diff --git a/.gitignore b/.gitignore
index c9ffe48..3b37c71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /Default/
 t
 t.c
-*.o
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 5fd04a6..200d3ff 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,11 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="1454897614747865177" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+<<<<<<< HEAD
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1454897614747865177" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+=======
+			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-453075839587151408" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+>>>>>>> branch 'master' of http://Git.BrainChurts.com:8080/git/MrOlsen/UbixOS.git
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/Makefile b/Makefile
index cc37119..db57540 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,7 @@
-# The System Makefile (C) 2002, 2017 The UbixOS Project
+all: universe
 
-.if ${.MAKEFLAGS:M${.CURDIR}/share/mk} == ""
-.MAKEFLAGS: -m ${.CURDIR}/share/mk
-.endif
+universe:
+	(cd src; make all)
 
-.include <ubix.own.mk>
-
-_SUBDIR=lib bin sys
-
-.for dir in ${_SUBDIR}
-.if (${BUILD_${dir}:Uyes} != "no" && exists(${dir}/Makefile))
-SUBDIR+= ${dir}
-.endif
-.endfor
-
-.include <ubix.obj.mk>
-.include <ubix.kernobj.mk>
-.include <ubix.subdir.mk>
+clean:
+	(cd src;make clean)
\ No newline at end of file
diff --git a/Makefile.incl b/Makefile.incl
deleted file mode 100644
index f0a9e86..0000000
--- a/Makefile.incl
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: Makefile.inc 89 2016-01-12 00:20:40Z reddawg $
-# Global 'Source' Options
-
-# allow you to change your default compiler without affecting your other work
-#MrOlsen (2016-01-10) NOTE: I pass all this now
-#CFLAGS = -m32 
-#CC = cc
-#CXX = c++
-#LD = ld
-#AR = ar
-
-#Glogal Override And Defs
-_ARCH?=${MACHINE_ARCH}
-
-_ARCH=i386
-
-REMOVE = rm -rf
-
-#FD_DEVICE = /dev/md0
diff --git a/build.sh b/build.sh
deleted file mode 100644
index f75c272..0000000
--- a/build.sh
+++ /dev/null
@@ -1,2321 +0,0 @@
-#! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.308 2015/06/27 06:00:28 matt Exp $
-#
-# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Todd Vierling and Luke Mewburn.
-#
-# 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
-#
-#
-# Top level build wrapper, to build or cross-build NetBSD.
-#
-
-#
-# {{{ Begin shell feature tests.
-#
-# We try to determine whether or not this script is being run under
-# a shell that supports the features that we use.  If not, we try to
-# re-exec the script under another shell.  If we can't find another
-# suitable shell, then we print a message and exit.
-#
-
-errmsg=''		# error message, if not empty
-shelltest=false		# if true, exit after testing the shell
-re_exec_allowed=true	# if true, we may exec under another shell
-
-# Parse special command line options in $1.  These special options are
-# for internal use only, are not documented, and are not valid anywhere
-# other than $1.
-case "$1" in
-"--shelltest")
-    shelltest=true
-    re_exec_allowed=false
-    shift
-    ;;
-"--no-re-exec")
-    re_exec_allowed=false
-    shift
-    ;;
-esac
-
-# Solaris /bin/sh, and other SVR4 shells, do not support "!".
-# This is the first feature that we test, because subsequent
-# tests use "!".
-#
-if test -z "$errmsg"; then
-    if ( eval '! false' ) >/dev/null 2>&1 ; then
-	:
-    else
-	errmsg='Shell does not support "!".'
-    fi
-fi
-
-# Does the shell support functions?
-#
-if test -z "$errmsg"; then
-    if ! (
-	eval 'somefunction() { : ; }'
-	) >/dev/null 2>&1
-    then
-	errmsg='Shell does not support functions.'
-    fi
-fi
-
-# Does the shell support the "local" keyword for variables in functions?
-#
-# Local variables are not required by SUSv3, but some scripts run during
-# the NetBSD build use them.
-#
-# ksh93 fails this test; it uses an incompatible syntax involving the
-# keywords 'function' and 'typeset'.
-#
-if test -z "$errmsg"; then
-    if ! (
-	eval 'f() { local v=2; }; v=1; f && test x"$v" = x"1"'
-	) >/dev/null 2>&1
-    then
-	errmsg='Shell does not support the "local" keyword in functions.'
-    fi
-fi
-
-# Does the shell support ${var%suffix}, ${var#prefix}, and their variants?
-#
-# We don't bother testing for ${var+value}, ${var-value}, or their variants,
-# since shells without those are sure to fail other tests too.
-#
-if test -z "$errmsg"; then
-    if ! (
-	eval 'var=a/b/c ;
-	      test x"${var#*/};${var##*/};${var%/*};${var%%/*}" = \
-		   x"b/c;c;a/b;a" ;'
-	) >/dev/null 2>&1
-    then
-	errmsg='Shell does not support "${var%suffix}" or "${var#prefix}".'
-    fi
-fi
-
-# Does the shell support IFS?
-#
-# zsh in normal mode (as opposed to "emulate sh" mode) fails this test.
-#
-if test -z "$errmsg"; then
-    if ! (
-	eval 'IFS=: ; v=":a b::c" ; set -- $v ; IFS=+ ;
-		test x"$#;$1,$2,$3,$4;$*" = x"4;,a b,,c;+a b++c"'
-	) >/dev/null 2>&1
-    then
-	errmsg='Shell does not support IFS word splitting.'
-    fi
-fi
-
-# Does the shell support ${1+"$@"}?
-#
-# Some versions of zsh fail this test, even in "emulate sh" mode.
-#
-if test -z "$errmsg"; then
-    if ! (
-	eval 'set -- "a a a" "b b b"; set -- ${1+"$@"};
-	      test x"$#;$1;$2" = x"2;a a a;b b b";'
-	) >/dev/null 2>&1
-    then
-	errmsg='Shell does not support ${1+"$@"}.'
-    fi
-fi
-
-# Does the shell support $(...) command substitution?
-#
-if test -z "$errmsg"; then
-    if ! (
-	eval 'var=$(echo abc); test x"$var" = x"abc"'
-	) >/dev/null 2>&1
-    then
-	errmsg='Shell does not support "$(...)" command substitution.'
-    fi
-fi
-
-# Does the shell support $(...) command substitution with
-# unbalanced parentheses?
-#
-# Some shells known to fail this test are:  NetBSD /bin/ksh (as of 2009-12),
-# bash-3.1, pdksh-5.2.14, zsh-4.2.7 in "emulate sh" mode.
-#
-if test -z "$errmsg"; then
-    if ! (
-	eval 'var=$(case x in x) echo abc;; esac); test x"$var" = x"abc"'
-	) >/dev/null 2>&1
-    then
-	# XXX: This test is ignored because so many shells fail it; instead,
-	#      the NetBSD build avoids using the problematic construct.
-	: ignore 'Shell does not support "$(...)" with unbalanced ")".'
-    fi
-fi
-
-# Does the shell support getopts or getopt?
-#
-if test -z "$errmsg"; then
-    if ! (
-	eval 'type getopts || type getopt'
-	) >/dev/null 2>&1
-    then
-	errmsg='Shell does not support getopts or getopt.'
-    fi
-fi
-
-#
-# If shelltest is true, exit now, reporting whether or not the shell is good.
-#
-if $shelltest; then
-    if test -n "$errmsg"; then
-	echo >&2 "$0: $errmsg"
-	exit 1
-    else
-	exit 0
-    fi
-fi
-
-#
-# If the shell was bad, try to exec a better shell, or report an error.
-#
-# Loops are broken by passing an extra "--no-re-exec" flag to the new
-# instance of this script.
-#
-if test -n "$errmsg"; then
-    if $re_exec_allowed; then
-	for othershell in \
-	    "${HOST_SH}" /usr/xpg4/bin/sh ksh ksh88 mksh pdksh dash bash
-	    # NOTE: some shells known not to work are:
-	    # any shell using csh syntax;
-	    # Solaris /bin/sh (missing many modern features);
-	    # ksh93 (incompatible syntax for local variables);
-	    # zsh (many differences, unless run in compatibility mode).
-	do
-	    test -n "$othershell" || continue
-	    if eval 'type "$othershell"' >/dev/null 2>&1 \
-		&& "$othershell" "$0" --shelltest >/dev/null 2>&1
-	    then
-		cat <<EOF
-$0: $errmsg
-$0: Retrying under $othershell
-EOF
-		HOST_SH="$othershell"
-		export HOST_SH
-		exec $othershell "$0" --no-re-exec "$@" # avoid ${1+"$@"}
-	    fi
-	    # If HOST_SH was set, but failed the test above,
-	    # then give up without trying any other shells.
-	    test x"${othershell}" = x"${HOST_SH}" && break
-	done
-    fi
-
-    #
-    # If we get here, then the shell is bad, and we either could not
-    # find a replacement, or were not allowed to try a replacement.
-    #
-    cat <<EOF
-$0: $errmsg
-
-The NetBSD build system requires a shell that supports modern POSIX
-features, as well as the "local" keyword in functions (which is a
-widely-implemented but non-standardised feature).
-
-Please re-run this script under a suitable shell.  For example:
-
-	/path/to/suitable/shell $0 ...
-
-The above command will usually enable build.sh to automatically set
-HOST_SH=/path/to/suitable/shell, but if that fails, then you may also
-need to explicitly set the HOST_SH environment variable, as follows:
-
-	HOST_SH=/path/to/suitable/shell
-	export HOST_SH
-	\${HOST_SH} $0 ...
-EOF
-    exit 1
-fi
-
-#
-# }}} End shell feature tests.
-#
-
-progname=${0##*/}
-toppid=$$
-results=/dev/null
-tab='	'
-nl='
-'
-trap "exit 1" 1 2 3 15
-
-bomb()
-{
-	cat >&2 <<ERRORMESSAGE
-
-ERROR: $@
-*** BUILD ABORTED ***
-ERRORMESSAGE
-	kill ${toppid}		# in case we were invoked from a subshell
-	exit 1
-}
-
-# Quote args to make them safe in the shell.
-# Usage: quotedlist="$(shell_quote args...)"
-#
-# After building up a quoted list, use it by evaling it inside
-# double quotes, like this:
-#    eval "set -- $quotedlist"
-# or like this:
-#    eval "\$command $quotedlist \$filename"
-#
-shell_quote()
-{(
-	local result=''
-	local arg qarg
-	LC_COLLATE=C ; export LC_COLLATE # so [a-zA-Z0-9] works in ASCII
-	for arg in "$@" ; do
-		case "${arg}" in
-		'')
-			qarg="''"
-			;;
-		*[!-./a-zA-Z0-9]*)
-			# Convert each embedded ' to '\'',
-			# then insert ' at the beginning of the first line,
-			# and append ' at the end of the last line.
-			# Finally, elide unnecessary '' pairs at the
-			# beginning and end of the result and as part of
-			# '\'''\'' sequences that result from multiple
-			# adjacent quotes in he input.
-			qarg="$(printf "%s\n" "$arg" | \
-			    ${SED:-sed} -e "s/'/'\\\\''/g" \
-				-e "1s/^/'/" -e "\$s/\$/'/" \
-				-e "1s/^''//" -e "\$s/''\$//" \
-				-e "s/'''/'/g"
-				)"
-			;;
-		*)
-			# Arg is not the empty string, and does not contain
-			# any unsafe characters.  Leave it unchanged for
-			# readability.
-			qarg="${arg}"
-			;;
-		esac
-		result="${result}${result:+ }${qarg}"
-	done
-	printf "%s\n" "$result"
-)}
-
-statusmsg()
-{
-	${runcmd} echo "===> $@" | tee -a "${results}"
-}
-
-statusmsg2()
-{
-	local msg
-
-	msg="${1}"
-	shift
-	case "${msg}" in
-	????????????????*)	;;
-	??????????*)		msg="${msg}      ";;
-	?????*)			msg="${msg}           ";;
-	*)			msg="${msg}                ";;
-	esac
-	case "${msg}" in
-	?????????????????????*)	;;
-	????????????????????)	msg="${msg} ";;
-	???????????????????)	msg="${msg}  ";;
-	??????????????????)	msg="${msg}   ";;
-	?????????????????)	msg="${msg}    ";;
-	????????????????)	msg="${msg}     ";;
-	esac
-	statusmsg "${msg}$*"
-}
-
-warning()
-{
-	statusmsg "Warning: $@"
-}
-
-# Find a program in the PATH, and print the result.  If not found,
-# print a default.  If $2 is defined (even if it is an empty string),
-# then that is the default; otherwise, $1 is used as the default.
-find_in_PATH()
-{
-	local prog="$1"
-	local result="${2-"$1"}"
-	local oldIFS="${IFS}"
-	local dir
-	IFS=":"
-	for dir in ${PATH}; do
-		if [ -x "${dir}/${prog}" ]; then
-			result="${dir}/${prog}"
-			break
-		fi
-	done
-	IFS="${oldIFS}"
-	echo "${result}"
-}
-
-# Try to find a working POSIX shell, and set HOST_SH to refer to it.
-# Assumes that uname_s, uname_m, and PWD have been set.
-set_HOST_SH()
-{
-	# Even if ${HOST_SH} is already defined, we still do the
-	# sanity checks at the end.
-
-	# Solaris has /usr/xpg4/bin/sh.
-	#
-	[ -z "${HOST_SH}" ] && [ x"${uname_s}" = x"SunOS" ] && \
-		[ -x /usr/xpg4/bin/sh ] && HOST_SH="/usr/xpg4/bin/sh"
-
-	# Try to get the name of the shell that's running this script,
-	# by parsing the output from "ps".  We assume that, if the host
-	# system's ps command supports -o comm at all, it will do so
-	# in the usual way: a one-line header followed by a one-line
-	# result, possibly including trailing white space.  And if the
-	# host system's ps command doesn't support -o comm, we assume
-	# that we'll get an error message on stderr and nothing on
-	# stdout.  (We don't try to use ps -o 'comm=' to suppress the
-	# header line, because that is less widely supported.)
-	#
-	# If we get the wrong result here, the user can override it by
-	# specifying HOST_SH in the environment.
-	#
-	[ -z "${HOST_SH}" ] && HOST_SH="$(
-		(ps -p $$ -o comm | sed -ne "2s/[ ${tab}]*\$//p") 2>/dev/null )"
-
-	# If nothing above worked, use "sh".  We will later find the
-	# first directory in the PATH that has a "sh" program.
-	#
-	[ -z "${HOST_SH}" ] && HOST_SH="sh"
-
-	# If the result so far is not an absolute path, try to prepend
-	# PWD or search the PATH.
-	#
-	case "${HOST_SH}" in
-	/*)	:
-		;;
-	*/*)	HOST_SH="${PWD}/${HOST_SH}"
-		;;
-	*)	HOST_SH="$(find_in_PATH "${HOST_SH}")"
-		;;
-	esac
-
-	# If we don't have an absolute path by now, bomb.
-	#
-	case "${HOST_SH}" in
-	/*)	:
-		;;
-	*)	bomb "HOST_SH=\"${HOST_SH}\" is not an absolute path."
-		;;
-	esac
-
-	# If HOST_SH is not executable, bomb.
-	#
-	[ -x "${HOST_SH}" ] ||
-	    bomb "HOST_SH=\"${HOST_SH}\" is not executable."
-
-	# If HOST_SH fails tests, bomb.
-	# ("$0" may be a path that is no longer valid, because we have
-	# performed "cd $(dirname $0)", so don't use $0 here.)
-	#
-	"${HOST_SH}" build.sh --shelltest ||
-	    bomb "HOST_SH=\"${HOST_SH}\" failed functionality tests."
-}
-
-# initdefaults --
-# Set defaults before parsing command line options.
-#
-initdefaults()
-{
-	makeenv=
-	makewrapper=
-	makewrappermachine=
-	runcmd=
-	operations=
-	removedirs=
-
-	[ -d usr.bin/make ] || cd "$(dirname $0)"
-	[ -d usr.bin/make ] ||
-	    bomb "build.sh must be run from the top source level"
-	[ -f share/mk/bsd.own.mk ] ||
-	    bomb "src/share/mk is missing; please re-fetch the source tree"
-
-	# Set various environment variables to known defaults,
-	# to minimize (cross-)build problems observed "in the field".
-	#
-	# LC_ALL=C must be set before we try to parse the output from
-	# any command.  Other variables are set (or unset) here, before
-	# we parse command line arguments.
-	#
-	# These variables can be overridden via "-V var=value" if
-	# you know what you are doing.
-	#
-	unsetmakeenv INFODIR
-	unsetmakeenv LESSCHARSET
-	unsetmakeenv MAKEFLAGS
-	unsetmakeenv TERMINFO
-	setmakeenv LC_ALL C
-
-	# Find information about the build platform.  This should be
-	# kept in sync with _HOST_OSNAME, _HOST_OSREL, and _HOST_ARCH
-	# variables in share/mk/bsd.sys.mk.
-	#
-	# Note that "uname -p" is not part of POSIX, but we want uname_p
-	# to be set to the host MACHINE_ARCH, if possible.  On systems
-	# where "uname -p" fails, prints "unknown", or prints a string
-	# that does not look like an identifier, fall back to using the
-	# output from "uname -m" instead.
-	#
-	uname_s=$(uname -s 2>/dev/null)
-	uname_r=$(uname -r 2>/dev/null)
-	uname_m=$(uname -m 2>/dev/null)
-	uname_p=$(uname -p 2>/dev/null || echo "unknown")
-	case "${uname_p}" in
-	''|unknown|*[^-_A-Za-z0-9]*) uname_p="${uname_m}" ;;
-	esac
-
-	id_u=$(id -u 2>/dev/null || /usr/xpg4/bin/id -u 2>/dev/null)
-
-	# If $PWD is a valid name of the current directory, POSIX mandates
-	# that pwd return it by default which causes problems in the
-	# presence of symlinks.  Unsetting PWD is simpler than changing
-	# every occurrence of pwd to use -P.
-	#
-	# XXX Except that doesn't work on Solaris. Or many Linuces.
-	#
-	unset PWD
-	TOP=$(/bin/pwd -P 2>/dev/null || /bin/pwd 2>/dev/null)
-
-	# The user can set HOST_SH in the environment, or we try to
-	# guess an appropriate value.  Then we set several other
-	# variables from HOST_SH.
-	#
-	set_HOST_SH
-	setmakeenv HOST_SH "${HOST_SH}"
-	setmakeenv BSHELL "${HOST_SH}"
-	setmakeenv CONFIG_SHELL "${HOST_SH}"
-
-	# Set defaults.
-	#
-	toolprefix=nb
-
-	# Some systems have a small ARG_MAX.  -X prevents make(1) from
-	# exporting variables in the environment redundantly.
-	#
-	case "${uname_s}" in
-	Darwin | FreeBSD | CYGWIN*)
-		MAKEFLAGS="-X ${MAKEFLAGS}"
-		;;
-	esac
-
-	# do_{operation}=true if given operation is requested.
-	#
-	do_expertmode=false
-	do_rebuildmake=false
-	do_removedirs=false
-	do_tools=false
-	do_cleandir=false
-	do_obj=false
-	do_build=false
-	do_distribution=false
-	do_release=false
-	do_kernel=false
-	do_releasekernel=false
-	do_kernels=false
-	do_modules=false
-	do_installmodules=false
-	do_install=false
-	do_sets=false
-	do_sourcesets=false
-	do_syspkgs=false
-	do_iso_image=false
-	do_iso_image_source=false
-	do_live_image=false
-	do_install_image=false
-	do_disk_image=false
-	do_show_params=false
-	do_rump=false
-
-	# done_{operation}=true if given operation has been done.
-	#
-	done_rebuildmake=false
-
-	# Create scratch directory
-	#
-	tmpdir="${TMPDIR-/tmp}/nbbuild$$"
-	mkdir "${tmpdir}" || bomb "Cannot mkdir: ${tmpdir}"
-	trap "cd /; rm -r -f \"${tmpdir}\"" 0
-	results="${tmpdir}/build.sh.results"
-
-	# Set source directories
-	#
-	setmakeenv NETBSDSRCDIR "${TOP}"
-
-	# Make sure KERNOBJDIR is an absolute path if defined
-	#
-	case "${KERNOBJDIR}" in
-	''|/*)	;;
-	*)	KERNOBJDIR="${TOP}/${KERNOBJDIR}"
-		setmakeenv KERNOBJDIR "${KERNOBJDIR}"
-		;;
-	esac
-
-	# Find the version of NetBSD
-	#
-	DISTRIBVER="$(${HOST_SH} ${TOP}/sys/conf/osrelease.sh)"
-
-	# Set the BUILDSEED to NetBSD-"N"
-	#
-	setmakeenv BUILDSEED "MINIX-$(${HOST_SH} ${TOP}/sys/conf/osrelease.sh -m)"
-
-	# Set MKARZERO to "yes"
-	#
-	setmakeenv MKARZERO "yes"
-
-}
-
-# valid_MACHINE_ARCH -- A multi-line string, listing all valid
-# MACHINE/MACHINE_ARCH pairs.
-#
-# Each line contains a MACHINE and MACHINE_ARCH value, an optional ALIAS
-# which may be used to refer to the MACHINE/MACHINE_ARCH pair, and an
-# optional DEFAULT or NO_DEFAULT keyword.
-#
-# When a MACHINE corresponds to multiple possible values of
-# MACHINE_ARCH, then this table should list all allowed combinations.
-# If the MACHINE is associated with a default MACHINE_ARCH (to be
-# used when the user specifies the MACHINE but fails to specify the
-# MACHINE_ARCH), then one of the lines should have the "DEFAULT"
-# keyword.  If there is no default MACHINE_ARCH for a particular
-# MACHINE, then there should be a line with the "NO_DEFAULT" keyword,
-# and with a blank MACHINE_ARCH.
-#
-valid_MACHINE_ARCH='
-MACHINE=acorn26		MACHINE_ARCH=arm
-MACHINE=acorn32		MACHINE_ARCH=arm
-MACHINE=algor		MACHINE_ARCH=mips64el	ALIAS=algor64
-MACHINE=algor		MACHINE_ARCH=mipsel	DEFAULT
-MACHINE=alpha		MACHINE_ARCH=alpha
-MACHINE=amd64		MACHINE_ARCH=x86_64
-MACHINE=amiga		MACHINE_ARCH=m68k
-MACHINE=amigappc	MACHINE_ARCH=powerpc
-MACHINE=arc		MACHINE_ARCH=mips64el	ALIAS=arc64
-MACHINE=arc		MACHINE_ARCH=mipsel	DEFAULT
-MACHINE=atari		MACHINE_ARCH=m68k
-MACHINE=bebox		MACHINE_ARCH=powerpc
-MACHINE=cats		MACHINE_ARCH=arm	ALIAS=ocats
-MACHINE=cats		MACHINE_ARCH=earmv4	ALIAS=ecats DEFAULT
-MACHINE=cesfic		MACHINE_ARCH=m68k
-MACHINE=cobalt		MACHINE_ARCH=mips64el	ALIAS=cobalt64
-MACHINE=cobalt		MACHINE_ARCH=mipsel	DEFAULT
-MACHINE=dreamcast	MACHINE_ARCH=sh3el
-MACHINE=emips		MACHINE_ARCH=mipseb
-MACHINE=epoc32		MACHINE_ARCH=arm
-MACHINE=evbarm		MACHINE_ARCH=arm	ALIAS=evboarm-el
-MACHINE=evbarm		MACHINE_ARCH=armeb	ALIAS=evboarm-eb
-MACHINE=evbarm		MACHINE_ARCH=earm	ALIAS=evbearm-el DEFAULT
-MACHINE=evbarm		MACHINE_ARCH=earmeb	ALIAS=evbearm-eb
-MACHINE=evbarm		MACHINE_ARCH=earmhf	ALIAS=evbearmhf-el
-MACHINE=evbarm		MACHINE_ARCH=earmhfeb	ALIAS=evbearmhf-eb
-MACHINE=evbarm		MACHINE_ARCH=earmv4	ALIAS=evbearmv4-el
-MACHINE=evbarm		MACHINE_ARCH=earmv4eb	ALIAS=evbearmv4-eb
-MACHINE=evbarm		MACHINE_ARCH=earmv5	ALIAS=evbearmv5-el
-MACHINE=evbarm		MACHINE_ARCH=earmv5eb	ALIAS=evbearmv5-eb
-MACHINE=evbarm		MACHINE_ARCH=earmv6	ALIAS=evbearmv6-el
-MACHINE=evbarm		MACHINE_ARCH=earmv6hf	ALIAS=evbearmv6hf-el
-MACHINE=evbarm		MACHINE_ARCH=earmv6eb	ALIAS=evbearmv6-eb
-MACHINE=evbarm		MACHINE_ARCH=earmv6hfeb	ALIAS=evbearmv6hf-eb
-MACHINE=evbarm		MACHINE_ARCH=earmv7	ALIAS=evbearmv7-el
-MACHINE=evbarm		MACHINE_ARCH=earmv7eb	ALIAS=evbearmv7-eb
-MACHINE=evbarm		MACHINE_ARCH=earmv7hf	ALIAS=evbearmv7hf-el
-MACHINE=evbarm		MACHINE_ARCH=earmv7hfeb	ALIAS=evbearmv7hf-eb
-MACHINE=evbarm64	MACHINE_ARCH=aarch64	ALIAS=evbarm64-el DEFAULT
-MACHINE=evbarm64	MACHINE_ARCH=aarch64eb	ALIAS=evbarm64-eb
-MACHINE=evbcf		MACHINE_ARCH=coldfire
-MACHINE=evbmips		MACHINE_ARCH=		NO_DEFAULT
-MACHINE=evbmips		MACHINE_ARCH=mips64eb	ALIAS=evbmips64-eb
-MACHINE=evbmips		MACHINE_ARCH=mips64el	ALIAS=evbmips64-el
-MACHINE=evbmips		MACHINE_ARCH=mipseb	ALIAS=evbmips-eb
-MACHINE=evbmips		MACHINE_ARCH=mipsel	ALIAS=evbmips-el
-MACHINE=evbppc		MACHINE_ARCH=powerpc	DEFAULT
-MACHINE=evbppc		MACHINE_ARCH=powerpc64	ALIAS=evbppc64
-MACHINE=evbsh3		MACHINE_ARCH=		NO_DEFAULT
-MACHINE=evbsh3		MACHINE_ARCH=sh3eb	ALIAS=evbsh3-eb
-MACHINE=evbsh3		MACHINE_ARCH=sh3el	ALIAS=evbsh3-el
-MACHINE=ews4800mips	MACHINE_ARCH=mipseb
-MACHINE=hp300		MACHINE_ARCH=m68k
-MACHINE=hppa		MACHINE_ARCH=hppa
-MACHINE=hpcarm		MACHINE_ARCH=arm	ALIAS=hpcoarm
-MACHINE=hpcarm		MACHINE_ARCH=earmv4	ALIAS=hpcearm DEFAULT
-MACHINE=hpcmips		MACHINE_ARCH=mipsel
-MACHINE=hpcsh		MACHINE_ARCH=sh3el
-MACHINE=i386		MACHINE_ARCH=i386
-MACHINE=ia64		MACHINE_ARCH=ia64
-MACHINE=ibmnws		MACHINE_ARCH=powerpc
-MACHINE=iyonix		MACHINE_ARCH=arm	ALIAS=oiyonix
-MACHINE=iyonix		MACHINE_ARCH=earm	ALIAS=eiyonix DEFAULT
-MACHINE=landisk		MACHINE_ARCH=sh3el
-MACHINE=luna68k		MACHINE_ARCH=m68k
-MACHINE=mac68k		MACHINE_ARCH=m68k
-MACHINE=macppc		MACHINE_ARCH=powerpc	DEFAULT
-MACHINE=macppc		MACHINE_ARCH=powerpc64	ALIAS=macppc64
-MACHINE=mipsco		MACHINE_ARCH=mipseb
-MACHINE=mmeye		MACHINE_ARCH=sh3eb
-MACHINE=mvme68k		MACHINE_ARCH=m68k
-MACHINE=mvmeppc		MACHINE_ARCH=powerpc
-MACHINE=netwinder	MACHINE_ARCH=arm	ALIAS=onetwinder
-MACHINE=netwinder	MACHINE_ARCH=earmv4	ALIAS=enetwinder DEFAULT
-MACHINE=news68k		MACHINE_ARCH=m68k
-MACHINE=newsmips	MACHINE_ARCH=mipseb
-MACHINE=next68k		MACHINE_ARCH=m68k
-MACHINE=ofppc		MACHINE_ARCH=powerpc	DEFAULT
-MACHINE=ofppc		MACHINE_ARCH=powerpc64	ALIAS=ofppc64
-MACHINE=or1k		MACHINE_ARCH=or1k
-MACHINE=playstation2	MACHINE_ARCH=mipsel
-MACHINE=pmax		MACHINE_ARCH=mips64el	ALIAS=pmax64
-MACHINE=pmax		MACHINE_ARCH=mipsel	DEFAULT
-MACHINE=prep		MACHINE_ARCH=powerpc
-MACHINE=riscv		MACHINE_ARCH=riscv64	ALIAS=riscv64 DEFAULT
-MACHINE=riscv		MACHINE_ARCH=riscv32	ALIAS=riscv32
-MACHINE=rs6000		MACHINE_ARCH=powerpc
-MACHINE=sandpoint	MACHINE_ARCH=powerpc
-MACHINE=sbmips		MACHINE_ARCH=		NO_DEFAULT
-MACHINE=sbmips		MACHINE_ARCH=mips64eb	ALIAS=sbmips64-eb
-MACHINE=sbmips		MACHINE_ARCH=mips64el	ALIAS=sbmips64-el
-MACHINE=sbmips		MACHINE_ARCH=mipseb	ALIAS=sbmips-eb
-MACHINE=sbmips		MACHINE_ARCH=mipsel	ALIAS=sbmips-el
-MACHINE=sgimips		MACHINE_ARCH=mips64eb	ALIAS=sgimips64
-MACHINE=sgimips		MACHINE_ARCH=mipseb	DEFAULT
-MACHINE=shark		MACHINE_ARCH=arm	ALIAS=oshark
-MACHINE=shark		MACHINE_ARCH=earmv4	ALIAS=eshark DEFAULT
-MACHINE=sparc		MACHINE_ARCH=sparc
-MACHINE=sparc64		MACHINE_ARCH=sparc64
-MACHINE=sun2		MACHINE_ARCH=m68000
-MACHINE=sun3		MACHINE_ARCH=m68k
-MACHINE=vax		MACHINE_ARCH=vax
-MACHINE=x68k		MACHINE_ARCH=m68k
-MACHINE=zaurus		MACHINE_ARCH=arm	ALIAS=ozaurus
-MACHINE=zaurus		MACHINE_ARCH=earm	ALIAS=ezaurus DEFAULT
-'
-
-# getarch -- find the default MACHINE_ARCH for a MACHINE,
-# or convert an alias to a MACHINE/MACHINE_ARCH pair.
-#
-# Saves the original value of MACHINE in makewrappermachine before
-# alias processing.
-#
-# Sets MACHINE and MACHINE_ARCH if the input MACHINE value is
-# recognised as an alias, or recognised as a machine that has a default
-# MACHINE_ARCH (or that has only one possible MACHINE_ARCH).
-#
-# Leaves MACHINE and MACHINE_ARCH unchanged if MACHINE is recognised
-# as being associated with multiple MACHINE_ARCH values with no default.
-#
-# Bombs if MACHINE is not recognised.
-#
-getarch()
-{
-	local IFS
-	local found=""
-	local line
-
-	IFS="${nl}"
-	makewrappermachine="${MACHINE}"
-	for line in ${valid_MACHINE_ARCH}; do
-		line="${line%%#*}" # ignore comments
-		line="$( IFS=" ${tab}" ; echo $line )" # normalise white space
-		case "${line} " in
-		" ")
-			# skip blank lines or comment lines
-			continue
-			;;
-		*" ALIAS=${MACHINE} "*)
-			# Found a line with a matching ALIAS=<alias>.
-			found="$line"
-			break
-			;;
-		"MACHINE=${MACHINE} "*" NO_DEFAULT"*)
-			# Found an explicit "NO_DEFAULT" for this MACHINE.
-			found="$line"
-			break
-			;;
-		"MACHINE=${MACHINE} "*" DEFAULT"*)
-			# Found an explicit "DEFAULT" for this MACHINE.
-			found="$line"
-			break
-			;;
-		"MACHINE=${MACHINE} "*)
-			# Found a line for this MACHINE.  If it's the
-			# first such line, then tentatively accept it.
-			# If it's not the first matching line, then
-			# remember that there was more than one match.
-			case "$found" in
-			'')	found="$line" ;;
-			*)	found="MULTIPLE_MATCHES" ;;
-			esac
-			;;
-		esac
-	done
-
-	case "$found" in
-	*NO_DEFAULT*|*MULTIPLE_MATCHES*)
-		# MACHINE is OK, but MACHINE_ARCH is still unknown
-		return
-		;;
-	"MACHINE="*" MACHINE_ARCH="*)
-		# Obey the MACHINE= and MACHINE_ARCH= parts of the line.
-		IFS=" "
-		for frag in ${found}; do
-			case "$frag" in
-			MACHINE=*|MACHINE_ARCH=*)
-				eval "$frag"
-				;;
-			esac
-		done
-		;;
-	*)
-		bomb "Unknown target MACHINE: ${MACHINE}"
-		;;
-	esac
-}
-
-# validatearch -- check that the MACHINE/MACHINE_ARCH pair is supported.
-#
-# Bombs if the pair is not supported.
-#
-validatearch()
-{
-	local IFS
-	local line
-	local foundpair=false foundmachine=false foundarch=false
-
-	case "${MACHINE_ARCH}" in
-	"")
-		bomb "No MACHINE_ARCH provided"
-		;;
-	esac
-
-	IFS="${nl}"
-	for line in ${valid_MACHINE_ARCH}; do
-		line="${line%%#*}" # ignore comments
-		line="$( IFS=" ${tab}" ; echo $line )" # normalise white space
-		case "${line} " in
-		" ")
-			# skip blank lines or comment lines
-			continue
-			;;
-		"MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} "*)
-			foundpair=true
-			;;
-		"MACHINE=${MACHINE} "*)
-			foundmachine=true
-			;;
-		*"MACHINE_ARCH=${MACHINE_ARCH} "*)
-			foundarch=true
-			;;
-		esac
-	done
-
-	case "${foundpair}:${foundmachine}:${foundarch}" in
-	true:*)
-		: OK
-		;;
-	*:false:*)
-		bomb "Unknown target MACHINE: ${MACHINE}"
-		;;
-	*:*:false)
-		bomb "Unknown target MACHINE_ARCH: ${MACHINE_ARCH}"
-		;;
-	*)
-		bomb "MACHINE_ARCH '${MACHINE_ARCH}' does not support MACHINE '${MACHINE}'"
-		;;
-	esac
-}
-
-# listarch -- list valid MACHINE/MACHINE_ARCH/ALIAS values,
-# optionally restricted to those where the MACHINE and/or MACHINE_ARCH
-# match specifed glob patterns.
-#
-listarch()
-{
-	local machglob="$1" archglob="$2"
-	local IFS
-	local wildcard="*"
-	local line xline frag
-	local line_matches_machine line_matches_arch
-	local found=false
-
-	# Empty machglob or archglob should match anything
-	: "${machglob:=${wildcard}}"
-	: "${archglob:=${wildcard}}"
-
-	IFS="${nl}"
-	for line in ${valid_MACHINE_ARCH}; do
-		line="${line%%#*}" # ignore comments
-		xline="$( IFS=" ${tab}" ; echo $line )" # normalise white space
-		[ -z "${xline}" ] && continue # skip blank or comment lines
-
-		line_matches_machine=false
-		line_matches_arch=false
-
-		IFS=" "
-		for frag in ${xline}; do
-			case "${frag}" in
-			MACHINE=${machglob})
-				line_matches_machine=true ;;
-			ALIAS=${machglob})
-				line_matches_machine=true ;;
-			MACHINE_ARCH=${archglob})
-				line_matches_arch=true ;;
-			esac
-		done
-
-		if $line_matches_machine && $line_matches_arch; then
-			found=true
-			echo "$line"
-		fi
-	done
-	if ! $found; then
-		echo >&2 "No match for" \
-		    "MACHINE=${machglob} MACHINE_ARCH=${archglob}"
-		return 1
-	fi
-	return 0
-}
-
-# nobomb_getmakevar --
-# Given the name of a make variable in $1, print make's idea of the
-# value of that variable, or return 1 if there's an error.
-#
-nobomb_getmakevar()
-{
-	[ -x "${make}" ] || return 1
-	"${make}" -m ${TOP}/share/mk -s -B -f- _x_ <<EOF || return 1
-_x_:
-	echo \${$1}
-# LSC FIXME: We are cross compiling, so overwrite default and build tools
-USETOOLS:=yes
-.include <bsd.prog.mk>
-.include <bsd.kernobj.mk>
-EOF
-}
-
-# bomb_getmakevar --
-# Given the name of a make variable in $1, print make's idea of the
-# value of that variable, or bomb if there's an error.
-#
-bomb_getmakevar()
-{
-	[ -x "${make}" ] || bomb "bomb_getmakevar $1: ${make} is not executable"
-	nobomb_getmakevar "$1" || bomb "bomb_getmakevar $1: ${make} failed"
-}
-
-# getmakevar --
-# Given the name of a make variable in $1, print make's idea of the
-# value of that variable, or print a literal '$' followed by the
-# variable name if ${make} is not executable.  This is intended for use in
-# messages that need to be readable even if $make hasn't been built,
-# such as when build.sh is run with the "-n" option.
-#
-getmakevar()
-{
-	if [ -x "${make}" ]; then
-		bomb_getmakevar "$1"
-	else
-		echo "\$$1"
-	fi
-}
-
-setmakeenv()
-{
-	eval "$1='$2'; export $1"
-	makeenv="${makeenv} $1"
-}
-
-unsetmakeenv()
-{
-	eval "unset $1"
-	makeenv="${makeenv} $1"
-}
-
-# Given a variable name in $1, modify the variable in place as follows:
-# For each space-separated word in the variable, call resolvepath.
-resolvepaths()
-{
-	local var="$1"
-	local val
-	eval val=\"\${${var}}\"
-	local newval=''
-	local word
-	for word in ${val}; do
-		resolvepath word
-		newval="${newval}${newval:+ }${word}"
-	done
-	eval ${var}=\"\${newval}\"
-}
-
-# Given a variable name in $1, modify the variable in place as follows:
-# Convert possibly-relative path to absolute path by prepending
-# ${TOP} if necessary.  Also delete trailing "/", if any.
-resolvepath()
-{
-	local var="$1"
-	local val
-	eval val=\"\${${var}}\"
-	case "${val}" in
-	/)
-		;;
-	/*)
-		val="${val%/}"
-		;;
-	*)
-		val="${TOP}/${val%/}"
-		;;
-	esac
-	eval ${var}=\"\${val}\"
-}
-
-usage()
-{
-	if [ -n "$*" ]; then
-		echo ""
-		echo "${progname}: $*"
-	fi
-	cat <<_usage_
-
-Usage: ${progname} [-EhnorUuxy] [-a arch] [-B buildid] [-C cdextras]
-                [-D dest] [-j njob] [-M obj] [-m mach] [-N noisy]
-                [-O obj] [-R release] [-S seed] [-T tools]
-                [-V var=[value]] [-w wrapper] [-X x11src] [-Y extsrcsrc]
-                [-Z var]
-                operation [...]
-
- Build operations (all imply "obj" and "tools"):
-    build               Run "make build".
-    distribution        Run "make distribution" (includes DESTDIR/etc/ files).
-    release             Run "make release" (includes kernels & distrib media).
-
- Other operations:
-    help                Show this message and exit.
-    makewrapper         Create ${toolprefix}make-\${MACHINE} wrapper and ${toolprefix}make.
-                        Always performed.
-    cleandir            Run "make cleandir".  [Default unless -u is used]
-    obj                 Run "make obj".  [Default unless -o is used]
-    tools               Build and install tools.
-    install=idir        Run "make installworld" to \`idir' to install all sets
-                        except \`etc'.  Useful after "distribution" or "release"
-    kernel=conf         Build kernel with config file \`conf'
-    kernel.gdb=conf     Build kernel (including netbsd.gdb) with config
-                        file \`conf'
-    releasekernel=conf  Install kernel built by kernel=conf to RELEASEDIR.
-    kernels             Build all kernels
-    installmodules=idir Run "make installmodules" to \`idir' to install all
-                        kernel modules.
-    modules             Build kernel modules.
-    rumptest            Do a linktest for rump (for developers).
-    sets                Create binary sets in
-                        RELEASEDIR/RELEASEMACHINEDIR/binary/sets.
-                        DESTDIR should be populated beforehand.
-    sourcesets          Create source sets in RELEASEDIR/source/sets.
-    syspkgs             Create syspkgs in
-                        RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.
-    iso-image           Create CD-ROM image in RELEASEDIR/images.
-    iso-image-source    Create CD-ROM image with source in RELEASEDIR/images.
-    live-image          Create bootable live image in
-                        RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage.
-    install-image       Create bootable installation image in
-                        RELEASEDIR/RELEASEMACHINEDIR/installation/installimage.
-    disk-image=target   Create bootable disk image in
-                        RELEASEDIR/RELEASEMACHINEDIR/binary/gzimg/target.img.gz.
-    params              Display various make(1) parameters.
-    list-arch           Display a list of valid MACHINE/MACHINE_ARCH values,
-                        and exit.  The list may be narrowed by passing glob
-                        patterns or exact values in MACHINE or MACHINE_ARCH.
-
- Options:
-    -a arch        Set MACHINE_ARCH to arch.  [Default: deduced from MACHINE]
-    -B buildid     Set BUILDID to buildid.
-    -C cdextras    Append cdextras to CDEXTRA variable for inclusion on CD-ROM.
-    -D dest        Set DESTDIR to dest.  [Default: destdir.MACHINE]
-    -E             Set "expert" mode; disables various safety checks.
-                   Should not be used without expert knowledge of the build system.
-    -h             Print this help message.
-    -j njob        Run up to njob jobs in parallel; see make(1) -j.
-    -M obj         Set obj root directory to obj; sets MAKEOBJDIRPREFIX.
-                   Unsets MAKEOBJDIR.
-    -m mach        Set MACHINE to mach.  Some mach values are actually
-                   aliases that set MACHINE/MACHINE_ARCH pairs.
-                   [Default: deduced from the host system if the host
-                   OS is NetBSD]
-    -N noisy       Set the noisyness (MAKEVERBOSE) level of the build:
-                       0   Minimal output ("quiet")
-                       1   Describe what is occurring
-                       2   Describe what is occurring and echo the actual command
-                       3   Ignore the effect of the "@" prefix in make commands
-                       4   Trace shell commands using the shell's -x flag
-                   [Default: 2]
-    -n             Show commands that would be executed, but do not execute them.
-    -O obj         Set obj root directory to obj; sets a MAKEOBJDIR pattern.
-                   Unsets MAKEOBJDIRPREFIX.
-    -o             Set MKOBJDIRS=no; do not create objdirs at start of build.
-    -R release     Set RELEASEDIR to release.  [Default: releasedir]
-    -r             Remove contents of TOOLDIR and DESTDIR before building.
-    -S seed        Set BUILDSEED to seed.  [Default: NetBSD-majorversion]
-    -T tools       Set TOOLDIR to tools.  If unset, and TOOLDIR is not set in
-                   the environment, ${toolprefix}make will be (re)built
-                   unconditionally.
-    -U             Set MKUNPRIVED=yes; build without requiring root privileges,
-                   install from an UNPRIVED build with proper file permissions.
-    -u             Set MKUPDATE=yes; do not run "make cleandir" first.
-                   Without this, everything is rebuilt, including the tools.
-    -V var=[value] Set variable \`var' to \`value'.
-    -w wrapper     Create ${toolprefix}make script as wrapper.
-                   [Default: \${TOOLDIR}/bin/${toolprefix}make-\${MACHINE}]
-    -X x11src      Set X11SRCDIR to x11src.  [Default: /usr/xsrc]
-    -x             Set MKX11=yes; build X11 from X11SRCDIR
-    -Y extsrcsrc   Set EXTSRCSRCDIR to extsrcsrc.  [Default: /usr/extsrc]
-    -y             Set MKEXTSRC=yes; build extsrc from EXTSRCSRCDIR
-    -Z var         Unset ("zap") variable \`var'.
-
-_usage_
-	exit 1
-}
-
-parseoptions()
-{
-	opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:X:xY:yZ:'
-	opt_a=false
-	opt_m=false
-
-	if type getopts >/dev/null 2>&1; then
-		# Use POSIX getopts.
-		#
-		getoptcmd='getopts ${opts} opt && opt=-${opt}'
-		optargcmd=':'
-		optremcmd='shift $((${OPTIND} -1))'
-	else
-		type getopt >/dev/null 2>&1 ||
-		    bomb "Shell does not support getopts or getopt"
-
-		# Use old-style getopt(1) (doesn't handle whitespace in args).
-		#
-		args="$(getopt ${opts} $*)"
-		[ $? = 0 ] || usage
-		set -- ${args}
-
-		getoptcmd='[ $# -gt 0 ] && opt="$1" && shift'
-		optargcmd='OPTARG="$1"; shift'
-		optremcmd=':'
-	fi
-
-	# Parse command line options.
-	#
-	while eval ${getoptcmd}; do
-		case ${opt} in
-
-		-a)
-			eval ${optargcmd}
-			MACHINE_ARCH=${OPTARG}
-			opt_a=true
-			;;
-
-		-B)
-			eval ${optargcmd}
-			BUILDID=${OPTARG}
-			;;
-
-		-C)
-			eval ${optargcmd}; resolvepaths OPTARG
-			CDEXTRA="${CDEXTRA}${CDEXTRA:+ }${OPTARG}"
-			;;
-
-		-D)
-			eval ${optargcmd}; resolvepath OPTARG
-			setmakeenv DESTDIR "${OPTARG}"
-			;;
-
-		-E)
-			do_expertmode=true
-			;;
-
-		-j)
-			eval ${optargcmd}
-			parallel="-j ${OPTARG}"
-			;;
-
-		-M)
-			eval ${optargcmd}; resolvepath OPTARG
-			case "${OPTARG}" in
-			\$*)	usage "-M argument must not begin with '\$'"
-				;;
-			*\$*)	# can use resolvepath, but can't set TOP_objdir
-				resolvepath OPTARG
-				;;
-			*)	resolvepath OPTARG
-				TOP_objdir="${OPTARG}${TOP}"
-				;;
-			esac
-			unsetmakeenv MAKEOBJDIR
-			setmakeenv MAKEOBJDIRPREFIX "${OPTARG}"
-			;;
-
-			# -m overrides MACHINE_ARCH unless "-a" is specified
-		-m)
-			eval ${optargcmd}
-			MACHINE="${OPTARG}"
-			opt_m=true
-			;;
-
-		-N)
-			eval ${optargcmd}
-			case "${OPTARG}" in
-			0|1|2|3|4)
-				setmakeenv MAKEVERBOSE "${OPTARG}"
-				;;
-			*)
-				usage "'${OPTARG}' is not a valid value for -N"
-				;;
-			esac
-			;;
-
-		-n)
-			runcmd=echo
-			;;
-
-		-O)
-			eval ${optargcmd}
-			case "${OPTARG}" in
-			*\$*)	usage "-O argument must not contain '\$'"
-				;;
-			*)	resolvepath OPTARG
-				TOP_objdir="${OPTARG}"
-				;;
-			esac
-			unsetmakeenv MAKEOBJDIRPREFIX
-			setmakeenv MAKEOBJDIR "\${.CURDIR:C,^$TOP,$OPTARG,}"
-			;;
-
-		-o)
-			MKOBJDIRS=no
-			;;
-
-		-R)
-			eval ${optargcmd}; resolvepath OPTARG
-			setmakeenv RELEASEDIR "${OPTARG}"
-			;;
-
-		-r)
-			do_removedirs=true
-			do_rebuildmake=true
-			;;
-
-		-S)
-			eval ${optargcmd}
-			setmakeenv BUILDSEED "${OPTARG}"
-			;;
-
-		-T)
-			eval ${optargcmd}; resolvepath OPTARG
-			TOOLDIR="${OPTARG}"
-			export TOOLDIR
-			;;
-
-		-U)
-			setmakeenv MKUNPRIVED yes
-			;;
-
-		-u)
-			setmakeenv MKUPDATE yes
-			;;
-
-		-V)
-			eval ${optargcmd}
-			case "${OPTARG}" in
-		    # XXX: consider restricting which variables can be changed?
-			[a-zA-Z_][a-zA-Z_0-9]*=*)
-				setmakeenv "${OPTARG%%=*}" "${OPTARG#*=}"
-				;;
-			*)
-				usage "-V argument must be of the form 'var=[value]'"
-				;;
-			esac
-			;;
-
-		-w)
-			eval ${optargcmd}; resolvepath OPTARG
-			makewrapper="${OPTARG}"
-			;;
-
-		-X)
-			eval ${optargcmd}; resolvepath OPTARG
-			setmakeenv X11SRCDIR "${OPTARG}"
-			;;
-
-		-x)
-			setmakeenv MKX11 yes
-			;;
-
-		-Y)
-			eval ${optargcmd}; resolvepath OPTARG
-			setmakeenv EXTSRCSRCDIR "${OPTARG}"
-			;;
-
-		-y)
-			setmakeenv MKEXTSRC yes
-			;;
-
-		-Z)
-			eval ${optargcmd}
-		    # XXX: consider restricting which variables can be unset?
-			unsetmakeenv "${OPTARG}"
-			;;
-
-		--)
-			break
-			;;
-
-		-'?'|-h)
-			usage
-			;;
-
-		esac
-	done
-
-	# Validate operations.
-	#
-	eval ${optremcmd}
-	while [ $# -gt 0 ]; do
-		op=$1; shift
-		operations="${operations} ${op}"
-
-		case "${op}" in
-
-		help)
-			usage
-			;;
-
-		list-arch)
-			listarch "${MACHINE}" "${MACHINE_ARCH}"
-			exit $?
-			;;
-
-		show-params)
-			op=show_params	# used as part of a variable name
-			;;
-
-		kernel=*|releasekernel=*|kernel.gdb=*)
-			arg=${op#*=}
-			op=${op%%=*}
-			[ -n "${arg}" ] ||
-			    bomb "Must supply a kernel name with \`${op}=...'"
-			;;
-
-		disk-image=*)
-			arg=${op#*=}
-			op=disk_image
-			[ -n "${arg}" ] ||
-			    bomb "Must supply a target name with \`${op}=...'"
-
-			;;
-
-		install=*|installmodules=*)
-			arg=${op#*=}
-			op=${op%%=*}
-			[ -n "${arg}" ] ||
-			    bomb "Must supply a directory with \`install=...'"
-			;;
-
-		build|\
-		cleandir|\
-		distribution|\
-		install-image|\
-		iso-image-source|\
-		iso-image|\
-		kernels|\
-		live-image|\
-		makewrapper|\
-		modules|\
-		obj|\
-		params|\
-		release|\
-		rump|\
-		rumptest|\
-		sets|\
-		sourcesets|\
-		syspkgs|\
-		tools)
-			;;
-
-		*)
-			usage "Unknown operation \`${op}'"
-			;;
-
-		esac
-		# ${op} may contain chars that are not allowed in variable
-		# names.  Replace them with '_' before setting do_${op}.
-		op="$( echo "$op" | tr -s '.-' '__')"
-		eval do_${op}=true
-	done
-	[ -n "${operations}" ] || usage "Missing operation to perform."
-
-	# Set up MACHINE*.  On a NetBSD host, these are allowed to be unset.
-	#
-	if [ -z "${MACHINE}" ]; then
-		[ "${uname_s}" = "Minix" ] ||
-		    bomb "MACHINE must be set, or -m must be used, for cross builds."
-		MACHINE=${uname_m}
-	fi
-	if $opt_m && ! $opt_a; then
-		# Settings implied by the command line -m option
-		# override MACHINE_ARCH from the environment (if any).
-		getarch
-	fi
-	[ -n "${MACHINE_ARCH}" ] || getarch
-	validatearch
-
-	# Set up default make(1) environment.
-	#
-	makeenv="${makeenv} TOOLDIR MACHINE MACHINE_ARCH MAKEFLAGS"
-	[ -z "${BUILDID}" ] || makeenv="${makeenv} BUILDID"
-	[ -z "${BUILDINFO}" ] || makeenv="${makeenv} BUILDINFO"
-	MAKEFLAGS="-de -m ${TOP}/share/mk ${MAKEFLAGS}"
-	MAKEFLAGS="${MAKEFLAGS} MKOBJDIRS=${MKOBJDIRS-yes}"
-	export MAKEFLAGS MACHINE MACHINE_ARCH
-	setmakeenv USETOOLS "yes"
-	setmakeenv MAKEWRAPPERMACHINE "${makewrappermachine:-${MACHINE}}"
-}
-
-# sanitycheck --
-# Sanity check after parsing command line options, before rebuildmake.
-#
-sanitycheck()
-{
-	# Install as non-root is a bad idea.
-	#
-	if ${do_install} && [ "$id_u" -ne 0 ] ; then
-		if ${do_expertmode}; then
-			warning "Will install as an unprivileged user."
-		else
-			bomb "-E must be set for install as an unprivileged user."
-		fi
-	fi
-
-	# If the PATH contains any non-absolute components (including,
-	# but not limited to, "." or ""), then complain.  As an exception,
-	# allow "" or "." as the last component of the PATH.  This is fatal
-	# if expert mode is not in effect.
-	#
-	local path="${PATH}"
-	path="${path%:}"	# delete trailing ":"
-	path="${path%:.}"	# delete trailing ":."
-	case ":${path}:/" in
-	*:[!/]*)
-		if ${do_expertmode}; then
-			warning "PATH contains non-absolute components"
-		else
-			bomb "PATH environment variable must not" \
-			     "contain non-absolute components"
-		fi
-		;;
-	esac
-}
-
-# print_tooldir_make --
-# Try to find and print a path to an existing
-# ${TOOLDIR}/bin/${toolprefix}make, for use by rebuildmake() before a
-# new version of ${toolprefix}make has been built.
-#
-# * If TOOLDIR was set in the environment or on the command line, use
-#   that value.
-# * Otherwise try to guess what TOOLDIR would be if not overridden by
-#   /etc/mk.conf, and check whether the resulting directory contains
-#   a copy of ${toolprefix}make (this should work for everybody who
-#   doesn't override TOOLDIR via /etc/mk.conf);
-# * Failing that, search for ${toolprefix}make, nbmake, bmake, or make,
-#   in the PATH (this might accidentally find a version of make that
-#   does not understand the syntax used by NetBSD make, and that will
-#   lead to failure in the next step);
-# * If a copy of make was found above, try to use it with
-#   nobomb_getmakevar to find the correct value for TOOLDIR, and believe the
-#   result only if it's a directory that already exists;
-# * If a value of TOOLDIR was found above, and if
-#   ${TOOLDIR}/bin/${toolprefix}make exists, print that value.
-#
-print_tooldir_make()
-{
-	local possible_TOP_OBJ
-	local possible_TOOLDIR
-	local possible_make
-	local tooldir_make
-
-	if [ -n "${TOOLDIR}" ]; then
-		echo "${TOOLDIR}/bin/${toolprefix}make"
-		return 0
-	fi
-
-	# Set host_ostype to something like "NetBSD-4.5.6-i386".  This
-	# is intended to match the HOST_OSTYPE variable in <bsd.own.mk>.
-	#
-	local host_ostype="${uname_s}-$(
-		echo "${uname_r}" | sed -e 's/([^)]*)//g' -e 's/ /_/g'
-		)-$(
-		echo "${uname_p}" | sed -e 's/([^)]*)//g' -e 's/ /_/g'
-		)"
-
-	# Look in a few potential locations for
-	# ${possible_TOOLDIR}/bin/${toolprefix}make.
-	# If we find it, then set possible_make.
-	#
-	# In the usual case (without interference from environment
-	# variables or /etc/mk.conf), <bsd.own.mk> should set TOOLDIR to
-	# "${_SRC_TOP_OBJ_}/tooldir.${host_ostype}".
-	#
-	# In practice it's difficult to figure out the correct value
-	# for _SRC_TOP_OBJ_.  In the easiest case, when the -M or -O
-	# options were passed to build.sh, then ${TOP_objdir} will be
-	# the correct value.  We also try a few other possibilities, but
-	# we do not replicate all the logic of <bsd.obj.mk>.
-	#
-	for possible_TOP_OBJ in \
-		"${TOP_objdir}" \
-		"${MAKEOBJDIRPREFIX:+${MAKEOBJDIRPREFIX}${TOP}}" \
-		"${TOP}" \
-		"${TOP}/obj" \
-		"${TOP}/obj.${MACHINE}"
-	do
-		[ -n "${possible_TOP_OBJ}" ] || continue
-		possible_TOOLDIR="${possible_TOP_OBJ}/tooldir.${host_ostype}"
-		possible_make="${possible_TOOLDIR}/bin/${toolprefix}make"
-		if [ -x "${possible_make}" ]; then
-			break
-		else
-			unset possible_make
-		fi
-	done
-
-	# If the above didn't work, search the PATH for a suitable
-	# ${toolprefix}make, nbmake, bmake, or make.
-	#
-	: ${possible_make:=$(find_in_PATH ${toolprefix}make '')}
-	: ${possible_make:=$(find_in_PATH nbmake '')}
-	: ${possible_make:=$(find_in_PATH bmake '')}
-	: ${possible_make:=$(find_in_PATH make '')}
-
-	# At this point, we don't care whether possible_make is in the
-	# correct TOOLDIR or not; we simply want it to be usable by
-	# getmakevar to help us find the correct TOOLDIR.
-	#
-	# Use ${possible_make} with nobomb_getmakevar to try to find
-	# the value of TOOLDIR.  Believe the result only if it's
-	# a directory that already exists and contains bin/${toolprefix}make.
-	#
-	if [ -x "${possible_make}" ]; then
-		possible_TOOLDIR="$(
-			make="${possible_make}" \
-			nobomb_getmakevar TOOLDIR 2>/dev/null
-			)"
-		if [ $? = 0 ] && [ -n "${possible_TOOLDIR}" ] \
-		    && [ -d "${possible_TOOLDIR}" ];
-		then
-			tooldir_make="${possible_TOOLDIR}/bin/${toolprefix}make"
-			if [ -x "${tooldir_make}" ]; then
-				echo "${tooldir_make}"
-				return 0
-			fi
-		fi
-	fi
-	return 1
-}
-
-# rebuildmake --
-# Rebuild nbmake in a temporary directory if necessary.  Sets $make
-# to a path to the nbmake executable.  Sets done_rebuildmake=true
-# if nbmake was rebuilt.
-#
-# There is a cyclic dependency between building nbmake and choosing
-# TOOLDIR: TOOLDIR may be affected by settings in /etc/mk.conf, so we
-# would like to use getmakevar to get the value of TOOLDIR; but we can't
-# use getmakevar before we have an up to date version of nbmake; we
-# might already have an up to date version of nbmake in TOOLDIR, but we
-# don't yet know where TOOLDIR is.
-#
-# The default value of TOOLDIR also depends on the location of the top
-# level object directory, so $(getmakevar TOOLDIR) invoked before or
-# after making the top level object directory may produce different
-# results.
-#
-# Strictly speaking, we should do the following:
-#
-#    1. build a new version of nbmake in a temporary directory;
-#    2. use the temporary nbmake to create the top level obj directory;
-#    3. use $(getmakevar TOOLDIR) with the temporary nbmake to
-#       get the correct value of TOOLDIR;
-#    4. move the temporary nbmake to ${TOOLDIR}/bin/nbmake.
-#
-# However, people don't like building nbmake unnecessarily if their
-# TOOLDIR has not changed since an earlier build.  We try to avoid
-# rebuilding a temporary version of nbmake by taking some shortcuts to
-# guess a value for TOOLDIR, looking for an existing version of nbmake
-# in that TOOLDIR, and checking whether that nbmake is newer than the
-# sources used to build it.
-#
-rebuildmake()
-{
-	make="$(print_tooldir_make)"
-	if [ -n "${make}" ] && [ -x "${make}" ]; then
-		for f in usr.bin/make/*.[ch] usr.bin/make/lst.lib/*.[ch]; do
-			if [ "${f}" -nt "${make}" ]; then
-				statusmsg "${make} outdated" \
-					"(older than ${f}), needs building."
-				do_rebuildmake=true
-				break
-			fi
-		done
-	else
-		statusmsg "No \$TOOLDIR/bin/${toolprefix}make, needs building."
-		do_rebuildmake=true
-	fi
-
-	# Build bootstrap ${toolprefix}make if needed.
-	if ${do_rebuildmake}; then
-		statusmsg "Bootstrapping ${toolprefix}make"
-		${runcmd} cd "${tmpdir}"
-		${runcmd} env CC="${HOST_CC-cc}" CPPFLAGS="${HOST_CPPFLAGS}" \
-			CFLAGS="${HOST_CFLAGS--O}" LDFLAGS="${HOST_LDFLAGS}" \
-			${HOST_SH} "${TOP}/tools/make/configure" ||
-		    ( cp ${tmpdir}/config.log ${tmpdir}-config.log
-		      bomb "Configure of ${toolprefix}make failed, see ${tmpdir}-config.log for details" )
-		${runcmd} ${HOST_SH} buildmake.sh ||
-		    bomb "Build of ${toolprefix}make failed"
-		make="${tmpdir}/${toolprefix}make"
-		${runcmd} cd "${TOP}"
-		${runcmd} rm -f usr.bin/make/*.o usr.bin/make/lst.lib/*.o
-		done_rebuildmake=true
-	fi
-}
-
-# validatemakeparams --
-# Perform some late sanity checks, after rebuildmake,
-# but before createmakewrapper or any real work.
-#
-# Creates the top-level obj directory, because that
-# is needed by some of the sanity checks.
-#
-# Prints status messages reporting the values of several variables.
-#
-validatemakeparams()
-{
-	# MAKECONF (which defaults to /etc/mk.conf in share/mk/bsd.own.mk)
-	# can affect many things, so mention it in an early status message.
-	#
-	MAKECONF=$(getmakevar MAKECONF)
-	if [ -e "${MAKECONF}" ]; then
-		statusmsg2 "MAKECONF file:" "${MAKECONF}"
-	else
-		statusmsg2 "MAKECONF file:" "${MAKECONF} (File not found)"
-	fi
-
-	# Normalise MKOBJDIRS, MKUNPRIVED, and MKUPDATE.
-	# These may be set as build.sh options or in "mk.conf".
-	# Don't export them as they're only used for tests in build.sh.
-	#
-	MKOBJDIRS=$(getmakevar MKOBJDIRS)
-	MKUNPRIVED=$(getmakevar MKUNPRIVED)
-	MKUPDATE=$(getmakevar MKUPDATE)
-
-	# Non-root should always use either the -U or -E flag.
-	#
-	if ! ${do_expertmode} && \
-	    [ "$id_u" -ne 0 ] && \
-	    [ "${MKUNPRIVED}" = "no" ] ; then
-		bomb "-U or -E must be set for build as an unprivileged user."
-	fi
-
-	if [ "${runcmd}" = "echo" ]; then
-		TOOLCHAIN_MISSING=no
-		EXTERNAL_TOOLCHAIN=""
-	else
-		TOOLCHAIN_MISSING=$(bomb_getmakevar TOOLCHAIN_MISSING)
-		EXTERNAL_TOOLCHAIN=$(bomb_getmakevar EXTERNAL_TOOLCHAIN)
-	fi
-	if [ "${TOOLCHAIN_MISSING}" = "yes" ] && \
-	   [ -z "${EXTERNAL_TOOLCHAIN}" ]; then
-		${runcmd} echo "ERROR: build.sh (in-tree cross-toolchain) is not yet available for"
-		${runcmd} echo "	MACHINE:      ${MACHINE}"
-		${runcmd} echo "	MACHINE_ARCH: ${MACHINE_ARCH}"
-		${runcmd} echo ""
-		${runcmd} echo "All builds for this platform should be done via a traditional make"
-		${runcmd} echo "If you wish to use an external cross-toolchain, set"
-		${runcmd} echo "	EXTERNAL_TOOLCHAIN=<path to toolchain root>"
-		${runcmd} echo "in either the environment or mk.conf and rerun"
-		${runcmd} echo "	${progname} $*"
-		exit 1
-	fi
-
-	if [ "${MKOBJDIRS}" != "no" ]; then
-		# Create the top-level object directory.
-		#
-		# "make obj NOSUBDIR=" can handle most cases, but it
-		# can't handle the case where MAKEOBJDIRPREFIX is set
-		# while the corresponding directory does not exist
-		# (rules in <bsd.obj.mk> would abort the build).  We
-		# therefore have to handle the MAKEOBJDIRPREFIX case
-		# without invoking "make obj".  The MAKEOBJDIR case
-		# could be handled either way, but we choose to handle
-		# it similarly to MAKEOBJDIRPREFIX.
-		#
-		if [ -n "${TOP_obj}" ]; then
-			# It must have been set by the "-M" or "-O"
-			# command line options, so there's no need to
-			# use getmakevar
-			:
-		elif [ -n "$MAKEOBJDIRPREFIX" ]; then
-			TOP_obj="$(getmakevar MAKEOBJDIRPREFIX)${TOP}"
-		elif [ -n "$MAKEOBJDIR" ]; then
-			TOP_obj="$(getmakevar MAKEOBJDIR)"
-		fi
-		if [ -n "$TOP_obj" ]; then
-			${runcmd} mkdir -p "${TOP_obj}" ||
-			    bomb "Can't create top level object directory" \
-					"${TOP_obj}"
-		else
-			${runcmd} "${make}" -m ${TOP}/share/mk obj NOSUBDIR= ||
-			    bomb "Can't create top level object directory" \
-					"using make obj"
-		fi
-
-		# make obj in tools to ensure that the objdir for "tools"
-		# is available.
-		#
-		${runcmd} cd tools
-		${runcmd} "${make}" -m ${TOP}/share/mk obj NOSUBDIR= ||
-		    bomb "Failed to make obj in tools"
-		${runcmd} cd "${TOP}"
-	fi
-
-	# Find TOOLDIR, DESTDIR, and RELEASEDIR, according to getmakevar,
-	# and bomb if they have changed from the values we had from the
-	# command line or environment.
-	#
-	# This must be done after creating the top-level object directory.
-	#
-	for var in TOOLDIR DESTDIR RELEASEDIR
-	do
-		eval oldval=\"\$${var}\"
-		newval="$(getmakevar $var)"
-		if ! $do_expertmode; then
-			: ${_SRC_TOP_OBJ_:=$(getmakevar _SRC_TOP_OBJ_)}
-			case "$var" in
-			DESTDIR)
-				: ${newval:=${_SRC_TOP_OBJ_}/destdir.${MACHINE}}
-				makeenv="${makeenv} DESTDIR"
-				;;
-			RELEASEDIR)
-				: ${newval:=${_SRC_TOP_OBJ_}/releasedir}
-				makeenv="${makeenv} RELEASEDIR"
-				;;
-			esac
-		fi
-		if [ -n "$oldval" ] && [ "$oldval" != "$newval" ]; then
-			bomb "Value of ${var} has changed" \
-				"(was \"${oldval}\", now \"${newval}\")"
-		fi
-		eval ${var}=\"\${newval}\"
-		eval export ${var}
-		statusmsg2 "${var} path:" "${newval}"
-	done
-
-	# RELEASEMACHINEDIR is just a subdir name, e.g. "i386".
-	RELEASEMACHINEDIR=$(getmakevar RELEASEMACHINEDIR)
-
-	# Check validity of TOOLDIR and DESTDIR.
-	#
-	if [ -z "${TOOLDIR}" ] || [ "${TOOLDIR}" = "/" ]; then
-		bomb "TOOLDIR '${TOOLDIR}' invalid"
-	fi
-	removedirs="${TOOLDIR}"
-
-	if [ -z "${DESTDIR}" ] || [ "${DESTDIR}" = "/" ]; then
-		if ${do_distribution} || ${do_release} || \
-		   ( [ "${uname_s}" != "NetBSD" ] && [ "${uname_s}" != "Minix" ] ) || \
-		   [ "${uname_m}" != "${MACHINE}" ]; then
-			bomb "DESTDIR must != / for cross builds, or ${progname} 'distribution' or 'release'."
-		fi
-		if ! ${do_expertmode}; then
-			bomb "DESTDIR must != / for non -E (expert) builds"
-		fi
-		statusmsg "WARNING: Building to /, in expert mode."
-		statusmsg "         This may cause your system to break!  Reasons include:"
-		statusmsg "            - your kernel is not up to date"
-		statusmsg "            - the libraries or toolchain have changed"
-		statusmsg "         YOU HAVE BEEN WARNED!"
-	else
-		removedirs="${removedirs} ${DESTDIR}"
-	fi
-	if ${do_releasekernel} && [ -z "${RELEASEDIR}" ]; then
-		bomb "Must set RELEASEDIR with \`releasekernel=...'"
-	fi
-
-	# If a previous build.sh run used -U (and therefore created a
-	# METALOG file), then most subsequent build.sh runs must also
-	# use -U.  If DESTDIR is about to be removed, then don't perform
-	# this check.
-	#
-	case "${do_removedirs} ${removedirs} " in
-	true*" ${DESTDIR} "*)
-		# DESTDIR is about to be removed
-		;;
-	*)
-		if [ -e "${DESTDIR}/METALOG" ] && \
-		    [ "${MKUNPRIVED}" = "no" ] ; then
-			if $do_expertmode; then
-				warning "A previous build.sh run specified -U."
-			else
-				bomb "A previous build.sh run specified -U; you must specify it again now."
-			fi
-		fi
-		;;
-	esac
-
-	# live-image and install-image targets require binary sets
-	# (actually DESTDIR/etc/mtree/set.* files) built with MKUNPRIVED.
-	# If release operation is specified with live-image or install-image,
-	# the release op should be performed with -U for later image ops.
-	#
-	if ${do_release} && ( ${do_live_image} || ${do_install_image} ) && \
-	    [ "${MKUNPRIVED}" = "no" ] ; then
-		bomb "-U must be specified on building release to create images later."
-	fi
-}
-
-
-createmakewrapper()
-{
-	# Remove the target directories.
-	#
-	if ${do_removedirs}; then
-		for f in ${removedirs}; do
-			statusmsg "Removing ${f}"
-			${runcmd} rm -r -f "${f}"
-		done
-	fi
-
-	# Recreate $TOOLDIR.
-	#
-	${runcmd} mkdir -p "${TOOLDIR}/bin" ||
-	    bomb "mkdir of '${TOOLDIR}/bin' failed"
-
-	# If we did not previously rebuild ${toolprefix}make, then
-	# check whether $make is still valid and the same as the output
-	# from print_tooldir_make.  If not, then rebuild make now.  A
-	# possible reason for this being necessary is that the actual
-	# value of TOOLDIR might be different from the value guessed
-	# before the top level obj dir was created.
-	#
-	if ! ${done_rebuildmake} && \
-	    ( [ ! -x "$make" ] || [ "$make" != "$(print_tooldir_make)" ] )
-	then
-		rebuildmake
-	fi
-
-	# Install ${toolprefix}make if it was built.
-	#
-	if ${done_rebuildmake}; then
-		${runcmd} rm -f "${TOOLDIR}/bin/${toolprefix}make"
-		${runcmd} cp "${make}" "${TOOLDIR}/bin/${toolprefix}make" ||
-		    bomb "Failed to install \$TOOLDIR/bin/${toolprefix}make"
-		make="${TOOLDIR}/bin/${toolprefix}make"
-		statusmsg "Created ${make}"
-	fi
-
-	# Build a ${toolprefix}make wrapper script, usable by hand as
-	# well as by build.sh.
-	#
-	if [ -z "${makewrapper}" ]; then
-		makewrapper="${TOOLDIR}/bin/${toolprefix}make-${makewrappermachine:-${MACHINE}}"
-		[ -z "${BUILDID}" ] || makewrapper="${makewrapper}-${BUILDID}"
-	fi
-
-	${runcmd} rm -f "${makewrapper}"
-	if [ "${runcmd}" = "echo" ]; then
-		echo 'cat <<EOF >'${makewrapper}
-		makewrapout=
-	else
-		makewrapout=">>\${makewrapper}"
-	fi
-
-	case "${KSH_VERSION:-${SH_VERSION}}" in
-	*PD\ KSH*|*MIRBSD\ KSH*)
-		set +o braceexpand
-		;;
-	esac
-
-	eval cat <<EOF ${makewrapout}
-#! ${HOST_SH}
-# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.308 2015/06/27 06:00:28 matt Exp $
-# with these arguments: ${_args}
-#
-
-EOF
-	{
-		sorted_vars="$(for var in ${makeenv}; do echo "${var}" ; done \
-			| sort -u )"
-		for var in ${sorted_vars}; do
-			eval val=\"\${${var}}\"
-			eval is_set=\"\${${var}+set}\"
-			if [ -z "${is_set}" ]; then
-				echo "unset ${var}"
-			else
-				qval="$(shell_quote "${val}")"
-				echo "${var}=${qval}; export ${var}"
-			fi
-		done
-
-		eval cat <<EOF
-MAKEWRAPPERMACHINE=${makewrappermachine:-${MACHINE}}; export MAKEWRAPPERMACHINE
-USETOOLS=yes; export USETOOLS
-# LSC We are cross compiling, so do not install to root!
-MKINSTALLBOOT=no; export MKINSTALLBOOT
-EOF
-	} | eval sort -u "${makewrapout}"
-	eval cat <<EOF "${makewrapout}"
-
-exec "\${TOOLDIR}/bin/${toolprefix}make" \${1+"\$@"}
-EOF
-	[ "${runcmd}" = "echo" ] && echo EOF
-	${runcmd} chmod +x "${makewrapper}"
-	statusmsg2 "Updated makewrapper:" "${makewrapper}"
-}
-
-make_in_dir()
-{
-	dir="$1"
-	op="$2"
-	${runcmd} cd "${dir}" ||
-	    bomb "Failed to cd to \"${dir}\""
-	${runcmd} "${makewrapper}" ${parallel} ${op} ||
-	    bomb "Failed to make ${op} in \"${dir}\""
-	${runcmd} cd "${TOP}" ||
-	    bomb "Failed to cd back to \"${TOP}\""
-}
-
-buildtools()
-{
-	if [ "${MKOBJDIRS}" != "no" ]; then
-		${runcmd} "${makewrapper}" ${parallel} obj-tools ||
-		    bomb "Failed to make obj-tools"
-	fi
-	if [ "${MKUPDATE}" = "no" ]; then
-		make_in_dir tools cleandir
-	fi
-	make_in_dir tools build_install
-	statusmsg "Tools built to ${TOOLDIR}"
-}
-
-getkernelconf()
-{
-	kernelconf="$1"
-	if [ "${MKOBJDIRS}" != "no" ]; then
-		# The correct value of KERNOBJDIR might
-		# depend on a prior "make obj" in
-		# ${KERNSRCDIR}/${KERNARCHDIR}/compile.
-		#
-		KERNSRCDIR="$(getmakevar KERNSRCDIR)"
-		KERNARCHDIR="$(getmakevar KERNARCHDIR)"
-		make_in_dir "${KERNSRCDIR}/${KERNARCHDIR}/compile" obj
-	fi
-	KERNCONFDIR="$(getmakevar KERNCONFDIR)"
-	KERNOBJDIR="$(getmakevar KERNOBJDIR)"
-	case "${kernelconf}" in
-	*/*)
-		kernelconfpath="${kernelconf}"
-		kernelconfname="${kernelconf##*/}"
-		;;
-	*)
-		kernelconfpath="${KERNCONFDIR}/${kernelconf}"
-		kernelconfname="${kernelconf}"
-		;;
-	esac
-	kernelbuildpath="${KERNOBJDIR}/${kernelconfname}"
-}
-
-diskimage()
-{
-	ARG="$(echo $1 | tr '[:lower:]' '[:upper:]')"
-	[ -f "${DESTDIR}/etc/mtree/set.base" ] || 
-	    bomb "The release binaries must be built first"
-	kerneldir="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel"
-	kernel="${kerneldir}/netbsd-${ARG}.gz"
-	[ -f "${kernel}" ] ||
-	    bomb "The kernel ${kernel} must be built first"
-	make_in_dir "${NETBSDSRCDIR}/etc" "smp_${1}"
-}
-
-buildkernel()
-{
-	if ! ${do_tools} && ! ${buildkernelwarned:-false}; then
-		# Building tools every time we build a kernel is clearly
-		# unnecessary.  We could try to figure out whether rebuilding
-		# the tools is necessary this time, but it doesn't seem worth
-		# the trouble.  Instead, we say it's the user's responsibility
-		# to rebuild the tools if necessary.
-		#
-		statusmsg "Building kernel without building new tools"
-		buildkernelwarned=true
-	fi
-	getkernelconf $1
-	statusmsg2 "Building kernel:" "${kernelconf}"
-	statusmsg2 "Build directory:" "${kernelbuildpath}"
-	${runcmd} mkdir -p "${kernelbuildpath}" ||
-	    bomb "Cannot mkdir: ${kernelbuildpath}"
-	if [ "${MKUPDATE}" = "no" ]; then
-		make_in_dir "${kernelbuildpath}" cleandir
-	fi
-	[ -x "${TOOLDIR}/bin/${toolprefix}config" ] \
-	|| bomb "${TOOLDIR}/bin/${toolprefix}config does not exist. You need to \"$0 tools\" first."
-	CONFIGOPTS=$(getmakevar CONFIGOPTS)
-	${runcmd} "${TOOLDIR}/bin/${toolprefix}config" ${CONFIGOPTS} \
-		-b "${kernelbuildpath}" -s "${TOP}/sys" ${configopts} \
-		"${kernelconfpath}" ||
-	    bomb "${toolprefix}config failed for ${kernelconf}"
-	make_in_dir "${kernelbuildpath}" depend
-	make_in_dir "${kernelbuildpath}" all
-
-	if [ "${runcmd}" != "echo" ]; then
-		statusmsg "Kernels built from ${kernelconf}:"
-		kernlist=$(awk '$1 == "config" { print $2 }' ${kernelconfpath})
-		for kern in ${kernlist:-netbsd}; do
-			[ -f "${kernelbuildpath}/${kern}" ] && \
-			    echo "  ${kernelbuildpath}/${kern}"
-		done | tee -a "${results}"
-	fi
-}
-
-releasekernel()
-{
-	getkernelconf $1
-	kernelreldir="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel"
-	${runcmd} mkdir -p "${kernelreldir}"
-	kernlist=$(awk '$1 == "config" { print $2 }' ${kernelconfpath})
-	for kern in ${kernlist:-netbsd}; do
-		builtkern="${kernelbuildpath}/${kern}"
-		[ -f "${builtkern}" ] || continue
-		releasekern="${kernelreldir}/${kern}-${kernelconfname}.gz"
-		statusmsg2 "Kernel copy:" "${releasekern}"
-		if [ "${runcmd}" = "echo" ]; then
-			echo "gzip -c -9 < ${builtkern} > ${releasekern}"
-		else
-			gzip -c -9 < "${builtkern}" > "${releasekern}"
-		fi
-	done
-}
-
-buildkernels()
-{
-	allkernels=$( runcmd= make_in_dir etc '-V ${ALL_KERNELS}' )
-	for k in $allkernels; do
-		buildkernel "${k}"
-	done
-}
-
-buildmodules()
-{
-	setmakeenv MKBINUTILS no
-	if ! ${do_tools} && ! ${buildmoduleswarned:-false}; then
-		# Building tools every time we build modules is clearly
-		# unnecessary as well as a kernel.
-		#
-		statusmsg "Building modules without building new tools"
-		buildmoduleswarned=true
-	fi
-
-	statusmsg "Building kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}"
-	if [ "${MKOBJDIRS}" != "no" ]; then
-		make_in_dir sys/modules obj
-	fi
-	if [ "${MKUPDATE}" = "no" ]; then
-		make_in_dir sys/modules cleandir
-	fi
-	make_in_dir sys/modules dependall
-	make_in_dir sys/modules install
-
-	statusmsg "Successful build of kernel modules for NetBSD/${MACHINE} ${DISTRIBVER}"
-}
-
-installmodules()
-{
-	dir="$1"
-	${runcmd} "${makewrapper}" INSTALLMODULESDIR="${dir}" installmodules ||
-	    bomb "Failed to make installmodules to ${dir}"
-	statusmsg "Successful installmodules to ${dir}"
-}
-
-installworld()
-{
-	dir="$1"
-	${runcmd} "${makewrapper}" INSTALLWORLDDIR="${dir}" installworld ||
-	    bomb "Failed to make installworld to ${dir}"
-	statusmsg "Successful installworld to ${dir}"
-}
-
-# Run rump build&link tests.
-#
-# To make this feasible for running without having to install includes and
-# libraries into destdir (i.e. quick), we only run ld.  This is possible
-# since the rump kernel is a closed namespace apart from calls to rumpuser.
-# Therefore, if ld complains only about rumpuser symbols, rump kernel
-# linking was successful.
-#
-# We test that rump links with a number of component configurations.
-# These attempt to mimic what is encountered in the full build.
-# See list below.  The list should probably be either autogenerated
-# or managed elsewhere; keep it here until a better idea arises.
-#
-# Above all, note that THIS IS NOT A SUBSTITUTE FOR A FULL BUILD.
-#
-
-RUMP_LIBSETS='
-	-lrump,
-	-lrumpvfs -lrump,
-	-lrumpvfs -lrumpdev -lrump,
-	-lrumpnet -lrump,
-	-lrumpkern_tty -lrumpvfs -lrump,
-	-lrumpfs_tmpfs -lrumpvfs -lrump,
-	-lrumpfs_ffs -lrumpfs_msdos -lrumpvfs -lrumpdev_disk -lrumpdev -lrump,
-	-lrumpnet_virtif -lrumpnet_netinet -lrumpnet_net -lrumpnet -lrump,
-	-lrumpnet_sockin -lrumpfs_smbfs -lrumpdev_netsmb
-	    -lrumpkern_crypto -lrumpdev -lrumpnet -lrumpvfs -lrump,
-	-lrumpnet_sockin -lrumpfs_nfs -lrumpnet -lrumpvfs -lrump,
-	-lrumpdev_cgd -lrumpdev_raidframe -lrumpdev_disk -lrumpdev_rnd
-	    -lrumpdev_dm -lrumpdev -lrumpvfs -lrumpkern_crypto -lrump'
-dorump()
-{
-	local doclean=""
-	local doobjs=""
-
-	# we cannot link libs without building csu, and that leads to lossage
-	[ "${1}" != "rumptest" ] && bomb 'build.sh rump not yet functional. ' \
-	    'did you mean "rumptest"?'
-
-	export RUMPKERN_ONLY=1
-	# create obj and distrib dirs
-	if [ "${MKOBJDIRS}" != "no" ]; then
-		make_in_dir "${NETBSDSRCDIR}/etc/mtree" obj
-		make_in_dir "${NETBSDSRCDIR}/sys/rump" obj
-	fi
-	${runcmd} "${makewrapper}" ${parallel} do-distrib-dirs \
-	    || bomb 'could not create distrib-dirs'
-
-	[ "${MKUPDATE}" = "no" ] && doclean="cleandir"
-	targlist="${doclean} ${doobjs} dependall install"
-	# optimize: for test we build only static libs (3x test speedup)
-	if [ "${1}" = "rumptest" ] ; then
-		setmakeenv NOPIC 1
-		setmakeenv NOPROFILE 1
-	fi
-	for cmd in ${targlist} ; do
-		make_in_dir "${NETBSDSRCDIR}/sys/rump" ${cmd}
-	done
-
-	# if we just wanted to build & install rump, we're done
-	[ "${1}" != "rumptest" ] && return
-
-	${runcmd} cd "${NETBSDSRCDIR}/sys/rump/librump/rumpkern" \
-	    || bomb "cd to rumpkern failed"
-	md_quirks=`${runcmd} "${makewrapper}" -V '${_SYMQUIRK}'`
-	# one little, two little, three little backslashes ...
-	md_quirks="$(echo ${md_quirks} | sed 's,\\,\\\\,g'";s/'//g" )"
-	${runcmd} cd "${TOP}" || bomb "cd to ${TOP} failed"
-	tool_ld=`${runcmd} "${makewrapper}" -V '${LD}'`
-
-	local oIFS="${IFS}"
-	IFS=","
-	for set in ${RUMP_LIBSETS} ; do
-		IFS="${oIFS}"
-		${runcmd} ${tool_ld} -nostdlib -L${DESTDIR}/usr/lib	\
-		    -static --whole-archive ${set} 2>&1 -o /tmp/rumptest.$$ | \
-		      awk -v quirks="${md_quirks}" '
-			/undefined reference/ &&
-			    !/more undefined references.*follow/{
-				if (match($NF,
-				    "`(rumpuser_|rumpcomp_|__" quirks ")") == 0)
-					fails[NR] = $0
-			}
-			/cannot find -l/{fails[NR] = $0}
-			/cannot open output file/{fails[NR] = $0}
-			END{
-				for (x in fails)
-					print fails[x]
-				exit x!=0
-			}'
-		[ $? -ne 0 ] && bomb "Testlink of rump failed: ${set}"
-	done
-	statusmsg "Rump build&link tests successful"
-}
-
-main()
-{
-	initdefaults
-	_args=$@
-	parseoptions "$@"
-
-	sanitycheck
-
-	build_start=$(date)
-	statusmsg2 "${progname} command:" "$0 $*"
-	statusmsg2 "${progname} started:" "${build_start}"
-	statusmsg2 "MINIX version:"    "${DISTRIBVER}"
-	statusmsg2 "MACHINE:"          "${MACHINE}"
-	statusmsg2 "MACHINE_ARCH:"     "${MACHINE_ARCH}"
-	statusmsg2 "Build platform:"   "${uname_s} ${uname_r} ${uname_m}"
-	statusmsg2 "HOST_SH:"          "${HOST_SH}"
-	if [ -n "${BUILDID}" ]; then
-		statusmsg2 "BUILDID:"  "${BUILDID}"
-	fi
-	if [ -n "${BUILDINFO}" ]; then
-		printf "%b\n" "${BUILDINFO}" | \
-		while read -r line ; do
-			[ -s "${line}" ] && continue
-			statusmsg2 "BUILDINFO:"  "${line}"
-		done
-	fi
-
-	rebuildmake
-	validatemakeparams
-	createmakewrapper
-
-	# Perform the operations.
-	#
-	for op in ${operations}; do
-		case "${op}" in
-
-		makewrapper)
-			# no-op
-			;;
-
-		tools)
-			buildtools
-			;;
-
-		sets)
-			statusmsg "Building sets from pre-populated ${DESTDIR}"
-			${runcmd} "${makewrapper}" ${parallel} ${op} ||
-			    bomb "Failed to make ${op}"
-			setdir=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
-			statusmsg "Built sets to ${setdir}"
-			;;
-
-		cleandir|obj|build|distribution|release|sourcesets|syspkgs|show-params)
-			${runcmd} "${makewrapper}" ${parallel} ${op} ||
-			    bomb "Failed to make ${op}"
-			statusmsg "Successful make ${op}"
-			;;
-
-		iso-image|iso-image-source)
-			${runcmd} "${makewrapper}" ${parallel} \
-			    CDEXTRA="$CDEXTRA" ${op} ||
-			    bomb "Failed to make ${op}"
-			statusmsg "Successful make ${op}"
-			;;
-
-		live-image|install-image)
-			# install-image and live-image require mtree spec files
-			# built with UNPRIVED.  Assume UNPRIVED build has been
-			# performed if METALOG file is created in DESTDIR.
-			if [ ! -e "${DESTDIR}/METALOG" ] ; then
-				bomb "The release binaries must have been built with -U to create images."
-			fi
-			${runcmd} "${makewrapper}" ${parallel} ${op} ||
-			    bomb "Failed to make ${op}"
-			statusmsg "Successful make ${op}"
-			;;
-		kernel=*)
-			arg=${op#*=}
-			buildkernel "${arg}"
-			;;
-		kernel.gdb=*)
-			arg=${op#*=}
-			configopts="-D DEBUG=-g"
-			buildkernel "${arg}"
-			;;
-		releasekernel=*)
-			arg=${op#*=}
-			releasekernel "${arg}"
-			;;
-
-		kernels)
-			buildkernels
-			;;
-
-		disk-image=*)
-			arg=${op#*=}
-			diskimage "${arg}"
-			;;
-
-		modules)
-			buildmodules
-			;;
-
-		installmodules=*)
-			arg=${op#*=}
-			if [ "${arg}" = "/" ] && \
-			    (	( [ "${uname_s}" != "NetBSD" ] && [ "${uname_s}" != "Minix" ] ) || \
-				[ "${uname_m}" != "${MACHINE}" ] ); then
-				bomb "'${op}' must != / for cross builds."
-			fi
-			installmodules "${arg}"
-			;;
-
-		install=*)
-			arg=${op#*=}
-			if [ "${arg}" = "/" ] && \
-			    (	( [ "${uname_s}" != "NetBSD" ] && [ "${uname_s}" != "Minix" ] ) || \
-				[ "${uname_m}" != "${MACHINE}" ] ); then
-				bomb "'${op}' must != / for cross builds."
-			fi
-			installworld "${arg}"
-			;;
-
-		rump|rumptest)
-			dorump "${op}"
-			;;
-
-		*)
-			bomb "Unknown operation \`${op}'"
-			;;
-
-		esac
-	done
-
-	statusmsg2 "${progname} ended:" "$(date)"
-	if [ -s "${results}" ]; then
-		echo "===> Summary of results:"
-		sed -e 's/^===>//;s/^/	/' "${results}"
-		echo "===> ."
-	fi
-}
-
-main "$@"
diff --git a/build/bin/.gitignore b/build/bin/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/build/bin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/build/lib/.gitignore b/build/lib/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/build/lib/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/build/libexec/.gitignore b/build/libexec/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/build/libexec/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/etc/motd b/etc/motd
deleted file mode 100644
index f5a6ac4..0000000
--- a/etc/motd
+++ /dev/null
@@ -1,12 +0,0 @@
-Welcome to UbixOS
-
-This is an experimental kernel so it has the potential
-to crash if it does please send us some info so we can
-fix it or if you have access to the source fix it and
-commit the changes.
-
-All reports can be sent to cwolsen@ubixos.com
-
-NOTICE!!!!! 
-
-This is now 2016 and we're working again!
diff --git a/etc/userdb b/etc/userdb
deleted file mode 100644
index ed464e7..0000000
--- a/etc/userdb
+++ /dev/null
Binary files differ
diff --git a/include.new/Block.h b/include.new/Block.h
deleted file mode 100644
index 55cdd01..0000000
--- a/include.new/Block.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Block.h
- *
- * Copyright 2008-2010 Apple, Inc. Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the following
- * conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _BLOCK_H_
-#define _BLOCK_H_
-
-#if !defined(BLOCK_EXPORT)
-#   if defined(__cplusplus)
-#       define BLOCK_EXPORT extern "C" 
-#   else
-#       define BLOCK_EXPORT extern
-#   endif
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-/* Create a heap based copy of a Block or simply add a reference to an existing one.
- * This must be paired with Block_release to recover memory, even when running
- * under Objective-C Garbage Collection.
- */
-BLOCK_EXPORT void *_Block_copy(const void *aBlock);
-
-/* Lose the reference, and if heap based and last reference, recover the memory. */
-BLOCK_EXPORT void _Block_release(const void *aBlock);
-
-#if defined(__cplusplus)
-}
-#endif
-
-/* Type correct macros. */
-
-#define Block_copy(...) ((__typeof(__VA_ARGS__))_Block_copy((const void *)(__VA_ARGS__)))
-#define Block_release(...) _Block_release((const void *)(__VA_ARGS__))
-
-
-#endif
diff --git a/include.new/Block_private.h b/include.new/Block_private.h
deleted file mode 100644
index 8ae8218..0000000
--- a/include.new/Block_private.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Block_private.h
- *
- * Copyright 2008-2010 Apple, Inc. Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the following
- * conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- */
-
-#ifndef _BLOCK_PRIVATE_H_
-#define _BLOCK_PRIVATE_H_
-
-#if !defined(BLOCK_EXPORT)
-#   if defined(__cplusplus)
-#       define BLOCK_EXPORT extern "C" 
-#   else
-#       define BLOCK_EXPORT extern
-#   endif
-#endif
-
-#ifndef _MSC_VER
-#include <stdbool.h>
-#else
-/* MSVC doesn't have <stdbool.h>. Compensate. */
-typedef char bool;
-#define true (bool)1
-#define false (bool)0
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-
-enum {
-    BLOCK_REFCOUNT_MASK =     (0xffff),
-    BLOCK_NEEDS_FREE =        (1 << 24),
-    BLOCK_HAS_COPY_DISPOSE =  (1 << 25),
-    BLOCK_HAS_CTOR =          (1 << 26), /* Helpers have C++ code. */
-    BLOCK_IS_GC =             (1 << 27),
-    BLOCK_IS_GLOBAL =         (1 << 28),
-    BLOCK_HAS_DESCRIPTOR =    (1 << 29)
-};
-
-
-/* Revised new layout. */
-struct Block_descriptor {
-    unsigned long int reserved;
-    unsigned long int size;
-    void (*copy)(void *dst, void *src);
-    void (*dispose)(void *);
-};
-
-
-struct Block_layout {
-    void *isa;
-    int flags;
-    int reserved; 
-    void (*invoke)(void *, ...);
-    struct Block_descriptor *descriptor;
-    /* Imported variables. */
-};
-
-
-struct Block_byref {
-    void *isa;
-    struct Block_byref *forwarding;
-    int flags; /* refcount; */
-    int size;
-    void (*byref_keep)(struct Block_byref *dst, struct Block_byref *src);
-    void (*byref_destroy)(struct Block_byref *);
-    /* long shared[0]; */
-};
-
-
-struct Block_byref_header {
-    void *isa;
-    struct Block_byref *forwarding;
-    int flags;
-    int size;
-};
-
-
-/* Runtime support functions used by compiler when generating copy/dispose helpers. */
-
-enum {
-    /* See function implementation for a more complete description of these fields and combinations */
-    BLOCK_FIELD_IS_OBJECT   =  3,  /* id, NSObject, __attribute__((NSObject)), block, ... */
-    BLOCK_FIELD_IS_BLOCK    =  7,  /* a block variable */
-    BLOCK_FIELD_IS_BYREF    =  8,  /* the on stack structure holding the __block variable */
-    BLOCK_FIELD_IS_WEAK     = 16,  /* declared __weak, only used in byref copy helpers */
-    BLOCK_BYREF_CALLER      = 128  /* called from __block (byref) copy/dispose support routines. */
-};
-
-/* Runtime entry point called by compiler when assigning objects inside copy helper routines */
-BLOCK_EXPORT void _Block_object_assign(void *destAddr, const void *object, const int flags);
-    /* BLOCK_FIELD_IS_BYREF is only used from within block copy helpers */
-
-
-/* runtime entry point called by the compiler when disposing of objects inside dispose helper routine */
-BLOCK_EXPORT void _Block_object_dispose(const void *object, const int flags);
-
-
-
-/* Other support functions */
-
-/* Runtime entry to get total size of a closure */
-BLOCK_EXPORT unsigned long int Block_size(void *block_basic);
-
-
-
-/* the raw data space for runtime classes for blocks */
-/* class+meta used for stack, malloc, and collectable based blocks */
-BLOCK_EXPORT void * _NSConcreteStackBlock[32];
-BLOCK_EXPORT void * _NSConcreteMallocBlock[32];
-BLOCK_EXPORT void * _NSConcreteAutoBlock[32];
-BLOCK_EXPORT void * _NSConcreteFinalizingBlock[32];
-BLOCK_EXPORT void * _NSConcreteGlobalBlock[32];
-BLOCK_EXPORT void * _NSConcreteWeakBlockVariable[32];
-
-
-/* the intercept routines that must be used under GC */
-BLOCK_EXPORT void _Block_use_GC( void *(*alloc)(const unsigned long, const bool isOne, const bool isObject),
-                                  void (*setHasRefcount)(const void *, const bool),
-                                  void (*gc_assign_strong)(void *, void **),
-                                  void (*gc_assign_weak)(const void *, void *),
-                                  void (*gc_memmove)(void *, void *, unsigned long));
-
-/* earlier version, now simply transitional */
-BLOCK_EXPORT void _Block_use_GC5( void *(*alloc)(const unsigned long, const bool isOne, const bool isObject),
-                                  void (*setHasRefcount)(const void *, const bool),
-                                  void (*gc_assign_strong)(void *, void **),
-                                  void (*gc_assign_weak)(const void *, void *));
-
-BLOCK_EXPORT void _Block_use_RR( void (*retain)(const void *),
-                                 void (*release)(const void *));
-
-/* make a collectable GC heap based Block.  Not useful under non-GC. */
-BLOCK_EXPORT void *_Block_copy_collectable(const void *aBlock);
-
-/* thread-unsafe diagnostic */
-BLOCK_EXPORT const char *_Block_dump(const void *block);
-
-
-/* Obsolete */
-
-/* first layout */
-struct Block_basic {
-    void *isa;
-    int Block_flags;  /* int32_t */
-    int Block_size;  /* XXX should be packed into Block_flags */
-    void (*Block_invoke)(void *);
-    void (*Block_copy)(void *dst, void *src);  /* iff BLOCK_HAS_COPY_DISPOSE */
-    void (*Block_dispose)(void *);             /* iff BLOCK_HAS_COPY_DISPOSE */
-    /* long params[0];  // where const imports, __block storage references, etc. get laid down */
-};
-
-
-#if defined(__cplusplus)
-}
-#endif
-
-
-#endif /* _BLOCK_PRIVATE_H_ */
diff --git a/include.new/FlexLexer.h b/include.new/FlexLexer.h
deleted file mode 100644
index bad4ce0..0000000
--- a/include.new/FlexLexer.h
+++ /dev/null
@@ -1,206 +0,0 @@
-// -*-C++-*-
-// FlexLexer.h -- define interfaces for lexical analyzer classes generated
-// by flex
-
-// Copyright (c) 1993 The Regents of the University of California.
-// All rights reserved.
-//
-// This code is derived from software contributed to Berkeley by
-// Kent Williams and Tom Epperly.
-//
-//  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.
-
-//  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 ``AS IS'' AND WITHOUT ANY EXPRESS OR
-//  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-//  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-//  PURPOSE.
-
-// This file defines FlexLexer, an abstract class which specifies the
-// external interface provided to flex C++ lexer objects, and yyFlexLexer,
-// which defines a particular lexer class.
-//
-// If you want to create multiple lexer classes, you use the -P flag
-// to rename each yyFlexLexer to some other xxFlexLexer.  You then
-// include <FlexLexer.h> in your other sources once per lexer class:
-//
-//	#undef yyFlexLexer
-//	#define yyFlexLexer xxFlexLexer
-//	#include <FlexLexer.h>
-//
-//	#undef yyFlexLexer
-//	#define yyFlexLexer zzFlexLexer
-//	#include <FlexLexer.h>
-//	...
-
-#ifndef __FLEX_LEXER_H
-// Never included before - need to define base class.
-#define __FLEX_LEXER_H
-
-#include <iostream>
-#  ifndef FLEX_STD
-#    define FLEX_STD std::
-#  endif
-
-extern "C++" {
-
-struct yy_buffer_state;
-typedef int yy_state_type;
-
-class FlexLexer {
-public:
-	virtual ~FlexLexer()	{ }
-
-	const char* YYText() const	{ return yytext; }
-	int YYLeng()	const	{ return yyleng; }
-
-	virtual void
-		yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
-	virtual struct yy_buffer_state*
-		yy_create_buffer( FLEX_STD istream* s, int size ) = 0;
-	virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
-	virtual void yyrestart( FLEX_STD istream* s ) = 0;
-
-	virtual int yylex() = 0;
-
-	// Call yylex with new input/output sources.
-	int yylex( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0 )
-		{
-		switch_streams( new_in, new_out );
-		return yylex();
-		}
-
-	// Switch to new input/output streams.  A nil stream pointer
-	// indicates "keep the current one".
-	virtual void switch_streams( FLEX_STD istream* new_in = 0,
-					FLEX_STD ostream* new_out = 0 ) = 0;
-
-	int lineno() const		{ return yylineno; }
-
-	int debug() const		{ return yy_flex_debug; }
-	void set_debug( int flag )	{ yy_flex_debug = flag; }
-
-protected:
-	char* yytext;
-	int yyleng;
-	int yylineno;		// only maintained if you use %option yylineno
-	int yy_flex_debug;	// only has effect with -d or "%option debug"
-};
-
-}
-#endif // FLEXLEXER_H
-
-#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
-// Either this is the first time through (yyFlexLexerOnce not defined),
-// or this is a repeated include to define a different flavor of
-// yyFlexLexer, as discussed in the flex manual.
-#define yyFlexLexerOnce
-
-extern "C++" {
-
-class yyFlexLexer : public FlexLexer {
-public:
-	// arg_yyin and arg_yyout default to the cin and cout, but we
-	// only make that assignment when initializing in yylex().
-	yyFlexLexer( FLEX_STD istream* arg_yyin = 0, FLEX_STD ostream* arg_yyout = 0 );
-
-	virtual ~yyFlexLexer();
-
-	void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
-	struct yy_buffer_state* yy_create_buffer( FLEX_STD istream* s, int size );
-	void yy_delete_buffer( struct yy_buffer_state* b );
-	void yyrestart( FLEX_STD istream* s );
-
-	void yypush_buffer_state( struct yy_buffer_state* new_buffer );
-	void yypop_buffer_state();
-
-	virtual int yylex();
-	virtual void switch_streams( FLEX_STD istream* new_in, FLEX_STD ostream* new_out = 0 );
-	virtual int yywrap();
-
-protected:
-	virtual int LexerInput( char* buf, int max_size );
-	virtual void LexerOutput( const char* buf, int size );
-	virtual void LexerError( const char* msg );
-
-	void yyunput( int c, char* buf_ptr );
-	int yyinput();
-
-	void yy_load_buffer_state();
-	void yy_init_buffer( struct yy_buffer_state* b, FLEX_STD istream* s );
-	void yy_flush_buffer( struct yy_buffer_state* b );
-
-	int yy_start_stack_ptr;
-	int yy_start_stack_depth;
-	int* yy_start_stack;
-
-	void yy_push_state( int new_state );
-	void yy_pop_state();
-	int yy_top_state();
-
-	yy_state_type yy_get_previous_state();
-	yy_state_type yy_try_NUL_trans( yy_state_type current_state );
-	int yy_get_next_buffer();
-
-	FLEX_STD istream* yyin;	// input source for default LexerInput
-	FLEX_STD ostream* yyout;	// output sink for default LexerOutput
-
-	// yy_hold_char holds the character lost when yytext is formed.
-	char yy_hold_char;
-
-	// Number of characters read into yy_ch_buf.
-	int yy_n_chars;
-
-	// Points to current character in buffer.
-	char* yy_c_buf_p;
-
-	int yy_init;		// whether we need to initialize
-	int yy_start;		// start state number
-
-	// Flag which is used to allow yywrap()'s to do buffer switches
-	// instead of setting up a fresh yyin.  A bit of a hack ...
-	int yy_did_buffer_switch_on_eof;
-
-
-	size_t yy_buffer_stack_top; /**< index of top of stack. */
-	size_t yy_buffer_stack_max; /**< capacity of stack. */
-	struct yy_buffer_state ** yy_buffer_stack; /**< Stack as an array. */
-	void yyensure_buffer_stack(void);
-
-	// The following are not always needed, but may be depending
-	// on use of certain flex features (like REJECT or yymore()).
-
-	yy_state_type yy_last_accepting_state;
-	char* yy_last_accepting_cpos;
-
-	yy_state_type* yy_state_buf;
-	yy_state_type* yy_state_ptr;
-
-	char* yy_full_match;
-	int* yy_full_state;
-	int yy_full_lp;
-
-	int yy_lp;
-	int yy_looking_for_trail_begin;
-
-	int yy_more_flag;
-	int yy_more_len;
-	int yy_more_offset;
-	int yy_prev_more_offset;
-};
-
-}
-
-#endif // yyFlexLexer || ! yyFlexLexerOnce
-
diff --git a/include.new/_ctype.h b/include.new/_ctype.h
deleted file mode 100644
index 8ed4b86..0000000
--- a/include.new/_ctype.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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. 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.
- *
- * From @(#)ctype.h	8.4 (Berkeley) 1/21/94
- * From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp
- * $FreeBSD: releng/10.2/include/_ctype.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef __CTYPE_H_
-#define	__CTYPE_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#define	_CTYPE_A	0x00000100L		/* Alpha */
-#define	_CTYPE_C	0x00000200L		/* Control */
-#define	_CTYPE_D	0x00000400L		/* Digit */
-#define	_CTYPE_G	0x00000800L		/* Graph */
-#define	_CTYPE_L	0x00001000L		/* Lower */
-#define	_CTYPE_P	0x00002000L		/* Punct */
-#define	_CTYPE_S	0x00004000L		/* Space */
-#define	_CTYPE_U	0x00008000L		/* Upper */
-#define	_CTYPE_X	0x00010000L		/* X digit */
-#define	_CTYPE_B	0x00020000L		/* Blank */
-#define	_CTYPE_R	0x00040000L		/* Print */
-#define	_CTYPE_I	0x00080000L		/* Ideogram */
-#define	_CTYPE_T	0x00100000L		/* Special */
-#define	_CTYPE_Q	0x00200000L		/* Phonogram */
-#define	_CTYPE_SW0	0x20000000L		/* 0 width character */
-#define	_CTYPE_SW1	0x40000000L		/* 1 width character */
-#define	_CTYPE_SW2	0x80000000L		/* 2 width character */
-#define	_CTYPE_SW3	0xc0000000L		/* 3 width character */
-#define	_CTYPE_SWM	0xe0000000L		/* Mask for screen width data */
-#define	_CTYPE_SWS	30			/* Bits to shift to get width */
-
-/* See comments in <sys/_types.h> about __ct_rune_t. */
-__BEGIN_DECLS
-unsigned long	___runetype(__ct_rune_t) __pure;
-__ct_rune_t	___tolower(__ct_rune_t) __pure;
-__ct_rune_t	___toupper(__ct_rune_t) __pure;
-__END_DECLS
-
-/*
- * _EXTERNALIZE_CTYPE_INLINES_ is defined in locale/nomacros.c to tell us
- * to generate code for extern versions of all our inline functions.
- */
-#ifdef _EXTERNALIZE_CTYPE_INLINES_
-#define	_USE_CTYPE_INLINE_
-#define	static
-#define	__inline
-#endif
-
-extern int __mb_sb_limit;
-
-/*
- * Use inline functions if we are allowed to and the compiler supports them.
- */
-#if !defined(_DONT_USE_CTYPE_INLINE_) && \
-    (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus))
-
-#include <runetype.h>
-
-static __inline int
-__maskrune(__ct_rune_t _c, unsigned long _f)
-{
-	return ((_c < 0 || _c >= _CACHED_RUNES) ? ___runetype(_c) :
-		_CurrentRuneLocale->__runetype[_c]) & _f;
-}
-
-static __inline int
-__sbmaskrune(__ct_rune_t _c, unsigned long _f)
-{
-	return (_c < 0 || _c >= __mb_sb_limit) ? 0 :
-	       _CurrentRuneLocale->__runetype[_c] & _f;
-}
-
-static __inline int
-__istype(__ct_rune_t _c, unsigned long _f)
-{
-	return (!!__maskrune(_c, _f));
-}
-
-static __inline int
-__sbistype(__ct_rune_t _c, unsigned long _f)
-{
-	return (!!__sbmaskrune(_c, _f));
-}
-
-static __inline int
-__isctype(__ct_rune_t _c, unsigned long _f)
-{
-	return (_c < 0 || _c >= 128) ? 0 :
-	       !!(_DefaultRuneLocale.__runetype[_c] & _f);
-}
-
-static __inline __ct_rune_t
-__toupper(__ct_rune_t _c)
-{
-	return (_c < 0 || _c >= _CACHED_RUNES) ? ___toupper(_c) :
-	       _CurrentRuneLocale->__mapupper[_c];
-}
-
-static __inline __ct_rune_t
-__sbtoupper(__ct_rune_t _c)
-{
-	return (_c < 0 || _c >= __mb_sb_limit) ? _c :
-	       _CurrentRuneLocale->__mapupper[_c];
-}
-
-static __inline __ct_rune_t
-__tolower(__ct_rune_t _c)
-{
-	return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) :
-	       _CurrentRuneLocale->__maplower[_c];
-}
-
-static __inline __ct_rune_t
-__sbtolower(__ct_rune_t _c)
-{
-	return (_c < 0 || _c >= __mb_sb_limit) ? _c :
-	       _CurrentRuneLocale->__maplower[_c];
-}
-
-static __inline int
-__wcwidth(__ct_rune_t _c)
-{
-	unsigned int _x;
-
-	if (_c == 0)
-		return (0);
-	_x = (unsigned int)__maskrune(_c, _CTYPE_SWM|_CTYPE_R);
-	if ((_x & _CTYPE_SWM) != 0)
-		return ((_x & _CTYPE_SWM) >> _CTYPE_SWS);
-	return ((_x & _CTYPE_R) != 0 ? 1 : -1);
-}
-
-#else /* not using inlines */
-
-__BEGIN_DECLS
-int		__maskrune(__ct_rune_t, unsigned long);
-int		__sbmaskrune(__ct_rune_t, unsigned long);
-int		__istype(__ct_rune_t, unsigned long);
-int		__sbistype(__ct_rune_t, unsigned long);
-int		__isctype(__ct_rune_t, unsigned long);
-__ct_rune_t	__toupper(__ct_rune_t);
-__ct_rune_t	__sbtoupper(__ct_rune_t);
-__ct_rune_t	__tolower(__ct_rune_t);
-__ct_rune_t	__sbtolower(__ct_rune_t);
-int		__wcwidth(__ct_rune_t);
-__END_DECLS
-#endif /* using inlines */
-
-#endif /* !__CTYPE_H_ */
diff --git a/include.new/_semaphore.h b/include.new/_semaphore.h
deleted file mode 100644
index b8a83b2..0000000
--- a/include.new/_semaphore.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2002 Alfred Perlstein <alfred@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.
- *
- * 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: releng/10.2/sys/sys/_semaphore.h 201546 2010-01-05 02:37:59Z davidxu $
- */
-#ifndef __SEMAPHORE_H_
-#define __SEMAPHORE_H_
-
-typedef intptr_t semid_t;
-struct timespec;
-
-#define SEM_VALUE_MAX  __INT_MAX
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-
-int ksem_close(semid_t id);
-int ksem_post(semid_t id);
-int ksem_wait(semid_t id);
-int ksem_trywait(semid_t id);
-int ksem_timedwait(semid_t id, const struct timespec *abstime);
-int ksem_init(semid_t *idp, unsigned int value);
-int ksem_open(semid_t *idp, const char *name, int oflag, mode_t mode,
-    unsigned int value);
-int ksem_unlink(const char *name);
-int ksem_getvalue(semid_t id, int *val);
-int ksem_destroy(semid_t id);
-
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* __SEMAPHORE_H_ */
diff --git a/include.new/a.out.h b/include.new/a.out.h
deleted file mode 100644
index bf57968..0000000
--- a/include.new/a.out.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 1991, 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. 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.
- *
- *	@(#)a.out.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/a.out.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef	_AOUT_H_
-#define	_AOUT_H_
-
-#include <sys/types.h>
-#include <machine/exec.h>
-#include <sys/endian.h>
-#include <sys/imgact_aout.h>
-#include <machine/reloc.h>
-
-#define _AOUT_INCLUDE_
-#include <nlist.h>
-
-#endif /* !_AOUT_H_ */
diff --git a/include.new/aio.h b/include.new/aio.h
deleted file mode 100644
index 75353a6..0000000
--- a/include.new/aio.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * Copyright (c) 1997 John S. Dyson.  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. John S. Dyson's name may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * DISCLAIMER:  This code isn't warranted to do anything useful.  Anything
- * bad that happens because of using this software isn't the responsibility
- * of the author.  This software is distributed AS-IS.
- *
- * $FreeBSD: releng/10.2/sys/sys/aio.h 251526 2013-06-08 13:27:57Z glebius $
- */
-
-#ifndef _SYS_AIO_H_
-#define	_SYS_AIO_H_
-
-#include <sys/types.h>
-#include <sys/signal.h>
-
-/*
- * Returned by aio_cancel:
- */
-#define	AIO_CANCELED		0x1
-#define	AIO_NOTCANCELED		0x2
-#define	AIO_ALLDONE		0x3
-
-/*
- * LIO opcodes
- */
-#define	LIO_NOP			0x0
-#define LIO_WRITE		0x1
-#define	LIO_READ		0x2
-#ifdef _KERNEL
-#define	LIO_SYNC		0x3
-#define	LIO_MLOCK		0x4
-#endif
-
-/*
- * LIO modes
- */
-#define	LIO_NOWAIT		0x0
-#define	LIO_WAIT		0x1
-
-/*
- * Maximum number of allowed LIO operations
- */
-#define	AIO_LISTIO_MAX		16
-
-/*
- * Private members for aiocb -- don't access
- * directly.
- */
-struct __aiocb_private {
-	long	status;
-	long	error;
-	void	*kernelinfo;
-};
-
-/*
- * I/O control block
- */
-typedef struct aiocb {
-	int	aio_fildes;		/* File descriptor */
-	off_t	aio_offset;		/* File offset for I/O */
-	volatile void *aio_buf;         /* I/O buffer in process space */
-	size_t	aio_nbytes;		/* Number of bytes for I/O */
-	int	__spare__[2];
-	void	*__spare2__;
-	int	aio_lio_opcode;		/* LIO opcode */
-	int	aio_reqprio;		/* Request priority -- ignored */
-	struct	__aiocb_private	_aiocb_private;
-	struct	sigevent aio_sigevent;	/* Signal to deliver */
-} aiocb_t;
-
-#ifndef _KERNEL
-
-struct timespec;
-
-__BEGIN_DECLS
-/*
- * Asynchronously read from a file
- */
-int	aio_read(struct aiocb *);
-
-/*
- * Asynchronously write to file
- */
-int	aio_write(struct aiocb *);
-
-/*
- * List I/O Asynchronously/synchronously read/write to/from file
- *	"lio_mode" specifies whether or not the I/O is synchronous.
- *	"acb_list" is an array of "nacb_listent" I/O control blocks.
- *	when all I/Os are complete, the optional signal "sig" is sent.
- */
-int	lio_listio(int, struct aiocb * const [], int, struct sigevent *);
-
-/*
- * Get completion status
- *	returns EINPROGRESS until I/O is complete.
- *	this routine does not block.
- */
-int	aio_error(const struct aiocb *);
-
-/*
- * Finish up I/O, releasing I/O resources and returns the value
- *	that would have been associated with a synchronous I/O request.
- *	This routine must be called once and only once for each
- *	I/O control block who has had I/O associated with it.
- */
-ssize_t	aio_return(struct aiocb *);
-
-/*
- * Cancel I/O
- */
-int	aio_cancel(int, struct aiocb *);
-
-/*
- * Suspend until all specified I/O or timeout is complete.
- */
-int	aio_suspend(const struct aiocb * const[], int, const struct timespec *);
-
-/*
- * Asynchronous mlock
- */
-int	aio_mlock(struct aiocb *);
-
-#ifdef __BSD_VISIBLE
-int	aio_waitcomplete(struct aiocb **, struct timespec *);
-#endif
-
-int	aio_fsync(int op, struct aiocb *aiocbp);
-__END_DECLS
-
-#else
-
-/* Forward declarations for prototypes below. */
-struct socket;
-struct sockbuf;
-
-extern void (*aio_swake)(struct socket *, struct sockbuf *);
-
-#endif
-
-#endif
diff --git a/include.new/alias.h b/include.new/alias.h
deleted file mode 100644
index 9559561..0000000
--- a/include.new/alias.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* lint -save -library Flexelint comment for external headers */
-
-/*-
- * Copyright (c) 2001 Charles Mott <cm@linktel.net>
- * 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.
- *
- * 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: releng/10.2/sys/netinet/libalias/alias.h 223080 2011-06-14 13:35:24Z ae $
- */
-
-/*
- * Alias.h defines the outside world interfaces for the packet aliasing
- * software.
- *
- * This software is placed into the public domain with no restrictions on its
- * distribution.
- */
-
-#ifndef _ALIAS_H_
-#define	_ALIAS_H_
-
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-
-#define LIBALIAS_BUF_SIZE 128
-#ifdef	_KERNEL
-/*
- * The kernel version of libalias does not support these features.
- */
-#define	NO_FW_PUNCH
-#define	NO_USE_SOCKETS
-#endif
-
-/*
- * The external interface to libalias, the packet aliasing engine.
- *
- * There are two sets of functions:
- *
- * PacketAlias*() the old API which doesn't take an instance pointer
- * and therefore can only have one packet engine at a time.
- *
- * LibAlias*() the new API which takes as first argument a pointer to
- * the instance of the packet aliasing engine.
- *
- * The functions otherwise correspond to each other one for one, except
- * for the LibAliasUnaliasOut()/PacketUnaliasOut() function which were
- * were misnamed in the old API.
- */
-
-/*
- * The instance structure
- */
-struct libalias;
-
-/*
- * An anonymous structure, a pointer to which is returned from
- * PacketAliasRedirectAddr(), PacketAliasRedirectPort() or
- * PacketAliasRedirectProto(), passed to PacketAliasAddServer(),
- * and freed by PacketAliasRedirectDelete().
- */
-struct alias_link;
-
-/* Initialization and control functions. */
-struct libalias *LibAliasInit(struct libalias *);
-void		LibAliasSetAddress(struct libalias *, struct in_addr _addr);
-void		LibAliasSetFWBase(struct libalias *, unsigned int _base, unsigned int _num);
-void		LibAliasSetSkinnyPort(struct libalias *, unsigned int _port);
-unsigned int
-		LibAliasSetMode(struct libalias *, unsigned int _flags, unsigned int _mask);
-void		LibAliasUninit(struct libalias *);
-
-/* Packet Handling functions. */
-int		LibAliasIn (struct libalias *, char *_ptr, int _maxpacketsize);
-int		LibAliasOut(struct libalias *, char *_ptr, int _maxpacketsize);
-int		LibAliasOutTry(struct libalias *, char *_ptr, int _maxpacketsize, int _create);
-int		LibAliasUnaliasOut(struct libalias *, char *_ptr, int _maxpacketsize);
-
-/* Port and address redirection functions. */
-
-int
-LibAliasAddServer(struct libalias *, struct alias_link *_lnk,
-    struct in_addr _addr, unsigned short _port);
-struct alias_link *
-LibAliasRedirectAddr(struct libalias *, struct in_addr _src_addr,
-    struct in_addr _alias_addr);
-int		LibAliasRedirectDynamic(struct libalias *, struct alias_link *_lnk);
-void		LibAliasRedirectDelete(struct libalias *, struct alias_link *_lnk);
-struct alias_link *
-LibAliasRedirectPort(struct libalias *, struct in_addr _src_addr,
-    unsigned short _src_port, struct in_addr _dst_addr,
-    unsigned short _dst_port, struct in_addr _alias_addr,
-    unsigned short _alias_port, unsigned char _proto);
-struct alias_link *
-LibAliasRedirectProto(struct libalias *, struct in_addr _src_addr,
-    struct in_addr _dst_addr, struct in_addr _alias_addr,
-    unsigned char _proto);
-
-/* Fragment Handling functions. */
-void		LibAliasFragmentIn(struct libalias *, char *_ptr, char *_ptr_fragment);
-char           *LibAliasGetFragment(struct libalias *, char *_ptr);
-int		LibAliasSaveFragment(struct libalias *, char *_ptr);
-
-/* Miscellaneous functions. */
-int		LibAliasCheckNewLink(struct libalias *);
-unsigned short
-		LibAliasInternetChecksum(struct libalias *, unsigned short *_ptr, int _nbytes);
-void		LibAliasSetTarget(struct libalias *, struct in_addr _target_addr);
-
-/* Transparent proxying routines. */
-int		LibAliasProxyRule(struct libalias *, const char *_cmd);
-
-/* Module handling API */
-int             LibAliasLoadModule(char *);
-int             LibAliasUnLoadAllModule(void);
-int             LibAliasRefreshModules(void);
-
-/* Mbuf helper function. */
-struct mbuf    *m_megapullup(struct mbuf *, int);
-
-/*
- * Mode flags and other constants.
- */
-
-
-/* Mode flags, set using PacketAliasSetMode() */
-
-/*
- * If PKT_ALIAS_LOG is set, a message will be printed to /var/log/alias.log
- * every time a link is created or deleted.  This is useful for debugging.
- */
-#define	PKT_ALIAS_LOG			0x01
-
-/*
- * If PKT_ALIAS_DENY_INCOMING is set, then incoming connections (e.g. to ftp,
- * telnet or web servers will be prevented by the aliasing mechanism.
- */
-#define	PKT_ALIAS_DENY_INCOMING		0x02
-
-/*
- * If PKT_ALIAS_SAME_PORTS is set, packets will be attempted sent from the
- * same port as they originated on.  This allows e.g. rsh to work *99% of the
- * time*, but _not_ 100% (it will be slightly flakey instead of not working
- * at all).  This mode bit is set by PacketAliasInit(), so it is a default
- * mode of operation.
- */
-#define	PKT_ALIAS_SAME_PORTS		0x04
-
-/*
- * If PKT_ALIAS_USE_SOCKETS is set, then when partially specified links (e.g.
- * destination port and/or address is zero), the packet aliasing engine will
- * attempt to allocate a socket for the aliasing port it chooses.  This will
- * avoid interference with the host machine.  Fully specified links do not
- * require this.  This bit is set after a call to PacketAliasInit(), so it is
- * a default mode of operation.
- */
-#ifndef	NO_USE_SOCKETS
-#define	PKT_ALIAS_USE_SOCKETS		0x08
-#endif
-/*-
- * If PKT_ALIAS_UNREGISTERED_ONLY is set, then only packets with
- * unregistered source addresses will be aliased.  Private
- * addresses are those in the following ranges:
- *
- *		10.0.0.0     ->   10.255.255.255
- *		172.16.0.0   ->   172.31.255.255
- *		192.168.0.0  ->   192.168.255.255
- */
-#define	PKT_ALIAS_UNREGISTERED_ONLY	0x10
-
-/*
- * If PKT_ALIAS_RESET_ON_ADDR_CHANGE is set, then the table of dynamic
- * aliasing links will be reset whenever PacketAliasSetAddress() changes the
- * default aliasing address.  If the default aliasing address is left
- * unchanged by this function call, then the table of dynamic aliasing links
- * will be left intact.  This bit is set after a call to PacketAliasInit().
- */
-#define	PKT_ALIAS_RESET_ON_ADDR_CHANGE	0x20
-
-/*
- * If PKT_ALIAS_PROXY_ONLY is set, then NAT will be disabled and only
- * transparent proxying is performed.
- */
-#define	PKT_ALIAS_PROXY_ONLY		0x40
-
-/*
- * If PKT_ALIAS_REVERSE is set, the actions of PacketAliasIn() and
- * PacketAliasOut() are reversed.
- */
-#define	PKT_ALIAS_REVERSE		0x80
-
-#ifndef NO_FW_PUNCH
-/*
- * If PKT_ALIAS_PUNCH_FW is set, active FTP and IRC DCC connections will
- * create a 'hole' in the firewall to allow the transfers to work.  The
- * ipfw rule number that the hole is created with is controlled by
- * PacketAliasSetFWBase().  The hole will be attached to that
- * particular alias_link, so when the link goes away the hole is deleted.
- */
-#define	PKT_ALIAS_PUNCH_FW		0x100
-#endif
-
-/*
- * If PKT_ALIAS_SKIP_GLOBAL is set, nat instance is not checked for matching
- * states in 'ipfw nat global' rule.
- */
-#define	PKT_ALIAS_SKIP_GLOBAL		0x200
-
-/* Function return codes. */
-#define	PKT_ALIAS_ERROR			-1
-#define	PKT_ALIAS_OK			1
-#define	PKT_ALIAS_IGNORED		2
-#define	PKT_ALIAS_UNRESOLVED_FRAGMENT	3
-#define	PKT_ALIAS_FOUND_HEADER_FRAGMENT	4
-
-#endif				/* !_ALIAS_H_ */
-
-/* lint -restore */
diff --git a/include.new/altq/altq.h b/include.new/altq/altq.h
deleted file mode 100644
index b6220d9..0000000
--- a/include.new/altq/altq.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/altq/altq/altq.h 130368 2004-06-12 00:57:20Z mlaier $	*/
-/*	$KAME: altq.h,v 1.10 2003/07/10 12:07:47 kjc Exp $	*/
-
-/*
- * Copyright (C) 1998-2003
- *	Sony Computer Science Laboratories Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY SONY CSL 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 SONY CSL 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.
- */
-#ifndef _ALTQ_ALTQ_H_
-#define	_ALTQ_ALTQ_H_
-
-#if 0
-/*
- * allow altq-3 (altqd(8) and /dev/altq) to coexist with the new pf-based altq.
- * altq3 is mainly for research experiments. pf-based altq is for daily use.
- */
-#define ALTQ3_COMPAT		/* for compatibility with altq-3 */
-#define ALTQ3_CLFIER_COMPAT	/* for compatibility with altq-3 classifier */
-#endif
-
-#ifdef ALTQ3_COMPAT
-#include <sys/param.h>
-#include <sys/ioccom.h>
-#include <sys/queue.h>
-#include <netinet/in.h>
-
-#ifndef IFNAMSIZ
-#define	IFNAMSIZ	16
-#endif
-#endif /* ALTQ3_COMPAT */
-
-/* altq discipline type */
-#define	ALTQT_NONE		0	/* reserved */
-#define	ALTQT_CBQ		1	/* cbq */
-#define	ALTQT_WFQ		2	/* wfq */
-#define	ALTQT_AFMAP		3	/* afmap */
-#define	ALTQT_FIFOQ		4	/* fifoq */
-#define	ALTQT_RED		5	/* red */
-#define	ALTQT_RIO		6	/* rio */
-#define	ALTQT_LOCALQ		7	/* local use */
-#define	ALTQT_HFSC		8	/* hfsc */
-#define	ALTQT_CDNR		9	/* traffic conditioner */
-#define	ALTQT_BLUE		10	/* blue */
-#define	ALTQT_PRIQ		11	/* priority queue */
-#define	ALTQT_JOBS		12	/* JoBS */
-#define	ALTQT_MAX		13	/* should be max discipline type + 1 */
-
-#ifdef ALTQ3_COMPAT
-struct	altqreq {
-	char	ifname[IFNAMSIZ];	/* if name, e.g. "en0" */
-	u_long	arg;			/* request-specific argument */
-};
-#endif
-
-/* simple token backet meter profile */
-struct	tb_profile {
-	u_int	rate;	/* rate in bit-per-sec */
-	u_int	depth;	/* depth in bytes */
-};
-
-#ifdef ALTQ3_COMPAT
-struct	tbrreq {
-	char	ifname[IFNAMSIZ];	/* if name, e.g. "en0" */
-	struct	tb_profile tb_prof;	/* token bucket profile */
-};
-
-#ifdef ALTQ3_CLFIER_COMPAT
-/*
- * common network flow info structure
- */
-struct flowinfo {
-	u_char		fi_len;		/* total length */
-	u_char		fi_family;	/* address family */
-	u_int8_t	fi_data[46];	/* actually longer; address family
-					   specific flow info. */
-};
-
-/*
- * flow info structure for internet protocol family.
- * (currently this is the only protocol family supported)
- */
-struct flowinfo_in {
-	u_char		fi_len;		/* sizeof(struct flowinfo_in) */
-	u_char		fi_family;	/* AF_INET */
-	u_int8_t	fi_proto;	/* IPPROTO_XXX */
-	u_int8_t	fi_tos;		/* type-of-service */
-	struct in_addr	fi_dst;		/* dest address */
-	struct in_addr	fi_src;		/* src address */
-	u_int16_t	fi_dport;	/* dest port */
-	u_int16_t	fi_sport;	/* src port */
-	uint32_t	fi_gpi;		/* generalized port id for ipsec */
-	u_int8_t	_pad[28];	/* make the size equal to
-					   flowinfo_in6 */
-};
-
-#ifdef SIN6_LEN
-struct flowinfo_in6 {
-	u_char		fi6_len;	/* sizeof(struct flowinfo_in6) */
-	u_char		fi6_family;	/* AF_INET6 */
-	u_int8_t	fi6_proto;	/* IPPROTO_XXX */
-	u_int8_t	fi6_tclass;	/* traffic class */
-	uint32_t	fi6_flowlabel;	/* ipv6 flowlabel */
-	u_int16_t	fi6_dport;	/* dest port */
-	u_int16_t	fi6_sport;	/* src port */
-	uint32_t	fi6_gpi;	/* generalized port id */
-	struct in6_addr fi6_dst;	/* dest address */
-	struct in6_addr fi6_src;	/* src address */
-};
-#endif /* INET6 */
-
-/*
- * flow filters for AF_INET and AF_INET6
- */
-struct flow_filter {
-	int			ff_ruleno;
-	struct flowinfo_in	ff_flow;
-	struct {
-		struct in_addr	mask_dst;
-		struct in_addr	mask_src;
-		u_int8_t	mask_tos;
-		u_int8_t	_pad[3];
-	} ff_mask;
-	u_int8_t _pad2[24];	/* make the size equal to flow_filter6 */
-};
-
-#ifdef SIN6_LEN
-struct flow_filter6 {
-	int			ff_ruleno;
-	struct flowinfo_in6	ff_flow6;
-	struct {
-		struct in6_addr	mask6_dst;
-		struct in6_addr	mask6_src;
-		u_int8_t	mask6_tclass;
-		u_int8_t	_pad[3];
-	} ff_mask6;
-};
-#endif /* INET6 */
-#endif /* ALTQ3_CLFIER_COMPAT */
-#endif /* ALTQ3_COMPAT */
-
-/*
- * generic packet counter
- */
-struct pktcntr {
-	u_int64_t	packets;
-	u_int64_t	bytes;
-};
-
-#define	PKTCNTR_ADD(cntr, len)	\
-	do { (cntr)->packets++; (cntr)->bytes += len; } while (/*CONSTCOND*/ 0)
-
-#ifdef ALTQ3_COMPAT
-/*
- * altq related ioctls
- */
-#define	ALTQGTYPE	_IOWR('q', 0, struct altqreq)	/* get queue type */
-#if 0
-/*
- * these ioctls are currently discipline-specific but could be shared
- * in the future.
- */
-#define	ALTQATTACH	_IOW('q', 1, struct altqreq)	/* attach discipline */
-#define	ALTQDETACH	_IOW('q', 2, struct altqreq)	/* detach discipline */
-#define	ALTQENABLE	_IOW('q', 3, struct altqreq)	/* enable discipline */
-#define	ALTQDISABLE	_IOW('q', 4, struct altqreq)	/* disable discipline*/
-#define	ALTQCLEAR	_IOW('q', 5, struct altqreq)	/* (re)initialize */
-#define	ALTQCONFIG	_IOWR('q', 6, struct altqreq)	/* set config params */
-#define	ALTQADDCLASS	_IOWR('q', 7, struct altqreq)	/* add a class */
-#define	ALTQMODCLASS	_IOWR('q', 8, struct altqreq)	/* modify a class */
-#define	ALTQDELCLASS	_IOWR('q', 9, struct altqreq)	/* delete a class */
-#define	ALTQADDFILTER	_IOWR('q', 10, struct altqreq)	/* add a filter */
-#define	ALTQDELFILTER	_IOWR('q', 11, struct altqreq)	/* delete a filter */
-#define	ALTQGETSTATS	_IOWR('q', 12, struct altqreq)	/* get statistics */
-#define	ALTQGETCNTR	_IOWR('q', 13, struct altqreq)	/* get a pkt counter */
-#endif /* 0 */
-#define	ALTQTBRSET	_IOW('q', 14, struct tbrreq)	/* set tb regulator */
-#define	ALTQTBRGET	_IOWR('q', 15, struct tbrreq)	/* get tb regulator */
-#endif /* ALTQ3_COMPAT */
-
-#ifdef _KERNEL
-#include <altq/altq_var.h>
-#endif
-
-#endif /* _ALTQ_ALTQ_H_ */
diff --git a/include.new/altq/altq_cbq.h b/include.new/altq/altq_cbq.h
deleted file mode 100644
index 723bebb..0000000
--- a/include.new/altq/altq_cbq.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*	$KAME: altq_cbq.h,v 1.12 2003/10/03 05:05:15 kjc Exp $	*/
-
-/*
- * Copyright (c) Sun Microsystems, Inc. 1993-1998 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 SMCC Technology
- *      Development Group at Sun Microsystems, Inc.
- *
- * 4. The name of the Sun Microsystems, Inc nor may not be used to endorse or
- *      promote products derived from this software without specific prior
- *      written permission.
- *
- * SUN MICROSYSTEMS DOES NOT CLAIM MERCHANTABILITY OF THIS SOFTWARE OR THE
- * SUITABILITY OF THIS SOFTWARE FOR ANY PARTICULAR PURPOSE.  The software is
- * provided "as is" without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this software.
- */
-
-#ifndef _ALTQ_ALTQ_CBQ_H_
-#define	_ALTQ_ALTQ_CBQ_H_
-
-#include <altq/altq.h>
-#include <altq/altq_rmclass.h>
-#include <altq/altq_red.h>
-#include <altq/altq_rio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	NULL_CLASS_HANDLE	0
-
-/* class flags should be same as class flags in rm_class.h */
-#define	CBQCLF_RED		0x0001	/* use RED */
-#define	CBQCLF_ECN		0x0002  /* use RED/ECN */
-#define	CBQCLF_RIO		0x0004  /* use RIO */
-#define	CBQCLF_FLOWVALVE	0x0008	/* use flowvalve (aka penalty-box) */
-#define	CBQCLF_CLEARDSCP	0x0010  /* clear diffserv codepoint */
-#define	CBQCLF_BORROW		0x0020  /* borrow from parent */
-
-/* class flags only for root class */
-#define	CBQCLF_WRR		0x0100	/* weighted-round robin */
-#define	CBQCLF_EFFICIENT	0x0200  /* work-conserving */
-
-/* class flags for special classes */
-#define	CBQCLF_ROOTCLASS	0x1000	/* root class */
-#define	CBQCLF_DEFCLASS		0x2000	/* default class */
-#ifdef ALTQ3_COMPAT
-#define	CBQCLF_CTLCLASS		0x4000	/* control class */
-#endif
-#define	CBQCLF_CLASSMASK	0xf000	/* class mask */
-
-#define	CBQ_MAXQSIZE		200
-#define	CBQ_MAXPRI		RM_MAXPRIO
-
-typedef struct _cbq_class_stats_ {
-	uint32_t	handle;
-	u_int		depth;
-
-	struct pktcntr	xmit_cnt;	/* packets sent in this class */
-	struct pktcntr	drop_cnt;	/* dropped packets */
-	u_int		over;		/* # times went over limit */
-	u_int		borrows;	/* # times tried to borrow */
-	u_int		overactions;	/* # times invoked overlimit action */
-	u_int		delays;		/* # times invoked delay actions */
-
-	/* other static class parameters useful for debugging */
-	int		priority;
-	int		maxidle;
-	int		minidle;
-	int		offtime;
-	int		qmax;
-	int		ns_per_byte;
-	int		wrr_allot;
-
-	int		qcnt;		/* # packets in queue */
-	int		avgidle;
-
-	/* red and rio related info */
-	int		qtype;
-	struct redstats	red[3];
-} class_stats_t;
-
-#ifdef ALTQ3_COMPAT
-/*
- * Define structures associated with IOCTLS for cbq.
- */
-
-/*
- * Define the CBQ interface structure.  This must be included in all
- * IOCTL's such that the CBQ driver may find the appropriate CBQ module
- * associated with the network interface to be affected.
- */
-struct cbq_interface {
-	char	cbq_ifacename[IFNAMSIZ];
-};
-
-typedef struct cbq_class_spec {
-	u_int		priority;
-	u_int		nano_sec_per_byte;
-	u_int		maxq;
-	u_int		maxidle;
-	int		minidle;
-	u_int		offtime;
-	uint32_t	parent_class_handle;
-	uint32_t	borrow_class_handle;
-
-	u_int		pktsize;
-	int		flags;
-} cbq_class_spec_t;
-
-struct cbq_add_class {
-	struct cbq_interface	cbq_iface;
-
-	cbq_class_spec_t	cbq_class;
-	uint32_t		cbq_class_handle;
-};
-
-struct cbq_delete_class {
-	struct cbq_interface	cbq_iface;
-	uint32_t		cbq_class_handle;
-};
-
-struct cbq_modify_class {
-	struct cbq_interface	cbq_iface;
-
-	cbq_class_spec_t	cbq_class;
-	uint32_t		cbq_class_handle;
-};
-
-struct cbq_add_filter {
-	struct cbq_interface		cbq_iface;
-	uint32_t		cbq_class_handle;
-	struct flow_filter	cbq_filter;
-
-	u_long			cbq_filter_handle;
-};
-
-struct cbq_delete_filter {
-	struct cbq_interface	cbq_iface;
-	u_long			cbq_filter_handle;
-};
-
-/* number of classes are returned in nclasses field */
-struct cbq_getstats {
-	struct cbq_interface	iface;
-	int			nclasses;
-	class_stats_t		*stats;
-};
-
-/*
- * Define IOCTLs for CBQ.
- */
-#define	CBQ_IF_ATTACH		_IOW('Q', 1, struct cbq_interface)
-#define	CBQ_IF_DETACH		_IOW('Q', 2, struct cbq_interface)
-#define	CBQ_ENABLE		_IOW('Q', 3, struct cbq_interface)
-#define	CBQ_DISABLE		_IOW('Q', 4, struct cbq_interface)
-#define	CBQ_CLEAR_HIERARCHY	_IOW('Q', 5, struct cbq_interface)
-#define	CBQ_ADD_CLASS		_IOWR('Q', 7, struct cbq_add_class)
-#define	CBQ_DEL_CLASS		_IOW('Q', 8, struct cbq_delete_class)
-#define	CBQ_MODIFY_CLASS	_IOWR('Q', 9, struct cbq_modify_class)
-#define	CBQ_ADD_FILTER		_IOWR('Q', 10, struct cbq_add_filter)
-#define	CBQ_DEL_FILTER		_IOW('Q', 11, struct cbq_delete_filter)
-#define	CBQ_GETSTATS		_IOWR('Q', 12, struct cbq_getstats)
-#endif /* ALTQ3_COMPAT */
-
-#ifdef _KERNEL
-/*
- * Define macros only good for kernel drivers and modules.
- */
-#define	CBQ_WATCHDOG		(hz / 20)
-#define	CBQ_TIMEOUT		10
-#define	CBQ_LS_TIMEOUT		(20 * hz / 1000)
-
-#define	CBQ_MAX_CLASSES	256
-
-#ifdef ALTQ3_COMPAT
-#define	CBQ_MAX_FILTERS 256
-
-#define	DISABLE		0x00
-#define	ENABLE		0x01
-#endif /* ALTQ3_COMPAT */
-
-/*
- * Define State structures.
- */
-typedef struct cbqstate {
-#ifdef ALTQ3_COMPAT
-	struct cbqstate		*cbq_next;
-#endif
-	int			 cbq_qlen;	/* # of packets in cbq */
-	struct rm_class		*cbq_class_tbl[CBQ_MAX_CLASSES];
-
-	struct rm_ifdat		 ifnp;
-	struct callout		 cbq_callout;	/* for timeouts */
-#ifdef ALTQ3_CLFIER_COMPAT
-	struct acc_classifier	cbq_classifier;
-#endif
-} cbq_state_t;
-
-#endif /* _KERNEL */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_ALTQ_ALTQ_CBQ_H_ */
diff --git a/include.new/altq/altq_cdnr.h b/include.new/altq/altq_cdnr.h
deleted file mode 100644
index f22fec7..0000000
--- a/include.new/altq/altq_cdnr.h
+++ /dev/null
@@ -1,335 +0,0 @@
-/*	$KAME: altq_cdnr.h,v 1.9 2003/07/10 12:07:48 kjc Exp $	*/
-
-/*
- * Copyright (C) 1999-2002
- *	Sony Computer Science Laboratories Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY SONY CSL 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 SONY CSL 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.
- */
-
-#ifndef _ALTQ_ALTQ_CDNR_H_
-#define	_ALTQ_ALTQ_CDNR_H_
-
-#include <altq/altq.h>
-
-/*
- * traffic conditioner element types
- */
-#define	TCETYPE_NONE		0
-#define	TCETYPE_TOP		1	/* top level conditioner */
-#define	TCETYPE_ELEMENT		2	/* a simple tc element */
-#define	TCETYPE_TBMETER		3	/* token bucket meter */
-#define	TCETYPE_TRTCM		4	/* (two-rate) three color marker */
-#define	TCETYPE_TSWTCM		5	/* time sliding window 3-color maker */
-
-/*
- * traffic conditioner action
- */
-struct cdnr_block;
-
-struct tc_action {
-	int	tca_code;	/* e.g., TCACODE_PASS */
-	/* tca_code dependent variable */
-	union {
-		u_long		un_value;	/* template */
-		u_int8_t	un_dscp;	/* diffserv code point */
-		u_long		un_handle;	/* tc action handle */
-		struct cdnr_block *un_next;	/* next tc element block */
-	} tca_un;
-};
-#define	tca_value	tca_un.un_value
-#define	tca_dscp	tca_un.un_dscp
-#define	tca_handle	tca_un.un_handle
-#define	tca_next	tca_un.un_next
-
-#define	TCACODE_NONE	0	/* action is not set */
-#define	TCACODE_PASS	1 	/* pass this packet */
-#define	TCACODE_DROP	2	/* discard this packet */
-#define	TCACODE_RETURN	3	/* do not process this packet */
-#define	TCACODE_MARK	4	/* mark dscp */
-#define	TCACODE_HANDLE	5	/* take action specified by handle */
-#define	TCACODE_NEXT	6	/* take action in the next tc element */
-#define	TCACODE_MAX	6
-
-#define	CDNR_NULL_HANDLE	0
-
-struct cdnr_interface {
-	char	cdnr_ifname[IFNAMSIZ];  /* interface name (e.g., fxp0) */
-};
-
-/* simple element operations */
-struct cdnr_add_element {
-	struct cdnr_interface	iface;
-	struct tc_action	action;
-
-	u_long			cdnr_handle;	/* return value */
-};
-
-struct cdnr_delete_element {
-	struct cdnr_interface	iface;
-	u_long			cdnr_handle;
-};
-
-/* token-bucket meter operations */
-struct cdnr_add_tbmeter {
-	struct cdnr_interface	iface;
-	struct tb_profile	profile;
-	struct tc_action	in_action;
-	struct tc_action	out_action;
-
-	u_long			cdnr_handle;	/* return value */
-};
-
-struct cdnr_modify_tbmeter {
-	struct cdnr_interface	iface;
-	u_long			cdnr_handle;
-	struct tb_profile	profile;
-};
-
-struct cdnr_tbmeter_stats {
-	struct cdnr_interface	iface;
-	u_long			cdnr_handle;
-	struct pktcntr		in_cnt;
-	struct pktcntr		out_cnt;
-};
-
-/* two-rate three-color marker operations */
-struct cdnr_add_trtcm {
-	struct cdnr_interface	iface;
-	struct tb_profile	cmtd_profile;	/* profile for committed tb */
-	struct tb_profile	peak_profile;	/* profile for peak tb */
-	struct tc_action	green_action;	/* action for green packets */
-	struct tc_action	yellow_action;	/* action for yellow packets */
-	struct tc_action	red_action;	/* action for red packets */
-	int			coloraware;	/* color-aware/color-blind */
-
-	u_long			cdnr_handle;	/* return value */
-};
-
-struct cdnr_modify_trtcm {
-	struct cdnr_interface	iface;
-	u_long			cdnr_handle;
-	struct tb_profile	cmtd_profile;	/* profile for committed tb */
-	struct tb_profile	peak_profile;	/* profile for peak tb */
-	int			coloraware;	/* color-aware/color-blind */
-};
-
-struct cdnr_tcm_stats {
-	struct cdnr_interface	iface;
-	u_long			cdnr_handle;
-	struct pktcntr		green_cnt;
-	struct pktcntr		yellow_cnt;
-	struct pktcntr		red_cnt;
-};
-
-/* time sliding window three-color marker operations */
-struct cdnr_add_tswtcm {
-	struct cdnr_interface	iface;
-	uint32_t		cmtd_rate;	/* committed rate (bits/sec) */
-	uint32_t		peak_rate;	/* peak rate (bits/sec) */
-	uint32_t		avg_interval;	/* averaging interval (msec) */
-	struct tc_action	green_action;	/* action for green packets */
-	struct tc_action	yellow_action;	/* action for yellow packets */
-	struct tc_action	red_action;	/* action for red packets */
-
-	u_long			cdnr_handle;	/* return value */
-};
-
-struct cdnr_modify_tswtcm {
-	struct cdnr_interface	iface;
-	u_long			cdnr_handle;
-	uint32_t		cmtd_rate;	/* committed rate (bits/sec) */
-	uint32_t		peak_rate;	/* peak rate (bits/sec) */
-	uint32_t		avg_interval;	/* averaging interval (msec) */
-};
-
-struct cdnr_add_filter {
-	struct cdnr_interface	iface;
-	u_long			cdnr_handle;
-#ifdef ALTQ3_CLFIER_COMPAT
-	struct flow_filter	filter;
-#endif
-	u_long			filter_handle;	/* return value */
-};
-
-struct cdnr_delete_filter {
-	struct cdnr_interface	iface;
-	u_long			filter_handle;
-};
-
-struct tce_stats {
-	u_long			tce_handle;	/* tc element handle */
-	int			tce_type;	/* e.g., TCETYPE_ELEMENT */
-	struct pktcntr		tce_cnts[3];	/* tcm returns 3 counters */
-};
-
-struct cdnr_get_stats {
-	struct cdnr_interface	iface;
-	struct pktcntr		cnts[TCACODE_MAX+1];
-
-	/* element stats */
-	int			nskip;		/* skip # of elements */
-	int			nelements;	/* # of element stats (WR) */
-	struct tce_stats	*tce_stats;	/* pointer to stats array */
-};
-
-#define	CDNR_IF_ATTACH		_IOW('Q', 1, struct cdnr_interface)
-#define	CDNR_IF_DETACH		_IOW('Q', 2, struct cdnr_interface)
-#define	CDNR_ENABLE		_IOW('Q', 3, struct cdnr_interface)
-#define	CDNR_DISABLE		_IOW('Q', 4, struct cdnr_interface)
-#define	CDNR_ADD_FILTER		_IOWR('Q', 10, struct cdnr_add_filter)
-#define	CDNR_DEL_FILTER		_IOW('Q', 11, struct cdnr_delete_filter)
-#define	CDNR_GETSTATS		_IOWR('Q', 12, struct cdnr_get_stats)
-#define	CDNR_ADD_ELEM		_IOWR('Q', 30, struct cdnr_add_element)
-#define	CDNR_DEL_ELEM		_IOW('Q', 31, struct cdnr_delete_element)
-#define	CDNR_ADD_TBM		_IOWR('Q', 32, struct cdnr_add_tbmeter)
-#define	CDNR_MOD_TBM		_IOW('Q', 33, struct cdnr_modify_tbmeter)
-#define	CDNR_TBM_STATS		_IOWR('Q', 34, struct cdnr_tbmeter_stats)
-#define	CDNR_ADD_TCM		_IOWR('Q', 35, struct cdnr_add_trtcm)
-#define	CDNR_MOD_TCM		_IOWR('Q', 36, struct cdnr_modify_trtcm)
-#define	CDNR_TCM_STATS		_IOWR('Q', 37, struct cdnr_tcm_stats)
-#define	CDNR_ADD_TSW		_IOWR('Q', 38, struct cdnr_add_tswtcm)
-#define	CDNR_MOD_TSW		_IOWR('Q', 39, struct cdnr_modify_tswtcm)
-
-#ifndef DSCP_EF
-/* diffserve code points */
-#define	DSCP_MASK	0xfc
-#define	DSCP_CUMASK	0x03
-#define	DSCP_EF		0xb8
-#define	DSCP_AF11	0x28
-#define	DSCP_AF12	0x30
-#define	DSCP_AF13	0x38
-#define	DSCP_AF21	0x48
-#define	DSCP_AF22	0x50
-#define	DSCP_AF23	0x58
-#define	DSCP_AF31	0x68
-#define	DSCP_AF32	0x70
-#define	DSCP_AF33	0x78
-#define	DSCP_AF41	0x88
-#define	DSCP_AF42	0x90
-#define	DSCP_AF43	0x98
-#define	AF_CLASSMASK		0xe0
-#define	AF_DROPPRECMASK		0x18
-#endif
-
-#ifdef _KERNEL
-
-/*
- * packet information passed to the input function of tc elements
- */
-struct cdnr_pktinfo {
-	int		pkt_len;	/* packet length */
-	u_int8_t	pkt_dscp;	/* diffserv code point */
-};
-
-/*
- * traffic conditioner control block common to all types of tc elements
- */
-struct cdnr_block {
-	LIST_ENTRY(cdnr_block)	cb_next;
-	int		cb_len;		/* size of this tc element */
-	int		cb_type;	/* cdnr block type */
-	int		cb_ref;		/* reference count of this element */
-	u_long		cb_handle;	/* handle of this tc element */
-	struct top_cdnr *cb_top;	/* back pointer to top */
-	struct tc_action cb_action;	/* top level action for this tcb */
-	struct tc_action *(*cb_input)(struct cdnr_block *,
-				      struct cdnr_pktinfo *);
-};
-
-/*
- * top level traffic conditioner structure for an interface
- */
-struct top_cdnr {
-	struct cdnr_block	tc_block;
-
-	LIST_ENTRY(top_cdnr)	tc_next;
-	struct ifaltq		*tc_ifq;
-
-	LIST_HEAD(, cdnr_block) tc_elements;
-#ifdef ALTQ3_CLFIER_COMPAT
-	struct acc_classifier	tc_classifier;
-#endif
-	struct pktcntr		tc_cnts[TCACODE_MAX+1];
-};
-
-/* token bucket element */
-struct tbe {
-	u_int64_t	rate;
-	u_int64_t	depth;
-
-	u_int64_t	token;
-	u_int64_t	filluptime;
-	u_int64_t	last;
-};
-
-/* token bucket meter structure */
-struct tbmeter {
-	struct cdnr_block	cdnrblk;	/* conditioner block */
-	struct tbe		tb;		/* token bucket */
-	struct tc_action	in_action;	/* actions for IN/OUT */
-	struct tc_action	out_action;	/* actions for IN/OUT */
-	struct pktcntr		in_cnt;		/* statistics for IN/OUT */
-	struct pktcntr		out_cnt;	/* statistics for IN/OUT */
-};
-
-/* two-rate three-color marker structure */
-struct trtcm {
-	struct cdnr_block	cdnrblk;	/* conditioner block */
-	struct tbe		cmtd_tb;	/* committed tb profile */
-	struct tbe		peak_tb;	/* peak tb profile */
-	struct tc_action	green_action;
-	struct tc_action	yellow_action;
-	struct tc_action	red_action;
-	int			coloraware;
-	u_int8_t		green_dscp;
-	u_int8_t		yellow_dscp;
-	u_int8_t		red_dscp;
-	struct pktcntr		green_cnt;
-	struct pktcntr		yellow_cnt;
-	struct pktcntr		red_cnt;
-};
-
-/* time sliding window three-color marker structure */
-struct tswtcm {
-	struct cdnr_block	cdnrblk;	/* conditioner block */
-
-	uint32_t		avg_rate;	/* average rate (bytes/sec) */
-	u_int64_t		t_front;	/* timestamp of last update */
-
-	u_int64_t		timewin;	/* average interval */
-	uint32_t		cmtd_rate;	/* committed target rate */
-	uint32_t		peak_rate;	/* peak target rate */
-	struct tc_action	green_action;
-	struct tc_action	yellow_action;
-	struct tc_action	red_action;
-	u_int8_t		green_dscp;
-	u_int8_t		yellow_dscp;
-	u_int8_t		red_dscp;
-	struct pktcntr		green_cnt;
-	struct pktcntr		yellow_cnt;
-	struct pktcntr		red_cnt;
-};
-
-#endif /* _KERNEL */
-
-#endif /* _ALTQ_ALTQ_CDNR_H_ */
diff --git a/include.new/altq/altq_classq.h b/include.new/altq/altq_classq.h
deleted file mode 100644
index dc5c646..0000000
--- a/include.new/altq/altq_classq.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*	$KAME: altq_classq.h,v 1.6 2003/01/07 07:33:38 kjc Exp $	*/
-
-/*
- * Copyright (c) 1991-1997 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 Network Research
- *	Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory 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.
- */
-/*
- * class queue definitions extracted from rm_class.h.
- */
-#ifndef _ALTQ_ALTQ_CLASSQ_H_
-#define	_ALTQ_ALTQ_CLASSQ_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Packet Queue types: RED or DROPHEAD.
- */
-#define	Q_DROPHEAD	0x00
-#define	Q_RED		0x01
-#define	Q_RIO		0x02
-#define	Q_DROPTAIL	0x03
-
-#ifdef _KERNEL
-
-/*
- * Packet Queue structures and macros to manipulate them.
- */
-struct _class_queue_ {
-	struct mbuf	*tail_;	/* Tail of packet queue */
-	int	qlen_;		/* Queue length (in number of packets) */
-	int	qlim_;		/* Queue limit (in number of packets*) */
-	int	qtype_;		/* Queue type */
-};
-
-typedef struct _class_queue_	class_queue_t;
-
-#define	qtype(q)	(q)->qtype_		/* Get queue type */
-#define	qlimit(q)	(q)->qlim_		/* Max packets to be queued */
-#define	qlen(q)		(q)->qlen_		/* Current queue length. */
-#define	qtail(q)	(q)->tail_		/* Tail of the queue */
-#define	qhead(q)	((q)->tail_ ? (q)->tail_->m_nextpkt : NULL)
-
-#define	qempty(q)	((q)->qlen_ == 0)	/* Is the queue empty?? */
-#define	q_is_red(q)	((q)->qtype_ == Q_RED)	/* Is the queue a red queue */
-#define	q_is_rio(q)	((q)->qtype_ == Q_RIO)	/* Is the queue a rio queue */
-#define	q_is_red_or_rio(q)	((q)->qtype_ == Q_RED || (q)->qtype_ == Q_RIO)
-
-#if !defined(__GNUC__) || defined(ALTQ_DEBUG)
-
-extern void		_addq(class_queue_t *, struct mbuf *);
-extern struct mbuf	*_getq(class_queue_t *);
-extern struct mbuf	*_getq_tail(class_queue_t *);
-extern struct mbuf	*_getq_random(class_queue_t *);
-extern void		_removeq(class_queue_t *, struct mbuf *);
-extern void		_flushq(class_queue_t *);
-
-#else /* __GNUC__ && !ALTQ_DEBUG */
-/*
- * inlined versions
- */
-static __inline void
-_addq(class_queue_t *q, struct mbuf *m)
-{
-        struct mbuf *m0;
-
-	if ((m0 = qtail(q)) != NULL)
-		m->m_nextpkt = m0->m_nextpkt;
-	else
-		m0 = m;
-	m0->m_nextpkt = m;
-	qtail(q) = m;
-	qlen(q)++;
-}
-
-static __inline struct mbuf *
-_getq(class_queue_t *q)
-{
-	struct mbuf  *m, *m0;
-
-	if ((m = qtail(q)) == NULL)
-		return (NULL);
-	if ((m0 = m->m_nextpkt) != m)
-		m->m_nextpkt = m0->m_nextpkt;
-	else
-		qtail(q) = NULL;
-	qlen(q)--;
-	m0->m_nextpkt = NULL;
-	return (m0);
-}
-
-/* drop a packet at the tail of the queue */
-static __inline struct mbuf *
-_getq_tail(class_queue_t *q)
-{
-	struct mbuf *m, *m0, *prev;
-
-	if ((m = m0 = qtail(q)) == NULL)
-		return NULL;
-	do {
-		prev = m0;
-		m0 = m0->m_nextpkt;
-	} while (m0 != m);
-	prev->m_nextpkt = m->m_nextpkt;
-	if (prev == m)
-		qtail(q) = NULL;
-	else
-		qtail(q) = prev;
-	qlen(q)--;
-	m->m_nextpkt = NULL;
-	return (m);
-}
-
-/* randomly select a packet in the queue */
-static __inline struct mbuf *
-_getq_random(class_queue_t *q)
-{
-	struct mbuf *m;
-	int i, n;
-
-	if ((m = qtail(q)) == NULL)
-		return NULL;
-	if (m->m_nextpkt == m)
-		qtail(q) = NULL;
-	else {
-		struct mbuf *prev = NULL;
-
-		n = random() % qlen(q) + 1;
-		for (i = 0; i < n; i++) {
-			prev = m;
-			m = m->m_nextpkt;
-		}
-		prev->m_nextpkt = m->m_nextpkt;
-		if (m == qtail(q))
-			qtail(q) = prev;
-	}
-	qlen(q)--;
-	m->m_nextpkt = NULL;
-	return (m);
-}
-
-static __inline void
-_removeq(class_queue_t *q, struct mbuf *m)
-{
-	struct mbuf *m0, *prev;
-
-	m0 = qtail(q);
-	do {
-		prev = m0;
-		m0 = m0->m_nextpkt;
-	} while (m0 != m);
-	prev->m_nextpkt = m->m_nextpkt;
-	if (prev == m)
-		qtail(q) = NULL;
-	else if (qtail(q) == m)
-		qtail(q) = prev;
-	qlen(q)--;
-}
-
-static __inline void
-_flushq(class_queue_t *q)
-{
-	struct mbuf *m;
-
-	while ((m = _getq(q)) != NULL)
-		m_freem(m);
-}
-
-#endif /* __GNUC__ && !ALTQ_DEBUG */
-
-#endif /* _KERNEL */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ALTQ_ALTQ_CLASSQ_H_ */
diff --git a/include.new/altq/altq_hfsc.h b/include.new/altq/altq_hfsc.h
deleted file mode 100644
index f343477..0000000
--- a/include.new/altq/altq_hfsc.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*	$KAME: altq_hfsc.h,v 1.12 2003/12/05 05:40:46 kjc Exp $	*/
-
-/*
- * Copyright (c) 1997-1999 Carnegie Mellon University. All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation is hereby granted (including for commercial or
- * for-profit use), provided that both the copyright notice and this
- * permission notice appear in all copies of the software, derivative
- * works, or modified versions, and any portions thereof.
- *
- * THIS SOFTWARE IS EXPERIMENTAL AND IS KNOWN TO HAVE BUGS, SOME OF
- * WHICH MAY HAVE SERIOUS CONSEQUENCES.  CARNEGIE MELLON PROVIDES THIS
- * SOFTWARE IN ITS ``AS IS'' CONDITION, 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 CARNEGIE MELLON UNIVERSITY 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.
- *
- * Carnegie Mellon encourages (but does not require) users of this
- * software to return any improvements or extensions that they make,
- * and to grant Carnegie Mellon the rights to redistribute these
- * changes without encumbrance.
- */
-#ifndef _ALTQ_ALTQ_HFSC_H_
-#define	_ALTQ_ALTQ_HFSC_H_
-
-#include <altq/altq.h>
-#include <altq/altq_classq.h>
-#include <altq/altq_red.h>
-#include <altq/altq_rio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct service_curve {
-	u_int	m1;	/* slope of the first segment in bits/sec */
-	u_int	d;	/* the x-projection of the first segment in msec */
-	u_int	m2;	/* slope of the second segment in bits/sec */
-};
-
-/* special class handles */
-#define	HFSC_NULLCLASS_HANDLE	0
-#define	HFSC_MAX_CLASSES	64
-
-/* hfsc class flags */
-#define	HFCF_RED		0x0001	/* use RED */
-#define	HFCF_ECN		0x0002  /* use RED/ECN */
-#define	HFCF_RIO		0x0004  /* use RIO */
-#define	HFCF_CLEARDSCP		0x0010  /* clear diffserv codepoint */
-#define	HFCF_DEFAULTCLASS	0x1000	/* default class */
-
-/* service curve types */
-#define	HFSC_REALTIMESC		1
-#define	HFSC_LINKSHARINGSC	2
-#define	HFSC_UPPERLIMITSC	4
-#define	HFSC_DEFAULTSC		(HFSC_REALTIMESC|HFSC_LINKSHARINGSC)
-
-struct hfsc_classstats {
-	u_int			class_id;
-	uint32_t		class_handle;
-	struct service_curve	rsc;
-	struct service_curve	fsc;
-	struct service_curve	usc;	/* upper limit service curve */
-
-	u_int64_t		total;	/* total work in bytes */
-	u_int64_t		cumul;	/* cumulative work in bytes
-					   done by real-time criteria */
-	u_int64_t		d;		/* deadline */
-	u_int64_t		e;		/* eligible time */
-	u_int64_t		vt;		/* virtual time */
-	u_int64_t		f;		/* fit time for upper-limit */
-
-	/* info helpful for debugging */
-	u_int64_t		initvt;		/* init virtual time */
-	u_int64_t		vtoff;		/* cl_vt_ipoff */
-	u_int64_t		cvtmax;		/* cl_maxvt */
-	u_int64_t		myf;		/* cl_myf */
-	u_int64_t		cfmin;		/* cl_mincf */
-	u_int64_t		cvtmin;		/* cl_mincvt */
-	u_int64_t		myfadj;		/* cl_myfadj */
-	u_int64_t		vtadj;		/* cl_vtadj */
-	u_int64_t		cur_time;
-	uint32_t		machclk_freq;
-
-	u_int			qlength;
-	u_int			qlimit;
-	struct pktcntr		xmit_cnt;
-	struct pktcntr		drop_cnt;
-	u_int			period;
-
-	u_int			vtperiod;	/* vt period sequence no */
-	u_int			parentperiod;	/* parent's vt period seqno */
-	int			nactive;	/* number of active children */
-
-	/* red and rio related info */
-	int			qtype;
-	struct redstats		red[3];
-};
-
-#ifdef ALTQ3_COMPAT
-struct hfsc_interface {
-	char	hfsc_ifname[IFNAMSIZ];  /* interface name (e.g., fxp0) */
-};
-
-struct hfsc_attach {
-	struct hfsc_interface	iface;
-	u_int			bandwidth;  /* link bandwidth in bits/sec */
-};
-
-struct hfsc_add_class {
-	struct hfsc_interface	iface;
-	uint32_t		parent_handle;
-	struct service_curve	service_curve;
-	int			qlimit;
-	int			flags;
-
-	uint32_t		class_handle;  /* return value */
-};
-
-struct hfsc_delete_class {
-	struct hfsc_interface	iface;
-	uint32_t		class_handle;
-};
-
-struct hfsc_modify_class {
-	struct hfsc_interface	iface;
-	uint32_t		class_handle;
-	struct service_curve	service_curve;
-	int			sctype;
-};
-
-struct hfsc_add_filter {
-	struct hfsc_interface	iface;
-	uint32_t		class_handle;
-	struct flow_filter	filter;
-
-	u_long			filter_handle;  /* return value */
-};
-
-struct hfsc_delete_filter {
-	struct hfsc_interface	iface;
-	u_long			filter_handle;
-};
-
-struct hfsc_class_stats {
-	struct hfsc_interface	iface;
-	int			nskip;		/* skip # of classes */
-	int			nclasses;	/* # of class stats (WR) */
-	u_int64_t		cur_time;	/* current time */
-	uint32_t		machclk_freq;	/* machine clock frequency */
-	u_int			hif_classes;	/* # of classes in the tree */
-	u_int			hif_packets;	/* # of packets in the tree */
-	struct hfsc_classstats	*stats;		/* pointer to stats array */
-};
-
-#define	HFSC_IF_ATTACH		_IOW('Q', 1, struct hfsc_attach)
-#define	HFSC_IF_DETACH		_IOW('Q', 2, struct hfsc_interface)
-#define	HFSC_ENABLE		_IOW('Q', 3, struct hfsc_interface)
-#define	HFSC_DISABLE		_IOW('Q', 4, struct hfsc_interface)
-#define	HFSC_CLEAR_HIERARCHY	_IOW('Q', 5, struct hfsc_interface)
-#define	HFSC_ADD_CLASS		_IOWR('Q', 7, struct hfsc_add_class)
-#define	HFSC_DEL_CLASS		_IOW('Q', 8, struct hfsc_delete_class)
-#define	HFSC_MOD_CLASS		_IOW('Q', 9, struct hfsc_modify_class)
-#define	HFSC_ADD_FILTER		_IOWR('Q', 10, struct hfsc_add_filter)
-#define	HFSC_DEL_FILTER		_IOW('Q', 11, struct hfsc_delete_filter)
-#define	HFSC_GETSTATS		_IOWR('Q', 12, struct hfsc_class_stats)
-#endif /* ALTQ3_COMPAT */
-
-#ifdef _KERNEL
-/*
- * kernel internal service curve representation
- *	coordinates are given by 64 bit unsigned integers.
- *	x-axis: unit is clock count.  for the intel x86 architecture,
- *		the raw Pentium TSC (Timestamp Counter) value is used.
- *		virtual time is also calculated in this time scale.
- *	y-axis: unit is byte.
- *
- *	the service curve parameters are converted to the internal
- *	representation.
- *	the slope values are scaled to avoid overflow.
- *	the inverse slope values as well as the y-projection of the 1st
- *	segment are kept in order to to avoid 64-bit divide operations
- *	that are expensive on 32-bit architectures.
- *
- *  note: Intel Pentium TSC never wraps around in several thousands of years.
- *	x-axis doesn't wrap around for 1089 years with 1GHz clock.
- *      y-axis doesn't wrap around for 4358 years with 1Gbps bandwidth.
- */
-
-/* kernel internal representation of a service curve */
-struct internal_sc {
-	u_int64_t	sm1;	/* scaled slope of the 1st segment */
-	u_int64_t	ism1;	/* scaled inverse-slope of the 1st segment */
-	u_int64_t	dx;	/* the x-projection of the 1st segment */
-	u_int64_t	dy;	/* the y-projection of the 1st segment */
-	u_int64_t	sm2;	/* scaled slope of the 2nd segment */
-	u_int64_t	ism2;	/* scaled inverse-slope of the 2nd segment */
-};
-
-/* runtime service curve */
-struct runtime_sc {
-	u_int64_t	x;	/* current starting position on x-axis */
-	u_int64_t	y;	/* current starting position on x-axis */
-	u_int64_t	sm1;	/* scaled slope of the 1st segment */
-	u_int64_t	ism1;	/* scaled inverse-slope of the 1st segment */
-	u_int64_t	dx;	/* the x-projection of the 1st segment */
-	u_int64_t	dy;	/* the y-projection of the 1st segment */
-	u_int64_t	sm2;	/* scaled slope of the 2nd segment */
-	u_int64_t	ism2;	/* scaled inverse-slope of the 2nd segment */
-};
-
-struct hfsc_class {
-	u_int		cl_id;		/* class id (just for debug) */
-	uint32_t	cl_handle;	/* class handle */
-	struct hfsc_if	*cl_hif;	/* back pointer to struct hfsc_if */
-	int		cl_flags;	/* misc flags */
-
-	struct hfsc_class *cl_parent;	/* parent class */
-	struct hfsc_class *cl_siblings;	/* sibling classes */
-	struct hfsc_class *cl_children;	/* child classes */
-
-	class_queue_t	*cl_q;		/* class queue structure */
-	struct red	*cl_red;	/* RED state */
-	struct altq_pktattr *cl_pktattr; /* saved header used by ECN */
-
-	u_int64_t	cl_total;	/* total work in bytes */
-	u_int64_t	cl_cumul;	/* cumulative work in bytes
-					   done by real-time criteria */
-	u_int64_t	cl_d;		/* deadline */
-	u_int64_t	cl_e;		/* eligible time */
-	u_int64_t	cl_vt;		/* virtual time */
-	u_int64_t	cl_f;		/* time when this class will fit for
-					   link-sharing, max(myf, cfmin) */
-	u_int64_t	cl_myf;		/* my fit-time (as calculated from this
-					   class's own upperlimit curve) */
-	u_int64_t	cl_myfadj;	/* my fit-time adjustment
-					   (to cancel history dependence) */
-	u_int64_t	cl_cfmin;	/* earliest children's fit-time (used
-					   with cl_myf to obtain cl_f) */
-	u_int64_t	cl_cvtmin;	/* minimal virtual time among the
-					   children fit for link-sharing
-					   (monotonic within a period) */
-	u_int64_t	cl_vtadj;	/* intra-period cumulative vt
-					   adjustment */
-	u_int64_t	cl_vtoff;	/* inter-period cumulative vt offset */
-	u_int64_t	cl_cvtmax;	/* max child's vt in the last period */
-
-	u_int64_t	cl_initvt;	/* init virtual time (for debugging) */
-
-	struct internal_sc *cl_rsc;	/* internal real-time service curve */
-	struct internal_sc *cl_fsc;	/* internal fair service curve */
-	struct internal_sc *cl_usc;	/* internal upperlimit service curve */
-	struct runtime_sc  cl_deadline;	/* deadline curve */
-	struct runtime_sc  cl_eligible;	/* eligible curve */
-	struct runtime_sc  cl_virtual;	/* virtual curve */
-	struct runtime_sc  cl_ulimit;	/* upperlimit curve */
-
-	u_int		cl_vtperiod;	/* vt period sequence no */
-	u_int		cl_parentperiod;  /* parent's vt period seqno */
-	int		cl_nactive;	/* number of active children */
-
-	TAILQ_HEAD(acthead, hfsc_class) cl_actc; /* active children list */
-	TAILQ_ENTRY(hfsc_class)	cl_actlist;	/* active children list entry */
-	TAILQ_ENTRY(hfsc_class)	cl_ellist;	/* eligible list entry */
-
-	struct {
-		struct pktcntr	xmit_cnt;
-		struct pktcntr	drop_cnt;
-		u_int period;
-	} cl_stats;
-};
-
-/*
- * hfsc interface state
- */
-struct hfsc_if {
-	struct hfsc_if		*hif_next;	/* interface state list */
-	struct ifaltq		*hif_ifq;	/* backpointer to ifaltq */
-	struct hfsc_class	*hif_rootclass;		/* root class */
-	struct hfsc_class	*hif_defaultclass;	/* default class */
-	struct hfsc_class	*hif_class_tbl[HFSC_MAX_CLASSES];
-	struct hfsc_class	*hif_pollcache;	/* cache for poll operation */
-
-	u_int	hif_classes;			/* # of classes in the tree */
-	u_int	hif_packets;			/* # of packets in the tree */
-	u_int	hif_classid;			/* class id sequence number */
-
-	TAILQ_HEAD(elighead, hfsc_class) hif_eligible; /* eligible list */
-
-#ifdef ALTQ3_CLFIER_COMPAT
-	struct acc_classifier	hif_classifier;
-#endif
-};
-
-#endif /* _KERNEL */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ALTQ_ALTQ_HFSC_H_ */
diff --git a/include.new/altq/altq_priq.h b/include.new/altq/altq_priq.h
deleted file mode 100644
index 2851702..0000000
--- a/include.new/altq/altq_priq.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*	$KAME: altq_priq.h,v 1.7 2003/10/03 05:05:15 kjc Exp $	*/
-/*
- * Copyright (C) 2000-2003
- *	Sony Computer Science Laboratories Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY SONY CSL 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 SONY CSL 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.
- */
-
-#ifndef _ALTQ_ALTQ_PRIQ_H_
-#define	_ALTQ_ALTQ_PRIQ_H_
-
-#include <altq/altq.h>
-#include <altq/altq_classq.h>
-#include <altq/altq_red.h>
-#include <altq/altq_rio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	PRIQ_MAXPRI	16	/* upper limit of the number of priorities */
-
-#ifdef ALTQ3_COMPAT
-struct priq_interface {
-	char	ifname[IFNAMSIZ];	/* interface name (e.g., fxp0) */
-	u_long	arg;			/* request-specific argument */
-};
-
-struct priq_add_class {
-	struct priq_interface	iface;
-	int			pri;	/* priority (0 is the lowest) */
-	int			qlimit;	/* queue size limit */
-	int			flags;	/* misc flags (see below) */
-
-	uint32_t		class_handle;  /* return value */
-};
-#endif /* ALTQ3_COMPAT */
-
-/* priq class flags */
-#define	PRCF_RED		0x0001	/* use RED */
-#define	PRCF_ECN		0x0002  /* use RED/ECN */
-#define	PRCF_RIO		0x0004  /* use RIO */
-#define	PRCF_CLEARDSCP		0x0010  /* clear diffserv codepoint */
-#define	PRCF_DEFAULTCLASS	0x1000	/* default class */
-
-/* special class handles */
-#define	PRIQ_NULLCLASS_HANDLE	0
-
-#ifdef ALTQ3_COMPAT
-struct priq_delete_class {
-	struct priq_interface	iface;
-	uint32_t		class_handle;
-};
-
-struct priq_modify_class {
-	struct priq_interface	iface;
-	uint32_t		class_handle;
-	int			pri;
-	int			qlimit;
-	int			flags;
-};
-
-struct priq_add_filter {
-	struct priq_interface	iface;
-	uint32_t		class_handle;
-	struct flow_filter	filter;
-
-	u_long			filter_handle;  /* return value */
-};
-
-struct priq_delete_filter {
-	struct priq_interface	iface;
-	u_long			filter_handle;
-};
-#endif /* ALTQ3_COMPAT */
-
-struct priq_classstats {
-	uint32_t		class_handle;
-
-	u_int			qlength;
-	u_int			qlimit;
-	u_int			period;
-	struct pktcntr		xmitcnt;  /* transmitted packet counter */
-	struct pktcntr		dropcnt;  /* dropped packet counter */
-
-	/* red and rio related info */
-	int			qtype;
-	struct redstats		red[3];	/* rio has 3 red stats */
-};
-
-#ifdef ALTQ3_COMPAT
-struct priq_class_stats {
-	struct priq_interface	iface;
-	int			maxpri;	  /* in/out */
-
-	struct priq_classstats	*stats;   /* pointer to stats array */
-};
-
-#define	PRIQ_IF_ATTACH		_IOW('Q', 1, struct priq_interface)
-#define	PRIQ_IF_DETACH		_IOW('Q', 2, struct priq_interface)
-#define	PRIQ_ENABLE		_IOW('Q', 3, struct priq_interface)
-#define	PRIQ_DISABLE		_IOW('Q', 4, struct priq_interface)
-#define	PRIQ_CLEAR		_IOW('Q', 5, struct priq_interface)
-#define	PRIQ_ADD_CLASS		_IOWR('Q', 7, struct priq_add_class)
-#define	PRIQ_DEL_CLASS		_IOW('Q', 8, struct priq_delete_class)
-#define	PRIQ_MOD_CLASS		_IOW('Q', 9, struct priq_modify_class)
-#define	PRIQ_ADD_FILTER		_IOWR('Q', 10, struct priq_add_filter)
-#define	PRIQ_DEL_FILTER		_IOW('Q', 11, struct priq_delete_filter)
-#define	PRIQ_GETSTATS		_IOWR('Q', 12, struct priq_class_stats)
-
-#endif /* ALTQ3_COMPAT */
-
-#ifdef _KERNEL
-
-struct priq_class {
-	uint32_t	cl_handle;	/* class handle */
-	class_queue_t	*cl_q;		/* class queue structure */
-	struct red	*cl_red;	/* RED state */
-	int		cl_pri;		/* priority */
-	int		cl_flags;	/* class flags */
-	struct priq_if	*cl_pif;	/* back pointer to pif */
-	struct altq_pktattr *cl_pktattr; /* saved header used by ECN */
-
-	/* statistics */
-	u_int		cl_period;	/* backlog period */
-	struct pktcntr  cl_xmitcnt;	/* transmitted packet counter */
-	struct pktcntr  cl_dropcnt;	/* dropped packet counter */
-};
-
-/*
- * priq interface state
- */
-struct priq_if {
-	struct priq_if		*pif_next;	/* interface state list */
-	struct ifaltq		*pif_ifq;	/* backpointer to ifaltq */
-	u_int			pif_bandwidth;	/* link bandwidth in bps */
-	int			pif_maxpri;	/* max priority in use */
-	struct priq_class	*pif_default;	/* default class */
-	struct priq_class	*pif_classes[PRIQ_MAXPRI]; /* classes */
-#ifdef ALTQ3_CLFIER_COMPAT
-	struct acc_classifier	pif_classifier;	/* classifier */
-#endif
-};
-
-#endif /* _KERNEL */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ALTQ_ALTQ_PRIQ_H_ */
diff --git a/include.new/altq/altq_red.h b/include.new/altq/altq_red.h
deleted file mode 100644
index dc8ea0a..0000000
--- a/include.new/altq/altq_red.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*	$KAME: altq_red.h,v 1.8 2003/07/10 12:07:49 kjc Exp $	*/
-
-/*
- * Copyright (C) 1997-2003
- *	Sony Computer Science Laboratories Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY SONY CSL 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 SONY CSL 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.
- */
-
-#ifndef _ALTQ_ALTQ_RED_H_
-#define	_ALTQ_ALTQ_RED_H_
-
-#include <altq/altq_classq.h>
-
-#ifdef ALTQ3_COMPAT
-struct red_interface {
-	char	red_ifname[IFNAMSIZ];
-};
-
-struct red_stats {
-	struct red_interface iface;
-	int q_len;
-	int q_avg;
-
-	struct pktcntr	xmit_cnt;
-	struct pktcntr	drop_cnt;
-	u_int		drop_forced;
-	u_int		drop_unforced;
-	u_int		marked_packets;
-
-	/* static red parameters */
-	int q_limit;
-	int weight;
-	int inv_pmax;
-	int th_min;
-	int th_max;
-
-	/* flowvalve related stuff */
-	u_int fv_flows;
-	u_int fv_pass;
-	u_int fv_predrop;
-	u_int fv_alloc;
-	u_int fv_escape;
-};
-
-struct red_conf {
-	struct red_interface iface;
-	int red_weight;		/* weight for EWMA */
-	int red_inv_pmax;	/* inverse of max drop probability */
-	int red_thmin;		/* red min threshold */
-	int red_thmax;		/* red max threshold */
-	int red_limit;		/* max queue length */
-	int red_pkttime;	/* average packet time in usec */
-	int red_flags;		/* see below */
-};
-#endif /* ALTQ3_COMPAT */
-
-/* red flags */
-#define	REDF_ECN4	0x01	/* use packet marking for IPv4 packets */
-#define	REDF_ECN6	0x02	/* use packet marking for IPv6 packets */
-#define	REDF_ECN	(REDF_ECN4 | REDF_ECN6)
-#define	REDF_FLOWVALVE	0x04	/* use flowvalve (aka penalty-box) */
-
-/*
- * simpler versions of red parameters and statistics used by other
- * disciplines (e.g., CBQ)
- */
-struct redparams {
-	int th_min;		/* red min threshold */
-	int th_max;		/* red max threshold */
-	int inv_pmax;		/* inverse of max drop probability */
-};
-
-struct redstats {
-	int		q_avg;
-	struct pktcntr	xmit_cnt;
-	struct pktcntr	drop_cnt;
-	u_int		drop_forced;
-	u_int		drop_unforced;
-	u_int		marked_packets;
-};
-
-#ifdef ALTQ3_COMPAT
-/*
- * IOCTLs for RED
- */
-#define	RED_IF_ATTACH		_IOW('Q', 1, struct red_interface)
-#define	RED_IF_DETACH		_IOW('Q', 2, struct red_interface)
-#define	RED_ENABLE		_IOW('Q', 3, struct red_interface)
-#define	RED_DISABLE		_IOW('Q', 4, struct red_interface)
-#define	RED_CONFIG		_IOWR('Q', 6, struct red_conf)
-#define	RED_GETSTATS		_IOWR('Q', 12, struct red_stats)
-#define	RED_SETDEFAULTS		_IOW('Q', 30, struct redparams)
-#endif /* ALTQ3_COMPAT */
-
-#ifdef _KERNEL
-
-#ifdef ALTQ3_COMPAT
-struct flowvalve;
-#endif
-
-/* weight table structure for idle time calibration */
-struct wtab {
-	struct wtab	*w_next;
-	int		 w_weight;
-	int		 w_param_max;
-	int		 w_refcount;
-	int32_t		 w_tab[32];
-};
-
-typedef struct red {
-	int		red_pkttime;	/* average packet time in micro sec
-					   used for idle calibration */
-	int		red_flags;	/* red flags */
-
-	/* red parameters */
-	int		red_weight;	/* weight for EWMA */
-	int		red_inv_pmax;	/* inverse of max drop probability */
-	int		red_thmin;	/* red min threshold */
-	int		red_thmax;	/* red max threshold */
-
-	/* variables for internal use */
-	int		red_wshift;	/* log(red_weight) */
-	int		red_thmin_s;	/* th_min scaled by avgshift */
-	int		red_thmax_s;	/* th_max scaled by avgshift */
-	int		red_probd;	/* drop probability denominator */
-
-	int		red_avg;	/* queue len avg scaled by avgshift */
-	int		red_count;	/* packet count since last dropped/
-					   marked packet */
-	int		red_idle;	/* queue was empty */
-	int		red_old;	/* avg is above th_min */
-	struct wtab	*red_wtab;	/* weight table */
-	struct timeval	 red_last;	/* time when the queue becomes idle */
-
-#ifdef ALTQ3_COMPAT
-	struct flowvalve *red_flowvalve;	/* flowvalve state */
-#endif
-
-	struct {
-		struct pktcntr	xmit_cnt;
-		struct pktcntr	drop_cnt;
-		u_int		drop_forced;
-		u_int		drop_unforced;
-		u_int		marked_packets;
-	} red_stats;
-} red_t;
-
-#ifdef ALTQ3_COMPAT
-typedef struct red_queue {
-	struct red_queue *rq_next;	/* next red_state in the list */
-	struct ifaltq *rq_ifq;		/* backpointer to ifaltq */
-
-	class_queue_t *rq_q;
-
-	red_t *rq_red;
-} red_queue_t;
-#endif /* ALTQ3_COMPAT */
-
-/* red drop types */
-#define	DTYPE_NODROP	0	/* no drop */
-#define	DTYPE_FORCED	1	/* a "forced" drop */
-#define	DTYPE_EARLY	2	/* an "unforced" (early) drop */
-
-extern red_t		*red_alloc(int, int, int, int, int, int);
-extern void		 red_destroy(red_t *);
-extern void		 red_getstats(red_t *, struct redstats *);
-extern int		 red_addq(red_t *, class_queue_t *, struct mbuf *,
-			     struct altq_pktattr *);
-extern struct mbuf	*red_getq(red_t *, class_queue_t *);
-extern int		 drop_early(int, int, int);
-extern int		 mark_ecn(struct mbuf *, struct altq_pktattr *, int);
-extern struct wtab	*wtab_alloc(int);
-extern int		 wtab_destroy(struct wtab *);
-extern int32_t		 pow_w(struct wtab *, int);
-
-#endif /* _KERNEL */
-
-#endif /* _ALTQ_ALTQ_RED_H_ */
diff --git a/include.new/altq/altq_rio.h b/include.new/altq/altq_rio.h
deleted file mode 100644
index 83210f2..0000000
--- a/include.new/altq/altq_rio.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*	$KAME: altq_rio.h,v 1.9 2003/07/10 12:07:49 kjc Exp $	*/
-
-/*
- * Copyright (C) 1998-2003
- *	Sony Computer Science Laboratories Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY SONY CSL 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 SONY CSL 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.
- */
-
-#ifndef _ALTQ_ALTQ_RIO_H_
-#define	_ALTQ_ALTQ_RIO_H_
-
-#include <altq/altq_classq.h>
-
-/*
- * RIO: RED with IN/OUT bit
- * (extended to support more than 2 drop precedence values)
- */
-#define	RIO_NDROPPREC	3	/* number of drop precedence values */
-
-#ifdef ALTQ3_COMPAT
-struct rio_interface {
-	char	rio_ifname[IFNAMSIZ];
-};
-
-struct rio_stats {
-	struct rio_interface iface;
-	int q_len[RIO_NDROPPREC];
-	struct redstats q_stats[RIO_NDROPPREC];
-
-	/* static red parameters */
-	int q_limit;
-	int weight;
-	int flags;
-	struct redparams q_params[RIO_NDROPPREC];
-};
-
-struct rio_conf {
-	struct rio_interface iface;
-	struct redparams q_params[RIO_NDROPPREC];
-	int rio_weight;		/* weight for EWMA */
-	int rio_limit;		/* max queue length */
-	int rio_pkttime;	/* average packet time in usec */
-	int rio_flags;		/* see below */
-};
-#endif /* ALTQ3_COMPAT */
-
-/* rio flags */
-#define	RIOF_ECN4	0x01	/* use packet marking for IPv4 packets */
-#define	RIOF_ECN6	0x02	/* use packet marking for IPv6 packets */
-#define	RIOF_ECN	(RIOF_ECN4 | RIOF_ECN6)
-#define	RIOF_CLEARDSCP	0x200	/* clear diffserv codepoint */
-
-#ifdef ALTQ3_COMPAT
-/*
- * IOCTLs for RIO
- */
-#define	RIO_IF_ATTACH		_IOW('Q', 1, struct rio_interface)
-#define	RIO_IF_DETACH		_IOW('Q', 2, struct rio_interface)
-#define	RIO_ENABLE		_IOW('Q', 3, struct rio_interface)
-#define	RIO_DISABLE		_IOW('Q', 4, struct rio_interface)
-#define	RIO_CONFIG		_IOWR('Q', 6, struct rio_conf)
-#define	RIO_GETSTATS		_IOWR('Q', 12, struct rio_stats)
-#define	RIO_SETDEFAULTS		_IOW('Q', 30, struct redparams[RIO_NDROPPREC])
-#endif /* ALTQ3_COMPAT */
-
-#ifdef _KERNEL
-
-typedef struct rio {
-	/* per drop precedence structure */
-	struct dropprec_state {
-		/* red parameters */
-		int	inv_pmax;	/* inverse of max drop probability */
-		int	th_min;		/* red min threshold */
-		int	th_max;		/* red max threshold */
-
-		/* variables for internal use */
-		int	th_min_s;	/* th_min scaled by avgshift */
-		int	th_max_s;	/* th_max scaled by avgshift */
-		int	probd;		/* drop probability denominator */
-
-		int	qlen;		/* queue length */
-		int	avg;		/* (scaled) queue length average */
-		int	count;		/* packet count since the last dropped/
-					   marked packet */
-		int	idle;		/* queue was empty */
-		int	old;		/* avg is above th_min */
-		struct timeval	last;	/* timestamp when queue becomes idle */
-	} rio_precstate[RIO_NDROPPREC];
-
-	int		 rio_wshift;	/* log(red_weight) */
-	int		 rio_weight;	/* weight for EWMA */
-	struct wtab	*rio_wtab;	/* weight table */
-
-	int		 rio_pkttime;	/* average packet time in micro sec
-					   used for idle calibration */
-	int		 rio_flags;	/* rio flags */
-
-	u_int8_t	 rio_codepoint;	/* codepoint value to tag packets */
-	u_int8_t	 rio_codepointmask;	/* codepoint mask bits */
-
-	struct redstats q_stats[RIO_NDROPPREC];	/* statistics */
-} rio_t;
-
-#ifdef ALTQ3_COMPAT
-typedef struct rio_queue {
-	struct rio_queue	*rq_next;	/* next red_state in the list */
-	struct ifaltq		*rq_ifq;	/* backpointer to ifaltq */
-
-	class_queue_t		*rq_q;
-
-	rio_t			*rq_rio;
-} rio_queue_t;
-#endif /* ALTQ3_COMPAT */
-
-extern rio_t		*rio_alloc(int, struct redparams *, int, int);
-extern void		 rio_destroy(rio_t *);
-extern void		 rio_getstats(rio_t *, struct redstats *);
-extern int		 rio_addq(rio_t *, class_queue_t *, struct mbuf *,
-			     struct altq_pktattr *);
-extern struct mbuf	*rio_getq(rio_t *, class_queue_t *);
-
-#endif /* _KERNEL */
-
-#endif /* _ALTQ_ALTQ_RIO_H_ */
diff --git a/include.new/altq/altq_rmclass.h b/include.new/altq/altq_rmclass.h
deleted file mode 100644
index cf0ddf4..0000000
--- a/include.new/altq/altq_rmclass.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*	$KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $	*/
-
-/*
- * Copyright (c) 1991-1997 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 Network Research
- *	Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory 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.
- */
-
-#ifndef _ALTQ_ALTQ_RMCLASS_H_
-#define	_ALTQ_ALTQ_RMCLASS_H_
-
-#include <altq/altq_classq.h>
-
-/* #pragma ident "@(#)rm_class.h  1.20     97/10/23 SMI" */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	RM_MAXPRIO	8	/* Max priority */
-
-#ifdef _KERNEL
-
-typedef struct mbuf		mbuf_t;
-typedef struct rm_ifdat		rm_ifdat_t;
-typedef struct rm_class		rm_class_t;
-
-struct red;
-
-/*
- * Macros for dealing with time values.  We assume all times are
- * 'timevals'.  `microtime' is used to get the best available clock
- * resolution.  If `microtime' *doesn't* return a value that's about
- * ten times smaller than the average packet time on the fastest
- * link that will use these routines, a slightly different clock
- * scheme than this one should be used.
- * (Bias due to truncation error in this scheme will overestimate utilization
- * and discriminate against high bandwidth classes.  To remove this bias an
- * integrator needs to be added.  The simplest integrator uses a history of
- * 10 * avg.packet.time / min.tick.time packet completion entries.  This is
- * straight forward to add but we don't want to pay the extra memory
- * traffic to maintain it if it's not necessary (occasionally a vendor
- * accidentally builds a workstation with a decent clock - e.g., Sun & HP).)
- */
-
-#define	RM_GETTIME(now) microtime(&now)
-
-#define	TV_LT(a, b) (((a)->tv_sec < (b)->tv_sec) ||  \
-	(((a)->tv_usec < (b)->tv_usec) && ((a)->tv_sec <= (b)->tv_sec)))
-
-#define	TV_DELTA(a, b, delta) { \
-	register int	xxs;	\
-							\
-	delta = (a)->tv_usec - (b)->tv_usec; \
-	if ((xxs = (a)->tv_sec - (b)->tv_sec)) { \
-		switch (xxs) { \
-		default: \
-			/* if (xxs < 0) \
-				printf("rm_class: bogus time values\n"); */ \
-			delta = 0; \
-			/* fall through */ \
-		case 2: \
-			delta += 1000000; \
-			/* fall through */ \
-		case 1: \
-			delta += 1000000; \
-			break; \
-		} \
-	} \
-}
-
-#define	TV_ADD_DELTA(a, delta, res) { \
-	register int xxus = (a)->tv_usec + (delta); \
-	\
-	(res)->tv_sec = (a)->tv_sec; \
-	while (xxus >= 1000000) { \
-		++((res)->tv_sec); \
-		xxus -= 1000000; \
-	} \
-	(res)->tv_usec = xxus; \
-}
-
-#define	RM_TIMEOUT	2	/* 1 Clock tick. */
-
-#if 1
-#define	RM_MAXQUEUED	1	/* this isn't used in ALTQ/CBQ */
-#else
-#define	RM_MAXQUEUED	16	/* Max number of packets downstream of CBQ */
-#endif
-#define	RM_MAXQUEUE	64	/* Max queue length */
-#define	RM_FILTER_GAIN	5	/* log2 of gain, e.g., 5 => 31/32 */
-#define	RM_POWER	(1 << RM_FILTER_GAIN)
-#define	RM_MAXDEPTH	32
-#define	RM_NS_PER_SEC	(1000000000)
-
-typedef struct _rm_class_stats_ {
-	u_int		handle;
-	u_int		depth;
-
-	struct pktcntr	xmit_cnt;	/* packets sent in this class */
-	struct pktcntr	drop_cnt;	/* dropped packets */
-	u_int		over;		/* # times went over limit */
-	u_int		borrows;	/* # times tried to borrow */
-	u_int		overactions;	/* # times invoked overlimit action */
-	u_int		delays;		/* # times invoked delay actions */
-} rm_class_stats_t;
-
-/*
- * CBQ Class state structure
- */
-struct rm_class {
-	class_queue_t	*q_;		/* Queue of packets */
-	rm_ifdat_t	*ifdat_;
-	int		pri_;		/* Class priority. */
-	int		depth_;		/* Class depth */
-	u_int		ns_per_byte_;	/* NanoSeconds per byte. */
-	u_int		maxrate_;	/* Bytes per second for this class. */
-	u_int		allotment_;	/* Fraction of link bandwidth. */
-	u_int		w_allotment_;	/* Weighted allotment for WRR */
-	int		bytes_alloc_;	/* Allocation for round of WRR */
-
-	int		avgidle_;
-	int		maxidle_;
-	int		minidle_;
-	int		offtime_;
-	int		sleeping_;	/* != 0 if delaying */
-	int		qthresh_;	/* Queue threshold for formal link sharing */
-	int		leaf_;		/* Note whether leaf class or not.*/
-
-	rm_class_t	*children_;	/* Children of this class */
-	rm_class_t	*next_;		/* Next pointer, used if child */
-
-	rm_class_t	*peer_;		/* Peer class */
-	rm_class_t	*borrow_;	/* Borrow class */
-	rm_class_t	*parent_;	/* Parent class */
-
-	void	(*overlimit)(struct rm_class *, struct rm_class *);
-	void	(*drop)(struct rm_class *);       /* Class drop action. */
-
-	struct red	*red_;		/* RED state pointer */
-	struct altq_pktattr *pktattr_;	/* saved hdr used by RED/ECN */
-	int		flags_;
-
-	int		last_pkttime_;	/* saved pkt_time */
-	struct timeval	undertime_;	/* time can next send */
-	struct timeval	last_;		/* time last packet sent */
-	struct timeval	overtime_;
-	struct callout	callout_; 	/* for timeout() calls */
-
-	rm_class_stats_t stats_;	/* Class Statistics */
-};
-
-/*
- * CBQ Interface state
- */
-struct rm_ifdat {
-	int		queued_;	/* # pkts queued downstream */
-	int		efficient_;	/* Link Efficency bit */
-	int		wrr_;		/* Enable Weighted Round-Robin */
-	u_long		ns_per_byte_;	/* Link byte speed. */
-	int		maxqueued_;	/* Max packets to queue */
-	int		maxpkt_;	/* Max packet size. */
-	int		qi_;		/* In/out pointers for downstream */
-	int		qo_;		/* packets */
-
-	/*
-	 * Active class state and WRR state.
-	 */
-	rm_class_t	*active_[RM_MAXPRIO];	/* Active cl's in each pri */
-	int		na_[RM_MAXPRIO];	/* # of active cl's in a pri */
-	int		num_[RM_MAXPRIO];	/* # of cl's per pri */
-	int		alloc_[RM_MAXPRIO];	/* Byte Allocation */
-	u_long		M_[RM_MAXPRIO];		/* WRR weights. */
-
-	/*
-	 * Network Interface/Solaris Queue state pointer.
-	 */
-	struct ifaltq	*ifq_;
-	rm_class_t	*default_;	/* Default Pkt class, BE */
-	rm_class_t	*root_;		/* Root Link class. */
-	rm_class_t	*ctl_;		/* Control Traffic class. */
-	void		(*restart)(struct ifaltq *);	/* Restart routine. */
-
-	/*
-	 * Current packet downstream packet state and dynamic state.
-	 */
-	rm_class_t	*borrowed_[RM_MAXQUEUED]; /* Class borrowed last */
-	rm_class_t	*class_[RM_MAXQUEUED];	/* class sending */
-	int		curlen_[RM_MAXQUEUED];	/* Current pktlen */
-	struct timeval	now_[RM_MAXQUEUED];	/* Current packet time. */
-	int		is_overlimit_[RM_MAXQUEUED];/* Current packet time. */
-
-	int		cutoff_;	/* Cut-off depth for borrowing */
-
-	struct timeval	ifnow_;		/* expected xmit completion time */
-#if 1 /* ALTQ4PPP */
-	int		maxiftime_;	/* max delay inside interface */
-#endif
-        rm_class_t	*pollcache_;	/* cached rm_class by poll operation */
-};
-
-/* flags for rmc_init and rmc_newclass */
-/* class flags */
-#define	RMCF_RED		0x0001
-#define	RMCF_ECN		0x0002
-#define	RMCF_RIO		0x0004
-#define	RMCF_FLOWVALVE		0x0008	/* use flowvalve (aka penalty-box) */
-#define	RMCF_CLEARDSCP		0x0010  /* clear diffserv codepoint */
-
-/* flags for rmc_init */
-#define	RMCF_WRR		0x0100
-#define	RMCF_EFFICIENT		0x0200
-
-#define	is_a_parent_class(cl)	((cl)->children_ != NULL)
-
-extern rm_class_t *rmc_newclass(int, struct rm_ifdat *, u_int,
-				void (*)(struct rm_class *, struct rm_class *),
-				int, struct rm_class *, struct rm_class *,
-				u_int, int, u_int, int, int);
-extern void	rmc_delete_class(struct rm_ifdat *, struct rm_class *);
-extern int 	rmc_modclass(struct rm_class *, u_int, int,
-			     u_int, int, u_int, int);
-extern void	rmc_init(struct ifaltq *, struct rm_ifdat *, u_int,
-			 void (*)(struct ifaltq *),
-			 int, int, u_int, int, u_int, int);
-extern int	rmc_queue_packet(struct rm_class *, mbuf_t *);
-extern mbuf_t	*rmc_dequeue_next(struct rm_ifdat *, int);
-extern void	rmc_update_class_util(struct rm_ifdat *);
-extern void	rmc_delay_action(struct rm_class *, struct rm_class *);
-extern void	rmc_dropall(struct rm_class *);
-extern int	rmc_get_weight(struct rm_ifdat *, int);
-
-#endif /* _KERNEL */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ALTQ_ALTQ_RMCLASS_H_ */
diff --git a/include.new/altq/altq_rmclass_debug.h b/include.new/altq/altq_rmclass_debug.h
deleted file mode 100644
index 8f471b2..0000000
--- a/include.new/altq/altq_rmclass_debug.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*	$KAME: altq_rmclass_debug.h,v 1.3 2002/11/29 04:36:24 kjc Exp $	*/
-
-/*
- * Copyright (c) Sun Microsystems, Inc. 1998 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 SMCC Technology
- *      Development Group at Sun Microsystems, Inc.
- *
- * 4. The name of the Sun Microsystems, Inc nor may not be used to endorse or
- *      promote products derived from this software without specific prior
- *      written permission.
- *
- * SUN MICROSYSTEMS DOES NOT CLAIM MERCHANTABILITY OF THIS SOFTWARE OR THE
- * SUITABILITY OF THIS SOFTWARE FOR ANY PARTICULAR PURPOSE.  The software is
- * provided "as is" without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this software.
- */
-
-#ifndef _ALTQ_ALTQ_RMCLASS_DEBUG_H_
-#define	_ALTQ_ALTQ_RMCLASS_DEBUG_H_
-
-/* #pragma ident	"@(#)rm_class_debug.h	1.7	98/05/04 SMI" */
-
-/*
- * Cbq debugging macros
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef	CBQ_TRACE
-#ifndef NCBQTRACE
-#define	NCBQTRACE (16 * 1024)
-#endif
-
-/*
- * To view the trace output, using adb, type:
- *	adb -k /dev/ksyms /dev/mem <cr>, then type
- *	cbqtrace_count/D to get the count, then type
- *	cbqtrace_buffer,0tcount/Dp4C" "Xn
- *	This will dump the trace buffer from 0 to count.
- */
-/*
- * in ALTQ, "call cbqtrace_dump(N)" from DDB to display 20 events
- * from Nth event in the circular buffer.
- */
-
-struct cbqtrace {
-	int count;
-	int function;		/* address of function */
-	int trace_action;	/* descriptive 4 characters */
-	int object;		/* object operated on */
-};
-
-extern struct cbqtrace cbqtrace_buffer[];
-extern struct cbqtrace *cbqtrace_ptr;
-extern int cbqtrace_count;
-
-#define	CBQTRACEINIT() {				\
-	if (cbqtrace_ptr == NULL)		\
-		cbqtrace_ptr = cbqtrace_buffer; \
-	else { \
-		cbqtrace_ptr = cbqtrace_buffer; \
-		bzero((void *)cbqtrace_ptr, sizeof(cbqtrace_buffer)); \
-		cbqtrace_count = 0; \
-	} \
-}
-
-#define	LOCK_TRACE()	splimp()
-#define	UNLOCK_TRACE(x)	splx(x)
-
-#define	CBQTRACE(func, act, obj) {		\
-	int __s = LOCK_TRACE();			\
-	int *_p = &cbqtrace_ptr->count;	\
-	*_p++ = ++cbqtrace_count;		\
-	*_p++ = (int)(func);			\
-	*_p++ = (int)(act);			\
-	*_p++ = (int)(obj);			\
-	if ((struct cbqtrace *)(void *)_p >= &cbqtrace_buffer[NCBQTRACE])\
-		cbqtrace_ptr = cbqtrace_buffer; \
-	else					\
-		cbqtrace_ptr = (struct cbqtrace *)(void *)_p; \
-	UNLOCK_TRACE(__s);			\
-	}
-#else
-
-/* If no tracing, define no-ops */
-#define	CBQTRACEINIT()
-#define	CBQTRACE(a, b, c)
-
-#endif	/* !CBQ_TRACE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* _ALTQ_ALTQ_RMCLASS_DEBUG_H_ */
diff --git a/include.new/altq/altq_var.h b/include.new/altq/altq_var.h
deleted file mode 100644
index 75f9c8b..0000000
--- a/include.new/altq/altq_var.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/altq/altq/altq_var.h 219457 2011-03-10 18:49:15Z jkim $	*/
-/*	$KAME: altq_var.h,v 1.16 2003/10/03 05:05:15 kjc Exp $	*/
-
-/*
- * Copyright (C) 1998-2003
- *	Sony Computer Science Laboratories Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY SONY CSL 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 SONY CSL 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.
- */
-#ifndef _ALTQ_ALTQ_VAR_H_
-#define	_ALTQ_ALTQ_VAR_H_
-
-#ifdef _KERNEL
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/queue.h>
-
-#ifdef ALTQ3_CLFIER_COMPAT
-/*
- * filter structure for altq common classifier
- */
-struct acc_filter {
-	LIST_ENTRY(acc_filter)	f_chain;
-	void			*f_class;	/* pointer to the class */
-	u_long			f_handle;	/* filter id */
-	uint32_t		f_fbmask;	/* filter bitmask */
-	struct flow_filter	f_filter;	/* filter value */
-};
-
-/*
- * XXX ACC_FILTER_TABLESIZE can't be larger than 2048 unless we fix
- * the handle assignment.
- */
-#define	ACC_FILTER_TABLESIZE	(256+1)
-#define	ACC_FILTER_MASK		(ACC_FILTER_TABLESIZE - 2)
-#define	ACC_WILDCARD_INDEX	(ACC_FILTER_TABLESIZE - 1)
-#ifdef __GNUC__
-#define	ACC_GET_HASH_INDEX(addr) \
-	({int x = (addr) + ((addr) >> 16); (x + (x >> 8)) & ACC_FILTER_MASK;})
-#else
-#define	ACC_GET_HASH_INDEX(addr) \
-	(((addr) + ((addr) >> 8) + ((addr) >> 16) + ((addr) >> 24)) \
-	& ACC_FILTER_MASK)
-#endif
-#define	ACC_GET_HINDEX(handle) ((handle) >> 20)
-
-#if (__FreeBSD_version > 500000)
-#define ACC_LOCK_INIT(ac)	mtx_init(&(ac)->acc_mtx, "classifier", MTX_DEF)
-#define ACC_LOCK_DESTROY(ac)	mtx_destroy(&(ac)->acc_mtx)
-#define ACC_LOCK(ac)		mtx_lock(&(ac)->acc_mtx)
-#define ACC_UNLOCK(ac)		mtx_unlock(&(ac)->acc_mtx)
-#else
-#define ACC_LOCK_INIT(ac)
-#define ACC_LOCK_DESTROY(ac)
-#define ACC_LOCK(ac)
-#define ACC_UNLOCK(ac)
-#endif
-
-struct acc_classifier {
-	uint32_t			acc_fbmask;
-	LIST_HEAD(filt, acc_filter)	acc_filters[ACC_FILTER_TABLESIZE];
-
-#if (__FreeBSD_version > 500000)
-	struct	mtx acc_mtx;
-#endif
-};
-
-/*
- * flowinfo mask bits used by classifier
- */
-/* for ipv4 */
-#define	FIMB4_PROTO	0x0001
-#define	FIMB4_TOS	0x0002
-#define	FIMB4_DADDR	0x0004
-#define	FIMB4_SADDR	0x0008
-#define	FIMB4_DPORT	0x0010
-#define	FIMB4_SPORT	0x0020
-#define	FIMB4_GPI	0x0040
-#define	FIMB4_ALL	0x007f
-/* for ipv6 */
-#define	FIMB6_PROTO	0x0100
-#define	FIMB6_TCLASS	0x0200
-#define	FIMB6_DADDR	0x0400
-#define	FIMB6_SADDR	0x0800
-#define	FIMB6_DPORT	0x1000
-#define	FIMB6_SPORT	0x2000
-#define	FIMB6_GPI	0x4000
-#define	FIMB6_FLABEL	0x8000
-#define	FIMB6_ALL	0xff00
-
-#define	FIMB_ALL	(FIMB4_ALL|FIMB6_ALL)
-
-#define	FIMB4_PORTS	(FIMB4_DPORT|FIMB4_SPORT|FIMB4_GPI)
-#define	FIMB6_PORTS	(FIMB6_DPORT|FIMB6_SPORT|FIMB6_GPI)
-#endif /* ALTQ3_CLFIER_COMPAT */
-
-/*
- * machine dependent clock
- * a 64bit high resolution time counter.
- */
-extern int machclk_usepcc;
-extern uint32_t machclk_freq;
-extern uint32_t machclk_per_tick;
-extern void init_machclk(void);
-extern u_int64_t read_machclk(void);
-
-/*
- * debug support
- */
-#ifdef ALTQ_DEBUG
-#ifdef __STDC__
-#define	ASSERT(e)	((e) ? (void)0 : altq_assert(__FILE__, __LINE__, #e))
-#else	/* PCC */
-#define	ASSERT(e)	((e) ? (void)0 : altq_assert(__FILE__, __LINE__, "e"))
-#endif
-#else
-#define	ASSERT(e)	((void)0)
-#endif
-
-/*
- * misc stuff for compatibility
- */
-/* ioctl cmd type */
-typedef u_long ioctlcmd_t;
-
-/*
- * queue macros:
- * the interface of TAILQ_LAST macro changed after the introduction
- * of softupdate. redefine it here to make it work with pre-2.2.7.
- */
-#undef TAILQ_LAST
-#define	TAILQ_LAST(head, headname) \
-	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-
-#ifndef TAILQ_EMPTY
-#define	TAILQ_EMPTY(head) ((head)->tqh_first == NULL)
-#endif
-#ifndef TAILQ_FOREACH
-#define TAILQ_FOREACH(var, head, field)					\
-	for (var = TAILQ_FIRST(head); var; var = TAILQ_NEXT(var, field))
-#endif
-
-/* macro for timeout/untimeout */
-#if (__FreeBSD_version > 300000) || defined(__NetBSD__)
-/* use callout */
-#include <sys/callout.h>
-
-#if (__FreeBSD_version > 500000)
-#define	CALLOUT_INIT(c)		callout_init((c), 0)
-#else
-#define	CALLOUT_INIT(c)		callout_init((c))
-#endif
-#define	CALLOUT_RESET(c,t,f,a)	callout_reset((c),(t),(f),(a))
-#define	CALLOUT_STOP(c)		callout_stop((c))
-#if !defined(CALLOUT_INITIALIZER) && (__FreeBSD_version < 600000)
-#define	CALLOUT_INITIALIZER	{ { { NULL } }, 0, NULL, NULL, 0 }
-#endif
-#elif defined(__OpenBSD__)
-#include <sys/timeout.h>
-/* callout structure as a wrapper of struct timeout */
-struct callout {
-	struct timeout	c_to;
-};
-#define	CALLOUT_INIT(c)		do { bzero((c), sizeof(*(c))); } while (/*CONSTCOND*/ 0)
-#define	CALLOUT_RESET(c,t,f,a)	do { if (!timeout_initialized(&(c)->c_to))  \
-					 timeout_set(&(c)->c_to, (f), (a)); \
-				     timeout_add(&(c)->c_to, (t)); } while (/*CONSTCOND*/ 0)
-#define	CALLOUT_STOP(c)		timeout_del(&(c)->c_to)
-#define	CALLOUT_INITIALIZER	{ { { NULL }, NULL, NULL, 0, 0 } }
-#else
-/* use old-style timeout/untimeout */
-/* dummy callout structure */
-struct callout {
-	void		*c_arg;			/* function argument */
-	void		(*c_func)(void *);	/* functiuon to call */
-};
-#define	CALLOUT_INIT(c)		do { bzero((c), sizeof(*(c))); } while (/*CONSTCOND*/ 0)
-#define	CALLOUT_RESET(c,t,f,a)	do {	(c)->c_arg = (a);	\
-					(c)->c_func = (f);	\
-					timeout((f),(a),(t)); } while (/*CONSTCOND*/ 0)
-#define	CALLOUT_STOP(c)		untimeout((c)->c_func,(c)->c_arg)
-#define	CALLOUT_INITIALIZER	{ NULL, NULL }
-#endif
-#if !defined(__FreeBSD__)
-typedef void (timeout_t)(void *);
-#endif
-
-#define	m_pktlen(m)		((m)->m_pkthdr.len)
-
-struct ifnet; struct mbuf;
-struct pf_altq;
-#ifdef ALTQ3_CLFIER_COMPAT
-struct flowinfo;
-#endif
-
-void	*altq_lookup(char *, int);
-#ifdef ALTQ3_CLFIER_COMPAT
-int	altq_extractflow(struct mbuf *, int, struct flowinfo *, uint32_t);
-int	acc_add_filter(struct acc_classifier *, struct flow_filter *,
-	    void *, u_long *);
-int	acc_delete_filter(struct acc_classifier *, u_long);
-int	acc_discard_filters(struct acc_classifier *, void *, int);
-void	*acc_classify(void *, struct mbuf *, int);
-#endif
-u_int8_t read_dsfield(struct mbuf *, struct altq_pktattr *);
-void	write_dsfield(struct mbuf *, struct altq_pktattr *, u_int8_t);
-void	altq_assert(const char *, int, const char *);
-int	tbr_set(struct ifaltq *, struct tb_profile *);
-int	tbr_get(struct ifaltq *, struct tb_profile *);
-
-int	altq_pfattach(struct pf_altq *);
-int	altq_pfdetach(struct pf_altq *);
-int	altq_add(struct pf_altq *);
-int	altq_remove(struct pf_altq *);
-int	altq_add_queue(struct pf_altq *);
-int	altq_remove_queue(struct pf_altq *);
-int	altq_getqstats(struct pf_altq *, void *, int *);
-
-int	cbq_pfattach(struct pf_altq *);
-int	cbq_add_altq(struct pf_altq *);
-int	cbq_remove_altq(struct pf_altq *);
-int	cbq_add_queue(struct pf_altq *);
-int	cbq_remove_queue(struct pf_altq *);
-int	cbq_getqstats(struct pf_altq *, void *, int *);
-
-int	priq_pfattach(struct pf_altq *);
-int	priq_add_altq(struct pf_altq *);
-int	priq_remove_altq(struct pf_altq *);
-int	priq_add_queue(struct pf_altq *);
-int	priq_remove_queue(struct pf_altq *);
-int	priq_getqstats(struct pf_altq *, void *, int *);
-
-int	hfsc_pfattach(struct pf_altq *);
-int	hfsc_add_altq(struct pf_altq *);
-int	hfsc_remove_altq(struct pf_altq *);
-int	hfsc_add_queue(struct pf_altq *);
-int	hfsc_remove_queue(struct pf_altq *);
-int	hfsc_getqstats(struct pf_altq *, void *, int *);
-
-#endif /* _KERNEL */
-#endif /* _ALTQ_ALTQ_VAR_H_ */
diff --git a/include.new/altq/altqconf.h b/include.new/altq/altqconf.h
deleted file mode 100644
index 4d3921c..0000000
--- a/include.new/altq/altqconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$OpenBSD: altqconf.h,v 1.1 2001/06/27 05:28:36 kjc Exp $	*/
-/*	$NetBSD: altqconf.h,v 1.2 2001/05/30 11:57:16 mrg Exp $	*/
-
-#if defined(_KERNEL_OPT) || defined(__OpenBSD__)
-
-#if defined(_KERNEL_OPT)
-#include "opt_altq_enabled.h"
-#endif
-
-#include <sys/conf.h>
-
-#ifdef ALTQ
-#define	NALTQ	1
-#else
-#define	NALTQ	0
-#endif
-
-cdev_decl(altq);
-
-#ifdef __OpenBSD__
-#define cdev_altq_init(c,n) { \
-	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
-	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
-	(dev_type_stop((*))) enodev, 0, (dev_type_select((*))) enodev, \
-	(dev_type_mmap((*))) enodev }
-#else
-#define	cdev_altq_init(x,y)	cdev__oci_init(x,y)
-#endif
-#endif /* defined(_KERNEL_OPT) || defined(__OpenBSD__) */
diff --git a/include.new/altq/if_altq.h b/include.new/altq/if_altq.h
deleted file mode 100644
index 0b71eaf..0000000
--- a/include.new/altq/if_altq.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/altq/altq/if_altq.h 219457 2011-03-10 18:49:15Z jkim $	*/
-/*	$KAME: if_altq.h,v 1.12 2005/04/13 03:44:25 suz Exp $	*/
-
-/*
- * Copyright (C) 1997-2003
- *	Sony Computer Science Laboratories Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY SONY CSL 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 SONY CSL 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.
- */
-#ifndef _ALTQ_IF_ALTQ_H_
-#define	_ALTQ_IF_ALTQ_H_
-
-#ifdef __FreeBSD__
-#include <sys/lock.h>		/* XXX */
-#include <sys/mutex.h>		/* XXX */
-#include <sys/event.h>		/* XXX */
-#endif
-
-#ifdef _KERNEL_OPT
-#include <altq/altqconf.h>
-#endif
-
-struct altq_pktattr; struct tb_regulator; struct top_cdnr;
-
-/*
- * Structure defining a queue for a network interface.
- */
-struct	ifaltq {
-	/* fields compatible with struct ifqueue */
-	struct	mbuf *ifq_head;
-	struct	mbuf *ifq_tail;
-	int	ifq_len;
-	int	ifq_maxlen;
-	int	ifq_drops;
-#ifdef __FreeBSD__
-	struct	mtx ifq_mtx;
-#endif
-
-	/* driver owned queue (used for bulk dequeue and prepend) UNLOCKED */
-	struct	mbuf *ifq_drv_head;
-	struct	mbuf *ifq_drv_tail;
-	int	ifq_drv_len;
-	int	ifq_drv_maxlen;
-
-	/* alternate queueing related fields */
-	int	altq_type;		/* discipline type */
-	int	altq_flags;		/* flags (e.g. ready, in-use) */
-	void	*altq_disc;		/* for discipline-specific use */
-	struct	ifnet *altq_ifp;	/* back pointer to interface */
-
-	int	(*altq_enqueue)(struct ifaltq *, struct mbuf *,
-				struct altq_pktattr *);
-	struct	mbuf *(*altq_dequeue)(struct ifaltq *, int);
-	int	(*altq_request)(struct ifaltq *, int, void *);
-
-	/* classifier fields */
-	void	*altq_clfier;		/* classifier-specific use */
-	void	*(*altq_classify)(void *, struct mbuf *, int);
-
-	/* token bucket regulator */
-	struct	tb_regulator *altq_tbr;
-
-	/* input traffic conditioner (doesn't belong to the output queue...) */
-	struct top_cdnr *altq_cdnr;
-};
-
-
-#ifdef _KERNEL
-
-/*
- * packet attributes used by queueing disciplines.
- * pattr_class is a discipline-dependent scheduling class that is
- * set by a classifier.
- * pattr_hdr and pattr_af may be used by a discipline to access
- * the header within a mbuf.  (e.g. ECN needs to update the CE bit)
- * note that pattr_hdr could be stale after m_pullup, though link
- * layer output routines usually don't use m_pullup.  link-level
- * compression also invalidates these fields.  thus, pattr_hdr needs
- * to be verified when a discipline touches the header.
- */
-struct altq_pktattr {
-	void	*pattr_class;		/* sched class set by classifier */
-	int	pattr_af;		/* address family */
-	caddr_t	pattr_hdr;		/* saved header position in mbuf */
-};
-
-/*
- * mbuf tag to carry a queue id (and hints for ECN).
- */
-struct altq_tag {
-	uint32_t	qid;		/* queue id */
-	/* hints for ecn */
-	int		af;		/* address family */
-	void		*hdr;		/* saved header position in mbuf */
-};
-
-/*
- * a token-bucket regulator limits the rate that a network driver can
- * dequeue packets from the output queue.
- * modern cards are able to buffer a large amount of packets and dequeue
- * too many packets at a time.  this bursty dequeue behavior makes it
- * impossible to schedule packets by queueing disciplines.
- * a token-bucket is used to control the burst size in a device
- * independent manner.
- */
-struct tb_regulator {
-	int64_t		tbr_rate;	/* (scaled) token bucket rate */
-	int64_t		tbr_depth;	/* (scaled) token bucket depth */
-
-	int64_t		tbr_token;	/* (scaled) current token */
-	int64_t		tbr_filluptime;	/* (scaled) time to fill up bucket */
-	u_int64_t	tbr_last;	/* last time token was updated */
-
-	int		tbr_lastop;	/* last dequeue operation type
-					   needed for poll-and-dequeue */
-};
-
-/* if_altqflags */
-#define	ALTQF_READY	 0x01	/* driver supports alternate queueing */
-#define	ALTQF_ENABLED	 0x02	/* altq is in use */
-#define	ALTQF_CLASSIFY	 0x04	/* classify packets */
-#define	ALTQF_CNDTNING	 0x08	/* altq traffic conditioning is enabled */
-#define	ALTQF_DRIVER1	 0x40	/* driver specific */
-
-/* if_altqflags set internally only: */
-#define	ALTQF_CANTCHANGE 	(ALTQF_READY)
-
-/* altq_dequeue 2nd arg */
-#define	ALTDQ_REMOVE		1	/* dequeue mbuf from the queue */
-#define	ALTDQ_POLL		2	/* don't dequeue mbuf from the queue */
-
-/* altq request types (currently only purge is defined) */
-#define	ALTRQ_PURGE		1	/* purge all packets */
-
-#define	ALTQ_IS_READY(ifq)		((ifq)->altq_flags & ALTQF_READY)
-#define	ALTQ_IS_ENABLED(ifq)		((ifq)->altq_flags & ALTQF_ENABLED)
-#define	ALTQ_NEEDS_CLASSIFY(ifq)	((ifq)->altq_flags & ALTQF_CLASSIFY)
-#define	ALTQ_IS_CNDTNING(ifq)		((ifq)->altq_flags & ALTQF_CNDTNING)
-
-#define	ALTQ_SET_CNDTNING(ifq)		((ifq)->altq_flags |= ALTQF_CNDTNING)
-#define	ALTQ_CLEAR_CNDTNING(ifq)	((ifq)->altq_flags &= ~ALTQF_CNDTNING)
-#define	ALTQ_IS_ATTACHED(ifq)		((ifq)->altq_disc != NULL)
-
-#define	ALTQ_ENQUEUE(ifq, m, pa, err)					\
-	(err) = (*(ifq)->altq_enqueue)((ifq),(m),(pa))
-#define	ALTQ_DEQUEUE(ifq, m)						\
-	(m) = (*(ifq)->altq_dequeue)((ifq), ALTDQ_REMOVE)
-#define	ALTQ_POLL(ifq, m)						\
-	(m) = (*(ifq)->altq_dequeue)((ifq), ALTDQ_POLL)
-#define	ALTQ_PURGE(ifq)							\
-	(void)(*(ifq)->altq_request)((ifq), ALTRQ_PURGE, (void *)0)
-#define	ALTQ_IS_EMPTY(ifq)		((ifq)->ifq_len == 0)
-#define	TBR_IS_ENABLED(ifq)		((ifq)->altq_tbr != NULL)
-
-extern int altq_attach(struct ifaltq *, int, void *,
-		       int (*)(struct ifaltq *, struct mbuf *,
-			       struct altq_pktattr *),
-		       struct mbuf *(*)(struct ifaltq *, int),
-		       int (*)(struct ifaltq *, int, void *),
-		       void *,
-		       void *(*)(void *, struct mbuf *, int));
-extern int altq_detach(struct ifaltq *);
-extern int altq_enable(struct ifaltq *);
-extern int altq_disable(struct ifaltq *);
-extern struct mbuf *(*tbr_dequeue_ptr)(struct ifaltq *, int);
-extern int (*altq_input)(struct mbuf *, int);
-#if 0 /* ALTQ3_CLFIER_COMPAT */
-void altq_etherclassify(struct ifaltq *, struct mbuf *, struct altq_pktattr *);
-#endif
-#endif /* _KERNEL */
-
-#endif /* _ALTQ_IF_ALTQ_H_ */
diff --git a/include.new/ar.h b/include.new/ar.h
deleted file mode 100644
index c86a563..0000000
--- a/include.new/ar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Hugh Smith at The University of Guelph.
- *
- * 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. 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.
- *
- *	@(#)ar.h	8.2 (Berkeley) 1/21/94
- *
- * $FreeBSD: releng/10.2/include/ar.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _AR_H_
-#define	_AR_H_
-
-#include <sys/cdefs.h>
-
-/* Pre-4BSD archives had these magic numbers in them. */
-#define	OARMAG1	0177555
-#define	OARMAG2	0177545
-
-#define	ARMAG		"!<arch>\n"	/* ar "magic number" */
-#define	SARMAG		8		/* strlen(ARMAG); */
-
-#define	AR_EFMT1	"#1/"		/* extended format #1 */
-
-struct ar_hdr {
-	char ar_name[16];		/* name */
-	char ar_date[12];		/* modification time */
-	char ar_uid[6];			/* user id */
-	char ar_gid[6];			/* group id */
-	char ar_mode[8];		/* octal file permissions */
-	char ar_size[10];		/* size in bytes */
-#define	ARFMAG	"`\n"
-	char ar_fmag[2];		/* consistency check */
-} __packed;
-
-#endif /* !_AR_H_ */
diff --git a/include.new/archive.h b/include.new/archive.h
deleted file mode 100644
index db34904..0000000
--- a/include.new/archive.h
+++ /dev/null
@@ -1,1040 +0,0 @@
-/*-
- * Copyright (c) 2003-2010 Tim Kientzle
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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: releng/10.2/contrib/libarchive/libarchive/archive.h 248616 2013-03-22 13:36:03Z mm $
- */
-
-#ifndef ARCHIVE_H_INCLUDED
-#define	ARCHIVE_H_INCLUDED
-
-#include <sys/stat.h>
-#include <stddef.h>  /* for wchar_t */
-#include <stdio.h> /* For FILE * */
-
-/*
- * Note: archive.h is for use outside of libarchive; the configuration
- * headers (config.h, archive_platform.h, etc.) are purely internal.
- * Do NOT use HAVE_XXX configuration macros to control the behavior of
- * this header!  If you must conditionalize, use predefined compiler and/or
- * platform macros.
- */
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x560
-# include <stdint.h>
-#elif !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) && !defined(__BORLANDC__) && !defined(_SCO_DS)
-# include <inttypes.h>
-#endif
-
-/* Get appropriate definitions of standard POSIX-style types. */
-/* These should match the types used in 'struct stat' */
-#if defined(_WIN32) && !defined(__CYGWIN__)
-# define	__LA_INT64_T	__int64
-# if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
-#  define	__LA_SSIZE_T	ssize_t
-# elif defined(_WIN64)
-#  define	__LA_SSIZE_T	__int64
-# else
-#  define	__LA_SSIZE_T	long
-# endif
-#else
-# include <unistd.h>  /* ssize_t */
-# if defined(_SCO_DS)
-#  define	__LA_INT64_T	long long
-# else
-#  define	__LA_INT64_T	int64_t
-# endif
-# define	__LA_SSIZE_T	ssize_t
-#endif
-
-/*
- * On Windows, define LIBARCHIVE_STATIC if you're building or using a
- * .lib.  The default here assumes you're building a DLL.  Only
- * libarchive source should ever define __LIBARCHIVE_BUILD.
- */
-#if ((defined __WIN32__) || (defined _WIN32) || defined(__CYGWIN__)) && (!defined LIBARCHIVE_STATIC)
-# ifdef __LIBARCHIVE_BUILD
-#  ifdef __GNUC__
-#   define __LA_DECL	__attribute__((dllexport)) extern
-#  else
-#   define __LA_DECL	__declspec(dllexport)
-#  endif
-# else
-#  ifdef __GNUC__
-#   define __LA_DECL
-#  else
-#   define __LA_DECL	__declspec(dllimport)
-#  endif
-# endif
-#else
-/* Static libraries or non-Windows needs no special declaration. */
-# define __LA_DECL
-#endif
-
-#if defined(__GNUC__) && __GNUC__ >= 3 && !defined(__MINGW32__)
-#define	__LA_PRINTF(fmtarg, firstvararg) \
-	__attribute__((__format__ (__printf__, fmtarg, firstvararg)))
-#else
-#define	__LA_PRINTF(fmtarg, firstvararg)	/* nothing */
-#endif
-
-#if defined(__GNUC__) && __GNUC__ >= 3 && __GNUC_MINOR__ >= 1
-# define __LA_DEPRECATED __attribute__((deprecated))
-#else
-# define __LA_DEPRECATED
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * The version number is provided as both a macro and a function.
- * The macro identifies the installed header; the function identifies
- * the library version (which may not be the same if you're using a
- * dynamically-linked version of the library).  Of course, if the
- * header and library are very different, you should expect some
- * strangeness.  Don't do that.
- */
-
-/*
- * The version number is expressed as a single integer that makes it
- * easy to compare versions at build time: for version a.b.c, the
- * version number is printf("%d%03d%03d",a,b,c).  For example, if you
- * know your application requires version 2.12.108 or later, you can
- * assert that ARCHIVE_VERSION_NUMBER >= 2012108.
- */
-/* Note: Compiler will complain if this does not match archive_entry.h! */
-#define	ARCHIVE_VERSION_NUMBER 3001002
-__LA_DECL int		archive_version_number(void);
-
-/*
- * Textual name/version of the library, useful for version displays.
- */
-#define	ARCHIVE_VERSION_STRING "libarchive 3.1.2"
-__LA_DECL const char *	archive_version_string(void);
-
-/* Declare our basic types. */
-struct archive;
-struct archive_entry;
-
-/*
- * Error codes: Use archive_errno() and archive_error_string()
- * to retrieve details.  Unless specified otherwise, all functions
- * that return 'int' use these codes.
- */
-#define	ARCHIVE_EOF	  1	/* Found end of archive. */
-#define	ARCHIVE_OK	  0	/* Operation was successful. */
-#define	ARCHIVE_RETRY	(-10)	/* Retry might succeed. */
-#define	ARCHIVE_WARN	(-20)	/* Partial success. */
-/* For example, if write_header "fails", then you can't push data. */
-#define	ARCHIVE_FAILED	(-25)	/* Current operation cannot complete. */
-/* But if write_header is "fatal," then this archive is dead and useless. */
-#define	ARCHIVE_FATAL	(-30)	/* No more operations are possible. */
-
-/*
- * As far as possible, archive_errno returns standard platform errno codes.
- * Of course, the details vary by platform, so the actual definitions
- * here are stored in "archive_platform.h".  The symbols are listed here
- * for reference; as a rule, clients should not need to know the exact
- * platform-dependent error code.
- */
-/* Unrecognized or invalid file format. */
-/* #define	ARCHIVE_ERRNO_FILE_FORMAT */
-/* Illegal usage of the library. */
-/* #define	ARCHIVE_ERRNO_PROGRAMMER_ERROR */
-/* Unknown or unclassified error. */
-/* #define	ARCHIVE_ERRNO_MISC */
-
-/*
- * Callbacks are invoked to automatically read/skip/write/open/close the
- * archive. You can provide your own for complex tasks (like breaking
- * archives across multiple tapes) or use standard ones built into the
- * library.
- */
-
-/* Returns pointer and size of next block of data from archive. */
-typedef __LA_SSIZE_T	archive_read_callback(struct archive *,
-			    void *_client_data, const void **_buffer);
-
-/* Skips at most request bytes from archive and returns the skipped amount.
- * This may skip fewer bytes than requested; it may even skip zero bytes.
- * If you do skip fewer bytes than requested, libarchive will invoke your
- * read callback and discard data as necessary to make up the full skip.
- */
-typedef __LA_INT64_T	archive_skip_callback(struct archive *,
-			    void *_client_data, __LA_INT64_T request);
-
-/* Seeks to specified location in the file and returns the position.
- * Whence values are SEEK_SET, SEEK_CUR, SEEK_END from stdio.h.
- * Return ARCHIVE_FATAL if the seek fails for any reason.
- */
-typedef __LA_INT64_T	archive_seek_callback(struct archive *,
-    void *_client_data, __LA_INT64_T offset, int whence);
-
-/* Returns size actually written, zero on EOF, -1 on error. */
-typedef __LA_SSIZE_T	archive_write_callback(struct archive *,
-			    void *_client_data,
-			    const void *_buffer, size_t _length);
-
-typedef int	archive_open_callback(struct archive *, void *_client_data);
-
-typedef int	archive_close_callback(struct archive *, void *_client_data);
-
-/* Switches from one client data object to the next/prev client data object.
- * This is useful for reading from different data blocks such as a set of files
- * that make up one large file.
- */
-typedef int archive_switch_callback(struct archive *, void *_client_data1,
-			    void *_client_data2);
-
-/*
- * Codes to identify various stream filters.
- */
-#define	ARCHIVE_FILTER_NONE	0
-#define	ARCHIVE_FILTER_GZIP	1
-#define	ARCHIVE_FILTER_BZIP2	2
-#define	ARCHIVE_FILTER_COMPRESS	3
-#define	ARCHIVE_FILTER_PROGRAM	4
-#define	ARCHIVE_FILTER_LZMA	5
-#define	ARCHIVE_FILTER_XZ	6
-#define	ARCHIVE_FILTER_UU	7
-#define	ARCHIVE_FILTER_RPM	8
-#define	ARCHIVE_FILTER_LZIP	9
-#define	ARCHIVE_FILTER_LRZIP	10
-#define	ARCHIVE_FILTER_LZOP	11
-#define	ARCHIVE_FILTER_GRZIP	12
-
-#if ARCHIVE_VERSION_NUMBER < 4000000
-#define	ARCHIVE_COMPRESSION_NONE	ARCHIVE_FILTER_NONE
-#define	ARCHIVE_COMPRESSION_GZIP	ARCHIVE_FILTER_GZIP
-#define	ARCHIVE_COMPRESSION_BZIP2	ARCHIVE_FILTER_BZIP2
-#define	ARCHIVE_COMPRESSION_COMPRESS	ARCHIVE_FILTER_COMPRESS
-#define	ARCHIVE_COMPRESSION_PROGRAM	ARCHIVE_FILTER_PROGRAM
-#define	ARCHIVE_COMPRESSION_LZMA	ARCHIVE_FILTER_LZMA
-#define	ARCHIVE_COMPRESSION_XZ		ARCHIVE_FILTER_XZ
-#define	ARCHIVE_COMPRESSION_UU		ARCHIVE_FILTER_UU
-#define	ARCHIVE_COMPRESSION_RPM		ARCHIVE_FILTER_RPM
-#define	ARCHIVE_COMPRESSION_LZIP	ARCHIVE_FILTER_LZIP
-#define	ARCHIVE_COMPRESSION_LRZIP	ARCHIVE_FILTER_LRZIP
-#endif
-
-/*
- * Codes returned by archive_format.
- *
- * Top 16 bits identifies the format family (e.g., "tar"); lower
- * 16 bits indicate the variant.  This is updated by read_next_header.
- * Note that the lower 16 bits will often vary from entry to entry.
- * In some cases, this variation occurs as libarchive learns more about
- * the archive (for example, later entries might utilize extensions that
- * weren't necessary earlier in the archive; in this case, libarchive
- * will change the format code to indicate the extended format that
- * was used).  In other cases, it's because different tools have
- * modified the archive and so different parts of the archive
- * actually have slightly different formats.  (Both tar and cpio store
- * format codes in each entry, so it is quite possible for each
- * entry to be in a different format.)
- */
-#define	ARCHIVE_FORMAT_BASE_MASK		0xff0000
-#define	ARCHIVE_FORMAT_CPIO			0x10000
-#define	ARCHIVE_FORMAT_CPIO_POSIX		(ARCHIVE_FORMAT_CPIO | 1)
-#define	ARCHIVE_FORMAT_CPIO_BIN_LE		(ARCHIVE_FORMAT_CPIO | 2)
-#define	ARCHIVE_FORMAT_CPIO_BIN_BE		(ARCHIVE_FORMAT_CPIO | 3)
-#define	ARCHIVE_FORMAT_CPIO_SVR4_NOCRC		(ARCHIVE_FORMAT_CPIO | 4)
-#define	ARCHIVE_FORMAT_CPIO_SVR4_CRC		(ARCHIVE_FORMAT_CPIO | 5)
-#define	ARCHIVE_FORMAT_CPIO_AFIO_LARGE		(ARCHIVE_FORMAT_CPIO | 6)
-#define	ARCHIVE_FORMAT_SHAR			0x20000
-#define	ARCHIVE_FORMAT_SHAR_BASE		(ARCHIVE_FORMAT_SHAR | 1)
-#define	ARCHIVE_FORMAT_SHAR_DUMP		(ARCHIVE_FORMAT_SHAR | 2)
-#define	ARCHIVE_FORMAT_TAR			0x30000
-#define	ARCHIVE_FORMAT_TAR_USTAR		(ARCHIVE_FORMAT_TAR | 1)
-#define	ARCHIVE_FORMAT_TAR_PAX_INTERCHANGE	(ARCHIVE_FORMAT_TAR | 2)
-#define	ARCHIVE_FORMAT_TAR_PAX_RESTRICTED	(ARCHIVE_FORMAT_TAR | 3)
-#define	ARCHIVE_FORMAT_TAR_GNUTAR		(ARCHIVE_FORMAT_TAR | 4)
-#define	ARCHIVE_FORMAT_ISO9660			0x40000
-#define	ARCHIVE_FORMAT_ISO9660_ROCKRIDGE	(ARCHIVE_FORMAT_ISO9660 | 1)
-#define	ARCHIVE_FORMAT_ZIP			0x50000
-#define	ARCHIVE_FORMAT_EMPTY			0x60000
-#define	ARCHIVE_FORMAT_AR			0x70000
-#define	ARCHIVE_FORMAT_AR_GNU			(ARCHIVE_FORMAT_AR | 1)
-#define	ARCHIVE_FORMAT_AR_BSD			(ARCHIVE_FORMAT_AR | 2)
-#define	ARCHIVE_FORMAT_MTREE			0x80000
-#define	ARCHIVE_FORMAT_RAW			0x90000
-#define	ARCHIVE_FORMAT_XAR			0xA0000
-#define	ARCHIVE_FORMAT_LHA			0xB0000
-#define	ARCHIVE_FORMAT_CAB			0xC0000
-#define	ARCHIVE_FORMAT_RAR			0xD0000
-#define	ARCHIVE_FORMAT_7ZIP			0xE0000
-
-/*-
- * Basic outline for reading an archive:
- *   1) Ask archive_read_new for an archive reader object.
- *   2) Update any global properties as appropriate.
- *      In particular, you'll certainly want to call appropriate
- *      archive_read_support_XXX functions.
- *   3) Call archive_read_open_XXX to open the archive
- *   4) Repeatedly call archive_read_next_header to get information about
- *      successive archive entries.  Call archive_read_data to extract
- *      data for entries of interest.
- *   5) Call archive_read_finish to end processing.
- */
-__LA_DECL struct archive	*archive_read_new(void);
-
-/*
- * The archive_read_support_XXX calls enable auto-detect for this
- * archive handle.  They also link in the necessary support code.
- * For example, if you don't want bzlib linked in, don't invoke
- * support_compression_bzip2().  The "all" functions provide the
- * obvious shorthand.
- */
-
-#if ARCHIVE_VERSION_NUMBER < 4000000
-__LA_DECL int archive_read_support_compression_all(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_bzip2(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_compress(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_gzip(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_lzip(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_lzma(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_none(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_program(struct archive *,
-		     const char *command) __LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_program_signature
-		(struct archive *, const char *,
-		 const void * /* match */, size_t) __LA_DEPRECATED;
-
-__LA_DECL int archive_read_support_compression_rpm(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_uu(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_read_support_compression_xz(struct archive *)
-		__LA_DEPRECATED;
-#endif
-
-__LA_DECL int archive_read_support_filter_all(struct archive *);
-__LA_DECL int archive_read_support_filter_bzip2(struct archive *);
-__LA_DECL int archive_read_support_filter_compress(struct archive *);
-__LA_DECL int archive_read_support_filter_gzip(struct archive *);
-__LA_DECL int archive_read_support_filter_grzip(struct archive *);
-__LA_DECL int archive_read_support_filter_lrzip(struct archive *);
-__LA_DECL int archive_read_support_filter_lzip(struct archive *);
-__LA_DECL int archive_read_support_filter_lzma(struct archive *);
-__LA_DECL int archive_read_support_filter_lzop(struct archive *);
-__LA_DECL int archive_read_support_filter_none(struct archive *);
-__LA_DECL int archive_read_support_filter_program(struct archive *,
-		     const char *command);
-__LA_DECL int archive_read_support_filter_program_signature
-		(struct archive *, const char * /* cmd */,
-				    const void * /* match */, size_t);
-__LA_DECL int archive_read_support_filter_rpm(struct archive *);
-__LA_DECL int archive_read_support_filter_uu(struct archive *);
-__LA_DECL int archive_read_support_filter_xz(struct archive *);
-
-__LA_DECL int archive_read_support_format_7zip(struct archive *);
-__LA_DECL int archive_read_support_format_all(struct archive *);
-__LA_DECL int archive_read_support_format_ar(struct archive *);
-__LA_DECL int archive_read_support_format_by_code(struct archive *, int);
-__LA_DECL int archive_read_support_format_cab(struct archive *);
-__LA_DECL int archive_read_support_format_cpio(struct archive *);
-__LA_DECL int archive_read_support_format_empty(struct archive *);
-__LA_DECL int archive_read_support_format_gnutar(struct archive *);
-__LA_DECL int archive_read_support_format_iso9660(struct archive *);
-__LA_DECL int archive_read_support_format_lha(struct archive *);
-__LA_DECL int archive_read_support_format_mtree(struct archive *);
-__LA_DECL int archive_read_support_format_rar(struct archive *);
-__LA_DECL int archive_read_support_format_raw(struct archive *);
-__LA_DECL int archive_read_support_format_tar(struct archive *);
-__LA_DECL int archive_read_support_format_xar(struct archive *);
-__LA_DECL int archive_read_support_format_zip(struct archive *);
-
-/* Functions to manually set the format and filters to be used. This is
- * useful to bypass the bidding process when the format and filters to use
- * is known in advance.
- */
-__LA_DECL int archive_read_set_format(struct archive *, int);
-__LA_DECL int archive_read_append_filter(struct archive *, int);
-__LA_DECL int archive_read_append_filter_program(struct archive *,
-    const char *);
-__LA_DECL int archive_read_append_filter_program_signature
-    (struct archive *, const char *, const void * /* match */, size_t);
-
-/* Set various callbacks. */
-__LA_DECL int archive_read_set_open_callback(struct archive *,
-    archive_open_callback *);
-__LA_DECL int archive_read_set_read_callback(struct archive *,
-    archive_read_callback *);
-__LA_DECL int archive_read_set_seek_callback(struct archive *,
-    archive_seek_callback *);
-__LA_DECL int archive_read_set_skip_callback(struct archive *,
-    archive_skip_callback *);
-__LA_DECL int archive_read_set_close_callback(struct archive *,
-    archive_close_callback *);
-/* Callback used to switch between one data object to the next */
-__LA_DECL int archive_read_set_switch_callback(struct archive *,
-    archive_switch_callback *);
-
-/* This sets the first data object. */
-__LA_DECL int archive_read_set_callback_data(struct archive *, void *);
-/* This sets data object at specified index */
-__LA_DECL int archive_read_set_callback_data2(struct archive *, void *,
-    unsigned int);
-/* This adds a data object at the specified index. */
-__LA_DECL int archive_read_add_callback_data(struct archive *, void *,
-    unsigned int);
-/* This appends a data object to the end of list */
-__LA_DECL int archive_read_append_callback_data(struct archive *, void *);
-/* This prepends a data object to the beginning of list */
-__LA_DECL int archive_read_prepend_callback_data(struct archive *, void *);
-
-/* Opening freezes the callbacks. */
-__LA_DECL int archive_read_open1(struct archive *);
-
-/* Convenience wrappers around the above. */
-__LA_DECL int archive_read_open(struct archive *, void *_client_data,
-		     archive_open_callback *, archive_read_callback *,
-		     archive_close_callback *);
-__LA_DECL int archive_read_open2(struct archive *, void *_client_data,
-		     archive_open_callback *, archive_read_callback *,
-		     archive_skip_callback *, archive_close_callback *);
-
-/*
- * A variety of shortcuts that invoke archive_read_open() with
- * canned callbacks suitable for common situations.  The ones that
- * accept a block size handle tape blocking correctly.
- */
-/* Use this if you know the filename.  Note: NULL indicates stdin. */
-__LA_DECL int archive_read_open_filename(struct archive *,
-		     const char *_filename, size_t _block_size);
-/* Use this for reading multivolume files by filenames.
- * NOTE: Must be NULL terminated. Sorting is NOT done. */
-__LA_DECL int archive_read_open_filenames(struct archive *,
-		     const char **_filenames, size_t _block_size);
-__LA_DECL int archive_read_open_filename_w(struct archive *,
-		     const wchar_t *_filename, size_t _block_size);
-/* archive_read_open_file() is a deprecated synonym for ..._open_filename(). */
-__LA_DECL int archive_read_open_file(struct archive *,
-		     const char *_filename, size_t _block_size) __LA_DEPRECATED;
-/* Read an archive that's stored in memory. */
-__LA_DECL int archive_read_open_memory(struct archive *,
-		     void * buff, size_t size);
-/* A more involved version that is only used for internal testing. */
-__LA_DECL int archive_read_open_memory2(struct archive *a, void *buff,
-		     size_t size, size_t read_size);
-/* Read an archive that's already open, using the file descriptor. */
-__LA_DECL int archive_read_open_fd(struct archive *, int _fd,
-		     size_t _block_size);
-/* Read an archive that's already open, using a FILE *. */
-/* Note: DO NOT use this with tape drives. */
-__LA_DECL int archive_read_open_FILE(struct archive *, FILE *_file);
-
-/* Parses and returns next entry header. */
-__LA_DECL int archive_read_next_header(struct archive *,
-		     struct archive_entry **);
-
-/* Parses and returns next entry header using the archive_entry passed in */
-__LA_DECL int archive_read_next_header2(struct archive *,
-		     struct archive_entry *);
-
-/*
- * Retrieve the byte offset in UNCOMPRESSED data where last-read
- * header started.
- */
-__LA_DECL __LA_INT64_T		 archive_read_header_position(struct archive *);
-
-/* Read data from the body of an entry.  Similar to read(2). */
-__LA_DECL __LA_SSIZE_T		 archive_read_data(struct archive *,
-				    void *, size_t);
-
-/* Seek within the body of an entry.  Similar to lseek(2). */
-__LA_DECL __LA_INT64_T archive_seek_data(struct archive *, __LA_INT64_T, int);
-
-/*
- * A zero-copy version of archive_read_data that also exposes the file offset
- * of each returned block.  Note that the client has no way to specify
- * the desired size of the block.  The API does guarantee that offsets will
- * be strictly increasing and that returned blocks will not overlap.
- */
-__LA_DECL int archive_read_data_block(struct archive *a,
-		    const void **buff, size_t *size, __LA_INT64_T *offset);
-
-/*-
- * Some convenience functions that are built on archive_read_data:
- *  'skip': skips entire entry
- *  'into_buffer': writes data into memory buffer that you provide
- *  'into_fd': writes data to specified filedes
- */
-__LA_DECL int archive_read_data_skip(struct archive *);
-__LA_DECL int archive_read_data_into_fd(struct archive *, int fd);
-
-/*
- * Set read options.
- */
-/* Apply option to the format only. */
-__LA_DECL int archive_read_set_format_option(struct archive *_a,
-			    const char *m, const char *o,
-			    const char *v);
-/* Apply option to the filter only. */
-__LA_DECL int archive_read_set_filter_option(struct archive *_a,
-			    const char *m, const char *o,
-			    const char *v);
-/* Apply option to both the format and the filter. */
-__LA_DECL int archive_read_set_option(struct archive *_a,
-			    const char *m, const char *o,
-			    const char *v);
-/* Apply option string to both the format and the filter. */
-__LA_DECL int archive_read_set_options(struct archive *_a,
-			    const char *opts);
-
-/*-
- * Convenience function to recreate the current entry (whose header
- * has just been read) on disk.
- *
- * This does quite a bit more than just copy data to disk. It also:
- *  - Creates intermediate directories as required.
- *  - Manages directory permissions:  non-writable directories will
- *    be initially created with write permission enabled; when the
- *    archive is closed, dir permissions are edited to the values specified
- *    in the archive.
- *  - Checks hardlinks:  hardlinks will not be extracted unless the
- *    linked-to file was also extracted within the same session. (TODO)
- */
-
-/* The "flags" argument selects optional behavior, 'OR' the flags you want. */
-
-/* Default: Do not try to set owner/group. */
-#define	ARCHIVE_EXTRACT_OWNER			(0x0001)
-/* Default: Do obey umask, do not restore SUID/SGID/SVTX bits. */
-#define	ARCHIVE_EXTRACT_PERM			(0x0002)
-/* Default: Do not restore mtime/atime. */
-#define	ARCHIVE_EXTRACT_TIME			(0x0004)
-/* Default: Replace existing files. */
-#define	ARCHIVE_EXTRACT_NO_OVERWRITE 		(0x0008)
-/* Default: Try create first, unlink only if create fails with EEXIST. */
-#define	ARCHIVE_EXTRACT_UNLINK			(0x0010)
-/* Default: Do not restore ACLs. */
-#define	ARCHIVE_EXTRACT_ACL			(0x0020)
-/* Default: Do not restore fflags. */
-#define	ARCHIVE_EXTRACT_FFLAGS			(0x0040)
-/* Default: Do not restore xattrs. */
-#define	ARCHIVE_EXTRACT_XATTR 			(0x0080)
-/* Default: Do not try to guard against extracts redirected by symlinks. */
-/* Note: With ARCHIVE_EXTRACT_UNLINK, will remove any intermediate symlink. */
-#define	ARCHIVE_EXTRACT_SECURE_SYMLINKS		(0x0100)
-/* Default: Do not reject entries with '..' as path elements. */
-#define	ARCHIVE_EXTRACT_SECURE_NODOTDOT		(0x0200)
-/* Default: Create parent directories as needed. */
-#define	ARCHIVE_EXTRACT_NO_AUTODIR		(0x0400)
-/* Default: Overwrite files, even if one on disk is newer. */
-#define	ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER	(0x0800)
-/* Detect blocks of 0 and write holes instead. */
-#define	ARCHIVE_EXTRACT_SPARSE			(0x1000)
-/* Default: Do not restore Mac extended metadata. */
-/* This has no effect except on Mac OS. */
-#define	ARCHIVE_EXTRACT_MAC_METADATA		(0x2000)
-/* Default: Use HFS+ compression if it was compressed. */
-/* This has no effect except on Mac OS v10.6 or later. */
-#define	ARCHIVE_EXTRACT_NO_HFS_COMPRESSION	(0x4000)
-/* Default: Do not use HFS+ compression if it was not compressed. */
-/* This has no effect except on Mac OS v10.6 or later. */
-#define	ARCHIVE_EXTRACT_HFS_COMPRESSION_FORCED	(0x8000)
-
-__LA_DECL int archive_read_extract(struct archive *, struct archive_entry *,
-		     int flags);
-__LA_DECL int archive_read_extract2(struct archive *, struct archive_entry *,
-		     struct archive * /* dest */);
-__LA_DECL void	 archive_read_extract_set_progress_callback(struct archive *,
-		     void (*_progress_func)(void *), void *_user_data);
-
-/* Record the dev/ino of a file that will not be written.  This is
- * generally set to the dev/ino of the archive being read. */
-__LA_DECL void		archive_read_extract_set_skip_file(struct archive *,
-		     __LA_INT64_T, __LA_INT64_T);
-
-/* Close the file and release most resources. */
-__LA_DECL int		 archive_read_close(struct archive *);
-/* Release all resources and destroy the object. */
-/* Note that archive_read_free will call archive_read_close for you. */
-__LA_DECL int		 archive_read_free(struct archive *);
-#if ARCHIVE_VERSION_NUMBER < 4000000
-/* Synonym for archive_read_free() for backwards compatibility. */
-__LA_DECL int		 archive_read_finish(struct archive *) __LA_DEPRECATED;
-#endif
-
-/*-
- * To create an archive:
- *   1) Ask archive_write_new for an archive writer object.
- *   2) Set any global properties.  In particular, you should set
- *      the compression and format to use.
- *   3) Call archive_write_open to open the file (most people
- *       will use archive_write_open_file or archive_write_open_fd,
- *       which provide convenient canned I/O callbacks for you).
- *   4) For each entry:
- *      - construct an appropriate struct archive_entry structure
- *      - archive_write_header to write the header
- *      - archive_write_data to write the entry data
- *   5) archive_write_close to close the output
- *   6) archive_write_free to cleanup the writer and release resources
- */
-__LA_DECL struct archive	*archive_write_new(void);
-__LA_DECL int archive_write_set_bytes_per_block(struct archive *,
-		     int bytes_per_block);
-__LA_DECL int archive_write_get_bytes_per_block(struct archive *);
-/* XXX This is badly misnamed; suggestions appreciated. XXX */
-__LA_DECL int archive_write_set_bytes_in_last_block(struct archive *,
-		     int bytes_in_last_block);
-__LA_DECL int archive_write_get_bytes_in_last_block(struct archive *);
-
-/* The dev/ino of a file that won't be archived.  This is used
- * to avoid recursively adding an archive to itself. */
-__LA_DECL int archive_write_set_skip_file(struct archive *,
-    __LA_INT64_T, __LA_INT64_T);
-
-#if ARCHIVE_VERSION_NUMBER < 4000000
-__LA_DECL int archive_write_set_compression_bzip2(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_write_set_compression_compress(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_write_set_compression_gzip(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_write_set_compression_lzip(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_write_set_compression_lzma(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_write_set_compression_none(struct archive *)
-		__LA_DEPRECATED;
-__LA_DECL int archive_write_set_compression_program(struct archive *,
-		     const char *cmd) __LA_DEPRECATED;
-__LA_DECL int archive_write_set_compression_xz(struct archive *)
-		__LA_DEPRECATED;
-#endif
-
-/* A convenience function to set the filter based on the code. */
-__LA_DECL int archive_write_add_filter(struct archive *, int filter_code);
-__LA_DECL int archive_write_add_filter_by_name(struct archive *,
-		     const char *name);
-__LA_DECL int archive_write_add_filter_b64encode(struct archive *);
-__LA_DECL int archive_write_add_filter_bzip2(struct archive *);
-__LA_DECL int archive_write_add_filter_compress(struct archive *);
-__LA_DECL int archive_write_add_filter_grzip(struct archive *);
-__LA_DECL int archive_write_add_filter_gzip(struct archive *);
-__LA_DECL int archive_write_add_filter_lrzip(struct archive *);
-__LA_DECL int archive_write_add_filter_lzip(struct archive *);
-__LA_DECL int archive_write_add_filter_lzma(struct archive *);
-__LA_DECL int archive_write_add_filter_lzop(struct archive *);
-__LA_DECL int archive_write_add_filter_none(struct archive *);
-__LA_DECL int archive_write_add_filter_program(struct archive *,
-		     const char *cmd);
-__LA_DECL int archive_write_add_filter_uuencode(struct archive *);
-__LA_DECL int archive_write_add_filter_xz(struct archive *);
-
-
-/* A convenience function to set the format based on the code or name. */
-__LA_DECL int archive_write_set_format(struct archive *, int format_code);
-__LA_DECL int archive_write_set_format_by_name(struct archive *,
-		     const char *name);
-/* To minimize link pollution, use one or more of the following. */
-__LA_DECL int archive_write_set_format_7zip(struct archive *);
-__LA_DECL int archive_write_set_format_ar_bsd(struct archive *);
-__LA_DECL int archive_write_set_format_ar_svr4(struct archive *);
-__LA_DECL int archive_write_set_format_cpio(struct archive *);
-__LA_DECL int archive_write_set_format_cpio_newc(struct archive *);
-__LA_DECL int archive_write_set_format_gnutar(struct archive *);
-__LA_DECL int archive_write_set_format_iso9660(struct archive *);
-__LA_DECL int archive_write_set_format_mtree(struct archive *);
-__LA_DECL int archive_write_set_format_mtree_classic(struct archive *);
-/* TODO: int archive_write_set_format_old_tar(struct archive *); */
-__LA_DECL int archive_write_set_format_pax(struct archive *);
-__LA_DECL int archive_write_set_format_pax_restricted(struct archive *);
-__LA_DECL int archive_write_set_format_shar(struct archive *);
-__LA_DECL int archive_write_set_format_shar_dump(struct archive *);
-__LA_DECL int archive_write_set_format_ustar(struct archive *);
-__LA_DECL int archive_write_set_format_v7tar(struct archive *);
-__LA_DECL int archive_write_set_format_xar(struct archive *);
-__LA_DECL int archive_write_set_format_zip(struct archive *);
-__LA_DECL int archive_write_zip_set_compression_deflate(struct archive *);
-__LA_DECL int archive_write_zip_set_compression_store(struct archive *);
-__LA_DECL int archive_write_open(struct archive *, void *,
-		     archive_open_callback *, archive_write_callback *,
-		     archive_close_callback *);
-__LA_DECL int archive_write_open_fd(struct archive *, int _fd);
-__LA_DECL int archive_write_open_filename(struct archive *, const char *_file);
-__LA_DECL int archive_write_open_filename_w(struct archive *,
-		     const wchar_t *_file);
-/* A deprecated synonym for archive_write_open_filename() */
-__LA_DECL int archive_write_open_file(struct archive *, const char *_file)
-		__LA_DEPRECATED;
-__LA_DECL int archive_write_open_FILE(struct archive *, FILE *);
-/* _buffSize is the size of the buffer, _used refers to a variable that
- * will be updated after each write into the buffer. */
-__LA_DECL int archive_write_open_memory(struct archive *,
-			void *_buffer, size_t _buffSize, size_t *_used);
-
-/*
- * Note that the library will truncate writes beyond the size provided
- * to archive_write_header or pad if the provided data is short.
- */
-__LA_DECL int archive_write_header(struct archive *,
-		     struct archive_entry *);
-__LA_DECL __LA_SSIZE_T	archive_write_data(struct archive *,
-			    const void *, size_t);
-
-/* This interface is currently only available for archive_write_disk handles.  */
-__LA_DECL __LA_SSIZE_T	 archive_write_data_block(struct archive *,
-				    const void *, size_t, __LA_INT64_T);
-
-__LA_DECL int		 archive_write_finish_entry(struct archive *);
-__LA_DECL int		 archive_write_close(struct archive *);
-/* Marks the archive as FATAL so that a subsequent free() operation
- * won't try to close() cleanly.  Provides a fast abort capability
- * when the client discovers that things have gone wrong. */
-__LA_DECL int            archive_write_fail(struct archive *);
-/* This can fail if the archive wasn't already closed, in which case
- * archive_write_free() will implicitly call archive_write_close(). */
-__LA_DECL int		 archive_write_free(struct archive *);
-#if ARCHIVE_VERSION_NUMBER < 4000000
-/* Synonym for archive_write_free() for backwards compatibility. */
-__LA_DECL int		 archive_write_finish(struct archive *) __LA_DEPRECATED;
-#endif
-
-/*
- * Set write options.
- */
-/* Apply option to the format only. */
-__LA_DECL int archive_write_set_format_option(struct archive *_a,
-			    const char *m, const char *o,
-			    const char *v);
-/* Apply option to the filter only. */
-__LA_DECL int archive_write_set_filter_option(struct archive *_a,
-			    const char *m, const char *o,
-			    const char *v);
-/* Apply option to both the format and the filter. */
-__LA_DECL int archive_write_set_option(struct archive *_a,
-			    const char *m, const char *o,
-			    const char *v);
-/* Apply option string to both the format and the filter. */
-__LA_DECL int archive_write_set_options(struct archive *_a,
-			    const char *opts);
-
-/*-
- * ARCHIVE_WRITE_DISK API
- *
- * To create objects on disk:
- *   1) Ask archive_write_disk_new for a new archive_write_disk object.
- *   2) Set any global properties.  In particular, you probably
- *      want to set the options.
- *   3) For each entry:
- *      - construct an appropriate struct archive_entry structure
- *      - archive_write_header to create the file/dir/etc on disk
- *      - archive_write_data to write the entry data
- *   4) archive_write_free to cleanup the writer and release resources
- *
- * In particular, you can use this in conjunction with archive_read()
- * to pull entries out of an archive and create them on disk.
- */
-__LA_DECL struct archive	*archive_write_disk_new(void);
-/* This file will not be overwritten. */
-__LA_DECL int archive_write_disk_set_skip_file(struct archive *,
-    __LA_INT64_T, __LA_INT64_T);
-/* Set flags to control how the next item gets created.
- * This accepts a bitmask of ARCHIVE_EXTRACT_XXX flags defined above. */
-__LA_DECL int		 archive_write_disk_set_options(struct archive *,
-		     int flags);
-/*
- * The lookup functions are given uname/uid (or gname/gid) pairs and
- * return a uid (gid) suitable for this system.  These are used for
- * restoring ownership and for setting ACLs.  The default functions
- * are naive, they just return the uid/gid.  These are small, so reasonable
- * for applications that don't need to preserve ownership; they
- * are probably also appropriate for applications that are doing
- * same-system backup and restore.
- */
-/*
- * The "standard" lookup functions use common system calls to lookup
- * the uname/gname, falling back to the uid/gid if the names can't be
- * found.  They cache lookups and are reasonably fast, but can be very
- * large, so they are not used unless you ask for them.  In
- * particular, these match the specifications of POSIX "pax" and old
- * POSIX "tar".
- */
-__LA_DECL int	 archive_write_disk_set_standard_lookup(struct archive *);
-/*
- * If neither the default (naive) nor the standard (big) functions suit
- * your needs, you can write your own and register them.  Be sure to
- * include a cleanup function if you have allocated private data.
- */
-__LA_DECL int archive_write_disk_set_group_lookup(struct archive *,
-    void * /* private_data */,
-    __LA_INT64_T (*)(void *, const char *, __LA_INT64_T),
-    void (* /* cleanup */)(void *));
-__LA_DECL int archive_write_disk_set_user_lookup(struct archive *,
-    void * /* private_data */,
-    __LA_INT64_T (*)(void *, const char *, __LA_INT64_T),
-    void (* /* cleanup */)(void *));
-__LA_DECL __LA_INT64_T archive_write_disk_gid(struct archive *, const char *, __LA_INT64_T);
-__LA_DECL __LA_INT64_T archive_write_disk_uid(struct archive *, const char *, __LA_INT64_T);
-
-/*
- * ARCHIVE_READ_DISK API
- *
- * This is still evolving and somewhat experimental.
- */
-__LA_DECL struct archive *archive_read_disk_new(void);
-/* The names for symlink modes here correspond to an old BSD
- * command-line argument convention: -L, -P, -H */
-/* Follow all symlinks. */
-__LA_DECL int archive_read_disk_set_symlink_logical(struct archive *);
-/* Follow no symlinks. */
-__LA_DECL int archive_read_disk_set_symlink_physical(struct archive *);
-/* Follow symlink initially, then not. */
-__LA_DECL int archive_read_disk_set_symlink_hybrid(struct archive *);
-/* TODO: Handle Linux stat32/stat64 ugliness. <sigh> */
-__LA_DECL int archive_read_disk_entry_from_file(struct archive *,
-    struct archive_entry *, int /* fd */, const struct stat *);
-/* Look up gname for gid or uname for uid. */
-/* Default implementations are very, very stupid. */
-__LA_DECL const char *archive_read_disk_gname(struct archive *, __LA_INT64_T);
-__LA_DECL const char *archive_read_disk_uname(struct archive *, __LA_INT64_T);
-/* "Standard" implementation uses getpwuid_r, getgrgid_r and caches the
- * results for performance. */
-__LA_DECL int	archive_read_disk_set_standard_lookup(struct archive *);
-/* You can install your own lookups if you like. */
-__LA_DECL int	archive_read_disk_set_gname_lookup(struct archive *,
-    void * /* private_data */,
-    const char *(* /* lookup_fn */)(void *, __LA_INT64_T),
-    void (* /* cleanup_fn */)(void *));
-__LA_DECL int	archive_read_disk_set_uname_lookup(struct archive *,
-    void * /* private_data */,
-    const char *(* /* lookup_fn */)(void *, __LA_INT64_T),
-    void (* /* cleanup_fn */)(void *));
-/* Start traversal. */
-__LA_DECL int	archive_read_disk_open(struct archive *, const char *);
-__LA_DECL int	archive_read_disk_open_w(struct archive *, const wchar_t *);
-/*
- * Request that current entry be visited.  If you invoke it on every
- * directory, you'll get a physical traversal.  This is ignored if the
- * current entry isn't a directory or a link to a directory.  So, if
- * you invoke this on every returned path, you'll get a full logical
- * traversal.
- */
-__LA_DECL int	archive_read_disk_descend(struct archive *);
-__LA_DECL int	archive_read_disk_can_descend(struct archive *);
-__LA_DECL int	archive_read_disk_current_filesystem(struct archive *);
-__LA_DECL int	archive_read_disk_current_filesystem_is_synthetic(struct archive *);
-__LA_DECL int	archive_read_disk_current_filesystem_is_remote(struct archive *);
-/* Request that the access time of the entry visited by travesal be restored. */
-__LA_DECL int  archive_read_disk_set_atime_restored(struct archive *);
-/*
- * Set behavior. The "flags" argument selects optional behavior.
- */
-/* Request that the access time of the entry visited by travesal be restored.
- * This is the same as archive_read_disk_set_atime_restored. */
-#define	ARCHIVE_READDISK_RESTORE_ATIME		(0x0001)
-/* Default: Do not skip an entry which has nodump flags. */
-#define	ARCHIVE_READDISK_HONOR_NODUMP		(0x0002)
-/* Default: Skip a mac resource fork file whose prefix is "._" because of
- * using copyfile. */
-#define	ARCHIVE_READDISK_MAC_COPYFILE		(0x0004)
-/* Default: Do not traverse mount points. */
-#define	ARCHIVE_READDISK_NO_TRAVERSE_MOUNTS	(0x0008)
-
-__LA_DECL int  archive_read_disk_set_behavior(struct archive *,
-		    int flags);
-
-/*
- * Set archive_match object that will be used in archive_read_disk to
- * know whether an entry should be skipped. The callback function
- * _excluded_func will be invoked when an entry is skipped by the result
- * of archive_match.
- */
-__LA_DECL int	archive_read_disk_set_matching(struct archive *,
-		    struct archive *_matching, void (*_excluded_func)
-		    (struct archive *, void *, struct archive_entry *),
-		    void *_client_data);
-__LA_DECL int	archive_read_disk_set_metadata_filter_callback(struct archive *,
-		    int (*_metadata_filter_func)(struct archive *, void *,
-		    	struct archive_entry *), void *_client_data);
-
-/*
- * Accessor functions to read/set various information in
- * the struct archive object:
- */
-
-/* Number of filters in the current filter pipeline. */
-/* Filter #0 is the one closest to the format, -1 is a synonym for the
- * last filter, which is always the pseudo-filter that wraps the
- * client callbacks. */
-__LA_DECL int		 archive_filter_count(struct archive *);
-__LA_DECL __LA_INT64_T	 archive_filter_bytes(struct archive *, int);
-__LA_DECL int		 archive_filter_code(struct archive *, int);
-__LA_DECL const char *	 archive_filter_name(struct archive *, int);
-
-#if ARCHIVE_VERSION_NUMBER < 4000000
-/* These don't properly handle multiple filters, so are deprecated and
- * will eventually be removed. */
-/* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, -1); */
-__LA_DECL __LA_INT64_T	 archive_position_compressed(struct archive *)
-				__LA_DEPRECATED;
-/* As of libarchive 3.0, this is an alias for archive_filter_bytes(a, 0); */
-__LA_DECL __LA_INT64_T	 archive_position_uncompressed(struct archive *)
-				__LA_DEPRECATED;
-/* As of libarchive 3.0, this is an alias for archive_filter_name(a, 0); */
-__LA_DECL const char	*archive_compression_name(struct archive *)
-				__LA_DEPRECATED;
-/* As of libarchive 3.0, this is an alias for archive_filter_code(a, 0); */
-__LA_DECL int		 archive_compression(struct archive *)
-				__LA_DEPRECATED;
-#endif
-
-__LA_DECL int		 archive_errno(struct archive *);
-__LA_DECL const char	*archive_error_string(struct archive *);
-__LA_DECL const char	*archive_format_name(struct archive *);
-__LA_DECL int		 archive_format(struct archive *);
-__LA_DECL void		 archive_clear_error(struct archive *);
-__LA_DECL void		 archive_set_error(struct archive *, int _err,
-			    const char *fmt, ...) __LA_PRINTF(3, 4);
-__LA_DECL void		 archive_copy_error(struct archive *dest,
-			    struct archive *src);
-__LA_DECL int		 archive_file_count(struct archive *);
-
-/*
- * ARCHIVE_MATCH API
- */
-__LA_DECL struct archive *archive_match_new(void);
-__LA_DECL int	archive_match_free(struct archive *);
-
-/*
- * Test if archive_entry is excluded.
- * This is a convenience function. This is the same as calling all
- * archive_match_path_excluded, archive_match_time_excluded
- * and archive_match_owner_excluded.
- */
-__LA_DECL int	archive_match_excluded(struct archive *,
-		    struct archive_entry *);
-
-/*
- * Test if pathname is excluded. The conditions are set by following functions.
- */
-__LA_DECL int	archive_match_path_excluded(struct archive *,
-		    struct archive_entry *);
-/* Add exclusion pathname pattern. */
-__LA_DECL int	archive_match_exclude_pattern(struct archive *, const char *);
-__LA_DECL int	archive_match_exclude_pattern_w(struct archive *,
-		    const wchar_t *);
-/* Add exclusion pathname pattern from file. */
-__LA_DECL int	archive_match_exclude_pattern_from_file(struct archive *,
-		    const char *, int _nullSeparator);
-__LA_DECL int	archive_match_exclude_pattern_from_file_w(struct archive *,
-		    const wchar_t *, int _nullSeparator);
-/* Add inclusion pathname pattern. */
-__LA_DECL int	archive_match_include_pattern(struct archive *, const char *);
-__LA_DECL int	archive_match_include_pattern_w(struct archive *,
-		    const wchar_t *);
-/* Add inclusion pathname pattern from file. */
-__LA_DECL int	archive_match_include_pattern_from_file(struct archive *,
-		    const char *, int _nullSeparator);
-__LA_DECL int	archive_match_include_pattern_from_file_w(struct archive *,
-		    const wchar_t *, int _nullSeparator);
-/*
- * How to get statistic information for inclusion patterns.
- */
-/* Return the amount number of unmatched inclusion patterns. */
-__LA_DECL int	archive_match_path_unmatched_inclusions(struct archive *);
-/* Return the pattern of unmatched inclusion with ARCHIVE_OK.
- * Return ARCHIVE_EOF if there is no inclusion pattern. */
-__LA_DECL int	archive_match_path_unmatched_inclusions_next(
-		    struct archive *, const char **);
-__LA_DECL int	archive_match_path_unmatched_inclusions_next_w(
-		    struct archive *, const wchar_t **);
-
-/*
- * Test if a file is excluded by its time stamp.
- * The conditions are set by following functions.
- */
-__LA_DECL int	archive_match_time_excluded(struct archive *,
-		    struct archive_entry *);
-
-/*
- * Flags to tell a matching type of time stamps. These are used for
- * following functinos.
- */
-/* Time flag: mtime to be tested. */
-#define ARCHIVE_MATCH_MTIME	(0x0100)
-/* Time flag: ctime to be tested. */
-#define ARCHIVE_MATCH_CTIME	(0x0200)
-/* Comparison flag: Match the time if it is newer than. */
-#define ARCHIVE_MATCH_NEWER	(0x0001)
-/* Comparison flag: Match the time if it is older than. */
-#define ARCHIVE_MATCH_OLDER	(0x0002)
-/* Comparison flag: Match the time if it is equal to. */
-#define ARCHIVE_MATCH_EQUAL	(0x0010)
-/* Set inclusion time. */
-__LA_DECL int	archive_match_include_time(struct archive *, int _flag,
-		    time_t _sec, long _nsec);
-/* Set inclusion time by a date string. */
-__LA_DECL int	archive_match_include_date(struct archive *, int _flag,
-		    const char *_datestr);
-__LA_DECL int	archive_match_include_date_w(struct archive *, int _flag,
-		    const wchar_t *_datestr);
-/* Set inclusion time by a particluar file. */
-__LA_DECL int	archive_match_include_file_time(struct archive *,
-		    int _flag, const char *_pathname);
-__LA_DECL int	archive_match_include_file_time_w(struct archive *,
-		    int _flag, const wchar_t *_pathname);
-/* Add exclusion entry. */
-__LA_DECL int	archive_match_exclude_entry(struct archive *,
-		    int _flag, struct archive_entry *);
-
-/*
- * Test if a file is excluded by its uid ,gid, uname or gname.
- * The conditions are set by following functions.
- */
-__LA_DECL int	archive_match_owner_excluded(struct archive *,
-		    struct archive_entry *);
-/* Add inclusion uid, gid, uname and gname. */
-__LA_DECL int	archive_match_include_uid(struct archive *, __LA_INT64_T);
-__LA_DECL int	archive_match_include_gid(struct archive *, __LA_INT64_T);
-__LA_DECL int	archive_match_include_uname(struct archive *, const char *);
-__LA_DECL int	archive_match_include_uname_w(struct archive *,
-		    const wchar_t *);
-__LA_DECL int	archive_match_include_gname(struct archive *, const char *);
-__LA_DECL int	archive_match_include_gname_w(struct archive *,
-		    const wchar_t *);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* These are meaningless outside of this header. */
-#undef __LA_DECL
-
-/* These need to remain defined because they're used in the
- * callback type definitions.  XXX Fix this.  This is ugly. XXX */
-/* #undef __LA_INT64_T */
-/* #undef __LA_SSIZE_T */
-
-#endif /* !ARCHIVE_H_INCLUDED */
diff --git a/include.new/archive_entry.h b/include.new/archive_entry.h
deleted file mode 100644
index a67371c..0000000
--- a/include.new/archive_entry.h
+++ /dev/null
@@ -1,615 +0,0 @@
-/*-
- * Copyright (c) 2003-2008 Tim Kientzle
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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: releng/10.2/contrib/libarchive/libarchive/archive_entry.h 248616 2013-03-22 13:36:03Z mm $
- */
-
-#ifndef ARCHIVE_ENTRY_H_INCLUDED
-#define	ARCHIVE_ENTRY_H_INCLUDED
-
-/* Note: Compiler will complain if this does not match archive.h! */
-#define	ARCHIVE_VERSION_NUMBER 3001002
-
-/*
- * Note: archive_entry.h is for use outside of libarchive; the
- * configuration headers (config.h, archive_platform.h, etc.) are
- * purely internal.  Do NOT use HAVE_XXX configuration macros to
- * control the behavior of this header!  If you must conditionalize,
- * use predefined compiler and/or platform macros.
- */
-
-#include <sys/types.h>
-#include <stddef.h>  /* for wchar_t */
-#include <time.h>
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-#include <windows.h>
-#endif
-
-/* Get a suitable 64-bit integer type. */
-#if defined(_WIN32) && !defined(__CYGWIN__)
-# define	__LA_INT64_T	__int64
-#else
-#include <unistd.h>
-# if defined(_SCO_DS)
-#  define	__LA_INT64_T	long long
-# else
-#  define	__LA_INT64_T	int64_t
-# endif
-#endif
-
-/* Get a suitable definition for mode_t */
-#if ARCHIVE_VERSION_NUMBER >= 3999000
-/* Switch to plain 'int' for libarchive 4.0.  It's less broken than 'mode_t' */
-# define	__LA_MODE_T	int
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__)
-# define	__LA_MODE_T	unsigned short
-#else
-# define	__LA_MODE_T	mode_t
-#endif
-
-/*
- * On Windows, define LIBARCHIVE_STATIC if you're building or using a
- * .lib.  The default here assumes you're building a DLL.  Only
- * libarchive source should ever define __LIBARCHIVE_BUILD.
- */
-#if ((defined __WIN32__) || (defined _WIN32) || defined(__CYGWIN__)) && (!defined LIBARCHIVE_STATIC)
-# ifdef __LIBARCHIVE_BUILD
-#  ifdef __GNUC__
-#   define __LA_DECL	__attribute__((dllexport)) extern
-#  else
-#   define __LA_DECL	__declspec(dllexport)
-#  endif
-# else
-#  ifdef __GNUC__
-#   define __LA_DECL
-#  else
-#   define __LA_DECL	__declspec(dllimport)
-#  endif
-# endif
-#else
-/* Static libraries on all platforms and shared libraries on non-Windows. */
-# define __LA_DECL
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Description of an archive entry.
- *
- * You can think of this as "struct stat" with some text fields added in.
- *
- * TODO: Add "comment", "charset", and possibly other entries that are
- * supported by "pax interchange" format.  However, GNU, ustar, cpio,
- * and other variants don't support these features, so they're not an
- * excruciatingly high priority right now.
- *
- * TODO: "pax interchange" format allows essentially arbitrary
- * key/value attributes to be attached to any entry.  Supporting
- * such extensions may make this library useful for special
- * applications (e.g., a package manager could attach special
- * package-management attributes to each entry).
- */
-struct archive;
-struct archive_entry;
-
-/*
- * File-type constants.  These are returned from archive_entry_filetype()
- * and passed to archive_entry_set_filetype().
- *
- * These values match S_XXX defines on every platform I've checked,
- * including Windows, AIX, Linux, Solaris, and BSD.  They're
- * (re)defined here because platforms generally don't define the ones
- * they don't support.  For example, Windows doesn't define S_IFLNK or
- * S_IFBLK.  Instead of having a mass of conditional logic and system
- * checks to define any S_XXX values that aren't supported locally,
- * I've just defined a new set of such constants so that
- * libarchive-based applications can manipulate and identify archive
- * entries properly even if the hosting platform can't store them on
- * disk.
- *
- * These values are also used directly within some portable formats,
- * such as cpio.  If you find a platform that varies from these, the
- * correct solution is to leave these alone and translate from these
- * portable values to platform-native values when entries are read from
- * or written to disk.
- */
-/*
- * In libarchive 4.0, we can drop the casts here.
- * They're needed to work around Borland C's broken mode_t.
- */
-#define AE_IFMT		((__LA_MODE_T)0170000)
-#define AE_IFREG	((__LA_MODE_T)0100000)
-#define AE_IFLNK	((__LA_MODE_T)0120000)
-#define AE_IFSOCK	((__LA_MODE_T)0140000)
-#define AE_IFCHR	((__LA_MODE_T)0020000)
-#define AE_IFBLK	((__LA_MODE_T)0060000)
-#define AE_IFDIR	((__LA_MODE_T)0040000)
-#define AE_IFIFO	((__LA_MODE_T)0010000)
-
-/*
- * Basic object manipulation
- */
-
-__LA_DECL struct archive_entry	*archive_entry_clear(struct archive_entry *);
-/* The 'clone' function does a deep copy; all of the strings are copied too. */
-__LA_DECL struct archive_entry	*archive_entry_clone(struct archive_entry *);
-__LA_DECL void			 archive_entry_free(struct archive_entry *);
-__LA_DECL struct archive_entry	*archive_entry_new(void);
-
-/*
- * This form of archive_entry_new2() will pull character-set
- * conversion information from the specified archive handle.  The
- * older archive_entry_new(void) form is equivalent to calling
- * archive_entry_new2(NULL) and will result in the use of an internal
- * default character-set conversion.
- */
-__LA_DECL struct archive_entry	*archive_entry_new2(struct archive *);
-
-/*
- * Retrieve fields from an archive_entry.
- *
- * There are a number of implicit conversions among these fields.  For
- * example, if a regular string field is set and you read the _w wide
- * character field, the entry will implicitly convert narrow-to-wide
- * using the current locale.  Similarly, dev values are automatically
- * updated when you write devmajor or devminor and vice versa.
- *
- * In addition, fields can be "set" or "unset."  Unset string fields
- * return NULL, non-string fields have _is_set() functions to test
- * whether they've been set.  You can "unset" a string field by
- * assigning NULL; non-string fields have _unset() functions to
- * unset them.
- *
- * Note: There is one ambiguity in the above; string fields will
- * also return NULL when implicit character set conversions fail.
- * This is usually what you want.
- */
-__LA_DECL time_t	 archive_entry_atime(struct archive_entry *);
-__LA_DECL long		 archive_entry_atime_nsec(struct archive_entry *);
-__LA_DECL int		 archive_entry_atime_is_set(struct archive_entry *);
-__LA_DECL time_t	 archive_entry_birthtime(struct archive_entry *);
-__LA_DECL long		 archive_entry_birthtime_nsec(struct archive_entry *);
-__LA_DECL int		 archive_entry_birthtime_is_set(struct archive_entry *);
-__LA_DECL time_t	 archive_entry_ctime(struct archive_entry *);
-__LA_DECL long		 archive_entry_ctime_nsec(struct archive_entry *);
-__LA_DECL int		 archive_entry_ctime_is_set(struct archive_entry *);
-__LA_DECL dev_t		 archive_entry_dev(struct archive_entry *);
-__LA_DECL int		 archive_entry_dev_is_set(struct archive_entry *);
-__LA_DECL dev_t		 archive_entry_devmajor(struct archive_entry *);
-__LA_DECL dev_t		 archive_entry_devminor(struct archive_entry *);
-__LA_DECL __LA_MODE_T	 archive_entry_filetype(struct archive_entry *);
-__LA_DECL void		 archive_entry_fflags(struct archive_entry *,
-			    unsigned long * /* set */,
-			    unsigned long * /* clear */);
-__LA_DECL const char	*archive_entry_fflags_text(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_gid(struct archive_entry *);
-__LA_DECL const char	*archive_entry_gname(struct archive_entry *);
-__LA_DECL const wchar_t	*archive_entry_gname_w(struct archive_entry *);
-__LA_DECL const char	*archive_entry_hardlink(struct archive_entry *);
-__LA_DECL const wchar_t	*archive_entry_hardlink_w(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_ino(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_ino64(struct archive_entry *);
-__LA_DECL int		 archive_entry_ino_is_set(struct archive_entry *);
-__LA_DECL __LA_MODE_T	 archive_entry_mode(struct archive_entry *);
-__LA_DECL time_t	 archive_entry_mtime(struct archive_entry *);
-__LA_DECL long		 archive_entry_mtime_nsec(struct archive_entry *);
-__LA_DECL int		 archive_entry_mtime_is_set(struct archive_entry *);
-__LA_DECL unsigned int	 archive_entry_nlink(struct archive_entry *);
-__LA_DECL const char	*archive_entry_pathname(struct archive_entry *);
-__LA_DECL const wchar_t	*archive_entry_pathname_w(struct archive_entry *);
-__LA_DECL __LA_MODE_T	 archive_entry_perm(struct archive_entry *);
-__LA_DECL dev_t		 archive_entry_rdev(struct archive_entry *);
-__LA_DECL dev_t		 archive_entry_rdevmajor(struct archive_entry *);
-__LA_DECL dev_t		 archive_entry_rdevminor(struct archive_entry *);
-__LA_DECL const char	*archive_entry_sourcepath(struct archive_entry *);
-__LA_DECL const wchar_t	*archive_entry_sourcepath_w(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_size(struct archive_entry *);
-__LA_DECL int		 archive_entry_size_is_set(struct archive_entry *);
-__LA_DECL const char	*archive_entry_strmode(struct archive_entry *);
-__LA_DECL const char	*archive_entry_symlink(struct archive_entry *);
-__LA_DECL const wchar_t	*archive_entry_symlink_w(struct archive_entry *);
-__LA_DECL __LA_INT64_T	 archive_entry_uid(struct archive_entry *);
-__LA_DECL const char	*archive_entry_uname(struct archive_entry *);
-__LA_DECL const wchar_t	*archive_entry_uname_w(struct archive_entry *);
-
-/*
- * Set fields in an archive_entry.
- *
- * Note: Before libarchive 2.4, there were 'set' and 'copy' versions
- * of the string setters.  'copy' copied the actual string, 'set' just
- * stored the pointer.  In libarchive 2.4 and later, strings are
- * always copied.
- */
-
-__LA_DECL void	archive_entry_set_atime(struct archive_entry *, time_t, long);
-__LA_DECL void  archive_entry_unset_atime(struct archive_entry *);
-#if defined(_WIN32) && !defined(__CYGWIN__)
-__LA_DECL void archive_entry_copy_bhfi(struct archive_entry *, BY_HANDLE_FILE_INFORMATION *);
-#endif
-__LA_DECL void	archive_entry_set_birthtime(struct archive_entry *, time_t, long);
-__LA_DECL void  archive_entry_unset_birthtime(struct archive_entry *);
-__LA_DECL void	archive_entry_set_ctime(struct archive_entry *, time_t, long);
-__LA_DECL void  archive_entry_unset_ctime(struct archive_entry *);
-__LA_DECL void	archive_entry_set_dev(struct archive_entry *, dev_t);
-__LA_DECL void	archive_entry_set_devmajor(struct archive_entry *, dev_t);
-__LA_DECL void	archive_entry_set_devminor(struct archive_entry *, dev_t);
-__LA_DECL void	archive_entry_set_filetype(struct archive_entry *, unsigned int);
-__LA_DECL void	archive_entry_set_fflags(struct archive_entry *,
-	    unsigned long /* set */, unsigned long /* clear */);
-/* Returns pointer to start of first invalid token, or NULL if none. */
-/* Note that all recognized tokens are processed, regardless. */
-__LA_DECL const char *archive_entry_copy_fflags_text(struct archive_entry *,
-	    const char *);
-__LA_DECL const wchar_t *archive_entry_copy_fflags_text_w(struct archive_entry *,
-	    const wchar_t *);
-__LA_DECL void	archive_entry_set_gid(struct archive_entry *, __LA_INT64_T);
-__LA_DECL void	archive_entry_set_gname(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_gname(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_gname_w(struct archive_entry *, const wchar_t *);
-__LA_DECL int	archive_entry_update_gname_utf8(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_set_hardlink(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_hardlink(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_hardlink_w(struct archive_entry *, const wchar_t *);
-__LA_DECL int	archive_entry_update_hardlink_utf8(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_set_ino(struct archive_entry *, __LA_INT64_T);
-__LA_DECL void	archive_entry_set_ino64(struct archive_entry *, __LA_INT64_T);
-__LA_DECL void	archive_entry_set_link(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_link(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_link_w(struct archive_entry *, const wchar_t *);
-__LA_DECL int	archive_entry_update_link_utf8(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_set_mode(struct archive_entry *, __LA_MODE_T);
-__LA_DECL void	archive_entry_set_mtime(struct archive_entry *, time_t, long);
-__LA_DECL void  archive_entry_unset_mtime(struct archive_entry *);
-__LA_DECL void	archive_entry_set_nlink(struct archive_entry *, unsigned int);
-__LA_DECL void	archive_entry_set_pathname(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_pathname(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_pathname_w(struct archive_entry *, const wchar_t *);
-__LA_DECL int	archive_entry_update_pathname_utf8(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_set_perm(struct archive_entry *, __LA_MODE_T);
-__LA_DECL void	archive_entry_set_rdev(struct archive_entry *, dev_t);
-__LA_DECL void	archive_entry_set_rdevmajor(struct archive_entry *, dev_t);
-__LA_DECL void	archive_entry_set_rdevminor(struct archive_entry *, dev_t);
-__LA_DECL void	archive_entry_set_size(struct archive_entry *, __LA_INT64_T);
-__LA_DECL void	archive_entry_unset_size(struct archive_entry *);
-__LA_DECL void	archive_entry_copy_sourcepath(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_sourcepath_w(struct archive_entry *, const wchar_t *);
-__LA_DECL void	archive_entry_set_symlink(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_symlink(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *);
-__LA_DECL int	archive_entry_update_symlink_utf8(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_set_uid(struct archive_entry *, __LA_INT64_T);
-__LA_DECL void	archive_entry_set_uname(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_uname(struct archive_entry *, const char *);
-__LA_DECL void	archive_entry_copy_uname_w(struct archive_entry *, const wchar_t *);
-__LA_DECL int	archive_entry_update_uname_utf8(struct archive_entry *, const char *);
-/*
- * Routines to bulk copy fields to/from a platform-native "struct
- * stat."  Libarchive used to just store a struct stat inside of each
- * archive_entry object, but this created issues when trying to
- * manipulate archives on systems different than the ones they were
- * created on.
- *
- * TODO: On Linux and other LFS systems, provide both stat32 and
- * stat64 versions of these functions and all of the macro glue so
- * that archive_entry_stat is magically defined to
- * archive_entry_stat32 or archive_entry_stat64 as appropriate.
- */
-__LA_DECL const struct stat	*archive_entry_stat(struct archive_entry *);
-__LA_DECL void	archive_entry_copy_stat(struct archive_entry *, const struct stat *);
-
-/*
- * Storage for Mac OS-specific AppleDouble metadata information.
- * Apple-format tar files store a separate binary blob containing
- * encoded metadata with ACL, extended attributes, etc.
- * This provides a place to store that blob.
- */
-
-__LA_DECL const void * archive_entry_mac_metadata(struct archive_entry *, size_t *);
-__LA_DECL void archive_entry_copy_mac_metadata(struct archive_entry *, const void *, size_t);
-
-/*
- * ACL routines.  This used to simply store and return text-format ACL
- * strings, but that proved insufficient for a number of reasons:
- *   = clients need control over uname/uid and gname/gid mappings
- *   = there are many different ACL text formats
- *   = would like to be able to read/convert archives containing ACLs
- *     on platforms that lack ACL libraries
- *
- *  This last point, in particular, forces me to implement a reasonably
- *  complete set of ACL support routines.
- */
-
-/*
- * Permission bits.
- */
-#define	ARCHIVE_ENTRY_ACL_EXECUTE             0x00000001
-#define	ARCHIVE_ENTRY_ACL_WRITE               0x00000002
-#define	ARCHIVE_ENTRY_ACL_READ                0x00000004
-#define	ARCHIVE_ENTRY_ACL_READ_DATA           0x00000008
-#define	ARCHIVE_ENTRY_ACL_LIST_DIRECTORY      0x00000008
-#define	ARCHIVE_ENTRY_ACL_WRITE_DATA          0x00000010
-#define	ARCHIVE_ENTRY_ACL_ADD_FILE            0x00000010
-#define	ARCHIVE_ENTRY_ACL_APPEND_DATA         0x00000020
-#define	ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY    0x00000020
-#define	ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS    0x00000040
-#define	ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS   0x00000080
-#define	ARCHIVE_ENTRY_ACL_DELETE_CHILD        0x00000100
-#define	ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES     0x00000200
-#define	ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES    0x00000400
-#define	ARCHIVE_ENTRY_ACL_DELETE              0x00000800
-#define	ARCHIVE_ENTRY_ACL_READ_ACL            0x00001000
-#define	ARCHIVE_ENTRY_ACL_WRITE_ACL           0x00002000
-#define	ARCHIVE_ENTRY_ACL_WRITE_OWNER         0x00004000
-#define	ARCHIVE_ENTRY_ACL_SYNCHRONIZE         0x00008000
-
-#define	ARCHIVE_ENTRY_ACL_PERMS_POSIX1E			\
-	(ARCHIVE_ENTRY_ACL_EXECUTE			\
-	    | ARCHIVE_ENTRY_ACL_WRITE			\
-	    | ARCHIVE_ENTRY_ACL_READ)
-
-#define ARCHIVE_ENTRY_ACL_PERMS_NFS4			\
-	(ARCHIVE_ENTRY_ACL_EXECUTE			\
-	    | ARCHIVE_ENTRY_ACL_READ_DATA		\
-	    | ARCHIVE_ENTRY_ACL_LIST_DIRECTORY 		\
-	    | ARCHIVE_ENTRY_ACL_WRITE_DATA		\
-	    | ARCHIVE_ENTRY_ACL_ADD_FILE		\
-	    | ARCHIVE_ENTRY_ACL_APPEND_DATA		\
-	    | ARCHIVE_ENTRY_ACL_ADD_SUBDIRECTORY	\
-	    | ARCHIVE_ENTRY_ACL_READ_NAMED_ATTRS	\
-	    | ARCHIVE_ENTRY_ACL_WRITE_NAMED_ATTRS	\
-	    | ARCHIVE_ENTRY_ACL_DELETE_CHILD		\
-	    | ARCHIVE_ENTRY_ACL_READ_ATTRIBUTES		\
-	    | ARCHIVE_ENTRY_ACL_WRITE_ATTRIBUTES	\
-	    | ARCHIVE_ENTRY_ACL_DELETE			\
-	    | ARCHIVE_ENTRY_ACL_READ_ACL		\
-	    | ARCHIVE_ENTRY_ACL_WRITE_ACL		\
-	    | ARCHIVE_ENTRY_ACL_WRITE_OWNER		\
-	    | ARCHIVE_ENTRY_ACL_SYNCHRONIZE)
-
-/*
- * Inheritance values (NFS4 ACLs only); included in permset.
- */
-#define	ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT                0x02000000
-#define	ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT           0x04000000
-#define	ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT        0x08000000
-#define	ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY                0x10000000
-#define	ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS           0x20000000
-#define	ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS               0x40000000
-
-#define	ARCHIVE_ENTRY_ACL_INHERITANCE_NFS4			\
-	(ARCHIVE_ENTRY_ACL_ENTRY_FILE_INHERIT			\
-	    | ARCHIVE_ENTRY_ACL_ENTRY_DIRECTORY_INHERIT		\
-	    | ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT	\
-	    | ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY		\
-	    | ARCHIVE_ENTRY_ACL_ENTRY_SUCCESSFUL_ACCESS		\
-	    | ARCHIVE_ENTRY_ACL_ENTRY_FAILED_ACCESS)
-
-/* We need to be able to specify combinations of these. */
-#define	ARCHIVE_ENTRY_ACL_TYPE_ACCESS	256  /* POSIX.1e only */
-#define	ARCHIVE_ENTRY_ACL_TYPE_DEFAULT	512  /* POSIX.1e only */
-#define	ARCHIVE_ENTRY_ACL_TYPE_ALLOW	1024 /* NFS4 only */
-#define	ARCHIVE_ENTRY_ACL_TYPE_DENY	2048 /* NFS4 only */
-#define	ARCHIVE_ENTRY_ACL_TYPE_AUDIT	4096 /* NFS4 only */
-#define	ARCHIVE_ENTRY_ACL_TYPE_ALARM	8192 /* NFS4 only */
-#define	ARCHIVE_ENTRY_ACL_TYPE_POSIX1E	(ARCHIVE_ENTRY_ACL_TYPE_ACCESS \
-	    | ARCHIVE_ENTRY_ACL_TYPE_DEFAULT)
-#define	ARCHIVE_ENTRY_ACL_TYPE_NFS4	(ARCHIVE_ENTRY_ACL_TYPE_ALLOW \
-	    | ARCHIVE_ENTRY_ACL_TYPE_DENY \
-	    | ARCHIVE_ENTRY_ACL_TYPE_AUDIT \
-	    | ARCHIVE_ENTRY_ACL_TYPE_ALARM)
-
-/* Tag values mimic POSIX.1e */
-#define	ARCHIVE_ENTRY_ACL_USER		10001	/* Specified user. */
-#define	ARCHIVE_ENTRY_ACL_USER_OBJ 	10002	/* User who owns the file. */
-#define	ARCHIVE_ENTRY_ACL_GROUP		10003	/* Specified group. */
-#define	ARCHIVE_ENTRY_ACL_GROUP_OBJ	10004	/* Group who owns the file. */
-#define	ARCHIVE_ENTRY_ACL_MASK		10005	/* Modify group access (POSIX.1e only) */
-#define	ARCHIVE_ENTRY_ACL_OTHER		10006	/* Public (POSIX.1e only) */
-#define	ARCHIVE_ENTRY_ACL_EVERYONE	10107   /* Everyone (NFS4 only) */
-
-/*
- * Set the ACL by clearing it and adding entries one at a time.
- * Unlike the POSIX.1e ACL routines, you must specify the type
- * (access/default) for each entry.  Internally, the ACL data is just
- * a soup of entries.  API calls here allow you to retrieve just the
- * entries of interest.  This design (which goes against the spirit of
- * POSIX.1e) is useful for handling archive formats that combine
- * default and access information in a single ACL list.
- */
-__LA_DECL void	 archive_entry_acl_clear(struct archive_entry *);
-__LA_DECL int	 archive_entry_acl_add_entry(struct archive_entry *,
-	    int /* type */, int /* permset */, int /* tag */,
-	    int /* qual */, const char * /* name */);
-__LA_DECL int	 archive_entry_acl_add_entry_w(struct archive_entry *,
-	    int /* type */, int /* permset */, int /* tag */,
-	    int /* qual */, const wchar_t * /* name */);
-
-/*
- * To retrieve the ACL, first "reset", then repeatedly ask for the
- * "next" entry.  The want_type parameter allows you to request only
- * certain types of entries.
- */
-__LA_DECL int	 archive_entry_acl_reset(struct archive_entry *, int /* want_type */);
-__LA_DECL int	 archive_entry_acl_next(struct archive_entry *, int /* want_type */,
-	    int * /* type */, int * /* permset */, int * /* tag */,
-	    int * /* qual */, const char ** /* name */);
-__LA_DECL int	 archive_entry_acl_next_w(struct archive_entry *, int /* want_type */,
-	    int * /* type */, int * /* permset */, int * /* tag */,
-	    int * /* qual */, const wchar_t ** /* name */);
-
-/*
- * Construct a text-format ACL.  The flags argument is a bitmask that
- * can include any of the following:
- *
- * ARCHIVE_ENTRY_ACL_TYPE_ACCESS - Include POSIX.1e "access" entries.
- * ARCHIVE_ENTRY_ACL_TYPE_DEFAULT - Include POSIX.1e "default" entries.
- * ARCHIVE_ENTRY_ACL_TYPE_NFS4 - Include NFS4 entries.
- * ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID - Include extra numeric ID field in
- *    each ACL entry.  ('star' introduced this for POSIX.1e, this flag
- *    also applies to NFS4.)
- * ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT - Include "default:" before each
- *    default ACL entry, as used in old Solaris ACLs.
- */
-#define	ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID	1024
-#define	ARCHIVE_ENTRY_ACL_STYLE_MARK_DEFAULT	2048
-__LA_DECL const wchar_t	*archive_entry_acl_text_w(struct archive_entry *,
-		    int /* flags */);
-__LA_DECL const char *archive_entry_acl_text(struct archive_entry *,
-		    int /* flags */);
-
-/* Return a count of entries matching 'want_type' */
-__LA_DECL int	 archive_entry_acl_count(struct archive_entry *, int /* want_type */);
-
-/* Return an opaque ACL object. */
-/* There's not yet anything clients can actually do with this... */
-struct archive_acl;
-__LA_DECL struct archive_acl *archive_entry_acl(struct archive_entry *);
-
-/*
- * extended attributes
- */
-
-__LA_DECL void	 archive_entry_xattr_clear(struct archive_entry *);
-__LA_DECL void	 archive_entry_xattr_add_entry(struct archive_entry *,
-	    const char * /* name */, const void * /* value */,
-	    size_t /* size */);
-
-/*
- * To retrieve the xattr list, first "reset", then repeatedly ask for the
- * "next" entry.
- */
-
-__LA_DECL int	archive_entry_xattr_count(struct archive_entry *);
-__LA_DECL int	archive_entry_xattr_reset(struct archive_entry *);
-__LA_DECL int	archive_entry_xattr_next(struct archive_entry *,
-	    const char ** /* name */, const void ** /* value */, size_t *);
-
-/*
- * sparse
- */
-
-__LA_DECL void	 archive_entry_sparse_clear(struct archive_entry *);
-__LA_DECL void	 archive_entry_sparse_add_entry(struct archive_entry *,
-	    __LA_INT64_T /* offset */, __LA_INT64_T /* length */);
-
-/*
- * To retrieve the xattr list, first "reset", then repeatedly ask for the
- * "next" entry.
- */
-
-__LA_DECL int	archive_entry_sparse_count(struct archive_entry *);
-__LA_DECL int	archive_entry_sparse_reset(struct archive_entry *);
-__LA_DECL int	archive_entry_sparse_next(struct archive_entry *,
-	    __LA_INT64_T * /* offset */, __LA_INT64_T * /* length */);
-
-/*
- * Utility to match up hardlinks.
- *
- * The 'struct archive_entry_linkresolver' is a cache of archive entries
- * for files with multiple links.  Here's how to use it:
- *   1. Create a lookup object with archive_entry_linkresolver_new()
- *   2. Tell it the archive format you're using.
- *   3. Hand each archive_entry to archive_entry_linkify().
- *      That function will return 0, 1, or 2 entries that should
- *      be written.
- *   4. Call archive_entry_linkify(resolver, NULL) until
- *      no more entries are returned.
- *   5. Call archive_entry_linkresolver_free(resolver) to free resources.
- *
- * The entries returned have their hardlink and size fields updated
- * appropriately.  If an entry is passed in that does not refer to
- * a file with multiple links, it is returned unchanged.  The intention
- * is that you should be able to simply filter all entries through
- * this machine.
- *
- * To make things more efficient, be sure that each entry has a valid
- * nlinks value.  The hardlink cache uses this to track when all links
- * have been found.  If the nlinks value is zero, it will keep every
- * name in the cache indefinitely, which can use a lot of memory.
- *
- * Note that archive_entry_size() is reset to zero if the file
- * body should not be written to the archive.  Pay attention!
- */
-struct archive_entry_linkresolver;
-
-/*
- * There are three different strategies for marking hardlinks.
- * The descriptions below name them after the best-known
- * formats that rely on each strategy:
- *
- * "Old cpio" is the simplest, it always returns any entry unmodified.
- *    As far as I know, only cpio formats use this.  Old cpio archives
- *    store every link with the full body; the onus is on the dearchiver
- *    to detect and properly link the files as they are restored.
- * "tar" is also pretty simple; it caches a copy the first time it sees
- *    any link.  Subsequent appearances are modified to be hardlink
- *    references to the first one without any body.  Used by all tar
- *    formats, although the newest tar formats permit the "old cpio" strategy
- *    as well.  This strategy is very simple for the dearchiver,
- *    and reasonably straightforward for the archiver.
- * "new cpio" is trickier.  It stores the body only with the last
- *    occurrence.  The complication is that we might not
- *    see every link to a particular file in a single session, so
- *    there's no easy way to know when we've seen the last occurrence.
- *    The solution here is to queue one link until we see the next.
- *    At the end of the session, you can enumerate any remaining
- *    entries by calling archive_entry_linkify(NULL) and store those
- *    bodies.  If you have a file with three links l1, l2, and l3,
- *    you'll get the following behavior if you see all three links:
- *           linkify(l1) => NULL   (the resolver stores l1 internally)
- *           linkify(l2) => l1     (resolver stores l2, you write l1)
- *           linkify(l3) => l2, l3 (all links seen, you can write both).
- *    If you only see l1 and l2, you'll get this behavior:
- *           linkify(l1) => NULL
- *           linkify(l2) => l1
- *           linkify(NULL) => l2   (at end, you retrieve remaining links)
- *    As the name suggests, this strategy is used by newer cpio variants.
- *    It's noticeably more complex for the archiver, slightly more complex
- *    for the dearchiver than the tar strategy, but makes it straightforward
- *    to restore a file using any link by simply continuing to scan until
- *    you see a link that is stored with a body.  In contrast, the tar
- *    strategy requires you to rescan the archive from the beginning to
- *    correctly extract an arbitrary link.
- */
-
-__LA_DECL struct archive_entry_linkresolver *archive_entry_linkresolver_new(void);
-__LA_DECL void archive_entry_linkresolver_set_strategy(
-	struct archive_entry_linkresolver *, int /* format_code */);
-__LA_DECL void archive_entry_linkresolver_free(struct archive_entry_linkresolver *);
-__LA_DECL void archive_entry_linkify(struct archive_entry_linkresolver *,
-    struct archive_entry **, struct archive_entry **);
-__LA_DECL struct archive_entry *archive_entry_partial_links(
-    struct archive_entry_linkresolver *res, unsigned int *links);
-
-#ifdef __cplusplus
-}
-#endif
-
-/* This is meaningless outside of this header. */
-#undef __LA_DECL
-
-#endif /* !ARCHIVE_ENTRY_H_INCLUDED */
diff --git a/include.new/arpa/ftp.h b/include.new/arpa/ftp.h
deleted file mode 100644
index 1d8d977..0000000
--- a/include.new/arpa/ftp.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 1983, 1989, 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. 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.
- *
- *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/arpa/ftp.h 203965 2010-02-16 19:46:46Z imp $
- */
-
-#ifndef _ARPA_FTP_H_
-#define	_ARPA_FTP_H_
-
-/* Definitions for FTP; see RFC-765. */
-
-/*
- * Reply codes.
- */
-#define PRELIM		1	/* positive preliminary */
-#define COMPLETE	2	/* positive completion */
-#define CONTINUE	3	/* positive intermediate */
-#define TRANSIENT	4	/* transient negative completion */
-#define ERROR		5	/* permanent negative completion */
-
-/*
- * Type codes
- */
-#define	TYPE_A		1	/* ASCII */
-#define	TYPE_E		2	/* EBCDIC */
-#define	TYPE_I		3	/* image */
-#define	TYPE_L		4	/* local byte size */
-
-#ifdef FTP_NAMES
-char *typenames[] =  {"0", "ASCII", "EBCDIC", "Image", "Local" };
-#endif
-
-/*
- * Form codes
- */
-#define	FORM_N		1	/* non-print */
-#define	FORM_T		2	/* telnet format effectors */
-#define	FORM_C		3	/* carriage control (ASA) */
-#ifdef FTP_NAMES
-char *formnames[] =  {"0", "Nonprint", "Telnet", "Carriage-control" };
-#endif
-
-/*
- * Structure codes
- */
-#define	STRU_F		1	/* file (no record structure) */
-#define	STRU_R		2	/* record structure */
-#define	STRU_P		3	/* page structure */
-#ifdef FTP_NAMES
-char *strunames[] =  {"0", "File", "Record", "Page" };
-#endif
-
-/*
- * Mode types
- */
-#define	MODE_S		1	/* stream */
-#define	MODE_B		2	/* block */
-#define	MODE_C		3	/* compressed */
-#ifdef FTP_NAMES
-char *modenames[] =  {"0", "Stream", "Block", "Compressed" };
-#endif
-
-/*
- * Record Tokens
- */
-#define	REC_ESC		'\377'	/* Record-mode Escape */
-#define	REC_EOR		'\001'	/* Record-mode End-of-Record */
-#define REC_EOF		'\002'	/* Record-mode End-of-File */
-
-/*
- * Block Header
- */
-#define	BLK_EOR		0x80	/* Block is End-of-Record */
-#define	BLK_EOF		0x40	/* Block is End-of-File */
-#define BLK_ERRORS	0x20	/* Block is suspected of containing errors */
-#define	BLK_RESTART	0x10	/* Block is Restart Marker */
-
-#define	BLK_BYTECOUNT	2	/* Bytes in this block */
-
-#endif /* !_FTP_H_ */
diff --git a/include.new/arpa/inet.h b/include.new/arpa/inet.h
deleted file mode 100644
index 7086a4a..0000000
--- a/include.new/arpa/inet.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * ++Copyright++ 1983, 1993
- * -
- * Copyright (c) 1983, 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. 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*%
- *	@(#)inet.h	8.1 (Berkeley) 6/2/93
- *	$Id: inet.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/include/arpa/inet.h 270838 2014-08-30 10:16:25Z ume $
- */
-
-#ifndef _ARPA_INET_H_
-#define	_ARPA_INET_H_
-
-/* External definitions for functions in inet(3). */
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/* Required for byteorder(3) functions. */
-#include <machine/endian.h>
-
-#define	INET_ADDRSTRLEN		16
-#define	INET6_ADDRSTRLEN	46
-
-#ifndef _UINT16_T_DECLARED
-typedef	__uint16_t	uint16_t;
-#define	_UINT16_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t	uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
-
-#ifndef _IN_ADDR_T_DECLARED
-typedef	uint32_t	in_addr_t;
-#define	_IN_ADDR_T_DECLARED
-#endif
-
-#ifndef _IN_PORT_T_DECLARED
-typedef	uint16_t	in_port_t;
-#define	_IN_PORT_T_DECLARED
-#endif
-
-#if __BSD_VISIBLE
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-#endif
-
-/*
- * XXX socklen_t is used by a POSIX.1-2001 interface, but not required by
- * POSIX.1-2001.
- */
-#ifndef _SOCKLEN_T_DECLARED
-typedef	__socklen_t	socklen_t;
-#define	_SOCKLEN_T_DECLARED
-#endif
-
-#ifndef _STRUCT_IN_ADDR_DECLARED
-struct in_addr {
-	in_addr_t s_addr;
-};
-#define	_STRUCT_IN_ADDR_DECLARED
-#endif
-
-/* XXX all new diversions!! argh!! */
-#if __BSD_VISIBLE
-#define	inet_addr		__inet_addr
-#define	inet_aton		__inet_aton
-#define	inet_lnaof		__inet_lnaof
-#define	inet_makeaddr		__inet_makeaddr
-#define	inet_neta		__inet_neta
-#define	inet_netof		__inet_netof
-#define	inet_network		__inet_network
-#define	inet_net_ntop		__inet_net_ntop
-#define	inet_net_pton		__inet_net_pton
-#define	inet_cidr_ntop		__inet_cidr_ntop
-#define	inet_cidr_pton		__inet_cidr_pton
-#define	inet_ntoa		__inet_ntoa
-#define	inet_ntoa_r		__inet_ntoa_r
-#define	inet_pton		__inet_pton
-#define	inet_ntop		__inet_ntop
-#define	inet_nsap_addr		__inet_nsap_addr
-#define	inet_nsap_ntoa		__inet_nsap_ntoa
-#endif /* __BSD_VISIBLE */
-
-__BEGIN_DECLS
-#ifndef _BYTEORDER_PROTOTYPED
-#define	_BYTEORDER_PROTOTYPED
-uint32_t	 htonl(uint32_t);
-uint16_t	 htons(uint16_t);
-uint32_t	 ntohl(uint32_t);
-uint16_t	 ntohs(uint16_t);
-#endif
-
-in_addr_t	 inet_addr(const char *);
-/*const*/ char	*inet_ntoa(struct in_addr);
-const char	*inet_ntop(int, const void * __restrict, char * __restrict,
-		    socklen_t);
-int		 inet_pton(int, const char * __restrict, void * __restrict);
-
-#if __BSD_VISIBLE
-int		 inet_aton(const char *, struct in_addr *);
-in_addr_t	 inet_lnaof(struct in_addr);
-struct in_addr	 inet_makeaddr(in_addr_t, in_addr_t);
-char *		 inet_neta(in_addr_t, char *, size_t);
-in_addr_t	 inet_netof(struct in_addr);
-in_addr_t	 inet_network(const char *);
-char		*inet_net_ntop(int, const void *, int, char *, size_t);
-int		 inet_net_pton(int, const char *, void *, size_t);
-char		*inet_ntoa_r(struct in_addr, char *buf, socklen_t size);
-char		*inet_cidr_ntop(int, const void *, int, char *, size_t);
-int		 inet_cidr_pton(int, const char *, void *, int *);
-unsigned	 inet_nsap_addr(const char *, unsigned char *, int);
-char		*inet_nsap_ntoa(int, const unsigned char *, char *);
-#endif /* __BSD_VISIBLE */
-__END_DECLS
-
-#ifndef _BYTEORDER_FUNC_DEFINED
-#define	_BYTEORDER_FUNC_DEFINED
-#define	htonl(x)	__htonl(x)
-#define	htons(x)	__htons(x)
-#define	ntohl(x)	__ntohl(x)
-#define	ntohs(x)	__ntohs(x)
-#endif
-
-#endif /* !_ARPA_INET_H_ */
-
-/*! \file */
diff --git a/include.new/arpa/nameser.h b/include.new/arpa/nameser.h
deleted file mode 100644
index fb22cf6..0000000
--- a/include.new/arpa/nameser.h
+++ /dev/null
@@ -1,680 +0,0 @@
-/*
- * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1996-2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Copyright (c) 1983, 1989, 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. 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.
- */
-
-/*
- *	$Id: nameser.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/include/arpa/nameser.h 270838 2014-08-30 10:16:25Z ume $
- */
-
-#ifndef _ARPA_NAMESER_H_
-#define _ARPA_NAMESER_H_
-
-/*! \file */
-
-#define BIND_4_COMPAT
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-/*%
- * Revision information.  This is the release date in YYYYMMDD format.
- * It can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__NAMESER > 19931104)".  Do not
- * compare for equality; rather, use it to determine whether your libbind.a
- * contains a new enough lib/nameser/ to support the feature you need.
- */
-
-#define __NAMESER	20090302	/*%< New interface version stamp. */
-/*
- * Define constants based on RFC0883, RFC1034, RFC 1035
- */
-#define NS_PACKETSZ	512	/*%< default UDP packet size */
-#define NS_MAXDNAME	1025	/*%< maximum domain name (presentation format)*/
-#define NS_MAXMSG	65535	/*%< maximum message size */
-#define NS_MAXCDNAME	255	/*%< maximum compressed domain name */
-#define NS_MAXLABEL	63	/*%< maximum length of domain label */
-#define NS_MAXLABELS	128	/*%< theoretical max #/labels per domain name */
-#define NS_MAXNNAME	256	/*%< maximum uncompressed (binary) domain name*/
-#define	NS_MAXPADDR	(sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff")
-#define NS_HFIXEDSZ	12	/*%< #/bytes of fixed data in header */
-#define NS_QFIXEDSZ	4	/*%< #/bytes of fixed data in query */
-#define NS_RRFIXEDSZ	10	/*%< #/bytes of fixed data in r record */
-#define NS_INT32SZ	4	/*%< #/bytes of data in a uint32_t */
-#define NS_INT16SZ	2	/*%< #/bytes of data in a u_int16_t */
-#define NS_INT8SZ	1	/*%< #/bytes of data in a u_int8_t */
-#define NS_INADDRSZ	4	/*%< IPv4 T_A */
-#define NS_IN6ADDRSZ	16	/*%< IPv6 T_AAAA */
-#define NS_CMPRSFLGS	0xc0	/*%< Flag bits indicating name compression. */
-#define NS_DEFAULTPORT	53	/*%< For both TCP and UDP. */
-/*
- * These can be expanded with synonyms, just keep ns_parse.c:ns_parserecord()
- * in synch with it.
- */
-typedef enum __ns_sect {
-	ns_s_qd = 0,		/*%< Query: Question. */
-	ns_s_zn = 0,		/*%< Update: Zone. */
-	ns_s_an = 1,		/*%< Query: Answer. */
-	ns_s_pr = 1,		/*%< Update: Prerequisites. */
-	ns_s_ns = 2,		/*%< Query: Name servers. */
-	ns_s_ud = 2,		/*%< Update: Update. */
-	ns_s_ar = 3,		/*%< Query|Update: Additional records. */
-	ns_s_max = 4
-} ns_sect;
-
-/*%
- * Network name (compressed or not) type.  Equivilent to a pointer when used
- * in a function prototype.  Can be const'd.
- */
-typedef u_char ns_nname[NS_MAXNNAME];
-typedef const u_char *ns_nname_ct;
-typedef u_char *ns_nname_t;
-
-struct ns_namemap { ns_nname_ct base; int len; };
-typedef struct ns_namemap *ns_namemap_t;
-typedef const struct ns_namemap *ns_namemap_ct;
-
-/*%
- * This is a message handle.  It is caller allocated and has no dynamic data.
- * This structure is intended to be opaque to all but ns_parse.c, thus the
- * leading _'s on the member names.  Use the accessor functions, not the _'s.
- */
-typedef struct __ns_msg {
-	const u_char	*_msg, *_eom;
-	u_int16_t	_id, _flags, _counts[ns_s_max];
-	const u_char	*_sections[ns_s_max];
-	ns_sect		_sect;
-	int		_rrnum;
-	const u_char	*_msg_ptr;
-} ns_msg;
-
-/*
- * This is a newmsg handle, used when constructing new messages with
- * ns_newmsg_init, et al.
- */
-struct ns_newmsg {
-	ns_msg		msg;
-	const u_char	*dnptrs[25];
-	const u_char	**lastdnptr;
-};
-typedef struct ns_newmsg ns_newmsg;
-
-/* Private data structure - do not use from outside library. */
-struct _ns_flagdata {  int mask, shift;  };
-extern struct _ns_flagdata _ns_flagdata[];
-
-/* Accessor macros - this is part of the public interface. */
-
-#define ns_msg_id(handle) ((handle)._id + 0)
-#define ns_msg_base(handle) ((handle)._msg + 0)
-#define ns_msg_end(handle) ((handle)._eom + 0)
-#define ns_msg_size(handle) ((handle)._eom - (handle)._msg)
-#define ns_msg_count(handle, section) ((handle)._counts[section] + 0)
-
-/*%
- * This is a parsed record.  It is caller allocated and has no dynamic data.
- */
-typedef	struct __ns_rr {
-	char		name[NS_MAXDNAME];
-	u_int16_t	type;
-	u_int16_t	rr_class;
-	uint32_t	ttl;
-	u_int16_t	rdlength;
-	const u_char *	rdata;
-} ns_rr;
-
-/*
- * Same thing, but using uncompressed network binary names, and real C types.
- */
-typedef	struct __ns_rr2 {
-	ns_nname	nname;
-	size_t		nnamel;
-	int		type;
-	int		rr_class;
-	u_int		ttl;
-	int		rdlength;
-	const u_char *	rdata;
-} ns_rr2;
-
-/* Accessor macros - this is part of the public interface. */
-#define ns_rr_name(rr)	(((rr).name[0] != '\0') ? (rr).name : ".")
-#define ns_rr_nname(rr)	((const ns_nname_t)(rr).nname)
-#define ns_rr_nnamel(rr) ((rr).nnamel + 0)
-#define ns_rr_type(rr)	((ns_type)((rr).type + 0))
-#define ns_rr_class(rr)	((ns_class)((rr).rr_class + 0))
-#define ns_rr_ttl(rr)	((rr).ttl + 0)
-#define ns_rr_rdlen(rr)	((rr).rdlength + 0)
-#define ns_rr_rdata(rr)	((rr).rdata + 0)
-
-/*%
- * These don't have to be in the same order as in the packet flags word,
- * and they can even overlap in some cases, but they will need to be kept
- * in synch with ns_parse.c:ns_flagdata[].
- */
-typedef enum __ns_flag {
-	ns_f_qr,		/*%< Question/Response. */
-	ns_f_opcode,		/*%< Operation code. */
-	ns_f_aa,		/*%< Authoritative Answer. */
-	ns_f_tc,		/*%< Truncation occurred. */
-	ns_f_rd,		/*%< Recursion Desired. */
-	ns_f_ra,		/*%< Recursion Available. */
-	ns_f_z,			/*%< MBZ. */
-	ns_f_ad,		/*%< Authentic Data (DNSSEC). */
-	ns_f_cd,		/*%< Checking Disabled (DNSSEC). */
-	ns_f_rcode,		/*%< Response code. */
-	ns_f_max
-} ns_flag;
-
-/*%
- * Currently defined opcodes.
- */
-typedef enum __ns_opcode {
-	ns_o_query = 0,		/*%< Standard query. */
-	ns_o_iquery = 1,	/*%< Inverse query (deprecated/unsupported). */
-	ns_o_status = 2,	/*%< Name server status query (unsupported). */
-				/* Opcode 3 is undefined/reserved. */
-	ns_o_notify = 4,	/*%< Zone change notification. */
-	ns_o_update = 5,	/*%< Zone update message. */
-	ns_o_max = 6
-} ns_opcode;
-
-/*%
- * Currently defined response codes.
- */
-typedef	enum __ns_rcode {
-	ns_r_noerror = 0,	/*%< No error occurred. */
-	ns_r_formerr = 1,	/*%< Format error. */
-	ns_r_servfail = 2,	/*%< Server failure. */
-	ns_r_nxdomain = 3,	/*%< Name error. */
-	ns_r_notimpl = 4,	/*%< Unimplemented. */
-	ns_r_refused = 5,	/*%< Operation refused. */
-	/* these are for BIND_UPDATE */
-	ns_r_yxdomain = 6,	/*%< Name exists */
-	ns_r_yxrrset = 7,	/*%< RRset exists */
-	ns_r_nxrrset = 8,	/*%< RRset does not exist */
-	ns_r_notauth = 9,	/*%< Not authoritative for zone */
-	ns_r_notzone = 10,	/*%< Zone of record different from zone section */
-	ns_r_max = 11,
-	/* The following are EDNS extended rcodes */
-	ns_r_badvers = 16,
-	/* The following are TSIG errors */
-	ns_r_badsig = 16,
-	ns_r_badkey = 17,
-	ns_r_badtime = 18
-} ns_rcode;
-
-/* BIND_UPDATE */
-typedef enum __ns_update_operation {
-	ns_uop_delete = 0,
-	ns_uop_add = 1,
-	ns_uop_max = 2
-} ns_update_operation;
-
-/*%
- * This structure is used for TSIG authenticated messages
- */
-struct ns_tsig_key {
-	char name[NS_MAXDNAME], alg[NS_MAXDNAME];
-	unsigned char *data;
-	int len;
-};
-typedef struct ns_tsig_key ns_tsig_key;
-
-/*%
- * This structure is used for TSIG authenticated TCP messages
- */
-struct ns_tcp_tsig_state {
-	int counter;
-	struct dst_key *key;
-	void *ctx;
-	unsigned char sig[NS_PACKETSZ];
-	int siglen;
-};
-typedef struct ns_tcp_tsig_state ns_tcp_tsig_state;
-
-#define NS_TSIG_FUDGE 300
-#define NS_TSIG_TCP_COUNT 100
-#define NS_TSIG_ALG_HMAC_MD5 "HMAC-MD5.SIG-ALG.REG.INT"
-
-#define NS_TSIG_ERROR_NO_TSIG -10
-#define NS_TSIG_ERROR_NO_SPACE -11
-#define NS_TSIG_ERROR_FORMERR -12
-
-/*%
- * Currently defined type values for resources and queries.
- */
-typedef enum __ns_type {
-	ns_t_invalid = 0,	/*%< Cookie. */
-	ns_t_a = 1,		/*%< Host address. */
-	ns_t_ns = 2,		/*%< Authoritative server. */
-	ns_t_md = 3,		/*%< Mail destination. */
-	ns_t_mf = 4,		/*%< Mail forwarder. */
-	ns_t_cname = 5,		/*%< Canonical name. */
-	ns_t_soa = 6,		/*%< Start of authority zone. */
-	ns_t_mb = 7,		/*%< Mailbox domain name. */
-	ns_t_mg = 8,		/*%< Mail group member. */
-	ns_t_mr = 9,		/*%< Mail rename name. */
-	ns_t_null = 10,		/*%< Null resource record. */
-	ns_t_wks = 11,		/*%< Well known service. */
-	ns_t_ptr = 12,		/*%< Domain name pointer. */
-	ns_t_hinfo = 13,	/*%< Host information. */
-	ns_t_minfo = 14,	/*%< Mailbox information. */
-	ns_t_mx = 15,		/*%< Mail routing information. */
-	ns_t_txt = 16,		/*%< Text strings. */
-	ns_t_rp = 17,		/*%< Responsible person. */
-	ns_t_afsdb = 18,	/*%< AFS cell database. */
-	ns_t_x25 = 19,		/*%< X_25 calling address. */
-	ns_t_isdn = 20,		/*%< ISDN calling address. */
-	ns_t_rt = 21,		/*%< Router. */
-	ns_t_nsap = 22,		/*%< NSAP address. */
-	ns_t_nsap_ptr = 23,	/*%< Reverse NSAP lookup (deprecated). */
-	ns_t_sig = 24,		/*%< Security signature. */
-	ns_t_key = 25,		/*%< Security key. */
-	ns_t_px = 26,		/*%< X.400 mail mapping. */
-	ns_t_gpos = 27,		/*%< Geographical position (withdrawn). */
-	ns_t_aaaa = 28,		/*%< IPv6 Address. */
-	ns_t_loc = 29,		/*%< Location Information. */
-	ns_t_nxt = 30,		/*%< Next domain (security). */
-	ns_t_eid = 31,		/*%< Endpoint identifier. */
-	ns_t_nimloc = 32,	/*%< Nimrod Locator. */
-	ns_t_srv = 33,		/*%< Server Selection. */
-	ns_t_atma = 34,		/*%< ATM Address */
-	ns_t_naptr = 35,	/*%< Naming Authority PoinTeR */
-	ns_t_kx = 36,		/*%< Key Exchange */
-	ns_t_cert = 37,		/*%< Certification record */
-	ns_t_a6 = 38,		/*%< IPv6 address (experimental) */
-	ns_t_dname = 39,	/*%< Non-terminal DNAME */
-	ns_t_sink = 40,		/*%< Kitchen sink (experimentatl) */
-	ns_t_opt = 41,		/*%< EDNS0 option (meta-RR) */
-	ns_t_apl = 42,		/*%< Address prefix list (RFC3123) */
-	ns_t_ds = 43,		/*%< Delegation Signer */
-	ns_t_sshfp = 44,	/*%< SSH Fingerprint */
-	ns_t_ipseckey = 45,	/*%< IPSEC Key */
-	ns_t_rrsig = 46,	/*%< RRset Signature */
-	ns_t_nsec = 47,		/*%< Negative security */
-	ns_t_dnskey = 48,	/*%< DNS Key */
-	ns_t_dhcid = 49,	/*%< Dynamic host configuratin identifier */
-	ns_t_nsec3 = 50,	/*%< Negative security type 3 */
-	ns_t_nsec3param = 51,	/*%< Negative security type 3 parameters */
-	ns_t_hip = 55,		/*%< Host Identity Protocol */
-	ns_t_spf = 99,		/*%< Sender Policy Framework */
-	ns_t_tkey = 249,	/*%< Transaction key */
-	ns_t_tsig = 250,	/*%< Transaction signature. */
-	ns_t_ixfr = 251,	/*%< Incremental zone transfer. */
-	ns_t_axfr = 252,	/*%< Transfer zone of authority. */
-	ns_t_mailb = 253,	/*%< Transfer mailbox records. */
-	ns_t_maila = 254,	/*%< Transfer mail agent records. */
-	ns_t_any = 255,		/*%< Wildcard match. */
-	ns_t_zxfr = 256,	/*%< BIND-specific, nonstandard. */
-	ns_t_dlv = 32769,	/*%< DNSSEC look-aside validatation. */
-	ns_t_max = 65536
-} ns_type;
-
-/* Exclusively a QTYPE? (not also an RTYPE) */
-#define	ns_t_qt_p(t) (ns_t_xfr_p(t) || (t) == ns_t_any || \
-		      (t) == ns_t_mailb || (t) == ns_t_maila)
-/* Some kind of meta-RR? (not a QTYPE, but also not an RTYPE) */
-#define	ns_t_mrr_p(t) ((t) == ns_t_tsig || (t) == ns_t_opt)
-/* Exclusively an RTYPE? (not also a QTYPE or a meta-RR) */
-#define ns_t_rr_p(t) (!ns_t_qt_p(t) && !ns_t_mrr_p(t))
-#define ns_t_udp_p(t) ((t) != ns_t_axfr && (t) != ns_t_zxfr)
-#define ns_t_xfr_p(t) ((t) == ns_t_axfr || (t) == ns_t_ixfr || \
-		       (t) == ns_t_zxfr)
-
-/*%
- * Values for class field
- */
-typedef enum __ns_class {
-	ns_c_invalid = 0,	/*%< Cookie. */
-	ns_c_in = 1,		/*%< Internet. */
-	ns_c_2 = 2,		/*%< unallocated/unsupported. */
-	ns_c_chaos = 3,		/*%< MIT Chaos-net. */
-	ns_c_hs = 4,		/*%< MIT Hesiod. */
-	/* Query class values which do not appear in resource records */
-	ns_c_none = 254,	/*%< for prereq. sections in update requests */
-	ns_c_any = 255,		/*%< Wildcard match. */
-	ns_c_max = 65536
-} ns_class;
-
-/* DNSSEC constants. */
-
-typedef enum __ns_key_types {
-	ns_kt_rsa = 1,		/*%< key type RSA/MD5 */
-	ns_kt_dh  = 2,		/*%< Diffie Hellman */
-	ns_kt_dsa = 3,		/*%< Digital Signature Standard (MANDATORY) */
-	ns_kt_private = 254	/*%< Private key type starts with OID */
-} ns_key_types;
-
-typedef enum __ns_cert_types {
-	cert_t_pkix = 1,	/*%< PKIX (X.509v3) */
-	cert_t_spki = 2,	/*%< SPKI */
-	cert_t_pgp  = 3,	/*%< PGP */
-	cert_t_url  = 253,	/*%< URL private type */
-	cert_t_oid  = 254	/*%< OID private type */
-} ns_cert_types;
-
-/* Flags field of the KEY RR rdata. */
-#define	NS_KEY_TYPEMASK		0xC000	/*%< Mask for "type" bits */
-#define	NS_KEY_TYPE_AUTH_CONF	0x0000	/*%< Key usable for both */
-#define	NS_KEY_TYPE_CONF_ONLY	0x8000	/*%< Key usable for confidentiality */
-#define	NS_KEY_TYPE_AUTH_ONLY	0x4000	/*%< Key usable for authentication */
-#define	NS_KEY_TYPE_NO_KEY	0xC000	/*%< No key usable for either; no key */
-/* The type bits can also be interpreted independently, as single bits: */
-#define	NS_KEY_NO_AUTH		0x8000	/*%< Key unusable for authentication */
-#define	NS_KEY_NO_CONF		0x4000	/*%< Key unusable for confidentiality */
-#define	NS_KEY_RESERVED2	0x2000	/* Security is *mandatory* if bit=0 */
-#define	NS_KEY_EXTENDED_FLAGS	0x1000	/*%< reserved - must be zero */
-#define	NS_KEY_RESERVED4	0x0800  /*%< reserved - must be zero */
-#define	NS_KEY_RESERVED5	0x0400  /*%< reserved - must be zero */
-#define	NS_KEY_NAME_TYPE	0x0300	/*%< these bits determine the type */
-#define	NS_KEY_NAME_USER	0x0000	/*%< key is assoc. with user */
-#define	NS_KEY_NAME_ENTITY	0x0200	/*%< key is assoc. with entity eg host */
-#define	NS_KEY_NAME_ZONE	0x0100	/*%< key is zone key */
-#define	NS_KEY_NAME_RESERVED	0x0300	/*%< reserved meaning */
-#define	NS_KEY_RESERVED8	0x0080  /*%< reserved - must be zero */
-#define	NS_KEY_RESERVED9	0x0040  /*%< reserved - must be zero */
-#define	NS_KEY_RESERVED10	0x0020  /*%< reserved - must be zero */
-#define	NS_KEY_RESERVED11	0x0010  /*%< reserved - must be zero */
-#define	NS_KEY_SIGNATORYMASK	0x000F	/*%< key can sign RR's of same name */
-#define	NS_KEY_RESERVED_BITMASK ( NS_KEY_RESERVED2 | \
-				  NS_KEY_RESERVED4 | \
-				  NS_KEY_RESERVED5 | \
-				  NS_KEY_RESERVED8 | \
-				  NS_KEY_RESERVED9 | \
-				  NS_KEY_RESERVED10 | \
-				  NS_KEY_RESERVED11 )
-#define NS_KEY_RESERVED_BITMASK2 0xFFFF /*%< no bits defined here */
-/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
-#define	NS_ALG_MD5RSA		1	/*%< MD5 with RSA */
-#define	NS_ALG_DH               2	/*%< Diffie Hellman KEY */
-#define	NS_ALG_DSA              3	/*%< DSA KEY */
-#define	NS_ALG_DSS              NS_ALG_DSA
-#define	NS_ALG_EXPIRE_ONLY	253	/*%< No alg, no security */
-#define	NS_ALG_PRIVATE_OID	254	/*%< Key begins with OID giving alg */
-/* Protocol values  */
-/* value 0 is reserved */
-#define NS_KEY_PROT_TLS         1
-#define NS_KEY_PROT_EMAIL       2
-#define NS_KEY_PROT_DNSSEC      3
-#define NS_KEY_PROT_IPSEC       4
-#define NS_KEY_PROT_ANY		255
-
-/* Signatures */
-#define	NS_MD5RSA_MIN_BITS	 512	/*%< Size of a mod or exp in bits */
-#define	NS_MD5RSA_MAX_BITS	4096
-	/* Total of binary mod and exp */
-#define	NS_MD5RSA_MAX_BYTES	((NS_MD5RSA_MAX_BITS+7/8)*2+3)
-	/* Max length of text sig block */
-#define	NS_MD5RSA_MAX_BASE64	(((NS_MD5RSA_MAX_BYTES+2)/3)*4)
-#define NS_MD5RSA_MIN_SIZE	((NS_MD5RSA_MIN_BITS+7)/8)
-#define NS_MD5RSA_MAX_SIZE	((NS_MD5RSA_MAX_BITS+7)/8)
-
-#define NS_DSA_SIG_SIZE         41
-#define NS_DSA_MIN_SIZE         213
-#define NS_DSA_MAX_BYTES        405
-
-/* Offsets into SIG record rdata to find various values */
-#define	NS_SIG_TYPE	0	/*%< Type flags */
-#define	NS_SIG_ALG	2	/*%< Algorithm */
-#define	NS_SIG_LABELS	3	/*%< How many labels in name */
-#define	NS_SIG_OTTL	4	/*%< Original TTL */
-#define	NS_SIG_EXPIR	8	/*%< Expiration time */
-#define	NS_SIG_SIGNED	12	/*%< Signature time */
-#define	NS_SIG_FOOT	16	/*%< Key footprint */
-#define	NS_SIG_SIGNER	18	/*%< Domain name of who signed it */
-/* How RR types are represented as bit-flags in NXT records */
-#define	NS_NXT_BITS 8
-#define	NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
-#define	NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
-#define NS_NXT_MAX 127
-
-/*%
- * EDNS0 extended flags and option codes, host order.
- */
-#define NS_OPT_DNSSEC_OK	0x8000U
-#define NS_OPT_NSID             3
-
-/*%
- * Inline versions of get/put short/long.  Pointer is advanced.
- */
-#define NS_GET16(s, cp) do { \
-	register const u_char *t_cp = (const u_char *)(cp); \
-	(s) = ((u_int16_t)t_cp[0] << 8) \
-	    | ((u_int16_t)t_cp[1]) \
-	    ; \
-	(cp) += NS_INT16SZ; \
-} while (0)
-
-#define NS_GET32(l, cp) do { \
-	register const u_char *t_cp = (const u_char *)(cp); \
-	(l) = ((uint32_t)t_cp[0] << 24) \
-	    | ((uint32_t)t_cp[1] << 16) \
-	    | ((uint32_t)t_cp[2] << 8) \
-	    | ((uint32_t)t_cp[3]) \
-	    ; \
-	(cp) += NS_INT32SZ; \
-} while (0)
-
-#define NS_PUT16(s, cp) do { \
-	register u_int16_t t_s = (u_int16_t)(s); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_s >> 8; \
-	*t_cp   = t_s; \
-	(cp) += NS_INT16SZ; \
-} while (0)
-
-#define NS_PUT32(l, cp) do { \
-	register uint32_t t_l = (uint32_t)(l); \
-	register u_char *t_cp = (u_char *)(cp); \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += NS_INT32SZ; \
-} while (0)
-
-/*%
- * ANSI C identifier hiding for bind's lib/nameser.
- */
-#define	ns_msg_getflag		__ns_msg_getflag
-#define ns_get16		__ns_get16
-#define ns_get32		__ns_get32
-#define ns_put16		__ns_put16
-#define ns_put32		__ns_put32
-#define ns_initparse		__ns_initparse
-#define ns_skiprr		__ns_skiprr
-#define ns_parserr		__ns_parserr
-#define ns_parserr2		__ns_parserr2
-#define	ns_sprintrr		__ns_sprintrr
-#define	ns_sprintrrf		__ns_sprintrrf
-#define	ns_format_ttl		__ns_format_ttl
-#define	ns_parse_ttl		__ns_parse_ttl
-#if 0
-#define ns_datetosecs		__ns_datetosecs
-#endif
-#define	ns_name_ntol		__ns_name_ntol
-#define	ns_name_ntop		__ns_name_ntop
-#define	ns_name_pton		__ns_name_pton
-#define	ns_name_pton2		__ns_name_pton2
-#define	ns_name_unpack		__ns_name_unpack
-#define	ns_name_unpack2		__ns_name_unpack2
-#define	ns_name_pack		__ns_name_pack
-#define	ns_name_compress	__ns_name_compress
-#define	ns_name_uncompress	__ns_name_uncompress
-#define	ns_name_skip		__ns_name_skip
-#define	ns_name_rollback	__ns_name_rollback
-#define	ns_name_length		__ns_name_length
-#define	ns_name_eq		__ns_name_eq
-#define	ns_name_owned		__ns_name_owned
-#define	ns_name_map		__ns_name_map
-#define	ns_name_labels		__ns_name_labels
-#if 0
-#define	ns_sign			__ns_sign
-#define	ns_sign2		__ns_sign2
-#define	ns_sign_tcp		__ns_sign_tcp
-#define	ns_sign_tcp2		__ns_sign_tcp2
-#define	ns_sign_tcp_init	__ns_sign_tcp_init
-#define ns_find_tsig		__ns_find_tsig
-#define	ns_verify		__ns_verify
-#define	ns_verify_tcp		__ns_verify_tcp
-#define	ns_verify_tcp_init	__ns_verify_tcp_init
-#endif
-#define	ns_samedomain		__ns_samedomain
-#if 0
-#define	ns_subdomain		__ns_subdomain
-#endif
-#define	ns_makecanon		__ns_makecanon
-#define	ns_samename		__ns_samename
-#define	ns_newmsg_init		__ns_newmsg_init
-#define	ns_newmsg_copy		__ns_newmsg_copy
-#define	ns_newmsg_id		__ns_newmsg_id
-#define	ns_newmsg_flag		__ns_newmsg_flag
-#define	ns_newmsg_q		__ns_newmsg_q
-#define	ns_newmsg_rr		__ns_newmsg_rr
-#define	ns_newmsg_done		__ns_newmsg_done
-#define	ns_rdata_unpack		__ns_rdata_unpack
-#define	ns_rdata_equal		__ns_rdata_equal
-#define	ns_rdata_refers		__ns_rdata_refers
-
-__BEGIN_DECLS
-int		ns_msg_getflag(ns_msg, int);
-u_int		ns_get16(const u_char *);
-u_long		ns_get32(const u_char *);
-void		ns_put16(u_int, u_char *);
-void		ns_put32(u_long, u_char *);
-int		ns_initparse(const u_char *, int, ns_msg *);
-int		ns_skiprr(const u_char *, const u_char *, ns_sect, int);
-int		ns_parserr(ns_msg *, ns_sect, int, ns_rr *);
-int		ns_parserr2(ns_msg *, ns_sect, int, ns_rr2 *);
-int		ns_sprintrr(const ns_msg *, const ns_rr *,
-			    const char *, const char *, char *, size_t);
-int		ns_sprintrrf(const u_char *, size_t, const char *,
-			     ns_class, ns_type, u_long, const u_char *,
-			     size_t, const char *, const char *,
-			     char *, size_t);
-int		ns_format_ttl(u_long, char *, size_t);
-int		ns_parse_ttl(const char *, u_long *);
-#if 0
-uint32_t	ns_datetosecs(const char *cp, int *errp);
-#endif
-int		ns_name_ntol(const u_char *, u_char *, size_t);
-int		ns_name_ntop(const u_char *, char *, size_t);
-int		ns_name_pton(const char *, u_char *, size_t);
-int		ns_name_pton2(const char *, u_char *, size_t, size_t *);
-int		ns_name_unpack(const u_char *, const u_char *,
-			       const u_char *, u_char *, size_t);
-int		ns_name_unpack2(const u_char *, const u_char *,
-				const u_char *, u_char *, size_t,
-				size_t *);
-int		ns_name_pack(const u_char *, u_char *, int,
-			     const u_char **, const u_char **);
-int		ns_name_uncompress(const u_char *, const u_char *,
-				   const u_char *, char *, size_t);
-int		ns_name_compress(const char *, u_char *, size_t,
-				 const u_char **, const u_char **);
-int		ns_name_skip(const u_char **, const u_char *);
-void		ns_name_rollback(const u_char *, const u_char **,
-				 const u_char **);
-ssize_t		ns_name_length(ns_nname_ct, size_t);
-int		ns_name_eq(ns_nname_ct, size_t, ns_nname_ct, size_t);
-int		ns_name_owned(ns_namemap_ct, int, ns_namemap_ct, int);
-int		ns_name_map(ns_nname_ct, size_t, ns_namemap_t, int);
-int		ns_name_labels(ns_nname_ct, size_t);
-#if 0
-int		ns_sign(u_char *, int *, int, int, void *,
-			const u_char *, int, u_char *, int *, time_t);
-int		ns_sign2(u_char *, int *, int, int, void *,
-			 const u_char *, int, u_char *, int *, time_t,
-			 u_char **, u_char **);
-int		ns_sign_tcp(u_char *, int *, int, int,
-			    ns_tcp_tsig_state *, int);
-int		ns_sign_tcp2(u_char *, int *, int, int,
-			     ns_tcp_tsig_state *, int,
-			     u_char **, u_char **);
-int		ns_sign_tcp_init(void *, const u_char *, int,
-				 ns_tcp_tsig_state *);
-u_char		*ns_find_tsig(u_char *, u_char *);
-int		ns_verify(u_char *, int *, void *,
-			  const u_char *, int, u_char *, int *,
-			  time_t *, int);
-int		ns_verify_tcp(u_char *, int *, ns_tcp_tsig_state *, int);
-int		ns_verify_tcp_init(void *, const u_char *, int,
-				   ns_tcp_tsig_state *);
-#endif
-int		ns_samedomain(const char *, const char *);
-#if 0
-int		ns_subdomain(const char *, const char *);
-#endif
-int		ns_makecanon(const char *, char *, size_t);
-int		ns_samename(const char *, const char *);
-int		ns_newmsg_init(u_char *buffer, size_t bufsiz, ns_newmsg *);
-int		ns_newmsg_copy(ns_newmsg *, ns_msg *);
-void		ns_newmsg_id(ns_newmsg *handle, u_int16_t id);
-void		ns_newmsg_flag(ns_newmsg *handle, ns_flag flag, u_int value);
-int		ns_newmsg_q(ns_newmsg *handle, ns_nname_ct qname,
-			    ns_type qtype, ns_class qclass);
-int		ns_newmsg_rr(ns_newmsg *handle, ns_sect sect,
-			     ns_nname_ct name, ns_type type,
-			     ns_class rr_class, uint32_t ttl,
-			     u_int16_t rdlen, const u_char *rdata);
-size_t		ns_newmsg_done(ns_newmsg *handle);
-ssize_t		ns_rdata_unpack(const u_char *, const u_char *, ns_type,
-				const u_char *, size_t, u_char *, size_t);
-int		ns_rdata_equal(ns_type,
-			       const u_char *, size_t,
-			       const u_char *, size_t);
-int		ns_rdata_refers(ns_type,
-				const u_char *, size_t,
-				const u_char *);
-__END_DECLS
-
-#ifdef BIND_4_COMPAT
-#include <arpa/nameser_compat.h>
-#endif
-
-#endif /* !_ARPA_NAMESER_H_ */
-/*! \file */
diff --git a/include.new/arpa/nameser_compat.h b/include.new/arpa/nameser_compat.h
deleted file mode 100644
index 2be8233..0000000
--- a/include.new/arpa/nameser_compat.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Copyright (c) 1983, 1989
- *    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. 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.
- */
-
-/*%
- *      from nameser.h	8.1 (Berkeley) 6/2/93
- *	$Id: nameser_compat.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/include/arpa/nameser_compat.h 270838 2014-08-30 10:16:25Z ume $
- */
-
-#ifndef _ARPA_NAMESER_COMPAT_
-#define	_ARPA_NAMESER_COMPAT_
-
-#define	__BIND		19950621	/*%< (DEAD) interface version stamp. */
-
-#include <machine/endian.h>
-
-#if !defined(_BYTE_ORDER) || \
-    (_BYTE_ORDER != _BIG_ENDIAN && _BYTE_ORDER != _LITTLE_ENDIAN && \
-    _BYTE_ORDER != _PDP_ENDIAN)
-	/* you must determine what the correct bit order is for
-	 * your compiler - the next line is an intentional error
-	 * which will force your compiles to bomb until you fix
-	 * the above macros.
-	 */
-#error "Undefined or invalid _BYTE_ORDER";
-#endif
-
-/*%
- * Structure for query header.  The order of the fields is machine- and
- * compiler-dependent, depending on the byte/bit order and the layout
- * of bit fields.  We use bit fields only in int variables, as this
- * is all ANSI requires.  This requires a somewhat confusing rearrangement.
- */
-
-typedef struct {
-	unsigned	id :16;		/*%< query identification number */
-#if _BYTE_ORDER == _BIG_ENDIAN
-			/* fields in third byte */
-	unsigned	qr: 1;		/*%< response flag */
-	unsigned	opcode: 4;	/*%< purpose of message */
-	unsigned	aa: 1;		/*%< authoritative answer */
-	unsigned	tc: 1;		/*%< truncated message */
-	unsigned	rd: 1;		/*%< recursion desired */
-			/* fields in fourth byte */
-	unsigned	ra: 1;		/*%< recursion available */
-	unsigned	unused :1;	/*%< unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ad: 1;		/*%< authentic data from named */
-	unsigned	cd: 1;		/*%< checking disabled by resolver */
-	unsigned	rcode :4;	/*%< response code */
-#endif
-#if _BYTE_ORDER == _LITTLE_ENDIAN || _BYTE_ORDER == _PDP_ENDIAN
-			/* fields in third byte */
-	unsigned	rd :1;		/*%< recursion desired */
-	unsigned	tc :1;		/*%< truncated message */
-	unsigned	aa :1;		/*%< authoritative answer */
-	unsigned	opcode :4;	/*%< purpose of message */
-	unsigned	qr :1;		/*%< response flag */
-			/* fields in fourth byte */
-	unsigned	rcode :4;	/*%< response code */
-	unsigned	cd: 1;		/*%< checking disabled by resolver */
-	unsigned	ad: 1;		/*%< authentic data from named */
-	unsigned	unused :1;	/*%< unused bits (MBZ as of 4.9.3a3) */
-	unsigned	ra :1;		/*%< recursion available */
-#endif
-			/* remaining bytes */
-	unsigned	qdcount :16;	/*%< number of question entries */
-	unsigned	ancount :16;	/*%< number of answer entries */
-	unsigned	nscount :16;	/*%< number of authority entries */
-	unsigned	arcount :16;	/*%< number of resource entries */
-} HEADER;
-
-#define PACKETSZ	NS_PACKETSZ
-#define MAXDNAME	NS_MAXDNAME
-#define MAXCDNAME	NS_MAXCDNAME
-#define MAXLABEL	NS_MAXLABEL
-#define	HFIXEDSZ	NS_HFIXEDSZ
-#define QFIXEDSZ	NS_QFIXEDSZ
-#define RRFIXEDSZ	NS_RRFIXEDSZ
-#define	INT32SZ		NS_INT32SZ
-#define	INT16SZ		NS_INT16SZ
-#define	INT8SZ		NS_INT8SZ
-#define	INADDRSZ	NS_INADDRSZ
-#define	IN6ADDRSZ	NS_IN6ADDRSZ
-#define	INDIR_MASK	NS_CMPRSFLGS
-#define NAMESERVER_PORT	NS_DEFAULTPORT
-
-#define S_ZONE		ns_s_zn
-#define S_PREREQ	ns_s_pr
-#define S_UPDATE	ns_s_ud
-#define S_ADDT		ns_s_ar
-
-#define QUERY		ns_o_query
-#define IQUERY		ns_o_iquery
-#define STATUS		ns_o_status
-#define	NS_NOTIFY_OP	ns_o_notify
-#define	NS_UPDATE_OP	ns_o_update
-
-#define NOERROR		ns_r_noerror
-#define FORMERR		ns_r_formerr
-#define SERVFAIL	ns_r_servfail
-#define NXDOMAIN	ns_r_nxdomain
-#define NOTIMP		ns_r_notimpl
-#define REFUSED		ns_r_refused
-#define YXDOMAIN	ns_r_yxdomain
-#define YXRRSET		ns_r_yxrrset
-#define NXRRSET		ns_r_nxrrset
-#define NOTAUTH		ns_r_notauth
-#define NOTZONE		ns_r_notzone
-/*#define BADSIG		ns_r_badsig*/
-/*#define BADKEY		ns_r_badkey*/
-/*#define BADTIME		ns_r_badtime*/
-
-
-#define DELETE		ns_uop_delete
-#define ADD		ns_uop_add
-
-#define T_A		ns_t_a
-#define T_NS		ns_t_ns
-#define T_MD		ns_t_md
-#define T_MF		ns_t_mf
-#define T_CNAME		ns_t_cname
-#define T_SOA		ns_t_soa
-#define T_MB		ns_t_mb
-#define T_MG		ns_t_mg
-#define T_MR		ns_t_mr
-#define T_NULL		ns_t_null
-#define T_WKS		ns_t_wks
-#define T_PTR		ns_t_ptr
-#define T_HINFO		ns_t_hinfo
-#define T_MINFO		ns_t_minfo
-#define T_MX		ns_t_mx
-#define T_TXT		ns_t_txt
-#define	T_RP		ns_t_rp
-#define T_AFSDB		ns_t_afsdb
-#define T_X25		ns_t_x25
-#define T_ISDN		ns_t_isdn
-#define T_RT		ns_t_rt
-#define T_NSAP		ns_t_nsap
-#define T_NSAP_PTR	ns_t_nsap_ptr
-#define	T_SIG		ns_t_sig
-#define	T_KEY		ns_t_key
-#define	T_PX		ns_t_px
-#define	T_GPOS		ns_t_gpos
-#define	T_AAAA		ns_t_aaaa
-#define	T_LOC		ns_t_loc
-#define	T_NXT		ns_t_nxt
-#define	T_EID		ns_t_eid
-#define	T_NIMLOC	ns_t_nimloc
-#define	T_SRV		ns_t_srv
-#define T_ATMA		ns_t_atma
-#define T_NAPTR		ns_t_naptr
-#define T_A6		ns_t_a6
-#define T_OPT		ns_t_opt
-#define	T_TSIG		ns_t_tsig
-#define	T_IXFR		ns_t_ixfr
-#define T_AXFR		ns_t_axfr
-#define T_MAILB		ns_t_mailb
-#define T_MAILA		ns_t_maila
-#define T_ANY		ns_t_any
-
-#define C_IN		ns_c_in
-#define C_CHAOS		ns_c_chaos
-#define C_HS		ns_c_hs
-/* BIND_UPDATE */
-#define C_NONE		ns_c_none
-#define C_ANY		ns_c_any
-
-#define	GETSHORT		NS_GET16
-#define	GETLONG			NS_GET32
-#define	PUTSHORT		NS_PUT16
-#define	PUTLONG			NS_PUT32
-
-#endif /* _ARPA_NAMESER_COMPAT_ */
-/*! \file */
diff --git a/include.new/arpa/telnet.h b/include.new/arpa/telnet.h
deleted file mode 100644
index bf01736..0000000
--- a/include.new/arpa/telnet.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- *
- *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
- * $FreeBSD: releng/10.2/contrib/telnet/arpa/telnet.h 275508 2014-12-05 12:23:29Z ngie $
- */
-
-#ifndef _ARPA_TELNET_H_
-#define	_ARPA_TELNET_H_
-
-/*
- * Definitions for the TELNET protocol.
- */
-#define	IAC	255		/* interpret as command: */
-#define	DONT	254		/* you are not to use option */
-#define	DO	253		/* please, you use option */
-#define	WONT	252		/* I won't use option */
-#define	WILL	251		/* I will use option */
-#define	SB	250		/* interpret as subnegotiation */
-#define	GA	249		/* you may reverse the line */
-#define	EL	248		/* erase the current line */
-#define	EC	247		/* erase the current character */
-#define	AYT	246		/* are you there */
-#define	AO	245		/* abort output--but let prog finish */
-#define	IP	244		/* interrupt process--permanently */
-#define	BREAK	243		/* break */
-#define	DM	242		/* data mark--for connect. cleaning */
-#define	NOP	241		/* nop */
-#define	SE	240		/* end sub negotiation */
-#define EOR     239             /* end of record (transparent mode) */
-#define	ABORT	238		/* Abort process */
-#define	SUSP	237		/* Suspend process */
-#define	xEOF	236		/* End of file: EOF is already used... */
-
-#define SYNCH	242		/* for telfunc calls */
-
-#ifdef TELCMDS
-const char *telcmds[] = {
-	"EOF", "SUSP", "ABORT", "EOR",
-	"SE", "NOP", "DMARK", "BRK", "IP", "AO", "AYT", "EC",
-	"EL", "GA", "SB", "WILL", "WONT", "DO", "DONT", "IAC",
-	0
-};
-#else
-extern char *telcmds[];
-#endif
-
-#define	TELCMD_FIRST	xEOF
-#define	TELCMD_LAST	IAC
-#define	TELCMD_OK(x)	((unsigned int)(x) <= TELCMD_LAST && \
-			 (unsigned int)(x) >= TELCMD_FIRST)
-#define	TELCMD(x)	telcmds[(x)-TELCMD_FIRST]
-
-/* telnet options */
-#define TELOPT_BINARY	0	/* 8-bit data path */
-#define TELOPT_ECHO	1	/* echo */
-#define	TELOPT_RCP	2	/* prepare to reconnect */
-#define	TELOPT_SGA	3	/* suppress go ahead */
-#define	TELOPT_NAMS	4	/* approximate message size */
-#define	TELOPT_STATUS	5	/* give status */
-#define	TELOPT_TM	6	/* timing mark */
-#define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
-#define TELOPT_NAOL 	8	/* negotiate about output line width */
-#define TELOPT_NAOP 	9	/* negotiate about output page size */
-#define TELOPT_NAOCRD	10	/* negotiate about CR disposition */
-#define TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
-#define TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
-#define TELOPT_NAOFFD	13	/* negotiate about formfeed disposition */
-#define TELOPT_NAOVTS	14	/* negotiate about vertical tab stops */
-#define TELOPT_NAOVTD	15	/* negotiate about vertical tab disposition */
-#define TELOPT_NAOLFD	16	/* negotiate about output LF disposition */
-#define TELOPT_XASCII	17	/* extended ascic character set */
-#define	TELOPT_LOGOUT	18	/* force logout */
-#define	TELOPT_BM	19	/* byte macro */
-#define	TELOPT_DET	20	/* data entry terminal */
-#define	TELOPT_SUPDUP	21	/* supdup protocol */
-#define	TELOPT_SUPDUPOUTPUT 22	/* supdup output */
-#define	TELOPT_SNDLOC	23	/* send location */
-#define	TELOPT_TTYPE	24	/* terminal type */
-#define	TELOPT_EOR	25	/* end or record */
-#define	TELOPT_TUID	26	/* TACACS user identification */
-#define	TELOPT_OUTMRK	27	/* output marking */
-#define	TELOPT_TTYLOC	28	/* terminal location number */
-#define	TELOPT_3270REGIME 29	/* 3270 regime */
-#define	TELOPT_X3PAD	30	/* X.3 PAD */
-#define	TELOPT_NAWS	31	/* window size */
-#define	TELOPT_TSPEED	32	/* terminal speed */
-#define	TELOPT_LFLOW	33	/* remote flow control */
-#define TELOPT_LINEMODE	34	/* Linemode option */
-#define TELOPT_XDISPLOC	35	/* X Display Location */
-#define TELOPT_OLD_ENVIRON 36	/* Old - Environment variables */
-#define	TELOPT_AUTHENTICATION 37/* Authenticate */
-#define	TELOPT_ENCRYPT	38	/* Encryption option */
-#define TELOPT_NEW_ENVIRON 39	/* New - Environment variables */
-#define	TELOPT_TN3270E	40	/* RFC2355 - TN3270 Enhancements */
-#define	TELOPT_CHARSET	42	/* RFC2066 - Charset */
-#define	TELOPT_COMPORT	44	/* RFC2217 - Com Port Control */
-#define	TELOPT_KERMIT	47	/* RFC2840 - Kermit */
-#define	TELOPT_EXOPL	255	/* extended-options-list */
-
-#define	COMPORT_SET_BAUDRATE	1	/* RFC2217 - Com Port Set Baud Rate */
-
-#define	NTELOPTS	(1+TELOPT_KERMIT)
-#ifdef TELOPTS
-const char *telopts[NTELOPTS+1] = {
-	"BINARY", "ECHO", "RCP", "SUPPRESS GO AHEAD", "NAME",
-	"STATUS", "TIMING MARK", "RCTE", "NAOL", "NAOP",
-	"NAOCRD", "NAOHTS", "NAOHTD", "NAOFFD", "NAOVTS",
-	"NAOVTD", "NAOLFD", "EXTEND ASCII", "LOGOUT", "BYTE MACRO",
-	"DATA ENTRY TERMINAL", "SUPDUP", "SUPDUP OUTPUT",
-	"SEND LOCATION", "TERMINAL TYPE", "END OF RECORD",
-	"TACACS UID", "OUTPUT MARKING", "TTYLOC",
-	"3270 REGIME", "X.3 PAD", "NAWS", "TSPEED", "LFLOW",
-	"LINEMODE", "XDISPLOC", "OLD-ENVIRON", "AUTHENTICATION",
-	"ENCRYPT", "NEW-ENVIRON", "TN3270E", "XAUTH", "CHARSET",
-	"RSP", "COM-PORT", "SLE", "STARTTLS", "KERMIT",
-	0
-};
-#define	TELOPT_FIRST	TELOPT_BINARY
-#define	TELOPT_LAST	TELOPT_KERMIT
-#define	TELOPT_OK(x)	((unsigned int)(x) <= TELOPT_LAST)
-#define	TELOPT(x)	telopts[(x)-TELOPT_FIRST]
-#endif
-
-/* sub-option qualifiers */
-#define	TELQUAL_IS	0	/* option is... */
-#define	TELQUAL_SEND	1	/* send option */
-#define	TELQUAL_INFO	2	/* ENVIRON: informational version of IS */
-#define	TELQUAL_REPLY	2	/* AUTHENTICATION: client version of IS */
-#define	TELQUAL_NAME	3	/* AUTHENTICATION: client version of IS */
-
-#define	LFLOW_OFF		0	/* Disable remote flow control */
-#define	LFLOW_ON		1	/* Enable remote flow control */
-#define	LFLOW_RESTART_ANY	2	/* Restart output on any char */
-#define	LFLOW_RESTART_XON	3	/* Restart output only on XON */
-
-/*
- * LINEMODE suboptions
- */
-
-#define	LM_MODE		1
-#define	LM_FORWARDMASK	2
-#define	LM_SLC		3
-
-#define	MODE_EDIT	0x01
-#define	MODE_TRAPSIG	0x02
-#define	MODE_ACK	0x04
-#define MODE_SOFT_TAB	0x08
-#define MODE_LIT_ECHO	0x10
-
-#define	MODE_MASK	0x1f
-
-/* Not part of protocol, but needed to simplify things... */
-#define MODE_FLOW		0x0100
-#define MODE_ECHO		0x0200
-#define MODE_INBIN		0x0400
-#define MODE_OUTBIN		0x0800
-#define MODE_FORCE		0x1000
-
-#define	SLC_SYNCH	1
-#define	SLC_BRK		2
-#define	SLC_IP		3
-#define	SLC_AO		4
-#define	SLC_AYT		5
-#define	SLC_EOR		6
-#define	SLC_ABORT	7
-#define	SLC_EOF		8
-#define	SLC_SUSP	9
-#define	SLC_EC		10
-#define	SLC_EL		11
-#define	SLC_EW		12
-#define	SLC_RP		13
-#define	SLC_LNEXT	14
-#define	SLC_XON		15
-#define	SLC_XOFF	16
-#define	SLC_FORW1	17
-#define	SLC_FORW2	18
-#define SLC_MCL         19
-#define SLC_MCR         20
-#define SLC_MCWL        21
-#define SLC_MCWR        22
-#define SLC_MCBOL       23
-#define SLC_MCEOL       24
-#define SLC_INSRT       25
-#define SLC_OVER        26
-#define SLC_ECR         27
-#define SLC_EWR         28
-#define SLC_EBOL        29
-#define SLC_EEOL        30
-
-#define	NSLC		30
-
-/*
- * For backwards compatibility, we define SLC_NAMES to be the
- * list of names if SLC_NAMES is not defined.
- */
-#define	SLC_NAMELIST	"0", "SYNCH", "BRK", "IP", "AO", "AYT", "EOR",	\
-			"ABORT", "EOF", "SUSP", "EC", "EL", "EW", "RP",	\
-			"LNEXT", "XON", "XOFF", "FORW1", "FORW2",	\
-			"MCL", "MCR", "MCWL", "MCWR", "MCBOL",		\
-			"MCEOL", "INSRT", "OVER", "ECR", "EWR",		\
-			"EBOL", "EEOL",					\
-			0
-
-#ifdef	SLC_NAMES
-const char *slc_names[] = {
-	SLC_NAMELIST
-};
-#else
-extern char *slc_names[];
-#define	SLC_NAMES SLC_NAMELIST
-#endif
-
-#define	SLC_NAME_OK(x)	((unsigned int)(x) <= NSLC)
-#define SLC_NAME(x)	slc_names[x]
-
-#define	SLC_NOSUPPORT	0
-#define	SLC_CANTCHANGE	1
-#define	SLC_VARIABLE	2
-#define	SLC_DEFAULT	3
-#define	SLC_LEVELBITS	0x03
-
-#define	SLC_FUNC	0
-#define	SLC_FLAGS	1
-#define	SLC_VALUE	2
-
-#define	SLC_ACK		0x80
-#define	SLC_FLUSHIN	0x40
-#define	SLC_FLUSHOUT	0x20
-
-#define	OLD_ENV_VAR	1
-#define	OLD_ENV_VALUE	0
-#define	NEW_ENV_VAR	0
-#define	NEW_ENV_VALUE	1
-#define	ENV_ESC		2
-#define ENV_USERVAR	3
-
-/*
- * AUTHENTICATION suboptions
- */
-
-/*
- * Who is authenticating who ...
- */
-#define	AUTH_WHO_CLIENT		0	/* Client authenticating server */
-#define	AUTH_WHO_SERVER		1	/* Server authenticating client */
-#define	AUTH_WHO_MASK		1
-
-/*
- * amount of authentication done
- */
-#define	AUTH_HOW_ONE_WAY	0
-#define	AUTH_HOW_MUTUAL		2
-#define	AUTH_HOW_MASK		2
-
-#define	AUTHTYPE_NULL		0
-#define	AUTHTYPE_KERBEROS_V4	1
-#define	AUTHTYPE_KERBEROS_V5	2
-#define	AUTHTYPE_SPX		3
-#define	AUTHTYPE_MINK		4
-#define	AUTHTYPE_SRA		6
-#define	AUTHTYPE_CNT		7
-
-#define	AUTHTYPE_TEST		99
-
-#ifdef	AUTH_NAMES
-const char *authtype_names[] = {
-	"NULL", "KERBEROS_V4", "KERBEROS_V5", "SPX", "MINK", NULL, "SRA",
-	0
-};
-#else
-extern char *authtype_names[];
-#endif
-
-#define	AUTHTYPE_NAME_OK(x)	((unsigned int)(x) < AUTHTYPE_CNT)
-#define	AUTHTYPE_NAME(x)	authtype_names[x]
-
-/*
- * ENCRYPTion suboptions
- */
-#define	ENCRYPT_IS		0	/* I pick encryption type ... */
-#define	ENCRYPT_SUPPORT		1	/* I support encryption types ... */
-#define	ENCRYPT_REPLY		2	/* Initial setup response */
-#define	ENCRYPT_START		3	/* Am starting to send encrypted */
-#define	ENCRYPT_END		4	/* Am ending encrypted */
-#define	ENCRYPT_REQSTART	5	/* Request you start encrypting */
-#define	ENCRYPT_REQEND		6	/* Request you end encrypting */
-#define	ENCRYPT_ENC_KEYID	7
-#define	ENCRYPT_DEC_KEYID	8
-#define	ENCRYPT_CNT		9
-
-#define	ENCTYPE_ANY		0
-#define	ENCTYPE_DES_CFB64	1
-#define	ENCTYPE_DES_OFB64	2
-#define	ENCTYPE_CNT		3
-
-#ifdef	ENCRYPT_NAMES
-const char *encrypt_names[] = {
-	"IS", "SUPPORT", "REPLY", "START", "END",
-	"REQUEST-START", "REQUEST-END", "ENC-KEYID", "DEC-KEYID",
-	0
-};
-const char *enctype_names[] = {
-	"ANY", "DES_CFB64",  "DES_OFB64",
-	0
-};
-#else
-extern char *encrypt_names[];
-extern char *enctype_names[];
-#endif
-
-
-#define	ENCRYPT_NAME_OK(x)	((unsigned int)(x) < ENCRYPT_CNT)
-#define	ENCRYPT_NAME(x)		encrypt_names[x]
-
-#define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
-#define	ENCTYPE_NAME(x)		enctype_names[x]
-
-#endif /* !_TELNET_H_ */
diff --git a/include.new/arpa/tftp.h b/include.new/arpa/tftp.h
deleted file mode 100644
index 1c18e6c..0000000
--- a/include.new/arpa/tftp.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1983, 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. 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.
- *
- *	@(#)tftp.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/arpa/tftp.h 250887 2013-05-21 21:20:10Z ed $
- */
-
-#ifndef _ARPA_TFTP_H_
-#define	_ARPA_TFTP_H_
-
-#include <sys/cdefs.h>
-
-/*
- * Trivial File Transfer Protocol (IEN-133)
- */
-#define	SEGSIZE		512		/* data segment size */
-
-/*
- * Packet types.
- */
-#define	RRQ	01			/* read request */
-#define	WRQ	02			/* write request */
-#define	DATA	03			/* data packet */
-#define	ACK	04			/* acknowledgement */
-#define	ERROR	05			/* error code */
-#define	OACK	06			/* option acknowledgement */
-
-struct tftphdr {
-	unsigned short	th_opcode;		/* packet type */
-	union {
-		unsigned short	tu_block;	/* block # */
-		unsigned short	tu_code;	/* error code */
-		char	tu_stuff[1];	/* request packet stuff */
-	} __packed th_u;
-	char	th_data[1];		/* data or error string */
-} __packed;
-
-#define	th_block	th_u.tu_block
-#define	th_code		th_u.tu_code
-#define	th_stuff	th_u.tu_stuff
-#define	th_msg		th_data
-
-/*
- * Error codes.
- */
-#define	EUNDEF		0		/* not defined */
-#define	ENOTFOUND	1		/* file not found */
-#define	EACCESS		2		/* access violation */
-#define	ENOSPACE	3		/* disk full or allocation exceeded */
-#define	EBADOP		4		/* illegal TFTP operation */
-#define	EBADID		5		/* unknown transfer ID */
-#define	EEXISTS		6		/* file already exists */
-#define	ENOUSER		7		/* no such user */
-#define	EOPTNEG		8		/* option negotiation failed */
-
-#endif /* !_TFTP_H_ */
diff --git a/include.new/asn1-common.h b/include.new/asn1-common.h
deleted file mode 100644
index 4083ebc..0000000
--- a/include.new/asn1-common.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* $Id$ */
-
-#include <stddef.h>
-#include <time.h>
-#include <krb5-types.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-    size_t length;
-    void *data;
-    int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-    size_t length;
-    void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-typedef char *heim_utf8_string;
-typedef struct heim_octet_string heim_printable_string;
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-    size_t length;
-    uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-    size_t length;
-    uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-    size_t length;
-    unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-    size_t length;
-    void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-
-#endif
diff --git a/include.new/asn1_err.h b/include.new/asn1_err.h
deleted file mode 100644
index 8bd812b..0000000
--- a/include.new/asn1_err.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/asn1_err.et */
-/* $Id: asn1_err.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __asn1_err_h__
-#define __asn1_err_h__
-
-struct et_list;
-
-void initialize_asn1_error_table_r(struct et_list **);
-
-void initialize_asn1_error_table(void);
-#define init_asn1_err_tbl initialize_asn1_error_table
-
-typedef enum asn1_error_number{
-	ASN1_BAD_TIMEFORMAT = 1859794432,
-	ASN1_MISSING_FIELD = 1859794433,
-	ASN1_MISPLACED_FIELD = 1859794434,
-	ASN1_TYPE_MISMATCH = 1859794435,
-	ASN1_OVERFLOW = 1859794436,
-	ASN1_OVERRUN = 1859794437,
-	ASN1_BAD_ID = 1859794438,
-	ASN1_BAD_LENGTH = 1859794439,
-	ASN1_BAD_FORMAT = 1859794440,
-	ASN1_PARSE_ERROR = 1859794441,
-	ASN1_EXTRA_DATA = 1859794442,
-	ASN1_BAD_CHARACTER = 1859794443,
-	ASN1_MIN_CONSTRAINT = 1859794444,
-	ASN1_MAX_CONSTRAINT = 1859794445,
-	ASN1_EXACT_CONSTRAINT = 1859794446,
-	ASN1_INDEF_OVERRUN = 1859794447,
-	ASN1_INDEF_UNDERRUN = 1859794448,
-	ASN1_GOT_BER = 1859794449,
-	ASN1_INDEF_EXTRA_DATA = 1859794450
-} asn1_error_number;
-
-#define ERROR_TABLE_BASE_asn1 1859794432
-
-#define COM_ERR_BINDDOMAIN_asn1 "heim_com_err1859794432"
-
-#endif /* __asn1_err_h__ */
diff --git a/include.new/assert.h b/include.new/assert.h
deleted file mode 100644
index d1d3d7a..0000000
--- a/include.new/assert.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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. 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.
- *
- *	@(#)assert.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/include/assert.h 228955 2011-12-29 14:41:17Z ed $
- */
-
-#include <sys/cdefs.h>
-
-/*
- * Unlike other ANSI header files, <assert.h> may usefully be included
- * multiple times, with and without NDEBUG defined.
- */
-
-#undef assert
-#undef _assert
-
-#ifdef NDEBUG
-#define	assert(e)	((void)0)
-#define	_assert(e)	((void)0)
-#else
-#define	_assert(e)	assert(e)
-
-#define	assert(e)	((e) ? (void)0 : __assert(__func__, __FILE__, \
-			    __LINE__, #e))
-#endif /* NDEBUG */
-
-#ifndef _ASSERT_H_
-#define _ASSERT_H_
-
-/*
- * Static assertions.  In principle we could define static_assert for
- * C++ older than C++11, but this breaks if _Static_assert is
- * implemented as a macro.
- *
- * C++ template parameters may contain commas, even if not enclosed in
- * parentheses, causing the _Static_assert macro to be invoked with more
- * than two parameters.
- */
-#if __ISO_C_VISIBLE >= 2011 && !defined(__cplusplus)
-#define	static_assert	_Static_assert
-#endif
-
-__BEGIN_DECLS
-void __assert(const char *, const char *, int, const char *) __dead2;
-__END_DECLS
-
-#endif /* !_ASSERT_H_ */
diff --git a/include.new/base64.h b/include.new/base64.h
deleted file mode 100644
index dfae4c1..0000000
--- a/include.new/base64.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef _BASE64_H_
-#define _BASE64_H_
-
-#ifndef ROKEN_LIB_FUNCTION
-#ifdef _WIN32
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL __cdecl
-#else
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#endif
-#endif
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-base64_encode(const void *, int, char **);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-base64_decode(const char *, void *);
-
-#endif
diff --git a/include.new/bitstring.h b/include.new/bitstring.h
deleted file mode 100644
index 5c99a98..0000000
--- a/include.new/bitstring.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2003 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/include/bitstring.h 116306 2003-06-13 19:40:13Z phk $
- */
-
-#ifndef _BITSTRING_H_
-#define	_BITSTRING_H_
-
-#include <sys/bitstring.h>
-
-#endif /* _BITSTRING_H_ */
-
diff --git a/include.new/bluetooth.h b/include.new/bluetooth.h
deleted file mode 100644
index 1db5d22..0000000
--- a/include.new/bluetooth.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * bluetooth.h
- */
-
-/*-
- * Copyright (c) 2001-2009 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: bluetooth.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/lib/libbluetooth/bluetooth.h 213042 2010-09-22 23:41:02Z emax $
- */
-
-#ifndef _BLUETOOTH_H_
-#define _BLUETOOTH_H_
-
-#include <sys/types.h>
-#include <sys/bitstring.h>
-#include <sys/endian.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <errno.h>
-#include <netdb.h>
-#include <netgraph/ng_message.h>
-#include <netgraph/bluetooth/include/ng_hci.h>
-#include <netgraph/bluetooth/include/ng_l2cap.h>
-#include <netgraph/bluetooth/include/ng_btsocket.h>
-#include <time.h>
-
-__BEGIN_DECLS
-
-/*
- * Linux BlueZ compatibility
- */
-
-#define	bacmp(ba1, ba2)	memcmp((ba1), (ba2), sizeof(bdaddr_t))
-#define	bacpy(dst, src)	memcpy((dst), (src), sizeof(bdaddr_t))
-#define ba2str(ba, str)	bt_ntoa((ba), (str))
-#define str2ba(str, ba)	(bt_aton((str), (ba)) == 1? 0 : -1)
-#define htobs(d)	htole16(d)
-#define htobl(d)	htole32(d)
-#define btohs(d)	le16toh(d)
-#define btohl(d)	le32toh(d)
-
-/*
- * Interface to the outside world
- */
-
-struct hostent *  bt_gethostbyname    (char const *name);
-struct hostent *  bt_gethostbyaddr    (char const *addr, int len, int type);
-struct hostent *  bt_gethostent       (void);
-void              bt_sethostent       (int stayopen);
-void              bt_endhostent       (void);
-
-struct protoent * bt_getprotobyname   (char const *name);
-struct protoent * bt_getprotobynumber (int proto);
-struct protoent * bt_getprotoent      (void);
-void              bt_setprotoent      (int stayopen);
-void              bt_endprotoent      (void);
-
-char const *      bt_ntoa             (bdaddr_t const *ba, char *str);
-int               bt_aton             (char const *str, bdaddr_t *ba);
-
-/* bt_devXXXX() functions (inspired by NetBSD) */
-int               bt_devaddr          (char const *devname, bdaddr_t *addr);
-int               bt_devname          (char *devname, bdaddr_t const *addr);
-
-/* 
- * Bluetooth HCI functions
- */
-
-#define	HCI_DEVMAX			32		/* arbitrary */
-#define	HCI_DEVNAME_SIZE		NG_NODESIZ
-#define	HCI_DEVFEATURES_SIZE		NG_HCI_FEATURES_SIZE
-
-struct bt_devinfo
-{
-	char		devname[HCI_DEVNAME_SIZE];
-
-	uint32_t	state;		/* device/implementation specific */
-
-	bdaddr_t	bdaddr;
-	uint16_t	_reserved0;
-
-	uint8_t		features[HCI_DEVFEATURES_SIZE];
-
-	/* buffer info */
-	uint16_t	_reserved1;
-	uint16_t	cmd_free;
-	uint16_t	sco_size;
-	uint16_t	sco_pkts;
-	uint16_t	sco_free;
-	uint16_t	acl_size;
-	uint16_t	acl_pkts;
-	uint16_t	acl_free;
-
-	/* stats */
-	uint32_t	cmd_sent;
-	uint32_t	evnt_recv;
-	uint32_t	acl_recv;
-	uint32_t	acl_sent;
-	uint32_t	sco_recv;
-	uint32_t	sco_sent;
-	uint32_t	bytes_recv;
-	uint32_t	bytes_sent;
-
-	/* misc/specific */
-	uint16_t	link_policy_info;
-	uint16_t	packet_type_info;
-	uint16_t	role_switch_info;
-	uint16_t	debug;
-
-	uint8_t		_padding[20];	/* leave space for future additions */
-};
-
-struct bt_devreq
-{
-	uint16_t	opcode;
-	uint8_t		event;
-	void		*cparam;
-	size_t		clen;
-	void		*rparam;
-	size_t		rlen;
-};
-
-struct bt_devfilter {
-	bitstr_t	bit_decl(packet_mask, 8);
-	bitstr_t	bit_decl(event_mask, 256);
-};
-
-struct bt_devinquiry {
-	bdaddr_t        bdaddr;
-	uint8_t         pscan_rep_mode;
-	uint8_t         pscan_period_mode;
-	uint8_t         dev_class[3];
-	uint16_t        clock_offset;
-	int8_t          rssi;
-	uint8_t         data[240];
-};
-
-typedef int	(bt_devenum_cb_t)(int, struct bt_devinfo const *, void *);
-
-int		bt_devopen (char const *devname);
-int		bt_devclose(int s);
-int		bt_devsend (int s, uint16_t opcode, void *param, size_t plen);
-ssize_t		bt_devrecv (int s, void *buf, size_t size, time_t to);
-int		bt_devreq  (int s, struct bt_devreq *r, time_t to);
-int		bt_devfilter(int s, struct bt_devfilter const *newp,
-			     struct bt_devfilter *oldp);
-void		bt_devfilter_pkt_set(struct bt_devfilter *filter, uint8_t type);
-void		bt_devfilter_pkt_clr(struct bt_devfilter *filter, uint8_t type);
-int		bt_devfilter_pkt_tst(struct bt_devfilter const *filter, uint8_t type);
-void		bt_devfilter_evt_set(struct bt_devfilter *filter, uint8_t event);
-void		bt_devfilter_evt_clr(struct bt_devfilter *filter, uint8_t event);
-int		bt_devfilter_evt_tst(struct bt_devfilter const *filter, uint8_t event);
-int		bt_devinquiry(char const *devname, time_t length, int num_rsp,
-			      struct bt_devinquiry **ii);
-int		bt_devinfo (struct bt_devinfo *di);
-int		bt_devenum (bt_devenum_cb_t *cb, void *arg);
-
-/*
- * bdaddr utility functions (from NetBSD)
- */
-
-static __inline int
-bdaddr_same(const bdaddr_t *a, const bdaddr_t *b)
-{
-	return (a->b[0] == b->b[0] && a->b[1] == b->b[1] &&
-		a->b[2] == b->b[2] && a->b[3] == b->b[3] &&
-		a->b[4] == b->b[4] && a->b[5] == b->b[5]);
-}
-
-static __inline int
-bdaddr_any(const bdaddr_t *a)
-{
-	return (a->b[0] == 0 && a->b[1] == 0 && a->b[2] == 0 &&
-		a->b[3] == 0 && a->b[4] == 0 && a->b[5] == 0);
-}
-
-static __inline void
-bdaddr_copy(bdaddr_t *d, const bdaddr_t *s)
-{
-	d->b[0] = s->b[0];
-	d->b[1] = s->b[1];
-	d->b[2] = s->b[2];
-	d->b[3] = s->b[3];
-	d->b[4] = s->b[4];
-	d->b[5] = s->b[5];
-}
-
-__END_DECLS
-
-#endif /* ndef _BLUETOOTH_H_ */
-
diff --git a/include.new/bsdxml.h b/include.new/bsdxml.h
deleted file mode 100644
index 2f56665..0000000
--- a/include.new/bsdxml.h
+++ /dev/null
@@ -1,1039 +0,0 @@
-/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-   See the file src/contrib/expat/COPYING for copying permission.
-*/
-
-#ifndef Expat_INCLUDED
-#define Expat_INCLUDED 1
-
-
-#include <stdlib.h>
-#include "bsdxml_external.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct XML_ParserStruct;
-typedef struct XML_ParserStruct *XML_Parser;
-
-/* Should this be defined using stdbool.h when C99 is available? */
-typedef unsigned char XML_Bool;
-#define XML_TRUE   ((XML_Bool) 1)
-#define XML_FALSE  ((XML_Bool) 0)
-
-/* The XML_Status enum gives the possible return values for several
-   API functions.  The preprocessor #defines are included so this
-   stanza can be added to code that still needs to support older
-   versions of Expat 1.95.x:
-
-   #ifndef XML_STATUS_OK
-   #define XML_STATUS_OK    1
-   #define XML_STATUS_ERROR 0
-   #endif
-
-   Otherwise, the #define hackery is quite ugly and would have been
-   dropped.
-*/
-enum XML_Status {
-  XML_STATUS_ERROR = 0,
-#define XML_STATUS_ERROR XML_STATUS_ERROR
-  XML_STATUS_OK = 1,
-#define XML_STATUS_OK XML_STATUS_OK
-  XML_STATUS_SUSPENDED = 2
-#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
-};
-
-enum XML_Error {
-  XML_ERROR_NONE,
-  XML_ERROR_NO_MEMORY,
-  XML_ERROR_SYNTAX,
-  XML_ERROR_NO_ELEMENTS,
-  XML_ERROR_INVALID_TOKEN,
-  XML_ERROR_UNCLOSED_TOKEN,
-  XML_ERROR_PARTIAL_CHAR,
-  XML_ERROR_TAG_MISMATCH,
-  XML_ERROR_DUPLICATE_ATTRIBUTE,
-  XML_ERROR_JUNK_AFTER_DOC_ELEMENT,
-  XML_ERROR_PARAM_ENTITY_REF,
-  XML_ERROR_UNDEFINED_ENTITY,
-  XML_ERROR_RECURSIVE_ENTITY_REF,
-  XML_ERROR_ASYNC_ENTITY,
-  XML_ERROR_BAD_CHAR_REF,
-  XML_ERROR_BINARY_ENTITY_REF,
-  XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF,
-  XML_ERROR_MISPLACED_XML_PI,
-  XML_ERROR_UNKNOWN_ENCODING,
-  XML_ERROR_INCORRECT_ENCODING,
-  XML_ERROR_UNCLOSED_CDATA_SECTION,
-  XML_ERROR_EXTERNAL_ENTITY_HANDLING,
-  XML_ERROR_NOT_STANDALONE,
-  XML_ERROR_UNEXPECTED_STATE,
-  XML_ERROR_ENTITY_DECLARED_IN_PE,
-  XML_ERROR_FEATURE_REQUIRES_XML_DTD,
-  XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING,
-  /* Added in 1.95.7. */
-  XML_ERROR_UNBOUND_PREFIX,
-  /* Added in 1.95.8. */
-  XML_ERROR_UNDECLARING_PREFIX,
-  XML_ERROR_INCOMPLETE_PE,
-  XML_ERROR_XML_DECL,
-  XML_ERROR_TEXT_DECL,
-  XML_ERROR_PUBLICID,
-  XML_ERROR_SUSPENDED,
-  XML_ERROR_NOT_SUSPENDED,
-  XML_ERROR_ABORTED,
-  XML_ERROR_FINISHED,
-  XML_ERROR_SUSPEND_PE,
-  /* Added in 2.0. */
-  XML_ERROR_RESERVED_PREFIX_XML,
-  XML_ERROR_RESERVED_PREFIX_XMLNS,
-  XML_ERROR_RESERVED_NAMESPACE_URI
-};
-
-enum XML_Content_Type {
-  XML_CTYPE_EMPTY = 1,
-  XML_CTYPE_ANY,
-  XML_CTYPE_MIXED,
-  XML_CTYPE_NAME,
-  XML_CTYPE_CHOICE,
-  XML_CTYPE_SEQ
-};
-
-enum XML_Content_Quant {
-  XML_CQUANT_NONE,
-  XML_CQUANT_OPT,
-  XML_CQUANT_REP,
-  XML_CQUANT_PLUS
-};
-
-/* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be
-   XML_CQUANT_NONE, and the other fields will be zero or NULL.
-   If type == XML_CTYPE_MIXED, then quant will be NONE or REP and
-   numchildren will contain number of elements that may be mixed in
-   and children point to an array of XML_Content cells that will be
-   all of XML_CTYPE_NAME type with no quantification.
-
-   If type == XML_CTYPE_NAME, then the name points to the name, and
-   the numchildren field will be zero and children will be NULL. The
-   quant fields indicates any quantifiers placed on the name.
-
-   CHOICE and SEQ will have name NULL, the number of children in
-   numchildren and children will point, recursively, to an array
-   of XML_Content cells.
-
-   The EMPTY, ANY, and MIXED types will only occur at top level.
-*/
-
-typedef struct XML_cp XML_Content;
-
-struct XML_cp {
-  enum XML_Content_Type         type;
-  enum XML_Content_Quant        quant;
-  XML_Char *                    name;
-  unsigned int                  numchildren;
-  XML_Content *                 children;
-};
-
-
-/* This is called for an element declaration. See above for
-   description of the model argument. It's the caller's responsibility
-   to free model when finished with it.
-*/
-typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData,
-                                                const XML_Char *name,
-                                                XML_Content *model);
-
-XMLPARSEAPI(void)
-XML_SetElementDeclHandler(XML_Parser parser,
-                          XML_ElementDeclHandler eldecl);
-
-/* The Attlist declaration handler is called for *each* attribute. So
-   a single Attlist declaration with multiple attributes declared will
-   generate multiple calls to this handler. The "default" parameter
-   may be NULL in the case of the "#IMPLIED" or "#REQUIRED"
-   keyword. The "isrequired" parameter will be true and the default
-   value will be NULL in the case of "#REQUIRED". If "isrequired" is
-   true and default is non-NULL, then this is a "#FIXED" default.
-*/
-typedef void (XMLCALL *XML_AttlistDeclHandler) (
-                                    void            *userData,
-                                    const XML_Char  *elname,
-                                    const XML_Char  *attname,
-                                    const XML_Char  *att_type,
-                                    const XML_Char  *dflt,
-                                    int              isrequired);
-
-XMLPARSEAPI(void)
-XML_SetAttlistDeclHandler(XML_Parser parser,
-                          XML_AttlistDeclHandler attdecl);
-
-/* The XML declaration handler is called for *both* XML declarations
-   and text declarations. The way to distinguish is that the version
-   parameter will be NULL for text declarations. The encoding
-   parameter may be NULL for XML declarations. The standalone
-   parameter will be -1, 0, or 1 indicating respectively that there
-   was no standalone parameter in the declaration, that it was given
-   as no, or that it was given as yes.
-*/
-typedef void (XMLCALL *XML_XmlDeclHandler) (void           *userData,
-                                            const XML_Char *version,
-                                            const XML_Char *encoding,
-                                            int             standalone);
-
-XMLPARSEAPI(void)
-XML_SetXmlDeclHandler(XML_Parser parser,
-                      XML_XmlDeclHandler xmldecl);
-
-
-typedef struct {
-  void *(*malloc_fcn)(size_t size);
-  void *(*realloc_fcn)(void *ptr, size_t size);
-  void (*free_fcn)(void *ptr);
-} XML_Memory_Handling_Suite;
-
-/* Constructs a new parser; encoding is the encoding specified by the
-   external protocol or NULL if there is none specified.
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ParserCreate(const XML_Char *encoding);
-
-/* Constructs a new parser and namespace processor.  Element type
-   names and attribute names that belong to a namespace will be
-   expanded; unprefixed attribute names are never expanded; unprefixed
-   element type names are expanded only if there is a default
-   namespace. The expanded name is the concatenation of the namespace
-   URI, the namespace separator character, and the local part of the
-   name.  If the namespace separator is '\0' then the namespace URI
-   and the local part will be concatenated without any separator.
-   It is a programming error to use the separator '\0' with namespace
-   triplets (see XML_SetReturnNSTriplet).
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator);
-
-
-/* Constructs a new parser using the memory management suite referred to
-   by memsuite. If memsuite is NULL, then use the standard library memory
-   suite. If namespaceSeparator is non-NULL it creates a parser with
-   namespace processing as described above. The character pointed at
-   will serve as the namespace separator.
-
-   All further memory operations used for the created parser will come from
-   the given suite.
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ParserCreate_MM(const XML_Char *encoding,
-                    const XML_Memory_Handling_Suite *memsuite,
-                    const XML_Char *namespaceSeparator);
-
-/* Prepare a parser object to be re-used.  This is particularly
-   valuable when memory allocation overhead is disproportionatly high,
-   such as when a large number of small documnents need to be parsed.
-   All handlers are cleared from the parser, except for the
-   unknownEncodingHandler. The parser's external state is re-initialized
-   except for the values of ns and ns_triplets.
-
-   Added in Expat 1.95.3.
-*/
-XMLPARSEAPI(XML_Bool)
-XML_ParserReset(XML_Parser parser, const XML_Char *encoding);
-
-/* atts is array of name/value pairs, terminated by 0;
-   names and values are 0 terminated.
-*/
-typedef void (XMLCALL *XML_StartElementHandler) (void *userData,
-                                                 const XML_Char *name,
-                                                 const XML_Char **atts);
-
-typedef void (XMLCALL *XML_EndElementHandler) (void *userData,
-                                               const XML_Char *name);
-
-
-/* s is not 0 terminated. */
-typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData,
-                                                  const XML_Char *s,
-                                                  int len);
-
-/* target and data are 0 terminated */
-typedef void (XMLCALL *XML_ProcessingInstructionHandler) (
-                                                void *userData,
-                                                const XML_Char *target,
-                                                const XML_Char *data);
-
-/* data is 0 terminated */
-typedef void (XMLCALL *XML_CommentHandler) (void *userData,
-                                            const XML_Char *data);
-
-typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData);
-typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData);
-
-/* This is called for any characters in the XML document for which
-   there is no applicable handler.  This includes both characters that
-   are part of markup which is of a kind that is not reported
-   (comments, markup declarations), or characters that are part of a
-   construct which could be reported but for which no handler has been
-   supplied. The characters are passed exactly as they were in the XML
-   document except that they will be encoded in UTF-8 or UTF-16.
-   Line boundaries are not normalized. Note that a byte order mark
-   character is not passed to the default handler. There are no
-   guarantees about how characters are divided between calls to the
-   default handler: for example, a comment might be split between
-   multiple calls.
-*/
-typedef void (XMLCALL *XML_DefaultHandler) (void *userData,
-                                            const XML_Char *s,
-                                            int len);
-
-/* This is called for the start of the DOCTYPE declaration, before
-   any DTD or internal subset is parsed.
-*/
-typedef void (XMLCALL *XML_StartDoctypeDeclHandler) (
-                                            void *userData,
-                                            const XML_Char *doctypeName,
-                                            const XML_Char *sysid,
-                                            const XML_Char *pubid,
-                                            int has_internal_subset);
-
-/* This is called for the start of the DOCTYPE declaration when the
-   closing > is encountered, but after processing any external
-   subset.
-*/
-typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData);
-
-/* This is called for entity declarations. The is_parameter_entity
-   argument will be non-zero if the entity is a parameter entity, zero
-   otherwise.
-
-   For internal entities (<!ENTITY foo "bar">), value will
-   be non-NULL and systemId, publicID, and notationName will be NULL.
-   The value string is NOT nul-terminated; the length is provided in
-   the value_length argument. Since it is legal to have zero-length
-   values, do not use this argument to test for internal entities.
-
-   For external entities, value will be NULL and systemId will be
-   non-NULL. The publicId argument will be NULL unless a public
-   identifier was provided. The notationName argument will have a
-   non-NULL value only for unparsed entity declarations.
-
-   Note that is_parameter_entity can't be changed to XML_Bool, since
-   that would break binary compatibility.
-*/
-typedef void (XMLCALL *XML_EntityDeclHandler) (
-                              void *userData,
-                              const XML_Char *entityName,
-                              int is_parameter_entity,
-                              const XML_Char *value,
-                              int value_length,
-                              const XML_Char *base,
-                              const XML_Char *systemId,
-                              const XML_Char *publicId,
-                              const XML_Char *notationName);
-
-XMLPARSEAPI(void)
-XML_SetEntityDeclHandler(XML_Parser parser,
-                         XML_EntityDeclHandler handler);
-
-/* OBSOLETE -- OBSOLETE -- OBSOLETE
-   This handler has been superceded by the EntityDeclHandler above.
-   It is provided here for backward compatibility.
-
-   This is called for a declaration of an unparsed (NDATA) entity.
-   The base argument is whatever was set by XML_SetBase. The
-   entityName, systemId and notationName arguments will never be
-   NULL. The other arguments may be.
-*/
-typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *entityName,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId,
-                                    const XML_Char *notationName);
-
-/* This is called for a declaration of notation.  The base argument is
-   whatever was set by XML_SetBase. The notationName will never be
-   NULL.  The other arguments can be.
-*/
-typedef void (XMLCALL *XML_NotationDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *notationName,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId);
-
-/* When namespace processing is enabled, these are called once for
-   each namespace declaration. The call to the start and end element
-   handlers occur between the calls to the start and end namespace
-   declaration handlers. For an xmlns attribute, prefix will be
-   NULL.  For an xmlns="" attribute, uri will be NULL.
-*/
-typedef void (XMLCALL *XML_StartNamespaceDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *prefix,
-                                    const XML_Char *uri);
-
-typedef void (XMLCALL *XML_EndNamespaceDeclHandler) (
-                                    void *userData,
-                                    const XML_Char *prefix);
-
-/* This is called if the document is not standalone, that is, it has an
-   external subset or a reference to a parameter entity, but does not
-   have standalone="yes". If this handler returns XML_STATUS_ERROR,
-   then processing will not continue, and the parser will return a
-   XML_ERROR_NOT_STANDALONE error.
-   If parameter entity parsing is enabled, then in addition to the
-   conditions above this handler will only be called if the referenced
-   entity was actually read.
-*/
-typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData);
-
-/* This is called for a reference to an external parsed general
-   entity.  The referenced entity is not automatically parsed.  The
-   application can parse it immediately or later using
-   XML_ExternalEntityParserCreate.
-
-   The parser argument is the parser parsing the entity containing the
-   reference; it can be passed as the parser argument to
-   XML_ExternalEntityParserCreate.  The systemId argument is the
-   system identifier as specified in the entity declaration; it will
-   not be NULL.
-
-   The base argument is the system identifier that should be used as
-   the base for resolving systemId if systemId was relative; this is
-   set by XML_SetBase; it may be NULL.
-
-   The publicId argument is the public identifier as specified in the
-   entity declaration, or NULL if none was specified; the whitespace
-   in the public identifier will have been normalized as required by
-   the XML spec.
-
-   The context argument specifies the parsing context in the format
-   expected by the context argument to XML_ExternalEntityParserCreate;
-   context is valid only until the handler returns, so if the
-   referenced entity is to be parsed later, it must be copied.
-   context is NULL only when the entity is a parameter entity.
-
-   The handler should return XML_STATUS_ERROR if processing should not
-   continue because of a fatal error in the handling of the external
-   entity.  In this case the calling parser will return an
-   XML_ERROR_EXTERNAL_ENTITY_HANDLING error.
-
-   Note that unlike other handlers the first argument is the parser,
-   not userData.
-*/
-typedef int (XMLCALL *XML_ExternalEntityRefHandler) (
-                                    XML_Parser parser,
-                                    const XML_Char *context,
-                                    const XML_Char *base,
-                                    const XML_Char *systemId,
-                                    const XML_Char *publicId);
-
-/* This is called in two situations:
-   1) An entity reference is encountered for which no declaration
-      has been read *and* this is not an error.
-   2) An internal entity reference is read, but not expanded, because
-      XML_SetDefaultHandler has been called.
-   Note: skipped parameter entities in declarations and skipped general
-         entities in attribute values cannot be reported, because
-         the event would be out of sync with the reporting of the
-         declarations or attribute values
-*/
-typedef void (XMLCALL *XML_SkippedEntityHandler) (
-                                    void *userData,
-                                    const XML_Char *entityName,
-                                    int is_parameter_entity);
-
-/* This structure is filled in by the XML_UnknownEncodingHandler to
-   provide information to the parser about encodings that are unknown
-   to the parser.
-
-   The map[b] member gives information about byte sequences whose
-   first byte is b.
-
-   If map[b] is c where c is >= 0, then b by itself encodes the
-   Unicode scalar value c.
-
-   If map[b] is -1, then the byte sequence is malformed.
-
-   If map[b] is -n, where n >= 2, then b is the first byte of an
-   n-byte sequence that encodes a single Unicode scalar value.
-
-   The data member will be passed as the first argument to the convert
-   function.
-
-   The convert function is used to convert multibyte sequences; s will
-   point to a n-byte sequence where map[(unsigned char)*s] == -n.  The
-   convert function must return the Unicode scalar value represented
-   by this byte sequence or -1 if the byte sequence is malformed.
-
-   The convert function may be NULL if the encoding is a single-byte
-   encoding, that is if map[b] >= -1 for all bytes b.
-
-   When the parser is finished with the encoding, then if release is
-   not NULL, it will call release passing it the data member; once
-   release has been called, the convert function will not be called
-   again.
-
-   Expat places certain restrictions on the encodings that are supported
-   using this mechanism.
-
-   1. Every ASCII character that can appear in a well-formed XML document,
-      other than the characters
-
-      $@\^`{}~
-
-      must be represented by a single byte, and that byte must be the
-      same byte that represents that character in ASCII.
-
-   2. No character may require more than 4 bytes to encode.
-
-   3. All characters encoded must have Unicode scalar values <=
-      0xFFFF, (i.e., characters that would be encoded by surrogates in
-      UTF-16 are  not allowed).  Note that this restriction doesn't
-      apply to the built-in support for UTF-8 and UTF-16.
-
-   4. No Unicode character may be encoded by more than one distinct
-      sequence of bytes.
-*/
-typedef struct {
-  int map[256];
-  void *data;
-  int (XMLCALL *convert)(void *data, const char *s);
-  void (XMLCALL *release)(void *data);
-} XML_Encoding;
-
-/* This is called for an encoding that is unknown to the parser.
-
-   The encodingHandlerData argument is that which was passed as the
-   second argument to XML_SetUnknownEncodingHandler.
-
-   The name argument gives the name of the encoding as specified in
-   the encoding declaration.
-
-   If the callback can provide information about the encoding, it must
-   fill in the XML_Encoding structure, and return XML_STATUS_OK.
-   Otherwise it must return XML_STATUS_ERROR.
-
-   If info does not describe a suitable encoding, then the parser will
-   return an XML_UNKNOWN_ENCODING error.
-*/
-typedef int (XMLCALL *XML_UnknownEncodingHandler) (
-                                    void *encodingHandlerData,
-                                    const XML_Char *name,
-                                    XML_Encoding *info);
-
-XMLPARSEAPI(void)
-XML_SetElementHandler(XML_Parser parser,
-                      XML_StartElementHandler start,
-                      XML_EndElementHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartElementHandler(XML_Parser parser,
-                           XML_StartElementHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetEndElementHandler(XML_Parser parser,
-                         XML_EndElementHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetCharacterDataHandler(XML_Parser parser,
-                            XML_CharacterDataHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetProcessingInstructionHandler(XML_Parser parser,
-                                    XML_ProcessingInstructionHandler handler);
-XMLPARSEAPI(void)
-XML_SetCommentHandler(XML_Parser parser,
-                      XML_CommentHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetCdataSectionHandler(XML_Parser parser,
-                           XML_StartCdataSectionHandler start,
-                           XML_EndCdataSectionHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartCdataSectionHandler(XML_Parser parser,
-                                XML_StartCdataSectionHandler start);
-
-XMLPARSEAPI(void)
-XML_SetEndCdataSectionHandler(XML_Parser parser,
-                              XML_EndCdataSectionHandler end);
-
-/* This sets the default handler and also inhibits expansion of
-   internal entities. These entity references will be passed to the
-   default handler, or to the skipped entity handler, if one is set.
-*/
-XMLPARSEAPI(void)
-XML_SetDefaultHandler(XML_Parser parser,
-                      XML_DefaultHandler handler);
-
-/* This sets the default handler but does not inhibit expansion of
-   internal entities.  The entity reference will not be passed to the
-   default handler.
-*/
-XMLPARSEAPI(void)
-XML_SetDefaultHandlerExpand(XML_Parser parser,
-                            XML_DefaultHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetDoctypeDeclHandler(XML_Parser parser,
-                          XML_StartDoctypeDeclHandler start,
-                          XML_EndDoctypeDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartDoctypeDeclHandler(XML_Parser parser,
-                               XML_StartDoctypeDeclHandler start);
-
-XMLPARSEAPI(void)
-XML_SetEndDoctypeDeclHandler(XML_Parser parser,
-                             XML_EndDoctypeDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetUnparsedEntityDeclHandler(XML_Parser parser,
-                                 XML_UnparsedEntityDeclHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetNotationDeclHandler(XML_Parser parser,
-                           XML_NotationDeclHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetNamespaceDeclHandler(XML_Parser parser,
-                            XML_StartNamespaceDeclHandler start,
-                            XML_EndNamespaceDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetStartNamespaceDeclHandler(XML_Parser parser,
-                                 XML_StartNamespaceDeclHandler start);
-
-XMLPARSEAPI(void)
-XML_SetEndNamespaceDeclHandler(XML_Parser parser,
-                               XML_EndNamespaceDeclHandler end);
-
-XMLPARSEAPI(void)
-XML_SetNotStandaloneHandler(XML_Parser parser,
-                            XML_NotStandaloneHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetExternalEntityRefHandler(XML_Parser parser,
-                                XML_ExternalEntityRefHandler handler);
-
-/* If a non-NULL value for arg is specified here, then it will be
-   passed as the first argument to the external entity ref handler
-   instead of the parser object.
-*/
-XMLPARSEAPI(void)
-XML_SetExternalEntityRefHandlerArg(XML_Parser parser,
-                                   void *arg);
-
-XMLPARSEAPI(void)
-XML_SetSkippedEntityHandler(XML_Parser parser,
-                            XML_SkippedEntityHandler handler);
-
-XMLPARSEAPI(void)
-XML_SetUnknownEncodingHandler(XML_Parser parser,
-                              XML_UnknownEncodingHandler handler,
-                              void *encodingHandlerData);
-
-/* This can be called within a handler for a start element, end
-   element, processing instruction or character data.  It causes the
-   corresponding markup to be passed to the default handler.
-*/
-XMLPARSEAPI(void)
-XML_DefaultCurrent(XML_Parser parser);
-
-/* If do_nst is non-zero, and namespace processing is in effect, and
-   a name has a prefix (i.e. an explicit namespace qualifier) then
-   that name is returned as a triplet in a single string separated by
-   the separator character specified when the parser was created: URI
-   + sep + local_name + sep + prefix.
-
-   If do_nst is zero, then namespace information is returned in the
-   default manner (URI + sep + local_name) whether or not the name
-   has a prefix.
-
-   Note: Calling XML_SetReturnNSTriplet after XML_Parse or
-     XML_ParseBuffer has no effect.
-*/
-
-XMLPARSEAPI(void)
-XML_SetReturnNSTriplet(XML_Parser parser, int do_nst);
-
-/* This value is passed as the userData argument to callbacks. */
-XMLPARSEAPI(void)
-XML_SetUserData(XML_Parser parser, void *userData);
-
-/* Returns the last value set by XML_SetUserData or NULL. */
-#define XML_GetUserData(parser) (*(void **)(parser))
-
-/* This is equivalent to supplying an encoding argument to
-   XML_ParserCreate. On success XML_SetEncoding returns non-zero,
-   zero otherwise.
-   Note: Calling XML_SetEncoding after XML_Parse or XML_ParseBuffer
-     has no effect and returns XML_STATUS_ERROR.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_SetEncoding(XML_Parser parser, const XML_Char *encoding);
-
-/* If this function is called, then the parser will be passed as the
-   first argument to callbacks instead of userData.  The userData will
-   still be accessible using XML_GetUserData.
-*/
-XMLPARSEAPI(void)
-XML_UseParserAsHandlerArg(XML_Parser parser);
-
-/* If useDTD == XML_TRUE is passed to this function, then the parser
-   will assume that there is an external subset, even if none is
-   specified in the document. In such a case the parser will call the
-   externalEntityRefHandler with a value of NULL for the systemId
-   argument (the publicId and context arguments will be NULL as well).
-   Note: For the purpose of checking WFC: Entity Declared, passing
-     useDTD == XML_TRUE will make the parser behave as if the document
-     had a DTD with an external subset.
-   Note: If this function is called, then this must be done before
-     the first call to XML_Parse or XML_ParseBuffer, since it will
-     have no effect after that.  Returns
-     XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING.
-   Note: If the document does not have a DOCTYPE declaration at all,
-     then startDoctypeDeclHandler and endDoctypeDeclHandler will not
-     be called, despite an external subset being parsed.
-   Note: If XML_DTD is not defined when Expat is compiled, returns
-     XML_ERROR_FEATURE_REQUIRES_XML_DTD.
-*/
-XMLPARSEAPI(enum XML_Error)
-XML_UseForeignDTD(XML_Parser parser, XML_Bool useDTD);
-
-
-/* Sets the base to be used for resolving relative URIs in system
-   identifiers in declarations.  Resolving relative identifiers is
-   left to the application: this value will be passed through as the
-   base argument to the XML_ExternalEntityRefHandler,
-   XML_NotationDeclHandler and XML_UnparsedEntityDeclHandler. The base
-   argument will be copied.  Returns XML_STATUS_ERROR if out of memory,
-   XML_STATUS_OK otherwise.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_SetBase(XML_Parser parser, const XML_Char *base);
-
-XMLPARSEAPI(const XML_Char *)
-XML_GetBase(XML_Parser parser);
-
-/* Returns the number of the attribute/value pairs passed in last call
-   to the XML_StartElementHandler that were specified in the start-tag
-   rather than defaulted. Each attribute/value pair counts as 2; thus
-   this correspondds to an index into the atts array passed to the
-   XML_StartElementHandler.
-*/
-XMLPARSEAPI(int)
-XML_GetSpecifiedAttributeCount(XML_Parser parser);
-
-/* Returns the index of the ID attribute passed in the last call to
-   XML_StartElementHandler, or -1 if there is no ID attribute.  Each
-   attribute/value pair counts as 2; thus this correspondds to an
-   index into the atts array passed to the XML_StartElementHandler.
-*/
-XMLPARSEAPI(int)
-XML_GetIdAttributeIndex(XML_Parser parser);
-
-#ifdef XML_ATTR_INFO
-/* Source file byte offsets for the start and end of attribute names and values.
-   The value indices are exclusive of surrounding quotes; thus in a UTF-8 source
-   file an attribute value of "blah" will yield:
-   info->valueEnd - info->valueStart = 4 bytes.
-*/
-typedef struct {
-  XML_Index  nameStart;  /* Offset to beginning of the attribute name. */
-  XML_Index  nameEnd;    /* Offset after the attribute name's last byte. */
-  XML_Index  valueStart; /* Offset to beginning of the attribute value. */
-  XML_Index  valueEnd;   /* Offset after the attribute value's last byte. */
-} XML_AttrInfo;
-
-/* Returns an array of XML_AttrInfo structures for the attribute/value pairs
-   passed in last call to the XML_StartElementHandler that were specified
-   in the start-tag rather than defaulted. Each attribute/value pair counts
-   as 1; thus the number of entries in the array is
-   XML_GetSpecifiedAttributeCount(parser) / 2.
-*/
-XMLPARSEAPI(const XML_AttrInfo *)
-XML_GetAttributeInfo(XML_Parser parser);
-#endif
-
-/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
-   detected.  The last call to XML_Parse must have isFinal true; len
-   may be zero for this call (or any other).
-
-   Though the return values for these functions has always been
-   described as a Boolean value, the implementation, at least for the
-   1.95.x series, has always returned exactly one of the XML_Status
-   values.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_Parse(XML_Parser parser, const char *s, int len, int isFinal);
-
-XMLPARSEAPI(void *)
-XML_GetBuffer(XML_Parser parser, int len);
-
-XMLPARSEAPI(enum XML_Status)
-XML_ParseBuffer(XML_Parser parser, int len, int isFinal);
-
-/* Stops parsing, causing XML_Parse() or XML_ParseBuffer() to return.
-   Must be called from within a call-back handler, except when aborting
-   (resumable = 0) an already suspended parser. Some call-backs may
-   still follow because they would otherwise get lost. Examples:
-   - endElementHandler() for empty elements when stopped in
-     startElementHandler(), 
-   - endNameSpaceDeclHandler() when stopped in endElementHandler(), 
-   and possibly others.
-
-   Can be called from most handlers, including DTD related call-backs,
-   except when parsing an external parameter entity and resumable != 0.
-   Returns XML_STATUS_OK when successful, XML_STATUS_ERROR otherwise.
-   Possible error codes: 
-   - XML_ERROR_SUSPENDED: when suspending an already suspended parser.
-   - XML_ERROR_FINISHED: when the parser has already finished.
-   - XML_ERROR_SUSPEND_PE: when suspending while parsing an external PE.
-
-   When resumable != 0 (true) then parsing is suspended, that is, 
-   XML_Parse() and XML_ParseBuffer() return XML_STATUS_SUSPENDED. 
-   Otherwise, parsing is aborted, that is, XML_Parse() and XML_ParseBuffer()
-   return XML_STATUS_ERROR with error code XML_ERROR_ABORTED.
-
-   *Note*:
-   This will be applied to the current parser instance only, that is, if
-   there is a parent parser then it will continue parsing when the
-   externalEntityRefHandler() returns. It is up to the implementation of
-   the externalEntityRefHandler() to call XML_StopParser() on the parent
-   parser (recursively), if one wants to stop parsing altogether.
-
-   When suspended, parsing can be resumed by calling XML_ResumeParser(). 
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_StopParser(XML_Parser parser, XML_Bool resumable);
-
-/* Resumes parsing after it has been suspended with XML_StopParser().
-   Must not be called from within a handler call-back. Returns same
-   status codes as XML_Parse() or XML_ParseBuffer().
-   Additional error code XML_ERROR_NOT_SUSPENDED possible.   
-
-   *Note*:
-   This must be called on the most deeply nested child parser instance
-   first, and on its parent parser only after the child parser has finished,
-   to be applied recursively until the document entity's parser is restarted.
-   That is, the parent parser will not resume by itself and it is up to the
-   application to call XML_ResumeParser() on it at the appropriate moment.
-*/
-XMLPARSEAPI(enum XML_Status)
-XML_ResumeParser(XML_Parser parser);
-
-enum XML_Parsing {
-  XML_INITIALIZED,
-  XML_PARSING,
-  XML_FINISHED,
-  XML_SUSPENDED
-};
-
-typedef struct {
-  enum XML_Parsing parsing;
-  XML_Bool finalBuffer;
-} XML_ParsingStatus;
-
-/* Returns status of parser with respect to being initialized, parsing,
-   finished, or suspended and processing the final buffer.
-   XXX XML_Parse() and XML_ParseBuffer() should return XML_ParsingStatus,
-   XXX with XML_FINISHED_OK or XML_FINISHED_ERROR replacing XML_FINISHED
-*/
-XMLPARSEAPI(void)
-XML_GetParsingStatus(XML_Parser parser, XML_ParsingStatus *status);
-
-/* Creates an XML_Parser object that can parse an external general
-   entity; context is a '\0'-terminated string specifying the parse
-   context; encoding is a '\0'-terminated string giving the name of
-   the externally specified encoding, or NULL if there is no
-   externally specified encoding.  The context string consists of a
-   sequence of tokens separated by formfeeds (\f); a token consisting
-   of a name specifies that the general entity of the name is open; a
-   token of the form prefix=uri specifies the namespace for a
-   particular prefix; a token of the form =uri specifies the default
-   namespace.  This can be called at any point after the first call to
-   an ExternalEntityRefHandler so longer as the parser has not yet
-   been freed.  The new parser is completely independent and may
-   safely be used in a separate thread.  The handlers and userData are
-   initialized from the parser argument.  Returns NULL if out of memory.
-   Otherwise returns a new XML_Parser object.
-*/
-XMLPARSEAPI(XML_Parser)
-XML_ExternalEntityParserCreate(XML_Parser parser,
-                               const XML_Char *context,
-                               const XML_Char *encoding);
-
-enum XML_ParamEntityParsing {
-  XML_PARAM_ENTITY_PARSING_NEVER,
-  XML_PARAM_ENTITY_PARSING_UNLESS_STANDALONE,
-  XML_PARAM_ENTITY_PARSING_ALWAYS
-};
-
-/* Controls parsing of parameter entities (including the external DTD
-   subset). If parsing of parameter entities is enabled, then
-   references to external parameter entities (including the external
-   DTD subset) will be passed to the handler set with
-   XML_SetExternalEntityRefHandler.  The context passed will be 0.
-
-   Unlike external general entities, external parameter entities can
-   only be parsed synchronously.  If the external parameter entity is
-   to be parsed, it must be parsed during the call to the external
-   entity ref handler: the complete sequence of
-   XML_ExternalEntityParserCreate, XML_Parse/XML_ParseBuffer and
-   XML_ParserFree calls must be made during this call.  After
-   XML_ExternalEntityParserCreate has been called to create the parser
-   for the external parameter entity (context must be 0 for this
-   call), it is illegal to make any calls on the old parser until
-   XML_ParserFree has been called on the newly created parser.
-   If the library has been compiled without support for parameter
-   entity parsing (ie without XML_DTD being defined), then
-   XML_SetParamEntityParsing will return 0 if parsing of parameter
-   entities is requested; otherwise it will return non-zero.
-   Note: If XML_SetParamEntityParsing is called after XML_Parse or
-      XML_ParseBuffer, then it has no effect and will always return 0.
-*/
-XMLPARSEAPI(int)
-XML_SetParamEntityParsing(XML_Parser parser,
-                          enum XML_ParamEntityParsing parsing);
-
-/* Sets the hash salt to use for internal hash calculations.
-   Helps in preventing DoS attacks based on predicting hash
-   function behavior. This must be called before parsing is started.
-   Returns 1 if successful, 0 when called after parsing has started.
-*/
-XMLPARSEAPI(int)
-XML_SetHashSalt(XML_Parser parser,
-                unsigned long hash_salt);
-
-/* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then
-   XML_GetErrorCode returns information about the error.
-*/
-XMLPARSEAPI(enum XML_Error)
-XML_GetErrorCode(XML_Parser parser);
-
-/* These functions return information about the current parse
-   location.  They may be called from any callback called to report
-   some parse event; in this case the location is the location of the
-   first of the sequence of characters that generated the event.  When
-   called from callbacks generated by declarations in the document
-   prologue, the location identified isn't as neatly defined, but will
-   be within the relevant markup.  When called outside of the callback
-   functions, the position indicated will be just past the last parse
-   event (regardless of whether there was an associated callback).
-   
-   They may also be called after returning from a call to XML_Parse
-   or XML_ParseBuffer.  If the return value is XML_STATUS_ERROR then
-   the location is the location of the character at which the error
-   was detected; otherwise the location is the location of the last
-   parse event, as described above.
-*/
-XMLPARSEAPI(XML_Size) XML_GetCurrentLineNumber(XML_Parser parser);
-XMLPARSEAPI(XML_Size) XML_GetCurrentColumnNumber(XML_Parser parser);
-XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser);
-
-/* Return the number of bytes in the current event.
-   Returns 0 if the event is in an internal entity.
-*/
-XMLPARSEAPI(int)
-XML_GetCurrentByteCount(XML_Parser parser);
-
-/* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets
-   the integer pointed to by offset to the offset within this buffer
-   of the current parse position, and sets the integer pointed to by size
-   to the size of this buffer (the number of input bytes). Otherwise
-   returns a NULL pointer. Also returns a NULL pointer if a parse isn't
-   active.
-
-   NOTE: The character pointer returned should not be used outside
-   the handler that makes the call.
-*/
-XMLPARSEAPI(const char *)
-XML_GetInputContext(XML_Parser parser,
-                    int *offset,
-                    int *size);
-
-/* For backwards compatibility with previous versions. */
-#define XML_GetErrorLineNumber   XML_GetCurrentLineNumber
-#define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
-#define XML_GetErrorByteIndex    XML_GetCurrentByteIndex
-
-/* Frees the content model passed to the element declaration handler */
-XMLPARSEAPI(void)
-XML_FreeContentModel(XML_Parser parser, XML_Content *model);
-
-/* Exposing the memory handling functions used in Expat */
-XMLPARSEAPI(void *)
-XML_MemMalloc(XML_Parser parser, size_t size);
-
-XMLPARSEAPI(void *)
-XML_MemRealloc(XML_Parser parser, void *ptr, size_t size);
-
-XMLPARSEAPI(void)
-XML_MemFree(XML_Parser parser, void *ptr);
-
-/* Frees memory used by the parser. */
-XMLPARSEAPI(void)
-XML_ParserFree(XML_Parser parser);
-
-/* Returns a string describing the error. */
-XMLPARSEAPI(const XML_LChar *)
-XML_ErrorString(enum XML_Error code);
-
-/* Return a string containing the version number of this expat */
-XMLPARSEAPI(const XML_LChar *)
-XML_ExpatVersion(void);
-
-typedef struct {
-  int major;
-  int minor;
-  int micro;
-} XML_Expat_Version;
-
-/* Return an XML_Expat_Version structure containing numeric version
-   number information for this version of expat.
-*/
-XMLPARSEAPI(XML_Expat_Version)
-XML_ExpatVersionInfo(void);
-
-/* Added in Expat 1.95.5. */
-enum XML_FeatureEnum {
-  XML_FEATURE_END = 0,
-  XML_FEATURE_UNICODE,
-  XML_FEATURE_UNICODE_WCHAR_T,
-  XML_FEATURE_DTD,
-  XML_FEATURE_CONTEXT_BYTES,
-  XML_FEATURE_MIN_SIZE,
-  XML_FEATURE_SIZEOF_XML_CHAR,
-  XML_FEATURE_SIZEOF_XML_LCHAR,
-  XML_FEATURE_NS,
-  XML_FEATURE_LARGE_SIZE,
-  XML_FEATURE_ATTR_INFO
-  /* Additional features must be added to the end of this enum. */
-};
-
-typedef struct {
-  enum XML_FeatureEnum  feature;
-  const XML_LChar       *name;
-  long int              value;
-} XML_Feature;
-
-XMLPARSEAPI(const XML_Feature *)
-XML_GetFeatureList(void);
-
-
-/* Expat follows the GNU/Linux convention of odd number minor version for
-   beta/development releases and even number minor version for stable
-   releases. Micro is bumped with each release, and set to 0 with each
-   change to major or minor version.
-*/
-#define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 1
-#define XML_MICRO_VERSION 0
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* not Expat_INCLUDED */
diff --git a/include.new/bsdxml_external.h b/include.new/bsdxml_external.h
deleted file mode 100644
index 2c03284..0000000
--- a/include.new/bsdxml_external.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
-   See the file COPYING for copying permission.
-*/
-
-#ifndef Expat_External_INCLUDED
-#define Expat_External_INCLUDED 1
-
-/* External API definitions */
-
-#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__)
-#define XML_USE_MSC_EXTENSIONS 1
-#endif
-
-/* Expat tries very hard to make the API boundary very specifically
-   defined.  There are two macros defined to control this boundary;
-   each of these can be defined before including this header to
-   achieve some different behavior, but doing so it not recommended or
-   tested frequently.
-
-   XMLCALL    - The calling convention to use for all calls across the
-                "library boundary."  This will default to cdecl, and
-                try really hard to tell the compiler that's what we
-                want.
-
-   XMLIMPORT  - Whatever magic is needed to note that a function is
-                to be imported from a dynamically loaded library
-                (.dll, .so, or .sl, depending on your platform).
-
-   The XMLCALL macro was added in Expat 1.95.7.  The only one which is
-   expected to be directly useful in client code is XMLCALL.
-
-   Note that on at least some Unix versions, the Expat library must be
-   compiled with the cdecl calling convention as the default since
-   system headers may assume the cdecl convention.
-*/
-#ifndef XMLCALL
-#if defined(_MSC_VER)
-#define XMLCALL __cdecl
-#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER)
-#define XMLCALL __attribute__((cdecl))
-#else
-/* For any platform which uses this definition and supports more than
-   one calling convention, we need to extend this definition to
-   declare the convention used on that platform, if it's possible to
-   do so.
-
-   If this is the case for your platform, please file a bug report
-   with information on how to identify your platform via the C
-   pre-processor and how to specify the same calling convention as the
-   platform's malloc() implementation.
-*/
-#define XMLCALL
-#endif
-#endif  /* not defined XMLCALL */
-
-
-#if !defined(XML_STATIC) && !defined(XMLIMPORT)
-#ifndef XML_BUILDING_EXPAT
-/* using Expat from an application */
-
-#ifdef XML_USE_MSC_EXTENSIONS
-#define XMLIMPORT __declspec(dllimport)
-#endif
-
-#endif
-#endif  /* not defined XML_STATIC */
-
-
-/* If we didn't define it above, define it away: */
-#ifndef XMLIMPORT
-#define XMLIMPORT
-#endif
-
-
-#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef XML_UNICODE_WCHAR_T
-#define XML_UNICODE
-#endif
-
-#ifdef XML_UNICODE     /* Information is UTF-16 encoded. */
-#ifdef XML_UNICODE_WCHAR_T
-typedef wchar_t XML_Char;
-typedef wchar_t XML_LChar;
-#else
-typedef unsigned short XML_Char;
-typedef char XML_LChar;
-#endif /* XML_UNICODE_WCHAR_T */
-#else                  /* Information is UTF-8 encoded. */
-typedef char XML_Char;
-typedef char XML_LChar;
-#endif /* XML_UNICODE */
-
-#ifdef XML_LARGE_SIZE  /* Use large integers for file/stream positions. */
-#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
-typedef __int64 XML_Index; 
-typedef unsigned __int64 XML_Size;
-#else
-typedef long long XML_Index;
-typedef unsigned long long XML_Size;
-#endif
-#else
-typedef long XML_Index;
-typedef unsigned long XML_Size;
-#endif /* XML_LARGE_SIZE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* not Expat_External_INCLUDED */
diff --git a/include.new/bsm/audit.h b/include.new/bsm/audit.h
deleted file mode 100644
index 853d2b7..0000000
--- a/include.new/bsm/audit.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*-
- * Copyright (c) 2005-2009 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#10
- * $FreeBSD: releng/10.2/sys/bsm/audit.h 195740 2009-07-17 14:02:20Z rwatson $
- */
-
-#ifndef	_BSM_AUDIT_H
-#define	_BSM_AUDIT_H
-
-#include <sys/param.h>
-#include <sys/types.h>
-
-#define	AUDIT_RECORD_MAGIC	0x828a0f1b
-#define	MAX_AUDIT_RECORDS	20
-#define	MAXAUDITDATA		(0x8000 - 1)
-#define	MAX_AUDIT_RECORD_SIZE	MAXAUDITDATA
-#define	MIN_AUDIT_FILE_SIZE	(512 * 1024)
-
-/*
- * Minimum noumber of free blocks on the filesystem containing the audit
- * log necessary to avoid a hard log rotation. DO NOT SET THIS VALUE TO 0
- * as the kernel does an unsigned compare, plus we want to leave a few blocks
- * free so userspace can terminate the log, etc.
- */
-#define	AUDIT_HARD_LIMIT_FREE_BLOCKS	4
-
-/*
- * Triggers for the audit daemon.
- */
-#define	AUDIT_TRIGGER_MIN		1
-#define	AUDIT_TRIGGER_LOW_SPACE		1	/* Below low watermark. */
-#define	AUDIT_TRIGGER_ROTATE_KERNEL	2	/* Kernel requests rotate. */
-#define	AUDIT_TRIGGER_READ_FILE		3	/* Re-read config file. */
-#define	AUDIT_TRIGGER_CLOSE_AND_DIE	4	/* Terminate audit. */
-#define	AUDIT_TRIGGER_NO_SPACE		5	/* Below min free space. */
-#define	AUDIT_TRIGGER_ROTATE_USER	6	/* User requests rotate. */
-#define	AUDIT_TRIGGER_INITIALIZE	7	/* User initialize of auditd. */
-#define	AUDIT_TRIGGER_EXPIRE_TRAILS	8	/* User expiration of trails. */
-#define	AUDIT_TRIGGER_MAX		8
-
-/*
- * The special device filename (FreeBSD).
- */
-#define	AUDITDEV_FILENAME	"audit"
-#define	AUDIT_TRIGGER_FILE	("/dev/" AUDITDEV_FILENAME)
-
-/*
- * Pre-defined audit IDs
- */
-#define	AU_DEFAUDITID	(uid_t)(-1)
-#define	AU_DEFAUDITSID	 0
-#define	AU_ASSIGN_ASID	-1
-
-/*
- * IPC types.
- */
-#define	AT_IPC_MSG	((u_char)1)	/* Message IPC id. */
-#define	AT_IPC_SEM	((u_char)2)	/* Semaphore IPC id. */
-#define	AT_IPC_SHM	((u_char)3)	/* Shared mem IPC id. */
-
-/*
- * Audit conditions.
- */
-#define	AUC_UNSET		0
-#define	AUC_AUDITING		1
-#define	AUC_NOAUDIT		2
-#define	AUC_DISABLED		-1
-
-/*
- * auditon(2) commands.
- */
-#define	A_OLDGETPOLICY	2
-#define	A_OLDSETPOLICY	3
-#define	A_GETKMASK	4
-#define	A_SETKMASK	5
-#define	A_OLDGETQCTRL	6
-#define	A_OLDSETQCTRL	7
-#define	A_GETCWD	8
-#define	A_GETCAR	9
-#define	A_GETSTAT	12
-#define	A_SETSTAT	13
-#define	A_SETUMASK	14
-#define	A_SETSMASK	15
-#define	A_OLDGETCOND	20
-#define	A_OLDSETCOND	21
-#define	A_GETCLASS	22
-#define	A_SETCLASS	23
-#define	A_GETPINFO	24
-#define	A_SETPMASK	25
-#define	A_SETFSIZE	26
-#define	A_GETFSIZE	27
-#define	A_GETPINFO_ADDR	28
-#define	A_GETKAUDIT	29
-#define	A_SETKAUDIT	30
-#define	A_SENDTRIGGER	31
-#define	A_GETSINFO_ADDR	32
-#define	A_GETPOLICY	33
-#define	A_SETPOLICY	34
-#define	A_GETQCTRL	35
-#define	A_SETQCTRL	36
-#define	A_GETCOND	37
-#define	A_SETCOND	38
-
-/*
- * Audit policy controls.
- */
-#define	AUDIT_CNT	0x0001
-#define	AUDIT_AHLT	0x0002
-#define	AUDIT_ARGV	0x0004
-#define	AUDIT_ARGE	0x0008
-#define	AUDIT_SEQ	0x0010
-#define	AUDIT_WINDATA	0x0020
-#define	AUDIT_USER	0x0040
-#define	AUDIT_GROUP	0x0080
-#define	AUDIT_TRAIL	0x0100
-#define	AUDIT_PATH	0x0200
-#define	AUDIT_SCNT	0x0400
-#define	AUDIT_PUBLIC	0x0800
-#define	AUDIT_ZONENAME	0x1000
-#define	AUDIT_PERZONE	0x2000
-
-/*
- * Default audit queue control parameters.
- */
-#define	AQ_HIWATER	100
-#define	AQ_MAXHIGH	10000
-#define	AQ_LOWATER	10
-#define	AQ_BUFSZ	MAXAUDITDATA
-#define	AQ_MAXBUFSZ	1048576
-
-/*
- * Default minimum percentage free space on file system.
- */
-#define	AU_FS_MINFREE	20
-
-/*
- * Type definitions used indicating the length of variable length addresses
- * in tokens containing addresses, such as header fields.
- */
-#define	AU_IPv4		4
-#define	AU_IPv6		16
-
-__BEGIN_DECLS
-
-typedef	uid_t		au_id_t;
-typedef	pid_t		au_asid_t;
-typedef	u_int16_t	au_event_t;
-typedef	u_int16_t	au_emod_t;
-typedef	uint32_t	au_class_t;
-typedef	u_int64_t	au_asflgs_t __attribute__ ((aligned (8)));
-
-struct au_tid {
-	dev_t		port;
-	uint32_t	machine;
-};
-typedef	struct au_tid	au_tid_t;
-
-struct au_tid_addr {
-	dev_t		at_port;
-	uint32_t	at_type;
-	uint32_t	at_addr[4];
-};
-typedef	struct au_tid_addr	au_tid_addr_t;
-
-struct au_mask {
-	unsigned int    am_success;     /* Success bits. */
-	unsigned int    am_failure;     /* Failure bits. */
-};
-typedef	struct au_mask	au_mask_t;
-
-struct auditinfo {
-	au_id_t		ai_auid;	/* Audit user ID. */
-	au_mask_t	ai_mask;	/* Audit masks. */
-	au_tid_t	ai_termid;	/* Terminal ID. */
-	au_asid_t	ai_asid;	/* Audit session ID. */
-};
-typedef	struct auditinfo	auditinfo_t;
-
-struct auditinfo_addr {
-	au_id_t		ai_auid;	/* Audit user ID. */
-	au_mask_t	ai_mask;	/* Audit masks. */
-	au_tid_addr_t	ai_termid;	/* Terminal ID. */
-	au_asid_t	ai_asid;	/* Audit session ID. */
-	au_asflgs_t	ai_flags;	/* Audit session flags. */
-};
-typedef	struct auditinfo_addr	auditinfo_addr_t;
-
-struct auditpinfo {
-	pid_t		ap_pid;		/* ID of target process. */
-	au_id_t		ap_auid;	/* Audit user ID. */
-	au_mask_t	ap_mask;	/* Audit masks. */
-	au_tid_t	ap_termid;	/* Terminal ID. */
-	au_asid_t	ap_asid;	/* Audit session ID. */
-};
-typedef	struct auditpinfo	auditpinfo_t;
-
-struct auditpinfo_addr {
-	pid_t		ap_pid;		/* ID of target process. */
-	au_id_t		ap_auid;	/* Audit user ID. */
-	au_mask_t	ap_mask;	/* Audit masks. */
-	au_tid_addr_t	ap_termid;	/* Terminal ID. */
-	au_asid_t	ap_asid;	/* Audit session ID. */
-	au_asflgs_t	ap_flags;	/* Audit session flags. */
-};
-typedef	struct auditpinfo_addr	auditpinfo_addr_t;
-
-struct au_session {
-	auditinfo_addr_t	*as_aia_p;	/* Ptr to full audit info. */
-	au_mask_t		 as_mask;	/* Process Audit Masks. */
-};
-typedef struct au_session       au_session_t;
-
-/*
- * Contents of token_t are opaque outside of libbsm.
- */
-typedef	struct au_token	token_t;
-
-/*
- * Kernel audit queue control parameters:
- * 			Default:		Maximum:
- * 	aq_hiwater:	AQ_HIWATER (100)	AQ_MAXHIGH (10000) 
- * 	aq_lowater:	AQ_LOWATER (10)		<aq_hiwater
- * 	aq_bufsz:	AQ_BUFSZ (32767)	AQ_MAXBUFSZ (1048576)
- * 	aq_delay:	20			20000 (not used) 
- */
-struct au_qctrl {
-	int	aq_hiwater;	/* Max # of audit recs in queue when */
-				/* threads with new ARs get blocked. */ 
-
-	int	aq_lowater;	/* # of audit recs in queue when */
-				/* blocked threads get unblocked. */
-
-	int	aq_bufsz;	/* Max size of audit record for audit(2). */
-	int	aq_delay;	/* Queue delay (not used). */
-	int	aq_minfree;	/* Minimum filesystem percent free space. */
-};
-typedef	struct au_qctrl	au_qctrl_t;
-
-/*
- * Structure for the audit statistics.
- */
-struct audit_stat {
-	unsigned int	as_version;
-	unsigned int	as_numevent;
-	int		as_generated;
-	int		as_nonattrib;
-	int		as_kernel;
-	int		as_audit;
-	int		as_auditctl;
-	int		as_enqueue;
-	int		as_written;
-	int		as_wblocked;
-	int		as_rblocked;
-	int		as_dropped;
-	int		as_totalsize;
-	unsigned int	as_memused;
-};
-typedef	struct audit_stat	au_stat_t;
-
-/*
- * Structure for the audit file statistics.
- */
-struct audit_fstat {
-	u_int64_t	af_filesz;
-	u_int64_t	af_currsz;
-};
-typedef	struct audit_fstat	au_fstat_t;
-
-/*
- * Audit to event class mapping.
- */
-struct au_evclass_map {
-	au_event_t	ec_number;
-	au_class_t	ec_class;
-};
-typedef	struct au_evclass_map	au_evclass_map_t;
-
-/*
- * Audit system calls.
- */
-#if !defined(_KERNEL) && !defined(KERNEL)
-int	audit(const void *, int);
-int	auditon(int, void *, int);
-int	auditctl(const char *);
-int	getauid(au_id_t *);
-int	setauid(const au_id_t *);
-int	getaudit(struct auditinfo *);
-int	setaudit(const struct auditinfo *);
-int	getaudit_addr(struct auditinfo_addr *, int);
-int	setaudit_addr(const struct auditinfo_addr *, int);
-
-#ifdef __APPLE_API_PRIVATE
-#include <mach/port.h>
-mach_port_name_t audit_session_self(void);
-au_asid_t	 audit_session_join(mach_port_name_t port);
-#endif /* __APPLE_API_PRIVATE */
-
-#endif /* defined(_KERNEL) || defined(KERNEL) */
-
-__END_DECLS
-
-#endif /* !_BSM_AUDIT_H */
diff --git a/include.new/bsm/audit_domain.h b/include.new/bsm/audit_domain.h
deleted file mode 100644
index 1332e94..0000000
--- a/include.new/bsm/audit_domain.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 2008 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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. 
- *
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_domain.h#2
- * $FreeBSD: releng/10.2/sys/bsm/audit_domain.h 191273 2009-04-19 16:17:13Z rwatson $
- */
-
-#ifndef _BSM_AUDIT_DOMAIN_H_
-#define	_BSM_AUDIT_DOMAIN_H_
-
-/*
- * BSM protocol domain constants - protocol domains defined in Solaris.
- */
-#define	BSM_PF_UNSPEC		0
-#define	BSM_PF_LOCAL		1
-#define	BSM_PF_INET		2
-#define	BSM_PF_IMPLINK		3
-#define	BSM_PF_PUP		4
-#define	BSM_PF_CHAOS		5
-#define	BSM_PF_NS		6
-#define	BSM_PF_NBS		7	/* Solaris-specific. */
-#define	BSM_PF_ECMA		8
-#define	BSM_PF_DATAKIT		9
-#define	BSM_PF_CCITT		10
-#define	BSM_PF_SNA		11
-#define	BSM_PF_DECnet		12
-#define	BSM_PF_DLI		13
-#define	BSM_PF_LAT		14
-#define	BSM_PF_HYLINK		15
-#define	BSM_PF_APPLETALK	16
-#define	BSM_PF_NIT		17	/* Solaris-specific. */
-#define	BSM_PF_802		18	/* Solaris-specific. */
-#define	BSM_PF_OSI		19
-#define	BSM_PF_X25		20	/* Solaris/Linux-specific. */
-#define	BSM_PF_OSINET		21	/* Solaris-specific. */
-#define	BSM_PF_GOSIP		22	/* Solaris-specific. */
-#define	BSM_PF_IPX		23
-#define	BSM_PF_ROUTE		24
-#define	BSM_PF_LINK		25
-#define	BSM_PF_INET6		26
-#define	BSM_PF_KEY		27
-#define	BSM_PF_NCA		28	/* Solaris-specific. */
-#define	BSM_PF_POLICY		29	/* Solaris-specific. */
-#define	BSM_PF_INET_OFFLOAD	30	/* Solaris-specific. */
-
-/*
- * BSM protocol domain constants - protocol domains not defined in Solaris.
- */
-#define	BSM_PF_NETBIOS		500	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_ISO		501	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_XTP		502	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_COIP		503	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_CNT		504	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_RTIP		505	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_SIP		506	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_PIP		507	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_ISDN		508	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_E164		509	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_NATM		510	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_ATM		511	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_NETGRAPH		512	/* FreeBSD/Darwin-specific. */
-#define	BSM_PF_SLOW		513	/* FreeBSD-specific. */
-#define	BSM_PF_SCLUSTER		514	/* FreeBSD-specific. */
-#define	BSM_PF_ARP		515	/* FreeBSD-specific. */
-#define	BSM_PF_BLUETOOTH	516	/* FreeBSD-specific. */
-					/* 517: unallocated. */
-#define	BSM_PF_AX25		518	/* Linux-specific. */
-#define	BSM_PF_ROSE		519	/* Linux-specific. */
-#define	BSM_PF_NETBEUI		520	/* Linux-specific. */
-#define	BSM_PF_SECURITY		521	/* Linux-specific. */
-#define	BSM_PF_PACKET		522	/* Linux-specific. */
-#define	BSM_PF_ASH		523	/* Linux-specific. */
-#define	BSM_PF_ECONET		524	/* Linux-specific. */
-#define	BSM_PF_ATMSVC		525	/* Linux-specific. */
-#define	BSM_PF_IRDA		526	/* Linux-specific. */
-#define	BSM_PF_PPPOX		527	/* Linux-specific. */
-#define	BSM_PF_WANPIPE		528	/* Linux-specific. */
-#define	BSM_PF_LLC		529	/* Linux-specific. */
-#define	BSM_PF_CAN		530	/* Linux-specific. */
-#define	BSM_PF_TIPC		531	/* Linux-specific. */
-#define	BSM_PF_IUCV		532	/* Linux-specific. */
-#define	BSM_PF_RXRPC		533	/* Linux-specific. */
-#define	BSM_PF_PHONET		534	/* Linux-specific. */
-
-/*
- * Used when there is no mapping from a local to BSM protocol domain.
- */
-#define	BSM_PF_UNKNOWN		700	/* OpenBSM-specific. */
-
-#endif /* !_BSM_AUDIT_DOMAIN_H_ */
diff --git a/include.new/bsm/audit_errno.h b/include.new/bsm/audit_errno.h
deleted file mode 100644
index 661320f..0000000
--- a/include.new/bsm/audit_errno.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*-
- * Copyright (c) 2008 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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. 
- *
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_errno.h#7
- * $FreeBSD: releng/10.2/sys/bsm/audit_errno.h 243751 2012-12-01 13:46:37Z rwatson $
- */
-
-#ifndef _BSM_AUDIT_ERRNO_H_
-#define	_BSM_AUDIT_ERRNO_H_
-
-/*
- * For the purposes of portable encoding, we convert between local error
- * numbers and Solaris error numbers (as well as some extensions for error
- * numbers that don't exist in Solaris).  Although the first 35 or so
- * constants are the same across all OS's, we don't handle that in any
- * special way.
- *
- * When adding constants here, also add them to bsm_errno.c.
- */
-#define	BSM_ERRNO_ESUCCESS		0
-#define	BSM_ERRNO_EPERM			1
-#define	BSM_ERRNO_ENOENT		2
-#define	BSM_ERRNO_ESRCH			3
-#define	BSM_ERRNO_EINTR			4
-#define	BSM_ERRNO_EIO			5
-#define	BSM_ERRNO_ENXIO			6
-#define	BSM_ERRNO_E2BIG			7
-#define	BSM_ERRNO_ENOEXEC		8
-#define	BSM_ERRNO_EBADF			9
-#define	BSM_ERRNO_ECHILD		10
-#define	BSM_ERRNO_EAGAIN		11
-#define	BSM_ERRNO_ENOMEM		12
-#define	BSM_ERRNO_EACCES		13
-#define	BSM_ERRNO_EFAULT		14
-#define	BSM_ERRNO_ENOTBLK		15
-#define	BSM_ERRNO_EBUSY			16
-#define	BSM_ERRNO_EEXIST		17
-#define	BSM_ERRNO_EXDEV			18
-#define	BSM_ERRNO_ENODEV		19
-#define	BSM_ERRNO_ENOTDIR		20
-#define	BSM_ERRNO_EISDIR		21
-#define	BSM_ERRNO_EINVAL		22
-#define	BSM_ERRNO_ENFILE		23
-#define	BSM_ERRNO_EMFILE		24
-#define	BSM_ERRNO_ENOTTY		25
-#define	BSM_ERRNO_ETXTBSY		26
-#define	BSM_ERRNO_EFBIG			27
-#define	BSM_ERRNO_ENOSPC		28
-#define	BSM_ERRNO_ESPIPE		29
-#define	BSM_ERRNO_EROFS			30
-#define	BSM_ERRNO_EMLINK		31
-#define	BSM_ERRNO_EPIPE			32
-#define	BSM_ERRNO_EDOM			33
-#define	BSM_ERRNO_ERANGE		34
-#define	BSM_ERRNO_ENOMSG		35
-#define	BSM_ERRNO_EIDRM			36
-#define	BSM_ERRNO_ECHRNG		37	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EL2NSYNC		38	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EL3HLT		39	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EL3RST		40	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ELNRNG		41	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EUNATCH		42	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ENOCSI		43	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EL2HLT		44	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EDEADLK		45
-#define	BSM_ERRNO_ENOLCK		46
-#define	BSM_ERRNO_ECANCELED		47
-#define	BSM_ERRNO_ENOTSUP		48
-#define	BSM_ERRNO_EDQUOT		49
-#define	BSM_ERRNO_EBADE			50	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EBADR			51	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EXFULL		52	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ENOANO		53	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EBADRQC		54	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EBADSLT		55	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EDEADLOCK		56	/* Solaris-specific. */
-#define	BSM_ERRNO_EBFONT		57	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EOWNERDEAD		58	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ENOTRECOVERABLE	59	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ENOSTR		60	/* Solaris/Darwin/Linux-specific. */
-#define	BSM_ERRNO_ENODATA		61	/* Solaris/Darwin/Linux-specific. */
-#define	BSM_ERRNO_ETIME			62	/* Solaris/Darwin/Linux-specific. */
-#define	BSM_ERRNO_ENOSR			63	/* Solaris/Darwin/Linux-specific. */
-#define	BSM_ERRNO_ENONET		64	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ENOPKG		65	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EREMOTE		66
-#define	BSM_ERRNO_ENOLINK		67
-#define	BSM_ERRNO_EADV			68	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ESRMNT		69	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ECOMM			70	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EPROTO		71
-#define	BSM_ERRNO_ELOCKUNMAPPED		72	/* Solaris-specific. */
-#define	BSM_ERRNO_ENOTACTIVE		73	/* Solaris-specific. */
-#define	BSM_ERRNO_EMULTIHOP		74
-#define	BSM_ERRNO_EBADMSG		77
-#define	BSM_ERRNO_ENAMETOOLONG		78
-#define	BSM_ERRNO_EOVERFLOW		79
-#define	BSM_ERRNO_ENOTUNIQ		80	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EBADFD		81	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EREMCHG		82	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ELIBACC		83	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ELIBBAD		84	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ELIBSCN		85	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ELIBMAX		86	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ELIBEXEC		87	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_EILSEQ		88
-#define	BSM_ERRNO_ENOSYS		89
-#define	BSM_ERRNO_ELOOP			90
-#define	BSM_ERRNO_ERESTART		91
-#define	BSM_ERRNO_ESTRPIPE		92	/* Solaris/Linux-specific. */
-#define	BSM_ERRNO_ENOTEMPTY		93
-#define	BSM_ERRNO_EUSERS		94
-#define	BSM_ERRNO_ENOTSOCK		95
-#define	BSM_ERRNO_EDESTADDRREQ		96
-#define	BSM_ERRNO_EMSGSIZE		97
-#define	BSM_ERRNO_EPROTOTYPE		98
-#define	BSM_ERRNO_ENOPROTOOPT		99
-#define	BSM_ERRNO_EPROTONOSUPPORT	120
-#define	BSM_ERRNO_ESOCKTNOSUPPORT	121
-#define	BSM_ERRNO_EOPNOTSUPP		122
-#define	BSM_ERRNO_EPFNOSUPPORT		123
-#define	BSM_ERRNO_EAFNOSUPPORT		124
-#define	BSM_ERRNO_EADDRINUSE		125
-#define	BSM_ERRNO_EADDRNOTAVAIL		126
-#define	BSM_ERRNO_ENETDOWN		127
-#define	BSM_ERRNO_ENETUNREACH		128
-#define	BSM_ERRNO_ENETRESET		129
-#define	BSM_ERRNO_ECONNABORTED		130
-#define	BSM_ERRNO_ECONNRESET		131
-#define	BSM_ERRNO_ENOBUFS		132
-#define	BSM_ERRNO_EISCONN		133
-#define	BSM_ERRNO_ENOTCONN		134
-#define	BSM_ERRNO_ESHUTDOWN		143
-#define	BSM_ERRNO_ETOOMANYREFS		144
-#define	BSM_ERRNO_ETIMEDOUT		145
-#define	BSM_ERRNO_ECONNREFUSED		146
-#define	BSM_ERRNO_EHOSTDOWN		147
-#define	BSM_ERRNO_EHOSTUNREACH		148
-#define	BSM_ERRNO_EALREADY		149
-#define	BSM_ERRNO_EINPROGRESS		150
-#define	BSM_ERRNO_ESTALE		151
-
-/*
- * OpenBSM constants for error numbers not defined in Solaris.  In the event
- * that these errors are added to Solaris, we will deprecate the OpenBSM
- * numbers in the same way we do for audit event constants.
- *
- * ELAST doesn't get a constant in the BSM space.
- */
-#define	BSM_ERRNO_EPROCLIM		190	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_EBADRPC		191	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_ERPCMISMATCH		192	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_EPROGUNAVAIL		193	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_EPROGMISMATCH		194	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_EPROCUNAVAIL		195	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_EFTYPE		196	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_EAUTH			197	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_ENEEDAUTH		198	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_ENOATTR		199	/* FreeBSD/Darwin-specific. */
-#define	BSM_ERRNO_EDOOFUS		200	/* FreeBSD-specific. */
-#define	BSM_ERRNO_EJUSTRETURN		201	/* FreeBSD-specific. */
-#define	BSM_ERRNO_ENOIOCTL		202	/* FreeBSD-specific. */
-#define	BSM_ERRNO_EDIRIOCTL		203	/* FreeBSD-specific. */
-#define	BSM_ERRNO_EPWROFF		204	/* Darwin-specific. */
-#define	BSM_ERRNO_EDEVERR		205	/* Darwin-specific. */
-#define	BSM_ERRNO_EBADEXEC		206	/* Darwin-specific. */
-#define	BSM_ERRNO_EBADARCH		207	/* Darwin-specific. */
-#define	BSM_ERRNO_ESHLIBVERS		208	/* Darwin-specific. */
-#define	BSM_ERRNO_EBADMACHO		209	/* Darwin-specific. */
-#define	BSM_ERRNO_EPOLICY		210	/* Darwin-specific. */
-#define	BSM_ERRNO_EDOTDOT		211	/* Linux-specific. */
-#define	BSM_ERRNO_EUCLEAN		212	/* Linux-specific. */
-#define	BSM_ERRNO_ENOTNAM		213	/* Linux(Xenix?)-specific. */
-#define	BSM_ERRNO_ENAVAIL		214	/* Linux(Xenix?)-specific. */
-#define	BSM_ERRNO_EISNAM		215	/* Linux(Xenix?)-specific. */
-#define	BSM_ERRNO_EREMOTEIO		216	/* Linux-specific. */
-#define	BSM_ERRNO_ENOMEDIUM		217	/* Linux-specific. */
-#define	BSM_ERRNO_EMEDIUMTYPE		218	/* Linux-specific. */
-#define	BSM_ERRNO_ENOKEY		219	/* Linux-specific. */
-#define	BSM_ERRNO_EKEYEXPIRED		220	/* Linux-specific. */
-#define	BSM_ERRNO_EKEYREVOKED		221	/* Linux-specific. */
-#define	BSM_ERRNO_EKEYREJECTED		222	/* Linux-specific. */
-#define	BSM_ERRNO_ENOTCAPABLE		223	/* FreeBSD-specific. */
-#define	BSM_ERRNO_ECAPMODE		224	/* FreeBSD-specific. */
-
-/*
- * In the event that OpenBSM doesn't have a file representation of a local
- * error number, use this.
- */
-#define	BSM_ERRNO_UNKNOWN		250	/* OpenBSM-specific. */
-
-#endif /* !_BSM_AUDIT_ERRNO_H_ */
diff --git a/include.new/bsm/audit_fcntl.h b/include.new/bsm/audit_fcntl.h
deleted file mode 100644
index 7922410..0000000
--- a/include.new/bsm/audit_fcntl.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 2009 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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. 
- *
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2
- * $FreeBSD: releng/10.2/sys/bsm/audit_fcntl.h 191147 2009-04-16 20:17:32Z rwatson $
- */
-
-#ifndef	_BSM_AUDIT_FCNTL_H_
-#define	_BSM_AUDIT_FCNTL_H_
-
-/*
- * Shared and Solaris-specific: (0-99).
- */
-#define	BSM_F_DUPFD		0
-#define	BSM_F_GETFD		1
-#define	BSM_F_SETFD		2
-#define	BSM_F_GETFL		3
-#define	BSM_F_SETFL		4
-#define	BSM_F_O_GETLK		5	/* Solaris-specific. */
-#define	BSM_F_SETLK		6
-#define	BSM_F_SETLKW		7
-#define	BSM_F_CHKFL		8	/* Solaris-specific. */
-#define	BSM_F_DUP2FD		9	/* FreeBSD/Solaris-specific. */
-#define	BSM_F_ALLOCSP		10	/* Solaris-specific. */
-#define	BSM_F_FREESP		11	/* Solaris-specific. */
-
-#define	BSM_F_ISSTREAM		13	/* Solaris-specific. */
-#define	BSM_F_GETLK		14	
-#define	BSM_F_PRIV		15	/* Solaris-specific. */
-#define	BSM_F_NPRIV		16	/* Solaris-specific. */
-#define	BSM_F_QUOTACTL		17	/* Solaris-specific. */
-#define	BSM_F_BLOCKS		18	/* Solaris-specific. */
-#define	BSM_F_BLKSIZE		19	/* Solaris-specific. */
-
-#define	BSM_F_GETOWN		23
-#define	BSM_F_SETOWN		24
-#define	BSM_F_REVOKE		25	/* Solaris-specific. */
-#define	BSM_F_HASREMOTELOCKS	26	/* Solaris-specific. */
-#define	BSM_F_FREESP64		27	/* Solaris-specific. */
-#define	BSM_F_ALLOCSP64		28	/* Solaris-specific. */
-
-#define	BSM_F_GETLK64		33	/* Solaris-specific. */
-#define	BSM_F_SETLK64		34	/* Solaris-specific. */
-#define	BSM_F_SETLKW64		35	/* Solaris-specific. */
-
-#define	BSM_F_SHARE		40	/* Solaris-specific. */
-#define	BSM_F_UNSHARE		41 	/* Solaris-specific. */
-#define	BSM_F_SETLK_NBMAND	42	/* Solaris-specific. */
-#define	BSM_F_SHARE_NBMAND	43	/* Solaris-specific. */
-#define	BSM_F_SETLK64_NBMAND	44 	/* Solaris-specific. */
-#define	BSM_F_GETXFL		45	/* Solaris-specific. */
-#define	BSM_F_BADFD		46	/* Solaris-specific. */
-
-/*
- * FreeBSD-specific (100-199).
- */
-#define	BSM_F_OGETLK		107	/* FreeBSD-specific. */
-#define	BSM_F_OSETLK		108	/* FreeBSD-specific. */
-#define	BSM_F_OSETLKW		109	/* FreeBSD-specific. */
-
-#define	BSM_F_SETLK_REMOTE	114	/* FreeBSD-specific. */
-
-/*
- * Linux-specific (200-299).
- */
-#define	BSM_F_SETSIG		210	/* Linux-specific. */
-#define	BSM_F_GETSIG		211	/* Linux-specific. */
-
-/*
- * Darwin-specific (300-399).
- */
-#define	BSM_F_CHKCLEAN 		341	/* Darwin-specific. */
-#define	BSM_F_PREALLOCATE	342	/* Darwin-specific. */
-#define	BSM_F_SETSIZE		343	/* Darwin-specific. */
-#define	BSM_F_RDADVISE		344	/* Darwin-specific. */
-#define	BSM_F_RDAHEAD		345	/* Darwin-specific. */
-#define	BSM_F_READBOOTSTRAP	346	/* Darwin-specific. */
-#define	BSM_F_WRITEBOOTSTRAP	347	/* Darwin-specific. */
-#define	BSM_F_NOCACHE		348	/* Darwin-specific. */
-#define	BSM_F_LOG2PHYS		349	/* Darwin-specific. */
-#define	BSM_F_GETPATH		350	/* Darwin-specific. */
-#define	BSM_F_FULLFSYNC		351	/* Darwin-specific. */
-#define	BSM_F_PATHPKG_CHECK	352	/* Darwin-specific. */
-#define	BSM_F_FREEZE_FS		353	/* Darwin-specific. */
-#define	BSM_F_THAW_FS		354	/* Darwin-specific. */
-#define	BSM_F_GLOBAL_NOCACHE	355	/* Darwin-specific. */
-#define	BSM_F_OPENFROM		356	/* Darwin-specific. */
-#define	BSM_F_UNLINKFROM	357	/* Darwin-specific. */
-#define	BSM_F_CHECK_OPENEVT	358	/* Darwin-specific. */
-#define	BSM_F_ADDSIGS		359	/* Darwin-specific. */
-#define	BSM_F_MARKDEPENDENCY	360	/* Darwin-specific. */
-
-/*
- * Darwin file system specific (400-499).
- */
-#define	BSM_F_FS_SPECIFIC_0	400	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_1	401	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_2	402	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_3	403	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_4	404	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_5	405	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_6	406	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_7	407	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_8	408	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_9	409	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_10	410	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_11	411	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_12	412	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_13	413	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_14	414	/* Darwin-fs-specific. */
-#define	BSM_F_FS_SPECIFIC_15	415	/* Darwin-fs-specific. */
-
-
-#define	BSM_F_UNKNOWN		0xFFFF	
-
-#endif /* !_BSM_AUDIT_FCNTL_H_ */
diff --git a/include.new/bsm/audit_internal.h b/include.new/bsm/audit_internal.h
deleted file mode 100644
index 61fc712..0000000
--- a/include.new/bsm/audit_internal.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 2005-2008 Apple Inc.
- * Copyright (c) 2005 SPARTA, Inc.
- * All rights reserved.
- *
- * This code was developed in part by Robert N. M. Watson, Senior Principal
- * Scientist, SPARTA, Inc.
- *
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_internal.h#6
- * $FreeBSD: releng/10.2/sys/bsm/audit_internal.h 243751 2012-12-01 13:46:37Z rwatson $
- */
-
-#ifndef _AUDIT_INTERNAL_H
-#define	_AUDIT_INTERNAL_H
-
-#if defined(__linux__) && !defined(__unused)
-#define	__unused
-#endif
-
-/*
- * audit_internal.h contains private interfaces that are shared by user space
- * and the kernel for the purposes of assembling audit records.  Applications
- * should not include this file or use the APIs found within, or it may be
- * broken with future releases of OpenBSM, which may delete, modify, or
- * otherwise break these interfaces or the assumptions they rely on.
- */
-struct au_token {
-	u_char			*t_data;
-	size_t			 len;
-	TAILQ_ENTRY(au_token)	 tokens;
-};
-
-struct au_record {
-	char			 used;		/* Record currently in use? */
-	int			 desc;		/* Descriptor for record. */
-	TAILQ_HEAD(, au_token)	 token_q;	/* Queue of BSM tokens. */
-	u_char			*data;
-	size_t			 len;
-	LIST_ENTRY(au_record)	 au_rec_q;
-};
-typedef	struct au_record	au_record_t;
-
-
-/*
- * We could determined the header and trailer sizes by defining appropriate
- * structures.  We hold off that approach until we have a consistent way of
- * using structures for all tokens.  This is not straightforward since these
- * token structures may contain pointers of whose contents we do not know the
- * size (e.g text tokens).
- */
-#define	AUDIT_HEADER_EX_SIZE(a)	((a)->ai_termid.at_type+18+sizeof(uint32_t))
-#define	AUDIT_HEADER_SIZE	18
-#define	MAX_AUDIT_HEADER_SIZE	(5*sizeof(uint32_t)+18)
-#define	AUDIT_TRAILER_SIZE	7
-
-/*
- * BSM token streams store fields in big endian byte order, so as to be
- * portable; when encoding and decoding, we must convert byte orders for
- * typed values.
- */
-#define	ADD_U_CHAR(loc, val)						\
-	do {								\
-		*(loc) = (val);						\
-		(loc) += sizeof(u_char);				\
-	} while(0)
-
-
-#define	ADD_U_INT16(loc, val)						\
-	do {								\
-		be16enc((loc), (val));					\
-		(loc) += sizeof(u_int16_t);				\
-	} while(0)
-
-#define	ADD_U_INT32(loc, val)						\
-	do {								\
-		be32enc((loc), (val));					\
-		(loc) += sizeof(uint32_t);				\
-	} while(0)
-
-#define	ADD_U_INT64(loc, val)						\
-	do {								\
-		be64enc((loc), (val));					\
-		(loc) += sizeof(u_int64_t); 				\
-	} while(0)
-
-#define	ADD_MEM(loc, data, size)					\
-	do {								\
-		memcpy((loc), (data), (size));				\
-		(loc) += size;						\
-	} while(0)
-
-#define	ADD_STRING(loc, data, size)	ADD_MEM(loc, data, size)
-
-#endif /* !_AUDIT_INTERNAL_H_ */
diff --git a/include.new/bsm/audit_kevents.h b/include.new/bsm/audit_kevents.h
deleted file mode 100644
index b132e64..0000000
--- a/include.new/bsm/audit_kevents.h
+++ /dev/null
@@ -1,809 +0,0 @@
-/*-
- * Copyright (c) 2005-2009 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#7
- * $FreeBSD: releng/10.2/sys/bsm/audit_kevents.h 255219 2013-09-05 00:09:56Z pjd $
- */
-
-#ifndef _BSM_AUDIT_KEVENTS_H_
-#define	_BSM_AUDIT_KEVENTS_H_
-
-/*
- * The reserved event numbers for kernel events are 1...2047 and 43001..44900.
- */
-#define	AUE_IS_A_KEVENT(e)	(((e) > 0 && (e) < 2048) ||	\
-				 ((e) > 43000 && (e) < 45000))
-
-/*
- * Values marked as AUE_NULL are not required to be audited as per CAPP.
- *
- * Some conflicts exist in the assignment of name to event number mappings
- * between BSM implementations.  In general, we prefer the OpenSolaris
- * definition as we consider Solaris BSM to be authoritative.  _DARWIN_ has
- * been inserted for the Darwin variants.  If necessary, other tags will be
- * added in the future.
- */
-#define	AUE_NULL		0
-#define	AUE_EXIT		1
-#define	AUE_FORK		2
-#define	AUE_FORKALL		AUE_FORK	/* Solaris-specific. */
-#define	AUE_OPEN		3
-#define	AUE_CREAT		4
-#define	AUE_LINK		5
-#define	AUE_UNLINK		6
-#define	AUE_DELETE		AUE_UNLINK	/* Darwin-specific. */
-#define	AUE_EXEC		7
-#define	AUE_CHDIR		8
-#define	AUE_MKNOD		9
-#define	AUE_CHMOD		10
-#define	AUE_CHOWN		11
-#define	AUE_UMOUNT		12
-#define	AUE_JUNK		13	/* Solaris-specific. */
-#define	AUE_ACCESS		14
-#define	AUE_KILL		15
-#define	AUE_STAT		16
-#define	AUE_LSTAT		17
-#define	AUE_ACCT		18
-#define	AUE_MCTL		19	/* Solaris-specific. */
-#define	AUE_REBOOT		20	/* XXX: Darwin conflict. */
-#define	AUE_SYMLINK		21
-#define	AUE_READLINK		22
-#define	AUE_EXECVE		23
-#define	AUE_CHROOT		24
-#define	AUE_VFORK		25
-#define	AUE_SETGROUPS		26
-#define	AUE_SETPGRP		27
-#define	AUE_SWAPON		28
-#define	AUE_SETHOSTNAME		29	/* XXX: Darwin conflict. */
-#define	AUE_FCNTL		30
-#define	AUE_SETPRIORITY		31	/* XXX: Darwin conflict. */
-#define	AUE_CONNECT		32
-#define	AUE_ACCEPT		33
-#define	AUE_BIND		34
-#define	AUE_SETSOCKOPT		35
-#define	AUE_VTRACE		36	/* Solaris-specific. */
-#define	AUE_SETTIMEOFDAY	37	/* XXX: Darwin conflict. */
-#define	AUE_FCHOWN		38
-#define	AUE_FCHMOD		39
-#define	AUE_SETREUID		40
-#define	AUE_SETREGID		41
-#define	AUE_RENAME		42
-#define	AUE_TRUNCATE		43	/* XXX: Darwin conflict. */
-#define	AUE_FTRUNCATE		44	/* XXX: Darwin conflict. */
-#define	AUE_FLOCK		45	/* XXX: Darwin conflict. */
-#define	AUE_SHUTDOWN		46
-#define	AUE_MKDIR		47
-#define	AUE_RMDIR		48
-#define	AUE_UTIMES		49
-#define	AUE_ADJTIME		50
-#define	AUE_SETRLIMIT		51
-#define	AUE_KILLPG		52
-#define	AUE_NFS_SVC		53	/* XXX: Darwin conflict. */
-#define	AUE_STATFS		54
-#define	AUE_FSTATFS		55
-#define	AUE_UNMOUNT		56	/* XXX: Darwin conflict. */
-#define	AUE_ASYNC_DAEMON	57
-#define	AUE_NFS_GETFH		58	/* XXX: Darwin conflict. */
-#define	AUE_SETDOMAINNAME	59
-#define	AUE_QUOTACTL		60	/* XXX: Darwin conflict. */
-#define	AUE_EXPORTFS		61
-#define	AUE_MOUNT		62
-#define	AUE_SEMSYS		63
-#define	AUE_MSGSYS		64
-#define	AUE_SHMSYS		65
-#define	AUE_BSMSYS		66	/* Solaris-specific. */
-#define	AUE_RFSSYS		67	/* Solaris-specific. */
-#define	AUE_FCHDIR		68
-#define	AUE_FCHROOT		69
-#define	AUE_VPIXSYS		70	/* Solaris-specific. */
-#define	AUE_PATHCONF		71
-#define	AUE_OPEN_R		72
-#define	AUE_OPEN_RC		73
-#define	AUE_OPEN_RT		74
-#define	AUE_OPEN_RTC		75
-#define	AUE_OPEN_W		76
-#define	AUE_OPEN_WC		77
-#define	AUE_OPEN_WT		78
-#define	AUE_OPEN_WTC		79
-#define	AUE_OPEN_RW		80
-#define	AUE_OPEN_RWC		81
-#define	AUE_OPEN_RWT		82
-#define	AUE_OPEN_RWTC		83
-#define	AUE_MSGCTL		84
-#define	AUE_MSGCTL_RMID		85
-#define	AUE_MSGCTL_SET		86
-#define	AUE_MSGCTL_STAT		87
-#define	AUE_MSGGET		88
-#define	AUE_MSGRCV		89
-#define	AUE_MSGSND		90
-#define	AUE_SHMCTL		91
-#define	AUE_SHMCTL_RMID		92
-#define	AUE_SHMCTL_SET		93
-#define	AUE_SHMCTL_STAT		94
-#define	AUE_SHMGET		95
-#define	AUE_SHMAT		96
-#define	AUE_SHMDT		97
-#define	AUE_SEMCTL		98
-#define	AUE_SEMCTL_RMID		99
-#define	AUE_SEMCTL_SET		100
-#define	AUE_SEMCTL_STAT		101
-#define	AUE_SEMCTL_GETNCNT	102
-#define	AUE_SEMCTL_GETPID	103
-#define	AUE_SEMCTL_GETVAL	104
-#define	AUE_SEMCTL_GETALL	105
-#define	AUE_SEMCTL_GETZCNT	106
-#define	AUE_SEMCTL_SETVAL	107
-#define	AUE_SEMCTL_SETALL	108
-#define	AUE_SEMGET		109
-#define	AUE_SEMOP		110
-#define	AUE_CORE		111	/* Solaris-specific, currently. */
-#define	AUE_CLOSE		112
-#define	AUE_SYSTEMBOOT		113	/* Solaris-specific. */
-#define	AUE_ASYNC_DAEMON_EXIT	114	/* Solaris-specific. */
-#define	AUE_NFSSVC_EXIT		115	/* Solaris-specific. */
-#define	AUE_WRITEL		128	/* Solaris-specific. */
-#define	AUE_WRITEVL		129	/* Solaris-specific. */
-#define	AUE_GETAUID		130
-#define	AUE_SETAUID		131
-#define	AUE_GETAUDIT		132
-#define	AUE_SETAUDIT		133
-#define	AUE_GETUSERAUDIT	134	/* Solaris-specific. */
-#define	AUE_SETUSERAUDIT	135	/* Solaris-specific. */
-#define	AUE_AUDITSVC		136	/* Solaris-specific. */
-#define	AUE_AUDITUSER		137	/* Solaris-specific. */
-#define	AUE_AUDITON		138
-#define	AUE_AUDITON_GTERMID	139	/* Solaris-specific. */
-#define	AUE_AUDITON_STERMID	140	/* Solaris-specific. */
-#define	AUE_AUDITON_GPOLICY	141
-#define	AUE_AUDITON_SPOLICY	142
-#define	AUE_AUDITON_GQCTRL	145
-#define	AUE_AUDITON_SQCTRL	146
-#define	AUE_GETKERNSTATE	147	/* Solaris-specific. */
-#define	AUE_SETKERNSTATE	148	/* Solaris-specific. */
-#define	AUE_GETPORTAUDIT	149	/* Solaris-specific. */
-#define	AUE_AUDITSTAT		150	/* Solaris-specific. */
-#define	AUE_REVOKE		151
-#define	AUE_MAC			152	/* Solaris-specific. */
-#define	AUE_ENTERPROM		153	/* Solaris-specific. */
-#define	AUE_EXITPROM		154	/* Solaris-specific. */
-#define	AUE_IFLOAT		155	/* Solaris-specific. */
-#define	AUE_PFLOAT		156	/* Solaris-specific. */
-#define	AUE_UPRIV		157	/* Solaris-specific. */
-#define	AUE_IOCTL		158
-#define	AUE_SOCKET		183
-#define	AUE_SENDTO		184
-#define	AUE_PIPE		185
-#define	AUE_SOCKETPAIR		186	/* XXX: Darwin conflict. */
-#define	AUE_SEND		187
-#define	AUE_SENDMSG		188
-#define	AUE_RECV		189
-#define	AUE_RECVMSG		190
-#define	AUE_RECVFROM		191
-#define	AUE_READ		192
-#define	AUE_GETDENTS		193
-#define	AUE_LSEEK		194
-#define	AUE_WRITE		195
-#define	AUE_WRITEV		196
-#define	AUE_NFS			197	/* Solaris-specific. */
-#define	AUE_READV		198
-#define	AUE_OSTAT		199	/* Solaris-specific. */
-#define	AUE_SETUID		200	/* XXXRW: Solaris old setuid? */
-#define	AUE_STIME		201	/* XXXRW: Solaris old stime? */
-#define	AUE_UTIME		202	/* XXXRW: Solaris old utime? */
-#define	AUE_NICE		203	/* XXXRW: Solaris old nice? */
-#define	AUE_OSETPGRP		204	/* Solaris-specific. */
-#define	AUE_SETGID		205
-#define	AUE_READL		206	/* Solaris-specific. */
-#define	AUE_READVL		207	/* Solaris-specific. */
-#define	AUE_FSTAT		208
-#define	AUE_DUP2		209
-#define	AUE_MMAP		210
-#define	AUE_AUDIT		211
-#define	AUE_PRIOCNTLSYS		212	/* Solaris-specific. */
-#define	AUE_MUNMAP		213
-#define	AUE_SETEGID		214
-#define	AUE_SETEUID		215
-#define	AUE_PUTMSG		216	/* Solaris-specific. */
-#define	AUE_GETMSG		217	/* Solaris-specific. */
-#define	AUE_PUTPMSG		218	/* Solaris-specific. */
-#define	AUE_GETPMSG		219	/* Solaris-specific. */
-#define	AUE_AUDITSYS		220	/* Solaris-specific. */
-#define	AUE_AUDITON_GETKMASK	221
-#define	AUE_AUDITON_SETKMASK	222
-#define	AUE_AUDITON_GETCWD	223
-#define	AUE_AUDITON_GETCAR	224
-#define	AUE_AUDITON_GETSTAT	225
-#define	AUE_AUDITON_SETSTAT	226
-#define	AUE_AUDITON_SETUMASK	227
-#define	AUE_AUDITON_SETSMASK	228
-#define	AUE_AUDITON_GETCOND	229
-#define	AUE_AUDITON_SETCOND	230
-#define	AUE_AUDITON_GETCLASS	231
-#define	AUE_AUDITON_SETCLASS	232
-#define	AUE_FUSERS		233	/* Solaris-specific; also UTSSYS? */
-#define	AUE_STATVFS		234
-#define	AUE_XSTAT		235	/* Solaris-specific. */
-#define	AUE_LXSTAT		236	/* Solaris-specific. */
-#define	AUE_LCHOWN		237
-#define	AUE_MEMCNTL		238	/* Solaris-specific. */
-#define	AUE_SYSINFO		239	/* Solaris-specific. */
-#define	AUE_XMKNOD		240	/* Solaris-specific. */
-#define	AUE_FORK1		241
-#define	AUE_MODCTL		242	/* Solaris-specific. */
-#define	AUE_MODLOAD		243
-#define	AUE_MODUNLOAD		244
-#define	AUE_MODCONFIG		245	/* Solaris-specific. */
-#define	AUE_MODADDMAJ		246	/* Solaris-specific. */
-#define	AUE_SOCKACCEPT		247	/* Solaris-specific. */
-#define	AUE_SOCKCONNECT		248	/* Solaris-specific. */
-#define	AUE_SOCKSEND		249	/* Solaris-specific. */
-#define	AUE_SOCKRECEIVE		250	/* Solaris-specific. */
-#define	AUE_ACLSET		251
-#define	AUE_FACLSET		252
-#define	AUE_DOORFS		253	/* Solaris-specific. */
-#define	AUE_DOORFS_DOOR_CALL	254	/* Solaris-specific. */
-#define	AUE_DOORFS_DOOR_RETURN	255	/* Solaris-specific. */
-#define	AUE_DOORFS_DOOR_CREATE	256	/* Solaris-specific. */
-#define	AUE_DOORFS_DOOR_REVOKE	257	/* Solaris-specific. */
-#define	AUE_DOORFS_DOOR_INFO	258	/* Solaris-specific. */
-#define	AUE_DOORFS_DOOR_CRED	259	/* Solaris-specific. */
-#define	AUE_DOORFS_DOOR_BIND	260	/* Solaris-specific. */
-#define	AUE_DOORFS_DOOR_UNBIND	261	/* Solaris-specific. */
-#define	AUE_P_ONLINE		262	/* Solaris-specific. */
-#define	AUE_PROCESSOR_BIND	263	/* Solaris-specific. */
-#define	AUE_INST_SYNC		264	/* Solaris-specific. */
-#define	AUE_SOCKCONFIG		265	/* Solaris-specific. */
-#define	AUE_SETAUDIT_ADDR	266
-#define	AUE_GETAUDIT_ADDR	267
-#define	AUE_UMOUNT2		268	/* Solaris-specific. */
-#define	AUE_FSAT		269	/* Solaris-specific. */
-#define	AUE_OPENAT_R		270
-#define	AUE_OPENAT_RC		271
-#define	AUE_OPENAT_RT		272
-#define	AUE_OPENAT_RTC		273
-#define	AUE_OPENAT_W		274
-#define	AUE_OPENAT_WC		275
-#define	AUE_OPENAT_WT		276
-#define	AUE_OPENAT_WTC		277
-#define	AUE_OPENAT_RW		278
-#define	AUE_OPENAT_RWC		279
-#define	AUE_OPENAT_RWT		280
-#define	AUE_OPENAT_RWTC		281
-#define	AUE_RENAMEAT		282
-#define	AUE_FSTATAT		283
-#define	AUE_FCHOWNAT		284
-#define	AUE_FUTIMESAT		285
-#define	AUE_UNLINKAT		286
-#define	AUE_CLOCK_SETTIME	287
-#define	AUE_NTP_ADJTIME		288
-#define	AUE_SETPPRIV		289	/* Solaris-specific. */
-#define	AUE_MODDEVPLCY		290	/* Solaris-specific. */
-#define	AUE_MODADDPRIV		291	/* Solaris-specific. */
-#define	AUE_CRYPTOADM		292	/* Solaris-specific. */
-#define	AUE_CONFIGKSSL		293	/* Solaris-specific. */
-#define	AUE_BRANDSYS		294	/* Solaris-specific. */
-#define	AUE_PF_POLICY_ADDRULE	295	/* Solaris-specific. */
-#define	AUE_PF_POLICY_DELRULE	296	/* Solaris-specific. */
-#define	AUE_PF_POLICY_CLONE	297	/* Solaris-specific. */
-#define	AUE_PF_POLICY_FLIP	298	/* Solaris-specific. */
-#define	AUE_PF_POLICY_FLUSH	299	/* Solaris-specific. */
-#define	AUE_PF_POLICY_ALGS	300	/* Solaris-specific. */
-#define	AUE_PORTFS		301	/* Solaris-specific. */
-
-/*
- * Events added for Apple Darwin that potentially collide with future Solaris
- * BSM events.  These are assigned AUE_DARWIN prefixes, and are deprecated in
- * new trails.  Systems generating these events should switch to the new
- * identifiers that avoid colliding with the Solaris identifier space.
- */
-#define	AUE_DARWIN_GETFSSTAT	301
-#define	AUE_DARWIN_PTRACE	302
-#define	AUE_DARWIN_CHFLAGS	303
-#define	AUE_DARWIN_FCHFLAGS	304
-#define	AUE_DARWIN_PROFILE	305
-#define	AUE_DARWIN_KTRACE	306
-#define	AUE_DARWIN_SETLOGIN	307
-#define	AUE_DARWIN_REBOOT	308
-#define	AUE_DARWIN_REVOKE	309
-#define	AUE_DARWIN_UMASK	310
-#define	AUE_DARWIN_MPROTECT	311
-#define	AUE_DARWIN_SETPRIORITY	312
-#define	AUE_DARWIN_SETTIMEOFDAY	313
-#define	AUE_DARWIN_FLOCK	314
-#define	AUE_DARWIN_MKFIFO	315
-#define	AUE_DARWIN_POLL		316
-#define	AUE_DARWIN_SOCKETPAIR	317
-#define	AUE_DARWIN_FUTIMES	318
-#define	AUE_DARWIN_SETSID	319
-#define	AUE_DARWIN_SETPRIVEXEC	320	/* Darwin-specific. */
-#define	AUE_DARWIN_NFSSVC	321
-#define	AUE_DARWIN_GETFH	322
-#define	AUE_DARWIN_QUOTACTL	323
-#define	AUE_DARWIN_ADDPROFILE	324	/* Darwin-specific. */
-#define	AUE_DARWIN_KDEBUGTRACE	325	/* Darwin-specific. */
-#define	AUE_DARWIN_KDBUGTRACE	AUE_KDEBUGTRACE
-#define	AUE_DARWIN_FSTAT	326
-#define	AUE_DARWIN_FPATHCONF	327
-#define	AUE_DARWIN_GETDIRENTRIES	328
-#define	AUE_DARWIN_TRUNCATE	329
-#define	AUE_DARWIN_FTRUNCATE	330
-#define	AUE_DARWIN_SYSCTL	331
-#define	AUE_DARWIN_MLOCK	332
-#define	AUE_DARWIN_MUNLOCK	333
-#define	AUE_DARWIN_UNDELETE	334
-#define	AUE_DARWIN_GETATTRLIST	335	/* Darwin-specific. */
-#define	AUE_DARWIN_SETATTRLIST	336	/* Darwin-specific. */
-#define	AUE_DARWIN_GETDIRENTRIESATTR	337	/* Darwin-specific. */
-#define	AUE_DARWIN_EXCHANGEDATA	338	/* Darwin-specific. */
-#define	AUE_DARWIN_SEARCHFS	339	/* Darwin-specific. */
-#define	AUE_DARWIN_MINHERIT	340
-#define	AUE_DARWIN_SEMCONFIG	341
-#define	AUE_DARWIN_SEMOPEN	342
-#define	AUE_DARWIN_SEMCLOSE	343
-#define	AUE_DARWIN_SEMUNLINK	344
-#define	AUE_DARWIN_SHMOPEN	345
-#define	AUE_DARWIN_SHMUNLINK	346
-#define	AUE_DARWIN_LOADSHFILE	347	/* Darwin-specific. */
-#define	AUE_DARWIN_RESETSHFILE	348	/* Darwin-specific. */
-#define	AUE_DARWIN_NEWSYSTEMSHREG	349	/* Darwin-specific. */
-#define	AUE_DARWIN_PTHREADKILL	350	/* Darwin-specific. */
-#define	AUE_DARWIN_PTHREADSIGMASK	351	/* Darwin-specific. */
-#define	AUE_DARWIN_AUDITCTL	352
-#define	AUE_DARWIN_RFORK	353
-#define	AUE_DARWIN_LCHMOD	354
-#define	AUE_DARWIN_SWAPOFF	355
-#define	AUE_DARWIN_INITPROCESS	356	/* Darwin-specific. */
-#define	AUE_DARWIN_MAPFD	357	/* Darwin-specific. */
-#define	AUE_DARWIN_TASKFORPID	358	/* Darwin-specific. */
-#define	AUE_DARWIN_PIDFORTASK	359	/* Darwin-specific. */
-#define	AUE_DARWIN_SYSCTL_NONADMIN	360
-#define	AUE_DARWIN_COPYFILE	361	/* Darwin-specific. */
-
-/*
- * Audit event identifiers added as part of OpenBSM, generally corresponding
- * to events in FreeBSD, Darwin, and Linux that were not present in Solaris.
- * These often duplicate events added to the Solaris set by Darwin, but use
- * event identifiers in a higher range in order to avoid colliding with
- * future Solaris additions.
- *
- * If an event in this section is later added to Solaris, we prefer the
- * Solaris event identifier, and add _OPENBSM_ to the OpenBSM-specific
- * identifier so that old trails can still be processed, but new trails use
- * the Solaris identifier.
- */
-#define	AUE_GETFSSTAT		43001
-#define	AUE_PTRACE		43002
-#define	AUE_CHFLAGS		43003
-#define	AUE_FCHFLAGS		43004
-#define	AUE_PROFILE		43005
-#define	AUE_KTRACE		43006
-#define	AUE_SETLOGIN		43007
-#define	AUE_OPENBSM_REVOKE	43008	/* Solaris event now preferred. */
-#define	AUE_UMASK		43009
-#define	AUE_MPROTECT		43010
-#define	AUE_MKFIFO		43011
-#define	AUE_POLL		43012
-#define	AUE_FUTIMES		43013
-#define	AUE_SETSID		43014
-#define	AUE_SETPRIVEXEC		43015	/* Darwin-specific. */
-#define	AUE_ADDPROFILE		43016	/* Darwin-specific. */
-#define	AUE_KDEBUGTRACE		43017	/* Darwin-specific. */
-#define	AUE_KDBUGTRACE		AUE_KDEBUGTRACE
-#define	AUE_OPENBSM_FSTAT	43018	/* Solaris event now preferred. */
-#define	AUE_FPATHCONF		43019
-#define	AUE_GETDIRENTRIES	43020
-#define	AUE_SYSCTL		43021
-#define	AUE_MLOCK		43022
-#define	AUE_MUNLOCK		43023
-#define	AUE_UNDELETE		43024
-#define	AUE_GETATTRLIST		43025	/* Darwin-specific. */
-#define	AUE_SETATTRLIST		43026	/* Darwin-specific. */
-#define	AUE_GETDIRENTRIESATTR	43027	/* Darwin-specific. */
-#define	AUE_EXCHANGEDATA	43028	/* Darwin-specific. */
-#define	AUE_SEARCHFS		43029	/* Darwin-specific. */
-#define	AUE_MINHERIT		43030
-#define	AUE_SEMCONFIG		43031
-#define	AUE_SEMOPEN		43032
-#define	AUE_SEMCLOSE		43033
-#define	AUE_SEMUNLINK		43034
-#define	AUE_SHMOPEN		43035
-#define	AUE_SHMUNLINK		43036
-#define	AUE_LOADSHFILE		43037	/* Darwin-specific. */
-#define	AUE_RESETSHFILE		43038	/* Darwin-specific. */
-#define	AUE_NEWSYSTEMSHREG	43039	/* Darwin-specific. */
-#define	AUE_PTHREADKILL		43040	/* Darwin-specific. */
-#define	AUE_PTHREADSIGMASK	43041	/* Darwin-specific. */
-#define	AUE_AUDITCTL		43042
-#define	AUE_RFORK		43043
-#define	AUE_LCHMOD		43044
-#define	AUE_SWAPOFF		43045
-#define	AUE_INITPROCESS		43046	/* Darwin-specific. */
-#define	AUE_MAPFD		43047	/* Darwin-specific. */
-#define	AUE_TASKFORPID		43048	/* Darwin-specific. */
-#define	AUE_PIDFORTASK		43049	/* Darwin-specific. */
-#define	AUE_SYSCTL_NONADMIN	43050
-#define	AUE_COPYFILE		43051	/* Darwin-specific. */
-
-/*
- * Events added to OpenBSM for FreeBSD and Linux; may also be used by Darwin
- * in the future.
- */
-#define	AUE_LUTIMES		43052
-#define	AUE_LCHFLAGS		43053	/* FreeBSD-specific. */
-#define	AUE_SENDFILE		43054	/* BSD/Linux-specific. */
-#define	AUE_USELIB		43055	/* Linux-specific. */
-#define	AUE_GETRESUID		43056
-#define	AUE_SETRESUID		43057
-#define	AUE_GETRESGID		43058
-#define	AUE_SETRESGID		43059
-#define	AUE_WAIT4		43060	/* FreeBSD-specific. */
-#define	AUE_LGETFH		43061	/* FreeBSD-specific. */
-#define	AUE_FHSTATFS		43062	/* FreeBSD-specific. */
-#define	AUE_FHOPEN		43063	/* FreeBSD-specific. */
-#define	AUE_FHSTAT		43064	/* FreeBSD-specific. */
-#define	AUE_JAIL		43065	/* FreeBSD-specific. */
-#define	AUE_EACCESS		43066	/* FreeBSD-specific. */
-#define	AUE_KQUEUE		43067	/* FreeBSD-specific. */
-#define	AUE_KEVENT		43068	/* FreeBSD-specific. */
-#define	AUE_FSYNC		43069
-#define	AUE_NMOUNT		43070	/* FreeBSD-specific. */
-#define	AUE_BDFLUSH		43071	/* Linux-specific. */
-#define	AUE_SETFSUID		43072	/* Linux-specific. */
-#define	AUE_SETFSGID		43073	/* Linux-specific. */
-#define	AUE_PERSONALITY		43074	/* Linux-specific. */
-#define	AUE_SCHED_GETSCHEDULER	43075	/* POSIX.1b. */
-#define	AUE_SCHED_SETSCHEDULER	43076	/* POSIX.1b. */
-#define	AUE_PRCTL		43077	/* Linux-specific. */
-#define	AUE_GETCWD		43078	/* FreeBSD/Linux-specific. */
-#define	AUE_CAPGET		43079	/* Linux-specific. */
-#define	AUE_CAPSET		43080	/* Linux-specific. */
-#define	AUE_PIVOT_ROOT		43081	/* Linux-specific. */
-#define	AUE_RTPRIO		43082	/* FreeBSD-specific. */
-#define	AUE_SCHED_GETPARAM	43083	/* POSIX.1b. */
-#define	AUE_SCHED_SETPARAM	43084	/* POSIX.1b. */
-#define	AUE_SCHED_GET_PRIORITY_MAX	43085	/* POSIX.1b. */
-#define	AUE_SCHED_GET_PRIORITY_MIN	43086	/* POSIX.1b. */
-#define	AUE_SCHED_RR_GET_INTERVAL	43087	/* POSIX.1b. */
-#define	AUE_ACL_GET_FILE	43088	/* FreeBSD. */
-#define	AUE_ACL_SET_FILE	43089	/* FreeBSD. */
-#define	AUE_ACL_GET_FD		43090	/* FreeBSD. */
-#define	AUE_ACL_SET_FD		43091	/* FreeBSD. */
-#define	AUE_ACL_DELETE_FILE	43092	/* FreeBSD. */
-#define	AUE_ACL_DELETE_FD	43093	/* FreeBSD. */
-#define	AUE_ACL_CHECK_FILE	43094	/* FreeBSD. */
-#define	AUE_ACL_CHECK_FD	43095	/* FreeBSD. */
-#define	AUE_ACL_GET_LINK	43096	/* FreeBSD. */
-#define	AUE_ACL_SET_LINK	43097	/* FreeBSD. */
-#define	AUE_ACL_DELETE_LINK	43098	/* FreeBSD. */
-#define	AUE_ACL_CHECK_LINK	43099	/* FreeBSD. */
-#define	AUE_SYSARCH		43100	/* FreeBSD. */
-#define	AUE_EXTATTRCTL		43101	/* FreeBSD. */
-#define	AUE_EXTATTR_GET_FILE	43102	/* FreeBSD. */
-#define	AUE_EXTATTR_SET_FILE	43103	/* FreeBSD. */
-#define	AUE_EXTATTR_LIST_FILE	43104	/* FreeBSD. */
-#define	AUE_EXTATTR_DELETE_FILE	43105	/* FreeBSD. */
-#define	AUE_EXTATTR_GET_FD	43106	/* FreeBSD. */
-#define	AUE_EXTATTR_SET_FD	43107	/* FreeBSD. */
-#define	AUE_EXTATTR_LIST_FD	43108	/* FreeBSD. */
-#define	AUE_EXTATTR_DELETE_FD	43109	/* FreeBSD. */
-#define	AUE_EXTATTR_GET_LINK	43110	/* FreeBSD. */
-#define	AUE_EXTATTR_SET_LINK	43111	/* FreeBSD. */
-#define	AUE_EXTATTR_LIST_LINK	43112	/* FreeBSD. */
-#define	AUE_EXTATTR_DELETE_LINK	43113	/* FreeBSD. */
-#define	AUE_KENV		43114	/* FreeBSD. */
-#define	AUE_JAIL_ATTACH		43115	/* FreeBSD. */
-#define	AUE_SYSCTL_WRITE	43116	/* FreeBSD. */
-#define	AUE_IOPERM		43117	/* Linux. */
-#define	AUE_READDIR		43118	/* Linux. */
-#define	AUE_IOPL		43119	/* Linux. */
-#define	AUE_VM86		43120	/* Linux. */
-#define	AUE_MAC_GET_PROC	43121	/* FreeBSD/Darwin. */
-#define	AUE_MAC_SET_PROC	43122	/* FreeBSD/Darwin. */
-#define	AUE_MAC_GET_FD		43123	/* FreeBSD/Darwin. */
-#define	AUE_MAC_GET_FILE	43124	/* FreeBSD/Darwin. */
-#define	AUE_MAC_SET_FD		43125	/* FreeBSD/Darwin. */
-#define	AUE_MAC_SET_FILE	43126	/* FreeBSD/Darwin. */
-#define	AUE_MAC_SYSCALL		43127	/* FreeBSD. */
-#define	AUE_MAC_GET_PID		43128	/* FreeBSD/Darwin. */
-#define	AUE_MAC_GET_LINK	43129	/* FreeBSD/Darwin. */
-#define	AUE_MAC_SET_LINK	43130	/* FreeBSD/Darwin. */
-#define	AUE_MAC_EXECVE		43131	/* FreeBSD/Darwin. */
-#define	AUE_GETPATH_FROMFD	43132	/* FreeBSD. */
-#define	AUE_GETPATH_FROMADDR	43133	/* FreeBSD. */
-#define	AUE_MQ_OPEN		43134	/* FreeBSD. */
-#define	AUE_MQ_SETATTR		43135	/* FreeBSD. */
-#define	AUE_MQ_TIMEDRECEIVE	43136	/* FreeBSD. */
-#define	AUE_MQ_TIMEDSEND	43137	/* FreeBSD. */
-#define	AUE_MQ_NOTIFY		43138	/* FreeBSD. */
-#define	AUE_MQ_UNLINK		43139	/* FreeBSD. */
-#define	AUE_LISTEN		43140	/* FreeBSD/Darwin/Linux. */
-#define	AUE_MLOCKALL		43141	/* FreeBSD. */
-#define	AUE_MUNLOCKALL		43142	/* FreeBSD. */
-#define	AUE_CLOSEFROM		43143	/* FreeBSD. */
-#define	AUE_FEXECVE		43144	/* FreeBSD. */
-#define	AUE_FACCESSAT		43145	/* FreeBSD. */
-#define	AUE_FCHMODAT		43146	/* FreeBSD. */
-#define	AUE_LINKAT		43147	/* FreeBSD. */
-#define	AUE_MKDIRAT		43148	/* FreeBSD. */
-#define	AUE_MKFIFOAT		43149	/* FreeBSD. */
-#define	AUE_MKNODAT		43150	/* FreeBSD. */
-#define	AUE_READLINKAT		43151	/* FreeBSD. */
-#define	AUE_SYMLINKAT		43152	/* FreeBSD. */
-#define	AUE_MAC_GETFSSTAT	43153	/* Darwin. */
-#define	AUE_MAC_GET_MOUNT	43154	/* Darwin. */
-#define	AUE_MAC_GET_LCID	43155	/* Darwin. */
-#define	AUE_MAC_GET_LCTX	43156	/* Darwin. */
-#define	AUE_MAC_SET_LCTX	43157	/* Darwin. */
-#define	AUE_MAC_MOUNT		43158	/* Darwin. */
-#define	AUE_GETLCID		43159	/* Darwin. */
-#define	AUE_SETLCID		43160	/* Darwin. */
-#define	AUE_TASKNAMEFORPID	43161	/* Darwin. */
-#define	AUE_ACCESS_EXTENDED	43162	/* Darwin. */
-#define	AUE_CHMOD_EXTENDED	43163	/* Darwin. */
-#define	AUE_FCHMOD_EXTENDED	43164	/* Darwin. */
-#define	AUE_FSTAT_EXTENDED	43165	/* Darwin. */
-#define	AUE_LSTAT_EXTENDED	43166	/* Darwin. */
-#define	AUE_MKDIR_EXTENDED	43167	/* Darwin. */
-#define	AUE_MKFIFO_EXTENDED	43168	/* Darwin. */
-#define	AUE_OPEN_EXTENDED	43169	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_R	43170	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_RC	43171	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_RT	43172	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_RTC	43173	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_W	43174	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_WC	43175	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_WT	43176	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_WTC	43177	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_RW	43178	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_RWC	43179	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_RWT	43180	/* Darwin. */
-#define	AUE_OPEN_EXTENDED_RWTC	43181	/* Darwin. */
-#define	AUE_STAT_EXTENDED	43182	/* Darwin. */
-#define	AUE_UMASK_EXTENDED	43183	/* Darwin. */
-#define	AUE_OPENAT		43184	/* FreeBSD. */
-#define	AUE_POSIX_OPENPT	43185	/* FreeBSD. */
-#define	AUE_CAP_NEW		43186	/* TrustedBSD. */
-#define	AUE_CAP_RIGHTS_GET	43187	/* TrustedBSD. */
-#define	AUE_CAP_GETRIGHTS	AUE_CAP_RIGHTS_GET
-#define	AUE_CAP_ENTER		43188	/* TrustedBSD. */
-#define	AUE_CAP_GETMODE		43189	/* TrustedBSD. */
-#define	AUE_POSIX_SPAWN		43190	/* Darwin. */
-#define	AUE_FSGETPATH		43191	/* Darwin. */
-#define	AUE_PREAD		43192	/* Darwin/FreeBSD. */
-#define	AUE_PWRITE		43193	/* Darwin/FreeBSD. */
-#define	AUE_FSCTL		43194	/* Darwin. */
-#define	AUE_FFSCTL		43195	/* Darwin. */
-#define	AUE_LPATHCONF		43196	/* FreeBSD. */
-#define	AUE_PDFORK		43197	/* FreeBSD. */
-#define	AUE_PDKILL		43198	/* FreeBSD. */
-#define	AUE_PDGETPID		43199	/* FreeBSD. */
-#define	AUE_PDWAIT		43200	/* FreeBSD. */
-#define	AUE_WAIT6		43201	/* FreeBSD. */
-#define	AUE_CAP_RIGHTS_LIMIT	43202	/* TrustedBSD. */
-#define	AUE_CAP_IOCTLS_LIMIT	43203	/* TrustedBSD. */
-#define	AUE_CAP_IOCTLS_GET	43204	/* TrustedBSD. */
-#define	AUE_CAP_FCNTLS_LIMIT	43205	/* TrustedBSD. */
-#define	AUE_CAP_FCNTLS_GET	43206	/* TrustedBSD. */
-#define	AUE_BINDAT		43207	/* TrustedBSD. */
-#define	AUE_CONNECTAT		43208	/* TrustedBSD. */
-#define	AUE_CHFLAGSAT		43209	/* FreeBSD-specific. */
-
-/*
- * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
- * normal Solaris BSM identifiers.  _O_ refers to it being an old, or compat
- * interface.  In most cases, Darwin has never implemented these system calls
- * but picked up the fields in their system call table from their FreeBSD
- * import.  Happily, these have different names than the AUE_O* definitions
- * in Solaris BSM.
- */
-#define	AUE_O_CREAT		AUE_OPEN_RWTC	/* Darwin */
-#define	AUE_O_EXECVE		AUE_NULL	/* Darwin */
-#define	AUE_O_SBREAK		AUE_NULL	/* Darwin */
-#define	AUE_O_LSEEK		AUE_NULL	/* Darwin */
-#define	AUE_O_MOUNT		AUE_NULL	/* Darwin */
-#define	AUE_O_UMOUNT		AUE_NULL	/* Darwin */
-#define	AUE_O_STAT		AUE_STAT	/* Darwin */
-#define	AUE_O_LSTAT		AUE_LSTAT	/* Darwin */
-#define	AUE_O_FSTAT		AUE_FSTAT	/* Darwin */
-#define	AUE_O_GETPAGESIZE	AUE_NULL	/* Darwin */
-#define	AUE_O_VREAD		AUE_NULL	/* Darwin */
-#define	AUE_O_VWRITE		AUE_NULL	/* Darwin */
-#define	AUE_O_MMAP		AUE_MMAP	/* Darwin */
-#define	AUE_O_VADVISE		AUE_NULL	/* Darwin */
-#define	AUE_O_VHANGUP		AUE_NULL	/* Darwin */
-#define	AUE_O_VLIMIT		AUE_NULL	/* Darwin */
-#define	AUE_O_WAIT		AUE_NULL	/* Darwin */
-#define	AUE_O_GETHOSTNAME	AUE_NULL	/* Darwin */
-#define	AUE_O_SETHOSTNAME	AUE_SYSCTL	/* Darwin */
-#define	AUE_O_GETDOPT		AUE_NULL	/* Darwin */
-#define	AUE_O_SETDOPT		AUE_NULL	/* Darwin */
-#define	AUE_O_ACCEPT		AUE_NULL	/* Darwin */
-#define	AUE_O_SEND		AUE_SENDMSG	/* Darwin */
-#define	AUE_O_RECV		AUE_RECVMSG	/* Darwin */
-#define	AUE_O_VTIMES		AUE_NULL	/* Darwin */
-#define	AUE_O_SIGVEC		AUE_NULL	/* Darwin */
-#define	AUE_O_SIGBLOCK		AUE_NULL	/* Darwin */
-#define	AUE_O_SIGSETMASK	AUE_NULL	/* Darwin */
-#define	AUE_O_SIGSTACK		AUE_NULL	/* Darwin */
-#define	AUE_O_RECVMSG		AUE_RECVMSG	/* Darwin */
-#define	AUE_O_SENDMSG		AUE_SENDMSG	/* Darwin */
-#define	AUE_O_VTRACE		AUE_NULL	/* Darwin */
-#define	AUE_O_RESUBA		AUE_NULL	/* Darwin */
-#define	AUE_O_RECVFROM		AUE_RECVFROM	/* Darwin */
-#define	AUE_O_SETREUID		AUE_SETREUID	/* Darwin */
-#define	AUE_O_SETREGID		AUE_SETREGID	/* Darwin */
-#define	AUE_O_GETDIRENTRIES	AUE_GETDIRENTRIES	/* Darwin */
-#define	AUE_O_TRUNCATE		AUE_TRUNCATE	/* Darwin */
-#define	AUE_O_FTRUNCATE		AUE_FTRUNCATE	/* Darwin */
-#define	AUE_O_GETPEERNAME	AUE_NULL	/* Darwin */
-#define	AUE_O_GETHOSTID		AUE_NULL	/* Darwin */
-#define	AUE_O_SETHOSTID		AUE_NULL	/* Darwin */
-#define	AUE_O_GETRLIMIT		AUE_NULL	/* Darwin */
-#define	AUE_O_SETRLIMIT		AUE_SETRLIMIT	/* Darwin */
-#define	AUE_O_KILLPG		AUE_KILL	/* Darwin */
-#define	AUE_O_SETQUOTA		AUE_NULL	/* Darwin */
-#define	AUE_O_QUOTA		AUE_NULL	/* Darwin */
-#define	AUE_O_GETSOCKNAME	AUE_NULL	/* Darwin */
-#define	AUE_O_GETDIREENTRIES	AUE_GETDIREENTRIES	/* Darwin */
-#define	AUE_O_ASYNCDAEMON	AUE_NULL	/* Darwin */
-#define	AUE_O_GETDOMAINNAME	AUE_NULL	/* Darwin */
-#define	AUE_O_SETDOMAINNAME	AUE_SYSCTL	/* Darwin */
-#define	AUE_O_PCFS_MOUNT	AUE_NULL	/* Darwin */
-#define	AUE_O_EXPORTFS		AUE_NULL	/* Darwin */
-#define	AUE_O_USTATE		AUE_NULL	/* Darwin */
-#define	AUE_O_WAIT3		AUE_NULL	/* Darwin */
-#define	AUE_O_RPAUSE		AUE_NULL	/* Darwin */
-#define	AUE_O_GETDENTS		AUE_NULL	/* Darwin */
-
-/*
- * Possible desired future values based on review of BSD/Darwin system calls.
- */
-#define	AUE_ATGETMSG		AUE_NULL
-#define	AUE_ATPUTMSG		AUE_NULL
-#define	AUE_ATSOCKET		AUE_NULL
-#define	AUE_ATPGETREQ		AUE_NULL
-#define	AUE_ATPGETRSP		AUE_NULL
-#define	AUE_ATPSNDREQ		AUE_NULL
-#define	AUE_ATPSNDRSP		AUE_NULL
-#define	AUE_BSDTHREADCREATE	AUE_NULL
-#define	AUE_BSDTHREADTERMINATE	AUE_NULL
-#define	AUE_BSDTHREADREGISTER	AUE_NULL
-#define	AUE_CHUD		AUE_NULL
-#define	AUE_CSOPS		AUE_NULL
-#define	AUE_DUP			AUE_NULL
-#define	AUE_FDATASYNC		AUE_NULL
-#define	AUE_FGETATTRLIST	AUE_NULL
-#define	AUE_FGETXATTR		AUE_NULL
-#define	AUE_FLISTXATTR		AUE_NULL
-#define	AUE_FREMOVEXATTR	AUE_NULL
-#define	AUE_FSETATTRLIST	AUE_NULL
-#define	AUE_FSETXATTR		AUE_NULL
-#define	AUE_FSTATFS64		AUE_NULL
-#define	AUE_FSTATV		AUE_NULL
-#define	AUE_FSTAT64		AUE_NULL
-#define	AUE_FSTAT64_EXTENDED	AUE_NULL
-#define	AUE_GCCONTROL		AUE_NULL
-#define	AUE_GETDIRENTRIES64	AUE_NULL
-#define	AUE_GETDTABLESIZE	AUE_NULL
-#define	AUE_GETEGID		AUE_NULL
-#define	AUE_GETEUID		AUE_NULL
-#define	AUE_GETFSSTAT64		AUE_NULL
-#define	AUE_GETGID		AUE_NULL
-#define	AUE_GETGROUPS		AUE_NULL
-#define	AUE_GETITIMER		AUE_NULL
-#define	AUE_GETLOGIN		AUE_NULL
-#define	AUE_GETPEERNAME		AUE_NULL
-#define	AUE_GETPGID		AUE_NULL
-#define	AUE_GETPGRP		AUE_NULL
-#define	AUE_GETPID		AUE_NULL
-#define	AUE_GETPPID		AUE_NULL
-#define	AUE_GETPRIORITY		AUE_NULL
-#define	AUE_GETRLIMIT		AUE_NULL
-#define	AUE_GETRUSAGE		AUE_NULL
-#define	AUE_GETSGROUPS		AUE_NULL
-#define	AUE_GETSID		AUE_NULL
-#define	AUE_GETSOCKNAME		AUE_NULL
-#define	AUE_GETTIMEOFDAY	AUE_NULL
-#define	AUE_GETTID		AUE_NULL
-#define	AUE_GETUID		AUE_NULL
-#define	AUE_GETSOCKOPT		AUE_NULL
-#define	AUE_GETWGROUPS		AUE_NULL
-#define	AUE_GETXATTR		AUE_NULL
-#define	AUE_IDENTITYSVC		AUE_NULL
-#define	AUE_INITGROUPS		AUE_NULL
-#define	AUE_IOPOLICYSYS		AUE_NULL
-#define	AUE_ISSETUGID		AUE_NULL
-#define	AUE_LIOLISTIO		AUE_NULL
-#define	AUE_LISTXATTR		AUE_NULL
-#define	AUE_LSTATV		AUE_NULL
-#define	AUE_LSTAT64		AUE_NULL
-#define	AUE_LSTAT64_EXTENDED	AUE_NULL
-#define	AUE_MADVISE		AUE_NULL
-#define	AUE_MINCORE		AUE_NULL
-#define	AUE_MKCOMPLEX		AUE_NULL
-#define	AUE_MODWATCH		AUE_NULL
-#define	AUE_MSGCL		AUE_NULL
-#define	AUE_MSYNC		AUE_NULL
-#define	AUE_PREADV		AUE_NULL
-#define	AUE_PROCINFO		AUE_NULL
-#define	AUE_PTHREADCANCELED	AUE_NULL
-#define	AUE_PTHREADCHDIR	AUE_NULL
-#define	AUE_PTHREADCONDBROADCAST	AUE_NULL
-#define	AUE_PTHREADCONDDESTORY	AUE_NULL
-#define	AUE_PTHREADCONDINIT	AUE_NULL
-#define	AUE_PTHREADCONDSIGNAL	AUE_NULL
-#define	AUE_PTHREADCONDWAIT	AUE_NULL
-#define	AUE_PTHREADFCHDIR	AUE_NULL
-#define	AUE_PTHREADMARK		AUE_NULL
-#define	AUE_PTHREADMUTEXDESTROY	AUE_NULL
-#define	AUE_PTHREADMUTEXINIT	AUE_NULL
-#define	AUE_PTHREADMUTEXTRYLOCK	AUE_NULL
-#define	AUE_PTHREADMUTEXUNLOCK	AUE_NULL
-#define	AUE_PWRITEV		AUE_NULL
-#define	AUE_REMOVEXATTR		AUE_NULL
-#define	AUE_SBRK		AUE_NULL
-#define	AUE_SELECT		AUE_NULL
-#define	AUE_SEMDESTROY		AUE_NULL
-#define	AUE_SEMGETVALUE		AUE_NULL
-#define	AUE_SEMINIT		AUE_NULL
-#define	AUE_SEMPOST		AUE_NULL
-#define	AUE_SEMTRYWAIT		AUE_NULL
-#define	AUE_SEMWAIT		AUE_NULL
-#define	AUE_SEMWAITSIGNAL	AUE_NULL
-#define	AUE_SETITIMER		AUE_NULL
-#define	AUE_SETSGROUPS		AUE_NULL
-#define	AUE_SETTID		AUE_NULL
-#define	AUE_SETTIDWITHPID	AUE_NULL
-#define	AUE_SETWGROUPS		AUE_NULL
-#define	AUE_SETXATTR		AUE_NULL
-#define	AUE_SHAREDREGIONCHECK	AUE_NULL
-#define	AUE_SHAREDREGIONMAP	AUE_NULL
-#define	AUE_SIGACTION		AUE_NULL
-#define	AUE_SIGALTSTACK		AUE_NULL
-#define	AUE_SIGPENDING		AUE_NULL
-#define	AUE_SIGPROCMASK		AUE_NULL
-#define	AUE_SIGRETURN		AUE_NULL
-#define	AUE_SIGSUSPEND		AUE_NULL
-#define	AUE_SIGWAIT		AUE_NULL
-#define	AUE_SSTK		AUE_NULL
-#define	AUE_STACKSNAPSHOT	AUE_NULL
-#define	AUE_STATFS64		AUE_NULL
-#define	AUE_STATV		AUE_NULL
-#define	AUE_STAT64		AUE_NULL
-#define	AUE_STAT64_EXTENDED	AUE_NULL
-#define	AUE_SYNC		AUE_NULL
-#define	AUE_SYSCALL		AUE_NULL
-#define	AUE_TABLE		AUE_NULL
-#define	AUE_VMPRESSUREMONITOR	AUE_NULL
-#define	AUE_WAITEVENT		AUE_NULL
-#define	AUE_WAITID		AUE_NULL
-#define	AUE_WATCHEVENT		AUE_NULL
-#define	AUE_WORKQOPEN		AUE_NULL
-#define	AUE_WORKQOPS		AUE_NULL
-
-#endif /* !_BSM_AUDIT_KEVENTS_H_ */
diff --git a/include.new/bsm/audit_record.h b/include.new/bsm/audit_record.h
deleted file mode 100644
index c2fc3b6..0000000
--- a/include.new/bsm/audit_record.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/*-
- * Copyright (c) 2005-2009 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10
- * $FreeBSD: releng/10.2/sys/bsm/audit_record.h 255219 2013-09-05 00:09:56Z pjd $
- */
-
-#ifndef _BSM_AUDIT_RECORD_H_
-#define _BSM_AUDIT_RECORD_H_
-
-#include <sys/time.h>			/* struct timeval */
-#include <sys/caprights.h>		/* cap_rights_t */
-
-/*
- * Token type identifiers.
- */
-#define	AUT_INVALID		0x00
-#define	AUT_OTHER_FILE32	0x11
-#define	AUT_OHEADER		0x12
-#define	AUT_TRAILER		0x13
-#define	AUT_HEADER32		0x14
-#define	AUT_HEADER32_EX		0x15
-#define	AUT_DATA		0x21
-#define	AUT_IPC			0x22
-#define	AUT_PATH		0x23
-#define	AUT_SUBJECT32		0x24
-#define	AUT_XATPATH		0x25
-#define	AUT_PROCESS32		0x26
-#define	AUT_RETURN32		0x27
-#define	AUT_TEXT		0x28
-#define	AUT_OPAQUE		0x29
-#define	AUT_IN_ADDR		0x2a
-#define	AUT_IP			0x2b
-#define	AUT_IPORT		0x2c
-#define	AUT_ARG32		0x2d
-#define	AUT_SOCKET		0x2e
-#define	AUT_SEQ			0x2f
-#define	AUT_ACL			0x30
-#define	AUT_ATTR		0x31
-#define	AUT_IPC_PERM		0x32
-#define	AUT_LABEL		0x33
-#define	AUT_GROUPS		0x34
-#define	AUT_ACE			0x35
-#define	AUT_PRIV		0x38
-#define	AUT_UPRIV		0x39
-#define	AUT_LIAISON		0x3a
-#define	AUT_NEWGROUPS		0x3b
-#define	AUT_EXEC_ARGS		0x3c
-#define	AUT_EXEC_ENV		0x3d
-#define	AUT_ATTR32		0x3e
-#define	AUT_UNAUTH		0x3f
-#define	AUT_XATOM		0x40
-#define	AUT_XOBJ		0x41
-#define	AUT_XPROTO		0x42
-#define	AUT_XSELECT		0x43
-#define	AUT_XCOLORMAP		0x44
-#define	AUT_XCURSOR		0x45
-#define	AUT_XFONT		0x46
-#define	AUT_XGC			0x47
-#define	AUT_XPIXMAP		0x48
-#define	AUT_XPROPERTY		0x49
-#define	AUT_XWINDOW		0x4a
-#define	AUT_XCLIENT		0x4b
-#define	AUT_CMD			0x51
-#define	AUT_EXIT		0x52
-#define	AUT_ZONENAME		0x60
-#define	AUT_HOST		0x70
-#define	AUT_ARG64		0x71
-#define	AUT_RETURN64		0x72
-#define	AUT_ATTR64		0x73
-#define	AUT_HEADER64		0x74
-#define	AUT_SUBJECT64		0x75
-#define	AUT_PROCESS64		0x77
-#define	AUT_OTHER_FILE64	0x78
-#define	AUT_HEADER64_EX		0x79
-#define	AUT_SUBJECT32_EX	0x7a
-#define	AUT_PROCESS32_EX	0x7b
-#define	AUT_SUBJECT64_EX	0x7c
-#define	AUT_PROCESS64_EX	0x7d
-#define	AUT_IN_ADDR_EX		0x7e
-#define	AUT_SOCKET_EX		0x7f
-
-/*
- * Pre-64-bit BSM, 32-bit tokens weren't explicitly named as '32'.  We have
- * compatibility defines.
- */
-#define	AUT_HEADER		AUT_HEADER32
-#define	AUT_ARG			AUT_ARG32
-#define	AUT_RETURN		AUT_RETURN32
-#define	AUT_SUBJECT		AUT_SUBJECT32
-#define	AUT_PROCESS		AUT_PROCESS32
-#define	AUT_OTHER_FILE		AUT_OTHER_FILE32
-
-/*
- * The values for the following token ids are not defined by BSM.
- *
- * XXXRW: Not sure how to handle these in OpenBSM yet, but I'll give them
- * names more consistent with Sun's BSM.  These originally came from Apple's
- * BSM.
- */
-#define	AUT_SOCKINET32		0x80		/* XXX */
-#define	AUT_SOCKINET128		0x81		/* XXX */
-#define	AUT_SOCKUNIX		0x82		/* XXX */
-
-#define	AUT_RIGHTS		0x83
-
-/* print values for the arbitrary token */
-#define AUP_BINARY      0
-#define AUP_OCTAL       1
-#define AUP_DECIMAL     2
-#define AUP_HEX         3
-#define AUP_STRING      4
-
-/* data-types for the arbitrary token */
-#define AUR_BYTE        0
-#define AUR_CHAR        AUR_BYTE
-#define AUR_SHORT       1
-#define AUR_INT32       2
-#define AUR_INT         AUR_INT32
-#define AUR_INT64       3
-
-/* ... and their sizes */
-#define AUR_BYTE_SIZE       sizeof(u_char)
-#define AUR_CHAR_SIZE       AUR_BYTE_SIZE
-#define AUR_SHORT_SIZE      sizeof(uint16_t)
-#define AUR_INT32_SIZE      sizeof(uint32_t)
-#define AUR_INT_SIZE        AUR_INT32_SIZE
-#define AUR_INT64_SIZE      sizeof(uint64_t)
-
-/* Modifiers for the header token */
-#define PAD_NOTATTR  0x4000   /* nonattributable event */
-#define PAD_FAILURE  0x8000   /* fail audit event */
-
-#define AUDIT_MAX_GROUPS      16
-
-/*
- * A number of BSM versions are floating around and defined.  Here are
- * constants for them.  OpenBSM uses the same token types, etc, used in the
- * Solaris BSM version, but has a separate version number in order to
- * identify a potentially different event identifier name space.
- */
-#define	AUDIT_HEADER_VERSION_OLDDARWIN	1	/* In retrospect, a mistake. */
-#define	AUDIT_HEADER_VERSION_SOLARIS	2
-#define	AUDIT_HEADER_VERSION_TSOL25	3
-#define	AUDIT_HEADER_VERSION_TSOL	4
-#define	AUDIT_HEADER_VERSION_OPENBSM10	10
-#define	AUDIT_HEADER_VERSION_OPENBSM11	11
-#define	AUDIT_HEADER_VERSION_OPENBSM	AUDIT_HEADER_VERSION_OPENBSM11
-
-#define	AUT_TRAILER_MAGIC	0xb105
-
-/* BSM library calls */
-
-__BEGIN_DECLS
-
-struct in_addr;
-struct in6_addr;
-struct ip;
-struct ipc_perm;
-struct kevent;
-struct sockaddr;
-struct sockaddr_in;
-struct sockaddr_in6;
-struct sockaddr_un;
-#if defined(_KERNEL) || defined(KERNEL)
-struct vnode_au_info;
-#endif
-
-int	 au_open(void);
-int	 au_write(int d, token_t *m);
-int	 au_close(int d, int keep, short event);
-int	 au_close_buffer(int d, short event, u_char *buffer, size_t *buflen);
-int	 au_close_token(token_t *tok, u_char *buffer, size_t *buflen);
-
-token_t	*au_to_file(const char *file, struct timeval tm);
-
-token_t	*au_to_header32_tm(int rec_size, au_event_t e_type, au_emod_t e_mod,
-	    struct timeval tm);
-token_t	*au_to_header32_ex_tm(int rec_size, au_event_t e_type, au_emod_t e_mod,
-	    struct timeval tm, struct auditinfo_addr *aia);
-token_t	*au_to_header64_tm(int rec_size, au_event_t e_type, au_emod_t e_mod,
-	    struct timeval tm);
-#if !defined(KERNEL) && !defined(_KERNEL)
-token_t	*au_to_header(int rec_size, au_event_t e_type, au_emod_t e_mod);
-token_t	*au_to_header_ex(int rec_size, au_event_t e_type, au_emod_t e_mod);
-token_t	*au_to_header32(int rec_size, au_event_t e_type, au_emod_t e_mod);
-token_t	*au_to_header64(int rec_size, au_event_t e_type, au_emod_t e_mod);
-token_t	*au_to_header32_ex(int rec_size, au_event_t e_type, au_emod_t e_mod);
-#endif
-
-token_t	*au_to_me(void);
-token_t	*au_to_arg(char n, const char *text, uint32_t v);
-token_t	*au_to_arg32(char n, const char *text, uint32_t v);
-token_t	*au_to_arg64(char n, const char *text, uint64_t v);
-
-#if defined(_KERNEL) || defined(KERNEL)
-token_t	*au_to_attr(struct vnode_au_info *vni);
-token_t	*au_to_attr32(struct vnode_au_info *vni);
-token_t	*au_to_attr64(struct vnode_au_info *vni);
-#endif
-
-token_t	*au_to_data(char unit_print, char unit_type, char unit_count,
-	    const char *p);
-token_t	*au_to_exit(int retval, int err);
-token_t	*au_to_groups(int *groups);
-token_t	*au_to_newgroups(uint16_t n, gid_t *groups);
-token_t	*au_to_in_addr(struct in_addr *internet_addr);
-token_t	*au_to_in_addr_ex(struct in6_addr *internet_addr);
-token_t	*au_to_ip(struct ip *ip);
-token_t	*au_to_ipc(char type, int id);
-token_t	*au_to_ipc_perm(struct ipc_perm *perm);
-token_t	*au_to_iport(uint16_t iport);
-token_t	*au_to_opaque(const char *data, uint16_t bytes);
-token_t	*au_to_path(const char *path);
-token_t	*au_to_privset(char *privtypestr, char *privstr);
-token_t	*au_to_process(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t	*au_to_process32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t	*au_to_process64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t	*au_to_process_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-token_t	*au_to_process32_ex(au_id_t auid, uid_t euid, gid_t egid,
-	    uid_t ruid, gid_t rgid, pid_t pid, au_asid_t sid,
-	    au_tid_addr_t *tid);
-token_t	*au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-token_t	*au_to_rights(cap_rights_t *rightsp);
-token_t	*au_to_return(char status, uint32_t ret);
-token_t	*au_to_return32(char status, uint32_t ret);
-token_t	*au_to_return64(char status, uint64_t ret);
-token_t	*au_to_seq(long audit_count);
-token_t	*au_to_socket_ex(u_short so_domain, u_short so_type,
-	    struct sockaddr *sa_local, struct sockaddr *sa_remote);
-token_t	*au_to_sock_inet(struct sockaddr_in *so);
-token_t	*au_to_sock_inet32(struct sockaddr_in *so);
-token_t	*au_to_sock_inet128(struct sockaddr_in6 *so);
-token_t	*au_to_sock_unix(struct sockaddr_un *so);
-token_t	*au_to_subject(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t	*au_to_subject32(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t	*au_to_subject64(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_t *tid);
-token_t	*au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-token_t	*au_to_subject32_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-token_t	*au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
-	    gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-#if defined(_KERNEL) || defined(KERNEL)
-token_t	*au_to_exec_args(char *args, int argc);
-token_t	*au_to_exec_env(char *envs, int envc);
-#else
-token_t	*au_to_exec_args(char **argv);
-token_t	*au_to_exec_env(char **envp);
-#endif
-token_t	*au_to_text(const char *text);
-token_t	*au_to_kevent(struct kevent *kev);
-token_t	*au_to_trailer(int rec_size);
-token_t	*au_to_upriv(char sorf, char *priv);
-token_t	*au_to_zonename(const char *zonename);
-
-/*
- * BSM library routines for converting between local and BSM constant spaces.
- */
-int	 au_bsm_to_domain(u_short bsm_domain, int *local_domainp);
-int	 au_bsm_to_errno(u_char bsm_error, int *errorp);
-int	 au_bsm_to_fcntl_cmd(u_short bsm_fcntl_cmd, int *local_fcntl_cmdp);
-int	 au_bsm_to_socket_type(u_short bsm_socket_type,
-	    int *local_socket_typep);
-u_short	 au_domain_to_bsm(int local_domain);
-u_char	 au_errno_to_bsm(int local_errno);
-u_short	 au_fcntl_cmd_to_bsm(int local_fcntl_command);
-u_short	 au_socket_type_to_bsm(int local_socket_type);
-
-__END_DECLS
-
-#endif /* ! _BSM_AUDIT_RECORD_H_ */
diff --git a/include.new/bsm/audit_socket_type.h b/include.new/bsm/audit_socket_type.h
deleted file mode 100644
index b932e10..0000000
--- a/include.new/bsm/audit_socket_type.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2008 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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. 
- *
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_socket_type.h#1
- * $FreeBSD: releng/10.2/sys/bsm/audit_socket_type.h 187214 2009-01-14 10:44:16Z rwatson $
- */
-
-#ifndef _BSM_AUDIT_SOCKET_TYPE_H_
-#define	_BSM_AUDIT_SOCKET_TYPE_H_
-
-/*
- * BSM socket type constants.
- */
-#define	BSM_SOCK_DGRAM		1
-#define	BSM_SOCK_STREAM		2
-#define	BSM_SOCK_RAW		4
-#define	BSM_SOCK_RDM		5
-#define	BSM_SOCK_SEQPACKET	6
-
-#define	BSM_SOCK_UNKNOWN	500
-
-#endif /* !_BSM_AUDIT_SOCKET_TYPE_H_ */
diff --git a/include.new/bsm/audit_uevents.h b/include.new/bsm/audit_uevents.h
deleted file mode 100644
index f71797b..0000000
--- a/include.new/bsm/audit_uevents.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * Copyright (c) 2004-2008 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_uevents.h#11 $
- */
-
-#ifndef _BSM_AUDIT_UEVENTS_H_
-#define	_BSM_AUDIT_UEVENTS_H_
-
-/*
- * Solaris userspace events.
- */
-#define	AUE_at_create		6144
-#define	AUE_at_delete		6145
-#define	AUE_at_perm		6146
-#define	AUE_cron_invoke		6147
-#define	AUE_crontab_create	6148
-#define	AUE_crontab_delete	6149
-#define	AUE_crontab_perm	6150
-#define	AUE_inetd_connect	6151
-#define	AUE_login		6152
-#define	AUE_logout		6153
-#define	AUE_telnet		6154
-#define	AUE_rlogin		6155
-#define	AUE_mountd_mount	6156
-#define	AUE_mountd_umount	6157
-#define	AUE_rshd		6158
-#define	AUE_su			6159
-#define	AUE_halt		6160
-#define	AUE_reboot		6161
-#define	AUE_rexecd		6162
-#define	AUE_passwd		6163
-#define	AUE_rexd		6164
-#define	AUE_ftpd		6165
-#define	AUE_init		6166
-#define	AUE_uadmin		6167
-#define	AUE_shutdown		6168
-#define	AUE_poweroff		6169
-#define	AUE_crontab_mod		6170
-#define	AUE_ftpd_logout		6171
-#define	AUE_ssh			6172
-#define	AUE_role_login		6173
-#define	AUE_prof_cmd		6180
-#define	AUE_filesystem_add	6181
-#define	AUE_filesystem_delete	6182
-#define	AUE_filesystem_modify	6183
-#define	AUE_allocate_succ	6200
-#define	AUE_allocate_fail	6201
-#define	AUE_deallocate_succ	6202
-#define	AUE_deallocate_fail	6203
-#define	AUE_listdevice_succ	6205
-#define	AUE_listdevice_fail	6206
-#define	AUE_create_user		6207
-#define	AUE_modify_user		6208
-#define	AUE_delete_user		6209
-#define	AUE_disable_user	6210
-#define	AUE_enable_user		6211
-#define	AUE_newgrp_login	6212
-#define	AUE_admin_authentication	6213
-#define	AUE_kadmind_auth	6214
-#define	AUE_kadmind_unauth	6215
-#define	AUE_krb5kdc_as_req	6216
-#define	AUE_krb5kdc_tgs_req	6217
-#define	AUE_krb5kdc_tgs_req_2ndtktmm	6218
-#define	AUE_krb5kdc_tgs_req_alt_tgt	6219
-
-/*
- * Historic Darwin use of the low event numbering space, which collided with
- * the Solaris event space.  Now obsoleted and new, higher, event numbers
- * assigned to make it easier to interpret Solaris events using the OpenBSM
- * tools.
- */
-#define	AUE_DARWIN_audit_startup	6171
-#define	AUE_DARWIN_audit_shutdown	6172
-#define	AUE_DARWIN_sudo			6300
-#define	AUE_DARWIN_modify_password	6501
-#define	AUE_DARWIN_create_group		6511
-#define	AUE_DARWIN_delete_group		6512
-#define	AUE_DARWIN_modify_group		6513
-#define	AUE_DARWIN_add_to_group		6514
-#define	AUE_DARWIN_remove_from_group	6515
-#define	AUE_DARWIN_revoke_obj		6521
-#define	AUE_DARWIN_lw_login		6600
-#define	AUE_DARWIN_lw_logout		6601
-#define	AUE_DARWIN_auth_user		7000
-#define	AUE_DARWIN_ssconn		7001
-#define	AUE_DARWIN_ssauthorize		7002
-#define	AUE_DARWIN_ssauthint		7003
-
-/*
- * Historic/third-party appliation allocations of event idenfiers.
- */
-#define	AUE_openssh		32800
-
-/*
- * OpenBSM-managed application event space.
- */
-#define	AUE_audit_startup	45000		/* Darwin-specific. */
-#define	AUE_audit_shutdown	45001		/* Darwin-specific. */
-#define	AUE_modify_password	45014		/* Darwin-specific. */
-#define	AUE_create_group	45015		/* Darwin-specific. */
-#define	AUE_delete_group	45016		/* Darwin-specific. */
-#define	AUE_modify_group	45017		/* Darwin-specific. */
-#define	AUE_add_to_group	45018		/* Darwin-specific. */
-#define	AUE_remove_from_group	45019		/* Darwin-specific. */
-#define	AUE_revoke_obj		45020		/* Darwin-specific. */
-#define	AUE_lw_login		45021		/* Darwin-specific. */
-#define	AUE_lw_logout		45022		/* Darwin-specific. */
-#define	AUE_auth_user		45023		/* Darwin-specific. */
-#define	AUE_ssconn		45024		/* Darwin-specific. */
-#define	AUE_ssauthorize		45025		/* Darwin-specific. */
-#define	AUE_ssauthint		45026		/* Darwin-specific. */
-#define	AUE_calife		45027		/* OpenBSM-allocated. */
-#define	AUE_sudo		45028		/* OpenBSM-allocated. */
-#define	AUE_audit_recovery	45029		/* OpenBSM-allocated. */
-#define	AUE_ssauthmech		45030		/* Darwin-specific. */
-
-#endif /* !_BSM_AUDIT_UEVENTS_H_ */
diff --git a/include.new/bsm/libbsm.h b/include.new/bsm/libbsm.h
deleted file mode 100644
index b678a23..0000000
--- a/include.new/bsm/libbsm.h
+++ /dev/null
@@ -1,1342 +0,0 @@
-/*-
- * Copyright (c) 2004-2009 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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.
- *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#50 $
- */
-
-#ifndef _LIBBSM_H_
-#define	_LIBBSM_H_
-
-/*
- * NB: definitions, etc., marked with "OpenSSH compatibility" were introduced
- * solely to allow OpenSSH to compile; Darwin/Apple code should not use them.
- */
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-#include <inttypes.h>		/* Required for audit.h. */
-#include <time.h>		/* Required for clock_t on Linux. */
-
-#include <bsm/audit.h>
-#include <bsm/audit_record.h>
-
-#include <stdio.h>
-
-#ifdef __APPLE__
-#include <mach/mach.h>		/* audit_token_t */
-#endif
-
-/*
- * Size parsed token vectors for execve(2) arguments and environmental
- * variables.  Note: changing these sizes affects the ABI of the token
- * structure, and as the token structure is often placed in the caller stack,
- * this is undesirable.
- */
-#define	AUDIT_MAX_ARGS	128
-#define	AUDIT_MAX_ENV	128
-
-/*
- * Arguments to au_preselect(3).
- */
-#define	AU_PRS_USECACHE	0
-#define	AU_PRS_REREAD	1
-
-#define	AU_PRS_SUCCESS	1
-#define	AU_PRS_FAILURE	2
-#define	AU_PRS_BOTH	(AU_PRS_SUCCESS|AU_PRS_FAILURE)
-
-#define	AUDIT_EVENT_FILE	"/etc/security/audit_event"
-#define	AUDIT_CLASS_FILE	"/etc/security/audit_class"
-#define	AUDIT_CONTROL_FILE	"/etc/security/audit_control"
-#define	AUDIT_USER_FILE		"/etc/security/audit_user"
-
-#define	DIR_CONTROL_ENTRY		"dir"
-#define	DIST_CONTROL_ENTRY		"dist"
-#define	FILESZ_CONTROL_ENTRY		"filesz"
-#define	FLAGS_CONTROL_ENTRY		"flags"
-#define	HOST_CONTROL_ENTRY		"host"
-#define	MINFREE_CONTROL_ENTRY		"minfree"
-#define	NA_CONTROL_ENTRY		"naflags"
-#define	POLICY_CONTROL_ENTRY		"policy"
-#define	EXPIRE_AFTER_CONTROL_ENTRY	"expire-after"
-
-#define	AU_CLASS_NAME_MAX	8
-#define	AU_CLASS_DESC_MAX	72
-#define	AU_EVENT_NAME_MAX	30
-#define	AU_EVENT_DESC_MAX	50
-#define	AU_USER_NAME_MAX	50
-#define	AU_LINE_MAX		256
-#define	MAX_AUDITSTRING_LEN	256
-#define	BSM_TEXTBUFSZ		MAX_AUDITSTRING_LEN	/* OpenSSH compatibility */
-
-/*
- * Arguments to au_close(3).
- */
-#define	AU_TO_NO_WRITE		0	/* Abandon audit record. */
-#define	AU_TO_WRITE		1	/* Commit audit record. */
-
-/*
- * Output format flags for au_print_flags_tok().
- */
-#define	AU_OFLAG_NONE		0x0000	/* Default form. */
-#define	AU_OFLAG_RAW		0x0001	/* Raw, numeric form. */
-#define	AU_OFLAG_SHORT		0x0002	/* Short form. */
-#define	AU_OFLAG_XML		0x0004	/* XML form. */
-#define	AU_OFLAG_NORESOLVE	0x0008	/* No user/group name resolution. */
-
-__BEGIN_DECLS
-struct au_event_ent {
-	au_event_t	 ae_number;
-	char		*ae_name;
-	char		*ae_desc;
-	au_class_t	 ae_class;
-};
-typedef struct au_event_ent au_event_ent_t;
-
-struct au_class_ent {
-	char		*ac_name;
-	au_class_t	 ac_class;
-	char		*ac_desc;
-};
-typedef struct au_class_ent au_class_ent_t;
-
-struct au_user_ent {
-	char		*au_name;
-	au_mask_t	 au_always;
-	au_mask_t	 au_never;
-};
-typedef struct au_user_ent au_user_ent_t;
-__END_DECLS
-
-#define	ADD_TO_MASK(m, c, sel) do {					\
-	if (sel & AU_PRS_SUCCESS)					\
-		(m)->am_success |= c;					\
-	if (sel & AU_PRS_FAILURE)					\
-		(m)->am_failure |= c;					\
-} while (0)
-
-#define	SUB_FROM_MASK(m, c, sel) do {					\
-	if (sel & AU_PRS_SUCCESS)					\
-		(m)->am_success &= ((m)->am_success ^ c);		\
-	if (sel & AU_PRS_FAILURE)					\
-		(m)->am_failure &= ((m)->am_failure ^ c);		\
-} while (0)
-
-#define	ADDMASK(m, v) do {						\
-	(m)->am_success |= (v)->am_success;				\
-	(m)->am_failure |= (v)->am_failure;				\
-} while(0)
-
-#define	SUBMASK(m, v) do {						\
-	(m)->am_success &= ((m)->am_success ^ (v)->am_success);		\
-	(m)->am_failure &= ((m)->am_failure ^ (v)->am_failure);		\
-} while(0)
-
-__BEGIN_DECLS
-
-typedef struct au_tid32 {
-	uint32_t	port;
-	uint32_t	addr;
-} au_tid32_t;
-
-typedef struct au_tid64 {
-	u_int64_t	port;
-	uint32_t	addr;
-} au_tid64_t;
-
-typedef struct au_tidaddr32 {
-	uint32_t	port;
-	uint32_t	type;
-	uint32_t	addr[4];
-} au_tidaddr32_t;
-
-typedef struct au_tidaddr64 {
-	u_int64_t	port;
-	uint32_t	type;
-	uint32_t	addr[4];
-} au_tidaddr64_t;
-
-/*
- * argument #              1 byte
- * argument value          4 bytes/8 bytes (32-bit/64-bit value)
- * text length             2 bytes
- * text                    N bytes + 1 terminating NULL byte
- */
-typedef struct {
-	u_char		 no;
-	uint32_t	 val;
-	u_int16_t	 len;
-	char		*text;
-} au_arg32_t;
-
-typedef struct {
-	u_char		 no;
-	u_int64_t	 val;
-	u_int16_t	 len;
-	char		*text;
-} au_arg64_t;
-
-/*
- * how to print            1 byte
- * basic unit              1 byte
- * unit count              1 byte
- * data items              (depends on basic unit)
- */
-typedef struct {
-	u_char	 howtopr;
-	u_char	 bu;
-	u_char	 uc;
-	u_char	*data;
-} au_arb_t;
-
-/*
- * file access mode        4 bytes
- * owner user ID           4 bytes
- * owner group ID          4 bytes
- * file system ID          4 bytes
- * node ID                 8 bytes
- * device                  4 bytes/8 bytes (32-bit/64-bit)
- */
-typedef struct {
-	uint32_t	mode;
-	uint32_t	uid;
-	uint32_t	gid;
-	uint32_t	fsid;
-	u_int64_t	nid;
-	uint32_t	dev;
-} au_attr32_t;
-
-typedef struct {
-	uint32_t	mode;
-	uint32_t	uid;
-	uint32_t	gid;
-	uint32_t	fsid;
-	u_int64_t	nid;
-	u_int64_t	dev;
-} au_attr64_t;
-
-/*
- * count                   4 bytes
- * text                    count null-terminated string(s)
- */
-typedef struct {
-	uint32_t	 count;
-	char		*text[AUDIT_MAX_ARGS];
-} au_execarg_t;
-
-/*
- * count                   4 bytes
- * text                    count null-terminated string(s)
- */
-typedef struct {
-	uint32_t	 count;
-	char		*text[AUDIT_MAX_ENV];
-} au_execenv_t;
-
-/*
- * status                  4 bytes
- * return value            4 bytes
- */
-typedef struct {
-	uint32_t	status;
-	uint32_t	ret;
-} au_exit_t;
-
-/*
- * seconds of time         4 bytes
- * milliseconds of time    4 bytes
- * file name length        2 bytes
- * file pathname           N bytes + 1 terminating NULL byte
- */
-typedef struct {
-	uint32_t	 s;
-	uint32_t	 ms;
-	u_int16_t	 len;
-	char		*name;
-} au_file_t;
-
-
-/*
- * number groups           2 bytes
- * group list              N * 4 bytes
- */
-typedef struct {
-	u_int16_t	no;
-	uint32_t	list[AUDIT_MAX_GROUPS];
-} au_groups_t;
-
-/*
- * record byte count       4 bytes
- * version #               1 byte    [2]
- * event type              2 bytes
- * event modifier          2 bytes
- * seconds of time         4 bytes/8 bytes (32-bit/64-bit value)
- * milliseconds of time    4 bytes/8 bytes (32-bit/64-bit value)
- */
-typedef struct {
-	uint32_t	size;
-	u_char		version;
-	u_int16_t	e_type;
-	u_int16_t	e_mod;
-	uint32_t	s;
-	uint32_t	ms;
-} au_header32_t;
-
-/*
- * record byte count       4 bytes
- * version #               1 byte     [2]
- * event type              2 bytes
- * event modifier          2 bytes
- * address type/length     1 byte (XXX: actually, 4 bytes)
- * machine address         4 bytes/16 bytes (IPv4/IPv6 address)
- * seconds of time         4 bytes/8 bytes  (32/64-bits)
- * nanoseconds of time     4 bytes/8 bytes  (32/64-bits)
- */
-typedef struct {
-	uint32_t	size;
-	u_char		version;
-	u_int16_t	e_type;
-	u_int16_t	e_mod;
-	uint32_t	ad_type;
-	uint32_t	addr[4];
-	uint32_t	s;
-	uint32_t	ms;
-} au_header32_ex_t;
-
-typedef struct {
-	uint32_t	size;
-	u_char		version;
-	u_int16_t	e_type;
-	u_int16_t	e_mod;
-	u_int64_t	s;
-	u_int64_t	ms;
-} au_header64_t;
-
-typedef struct {
-	uint32_t	size;
-	u_char		version;
-	u_int16_t	e_type;
-	u_int16_t	e_mod;
-	uint32_t	ad_type;
-	uint32_t	addr[4];
-	u_int64_t	s;
-	u_int64_t	ms;
-} au_header64_ex_t;
-
-/*
- * internet address        4 bytes
- */
-typedef struct {
-	uint32_t	addr;
-} au_inaddr_t;
-
-/*
- * type                 4 bytes
- * internet address     16 bytes
- */
-typedef struct {
-	uint32_t	type;
-	uint32_t	addr[4];
-} au_inaddr_ex_t;
-
-/*
- * version and ihl         1 byte
- * type of service         1 byte
- * length                  2 bytes
- * id                      2 bytes
- * offset                  2 bytes
- * ttl                     1 byte
- * protocol                1 byte
- * checksum                2 bytes
- * source address          4 bytes
- * destination address     4 bytes
- */
-typedef struct {
-	u_char		version;
-	u_char		tos;
-	u_int16_t	len;
-	u_int16_t	id;
-	u_int16_t	offset;
-	u_char		ttl;
-	u_char		prot;
-	u_int16_t	chksm;
-	uint32_t	src;
-	uint32_t	dest;
-} au_ip_t;
-
-/*
- * object ID type          1 byte
- * object ID               4 bytes
- */
-typedef struct {
-	u_char		type;
-	uint32_t	id;
-} au_ipc_t;
-
-/*
- * owner user ID           4 bytes
- * owner group ID          4 bytes
- * creator user ID         4 bytes
- * creator group ID        4 bytes
- * access mode             4 bytes
- * slot sequence #         4 bytes
- * key                     4 bytes
- */
-typedef struct {
-	uint32_t	uid;
-	uint32_t	gid;
-	uint32_t	puid;
-	uint32_t	pgid;
-	uint32_t	mode;
-	uint32_t	seq;
-	uint32_t	key;
-} au_ipcperm_t;
-
-/*
- * port IP address         2 bytes
- */
-typedef struct {
-	u_int16_t	port;
-} au_iport_t;
-
-/*
- * length		2 bytes
- * data			length bytes
- */
-typedef struct {
-	u_int16_t	 size;
-	char		*data;
-} au_opaque_t;
-
-/*
- * path length             2 bytes
- * path                    N bytes + 1 terminating NULL byte
- */
-typedef struct {
-	u_int16_t	 len;
-	char		*path;
-} au_path_t;
-
-/*
- * audit ID                4 bytes
- * effective user ID       4 bytes
- * effective group ID      4 bytes
- * real user ID            4 bytes
- * real group ID           4 bytes
- * process ID              4 bytes
- * session ID              4 bytes
- * terminal ID
- * port ID               4 bytes/8 bytes (32-bit/64-bit value)
- * machine address       4 bytes
- */
-typedef struct {
-	uint32_t	auid;
-	uint32_t	euid;
-	uint32_t	egid;
-	uint32_t	ruid;
-	uint32_t	rgid;
-	uint32_t	pid;
-	uint32_t	sid;
-	au_tid32_t	tid;
-} au_proc32_t;
-
-typedef struct {
-	uint32_t	auid;
-	uint32_t	euid;
-	uint32_t	egid;
-	uint32_t	ruid;
-	uint32_t	rgid;
-	uint32_t	pid;
-	uint32_t	sid;
-	au_tid64_t	tid;
-} au_proc64_t;
-
-/*
- * audit ID                4 bytes
- * effective user ID       4 bytes
- * effective group ID      4 bytes
- * real user ID            4 bytes
- * real group ID           4 bytes
- * process ID              4 bytes
- * session ID              4 bytes
- * terminal ID
- * port ID               4 bytes/8 bytes (32-bit/64-bit value)
- * type                  4 bytes
- * machine address       16 bytes
- */
-typedef struct {
-	uint32_t	auid;
-	uint32_t	euid;
-	uint32_t	egid;
-	uint32_t	ruid;
-	uint32_t	rgid;
-	uint32_t	pid;
-	uint32_t	sid;
-	au_tidaddr32_t	tid;
-} au_proc32ex_t;
-
-typedef struct {
-	uint32_t	auid;
-	uint32_t	euid;
-	uint32_t	egid;
-	uint32_t	ruid;
-	uint32_t	rgid;
-	uint32_t	pid;
-	uint32_t	sid;
-	au_tidaddr64_t	tid;
-} au_proc64ex_t;
-
-/*
- * error status            1 byte
- * return value            4 bytes/8 bytes (32-bit/64-bit value)
- */
-typedef struct {
-	u_char		status;
-	uint32_t	ret;
-} au_ret32_t;
-
-typedef struct {
-	u_char		err;
-	u_int64_t	val;
-} au_ret64_t;
-
-/*
- * sequence number         4 bytes
- */
-typedef struct {
-	uint32_t	seqno;
-} au_seq_t;
-
-/*
- * socket type             2 bytes
- * local port              2 bytes
- * local Internet address  4 bytes
- * remote port             2 bytes
- * remote Internet address 4 bytes
- */
-typedef struct {
-	u_int16_t	type;
-	u_int16_t	l_port;
-	uint32_t	l_addr;
-	u_int16_t	r_port;
-	uint32_t	r_addr;
-} au_socket_t;
-
-/*
- * socket type             2 bytes
- * local port              2 bytes
- * address type/length     4 bytes
- * local Internet address  4 bytes/16 bytes (IPv4/IPv6 address)
- * remote port             4 bytes
- * address type/length     4 bytes
- * remote Internet address 4 bytes/16 bytes (IPv4/IPv6 address)
- */
-typedef struct {
-	u_int16_t	domain;
-	u_int16_t	type;
-	u_int16_t	atype;
-	u_int16_t	l_port;
-	uint32_t	l_addr[4];
-	uint32_t	r_port;
-	uint32_t	r_addr[4];
-} au_socket_ex32_t;
-
-/*
- * socket family           2 bytes
- * local port              2 bytes
- * socket address          4 bytes/16 bytes (IPv4/IPv6 address)
- */
-typedef struct {
-	u_int16_t	family;
-	u_int16_t	port;
-	uint32_t	addr[4];
-} au_socketinet_ex32_t;
-
-typedef struct {
-	u_int16_t	family;
-	u_int16_t	port;
-	uint32_t	addr;
-} au_socketinet32_t;
-
-/*
- * socket family           2 bytes
- * path                    104 bytes
- */
-typedef struct {
-	u_int16_t	family;
-	char		path[104];
-} au_socketunix_t;
-
-/*
- * audit ID                4 bytes
- * effective user ID       4 bytes
- * effective group ID      4 bytes
- * real user ID            4 bytes
- * real group ID           4 bytes
- * process ID              4 bytes
- * session ID              4 bytes
- * terminal ID
- * 	port ID               4 bytes/8 bytes (32-bit/64-bit value)
- * 	machine address       4 bytes
- */
-typedef struct {
-	uint32_t	auid;
-	uint32_t	euid;
-	uint32_t	egid;
-	uint32_t	ruid;
-	uint32_t	rgid;
-	uint32_t	pid;
-	uint32_t	sid;
-	au_tid32_t	tid;
-} au_subject32_t;
-
-typedef struct {
-	uint32_t	auid;
-	uint32_t	euid;
-	uint32_t	egid;
-	uint32_t	ruid;
-	uint32_t	rgid;
-	uint32_t	pid;
-	uint32_t	sid;
-	au_tid64_t	tid;
-} au_subject64_t;
-
-/*
- * audit ID                4 bytes
- * effective user ID       4 bytes
- * effective group ID      4 bytes
- * real user ID            4 bytes
- * real group ID           4 bytes
- * process ID              4 bytes
- * session ID              4 bytes
- * terminal ID
- * port ID               4 bytes/8 bytes (32-bit/64-bit value)
- * type                  4 bytes
- * machine address       16 bytes
- */
-typedef struct {
-	uint32_t	auid;
-	uint32_t	euid;
-	uint32_t	egid;
-	uint32_t	ruid;
-	uint32_t	rgid;
-	uint32_t	pid;
-	uint32_t	sid;
-	au_tidaddr32_t	tid;
-} au_subject32ex_t;
-
-typedef struct {
-	uint32_t	auid;
-	uint32_t	euid;
-	uint32_t	egid;
-	uint32_t	ruid;
-	uint32_t	rgid;
-	uint32_t	pid;
-	uint32_t	sid;
-	au_tidaddr64_t	tid;
-} au_subject64ex_t;
-
-/*
- * text length             2 bytes
- * text                    N bytes + 1 terminating NULL byte
- */
-typedef struct {
-	u_int16_t	 len;
-	char		*text;
-} au_text_t;
-
-/*
- * upriv status         1 byte
- * privstr len          2 bytes
- * privstr              N bytes + 1 (\0 byte)
- */
-typedef struct {
-	u_int8_t	 sorf;
-	u_int16_t	 privstrlen;
-	char		*priv;
-} au_priv_t;
-
-/*
-* privset
-* privtstrlen		2 bytes
-* privtstr		N Bytes + 1
-* privstrlen		2 bytes
-* privstr		N Bytes + 1
-*/
-typedef struct {
-	u_int16_t	 privtstrlen;
-	char		*privtstr;
-	u_int16_t	 privstrlen;
-	char		*privstr;
-} au_privset_t;
-
-/*
- * zonename length	2 bytes
- * zonename text	N bytes + 1 NULL terminator
- */
-typedef struct {
-	u_int16_t	 len;
-	char		*zonename;
-} au_zonename_t;
-
-typedef struct {
-	uint32_t	ident;
-	u_int16_t	filter;
-	u_int16_t	flags;
-	uint32_t	fflags;
-	uint32_t	data;
-} au_kevent_t;
-
-typedef struct {
-	u_int16_t	 length;
-	char		*data;
-} au_invalid_t;
-
-/*
- * trailer magic number    2 bytes
- * record byte count       4 bytes
- */
-typedef struct {
-	u_int16_t	magic;
-	uint32_t	count;
-} au_trailer_t;
-
-struct tokenstr {
-	u_char	 id;
-	u_char	*data;
-	size_t	 len;
-	union {
-		au_arg32_t		arg32;
-		au_arg64_t		arg64;
-		au_arb_t		arb;
-		au_attr32_t		attr32;
-		au_attr64_t		attr64;
-		au_execarg_t		execarg;
-		au_execenv_t		execenv;
-		au_exit_t		exit;
-		au_file_t		file;
-		au_groups_t		grps;
-		au_header32_t		hdr32;
-		au_header32_ex_t	hdr32_ex;
-		au_header64_t		hdr64;
-		au_header64_ex_t	hdr64_ex;
-		au_inaddr_t		inaddr;
-		au_inaddr_ex_t		inaddr_ex;
-		au_ip_t			ip;
-		au_ipc_t		ipc;
-		au_ipcperm_t		ipcperm;
-		au_iport_t		iport;
-		au_opaque_t		opaque;
-		au_path_t		path;
-		au_proc32_t		proc32;
-		au_proc32ex_t		proc32_ex;
-		au_proc64_t		proc64;
-		au_proc64ex_t		proc64_ex;
-		au_ret32_t		ret32;
-		au_ret64_t		ret64;
-		au_seq_t		seq;
-		au_socket_t		socket;
-		au_socket_ex32_t	socket_ex32;
-		au_socketinet_ex32_t	sockinet_ex32;
-		au_socketunix_t		sockunix;
-		au_subject32_t		subj32;
-		au_subject32ex_t	subj32_ex;
-		au_subject64_t		subj64;
-		au_subject64ex_t	subj64_ex;
-		au_text_t		text;
-		au_kevent_t		kevent;
-		au_invalid_t		invalid;
-		au_trailer_t		trail;
-		au_zonename_t		zonename;
-		au_priv_t		priv;
-		au_privset_t		privset;
-	} tt; /* The token is one of the above types */
-};
-
-typedef struct tokenstr tokenstr_t;
-
-int			 audit_submit(short au_event, au_id_t auid,
-			    char status, int reterr, const char *fmt, ...);
-
-/*
- * Functions relating to querying audit class information.
- */
-void			 setauclass(void);
-void			 endauclass(void);
-struct au_class_ent	*getauclassent(void);
-struct au_class_ent	*getauclassent_r(au_class_ent_t *class_int);
-struct au_class_ent	*getauclassnam(const char *name);
-struct au_class_ent	*getauclassnam_r(au_class_ent_t *class_int,
-			    const char *name);
-struct au_class_ent	*getauclassnum(au_class_t class_number);
-struct au_class_ent	*getauclassnum_r(au_class_ent_t *class_int,
-			    au_class_t class_number);
-
-/*
- * Functions relating to querying audit control information.
- */
-void			 setac(void);
-void			 endac(void);
-int			 getacdir(char *name, int len);
-int			 getacdist(void);
-int			 getacexpire(int *andflg, time_t *age, size_t *size);
-int			 getacfilesz(size_t *size_val);
-int			 getacflg(char *auditstr, int len);
-int			 getachost(char *auditstr, size_t len);
-int			 getacmin(int *min_val);
-int			 getacna(char *auditstr, int len);
-int			 getacpol(char *auditstr, size_t len);
-int			 getauditflagsbin(char *auditstr, au_mask_t *masks);
-int			 getauditflagschar(char *auditstr, au_mask_t *masks,
-			    int verbose);
-int			 au_preselect(au_event_t event, au_mask_t *mask_p,
-			    int sorf, int flag);
-ssize_t			 au_poltostr(int policy, size_t maxsize, char *buf);
-int			 au_strtopol(const char *polstr, int *policy);
-
-/*
- * Functions relating to querying audit event information.
- */
-void			 setauevent(void);
-void			 endauevent(void);
-struct au_event_ent	*getauevent(void);
-struct au_event_ent	*getauevent_r(struct au_event_ent *e);
-struct au_event_ent	*getauevnam(const char *name);
-struct au_event_ent	*getauevnam_r(struct au_event_ent *e,
-			    const char *name);
-struct au_event_ent	*getauevnum(au_event_t event_number);
-struct au_event_ent	*getauevnum_r(struct au_event_ent *e,
-			    au_event_t event_number);
-au_event_t		*getauevnonam(const char *event_name);
-au_event_t		*getauevnonam_r(au_event_t *ev,
-			    const char *event_name);
-
-/*
- * Functions relating to querying audit user information.
- */
-void			 setauuser(void);
-void			 endauuser(void);
-struct au_user_ent	*getauuserent(void);
-struct au_user_ent	*getauuserent_r(struct au_user_ent *u);
-struct au_user_ent	*getauusernam(const char *name);
-struct au_user_ent	*getauusernam_r(struct au_user_ent *u,
-			    const char *name);
-int			 au_user_mask(char *username, au_mask_t *mask_p);
-int			 getfauditflags(au_mask_t *usremask,
-			    au_mask_t *usrdmask, au_mask_t *lastmask);
-
-/*
- * Functions for reading and printing records and tokens from audit trails.
- */
-int			 au_read_rec(FILE *fp, u_char **buf);
-int			 au_fetch_tok(tokenstr_t *tok, u_char *buf, int len);
-//XXX The following interface has different prototype from BSM
-void			 au_print_tok(FILE *outfp, tokenstr_t *tok,
-			    char *del, char raw, char sfrm);
-void			 au_print_flags_tok(FILE *outfp, tokenstr_t *tok,
-			    char *del, int oflags);
-void			 au_print_tok_xml(FILE *outfp, tokenstr_t *tok,
-			    char *del, char raw, char sfrm);
-
-/* 
- * Functions relating to XML output.
- */
-void			 au_print_xml_header(FILE *outfp);
-void			 au_print_xml_footer(FILE *outfp);
-
-/*
- * BSM library routines for converting between local and BSM constant spaces.
- * (Note: some of these are replicated in audit_record.h for the benefit of
- * the FreeBSD and Mac OS X kernels)
- */
-int	 au_bsm_to_domain(u_short bsm_domain, int *local_domainp);
-int	 au_bsm_to_errno(u_char bsm_error, int *errorp);
-int	 au_bsm_to_fcntl_cmd(u_short bsm_fcntl_cmd, int *local_fcntl_cmdp);
-int	 au_bsm_to_socket_type(u_short bsm_socket_type,
-	    int *local_socket_typep);
-u_short	 au_domain_to_bsm(int local_domain);
-u_char	 au_errno_to_bsm(int local_errno);
-u_short	 au_fcntl_cmd_to_bsm(int local_fcntl_command);
-u_short	 au_socket_type_to_bsm(int local_socket_type);
-
-const char	 *au_strerror(u_char bsm_error);
-__END_DECLS
-
-/*
- * The remaining APIs are associated with Apple's BSM implementation, in
- * particular as relates to Mach IPC auditing and triggers passed via Mach
- * IPC.
- */
-#ifdef __APPLE__
-#include <sys/appleapiopts.h>
-
-/**************************************************************************
- **************************************************************************
- ** The following definitions, functions, etc., are NOT officially
- ** supported: they may be changed or removed in the future.  Do not use
- ** them unless you are prepared to cope with that eventuality.
- **************************************************************************
- **************************************************************************/
-
-#ifdef __APPLE_API_PRIVATE
-#define	__BSM_INTERNAL_NOTIFY_KEY	"com.apple.audit.change"
-#endif /* __APPLE_API_PRIVATE */
-
-/*
- * au_get_state() return values
- * XXX  use AUC_* values directly instead (<bsm/audit.h>); AUDIT_OFF and
- * AUDIT_ON are deprecated and WILL be removed.
- */
-#ifdef __APPLE_API_PRIVATE
-#define	AUDIT_OFF	AUC_NOAUDIT
-#define	AUDIT_ON	AUC_AUDITING
-#endif /* __APPLE_API_PRIVATE */
-#endif /* !__APPLE__ */
-
-/*
- * Error return codes for audit_set_terminal_id(), audit_write() and its
- * brethren.  We have 255 (not including kAUNoErr) to play with.
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-enum {
-	kAUNoErr			= 0,
-	kAUBadParamErr			= -66049,
-	kAUStatErr,
-	kAUSysctlErr,
-	kAUOpenErr,
-	kAUMakeSubjectTokErr,
-	kAUWriteSubjectTokErr,
-	kAUWriteCallerTokErr,
-	kAUMakeReturnTokErr,
-	kAUWriteReturnTokErr,
-	kAUCloseErr,
-	kAUMakeTextTokErr,
-	kAULastErr
-};
-
-#ifdef __APPLE__
-/*
- * Error return codes for au_get_state() and/or its private support
- * functions.  These codes are designed to be compatible with the
- * NOTIFY_STATUS_* codes defined in <notify.h> but non-overlapping.
- * Any changes to notify(3) may cause these values to change in future.
- *
- * AU_UNIMPL should never happen unless you've changed your system software
- * without rebooting.  Shame on you.
- */
-#ifdef __APPLE_API_PRIVATE
-#define	AU_UNIMPL	NOTIFY_STATUS_FAILED + 1	/* audit unimplemented */
-#endif /* __APPLE_API_PRIVATE */
-#endif /* !__APPLE__ */
-
-__BEGIN_DECLS
-/*
- * XXX  This prototype should be in audit_record.h
- *
- * au_free_token()
- *
- * @summary - au_free_token() deallocates a token_t created by any of
- * the au_to_*() BSM API functions.
- *
- * The BSM API generally manages deallocation of token_t objects.  However,
- * if au_write() is passed a bad audit descriptor, the token_t * parameter
- * will be left untouched.  In that case, the caller can deallocate the
- * token_t using au_free_token() if desired.  This is, in fact, what
- * audit_write() does, in keeping with the existing memory management model
- * of the BSM API.
- *
- * @param tok - A token_t * generated by one of the au_to_*() BSM API
- * calls.  For convenience, tok may be NULL, in which case
- * au_free_token() returns immediately.
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-void	au_free_token(token_t *tok);
-
-/*
- * Lightweight check to determine if auditing is enabled.  If a client
- * wants to use this to govern whether an entire series of audit calls
- * should be made--as in the common case of a caller building a set of
- * tokens, then writing them--it should cache the audit status in a local
- * variable.  This call always returns the current state of auditing.
- *
- * @return - AUC_AUDITING or AUC_NOAUDIT if no error occurred.
- * Otherwise the function can return any of the errno values defined for
- * setaudit(2), or AU_UNIMPL if audit does not appear to be supported by
- * the system.
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-int	au_get_state(void);
-
-/*
- * Initialize the audit notification.  If it has not already been initialized
- * it will automatically on the first call of au_get_state().
- */
-uint32_t	au_notify_initialize(void);
-
-/*
- * Cancel audit notification and free the resources associated with it.
- * Responsible code that no longer needs to use au_get_state() should call
- * this.
- */
-int		au_notify_terminate(void);
-__END_DECLS
-
-/* OpenSSH compatibility */
-int	cannot_audit(int);
-
-__BEGIN_DECLS
-/*
- * audit_set_terminal_id()
- *
- * @summary - audit_set_terminal_id() fills in an au_tid_t struct, which is
- * used in audit session initialization by processes like /usr/bin/login.
- *
- * @param tid - A pointer to an au_tid_t struct.
- *
- * @return - kAUNoErr on success; kAUBadParamErr if tid is NULL, kAUStatErr
- * or kAUSysctlErr if one of the underlying system calls fails (a message
- * is sent to the system log in those cases).
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-int	audit_set_terminal_id(au_tid_t *tid);
-
-/*
- * BEGIN au_write() WRAPPERS
- *
- * The following calls all wrap the existing BSM API.  They use the
- * provided subject information, if any, to construct the subject token
- * required for every log message.  They use the provided return/error
- * value(s), if any, to construct the success/failure indication required
- * for every log message.  They only permit one "miscellaneous" token,
- * which should contain the event-specific logging information mandated by
- * CAPP.
- *
- * All these calls assume the caller has previously determined that
- * auditing is enabled by calling au_get_state().
- */
-
-/*
- * audit_write()
- *
- * @summary - audit_write() is the basis for the other audit_write_*()
- * calls.  Performs a basic write of an audit record (subject, additional
- * info, success/failure).  Note that this call only permits logging one
- * caller-specified token; clients needing to log more flexibly must use
- * the existing BSM API (au_open(), et al.) directly.
- *
- * Note on memory management: audit_write() guarantees that the token_t *s
- * passed to it will be deallocated whether or not the underlying write to
- * the audit log succeeded.  This addresses an inconsistency in the
- * underlying BSM API in which token_t *s are usually but not always
- * deallocated.
- *
- * @param event_code - The code for the event being logged.  This should
- * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h.
- *
- * @param subject - A token_t * generated by au_to_subject(),
- * au_to_subject32(), au_to_subject64(), or au_to_me().  If no subject is
- * required, subject should be NULL.
- *
- * @param misctok - A token_t * generated by one of the au_to_*() BSM API
- * calls.  This should correspond to the additional information required by
- * CAPP for the event being audited.  If no additional information is
- * required, misctok should be NULL.
- *
- * @param retval - The return value to be logged for this event.  This
- * should be 0 (zero) for success, otherwise the value is event-specific.
- *
- * @param errcode - Any error code associated with the return value (e.g.,
- * errno or h_errno).  If there was no error, errcode should be 0 (zero).
- *
- * @return - The status of the call: 0 (zero) on success, else one of the
- * kAU*Err values defined above.
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-int	audit_write(short event_code, token_t *subject, token_t *misctok,
-	    char retval, int errcode);
-
-/*
- * audit_write_success()
- *
- * @summary - audit_write_success() records an auditable event that did not
- * encounter an error.  The interface is designed to require as little
- * direct use of the au_to_*() API as possible.  It builds a subject token
- * from the information passed in and uses that to invoke audit_write().
- * A subject, as defined by CAPP, is a process acting on the user's behalf.
- *
- * If the subject information is the same as the current process, use
- * au_write_success_self().
- *
- * @param event_code - The code for the event being logged.  This should
- * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h.
- *
- * @param misctok - A token_t * generated by one of the au_to_*() BSM API
- * calls.  This should correspond to the additional information required by
- * CAPP for the event being audited.  If no additional information is
- * required, misctok should be NULL.
- *
- * @param auid - The subject's audit ID.
- *
- * @param euid - The subject's effective user ID.
- *
- * @param egid - The subject's effective group ID.
- *
- * @param ruid - The subject's real user ID.
- *
- * @param rgid - The subject's real group ID.
- *
- * @param pid - The subject's process ID.
- *
- * @param sid - The subject's session ID.
- *
- * @param tid - The subject's terminal ID.
- *
- * @return - The status of the call: 0 (zero) on success, else one of the
- * kAU*Err values defined above.
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-int	audit_write_success(short event_code, token_t *misctok, au_id_t auid,
-	    uid_t euid, gid_t egid, uid_t ruid, gid_t rgid, pid_t pid,
-	    au_asid_t sid, au_tid_t *tid);
-
-/*
- * audit_write_success_self()
- *
- * @summary - Similar to audit_write_success(), but used when the subject
- * (process) is owned and operated by the auditable user him/herself.
- *
- * @param event_code - The code for the event being logged.  This should
- * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h.
- *
- * @param misctok - A token_t * generated by one of the au_to_*() BSM API
- * calls.  This should correspond to the additional information required by
- * CAPP for the event being audited.  If no additional information is
- * required, misctok should be NULL.
- *
- * @return - The status of the call: 0 (zero) on success, else one of the
- * kAU*Err values defined above.
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-int	audit_write_success_self(short event_code, token_t *misctok);
-
-/*
- * audit_write_failure()
- *
- * @summary - audit_write_failure() records an auditable event that
- * encountered an error.  The interface is designed to require as little
- * direct use of the au_to_*() API as possible.  It builds a subject token
- * from the information passed in and uses that to invoke audit_write().
- * A subject, as defined by CAPP, is a process acting on the user's behalf.
- *
- * If the subject information is the same as the current process, use
- * au_write_failure_self().
- *
- * @param event_code - The code for the event being logged.  This should
- * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h.
- *
- * @param errmsg - A text message providing additional information about
- * the event being audited.
- *
- * @param errret - A numerical value providing additional information about
- * the error.  This is intended to store the value of errno or h_errno if
- * it's relevant.  This can be 0 (zero) if no additional information is
- * available.
- *
- * @param auid - The subject's audit ID.
- *
- * @param euid - The subject's effective user ID.
- *
- * @param egid - The subject's effective group ID.
- *
- * @param ruid - The subject's real user ID.
- *
- * @param rgid - The subject's real group ID.
- *
- * @param pid - The subject's process ID.
- *
- * @param sid - The subject's session ID.
- *
- * @param tid - The subject's terminal ID.
- *
- * @return - The status of the call: 0 (zero) on success, else one of the
- * kAU*Err values defined above.
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-int	audit_write_failure(short event_code, char *errmsg, int errret,
-	    au_id_t auid, uid_t euid, gid_t egid, uid_t ruid, gid_t rgid,
-	    pid_t pid, au_asid_t sid, au_tid_t *tid);
-
-/*
- * audit_write_failure_self()
- *
- * @summary - Similar to audit_write_failure(), but used when the subject
- * (process) is owned and operated by the auditable user him/herself.
- *
- * @param event_code - The code for the event being logged.  This should
- * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h.
- *
- * @param errmsg - A text message providing additional information about
- * the event being audited.
- *
- * @param errret - A numerical value providing additional information about
- * the error.  This is intended to store the value of errno or h_errno if
- * it's relevant.  This can be 0 (zero) if no additional information is
- * available.
- *
- * @return - The status of the call: 0 (zero) on success, else one of the
- * kAU*Err values defined above.
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-int	audit_write_failure_self(short event_code, char *errmsg, int errret);
-
-/*
- * audit_write_failure_na()
- *
- * @summary - audit_write_failure_na() records errors during login.  Such
- * errors are implicitly non-attributable (i.e., not ascribable to any user).
- *
- * @param event_code - The code for the event being logged.  This should
- * be one of the AUE_ values in /usr/include/bsm/audit_uevents.h.
- *
- * @param errmsg - A text message providing additional information about
- * the event being audited.
- *
- * @param errret - A numerical value providing additional information about
- * the error.  This is intended to store the value of errno or h_errno if
- * it's relevant.  This can be 0 (zero) if no additional information is
- * available.
- *
- * @param euid - The subject's effective user ID.
- *
- * @param egid - The subject's effective group ID.
- *
- * @param pid - The subject's process ID.
- *
- * @param tid - The subject's terminal ID.
- *
- * @return - The status of the call: 0 (zero) on success, else one of the
- * kAU*Err values defined above.
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-int	audit_write_failure_na(short event_code, char *errmsg, int errret,
-	    uid_t euid, gid_t egid, pid_t pid, au_tid_t *tid);
-
-/* END au_write() WRAPPERS */
-
-#ifdef  __APPLE__
-/*
- * audit_token_to_au32()
- *
- * @summary - Extract information from an audit_token_t, used to identify
- * Mach tasks and senders of Mach messages as subjects to the audit system.
- * audit_tokent_to_au32() is the only method that should be used to parse
- * an audit_token_t, since its internal representation may change over
- * time.  A pointer parameter may be NULL if that information is not
- * needed.
- *
- * @param atoken - the audit token containing the desired information
- *
- * @param auidp - Pointer to a uid_t; on return will be set to the task or
- * sender's audit user ID
- *
- * @param euidp - Pointer to a uid_t; on return will be set to the task or
- * sender's effective user ID
- *
- * @param egidp - Pointer to a gid_t; on return will be set to the task or
- * sender's effective group ID
- *
- * @param ruidp - Pointer to a uid_t; on return will be set to the task or
- * sender's real user ID
- *
- * @param rgidp - Pointer to a gid_t; on return will be set to the task or
- * sender's real group ID
- *
- * @param pidp - Pointer to a pid_t; on return will be set to the task or
- * sender's process ID
- *
- * @param asidp - Pointer to an au_asid_t; on return will be set to the
- * task or sender's audit session ID
- *
- * @param tidp - Pointer to an au_tid_t; on return will be set to the task
- * or sender's terminal ID
- *
- * XXXRW: In Apple's bsm-8, these are marked __APPLE_API_PRIVATE.
- */
-void audit_token_to_au32(
-	audit_token_t	 atoken,
-	uid_t		*auidp,
-	uid_t		*euidp,
-	gid_t		*egidp,
-	uid_t		*ruidp,
-	gid_t		*rgidp,
-	pid_t		*pidp,
-	au_asid_t	*asidp,
-	au_tid_t	*tidp);
-#endif /* !__APPLE__ */
-
-/*
- * Wrapper functions to auditon(2).
- */
-int audit_get_car(char *path, size_t sz);
-int audit_get_class(au_evclass_map_t *evc_map, size_t sz);
-int audit_set_class(au_evclass_map_t *evc_map, size_t sz);
-int audit_get_cond(int *cond);
-int audit_set_cond(int *cond);
-int audit_get_cwd(char *path, size_t sz);
-int audit_get_fsize(au_fstat_t *fstat, size_t sz);
-int audit_set_fsize(au_fstat_t *fstat, size_t sz);
-int audit_get_kmask(au_mask_t *kmask, size_t sz);
-int audit_set_kmask(au_mask_t *kmask, size_t sz);
-int audit_get_kaudit(auditinfo_addr_t *aia, size_t sz);
-int audit_set_kaudit(auditinfo_addr_t *aia, size_t sz);
-int audit_set_pmask(auditpinfo_t *api, size_t sz);
-int audit_get_pinfo(auditpinfo_t *api, size_t sz);
-int audit_get_pinfo_addr(auditpinfo_addr_t *apia, size_t sz);
-int audit_get_policy(int *policy);
-int audit_set_policy(int *policy);
-int audit_get_qctrl(au_qctrl_t *qctrl, size_t sz);
-int audit_set_qctrl(au_qctrl_t *qctrl, size_t sz);
-int audit_get_sinfo_addr(auditinfo_addr_t *aia, size_t sz);
-int audit_get_stat(au_stat_t *stats, size_t sz);
-int audit_set_stat(au_stat_t *stats, size_t sz);
-int audit_send_trigger(int *trigger);
-
-__END_DECLS
-
-#endif /* !_LIBBSM_H_ */
diff --git a/include.new/bsnmp/asn1.h b/include.new/bsnmp/asn1.h
deleted file mode 100644
index cf9a727..0000000
--- a/include.new/bsnmp/asn1.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- * 
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- *
- * $Begemot: bsnmp/lib/asn1.h,v 1.20 2005/10/05 16:43:11 brandt_h Exp $
- *
- * ASN.1 for SNMP
- */
-#ifndef asn1_h_
-#define asn1_h_
-
-#include <sys/types.h>
-
-struct asn_buf {
-	union {
-		u_char	*ptr;
-		const u_char *cptr;
-	}	asn_u;
-	size_t	asn_len;
-};
-#define asn_cptr	asn_u.cptr
-#define asn_ptr	asn_u.ptr
-
-/* these restrictions are in the SMI */
-#define ASN_MAXID	0xffffffff
-#define ASN_MAXOIDLEN	128
-
-/* the string needed for this (with trailing zero) */
-#define ASN_OIDSTRLEN	(ASN_MAXOIDLEN * (10 + 1) - 1 + 1)
-
-/* type of subidentifiers */
-typedef uint32_t asn_subid_t;
-
-struct asn_oid {
-	u_int	len;
-	asn_subid_t subs[ASN_MAXOIDLEN];
-};
-
-enum asn_err {
-	/* conversion was ok */
-	ASN_ERR_OK	= 0,
-	/* conversion failed and stopped */
-	ASN_ERR_FAILED	= 1 | 0x1000,
-	/* length field bad, value skipped */
-	ASN_ERR_BADLEN	= 2,
-	/* out of buffer, stopped */
-	ASN_ERR_EOBUF	= 3 | 0x1000,
-	/* length ok, but value is out of range */
-	ASN_ERR_RANGE	= 4,
-	/* not the expected tag, stopped */
-	ASN_ERR_TAG	= 5 | 0x1000,
-};
-#define ASN_ERR_STOPPED(E) (((E) & 0x1000) != 0)
-
-/* type for the length field of encoded values. The length is restricted
- * to 65535, but using uint16_t would give conversion warnings on gcc */
-typedef uint32_t asn_len_t;	/* could be also uint16_t */
-
-/* maximal length of a long length field without the length of the length */
-#define ASN_MAXLEN	65535
-#define ASN_MAXLENLEN	2	/* number of bytes in a length */
-
-/* maximum size of an octet string as per SMIv2 */
-#define ASN_MAXOCTETSTRING 65535
-
-extern void (*asn_error)(const struct asn_buf *, const char *, ...);
-
-enum asn_err asn_get_header(struct asn_buf *, u_char *, asn_len_t *);
-enum asn_err asn_put_header(struct asn_buf *, u_char, asn_len_t);
-
-enum asn_err asn_put_temp_header(struct asn_buf *, u_char, u_char **);
-enum asn_err asn_commit_header(struct asn_buf *, u_char *, size_t *);
-
-enum asn_err asn_get_integer_raw(struct asn_buf *, asn_len_t, int32_t *);
-enum asn_err asn_get_integer(struct asn_buf *, int32_t *);
-enum asn_err asn_put_integer(struct asn_buf *, int32_t);
-
-enum asn_err asn_get_octetstring_raw(struct asn_buf *, asn_len_t, u_char *, u_int *);
-enum asn_err asn_get_octetstring(struct asn_buf *, u_char *, u_int *);
-enum asn_err asn_put_octetstring(struct asn_buf *, const u_char *, u_int);
-
-enum asn_err asn_get_null_raw(struct asn_buf *b, asn_len_t);
-enum asn_err asn_get_null(struct asn_buf *);
-enum asn_err asn_put_null(struct asn_buf *);
-
-enum asn_err asn_put_exception(struct asn_buf *, u_int);
-
-enum asn_err asn_get_objid_raw(struct asn_buf *, asn_len_t, struct asn_oid *);
-enum asn_err asn_get_objid(struct asn_buf *, struct asn_oid *);
-enum asn_err asn_put_objid(struct asn_buf *, const struct asn_oid *);
-
-enum asn_err asn_get_sequence(struct asn_buf *, asn_len_t *);
-
-enum asn_err asn_get_ipaddress_raw(struct asn_buf *, asn_len_t, u_char *);
-enum asn_err asn_get_ipaddress(struct asn_buf *, u_char *);
-enum asn_err asn_put_ipaddress(struct asn_buf *, const u_char *);
-
-enum asn_err asn_get_uint32_raw(struct asn_buf *, asn_len_t, uint32_t *);
-enum asn_err asn_put_uint32(struct asn_buf *, u_char, uint32_t);
-
-enum asn_err asn_get_counter64_raw(struct asn_buf *, asn_len_t, uint64_t *);
-enum asn_err asn_put_counter64(struct asn_buf *, uint64_t);
-
-enum asn_err asn_get_timeticks(struct asn_buf *, uint32_t *);
-enum asn_err asn_put_timeticks(struct asn_buf *, uint32_t);
-
-enum asn_err asn_skip(struct asn_buf *, asn_len_t);
-enum asn_err asn_pad(struct asn_buf *, asn_len_t);
-
-/*
- * Utility functions for OIDs
- */
-/* get a sub-OID from the middle of another OID */
-void asn_slice_oid(struct asn_oid *, const struct asn_oid *, u_int, u_int);
-
-/* append an OID to another one */
-void asn_append_oid(struct asn_oid *, const struct asn_oid *);
-
-/* compare two OIDs */
-int asn_compare_oid(const struct asn_oid *, const struct asn_oid *);
-
-/* check whether the first is a suboid of the second one */
-int asn_is_suboid(const struct asn_oid *, const struct asn_oid *);
-
-/* format an OID into a user buffer of size ASN_OIDSTRLEN */
-char *asn_oid2str_r(const struct asn_oid *, char *);
-
-/* format an OID into a private static buffer */
-char *asn_oid2str(const struct asn_oid *);
-
-enum {
-	ASN_TYPE_BOOLEAN	= 0x01,
-	ASN_TYPE_INTEGER	= 0x02,
-	ASN_TYPE_BITSTRING	= 0x03,
-	ASN_TYPE_OCTETSTRING	= 0x04,
-	ASN_TYPE_NULL		= 0x05,
-	ASN_TYPE_OBJID		= 0x06,
-	ASN_TYPE_SEQUENCE	= 0x10,
-
-	ASN_TYPE_CONSTRUCTED	= 0x20,
-	ASN_CLASS_UNIVERSAL	= 0x00,
-	ASN_CLASS_APPLICATION	= 0x40,
-	ASN_CLASS_CONTEXT	= 0x80,
-	ASN_CLASS_PRIVATE	= 0xc0,
-	ASN_TYPE_MASK		= 0x1f,
-
-	ASN_APP_IPADDRESS	= 0x00,
-	ASN_APP_COUNTER		= 0x01,
-	ASN_APP_GAUGE		= 0x02,
-	ASN_APP_TIMETICKS	= 0x03,
-	ASN_APP_OPAQUE		= 0x04,	/* not implemented */
-	ASN_APP_COUNTER64	= 0x06,
-
-	ASN_EXCEPT_NOSUCHOBJECT	= 0x00,
-	ASN_EXCEPT_NOSUCHINSTANCE = 0x01,
-	ASN_EXCEPT_ENDOFMIBVIEW	= 0x02,
-};
-
-#endif
diff --git a/include.new/bsnmp/bridge_snmp.h b/include.new/bsnmp/bridge_snmp.h
deleted file mode 100644
index 31d23fb..0000000
--- a/include.new/bsnmp/bridge_snmp.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/*-
- * Copyright (c) 2006 Shteryana Shopova <syrinx@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.
- *
- * 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.
- *
- * Bridge MIB implementation for SNMPd.
- *
- * $FreeBSD: releng/10.2/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_snmp.h 171791 2007-08-08 19:27:50Z syrinx $
- */
-
-#ifndef	SNMP_BRIDGE_H
-#define	SNMP_BRIDGE_H
-
-#define	SNMP_BRIDGE_ID_LEN	8
-
-typedef uint8_t	port_id[2];
-typedef u_char	bridge_id[SNMP_BRIDGE_ID_LEN];
-
-#define	SNMP_BRIDGE_MAX_PRIORITY	65535
-
-#define	SNMP_BRIDGE_MIN_AGE_TIME	10
-#define	SNMP_BRIDGE_MAX_AGE_TIME	1000000
-
-#define	SNMP_BRIDGE_MIN_TXHC		1
-#define	SNMP_BRIDGE_MAX_TXHC		10
-
-#define	SNMP_BRIDGE_MIN_MAGE		600
-#define	SNMP_BRIDGE_MAX_MAGE		4000
-
-#define	SNMP_BRIDGE_MIN_HTIME		100
-#define	SNMP_BRIDGE_MAX_HTIME		1000
-
-#define	SNMP_BRIDGE_MIN_FDELAY		400
-#define	SNMP_BRIDGE_MAX_FDELAY		3000
-
-#define	SNMP_PORT_PATHCOST_OBSOLETE	65535
-#define	SNMP_PORT_MIN_PATHCOST		0
-#define	SNMP_PORT_MAX_PATHCOST		200000000
-#define	SNMP_PORT_PATHCOST_AUTO		0
-
-#define	SNMP_BRIDGE_DATA_MAXAGE		10
-#define	SNMP_BRIDGE_DATA_MAXAGE_MIN	1
-#define	SNMP_BRIDGE_DATA_MAXAGE_MAX	300
-
-/* By default poll kernel data every 5 minutes. */
-#define	SNMP_BRIDGE_POLL_INTERVAL	(5 * 60)
-#define	SNMP_BRIDGE_POLL_INTERVAL_MIN	1
-#define	SNMP_BRIDGE_POLL_INTERVAL_MAX	3600
-
-/* Poll for a topology change once every 30 seconds. */
-#define	SNMP_BRIDGE_TC_POLL_INTERVAL	30
-
-struct bridge_if *bridge_get_default(void);
-
-void bridge_set_default(struct bridge_if *bif);
-
-const char *bridge_get_default_name(void);
-
-int bridge_get_data_maxage(void);
-
-/*
- * Bridge Addresses Table.
- */
-struct tp_entry {
-	uint32_t		sysindex;	/* The bridge if sysindex. */
-	int32_t			port_no;
-	enum TpFdbStatus	status;
-	uint8_t			tp_addr[ETHER_ADDR_LEN];
-	uint8_t			flags;
-	TAILQ_ENTRY(tp_entry)	tp_e;
-};
-
-/*
- * Bridge ports.
- * The bridge port system interface index is used for a
- * port number. Transparent bridging statistics and STP
- * information for a port are also contained here.
- */
-struct bridge_port {
-	/* dot1dBase subtree objects. */
-	uint32_t	sysindex;	/* The bridge interface sysindex. */
-	int32_t		port_no;	/* The bridge member system index. */
-	int32_t		if_idx;		/* SNMP ifIndex from mibII. */
-	int8_t		span_enable;	/* Span flag set - private MIB. */
-	struct asn_oid	circuit;	/* Unused. */
-	uint32_t	dly_ex_drops;	/* Drops on output. */
-	uint32_t	dly_mtu_drops;	/* MTU exceeded drops. */
-	int32_t		status;		/* The entry status. */
-	enum TruthValue	priv_set;	/* The private flag. */
-
-	/* dot1dStp subtree objects. */
-	int32_t		path_cost;
-	int32_t		priority;
-	int32_t		design_cost;
-	uint32_t	fwd_trans;
-	char		p_name[IFNAMSIZ]; /* Not in BRIDGE-MIB. */
-	enum StpPortState	state;
-	enum dot1dStpPortEnable	enable;
-	port_id		design_port;
-	bridge_id	design_root;
-	bridge_id	design_bridge;
-
-	/* rstpMib extensions. */
-	int32_t		admin_path_cost;
-	enum TruthValue	proto_migr;
-	enum TruthValue	admin_edge;
-	enum TruthValue	oper_edge;
-	enum TruthValue	oper_ptp;
-	enum StpPortAdminPointToPointType	admin_ptp;
-
-	/* dot1dTp subtree objects. */
-	int32_t		max_info;
-	int32_t		in_frames;
-	int32_t		out_frames;
-	int32_t		in_drops;
-
-	uint8_t		flags;
-	TAILQ_ENTRY(bridge_port) b_p;
-};
-
-/*
- * A bridge interface.
- * The system interface index of the bridge is not required neither by the
- * standard BRIDGE-MIB nor by the private BEGEMOT-BRIDGE-MIB, but is used
- * as key for looking up the other info for this bridge.
- */
-struct bridge_if {
-	/* dot1dBase subtree objects. */
-	uint32_t	sysindex;	/* The system interface index. */
-	int32_t		num_ports;	/* Number of ports. */
-	enum BaseType	br_type;	/* Bridge type. */
-	enum RowStatus	if_status;	/* Bridge status. */
-	char		bif_name[IFNAMSIZ]; /* Bridge interface name. */
-	struct ether_addr br_addr;	/* Bridge address. */
-	struct bridge_port *f_bp;	/* This bridge's first entry
-					 * in the base ports TAILQ. */
-	/* dot1dStp subtree objects. */
-	int32_t		priority;
-	int32_t		root_cost;
-	int32_t		root_port;
-	int32_t		max_age;	/* Current max age. */
-	int32_t		hello_time;	/* Current hello time. */
-	int32_t		fwd_delay;	/* Current forward delay. */
-	int32_t		hold_time;
-	int32_t		bridge_max_age;	/* Configured max age. */
-	int32_t		bridge_hello_time; /* Configured hello time. */
-	int32_t		bridge_fwd_delay; /* Configured forward delay. */
-	int32_t		tx_hold_count;
-	uint32_t	top_changes;
-	enum dot1dStpVersion	stp_version;
-	enum dot1dStpProtocolSpecification prot_spec;
-	struct timeval	last_tc_time;
-	bridge_id	design_root;
-
-	/* dot1dTp subtree objects. */
-	int32_t		lrnt_drops;	/* Dropped addresses. */
-	int32_t		age_time;	/* Address entry timeout. */
-	int32_t		num_addrs;	/* Current # of addresses in cache. */
-	int32_t		max_addrs;	/* Max # of addresses in cache. */
-	struct tp_entry	 *f_tpa;	/* This bridge's first entry in
-					 * the tp addresses TAILQ. */
-
-	time_t		entry_age;
-	time_t		ports_age;
-	time_t		addrs_age;
-	TAILQ_ENTRY(bridge_if) b_if;
-};
-
-void bridge_ifs_fini(void);
-
-struct bridge_if *bridge_if_find_ifs(uint32_t sysindex);
-
-struct bridge_if *bridge_if_find_ifname(const char *b_name);
-
-const char *bridge_if_find_name(uint32_t sysindex);
-
-int bridge_compare_sysidx(uint32_t i1, uint32_t i2);
-
-int bridge_attach_newif(struct mibif *ifp);
-
-struct bridge_if *bridge_first_bif(void);
-
-struct bridge_if *bridge_next_bif(struct bridge_if *b_pr);
-
-void bridge_remove_bif(struct bridge_if *bif);
-
-void bridge_update_all_ports(void);
-
-void bridge_update_all_addrs(void);
-
-void bridge_update_all_ifs(void);
-
-void bridge_update_all(void *arg);
-
-void bridge_update_tc_time(void *arg);
-
-void bridge_ifs_dump(void);
-
-/* Bridge ports. */
-void bridge_ports_update_listage(void);
-
-void bridge_ports_fini(void);
-
-void bridge_members_free(struct bridge_if *bif);
-
-struct bridge_port *bridge_new_port(struct mibif *mif, struct bridge_if *bif);
-
-void bridge_port_remove(struct bridge_port *bp, struct bridge_if *bif);
-
-struct bridge_port *bridge_port_bif_first(struct bridge_if *bif);
-
-struct bridge_port *bridge_port_bif_next(struct bridge_port *bp);
-
-struct bridge_port *bridge_port_find(int32_t if_idx, struct bridge_if *bif);
-
-void bridge_port_getinfo_mibif(struct mibif *m_if, struct bridge_port *bp);
-
-int bridge_getinfo_bif_ports(struct bridge_if *bif);
-
-int bridge_update_memif(struct bridge_if *bif);
-
-void bridge_ports_dump(struct bridge_if *bif);
-
-/* Bridge addresses. */
-void bridge_addrs_update_listage(void);
-
-void bridge_addrs_fini(void);
-
-void bridge_addrs_free(struct bridge_if *bif);
-
-struct tp_entry *bridge_new_addrs(uint8_t *mac, struct bridge_if *bif);
-
-void bridge_addrs_remove(struct tp_entry *te, struct bridge_if *bif);
-
-struct tp_entry *bridge_addrs_find(uint8_t *mac, struct bridge_if *bif);
-
-struct tp_entry *bridge_addrs_bif_first(struct bridge_if *bif);
-
-struct tp_entry *bridge_addrs_bif_next(struct tp_entry *te);
-
-int bridge_getinfo_bif_addrs(struct bridge_if *bif);
-
-int bridge_update_addrs(struct bridge_if *bif);
-
-void bridge_addrs_dump(struct bridge_if *bif);
-
-/* Bridge PF. */
-
-void bridge_pf_dump(void);
-
-/* System specific. */
-
-/* Open the socket for the ioctls. */
-int bridge_ioctl_init(void);
-
-/* Load bridge kernel module. */
-int bridge_kmod_load(void);
-
-/* Get the bridge interface information. */
-int bridge_getinfo_bif(struct bridge_if *bif);
-
-/* Get the bridge interface STP parameters. */
-int bridge_get_op_param(struct bridge_if *bif);
-
-/* Set the bridge priority. */
-int bridge_set_priority(struct bridge_if *bif, int32_t priority);
-
-/* Set the bridge max age. */
-int bridge_set_maxage(struct bridge_if *bif, int32_t max_age);
-
-/* Set the bridge hello time.*/
-int bridge_set_hello_time(struct bridge_if *bif, int32_t hello_time);
-
-/* Set the bridge forward delay.*/
-int bridge_set_forward_delay(struct bridge_if *bif, int32_t fwd_delay);
-
-/* Set the bridge address cache max age. */
-int bridge_set_aging_time(struct bridge_if *bif, int32_t age_time);
-
-/* Set the max number of entries in the bridge address cache. */
-int bridge_set_max_cache(struct bridge_if *bif, int32_t max_cache);
-
-/* Set the bridge TX hold count. */
-int bridge_set_tx_hold_count(struct bridge_if *bif, int32_t tx_hc);
-
-/* Set the bridge STP protocol version. */
-int bridge_set_stp_version(struct bridge_if *bif, int32_t stp_proto);
-
-/* Set the bridge interface status to up/down. */
-int bridge_set_if_up(const char* b_name, int8_t up);
-
-/* Create a bridge interface. */
-int bridge_create(const char *b_name);
-
-/* Destroy a bridge interface. */
-int bridge_destroy(const char *b_name);
-
-/* Fetch the bridge mac address. */
-u_char *bridge_get_basemac(const char *bif_name, u_char *mac, size_t mlen);
-
-/* Set a bridge member priority. */
-int bridge_port_set_priority(const char *bif_name, struct bridge_port *bp,
-    int32_t priority);
-
-/* Set a bridge member STP-enabled flag. */
-int bridge_port_set_stp_enable(const char *bif_name, struct bridge_port *bp,
-    uint32_t enable);
-
-/* Set a bridge member STP path cost. */
-int bridge_port_set_path_cost(const char *bif_name, struct bridge_port *bp,
-    int32_t path_cost);
-
-/* Set admin point-to-point link. */
-int bridge_port_set_admin_ptp(const char *bif_name, struct bridge_port *bp,
-    uint32_t admin_ptp);
-
-/* Set admin edge. */
-int bridge_port_set_admin_edge(const char *bif_name, struct bridge_port *bp,
-    uint32_t enable);
-
-/* Set 'private' flag. */
-int bridge_port_set_private(const char *bif_name, struct bridge_port *bp,
-    uint32_t priv_set);
-
-/* Add a bridge member port. */
-int bridge_port_addm(struct bridge_port *bp, const char *b_name);
-
-/* Delete a bridge member port. */
-int bridge_port_delm(struct bridge_port *bp, const char *b_name);
-
-/* Get the current value from the module for bridge PF control. */
-int32_t bridge_get_pfval(uint8_t which);
-
-/* Get/Set a bridge PF control. */
-int32_t bridge_do_pfctl(int32_t bridge_ctl, enum snmp_op op, int32_t *val);
-
-#endif /* SNMP_BRIDGE_H */
diff --git a/include.new/bsnmp/snmp.h b/include.new/bsnmp/snmp.h
deleted file mode 100644
index 631d2f2..0000000
--- a/include.new/bsnmp/snmp.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- * 
- * Copyright (c) 2010 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by Shteryana Sotirova Shopova
- * under sponsorship from the FreeBSD Foundation.
- *
- * 
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- *
- * $Begemot: bsnmp/lib/snmp.h,v 1.30 2004/08/06 08:46:54 brandt Exp $
- *
- * Header file for SNMP functions.
- */
-#ifndef snmp_h_
-#define snmp_h_
-
-#include <sys/types.h>
-
-#define SNMP_COMMUNITY_MAXLEN		128
-#define SNMP_MAX_BINDINGS		100
-#define	SNMP_CONTEXT_NAME_SIZ		(32 + 1)
-#define	SNMP_ENGINE_ID_SIZ		32
-#define	SNMP_TIME_WINDOW		150
-
-enum snmp_syntax {
-	SNMP_SYNTAX_NULL	= 0,
-	SNMP_SYNTAX_INTEGER,		/* == INTEGER32 */
-	SNMP_SYNTAX_OCTETSTRING,
-	SNMP_SYNTAX_OID,
-	SNMP_SYNTAX_IPADDRESS,
-	SNMP_SYNTAX_COUNTER,
-	SNMP_SYNTAX_GAUGE,		/* == UNSIGNED32 */
-	SNMP_SYNTAX_TIMETICKS,
-
-	/* v2 additions */
-	SNMP_SYNTAX_COUNTER64,
-	SNMP_SYNTAX_NOSUCHOBJECT,	/* exception */
-	SNMP_SYNTAX_NOSUCHINSTANCE,	/* exception */
-	SNMP_SYNTAX_ENDOFMIBVIEW,	/* exception */
-};
-
-struct snmp_value {
-	struct asn_oid		var;
-	enum snmp_syntax	syntax;
-	union snmp_values {
-	  int32_t		integer;	/* also integer32 */
-	  struct {
-	    u_int		len;
-	    u_char		*octets;
-	  }			octetstring;
-	  struct asn_oid	oid;
-	  u_char		ipaddress[4];
-	  uint32_t		uint32;		/* also gauge32, counter32,
-						   unsigned32, timeticks */
-	  uint64_t		counter64;
-	}			v;
-};
-
-enum snmp_version {
-	SNMP_Verr = 0,
-	SNMP_V1 = 1,
-	SNMP_V2c = 2,
-	SNMP_V3,
-};
-
-#define	SNMP_MPM_SNMP_V1		0
-#define	SNMP_MPM_SNMP_V2c		1
-#define	SNMP_MPM_SNMP_V3		3
-
-#define	SNMP_ADM_STR32_SIZ		(32 + 1)
-#define	SNMP_AUTH_KEY_SIZ		40
-#define	SNMP_PRIV_KEY_SIZ		32
-#define	SNMP_USM_AUTH_SIZE		12
-#define	SNMP_USM_PRIV_SIZE		8
-#define	SNMP_AUTH_HMACMD5_KEY_SIZ	16
-#define	SNMP_AUTH_HMACSHA_KEY_SIZ	20
-#define	SNMP_PRIV_AES_KEY_SIZ		16
-#define	SNMP_PRIV_DES_KEY_SIZ		8
-
-
-enum snmp_secmodel {
-	SNMP_SECMODEL_ANY = 0,
-	SNMP_SECMODEL_SNMPv1 = 1,
-	SNMP_SECMODEL_SNMPv2c = 2,
-	SNMP_SECMODEL_USM = 3,
-	SNMP_SECMODEL_UNKNOWN
-};
-
-enum snmp_usm_level {
-	SNMP_noAuthNoPriv = 1,
-	SNMP_authNoPriv = 2,
-	SNMP_authPriv = 3
-};
-
-enum snmp_authentication {
-	SNMP_AUTH_NOAUTH = 0,
-	SNMP_AUTH_HMAC_MD5,
-	SNMP_AUTH_HMAC_SHA
-};
-
-enum snmp_privacy {
-	SNMP_PRIV_NOPRIV = 0,
-	SNMP_PRIV_DES = 1,
-	SNMP_PRIV_AES
-};
-
-struct snmp_engine {
-	uint8_t			engine_id[SNMP_ENGINE_ID_SIZ];
-	uint32_t		engine_len;
-	int32_t			engine_boots;
-	int32_t			engine_time;
-	int32_t			max_msg_size;
-};
-
-struct snmp_user {
-	char				sec_name[SNMP_ADM_STR32_SIZ];
-	enum snmp_authentication	auth_proto;
-	enum snmp_privacy		priv_proto;
-	uint8_t				auth_key[SNMP_AUTH_KEY_SIZ];
-	uint8_t				priv_key[SNMP_PRIV_KEY_SIZ];
-};
-
-struct snmp_pdu {
-	char			community[SNMP_COMMUNITY_MAXLEN + 1];
-	enum snmp_version	version;
-	u_int			type;
-
-	/* SNMPv3 PDU header fields */
-	int32_t			identifier;
-	uint8_t			flags;
-	int32_t			security_model;
-	struct snmp_engine	engine;
-
-	/* Associated USM user parameters */
-	struct snmp_user	user;
-	uint8_t			msg_digest[SNMP_USM_AUTH_SIZE];
-	uint8_t			msg_salt[SNMP_USM_PRIV_SIZE];
-
-	/*  View-based Access Model */
-	/* XXX: put in separate structure - conflicts with struct snmp_context */
-	uint32_t		context_engine_len;
-	uint8_t			context_engine[SNMP_ENGINE_ID_SIZ];
-	char			context_name[SNMP_CONTEXT_NAME_SIZ];
-
-	/* trap only */
-	struct asn_oid		enterprise;
-	u_char			agent_addr[4];
-	int32_t			generic_trap;
-	int32_t			specific_trap;
-	uint32_t		time_stamp;
-
-	/* others */
-	int32_t			request_id;
-	int32_t			error_status;
-	int32_t			error_index;
-
-	/* fixes for encoding */
-	size_t			outer_len;
-	size_t			scoped_len;
-	u_char			*outer_ptr;
-	u_char			*digest_ptr;
-	u_char			*encrypted_ptr;
-	u_char			*scoped_ptr;
-	u_char			*pdu_ptr;
-	u_char			*vars_ptr;
-
-
-	struct snmp_value	bindings[SNMP_MAX_BINDINGS];
-	u_int			nbindings;
-};
-#define snmp_v1_pdu snmp_pdu
-
-#define SNMP_PDU_GET		0
-#define SNMP_PDU_GETNEXT	1
-#define SNMP_PDU_RESPONSE	2
-#define SNMP_PDU_SET		3
-#define SNMP_PDU_TRAP		4	/* v1 */
-#define SNMP_PDU_GETBULK	5	/* v2 */
-#define SNMP_PDU_INFORM		6	/* v2 */
-#define SNMP_PDU_TRAP2		7	/* v2 */
-#define SNMP_PDU_REPORT		8	/* v2 */
-
-#define SNMP_ERR_NOERROR	0
-#define SNMP_ERR_TOOBIG		1
-#define SNMP_ERR_NOSUCHNAME	2	/* v1 */
-#define SNMP_ERR_BADVALUE	3	/* v1 */
-#define SNMP_ERR_READONLY	4	/* v1 */
-#define SNMP_ERR_GENERR		5
-#define SNMP_ERR_NO_ACCESS	6	/* v2 */
-#define SNMP_ERR_WRONG_TYPE	7	/* v2 */
-#define SNMP_ERR_WRONG_LENGTH	8	/* v2 */
-#define SNMP_ERR_WRONG_ENCODING	9	/* v2 */
-#define SNMP_ERR_WRONG_VALUE	10	/* v2 */
-#define SNMP_ERR_NO_CREATION	11	/* v2 */
-#define SNMP_ERR_INCONS_VALUE	12	/* v2 */
-#define SNMP_ERR_RES_UNAVAIL	13	/* v2 */
-#define SNMP_ERR_COMMIT_FAILED	14	/* v2 */
-#define SNMP_ERR_UNDO_FAILED	15	/* v2 */
-#define SNMP_ERR_AUTH_ERR	16	/* v2 */
-#define SNMP_ERR_NOT_WRITEABLE	17	/* v2 */
-#define SNMP_ERR_INCONS_NAME	18	/* v2 */
-
-#define SNMP_TRAP_COLDSTART	0
-#define SNMP_TRAP_WARMSTART	1
-#define SNMP_TRAP_LINKDOWN	2
-#define SNMP_TRAP_LINKUP	3
-#define SNMP_TRAP_AUTHENTICATION_FAILURE	4
-#define SNMP_TRAP_EGP_NEIGHBOR_LOSS	5
-#define SNMP_TRAP_ENTERPRISE	6
-
-enum snmp_code {
-	SNMP_CODE_OK = 0,
-	SNMP_CODE_FAILED,
-	SNMP_CODE_BADVERS,
-	SNMP_CODE_BADLEN,
-	SNMP_CODE_BADENC,
-	SNMP_CODE_OORANGE,
-	SNMP_CODE_BADSECLEVEL,
-	SNMP_CODE_NOTINTIME,
-	SNMP_CODE_BADUSER,
-	SNMP_CODE_BADENGINE,
-	SNMP_CODE_BADDIGEST,
-	SNMP_CODE_EDECRYPT
-};
-
-#define	SNMP_MSG_AUTH_FLAG		0x1
-#define	SNMP_MSG_PRIV_FLAG		0x2
-#define	SNMP_MSG_REPORT_FLAG		0x4
-#define	SNMP_MSG_AUTODISCOVER		0x80
-
-void snmp_value_free(struct snmp_value *);
-int snmp_value_parse(const char *, enum snmp_syntax, union snmp_values *);
-int snmp_value_copy(struct snmp_value *, const struct snmp_value *);
-
-void snmp_pdu_free(struct snmp_pdu *);
-void snmp_pdu_init_secparams(struct snmp_pdu *);
-enum snmp_code snmp_pdu_decode(struct asn_buf *b, struct snmp_pdu *pdu, int32_t *);
-enum snmp_code snmp_pdu_decode_header(struct asn_buf *, struct snmp_pdu *);
-enum snmp_code snmp_pdu_decode_scoped(struct asn_buf *, struct snmp_pdu *, int32_t *);
-enum snmp_code snmp_pdu_encode(struct snmp_pdu *, struct asn_buf *);
-enum snmp_code snmp_pdu_decode_secmode(struct asn_buf *, struct snmp_pdu *);
-
-int snmp_pdu_snoop(const struct asn_buf *);
-
-void snmp_pdu_dump(const struct snmp_pdu *pdu);
-
-enum snmp_code snmp_passwd_to_keys(struct snmp_user *, char *);
-enum snmp_code snmp_get_local_keys(struct snmp_user *, uint8_t *, uint32_t);
-enum snmp_code snmp_calc_keychange(struct snmp_user *, uint8_t *);
-
-extern void (*snmp_error)(const char *, ...);
-extern void (*snmp_printf)(const char *, ...);
-
-#define TRUTH_MK(F) ((F) ? 1 : 2)
-#define TRUTH_GET(T) (((T) == 1) ? 1 : 0)
-#define TRUTH_OK(T)  ((T) == 1 || (T) == 2)
-
-#endif
diff --git a/include.new/bsnmp/snmp_atm.h b/include.new/bsnmp/snmp_atm.h
deleted file mode 100644
index 50784cc..0000000
--- a/include.new/bsnmp/snmp_atm.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- * 
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- *
- * $Begemot: libunimsg/snmp_atm/snmp_atm.h,v 1.2 2004/08/06 17:30:40 brandt Exp $
- */
-#ifndef _BSNMP_SNMP_ATM_H
-#define _BSNMP_SNMP_ATM_H
-
-enum atmif_notify {
-	ATMIF_NOTIFY_DESTROY,	/* interface has been destroyed */
-	ATMIF_NOTIFY_CARRIER,	/* carriere change */
-	ATMIF_NOTIFY_VCC	/* VCC change */
-};
-
-enum atmif_carrier_state {
-	ATMIF_CARRIER_ON	= 1,
-	ATMIF_CARRIER_OFF	= 2,
-	ATMIF_CARRIER_UNKNOWN	= 3,
-	ATMIF_CARRIER_NONE	= 4
-};
-
-enum atmif_suni_mode {
-	ATMIF_SUNI_MODE_SONET	= 1,
-	ATMIF_SUNI_MODE_SDH	= 2,
-	ATMIF_SUNI_MODE_UNKNOWN	= 3
-};
-
-/* forward declaration */
-struct atmif;
-typedef void (*atmif_event_f)(struct atmif *, enum atmif_notify, uintptr_t,
-    void *);
-
-struct atmif_mib {
-	u_int	version;	/* currently 0 */
-
-	u_int	device;		/* type of hardware (system specific) */
-	u_int	serial;		/* card serial number (device specific) */
-	u_int	hw_version;	/* card version (device specific) */
-	u_int	sw_version;	/* firmware version (device specific) */
-	u_int	media;		/* physical media (see MIB) */
-
-	u_char	esi[6];		/* end system identifier (MAC) */
-	u_int	pcr;		/* supported peak cell rate */
-	u_int	vpi_bits;	/* number of used bits in VPI field */
-	u_int	vci_bits;	/* number of used bits in VCI field */
-	u_int	max_vpcs;	/* maximum number of VPCs */
-	u_int	max_vccs;	/* maximum number of VCCs */
-};
-
-struct atmif {
-	struct mibif	*ifp;		/* common interface data */
-	struct atmif_mib *mib;		/* ATM MIB */
-	enum atmif_carrier_state carrier;
-	enum atmif_suni_mode mode;	/* SUNI mode SDH or SONET */
-};
-
-/* find an ATM interface by name */
-struct atmif *atm_find_if_name(const char *);
-
-/* get the interface from the interface index */
-struct atmif *atm_find_if(u_int);
-
-/* register for notifications */
-void *atm_notify_aif(struct atmif *, const struct lmodule *mod,
-    atmif_event_f, void *);
-void atm_unnotify_aif(void *);
-
-/* return the If for a system-specific node number */
-struct atmif *atm_node2if(u_int);
-
-/* return the node id for the if */
-u_int atm_if2node(struct atmif *);
-
-#endif
diff --git a/include.new/bsnmp/snmp_mibII.h b/include.new/bsnmp/snmp_mibII.h
deleted file mode 100644
index 91e552e..0000000
--- a/include.new/bsnmp/snmp_mibII.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- * 
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- *
- * $Begemot: bsnmp/snmp_mibII/snmp_mibII.h,v 1.18 2006/02/14 09:04:19 brandt_h Exp $
- *
- * Implementation of the interfaces and IP groups of MIB-II.
- */
-#ifndef snmp_mibII_h_
-#define snmp_mibII_h_
-
-/* forward declaration */
-struct mibif;
-
-enum mibif_notify {
-	MIBIF_NOTIFY_DESTROY
-};
-
-typedef void (*mibif_notify_f)(struct mibif *, enum mibif_notify, void *);
-
-/*
- * Interfaces. This structure describes one interface as seen in the MIB.
- * Interfaces are indexed by ifindex. This is not the same as the index
- * used by the system because of the rules in RFC-2863 section 3.1.5. This
- * RFC requires, that an ifindex is not to be re-used for ANOTHER dynamically
- * interfaces once the interface was deleted. The system's ifindex is in
- * sysindex. Mapping is via the mapping table below.
- */
-struct mibif {
-	TAILQ_ENTRY(mibif) link;
-	u_int		flags;
-	u_int		index;		/* the logical ifindex */
-	u_int		sysindex;
-	char		name[IFNAMSIZ];
-	char		descr[256];
-	struct ifmibdata mib;
-	uint64_t	mibtick;
-	void		*specmib;
-	size_t		specmiblen;
-	u_char		*physaddr;
-	u_int		physaddrlen;
-	int		has_connector;
-	int		trap_enable;
-	uint64_t	counter_disc;
-
-	/*
-	 * This is needed to handle interface type specific information
-	 * in sub-modules. It contains a function pointer which handles
-	 * notifications and a data pointer to arbitrary data.
-	 * Should be set via the mibif_notify function.
-	 */
-	mibif_notify_f	xnotify;
-	void		*xnotify_data;
-	const struct lmodule *xnotify_mod;
-
-	/* to be set by ifType specific modules. This is ifSpecific. */
-	struct asn_oid	spec_oid;
-
-	/* private data - don't touch */
-	void		*private;
-};
-
-/*
- * Interface IP-address table.
- */
-struct mibifa {
-	TAILQ_ENTRY(mibifa) link;
-	struct in_addr	inaddr;
-	struct in_addr	inmask;
-	struct in_addr	inbcast;
-	struct asn_oid	index;		/* index for table search */
-	u_int		ifindex;
-	u_int		flags;
-};
-
-/*
- * Interface receive addresses. Interface link-level multicast, broadcast
- * and hardware addresses are handled automatically.
- */
-struct mibrcvaddr {
-	TAILQ_ENTRY(mibrcvaddr) link;
-	struct asn_oid	index;
-	u_int		ifindex;
-	u_char		addr[ASN_MAXOIDLEN];
-	size_t		addrlen;
-	u_int		flags;
-};
-enum {
-	MIBRCVADDR_VOLATILE	= 0x00000001,
-	MIBRCVADDR_BCAST	= 0x00000002,
-	MIBRCVADDR_HW		= 0x00000004,
-};
-
-/* network socket */
-extern int mib_netsock;
-
-/* set an interface name to dynamic mode */
-void mib_if_set_dyn(const char *);
-
-/* re-read the systems interface list */
-void mib_refresh_iflist(void);
-
-/* find interface by index */
-struct mibif *mib_find_if(u_int);
-struct mibif *mib_find_if_sys(u_int);
-struct mibif *mib_find_if_name(const char *);
-
-/* iterate through all interfaces */
-struct mibif *mib_first_if(void);
-struct mibif *mib_next_if(const struct mibif *);
-
-/* register for interface creations */
-int mib_register_newif(int (*)(struct mibif *), const struct lmodule *);
-void mib_unregister_newif(const struct lmodule *);
-
-/* get fresh MIB data */
-int mib_fetch_ifmib(struct mibif *);
-
-/* change the ADMIN status of an interface and refresh the MIB */
-int mib_if_admin(struct mibif *, int up);
-
-/* find interface address by address */
-struct mibifa *mib_find_ifa(struct in_addr);
-
-/* find first/next address for a given interface */
-struct mibifa *mib_first_ififa(const struct mibif *);
-struct mibifa *mib_next_ififa(struct mibifa *);
-
-/* create/delete stacking entries */
-int mib_ifstack_create(const struct mibif *lower, const struct mibif *upper);
-void mib_ifstack_delete(const struct mibif *lower, const struct mibif *upper);
-
-/* find receive address */
-struct mibrcvaddr *mib_find_rcvaddr(u_int, const u_char *, size_t);
-
-/* create/delete receive addresses */
-struct mibrcvaddr *mib_rcvaddr_create(struct mibif *, const u_char *, size_t);
-void mib_rcvaddr_delete(struct mibrcvaddr *);
-
-/* register for interface notification */
-void *mibif_notify(struct mibif *, const struct lmodule *, mibif_notify_f,
-    void *);
-void mibif_unnotify(void *);
-
-#endif
diff --git a/include.new/bsnmp/snmp_netgraph.h b/include.new/bsnmp/snmp_netgraph.h
deleted file mode 100644
index 780c5b4..0000000
--- a/include.new/bsnmp/snmp_netgraph.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation 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.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY FRAUNHOFER FOKUS
- * AND ITS 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
- * FRAUNHOFER FOKUS OR ITS 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: releng/10.2/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.h 122405 2003-11-10 09:17:34Z harti $
- *
- * Netgraph interface for SNMPd. Exported stuff.
- */
-#ifndef SNMP_NETGRAPH_H_
-#define SNMP_NETGRAPH_H_
-
-#include <netgraph/ng_message.h>
-
-extern ng_ID_t	snmp_node;
-extern u_char *snmp_nodename;
-
-typedef void ng_cookie_f(const struct ng_mesg *, const char *, ng_ID_t, void *);
-typedef void ng_hook_f(const char *, const u_char *, size_t, void *);
-
-void *ng_register_cookie(const struct lmodule *, uint32_t cookie,
-    ng_ID_t, ng_cookie_f *, void *);
-void ng_unregister_cookie(void *reg);
-
-void *ng_register_hook(const struct lmodule *, const char *,
-    ng_hook_f *, void *);
-void ng_unregister_hook(void *reg);
-
-void ng_unregister_module(const struct lmodule *);
-
-int ng_output(const char *path, u_int cookie, u_int opcode,
-    const void *arg, size_t arglen);
-int ng_output_node(const char *node, u_int cookie, u_int opcode,
-    const void *arg, size_t arglen);
-int ng_output_id(ng_ID_t node, u_int cookie, u_int opcode,
-    const void *arg, size_t arglen);
-
-struct ng_mesg *ng_dialog(const char *path, u_int cookie, u_int opcode,
-    const void *arg, size_t arglen);
-struct ng_mesg *ng_dialog_node(const char *node, u_int cookie, u_int opcode,
-    const void *arg, size_t arglen);
-struct ng_mesg *ng_dialog_id(ng_ID_t id, u_int cookie, u_int opcode,
-    const void *arg, size_t arglen);
-
-int ng_send_data(const char *hook, const void *sndbuf, size_t sndlen);
-
-ng_ID_t ng_mkpeer_id(ng_ID_t, const char *name, const char *type,
-    const char *hook, const char *peerhook);
-int ng_connect_node(const char *node, const char *ourhook, const char *peerhook);
-int ng_connect_id(ng_ID_t id, const char *ourhook, const char *peerhook);
-int ng_connect2_id(ng_ID_t id, ng_ID_t peer, const char *ourhook,
-    const char *peerhook);
-int ng_connect2_tee_id(ng_ID_t id, ng_ID_t peer, const char *ourhook,
-    const char *peerhook);
-int ng_rmhook(const char *ourhook);
-int ng_rmhook_id(ng_ID_t, const char *);
-int ng_rmhook_tee_id(ng_ID_t, const char *);
-int ng_shutdown_id(ng_ID_t);
-
-ng_ID_t ng_next_node_id(ng_ID_t node, const char *type, const char *hook);
-ng_ID_t ng_node_id(const char *path);
-ng_ID_t ng_node_id_node(const char *node);
-ng_ID_t ng_node_name(ng_ID_t, char *);
-ng_ID_t ng_node_type(ng_ID_t, char *);
-int ng_peer_hook_id(ng_ID_t, const char *, char *);
-
-#endif
diff --git a/include.new/bsnmp/snmpagent.h b/include.new/bsnmp/snmpagent.h
deleted file mode 100644
index 66019c9..0000000
--- a/include.new/bsnmp/snmpagent.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- * 
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- *
- * $Begemot: bsnmp/lib/snmpagent.h,v 1.13 2004/08/06 08:46:56 brandt Exp $
- *
- * Header file for SNMP functions. This requires snmp.h to be included.
- */
-#ifndef snmp_agent_h_
-#define snmp_agent_h_
-
-struct snmp_dependency;
-
-enum snmp_ret {
-	/* OK, generate a response */
-	SNMP_RET_OK	= 0,
-	/* Error, ignore packet (no response) */
-	SNMP_RET_IGN	= 1,
-	/* Error, generate response from original packet */
-	SNMP_RET_ERR	= 2
-};
-
-/* Semi-Opaque object for SET operations */
-struct snmp_context {
-	u_int	var_index;
-	struct snmp_scratch *scratch;
-	struct snmp_dependency *dep;
-	void	*data;		/* user data */
-	enum snmp_ret code;	/* return code */
-};
-
-struct snmp_scratch {
-	void		*ptr1;
-	void		*ptr2;
-	uint32_t	int1;
-	uint32_t	int2;
-};
-
-enum snmp_depop {
-	SNMP_DEPOP_COMMIT,
-	SNMP_DEPOP_ROLLBACK,
-	SNMP_DEPOP_FINISH
-};
-
-typedef int (*snmp_depop_t)(struct snmp_context *, struct snmp_dependency *,
-    enum snmp_depop);
-
-struct snmp_dependency {
-	struct asn_oid	obj;
-	struct asn_oid	idx;
-};
-
-/*
- * The TREE
- */
-enum snmp_node_type {
-	SNMP_NODE_LEAF = 1,
-	SNMP_NODE_COLUMN
-};
-
-enum snmp_op {
-	SNMP_OP_GET 	= 1,
-	SNMP_OP_GETNEXT,
-	SNMP_OP_SET,
-	SNMP_OP_COMMIT,
-	SNMP_OP_ROLLBACK,
-};
-
-typedef int (*snmp_op_t)(struct snmp_context *, struct snmp_value *,
-    u_int, u_int, enum snmp_op);
-
-struct snmp_node {
-	struct asn_oid oid;
-	const char	*name;		/* name of the leaf */
-	enum snmp_node_type type;	/* type of this node */
-	enum snmp_syntax syntax;
-	snmp_op_t	op;
-	u_int		flags;
-	uint32_t	index;		/* index data */
-	void		*data;		/* application data */
-	void		*tree_data;	/* application data */
-};
-extern struct snmp_node *tree;
-extern u_int  tree_size;
-
-#define SNMP_NODE_CANSET	0x0001	/* SET allowed */
-
-#define SNMP_INDEXES_MAX	7
-#define SNMP_INDEX_SHIFT	4
-#define SNMP_INDEX_MASK	0xf
-#define SNMP_INDEX_COUNT(V)	((V) & SNMP_INDEX_MASK)
-#define SNMP_INDEX(V,I) \
-	(((V) >> (((I) + 1) * SNMP_INDEX_SHIFT)) & SNMP_INDEX_MASK)
-
-enum {
-	SNMP_TRACE_GET		= 0x00000001,
-	SNMP_TRACE_GETNEXT	= 0x00000002,
-	SNMP_TRACE_SET		= 0x00000004,
-	SNMP_TRACE_DEPEND	= 0x00000008,
-	SNMP_TRACE_FIND		= 0x00000010,
-};
-/* trace flag for the following functions */
-extern u_int snmp_trace;
-
-/* called to write the trace */
-extern void (*snmp_debug)(const char *fmt, ...);
-
-enum snmp_ret snmp_get(struct snmp_pdu *pdu, struct asn_buf *resp_b,
-    struct snmp_pdu *resp, void *);
-enum snmp_ret snmp_getnext(struct snmp_pdu *pdu, struct asn_buf *resp_b,
-    struct snmp_pdu *resp, void *);
-enum snmp_ret snmp_getbulk(struct snmp_pdu *pdu, struct asn_buf *resp_b,
-    struct snmp_pdu *resp, void *);
-enum snmp_ret snmp_set(struct snmp_pdu *pdu, struct asn_buf *resp_b,
-    struct snmp_pdu *resp, void *);
-
-enum snmp_ret snmp_make_errresp(const struct snmp_pdu *, struct asn_buf *,
-    struct asn_buf *);
-
-struct snmp_dependency *snmp_dep_lookup(struct snmp_context *,
-    const struct asn_oid *, const struct asn_oid *, size_t, snmp_depop_t);
-
-struct snmp_context *snmp_init_context(void);
-int snmp_dep_commit(struct snmp_context *);
-int snmp_dep_rollback(struct snmp_context *);
-void snmp_dep_finish(struct snmp_context *);
-
-#endif
diff --git a/include.new/bsnmp/snmpclient.h b/include.new/bsnmp/snmpclient.h
deleted file mode 100644
index 619f726..0000000
--- a/include.new/bsnmp/snmpclient.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *	   Kendy Kutzner
- * 
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- *
- * $Begemot: bsnmp/lib/snmpclient.h,v 1.19 2005/05/23 11:10:14 brandt_h Exp $
- */
-#ifndef _BSNMP_SNMPCLIENT_H
-#define _BSNMP_SNMPCLIENT_H
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <stddef.h>
-
-
-#define SNMP_STRERROR_LEN 200
-
-#define SNMP_LOCAL_PATH	"/tmp/snmpXXXXXXXXXXXXXX"
-
-/*
- * transport methods
- */
-#define	SNMP_TRANS_UDP		0
-#define	SNMP_TRANS_LOC_DGRAM	1
-#define	SNMP_TRANS_LOC_STREAM	2
-
-/* type of callback function for responses
- * this callback function is responsible for free() any memory associated with
- * any of the PDUs. Therefor it may call snmp_pdu_free() */
-typedef void (*snmp_send_cb_f)(struct snmp_pdu *, struct snmp_pdu *, void *);
-
-/* type of callback function for timeouts */
-typedef void (*snmp_timeout_cb_f)(void * );
-
-/* timeout start function */
-typedef void *(*snmp_timeout_start_f)(struct timeval *timeout,  
-    snmp_timeout_cb_f callback, void *);
-
-/* timeout stop function */
-typedef void (*snmp_timeout_stop_f)(void *timeout_id);
-
-/*
- * Client context.
- */
-struct snmp_client {
-	enum snmp_version	version;
-	int			trans;	/* which transport to use */
-
-	/* these two are read-only for the application */
-	char			*cport;	/* port number as string */
-	char			*chost;	/* host name or IP address as string */
-
-	char			read_community[SNMP_COMMUNITY_MAXLEN + 1];
-	char			write_community[SNMP_COMMUNITY_MAXLEN + 1];
-
-	/* SNMPv3 specific fields */
-	int32_t			identifier;
-	int32_t			security_model;
-	struct snmp_engine	engine;
-	struct snmp_user	user;
-
-	/* SNMPv3 Access control - VACM*/
-	uint32_t		clen;
-	uint8_t			cengine[SNMP_ENGINE_ID_SIZ];
-	char			cname[SNMP_CONTEXT_NAME_SIZ];
-
-	struct timeval		timeout;
-	u_int			retries;
-
-	int			dump_pdus;
-
-	size_t			txbuflen;
-	size_t			rxbuflen;
-
-	int			fd;
-
-	int32_t			next_reqid;
-	int32_t			max_reqid;
-	int32_t			min_reqid;
-
-	char			error[SNMP_STRERROR_LEN];
-
-	snmp_timeout_start_f	timeout_start;
-	snmp_timeout_stop_f	timeout_stop;
-
-	char			local_path[sizeof(SNMP_LOCAL_PATH)];
-};
-
-/* the global context */
-extern struct snmp_client snmp_client;
-
-/* initizialies a snmp_client structure */
-void snmp_client_init(struct snmp_client *);
-
-/* initialize fields */
-int snmp_client_set_host(struct snmp_client *, const char *);
-int snmp_client_set_port(struct snmp_client *, const char *);
-
-/* open connection to snmp server (hostname or portname can be NULL) */
-int snmp_open(const char *_hostname, const char *_portname,
-    const char *_read_community, const char *_write_community);
-
-/* close connection */
-void snmp_close(void);
-
-/* initialize a snmp_pdu structure */
-void snmp_pdu_create(struct snmp_pdu *, u_int _op);
-
-/* add pairs of (struct asn_oid *, enum snmp_syntax) to an existing pdu */
-int snmp_add_binding(struct snmp_pdu *, ...);
-
-/* check wheater the answer is valid or not */
-int snmp_pdu_check(const struct snmp_pdu *_req, const struct snmp_pdu *_resp);
-
-int32_t snmp_pdu_send(struct snmp_pdu *_pdu, snmp_send_cb_f _func, void *_arg);
-
-/*  append an index to an oid */
-int snmp_oid_append(struct asn_oid *_oid, const char *_fmt, ...);
-
-/* receive a packet */
-int snmp_receive(int _blocking);
-
-/*
- * This structure is used to describe an SNMP table that is to be fetched.
- * The C-structure that is produced by the fetch function must start with
- * a TAILQ_ENTRY and an u_int64_t.
- */
-struct snmp_table {
-	/* base OID of the table */
-	struct asn_oid		table;
-	/* type OID of the LastChange variable for the table if any */
-	struct asn_oid		last_change;
-	/* maximum number of iterations if table has changed */
-	u_int			max_iter;
-	/* size of the C-structure */
-	size_t			entry_size;
-	/* number of index fields */
-	u_int			index_size;
-	/* bit mask of required fields */
-	uint64_t		req_mask;
-
-	/* indexes and columns to fetch. Ended by a NULL syntax entry */
-	struct snmp_table_entry {
-	    /* the column sub-oid, ignored for index fields */
-	    asn_subid_t		subid;
-	    /* the syntax of the column or index */
-	    enum snmp_syntax	syntax;
-	    /* offset of the field into the C-structure. For octet strings
-	     * this points to an u_char * followed by a size_t */
-	    off_t		offset;
-#if defined(__GNUC__) && __GNUC__ < 3
-	}			entries[0];
-#else
-	}			entries[];
-#endif
-};
-
-/* callback type for table fetch */
-typedef void (*snmp_table_cb_f)(void *_list, void *_arg, int _res);
-
-/* fetch a table. The argument points to a TAILQ_HEAD */
-int snmp_table_fetch(const struct snmp_table *descr, void *);
-int snmp_table_fetch_async(const struct snmp_table *, void *,
-    snmp_table_cb_f, void *);
-
-/* send a request and wait for the response */
-int snmp_dialog(struct snmp_pdu *_req, struct snmp_pdu *_resp);
-
-/* discover an authorative snmpEngineId */
-int snmp_discover_engine(char *);
-
-/* parse a server specification */
-int snmp_parse_server(struct snmp_client *, const char *);
-
-#endif /* _BSNMP_SNMPCLIENT_H */
diff --git a/include.new/bsnmp/snmpmod.h b/include.new/bsnmp/snmpmod.h
deleted file mode 100644
index 4abc460..0000000
--- a/include.new/bsnmp/snmpmod.h
+++ /dev/null
@@ -1,625 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- * 
- * Copyright (c) 2010 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by Shteryana Sotirova Shopova
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- *
- * $Begemot: bsnmp/snmpd/snmpmod.h,v 1.32 2006/02/14 09:04:20 brandt_h Exp $
- *
- * SNMP daemon data and functions exported to modules.
- */
-#ifndef snmpmod_h_
-#define snmpmod_h_
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include "asn1.h"
-#include "snmp.h"
-#include "snmpagent.h"
-
-#define MAX_MOD_ARGS	16
-
-/*
- * These macros help to handle object lists for SNMP tables. They use
- * tail queues to hold the objects in ascending order in the list.
- * ordering can be done either on an integer/unsigned field, an asn_oid
- * or an ordering function.
- */
-#define INSERT_OBJECT_OID_LINK_INDEX(PTR, LIST, LINK, INDEX) do {	\
-	__typeof (PTR) _lelem;						\
-									\
-	TAILQ_FOREACH(_lelem, (LIST), LINK)				\
-		if (asn_compare_oid(&_lelem->INDEX, &(PTR)->INDEX) > 0)	\
-			break;						\
-	if (_lelem == NULL)						\
-		TAILQ_INSERT_TAIL((LIST), (PTR), LINK);			\
-	else								\
-		TAILQ_INSERT_BEFORE(_lelem, (PTR), LINK);		\
-    } while (0)
-
-#define INSERT_OBJECT_INT_LINK_INDEX(PTR, LIST, LINK, INDEX) do {	\
-	__typeof (PTR) _lelem;						\
-									\
-	TAILQ_FOREACH(_lelem, (LIST), LINK)				\
-		if ((asn_subid_t)_lelem->INDEX > (asn_subid_t)(PTR)->INDEX)\
-			break;						\
-	if (_lelem == NULL)						\
-		TAILQ_INSERT_TAIL((LIST), (PTR), LINK);			\
-	else								\
-		TAILQ_INSERT_BEFORE(_lelem, (PTR), LINK);		\
-    } while (0)
-
-#define	INSERT_OBJECT_FUNC_LINK(PTR, LIST, LINK, FUNC) do {		\
-	__typeof (PTR) _lelem;						\
-									\
-	TAILQ_FOREACH(_lelem, (LIST), LINK)				\
-		if ((FUNC)(_lelem, (PTR)) > 0)				\
-			break;						\
-	if (_lelem == NULL)						\
-		TAILQ_INSERT_TAIL((LIST), (PTR), LINK);			\
-	else								\
-		TAILQ_INSERT_BEFORE(_lelem, (PTR), LINK);		\
-    } while (0)
-
-#define	INSERT_OBJECT_FUNC_LINK_REV(PTR, LIST, HEAD, LINK, FUNC) do {	\
-	__typeof (PTR) _lelem;						\
-									\
-	TAILQ_FOREACH_REVERSE(_lelem, (LIST), HEAD, LINK)		\
-		if ((FUNC)(_lelem, (PTR)) < 0)				\
-			break;						\
-	if (_lelem == NULL)						\
-		TAILQ_INSERT_HEAD((LIST), (PTR), LINK);			\
-	else								\
-		TAILQ_INSERT_AFTER((LIST), _lelem, (PTR), LINK);	\
-    } while (0)
-
-#define FIND_OBJECT_OID_LINK_INDEX(LIST, OID, SUB, LINK, INDEX) ({	\
-	__typeof (TAILQ_FIRST(LIST)) _lelem;				\
-									\
-	TAILQ_FOREACH(_lelem, (LIST), LINK)				\
-		if (index_compare(OID, SUB, &_lelem->INDEX) == 0)	\
-			break;						\
-	(_lelem);							\
-    })
-
-#define NEXT_OBJECT_OID_LINK_INDEX(LIST, OID, SUB, LINK, INDEX) ({	\
-	__typeof (TAILQ_FIRST(LIST)) _lelem;				\
-									\
-	TAILQ_FOREACH(_lelem, (LIST), LINK)				\
-		if (index_compare(OID, SUB, &_lelem->INDEX) < 0)	\
-			break;						\
-	(_lelem);							\
-    })
-
-#define FIND_OBJECT_INT_LINK_INDEX(LIST, OID, SUB, LINK, INDEX) ({	\
-	__typeof (TAILQ_FIRST(LIST)) _lelem;				\
-									\
-	if ((OID)->len - SUB != 1)					\
-		_lelem = NULL;						\
-	else								\
-		TAILQ_FOREACH(_lelem, (LIST), LINK)			\
-			if ((OID)->subs[SUB] == (asn_subid_t)_lelem->INDEX)\
-				break;					\
-	(_lelem);							\
-    })
-
-#define NEXT_OBJECT_INT_LINK_INDEX(LIST, OID, SUB, LINK, INDEX) ({	\
-	__typeof (TAILQ_FIRST(LIST)) _lelem;				\
-									\
-	if ((OID)->len - SUB == 0)					\
-		_lelem = TAILQ_FIRST(LIST);				\
-	else								\
-		TAILQ_FOREACH(_lelem, (LIST), LINK)			\
-			if ((OID)->subs[SUB] < (asn_subid_t)_lelem->INDEX)\
-				break;					\
-	(_lelem);							\
-    })
-
-#define FIND_OBJECT_FUNC_LINK(LIST, OID, SUB, LINK, FUNC) ({		\
-	__typeof (TAILQ_FIRST(LIST)) _lelem;				\
-									\
-	TAILQ_FOREACH(_lelem, (LIST), LINK)				\
-		if ((FUNC)(OID, SUB, _lelem) == 0)			\
-			break;						\
-	(_lelem);							\
-    })
-
-#define NEXT_OBJECT_FUNC_LINK(LIST, OID, SUB, LINK, FUNC) ({		\
-	__typeof (TAILQ_FIRST(LIST)) _lelem;				\
-									\
-	TAILQ_FOREACH(_lelem, (LIST), LINK)				\
-		if ((FUNC)(OID, SUB, _lelem) < 0)			\
-			break;						\
-	(_lelem);							\
-    })
-
-/*
- * Macros for the case where the index field is called 'index'
- */
-#define INSERT_OBJECT_OID_LINK(PTR, LIST, LINK)				\
-    INSERT_OBJECT_OID_LINK_INDEX(PTR, LIST, LINK, index)
-
-#define INSERT_OBJECT_INT_LINK(PTR, LIST, LINK) do {			\
-    INSERT_OBJECT_INT_LINK_INDEX(PTR, LIST, LINK, index)
-
-#define FIND_OBJECT_OID_LINK(LIST, OID, SUB, LINK)			\
-    FIND_OBJECT_OID_LINK_INDEX(LIST, OID, SUB, LINK, index)
-
-#define NEXT_OBJECT_OID_LINK(LIST, OID, SUB, LINK)			\
-    NEXT_OBJECT_OID_LINK_INDEX(LIST, OID, SUB, LINK, index)
-
-#define FIND_OBJECT_INT_LINK(LIST, OID, SUB, LINK)			\
-    FIND_OBJECT_INT_LINK_INDEX(LIST, OID, SUB, LINK, index)
-
-#define NEXT_OBJECT_INT_LINK(LIST, OID, SUB, LINK)			\
-    NEXT_OBJECT_INT_LINK_INDEX(LIST, OID, SUB, LINK, index)
-
-/*
- * Macros for the case where the index field is called 'index' and the
- * link field 'link'.
- */
-#define INSERT_OBJECT_OID(PTR, LIST)					\
-    INSERT_OBJECT_OID_LINK_INDEX(PTR, LIST, link, index)
-
-#define INSERT_OBJECT_INT(PTR, LIST)					\
-    INSERT_OBJECT_INT_LINK_INDEX(PTR, LIST, link, index)
-
-#define	INSERT_OBJECT_FUNC_REV(PTR, LIST, HEAD, FUNC)			\
-    INSERT_OBJECT_FUNC_LINK_REV(PTR, LIST, HEAD, link, FUNC)
-
-#define FIND_OBJECT_OID(LIST, OID, SUB)					\
-    FIND_OBJECT_OID_LINK_INDEX(LIST, OID, SUB, link, index)
-
-#define FIND_OBJECT_INT(LIST, OID, SUB)					\
-    FIND_OBJECT_INT_LINK_INDEX(LIST, OID, SUB, link, index)
-
-#define	FIND_OBJECT_FUNC(LIST, OID, SUB, FUNC)				\
-    FIND_OBJECT_FUNC_LINK(LIST, OID, SUB, link, FUNC)
-
-#define NEXT_OBJECT_OID(LIST, OID, SUB)					\
-    NEXT_OBJECT_OID_LINK_INDEX(LIST, OID, SUB, link, index)
-
-#define NEXT_OBJECT_INT(LIST, OID, SUB)					\
-    NEXT_OBJECT_INT_LINK_INDEX(LIST, OID, SUB, link, index)
-
-#define	NEXT_OBJECT_FUNC(LIST, OID, SUB, FUNC)				\
-    NEXT_OBJECT_FUNC_LINK(LIST, OID, SUB, link, FUNC)
-
-struct lmodule;
-
-/* The tick when the program was started. This is the absolute time of
- * the start in 100th of a second. */
-extern uint64_t start_tick;
-
-/* The tick when the current packet was received. This is the absolute
- * time in 100th of second. */
-extern uint64_t this_tick;
-
-/* Get the current absolute time in 100th of a second. */
-uint64_t get_ticks(void);
-
-/*
- * Return code for proxy function
- */
-enum snmpd_proxy_err {
-	/* proxy code will process the PDU */
-	SNMPD_PROXY_OK,
-	/* proxy code does not process PDU */
-	SNMPD_PROXY_REJ,
-	/* drop this PDU */
-	SNMPD_PROXY_DROP,
-	/* drop because of bad community */
-	SNMPD_PROXY_BADCOMM,
-	/* drop because of bad community use */
-	SNMPD_PROXY_BADCOMMUSE
-};
-
-/*
- * Input handling
- */
-enum snmpd_input_err {
-	/* proceed with packet */
-	SNMPD_INPUT_OK,
-	/* fatal error in packet, ignore it */
-	SNMPD_INPUT_FAILED,
-	/* value encoding has wrong length in a SET operation */
-	SNMPD_INPUT_VALBADLEN,
-	/* value encoding is out of range */
-	SNMPD_INPUT_VALRANGE,
-	/* value has bad encoding */
-	SNMPD_INPUT_VALBADENC,
-	/* need more data (truncated packet) */
-	SNMPD_INPUT_TRUNC,
-	/* unknown community */
-	SNMPD_INPUT_BAD_COMM,
-};
-
-/*
- * Every loadable module must have one of this structures with
- * the external name 'config'.
- */
-struct snmp_module {
-	/* a comment describing what this module implements */
-	const char *comment;
-
-	/* the initialization function */
-	int (*init)(struct lmodule *, int argc, char *argv[]);
-
-	/* the finalisation function */
-	int (*fini)(void);
-
-	/* the idle function */
-	void (*idle)(void);
-
-	/* the dump function */
-	void (*dump)(void);
-
-	/* re-configuration function */
-	void (*config)(void);
-
-	/* start operation */
-	void (*start)(void);
-
-	/* proxy a PDU */
-	enum snmpd_proxy_err (*proxy)(struct snmp_pdu *, void *,
-	    const struct asn_oid *, const struct sockaddr *, socklen_t,
-	    enum snmpd_input_err, int32_t, int);
-
-	/* the tree this module is going to server */
-	const struct snmp_node *tree;
-	u_int tree_size;
-
-	/* function called, when another module was unloaded/loaded */
-	void (*loading)(const struct lmodule *, int);
-};
-
-/*
- * Stuff exported to modules
- */
-
-/*
- * The system group.
- */
-struct systemg {
-	u_char		*descr;
-	struct asn_oid	object_id;
-	u_char		*contact;
-	u_char		*name;
-	u_char		*location;
-	uint32_t	services;
-	uint32_t	or_last_change;
-};
-extern struct systemg systemg;
-
-/*
- * Community support.
- *
- * We have 2 fixed communities for SNMP read and write access. Modules
- * can create their communities dynamically. They are deleted automatically
- * if the module is unloaded.
- */
-#define COMM_INITIALIZE	0
-#define COMM_READ	1
-#define COMM_WRITE	2
-
-u_int comm_define(u_int, const char *descr, struct lmodule *, const char *str);
-const char * comm_string(u_int);
-
-/* community for current packet */
-extern u_int community;
-
-/*
- * SNMP User-based Security Model data. Modified via the snmp_usm(3) module.
- */
-struct snmpd_usmstat {
-	uint32_t	unsupported_seclevels;
-	uint32_t	not_in_time_windows;
-	uint32_t	unknown_users;
-	uint32_t	unknown_engine_ids;
-	uint32_t	wrong_digests;
-	uint32_t	decrypt_errors;
-};
-
-extern struct snmpd_usmstat snmpd_usmstats;
-struct snmpd_usmstat *bsnmpd_get_usm_stats(void);
-void bsnmpd_reset_usm_stats(void);
-
-struct usm_user {
-	struct snmp_user		suser;
-	uint8_t				user_engine_id[SNMP_ENGINE_ID_SIZ];
-	uint32_t			user_engine_len;
-	char				user_public[SNMP_ADM_STR32_SIZ];
-	uint32_t			user_public_len;
-	int32_t				status;
-	int32_t				type;
-	SLIST_ENTRY(usm_user)		up;
-};
-
-SLIST_HEAD(usm_userlist, usm_user);
-struct usm_user *usm_first_user(void);
-struct usm_user *usm_next_user(struct usm_user *);
-struct usm_user *usm_find_user(uint8_t *, uint32_t, char *);
-struct usm_user *usm_new_user(uint8_t *, uint32_t, char *);
-void usm_delete_user(struct usm_user *);
-void usm_flush_users(void);
-
-/* USM user for current packet */
-extern struct usm_user *usm_user;
-
-/*
- * SNMP View-based Access Control Model data. Modified via the snmp_vacm(3) module.
- */
-struct vacm_group;
-
-struct vacm_user {
-	/* Security user name from USM */
-	char				secname[SNMP_ADM_STR32_SIZ];
-	int32_t				sec_model;
-	/* Back pointer to user assigned group name */
-	struct vacm_group		*group;
-	int32_t				type;
-	int32_t				status;
-	SLIST_ENTRY(vacm_user)		vvu;
-	SLIST_ENTRY(vacm_user)		vvg;
-};
-
-SLIST_HEAD(vacm_userlist, vacm_user);
-
-struct vacm_group {
-	char				groupname[SNMP_ADM_STR32_SIZ];
-	struct vacm_userlist		group_users;
-	SLIST_ENTRY(vacm_group)		vge;
-};
-
-SLIST_HEAD(vacm_grouplist, vacm_group);
-
-struct vacm_access {
-	/* The group name is index, not a column in the table */
-	struct vacm_group		*group;
-	char				ctx_prefix[SNMP_ADM_STR32_SIZ];
-	int32_t				sec_model;
-	int32_t				sec_level;
-	int32_t				ctx_match;
-	struct vacm_view		*read_view;
-	struct vacm_view		*write_view;
-	struct vacm_view		*notify_view;
-	int32_t				type;
-	int32_t				status;
-	TAILQ_ENTRY(vacm_access)	vva;
-};
-
-TAILQ_HEAD(vacm_accesslist, vacm_access);
-
-struct vacm_view {
-	char				viewname[SNMP_ADM_STR32_SIZ]; /* key */
-	struct asn_oid			subtree; /* key */
-	uint8_t				mask[16];
-	uint8_t				exclude;
-	int32_t				type;
-	int32_t				status;
-	SLIST_ENTRY(vacm_view)		vvl;
-};
-
-SLIST_HEAD(vacm_viewlist, vacm_view);
-
-struct vacm_context {
-	/* The ID of the module that registered this context */
-	int32_t				regid;
-	char				ctxname[SNMP_ADM_STR32_SIZ];
-	SLIST_ENTRY(vacm_context)	vcl;
-};
-
-SLIST_HEAD(vacm_contextlist, vacm_context);
-
-void vacm_groups_init(void);
-struct vacm_user *vacm_first_user(void);
-struct vacm_user *vacm_next_user(struct vacm_user *);
-struct vacm_user *vacm_new_user(int32_t, char *);
-int vacm_delete_user(struct vacm_user *);
-int vacm_user_set_group(struct vacm_user *, u_char *, u_int);
-struct vacm_access *vacm_first_access_rule(void);
-struct vacm_access *vacm_next_access_rule(struct vacm_access *);
-struct vacm_access *vacm_new_access_rule(char *, char *, int32_t, int32_t);
-int vacm_delete_access_rule(struct vacm_access *);
-struct vacm_view *vacm_first_view(void);
-struct vacm_view *vacm_next_view(struct vacm_view *);
-struct vacm_view *vacm_new_view(char *, struct asn_oid *);
-int vacm_delete_view(struct vacm_view *);
-struct vacm_context *vacm_first_context(void);
-struct vacm_context *vacm_next_context(struct vacm_context *);
-struct vacm_context *vacm_add_context(char *, int32_t);
-void vacm_flush_contexts(int32_t);
-
-/*
- * RFC 3413 SNMP Management Target & Notification MIB
- */
-
-struct snmpd_target_stats {
-	uint32_t			unavail_contexts;
-	uint32_t			unknown_contexts;
-};
-
-#define	SNMP_UDP_ADDR_SIZ		6
-#define	SNMP_TAG_SIZ			(255 + 1)
-
-struct target_address {
-	char				name[SNMP_ADM_STR32_SIZ];
-	uint8_t				address[SNMP_UDP_ADDR_SIZ];
-	int32_t				timeout;
-	int32_t				retry;
-	char				taglist[SNMP_TAG_SIZ];
-	char				paramname[SNMP_ADM_STR32_SIZ];
-	int32_t				type;
-	int32_t				socket;
-	int32_t				status;
-	SLIST_ENTRY(target_address)	ta;
-};
-
-SLIST_HEAD(target_addresslist, target_address);
-
-struct target_param {
-	char				name[SNMP_ADM_STR32_SIZ];
-	int32_t				mpmodel;
-	int32_t				sec_model;
-	char				secname[SNMP_ADM_STR32_SIZ];
-	enum snmp_usm_level		sec_level;
-	int32_t				type;
-	int32_t				status;
-	SLIST_ENTRY(target_param)	tp;
-};
-
-SLIST_HEAD(target_paramlist, target_param);
-
-struct target_notify {
-	char				name[SNMP_ADM_STR32_SIZ];
-	char				taglist[SNMP_TAG_SIZ];
-	int32_t				notify_type;
-	int32_t				type;
-	int32_t				status;
-	SLIST_ENTRY(target_notify)	tn;
-};
-
-SLIST_HEAD(target_notifylist, target_notify);
-
-extern struct snmpd_target_stats snmpd_target_stats;
-struct snmpd_target_stats *bsnmpd_get_target_stats(void);
-struct target_address *target_first_address(void);
-struct target_address *target_next_address(struct target_address *);
-struct target_address *target_new_address(char *);
-int target_activate_address(struct target_address *);
-int target_delete_address(struct target_address *);
-struct target_param *target_first_param(void);
-struct target_param *target_next_param(struct target_param *);
-struct target_param *target_new_param(char *);
-int target_delete_param(struct target_param *);
-struct target_notify *target_first_notify(void);
-struct target_notify *target_next_notify(struct target_notify *);
-struct target_notify *target_new_notify(char *);
-int target_delete_notify (struct target_notify *);
-void target_flush_all(void);
-
-/*
- * Well known OIDs
- */
-extern const struct asn_oid oid_zeroDotZero;
-
-/* SNMPv3 Engine Discovery */
-extern const struct asn_oid oid_usmUnknownEngineIDs;
-extern const struct asn_oid oid_usmNotInTimeWindows;
-
-/*
- * Request ID ranges.
- *
- * A module can request a range of request ids and associate them with a
- * type field. All ranges are deleted if a module is unloaded.
- */
-u_int reqid_allocate(int size, struct lmodule *);
-int32_t reqid_next(u_int type);
-int32_t reqid_base(u_int type);
-int reqid_istype(int32_t reqid, u_int type);
-u_int reqid_type(int32_t reqid);
-
-/*
- * Timers.
- */
-void *timer_start(u_int, void (*)(void *), void *, struct lmodule *);
-void *timer_start_repeat(u_int, u_int, void (*)(void *), void *,
-    struct lmodule *);
-void timer_stop(void *);
-
-/*
- * File descriptors
- */
-void *fd_select(int, void (*)(int, void *), void *, struct lmodule *);
-void fd_deselect(void *);
-void fd_suspend(void *);
-int fd_resume(void *);
-
-/*
- * Object resources
- */
-u_int or_register(const struct asn_oid *, const char *, struct lmodule *);
-void or_unregister(u_int);
-
-/*
- * Buffers
- */
-void *buf_alloc(int tx);
-size_t buf_size(int tx);
-
-/* decode PDU and find community */
-enum snmpd_input_err snmp_input_start(const u_char *, size_t, const char *,
-    struct snmp_pdu *, int32_t *, size_t *);
-
-/* process the pdu. returns either _OK or _FAILED */
-enum snmpd_input_err snmp_input_finish(struct snmp_pdu *, const u_char *,
-    size_t, u_char *, size_t *, const char *, enum snmpd_input_err, int32_t,
-    void *);
-
-void snmp_output(struct snmp_pdu *, u_char *, size_t *, const char *);
-void snmp_send_port(void *, const struct asn_oid *, struct snmp_pdu *,
-	const struct sockaddr *, socklen_t);
-enum snmp_code snmp_pdu_auth_access(struct snmp_pdu *, int32_t *);
-
-/* sending traps */
-void snmp_send_trap(const struct asn_oid *, ...);
-
-/*
- * Action support
- */
-int string_save(struct snmp_value *, struct snmp_context *, ssize_t, u_char **);
-void string_commit(struct snmp_context *);
-void string_rollback(struct snmp_context *, u_char **);
-int string_get(struct snmp_value *, const u_char *, ssize_t);
-int string_get_max(struct snmp_value *, const u_char *, ssize_t, size_t);
-void string_free(struct snmp_context *);
-
-int ip_save(struct snmp_value *, struct snmp_context *, u_char *);
-void ip_rollback(struct snmp_context *, u_char *);
-void ip_commit(struct snmp_context *);
-int ip_get(struct snmp_value *, u_char *);
-
-int oid_save(struct snmp_value *, struct snmp_context *, struct asn_oid *);
-void oid_rollback(struct snmp_context *, struct asn_oid *);
-void oid_commit(struct snmp_context *);
-int oid_get(struct snmp_value *, const struct asn_oid *);
-
-int index_decode(const struct asn_oid *oid, u_int sub, u_int code, ...);
-int index_compare(const struct asn_oid *, u_int, const struct asn_oid *);
-int index_compare_off(const struct asn_oid *, u_int, const struct asn_oid *,
-    u_int);
-void index_append(struct asn_oid *, u_int, const struct asn_oid *);
-void index_append_off(struct asn_oid *, u_int, const struct asn_oid *, u_int);
-
-#endif
diff --git a/include.new/bzlib.h b/include.new/bzlib.h
deleted file mode 100644
index 8277123..0000000
--- a/include.new/bzlib.h
+++ /dev/null
@@ -1,282 +0,0 @@
-
-/*-------------------------------------------------------------*/
-/*--- Public header file for the library.                   ---*/
-/*---                                               bzlib.h ---*/
-/*-------------------------------------------------------------*/
-
-/* ------------------------------------------------------------------
-   This file is part of bzip2/libbzip2, a program and library for
-   lossless, block-sorting data compression.
-
-   bzip2/libbzip2 version 1.0.6 of 6 September 2010
-   Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
-
-   Please read the WARNING, DISCLAIMER and PATENTS sections in the 
-   README file.
-
-   This program is released under the terms of the license contained
-   in the file LICENSE.
-   ------------------------------------------------------------------ */
-
-
-#ifndef _BZLIB_H
-#define _BZLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BZ_RUN               0
-#define BZ_FLUSH             1
-#define BZ_FINISH            2
-
-#define BZ_OK                0
-#define BZ_RUN_OK            1
-#define BZ_FLUSH_OK          2
-#define BZ_FINISH_OK         3
-#define BZ_STREAM_END        4
-#define BZ_SEQUENCE_ERROR    (-1)
-#define BZ_PARAM_ERROR       (-2)
-#define BZ_MEM_ERROR         (-3)
-#define BZ_DATA_ERROR        (-4)
-#define BZ_DATA_ERROR_MAGIC  (-5)
-#define BZ_IO_ERROR          (-6)
-#define BZ_UNEXPECTED_EOF    (-7)
-#define BZ_OUTBUFF_FULL      (-8)
-#define BZ_CONFIG_ERROR      (-9)
-
-typedef 
-   struct {
-      char *next_in;
-      unsigned int avail_in;
-      unsigned int total_in_lo32;
-      unsigned int total_in_hi32;
-
-      char *next_out;
-      unsigned int avail_out;
-      unsigned int total_out_lo32;
-      unsigned int total_out_hi32;
-
-      void *state;
-
-      void *(*bzalloc)(void *,int,int);
-      void (*bzfree)(void *,void *);
-      void *opaque;
-   } 
-   bz_stream;
-
-
-#ifndef BZ_IMPORT
-#define BZ_EXPORT
-#endif
-
-#ifndef BZ_NO_STDIO
-/* Need a definitition for FILE */
-#include <stdio.h>
-#endif
-
-#ifdef _WIN32
-#   include <windows.h>
-#   ifdef small
-      /* windows.h define small to char */
-#      undef small
-#   endif
-#   ifdef BZ_EXPORT
-#   define BZ_API(func) WINAPI func
-#   define BZ_EXTERN extern
-#   else
-   /* import windows dll dynamically */
-#   define BZ_API(func) (WINAPI * func)
-#   define BZ_EXTERN
-#   endif
-#else
-#   define BZ_API(func) func
-#   define BZ_EXTERN extern
-#endif
-
-
-/*-- Core (low-level) library functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressInit) ( 
-      bz_stream* strm, 
-      int        blockSize100k, 
-      int        verbosity, 
-      int        workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompress) ( 
-      bz_stream* strm, 
-      int action 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) ( 
-      bz_stream *strm, 
-      int       verbosity, 
-      int       small
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompress) ( 
-      bz_stream* strm 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) ( 
-      bz_stream *strm 
-   );
-
-
-
-/*-- High(er) level library functions --*/
-
-#ifndef BZ_NO_STDIO
-#define BZ_MAX_UNUSED 5000
-
-typedef void BZFILE;
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) ( 
-      int*  bzerror,   
-      FILE* f, 
-      int   verbosity, 
-      int   small,
-      void* unused,    
-      int   nUnused 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadClose) ( 
-      int*    bzerror, 
-      BZFILE* b 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void**  unused,  
-      int*    nUnused 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzRead) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) ( 
-      int*  bzerror,      
-      FILE* f, 
-      int   blockSize100k, 
-      int   verbosity, 
-      int   workFactor 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWrite) ( 
-      int*    bzerror, 
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in, 
-      unsigned int* nbytes_out 
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) ( 
-      int*          bzerror, 
-      BZFILE*       b, 
-      int           abandon, 
-      unsigned int* nbytes_in_lo32, 
-      unsigned int* nbytes_in_hi32, 
-      unsigned int* nbytes_out_lo32, 
-      unsigned int* nbytes_out_hi32
-   );
-#endif
-
-
-/*-- Utility functions --*/
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           blockSize100k, 
-      int           verbosity, 
-      int           workFactor 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) ( 
-      char*         dest, 
-      unsigned int* destLen,
-      char*         source, 
-      unsigned int  sourceLen,
-      int           small, 
-      int           verbosity 
-   );
-
-
-/*--
-   Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
-   to support better zlib compatibility.
-   This code is not _officially_ part of libbzip2 (yet);
-   I haven't tested it, documented it, or considered the
-   threading-safeness of it.
-   If this code breaks, please contact both Yoshioka and me.
---*/
-
-BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (
-      void
-   );
-
-#ifndef BZ_NO_STDIO
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (
-      const char *path,
-      const char *mode
-   );
-
-BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
-      int        fd,
-      const char *mode
-   );
-         
-BZ_EXTERN int BZ_API(BZ2_bzread) (
-      BZFILE* b, 
-      void* buf, 
-      int len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzwrite) (
-      BZFILE* b, 
-      void*   buf, 
-      int     len 
-   );
-
-BZ_EXTERN int BZ_API(BZ2_bzflush) (
-      BZFILE* b
-   );
-
-BZ_EXTERN void BZ_API(BZ2_bzclose) (
-      BZFILE* b
-   );
-
-BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
-      BZFILE *b, 
-      int    *errnum
-   );
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/*-------------------------------------------------------------*/
-/*--- end                                           bzlib.h ---*/
-/*-------------------------------------------------------------*/
diff --git a/include.new/c++/3.4/algorithm b/include.new/c++/3.4/algorithm
deleted file mode 100644
index 40e6246..0000000
--- a/include.new/c++/3.4/algorithm
+++ /dev/null
@@ -1,71 +0,0 @@
-// <algorithm> -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file algorithm
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_ALGORITHM
-#define _GLIBCXX_ALGORITHM 1
-
-#pragma GCC system_header
-
-#include <bits/stl_algobase.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_algo.h>
-
-#endif /* _GLIBCXX_ALGORITHM */
diff --git a/include.new/c++/3.4/backward/algo.h b/include.new/c++/3.4/backward/algo.h
deleted file mode 100644
index 6f24835..0000000
--- a/include.new/c++/3.4/backward/algo.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_ALGO_H
-#define _BACKWARD_ALGO_H 1
-
-#include "backward_warning.h"
-#include "algobase.h"
-#include "tempbuf.h"
-#include "iterator.h"
-#include <bits/stl_algo.h>
-#include <bits/stl_numeric.h>
-#include <ext/algorithm>
-#include <ext/numeric>
-
-// Names from <stl_algo.h>
-using std::for_each;
-using std::find;
-using std::find_if;
-using std::adjacent_find;
-using std::count;
-using std::count_if;
-using std::search;
-using std::search_n;
-using std::swap_ranges;
-using std::transform;
-using std::replace;
-using std::replace_if;
-using std::replace_copy;
-using std::replace_copy_if;
-using std::generate;
-using std::generate_n;
-using std::remove;
-using std::remove_if;
-using std::remove_copy;
-using std::remove_copy_if;
-using std::unique;
-using std::unique_copy;
-using std::reverse;
-using std::reverse_copy;
-using std::rotate;
-using std::rotate_copy;
-using std::random_shuffle;
-using std::partition;
-using std::stable_partition;
-using std::sort;
-using std::stable_sort;
-using std::partial_sort;
-using std::partial_sort_copy;
-using std::nth_element;
-using std::lower_bound;
-using std::upper_bound;
-using std::equal_range;
-using std::binary_search;
-using std::merge;
-using std::inplace_merge;
-using std::includes;
-using std::set_union;
-using std::set_intersection;
-using std::set_difference;
-using std::set_symmetric_difference;
-using std::min_element;
-using std::max_element;
-using std::next_permutation;
-using std::prev_permutation;
-using std::find_first_of;
-using std::find_end;
-
-// Names from stl_heap.h
-using std::push_heap;
-using std::pop_heap;
-using std::make_heap;
-using std::sort_heap;
-
-// Names from stl_numeric.h
-using std::accumulate;
-using std::inner_product;
-using std::partial_sum;
-using std::adjacent_difference;
-
-// Names from ext/algorithm
-using __gnu_cxx::random_sample;
-using __gnu_cxx::random_sample_n;
-using __gnu_cxx::is_sorted;
-using __gnu_cxx::is_heap;
-using __gnu_cxx::count;   // Extension returning void
-using __gnu_cxx::count_if;   // Extension returning void
-
-// Names from ext/numeric
-using __gnu_cxx::power;
-using __gnu_cxx::iota;
-
-#endif /* _BACKWARD_ALGO_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/algobase.h b/include.new/c++/3.4/backward/algobase.h
deleted file mode 100644
index 86028a0..0000000
--- a/include.new/c++/3.4/backward/algobase.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_ALGOBASE_H
-#define _BACKWARD_ALGOBASE_H 1
-
-#include "backward_warning.h"
-#include "pair.h"
-#include "iterator.h"
-#include <bits/stl_algobase.h>
-#include <bits/stl_uninitialized.h>
-#include <ext/algorithm>
-#include <ext/memory>
-
-// Names from stl_algobase.h
-using std::iter_swap;
-using std::swap;
-using std::min;
-using std::max;
-using std::copy;
-using std::copy_backward;
-using std::fill;
-using std::fill_n;
-using std::mismatch;
-using std::equal;
-using std::lexicographical_compare;
-
-// Names from stl_uninitialized.h
-using std::uninitialized_copy;
-using std::uninitialized_fill;
-using std::uninitialized_fill_n;
-
-// Names from ext/algorithm
-using __gnu_cxx::copy_n;
-using __gnu_cxx::lexicographical_compare_3way;
-
-// Names from ext/memory
-using __gnu_cxx::uninitialized_copy_n;
-
-#endif /* _BACKWARD_ALGOBASE_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/alloc.h b/include.new/c++/3.4/backward/alloc.h
deleted file mode 100644
index d3c3c73..0000000
--- a/include.new/c++/3.4/backward/alloc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996-1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_ALLOC_H
-#define _BACKWARD_ALLOC_H 1
-
-#include "backward_warning.h"
-#include <bits/c++config.h>
-#include <bits/allocator.h>
-
-using std::allocator;
-
-#endif
diff --git a/include.new/c++/3.4/backward/backward_warning.h b/include.new/c++/3.4/backward/backward_warning.h
deleted file mode 100644
index 9e13777..0000000
--- a/include.new/c++/3.4/backward/backward_warning.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_BACKWARD_WARNING_H
-#define _BACKWARD_BACKWARD_WARNING_H 1
-
-#ifdef __DEPRECATED
-#warning This file includes at least one deprecated or antiquated header. \
-Please consider using one of the 32 headers found in section 17.4.1.2 of the \
-C++ standard. Examples include substituting the <X> header for the <X.h> \
-header for C++ includes, or <iostream> instead of the deprecated header \
-<iostream.h>. To disable this warning use -Wno-deprecated.
-#endif
-
-#endif
diff --git a/include.new/c++/3.4/backward/bvector.h b/include.new/c++/3.4/backward/bvector.h
deleted file mode 100644
index 9245792..0000000
--- a/include.new/c++/3.4/backward/bvector.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_BVECTOR_H
-#define _BACKWARD_BVECTOR_H 1
-
-#include "backward_warning.h"
-#include <vector>
-
-typedef std::vector<bool, std::allocator<bool> > bit_vector;
-
-#endif /* _BACKWARD_BVECTOR_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/complex.h b/include.new/c++/3.4/backward/complex.h
deleted file mode 100644
index dfc6714..0000000
--- a/include.new/c++/3.4/backward/complex.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2000 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_COMPLEX_H
-#define _BACKWARD_COMPLEX_H 1
-
-#include "backward_warning.h"
-#include <complex>
-
-using std::complex;
-typedef complex<float>		float_complex;
-typedef complex<double>		double_complex;
-typedef complex<long double>	long_double_complex;
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/defalloc.h b/include.new/c++/3.4/backward/defalloc.h
deleted file mode 100644
index 76ea52a..0000000
--- a/include.new/c++/3.4/backward/defalloc.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-// Inclusion of this file is DEPRECATED.  This is the original HP
-// default allocator.  It is provided only for backward compatibility.
-// This file WILL BE REMOVED in a future release.
-//
-// DO NOT USE THIS FILE unless you have an old container implementation
-// that requires an allocator with the HP-style interface.
-//
-// Standard-conforming allocators have a very different interface.  The
-// standard default allocator is declared in the header <memory>.
-
-#ifndef _BACKWARD_DEFALLOC_H
-#define _BACKWARD_DEFALLOC_H 1
-
-#include "backward_warning.h"
-#include "new.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <limits.h>
-#include "iostream.h"
-#include "algobase.h"
-
-
-template <class _Tp>
-inline _Tp* allocate(ptrdiff_t __size, _Tp*) {
-    set_new_handler(0);
-    _Tp* __tmp = (_Tp*)(::operator new((size_t)(__size * sizeof(_Tp))));
-    if (__tmp == 0) {
-	cerr << "out of memory" << endl;
-	exit(1);
-    }
-    return __tmp;
-}
-
-
-template <class _Tp>
-inline void deallocate(_Tp* __buffer) {
-    ::operator delete(__buffer);
-}
-
-template <class _Tp>
-class allocator {
-public:
-    typedef _Tp value_type;
-    typedef _Tp* pointer;
-    typedef const _Tp* const_pointer;
-    typedef _Tp& reference;
-    typedef const _Tp& const_reference;
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    pointer allocate(size_type __n) {
-	return ::allocate((difference_type)__n, (pointer)0);
-    }
-    void deallocate(pointer __p) { ::deallocate(__p); }
-    pointer address(reference __x) { return (pointer)&__x; }
-    const_pointer const_address(const_reference __x) {
-	return (const_pointer)&__x;
-    }
-    size_type init_page_size() {
-	return max(size_type(1), size_type(4096/sizeof(_Tp)));
-    }
-    size_type max_size() const {
-	return max(size_type(1), size_type(UINT_MAX/sizeof(_Tp)));
-    }
-};
-
-class allocator<void> {
-public:
-    typedef void* pointer;
-};
-
-
-
-#endif /* _BACKWARD_DEFALLOC_H */
diff --git a/include.new/c++/3.4/backward/deque.h b/include.new/c++/3.4/backward/deque.h
deleted file mode 100644
index 36c7479..0000000
--- a/include.new/c++/3.4/backward/deque.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_DEQUE_H
-#define _BACKWARD_DEQUE_H 1
-
-#include "backward_warning.h"
-#include "algobase.h"
-#include "alloc.h"
-#include <deque>
-
-using std::deque;
-
-#endif /* _BACKWARD_DEQUE_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/fstream.h b/include.new/c++/3.4/backward/fstream.h
deleted file mode 100644
index 6dfd514..0000000
--- a/include.new/c++/3.4/backward/fstream.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_FSTREAM_H
-#define _BACKWARD_FSTREAM_H 1
-
-#include "backward_warning.h"
-#include <fstream>
-
-using std::filebuf;
-using std::ifstream;
-using std::ofstream;
-using std::fstream;
-using std::streampos;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-using std::wfilebuf;
-using std::wifstream;
-using std::wofstream;
-using std::wfstream;
-using std::wstreampos;
-#endif
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/function.h b/include.new/c++/3.4/backward/function.h
deleted file mode 100644
index 9fc8719..0000000
--- a/include.new/c++/3.4/backward/function.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_FUNCTION_H
-#define _BACKWARD_FUNCTION_H 1
-
-#include "backward_warning.h"
-#include <bits/c++config.h>
-#include <stddef.h>
-#include <bits/stl_function.h>
-#include <ext/functional>
-
-// Names from stl_function.h
-using std::unary_function;
-using std::binary_function;
-using std::plus;
-using std::minus;
-using std::multiplies;
-using std::divides;
-using std::modulus;
-using std::negate;
-using std::equal_to;
-using std::not_equal_to;
-using std::greater;
-using std::less;
-using std::greater_equal;
-using std::less_equal;
-using std::logical_and;
-using std::logical_or;
-using std::logical_not;
-using std::unary_negate;
-using std::binary_negate;
-using std::not1;
-using std::not2;
-using std::binder1st;
-using std::binder2nd;
-using std::bind1st;
-using std::bind2nd;
-using std::pointer_to_unary_function;
-using std::pointer_to_binary_function;
-using std::ptr_fun;
-using std::mem_fun_t;
-using std::const_mem_fun_t;
-using std::mem_fun_ref_t;
-using std::const_mem_fun_ref_t;
-using std::mem_fun1_t;
-using std::const_mem_fun1_t;
-using std::mem_fun1_ref_t;
-using std::const_mem_fun1_ref_t;
-using std::mem_fun;
-using std::mem_fun_ref;
-
-// Names from ext/functional
-using __gnu_cxx::identity_element;
-using __gnu_cxx::unary_compose;
-using __gnu_cxx::binary_compose;
-using __gnu_cxx::compose1;
-using __gnu_cxx::compose2;
-using __gnu_cxx::identity;
-using __gnu_cxx::select1st;
-using __gnu_cxx::select2nd;
-using __gnu_cxx::project1st;
-using __gnu_cxx::project2nd;
-using __gnu_cxx::constant_void_fun;
-using __gnu_cxx::constant_unary_fun;
-using __gnu_cxx::constant_binary_fun;
-using __gnu_cxx::constant0;
-using __gnu_cxx::constant1;
-using __gnu_cxx::constant2;
-using __gnu_cxx::subtractive_rng;
-using __gnu_cxx::mem_fun1;
-using __gnu_cxx::mem_fun1_ref;
-
-#endif /* _BACKWARD_FUNCTION_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/hash_map.h b/include.new/c++/3.4/backward/hash_map.h
deleted file mode 100644
index bc9c148..0000000
--- a/include.new/c++/3.4/backward/hash_map.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-#ifndef _BACKWARD_HASH_MAP_H
-#define _BACKWARD_HASH_MAP_H 1
-
-#include "backward_warning.h"
-#include "algobase.h"
-#include <ext/hash_map>
-
-using __gnu_cxx::hash;
-using __gnu_cxx::hashtable;
-using __gnu_cxx::hash_map;
-using __gnu_cxx::hash_multimap;
-
-#endif /* _BACKWARD_HASH_MAP_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/hash_set.h b/include.new/c++/3.4/backward/hash_set.h
deleted file mode 100644
index 89307de..0000000
--- a/include.new/c++/3.4/backward/hash_set.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-#ifndef _BACKWARD_HASH_SET_H
-#define _BACKWARD_HASH_SET_H 1
-
-#include "backward_warning.h"
-#include "algobase.h"
-#include <ext/hash_set>
-
-using __gnu_cxx::hash;
-using __gnu_cxx::hashtable;
-using __gnu_cxx::hash_set;
-using __gnu_cxx::hash_multiset;
-
-#endif /* _BACKWARD_HASH_SET_H */
-
diff --git a/include.new/c++/3.4/backward/hashtable.h b/include.new/c++/3.4/backward/hashtable.h
deleted file mode 100644
index abedd55..0000000
--- a/include.new/c++/3.4/backward/hashtable.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/* NOTE: This is an internal header file, included by other STL headers.
- *   You should not attempt to use it directly.
- */
-
-#ifndef _BACKWARD_HASHTABLE_H
-#define _BACKWARD_HASHTABLE_H 1
-
-#include "backward_warning.h"
-#include <ext/hashtable.h>
-#include "algo.h"
-#include "alloc.h"
-#include "vector.h"
-
-using __gnu_cxx::hash;
-using __gnu_cxx::hashtable;
-
-#endif /* _BACKWARD_HASHTABLE_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/heap.h b/include.new/c++/3.4/backward/heap.h
deleted file mode 100644
index 2f19545..0000000
--- a/include.new/c++/3.4/backward/heap.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_HEAP_H
-#define _BACKWARD_HEAP_H 1
-
-#include "backward_warning.h"
-#include <bits/c++config.h>
-#include <bits/stl_heap.h>
-
-using std::push_heap;
-using std::pop_heap;
-using std::make_heap;
-using std::sort_heap;
-
-#endif /* _BACKWARD_HEAP_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/iomanip.h b/include.new/c++/3.4/backward/iomanip.h
deleted file mode 100644
index 160dbeb..0000000
--- a/include.new/c++/3.4/backward/iomanip.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (C) 2000 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_IOMANIP_H
-#define _BACKWARD_IOMANIP_H 1
-
-#include "backward_warning.h"
-#include "iostream.h"
-#include <iomanip>
-
-// These are from <ios> as per [27.4].
-using std::boolalpha;
-using std::noboolalpha;
-using std::showbase;
-using std::noshowbase;
-using std::showpoint;
-using std::noshowpoint;
-using std::showpos;
-using std::noshowpos;
-using std::skipws;
-using std::noskipws;
-using std::uppercase;
-using std::nouppercase;
-using std::internal;
-using std::left;
-using std::right;
-using std::dec;
-using std::hex;
-using std::oct;
-using std::fixed;
-using std::scientific;
-
-// These are from <iomanip> as per [27.6].  Manipulators from <istream>
-// and <ostream> (e.g., endl) are made available via <iostream.h>.
-using std::resetiosflags;
-using std::setiosflags;
-using std::setbase;
-using std::setfill;
-using std::setprecision;
-using std::setw;
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/iostream.h b/include.new/c++/3.4/backward/iostream.h
deleted file mode 100644
index 5a5ccea..0000000
--- a/include.new/c++/3.4/backward/iostream.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_IOSTREAM_H
-#define _BACKWARD_IOSTREAM_H 1
-
-#include "backward_warning.h"
-#include <iostream>
-
-using std::iostream;
-using std::ostream;
-using std::istream;
-using std::ios;
-using std::streambuf;
-
-using std::cout;
-using std::cin;
-using std::cerr;
-using std::clog;
-#ifdef _GLIBCXX_USE_WCHAR_T
-using std::wcout;
-using std::wcin;
-using std::wcerr;
-using std::wclog;
-#endif
-
-using std::ws;
-using std::endl;
-using std::ends;
-using std::flush;
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/istream.h b/include.new/c++/3.4/backward/istream.h
deleted file mode 100644
index 707b575..0000000
--- a/include.new/c++/3.4/backward/istream.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2000 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_ISTREAM_H
-#define _BACKWARD_ISTREAM_H 1
-
-#include "backward_warning.h"
-#include "iostream.h"
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
-
-
-
-
-
diff --git a/include.new/c++/3.4/backward/iterator.h b/include.new/c++/3.4/backward/iterator.h
deleted file mode 100644
index 8316a83..0000000
--- a/include.new/c++/3.4/backward/iterator.h
+++ /dev/null
@@ -1,191 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_ITERATOR_H
-#define _BACKWARD_ITERATOR_H 1
-
-#include "backward_warning.h"
-#include "function.h"
-#include <stddef.h>
-#include "iostream.h"
-#include <iterator>
-
-#include <bits/stl_construct.h>
-#include <bits/stl_raw_storage_iter.h>
-
-#include <ext/iterator> // For 3-parameter distance extension
-
-// Names from stl_iterator.h
-using std::input_iterator_tag;
-using std::output_iterator_tag;
-using std::forward_iterator_tag;
-using std::bidirectional_iterator_tag;
-using std::random_access_iterator_tag;
-
-#if 0
-using std::iterator;
-#endif
-
-// The base classes input_iterator, output_iterator, forward_iterator,
-// bidirectional_iterator, and random_access_iterator are not part of
-// the C++ standard.  (They have been replaced by struct iterator.)
-// They are included for backward compatibility with the HP STL.
-template<typename _Tp, typename _Distance>
-  struct input_iterator {
-    typedef input_iterator_tag iterator_category;
-    typedef _Tp                value_type;
-    typedef _Distance          difference_type;
-    typedef _Tp*               pointer;
-    typedef _Tp&               reference;
-  };
-
-struct output_iterator {
-  typedef output_iterator_tag iterator_category;
-  typedef void                value_type;
-  typedef void                difference_type;
-  typedef void                pointer;
-  typedef void                reference;
-};
-
-template<typename _Tp, typename _Distance>
-  struct forward_iterator {
-    typedef forward_iterator_tag iterator_category;
-    typedef _Tp                  value_type;
-    typedef _Distance            difference_type;
-    typedef _Tp*                 pointer;
-    typedef _Tp&                 reference;
-  };
-
-template<typename _Tp, typename _Distance>
-  struct bidirectional_iterator {
-    typedef bidirectional_iterator_tag iterator_category;
-    typedef _Tp                        value_type;
-    typedef _Distance                  difference_type;
-    typedef _Tp*                       pointer;
-    typedef _Tp&                       reference;
-  };
-
-template<typename _Tp, typename _Distance>
-  struct random_access_iterator {
-    typedef random_access_iterator_tag iterator_category;
-    typedef _Tp                        value_type;
-    typedef _Distance                  difference_type;
-    typedef _Tp*                       pointer;
-    typedef _Tp&                       reference;
-  };
-
-using std::iterator_traits;
-
-template <class _Iter>
-  inline typename iterator_traits<_Iter>::iterator_category
-  iterator_category(const _Iter& __i)
-  { return __iterator_category(__i); }
-
-template <class _Iter>
-  inline typename iterator_traits<_Iter>::difference_type*
-  distance_type(const _Iter&)
-  { return static_cast<typename iterator_traits<_Iter>::difference_type*>(0); }
-
-template<class _Iter>
-  inline typename iterator_traits<_Iter>::value_type*
-  value_type(const _Iter& __i)
-  { return static_cast<typename iterator_traits<_Iter>::value_type*>(0); }
-
-using std::distance;
-using __gnu_cxx::distance; // 3-parameter extension
-using std::advance;
-
-using std::insert_iterator;
-using std::front_insert_iterator;
-using std::back_insert_iterator;
-using std::inserter;
-using std::front_inserter;
-using std::back_inserter;
-
-using std::reverse_iterator;
-
-using std::istream_iterator;
-using std::ostream_iterator;
-
-// Names from stl_construct.h
-template<class _T1, class _T2>
-  inline void
-  construct(_T1* __p, const _T2& __value)
-  { std::_Construct(__p, __value); }
-
-template<class _T1>
-  inline void
-  construct(_T1* __p)
-  { std::_Construct(__p); }
-
-template <class _Tp>
-  inline void
-  destroy(_Tp* __pointer)
-  { std::_Destroy(__pointer); }
-
-template <class _ForwardIterator>
-  inline void
-  destroy(_ForwardIterator __first, _ForwardIterator __last)
-  { std::_Destroy(__first, __last); }
-
-
-// Names from stl_raw_storage_iter.h
-using std::raw_storage_iterator;
-
-#endif /* _BACKWARD_ITERATOR_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/list.h b/include.new/c++/3.4/backward/list.h
deleted file mode 100644
index 00c11a6..0000000
--- a/include.new/c++/3.4/backward/list.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_LIST_H
-#define _BACKWARD_LIST_H 1
-
-#include "backward_warning.h"
-#include "algobase.h"
-#include "alloc.h"
-#include <list>
-
-using std::list;
-
-#endif /* _BACKWARD_LIST_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/map.h b/include.new/c++/3.4/backward/map.h
deleted file mode 100644
index 56d5c69..0000000
--- a/include.new/c++/3.4/backward/map.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_MAP_H
-#define _BACKWARD_MAP_H 1
-
-#include "backward_warning.h"
-#include "tree.h"
-#include <map>
-
-using std::map;
-
-#endif /* _BACKWARD_MAP_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/multimap.h b/include.new/c++/3.4/backward/multimap.h
deleted file mode 100644
index aba42f7..0000000
--- a/include.new/c++/3.4/backward/multimap.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_MULTIMAP_H
-#define _BACKWARD_MULTIMAP_H 1
-
-#include "backward_warning.h"
-#include "tree.h"
-#include <map>
-
-using std::multimap;
-
-#endif /* _BACKWARD_MULTIMAP_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/multiset.h b/include.new/c++/3.4/backward/multiset.h
deleted file mode 100644
index 7ec0c94..0000000
--- a/include.new/c++/3.4/backward/multiset.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_MULTISET_H
-#define _BACKWARD_MULTISET_H 1
-
-#include "backward_warning.h"
-#include "tree.h"
-#include <set>
-
-using std::multiset;
-
-#endif /* _BACKWARD_MULTISET_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/new.h b/include.new/c++/3.4/backward/new.h
deleted file mode 100644
index 00a4819..0000000
--- a/include.new/c++/3.4/backward/new.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// -*- C++ -*- forwarding header.
-// Copyright (C) 2000 Free Software Foundation
-
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-//
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with GCC; see the file COPYING.  If not, write to
-// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_NEW_H
-#define _BACKWARD_NEW_H 1
-
-#include "backward_warning.h"
-#include <new>
-
-using std::bad_alloc;
-using std::nothrow_t;
-using std::nothrow;
-using std::new_handler;
-using std::set_new_handler;
-
-#endif
diff --git a/include.new/c++/3.4/backward/ostream.h b/include.new/c++/3.4/backward/ostream.h
deleted file mode 100644
index a72de09..0000000
--- a/include.new/c++/3.4/backward/ostream.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (C) 2000 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_OSTREAM_H
-#define _BACKWARD_OSTREAM_H 1
-
-#include "backward_warning.h"
-#include "iostream.h"
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/pair.h b/include.new/c++/3.4/backward/pair.h
deleted file mode 100644
index cbb3bc7..0000000
--- a/include.new/c++/3.4/backward/pair.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_PAIR_H
-#define _BACKWARD_PAIR_H 1
-
-#include "backward_warning.h"
-#include <bits/c++config.h>
-#include <bits/stl_pair.h>
-
-using std::pair;
-using std::make_pair;
-
-#endif /* _BACKWARD_PAIR_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/queue.h b/include.new/c++/3.4/backward/queue.h
deleted file mode 100644
index a3e2ff3..0000000
--- a/include.new/c++/3.4/backward/queue.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_QUEUE_H
-#define _BACKWARD_QUEUE_H 1
-
-#include "backward_warning.h"
-#include <queue>
-
-using std::queue;
-using std::priority_queue;
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/rope.h b/include.new/c++/3.4/backward/rope.h
deleted file mode 100644
index fc6715a..0000000
--- a/include.new/c++/3.4/backward/rope.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_ROPE_H
-#define _BACKWARD_ROPE_H 1
-
-#include "backward_warning.h"
-#include "hashtable.h"
-#include <ext/rope>
-
-using __gnu_cxx::char_producer;
-using __gnu_cxx::sequence_buffer;
-using __gnu_cxx::rope;
-using __gnu_cxx::crope;
-using __gnu_cxx::wrope;
-
-#endif /* _BACKWARD_ROPE_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/set.h b/include.new/c++/3.4/backward/set.h
deleted file mode 100644
index 6a8320b..0000000
--- a/include.new/c++/3.4/backward/set.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_SET_H
-#define _BACKWARD_SET_H 1
-
-#include "backward_warning.h"
-#include "tree.h"
-#include <set>
-
-using std::set;
-
-#endif /* _BACKWARD_SET_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/slist.h b/include.new/c++/3.4/backward/slist.h
deleted file mode 100644
index 63db065..0000000
--- a/include.new/c++/3.4/backward/slist.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-#ifndef _BACKWARD_SLIST_H
-#define _BACKWARD_SLIST_H 1
-
-#include "backward_warning.h"
-#include <ext/slist>
-
-using __gnu_cxx::slist;
-
-#endif /* _BACKWARD_SLIST_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/stack.h b/include.new/c++/3.4/backward/stack.h
deleted file mode 100644
index 0ff53a4..0000000
--- a/include.new/c++/3.4/backward/stack.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_STACK_H
-#define _BACKWARD_STACK_H 1
-
-#include "backward_warning.h"
-#include "vector.h"
-#include "deque.h"
-#include "heap.h"
-#include "queue.h"
-#include <stack>
-
-using std::stack;
-
-#endif /* _BACKWARD_STACK_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/stream.h b/include.new/c++/3.4/backward/stream.h
deleted file mode 100644
index 5540c7e..0000000
--- a/include.new/c++/3.4/backward/stream.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (C) 2000 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_STREAM_H
-#define _BACKWARD_STREAM_H 1
-
-#include "backward_warning.h"
-#include "iostream.h"
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/streambuf.h b/include.new/c++/3.4/backward/streambuf.h
deleted file mode 100644
index fc9825e..0000000
--- a/include.new/c++/3.4/backward/streambuf.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2000 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BACKWARD_STREAMBUF_H
-#define _BACKWARD_STREAMBUF_H 1
-
-#include "backward_warning.h"
-#include <streambuf>
-
-using std::streambuf;
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/strstream b/include.new/c++/3.4/backward/strstream
deleted file mode 100644
index a5b95c5..0000000
--- a/include.new/c++/3.4/backward/strstream
+++ /dev/null
@@ -1,179 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-// WARNING: The classes defined in this header are DEPRECATED.  This
-// header is defined in section D.7.1 of the C++ standard, and it
-// MAY BE REMOVED in a future standard revision.  You should use the
-// header <sstream> instead.
-
-#ifndef __SGI_STL_STRSTREAM
-#define __SGI_STL_STRSTREAM
-
-#include "backward_warning.h"
-#include <iosfwd>
-#include <ios>
-#include <istream>
-#include <ostream>
-#include <string>
-
-namespace std
-{
-  // Class strstreambuf, a streambuf class that manages an array of char.
-  // Note that this class is not a template.
-  class strstreambuf : public basic_streambuf<char, char_traits<char> >
-  {
-  public:
-    // Types.
-    typedef char_traits<char>              _Traits;
-    typedef basic_streambuf<char, _Traits> _Base;
-
-  public:
-    // Constructor, destructor
-    explicit strstreambuf(streamsize __initial_capacity = 0);
-    strstreambuf(void* (*__alloc)(size_t), void (*__free)(void*));
-
-    strstreambuf(char* __get, streamsize __n, char* __put = 0);
-    strstreambuf(signed char* __get, streamsize __n, signed char* __put = 0);
-    strstreambuf(unsigned char* __get, streamsize __n, unsigned char* __put=0);
-
-    strstreambuf(const char* __get, streamsize __n);
-    strstreambuf(const signed char* __get, streamsize __n);
-    strstreambuf(const unsigned char* __get, streamsize __n);
-
-    virtual ~strstreambuf();
-
-  public:
-    void freeze(bool = true);
-    char* str();
-    int pcount() const;
-
-  protected:
-    virtual int_type overflow(int_type __c  = _Traits::eof());
-    virtual int_type pbackfail(int_type __c = _Traits::eof());
-    virtual int_type underflow();
-    virtual _Base* setbuf(char* __buf, streamsize __n);
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __dir,
-			     ios_base::openmode __mode
-			     = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __pos, ios_base::openmode __mode
-			     = ios_base::in | ios_base::out);
-
-  private:
-    strstreambuf&
-    operator=(const strstreambuf&);
-
-    strstreambuf(const strstreambuf&);
-
-    // Dynamic allocation, possibly using _M_alloc_fun and _M_free_fun.
-    char* _M_alloc(size_t);
-    void  _M_free(char*);
-
-    // Helper function used in constructors.
-    void _M_setup(char* __get, char* __put, streamsize __n);
-
-  private:
-    // Data members.
-    void* (*_M_alloc_fun)(size_t);
-    void  (*_M_free_fun)(void*);
-
-    bool _M_dynamic  : 1;
-    bool _M_frozen   : 1;
-    bool _M_constant : 1;
-  };
-
-  // Class istrstream, an istream that manages a strstreambuf.
-  class istrstream : public basic_istream<char>
-  {
-  public:
-    explicit istrstream(char*);
-    explicit istrstream(const char*);
-    istrstream(char* , streamsize);
-    istrstream(const char*, streamsize);
-    virtual ~istrstream();
-
-    strstreambuf* rdbuf() const;
-    char* str();
-
-  private:
-    strstreambuf _M_buf;
-  };
-
-  // Class ostrstream
-  class ostrstream : public basic_ostream<char>
-  {
-  public:
-    ostrstream();
-    ostrstream(char*, int, ios_base::openmode = ios_base::out);
-    virtual ~ostrstream();
-
-    strstreambuf* rdbuf() const;
-    void freeze(bool = true);
-    char* str();
-    int pcount() const;
-
-  private:
-    strstreambuf _M_buf;
-  };
-
-  // Class strstream
-  class strstream : public basic_iostream<char>
-  {
-  public:
-    typedef char                        char_type;
-    typedef char_traits<char>::int_type int_type;
-    typedef char_traits<char>::pos_type pos_type;
-    typedef char_traits<char>::off_type off_type;
-
-    strstream();
-    strstream(char*, int, ios_base::openmode = ios_base::in | ios_base::out);
-    virtual ~strstream();
-
-    strstreambuf* rdbuf() const;
-    void freeze(bool = true);
-    int pcount() const;
-    char* str();
-
-  private:
-    strstreambuf _M_buf;
-  };
-} // namespace std
-#endif
diff --git a/include.new/c++/3.4/backward/tempbuf.h b/include.new/c++/3.4/backward/tempbuf.h
deleted file mode 100644
index 06de2bd..0000000
--- a/include.new/c++/3.4/backward/tempbuf.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_TEMPBUF_H
-#define _BACKWARD_TEMPBUF_H 1
-
-#include "backward_warning.h"
-#include "pair.h"
-#include "iterator.h"
-#include <limits.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <bits/type_traits.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <ext/memory>
-
-using std::get_temporary_buffer;
-using std::return_temporary_buffer;
-using __gnu_cxx::temporary_buffer;
-
-#endif /* _BACKWARD_TEMPBUF_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/tree.h b/include.new/c++/3.4/backward/tree.h
deleted file mode 100644
index fcfcbf4..0000000
--- a/include.new/c++/3.4/backward/tree.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-#ifndef _BACKWARD_TREE
-#define _BACKWARD_TREE 1
-
-#include "backward_warning.h"
-#include <ext/rb_tree>
-
-using __gnu_cxx::rb_tree;
-
-#endif
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/backward/vector.h b/include.new/c++/3.4/backward/vector.h
deleted file mode 100644
index ba9b704..0000000
--- a/include.new/c++/3.4/backward/vector.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Backward-compat support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-#ifndef _BACKWARD_VECTOR_H
-#define _BACKWARD_VECTOR_H 1
-
-#include "backward_warning.h"
-#include "algobase.h"
-#include "alloc.h"
-#include <vector>
-
-using std::vector;
-
-#endif /* _BACKWARD_VECTOR_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/bits/allocator.h b/include.new/c++/3.4/bits/allocator.h
deleted file mode 100644
index c9200ec..0000000
--- a/include.new/c++/3.4/bits/allocator.h
+++ /dev/null
@@ -1,130 +0,0 @@
-// Allocators -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996-1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file allocator.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _ALLOCATOR_H
-#define _ALLOCATOR_H 1
-
-// Define the base class to std::allocator.
-#include <bits/c++allocator.h>
-
-namespace std
-{
-  template<typename _Tp>
-    class allocator;
-
-  template<>
-    class allocator<void>
-    {
-    public:
-      typedef size_t      size_type;
-      typedef ptrdiff_t   difference_type;
-      typedef void*       pointer;
-      typedef const void* const_pointer;
-      typedef void        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef allocator<_Tp1> other; };
-    };
-
-  /**
-   *  @brief  The "standard" allocator, as per [20.4].
-   *
-   *  (See @link Allocators allocators info @endlink for more.)
-   */
-  template<typename _Tp>
-    class allocator: public ___glibcxx_base_allocator<_Tp>
-    {
-   public:
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-      typedef _Tp*       pointer;
-      typedef const _Tp* const_pointer;
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef allocator<_Tp1> other; };
-
-      allocator() throw() { }
-
-      allocator(const allocator& a) throw()
-      : ___glibcxx_base_allocator<_Tp>(a) { }
-
-      template<typename _Tp1>
-        allocator(const allocator<_Tp1>&) throw() { }
-
-      ~allocator() throw() { }
-
-      // Inherit everything else.
-    };
-
-  template<typename _T1, typename _T2>
-    inline bool
-    operator==(const allocator<_T1>&, const allocator<_T2>&)
-    { return true; }
-
-  template<typename _T1, typename _T2>
-    inline bool
-    operator!=(const allocator<_T1>&, const allocator<_T2>&)
-    { return false; }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB: This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class allocator<char>;
-  extern template class allocator<wchar_t>;
-#endif
-
-  // Undefine.
-#undef ___glibcxx_base_allocator
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/atomic_word.h b/include.new/c++/3.4/bits/atomic_word.h
deleted file mode 100644
index b46adc2..0000000
--- a/include.new/c++/3.4/bits/atomic_word.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Low-level type for atomic operations -*- C++ -*-
-
-// Copyright (C) 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_ATOMIC_WORD_H
-#define _GLIBCXX_ATOMIC_WORD_H	1
-
-typedef int _Atomic_word;
-
-#endif 
diff --git a/include.new/c++/3.4/bits/atomicity.h b/include.new/c++/3.4/bits/atomicity.h
deleted file mode 100644
index d2620b0..0000000
--- a/include.new/c++/3.4/bits/atomicity.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Low-level functions for atomic operations -*- C++ -*-
-
-// Copyright (C) 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_ATOMICITY_H
-#define _GLIBCXX_ATOMICITY_H	1
-
-#include <bits/atomic_word.h>
-  
-namespace __gnu_cxx
-{
-  _Atomic_word 
-  __attribute__ ((__unused__))
-  __exchange_and_add(volatile _Atomic_word* __mem, int __val);
-
-  void
-  __attribute__ ((__unused__))
-  __atomic_add(volatile _Atomic_word* __mem, int __val);
-} // namespace __gnu_cxx
-
-#endif 
diff --git a/include.new/c++/3.4/bits/basic_file.h b/include.new/c++/3.4/bits/basic_file.h
deleted file mode 100644
index 6aa031b..0000000
--- a/include.new/c++/3.4/bits/basic_file.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Wrapper of C-language FILE struct -*- C++ -*-
-
-// Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.8  File-based streams
-//
-
-/** @file basic_file.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _BASIC_FILE_STDIO_H
-#define _BASIC_FILE_STDIO_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <ios>
-
-namespace std 
-{
-  // Generic declaration.
-  template<typename _CharT>
-    class __basic_file; 
-
-  // Specialization.
-  template<>
-    class __basic_file<char>
-    {
-      // Underlying data source/sink.
-      __c_file* 	_M_cfile;
-
-      // True iff we opened _M_cfile, and thus must close it ourselves.
-      bool 		_M_cfile_created;
-
-    public:
-      __basic_file(__c_lock* __lock = 0);
-
-      __basic_file* 
-      open(const char* __name, ios_base::openmode __mode, int __prot = 0664);
-
-      __basic_file*
-      sys_open(__c_file* __file, ios_base::openmode);
-
-      __basic_file*
-      sys_open(int __fd, ios_base::openmode __mode);
-
-      __basic_file* 
-      close(); 
-
-      bool 
-      is_open() const;
-
-      int 
-      fd();
-
-      __c_file*
-      file();
-
-      ~__basic_file();
-
-      streamsize 
-      xsputn(const char* __s, streamsize __n);
-
-      streamsize 
-      xsputn_2(const char* __s1, streamsize __n1,
-	       const char* __s2, streamsize __n2);
-
-      streamsize 
-      xsgetn(char* __s, streamsize __n);
-
-      streamoff
-      seekoff(streamoff __off, ios_base::seekdir __way);
-
-      int 
-      sync();
-
-      streamsize
-      showmanyc();
-    };
-}  // namespace std
-
-#endif	
diff --git a/include.new/c++/3.4/bits/basic_ios.h b/include.new/c++/3.4/bits/basic_ios.h
deleted file mode 100644
index 7ffe40e..0000000
--- a/include.new/c++/3.4/bits/basic_ios.h
+++ /dev/null
@@ -1,467 +0,0 @@
-// Iostreams base classes -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file basic_ios.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _BASIC_IOS_H
-#define _BASIC_IOS_H 1
-
-#pragma GCC system_header
-
-#include <bits/streambuf_iterator.h>
-#include <bits/localefwd.h>
-#include <bits/locale_classes.h>
-#include <bits/locale_facets.h>
-
-namespace std
-{
-  // 27.4.5  Template class basic_ios
-  /**
-   *  @brief  Virtual base class for all stream classes.
-   *
-   *  Most of the member functions called dispatched on stream objects
-   *  (e.g., @c std::cout.foo(bar);) are consolidated in this class.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_ios : public ios_base
-    {
-    public:
-      //@{
-      /**
-       *  These are standard types.  They permit a standardized way of
-       *  referring to names of (or names dependant on) the template
-       *  parameters, which are specific to the implementation.
-      */
-      typedef _CharT                                 char_type;
-      typedef typename _Traits::int_type             int_type;
-      typedef typename _Traits::pos_type             pos_type;
-      typedef typename _Traits::off_type             off_type;
-      typedef _Traits                                traits_type;
-      //@}
-
-      //@{
-      /**
-       *  @if maint
-       *  These are non-standard types.
-       *  @endif
-      */
-      typedef ctype<_CharT>                          __ctype_type;
-      typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> >
-						     __num_put_type;
-      typedef num_get<_CharT, istreambuf_iterator<_CharT, _Traits> >
-						     __num_get_type;
-      //@}
-
-      // Data members:
-    protected:
-      basic_ostream<_CharT, _Traits>*                _M_tie;
-      mutable char_type                              _M_fill;
-      mutable bool                                   _M_fill_init;
-      basic_streambuf<_CharT, _Traits>*              _M_streambuf;
-
-      // Cached use_facet<ctype>, which is based on the current locale info.
-      const __ctype_type*                            _M_ctype;
-      // For ostream.
-      const __num_put_type*                          _M_num_put;
-      // For istream.
-      const __num_get_type*                          _M_num_get;
-
-    public:
-      //@{
-      /**
-       *  @brief  The quick-and-easy status check.
-       *
-       *  This allows you to write constructs such as
-       *  "if (!a_stream) ..." and "while (a_stream) ..."
-      */
-      operator void*() const
-      { return this->fail() ? 0 : const_cast<basic_ios*>(this); }
-
-      bool
-      operator!() const
-      { return this->fail(); }
-      //@}
-
-      /**
-       *  @brief  Returns the error state of the stream buffer.
-       *  @return  A bit pattern (well, isn't everything?)
-       *
-       *  See std::ios_base::iostate for the possible bit values.  Most
-       *  users will call one of the interpreting wrappers, e.g., good().
-      */
-      iostate
-      rdstate() const
-      { return _M_streambuf_state; }
-
-      /**
-       *  @brief  [Re]sets the error state.
-       *  @param  state  The new state flag(s) to set.
-       *
-       *  See std::ios_base::iostate for the possible bit values.  Most
-       *  users will not need to pass an argument.
-      */
-      void
-      clear(iostate __state = goodbit);
-
-      /**
-       *  @brief  Sets additional flags in the error state.
-       *  @param  state  The additional state flag(s) to set.
-       *
-       *  See std::ios_base::iostate for the possible bit values.
-      */
-      void
-      setstate(iostate __state)
-      { this->clear(this->rdstate() | __state); }
-
-      // Flip the internal state on for the proper state bits, then re
-      // throws the propagated exception if bit also set in
-      // exceptions().
-      void
-      _M_setstate(iostate __state)
-      {
-	// 27.6.1.2.1 Common requirements.
-	// Turn this on without causing an ios::failure to be thrown.
-	_M_streambuf_state |= __state;
-	if (this->exceptions() & __state)
-	  __throw_exception_again;
-      }
-
-      /**
-       *  @brief  Fast error checking.
-       *  @return  True if no error flags are set.
-       *
-       *  A wrapper around rdstate.
-      */
-      bool
-      good() const
-      { return this->rdstate() == 0; }
-
-      /**
-       *  @brief  Fast error checking.
-       *  @return  True if the eofbit is set.
-       *
-       *  Note that other iostate flags may also be set.
-      */
-      bool
-      eof() const
-      { return (this->rdstate() & eofbit) != 0; }
-
-      /**
-       *  @brief  Fast error checking.
-       *  @return  True if either the badbit or the failbit is set.
-       *
-       *  Checking the badbit in fail() is historical practice.
-       *  Note that other iostate flags may also be set.
-      */
-      bool
-      fail() const
-      { return (this->rdstate() & (badbit | failbit)) != 0; }
-
-      /**
-       *  @brief  Fast error checking.
-       *  @return  True if the badbit is set.
-       *
-       *  Note that other iostate flags may also be set.
-      */
-      bool
-      bad() const
-      { return (this->rdstate() & badbit) != 0; }
-
-      /**
-       *  @brief  Throwing exceptions on errors.
-       *  @return  The current exceptions mask.
-       *
-       *  This changes nothing in the stream.  See the one-argument version
-       *  of exceptions(iostate) for the meaning of the return value.
-      */
-      iostate
-      exceptions() const
-      { return _M_exception; }
-
-      /**
-       *  @brief  Throwing exceptions on errors.
-       *  @param  except  The new exceptions mask.
-       *
-       *  By default, error flags are set silently.  You can set an
-       *  exceptions mask for each stream; if a bit in the mask becomes set
-       *  in the error flags, then an exception of type
-       *  std::ios_base::failure is thrown.
-       *
-       *  If the error flage is already set when the exceptions mask is
-       *  added, the exception is immediately thrown.  Try running the
-       *  following under GCC 3.1 or later:
-       *  @code
-       *  #include <iostream>
-       *  #include <fstream>
-       *  #include <exception>
-       *
-       *  int main()
-       *  {
-       *      std::set_terminate (__gnu_cxx::__verbose_terminate_handler);
-       *
-       *      std::ifstream f ("/etc/motd");
-       *
-       *      std::cerr << "Setting badbit\n";
-       *      f.setstate (std::ios_base::badbit);
-       *
-       *      std::cerr << "Setting exception mask\n";
-       *      f.exceptions (std::ios_base::badbit);
-       *  }
-       *  @endcode
-      */
-      void
-      exceptions(iostate __except)
-      {
-        _M_exception = __except;
-        this->clear(_M_streambuf_state);
-      }
-
-      // Constructor/destructor:
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  The parameter is passed by derived streams.
-      */
-      explicit
-      basic_ios(basic_streambuf<_CharT, _Traits>* __sb)
-      : ios_base(), _M_tie(0), _M_fill(), _M_fill_init(false), _M_streambuf(0),
-      _M_ctype(0), _M_num_put(0), _M_num_get(0)
-      { this->init(__sb); }
-
-      /**
-       *  @brief  Empty.
-       *
-       *  The destructor does nothing.  More specifically, it does not
-       *  destroy the streambuf held by rdbuf().
-      */
-      virtual
-      ~basic_ios() { }
-
-      // Members:
-      /**
-       *  @brief  Fetches the current @e tied stream.
-       *  @return  A pointer to the tied stream, or NULL if the stream is
-       *           not tied.
-       *
-       *  A stream may be @e tied (or synchronized) to a second output
-       *  stream.  When this stream performs any I/O, the tied stream is
-       *  first flushed.  For example, @c std::cin is tied to @c std::cout.
-      */
-      basic_ostream<_CharT, _Traits>*
-      tie() const
-      { return _M_tie; }
-
-      /**
-       *  @brief  Ties this stream to an output stream.
-       *  @param  tiestr  The output stream.
-       *  @return  The previously tied output stream, or NULL if the stream
-       *           was not tied.
-       *
-       *  This sets up a new tie; see tie() for more.
-      */
-      basic_ostream<_CharT, _Traits>*
-      tie(basic_ostream<_CharT, _Traits>* __tiestr)
-      {
-        basic_ostream<_CharT, _Traits>* __old = _M_tie;
-        _M_tie = __tiestr;
-        return __old;
-      }
-
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current stream buffer.
-       *
-       *  This does not change the state of the stream.
-      */
-      basic_streambuf<_CharT, _Traits>*
-      rdbuf() const
-      { return _M_streambuf; }
-
-      /**
-       *  @brief  Changing the underlying buffer.
-       *  @param  sb  The new stream buffer.
-       *  @return  The previous stream buffer.
-       *
-       *  Associates a new buffer with the current stream, and clears the
-       *  error state.
-       *
-       *  Due to historical accidents which the LWG refuses to correct, the
-       *  I/O library suffers from a design error:  this function is hidden
-       *  in derived classes by overrides of the zero-argument @c rdbuf(),
-       *  which is non-virtual for hysterical raisins.  As a result, you
-       *  must use explicit qualifications to access this function via any
-       *  derived class.  For example:
-       *
-       *  @code
-       *  std::fstream     foo;         // or some other derived type
-       *  std::streambuf*  p = .....;
-       *
-       *  foo.ios::rdbuf(p);            // ios == basic_ios<char>
-       *  @endcode
-      */
-      basic_streambuf<_CharT, _Traits>*
-      rdbuf(basic_streambuf<_CharT, _Traits>* __sb);
-
-      /**
-       *  @brief  Copies fields of __rhs into this.
-       *  @param  __rhs  The source values for the copies.
-       *  @return  Reference to this object.
-       *
-       *  All fields of __rhs are copied into this object except that rdbuf()
-       *  and rdstate() remain unchanged.  All values in the pword and iword
-       *  arrays are copied.  Before copying, each callback is invoked with
-       *  erase_event.  After copying, each (new) callback is invoked with
-       *  copyfmt_event.  The final step is to copy exceptions().
-      */
-      basic_ios&
-      copyfmt(const basic_ios& __rhs);
-
-      /**
-       *  @brief  Retreives the "empty" character.
-       *  @return  The current fill character.
-       *
-       *  It defaults to a space (' ') in the current locale.
-      */
-      char_type
-      fill() const
-      {
-	if (!_M_fill_init)
-	  {
-	    _M_fill = this->widen(' ');
-	    _M_fill_init = true;
-	  }
-	return _M_fill;
-      }
-
-      /**
-       *  @brief  Sets a new "empty" character.
-       *  @param  ch  The new character.
-       *  @return  The previous fill character.
-       *
-       *  The fill character is used to fill out space when P+ characters
-       *  have been requested (e.g., via setw), Q characters are actually
-       *  used, and Q<P.  It defaults to a space (' ') in the current locale.
-      */
-      char_type
-      fill(char_type __ch)
-      {
-	char_type __old = this->fill();
-	_M_fill = __ch;
-	return __old;
-      }
-
-      // Locales:
-      /**
-       *  @brief  Moves to a new locale.
-       *  @param  loc  The new locale.
-       *  @return  The previous locale.
-       *
-       *  Calls @c ios_base::imbue(loc), and if a stream buffer is associated
-       *  with this stream, calls that buffer's @c pubimbue(loc).
-       *
-       *  Additional l10n notes are at
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html
-      */
-      locale
-      imbue(const locale& __loc);
-
-      /**
-       *  @brief  Squeezes characters.
-       *  @param  c  The character to narrow.
-       *  @param  dfault  The character to narrow.
-       *  @return  The narrowed character.
-       *
-       *  Maps a character of @c char_type to a character of @c char,
-       *  if possible.
-       *
-       *  Returns the result of
-       *  @code
-       *    std::use_facet<ctype<char_type> >(getloc()).narrow(c,dfault)
-       *  @endcode
-       *
-       *  Additional l10n notes are at
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html
-      */
-      char
-      narrow(char_type __c, char __dfault) const;
-
-      /**
-       *  @brief  Widens characters.
-       *  @param  c  The character to widen.
-       *  @return  The widened character.
-       *
-       *  Maps a character of @c char to a character of @c char_type.
-       *
-       *  Returns the result of
-       *  @code
-       *    std::use_facet<ctype<char_type> >(getloc()).widen(c)
-       *  @endcode
-       *
-       *  Additional l10n notes are at
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/22_locale/howto.html
-      */
-      char_type
-      widen(char __c) const;
-
-    protected:
-      // 27.4.5.1  basic_ios constructors
-      /**
-       *  @brief  Empty.
-       *
-       *  The default constructor does nothing and is not normally
-       *  accessible to users.
-      */
-      basic_ios()
-      : ios_base(), _M_tie(0), _M_fill(char_type()), _M_fill_init(false), 
-      _M_streambuf(0), _M_ctype(0), _M_num_put(0), _M_num_get(0)
-      { }
-
-      /**
-       *  @brief  All setup is performed here.
-       *
-       *  This is called from the public constructor.  It is not virtual and
-       *  cannot be redefined.
-      */
-      void
-      init(basic_streambuf<_CharT, _Traits>* __sb);
-
-      void
-      _M_cache_locale(const locale& __loc);
-    };
-} // namespace std
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-#include <bits/basic_ios.tcc>
-#endif
-
-#endif /* _BASIC_IOS_H */
diff --git a/include.new/c++/3.4/bits/basic_ios.tcc b/include.new/c++/3.4/bits/basic_ios.tcc
deleted file mode 100644
index fcb4b02..0000000
--- a/include.new/c++/3.4/bits/basic_ios.tcc
+++ /dev/null
@@ -1,200 +0,0 @@
-// basic_ios member functions -*- C++ -*-
-
-// Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _BASIC_IOS_TCC
-#define _BASIC_IOS_TCC 1
-
-#pragma GCC system_header
-
-namespace std
-{
-  template<typename _CharT, typename _Traits>
-    void
-    basic_ios<_CharT, _Traits>::clear(iostate __state)
-    {
-      if (this->rdbuf())
-	_M_streambuf_state = __state;
-      else
-	  _M_streambuf_state = __state | badbit;
-      if (this->exceptions() & this->rdstate())
-	__throw_ios_failure(__N("basic_ios::clear"));
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_streambuf<_CharT, _Traits>*
-    basic_ios<_CharT, _Traits>::rdbuf(basic_streambuf<_CharT, _Traits>* __sb)
-    {
-      basic_streambuf<_CharT, _Traits>* __old = _M_streambuf;
-      _M_streambuf = __sb;
-      this->clear();
-      return __old;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ios<_CharT, _Traits>&
-    basic_ios<_CharT, _Traits>::copyfmt(const basic_ios& __rhs)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 292. effects of a.copyfmt (a)
-      if (this != &__rhs)
-	{
-	  // Per 27.1.1, do not call imbue, yet must trash all caches
-	  // associated with imbue()
-
-	  // Alloc any new word array first, so if it fails we have "rollback".
-	  _Words* __words = (__rhs._M_word_size <= _S_local_word_size) ?
-	                     _M_local_word : new _Words[__rhs._M_word_size];
-
-	  // Bump refs before doing callbacks, for safety.
-	  _Callback_list* __cb = __rhs._M_callbacks;
-	  if (__cb)
-	    __cb->_M_add_reference();
-	  _M_call_callbacks(erase_event);
-	  if (_M_word != _M_local_word)
-	    {
-	      delete [] _M_word;
-	      _M_word = 0;
-	    }
-	  _M_dispose_callbacks();
-
-	  // NB: Don't want any added during above.
-	  _M_callbacks = __cb;
-	  for (int __i = 0; __i < __rhs._M_word_size; ++__i)
-	    __words[__i] = __rhs._M_word[__i];
-	  if (_M_word != _M_local_word)
-	    {
-	      delete [] _M_word;
-	      _M_word = 0;
-	    }
-	  _M_word = __words;
-	  _M_word_size = __rhs._M_word_size;
-
-	  this->flags(__rhs.flags());
-	  this->width(__rhs.width());
-	  this->precision(__rhs.precision());
-	  this->tie(__rhs.tie());
-	  this->fill(__rhs.fill());
-	  _M_ios_locale = __rhs.getloc();
-	  _M_cache_locale(_M_ios_locale);
-
-	  _M_call_callbacks(copyfmt_event);
-
-	  // The next is required to be the last assignment.
-	  this->exceptions(__rhs.exceptions());
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    char
-    basic_ios<_CharT, _Traits>::narrow(char_type __c, char __dfault) const
-    { return __check_facet(_M_ctype).narrow(__c, __dfault); }
-
-  template<typename _CharT, typename _Traits>
-    _CharT
-    basic_ios<_CharT, _Traits>::widen(char __c) const
-    { return __check_facet(_M_ctype).widen(__c); }
-
-  // Locales:
-  template<typename _CharT, typename _Traits>
-    locale
-    basic_ios<_CharT, _Traits>::imbue(const locale& __loc)
-    {
-      locale __old(this->getloc());
-      ios_base::imbue(__loc);
-      _M_cache_locale(__loc);
-      if (this->rdbuf() != 0)
-	this->rdbuf()->pubimbue(__loc);
-      return __old;
-    }
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_ios<_CharT, _Traits>::init(basic_streambuf<_CharT, _Traits>* __sb)
-    {
-      // NB: This may be called more than once on the same object.
-      ios_base::_M_init();
-
-      // Cache locale data and specific facets used by iostreams.
-      _M_cache_locale(_M_ios_locale);
-
-      // NB: The 27.4.4.1 Postconditions Table specifies requirements
-      // after basic_ios::init() has been called. As part of this,
-      // fill() must return widen(' ') any time after init() has been
-      // called, which needs an imbued ctype facet of char_type to
-      // return without throwing an exception. Unfortunately,
-      // ctype<char_type> is not necessarily a required facet, so
-      // streams with char_type != [char, wchar_t] will not have it by
-      // default. Because of this, the correct value for _M_fill is
-      // constructed on the first call of fill(). That way,
-      // unformatted input and output with non-required basic_ios
-      // instantiations is possible even without imbuing the expected
-      // ctype<char_type> facet.
-      _M_fill = _CharT();
-      _M_fill_init = false;
-
-      _M_tie = 0;
-      _M_exception = goodbit;
-      _M_streambuf = __sb;
-      _M_streambuf_state = __sb ? goodbit : badbit;
-    }
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_ios<_CharT, _Traits>::_M_cache_locale(const locale& __loc)
-    {
-      if (__builtin_expect(has_facet<__ctype_type>(__loc), true))
-	_M_ctype = &use_facet<__ctype_type>(__loc);
-      else
-	_M_ctype = 0;
-
-      if (__builtin_expect(has_facet<__num_put_type>(__loc), true))
-	_M_num_put = &use_facet<__num_put_type>(__loc);
-      else
-	_M_num_put = 0;
-
-      if (__builtin_expect(has_facet<__num_get_type>(__loc), true))
-	_M_num_get = &use_facet<__num_get_type>(__loc);
-      else
-	_M_num_get = 0;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB:  This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_ios<char>;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_ios<wchar_t>;
-#endif
-#endif
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/basic_string.h b/include.new/c++/3.4/bits/basic_string.h
deleted file mode 100644
index 04e1500..0000000
--- a/include.new/c++/3.4/bits/basic_string.h
+++ /dev/null
@@ -1,2365 +0,0 @@
-// Components for manipulating sequences of characters -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 21 Strings library
-//
-
-/** @file basic_string.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _BASIC_STRING_H
-#define _BASIC_STRING_H 1
-
-#pragma GCC system_header
-
-#include <bits/atomicity.h>
-#include <debug/debug.h>
-
-namespace std
-{
-  /**
-   *  @class basic_string basic_string.h <string>
-   *  @brief  Managing sequences of characters and character-like objects.
-   *
-   *  @ingroup Containers
-   *  @ingroup Sequences
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>.  Of the
-   *  <a href="tables.html#68">optional sequence requirements</a>, only
-   *  @c push_back, @c at, and array access are supported.
-   *
-   *  @doctodo
-   *
-   *
-   *  @if maint
-   *  Documentation?  What's that?
-   *  Nathan Myers <ncm@cantrip.org>.
-   *
-   *  A string looks like this:
-   *
-   *  @code
-   *                                        [_Rep]
-   *                                        _M_length
-   *   [basic_string<char_type>]            _M_capacity
-   *   _M_dataplus                          _M_refcount
-   *   _M_p ---------------->               unnamed array of char_type
-   *  @endcode
-   *
-   *  Where the _M_p points to the first character in the string, and
-   *  you cast it to a pointer-to-_Rep and subtract 1 to get a
-   *  pointer to the header.
-   *
-   *  This approach has the enormous advantage that a string object
-   *  requires only one allocation.  All the ugliness is confined
-   *  within a single pair of inline functions, which each compile to
-   *  a single "add" instruction: _Rep::_M_data(), and
-   *  string::_M_rep(); and the allocation function which gets a
-   *  block of raw bytes and with room enough and constructs a _Rep
-   *  object at the front.
-   *
-   *  The reason you want _M_data pointing to the character array and
-   *  not the _Rep is so that the debugger can see the string
-   *  contents. (Probably we should add a non-inline member to get
-   *  the _Rep for the debugger to use, so users can check the actual
-   *  string length.)
-   *
-   *  Note that the _Rep object is a POD so that you can have a
-   *  static "empty string" _Rep object already "constructed" before
-   *  static constructors have run.  The reference-count encoding is
-   *  chosen so that a 0 indicates one reference, so you never try to
-   *  destroy the empty-string _Rep object.
-   *
-   *  All but the last paragraph is considered pretty conventional
-   *  for a C++ string implementation.
-   *  @endif
-  */
-  // 21.3  Template class basic_string
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class basic_string
-    {
-      // Types:
-    public:
-      typedef _Traits					    traits_type;
-      typedef typename _Traits::char_type		    value_type;
-      typedef _Alloc					    allocator_type;
-      typedef typename _Alloc::size_type		    size_type;
-      typedef typename _Alloc::difference_type		    difference_type;
-      typedef typename _Alloc::reference		    reference;
-      typedef typename _Alloc::const_reference		    const_reference;
-      typedef typename _Alloc::pointer			    pointer;
-      typedef typename _Alloc::const_pointer		    const_pointer;
-      typedef __gnu_cxx::__normal_iterator<pointer, basic_string>  iterator;
-      typedef __gnu_cxx::__normal_iterator<const_pointer, basic_string>
-                                                            const_iterator;
-      typedef std::reverse_iterator<const_iterator>	const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>		    reverse_iterator;
-
-    private:
-      // _Rep: string representation
-      //   Invariants:
-      //   1. String really contains _M_length + 1 characters: due to 21.3.4
-      //      must be kept null-terminated.
-      //   2. _M_capacity >= _M_length
-      //      Allocated memory is always (_M_capacity + 1) * sizeof(_CharT).
-      //   3. _M_refcount has three states:
-      //      -1: leaked, one reference, no ref-copies allowed, non-const.
-      //       0: one reference, non-const.
-      //     n>0: n + 1 references, operations require a lock, const.
-      //   4. All fields==0 is an empty string, given the extra storage
-      //      beyond-the-end for a null terminator; thus, the shared
-      //      empty string representation needs no constructor.
-
-      struct _Rep_base
-      {
-	size_type		_M_length;
-	size_type		_M_capacity;
-	_Atomic_word		_M_refcount;
-      };
-
-      struct _Rep : _Rep_base
-      {
-	// Types:
-	typedef typename _Alloc::template rebind<char>::other _Raw_bytes_alloc;
-
-	// (Public) Data members:
-
-	// The maximum number of individual char_type elements of an
-	// individual string is determined by _S_max_size. This is the
-	// value that will be returned by max_size().  (Whereas npos
-	// is the maximum number of bytes the allocator can allocate.)
-	// If one was to divvy up the theoretical largest size string,
-	// with a terminating character and m _CharT elements, it'd
-	// look like this:
-	// npos = sizeof(_Rep) + (m * sizeof(_CharT)) + sizeof(_CharT)
-	// Solving for m:
-	// m = ((npos - sizeof(_Rep))/sizeof(CharT)) - 1
-	// In addition, this implementation quarters this amount.
-	static const size_type	_S_max_size;
-	static const _CharT	_S_terminal;
-
-	// The following storage is init'd to 0 by the linker, resulting
-        // (carefully) in an empty string with one reference.
-        static size_type _S_empty_rep_storage[];
-
-        static _Rep&
-        _S_empty_rep()
-        { return *reinterpret_cast<_Rep*>(&_S_empty_rep_storage); }
-
-        bool
-	_M_is_leaked() const
-        { return this->_M_refcount < 0; }
-
-        bool
-	_M_is_shared() const
-        { return this->_M_refcount > 0; }
-
-        void
-	_M_set_leaked()
-        { this->_M_refcount = -1; }
-
-        void
-	_M_set_sharable()
-        { this->_M_refcount = 0; }
-
-	_CharT*
-	_M_refdata() throw()
-	{ return reinterpret_cast<_CharT*>(this + 1); }
-
-	_CharT*
-	_M_grab(const _Alloc& __alloc1, const _Alloc& __alloc2)
-	{
-	  return (!_M_is_leaked() && __alloc1 == __alloc2)
-	          ? _M_refcopy() : _M_clone(__alloc1);
-	}
-
-	// Create & Destroy
-	static _Rep*
-	_S_create(size_type, size_type, const _Alloc&);
-
-	void
-	_M_dispose(const _Alloc& __a)
-	{
-#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
-	  if (__builtin_expect(this != &_S_empty_rep(), false))
-#endif
-	    if (__gnu_cxx::__exchange_and_add(&this->_M_refcount, -1) <= 0)
-	      _M_destroy(__a);
-	}  // XXX MT
-
-	void
-	_M_destroy(const _Alloc&) throw();
-
-	_CharT*
-	_M_refcopy() throw()
-	{
-#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
-	  if (__builtin_expect(this != &_S_empty_rep(), false))
-#endif
-            __gnu_cxx::__atomic_add(&this->_M_refcount, 1);
-	  return _M_refdata();
-	}  // XXX MT
-
-	_CharT*
-	_M_clone(const _Alloc&, size_type __res = 0);
-      };
-
-      // Use empty-base optimization: http://www.cantrip.org/emptyopt.html
-      struct _Alloc_hider : _Alloc
-      {
-	_Alloc_hider(_CharT* __dat, const _Alloc& __a)
-	: _Alloc(__a), _M_p(__dat) { }
-
-	_CharT* _M_p; // The actual data.
-      };
-
-    public:
-      // Data Members (public):
-      // NB: This is an unsigned type, and thus represents the maximum
-      // size that the allocator can hold.
-      /// @var
-      /// Value returned by various member functions when they fail.
-      static const size_type	npos = static_cast<size_type>(-1);
-
-    private:
-      // Data Members (private):
-      mutable _Alloc_hider	_M_dataplus;
-
-      _CharT*
-      _M_data() const
-      { return  _M_dataplus._M_p; }
-
-      _CharT*
-      _M_data(_CharT* __p)
-      { return (_M_dataplus._M_p = __p); }
-
-      _Rep*
-      _M_rep() const
-      { return &((reinterpret_cast<_Rep*> (_M_data()))[-1]); }
-
-      // For the internal use we have functions similar to `begin'/`end'
-      // but they do not call _M_leak.
-      iterator
-      _M_ibegin() const { return iterator(_M_data()); }
-
-      iterator
-      _M_iend() const { return iterator(_M_data() + this->size()); }
-
-      void
-      _M_leak()    // for use in begin() & non-const op[]
-      {
-	if (!_M_rep()->_M_is_leaked())
-	  _M_leak_hard();
-      }
-
-      size_type
-      _M_check(size_type __pos, const char* __s) const
-      {
-	if (__pos > this->size())
-	  __throw_out_of_range(__N(__s));
-	return __pos;
-      }
-
-      // NB: _M_limit doesn't check for a bad __pos value.
-      size_type
-      _M_limit(size_type __pos, size_type __off) const
-      {
-	const bool __testoff =  __off < this->size() - __pos;
-	return __testoff ? __off : this->size() - __pos;
-      }
-
-      // _S_copy_chars is a separate template to permit specialization
-      // to optimize for the common case of pointers as iterators.
-      template<class _Iterator>
-        static void
-        _S_copy_chars(_CharT* __p, _Iterator __k1, _Iterator __k2)
-        {
-	  for (; __k1 != __k2; ++__k1, ++__p)
-	    traits_type::assign(*__p, *__k1); // These types are off.
-	}
-
-      static void
-      _S_copy_chars(_CharT* __p, iterator __k1, iterator __k2)
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, const_iterator __k1, const_iterator __k2)
-      { _S_copy_chars(__p, __k1.base(), __k2.base()); }
-
-      static void
-      _S_copy_chars(_CharT* __p, _CharT* __k1, _CharT* __k2)
-      { traits_type::copy(__p, __k1, __k2 - __k1); }
-
-      static void
-      _S_copy_chars(_CharT* __p, const _CharT* __k1, const _CharT* __k2)
-      { traits_type::copy(__p, __k1, __k2 - __k1); }
-
-      void
-      _M_mutate(size_type __pos, size_type __len1, size_type __len2);
-
-      void
-      _M_leak_hard();
-
-      static _Rep&
-      _S_empty_rep()
-      { return _Rep::_S_empty_rep(); }
-
-    public:
-      // Construct/copy/destroy:
-      // NB: We overload ctors in some cases instead of using default
-      // arguments, per 17.4.4.4 para. 2 item 2.
-
-      /**
-       *  @brief  Default constructor creates an empty string.
-       */
-      inline
-      basic_string();
-
-      /**
-       *  @brief  Construct an empty string using allocator a.
-       */
-      explicit
-      basic_string(const _Alloc& __a);
-
-      // NB: per LWG issue 42, semantics different from IS:
-      /**
-       *  @brief  Construct string with copy of value of @a str.
-       *  @param  str  Source string.
-       */
-      basic_string(const basic_string& __str);
-      /**
-       *  @brief  Construct string as copy of a substring.
-       *  @param  str  Source string.
-       *  @param  pos  Index of first character to copy from.
-       *  @param  n  Number of characters to copy (default remainder).
-       */
-      basic_string(const basic_string& __str, size_type __pos,
-		   size_type __n = npos);
-      /**
-       *  @brief  Construct string as copy of a substring.
-       *  @param  str  Source string.
-       *  @param  pos  Index of first character to copy from.
-       *  @param  n  Number of characters to copy.
-       *  @param  a  Allocator to use.
-       */
-      basic_string(const basic_string& __str, size_type __pos,
-		   size_type __n, const _Alloc& __a);
-
-      /**
-       *  @brief  Construct string initialized by a character array.
-       *  @param  s  Source character array.
-       *  @param  n  Number of characters to copy.
-       *  @param  a  Allocator to use (default is default allocator).
-       *
-       *  NB: s must have at least n characters, '\0' has no special
-       *  meaning.
-       */
-      basic_string(const _CharT* __s, size_type __n,
-		   const _Alloc& __a = _Alloc());
-      /**
-       *  @brief  Construct string as copy of a C string.
-       *  @param  s  Source C string.
-       *  @param  a  Allocator to use (default is default allocator).
-       */
-      basic_string(const _CharT* __s, const _Alloc& __a = _Alloc());
-      /**
-       *  @brief  Construct string as multiple characters.
-       *  @param  n  Number of characters.
-       *  @param  c  Character to use.
-       *  @param  a  Allocator to use (default is default allocator).
-       */
-      basic_string(size_type __n, _CharT __c, const _Alloc& __a = _Alloc());
-
-      /**
-       *  @brief  Construct string as copy of a range.
-       *  @param  beg  Start of range.
-       *  @param  end  End of range.
-       *  @param  a  Allocator to use (default is default allocator).
-       */
-      template<class _InputIterator>
-        basic_string(_InputIterator __beg, _InputIterator __end,
-		     const _Alloc& __a = _Alloc());
-
-      /**
-       *  @brief  Destroy the string instance.
-       */
-      ~basic_string()
-      { _M_rep()->_M_dispose(this->get_allocator()); }
-
-      /**
-       *  @brief  Assign the value of @a str to this string.
-       *  @param  str  Source string.
-       */
-      basic_string&
-      operator=(const basic_string& __str) 
-      { 
-	this->assign(__str); 
-	return *this;
-      }
-
-      /**
-       *  @brief  Copy contents of @a s into this string.
-       *  @param  s  Source null-terminated string.
-       */
-      basic_string&
-      operator=(const _CharT* __s) 
-      { 
-	this->assign(__s); 
-	return *this;
-      }
-
-      /**
-       *  @brief  Set value to string of length 1.
-       *  @param  c  Source character.
-       *
-       *  Assigning to a character makes this string length 1 and
-       *  (*this)[0] == @a c.
-       */
-      basic_string&
-      operator=(_CharT __c) 
-      { 
-	this->assign(1, __c); 
-	return *this;
-      }
-
-      // Iterators:
-      /**
-       *  Returns a read/write iterator that points to the first character in
-       *  the %string.  Unshares the string.
-       */
-      iterator
-      begin()
-      {
-	_M_leak();
-	return iterator(_M_data());
-      }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  character in the %string.
-       */
-      const_iterator
-      begin() const
-      { return const_iterator(_M_data()); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  character in the %string.  Unshares the string.
-       */
-      iterator
-      end()
-      {
-	_M_leak();
-	return iterator(_M_data() + this->size());
-      }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the
-       *  last character in the %string.
-       */
-      const_iterator
-      end() const
-      { return const_iterator(_M_data() + this->size()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last
-       *  character in the %string.  Iteration is done in reverse element
-       *  order.  Unshares the string.
-       */
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last character in the %string.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(this->end()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one before the
-       *  first character in the %string.  Iteration is done in reverse
-       *  element order.  Unshares the string.
-       */
-      reverse_iterator
-      rend()
-      { return reverse_iterator(this->begin()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first character in the %string.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(this->begin()); }
-
-    public:
-      // Capacity:
-      ///  Returns the number of characters in the string, not including any
-      ///  null-termination.
-      size_type
-      size() const { return _M_rep()->_M_length; }
-
-      ///  Returns the number of characters in the string, not including any
-      ///  null-termination.
-      size_type
-      length() const { return _M_rep()->_M_length; }
-
-      /// Returns the size() of the largest possible %string.
-      size_type
-      max_size() const { return _Rep::_S_max_size; }
-
-      /**
-       *  @brief  Resizes the %string to the specified number of characters.
-       *  @param  n  Number of characters the %string should contain.
-       *  @param  c  Character to fill any new elements.
-       *
-       *  This function will %resize the %string to the specified
-       *  number of characters.  If the number is smaller than the
-       *  %string's current size the %string is truncated, otherwise
-       *  the %string is extended and new elements are set to @a c.
-       */
-      void
-      resize(size_type __n, _CharT __c);
-
-      /**
-       *  @brief  Resizes the %string to the specified number of characters.
-       *  @param  n  Number of characters the %string should contain.
-       *
-       *  This function will resize the %string to the specified length.  If
-       *  the new size is smaller than the %string's current size the %string
-       *  is truncated, otherwise the %string is extended and new characters
-       *  are default-constructed.  For basic types such as char, this means
-       *  setting them to 0.
-       */
-      void
-      resize(size_type __n) { this->resize(__n, _CharT()); }
-
-      /**
-       *  Returns the total number of characters that the %string can hold
-       *  before needing to allocate more memory.
-       */
-      size_type
-      capacity() const { return _M_rep()->_M_capacity; }
-
-      /**
-       *  @brief  Attempt to preallocate enough memory for specified number of
-       *          characters.
-       *  @param  n  Number of characters required.
-       *  @throw  std::length_error  If @a n exceeds @c max_size().
-       *
-       *  This function attempts to reserve enough memory for the
-       *  %string to hold the specified number of characters.  If the
-       *  number requested is more than max_size(), length_error is
-       *  thrown.
-       *
-       *  The advantage of this function is that if optimal code is a
-       *  necessity and the user can determine the string length that will be
-       *  required, the user can reserve the memory in %advance, and thus
-       *  prevent a possible reallocation of memory and copying of %string
-       *  data.
-       */
-      void
-      reserve(size_type __res_arg = 0);
-
-      /**
-       *  Erases the string, making it empty.
-       */
-      void
-      clear() { _M_mutate(0, this->size(), 0); }
-
-      /**
-       *  Returns true if the %string is empty.  Equivalent to *this == "".
-       */
-      bool
-      empty() const { return this->size() == 0; }
-
-      // Element access:
-      /**
-       *  @brief  Subscript access to the data contained in the %string.
-       *  @param  n  The index of the character to access.
-       *  @return  Read-only (constant) reference to the character.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      const_reference
-      operator[] (size_type __pos) const
-      {
-	_GLIBCXX_DEBUG_ASSERT(__pos <= size());
-	return _M_data()[__pos];
-      }
-
-      /**
-       *  @brief  Subscript access to the data contained in the %string.
-       *  @param  n  The index of the character to access.
-       *  @return  Read/write reference to the character.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)  Unshares the string.
-       */
-      reference
-      operator[](size_type __pos)
-      {
-	_GLIBCXX_DEBUG_ASSERT(__pos < size());
-	_M_leak();
-	return _M_data()[__pos];
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %string.
-       *  @param n The index of the character to access.
-       *  @return  Read-only (const) reference to the character.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter is
-       *  first checked that it is in the range of the string.  The function
-       *  throws out_of_range if the check fails.
-       */
-      const_reference
-      at(size_type __n) const
-      {
-	if (__n >= this->size())
-	  __throw_out_of_range(__N("basic_string::at"));
-	return _M_data()[__n];
-      }
-
-      /**
-       *  @brief  Provides access to the data contained in the %string.
-       *  @param n The index of the character to access.
-       *  @return  Read/write reference to the character.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter is
-       *  first checked that it is in the range of the string.  The function
-       *  throws out_of_range if the check fails.  Success results in
-       *  unsharing the string.
-       */
-      reference
-      at(size_type __n)
-      {
-	if (__n >= size())
-	  __throw_out_of_range(__N("basic_string::at"));
-	_M_leak();
-	return _M_data()[__n];
-      }
-
-      // Modifiers:
-      /**
-       *  @brief  Append a string to this string.
-       *  @param str  The string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(const basic_string& __str) { return this->append(__str); }
-
-      /**
-       *  @brief  Append a C string.
-       *  @param s  The C string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(const _CharT* __s) { return this->append(__s); }
-
-      /**
-       *  @brief  Append a character.
-       *  @param s  The character to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      operator+=(_CharT __c) { return this->append(size_type(1), __c); }
-
-      /**
-       *  @brief  Append a string to this string.
-       *  @param str  The string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(const basic_string& __str);
-
-      /**
-       *  @brief  Append a substring.
-       *  @param str  The string to append.
-       *  @param pos  Index of the first character of str to append.
-       *  @param n  The number of characters to append.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range if @a pos is not a valid index.
-       *
-       *  This function appends @a n characters from @a str starting at @a pos
-       *  to this string.  If @a n is is larger than the number of available
-       *  characters in @a str, the remainder of @a str is appended.
-       */
-      basic_string&
-      append(const basic_string& __str, size_type __pos, size_type __n);
-
-      /**
-       *  @brief  Append a C substring.
-       *  @param s  The C string to append.
-       *  @param n  The number of characters to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(const _CharT* __s, size_type __n);
-
-      /**
-       *  @brief  Append a C string.
-       *  @param s  The C string to append.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      append(const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->append(__s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Append multiple characters.
-       *  @param n  The number of characters to append.
-       *  @param c  The character to use.
-       *  @return  Reference to this string.
-       *
-       *  Appends n copies of c to this string.
-       */
-      basic_string&
-      append(size_type __n, _CharT __c)
-      { return _M_replace_aux(this->size(), size_type(0), __n, __c); }
-
-      /**
-       *  @brief  Append a range of characters.
-       *  @param first  Iterator referencing the first character to append.
-       *  @param last  Iterator marking the end of the range.
-       *  @return  Reference to this string.
-       *
-       *  Appends characters in the range [first,last) to this string.
-       */
-      template<class _InputIterator>
-        basic_string&
-        append(_InputIterator __first, _InputIterator __last)
-        { return this->replace(_M_iend(), _M_iend(), __first, __last); }
-
-      /**
-       *  @brief  Append a single character.
-       *  @param c  Character to append.
-       */
-      void
-      push_back(_CharT __c)
-      { _M_replace_aux(this->size(), size_type(0), size_type(1), __c); }
-
-      /**
-       *  @brief  Set value to contents of another string.
-       *  @param  str  Source string to use.
-       *  @return  Reference to this string.
-       */
-      basic_string&
-      assign(const basic_string& __str);
-
-      /**
-       *  @brief  Set value to a substring of a string.
-       *  @param str  The string to use.
-       *  @param pos  Index of the first character of str.
-       *  @param n  Number of characters to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range if @a pos is not a valid index.
-       *
-       *  This function sets this string to the substring of @a str consisting
-       *  of @a n characters at @a pos.  If @a n is is larger than the number
-       *  of available characters in @a str, the remainder of @a str is used.
-       */
-      basic_string&
-      assign(const basic_string& __str, size_type __pos, size_type __n)
-      { return this->assign(__str._M_data()
-			    + __str._M_check(__pos, "basic_string::assign"),
-			    __str._M_limit(__pos, __n)); }
-
-      /**
-       *  @brief  Set value to a C substring.
-       *  @param s  The C string to use.
-       *  @param n  Number of characters to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to the first @a n
-       *  characters of @a s.  If @a n is is larger than the number of
-       *  available characters in @a s, the remainder of @a s is used.
-       */
-      basic_string&
-      assign(const _CharT* __s, size_type __n);
-
-      /**
-       *  @brief  Set value to contents of a C string.
-       *  @param s  The C string to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to the value of @a s.
-       *  The data is copied, so there is no dependence on @a s once the
-       *  function returns.
-       */
-      basic_string&
-      assign(const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->assign(__s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Set value to multiple characters.
-       *  @param n  Length of the resulting string.
-       *  @param c  The character to use.
-       *  @return  Reference to this string.
-       *
-       *  This function sets the value of this string to @a n copies of
-       *  character @a c.
-       */
-      basic_string&
-      assign(size_type __n, _CharT __c)
-      { return _M_replace_aux(size_type(0), this->size(), __n, __c); }
-
-      /**
-       *  @brief  Set value to a range of characters.
-       *  @param first  Iterator referencing the first character to append.
-       *  @param last  Iterator marking the end of the range.
-       *  @return  Reference to this string.
-       *
-       *  Sets value of string to characters in the range [first,last).
-      */
-      template<class _InputIterator>
-        basic_string&
-        assign(_InputIterator __first, _InputIterator __last)
-        { return this->replace(_M_ibegin(), _M_iend(), __first, __last); }
-
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param p  Iterator referencing location in string to insert at.
-       *  @param n  Number of characters to insert
-       *  @param c  The character to insert.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts @a n copies of character @a c starting at the position
-       *  referenced by iterator @a p.  If adding characters causes the length
-       *  to exceed max_size(), length_error is thrown.  The value of the
-       *  string doesn't change if an error is thrown.
-      */
-      void
-      insert(iterator __p, size_type __n, _CharT __c)
-      {	this->replace(__p, __p, __n, __c);  }
-
-      /**
-       *  @brief  Insert a range of characters.
-       *  @param p  Iterator referencing location in string to insert at.
-       *  @param beg  Start of range.
-       *  @param end  End of range.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts characters in range [beg,end).  If adding characters causes
-       *  the length to exceed max_size(), length_error is thrown.  The value
-       *  of the string doesn't change if an error is thrown.
-      */
-      template<class _InputIterator>
-        void insert(iterator __p, _InputIterator __beg, _InputIterator __end)
-        { this->replace(__p, __p, __beg, __end); }
-
-      /**
-       *  @brief  Insert value of a string.
-       *  @param pos1  Iterator referencing location in string to insert at.
-       *  @param str  The string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts value of @a str starting at @a pos1.  If adding characters
-       *  causes the length to exceed max_size(), length_error is thrown.  The
-       *  value of the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      insert(size_type __pos1, const basic_string& __str)
-      { return this->insert(__pos1, __str, size_type(0), __str.size()); }
-
-      /**
-       *  @brief  Insert a substring.
-       *  @param pos1  Iterator referencing location in string to insert at.
-       *  @param str  The string to insert.
-       *  @param pos2  Start of characters in str to insert.
-       *  @param n  Number of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a pos1 > size() or
-       *  @a pos2 > @a str.size().
-       *
-       *  Starting at @a pos1, insert @a n character of @a str beginning with
-       *  @a pos2.  If adding characters causes the length to exceed
-       *  max_size(), length_error is thrown.  If @a pos1 is beyond the end of
-       *  this string or @a pos2 is beyond the end of @a str, out_of_range is
-       *  thrown.  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string&
-      insert(size_type __pos1, const basic_string& __str,
-	     size_type __pos2, size_type __n)
-      { return this->insert(__pos1, __str._M_data()
-			    + __str._M_check(__pos2, "basic_string::insert"),
-			    __str._M_limit(__pos2, __n)); }
-
-      /**
-       *  @brief  Insert a C substring.
-       *  @param pos  Iterator referencing location in string to insert at.
-       *  @param s  The C string to insert.
-       *  @param n  The number of characters to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts the first @a n characters of @a s starting at @a pos.  If
-       *  adding characters causes the length to exceed max_size(),
-       *  length_error is thrown.  If @a pos is beyond end(), out_of_range is
-       *  thrown.  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string&
-      insert(size_type __pos, const _CharT* __s, size_type __n);
-
-      /**
-       *  @brief  Insert a C string.
-       *  @param pos  Iterator referencing location in string to insert at.
-       *  @param s  The C string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts the first @a n characters of @a s starting at @a pos.  If
-       *  adding characters causes the length to exceed max_size(),
-       *  length_error is thrown.  If @a pos is beyond end(), out_of_range is
-       *  thrown.  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string&
-      insert(size_type __pos, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->insert(__pos, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Insert multiple characters.
-       *  @param pos  Index in string to insert at.
-       *  @param n  Number of characters to insert
-       *  @param c  The character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *
-       *  Inserts @a n copies of character @a c starting at index @a pos.  If
-       *  adding characters causes the length to exceed max_size(),
-       *  length_error is thrown.  If @a pos > length(), out_of_range is
-       *  thrown.  The value of the string doesn't change if an error is
-       *  thrown.
-      */
-      basic_string&
-      insert(size_type __pos, size_type __n, _CharT __c)
-      { return _M_replace_aux(_M_check(__pos, "basic_string::insert"),
-			      size_type(0), __n, __c); }
-
-      /**
-       *  @brief  Insert one character.
-       *  @param p  Iterator referencing position in string to insert at.
-       *  @param c  The character to insert.
-       *  @return  Iterator referencing newly inserted char.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Inserts character @a c at position referenced by @a p.  If adding
-       *  character causes the length to exceed max_size(), length_error is
-       *  thrown.  If @a p is beyond end of string, out_of_range is thrown.
-       *  The value of the string doesn't change if an error is thrown.
-      */
-      iterator
-      insert(iterator __p, _CharT __c)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__p >= _M_ibegin() && __p <= _M_iend());
-	const size_type __pos = __p - _M_ibegin();
-	_M_replace_aux(__pos, size_type(0), size_type(1), __c);
-	_M_rep()->_M_set_leaked();
-	return this->_M_ibegin() + __pos;
-      }
-
-      /**
-       *  @brief  Remove characters.
-       *  @param pos  Index of first character to remove (default 0).
-       *  @param n  Number of characters to remove (default remainder).
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *
-       *  Removes @a n characters from this string starting at @a pos.  The
-       *  length of the string is reduced by @a n.  If there are < @a n
-       *  characters to remove, the remainder of the string is truncated.  If
-       *  @a p is beyond end of string, out_of_range is thrown.  The value of
-       *  the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      erase(size_type __pos = 0, size_type __n = npos)
-      { return _M_replace_safe(_M_check(__pos, "basic_string::erase"),
-			       _M_limit(__pos, __n), NULL, size_type(0)); }
-
-      /**
-       *  @brief  Remove one character.
-       *  @param position  Iterator referencing the character to remove.
-       *  @return  iterator referencing same location after removal.
-       *
-       *  Removes the character at @a position from this string. The value
-       *  of the string doesn't change if an error is thrown.
-      */
-      iterator
-      erase(iterator __position)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__position >= _M_ibegin()
-				 && __position < _M_iend());
-	const size_type __pos = __position - _M_ibegin();
-	_M_replace_safe(__pos, size_type(1), NULL, size_type(0));
-	_M_rep()->_M_set_leaked();
-	return _M_ibegin() + __pos;
-      }
-
-      /**
-       *  @brief  Remove a range of characters.
-       *  @param first  Iterator referencing the first character to remove.
-       *  @param last  Iterator referencing the end of the range.
-       *  @return  Iterator referencing location of first after removal.
-       *
-       *  Removes the characters in the range [first,last) from this string.
-       *  The value of the string doesn't change if an error is thrown.
-      */
-      iterator
-      erase(iterator __first, iterator __last)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(__first >= _M_ibegin() && __first <= __last
-				 && __last <= _M_iend());
-        const size_type __pos = __first - _M_ibegin();
-	_M_replace_safe(__pos, __last - __first, NULL, size_type(0));
-	_M_rep()->_M_set_leaked();
-	return _M_ibegin() + __pos;
-      }
-
-      /**
-       *  @brief  Replace characters with value from another string.
-       *  @param pos  Index of first character to replace.
-       *  @param n  Number of characters to be replaced.
-       *  @param str  String to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos is beyond the end of this
-       *  string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos+n) from this string.
-       *  In place, the value of @a str is inserted.  If @a pos is beyond end
-       *  of string, out_of_range is thrown.  If the length of the result
-       *  exceeds max_size(), length_error is thrown.  The value of the string
-       *  doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n, const basic_string& __str)
-      { return this->replace(__pos, __n, __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Replace characters with value from another string.
-       *  @param pos1  Index of first character to replace.
-       *  @param n1  Number of characters to be replaced.
-       *  @param str  String to insert.
-       *  @param pos2  Index of first character of str to use.
-       *  @param n2  Number of characters from str to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos1 > size() or @a pos2 >
-       *  str.size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos1,pos1 + n) from this
-       *  string.  In place, the value of @a str is inserted.  If @a pos is
-       *  beyond end of string, out_of_range is thrown.  If the length of the
-       *  result exceeds max_size(), length_error is thrown.  The value of the
-       *  string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos1, size_type __n1, const basic_string& __str,
-	      size_type __pos2, size_type __n2)
-      { return this->replace(__pos1, __n1, __str._M_data()
-			     + __str._M_check(__pos2, "basic_string::replace"),
-			     __str._M_limit(__pos2, __n2)); }
-
-      /**
-       *  @brief  Replace characters with value of a C substring.
-       *  @param pos  Index of first character to replace.
-       *  @param n1  Number of characters to be replaced.
-       *  @param str  C string to insert.
-       *  @param n2  Number of characters from str to use.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos1 > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos + n1) from this string.
-       *  In place, the first @a n2 characters of @a str are inserted, or all
-       *  of @a str if @a n2 is too large.  If @a pos is beyond end of string,
-       *  out_of_range is thrown.  If the length of result exceeds max_size(),
-       *  length_error is thrown.  The value of the string doesn't change if
-       *  an error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n1, const _CharT* __s,
-	      size_type __n2);
-
-      /**
-       *  @brief  Replace characters with value of a C string.
-       *  @param pos  Index of first character to replace.
-       *  @param n1  Number of characters to be replaced.
-       *  @param str  C string to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos + n1) from this string.
-       *  In place, the first @a n characters of @a str are inserted.  If @a
-       *  pos is beyond end of string, out_of_range is thrown.  If the length
-       *  of result exceeds max_size(), length_error is thrown.  The value of
-       *  the string doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n1, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__pos, __n1, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Replace characters with multiple characters.
-       *  @param pos  Index of first character to replace.
-       *  @param n1  Number of characters to be replaced.
-       *  @param n2  Number of characters to insert.
-       *  @param c  Character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::out_of_range  If @a pos > size().
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [pos,pos + n1) from this string.
-       *  In place, @a n2 copies of @a c are inserted.  If @a pos is beyond
-       *  end of string, out_of_range is thrown.  If the length of result
-       *  exceeds max_size(), length_error is thrown.  The value of the string
-       *  doesn't change if an error is thrown.
-      */
-      basic_string&
-      replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c)
-      { return _M_replace_aux(_M_check(__pos, "basic_string::replace"),
-			      _M_limit(__pos, __n1), __n2, __c); }
-
-      /**
-       *  @brief  Replace range of characters with string.
-       *  @param i1  Iterator referencing start of range to replace.
-       *  @param i2  Iterator referencing end of range to replace.
-       *  @param str  String value to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place, the value of
-       *  @a str is inserted.  If the length of result exceeds max_size(),
-       *  length_error is thrown.  The value of the string doesn't change if
-       *  an error is thrown.
-      */
-      basic_string&
-      replace(iterator __i1, iterator __i2, const basic_string& __str)
-      { return this->replace(__i1, __i2, __str._M_data(), __str.size()); }
-
-      /**
-       *  @brief  Replace range of characters with C substring.
-       *  @param i1  Iterator referencing start of range to replace.
-       *  @param i2  Iterator referencing end of range to replace.
-       *  @param s  C string value to insert.
-       *  @param n  Number of characters from s to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place, the first @a
-       *  n characters of @a s are inserted.  If the length of result exceeds
-       *  max_size(), length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	return this->replace(__i1 - _M_ibegin(), __i2 - __i1, __s, __n);
-      }
-
-      /**
-       *  @brief  Replace range of characters with C string.
-       *  @param i1  Iterator referencing start of range to replace.
-       *  @param i2  Iterator referencing end of range to replace.
-       *  @param s  C string value to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place, the
-       *  characters of @a s are inserted.  If the length of result exceeds
-       *  max_size(), length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      basic_string&
-      replace(iterator __i1, iterator __i2, const _CharT* __s)
-      {
-	__glibcxx_requires_string(__s);
-	return this->replace(__i1, __i2, __s, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Replace range of characters with multiple characters
-       *  @param i1  Iterator referencing start of range to replace.
-       *  @param i2  Iterator referencing end of range to replace.
-       *  @param n  Number of characters to insert.
-       *  @param c  Character to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place, @a n copies
-       *  of @a c are inserted.  If the length of result exceeds max_size(),
-       *  length_error is thrown.  The value of the string doesn't change if
-       *  an error is thrown.
-      */
-      basic_string&
-      replace(iterator __i1, iterator __i2, size_type __n, _CharT __c)
-      {
-	_GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				 && __i2 <= _M_iend());
-	return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __c);
-      }
-
-      /**
-       *  @brief  Replace range of characters with range.
-       *  @param i1  Iterator referencing start of range to replace.
-       *  @param i2  Iterator referencing end of range to replace.
-       *  @param k1  Iterator referencing start of range to insert.
-       *  @param k2  Iterator referencing end of range to insert.
-       *  @return  Reference to this string.
-       *  @throw  std::length_error  If new length exceeds @c max_size().
-       *
-       *  Removes the characters in the range [i1,i2).  In place, characters
-       *  in the range [k1,k2) are inserted.  If the length of result exceeds
-       *  max_size(), length_error is thrown.  The value of the string doesn't
-       *  change if an error is thrown.
-      */
-      template<class _InputIterator>
-        basic_string&
-        replace(iterator __i1, iterator __i2,
-		_InputIterator __k1, _InputIterator __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				   && __i2 <= _M_iend());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-	  return _M_replace_dispatch(__i1, __i2, __k1, __k2, _Integral());
-	}
-
-      // Specializations for the common case of pointer and iterator:
-      // useful to avoid the overhead of temporary buffering in _M_replace.
-      basic_string&
-        replace(iterator __i1, iterator __i2, _CharT* __k1, _CharT* __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				   && __i2 <= _M_iend());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			       __k1, __k2 - __k1);
-	}
-
-      basic_string&
-        replace(iterator __i1, iterator __i2,
-		const _CharT* __k1, const _CharT* __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				   && __i2 <= _M_iend());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			       __k1, __k2 - __k1);
-	}
-
-      basic_string&
-        replace(iterator __i1, iterator __i2, iterator __k1, iterator __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				   && __i2 <= _M_iend());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			       __k1.base(), __k2 - __k1);
-	}
-
-      basic_string&
-        replace(iterator __i1, iterator __i2,
-		const_iterator __k1, const_iterator __k2)
-        {
-	  _GLIBCXX_DEBUG_PEDASSERT(_M_ibegin() <= __i1 && __i1 <= __i2
-				   && __i2 <= _M_iend());
-	  __glibcxx_requires_valid_range(__k1, __k2);
-	  return this->replace(__i1 - _M_ibegin(), __i2 - __i1,
-			       __k1.base(), __k2 - __k1);
-	}
-
-    private:
-      template<class _Integer>
-	basic_string&
-	_M_replace_dispatch(iterator __i1, iterator __i2, _Integer __n,
-			    _Integer __val, __true_type)
-        { return _M_replace_aux(__i1 - _M_ibegin(), __i2 - __i1, __n, __val); }
-
-      template<class _InputIterator>
-	basic_string&
-	_M_replace_dispatch(iterator __i1, iterator __i2, _InputIterator __k1,
-			    _InputIterator __k2, __false_type);
-
-      basic_string&
-      _M_replace_aux(size_type __pos1, size_type __n1, size_type __n2,
-		     _CharT __c)
-      {
-	if (this->max_size() - (this->size() - __n1) < __n2)
-	  __throw_length_error(__N("basic_string::_M_replace_aux"));
-	_M_mutate(__pos1, __n1, __n2);
-	if (__n2 == 1)
-	  _M_data()[__pos1] = __c;
-	else if (__n2)
-	  traits_type::assign(_M_data() + __pos1, __n2, __c);
-	return *this;
-      }
-
-      basic_string&
-      _M_replace_safe(size_type __pos1, size_type __n1, const _CharT* __s,
-		      size_type __n2)
-      {
-	_M_mutate(__pos1, __n1, __n2);
-	if (__n2 == 1)
-	  _M_data()[__pos1] = *__s;
-	else if (__n2)
-	  traits_type::copy(_M_data() + __pos1, __s, __n2);
-	return *this;
-      }
-
-      // _S_construct_aux is used to implement the 21.3.1 para 15 which
-      // requires special behaviour if _InIter is an integral type
-      template<class _InIterator>
-        static _CharT*
-        _S_construct_aux(_InIterator __beg, _InIterator __end,
-			 const _Alloc& __a, __false_type)
-	{
-          typedef typename iterator_traits<_InIterator>::iterator_category _Tag;
-          return _S_construct(__beg, __end, __a, _Tag());
-	}
-
-      template<class _InIterator>
-        static _CharT*
-        _S_construct_aux(_InIterator __beg, _InIterator __end,
-			 const _Alloc& __a, __true_type)
-	{ return _S_construct(static_cast<size_type>(__beg),
-			      static_cast<value_type>(__end), __a); }
-
-      template<class _InIterator>
-        static _CharT*
-        _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a)
-	{
-	  typedef typename _Is_integer<_InIterator>::_Integral _Integral;
-	  return _S_construct_aux(__beg, __end, __a, _Integral());
-        }
-
-      // For Input Iterators, used in istreambuf_iterators, etc.
-      template<class _InIterator>
-        static _CharT*
-         _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
-		      input_iterator_tag);
-
-      // For forward_iterators up to random_access_iterators, used for
-      // string::iterator, _CharT*, etc.
-      template<class _FwdIterator>
-        static _CharT*
-        _S_construct(_FwdIterator __beg, _FwdIterator __end, const _Alloc& __a,
-		     forward_iterator_tag);
-
-      static _CharT*
-      _S_construct(size_type __req, _CharT __c, const _Alloc& __a);
-
-    public:
-
-      /**
-       *  @brief  Copy substring into C string.
-       *  @param s  C string to copy value into.
-       *  @param n  Number of characters to copy.
-       *  @param pos  Index of first character to copy.
-       *  @return  Number of characters actually copied
-       *  @throw  std::out_of_range  If pos > size().
-       *
-       *  Copies up to @a n characters starting at @a pos into the C string @a
-       *  s.  If @a pos is greater than size(), out_of_range is thrown.
-      */
-      size_type
-      copy(_CharT* __s, size_type __n, size_type __pos = 0) const;
-
-      /**
-       *  @brief  Swap contents with another string.
-       *  @param s  String to swap with.
-       *
-       *  Exchanges the contents of this string with that of @a s in constant
-       *  time.
-      */
-      void
-      swap(basic_string& __s);
-
-      // String operations:
-      /**
-       *  @brief  Return const pointer to null-terminated contents.
-       *
-       *  This is a handle to internal data.  Do not modify or dire things may
-       *  happen.
-      */
-      const _CharT*
-      c_str() const { return _M_data(); }
-
-      /**
-       *  @brief  Return const pointer to contents.
-       *
-       *  This is a handle to internal data.  Do not modify or dire things may
-       *  happen.
-      */
-      const _CharT*
-      data() const { return _M_data(); }
-
-      /**
-       *  @brief  Return copy of allocator used to construct this string.
-      */
-      allocator_type
-      get_allocator() const { return _M_dataplus; }
-
-      /**
-       *  @brief  Find position of a C substring.
-       *  @param s  C string to locate.
-       *  @param pos  Index of character to search from.
-       *  @param n  Number of characters from @a s to search for.
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for the first @a n characters
-       *  in @a s within this string.  If found, returns the index where it
-       *  begins.  If not found, returns npos.
-      */
-      size_type
-      find(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find position of a string.
-       *  @param str  String to locate.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for value of @a str within
-       *  this string.  If found, returns the index where it begins.  If not
-       *  found, returns npos.
-      */
-      size_type
-      find(const basic_string& __str, size_type __pos = 0) const
-      { return this->find(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a C string.
-       *  @param s  C string to locate.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of start of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for the value of @a s within
-       *  this string.  If found, returns the index where it begins.  If not
-       *  found, returns npos.
-      */
-      size_type
-      find(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a character.
-       *  @param c  Character to locate.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for @a c within this string.
-       *  If found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find(_CharT __c, size_type __pos = 0) const;
-
-      /**
-       *  @brief  Find last position of a string.
-       *  @param str  String to locate.
-       *  @param pos  Index of character to search back from (default end).
-       *  @return  Index of start of last occurrence.
-       *
-       *  Starting from @a pos, searches backward for value of @a str within
-       *  this string.  If found, returns the index where it begins.  If not
-       *  found, returns npos.
-      */
-      size_type
-      rfind(const basic_string& __str, size_type __pos = npos) const
-      { return this->rfind(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a C substring.
-       *  @param s  C string to locate.
-       *  @param pos  Index of character to search back from.
-       *  @param n  Number of characters from s to search for.
-       *  @return  Index of start of last occurrence.
-       *
-       *  Starting from @a pos, searches backward for the first @a n
-       *  characters in @a s within this string.  If found, returns the index
-       *  where it begins.  If not found, returns npos.
-      */
-      size_type
-      rfind(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find last position of a C string.
-       *  @param s  C string to locate.
-       *  @param pos  Index of character to start search at (default 0).
-       *  @return  Index of start of  last occurrence.
-       *
-       *  Starting from @a pos, searches backward for the value of @a s within
-       *  this string.  If found, returns the index where it begins.  If not
-       *  found, returns npos.
-      */
-      size_type
-      rfind(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->rfind(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a character.
-       *  @param c  Character to locate.
-       *  @param pos  Index of character to search back from (default 0).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a pos, searches backward for @a c within this string.
-       *  If found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      rfind(_CharT __c, size_type __pos = npos) const;
-
-      /**
-       *  @brief  Find position of a character of string.
-       *  @param str  String containing characters to locate.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for one of the characters of
-       *  @a str within this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_first_of(const basic_string& __str, size_type __pos = 0) const
-      { return this->find_first_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a character of C substring.
-       *  @param s  String containing characters to locate.
-       *  @param pos  Index of character to search from (default 0).
-       *  @param n  Number of characters from s to search for.
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for one of the first @a n
-       *  characters of @a s within this string.  If found, returns the index
-       *  where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find position of a character of C string.
-       *  @param s  String containing characters to locate.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for one of the characters of
-       *  @a s within this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_first_of(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_first_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a character.
-       *  @param c  Character to locate.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for the character @a c within
-       *  this string.  If found, returns the index where it was found.  If
-       *  not found, returns npos.
-       *
-       *  Note: equivalent to find(c, pos).
-      */
-      size_type
-      find_first_of(_CharT __c, size_type __pos = 0) const
-      { return this->find(__c, __pos); }
-
-      /**
-       *  @brief  Find last position of a character of string.
-       *  @param str  String containing characters to locate.
-       *  @param pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a pos, searches backward for one of the characters of
-       *  @a str within this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_last_of(const basic_string& __str, size_type __pos = npos) const
-      { return this->find_last_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a character of C substring.
-       *  @param s  C string containing characters to locate.
-       *  @param pos  Index of character to search back from (default end).
-       *  @param n  Number of characters from s to search for.
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a pos, searches backward for one of the first @a n
-       *  characters of @a s within this string.  If found, returns the index
-       *  where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_last_of(const _CharT* __s, size_type __pos, size_type __n) const;
-
-      /**
-       *  @brief  Find last position of a character of C string.
-       *  @param s  C string containing characters to locate.
-       *  @param pos  Index of character to search back from (default end).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a pos, searches backward for one of the characters of
-       *  @a s within this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_last_of(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_last_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a character.
-       *  @param c  Character to locate.
-       *  @param pos  Index of character to search back from (default 0).
-       *  @return  Index of last occurrence.
-       *
-       *  Starting from @a pos, searches backward for @a c within this string.
-       *  If found, returns the index where it was found.  If not found,
-       *  returns npos.
-       *
-       *  Note: equivalent to rfind(c, pos).
-      */
-      size_type
-      find_last_of(_CharT __c, size_type __pos = npos) const
-      { return this->rfind(__c, __pos); }
-
-      /**
-       *  @brief  Find position of a character not in string.
-       *  @param str  String containing characters to avoid.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for a character not contained
-       *  in @a str within this string.  If found, returns the index where it
-       *  was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const basic_string& __str, size_type __pos = 0) const
-      { return this->find_first_not_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find position of a character not in C substring.
-       *  @param s  C string containing characters to avoid.
-       *  @param pos  Index of character to search from (default 0).
-       *  @param n  Number of characters from s to consider.
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for a character not contained
-       *  in the first @a n characters of @a s within this string.  If found,
-       *  returns the index where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const _CharT* __s, size_type __pos,
-			size_type __n) const;
-
-      /**
-       *  @brief  Find position of a character not in C string.
-       *  @param s  C string containing characters to avoid.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for a character not contained
-       *  in @a s within this string.  If found, returns the index where it
-       *  was found.  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(const _CharT* __s, size_type __pos = 0) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_first_not_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find position of a different character.
-       *  @param c  Character to avoid.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches forward for a character other than @a c
-       *  within this string.  If found, returns the index where it was found.
-       *  If not found, returns npos.
-      */
-      size_type
-      find_first_not_of(_CharT __c, size_type __pos = 0) const;
-
-      /**
-       *  @brief  Find last position of a character not in string.
-       *  @param str  String containing characters to avoid.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches backward for a character not
-       *  contained in @a str within this string.  If found, returns the index
-       *  where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_last_not_of(const basic_string& __str, size_type __pos = npos) const
-      { return this->find_last_not_of(__str.data(), __pos, __str.size()); }
-
-      /**
-       *  @brief  Find last position of a character not in C substring.
-       *  @param s  C string containing characters to avoid.
-       *  @param pos  Index of character to search from (default 0).
-       *  @param n  Number of characters from s to consider.
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches backward for a character not
-       *  contained in the first @a n characters of @a s within this string.
-       *  If found, returns the index where it was found.  If not found,
-       *  returns npos.
-      */
-      size_type
-      find_last_not_of(const _CharT* __s, size_type __pos,
-		       size_type __n) const;
-      /**
-       *  @brief  Find position of a character not in C string.
-       *  @param s  C string containing characters to avoid.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches backward for a character not
-       *  contained in @a s within this string.  If found, returns the index
-       *  where it was found.  If not found, returns npos.
-      */
-      size_type
-      find_last_not_of(const _CharT* __s, size_type __pos = npos) const
-      {
-	__glibcxx_requires_string(__s);
-	return this->find_last_not_of(__s, __pos, traits_type::length(__s));
-      }
-
-      /**
-       *  @brief  Find last position of a different character.
-       *  @param c  Character to avoid.
-       *  @param pos  Index of character to search from (default 0).
-       *  @return  Index of first occurrence.
-       *
-       *  Starting from @a pos, searches backward for a character other than
-       *  @a c within this string.  If found, returns the index where it was
-       *  found.  If not found, returns npos.
-      */
-      size_type
-      find_last_not_of(_CharT __c, size_type __pos = npos) const;
-
-      /**
-       *  @brief  Get a substring.
-       *  @param pos  Index of first character (default 0).
-       *  @param n  Number of characters in substring (default remainder).
-       *  @return  The new string.
-       *  @throw  std::out_of_range  If pos > size().
-       *
-       *  Construct and return a new string using the @a n characters starting
-       *  at @a pos.  If the string is too short, use the remainder of the
-       *  characters.  If @a pos is beyond the end of the string, out_of_range
-       *  is thrown.
-      */
-      basic_string
-      substr(size_type __pos = 0, size_type __n = npos) const
-      { return basic_string(*this,
-			    _M_check(__pos, "basic_string::substr"), __n); }
-
-      /**
-       *  @brief  Compare to a string.
-       *  @param str  String to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Returns an integer < 0 if this string is ordered before @a str, 0 if
-       *  their values are equivalent, or > 0 if this string is ordered after
-       *  @a str.  Determines the effective length rlen of the strings to
-       *  compare as the smallest of size() and str.size().  The function
-       *  then compares the two strings by calling traits::compare(data(),
-       *  str.data(),rlen).  If the result of the comparison is nonzero returns
-       *  it, otherwise the shorter one is ordered first.
-      */
-      int
-      compare(const basic_string& __str) const
-      {
-	const size_type __size = this->size();
-	const size_type __osize = __str.size();
-	const size_type __len = std::min(__size, __osize);
-
-	int __r = traits_type::compare(_M_data(), __str.data(), __len);
-	if (!__r)
-	  __r =  __size - __osize;
-	return __r;
-      }
-
-      /**
-       *  @brief  Compare substring to a string.
-       *  @param pos  Index of first character of substring.
-       *  @param n  Number of characters in substring.
-       *  @param str  String to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a n characters starting
-       *  at @a pos.  Returns an integer < 0 if the substring is ordered
-       *  before @a str, 0 if their values are equivalent, or > 0 if the
-       *  substring is ordered after @a str.  Determines the effective length
-       *  rlen of the strings to compare as the smallest of the length of the
-       *  substring and @a str.size().  The function then compares the two
-       *  strings by calling traits::compare(substring.data(),str.data(),rlen).
-       *  If the result of the comparison is nonzero returns it, otherwise the
-       *  shorter one is ordered first.
-      */
-      int
-      compare(size_type __pos, size_type __n, const basic_string& __str) const;
-
-      /**
-       *  @brief  Compare substring to a substring.
-       *  @param pos1  Index of first character of substring.
-       *  @param n1  Number of characters in substring.
-       *  @param str  String to compare against.
-       *  @param pos2  Index of first character of substring of str.
-       *  @param n2  Number of characters in substring of str.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a n1 characters starting
-       *  at @a pos1.  Form the substring of @a str from the @a n2 characters
-       *  starting at @a pos2.  Returns an integer < 0 if this substring is
-       *  ordered before the substring of @a str, 0 if their values are
-       *  equivalent, or > 0 if this substring is ordered after the substring
-       *  of @a str.  Determines the effective length rlen of the strings
-       *  to compare as the smallest of the lengths of the substrings.  The
-       *  function then compares the two strings by calling
-       *  traits::compare(substring.data(),str.substr(pos2,n2).data(),rlen).
-       *  If the result of the comparison is nonzero returns it, otherwise the
-       *  shorter one is ordered first.
-      */
-      int
-      compare(size_type __pos1, size_type __n1, const basic_string& __str,
-	      size_type __pos2, size_type __n2) const;
-
-      /**
-       *  @brief  Compare to a C string.
-       *  @param s  C string to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Returns an integer < 0 if this string is ordered before @a s, 0 if
-       *  their values are equivalent, or > 0 if this string is ordered after
-       *  @a s.  Determines the effective length rlen of the strings to
-       *  compare as the smallest of size() and the length of a string
-       *  constructed from @a s.  The function then compares the two strings
-       *  by calling traits::compare(data(),s,rlen).  If the result of the
-       *  comparison is nonzero returns it, otherwise the shorter one is
-       *  ordered first.
-      */
-      int
-      compare(const _CharT* __s) const;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 5 String::compare specification questionable
-      /**
-       *  @brief  Compare substring to a C string.
-       *  @param pos  Index of first character of substring.
-       *  @param n1  Number of characters in substring.
-       *  @param s  C string to compare against.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a n1 characters starting
-       *  at @a pos.  Returns an integer < 0 if the substring is ordered
-       *  before @a s, 0 if their values are equivalent, or > 0 if the
-       *  substring is ordered after @a s.  Determines the effective length
-       *  rlen of the strings to compare as the smallest of the length of the 
-       *  substring and the length of a string constructed from @a s.  The
-       *  function then compares the two string by calling
-       *  traits::compare(substring.data(),s,rlen).  If the result of the
-       *  comparison is nonzero returns it, otherwise the shorter one is
-       *  ordered first.
-      */
-      int
-      compare(size_type __pos, size_type __n1, const _CharT* __s) const;
-
-      /**
-       *  @brief  Compare substring against a character array.
-       *  @param pos1  Index of first character of substring.
-       *  @param n1  Number of characters in substring.
-       *  @param s  character array to compare against.
-       *  @param n2  Number of characters of s.
-       *  @return  Integer < 0, 0, or > 0.
-       *
-       *  Form the substring of this string from the @a n1 characters starting
-       *  at @a pos1.  Form a string from the first @a n2 characters of @a s.
-       *  Returns an integer < 0 if this substring is ordered before the string
-       *  from @a s, 0 if their values are equivalent, or > 0 if this substring
-       *  is ordered after the string from @a s.   Determines the effective
-       *  length rlen of the strings to compare as the smallest of the length
-       *  of the substring and @a n2.  The function then compares the two
-       *  strings by calling traits::compare(substring.data(),s,rlen).  If the
-       *  result of the comparison is nonzero returns it, otherwise the shorter
-       *  one is ordered first.
-       *
-       *  NB: s must have at least n2 characters, '\0' has no special
-       *  meaning.
-      */
-      int
-      compare(size_type __pos, size_type __n1, const _CharT* __s,
-	      size_type __n2) const;
-  };
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>::
-    basic_string()
-#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
-    : _M_dataplus(_S_empty_rep()._M_refdata(), _Alloc()) { }
-#else
-    : _M_dataplus(_S_construct(size_type(), _CharT(), _Alloc()), _Alloc()) { }
-#endif
-
-  // operator+
-  /**
-   *  @brief  Concatenate two strings.
-   *  @param lhs  First string.
-   *  @param rhs  Last string.
-   *  @return  New string with value of @a lhs followed by @a rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>
-    operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    {
-      basic_string<_CharT, _Traits, _Alloc> __str(__lhs);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  /**
-   *  @brief  Concatenate C string and string.
-   *  @param lhs  First string.
-   *  @param rhs  Last string.
-   *  @return  New string with value of @a lhs followed by @a rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT,_Traits,_Alloc>
-    operator+(const _CharT* __lhs,
-	      const basic_string<_CharT,_Traits,_Alloc>& __rhs);
-
-  /**
-   *  @brief  Concatenate character and string.
-   *  @param lhs  First string.
-   *  @param rhs  Last string.
-   *  @return  New string with @a lhs followed by @a rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT,_Traits,_Alloc>
-    operator+(_CharT __lhs, const basic_string<_CharT,_Traits,_Alloc>& __rhs);
-
-  /**
-   *  @brief  Concatenate string and C string.
-   *  @param lhs  First string.
-   *  @param rhs  Last string.
-   *  @return  New string with @a lhs followed by @a rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	     const _CharT* __rhs)
-    {
-      basic_string<_CharT, _Traits, _Alloc> __str(__lhs);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  /**
-   *  @brief  Concatenate string and character.
-   *  @param lhs  First string.
-   *  @param rhs  Last string.
-   *  @return  New string with @a lhs followed by @a rhs.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_string<_CharT, _Traits, _Alloc>
-    operator+(const basic_string<_CharT, _Traits, _Alloc>& __lhs, _CharT __rhs)
-    {
-      typedef basic_string<_CharT, _Traits, _Alloc>	__string_type;
-      typedef typename __string_type::size_type		__size_type;
-      __string_type __str(__lhs);
-      __str.append(__size_type(1), __rhs);
-      return __str;
-    }
-
-  // operator ==
-  /**
-   *  @brief  Test equivalence of two strings.
-   *  @param lhs  First string.
-   *  @param rhs  Second string.
-   *  @return  True if @a lhs.compare(@a rhs) == 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator==(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) == 0; }
-
-  /**
-   *  @brief  Test equivalence of C string and string.
-   *  @param lhs  C string.
-   *  @param rhs  String.
-   *  @return  True if @a rhs.compare(@a lhs) == 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator==(const _CharT* __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) == 0; }
-
-  /**
-   *  @brief  Test equivalence of string and C string.
-   *  @param lhs  String.
-   *  @param rhs  C string.
-   *  @return  True if @a lhs.compare(@a rhs) == 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator==(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) == 0; }
-
-  // operator !=
-  /**
-   *  @brief  Test difference of two strings.
-   *  @param lhs  First string.
-   *  @param rhs  Second string.
-   *  @return  True if @a lhs.compare(@a rhs) != 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator!=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) != 0; }
-
-  /**
-   *  @brief  Test difference of C string and string.
-   *  @param lhs  C string.
-   *  @param rhs  String.
-   *  @return  True if @a rhs.compare(@a lhs) != 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator!=(const _CharT* __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) != 0; }
-
-  /**
-   *  @brief  Test difference of string and C string.
-   *  @param lhs  String.
-   *  @param rhs  C string.
-   *  @return  True if @a lhs.compare(@a rhs) != 0.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator!=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) != 0; }
-
-  // operator <
-  /**
-   *  @brief  Test if string precedes string.
-   *  @param lhs  First string.
-   *  @param rhs  Second string.
-   *  @return  True if @a lhs precedes @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) < 0; }
-
-  /**
-   *  @brief  Test if string precedes C string.
-   *  @param lhs  String.
-   *  @param rhs  C string.
-   *  @return  True if @a lhs precedes @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const _CharT* __rhs)
-    { return __lhs.compare(__rhs) < 0; }
-
-  /**
-   *  @brief  Test if C string precedes string.
-   *  @param lhs  C string.
-   *  @param rhs  String.
-   *  @return  True if @a lhs precedes @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<(const _CharT* __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) > 0; }
-
-  // operator >
-  /**
-   *  @brief  Test if string follows string.
-   *  @param lhs  First string.
-   *  @param rhs  Second string.
-   *  @return  True if @a lhs follows @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) > 0; }
-
-  /**
-   *  @brief  Test if string follows C string.
-   *  @param lhs  String.
-   *  @param rhs  C string.
-   *  @return  True if @a lhs follows @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	      const _CharT* __rhs)
-    { return __lhs.compare(__rhs) > 0; }
-
-  /**
-   *  @brief  Test if C string follows string.
-   *  @param lhs  C string.
-   *  @param rhs  String.
-   *  @return  True if @a lhs follows @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>(const _CharT* __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) < 0; }
-
-  // operator <=
-  /**
-   *  @brief  Test if string doesn't follow string.
-   *  @param lhs  First string.
-   *  @param rhs  Second string.
-   *  @return  True if @a lhs doesn't follow @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) <= 0; }
-
-  /**
-   *  @brief  Test if string doesn't follow C string.
-   *  @param lhs  String.
-   *  @param rhs  C string.
-   *  @return  True if @a lhs doesn't follow @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) <= 0; }
-
-  /**
-   *  @brief  Test if C string doesn't follow string.
-   *  @param lhs  C string.
-   *  @param rhs  String.
-   *  @return  True if @a lhs doesn't follow @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator<=(const _CharT* __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-  { return __rhs.compare(__lhs) >= 0; }
-
-  // operator >=
-  /**
-   *  @brief  Test if string doesn't precede string.
-   *  @param lhs  First string.
-   *  @param rhs  Second string.
-   *  @return  True if @a lhs doesn't precede @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __lhs.compare(__rhs) >= 0; }
-
-  /**
-   *  @brief  Test if string doesn't precede C string.
-   *  @param lhs  String.
-   *  @param rhs  C string.
-   *  @return  True if @a lhs doesn't precede @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>=(const basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	       const _CharT* __rhs)
-    { return __lhs.compare(__rhs) >= 0; }
-
-  /**
-   *  @brief  Test if C string doesn't precede string.
-   *  @param lhs  C string.
-   *  @param rhs  String.
-   *  @return  True if @a lhs doesn't precede @a rhs.  False otherwise.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline bool
-    operator>=(const _CharT* __lhs,
-	     const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { return __rhs.compare(__lhs) <= 0; }
-
-  /**
-   *  @brief  Swap contents of two strings.
-   *  @param lhs  First string.
-   *  @param rhs  Second string.
-   *
-   *  Exchanges the contents of @a lhs and @a rhs in constant time.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline void
-    swap(basic_string<_CharT, _Traits, _Alloc>& __lhs,
-	 basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-
-  /**
-   *  @brief  Read stream into a string.
-   *  @param is  Input stream.
-   *  @param str  Buffer to store into.
-   *  @return  Reference to the input stream.
-   *
-   *  Stores characters from @a is into @a str until whitespace is found, the
-   *  end of the stream is encountered, or str.max_size() is reached.  If
-   *  is.width() is non-zero, that is the limit on the number of characters
-   *  stored into @a str.  Any previous contents of @a str are erased.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-	       basic_string<_CharT, _Traits, _Alloc>& __str);
-
-  /**
-   *  @brief  Write string to a stream.
-   *  @param os  Output stream.
-   *  @param str  String to write out.
-   *  @return  Reference to the output stream.
-   *
-   *  Output characters of @a str into os following the same rules as for
-   *  writing a C string.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-	       const basic_string<_CharT, _Traits, _Alloc>& __str);
-
-  /**
-   *  @brief  Read a line from stream into a string.
-   *  @param is  Input stream.
-   *  @param str  Buffer to store into.
-   *  @param delim  Character marking end of line.
-   *  @return  Reference to the input stream.
-   *
-   *  Stores characters from @a is into @a str until @a delim is found, the
-   *  end of the stream is encountered, or str.max_size() is reached.  If
-   *  is.width() is non-zero, that is the limit on the number of characters
-   *  stored into @a str.  Any previous contents of @a str are erased.  If @a
-   *  delim was encountered, it is extracted but not stored into @a str.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT,_Traits>&
-    getline(basic_istream<_CharT, _Traits>& __is,
-	    basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim);
-
-  /**
-   *  @brief  Read a line from stream into a string.
-   *  @param is  Input stream.
-   *  @param str  Buffer to store into.
-   *  @return  Reference to the input stream.
-   *
-   *  Stores characters from is into @a str until '\n' is found, the end of
-   *  the stream is encountered, or str.max_size() is reached.  If is.width()
-   *  is non-zero, that is the limit on the number of characters stored into
-   *  @a str.  Any previous contents of @a str are erased.  If end of line was
-   *  encountered, it is extracted but not stored into @a str.
-   */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    inline basic_istream<_CharT,_Traits>&
-    getline(basic_istream<_CharT, _Traits>& __is,
-	    basic_string<_CharT, _Traits, _Alloc>& __str);
-} // namespace std
-
-#endif /* _BASIC_STRING_H */
diff --git a/include.new/c++/3.4/bits/basic_string.tcc b/include.new/c++/3.4/bits/basic_string.tcc
deleted file mode 100644
index fc90111..0000000
--- a/include.new/c++/3.4/bits/basic_string.tcc
+++ /dev/null
@@ -1,975 +0,0 @@
-// Components for manipulating sequences of characters -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 21  Strings library
-//
-
-// This file is included by <string>.  It is not meant to be included
-// separately.
-
-// Written by Jason Merrill based upon the specification by Takanori Adachi
-// in ANSI X3J16/94-0013R2.  Rewritten by Nathan Myers to ISO-14882.
-
-#ifndef _BASIC_STRING_TCC
-#define _BASIC_STRING_TCC 1
-
-#pragma GCC system_header
-
-namespace std
-{
-  template<typename _Type>
-    inline bool
-    __is_null_pointer(_Type* __ptr)
-    { return __ptr == 0; }
-
-  template<typename _Type>
-    inline bool
-    __is_null_pointer(_Type)
-    { return false; }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    const typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    _Rep::_S_max_size = (((npos - sizeof(_Rep_base))/sizeof(_CharT)) - 1) / 4;
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    const _CharT
-    basic_string<_CharT, _Traits, _Alloc>::
-    _Rep::_S_terminal = _CharT();
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    const typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::npos;
-
-  // Linker sets _S_empty_rep_storage to all 0s (one reference, empty string)
-  // at static init time (before static ctors are run).
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::_Rep::_S_empty_rep_storage[
-    (sizeof(_Rep_base) + sizeof(_CharT) + sizeof(size_type) - 1) /
-      sizeof(size_type)];
-
-  // NB: This is the special case for Input Iterators, used in
-  // istreambuf_iterators, etc.
-  // Input Iterators have a cost structure very different from
-  // pointers, calling for a different coding style.
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InIterator>
-      _CharT*
-      basic_string<_CharT, _Traits, _Alloc>::
-      _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
-		   input_iterator_tag)
-      {
-#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
-	if (__beg == __end && __a == _Alloc())
-	  return _S_empty_rep()._M_refdata();
-#endif
-	// Avoid reallocation for common case.
-	_CharT __buf[128];
-	size_type __len = 0;
-	while (__beg != __end && __len < sizeof(__buf) / sizeof(_CharT))
-	  {
-	    __buf[__len++] = *__beg;
-	    ++__beg;
-	  }
-	_Rep* __r = _Rep::_S_create(__len, size_type(0), __a);
-	traits_type::copy(__r->_M_refdata(), __buf, __len);
-	try
-	  {
-	    while (__beg != __end)
-	      {
-		if (__len == __r->_M_capacity)
-		  {
-		    // Allocate more space.
-		    _Rep* __another = _Rep::_S_create(__len + 1, __len, __a);
-		    traits_type::copy(__another->_M_refdata(),
-				      __r->_M_refdata(), __len);
-		    __r->_M_destroy(__a);
-		    __r = __another;
-		  }
-		__r->_M_refdata()[__len++] = *__beg;
-		++__beg;
-	      }
-	  }
-	catch(...)
-	  {
-	    __r->_M_destroy(__a);
-	    __throw_exception_again;
-	  }
-	__r->_M_length = __len;
-	__r->_M_refdata()[__len] = _Rep::_S_terminal;       // grrr.
-	return __r->_M_refdata();
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template <typename _InIterator>
-      _CharT*
-      basic_string<_CharT, _Traits, _Alloc>::
-      _S_construct(_InIterator __beg, _InIterator __end, const _Alloc& __a,
-		   forward_iterator_tag)
-      {
-#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
-	if (__beg == __end && __a == _Alloc())
-	  return _S_empty_rep()._M_refdata();
-#endif
-	// NB: Not required, but considered best practice.
-	if (__builtin_expect(__is_null_pointer(__beg) && __beg != __end, 0))
-	  __throw_logic_error(__N("basic_string::_S_construct NULL not valid"));
-
-	const size_type __dnew = static_cast<size_type>(std::distance(__beg,
-								      __end));
-	// Check for out_of_range and length_error exceptions.
-	_Rep* __r = _Rep::_S_create(__dnew, size_type(0), __a);
-	try
-	  { _S_copy_chars(__r->_M_refdata(), __beg, __end); }
-	catch(...)
-	  {
-	    __r->_M_destroy(__a);
-	    __throw_exception_again;
-	  }
-	__r->_M_length = __dnew;
-	__r->_M_refdata()[__dnew] = _Rep::_S_terminal;  // grrr.
-	return __r->_M_refdata();
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    _CharT*
-    basic_string<_CharT, _Traits, _Alloc>::
-    _S_construct(size_type __n, _CharT __c, const _Alloc& __a)
-    {
-#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
-      if (__n == 0 && __a == _Alloc())
-	return _S_empty_rep()._M_refdata();
-#endif
-      // Check for out_of_range and length_error exceptions.
-      _Rep* __r = _Rep::_S_create(__n, size_type(0), __a);
-      if (__n)
-	traits_type::assign(__r->_M_refdata(), __n, __c);
-
-      __r->_M_length = __n;
-      __r->_M_refdata()[__n] = _Rep::_S_terminal;  // grrr
-      return __r->_M_refdata();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const basic_string& __str)
-    : _M_dataplus(__str._M_rep()->_M_grab(_Alloc(__str.get_allocator()),
-					  __str.get_allocator()),
-		  __str.get_allocator())
-    { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const _Alloc& __a)
-    : _M_dataplus(_S_construct(size_type(), _CharT(), __a), __a)
-    { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const basic_string& __str, size_type __pos, size_type __n)
-    : _M_dataplus(_S_construct(__str._M_data()
-			       + __str._M_check(__pos,
-						"basic_string::basic_string"),
-			       __str._M_data() + __str._M_limit(__pos, __n)
-			       + __pos, _Alloc()), _Alloc())
-    { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const basic_string& __str, size_type __pos,
-		 size_type __n, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__str._M_data()
-			       + __str._M_check(__pos,
-						"basic_string::basic_string"),
-			       __str._M_data() + __str._M_limit(__pos, __n)
-			       + __pos, __a), __a)
-    { }
-
-  // TBD: DPG annotate
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const _CharT* __s, size_type __n, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__s, __s + __n, __a), __a)
-    { }
-
-  // TBD: DPG annotate
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(const _CharT* __s, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__s, __s ? __s + traits_type::length(__s) :
-			       __s + npos, __a), __a)
-    { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(size_type __n, _CharT __c, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__n, __c, __a), __a)
-    { }
-
-  // TBD: DPG annotate
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InputIterator>
-    basic_string<_CharT, _Traits, _Alloc>::
-    basic_string(_InputIterator __beg, _InputIterator __end, const _Alloc& __a)
-    : _M_dataplus(_S_construct(__beg, __end, __a), __a)
-    { }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    assign(const basic_string& __str)
-    {
-      if (_M_rep() != __str._M_rep())
-	{
-	  // XXX MT
-	  const allocator_type __a = this->get_allocator();
-	  _CharT* __tmp = __str._M_rep()->_M_grab(__a, __str.get_allocator());
-	  _M_rep()->_M_dispose(__a);
-	  _M_data(__tmp);
-	}
-      return *this;
-    }
-
-   template<typename _CharT, typename _Traits, typename _Alloc>
-     basic_string<_CharT, _Traits, _Alloc>&
-     basic_string<_CharT, _Traits, _Alloc>::
-     assign(const _CharT* __s, size_type __n)
-     {
-       __glibcxx_requires_string_len(__s, __n);
-       if (__n > this->max_size())
-	 __throw_length_error(__N("basic_string::assign"));
-       if (_M_rep()->_M_is_shared() || less<const _CharT*>()(__s, _M_data())
-	   || less<const _CharT*>()(_M_data() + this->size(), __s))
-	 return _M_replace_safe(size_type(0), this->size(), __s, __n);
-       else
-	 {
-	   // Work in-place
-	   const size_type __pos = __s - _M_data();
-	   if (__pos >= __n)
-	     traits_type::copy(_M_data(), __s, __n);
-	   else if (__pos)
-	     traits_type::move(_M_data(), __s, __n);
-	   _M_rep()->_M_set_sharable();
-	   _M_rep()->_M_length = __n;
-	   _M_data()[__n] = _Rep::_S_terminal;  // grr.
-	   return *this;
-	 }
-     }
-
-   template<typename _CharT, typename _Traits, typename _Alloc>
-     basic_string<_CharT, _Traits, _Alloc>&
-     basic_string<_CharT, _Traits, _Alloc>::
-     insert(size_type __pos, const _CharT* __s, size_type __n)
-     {
-       __glibcxx_requires_string_len(__s, __n);
-       _M_check(__pos, "basic_string::insert");
-       if (this->max_size() - this->size() < __n)
-	 __throw_length_error(__N("basic_string::insert"));
-       if (_M_rep()->_M_is_shared() || less<const _CharT*>()(__s, _M_data())
-           || less<const _CharT*>()(_M_data() + this->size(), __s))
-         return _M_replace_safe(__pos, size_type(0), __s, __n);
-       else
-         {
-           // Work in-place. If _M_mutate reallocates the string, __s
-           // does not point anymore to valid data, therefore we save its
-           // offset, then we restore it.
-           const size_type __off = __s - _M_data();
-           _M_mutate(__pos, 0, __n);
-           __s = _M_data() + __off;
-           _CharT* __p = _M_data() + __pos;
-           if (__s  + __n <= __p)
-             traits_type::copy(__p, __s, __n);
-           else if (__s >= __p)
-             traits_type::copy(__p, __s + __n, __n);
-           else
-             {
-	       const size_type __nleft = __p - __s;
-               traits_type::copy(__p, __s, __nleft);
-               traits_type::copy(__p + __nleft, __p + __n, __n - __nleft);
-             }
-           return *this;
-         }
-     }
-
-   template<typename _CharT, typename _Traits, typename _Alloc>
-     basic_string<_CharT, _Traits, _Alloc>&
-     basic_string<_CharT, _Traits, _Alloc>::
-     replace(size_type __pos, size_type __n1, const _CharT* __s,
-	     size_type __n2)
-     {
-       __glibcxx_requires_string_len(__s, __n2);
-       _M_check(__pos, "basic_string::replace");
-       __n1 = _M_limit(__pos, __n1);
-       if (this->max_size() - (this->size() - __n1) < __n2)
-         __throw_length_error(__N("basic_string::replace"));
-       bool __left;
-       if (_M_rep()->_M_is_shared() || less<const _CharT*>()(__s, _M_data())
-	   || less<const _CharT*>()(_M_data() + this->size(), __s))
-         return _M_replace_safe(__pos, __n1, __s, __n2);
-       else if ((__left = __s + __n2 <= _M_data() + __pos)
-		|| _M_data() + __pos + __n1 <= __s)
-	 {
-	   // Work in-place: non-overlapping case.
-	   const size_type __off = __s - _M_data();
-	   _M_mutate(__pos, __n1, __n2);
-	   if (__left)
-	     traits_type::copy(_M_data() + __pos,
-			       _M_data() + __off, __n2);
-	   else
-	     traits_type::copy(_M_data() + __pos,
-			       _M_data() + __off + __n2 - __n1, __n2);
-	   return *this;
-	 }
-       else
-	 {
-	   // Todo: overlapping case.
-	   const basic_string __tmp(__s, __n2);
-	   return _M_replace_safe(__pos, __n1, __tmp._M_data(), __n2);
-	 }
-     }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::_Rep::
-    _M_destroy(const _Alloc& __a) throw ()
-    {
-#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
-      if (this == &_S_empty_rep())
-	return;
-#endif
-      const size_type __size = sizeof(_Rep_base) +
-	                       (this->_M_capacity + 1) * sizeof(_CharT);
-      _Raw_bytes_alloc(__a).deallocate(reinterpret_cast<char*>(this), __size);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::_M_leak_hard()
-    {
-#ifndef _GLIBCXX_FULLY_DYNAMIC_STRING
-      if (_M_rep() == &_S_empty_rep())
-	return;
-#endif
-      if (_M_rep()->_M_is_shared())
-	_M_mutate(0, 0, 0);
-      _M_rep()->_M_set_leaked();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::
-    _M_mutate(size_type __pos, size_type __len1, size_type __len2)
-    {
-      const size_type __old_size = this->size();
-      const size_type __new_size = __old_size + __len2 - __len1;
-      const size_type __how_much = __old_size - __pos - __len1;
-
-      if (__new_size > capacity() || _M_rep()->_M_is_shared())
-	{
-	  // Must reallocate.
-	  const allocator_type __a = get_allocator();
-	  _Rep* __r = _Rep::_S_create(__new_size, capacity(), __a);
-
-	  if (__pos)
-	    traits_type::copy(__r->_M_refdata(), _M_data(), __pos);
-	  if (__how_much)
-	    traits_type::copy(__r->_M_refdata() + __pos + __len2,
-			      _M_data() + __pos + __len1, __how_much);
-
-	  _M_rep()->_M_dispose(__a);
-	  _M_data(__r->_M_refdata());
-	}
-      else if (__how_much && __len1 != __len2)
-	{
-	  // Work in-place
-	  traits_type::move(_M_data() + __pos + __len2,
-			    _M_data() + __pos + __len1, __how_much);
-	}
-      _M_rep()->_M_set_sharable();
-      _M_rep()->_M_length = __new_size;
-      _M_data()[__new_size] = _Rep::_S_terminal; // grrr. (per 21.3.4)
-      // You cannot leave those LWG people alone for a second.
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::reserve(size_type __res)
-    {
-      if (__res != this->capacity() || _M_rep()->_M_is_shared())
-        {
-	  if (__res > this->max_size())
-	    __throw_length_error(__N("basic_string::reserve"));
-	  // Make sure we don't shrink below the current size
-	  if (__res < this->size())
-	    __res = this->size();
-	  const allocator_type __a = get_allocator();
-	  _CharT* __tmp = _M_rep()->_M_clone(__a, __res - this->size());
-	  _M_rep()->_M_dispose(__a);
-	  _M_data(__tmp);
-        }
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void basic_string<_CharT, _Traits, _Alloc>::swap(basic_string& __s)
-    {
-      if (_M_rep()->_M_is_leaked())
-	_M_rep()->_M_set_sharable();
-      if (__s._M_rep()->_M_is_leaked())
-	__s._M_rep()->_M_set_sharable();
-      if (this->get_allocator() == __s.get_allocator())
-	{
-	  _CharT* __tmp = _M_data();
-	  _M_data(__s._M_data());
-	  __s._M_data(__tmp);
-	}
-      // The code below can usually be optimized away.
-      else
-	{
-	  const basic_string __tmp1(_M_ibegin(), _M_iend(),
-				    __s.get_allocator());
-	  const basic_string __tmp2(__s._M_ibegin(), __s._M_iend(),
-				    this->get_allocator());
-	  *this = __tmp2;
-	  __s = __tmp1;
-	}
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::_Rep*
-    basic_string<_CharT, _Traits, _Alloc>::_Rep::
-    _S_create(size_type __capacity, size_type __old_capacity,
-	      const _Alloc& __alloc)
-    {
-      typedef basic_string<_CharT, _Traits, _Alloc> __string_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 83.  String::npos vs. string::max_size()
-      if (__capacity > _S_max_size)
-	__throw_length_error(__N("basic_string::_S_create"));
-
-      // The standard places no restriction on allocating more memory
-      // than is strictly needed within this layer at the moment or as
-      // requested by an explicit application call to reserve().
-
-      // Many malloc implementations perform quite poorly when an
-      // application attempts to allocate memory in a stepwise fashion
-      // growing each allocation size by only 1 char.  Additionally,
-      // it makes little sense to allocate less linear memory than the
-      // natural blocking size of the malloc implementation.
-      // Unfortunately, we would need a somewhat low-level calculation
-      // with tuned parameters to get this perfect for any particular
-      // malloc implementation.  Fortunately, generalizations about
-      // common features seen among implementations seems to suffice.
-
-      // __pagesize need not match the actual VM page size for good
-      // results in practice, thus we pick a common value on the low
-      // side.  __malloc_header_size is an estimate of the amount of
-      // overhead per memory allocation (in practice seen N * sizeof
-      // (void*) where N is 0, 2 or 4).  According to folklore,
-      // picking this value on the high side is better than
-      // low-balling it (especially when this algorithm is used with
-      // malloc implementations that allocate memory blocks rounded up
-      // to a size which is a power of 2).
-      const size_type __pagesize = 4096; // must be 2^i * __subpagesize
-      const size_type __subpagesize = 128; // should be >> __malloc_header_size
-      const size_type __malloc_header_size = 4 * sizeof (void*);
-
-      // The below implements an exponential growth policy, necessary to
-      // meet amortized linear time requirements of the library: see
-      // http://gcc.gnu.org/ml/libstdc++/2001-07/msg00085.html.
-      // It's active for allocations requiring an amount of memory above
-      // system pagesize. This is consistent with the requirements of the
-      // standard: http://gcc.gnu.org/ml/libstdc++/2001-07/msg00130.html
-
-      // The biggest string which fits in a memory page
-      const size_type __page_capacity = ((__pagesize - __malloc_header_size
-					  - sizeof(_Rep) - sizeof(_CharT))
-					 / sizeof(_CharT));
-
-      if (__capacity > __old_capacity && __capacity < 2 * __old_capacity
-	  && __capacity > __page_capacity)
-	__capacity = 2 * __old_capacity;
-
-      // NB: Need an array of char_type[__capacity], plus a terminating
-      // null char_type() element, plus enough for the _Rep data structure.
-      // Whew. Seemingly so needy, yet so elemental.
-      size_type __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
-
-      const size_type __adj_size = __size + __malloc_header_size;
-      if (__adj_size > __pagesize)
-	{
-	  const size_type __extra = __pagesize - __adj_size % __pagesize;
-	  __capacity += __extra / sizeof(_CharT);
-	  // Never allocate a string bigger than _S_max_size.
-	  if (__capacity > _S_max_size)
-	    __capacity = _S_max_size;
-	  __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
-	}
-      else if (__size > __subpagesize)
-	{
-	  const size_type __extra = __subpagesize - __adj_size % __subpagesize;
-	  __capacity += __extra / sizeof(_CharT);
-	  __size = (__capacity + 1) * sizeof(_CharT) + sizeof(_Rep);
-	}
-
-      // NB: Might throw, but no worries about a leak, mate: _Rep()
-      // does not throw.
-      void* __place = _Raw_bytes_alloc(__alloc).allocate(__size);
-      _Rep *__p = new (__place) _Rep;
-      __p->_M_capacity = __capacity;
-      __p->_M_set_sharable();  // One reference.
-      __p->_M_length = 0;
-      return __p;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    _CharT*
-    basic_string<_CharT, _Traits, _Alloc>::_Rep::
-    _M_clone(const _Alloc& __alloc, size_type __res)
-    {
-      // Requested capacity of the clone.
-      const size_type __requested_cap = this->_M_length + __res;
-      _Rep* __r = _Rep::_S_create(__requested_cap, this->_M_capacity,
-				  __alloc);
-      if (this->_M_length)
-	traits_type::copy(__r->_M_refdata(), _M_refdata(),
-			  this->_M_length);
-
-      __r->_M_length = this->_M_length;
-      __r->_M_refdata()[this->_M_length] = _Rep::_S_terminal;
-      return __r->_M_refdata();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    void
-    basic_string<_CharT, _Traits, _Alloc>::resize(size_type __n, _CharT __c)
-    {
-      if (__n > max_size())
-	__throw_length_error(__N("basic_string::resize"));
-      const size_type __size = this->size();
-      if (__size < __n)
-	this->append(__n - __size, __c);
-      else if (__n < __size)
-	this->erase(__n);
-      // else nothing (in particular, avoid calling _M_mutate() unnecessarily.)
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    template<typename _InputIterator>
-      basic_string<_CharT, _Traits, _Alloc>&
-      basic_string<_CharT, _Traits, _Alloc>::
-      _M_replace_dispatch(iterator __i1, iterator __i2, _InputIterator __k1,
-			  _InputIterator __k2, __false_type)
-      {
-	const basic_string __s(__k1, __k2);
-	const size_type __n1 = __i2 - __i1;
-	if (this->max_size() - (this->size() - __n1) < __s.size())
-	  __throw_length_error(__N("basic_string::_M_replace_dispatch"));
-	return _M_replace_safe(__i1 - _M_ibegin(), __n1, __s._M_data(),
-			       __s.size());
-      }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    append(const basic_string& __str)
-    {
-      // Iff appending itself, string needs to pre-reserve the
-      // correct size so that _M_mutate does not clobber the
-      // pointer __str._M_data() formed here.
-      const size_type __size = __str.size();
-      const size_type __len = __size + this->size();
-      if (__len > this->capacity())
-	this->reserve(__len);
-      return _M_replace_safe(this->size(), size_type(0), __str._M_data(),
-			     __str.size());
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    append(const basic_string& __str, size_type __pos, size_type __n)
-    {
-      // Iff appending itself, string needs to pre-reserve the
-      // correct size so that _M_mutate does not clobber the
-      // pointer __str._M_data() formed here.
-      __str._M_check(__pos, "basic_string::append");
-      __n = __str._M_limit(__pos, __n);
-      const size_type __len = __n + this->size();
-      if (__len > this->capacity())
-	this->reserve(__len);
-      return _M_replace_safe(this->size(), size_type(0), __str._M_data()
-			     + __pos, __n);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>&
-    basic_string<_CharT, _Traits, _Alloc>::
-    append(const _CharT* __s, size_type __n)
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      const size_type __len = __n + this->size();
-      if (__len > this->capacity())
-	this->reserve(__len);
-      return _M_replace_safe(this->size(), size_type(0), __s, __n);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>
-    operator+(const _CharT* __lhs,
-	      const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    {
-      __glibcxx_requires_string(__lhs);
-      typedef basic_string<_CharT, _Traits, _Alloc> __string_type;
-      typedef typename __string_type::size_type	  __size_type;
-      const __size_type __len = _Traits::length(__lhs);
-      __string_type __str;
-      __str.reserve(__len + __rhs.size());
-      __str.append(__lhs, __len);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_string<_CharT, _Traits, _Alloc>
-    operator+(_CharT __lhs, const basic_string<_CharT, _Traits, _Alloc>& __rhs)
-    {
-      typedef basic_string<_CharT, _Traits, _Alloc> __string_type;
-      typedef typename __string_type::size_type	  __size_type;
-      __string_type __str;
-      const __size_type __len = __rhs.size();
-      __str.reserve(__len + 1);
-      __str.append(__size_type(1), __lhs);
-      __str.append(__rhs);
-      return __str;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    copy(_CharT* __s, size_type __n, size_type __pos) const
-    {
-      _M_check(__pos, "basic_string::copy");
-      __n = _M_limit(__pos, __n);
-      __glibcxx_requires_string_len(__s, __n);
-      if (__n)
-	traits_type::copy(__s, _M_data() + __pos, __n);
-      // 21.3.5.7 par 3: do not append null.  (good.)
-      return __n;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      const size_type __size = this->size();
-      const _CharT* __data = _M_data();
-      for (; __pos + __n <= __size; ++__pos)
-	if (traits_type::compare(__data + __pos, __s, __n) == 0)
-	  return __pos;
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find(_CharT __c, size_type __pos) const
-    {
-      const size_type __size = this->size();
-      size_type __ret = npos;
-      if (__pos < __size)
-	{
-	  const _CharT* __data = _M_data();
-	  const size_type __n = __size - __pos;
-	  const _CharT* __p = traits_type::find(__data + __pos, __n, __c);
-	  if (__p)
-	    __ret = __p - __data;
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    rfind(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      const size_type __size = this->size();
-      if (__n <= __size)
-	{
-	  __pos = std::min(size_type(__size - __n), __pos);
-	  const _CharT* __data = _M_data();
-	  do
-	    {
-	      if (traits_type::compare(__data + __pos, __s, __n) == 0)
-		return __pos;
-	    }
-	  while (__pos-- > 0);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    rfind(_CharT __c, size_type __pos) const
-    {
-      size_type __size = this->size();
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  for (++__size; __size-- > 0; )
-	    if (traits_type::eq(_M_data()[__size], __c))
-	      return __size;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_first_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      for (; __n && __pos < this->size(); ++__pos)
-	{
-	  const _CharT* __p = traits_type::find(__s, __n, _M_data()[__pos]);
-	  if (__p)
-	    return __pos;
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_last_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      size_type __size = this->size();
-      if (__size && __n)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (traits_type::find(__s, __n, _M_data()[__size]))
-		return __size;
-	    }
-	  while (__size-- != 0);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_first_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      for (; __pos < this->size(); ++__pos)
-	if (!traits_type::find(__s, __n, _M_data()[__pos]))
-	  return __pos;
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_first_not_of(_CharT __c, size_type __pos) const
-    {
-      for (; __pos < this->size(); ++__pos)
-	if (!traits_type::eq(_M_data()[__pos], __c))
-	  return __pos;
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_last_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_requires_string_len(__s, __n);
-      size_type __size = this->size();
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (!traits_type::find(__s, __n, _M_data()[__size]))
-		return __size;
-	    }
-	  while (__size--);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    typename basic_string<_CharT, _Traits, _Alloc>::size_type
-    basic_string<_CharT, _Traits, _Alloc>::
-    find_last_not_of(_CharT __c, size_type __pos) const
-    {
-      size_type __size = this->size();
-      if (__size)
-	{
-	  if (--__size > __pos)
-	    __size = __pos;
-	  do
-	    {
-	      if (!traits_type::eq(_M_data()[__size], __c))
-		return __size;
-	    }
-	  while (__size--);
-	}
-      return npos;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string<_CharT, _Traits, _Alloc>::
-    compare(size_type __pos, size_type __n, const basic_string& __str) const
-    {
-      _M_check(__pos, "basic_string::compare");
-      __n = _M_limit(__pos, __n);
-      const size_type __osize = __str.size();
-      const size_type __len = std::min(__n, __osize);
-      int __r = traits_type::compare(_M_data() + __pos, __str.data(), __len);
-      if (!__r)
-	__r = __n - __osize;
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string<_CharT, _Traits, _Alloc>::
-    compare(size_type __pos1, size_type __n1, const basic_string& __str,
-	    size_type __pos2, size_type __n2) const
-    {
-      _M_check(__pos1, "basic_string::compare");
-      __str._M_check(__pos2, "basic_string::compare");
-      __n1 = _M_limit(__pos1, __n1);
-      __n2 = __str._M_limit(__pos2, __n2);
-      const size_type __len = std::min(__n1, __n2);
-      int __r = traits_type::compare(_M_data() + __pos1,
-				     __str.data() + __pos2, __len);
-      if (!__r)
-	__r = __n1 - __n2;
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string<_CharT, _Traits, _Alloc>::
-    compare(const _CharT* __s) const
-    {
-      __glibcxx_requires_string(__s);
-      const size_type __size = this->size();
-      const size_type __osize = traits_type::length(__s);
-      const size_type __len = std::min(__size, __osize);
-      int __r = traits_type::compare(_M_data(), __s, __len);
-      if (!__r)
-	__r = __size - __osize;
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string <_CharT, _Traits, _Alloc>::
-    compare(size_type __pos, size_type __n1, const _CharT* __s) const
-    {
-      __glibcxx_requires_string(__s);
-      _M_check(__pos, "basic_string::compare");
-      __n1 = _M_limit(__pos, __n1);
-      const size_type __osize = traits_type::length(__s);
-      const size_type __len = std::min(__n1, __osize);
-      int __r = traits_type::compare(_M_data() + __pos, __s, __len);
-      if (!__r)
-	__r = __n1 - __osize;
-      return __r;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    int
-    basic_string <_CharT, _Traits, _Alloc>::
-    compare(size_type __pos, size_type __n1, const _CharT* __s,
-	    size_type __n2) const
-    {
-      __glibcxx_requires_string_len(__s, __n2);
-      _M_check(__pos, "basic_string::compare");
-      __n1 = _M_limit(__pos, __n1);
-      const size_type __len = std::min(__n1, __n2);
-      int __r = traits_type::compare(_M_data() + __pos, __s, __len);
-      if (!__r)
-	__r = __n1 - __n2;
-      return __r;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB: This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_string<char>;
-  extern template
-    basic_istream<char>&
-    operator>>(basic_istream<char>&, string&);
-  extern template
-    basic_ostream<char>&
-    operator<<(basic_ostream<char>&, const string&);
-  extern template
-    basic_istream<char>&
-    getline(basic_istream<char>&, string&, char);
-  extern template
-    basic_istream<char>&
-    getline(basic_istream<char>&, string&);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_string<wchar_t>;
-  extern template
-    basic_istream<wchar_t>&
-    operator>>(basic_istream<wchar_t>&, wstring&);
-  extern template
-    basic_ostream<wchar_t>&
-    operator<<(basic_ostream<wchar_t>&, const wstring&);
-  extern template
-    basic_istream<wchar_t>&
-    getline(basic_istream<wchar_t>&, wstring&, wchar_t);
-  extern template
-    basic_istream<wchar_t>&
-    getline(basic_istream<wchar_t>&, wstring&);
-#endif
-#endif
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/boost_concept_check.h b/include.new/c++/3.4/bits/boost_concept_check.h
deleted file mode 100644
index ff154f7..0000000
--- a/include.new/c++/3.4/bits/boost_concept_check.h
+++ /dev/null
@@ -1,932 +0,0 @@
-// Copyright (C) 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// (C) Copyright Jeremy Siek 2000. Permission to copy, use, modify,
-// sell and distribute this software is granted provided this
-// copyright notice appears in all copies. This software is provided
-// "as is" without express or implied warranty, and with no claim as
-// to its suitability for any purpose.
-//
-
-// GCC Note:  based on version 1.12.0 of the Boost library.
-
-/** @file boost_concept_check.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _BOOST_CONCEPT_CHECK_H
-#define _BOOST_CONCEPT_CHECK_H 1
-
-#pragma GCC system_header
-
-#include <cstddef>                // for ptrdiff_t, used next
-#include <bits/stl_iterator_base_types.h>    // for traits and tags
-#include <utility>                           // for pair<>
-
-namespace __gnu_cxx
-{
-
-#define _IsUnused __attribute__ ((__unused__))
-
-// When the C-C code is in use, we would like this function to do as little
-// as possible at runtime, use as few resources as possible, and hopefully
-// be elided out of existence... hmmm.
-template <class _Concept>
-inline void __function_requires()
-{
-  void (_Concept::*__x)() _IsUnused = &_Concept::__constraints;
-}
-
-// No definition: if this is referenced, there's a problem with
-// the instantiating type not being one of the required integer types.
-// Unfortunately, this results in a link-time error, not a compile-time error.
-void __error_type_must_be_an_integer_type();
-void __error_type_must_be_an_unsigned_integer_type();
-void __error_type_must_be_a_signed_integer_type();
-
-// ??? Should the "concept_checking*" structs begin with more than _ ?
-#define _GLIBCXX_CLASS_REQUIRES(_type_var, _ns, _concept) \
-  typedef void (_ns::_concept <_type_var>::* _func##_type_var##_concept)(); \
-  template <_func##_type_var##_concept _Tp1> \
-  struct _concept_checking##_type_var##_concept { }; \
-  typedef _concept_checking##_type_var##_concept< \
-    &_ns::_concept <_type_var>::__constraints> \
-    _concept_checking_typedef##_type_var##_concept
-
-#define _GLIBCXX_CLASS_REQUIRES2(_type_var1, _type_var2, _ns, _concept) \
-  typedef void (_ns::_concept <_type_var1,_type_var2>::* _func##_type_var1##_type_var2##_concept)(); \
-  template <_func##_type_var1##_type_var2##_concept _Tp1> \
-  struct _concept_checking##_type_var1##_type_var2##_concept { }; \
-  typedef _concept_checking##_type_var1##_type_var2##_concept< \
-    &_ns::_concept <_type_var1,_type_var2>::__constraints> \
-    _concept_checking_typedef##_type_var1##_type_var2##_concept
-
-#define _GLIBCXX_CLASS_REQUIRES3(_type_var1, _type_var2, _type_var3, _ns, _concept) \
-  typedef void (_ns::_concept <_type_var1,_type_var2,_type_var3>::* _func##_type_var1##_type_var2##_type_var3##_concept)(); \
-  template <_func##_type_var1##_type_var2##_type_var3##_concept _Tp1> \
-  struct _concept_checking##_type_var1##_type_var2##_type_var3##_concept { }; \
-  typedef _concept_checking##_type_var1##_type_var2##_type_var3##_concept< \
-    &_ns::_concept <_type_var1,_type_var2,_type_var3>::__constraints>  \
-  _concept_checking_typedef##_type_var1##_type_var2##_type_var3##_concept
-
-#define _GLIBCXX_CLASS_REQUIRES4(_type_var1, _type_var2, _type_var3, _type_var4, _ns, _concept) \
-  typedef void (_ns::_concept <_type_var1,_type_var2,_type_var3,_type_var4>::* _func##_type_var1##_type_var2##_type_var3##_type_var4##_concept)(); \
-  template <_func##_type_var1##_type_var2##_type_var3##_type_var4##_concept _Tp1> \
-  struct _concept_checking##_type_var1##_type_var2##_type_var3##_type_var4##_concept { }; \
-  typedef _concept_checking##_type_var1##_type_var2##_type_var3##_type_var4##_concept< \
-  &_ns::_concept <_type_var1,_type_var2,_type_var3,_type_var4>::__constraints> \
-    _concept_checking_typedef##_type_var1##_type_var2##_type_var3##_type_var4##_concept
-
-
-template <class _Tp1, class _Tp2>
-struct _Aux_require_same { };
-
-template <class _Tp>
-struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
-
-  template <class _Tp1, class _Tp2>
-  struct _SameTypeConcept
-  {
-    void __constraints() {
-      typedef typename _Aux_require_same<_Tp1, _Tp2>::_Type _Required;
-    }
-  };
-
-  template <class _Tp>
-  struct _IntegerConcept {
-    void __constraints() {
-      __error_type_must_be_an_integer_type();
-    }
-  };
-  template <> struct _IntegerConcept<short> { void __constraints() {} };
-  template <> struct _IntegerConcept<unsigned short> { void __constraints(){} };
-  template <> struct _IntegerConcept<int> { void __constraints() {} };
-  template <> struct _IntegerConcept<unsigned int> { void __constraints() {} };
-  template <> struct _IntegerConcept<long> { void __constraints() {} };
-  template <> struct _IntegerConcept<unsigned long> { void __constraints() {} };
-  template <> struct _IntegerConcept<long long> { void __constraints() {} };
-  template <> struct _IntegerConcept<unsigned long long>
-                                                { void __constraints() {} };
-
-  template <class _Tp>
-  struct _SignedIntegerConcept {
-    void __constraints() {
-      __error_type_must_be_a_signed_integer_type();
-    }
-  };
-  template <> struct _SignedIntegerConcept<short> { void __constraints() {} };
-  template <> struct _SignedIntegerConcept<int> { void __constraints() {} };
-  template <> struct _SignedIntegerConcept<long> { void __constraints() {} };
-  template <> struct _SignedIntegerConcept<long long> { void __constraints(){}};
-
-  template <class _Tp>
-  struct _UnsignedIntegerConcept {
-    void __constraints() {
-      __error_type_must_be_an_unsigned_integer_type();
-    }
-  };
-  template <> struct _UnsignedIntegerConcept<unsigned short>
-    { void __constraints() {} };
-  template <> struct _UnsignedIntegerConcept<unsigned int>
-    { void __constraints() {} };
-  template <> struct _UnsignedIntegerConcept<unsigned long>
-    { void __constraints() {} };
-  template <> struct _UnsignedIntegerConcept<unsigned long long>
-    { void __constraints() {} };
-
-  //===========================================================================
-  // Basic Concepts
-
-  template <class _Tp>
-  struct _DefaultConstructibleConcept
-  {
-    void __constraints() {
-      _Tp __a _IsUnused;                // require default constructor
-    }
-  };
-
-  template <class _Tp>
-  struct _AssignableConcept
-  {
-    void __constraints() {
-      __a = __a;                        // require assignment operator
-      __const_constraints(__a);
-    }
-    void __const_constraints(const _Tp& __b) {
-      __a = __b;                   // const required for argument to assignment
-    }
-    _Tp __a;
-    // possibly should be "Tp* a;" and then dereference "a" in constraint
-    // functions?  present way would require a default ctor, i think...
-  };
-
-  template <class _Tp>
-  struct _CopyConstructibleConcept
-  {
-    void __constraints() {
-      _Tp __a(__b);                     // require copy constructor
-      _Tp* __ptr _IsUnused = &__a;      // require address of operator
-      __const_constraints(__a);
-    }
-    void __const_constraints(const _Tp& __a) {
-      _Tp __c _IsUnused(__a);           // require const copy constructor
-      const _Tp* __ptr _IsUnused = &__a; // require const address of operator
-    }
-    _Tp __b;
-  };
-
-  // The SGI STL version of Assignable requires copy constructor and operator=
-  template <class _Tp>
-  struct _SGIAssignableConcept
-  {
-    void __constraints() {
-      _Tp __b _IsUnused(__a);
-      __a = __a;                        // require assignment operator
-      __const_constraints(__a);
-    }
-    void __const_constraints(const _Tp& __b) {
-      _Tp __c _IsUnused(__b);
-      __a = __b;              // const required for argument to assignment
-    }
-    _Tp __a;
-  };
-
-  template <class _From, class _To>
-  struct _ConvertibleConcept
-  {
-    void __constraints() {
-      _To __y _IsUnused = __x;
-    }
-    _From __x;
-  };
-
-  // The C++ standard requirements for many concepts talk about return
-  // types that must be "convertible to bool".  The problem with this
-  // requirement is that it leaves the door open for evil proxies that
-  // define things like operator|| with strange return types.  Two
-  // possible solutions are:
-  // 1) require the return type to be exactly bool
-  // 2) stay with convertible to bool, and also
-  //    specify stuff about all the logical operators.
-  // For now we just test for convertible to bool.
-  template <class _Tp>
-  void __aux_require_boolean_expr(const _Tp& __t) {
-    bool __x _IsUnused = __t;
-  }
-
-// FIXME
-  template <class _Tp>
-  struct _EqualityComparableConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__a == __b);
-    }
-    _Tp __a, __b;
-  };
-
-  template <class _Tp>
-  struct _LessThanComparableConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__a < __b);
-    }
-    _Tp __a, __b;
-  };
-
-  // This is equivalent to SGI STL's LessThanComparable.
-  template <class _Tp>
-  struct _ComparableConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__a < __b);
-      __aux_require_boolean_expr(__a > __b);
-      __aux_require_boolean_expr(__a <= __b);
-      __aux_require_boolean_expr(__a >= __b);
-    }
-    _Tp __a, __b;
-  };
-
-#define _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(_OP,_NAME) \
-  template <class _First, class _Second> \
-  struct _NAME { \
-    void __constraints() { (void)__constraints_(); } \
-    bool __constraints_() {  \
-      return  __a _OP __b; \
-    } \
-    _First __a; \
-    _Second __b; \
-  }
-
-#define _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(_OP,_NAME) \
-  template <class _Ret, class _First, class _Second> \
-  struct _NAME { \
-    void __constraints() { (void)__constraints_(); } \
-    _Ret __constraints_() {  \
-      return __a _OP __b; \
-    } \
-    _First __a; \
-    _Second __b; \
-  }
-
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(==, _EqualOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(!=, _NotEqualOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<, _LessThanOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(<=, _LessEqualOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>, _GreaterThanOpConcept);
-  _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT(>=, _GreaterEqualOpConcept);
-
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(+, _PlusOpConcept);
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(*, _TimesOpConcept);
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(/, _DivideOpConcept);
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(-, _SubtractOpConcept);
-  _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT(%, _ModOpConcept);
-
-#undef _GLIBCXX_DEFINE_BINARY_PREDICATE_OP_CONSTRAINT
-#undef _GLIBCXX_DEFINE_BINARY_OPERATOR_CONSTRAINT
-
-  //===========================================================================
-  // Function Object Concepts
-
-  template <class _Func, class _Return>
-  struct _GeneratorConcept
-  {
-    void __constraints() {
-      const _Return& __r _IsUnused = __f();// require operator() member function
-    }
-    _Func __f;
-  };
-
-
-  template <class _Func>
-  struct _GeneratorConcept<_Func,void>
-  {
-    void __constraints() {
-      __f();                            // require operator() member function
-    }
-    _Func __f;
-  };
-
-  template <class _Func, class _Return, class _Arg>
-  struct _UnaryFunctionConcept
-  {
-    void __constraints() {
-      __r = __f(__arg);                  // require operator()
-    }
-    _Func __f;
-    _Arg __arg;
-    _Return __r;
-  };
-
-  template <class _Func, class _Arg>
-  struct _UnaryFunctionConcept<_Func, void, _Arg> {
-    void __constraints() {
-      __f(__arg);                       // require operator()
-    }
-    _Func __f;
-    _Arg __arg;
-  };
-
-  template <class _Func, class _Return, class _First, class _Second>
-  struct _BinaryFunctionConcept
-  {
-    void __constraints() {
-      __r = __f(__first, __second);     // require operator()
-    }
-    _Func __f;
-    _First __first;
-    _Second __second;
-    _Return __r;
-  };
-
-  template <class _Func, class _First, class _Second>
-  struct _BinaryFunctionConcept<_Func, void, _First, _Second>
-  {
-    void __constraints() {
-      __f(__first, __second);           // require operator()
-    }
-    _Func __f;
-    _First __first;
-    _Second __second;
-  };
-
-  template <class _Func, class _Arg>
-  struct _UnaryPredicateConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__f(__arg)); // require op() returning bool
-    }
-    _Func __f;
-    _Arg __arg;
-  };
-
-  template <class _Func, class _First, class _Second>
-  struct _BinaryPredicateConcept
-  {
-    void __constraints() {
-      __aux_require_boolean_expr(__f(__a, __b)); // require op() returning bool
-    }
-    _Func __f;
-    _First __a;
-    _Second __b;
-  };
-
-  // use this when functor is used inside a container class like std::set
-  template <class _Func, class _First, class _Second>
-  struct _Const_BinaryPredicateConcept {
-    void __constraints() {
-      __const_constraints(__f);
-    }
-    void __const_constraints(const _Func& __fun) {
-      __function_requires<_BinaryPredicateConcept<_Func, _First, _Second> >();
-      // operator() must be a const member function
-      __aux_require_boolean_expr(__fun(__a, __b));
-    }
-    _Func __f;
-    _First __a;
-    _Second __b;
-  };
-
-  //===========================================================================
-  // Iterator Concepts
-
-  template <class _Tp>
-  struct _TrivialIteratorConcept
-  {
-    void __constraints() {
-//    __function_requires< _DefaultConstructibleConcept<_Tp> >();
-      __function_requires< _AssignableConcept<_Tp> >();
-      __function_requires< _EqualityComparableConcept<_Tp> >();
-//      typedef typename std::iterator_traits<_Tp>::value_type _V;
-      (void)*__i;                       // require dereference operator
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp>
-  struct _Mutable_TrivialIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _TrivialIteratorConcept<_Tp> >();
-      *__i = *__j;                      // require dereference and assignment
-    }
-    _Tp __i, __j;
-  };
-
-  template <class _Tp>
-  struct _InputIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _TrivialIteratorConcept<_Tp> >();
-      // require iterator_traits typedef's
-      typedef typename std::iterator_traits<_Tp>::difference_type _Diff;
-//      __function_requires< _SignedIntegerConcept<_Diff> >();
-      typedef typename std::iterator_traits<_Tp>::reference _Ref;
-      typedef typename std::iterator_traits<_Tp>::pointer _Pt;
-      typedef typename std::iterator_traits<_Tp>::iterator_category _Cat;
-      __function_requires< _ConvertibleConcept<
-        typename std::iterator_traits<_Tp>::iterator_category,
-        std::input_iterator_tag> >();
-      ++__i;                            // require preincrement operator
-      __i++;                            // require postincrement operator
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp, class _ValueT>
-  struct _OutputIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _AssignableConcept<_Tp> >();
-      ++__i;                            // require preincrement operator
-      __i++;                            // require postincrement operator
-      *__i++ = __t;                     // require postincrement and assignment
-    }
-    _Tp __i;
-    _ValueT __t;
-  };
-
-  template <class _Tp>
-  struct _ForwardIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _InputIteratorConcept<_Tp> >();
-      __function_requires< _DefaultConstructibleConcept<_Tp> >();
-      __function_requires< _ConvertibleConcept<
-        typename std::iterator_traits<_Tp>::iterator_category,
-        std::forward_iterator_tag> >();
-      typedef typename std::iterator_traits<_Tp>::reference _Ref;
-      _Ref __r _IsUnused = *__i;
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp>
-  struct _Mutable_ForwardIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _ForwardIteratorConcept<_Tp> >();
-      *__i++ = *__i;                    // require postincrement and assignment
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp>
-  struct _BidirectionalIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _ForwardIteratorConcept<_Tp> >();
-      __function_requires< _ConvertibleConcept<
-        typename std::iterator_traits<_Tp>::iterator_category,
-        std::bidirectional_iterator_tag> >();
-      --__i;                            // require predecrement operator
-      __i--;                            // require postdecrement operator
-    }
-    _Tp __i;
-  };
-
-  template <class _Tp>
-  struct _Mutable_BidirectionalIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _BidirectionalIteratorConcept<_Tp> >();
-      __function_requires< _Mutable_ForwardIteratorConcept<_Tp> >();
-      *__i-- = *__i;                    // require postdecrement and assignment
-    }
-    _Tp __i;
-  };
-
-
-  template <class _Tp>
-  struct _RandomAccessIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _BidirectionalIteratorConcept<_Tp> >();
-      __function_requires< _ComparableConcept<_Tp> >();
-      __function_requires< _ConvertibleConcept<
-        typename std::iterator_traits<_Tp>::iterator_category,
-        std::random_access_iterator_tag> >();
-      // ??? We don't use _Ref, are we just checking for "referenceability"?
-      typedef typename std::iterator_traits<_Tp>::reference _Ref;
-
-      __i += __n;                       // require assignment addition operator
-      __i = __i + __n; __i = __n + __i; // require addition with difference type
-      __i -= __n;                       // require assignment subtraction op
-      __i = __i - __n;                  // require subtraction with
-                                        //            difference type
-      __n = __i - __j;                  // require difference operator
-      (void)__i[__n];                   // require element access operator
-    }
-    _Tp __a, __b;
-    _Tp __i, __j;
-    typename std::iterator_traits<_Tp>::difference_type __n;
-  };
-
-  template <class _Tp>
-  struct _Mutable_RandomAccessIteratorConcept
-  {
-    void __constraints() {
-      __function_requires< _RandomAccessIteratorConcept<_Tp> >();
-      __function_requires< _Mutable_BidirectionalIteratorConcept<_Tp> >();
-      __i[__n] = *__i;                  // require element access and assignment
-    }
-    _Tp __i;
-    typename std::iterator_traits<_Tp>::difference_type __n;
-  };
-
-  //===========================================================================
-  // Container Concepts
-
-  template <class _Container>
-  struct _ContainerConcept
-  {
-    typedef typename _Container::value_type _Value_type;
-    typedef typename _Container::difference_type _Difference_type;
-    typedef typename _Container::size_type _Size_type;
-    typedef typename _Container::const_reference _Const_reference;
-    typedef typename _Container::const_pointer _Const_pointer;
-    typedef typename _Container::const_iterator _Const_iterator;
-
-    void __constraints() {
-      __function_requires< _InputIteratorConcept<_Const_iterator> >();
-      __function_requires< _AssignableConcept<_Container> >();
-      const _Container __c;
-      __i = __c.begin();
-      __i = __c.end();
-      __n = __c.size();
-      __n = __c.max_size();
-      __b = __c.empty();
-    }
-    bool __b;
-    _Const_iterator __i;
-    _Size_type __n;
-  };
-
-  template <class _Container>
-  struct _Mutable_ContainerConcept
-  {
-    typedef typename _Container::value_type _Value_type;
-    typedef typename _Container::reference _Reference;
-    typedef typename _Container::iterator _Iterator;
-    typedef typename _Container::pointer _Pointer;
-
-    void __constraints() {
-      __function_requires< _ContainerConcept<_Container> >();
-      __function_requires< _AssignableConcept<_Value_type> >();
-      __function_requires< _InputIteratorConcept<_Iterator> >();
-
-      __i = __c.begin();
-      __i = __c.end();
-      __c.swap(__c2);
-    }
-    _Iterator __i;
-    _Container __c, __c2;
-  };
-
-  template <class _ForwardContainer>
-  struct _ForwardContainerConcept
-  {
-    void __constraints() {
-      __function_requires< _ContainerConcept<_ForwardContainer> >();
-      typedef typename _ForwardContainer::const_iterator _Const_iterator;
-      __function_requires< _ForwardIteratorConcept<_Const_iterator> >();
-    }
-  };
-
-  template <class _ForwardContainer>
-  struct _Mutable_ForwardContainerConcept
-  {
-    void __constraints() {
-      __function_requires< _ForwardContainerConcept<_ForwardContainer> >();
-      __function_requires< _Mutable_ContainerConcept<_ForwardContainer> >();
-      typedef typename _ForwardContainer::iterator _Iterator;
-      __function_requires< _Mutable_ForwardIteratorConcept<_Iterator> >();
-    }
-  };
-
-  template <class _ReversibleContainer>
-  struct _ReversibleContainerConcept
-  {
-    typedef typename _ReversibleContainer::const_iterator _Const_iterator;
-    typedef typename _ReversibleContainer::const_reverse_iterator
-      _Const_reverse_iterator;
-
-    void __constraints() {
-      __function_requires< _ForwardContainerConcept<_ReversibleContainer> >();
-      __function_requires< _BidirectionalIteratorConcept<_Const_iterator> >();
-      __function_requires<
-        _BidirectionalIteratorConcept<_Const_reverse_iterator> >();
-
-      const _ReversibleContainer __c;
-      _Const_reverse_iterator __i = __c.rbegin();
-      __i = __c.rend();
-    }
-  };
-
-  template <class _ReversibleContainer>
-  struct _Mutable_ReversibleContainerConcept
-  {
-    typedef typename _ReversibleContainer::iterator _Iterator;
-    typedef typename _ReversibleContainer::reverse_iterator _Reverse_iterator;
-
-    void __constraints() {
-      __function_requires<_ReversibleContainerConcept<_ReversibleContainer> >();
-      __function_requires<
-        _Mutable_ForwardContainerConcept<_ReversibleContainer> >();
-      __function_requires<_Mutable_BidirectionalIteratorConcept<_Iterator> >();
-      __function_requires<
-        _Mutable_BidirectionalIteratorConcept<_Reverse_iterator> >();
-
-      _Reverse_iterator __i = __c.rbegin();
-      __i = __c.rend();
-    }
-    _ReversibleContainer __c;
-  };
-
-  template <class _RandomAccessContainer>
-  struct _RandomAccessContainerConcept
-  {
-    typedef typename _RandomAccessContainer::size_type _Size_type;
-    typedef typename _RandomAccessContainer::const_reference _Const_reference;
-    typedef typename _RandomAccessContainer::const_iterator _Const_iterator;
-    typedef typename _RandomAccessContainer::const_reverse_iterator
-      _Const_reverse_iterator;
-
-    void __constraints() {
-      __function_requires<
-        _ReversibleContainerConcept<_RandomAccessContainer> >();
-      __function_requires< _RandomAccessIteratorConcept<_Const_iterator> >();
-      __function_requires<
-        _RandomAccessIteratorConcept<_Const_reverse_iterator> >();
-
-      const _RandomAccessContainer __c;
-      _Const_reference __r _IsUnused = __c[__n];
-    }
-    _Size_type __n;
-  };
-
-  template <class _RandomAccessContainer>
-  struct _Mutable_RandomAccessContainerConcept
-  {
-    typedef typename _RandomAccessContainer::size_type _Size_type;
-    typedef typename _RandomAccessContainer::reference _Reference;
-    typedef typename _RandomAccessContainer::iterator _Iterator;
-    typedef typename _RandomAccessContainer::reverse_iterator _Reverse_iterator;
-
-    void __constraints() {
-      __function_requires<
-        _RandomAccessContainerConcept<_RandomAccessContainer> >();
-      __function_requires<
-        _Mutable_ReversibleContainerConcept<_RandomAccessContainer> >();
-      __function_requires< _Mutable_RandomAccessIteratorConcept<_Iterator> >();
-      __function_requires<
-        _Mutable_RandomAccessIteratorConcept<_Reverse_iterator> >();
-
-      _Reference __r _IsUnused = __c[__i];
-    }
-    _Size_type __i;
-    _RandomAccessContainer __c;
-  };
-
-  // A Sequence is inherently mutable
-  template <class _Sequence>
-  struct _SequenceConcept
-  {
-    typedef typename _Sequence::reference _Reference;
-    typedef typename _Sequence::const_reference _Const_reference;
-
-    void __constraints() {
-      // Matt Austern's book puts DefaultConstructible here, the C++
-      // standard places it in Container
-      //    function_requires< DefaultConstructible<Sequence> >();
-      __function_requires< _Mutable_ForwardContainerConcept<_Sequence> >();
-      __function_requires< _DefaultConstructibleConcept<_Sequence> >();
-
-      _Sequence
-	__c _IsUnused(__n, __t),
-        __c2 _IsUnused(__first, __last);
-
-      __c.insert(__p, __t);
-      __c.insert(__p, __n, __t);
-      __c.insert(__p, __first, __last);
-
-      __c.erase(__p);
-      __c.erase(__p, __q);
-
-      _Reference __r _IsUnused = __c.front();
-
-      __const_constraints(__c);
-    }
-    void __const_constraints(const _Sequence& __c) {
-      _Const_reference __r _IsUnused = __c.front();
-    }
-    typename _Sequence::value_type __t;
-    typename _Sequence::size_type __n;
-    typename _Sequence::value_type *__first, *__last;
-    typename _Sequence::iterator __p, __q;
-  };
-
-  template <class _FrontInsertionSequence>
-  struct _FrontInsertionSequenceConcept
-  {
-    void __constraints() {
-      __function_requires< _SequenceConcept<_FrontInsertionSequence> >();
-
-      __c.push_front(__t);
-      __c.pop_front();
-    }
-    _FrontInsertionSequence __c;
-    typename _FrontInsertionSequence::value_type __t;
-  };
-
-  template <class _BackInsertionSequence>
-  struct _BackInsertionSequenceConcept
-  {
-    typedef typename _BackInsertionSequence::reference _Reference;
-    typedef typename _BackInsertionSequence::const_reference _Const_reference;
-
-    void __constraints() {
-      __function_requires< _SequenceConcept<_BackInsertionSequence> >();
-
-      __c.push_back(__t);
-      __c.pop_back();
-      _Reference __r _IsUnused = __c.back();
-    }
-    void __const_constraints(const _BackInsertionSequence& __c) {
-      _Const_reference __r _IsUnused = __c.back();
-    };
-    _BackInsertionSequence __c;
-    typename _BackInsertionSequence::value_type __t;
-  };
-
-  template <class _AssociativeContainer>
-  struct _AssociativeContainerConcept
-  {
-    void __constraints() {
-      __function_requires< _ForwardContainerConcept<_AssociativeContainer> >();
-      __function_requires<
-        _DefaultConstructibleConcept<_AssociativeContainer> >();
-
-      __i = __c.find(__k);
-      __r = __c.equal_range(__k);
-      __c.erase(__k);
-      __c.erase(__i);
-      __c.erase(__r.first, __r.second);
-      __const_constraints(__c);
-    }
-    void __const_constraints(const _AssociativeContainer& __c) {
-      __ci = __c.find(__k);
-      __n = __c.count(__k);
-      __cr = __c.equal_range(__k);
-    }
-    typedef typename _AssociativeContainer::iterator _Iterator;
-    typedef typename _AssociativeContainer::const_iterator _Const_iterator;
-
-    _AssociativeContainer __c;
-    _Iterator __i;
-    std::pair<_Iterator,_Iterator> __r;
-    _Const_iterator __ci;
-    std::pair<_Const_iterator,_Const_iterator> __cr;
-    typename _AssociativeContainer::key_type __k;
-    typename _AssociativeContainer::size_type __n;
-  };
-
-  template <class _UniqueAssociativeContainer>
-  struct _UniqueAssociativeContainerConcept
-  {
-    void __constraints() {
-      __function_requires<
-        _AssociativeContainerConcept<_UniqueAssociativeContainer> >();
-
-      _UniqueAssociativeContainer __c(__first, __last);
-
-      __pos_flag = __c.insert(__t);
-      __c.insert(__first, __last);
-    }
-    std::pair<typename _UniqueAssociativeContainer::iterator, bool> __pos_flag;
-    typename _UniqueAssociativeContainer::value_type __t;
-    typename _UniqueAssociativeContainer::value_type *__first, *__last;
-  };
-
-  template <class _MultipleAssociativeContainer>
-  struct _MultipleAssociativeContainerConcept
-  {
-    void __constraints() {
-      __function_requires<
-        _AssociativeContainerConcept<_MultipleAssociativeContainer> >();
-
-      _MultipleAssociativeContainer __c(__first, __last);
-
-      __pos = __c.insert(__t);
-      __c.insert(__first, __last);
-
-    }
-    typename _MultipleAssociativeContainer::iterator __pos;
-    typename _MultipleAssociativeContainer::value_type __t;
-    typename _MultipleAssociativeContainer::value_type *__first, *__last;
-  };
-
-  template <class _SimpleAssociativeContainer>
-  struct _SimpleAssociativeContainerConcept
-  {
-    void __constraints() {
-      __function_requires<
-        _AssociativeContainerConcept<_SimpleAssociativeContainer> >();
-      typedef typename _SimpleAssociativeContainer::key_type _Key_type;
-      typedef typename _SimpleAssociativeContainer::value_type _Value_type;
-      typedef typename _Aux_require_same<_Key_type, _Value_type>::_Type
-        _Required;
-    }
-  };
-
-  template <class _SimpleAssociativeContainer>
-  struct _PairAssociativeContainerConcept
-  {
-    void __constraints() {
-      __function_requires<
-        _AssociativeContainerConcept<_SimpleAssociativeContainer> >();
-      typedef typename _SimpleAssociativeContainer::key_type _Key_type;
-      typedef typename _SimpleAssociativeContainer::value_type _Value_type;
-      typedef typename _SimpleAssociativeContainer::mapped_type _Mapped_type;
-      typedef std::pair<const _Key_type, _Mapped_type> _Required_value_type;
-      typedef typename _Aux_require_same<_Value_type,
-        _Required_value_type>::_Type _Required;
-    }
-  };
-
-  template <class _SortedAssociativeContainer>
-  struct _SortedAssociativeContainerConcept
-  {
-    void __constraints() {
-      __function_requires<
-        _AssociativeContainerConcept<_SortedAssociativeContainer> >();
-      __function_requires<
-        _ReversibleContainerConcept<_SortedAssociativeContainer> >();
-
-      _SortedAssociativeContainer
-        __c _IsUnused(__kc),
-        __c2 _IsUnused(__first, __last),
-        __c3 _IsUnused(__first, __last, __kc);
-
-      __p = __c.upper_bound(__k);
-      __p = __c.lower_bound(__k);
-      __r = __c.equal_range(__k);
-
-      __c.insert(__p, __t);
-    }
-    void __const_constraints(const _SortedAssociativeContainer& __c) {
-      __kc = __c.key_comp();
-      __vc = __c.value_comp();
-
-      __cp = __c.upper_bound(__k);
-      __cp = __c.lower_bound(__k);
-      __cr = __c.equal_range(__k);
-    }
-    typename _SortedAssociativeContainer::key_compare __kc;
-    typename _SortedAssociativeContainer::value_compare __vc;
-    typename _SortedAssociativeContainer::value_type __t;
-    typename _SortedAssociativeContainer::key_type __k;
-    typedef typename _SortedAssociativeContainer::iterator _Iterator;
-    typedef typename _SortedAssociativeContainer::const_iterator
-      _Const_iterator;
-
-    _Iterator __p;
-    _Const_iterator __cp;
-    std::pair<_Iterator,_Iterator> __r;
-    std::pair<_Const_iterator,_Const_iterator> __cr;
-    typename _SortedAssociativeContainer::value_type *__first, *__last;
-  };
-
-  // HashedAssociativeContainer
-
-} // namespace __gnu_cxx
-
-#undef _IsUnused
-
-#endif // _GLIBCXX_BOOST_CONCEPT_CHECK
-
-
diff --git a/include.new/c++/3.4/bits/c++allocator.h b/include.new/c++/3.4/bits/c++allocator.h
deleted file mode 100644
index 442f89c..0000000
--- a/include.new/c++/3.4/bits/c++allocator.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Base to std::allocator -*- C++ -*-
-
-// Copyright (C) 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _CXX_ALLOCATOR_H
-#define _CXX_ALLOCATOR_H 1
-
-// Define new_allocator as the base class to std::allocator.
-#include <ext/new_allocator.h>
-#define ___glibcxx_base_allocator  __gnu_cxx::new_allocator
-
-#endif
diff --git a/include.new/c++/3.4/bits/c++config.h b/include.new/c++/3.4/bits/c++config.h
deleted file mode 100644
index 3d7d115..0000000
--- a/include.new/c++/3.4/bits/c++config.h
+++ /dev/null
@@ -1,1293 +0,0 @@
-// Predefined symbols and macros -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _CXXCONFIG
-#define _CXXCONFIG 1
-
-// Pick up any OS-specific definitions.
-#include <bits/os_defines.h>
-
-// The current version of the C++ library in compressed ISO date format.
-#define __GLIBCXX__ 20060311
-
-// Allow use of "export template." This is currently not a feature
-// that g++ supports.
-// #define _GLIBCXX_EXPORT_TEMPLATE 1
-
-// Allow use of the GNU syntax extension, "extern template." This
-// extension is fully documented in the g++ manual, but in a nutshell,
-// it inhibits all implicit instantiations and is used throughout the
-// library to avoid multiple weak definitions for required types that
-// are already explicitly instantiated in the library binary. This
-// substantially reduces the binary size of resulting executables.
-#ifndef _GLIBCXX_EXTERN_TEMPLATE
-# define _GLIBCXX_EXTERN_TEMPLATE 1
-#endif
-
-// Debug mode support. Debug mode basic_string is not allowed to be
-// associated with std, because of locale and exception link
-// dependence.
-namespace __gnu_debug_def { }
-
-namespace __gnu_debug 
-{ 
-  using namespace __gnu_debug_def;
-}
-
-#ifdef _GLIBCXX_DEBUG
-# define _GLIBCXX_STD __gnu_norm
-namespace __gnu_norm 
-{ 
-  using namespace std; 
-}
-namespace std
-{
-  using namespace __gnu_debug_def __attribute__ ((strong));
-}
-#else
-# define _GLIBCXX_STD std
-#endif
-
-
-// The remainder of the prewritten config is automatic; all the
-// user hooks are listed above.
-
-// Create a boolean flag to be used to determine if --fast-math is set.
-#ifdef __FAST_MATH__
-# define _GLIBCXX_FAST_MATH 1
-#else
-# define _GLIBCXX_FAST_MATH 0
-#endif
-
-// This marks string literals in header files to be extracted for eventual
-// translation.  It is primarily used for messages in thrown exceptions; see
-// src/functexcept.cc.  We use __N because the more traditional _N is used
-// for something else under certain OSes (see BADNAMES).
-#define __N(msgid)     (msgid)
-
-// End of prewritten config; the discovered settings follow.
-/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.11 2005/03/26 08:27:53 das Exp $ */
-
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-// acconfig.h symbols and macros for libstdc++ v3 -*- C++ -*-
-
-// Defines libstdc++ version.
-/* #undef _GLIBCXX_PACKAGE */
-/* #undef _GLIBCXX_VERSION */
-
-// Needed for gettext.
-/* #undef ENABLE_NLS */
-/* #undef _GLIBCXX_HAVE_CATGETS */
-/* #undef _GLIBCXX_HAVE_GETTEXT */
-/* #undef _GLIBCXX_HAVE_STPCPY */
-
-// Include I/O support for 'long long' and 'unsigned long long'.
-#define _GLIBCXX_USE_LONG_LONG 1
-
-// Include support for 'long double'.
-/* #undef _GLIBCXX_USE_LONG_DOUBLE */
-
-// Define if C99 math functions (like fpclassify) should be exposed.
-#define _GLIBCXX_USE_C99_MATH 1
-
-// Define if C99 features such as lldiv_t, llabs, lldiv should be exposed.
-#define _GLIBCXX_USE_C99 1
-
-// Define if code specialized for wchar_t should be used.
-#define _GLIBCXX_USE_WCHAR_T 1
-
-// Define if using setrlimit to limit memory usage during 'make check'.
-#define _GLIBCXX_MEM_LIMITS 1
-
-// Define to use concept checking code from the boost libraries.
-/* #undef _GLIBCXX_CONCEPT_CHECKS */
-
-// Define to use symbol versioning in the shared library.
-/* #undef _GLIBCXX_SYMVER */
-
-// Define symbol versioning in assember directives. If symbol
-// versioning is beigng used, and the assembler supports this kind of
-// thing, then use it.
-// NB: _GLIBCXX_AT_AT is a hack to work around quoting issues in m4.
-#if _GLIBCXX_SYMVER
-  #define _GLIBCXX_ASM_SYMVER(cur, old, version) \
-   asm (".symver " #cur "," #old _GLIBCXX_AT_AT #version);
-#else
-  #define _GLIBCXX_ASM_SYMVER(cur, old, version)
-#endif
-
-// Define if LFS support is available.
-/* #undef _GLIBCXX_USE_LFS */
-
-// Define if NLS translations are to be used.
-/* #undef _GLIBCXX_USE_NLS */
-
-// Define if gthr-default.h exists (meaning that threading support is enabled).
-#define _GLIBCXX_HAVE_GTHR_DEFAULT 1
-
-// Define if the atan2f function exists.
-#define _GLIBCXX_HAVE_ATAN2F 1
-
-// Define if the atan2l function exists.
-/* #undef _GLIBCXX_HAVE_ATAN2L */
-
-// Define if the tanl function exists.
-/* #undef _GLIBCXX_HAVE_TANL */
-
-// Define if the copysignf function exists.
-#define _GLIBCXX_HAVE_COPYSIGNF 1
-
-// Define if getpagesize exists.
-#define _GLIBCXX_HAVE_GETPAGESIZE 1
-
-// Define if setenv exists.
-#define _GLIBCXX_HAVE_SETENV 1
-
-// Define if sigsetjmp exists.
-#define _GLIBCXX_HAVE_SIGSETJMP 1
-
-// Define if mbstate_t exists in wchar.h.
-#define _GLIBCXX_HAVE_MBSTATE_T 1
-
-// Define if you have the modff function.
-#define _GLIBCXX_HAVE_MODFF 1
-
-// Define if you have the modfl function.
-/* #undef _GLIBCXX_HAVE_MODFL */
-
-// Define if you have the expf function.
-#define _GLIBCXX_HAVE_EXPF 1
-
-// Define if you have the expl function.
-/* #undef _GLIBCXX_HAVE_EXPL */
-
-// Define if you have the hypot function.
-#define _GLIBCXX_HAVE_HYPOT 1
-
-// Define if you have the hypotf function.
-#define _GLIBCXX_HAVE_HYPOTF 1
-
-// Define if you have the hypotl function.
-/* #undef _GLIBCXX_HAVE_HYPOTL */
-
-// Define if the compiler/host combination has __builtin_abs
-#define _GLIBCXX_HAVE___BUILTIN_ABS 1
-
-// Define if the compiler/host combination has __builtin_labs
-#define _GLIBCXX_HAVE___BUILTIN_LABS 1
-
-// Define if the compiler/host combination has __builtin_cos
-#define _GLIBCXX_HAVE___BUILTIN_COS 1
-
-// Define if the compiler/host combination has __builtin_cosf
-#define _GLIBCXX_HAVE___BUILTIN_COSF 1
-
-// Define if the compiler/host combination has __builtin_cosl
-#define _GLIBCXX_HAVE___BUILTIN_COSL 1
-
-// Define if the compiler/host combination has __builtin_fabs
-#define _GLIBCXX_HAVE___BUILTIN_FABS 1
-
-// Define if the compiler/host combination has __builtin_fabsf
-#define _GLIBCXX_HAVE___BUILTIN_FABSF 1
-
-// Define if the compiler/host combination has __builtin_fabsl
-#define _GLIBCXX_HAVE___BUILTIN_FABSL 1
-
-// Define if the compiler/host combination has __builtin_sin
-#define _GLIBCXX_HAVE___BUILTIN_SIN 1
-
-// Define if the compiler/host combination has __builtin_sinf
-#define _GLIBCXX_HAVE___BUILTIN_SINF 1
-
-// Define if the compiler/host combination has __builtin_sinl
-#define _GLIBCXX_HAVE___BUILTIN_SINL 1
-
-// Define if the compiler/host combination has __builtin_sqrt
-#define _GLIBCXX_HAVE___BUILTIN_SQRT 1
-
-// Define if the compiler/host combination has __builtin_sqrtf
-#define _GLIBCXX_HAVE___BUILTIN_SQRTF 1
-
-// Define if the compiler/host combination has __builtin_sqrtl
-#define _GLIBCXX_HAVE___BUILTIN_SQRTL 1
-
-// Define if poll is available in <poll.h>.
-#define _GLIBCXX_HAVE_POLL 1
-
-// Define if S_ISREG (Posix) is available in <sys/stat.h>.
-#define _GLIBCXX_HAVE_S_ISREG 1
-
-// Define if S_IFREG is available in <sys/stat.h>.
-/* #undef _GLIBCXX_HAVE_S_IFREG */
-
-// Define if writev is available in <sys/uio.h>.
-#define _GLIBCXX_HAVE_WRITEV 1
-
-// Define if int64_t is available in <stdint.h>.
-#define _GLIBCXX_HAVE_INT64_T 1
-
-// Define if LC_MESSAGES is available in <locale.h>.
-#define _GLIBCXX_HAVE_LC_MESSAGES 1
-
-// Define if <float.h> exists.
-#define _GLIBCXX_HAVE_FLOAT_H 1
-
-// Define if modf is present in <math.h>
-/* #undef _GLIBCXX_HAVE_MODF */
-
-
-/* Define to 1 if you have the `acosf' function. */
-#define _GLIBCXX_HAVE_ACOSF 1
-
-/* Define to 1 if you have the `acosl' function. */
-/* #undef _GLIBCXX_HAVE_ACOSL */
-
-/* Define to 1 if you have the `asinf' function. */
-#define _GLIBCXX_HAVE_ASINF 1
-
-/* Define to 1 if you have the `asinl' function. */
-/* #undef _GLIBCXX_HAVE_ASINL */
-
-/* Define to 1 if you have the `atan2f' function. */
-#define _GLIBCXX_HAVE_ATAN2F 1
-
-/* Define to 1 if you have the `atan2l' function. */
-/* #undef _GLIBCXX_HAVE_ATAN2L */
-
-/* Define to 1 if you have the `atanf' function. */
-#define _GLIBCXX_HAVE_ATANF 1
-
-/* Define to 1 if you have the `atanl' function. */
-/* #undef _GLIBCXX_HAVE_ATANL */
-
-/* Define to 1 if you have the `btowc' function. */
-#define _GLIBCXX_HAVE_BTOWC 1
-
-/* Define to 1 if you have the `ceilf' function. */
-#define _GLIBCXX_HAVE_CEILF 1
-
-/* Define to 1 if you have the `ceill' function. */
-#define _GLIBCXX_HAVE_CEILL 1
-
-/* Define to 1 if you have the `copysign' function. */
-#define _GLIBCXX_HAVE_COPYSIGN 1
-
-/* Define to 1 if you have the `copysignf' function. */
-#define _GLIBCXX_HAVE_COPYSIGNF 1
-
-/* Define to 1 if you have the `copysignl' function. */
-#define _GLIBCXX_HAVE_COPYSIGNL 1
-
-/* Define to 1 if you have the `cosf' function. */
-#define _GLIBCXX_HAVE_COSF 1
-
-/* Define to 1 if you have the `coshf' function. */
-#define _GLIBCXX_HAVE_COSHF 1
-
-/* Define to 1 if you have the `coshl' function. */
-/* #undef _GLIBCXX_HAVE_COSHL */
-
-/* Define to 1 if you have the `cosl' function. */
-/* #undef _GLIBCXX_HAVE_COSL */
-
-/* Define to 1 if you have the <endian.h> header file. */
-/* #undef _GLIBCXX_HAVE_ENDIAN_H */
-
-/* Define to 1 if you have the `expf' function. */
-#define _GLIBCXX_HAVE_EXPF 1
-
-/* Define to 1 if you have the `expl' function. */
-/* #undef _GLIBCXX_HAVE_EXPL */
-
-/* Define to 1 if you have the `fabsf' function. */
-#define _GLIBCXX_HAVE_FABSF 1
-
-/* Define to 1 if you have the `fabsl' function. */
-#define _GLIBCXX_HAVE_FABSL 1
-
-/* Define to 1 if you have the `fgetwc' function. */
-#define _GLIBCXX_HAVE_FGETWC 1
-
-/* Define to 1 if you have the `fgetws' function. */
-#define _GLIBCXX_HAVE_FGETWS 1
-
-/* Define to 1 if you have the `finite' function. */
-#define _GLIBCXX_HAVE_FINITE 1
-
-/* Define to 1 if you have the `finitef' function. */
-#define _GLIBCXX_HAVE_FINITEF 1
-
-/* Define to 1 if you have the `finitel' function. */
-/* #undef _GLIBCXX_HAVE_FINITEL */
-
-/* Define to 1 if you have the <float.h> header file. */
-#define _GLIBCXX_HAVE_FLOAT_H 1
-
-/* Define to 1 if you have the `floorf' function. */
-#define _GLIBCXX_HAVE_FLOORF 1
-
-/* Define to 1 if you have the `floorl' function. */
-#define _GLIBCXX_HAVE_FLOORL 1
-
-/* Define to 1 if you have the `fmodf' function. */
-#define _GLIBCXX_HAVE_FMODF 1
-
-/* Define to 1 if you have the `fmodl' function. */
-/* #undef _GLIBCXX_HAVE_FMODL */
-
-/* Define to 1 if you have the `fpclass' function. */
-/* #undef _GLIBCXX_HAVE_FPCLASS */
-
-/* Define to 1 if you have the `fputwc' function. */
-#define _GLIBCXX_HAVE_FPUTWC 1
-
-/* Define to 1 if you have the `fputws' function. */
-#define _GLIBCXX_HAVE_FPUTWS 1
-
-/* Define to 1 if you have the <fp.h> header file. */
-/* #undef _GLIBCXX_HAVE_FP_H */
-
-/* Define to 1 if you have the `frexpf' function. */
-#define _GLIBCXX_HAVE_FREXPF 1
-
-/* Define to 1 if you have the `frexpl' function. */
-#define _GLIBCXX_HAVE_FREXPL 1
-
-/* Define to 1 if you have the `fwide' function. */
-#define _GLIBCXX_HAVE_FWIDE 1
-
-/* Define to 1 if you have the `fwprintf' function. */
-#define _GLIBCXX_HAVE_FWPRINTF 1
-
-/* Define to 1 if you have the `fwscanf' function. */
-#define _GLIBCXX_HAVE_FWSCANF 1
-
-/* Define to 1 if you have the <gconv.h> header file. */
-/* #undef _GLIBCXX_HAVE_GCONV_H */
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define _GLIBCXX_HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the `getwc' function. */
-#define _GLIBCXX_HAVE_GETWC 1
-
-/* Define to 1 if you have the `getwchar' function. */
-#define _GLIBCXX_HAVE_GETWCHAR 1
-
-/* Define to 1 if you have the `hypot' function. */
-#define _GLIBCXX_HAVE_HYPOT 1
-
-/* Define to 1 if you have the `hypotf' function. */
-#define _GLIBCXX_HAVE_HYPOTF 1
-
-/* Define to 1 if you have the `hypotl' function. */
-/* #undef _GLIBCXX_HAVE_HYPOTL */
-
-/* Define to 1 if you have the `iconv' function. */
-#define _GLIBCXX_HAVE_ICONV 1
-
-/* Define to 1 if you have the `iconv_close' function. */
-#define _GLIBCXX_HAVE_ICONV_CLOSE 1
-
-/* Define to 1 if you have the `iconv_open' function. */
-#define _GLIBCXX_HAVE_ICONV_OPEN 1
-
-/* Define to 1 if you have the <ieeefp.h> header file. */
-#define _GLIBCXX_HAVE_IEEEFP_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define _GLIBCXX_HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `isinf' function. */
-#define _GLIBCXX_HAVE_ISINF 1
-
-/* Define to 1 if you have the `isinff' function. */
-/* #undef _GLIBCXX_HAVE_ISINFF */
-
-/* Define to 1 if you have the `isinfl' function. */
-/* #undef _GLIBCXX_HAVE_ISINFL */
-
-/* Define to 1 if you have the `isnan' function. */
-#define _GLIBCXX_HAVE_ISNAN 1
-
-/* Define to 1 if you have the `isnanf' function. */
-#define _GLIBCXX_HAVE_ISNANF 1
-
-/* Define to 1 if you have the `isnanl' function. */
-/* #undef _GLIBCXX_HAVE_ISNANL */
-
-/* Define to 1 if you have the `iswblank' function. */
-#define _GLIBCXX_HAVE_ISWBLANK 1
-
-/* Define to 1 if you have the `ldexpf' function. */
-#define _GLIBCXX_HAVE_LDEXPF 1
-
-/* Define to 1 if you have the `ldexpl' function. */
-#define _GLIBCXX_HAVE_LDEXPL 1
-
-/* Define to 1 if you have the <libintl.h> header file. */
-/* #undef _GLIBCXX_HAVE_LIBINTL_H */
-
-/* Define to 1 if you have the `m' library (-lm). */
-#define _GLIBCXX_HAVE_LIBM 1
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define _GLIBCXX_HAVE_LOCALE_H 1
-
-/* Define to 1 if you have the `log10f' function. */
-#define _GLIBCXX_HAVE_LOG10F 1
-
-/* Define to 1 if you have the `log10l' function. */
-/* #undef _GLIBCXX_HAVE_LOG10L */
-
-/* Define to 1 if you have the `logf' function. */
-#define _GLIBCXX_HAVE_LOGF 1
-
-/* Define to 1 if you have the `logl' function. */
-/* #undef _GLIBCXX_HAVE_LOGL */
-
-/* Define to 1 if you have the <machine/endian.h> header file. */
-#define _GLIBCXX_HAVE_MACHINE_ENDIAN_H 1
-
-/* Define to 1 if you have the <machine/param.h> header file. */
-#define _GLIBCXX_HAVE_MACHINE_PARAM_H 1
-
-/* Define to 1 if you have the `mbrlen' function. */
-#define _GLIBCXX_HAVE_MBRLEN 1
-
-/* Define to 1 if you have the `mbrtowc' function. */
-#define _GLIBCXX_HAVE_MBRTOWC 1
-
-/* Define to 1 if you have the `mbsinit' function. */
-#define _GLIBCXX_HAVE_MBSINIT 1
-
-/* Define to 1 if you have the `mbsrtowcs' function. */
-#define _GLIBCXX_HAVE_MBSRTOWCS 1
-
-/* Only used in build directory testsuite_hooks.h. */
-#define _GLIBCXX_HAVE_MEMLIMIT_AS 0
-
-/* Only used in build directory testsuite_hooks.h. */
-#define _GLIBCXX_HAVE_MEMLIMIT_DATA 1
-
-/* Only used in build directory testsuite_hooks.h. */
-#define _GLIBCXX_HAVE_MEMLIMIT_RSS 1
-
-/* Only used in build directory testsuite_hooks.h. */
-#define _GLIBCXX_HAVE_MEMLIMIT_VMEM 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define _GLIBCXX_HAVE_MEMORY_H 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define _GLIBCXX_HAVE_MMAP 1
-
-/* Define to 1 if you have the `modff' function. */
-#define _GLIBCXX_HAVE_MODFF 1
-
-/* Define to 1 if you have the `modfl' function. */
-/* #undef _GLIBCXX_HAVE_MODFL */
-
-/* Define to 1 if you have the <nan.h> header file. */
-/* #undef _GLIBCXX_HAVE_NAN_H */
-
-/* Define to 1 if you have the `nl_langinfo' function. */
-#define _GLIBCXX_HAVE_NL_LANGINFO 1
-
-/* Define to 1 if you have the `powf' function. */
-#define _GLIBCXX_HAVE_POWF 1
-
-/* Define to 1 if you have the `powl' function. */
-/* #undef _GLIBCXX_HAVE_POWL */
-
-/* Define to 1 if you have the `putwc' function. */
-#define _GLIBCXX_HAVE_PUTWC 1
-
-/* Define to 1 if you have the `putwchar' function. */
-#define _GLIBCXX_HAVE_PUTWCHAR 1
-
-/* Define to 1 if you have the `qfpclass' function. */
-/* #undef _GLIBCXX_HAVE_QFPCLASS */
-
-/* Define to 1 if you have the `setenv' function. */
-#define _GLIBCXX_HAVE_SETENV 1
-
-/* Define if sigsetjmp is available. */
-#define _GLIBCXX_HAVE_SIGSETJMP 1
-
-/* Define to 1 if you have the `sincos' function. */
-/* #undef _GLIBCXX_HAVE_SINCOS */
-
-/* Define to 1 if you have the `sincosf' function. */
-/* #undef _GLIBCXX_HAVE_SINCOSF */
-
-/* Define to 1 if you have the `sincosl' function. */
-/* #undef _GLIBCXX_HAVE_SINCOSL */
-
-/* Define to 1 if you have the `sinf' function. */
-#define _GLIBCXX_HAVE_SINF 1
-
-/* Define to 1 if you have the `sinhf' function. */
-#define _GLIBCXX_HAVE_SINHF 1
-
-/* Define to 1 if you have the `sinhl' function. */
-/* #undef _GLIBCXX_HAVE_SINHL */
-
-/* Define to 1 if you have the `sinl' function. */
-/* #undef _GLIBCXX_HAVE_SINL */
-
-/* Define to 1 if you have the `sqrtf' function. */
-#define _GLIBCXX_HAVE_SQRTF 1
-
-/* Define to 1 if you have the `sqrtl' function. */
-/* #undef _GLIBCXX_HAVE_SQRTL */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define _GLIBCXX_HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define _GLIBCXX_HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define _GLIBCXX_HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define _GLIBCXX_HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtof' function. */
-#define _GLIBCXX_HAVE_STRTOF 1
-
-/* Define to 1 if you have the `strtold' function. */
-#define _GLIBCXX_HAVE_STRTOLD 1
-
-/* Define to 1 if you have the `swprintf' function. */
-#define _GLIBCXX_HAVE_SWPRINTF 1
-
-/* Define to 1 if you have the `swscanf' function. */
-#define _GLIBCXX_HAVE_SWSCANF 1
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-#define _GLIBCXX_HAVE_SYS_FILIO_H 1
-
-/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define _GLIBCXX_HAVE_SYS_IOCTL_H 1
-
-/* Define to 1 if you have the <sys/isa_defs.h> header file. */
-/* #undef _GLIBCXX_HAVE_SYS_ISA_DEFS_H */
-
-/* Define to 1 if you have the <sys/machine.h> header file. */
-/* #undef _GLIBCXX_HAVE_SYS_MACHINE_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef _GLIBCXX_HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/resource.h> header file. */
-#define _GLIBCXX_HAVE_SYS_RESOURCE_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define _GLIBCXX_HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define _GLIBCXX_HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define _GLIBCXX_HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define _GLIBCXX_HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the `tanf' function. */
-#define _GLIBCXX_HAVE_TANF 1
-
-/* Define to 1 if you have the `tanhf' function. */
-#define _GLIBCXX_HAVE_TANHF 1
-
-/* Define to 1 if you have the `tanhl' function. */
-/* #undef _GLIBCXX_HAVE_TANHL */
-
-/* Define to 1 if you have the `tanl' function. */
-/* #undef _GLIBCXX_HAVE_TANL */
-
-/* Define to 1 if you have the `ungetwc' function. */
-#define _GLIBCXX_HAVE_UNGETWC 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define _GLIBCXX_HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `vfwprintf' function. */
-#define _GLIBCXX_HAVE_VFWPRINTF 1
-
-/* Define to 1 if you have the `vfwscanf' function. */
-#define _GLIBCXX_HAVE_VFWSCANF 1
-
-/* Define to 1 if you have the `vswprintf' function. */
-#define _GLIBCXX_HAVE_VSWPRINTF 1
-
-/* Define to 1 if you have the `vswscanf' function. */
-#define _GLIBCXX_HAVE_VSWSCANF 1
-
-/* Define to 1 if you have the `vwprintf' function. */
-#define _GLIBCXX_HAVE_VWPRINTF 1
-
-/* Define to 1 if you have the `vwscanf' function. */
-#define _GLIBCXX_HAVE_VWSCANF 1
-
-/* Define to 1 if you have the <wchar.h> header file. */
-#define _GLIBCXX_HAVE_WCHAR_H 1
-
-/* Define to 1 if you have the `wcrtomb' function. */
-#define _GLIBCXX_HAVE_WCRTOMB 1
-
-/* Define to 1 if you have the `wcscat' function. */
-#define _GLIBCXX_HAVE_WCSCAT 1
-
-/* Define to 1 if you have the `wcschr' function. */
-#define _GLIBCXX_HAVE_WCSCHR 1
-
-/* Define to 1 if you have the `wcscmp' function. */
-#define _GLIBCXX_HAVE_WCSCMP 1
-
-/* Define to 1 if you have the `wcscoll' function. */
-#define _GLIBCXX_HAVE_WCSCOLL 1
-
-/* Define to 1 if you have the `wcscpy' function. */
-#define _GLIBCXX_HAVE_WCSCPY 1
-
-/* Define to 1 if you have the `wcscspn' function. */
-#define _GLIBCXX_HAVE_WCSCSPN 1
-
-/* Define to 1 if you have the `wcsftime' function. */
-#define _GLIBCXX_HAVE_WCSFTIME 1
-
-/* Define to 1 if you have the `wcslen' function. */
-#define _GLIBCXX_HAVE_WCSLEN 1
-
-/* Define to 1 if you have the `wcsncat' function. */
-#define _GLIBCXX_HAVE_WCSNCAT 1
-
-/* Define to 1 if you have the `wcsncmp' function. */
-#define _GLIBCXX_HAVE_WCSNCMP 1
-
-/* Define to 1 if you have the `wcsncpy' function. */
-#define _GLIBCXX_HAVE_WCSNCPY 1
-
-/* Define to 1 if you have the `wcspbrk' function. */
-#define _GLIBCXX_HAVE_WCSPBRK 1
-
-/* Define to 1 if you have the `wcsrchr' function. */
-#define _GLIBCXX_HAVE_WCSRCHR 1
-
-/* Define to 1 if you have the `wcsrtombs' function. */
-#define _GLIBCXX_HAVE_WCSRTOMBS 1
-
-/* Define to 1 if you have the `wcsspn' function. */
-#define _GLIBCXX_HAVE_WCSSPN 1
-
-/* Define to 1 if you have the `wcsstr' function. */
-#define _GLIBCXX_HAVE_WCSSTR 1
-
-/* Define to 1 if you have the `wcstod' function. */
-#define _GLIBCXX_HAVE_WCSTOD 1
-
-/* Define to 1 if you have the `wcstof' function. */
-#define _GLIBCXX_HAVE_WCSTOF 1
-
-/* Define to 1 if you have the `wcstok' function. */
-#define _GLIBCXX_HAVE_WCSTOK 1
-
-/* Define to 1 if you have the `wcstol' function. */
-#define _GLIBCXX_HAVE_WCSTOL 1
-
-/* Define to 1 if you have the `wcstoul' function. */
-#define _GLIBCXX_HAVE_WCSTOUL 1
-
-/* Define to 1 if you have the `wcsxfrm' function. */
-#define _GLIBCXX_HAVE_WCSXFRM 1
-
-/* Define to 1 if you have the `wctob' function. */
-#define _GLIBCXX_HAVE_WCTOB 1
-
-/* Define to 1 if you have the <wctype.h> header file. */
-#define _GLIBCXX_HAVE_WCTYPE_H 1
-
-/* Define to 1 if you have the `wmemchr' function. */
-#define _GLIBCXX_HAVE_WMEMCHR 1
-
-/* Define to 1 if you have the `wmemcmp' function. */
-#define _GLIBCXX_HAVE_WMEMCMP 1
-
-/* Define to 1 if you have the `wmemcpy' function. */
-#define _GLIBCXX_HAVE_WMEMCPY 1
-
-/* Define to 1 if you have the `wmemmove' function. */
-#define _GLIBCXX_HAVE_WMEMMOVE 1
-
-/* Define to 1 if you have the `wmemset' function. */
-#define _GLIBCXX_HAVE_WMEMSET 1
-
-/* Define to 1 if you have the `wprintf' function. */
-#define _GLIBCXX_HAVE_WPRINTF 1
-
-/* Define to 1 if you have the `wscanf' function. */
-#define _GLIBCXX_HAVE_WSCANF 1
-
-/* Define to 1 if you have the `_acosf' function. */
-/* #undef _GLIBCXX_HAVE__ACOSF */
-
-/* Define to 1 if you have the `_acosl' function. */
-/* #undef _GLIBCXX_HAVE__ACOSL */
-
-/* Define to 1 if you have the `_asinf' function. */
-/* #undef _GLIBCXX_HAVE__ASINF */
-
-/* Define to 1 if you have the `_asinl' function. */
-/* #undef _GLIBCXX_HAVE__ASINL */
-
-/* Define to 1 if you have the `_atan2f' function. */
-/* #undef _GLIBCXX_HAVE__ATAN2F */
-
-/* Define to 1 if you have the `_atan2l' function. */
-/* #undef _GLIBCXX_HAVE__ATAN2L */
-
-/* Define to 1 if you have the `_atanf' function. */
-/* #undef _GLIBCXX_HAVE__ATANF */
-
-/* Define to 1 if you have the `_atanl' function. */
-/* #undef _GLIBCXX_HAVE__ATANL */
-
-/* Define to 1 if you have the `_ceilf' function. */
-/* #undef _GLIBCXX_HAVE__CEILF */
-
-/* Define to 1 if you have the `_ceill' function. */
-/* #undef _GLIBCXX_HAVE__CEILL */
-
-/* Define to 1 if you have the `_copysign' function. */
-/* #undef _GLIBCXX_HAVE__COPYSIGN */
-
-/* Define to 1 if you have the `_copysignl' function. */
-/* #undef _GLIBCXX_HAVE__COPYSIGNL */
-
-/* Define to 1 if you have the `_cosf' function. */
-/* #undef _GLIBCXX_HAVE__COSF */
-
-/* Define to 1 if you have the `_coshf' function. */
-/* #undef _GLIBCXX_HAVE__COSHF */
-
-/* Define to 1 if you have the `_coshl' function. */
-/* #undef _GLIBCXX_HAVE__COSHL */
-
-/* Define to 1 if you have the `_cosl' function. */
-/* #undef _GLIBCXX_HAVE__COSL */
-
-/* Define to 1 if you have the `_expf' function. */
-/* #undef _GLIBCXX_HAVE__EXPF */
-
-/* Define to 1 if you have the `_expl' function. */
-/* #undef _GLIBCXX_HAVE__EXPL */
-
-/* Define to 1 if you have the `_fabsf' function. */
-/* #undef _GLIBCXX_HAVE__FABSF */
-
-/* Define to 1 if you have the `_fabsl' function. */
-/* #undef _GLIBCXX_HAVE__FABSL */
-
-/* Define to 1 if you have the `_finite' function. */
-/* #undef _GLIBCXX_HAVE__FINITE */
-
-/* Define to 1 if you have the `_finitef' function. */
-/* #undef _GLIBCXX_HAVE__FINITEF */
-
-/* Define to 1 if you have the `_finitel' function. */
-/* #undef _GLIBCXX_HAVE__FINITEL */
-
-/* Define to 1 if you have the `_floorf' function. */
-/* #undef _GLIBCXX_HAVE__FLOORF */
-
-/* Define to 1 if you have the `_floorl' function. */
-/* #undef _GLIBCXX_HAVE__FLOORL */
-
-/* Define to 1 if you have the `_fmodf' function. */
-/* #undef _GLIBCXX_HAVE__FMODF */
-
-/* Define to 1 if you have the `_fmodl' function. */
-/* #undef _GLIBCXX_HAVE__FMODL */
-
-/* Define to 1 if you have the `_fpclass' function. */
-/* #undef _GLIBCXX_HAVE__FPCLASS */
-
-/* Define to 1 if you have the `_frexpf' function. */
-/* #undef _GLIBCXX_HAVE__FREXPF */
-
-/* Define to 1 if you have the `_frexpl' function. */
-/* #undef _GLIBCXX_HAVE__FREXPL */
-
-/* Define to 1 if you have the `_hypot' function. */
-/* #undef _GLIBCXX_HAVE__HYPOT */
-
-/* Define to 1 if you have the `_hypotf' function. */
-/* #undef _GLIBCXX_HAVE__HYPOTF */
-
-/* Define to 1 if you have the `_hypotl' function. */
-/* #undef _GLIBCXX_HAVE__HYPOTL */
-
-/* Define to 1 if you have the `_isinf' function. */
-/* #undef _GLIBCXX_HAVE__ISINF */
-
-/* Define to 1 if you have the `_isinff' function. */
-/* #undef _GLIBCXX_HAVE__ISINFF */
-
-/* Define to 1 if you have the `_isinfl' function. */
-/* #undef _GLIBCXX_HAVE__ISINFL */
-
-/* Define to 1 if you have the `_isnan' function. */
-/* #undef _GLIBCXX_HAVE__ISNAN */
-
-/* Define to 1 if you have the `_isnanf' function. */
-/* #undef _GLIBCXX_HAVE__ISNANF */
-
-/* Define to 1 if you have the `_isnanl' function. */
-/* #undef _GLIBCXX_HAVE__ISNANL */
-
-/* Define to 1 if you have the `_ldexpf' function. */
-/* #undef _GLIBCXX_HAVE__LDEXPF */
-
-/* Define to 1 if you have the `_ldexpl' function. */
-/* #undef _GLIBCXX_HAVE__LDEXPL */
-
-/* Define to 1 if you have the `_log10f' function. */
-/* #undef _GLIBCXX_HAVE__LOG10F */
-
-/* Define to 1 if you have the `_log10l' function. */
-/* #undef _GLIBCXX_HAVE__LOG10L */
-
-/* Define to 1 if you have the `_logf' function. */
-/* #undef _GLIBCXX_HAVE__LOGF */
-
-/* Define to 1 if you have the `_logl' function. */
-/* #undef _GLIBCXX_HAVE__LOGL */
-
-/* Define to 1 if you have the `_modff' function. */
-/* #undef _GLIBCXX_HAVE__MODFF */
-
-/* Define to 1 if you have the `_modfl' function. */
-/* #undef _GLIBCXX_HAVE__MODFL */
-
-/* Define to 1 if you have the `_powf' function. */
-/* #undef _GLIBCXX_HAVE__POWF */
-
-/* Define to 1 if you have the `_powl' function. */
-/* #undef _GLIBCXX_HAVE__POWL */
-
-/* Define to 1 if you have the `_qfpclass' function. */
-/* #undef _GLIBCXX_HAVE__QFPCLASS */
-
-/* Define to 1 if you have the `_sincos' function. */
-/* #undef _GLIBCXX_HAVE__SINCOS */
-
-/* Define to 1 if you have the `_sincosf' function. */
-/* #undef _GLIBCXX_HAVE__SINCOSF */
-
-/* Define to 1 if you have the `_sincosl' function. */
-/* #undef _GLIBCXX_HAVE__SINCOSL */
-
-/* Define to 1 if you have the `_sinf' function. */
-/* #undef _GLIBCXX_HAVE__SINF */
-
-/* Define to 1 if you have the `_sinhf' function. */
-/* #undef _GLIBCXX_HAVE__SINHF */
-
-/* Define to 1 if you have the `_sinhl' function. */
-/* #undef _GLIBCXX_HAVE__SINHL */
-
-/* Define to 1 if you have the `_sinl' function. */
-/* #undef _GLIBCXX_HAVE__SINL */
-
-/* Define to 1 if you have the `_sqrtf' function. */
-/* #undef _GLIBCXX_HAVE__SQRTF */
-
-/* Define to 1 if you have the `_sqrtl' function. */
-/* #undef _GLIBCXX_HAVE__SQRTL */
-
-/* Define to 1 if you have the `_tanf' function. */
-/* #undef _GLIBCXX_HAVE__TANF */
-
-/* Define to 1 if you have the `_tanhf' function. */
-/* #undef _GLIBCXX_HAVE__TANHF */
-
-/* Define to 1 if you have the `_tanhl' function. */
-/* #undef _GLIBCXX_HAVE__TANHL */
-
-/* Define to 1 if you have the `_tanl' function. */
-/* #undef _GLIBCXX_HAVE__TANL */
-
-/* Define to 1 if you have the `__signbit' function. */
-#define _GLIBCXX_HAVE___SIGNBIT 1
-
-/* Define to 1 if you have the `__signbitf' function. */
-#define _GLIBCXX_HAVE___SIGNBITF 1
-
-/* Define to 1 if you have the `__signbitl' function. */
-#define _GLIBCXX_HAVE___SIGNBITL 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#define _GLIBCXX_PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define _GLIBCXX_PACKAGE_NAME "package-unused"
-
-/* Define to the full name and version of this package. */
-#define _GLIBCXX_PACKAGE_STRING "package-unused version-unused"
-
-/* Define to the one symbol short name of this package. */
-#define _GLIBCXX_PACKAGE_TARNAME "libstdc++"
-
-/* Define to the version of this package. */
-#define _GLIBCXX_PACKAGE__GLIBCXX_VERSION "version-unused"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if a full hosted library is built, or 0 if freestanding. */
-#define _GLIBCXX_HOSTED 1
-
-/* Define if the compiler is configured for setjmp/longjmp exceptions. */
-/* #undef _GLIBCXX_SJLJ_EXCEPTIONS */
-//
-// Systems that have certain non-standard functions prefixed with an
-// underscore, we'll handle those here. Must come after config.h.in.
-//
-#if defined (_GLIBCXX_HAVE__ISNAN) && ! defined (_GLIBCXX_HAVE_ISNAN)
-# define _GLIBCXX_HAVE_ISNAN 1
-# define isnan _isnan
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISNANF) && ! defined (_GLIBCXX_HAVE_ISNANF)
-# define _GLIBCXX_HAVE_ISNANF 1
-# define isnanf _isnanf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISNANL) && ! defined (_GLIBCXX_HAVE_ISNANL)
-# define _GLIBCXX_HAVE_ISNANL 1
-# define isnanl _isnanl
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISINF) && ! defined (_GLIBCXX_HAVE_ISINF)
-# define _GLIBCXX_HAVE_ISINF 1
-# define isinf _isinf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISINFF) && ! defined (_GLIBCXX_HAVE_ISINFF)
-# define _GLIBCXX_HAVE_ISINFF 1
-# define isinff _isinff
-#endif
-
-#if defined (_GLIBCXX_HAVE__ISINFL) && ! defined (_GLIBCXX_HAVE_ISINFL)
-# define _GLIBCXX_HAVE_ISINFL 1
-# define isinfl _isinfl
-#endif
-
-#if defined (_GLIBCXX_HAVE__COPYSIGN) && ! defined (_GLIBCXX_HAVE_COPYSIGN)
-# define _GLIBCXX_HAVE_COPYSIGN 1
-# define copysign _copysign
-#endif
-
-#if defined (_GLIBCXX_HAVE__COPYSIGNL) && ! defined (_GLIBCXX_HAVE_COPYSIGNL)
-# define _GLIBCXX_HAVE_COPYSIGNL 1
-# define copysignl _copysignl
-#endif
-
-#if defined (_GLIBCXX_HAVE__COSF) && ! defined (_GLIBCXX_HAVE_COSF)
-# define _GLIBCXX_HAVE_COSF 1
-# define cosf _cosf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ACOSF) && ! defined (_GLIBCXX_HAVE_ACOSF)
-# define _GLIBCXX_HAVE_ACOSF 1
-# define acosf _acosf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ACOSL) && ! defined (_GLIBCXX_HAVE_ACOSL)
-# define _GLIBCXX_HAVE_ACOSL 1
-# define acosl _acosl
-#endif
-
-#if defined (_GLIBCXX_HAVE__ASINF) && ! defined (_GLIBCXX_HAVE_ASINF)
-# define _GLIBCXX_HAVE_ASINF 1
-# define asinf _asinf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ASINL) && ! defined (_GLIBCXX_HAVE_ASINL)
-# define _GLIBCXX_HAVE_ASINL 1
-# define asinl _asinl
-#endif
-
-#if defined (_GLIBCXX_HAVE__ATANF) && ! defined (_GLIBCXX_HAVE_ATANF)
-# define _GLIBCXX_HAVE_ATANF 1
-# define atanf _atanf
-#endif
-
-#if defined (_GLIBCXX_HAVE__ATANL) && ! defined (_GLIBCXX_HAVE_ATANL)
-# define _GLIBCXX_HAVE_ATANL 1
-# define atanl _atanl
-#endif
-
-#if defined (_GLIBCXX_HAVE__CEILF) && ! defined (_GLIBCXX_HAVE_CEILF)
-# define _GLIBCXX_HAVE_CEILF 1
-# define aceil _ceilf
-#endif
-
-#if defined (_GLIBCXX_HAVE__CEILL) && ! defined (_GLIBCXX_HAVE_CEILL)
-# define _GLIBCXX_HAVE_CEILL 1
-# define aceil _ceill
-#endif
-
-#if defined (_GLIBCXX_HAVE__COSHF) && ! defined (_GLIBCXX_HAVE_COSHF)
-# define _GLIBCXX_HAVE_COSHF 1
-# define coshf _coshf
-#endif
-
-#if defined (_GLIBCXX_HAVE__COSL) && ! defined (_GLIBCXX_HAVE_COSL)
-# define _GLIBCXX_HAVE_COSL 1
-# define cosl _cosl
-#endif
-
-#if defined (_GLIBCXX_HAVE__LOGF) && ! defined (_GLIBCXX_HAVE_LOGF)
-# define _GLIBCXX_HAVE_LOGF 1
-# define logf _logf
-#endif
-
-#if defined (_GLIBCXX_HAVE__COSHL) && ! defined (_GLIBCXX_HAVE_COSHL)
-# define _GLIBCXX_HAVE_COSHL 1
-# define coshl _coshl
-#endif
-
-#if defined (_GLIBCXX_HAVE__EXPF) && ! defined (_GLIBCXX_HAVE_EXPF)
-# define _GLIBCXX_HAVE_EXPF 1
-# define expf _expf
-#endif
-
-#if defined (_GLIBCXX_HAVE__EXPL) && ! defined (_GLIBCXX_HAVE_EXPL)
-# define _GLIBCXX_HAVE_EXPL 1
-# define expl _expl
-#endif
-
-#if defined (_GLIBCXX_HAVE__FABSF) && ! defined (_GLIBCXX_HAVE_FABSF)
-# define _GLIBCXX_HAVE_FABSF 1
-# define fabsf _fabsf
-#endif
-
-#if defined (_GLIBCXX_HAVE__FABSL) && ! defined (_GLIBCXX_HAVE_FABSL)
-# define _GLIBCXX_HAVE_FABSL 1
-# define fabsl _fabsl
-#endif
-
-#if defined (_GLIBCXX_HAVE__FLOORF) && ! defined (_GLIBCXX_HAVE_FLOORF)
-# define _GLIBCXX_HAVE_FLOORF 1
-# define floorf _floorf
-#endif
-
-#if defined (_GLIBCXX_HAVE__FLOORL) && ! defined (_GLIBCXX_HAVE_FLOORL)
-# define _GLIBCXX_HAVE_FLOORL 1
-# define floorl _floorl
-#endif
-
-#if defined (_GLIBCXX_HAVE__FMODF) && ! defined (_GLIBCXX_HAVE_FMODF)
-# define _GLIBCXX_HAVE_FMODF 1
-# define fmodf _fmodf
-#endif
-
-#if defined (_GLIBCXX_HAVE__FMODL) && ! defined (_GLIBCXX_HAVE_FMODL)
-# define _GLIBCXX_HAVE_FMODL 1
-# define fmodl _fmodl
-#endif
-
-#if defined (_GLIBCXX_HAVE__FREXPF) && ! defined (_GLIBCXX_HAVE_FREXPF)
-# define _GLIBCXX_HAVE_FREXPF 1
-# define frexpf _frexpf
-#endif
-
-#if defined (_GLIBCXX_HAVE__FREXPL) && ! defined (_GLIBCXX_HAVE_FREXPL)
-# define _GLIBCXX_HAVE_FREXPL 1
-# define frexpl _frexpl
-#endif
-
-#if defined (_GLIBCXX_HAVE__LDEXPF) && ! defined (_GLIBCXX_HAVE_LDEXPF)
-# define _GLIBCXX_HAVE_LDEXPF 1
-# define ldexpf _ldexpf
-#endif
-
-#if defined (_GLIBCXX_HAVE__LDEXPL) && ! defined (_GLIBCXX_HAVE_LDEXPL)
-# define _GLIBCXX_HAVE_LDEXPL 1
-# define ldexpl _ldexpl
-#endif
-
-#if defined (_GLIBCXX_HAVE__LOG10F) && ! defined (_GLIBCXX_HAVE_LOG10F)
-# define _GLIBCXX_HAVE_LOG10F 1
-# define log10f _log10f
-#endif
-
-#if defined (_GLIBCXX_HAVE__LOGL) && ! defined (_GLIBCXX_HAVE_LOGL)
-# define _GLIBCXX_HAVE_LOGL 1
-# define logl _logl
-#endif
-
-#if defined (_GLIBCXX_HAVE__POWF) && ! defined (_GLIBCXX_HAVE_POWF)
-# define _GLIBCXX_HAVE_POWF 1
-# define powf _powf
-#endif
-
-#if defined (_GLIBCXX_HAVE__LOG10L) && ! defined (_GLIBCXX_HAVE_LOG10L)
-# define _GLIBCXX_HAVE_LOG10L 1
-# define log10l _log10l
-#endif
-
-#if defined (_GLIBCXX_HAVE__MODF) && ! defined (_GLIBCXX_HAVE_MODF)
-# define _GLIBCXX_HAVE_MODF 1
-# define modf _modf
-#endif
-
-#if defined (_GLIBCXX_HAVE__MODL) && ! defined (_GLIBCXX_HAVE_MODL)
-# define _GLIBCXX_HAVE_MODL 1
-# define modl _modl
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINF) && ! defined (_GLIBCXX_HAVE_SINF)
-# define _GLIBCXX_HAVE_SINF 1
-# define sinf _sinf
-#endif
-
-#if defined (_GLIBCXX_HAVE__POWL) && ! defined (_GLIBCXX_HAVE_POWL)
-# define _GLIBCXX_HAVE_POWL 1
-# define powl _powl
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINHF) && ! defined (_GLIBCXX_HAVE_SINHF)
-# define _GLIBCXX_HAVE_SINHF 1
-# define sinhf _sinhf
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINL) && ! defined (_GLIBCXX_HAVE_SINL)
-# define _GLIBCXX_HAVE_SINL 1
-# define sinl _sinl
-#endif
-
-#if defined (_GLIBCXX_HAVE__SQRTF) && ! defined (_GLIBCXX_HAVE_SQRTF)
-# define _GLIBCXX_HAVE_SQRTF 1
-# define sqrtf _sqrtf
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINHL) && ! defined (_GLIBCXX_HAVE_SINHL)
-# define _GLIBCXX_HAVE_SINHL 1
-# define sinhl _sinhl
-#endif
-
-#if defined (_GLIBCXX_HAVE__TANF) && ! defined (_GLIBCXX_HAVE_TANF)
-# define _GLIBCXX_HAVE_TANF 1
-# define tanf _tanf
-#endif
-
-#if defined (_GLIBCXX_HAVE__SQRTL) && ! defined (_GLIBCXX_HAVE_SQRTL)
-# define _GLIBCXX_HAVE_SQRTL 1
-# define sqrtl _sqrtl
-#endif
-
-#if defined (_GLIBCXX_HAVE__TANHF) && ! defined (_GLIBCXX_HAVE_TANHF)
-# define _GLIBCXX_HAVE_TANHF 1
-# define tanhf _tanhf
-#endif
-
-#if defined (_GLIBCXX_HAVE__TANL) && ! defined (_GLIBCXX_HAVE_TANL)
-# define _GLIBCXX_HAVE_TANF 1
-# define tanf _tanf
-#endif
-
-#if defined (_GLIBCXX_HAVE__STRTOF) && ! defined (_GLIBCXX_HAVE_STRTOF)
-# define _GLIBCXX_HAVE_STRTOF 1
-# define strtof _strtof
-#endif
-
-#if defined (_GLIBCXX_HAVE__TANHL) && ! defined (_GLIBCXX_HAVE_TANHL)
-# define _GLIBCXX_HAVE_TANHL 1
-# define tanhl _tanhl
-#endif
-
-#if defined (_GLIBCXX_HAVE__STRTOLD) && ! defined (_GLIBCXX_HAVE_STRTOLD)
-# define _GLIBCXX_HAVE_STRTOLD 1
-# define strtold _strtold
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINCOS) && ! defined (_GLIBCXX_HAVE_SINCOS)
-# define _GLIBCXX_HAVE_SINCOS 1
-# define sincos _sincos
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINCOSF) && ! defined (_GLIBCXX_HAVE_SINCOSF)
-# define _GLIBCXX_HAVE_SINCOSF 1
-# define sincosf _sincosf
-#endif
-
-#if defined (_GLIBCXX_HAVE__SINCOSL) && ! defined (_GLIBCXX_HAVE_SINCOSL)
-# define _GLIBCXX_HAVE_SINCOSL 1
-# define sincosl _sincosl
-#endif
-
-#if defined (_GLIBCXX_HAVE__FINITE) && ! defined (_GLIBCXX_HAVE_FINITE)
-# define _GLIBCXX_HAVE_FINITE 1
-# define finite _finite
-#endif
-
-#if defined (_GLIBCXX_HAVE__FINITEF) && ! defined (_GLIBCXX_HAVE_FINITEF)
-# define _GLIBCXX_HAVE_FINITEF 1
-# define finitef _finitef
-#endif
-
-#if defined (_GLIBCXX_HAVE__FINITEL) && ! defined (_GLIBCXX_HAVE_FINITEL)
-# define _GLIBCXX_HAVE_FINITEL 1
-# define finitel _finitel
-#endif
-
-#if defined (_GLIBCXX_HAVE__QFINITE) && ! defined (_GLIBCXX_HAVE_QFINITE)
-# define _GLIBCXX_HAVE_QFINITE 1
-# define qfinite _qfinite
-#endif
-
-#if defined (_GLIBCXX_HAVE__FPCLASS) && ! defined (_GLIBCXX_HAVE_FPCLASS)
-# define _GLIBCXX_HAVE_FPCLASS 1
-# define fpclass _fpclass
-#endif
-
-#if defined (_GLIBCXX_HAVE__QFPCLASS) && ! defined (_GLIBCXX_HAVE_QFPCLASS)
-# define _GLIBCXX_HAVE_QFPCLASS 1
-# define qfpclass _qfpclass
-#endif
-
-#endif // _CXXCONFIG_
diff --git a/include.new/c++/3.4/bits/c++io.h b/include.new/c++/3.4/bits/c++io.h
deleted file mode 100644
index 5659c13..0000000
--- a/include.new/c++/3.4/bits/c++io.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// underlying io library  -*- C++ -*-
-
-// Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// c_io_stdio.h - Defines for using "C" stdio.h
-
-#ifndef _C_IO_STDIO_H
-#define _C_IO_STDIO_H 1
-
-#include <cstdio>
-#include <cstddef>
-#include <bits/gthr.h>
-
-namespace std 
-{
-  typedef __gthread_mutex_t __c_lock;
-
-  // for basic_file.h
-  typedef FILE __c_file;
-
-  // XXX GLIBCXX_ABI Deprecated
-  // for ios_base.h
-  struct __ios_flags
-  {
-    typedef short __int_type;
-
-    static const __int_type _S_boolalpha =	0x0001;
-    static const __int_type _S_dec =		0x0002;
-    static const __int_type _S_fixed = 		0x0004;
-    static const __int_type _S_hex =		0x0008;
-    static const __int_type _S_internal = 	0x0010;
-    static const __int_type _S_left =   	0x0020;
-    static const __int_type _S_oct =		0x0040;
-    static const __int_type _S_right =		0x0080;
-    static const __int_type _S_scientific =	0x0100;
-    static const __int_type _S_showbase =       0x0200;
-    static const __int_type _S_showpoint =	0x0400;
-    static const __int_type _S_showpos =	0x0800;
-    static const __int_type _S_skipws =		0x1000;
-    static const __int_type _S_unitbuf =	0x2000;
-    static const __int_type _S_uppercase =	0x4000;
-    static const __int_type _S_adjustfield =	0x0020 | 0x0080 | 0x0010;
-    static const __int_type _S_basefield =	0x0002 | 0x0040 | 0x0008;
-    static const __int_type _S_floatfield =	0x0100 | 0x0004;
-
-    // 27.4.2.1.3  Type ios_base::iostate
-    static const __int_type _S_badbit =		0x01;
-    static const __int_type _S_eofbit =		0x02;
-    static const __int_type _S_failbit =       	0x04;
-
-    // 27.4.2.1.4  Type openmode
-    static const __int_type _S_app =		0x01;
-    static const __int_type _S_ate =		0x02;
-    static const __int_type _S_bin =		0x04;
-    static const __int_type _S_in =		0x08;
-    static const __int_type _S_out =		0x10;
-    static const __int_type _S_trunc =		0x20;
-  };
-}
-
-#endif
diff --git a/include.new/c++/3.4/bits/c++locale.h b/include.new/c++/3.4/bits/c++locale.h
deleted file mode 100644
index 7b2282b..0000000
--- a/include.new/c++/3.4/bits/c++locale.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Wrapper for underlying C-language localization -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.8  Standard locale categories.
-//
-
-// Written by Benjamin Kosnik <bkoz@redhat.com>
-
-#ifndef _C_LOCALE_H
-#define _C_LOCALE_H 1
-
-#pragma GCC system_header
-
-#include <clocale>
-#include <cstring>   // get std::strlen
-#include <cstdio>    // get std::snprintf or std::sprintf
-
-#define _GLIBCXX_NUM_CATEGORIES 0
-
-namespace std
-{
-  typedef int*			__c_locale;
-
-  // Convert numeric value of type _Tv to string and return length of
-  // string.  If snprintf is available use it, otherwise fall back to
-  // the unsafe sprintf which, in general, can be dangerous and should
-  // be avoided.
-  template<typename _Tv>
-    int
-    __convert_from_v(char* __out, 
-		     const int __size __attribute__((__unused__)),
-		     const char* __fmt,
-		     _Tv __v, const __c_locale&, int __prec)
-    {
-      char* __old = std::setlocale(LC_NUMERIC, NULL);
-      char* __sav = NULL;
-      if (std::strcmp(__old, "C"))
-	{
-	  __sav = new char[std::strlen(__old) + 1];
-	  std::strcpy(__sav, __old);
-	  std::setlocale(LC_NUMERIC, "C");
-	}
-
-#ifdef _GLIBCXX_USE_C99
-      const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-#else
-      const int __ret = std::sprintf(__out, __fmt, __prec, __v);
-#endif
-      
-      if (__sav)
-	{
-	  std::setlocale(LC_NUMERIC, __sav);
-	  delete [] __sav;
-	}
-      return __ret;
-    }
-}
-
-#endif
diff --git a/include.new/c++/3.4/bits/c++locale_internal.h b/include.new/c++/3.4/bits/c++locale_internal.h
deleted file mode 100644
index fb26352..0000000
--- a/include.new/c++/3.4/bits/c++locale_internal.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Locale internal implementation header -*- C++ -*-
-
-// Copyright (C) 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// The generic locale code doesn't need to do anything here (yet)
diff --git a/include.new/c++/3.4/bits/char_traits.h b/include.new/c++/3.4/bits/char_traits.h
deleted file mode 100644
index 323fdfb..0000000
--- a/include.new/c++/3.4/bits/char_traits.h
+++ /dev/null
@@ -1,376 +0,0 @@
-// Character Traits for use by standard string and iostream -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 21  Strings library
-//
-
-/** @file char_traits.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _CHAR_TRAITS_H
-#define _CHAR_TRAITS_H 1
-
-#pragma GCC system_header
-
-#include <cstring>            // For memmove, memset, memchr
-#include <bits/stl_algobase.h>// For copy, lexicographical_compare, fill_n
-#include <bits/postypes.h>    // For streampos
-
-namespace __gnu_cxx
-{
-  /**
-   *  @brief  Mapping from character type to associated types.
-   *
-   *
-   *  @note This is an implementation class for the generic version
-   *  of char_traits.  It defines int_type, off_type, pos_type, and
-   *  state_type.  By default these are unsigned long, streamoff,
-   *  streampos, and mbstate_t.  Users who need a different set of
-   *  types, but who don't need to change the definitions of any function
-   *  defined in char_traits, can specialize __gnu_cxx::_Char_types
-   *  while leaving __gnu_cxx::char_traits alone. */
-  template <class _CharT>
-    struct _Char_types
-    {
-      typedef unsigned long   int_type;
-      typedef std::streampos  pos_type;
-      typedef std::streamoff  off_type;
-      typedef std::mbstate_t  state_type;
-    };
-
-
-  /**
-   *  @brief  Base class used to implement std::char_traits.
-   *
-   *  @note For any given actual character type, this definition is
-   *  probably wrong.  (Most of the member functions are likely to be
-   *  right, but the int_type and state_type typedefs, and the eof()
-   *  member function, are likely to be wrong.)  The reason this class
-   *  exists is so users can specialize it.  Classes in namespace std
-   *  may not be specialized for fundamentl types, but classes in
-   *  namespace __gnu_cxx may be.
-   *
-   *  See http://gcc.gnu.org/onlinedocs/libstdc++/21_strings/howto.html#5
-   *  for advice on how to make use of this class for "unusual" character
-   *  types. Also, check out include/ext/pod_char_traits.h.  */
-  template<typename _CharT>
-    struct char_traits
-    {
-      typedef _CharT                                    char_type;
-      typedef typename _Char_types<_CharT>::int_type    int_type;
-      typedef typename _Char_types<_CharT>::pos_type    pos_type;
-      typedef typename _Char_types<_CharT>::off_type    off_type;
-      typedef typename _Char_types<_CharT>::state_type  state_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2)
-      { __c1 = __c2; }
-
-      static bool
-      eq(const char_type& __c1, const char_type& __c2)
-      { return __c1 == __c2; }
-
-      static bool
-      lt(const char_type& __c1, const char_type& __c2)
-      { return __c1 < __c2; }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, std::size_t __n);
-
-      static std::size_t
-      length(const char_type* __s);
-
-      static const char_type*
-      find(const char_type* __s, std::size_t __n, const char_type& __a);
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, std::size_t __n);
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, std::size_t __n);
-
-      static char_type*
-      assign(char_type* __s, std::size_t __n, char_type __a);
-
-      static char_type
-      to_char_type(const int_type& __c)
-      { return static_cast<char_type>(__c); }
-
-      static int_type
-      to_int_type(const char_type& __c)
-      { return static_cast<int_type>(__c); }
-
-      static bool
-      eq_int_type(const int_type& __c1, const int_type& __c2)
-      { return __c1 == __c2; }
-
-      static int_type
-      eof()
-      { return static_cast<int_type>(EOF); }
-
-      static int_type
-      not_eof(const int_type& __c)
-      { return !eq_int_type(__c, eof()) ? __c : to_int_type(char_type()); }
-    };
-
-  template<typename _CharT>
-    int
-    char_traits<_CharT>::
-    compare(const char_type* __s1, const char_type* __s2, std::size_t __n)
-    {
-      for (size_t __i = 0; __i < __n; ++__i)
-	if (lt(__s1[__i], __s2[__i]))
-	  return -1;
-	else if (lt(__s2[__i], __s1[__i]))
-	  return 1;
-      return 0;
-    }
-
-  template<typename _CharT>
-    std::size_t
-    char_traits<_CharT>::
-    length(const char_type* __p)
-    {
-      std::size_t __i = 0;
-      while (!eq(__p[__i], char_type()))
-        ++__i;
-      return __i;
-    }
-
-  template<typename _CharT>
-    const typename char_traits<_CharT>::char_type*
-    char_traits<_CharT>::
-    find(const char_type* __s, std::size_t __n, const char_type& __a)
-    {
-      for (std::size_t __i = 0; __i < __n; ++__i)
-        if (eq(__s[__i], __a))
-          return __s + __i;
-      return 0;
-    }
-
-  template<typename _CharT>
-    typename char_traits<_CharT>::char_type*
-    char_traits<_CharT>::
-    move(char_type* __s1, const char_type* __s2, std::size_t __n)
-    {
-      return static_cast<_CharT*>(std::memmove(__s1, __s2,
-					       __n * sizeof(char_type)));
-    }
-
-  template<typename _CharT>
-    typename char_traits<_CharT>::char_type*
-    char_traits<_CharT>::
-    copy(char_type* __s1, const char_type* __s2, std::size_t __n)
-    {
-      std::copy(__s2, __s2 + __n, __s1);
-      return __s1;
-    }
-
-  template<typename _CharT>
-    typename char_traits<_CharT>::char_type*
-    char_traits<_CharT>::
-    assign(char_type* __s, std::size_t __n, char_type __a)
-    {
-      std::fill_n(__s, __n, __a);
-      return __s;
-    }
-}
-
-namespace std
-{
-  // 21.1
-  /**
-   *  @brief  Basis for explicit traits specializations.
-   *
-   *  @note  For any given actual character type, this definition is
-   *  probably wrong.  Since this is just a thin wrapper around
-   *  __gnu_cxx::char_traits, it is possible to achieve a more
-   *  appropriate definition by specializing __gnu_cxx::char_traits.
-   *
-   *  See http://gcc.gnu.org/onlinedocs/libstdc++/21_strings/howto.html#5
-   *  for advice on how to make use of this class for "unusual" character
-   *  types. Also, check out include/ext/pod_char_traits.h.
-  */
-  template<class _CharT>
-    struct char_traits
-    : public __gnu_cxx::char_traits<_CharT>
-    { };
-
-
-  /// 21.1.3.1  char_traits specializations
-  template<>
-    struct char_traits<char>
-    {
-      typedef char              char_type;
-      typedef int               int_type;
-      typedef streampos         pos_type;
-      typedef streamoff         off_type;
-      typedef mbstate_t         state_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2)
-      { __c1 = __c2; }
-
-      static bool
-      eq(const char_type& __c1, const char_type& __c2)
-      { return __c1 == __c2; }
-
-      static bool
-      lt(const char_type& __c1, const char_type& __c2)
-      { return __c1 < __c2; }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      { return memcmp(__s1, __s2, __n); }
-
-      static size_t
-      length(const char_type* __s)
-      { return strlen(__s); }
-
-      static const char_type*
-      find(const char_type* __s, size_t __n, const char_type& __a)
-      { return static_cast<const char_type*>(memchr(__s, __a, __n)); }
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, size_t __n)
-      { return static_cast<char_type*>(memmove(__s1, __s2, __n)); }
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      { return static_cast<char_type*>(memcpy(__s1, __s2, __n)); }
-
-      static char_type*
-      assign(char_type* __s, size_t __n, char_type __a)
-      { return static_cast<char_type*>(memset(__s, __a, __n)); }
-
-      static char_type
-      to_char_type(const int_type& __c)
-      { return static_cast<char_type>(__c); }
-
-      // To keep both the byte 0xff and the eof symbol 0xffffffff
-      // from ending up as 0xffffffff.
-      static int_type
-      to_int_type(const char_type& __c)
-      { return static_cast<int_type>(static_cast<unsigned char>(__c)); }
-
-      static bool
-      eq_int_type(const int_type& __c1, const int_type& __c2)
-      { return __c1 == __c2; }
-
-      static int_type
-      eof() { return static_cast<int_type>(EOF); }
-
-      static int_type
-      not_eof(const int_type& __c)
-      { return (__c == eof()) ? 0 : __c; }
-  };
-
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  /// 21.1.3.2  char_traits specializations
-  template<>
-    struct char_traits<wchar_t>
-    {
-      typedef wchar_t           char_type;
-      typedef wint_t            int_type;
-      typedef streamoff         off_type;
-      typedef wstreampos        pos_type;
-      typedef mbstate_t         state_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2)
-      { __c1 = __c2; }
-
-      static bool
-      eq(const char_type& __c1, const char_type& __c2)
-      { return __c1 == __c2; }
-
-      static bool
-      lt(const char_type& __c1, const char_type& __c2)
-      { return __c1 < __c2; }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      { return wmemcmp(__s1, __s2, __n); }
-
-      static size_t
-      length(const char_type* __s)
-      { return wcslen(__s); }
-
-      static const char_type*
-      find(const char_type* __s, size_t __n, const char_type& __a)
-      { return wmemchr(__s, __a, __n); }
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, size_t __n)
-      { return wmemmove(__s1, __s2, __n); }
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      { return wmemcpy(__s1, __s2, __n); }
-
-      static char_type*
-      assign(char_type* __s, size_t __n, char_type __a)
-      { return wmemset(__s, __a, __n); }
-
-      static char_type
-      to_char_type(const int_type& __c) { return char_type(__c); }
-
-      static int_type
-      to_int_type(const char_type& __c) { return int_type(__c); }
-
-      static bool
-      eq_int_type(const int_type& __c1, const int_type& __c2)
-      { return __c1 == __c2; }
-
-      static int_type
-      eof() { return static_cast<int_type>(WEOF); }
-
-      static int_type
-      not_eof(const int_type& __c)
-      { return eq_int_type(__c, eof()) ? 0 : __c; }
-  };
-#endif //_GLIBCXX_USE_WCHAR_T
-
-  template<typename _CharT, typename _Traits>
-    struct _Char_traits_match
-    {
-      _CharT _M_c;
-      _Char_traits_match(_CharT const& __c) : _M_c(__c) { }
-
-      bool
-      operator()(_CharT const& __a) { return _Traits::eq(_M_c, __a); }
-    };
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/cmath.tcc b/include.new/c++/3.4/bits/cmath.tcc
deleted file mode 100644
index d771467..0000000
--- a/include.new/c++/3.4/bits/cmath.tcc
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- C++ -*- C math library.
-
-// Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// This file was written by Gabriel Dos Reis <gdr@codesourcery.com>
-
-#ifndef _GLIBCXX_CMATH_TCC
-#define _GLIBCXX_CMATH_TCC 1
-
-namespace std
-{
-  template<typename _Tp>
-    inline _Tp
-    __cmath_power(_Tp __x, unsigned int __n)
-    {
-      _Tp __y = __n % 2 ? __x : 1;
-
-      while (__n >>= 1)
-        {
-          __x = __x * __x;
-          if (__n % 2)
-            __y = __y * __x;
-        }
-
-      return __y;
-    }
-}
-
-#endif
diff --git a/include.new/c++/3.4/bits/codecvt.h b/include.new/c++/3.4/bits/codecvt.h
deleted file mode 100644
index d31ebf2..0000000
--- a/include.new/c++/3.4/bits/codecvt.h
+++ /dev/null
@@ -1,478 +0,0 @@
-// Locale support (codecvt) -*- C++ -*-
-
-// Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.2.1.5 Template class codecvt
-//
-
-// Written by Benjamin Kosnik <bkoz@cygnus.com>
-
-/** @file codecvt.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _CODECVT_H
-#define _CODECVT_H 1
-
-#pragma GCC system_header
-
-  //  22.2.1.5  Template class codecvt
-  /// Base class for codecvt facet providing conversion result enum.
-  class codecvt_base
-  {
-  public:
-    enum result
-    {
-      ok,
-      partial,
-      error,
-      noconv
-    };
-  };
-
-  // Template class __codecvt_abstract_base
-  // NB: An abstract base class that fills in the public inlines, so
-  // that the specializations don't have to re-copy the public
-  // interface.
-  /**
-   *  @brief  Common base for codecvt facet
-   *
-   *  This template class provides implementations of the public functions
-   *  that forward to the protected virtual functions.
-   *
-   *  This template also provides abstract stubs for the protected virtual
-   *  functions.
-  */
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    class __codecvt_abstract_base
-    : public locale::facet, public codecvt_base
-    {
-    public:
-      // Types:
-      typedef codecvt_base::result	result;
-      typedef _InternT			intern_type;
-      typedef _ExternT			extern_type;
-      typedef _StateT			state_type;
-
-      // 22.2.1.5.1 codecvt members
-      /**
-       *  @brief  Convert from internal to external character set.
-       *
-       *  Converts input string of intern_type to output string of
-       *  extern_type.  This is analogous to wcsrtombs.  It does this by
-       *  calling codecvt::do_out.
-       *
-       *  The source and destination character sets are determined by the
-       *  facet's locale, internal and external types.
-       *
-       *  The characters in [from,from_end) are converted and written to
-       *  [to,to_end).  from_next and to_next are set to point to the
-       *  character following the last successfully converted character,
-       *  respectively.  If the result needed no conversion, from_next and
-       *  to_next are not affected.
-       *
-       *  The @a state argument should be intialized if the input is at the
-       *  beginning and carried from a previous call if continuing
-       *  conversion.  There are no guarantees about how @a state is used.
-       *
-       *  The result returned is a member of codecvt_base::result.  If all the
-       *  input is converted, returns codecvt_base::ok.  If no conversion is
-       *  necessary, returns codecvt_base::noconv.  If the input ends early or
-       *  there is insufficient space in the output, returns codecvt_base::partial.
-       *  Otherwise the conversion failed and codecvt_base::error is returned.
-       *
-       *  @param  state  Persistent conversion state data.
-       *  @param  from  Start of input.
-       *  @param  from_end  End of input.
-       *  @param  from_next  Returns start of unconverted data.
-       *  @param  to  Start of output buffer.
-       *  @param  to_end  End of output buffer.
-       *  @param  to_next  Returns start of unused output area.
-       *  @return  codecvt_base::result.
-      */
-      result
-      out(state_type& __state, const intern_type* __from,
-	  const intern_type* __from_end, const intern_type*& __from_next,
-	  extern_type* __to, extern_type* __to_end,
-	  extern_type*& __to_next) const
-      {
-	return this->do_out(__state, __from, __from_end, __from_next,
-			    __to, __to_end, __to_next);
-      }
-
-      /**
-       *  @brief  Reset conversion state.
-       *
-       *  Writes characters to output that would restore @a state to initial
-       *  conditions.  The idea is that if a partial conversion occurs, then
-       *  the converting the characters written by this function would leave
-       *  the state in initial conditions, rather than partial conversion
-       *  state.  It does this by calling codecvt::do_unshift().
-       *
-       *  For example, if 4 external characters always converted to 1 internal
-       *  character, and input to in() had 6 external characters with state
-       *  saved, this function would write two characters to the output and
-       *  set the state to initialized conditions.
-       *
-       *  The source and destination character sets are determined by the
-       *  facet's locale, internal and external types.
-       *
-       *  The result returned is a member of codecvt_base::result.  If the
-       *  state could be reset and data written, returns codecvt_base::ok.  If
-       *  no conversion is necessary, returns codecvt_base::noconv.  If the
-       *  output has insufficient space, returns codecvt_base::partial.
-       *  Otherwise the reset failed and codecvt_base::error is returned.
-       *
-       *  @param  state  Persistent conversion state data.
-       *  @param  to  Start of output buffer.
-       *  @param  to_end  End of output buffer.
-       *  @param  to_next  Returns start of unused output area.
-       *  @return  codecvt_base::result.
-      */
-      result
-      unshift(state_type& __state, extern_type* __to, extern_type* __to_end,
-	      extern_type*& __to_next) const
-      { return this->do_unshift(__state, __to,__to_end,__to_next); }
-
-      /**
-       *  @brief  Convert from external to internal character set.
-       *
-       *  Converts input string of extern_type to output string of
-       *  intern_type.  This is analogous to mbsrtowcs.  It does this by
-       *  calling codecvt::do_in.
-       *
-       *  The source and destination character sets are determined by the
-       *  facet's locale, internal and external types.
-       *
-       *  The characters in [from,from_end) are converted and written to
-       *  [to,to_end).  from_next and to_next are set to point to the
-       *  character following the last successfully converted character,
-       *  respectively.  If the result needed no conversion, from_next and
-       *  to_next are not affected.
-       *
-       *  The @a state argument should be intialized if the input is at the
-       *  beginning and carried from a previous call if continuing
-       *  conversion.  There are no guarantees about how @a state is used.
-       *
-       *  The result returned is a member of codecvt_base::result.  If all the
-       *  input is converted, returns codecvt_base::ok.  If no conversion is
-       *  necessary, returns codecvt_base::noconv.  If the input ends early or
-       *  there is insufficient space in the output, returns codecvt_base::partial.
-       *  Otherwise the conversion failed and codecvt_base::error is returned.
-       *
-       *  @param  state  Persistent conversion state data.
-       *  @param  from  Start of input.
-       *  @param  from_end  End of input.
-       *  @param  from_next  Returns start of unconverted data.
-       *  @param  to  Start of output buffer.
-       *  @param  to_end  End of output buffer.
-       *  @param  to_next  Returns start of unused output area.
-       *  @return  codecvt_base::result.
-      */
-      result
-      in(state_type& __state, const extern_type* __from,
-	 const extern_type* __from_end, const extern_type*& __from_next,
-	 intern_type* __to, intern_type* __to_end,
-	 intern_type*& __to_next) const
-      {
-	return this->do_in(__state, __from, __from_end, __from_next,
-			   __to, __to_end, __to_next);
-      }
-
-      int
-      encoding() const throw()
-      { return this->do_encoding(); }
-
-      bool
-      always_noconv() const throw()
-      { return this->do_always_noconv(); }
-
-      int
-      length(state_type& __state, const extern_type* __from,
-	     const extern_type* __end, size_t __max) const
-      { return this->do_length(__state, __from, __end, __max); }
-
-      int
-      max_length() const throw()
-      { return this->do_max_length(); }
-
-    protected:
-      explicit
-      __codecvt_abstract_base(size_t __refs = 0) : locale::facet(__refs) { }
-
-      virtual
-      ~__codecvt_abstract_base() { }
-
-      /**
-       *  @brief  Convert from internal to external character set.
-       *
-       *  Converts input string of intern_type to output string of
-       *  extern_type.  This function is a hook for derived classes to change
-       *  the value returned.  @see out for more information.
-      */
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const = 0;
-
-      virtual result
-      do_unshift(state_type& __state, extern_type* __to,
-		 extern_type* __to_end, extern_type*& __to_next) const = 0;
-
-      virtual result
-      do_in(state_type& __state, const extern_type* __from,
-	    const extern_type* __from_end, const extern_type*& __from_next,
-	    intern_type* __to, intern_type* __to_end,
-	    intern_type*& __to_next) const = 0;
-
-      virtual int
-      do_encoding() const throw() = 0;
-
-      virtual bool
-      do_always_noconv() const throw() = 0;
-
-      virtual int
-      do_length(state_type&, const extern_type* __from,
-		const extern_type* __end, size_t __max) const = 0;
-
-      virtual int
-      do_max_length() const throw() = 0;
-    };
-
-  // 22.2.1.5 Template class codecvt
-  // NB: Generic, mostly useless implementation.
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    class codecvt
-    : public __codecvt_abstract_base<_InternT, _ExternT, _StateT>
-    {
-    public:
-      // Types:
-      typedef codecvt_base::result	result;
-      typedef _InternT			intern_type;
-      typedef _ExternT			extern_type;
-      typedef _StateT			state_type;
-
-    protected:
-      __c_locale			_M_c_locale_codecvt;
-
-    public:
-      static locale::id			id;
-
-      explicit
-      codecvt(size_t __refs = 0)
-      : __codecvt_abstract_base<_InternT, _ExternT, _StateT> (__refs) { }
-
-      explicit
-      codecvt(__c_locale __cloc, size_t __refs = 0);
-
-    protected:
-      virtual
-      ~codecvt() { }
-
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const;
-
-      virtual result
-      do_unshift(state_type& __state, extern_type* __to,
-		 extern_type* __to_end, extern_type*& __to_next) const;
-
-      virtual result
-      do_in(state_type& __state, const extern_type* __from,
-	    const extern_type* __from_end, const extern_type*& __from_next,
-	    intern_type* __to, intern_type* __to_end,
-	    intern_type*& __to_next) const;
-
-      virtual int
-      do_encoding() const throw();
-
-      virtual bool
-      do_always_noconv() const throw();
-
-      virtual int
-      do_length(state_type&, const extern_type* __from,
-		const extern_type* __end, size_t __max) const;
-
-      virtual int
-      do_max_length() const throw();
-    };
-
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    locale::id codecvt<_InternT, _ExternT, _StateT>::id;
-
-  // codecvt<char, char, mbstate_t> required specialization
-  template<>
-    class codecvt<char, char, mbstate_t>
-    : public __codecvt_abstract_base<char, char, mbstate_t>
-    {
-    public:
-      // Types:
-      typedef char			intern_type;
-      typedef char			extern_type;
-      typedef mbstate_t			state_type;
-
-    protected:
-      __c_locale			_M_c_locale_codecvt;
-
-    public:
-      static locale::id id;
-
-      explicit
-      codecvt(size_t __refs = 0);
-
-      explicit
-      codecvt(__c_locale __cloc, size_t __refs = 0);
-
-    protected:
-      virtual
-      ~codecvt();
-
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const;
-
-      virtual result
-      do_unshift(state_type& __state, extern_type* __to,
-		 extern_type* __to_end, extern_type*& __to_next) const;
-
-      virtual result
-      do_in(state_type& __state, const extern_type* __from,
-	    const extern_type* __from_end, const extern_type*& __from_next,
-	    intern_type* __to, intern_type* __to_end,
-	    intern_type*& __to_next) const;
-
-      virtual int
-      do_encoding() const throw();
-
-      virtual bool
-      do_always_noconv() const throw();
-
-      virtual int
-      do_length(state_type&, const extern_type* __from,
-		const extern_type* __end, size_t __max) const;
-
-      virtual int
-      do_max_length() const throw();
-  };
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  // codecvt<wchar_t, char, mbstate_t> required specialization
-  template<>
-    class codecvt<wchar_t, char, mbstate_t>
-    : public __codecvt_abstract_base<wchar_t, char, mbstate_t>
-    {
-    public:
-      // Types:
-      typedef wchar_t			intern_type;
-      typedef char			extern_type;
-      typedef mbstate_t			state_type;
-
-    protected:
-      __c_locale			_M_c_locale_codecvt;
-
-    public:
-      static locale::id			id;
-
-      explicit
-      codecvt(size_t __refs = 0);
-
-      explicit
-      codecvt(__c_locale __cloc, size_t __refs = 0);
-
-    protected:
-      virtual
-      ~codecvt();
-
-      virtual result
-      do_out(state_type& __state, const intern_type* __from,
-	     const intern_type* __from_end, const intern_type*& __from_next,
-	     extern_type* __to, extern_type* __to_end,
-	     extern_type*& __to_next) const;
-
-      virtual result
-      do_unshift(state_type& __state,
-		 extern_type* __to, extern_type* __to_end,
-		 extern_type*& __to_next) const;
-
-      virtual result
-      do_in(state_type& __state,
-	     const extern_type* __from, const extern_type* __from_end,
-	     const extern_type*& __from_next,
-	     intern_type* __to, intern_type* __to_end,
-	     intern_type*& __to_next) const;
-
-      virtual
-      int do_encoding() const throw();
-
-      virtual
-      bool do_always_noconv() const throw();
-
-      virtual
-      int do_length(state_type&, const extern_type* __from,
-		    const extern_type* __end, size_t __max) const;
-
-      virtual int
-      do_max_length() const throw();
-    };
-#endif //_GLIBCXX_USE_WCHAR_T
-
-  // 22.2.1.6  Template class codecvt_byname
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    class codecvt_byname : public codecvt<_InternT, _ExternT, _StateT>
-    {
-    public:
-      explicit
-      codecvt_byname(const char* __s, size_t __refs = 0)
-      : codecvt<_InternT, _ExternT, _StateT>(__refs)
-      {
-	if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-	  {
-	    this->_S_destroy_c_locale(this->_M_c_locale_codecvt);
-	    this->_S_create_c_locale(this->_M_c_locale_codecvt, __s);
-	  }
-      }
-
-    protected:
-      virtual
-      ~codecvt_byname() { }
-    };
-
-  // Include host and configuration specific partial specializations
-  // with additional functionality, if possible.
-#ifdef _GLIBCXX_USE_WCHAR_T
-  #include <bits/codecvt_specializations.h>
-#endif
-
-#endif // _CODECVT_H
diff --git a/include.new/c++/3.4/bits/codecvt_specializations.h b/include.new/c++/3.4/bits/codecvt_specializations.h
deleted file mode 100644
index 24db4c8..0000000
--- a/include.new/c++/3.4/bits/codecvt_specializations.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Locale support (codecvt) -*- C++ -*-
-
-// Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.2.1.5 Template class codecvt
-//
-
-// Warning: this file is not meant for user inclusion.  Use <locale>.
-
-// Written by Benjamin Kosnik <bkoz@cygnus.com>
-
-// XXX dummy file
diff --git a/include.new/c++/3.4/bits/concept_check.h b/include.new/c++/3.4/bits/concept_check.h
deleted file mode 100644
index 80c1439..0000000
--- a/include.new/c++/3.4/bits/concept_check.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Concept-checking control -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file concept_check.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _CONCEPT_CHECK_H
-#define _CONCEPT_CHECK_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-// All places in libstdc++-v3 where these are used, or /might/ be used, or
-// don't need to be used, or perhaps /should/ be used, are commented with
-// "concept requirements" (and maybe some more text).  So grep like crazy
-// if you're looking for additional places to use these.
-
-// Concept-checking code is off by default unless users turn it on via
-// configure options or editing c++config.h.
-
-#ifndef _GLIBCXX_CONCEPT_CHECKS
-
-#define __glibcxx_function_requires(...)
-#define __glibcxx_class_requires(_a,_b)
-#define __glibcxx_class_requires2(_a,_b,_c)
-#define __glibcxx_class_requires3(_a,_b,_c,_d)
-#define __glibcxx_class_requires4(_a,_b,_c,_d,_e)
-
-#else // the checks are on
-
-#include <bits/boost_concept_check.h>
-
-// Note that the obvious and elegant approach of
-//
-//#define glibcxx_function_requires(C) boost::function_requires< boost::C >()
-//
-// won't work due to concept templates with more than one parameter, e.g.,
-// BinaryPredicateConcept.  The preprocessor tries to split things up on
-// the commas in the template argument list.  We can't use an inner pair of
-// parenthesis to hide the commas, because "boost::(Temp<Foo,Bar>)" isn't
-// a valid instantiation pattern.  Thus, we steal a feature from C99.
-
-#define __glibcxx_function_requires(...)                                 \
-            __gnu_cxx::__function_requires< __gnu_cxx::__VA_ARGS__ >();
-#define __glibcxx_class_requires(_a,_C)                                  \
-            _GLIBCXX_CLASS_REQUIRES(_a, __gnu_cxx, _C);
-#define __glibcxx_class_requires2(_a,_b,_C)                              \
-            _GLIBCXX_CLASS_REQUIRES2(_a, _b, __gnu_cxx, _C);
-#define __glibcxx_class_requires3(_a,_b,_c,_C)                           \
-            _GLIBCXX_CLASS_REQUIRES3(_a, _b, _c, __gnu_cxx, _C);
-#define __glibcxx_class_requires4(_a,_b,_c,_d,_C)                        \
-            _GLIBCXX_CLASS_REQUIRES4(_a, _b, _c, _d, __gnu_cxx, _C);
-
-#endif // enable/disable
-
-#endif // _GLIBCXX_CONCEPT_CHECK
diff --git a/include.new/c++/3.4/bits/concurrence.h b/include.new/c++/3.4/bits/concurrence.h
deleted file mode 100644
index c436a1b..0000000
--- a/include.new/c++/3.4/bits/concurrence.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Support for concurrent programing -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _CONCURRENCE_H
-#define _CONCURRENCE_H 1
-
-// GCC's thread abstraction layer
-#include "bits/gthr.h"
-
-#if __GTHREADS
-
-# ifdef __GTHREAD_MUTEX_INIT
-#  define __glibcxx_mutex_type __gthread_mutex_t
-#  define __glibcxx_mutex_define_initialized(NAME) \
-__gthread_mutex_t NAME = __GTHREAD_MUTEX_INIT
-#  define __glibcxx_mutex_lock(NAME) \
-__gthread_mutex_lock(&NAME)
-# else
-// Implies __GTHREAD_MUTEX_INIT_FUNCTION
-struct __glibcxx_mutex : public __gthread_mutex_t
-{
-   __glibcxx_mutex() { __GTHREAD_MUTEX_INIT_FUNCTION(this); }
-};
-
-#  define __glibcxx_mutex_type __glibcxx_mutex
-#  define __glibcxx_mutex_define_initialized(NAME) \
-__glibcxx_mutex NAME
-# define __glibcxx_mutex_lock(NAME) \
-__gthread_mutex_lock(&NAME)
-# endif
-
-# define __glibcxx_mutex_unlock(NAME) __gthread_mutex_unlock(&NAME)
-
-#else
-
-# define __glibcxx_mutex_type __gthread_mutex_t
-# define __glibcxx_mutex_define_initialized(NAME) __gthread_mutex_t NAME
-# define __glibcxx_mutex_lock(NAME)
-# define __glibcxx_mutex_unlock(NAME)
-
-#endif
-
-namespace __gnu_cxx
-{
-  typedef __glibcxx_mutex_type mutex_type;
-  
-  // Scoped lock idiom.
-  // Acquire the mutex here with a constructor call, then release with
-  // the destructor call in accordance with RAII style.
-   class lock
-  {
-    // Externally defined and initialized.
-    mutex_type& device;
-
-  public:
-    explicit lock(mutex_type& name) : device(name)
-    { __glibcxx_mutex_lock(device); }
-
-    ~lock() throw()
-    { __glibcxx_mutex_unlock(device); }
-
-  private:
-    lock(const lock&);
-    lock& operator=(const lock&);
-  };
-}
-
-#endif
diff --git a/include.new/c++/3.4/bits/cpp_type_traits.h b/include.new/c++/3.4/bits/cpp_type_traits.h
deleted file mode 100644
index d4e4ea0..0000000
--- a/include.new/c++/3.4/bits/cpp_type_traits.h
+++ /dev/null
@@ -1,345 +0,0 @@
-// The  -*- C++ -*- type traits classes for internal use in libstdc++
-
-// Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
-
-/** @file cpp_type_traits.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _CPP_TYPE_TRAITS_H
-#define _CPP_TYPE_TRAITS_H 1
-
-#pragma GCC system_header
-
-//
-// This file provides some compile-time information about various types.
-// These representations were designed, on purpose, to be constant-expressions
-// and not types as found in <stl/bits/type_traits.h>.  In particular, they
-// can be used in control structures and the optimizer hopefully will do
-// the obvious thing.
-//
-// Why integral expressions, and not functions nor types?
-// Firstly, these compile-time entities are used as template-arguments
-// so function return values won't work:  We need compile-time entities.
-// We're left with types and constant  integral expressions.
-// Secondly, from the point of view of ease of use, type-based compile-time
-// information is -not- *that* convenient.  On has to write lots of
-// overloaded functions and to hope that the compiler will select the right
-// one. As a net effect, the overall structure isn't very clear at first
-// glance.
-// Thirdly, partial ordering and overload resolution (of function templates)
-// is highly costly in terms of compiler-resource.  It is a Good Thing to
-// keep these resource consumption as least as possible.
-//
-// See valarray_array.h for a case use.
-//
-// -- Gaby (dosreis@cmla.ens-cachan.fr) 2000-03-06.
-//
-
-// NB: g++ can not compile these if declared within the class
-// __is_pod itself.
-namespace __gnu_internal
-{
-  typedef char __one;
-  typedef char __two[2];
-
-  template <typename _Tp>
-  __one __test_type (int _Tp::*);
-  template <typename _Tp>
-  __two& __test_type (...);
-} // namespace __gnu_internal
-
-namespace std
-{
-  // Compare for equality of types.
-  template<typename, typename>
-    struct __are_same
-    {
-      enum
-	{
-	  _M_type = 0
-	};
-    };
-
-  template<typename _Tp>
-    struct __are_same<_Tp, _Tp>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  // Define a nested type if some predicate holds.
-  template<typename, bool>
-    struct __enable_if
-    {
-    };
-
-  template<typename _Tp>
-    struct __enable_if<_Tp, true>
-    {
-      typedef _Tp _M_type;
-    };
-
-  // Holds if the template-argument is a void type.
-  template<typename _Tp>
-    struct __is_void
-    {
-      enum
-	{
-	  _M_type = 0
-	};
-    };
-
-  template<>
-    struct __is_void<void>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  //
-  // Integer types
-  //
-  template<typename _Tp>
-    struct __is_integer
-    {
-      enum
-	{
-	  _M_type = 0
-	};
-    };
-
-  // Thirteen specializations (yes there are eleven standard integer
-  // types; 'long long' and 'unsigned long long' are supported as
-  // extensions)
-  template<>
-    struct __is_integer<bool>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<char>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<signed char>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<unsigned char>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-# ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    struct __is_integer<wchar_t>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-# endif
-
-  template<>
-    struct __is_integer<short>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<unsigned short>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<int>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<unsigned int>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<long>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<unsigned long>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<long long>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_integer<unsigned long long>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  //
-  // Floating point types
-  //
-  template<typename _Tp>
-    struct __is_floating
-    {
-      enum
-	{
-	  _M_type = 0
-	};
-    };
-
-  // three specializations (float, double and 'long double')
-  template<>
-    struct __is_floating<float>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_floating<double>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  template<>
-    struct __is_floating<long double>
-    {
-      enum
-	{
-	  _M_type = 1
-	};
-    };
-
-  //
-  // An arithmetic type is an integer type or a floating point type
-  //
-  template<typename _Tp>
-    struct __is_arithmetic
-    {
-      enum
-	{
-	  _M_type = __is_integer<_Tp>::_M_type || __is_floating<_Tp>::_M_type
-	};
-    };
-  
-  //
-  // A fundamental type is `void' or and arithmetic type
-  //
-  template<typename _Tp>
-    struct __is_fundamental
-    {
-      enum
-	{
-	  _M_type = __is_void<_Tp>::_M_type || __is_arithmetic<_Tp>::_M_type
-	};
-    };
-
-  //
-  // For the immediate use, the following is a good approximation
-  //
-  template<typename _Tp>
-    struct __is_pod
-    {
-      enum
-	{
-	  _M_type = (sizeof(__gnu_internal::__test_type<_Tp>(0))
-		     != sizeof(__gnu_internal::__one))
-	};
-    };
-
-} // namespace std
-
-#endif //_CPP_TYPE_TRAITS_H
diff --git a/include.new/c++/3.4/bits/ctype_base.h b/include.new/c++/3.4/bits/ctype_base.h
deleted file mode 100644
index f44a7c7..0000000
--- a/include.new/c++/3.4/bits/ctype_base.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2000, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-  
-// Information as gleaned from /usr/include/ctype.h on FreeBSD 3.4,
-// 4.0 and all versions of the CVS managed file at:
-// :pserver:anoncvs@anoncvs.freebsd.org:/home/ncvs/src/include/ctype.h
-  
-  struct ctype_base
-  {
-    // Non-standard typedefs.
-    typedef const int* 		__to_type;
-
-    // NB: Offsets into ctype<char>::_M_table force a particular size
-    // on the mask type. Because of this, we don't use an enum.
-    typedef unsigned long 	mask;
-#ifdef _CTYPE_S
-    // FreeBSD 4.0 uses this style of define.
-    static const mask upper    	= _CTYPE_U;
-    static const mask lower 	= _CTYPE_L;
-    static const mask alpha 	= _CTYPE_A;
-    static const mask digit 	= _CTYPE_D;
-    static const mask xdigit 	= _CTYPE_X;
-    static const mask space 	= _CTYPE_S;
-    static const mask print 	= _CTYPE_R;
-    static const mask graph 	= _CTYPE_A | _CTYPE_D | _CTYPE_P;
-    static const mask cntrl 	= _CTYPE_C;
-    static const mask punct 	= _CTYPE_P;
-    static const mask alnum 	= _CTYPE_A | _CTYPE_D;
-#else
-    // Older versions, including Free BSD 3.4, use this style of define.
-    static const mask upper    	= _U;
-    static const mask lower 	= _L;
-    static const mask alpha 	= _A;
-    static const mask digit 	= _D;
-    static const mask xdigit 	= _X;
-    static const mask space 	= _S;
-    static const mask print 	= _R;
-    static const mask graph 	= _A | _D | _P;
-    static const mask cntrl 	= _C;
-    static const mask punct 	= _P;
-    static const mask alnum 	= _A | _D;
-#endif
-  };
-
-
-
diff --git a/include.new/c++/3.4/bits/ctype_inline.h b/include.new/c++/3.4/bits/ctype_inline.h
deleted file mode 100644
index d69324a..0000000
--- a/include.new/c++/3.4/bits/ctype_inline.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2000, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-  
-// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
-// functions go in ctype.cc
-  
-  bool
-  ctype<char>::
-  is(mask __m, char __c) const
-  { 
-    if (_M_table)
-      return _M_table[static_cast<unsigned char>(__c)] & __m;
-    else
-      return __istype(__c, __m);
-  }
-
-  const char*
-  ctype<char>::
-  is(const char* __low, const char* __high, mask* __vec) const
-  {
-    if (_M_table)
-      while (__low < __high)
-	*__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
-    else
-      for (;__low < __high; ++__vec, ++__low)
-	{
-#if defined (_CTYPE_S) || defined (__istype)
-	  *__vec = __maskrune (*__low, upper | lower | alpha | digit | xdigit
-			       | space | print | graph | cntrl | punct | alnum);
-#else
-	  mask __m = 0;
-	  if (this->is(upper, *__low)) __m |= upper;
-	  if (this->is(lower, *__low)) __m |= lower;
-	  if (this->is(alpha, *__low)) __m |= alpha;
-	  if (this->is(digit, *__low)) __m |= digit;
-	  if (this->is(xdigit, *__low)) __m |= xdigit;
-	  if (this->is(space, *__low)) __m |= space;
-	  if (this->is(print, *__low)) __m |= print;
-	  if (this->is(graph, *__low)) __m |= graph;
-	  if (this->is(cntrl, *__low)) __m |= cntrl;
-	  if (this->is(punct, *__low)) __m |= punct;
-	  // Do not include explicit line for alnum mask since it is a
-	  // pure composite of masks on FreeBSD.
-	  *__vec = __m;
-#endif
-	}
-    return __high;
-  }
-
-  const char*
-  ctype<char>::
-  scan_is(mask __m, const char* __low, const char* __high) const
-  {
-    if (_M_table)
-      while (__low < __high
-	     && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
-	++__low;
-    else
-      while (__low < __high && !this->is(__m, *__low))
-	++__low;
-    return __low;
-  }
-
-  const char*
-  ctype<char>::
-  scan_not(mask __m, const char* __low, const char* __high) const
-  {
-    if (_M_table)
-      while (__low < __high
-	     && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
-	++__low;
-    else
-      while (__low < __high && this->is(__m, *__low) != 0)
-	++__low;
-    return __low;
-  }
diff --git a/include.new/c++/3.4/bits/ctype_noninline.h b/include.new/c++/3.4/bits/ctype_noninline.h
deleted file mode 100644
index ec5b575..0000000
--- a/include.new/c++/3.4/bits/ctype_noninline.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-  
-// Information as gleaned from /usr/include/ctype.h
-  
-  const ctype_base::mask*
-  ctype<char>::classic_table() throw()
-  { return 0; }
-
-  ctype<char>::ctype(__c_locale, const mask* __table, bool __del, 
-		     size_t __refs) 
-  : facet(__refs), _M_del(__table != 0 && __del), 
-  _M_toupper(NULL), _M_tolower(NULL), 
-  _M_table(__table ? __table : classic_table()) 
-  { 
-    memset(_M_widen, 0, sizeof(_M_widen));
-    _M_widen_ok = 0;
-    memset(_M_narrow, 0, sizeof(_M_narrow));
-    _M_narrow_ok = 0;
-  }
-
-  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
-  : facet(__refs), _M_del(__table != 0 && __del), 
-  _M_toupper(NULL), _M_tolower(NULL), 
-  _M_table(__table ? __table : classic_table()) 
-  { 
-    memset(_M_widen, 0, sizeof(_M_widen));
-    _M_widen_ok = 0;
-    memset(_M_narrow, 0, sizeof(_M_narrow));
-    _M_narrow_ok = 0;
-  }
-
-  char
-  ctype<char>::do_toupper(char __c) const
-  { return ::toupper((int) __c); }
-
-  const char*
-  ctype<char>::do_toupper(char* __low, const char* __high) const
-  {
-    while (__low < __high)
-      {
-	*__low = ::toupper((int) *__low);
-	++__low;
-      }
-    return __high;
-  }
-
-  char
-  ctype<char>::do_tolower(char __c) const
-  { return ::tolower((int) __c); }
-
-  const char* 
-  ctype<char>::do_tolower(char* __low, const char* __high) const
-  {
-    while (__low < __high)
-      {
-	*__low = ::tolower((int) *__low);
-	++__low;
-      }
-    return __high;
-  }
diff --git a/include.new/c++/3.4/bits/deque.tcc b/include.new/c++/3.4/bits/deque.tcc
deleted file mode 100644
index e8e0438..0000000
--- a/include.new/c++/3.4/bits/deque.tcc
+++ /dev/null
@@ -1,719 +0,0 @@
-// Deque implementation (out of line) -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file deque.tcc
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _DEQUE_TCC
-#define _DEQUE_TCC 1
-
-namespace _GLIBCXX_STD
-{
-  template <typename _Tp, typename _Alloc>
-    deque<_Tp,_Alloc>&
-    deque<_Tp,_Alloc>::
-    operator=(const deque& __x)
-    {
-      const size_type __len = size();
-      if (&__x != this)
-	{
-	  if (__len >= __x.size())
-	    erase(std::copy(__x.begin(), __x.end(), this->_M_impl._M_start),
-		  this->_M_impl._M_finish);
-	  else
-	    {
-	      const_iterator __mid = __x.begin() + difference_type(__len);
-	      std::copy(__x.begin(), __mid, this->_M_impl._M_start);
-	      insert(this->_M_impl._M_finish, __mid, __x.end());
-	    }
-	}
-      return *this;
-    }
-
-  template <typename _Tp, typename _Alloc>
-    typename deque<_Tp,_Alloc>::iterator
-    deque<_Tp,_Alloc>::
-    insert(iterator position, const value_type& __x)
-    {
-      if (position._M_cur == this->_M_impl._M_start._M_cur)
-	{
-	  push_front(__x);
-	  return this->_M_impl._M_start;
-	}
-      else if (position._M_cur == this->_M_impl._M_finish._M_cur)
-	{
-	  push_back(__x);
-	  iterator __tmp = this->_M_impl._M_finish;
-	  --__tmp;
-	  return __tmp;
-	}
-      else
-        return _M_insert_aux(position, __x);
-    }
-
-  template <typename _Tp, typename _Alloc>
-    typename deque<_Tp,_Alloc>::iterator
-    deque<_Tp,_Alloc>::
-    erase(iterator __position)
-    {
-      iterator __next = __position;
-      ++__next;
-      size_type __index = __position - this->_M_impl._M_start;
-      if (__index < (size() >> 1))
-	{
-	  std::copy_backward(this->_M_impl._M_start, __position, __next);
-	  pop_front();
-	}
-      else
-	{
-	  std::copy(__next, this->_M_impl._M_finish, __position);
-	  pop_back();
-	}
-      return this->_M_impl._M_start + __index;
-    }
-
-  template <typename _Tp, typename _Alloc>
-    typename deque<_Tp,_Alloc>::iterator
-    deque<_Tp,_Alloc>::
-    erase(iterator __first, iterator __last)
-    {
-      if (__first == this->_M_impl._M_start && __last == this->_M_impl._M_finish)
-	{
-	  clear();
-	  return this->_M_impl._M_finish;
-	}
-      else
-	{
-	  const difference_type __n = __last - __first;
-	  const difference_type __elems_before = __first - this->_M_impl._M_start;
-	  if (static_cast<size_type>(__elems_before) < (size() - __n) / 2)
-	    {
-	      std::copy_backward(this->_M_impl._M_start, __first, __last);
-	      iterator __new_start = this->_M_impl._M_start + __n;
-	      std::_Destroy(this->_M_impl._M_start, __new_start);
-	      _M_destroy_nodes(this->_M_impl._M_start._M_node, __new_start._M_node);
-	      this->_M_impl._M_start = __new_start;
-	    }
-	  else
-	    {
-	      std::copy(__last, this->_M_impl._M_finish, __first);
-	      iterator __new_finish = this->_M_impl._M_finish - __n;
-	      std::_Destroy(__new_finish, this->_M_impl._M_finish);
-	      _M_destroy_nodes(__new_finish._M_node + 1,
-			       this->_M_impl._M_finish._M_node + 1);
-	      this->_M_impl._M_finish = __new_finish;
-	    }
-	  return this->_M_impl._M_start + __elems_before;
-	}
-    }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp,_Alloc>::
-    clear()
-    {
-      for (_Map_pointer __node = this->_M_impl._M_start._M_node + 1;
-           __node < this->_M_impl._M_finish._M_node;
-           ++__node)
-	{
-	  std::_Destroy(*__node, *__node + _S_buffer_size());
-	  _M_deallocate_node(*__node);
-	}
-
-      if (this->_M_impl._M_start._M_node != this->_M_impl._M_finish._M_node)
-	{
-	  std::_Destroy(this->_M_impl._M_start._M_cur, this->_M_impl._M_start._M_last);
-	  std::_Destroy(this->_M_impl._M_finish._M_first, this->_M_impl._M_finish._M_cur);
-	  _M_deallocate_node(this->_M_impl._M_finish._M_first);
-	}
-      else
-        std::_Destroy(this->_M_impl._M_start._M_cur, this->_M_impl._M_finish._M_cur);
-
-      this->_M_impl._M_finish = this->_M_impl._M_start;
-    }
-
-  template <typename _Tp, class _Alloc>
-    template <typename _InputIterator>
-      void
-      deque<_Tp,_Alloc>
-      ::_M_assign_aux(_InputIterator __first, _InputIterator __last,
-		      input_iterator_tag)
-      {
-        iterator __cur = begin();
-        for ( ; __first != __last && __cur != end(); ++__cur, ++__first)
-          *__cur = *__first;
-        if (__first == __last)
-          erase(__cur, end());
-        else
-          insert(end(), __first, __last);
-      }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp,_Alloc>::
-    _M_fill_insert(iterator __pos, size_type __n, const value_type& __x)
-    {
-      if (__pos._M_cur == this->_M_impl._M_start._M_cur)
-	{
-	  iterator __new_start = _M_reserve_elements_at_front(__n);
-	  try
-	    {
-	      std::uninitialized_fill(__new_start, this->_M_impl._M_start, __x);
-	      this->_M_impl._M_start = __new_start;
-	    }
-	  catch(...)
-	    {
-	      _M_destroy_nodes(__new_start._M_node, this->_M_impl._M_start._M_node);
-	      __throw_exception_again;
-	    }
-	}
-      else if (__pos._M_cur == this->_M_impl._M_finish._M_cur)
-	{
-	  iterator __new_finish = _M_reserve_elements_at_back(__n);
-	  try
-	    {
-	      std::uninitialized_fill(this->_M_impl._M_finish, __new_finish, __x);
-	      this->_M_impl._M_finish = __new_finish;
-	    }
-	  catch(...)
-	    {
-	      _M_destroy_nodes(this->_M_impl._M_finish._M_node + 1,
-			       __new_finish._M_node + 1);
-	      __throw_exception_again;
-	    }
-	}
-      else
-        _M_insert_aux(__pos, __n, __x);
-    }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp,_Alloc>::
-    _M_fill_initialize(const value_type& __value)
-    {
-      _Map_pointer __cur;
-      try
-        {
-          for (__cur = this->_M_impl._M_start._M_node;
-	       __cur < this->_M_impl._M_finish._M_node;
-	       ++__cur)
-            std::uninitialized_fill(*__cur, *__cur + _S_buffer_size(), __value);
-          std::uninitialized_fill(this->_M_impl._M_finish._M_first,
-				  this->_M_impl._M_finish._M_cur,
-				  __value);
-        }
-      catch(...)
-        {
-          std::_Destroy(this->_M_impl._M_start, iterator(*__cur, __cur));
-          __throw_exception_again;
-        }
-    }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _InputIterator>
-      void
-      deque<_Tp,_Alloc>::
-      _M_range_initialize(_InputIterator __first, _InputIterator __last,
-                          input_iterator_tag)
-      {
-        this->_M_initialize_map(0);
-        try
-          {
-            for ( ; __first != __last; ++__first)
-              push_back(*__first);
-          }
-        catch(...)
-          {
-            clear();
-            __throw_exception_again;
-          }
-      }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _ForwardIterator>
-      void
-      deque<_Tp,_Alloc>::
-      _M_range_initialize(_ForwardIterator __first, _ForwardIterator __last,
-                          forward_iterator_tag)
-      {
-        const size_type __n = std::distance(__first, __last);
-        this->_M_initialize_map(__n);
-
-        _Map_pointer __cur_node;
-        try
-          {
-            for (__cur_node = this->_M_impl._M_start._M_node;
-                 __cur_node < this->_M_impl._M_finish._M_node;
-                 ++__cur_node)
-            {
-              _ForwardIterator __mid = __first;
-              std::advance(__mid, _S_buffer_size());
-              std::uninitialized_copy(__first, __mid, *__cur_node);
-              __first = __mid;
-            }
-            std::uninitialized_copy(__first, __last, this->_M_impl._M_finish._M_first);
-          }
-        catch(...)
-          {
-            std::_Destroy(this->_M_impl._M_start, iterator(*__cur_node, __cur_node));
-            __throw_exception_again;
-          }
-      }
-
-  // Called only if _M_impl._M_finish._M_cur == _M_impl._M_finish._M_last - 1.
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp,_Alloc>::
-    _M_push_back_aux(const value_type& __t)
-    {
-      value_type __t_copy = __t;
-      _M_reserve_map_at_back();
-      *(this->_M_impl._M_finish._M_node + 1) = this->_M_allocate_node();
-      try
-        {
-          std::_Construct(this->_M_impl._M_finish._M_cur, __t_copy);
-          this->_M_impl._M_finish._M_set_node(this->_M_impl._M_finish._M_node + 1);
-          this->_M_impl._M_finish._M_cur = this->_M_impl._M_finish._M_first;
-        }
-      catch(...)
-        {
-          _M_deallocate_node(*(this->_M_impl._M_finish._M_node + 1));
-          __throw_exception_again;
-        }
-    }
-
-  // Called only if _M_impl._M_start._M_cur == _M_impl._M_start._M_first.
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp,_Alloc>::
-    _M_push_front_aux(const value_type& __t)
-    {
-      value_type __t_copy = __t;
-      _M_reserve_map_at_front();
-      *(this->_M_impl._M_start._M_node - 1) = this->_M_allocate_node();
-      try
-        {
-          this->_M_impl._M_start._M_set_node(this->_M_impl._M_start._M_node - 1);
-          this->_M_impl._M_start._M_cur = this->_M_impl._M_start._M_last - 1;
-          std::_Construct(this->_M_impl._M_start._M_cur, __t_copy);
-        }
-      catch(...)
-        {
-          ++this->_M_impl._M_start;
-          _M_deallocate_node(*(this->_M_impl._M_start._M_node - 1));
-          __throw_exception_again;
-        }
-    }
-
-  // Called only if _M_impl._M_finish._M_cur == _M_impl._M_finish._M_first.
-  template <typename _Tp, typename _Alloc>
-    void deque<_Tp,_Alloc>::
-    _M_pop_back_aux()
-    {
-      _M_deallocate_node(this->_M_impl._M_finish._M_first);
-      this->_M_impl._M_finish._M_set_node(this->_M_impl._M_finish._M_node - 1);
-      this->_M_impl._M_finish._M_cur = this->_M_impl._M_finish._M_last - 1;
-      std::_Destroy(this->_M_impl._M_finish._M_cur);
-    }
-
-  // Called only if _M_impl._M_start._M_cur == _M_impl._M_start._M_last - 1.  Note that
-  // if the deque has at least one element (a precondition for this member
-  // function), and if _M_impl._M_start._M_cur == _M_impl._M_start._M_last, then the deque
-  // must have at least two nodes.
-  template <typename _Tp, typename _Alloc>
-    void deque<_Tp,_Alloc>::
-    _M_pop_front_aux()
-    {
-      std::_Destroy(this->_M_impl._M_start._M_cur);
-      _M_deallocate_node(this->_M_impl._M_start._M_first);
-      this->_M_impl._M_start._M_set_node(this->_M_impl._M_start._M_node + 1);
-      this->_M_impl._M_start._M_cur = this->_M_impl._M_start._M_first;
-    }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _InputIterator>
-      void
-      deque<_Tp,_Alloc>::
-      _M_range_insert_aux(iterator __pos,
-                          _InputIterator __first, _InputIterator __last,
-                          input_iterator_tag)
-      { std::copy(__first, __last, std::inserter(*this, __pos)); }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _ForwardIterator>
-      void
-      deque<_Tp,_Alloc>::
-      _M_range_insert_aux(iterator __pos,
-                          _ForwardIterator __first, _ForwardIterator __last,
-                          forward_iterator_tag)
-      {
-        size_type __n = std::distance(__first, __last);
-        if (__pos._M_cur == this->_M_impl._M_start._M_cur)
-	  {
-	    iterator __new_start = _M_reserve_elements_at_front(__n);
-	    try
-	      {
-		std::uninitialized_copy(__first, __last, __new_start);
-		this->_M_impl._M_start = __new_start;
-	      }
-	    catch(...)
-	      {
-		_M_destroy_nodes(__new_start._M_node, this->_M_impl._M_start._M_node);
-		__throw_exception_again;
-	      }
-	  }
-        else if (__pos._M_cur == this->_M_impl._M_finish._M_cur)
-	  {
-	    iterator __new_finish = _M_reserve_elements_at_back(__n);
-	    try
-	      {
-		std::uninitialized_copy(__first, __last, this->_M_impl._M_finish);
-		this->_M_impl._M_finish = __new_finish;
-	      }
-	    catch(...)
-	      {
-		_M_destroy_nodes(this->_M_impl._M_finish._M_node + 1,
-				 __new_finish._M_node + 1);
-		__throw_exception_again;
-	      }
-	  }
-        else
-          _M_insert_aux(__pos, __first, __last, __n);
-      }
-
-  template <typename _Tp, typename _Alloc>
-    typename deque<_Tp, _Alloc>::iterator
-    deque<_Tp,_Alloc>::
-    _M_insert_aux(iterator __pos, const value_type& __x)
-    {
-      difference_type __index = __pos - this->_M_impl._M_start;
-      value_type __x_copy = __x; // XXX copy
-      if (static_cast<size_type>(__index) < size() / 2)
-	{
-	  push_front(front());
-	  iterator __front1 = this->_M_impl._M_start;
-	  ++__front1;
-	  iterator __front2 = __front1;
-	  ++__front2;
-	  __pos = this->_M_impl._M_start + __index;
-	  iterator __pos1 = __pos;
-	  ++__pos1;
-	  std::copy(__front2, __pos1, __front1);
-	}
-      else
-	{
-	  push_back(back());
-	  iterator __back1 = this->_M_impl._M_finish;
-	  --__back1;
-	  iterator __back2 = __back1;
-	  --__back2;
-	  __pos = this->_M_impl._M_start + __index;
-	  std::copy_backward(__pos, __back2, __back1);
-	}
-      *__pos = __x_copy;
-      return __pos;
-    }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp,_Alloc>::
-    _M_insert_aux(iterator __pos, size_type __n, const value_type& __x)
-    {
-      const difference_type __elems_before = __pos - this->_M_impl._M_start;
-      size_type __length = this->size();
-      value_type __x_copy = __x;
-      if (__elems_before < difference_type(__length / 2))
-	{
-	  iterator __new_start = _M_reserve_elements_at_front(__n);
-	  iterator __old_start = this->_M_impl._M_start;
-	  __pos = this->_M_impl._M_start + __elems_before;
-	  try
-	    {
-	      if (__elems_before >= difference_type(__n))
-		{
-		  iterator __start_n = this->_M_impl._M_start + difference_type(__n);
-		  std::uninitialized_copy(this->_M_impl._M_start, __start_n,
-					  __new_start);
-		  this->_M_impl._M_start = __new_start;
-		  std::copy(__start_n, __pos, __old_start);
-		  fill(__pos - difference_type(__n), __pos, __x_copy);
-		}
-	      else
-		{
-		  std::__uninitialized_copy_fill(this->_M_impl._M_start, __pos,
-						 __new_start,
-						 this->_M_impl._M_start, __x_copy);
-		  this->_M_impl._M_start = __new_start;
-		  std::fill(__old_start, __pos, __x_copy);
-		}
-	    }
-	  catch(...)
-	    {
-	      _M_destroy_nodes(__new_start._M_node, this->_M_impl._M_start._M_node);
-	      __throw_exception_again;
-	    }
-	}
-      else
-	{
-	  iterator __new_finish = _M_reserve_elements_at_back(__n);
-	  iterator __old_finish = this->_M_impl._M_finish;
-	  const difference_type __elems_after =
-	    difference_type(__length) - __elems_before;
-	  __pos = this->_M_impl._M_finish - __elems_after;
-	  try
-	    {
-	      if (__elems_after > difference_type(__n))
-		{
-		  iterator __finish_n = this->_M_impl._M_finish - difference_type(__n);
-		  std::uninitialized_copy(__finish_n, this->_M_impl._M_finish,
-					  this->_M_impl._M_finish);
-		  this->_M_impl._M_finish = __new_finish;
-		  std::copy_backward(__pos, __finish_n, __old_finish);
-		  std::fill(__pos, __pos + difference_type(__n), __x_copy);
-		}
-	      else
-		{
-		  std::__uninitialized_fill_copy(this->_M_impl._M_finish,
-						 __pos + difference_type(__n),
-						 __x_copy, __pos,
-						 this->_M_impl._M_finish);
-		  this->_M_impl._M_finish = __new_finish;
-		  std::fill(__pos, __old_finish, __x_copy);
-		}
-	    }
-	  catch(...)
-	    {
-	      _M_destroy_nodes(this->_M_impl._M_finish._M_node + 1,
-			       __new_finish._M_node + 1);
-	      __throw_exception_again;
-	    }
-	}
-    }
-
-  template <typename _Tp, typename _Alloc>
-    template <typename _ForwardIterator>
-      void
-      deque<_Tp,_Alloc>::
-      _M_insert_aux(iterator __pos,
-                    _ForwardIterator __first, _ForwardIterator __last,
-                    size_type __n)
-      {
-        const difference_type __elemsbefore = __pos - this->_M_impl._M_start;
-        size_type __length = size();
-        if (static_cast<size_type>(__elemsbefore) < __length / 2)
-	  {
-	    iterator __new_start = _M_reserve_elements_at_front(__n);
-	    iterator __old_start = this->_M_impl._M_start;
-	    __pos = this->_M_impl._M_start + __elemsbefore;
-	    try
-	      {
-		if (__elemsbefore >= difference_type(__n))
-		  {
-		    iterator __start_n = this->_M_impl._M_start + difference_type(__n);
-		    std::uninitialized_copy(this->_M_impl._M_start, __start_n,
-					    __new_start);
-		    this->_M_impl._M_start = __new_start;
-		    std::copy(__start_n, __pos, __old_start);
-		    std::copy(__first, __last, __pos - difference_type(__n));
-		  }
-		else
-		  {
-		    _ForwardIterator __mid = __first;
-		    std::advance(__mid, difference_type(__n) - __elemsbefore);
-		    std::__uninitialized_copy_copy(this->_M_impl._M_start, __pos,
-						   __first, __mid, __new_start);
-		    this->_M_impl._M_start = __new_start;
-		    std::copy(__mid, __last, __old_start);
-		  }
-	      }
-	    catch(...)
-	      {
-		_M_destroy_nodes(__new_start._M_node, this->_M_impl._M_start._M_node);
-		__throw_exception_again;
-	      }
-	  }
-        else
-        {
-          iterator __new_finish = _M_reserve_elements_at_back(__n);
-          iterator __old_finish = this->_M_impl._M_finish;
-          const difference_type __elemsafter =
-            difference_type(__length) - __elemsbefore;
-          __pos = this->_M_impl._M_finish - __elemsafter;
-          try
-            {
-              if (__elemsafter > difference_type(__n))
-		{
-		  iterator __finish_n = this->_M_impl._M_finish - difference_type(__n);
-		  std::uninitialized_copy(__finish_n,
-					  this->_M_impl._M_finish,
-					  this->_M_impl._M_finish);
-		  this->_M_impl._M_finish = __new_finish;
-		  std::copy_backward(__pos, __finish_n, __old_finish);
-		  std::copy(__first, __last, __pos);
-		}
-              else
-		{
-		  _ForwardIterator __mid = __first;
-		  std::advance(__mid, __elemsafter);
-		  std::__uninitialized_copy_copy(__mid, __last, __pos,
-						 this->_M_impl._M_finish,
-						 this->_M_impl._M_finish);
-		  this->_M_impl._M_finish = __new_finish;
-		  std::copy(__first, __mid, __pos);
-		}
-            }
-          catch(...)
-            {
-              _M_destroy_nodes(this->_M_impl._M_finish._M_node + 1,
-			       __new_finish._M_node + 1);
-              __throw_exception_again;
-            }
-        }
-      }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp,_Alloc>::
-    _M_new_elements_at_front(size_type __new_elems)
-    {
-      size_type __new_nodes
-	= (__new_elems + _S_buffer_size() - 1) / _S_buffer_size();
-      _M_reserve_map_at_front(__new_nodes);
-      size_type __i;
-      try
-        {
-          for (__i = 1; __i <= __new_nodes; ++__i)
-            *(this->_M_impl._M_start._M_node - __i) = this->_M_allocate_node();
-        }
-      catch(...)
-        {
-          for (size_type __j = 1; __j < __i; ++__j)
-            _M_deallocate_node(*(this->_M_impl._M_start._M_node - __j));
-          __throw_exception_again;
-        }
-    }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp,_Alloc>::
-    _M_new_elements_at_back(size_type __new_elems)
-    {
-      size_type __new_nodes
-          = (__new_elems + _S_buffer_size() - 1) / _S_buffer_size();
-      _M_reserve_map_at_back(__new_nodes);
-      size_type __i;
-      try
-        {
-          for (__i = 1; __i <= __new_nodes; ++__i)
-            *(this->_M_impl._M_finish._M_node + __i) = this->_M_allocate_node();
-        }
-      catch(...)
-        {
-          for (size_type __j = 1; __j < __i; ++__j)
-            _M_deallocate_node(*(this->_M_impl._M_finish._M_node + __j));
-          __throw_exception_again;
-        }
-    }
-
-  template <typename _Tp, typename _Alloc>
-    void
-    deque<_Tp,_Alloc>::
-    _M_reallocate_map(size_type __nodes_to_add, bool __add_at_front)
-    {
-      size_type __old_num_nodes
-	= this->_M_impl._M_finish._M_node - this->_M_impl._M_start._M_node + 1;
-      size_type __new_num_nodes = __old_num_nodes + __nodes_to_add;
-
-      _Map_pointer __new_nstart;
-      if (this->_M_impl._M_map_size > 2 * __new_num_nodes)
-	{
-	  __new_nstart = this->_M_impl._M_map + (this->_M_impl._M_map_size
-					 - __new_num_nodes) / 2
-	                 + (__add_at_front ? __nodes_to_add : 0);
-	  if (__new_nstart < this->_M_impl._M_start._M_node)
-	    std::copy(this->_M_impl._M_start._M_node,
-		    this->_M_impl._M_finish._M_node + 1,
-		    __new_nstart);
-	  else
-	    std::copy_backward(this->_M_impl._M_start._M_node,
-			       this->_M_impl._M_finish._M_node + 1,
-			       __new_nstart + __old_num_nodes);
-	}
-      else
-	{
-	  size_type __new_map_size = this->_M_impl._M_map_size
-	                             + std::max(this->_M_impl._M_map_size,
-						__nodes_to_add) + 2;
-
-	  _Map_pointer __new_map = this->_M_allocate_map(__new_map_size);
-	  __new_nstart = __new_map + (__new_map_size - __new_num_nodes) / 2
-	                 + (__add_at_front ? __nodes_to_add : 0);
-	  std::copy(this->_M_impl._M_start._M_node,
-		    this->_M_impl._M_finish._M_node + 1,
-		    __new_nstart);
-	  _M_deallocate_map(this->_M_impl._M_map, this->_M_impl._M_map_size);
-
-	  this->_M_impl._M_map = __new_map;
-	  this->_M_impl._M_map_size = __new_map_size;
-	}
-
-      this->_M_impl._M_start._M_set_node(__new_nstart);
-      this->_M_impl._M_finish._M_set_node(__new_nstart + __old_num_nodes - 1);
-    }
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/fstream.tcc b/include.new/c++/3.4/bits/fstream.tcc
deleted file mode 100644
index 3b433ea..0000000
--- a/include.new/c++/3.4/bits/fstream.tcc
+++ /dev/null
@@ -1,892 +0,0 @@
-// File based streams -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.8  File-based streams
-//
-
-#ifndef _FSTREAM_TCC
-#define _FSTREAM_TCC 1
-
-#pragma GCC system_header
-
-namespace std
-{
-  template<typename _CharT, typename _Traits>
-    void
-    basic_filebuf<_CharT, _Traits>::
-    _M_allocate_internal_buffer()
-    {
-      // Allocate internal buffer only if one doesn't already exist
-      // (either allocated or provided by the user via setbuf).
-      if (!_M_buf_allocated && !this->_M_buf)
-	{
-	  this->_M_buf = new char_type[this->_M_buf_size];
-	  _M_buf_allocated = true;
-	}
-    }
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_filebuf<_CharT, _Traits>::
-    _M_destroy_internal_buffer() throw()
-    {
-      if (_M_buf_allocated)
-	{
-	  delete [] this->_M_buf;
-	  this->_M_buf = NULL;
-	  _M_buf_allocated = false;
-	}
-      delete [] _M_ext_buf;
-      _M_ext_buf = NULL;
-      _M_ext_buf_size = 0;
-      _M_ext_next = NULL;
-      _M_ext_end = NULL;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_filebuf<_CharT, _Traits>::
-    basic_filebuf() : __streambuf_type(), _M_lock(), _M_file(&_M_lock),
-    _M_mode(ios_base::openmode(0)), _M_state_beg(), _M_state_cur(),
-    _M_state_last(), _M_buf(NULL), _M_buf_size(BUFSIZ),
-    _M_buf_allocated(false), _M_reading(false), _M_writing(false), _M_pback(), 
-    _M_pback_cur_save(0), _M_pback_end_save(0), _M_pback_init(false),
-    _M_codecvt(0), _M_ext_buf(0), _M_ext_buf_size(0), _M_ext_next(0),
-    _M_ext_end(0)
-    {
-      if (has_facet<__codecvt_type>(this->_M_buf_locale))
-	_M_codecvt = &use_facet<__codecvt_type>(this->_M_buf_locale);
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::__filebuf_type*
-    basic_filebuf<_CharT, _Traits>::
-    open(const char* __s, ios_base::openmode __mode)
-    {
-      __filebuf_type *__ret = NULL;
-      if (!this->is_open())
-	{
-	  _M_file.open(__s, __mode);
-	  if (this->is_open())
-	    {
-	      _M_allocate_internal_buffer();
-	      this->_M_mode = __mode;
-
-	      // Setup initial buffer to 'uncommitted' mode.
-	      _M_reading = false;
-	      _M_writing = false;
-	      _M_set_buffer(-1);
-
-	      // Reset to initial state.
-	      _M_state_last = _M_state_cur = _M_state_beg;
-
-	      // 27.8.1.3,4
-	      if ((__mode & ios_base::ate)
-		  && this->seekoff(0, ios_base::end, __mode)
-		  == pos_type(off_type(-1)))
-		this->close();
-	      else
-		__ret = this;
-	    }
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::__filebuf_type*
-    basic_filebuf<_CharT, _Traits>::
-    close() throw()
-    {
-      __filebuf_type* __ret = NULL;
-      if (this->is_open())
-	{
-	  bool __testfail = false;
-	  try
-	    {
-	      if (!_M_terminate_output())
-		__testfail = true;
-	    }
-	  catch(...)
-	    { __testfail = true; }
-
-	  // NB: Do this here so that re-opened filebufs will be cool...
-	  this->_M_mode = ios_base::openmode(0);
-	  this->_M_pback_init = false;
-	  _M_destroy_internal_buffer();
-	  _M_reading = false;
-	  _M_writing = false;
-	  _M_set_buffer(-1);
-	  _M_state_last = _M_state_cur = _M_state_beg;
-
-	  if (!_M_file.close())
-	    __testfail = true;
-
-	  if (!__testfail)
-	    __ret = this;
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_filebuf<_CharT, _Traits>::
-    showmanyc()
-    {
-      streamsize __ret = -1;
-      const bool __testin = this->_M_mode & ios_base::in;
-      if (__testin && this->is_open())
-	{
-	  // For a stateful encoding (-1) the pending sequence might be just
-	  // shift and unshift prefixes with no actual character.
-	  __ret = this->egptr() - this->gptr();
-	  if (__check_facet(_M_codecvt).encoding() >= 0)
-	    __ret += _M_file.showmanyc() / _M_codecvt->max_length();
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::int_type
-    basic_filebuf<_CharT, _Traits>::
-    underflow()
-    {
-      int_type __ret = traits_type::eof();
-      const bool __testin = this->_M_mode & ios_base::in;
-      if (__testin && !_M_writing)
-	{
-	  // Check for pback madness, and if so swich back to the
-	  // normal buffers and jet outta here before expensive
-	  // fileops happen...
-	  _M_destroy_pback();
-
-	  if (this->gptr() < this->egptr())
-	    return traits_type::to_int_type(*this->gptr());
-
-	  // Get and convert input sequence.
-	  const size_t __buflen = this->_M_buf_size > 1
-	                          ? this->_M_buf_size - 1 : 1;
-
-	  // Will be set to true if ::read() returns 0 indicating EOF.
-	  bool __got_eof = false;
-	  // Number of internal characters produced.
-	  streamsize __ilen = 0;
-	  codecvt_base::result __r = codecvt_base::ok;
-	  if (__check_facet(_M_codecvt).always_noconv())
-	    {
-	      __ilen = _M_file.xsgetn(reinterpret_cast<char*>(this->eback()),
-				      __buflen);
-	      if (__ilen == 0)
-		__got_eof = true;
-	    }
-	  else
-	    {
-              // Worst-case number of external bytes.
-	      // XXX Not done encoding() == -1.
-	      const int __enc = _M_codecvt->encoding();
-	      streamsize __blen; // Minimum buffer size.
-	      streamsize __rlen; // Number of chars to read.
-	      if (__enc > 0)
-		__blen = __rlen = __buflen * __enc;
-	      else
-		{
-		  __blen = __buflen + _M_codecvt->max_length() - 1;
-		  __rlen = __buflen;
-		}
-	      const streamsize __remainder = _M_ext_end - _M_ext_next;
-	      __rlen = __rlen > __remainder ? __rlen - __remainder : 0;
-
-	      // An imbue in 'read' mode implies first converting the external
-	      // chars already present.
-	      if (_M_reading && this->egptr() == this->eback() && __remainder)
-		__rlen = 0;
-
-	      // Allocate buffer if necessary and move unconverted
-	      // bytes to front.
-	      if (_M_ext_buf_size < __blen)
-		{
-		  char* __buf = new char[__blen];
-		  if (__remainder)
-		    std::memcpy(__buf, _M_ext_next, __remainder);
-
-		  delete [] _M_ext_buf;
-		  _M_ext_buf = __buf;
-		  _M_ext_buf_size = __blen;
-		}
-	      else if (__remainder)
-		std::memmove(_M_ext_buf, _M_ext_next, __remainder);
-
-	      _M_ext_next = _M_ext_buf;
-	      _M_ext_end = _M_ext_buf + __remainder;
-	      _M_state_last = _M_state_cur;
-
-	      do
-		{
-		  if (__rlen > 0)
-		    {
-		      // Sanity check!
-		      // This may fail if the return value of
-		      // codecvt::max_length() is bogus.
-		      if (_M_ext_end - _M_ext_buf + __rlen > _M_ext_buf_size)
-			{
-			  __throw_ios_failure(__N("basic_filebuf::underflow "
-					      "codecvt::max_length() "
-					      "is not valid"));
-			}
-		      streamsize __elen = _M_file.xsgetn(_M_ext_end, __rlen);
-		      if (__elen == 0)
-			__got_eof = true;
-		      else if (__elen == -1)
-			break;
-		      _M_ext_end += __elen;
-		    }
-
-		  char_type* __iend;
-		  __r = _M_codecvt->in(_M_state_cur, _M_ext_next,
-				       _M_ext_end, _M_ext_next, this->eback(),
-				       this->eback() + __buflen, __iend);
-		  if (__r == codecvt_base::noconv)
-		    {
-		      size_t __avail = _M_ext_end - _M_ext_buf;
-		      __ilen = std::min(__avail, __buflen);
-		      traits_type::copy(this->eback(),
-					reinterpret_cast<char_type*>(_M_ext_buf), __ilen);
-		      _M_ext_next = _M_ext_buf + __ilen;
-		    }
-		  else
-		    __ilen = __iend - this->eback();
-
-		  // _M_codecvt->in may return error while __ilen > 0: this is
-		  // ok, and actually occurs in case of mixed encodings (e.g.,
-		  // XML files).
-		  if (__r == codecvt_base::error)
-		    break;
-
-		  __rlen = 1;
-		}
-	      while (__ilen == 0 && !__got_eof);
-	    }
-
-	  if (__ilen > 0)
-	    {
-	      _M_set_buffer(__ilen);
-	      _M_reading = true;
-	      __ret = traits_type::to_int_type(*this->gptr());
-	    }
-	  else if (__got_eof)
-	    {
-	      // If the actual end of file is reached, set 'uncommitted'
-	      // mode, thus allowing an immediate write without an
-	      // intervening seek.
-	      _M_set_buffer(-1);
-	      _M_reading = false;
-	      // However, reaching it while looping on partial means that
-	      // the file has got an incomplete character.
-	      if (__r == codecvt_base::partial)
-		__throw_ios_failure(__N("basic_filebuf::underflow "
-				    "incomplete character in file"));
-	    }
-	  else if (__r == codecvt_base::error)
-	    __throw_ios_failure(__N("basic_filebuf::underflow "
-				"invalid byte sequence in file"));
-	  else
-	    __throw_ios_failure(__N("basic_filebuf::underflow "
-				"error reading the file"));
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::int_type
-    basic_filebuf<_CharT, _Traits>::
-    pbackfail(int_type __i)
-    {
-      int_type __ret = traits_type::eof();
-      const bool __testin = this->_M_mode & ios_base::in;
-      if (__testin && !_M_writing)
-	{
-	  // Remember whether the pback buffer is active, otherwise below
-	  // we may try to store in it a second char (libstdc++/9761).
-	  const bool __testpb = this->_M_pback_init;
-	  const bool __testeof = traits_type::eq_int_type(__i, __ret);
-	  int_type __tmp;
-	  if (this->eback() < this->gptr())
-	    {
-	      this->gbump(-1);
-	      __tmp = traits_type::to_int_type(*this->gptr());
-	    }
-	  else if (this->seekoff(-1, ios_base::cur) != pos_type(off_type(-1)))
-	    {
-	      __tmp = this->underflow();
-	      if (traits_type::eq_int_type(__tmp, __ret))
-		return __ret;
-	    }
-	  else
-	    {
-	      // At the beginning of the buffer, need to make a
-	      // putback position available.  But the seek may fail
-	      // (f.i., at the beginning of a file, see
-	      // libstdc++/9439) and in that case we return
-	      // traits_type::eof().
-	      return __ret;
-	    }
-
-	  // Try to put back __i into input sequence in one of three ways.
-	  // Order these tests done in is unspecified by the standard.
-	  if (!__testeof && traits_type::eq_int_type(__i, __tmp))
-	    __ret = __i;
-	  else if (__testeof)
-	    __ret = traits_type::not_eof(__i);
-	  else if (!__testpb)
-	    {
-	      _M_create_pback();
-	      _M_reading = true;
-	      *this->gptr() = traits_type::to_char_type(__i);
-	      __ret = __i;
-	    }
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::int_type
-    basic_filebuf<_CharT, _Traits>::
-    overflow(int_type __c)
-    {
-      int_type __ret = traits_type::eof();
-      const bool __testeof = traits_type::eq_int_type(__c, __ret);
-      const bool __testout = this->_M_mode & ios_base::out;
-      if (__testout && !_M_reading)
-	{
-	  if (this->pbase() < this->pptr())
-	    {
-	      // If appropriate, append the overflow char.
-	      if (!__testeof)
-		{
-		  *this->pptr() = traits_type::to_char_type(__c);
-		  this->pbump(1);
-		}
-
-	      // Convert pending sequence to external representation,
-	      // and output.
-	      if (_M_convert_to_external(this->pbase(),
-					 this->pptr() - this->pbase()))
-		{
-		  _M_set_buffer(0);
-		  __ret = traits_type::not_eof(__c);
-		}
-	    }
-	  else if (this->_M_buf_size > 1)
-	    {
-	      // Overflow in 'uncommitted' mode: set _M_writing, set
-	      // the buffer to the initial 'write' mode, and put __c
-	      // into the buffer.
-	      _M_set_buffer(0);
-	      _M_writing = true;
-	      if (!__testeof)
-		{
-		  *this->pptr() = traits_type::to_char_type(__c);
-		  this->pbump(1);
-		}
-	      __ret = traits_type::not_eof(__c);
-	    }
-	  else
-	    {
-	      // Unbuffered.
-	      char_type __conv = traits_type::to_char_type(__c);
-	      if (__testeof || _M_convert_to_external(&__conv, 1))
-		{
-		  _M_writing = true;
-		  __ret = traits_type::not_eof(__c);
-		}
-	    }
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    bool
-    basic_filebuf<_CharT, _Traits>::
-    _M_convert_to_external(_CharT* __ibuf, streamsize __ilen)
-    {
-      // Sizes of external and pending output.
-      streamsize __elen;
-      streamsize __plen;
-      if (__check_facet(_M_codecvt).always_noconv())
-	{
-	  __elen = _M_file.xsputn(reinterpret_cast<char*>(__ibuf), __ilen);
-	  __plen = __ilen;
-	}
-      else
-	{
-	  // Worst-case number of external bytes needed.
-	  // XXX Not done encoding() == -1.
-	  streamsize __blen = __ilen * _M_codecvt->max_length();
-	  char* __buf = static_cast<char*>(__builtin_alloca(__blen));
-
-	  char* __bend;
-	  const char_type* __iend;
-	  codecvt_base::result __r;
-	  __r = _M_codecvt->out(_M_state_cur, __ibuf, __ibuf + __ilen,
-				__iend, __buf, __buf + __blen, __bend);
-
-	  if (__r == codecvt_base::ok || __r == codecvt_base::partial)
-	    __blen = __bend - __buf;
-	  else if (__r == codecvt_base::noconv)
-	    {
-	      // Same as the always_noconv case above.
-	      __buf = reinterpret_cast<char*>(__ibuf);
-	      __blen = __ilen;
-	    }
-	  else
-	    __throw_ios_failure(__N("basic_filebuf::_M_convert_to_external "
-				    "conversion error"));
-  
-	  __elen = _M_file.xsputn(__buf, __blen);
-	  __plen = __blen;
-
-	  // Try once more for partial conversions.
-	  if (__r == codecvt_base::partial && __elen == __plen)
-	    {
-	      const char_type* __iresume = __iend;
-	      streamsize __rlen = this->pptr() - __iend;
-	      __r = _M_codecvt->out(_M_state_cur, __iresume,
-				    __iresume + __rlen, __iend, __buf,
-				    __buf + __blen, __bend);
-	      if (__r != codecvt_base::error)
-		{
-		  __rlen = __bend - __buf;
-		  __elen = _M_file.xsputn(__buf, __rlen);
-		  __plen = __rlen;
-		}
-	      else
-		__throw_ios_failure(__N("basic_filebuf::_M_convert_to_external "
-					"conversion error"));
-	    }
-	}
-      return __elen == __plen;
-    }
-
-   template<typename _CharT, typename _Traits>
-     streamsize
-     basic_filebuf<_CharT, _Traits>::
-     xsgetn(_CharT* __s, streamsize __n)
-     {
-       // Clear out pback buffer before going on to the real deal...
-       streamsize __ret = 0;
-       if (this->_M_pback_init)
-	 {
-	   if (__n > 0 && this->gptr() == this->eback())
-	     {
-	       *__s++ = *this->gptr();
-	       this->gbump(1);
-	       __ret = 1;
-	       --__n;
-	     }
-	   _M_destroy_pback();
-	 }
-       
-       // Optimization in the always_noconv() case, to be generalized in the
-       // future: when __n > __buflen we read directly instead of using the
-       // buffer repeatedly.
-       const bool __testin = this->_M_mode & ios_base::in;
-       const streamsize __buflen = this->_M_buf_size > 1 ? this->_M_buf_size - 1
-	                                                 : 1;
-       if (__n > __buflen && __check_facet(_M_codecvt).always_noconv()
-	   && __testin && !_M_writing)
-	 {
-	   // First, copy the chars already present in the buffer.
-	   const streamsize __avail = this->egptr() - this->gptr();
-	   if (__avail != 0)
-	     {
-	       if (__avail == 1)
-		 *__s = *this->gptr();
-	       else
-		 traits_type::copy(__s, this->gptr(), __avail);
-	       __s += __avail;
-	       this->gbump(__avail);
-	       __ret += __avail;
-	       __n -= __avail;
-	     }
-
-	   // Need to loop in case of short reads (relatively common
-	   // with pipes).
-	   streamsize __len;
-	   for (;;)
-	     {
-	       __len = _M_file.xsgetn(reinterpret_cast<char*>(__s),
-				      __n);
-	       if (__len == -1)
-		 __throw_ios_failure(__N("basic_filebuf::xsgetn "
-					 "error reading the file"));
-	       if (__len == 0)
-		 break;
-
-	       __n -= __len;
-	       __ret += __len;
-	       if (__n == 0)
-		 break;
-
-	       __s += __len;
-	     }
-
-	   if (__n == 0)
-	     {
-	       _M_set_buffer(0);
-	       _M_reading = true;
-	     }
-	   else if (__len == 0)
-	     {
-	       // If end of file is reached, set 'uncommitted'
-	       // mode, thus allowing an immediate write without
-	       // an intervening seek.
-	       _M_set_buffer(-1);
-	       _M_reading = false;
-	     }
-	 }
-       else
-	 __ret += __streambuf_type::xsgetn(__s, __n);
-
-       return __ret;
-     }
-
-   template<typename _CharT, typename _Traits>
-     streamsize
-     basic_filebuf<_CharT, _Traits>::
-     xsputn(const _CharT* __s, streamsize __n)
-     {
-       // Optimization in the always_noconv() case, to be generalized in the
-       // future: when __n is sufficiently large we write directly instead of
-       // using the buffer.
-       streamsize __ret = 0;
-       const bool __testout = this->_M_mode & ios_base::out;
-       if (__check_facet(_M_codecvt).always_noconv()
-	   && __testout && !_M_reading)
-	{
-	  // Measurement would reveal the best choice.
-	  const streamsize __chunk = 1ul << 10;
-	  streamsize __bufavail = this->epptr() - this->pptr();
-
-	  // Don't mistake 'uncommitted' mode buffered with unbuffered.
-	  if (!_M_writing && this->_M_buf_size > 1)
-	    __bufavail = this->_M_buf_size - 1;
-
-	  const streamsize __limit = std::min(__chunk, __bufavail);
-	  if (__n >= __limit)
-	    {
-	      const streamsize __buffill = this->pptr() - this->pbase();
-	      const char* __buf = reinterpret_cast<const char*>(this->pbase());
-	      __ret = _M_file.xsputn_2(__buf, __buffill,
-				       reinterpret_cast<const char*>(__s),
-				       __n);
-	      if (__ret == __buffill + __n)
-		{
-		  _M_set_buffer(0);
-		  _M_writing = true;
-		}
-	      if (__ret > __buffill)
-		__ret -= __buffill;
-	      else
-		__ret = 0;
-	    }
-	  else
-	    __ret = __streambuf_type::xsputn(__s, __n);
-	}
-       else
-	 __ret = __streambuf_type::xsputn(__s, __n);
-       return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::__streambuf_type*
-    basic_filebuf<_CharT, _Traits>::
-    setbuf(char_type* __s, streamsize __n)
-    {
-      if (!this->is_open())
-	if (__s == 0 && __n == 0)
-	  this->_M_buf_size = 1;
-	else if (__s && __n > 0)
-	  {
-	    // This is implementation-defined behavior, and assumes that
-	    // an external char_type array of length __n exists and has
-	    // been pre-allocated. If this is not the case, things will
-	    // quickly blow up. When __n > 1, __n - 1 positions will be
-	    // used for the get area, __n - 1 for the put area and 1
-	    // position to host the overflow char of a full put area.
-	    // When __n == 1, 1 position will be used for the get area
-	    // and 0 for the put area, as in the unbuffered case above.
-	    this->_M_buf = __s;
-	    this->_M_buf_size = __n;
-	  }
-      return this;
-    }
-
-
-  // According to 27.8.1.4 p11 - 13, seekoff should ignore the last
-  // argument (of type openmode).
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::pos_type
-    basic_filebuf<_CharT, _Traits>::
-    seekoff(off_type __off, ios_base::seekdir __way, ios_base::openmode)
-    {
-      int __width = 0;
-      if (_M_codecvt)
-	__width = _M_codecvt->encoding();
-      if (__width < 0)
-	__width = 0;
-
-      pos_type __ret =  pos_type(off_type(-1));
-      const bool __testfail = __off != 0 && __width <= 0;
-      if (this->is_open() && !__testfail)
-	{
-	  // Ditch any pback buffers to avoid confusion.
-	  _M_destroy_pback();
-
-	  // Correct state at destination. Note that this is the correct
-	  // state for the current position during output, because
-	  // codecvt::unshift() returns the state to the initial state.
-	  // This is also the correct state at the end of the file because
-	  // an unshift sequence should have been written at the end.
-	  __state_type __state = _M_state_beg;
-	  off_type __computed_off = __off * __width;
-	  if (_M_reading && __way == ios_base::cur)
-	    {
-	      if (_M_codecvt->always_noconv())
-		__computed_off += this->gptr() - this->egptr();
-	      else
-		{
-		  // Calculate offset from _M_ext_buf that corresponds
-		  // to gptr(). Note: uses _M_state_last, which
-		  // corresponds to eback().
-		  const int __gptr_off =
-		    _M_codecvt->length(_M_state_last, _M_ext_buf, _M_ext_next,
-				       this->gptr() - this->eback());
-		  __computed_off += _M_ext_buf + __gptr_off - _M_ext_end;
-
-		  // _M_state_last is modified by codecvt::length() so
-		  // it now corresponds to gptr().
-		  __state = _M_state_last;
-		}
-	    }
-	  __ret = _M_seek(__computed_off, __way, __state);
-	}
-      return __ret;
-    }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 171. Strange seekpos() semantics due to joint position
-  // According to the resolution of DR 171, seekpos should ignore the last
-  // argument (of type openmode).
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::pos_type
-    basic_filebuf<_CharT, _Traits>::
-    seekpos(pos_type __pos, ios_base::openmode)
-    {
-      pos_type __ret =  pos_type(off_type(-1));
-      if (this->is_open())
-	{
-	  // Ditch any pback buffers to avoid confusion.
-	  _M_destroy_pback();
-	  __ret = _M_seek(off_type(__pos), ios_base::beg, __pos.state());
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_filebuf<_CharT, _Traits>::pos_type
-    basic_filebuf<_CharT, _Traits>::
-    _M_seek(off_type __off, ios_base::seekdir __way, __state_type __state)
-    {
-      pos_type __ret = pos_type(off_type(-1));
-      if (_M_terminate_output())
-	{
-	  // Returns pos_type(off_type(-1)) in case of failure.
-	  __ret = pos_type(_M_file.seekoff(__off, __way));
-	  _M_reading = false;
-	  _M_writing = false;
-	  _M_ext_next = _M_ext_end = _M_ext_buf;
-	  _M_set_buffer(-1);
-	  _M_state_cur = __state;
-	  __ret.state(_M_state_cur);
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    bool
-    basic_filebuf<_CharT, _Traits>::
-    _M_terminate_output()
-    {
-      // Part one: update the output sequence.
-      bool __testvalid = true;
-      if (this->pbase() < this->pptr())
-	{
-	  const int_type __tmp = this->overflow();
-	  if (traits_type::eq_int_type(__tmp, traits_type::eof()))
-	    __testvalid = false;
-	}
-
-      // Part two: output unshift sequence.
-      if (_M_writing && !__check_facet(_M_codecvt).always_noconv()
-	  && __testvalid)
-	{
-	  // Note: this value is arbitrary, since there is no way to
-	  // get the length of the unshift sequence from codecvt,
-	  // without calling unshift.
-	  const size_t __blen = 128;
-	  char __buf[__blen];
-	  codecvt_base::result __r;
-	  streamsize __ilen = 0;
-
-	  do
-	    {
-	      char* __next;
-	      __r = _M_codecvt->unshift(_M_state_cur, __buf,
-					__buf + __blen, __next);
-	      if (__r == codecvt_base::error)
-		__testvalid = false;
-	      else if (__r == codecvt_base::ok ||
-		       __r == codecvt_base::partial)
-		{
-		  __ilen = __next - __buf;
-		  if (__ilen > 0)
-		    {
-		      const streamsize __elen = _M_file.xsputn(__buf, __ilen);
-		      if (__elen != __ilen)
-			__testvalid = false;
-		    }
-		}
-	    }
-	  while (__r == codecvt_base::partial && __ilen > 0 && __testvalid);
-
-	  if (__testvalid)
-	    {
-	      // This second call to overflow() is required by the standard,
-	      // but it's not clear why it's needed, since the output buffer
-	      // should be empty by this point (it should have been emptied
-	      // in the first call to overflow()).
-	      const int_type __tmp = this->overflow();
-	      if (traits_type::eq_int_type(__tmp, traits_type::eof()))
-		__testvalid = false;
-	    }
-	}
-      return __testvalid;
-    }
-
-  template<typename _CharT, typename _Traits>
-    int
-    basic_filebuf<_CharT, _Traits>::
-    sync()
-    {
-      // Make sure that the internal buffer resyncs its idea of
-      // the file position with the external file.
-      int __ret = 0;
-      if (this->pbase() < this->pptr())
-	{
-	  const int_type __tmp = this->overflow();
-	  if (traits_type::eq_int_type(__tmp, traits_type::eof()))
-	    __ret = -1;
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    void
-    basic_filebuf<_CharT, _Traits>::
-    imbue(const locale& __loc)
-    {
-      bool __testvalid = true;
-
-      const __codecvt_type* _M_codecvt_tmp = 0;
-      if (__builtin_expect(has_facet<__codecvt_type>(__loc), true))
-	_M_codecvt_tmp = &use_facet<__codecvt_type>(__loc);
-
-      if (this->is_open())
-	{
-	  // encoding() == -1 is ok only at the beginning.
-	  if ((_M_reading || _M_writing)
-	      && __check_facet(_M_codecvt).encoding() == -1)
-	    __testvalid = false;
-	  else
-	    {
-	      if (_M_reading)
-		{
-		  if (__check_facet(_M_codecvt).always_noconv())
-		    {
-		      if (_M_codecvt_tmp
-			  && !__check_facet(_M_codecvt_tmp).always_noconv())
-			__testvalid = this->seekoff(0, ios_base::cur, this->_M_mode)
-			              != pos_type(off_type(-1));
-		    }
-		  else
-		    {
-		      // External position corresponding to gptr().
-		      _M_ext_next = _M_ext_buf
-			+ _M_codecvt->length(_M_state_last, _M_ext_buf, _M_ext_next,
-					     this->gptr() - this->eback());
-		      const streamsize __remainder = _M_ext_end - _M_ext_next;
-		      if (__remainder)
-			std::memmove(_M_ext_buf, _M_ext_next, __remainder);
-
-		      _M_ext_next = _M_ext_buf;
-		      _M_ext_end = _M_ext_buf + __remainder;
-		      _M_set_buffer(-1);
-		      _M_state_last = _M_state_cur = _M_state_beg;
-		    }
-		}
-	      else if (_M_writing && (__testvalid = _M_terminate_output()))
-		_M_set_buffer(-1);
-	    }
-	}
-
-      if (__testvalid)
-	_M_codecvt = _M_codecvt_tmp;
-      else
-	_M_codecvt = 0;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB:  This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_filebuf<char>;
-  extern template class basic_ifstream<char>;
-  extern template class basic_ofstream<char>;
-  extern template class basic_fstream<char>;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_filebuf<wchar_t>;
-  extern template class basic_ifstream<wchar_t>;
-  extern template class basic_ofstream<wchar_t>;
-  extern template class basic_fstream<wchar_t>;
-#endif
-#endif
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/functexcept.h b/include.new/c++/3.4/bits/functexcept.h
deleted file mode 100644
index 8b1d16c..0000000
--- a/include.new/c++/3.4/bits/functexcept.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Function-Based Exception Support -*- C++ -*-
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 19.1  Exception classes
-//
-
-#include <exception_defines.h>
-
-namespace std
-{
-  // Helper for exception objects in <except>
-  void
-  __throw_bad_exception(void);
-
-  // Helper for exception objects in <new>
-  void
-  __throw_bad_alloc(void);
-
-  // Helper for exception objects in <typeinfo>
-  void
-  __throw_bad_cast(void);
-
-  void
-  __throw_bad_typeid(void);
-
-  // Helpers for exception objects in <stdexcept>
-  void
-  __throw_logic_error(const char* __s);
-
-  void
-  __throw_domain_error(const char* __s);
-
-  void
-  __throw_invalid_argument(const char* __s);
-
-  void
-  __throw_length_error(const char* __s);
-
-  void
-  __throw_out_of_range(const char* __s);
-
-  void
-  __throw_runtime_error(const char* __s);
-
-  void
-  __throw_range_error(const char* __s);
-
-  void
-  __throw_overflow_error(const char* __s);
-
-  void
-  __throw_underflow_error(const char* __s);
-
-  // Helpers for exception objects in basic_ios
-  void
-  __throw_ios_failure(const char* __s);
-} // namespace std
-
diff --git a/include.new/c++/3.4/bits/gslice.h b/include.new/c++/3.4/bits/gslice.h
deleted file mode 100644
index 78f8a67..0000000
--- a/include.new/c++/3.4/bits/gslice.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// The template and inlines for the -*- C++ -*- gslice class.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-/** @file gslice.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _GSLICE_H
-#define _GSLICE_H 1
-
-#pragma GCC system_header
-
-namespace std {
-
-  /**
-   *  @brief  Class defining multi-dimensional subset of an array.
-   *
-   *  The slice class represents a multi-dimensional subset of an array,
-   *  specified by three parameter sets: start offset, size array, and stride
-   *  array.  The start offset is the index of the first element of the array
-   *  that is part of the subset.  The size and stride array describe each
-   *  dimension of the slice.  Size is the number of elements in that
-   *  dimension, and stride is the distance in the array between successive
-   *  elements in that dimension.  Each dimension's size and stride is taken
-   *  to begin at an array element described by the previous dimension.  The
-   *  size array and stride array must be the same size.
-   *
-   *  For example, if you have offset==3, stride[0]==11, size[1]==3,
-   *  stride[1]==3, then slice[0,0]==array[3], slice[0,1]==array[6],
-   *  slice[0,2]==array[9], slice[1,0]==array[14], slice[1,1]==array[17],
-   *  slice[1,2]==array[20].
-   */
-    class gslice
-    {
-    public:
-      ///  Construct an empty slice.
-      gslice ();
-
-      /**
-       *  @brief  Construct a slice.
-       *
-       *  Constructs a slice with as many dimensions as the length of the @a l
-       *  and @a s arrays.
-       *
-       *  @param  o  Offset in array of first element.
-       *  @param  l  Array of dimension lengths.
-       *  @param  s  Array of dimension strides between array elements.
-       */
-      gslice(size_t, const valarray<size_t>&, const valarray<size_t>&);
-
-      // XXX: the IS says the copy-ctor and copy-assignment operators are
-      //      synthetized by the compiler but they are just unsuitable
-      //      for a ref-counted semantic
-      ///  Copy constructor.
-      gslice(const gslice&);
-
-      ///  Destructor.
-      ~gslice();
-
-      // XXX: See the note above.
-      ///  Assignment operator.
-      gslice& operator=(const gslice&);
-
-      ///  Return array offset of first slice element.
-      size_t           start() const;
-
-      ///  Return array of sizes of slice dimensions.
-      valarray<size_t> size() const;
-
-      ///  Return array of array strides for each dimension.
-      valarray<size_t> stride() const;
-
-    private:
-      struct _Indexer {
-	size_t _M_count;
-	size_t _M_start;
-	valarray<size_t> _M_size;
-	valarray<size_t> _M_stride;
-	valarray<size_t> _M_index; // Linear array of referenced indices
-	_Indexer(size_t, const valarray<size_t>&,
-		 const valarray<size_t>&);
-	void _M_increment_use() { ++_M_count; }
-	size_t _M_decrement_use() { return --_M_count; }
-      };
-
-      _Indexer* _M_index;
-
-      template<typename _Tp> friend class valarray;
-    };
-
-    inline size_t
-    gslice::start () const
-    { return _M_index ? _M_index->_M_start : 0; }
-
-    inline valarray<size_t>
-    gslice::size () const
-    { return _M_index ? _M_index->_M_size : valarray<size_t>(); }
-
-    inline valarray<size_t>
-    gslice::stride () const
-    { return _M_index ? _M_index->_M_stride : valarray<size_t>(); }
-
-    inline gslice::gslice () : _M_index(0) {}
-
-    inline
-    gslice::gslice(size_t __o, const valarray<size_t>& __l,
-                   const valarray<size_t>& __s)
-            : _M_index(new gslice::_Indexer(__o, __l, __s)) {}
-
-    inline
-    gslice::gslice(const gslice& __g) : _M_index(__g._M_index)
-    { if (_M_index) _M_index->_M_increment_use(); }
-
-    inline
-    gslice::~gslice()
-    { if (_M_index && _M_index->_M_decrement_use() == 0) delete _M_index; }
-
-    inline gslice&
-    gslice::operator= (const gslice& __g)
-    {
-        if (__g._M_index) __g._M_index->_M_increment_use();
-        if (_M_index && _M_index->_M_decrement_use() == 0) delete _M_index;
-        _M_index = __g._M_index;
-        return *this;
-    }
-
-
-} // std::
-
-
-#endif /* _GSLICE_H */
-
-// Local Variables:
-// mode:c++
-// End:
diff --git a/include.new/c++/3.4/bits/gslice_array.h b/include.new/c++/3.4/bits/gslice_array.h
deleted file mode 100644
index 7e2e684..0000000
--- a/include.new/c++/3.4/bits/gslice_array.h
+++ /dev/null
@@ -1,220 +0,0 @@
-// The template and inlines for the -*- C++ -*- gslice_array class.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-/** @file gslice_array.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _GSLICE_ARRAY_H
-#define _GSLICE_ARRAY_H 1
-
-#pragma GCC system_header
-
-namespace std {
-
-  /**
-   *  @brief  Reference to multi-dimensional subset of an array.
-   *
-   *  A gslice_array is a reference to the actual elements of an array
-   *  specified by a gslice.  The way to get a gslice_array is to call
-   *  operator[](gslice) on a valarray.  The returned gslice_array then
-   *  permits carrying operations out on the referenced subset of elements in
-   *  the original valarray.  For example, operator+=(valarray) will add
-   *  values to the subset of elements in the underlying valarray this
-   *  gslice_array refers to.
-   *
-   *  @param  Tp  Element type.
-   */
-  template<typename _Tp>
-    class gslice_array
-    {
-    public:
-      typedef _Tp value_type;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 253. valarray helper functions are almost entirely useless
-
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      gslice_array(const gslice_array&);
-
-      ///  Assignment operator.  Assigns slice elements to corresponding
-      ///  elements of @a a.
-      gslice_array& operator=(const gslice_array&);
-
-      ///  Assign slice elements to corresponding elements of @a v.
-      void operator=(const valarray<_Tp>&) const;
-      ///  Multiply slice elements by corresponding elements of @a v.
-      void operator*=(const valarray<_Tp>&) const;
-      ///  Divide slice elements by corresponding elements of @a v.
-      void operator/=(const valarray<_Tp>&) const;
-      ///  Modulo slice elements by corresponding elements of @a v.
-      void operator%=(const valarray<_Tp>&) const;
-      ///  Add corresponding elements of @a v to slice elements.
-      void operator+=(const valarray<_Tp>&) const;
-      ///  Subtract corresponding elements of @a v from slice elements.
-      void operator-=(const valarray<_Tp>&) const;
-      ///  Logical xor slice elements with corresponding elements of @a v.
-      void operator^=(const valarray<_Tp>&) const;
-      ///  Logical and slice elements with corresponding elements of @a v.
-      void operator&=(const valarray<_Tp>&) const;
-      ///  Logical or slice elements with corresponding elements of @a v.
-      void operator|=(const valarray<_Tp>&) const;
-      ///  Left shift slice elements by corresponding elements of @a v.
-      void operator<<=(const valarray<_Tp>&) const;
-      ///  Right shift slice elements by corresponding elements of @a v.
-      void operator>>=(const valarray<_Tp>&) const;
-      ///  Assign all slice elements to @a t.
-      void operator=(const _Tp&) const;
-
-      template<class _Dom>
-        void operator=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator*=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator/=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator%=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator+=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator-=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator^=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator&=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator|=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator<<=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator>>=(const _Expr<_Dom,_Tp>&) const;
-
-    private:
-      _Array<_Tp>    _M_array;
-      const valarray<size_t>& _M_index;
-
-      friend class valarray<_Tp>;
-
-      gslice_array(_Array<_Tp>, const valarray<size_t>&);
-
-      // not implemented
-      gslice_array();
-    };
-
-  template<typename _Tp>
-    inline
-    gslice_array<_Tp>::gslice_array(_Array<_Tp> __a,
-				    const valarray<size_t>& __i)
-    : _M_array(__a), _M_index(__i) {}
-
-
-  template<typename _Tp>
-    inline
-    gslice_array<_Tp>::gslice_array(const gslice_array<_Tp>& __a)
-    : _M_array(__a._M_array), _M_index(__a._M_index) {}
-
-
-  template<typename _Tp>
-    inline gslice_array<_Tp>&
-    gslice_array<_Tp>::operator=(const gslice_array<_Tp>& __a)
-    {
-      std::__valarray_copy(_Array<_Tp>(__a._M_array),
-			   _Array<size_t>(__a._M_index), _M_index.size(),
-			   _M_array, _Array<size_t>(_M_index));
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline void
-    gslice_array<_Tp>::operator=(const _Tp& __t) const
-    {
-      std::__valarray_fill(_M_array, _Array<size_t>(_M_index),
-			   _M_index.size(), __t);
-    }
-
-  template<typename _Tp>
-    inline void
-    gslice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
-    {
-      std::__valarray_copy(_Array<_Tp>(__v), __v.size(),
-			   _M_array, _Array<size_t>(_M_index));
-    }
-
-  template<typename _Tp>
-    template<class _Dom>
-      inline void
-      gslice_array<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e) const
-      {
-	std::__valarray_copy (__e, _M_index.size(), _M_array,
-			      _Array<size_t>(_M_index));
-      }
-
-#undef _DEFINE_VALARRAY_OPERATOR
-#define _DEFINE_VALARRAY_OPERATOR(_Op, _Name)				\
-  template<typename _Tp>						\
-    inline void								\
-    gslice_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const	\
-    {									\
-      _Array_augmented_##_Name(_M_array, _Array<size_t>(_M_index),	\
-			      _Array<_Tp>(__v), __v.size());		\
-    }									\
-									\
-  template<typename _Tp>                                                \
-    template<class _Dom>				                \
-      inline void							\
-      gslice_array<_Tp>::operator _Op##= (const _Expr<_Dom, _Tp>& __e) const\
-      {									\
-	_Array_augmented_##_Name(_M_array, _Array<size_t>(_M_index), __e,\
-				 _M_index.size());			\
-      }
-
-_DEFINE_VALARRAY_OPERATOR(*, __multiplies)
-_DEFINE_VALARRAY_OPERATOR(/, __divides)
-_DEFINE_VALARRAY_OPERATOR(%, __modulus)
-_DEFINE_VALARRAY_OPERATOR(+, __plus)
-_DEFINE_VALARRAY_OPERATOR(-, __minus)
-_DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
-_DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
-_DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
-_DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
-_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_OPERATOR
-
-} // std::
-
-#endif /* _GSLICE_ARRAY_H */
-
-// Local Variables:
-// mode:c++
-// End:
diff --git a/include.new/c++/3.4/bits/gthr-default.h b/include.new/c++/3.4/bits/gthr-default.h
deleted file mode 100644
index 1898d24..0000000
--- a/include.new/c++/3.4/bits/gthr-default.h
+++ /dev/null
@@ -1,517 +0,0 @@
-/* Threads compatibility routines for libgcc2 and libobjc.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef _GLIBCXX_GCC_GTHR_POSIX_H
-#define _GLIBCXX_GCC_GTHR_POSIX_H
-
-/* POSIX threads specific definitions.
-   Easy, since the interface is just one-to-one mapping.  */
-
-#define __GTHREADS 1
-
-/* Some implementations of <pthread.h> require this to be defined.  */
-#ifndef _REENTRANT
-#define _REENTRANT 1
-#endif
-
-#include <pthread.h>
-#include <unistd.h>
-
-typedef pthread_key_t __gthread_key_t;
-typedef pthread_once_t __gthread_once_t;
-typedef pthread_mutex_t __gthread_mutex_t;
-
-#define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
-#define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-
-#if __GXX_WEAK__ && _GLIBCXX_GTHREAD_USE_WEAK
-
-#pragma weak pthread_once
-#pragma weak pthread_key_create
-#pragma weak pthread_key_delete
-#pragma weak pthread_getspecific
-#pragma weak pthread_setspecific
-#pragma weak pthread_create
-
-#pragma weak pthread_mutex_lock
-#pragma weak pthread_mutex_trylock
-#pragma weak pthread_mutex_unlock
-
-#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
-/* Objective-C.  */
-#pragma weak pthread_cond_broadcast
-#pragma weak pthread_cond_destroy
-#pragma weak pthread_cond_init
-#pragma weak pthread_cond_signal
-#pragma weak pthread_cond_wait
-#pragma weak pthread_exit
-#pragma weak pthread_mutex_init
-#pragma weak pthread_mutex_destroy
-#pragma weak pthread_self
-/* These really should be protected by _POSIX_PRIORITY_SCHEDULING, but
-   we use them inside a _POSIX_THREAD_PRIORITY_SCHEDULING block.  */
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-#pragma weak sched_get_priority_max
-#pragma weak sched_get_priority_min
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#pragma weak sched_yield
-#pragma weak pthread_attr_destroy
-#pragma weak pthread_attr_init
-#pragma weak pthread_attr_setdetachstate
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-#pragma weak pthread_getschedparam
-#pragma weak pthread_setschedparam
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _LIBOBJC || _LIBOBJC_WEAK */
-
-static inline int
-__gthread_active_p (void)
-{
-  static void *const __gthread_active_ptr = (void *) &pthread_create;
-  return __gthread_active_ptr != 0;
-}
-
-#else /* not __GXX_WEAK__ */
-
-static inline int
-__gthread_active_p (void)
-{
-  return 1;
-}
-
-#endif /* __GXX_WEAK__ */
-
-#ifdef _LIBOBJC
-
-/* This is the config.h file in libobjc/ */
-#include <config.h>
-
-#ifdef HAVE_SCHED_H
-# include <sched.h>
-#endif
-
-/* Key structure for maintaining thread specific storage */
-static pthread_key_t _objc_thread_storage;
-static pthread_attr_t _objc_thread_attribs;
-
-/* Thread local storage for a single thread */
-static void *thread_local_storage = NULL;
-
-/* Backend initialization functions */
-
-/* Initialize the threads subsystem.  */
-static inline int
-__gthread_objc_init_thread_system (void)
-{
-  if (__gthread_active_p ())
-    {
-      /* Initialize the thread storage key */
-      if (pthread_key_create (&_objc_thread_storage, NULL) == 0)
-	{
-	  /* The normal default detach state for threads is
-	   * PTHREAD_CREATE_JOINABLE which causes threads to not die
-	   * when you think they should.  */
-	  if (pthread_attr_init (&_objc_thread_attribs) == 0
-	      && pthread_attr_setdetachstate (&_objc_thread_attribs,
-					      PTHREAD_CREATE_DETACHED) == 0)
-	    return 0;
-	}
-    }
-
-  return -1;
-}
-
-/* Close the threads subsystem.  */
-static inline int
-__gthread_objc_close_thread_system (void)
-{
-  if (__gthread_active_p ()
-      && pthread_key_delete (_objc_thread_storage) == 0
-      && pthread_attr_destroy (&_objc_thread_attribs) == 0)
-    return 0;
-
-  return -1;
-}
-
-/* Backend thread functions */
-
-/* Create a new thread of execution.  */
-static inline objc_thread_t
-__gthread_objc_thread_detach (void (*func)(void *), void *arg)
-{
-  objc_thread_t thread_id;
-  pthread_t new_thread_handle;
-
-  if (!__gthread_active_p ())
-    return NULL;
-
-  if (!(pthread_create (&new_thread_handle, NULL, (void *) func, arg)))
-    thread_id = (objc_thread_t) new_thread_handle;
-  else
-    thread_id = NULL;
-
-  return thread_id;
-}
-
-/* Set the current thread's priority.  */
-static inline int
-__gthread_objc_thread_set_priority (int priority)
-{
-  if (!__gthread_active_p ())
-    return -1;
-  else
-    {
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-      pthread_t thread_id = pthread_self ();
-      int policy;
-      struct sched_param params;
-      int priority_min, priority_max;
-
-      if (pthread_getschedparam (thread_id, &policy, &params) == 0)
-	{
-	  if ((priority_max = sched_get_priority_max (policy)) == -1)
-	    return -1;
-
-	  if ((priority_min = sched_get_priority_min (policy)) == -1)
-	    return -1;
-
-	  if (priority > priority_max)
-	    priority = priority_max;
-	  else if (priority < priority_min)
-	    priority = priority_min;
-	  params.sched_priority = priority;
-
-	  /*
-	   * The solaris 7 and several other man pages incorrectly state that
-	   * this should be a pointer to policy but pthread.h is universally
-	   * at odds with this.
-	   */
-	  if (pthread_setschedparam (thread_id, policy, &params) == 0)
-	    return 0;
-	}
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-      return -1;
-    }
-}
-
-/* Return the current thread's priority.  */
-static inline int
-__gthread_objc_thread_get_priority (void)
-{
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-  if (__gthread_active_p ())
-    {
-      int policy;
-      struct sched_param params;
-
-      if (pthread_getschedparam (pthread_self (), &policy, &params) == 0)
-	return params.sched_priority;
-      else
-	return -1;
-    }
-  else
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-    return OBJC_THREAD_INTERACTIVE_PRIORITY;
-}
-
-/* Yield our process time to another thread.  */
-static inline void
-__gthread_objc_thread_yield (void)
-{
-  if (__gthread_active_p ())
-    sched_yield ();
-}
-
-/* Terminate the current thread.  */
-static inline int
-__gthread_objc_thread_exit (void)
-{
-  if (__gthread_active_p ())
-    /* exit the thread */
-    pthread_exit (&__objc_thread_exit_status);
-
-  /* Failed if we reached here */
-  return -1;
-}
-
-/* Returns an integer value which uniquely describes a thread.  */
-static inline objc_thread_t
-__gthread_objc_thread_id (void)
-{
-  if (__gthread_active_p ())
-    return (objc_thread_t) pthread_self ();
-  else
-    return (objc_thread_t) 1;
-}
-
-/* Sets the thread's local storage pointer.  */
-static inline int
-__gthread_objc_thread_set_data (void *value)
-{
-  if (__gthread_active_p ())
-    return pthread_setspecific (_objc_thread_storage, value);
-  else
-    {
-      thread_local_storage = value;
-      return 0;
-    }
-}
-
-/* Returns the thread's local storage pointer.  */
-static inline void *
-__gthread_objc_thread_get_data (void)
-{
-  if (__gthread_active_p ())
-    return pthread_getspecific (_objc_thread_storage);
-  else
-    return thread_local_storage;
-}
-
-/* Backend mutex functions */
-
-/* Allocate a mutex.  */
-static inline int
-__gthread_objc_mutex_allocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    {
-      mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
-
-      if (pthread_mutex_init ((pthread_mutex_t *) mutex->backend, NULL))
-	{
-	  objc_free (mutex->backend);
-	  mutex->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a mutex.  */
-static inline int
-__gthread_objc_mutex_deallocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    {
-      int count;
-
-      /*
-       * Posix Threads specifically require that the thread be unlocked
-       * for pthread_mutex_destroy to work.
-       */
-
-      do
-	{
-	  count = pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
-	  if (count < 0)
-	    return -1;
-	}
-      while (count);
-
-      if (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
-	return -1;
-
-      objc_free (mutex->backend);
-      mutex->backend = NULL;
-    }
-  return 0;
-}
-
-/* Grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_lock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && pthread_mutex_lock ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Try to grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_trylock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Unlock the mutex */
-static inline int
-__gthread_objc_mutex_unlock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Backend condition mutex functions */
-
-/* Allocate a condition.  */
-static inline int
-__gthread_objc_condition_allocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    {
-      condition->backend = objc_malloc (sizeof (pthread_cond_t));
-
-      if (pthread_cond_init ((pthread_cond_t *) condition->backend, NULL))
-	{
-	  objc_free (condition->backend);
-	  condition->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a condition.  */
-static inline int
-__gthread_objc_condition_deallocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    {
-      if (pthread_cond_destroy ((pthread_cond_t *) condition->backend))
-	return -1;
-
-      objc_free (condition->backend);
-      condition->backend = NULL;
-    }
-  return 0;
-}
-
-/* Wait on the condition */
-static inline int
-__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_cond_wait ((pthread_cond_t *) condition->backend,
-			      (pthread_mutex_t *) mutex->backend);
-  else
-    return 0;
-}
-
-/* Wake up all threads waiting on this condition.  */
-static inline int
-__gthread_objc_condition_broadcast (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return pthread_cond_broadcast ((pthread_cond_t *) condition->backend);
-  else
-    return 0;
-}
-
-/* Wake up one thread waiting on this condition.  */
-static inline int
-__gthread_objc_condition_signal (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return pthread_cond_signal ((pthread_cond_t *) condition->backend);
-  else
-    return 0;
-}
-
-#else /* _LIBOBJC */
-
-static inline int
-__gthread_once (__gthread_once_t *once, void (*func) (void))
-{
-  if (__gthread_active_p ())
-    return pthread_once (once, func);
-  else
-    return -1;
-}
-
-static inline int
-__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
-{
-  return pthread_key_create (key, dtor);
-}
-
-static inline int
-__gthread_key_delete (__gthread_key_t key)
-{
-  return pthread_key_delete (key);
-}
-
-static inline void *
-__gthread_getspecific (__gthread_key_t key)
-{
-  return pthread_getspecific (key);
-}
-
-static inline int
-__gthread_setspecific (__gthread_key_t key, const void *ptr)
-{
-  return pthread_setspecific (key, ptr);
-}
-
-static inline int
-__gthread_mutex_lock (__gthread_mutex_t *mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_mutex_lock (mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_trylock (__gthread_mutex_t *mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_mutex_trylock (mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_unlock (__gthread_mutex_t *mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_mutex_unlock (mutex);
-  else
-    return 0;
-}
-
-#endif /* _LIBOBJC */
-
-#endif /* ! _GLIBCXX_GCC_GTHR_POSIX_H */
diff --git a/include.new/c++/3.4/bits/gthr-posix.h b/include.new/c++/3.4/bits/gthr-posix.h
deleted file mode 100644
index 1898d24..0000000
--- a/include.new/c++/3.4/bits/gthr-posix.h
+++ /dev/null
@@ -1,517 +0,0 @@
-/* Threads compatibility routines for libgcc2 and libobjc.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef _GLIBCXX_GCC_GTHR_POSIX_H
-#define _GLIBCXX_GCC_GTHR_POSIX_H
-
-/* POSIX threads specific definitions.
-   Easy, since the interface is just one-to-one mapping.  */
-
-#define __GTHREADS 1
-
-/* Some implementations of <pthread.h> require this to be defined.  */
-#ifndef _REENTRANT
-#define _REENTRANT 1
-#endif
-
-#include <pthread.h>
-#include <unistd.h>
-
-typedef pthread_key_t __gthread_key_t;
-typedef pthread_once_t __gthread_once_t;
-typedef pthread_mutex_t __gthread_mutex_t;
-
-#define __GTHREAD_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
-#define __GTHREAD_ONCE_INIT PTHREAD_ONCE_INIT
-
-#if __GXX_WEAK__ && _GLIBCXX_GTHREAD_USE_WEAK
-
-#pragma weak pthread_once
-#pragma weak pthread_key_create
-#pragma weak pthread_key_delete
-#pragma weak pthread_getspecific
-#pragma weak pthread_setspecific
-#pragma weak pthread_create
-
-#pragma weak pthread_mutex_lock
-#pragma weak pthread_mutex_trylock
-#pragma weak pthread_mutex_unlock
-
-#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
-/* Objective-C.  */
-#pragma weak pthread_cond_broadcast
-#pragma weak pthread_cond_destroy
-#pragma weak pthread_cond_init
-#pragma weak pthread_cond_signal
-#pragma weak pthread_cond_wait
-#pragma weak pthread_exit
-#pragma weak pthread_mutex_init
-#pragma weak pthread_mutex_destroy
-#pragma weak pthread_self
-/* These really should be protected by _POSIX_PRIORITY_SCHEDULING, but
-   we use them inside a _POSIX_THREAD_PRIORITY_SCHEDULING block.  */
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-#pragma weak sched_get_priority_max
-#pragma weak sched_get_priority_min
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#pragma weak sched_yield
-#pragma weak pthread_attr_destroy
-#pragma weak pthread_attr_init
-#pragma weak pthread_attr_setdetachstate
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-#pragma weak pthread_getschedparam
-#pragma weak pthread_setschedparam
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-#endif /* _LIBOBJC || _LIBOBJC_WEAK */
-
-static inline int
-__gthread_active_p (void)
-{
-  static void *const __gthread_active_ptr = (void *) &pthread_create;
-  return __gthread_active_ptr != 0;
-}
-
-#else /* not __GXX_WEAK__ */
-
-static inline int
-__gthread_active_p (void)
-{
-  return 1;
-}
-
-#endif /* __GXX_WEAK__ */
-
-#ifdef _LIBOBJC
-
-/* This is the config.h file in libobjc/ */
-#include <config.h>
-
-#ifdef HAVE_SCHED_H
-# include <sched.h>
-#endif
-
-/* Key structure for maintaining thread specific storage */
-static pthread_key_t _objc_thread_storage;
-static pthread_attr_t _objc_thread_attribs;
-
-/* Thread local storage for a single thread */
-static void *thread_local_storage = NULL;
-
-/* Backend initialization functions */
-
-/* Initialize the threads subsystem.  */
-static inline int
-__gthread_objc_init_thread_system (void)
-{
-  if (__gthread_active_p ())
-    {
-      /* Initialize the thread storage key */
-      if (pthread_key_create (&_objc_thread_storage, NULL) == 0)
-	{
-	  /* The normal default detach state for threads is
-	   * PTHREAD_CREATE_JOINABLE which causes threads to not die
-	   * when you think they should.  */
-	  if (pthread_attr_init (&_objc_thread_attribs) == 0
-	      && pthread_attr_setdetachstate (&_objc_thread_attribs,
-					      PTHREAD_CREATE_DETACHED) == 0)
-	    return 0;
-	}
-    }
-
-  return -1;
-}
-
-/* Close the threads subsystem.  */
-static inline int
-__gthread_objc_close_thread_system (void)
-{
-  if (__gthread_active_p ()
-      && pthread_key_delete (_objc_thread_storage) == 0
-      && pthread_attr_destroy (&_objc_thread_attribs) == 0)
-    return 0;
-
-  return -1;
-}
-
-/* Backend thread functions */
-
-/* Create a new thread of execution.  */
-static inline objc_thread_t
-__gthread_objc_thread_detach (void (*func)(void *), void *arg)
-{
-  objc_thread_t thread_id;
-  pthread_t new_thread_handle;
-
-  if (!__gthread_active_p ())
-    return NULL;
-
-  if (!(pthread_create (&new_thread_handle, NULL, (void *) func, arg)))
-    thread_id = (objc_thread_t) new_thread_handle;
-  else
-    thread_id = NULL;
-
-  return thread_id;
-}
-
-/* Set the current thread's priority.  */
-static inline int
-__gthread_objc_thread_set_priority (int priority)
-{
-  if (!__gthread_active_p ())
-    return -1;
-  else
-    {
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-      pthread_t thread_id = pthread_self ();
-      int policy;
-      struct sched_param params;
-      int priority_min, priority_max;
-
-      if (pthread_getschedparam (thread_id, &policy, &params) == 0)
-	{
-	  if ((priority_max = sched_get_priority_max (policy)) == -1)
-	    return -1;
-
-	  if ((priority_min = sched_get_priority_min (policy)) == -1)
-	    return -1;
-
-	  if (priority > priority_max)
-	    priority = priority_max;
-	  else if (priority < priority_min)
-	    priority = priority_min;
-	  params.sched_priority = priority;
-
-	  /*
-	   * The solaris 7 and several other man pages incorrectly state that
-	   * this should be a pointer to policy but pthread.h is universally
-	   * at odds with this.
-	   */
-	  if (pthread_setschedparam (thread_id, policy, &params) == 0)
-	    return 0;
-	}
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-      return -1;
-    }
-}
-
-/* Return the current thread's priority.  */
-static inline int
-__gthread_objc_thread_get_priority (void)
-{
-#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
-  if (__gthread_active_p ())
-    {
-      int policy;
-      struct sched_param params;
-
-      if (pthread_getschedparam (pthread_self (), &policy, &params) == 0)
-	return params.sched_priority;
-      else
-	return -1;
-    }
-  else
-#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
-    return OBJC_THREAD_INTERACTIVE_PRIORITY;
-}
-
-/* Yield our process time to another thread.  */
-static inline void
-__gthread_objc_thread_yield (void)
-{
-  if (__gthread_active_p ())
-    sched_yield ();
-}
-
-/* Terminate the current thread.  */
-static inline int
-__gthread_objc_thread_exit (void)
-{
-  if (__gthread_active_p ())
-    /* exit the thread */
-    pthread_exit (&__objc_thread_exit_status);
-
-  /* Failed if we reached here */
-  return -1;
-}
-
-/* Returns an integer value which uniquely describes a thread.  */
-static inline objc_thread_t
-__gthread_objc_thread_id (void)
-{
-  if (__gthread_active_p ())
-    return (objc_thread_t) pthread_self ();
-  else
-    return (objc_thread_t) 1;
-}
-
-/* Sets the thread's local storage pointer.  */
-static inline int
-__gthread_objc_thread_set_data (void *value)
-{
-  if (__gthread_active_p ())
-    return pthread_setspecific (_objc_thread_storage, value);
-  else
-    {
-      thread_local_storage = value;
-      return 0;
-    }
-}
-
-/* Returns the thread's local storage pointer.  */
-static inline void *
-__gthread_objc_thread_get_data (void)
-{
-  if (__gthread_active_p ())
-    return pthread_getspecific (_objc_thread_storage);
-  else
-    return thread_local_storage;
-}
-
-/* Backend mutex functions */
-
-/* Allocate a mutex.  */
-static inline int
-__gthread_objc_mutex_allocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    {
-      mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
-
-      if (pthread_mutex_init ((pthread_mutex_t *) mutex->backend, NULL))
-	{
-	  objc_free (mutex->backend);
-	  mutex->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a mutex.  */
-static inline int
-__gthread_objc_mutex_deallocate (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    {
-      int count;
-
-      /*
-       * Posix Threads specifically require that the thread be unlocked
-       * for pthread_mutex_destroy to work.
-       */
-
-      do
-	{
-	  count = pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
-	  if (count < 0)
-	    return -1;
-	}
-      while (count);
-
-      if (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
-	return -1;
-
-      objc_free (mutex->backend);
-      mutex->backend = NULL;
-    }
-  return 0;
-}
-
-/* Grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_lock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && pthread_mutex_lock ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Try to grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_trylock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Unlock the mutex */
-static inline int
-__gthread_objc_mutex_unlock (objc_mutex_t mutex)
-{
-  if (__gthread_active_p ()
-      && pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend) != 0)
-    {
-      return -1;
-    }
-
-  return 0;
-}
-
-/* Backend condition mutex functions */
-
-/* Allocate a condition.  */
-static inline int
-__gthread_objc_condition_allocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    {
-      condition->backend = objc_malloc (sizeof (pthread_cond_t));
-
-      if (pthread_cond_init ((pthread_cond_t *) condition->backend, NULL))
-	{
-	  objc_free (condition->backend);
-	  condition->backend = NULL;
-	  return -1;
-	}
-    }
-
-  return 0;
-}
-
-/* Deallocate a condition.  */
-static inline int
-__gthread_objc_condition_deallocate (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    {
-      if (pthread_cond_destroy ((pthread_cond_t *) condition->backend))
-	return -1;
-
-      objc_free (condition->backend);
-      condition->backend = NULL;
-    }
-  return 0;
-}
-
-/* Wait on the condition */
-static inline int
-__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_cond_wait ((pthread_cond_t *) condition->backend,
-			      (pthread_mutex_t *) mutex->backend);
-  else
-    return 0;
-}
-
-/* Wake up all threads waiting on this condition.  */
-static inline int
-__gthread_objc_condition_broadcast (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return pthread_cond_broadcast ((pthread_cond_t *) condition->backend);
-  else
-    return 0;
-}
-
-/* Wake up one thread waiting on this condition.  */
-static inline int
-__gthread_objc_condition_signal (objc_condition_t condition)
-{
-  if (__gthread_active_p ())
-    return pthread_cond_signal ((pthread_cond_t *) condition->backend);
-  else
-    return 0;
-}
-
-#else /* _LIBOBJC */
-
-static inline int
-__gthread_once (__gthread_once_t *once, void (*func) (void))
-{
-  if (__gthread_active_p ())
-    return pthread_once (once, func);
-  else
-    return -1;
-}
-
-static inline int
-__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
-{
-  return pthread_key_create (key, dtor);
-}
-
-static inline int
-__gthread_key_delete (__gthread_key_t key)
-{
-  return pthread_key_delete (key);
-}
-
-static inline void *
-__gthread_getspecific (__gthread_key_t key)
-{
-  return pthread_getspecific (key);
-}
-
-static inline int
-__gthread_setspecific (__gthread_key_t key, const void *ptr)
-{
-  return pthread_setspecific (key, ptr);
-}
-
-static inline int
-__gthread_mutex_lock (__gthread_mutex_t *mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_mutex_lock (mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_trylock (__gthread_mutex_t *mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_mutex_trylock (mutex);
-  else
-    return 0;
-}
-
-static inline int
-__gthread_mutex_unlock (__gthread_mutex_t *mutex)
-{
-  if (__gthread_active_p ())
-    return pthread_mutex_unlock (mutex);
-  else
-    return 0;
-}
-
-#endif /* _LIBOBJC */
-
-#endif /* ! _GLIBCXX_GCC_GTHR_POSIX_H */
diff --git a/include.new/c++/3.4/bits/gthr-single.h b/include.new/c++/3.4/bits/gthr-single.h
deleted file mode 100644
index 68e425b..0000000
--- a/include.new/c++/3.4/bits/gthr-single.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/* Threads compatibility routines for libgcc2 and libobjc.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef _GLIBCXX_GCC_GTHR_SINGLE_H
-#define _GLIBCXX_GCC_GTHR_SINGLE_H
-
-/* Just provide compatibility for mutex handling.  */
-
-typedef int __gthread_mutex_t;
-
-#define __GTHREAD_MUTEX_INIT 0
-
-#ifdef __cplusplus
-#define _GLIBCXX_UNUSED(x)
-#else
-#define _GLIBCXX_UNUSED(x) x __attribute__((unused))
-#endif
-
-#ifdef _LIBOBJC
-
-/* Thread local storage for a single thread */
-static void *thread_local_storage = NULL;
-
-/* Backend initialization functions */
-
-/* Initialize the threads subsystem.  */
-static inline int
-__gthread_objc_init_thread_system (void)
-{
-  /* No thread support available */
-  return -1;
-}
-
-/* Close the threads subsystem.  */
-static inline int
-__gthread_objc_close_thread_system (void)
-{
-  /* No thread support available */
-  return -1;
-}
-
-/* Backend thread functions */
-
-/* Create a new thread of execution.  */
-static inline objc_thread_t
-__gthread_objc_thread_detach (void (* func)(void *), void * _GLIBCXX_UNUSED(arg))
-{
-  /* No thread support available */
-  return NULL;
-}
-
-/* Set the current thread's priority.  */
-static inline int
-__gthread_objc_thread_set_priority (int _GLIBCXX_UNUSED(priority))
-{
-  /* No thread support available */
-  return -1;
-}
-
-/* Return the current thread's priority.  */
-static inline int
-__gthread_objc_thread_get_priority (void)
-{
-  return OBJC_THREAD_INTERACTIVE_PRIORITY;
-}
-
-/* Yield our process time to another thread.  */
-static inline void
-__gthread_objc_thread_yield (void)
-{
-  return;
-}
-
-/* Terminate the current thread.  */
-static inline int
-__gthread_objc_thread_exit (void)
-{
-  /* No thread support available */
-  /* Should we really exit the program */
-  /* exit (&__objc_thread_exit_status); */
-  return -1;
-}
-
-/* Returns an integer value which uniquely describes a thread.  */
-static inline objc_thread_t
-__gthread_objc_thread_id (void)
-{
-  /* No thread support, use 1.  */
-  return (objc_thread_t) 1;
-}
-
-/* Sets the thread's local storage pointer.  */
-static inline int
-__gthread_objc_thread_set_data (void *value)
-{
-  thread_local_storage = value;
-  return 0;
-}
-
-/* Returns the thread's local storage pointer.  */
-static inline void *
-__gthread_objc_thread_get_data (void)
-{
-  return thread_local_storage;
-}
-
-/* Backend mutex functions */
-
-/* Allocate a mutex.  */
-static inline int
-__gthread_objc_mutex_allocate (objc_mutex_t _GLIBCXX_UNUSED(mutex))
-{
-  return 0;
-}
-
-/* Deallocate a mutex.  */
-static inline int
-__gthread_objc_mutex_deallocate (objc_mutex_t _GLIBCXX_UNUSED(mutex))
-{
-  return 0;
-}
-
-/* Grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_lock (objc_mutex_t _GLIBCXX_UNUSED(mutex))
-{
-  /* There can only be one thread, so we always get the lock */
-  return 0;
-}
-
-/* Try to grab a lock on a mutex.  */
-static inline int
-__gthread_objc_mutex_trylock (objc_mutex_t _GLIBCXX_UNUSED(mutex))
-{
-  /* There can only be one thread, so we always get the lock */
-  return 0;
-}
-
-/* Unlock the mutex */
-static inline int
-__gthread_objc_mutex_unlock (objc_mutex_t _GLIBCXX_UNUSED(mutex))
-{
-  return 0;
-}
-
-/* Backend condition mutex functions */
-
-/* Allocate a condition.  */
-static inline int
-__gthread_objc_condition_allocate (objc_condition_t _GLIBCXX_UNUSED(condition))
-{
-  return 0;
-}
-
-/* Deallocate a condition.  */
-static inline int
-__gthread_objc_condition_deallocate (objc_condition_t _GLIBCXX_UNUSED(condition))
-{
-  return 0;
-}
-
-/* Wait on the condition */
-static inline int
-__gthread_objc_condition_wait (objc_condition_t _GLIBCXX_UNUSED(condition),
-			       objc_mutex_t _GLIBCXX_UNUSED(mutex))
-{
-  return 0;
-}
-
-/* Wake up all threads waiting on this condition.  */
-static inline int
-__gthread_objc_condition_broadcast (objc_condition_t _GLIBCXX_UNUSED(condition))
-{
-  return 0;
-}
-
-/* Wake up one thread waiting on this condition.  */
-static inline int
-__gthread_objc_condition_signal (objc_condition_t _GLIBCXX_UNUSED(condition))
-{
-  return 0;
-}
-
-#else /* _LIBOBJC */
-
-static inline int
-__gthread_active_p (void)
-{
-  return 0;
-}
-
-static inline int
-__gthread_mutex_lock (__gthread_mutex_t * _GLIBCXX_UNUSED(mutex))
-{
-  return 0;
-}
-
-static inline int
-__gthread_mutex_trylock (__gthread_mutex_t * _GLIBCXX_UNUSED(mutex))
-{
-  return 0;
-}
-
-static inline int
-__gthread_mutex_unlock (__gthread_mutex_t * _GLIBCXX_UNUSED(mutex))
-{
-  return 0;
-}
-
-#endif /* _LIBOBJC */
-
-#undef _GLIBCXX_UNUSED
-
-#endif /* ! _GLIBCXX_GCC_GTHR_SINGLE_H */
diff --git a/include.new/c++/3.4/bits/gthr.h b/include.new/c++/3.4/bits/gthr.h
deleted file mode 100644
index fe5740c..0000000
--- a/include.new/c++/3.4/bits/gthr.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Threads compatibility routines for libgcc2.  */
-/* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
-
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef _GLIBCXX_GCC_GTHR_H
-#define _GLIBCXX_GCC_GTHR_H
-
-/* If this file is compiled with threads support, it must
-       #define __GTHREADS 1
-   to indicate that threads support is present.  Also it has define
-   function
-     int __gthread_active_p ()
-   that returns 1 if thread system is active, 0 if not.
-
-   The threads interface must define the following types:
-     __gthread_key_t
-     __gthread_once_t
-     __gthread_mutex_t
-
-   The threads interface must define the following macros:
-
-     __GTHREAD_ONCE_INIT
-     		to initialize __gthread_once_t
-     __GTHREAD_MUTEX_INIT
-     		to initialize __gthread_mutex_t to get a fast
-		non-recursive mutex.
-     __GTHREAD_MUTEX_INIT_FUNCTION
-     		some systems can't initialize a mutex without a
-		function call.  On such systems, define this to a
-		function which looks like this:
-		  void __GTHREAD_MUTEX_INIT_FUNCTION (__gthread_mutex_t *)
-		Don't define __GTHREAD_MUTEX_INIT in this case
-
-   The threads interface must define the following static functions:
-
-     int __gthread_once (__gthread_once_t *once, void (*func) ())
-
-     int __gthread_key_create (__gthread_key_t *keyp, void (*dtor) (void *))
-     int __gthread_key_delete (__gthread_key_t key)
-
-     void *__gthread_getspecific (__gthread_key_t key)
-     int __gthread_setspecific (__gthread_key_t key, const void *ptr)
-
-     int __gthread_mutex_lock (__gthread_mutex_t *mutex);
-     int __gthread_mutex_trylock (__gthread_mutex_t *mutex);
-     int __gthread_mutex_unlock (__gthread_mutex_t *mutex);
-
-   All functions returning int should return zero on success or the error
-   number.  If the operation is not supported, -1 is returned.
-
-   Currently supported threads packages are
-     POSIX threads with -D_PTHREADS
-     DCE threads with -D_DCE_THREADS
-     Solaris/UI threads with -D_SOLARIS_THREADS
-*/
-
-/* Check first for thread specific defines.  */
-#if _GLIBCXX__PTHREADS
-#include <bits/gthr-posix.h>
-#elif _GLIBCXX__DCE_THREADS
-#include <bits/gthr-dce.h>
-#elif _GLIBCXX__SOLARIS_THREADS
-#include <bits/gthr-solaris.h>
-
-/* Include GTHREAD_FILE if one is defined.  */
-#elif defined(_GLIBCXX_HAVE_GTHR_DEFAULT)
-#if __GXX_WEAK__
-#ifndef _GLIBCXX_GTHREAD_USE_WEAK
-#define _GLIBCXX_GTHREAD_USE_WEAK 1
-#endif
-#endif
-#include <bits/gthr-default.h>
-
-/* Fallback to single thread definitions.  */
-#else
-#include <bits/gthr-single.h>
-#endif
-
-#endif /* ! _GLIBCXX_GCC_GTHR_H */
diff --git a/include.new/c++/3.4/bits/indirect_array.h b/include.new/c++/3.4/bits/indirect_array.h
deleted file mode 100644
index 912f522..0000000
--- a/include.new/c++/3.4/bits/indirect_array.h
+++ /dev/null
@@ -1,212 +0,0 @@
-// The template and inlines for the -*- C++ -*- indirect_array class.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
-//  Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-/** @file indirect_array.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _INDIRECT_ARRAY_H
-#define _INDIRECT_ARRAY_H 1
-
-#pragma GCC system_header
-
-namespace std
-{
-  /**
-   *  @brief  Reference to arbitrary subset of an array.
-   *
-   *  An indirect_array is a reference to the actual elements of an array
-   *  specified by an ordered array of indices.  The way to get an indirect_array is to
-   *  call operator[](valarray<size_t>) on a valarray.  The returned
-   *  indirect_array then permits carrying operations out on the referenced
-   *  subset of elements in the original valarray.
-   *
-   *  For example, if an indirect_array is obtained using the array (4,2,0) as
-   *  an argument, and then assigned to an array containing (1,2,3), then the
-   *  underlying array will have array[0]==3, array[2]==2, and array[4]==1.
-   *
-   *  @param  Tp  Element type.
-   */
-  template <class _Tp>
-    class indirect_array
-    {
-    public:
-      typedef _Tp value_type;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 253. valarray helper functions are almost entirely useless
-
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      indirect_array(const indirect_array&);
-
-      ///  Assignment operator.  Assigns elements to corresponding elements
-      ///  of @a a.
-      indirect_array& operator=(const indirect_array&);
-
-      ///  Assign slice elements to corresponding elements of @a v.
-      void operator=(const valarray<_Tp>&) const;
-      ///  Multiply slice elements by corresponding elements of @a v.
-      void operator*=(const valarray<_Tp>&) const;
-      ///  Divide slice elements by corresponding elements of @a v.
-      void operator/=(const valarray<_Tp>&) const;
-      ///  Modulo slice elements by corresponding elements of @a v.
-      void operator%=(const valarray<_Tp>&) const;
-      ///  Add corresponding elements of @a v to slice elements.
-      void operator+=(const valarray<_Tp>&) const;
-      ///  Subtract corresponding elements of @a v from slice elements.
-      void operator-=(const valarray<_Tp>&) const;
-      ///  Logical xor slice elements with corresponding elements of @a v.
-      void operator^=(const valarray<_Tp>&) const;
-      ///  Logical and slice elements with corresponding elements of @a v.
-      void operator&=(const valarray<_Tp>&) const;
-      ///  Logical or slice elements with corresponding elements of @a v.
-      void operator|=(const valarray<_Tp>&) const;
-      ///  Left shift slice elements by corresponding elements of @a v.
-      void operator<<=(const valarray<_Tp>&) const;
-      ///  Right shift slice elements by corresponding elements of @a v.
-      void operator>>=(const valarray<_Tp>&) const;
-      ///  Assign all slice elements to @a t.
-      void operator= (const _Tp&) const;
-      //    ~indirect_array();
-
-      template<class _Dom>
-      void operator=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator*=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator/=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator%=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator+=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator-=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator^=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator&=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator|=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator<<=(const _Expr<_Dom, _Tp>&) const;
-      template<class _Dom>
-      void operator>>=(const _Expr<_Dom, _Tp>&) const;
-
-    private:
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      indirect_array(_Array<_Tp>, size_t, _Array<size_t>);
-
-      friend class valarray<_Tp>;
-      friend class gslice_array<_Tp>;
-
-      const size_t	 _M_sz;
-      const _Array<size_t> _M_index;
-      const _Array<_Tp>	 _M_array;
-
-      // not implemented
-      indirect_array();
-    };
-
-  template<typename _Tp>
-    inline
-    indirect_array<_Tp>::indirect_array(const indirect_array<_Tp>& __a)
-    : _M_sz(__a._M_sz), _M_index(__a._M_index), _M_array(__a._M_array) {}
-
-  template<typename _Tp>
-     inline
-     indirect_array<_Tp>::indirect_array(_Array<_Tp> __a, size_t __s,
-					 _Array<size_t> __i)
-     : _M_sz(__s), _M_index(__i), _M_array(__a) {}
-
-  template<typename _Tp>
-     inline indirect_array<_Tp>&
-     indirect_array<_Tp>::operator=(const indirect_array<_Tp>& __a)
-     {
-       std::__valarray_copy(__a._M_array, _M_sz, __a._M_index, _M_array, _M_index);
-       return *this;
-     }
-
-
-  template<typename _Tp>
-     inline void
-     indirect_array<_Tp>::operator=(const _Tp& __t) const
-     { std::__valarray_fill(_M_array, _M_index, _M_sz, __t); }
-
-  template<typename _Tp>
-     inline void
-     indirect_array<_Tp>::operator=(const valarray<_Tp>& __v) const
-     { std::__valarray_copy(_Array<_Tp>(__v), _M_sz, _M_array, _M_index); }
-
-  template<typename _Tp>
-     template<class _Dom>
-       inline void
-       indirect_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const
-       { std::__valarray_copy(__e, _M_sz, _M_array, _M_index); }
-
-#undef _DEFINE_VALARRAY_OPERATOR
-#define _DEFINE_VALARRAY_OPERATOR(_Op, _Name)				\
-  template<typename _Tp>						\
-    inline void								\
-    indirect_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const\
-    {									\
-      _Array_augmented_##_Name(_M_array, _M_index, _Array<_Tp>(__v), _M_sz); \
-    }									\
-									\
-  template<typename _Tp>                                                \
-    template<class _Dom>				                \
-      inline void							\
-      indirect_array<_Tp>::operator _Op##=(const _Expr<_Dom,_Tp>& __e) const\
-      {									\
-	_Array_augmented_##_Name(_M_array, _M_index, __e, _M_sz);	\
-      }
-
-_DEFINE_VALARRAY_OPERATOR(*, __multiplies)
-_DEFINE_VALARRAY_OPERATOR(/, __divides)
-_DEFINE_VALARRAY_OPERATOR(%, __modulus)
-_DEFINE_VALARRAY_OPERATOR(+, __plus)
-_DEFINE_VALARRAY_OPERATOR(-, __minus)
-_DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
-_DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
-_DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
-_DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
-_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_OPERATOR
-
-} // std::
-
-#endif /* _INDIRECT_ARRAY_H */
-
-// Local Variables:
-// mode:c++
-// End:
diff --git a/include.new/c++/3.4/bits/ios_base.h b/include.new/c++/3.4/bits/ios_base.h
deleted file mode 100644
index 08c952d..0000000
--- a/include.new/c++/3.4/bits/ios_base.h
+++ /dev/null
@@ -1,969 +0,0 @@
-// Iostreams base classes -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.4  Iostreams base classes
-//
-
-/** @file ios_base.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _IOS_BASE_H
-#define _IOS_BASE_H 1
-
-#pragma GCC system_header
-
-#include <bits/atomicity.h>
-#include <bits/localefwd.h>
-#include <bits/locale_classes.h>
-
-namespace std
-{
-  // The following definitions of bitmask types are enums, not ints,
-  // as permitted (but not required) in the standard, in order to provide
-  // better type safety in iostream calls.  A side effect is that
-  // expressions involving them are no longer compile-time constants.
-  enum _Ios_Fmtflags 
-    { 
-      _S_boolalpha 	= 1L << 0,
-      _S_dec 		= 1L << 1,
-      _S_fixed 		= 1L << 2,
-      _S_hex 		= 1L << 3,
-      _S_internal 	= 1L << 4,
-      _S_left 		= 1L << 5,
-      _S_oct 		= 1L << 6,
-      _S_right 		= 1L << 7,
-      _S_scientific 	= 1L << 8,
-      _S_showbase 	= 1L << 9,
-      _S_showpoint 	= 1L << 10,
-      _S_showpos 	= 1L << 11,
-      _S_skipws 	= 1L << 12,
-      _S_unitbuf 	= 1L << 13,
-      _S_uppercase 	= 1L << 14,
-      _S_adjustfield 	= _S_left | _S_right | _S_internal,
-      _S_basefield 	= _S_dec | _S_oct | _S_hex,
-      _S_floatfield 	= _S_scientific | _S_fixed,
-      _S_ios_fmtflags_end = 1L << 16 
-    };
-
-  inline _Ios_Fmtflags
-  operator&(_Ios_Fmtflags __a, _Ios_Fmtflags __b)
-  { return _Ios_Fmtflags(static_cast<int>(__a) & static_cast<int>(__b)); }
-
-  inline _Ios_Fmtflags
-  operator|(_Ios_Fmtflags __a, _Ios_Fmtflags __b)
-  { return _Ios_Fmtflags(static_cast<int>(__a) | static_cast<int>(__b)); }
-
-  inline _Ios_Fmtflags
-  operator^(_Ios_Fmtflags __a, _Ios_Fmtflags __b)
-  { return _Ios_Fmtflags(static_cast<int>(__a) ^ static_cast<int>(__b)); }
-
-  inline _Ios_Fmtflags&
-  operator|=(_Ios_Fmtflags& __a, _Ios_Fmtflags __b)
-  { return __a = __a | __b; }
-
-  inline _Ios_Fmtflags&
-  operator&=(_Ios_Fmtflags& __a, _Ios_Fmtflags __b)
-  { return __a = __a & __b; }
-
-  inline _Ios_Fmtflags&
-  operator^=(_Ios_Fmtflags& __a, _Ios_Fmtflags __b)
-  { return __a = __a ^ __b; }
-
-  inline _Ios_Fmtflags
-  operator~(_Ios_Fmtflags __a)
-  { return _Ios_Fmtflags(~static_cast<int>(__a)); }
-
-
-  enum _Ios_Openmode 
-    { 
-      _S_app 		= 1L << 0,
-      _S_ate 		= 1L << 1,
-      _S_bin 		= 1L << 2,
-      _S_in 		= 1L << 3,
-      _S_out 		= 1L << 4,
-      _S_trunc 		= 1L << 5,
-      _S_ios_openmode_end = 1L << 16 
-    };
-
-  inline _Ios_Openmode
-  operator&(_Ios_Openmode __a, _Ios_Openmode __b)
-  { return _Ios_Openmode(static_cast<int>(__a) & static_cast<int>(__b)); }
-
-  inline _Ios_Openmode
-  operator|(_Ios_Openmode __a, _Ios_Openmode __b)
-  { return _Ios_Openmode(static_cast<int>(__a) | static_cast<int>(__b)); }
-
-  inline _Ios_Openmode
-  operator^(_Ios_Openmode __a, _Ios_Openmode __b)
-  { return _Ios_Openmode(static_cast<int>(__a) ^ static_cast<int>(__b)); }
-
-  inline _Ios_Openmode&
-  operator|=(_Ios_Openmode& __a, _Ios_Openmode __b)
-  { return __a = __a | __b; }
-
-  inline _Ios_Openmode&
-  operator&=(_Ios_Openmode& __a, _Ios_Openmode __b)
-  { return __a = __a & __b; }
-
-  inline _Ios_Openmode&
-  operator^=(_Ios_Openmode& __a, _Ios_Openmode __b)
-  { return __a = __a ^ __b; }
-
-  inline _Ios_Openmode
-  operator~(_Ios_Openmode __a)
-  { return _Ios_Openmode(~static_cast<int>(__a)); }
-
-
-  enum _Ios_Iostate
-    { 
-      _S_goodbit 		= 0,
-      _S_badbit 		= 1L << 0,
-      _S_eofbit 		= 1L << 1,
-      _S_failbit		= 1L << 2,
-      _S_ios_iostate_end = 1L << 16 
-    };
-
-  inline _Ios_Iostate
-  operator&(_Ios_Iostate __a, _Ios_Iostate __b)
-  { return _Ios_Iostate(static_cast<int>(__a) & static_cast<int>(__b)); }
-
-  inline _Ios_Iostate
-  operator|(_Ios_Iostate __a, _Ios_Iostate __b)
-  { return _Ios_Iostate(static_cast<int>(__a) | static_cast<int>(__b)); }
-
-  inline _Ios_Iostate
-  operator^(_Ios_Iostate __a, _Ios_Iostate __b)
-  { return _Ios_Iostate(static_cast<int>(__a) ^ static_cast<int>(__b)); }
-
-  inline _Ios_Iostate&
-  operator|=(_Ios_Iostate& __a, _Ios_Iostate __b)
-  { return __a = __a | __b; }
-
-  inline _Ios_Iostate&
-  operator&=(_Ios_Iostate& __a, _Ios_Iostate __b)
-  { return __a = __a & __b; }
-
-  inline _Ios_Iostate&
-  operator^=(_Ios_Iostate& __a, _Ios_Iostate __b)
-  { return __a = __a ^ __b; }
-
-  inline _Ios_Iostate
-  operator~(_Ios_Iostate __a)
-  { return _Ios_Iostate(~static_cast<int>(__a)); }
-
-  enum _Ios_Seekdir 
-    { 
-      _S_beg = 0,
-      _S_cur = SEEK_CUR,
-      _S_end = SEEK_END,
-      _S_ios_seekdir_end = 1L << 16 
-    };
-
-  // 27.4.2  Class ios_base
-  /**
-   *  @brief  The very top of the I/O class hierarchy.
-   *
-   *  This class defines everything that can be defined about I/O that does
-   *  not depend on the type of characters being input or output.  Most
-   *  people will only see @c ios_base when they need to specify the full
-   *  name of the various I/O flags (e.g., the openmodes).
-  */
-  class ios_base
-  {
-  public:
-
-    // 27.4.2.1.1  Class ios_base::failure
-    /// These are thrown to indicate problems.  Doc me.
-    class failure : public exception
-    {
-    public:
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 48.  Use of non-existent exception constructor
-      explicit
-      failure(const string& __str) throw();
-
-      // This declaration is not useless:
-      // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-      virtual
-      ~failure() throw();
-
-      virtual const char*
-      what() const throw();
-
-    private:
-      string _M_msg;
-    };
-
-    // 27.4.2.1.2  Type ios_base::fmtflags
-    /**
-     *  @brief This is a bitmask type.
-     *
-     *  @c "_Ios_Fmtflags" is implementation-defined, but it is valid to
-     *  perform bitwise operations on these values and expect the Right
-     *  Thing to happen.  Defined objects of type fmtflags are:
-     *  - boolalpha
-     *  - dec
-     *  - fixed
-     *  - hex
-     *  - internal
-     *  - left
-     *  - oct
-     *  - right
-     *  - scientific
-     *  - showbase
-     *  - showpoint
-     *  - showpos
-     *  - skipws
-     *  - unitbuf
-     *  - uppercase
-     *  - adjustfield
-     *  - basefield
-     *  - floatfield
-    */
-    typedef _Ios_Fmtflags fmtflags;
-
-    /// Insert/extract @c bool in alphabetic rather than numeric format.
-    static const fmtflags boolalpha =   fmtflags(__ios_flags::_S_boolalpha);
-
-    /// Converts integer input or generates integer output in decimal base.
-    static const fmtflags dec =         fmtflags(__ios_flags::_S_dec);
-
-    /// Generate floating-point output in fixed-point notation.
-    static const fmtflags fixed =       fmtflags(__ios_flags::_S_fixed);
-
-    /// Converts integer input or generates integer output in hexadecimal base.
-    static const fmtflags hex =         fmtflags(__ios_flags::_S_hex);
-
-    /// Adds fill characters at a designated internal point in certain
-    /// generated output, or identical to @c right if no such point is
-    /// designated.
-    static const fmtflags internal =    fmtflags(__ios_flags::_S_internal);
-
-    /// Adds fill characters on the right (final positions) of certain
-    /// generated output.  (I.e., the thing you print is flush left.)
-    static const fmtflags left =        fmtflags(__ios_flags::_S_left);
-
-    /// Converts integer input or generates integer output in octal base.
-    static const fmtflags oct =         fmtflags(__ios_flags::_S_oct);
-
-    /// Adds fill characters on the left (initial positions) of certain
-    /// generated output.  (I.e., the thing you print is flush right.)
-    static const fmtflags right =       fmtflags(__ios_flags::_S_right);
-
-    /// Generates floating-point output in scientific notation.
-    static const fmtflags scientific =  fmtflags(__ios_flags::_S_scientific);
-
-    /// Generates a prefix indicating the numeric base of generated integer
-    /// output.
-    static const fmtflags showbase =    fmtflags(__ios_flags::_S_showbase);
-
-    /// Generates a decimal-point character unconditionally in generated
-    /// floating-point output.
-    static const fmtflags showpoint =   fmtflags(__ios_flags::_S_showpoint);
-
-    /// Generates a + sign in non-negative generated numeric output.
-    static const fmtflags showpos =     fmtflags(__ios_flags::_S_showpos);
-
-    /// Skips leading white space before certain input operations.
-    static const fmtflags skipws =      fmtflags(__ios_flags::_S_skipws);
-
-    /// Flushes output after each output operation.
-    static const fmtflags unitbuf =     fmtflags(__ios_flags::_S_unitbuf);
-
-    /// Replaces certain lowercase letters with their uppercase equivalents
-    /// in generated output.
-    static const fmtflags uppercase =   fmtflags(__ios_flags::_S_uppercase);
-
-    /// A mask of left|right|internal.  Useful for the 2-arg form of @c setf.
-    static const fmtflags adjustfield = fmtflags(__ios_flags::_S_adjustfield);
-
-    /// A mask of dec|oct|hex.  Useful for the 2-arg form of @c setf.
-    static const fmtflags basefield =   fmtflags(__ios_flags::_S_basefield);
-
-    /// A mask of scientific|fixed.  Useful for the 2-arg form of @c setf.
-    static const fmtflags floatfield =  fmtflags(__ios_flags::_S_floatfield);
-
-    // 27.4.2.1.3  Type ios_base::iostate
-    /**
-     *  @brief This is a bitmask type.
-     *
-     *  @c "_Ios_Iostate" is implementation-defined, but it is valid to
-     *  perform bitwise operations on these values and expect the Right
-     *  Thing to happen.  Defined objects of type iostate are:
-     *  - badbit
-     *  - eofbit
-     *  - failbit
-     *  - goodbit
-    */
-    typedef _Ios_Iostate iostate;
-
-    /// Indicates a loss of integrity in an input or output sequence (such
-    /// as an irrecoverable read error from a file).
-    static const iostate badbit =	iostate(__ios_flags::_S_badbit);
-
-    /// Indicates that an input operation reached the end of an input sequence.
-    static const iostate eofbit =	iostate(__ios_flags::_S_eofbit);
-
-    /// Indicates that an input operation failed to read the expected
-    /// characters, or that an output operation failed to generate the
-    /// desired characters.
-    static const iostate failbit =	iostate(__ios_flags::_S_failbit);
-
-    /// Indicates all is well.
-    static const iostate goodbit =	iostate(0);
-
-    // 27.4.2.1.4  Type ios_base::openmode
-    /**
-     *  @brief This is a bitmask type.
-     *
-     *  @c "_Ios_Openmode" is implementation-defined, but it is valid to
-     *  perform bitwise operations on these values and expect the Right
-     *  Thing to happen.  Defined objects of type openmode are:
-     *  - app
-     *  - ate
-     *  - binary
-     *  - in
-     *  - out
-     *  - trunc
-    */
-    typedef _Ios_Openmode openmode;
-
-    /// Seek to end before each write.
-    static const openmode app =		openmode(__ios_flags::_S_app);
-
-    /// Open and seek to end immediately after opening.
-    static const openmode ate =		openmode(__ios_flags::_S_ate);
-
-    /// Perform input and output in binary mode (as opposed to text mode).
-    /// This is probably not what you think it is; see
-    /// http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#3 and
-    /// http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#7 for more.
-    static const openmode binary =	openmode(__ios_flags::_S_bin);
-
-    /// Open for input.  Default for @c ifstream and fstream.
-    static const openmode in =		openmode(__ios_flags::_S_in);
-
-    /// Open for output.  Default for @c ofstream and fstream.
-    static const openmode out =		openmode(__ios_flags::_S_out);
-
-    /// Open for input.  Default for @c ofstream.
-    static const openmode trunc =	openmode(__ios_flags::_S_trunc);
-
-    // 27.4.2.1.5  Type ios_base::seekdir
-    /**
-     *  @brief This is an enumerated type.
-     *
-     *  @c "_Ios_Seekdir" is implementation-defined.  Defined values
-     *  of type seekdir are:
-     *  - beg
-     *  - cur, equivalent to @c SEEK_CUR in the C standard library.
-     *  - end, equivalent to @c SEEK_END in the C standard library.
-    */
-    typedef _Ios_Seekdir seekdir;
-
-    /// Request a seek relative to the beginning of the stream.
-    static const seekdir beg =		seekdir(0);
-
-    /// Request a seek relative to the current position within the sequence.
-    static const seekdir cur =		seekdir(SEEK_CUR);
-
-    /// Request a seek relative to the current end of the sequence.
-    static const seekdir end =		seekdir(SEEK_END);
-
-#ifdef _GLIBCXX_DEPRECATED
-    // Annex D.6
-    typedef int io_state;
-    typedef int open_mode;
-    typedef int seek_dir;
-
-    typedef std::streampos streampos;
-    typedef std::streamoff streamoff;
-#endif
-
-    // Callbacks;
-    /**
-     *  @brief  The set of events that may be passed to an event callback.
-     *
-     *  erase_event is used during ~ios() and copyfmt().  imbue_event is used
-     *  during imbue().  copyfmt_event is used during copyfmt().
-    */
-    enum event
-    {
-      erase_event,
-      imbue_event,
-      copyfmt_event
-    };
-
-    /**
-     *  @brief  The type of an event callback function.
-     *  @param  event  One of the members of the event enum.
-     *  @param  ios_base  Reference to the ios_base object.
-     *  @param  int  The integer provided when the callback was registered.
-     *
-     *  Event callbacks are user defined functions that get called during
-     *  several ios_base and basic_ios functions, specifically imbue(),
-     *  copyfmt(), and ~ios().
-    */
-    typedef void (*event_callback) (event, ios_base&, int);
-
-    /**
-     *  @brief  Add the callback __fn with parameter __index.
-     *  @param  __fn  The function to add.
-     *  @param  __index  The integer to pass to the function when invoked.
-     *
-     *  Registers a function as an event callback with an integer parameter to
-     *  be passed to the function when invoked.  Multiple copies of the
-     *  function are allowed.  If there are multiple callbacks, they are
-     *  invoked in the order they were registered.
-    */
-    void
-    register_callback(event_callback __fn, int __index);
-
-  protected:
-    //@{
-    /**
-     *  @if maint
-     *  ios_base data members (doc me)
-     *  @endif
-    */
-    streamsize		_M_precision;
-    streamsize		_M_width;
-    fmtflags		_M_flags;
-    iostate		_M_exception;
-    iostate		_M_streambuf_state;
-    //@}
-
-    // 27.4.2.6  Members for callbacks
-    // 27.4.2.6  ios_base callbacks
-    struct _Callback_list
-    {
-      // Data Members
-      _Callback_list*		_M_next;
-      ios_base::event_callback	_M_fn;
-      int			_M_index;
-      _Atomic_word		_M_refcount;  // 0 means one reference.
-
-      _Callback_list(ios_base::event_callback __fn, int __index,
-		     _Callback_list* __cb)
-      : _M_next(__cb), _M_fn(__fn), _M_index(__index), _M_refcount(0) { }
-
-      void
-      _M_add_reference() { __gnu_cxx::__atomic_add(&_M_refcount, 1); }
-
-      // 0 => OK to delete.
-      int
-      _M_remove_reference() 
-      { return __gnu_cxx::__exchange_and_add(&_M_refcount, -1); }
-    };
-
-     _Callback_list*	_M_callbacks;
-
-    void
-    _M_call_callbacks(event __ev) throw();
-
-    void
-    _M_dispose_callbacks(void);
-
-    // 27.4.2.5  Members for iword/pword storage
-    struct _Words
-    {
-      void*	_M_pword;
-      long	_M_iword;
-      _Words() : _M_pword(0), _M_iword(0) { }
-    };
-
-    // Only for failed iword/pword calls.
-    _Words		_M_word_zero;
-
-    // Guaranteed storage.
-    // The first 5 iword and pword slots are reserved for internal use.
-    static const int	_S_local_word_size = 8;
-    _Words		_M_local_word[_S_local_word_size];
-
-    // Allocated storage.
-    int			_M_word_size;
-    _Words*		_M_word;
-
-    _Words&
-    _M_grow_words(int __index, bool __iword);
-
-    // Members for locale and locale caching.
-    locale		_M_ios_locale;
-
-    void
-    _M_init();
-
-  public:
-
-    // 27.4.2.1.6  Class ios_base::Init
-    // Used to initialize standard streams. In theory, g++ could use
-    // -finit-priority to order this stuff correctly without going
-    // through these machinations.
-    class Init
-    {
-      friend class ios_base;
-    public:
-      Init();
-      ~Init();
-
-    private:
-      static _Atomic_word	_S_refcount;
-      static bool		_S_synced_with_stdio;
-    };
-
-    // [27.4.2.2] fmtflags state functions
-    /**
-     *  @brief  Access to format flags.
-     *  @return  The format control flags for both input and output.
-    */
-    inline fmtflags
-    flags() const { return _M_flags; }
-
-    /**
-     *  @brief  Setting new format flags all at once.
-     *  @param  fmtfl  The new flags to set.
-     *  @return  The previous format control flags.
-     *
-     *  This function overwrites all the format flags with @a fmtfl.
-    */
-    inline fmtflags
-    flags(fmtflags __fmtfl)
-    {
-      fmtflags __old = _M_flags;
-      _M_flags = __fmtfl;
-      return __old;
-    }
-
-    /**
-     *  @brief  Setting new format flags.
-     *  @param  fmtfl  Additional flags to set.
-     *  @return  The previous format control flags.
-     *
-     *  This function sets additional flags in format control.  Flags that
-     *  were previously set remain set.
-    */
-    inline fmtflags
-    setf(fmtflags __fmtfl)
-    {
-      fmtflags __old = _M_flags;
-      _M_flags |= __fmtfl;
-      return __old;
-    }
-
-    /**
-     *  @brief  Setting new format flags.
-     *  @param  fmtfl  Additional flags to set.
-     *  @param  mask  The flags mask for @a fmtfl.
-     *  @return  The previous format control flags.
-     *
-     *  This function clears @a mask in the format flags, then sets
-     *  @a fmtfl @c & @a mask.  An example mask is @c ios_base::adjustfield.
-    */
-    inline fmtflags
-    setf(fmtflags __fmtfl, fmtflags __mask)
-    {
-      fmtflags __old = _M_flags;
-      _M_flags &= ~__mask;
-      _M_flags |= (__fmtfl & __mask);
-      return __old;
-    }
-
-    /**
-     *  @brief  Clearing format flags.
-     *  @param  mask  The flags to unset.
-     *
-     *  This function clears @a mask in the format flags.
-    */
-    inline void
-    unsetf(fmtflags __mask) { _M_flags &= ~__mask; }
-
-    /**
-     *  @brief  Flags access.
-     *  @return  The precision to generate on certain output operations.
-     *
-     *  @if maint
-     *  Be careful if you try to give a definition of "precision" here; see
-     *  DR 189.
-     *  @endif
-    */
-    inline streamsize
-    precision() const { return _M_precision; }
-
-    /**
-     *  @brief  Changing flags.
-     *  @param  prec  The new precision value.
-     *  @return  The previous value of precision().
-    */
-    inline streamsize
-    precision(streamsize __prec)
-    {
-      streamsize __old = _M_precision;
-      _M_precision = __prec;
-      return __old;
-    }
-
-    /**
-     *  @brief  Flags access.
-     *  @return  The minimum field width to generate on output operations.
-     *
-     *  "Minimum field width" refers to the number of characters.
-    */
-    inline streamsize
-    width() const { return _M_width; }
-
-    /**
-     *  @brief  Changing flags.
-     *  @param  wide  The new width value.
-     *  @return  The previous value of width().
-    */
-    inline streamsize
-    width(streamsize __wide)
-    {
-      streamsize __old = _M_width;
-      _M_width = __wide;
-      return __old;
-    }
-
-    // [27.4.2.4] ios_base static members
-    /**
-     *  @brief  Interaction with the standard C I/O objects.
-     *  @param  sync  Whether to synchronize or not.
-     *  @return  True if the standard streams were previously synchronized.
-     *
-     *  The synchronization referred to is @e only that between the standard
-     *  C facilities (e.g., stdout) and the standard C++ objects (e.g.,
-     *  cout).  User-declared streams are unaffected.  See
-     *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#8 for more.
-    */
-    static bool
-    sync_with_stdio(bool __sync = true);
-
-    // [27.4.2.3] ios_base locale functions
-    /**
-     *  @brief  Setting a new locale.
-     *  @param  loc  The new locale.
-     *  @return  The previous locale.
-     *
-     *  Sets the new locale for this stream, and then invokes each callback
-     *  with imbue_event.
-    */
-    locale
-    imbue(const locale& __loc);
-
-    /**
-     *  @brief  Locale access
-     *  @return  A copy of the current locale.
-     *
-     *  If @c imbue(loc) has previously been called, then this function
-     *  returns @c loc.  Otherwise, it returns a copy of @c std::locale(),
-     *  the global C++ locale.
-    */
-    inline locale
-    getloc() const { return _M_ios_locale; }
-
-    /**
-     *  @brief  Locale access
-     *  @return  A reference to the current locale.
-     *
-     *  Like getloc above, but returns a reference instead of
-     *  generating a copy.
-    */
-    inline const locale&
-    _M_getloc() const { return _M_ios_locale; }
-
-    // [27.4.2.5] ios_base storage functions
-    /**
-     *  @brief  Access to unique indices.
-     *  @return  An integer different from all previous calls.
-     *
-     *  This function returns a unique integer every time it is called.  It
-     *  can be used for any purpose, but is primarily intended to be a unique
-     *  index for the iword and pword functions.  The expectation is that an
-     *  application calls xalloc in order to obtain an index in the iword and
-     *  pword arrays that can be used without fear of conflict.
-     *
-     *  The implementation maintains a static variable that is incremented and
-     *  returned on each invocation.  xalloc is guaranteed to return an index
-     *  that is safe to use in the iword and pword arrays.
-    */
-    static int
-    xalloc() throw();
-
-    /**
-     *  @brief  Access to integer array.
-     *  @param  __ix  Index into the array.
-     *  @return  A reference to an integer associated with the index.
-     *
-     *  The iword function provides access to an array of integers that can be
-     *  used for any purpose.  The array grows as required to hold the
-     *  supplied index.  All integers in the array are initialized to 0.
-     *
-     *  The implementation reserves several indices.  You should use xalloc to
-     *  obtain an index that is safe to use.  Also note that since the array
-     *  can grow dynamically, it is not safe to hold onto the reference.
-    */
-    inline long&
-    iword(int __ix)
-    {
-      _Words& __word = (__ix < _M_word_size)
-			? _M_word[__ix] : _M_grow_words(__ix, true);
-      return __word._M_iword;
-    }
-
-    /**
-     *  @brief  Access to void pointer array.
-     *  @param  __ix  Index into the array.
-     *  @return  A reference to a void* associated with the index.
-     *
-     *  The pword function provides access to an array of pointers that can be
-     *  used for any purpose.  The array grows as required to hold the
-     *  supplied index.  All pointers in the array are initialized to 0.
-     *
-     *  The implementation reserves several indices.  You should use xalloc to
-     *  obtain an index that is safe to use.  Also note that since the array
-     *  can grow dynamically, it is not safe to hold onto the reference.
-    */
-    inline void*&
-    pword(int __ix)
-    {
-      _Words& __word = (__ix < _M_word_size)
-			? _M_word[__ix] : _M_grow_words(__ix, false);
-      return __word._M_pword;
-    }
-
-    // Destructor
-    /**
-     *  Invokes each callback with erase_event.  Destroys local storage.
-     *
-     *  Note that the ios_base object for the standard streams never gets
-     *  destroyed.  As a result, any callbacks registered with the standard
-     *  streams will not get invoked with erase_event (unless copyfmt is
-     *  used).
-    */
-    virtual ~ios_base();
-
-  protected:
-    ios_base();
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 50.  Copy constructor and assignment operator of ios_base
-  private:
-    ios_base(const ios_base&);
-
-    ios_base&
-    operator=(const ios_base&);
-  };
-
-  // [27.4.5.1] fmtflags manipulators
-  /// Calls base.setf(ios_base::boolalpha).
-  inline ios_base&
-  boolalpha(ios_base& __base)
-  {
-    __base.setf(ios_base::boolalpha);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::boolalpha).
-  inline ios_base&
-  noboolalpha(ios_base& __base)
-  {
-    __base.unsetf(ios_base::boolalpha);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::showbase).
-  inline ios_base&
-  showbase(ios_base& __base)
-  {
-    __base.setf(ios_base::showbase);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::showbase).
-  inline ios_base&
-  noshowbase(ios_base& __base)
-  {
-    __base.unsetf(ios_base::showbase);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::showpoint).
-  inline ios_base&
-  showpoint(ios_base& __base)
-  {
-    __base.setf(ios_base::showpoint);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::showpoint).
-  inline ios_base&
-  noshowpoint(ios_base& __base)
-  {
-    __base.unsetf(ios_base::showpoint);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::showpos).
-  inline ios_base&
-  showpos(ios_base& __base)
-  {
-    __base.setf(ios_base::showpos);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::showpos).
-  inline ios_base&
-  noshowpos(ios_base& __base)
-  {
-    __base.unsetf(ios_base::showpos);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::skipws).
-  inline ios_base&
-  skipws(ios_base& __base)
-  {
-    __base.setf(ios_base::skipws);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::skipws).
-  inline ios_base&
-  noskipws(ios_base& __base)
-  {
-    __base.unsetf(ios_base::skipws);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::uppercase).
-  inline ios_base&
-  uppercase(ios_base& __base)
-  {
-    __base.setf(ios_base::uppercase);
-    return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::uppercase).
-  inline ios_base&
-  nouppercase(ios_base& __base)
-  {
-    __base.unsetf(ios_base::uppercase);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::unitbuf).
-  inline ios_base&
-  unitbuf(ios_base& __base)
-  {
-     __base.setf(ios_base::unitbuf);
-     return __base;
-  }
-
-  /// Calls base.unsetf(ios_base::unitbuf).
-  inline ios_base&
-  nounitbuf(ios_base& __base)
-  {
-     __base.unsetf(ios_base::unitbuf);
-     return __base;
-  }
-
-  // [27.4.5.2] adjustfield anipulators
-  /// Calls base.setf(ios_base::internal, ios_base::adjustfield).
-  inline ios_base&
-  internal(ios_base& __base)
-  {
-     __base.setf(ios_base::internal, ios_base::adjustfield);
-     return __base;
-  }
-
-  /// Calls base.setf(ios_base::left, ios_base::adjustfield).
-  inline ios_base&
-  left(ios_base& __base)
-  {
-    __base.setf(ios_base::left, ios_base::adjustfield);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::right, ios_base::adjustfield).
-  inline ios_base&
-  right(ios_base& __base)
-  {
-    __base.setf(ios_base::right, ios_base::adjustfield);
-    return __base;
-  }
-
-  // [27.4.5.3] basefield anipulators
-  /// Calls base.setf(ios_base::dec, ios_base::basefield).
-  inline ios_base&
-  dec(ios_base& __base)
-  {
-    __base.setf(ios_base::dec, ios_base::basefield);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::hex, ios_base::basefield).
-  inline ios_base&
-  hex(ios_base& __base)
-  {
-    __base.setf(ios_base::hex, ios_base::basefield);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::oct, ios_base::basefield).
-  inline ios_base&
-  oct(ios_base& __base)
-  {
-    __base.setf(ios_base::oct, ios_base::basefield);
-    return __base;
-  }
-
-  // [27.4.5.4] floatfield anipulators
-  /// Calls base.setf(ios_base::fixed, ios_base::floatfield).
-  inline ios_base&
-  fixed(ios_base& __base)
-  {
-    __base.setf(ios_base::fixed, ios_base::floatfield);
-    return __base;
-  }
-
-  /// Calls base.setf(ios_base::scientific, ios_base::floatfield).
-  inline ios_base&
-  scientific(ios_base& __base)
-  {
-    __base.setf(ios_base::scientific, ios_base::floatfield);
-    return __base;
-  }
-} // namespace std
-
-#endif /* _IOS_BASE_H */
-
diff --git a/include.new/c++/3.4/bits/istream.tcc b/include.new/c++/3.4/bits/istream.tcc
deleted file mode 100644
index 9decce3..0000000
--- a/include.new/c++/3.4/bits/istream.tcc
+++ /dev/null
@@ -1,1192 +0,0 @@
-// istream classes -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.6.1  Input streams
-//
-
-#ifndef _ISTREAM_TCC
-#define _ISTREAM_TCC 1
-
-#pragma GCC system_header
-
-#include <locale>
-#include <ostream> // For flush()
-
-namespace std
-{
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>::sentry::
-    sentry(basic_istream<_CharT, _Traits>& __in, bool __noskip) : _M_ok(false)
-    {
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      if (__in.good())
-	{
-	  if (__in.tie())
-	    __in.tie()->flush();
-	  if (!__noskip && (__in.flags() & ios_base::skipws))
-	    {
-	      const __int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = __in.rdbuf();
-	      __int_type __c = __sb->sgetc();
-
-	      const __ctype_type& __ct = __check_facet(__in._M_ctype);
-	      while (!traits_type::eq_int_type(__c, __eof)
-		     && __ct.is(ctype_base::space, 
-				traits_type::to_char_type(__c)))
-		__c = __sb->snextc();
-
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 195. Should basic_istream::sentry's constructor ever
-	      // set eofbit?
-	      if (traits_type::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	    }
-	}
-
-      if (__in.good() && __err == ios_base::goodbit)
-	_M_ok = true;
-      else
-	{
-	  __err |= ios_base::failbit;
-	  __in.setstate(__err);
-	}
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(__istream_type& (*__pf)(__istream_type&))
-    { return __pf(*this); }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(__ios_type& (*__pf)(__ios_type&))
-    {
-      __pf(*this);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(ios_base& (*__pf)(ios_base&))
-    {
-      __pf(*this);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(bool& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(short& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      long __l;
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __l);
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 118. basic_istream uses nonexistent num_get member functions.
-	      if (!(__err & ios_base::failbit)
-		  && (numeric_limits<short>::min() <= __l
-		      && __l <= numeric_limits<short>::max()))
-		__n = __l;
-	      else
-                __err |= ios_base::failbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(unsigned short& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(int& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      long __l;
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __l);
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 118. basic_istream uses nonexistent num_get member functions.
-	      if (!(__err & ios_base::failbit)
-		  && (numeric_limits<int>::min() <= __l
-		      && __l <= numeric_limits<int>::max()))
-		__n = __l;
-	      else
-                __err |= ios_base::failbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(unsigned int& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(long& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(unsigned long& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(long long& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(unsigned long long& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-#endif
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(float& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(double& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(long double& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(void*& __n)
-    {
-      sentry __cerb(*this, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_get_type& __ng = __check_facet(this->_M_num_get);
-	      __ng.get(*this, 0, *this, __err, __n);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    operator>>(__streambuf_type* __sbout)
-    {
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      sentry __cerb(*this, false);
-      if (__cerb && __sbout)
-	{
-	  try
-	    {
-	      if (!__copy_streambufs(this->rdbuf(), __sbout))
-		__err |= ios_base::failbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::failbit); }
-	}
-      else if (!__sbout)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_istream<_CharT, _Traits>::int_type
-    basic_istream<_CharT, _Traits>::
-    get(void)
-    {
-      const int_type __eof = traits_type::eof();
-      int_type __c = __eof;
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  try
-	    {
-	      __c = this->rdbuf()->sbumpc();
-	      // 27.6.1.1 paragraph 3
-	      if (!traits_type::eq_int_type(__c, __eof))
-		_M_gcount = 1;
-	      else
-		__err |= ios_base::eofbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      if (!_M_gcount)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return __c;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    get(char_type& __c)
-    {
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  try
-	    {
-	      const int_type __cb = this->rdbuf()->sbumpc();
-	      // 27.6.1.1 paragraph 3
-	      if (!traits_type::eq_int_type(__cb, traits_type::eof()))
-		{
-		  _M_gcount = 1;
-		  __c = traits_type::to_char_type(__cb);
-		}
-	      else
-		__err |= ios_base::eofbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      if (!_M_gcount)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    get(char_type* __s, streamsize __n, char_type __delim)
-    {
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  try
-	    {
-	      const int_type __idelim = traits_type::to_int_type(__delim);
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-	      int_type __c = __sb->sgetc();
-
-	      while (_M_gcount + 1 < __n
-		     && !traits_type::eq_int_type(__c, __eof)
-		     && !traits_type::eq_int_type(__c, __idelim))
-		{
-		  *__s++ = traits_type::to_char_type(__c);
-		  ++_M_gcount;
-		  __c = __sb->snextc();
-		}
-	      if (traits_type::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      *__s = char_type();
-      if (!_M_gcount)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    get(__streambuf_type& __sb, char_type __delim)
-    {
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  try
-	    {
-	      const int_type __idelim = traits_type::to_int_type(__delim);
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __this_sb = this->rdbuf();
-	      int_type __c = __this_sb->sgetc();
-	      char_type __c2 = traits_type::to_char_type(__c);
-
-	      while (!traits_type::eq_int_type(__c, __eof)
-		     && !traits_type::eq_int_type(__c, __idelim)
-		     && !traits_type::eq_int_type(__sb.sputc(__c2), __eof))
-		{
-		  ++_M_gcount;
-		  __c = __this_sb->snextc();
-		  __c2 = traits_type::to_char_type(__c);
-		}
-	      if (traits_type::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      if (!_M_gcount)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    getline(char_type* __s, streamsize __n, char_type __delim)
-    {
-      _M_gcount = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-          try
-	    {
-	      const int_type __idelim = traits_type::to_int_type(__delim);
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-	      int_type __c = __sb->sgetc();
-	      
-	      while (_M_gcount + 1 < __n
-		     && !traits_type::eq_int_type(__c, __eof)
-		     && !traits_type::eq_int_type(__c, __idelim))
-		{
-		  streamsize __size = std::min(streamsize(__sb->egptr()
-							  - __sb->gptr()),
-					       __n - _M_gcount - 1);
-		  if (__size > 1)
-		    {
-		      const char_type* __p = traits_type::find(__sb->gptr(),
-							       __size,
-							       __delim);
-		      if (__p)
-			__size = __p - __sb->gptr();
-		      traits_type::copy(__s, __sb->gptr(), __size);
-		      __s += __size;
-		      __sb->gbump(__size);
-		      _M_gcount += __size;
-		      __c = __sb->sgetc();
-		    }
-		  else
-		    {
-		      *__s++ = traits_type::to_char_type(__c);
-		      ++_M_gcount;
-		      __c = __sb->snextc();
-		    }
-		}
-
-	      if (traits_type::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	      else if (traits_type::eq_int_type(__c, __idelim))
-		{
-		  ++_M_gcount;		  
-		  __sb->sbumpc();
-		}
-	      else
-		__err |= ios_base::failbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      *__s = char_type();
-      if (!_M_gcount)
-	__err |= ios_base::failbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    ignore(streamsize __n, int_type __delim)
-    {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb && __n > 0)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-	      int_type __c;
-
-	      if (__n != numeric_limits<streamsize>::max())
-		--__n;
-	      while (_M_gcount <= __n
-		     && !traits_type::eq_int_type(__c = __sb->sbumpc(), __eof))
-		{
-		  ++_M_gcount;
-		  if (traits_type::eq_int_type(__c, __delim))
-		    break;
-		}
-	      if (traits_type::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_istream<_CharT, _Traits>::int_type
-    basic_istream<_CharT, _Traits>::
-    peek(void)
-    {
-      int_type __c = traits_type::eof();
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      __c = this->rdbuf()->sgetc();
-	      if (traits_type::eq_int_type(__c, traits_type::eof()))
-		__err |= ios_base::eofbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return __c;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    read(char_type* __s, streamsize __n)
-    {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      _M_gcount = this->rdbuf()->sgetn(__s, __n);
-	      if (_M_gcount != __n)
-		__err |= (ios_base::eofbit | ios_base::failbit);
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_istream<_CharT, _Traits>::
-    readsome(char_type* __s, streamsize __n)
-    {
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      // Cannot compare int_type with streamsize generically.
-	      const streamsize __num = this->rdbuf()->in_avail();
-	      if (__num > 0)
-		_M_gcount = this->rdbuf()->sgetn(__s, std::min(__num, __n));
-	      else if (__num == -1)
-		__err |= ios_base::eofbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return _M_gcount;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    putback(char_type __c)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 60. What is a formatted input function?
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-	      if (!__sb
-		  || traits_type::eq_int_type(__sb->sputbackc(__c), __eof))
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    unget(void)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 60. What is a formatted input function?
-      _M_gcount = 0;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const int_type __eof = traits_type::eof();
-	      __streambuf_type* __sb = this->rdbuf();
-	      if (!__sb
-		  || traits_type::eq_int_type(__sb->sungetc(), __eof))
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    int
-    basic_istream<_CharT, _Traits>::
-    sync(void)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR60.  Do not change _M_gcount.
-      int __ret = -1;
-      sentry __cerb(*this, true);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      __streambuf_type* __sb = this->rdbuf();
-	      if (__sb)
-		{
-		  if (__sb->pubsync() == -1)
-		    __err |= ios_base::badbit;
-		  else
-		    __ret = 0;
-		}
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_istream<_CharT, _Traits>::pos_type
-    basic_istream<_CharT, _Traits>::
-    tellg(void)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR60.  Do not change _M_gcount.
-      pos_type __ret = pos_type(-1);
-      try
-	{
-	  if (!this->fail())
-	    __ret = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in);
-	}
-      catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    seekg(pos_type __pos)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR60.  Do not change _M_gcount.
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      try
-	{
-	  if (!this->fail())
-	    {
-	      // 136.  seekp, seekg setting wrong streams?
-	      const pos_type __p = this->rdbuf()->pubseekpos(__pos,
-							     ios_base::in);
-
-	      // 129. Need error indication from seekp() and seekg()
-	      if (__p == pos_type(off_type(-1)))
-		__err |= ios_base::failbit;
-	    }
-	}
-      catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    basic_istream<_CharT, _Traits>::
-    seekg(off_type __off, ios_base::seekdir __dir)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR60.  Do not change _M_gcount.
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      try
-	{
-	  if (!this->fail())
-	    {
-	      // 136.  seekp, seekg setting wrong streams?
-	      const pos_type __p = this->rdbuf()->pubseekoff(__off, __dir,
-							     ios_base::in);
-
-	      // 129. Need error indication from seekp() and seekg()
-	      if (__p == pos_type(off_type(-1)))
-		__err |= ios_base::failbit;
-	    }
-	}
-      catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  // 27.6.1.2.3 Character extraction templates
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef typename __istream_type::int_type         __int_type;
-
-      typename __istream_type::sentry __cerb(__in, false);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __int_type __cb = __in.rdbuf()->sbumpc();
-	      if (!_Traits::eq_int_type(__cb, _Traits::eof()))
-		__c = _Traits::to_char_type(__cb);
-	      else
-		__err |= (ios_base::eofbit | ios_base::failbit);
-	    }
-	  catch(...)
-	    { __in._M_setstate(ios_base::badbit); }
-	  if (__err)
-	    __in.setstate(__err);
-	}
-      return __in;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename _Traits::int_type		int_type;
-      typedef _CharT					char_type;
-      typedef ctype<_CharT>				__ctype_type;
-
-      streamsize __extracted = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      typename __istream_type::sentry __cerb(__in, false);
-      if (__cerb)
-	{
-	  try
-	    {
-	      // Figure out how many characters to extract.
-	      streamsize __num = __in.width();
-	      if (__num <= 0)
-		__num = numeric_limits<streamsize>::max();
-
-	      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
-
-	      const int_type __eof = _Traits::eof();
-	      __streambuf_type* __sb = __in.rdbuf();
-	      int_type __c = __sb->sgetc();
-
-	      while (__extracted < __num - 1
-		     && !_Traits::eq_int_type(__c, __eof)
-		     && !__ct.is(ctype_base::space,
-				 _Traits::to_char_type(__c)))
-		{
-		  *__s++ = _Traits::to_char_type(__c);
-		  ++__extracted;
-		  __c = __sb->snextc();
-		}
-	      if (_Traits::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 68.  Extractors for char* should store null at end
-	      *__s = char_type();
-	      __in.width(0);
-	    }
-	  catch(...)
-	    { __in._M_setstate(ios_base::badbit); }
-	}
-      if (!__extracted)
-	__err |= ios_base::failbit;
-      if (__err)
-	__in.setstate(__err);
-      return __in;
-    }
-
-  // 27.6.1.4 Standard basic_istream manipulators
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT,_Traits>&
-    ws(basic_istream<_CharT,_Traits>& __in)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename __istream_type::__ctype_type	__ctype_type;
-      typedef typename __istream_type::int_type		__int_type;
-
-      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
-      const __int_type __eof = _Traits::eof();
-      __streambuf_type* __sb = __in.rdbuf();
-      __int_type __c = __sb->sgetc();
-
-      while (!_Traits::eq_int_type(__c, __eof)
-	     && __ct.is(ctype_base::space, _Traits::to_char_type(__c)))
-	__c = __sb->snextc();
-
-       if (_Traits::eq_int_type(__c, __eof))
-	 __in.setstate(ios_base::eofbit);
-      return __in;
-    }
-
-  // 21.3.7.9 basic_string::getline and operators
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in,
-	       basic_string<_CharT, _Traits, _Alloc>& __str)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef typename __istream_type::int_type		__int_type;
-      typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename __istream_type::__ctype_type	__ctype_type;
-      typedef basic_string<_CharT, _Traits, _Alloc>	__string_type;
-      typedef typename __string_type::size_type		__size_type;
-
-      __size_type __extracted = 0;
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      typename __istream_type::sentry __cerb(__in, false);
-      if (__cerb)
-	{
-	  try
-	    {
-	      // Avoid reallocation for common case.
-	      __str.erase();
-	      _CharT __buf[128];
-	      __size_type __len = 0;	      
-	      const streamsize __w = __in.width();
-	      const __size_type __n = __w > 0 ? static_cast<__size_type>(__w)
-		                              : __str.max_size();
-	      const __ctype_type& __ct = use_facet<__ctype_type>(__in.getloc());
-	      const __int_type __eof = _Traits::eof();
-	      __streambuf_type* __sb = __in.rdbuf();
-	      __int_type __c = __sb->sgetc();
-
-	      while (__extracted < __n
-		     && !_Traits::eq_int_type(__c, __eof)
-		     && !__ct.is(ctype_base::space, _Traits::to_char_type(__c)))
-		{
-		  if (__len == sizeof(__buf) / sizeof(_CharT))
-		    {
-		      __str.append(__buf, sizeof(__buf) / sizeof(_CharT));
-		      __len = 0;
-		    }
-		  __buf[__len++] = _Traits::to_char_type(__c);
-		  ++__extracted;
-		  __c = __sb->snextc();
-		}
-	      __str.append(__buf, __len);
-
-	      if (_Traits::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	      __in.width(0);
-	    }
-	  catch(...)
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 91. Description of operator>> and getline() for string<>
-	      // might cause endless loop
-	      __in._M_setstate(ios_base::badbit);
-	    }
-	}
-      // 211.  operator>>(istream&, string&) doesn't set failbit
-      if (!__extracted)
-	__err |= ios_base::failbit;
-      if (__err)
-	__in.setstate(__err);
-      return __in;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_istream<_CharT, _Traits>&
-    getline(basic_istream<_CharT, _Traits>& __in,
-	    basic_string<_CharT, _Traits, _Alloc>& __str, _CharT __delim)
-    {
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef typename __istream_type::int_type		__int_type;
-      typedef typename __istream_type::__streambuf_type __streambuf_type;
-      typedef typename __istream_type::__ctype_type	__ctype_type;
-      typedef basic_string<_CharT, _Traits, _Alloc>	__string_type;
-      typedef typename __string_type::size_type		__size_type;
-
-      __size_type __extracted = 0;
-      const __size_type __n = __str.max_size();
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      typename __istream_type::sentry __cerb(__in, true);
-      if (__cerb)
-	{
-	  try
-	    {
-	      // Avoid reallocation for common case.
-	      __str.erase();
-	      _CharT __buf[128];
-	      __size_type __len = 0;
-	      const __int_type __idelim = _Traits::to_int_type(__delim);
-	      const __int_type __eof = _Traits::eof();
-	      __streambuf_type* __sb = __in.rdbuf();
-	      __int_type __c = __sb->sgetc();
-
-	      while (__extracted < __n
-		     && !_Traits::eq_int_type(__c, __eof)
-		     && !_Traits::eq_int_type(__c, __idelim))
-		{
-		  if (__len == sizeof(__buf) / sizeof(_CharT))
-		    {
-		      __str.append(__buf, sizeof(__buf) / sizeof(_CharT));
-		      __len = 0;
-		    }
-		  __buf[__len++] = _Traits::to_char_type(__c);
-		  ++__extracted;
-		  __c = __sb->snextc();
-		}
-	      __str.append(__buf, __len);
-
-	      if (_Traits::eq_int_type(__c, __eof))
-		__err |= ios_base::eofbit;
-	      else if (_Traits::eq_int_type(__c, __idelim))
-		{
-		  ++__extracted;		  
-		  __sb->sbumpc();
-		}
-	      else
-		__err |= ios_base::failbit;
-	    }
-	  catch(...)
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 91. Description of operator>> and getline() for string<>
-	      // might cause endless loop
-	      __in._M_setstate(ios_base::badbit);
-	    }
-	}
-      if (!__extracted)
-	__err |= ios_base::failbit;
-      if (__err)
-	__in.setstate(__err);
-      return __in;
-    }
-
-  template<class _CharT, class _Traits, class _Alloc>
-    inline basic_istream<_CharT,_Traits>&
-    getline(basic_istream<_CharT, _Traits>& __in,
-	    basic_string<_CharT,_Traits,_Alloc>& __str)
-    { return getline(__in, __str, __in.widen('\n')); }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB:  This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_istream<char>;
-  extern template istream& ws(istream&);
-  extern template istream& operator>>(istream&, char&);
-  extern template istream& operator>>(istream&, char*);
-  extern template istream& operator>>(istream&, unsigned char&);
-  extern template istream& operator>>(istream&, signed char&);
-  extern template istream& operator>>(istream&, unsigned char*);
-  extern template istream& operator>>(istream&, signed char*);
-
-  extern template class basic_iostream<char>;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_istream<wchar_t>;
-  extern template wistream& ws(wistream&);
-  extern template wistream& operator>>(wistream&, wchar_t&);
-  extern template wistream& operator>>(wistream&, wchar_t*);
-
-  extern template class basic_iostream<wchar_t>;
-#endif
-#endif
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/list.tcc b/include.new/c++/3.4/bits/list.tcc
deleted file mode 100644
index aaaa8c3..0000000
--- a/include.new/c++/3.4/bits/list.tcc
+++ /dev/null
@@ -1,377 +0,0 @@
-// List implementation (out of line) -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file list.tcc
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _LIST_TCC
-#define _LIST_TCC 1
-
-namespace _GLIBCXX_STD
-{
-  template<typename _Tp, typename _Alloc>
-    void
-    _List_base<_Tp,_Alloc>::
-    _M_clear()
-    {
-      typedef _List_node<_Tp>  _Node;
-      _Node* __cur = static_cast<_Node*>(this->_M_impl._M_node._M_next);
-      while (__cur != &this->_M_impl._M_node)
-      {
-        _Node* __tmp = __cur;
-        __cur = static_cast<_Node*>(__cur->_M_next);
-        std::_Destroy(&__tmp->_M_data);
-        _M_put_node(__tmp);
-      }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    typename list<_Tp,_Alloc>::iterator
-    list<_Tp,_Alloc>::
-    insert(iterator __position, const value_type& __x)
-    {
-      _Node* __tmp = _M_create_node(__x);
-      __tmp->hook(__position._M_node);
-      return __tmp;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    typename list<_Tp,_Alloc>::iterator
-    list<_Tp,_Alloc>::
-    erase(iterator __position)
-    {
-      iterator __ret = __position._M_node->_M_next;
-      _M_erase(__position);
-      return __ret;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp,_Alloc>::
-    resize(size_type __new_size, const value_type& __x)
-    {
-      iterator __i = begin();
-      size_type __len = 0;
-      for ( ; __i != end() && __len < __new_size; ++__i, ++__len)
-        ;
-      if (__len == __new_size)
-        erase(__i, end());
-      else                          // __i == end()
-        insert(end(), __new_size - __len, __x);
-    }
-
-  template<typename _Tp, typename _Alloc>
-    list<_Tp,_Alloc>&
-    list<_Tp,_Alloc>::
-    operator=(const list& __x)
-    {
-      if (this != &__x)
-	{
-	  iterator __first1 = begin();
-	  iterator __last1 = end();
-	  const_iterator __first2 = __x.begin();
-	  const_iterator __last2 = __x.end();
-	  while (__first1 != __last1 && __first2 != __last2)
-	    *__first1++ = *__first2++;
-	  if (__first2 == __last2)
-	    erase(__first1, __last1);
-	  else
-	    insert(__last1, __first2, __last2);
-	}
-      return *this;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp,_Alloc>::
-    _M_fill_assign(size_type __n, const value_type& __val)
-    {
-      iterator __i = begin();
-      for ( ; __i != end() && __n > 0; ++__i, --__n)
-        *__i = __val;
-      if (__n > 0)
-        insert(end(), __n, __val);
-      else
-        erase(__i, end());
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _InputIterator>
-      void
-      list<_Tp,_Alloc>::
-      _M_assign_dispatch(_InputIterator __first2, _InputIterator __last2,
-			 __false_type)
-      {
-        iterator __first1 = begin();
-        iterator __last1 = end();
-        for (; __first1 != __last1 && __first2 != __last2;
-	     ++__first1, ++__first2)
-          *__first1 = *__first2;
-        if (__first2 == __last2)
-          erase(__first1, __last1);
-        else
-          insert(__last1, __first2, __last2);
-      }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp,_Alloc>::
-    remove(const value_type& __value)
-    {
-      iterator __first = begin();
-      iterator __last = end();
-      while (__first != __last)
-      {
-        iterator __next = __first;
-        ++__next;
-        if (*__first == __value)
-          _M_erase(__first);
-        __first = __next;
-      }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp,_Alloc>::
-    unique()
-    {
-      iterator __first = begin();
-      iterator __last = end();
-      if (__first == __last)
-	return;
-      iterator __next = __first;
-      while (++__next != __last)
-      {
-        if (*__first == *__next)
-          _M_erase(__next);
-        else
-          __first = __next;
-        __next = __first;
-      }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp,_Alloc>::
-    merge(list& __x)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 300. list::merge() specification incomplete
-      if (this != &__x)
-	{
-	  iterator __first1 = begin();
-	  iterator __last1 = end();
-	  iterator __first2 = __x.begin();
-	  iterator __last2 = __x.end();
-	  while (__first1 != __last1 && __first2 != __last2)
-	    if (*__first2 < *__first1)
-	      {
-		iterator __next = __first2;
-		_M_transfer(__first1, __first2, ++__next);
-		__first2 = __next;
-	      }
-	    else
-	      ++__first1;
-	  if (__first2 != __last2)
-	    _M_transfer(__last1, __first2, __last2);
-	}
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    list<_Tp,_Alloc>::
-    sort()
-    {
-      // Do nothing if the list has length 0 or 1.
-      if (this->_M_impl._M_node._M_next != &this->_M_impl._M_node
-	  && this->_M_impl._M_node._M_next->_M_next != &this->_M_impl._M_node)
-      {
-        list __carry;
-        list __tmp[64];
-        list * __fill = &__tmp[0];
-        list * __counter;
-
-        do
-	  {
-	    __carry.splice(__carry.begin(), *this, begin());
-
-	    for(__counter = &__tmp[0];
-		(__counter != __fill) && !__counter->empty();
-		++__counter)
-	      {
-		__counter->merge(__carry);
-		__carry.swap(*__counter);
-	      }
-	    __carry.swap(*__counter);
-	    if (__counter == __fill)
-	      ++__fill;
-	  }
-	while ( !empty() );
-
-        for (__counter =  &__tmp[1]; __counter != __fill; ++__counter)
-          __counter->merge( *(__counter-1) );
-        swap( *(__fill-1) );
-      }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _Predicate>
-      void
-      list<_Tp,_Alloc>::
-      remove_if(_Predicate __pred)
-      {
-        iterator __first = begin();
-        iterator __last = end();
-        while (__first != __last)
-        {
-          iterator __next = __first;
-          ++__next;
-          if (__pred(*__first))
-	    _M_erase(__first);
-          __first = __next;
-        }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _BinaryPredicate>
-      void
-      list<_Tp,_Alloc>::
-      unique(_BinaryPredicate __binary_pred)
-      {
-        iterator __first = begin();
-        iterator __last = end();
-        if (__first == __last) return;
-        iterator __next = __first;
-        while (++__next != __last)
-        {
-          if (__binary_pred(*__first, *__next))
-            _M_erase(__next);
-          else
-            __first = __next;
-          __next = __first;
-        }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _StrictWeakOrdering>
-      void
-      list<_Tp,_Alloc>::
-      merge(list& __x, _StrictWeakOrdering __comp)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 300. list::merge() specification incomplete
-	if (this != &__x)
-	  {
-	    iterator __first1 = begin();
-	    iterator __last1 = end();
-	    iterator __first2 = __x.begin();
-	    iterator __last2 = __x.end();
-	    while (__first1 != __last1 && __first2 != __last2)
-	      if (__comp(*__first2, *__first1))
-		{
-		  iterator __next = __first2;
-		  _M_transfer(__first1, __first2, ++__next);
-		  __first2 = __next;
-		}
-	      else
-		++__first1;
-	    if (__first2 != __last2)
-	      _M_transfer(__last1, __first2, __last2);
-	  }
-      }
-
-  template<typename _Tp, typename _Alloc>
-    template <typename _StrictWeakOrdering>
-      void
-      list<_Tp,_Alloc>::
-      sort(_StrictWeakOrdering __comp)
-      {
-	// Do nothing if the list has length 0 or 1.
-	if (this->_M_impl._M_node._M_next != &this->_M_impl._M_node
-	    && this->_M_impl._M_node._M_next->_M_next != &this->_M_impl._M_node)
-	  {
-	    list __carry;
-	    list __tmp[64];
-	    list * __fill = &__tmp[0];
-	    list * __counter;
-
-	    do
-	      {
-		__carry.splice(__carry.begin(), *this, begin());
-
-		for(__counter = &__tmp[0];
-		    (__counter != __fill) && !__counter->empty();
-		    ++__counter)
-		  {
-		    __counter->merge(__carry, __comp);
-		    __carry.swap(*__counter);
-		  }
-		__carry.swap(*__counter);
-		if (__counter == __fill)
-		  ++__fill;
-	      }
-	    while ( !empty() );
-
-	    for (__counter =  &__tmp[1]; __counter != __fill; ++__counter)
-	      __counter->merge( *(__counter-1), __comp );
-	    swap( *(__fill-1) );
-	  }
-      }
-} // namespace std
-
-#endif /* _LIST_TCC */
-
diff --git a/include.new/c++/3.4/bits/locale_classes.h b/include.new/c++/3.4/bits/locale_classes.h
deleted file mode 100644
index 95d9c03..0000000
--- a/include.new/c++/3.4/bits/locale_classes.h
+++ /dev/null
@@ -1,599 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-/** @file localefwd.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _LOCALE_CLASSES_H
-#define _LOCALE_CLASSES_H 1
-
-#pragma GCC system_header
-
-#include <bits/localefwd.h>
-#include <cstring>		// For strcmp.
-#include <string>
-#include <bits/atomicity.h>
-#include <bits/gthr.h>
-
-namespace std
-{
-  // 22.1.1 Class locale
-  /**
-   *  @brief  Container class for localization functionality.
-   *
-   *  The locale class is first a class wrapper for C library locales.  It is
-   *  also an extensible container for user-defined localization.  A locale is
-   *  a collection of facets that implement various localization features such
-   *  as money, time, and number printing.
-   *
-   *  Constructing C++ locales does not change the C library locale.
-   *
-   *  This library supports efficient construction and copying of locales
-   *  through a reference counting implementation of the locale class.
-  */
-  class locale
-  {
-  public:
-    // Types:
-    /// Definition of locale::category.
-    typedef int	category;
-
-    // Forward decls and friends:
-    class facet;
-    class id;
-    class _Impl;
-
-    friend class facet;
-    friend class _Impl;
-
-    template<typename _Facet>
-      friend bool
-      has_facet(const locale&) throw();
-
-    template<typename _Facet>
-      friend const _Facet&
-      use_facet(const locale&);
-
-    template<typename _Cache>
-      friend struct __use_cache;
-
-    //@{
-    /**
-     *  @brief  Category values.
-     *
-     *  The standard category values are none, ctype, numeric, collate, time,
-     *  monetary, and messages.  They form a bitmask that supports union and
-     *  intersection.  The category all is the union of these values.
-     *
-     *  @if maint
-     *  NB: Order must match _S_facet_categories definition in locale.cc
-     *  @endif
-    */
-    static const category none		= 0;
-    static const category ctype		= 1L << 0;
-    static const category numeric	= 1L << 1;
-    static const category collate	= 1L << 2;
-    static const category time		= 1L << 3;
-    static const category monetary	= 1L << 4;
-    static const category messages	= 1L << 5;
-    static const category all		= (ctype | numeric | collate |
-					   time  | monetary | messages);
-    //@}
-
-    // Construct/copy/destroy:
-
-    /**
-     *  @brief  Default constructor.
-     *
-     *  Constructs a copy of the global locale.  If no locale has been
-     *  explicitly set, this is the "C" locale.
-    */
-    locale() throw();
-
-    /**
-     *  @brief  Copy constructor.
-     *
-     *  Constructs a copy of @a other.
-     *
-     *  @param  other  The locale to copy.
-    */
-    locale(const locale& __other) throw();
-
-    /**
-     *  @brief  Named locale constructor.
-     *
-     *  Constructs a copy of the named C library locale.
-     *
-     *  @param  s  Name of the locale to construct.
-     *  @throw  std::runtime_error if s is null or an undefined locale.
-    */
-    explicit
-    locale(const char* __s);
-
-    /**
-     *  @brief  Construct locale with facets from another locale.
-     *
-     *  Constructs a copy of the locale @a base.  The facets specified by @a
-     *  cat are replaced with those from the locale named by @a s.  If base is
-     *  named, this locale instance will also be named.
-     *
-     *  @param  base  The locale to copy.
-     *  @param  s  Name of the locale to use facets from.
-     *  @param  cat  Set of categories defining the facets to use from s.
-     *  @throw  std::runtime_error if s is null or an undefined locale.
-    */
-    locale(const locale& __base, const char* __s, category __cat);
-
-    /**
-     *  @brief  Construct locale with facets from another locale.
-     *
-     *  Constructs a copy of the locale @a base.  The facets specified by @a
-     *  cat are replaced with those from the locale @a add.  If @a base and @a
-     *  add are named, this locale instance will also be named.
-     *
-     *  @param  base  The locale to copy.
-     *  @param  add  The locale to use facets from.
-     *  @param  cat  Set of categories defining the facets to use from add.
-    */
-    locale(const locale& __base, const locale& __add, category __cat);
-
-    /**
-     *  @brief  Construct locale with another facet.
-     *
-     *  Constructs a copy of the locale @a other.  The facet @f is added to
-     *  @other, replacing an existing facet of type Facet if there is one.  If
-     *  @f is null, this locale is a copy of @a other.
-     *
-     *  @param  other  The locale to copy.
-     *  @param  f  The facet to add in.
-    */
-    template<typename _Facet>
-      locale(const locale& __other, _Facet* __f);
-
-    /// Locale destructor.
-    ~locale() throw();
-
-    /**
-     *  @brief  Assignment operator.
-     *
-     *  Set this locale to be a copy of @a other.
-     *
-     *  @param  other  The locale to copy.
-     *  @return  A reference to this locale.
-    */
-    const locale&
-    operator=(const locale& __other) throw();
-
-    /**
-     *  @brief  Construct locale with another facet.
-     *
-     *  Constructs and returns a new copy of this locale.  Adds or replaces an
-     *  existing facet of type Facet from the locale @a other into the new
-     *  locale.
-     *
-     *  @param  Facet  The facet type to copy from other
-     *  @param  other  The locale to copy from.
-     *  @return  Newly constructed locale.
-     *  @throw  std::runtime_error if other has no facet of type Facet.
-    */
-    template<typename _Facet>
-      locale
-      combine(const locale& __other) const;
-
-    // Locale operations:
-    /**
-     *  @brief  Return locale name.
-     *  @return  Locale name or "*" if unnamed.
-    */
-    string
-    name() const;
-
-    /**
-     *  @brief  Locale equality.
-     *
-     *  @param  other  The locale to compare against.
-     *  @return  True if other and this refer to the same locale instance, are
-     *		 copies, or have the same name.  False otherwise.
-    */
-    bool
-    operator==(const locale& __other) const throw ();
-
-    /**
-     *  @brief  Locale inequality.
-     *
-     *  @param  other  The locale to compare against.
-     *  @return  ! (*this == other)
-    */
-    inline bool
-    operator!=(const locale& __other) const throw ()
-    { return !(this->operator==(__other));  }
-
-    /**
-     *  @brief  Compare two strings according to collate.
-     *
-     *  Template operator to compare two strings using the compare function of
-     *  the collate facet in this locale.  One use is to provide the locale to
-     *  the sort function.  For example, a vector v of strings could be sorted
-     *  according to locale loc by doing:
-     *  @code
-     *  std::sort(v.begin(), v.end(), loc);
-     *  @endcode
-     *
-     *  @param  s1  First string to compare.
-     *  @param  s2  Second string to compare.
-     *  @return  True if collate<Char> facet compares s1 < s2, else false.
-    */
-    template<typename _Char, typename _Traits, typename _Alloc>
-      bool
-      operator()(const basic_string<_Char, _Traits, _Alloc>& __s1,
-		 const basic_string<_Char, _Traits, _Alloc>& __s2) const;
-
-    // Global locale objects:
-    /**
-     *  @brief  Set global locale
-     *
-     *  This function sets the global locale to the argument and returns a
-     *  copy of the previous global locale.  If the argument has a name, it
-     *  will also call std::setlocale(LC_ALL, loc.name()).
-     *
-     *  @param  locale  The new locale to make global.
-     *  @return  Copy of the old global locale.
-    */
-    static locale
-    global(const locale&);
-
-    /**
-     *  @brief  Return reference to the "C" locale.
-    */
-    static const locale&
-    classic();
-
-  private:
-    // The (shared) implementation
-    _Impl*		_M_impl;
-
-    // The "C" reference locale
-    static _Impl*       _S_classic;
-
-    // Current global locale
-    static _Impl*	_S_global;
-
-    // Names of underlying locale categories.
-    // NB: locale::global() has to know how to modify all the
-    // underlying categories, not just the ones required by the C++
-    // standard.
-    static const char* const* const _S_categories;
-
-    // Number of standard categories. For C++, these categories are
-    // collate, ctype, monetary, numeric, time, and messages. These
-    // directly correspond to ISO C99 macros LC_COLLATE, LC_CTYPE,
-    // LC_MONETARY, LC_NUMERIC, and LC_TIME. In addition, POSIX (IEEE
-    // 1003.1-2001) specifies LC_MESSAGES.
-    // In addition to the standard categories, the underlying
-    // operating system is allowed to define extra LC_*
-    // macros. For GNU systems, the following are also valid:
-    // LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, LC_MEASUREMENT,
-    // and LC_IDENTIFICATION.
-    static const size_t _S_categories_size = 6 + _GLIBCXX_NUM_CATEGORIES;
-
-#ifdef __GTHREADS
-    static __gthread_once_t _S_once;
-#endif
-
-    explicit
-    locale(_Impl*) throw();
-
-    static void
-    _S_initialize();
-
-    static void
-    _S_initialize_once();
-
-    static category
-    _S_normalize_category(category);
-
-    void
-    _M_coalesce(const locale& __base, const locale& __add, category __cat);
-  };
-
-
-  // 22.1.1.1.2  Class locale::facet
-  /**
-   *  @brief  Localization functionality base class.
-   *
-   *  The facet class is the base class for a localization feature, such as
-   *  money, time, and number printing.  It provides common support for facets
-   *  and reference management.
-   *
-   *  Facets may not be copied or assigned.
-  */
-  class locale::facet
-  {
-  private:
-    friend class locale;
-    friend class locale::_Impl;
-
-    mutable _Atomic_word		_M_refcount;
-
-    // Contains data from the underlying "C" library for the classic locale.
-    static __c_locale                   _S_c_locale;
-
-    // String literal for the name of the classic locale.
-    static const char			_S_c_name[2];
-
-#ifdef __GTHREADS
-    static __gthread_once_t		_S_once;
-#endif
-
-    static void
-    _S_initialize_once();
-
-  protected:
-    /**
-     *  @brief  Facet constructor.
-     *
-     *  This is the constructor provided by the standard.  If refs is 0, the
-     *  facet is destroyed when the last referencing locale is destroyed.
-     *  Otherwise the facet will never be destroyed.
-     *
-     *  @param refs  The initial value for reference count.
-    */
-    explicit
-    facet(size_t __refs = 0) throw() : _M_refcount(__refs ? 1 : 0)
-    { }
-
-    /// Facet destructor.
-    virtual
-    ~facet();
-
-    static void
-    _S_create_c_locale(__c_locale& __cloc, const char* __s,
-		       __c_locale __old = 0);
-
-    static __c_locale
-    _S_clone_c_locale(__c_locale& __cloc);
-
-    static void
-    _S_destroy_c_locale(__c_locale& __cloc);
-
-    // Returns data from the underlying "C" library data for the
-    // classic locale.
-    static __c_locale
-    _S_get_c_locale();
-
-    static const char*
-    _S_get_c_name();
-
-  private:
-    inline void
-    _M_add_reference() const throw()
-    { __gnu_cxx::__atomic_add(&_M_refcount, 1); }
-
-    inline void
-    _M_remove_reference() const throw()
-    {
-      if (__gnu_cxx::__exchange_and_add(&_M_refcount, -1) == 1)
-	{
-	  try
-	    { delete this; }
-	  catch (...)
-	    { }
-	}
-    }
-
-    facet(const facet&);  // Not defined.
-
-    facet&
-    operator=(const facet&);  // Not defined.
-  };
-
-
-  // 22.1.1.1.3 Class locale::id
-  /**
-   *  @brief  Facet ID class.
-   *
-   *  The ID class provides facets with an index used to identify them.
-   *  Every facet class must define a public static member locale::id, or be
-   *  derived from a facet that provides this member, otherwise the facet
-   *  cannot be used in a locale.  The locale::id ensures that each class
-   *  type gets a unique identifier.
-  */
-  class locale::id
-  {
-  private:
-    friend class locale;
-    friend class locale::_Impl;
-
-    template<typename _Facet>
-      friend const _Facet&
-      use_facet(const locale&);
-
-    template<typename _Facet>
-      friend bool
-      has_facet(const locale&) throw ();
-
-    // NB: There is no accessor for _M_index because it may be used
-    // before the constructor is run; the effect of calling a member
-    // function (even an inline) would be undefined.
-    mutable size_t		_M_index;
-
-    // Last id number assigned.
-    static _Atomic_word		_S_refcount;
-
-    void
-    operator=(const id&);  // Not defined.
-
-    id(const id&);  // Not defined.
-
-  public:
-    // NB: This class is always a static data member, and thus can be
-    // counted on to be zero-initialized.
-    /// Constructor.
-    id() { }
-
-    size_t
-    _M_id() const;
-  };
-
-
-  // Implementation object for locale.
-  class locale::_Impl
-  {
-  public:
-    // Friends.
-    friend class locale;
-    friend class locale::facet;
-
-    template<typename _Facet>
-      friend bool
-      has_facet(const locale&) throw();
-
-    template<typename _Facet>
-      friend const _Facet&
-      use_facet(const locale&);
-
-    template<typename _Cache>
-      friend struct __use_cache;
-
-  private:
-    // Data Members.
-    _Atomic_word			_M_refcount;
-    const facet**			_M_facets;
-    size_t				_M_facets_size;
-    const facet**			_M_caches;
-    char**				_M_names;
-    static const locale::id* const	_S_id_ctype[];
-    static const locale::id* const	_S_id_numeric[];
-    static const locale::id* const	_S_id_collate[];
-    static const locale::id* const	_S_id_time[];
-    static const locale::id* const	_S_id_monetary[];
-    static const locale::id* const	_S_id_messages[];
-    static const locale::id* const* const _S_facet_categories[];
-
-    inline void
-    _M_add_reference() throw()
-    { __gnu_cxx::__atomic_add(&_M_refcount, 1); }
-
-    inline void
-    _M_remove_reference() throw()
-    {
-      if (__gnu_cxx::__exchange_and_add(&_M_refcount, -1) == 1)
-	{
-	  try
-	    { delete this; }
-	  catch(...)
-	    { }
-	}
-    }
-
-    _Impl(const _Impl&, size_t);
-    _Impl(const char*, size_t);
-    _Impl(size_t) throw();
-
-   ~_Impl() throw();
-
-    _Impl(const _Impl&);  // Not defined.
-
-    void
-    operator=(const _Impl&);  // Not defined.
-
-    inline bool
-    _M_check_same_name()
-    {
-      bool __ret = true;
-      for (size_t __i = 0; __ret && __i < _S_categories_size - 1; ++__i)
-	__ret = std::strcmp(_M_names[__i], _M_names[__i + 1]) == 0;
-      return __ret;
-    }
-
-    void
-    _M_replace_categories(const _Impl*, category);
-
-    void
-    _M_replace_category(const _Impl*, const locale::id* const*);
-
-    void
-    _M_replace_facet(const _Impl*, const locale::id*);
-
-    void
-    _M_install_facet(const locale::id*, const facet*);
-
-    template<typename _Facet>
-      inline void
-      _M_init_facet(_Facet* __facet)
-      { _M_install_facet(&_Facet::id, __facet); }
-
-    void
-    _M_install_cache(const facet* __cache, size_t __index) throw()
-    {
-      __cache->_M_add_reference();
-      _M_caches[__index] = __cache;
-    }
-  };
-
-  template<typename _Facet>
-    locale::locale(const locale& __other, _Facet* __f)
-    {
-      _M_impl = new _Impl(*__other._M_impl, 1);
-
-      char* _M_tmp_names[_S_categories_size];
-      size_t __i = 0;
-      try
-	{
-	  for (; __i < _S_categories_size; ++__i)
-	    {
-	      _M_tmp_names[__i] = new char[2];
-	      std::strcpy(_M_tmp_names[__i], "*");
-	    }
-	  _M_impl->_M_install_facet(&_Facet::id, __f);
-	}
-      catch(...)
-	{
-	  _M_impl->_M_remove_reference();
-	  for (size_t __j = 0; __j < __i; ++__j)
-	    delete [] _M_tmp_names[__j];
-	  __throw_exception_again;
-	}
-
-      for (size_t __k = 0; __k < _S_categories_size; ++__k)
-	{
-	  delete [] _M_impl->_M_names[__k];
-	  _M_impl->_M_names[__k] = _M_tmp_names[__k];
-	}
-    }
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/locale_facets.h b/include.new/c++/3.4/bits/locale_facets.h
deleted file mode 100644
index db0e951..0000000
--- a/include.new/c++/3.4/bits/locale_facets.h
+++ /dev/null
@@ -1,4558 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-/** @file locale_facets.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _LOCALE_FACETS_H
-#define _LOCALE_FACETS_H 1
-
-#pragma GCC system_header
-
-#include <ctime>	// For struct tm
-#include <cwctype>	// For wctype_t
-#include <iosfwd>
-#include <bits/ios_base.h>  // For ios_base, ios_base::iostate
-#include <streambuf>
-
-namespace std
-{
-  // NB: Don't instantiate required wchar_t facets if no wchar_t support.
-#ifdef _GLIBCXX_USE_WCHAR_T
-# define  _GLIBCXX_NUM_FACETS 28
-#else
-# define  _GLIBCXX_NUM_FACETS 14
-#endif
-
-  // Convert string to numeric value of type _Tv and store results.
-  // NB: This is specialized for all required types, there is no
-  // generic definition.
-  template<typename _Tv>
-    void
-    __convert_to_v(const char* __in, _Tv& __out, ios_base::iostate& __err,
-		   const __c_locale& __cloc);
-
-  // Explicit specializations for required types.
-  template<>
-    void
-    __convert_to_v(const char*, float&, ios_base::iostate&,
-		   const __c_locale&);
-
-  template<>
-    void
-    __convert_to_v(const char*, double&, ios_base::iostate&,
-		   const __c_locale&);
-
-  template<>
-    void
-    __convert_to_v(const char*, long double&, ios_base::iostate&,
-		   const __c_locale&);
-
-  // NB: __pad is a struct, rather than a function, so it can be
-  // partially-specialized.
-  template<typename _CharT, typename _Traits>
-    struct __pad
-    {
-      static void
-      _S_pad(ios_base& __io, _CharT __fill, _CharT* __news,
-	     const _CharT* __olds, const streamsize __newlen,
-	     const streamsize __oldlen, const bool __num);
-    };
-
-  // Used by both numeric and monetary facets.
-  // Inserts "group separator" characters into an array of characters.
-  // It's recursive, one iteration per group.  It moves the characters
-  // in the buffer this way: "xxxx12345" -> "12,345xxx".  Call this
-  // only with __glen != 0.
-  template<typename _CharT>
-    _CharT*
-    __add_grouping(_CharT* __s, _CharT __sep,
-		   const char* __gbeg, size_t __gsize,
-		   const _CharT* __first, const _CharT* __last);
-
-  // This template permits specializing facet output code for
-  // ostreambuf_iterator.  For ostreambuf_iterator, sputn is
-  // significantly more efficient than incrementing iterators.
-  template<typename _CharT>
-    inline
-    ostreambuf_iterator<_CharT>
-    __write(ostreambuf_iterator<_CharT> __s, const _CharT* __ws, int __len)
-    {
-      __s._M_put(__ws, __len);
-      return __s;
-    }
-
-  // This is the unspecialized form of the template.
-  template<typename _CharT, typename _OutIter>
-    inline
-    _OutIter
-    __write(_OutIter __s, const _CharT* __ws, int __len)
-    {
-      for (int __j = 0; __j < __len; __j++, ++__s)
-	*__s = __ws[__j];
-      return __s;
-    }
-
-
-  // 22.2.1.1  Template class ctype
-  // Include host and configuration specific ctype enums for ctype_base.
-  #include <bits/ctype_base.h>
-
-  // Common base for ctype<_CharT>.
-  /**
-   *  @brief  Common base for ctype facet
-   *
-   *  This template class provides implementations of the public functions
-   *  that forward to the protected virtual functions.
-   *
-   *  This template also provides abtract stubs for the protected virtual
-   *  functions.
-  */
-  template<typename _CharT>
-    class __ctype_abstract_base : public locale::facet, public ctype_base
-    {
-    public:
-      // Types:
-      /// Typedef for the template parameter
-      typedef _CharT char_type;
-
-      /**
-       *  @brief  Test char_type classification.
-       *
-       *  This function finds a mask M for @a c and compares it to mask @a m.
-       *  It does so by returning the value of ctype<char_type>::do_is().
-       *
-       *  @param c  The char_type to compare the mask of.
-       *  @param m  The mask to compare against.
-       *  @return  (M & m) != 0.
-      */
-      bool
-      is(mask __m, char_type __c) const
-      { return this->do_is(__m, __c); }
-
-      /**
-       *  @brief  Return a mask array.
-       *
-       *  This function finds the mask for each char_type in the range [lo,hi)
-       *  and successively writes it to vec.  vec must have as many elements
-       *  as the char array.  It does so by returning the value of
-       *  ctype<char_type>::do_is().
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param vec  Pointer to an array of mask storage.
-       *  @return  @a hi.
-      */
-      const char_type*
-      is(const char_type *__lo, const char_type *__hi, mask *__vec) const
-      { return this->do_is(__lo, __hi, __vec); }
-
-      /**
-       *  @brief  Find char_type matching a mask
-       *
-       *  This function searches for and returns the first char_type c in
-       *  [lo,hi) for which is(m,c) is true.  It does so by returning
-       *  ctype<char_type>::do_scan_is().
-       *
-       *  @param m  The mask to compare against.
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  Pointer to matching char_type if found, else @a hi.
-      */
-      const char_type*
-      scan_is(mask __m, const char_type* __lo, const char_type* __hi) const
-      { return this->do_scan_is(__m, __lo, __hi); }
-
-      /**
-       *  @brief  Find char_type not matching a mask
-       *
-       *  This function searches for and returns the first char_type c in
-       *  [lo,hi) for which is(m,c) is false.  It does so by returning
-       *  ctype<char_type>::do_scan_not().
-       *
-       *  @param m  The mask to compare against.
-       *  @param lo  Pointer to first char in range.
-       *  @param hi  Pointer to end of range.
-       *  @return  Pointer to non-matching char if found, else @a hi.
-      */
-      const char_type*
-      scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
-      { return this->do_scan_not(__m, __lo, __hi); }
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This function converts the argument to uppercase if possible.
-       *  If not possible (for example, '2'), returns the argument.  It does
-       *  so by returning ctype<char_type>::do_toupper().
-       *
-       *  @param c  The char_type to convert.
-       *  @return  The uppercase char_type if convertible, else @a c.
-      */
-      char_type
-      toupper(char_type __c) const
-      { return this->do_toupper(__c); }
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This function converts each char_type in the range [lo,hi) to
-       *  uppercase if possible.  Other elements remain untouched.  It does so
-       *  by returning ctype<char_type>:: do_toupper(lo, hi).
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      const char_type*
-      toupper(char_type *__lo, const char_type* __hi) const
-      { return this->do_toupper(__lo, __hi); }
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This function converts the argument to lowercase if possible.  If
-       *  not possible (for example, '2'), returns the argument.  It does so
-       *  by returning ctype<char_type>::do_tolower(c).
-       *
-       *  @param c  The char_type to convert.
-       *  @return  The lowercase char_type if convertible, else @a c.
-      */
-      char_type
-      tolower(char_type __c) const
-      { return this->do_tolower(__c); }
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This function converts each char_type in the range [lo,hi) to
-       *  lowercase if possible.  Other elements remain untouched.  It does so
-       *  by returning ctype<char_type>:: do_tolower(lo, hi).
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      const char_type*
-      tolower(char_type* __lo, const char_type* __hi) const
-      { return this->do_tolower(__lo, __hi); }
-
-      /**
-       *  @brief  Widen char to char_type
-       *
-       *  This function converts the char argument to char_type using the
-       *  simplest reasonable transformation.  It does so by returning
-       *  ctype<char_type>::do_widen(c).
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The char to convert.
-       *  @return  The converted char_type.
-      */
-      char_type
-      widen(char __c) const
-      { return this->do_widen(__c); }
-
-      /**
-       *  @brief  Widen array to char_type
-       *
-       *  This function converts each char in the input to char_type using the
-       *  simplest reasonable transformation.  It does so by returning
-       *  ctype<char_type>::do_widen(c).
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      const char*
-      widen(const char* __lo, const char* __hi, char_type* __to) const
-      { return this->do_widen(__lo, __hi, __to); }
-
-      /**
-       *  @brief  Narrow char_type to char
-       *
-       *  This function converts the char_type to char using the simplest
-       *  reasonable transformation.  If the conversion fails, dfault is
-       *  returned instead.  It does so by returning
-       *  ctype<char_type>::do_narrow(c).
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The char_type to convert.
-       *  @param dfault  Char to return if conversion fails.
-       *  @return  The converted char.
-      */
-      char
-      narrow(char_type __c, char __dfault) const
-      { return this->do_narrow(__c, __dfault); }
-
-      /**
-       *  @brief  Narrow array to char array
-       *
-       *  This function converts each char_type in the input to char using the
-       *  simplest reasonable transformation and writes the results to the
-       *  destination array.  For any char_type in the input that cannot be
-       *  converted, @a dfault is used instead.  It does so by returning
-       *  ctype<char_type>::do_narrow(lo, hi, dfault, to).
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param dfault  Char to use if conversion fails.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      const char_type*
-      narrow(const char_type* __lo, const char_type* __hi,
-	      char __dfault, char *__to) const
-      { return this->do_narrow(__lo, __hi, __dfault, __to); }
-
-    protected:
-      explicit
-      __ctype_abstract_base(size_t __refs = 0): facet(__refs) { }
-
-      virtual
-      ~__ctype_abstract_base() { }
-
-      /**
-       *  @brief  Test char_type classification.
-       *
-       *  This function finds a mask M for @a c and compares it to mask @a m.
-       *
-       *  do_is() is a hook for a derived facet to change the behavior of
-       *  classifying.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param c  The char_type to find the mask of.
-       *  @param m  The mask to compare against.
-       *  @return  (M & m) != 0.
-      */
-      virtual bool
-      do_is(mask __m, char_type __c) const = 0;
-
-      /**
-       *  @brief  Return a mask array.
-       *
-       *  This function finds the mask for each char_type in the range [lo,hi)
-       *  and successively writes it to vec.  vec must have as many elements
-       *  as the input.
-       *
-       *  do_is() is a hook for a derived facet to change the behavior of
-       *  classifying.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param vec  Pointer to an array of mask storage.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_is(const char_type* __lo, const char_type* __hi,
-	    mask* __vec) const = 0;
-
-      /**
-       *  @brief  Find char_type matching mask
-       *
-       *  This function searches for and returns the first char_type c in
-       *  [lo,hi) for which is(m,c) is true.
-       *
-       *  do_scan_is() is a hook for a derived facet to change the behavior of
-       *  match searching.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param m  The mask to compare against.
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  Pointer to a matching char_type if found, else @a hi.
-      */
-      virtual const char_type*
-      do_scan_is(mask __m, const char_type* __lo,
-		 const char_type* __hi) const = 0;
-
-      /**
-       *  @brief  Find char_type not matching mask
-       *
-       *  This function searches for and returns a pointer to the first
-       *  char_type c of [lo,hi) for which is(m,c) is false.
-       *
-       *  do_scan_is() is a hook for a derived facet to change the behavior of
-       *  match searching.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param m  The mask to compare against.
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  Pointer to a non-matching char_type if found, else @a hi.
-      */
-      virtual const char_type*
-      do_scan_not(mask __m, const char_type* __lo,
-		  const char_type* __hi) const = 0;
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This virtual function converts the char_type argument to uppercase
-       *  if possible.  If not possible (for example, '2'), returns the
-       *  argument.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param c  The char_type to convert.
-       *  @return  The uppercase char_type if convertible, else @a c.
-      */
-      virtual char_type
-      do_toupper(char_type) const = 0;
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This virtual function converts each char_type in the range [lo,hi)
-       *  to uppercase if possible.  Other elements remain untouched.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_toupper(char_type* __lo, const char_type* __hi) const = 0;
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This virtual function converts the argument to lowercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param c  The char_type to convert.
-       *  @return  The lowercase char_type if convertible, else @a c.
-      */
-      virtual char_type
-      do_tolower(char_type) const = 0;
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This virtual function converts each char_type in the range [lo,hi)
-       *  to lowercase if possible.  Other elements remain untouched.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_tolower(char_type* __lo, const char_type* __hi) const = 0;
-
-      /**
-       *  @brief  Widen char
-       *
-       *  This virtual function converts the char to char_type using the
-       *  simplest reasonable transformation.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The char to convert.
-       *  @return  The converted char_type
-      */
-      virtual char_type
-      do_widen(char) const = 0;
-
-      /**
-       *  @brief  Widen char array
-       *
-       *  This function converts each char in the input to char_type using the
-       *  simplest reasonable transformation.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to start range.
-       *  @param hi  Pointer to end of range.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      virtual const char*
-      do_widen(const char* __lo, const char* __hi,
-	       char_type* __dest) const = 0;
-
-      /**
-       *  @brief  Narrow char_type to char
-       *
-       *  This virtual function converts the argument to char using the
-       *  simplest reasonable transformation.  If the conversion fails, dfault
-       *  is returned instead.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The char_type to convert.
-       *  @param dfault  Char to return if conversion fails.
-       *  @return  The converted char.
-      */
-      virtual char
-      do_narrow(char_type, char __dfault) const = 0;
-
-      /**
-       *  @brief  Narrow char_type array to char
-       *
-       *  This virtual function converts each char_type in the range [lo,hi) to
-       *  char using the simplest reasonable transformation and writes the
-       *  results to the destination array.  For any element in the input that
-       *  cannot be converted, @a dfault is used instead.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param dfault  Char to use if conversion fails.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_narrow(const char_type* __lo, const char_type* __hi,
-		char __dfault, char* __dest) const = 0;
-    };
-
-  // NB: Generic, mostly useless implementation.
-  /**
-   *  @brief  Template ctype facet
-   *
-   *  This template class defines classification and conversion functions for
-   *  character sets.  It wraps <cctype> functionality.  Ctype gets used by
-   *  streams for many I/O operations.
-   *
-   *  This template provides the protected virtual functions the developer
-   *  will have to replace in a derived class or specialization to make a
-   *  working facet.  The public functions that access them are defined in
-   *  __ctype_abstract_base, to allow for implementation flexibility.  See
-   *  ctype<wchar_t> for an example.  The functions are documented in
-   *  __ctype_abstract_base.
-   *
-   *  Note: implementations are provided for all the protected virtual
-   *  functions, but will likely not be useful.
-  */
-  template<typename _CharT>
-    class ctype : public __ctype_abstract_base<_CharT>
-    {
-    public:
-      // Types:
-      typedef _CharT			char_type;
-      typedef typename __ctype_abstract_base<_CharT>::mask mask;
-
-      /// The facet id for ctype<char_type>
-      static locale::id			id;
-
-      explicit
-      ctype(size_t __refs = 0) : __ctype_abstract_base<_CharT>(__refs) { }
-
-   protected:
-      virtual
-      ~ctype();
-
-      virtual bool
-      do_is(mask __m, char_type __c) const;
-
-      virtual const char_type*
-      do_is(const char_type* __lo, const char_type* __hi, mask* __vec) const;
-
-      virtual const char_type*
-      do_scan_is(mask __m, const char_type* __lo, const char_type* __hi) const;
-
-      virtual const char_type*
-      do_scan_not(mask __m, const char_type* __lo,
-		  const char_type* __hi) const;
-
-      virtual char_type
-      do_toupper(char_type __c) const;
-
-      virtual const char_type*
-      do_toupper(char_type* __lo, const char_type* __hi) const;
-
-      virtual char_type
-      do_tolower(char_type __c) const;
-
-      virtual const char_type*
-      do_tolower(char_type* __lo, const char_type* __hi) const;
-
-      virtual char_type
-      do_widen(char __c) const;
-
-      virtual const char*
-      do_widen(const char* __lo, const char* __hi, char_type* __dest) const;
-
-      virtual char
-      do_narrow(char_type, char __dfault) const;
-
-      virtual const char_type*
-      do_narrow(const char_type* __lo, const char_type* __hi,
-		char __dfault, char* __dest) const;
-    };
-
-  template<typename _CharT>
-    locale::id ctype<_CharT>::id;
-
-  // 22.2.1.3  ctype<char> specialization.
-  /**
-   *  @brief  The ctype<char> specialization.
-   *
-   *  This class defines classification and conversion functions for
-   *  the char type.  It gets used by char streams for many I/O
-   *  operations.  The char specialization provides a number of
-   *  optimizations as well.
-  */
-  template<>
-    class ctype<char> : public locale::facet, public ctype_base
-    {
-    public:
-      // Types:
-      /// Typedef for the template parameter char.
-      typedef char		char_type;
-
-    protected:
-      // Data Members:
-      __c_locale		_M_c_locale_ctype;
-      bool			_M_del;
-      __to_type			_M_toupper;
-      __to_type			_M_tolower;
-      const mask*		_M_table;
-      mutable char		_M_widen_ok;
-      mutable char		_M_widen[1 + static_cast<unsigned char>(-1)];
-      mutable char		_M_narrow[1 + static_cast<unsigned char>(-1)];
-      mutable char		_M_narrow_ok;	// 0 uninitialized, 1 init,
-						// 2 memcpy can't be used
-
-    public:
-      /// The facet id for ctype<char>
-      static locale::id        id;
-      /// The size of the mask table.  It is SCHAR_MAX + 1.
-      static const size_t      table_size = 1 + static_cast<unsigned char>(-1);
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param table If non-zero, table is used as the per-char mask.
-       *               Else classic_table() is used.
-       *  @param del   If true, passes ownership of table to this facet.
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      ctype(const mask* __table = 0, bool __del = false, size_t __refs = 0);
-
-      /**
-       *  @brief  Constructor performs static initialization.
-       *
-       *  This constructor is used to construct the initial C locale facet.
-       *
-       *  @param cloc  Handle to C locale data.
-       *  @param table If non-zero, table is used as the per-char mask.
-       *  @param del   If true, passes ownership of table to this facet.
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      ctype(__c_locale __cloc, const mask* __table = 0, bool __del = false,
-	    size_t __refs = 0);
-
-      /**
-       *  @brief  Test char classification.
-       *
-       *  This function compares the mask table[c] to @a m.
-       *
-       *  @param c  The char to compare the mask of.
-       *  @param m  The mask to compare against.
-       *  @return  True if m & table[c] is true, false otherwise.
-      */
-      inline bool
-      is(mask __m, char __c) const;
-
-      /**
-       *  @brief  Return a mask array.
-       *
-       *  This function finds the mask for each char in the range [lo, hi) and
-       *  successively writes it to vec.  vec must have as many elements as
-       *  the char array.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param vec  Pointer to an array of mask storage.
-       *  @return  @a hi.
-      */
-      inline const char*
-      is(const char* __lo, const char* __hi, mask* __vec) const;
-
-      /**
-       *  @brief  Find char matching a mask
-       *
-       *  This function searches for and returns the first char in [lo,hi) for
-       *  which is(m,char) is true.
-       *
-       *  @param m  The mask to compare against.
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  Pointer to a matching char if found, else @a hi.
-      */
-      inline const char*
-      scan_is(mask __m, const char* __lo, const char* __hi) const;
-
-      /**
-       *  @brief  Find char not matching a mask
-       *
-       *  This function searches for and returns a pointer to the first char
-       *  in [lo,hi) for which is(m,char) is false.
-       *
-       *  @param m  The mask to compare against.
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  Pointer to a non-matching char if found, else @a hi.
-      */
-      inline const char*
-      scan_not(mask __m, const char* __lo, const char* __hi) const;
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This function converts the char argument to uppercase if possible.
-       *  If not possible (for example, '2'), returns the argument.
-       *
-       *  toupper() acts as if it returns ctype<char>::do_toupper(c).
-       *  do_toupper() must always return the same result for the same input.
-       *
-       *  @param c  The char to convert.
-       *  @return  The uppercase char if convertible, else @a c.
-      */
-      char_type
-      toupper(char_type __c) const
-      { return this->do_toupper(__c); }
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This function converts each char in the range [lo,hi) to uppercase
-       *  if possible.  Other chars remain untouched.
-       *
-       *  toupper() acts as if it returns ctype<char>:: do_toupper(lo, hi).
-       *  do_toupper() must always return the same result for the same input.
-       *
-       *  @param lo  Pointer to first char in range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      const char_type*
-      toupper(char_type *__lo, const char_type* __hi) const
-      { return this->do_toupper(__lo, __hi); }
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This function converts the char argument to lowercase if possible.
-       *  If not possible (for example, '2'), returns the argument.
-       *
-       *  tolower() acts as if it returns ctype<char>::do_tolower(c).
-       *  do_tolower() must always return the same result for the same input.
-       *
-       *  @param c  The char to convert.
-       *  @return  The lowercase char if convertible, else @a c.
-      */
-      char_type
-      tolower(char_type __c) const
-      { return this->do_tolower(__c); }
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This function converts each char in the range [lo,hi) to lowercase
-       *  if possible.  Other chars remain untouched.
-       *
-       *  tolower() acts as if it returns ctype<char>:: do_tolower(lo, hi).
-       *  do_tolower() must always return the same result for the same input.
-       *
-       *  @param lo  Pointer to first char in range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      const char_type*
-      tolower(char_type* __lo, const char_type* __hi) const
-      { return this->do_tolower(__lo, __hi); }
-
-      /**
-       *  @brief  Widen char
-       *
-       *  This function converts the char to char_type using the simplest
-       *  reasonable transformation.  For an underived ctype<char> facet, the
-       *  argument will be returned unchanged.
-       *
-       *  This function works as if it returns ctype<char>::do_widen(c).
-       *  do_widen() must always return the same result for the same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The char to convert.
-       *  @return  The converted character.
-      */
-      char_type
-      widen(char __c) const
-      {
-	if (_M_widen_ok)
-	  return _M_widen[static_cast<unsigned char>(__c)];
-	this->_M_widen_init();
-	return this->do_widen(__c);
-      }
-
-      /**
-       *  @brief  Widen char array
-       *
-       *  This function converts each char in the input to char using the
-       *  simplest reasonable transformation.  For an underived ctype<char>
-       *  facet, the argument will be copied unchanged.
-       *
-       *  This function works as if it returns ctype<char>::do_widen(c).
-       *  do_widen() must always return the same result for the same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to first char in range.
-       *  @param hi  Pointer to end of range.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      const char*
-      widen(const char* __lo, const char* __hi, char_type* __to) const
-      {
-	if (_M_widen_ok == 1)
-	  {
-	    memcpy(__to, __lo, __hi - __lo);
-	    return __hi;
-	  }
-	if (!_M_widen_ok)
-	  _M_widen_init();
-	return this->do_widen(__lo, __hi, __to);
-      }
-
-      /**
-       *  @brief  Narrow char
-       *
-       *  This function converts the char to char using the simplest
-       *  reasonable transformation.  If the conversion fails, dfault is
-       *  returned instead.  For an underived ctype<char> facet, @a c
-       *  will be returned unchanged.
-       *
-       *  This function works as if it returns ctype<char>::do_narrow(c).
-       *  do_narrow() must always return the same result for the same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The char to convert.
-       *  @param dfault  Char to return if conversion fails.
-       *  @return  The converted character.
-      */
-      char
-      narrow(char_type __c, char __dfault) const
-      {
-	if (_M_narrow[static_cast<unsigned char>(__c)])
-	  return _M_narrow[static_cast<unsigned char>(__c)];
-	const char __t = do_narrow(__c, __dfault);
-	if (__t != __dfault)
-	  _M_narrow[static_cast<unsigned char>(__c)] = __t;
-	return __t;
-      }
-
-      /**
-       *  @brief  Narrow char array
-       *
-       *  This function converts each char in the input to char using the
-       *  simplest reasonable transformation and writes the results to the
-       *  destination array.  For any char in the input that cannot be
-       *  converted, @a dfault is used instead.  For an underived ctype<char>
-       *  facet, the argument will be copied unchanged.
-       *
-       *  This function works as if it returns ctype<char>::do_narrow(lo, hi,
-       *  dfault, to).  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param dfault  Char to use if conversion fails.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      const char_type*
-      narrow(const char_type* __lo, const char_type* __hi,
-	     char __dfault, char *__to) const
-      {
-	if (__builtin_expect(_M_narrow_ok == 1, true))
-	  {
-	    memcpy(__to, __lo, __hi - __lo);
-	    return __hi;
-	  }
-	if (!_M_narrow_ok)
-	  _M_narrow_init();
-	return this->do_narrow(__lo, __hi, __dfault, __to);
-      }
-
-    protected:
-      /// Returns a pointer to the mask table provided to the constructor, or
-      /// the default from classic_table() if none was provided.
-      const mask*
-      table() const throw()
-      { return _M_table; }
-
-      /// Returns a pointer to the C locale mask table.
-      static const mask*
-      classic_table() throw();
-
-      /**
-       *  @brief  Destructor.
-       *
-       *  This function deletes table() if @a del was true in the
-       *  constructor.
-      */
-      virtual
-      ~ctype();
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This virtual function converts the char argument to uppercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param c  The char to convert.
-       *  @return  The uppercase char if convertible, else @a c.
-      */
-      virtual char_type
-      do_toupper(char_type) const;
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This virtual function converts each char in the range [lo,hi) to
-       *  uppercase if possible.  Other chars remain untouched.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_toupper(char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This virtual function converts the char argument to lowercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param c  The char to convert.
-       *  @return  The lowercase char if convertible, else @a c.
-      */
-      virtual char_type
-      do_tolower(char_type) const;
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This virtual function converts each char in the range [lo,hi) to
-       *  lowercase if possible.  Other chars remain untouched.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param lo  Pointer to first char in range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_tolower(char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Widen char
-       *
-       *  This virtual function converts the char to char using the simplest
-       *  reasonable transformation.  For an underived ctype<char> facet, the
-       *  argument will be returned unchanged.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The char to convert.
-       *  @return  The converted character.
-      */
-      virtual char_type
-      do_widen(char __c) const
-      { return __c; }
-
-      /**
-       *  @brief  Widen char array
-       *
-       *  This function converts each char in the range [lo,hi) to char using
-       *  the simplest reasonable transformation.  For an underived
-       *  ctype<char> facet, the argument will be copied unchanged.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      virtual const char*
-      do_widen(const char* __lo, const char* __hi, char_type* __dest) const
-      {
-	memcpy(__dest, __lo, __hi - __lo);
-	return __hi;
-      }
-
-      /**
-       *  @brief  Narrow char
-       *
-       *  This virtual function converts the char to char using the simplest
-       *  reasonable transformation.  If the conversion fails, dfault is
-       *  returned instead.  For an underived ctype<char> facet, @a c will be
-       *  returned unchanged.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The char to convert.
-       *  @param dfault  Char to return if conversion fails.
-       *  @return  The converted char.
-      */
-      virtual char
-      do_narrow(char_type __c, char) const
-      { return __c; }
-
-      /**
-       *  @brief  Narrow char array to char array
-       *
-       *  This virtual function converts each char in the range [lo,hi) to
-       *  char using the simplest reasonable transformation and writes the
-       *  results to the destination array.  For any char in the input that
-       *  cannot be converted, @a dfault is used instead.  For an underived
-       *  ctype<char> facet, the argument will be copied unchanged.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param dfault  Char to use if conversion fails.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_narrow(const char_type* __lo, const char_type* __hi,
-		char, char* __dest) const
-      {
-	memcpy(__dest, __lo, __hi - __lo);
-	return __hi;
-      }
-
-    private:
-
-      void _M_widen_init() const
-      {
-	char __tmp[sizeof(_M_widen)];
-	for (size_t __i = 0; __i < sizeof(_M_widen); ++__i)
-	  __tmp[__i] = __i;
-	do_widen(__tmp, __tmp + sizeof(__tmp), _M_widen);
-
-	_M_widen_ok = 1;
-	// Set _M_widen_ok to 2 if memcpy can't be used.
-	if (memcmp(__tmp, _M_widen, sizeof(_M_widen)))
-	  _M_widen_ok = 2;
-      }
-
-      // Fill in the narrowing cache and flag whether all values are
-      // valid or not.  _M_narrow_ok is set to 2 if memcpy can't
-      // be used.
-      void _M_narrow_init() const
-      {
-	char __tmp[sizeof(_M_narrow)];
-	for (size_t __i = 0; __i < sizeof(_M_narrow); ++__i)
-	  __tmp[__i] = __i;
-	do_narrow(__tmp, __tmp + sizeof(__tmp), 0, _M_narrow);
-
-	_M_narrow_ok = 1;
-	if (memcmp(__tmp, _M_narrow, sizeof(_M_narrow)))
-	  _M_narrow_ok = 2;
-	else
-	  {
-	    // Deal with the special case of zero: renarrow with a
-	    // different default and compare.
-	    char __c;
-	    do_narrow(__tmp, __tmp + 1, 1, &__c);
-	    if (__c == 1)
-	      _M_narrow_ok = 2;
-	  }
-      }
-    };
-
-  template<>
-    const ctype<char>&
-    use_facet<ctype<char> >(const locale& __loc);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  // 22.2.1.3  ctype<wchar_t> specialization
-  /**
-   *  @brief  The ctype<wchar_t> specialization.
-   *
-   *  This class defines classification and conversion functions for the
-   *  wchar_t type.  It gets used by wchar_t streams for many I/O operations.
-   *  The wchar_t specialization provides a number of optimizations as well.
-   *
-   *  ctype<wchar_t> inherits its public methods from
-   *  __ctype_abstract_base<wchar_t>.
-  */
-  template<>
-    class ctype<wchar_t> : public __ctype_abstract_base<wchar_t>
-    {
-    public:
-      // Types:
-      /// Typedef for the template parameter wchar_t.
-      typedef wchar_t		char_type;
-      typedef wctype_t		__wmask_type;
-
-    protected:
-      __c_locale		_M_c_locale_ctype;
-
-      // Pre-computed narrowed and widened chars.
-      bool                      _M_narrow_ok;
-      char                      _M_narrow[128];
-      wint_t                    _M_widen[1 + static_cast<unsigned char>(-1)];
-
-      // Pre-computed elements for do_is.
-      mask                      _M_bit[16];
-      __wmask_type              _M_wmask[16];
-
-    public:
-      // Data Members:
-      /// The facet id for ctype<wchar_t>
-      static locale::id		id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      ctype(size_t __refs = 0);
-
-      /**
-       *  @brief  Constructor performs static initialization.
-       *
-       *  This constructor is used to construct the initial C locale facet.
-       *
-       *  @param cloc  Handle to C locale data.
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      ctype(__c_locale __cloc, size_t __refs = 0);
-
-    protected:
-      __wmask_type
-      _M_convert_to_wmask(const mask __m) const;
-
-      /// Destructor
-      virtual
-      ~ctype();
-
-      /**
-       *  @brief  Test wchar_t classification.
-       *
-       *  This function finds a mask M for @a c and compares it to mask @a m.
-       *
-       *  do_is() is a hook for a derived facet to change the behavior of
-       *  classifying.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param c  The wchar_t to find the mask of.
-       *  @param m  The mask to compare against.
-       *  @return  (M & m) != 0.
-      */
-      virtual bool
-      do_is(mask __m, char_type __c) const;
-
-      /**
-       *  @brief  Return a mask array.
-       *
-       *  This function finds the mask for each wchar_t in the range [lo,hi)
-       *  and successively writes it to vec.  vec must have as many elements
-       *  as the input.
-       *
-       *  do_is() is a hook for a derived facet to change the behavior of
-       *  classifying.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param vec  Pointer to an array of mask storage.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_is(const char_type* __lo, const char_type* __hi, mask* __vec) const;
-
-      /**
-       *  @brief  Find wchar_t matching mask
-       *
-       *  This function searches for and returns the first wchar_t c in
-       *  [lo,hi) for which is(m,c) is true.
-       *
-       *  do_scan_is() is a hook for a derived facet to change the behavior of
-       *  match searching.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param m  The mask to compare against.
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  Pointer to a matching wchar_t if found, else @a hi.
-      */
-      virtual const char_type*
-      do_scan_is(mask __m, const char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Find wchar_t not matching mask
-       *
-       *  This function searches for and returns a pointer to the first
-       *  wchar_t c of [lo,hi) for which is(m,c) is false.
-       *
-       *  do_scan_is() is a hook for a derived facet to change the behavior of
-       *  match searching.  do_is() must always return the same result for the
-       *  same input.
-       *
-       *  @param m  The mask to compare against.
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  Pointer to a non-matching wchar_t if found, else @a hi.
-      */
-      virtual const char_type*
-      do_scan_not(mask __m, const char_type* __lo,
-		  const char_type* __hi) const;
-
-      /**
-       *  @brief  Convert to uppercase.
-       *
-       *  This virtual function converts the wchar_t argument to uppercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param c  The wchar_t to convert.
-       *  @return  The uppercase wchar_t if convertible, else @a c.
-      */
-      virtual char_type
-      do_toupper(char_type) const;
-
-      /**
-       *  @brief  Convert array to uppercase.
-       *
-       *  This virtual function converts each wchar_t in the range [lo,hi) to
-       *  uppercase if possible.  Other elements remain untouched.
-       *
-       *  do_toupper() is a hook for a derived facet to change the behavior of
-       *  uppercasing.  do_toupper() must always return the same result for
-       *  the same input.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_toupper(char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Convert to lowercase.
-       *
-       *  This virtual function converts the argument to lowercase if
-       *  possible.  If not possible (for example, '2'), returns the argument.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param c  The wchar_t to convert.
-       *  @return  The lowercase wchar_t if convertible, else @a c.
-      */
-      virtual char_type
-      do_tolower(char_type) const;
-
-      /**
-       *  @brief  Convert array to lowercase.
-       *
-       *  This virtual function converts each wchar_t in the range [lo,hi) to
-       *  lowercase if possible.  Other elements remain untouched.
-       *
-       *  do_tolower() is a hook for a derived facet to change the behavior of
-       *  lowercasing.  do_tolower() must always return the same result for
-       *  the same input.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_tolower(char_type* __lo, const char_type* __hi) const;
-
-      /**
-       *  @brief  Widen char to wchar_t
-       *
-       *  This virtual function converts the char to wchar_t using the
-       *  simplest reasonable transformation.  For an underived ctype<wchar_t>
-       *  facet, the argument will be cast to wchar_t.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The char to convert.
-       *  @return  The converted wchar_t.
-      */
-      virtual char_type
-      do_widen(char) const;
-
-      /**
-       *  @brief  Widen char array to wchar_t array
-       *
-       *  This function converts each char in the input to wchar_t using the
-       *  simplest reasonable transformation.  For an underived ctype<wchar_t>
-       *  facet, the argument will be copied, casting each element to wchar_t.
-       *
-       *  do_widen() is a hook for a derived facet to change the behavior of
-       *  widening.  do_widen() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to start range.
-       *  @param hi  Pointer to end of range.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      virtual const char*
-      do_widen(const char* __lo, const char* __hi, char_type* __dest) const;
-
-      /**
-       *  @brief  Narrow wchar_t to char
-       *
-       *  This virtual function converts the argument to char using
-       *  the simplest reasonable transformation.  If the conversion
-       *  fails, dfault is returned instead.  For an underived
-       *  ctype<wchar_t> facet, @a c will be cast to char and
-       *  returned.
-       *
-       *  do_narrow() is a hook for a derived facet to change the
-       *  behavior of narrowing.  do_narrow() must always return the
-       *  same result for the same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param c  The wchar_t to convert.
-       *  @param dfault  Char to return if conversion fails.
-       *  @return  The converted char.
-      */
-      virtual char
-      do_narrow(char_type, char __dfault) const;
-
-      /**
-       *  @brief  Narrow wchar_t array to char array
-       *
-       *  This virtual function converts each wchar_t in the range [lo,hi) to
-       *  char using the simplest reasonable transformation and writes the
-       *  results to the destination array.  For any wchar_t in the input that
-       *  cannot be converted, @a dfault is used instead.  For an underived
-       *  ctype<wchar_t> facet, the argument will be copied, casting each
-       *  element to char.
-       *
-       *  do_narrow() is a hook for a derived facet to change the behavior of
-       *  narrowing.  do_narrow() must always return the same result for the
-       *  same input.
-       *
-       *  Note: this is not what you want for codepage conversions.  See
-       *  codecvt for that.
-       *
-       *  @param lo  Pointer to start of range.
-       *  @param hi  Pointer to end of range.
-       *  @param dfault  Char to use if conversion fails.
-       *  @param to  Pointer to the destination array.
-       *  @return  @a hi.
-      */
-      virtual const char_type*
-      do_narrow(const char_type* __lo, const char_type* __hi,
-		char __dfault, char* __dest) const;
-
-      // For use at construction time only.
-      void
-      _M_initialize_ctype();
-    };
-
-  template<>
-    const ctype<wchar_t>&
-    use_facet<ctype<wchar_t> >(const locale& __loc);
-#endif //_GLIBCXX_USE_WCHAR_T
-
-  // Include host and configuration specific ctype inlines.
-  #include <bits/ctype_inline.h>
-
-  // 22.2.1.2  Template class ctype_byname
-  template<typename _CharT>
-    class ctype_byname : public ctype<_CharT>
-    {
-    public:
-      typedef _CharT		char_type;
-
-      explicit
-      ctype_byname(const char* __s, size_t __refs = 0);
-
-    protected:
-      virtual
-      ~ctype_byname() { };
-    };
-
-  // 22.2.1.4  Class ctype_byname specializations.
-  template<>
-    ctype_byname<char>::ctype_byname(const char*, size_t refs);
-
-  template<>
-    ctype_byname<wchar_t>::ctype_byname(const char*, size_t refs);
-
-  // 22.2.1.5  Template class codecvt
-  #include <bits/codecvt.h>
-
-  // 22.2.2  The numeric category.
-  class __num_base
-  {
-  public:
-    // NB: Code depends on the order of _S_atoms_out elements.
-    // Below are the indices into _S_atoms_out.
-    enum
-      {
-        _S_ominus,
-        _S_oplus,
-        _S_ox,
-        _S_oX,
-        _S_odigits,
-        _S_odigits_end = _S_odigits + 16,
-        _S_oudigits = _S_odigits_end,
-        _S_oudigits_end = _S_oudigits + 16,
-        _S_oe = _S_odigits + 14,  // For scientific notation, 'e'
-        _S_oE = _S_oudigits + 14, // For scientific notation, 'E'
-	_S_oend = _S_oudigits_end
-      };
-
-    // A list of valid numeric literals for output.  This array
-    // contains chars that will be passed through the current locale's
-    // ctype<_CharT>.widen() and then used to render numbers.
-    // For the standard "C" locale, this is
-    // "-+xX0123456789abcdef0123456789ABCDEF".
-    static const char* _S_atoms_out;
-
-    // String literal of acceptable (narrow) input, for num_get.
-    // "-+xX0123456789abcdefABCDEF"
-    static const char* _S_atoms_in;
-
-    enum
-    {
-      _S_iminus,
-      _S_iplus,
-      _S_ix,
-      _S_iX,
-      _S_izero,
-      _S_ie = _S_izero + 14,
-      _S_iE = _S_izero + 20,
-      _S_iend = 26
-    };
-
-    // num_put
-    // Construct and return valid scanf format for floating point types.
-    static void
-    _S_format_float(const ios_base& __io, char* __fptr, char __mod);
-  };
-
-  template<typename _CharT>
-    struct __numpunct_cache : public locale::facet
-    {
-      const char*			_M_grouping;
-      size_t                            _M_grouping_size;
-      bool				_M_use_grouping;
-      const _CharT*			_M_truename;
-      size_t                            _M_truename_size;
-      const _CharT*			_M_falsename;
-      size_t                            _M_falsename_size;
-      _CharT				_M_decimal_point;
-      _CharT				_M_thousands_sep;
-
-      // A list of valid numeric literals for output: in the standard
-      // "C" locale, this is "-+xX0123456789abcdef0123456789ABCDEF".
-      // This array contains the chars after having been passed
-      // through the current locale's ctype<_CharT>.widen().
-      _CharT				_M_atoms_out[__num_base::_S_oend];
-
-      // A list of valid numeric literals for input: in the standard
-      // "C" locale, this is "-+xX0123456789abcdefABCDEF"
-      // This array contains the chars after having been passed
-      // through the current locale's ctype<_CharT>.widen().
-      _CharT				_M_atoms_in[__num_base::_S_iend];
-
-      bool				_M_allocated;
-
-      __numpunct_cache(size_t __refs = 0) : facet(__refs),
-      _M_grouping(NULL), _M_grouping_size(0), _M_use_grouping(false),
-      _M_truename(NULL), _M_truename_size(0), _M_falsename(NULL),
-      _M_falsename_size(0), _M_decimal_point(_CharT()),
-      _M_thousands_sep(_CharT()), _M_allocated(false)
-      { }
-
-      ~__numpunct_cache();
-
-      void
-      _M_cache(const locale& __loc);
-
-    private:
-      __numpunct_cache&
-      operator=(const __numpunct_cache&);
-      
-      explicit
-      __numpunct_cache(const __numpunct_cache&);
-    };
-
-  template<typename _CharT>
-    __numpunct_cache<_CharT>::~__numpunct_cache()
-    {
-      if (_M_allocated)
-	{
-	  delete [] _M_grouping;
-	  delete [] _M_truename;
-	  delete [] _M_falsename;
-	}
-    }
-
-  /**
-   *  @brief  Numpunct facet.
-   *
-   *  This facet stores several pieces of information related to printing and
-   *  scanning numbers, such as the decimal point character.  It takes a
-   *  template parameter specifying the char type.  The numpunct facet is
-   *  used by streams for many I/O operations involving numbers.
-   *
-   *  The numpunct template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from a numpunct facet.
-  */
-  template<typename _CharT>
-    class numpunct : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-      typedef __numpunct_cache<_CharT>  __cache_type;
-
-    protected:
-      __cache_type*			_M_data;
-
-    public:
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Numpunct constructor.
-       *
-       *  @param  refs  Refcount to pass to the base class.
-       */
-      explicit
-      numpunct(size_t __refs = 0) : facet(__refs), _M_data(NULL)
-      { _M_initialize_numpunct(); }
-
-      /**
-       *  @brief  Internal constructor.  Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up the
-       *  predefined locale facets.
-       *
-       *  @param  cache  __numpunct_cache object.
-       *  @param  refs  Refcount to pass to the base class.
-       */
-      explicit
-      numpunct(__cache_type* __cache, size_t __refs = 0)
-      : facet(__refs), _M_data(__cache)
-      { _M_initialize_numpunct(); }
-
-      /**
-       *  @brief  Internal constructor.  Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param  cloc  The "C" locale.
-       *  @param  refs  Refcount to pass to the base class.
-       */
-      explicit
-      numpunct(__c_locale __cloc, size_t __refs = 0)
-      : facet(__refs), _M_data(NULL)
-      { _M_initialize_numpunct(__cloc); }
-
-      /**
-       *  @brief  Return decimal point character.
-       *
-       *  This function returns a char_type to use as a decimal point.  It
-       *  does so by returning returning
-       *  numpunct<char_type>::do_decimal_point().
-       *
-       *  @return  @a char_type representing a decimal point.
-      */
-      char_type
-      decimal_point() const
-      { return this->do_decimal_point(); }
-
-      /**
-       *  @brief  Return thousands separator character.
-       *
-       *  This function returns a char_type to use as a thousands
-       *  separator.  It does so by returning returning
-       *  numpunct<char_type>::do_thousands_sep().
-       *
-       *  @return  char_type representing a thousands separator.
-      */
-      char_type
-      thousands_sep() const
-      { return this->do_thousands_sep(); }
-
-      /**
-       *  @brief  Return grouping specification.
-       *
-       *  This function returns a string representing groupings for the
-       *  integer part of a number.  Groupings indicate where thousands
-       *  separators should be inserted in the integer part of a number.
-       *
-       *  Each char in the return string is interpret as an integer
-       *  rather than a character.  These numbers represent the number
-       *  of digits in a group.  The first char in the string
-       *  represents the number of digits in the least significant
-       *  group.  If a char is negative, it indicates an unlimited
-       *  number of digits for the group.  If more chars from the
-       *  string are required to group a number, the last char is used
-       *  repeatedly.
-       *
-       *  For example, if the grouping() returns "\003\002" and is
-       *  applied to the number 123456789, this corresponds to
-       *  12,34,56,789.  Note that if the string was "32", this would
-       *  put more than 50 digits into the least significant group if
-       *  the character set is ASCII.
-       *
-       *  The string is returned by calling
-       *  numpunct<char_type>::do_grouping().
-       *
-       *  @return  string representing grouping specification.
-      */
-      string
-      grouping() const
-      { return this->do_grouping(); }
-
-      /**
-       *  @brief  Return string representation of bool true.
-       *
-       *  This function returns a string_type containing the text
-       *  representation for true bool variables.  It does so by calling
-       *  numpunct<char_type>::do_truename().
-       *
-       *  @return  string_type representing printed form of true.
-      */
-      string_type
-      truename() const
-      { return this->do_truename(); }
-
-      /**
-       *  @brief  Return string representation of bool false.
-       *
-       *  This function returns a string_type containing the text
-       *  representation for false bool variables.  It does so by calling
-       *  numpunct<char_type>::do_falsename().
-       *
-       *  @return  string_type representing printed form of false.
-      */
-      string_type
-      falsename() const
-      { return this->do_falsename(); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~numpunct();
-
-      /**
-       *  @brief  Return decimal point character.
-       *
-       *  Returns a char_type to use as a decimal point.  This function is a
-       *  hook for derived classes to change the value returned.
-       *
-       *  @return  @a char_type representing a decimal point.
-      */
-      virtual char_type
-      do_decimal_point() const
-      { return _M_data->_M_decimal_point; }
-
-      /**
-       *  @brief  Return thousands separator character.
-       *
-       *  Returns a char_type to use as a thousands separator.  This function
-       *  is a hook for derived classes to change the value returned.
-       *
-       *  @return  @a char_type representing a thousands separator.
-      */
-      virtual char_type
-      do_thousands_sep() const
-      { return _M_data->_M_thousands_sep; }
-
-      /**
-       *  @brief  Return grouping specification.
-       *
-       *  Returns a string representing groupings for the integer part of a
-       *  number.  This function is a hook for derived classes to change the
-       *  value returned.  @see grouping() for details.
-       *
-       *  @return  String representing grouping specification.
-      */
-      virtual string
-      do_grouping() const
-      { return _M_data->_M_grouping; }
-
-      /**
-       *  @brief  Return string representation of bool true.
-       *
-       *  Returns a string_type containing the text representation for true
-       *  bool variables.  This function is a hook for derived classes to
-       *  change the value returned.
-       *
-       *  @return  string_type representing printed form of true.
-      */
-      virtual string_type
-      do_truename() const
-      { return _M_data->_M_truename; }
-
-      /**
-       *  @brief  Return string representation of bool false.
-       *
-       *  Returns a string_type containing the text representation for false
-       *  bool variables.  This function is a hook for derived classes to
-       *  change the value returned.
-       *
-       *  @return  string_type representing printed form of false.
-      */
-      virtual string_type
-      do_falsename() const
-      { return _M_data->_M_falsename; }
-
-      // For use at construction time only.
-      void
-      _M_initialize_numpunct(__c_locale __cloc = NULL);
-    };
-
-  template<typename _CharT>
-    locale::id numpunct<_CharT>::id;
-
-  template<>
-    numpunct<char>::~numpunct();
-
-  template<>
-    void
-    numpunct<char>::_M_initialize_numpunct(__c_locale __cloc);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    numpunct<wchar_t>::~numpunct();
-
-  template<>
-    void
-    numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc);
-#endif
-
-  template<typename _CharT>
-    class numpunct_byname : public numpunct<_CharT>
-    {
-    public:
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-
-      explicit
-      numpunct_byname(const char* __s, size_t __refs = 0)
-      : numpunct<_CharT>(__refs)
-      {
-	if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-	  {
-	    __c_locale __tmp;
-	    this->_S_create_c_locale(__tmp, __s);
-	    this->_M_initialize_numpunct(__tmp);
-	    this->_S_destroy_c_locale(__tmp);
-	  }
-      }
-
-    protected:
-      virtual
-      ~numpunct_byname() { }
-    };
-
-  /**
-   *  @brief  Facet for parsing number strings.
-   *
-   *  This facet encapsulates the code to parse and return a number
-   *  from a string.  It is used by the istream numeric extraction
-   *  operators.
-   *
-   *  The num_get template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from the num_get facet.
-  */
-  template<typename _CharT, typename _InIter>
-    class num_get : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _InIter			iter_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      num_get(size_t __refs = 0) : facet(__refs) { }
-
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the bool @a v.  It does so by calling
-       *  num_put::do_put().
-       *
-       *  If ios_base::boolalpha is set, attempts to read
-       *  ctype<CharT>::truename() or ctype<CharT>::falsename().  Sets
-       *  @a v to true or false if successful.  Sets err to
-       *  ios_base::failbit if reading the string fails.  Sets err to
-       *  ios_base::eofbit if the stream is emptied.
-       *
-       *  If ios_base::boolalpha is not set, proceeds as with reading a long,
-       *  except if the value is 1, sets @a v to true, if the value is 0, sets
-       *  @a v to false, and otherwise set err to ios_base::failbit.
-       *
-       *  @param  in  Start of input stream.
-       *  @param  end  End of input stream.
-       *  @param  io  Source of locale and flags.
-       *  @param  err  Error flags to set.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, bool& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      //@{
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the integral variable @a v.  It does so
-       *  by calling num_put::do_put().
-       *
-       *  Parsing is affected by the flag settings in @a io.
-       *
-       *  The basic parse is affected by the value of io.flags() &
-       *  ios_base::basefield.  If equal to ios_base::oct, parses like the
-       *  scanf %o specifier.  Else if equal to ios_base::hex, parses like %X
-       *  specifier.  Else if basefield equal to 0, parses like the %i
-       *  specifier.  Otherwise, parses like %d for signed and %u for unsigned
-       *  types.  The matching type length modifier is also used.
-       *
-       *  Digit grouping is intrepreted according to numpunct::grouping() and
-       *  numpunct::thousands_sep().  If the pattern of digit groups isn't
-       *  consistent, sets err to ios_base::failbit.
-       *
-       *  If parsing the string yields a valid value for @a v, @a v is set.
-       *  Otherwise, sets err to ios_base::failbit and leaves @a v unaltered.
-       *  Sets err to ios_base::eofbit if the stream is emptied.
-       *
-       *  @param  in  Start of input stream.
-       *  @param  end  End of input stream.
-       *  @param  io  Source of locale and flags.
-       *  @param  err  Error flags to set.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, long& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, unsigned short& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, unsigned int& __v)   const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, unsigned long& __v)  const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, long long& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, unsigned long long& __v)  const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the integral variable @a v.  It does so
-       *  by calling num_put::do_put().
-       *
-       *  The input characters are parsed like the scanf %g specifier.  The
-       *  matching type length modifier is also used.
-       *
-       *  The decimal point character used is numpunct::decimal_point().
-       *  Digit grouping is intrepreted according to numpunct::grouping() and
-       *  numpunct::thousands_sep().  If the pattern of digit groups isn't
-       *  consistent, sets err to ios_base::failbit.
-       *
-       *  If parsing the string yields a valid value for @a v, @a v is set.
-       *  Otherwise, sets err to ios_base::failbit and leaves @a v unaltered.
-       *  Sets err to ios_base::eofbit if the stream is emptied.
-       *
-       *  @param  in  Start of input stream.
-       *  @param  end  End of input stream.
-       *  @param  io  Source of locale and flags.
-       *  @param  err  Error flags to set.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, float& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, double& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, long double& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-      //@}
-
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the pointer variable @a v.  It does so
-       *  by calling num_put::do_put().
-       *
-       *  The input characters are parsed like the scanf %p specifier.
-       *
-       *  Digit grouping is intrepreted according to numpunct::grouping() and
-       *  numpunct::thousands_sep().  If the pattern of digit groups isn't
-       *  consistent, sets err to ios_base::failbit.
-       *
-       *  Note that the digit grouping effect for pointers is a bit ambiguous
-       *  in the standard and shouldn't be relied on.  See DR 344.
-       *
-       *  If parsing the string yields a valid value for @a v, @a v is set.
-       *  Otherwise, sets err to ios_base::failbit and leaves @a v unaltered.
-       *  Sets err to ios_base::eofbit if the stream is emptied.
-       *
-       *  @param  in  Start of input stream.
-       *  @param  end  End of input stream.
-       *  @param  io  Source of locale and flags.
-       *  @param  err  Error flags to set.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      iter_type
-      get(iter_type __in, iter_type __end, ios_base& __io,
-	  ios_base::iostate& __err, void*& __v) const
-      { return this->do_get(__in, __end, __io, __err, __v); }
-
-    protected:
-      /// Destructor.
-      virtual ~num_get() { }
-
-      iter_type
-      _M_extract_float(iter_type, iter_type, ios_base&, ios_base::iostate&,
-		       string& __xtrc) const;
-
-      template<typename _ValueT>
-        iter_type
-        _M_extract_int(iter_type, iter_type, ios_base&, ios_base::iostate&,
-		       _ValueT& __v) const;
-
-      //@{
-      /**
-       *  @brief  Numeric parsing.
-       *
-       *  Parses the input stream into the variable @a v.  This function is a
-       *  hook for derived classes to change the value returned.  @see get()
-       *  for more details.
-       *
-       *  @param  in  Start of input stream.
-       *  @param  end  End of input stream.
-       *  @param  io  Source of locale and flags.
-       *  @param  err  Error flags to set.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after reading.
-      */
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, bool&) const;
-
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate&, long&) const;
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-	      unsigned short&) const;
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-	     unsigned int&) const;
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-	     unsigned long&) const;
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-	     long long&) const;
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-	     unsigned long long&) const;
-#endif
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-	     float&) const;
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-	     double&) const;
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-	     long double&) const;
-
-      virtual iter_type
-      do_get(iter_type, iter_type, ios_base&, ios_base::iostate& __err,
-	     void*&) const;
-      //@}
-    };
-
-  template<typename _CharT, typename _InIter>
-    locale::id num_get<_CharT, _InIter>::id;
-
-
-  /**
-   *  @brief  Facet for converting numbers to strings.
-   *
-   *  This facet encapsulates the code to convert a number to a string.  It is
-   *  used by the ostream numeric insertion operators.
-   *
-   *  The num_put template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from the num_put facet.
-  */
-  template<typename _CharT, typename _OutIter>
-    class num_put : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT		char_type;
-      typedef _OutIter		iter_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id		id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      num_put(size_t __refs = 0) : facet(__refs) { }
-
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  Formats the boolean @a v and inserts it into a stream.  It does so
-       *  by calling num_put::do_put().
-       *
-       *  If ios_base::boolalpha is set, writes ctype<CharT>::truename() or
-       *  ctype<CharT>::falsename().  Otherwise formats @a v as an int.
-       *
-       *  @param  s  Stream to write to.
-       *  @param  io  Source of locale and flags.
-       *  @param  fill  Char_type to use for filling.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      iter_type
-      put(iter_type __s, ios_base& __f, char_type __fill, bool __v) const
-      { return this->do_put(__s, __f, __fill, __v); }
-
-      //@{
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  Formats the integral value @a v and inserts it into a
-       *  stream.  It does so by calling num_put::do_put().
-       *
-       *  Formatting is affected by the flag settings in @a io.
-       *
-       *  The basic format is affected by the value of io.flags() &
-       *  ios_base::basefield.  If equal to ios_base::oct, formats like the
-       *  printf %o specifier.  Else if equal to ios_base::hex, formats like
-       *  %x or %X with ios_base::uppercase unset or set respectively.
-       *  Otherwise, formats like %d, %ld, %lld for signed and %u, %lu, %llu
-       *  for unsigned values.  Note that if both oct and hex are set, neither
-       *  will take effect.
-       *
-       *  If ios_base::showpos is set, '+' is output before positive values.
-       *  If ios_base::showbase is set, '0' precedes octal values (except 0)
-       *  and '0[xX]' precedes hex values.
-       *
-       *  Thousands separators are inserted according to numpunct::grouping()
-       *  and numpunct::thousands_sep().  The decimal point character used is
-       *  numpunct::decimal_point().
-       *
-       *  If io.width() is non-zero, enough @a fill characters are inserted to
-       *  make the result at least that wide.  If
-       *  (io.flags() & ios_base::adjustfield) == ios_base::left, result is
-       *  padded at the end.  If ios_base::internal, then padding occurs
-       *  immediately after either a '+' or '-' or after '0x' or '0X'.
-       *  Otherwise, padding occurs at the beginning.
-       *
-       *  @param  s  Stream to write to.
-       *  @param  io  Source of locale and flags.
-       *  @param  fill  Char_type to use for filling.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      iter_type
-      put(iter_type __s, ios_base& __f, char_type __fill, long __v) const
-      { return this->do_put(__s, __f, __fill, __v); }
-
-      iter_type
-      put(iter_type __s, ios_base& __f, char_type __fill,
-	  unsigned long __v) const
-      { return this->do_put(__s, __f, __fill, __v); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      iter_type
-      put(iter_type __s, ios_base& __f, char_type __fill, long long __v) const
-      { return this->do_put(__s, __f, __fill, __v); }
-
-      iter_type
-      put(iter_type __s, ios_base& __f, char_type __fill,
-	  unsigned long long __v) const
-      { return this->do_put(__s, __f, __fill, __v); }
-#endif
-      //@}
-
-      //@{
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  Formats the floating point value @a v and inserts it into a stream.
-       *  It does so by calling num_put::do_put().
-       *
-       *  Formatting is affected by the flag settings in @a io.
-       *
-       *  The basic format is affected by the value of io.flags() &
-       *  ios_base::floatfield.  If equal to ios_base::fixed, formats like the
-       *  printf %f specifier.  Else if equal to ios_base::scientific, formats
-       *  like %e or %E with ios_base::uppercase unset or set respectively.
-       *  Otherwise, formats like %g or %G depending on uppercase.  Note that
-       *  if both fixed and scientific are set, the effect will also be like
-       *  %g or %G.
-       *
-       *  The output precision is given by io.precision().  This precision is
-       *  capped at numeric_limits::digits10 + 2 (different for double and
-       *  long double).  The default precision is 6.
-       *
-       *  If ios_base::showpos is set, '+' is output before positive values.
-       *  If ios_base::showpoint is set, a decimal point will always be
-       *  output.
-       *
-       *  Thousands separators are inserted according to numpunct::grouping()
-       *  and numpunct::thousands_sep().  The decimal point character used is
-       *  numpunct::decimal_point().
-       *
-       *  If io.width() is non-zero, enough @a fill characters are inserted to
-       *  make the result at least that wide.  If
-       *  (io.flags() & ios_base::adjustfield) == ios_base::left, result is
-       *  padded at the end.  If ios_base::internal, then padding occurs
-       *  immediately after either a '+' or '-' or after '0x' or '0X'.
-       *  Otherwise, padding occurs at the beginning.
-       *
-       *  @param  s  Stream to write to.
-       *  @param  io  Source of locale and flags.
-       *  @param  fill  Char_type to use for filling.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      iter_type
-      put(iter_type __s, ios_base& __f, char_type __fill, double __v) const
-      { return this->do_put(__s, __f, __fill, __v); }
-
-      iter_type
-      put(iter_type __s, ios_base& __f, char_type __fill,
-	  long double __v) const
-      { return this->do_put(__s, __f, __fill, __v); }
-      //@}
-
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  Formats the pointer value @a v and inserts it into a stream.  It
-       *  does so by calling num_put::do_put().
-       *
-       *  This function formats @a v as an unsigned long with ios_base::hex
-       *  and ios_base::showbase set.
-       *
-       *  @param  s  Stream to write to.
-       *  @param  io  Source of locale and flags.
-       *  @param  fill  Char_type to use for filling.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      iter_type
-      put(iter_type __s, ios_base& __f, char_type __fill,
-	  const void* __v) const
-      { return this->do_put(__s, __f, __fill, __v); }
-
-    protected:
-      template<typename _ValueT>
-        iter_type
-        _M_insert_float(iter_type, ios_base& __io, char_type __fill,
-			char __mod, _ValueT __v) const;
-
-      void
-      _M_group_float(const char* __grouping, size_t __grouping_size,
-		     char_type __sep, const char_type* __p, char_type* __new,
-		     char_type* __cs, int& __len) const;
-
-      template<typename _ValueT>
-        iter_type
-        _M_insert_int(iter_type, ios_base& __io, char_type __fill,
-		      _ValueT __v) const;
-
-      void
-      _M_group_int(const char* __grouping, size_t __grouping_size,
-		   char_type __sep, ios_base& __io, char_type* __new,
-		   char_type* __cs, int& __len) const;
-
-      void
-      _M_pad(char_type __fill, streamsize __w, ios_base& __io,
-	     char_type* __new, const char_type* __cs, int& __len) const;
-
-      /// Destructor.
-      virtual
-      ~num_put() { };
-
-      //@{
-      /**
-       *  @brief  Numeric formatting.
-       *
-       *  These functions do the work of formatting numeric values and
-       *  inserting them into a stream. This function is a hook for derived
-       *  classes to change the value returned.
-       *
-       *  @param  s  Stream to write to.
-       *  @param  io  Source of locale and flags.
-       *  @param  fill  Char_type to use for filling.
-       *  @param  v  Value to format and insert.
-       *  @return  Iterator after writing.
-      */
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type __fill, bool __v) const;
-
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type __fill, long __v) const;
-
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type __fill, unsigned long) const;
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type __fill, long long __v) const;
-
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type __fill, unsigned long long) const;
-#endif
-
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type __fill, double __v) const;
-
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type __fill, long double __v) const;
-
-      virtual iter_type
-      do_put(iter_type, ios_base&, char_type __fill, const void* __v) const;
-      //@}
-    };
-
-  template <typename _CharT, typename _OutIter>
-    locale::id num_put<_CharT, _OutIter>::id;
-
-
-  /**
-   *  @brief  Facet for localized string comparison.
-   *
-   *  This facet encapsulates the code to compare strings in a localized
-   *  manner.
-   *
-   *  The collate template uses protected virtual functions to provide
-   *  the actual results.  The public accessors forward the call to
-   *  the virtual functions.  These virtual functions are hooks for
-   *  developers to implement the behavior they require from the
-   *  collate facet.
-  */
-  template<typename _CharT>
-    class collate : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-
-    protected:
-      // Underlying "C" library locale information saved from
-      // initialization, needed by collate_byname as well.
-      __c_locale			_M_c_locale_collate;
-
-    public:
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      collate(size_t __refs = 0)
-      : facet(__refs), _M_c_locale_collate(_S_get_c_locale())
-      { }
-
-      /**
-       *  @brief  Internal constructor. Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param cloc  The "C" locale.
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      collate(__c_locale __cloc, size_t __refs = 0)
-      : facet(__refs), _M_c_locale_collate(_S_clone_c_locale(__cloc))
-      { }
-
-      /**
-       *  @brief  Compare two strings.
-       *
-       *  This function compares two strings and returns the result by calling
-       *  collate::do_compare().
-       *
-       *  @param lo1  Start of string 1.
-       *  @param hi1  End of string 1.
-       *  @param lo2  Start of string 2.
-       *  @param hi2  End of string 2.
-       *  @return  1 if string1 > string2, -1 if string1 < string2, else 0.
-      */
-      int
-      compare(const _CharT* __lo1, const _CharT* __hi1,
-	      const _CharT* __lo2, const _CharT* __hi2) const
-      { return this->do_compare(__lo1, __hi1, __lo2, __hi2); }
-
-      /**
-       *  @brief  Transform string to comparable form.
-       *
-       *  This function is a wrapper for strxfrm functionality.  It takes the
-       *  input string and returns a modified string that can be directly
-       *  compared to other transformed strings.  In the "C" locale, this
-       *  function just returns a copy of the input string.  In some other
-       *  locales, it may replace two chars with one, change a char for
-       *  another, etc.  It does so by returning collate::do_transform().
-       *
-       *  @param lo  Start of string.
-       *  @param hi  End of string.
-       *  @return  Transformed string_type.
-      */
-      string_type
-      transform(const _CharT* __lo, const _CharT* __hi) const
-      { return this->do_transform(__lo, __hi); }
-
-      /**
-       *  @brief  Return hash of a string.
-       *
-       *  This function computes and returns a hash on the input string.  It
-       *  does so by returning collate::do_hash().
-       *
-       *  @param lo  Start of string.
-       *  @param hi  End of string.
-       *  @return  Hash value.
-      */
-      long
-      hash(const _CharT* __lo, const _CharT* __hi) const
-      { return this->do_hash(__lo, __hi); }
-
-      // Used to abstract out _CharT bits in virtual member functions, below.
-      int
-      _M_compare(const _CharT*, const _CharT*) const;
-
-      size_t
-      _M_transform(_CharT*, const _CharT*, size_t) const;
-
-  protected:
-      /// Destructor.
-      virtual
-      ~collate()
-      { _S_destroy_c_locale(_M_c_locale_collate); }
-
-      /**
-       *  @brief  Compare two strings.
-       *
-       *  This function is a hook for derived classes to change the value
-       *  returned.  @see compare().
-       *
-       *  @param lo1  Start of string 1.
-       *  @param hi1  End of string 1.
-       *  @param lo2  Start of string 2.
-       *  @param hi2  End of string 2.
-       *  @return  1 if string1 > string2, -1 if string1 < string2, else 0.
-      */
-      virtual int
-      do_compare(const _CharT* __lo1, const _CharT* __hi1,
-		 const _CharT* __lo2, const _CharT* __hi2) const;
-
-      /**
-       *  @brief  Transform string to comparable form.
-       *
-       *  This function is a hook for derived classes to change the value
-       *  returned.
-       *
-       *  @param lo1  Start of string 1.
-       *  @param hi1  End of string 1.
-       *  @param lo2  Start of string 2.
-       *  @param hi2  End of string 2.
-       *  @return  1 if string1 > string2, -1 if string1 < string2, else 0.
-      */
-      virtual string_type
-      do_transform(const _CharT* __lo, const _CharT* __hi) const;
-
-      /**
-       *  @brief  Return hash of a string.
-       *
-       *  This function computes and returns a hash on the input string.  This
-       *  function is a hook for derived classes to change the value returned.
-       *
-       *  @param lo  Start of string.
-       *  @param hi  End of string.
-       *  @return  Hash value.
-      */
-      virtual long
-      do_hash(const _CharT* __lo, const _CharT* __hi) const;
-    };
-
-  template<typename _CharT>
-    locale::id collate<_CharT>::id;
-
-  // Specializations.
-  template<>
-    int
-    collate<char>::_M_compare(const char*, const char*) const;
-
-  template<>
-    size_t
-    collate<char>::_M_transform(char*, const char*, size_t) const;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    int
-    collate<wchar_t>::_M_compare(const wchar_t*, const wchar_t*) const;
-
-  template<>
-    size_t
-    collate<wchar_t>::_M_transform(wchar_t*, const wchar_t*, size_t) const;
-#endif
-
-  template<typename _CharT>
-    class collate_byname : public collate<_CharT>
-    {
-    public:
-      //@{
-      /// Public typedefs
-      typedef _CharT               char_type;
-      typedef basic_string<_CharT> string_type;
-      //@}
-
-      explicit
-      collate_byname(const char* __s, size_t __refs = 0)
-      : collate<_CharT>(__refs)
-      {
-	if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-	  {
-	    this->_S_destroy_c_locale(this->_M_c_locale_collate);
-	    this->_S_create_c_locale(this->_M_c_locale_collate, __s);
-	  }
-      }
-
-    protected:
-      virtual
-      ~collate_byname() { }
-    };
-
-
-  /**
-   *  @brief  Time format ordering data.
-   *
-   *  This class provides an enum representing different orderings of day,
-   *  month, and year.
-  */
-  class time_base
-  {
-  public:
-    enum dateorder { no_order, dmy, mdy, ymd, ydm };
-  };
-
-  template<typename _CharT>
-    struct __timepunct_cache : public locale::facet
-    {
-      // List of all known timezones, with GMT first.
-      static const _CharT*		_S_timezones[14];
-
-      const _CharT*			_M_date_format;
-      const _CharT*			_M_date_era_format;
-      const _CharT*			_M_time_format;
-      const _CharT*			_M_time_era_format;
-      const _CharT*			_M_date_time_format;
-      const _CharT*			_M_date_time_era_format;
-      const _CharT*			_M_am;
-      const _CharT*			_M_pm;
-      const _CharT*			_M_am_pm_format;
-
-      // Day names, starting with "C"'s Sunday.
-      const _CharT*			_M_day1;
-      const _CharT*			_M_day2;
-      const _CharT*			_M_day3;
-      const _CharT*			_M_day4;
-      const _CharT*			_M_day5;
-      const _CharT*			_M_day6;
-      const _CharT*			_M_day7;
-
-      // Abbreviated day names, starting with "C"'s Sun.
-      const _CharT*			_M_aday1;
-      const _CharT*			_M_aday2;
-      const _CharT*			_M_aday3;
-      const _CharT*			_M_aday4;
-      const _CharT*			_M_aday5;
-      const _CharT*			_M_aday6;
-      const _CharT*			_M_aday7;
-
-      // Month names, starting with "C"'s January.
-      const _CharT*			_M_month01;
-      const _CharT*			_M_month02;
-      const _CharT*			_M_month03;
-      const _CharT*			_M_month04;
-      const _CharT*			_M_month05;
-      const _CharT*			_M_month06;
-      const _CharT*			_M_month07;
-      const _CharT*			_M_month08;
-      const _CharT*			_M_month09;
-      const _CharT*			_M_month10;
-      const _CharT*			_M_month11;
-      const _CharT*			_M_month12;
-
-      // Abbreviated month names, starting with "C"'s Jan.
-      const _CharT*			_M_amonth01;
-      const _CharT*			_M_amonth02;
-      const _CharT*			_M_amonth03;
-      const _CharT*			_M_amonth04;
-      const _CharT*			_M_amonth05;
-      const _CharT*			_M_amonth06;
-      const _CharT*			_M_amonth07;
-      const _CharT*			_M_amonth08;
-      const _CharT*			_M_amonth09;
-      const _CharT*			_M_amonth10;
-      const _CharT*			_M_amonth11;
-      const _CharT*			_M_amonth12;
-
-      bool				_M_allocated;
-
-      __timepunct_cache(size_t __refs = 0) : facet(__refs),
-      _M_date_format(NULL), _M_date_era_format(NULL), _M_time_format(NULL),
-      _M_time_era_format(NULL), _M_date_time_format(NULL),
-      _M_date_time_era_format(NULL), _M_am(NULL), _M_pm(NULL),
-      _M_am_pm_format(NULL), _M_day1(NULL), _M_day2(NULL), _M_day3(NULL),
-      _M_day4(NULL), _M_day5(NULL), _M_day6(NULL), _M_day7(NULL),
-      _M_aday1(NULL), _M_aday2(NULL), _M_aday3(NULL), _M_aday4(NULL),
-      _M_aday5(NULL), _M_aday6(NULL), _M_aday7(NULL), _M_month01(NULL),
-      _M_month02(NULL), _M_month03(NULL), _M_month04(NULL), _M_month05(NULL),
-      _M_month06(NULL), _M_month07(NULL), _M_month08(NULL), _M_month09(NULL),
-      _M_month10(NULL), _M_month11(NULL), _M_month12(NULL), _M_amonth01(NULL),
-      _M_amonth02(NULL), _M_amonth03(NULL), _M_amonth04(NULL),
-      _M_amonth05(NULL), _M_amonth06(NULL), _M_amonth07(NULL),
-      _M_amonth08(NULL), _M_amonth09(NULL), _M_amonth10(NULL),
-      _M_amonth11(NULL), _M_amonth12(NULL), _M_allocated(false)
-      { }
-
-      ~__timepunct_cache();
-
-      void
-      _M_cache(const locale& __loc);
-
-    private:
-      __timepunct_cache&
-      operator=(const __timepunct_cache&);
-      
-      explicit
-      __timepunct_cache(const __timepunct_cache&);
-    };
-
-  template<typename _CharT>
-    __timepunct_cache<_CharT>::~__timepunct_cache()
-    {
-      if (_M_allocated)
-	{
-	  // Unused.
-	}
-    }
-
-  // Specializations.
-  template<>
-    const char*
-    __timepunct_cache<char>::_S_timezones[14];
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    const wchar_t*
-    __timepunct_cache<wchar_t>::_S_timezones[14];
-#endif
-
-  // Generic.
-  template<typename _CharT>
-    const _CharT* __timepunct_cache<_CharT>::_S_timezones[14];
-
-  template<typename _CharT>
-    class __timepunct : public locale::facet
-    {
-    public:
-      // Types:
-      typedef _CharT			__char_type;
-      typedef basic_string<_CharT>	__string_type;
-      typedef __timepunct_cache<_CharT>	__cache_type;
-
-    protected:
-      __cache_type*			_M_data;
-      __c_locale			_M_c_locale_timepunct;
-      const char*			_M_name_timepunct;
-
-    public:
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      explicit
-      __timepunct(size_t __refs = 0);
-
-      explicit
-      __timepunct(__cache_type* __cache, size_t __refs = 0);
-
-      /**
-       *  @brief  Internal constructor. Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param cloc  The "C" locale.
-       *  @param s  The name of a locale.
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      __timepunct(__c_locale __cloc, const char* __s, size_t __refs = 0);
-
-      void
-      _M_put(_CharT* __s, size_t __maxlen, const _CharT* __format,
-	     const tm* __tm) const;
-
-      void
-      _M_date_formats(const _CharT** __date) const
-      {
-	// Always have default first.
-	__date[0] = _M_data->_M_date_format;
-	__date[1] = _M_data->_M_date_era_format;
-      }
-
-      void
-      _M_time_formats(const _CharT** __time) const
-      {
-	// Always have default first.
-	__time[0] = _M_data->_M_time_format;
-	__time[1] = _M_data->_M_time_era_format;
-      }
-
-      void
-      _M_date_time_formats(const _CharT** __dt) const
-      {
-	// Always have default first.
-	__dt[0] = _M_data->_M_date_time_format;
-	__dt[1] = _M_data->_M_date_time_era_format;
-      }
-
-      void
-      _M_am_pm_format(const _CharT* __ampm) const
-      { __ampm = _M_data->_M_am_pm_format; }
-
-      void
-      _M_am_pm(const _CharT** __ampm) const
-      {
-	__ampm[0] = _M_data->_M_am;
-	__ampm[1] = _M_data->_M_pm;
-      }
-
-      void
-      _M_days(const _CharT** __days) const
-      {
-	__days[0] = _M_data->_M_day1;
-	__days[1] = _M_data->_M_day2;
-	__days[2] = _M_data->_M_day3;
-	__days[3] = _M_data->_M_day4;
-	__days[4] = _M_data->_M_day5;
-	__days[5] = _M_data->_M_day6;
-	__days[6] = _M_data->_M_day7;
-      }
-
-      void
-      _M_days_abbreviated(const _CharT** __days) const
-      {
-	__days[0] = _M_data->_M_aday1;
-	__days[1] = _M_data->_M_aday2;
-	__days[2] = _M_data->_M_aday3;
-	__days[3] = _M_data->_M_aday4;
-	__days[4] = _M_data->_M_aday5;
-	__days[5] = _M_data->_M_aday6;
-	__days[6] = _M_data->_M_aday7;
-      }
-
-      void
-      _M_months(const _CharT** __months) const
-      {
-	__months[0] = _M_data->_M_month01;
-	__months[1] = _M_data->_M_month02;
-	__months[2] = _M_data->_M_month03;
-	__months[3] = _M_data->_M_month04;
-	__months[4] = _M_data->_M_month05;
-	__months[5] = _M_data->_M_month06;
-	__months[6] = _M_data->_M_month07;
-	__months[7] = _M_data->_M_month08;
-	__months[8] = _M_data->_M_month09;
-	__months[9] = _M_data->_M_month10;
-	__months[10] = _M_data->_M_month11;
-	__months[11] = _M_data->_M_month12;
-      }
-
-      void
-      _M_months_abbreviated(const _CharT** __months) const
-      {
-	__months[0] = _M_data->_M_amonth01;
-	__months[1] = _M_data->_M_amonth02;
-	__months[2] = _M_data->_M_amonth03;
-	__months[3] = _M_data->_M_amonth04;
-	__months[4] = _M_data->_M_amonth05;
-	__months[5] = _M_data->_M_amonth06;
-	__months[6] = _M_data->_M_amonth07;
-	__months[7] = _M_data->_M_amonth08;
-	__months[8] = _M_data->_M_amonth09;
-	__months[9] = _M_data->_M_amonth10;
-	__months[10] = _M_data->_M_amonth11;
-	__months[11] = _M_data->_M_amonth12;
-      }
-
-    protected:
-      virtual
-      ~__timepunct();
-
-      // For use at construction time only.
-      void
-      _M_initialize_timepunct(__c_locale __cloc = NULL);
-    };
-
-  template<typename _CharT>
-    locale::id __timepunct<_CharT>::id;
-
-  // Specializations.
-  template<>
-    void
-    __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc);
-
-  template<>
-    void
-    __timepunct<char>::_M_put(char*, size_t, const char*, const tm*) const;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    void
-    __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc);
-
-  template<>
-    void
-    __timepunct<wchar_t>::_M_put(wchar_t*, size_t, const wchar_t*,
-				 const tm*) const;
-#endif
-
-  // Include host and configuration specific timepunct functions.
-  #include <bits/time_members.h>
-
-  /**
-   *  @brief  Facet for parsing dates and times.
-   *
-   *  This facet encapsulates the code to parse and return a date or
-   *  time from a string.  It is used by the istream numeric
-   *  extraction operators.
-   *
-   *  The time_get template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from the time_get facet.
-  */
-  template<typename _CharT, typename _InIter>
-    class time_get : public locale::facet, public time_base
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _InIter			iter_type;
-      //@}
-      typedef basic_string<_CharT>	__string_type;
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      time_get(size_t __refs = 0)
-      : facet (__refs) { }
-
-      /**
-       *  @brief  Return preferred order of month, day, and year.
-       *
-       *  This function returns an enum from timebase::dateorder giving the
-       *  preferred ordering if the format "x" given to time_put::put() only
-       *  uses month, day, and year.  If the format "x" for the associated
-       *  locale uses other fields, this function returns
-       *  timebase::dateorder::noorder.
-       *
-       *  NOTE: The library always returns noorder at the moment.
-       *
-       *  @return  A member of timebase::dateorder.
-      */
-      dateorder
-      date_order()  const
-      { return this->do_date_order(); }
-
-      /**
-       *  @brief  Parse input time string.
-       *
-       *  This function parses a time according to the format "x" and puts the
-       *  results into a user-supplied struct tm.  The result is returned by
-       *  calling time_get::do_get_time().
-       *
-       *  If there is a valid time string according to format "x", @a tm will
-       *  be filled in accordingly and the returned iterator will point to the
-       *  first character beyond the time string.  If an error occurs before
-       *  the end, err |= ios_base::failbit.  If parsing reads all the
-       *  characters, err |= ios_base::eofbit.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond time string.
-      */
-      iter_type
-      get_time(iter_type __beg, iter_type __end, ios_base& __io,
-	       ios_base::iostate& __err, tm* __tm)  const
-      { return this->do_get_time(__beg, __end, __io, __err, __tm); }
-
-      /**
-       *  @brief  Parse input date string.
-       *
-       *  This function parses a date according to the format "X" and puts the
-       *  results into a user-supplied struct tm.  The result is returned by
-       *  calling time_get::do_get_date().
-       *
-       *  If there is a valid date string according to format "X", @a tm will
-       *  be filled in accordingly and the returned iterator will point to the
-       *  first character beyond the date string.  If an error occurs before
-       *  the end, err |= ios_base::failbit.  If parsing reads all the
-       *  characters, err |= ios_base::eofbit.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond date string.
-      */
-      iter_type
-      get_date(iter_type __beg, iter_type __end, ios_base& __io,
-	       ios_base::iostate& __err, tm* __tm)  const
-      { return this->do_get_date(__beg, __end, __io, __err, __tm); }
-
-      /**
-       *  @brief  Parse input weekday string.
-       *
-       *  This function parses a weekday name and puts the results into a
-       *  user-supplied struct tm.  The result is returned by calling
-       *  time_get::do_get_weekday().
-       *
-       *  Parsing starts by parsing an abbreviated weekday name.  If a valid
-       *  abbreviation is followed by a character that would lead to the full
-       *  weekday name, parsing continues until the full name is found or an
-       *  error occurs.  Otherwise parsing finishes at the end of the
-       *  abbreviated name.
-       *
-       *  If an error occurs before the end, err |= ios_base::failbit.  If
-       *  parsing reads all the characters, err |= ios_base::eofbit.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond weekday name.
-      */
-      iter_type
-      get_weekday(iter_type __beg, iter_type __end, ios_base& __io,
-		  ios_base::iostate& __err, tm* __tm) const
-      { return this->do_get_weekday(__beg, __end, __io, __err, __tm); }
-
-      /**
-       *  @brief  Parse input month string.
-       *
-       *  This function parses a month name and puts the results into a
-       *  user-supplied struct tm.  The result is returned by calling
-       *  time_get::do_get_monthname().
-       *
-       *  Parsing starts by parsing an abbreviated month name.  If a valid
-       *  abbreviation is followed by a character that would lead to the full
-       *  month name, parsing continues until the full name is found or an
-       *  error occurs.  Otherwise parsing finishes at the end of the
-       *  abbreviated name.
-       *
-       *  If an error occurs before the end, err |= ios_base::failbit.  If
-       *  parsing reads all the characters, err |=
-       *  ios_base::eofbit.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond month name.
-      */
-      iter_type
-      get_monthname(iter_type __beg, iter_type __end, ios_base& __io,
-		    ios_base::iostate& __err, tm* __tm) const
-      { return this->do_get_monthname(__beg, __end, __io, __err, __tm); }
-
-      /**
-       *  @brief  Parse input year string.
-       *
-       *  This function reads up to 4 characters to parse a year string and
-       *  puts the results into a user-supplied struct tm.  The result is
-       *  returned by calling time_get::do_get_year().
-       *
-       *  4 consecutive digits are interpreted as a full year.  If there are
-       *  exactly 2 consecutive digits, the library interprets this as the
-       *  number of years since 1900.
-       *
-       *  If an error occurs before the end, err |= ios_base::failbit.  If
-       *  parsing reads all the characters, err |= ios_base::eofbit.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond year.
-      */
-      iter_type
-      get_year(iter_type __beg, iter_type __end, ios_base& __io,
-	       ios_base::iostate& __err, tm* __tm) const
-      { return this->do_get_year(__beg, __end, __io, __err, __tm); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~time_get() { }
-
-      /**
-       *  @brief  Return preferred order of month, day, and year.
-       *
-       *  This function returns an enum from timebase::dateorder giving the
-       *  preferred ordering if the format "x" given to time_put::put() only
-       *  uses month, day, and year.  This function is a hook for derived
-       *  classes to change the value returned.
-       *
-       *  @return  A member of timebase::dateorder.
-      */
-      virtual dateorder
-      do_date_order() const;
-
-      /**
-       *  @brief  Parse input time string.
-       *
-       *  This function parses a time according to the format "x" and puts the
-       *  results into a user-supplied struct tm.  This function is a hook for
-       *  derived classes to change the value returned.  @see get_time() for
-       *  details.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond time string.
-      */
-      virtual iter_type
-      do_get_time(iter_type __beg, iter_type __end, ios_base& __io,
-		  ios_base::iostate& __err, tm* __tm) const;
-
-      /**
-       *  @brief  Parse input date string.
-       *
-       *  This function parses a date according to the format "X" and puts the
-       *  results into a user-supplied struct tm.  This function is a hook for
-       *  derived classes to change the value returned.  @see get_date() for
-       *  details.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond date string.
-      */
-      virtual iter_type
-      do_get_date(iter_type __beg, iter_type __end, ios_base& __io,
-		  ios_base::iostate& __err, tm* __tm) const;
-
-      /**
-       *  @brief  Parse input weekday string.
-       *
-       *  This function parses a weekday name and puts the results into a
-       *  user-supplied struct tm.  This function is a hook for derived
-       *  classes to change the value returned.  @see get_weekday() for
-       *  details.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond weekday name.
-      */
-      virtual iter_type
-      do_get_weekday(iter_type __beg, iter_type __end, ios_base&,
-		     ios_base::iostate& __err, tm* __tm) const;
-
-      /**
-       *  @brief  Parse input month string.
-       *
-       *  This function parses a month name and puts the results into a
-       *  user-supplied struct tm.  This function is a hook for derived
-       *  classes to change the value returned.  @see get_monthname() for
-       *  details.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond month name.
-      */
-      virtual iter_type
-      do_get_monthname(iter_type __beg, iter_type __end, ios_base&,
-		       ios_base::iostate& __err, tm* __tm) const;
-
-      /**
-       *  @brief  Parse input year string.
-       *
-       *  This function reads up to 4 characters to parse a year string and
-       *  puts the results into a user-supplied struct tm.  This function is a
-       *  hook for derived classes to change the value returned.  @see
-       *  get_year() for details.
-       *
-       *  @param  beg  Start of string to parse.
-       *  @param  end  End of string to parse.
-       *  @param  io  Source of the locale.
-       *  @param  err  Error flags to set.
-       *  @param  tm  Pointer to struct tm to fill in.
-       *  @return  Iterator to first char beyond year.
-      */
-      virtual iter_type
-      do_get_year(iter_type __beg, iter_type __end, ios_base& __io,
-		  ios_base::iostate& __err, tm* __tm) const;
-
-      // Extract numeric component of length __len.
-      iter_type
-      _M_extract_num(iter_type __beg, iter_type __end, int& __member,
-		     int __min, int __max, size_t __len,
-		     ios_base& __io, ios_base::iostate& __err) const;
-
-      // Extract day or month name, or any unique array of string
-      // literals in a const _CharT* array.
-      iter_type
-      _M_extract_name(iter_type __beg, iter_type __end, int& __member,
-		      const _CharT** __names, size_t __indexlen,
-		      ios_base& __io, ios_base::iostate& __err) const;
-
-      // Extract on a component-by-component basis, via __format argument.
-      iter_type
-      _M_extract_via_format(iter_type __beg, iter_type __end, ios_base& __io,
-			    ios_base::iostate& __err, tm* __tm,
-			    const _CharT* __format) const;
-    };
-
-  template<typename _CharT, typename _InIter>
-    locale::id time_get<_CharT, _InIter>::id;
-
-  template<typename _CharT, typename _InIter>
-    class time_get_byname : public time_get<_CharT, _InIter>
-    {
-    public:
-      // Types:
-      typedef _CharT			char_type;
-      typedef _InIter			iter_type;
-
-      explicit
-      time_get_byname(const char*, size_t __refs = 0)
-      : time_get<_CharT, _InIter>(__refs) { }
-
-    protected:
-      virtual
-      ~time_get_byname() { }
-    };
-
-  /**
-   *  @brief  Facet for outputting dates and times.
-   *
-   *  This facet encapsulates the code to format and output dates and times
-   *  according to formats used by strftime().
-   *
-   *  The time_put template uses protected virtual functions to provide the
-   *  actual results.  The public accessors forward the call to the virtual
-   *  functions.  These virtual functions are hooks for developers to
-   *  implement the behavior they require from the time_put facet.
-  */
-  template<typename _CharT, typename _OutIter>
-    class time_put : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _OutIter			iter_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      time_put(size_t __refs = 0)
-      : facet(__refs) { }
-
-      /**
-       *  @brief  Format and output a time or date.
-       *
-       *  This function formats the data in struct tm according to the
-       *  provided format string.  The format string is interpreted as by
-       *  strftime().
-       *
-       *  @param  s  The stream to write to.
-       *  @param  io  Source of locale.
-       *  @param  fill  char_type to use for padding.
-       *  @param  tm  Struct tm with date and time info to format.
-       *  @param  beg  Start of format string.
-       *  @param  end  End of format string.
-       *  @return  Iterator after writing.
-       */
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill, const tm* __tm,
-	  const _CharT* __beg, const _CharT* __end) const;
-
-      /**
-       *  @brief  Format and output a time or date.
-       *
-       *  This function formats the data in struct tm according to the
-       *  provided format char and optional modifier.  The format and modifier
-       *  are interpreted as by strftime().  It does so by returning
-       *  time_put::do_put().
-       *
-       *  @param  s  The stream to write to.
-       *  @param  io  Source of locale.
-       *  @param  fill  char_type to use for padding.
-       *  @param  tm  Struct tm with date and time info to format.
-       *  @param  format  Format char.
-       *  @param  mod  Optional modifier char.
-       *  @return  Iterator after writing.
-       */
-      iter_type
-      put(iter_type __s, ios_base& __io, char_type __fill,
-	  const tm* __tm, char __format, char __mod = 0) const
-      { return this->do_put(__s, __io, __fill, __tm, __format, __mod); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~time_put()
-      { }
-
-      /**
-       *  @brief  Format and output a time or date.
-       *
-       *  This function formats the data in struct tm according to the
-       *  provided format char and optional modifier.  This function is a hook
-       *  for derived classes to change the value returned.  @see put() for
-       *  more details.
-       *
-       *  @param  s  The stream to write to.
-       *  @param  io  Source of locale.
-       *  @param  fill  char_type to use for padding.
-       *  @param  tm  Struct tm with date and time info to format.
-       *  @param  format  Format char.
-       *  @param  mod  Optional modifier char.
-       *  @return  Iterator after writing.
-       */
-      virtual iter_type
-      do_put(iter_type __s, ios_base& __io, char_type __fill, const tm* __tm,
-	     char __format, char __mod) const;
-    };
-
-  template<typename _CharT, typename _OutIter>
-    locale::id time_put<_CharT, _OutIter>::id;
-
-  template<typename _CharT, typename _OutIter>
-    class time_put_byname : public time_put<_CharT, _OutIter>
-    {
-    public:
-      // Types:
-      typedef _CharT			char_type;
-      typedef _OutIter			iter_type;
-
-      explicit
-      time_put_byname(const char*, size_t __refs = 0)
-      : time_put<_CharT, _OutIter>(__refs)
-      { };
-
-    protected:
-      virtual
-      ~time_put_byname() { }
-    };
-
-
-  /**
-   *  @brief  Money format ordering data.
-   *
-   *  This class contains an ordered array of 4 fields to represent the
-   *  pattern for formatting a money amount.  Each field may contain one entry
-   *  from the part enum.  symbol, sign, and value must be present and the
-   *  remaining field must contain either none or space.  @see
-   *  moneypunct::pos_format() and moneypunct::neg_format() for details of how
-   *  these fields are interpreted.
-  */
-  class money_base
-  {
-  public:
-    enum part { none, space, symbol, sign, value };
-    struct pattern { char field[4]; };
-
-    static const pattern _S_default_pattern;
-
-    enum
-    {
-      _S_minus,
-      _S_zero,
-      _S_end = 11
-    };
-
-    // String literal of acceptable (narrow) input/output, for
-    // money_get/money_put. "-0123456789"
-    static const char* _S_atoms;
-
-    // Construct and return valid pattern consisting of some combination of:
-    // space none symbol sign value
-    static pattern
-    _S_construct_pattern(char __precedes, char __space, char __posn);
-  };
-
-  template<typename _CharT, bool _Intl>
-    struct __moneypunct_cache : public locale::facet
-    {
-      const char*			_M_grouping;
-      size_t                            _M_grouping_size;
-      bool				_M_use_grouping;
-      _CharT				_M_decimal_point;
-      _CharT				_M_thousands_sep;
-      const _CharT*			_M_curr_symbol;
-      size_t                            _M_curr_symbol_size;
-      const _CharT*			_M_positive_sign;
-      size_t                            _M_positive_sign_size;
-      const _CharT*			_M_negative_sign;
-      size_t                            _M_negative_sign_size;
-      int				_M_frac_digits;
-      money_base::pattern		_M_pos_format;
-      money_base::pattern	        _M_neg_format;
-
-      // A list of valid numeric literals for input and output: in the standard
-      // "C" locale, this is "-0123456789". This array contains the chars after
-      // having been passed through the current locale's ctype<_CharT>.widen().
-      _CharT				_M_atoms[money_base::_S_end];
-
-      bool				_M_allocated;
-
-      __moneypunct_cache(size_t __refs = 0) : facet(__refs),
-      _M_grouping(NULL), _M_grouping_size(0), _M_use_grouping(false),
-      _M_decimal_point(_CharT()), _M_thousands_sep(_CharT()),
-      _M_curr_symbol(NULL), _M_curr_symbol_size(0),
-      _M_positive_sign(NULL), _M_positive_sign_size(0),
-      _M_negative_sign(NULL), _M_negative_sign_size(0),
-      _M_frac_digits(0),
-      _M_pos_format(money_base::pattern()),
-      _M_neg_format(money_base::pattern()), _M_allocated(false)
-      { }
-
-      ~__moneypunct_cache();
-
-      void
-      _M_cache(const locale& __loc);
-
-    private:
-      __moneypunct_cache&
-      operator=(const __moneypunct_cache&);
-      
-      explicit
-      __moneypunct_cache(const __moneypunct_cache&);
-    };
-
-  template<typename _CharT, bool _Intl>
-    __moneypunct_cache<_CharT, _Intl>::~__moneypunct_cache()
-    {
-      if (_M_allocated)
-	{
-	  delete [] _M_grouping;
-	  delete [] _M_curr_symbol;
-	  delete [] _M_positive_sign;
-	  delete [] _M_negative_sign;
-	}
-    }
-
-  /**
-   *  @brief  Facet for formatting data for money amounts.
-   *
-   *  This facet encapsulates the punctuation, grouping and other formatting
-   *  features of money amount string representations.
-  */
-  template<typename _CharT, bool _Intl>
-    class moneypunct : public locale::facet, public money_base
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-      typedef __moneypunct_cache<_CharT, _Intl>     __cache_type;
-
-    private:
-      __cache_type*			_M_data;
-
-    public:
-      /// This value is provided by the standard, but no reason for its
-      /// existence.
-      static const bool			intl = _Intl;
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      moneypunct(size_t __refs = 0) : facet(__refs), _M_data(NULL)
-      { _M_initialize_moneypunct(); }
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is an internal constructor.
-       *
-       *  @param cache  Cache for optimization.
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      moneypunct(__cache_type* __cache, size_t __refs = 0)
-      : facet(__refs), _M_data(__cache)
-      { _M_initialize_moneypunct(); }
-
-      /**
-       *  @brief  Internal constructor. Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param cloc  The "C" locale.
-       *  @param s  The name of a locale.
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      moneypunct(__c_locale __cloc, const char* __s, size_t __refs = 0)
-      : facet(__refs), _M_data(NULL)
-      { _M_initialize_moneypunct(__cloc, __s); }
-
-      /**
-       *  @brief  Return decimal point character.
-       *
-       *  This function returns a char_type to use as a decimal point.  It
-       *  does so by returning returning
-       *  moneypunct<char_type>::do_decimal_point().
-       *
-       *  @return  @a char_type representing a decimal point.
-      */
-      char_type
-      decimal_point() const
-      { return this->do_decimal_point(); }
-
-      /**
-       *  @brief  Return thousands separator character.
-       *
-       *  This function returns a char_type to use as a thousands
-       *  separator.  It does so by returning returning
-       *  moneypunct<char_type>::do_thousands_sep().
-       *
-       *  @return  char_type representing a thousands separator.
-      */
-      char_type
-      thousands_sep() const
-      { return this->do_thousands_sep(); }
-
-      /**
-       *  @brief  Return grouping specification.
-       *
-       *  This function returns a string representing groupings for the
-       *  integer part of an amount.  Groupings indicate where thousands
-       *  separators should be inserted.
-       *
-       *  Each char in the return string is interpret as an integer rather
-       *  than a character.  These numbers represent the number of digits in a
-       *  group.  The first char in the string represents the number of digits
-       *  in the least significant group.  If a char is negative, it indicates
-       *  an unlimited number of digits for the group.  If more chars from the
-       *  string are required to group a number, the last char is used
-       *  repeatedly.
-       *
-       *  For example, if the grouping() returns "\003\002" and is applied to
-       *  the number 123456789, this corresponds to 12,34,56,789.  Note that
-       *  if the string was "32", this would put more than 50 digits into the
-       *  least significant group if the character set is ASCII.
-       *
-       *  The string is returned by calling
-       *  moneypunct<char_type>::do_grouping().
-       *
-       *  @return  string representing grouping specification.
-      */
-      string
-      grouping() const
-      { return this->do_grouping(); }
-
-      /**
-       *  @brief  Return currency symbol string.
-       *
-       *  This function returns a string_type to use as a currency symbol.  It
-       *  does so by returning returning
-       *  moneypunct<char_type>::do_curr_symbol().
-       *
-       *  @return  @a string_type representing a currency symbol.
-      */
-      string_type
-      curr_symbol() const
-      { return this->do_curr_symbol(); }
-
-      /**
-       *  @brief  Return positive sign string.
-       *
-       *  This function returns a string_type to use as a sign for positive
-       *  amounts.  It does so by returning returning
-       *  moneypunct<char_type>::do_positive_sign().
-       *
-       *  If the return value contains more than one character, the first
-       *  character appears in the position indicated by pos_format() and the
-       *  remainder appear at the end of the formatted string.
-       *
-       *  @return  @a string_type representing a positive sign.
-      */
-      string_type
-      positive_sign() const
-      { return this->do_positive_sign(); }
-
-      /**
-       *  @brief  Return negative sign string.
-       *
-       *  This function returns a string_type to use as a sign for negative
-       *  amounts.  It does so by returning returning
-       *  moneypunct<char_type>::do_negative_sign().
-       *
-       *  If the return value contains more than one character, the first
-       *  character appears in the position indicated by neg_format() and the
-       *  remainder appear at the end of the formatted string.
-       *
-       *  @return  @a string_type representing a negative sign.
-      */
-      string_type
-      negative_sign() const
-      { return this->do_negative_sign(); }
-
-      /**
-       *  @brief  Return number of digits in fraction.
-       *
-       *  This function returns the exact number of digits that make up the
-       *  fractional part of a money amount.  It does so by returning
-       *  returning moneypunct<char_type>::do_frac_digits().
-       *
-       *  The fractional part of a money amount is optional.  But if it is
-       *  present, there must be frac_digits() digits.
-       *
-       *  @return  Number of digits in amount fraction.
-      */
-      int
-      frac_digits() const
-      { return this->do_frac_digits(); }
-
-      //@{
-      /**
-       *  @brief  Return pattern for money values.
-       *
-       *  This function returns a pattern describing the formatting of a
-       *  positive or negative valued money amount.  It does so by returning
-       *  returning moneypunct<char_type>::do_pos_format() or
-       *  moneypunct<char_type>::do_neg_format().
-       *
-       *  The pattern has 4 fields describing the ordering of symbol, sign,
-       *  value, and none or space.  There must be one of each in the pattern.
-       *  The none and space enums may not appear in the first field and space
-       *  may not appear in the final field.
-       *
-       *  The parts of a money string must appear in the order indicated by
-       *  the fields of the pattern.  The symbol field indicates that the
-       *  value of curr_symbol() may be present.  The sign field indicates
-       *  that the value of positive_sign() or negative_sign() must be
-       *  present.  The value field indicates that the absolute value of the
-       *  money amount is present.  none indicates 0 or more whitespace
-       *  characters, except at the end, where it permits no whitespace.
-       *  space indicates that 1 or more whitespace characters must be
-       *  present.
-       *
-       *  For example, for the US locale and pos_format() pattern
-       *  {symbol,sign,value,none}, curr_symbol() == '$' positive_sign() ==
-       *  '+', and value 10.01, and options set to force the symbol, the
-       *  corresponding string is "$+10.01".
-       *
-       *  @return  Pattern for money values.
-      */
-      pattern
-      pos_format() const
-      { return this->do_pos_format(); }
-
-      pattern
-      neg_format() const
-      { return this->do_neg_format(); }
-      //@}
-
-    protected:
-      /// Destructor.
-      virtual
-      ~moneypunct();
-
-      /**
-       *  @brief  Return decimal point character.
-       *
-       *  Returns a char_type to use as a decimal point.  This function is a
-       *  hook for derived classes to change the value returned.
-       *
-       *  @return  @a char_type representing a decimal point.
-      */
-      virtual char_type
-      do_decimal_point() const
-      { return _M_data->_M_decimal_point; }
-
-      /**
-       *  @brief  Return thousands separator character.
-       *
-       *  Returns a char_type to use as a thousands separator.  This function
-       *  is a hook for derived classes to change the value returned.
-       *
-       *  @return  @a char_type representing a thousands separator.
-      */
-      virtual char_type
-      do_thousands_sep() const
-      { return _M_data->_M_thousands_sep; }
-
-      /**
-       *  @brief  Return grouping specification.
-       *
-       *  Returns a string representing groupings for the integer part of a
-       *  number.  This function is a hook for derived classes to change the
-       *  value returned.  @see grouping() for details.
-       *
-       *  @return  String representing grouping specification.
-      */
-      virtual string
-      do_grouping() const
-      { return _M_data->_M_grouping; }
-
-      /**
-       *  @brief  Return currency symbol string.
-       *
-       *  This function returns a string_type to use as a currency symbol.
-       *  This function is a hook for derived classes to change the value
-       *  returned.  @see curr_symbol() for details.
-       *
-       *  @return  @a string_type representing a currency symbol.
-      */
-      virtual string_type
-      do_curr_symbol()   const
-      { return _M_data->_M_curr_symbol; }
-
-      /**
-       *  @brief  Return positive sign string.
-       *
-       *  This function returns a string_type to use as a sign for positive
-       *  amounts.  This function is a hook for derived classes to change the
-       *  value returned.  @see positive_sign() for details.
-       *
-       *  @return  @a string_type representing a positive sign.
-      */
-      virtual string_type
-      do_positive_sign() const
-      { return _M_data->_M_positive_sign; }
-
-      /**
-       *  @brief  Return negative sign string.
-       *
-       *  This function returns a string_type to use as a sign for negative
-       *  amounts.  This function is a hook for derived classes to change the
-       *  value returned.  @see negative_sign() for details.
-       *
-       *  @return  @a string_type representing a negative sign.
-      */
-      virtual string_type
-      do_negative_sign() const
-      { return _M_data->_M_negative_sign; }
-
-      /**
-       *  @brief  Return number of digits in fraction.
-       *
-       *  This function returns the exact number of digits that make up the
-       *  fractional part of a money amount.  This function is a hook for
-       *  derived classes to change the value returned.  @see frac_digits()
-       *  for details.
-       *
-       *  @return  Number of digits in amount fraction.
-      */
-      virtual int
-      do_frac_digits() const
-      { return _M_data->_M_frac_digits; }
-
-      /**
-       *  @brief  Return pattern for money values.
-       *
-       *  This function returns a pattern describing the formatting of a
-       *  positive valued money amount.  This function is a hook for derived
-       *  classes to change the value returned.  @see pos_format() for
-       *  details.
-       *
-       *  @return  Pattern for money values.
-      */
-      virtual pattern
-      do_pos_format() const
-      { return _M_data->_M_pos_format; }
-
-      /**
-       *  @brief  Return pattern for money values.
-       *
-       *  This function returns a pattern describing the formatting of a
-       *  negative valued money amount.  This function is a hook for derived
-       *  classes to change the value returned.  @see neg_format() for
-       *  details.
-       *
-       *  @return  Pattern for money values.
-      */
-      virtual pattern
-      do_neg_format() const
-      { return _M_data->_M_neg_format; }
-
-      // For use at construction time only.
-       void
-       _M_initialize_moneypunct(__c_locale __cloc = NULL,
-				const char* __name = NULL);
-    };
-
-  template<typename _CharT, bool _Intl>
-    locale::id moneypunct<_CharT, _Intl>::id;
-
-  template<typename _CharT, bool _Intl>
-    const bool moneypunct<_CharT, _Intl>::intl;
-
-  template<>
-    moneypunct<char, true>::~moneypunct();
-
-  template<>
-    moneypunct<char, false>::~moneypunct();
-
-  template<>
-    void
-    moneypunct<char, true>::_M_initialize_moneypunct(__c_locale, const char*);
-
-  template<>
-    void
-    moneypunct<char, false>::_M_initialize_moneypunct(__c_locale, const char*);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    moneypunct<wchar_t, true>::~moneypunct();
-
-  template<>
-    moneypunct<wchar_t, false>::~moneypunct();
-
-  template<>
-    void
-    moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale,
-							const char*);
-
-  template<>
-    void
-    moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale,
-							 const char*);
-#endif
-
-  template<typename _CharT, bool _Intl>
-    class moneypunct_byname : public moneypunct<_CharT, _Intl>
-    {
-    public:
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-
-      static const bool intl = _Intl;
-
-      explicit
-      moneypunct_byname(const char* __s, size_t __refs = 0)
-      : moneypunct<_CharT, _Intl>(__refs)
-      {
-	if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-	  {
-	    __c_locale __tmp;
-	    this->_S_create_c_locale(__tmp, __s);
-	    this->_M_initialize_moneypunct(__tmp);
-	    this->_S_destroy_c_locale(__tmp);
-	  }
-      }
-
-    protected:
-      virtual
-      ~moneypunct_byname() { }
-    };
-
-  template<typename _CharT, bool _Intl>
-    const bool moneypunct_byname<_CharT, _Intl>::intl;
-
-  /**
-   *  @brief  Facet for parsing monetary amounts.
-   *
-   *  This facet encapsulates the code to parse and return a monetary
-   *  amount from a string.
-   *
-   *  The money_get template uses protected virtual functions to
-   *  provide the actual results.  The public accessors forward the
-   *  call to the virtual functions.  These virtual functions are
-   *  hooks for developers to implement the behavior they require from
-   *  the money_get facet.
-  */
-  template<typename _CharT, typename _InIter>
-    class money_get : public locale::facet
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _InIter			iter_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      money_get(size_t __refs = 0) : facet(__refs) { }
-
-      /**
-       *  @brief  Read and parse a monetary value.
-       *
-       *  This function reads characters from @a s, interprets them as a
-       *  monetary value according to moneypunct and ctype facets retrieved
-       *  from io.getloc(), and returns the result in @a units as an integral
-       *  value moneypunct::frac_digits() * the actual amount.  For example,
-       *  the string $10.01 in a US locale would store 1001 in @a units.
-       *
-       *  Any characters not part of a valid money amount are not consumed.
-       *
-       *  If a money value cannot be parsed from the input stream, sets
-       *  err=(err|io.failbit).  If the stream is consumed before finishing
-       *  parsing,  sets err=(err|io.failbit|io.eofbit).  @a units is
-       *  unchanged if parsing fails.
-       *
-       *  This function works by returning the result of do_get().
-       *
-       *  @param  s  Start of characters to parse.
-       *  @param  end  End of characters to parse.
-       *  @param  intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  io  Source of facets and io state.
-       *  @param  err  Error field to set if parsing fails.
-       *  @param  units  Place to store result of parsing.
-       *  @return  Iterator referencing first character beyond valid money
-       *	   amount.
-       */
-      iter_type
-      get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	  ios_base::iostate& __err, long double& __units) const
-      { return this->do_get(__s, __end, __intl, __io, __err, __units); }
-
-      /**
-       *  @brief  Read and parse a monetary value.
-       *
-       *  This function reads characters from @a s, interprets them as a
-       *  monetary value according to moneypunct and ctype facets retrieved
-       *  from io.getloc(), and returns the result in @a digits.  For example,
-       *  the string $10.01 in a US locale would store "1001" in @a digits.
-       *
-       *  Any characters not part of a valid money amount are not consumed.
-       *
-       *  If a money value cannot be parsed from the input stream, sets
-       *  err=(err|io.failbit).  If the stream is consumed before finishing
-       *  parsing,  sets err=(err|io.failbit|io.eofbit).
-       *
-       *  This function works by returning the result of do_get().
-       *
-       *  @param  s  Start of characters to parse.
-       *  @param  end  End of characters to parse.
-       *  @param  intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  io  Source of facets and io state.
-       *  @param  err  Error field to set if parsing fails.
-       *  @param  digits  Place to store result of parsing.
-       *  @return  Iterator referencing first character beyond valid money
-       *	   amount.
-       */
-      iter_type
-      get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	  ios_base::iostate& __err, string_type& __digits) const
-      { return this->do_get(__s, __end, __intl, __io, __err, __digits); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~money_get() { }
-
-      /**
-       *  @brief  Read and parse a monetary value.
-       *
-       *  This function reads and parses characters representing a monetary
-       *  value.  This function is a hook for derived classes to change the
-       *  value returned.  @see get() for details.
-       */
-      virtual iter_type
-      do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	     ios_base::iostate& __err, long double& __units) const;
-
-      /**
-       *  @brief  Read and parse a monetary value.
-       *
-       *  This function reads and parses characters representing a monetary
-       *  value.  This function is a hook for derived classes to change the
-       *  value returned.  @see get() for details.
-       */
-      virtual iter_type
-      do_get(iter_type __s, iter_type __end, bool __intl, ios_base& __io,
-	     ios_base::iostate& __err, string_type& __digits) const;
-
-      template<bool _Intl>
-        iter_type
-        _M_extract(iter_type __s, iter_type __end, ios_base& __io,
-		   ios_base::iostate& __err, string& __digits) const;     
-    };
-
-  template<typename _CharT, typename _InIter>
-    locale::id money_get<_CharT, _InIter>::id;
-
-  /**
-   *  @brief  Facet for outputting monetary amounts.
-   *
-   *  This facet encapsulates the code to format and output a monetary
-   *  amount.
-   *
-   *  The money_put template uses protected virtual functions to
-   *  provide the actual results.  The public accessors forward the
-   *  call to the virtual functions.  These virtual functions are
-   *  hooks for developers to implement the behavior they require from
-   *  the money_put facet.
-  */
-  template<typename _CharT, typename _OutIter>
-    class money_put : public locale::facet
-    {
-    public:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef _OutIter			iter_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      money_put(size_t __refs = 0) : facet(__refs) { }
-
-      /**
-       *  @brief  Format and output a monetary value.
-       *
-       *  This function formats @a units as a monetary value according to
-       *  moneypunct and ctype facets retrieved from io.getloc(), and writes
-       *  the resulting characters to @a s.  For example, the value 1001 in a
-       *  US locale would write "$10.01" to @a s.
-       *
-       *  This function works by returning the result of do_put().
-       *
-       *  @param  s  The stream to write to.
-       *  @param  intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  io  Source of facets and io state.
-       *  @param  fill  char_type to use for padding.
-       *  @param  units  Place to store result of parsing.
-       *  @return  Iterator after writing.
-       */
-      iter_type
-      put(iter_type __s, bool __intl, ios_base& __io,
-	  char_type __fill, long double __units) const
-      { return this->do_put(__s, __intl, __io, __fill, __units); }
-
-      /**
-       *  @brief  Format and output a monetary value.
-       *
-       *  This function formats @a digits as a monetary value according to
-       *  moneypunct and ctype facets retrieved from io.getloc(), and writes
-       *  the resulting characters to @a s.  For example, the string "1001" in
-       *  a US locale would write "$10.01" to @a s.
-       *
-       *  This function works by returning the result of do_put().
-       *
-       *  @param  s  The stream to write to.
-       *  @param  intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  io  Source of facets and io state.
-       *  @param  fill  char_type to use for padding.
-       *  @param  units  Place to store result of parsing.
-       *  @return  Iterator after writing.
-       */
-      iter_type
-      put(iter_type __s, bool __intl, ios_base& __io,
-	  char_type __fill, const string_type& __digits) const
-      { return this->do_put(__s, __intl, __io, __fill, __digits); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~money_put() { }
-
-      /**
-       *  @brief  Format and output a monetary value.
-       *
-       *  This function formats @a units as a monetary value according to
-       *  moneypunct and ctype facets retrieved from io.getloc(), and writes
-       *  the resulting characters to @a s.  For example, the value 1001 in a
-       *  US locale would write "$10.01" to @a s.
-       *
-       *  This function is a hook for derived classes to change the value
-       *  returned.  @see put().
-       *
-       *  @param  s  The stream to write to.
-       *  @param  intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  io  Source of facets and io state.
-       *  @param  fill  char_type to use for padding.
-       *  @param  units  Place to store result of parsing.
-       *  @return  Iterator after writing.
-       */
-      virtual iter_type
-      do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	     long double __units) const;
-
-      /**
-       *  @brief  Format and output a monetary value.
-       *
-       *  This function formats @a digits as a monetary value according to
-       *  moneypunct and ctype facets retrieved from io.getloc(), and writes
-       *  the resulting characters to @a s.  For example, the string "1001" in
-       *  a US locale would write "$10.01" to @a s.
-       *
-       *  This function is a hook for derived classes to change the value
-       *  returned.  @see put().
-       *
-       *  @param  s  The stream to write to.
-       *  @param  intl  Parameter to use_facet<moneypunct<CharT,intl> >.
-       *  @param  io  Source of facets and io state.
-       *  @param  fill  char_type to use for padding.
-       *  @param  units  Place to store result of parsing.
-       *  @return  Iterator after writing.
-       */
-      virtual iter_type
-      do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	     const string_type& __digits) const;
-
-      template<bool _Intl>
-        iter_type
-        _M_insert(iter_type __s, ios_base& __io, char_type __fill,
-		  const string_type& __digits) const;
-    };
-
-  template<typename _CharT, typename _OutIter>
-    locale::id money_put<_CharT, _OutIter>::id;
-
-  /**
-   *  @brief  Messages facet base class providing catalog typedef.
-   */
-  struct messages_base
-  {
-    typedef int catalog;
-  };
-
-  /**
-   *  @brief  Facet for handling message catalogs
-   *
-   *  This facet encapsulates the code to retrieve messages from
-   *  message catalogs.  The only thing defined by the standard for this facet
-   *  is the interface.  All underlying functionality is
-   *  implementation-defined.
-   *
-   *  This library currently implements 3 versions of the message facet.  The
-   *  first version (gnu) is a wrapper around gettext, provided by libintl.
-   *  The second version (ieee) is a wrapper around catgets.  The final
-   *  version (default) does no actual translation.  These implementations are
-   *  only provided for char and wchar_t instantiations.
-   *
-   *  The messages template uses protected virtual functions to
-   *  provide the actual results.  The public accessors forward the
-   *  call to the virtual functions.  These virtual functions are
-   *  hooks for developers to implement the behavior they require from
-   *  the messages facet.
-  */
-  template<typename _CharT>
-    class messages : public locale::facet, public messages_base
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-      //@}
-
-    protected:
-      // Underlying "C" library locale information saved from
-      // initialization, needed by messages_byname as well.
-      __c_locale			_M_c_locale_messages;
-      const char*			_M_name_messages;
-
-    public:
-      /// Numpunct facet id.
-      static locale::id			id;
-
-      /**
-       *  @brief  Constructor performs initialization.
-       *
-       *  This is the constructor provided by the standard.
-       *
-       *  @param refs  Passed to the base facet class.
-      */
-      explicit
-      messages(size_t __refs = 0);
-
-      // Non-standard.
-      /**
-       *  @brief  Internal constructor.  Not for general use.
-       *
-       *  This is a constructor for use by the library itself to set up new
-       *  locales.
-       *
-       *  @param  cloc  The "C" locale.
-       *  @param  s  The name of a locale.
-       *  @param  refs  Refcount to pass to the base class.
-       */
-      explicit
-      messages(__c_locale __cloc, const char* __s, size_t __refs = 0);
-
-      /*
-       *  @brief  Open a message catalog.
-       *
-       *  This function opens and returns a handle to a message catalog by
-       *  returning do_open(s, loc).
-       *
-       *  @param  s  The catalog to open.
-       *  @param  loc  Locale to use for character set conversions.
-       *  @return  Handle to the catalog or value < 0 if open fails.
-      */
-      catalog
-      open(const basic_string<char>& __s, const locale& __loc) const
-      { return this->do_open(__s, __loc); }
-
-      // Non-standard and unorthodox, yet effective.
-      /*
-       *  @brief  Open a message catalog.
-       *
-       *  This non-standard function opens and returns a handle to a message
-       *  catalog by returning do_open(s, loc).  The third argument provides a
-       *  message catalog root directory for gnu gettext and is ignored
-       *  otherwise.
-       *
-       *  @param  s  The catalog to open.
-       *  @param  loc  Locale to use for character set conversions.
-       *  @param  dir  Message catalog root directory.
-       *  @return  Handle to the catalog or value < 0 if open fails.
-      */
-      catalog
-      open(const basic_string<char>&, const locale&, const char*) const;
-
-      /*
-       *  @brief  Look up a string in a message catalog.
-       *
-       *  This function retrieves and returns a message from a catalog by
-       *  returning do_get(c, set, msgid, s).
-       *
-       *  For gnu, @a set and @a msgid are ignored.  Returns gettext(s).
-       *  For default, returns s. For ieee, returns catgets(c,set,msgid,s).
-       *
-       *  @param  c  The catalog to access.
-       *  @param  set  Implementation-defined.
-       *  @param  msgid  Implementation-defined.
-       *  @param  s  Default return value if retrieval fails.
-       *  @return  Retrieved message or @a s if get fails.
-      */
-      string_type
-      get(catalog __c, int __set, int __msgid, const string_type& __s) const
-      { return this->do_get(__c, __set, __msgid, __s); }
-
-      /*
-       *  @brief  Close a message catalog.
-       *
-       *  Closes catalog @a c by calling do_close(c).
-       *
-       *  @param  c  The catalog to close.
-      */
-      void
-      close(catalog __c) const
-      { return this->do_close(__c); }
-
-    protected:
-      /// Destructor.
-      virtual
-      ~messages();
-
-      /*
-       *  @brief  Open a message catalog.
-       *
-       *  This function opens and returns a handle to a message catalog in an
-       *  implementation-defined manner.  This function is a hook for derived
-       *  classes to change the value returned.
-       *
-       *  @param  s  The catalog to open.
-       *  @param  loc  Locale to use for character set conversions.
-       *  @return  Handle to the opened catalog, value < 0 if open failed.
-      */
-      virtual catalog
-      do_open(const basic_string<char>&, const locale&) const;
-
-      /*
-       *  @brief  Look up a string in a message catalog.
-       *
-       *  This function retrieves and returns a message from a catalog in an
-       *  implementation-defined manner.  This function is a hook for derived
-       *  classes to change the value returned.
-       *
-       *  For gnu, @a set and @a msgid are ignored.  Returns gettext(s).
-       *  For default, returns s. For ieee, returns catgets(c,set,msgid,s).
-       *
-       *  @param  c  The catalog to access.
-       *  @param  set  Implementation-defined.
-       *  @param  msgid  Implementation-defined.
-       *  @param  s  Default return value if retrieval fails.
-       *  @return  Retrieved message or @a s if get fails.
-      */
-      virtual string_type
-      do_get(catalog, int, int, const string_type& __dfault) const;
-
-      /*
-       *  @brief  Close a message catalog.
-       *
-       *  @param  c  The catalog to close.
-      */
-      virtual void
-      do_close(catalog) const;
-
-      // Returns a locale and codeset-converted string, given a char* message.
-      char*
-      _M_convert_to_char(const string_type& __msg) const
-      {
-	// XXX
-	return reinterpret_cast<char*>(const_cast<_CharT*>(__msg.c_str()));
-      }
-
-      // Returns a locale and codeset-converted string, given a char* message.
-      string_type
-      _M_convert_from_char(char*) const
-      {
-#if 0
-	// Length of message string without terminating null.
-	size_t __len = char_traits<char>::length(__msg) - 1;
-
-	// "everybody can easily convert the string using
-	// mbsrtowcs/wcsrtombs or with iconv()"
-
-	// Convert char* to _CharT in locale used to open catalog.
-	// XXX need additional template parameter on messages class for this..
-	// typedef typename codecvt<char, _CharT, _StateT> __codecvt_type;
-	typedef typename codecvt<char, _CharT, mbstate_t> __codecvt_type;
-
-	__codecvt_type::state_type __state;
-	// XXX may need to initialize state.
-	//initialize_state(__state._M_init());
-
-	char* __from_next;
-	// XXX what size for this string?
-	_CharT* __to = static_cast<_CharT*>(__builtin_alloca(__len + 1));
-	const __codecvt_type& __cvt = use_facet<__codecvt_type>(_M_locale_conv);
-	__cvt.out(__state, __msg, __msg + __len, __from_next,
-		  __to, __to + __len + 1, __to_next);
-	return string_type(__to);
-#endif
-#if 0
-	typedef ctype<_CharT> __ctype_type;
-	// const __ctype_type& __cvt = use_facet<__ctype_type>(_M_locale_msg);
-	const __ctype_type& __cvt = use_facet<__ctype_type>(locale());
-	// XXX Again, proper length of converted string an issue here.
-	// For now, assume the converted length is not larger.
-	_CharT* __dest = static_cast<_CharT*>(__builtin_alloca(__len + 1));
-	__cvt.widen(__msg, __msg + __len, __dest);
-	return basic_string<_CharT>(__dest);
-#endif
-	return string_type();
-      }
-     };
-
-  template<typename _CharT>
-    locale::id messages<_CharT>::id;
-
-  // Specializations for required instantiations.
-  template<>
-    string
-    messages<char>::do_get(catalog, int, int, const string&) const;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    wstring
-    messages<wchar_t>::do_get(catalog, int, int, const wstring&) const;
-#endif
-
-  template<typename _CharT>
-    class messages_byname : public messages<_CharT>
-    {
-    public:
-      typedef _CharT			char_type;
-      typedef basic_string<_CharT>	string_type;
-
-      explicit
-      messages_byname(const char* __s, size_t __refs = 0);
-
-    protected:
-      virtual
-      ~messages_byname()
-      { }
-    };
-
-  // Include host and configuration specific messages functions.
-  #include <bits/messages_members.h>
-
-
-  // Subclause convenience interfaces, inlines.
-  // NB: These are inline because, when used in a loop, some compilers
-  // can hoist the body out of the loop; then it's just as fast as the
-  // C is*() function.
-  //@{
-  /// Convenience interface to ctype.is().
-  template<typename _CharT>
-    inline bool
-    isspace(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::space, __c); }
-
-  template<typename _CharT>
-    inline bool
-    isprint(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c); }
-
-  template<typename _CharT>
-    inline bool
-    iscntrl(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::cntrl, __c); }
-
-  template<typename _CharT>
-    inline bool
-    isupper(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::upper, __c); }
-
-  template<typename _CharT>
-    inline bool islower(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::lower, __c); }
-
-  template<typename _CharT>
-    inline bool
-    isalpha(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alpha, __c); }
-
-  template<typename _CharT>
-    inline bool
-    isdigit(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::digit, __c); }
-
-  template<typename _CharT>
-    inline bool
-    ispunct(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::punct, __c); }
-
-  template<typename _CharT>
-    inline bool
-    isxdigit(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::xdigit, __c); }
-
-  template<typename _CharT>
-    inline bool
-    isalnum(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alnum, __c); }
-
-  template<typename _CharT>
-    inline bool
-    isgraph(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).is(ctype_base::graph, __c); }
-
-  template<typename _CharT>
-    inline _CharT
-    toupper(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).toupper(__c); }
-
-  template<typename _CharT>
-    inline _CharT
-    tolower(_CharT __c, const locale& __loc)
-    { return use_facet<ctype<_CharT> >(__loc).tolower(__c); }
-  //@}
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/locale_facets.tcc b/include.new/c++/3.4/bits/locale_facets.tcc
deleted file mode 100644
index 4f65844..0000000
--- a/include.new/c++/3.4/bits/locale_facets.tcc
+++ /dev/null
@@ -1,2744 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Warning: this file is not meant for user inclusion. Use <locale>.
-
-#ifndef _LOCALE_FACETS_TCC
-#define _LOCALE_FACETS_TCC 1
-
-#pragma GCC system_header
-
-#include <limits>		// For numeric_limits
-#include <typeinfo>		// For bad_cast.
-#include <bits/streambuf_iterator.h>
-
-namespace std
-{
-  template<typename _Facet>
-    locale
-    locale::combine(const locale& __other) const
-    {
-      _Impl* __tmp = new _Impl(*_M_impl, 1);
-      try
-	{
-	  __tmp->_M_replace_facet(__other._M_impl, &_Facet::id);
-	}
-      catch(...)
-	{
-	  __tmp->_M_remove_reference();
-	  __throw_exception_again;
-	}
-      return locale(__tmp);
-    }
-
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    bool
-    locale::operator()(const basic_string<_CharT, _Traits, _Alloc>& __s1,
-                       const basic_string<_CharT, _Traits, _Alloc>& __s2) const
-    {
-      typedef std::collate<_CharT> __collate_type;
-      const __collate_type& __collate = use_facet<__collate_type>(*this);
-      return (__collate.compare(__s1.data(), __s1.data() + __s1.length(),
-				__s2.data(), __s2.data() + __s2.length()) < 0);
-    }
-
-  /**
-   *  @brief  Test for the presence of a facet.
-   *
-   *  has_facet tests the locale argument for the presence of the facet type
-   *  provided as the template parameter.  Facets derived from the facet
-   *  parameter will also return true.
-   *
-   *  @param  Facet  The facet type to test the presence of.
-   *  @param  locale  The locale to test.
-   *  @return  true if locale contains a facet of type Facet, else false.
-  */
-  template<typename _Facet>
-    inline bool
-    has_facet(const locale& __loc) throw()
-    {
-      const size_t __i = _Facet::id._M_id();
-      const locale::facet** __facets = __loc._M_impl->_M_facets;
-      return (__i < __loc._M_impl->_M_facets_size && __facets[__i]);
-    }
-
-  /**
-   *  @brief  Return a facet.
-   *
-   *  use_facet looks for and returns a reference to a facet of type Facet
-   *  where Facet is the template parameter.  If has_facet(locale) is true,
-   *  there is a suitable facet to return.  It throws std::bad_cast if the
-   *  locale doesn't contain a facet of type Facet.
-   *
-   *  @param  Facet  The facet type to access.
-   *  @param  locale  The locale to use.
-   *  @return  Reference to facet of type Facet.
-   *  @throw  std::bad_cast if locale doesn't contain a facet of type Facet.
-  */
-  template<typename _Facet>
-    inline const _Facet&
-    use_facet(const locale& __loc)
-    {
-      const size_t __i = _Facet::id._M_id();
-      const locale::facet** __facets = __loc._M_impl->_M_facets;
-      if (!(__i < __loc._M_impl->_M_facets_size && __facets[__i]))
-        __throw_bad_cast();
-      return static_cast<const _Facet&>(*__facets[__i]);
-    }
-
-  // Routine to access a cache for the facet.  If the cache didn't
-  // exist before, it gets constructed on the fly.
-  template<typename _Facet>
-    struct __use_cache
-    {
-      const _Facet*
-      operator() (const locale& __loc) const;
-    };
-
-  // Specializations.
-  template<typename _CharT>
-    struct __use_cache<__numpunct_cache<_CharT> >
-    {
-      const __numpunct_cache<_CharT>*
-      operator() (const locale& __loc) const
-      {
-	const size_t __i = numpunct<_CharT>::id._M_id();
-	const locale::facet** __caches = __loc._M_impl->_M_caches;
-	if (!__caches[__i])
-	  {
-	    __numpunct_cache<_CharT>* __tmp = NULL;
-	    try
-	      {
-		__tmp = new __numpunct_cache<_CharT>;
-		__tmp->_M_cache(__loc);
-	      }
-	    catch(...)
-	      {
-		delete __tmp;
-		__throw_exception_again;
-	      }
-	    __loc._M_impl->_M_install_cache(__tmp, __i);
-	  }
-	return static_cast<const __numpunct_cache<_CharT>*>(__caches[__i]);
-      }
-    };
-
-  template<typename _CharT, bool _Intl>
-    struct __use_cache<__moneypunct_cache<_CharT, _Intl> >
-    {
-      const __moneypunct_cache<_CharT, _Intl>*
-      operator() (const locale& __loc) const
-      {
-	const size_t __i = moneypunct<_CharT, _Intl>::id._M_id();
-	const locale::facet** __caches = __loc._M_impl->_M_caches;
-	if (!__caches[__i])
-	  {
-	    __moneypunct_cache<_CharT, _Intl>* __tmp = NULL;
-	    try
-	      {
-		__tmp = new __moneypunct_cache<_CharT, _Intl>;
-		__tmp->_M_cache(__loc);
-	      }
-	    catch(...)
-	      {
-		delete __tmp;
-		__throw_exception_again;
-	      }
-	    __loc._M_impl->_M_install_cache(__tmp, __i);
-	  }
-	return static_cast<
-	  const __moneypunct_cache<_CharT, _Intl>*>(__caches[__i]);
-      }
-    };
-
-  template<typename _CharT>
-    void
-    __numpunct_cache<_CharT>::_M_cache(const locale& __loc)
-    {
-      _M_allocated = true;
-
-      const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc);
-
-      _M_grouping_size = __np.grouping().size();
-      char* __grouping = new char[_M_grouping_size];
-      __np.grouping().copy(__grouping, _M_grouping_size);
-      _M_grouping = __grouping;
-      _M_use_grouping = _M_grouping_size && __np.grouping()[0] != 0;
-
-      _M_truename_size = __np.truename().size();
-      _CharT* __truename = new _CharT[_M_truename_size];
-      __np.truename().copy(__truename, _M_truename_size);
-      _M_truename = __truename;
-
-      _M_falsename_size = __np.falsename().size();
-      _CharT* __falsename = new _CharT[_M_falsename_size];
-      __np.falsename().copy(__falsename, _M_falsename_size);
-      _M_falsename = __falsename;
-
-      _M_decimal_point = __np.decimal_point();
-      _M_thousands_sep = __np.thousands_sep();
-
-      const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__loc);
-      __ct.widen(__num_base::_S_atoms_out,
-		 __num_base::_S_atoms_out + __num_base::_S_oend, _M_atoms_out);
-      __ct.widen(__num_base::_S_atoms_in,
-		 __num_base::_S_atoms_in + __num_base::_S_iend, _M_atoms_in);
-    }
-
-  template<typename _CharT, bool _Intl>
-    void
-    __moneypunct_cache<_CharT, _Intl>::_M_cache(const locale& __loc)
-    {
-      _M_allocated = true;
-
-      const moneypunct<_CharT, _Intl>& __mp =
-	use_facet<moneypunct<_CharT, _Intl> >(__loc);
-
-      _M_grouping_size = __mp.grouping().size();
-      char* __grouping = new char[_M_grouping_size];
-      __mp.grouping().copy(__grouping, _M_grouping_size);
-      _M_grouping = __grouping;
-      _M_use_grouping = _M_grouping_size && __mp.grouping()[0] != 0;
-      
-      _M_decimal_point = __mp.decimal_point();
-      _M_thousands_sep = __mp.thousands_sep();
-      _M_frac_digits = __mp.frac_digits();
-      
-      _M_curr_symbol_size = __mp.curr_symbol().size();
-      _CharT* __curr_symbol = new _CharT[_M_curr_symbol_size];
-      __mp.curr_symbol().copy(__curr_symbol, _M_curr_symbol_size);
-      _M_curr_symbol = __curr_symbol;
-      
-      _M_positive_sign_size = __mp.positive_sign().size();
-      _CharT* __positive_sign = new _CharT[_M_positive_sign_size];
-      __mp.positive_sign().copy(__positive_sign, _M_positive_sign_size);
-      _M_positive_sign = __positive_sign;
-
-      _M_negative_sign_size = __mp.negative_sign().size();
-      _CharT* __negative_sign = new _CharT[_M_negative_sign_size];
-      __mp.negative_sign().copy(__negative_sign, _M_negative_sign_size);
-      _M_negative_sign = __negative_sign;
-      
-      _M_pos_format = __mp.pos_format();
-      _M_neg_format = __mp.neg_format();
-
-      const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__loc);
-      __ct.widen(money_base::_S_atoms,
-		 money_base::_S_atoms + money_base::_S_end, _M_atoms);
-    }
-
-
-  // Used by both numeric and monetary facets.
-  // Check to make sure that the __grouping_tmp string constructed in
-  // money_get or num_get matches the canonical grouping for a given
-  // locale.
-  // __grouping_tmp is parsed L to R
-  // 1,222,444 == __grouping_tmp of "\1\3\3"
-  // __grouping is parsed R to L
-  // 1,222,444 == __grouping of "\3" == "\3\3\3"
-  static bool
-  __verify_grouping(const char* __grouping, size_t __grouping_size,
-		    const string& __grouping_tmp);
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    _M_extract_float(_InIter __beg, _InIter __end, ios_base& __io,
-		     ios_base::iostate& __err, string& __xtrc) const
-    {
-      typedef char_traits<_CharT>			__traits_type;
-      typedef typename numpunct<_CharT>::__cache_type	__cache_type;
-      __use_cache<__cache_type> __uc;
-      const locale& __loc = __io._M_getloc();
-      const __cache_type* __lc = __uc(__loc);
-      const _CharT* __lit = __lc->_M_atoms_in;
-
-      // True if a mantissa is found.
-      bool __found_mantissa = false;
-
-      // First check for sign.
-      if (__beg != __end)
-	{
-	  const char_type __c = *__beg;
-	  const bool __plus = __c == __lit[__num_base::_S_iplus];
-	  if ((__plus || __c == __lit[__num_base::_S_iminus])
-	      && !(__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-	      && !(__c == __lc->_M_decimal_point))
-	    {
-	      __xtrc += __plus ? '+' : '-';
-	      ++__beg;
-	    }
-	}
-
-      // Next, look for leading zeros.
-      while (__beg != __end)
-	{
-	  const char_type __c = *__beg;
-	  if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep
-	      || __c == __lc->_M_decimal_point)
-	    break;
-	  else if (__c == __lit[__num_base::_S_izero])
-	    {
-	      if (!__found_mantissa)
-		{
-		  __xtrc += '0';
-		  __found_mantissa = true;
-		}
-	      ++__beg;
-	    }
-	  else
-	    break;
-	}
-
-      // Only need acceptable digits for floating point numbers.
-      bool __found_dec = false;
-      bool __found_sci = false;
-      string __found_grouping;
-      if (__lc->_M_use_grouping)
-	__found_grouping.reserve(32);
-      int __sep_pos = 0;
-      const char_type* __lit_zero = __lit + __num_base::_S_izero;
-      const char_type* __q;
-      while (__beg != __end)
-        {
-	  // According to 22.2.2.1.2, p8-9, first look for thousands_sep
-	  // and decimal_point.
-	  const char_type __c = *__beg;
-          if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-	    {
-	      if (!__found_dec && !__found_sci)
-		{
-		  // NB: Thousands separator at the beginning of a string
-		  // is a no-no, as is two consecutive thousands separators.
-		  if (__sep_pos)
-		    {
-		      __found_grouping += static_cast<char>(__sep_pos);
-		      __sep_pos = 0;
-		      ++__beg;
-		    }
-		  else
-		    {
-		      __err |= ios_base::failbit;
-		      break;
-		    }
-		}
-	      else
-		break;
-            }
-	  else if (__c == __lc->_M_decimal_point)
-	    {
-	      if (!__found_dec && !__found_sci)
-		{
-		  // If no grouping chars are seen, no grouping check
-		  // is applied. Therefore __found_grouping is adjusted
-		  // only if decimal_point comes after some thousands_sep.
-		  if (__found_grouping.size())
-		    __found_grouping += static_cast<char>(__sep_pos);
-		  __xtrc += '.';
-		  __found_dec = true;
-		  ++__beg;
-		}
-	      else
-		break;
-	    }
-          else if (__q = __traits_type::find(__lit_zero, 10, __c))
-	    {
-	      __xtrc += __num_base::_S_atoms_in[__q - __lit];
-	      __found_mantissa = true;
-	      ++__sep_pos;
-	      ++__beg;
-	    }
-	  else if ((__c == __lit[__num_base::_S_ie] 
-		    || __c == __lit[__num_base::_S_iE])
-		   && __found_mantissa && !__found_sci)
-	    {
-	      // Scientific notation.
-	      if (__found_grouping.size() && !__found_dec)
-		__found_grouping += static_cast<char>(__sep_pos);
-	      __xtrc += 'e';
-	      __found_sci = true;
-
-	      // Remove optional plus or minus sign, if they exist.
-	      if (++__beg != __end)
-		{
-		  const bool __plus = *__beg == __lit[__num_base::_S_iplus];
-		  if ((__plus || *__beg == __lit[__num_base::_S_iminus])
-		      && !(__lc->_M_use_grouping
-			   && *__beg == __lc->_M_thousands_sep)
-		      && !(*__beg == __lc->_M_decimal_point))
-		    {
-		      __xtrc += __plus ? '+' : '-';
-		      ++__beg;
-		    }
-		}
-	    }
-	  else
-	    // Not a valid input item.
-	    break;
-        }
-
-      // Digit grouping is checked. If grouping and found_grouping don't
-      // match, then get very very upset, and set failbit.
-      if (__lc->_M_use_grouping && __found_grouping.size())
-        {
-          // Add the ending grouping if a decimal or 'e'/'E' wasn't found.
-	  if (!__found_dec && !__found_sci)
-	    __found_grouping += static_cast<char>(__sep_pos);
-
-          if (!std::__verify_grouping(__lc->_M_grouping, 
-				      __lc->_M_grouping_size,
-				      __found_grouping))
-	    __err |= ios_base::failbit;
-        }
-
-      // Finish up.
-      if (__beg == __end)
-        __err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    template<typename _ValueT>
-      _InIter
-      num_get<_CharT, _InIter>::
-      _M_extract_int(_InIter __beg, _InIter __end, ios_base& __io,
-		     ios_base::iostate& __err, _ValueT& __v) const
-      {
-        typedef char_traits<_CharT>			__traits_type;
-	typedef typename numpunct<_CharT>::__cache_type __cache_type;
-	__use_cache<__cache_type> __uc;
-	const locale& __loc = __io._M_getloc();
-	const __cache_type* __lc = __uc(__loc);
-	const _CharT* __lit = __lc->_M_atoms_in;
-
-	// NB: Iff __basefield == 0, __base can change based on contents.
-	const ios_base::fmtflags __basefield = __io.flags()
-	                                       & ios_base::basefield;
-	const bool __oct = __basefield == ios_base::oct;
-	int __base = __oct ? 8 : (__basefield == ios_base::hex ? 16 : 10);
-
-	// True if numeric digits are found.
-	bool __found_num = false;
-
-	// First check for sign.
-	bool __negative = false;
-	if (__beg != __end)
-	  {
-	    const char_type __c = *__beg;
-	    if (numeric_limits<_ValueT>::is_signed)
-	      __negative = __c == __lit[__num_base::_S_iminus];
-	    if ((__negative || __c == __lit[__num_base::_S_iplus])
-		&& !(__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-		&& !(__c == __lc->_M_decimal_point))
-	      ++__beg;
-	  }
-
-	// Next, look for leading zeros and check required digits
-	// for base formats.
-	while (__beg != __end)
-	  {
-	    const char_type __c = *__beg;
-	    if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep
-		|| __c == __lc->_M_decimal_point)
-	      break;
-	    else if (__c == __lit[__num_base::_S_izero] 
-		     && (!__found_num || __base == 10))
-	      {
-		__found_num = true;
-		++__beg;
-	      }
-	    else if (__found_num)
-	      {
-		if (__c == __lit[__num_base::_S_ix] 
-		    || __c == __lit[__num_base::_S_iX])
-		  {
-		    if (__basefield == 0)
-		      __base = 16;
-		    if (__base == 16)
-		      {
-			__found_num = false;
-			++__beg;
-		      }
-		  }
-		else if (__basefield == 0)
-		  __base = 8;
-		break;
-	      }
-	    else
-	      break;
-	  }
-
-	// At this point, base is determined. If not hex, only allow
-	// base digits as valid input.
-	const size_t __len = __base == 16 ? (__num_base::_S_iend
-					     - __num_base::_S_izero)
-	                                  : __base;
-
-	// Extract.
-	string __found_grouping;
-	if (__lc->_M_use_grouping)
-	  __found_grouping.reserve(32);
-	int __sep_pos = 0;
-	bool __overflow = false;
-	_ValueT __result = 0;
-	const char_type* __lit_zero = __lit + __num_base::_S_izero;
-	const char_type* __q;
-	if (__negative)
-	  {
-	    const _ValueT __min = numeric_limits<_ValueT>::min() / __base;
-	    for (; __beg != __end; ++__beg)
-	      {
-		// According to 22.2.2.1.2, p8-9, first look for thousands_sep
-		// and decimal_point.
-		const char_type __c = *__beg;
-		if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-		  {
-		    // NB: Thousands separator at the beginning of a string
-		    // is a no-no, as is two consecutive thousands separators.
-		    if (__sep_pos)
-		      {
-			__found_grouping += static_cast<char>(__sep_pos);
-			__sep_pos = 0;
-		      }
-		    else
-		      {
-			__err |= ios_base::failbit;
-			break;
-		      }
-		  }
-		else if (__c == __lc->_M_decimal_point)
-		  break;
-		else if (__q = __traits_type::find(__lit_zero, __len, __c))
-		  {
-		    int __digit = __q - __lit_zero;
-		    if (__digit > 15)
-		      __digit -= 6;
-		    if (__result < __min)
-		      __overflow = true;
-		    else
-		      {
-			const _ValueT __new_result = __result * __base
-			                             - __digit;
-			__overflow |= __new_result > __result;
-			__result = __new_result;
-			++__sep_pos;
-			__found_num = true;
-		      }
-		  }
-		else
-		  // Not a valid input item.
-		  break;
-	      }
-	  }
-	else
-	  {
-	    const _ValueT __max = numeric_limits<_ValueT>::max() / __base;
-	    for (; __beg != __end; ++__beg)
-	      {
-		const char_type __c = *__beg;
-		if (__lc->_M_use_grouping && __c == __lc->_M_thousands_sep)
-		  {
-		    if (__sep_pos)
-		      {
-			__found_grouping += static_cast<char>(__sep_pos);
-			__sep_pos = 0;
-		      }
-		    else
-		      {
-			__err |= ios_base::failbit;
-			break;
-		      }
-		  }
-		else if (__c == __lc->_M_decimal_point)
-		  break;
-		else if (__q = __traits_type::find(__lit_zero, __len, __c))
-		  {
-		    int __digit = __q - __lit_zero;
-		    if (__digit > 15)
-		      __digit -= 6;
-		    if (__result > __max)
-		      __overflow = true;
-		    else
-		      {
-			const _ValueT __new_result = __result * __base
-			                             + __digit;
-			__overflow |= __new_result < __result;
-			__result = __new_result;
-			++__sep_pos;
-			__found_num = true;
-		      }
-		  }
-		else
-		  break;
-	      }
-	  }
-
-	// Digit grouping is checked. If grouping and found_grouping don't
-	// match, then get very very upset, and set failbit.
-	if (__lc->_M_use_grouping && __found_grouping.size())
-	  {
-	    // Add the ending grouping.
-	    __found_grouping += static_cast<char>(__sep_pos);
-
-	    if (!std::__verify_grouping(__lc->_M_grouping,
-					__lc->_M_grouping_size,
-					__found_grouping))
-	      __err |= ios_base::failbit;
-	  }
-
-	if (!(__err & ios_base::failbit) && !__overflow
-	    && __found_num)
-	  __v = __result;
-	else
-	  __err |= ios_base::failbit;
-
-	if (__beg == __end)
-	  __err |= ios_base::eofbit;
-	return __beg;
-      }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 17.  Bad bool parsing
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, bool& __v) const
-    {
-      if (!(__io.flags() & ios_base::boolalpha))
-        {
-	  // Parse bool values as long.
-          // NB: We can't just call do_get(long) here, as it might
-          // refer to a derived class.
-	  long __l = -1;
-          __beg = _M_extract_int(__beg, __end, __io, __err, __l);
-	  if (__l == 0 || __l == 1)
-	    __v = __l;
-	  else
-            __err |= ios_base::failbit;
-        }
-      else
-        {
-	  // Parse bool values as alphanumeric.
-	  typedef char_traits<_CharT>                     __traits_type;
-	  typedef typename numpunct<_CharT>::__cache_type __cache_type;
-	  __use_cache<__cache_type> __uc;
-	  const locale& __loc = __io._M_getloc();
-	  const __cache_type* __lc = __uc(__loc);
-
-	  bool __testf = true;
-	  bool __testt = true;
-	  size_t __n;
-          for (__n = 0; __beg != __end; ++__n, ++__beg)
-            {
-	      if (__testf)
-		if (__n < __lc->_M_falsename_size)
-		  __testf = *__beg == __lc->_M_falsename[__n];
-		else
-		  break;
-
-	      if (__testt)
-		if (__n < __lc->_M_truename_size)
-		  __testt = *__beg == __lc->_M_truename[__n];
-		else
-		  break;
-
-	      if (!__testf && !__testt)
-		break;
-            }
-	  if (__testf && __n == __lc->_M_falsename_size)
-	    __v = 0;
-	  else if (__testt && __n == __lc->_M_truename_size)
-	    __v = 1;
-	  else
-	    __err |= ios_base::failbit;
-
-          if (__beg == __end)
-            __err |= ios_base::eofbit;
-        }
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, long& __v) const
-    { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, unsigned short& __v) const
-    { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, unsigned int& __v) const
-    { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, unsigned long& __v) const
-    { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, long long& __v) const
-    { return _M_extract_int(__beg, __end, __io, __err, __v); }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, unsigned long long& __v) const
-    { return _M_extract_int(__beg, __end, __io, __err, __v); }
-#endif
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-	   ios_base::iostate& __err, float& __v) const
-    {
-      string __xtrc;
-      __xtrc.reserve(32);
-      __beg = _M_extract_float(__beg, __end, __io, __err, __xtrc);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err, _S_get_c_locale());
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, double& __v) const
-    {
-      string __xtrc;
-      __xtrc.reserve(32);
-      __beg = _M_extract_float(__beg, __end, __io, __err, __xtrc);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err, _S_get_c_locale());
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, long double& __v) const
-    {
-      string __xtrc;
-      __xtrc.reserve(32);
-      __beg = _M_extract_float(__beg, __end, __io, __err, __xtrc);
-      std::__convert_to_v(__xtrc.c_str(), __v, __err, _S_get_c_locale());
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    num_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, ios_base& __io,
-           ios_base::iostate& __err, void*& __v) const
-    {
-      // Prepare for hex formatted input.
-      typedef ios_base::fmtflags        fmtflags;
-      const fmtflags __fmt = __io.flags();
-      __io.flags(__fmt & ~ios_base::basefield | ios_base::hex);
-
-      unsigned long __ul;
-      __beg = _M_extract_int(__beg, __end, __io, __err, __ul);
-
-      // Reset from hex formatted input.
-      __io.flags(__fmt);
-
-      if (!(__err & ios_base::failbit))
-	__v = reinterpret_cast<void*>(__ul);
-      else
-	__err |= ios_base::failbit;
-      return __beg;
-    }
-
-  // For use by integer and floating-point types after they have been
-  // converted into a char_type string.
-  template<typename _CharT, typename _OutIter>
-    void
-    num_put<_CharT, _OutIter>::
-    _M_pad(_CharT __fill, streamsize __w, ios_base& __io,
-	   _CharT* __new, const _CharT* __cs, int& __len) const
-    {
-      // [22.2.2.2.2] Stage 3.
-      // If necessary, pad.
-      __pad<_CharT, char_traits<_CharT> >::_S_pad(__io, __fill, __new, __cs,
-						  __w, __len, true);
-      __len = static_cast<int>(__w);
-    }
-
-  // Forwarding functions to peel signed from unsigned integer types.
-  template<typename _CharT>
-    inline int
-    __int_to_char(_CharT* __bufend, long __v, const _CharT* __lit,
-		  ios_base::fmtflags __flags)
-    {
-      unsigned long __ul = static_cast<unsigned long>(__v);
-      bool __neg = false;
-      if (__v < 0)
-	{
-	  __ul = -__ul;
-	  __neg = true;
-	}
-      return __int_to_char(__bufend, __ul, __lit, __flags, __neg);
-    }
-
-  template<typename _CharT>
-    inline int
-    __int_to_char(_CharT* __bufend, unsigned long __v, const _CharT* __lit,
-		  ios_base::fmtflags __flags)
-    {
-      // About showpos, see Table 60 and C99 7.19.6.1, p6 (+).
-      return __int_to_char(__bufend, __v, __lit,
-			   __flags & ~ios_base::showpos, false);
-    }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-  template<typename _CharT>
-    inline int
-    __int_to_char(_CharT* __bufend, long long __v, const _CharT* __lit,
-		  ios_base::fmtflags __flags)
-    {
-      unsigned long long __ull = static_cast<unsigned long long>(__v);
-      bool __neg = false;
-      if (__v < 0)
-	{
-	  __ull = -__ull;
-	  __neg = true;
-	}
-      return __int_to_char(__bufend, __ull, __lit, __flags, __neg);
-    }
-
-  template<typename _CharT>
-    inline int
-    __int_to_char(_CharT* __bufend, unsigned long long __v, 
-		  const _CharT* __lit, ios_base::fmtflags __flags)
-    { return __int_to_char(__bufend, __v, __lit,
-			   __flags & ~ios_base::showpos, false); }
-#endif
-
-  template<typename _CharT, typename _ValueT>
-    int
-    __int_to_char(_CharT* __bufend, _ValueT __v, const _CharT* __lit,
-		  ios_base::fmtflags __flags, bool __neg)
-    {
-      // Don't write base if already 0.
-      const bool __showbase = (__flags & ios_base::showbase) && __v;
-      const ios_base::fmtflags __basefield = __flags & ios_base::basefield;
-      _CharT* __buf = __bufend - 1;
-
-      if (__builtin_expect(__basefield != ios_base::oct &&
-			   __basefield != ios_base::hex, true))
-	{
-	  // Decimal.
-	  do
-	    {
-	      *__buf-- = __lit[(__v % 10) + __num_base::_S_odigits];
-	      __v /= 10;
-	    }
-	  while (__v != 0);
-	  if (__neg)
-	    *__buf-- = __lit[__num_base::_S_ominus];
-	  else if (__flags & ios_base::showpos)
-	    *__buf-- = __lit[__num_base::_S_oplus];
-	}
-      else if (__basefield == ios_base::oct)
-	{
-	  // Octal.
-	  do
-	    {
-	      *__buf-- = __lit[(__v & 0x7) + __num_base::_S_odigits];
-	      __v >>= 3;
-	    }
-	  while (__v != 0);
-	  if (__showbase)
-	    *__buf-- = __lit[__num_base::_S_odigits];
-	}
-      else
-	{
-	  // Hex.
-	  const bool __uppercase = __flags & ios_base::uppercase;
-	  const int __case_offset = __uppercase ? __num_base::_S_oudigits
-	                                        : __num_base::_S_odigits;
-	  do
-	    {
-	      *__buf-- = __lit[(__v & 0xf) + __case_offset];
-	      __v >>= 4;
-	    }
-	  while (__v != 0);
-	  if (__showbase)
-	    {
-	      // 'x' or 'X'
-	      *__buf-- = __lit[__num_base::_S_ox + __uppercase];
-	      // '0'
-	      *__buf-- = __lit[__num_base::_S_odigits];
-	    }
-	}
-      return __bufend - __buf - 1;
-    }
-
-  template<typename _CharT, typename _OutIter>
-    void
-    num_put<_CharT, _OutIter>::
-    _M_group_int(const char* __grouping, size_t __grouping_size, _CharT __sep,
-		 ios_base& __io, _CharT* __new, _CharT* __cs, int& __len) const
-    {
-      // By itself __add_grouping cannot deal correctly with __cs when
-      // ios::showbase is set and ios_base::oct || ios_base::hex.
-      // Therefore we take care "by hand" of the initial 0, 0x or 0X.
-      // However, remember that the latter do not occur if the number
-      // printed is '0' (__len == 1).
-      streamsize __off = 0;
-      const ios_base::fmtflags __basefield = __io.flags()
-	                                     & ios_base::basefield;
-      if ((__io.flags() & ios_base::showbase) && __len > 1)
-	if (__basefield == ios_base::oct)
-	  {
-	    __off = 1;
-	    __new[0] = __cs[0];
-	  }
-	else if (__basefield == ios_base::hex)
-	  {
-	    __off = 2;
-	    __new[0] = __cs[0];
-	    __new[1] = __cs[1];
-	  }
-      _CharT* __p;
-      __p = std::__add_grouping(__new + __off, __sep, __grouping,
-				__grouping_size, __cs + __off,
-				__cs + __len);
-      __len = __p - __new;
-    }
-
-  template<typename _CharT, typename _OutIter>
-    template<typename _ValueT>
-      _OutIter
-      num_put<_CharT, _OutIter>::
-      _M_insert_int(_OutIter __s, ios_base& __io, _CharT __fill,
-		    _ValueT __v) const
-      {
-	typedef typename numpunct<_CharT>::__cache_type	__cache_type;
-	__use_cache<__cache_type> __uc;
-	const locale& __loc = __io._M_getloc();
-	const __cache_type* __lc = __uc(__loc);
-	const _CharT* __lit = __lc->_M_atoms_out;
-
-	// Long enough to hold hex, dec, and octal representations.
-	const int __ilen = 4 * sizeof(_ValueT);
-	_CharT* __cs = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							     * __ilen));
-
-	// [22.2.2.2.2] Stage 1, numeric conversion to character.
-	// Result is returned right-justified in the buffer.
-	int __len;
-	__len = __int_to_char(__cs + __ilen, __v, __lit, __io.flags());
-	__cs += __ilen - __len;
-
-	// Add grouping, if necessary.
-	if (__lc->_M_use_grouping)
-	  {
-	    // Grouping can add (almost) as many separators as the
-	    // number of digits, but no more.
-	    _CharT* __cs2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-								  * __len * 2));
-	    _M_group_int(__lc->_M_grouping, __lc->_M_grouping_size,
-			 __lc->_M_thousands_sep, __io, __cs2, __cs, __len);
-	    __cs = __cs2;
-	  }
-
-	// Pad.
-	const streamsize __w = __io.width();
-	if (__w > static_cast<streamsize>(__len))
-	  {
-	    _CharT* __cs3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-								  * __w));
-	    _M_pad(__fill, __w, __io, __cs3, __cs, __len);
-	    __cs = __cs3;
-	  }
-	__io.width(0);
-
-	// [22.2.2.2.2] Stage 4.
-	// Write resulting, fully-formatted string to output iterator.
-	return std::__write(__s, __cs, __len);
-      }
-
-  template<typename _CharT, typename _OutIter>
-    void
-    num_put<_CharT, _OutIter>::
-    _M_group_float(const char* __grouping, size_t __grouping_size,
-		   _CharT __sep, const _CharT* __p, _CharT* __new,
-		   _CharT* __cs, int& __len) const
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 282. What types does numpunct grouping refer to?
-      // Add grouping, if necessary.
-      _CharT* __p2;
-      const int __declen = __p ? __p - __cs : __len;
-      __p2 = std::__add_grouping(__new, __sep, __grouping, __grouping_size,
-				 __cs, __cs + __declen);
-
-      // Tack on decimal part.
-      int __newlen = __p2 - __new;
-      if (__p)
-	{
-	  char_traits<_CharT>::copy(__p2, __p, __len - __declen);
-	  __newlen += __len - __declen;
-	}
-      __len = __newlen;
-    }
-
-  // The following code uses snprintf (or sprintf(), when
-  // _GLIBCXX_USE_C99 is not defined) to convert floating point values
-  // for insertion into a stream.  An optimization would be to replace
-  // them with code that works directly on a wide buffer and then use
-  // __pad to do the padding.  It would be good to replace them anyway
-  // to gain back the efficiency that C++ provides by knowing up front
-  // the type of the values to insert.  Also, sprintf is dangerous
-  // since may lead to accidental buffer overruns.  This
-  // implementation follows the C++ standard fairly directly as
-  // outlined in 22.2.2.2 [lib.locale.num.put]
-  template<typename _CharT, typename _OutIter>
-    template<typename _ValueT>
-      _OutIter
-      num_put<_CharT, _OutIter>::
-      _M_insert_float(_OutIter __s, ios_base& __io, _CharT __fill, char __mod,
-		       _ValueT __v) const
-      {
-	typedef typename numpunct<_CharT>::__cache_type	__cache_type;
-	__use_cache<__cache_type> __uc;
-	const locale& __loc = __io._M_getloc();
-	const __cache_type* __lc = __uc(__loc);
-
-	// Use default precision if out of range.
-	streamsize __prec = __io.precision();
-	if (__prec < static_cast<streamsize>(0))
-	  __prec = static_cast<streamsize>(6);
-
-	const int __max_digits = numeric_limits<_ValueT>::digits10;
-
-	// [22.2.2.2.2] Stage 1, numeric conversion to character.
-	int __len;
-	// Long enough for the max format spec.
-	char __fbuf[16];
-
-#ifdef _GLIBCXX_USE_C99
-	// First try a buffer perhaps big enough (most probably sufficient
-	// for non-ios_base::fixed outputs)
-	int __cs_size = __max_digits * 3;
-	char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-
-	__num_base::_S_format_float(__io, __fbuf, __mod);
-	__len = std::__convert_from_v(__cs, __cs_size, __fbuf, __v,
-				      _S_get_c_locale(), __prec);
-
-	// If the buffer was not large enough, try again with the correct size.
-	if (__len >= __cs_size)
-	  {
-	    __cs_size = __len + 1;
-	    __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-	    __len = std::__convert_from_v(__cs, __cs_size, __fbuf, __v,
-					  _S_get_c_locale(), __prec);
-	  }
-#else
-	// Consider the possibility of long ios_base::fixed outputs
-	const bool __fixed = __io.flags() & ios_base::fixed;
-	const int __max_exp = numeric_limits<_ValueT>::max_exponent10;
-
-	// The size of the output string is computed as follows.
-	// ios_base::fixed outputs may need up to __max_exp + 1 chars
-	// for the integer part + __prec chars for the fractional part
-	// + 3 chars for sign, decimal point, '\0'. On the other hand,
-	// for non-fixed outputs __max_digits * 2 + __prec chars are
-	// largely sufficient.
-	const int __cs_size = __fixed ? __max_exp + __prec + 4
-	                              : __max_digits * 2 + __prec;
-	char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-
-	__num_base::_S_format_float(__io, __fbuf, __mod);
-	__len = std::__convert_from_v(__cs, 0, __fbuf, __v,
-				      _S_get_c_locale(), __prec);
-#endif
-
-      // [22.2.2.2.2] Stage 2, convert to char_type, using correct
-      // numpunct.decimal_point() values for '.' and adding grouping.
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-      _CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							   * __len));
-      __ctype.widen(__cs, __cs + __len, __ws);
-
-      // Replace decimal point.
-      const _CharT __cdec = __ctype.widen('.');
-      const _CharT __dec = __lc->_M_decimal_point;
-      const _CharT* __p;
-      if (__p = char_traits<_CharT>::find(__ws, __len, __cdec))
-	__ws[__p - __ws] = __dec;
-
-      // Add grouping, if necessary.
-      if (__lc->_M_use_grouping)
-	{
-	  // Grouping can add (almost) as many separators as the
-	  // number of digits, but no more.
-	  _CharT* __ws2 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-								* __len * 2));
-	  _M_group_float(__lc->_M_grouping, __lc->_M_grouping_size,
-			 __lc->_M_thousands_sep, __p, __ws2, __ws, __len);
-	  __ws = __ws2;
-	}
-
-      // Pad.
-      const streamsize __w = __io.width();
-      if (__w > static_cast<streamsize>(__len))
-	{
-	  _CharT* __ws3 = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-								* __w));
-	  _M_pad(__fill, __w, __io, __ws3, __ws, __len);
-	  __ws = __ws3;
-	}
-      __io.width(0);
-
-      // [22.2.2.2.2] Stage 4.
-      // Write resulting, fully-formatted string to output iterator.
-      return std::__write(__s, __ws, __len);
-      }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill, bool __v) const
-    {
-      const ios_base::fmtflags __flags = __io.flags();
-      if ((__flags & ios_base::boolalpha) == 0)
-        {
-          const long __l = __v;
-          __s = _M_insert_int(__s, __io, __fill, __l);
-        }
-      else
-        {
-	  typedef typename numpunct<_CharT>::__cache_type __cache_type;
-	  __use_cache<__cache_type> __uc;
-	  const locale& __loc = __io._M_getloc();
-	  const __cache_type* __lc = __uc(__loc);
-
-	  const _CharT* __name = __v ? __lc->_M_truename
-	                             : __lc->_M_falsename;
-	  int __len = __v ? __lc->_M_truename_size
-	                  : __lc->_M_falsename_size;
-
-	  const streamsize __w = __io.width();
-	  if (__w > static_cast<streamsize>(__len))
-	    {
-	      _CharT* __cs
-		= static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							* __w));
-	      _M_pad(__fill, __w, __io, __cs, __name, __len);
-	      __name = __cs;
-	    }
-	  __io.width(0);
-	  __s = std::__write(__s, __name, __len);
-	}
-      return __s;
-    }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill, long __v) const
-    { return _M_insert_int(__s, __io, __fill, __v); }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill,
-           unsigned long __v) const
-    { return _M_insert_int(__s, __io, __fill, __v); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __b, char_type __fill, long long __v) const
-    { return _M_insert_int(__s, __b, __fill, __v); }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill,
-           unsigned long long __v) const
-    { return _M_insert_int(__s, __io, __fill, __v); }
-#endif
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill, double __v) const
-    { return _M_insert_float(__s, __io, __fill, char(), __v); }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill,
-	   long double __v) const
-    { return _M_insert_float(__s, __io, __fill, 'L', __v); }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    num_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type __fill,
-           const void* __v) const
-    {
-      const ios_base::fmtflags __flags = __io.flags();
-      const ios_base::fmtflags __fmt = ~(ios_base::basefield
-					 | ios_base::uppercase
-					 | ios_base::internal);
-      __io.flags(__flags & __fmt | (ios_base::hex | ios_base::showbase));
-
-      __s = _M_insert_int(__s, __io, __fill,
-			  reinterpret_cast<unsigned long>(__v));
-      __io.flags(__flags);
-      return __s;
-    }
-
-  template<typename _CharT, typename _InIter>
-    template<bool _Intl>
-      _InIter
-      money_get<_CharT, _InIter>::
-      _M_extract(iter_type __beg, iter_type __end, ios_base& __io,
-		 ios_base::iostate& __err, string& __units) const
-      {
-	typedef char_traits<_CharT>			  __traits_type;
-	typedef typename string_type::size_type	          size_type;	
-	typedef money_base::part			  part;
-	typedef moneypunct<_CharT, _Intl>		  __moneypunct_type;
-	typedef typename __moneypunct_type::__cache_type  __cache_type;
-	
-	const locale& __loc = __io._M_getloc();
-	const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-	__use_cache<__cache_type> __uc;
-	const __cache_type* __lc = __uc(__loc);
-	const char_type* __lit = __lc->_M_atoms;
-
-	// Deduced sign.
-	bool __negative = false;
-	// Sign size.
-	size_type __sign_size = 0;
-	// True if sign is mandatory.
-	const bool __mandatory_sign = (__lc->_M_positive_sign_size
-				       && __lc->_M_negative_sign_size);
-	// String of grouping info from thousands_sep plucked from __units.
-	string __grouping_tmp;
-	if (__lc->_M_use_grouping)
-	  __grouping_tmp.reserve(32);
-	// Last position before the decimal point.
-	int __last_pos = 0;
-	// Separator positions, then, possibly, fractional digits.
-	int __n = 0;
-	// If input iterator is in a valid state.
-	bool __testvalid = true;
-	// Flag marking when a decimal point is found.
-	bool __testdecfound = false;
-
-	// The tentative returned string is stored here.
-	string __res;
-	__res.reserve(32);
-
-	const char_type* __lit_zero = __lit + money_base::_S_zero;
-	const char_type* __q;
-	const money_base::pattern __p = __lc->_M_neg_format;	
-	for (int __i = 0; __i < 4 && __testvalid; ++__i)
-	  {
-	    const part __which = static_cast<part>(__p.field[__i]);
-	    switch (__which)
-	      {
-	      case money_base::symbol:
-		// According to 22.2.6.1.2, p2, symbol is required
-		// if (__io.flags() & ios_base::showbase), otherwise
-		// is optional and consumed only if other characters
-		// are needed to complete the format.
-		if (__io.flags() & ios_base::showbase || __sign_size > 1
-		    || __i == 0
-		    || (__i == 1 && (__mandatory_sign
-				     || (static_cast<part>(__p.field[0])
-					 == money_base::sign)
-				     || (static_cast<part>(__p.field[2])
-					 == money_base::space)))
-		    || (__i == 2 && ((static_cast<part>(__p.field[3])
-				      == money_base::value)
-				     || __mandatory_sign
-				     && (static_cast<part>(__p.field[3])
-					 == money_base::sign))))
-		  {
-		    const size_type __len = __lc->_M_curr_symbol_size;
-		    size_type __j = 0;
-		    for (; __beg != __end && __j < __len
-			   && *__beg == __lc->_M_curr_symbol[__j];
-			 ++__beg, ++__j);
-		    if (__j != __len
-			&& (__j || __io.flags() & ios_base::showbase))
-		      __testvalid = false;
-		  }
-		break;
-	      case money_base::sign:
-		// Sign might not exist, or be more than one character long.
-		if (__lc->_M_positive_sign_size && __beg != __end
-		    && *__beg == __lc->_M_positive_sign[0])
-		  {
-		    __sign_size = __lc->_M_positive_sign_size;
-		    ++__beg;
-		  }
-		else if (__lc->_M_negative_sign_size && __beg != __end
-			 && *__beg == __lc->_M_negative_sign[0])
-		  {
-		    __negative = true;
-		    __sign_size = __lc->_M_negative_sign_size;
-		    ++__beg;
-		  }
-		else if (__lc->_M_positive_sign_size
-			 && !__lc->_M_negative_sign_size)
-		  // "... if no sign is detected, the result is given the sign
-		  // that corresponds to the source of the empty string"
-		  __negative = true;
-		else if (__mandatory_sign)
-		  __testvalid = false;
-		break;
-	      case money_base::value:
-		// Extract digits, remove and stash away the
-		// grouping of found thousands separators.
-		for (; __beg != __end; ++__beg)
-		  if (__q = __traits_type::find(__lit_zero, 10, *__beg))
-		    {
-		      __res += money_base::_S_atoms[__q - __lit];
-		      ++__n;
-		    }
-		  else if (*__beg == __lc->_M_decimal_point && !__testdecfound)
-		    {
-		      __last_pos = __n;
-		      __n = 0;
-		      __testdecfound = true;
-		    }
-		  else if (__lc->_M_use_grouping
-			   && *__beg == __lc->_M_thousands_sep
-			   && !__testdecfound)
-		    {
-		      if (__n)
-			{
-			  // Mark position for later analysis.
-			  __grouping_tmp += static_cast<char>(__n);
-			  __n = 0;
-			}
-		      else
-			{
-			  __testvalid = false;
-			  break;
-			}
-		    }
-		  else
-		    break;
-		if (__res.empty())
-		  __testvalid = false;
-		break;
-	      case money_base::space:
-		// At least one space is required.
-		if (__beg != __end && __ctype.is(ctype_base::space, *__beg))
-		  ++__beg;
-		else
-		  __testvalid = false;
-	      case money_base::none:
-		// Only if not at the end of the pattern.
-		if (__i != 3)
-		  for (; __beg != __end
-			 && __ctype.is(ctype_base::space, *__beg); ++__beg);
-		break;
-	      }
-	  }
-
-	// Need to get the rest of the sign characters, if they exist.
-	if (__sign_size > 1 && __testvalid)
-	  {
-	    const char_type* __sign = __negative ? __lc->_M_negative_sign
-	                                         : __lc->_M_positive_sign;
-	    size_type __i = 1;
-	    for (; __beg != __end && __i < __sign_size
-		   && *__beg == __sign[__i]; ++__beg, ++__i);
-	    
-	    if (__i != __sign_size)
-	      __testvalid = false;
-	  }
-
-	if (__testvalid)
-	  {
-	    // Strip leading zeros.
-	    if (__res.size() > 1)
-	      {
-		const size_type __first = __res.find_first_not_of('0');
-		const bool __only_zeros = __first == string::npos;
-		if (__first)
-		  __res.erase(0, __only_zeros ? __res.size() - 1 : __first);
-	      }
-
-	    // 22.2.6.1.2, p4
-	    if (__negative && __res[0] != '0')
-	      __res.insert(__res.begin(), '-');
-	    
-	    // Test for grouping fidelity.
-	    if (__grouping_tmp.size())
-	      {
-		// Add the ending grouping.
-		__grouping_tmp += static_cast<char>(__testdecfound ? __last_pos
-						                   : __n);
-		if (!std::__verify_grouping(__lc->_M_grouping,
-					    __lc->_M_grouping_size,
-					    __grouping_tmp))
-		  __testvalid = false;
-	      }
-	    
-	    // Iff not enough digits were supplied after the decimal-point.
-	    if (__testdecfound && __lc->_M_frac_digits > 0
-		&& __n != __lc->_M_frac_digits)
-	      __testvalid = false;
-	  }
-	
-	// Iff no more characters are available.
-	if (__beg == __end)
-	  __err |= ios_base::eofbit;
-	
-	// Iff valid sequence is not recognized.
-	if (!__testvalid)
-	  __err |= ios_base::failbit;
-	else
-	  __units.swap(__res);
-	
-	return __beg;
-      }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    money_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io,
-	   ios_base::iostate& __err, long double& __units) const
-    {
-      string __str;
-      if (__intl)
-	__beg = _M_extract<true>(__beg, __end, __io, __err, __str);
-      else
-	__beg = _M_extract<false>(__beg, __end, __io, __err, __str);
-      std::__convert_to_v(__str.c_str(), __units, __err, _S_get_c_locale());
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    money_get<_CharT, _InIter>::
-    do_get(iter_type __beg, iter_type __end, bool __intl, ios_base& __io,
-	   ios_base::iostate& __err, string_type& __units) const
-    {
-      typedef typename string::size_type                  size_type;
-
-      const locale& __loc = __io._M_getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-      string __str;
-      const iter_type __ret = __intl ? _M_extract<true>(__beg, __end, __io,
-							__err, __str)
-	                             : _M_extract<false>(__beg, __end, __io,
-							 __err, __str);
-      const size_type __len = __str.size();
-      if (__len)
-	{
-	  _CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							       * __len));
-	  __ctype.widen(__str.data(), __str.data() + __len, __ws);
-	  __units.assign(__ws, __len);
-	}
-
-      return __ret;
-    }
-
-  template<typename _CharT, typename _OutIter>
-    template<bool _Intl>
-      _OutIter
-      money_put<_CharT, _OutIter>::
-      _M_insert(iter_type __s, ios_base& __io, char_type __fill,
-		const string_type& __digits) const
-      {
-	typedef typename string_type::size_type	          size_type;
-	typedef money_base::part                          part;
-	typedef moneypunct<_CharT, _Intl>                 __moneypunct_type;
-	typedef typename __moneypunct_type::__cache_type  __cache_type;
-      
-	const locale& __loc = __io._M_getloc();
-	const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-	__use_cache<__cache_type> __uc;
-	const __cache_type* __lc = __uc(__loc);
-	const char_type* __lit = __lc->_M_atoms;
-
-	// Determine if negative or positive formats are to be used, and
-	// discard leading negative_sign if it is present.
-	const char_type* __beg = __digits.data();
-
-	money_base::pattern __p;
-	const char_type* __sign;
-	size_type __sign_size;
-	if (*__beg != __lit[money_base::_S_minus])
-	  {
-	    __p = __lc->_M_pos_format;
-	    __sign = __lc->_M_positive_sign;
-	    __sign_size = __lc->_M_positive_sign_size;
-	  }
-	else
-	  {
-	    __p = __lc->_M_neg_format;
-	    __sign = __lc->_M_negative_sign;
-	    __sign_size = __lc->_M_negative_sign_size;
-	    if (__digits.size())
-	      ++__beg;
-	  }
-       
-	// Look for valid numbers in the ctype facet within input digits.
-	size_type __len = __ctype.scan_not(ctype_base::digit, __beg,
-					   __beg + __digits.size()) - __beg;
-	if (__len)
-	  {
-	    // Assume valid input, and attempt to format.
-	    // Break down input numbers into base components, as follows:
-	    //   final_value = grouped units + (decimal point) + (digits)
-	    string_type __value;
-	    __value.reserve(2 * __len);
-
-	    // Add thousands separators to non-decimal digits, per
-	    // grouping rules.
-	    int __paddec = __len - __lc->_M_frac_digits;
-	    if (__paddec > 0)
-  	      {
-		if (__lc->_M_frac_digits < 0)
-		  __paddec = __len;
-  		if (__lc->_M_grouping_size)
-  		  {
-		    _CharT* __ws =
-  		      static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-  							    * 2 * __len));
-  		    _CharT* __ws_end =
-		      std::__add_grouping(__ws, __lc->_M_thousands_sep,
-					  __lc->_M_grouping,
-					  __lc->_M_grouping_size,
-					  __beg, __beg + __paddec);
-		    __value.assign(__ws, __ws_end - __ws);
-  		  }
-  		else
-		  __value.assign(__beg, __paddec);
-	      }
-
-	    // Deal with decimal point, decimal digits.
-	    if (__lc->_M_frac_digits > 0)
-	      {
-		__value += __lc->_M_decimal_point;
-		if (__paddec >= 0)
-		  __value.append(__beg + __paddec, __lc->_M_frac_digits);
-		else
-		  {
-		    // Have to pad zeros in the decimal position.
-		    __value.append(-__paddec, __lit[money_base::_S_zero]);
-		    __value.append(__beg, __len);
-		  }
-  	      }
-  
-	    // Calculate length of resulting string.
-	    const ios_base::fmtflags __f = __io.flags() 
-	                                   & ios_base::adjustfield;
-	    __len = __value.size() + __sign_size;
-	    __len += ((__io.flags() & ios_base::showbase)
-		      ? __lc->_M_curr_symbol_size : 0);
-
-	    string_type __res;
-	    __res.reserve(2 * __len);
-	    
-	    const size_type __width = static_cast<size_type>(__io.width());  
-	    const bool __testipad = (__f == ios_base::internal
-				     && __len < __width);
-	    // Fit formatted digits into the required pattern.
-	    for (int __i = 0; __i < 4; ++__i)
-	      {
-		const part __which = static_cast<part>(__p.field[__i]);
-		switch (__which)
-		  {
-		  case money_base::symbol:
-		    if (__io.flags() & ios_base::showbase)
-		      __res.append(__lc->_M_curr_symbol,
-				   __lc->_M_curr_symbol_size);
-		    break;
-		  case money_base::sign:
-		    // Sign might not exist, or be more than one
-		    // charater long. In that case, add in the rest
-		    // below.
-		    if (__sign_size)
-		      __res += __sign[0];
-		    break;
-		  case money_base::value:
-		    __res += __value;
-		    break;
-		  case money_base::space:
-		    // At least one space is required, but if internal
-		    // formatting is required, an arbitrary number of
-		    // fill spaces will be necessary.
-		    if (__testipad)
-		      __res.append(__width - __len, __fill);
-		    else
-		      __res += __fill;
-		    break;
-		  case money_base::none:
-		    if (__testipad)
-		      __res.append(__width - __len, __fill);
-		    break;
-		  }
-	      }
-	    
-	    // Special case of multi-part sign parts.
-	    if (__sign_size > 1)
-	      __res.append(__sign + 1, __sign_size - 1);
-	    
-	    // Pad, if still necessary.
-	    __len = __res.size();
-	    if (__width > __len)
-	      {
-		if (__f == ios_base::left)
-		  // After.
-		  __res.append(__width - __len, __fill);
-		else
-		  // Before.
-		  __res.insert(0, __width - __len, __fill);
-		__len = __width;
-	      }
-	    
-	    // Write resulting, fully-formatted string to output iterator.
-	    __s = std::__write(__s, __res.data(), __len);
-	  }
-	__io.width(0);
-	return __s;    
-      }
-  
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    money_put<_CharT, _OutIter>::
-    do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	   long double __units) const
-    {
-      const locale __loc = __io.getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-#ifdef _GLIBCXX_USE_C99
-      // First try a buffer perhaps big enough.
-      int __cs_size = 64;
-      char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 328. Bad sprintf format modifier in money_put<>::do_put()
-      int __len = std::__convert_from_v(__cs, __cs_size, "%.*Lf", __units,
-					_S_get_c_locale(), 0);
-      // If the buffer was not large enough, try again with the correct size.
-      if (__len >= __cs_size)
-	{
-	  __cs_size = __len + 1;
-	  __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-	  __len = std::__convert_from_v(__cs, __cs_size, "%.*Lf", __units,
-					_S_get_c_locale(), 0);
-	}
-#else
-      // max_exponent10 + 1 for the integer part, + 2 for sign and '\0'.
-      const int __cs_size = numeric_limits<long double>::max_exponent10 + 3;
-      char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-      int __len = std::__convert_from_v(__cs, 0, "%.*Lf", __units,
-					_S_get_c_locale(), 0);
-#endif
-      _CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							   * __cs_size));
-      __ctype.widen(__cs, __cs + __len, __ws);
-      const string_type __digits(__ws, __len);
-      return __intl ? _M_insert<true>(__s, __io, __fill, __digits)
-	            : _M_insert<false>(__s, __io, __fill, __digits);
-    }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    money_put<_CharT, _OutIter>::
-    do_put(iter_type __s, bool __intl, ios_base& __io, char_type __fill,
-	   const string_type& __digits) const
-    { return __intl ? _M_insert<true>(__s, __io, __fill, __digits)
-	            : _M_insert<false>(__s, __io, __fill, __digits); }
-
-
-  // NB: Not especially useful. Without an ios_base object or some
-  // kind of locale reference, we are left clawing at the air where
-  // the side of the mountain used to be...
-  template<typename _CharT, typename _InIter>
-    time_base::dateorder
-    time_get<_CharT, _InIter>::do_date_order() const
-    { return time_base::no_order; }
-
-  // Expand a strftime format string and parse it.  E.g., do_get_date() may
-  // pass %m/%d/%Y => extracted characters.
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    _M_extract_via_format(iter_type __beg, iter_type __end, ios_base& __io,
-			  ios_base::iostate& __err, tm* __tm,
-			  const _CharT* __format) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-      const size_t __len = char_traits<_CharT>::length(__format);
-
-      for (size_t __i = 0; __beg != __end && __i < __len && !__err; ++__i)
-	{
-	  if (__ctype.narrow(__format[__i], 0) == '%')
-	    {
-	      // Verify valid formatting code, attempt to extract.
-	      char __c = __ctype.narrow(__format[++__i], 0);
-	      int __mem = 0;
-	      if (__c == 'E' || __c == 'O')
-		__c = __ctype.narrow(__format[++__i], 0);
-	      switch (__c)
-		{
-		  const char* __cs;
-		  _CharT __wcs[10];
-		case 'a':
-		  // Abbreviated weekday name [tm_wday]
-		  const char_type*  __days1[7];
-		  __tp._M_days_abbreviated(__days1);
-		  __beg = _M_extract_name(__beg, __end, __tm->tm_wday, __days1,
-					  7, __io, __err);
-		  break;
-		case 'A':
-		  // Weekday name [tm_wday].
-		  const char_type*  __days2[7];
-		  __tp._M_days(__days2);
-		  __beg = _M_extract_name(__beg, __end, __tm->tm_wday, __days2,
-					  7, __io, __err);
-		  break;
-		case 'h':
-		case 'b':
-		  // Abbreviated month name [tm_mon]
-		  const char_type*  __months1[12];
-		  __tp._M_months_abbreviated(__months1);
-		  __beg = _M_extract_name(__beg, __end, __tm->tm_mon, 
-					  __months1, 12, __io, __err);
-		  break;
-		case 'B':
-		  // Month name [tm_mon].
-		  const char_type*  __months2[12];
-		  __tp._M_months(__months2);
-		  __beg = _M_extract_name(__beg, __end, __tm->tm_mon, 
-					  __months2, 12, __io, __err);
-		  break;
-		case 'c':
-		  // Default time and date representation.
-		  const char_type*  __dt[2];
-		  __tp._M_date_time_formats(__dt);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __err, 
-						__tm, __dt[0]);
-		  break;
-		case 'd':
-		  // Day [01, 31]. [tm_mday]
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_mday, 1, 31, 2,
-					 __io, __err);
-		  break;
-		case 'e':
-		  // Day [1, 31], with single digits preceded by
-		  // space. [tm_mday]
-		  if (__ctype.is(ctype_base::space, *__beg))
-		    __beg = _M_extract_num(++__beg, __end, __tm->tm_mday, 1, 9,
-					   1, __io, __err);
-		  else
-		    __beg = _M_extract_num(__beg, __end, __tm->tm_mday, 10, 31,
-					   2, __io, __err);
-		  break;
-		case 'D':
-		  // Equivalent to %m/%d/%y.[tm_mon, tm_mday, tm_year]
-		  __cs = "%m/%d/%y";
-		  __ctype.widen(__cs, __cs + 9, __wcs);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __err, 
-						__tm, __wcs);
-		  break;
-		case 'H':
-		  // Hour [00, 23]. [tm_hour]
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_hour, 0, 23, 2,
-					 __io, __err);
-		  break;
-		case 'I':
-		  // Hour [01, 12]. [tm_hour]
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_hour, 1, 12, 2,
-					 __io, __err);
-		  break;
-		case 'm':
-		  // Month [01, 12]. [tm_mon]
-		  __beg = _M_extract_num(__beg, __end, __mem, 1, 12, 2, 
-					 __io, __err);
-		  if (!__err)
-		    __tm->tm_mon = __mem - 1;
-		  break;
-		case 'M':
-		  // Minute [00, 59]. [tm_min]
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_min, 0, 59, 2,
-					 __io, __err);
-		  break;
-		case 'n':
-		  if (__ctype.narrow(*__beg, 0) == '\n')
-		    ++__beg;
-		  else
-		    __err |= ios_base::failbit;
-		  break;
-		case 'R':
-		  // Equivalent to (%H:%M).
-		  __cs = "%H:%M";
-		  __ctype.widen(__cs, __cs + 6, __wcs);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __err, 
-						__tm, __wcs);
-		  break;
-		case 'S':
-		  // Seconds. [tm_sec]
-		  // [00, 60] in C99 (one leap-second), [00, 61] in C89.
-#ifdef _GLIBCXX_USE_C99
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 60, 2,
-#else
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_sec, 0, 61, 2,
-#endif
-					 __io, __err);
-		  break;
-		case 't':
-		  if (__ctype.narrow(*__beg, 0) == '\t')
-		    ++__beg;
-		  else
-		    __err |= ios_base::failbit;
-		  break;
-		case 'T':
-		  // Equivalent to (%H:%M:%S).
-		  __cs = "%H:%M:%S";
-		  __ctype.widen(__cs, __cs + 9, __wcs);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __err, 
-						__tm, __wcs);
-		  break;
-		case 'x':
-		  // Locale's date.
-		  const char_type*  __dates[2];
-		  __tp._M_date_formats(__dates);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __err, 
-						__tm, __dates[0]);
-		  break;
-		case 'X':
-		  // Locale's time.
-		  const char_type*  __times[2];
-		  __tp._M_time_formats(__times);
-		  __beg = _M_extract_via_format(__beg, __end, __io, __err, 
-						__tm, __times[0]);
-		  break;
-		case 'y':
-		case 'C': // C99
-		  // Two digit year. [tm_year]
-		  __beg = _M_extract_num(__beg, __end, __tm->tm_year, 0, 99, 2,
-					 __io, __err);
-		  break;
-		case 'Y':
-		  // Year [1900). [tm_year]
-		  __beg = _M_extract_num(__beg, __end, __mem, 0, 9999, 4,
-					 __io, __err);
-		  if (!__err)
-		    __tm->tm_year = __mem - 1900;
-		  break;
-		case 'Z':
-		  // Timezone info.
-		  if (__ctype.is(ctype_base::upper, *__beg))
-		    {
-		      int __tmp;
-		      __beg = _M_extract_name(__beg, __end, __tmp,
-				       __timepunct_cache<_CharT>::_S_timezones,
-					      14, __io, __err);
-
-		      // GMT requires special effort.
-		      if (__beg != __end && !__err && __tmp == 0
-			  && (*__beg == __ctype.widen('-')
-			      || *__beg == __ctype.widen('+')))
-			{
-			  __beg = _M_extract_num(__beg, __end, __tmp, 0, 23, 2,
-						 __io, __err);
-			  __beg = _M_extract_num(__beg, __end, __tmp, 0, 59, 2,
-						 __io, __err);
-			}
-		    }
-		  else
-		    __err |= ios_base::failbit;
-		  break;
-		default:
-		  // Not recognized.
-		  __err |= ios_base::failbit;
-		}
-	    }
-	  else
-	    {
-	      // Verify format and input match, extract and discard.
-	      if (__format[__i] == *__beg)
-		++__beg;
-	      else
-		__err |= ios_base::failbit;
-	    }
-	}
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    _M_extract_num(iter_type __beg, iter_type __end, int& __member,
-		   int __min, int __max, size_t __len,
-		   ios_base& __io, ios_base::iostate& __err) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-      // As-is works for __len = 1, 2, 4, the values actually used.
-      int __mult = __len == 2 ? 10 : (__len == 4 ? 1000 : 1);
-
-      ++__min;
-      size_t __i = 0;
-      int __value = 0;
-      for (; __beg != __end && __i < __len; ++__beg, ++__i)
-	{
-	  const char __c = __ctype.narrow(*__beg, '*');
-	  if (__c >= '0' && __c <= '9')
-	    {
-	      __value = __value * 10 + (__c - '0');
-	      const int __valuec = __value * __mult;
-	      if (__valuec > __max || __valuec + __mult < __min)
-		break;
-	      __mult /= 10;
-	    }
-	  else
-	    break;
-	}
-      if (__i == __len)
-	__member = __value;
-      else
-	__err |= ios_base::failbit;
-      return __beg;
-    }
-
-  // Assumptions:
-  // All elements in __names are unique.
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    _M_extract_name(iter_type __beg, iter_type __end, int& __member,
-		    const _CharT** __names, size_t __indexlen,
-		    ios_base& __io, ios_base::iostate& __err) const
-    {
-      typedef char_traits<_CharT>		__traits_type;
-      const locale& __loc = __io._M_getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-      int* __matches = static_cast<int*>(__builtin_alloca(sizeof(int)
-							  * __indexlen));
-      size_t __nmatches = 0;
-      size_t __pos = 0;
-      bool __testvalid = true;
-      const char_type* __name;
-
-      // Look for initial matches.
-      // NB: Some of the locale data is in the form of all lowercase
-      // names, and some is in the form of initially-capitalized
-      // names. Look for both.
-      if (__beg != __end)
-	{
-	  const char_type __c = *__beg;
-	  for (size_t __i1 = 0; __i1 < __indexlen; ++__i1)
-	    if (__c == __names[__i1][0]
-		|| __c == __ctype.toupper(__names[__i1][0]))
-	      __matches[__nmatches++] = __i1;
-	}
-
-      while (__nmatches > 1)
-	{
-	  // Find smallest matching string.
-	  size_t __minlen = __traits_type::length(__names[__matches[0]]);
-	  for (size_t __i2 = 1; __i2 < __nmatches; ++__i2)
-	    __minlen = std::min(__minlen,
-			      __traits_type::length(__names[__matches[__i2]]));
-	  ++__beg, ++__pos;
-	  if (__pos < __minlen && __beg != __end)
-	    for (size_t __i3 = 0; __i3 < __nmatches;)
-	      {
-		__name = __names[__matches[__i3]];
-		if (__name[__pos] != *__beg)
-		  __matches[__i3] = __matches[--__nmatches];
-		else
-		  ++__i3;
-	      }
-	  else
-	    break;
-	}
-
-      if (__nmatches == 1)
-	{
-	  // Make sure found name is completely extracted.
-	  ++__beg, ++__pos;
-	  __name = __names[__matches[0]];
-	  const size_t __len = __traits_type::length(__name);
-	  while (__pos < __len && __beg != __end && __name[__pos] == *__beg)
-	    ++__beg, ++__pos;
-
-	  if (__len == __pos)
-	    __member = __matches[0];
-	  else
-	    __testvalid = false;
-	}
-      else
-	__testvalid = false;
-      if (!__testvalid)
-	__err |= ios_base::failbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_time(iter_type __beg, iter_type __end, ios_base& __io,
-		ios_base::iostate& __err, tm* __tm) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const char_type*  __times[2];
-      __tp._M_time_formats(__times);
-      __beg = _M_extract_via_format(__beg, __end, __io, __err, 
-				    __tm, __times[0]);
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_date(iter_type __beg, iter_type __end, ios_base& __io,
-		ios_base::iostate& __err, tm* __tm) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const char_type*  __dates[2];
-      __tp._M_date_formats(__dates);
-      __beg = _M_extract_via_format(__beg, __end, __io, __err,
-				    __tm, __dates[0]);
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_weekday(iter_type __beg, iter_type __end, ios_base& __io,
-		   ios_base::iostate& __err, tm* __tm) const
-    {
-      typedef char_traits<_CharT>		__traits_type;
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-      const char_type*  __days[7];
-      __tp._M_days_abbreviated(__days);
-      int __tmpwday;
-      __beg = _M_extract_name(__beg, __end, __tmpwday, __days, 7, __io, __err);
-
-      // Check to see if non-abbreviated name exists, and extract.
-      // NB: Assumes both _M_days and _M_days_abbreviated organized in
-      // exact same order, first to last, such that the resulting
-      // __days array with the same index points to a day, and that
-      // day's abbreviated form.
-      // NB: Also assumes that an abbreviated name is a subset of the name.
-      if (!__err && __beg != __end)
-	{
-	  size_t __pos = __traits_type::length(__days[__tmpwday]);
-	  __tp._M_days(__days);
-	  const char_type* __name = __days[__tmpwday];
-	  if (__name[__pos] == *__beg)
-	    {
-	      // Extract the rest of it.
-	      const size_t __len = __traits_type::length(__name);
-	      while (__pos < __len && __beg != __end
-		     && __name[__pos] == *__beg)
-		++__beg, ++__pos;
-	      if (__len != __pos)
-		__err |= ios_base::failbit;
-	    }
-	}
-      if (!__err)
-	__tm->tm_wday = __tmpwday;
-      
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-     }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_monthname(iter_type __beg, iter_type __end,
-                     ios_base& __io, ios_base::iostate& __err, tm* __tm) const
-    {
-      typedef char_traits<_CharT>		__traits_type;
-      const locale& __loc = __io._M_getloc();
-      const __timepunct<_CharT>& __tp = use_facet<__timepunct<_CharT> >(__loc);
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-      const char_type*  __months[12];
-      __tp._M_months_abbreviated(__months);
-      int __tmpmon;
-      __beg = _M_extract_name(__beg, __end, __tmpmon, __months, 12, 
-			      __io, __err);
-
-      // Check to see if non-abbreviated name exists, and extract.
-      // NB: Assumes both _M_months and _M_months_abbreviated organized in
-      // exact same order, first to last, such that the resulting
-      // __months array with the same index points to a month, and that
-      // month's abbreviated form.
-      // NB: Also assumes that an abbreviated name is a subset of the name.
-      if (!__err && __beg != __end)
-	{
-	  size_t __pos = __traits_type::length(__months[__tmpmon]);
-	  __tp._M_months(__months);
-	  const char_type* __name = __months[__tmpmon];
-	  if (__name[__pos] == *__beg)
-	    {
-	      // Extract the rest of it.
-	      const size_t __len = __traits_type::length(__name);
-	      while (__pos < __len && __beg != __end
-		     && __name[__pos] == *__beg)
-		++__beg, ++__pos;
-	      if (__len != __pos)
-		__err |= ios_base::failbit;
-	    }
-	}
-      if (!__err)
-	__tm->tm_mon = __tmpmon;
-
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _InIter>
-    _InIter
-    time_get<_CharT, _InIter>::
-    do_get_year(iter_type __beg, iter_type __end, ios_base& __io,
-		ios_base::iostate& __err, tm* __tm) const
-    {
-      const locale& __loc = __io._M_getloc();
-      const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-      size_t __i = 0;
-      int __value = 0;
-      for (; __beg != __end && __i < 4; ++__beg, ++__i)
-	{
-	  const char __c = __ctype.narrow(*__beg, '*');
-	  if (__c >= '0' && __c <= '9')
-	    __value = __value * 10 + (__c - '0');
-	  else
-	    break;
-	}
-      if (__i == 2 || __i == 4)
-	__tm->tm_year = __i == 2 ? __value : __value - 1900;
-      else
-	__err |= ios_base::failbit;
-      if (__beg == __end)
-	__err |= ios_base::eofbit;
-      return __beg;
-    }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    time_put<_CharT, _OutIter>::
-    put(iter_type __s, ios_base& __io, char_type __fill, const tm* __tm,
-	const _CharT* __beg, const _CharT* __end) const
-    {
-      const locale& __loc = __io._M_getloc();
-      ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
-      for (; __beg != __end; ++__beg)
-	if (__ctype.narrow(*__beg, 0) != '%')
-	  {
-	    *__s = *__beg;
-	    ++__s;
-	  }
-	else if (++__beg != __end)
-	  {
-	    char __format;
-	    char __mod = 0;
-	    const char __c = __ctype.narrow(*__beg, 0);
-	    if (__c != 'E' && __c != 'O')
-	      __format = __c;
-	    else if (++__beg != __end)
-	      {
-		__mod = __c;
-		__format = __ctype.narrow(*__beg, 0);
-	      }
-	    else
-	      break;
-	    __s = this->do_put(__s, __io, __fill, __tm, __format, __mod);
-	  }
-	else
-	  break;
-      return __s;
-    }
-
-  template<typename _CharT, typename _OutIter>
-    _OutIter
-    time_put<_CharT, _OutIter>::
-    do_put(iter_type __s, ios_base& __io, char_type, const tm* __tm,
-	   char __format, char __mod) const
-    {
-      const locale& __loc = __io._M_getloc();
-      ctype<_CharT> const& __ctype = use_facet<ctype<_CharT> >(__loc);
-      __timepunct<_CharT> const& __tp = use_facet<__timepunct<_CharT> >(__loc);
-
-      // NB: This size is arbitrary. Should this be a data member,
-      // initialized at construction?
-      const size_t __maxlen = 128;
-      char_type* __res = 
-       static_cast<char_type*>(__builtin_alloca(sizeof(char_type) * __maxlen));
-
-      // NB: In IEE 1003.1-200x, and perhaps other locale models, it
-      // is possible that the format character will be longer than one
-      // character. Possibilities include 'E' or 'O' followed by a
-      // format character: if __mod is not the default argument, assume
-      // it's a valid modifier.
-      char_type __fmt[4];
-      __fmt[0] = __ctype.widen('%');
-      if (!__mod)
-	{
-	  __fmt[1] = __format;
-	  __fmt[2] = char_type();
-	}
-      else
-	{
-	  __fmt[1] = __mod;
-	  __fmt[2] = __format;
-	  __fmt[3] = char_type();
-	}
-
-      __tp._M_put(__res, __maxlen, __fmt, __tm);
-
-      // Write resulting, fully-formatted string to output iterator.
-      return std::__write(__s, __res, char_traits<char_type>::length(__res));
-    }
-
-
-  // Generic version does nothing.
-  template<typename _CharT>
-    int
-    collate<_CharT>::_M_compare(const _CharT*, const _CharT*) const
-    { return 0; }
-
-  // Generic version does nothing.
-  template<typename _CharT>
-    size_t
-    collate<_CharT>::_M_transform(_CharT*, const _CharT*, size_t) const
-    { return 0; }
-
-  template<typename _CharT>
-    int
-    collate<_CharT>::
-    do_compare(const _CharT* __lo1, const _CharT* __hi1,
-	       const _CharT* __lo2, const _CharT* __hi2) const
-    {
-      // strcoll assumes zero-terminated strings so we make a copy
-      // and then put a zero at the end.
-      const string_type __one(__lo1, __hi1);
-      const string_type __two(__lo2, __hi2);
-
-      const _CharT* __p = __one.c_str();
-      const _CharT* __pend = __one.data() + __one.length();
-      const _CharT* __q = __two.c_str();
-      const _CharT* __qend = __two.data() + __two.length();
-
-      // strcoll stops when it sees a nul character so we break
-      // the strings into zero-terminated substrings and pass those
-      // to strcoll.
-      for (;;)
-	{
-	  const int __res = _M_compare(__p, __q);
-	  if (__res)
-	    return __res;
-
-	  __p += char_traits<_CharT>::length(__p);
-	  __q += char_traits<_CharT>::length(__q);
-	  if (__p == __pend && __q == __qend)
-	    return 0;
-	  else if (__p == __pend)
-	    return -1;
-	  else if (__q == __qend)
-	    return 1;
-
-	  __p++;
-	  __q++;
-	}
-    }
-
-  template<typename _CharT>
-    typename collate<_CharT>::string_type
-    collate<_CharT>::
-    do_transform(const _CharT* __lo, const _CharT* __hi) const
-    {
-      // strxfrm assumes zero-terminated strings so we make a copy
-      string_type __str(__lo, __hi);
-
-      const _CharT* __p = __str.c_str();
-      const _CharT* __pend = __str.data() + __str.length();
-
-      size_t __len = (__hi - __lo) * 2;
-
-      string_type __ret;
-
-      // strxfrm stops when it sees a nul character so we break
-      // the string into zero-terminated substrings and pass those
-      // to strxfrm.
-      for (;;)
-	{
-	  // First try a buffer perhaps big enough.
-	  _CharT* __c =
-	    static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT) * __len));
-	  size_t __res = _M_transform(__c, __p, __len);
-	  // If the buffer was not large enough, try again with the
-	  // correct size.
-	  if (__res >= __len)
-	    {
-	      __len = __res + 1;
-	      __c = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							  * __len));
-	      __res = _M_transform(__c, __p, __res + 1);
-	    }
-
-	  __ret.append(__c, __res);
-	  __p += char_traits<_CharT>::length(__p);
-	  if (__p == __pend)
-	    return __ret;
-
-	  __p++;
-	  __ret.push_back(_CharT());
-	}
-    }
-
-  template<typename _CharT>
-    long
-    collate<_CharT>::
-    do_hash(const _CharT* __lo, const _CharT* __hi) const
-    {
-      unsigned long __val = 0;
-      for (; __lo < __hi; ++__lo)
-	__val = *__lo + ((__val << 7) |
-		       (__val >> (numeric_limits<unsigned long>::digits - 7)));
-      return static_cast<long>(__val);
-    }
-
-  // Construct correctly padded string, as per 22.2.2.2.2
-  // Assumes
-  // __newlen > __oldlen
-  // __news is allocated for __newlen size
-  // Used by both num_put and ostream inserters: if __num,
-  // internal-adjusted objects are padded according to the rules below
-  // concerning 0[xX] and +-, otherwise, exactly as right-adjusted
-  // ones are.
-
-  // NB: Of the two parameters, _CharT can be deduced from the
-  // function arguments. The other (_Traits) has to be explicitly specified.
-  template<typename _CharT, typename _Traits>
-    void
-    __pad<_CharT, _Traits>::_S_pad(ios_base& __io, _CharT __fill,
-				   _CharT* __news, const _CharT* __olds,
-				   const streamsize __newlen,
-				   const streamsize __oldlen, const bool __num)
-    {
-      const size_t __plen = static_cast<size_t>(__newlen - __oldlen);
-      const ios_base::fmtflags __adjust = __io.flags() & ios_base::adjustfield;
-
-      // Padding last.
-      if (__adjust == ios_base::left)
-	{
-	  _Traits::copy(__news, const_cast<_CharT*>(__olds), __oldlen);
-	  _Traits::assign(__news + __oldlen, __plen, __fill);
-	  return;
-	}
-
-      size_t __mod = 0;
-      if (__adjust == ios_base::internal && __num)
-	{
-	  // Pad after the sign, if there is one.
-	  // Pad after 0[xX], if there is one.
-	  // Who came up with these rules, anyway? Jeeze.
-          const locale& __loc = __io._M_getloc();
-	  const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
-
-	  const bool __testsign = (__ctype.widen('-') == __olds[0]
-				   || __ctype.widen('+') == __olds[0]);
-	  const bool __testhex = (__ctype.widen('0') == __olds[0]
-				  && __oldlen > 1
-				  && (__ctype.widen('x') == __olds[1]
-				      || __ctype.widen('X') == __olds[1]));
-	  if (__testhex)
-	    {
-	      __news[0] = __olds[0];
-	      __news[1] = __olds[1];
-	      __mod = 2;
-	      __news += 2;
-	    }
-	  else if (__testsign)
-	    {
-	      __news[0] = __olds[0];
-	      __mod = 1;
-	      ++__news;
-	    }
-	  // else Padding first.
-	}
-      _Traits::assign(__news, __plen, __fill);
-      _Traits::copy(__news + __plen, const_cast<_CharT*>(__olds + __mod),
-		    __oldlen - __mod);
-    }
-
-  bool
-  __verify_grouping(const char* __grouping, size_t __grouping_size,
-		    const string& __grouping_tmp)
-  {
-    const size_t __n = __grouping_tmp.size() - 1;
-    const size_t __min = std::min(__n, __grouping_size - 1);
-    size_t __i = __n;
-    bool __test = true;
-    
-    // Parsed number groupings have to match the
-    // numpunct::grouping string exactly, starting at the
-    // right-most point of the parsed sequence of elements ...
-    for (size_t __j = 0; __j < __min && __test; --__i, ++__j)
-      __test = __grouping_tmp[__i] == __grouping[__j];
-    for (; __i && __test; --__i)
-      __test = __grouping_tmp[__i] == __grouping[__min];
-    // ... but the last parsed grouping can be <= numpunct
-    // grouping.
-    __test &= __grouping_tmp[0] <= __grouping[__min];
-    return __test;
-  }
-
-  template<typename _CharT>
-    _CharT*
-    __add_grouping(_CharT* __s, _CharT __sep,
-		   const char* __gbeg, size_t __gsize,
-		   const _CharT* __first, const _CharT* __last)
-    {
-      if (__last - __first > *__gbeg)
-	{
-	  const bool __bump = __gsize != 1;
-	  __s = std::__add_grouping(__s,  __sep, __gbeg + __bump,
-				    __gsize - __bump, __first,
-				    __last - *__gbeg);
-	  __first = __last - *__gbeg;
-	  *__s++ = __sep;
-	}
-      do
-	*__s++ = *__first++;
-      while (__first != __last);
-      return __s;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB: This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class moneypunct<char, false>;
-  extern template class moneypunct<char, true>;
-  extern template class moneypunct_byname<char, false>;
-  extern template class moneypunct_byname<char, true>;
-  extern template class money_get<char>;
-  extern template class money_put<char>;
-  extern template class numpunct<char>;
-  extern template class numpunct_byname<char>;
-  extern template class num_get<char>;
-  extern template class num_put<char>;
-  extern template class __timepunct<char>;
-  extern template class time_put<char>;
-  extern template class time_put_byname<char>;
-  extern template class time_get<char>;
-  extern template class time_get_byname<char>;
-  extern template class messages<char>;
-  extern template class messages_byname<char>;
-  extern template class ctype_byname<char>;
-  extern template class codecvt_byname<char, char, mbstate_t>;
-  extern template class collate<char>;
-  extern template class collate_byname<char>;
-
-  extern template
-    const codecvt<char, char, mbstate_t>&
-    use_facet<codecvt<char, char, mbstate_t> >(const locale&);
-
-  extern template
-    const collate<char>&
-    use_facet<collate<char> >(const locale&);
-
-  extern template
-    const numpunct<char>&
-    use_facet<numpunct<char> >(const locale&);
-
-  extern template
-    const num_put<char>&
-    use_facet<num_put<char> >(const locale&);
-
-  extern template
-    const num_get<char>&
-    use_facet<num_get<char> >(const locale&);
-
-  extern template
-    const moneypunct<char, true>&
-    use_facet<moneypunct<char, true> >(const locale&);
-
-  extern template
-    const moneypunct<char, false>&
-    use_facet<moneypunct<char, false> >(const locale&);
-
-  extern template
-    const money_put<char>&
-    use_facet<money_put<char> >(const locale&);
-
-  extern template
-    const money_get<char>&
-    use_facet<money_get<char> >(const locale&);
-
-  extern template
-    const __timepunct<char>&
-    use_facet<__timepunct<char> >(const locale&);
-
-  extern template
-    const time_put<char>&
-    use_facet<time_put<char> >(const locale&);
-
-  extern template
-    const time_get<char>&
-    use_facet<time_get<char> >(const locale&);
-
-  extern template
-    const messages<char>&
-    use_facet<messages<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<ctype<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<codecvt<char, char, mbstate_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<collate<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<numpunct<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<num_put<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<num_get<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<moneypunct<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<money_put<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<money_get<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<__timepunct<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<time_put<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<time_get<char> >(const locale&);
-
-  extern template
-    bool
-    has_facet<messages<char> >(const locale&);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class moneypunct<wchar_t, false>;
-  extern template class moneypunct<wchar_t, true>;
-  extern template class moneypunct_byname<wchar_t, false>;
-  extern template class moneypunct_byname<wchar_t, true>;
-  extern template class money_get<wchar_t>;
-  extern template class money_put<wchar_t>;
-  extern template class numpunct<wchar_t>;
-  extern template class numpunct_byname<wchar_t>;
-  extern template class num_get<wchar_t>;
-  extern template class num_put<wchar_t>;
-  extern template class __timepunct<wchar_t>;
-  extern template class time_put<wchar_t>;
-  extern template class time_put_byname<wchar_t>;
-  extern template class time_get<wchar_t>;
-  extern template class time_get_byname<wchar_t>;
-  extern template class messages<wchar_t>;
-  extern template class messages_byname<wchar_t>;
-  extern template class ctype_byname<wchar_t>;
-  extern template class codecvt_byname<wchar_t, char, mbstate_t>;
-  extern template class collate<wchar_t>;
-  extern template class collate_byname<wchar_t>;
-
-  extern template
-    const codecvt<wchar_t, char, mbstate_t>&
-    use_facet<codecvt<wchar_t, char, mbstate_t> >(locale const&);
-
-  extern template
-    const collate<wchar_t>&
-    use_facet<collate<wchar_t> >(const locale&);
-
-  extern template
-    const numpunct<wchar_t>&
-    use_facet<numpunct<wchar_t> >(const locale&);
-
-  extern template
-    const num_put<wchar_t>&
-    use_facet<num_put<wchar_t> >(const locale&);
-
-  extern template
-    const num_get<wchar_t>&
-    use_facet<num_get<wchar_t> >(const locale&);
-
-  extern template
-    const moneypunct<wchar_t, true>&
-    use_facet<moneypunct<wchar_t, true> >(const locale&);
-
-  extern template
-    const moneypunct<wchar_t, false>&
-    use_facet<moneypunct<wchar_t, false> >(const locale&);
-
-  extern template
-    const money_put<wchar_t>&
-    use_facet<money_put<wchar_t> >(const locale&);
-
-  extern template
-    const money_get<wchar_t>&
-    use_facet<money_get<wchar_t> >(const locale&);
-
-  extern template
-    const __timepunct<wchar_t>&
-    use_facet<__timepunct<wchar_t> >(const locale&);
-
-  extern template
-    const time_put<wchar_t>&
-    use_facet<time_put<wchar_t> >(const locale&);
-
-  extern template
-    const time_get<wchar_t>&
-    use_facet<time_get<wchar_t> >(const locale&);
-
-  extern template
-    const messages<wchar_t>&
-    use_facet<messages<wchar_t> >(const locale&);
-
- extern template
-    bool
-    has_facet<ctype<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<codecvt<wchar_t, char, mbstate_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<collate<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<numpunct<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<num_put<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<num_get<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<moneypunct<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<money_put<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<money_get<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<__timepunct<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<time_put<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<time_get<wchar_t> >(const locale&);
-
-  extern template
-    bool
-    has_facet<messages<wchar_t> >(const locale&);
-#endif
-#endif
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/localefwd.h b/include.new/c++/3.4/bits/localefwd.h
deleted file mode 100644
index 247158d..0000000
--- a/include.new/c++/3.4/bits/localefwd.h
+++ /dev/null
@@ -1,192 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-/** @file localefwd.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _LOCALE_FWD_H
-#define _LOCALE_FWD_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/c++locale.h>     // Defines __c_locale, config-specific includes
-#include <iosfwd>		// For ostreambuf_iterator, istreambuf_iterator
-#include <bits/functexcept.h>
-
-namespace std
-{
-  // 22.1.1 Locale
-  class locale;
-
-  // 22.1.3 Convenience interfaces
-  template<typename _CharT>
-    inline bool
-    isspace(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    isprint(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    iscntrl(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    isupper(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    islower(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    isalpha(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    isdigit(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    ispunct(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    isxdigit(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    isalnum(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline bool
-    isgraph(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline _CharT
-    toupper(_CharT, const locale&);
-
-  template<typename _CharT>
-    inline _CharT
-    tolower(_CharT, const locale&);
-
-  // 22.2.1 and 22.2.1.3 ctype
-  class ctype_base;
-  template<typename _CharT>
-    class ctype;
-  template<> class ctype<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<> class ctype<wchar_t>;
-#endif
-  template<typename _CharT>
-    class ctype_byname;
-  // NB: Specialized for char and wchar_t in locale_facets.h.
-
-  class codecvt_base;
-  class __enc_traits;
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    class codecvt;
-  template<> class codecvt<char, char, mbstate_t>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<> class codecvt<wchar_t, char, mbstate_t>;
-#endif
-  template<typename _InternT, typename _ExternT, typename _StateT>
-    class codecvt_byname;
-
-  // 22.2.2 and 22.2.3 numeric
-  template<typename _CharT, typename _InIter = istreambuf_iterator<_CharT> >
-    class num_get;
-  template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
-    class num_put;
-  template<typename _CharT> class numpunct;
-  template<typename _CharT> class numpunct_byname;
-
-  // 22.2.4 collation
-  template<typename _CharT>
-    class collate;
-  template<typename _CharT> class
-    collate_byname;
-
-  // 22.2.5 date and time
-  class time_base;
-  template<typename _CharT, typename _InIter =  istreambuf_iterator<_CharT> >
-    class time_get;
-  template<typename _CharT, typename _InIter =  istreambuf_iterator<_CharT> >
-    class time_get_byname;
-  template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
-    class time_put;
-  template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
-    class time_put_byname;
-
-  // 22.2.6 money
-  class money_base;
-  template<typename _CharT, typename _InIter =  istreambuf_iterator<_CharT> >
-    class money_get;
-  template<typename _CharT, typename _OutIter = ostreambuf_iterator<_CharT> >
-    class money_put;
-  template<typename _CharT, bool _Intl = false>
-    class moneypunct;
-  template<typename _CharT, bool _Intl = false>
-    class moneypunct_byname;
-
-  // 22.2.7 message retrieval
-  class messages_base;
-  template<typename _CharT>
-    class messages;
-  template<typename _CharT>
-    class messages_byname;
-
-  template<typename _Facet>
-    bool
-    has_facet(const locale& __loc) throw();
-
-  template<typename _Facet>
-    const _Facet&
-    use_facet(const locale& __loc);
-
-  template<typename _Facet>
-    inline const _Facet&
-    __check_facet(const _Facet* __f)
-    {
-      if (!__f)
-	__throw_bad_cast();
-      return *__f;
-    }
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/mask_array.h b/include.new/c++/3.4/bits/mask_array.h
deleted file mode 100644
index 1a694f3..0000000
--- a/include.new/c++/3.4/bits/mask_array.h
+++ /dev/null
@@ -1,209 +0,0 @@
-// The template and inlines for the -*- C++ -*- mask_array class.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
-//  Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-/** @file mask_array.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _MASK_ARRAY_H
-#define _MASK_ARRAY_H 1
-
-#pragma GCC system_header
-
-namespace std {
-
-  /**
-   *  @brief  Reference to selected subset of an array.
-   *
-   *  A mask_array is a reference to the actual elements of an array specified
-   *  by a bitmask in the form of an array of bool.  The way to get a
-   *  mask_array is to call operator[](valarray<bool>) on a valarray.  The
-   *  returned mask_array then permits carrying operations out on the
-   *  referenced subset of elements in the original valarray.
-   *
-   *  For example, if a mask_array is obtained using the array (false, true,
-   *  false, true) as an argument, the mask array has two elements referring
-   *  to array[1] and array[3] in the underlying array.
-   *
-   *  @param  Tp  Element type.
-   */
-  template <class _Tp>
-    class mask_array
-    {
-    public:
-      typedef _Tp value_type;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 253. valarray helper functions are almost entirely useless
-
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      mask_array (const mask_array&);
-      
-      ///  Assignment operator.  Assigns elements to corresponding elements
-      ///  of @a a.
-      mask_array& operator=(const mask_array&);
-
-      void operator=(const valarray<_Tp>&) const;
-      ///  Multiply slice elements by corresponding elements of @a v.
-      void operator*=(const valarray<_Tp>&) const;
-      ///  Divide slice elements by corresponding elements of @a v.
-      void operator/=(const valarray<_Tp>&) const;
-      ///  Modulo slice elements by corresponding elements of @a v.
-      void operator%=(const valarray<_Tp>&) const;
-      ///  Add corresponding elements of @a v to slice elements.
-      void operator+=(const valarray<_Tp>&) const;
-      ///  Subtract corresponding elements of @a v from slice elements.
-      void operator-=(const valarray<_Tp>&) const;
-      ///  Logical xor slice elements with corresponding elements of @a v.
-      void operator^=(const valarray<_Tp>&) const;
-      ///  Logical and slice elements with corresponding elements of @a v.
-      void operator&=(const valarray<_Tp>&) const;
-      ///  Logical or slice elements with corresponding elements of @a v.
-      void operator|=(const valarray<_Tp>&) const;
-      ///  Left shift slice elements by corresponding elements of @a v.
-      void operator<<=(const valarray<_Tp>&) const;
-      ///  Right shift slice elements by corresponding elements of @a v.
-      void operator>>=(const valarray<_Tp>&) const;
-      ///  Assign all slice elements to @a t.
-      void operator=(const _Tp&) const;
-
-        //        ~mask_array ();
-
-      template<class _Dom>
-        void operator=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator*=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator/=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator%=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator+=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator-=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator^=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator&=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator|=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator<<=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-        void operator>>=(const _Expr<_Dom,_Tp>&) const;
-
-    private:
-      mask_array(_Array<_Tp>, size_t, _Array<bool>);
-      friend class valarray<_Tp>;
-
-      const size_t       _M_sz;
-      const _Array<bool> _M_mask;
-      const _Array<_Tp>   _M_array;
-
-      // not implemented
-      mask_array();
-    };
-
-
-  template<typename _Tp>
-    inline mask_array<_Tp>::mask_array(const mask_array<_Tp>& a)
-    : _M_sz(a._M_sz), _M_mask(a._M_mask), _M_array(a._M_array) {}
-
-  template<typename _Tp>
-    inline
-    mask_array<_Tp>::mask_array(_Array<_Tp> __a, size_t __s, _Array<bool> __m)
-    : _M_sz(__s), _M_mask(__m), _M_array(__a) {}
-
-  template<typename _Tp>
-    inline mask_array<_Tp>&
-    mask_array<_Tp>::operator=(const mask_array<_Tp>& __a)
-    {
-      std::__valarray_copy(__a._M_array, __a._M_mask,
-			   _M_sz, _M_array, _M_mask);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline void
-    mask_array<_Tp>::operator=(const _Tp& __t) const
-    { std::__valarray_fill(_M_array, _M_sz, _M_mask, __t); }
-
-  template<typename _Tp>
-    inline void
-    mask_array<_Tp>::operator=(const valarray<_Tp>& __v) const
-    { std::__valarray_copy(_Array<_Tp>(__v), __v.size(), _M_array, _M_mask); }
-
-  template<typename _Tp>
-    template<class _Ex>
-      inline void
-      mask_array<_Tp>::operator=(const _Expr<_Ex, _Tp>& __e) const
-      { std::__valarray_copy(__e, __e.size(), _M_array, _M_mask); }
-
-#undef _DEFINE_VALARRAY_OPERATOR
-#define _DEFINE_VALARRAY_OPERATOR(_Op, _Name)				\
-  template<typename _Tp>						\
-    inline void								\
-    mask_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const	\
-    {									\
-      _Array_augmented_##_Name(_M_array, _M_mask,			\
-			       _Array<_Tp>(__v), __v.size());		\
-    }									\
-									\
-  template<typename _Tp>                                                \
-    template<class _Dom>			                        \
-      inline void							\
-      mask_array<_Tp>::operator _Op##=(const _Expr<_Dom, _Tp>& __e) const\
-      {									\
-	_Array_augmented_##_Name(_M_array, _M_mask, __e, __e.size());   \
-      }
-
-_DEFINE_VALARRAY_OPERATOR(*, __multiplies)
-_DEFINE_VALARRAY_OPERATOR(/, __divides)
-_DEFINE_VALARRAY_OPERATOR(%, __modulus)
-_DEFINE_VALARRAY_OPERATOR(+, __plus)
-_DEFINE_VALARRAY_OPERATOR(-, __minus)
-_DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
-_DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
-_DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
-_DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
-_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_OPERATOR
-
-} // std::
-
-#endif /* _MASK_ARRAY_H */
-
-// Local Variables:
-// mode:c++
-// End:
diff --git a/include.new/c++/3.4/bits/messages_members.h b/include.new/c++/3.4/bits/messages_members.h
deleted file mode 100644
index 4a2ff4a..0000000
--- a/include.new/c++/3.4/bits/messages_members.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// std::messages implementation details, generic version -*- C++ -*-
-
-// Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.2.7.1.2  messages virtual functions
-//
-
-// Written by Benjamin Kosnik <bkoz@redhat.com>
-
-  // Non-virtual member functions.
-  template<typename _CharT>
-     messages<_CharT>::messages(size_t __refs)
-     : facet(__refs)
-     { _M_c_locale_messages = _S_get_c_locale(); }
-
-  template<typename _CharT>
-     messages<_CharT>::messages(__c_locale, const char*, size_t __refs) 
-     : facet(__refs)
-     { _M_c_locale_messages = _S_get_c_locale(); }
-
-  template<typename _CharT>
-    typename messages<_CharT>::catalog 
-    messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, 
-			   const char*) const
-    { return this->do_open(__s, __loc); }
-
-  // Virtual member functions.
-  template<typename _CharT>
-    messages<_CharT>::~messages()
-    { _S_destroy_c_locale(_M_c_locale_messages); }
-
-  template<typename _CharT>
-    typename messages<_CharT>::catalog 
-    messages<_CharT>::do_open(const basic_string<char>&, const locale&) const
-    { return 0; }
-
-  template<typename _CharT>
-    typename messages<_CharT>::string_type  
-    messages<_CharT>::do_get(catalog, int, int, 
-			     const string_type& __dfault) const
-    { return __dfault; }
-
-  template<typename _CharT>
-    void    
-    messages<_CharT>::do_close(catalog) const 
-    { }
-
-   // messages_byname
-   template<typename _CharT>
-     messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
-     : messages<_CharT>(__refs) 
-     { 
-	if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
-	  {
-	    this->_S_destroy_c_locale(this->_M_c_locale_messages);
-	    this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
-	  }
-     }
diff --git a/include.new/c++/3.4/bits/os_defines.h b/include.new/c++/3.4/bits/os_defines.h
deleted file mode 100644
index 1e46712..0000000
--- a/include.new/c++/3.4/bits/os_defines.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Specific definitions for BSD  -*- C++ -*-
-
-// Copyright (C) 2000, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-
-#ifndef _GLIBCXX_OS_DEFINES
-#define _GLIBCXX_OS_DEFINES 1
-
-// System-specific #define, typedefs, corrections, etc, go here.  This
-// file will come before all others.
-
-#define _GLIBCXX_USE_C99_CHECK 1
-#define _GLIBCXX_USE_C99_DYNAMIC (!(__ISO_C_VISIBLE >= 1999))
-#define _GLIBCXX_USE_C99_LONG_LONG_CHECK 1
-#define _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC (_GLIBCXX_USE_C99_DYNAMIC || !defined __LONG_LONG_SUPPORTED)
-#define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_CHECK 1
-#define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC defined _XOPEN_SOURCE
-
-#endif
diff --git a/include.new/c++/3.4/bits/ostream.tcc b/include.new/c++/3.4/bits/ostream.tcc
deleted file mode 100644
index 2d1b5b4..0000000
--- a/include.new/c++/3.4/bits/ostream.tcc
+++ /dev/null
@@ -1,699 +0,0 @@
-// ostream classes -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.6.2  Output streams
-//
-
-#ifndef _OSTREAM_TCC
-#define _OSTREAM_TCC 1
-
-#pragma GCC system_header
-
-#include <locale>
-
-namespace std
-{
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>::sentry::
-    sentry(basic_ostream<_CharT, _Traits>& __os)
-    : _M_ok(false), _M_os(__os)
-    {
-      // XXX MT
-      if (__os.tie() && __os.good())
-	__os.tie()->flush();
-
-      if (__os.good())
-	_M_ok = true;
-      else
-	__os.setstate(ios_base::failbit);
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(__ostream_type& (*__pf)(__ostream_type&))
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 60. What is a formatted input function?
-      // The inserters for manipulators are *not* formatted output functions.
-      return __pf(*this);
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(__ios_type& (*__pf)(__ios_type&))
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 60. What is a formatted input function?
-      // The inserters for manipulators are *not* formatted output functions.
-      __pf(*this);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(ios_base& (*__pf)(ios_base&))
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 60. What is a formatted input function?
-      // The inserters for manipulators are *not* formatted output functions.
-      __pf(*this);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(bool __n)
-    {
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_put_type& __np = __check_facet(this->_M_num_put);
-	      if (__np.put(*this, *this, this->fill(), __n).failed())
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(long __n)
-    {
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      bool __b = false;
-	      const char_type __c = this->fill();
-	      const ios_base::fmtflags __fmt = (this->flags()
-						& ios_base::basefield);
-	      const __num_put_type& __np = __check_facet(this->_M_num_put);
-	      if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex))
-		{
-		  const unsigned long __l = static_cast<unsigned long>(__n);
-		  __b = __np.put(*this, *this, __c, __l).failed();
-		}
-	      else
-		__b = __np.put(*this, *this, __c, __n).failed();
-	      if (__b)
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(unsigned long __n)
-    {
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_put_type& __np = __check_facet(this->_M_num_put);
-	      if (__np.put(*this, *this, this->fill(), __n).failed())
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(long long __n)
-    {
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      bool __b = false;
-	      const char_type __c = this->fill();
-	      const ios_base::fmtflags __fmt = (this->flags()
-						& ios_base::basefield);
-	      const __num_put_type& __np = __check_facet(this->_M_num_put);
-	      if ((__fmt & ios_base::oct) || (__fmt & ios_base::hex))
-		{
-		  const unsigned long long __l = (static_cast<
-						  unsigned long long>(__n));
-		  __b = __np.put(*this, *this, __c, __l).failed();
-		}
-	      else
-		__b = __np.put(*this, *this, __c, __n).failed();
-	      if (__b)
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(unsigned long long __n)
-    {
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_put_type& __np = __check_facet(this->_M_num_put);
-	      if (__np.put(*this, *this, this->fill(), __n).failed())
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-#endif
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(double __n)
-    {
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_put_type& __np = __check_facet(this->_M_num_put);
-	      if (__np.put(*this, *this, this->fill(), __n).failed())
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(long double __n)
-    {
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_put_type& __np = __check_facet(this->_M_num_put);
-	      if (__np.put(*this, *this, this->fill(), __n).failed())
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(const void* __n)
-    {
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const __num_put_type& __np = __check_facet(this->_M_num_put);
-	      if (__np.put(*this, *this, this->fill(), __n).failed())
-		__err |= ios_base::badbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    operator<<(__streambuf_type* __sbin)
-    {
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      sentry __cerb(*this);
-      if (__cerb && __sbin)
-	{
-	  try
-	    {
-	      if (!__copy_streambufs(__sbin, this->rdbuf()))
-		__err |= ios_base::failbit;
-	    }
-	  catch(...)
-	    { this->_M_setstate(ios_base::failbit); }
-	}
-      else if (!__sbin)
-	__err |= ios_base::badbit;
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    put(char_type __c)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 60. What is a formatted input function?
-      // basic_ostream::put(char_type) is an unformatted output function.
-      // DR 63. Exception-handling policy for unformatted output.
-      // Unformatted output functions should catch exceptions thrown
-      // from streambuf members.
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-	  try
-	    {
-	      const int_type __put = this->rdbuf()->sputc(__c);
-	      if (traits_type::eq_int_type(__put, traits_type::eof()))
-		__err |= ios_base::badbit;
-	    }
-	  catch (...)
-	    { this->_M_setstate(ios_base::badbit); }
-	  if (__err)
-	    this->setstate(__err);
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    write(const _CharT* __s, streamsize __n)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 60. What is a formatted input function?
-      // basic_ostream::write(const char_type*, streamsize) is an
-      // unformatted output function.
-      // DR 63. Exception-handling policy for unformatted output.
-      // Unformatted output functions should catch exceptions thrown
-      // from streambuf members.
-      sentry __cerb(*this);
-      if (__cerb)
-	{
-	  try
-	    { _M_write(__s, __n); }
-	  catch (...)
-	    { this->_M_setstate(ios_base::badbit); }
-	}
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    flush()
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 60. What is a formatted input function?
-      // basic_ostream::flush() is *not* an unformatted output function.
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      try
-	{
-	  if (this->rdbuf() && this->rdbuf()->pubsync() == -1)
-	    __err |= ios_base::badbit;
-	}
-      catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    typename basic_ostream<_CharT, _Traits>::pos_type
-    basic_ostream<_CharT, _Traits>::
-    tellp()
-    {
-      pos_type __ret = pos_type(-1);
-      try
-	{
-	  if (!this->fail())
-	    __ret = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::out);
-	}
-      catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    seekp(pos_type __pos)
-    {
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      try
-	{
-	  if (!this->fail())
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 136.  seekp, seekg setting wrong streams?
-	      const pos_type __p = this->rdbuf()->pubseekpos(__pos,
-							     ios_base::out);
-
-	      // 129. Need error indication from seekp() and seekg()
-	      if (__p == pos_type(off_type(-1)))
-		__err |= ios_base::failbit;
-	    }
-	}
-      catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    basic_ostream<_CharT, _Traits>::
-    seekp(off_type __off, ios_base::seekdir __dir)
-    {
-      ios_base::iostate __err = ios_base::iostate(ios_base::goodbit);
-      try
-	{
-	  if (!this->fail())
-	    {
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 136.  seekp, seekg setting wrong streams?
-	      const pos_type __p = this->rdbuf()->pubseekoff(__off, __dir,
-							     ios_base::out);
-
-	      // 129. Need error indication from seekp() and seekg()
-	      if (__p == pos_type(off_type(-1)))
-		__err |= ios_base::failbit;
-	    }
-	}
-      catch(...)
-	{ this->_M_setstate(ios_base::badbit); }
-      if (__err)
-	this->setstate(__err);
-      return *this;
-    }
-
-  // 27.6.2.5.4 Character inserters.
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, _CharT __c)
-    {
-      typedef basic_ostream<_CharT, _Traits> __ostream_type;
-      typename __ostream_type::sentry __cerb(__out);
-      if (__cerb)
-	{
-	  try
-	    {
-	      const streamsize __w = __out.width();
-	      streamsize __len = 1;
-	      _CharT* __cs = &__c;
-	      if (__w > __len)
-		{
-		  __cs = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							       * __w));
-		  __pad<_CharT, _Traits>::_S_pad(__out, __out.fill(), __cs,
-						 &__c, __w, __len, false);
-		  __len = __w;
-		}
-	      __out._M_write(__cs, __len);
-	      __out.width(0);
-	    }
-	  catch(...)
-	    { __out._M_setstate(ios_base::badbit); }
-	}
-      return __out;
-    }
-
-  // Specializations.
-  template <class _Traits>
-    basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, char __c)
-    {
-      typedef basic_ostream<char, _Traits> __ostream_type;
-      typename __ostream_type::sentry __cerb(__out);
-      if (__cerb)
-	{
-	  try
-	    {
-	      const streamsize __w = __out.width();
-	      streamsize __len = 1;
-	      char* __cs = &__c;
-	      if (__w > __len)
-		{
-		  __cs = static_cast<char*>(__builtin_alloca(__w));
-		  __pad<char, _Traits>::_S_pad(__out, __out.fill(), __cs,
-					       &__c, __w, __len, false);
-		  __len = __w;
-		}
-	      __out._M_write(__cs, __len);
-	      __out.width(0);
-	    }
-	  catch(...)
-	    { __out._M_setstate(ios_base::badbit); }
-	}
-      return __out;
-     }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, const _CharT* __s)
-    {
-      typedef basic_ostream<_CharT, _Traits> __ostream_type;
-      typename __ostream_type::sentry __cerb(__out);
-      if (__cerb && __s)
-	{
-	  try
-	    {
-	      const streamsize __w = __out.width();
-	      streamsize __len = static_cast<streamsize>(_Traits::length(__s));
-	      if (__w > __len)
-		{
-		  _CharT* __cs = (static_cast<
-				  _CharT*>(__builtin_alloca(sizeof(_CharT)
-							    * __w)));
-		  __pad<_CharT, _Traits>::_S_pad(__out, __out.fill(), __cs,
-						 __s, __w, __len, false);
-		  __s = __cs;
-		  __len = __w;
-		}
-	      __out._M_write(__s, __len);
-	      __out.width(0);
-	    }
-	  catch(...)
-	    { __out._M_setstate(ios_base::badbit); }
-	}
-      else if (!__s)
-	__out.setstate(ios_base::badbit);
-      return __out;
-    }
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s)
-    {
-      typedef basic_ostream<_CharT, _Traits> __ostream_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 167.  Improper use of traits_type::length()
-      // Note that this is only in 'Review' status.
-      typedef char_traits<char>		     __traits_type;
-      typename __ostream_type::sentry __cerb(__out);
-      if (__cerb && __s)
-	{
-	  size_t __clen = __traits_type::length(__s);
-	  _CharT* __ws = static_cast<_CharT*>(__builtin_alloca(sizeof(_CharT)
-							       * __clen));
-	  for (size_t  __i = 0; __i < __clen; ++__i)
-	    __ws[__i] = __out.widen(__s[__i]);
-	  _CharT* __str = __ws;
-
-	  try
-	    {
-	      const streamsize __w = __out.width();
-	      streamsize __len = static_cast<streamsize>(__clen);
-	      if (__w > __len)
-		{
-		  _CharT* __cs = (static_cast<
-				  _CharT*>(__builtin_alloca(sizeof(_CharT)
-							    * __w)));
-		  __pad<_CharT, _Traits>::_S_pad(__out, __out.fill(), __cs,
-						 __ws, __w, __len, false);
-		  __str = __cs;
-		  __len = __w;
-		}
-	      __out._M_write(__str, __len);
-	      __out.width(0);
-	    }
-	  catch(...)
-	    { __out._M_setstate(ios_base::badbit); }
-	}
-      else if (!__s)
-	__out.setstate(ios_base::badbit);
-      return __out;
-    }
-
-  // Partial specializations.
-  template<class _Traits>
-    basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, const char* __s)
-    {
-      typedef basic_ostream<char, _Traits> __ostream_type;
-      typename __ostream_type::sentry __cerb(__out);
-      if (__cerb && __s)
-	{
-	  try
-	    {
-	      const streamsize __w = __out.width();
-	      streamsize __len = static_cast<streamsize>(_Traits::length(__s));
-	      if (__w > __len)
-		{
-		  char* __cs = static_cast<char*>(__builtin_alloca(__w));
-		  __pad<char, _Traits>::_S_pad(__out, __out.fill(), __cs,
-						 __s, __w, __len, false);
-		  __s = __cs;
-		  __len = __w;
-		}
-	      __out._M_write(__s, __len);
-	      __out.width(0);
-	    }
-	  catch(...)
-	    { __out._M_setstate(ios_base::badbit); }
-	}
-      else if (!__s)
-	__out.setstate(ios_base::badbit);
-      return __out;
-    }
-
-  // 21.3.7.9 basic_string::operator<<
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out,
-	       const basic_string<_CharT, _Traits, _Alloc>& __str)
-    {
-      typedef basic_ostream<_CharT, _Traits> __ostream_type;
-      typename __ostream_type::sentry __cerb(__out);
-      if (__cerb)
-	{
-	  const streamsize __w = __out.width();
-	  streamsize __len = static_cast<streamsize>(__str.size());
-	  const _CharT* __s = __str.data();
-
-	  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	  // 25. String operator<< uses width() value wrong
-	  if (__w > __len)
-	    {
-	      _CharT* __cs = (static_cast<
-			      _CharT*>(__builtin_alloca(sizeof(_CharT) * __w)));
-	      __pad<_CharT, _Traits>::_S_pad(__out, __out.fill(), __cs, __s,
-					     __w, __len, false);
-	      __s = __cs;
-	      __len = __w;
-	    }
-	  __out._M_write(__s, __len);
-	  __out.width(0);
-	}
-      return __out;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB:  This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_ostream<char>;
-  extern template ostream& endl(ostream&);
-  extern template ostream& ends(ostream&);
-  extern template ostream& flush(ostream&);
-  extern template ostream& operator<<(ostream&, char);
-  extern template ostream& operator<<(ostream&, unsigned char);
-  extern template ostream& operator<<(ostream&, signed char);
-  extern template ostream& operator<<(ostream&, const char*);
-  extern template ostream& operator<<(ostream&, const unsigned char*);
-  extern template ostream& operator<<(ostream&, const signed char*);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_ostream<wchar_t>;
-  extern template wostream& endl(wostream&);
-  extern template wostream& ends(wostream&);
-  extern template wostream& flush(wostream&);
-  extern template wostream& operator<<(wostream&, wchar_t);
-  extern template wostream& operator<<(wostream&, char);
-  extern template wostream& operator<<(wostream&, const wchar_t*);
-  extern template wostream& operator<<(wostream&, const char*);
-#endif
-#endif
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/postypes.h b/include.new/c++/3.4/bits/postypes.h
deleted file mode 100644
index 0cfb61b..0000000
--- a/include.new/c++/3.4/bits/postypes.h
+++ /dev/null
@@ -1,215 +0,0 @@
-// Position types -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.4.1 - Types
-// ISO C++ 14882: 27.4.3 - Template class fpos
-//
-
-/** @file postypes.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _GLIBCXX_POSTYPES_H
-#define _GLIBCXX_POSTYPES_H 1
-
-#pragma GCC system_header
-
-#include <cwchar> // For mbstate_t
-
-#ifdef _GLIBCXX_HAVE_STDINT_H
-#include <stdint.h> // For int64_t
-#endif
-
-namespace std
-{
-  // The types streamoff, streampos and wstreampos and the class
-  // template fpos<> are described in clauses 21.1.2, 21.1.3, 27.1.2,
-  // 27.2, 27.4.1, 27.4.3 and D.6. Despite all this verbage, the
-  // behaviour of these types is mostly implementation defined or
-  // unspecified. The behaviour in this implementation is as noted
-  // below.
-
-  /**
-   *  @brief  Type used by fpos, char_traits<char>, and char_traits<wchar_t>.
-   *
-   *  @if maint
-   *  In clauses 21.1.3.1 and 27.4.1 streamoff is described as an
-   *  implementation defined type.
-   *  Note: In versions of GCC up to and including GCC 3.3, streamoff
-   *  was typedef long.
-   *  @endif
-  */  
-#ifdef _GLIBCXX_HAVE_INT64_T
-  typedef int64_t       streamoff;
-#else
-  typedef long long     streamoff;
-#endif
-
-  /// Integral type for I/O operation counts and buffer sizes.
-  typedef ptrdiff_t	streamsize; // Signed integral type
-
-  template<typename _StateT>
-    class fpos;
-
-  /**
-   *  @brief  Class representing stream positions.
-   *
-   *  The standard places no requirements upon the template parameter StateT.
-   *  In this implementation StateT must be DefaultConstructible,
-   *  CopyConstructible and Assignable.  The standard only requires that fpos
-   *  should contain a member of type StateT. In this implementation it also
-   *  contains an offset stored as a signed integer.
-   *
-   *  @param  StateT  Type passed to and returned from state().
-   */
-  template<typename _StateT>
-    class fpos
-    {
-    private:
-      streamoff	                _M_off;
-      _StateT			_M_state;
-
-    public:
-      // The standard doesn't require that fpos objects can be default
-      // constructed. This implementation provides a default
-      // constructor that initializes the offset to 0 and default
-      // constructs the state.
-      fpos()
-      : _M_off(0), _M_state() { }
-
-      // The standard requires that fpos objects can be constructed
-      // from streamoff objects using the constructor syntax, and
-      // fails to give any meaningful semantics. In this
-      // implementation implicit conversion is also allowed, and this
-      // constructor stores the streamoff as the offset and default
-      // constructs the state.
-      /// Construct position from offset.
-      fpos(streamoff __off)
-      : _M_off(__off), _M_state() { }
-
-      /// Convert to streamoff.
-      operator streamoff() const { return _M_off; }
-
-      /// Remember the value of @a st.
-      void
-      state(_StateT __st)
-      { _M_state = __st; }
-
-      /// Return the last set value of @a st.
-      _StateT
-      state() const
-      { return _M_state; }
-
-      // The standard only requires that operator== must be an
-      // equivalence relation. In this implementation two fpos<StateT>
-      // objects belong to the same equivalence class if the contained
-      // offsets compare equal.
-      /// Test if equivalent to another position.
-      bool
-      operator==(const fpos& __other) const
-      { return _M_off == __other._M_off; }
-
-      /// Test if not equivalent to another position.
-      bool
-      operator!=(const fpos& __other) const
-      { return _M_off != __other._M_off; }
-
-      // The standard requires that this operator must be defined, but
-      // gives no semantics. In this implemenation it just adds it's
-      // argument to the stored offset and returns *this.
-      /// Add offset to this position.
-      fpos&
-      operator+=(streamoff __off)
-      {
-	_M_off += __off;
-	return *this;
-      }
-
-      // The standard requires that this operator must be defined, but
-      // gives no semantics. In this implemenation it just subtracts
-      // it's argument from the stored offset and returns *this.
-      /// Subtract offset from this position.
-      fpos&
-      operator-=(streamoff __off)
-      {
-	_M_off -= __off;
-	return *this;
-      }
-
-      // The standard requires that this operator must be defined, but
-      // defines it's semantics only in terms of operator-. In this
-      // implementation it constructs a copy of *this, adds the
-      // argument to that copy using operator+= and then returns the
-      // copy.
-      /// Add position and offset.
-      fpos
-      operator+(streamoff __off) const
-      {
-	fpos __pos(*this);
-	__pos += __off;
-	return __pos;
-      }
-
-      // The standard requires that this operator must be defined, but
-      // defines it's semantics only in terms of operator+. In this
-      // implementation it constructs a copy of *this, subtracts the
-      // argument from that copy using operator-= and then returns the
-      // copy.
-      /// Subtract offset from position.
-      fpos
-      operator-(streamoff __off) const
-      {
-	fpos __pos(*this);
-	__pos -= __off;
-	return __pos;
-      }
-
-      // The standard requires that this operator must be defined, but
-      // defines it's semantics only in terms of operator+. In this
-      // implementation it returns the difference between the offset
-      // stored in *this and in the argument.
-      /// Subtract position to return offset.
-      streamoff
-      operator-(const fpos& __other) const
-      { return _M_off - __other._M_off; }
-    };
-
-  // Clauses 21.1.3.1 and 21.1.3.2 describe streampos and wstreampos
-  // as implementation defined types, but clause 27.2 requires that
-  // they must both be typedefs for fpos<mbstate_t>
-  /// File position for char streams.
-  typedef fpos<mbstate_t> streampos;
-  /// File position for wchar_t streams.
-  typedef fpos<mbstate_t> wstreampos;
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/slice_array.h b/include.new/c++/3.4/bits/slice_array.h
deleted file mode 100644
index 31c89bc..0000000
--- a/include.new/c++/3.4/bits/slice_array.h
+++ /dev/null
@@ -1,273 +0,0 @@
-// The template and inlines for the -*- C++ -*- slice_array class.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-/** @file slice_array.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _SLICE_ARRAY_H
-#define _SLICE_ARRAY_H 1
-
-#pragma GCC system_header
-
-namespace std
-{
-  /**
-   *  @brief  Class defining one-dimensional subset of an array.
-   *
-   *  The slice class represents a one-dimensional subset of an array,
-   *  specified by three parameters: start offset, size, and stride.  The
-   *  start offset is the index of the first element of the array that is part
-   *  of the subset.  The size is the total number of elements in the subset.
-   *  Stride is the distance between each successive array element to include
-   *  in the subset.
-   *
-   *  For example, with an array of size 10, and a slice with offset 1, size 3
-   *  and stride 2, the subset consists of array elements 1, 3, and 5.
-   */
-  class slice
-  {
-  public:
-    ///  Construct an empty slice.
-    slice();
-
-    /**
-     *  @brief  Construct a slice.
-     *
-     *  @param  o  Offset in array of first element.
-     *  @param  d  Number of elements in slice.
-     *  @param  s  Stride between array elements.
-     */
-    slice(size_t, size_t, size_t);
-
-    ///  Return array offset of first slice element.
-    size_t start() const;
-    ///  Return size of slice.
-    size_t size() const;
-    ///  Return array stride of slice.
-    size_t stride() const;
-
-  private:
-    size_t _M_off;                      // offset
-    size_t _M_sz;			// size
-    size_t _M_st;			// stride unit
-  };
-
-  // The default constructor constructor is not required to initialize
-  // data members with any meaningful values, so we choose to do nothing.
-  inline
-  slice::slice() {}
-
-  inline
-  slice::slice(size_t __o, size_t __d, size_t __s)
-    : _M_off(__o), _M_sz(__d), _M_st(__s) {}
-
-  inline size_t
-  slice::start() const
-  { return _M_off; }
-
-  inline size_t
-  slice::size() const
-  { return _M_sz; }
-
-  inline size_t
-  slice::stride() const
-  { return _M_st; }
-
-  /**
-   *  @brief  Reference to one-dimensional subset of an array.
-   *
-   *  A slice_array is a reference to the actual elements of an array
-   *  specified by a slice.  The way to get a slice_array is to call
-   *  operator[](slice) on a valarray.  The returned slice_array then permits
-   *  carrying operations out on the referenced subset of elements in the
-   *  original valarray.  For example, operator+=(valarray) will add values
-   *  to the subset of elements in the underlying valarray this slice_array
-   *  refers to.
-   *
-   *  @param  Tp  Element type.
-   */
-  template<typename _Tp>
-    class slice_array
-    {
-    public:
-      typedef _Tp value_type;
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 253. valarray helper functions are almost entirely useless
-
-      ///  Copy constructor.  Both slices refer to the same underlying array.
-      slice_array(const slice_array&);
-
-      ///  Assignment operator.  Assigns slice elements to corresponding
-      ///  elements of @a a.
-      slice_array& operator=(const slice_array&);
-
-      ///  Assign slice elements to corresponding elements of @a v.
-      void operator=(const valarray<_Tp>&) const;
-      ///  Multiply slice elements by corresponding elements of @a v.
-      void operator*=(const valarray<_Tp>&) const;
-      ///  Divide slice elements by corresponding elements of @a v.
-      void operator/=(const valarray<_Tp>&) const;
-      ///  Modulo slice elements by corresponding elements of @a v.
-      void operator%=(const valarray<_Tp>&) const;
-      ///  Add corresponding elements of @a v to slice elements.
-      void operator+=(const valarray<_Tp>&) const;
-      ///  Subtract corresponding elements of @a v from slice elements.
-      void operator-=(const valarray<_Tp>&) const;
-      ///  Logical xor slice elements with corresponding elements of @a v.
-      void operator^=(const valarray<_Tp>&) const;
-      ///  Logical and slice elements with corresponding elements of @a v.
-      void operator&=(const valarray<_Tp>&) const;
-      ///  Logical or slice elements with corresponding elements of @a v.
-      void operator|=(const valarray<_Tp>&) const;
-      ///  Left shift slice elements by corresponding elements of @a v.
-      void operator<<=(const valarray<_Tp>&) const;
-      ///  Right shift slice elements by corresponding elements of @a v.
-      void operator>>=(const valarray<_Tp>&) const;
-      ///  Assign all slice elements to @a t.
-      void operator=(const _Tp &) const;
-      //        ~slice_array ();
-
-      template<class _Dom>
-	void operator=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator*=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator/=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator%=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator+=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator-=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator^=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator&=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator|=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator<<=(const _Expr<_Dom,_Tp>&) const;
-      template<class _Dom>
-	void operator>>=(const _Expr<_Dom,_Tp>&) const;
-
-    private:
-      friend class valarray<_Tp>;
-      slice_array(_Array<_Tp>, const slice&);
-
-      const size_t     _M_sz;
-      const size_t     _M_stride;
-      const _Array<_Tp> _M_array;
-
-      // not implemented
-      slice_array();
-    };
-
-  template<typename _Tp>
-    inline
-    slice_array<_Tp>::slice_array(_Array<_Tp> __a, const slice& __s)
-    : _M_sz(__s.size()), _M_stride(__s.stride()),
-      _M_array(__a.begin() + __s.start()) {}
-
-  template<typename _Tp>
-    inline
-    slice_array<_Tp>::slice_array(const slice_array<_Tp>& a)
-    : _M_sz(a._M_sz), _M_stride(a._M_stride), _M_array(a._M_array) {}
-
-  //    template<typename _Tp>
-  //    inline slice_array<_Tp>::~slice_array () {}
-
-  template<typename _Tp>
-    inline slice_array<_Tp>&
-    slice_array<_Tp>::operator=(const slice_array<_Tp>& __a)
-    {
-      std::__valarray_copy(__a._M_array, __a._M_sz, __a._M_stride,
-			   _M_array, _M_stride);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline void
-    slice_array<_Tp>::operator=(const _Tp& __t) const
-    { std::__valarray_fill(_M_array, _M_sz, _M_stride, __t); }
-
-  template<typename _Tp>
-    inline void
-    slice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
-    { std::__valarray_copy(_Array<_Tp>(__v), _M_array, _M_sz, _M_stride); }
-
-  template<typename _Tp>
-  template<class _Dom>
-    inline void
-    slice_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const
-    { std::__valarray_copy(__e, _M_sz, _M_array, _M_stride); }
-
-#undef _DEFINE_VALARRAY_OPERATOR
-#define _DEFINE_VALARRAY_OPERATOR(_Op,_Name)				\
-  template<typename _Tp>						\
-    inline void								\
-    slice_array<_Tp>::operator _Op##=(const valarray<_Tp>& __v) const	\
-    {									\
-      _Array_augmented_##_Name(_M_array, _M_sz, _M_stride, _Array<_Tp>(__v));\
-    }									\
-									\
-  template<typename _Tp>                                                \
-    template<class _Dom>				                \
-      inline void							\
-      slice_array<_Tp>::operator _Op##=(const _Expr<_Dom,_Tp>& __e) const\
-      {									\
-	  _Array_augmented_##_Name(_M_array, _M_stride, __e, _M_sz);	\
-      }
-
-
-_DEFINE_VALARRAY_OPERATOR(*, __multiplies)
-_DEFINE_VALARRAY_OPERATOR(/, __divides)
-_DEFINE_VALARRAY_OPERATOR(%, __modulus)
-_DEFINE_VALARRAY_OPERATOR(+, __plus)
-_DEFINE_VALARRAY_OPERATOR(-, __minus)
-_DEFINE_VALARRAY_OPERATOR(^, __bitwise_xor)
-_DEFINE_VALARRAY_OPERATOR(&, __bitwise_and)
-_DEFINE_VALARRAY_OPERATOR(|, __bitwise_or)
-_DEFINE_VALARRAY_OPERATOR(<<, __shift_left)
-_DEFINE_VALARRAY_OPERATOR(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_OPERATOR
-
-} // std::
-
-#endif /* _SLICE_ARRAY_H */
-
-// Local Variables:
-// mode:c++
-// End:
diff --git a/include.new/c++/3.4/bits/sstream.tcc b/include.new/c++/3.4/bits/sstream.tcc
deleted file mode 100644
index 03f49fb..0000000
--- a/include.new/c++/3.4/bits/sstream.tcc
+++ /dev/null
@@ -1,227 +0,0 @@
-// String based streams -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.7  String-based streams
-//
-
-#ifndef _SSTREAM_TCC
-#define _SSTREAM_TCC 1
-
-#pragma GCC system_header
-
-#include <sstream>
-
-namespace std
-{
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::int_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    pbackfail(int_type __c)
-    {
-      int_type __ret = traits_type::eof();
-      const bool __testeof = traits_type::eq_int_type(__c, __ret);
-
-      if (this->eback() < this->gptr())
-	{
-	  const bool __testeq = traits_type::eq(traits_type::to_char_type(__c),
-						this->gptr()[-1]);
-	  this->gbump(-1);
-
-	  // Try to put back __c into input sequence in one of three ways.
-	  // Order these tests done in is unspecified by the standard.
-	  if (!__testeof && __testeq)
-	    __ret = __c;
-	  else if (__testeof)
-	    __ret = traits_type::not_eof(__c);
-	  else
-	    {
-	      *this->gptr() = traits_type::to_char_type(__c);
-	      __ret = __c;
-	    }
-	}
-      return __ret;
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::int_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    overflow(int_type __c)
-    {
-      const bool __testout = this->_M_mode & ios_base::out;
-      if (__builtin_expect(!__testout, false))
-	return traits_type::eof();
-
-      const bool __testeof = traits_type::eq_int_type(__c, traits_type::eof());
-      if (__builtin_expect(__testeof, false))
-	return traits_type::not_eof(__c);
-
-      const __size_type __capacity = _M_string.capacity();
-      const __size_type __max_size = _M_string.max_size();
-      const bool __testput = this->pptr() < this->epptr();
-      if (__builtin_expect(!__testput && __capacity == __max_size, false))
-	return traits_type::eof();
-
-      // Try to append __c into output sequence in one of two ways.
-      // Order these tests done in is unspecified by the standard.
-      if (!__testput)
-	{
-	  // NB: Start ostringstream buffers at 512 chars. This is an
-	  // experimental value (pronounced "arbitrary" in some of the
-	  // hipper english-speaking countries), and can be changed to
-	  // suit particular needs.
-	  // Then, in virtue of DR 169 (TC) we are allowed to grow more
-	  // than one char.
-	  const __size_type __opt_len = std::max(__size_type(2 * __capacity),
-						 __size_type(512));
-	  const __size_type __len = std::min(__opt_len, __max_size);
-	  __string_type __tmp;
-	  __tmp.reserve(__len);
-	  __tmp.assign(_M_string.data(), this->epptr() - this->pbase());
-	  _M_string.swap(__tmp);
-	  _M_sync(const_cast<char_type*>(_M_string.data()),
-		  this->gptr() - this->eback(), this->pptr() - this->pbase());
-	}
-      return this->sputc(traits_type::to_char_type(__c));
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::int_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    underflow()
-    {
-      int_type __ret = traits_type::eof();
-      const bool __testin = this->_M_mode & ios_base::in;
-      if (__testin)
-	{
-	  // Update egptr() to match the actual string end.
-	  _M_update_egptr();
-
-	  if (this->gptr() < this->egptr())
-	    __ret = traits_type::to_int_type(*this->gptr());
-	}
-      return __ret;
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::pos_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    seekoff(off_type __off, ios_base::seekdir __way, ios_base::openmode __mode)
-    {
-      pos_type __ret =  pos_type(off_type(-1));
-      bool __testin = (ios_base::in & this->_M_mode & __mode) != 0;
-      bool __testout = (ios_base::out & this->_M_mode & __mode) != 0;
-      const bool __testboth = __testin && __testout && __way != ios_base::cur;
-      __testin &= !(__mode & ios_base::out);
-      __testout &= !(__mode & ios_base::in);
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 453. basic_stringbuf::seekoff need not always fail for an empty stream.
-      const char_type* __beg = __testin ? this->eback() : this->pbase();
-      if ((__beg || !__off) && (__testin || __testout || __testboth))
-	{
-	  _M_update_egptr();
-
-	  off_type __newoffi = 0;
-	  off_type __newoffo = 0;
-	  if (__way == ios_base::cur)
-	    {
-	      __newoffi = this->gptr() - __beg;
-	      __newoffo = this->pptr() - __beg;
-	    }
-	  else if (__way == ios_base::end)
-	    __newoffo = __newoffi = this->egptr() - __beg;
-
-	  if ((__testin || __testboth)
-	      && __newoffi + __off >= 0
-	      && this->egptr() - __beg >= __newoffi + __off)
-	    {
-	      this->gbump((__beg + __newoffi + __off) - this->gptr());
-	      __ret = pos_type(__newoffi);
-	    }
-	  if ((__testout || __testboth)
-	      && __newoffo + __off >= 0
-	      && this->egptr() - __beg >= __newoffo + __off)
-	    {
-	      this->pbump((__beg + __newoffo + __off) - this->pptr());
-	      __ret = pos_type(__newoffo);
-	    }
-	}
-      return __ret;
-    }
-
-  template <class _CharT, class _Traits, class _Alloc>
-    typename basic_stringbuf<_CharT, _Traits, _Alloc>::pos_type
-    basic_stringbuf<_CharT, _Traits, _Alloc>::
-    seekpos(pos_type __sp, ios_base::openmode __mode)
-    {
-      pos_type __ret =  pos_type(off_type(-1));
-      const bool __testin = (ios_base::in & this->_M_mode & __mode) != 0;
-      const bool __testout = (ios_base::out & this->_M_mode & __mode) != 0;
-
-      const char_type* __beg = __testin ? this->eback() : this->pbase();
-      if (__beg)
-	{
-	  _M_update_egptr();
-
-	  off_type __pos(__sp);
-	  const bool __testpos = 0 <= __pos
-	                         && __pos <=  this->egptr() - __beg;
-	  if ((__testin || __testout) && __testpos)
-	    {
-	      if (__testin)
-		this->gbump((__beg + __pos) - this->gptr());
-	      if (__testout)
-                this->pbump((__beg + __pos) - this->pptr());
-	      __ret = __sp;
-	    }
-	}
-      return __ret;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB:  This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_stringbuf<char>;
-  extern template class basic_istringstream<char>;
-  extern template class basic_ostringstream<char>;
-  extern template class basic_stringstream<char>;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_stringbuf<wchar_t>;
-  extern template class basic_istringstream<wchar_t>;
-  extern template class basic_ostringstream<wchar_t>;
-  extern template class basic_stringstream<wchar_t>;
-#endif
-#endif
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/stl_algo.h b/include.new/c++/3.4/bits/stl_algo.h
deleted file mode 100644
index 74956d7..0000000
--- a/include.new/c++/3.4/bits/stl_algo.h
+++ /dev/null
@@ -1,5148 +0,0 @@
-// Algorithm implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_algo.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _ALGO_H
-#define _ALGO_H 1
-
-#include <bits/stl_heap.h>
-#include <bits/stl_tempbuf.h>     // for _Temporary_buffer
-#include <debug/debug.h>
-
-// See concept_check.h for the __glibcxx_*_requires macros.
-
-namespace std
-{
-  /**
-   *  @brief Find the median of three values.
-   *  @param  a  A value.
-   *  @param  b  A value.
-   *  @param  c  A value.
-   *  @return One of @p a, @p b or @p c.
-   *
-   *  If @c {l,m,n} is some convolution of @p {a,b,c} such that @c l<=m<=n
-   *  then the value returned will be @c m.
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-  */
-  template<typename _Tp>
-    inline const _Tp&
-    __median(const _Tp& __a, const _Tp& __b, const _Tp& __c)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      if (__a < __b)
-	if (__b < __c)
-	  return __b;
-	else if (__a < __c)
-	  return __c;
-	else
-	  return __a;
-      else if (__a < __c)
-	return __a;
-      else if (__b < __c)
-	return __c;
-      else
-	return __b;
-    }
-
-  /**
-   *  @brief Find the median of three values using a predicate for comparison.
-   *  @param  a     A value.
-   *  @param  b     A value.
-   *  @param  c     A value.
-   *  @param  comp  A binary predicate.
-   *  @return One of @p a, @p b or @p c.
-   *
-   *  If @c {l,m,n} is some convolution of @p {a,b,c} such that @p comp(l,m)
-   *  and @p comp(m,n) are both true then the value returned will be @c m.
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-  */
-  template<typename _Tp, typename _Compare>
-    inline const _Tp&
-    __median(const _Tp& __a, const _Tp& __b, const _Tp& __c, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BinaryFunctionConcept<_Compare,bool,_Tp,_Tp>)
-      if (__comp(__a, __b))
-	if (__comp(__b, __c))
-	  return __b;
-	else if (__comp(__a, __c))
-	  return __c;
-	else
-	  return __a;
-      else if (__comp(__a, __c))
-	return __a;
-      else if (__comp(__b, __c))
-	return __c;
-      else
-	return __b;
-    }
-
-  /**
-   *  @brief Apply a function to every element of a sequence.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  f      A unary function object.
-   *  @return   @p f.
-   *
-   *  Applies the function object @p f to each element in the range
-   *  @p [first,last).  @p f must not modify the order of the sequence.
-   *  If @p f has a return value it is ignored.
-  */
-  template<typename _InputIterator, typename _Function>
-    _Function
-    for_each(_InputIterator __first, _InputIterator __last, _Function __f)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      for ( ; __first != __last; ++__first)
-	__f(*__first);
-      return __f;
-    }
-
-  /**
-   *  @if maint
-   *  This is an overload used by find() for the Input Iterator case.
-   *  @endif
-  */
-  template<typename _InputIterator, typename _Tp>
-    inline _InputIterator
-    find(_InputIterator __first, _InputIterator __last,
-	 const _Tp& __val, input_iterator_tag)
-    {
-      while (__first != __last && !(*__first == __val))
-	++__first;
-      return __first;
-    }
-
-  /**
-   *  @if maint
-   *  This is an overload used by find_if() for the Input Iterator case.
-   *  @endif
-  */
-  template<typename _InputIterator, typename _Predicate>
-    inline _InputIterator
-    find_if(_InputIterator __first, _InputIterator __last,
-	    _Predicate __pred, input_iterator_tag)
-    {
-      while (__first != __last && !__pred(*__first))
-	++__first;
-      return __first;
-    }
-
-  /**
-   *  @if maint
-   *  This is an overload used by find() for the RAI case.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Tp>
-    _RandomAccessIterator
-    find(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	 const _Tp& __val, random_access_iterator_tag)
-    {
-      typename iterator_traits<_RandomAccessIterator>::difference_type
-	__trip_count = (__last - __first) >> 2;
-
-      for ( ; __trip_count > 0 ; --__trip_count)
-	{
-	  if (*__first == __val)
-	    return __first;
-	  ++__first;
-
-	  if (*__first == __val)
-	    return __first;
-	  ++__first;
-
-	  if (*__first == __val)
-	    return __first;
-	  ++__first;
-
-	  if (*__first == __val)
-	    return __first;
-	  ++__first;
-	}
-
-      switch (__last - __first)
-	{
-	case 3:
-	  if (*__first == __val)
-	    return __first;
-	  ++__first;
-	case 2:
-	  if (*__first == __val)
-	    return __first;
-	  ++__first;
-	case 1:
-	  if (*__first == __val)
-	    return __first;
-	  ++__first;
-	case 0:
-	default:
-	  return __last;
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is an overload used by find_if() for the RAI case.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Predicate>
-    _RandomAccessIterator
-    find_if(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	    _Predicate __pred, random_access_iterator_tag)
-    {
-      typename iterator_traits<_RandomAccessIterator>::difference_type
-	__trip_count = (__last - __first) >> 2;
-
-      for ( ; __trip_count > 0 ; --__trip_count)
-	{
-	  if (__pred(*__first))
-	    return __first;
-	  ++__first;
-
-	  if (__pred(*__first))
-	    return __first;
-	  ++__first;
-
-	  if (__pred(*__first))
-	    return __first;
-	  ++__first;
-
-	  if (__pred(*__first))
-	    return __first;
-	  ++__first;
-	}
-
-      switch (__last - __first)
-	{
-	case 3:
-	  if (__pred(*__first))
-	    return __first;
-	  ++__first;
-	case 2:
-	  if (__pred(*__first))
-	    return __first;
-	  ++__first;
-	case 1:
-	  if (__pred(*__first))
-	    return __first;
-	  ++__first;
-	case 0:
-	default:
-	  return __last;
-	}
-    }
-
-  /**
-   *  @brief Find the first occurrence of a value in a sequence.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  val    The value to find.
-   *  @return   The first iterator @c i in the range @p [first,last)
-   *  such that @c *i == @p val, or @p last if no such iterator exists.
-  */
-  template<typename _InputIterator, typename _Tp>
-    inline _InputIterator
-    find(_InputIterator __first, _InputIterator __last,
-	 const _Tp& __val)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-		typename iterator_traits<_InputIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-      return std::find(__first, __last, __val,
-		       std::__iterator_category(__first));
-    }
-
-  /**
-   *  @brief Find the first element in a sequence for which a predicate is true.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  pred   A predicate.
-   *  @return   The first iterator @c i in the range @p [first,last)
-   *  such that @p pred(*i) is true, or @p last if no such iterator exists.
-  */
-  template<typename _InputIterator, typename _Predicate>
-    inline _InputIterator
-    find_if(_InputIterator __first, _InputIterator __last,
-	    _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	      typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-      return std::find_if(__first, __last, __pred,
-			  std::__iterator_category(__first));
-    }
-
-  /**
-   *  @brief Find two adjacent values in a sequence that are equal.
-   *  @param  first  A forward iterator.
-   *  @param  last   A forward iterator.
-   *  @return   The first iterator @c i such that @c i and @c i+1 are both
-   *  valid iterators in @p [first,last) and such that @c *i == @c *(i+1),
-   *  or @p last if no such iterator exists.
-  */
-  template<typename _ForwardIterator>
-    _ForwardIterator
-    adjacent_find(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-      if (__first == __last)
-	return __last;
-      _ForwardIterator __next = __first;
-      while(++__next != __last)
-	{
-	  if (*__first == *__next)
-	    return __first;
-	  __first = __next;
-	}
-      return __last;
-    }
-
-  /**
-   *  @brief Find two adjacent values in a sequence using a predicate.
-   *  @param  first         A forward iterator.
-   *  @param  last          A forward iterator.
-   *  @param  binary_pred   A binary predicate.
-   *  @return   The first iterator @c i such that @c i and @c i+1 are both
-   *  valid iterators in @p [first,last) and such that
-   *  @p binary_pred(*i,*(i+1)) is true, or @p last if no such iterator
-   *  exists.
-  */
-  template<typename _ForwardIterator, typename _BinaryPredicate>
-    _ForwardIterator
-    adjacent_find(_ForwardIterator __first, _ForwardIterator __last,
-		  _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-      if (__first == __last)
-	return __last;
-      _ForwardIterator __next = __first;
-      while(++__next != __last)
-	{
-	  if (__binary_pred(*__first, *__next))
-	    return __first;
-	  __first = __next;
-	}
-      return __last;
-    }
-
-  /**
-   *  @brief Count the number of copies of a value in a sequence.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  value  The value to be counted.
-   *  @return   The number of iterators @c i in the range @p [first,last)
-   *  for which @c *i == @p value
-  */
-  template<typename _InputIterator, typename _Tp>
-    typename iterator_traits<_InputIterator>::difference_type
-    count(_InputIterator __first, _InputIterator __last, const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_InputIterator>::value_type >)
-      __glibcxx_function_requires(_EqualityComparableConcept<_Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-      typename iterator_traits<_InputIterator>::difference_type __n = 0;
-      for ( ; __first != __last; ++__first)
-	if (*__first == __value)
-	  ++__n;
-      return __n;
-    }
-
-  /**
-   *  @brief Count the elements of a sequence for which a predicate is true.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  pred   A predicate.
-   *  @return   The number of iterators @c i in the range @p [first,last)
-   *  for which @p pred(*i) is true.
-  */
-  template<typename _InputIterator, typename _Predicate>
-    typename iterator_traits<_InputIterator>::difference_type
-    count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-      typename iterator_traits<_InputIterator>::difference_type __n = 0;
-      for ( ; __first != __last; ++__first)
-	if (__pred(*__first))
-	  ++__n;
-      return __n;
-    }
-
-  /**
-   *  @brief Search a sequence for a matching sub-sequence.
-   *  @param  first1  A forward iterator.
-   *  @param  last1   A forward iterator.
-   *  @param  first2  A forward iterator.
-   *  @param  last2   A forward iterator.
-   *  @return   The first iterator @c i in the range
-   *  @p [first1,last1-(last2-first2)) such that @c *(i+N) == @p *(first2+N)
-   *  for each @c N in the range @p [0,last2-first2), or @p last1 if no
-   *  such iterator exists.
-   *
-   *  Searches the range @p [first1,last1) for a sub-sequence that compares
-   *  equal value-by-value with the sequence given by @p [first2,last2) and
-   *  returns an iterator to the first element of the sub-sequence, or
-   *  @p last1 if the sub-sequence is not found.
-   *
-   *  Because the sub-sequence must lie completely within the range
-   *  @p [first1,last1) it must start at a position less than
-   *  @p last1-(last2-first2) where @p last2-first2 is the length of the
-   *  sub-sequence.
-   *  This means that the returned iterator @c i will be in the range
-   *  @p [first1,last1-(last2-first2))
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    _ForwardIterator1
-    search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	   _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-      // Test for empty ranges
-      if (__first1 == __last1 || __first2 == __last2)
-	return __first1;
-
-      // Test for a pattern of length 1.
-      _ForwardIterator2 __tmp(__first2);
-      ++__tmp;
-      if (__tmp == __last2)
-	return std::find(__first1, __last1, *__first2);
-
-      // General case.
-      _ForwardIterator2 __p1, __p;
-      __p1 = __first2; ++__p1;
-      _ForwardIterator1 __current = __first1;
-
-      while (__first1 != __last1)
-	{
-	  __first1 = std::find(__first1, __last1, *__first2);
-	  if (__first1 == __last1)
-	    return __last1;
-
-	  __p = __p1;
-	  __current = __first1;
-	  if (++__current == __last1)
-	    return __last1;
-
-	  while (*__current == *__p)
-	    {
-	      if (++__p == __last2)
-		return __first1;
-	      if (++__current == __last1)
-		return __last1;
-	    }
-	  ++__first1;
-	}
-      return __first1;
-    }
-
-  /**
-   *  @brief Search a sequence for a matching sub-sequence using a predicate.
-   *  @param  first1     A forward iterator.
-   *  @param  last1      A forward iterator.
-   *  @param  first2     A forward iterator.
-   *  @param  last2      A forward iterator.
-   *  @param  predicate  A binary predicate.
-   *  @return   The first iterator @c i in the range
-   *  @p [first1,last1-(last2-first2)) such that
-   *  @p predicate(*(i+N),*(first2+N)) is true for each @c N in the range
-   *  @p [0,last2-first2), or @p last1 if no such iterator exists.
-   *
-   *  Searches the range @p [first1,last1) for a sub-sequence that compares
-   *  equal value-by-value with the sequence given by @p [first2,last2),
-   *  using @p predicate to determine equality, and returns an iterator
-   *  to the first element of the sub-sequence, or @p last1 if no such
-   *  iterator exists.
-   *
-   *  @see search(_ForwardIter1, _ForwardIter1, _ForwardIter2, _ForwardIter2)
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    _ForwardIterator1
-    search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	   _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-	   _BinaryPredicate  __predicate)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      // Test for empty ranges
-      if (__first1 == __last1 || __first2 == __last2)
-	return __first1;
-
-      // Test for a pattern of length 1.
-      _ForwardIterator2 __tmp(__first2);
-      ++__tmp;
-      if (__tmp == __last2)
-	{
-	  while (__first1 != __last1 && !__predicate(*__first1, *__first2))
-	    ++__first1;
-	  return __first1;
-	}
-
-      // General case.
-      _ForwardIterator2 __p1, __p;
-      __p1 = __first2; ++__p1;
-      _ForwardIterator1 __current = __first1;
-
-      while (__first1 != __last1)
-	{
-	  while (__first1 != __last1)
-	    {
-	      if (__predicate(*__first1, *__first2))
-		break;
-	      ++__first1;
-	    }
-	  while (__first1 != __last1 && !__predicate(*__first1, *__first2))
-	    ++__first1;
-	  if (__first1 == __last1)
-	    return __last1;
-
-	  __p = __p1;
-	  __current = __first1;
-	  if (++__current == __last1)
-	    return __last1;
-
-	  while (__predicate(*__current, *__p))
-	    {
-	      if (++__p == __last2)
-		return __first1;
-	      if (++__current == __last1)
-		return __last1;
-	    }
-	  ++__first1;
-	}
-      return __first1;
-    }
-
-  /**
-   *  @brief Search a sequence for a number of consecutive values.
-   *  @param  first  A forward iterator.
-   *  @param  last   A forward iterator.
-   *  @param  count  The number of consecutive values.
-   *  @param  val    The value to find.
-   *  @return   The first iterator @c i in the range @p [first,last-count)
-   *  such that @c *(i+N) == @p val for each @c N in the range @p [0,count),
-   *  or @p last if no such iterator exists.
-   *
-   *  Searches the range @p [first,last) for @p count consecutive elements
-   *  equal to @p val.
-  */
-  template<typename _ForwardIterator, typename _Integer, typename _Tp>
-    _ForwardIterator
-    search_n(_ForwardIterator __first, _ForwardIterator __last,
-	     _Integer __count, const _Tp& __val)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_function_requires(_EqualityComparableConcept<_Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__count <= 0)
-	return __first;
-      else
-	{
-	  __first = std::find(__first, __last, __val);
-	  while (__first != __last)
-	    {
-	      typename iterator_traits<_ForwardIterator>::difference_type
-		__n = __count;
-	      _ForwardIterator __i = __first;
-	      ++__i;
-	      while (__i != __last && __n != 1 && *__i == __val)
-		{
-		  ++__i;
-		  --__n;
-		}
-	      if (__n == 1)
-		return __first;
-	      else
-		__first = std::find(__i, __last, __val);
-	    }
-	  return __last;
-	}
-    }
-
-  /**
-   *  @brief Search a sequence for a number of consecutive values using a
-   *         predicate.
-   *  @param  first        A forward iterator.
-   *  @param  last         A forward iterator.
-   *  @param  count        The number of consecutive values.
-   *  @param  val          The value to find.
-   *  @param  binary_pred  A binary predicate.
-   *  @return   The first iterator @c i in the range @p [first,last-count)
-   *  such that @p binary_pred(*(i+N),val) is true for each @c N in the
-   *  range @p [0,count), or @p last if no such iterator exists.
-   *
-   *  Searches the range @p [first,last) for @p count consecutive elements
-   *  for which the predicate returns true.
-  */
-  template<typename _ForwardIterator, typename _Integer, typename _Tp,
-           typename _BinaryPredicate>
-    _ForwardIterator
-    search_n(_ForwardIterator __first, _ForwardIterator __last,
-	     _Integer __count, const _Tp& __val,
-	     _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__count <= 0)
-	return __first;
-      else
-	{
-	  while (__first != __last)
-	    {
-	      if (__binary_pred(*__first, __val))
-		break;
-	      ++__first;
-	    }
-	  while (__first != __last)
-	    {
-	      typename iterator_traits<_ForwardIterator>::difference_type
-		__n = __count;
-	      _ForwardIterator __i = __first;
-	      ++__i;
-	      while (__i != __last && __n != 1 && __binary_pred(*__i, __val))
-		{
-		  ++__i;
-		  --__n;
-		}
-	      if (__n == 1)
-		return __first;
-	      else
-		{
-		  while (__i != __last)
-		    {
-		      if (__binary_pred(*__i, __val))
-			break;
-		      ++__i;
-		    }
-		  __first = __i;
-		}
-	    }
-	  return __last;
-	}
-    }
-
-  /**
-   *  @brief Swap the elements of two sequences.
-   *  @param  first1  A forward iterator.
-   *  @param  last1   A forward iterator.
-   *  @param  first2  A forward iterator.
-   *  @return   An iterator equal to @p first2+(last1-first1).
-   *
-   *  Swaps each element in the range @p [first1,last1) with the
-   *  corresponding element in the range @p [first2,(last1-first1)).
-   *  The ranges must not overlap.
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    _ForwardIterator2
-    swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-		_ForwardIterator2 __first2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator1>)
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator2>)
-      __glibcxx_function_requires(_ConvertibleConcept<
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_function_requires(_ConvertibleConcept<
-	    typename iterator_traits<_ForwardIterator2>::value_type,
-	    typename iterator_traits<_ForwardIterator1>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for ( ; __first1 != __last1; ++__first1, ++__first2)
-	std::iter_swap(__first1, __first2);
-      return __first2;
-    }
-
-  /**
-   *  @brief Perform an operation on a sequence.
-   *  @param  first     An input iterator.
-   *  @param  last      An input iterator.
-   *  @param  result    An output iterator.
-   *  @param  unary_op  A unary operator.
-   *  @return   An output iterator equal to @p result+(last-first).
-   *
-   *  Applies the operator to each element in the input range and assigns
-   *  the results to successive elements of the output sequence.
-   *  Evaluates @p *(result+N)=unary_op(*(first+N)) for each @c N in the
-   *  range @p [0,last-first).
-   *
-   *  @p unary_op must not alter its argument.
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _UnaryOperation>
-    _OutputIterator
-    transform(_InputIterator __first, _InputIterator __last,
-	      _OutputIterator __result, _UnaryOperation __unary_op)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-            // "the type returned by a _UnaryOperation"
-            __typeof__(__unary_op(*__first))>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first, ++__result)
-	*__result = __unary_op(*__first);
-      return __result;
-    }
-
-  /**
-   *  @brief Perform an operation on corresponding elements of two sequences.
-   *  @param  first1     An input iterator.
-   *  @param  last1      An input iterator.
-   *  @param  first2     An input iterator.
-   *  @param  result     An output iterator.
-   *  @param  binary_op  A binary operator.
-   *  @return   An output iterator equal to @p result+(last-first).
-   *
-   *  Applies the operator to the corresponding elements in the two
-   *  input ranges and assigns the results to successive elements of the
-   *  output sequence.
-   *  Evaluates @p *(result+N)=binary_op(*(first1+N),*(first2+N)) for each
-   *  @c N in the range @p [0,last1-first1).
-   *
-   *  @p binary_op must not alter either of its arguments.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _BinaryOperation>
-    _OutputIterator
-    transform(_InputIterator1 __first1, _InputIterator1 __last1,
-	      _InputIterator2 __first2, _OutputIterator __result,
-	      _BinaryOperation __binary_op)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-            // "the type returned by a _BinaryOperation"
-            __typeof__(__binary_op(*__first1,*__first2))>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for ( ; __first1 != __last1; ++__first1, ++__first2, ++__result)
-	*__result = __binary_op(*__first1, *__first2);
-      return __result;
-    }
-
-  /**
-   *  @brief Replace each occurrence of one value in a sequence with another
-   *         value.
-   *  @param  first      A forward iterator.
-   *  @param  last       A forward iterator.
-   *  @param  old_value  The value to be replaced.
-   *  @param  new_value  The replacement value.
-   *  @return   replace() returns no value.
-   *
-   *  For each iterator @c i in the range @p [first,last) if @c *i ==
-   *  @p old_value then the assignment @c *i = @p new_value is performed.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    void
-    replace(_ForwardIterator __first, _ForwardIterator __last,
-	    const _Tp& __old_value, const _Tp& __new_value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	if (*__first == __old_value)
-	  *__first = __new_value;
-    }
-
-  /**
-   *  @brief Replace each value in a sequence for which a predicate returns
-   *         true with another value.
-   *  @param  first      A forward iterator.
-   *  @param  last       A forward iterator.
-   *  @param  pred       A predicate.
-   *  @param  new_value  The replacement value.
-   *  @return   replace_if() returns no value.
-   *
-   *  For each iterator @c i in the range @p [first,last) if @p pred(*i)
-   *  is true then the assignment @c *i = @p new_value is performed.
-  */
-  template<typename _ForwardIterator, typename _Predicate, typename _Tp>
-    void
-    replace_if(_ForwardIterator __first, _ForwardIterator __last,
-	       _Predicate __pred, const _Tp& __new_value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	if (__pred(*__first))
-	  *__first = __new_value;
-    }
-
-  /**
-   *  @brief Copy a sequence, replacing each element of one value with another
-   *         value.
-   *  @param  first      An input iterator.
-   *  @param  last       An input iterator.
-   *  @param  result     An output iterator.
-   *  @param  old_value  The value to be replaced.
-   *  @param  new_value  The replacement value.
-   *  @return   The end of the output sequence, @p result+(last-first).
-   *
-   *  Copies each element in the input range @p [first,last) to the
-   *  output range @p [result,result+(last-first)) replacing elements
-   *  equal to @p old_value with @p new_value.
-  */
-  template<typename _InputIterator, typename _OutputIterator, typename _Tp>
-    _OutputIterator
-    replace_copy(_InputIterator __first, _InputIterator __last,
-		 _OutputIterator __result,
-		 const _Tp& __old_value, const _Tp& __new_value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first, ++__result)
-	*__result = *__first == __old_value ? __new_value : *__first;
-      return __result;
-    }
-
-  /**
-   *  @brief Copy a sequence, replacing each value for which a predicate
-   *         returns true with another value.
-   *  @param  first      An input iterator.
-   *  @param  last       An input iterator.
-   *  @param  result     An output iterator.
-   *  @param  pred       A predicate.
-   *  @param  new_value  The replacement value.
-   *  @return   The end of the output sequence, @p result+(last-first).
-   *
-   *  Copies each element in the range @p [first,last) to the range
-   *  @p [result,result+(last-first)) replacing elements for which
-   *  @p pred returns true with @p new_value.
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _Predicate, typename _Tp>
-    _OutputIterator
-    replace_copy_if(_InputIterator __first, _InputIterator __last,
-		    _OutputIterator __result,
-		    _Predicate __pred, const _Tp& __new_value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first, ++__result)
-	*__result = __pred(*__first) ? __new_value : *__first;
-      return __result;
-    }
-
-  /**
-   *  @brief Assign the result of a function object to each value in a
-   *         sequence.
-   *  @param  first  A forward iterator.
-   *  @param  last   A forward iterator.
-   *  @param  gen    A function object taking no arguments.
-   *  @return   generate() returns no value.
-   *
-   *  Performs the assignment @c *i = @p gen() for each @c i in the range
-   *  @p [first,last).
-  */
-  template<typename _ForwardIterator, typename _Generator>
-    void
-    generate(_ForwardIterator __first, _ForwardIterator __last,
-	     _Generator __gen)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_GeneratorConcept<_Generator,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	*__first = __gen();
-    }
-
-  /**
-   *  @brief Assign the result of a function object to each value in a
-   *         sequence.
-   *  @param  first  A forward iterator.
-   *  @param  n      The length of the sequence.
-   *  @param  gen    A function object taking no arguments.
-   *  @return   The end of the sequence, @p first+n
-   *
-   *  Performs the assignment @c *i = @p gen() for each @c i in the range
-   *  @p [first,first+n).
-  */
-  template<typename _OutputIterator, typename _Size, typename _Generator>
-    _OutputIterator
-    generate_n(_OutputIterator __first, _Size __n, _Generator __gen)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-            // "the type returned by a _Generator"
-            __typeof__(__gen())>)
-
-      for ( ; __n > 0; --__n, ++__first)
-	*__first = __gen();
-      return __first;
-    }
-
-  /**
-   *  @brief Copy a sequence, removing elements of a given value.
-   *  @param  first   An input iterator.
-   *  @param  last    An input iterator.
-   *  @param  result  An output iterator.
-   *  @param  value   The value to be removed.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies each element in the range @p [first,last) not equal to @p value
-   *  to the range beginning at @p result.
-   *  remove_copy() is stable, so the relative order of elements that are
-   *  copied is unchanged.
-  */
-  template<typename _InputIterator, typename _OutputIterator, typename _Tp>
-    _OutputIterator
-    remove_copy(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result, const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	if (!(*__first == __value))
-	  {
-	    *__result = *__first;
-	    ++__result;
-	  }
-      return __result;
-    }
-
-  /**
-   *  @brief Copy a sequence, removing elements for which a predicate is true.
-   *  @param  first   An input iterator.
-   *  @param  last    An input iterator.
-   *  @param  result  An output iterator.
-   *  @param  pred    A predicate.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies each element in the range @p [first,last) for which
-   *  @p pred returns true to the range beginning at @p result.
-   *
-   *  remove_copy_if() is stable, so the relative order of elements that are
-   *  copied is unchanged.
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _Predicate>
-    _OutputIterator
-    remove_copy_if(_InputIterator __first, _InputIterator __last,
-		   _OutputIterator __result, _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	if (!__pred(*__first))
-	  {
-	    *__result = *__first;
-	    ++__result;
-	  }
-      return __result;
-    }
-
-  /**
-   *  @brief Remove elements from a sequence.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  value  The value to be removed.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  All elements equal to @p value are removed from the range
-   *  @p [first,last).
-   *
-   *  remove() is stable, so the relative order of elements that are
-   *  not removed is unchanged.
-   *
-   *  Elements between the end of the resulting sequence and @p last
-   *  are still present, but their value is unspecified.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    _ForwardIterator
-    remove(_ForwardIterator __first, _ForwardIterator __last,
-	   const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      __first = std::find(__first, __last, __value);
-      _ForwardIterator __i = __first;
-      return __first == __last ? __first
-			       : std::remove_copy(++__i, __last,
-						  __first, __value);
-    }
-
-  /**
-   *  @brief Remove elements from a sequence using a predicate.
-   *  @param  first  A forward iterator.
-   *  @param  last   A forward iterator.
-   *  @param  pred   A predicate.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  All elements for which @p pred returns true are removed from the range
-   *  @p [first,last).
-   *
-   *  remove_if() is stable, so the relative order of elements that are
-   *  not removed is unchanged.
-   *
-   *  Elements between the end of the resulting sequence and @p last
-   *  are still present, but their value is unspecified.
-  */
-  template<typename _ForwardIterator, typename _Predicate>
-    _ForwardIterator
-    remove_if(_ForwardIterator __first, _ForwardIterator __last,
-	      _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      __first = std::find_if(__first, __last, __pred);
-      _ForwardIterator __i = __first;
-      return __first == __last ? __first
-			       : std::remove_copy_if(++__i, __last,
-						     __first, __pred);
-    }
-
-  /**
-   *  @if maint
-   *  This is an uglified unique_copy(_InputIterator, _InputIterator,
-   *                                  _OutputIterator)
-   *  overloaded for output iterators.
-   *  @endif
-  */
-  template<typename _InputIterator, typename _OutputIterator>
-    _OutputIterator
-    __unique_copy(_InputIterator __first, _InputIterator __last,
-		  _OutputIterator __result,
-		  output_iterator_tag)
-    {
-      // concept requirements -- taken care of in dispatching function
-      typename iterator_traits<_InputIterator>::value_type __value = *__first;
-      *__result = __value;
-      while (++__first != __last)
-	if (!(__value == *__first))
-	  {
-	    __value = *__first;
-	    *++__result = __value;
-	  }
-      return ++__result;
-    }
-
-  /**
-   *  @if maint
-   *  This is an uglified unique_copy(_InputIterator, _InputIterator,
-   *                                  _OutputIterator)
-   *  overloaded for forward iterators.
-   *  @endif
-  */
-  template<typename _InputIterator, typename _ForwardIterator>
-    _ForwardIterator
-    __unique_copy(_InputIterator __first, _InputIterator __last,
-		  _ForwardIterator __result,
-		  forward_iterator_tag)
-    {
-      // concept requirements -- taken care of in dispatching function
-      *__result = *__first;
-      while (++__first != __last)
-	if (!(*__result == *__first))
-	  *++__result = *__first;
-      return ++__result;
-    }
-
-  /**
-   *  @if maint
-   *  This is an uglified
-   *  unique_copy(_InputIterator, _InputIterator, _OutputIterator,
-   *              _BinaryPredicate)
-   *  overloaded for output iterators.
-   *  @endif
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _BinaryPredicate>
-    _OutputIterator
-    __unique_copy(_InputIterator __first, _InputIterator __last,
-		  _OutputIterator __result,
-		  _BinaryPredicate __binary_pred,
-		  output_iterator_tag)
-    {
-      // concept requirements -- iterators already checked
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	  typename iterator_traits<_InputIterator>::value_type,
-	  typename iterator_traits<_InputIterator>::value_type>)
-
-      typename iterator_traits<_InputIterator>::value_type __value = *__first;
-      *__result = __value;
-      while (++__first != __last)
-	if (!__binary_pred(__value, *__first))
-	  {
-	    __value = *__first;
-	    *++__result = __value;
-	  }
-      return ++__result;
-    }
-
-  /**
-   *  @if maint
-   *  This is an uglified
-   *  unique_copy(_InputIterator, _InputIterator, _OutputIterator,
-   *              _BinaryPredicate)
-   *  overloaded for forward iterators.
-   *  @endif
-  */
-  template<typename _InputIterator, typename _ForwardIterator,
-	   typename _BinaryPredicate>
-    _ForwardIterator
-    __unique_copy(_InputIterator __first, _InputIterator __last,
-		  _ForwardIterator __result,
-		  _BinaryPredicate __binary_pred,
-		  forward_iterator_tag)
-    {
-      // concept requirements -- iterators already checked
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_InputIterator>::value_type>)
-
-      *__result = *__first;
-      while (++__first != __last)
-	if (!__binary_pred(*__result, *__first)) *++__result = *__first;
-      return ++__result;
-    }
-
-  /**
-   *  @brief Copy a sequence, removing consecutive duplicate values.
-   *  @param  first   An input iterator.
-   *  @param  last    An input iterator.
-   *  @param  result  An output iterator.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies each element in the range @p [first,last) to the range
-   *  beginning at @p result, except that only the first element is copied
-   *  from groups of consecutive elements that compare equal.
-   *  unique_copy() is stable, so the relative order of elements that are
-   *  copied is unchanged.
-  */
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    unique_copy(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      typedef typename iterator_traits<_OutputIterator>::iterator_category
-	_IterType;
-
-      if (__first == __last) return __result;
-      return std::__unique_copy(__first, __last, __result, _IterType());
-    }
-
-  /**
-   *  @brief Copy a sequence, removing consecutive values using a predicate.
-   *  @param  first        An input iterator.
-   *  @param  last         An input iterator.
-   *  @param  result       An output iterator.
-   *  @param  binary_pred  A binary predicate.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies each element in the range @p [first,last) to the range
-   *  beginning at @p result, except that only the first element is copied
-   *  from groups of consecutive elements for which @p binary_pred returns
-   *  true.
-   *  unique_copy() is stable, so the relative order of elements that are
-   *  copied is unchanged.
-  */
-  template<typename _InputIterator, typename _OutputIterator,
-	   typename _BinaryPredicate>
-    inline _OutputIterator
-    unique_copy(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result,
-		_BinaryPredicate __binary_pred)
-    {
-      // concept requirements -- predicates checked later
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      typedef typename iterator_traits<_OutputIterator>::iterator_category
-	_IterType;
-
-      if (__first == __last) return __result;
-      return std::__unique_copy(__first, __last, __result,
-				__binary_pred, _IterType());
-    }
-
-  /**
-   *  @brief Remove consecutive duplicate values from a sequence.
-   *  @param  first  A forward iterator.
-   *  @param  last   A forward iterator.
-   *  @return  An iterator designating the end of the resulting sequence.
-   *
-   *  Removes all but the first element from each group of consecutive
-   *  values that compare equal.
-   *  unique() is stable, so the relative order of elements that are
-   *  not removed is unchanged.
-   *  Elements between the end of the resulting sequence and @p last
-   *  are still present, but their value is unspecified.
-  */
-  template<typename _ForwardIterator>
-    _ForwardIterator
-    unique(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-		     typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      // Skip the beginning, if already unique.
-      __first = std::adjacent_find(__first, __last);
-      if (__first == __last)
-	return __last;
-
-      // Do the real copy work.
-      _ForwardIterator __dest = __first;
-      ++__first;
-      while (++__first != __last)
-	if (!(*__dest == *__first))
-	  *++__dest = *__first;
-      return ++__dest;
-    }
-
-  /**
-   *  @brief Remove consecutive values from a sequence using a predicate.
-   *  @param  first        A forward iterator.
-   *  @param  last         A forward iterator.
-   *  @param  binary_pred  A binary predicate.
-   *  @return  An iterator designating the end of the resulting sequence.
-   *
-   *  Removes all but the first element from each group of consecutive
-   *  values for which @p binary_pred returns true.
-   *  unique() is stable, so the relative order of elements that are
-   *  not removed is unchanged.
-   *  Elements between the end of the resulting sequence and @p last
-   *  are still present, but their value is unspecified.
-  */
-  template<typename _ForwardIterator, typename _BinaryPredicate>
-    _ForwardIterator
-    unique(_ForwardIterator __first, _ForwardIterator __last,
-           _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-		typename iterator_traits<_ForwardIterator>::value_type,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      // Skip the beginning, if already unique.
-      __first = std::adjacent_find(__first, __last, __binary_pred);
-      if (__first == __last)
-	return __last;
-
-      // Do the real copy work.
-      _ForwardIterator __dest = __first;
-      ++__first;
-      while (++__first != __last)
-	if (!__binary_pred(*__dest, *__first))
-	  *++__dest = *__first;
-      return ++__dest;
-    }
-
-  /**
-   *  @if maint
-   *  This is an uglified reverse(_BidirectionalIterator,
-   *                              _BidirectionalIterator)
-   *  overloaded for bidirectional iterators.
-   *  @endif
-  */
-  template<typename _BidirectionalIterator>
-    void
-    __reverse(_BidirectionalIterator __first, _BidirectionalIterator __last,
-			  bidirectional_iterator_tag)
-    {
-      while (true)
-	if (__first == __last || __first == --__last)
-	  return;
-	else
-	  std::iter_swap(__first++, __last);
-    }
-
-  /**
-   *  @if maint
-   *  This is an uglified reverse(_BidirectionalIterator,
-   *                              _BidirectionalIterator)
-   *  overloaded for bidirectional iterators.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator>
-    void
-    __reverse(_RandomAccessIterator __first, _RandomAccessIterator __last,
-			  random_access_iterator_tag)
-    {
-      while (__first < __last)
-	std::iter_swap(__first++, --__last);
-    }
-
-  /**
-   *  @brief Reverse a sequence.
-   *  @param  first  A bidirectional iterator.
-   *  @param  last   A bidirectional iterator.
-   *  @return   reverse() returns no value.
-   *
-   *  Reverses the order of the elements in the range @p [first,last),
-   *  so that the first element becomes the last etc.
-   *  For every @c i such that @p 0<=i<=(last-first)/2), @p reverse()
-   *  swaps @p *(first+i) and @p *(last-(i+1))
-  */
-  template<typename _BidirectionalIterator>
-    inline void
-    reverse(_BidirectionalIterator __first, _BidirectionalIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
-		    _BidirectionalIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      std::__reverse(__first, __last, std::__iterator_category(__first));
-    }
-
-  /**
-   *  @brief Copy a sequence, reversing its elements.
-   *  @param  first   A bidirectional iterator.
-   *  @param  last    A bidirectional iterator.
-   *  @param  result  An output iterator.
-   *  @return  An iterator designating the end of the resulting sequence.
-   *
-   *  Copies the elements in the range @p [first,last) to the range
-   *  @p [result,result+(last-first)) such that the order of the
-   *  elements is reversed.
-   *  For every @c i such that @p 0<=i<=(last-first), @p reverse_copy()
-   *  performs the assignment @p *(result+(last-first)-i) = *(first+i).
-   *  The ranges @p [first,last) and @p [result,result+(last-first))
-   *  must not overlap.
-  */
-  template<typename _BidirectionalIterator, typename _OutputIterator>
-    _OutputIterator
-    reverse_copy(_BidirectionalIterator __first, _BidirectionalIterator __last,
-			     _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-		typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      while (__first != __last)
-	{
-	  --__last;
-	  *__result = *__last;
-	  ++__result;
-	}
-      return __result;
-    }
-
-
-  /**
-   *  @if maint
-   *  This is a helper function for the rotate algorithm specialized on RAIs.
-   *  It returns the greatest common divisor of two integer values.
-   *  @endif
-  */
-  template<typename _EuclideanRingElement>
-    _EuclideanRingElement
-    __gcd(_EuclideanRingElement __m, _EuclideanRingElement __n)
-    {
-      while (__n != 0)
-	{
-	  _EuclideanRingElement __t = __m % __n;
-	  __m = __n;
-	  __n = __t;
-	}
-      return __m;
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the rotate algorithm.
-   *  @endif
-  */
-  template<typename _ForwardIterator>
-    void
-    __rotate(_ForwardIterator __first,
-	     _ForwardIterator __middle,
-	     _ForwardIterator __last,
-	      forward_iterator_tag)
-    {
-      if ((__first == __middle) || (__last  == __middle))
-	return;
-
-      _ForwardIterator __first2 = __middle;
-      do
-	{
-	  swap(*__first++, *__first2++);
-	  if (__first == __middle)
-	    __middle = __first2;
-	}
-      while (__first2 != __last);
-
-      __first2 = __middle;
-
-      while (__first2 != __last)
-	{
-	  swap(*__first++, *__first2++);
-	  if (__first == __middle)
-	    __middle = __first2;
-	  else if (__first2 == __last)
-	    __first2 = __middle;
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the rotate algorithm.
-   *  @endif
-  */
-  template<typename _BidirectionalIterator>
-    void
-    __rotate(_BidirectionalIterator __first,
-	     _BidirectionalIterator __middle,
-	     _BidirectionalIterator __last,
-	      bidirectional_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
-	    _BidirectionalIterator>)
-
-      if ((__first == __middle) || (__last  == __middle))
-	return;
-
-      std::__reverse(__first,  __middle, bidirectional_iterator_tag());
-      std::__reverse(__middle, __last,   bidirectional_iterator_tag());
-
-      while (__first != __middle && __middle != __last)
-	swap(*__first++, *--__last);
-
-      if (__first == __middle)
-	std::__reverse(__middle, __last,   bidirectional_iterator_tag());
-      else
-	std::__reverse(__first,  __middle, bidirectional_iterator_tag());
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the rotate algorithm.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator>
-    void
-    __rotate(_RandomAccessIterator __first,
-	     _RandomAccessIterator __middle,
-	     _RandomAccessIterator __last,
-	     random_access_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-
-      if ((__first == __middle) || (__last  == __middle))
-	return;
-
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_Distance;
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      const _Distance __n = __last   - __first;
-      const _Distance __k = __middle - __first;
-      const _Distance __l = __n - __k;
-
-      if (__k == __l)
-	{
-	  std::swap_ranges(__first, __middle, __middle);
-	  return;
-	}
-
-      const _Distance __d = __gcd(__n, __k);
-
-      for (_Distance __i = 0; __i < __d; __i++)
-	{
-	  const _ValueType __tmp = *__first;
-	  _RandomAccessIterator __p = __first;
-
-	  if (__k < __l)
-	    {
-	      for (_Distance __j = 0; __j < __l / __d; __j++)
-		{
-		  if (__p > __first + __l)
-		    {
-		      *__p = *(__p - __l);
-		      __p -= __l;
-		    }
-
-		  *__p = *(__p + __k);
-		  __p += __k;
-		}
-	    }
-	  else
-	    {
-	      for (_Distance __j = 0; __j < __k / __d - 1; __j ++)
-		{
-		  if (__p < __last - __k)
-		    {
-		      *__p = *(__p + __k);
-		      __p += __k;
-		    }
-		  *__p = * (__p - __l);
-		  __p -= __l;
-		}
-	    }
-
-	  *__p = __tmp;
-	  ++__first;
-	}
-    }
-
-  /**
-   *  @brief Rotate the elements of a sequence.
-   *  @param  first   A forward iterator.
-   *  @param  middle  A forward iterator.
-   *  @param  last    A forward iterator.
-   *  @return  Nothing.
-   *
-   *  Rotates the elements of the range @p [first,last) by @p (middle-first)
-   *  positions so that the element at @p middle is moved to @p first, the
-   *  element at @p middle+1 is moved to @first+1 and so on for each element
-   *  in the range @p [first,last).
-   *
-   *  This effectively swaps the ranges @p [first,middle) and
-   *  @p [middle,last).
-   *
-   *  Performs @p *(first+(n+(last-middle))%(last-first))=*(first+n) for
-   *  each @p n in the range @p [0,last-first).
-  */
-  template<typename _ForwardIterator>
-    inline void
-    rotate(_ForwardIterator __first, _ForwardIterator __middle,
-	   _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_requires_valid_range(__first, __middle);
-      __glibcxx_requires_valid_range(__middle, __last);
-
-      typedef typename iterator_traits<_ForwardIterator>::iterator_category
-	_IterType;
-      std::__rotate(__first, __middle, __last, _IterType());
-    }
-
-  /**
-   *  @brief Copy a sequence, rotating its elements.
-   *  @param  first   A forward iterator.
-   *  @param  middle  A forward iterator.
-   *  @param  last    A forward iterator.
-   *  @param  result  An output iterator.
-   *  @return   An iterator designating the end of the resulting sequence.
-   *
-   *  Copies the elements of the range @p [first,last) to the range
-   *  beginning at @result, rotating the copied elements by @p (middle-first)
-   *  positions so that the element at @p middle is moved to @p result, the
-   *  element at @p middle+1 is moved to @result+1 and so on for each element
-   *  in the range @p [first,last).
-   *
-   *  Performs @p *(result+(n+(last-middle))%(last-first))=*(first+n) for
-   *  each @p n in the range @p [0,last-first).
-  */
-  template<typename _ForwardIterator, typename _OutputIterator>
-    _OutputIterator
-    rotate_copy(_ForwardIterator __first, _ForwardIterator __middle,
-                _ForwardIterator __last, _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __middle);
-      __glibcxx_requires_valid_range(__middle, __last);
-
-      return std::copy(__first, __middle, copy(__middle, __last, __result));
-    }
-
-  /**
-   *  @brief Randomly shuffle the elements of a sequence.
-   *  @param  first   A forward iterator.
-   *  @param  last    A forward iterator.
-   *  @return  Nothing.
-   *
-   *  Reorder the elements in the range @p [first,last) using a random
-   *  distribution, so that every possible ordering of the sequence is
-   *  equally likely.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first != __last)
-	for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-	  std::iter_swap(__i, __first + (std::rand() % ((__i - __first) + 1)));
-    }
-
-  /**
-   *  @brief Shuffle the elements of a sequence using a random number
-   *         generator.
-   *  @param  first   A forward iterator.
-   *  @param  last    A forward iterator.
-   *  @param  rand    The RNG functor or function.
-   *  @return  Nothing.
-   *
-   *  Reorders the elements in the range @p [first,last) using @p rand to
-   *  provide a random distribution. Calling @p rand(N) for a positive
-   *  integer @p N should return a randomly chosen integer from the
-   *  range [0,N).
-  */
-  template<typename _RandomAccessIterator, typename _RandomNumberGenerator>
-    void
-    random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
-		   _RandomNumberGenerator& __rand)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return;
-      for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-	std::iter_swap(__i, __first + __rand((__i - __first) + 1));
-    }
-
-
-  /**
-   *  @if maint
-   *  This is a helper function...
-   *  @endif
-  */
-  template<typename _ForwardIterator, typename _Predicate>
-    _ForwardIterator
-    __partition(_ForwardIterator __first, _ForwardIterator __last,
-		_Predicate __pred,
-		forward_iterator_tag)
-    {
-      if (__first == __last)
-	return __first;
-
-      while (__pred(*__first))
-	if (++__first == __last)
-	  return __first;
-
-      _ForwardIterator __next = __first;
-
-      while (++__next != __last)
-	if (__pred(*__next))
-	  {
-	    swap(*__first, *__next);
-	    ++__first;
-	  }
-
-      return __first;
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function...
-   *  @endif
-  */
-  template<typename _BidirectionalIterator, typename _Predicate>
-    _BidirectionalIterator
-    __partition(_BidirectionalIterator __first, _BidirectionalIterator __last,
-		_Predicate __pred,
-		bidirectional_iterator_tag)
-    {
-      while (true)
-	{
-	  while (true)
-	    if (__first == __last)
-	      return __first;
-	    else if (__pred(*__first))
-	      ++__first;
-	    else
-	      break;
-	  --__last;
-	  while (true)
-	    if (__first == __last)
-	      return __first;
-	    else if (!__pred(*__last))
-	      --__last;
-	    else
-	      break;
-	  std::iter_swap(__first, __last);
-	  ++__first;
-	}
-    }
-
-  /**
-   *  @brief Move elements for which a predicate is true to the beginning
-   *         of a sequence.
-   *  @param  first   A forward iterator.
-   *  @param  last    A forward iterator.
-   *  @param  pred    A predicate functor.
-   *  @return  An iterator @p middle such that @p pred(i) is true for each
-   *  iterator @p i in the range @p [first,middle) and false for each @p i
-   *  in the range @p [middle,last).
-   *
-   *  @p pred must not modify its operand. @p partition() does not preserve
-   *  the relative ordering of elements in each group, use
-   *  @p stable_partition() if this is needed.
-  */
-  template<typename _ForwardIterator, typename _Predicate>
-    inline _ForwardIterator
-    partition(_ForwardIterator __first, _ForwardIterator __last,
-	      _Predicate   __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__partition(__first, __last, __pred,
-			      std::__iterator_category(__first));
-    }
-
-
-  /**
-   *  @if maint
-   *  This is a helper function...
-   *  @endif
-  */
-  template<typename _ForwardIterator, typename _Predicate, typename _Distance>
-    _ForwardIterator
-    __inplace_stable_partition(_ForwardIterator __first,
-			       _ForwardIterator __last,
-			       _Predicate __pred, _Distance __len)
-    {
-      if (__len == 1)
-	return __pred(*__first) ? __last : __first;
-      _ForwardIterator __middle = __first;
-      std::advance(__middle, __len / 2);
-      _ForwardIterator __begin = std::__inplace_stable_partition(__first,
-								 __middle,
-								 __pred,
-								 __len / 2);
-      _ForwardIterator __end = std::__inplace_stable_partition(__middle, __last,
-							       __pred,
-							       __len
-							       - __len / 2);
-      std::rotate(__begin, __middle, __end);
-      std::advance(__begin, std::distance(__middle, __end));
-      return __begin;
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function...
-   *  @endif
-  */
-  template<typename _ForwardIterator, typename _Pointer, typename _Predicate,
-	   typename _Distance>
-    _ForwardIterator
-    __stable_partition_adaptive(_ForwardIterator __first,
-				_ForwardIterator __last,
-				_Predicate __pred, _Distance __len,
-				_Pointer __buffer,
-				_Distance __buffer_size)
-    {
-      if (__len <= __buffer_size)
-	{
-	  _ForwardIterator __result1 = __first;
-	  _Pointer __result2 = __buffer;
-	  for ( ; __first != __last ; ++__first)
-	    if (__pred(*__first))
-	      {
-		*__result1 = *__first;
-		++__result1;
-	      }
-	    else
-	      {
-		*__result2 = *__first;
-		++__result2;
-	      }
-	  std::copy(__buffer, __result2, __result1);
-	  return __result1;
-	}
-      else
-	{
-	  _ForwardIterator __middle = __first;
-	  std::advance(__middle, __len / 2);
-	  _ForwardIterator __begin =
-	    std::__stable_partition_adaptive(__first, __middle, __pred,
-					     __len / 2, __buffer,
-					     __buffer_size);
-	  _ForwardIterator __end =
-	    std::__stable_partition_adaptive(__middle, __last, __pred,
-					     __len - __len / 2,
-					     __buffer, __buffer_size);
-	  std::rotate(__begin, __middle, __end);
-	  std::advance(__begin, std::distance(__middle, __end));
-	  return __begin;
-	}
-    }
-
-  /**
-   *  @brief Move elements for which a predicate is true to the beginning
-   *         of a sequence, preserving relative ordering.
-   *  @param  first   A forward iterator.
-   *  @param  last    A forward iterator.
-   *  @param  pred    A predicate functor.
-   *  @return  An iterator @p middle such that @p pred(i) is true for each
-   *  iterator @p i in the range @p [first,middle) and false for each @p i
-   *  in the range @p [middle,last).
-   *
-   *  Performs the same function as @p partition() with the additional
-   *  guarantee that the relative ordering of elements in each group is
-   *  preserved, so any two elements @p x and @p y in the range
-   *  @p [first,last) such that @p pred(x)==pred(y) will have the same
-   *  relative ordering after calling @p stable_partition().
-  */
-  template<typename _ForwardIterator, typename _Predicate>
-    _ForwardIterator
-    stable_partition(_ForwardIterator __first, _ForwardIterator __last,
-		     _Predicate __pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __first;
-      else
-	{
-	  typedef typename iterator_traits<_ForwardIterator>::value_type
-	    _ValueType;
-	  typedef typename iterator_traits<_ForwardIterator>::difference_type
-	    _DistanceType;
-
-	  _Temporary_buffer<_ForwardIterator, _ValueType> __buf(__first,
-								__last);
-	if (__buf.size() > 0)
-	  return
-	    std::__stable_partition_adaptive(__first, __last, __pred,
-					  _DistanceType(__buf.requested_size()),
-					  __buf.begin(), __buf.size());
-	else
-	  return
-	    std::__inplace_stable_partition(__first, __last, __pred,
-					 _DistanceType(__buf.requested_size()));
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function...
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Tp>
-    _RandomAccessIterator
-    __unguarded_partition(_RandomAccessIterator __first,
-			  _RandomAccessIterator __last, _Tp __pivot)
-    {
-      while (true)
-	{
-	  while (*__first < __pivot)
-	    ++__first;
-	  --__last;
-	  while (__pivot < *__last)
-	    --__last;
-	  if (!(__first < __last))
-	    return __first;
-	  std::iter_swap(__first, __last);
-	  ++__first;
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function...
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Tp, typename _Compare>
-    _RandomAccessIterator
-    __unguarded_partition(_RandomAccessIterator __first,
-			  _RandomAccessIterator __last,
-			  _Tp __pivot, _Compare __comp)
-    {
-      while (true)
-	{
-	  while (__comp(*__first, __pivot))
-	    ++__first;
-	  --__last;
-	  while (__comp(__pivot, *__last))
-	    --__last;
-	  if (!(__first < __last))
-	    return __first;
-	  std::iter_swap(__first, __last);
-	  ++__first;
-	}
-    }
-
-  /**
-   *  @if maint
-   *  @doctodo
-   *  This controls some aspect of the sort routines.
-   *  @endif
-  */
-  enum { _S_threshold = 16 };
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Tp>
-    void
-    __unguarded_linear_insert(_RandomAccessIterator __last, _Tp __val)
-    {
-      _RandomAccessIterator __next = __last;
-      --__next;
-      while (__val < *__next)
-	{
-	  *__last = *__next;
-	  __last = __next;
-	  --__next;
-	}
-      *__last = __val;
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Tp, typename _Compare>
-    void
-    __unguarded_linear_insert(_RandomAccessIterator __last, _Tp __val,
-			      _Compare __comp)
-    {
-      _RandomAccessIterator __next = __last;
-      --__next;
-      while (__comp(__val, *__next))
-	{
-	  *__last = *__next;
-	  __last = __next;
-	  --__next;
-	}
-      *__last = __val;
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator>
-    void
-    __insertion_sort(_RandomAccessIterator __first,
-		     _RandomAccessIterator __last)
-    {
-      if (__first == __last)
-	return;
-
-      for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-	{
-	  typename iterator_traits<_RandomAccessIterator>::value_type
-	    __val = *__i;
-	  if (__val < *__first)
-	    {
-	      std::copy_backward(__first, __i, __i + 1);
-	      *__first = __val;
-	    }
-	  else
-	    std::__unguarded_linear_insert(__i, __val);
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __insertion_sort(_RandomAccessIterator __first,
-		     _RandomAccessIterator __last, _Compare __comp)
-    {
-      if (__first == __last) return;
-
-      for (_RandomAccessIterator __i = __first + 1; __i != __last; ++__i)
-	{
-	  typename iterator_traits<_RandomAccessIterator>::value_type
-	    __val = *__i;
-	  if (__comp(__val, *__first))
-	    {
-	      std::copy_backward(__first, __i, __i + 1);
-	      *__first = __val;
-	    }
-	  else
-	    std::__unguarded_linear_insert(__i, __val, __comp);
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    __unguarded_insertion_sort(_RandomAccessIterator __first,
-			       _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      for (_RandomAccessIterator __i = __first; __i != __last; ++__i)
-	std::__unguarded_linear_insert(__i, _ValueType(*__i));
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    __unguarded_insertion_sort(_RandomAccessIterator __first,
-			       _RandomAccessIterator __last, _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      for (_RandomAccessIterator __i = __first; __i != __last; ++__i)
-	std::__unguarded_linear_insert(__i, _ValueType(*__i), __comp);
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator>
-    void
-    __final_insertion_sort(_RandomAccessIterator __first,
-			   _RandomAccessIterator __last)
-    {
-      if (__last - __first > _S_threshold)
-	{
-	  std::__insertion_sort(__first, __first + _S_threshold);
-	  std::__unguarded_insertion_sort(__first + _S_threshold, __last);
-	}
-      else
-	std::__insertion_sort(__first, __last);
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __final_insertion_sort(_RandomAccessIterator __first,
-			   _RandomAccessIterator __last, _Compare __comp)
-    {
-      if (__last - __first > _S_threshold)
-	{
-	  std::__insertion_sort(__first, __first + _S_threshold, __comp);
-	  std::__unguarded_insertion_sort(__first + _S_threshold, __last,
-					  __comp);
-	}
-      else
-	std::__insertion_sort(__first, __last, __comp);
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _Size>
-    inline _Size
-    __lg(_Size __n)
-    {
-      _Size __k;
-      for (__k = 0; __n != 1; __n >>= 1)
-	++__k;
-      return __k;
-    }
-
-  /**
-   *  @brief Sort the smallest elements of a sequence.
-   *  @param  first   An iterator.
-   *  @param  middle  Another iterator.
-   *  @param  last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Sorts the smallest @p (middle-first) elements in the range
-   *  @p [first,last) and moves them to the range @p [first,middle). The
-   *  order of the remaining elements in the range @p [middle,last) is
-   *  undefined.
-   *  After the sort if @p i and @j are iterators in the range
-   *  @p [first,middle) such that @i precedes @j and @k is an iterator in
-   *  the range @p [middle,last) then @p *j<*i and @p *k<*i are both false.
-  */
-  template<typename _RandomAccessIterator>
-    void
-    partial_sort(_RandomAccessIterator __first,
-		 _RandomAccessIterator __middle,
-		 _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_valid_range(__first, __middle);
-      __glibcxx_requires_valid_range(__middle, __last);
-
-      std::make_heap(__first, __middle);
-      for (_RandomAccessIterator __i = __middle; __i < __last; ++__i)
-	if (*__i < *__first)
-	  std::__pop_heap(__first, __middle, __i, _ValueType(*__i));
-      std::sort_heap(__first, __middle);
-    }
-
-  /**
-   *  @brief Sort the smallest elements of a sequence using a predicate
-   *         for comparison.
-   *  @param  first   An iterator.
-   *  @param  middle  Another iterator.
-   *  @param  last    Another iterator.
-   *  @param  comp    A comparison functor.
-   *  @return  Nothing.
-   *
-   *  Sorts the smallest @p (middle-first) elements in the range
-   *  @p [first,last) and moves them to the range @p [first,middle). The
-   *  order of the remaining elements in the range @p [middle,last) is
-   *  undefined.
-   *  After the sort if @p i and @j are iterators in the range
-   *  @p [first,middle) such that @i precedes @j and @k is an iterator in
-   *  the range @p [middle,last) then @p *comp(j,*i) and @p comp(*k,*i)
-   *  are both false.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    partial_sort(_RandomAccessIterator __first,
-		 _RandomAccessIterator __middle,
-		 _RandomAccessIterator __last,
-		 _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _ValueType, _ValueType>)
-      __glibcxx_requires_valid_range(__first, __middle);
-      __glibcxx_requires_valid_range(__middle, __last);
-
-      std::make_heap(__first, __middle, __comp);
-      for (_RandomAccessIterator __i = __middle; __i < __last; ++__i)
-	if (__comp(*__i, *__first))
-	  std::__pop_heap(__first, __middle, __i, _ValueType(*__i), __comp);
-      std::sort_heap(__first, __middle, __comp);
-    }
-
-  /**
-   *  @brief Copy the smallest elements of a sequence.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  result_first   A random-access iterator.
-   *  @param  result_last    Another random-access iterator.
-   *  @return   An iterator indicating the end of the resulting sequence.
-   *
-   *  Copies and sorts the smallest N values from the range @p [first,last)
-   *  to the range beginning at @p result_first, where the number of
-   *  elements to be copied, @p N, is the smaller of @p (last-first) and
-   *  @p (result_last-result_first).
-   *  After the sort if @p i and @j are iterators in the range
-   *  @p [result_first,result_first+N) such that @i precedes @j then
-   *  @p *j<*i is false.
-   *  The value returned is @p result_first+N.
-  */
-  template<typename _InputIterator, typename _RandomAccessIterator>
-    _RandomAccessIterator
-    partial_sort_copy(_InputIterator __first, _InputIterator __last,
-		      _RandomAccessIterator __result_first,
-		      _RandomAccessIterator __result_last)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type
-	_InputValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_OutputValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_ConvertibleConcept<_InputValueType,
-				  _OutputValueType>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_OutputValueType>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_InputValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_valid_range(__result_first, __result_last);
-
-      if (__result_first == __result_last)
-	return __result_last;
-      _RandomAccessIterator __result_real_last = __result_first;
-      while(__first != __last && __result_real_last != __result_last)
-	{
-	  *__result_real_last = *__first;
-	  ++__result_real_last;
-	  ++__first;
-	}
-      std::make_heap(__result_first, __result_real_last);
-      while (__first != __last)
-	{
-	  if (*__first < *__result_first)
-	    std::__adjust_heap(__result_first, _DistanceType(0),
-			       _DistanceType(__result_real_last
-					     - __result_first),
-			       _InputValueType(*__first));
-	  ++__first;
-	}
-      std::sort_heap(__result_first, __result_real_last);
-      return __result_real_last;
-    }
-
-  /**
-   *  @brief Copy the smallest elements of a sequence using a predicate for
-   *         comparison.
-   *  @param  first   An input iterator.
-   *  @param  last    Another input iterator.
-   *  @param  result_first   A random-access iterator.
-   *  @param  result_last    Another random-access iterator.
-   *  @param  comp    A comparison functor.
-   *  @return   An iterator indicating the end of the resulting sequence.
-   *
-   *  Copies and sorts the smallest N values from the range @p [first,last)
-   *  to the range beginning at @p result_first, where the number of
-   *  elements to be copied, @p N, is the smaller of @p (last-first) and
-   *  @p (result_last-result_first).
-   *  After the sort if @p i and @j are iterators in the range
-   *  @p [result_first,result_first+N) such that @i precedes @j then
-   *  @p comp(*j,*i) is false.
-   *  The value returned is @p result_first+N.
-  */
-  template<typename _InputIterator, typename _RandomAccessIterator, typename _Compare>
-    _RandomAccessIterator
-    partial_sort_copy(_InputIterator __first, _InputIterator __last,
-		      _RandomAccessIterator __result_first,
-		      _RandomAccessIterator __result_last,
-		      _Compare __comp)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type
-	_InputValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_OutputValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __glibcxx_function_requires(_ConvertibleConcept<_InputValueType,
-				  _OutputValueType>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _OutputValueType, _OutputValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_valid_range(__result_first, __result_last);
-
-      if (__result_first == __result_last)
-	return __result_last;
-      _RandomAccessIterator __result_real_last = __result_first;
-      while(__first != __last && __result_real_last != __result_last)
-	{
-	  *__result_real_last = *__first;
-	  ++__result_real_last;
-	  ++__first;
-	}
-      std::make_heap(__result_first, __result_real_last, __comp);
-      while (__first != __last)
-	{
-	  if (__comp(*__first, *__result_first))
-	    std::__adjust_heap(__result_first, _DistanceType(0),
-			       _DistanceType(__result_real_last
-					     - __result_first),
-			       _InputValueType(*__first),
-			       __comp);
-	  ++__first;
-	}
-      std::sort_heap(__result_first, __result_real_last, __comp);
-      return __result_real_last;
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Size>
-    void
-    __introsort_loop(_RandomAccessIterator __first,
-		     _RandomAccessIterator __last,
-		     _Size __depth_limit)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      while (__last - __first > _S_threshold)
-	{
-	  if (__depth_limit == 0)
-	    {
-	      std::partial_sort(__first, __last, __last);
-	      return;
-	    }
-	  --__depth_limit;
-	  _RandomAccessIterator __cut =
-	    std::__unguarded_partition(__first, __last,
-				       _ValueType(std::__median(*__first,
-								*(__first
-								  + (__last
-								     - __first)
-								  / 2),
-								*(__last
-								  - 1))));
-	  std::__introsort_loop(__cut, __last, __depth_limit);
-	  __last = __cut;
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the sort routine.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Size, typename _Compare>
-    void
-    __introsort_loop(_RandomAccessIterator __first,
-		     _RandomAccessIterator __last,
-		     _Size __depth_limit, _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      while (__last - __first > _S_threshold)
-	{
-	  if (__depth_limit == 0)
-	    {
-	      std::partial_sort(__first, __last, __last, __comp);
-	      return;
-	    }
-	  --__depth_limit;
-	  _RandomAccessIterator __cut =
-	    std::__unguarded_partition(__first, __last,
-				       _ValueType(std::__median(*__first,
-								*(__first
-								  + (__last
-								     - __first)
-								  / 2),
-								*(__last - 1),
-								__comp)),
-				       __comp);
-	  std::__introsort_loop(__cut, __last, __depth_limit, __comp);
-	  __last = __cut;
-	}
-    }
-
-  /**
-   *  @brief Sort the elements of a sequence.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Sorts the elements in the range @p [first,last) in ascending order,
-   *  such that @p *(i+1)<*i is false for each iterator @p i in the range
-   *  @p [first,last-1).
-   *
-   *  The relative ordering of equivalent elements is not preserved, use
-   *  @p stable_sort() if this is needed.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first != __last)
-	{
-	  std::__introsort_loop(__first, __last, __lg(__last - __first) * 2);
-	  std::__final_insertion_sort(__first, __last);
-	}
-    }
-
-  /**
-   *  @brief Sort the elements of a sequence using a predicate for comparison.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  comp    A comparison functor.
-   *  @return  Nothing.
-   *
-   *  Sorts the elements in the range @p [first,last) in ascending order,
-   *  such that @p comp(*(i+1),*i) is false for every iterator @p i in the
-   *  range @p [first,last-1).
-   *
-   *  The relative ordering of equivalent elements is not preserved, use
-   *  @p stable_sort() if this is needed.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	 _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _ValueType,
-				  _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first != __last)
-	{
-	  std::__introsort_loop(__first, __last, __lg(__last - __first) * 2,
-				__comp);
-	  std::__final_insertion_sort(__first, __last, __comp);
-	}
-    }
-
-  /**
-   *  @brief Finds the first position in which @a val could be inserted
-   *         without changing the ordering.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  val     The search term.
-   *  @return  An iterator pointing to the first element "not less than" @a val,
-   *           or end() if every element is less than @a val.
-   *  @ingroup binarysearch
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    _ForwardIterator
-    lower_bound(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      // Note that these are slightly stricter than those of the 4-argument
-      // version, defined next.  The difference is in the strictness of the
-      // comparison operations... so for looser checking, define your own
-      // comparison function, as was intended.
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_SameTypeConcept<_Tp, _ValueType>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      __glibcxx_requires_partitioned(__first, __last, __val);
-
-      _DistanceType __len = std::distance(__first, __last);
-      _DistanceType __half;
-      _ForwardIterator __middle;
-
-      while (__len > 0)
-	{
-	  __half = __len >> 1;
-	  __middle = __first;
-	  std::advance(__middle, __half);
-	  if (*__middle < __val)
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	  else
-	    __len = __half;
-	}
-      return __first;
-    }
-
-  /**
-   *  @brief Finds the first position in which @a val could be inserted
-   *         without changing the ordering.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  val     The search term.
-   *  @param  comp    A functor to use for comparisons.
-   *  @return  An iterator pointing to the first element "not less than" @a val,
-   *           or end() if every element is less than @a val.
-   *  @ingroup binarysearch
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    _ForwardIterator
-    lower_bound(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val, _Compare __comp)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _ValueType, _Tp>)
-      __glibcxx_requires_partitioned_pred(__first, __last, __val, __comp);
-
-      _DistanceType __len = std::distance(__first, __last);
-      _DistanceType __half;
-      _ForwardIterator __middle;
-
-      while (__len > 0)
-	{
-	  __half = __len >> 1;
-	  __middle = __first;
-	  std::advance(__middle, __half);
-	  if (__comp(*__middle, __val))
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	  else
-	    __len = __half;
-	}
-      return __first;
-    }
-
-  /**
-   *  @brief Finds the last position in which @a val could be inserted
-   *         without changing the ordering.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  val     The search term.
-   *  @return  An iterator pointing to the first element greater than @a val,
-   *           or end() if no elements are greater than @a val.
-   *  @ingroup binarysearch
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    _ForwardIterator
-    upper_bound(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      // See comments on lower_bound.
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_SameTypeConcept<_Tp, _ValueType>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      __glibcxx_requires_partitioned(__first, __last, __val);
-
-      _DistanceType __len = std::distance(__first, __last);
-      _DistanceType __half;
-      _ForwardIterator __middle;
-
-      while (__len > 0)
-	{
-	  __half = __len >> 1;
-	  __middle = __first;
-	  std::advance(__middle, __half);
-	  if (__val < *__middle)
-	    __len = __half;
-	  else
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	}
-      return __first;
-    }
-
-  /**
-   *  @brief Finds the last position in which @a val could be inserted
-   *         without changing the ordering.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  val     The search term.
-   *  @param  comp    A functor to use for comparisons.
-   *  @return  An iterator pointing to the first element greater than @a val,
-   *           or end() if no elements are greater than @a val.
-   *  @ingroup binarysearch
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    _ForwardIterator
-    upper_bound(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val, _Compare __comp)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _Tp, _ValueType>)
-      __glibcxx_requires_partitioned_pred(__first, __last, __val, __comp);
-
-      _DistanceType __len = std::distance(__first, __last);
-      _DistanceType __half;
-      _ForwardIterator __middle;
-
-      while (__len > 0)
-	{
-	  __half = __len >> 1;
-	  __middle = __first;
-	  std::advance(__middle, __half);
-	  if (__comp(__val, *__middle))
-	    __len = __half;
-	  else
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	}
-      return __first;
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the merge routines.
-   *  @endif
-  */
-  template<typename _BidirectionalIterator, typename _Distance>
-    void
-    __merge_without_buffer(_BidirectionalIterator __first,
-			   _BidirectionalIterator __middle,
-			   _BidirectionalIterator __last,
-			   _Distance __len1, _Distance __len2)
-    {
-      if (__len1 == 0 || __len2 == 0)
-	return;
-      if (__len1 + __len2 == 2)
-	{
-	  if (*__middle < *__first)
-	    std::iter_swap(__first, __middle);
-	  return;
-	}
-      _BidirectionalIterator __first_cut = __first;
-      _BidirectionalIterator __second_cut = __middle;
-      _Distance __len11 = 0;
-      _Distance __len22 = 0;
-      if (__len1 > __len2)
-	{
-	  __len11 = __len1 / 2;
-	  std::advance(__first_cut, __len11);
-	  __second_cut = std::lower_bound(__middle, __last, *__first_cut);
-	  __len22 = std::distance(__middle, __second_cut);
-	}
-      else
-	{
-	  __len22 = __len2 / 2;
-	  std::advance(__second_cut, __len22);
-	  __first_cut = std::upper_bound(__first, __middle, *__second_cut);
-	  __len11 = std::distance(__first, __first_cut);
-	}
-      std::rotate(__first_cut, __middle, __second_cut);
-      _BidirectionalIterator __new_middle = __first_cut;
-      std::advance(__new_middle, std::distance(__middle, __second_cut));
-      std::__merge_without_buffer(__first, __first_cut, __new_middle,
-				  __len11, __len22);
-      std::__merge_without_buffer(__new_middle, __second_cut, __last,
-				  __len1 - __len11, __len2 - __len22);
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the merge routines.
-   *  @endif
-  */
-  template<typename _BidirectionalIterator, typename _Distance,
-	   typename _Compare>
-    void
-    __merge_without_buffer(_BidirectionalIterator __first,
-                           _BidirectionalIterator __middle,
-			   _BidirectionalIterator __last,
-			   _Distance __len1, _Distance __len2,
-			   _Compare __comp)
-    {
-      if (__len1 == 0 || __len2 == 0)
-	return;
-      if (__len1 + __len2 == 2)
-	{
-	  if (__comp(*__middle, *__first))
-	    std::iter_swap(__first, __middle);
-	  return;
-	}
-      _BidirectionalIterator __first_cut = __first;
-      _BidirectionalIterator __second_cut = __middle;
-      _Distance __len11 = 0;
-      _Distance __len22 = 0;
-      if (__len1 > __len2)
-	{
-	  __len11 = __len1 / 2;
-	  std::advance(__first_cut, __len11);
-	  __second_cut = std::lower_bound(__middle, __last, *__first_cut,
-					  __comp);
-	  __len22 = std::distance(__middle, __second_cut);
-	}
-      else
-	{
-	  __len22 = __len2 / 2;
-	  std::advance(__second_cut, __len22);
-	  __first_cut = std::upper_bound(__first, __middle, *__second_cut,
-					 __comp);
-	  __len11 = std::distance(__first, __first_cut);
-	}
-      std::rotate(__first_cut, __middle, __second_cut);
-      _BidirectionalIterator __new_middle = __first_cut;
-      std::advance(__new_middle, std::distance(__middle, __second_cut));
-      std::__merge_without_buffer(__first, __first_cut, __new_middle,
-				  __len11, __len22, __comp);
-      std::__merge_without_buffer(__new_middle, __second_cut, __last,
-				  __len1 - __len11, __len2 - __len22, __comp);
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the stable sorting routines.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator>
-    void
-    __inplace_stable_sort(_RandomAccessIterator __first,
-			  _RandomAccessIterator __last)
-    {
-      if (__last - __first < 15)
-	{
-	  std::__insertion_sort(__first, __last);
-	  return;
-	}
-      _RandomAccessIterator __middle = __first + (__last - __first) / 2;
-      std::__inplace_stable_sort(__first, __middle);
-      std::__inplace_stable_sort(__middle, __last);
-      std::__merge_without_buffer(__first, __middle, __last,
-				  __middle - __first,
-				  __last - __middle);
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the stable sorting routines.
-   *  @endif
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    __inplace_stable_sort(_RandomAccessIterator __first,
-			  _RandomAccessIterator __last, _Compare __comp)
-    {
-      if (__last - __first < 15)
-	{
-	  std::__insertion_sort(__first, __last, __comp);
-	  return;
-	}
-      _RandomAccessIterator __middle = __first + (__last - __first) / 2;
-      std::__inplace_stable_sort(__first, __middle, __comp);
-      std::__inplace_stable_sort(__middle, __last, __comp);
-      std::__merge_without_buffer(__first, __middle, __last,
-				  __middle - __first,
-				  __last - __middle,
-				  __comp);
-    }
-
-  /**
-   *  @brief Merges two sorted ranges.
-   *  @param  first1  An iterator.
-   *  @param  first2  Another iterator.
-   *  @param  last1   Another iterator.
-   *  @param  last2   Another iterator.
-   *  @param  result  An iterator pointing to the end of the merged range.
-   *  @return  An iterator pointing to the first element "not less than" @a val.
-   *
-   *  Merges the ranges [first1,last1) and [first2,last2) into the sorted range
-   *  [result, result + (last1-first1) + (last2-first2)).  Both input ranges
-   *  must be sorted, and the output range must not overlap with either of
-   *  the input ranges.  The sort is @e stable, that is, for equivalent
-   *  elements in the two ranges, elements from the first range will always
-   *  come before elements from the second.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    _OutputIterator
-    merge(_InputIterator1 __first1, _InputIterator1 __last1,
-	  _InputIterator2 __first2, _InputIterator2 __last2,
-	  _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted(__first1, __last1);
-      __glibcxx_requires_sorted(__first2, __last2);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	{
-	  if (*__first2 < *__first1)
-	    {
-	      *__result = *__first2;
-	      ++__first2;
-	    }
-	  else
-	    {
-	      *__result = *__first1;
-	      ++__first1;
-	    }
-	  ++__result;
-	}
-      return std::copy(__first2, __last2, std::copy(__first1, __last1,
-						    __result));
-    }
-
-  /**
-   *  @brief Merges two sorted ranges.
-   *  @param  first1  An iterator.
-   *  @param  first2  Another iterator.
-   *  @param  last1   Another iterator.
-   *  @param  last2   Another iterator.
-   *  @param  result  An iterator pointing to the end of the merged range.
-   *  @param  comp    A functor to use for comparisons.
-   *  @return  An iterator pointing to the first element "not less than" @a val.
-   *
-   *  Merges the ranges [first1,last1) and [first2,last2) into the sorted range
-   *  [result, result + (last1-first1) + (last2-first2)).  Both input ranges
-   *  must be sorted, and the output range must not overlap with either of
-   *  the input ranges.  The sort is @e stable, that is, for equivalent
-   *  elements in the two ranges, elements from the first range will always
-   *  come before elements from the second.
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    _OutputIterator
-    merge(_InputIterator1 __first1, _InputIterator1 __last1,
-	  _InputIterator2 __first2, _InputIterator2 __last2,
-	  _OutputIterator __result, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_sorted_pred(__first1, __last1, __comp);
-      __glibcxx_requires_sorted_pred(__first2, __last2, __comp);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	{
-	  if (__comp(*__first2, *__first1))
-	    {
-	      *__result = *__first2;
-	      ++__first2;
-	    }
-	  else
-	    {
-	      *__result = *__first1;
-	      ++__first1;
-	    }
-	  ++__result;
-	}
-      return std::copy(__first2, __last2, std::copy(__first1, __last1,
-						    __result));
-    }
-
-  template<typename _RandomAccessIterator1, typename _RandomAccessIterator2,
-	   typename _Distance>
-    void
-    __merge_sort_loop(_RandomAccessIterator1 __first,
-		      _RandomAccessIterator1 __last,
-		      _RandomAccessIterator2 __result,
-		      _Distance __step_size)
-    {
-      const _Distance __two_step = 2 * __step_size;
-
-      while (__last - __first >= __two_step)
-	{
-	  __result = std::merge(__first, __first + __step_size,
-				__first + __step_size, __first + __two_step,
-				__result);
-	  __first += __two_step;
-	}
-
-      __step_size = std::min(_Distance(__last - __first), __step_size);
-      std::merge(__first, __first + __step_size, __first + __step_size, __last,
-		 __result);
-    }
-
-  template<typename _RandomAccessIterator1, typename _RandomAccessIterator2,
-	   typename _Distance, typename _Compare>
-    void
-    __merge_sort_loop(_RandomAccessIterator1 __first,
-		      _RandomAccessIterator1 __last,
-		      _RandomAccessIterator2 __result, _Distance __step_size,
-		      _Compare __comp)
-    {
-      const _Distance __two_step = 2 * __step_size;
-
-      while (__last - __first >= __two_step)
-	{
-	  __result = std::merge(__first, __first + __step_size,
-				__first + __step_size, __first + __two_step,
-				__result,
-				__comp);
-	  __first += __two_step;
-	}
-      __step_size = std::min(_Distance(__last - __first), __step_size);
-
-      std::merge(__first, __first + __step_size,
-		 __first + __step_size, __last,
-		 __result,
-		 __comp);
-    }
-
-  enum { _S_chunk_size = 7 };
-
-  template<typename _RandomAccessIterator, typename _Distance>
-    void
-    __chunk_insertion_sort(_RandomAccessIterator __first,
-			   _RandomAccessIterator __last,
-			   _Distance __chunk_size)
-    {
-      while (__last - __first >= __chunk_size)
-	{
-	  std::__insertion_sort(__first, __first + __chunk_size);
-	  __first += __chunk_size;
-	}
-      std::__insertion_sort(__first, __last);
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance, typename _Compare>
-    void
-    __chunk_insertion_sort(_RandomAccessIterator __first,
-			   _RandomAccessIterator __last,
-			   _Distance __chunk_size, _Compare __comp)
-    {
-      while (__last - __first >= __chunk_size)
-	{
-	  std::__insertion_sort(__first, __first + __chunk_size, __comp);
-	  __first += __chunk_size;
-	}
-      std::__insertion_sort(__first, __last, __comp);
-    }
-
-  template<typename _RandomAccessIterator, typename _Pointer>
-    void
-    __merge_sort_with_buffer(_RandomAccessIterator __first,
-			     _RandomAccessIterator __last,
-                             _Pointer __buffer)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_Distance;
-
-      const _Distance __len = __last - __first;
-      const _Pointer __buffer_last = __buffer + __len;
-
-      _Distance __step_size = _S_chunk_size;
-      std::__chunk_insertion_sort(__first, __last, __step_size);
-
-      while (__step_size < __len)
-	{
-	  std::__merge_sort_loop(__first, __last, __buffer, __step_size);
-	  __step_size *= 2;
-	  std::__merge_sort_loop(__buffer, __buffer_last, __first, __step_size);
-	  __step_size *= 2;
-	}
-    }
-
-  template<typename _RandomAccessIterator, typename _Pointer, typename _Compare>
-    void
-    __merge_sort_with_buffer(_RandomAccessIterator __first,
-			     _RandomAccessIterator __last,
-                             _Pointer __buffer, _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_Distance;
-
-      const _Distance __len = __last - __first;
-      const _Pointer __buffer_last = __buffer + __len;
-
-      _Distance __step_size = _S_chunk_size;
-      std::__chunk_insertion_sort(__first, __last, __step_size, __comp);
-
-      while (__step_size < __len)
-	{
-	  std::__merge_sort_loop(__first, __last, __buffer,
-				 __step_size, __comp);
-	  __step_size *= 2;
-	  std::__merge_sort_loop(__buffer, __buffer_last, __first,
-				 __step_size, __comp);
-	  __step_size *= 2;
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the merge routines.
-   *  @endif
-  */
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
-	   typename _BidirectionalIterator3>
-    _BidirectionalIterator3
-    __merge_backward(_BidirectionalIterator1 __first1,
-		     _BidirectionalIterator1 __last1,
-		     _BidirectionalIterator2 __first2,
-		     _BidirectionalIterator2 __last2,
-		     _BidirectionalIterator3 __result)
-    {
-      if (__first1 == __last1)
-	return std::copy_backward(__first2, __last2, __result);
-      if (__first2 == __last2)
-	return std::copy_backward(__first1, __last1, __result);
-      --__last1;
-      --__last2;
-      while (true)
-	{
-	  if (*__last2 < *__last1)
-	    {
-	      *--__result = *__last1;
-	      if (__first1 == __last1)
-		return std::copy_backward(__first2, ++__last2, __result);
-	      --__last1;
-	    }
-	  else
-	    {
-	      *--__result = *__last2;
-	      if (__first2 == __last2)
-		return std::copy_backward(__first1, ++__last1, __result);
-	      --__last2;
-	    }
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the merge routines.
-   *  @endif
-  */
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
-	   typename _BidirectionalIterator3, typename _Compare>
-    _BidirectionalIterator3
-    __merge_backward(_BidirectionalIterator1 __first1,
-		     _BidirectionalIterator1 __last1,
-		     _BidirectionalIterator2 __first2,
-		     _BidirectionalIterator2 __last2,
-		     _BidirectionalIterator3 __result,
-		     _Compare __comp)
-    {
-      if (__first1 == __last1)
-	return std::copy_backward(__first2, __last2, __result);
-      if (__first2 == __last2)
-	return std::copy_backward(__first1, __last1, __result);
-      --__last1;
-      --__last2;
-      while (true)
-	{
-	  if (__comp(*__last2, *__last1))
-	    {
-	      *--__result = *__last1;
-	      if (__first1 == __last1)
-		return std::copy_backward(__first2, ++__last2, __result);
-	      --__last1;
-	    }
-	  else
-	    {
-	      *--__result = *__last2;
-	      if (__first2 == __last2)
-		return std::copy_backward(__first1, ++__last1, __result);
-	      --__last2;
-	    }
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the merge routines.
-   *  @endif
-  */
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
-	   typename _Distance>
-    _BidirectionalIterator1
-    __rotate_adaptive(_BidirectionalIterator1 __first,
-		      _BidirectionalIterator1 __middle,
-		      _BidirectionalIterator1 __last,
-		      _Distance __len1, _Distance __len2,
-		      _BidirectionalIterator2 __buffer,
-		      _Distance __buffer_size)
-    {
-      _BidirectionalIterator2 __buffer_end;
-      if (__len1 > __len2 && __len2 <= __buffer_size)
-	{
-	  __buffer_end = std::copy(__middle, __last, __buffer);
-	  std::copy_backward(__first, __middle, __last);
-	  return std::copy(__buffer, __buffer_end, __first);
-	}
-      else if (__len1 <= __buffer_size)
-	{
-	  __buffer_end = std::copy(__first, __middle, __buffer);
-	  std::copy(__middle, __last, __first);
-	  return std::copy_backward(__buffer, __buffer_end, __last);
-	}
-      else
-	{
-	  std::rotate(__first, __middle, __last);
-	  std::advance(__first, std::distance(__middle, __last));
-	  return __first;
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the merge routines.
-   *  @endif
-  */
-  template<typename _BidirectionalIterator, typename _Distance,
-	   typename _Pointer>
-    void
-    __merge_adaptive(_BidirectionalIterator __first,
-                     _BidirectionalIterator __middle,
-		     _BidirectionalIterator __last,
-		     _Distance __len1, _Distance __len2,
-		     _Pointer __buffer, _Distance __buffer_size)
-    {
-      if (__len1 <= __len2 && __len1 <= __buffer_size)
-	{
-	  _Pointer __buffer_end = std::copy(__first, __middle, __buffer);
-	  std::merge(__buffer, __buffer_end, __middle, __last, __first);
-	}
-      else if (__len2 <= __buffer_size)
-	{
-	  _Pointer __buffer_end = std::copy(__middle, __last, __buffer);
-	  std::__merge_backward(__first, __middle, __buffer,
-				__buffer_end, __last);
-	}
-      else
-	{
-	  _BidirectionalIterator __first_cut = __first;
-	  _BidirectionalIterator __second_cut = __middle;
-	  _Distance __len11 = 0;
-	  _Distance __len22 = 0;
-	  if (__len1 > __len2)
-	    {
-	      __len11 = __len1 / 2;
-	      std::advance(__first_cut, __len11);
-	      __second_cut = std::lower_bound(__middle, __last,
-					      *__first_cut);
-	      __len22 = std::distance(__middle, __second_cut);
-	    }
-	  else
-	    {
-	      __len22 = __len2 / 2;
-	      std::advance(__second_cut, __len22);
-	      __first_cut = std::upper_bound(__first, __middle,
-					     *__second_cut);
-	      __len11 = std::distance(__first, __first_cut);
-	    }
-	  _BidirectionalIterator __new_middle =
-	    std::__rotate_adaptive(__first_cut, __middle, __second_cut,
-				   __len1 - __len11, __len22, __buffer,
-				   __buffer_size);
-	  std::__merge_adaptive(__first, __first_cut, __new_middle, __len11,
-				__len22, __buffer, __buffer_size);
-	  std::__merge_adaptive(__new_middle, __second_cut, __last,
-				__len1 - __len11,
-				__len2 - __len22, __buffer, __buffer_size);
-	}
-    }
-
-  /**
-   *  @if maint
-   *  This is a helper function for the merge routines.
-   *  @endif
-  */
-  template<typename _BidirectionalIterator, typename _Distance, typename _Pointer,
-	   typename _Compare>
-    void
-    __merge_adaptive(_BidirectionalIterator __first,
-                     _BidirectionalIterator __middle,
-		     _BidirectionalIterator __last,
-		     _Distance __len1, _Distance __len2,
-		     _Pointer __buffer, _Distance __buffer_size,
-		     _Compare __comp)
-    {
-      if (__len1 <= __len2 && __len1 <= __buffer_size)
-	{
-	  _Pointer __buffer_end = std::copy(__first, __middle, __buffer);
-	  std::merge(__buffer, __buffer_end, __middle, __last, __first, __comp);
-	}
-      else if (__len2 <= __buffer_size)
-	{
-	  _Pointer __buffer_end = std::copy(__middle, __last, __buffer);
-	  std::__merge_backward(__first, __middle, __buffer, __buffer_end,
-				__last, __comp);
-	}
-      else
-	{
-	  _BidirectionalIterator __first_cut = __first;
-	  _BidirectionalIterator __second_cut = __middle;
-	  _Distance __len11 = 0;
-	  _Distance __len22 = 0;
-	  if (__len1 > __len2)
-	    {
-	      __len11 = __len1 / 2;
-	      std::advance(__first_cut, __len11);
-	      __second_cut = std::lower_bound(__middle, __last, *__first_cut,
-					      __comp);
-	      __len22 = std::distance(__middle, __second_cut);
-	    }
-	  else
-	    {
-	      __len22 = __len2 / 2;
-	      std::advance(__second_cut, __len22);
-	      __first_cut = std::upper_bound(__first, __middle, *__second_cut,
-					     __comp);
-	      __len11 = std::distance(__first, __first_cut);
-	    }
-	  _BidirectionalIterator __new_middle =
-	    std::__rotate_adaptive(__first_cut, __middle, __second_cut,
-				   __len1 - __len11, __len22, __buffer,
-				   __buffer_size);
-	  std::__merge_adaptive(__first, __first_cut, __new_middle, __len11,
-				__len22, __buffer, __buffer_size, __comp);
-	  std::__merge_adaptive(__new_middle, __second_cut, __last,
-				__len1 - __len11,
-				__len2 - __len22, __buffer,
-				__buffer_size, __comp);
-	}
-    }
-
-  /**
-   *  @brief Merges two sorted ranges in place.
-   *  @param  first   An iterator.
-   *  @param  middle  Another iterator.
-   *  @param  last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Merges two sorted and consecutive ranges, [first,middle) and
-   *  [middle,last), and puts the result in [first,last).  The output will
-   *  be sorted.  The sort is @e stable, that is, for equivalent
-   *  elements in the two ranges, elements from the first range will always
-   *  come before elements from the second.
-   *
-   *  If enough additional memory is available, this takes (last-first)-1
-   *  comparisons.  Otherwise an NlogN algorithm is used, where N is
-   *  distance(first,last).
-  */
-  template<typename _BidirectionalIterator>
-    void
-    inplace_merge(_BidirectionalIterator __first,
-		  _BidirectionalIterator __middle,
-		  _BidirectionalIterator __last)
-    {
-      typedef typename iterator_traits<_BidirectionalIterator>::value_type
-          _ValueType;
-      typedef typename iterator_traits<_BidirectionalIterator>::difference_type
-          _DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
-	    _BidirectionalIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_sorted(__first, __middle);
-      __glibcxx_requires_sorted(__middle, __last);
-
-      if (__first == __middle || __middle == __last)
-	return;
-
-      _DistanceType __len1 = std::distance(__first, __middle);
-      _DistanceType __len2 = std::distance(__middle, __last);
-
-      _Temporary_buffer<_BidirectionalIterator, _ValueType> __buf(__first,
-								  __last);
-      if (__buf.begin() == 0)
-	std::__merge_without_buffer(__first, __middle, __last, __len1, __len2);
-      else
-	std::__merge_adaptive(__first, __middle, __last, __len1, __len2,
-			      __buf.begin(), _DistanceType(__buf.size()));
-    }
-
-  /**
-   *  @brief Merges two sorted ranges in place.
-   *  @param  first   An iterator.
-   *  @param  middle  Another iterator.
-   *  @param  last    Another iterator.
-   *  @param  comp    A functor to use for comparisons.
-   *  @return  Nothing.
-   *
-   *  Merges two sorted and consecutive ranges, [first,middle) and
-   *  [middle,last), and puts the result in [first,last).  The output will
-   *  be sorted.  The sort is @e stable, that is, for equivalent
-   *  elements in the two ranges, elements from the first range will always
-   *  come before elements from the second.
-   *
-   *  If enough additional memory is available, this takes (last-first)-1
-   *  comparisons.  Otherwise an NlogN algorithm is used, where N is
-   *  distance(first,last).
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _BidirectionalIterator, typename _Compare>
-    void
-    inplace_merge(_BidirectionalIterator __first,
-		  _BidirectionalIterator __middle,
-		  _BidirectionalIterator __last,
-		  _Compare __comp)
-    {
-      typedef typename iterator_traits<_BidirectionalIterator>::value_type
-          _ValueType;
-      typedef typename iterator_traits<_BidirectionalIterator>::difference_type
-          _DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<
-	    _BidirectionalIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    _ValueType, _ValueType>)
-      __glibcxx_requires_sorted_pred(__first, __middle, __comp);
-      __glibcxx_requires_sorted_pred(__middle, __last, __comp);
-
-      if (__first == __middle || __middle == __last)
-	return;
-
-      const _DistanceType __len1 = std::distance(__first, __middle);
-      const _DistanceType __len2 = std::distance(__middle, __last);
-
-      _Temporary_buffer<_BidirectionalIterator, _ValueType> __buf(__first,
-								  __last);
-      if (__buf.begin() == 0)
-	std::__merge_without_buffer(__first, __middle, __last, __len1,
-				    __len2, __comp);
-      else
-	std::__merge_adaptive(__first, __middle, __last, __len1, __len2,
-			      __buf.begin(), _DistanceType(__buf.size()),
-			      __comp);
-    }
-
-  template<typename _RandomAccessIterator, typename _Pointer,
-	   typename _Distance>
-    void
-    __stable_sort_adaptive(_RandomAccessIterator __first,
-			   _RandomAccessIterator __last,
-                           _Pointer __buffer, _Distance __buffer_size)
-    {
-      const _Distance __len = (__last - __first + 1) / 2;
-      const _RandomAccessIterator __middle = __first + __len;
-      if (__len > __buffer_size)
-	{
-	  std::__stable_sort_adaptive(__first, __middle,
-				      __buffer, __buffer_size);
-	  std::__stable_sort_adaptive(__middle, __last,
-				      __buffer, __buffer_size);
-	}
-      else
-	{
-	  std::__merge_sort_with_buffer(__first, __middle, __buffer);
-	  std::__merge_sort_with_buffer(__middle, __last, __buffer);
-	}
-      std::__merge_adaptive(__first, __middle, __last,
-			    _Distance(__middle - __first),
-			    _Distance(__last - __middle),
-			    __buffer, __buffer_size);
-    }
-
-  template<typename _RandomAccessIterator, typename _Pointer,
-	   typename _Distance, typename _Compare>
-    void
-    __stable_sort_adaptive(_RandomAccessIterator __first,
-			   _RandomAccessIterator __last,
-                           _Pointer __buffer, _Distance __buffer_size,
-                           _Compare __comp)
-    {
-      const _Distance __len = (__last - __first + 1) / 2;
-      const _RandomAccessIterator __middle = __first + __len;
-      if (__len > __buffer_size)
-	{
-	  std::__stable_sort_adaptive(__first, __middle, __buffer,
-				      __buffer_size, __comp);
-	  std::__stable_sort_adaptive(__middle, __last, __buffer,
-				      __buffer_size, __comp);
-	}
-      else
-	{
-	  std::__merge_sort_with_buffer(__first, __middle, __buffer, __comp);
-	  std::__merge_sort_with_buffer(__middle, __last, __buffer, __comp);
-	}
-      std::__merge_adaptive(__first, __middle, __last,
-			    _Distance(__middle - __first),
-			    _Distance(__last - __middle),
-			    __buffer, __buffer_size,
-			    __comp);
-    }
-
-  /**
-   *  @brief Sort the elements of a sequence, preserving the relative order
-   *         of equivalent elements.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Sorts the elements in the range @p [first,last) in ascending order,
-   *  such that @p *(i+1)<*i is false for each iterator @p i in the range
-   *  @p [first,last-1).
-   *
-   *  The relative ordering of equivalent elements is preserved, so any two
-   *  elements @p x and @p y in the range @p [first,last) such that
-   *  @p x<y is false and @p y<x is false will have the same relative
-   *  ordering after calling @p stable_sort().
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      _Temporary_buffer<_RandomAccessIterator, _ValueType>
-	buf(__first, __last);
-      if (buf.begin() == 0)
-	std::__inplace_stable_sort(__first, __last);
-      else
-	std::__stable_sort_adaptive(__first, __last, buf.begin(),
-				    _DistanceType(buf.size()));
-    }
-
-  /**
-   *  @brief Sort the elements of a sequence using a predicate for comparison,
-   *         preserving the relative order of equivalent elements.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  comp    A comparison functor.
-   *  @return  Nothing.
-   *
-   *  Sorts the elements in the range @p [first,last) in ascending order,
-   *  such that @p comp(*(i+1),*i) is false for each iterator @p i in the
-   *  range @p [first,last-1).
-   *
-   *  The relative ordering of equivalent elements is preserved, so any two
-   *  elements @p x and @p y in the range @p [first,last) such that
-   *  @p comp(x,y) is false and @p comp(y,x) is false will have the same
-   *  relative ordering after calling @p stable_sort().
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last,
-		_Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _ValueType,
-				  _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      _Temporary_buffer<_RandomAccessIterator, _ValueType> buf(__first, __last);
-      if (buf.begin() == 0)
-	std::__inplace_stable_sort(__first, __last, __comp);
-      else
-	std::__stable_sort_adaptive(__first, __last, buf.begin(),
-				    _DistanceType(buf.size()), __comp);
-    }
-
-  /**
-   *  @brief Sort a sequence just enough to find a particular position.
-   *  @param  first   An iterator.
-   *  @param  nth     Another iterator.
-   *  @param  last    Another iterator.
-   *  @return  Nothing.
-   *
-   *  Rearranges the elements in the range @p [first,last) so that @p *nth
-   *  is the same element that would have been in that position had the
-   *  whole sequence been sorted.
-   *  whole sequence been sorted. The elements either side of @p *nth are
-   *  not completely sorted, but for any iterator @i in the range
-   *  @p [first,nth) and any iterator @j in the range @p [nth,last) it
-   *  holds that @p *j<*i is false.
-  */
-  template<typename _RandomAccessIterator>
-    void
-    nth_element(_RandomAccessIterator __first,
-		_RandomAccessIterator __nth,
-		_RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_valid_range(__first, __nth);
-      __glibcxx_requires_valid_range(__nth, __last);
-
-      while (__last - __first > 3)
-	{
-	  _RandomAccessIterator __cut =
-	    std::__unguarded_partition(__first, __last,
-				       _ValueType(std::__median(*__first,
-								*(__first
-								  + (__last
-								     - __first)
-								  / 2),
-								*(__last
-								  - 1))));
-	  if (__cut <= __nth)
-	    __first = __cut;
-	  else
-	    __last = __cut;
-	}
-      std::__insertion_sort(__first, __last);
-    }
-
-  /**
-   *  @brief Sort a sequence just enough to find a particular position
-   *         using a predicate for comparison.
-   *  @param  first   An iterator.
-   *  @param  nth     Another iterator.
-   *  @param  last    Another iterator.
-   *  @param  comp    A comparison functor.
-   *  @return  Nothing.
-   *
-   *  Rearranges the elements in the range @p [first,last) so that @p *nth
-   *  is the same element that would have been in that position had the
-   *  whole sequence been sorted. The elements either side of @p *nth are
-   *  not completely sorted, but for any iterator @i in the range
-   *  @p [first,nth) and any iterator @j in the range @p [nth,last) it
-   *  holds that @p comp(*j,*i) is false.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    nth_element(_RandomAccessIterator __first,
-		_RandomAccessIterator __nth,
-		_RandomAccessIterator __last,
-			    _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _ValueType, _ValueType>)
-      __glibcxx_requires_valid_range(__first, __nth);
-      __glibcxx_requires_valid_range(__nth, __last);
-
-      while (__last - __first > 3)
-	{
-	  _RandomAccessIterator __cut =
-	    std::__unguarded_partition(__first, __last,
-				       _ValueType(std::__median(*__first,
-								*(__first
-								  + (__last
-								     - __first)
-								  / 2),
-								*(__last - 1),
-							      __comp)), __comp);
-	  if (__cut <= __nth)
-	    __first = __cut;
-	  else
-	    __last = __cut;
-	}
-      std::__insertion_sort(__first, __last, __comp);
-    }
-
-  /**
-   *  @brief Finds the largest subrange in which @a val could be inserted
-   *         at any place in it without changing the ordering.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  val     The search term.
-   *  @return  An pair of iterators defining the subrange.
-   *  @ingroup binarysearch
-   *
-   *  This is equivalent to
-   *  @code
-   *    std::make_pair(lower_bound(first, last, val),
-   *                   upper_bound(first, last, val))
-   *  @endcode
-   *  but does not actually call those functions.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    pair<_ForwardIterator, _ForwardIterator>
-    equal_range(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      // See comments on lower_bound.
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_SameTypeConcept<_Tp, _ValueType>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      __glibcxx_requires_partitioned(__first, __last, __val);
-
-      _DistanceType __len = std::distance(__first, __last);
-      _DistanceType __half;
-      _ForwardIterator __middle, __left, __right;
-
-      while (__len > 0)
-	{
-	  __half = __len >> 1;
-	  __middle = __first;
-	  std::advance(__middle, __half);
-	  if (*__middle < __val)
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	  else if (__val < *__middle)
-	    __len = __half;
-	  else
-	    {
-	      __left = std::lower_bound(__first, __middle, __val);
-	      std::advance(__first, __len);
-	      __right = std::upper_bound(++__middle, __first, __val);
-	      return pair<_ForwardIterator, _ForwardIterator>(__left, __right);
-	    }
-	}
-      return pair<_ForwardIterator, _ForwardIterator>(__first, __first);
-    }
-
-  /**
-   *  @brief Finds the largest subrange in which @a val could be inserted
-   *         at any place in it without changing the ordering.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  val     The search term.
-   *  @param  comp    A functor to use for comparisons.
-   *  @return  An pair of iterators defining the subrange.
-   *  @ingroup binarysearch
-   *
-   *  This is equivalent to
-   *  @code
-   *    std::make_pair(lower_bound(first, last, val, comp),
-   *                   upper_bound(first, last, val, comp))
-   *  @endcode
-   *  but does not actually call those functions.
-  */
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    pair<_ForwardIterator, _ForwardIterator>
-    equal_range(_ForwardIterator __first, _ForwardIterator __last,
-		const _Tp& __val,
-		_Compare __comp)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-	_ValueType;
-      typedef typename iterator_traits<_ForwardIterator>::difference_type
-	_DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _ValueType, _Tp>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-				  _Tp, _ValueType>)
-      __glibcxx_requires_partitioned_pred(__first, __last, __val, __comp);
-
-      _DistanceType __len = std::distance(__first, __last);
-      _DistanceType __half;
-      _ForwardIterator __middle, __left, __right;
-
-      while (__len > 0)
-	{
-	  __half = __len >> 1;
-	  __middle = __first;
-	  std::advance(__middle, __half);
-	  if (__comp(*__middle, __val))
-	    {
-	      __first = __middle;
-	      ++__first;
-	      __len = __len - __half - 1;
-	    }
-	  else if (__comp(__val, *__middle))
-	    __len = __half;
-	  else
-	    {
-	      __left = std::lower_bound(__first, __middle, __val, __comp);
-	      std::advance(__first, __len);
-	      __right = std::upper_bound(++__middle, __first, __val, __comp);
-	      return pair<_ForwardIterator, _ForwardIterator>(__left, __right);
-	    }
-	}
-      return pair<_ForwardIterator, _ForwardIterator>(__first, __first);
-    }
-
-  /**
-   *  @brief Determines whether an element exists in a range.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  val     The search term.
-   *  @return  True if @a val (or its equivelent) is in [@a first,@a last ].
-   *  @ingroup binarysearch
-   *
-   *  Note that this does not actually return an iterator to @a val.  For
-   *  that, use std::find or a container's specialized find member functions.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    bool
-    binary_search(_ForwardIterator __first, _ForwardIterator __last,
-                  const _Tp& __val)
-    {
-      // concept requirements
-      // See comments on lower_bound.
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_SameTypeConcept<_Tp,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      __glibcxx_requires_partitioned(__first, __last, __val);
-
-      _ForwardIterator __i = std::lower_bound(__first, __last, __val);
-      return __i != __last && !(__val < *__i);
-    }
-
-  /**
-   *  @brief Determines whether an element exists in a range.
-   *  @param  first   An iterator.
-   *  @param  last    Another iterator.
-   *  @param  val     The search term.
-   *  @param  comp    A functor to use for comparisons.
-   *  @return  True if @a val (or its equivelent) is in [@a first,@a last ].
-   *  @ingroup binarysearch
-   *
-   *  Note that this does not actually return an iterator to @a val.  For
-   *  that, use std::find or a container's specialized find member functions.
-   *
-   *  The comparison function should have the same effects on ordering as
-   *  the function used for the initial sort.
-  */
-  template<typename _ForwardIterator, typename _Tp, typename _Compare>
-    bool
-    binary_search(_ForwardIterator __first, _ForwardIterator __last,
-                  const _Tp& __val, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-		typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare, _Tp,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_partitioned_pred(__first, __last, __val, __comp);
-
-      _ForwardIterator __i = std::lower_bound(__first, __last, __val, __comp);
-      return __i != __last && !__comp(__val, *__i);
-    }
-
-  // Set algorithms: includes, set_union, set_intersection, set_difference,
-  // set_symmetric_difference.  All of these algorithms have the precondition
-  // that their input ranges are sorted and the postcondition that their output
-  // ranges are sorted.
-
-  /**
-   *  @brief Determines whether all elements of a sequence exists in a range.
-   *  @param  first1  Start of search range.
-   *  @param  last1   End of search range.
-   *  @param  first2  Start of sequence
-   *  @param  last2   End of sequence.
-   *  @return  True if each element in [first2,last2) is contained in order
-   *  within [first1,last1).  False otherwise.
-   *  @ingroup setoperations
-   *
-   *  This operation expects both [first1,last1) and [first2,last2) to be
-   *  sorted.  Searches for the presence of each element in [first2,last2)
-   *  within [first1,last1).  The iterators over each range only move forward,
-   *  so this is a linear algorithm.  If an element in [first2,last2) is not
-   *  found before the search iterator reaches @a last2, false is returned.
-  */
-  template<typename _InputIterator1, typename _InputIterator2>
-    bool
-    includes(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _InputIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted(__first1, __last1);
-      __glibcxx_requires_sorted(__first2, __last2);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	if (*__first2 < *__first1)
-	  return false;
-	else if(*__first1 < *__first2)
-	  ++__first1;
-	else
-	  ++__first1, ++__first2;
-
-      return __first2 == __last2;
-    }
-
-  /**
-   *  @brief Determines whether all elements of a sequence exists in a range
-   *  using comparison.
-   *  @param  first1  Start of search range.
-   *  @param  last1   End of search range.
-   *  @param  first2  Start of sequence
-   *  @param  last2   End of sequence.
-   *  @param  comp    Comparison function to use.
-   *  @return  True if each element in [first2,last2) is contained in order
-   *  within [first1,last1) according to comp.  False otherwise.
-   *  @ingroup setoperations
-   *
-   *  This operation expects both [first1,last1) and [first2,last2) to be
-   *  sorted.  Searches for the presence of each element in [first2,last2)
-   *  within [first1,last1), using comp to decide.  The iterators over each
-   *  range only move forward, so this is a linear algorithm.  If an element
-   *  in [first2,last2) is not found before the search iterator reaches @a
-   *  last2, false is returned.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _Compare>
-    bool
-    includes(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_sorted_pred(__first1, __last1, __comp);
-      __glibcxx_requires_sorted_pred(__first2, __last2, __comp);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	if (__comp(*__first2, *__first1))
-	  return false;
-	else if(__comp(*__first1, *__first2))
-	  ++__first1;
-	else
-	  ++__first1, ++__first2;
-
-      return __first2 == __last2;
-    }
-
-  /**
-   *  @brief Return the union of two sorted ranges.
-   *  @param  first1  Start of first range.
-   *  @param  last1   End of first range.
-   *  @param  first2  Start of second range.
-   *  @param  last2   End of second range.
-   *  @return  End of the output range.
-   *  @ingroup setoperations
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  each range in order to the output range.  Iterators increment for each
-   *  range.  When the current element of one range is less than the other,
-   *  that element is copied and the iterator advanced.  If an element is
-   *  contained in both ranges, the element from the first range is copied and
-   *  both ranges advance.  The output range may not overlap either input
-   *  range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    _OutputIterator
-    set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-	      _InputIterator2 __first2, _InputIterator2 __last2,
-	      _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted(__first1, __last1);
-      __glibcxx_requires_sorted(__first2, __last2);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	{
-	  if (*__first1 < *__first2)
-	    {
-	      *__result = *__first1;
-	      ++__first1;
-	    }
-	  else if (*__first2 < *__first1)
-	    {
-	      *__result = *__first2;
-	      ++__first2;
-	    }
-	  else
-	    {
-	      *__result = *__first1;
-	      ++__first1;
-	      ++__first2;
-	    }
-	  ++__result;
-	}
-      return std::copy(__first2, __last2, std::copy(__first1, __last1,
-						    __result));
-    }
-
-  /**
-   *  @brief Return the union of two sorted ranges using a comparison functor.
-   *  @param  first1  Start of first range.
-   *  @param  last1   End of first range.
-   *  @param  first2  Start of second range.
-   *  @param  last2   End of second range.
-   *  @param  comp    The comparison functor.
-   *  @return  End of the output range.
-   *  @ingroup setoperations
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  each range in order to the output range.  Iterators increment for each
-   *  range.  When the current element of one range is less than the other
-   *  according to @a comp, that element is copied and the iterator advanced.
-   *  If an equivalent element according to @a comp is contained in both
-   *  ranges, the element from the first range is copied and both ranges
-   *  advance.  The output range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    _OutputIterator
-    set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-	      _InputIterator2 __first2, _InputIterator2 __last2,
-	      _OutputIterator __result, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_sorted_pred(__first1, __last1, __comp);
-      __glibcxx_requires_sorted_pred(__first2, __last2, __comp);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	{
-	  if (__comp(*__first1, *__first2))
-	    {
-	      *__result = *__first1;
-	      ++__first1;
-	    }
-	  else if (__comp(*__first2, *__first1))
-	    {
-	      *__result = *__first2;
-	      ++__first2;
-	    }
-	  else
-	    {
-	      *__result = *__first1;
-	      ++__first1;
-	      ++__first2;
-	    }
-	  ++__result;
-	}
-      return std::copy(__first2, __last2, std::copy(__first1, __last1,
-						    __result));
-    }
-
-  /**
-   *  @brief Return the intersection of two sorted ranges.
-   *  @param  first1  Start of first range.
-   *  @param  last1   End of first range.
-   *  @param  first2  Start of second range.
-   *  @param  last2   End of second range.
-   *  @return  End of the output range.
-   *  @ingroup setoperations
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  both ranges in order to the output range.  Iterators increment for each
-   *  range.  When the current element of one range is less than the other,
-   *  that iterator advances.  If an element is contained in both ranges, the
-   *  element from the first range is copied and both ranges advance.  The
-   *  output range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    _OutputIterator
-    set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-		     _InputIterator2 __first2, _InputIterator2 __last2,
-		     _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted(__first1, __last1);
-      __glibcxx_requires_sorted(__first2, __last2);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	if (*__first1 < *__first2)
-	  ++__first1;
-	else if (*__first2 < *__first1)
-	  ++__first2;
-	else
-	  {
-	    *__result = *__first1;
-	    ++__first1;
-	    ++__first2;
-	    ++__result;
-	  }
-      return __result;
-    }
-
-  /**
-   *  @brief Return the intersection of two sorted ranges using comparison
-   *  functor.
-   *  @param  first1  Start of first range.
-   *  @param  last1   End of first range.
-   *  @param  first2  Start of second range.
-   *  @param  last2   End of second range.
-   *  @param  comp    The comparison functor.
-   *  @return  End of the output range.
-   *  @ingroup setoperations
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  both ranges in order to the output range.  Iterators increment for each
-   *  range.  When the current element of one range is less than the other
-   *  according to @a comp, that iterator advances.  If an element is
-   *  contained in both ranges according to @a comp, the element from the
-   *  first range is copied and both ranges advance.  The output range may not
-   *  overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    _OutputIterator
-    set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-		     _InputIterator2 __first2, _InputIterator2 __last2,
-		     _OutputIterator __result, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_sorted_pred(__first1, __last1, __comp);
-      __glibcxx_requires_sorted_pred(__first2, __last2, __comp);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	if (__comp(*__first1, *__first2))
-	  ++__first1;
-	else if (__comp(*__first2, *__first1))
-	  ++__first2;
-	else
-	  {
-	    *__result = *__first1;
-	    ++__first1;
-	    ++__first2;
-	    ++__result;
-	  }
-      return __result;
-    }
-
-  /**
-   *  @brief Return the difference of two sorted ranges.
-   *  @param  first1  Start of first range.
-   *  @param  last1   End of first range.
-   *  @param  first2  Start of second range.
-   *  @param  last2   End of second range.
-   *  @return  End of the output range.
-   *  @ingroup setoperations
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  the first range but not the second in order to the output range.
-   *  Iterators increment for each range.  When the current element of the
-   *  first range is less than the second, that element is copied and the
-   *  iterator advances.  If the current element of the second range is less,
-   *  the iterator advances, but no element is copied.  If an element is
-   *  contained in both ranges, no elements are copied and both ranges
-   *  advance.  The output range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    _OutputIterator
-    set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-		   _InputIterator2 __first2, _InputIterator2 __last2,
-		   _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted(__first1, __last1);
-      __glibcxx_requires_sorted(__first2, __last2);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	if (*__first1 < *__first2)
-	  {
-	    *__result = *__first1;
-	    ++__first1;
-	    ++__result;
-	  }
-	else if (*__first2 < *__first1)
-	  ++__first2;
-	else
-	  {
-	    ++__first1;
-	    ++__first2;
-	  }
-      return std::copy(__first1, __last1, __result);
-    }
-
-  /**
-   *  @brief  Return the difference of two sorted ranges using comparison
-   *  functor.
-   *  @param  first1  Start of first range.
-   *  @param  last1   End of first range.
-   *  @param  first2  Start of second range.
-   *  @param  last2   End of second range.
-   *  @param  comp    The comparison functor.
-   *  @return  End of the output range.
-   *  @ingroup setoperations
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  the first range but not the second in order to the output range.
-   *  Iterators increment for each range.  When the current element of the
-   *  first range is less than the second according to @a comp, that element
-   *  is copied and the iterator advances.  If the current element of the
-   *  second range is less, no element is copied and the iterator advances.
-   *  If an element is contained in both ranges according to @a comp, no
-   *  elements are copied and both ranges advance.  The output range may not
-   *  overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    _OutputIterator
-    set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-		   _InputIterator2 __first2, _InputIterator2 __last2,
-		   _OutputIterator __result, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_sorted_pred(__first1, __last1, __comp);
-      __glibcxx_requires_sorted_pred(__first2, __last2, __comp);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	if (__comp(*__first1, *__first2))
-	  {
-	    *__result = *__first1;
-	    ++__first1;
-	    ++__result;
-	  }
-	else if (__comp(*__first2, *__first1))
-	  ++__first2;
-	else
-	  {
-	    ++__first1;
-	    ++__first2;
-	  }
-      return std::copy(__first1, __last1, __result);
-    }
-
-  /**
-   *  @brief  Return the symmetric difference of two sorted ranges.
-   *  @param  first1  Start of first range.
-   *  @param  last1   End of first range.
-   *  @param  first2  Start of second range.
-   *  @param  last2   End of second range.
-   *  @return  End of the output range.
-   *  @ingroup setoperations
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  one range but not the other in order to the output range.  Iterators
-   *  increment for each range.  When the current element of one range is less
-   *  than the other, that element is copied and the iterator advances.  If an
-   *  element is contained in both ranges, no elements are copied and both
-   *  ranges advance.  The output range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator>
-    _OutputIterator
-    set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-			     _InputIterator2 __first2, _InputIterator2 __last2,
-			     _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_sorted(__first1, __last1);
-      __glibcxx_requires_sorted(__first2, __last2);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	if (*__first1 < *__first2)
-	  {
-	    *__result = *__first1;
-	    ++__first1;
-	    ++__result;
-	  }
-	else if (*__first2 < *__first1)
-	  {
-	    *__result = *__first2;
-	    ++__first2;
-	    ++__result;
-	  }
-	else
-	  {
-	    ++__first1;
-	    ++__first2;
-	  }
-      return std::copy(__first2, __last2, std::copy(__first1,
-						    __last1, __result));
-    }
-
-  /**
-   *  @brief  Return the symmetric difference of two sorted ranges using
-   *  comparison functor.
-   *  @param  first1  Start of first range.
-   *  @param  last1   End of first range.
-   *  @param  first2  Start of second range.
-   *  @param  last2   End of second range.
-   *  @param  comp    The comparison functor.
-   *  @return  End of the output range.
-   *  @ingroup setoperations
-   *
-   *  This operation iterates over both ranges, copying elements present in
-   *  one range but not the other in order to the output range.  Iterators
-   *  increment for each range.  When the current element of one range is less
-   *  than the other according to @a comp, that element is copied and the
-   *  iterator advances.  If an element is contained in both ranges according
-   *  to @a comp, no elements are copied and both ranges advance.  The output
-   *  range may not overlap either input range.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _OutputIterator, typename _Compare>
-    _OutputIterator
-    set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-			     _InputIterator2 __first2, _InputIterator2 __last2,
-			     _OutputIterator __result,
-			     _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_SameTypeConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_sorted_pred(__first1, __last1, __comp);
-      __glibcxx_requires_sorted_pred(__first2, __last2, __comp);
-
-      while (__first1 != __last1 && __first2 != __last2)
-	if (__comp(*__first1, *__first2))
-	  {
-	    *__result = *__first1;
-	    ++__first1;
-	    ++__result;
-	  }
-	else if (__comp(*__first2, *__first1))
-	  {
-	    *__result = *__first2;
-	    ++__first2;
-	    ++__result;
-	  }
-	else
-	  {
-	    ++__first1;
-	    ++__first2;
-	  }
-      return std::copy(__first2, __last2, std::copy(__first1,
-						    __last1, __result));
-    }
-
-  // min_element and max_element, with and without an explicitly supplied
-  // comparison function.
-
-  /**
-   *  @brief  Return the maximum element in a range.
-   *  @param  first  Start of range.
-   *  @param  last   End of range.
-   *  @return  Iterator referencing the first instance of the largest value.
-  */
-  template<typename _ForwardIterator>
-    _ForwardIterator
-    max_element(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __first;
-      _ForwardIterator __result = __first;
-      while (++__first != __last)
-	if (*__result < *__first)
-	  __result = __first;
-      return __result;
-    }
-
-  /**
-   *  @brief  Return the maximum element in a range using comparison functor.
-   *  @param  first  Start of range.
-   *  @param  last   End of range.
-   *  @param  comp   Comparison functor.
-   *  @return  Iterator referencing the first instance of the largest value
-   *  according to comp.
-  */
-  template<typename _ForwardIterator, typename _Compare>
-    _ForwardIterator
-    max_element(_ForwardIterator __first, _ForwardIterator __last,
-		_Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last) return __first;
-      _ForwardIterator __result = __first;
-      while (++__first != __last)
-	if (__comp(*__result, *__first)) __result = __first;
-      return __result;
-    }
-
-  /**
-   *  @brief  Return the minimum element in a range.
-   *  @param  first  Start of range.
-   *  @param  last   End of range.
-   *  @return  Iterator referencing the first instance of the smallest value.
-  */
-  template<typename _ForwardIterator>
-    _ForwardIterator
-    min_element(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __first;
-      _ForwardIterator __result = __first;
-      while (++__first != __last)
-	if (*__first < *__result)
-	  __result = __first;
-      return __result;
-    }
-
-  /**
-   *  @brief  Return the minimum element in a range using comparison functor.
-   *  @param  first  Start of range.
-   *  @param  last   End of range.
-   *  @param  comp   Comparison functor.
-   *  @return  Iterator referencing the first instance of the smallest value
-   *  according to comp.
-  */
-  template<typename _ForwardIterator, typename _Compare>
-    _ForwardIterator
-    min_element(_ForwardIterator __first, _ForwardIterator __last,
-		_Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return __first;
-      _ForwardIterator __result = __first;
-      while (++__first != __last)
-	if (__comp(*__first, *__result))
-	  __result = __first;
-      return __result;
-    }
-
-  // next_permutation and prev_permutation, with and without an explicitly
-  // supplied comparison function.
-
-  /**
-   *  @brief  Permute range into the next "dictionary" ordering.
-   *  @param  first  Start of range.
-   *  @param  last   End of range.
-   *  @return  False if wrapped to first permutation, true otherwise.
-   *
-   *  Treats all permutations of the range as a set of "dictionary" sorted
-   *  sequences.  Permutes the current sequence into the next one of this set.
-   *  Returns true if there are more sequences to generate.  If the sequence
-   *  is the largest of the set, the smallest is generated and false returned.
-  */
-  template<typename _BidirectionalIterator>
-    bool
-    next_permutation(_BidirectionalIterator __first,
-		     _BidirectionalIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return false;
-      _BidirectionalIterator __i = __first;
-      ++__i;
-      if (__i == __last)
-	return false;
-      __i = __last;
-      --__i;
-
-      for(;;)
-	{
-	  _BidirectionalIterator __ii = __i;
-	  --__i;
-	  if (*__i < *__ii)
-	    {
-	      _BidirectionalIterator __j = __last;
-	      while (!(*__i < *--__j))
-		{}
-	      std::iter_swap(__i, __j);
-	      std::reverse(__ii, __last);
-	      return true;
-	    }
-	  if (__i == __first)
-	    {
-	      std::reverse(__first, __last);
-	      return false;
-	    }
-	}
-    }
-
-  /**
-   *  @brief  Permute range into the next "dictionary" ordering using
-   *  comparison functor.
-   *  @param  first  Start of range.
-   *  @param  last   End of range.
-   *  @param  comp
-   *  @return  False if wrapped to first permutation, true otherwise.
-   *
-   *  Treats all permutations of the range [first,last) as a set of
-   *  "dictionary" sorted sequences ordered by @a comp.  Permutes the current
-   *  sequence into the next one of this set.  Returns true if there are more
-   *  sequences to generate.  If the sequence is the largest of the set, the
-   *  smallest is generated and false returned.
-  */
-  template<typename _BidirectionalIterator, typename _Compare>
-    bool
-    next_permutation(_BidirectionalIterator __first,
-		     _BidirectionalIterator __last, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_BidirectionalIterator>::value_type,
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return false;
-      _BidirectionalIterator __i = __first;
-      ++__i;
-      if (__i == __last)
-	return false;
-      __i = __last;
-      --__i;
-
-      for(;;)
-	{
-	  _BidirectionalIterator __ii = __i;
-	  --__i;
-	  if (__comp(*__i, *__ii))
-	    {
-	      _BidirectionalIterator __j = __last;
-	      while (!__comp(*__i, *--__j))
-		{}
-	      std::iter_swap(__i, __j);
-	      std::reverse(__ii, __last);
-	      return true;
-	    }
-	  if (__i == __first)
-	    {
-	      std::reverse(__first, __last);
-	      return false;
-	    }
-	}
-    }
-
-  /**
-   *  @brief  Permute range into the previous "dictionary" ordering.
-   *  @param  first  Start of range.
-   *  @param  last   End of range.
-   *  @return  False if wrapped to last permutation, true otherwise.
-   *
-   *  Treats all permutations of the range as a set of "dictionary" sorted
-   *  sequences.  Permutes the current sequence into the previous one of this
-   *  set.  Returns true if there are more sequences to generate.  If the
-   *  sequence is the smallest of the set, the largest is generated and false
-   *  returned.
-  */
-  template<typename _BidirectionalIterator>
-    bool
-    prev_permutation(_BidirectionalIterator __first,
-		     _BidirectionalIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return false;
-      _BidirectionalIterator __i = __first;
-      ++__i;
-      if (__i == __last)
-	return false;
-      __i = __last;
-      --__i;
-
-      for(;;)
-	{
-	  _BidirectionalIterator __ii = __i;
-	  --__i;
-	  if (*__ii < *__i)
-	    {
-	      _BidirectionalIterator __j = __last;
-	      while (!(*--__j < *__i))
-		{}
-	      std::iter_swap(__i, __j);
-	      std::reverse(__ii, __last);
-	      return true;
-	    }
-	  if (__i == __first)
-	    {
-	      std::reverse(__first, __last);
-	      return false;
-	    }
-	}
-    }
-
-  /**
-   *  @brief  Permute range into the previous "dictionary" ordering using
-   *  comparison functor.
-   *  @param  first  Start of range.
-   *  @param  last   End of range.
-   *  @param  comp
-   *  @return  False if wrapped to last permutation, true otherwise.
-   *
-   *  Treats all permutations of the range [first,last) as a set of
-   *  "dictionary" sorted sequences ordered by @a comp.  Permutes the current
-   *  sequence into the previous one of this set.  Returns true if there are
-   *  more sequences to generate.  If the sequence is the smallest of the set,
-   *  the largest is generated and false returned.
-  */
-  template<typename _BidirectionalIterator, typename _Compare>
-    bool
-    prev_permutation(_BidirectionalIterator __first,
-		     _BidirectionalIterator __last, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_Compare,
-	    typename iterator_traits<_BidirectionalIterator>::value_type,
-	    typename iterator_traits<_BidirectionalIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return false;
-      _BidirectionalIterator __i = __first;
-      ++__i;
-      if (__i == __last)
-	return false;
-      __i = __last;
-      --__i;
-
-      for(;;)
-	{
-	  _BidirectionalIterator __ii = __i;
-	  --__i;
-	  if (__comp(*__ii, *__i))
-	    {
-	      _BidirectionalIterator __j = __last;
-	      while (!__comp(*--__j, *__i))
-		{}
-	      std::iter_swap(__i, __j);
-	      std::reverse(__ii, __last);
-	      return true;
-	    }
-	  if (__i == __first)
-	    {
-	      std::reverse(__first, __last);
-	      return false;
-	    }
-	}
-    }
-
-  // find_first_of, with and without an explicitly supplied comparison function.
-
-  /**
-   *  @brief  Find element from a set in a sequence.
-   *  @param  first1  Start of range to search.
-   *  @param  last1   End of range to search.
-   *  @param  first2  Start of match candidates.
-   *  @param  last2   End of match candidates.
-   *  @return   The first iterator @c i in the range
-   *  @p [first1,last1) such that @c *i == @p *(i2) such that i2 is an
-   *  interator in [first2,last2), or @p last1 if no such iterator exists.
-   *
-   *  Searches the range @p [first1,last1) for an element that is equal to
-   *  some element in the range [first2,last2).  If found, returns an iterator
-   *  in the range [first1,last1), otherwise returns @p last1.
-  */
-  template<typename _InputIterator, typename _ForwardIterator>
-    _InputIterator
-    find_first_of(_InputIterator __first1, _InputIterator __last1,
-		  _ForwardIterator __first2, _ForwardIterator __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      for ( ; __first1 != __last1; ++__first1)
-	for (_ForwardIterator __iter = __first2; __iter != __last2; ++__iter)
-	  if (*__first1 == *__iter)
-	    return __first1;
-      return __last1;
-    }
-
-  /**
-   *  @brief  Find element from a set in a sequence using a predicate.
-   *  @param  first1  Start of range to search.
-   *  @param  last1   End of range to search.
-   *  @param  first2  Start of match candidates.
-   *  @param  last2   End of match candidates.
-   *  @param  comp    Predicate to use.
-   *  @return   The first iterator @c i in the range
-   *  @p [first1,last1) such that @c comp(*i, @p *(i2)) is true and i2 is an
-   *  interator in [first2,last2), or @p last1 if no such iterator exists.
-   *
-   *  Searches the range @p [first1,last1) for an element that is equal to
-   *  some element in the range [first2,last2).  If found, returns an iterator in
-   *  the range [first1,last1), otherwise returns @p last1.
-  */
-  template<typename _InputIterator, typename _ForwardIterator,
-	   typename _BinaryPredicate>
-    _InputIterator
-    find_first_of(_InputIterator __first1, _InputIterator __last1,
-		  _ForwardIterator __first2, _ForwardIterator __last2,
-		  _BinaryPredicate __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_InputIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      for ( ; __first1 != __last1; ++__first1)
-	for (_ForwardIterator __iter = __first2; __iter != __last2; ++__iter)
-	  if (__comp(*__first1, *__iter))
-	    return __first1;
-      return __last1;
-    }
-
-
-  // find_end, with and without an explicitly supplied comparison function.
-  // Search [first2, last2) as a subsequence in [first1, last1), and return
-  // the *last* possible match.  Note that find_end for bidirectional iterators
-  // is much faster than for forward iterators.
-
-  // find_end for forward iterators.
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    _ForwardIterator1
-    __find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	       _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-	       forward_iterator_tag, forward_iterator_tag)
-    {
-      if (__first2 == __last2)
-	return __last1;
-      else
-	{
-	  _ForwardIterator1 __result = __last1;
-	  while (1)
-	    {
-	      _ForwardIterator1 __new_result
-		= std::search(__first1, __last1, __first2, __last2);
-	      if (__new_result == __last1)
-		return __result;
-	      else
-		{
-		  __result = __new_result;
-		  __first1 = __new_result;
-		  ++__first1;
-		}
-	    }
-	}
-    }
-
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    _ForwardIterator1
-    __find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	       _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-	       forward_iterator_tag, forward_iterator_tag,
-	       _BinaryPredicate __comp)
-    {
-      if (__first2 == __last2)
-	return __last1;
-      else
-	{
-	  _ForwardIterator1 __result = __last1;
-	  while (1)
-	    {
-	      _ForwardIterator1 __new_result
-		= std::search(__first1, __last1, __first2, __last2, __comp);
-	      if (__new_result == __last1)
-		return __result;
-	      else
-		{
-		  __result = __new_result;
-		  __first1 = __new_result;
-		  ++__first1;
-		}
-	    }
-	}
-    }
-
-  // find_end for bidirectional iterators.  Requires partial specialization.
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2>
-    _BidirectionalIterator1
-    __find_end(_BidirectionalIterator1 __first1,
-	       _BidirectionalIterator1 __last1,
-	       _BidirectionalIterator2 __first2,
-	       _BidirectionalIterator2 __last2,
-	       bidirectional_iterator_tag, bidirectional_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator1>)
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator2>)
-
-      typedef reverse_iterator<_BidirectionalIterator1> _RevIterator1;
-      typedef reverse_iterator<_BidirectionalIterator2> _RevIterator2;
-
-      _RevIterator1 __rlast1(__first1);
-      _RevIterator2 __rlast2(__first2);
-      _RevIterator1 __rresult = std::search(_RevIterator1(__last1), __rlast1,
-					    _RevIterator2(__last2), __rlast2);
-
-      if (__rresult == __rlast1)
-	return __last1;
-      else
-	{
-	  _BidirectionalIterator1 __result = __rresult.base();
-	  std::advance(__result, -std::distance(__first2, __last2));
-	  return __result;
-	}
-    }
-
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
-	   typename _BinaryPredicate>
-    _BidirectionalIterator1
-    __find_end(_BidirectionalIterator1 __first1,
-	       _BidirectionalIterator1 __last1,
-	       _BidirectionalIterator2 __first2,
-	       _BidirectionalIterator2 __last2,
-	       bidirectional_iterator_tag, bidirectional_iterator_tag,
-	       _BinaryPredicate __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator1>)
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator2>)
-
-      typedef reverse_iterator<_BidirectionalIterator1> _RevIterator1;
-      typedef reverse_iterator<_BidirectionalIterator2> _RevIterator2;
-
-      _RevIterator1 __rlast1(__first1);
-      _RevIterator2 __rlast2(__first2);
-      _RevIterator1 __rresult = std::search(_RevIterator1(__last1), __rlast1,
-					    _RevIterator2(__last2), __rlast2,
-					    __comp);
-
-      if (__rresult == __rlast1)
-	return __last1;
-      else
-	{
-	  _BidirectionalIterator1 __result = __rresult.base();
-	  std::advance(__result, -std::distance(__first2, __last2));
-	  return __result;
-	}
-    }
-
-  // Dispatching functions for find_end.
-
-  /**
-   *  @brief  Find last matching subsequence in a sequence.
-   *  @param  first1  Start of range to search.
-   *  @param  last1   End of range to search.
-   *  @param  first2  Start of sequence to match.
-   *  @param  last2   End of sequence to match.
-   *  @return   The last iterator @c i in the range
-   *  @p [first1,last1-(last2-first2)) such that @c *(i+N) == @p *(first2+N)
-   *  for each @c N in the range @p [0,last2-first2), or @p last1 if no
-   *  such iterator exists.
-   *
-   *  Searches the range @p [first1,last1) for a sub-sequence that compares
-   *  equal value-by-value with the sequence given by @p [first2,last2) and
-   *  returns an iterator to the first element of the sub-sequence, or
-   *  @p last1 if the sub-sequence is not found.  The sub-sequence will be the
-   *  last such subsequence contained in [first,last1).
-   *
-   *  Because the sub-sequence must lie completely within the range
-   *  @p [first1,last1) it must start at a position less than
-   *  @p last1-(last2-first2) where @p last2-first2 is the length of the
-   *  sub-sequence.
-   *  This means that the returned iterator @c i will be in the range
-   *  @p [first1,last1-(last2-first2))
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    inline _ForwardIterator1
-    find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	     _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return std::__find_end(__first1, __last1, __first2, __last2,
-			     std::__iterator_category(__first1),
-			     std::__iterator_category(__first2));
-    }
-
-  /**
-   *  @brief  Find last matching subsequence in a sequence using a predicate.
-   *  @param  first1  Start of range to search.
-   *  @param  last1   End of range to search.
-   *  @param  first2  Start of sequence to match.
-   *  @param  last2   End of sequence to match.
-   *  @param  comp    The predicate to use.
-   *  @return   The last iterator @c i in the range
-   *  @p [first1,last1-(last2-first2)) such that @c predicate(*(i+N), @p
-   *  (first2+N)) is true for each @c N in the range @p [0,last2-first2), or
-   *  @p last1 if no such iterator exists.
-   *
-   *  Searches the range @p [first1,last1) for a sub-sequence that compares
-   *  equal value-by-value with the sequence given by @p [first2,last2) using
-   *  comp as a predicate and returns an iterator to the first element of the
-   *  sub-sequence, or @p last1 if the sub-sequence is not found.  The
-   *  sub-sequence will be the last such subsequence contained in
-   *  [first,last1).
-   *
-   *  Because the sub-sequence must lie completely within the range
-   *  @p [first1,last1) it must start at a position less than
-   *  @p last1-(last2-first2) where @p last2-first2 is the length of the
-   *  sub-sequence.
-   *  This means that the returned iterator @c i will be in the range
-   *  @p [first1,last1-(last2-first2))
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2,
-	   typename _BinaryPredicate>
-    inline _ForwardIterator1
-    find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-	     _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-	     _BinaryPredicate __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator1>)
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator2>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_BinaryPredicate,
-	    typename iterator_traits<_ForwardIterator1>::value_type,
-	    typename iterator_traits<_ForwardIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return std::__find_end(__first1, __last1, __first2, __last2,
-			     std::__iterator_category(__first1),
-			     std::__iterator_category(__first2),
-			     __comp);
-    }
-
-} // namespace std
-
-#endif /* _ALGO_H */
diff --git a/include.new/c++/3.4/bits/stl_algobase.h b/include.new/c++/3.4/bits/stl_algobase.h
deleted file mode 100644
index d482529..0000000
--- a/include.new/c++/3.4/bits/stl_algobase.h
+++ /dev/null
@@ -1,842 +0,0 @@
-// Bits and pieces used in algorithms -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_algobase.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _ALGOBASE_H
-#define _ALGOBASE_H 1
-
-#include <bits/c++config.h>
-#include <cstring>
-#include <climits>
-#include <cstdlib>
-#include <cstddef>
-#include <new>
-#include <iosfwd>
-#include <bits/stl_pair.h>
-#include <bits/type_traits.h>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_iterator_base_funcs.h>
-#include <bits/stl_iterator.h>
-#include <bits/concept_check.h>
-#include <debug/debug.h>
-
-namespace std
-{
-  /**
-   *  @brief Swaps the contents of two iterators.
-   *  @param  a  An iterator.
-   *  @param  b  Another iterator.
-   *  @return   Nothing.
-   *
-   *  This function swaps the values pointed to by two iterators, not the
-   *  iterators themselves.
-  */
-  template<typename _ForwardIterator1, typename _ForwardIterator2>
-    inline void
-    iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
-    {
-      typedef typename iterator_traits<_ForwardIterator1>::value_type
-	_ValueType1;
-      typedef typename iterator_traits<_ForwardIterator2>::value_type
-	_ValueType2;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator1>)
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator2>)
-      __glibcxx_function_requires(_ConvertibleConcept<_ValueType1,
-				  _ValueType2>)
-      __glibcxx_function_requires(_ConvertibleConcept<_ValueType2,
-				  _ValueType1>)
-
-      const _ValueType1 __tmp = *__a;
-      *__a = *__b;
-      *__b = __tmp;
-    }
-
-  /**
-   *  @brief Swaps two values.
-   *  @param  a  A thing of arbitrary type.
-   *  @param  b  Another thing of arbitrary type.
-   *  @return   Nothing.
-   *
-   *  This is the simple classic generic implementation.  It will work on
-   *  any type which has a copy constructor and an assignment operator.
-  */
-  template<typename _Tp>
-    inline void
-    swap(_Tp& __a, _Tp& __b)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_SGIAssignableConcept<_Tp>)
-
-      const _Tp __tmp = __a;
-      __a = __b;
-      __b = __tmp;
-    }
-
-  #undef min
-  #undef max
-
-  /**
-   *  @brief This does what you think it does.
-   *  @param  a  A thing of arbitrary type.
-   *  @param  b  Another thing of arbitrary type.
-   *  @return   The lesser of the parameters.
-   *
-   *  This is the simple classic generic implementation.  It will work on
-   *  temporary expressions, since they are only evaluated once, unlike a
-   *  preprocessor macro.
-  */
-  template<typename _Tp>
-    inline const _Tp&
-    min(const _Tp& __a, const _Tp& __b)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      //return __b < __a ? __b : __a;
-      if (__b < __a)
-	return __b;
-      return __a;
-    }
-
-  /**
-   *  @brief This does what you think it does.
-   *  @param  a  A thing of arbitrary type.
-   *  @param  b  Another thing of arbitrary type.
-   *  @return   The greater of the parameters.
-   *
-   *  This is the simple classic generic implementation.  It will work on
-   *  temporary expressions, since they are only evaluated once, unlike a
-   *  preprocessor macro.
-  */
-  template<typename _Tp>
-    inline const _Tp&
-    max(const _Tp& __a, const _Tp& __b)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_LessThanComparableConcept<_Tp>)
-      //return  __a < __b ? __b : __a;
-      if (__a < __b)
-	return __b;
-      return __a;
-    }
-
-  /**
-   *  @brief This does what you think it does.
-   *  @param  a  A thing of arbitrary type.
-   *  @param  b  Another thing of arbitrary type.
-   *  @param  comp  A @link s20_3_3_comparisons comparison functor@endlink.
-   *  @return   The lesser of the parameters.
-   *
-   *  This will work on temporary expressions, since they are only evaluated
-   *  once, unlike a preprocessor macro.
-  */
-  template<typename _Tp, typename _Compare>
-    inline const _Tp&
-    min(const _Tp& __a, const _Tp& __b, _Compare __comp)
-    {
-      //return __comp(__b, __a) ? __b : __a;
-      if (__comp(__b, __a))
-	return __b;
-      return __a;
-    }
-
-  /**
-   *  @brief This does what you think it does.
-   *  @param  a  A thing of arbitrary type.
-   *  @param  b  Another thing of arbitrary type.
-   *  @param  comp  A @link s20_3_3_comparisons comparison functor@endlink.
-   *  @return   The greater of the parameters.
-   *
-   *  This will work on temporary expressions, since they are only evaluated
-   *  once, unlike a preprocessor macro.
-  */
-  template<typename _Tp, typename _Compare>
-    inline const _Tp&
-    max(const _Tp& __a, const _Tp& __b, _Compare __comp)
-    {
-      //return __comp(__a, __b) ? __b : __a;
-      if (__comp(__a, __b))
-	return __b;
-      return __a;
-    }
-
-  // All of these auxiliary functions serve two purposes.  (1) Replace
-  // calls to copy with memmove whenever possible.  (Memmove, not memcpy,
-  // because the input and output ranges are permitted to overlap.)
-  // (2) If we're using random access iterators, then write the loop as
-  // a for loop with an explicit count.
-
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    __copy(_InputIterator __first, _InputIterator __last,
-	   _OutputIterator __result, input_iterator_tag)
-    {
-      for (; __first != __last; ++__result, ++__first)
-	*__result = *__first;
-      return __result;
-    }
-
-  template<typename _RandomAccessIterator, typename _OutputIterator>
-    inline _OutputIterator
-    __copy(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	   _OutputIterator __result, random_access_iterator_tag)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-          _Distance;
-      for (_Distance __n = __last - __first; __n > 0; --__n)
-	{
-	  *__result = *__first;
-	  ++__first;
-	  ++__result;
-	}
-      return __result;
-    }
-
-  template<typename _Tp>
-    inline _Tp*
-    __copy_trivial(const _Tp* __first, const _Tp* __last, _Tp* __result)
-    {
-      std::memmove(__result, __first, sizeof(_Tp) * (__last - __first));
-      return __result + (__last - __first);
-    }
-
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    __copy_aux2(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result, __false_type)
-    { return std::__copy(__first, __last, __result,
-			 std::__iterator_category(__first)); }
-
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    __copy_aux2(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result, __true_type)
-    { return std::__copy(__first, __last, __result,
-			 std::__iterator_category(__first)); }
-
-  template<typename _Tp>
-    inline _Tp*
-    __copy_aux2(_Tp* __first, _Tp* __last, _Tp* __result, __true_type)
-    { return std::__copy_trivial(__first, __last, __result); }
-
-  template<typename _Tp>
-    inline _Tp*
-    __copy_aux2(const _Tp* __first, const _Tp* __last, _Tp* __result,
-		__true_type)
-    { return std::__copy_trivial(__first, __last, __result); }
-
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    __copy_ni2(_InputIterator __first, _InputIterator __last,
-	       _OutputIterator __result, __true_type)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type
-	_ValueType;
-      typedef typename __type_traits<
-	_ValueType>::has_trivial_assignment_operator _Trivial;
-      return _OutputIterator(std::__copy_aux2(__first, __last, __result.base(),
-					      _Trivial()));
-    }
-
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    __copy_ni2(_InputIterator __first, _InputIterator __last,
-	       _OutputIterator __result, __false_type)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
-      typedef typename __type_traits<
-	_ValueType>::has_trivial_assignment_operator _Trivial;
-      return std::__copy_aux2(__first, __last, __result, _Trivial());
-    }
-
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    __copy_ni1(_InputIterator __first, _InputIterator __last,
-	       _OutputIterator __result, __true_type)
-    {
-      typedef typename _Is_normal_iterator<_OutputIterator>::_Normal __Normal;
-      return std::__copy_ni2(__first.base(), __last.base(),
-			     __result, __Normal());
-    }
-
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    __copy_ni1(_InputIterator __first, _InputIterator __last,
-	       _OutputIterator __result, __false_type)
-    {
-      typedef typename _Is_normal_iterator<_OutputIterator>::_Normal __Normal;
-      return std::__copy_ni2(__first, __last, __result, __Normal());
-    }
-
-  /**
-   *  @brief Copies the range [first,last) into result.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  result An output iterator.
-   *  @return   result + (first - last)
-   *
-   *  This inline function will boil down to a call to @c memmove whenever
-   *  possible.  Failing that, if random access iterators are passed, then the
-   *  loop count will be known (and therefore a candidate for compiler
-   *  optimizations such as unrolling).  Result may not be contained within
-   *  [first,last); the copy_backward function should be used instead.
-   *
-   *  Note that the end of the output range is permitted to be contained
-   *  within [first,last).
-  */
-  template<typename _InputIterator, typename _OutputIterator>
-    inline _OutputIterator
-    copy(_InputIterator __first, _InputIterator __last,
-	 _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-       typedef typename _Is_normal_iterator<_InputIterator>::_Normal __Normal;
-       return std::__copy_ni1(__first, __last, __result, __Normal());
-    }
-
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2>
-    inline _BidirectionalIterator2
-    __copy_backward(_BidirectionalIterator1 __first,
-		    _BidirectionalIterator1 __last,
-		    _BidirectionalIterator2 __result,
-		    bidirectional_iterator_tag)
-    {
-      while (__first != __last)
-        *--__result = *--__last;
-      return __result;
-    }
-
-  template<typename _RandomAccessIterator, typename _BidirectionalIterator>
-    inline _BidirectionalIterator
-    __copy_backward(_RandomAccessIterator __first, _RandomAccessIterator __last,
-		    _BidirectionalIterator __result, random_access_iterator_tag)
-    {
-      typename iterator_traits<_RandomAccessIterator>::difference_type __n;
-      for (__n = __last - __first; __n > 0; --__n)
-        *--__result = *--__last;
-      return __result;
-    }
-
-
-  // This dispatch class is a workaround for compilers that do not
-  // have partial ordering of function templates.  All we're doing is
-  // creating a specialization so that we can turn a call to copy_backward
-  // into a memmove whenever possible.
-  template<typename _BidirectionalIterator1, typename _BidirectionalIterator2,
-           typename _BoolType>
-    struct __copy_backward_dispatch
-    {
-      static _BidirectionalIterator2
-      copy(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last,
-	   _BidirectionalIterator2 __result)
-      { return std::__copy_backward(__first, __last, __result,
-				    std::__iterator_category(__first)); }
-    };
-
-  template<typename _Tp>
-    struct __copy_backward_dispatch<_Tp*, _Tp*, __true_type>
-    {
-      static _Tp*
-      copy(const _Tp* __first, const _Tp* __last, _Tp* __result)
-      {
-	const ptrdiff_t _Num = __last - __first;
-	std::memmove(__result - _Num, __first, sizeof(_Tp) * _Num);
-	return __result - _Num;
-      }
-    };
-
-  template<typename _Tp>
-    struct __copy_backward_dispatch<const _Tp*, _Tp*, __true_type>
-    {
-      static _Tp*
-      copy(const _Tp* __first, const _Tp* __last, _Tp* __result)
-      {
-	return  std::__copy_backward_dispatch<_Tp*, _Tp*, __true_type>
-	  ::copy(__first, __last, __result);
-      }
-    };
-
-  template<typename _BI1, typename _BI2>
-    inline _BI2
-    __copy_backward_aux(_BI1 __first, _BI1 __last, _BI2 __result)
-    {
-      typedef typename __type_traits<typename iterator_traits<_BI2>::value_type>
-			    ::has_trivial_assignment_operator _Trivial;
-      return
-	std::__copy_backward_dispatch<_BI1, _BI2, _Trivial>::copy(__first,
-								  __last,
-								  __result);
-    }
-
-  template <typename _BI1, typename _BI2>
-    inline _BI2
-    __copy_backward_output_normal_iterator(_BI1 __first, _BI1 __last,
-					   _BI2 __result, __true_type)
-    { return _BI2(std::__copy_backward_aux(__first, __last, __result.base())); }
-
-  template <typename _BI1, typename _BI2>
-    inline _BI2
-    __copy_backward_output_normal_iterator(_BI1 __first, _BI1 __last,
-					   _BI2 __result, __false_type)
-    { return std::__copy_backward_aux(__first, __last, __result); }
-
-  template <typename _BI1, typename _BI2>
-    inline _BI2
-    __copy_backward_input_normal_iterator(_BI1 __first, _BI1 __last,
-					  _BI2 __result, __true_type)
-    {
-      typedef typename _Is_normal_iterator<_BI2>::_Normal __Normal;
-      return std::__copy_backward_output_normal_iterator(__first.base(),
-							 __last.base(),
-							 __result, __Normal());
-    }
-
-  template <typename _BI1, typename _BI2>
-    inline _BI2
-    __copy_backward_input_normal_iterator(_BI1 __first, _BI1 __last,
-					  _BI2 __result, __false_type)
-    {
-      typedef typename _Is_normal_iterator<_BI2>::_Normal __Normal;
-      return std::__copy_backward_output_normal_iterator(__first, __last,
-							 __result, __Normal());
-    }
-
-  /**
-   *  @brief Copies the range [first,last) into result.
-   *  @param  first  A bidirectional iterator.
-   *  @param  last   A bidirectional iterator.
-   *  @param  result A bidirectional iterator.
-   *  @return   result - (first - last)
-   *
-   *  The function has the same effect as copy, but starts at the end of the
-   *  range and works its way to the start, returning the start of the result.
-   *  This inline function will boil down to a call to @c memmove whenever
-   *  possible.  Failing that, if random access iterators are passed, then the
-   *  loop count will be known (and therefore a candidate for compiler
-   *  optimizations such as unrolling).
-   *
-   *  Result may not be in the range [first,last).  Use copy instead.  Note
-   *  that the start of the output range may overlap [first,last).
-  */
-  template <typename _BI1, typename _BI2>
-    inline _BI2
-    copy_backward(_BI1 __first, _BI1 __last, _BI2 __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<_BI1>)
-      __glibcxx_function_requires(_Mutable_BidirectionalIteratorConcept<_BI2>)
-      __glibcxx_function_requires(_ConvertibleConcept<
-	    typename iterator_traits<_BI1>::value_type,
-	    typename iterator_traits<_BI2>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      typedef typename _Is_normal_iterator<_BI1>::_Normal __Normal;
-      return std::__copy_backward_input_normal_iterator(__first, __last,
-							__result, __Normal());
-    }
-
-
-  /**
-   *  @brief Fills the range [first,last) with copies of value.
-   *  @param  first  A forward iterator.
-   *  @param  last   A forward iterator.
-   *  @param  value  A reference-to-const of arbitrary type.
-   *  @return   Nothing.
-   *
-   *  This function fills a range with copies of the same value.  For one-byte
-   *  types filling contiguous areas of memory, this becomes an inline call to
-   *  @c memset.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    void
-    fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<
-				  _ForwardIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	*__first = __value;
-    }
-
-  /**
-   *  @brief Fills the range [first,first+n) with copies of value.
-   *  @param  first  An output iterator.
-   *  @param  n      The count of copies to perform.
-   *  @param  value  A reference-to-const of arbitrary type.
-   *  @return   The iterator at first+n.
-   *
-   *  This function fills a range with copies of the same value.  For one-byte
-   *  types filling contiguous areas of memory, this becomes an inline call to
-   *  @c memset.
-  */
-  template<typename _OutputIterator, typename _Size, typename _Tp>
-    _OutputIterator
-    fill_n(_OutputIterator __first, _Size __n, const _Tp& __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,_Tp>)
-
-      for ( ; __n > 0; --__n, ++__first)
-	*__first = __value;
-      return __first;
-    }
-
-  // Specialization: for one-byte types we can use memset.
-  inline void
-  fill(unsigned char* __first, unsigned char* __last, const unsigned char& __c)
-  {
-    __glibcxx_requires_valid_range(__first, __last);
-    const unsigned char __tmp = __c;
-    std::memset(__first, __tmp, __last - __first);
-  }
-
-  inline void
-  fill(signed char* __first, signed char* __last, const signed char& __c)
-  {
-    __glibcxx_requires_valid_range(__first, __last);
-    const signed char __tmp = __c;
-    std::memset(__first, static_cast<unsigned char>(__tmp), __last - __first);
-  }
-
-  inline void
-  fill(char* __first, char* __last, const char& __c)
-  {
-    __glibcxx_requires_valid_range(__first, __last);
-    const char __tmp = __c;
-    std::memset(__first, static_cast<unsigned char>(__tmp), __last - __first);
-  }
-
-  template<typename _Size>
-    inline unsigned char*
-    fill_n(unsigned char* __first, _Size __n, const unsigned char& __c)
-    {
-      std::fill(__first, __first + __n, __c);
-      return __first + __n;
-    }
-
-  template<typename _Size>
-    inline signed char*
-    fill_n(char* __first, _Size __n, const signed char& __c)
-    {
-      std::fill(__first, __first + __n, __c);
-      return __first + __n;
-    }
-
-  template<typename _Size>
-    inline char*
-    fill_n(char* __first, _Size __n, const char& __c)
-    {
-      std::fill(__first, __first + __n, __c);
-      return __first + __n;
-    }
-
-
-  /**
-   *  @brief Finds the places in ranges which don't match.
-   *  @param  first1  An input iterator.
-   *  @param  last1   An input iterator.
-   *  @param  first2  An input iterator.
-   *  @return   A pair of iterators pointing to the first mismatch.
-   *
-   *  This compares the elements of two ranges using @c == and returns a pair
-   *  of iterators.  The first iterator points into the first range, the
-   *  second iterator points into the second range, and the elements pointed
-   *  to by the iterators are not equal.
-  */
-  template<typename _InputIterator1, typename _InputIterator2>
-    pair<_InputIterator1, _InputIterator2>
-    mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      while (__first1 != __last1 && *__first1 == *__first2)
-        {
-	  ++__first1;
-	  ++__first2;
-        }
-      return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
-    }
-
-  /**
-   *  @brief Finds the places in ranges which don't match.
-   *  @param  first1  An input iterator.
-   *  @param  last1   An input iterator.
-   *  @param  first2  An input iterator.
-   *  @param  binary_pred  A binary predicate @link s20_3_1_base functor@endlink.
-   *  @return   A pair of iterators pointing to the first mismatch.
-   *
-   *  This compares the elements of two ranges using the binary_pred
-   *  parameter, and returns a pair
-   *  of iterators.  The first iterator points into the first range, the
-   *  second iterator points into the second range, and the elements pointed
-   *  to by the iterators are not equal.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _BinaryPredicate>
-    pair<_InputIterator1, _InputIterator2>
-    mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-	     _InputIterator2 __first2, _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      while (__first1 != __last1 && __binary_pred(*__first1, *__first2))
-        {
-	  ++__first1;
-	  ++__first2;
-        }
-      return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
-    }
-
-  /**
-   *  @brief Tests a range for element-wise equality.
-   *  @param  first1  An input iterator.
-   *  @param  last1   An input iterator.
-   *  @param  first2  An input iterator.
-   *  @return   A boolean true or false.
-   *
-   *  This compares the elements of two ranges using @c == and returns true or
-   *  false depending on whether all of the corresponding elements of the
-   *  ranges are equal.
-  */
-  template<typename _InputIterator1, typename _InputIterator2>
-    inline bool
-    equal(_InputIterator1 __first1, _InputIterator1 __last1,
-	  _InputIterator2 __first2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_EqualOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for ( ; __first1 != __last1; ++__first1, ++__first2)
-	if (!(*__first1 == *__first2))
-	  return false;
-      return true;
-    }
-
-  /**
-   *  @brief Tests a range for element-wise equality.
-   *  @param  first1  An input iterator.
-   *  @param  last1   An input iterator.
-   *  @param  first2  An input iterator.
-   *  @param  binary_pred  A binary predicate @link s20_3_1_base functor@endlink.
-   *  @return   A boolean true or false.
-   *
-   *  This compares the elements of two ranges using the binary_pred
-   *  parameter, and returns true or
-   *  false depending on whether all of the corresponding elements of the
-   *  ranges are equal.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _BinaryPredicate>
-    inline bool
-    equal(_InputIterator1 __first1, _InputIterator1 __last1,
-	  _InputIterator2 __first2,
-	  _BinaryPredicate __binary_pred)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for ( ; __first1 != __last1; ++__first1, ++__first2)
-	if (!__binary_pred(*__first1, *__first2))
-	  return false;
-      return true;
-    }
-
-  /**
-   *  @brief Performs "dictionary" comparison on ranges.
-   *  @param  first1  An input iterator.
-   *  @param  last1   An input iterator.
-   *  @param  first2  An input iterator.
-   *  @param  last2   An input iterator.
-   *  @return   A boolean true or false.
-   *
-   *  "Returns true if the sequence of elements defined by the range
-   *  [first1,last1) is lexicographically less than the sequence of elements
-   *  defined by the range [first2,last2).  Returns false otherwise."
-   *  (Quoted from [25.3.8]/1.)  If the iterators are all character pointers,
-   *  then this is an inline call to @c memcmp.
-  */
-  template<typename _InputIterator1, typename _InputIterator2>
-    bool
-    lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
-			    _InputIterator2 __first2, _InputIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator1>::value_type,
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_function_requires(_LessThanOpConcept<
-	    typename iterator_traits<_InputIterator2>::value_type,
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      for (;__first1 != __last1 && __first2 != __last2; ++__first1, ++__first2)
-	{
-	  if (*__first1 < *__first2)
-	    return true;
-	  if (*__first2 < *__first1)
-	    return false;
-	}
-      return __first1 == __last1 && __first2 != __last2;
-    }
-
-  /**
-   *  @brief Performs "dictionary" comparison on ranges.
-   *  @param  first1  An input iterator.
-   *  @param  last1   An input iterator.
-   *  @param  first2  An input iterator.
-   *  @param  last2   An input iterator.
-   *  @param  comp  A @link s20_3_3_comparisons comparison functor@endlink.
-   *  @return   A boolean true or false.
-   *
-   *  The same as the four-parameter @c lexigraphical_compare, but uses the
-   *  comp parameter instead of @c <.
-  */
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _Compare>
-    bool
-    lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
-			    _InputIterator2 __first2, _InputIterator2 __last2,
-			    _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      for ( ; __first1 != __last1 && __first2 != __last2
-	    ; ++__first1, ++__first2)
-	{
-	  if (__comp(*__first1, *__first2))
-	    return true;
-	  if (__comp(*__first2, *__first1))
-	    return false;
-	}
-      return __first1 == __last1 && __first2 != __last2;
-    }
-
-  inline bool
-  lexicographical_compare(const unsigned char* __first1,
-			  const unsigned char* __last1,
-			  const unsigned char* __first2,
-			  const unsigned char* __last2)
-  {
-    __glibcxx_requires_valid_range(__first1, __last1);
-    __glibcxx_requires_valid_range(__first2, __last2);
-
-    const size_t __len1 = __last1 - __first1;
-    const size_t __len2 = __last2 - __first2;
-    const int __result = std::memcmp(__first1, __first2,
-				     std::min(__len1, __len2));
-    return __result != 0 ? __result < 0 : __len1 < __len2;
-  }
-
-  inline bool
-  lexicographical_compare(const char* __first1, const char* __last1,
-			  const char* __first2, const char* __last2)
-  {
-    __glibcxx_requires_valid_range(__first1, __last1);
-    __glibcxx_requires_valid_range(__first2, __last2);
-
-#if CHAR_MAX == SCHAR_MAX
-    return std::lexicographical_compare((const signed char*) __first1,
-					(const signed char*) __last1,
-					(const signed char*) __first2,
-					(const signed char*) __last2);
-#else /* CHAR_MAX == SCHAR_MAX */
-    return std::lexicographical_compare((const unsigned char*) __first1,
-					(const unsigned char*) __last1,
-					(const unsigned char*) __first2,
-					(const unsigned char*) __last2);
-#endif /* CHAR_MAX == SCHAR_MAX */
-  }
-
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/stl_bvector.h b/include.new/c++/3.4/bits/stl_bvector.h
deleted file mode 100644
index afae738..0000000
--- a/include.new/c++/3.4/bits/stl_bvector.h
+++ /dev/null
@@ -1,876 +0,0 @@
-// vector<bool> specialization -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1999
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_bvector.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _BVECTOR_H
-#define _BVECTOR_H 1
-
-namespace _GLIBCXX_STD
-{
-  typedef unsigned long _Bit_type;
-  enum { _S_word_bit = int(CHAR_BIT * sizeof(_Bit_type)) };
-
-  struct _Bit_reference
-  {
-    _Bit_type * _M_p;
-    _Bit_type _M_mask;
-
-    _Bit_reference(_Bit_type * __x, _Bit_type __y)
-    : _M_p(__x), _M_mask(__y) { }
-
-    _Bit_reference() : _M_p(0), _M_mask(0) { }
-
-    operator bool() const { return !!(*_M_p & _M_mask); }
-
-    _Bit_reference&
-    operator=(bool __x)
-    {
-      if (__x)
-	*_M_p |= _M_mask;
-      else
-	*_M_p &= ~_M_mask;
-      return *this;
-    }
-
-    _Bit_reference&
-    operator=(const _Bit_reference& __x)
-    { return *this = bool(__x); }
-
-    bool
-    operator==(const _Bit_reference& __x) const
-    { return bool(*this) == bool(__x); }
-
-    bool
-    operator<(const _Bit_reference& __x) const
-    { return !bool(*this) && bool(__x); }
-
-    void
-    flip() { *_M_p ^= _M_mask; }
-  };
-
-  struct _Bit_iterator_base : public iterator<random_access_iterator_tag, bool>
-  {
-    _Bit_type * _M_p;
-    unsigned int _M_offset;
-
-    _Bit_iterator_base(_Bit_type * __x, unsigned int __y)
-    : _M_p(__x), _M_offset(__y) { }
-
-    void
-    _M_bump_up()
-    {
-      if (_M_offset++ == _S_word_bit - 1)
-	{
-	  _M_offset = 0;
-	  ++_M_p;
-	}
-    }
-
-    void
-    _M_bump_down()
-    {
-      if (_M_offset-- == 0)
-	{
-	  _M_offset = _S_word_bit - 1;
-	  --_M_p;
-	}
-    }
-
-    void
-    _M_incr(ptrdiff_t __i)
-    {
-      difference_type __n = __i + _M_offset;
-      _M_p += __n / _S_word_bit;
-      __n = __n % _S_word_bit;
-      if (__n < 0)
-	{
-	  _M_offset = static_cast<unsigned int>(__n + _S_word_bit);
-	  --_M_p;
-	}
-      else
-	_M_offset = static_cast<unsigned int>(__n);
-    }
-
-    bool
-    operator==(const _Bit_iterator_base& __i) const
-    { return _M_p == __i._M_p && _M_offset == __i._M_offset; }
-
-    bool
-    operator<(const _Bit_iterator_base& __i) const
-    {
-      return _M_p < __i._M_p
-	     || (_M_p == __i._M_p && _M_offset < __i._M_offset);
-    }
-
-    bool
-    operator!=(const _Bit_iterator_base& __i) const
-    { return !(*this == __i); }
-
-    bool
-    operator>(const _Bit_iterator_base& __i) const
-    { return __i < *this; }
-
-    bool
-    operator<=(const _Bit_iterator_base& __i) const
-    { return !(__i < *this); }
-
-    bool
-    operator>=(const _Bit_iterator_base& __i) const
-    { return !(*this < __i); }
-  };
-
-  inline ptrdiff_t
-  operator-(const _Bit_iterator_base& __x, const _Bit_iterator_base& __y)
-  {
-    return _S_word_bit * (__x._M_p - __y._M_p) + __x._M_offset - __y._M_offset;
-  }
-
-  struct _Bit_iterator : public _Bit_iterator_base
-  {
-    typedef _Bit_reference  reference;
-    typedef _Bit_reference* pointer;
-    typedef _Bit_iterator   iterator;
-
-    _Bit_iterator() : _Bit_iterator_base(0, 0) { }
-    _Bit_iterator(_Bit_type * __x, unsigned int __y)
-    : _Bit_iterator_base(__x, __y) { }
-
-    reference
-    operator*() const { return reference(_M_p, 1UL << _M_offset); }
-
-    iterator&
-    operator++()
-    {
-      _M_bump_up();
-      return *this;
-    }
-
-    iterator
-    operator++(int)
-    {
-      iterator __tmp = *this;
-      _M_bump_up();
-      return __tmp;
-    }
-
-    iterator&
-    operator--()
-    {
-      _M_bump_down();
-      return *this;
-    }
-
-    iterator
-    operator--(int)
-    {
-      iterator __tmp = *this;
-      _M_bump_down();
-      return __tmp;
-    }
-
-    iterator&
-    operator+=(difference_type __i)
-    {
-      _M_incr(__i);
-      return *this;
-    }
-
-    iterator&
-    operator-=(difference_type __i)
-    {
-      *this += -__i;
-      return *this;
-    }
-
-    iterator
-    operator+(difference_type __i) const
-    {
-      iterator __tmp = *this;
-      return __tmp += __i;
-    }
-
-    iterator
-    operator-(difference_type __i) const
-    {
-      iterator __tmp = *this;
-      return __tmp -= __i;
-    }
-
-    reference
-    operator[](difference_type __i)
-    { return *(*this + __i); }
-  };
-
-  inline _Bit_iterator
-  operator+(ptrdiff_t __n, const _Bit_iterator& __x) { return __x + __n; }
-
-
-  struct _Bit_const_iterator : public _Bit_iterator_base
-  {
-    typedef bool                 reference;
-    typedef bool                 const_reference;
-    typedef const bool*          pointer;
-    typedef _Bit_const_iterator  const_iterator;
-
-    _Bit_const_iterator() : _Bit_iterator_base(0, 0) { }
-    _Bit_const_iterator(_Bit_type * __x, unsigned int __y)
-    : _Bit_iterator_base(__x, __y) { }
-    _Bit_const_iterator(const _Bit_iterator& __x)
-    : _Bit_iterator_base(__x._M_p, __x._M_offset) { }
-
-    const_reference
-    operator*() const
-    { return _Bit_reference(_M_p, 1UL << _M_offset); }
-
-    const_iterator&
-    operator++()
-    {
-      _M_bump_up();
-      return *this;
-    }
-
-    const_iterator
-    operator++(int)
-    {
-      const_iterator __tmp = *this;
-      _M_bump_up();
-      return __tmp;
-    }
-
-    const_iterator&
-    operator--()
-    {
-      _M_bump_down();
-      return *this;
-    }
-
-    const_iterator
-    operator--(int)
-    {
-      const_iterator __tmp = *this;
-      _M_bump_down();
-      return __tmp;
-    }
-
-    const_iterator&
-    operator+=(difference_type __i)
-    {
-      _M_incr(__i);
-      return *this;
-    }
-
-    const_iterator&
-    operator-=(difference_type __i)
-    {
-      *this += -__i;
-      return *this;
-    }
-
-    const_iterator 
-    operator+(difference_type __i) const {
-      const_iterator __tmp = *this;
-      return __tmp += __i;
-    }
-
-    const_iterator
-    operator-(difference_type __i) const
-    {
-      const_iterator __tmp = *this;
-      return __tmp -= __i;
-    }
-
-    const_reference
-    operator[](difference_type __i)
-    { return *(*this + __i); }
-  };
-
-  inline _Bit_const_iterator
-  operator+(ptrdiff_t __n, const _Bit_const_iterator& __x)
-  { return __x + __n; }
-
-  template<class _Alloc>
-    class _Bvector_base
-    {
-      typedef typename _Alloc::template rebind<_Bit_type>::other
-        _Bit_alloc_type;
-      
-      struct _Bvector_impl : public _Bit_alloc_type
-      {
-	_Bit_iterator 	_M_start;
-	_Bit_iterator 	_M_finish;
-	_Bit_type* 	_M_end_of_storage;
-	_Bvector_impl(const _Bit_alloc_type& __a)
-	: _Bit_alloc_type(__a), _M_start(), _M_finish(), _M_end_of_storage(0)
-	{ }
-      };
-
-    public:
-      typedef _Alloc allocator_type;
-
-      allocator_type
-      get_allocator() const
-      { return *static_cast<const _Bit_alloc_type*>(&this->_M_impl); }
-
-      _Bvector_base(const allocator_type& __a) : _M_impl(__a) { }
-
-      ~_Bvector_base() { this->_M_deallocate(); }
-
-    protected:
-      _Bvector_impl _M_impl;
-
-      _Bit_type*
-      _M_allocate(size_t __n)
-      { return _M_impl.allocate((__n + _S_word_bit - 1) / _S_word_bit); }
-
-      void
-      _M_deallocate()
-      {
-	if (_M_impl._M_start._M_p)
-	  _M_impl.deallocate(_M_impl._M_start._M_p,
-			    _M_impl._M_end_of_storage - _M_impl._M_start._M_p);
-      }
-    };
-} // namespace std
-
-// Declare a partial specialization of vector<T, Alloc>.
-#include <bits/stl_vector.h>
-
-namespace _GLIBCXX_STD
-{
-  /**
-   *  @brief  A specialization of vector for booleans which offers fixed time
-   *  access to individual elements in any order.
-   *
-   *  Note that vector<bool> does not actually meet the requirements for being
-   *  a container.  This is because the reference and pointer types are not
-   *  really references and pointers to bool.  See DR96 for details.  @see
-   *  vector for function documentation.
-   *
-   *  @ingroup Containers
-   *  @ingroup Sequences
-   *
-   *  In some terminology a %vector can be described as a dynamic
-   *  C-style array, it offers fast and efficient access to individual
-   *  elements in any order and saves the user from worrying about
-   *  memory and size allocation.  Subscripting ( @c [] ) access is
-   *  also provided as with C-style arrays.
-  */
-template<typename _Alloc>
-  class vector<bool, _Alloc> : public _Bvector_base<_Alloc>
-  {
-  public:
-    typedef bool value_type;
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Bit_reference reference;
-    typedef bool const_reference;
-    typedef _Bit_reference* pointer;
-    typedef const bool* const_pointer;
-
-    typedef _Bit_iterator                iterator;
-    typedef _Bit_const_iterator          const_iterator;
-
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-
-    typedef typename _Bvector_base<_Alloc>::allocator_type allocator_type;
-
-    allocator_type get_allocator() const
-    { return _Bvector_base<_Alloc>::get_allocator(); }
-
-  protected:
-    using _Bvector_base<_Alloc>::_M_allocate;
-    using _Bvector_base<_Alloc>::_M_deallocate;
-
-  protected:
-    void _M_initialize(size_type __n)
-    {
-      _Bit_type* __q = this->_M_allocate(__n);
-      this->_M_impl._M_end_of_storage = __q 
-	                               + (__n + _S_word_bit - 1) / _S_word_bit;
-      this->_M_impl._M_start = iterator(__q, 0);
-      this->_M_impl._M_finish = this->_M_impl._M_start + difference_type(__n);
-    }
-
-    void _M_insert_aux(iterator __position, bool __x)
-    {
-      if (this->_M_impl._M_finish._M_p != this->_M_impl._M_end_of_storage)
-	{
-	  std::copy_backward(__position, this->_M_impl._M_finish, 
-			     this->_M_impl._M_finish + 1);
-	  *__position = __x;
-	  ++this->_M_impl._M_finish;
-	}
-      else
-	{
-	  const size_type __len = size() ? 2 * size()
-	                                 : static_cast<size_type>(_S_word_bit);
-	  _Bit_type * __q = this->_M_allocate(__len);
-	  iterator __i = std::copy(begin(), __position, iterator(__q, 0));
-	  *__i++ = __x;
-	  this->_M_impl._M_finish = std::copy(__position, end(), __i);
-	  this->_M_deallocate();
-	  this->_M_impl._M_end_of_storage = __q + (__len + _S_word_bit - 1)
-				    / _S_word_bit;
-	  this->_M_impl._M_start = iterator(__q, 0);
-	}
-    }
-
-    template<class _InputIterator>
-    void _M_initialize_range(_InputIterator __first, _InputIterator __last,
-                             input_iterator_tag)
-    {
-      this->_M_impl._M_start = iterator();
-      this->_M_impl._M_finish = iterator();
-      this->_M_impl._M_end_of_storage = 0;
-      for ( ; __first != __last; ++__first)
-        push_back(*__first);
-    }
-
-    template<class _ForwardIterator>
-    void _M_initialize_range(_ForwardIterator __first, _ForwardIterator __last,
-                             forward_iterator_tag)
-    {
-      const size_type __n = std::distance(__first, __last);
-      _M_initialize(__n);
-      std::copy(__first, __last, this->_M_impl._M_start);
-    }
-
-    template<class _InputIterator>
-    void _M_insert_range(iterator __pos, _InputIterator __first, 
-			 _InputIterator __last, input_iterator_tag)
-    {
-      for ( ; __first != __last; ++__first)
-	{
-	  __pos = insert(__pos, *__first);
-	  ++__pos;
-	}
-    }
-
-    template<class _ForwardIterator>
-    void _M_insert_range(iterator __position, _ForwardIterator __first, 
-			 _ForwardIterator __last, forward_iterator_tag)
-    {
-      if (__first != __last)
-	{
-	  size_type __n = std::distance(__first, __last);
-	  if (capacity() - size() >= __n)
-	    {
-	      std::copy_backward(__position, end(),
-			       this->_M_impl._M_finish + difference_type(__n));
-	      std::copy(__first, __last, __position);
-	      this->_M_impl._M_finish += difference_type(__n);
-	    }
-	  else
-	    {
-	      const size_type __len = size() + std::max(size(), __n);
-	      _Bit_type * __q = this->_M_allocate(__len);
-	      iterator __i = std::copy(begin(), __position, iterator(__q, 0));
-	      __i = std::copy(__first, __last, __i);
-	      this->_M_impl._M_finish = std::copy(__position, end(), __i);
-	      this->_M_deallocate();
-	      this->_M_impl._M_end_of_storage = __q + (__len + _S_word_bit - 1)
-		                                / _S_word_bit;
-	      this->_M_impl._M_start = iterator(__q, 0);
-	    }
-	}
-    }
-
-  public:
-    iterator begin()
-    { return this->_M_impl._M_start; }
-
-    const_iterator begin() const
-    { return this->_M_impl._M_start; }
-
-    iterator end()
-    { return this->_M_impl._M_finish; }
-
-    const_iterator end() const
-    { return this->_M_impl._M_finish; }
-
-    reverse_iterator rbegin()
-    { return reverse_iterator(end()); }
-
-    const_reverse_iterator rbegin() const
-    { return const_reverse_iterator(end()); }
-
-    reverse_iterator rend()
-    { return reverse_iterator(begin()); }
-
-    const_reverse_iterator rend() const
-    { return const_reverse_iterator(begin()); }
-
-    size_type size() const
-    { return size_type(end() - begin()); }
-
-    size_type max_size() const
-    { return size_type(-1); }
-
-    size_type capacity() const
-    { return size_type(const_iterator(this->_M_impl._M_end_of_storage, 0)
-		       - begin()); }
-    bool empty() const
-    { return begin() == end(); }
-
-    reference operator[](size_type __n)
-    { return *(begin() + difference_type(__n)); }
-
-    const_reference operator[](size_type __n) const
-    { return *(begin() + difference_type(__n)); }
-
-    void _M_range_check(size_type __n) const
-    {
-      if (__n >= this->size())
-        __throw_out_of_range(__N("vector<bool>::_M_range_check"));
-    }
-
-    reference at(size_type __n)
-    { _M_range_check(__n); return (*this)[__n]; }
-
-    const_reference at(size_type __n) const
-    { _M_range_check(__n); return (*this)[__n]; }
-
-    explicit vector(const allocator_type& __a = allocator_type())
-      : _Bvector_base<_Alloc>(__a) { }
-
-    vector(size_type __n, bool __value, 
-	   const allocator_type& __a = allocator_type())
-    : _Bvector_base<_Alloc>(__a)
-    {
-      _M_initialize(__n);
-      std::fill(this->_M_impl._M_start._M_p, this->_M_impl._M_end_of_storage, 
-		__value ? ~0 : 0);
-    }
-
-    explicit vector(size_type __n)
-    : _Bvector_base<_Alloc>(allocator_type())
-    {
-      _M_initialize(__n);
-      std::fill(this->_M_impl._M_start._M_p, 
-		this->_M_impl._M_end_of_storage, 0);
-    }
-
-    vector(const vector& __x) : _Bvector_base<_Alloc>(__x.get_allocator())
-    {
-      _M_initialize(__x.size());
-      std::copy(__x.begin(), __x.end(), this->_M_impl._M_start);
-    }
-
-    // Check whether it's an integral type.  If so, it's not an iterator.
-    template<class _Integer>
-    void _M_initialize_dispatch(_Integer __n, _Integer __x, __true_type)
-    {
-      _M_initialize(__n);
-      std::fill(this->_M_impl._M_start._M_p, 
-		this->_M_impl._M_end_of_storage, __x ? ~0 : 0);
-    }
-
-    template<class _InputIterator>
-      void 
-      _M_initialize_dispatch(_InputIterator __first, _InputIterator __last,
-			     __false_type)
-      { _M_initialize_range(__first, __last, 
-			    std::__iterator_category(__first)); }
-
-    template<class _InputIterator>
-      vector(_InputIterator __first, _InputIterator __last,
-	     const allocator_type& __a = allocator_type())
-    : _Bvector_base<_Alloc>(__a)
-    {
-      typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-      _M_initialize_dispatch(__first, __last, _Integral());
-    }
-
-    ~vector() { }
-
-    vector& operator=(const vector& __x)
-    {
-      if (&__x == this)
-	return *this;
-      if (__x.size() > capacity())
-	{
-	  this->_M_deallocate();
-	  _M_initialize(__x.size());
-	}
-      std::copy(__x.begin(), __x.end(), begin());
-      this->_M_impl._M_finish = begin() + difference_type(__x.size());
-      return *this;
-    }
-
-    // assign(), a generalized assignment member function.  Two
-    // versions: one that takes a count, and one that takes a range.
-    // The range version is a member template, so we dispatch on whether
-    // or not the type is an integer.
-
-    void _M_fill_assign(size_t __n, bool __x)
-    {
-      if (__n > size())
-	{
-	  std::fill(this->_M_impl._M_start._M_p, 
-		    this->_M_impl._M_end_of_storage, __x ? ~0 : 0);
-	  insert(end(), __n - size(), __x);
-	}
-      else
-	{
-	  erase(begin() + __n, end());
-	  std::fill(this->_M_impl._M_start._M_p, 
-		    this->_M_impl._M_end_of_storage, __x ? ~0 : 0);
-	}
-    }
-
-    void assign(size_t __n, bool __x)
-    { _M_fill_assign(__n, __x); }
-
-    template<class _InputIterator>
-    void assign(_InputIterator __first, _InputIterator __last)
-    {
-      typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-      _M_assign_dispatch(__first, __last, _Integral());
-    }
-
-    template<class _Integer>
-    void _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-    { _M_fill_assign((size_t) __n, (bool) __val); }
-
-    template<class _InputIterator>
-    void _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-			    __false_type)
-    { _M_assign_aux(__first, __last, std::__iterator_category(__first)); }
-
-    template<class _InputIterator>
-    void _M_assign_aux(_InputIterator __first, _InputIterator __last,
-                       input_iterator_tag)
-    {
-      iterator __cur = begin();
-      for ( ; __first != __last && __cur != end(); ++__cur, ++__first)
-        *__cur = *__first;
-      if (__first == __last)
-        erase(__cur, end());
-      else
-        insert(end(), __first, __last);
-    }
-
-    template<class _ForwardIterator>
-    void _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
-                       forward_iterator_tag)
-    {
-      const size_type __len = std::distance(__first, __last);
-      if (__len < size())
-        erase(std::copy(__first, __last, begin()), end());
-      else
-	{
-	  _ForwardIterator __mid = __first;
-	  std::advance(__mid, size());
-	  std::copy(__first, __mid, begin());
-	  insert(end(), __mid, __last);
-	}
-    }
-
-    void reserve(size_type __n)
-    {
-      if (__n > this->max_size())
-	__throw_length_error(__N("vector::reserve"));
-      if (this->capacity() < __n)
-	{
-	  _Bit_type* __q = this->_M_allocate(__n);
-	  this->_M_impl._M_finish = std::copy(begin(), end(), 
-					      iterator(__q, 0));
-	  this->_M_deallocate();
-	  this->_M_impl._M_start = iterator(__q, 0);
-	  this->_M_impl._M_end_of_storage = __q + (__n + _S_word_bit - 1) / _S_word_bit;
-	}
-    }
-
-    reference front()
-    { return *begin(); }
-
-    const_reference front() const
-    { return *begin(); }
-
-    reference back()
-    { return *(end() - 1); }
-
-    const_reference back() const
-    { return *(end() - 1); }
-
-    void push_back(bool __x)
-    {
-      if (this->_M_impl._M_finish._M_p != this->_M_impl._M_end_of_storage)
-        *this->_M_impl._M_finish++ = __x;
-      else
-        _M_insert_aux(end(), __x);
-    }
-
-    void swap(vector<bool, _Alloc>& __x)
-    {
-      std::swap(this->_M_impl._M_start, __x._M_impl._M_start);
-      std::swap(this->_M_impl._M_finish, __x._M_impl._M_finish);
-      std::swap(this->_M_impl._M_end_of_storage, 
-		__x._M_impl._M_end_of_storage);
-    }
-
-    // [23.2.5]/1, third-to-last entry in synopsis listing
-    static void swap(reference __x, reference __y)
-    {
-      bool __tmp = __x;
-      __x = __y;
-      __y = __tmp;
-    }
-
-    iterator insert(iterator __position, bool __x = bool())
-    {
-      const difference_type __n = __position - begin();
-      if (this->_M_impl._M_finish._M_p != this->_M_impl._M_end_of_storage
-	  && __position == end())
-        *this->_M_impl._M_finish++ = __x;
-      else
-        _M_insert_aux(__position, __x);
-      return begin() + __n;
-    }
-
-    // Check whether it's an integral type.  If so, it's not an iterator.
-
-    template<class _Integer>
-    void _M_insert_dispatch(iterator __pos, _Integer __n, _Integer __x,
-                            __true_type)
-    { _M_fill_insert(__pos, __n, __x); }
-
-    template<class _InputIterator>
-    void _M_insert_dispatch(iterator __pos,
-                            _InputIterator __first, _InputIterator __last,
-                            __false_type)
-    { _M_insert_range(__pos, __first, __last,
-		      std::__iterator_category(__first)); }
-
-    template<class _InputIterator>
-    void insert(iterator __position,
-                _InputIterator __first, _InputIterator __last)
-    {
-      typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-      _M_insert_dispatch(__position, __first, __last, _Integral());
-    }
-
-    void _M_fill_insert(iterator __position, size_type __n, bool __x)
-    {
-      if (__n == 0)
-	return;
-      if (capacity() - size() >= __n)
-	{
-	  std::copy_backward(__position, end(),
-			     this->_M_impl._M_finish + difference_type(__n));
-	  std::fill(__position, __position + difference_type(__n), __x);
-	  this->_M_impl._M_finish += difference_type(__n);
-	}
-      else
-	{
-	  const size_type __len = size() + std::max(size(), __n);
-	  _Bit_type * __q = this->_M_allocate(__len);
-	  iterator __i = std::copy(begin(), __position, iterator(__q, 0));
-	  std::fill_n(__i, __n, __x);
-	  this->_M_impl._M_finish = std::copy(__position, end(),
-					      __i + difference_type(__n));
-	  this->_M_deallocate();
-	  this->_M_impl._M_end_of_storage = __q + (__len + _S_word_bit - 1)
-	                                    / _S_word_bit;
-	  this->_M_impl._M_start = iterator(__q, 0);
-	}
-    }
-
-    void insert(iterator __position, size_type __n, bool __x)
-    { _M_fill_insert(__position, __n, __x); }
-
-    void pop_back()
-    { --this->_M_impl._M_finish; }
-
-    iterator erase(iterator __position)
-    {
-      if (__position + 1 != end())
-        std::copy(__position + 1, end(), __position);
-      --this->_M_impl._M_finish;
-      return __position;
-    }
-
-    iterator erase(iterator __first, iterator __last)
-    {
-      this->_M_impl._M_finish = std::copy(__last, end(), __first);
-      return __first;
-    }
-
-    void resize(size_type __new_size, bool __x = bool())
-    {
-      if (__new_size < size())
-        erase(begin() + difference_type(__new_size), end());
-      else
-        insert(end(), __new_size - size(), __x);
-    }
-
-    void flip()
-    {
-      for (_Bit_type * __p = this->_M_impl._M_start._M_p;
-	   __p != this->_M_impl._M_end_of_storage; ++__p)
-        *__p = ~*__p;
-    }
-
-    void clear()
-    { erase(begin(), end()); }
-  };
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/stl_construct.h b/include.new/c++/3.4/bits/stl_construct.h
deleted file mode 100644
index afb3387..0000000
--- a/include.new/c++/3.4/bits/stl_construct.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// nonstandard construct and destroy functions -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_construct.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STL_CONSTRUCT_H
-#define _STL_CONSTRUCT_H 1
-
-#include <bits/type_traits.h>
-#include <new>
-
-namespace std
-{
-  /**
-   * @if maint
-   * Constructs an object in existing memory by invoking an allocated
-   * object's constructor with an initializer.
-   * @endif
-   */
-  template<typename _T1, typename _T2>
-    inline void
-    _Construct(_T1* __p, const _T2& __value)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_]allocator::construct
-      ::new(static_cast<void*>(__p)) _T1(__value);
-    }
-
-  /**
-   * @if maint
-   * Constructs an object in existing memory by invoking an allocated
-   * object's default constructor (no initializers).
-   * @endif
-   */
-  template<typename _T1>
-    inline void
-    _Construct(_T1* __p)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_]allocator::construct
-      ::new(static_cast<void*>(__p)) _T1();
-    }
-
-  /**
-   * @if maint
-   * Destroy the object pointed to by a pointer type.
-   * @endif
-   */
-  template<typename _Tp>
-    inline void
-    _Destroy(_Tp* __pointer)
-    { __pointer->~_Tp(); }
-
-  /**
-   * @if maint
-   * Destroy a range of objects with nontrivial destructors.
-   *
-   * This is a helper function used only by _Destroy().
-   * @endif
-   */
-  template<typename _ForwardIterator>
-    inline void
-    __destroy_aux(_ForwardIterator __first, _ForwardIterator __last,
-		  __false_type)
-    { for ( ; __first != __last; ++__first) std::_Destroy(&*__first); }
-
-  /**
-   * @if maint
-   * Destroy a range of objects with trivial destructors.  Since the destructors
-   * are trivial, there's nothing to do and hopefully this function will be
-   * entirely optimized away.
-   *
-   * This is a helper function used only by _Destroy().
-   * @endif
-   */
-  template<typename _ForwardIterator>
-    inline void
-    __destroy_aux(_ForwardIterator, _ForwardIterator, __true_type)
-    { }
-
-  /**
-   * @if maint
-   * Destroy a range of objects.  If the value_type of the object has
-   * a trivial destructor, the compiler should optimize all of this
-   * away, otherwise the objects' destructors must be invoked.
-   * @endif
-   */
-  template<typename _ForwardIterator>
-    inline void
-    _Destroy(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type
-                       _Value_type;
-      typedef typename __type_traits<_Value_type>::has_trivial_destructor
-                       _Has_trivial_destructor;
-
-      std::__destroy_aux(__first, __last, _Has_trivial_destructor());
-    }
-} // namespace std
-
-#endif /* _STL_CONSTRUCT_H */
-
diff --git a/include.new/c++/3.4/bits/stl_deque.h b/include.new/c++/3.4/bits/stl_deque.h
deleted file mode 100644
index 54dadf2..0000000
--- a/include.new/c++/3.4/bits/stl_deque.h
+++ /dev/null
@@ -1,1501 +0,0 @@
-// Deque implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_deque.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _DEQUE_H
-#define _DEQUE_H 1
-
-#include <bits/concept_check.h>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_iterator_base_funcs.h>
-
-namespace _GLIBCXX_STD
-{
-  /**
-   *  @if maint
-   *  @brief This function controls the size of memory nodes.
-   *  @param  size  The size of an element.
-   *  @return   The number (not byte size) of elements per node.
-   *
-   *  This function started off as a compiler kludge from SGI, but seems to
-   *  be a useful wrapper around a repeated constant expression.  The '512' is
-   *  tuneable (and no other code needs to change), but no investigation has
-   *  been done since inheriting the SGI code.
-   *  @endif
-  */
-  inline size_t
-  __deque_buf_size(size_t __size)
-  { return __size < 512 ? size_t(512 / __size) : size_t(1); }
-
-
-  /**
-   *  @brief A deque::iterator.
-   *
-   *  Quite a bit of intelligence here.  Much of the functionality of deque is
-   *  actually passed off to this class.  A deque holds two of these internally,
-   *  marking its valid range.  Access to elements is done as offsets of either
-   *  of those two, relying on operator overloading in this class.
-   *
-   *  @if maint
-   *  All the functions are op overloads except for _M_set_node.
-   *  @endif
-  */
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    struct _Deque_iterator
-    {
-      typedef _Deque_iterator<_Tp, _Tp&, _Tp*>             iterator;
-      typedef _Deque_iterator<_Tp, const _Tp&, const _Tp*> const_iterator;
-
-      static size_t _S_buffer_size()
-      { return __deque_buf_size(sizeof(_Tp)); }
-
-      typedef random_access_iterator_tag iterator_category;
-      typedef _Tp                        value_type;
-      typedef _Ptr                       pointer;
-      typedef _Ref                       reference;
-      typedef size_t                     size_type;
-      typedef ptrdiff_t                  difference_type;
-      typedef _Tp**                      _Map_pointer;
-      typedef _Deque_iterator            _Self;
-
-      _Tp* _M_cur;
-      _Tp* _M_first;
-      _Tp* _M_last;
-      _Map_pointer _M_node;
-
-      _Deque_iterator(_Tp* __x, _Map_pointer __y)
-      : _M_cur(__x), _M_first(*__y),
-        _M_last(*__y + _S_buffer_size()), _M_node(__y) {}
-
-      _Deque_iterator() : _M_cur(0), _M_first(0), _M_last(0), _M_node(0) {}
-
-      _Deque_iterator(const iterator& __x)
-      : _M_cur(__x._M_cur), _M_first(__x._M_first),
-        _M_last(__x._M_last), _M_node(__x._M_node) {}
-
-      reference
-      operator*() const
-      { return *_M_cur; }
-
-      pointer
-      operator->() const
-      { return _M_cur; }
-
-      _Self&
-      operator++()
-      {
-	++_M_cur;
-	if (_M_cur == _M_last)
-	  {
-	    _M_set_node(_M_node + 1);
-	    _M_cur = _M_first;
-	  }
-	return *this;
-      }
-
-      _Self
-      operator++(int)
-      {
-	_Self __tmp = *this;
-	++*this;
-	return __tmp;
-      }
-
-      _Self&
-      operator--()
-      {
-	if (_M_cur == _M_first)
-	  {
-	    _M_set_node(_M_node - 1);
-	    _M_cur = _M_last;
-	  }
-	--_M_cur;
-	return *this;
-      }
-
-      _Self
-      operator--(int)
-      {
-	_Self __tmp = *this;
-	--*this;
-	return __tmp;
-      }
-
-      _Self&
-      operator+=(difference_type __n)
-      {
-	const difference_type __offset = __n + (_M_cur - _M_first);
-	if (__offset >= 0 && __offset < difference_type(_S_buffer_size()))
-	  _M_cur += __n;
-	else
-	  {
-	    const difference_type __node_offset =
-	      __offset > 0 ? __offset / difference_type(_S_buffer_size())
-	                   : -difference_type((-__offset - 1)
-					      / _S_buffer_size()) - 1;
-	    _M_set_node(_M_node + __node_offset);
-	    _M_cur = _M_first + (__offset - __node_offset
-				 * difference_type(_S_buffer_size()));
-	  }
-	return *this;
-      }
-
-      _Self
-      operator+(difference_type __n) const
-      {
-	_Self __tmp = *this;
-	return __tmp += __n;
-      }
-
-      _Self&
-      operator-=(difference_type __n)
-      { return *this += -__n; }
-
-      _Self
-      operator-(difference_type __n) const
-      {
-	_Self __tmp = *this;
-	return __tmp -= __n;
-      }
-
-      reference
-      operator[](difference_type __n) const
-      { return *(*this + __n); }
-
-      /** @if maint
-       *  Prepares to traverse new_node.  Sets everything except _M_cur, which
-       *  should therefore be set by the caller immediately afterwards, based on
-       *  _M_first and _M_last.
-       *  @endif
-       */
-      void
-      _M_set_node(_Map_pointer __new_node)
-      {
-	_M_node = __new_node;
-	_M_first = *__new_node;
-	_M_last = _M_first + difference_type(_S_buffer_size());
-      }
-    };
-
-  // Note: we also provide overloads whose operands are of the same type in
-  // order to avoid ambiguous overload resolution when std::rel_ops operators
-  // are in scope (for additional details, see libstdc++/3628)
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator==(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	       const _Deque_iterator<_Tp, _Ref, _Ptr>& __y)
-    { return __x._M_cur == __y._M_cur; }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator==(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	       const _Deque_iterator<_Tp, _RefR, _PtrR>& __y)
-    { return __x._M_cur == __y._M_cur; }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator!=(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	       const _Deque_iterator<_Tp, _Ref, _Ptr>& __y)
-    { return !(__x == __y); }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator!=(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	       const _Deque_iterator<_Tp, _RefR, _PtrR>& __y)
-    { return !(__x == __y); }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator<(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	      const _Deque_iterator<_Tp, _Ref, _Ptr>& __y)
-    { return (__x._M_node == __y._M_node) ? (__x._M_cur < __y._M_cur)
-                                          : (__x._M_node < __y._M_node); }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator<(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	      const _Deque_iterator<_Tp, _RefR, _PtrR>& __y)
-    { return (__x._M_node == __y._M_node) ? (__x._M_cur < __y._M_cur)
-	                                  : (__x._M_node < __y._M_node); }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator>(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	      const _Deque_iterator<_Tp, _Ref, _Ptr>& __y)
-    { return __y < __x; }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator>(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	      const _Deque_iterator<_Tp, _RefR, _PtrR>& __y)
-    { return __y < __x; }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator<=(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	       const _Deque_iterator<_Tp, _Ref, _Ptr>& __y)
-    { return !(__y < __x); }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator<=(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	       const _Deque_iterator<_Tp, _RefR, _PtrR>& __y)
-    { return !(__y < __x); }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline bool
-    operator>=(const _Deque_iterator<_Tp, _Ref, _Ptr>& __x,
-	       const _Deque_iterator<_Tp, _Ref, _Ptr>& __y)
-    { return !(__x < __y); }
-
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline bool
-    operator>=(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	       const _Deque_iterator<_Tp, _RefR, _PtrR>& __y)
-    { return !(__x < __y); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // According to the resolution of DR179 not only the various comparison
-  // operators but also operator- must accept mixed iterator/const_iterator
-  // parameters.
-  template<typename _Tp, typename _RefL, typename _PtrL,
-	   typename _RefR, typename _PtrR>
-    inline typename _Deque_iterator<_Tp, _RefL, _PtrL>::difference_type
-    operator-(const _Deque_iterator<_Tp, _RefL, _PtrL>& __x,
-	      const _Deque_iterator<_Tp, _RefR, _PtrR>& __y)
-    {
-      return typename _Deque_iterator<_Tp, _RefL, _PtrL>::difference_type
-	(_Deque_iterator<_Tp, _RefL, _PtrL>::_S_buffer_size())
-	* (__x._M_node - __y._M_node - 1) + (__x._M_cur - __x._M_first)
-	+ (__y._M_last - __y._M_cur);
-    }
-
-  template<typename _Tp, typename _Ref, typename _Ptr>
-    inline _Deque_iterator<_Tp, _Ref, _Ptr>
-    operator+(ptrdiff_t __n, const _Deque_iterator<_Tp, _Ref, _Ptr>& __x)
-    { return __x + __n; }
-
-  /**
-   *  @if maint
-   *  Deque base class.  This class provides the unified face for %deque's
-   *  allocation.  This class's constructor and destructor allocate and
-   *  deallocate (but do not initialize) storage.  This makes %exception
-   *  safety easier.
-   *
-   *  Nothing in this class ever constructs or destroys an actual Tp element.
-   *  (Deque handles that itself.)  Only/All memory management is performed
-   *  here.
-   *  @endif
-  */
-  template<typename _Tp, typename _Alloc>
-    class _Deque_base
-    {
-    public:
-      typedef _Alloc                  allocator_type;
-
-      allocator_type
-      get_allocator() const
-      { return *static_cast<const _Alloc*>(&this->_M_impl); }
-
-      typedef _Deque_iterator<_Tp,_Tp&,_Tp*>             iterator;
-      typedef _Deque_iterator<_Tp,const _Tp&,const _Tp*> const_iterator;
-
-      _Deque_base(const allocator_type& __a, size_t __num_elements)
-	: _M_impl(__a)
-      { _M_initialize_map(__num_elements); }
-
-      _Deque_base(const allocator_type& __a)
-	: _M_impl(__a)
-      { }
-
-      ~_Deque_base();
-
-    protected:
-      //This struct encapsulates the implementation of the std::deque
-      //standard container and at the same time makes use of the EBO
-      //for empty allocators.
-      struct _Deque_impl
-	: public _Alloc {
-	_Tp** _M_map;
-	size_t _M_map_size;
-	iterator _M_start;
-	iterator _M_finish;
-
-	_Deque_impl(const _Alloc& __a)
-	  : _Alloc(__a), _M_map(0), _M_map_size(0), _M_start(), _M_finish()
-	{ }
-      };
-
-      typedef typename _Alloc::template rebind<_Tp*>::other _Map_alloc_type;
-      _Map_alloc_type _M_get_map_allocator() const
-      { return _Map_alloc_type(this->get_allocator()); }
-
-      _Tp*
-      _M_allocate_node()
-      { return _M_impl._Alloc::allocate(__deque_buf_size(sizeof(_Tp))); }
-
-      void
-      _M_deallocate_node(_Tp* __p)
-      { _M_impl._Alloc::deallocate(__p, __deque_buf_size(sizeof(_Tp))); }
-
-      _Tp**
-      _M_allocate_map(size_t __n)
-      { return _M_get_map_allocator().allocate(__n); }
-
-      void
-      _M_deallocate_map(_Tp** __p, size_t __n)
-      { _M_get_map_allocator().deallocate(__p, __n); }
-
-    protected:
-      void _M_initialize_map(size_t);
-      void _M_create_nodes(_Tp** __nstart, _Tp** __nfinish);
-      void _M_destroy_nodes(_Tp** __nstart, _Tp** __nfinish);
-      enum { _S_initial_map_size = 8 };
-
-      _Deque_impl _M_impl;
-    };
-
-  template<typename _Tp, typename _Alloc>
-  _Deque_base<_Tp,_Alloc>::~_Deque_base()
-  {
-    if (this->_M_impl._M_map)
-    {
-      _M_destroy_nodes(this->_M_impl._M_start._M_node, this->_M_impl._M_finish._M_node + 1);
-      _M_deallocate_map(this->_M_impl._M_map, this->_M_impl._M_map_size);
-    }
-  }
-
-  /**
-   *  @if maint
-   *  @brief Layout storage.
-   *  @param  num_elements  The count of T's for which to allocate space
-   *                        at first.
-   *  @return   Nothing.
-   *
-   *  The initial underlying memory layout is a bit complicated...
-   *  @endif
-  */
-  template<typename _Tp, typename _Alloc>
-    void
-    _Deque_base<_Tp,_Alloc>::_M_initialize_map(size_t __num_elements)
-    {
-      size_t __num_nodes = __num_elements / __deque_buf_size(sizeof(_Tp)) + 1;
-
-      this->_M_impl._M_map_size = std::max((size_t) _S_initial_map_size,
-				   __num_nodes + 2);
-      this->_M_impl._M_map = _M_allocate_map(this->_M_impl._M_map_size);
-
-      // For "small" maps (needing less than _M_map_size nodes), allocation
-      // starts in the middle elements and grows outwards.  So nstart may be
-      // the beginning of _M_map, but for small maps it may be as far in as
-      // _M_map+3.
-
-      _Tp** __nstart = this->_M_impl._M_map + (this->_M_impl._M_map_size - __num_nodes) / 2;
-      _Tp** __nfinish = __nstart + __num_nodes;
-
-      try
-	{ _M_create_nodes(__nstart, __nfinish); }
-      catch(...)
-	{
-	  _M_deallocate_map(this->_M_impl._M_map, this->_M_impl._M_map_size);
-	  this->_M_impl._M_map = 0;
-	  this->_M_impl._M_map_size = 0;
-	  __throw_exception_again;
-	}
-
-      this->_M_impl._M_start._M_set_node(__nstart);
-      this->_M_impl._M_finish._M_set_node(__nfinish - 1);
-      this->_M_impl._M_start._M_cur = _M_impl._M_start._M_first;
-      this->_M_impl._M_finish._M_cur = this->_M_impl._M_finish._M_first + __num_elements
-	                 % __deque_buf_size(sizeof(_Tp));
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    _Deque_base<_Tp,_Alloc>::_M_create_nodes(_Tp** __nstart, _Tp** __nfinish)
-    {
-      _Tp** __cur;
-      try
-	{
-	  for (__cur = __nstart; __cur < __nfinish; ++__cur)
-	    *__cur = this->_M_allocate_node();
-	}
-      catch(...)
-	{
-	  _M_destroy_nodes(__nstart, __cur);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    _Deque_base<_Tp,_Alloc>::_M_destroy_nodes(_Tp** __nstart, _Tp** __nfinish)
-    {
-      for (_Tp** __n = __nstart; __n < __nfinish; ++__n)
-	_M_deallocate_node(*__n);
-    }
-
-  /**
-   *  @brief  A standard container using fixed-size memory allocation and
-   *  constant-time manipulation of elements at either end.
-   *
-   *  @ingroup Containers
-   *  @ingroup Sequences
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>, including the
-   *  <a href="tables.html#68">optional sequence requirements</a>.
-   *
-   *  In previous HP/SGI versions of deque, there was an extra template
-   *  parameter so users could control the node size.  This extension turned
-   *  out to violate the C++ standard (it can be detected using template
-   *  template parameters), and it was removed.
-   *
-   *  @if maint
-   *  Here's how a deque<Tp> manages memory.  Each deque has 4 members:
-   *
-   *  - Tp**        _M_map
-   *  - size_t      _M_map_size
-   *  - iterator    _M_start, _M_finish
-   *
-   *  map_size is at least 8.  %map is an array of map_size pointers-to-"nodes".
-   *  (The name %map has nothing to do with the std::map class, and "nodes"
-   *  should not be confused with std::list's usage of "node".)
-   *
-   *  A "node" has no specific type name as such, but it is referred to as
-   *  "node" in this file.  It is a simple array-of-Tp.  If Tp is very large,
-   *  there will be one Tp element per node (i.e., an "array" of one).
-   *  For non-huge Tp's, node size is inversely related to Tp size:  the
-   *  larger the Tp, the fewer Tp's will fit in a node.  The goal here is to
-   *  keep the total size of a node relatively small and constant over different
-   *  Tp's, to improve allocator efficiency.
-   *
-   *  **** As I write this, the nodes are /not/ allocated using the high-speed
-   *  memory pool.  There are 20 hours left in the year; perhaps I can fix
-   *  this before 2002.
-   *
-   *  Not every pointer in the %map array will point to a node.  If the initial
-   *  number of elements in the deque is small, the /middle/ %map pointers will
-   *  be valid, and the ones at the edges will be unused.  This same situation
-   *  will arise as the %map grows:  available %map pointers, if any, will be on
-   *  the ends.  As new nodes are created, only a subset of the %map's pointers
-   *  need to be copied "outward".
-   *
-   *  Class invariants:
-   * - For any nonsingular iterator i:
-   *    - i.node points to a member of the %map array.  (Yes, you read that
-   *      correctly:  i.node does not actually point to a node.)  The member of
-   *      the %map array is what actually points to the node.
-   *    - i.first == *(i.node)    (This points to the node (first Tp element).)
-   *    - i.last  == i.first + node_size
-   *    - i.cur is a pointer in the range [i.first, i.last).  NOTE:
-   *      the implication of this is that i.cur is always a dereferenceable
-   *      pointer, even if i is a past-the-end iterator.
-   * - Start and Finish are always nonsingular iterators.  NOTE: this means that
-   *   an empty deque must have one node, a deque with <N elements (where N is
-   *   the node buffer size) must have one node, a deque with N through (2N-1)
-   *   elements must have two nodes, etc.
-   * - For every node other than start.node and finish.node, every element in
-   *   the node is an initialized object.  If start.node == finish.node, then
-   *   [start.cur, finish.cur) are initialized objects, and the elements outside
-   *   that range are uninitialized storage.  Otherwise, [start.cur, start.last)
-   *   and [finish.first, finish.cur) are initialized objects, and [start.first,
-   *   start.cur) and [finish.cur, finish.last) are uninitialized storage.
-   * - [%map, %map + map_size) is a valid, non-empty range.
-   * - [start.node, finish.node] is a valid range contained within
-   *   [%map, %map + map_size).
-   * - A pointer in the range [%map, %map + map_size) points to an allocated
-   *   node if and only if the pointer is in the range
-   *   [start.node, finish.node].
-   *
-   *  Here's the magic:  nothing in deque is "aware" of the discontiguous
-   *  storage!
-   *
-   *  The memory setup and layout occurs in the parent, _Base, and the iterator
-   *  class is entirely responsible for "leaping" from one node to the next.
-   *  All the implementation routines for deque itself work only through the
-   *  start and finish iterators.  This keeps the routines simple and sane,
-   *  and we can use other standard algorithms as well.
-   *  @endif
-  */
-  template<typename _Tp, typename _Alloc = allocator<_Tp> >
-    class deque : protected _Deque_base<_Tp, _Alloc>
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-
-      typedef _Deque_base<_Tp, _Alloc>           _Base;
-
-    public:
-      typedef _Tp                                value_type;
-      typedef typename _Alloc::pointer           pointer;
-      typedef typename _Alloc::const_pointer     const_pointer;
-      typedef typename _Alloc::reference         reference;
-      typedef typename _Alloc::const_reference   const_reference;
-      typedef typename _Base::iterator           iterator;
-      typedef typename _Base::const_iterator     const_iterator;
-      typedef std::reverse_iterator<const_iterator>   const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>         reverse_iterator;
-      typedef size_t                             size_type;
-      typedef ptrdiff_t                          difference_type;
-      typedef typename _Base::allocator_type     allocator_type;
-
-    protected:
-      typedef pointer*                           _Map_pointer;
-
-      static size_t _S_buffer_size()
-      { return __deque_buf_size(sizeof(_Tp)); }
-
-      // Functions controlling memory layout, and nothing else.
-      using _Base::_M_initialize_map;
-      using _Base::_M_create_nodes;
-      using _Base::_M_destroy_nodes;
-      using _Base::_M_allocate_node;
-      using _Base::_M_deallocate_node;
-      using _Base::_M_allocate_map;
-      using _Base::_M_deallocate_map;
-
-      /** @if maint
-       *  A total of four data members accumulated down the heirarchy.
-       *  May be accessed via _M_impl.*
-       *  @endif
-       */
-      using _Base::_M_impl;
-
-    public:
-      // [23.2.1.1] construct/copy/destroy
-      // (assign() and get_allocator() are also listed in this section)
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      explicit
-      deque(const allocator_type& __a = allocator_type())
-      : _Base(__a, 0) {}
-
-      /**
-       *  @brief  Create a %deque with copies of an exemplar element.
-       *  @param  n  The number of elements to initially create.
-       *  @param  value  An element to copy.
-       *
-       *  This constructor fills the %deque with @a n copies of @a value.
-       */
-      deque(size_type __n, const value_type& __value,
-	    const allocator_type& __a = allocator_type())
-      : _Base(__a, __n)
-      { _M_fill_initialize(__value); }
-
-      /**
-       *  @brief  Create a %deque with default elements.
-       *  @param  n  The number of elements to initially create.
-       *
-       *  This constructor fills the %deque with @a n copies of a
-       *  default-constructed element.
-       */
-      explicit
-      deque(size_type __n)
-      : _Base(allocator_type(), __n)
-      { _M_fill_initialize(value_type()); }
-
-      /**
-       *  @brief  %Deque copy constructor.
-       *  @param  x  A %deque of identical element and allocator types.
-       *
-       *  The newly-created %deque uses a copy of the allocation object used
-       *  by @a x.
-       */
-      deque(const deque& __x)
-      : _Base(__x.get_allocator(), __x.size())
-      { std::uninitialized_copy(__x.begin(), __x.end(), this->_M_impl._M_start); }
-
-      /**
-       *  @brief  Builds a %deque from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *
-       *  Create a %deque consisting of copies of the elements from [first,
-       *  last).
-       *
-       *  If the iterators are forward, bidirectional, or random-access, then
-       *  this will call the elements' copy constructor N times (where N is
-       *  distance(first,last)) and do no memory reallocation.  But if only
-       *  input iterators are used, then this will do at most 2N calls to the
-       *  copy constructor, and logN memory reallocations.
-       */
-      template<typename _InputIterator>
-        deque(_InputIterator __first, _InputIterator __last,
-	      const allocator_type& __a = allocator_type())
-	: _Base(__a)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-	  _M_initialize_dispatch(__first, __last, _Integral());
-	}
-
-      /**
-       *  The dtor only erases the elements, and note that if the elements
-       *  themselves are pointers, the pointed-to memory is not touched in any
-       *  way.  Managing the pointer is the user's responsibilty.
-       */
-      ~deque()
-      { std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish); }
-
-      /**
-       *  @brief  %Deque assignment operator.
-       *  @param  x  A %deque of identical element and allocator types.
-       *
-       *  All the elements of @a x are copied, but unlike the copy constructor,
-       *  the allocator object is not copied.
-       */
-      deque&
-      operator=(const deque& __x);
-
-      /**
-       *  @brief  Assigns a given value to a %deque.
-       *  @param  n  Number of elements to be assigned.
-       *  @param  val  Value to be assigned.
-       *
-       *  This function fills a %deque with @a n copies of the given value.
-       *  Note that the assignment completely changes the %deque and that the
-       *  resulting %deque's size is the same as the number of elements assigned.
-       *  Old data may be lost.
-       */
-      void
-      assign(size_type __n, const value_type& __val)
-      { _M_fill_assign(__n, __val); }
-
-      /**
-       *  @brief  Assigns a range to a %deque.
-       *  @param  first  An input iterator.
-       *  @param  last   An input iterator.
-       *
-       *  This function fills a %deque with copies of the elements in the
-       *  range [first,last).
-       *
-       *  Note that the assignment completely changes the %deque and that the
-       *  resulting %deque's size is the same as the number of elements
-       *  assigned.  Old data may be lost.
-       */
-      template<typename _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-	  _M_assign_dispatch(__first, __last, _Integral());
-	}
-
-      /// Get a copy of the memory allocation object.
-      allocator_type
-      get_allocator() const
-      { return _Base::get_allocator(); }
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first element in the
-       *  %deque.  Iteration is done in ordinary element order.
-       */
-      iterator
-      begin()
-      { return this->_M_impl._M_start; }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first
-       *  element in the %deque.  Iteration is done in ordinary element order.
-       */
-      const_iterator
-      begin() const
-      { return this->_M_impl._M_start; }
-
-      /**
-       *  Returns a read/write iterator that points one past the last element in
-       *  the %deque.  Iteration is done in ordinary element order.
-       */
-      iterator
-      end()
-      { return this->_M_impl._M_finish; }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  element in the %deque.  Iteration is done in ordinary element order.
-       */
-      const_iterator
-      end() const
-      { return this->_M_impl._M_finish; }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last element
-       *  in the %deque.  Iteration is done in reverse element order.
-       */
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last element in the %deque.  Iteration is done in reverse element
-       *  order.
-       */
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one before the
-       *  first element in the %deque.  Iteration is done in reverse element
-       *  order.
-       */
-      reverse_iterator
-      rend() { return reverse_iterator(this->_M_impl._M_start); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first element in the %deque.  Iteration is done in reverse
-       *  element order.
-       */
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(this->_M_impl._M_start); }
-
-      // [23.2.1.2] capacity
-      /**  Returns the number of elements in the %deque.  */
-      size_type
-      size() const
-      { return this->_M_impl._M_finish - this->_M_impl._M_start; }
-
-      /**  Returns the size() of the largest possible %deque.  */
-      size_type
-      max_size() const
-      { return size_type(-1); }
-
-      /**
-       *  @brief  Resizes the %deque to the specified number of elements.
-       *  @param  new_size  Number of elements the %deque should contain.
-       *  @param  x  Data with which new elements should be populated.
-       *
-       *  This function will %resize the %deque to the specified number of
-       *  elements.  If the number is smaller than the %deque's current size the
-       *  %deque is truncated, otherwise the %deque is extended and new elements
-       *  are populated with given data.
-       */
-      void
-      resize(size_type __new_size, const value_type& __x)
-      {
-	const size_type __len = size();
-	if (__new_size < __len)
-	  erase(this->_M_impl._M_start + __new_size, this->_M_impl._M_finish);
-	else
-	  insert(this->_M_impl._M_finish, __new_size - __len, __x);
-      }
-
-      /**
-       *  @brief  Resizes the %deque to the specified number of elements.
-       *  @param  new_size  Number of elements the %deque should contain.
-       *
-       *  This function will resize the %deque to the specified number of
-       *  elements.  If the number is smaller than the %deque's current size the
-       *  %deque is truncated, otherwise the %deque is extended and new elements
-       *  are default-constructed.
-       */
-      void
-      resize(size_type new_size)
-      { resize(new_size, value_type()); }
-
-      /**
-       *  Returns true if the %deque is empty.  (Thus begin() would equal end().)
-       */
-      bool
-      empty() const
-      { return this->_M_impl._M_finish == this->_M_impl._M_start; }
-
-      // element access
-      /**
-       *  @brief  Subscript access to the data contained in the %deque.
-       *  @param  n  The index of the element for which data should be accessed.
-       *  @return  Read/write reference to data.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and out_of_range
-       *  lookups are not defined. (For checked lookups see at().)
-       */
-      reference
-      operator[](size_type __n)
-      { return this->_M_impl._M_start[difference_type(__n)]; }
-
-      /**
-       *  @brief  Subscript access to the data contained in the %deque.
-       *  @param  n  The index of the element for which data should be accessed.
-       *  @return  Read-only (constant) reference to data.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and out_of_range
-       *  lookups are not defined. (For checked lookups see at().)
-       */
-      const_reference
-      operator[](size_type __n) const
-      { return this->_M_impl._M_start[difference_type(__n)]; }
-
-    protected:
-      /// @if maint Safety check used only from at().  @endif
-      void
-      _M_range_check(size_type __n) const
-      {
-	if (__n >= this->size())
-	  __throw_out_of_range(__N("deque::_M_range_check"));
-      }
-
-    public:
-      /**
-       *  @brief  Provides access to the data contained in the %deque.
-       *  @param  n  The index of the element for which data should be accessed.
-       *  @return  Read/write reference to data.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter is first
-       *  checked that it is in the range of the deque.  The function throws
-       *  out_of_range if the check fails.
-       */
-      reference
-      at(size_type __n)
-      { _M_range_check(__n); return (*this)[__n]; }
-
-      /**
-       *  @brief  Provides access to the data contained in the %deque.
-       *  @param  n  The index of the element for which data should be accessed.
-       *  @return  Read-only (constant) reference to data.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter is first
-       *  checked that it is in the range of the deque.  The function throws
-       *  out_of_range if the check fails.
-       */
-      const_reference
-      at(size_type __n) const
-      {
-	_M_range_check(__n);
-	return (*this)[__n];
-      }
-
-      /**
-       *  Returns a read/write reference to the data at the first element of the
-       *  %deque.
-       */
-      reference
-      front()
-      { return *this->_M_impl._M_start; }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %deque.
-       */
-      const_reference
-      front() const
-      { return *this->_M_impl._M_start; }
-
-      /**
-       *  Returns a read/write reference to the data at the last element of the
-       *  %deque.
-       */
-      reference
-      back()
-      {
-	iterator __tmp = this->_M_impl._M_finish;
-	--__tmp;
-	return *__tmp;
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the last
-       *  element of the %deque.
-       */
-      const_reference
-      back() const
-      {
-	const_iterator __tmp = this->_M_impl._M_finish;
-	--__tmp;
-	return *__tmp;
-      }
-
-      // [23.2.1.2] modifiers
-      /**
-       *  @brief  Add data to the front of the %deque.
-       *  @param  x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an element at
-       *  the front of the %deque and assigns the given data to it.  Due to the
-       *  nature of a %deque this operation can be done in constant time.
-       */
-      void
-      push_front(const value_type& __x)
-      {
-	if (this->_M_impl._M_start._M_cur != this->_M_impl._M_start._M_first)
-	  {
-	    std::_Construct(this->_M_impl._M_start._M_cur - 1, __x);
-	    --this->_M_impl._M_start._M_cur;
-	  }
-	else
-	  _M_push_front_aux(__x);
-      }
-
-      /**
-       *  @brief  Add data to the end of the %deque.
-       *  @param  x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an element at
-       *  the end of the %deque and assigns the given data to it.  Due to the
-       *  nature of a %deque this operation can be done in constant time.
-       */
-      void
-      push_back(const value_type& __x)
-      {
-	if (this->_M_impl._M_finish._M_cur != this->_M_impl._M_finish._M_last - 1)
-	  {
-	    std::_Construct(this->_M_impl._M_finish._M_cur, __x);
-	    ++this->_M_impl._M_finish._M_cur;
-	  }
-	else
-	  _M_push_back_aux(__x);
-      }
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical stack operation.  It shrinks the %deque by one.
-       *
-       *  Note that no data is returned, and if the first element's data is
-       *  needed, it should be retrieved before pop_front() is called.
-       */
-      void
-      pop_front()
-      {
-	if (this->_M_impl._M_start._M_cur != this->_M_impl._M_start._M_last - 1)
-	  {
-	    std::_Destroy(this->_M_impl._M_start._M_cur);
-	    ++this->_M_impl._M_start._M_cur;
-	  }
-	else
-	  _M_pop_front_aux();
-      }
-
-      /**
-       *  @brief  Removes last element.
-       *
-       *  This is a typical stack operation.  It shrinks the %deque by one.
-       *
-       *  Note that no data is returned, and if the last element's data is
-       *  needed, it should be retrieved before pop_back() is called.
-       */
-      void
-      pop_back()
-      {
-	if (this->_M_impl._M_finish._M_cur != this->_M_impl._M_finish._M_first)
-	  {
-	    --this->_M_impl._M_finish._M_cur;
-	    std::_Destroy(this->_M_impl._M_finish._M_cur);
-	  }
-	else
-	  _M_pop_back_aux();
-      }
-
-      /**
-       *  @brief  Inserts given value into %deque before specified iterator.
-       *  @param  position  An iterator into the %deque.
-       *  @param  x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value before the
-       *  specified location.
-       */
-      iterator
-      insert(iterator position, const value_type& __x);
-
-      /**
-       *  @brief  Inserts a number of copies of given data into the %deque.
-       *  @param  position  An iterator into the %deque.
-       *  @param  n  Number of elements to be inserted.
-       *  @param  x  Data to be inserted.
-       *
-       *  This function will insert a specified number of copies of the given
-       *  data before the location specified by @a position.
-       */
-      void
-      insert(iterator __position, size_type __n, const value_type& __x)
-      { _M_fill_insert(__position, __n, __x); }
-
-      /**
-       *  @brief  Inserts a range into the %deque.
-       *  @param  position  An iterator into the %deque.
-       *  @param  first  An input iterator.
-       *  @param  last   An input iterator.
-       *
-       *  This function will insert copies of the data in the range [first,last)
-       *  into the %deque before the location specified by @a pos.  This is
-       *  known as "range insert."
-       */
-      template<typename _InputIterator>
-        void
-        insert(iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-	  _M_insert_dispatch(__position, __first, __last, _Integral());
-	}
-
-      /**
-       *  @brief  Remove element at given position.
-       *  @param  position  Iterator pointing to element to be erased.
-       *  @return  An iterator pointing to the next element (or end()).
-       *
-       *  This function will erase the element at the given position and thus
-       *  shorten the %deque by one.
-       *
-       *  The user is cautioned that
-       *  this function only erases the element, and that if the element is
-       *  itself a pointer, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibilty.
-       */
-      iterator
-      erase(iterator __position);
-
-      /**
-       *  @brief  Remove a range of elements.
-       *  @param  first  Iterator pointing to the first element to be erased.
-       *  @param  last  Iterator pointing to one past the last element to be
-       *                erased.
-       *  @return  An iterator pointing to the element pointed to by @a last
-       *           prior to erasing (or end()).
-       *
-       *  This function will erase the elements in the range [first,last) and
-       *  shorten the %deque accordingly.
-       *
-       *  The user is cautioned that
-       *  this function only erases the elements, and that if the elements
-       *  themselves are pointers, the pointed-to memory is not touched in any
-       *  way.  Managing the pointer is the user's responsibilty.
-       */
-      iterator
-      erase(iterator __first, iterator __last);
-
-      /**
-       *  @brief  Swaps data with another %deque.
-       *  @param  x  A %deque of the same element and allocator types.
-       *
-       *  This exchanges the elements between two deques in constant time.
-       *  (Four pointers, so it should be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(d1,d2) will feed to this function.
-       */
-      void
-      swap(deque& __x)
-      {
-	std::swap(this->_M_impl._M_start, __x._M_impl._M_start);
-	std::swap(this->_M_impl._M_finish, __x._M_impl._M_finish);
-	std::swap(this->_M_impl._M_map, __x._M_impl._M_map);
-	std::swap(this->_M_impl._M_map_size, __x._M_impl._M_map_size);
-      }
-
-      /**
-       *  Erases all the elements.  Note that this function only erases the
-       *  elements, and that if the elements themselves are pointers, the
-       *  pointed-to memory is not touched in any way.  Managing the pointer is
-       *  the user's responsibilty.
-       */
-      void clear();
-
-    protected:
-      // Internal constructor functions follow.
-
-      // called by the range constructor to implement [23.1.1]/9
-      template<typename _Integer>
-        void
-        _M_initialize_dispatch(_Integer __n, _Integer __x, __true_type)
-        {
-	  _M_initialize_map(__n);
-	  _M_fill_initialize(__x);
-	}
-
-      // called by the range constructor to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_initialize_dispatch(_InputIterator __first, _InputIterator __last,
-			       __false_type)
-        {
-	  typedef typename iterator_traits<_InputIterator>::iterator_category
-	    _IterCategory;
-	  _M_range_initialize(__first, __last, _IterCategory());
-	}
-
-      // called by the second initialize_dispatch above
-      //@{
-      /**
-       *  @if maint
-       *  @brief Fills the deque with whatever is in [first,last).
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *  @return   Nothing.
-       *
-       *  If the iterators are actually forward iterators (or better), then the
-       *  memory layout can be done all at once.  Else we move forward using
-       *  push_back on each value from the iterator.
-       *  @endif
-       */
-      template<typename _InputIterator>
-        void
-        _M_range_initialize(_InputIterator __first, _InputIterator __last,
-			    input_iterator_tag);
-
-      // called by the second initialize_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_range_initialize(_ForwardIterator __first, _ForwardIterator __last,
-			    forward_iterator_tag);
-      //@}
-
-      /**
-       *  @if maint
-       *  @brief Fills the %deque with copies of value.
-       *  @param  value  Initial value.
-       *  @return   Nothing.
-       *  @pre _M_start and _M_finish have already been initialized, but none of
-       *       the %deque's elements have yet been constructed.
-       *
-       *  This function is called only when the user provides an explicit size
-       *  (with or without an explicit exemplar value).
-       *  @endif
-       */
-      void
-      _M_fill_initialize(const value_type& __value);
-
-      // Internal assign functions follow.  The *_aux functions do the actual
-      // assignment work for the range versions.
-
-      // called by the range assign to implement [23.1.1]/9
-      template<typename _Integer>
-        void
-        _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-        {
-	  _M_fill_assign(static_cast<size_type>(__n),
-			 static_cast<value_type>(__val));
-	}
-
-      // called by the range assign to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-			   __false_type)
-        {
-	  typedef typename iterator_traits<_InputIterator>::iterator_category
-	    _IterCategory;
-	  _M_assign_aux(__first, __last, _IterCategory());
-	}
-
-      // called by the second assign_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_assign_aux(_InputIterator __first, _InputIterator __last,
-		      input_iterator_tag);
-
-      // called by the second assign_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
-		      forward_iterator_tag)
-        {
-	  const size_type __len = std::distance(__first, __last);
-	  if (__len > size())
-	    {
-	      _ForwardIterator __mid = __first;
-	      std::advance(__mid, size());
-	      std::copy(__first, __mid, begin());
-	      insert(end(), __mid, __last);
-	    }
-	  else
-	    erase(std::copy(__first, __last, begin()), end());
-	}
-
-      // Called by assign(n,t), and the range assign when it turns out to be the
-      // same thing.
-      void
-      _M_fill_assign(size_type __n, const value_type& __val)
-      {
-	if (__n > size())
-	  {
-	    std::fill(begin(), end(), __val);
-	    insert(end(), __n - size(), __val);
-	  }
-	else
-	  {
-	    erase(begin() + __n, end());
-	    std::fill(begin(), end(), __val);
-	  }
-      }
-
-      //@{
-      /**
-       *  @if maint
-       *  @brief Helper functions for push_* and pop_*.
-       *  @endif
-       */
-      void _M_push_back_aux(const value_type&);
-      void _M_push_front_aux(const value_type&);
-      void _M_pop_back_aux();
-      void _M_pop_front_aux();
-      //@}
-
-      // Internal insert functions follow.  The *_aux functions do the actual
-      // insertion work when all shortcuts fail.
-
-      // called by the range insert to implement [23.1.1]/9
-      template<typename _Integer>
-        void
-        _M_insert_dispatch(iterator __pos,
-			   _Integer __n, _Integer __x, __true_type)
-        {
-	  _M_fill_insert(__pos, static_cast<size_type>(__n),
-			 static_cast<value_type>(__x));
-	}
-
-      // called by the range insert to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_insert_dispatch(iterator __pos,
-			   _InputIterator __first, _InputIterator __last,
-			   __false_type)
-        {
-	  typedef typename iterator_traits<_InputIterator>::iterator_category
-	    _IterCategory;
-          _M_range_insert_aux(__pos, __first, __last, _IterCategory());
-	}
-
-      // called by the second insert_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_range_insert_aux(iterator __pos, _InputIterator __first,
-			    _InputIterator __last, input_iterator_tag);
-
-      // called by the second insert_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_range_insert_aux(iterator __pos, _ForwardIterator __first,
-			    _ForwardIterator __last, forward_iterator_tag);
-
-      // Called by insert(p,n,x), and the range insert when it turns out to be
-      // the same thing.  Can use fill functions in optimal situations,
-      // otherwise passes off to insert_aux(p,n,x).
-      void
-      _M_fill_insert(iterator __pos, size_type __n, const value_type& __x);
-
-      // called by insert(p,x)
-      iterator
-      _M_insert_aux(iterator __pos, const value_type& __x);
-
-      // called by insert(p,n,x) via fill_insert
-      void
-      _M_insert_aux(iterator __pos, size_type __n, const value_type& __x);
-
-      // called by range_insert_aux for forward iterators
-      template<typename _ForwardIterator>
-        void
-        _M_insert_aux(iterator __pos,
-		      _ForwardIterator __first, _ForwardIterator __last,
-		      size_type __n);
-
-      //@{
-      /**
-       *  @if maint
-       *  @brief Memory-handling helpers for the previous internal insert
-       *         functions.
-       *  @endif
-       */
-      iterator
-      _M_reserve_elements_at_front(size_type __n)
-      {
-	const size_type __vacancies = this->_M_impl._M_start._M_cur
-	                              - this->_M_impl._M_start._M_first;
-	if (__n > __vacancies)
-	  _M_new_elements_at_front(__n - __vacancies);
-	return this->_M_impl._M_start - difference_type(__n);
-      }
-
-      iterator
-      _M_reserve_elements_at_back(size_type __n)
-      {
-	const size_type __vacancies = (this->_M_impl._M_finish._M_last
-				       - this->_M_impl._M_finish._M_cur) - 1;
-	if (__n > __vacancies)
-	  _M_new_elements_at_back(__n - __vacancies);
-	return this->_M_impl._M_finish + difference_type(__n);
-      }
-
-      void
-      _M_new_elements_at_front(size_type __new_elements);
-
-      void
-      _M_new_elements_at_back(size_type __new_elements);
-      //@}
-
-
-      //@{
-      /**
-       *  @if maint
-       *  @brief Memory-handling helpers for the major %map.
-       *
-       *  Makes sure the _M_map has space for new nodes.  Does not actually add
-       *  the nodes.  Can invalidate _M_map pointers.  (And consequently, %deque
-       *  iterators.)
-       *  @endif
-       */
-      void
-      _M_reserve_map_at_back (size_type __nodes_to_add = 1)
-      {
-	if (__nodes_to_add + 1 > this->_M_impl._M_map_size
-	    - (this->_M_impl._M_finish._M_node - this->_M_impl._M_map))
-	  _M_reallocate_map(__nodes_to_add, false);
-      }
-
-      void
-      _M_reserve_map_at_front (size_type __nodes_to_add = 1)
-      {
-	if (__nodes_to_add > size_type(this->_M_impl._M_start._M_node - this->_M_impl._M_map))
-	  _M_reallocate_map(__nodes_to_add, true);
-      }
-
-      void
-      _M_reallocate_map(size_type __nodes_to_add, bool __add_at_front);
-      //@}
-    };
-
-
-  /**
-   *  @brief  Deque equality comparison.
-   *  @param  x  A %deque.
-   *  @param  y  A %deque of the same type as @a x.
-   *  @return  True iff the size and elements of the deques are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  deques.  Deques are considered equivalent if their sizes are equal,
-   *  and if corresponding elements compare equal.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const deque<_Tp, _Alloc>& __x,
-                         const deque<_Tp, _Alloc>& __y)
-    { return __x.size() == __y.size()
-             && std::equal(__x.begin(), __x.end(), __y.begin()); }
-
-  /**
-   *  @brief  Deque ordering relation.
-   *  @param  x  A %deque.
-   *  @param  y  A %deque of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  deques.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const deque<_Tp, _Alloc>& __x,
-	      const deque<_Tp, _Alloc>& __y)
-    { return lexicographical_compare(__x.begin(), __x.end(),
-				     __y.begin(), __y.end()); }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const deque<_Tp, _Alloc>& __x,
-	       const deque<_Tp, _Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const deque<_Tp, _Alloc>& __x,
-	      const deque<_Tp, _Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const deque<_Tp, _Alloc>& __x,
-	       const deque<_Tp, _Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const deque<_Tp, _Alloc>& __x,
-	       const deque<_Tp, _Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::deque::swap().
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(deque<_Tp,_Alloc>& __x, deque<_Tp,_Alloc>& __y)
-    { __x.swap(__y); }
-} // namespace std
-
-#endif /* _DEQUE_H */
diff --git a/include.new/c++/3.4/bits/stl_function.h b/include.new/c++/3.4/bits/stl_function.h
deleted file mode 100644
index 74ddcce..0000000
--- a/include.new/c++/3.4/bits/stl_function.h
+++ /dev/null
@@ -1,898 +0,0 @@
-// Functor implementations -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_function.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _FUNCTION_H
-#define _FUNCTION_H 1
-
-namespace std
-{
-  // 20.3.1 base classes
-  /** @defgroup s20_3_1_base Functor Base Classes
-   *  Function objects, or @e functors, are objects with an @c operator()
-   *  defined and accessible.  They can be passed as arguments to algorithm
-   *  templates and used in place of a function pointer.  Not only is the
-   *  resulting expressiveness of the library increased, but the generated
-   *  code can be more efficient than what you might write by hand.  When we
-   *  refer to "functors," then, generally we include function pointers in
-   *  the description as well.
-   *
-   *  Often, functors are only created as temporaries passed to algorithm
-   *  calls, rather than being created as named variables.
-   *
-   *  Two examples taken from the standard itself follow.  To perform a
-   *  by-element addition of two vectors @c a and @c b containing @c double,
-   *  and put the result in @c a, use
-   *  \code
-   *  transform (a.begin(), a.end(), b.begin(), a.begin(), plus<double>());
-   *  \endcode
-   *  To negate every element in @c a, use
-   *  \code
-   *  transform(a.begin(), a.end(), a.begin(), negate<double>());
-   *  \endcode
-   *  The addition and negation functions will be inlined directly.
-   *
-   *  The standard functiors are derived from structs named @c unary_function
-   *  and @c binary_function.  These two classes contain nothing but typedefs,
-   *  to aid in generic (template) programming.  If you write your own
-   *  functors, you might consider doing the same.
-   *
-   *  @{
-   */
-  /**
-   *  This is one of the @link s20_3_1_base functor base classes@endlink.
-   */
-  template <class _Arg, class _Result>
-    struct unary_function
-    {
-      typedef _Arg argument_type;   ///< @c argument_type is the type of the
-                                    ///     argument (no surprises here)
-
-      typedef _Result result_type;  ///< @c result_type is the return type
-    };
-
-  /**
-   *  This is one of the @link s20_3_1_base functor base classes@endlink.
-   */
-  template <class _Arg1, class _Arg2, class _Result>
-    struct binary_function
-    {
-      typedef _Arg1 first_argument_type;   ///< the type of the first argument
-                                           ///  (no surprises here)
-
-      typedef _Arg2 second_argument_type;  ///< the type of the second argument
-      typedef _Result result_type;         ///< type of the return type
-    };
-  /** @}  */
-
-  // 20.3.2 arithmetic
-  /** @defgroup s20_3_2_arithmetic Arithmetic Classes
-   *  Because basic math often needs to be done during an algorithm, the library
-   *  provides functors for those operations.  See the documentation for
-   *  @link s20_3_1_base the base classes@endlink for examples of their use.
-   *
-   *  @{
-   */
-  /// One of the @link s20_3_2_arithmetic math functors@endlink.
-  template <class _Tp>
-    struct plus : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x + __y; }
-    };
-
-  /// One of the @link s20_3_2_arithmetic math functors@endlink.
-  template <class _Tp>
-    struct minus : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x - __y; }
-    };
-
-  /// One of the @link s20_3_2_arithmetic math functors@endlink.
-  template <class _Tp>
-    struct multiplies : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x * __y; }
-    };
-
-  /// One of the @link s20_3_2_arithmetic math functors@endlink.
-  template <class _Tp>
-    struct divides : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x / __y; }
-    };
-
-  /// One of the @link s20_3_2_arithmetic math functors@endlink.
-  template <class _Tp>
-    struct modulus : public binary_function<_Tp, _Tp, _Tp>
-    {
-      _Tp
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x % __y; }
-    };
-
-  /// One of the @link s20_3_2_arithmetic math functors@endlink.
-  template <class _Tp>
-    struct negate : public unary_function<_Tp, _Tp>
-    {
-      _Tp
-      operator()(const _Tp& __x) const
-      { return -__x; }
-    };
-  /** @}  */
-
-  // 20.3.3 comparisons
-  /** @defgroup s20_3_3_comparisons Comparison Classes
-   *  The library provides six wrapper functors for all the basic comparisons
-   *  in C++, like @c <.
-   *
-   *  @{
-   */
-  /// One of the @link s20_3_3_comparisons comparison functors@endlink.
-  template <class _Tp>
-    struct equal_to : public binary_function<_Tp, _Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x == __y; }
-    };
-
-  /// One of the @link s20_3_3_comparisons comparison functors@endlink.
-  template <class _Tp>
-    struct not_equal_to : public binary_function<_Tp, _Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x != __y; }
-    };
-
-  /// One of the @link s20_3_3_comparisons comparison functors@endlink.
-  template <class _Tp>
-    struct greater : public binary_function<_Tp, _Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x > __y; }
-    };
-
-  /// One of the @link s20_3_3_comparisons comparison functors@endlink.
-  template <class _Tp>
-    struct less : public binary_function<_Tp, _Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x < __y; }
-    };
-
-  /// One of the @link s20_3_3_comparisons comparison functors@endlink.
-  template <class _Tp>
-    struct greater_equal : public binary_function<_Tp, _Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x >= __y; }
-    };
-
-  /// One of the @link s20_3_3_comparisons comparison functors@endlink.
-  template <class _Tp>
-    struct less_equal : public binary_function<_Tp, _Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x <= __y; }
-    };
-  /** @}  */
-
-  // 20.3.4 logical operations
-  /** @defgroup s20_3_4_logical Boolean Operations Classes
-   *  Here are wrapper functors for Boolean operations:  @c &&, @c ||, and @c !.
-   *
-   *  @{
-   */
-  /// One of the @link s20_3_4_logical Boolean operations functors@endlink.
-  template <class _Tp>
-    struct logical_and : public binary_function<_Tp, _Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x && __y; }
-    };
-
-  /// One of the @link s20_3_4_logical Boolean operations functors@endlink.
-  template <class _Tp>
-    struct logical_or : public binary_function<_Tp, _Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x || __y; }
-    };
-
-  /// One of the @link s20_3_4_logical Boolean operations functors@endlink.
-  template <class _Tp>
-    struct logical_not : public unary_function<_Tp, bool>
-    {
-      bool
-      operator()(const _Tp& __x) const
-      { return !__x; }
-    };
-  /** @}  */
-
-  // 20.3.5 negators
-  /** @defgroup s20_3_5_negators Negators
-   *  The functions @c not1 and @c not2 each take a predicate functor
-   *  and return an instance of @c unary_negate or
-   *  @c binary_negate, respectively.  These classes are functors whose
-   *  @c operator() performs the stored predicate function and then returns
-   *  the negation of the result.
-   *
-   *  For example, given a vector of integers and a trivial predicate,
-   *  \code
-   *  struct IntGreaterThanThree
-   *    : public std::unary_function<int, bool>
-   *  {
-   *      bool operator() (int x) { return x > 3; }
-   *  };
-   *
-   *  std::find_if (v.begin(), v.end(), not1(IntGreaterThanThree()));
-   *  \endcode
-   *  The call to @c find_if will locate the first index (i) of @c v for which
-   *  "!(v[i] > 3)" is true.
-   *
-   *  The not1/unary_negate combination works on predicates taking a single
-   *  argument.  The not2/binary_negate combination works on predicates which
-   *  take two arguments.
-   *
-   *  @{
-   */
-  /// One of the @link s20_3_5_negators negation functors@endlink.
-  template <class _Predicate>
-    class unary_negate
-    : public unary_function<typename _Predicate::argument_type, bool>
-    {
-    protected:
-      _Predicate _M_pred;
-    public:
-      explicit
-      unary_negate(const _Predicate& __x) : _M_pred(__x) {}
-
-      bool
-      operator()(const typename _Predicate::argument_type& __x) const
-      { return !_M_pred(__x); }
-    };
-
-  /// One of the @link s20_3_5_negators negation functors@endlink.
-  template <class _Predicate>
-    inline unary_negate<_Predicate>
-    not1(const _Predicate& __pred)
-    { return unary_negate<_Predicate>(__pred); }
-
-  /// One of the @link s20_3_5_negators negation functors@endlink.
-  template <class _Predicate>
-    class binary_negate
-    : public binary_function<typename _Predicate::first_argument_type,
-			     typename _Predicate::second_argument_type,
-			     bool>
-    {
-    protected:
-      _Predicate _M_pred;
-    public:
-      explicit
-      binary_negate(const _Predicate& __x)
-      : _M_pred(__x) { }
-
-      bool
-      operator()(const typename _Predicate::first_argument_type& __x,
-		 const typename _Predicate::second_argument_type& __y) const
-      { return !_M_pred(__x, __y); }
-    };
-
-  /// One of the @link s20_3_5_negators negation functors@endlink.
-  template <class _Predicate>
-    inline binary_negate<_Predicate>
-    not2(const _Predicate& __pred)
-    { return binary_negate<_Predicate>(__pred); }
-  /** @}  */
-
-  // 20.3.6 binders
-  /** @defgroup s20_3_6_binder Binder Classes
-   *  Binders turn functions/functors with two arguments into functors with
-   *  a single argument, storing an argument to be applied later.  For
-   *  example, an variable @c B of type @c binder1st is constructed from a
-   *  functor @c f and an argument @c x.  Later, B's @c operator() is called
-   *  with a single argument @c y.  The return value is the value of @c f(x,y).
-   *  @c B can be "called" with various arguments (y1, y2, ...) and will in
-   *  turn call @c f(x,y1), @c f(x,y2), ...
-   *
-   *  The function @c bind1st is provided to save some typing.  It takes the
-   *  function and an argument as parameters, and returns an instance of
-   *  @c binder1st.
-   *
-   *  The type @c binder2nd and its creator function @c bind2nd do the same
-   *  thing, but the stored argument is passed as the second parameter instead
-   *  of the first, e.g., @c bind2nd(std::minus<float>,1.3) will create a
-   *  functor whose @c operator() accepts a floating-point number, subtracts
-   *  1.3 from it, and returns the result.  (If @c bind1st had been used,
-   *  the functor would perform "1.3 - x" instead.
-   *
-   *  Creator-wrapper functions like @c bind1st are intended to be used in
-   *  calling algorithms.  Their return values will be temporary objects.
-   *  (The goal is to not require you to type names like
-   *  @c std::binder1st<std::plus<int>> for declaring a variable to hold the
-   *  return value from @c bind1st(std::plus<int>,5).
-   *
-   *  These become more useful when combined with the composition functions.
-   *
-   *  @{
-   */
-  /// One of the @link s20_3_6_binder binder functors@endlink.
-  template <class _Operation>
-    class binder1st
-    : public unary_function<typename _Operation::second_argument_type,
-			    typename _Operation::result_type>
-    {
-    protected:
-      _Operation op;
-      typename _Operation::first_argument_type value;
-    public:
-      binder1st(const _Operation& __x,
-		const typename _Operation::first_argument_type& __y)
-      : op(__x), value(__y) {}
-
-      typename _Operation::result_type
-      operator()(const typename _Operation::second_argument_type& __x) const
-      { return op(value, __x); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 109.  Missing binders for non-const sequence elements
-      typename _Operation::result_type
-      operator()(typename _Operation::second_argument_type& __x) const
-      { return op(value, __x); }
-    };
-
-  /// One of the @link s20_3_6_binder binder functors@endlink.
-  template <class _Operation, class _Tp>
-    inline binder1st<_Operation>
-    bind1st(const _Operation& __fn, const _Tp& __x)
-    {
-      typedef typename _Operation::first_argument_type _Arg1_type;
-      return binder1st<_Operation>(__fn, _Arg1_type(__x));
-    }
-
-  /// One of the @link s20_3_6_binder binder functors@endlink.
-  template <class _Operation>
-    class binder2nd
-    : public unary_function<typename _Operation::first_argument_type,
-			    typename _Operation::result_type>
-    {
-    protected:
-      _Operation op;
-      typename _Operation::second_argument_type value;
-    public:
-      binder2nd(const _Operation& __x,
-		const typename _Operation::second_argument_type& __y)
-      : op(__x), value(__y) {}
-
-      typename _Operation::result_type
-      operator()(const typename _Operation::first_argument_type& __x) const
-      { return op(__x, value); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 109.  Missing binders for non-const sequence elements
-      typename _Operation::result_type
-      operator()(typename _Operation::first_argument_type& __x) const
-      { return op(__x, value); }
-    };
-
-  /// One of the @link s20_3_6_binder binder functors@endlink.
-  template <class _Operation, class _Tp>
-    inline binder2nd<_Operation>
-    bind2nd(const _Operation& __fn, const _Tp& __x)
-    {
-      typedef typename _Operation::second_argument_type _Arg2_type;
-      return binder2nd<_Operation>(__fn, _Arg2_type(__x));
-    }
-  /** @}  */
-
-  // 20.3.7 adaptors pointers functions
-  /** @defgroup s20_3_7_adaptors Adaptors for pointers to functions
-   *  The advantage of function objects over pointers to functions is that
-   *  the objects in the standard library declare nested typedefs describing
-   *  their argument and result types with uniform names (e.g., @c result_type
-   *  from the base classes @c unary_function and @c binary_function).
-   *  Sometimes those typedefs are required, not just optional.
-   *
-   *  Adaptors are provided to turn pointers to unary (single-argument) and
-   *  binary (double-argument) functions into function objects.  The
-   *  long-winded functor @c pointer_to_unary_function is constructed with a
-   *  function pointer @c f, and its @c operator() called with argument @c x
-   *  returns @c f(x).  The functor @c pointer_to_binary_function does the same
-   *  thing, but with a double-argument @c f and @c operator().
-   *
-   *  The function @c ptr_fun takes a pointer-to-function @c f and constructs
-   *  an instance of the appropriate functor.
-   *
-   *  @{
-   */
-  /// One of the @link s20_3_7_adaptors adaptors for function pointers@endlink.
-  template <class _Arg, class _Result>
-    class pointer_to_unary_function : public unary_function<_Arg, _Result>
-    {
-    protected:
-      _Result (*_M_ptr)(_Arg);
-    public:
-      pointer_to_unary_function() {}
-
-      explicit
-      pointer_to_unary_function(_Result (*__x)(_Arg))
-      : _M_ptr(__x) {}
-
-      _Result
-      operator()(_Arg __x) const
-      { return _M_ptr(__x); }
-    };
-
-  /// One of the @link s20_3_7_adaptors adaptors for function pointers@endlink.
-  template <class _Arg, class _Result>
-    inline pointer_to_unary_function<_Arg, _Result>
-    ptr_fun(_Result (*__x)(_Arg))
-    { return pointer_to_unary_function<_Arg, _Result>(__x); }
-
-  /// One of the @link s20_3_7_adaptors adaptors for function pointers@endlink.
-  template <class _Arg1, class _Arg2, class _Result>
-    class pointer_to_binary_function
-    : public binary_function<_Arg1, _Arg2, _Result>
-    {
-    protected:
-      _Result (*_M_ptr)(_Arg1, _Arg2);
-    public:
-      pointer_to_binary_function() {}
-
-      explicit
-      pointer_to_binary_function(_Result (*__x)(_Arg1, _Arg2))
-      : _M_ptr(__x) {}
-
-      _Result
-      operator()(_Arg1 __x, _Arg2 __y) const
-      { return _M_ptr(__x, __y); }
-    };
-
-  /// One of the @link s20_3_7_adaptors adaptors for function pointers@endlink.
-  template <class _Arg1, class _Arg2, class _Result>
-    inline pointer_to_binary_function<_Arg1, _Arg2, _Result>
-    ptr_fun(_Result (*__x)(_Arg1, _Arg2))
-    { return pointer_to_binary_function<_Arg1, _Arg2, _Result>(__x); }
-  /** @}  */
-
-  template <class _Tp>
-    struct _Identity : public unary_function<_Tp,_Tp>
-    {
-      _Tp&
-      operator()(_Tp& __x) const
-      { return __x; }
-
-      const _Tp&
-      operator()(const _Tp& __x) const
-      { return __x; }
-    };
-
-  template <class _Pair>
-    struct _Select1st : public unary_function<_Pair,
-					      typename _Pair::first_type>
-    {
-      typename _Pair::first_type&
-      operator()(_Pair& __x) const
-      { return __x.first; }
-
-      const typename _Pair::first_type&
-      operator()(const _Pair& __x) const
-      { return __x.first; }
-    };
-
-  template <class _Pair>
-    struct _Select2nd : public unary_function<_Pair,
-					      typename _Pair::second_type>
-    {
-      typename _Pair::second_type&
-      operator()(_Pair& __x) const
-      { return __x.second; }
-
-      const typename _Pair::second_type&
-      operator()(const _Pair& __x) const
-      { return __x.second; }
-    };
-
-  // 20.3.8 adaptors pointers members
-  /** @defgroup s20_3_8_memadaptors Adaptors for pointers to members
-   *  There are a total of 16 = 2^4 function objects in this family.
-   *   (1) Member functions taking no arguments vs member functions taking
-   *        one argument.
-   *   (2) Call through pointer vs call through reference.
-   *   (3) Member function with void return type vs member function with
-   *       non-void return type.
-   *   (4) Const vs non-const member function.
-   *
-   *  Note that choice (3) is nothing more than a workaround: according
-   *   to the draft, compilers should handle void and non-void the same way.
-   *   This feature is not yet widely implemented, though.  You can only use
-   *   member functions returning void if your compiler supports partial
-   *   specialization.
-   *
-   *  All of this complexity is in the function objects themselves.  You can
-   *   ignore it by using the helper function mem_fun and mem_fun_ref,
-   *   which create whichever type of adaptor is appropriate.
-   *
-   *  @{
-   */
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Ret, class _Tp>
-    class mem_fun_t : public unary_function<_Tp*, _Ret>
-    {
-    public:
-      explicit
-      mem_fun_t(_Ret (_Tp::*__pf)())
-      : _M_f(__pf) {}
-
-      _Ret
-      operator()(_Tp* __p) const
-      { return (__p->*_M_f)(); }
-    private:
-      _Ret (_Tp::*_M_f)();
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Ret, class _Tp>
-    class const_mem_fun_t : public unary_function<const _Tp*, _Ret>
-    {
-    public:
-      explicit
-      const_mem_fun_t(_Ret (_Tp::*__pf)() const)
-      : _M_f(__pf) {}
-
-      _Ret
-      operator()(const _Tp* __p) const
-      { return (__p->*_M_f)(); }
-    private:
-      _Ret (_Tp::*_M_f)() const;
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Ret, class _Tp>
-    class mem_fun_ref_t : public unary_function<_Tp, _Ret>
-    {
-    public:
-      explicit
-      mem_fun_ref_t(_Ret (_Tp::*__pf)())
-      : _M_f(__pf) {}
-
-      _Ret
-      operator()(_Tp& __r) const
-      { return (__r.*_M_f)(); }
-    private:
-      _Ret (_Tp::*_M_f)();
-  };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Ret, class _Tp>
-    class const_mem_fun_ref_t : public unary_function<_Tp, _Ret>
-    {
-    public:
-      explicit
-      const_mem_fun_ref_t(_Ret (_Tp::*__pf)() const)
-      : _M_f(__pf) {}
-
-      _Ret
-      operator()(const _Tp& __r) const
-      { return (__r.*_M_f)(); }
-    private:
-      _Ret (_Tp::*_M_f)() const;
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Ret, class _Tp, class _Arg>
-    class mem_fun1_t : public binary_function<_Tp*, _Arg, _Ret>
-    {
-    public:
-      explicit
-      mem_fun1_t(_Ret (_Tp::*__pf)(_Arg))
-      : _M_f(__pf) {}
-
-      _Ret
-      operator()(_Tp* __p, _Arg __x) const
-      { return (__p->*_M_f)(__x); }
-    private:
-      _Ret (_Tp::*_M_f)(_Arg);
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Ret, class _Tp, class _Arg>
-    class const_mem_fun1_t : public binary_function<const _Tp*, _Arg, _Ret>
-    {
-    public:
-      explicit
-      const_mem_fun1_t(_Ret (_Tp::*__pf)(_Arg) const)
-      : _M_f(__pf) {}
-
-      _Ret
-      operator()(const _Tp* __p, _Arg __x) const
-      { return (__p->*_M_f)(__x); }
-    private:
-      _Ret (_Tp::*_M_f)(_Arg) const;
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Ret, class _Tp, class _Arg>
-    class mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret>
-    {
-    public:
-      explicit
-      mem_fun1_ref_t(_Ret (_Tp::*__pf)(_Arg))
-      : _M_f(__pf) {}
-
-      _Ret
-      operator()(_Tp& __r, _Arg __x) const
-      { return (__r.*_M_f)(__x); }
-    private:
-      _Ret (_Tp::*_M_f)(_Arg);
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Ret, class _Tp, class _Arg>
-    class const_mem_fun1_ref_t : public binary_function<_Tp, _Arg, _Ret>
-    {
-    public:
-      explicit
-      const_mem_fun1_ref_t(_Ret (_Tp::*__pf)(_Arg) const)
-      : _M_f(__pf) {}
-
-      _Ret
-      operator()(const _Tp& __r, _Arg __x) const
-      { return (__r.*_M_f)(__x); }
-    private:
-      _Ret (_Tp::*_M_f)(_Arg) const;
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Tp>
-    class mem_fun_t<void, _Tp> : public unary_function<_Tp*, void>
-    {
-    public:
-      explicit
-      mem_fun_t(void (_Tp::*__pf)())
-      : _M_f(__pf) {}
-
-      void
-      operator()(_Tp* __p) const
-      { (__p->*_M_f)(); }
-    private:
-      void (_Tp::*_M_f)();
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Tp>
-    class const_mem_fun_t<void, _Tp> : public unary_function<const _Tp*, void>
-    {
-    public:
-      explicit
-      const_mem_fun_t(void (_Tp::*__pf)() const)
-      : _M_f(__pf) {}
-
-      void
-      operator()(const _Tp* __p) const
-      { (__p->*_M_f)(); }
-    private:
-      void (_Tp::*_M_f)() const;
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Tp>
-    class mem_fun_ref_t<void, _Tp> : public unary_function<_Tp, void>
-    {
-    public:
-      explicit
-      mem_fun_ref_t(void (_Tp::*__pf)())
-      : _M_f(__pf) {}
-
-      void
-      operator()(_Tp& __r) const
-      { (__r.*_M_f)(); }
-    private:
-      void (_Tp::*_M_f)();
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Tp>
-    class const_mem_fun_ref_t<void, _Tp> : public unary_function<_Tp, void>
-    {
-    public:
-      explicit
-      const_mem_fun_ref_t(void (_Tp::*__pf)() const)
-      : _M_f(__pf) {}
-
-      void
-      operator()(const _Tp& __r) const
-      { (__r.*_M_f)(); }
-    private:
-      void (_Tp::*_M_f)() const;
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Tp, class _Arg>
-    class mem_fun1_t<void, _Tp, _Arg> : public binary_function<_Tp*, _Arg, void>
-    {
-    public:
-      explicit
-      mem_fun1_t(void (_Tp::*__pf)(_Arg))
-      : _M_f(__pf) {}
-
-      void
-      operator()(_Tp* __p, _Arg __x) const
-      { (__p->*_M_f)(__x); }
-    private:
-      void (_Tp::*_M_f)(_Arg);
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Tp, class _Arg>
-    class const_mem_fun1_t<void, _Tp, _Arg>
-    : public binary_function<const _Tp*, _Arg, void>
-    {
-    public:
-      explicit
-      const_mem_fun1_t(void (_Tp::*__pf)(_Arg) const)
-      : _M_f(__pf) {}
-
-      void
-      operator()(const _Tp* __p, _Arg __x) const
-      { (__p->*_M_f)(__x); }
-    private:
-      void (_Tp::*_M_f)(_Arg) const;
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Tp, class _Arg>
-    class mem_fun1_ref_t<void, _Tp, _Arg>
-    : public binary_function<_Tp, _Arg, void>
-    {
-    public:
-      explicit
-      mem_fun1_ref_t(void (_Tp::*__pf)(_Arg))
-      : _M_f(__pf) {}
-
-      void
-      operator()(_Tp& __r, _Arg __x) const
-      { (__r.*_M_f)(__x); }
-    private:
-      void (_Tp::*_M_f)(_Arg);
-    };
-
-  /// One of the @link s20_3_8_memadaptors adaptors for member pointers@endlink.
-  template <class _Tp, class _Arg>
-    class const_mem_fun1_ref_t<void, _Tp, _Arg>
-    : public binary_function<_Tp, _Arg, void>
-    {
-    public:
-      explicit
-      const_mem_fun1_ref_t(void (_Tp::*__pf)(_Arg) const)
-      : _M_f(__pf) {}
-
-      void
-      operator()(const _Tp& __r, _Arg __x) const
-      { (__r.*_M_f)(__x); }
-    private:
-      void (_Tp::*_M_f)(_Arg) const;
-    };
-
-  // Mem_fun adaptor helper functions.  There are only two:
-  // mem_fun and mem_fun_ref.
-  template <class _Ret, class _Tp>
-    inline mem_fun_t<_Ret, _Tp>
-    mem_fun(_Ret (_Tp::*__f)())
-    { return mem_fun_t<_Ret, _Tp>(__f); }
-
-  template <class _Ret, class _Tp>
-    inline const_mem_fun_t<_Ret, _Tp>
-    mem_fun(_Ret (_Tp::*__f)() const)
-    { return const_mem_fun_t<_Ret, _Tp>(__f); }
-
-  template <class _Ret, class _Tp>
-    inline mem_fun_ref_t<_Ret, _Tp>
-    mem_fun_ref(_Ret (_Tp::*__f)())
-    { return mem_fun_ref_t<_Ret, _Tp>(__f); }
-
-  template <class _Ret, class _Tp>
-    inline const_mem_fun_ref_t<_Ret, _Tp>
-    mem_fun_ref(_Ret (_Tp::*__f)() const)
-    { return const_mem_fun_ref_t<_Ret, _Tp>(__f); }
-
-  template <class _Ret, class _Tp, class _Arg>
-    inline mem_fun1_t<_Ret, _Tp, _Arg>
-    mem_fun(_Ret (_Tp::*__f)(_Arg))
-    { return mem_fun1_t<_Ret, _Tp, _Arg>(__f); }
-
-  template <class _Ret, class _Tp, class _Arg>
-    inline const_mem_fun1_t<_Ret, _Tp, _Arg>
-    mem_fun(_Ret (_Tp::*__f)(_Arg) const)
-    { return const_mem_fun1_t<_Ret, _Tp, _Arg>(__f); }
-
-  template <class _Ret, class _Tp, class _Arg>
-    inline mem_fun1_ref_t<_Ret, _Tp, _Arg>
-    mem_fun_ref(_Ret (_Tp::*__f)(_Arg))
-    { return mem_fun1_ref_t<_Ret, _Tp, _Arg>(__f); }
-
-  template <class _Ret, class _Tp, class _Arg>
-    inline const_mem_fun1_ref_t<_Ret, _Tp, _Arg>
-    mem_fun_ref(_Ret (_Tp::*__f)(_Arg) const)
-    { return const_mem_fun1_ref_t<_Ret, _Tp, _Arg>(__f); }
-
-  /** @}  */
-
-} // namespace std
-
-#endif /* _FUNCTION_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/bits/stl_heap.h b/include.new/c++/3.4/bits/stl_heap.h
deleted file mode 100644
index eff7fd3..0000000
--- a/include.new/c++/3.4/bits/stl_heap.h
+++ /dev/null
@@ -1,467 +0,0 @@
-// Heap implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_heap.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STL_HEAP_H
-#define _STL_HEAP_H 1
-
-#include <debug/debug.h>
-
-namespace std
-{
-  // is_heap, a predicate testing whether or not a range is
-  // a heap.  This function is an extension, not part of the C++
-  // standard.
-  template<typename _RandomAccessIterator, typename _Distance>
-    bool
-    __is_heap(_RandomAccessIterator __first, _Distance __n)
-    {
-      _Distance __parent = 0;
-      for (_Distance __child = 1; __child < __n; ++__child)
-	{
-	  if (__first[__parent] < __first[__child])
-	    return false;
-	  if ((__child & 1) == 0)
-	    ++__parent;
-	}
-      return true;
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance,
-           typename _StrictWeakOrdering>
-    bool
-    __is_heap(_RandomAccessIterator __first, _StrictWeakOrdering __comp,
-	      _Distance __n)
-    {
-      _Distance __parent = 0;
-      for (_Distance __child = 1; __child < __n; ++__child)
-	{
-	  if (__comp(__first[__parent], __first[__child]))
-	    return false;
-	  if ((__child & 1) == 0)
-	    ++__parent;
-	}
-      return true;
-    }
-
-  template<typename _RandomAccessIterator>
-    bool
-    __is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    { return std::__is_heap(__first, std::distance(__first, __last)); }
-
-  template<typename _RandomAccessIterator, typename _StrictWeakOrdering>
-    bool
-    __is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	    _StrictWeakOrdering __comp)
-    { return std::__is_heap(__first, __comp, std::distance(__first, __last)); }
-
-  // Heap-manipulation functions: push_heap, pop_heap, make_heap, sort_heap.
-
-  template<typename _RandomAccessIterator, typename _Distance, typename _Tp>
-    void
-    __push_heap(_RandomAccessIterator __first,
-		_Distance __holeIndex, _Distance __topIndex, _Tp __value)
-    {
-      _Distance __parent = (__holeIndex - 1) / 2;
-      while (__holeIndex > __topIndex && *(__first + __parent) < __value)
-	{
-	  *(__first + __holeIndex) = *(__first + __parent);
-	  __holeIndex = __parent;
-	  __parent = (__holeIndex - 1) / 2;
-	}
-      *(__first + __holeIndex) = __value;
-    }
-
-  /**
-   *  @brief  Push an element onto a heap.
-   *  @param  first  Start of heap.
-   *  @param  last   End of heap + element.
-   *  @ingroup heap
-   *
-   *  This operation pushes the element at last-1 onto the valid heap over the
-   *  range [first,last-1).  After completion, [first,last) is a valid heap.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	  _ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	  _DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-      //      __glibcxx_requires_heap(__first, __last - 1);
-
-      std::__push_heap(__first, _DistanceType((__last - __first) - 1),
-		       _DistanceType(0), _ValueType(*(__last - 1)));
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance, typename _Tp,
-	    typename _Compare>
-    void
-    __push_heap(_RandomAccessIterator __first, _Distance __holeIndex,
-		_Distance __topIndex, _Tp __value, _Compare __comp)
-    {
-      _Distance __parent = (__holeIndex - 1) / 2;
-      while (__holeIndex > __topIndex
-	     && __comp(*(__first + __parent), __value))
-	{
-	  *(__first + __holeIndex) = *(__first + __parent);
-	  __holeIndex = __parent;
-	  __parent = (__holeIndex - 1) / 2;
-	}
-      *(__first + __holeIndex) = __value;
-    }
-
-  /**
-   *  @brief  Push an element onto a heap using comparison functor.
-   *  @param  first  Start of heap.
-   *  @param  last   End of heap + element.
-   *  @param  comp   Comparison functor.
-   *  @ingroup heap
-   *
-   *  This operation pushes the element at last-1 onto the valid heap over the
-   *  range [first,last-1).  After completion, [first,last) is a valid heap.
-   *  Compare operations are performed using comp.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	      _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	  _ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	  _DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_heap_pred(__first, __last - 1, __comp);
-
-      std::__push_heap(__first, _DistanceType((__last - __first) - 1),
-		       _DistanceType(0), _ValueType(*(__last - 1)), __comp);
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance, typename _Tp>
-    void
-    __adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
-		  _Distance __len, _Tp __value)
-    {
-      const _Distance __topIndex = __holeIndex;
-      _Distance __secondChild = 2 * __holeIndex + 2;
-      while (__secondChild < __len)
-	{
-	  if (*(__first + __secondChild) < *(__first + (__secondChild - 1)))
-	    __secondChild--;
-	  *(__first + __holeIndex) = *(__first + __secondChild);
-	  __holeIndex = __secondChild;
-	  __secondChild = 2 * (__secondChild + 1);
-	}
-      if (__secondChild == __len)
-	{
-	  *(__first + __holeIndex) = *(__first + (__secondChild - 1));
-	  __holeIndex = __secondChild - 1;
-	}
-      std::__push_heap(__first, __holeIndex, __topIndex, __value);
-    }
-
-  template<typename _RandomAccessIterator, typename _Tp>
-    inline void
-    __pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	       _RandomAccessIterator __result, _Tp __value)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_Distance;
-      *__result = *__first;
-      std::__adjust_heap(__first, _Distance(0), _Distance(__last - __first),
-			 __value);
-    }
-
-  /**
-   *  @brief  Pop an element off a heap.
-   *  @param  first  Start of heap.
-   *  @param  last   End of heap.
-   *  @ingroup heap
-   *
-   *  This operation pops the top of the heap.  The elements first and last-1
-   *  are swapped and [first,last-1) is made into a heap.
-  */
-  template<typename _RandomAccessIterator>
-    inline void
-    pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_heap(__first, __last);
-
-      std::__pop_heap(__first, __last - 1, __last - 1,
-		      _ValueType(*(__last - 1)));
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance,
-	   typename _Tp, typename _Compare>
-    void
-    __adjust_heap(_RandomAccessIterator __first, _Distance __holeIndex,
-		  _Distance __len, _Tp __value, _Compare __comp)
-    {
-      const _Distance __topIndex = __holeIndex;
-      _Distance __secondChild = 2 * __holeIndex + 2;
-      while (__secondChild < __len)
-	{
-	  if (__comp(*(__first + __secondChild),
-		     *(__first + (__secondChild - 1))))
-	    __secondChild--;
-	  *(__first + __holeIndex) = *(__first + __secondChild);
-	  __holeIndex = __secondChild;
-	  __secondChild = 2 * (__secondChild + 1);
-	}
-      if (__secondChild == __len)
-	{
-	  *(__first + __holeIndex) = *(__first + (__secondChild - 1));
-	  __holeIndex = __secondChild - 1;
-	}
-      std::__push_heap(__first, __holeIndex, __topIndex, __value, __comp);
-    }
-
-  template<typename _RandomAccessIterator, typename _Tp, typename _Compare>
-    inline void
-    __pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	       _RandomAccessIterator __result, _Tp __value, _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	_Distance;
-      *__result = *__first;
-      std::__adjust_heap(__first, _Distance(0), _Distance(__last - __first),
-			 __value, __comp);
-    }
-
-  /**
-   *  @brief  Pop an element off a heap using comparison functor.
-   *  @param  first  Start of heap.
-   *  @param  last   End of heap.
-   *  @param  comp   Comparison functor to use.
-   *  @ingroup heap
-   *
-   *  This operation pops the top of the heap.  The elements first and last-1
-   *  are swapped and [first,last-1) is made into a heap.  Comparisons are
-   *  made using comp.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    pop_heap(_RandomAccessIterator __first,
-	     _RandomAccessIterator __last, _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_heap_pred(__first, __last, __comp);
-
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	_ValueType;
-      std::__pop_heap(__first, __last - 1, __last - 1,
-		      _ValueType(*(__last - 1)), __comp);
-    }
-
-  /**
-   *  @brief  Construct a heap over a range.
-   *  @param  first  Start of heap.
-   *  @param  last   End of heap.
-   *  @ingroup heap
-   *
-   *  This operation makes the elements in [first,last) into a heap.
-  */
-  template<typename _RandomAccessIterator>
-    void
-    make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	  _ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	  _DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<_ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__last - __first < 2)
-	return;
-
-      const _DistanceType __len = __last - __first;
-      _DistanceType __parent = (__len - 2) / 2;
-      while (true)
-	{
-	  std::__adjust_heap(__first, __parent, __len,
-			     _ValueType(*(__first + __parent)));
-	  if (__parent == 0)
-	    return;
-	  __parent--;
-	}
-    }
-
-  /**
-   *  @brief  Construct a heap over a range using comparison functor.
-   *  @param  first  Start of heap.
-   *  @param  last   End of heap.
-   *  @param  comp   Comparison functor to use.
-   *  @ingroup heap
-   *
-   *  This operation makes the elements in [first,last) into a heap.
-   *  Comparisons are made using comp.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    inline void
-    make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	      _Compare __comp)
-    {
-      typedef typename iterator_traits<_RandomAccessIterator>::value_type
-	  _ValueType;
-      typedef typename iterator_traits<_RandomAccessIterator>::difference_type
-	  _DistanceType;
-
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__last - __first < 2)
-	return;
-
-      const _DistanceType __len = __last - __first;
-      _DistanceType __parent = (__len - 2) / 2;
-      while (true)
-	{
-	  std::__adjust_heap(__first, __parent, __len,
-			     _ValueType(*(__first + __parent)), __comp);
-	  if (__parent == 0)
-	    return;
-	  __parent--;
-	}
-    }
-
-  /**
-   *  @brief  Sort a heap.
-   *  @param  first  Start of heap.
-   *  @param  last   End of heap.
-   *  @ingroup heap
-   *
-   *  This operation sorts the valid heap in the range [first,last).
-  */
-  template<typename _RandomAccessIterator>
-    void
-    sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-      //      __glibcxx_requires_heap(__first, __last);
-
-      while (__last - __first > 1)
-	std::pop_heap(__first, __last--);
-    }
-
-  /**
-   *  @brief  Sort a heap using comparison functor.
-   *  @param  first  Start of heap.
-   *  @param  last   End of heap.
-   *  @param  comp   Comparison functor to use.
-   *  @ingroup heap
-   *
-   *  This operation sorts the valid heap in the range [first,last).
-   *  Comparisons are made using comp.
-  */
-  template<typename _RandomAccessIterator, typename _Compare>
-    void
-    sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	      _Compare __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_heap_pred(__first, __last, __comp);
-
-      while (__last - __first > 1)
-	std::pop_heap(__first, __last--, __comp);
-    }
-
-} // namespace std
-
-#endif /* _STL_HEAP_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/bits/stl_iterator.h b/include.new/c++/3.4/bits/stl_iterator.h
deleted file mode 100644
index cc56431..0000000
--- a/include.new/c++/3.4/bits/stl_iterator.h
+++ /dev/null
@@ -1,772 +0,0 @@
-// Iterators -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_iterator.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- *
- *  This file implements reverse_iterator, back_insert_iterator,
- *  front_insert_iterator, insert_iterator, __normal_iterator, and their
- *  supporting functions and overloaded operators.
- */
-
-#ifndef _ITERATOR_H
-#define _ITERATOR_H 1
-
-namespace std
-{
-  // 24.4.1 Reverse iterators
-  /**
-   *  "Bidirectional and random access iterators have corresponding reverse
-   *  %iterator adaptors that iterate through the data structure in the
-   *  opposite direction.  They have the same signatures as the corresponding
-   *  iterators.  The fundamental relation between a reverse %iterator and its
-   *  corresponding %iterator @c i is established by the identity:
-   *  @code
-   *      &*(reverse_iterator(i)) == &*(i - 1)
-   *  @endcode
-   *
-   *  This mapping is dictated by the fact that while there is always a
-   *  pointer past the end of an array, there might not be a valid pointer
-   *  before the beginning of an array." [24.4.1]/1,2
-   *
-   *  Reverse iterators can be tricky and surprising at first.  Their
-   *  semantics make sense, however, and the trickiness is a side effect of
-   *  the requirement that the iterators must be safe.
-  */
-  template<typename _Iterator>
-    class reverse_iterator
-    : public iterator<typename iterator_traits<_Iterator>::iterator_category,
-		      typename iterator_traits<_Iterator>::value_type,
-		      typename iterator_traits<_Iterator>::difference_type,
-		      typename iterator_traits<_Iterator>::pointer,
-                      typename iterator_traits<_Iterator>::reference>
-    {
-    protected:
-      _Iterator current;
-
-    public:
-      typedef _Iterator					       iterator_type;
-      typedef typename iterator_traits<_Iterator>::difference_type
-							       difference_type;
-      typedef typename iterator_traits<_Iterator>::reference   reference;
-      typedef typename iterator_traits<_Iterator>::pointer     pointer;
-
-    public:
-      /**
-       *  The default constructor default-initializes member @p current.
-       *  If it is a pointer, that means it is zero-initialized.
-      */
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 235 No specification of default ctor for reverse_iterator
-      reverse_iterator() : current() { }
-
-      /**
-       *  This %iterator will move in the opposite direction that @p x does.
-      */
-      explicit
-      reverse_iterator(iterator_type __x) : current(__x) { }
-
-      /**
-       *  The copy constructor is normal.
-      */
-      reverse_iterator(const reverse_iterator& __x)
-      : current(__x.current) { }
-
-      /**
-       *  A reverse_iterator across other types can be copied in the normal
-       *  fashion.
-      */
-      template<typename _Iter>
-        reverse_iterator(const reverse_iterator<_Iter>& __x)
-	: current(__x.base()) { }
-
-      /**
-       *  @return  @c current, the %iterator used for underlying work.
-      */
-      iterator_type
-      base() const
-      { return current; }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reference
-      operator*() const
-      {
-	_Iterator __tmp = current;
-	return *--__tmp;
-      }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      pointer
-      operator->() const
-      { return &(operator*()); }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reverse_iterator&
-      operator++()
-      {
-	--current;
-	return *this;
-      }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reverse_iterator
-      operator++(int)
-      {
-	reverse_iterator __tmp = *this;
-	--current;
-	return __tmp;
-      }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reverse_iterator&
-      operator--()
-      {
-	++current;
-	return *this;
-      }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reverse_iterator operator--(int)
-      {
-	reverse_iterator __tmp = *this;
-	++current;
-	return __tmp;
-      }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reverse_iterator
-      operator+(difference_type __n) const
-      { return reverse_iterator(current - __n); }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reverse_iterator&
-      operator+=(difference_type __n)
-      {
-	current -= __n;
-	return *this;
-      }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reverse_iterator
-      operator-(difference_type __n) const
-      { return reverse_iterator(current + __n); }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reverse_iterator&
-      operator-=(difference_type __n)
-      {
-	current += __n;
-	return *this;
-      }
-
-      /**
-       *  @return  TODO
-       *
-       *  @doctodo
-      */
-      reference
-      operator[](difference_type __n) const
-      { return *(*this + __n); }
-    };
-
-  //@{
-  /**
-   *  @param  x  A %reverse_iterator.
-   *  @param  y  A %reverse_iterator.
-   *  @return  A simple bool.
-   *
-   *  Reverse iterators forward many operations to their underlying base()
-   *  iterators.  Others are implemented in terms of one another.
-   *
-  */
-  template<typename _Iterator>
-    inline bool
-    operator==(const reverse_iterator<_Iterator>& __x,
-	       const reverse_iterator<_Iterator>& __y)
-    { return __x.base() == __y.base(); }
-
-  template<typename _Iterator>
-    inline bool
-    operator<(const reverse_iterator<_Iterator>& __x,
-	      const reverse_iterator<_Iterator>& __y)
-    { return __y.base() < __x.base(); }
-
-  template<typename _Iterator>
-    inline bool
-    operator!=(const reverse_iterator<_Iterator>& __x,
-	       const reverse_iterator<_Iterator>& __y)
-    { return !(__x == __y); }
-
-  template<typename _Iterator>
-    inline bool
-    operator>(const reverse_iterator<_Iterator>& __x,
-	      const reverse_iterator<_Iterator>& __y)
-    { return __y < __x; }
-
-  template<typename _Iterator>
-    inline bool
-    operator<=(const reverse_iterator<_Iterator>& __x,
-		const reverse_iterator<_Iterator>& __y)
-    { return !(__y < __x); }
-
-  template<typename _Iterator>
-    inline bool
-    operator>=(const reverse_iterator<_Iterator>& __x,
-	       const reverse_iterator<_Iterator>& __y)
-    { return !(__x < __y); }
-
-  template<typename _Iterator>
-    inline typename reverse_iterator<_Iterator>::difference_type
-    operator-(const reverse_iterator<_Iterator>& __x,
-	      const reverse_iterator<_Iterator>& __y)
-    { return __y.base() - __x.base(); }
-
-  template<typename _Iterator>
-    inline reverse_iterator<_Iterator>
-    operator+(typename reverse_iterator<_Iterator>::difference_type __n,
-	      const reverse_iterator<_Iterator>& __x)
-    { return reverse_iterator<_Iterator>(__x.base() - __n); }
-  //@}
-
-  // 24.4.2.2.1 back_insert_iterator
-  /**
-   *  @brief  Turns assignment into insertion.
-   *
-   *  These are output iterators, constructed from a container-of-T.
-   *  Assigning a T to the iterator appends it to the container using
-   *  push_back.
-   *
-   *  Tip:  Using the back_inserter function to create these iterators can
-   *  save typing.
-  */
-  template<typename _Container>
-    class back_insert_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    protected:
-      _Container* container;
-
-    public:
-      /// A nested typedef for the type of whatever container you used.
-      typedef _Container          container_type;
-
-      /// The only way to create this %iterator is with a container.
-      explicit
-      back_insert_iterator(_Container& __x) : container(&__x) { }
-
-      /**
-       *  @param  value  An instance of whatever type
-       *                 container_type::const_reference is; presumably a
-       *                 reference-to-const T for container<T>.
-       *  @return  This %iterator, for chained operations.
-       *
-       *  This kind of %iterator doesn't really have a "position" in the
-       *  container (you can think of the position as being permanently at
-       *  the end, if you like).  Assigning a value to the %iterator will
-       *  always append the value to the end of the container.
-      */
-      back_insert_iterator&
-      operator=(typename _Container::const_reference __value)
-      {
-	container->push_back(__value);
-	return *this;
-      }
-
-      /// Simply returns *this.
-      back_insert_iterator&
-      operator*()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not "move".)
-      back_insert_iterator&
-      operator++()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not "move".)
-      back_insert_iterator
-      operator++(int)
-      { return *this; }
-    };
-
-  /**
-   *  @param  x  A container of arbitrary type.
-   *  @return  An instance of back_insert_iterator working on @p x.
-   *
-   *  This wrapper function helps in creating back_insert_iterator instances.
-   *  Typing the name of the %iterator requires knowing the precise full
-   *  type of the container, which can be tedious and impedes generic
-   *  programming.  Using this function lets you take advantage of automatic
-   *  template parameter deduction, making the compiler match the correct
-   *  types for you.
-  */
-  template<typename _Container>
-    inline back_insert_iterator<_Container>
-    back_inserter(_Container& __x)
-    { return back_insert_iterator<_Container>(__x); }
-
-  /**
-   *  @brief  Turns assignment into insertion.
-   *
-   *  These are output iterators, constructed from a container-of-T.
-   *  Assigning a T to the iterator prepends it to the container using
-   *  push_front.
-   *
-   *  Tip:  Using the front_inserter function to create these iterators can
-   *  save typing.
-  */
-  template<typename _Container>
-    class front_insert_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    protected:
-      _Container* container;
-
-    public:
-      /// A nested typedef for the type of whatever container you used.
-      typedef _Container          container_type;
-
-      /// The only way to create this %iterator is with a container.
-      explicit front_insert_iterator(_Container& __x) : container(&__x) { }
-
-      /**
-       *  @param  value  An instance of whatever type
-       *                 container_type::const_reference is; presumably a
-       *                 reference-to-const T for container<T>.
-       *  @return  This %iterator, for chained operations.
-       *
-       *  This kind of %iterator doesn't really have a "position" in the
-       *  container (you can think of the position as being permanently at
-       *  the front, if you like).  Assigning a value to the %iterator will
-       *  always prepend the value to the front of the container.
-      */
-      front_insert_iterator&
-      operator=(typename _Container::const_reference __value)
-      {
-	container->push_front(__value);
-	return *this;
-      }
-
-      /// Simply returns *this.
-      front_insert_iterator&
-      operator*()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not "move".)
-      front_insert_iterator&
-      operator++()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not "move".)
-      front_insert_iterator
-      operator++(int)
-      { return *this; }
-    };
-
-  /**
-   *  @param  x  A container of arbitrary type.
-   *  @return  An instance of front_insert_iterator working on @p x.
-   *
-   *  This wrapper function helps in creating front_insert_iterator instances.
-   *  Typing the name of the %iterator requires knowing the precise full
-   *  type of the container, which can be tedious and impedes generic
-   *  programming.  Using this function lets you take advantage of automatic
-   *  template parameter deduction, making the compiler match the correct
-   *  types for you.
-  */
-  template<typename _Container>
-    inline front_insert_iterator<_Container>
-    front_inserter(_Container& __x)
-    { return front_insert_iterator<_Container>(__x); }
-
-  /**
-   *  @brief  Turns assignment into insertion.
-   *
-   *  These are output iterators, constructed from a container-of-T.
-   *  Assigning a T to the iterator inserts it in the container at the
-   *  %iterator's position, rather than overwriting the value at that
-   *  position.
-   *
-   *  (Sequences will actually insert a @e copy of the value before the
-   *  %iterator's position.)
-   *
-   *  Tip:  Using the inserter function to create these iterators can
-   *  save typing.
-  */
-  template<typename _Container>
-    class insert_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    protected:
-      _Container* container;
-      typename _Container::iterator iter;
-
-    public:
-      /// A nested typedef for the type of whatever container you used.
-      typedef _Container          container_type;
-
-      /**
-       *  The only way to create this %iterator is with a container and an
-       *  initial position (a normal %iterator into the container).
-      */
-      insert_iterator(_Container& __x, typename _Container::iterator __i)
-      : container(&__x), iter(__i) {}
-
-      /**
-       *  @param  value  An instance of whatever type
-       *                 container_type::const_reference is; presumably a
-       *                 reference-to-const T for container<T>.
-       *  @return  This %iterator, for chained operations.
-       *
-       *  This kind of %iterator maintains its own position in the
-       *  container.  Assigning a value to the %iterator will insert the
-       *  value into the container at the place before the %iterator.
-       *
-       *  The position is maintained such that subsequent assignments will
-       *  insert values immediately after one another.  For example,
-       *  @code
-       *     // vector v contains A and Z
-       *
-       *     insert_iterator i (v, ++v.begin());
-       *     i = 1;
-       *     i = 2;
-       *     i = 3;
-       *
-       *     // vector v contains A, 1, 2, 3, and Z
-       *  @endcode
-      */
-      insert_iterator&
-      operator=(const typename _Container::const_reference __value)
-      {
-	iter = container->insert(iter, __value);
-	++iter;
-	return *this;
-      }
-
-      /// Simply returns *this.
-      insert_iterator&
-      operator*()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not "move".)
-      insert_iterator&
-      operator++()
-      { return *this; }
-
-      /// Simply returns *this.  (This %iterator does not "move".)
-      insert_iterator&
-      operator++(int)
-      { return *this; }
-    };
-
-  /**
-   *  @param  x  A container of arbitrary type.
-   *  @return  An instance of insert_iterator working on @p x.
-   *
-   *  This wrapper function helps in creating insert_iterator instances.
-   *  Typing the name of the %iterator requires knowing the precise full
-   *  type of the container, which can be tedious and impedes generic
-   *  programming.  Using this function lets you take advantage of automatic
-   *  template parameter deduction, making the compiler match the correct
-   *  types for you.
-  */
-  template<typename _Container, typename _Iterator>
-    inline insert_iterator<_Container>
-    inserter(_Container& __x, _Iterator __i)
-    {
-      return insert_iterator<_Container>(__x,
-					 typename _Container::iterator(__i));
-    }
-} // namespace std
-
-namespace __gnu_cxx
-{
-  // This iterator adapter is 'normal' in the sense that it does not
-  // change the semantics of any of the operators of its iterator
-  // parameter.  Its primary purpose is to convert an iterator that is
-  // not a class, e.g. a pointer, into an iterator that is a class.
-  // The _Container parameter exists solely so that different containers
-  // using this template can instantiate different types, even if the
-  // _Iterator parameter is the same.
-  using std::iterator_traits;
-  using std::iterator;
-  template<typename _Iterator, typename _Container>
-    class __normal_iterator
-    {
-    protected:
-      _Iterator _M_current;
-
-    public:
-      typedef typename iterator_traits<_Iterator>::iterator_category
-                                                             iterator_category;
-      typedef typename iterator_traits<_Iterator>::value_type  value_type;
-      typedef typename iterator_traits<_Iterator>::difference_type
-                                                             difference_type;
-      typedef typename iterator_traits<_Iterator>::reference reference;
-      typedef typename iterator_traits<_Iterator>::pointer   pointer;
-
-      __normal_iterator() : _M_current(_Iterator()) { }
-
-      explicit
-      __normal_iterator(const _Iterator& __i) : _M_current(__i) { }
-
-      // Allow iterator to const_iterator conversion
-      template<typename _Iter>
-        inline __normal_iterator(const __normal_iterator<_Iter,
-				 _Container>& __i)
-	: _M_current(__i.base()) { }
-
-      // Forward iterator requirements
-      reference
-      operator*() const
-      { return *_M_current; }
-
-      pointer
-      operator->() const
-      { return _M_current; }
-
-      __normal_iterator&
-      operator++()
-      {
-	++_M_current;
-	return *this;
-      }
-
-      __normal_iterator
-      operator++(int)
-      { return __normal_iterator(_M_current++); }
-
-      // Bidirectional iterator requirements
-      __normal_iterator&
-      operator--()
-      {
-	--_M_current;
-	return *this;
-      }
-
-      __normal_iterator
-      operator--(int)
-      { return __normal_iterator(_M_current--); }
-
-      // Random access iterator requirements
-      reference
-      operator[](const difference_type& __n) const
-      { return _M_current[__n]; }
-
-      __normal_iterator&
-      operator+=(const difference_type& __n)
-      { _M_current += __n; return *this; }
-
-      __normal_iterator
-      operator+(const difference_type& __n) const
-      { return __normal_iterator(_M_current + __n); }
-
-      __normal_iterator&
-      operator-=(const difference_type& __n)
-      { _M_current -= __n; return *this; }
-
-      __normal_iterator
-      operator-(const difference_type& __n) const
-      { return __normal_iterator(_M_current - __n); }
-
-      const _Iterator&
-      base() const
-      { return _M_current; }
-    };
-
-  // Note: In what follows, the left- and right-hand-side iterators are
-  // allowed to vary in types (conceptually in cv-qualification) so that
-  // comparaison between cv-qualified and non-cv-qualified iterators be
-  // valid.  However, the greedy and unfriendly operators in std::rel_ops
-  // will make overload resolution ambiguous (when in scope) if we don't
-  // provide overloads whose operands are of the same type.  Can someone
-  // remind me what generic programming is about? -- Gaby
-
-  // Forward iterator requirements
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator==(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	       const __normal_iterator<_IteratorR, _Container>& __rhs)
-    { return __lhs.base() == __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator==(const __normal_iterator<_Iterator, _Container>& __lhs,
-	       const __normal_iterator<_Iterator, _Container>& __rhs)
-    { return __lhs.base() == __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator!=(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	       const __normal_iterator<_IteratorR, _Container>& __rhs)
-    { return __lhs.base() != __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator!=(const __normal_iterator<_Iterator, _Container>& __lhs,
-	       const __normal_iterator<_Iterator, _Container>& __rhs)
-    { return __lhs.base() != __rhs.base(); }
-
-  // Random access iterator requirements
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator<(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	      const __normal_iterator<_IteratorR, _Container>& __rhs)
-    { return __lhs.base() < __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator<(const __normal_iterator<_Iterator, _Container>& __lhs,
-	      const __normal_iterator<_Iterator, _Container>& __rhs)
-    { return __lhs.base() < __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator>(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	      const __normal_iterator<_IteratorR, _Container>& __rhs)
-    { return __lhs.base() > __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator>(const __normal_iterator<_Iterator, _Container>& __lhs,
-	      const __normal_iterator<_Iterator, _Container>& __rhs)
-    { return __lhs.base() > __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator<=(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	       const __normal_iterator<_IteratorR, _Container>& __rhs)
-    { return __lhs.base() <= __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator<=(const __normal_iterator<_Iterator, _Container>& __lhs,
-	       const __normal_iterator<_Iterator, _Container>& __rhs)
-    { return __lhs.base() <= __rhs.base(); }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline bool
-    operator>=(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	       const __normal_iterator<_IteratorR, _Container>& __rhs)
-    { return __lhs.base() >= __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline bool
-    operator>=(const __normal_iterator<_Iterator, _Container>& __lhs,
-	       const __normal_iterator<_Iterator, _Container>& __rhs)
-    { return __lhs.base() >= __rhs.base(); }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // According to the resolution of DR179 not only the various comparison
-  // operators but also operator- must accept mixed iterator/const_iterator
-  // parameters.
-  template<typename _IteratorL, typename _IteratorR, typename _Container>
-    inline typename __normal_iterator<_IteratorL, _Container>::difference_type
-    operator-(const __normal_iterator<_IteratorL, _Container>& __lhs,
-	      const __normal_iterator<_IteratorR, _Container>& __rhs)
-    { return __lhs.base() - __rhs.base(); }
-
-  template<typename _Iterator, typename _Container>
-    inline __normal_iterator<_Iterator, _Container>
-    operator+(typename __normal_iterator<_Iterator, _Container>::difference_type
-	      __n, const __normal_iterator<_Iterator, _Container>& __i)
-    { return __normal_iterator<_Iterator, _Container>(__i.base() + __n); }
-} // namespace __gnu_cxx
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/bits/stl_iterator_base_funcs.h b/include.new/c++/3.4/bits/stl_iterator_base_funcs.h
deleted file mode 100644
index c514e81..0000000
--- a/include.new/c++/3.4/bits/stl_iterator_base_funcs.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// Functions used by iterators -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_iterator_base_funcs.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- *
- *  This file contains all of the general iterator-related utility
- *  functions, such as distance() and advance().
- */
-
-#ifndef _ITERATOR_BASE_FUNCS_H
-#define _ITERATOR_BASE_FUNCS_H 1
-
-#pragma GCC system_header
-#include <bits/concept_check.h>
-
-namespace std
-{
-  template<typename _InputIterator>
-    inline typename iterator_traits<_InputIterator>::difference_type
-    __distance(_InputIterator __first, _InputIterator __last,
-               input_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-
-      typename iterator_traits<_InputIterator>::difference_type __n = 0;
-      while (__first != __last)
-	{
-	  ++__first;
-	  ++__n;
-	}
-      return __n;
-    }
-
-  template<typename _RandomAccessIterator>
-    inline typename iterator_traits<_RandomAccessIterator>::difference_type
-    __distance(_RandomAccessIterator __first, _RandomAccessIterator __last,
-               random_access_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      return __last - __first;
-    }
-
-  /**
-   *  @brief A generalization of pointer arithmetic.
-   *  @param  first  An input iterator.
-   *  @param  last  An input iterator.
-   *  @return  The distance between them.
-   *
-   *  Returns @c n such that first + n == last.  This requires that @p last
-   *  must be reachable from @p first.  Note that @c n may be negative.
-   *
-   *  For random access iterators, this uses their @c + and @c - operations
-   *  and are constant time.  For other %iterator classes they are linear time.
-  */
-  template<typename _InputIterator>
-    inline typename iterator_traits<_InputIterator>::difference_type
-    distance(_InputIterator __first, _InputIterator __last)
-    {
-      // concept requirements -- taken care of in __distance
-      return std::__distance(__first, __last,
-			     std::__iterator_category(__first));
-    }
-
-  template<typename _InputIterator, typename _Distance>
-    inline void
-    __advance(_InputIterator& __i, _Distance __n, input_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      while (__n--)
-	++__i;
-    }
-
-  template<typename _BidirectionalIterator, typename _Distance>
-    inline void
-    __advance(_BidirectionalIterator& __i, _Distance __n,
-              bidirectional_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_BidirectionalIteratorConcept<
-				  _BidirectionalIterator>)
-      if (__n > 0)
-        while (__n--)
-	  ++__i;
-      else
-        while (__n++)
-	  --__i;
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance>
-    inline void
-    __advance(_RandomAccessIterator& __i, _Distance __n,
-              random_access_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<
-				  _RandomAccessIterator>)
-      __i += __n;
-    }
-
-  /**
-   *  @brief A generalization of pointer arithmetic.
-   *  @param  i  An input iterator.
-   *  @param  n  The "delta" by which to change @p i.
-   *  @return  Nothing.
-   *
-   *  This increments @p i by @p n.  For bidirectional and random access
-   *  iterators, @p n may be negative, in which case @p i is decremented.
-   *
-   *  For random access iterators, this uses their @c + and @c - operations
-   *  and are constant time.  For other %iterator classes they are linear time.
-  */
-  template<typename _InputIterator, typename _Distance>
-    inline void
-    advance(_InputIterator& __i, _Distance __n)
-    {
-      // concept requirements -- taken care of in __advance
-      std::__advance(__i, __n, std::__iterator_category(__i));
-    }
-} // namespace std
-
-#endif /* _ITERATOR_BASE_FUNCS_H */
diff --git a/include.new/c++/3.4/bits/stl_iterator_base_types.h b/include.new/c++/3.4/bits/stl_iterator_base_types.h
deleted file mode 100644
index c3bb1c5..0000000
--- a/include.new/c++/3.4/bits/stl_iterator_base_types.h
+++ /dev/null
@@ -1,170 +0,0 @@
-// Types used in iterator implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_iterator_base_types.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- *
- *  This file contains all of the general iterator-related utility types,
- *  such as iterator_traits and struct iterator.
- */
-
-#ifndef _ITERATOR_BASE_TYPES_H
-#define _ITERATOR_BASE_TYPES_H 1
-
-#pragma GCC system_header
-
-namespace std
-{
-  //@{
-  /**
-   *  @defgroup iterator_tags Iterator Tags
-   *  These are empty types, used to distinguish different iterators.  The
-   *  distinction is not made by what they contain, but simply by what they
-   *  are.  Different underlying algorithms can then be used based on the
-   *  different operations supporetd by different iterator types.
-  */
-  ///  Marking input iterators.
-  struct input_iterator_tag {};
-  ///  Marking output iterators.
-  struct output_iterator_tag {};
-  /// Forward iterators support a superset of input iterator operations.
-  struct forward_iterator_tag : public input_iterator_tag {};
-  /// Bidirectional iterators support a superset of forward iterator
-  /// operations.
-  struct bidirectional_iterator_tag : public forward_iterator_tag {};
-  /// Random-access iterators support a superset of bidirectional iterator
-  /// operations.
-  struct random_access_iterator_tag : public bidirectional_iterator_tag {};
-  //@}
-
-
-  /**
-   *  @brief  Common %iterator class.
-   *
-   *  This class does nothing but define nested typedefs.  %Iterator classes
-   *  can inherit from this class to save some work.  The typedefs are then
-   *  used in specializations and overloading.
-   *
-   *  In particular, there are no default implementations of requirements
-   *  such as @c operator++ and the like.  (How could there be?)
-  */
-  template<typename _Category, typename _Tp, typename _Distance = ptrdiff_t,
-           typename _Pointer = _Tp*, typename _Reference = _Tp&>
-    struct iterator
-    {
-      /// One of the @link iterator_tags tag types@endlink.
-      typedef _Category  iterator_category;
-      /// The type "pointed to" by the iterator.
-      typedef _Tp        value_type;
-      /// Distance between iterators is represented as this type.
-      typedef _Distance  difference_type;
-      /// This type represents a pointer-to-value_type.
-      typedef _Pointer   pointer;
-      /// This type represents a reference-to-value_type.
-      typedef _Reference reference;
-    };
-
-  /**
-   *  This class does nothing but define nested typedefs.  The general
-   *  version simply "forwards" the nested typedefs from the Iterator
-   *  argument.  Specialized versions for pointers and pointers-to-const
-   *  provide tighter, more correct semantics.
-  */
-  template<typename _Iterator>
-    struct iterator_traits
-    {
-      typedef typename _Iterator::iterator_category iterator_category;
-      typedef typename _Iterator::value_type        value_type;
-      typedef typename _Iterator::difference_type   difference_type;
-      typedef typename _Iterator::pointer           pointer;
-      typedef typename _Iterator::reference         reference;
-    };
-
-  template<typename _Tp>
-    struct iterator_traits<_Tp*>
-    {
-      typedef random_access_iterator_tag iterator_category;
-      typedef _Tp                         value_type;
-      typedef ptrdiff_t                   difference_type;
-      typedef _Tp*                        pointer;
-      typedef _Tp&                        reference;
-    };
-
-  template<typename _Tp>
-    struct iterator_traits<const _Tp*>
-    {
-      typedef random_access_iterator_tag iterator_category;
-      typedef _Tp                         value_type;
-      typedef ptrdiff_t                   difference_type;
-      typedef const _Tp*                  pointer;
-      typedef const _Tp&                  reference;
-    };
-
-  /**
-   *  @if maint
-   *  This function is not a part of the C++ standard but is syntactic
-   *  sugar for internal library use only.
-   *  @endif
-  */
-  template<typename _Iter>
-    inline typename iterator_traits<_Iter>::iterator_category
-    __iterator_category(const _Iter&)
-    { return typename iterator_traits<_Iter>::iterator_category(); }
-
-} // namespace std
-
-#endif /* _ITERATOR_BASE_TYPES_H */
-
diff --git a/include.new/c++/3.4/bits/stl_list.h b/include.new/c++/3.4/bits/stl_list.h
deleted file mode 100644
index afb118b..0000000
--- a/include.new/c++/3.4/bits/stl_list.h
+++ /dev/null
@@ -1,1255 +0,0 @@
-// List implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_list.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _LIST_H
-#define _LIST_H 1
-
-#include <bits/concept_check.h>
-
-namespace _GLIBCXX_STD
-{
-  // Supporting structures are split into common and templated types; the
-  // latter publicly inherits from the former in an effort to reduce code
-  // duplication.  This results in some "needless" static_cast'ing later on,
-  // but it's all safe downcasting.
-
-  /// @if maint Common part of a node in the %list.  @endif
-  struct _List_node_base
-  {
-    _List_node_base* _M_next;   ///< Self-explanatory
-    _List_node_base* _M_prev;   ///< Self-explanatory
-
-    static void
-    swap(_List_node_base& __x, _List_node_base& __y);
-
-    void
-    transfer(_List_node_base * const __first,
-	     _List_node_base * const __last);
-
-    void
-    reverse();
-
-    void
-    hook(_List_node_base * const __position);
-
-    void
-    unhook();
-  };
-
-  /// @if maint An actual node in the %list.  @endif
-  template<typename _Tp>
-    struct _List_node : public _List_node_base
-    {
-      _Tp _M_data;                ///< User's data.
-    };
-
-  /**
-   *  @brief A list::iterator.
-   *
-   *  @if maint
-   *  All the functions are op overloads.
-   *  @endif
-  */
-  template<typename _Tp>
-    struct _List_iterator
-    {
-      typedef _List_iterator<_Tp>           _Self;
-      typedef _List_node<_Tp>               _Node;
-
-      typedef ptrdiff_t                     difference_type;
-      typedef bidirectional_iterator_tag    iterator_category;
-      typedef _Tp                           value_type;
-      typedef _Tp*                          pointer;
-      typedef _Tp&                          reference;
-
-      _List_iterator()
-      : _M_node() { }
-
-      _List_iterator(_List_node_base* __x)
-      : _M_node(__x) { }
-
-      // Must downcast from List_node_base to _List_node to get to _M_data.
-      reference
-      operator*() const
-      { return static_cast<_Node*>(_M_node)->_M_data; }
-
-      pointer
-      operator->() const
-      { return &static_cast<_Node*>(_M_node)->_M_data; }
-
-      _Self&
-      operator++()
-      {
-	_M_node = _M_node->_M_next;
-	return *this;
-      }
-
-      _Self
-      operator++(int)
-      {
-	_Self __tmp = *this;
-	_M_node = _M_node->_M_next;
-	return __tmp;
-      }
-
-      _Self&
-      operator--()
-      {
-	_M_node = _M_node->_M_prev;
-	return *this;
-      }
-
-      _Self
-      operator--(int)
-      {
-	_Self __tmp = *this;
-	_M_node = _M_node->_M_prev;
-	return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const
-      { return _M_node != __x._M_node; }
-
-      // The only member points to the %list element.
-      _List_node_base* _M_node;
-    };
-
-  /**
-   *  @brief A list::const_iterator.
-   *
-   *  @if maint
-   *  All the functions are op overloads.
-   *  @endif
-  */
-  template<typename _Tp>
-    struct _List_const_iterator
-    {
-      typedef _List_const_iterator<_Tp>     _Self;
-      typedef const _List_node<_Tp>         _Node;
-      typedef _List_iterator<_Tp>           iterator;
-
-      typedef ptrdiff_t                     difference_type;
-      typedef bidirectional_iterator_tag    iterator_category;
-      typedef _Tp                           value_type;
-      typedef const _Tp*                    pointer;
-      typedef const _Tp&                    reference;
-
-      _List_const_iterator()
-      : _M_node() { }
-
-      _List_const_iterator(const _List_node_base* __x)
-      : _M_node(__x) { }
-
-      _List_const_iterator(const iterator& __x)
-      : _M_node(__x._M_node) { }
-
-      // Must downcast from List_node_base to _List_node to get to
-      // _M_data.
-      reference
-      operator*() const
-      { return static_cast<_Node*>(_M_node)->_M_data; }
-
-      pointer
-      operator->() const
-      { return &static_cast<_Node*>(_M_node)->_M_data; }
-
-      _Self&
-      operator++()
-      {
-	_M_node = _M_node->_M_next;
-	return *this;
-      }
-
-      _Self
-      operator++(int)
-      {
-	_Self __tmp = *this;
-	_M_node = _M_node->_M_next;
-	return __tmp;
-      }
-
-      _Self&
-      operator--()
-      {
-	_M_node = _M_node->_M_prev;
-	return *this;
-      }
-
-      _Self
-      operator--(int)
-      {
-	_Self __tmp = *this;
-	_M_node = _M_node->_M_prev;
-	return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const
-      { return _M_node != __x._M_node; }
-
-      // The only member points to the %list element.
-      const _List_node_base* _M_node;
-    };
-
-  template<typename _Val>
-    inline bool
-    operator==(const _List_iterator<_Val>& __x,
-	       const _List_const_iterator<_Val>& __y)
-    { return __x._M_node == __y._M_node; }
-
-  template<typename _Val>
-    inline bool
-    operator!=(const _List_iterator<_Val>& __x,
-               const _List_const_iterator<_Val>& __y)
-    { return __x._M_node != __y._M_node; }
-
-
-  /**
-   *  @if maint
-   *  See bits/stl_deque.h's _Deque_base for an explanation.
-   *  @endif
-  */
-  template<typename _Tp, typename _Alloc>
-    class _List_base
-    {
-    protected:
-      // NOTA BENE
-      // The stored instance is not actually of "allocator_type"'s
-      // type.  Instead we rebind the type to
-      // Allocator<List_node<Tp>>, which according to [20.1.5]/4
-      // should probably be the same.  List_node<Tp> is not the same
-      // size as Tp (it's two pointers larger), and specializations on
-      // Tp may go unused because List_node<Tp> is being bound
-      // instead.
-      //
-      // We put this to the test in the constructors and in
-      // get_allocator, where we use conversions between
-      // allocator_type and _Node_Alloc_type. The conversion is
-      // required by table 32 in [20.1.5].
-      typedef typename _Alloc::template rebind<_List_node<_Tp> >::other
-
-      _Node_Alloc_type;
-
-      struct _List_impl 
-	: public _Node_Alloc_type {
-	_List_node_base _M_node;
-	_List_impl (const _Node_Alloc_type& __a)
-	  : _Node_Alloc_type(__a)
-	{ }
-      };
-
-      _List_impl _M_impl;
-
-      _List_node<_Tp>*
-      _M_get_node()
-      { return _M_impl._Node_Alloc_type::allocate(1); }
-      
-      void
-      _M_put_node(_List_node<_Tp>* __p)
-      { _M_impl._Node_Alloc_type::deallocate(__p, 1); }
-      
-  public:
-      typedef _Alloc allocator_type;
-
-      allocator_type
-      get_allocator() const
-      { return allocator_type(*static_cast<const _Node_Alloc_type*>(&this->_M_impl)); }
-
-      _List_base(const allocator_type& __a)
-	: _M_impl(__a)
-      { _M_init(); }
-
-      // This is what actually destroys the list.
-      ~_List_base()
-      { _M_clear(); }
-
-      void
-      _M_clear();
-
-      void
-      _M_init()
-      {
-        this->_M_impl._M_node._M_next = &this->_M_impl._M_node;
-        this->_M_impl._M_node._M_prev = &this->_M_impl._M_node;
-      }
-    };
-
-  /**
-   *  @brief A standard container with linear time access to elements,
-   *  and fixed time insertion/deletion at any point in the sequence.
-   *
-   *  @ingroup Containers
-   *  @ingroup Sequences
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>, including the
-   *  <a href="tables.html#68">optional sequence requirements</a> with the
-   *  %exception of @c at and @c operator[].
-   *
-   *  This is a @e doubly @e linked %list.  Traversal up and down the
-   *  %list requires linear time, but adding and removing elements (or
-   *  @e nodes) is done in constant time, regardless of where the
-   *  change takes place.  Unlike std::vector and std::deque,
-   *  random-access iterators are not provided, so subscripting ( @c
-   *  [] ) access is not allowed.  For algorithms which only need
-   *  sequential access, this lack makes no difference.
-   *
-   *  Also unlike the other standard containers, std::list provides
-   *  specialized algorithms %unique to linked lists, such as
-   *  splicing, sorting, and in-place reversal.
-   *
-   *  @if maint
-   *  A couple points on memory allocation for list<Tp>:
-   *
-   *  First, we never actually allocate a Tp, we allocate
-   *  List_node<Tp>'s and trust [20.1.5]/4 to DTRT.  This is to ensure
-   *  that after elements from %list<X,Alloc1> are spliced into
-   *  %list<X,Alloc2>, destroying the memory of the second %list is a
-   *  valid operation, i.e., Alloc1 giveth and Alloc2 taketh away.
-   *
-   *  Second, a %list conceptually represented as
-   *  @code
-   *    A <---> B <---> C <---> D
-   *  @endcode
-   *  is actually circular; a link exists between A and D.  The %list
-   *  class holds (as its only data member) a private list::iterator
-   *  pointing to @e D, not to @e A!  To get to the head of the %list,
-   *  we start at the tail and move forward by one.  When this member
-   *  iterator's next/previous pointers refer to itself, the %list is
-   *  %empty.  @endif
-  */
-  template<typename _Tp, typename _Alloc = allocator<_Tp> >
-    class list : protected _List_base<_Tp, _Alloc>
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-
-      typedef _List_base<_Tp, _Alloc>                   _Base;
-
-    public:
-      typedef _Tp                                        value_type;
-      typedef typename _Alloc::pointer                   pointer;
-      typedef typename _Alloc::const_pointer             const_pointer;
-      typedef typename _Alloc::reference                 reference;
-      typedef typename _Alloc::const_reference           const_reference;
-      typedef _List_iterator<_Tp>                        iterator;
-      typedef _List_const_iterator<_Tp>                  const_iterator;
-      typedef std::reverse_iterator<const_iterator>      const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>            reverse_iterator;
-      typedef size_t                                     size_type;
-      typedef ptrdiff_t                                  difference_type;
-      typedef typename _Base::allocator_type             allocator_type;
-
-    protected:
-      // Note that pointers-to-_Node's can be ctor-converted to
-      // iterator types.
-      typedef _List_node<_Tp>				_Node;
-
-      /** @if maint
-       *  One data member plus two memory-handling functions.  If the
-       *  _Alloc type requires separate instances, then one of those
-       *  will also be included, accumulated from the topmost parent.
-       *  @endif
-       */
-      using _Base::_M_impl;
-      using _Base::_M_put_node;
-      using _Base::_M_get_node;
-
-      /**
-       *  @if maint
-       *  @param  x  An instance of user data.
-       *
-       *  Allocates space for a new node and constructs a copy of @a x in it.
-       *  @endif
-       */
-      _Node*
-      _M_create_node(const value_type& __x)
-      {
-	_Node* __p = this->_M_get_node();
-	try
-	  {
-	    std::_Construct(&__p->_M_data, __x);
-	  }
-	catch(...)
-	  {
-	    _M_put_node(__p);
-	    __throw_exception_again;
-	  }
-	return __p;
-      }
-
-      /**
-       *  @if maint
-       *  Allocates space for a new node and default-constructs a new
-       *  instance of @c value_type in it.
-       *  @endif
-       */
-      _Node*
-      _M_create_node()
-      {
-	_Node* __p = this->_M_get_node();
-	try
-	  {
-	    std::_Construct(&__p->_M_data);
-	  }
-	catch(...)
-	  {
-	    _M_put_node(__p);
-	    __throw_exception_again;
-	  }
-	return __p;
-      }
-
-    public:
-      // [23.2.2.1] construct/copy/destroy
-      // (assign() and get_allocator() are also listed in this section)
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      explicit
-      list(const allocator_type& __a = allocator_type())
-      : _Base(__a) { }
-
-      /**
-       *  @brief  Create a %list with copies of an exemplar element.
-       *  @param  n  The number of elements to initially create.
-       *  @param  value  An element to copy.
-       *
-       *  This constructor fills the %list with @a n copies of @a value.
-       */
-      list(size_type __n, const value_type& __value,
-	   const allocator_type& __a = allocator_type())
-      : _Base(__a)
-      { this->insert(begin(), __n, __value); }
-
-      /**
-       *  @brief  Create a %list with default elements.
-       *  @param  n  The number of elements to initially create.
-       *
-       *  This constructor fills the %list with @a n copies of a
-       *  default-constructed element.
-       */
-      explicit
-      list(size_type __n)
-      : _Base(allocator_type())
-      { this->insert(begin(), __n, value_type()); }
-
-      /**
-       *  @brief  %List copy constructor.
-       *  @param  x  A %list of identical element and allocator types.
-       *
-       *  The newly-created %list uses a copy of the allocation object used
-       *  by @a x.
-       */
-      list(const list& __x)
-      : _Base(__x.get_allocator())
-      { this->insert(begin(), __x.begin(), __x.end()); }
-
-      /**
-       *  @brief  Builds a %list from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *
-       *  Create a %list consisting of copies of the elements from
-       *  [@a first,@a last).  This is linear in N (where N is
-       *  distance(@a first,@a last)).
-       *
-       *  @if maint
-       *  We don't need any dispatching tricks here, because insert does all of
-       *  that anyway.
-       *  @endif
-       */
-      template<typename _InputIterator>
-        list(_InputIterator __first, _InputIterator __last,
-	     const allocator_type& __a = allocator_type())
-        : _Base(__a)
-        { this->insert(begin(), __first, __last); }
-
-      /**
-       *  No explicit dtor needed as the _Base dtor takes care of
-       *  things.  The _Base dtor only erases the elements, and note
-       *  that if the elements themselves are pointers, the pointed-to
-       *  memory is not touched in any way.  Managing the pointer is
-       *  the user's responsibilty.
-       */
-
-      /**
-       *  @brief  %List assignment operator.
-       *  @param  x  A %list of identical element and allocator types.
-       *
-       *  All the elements of @a x are copied, but unlike the copy
-       *  constructor, the allocator object is not copied.
-       */
-      list&
-      operator=(const list& __x);
-
-      /**
-       *  @brief  Assigns a given value to a %list.
-       *  @param  n  Number of elements to be assigned.
-       *  @param  val  Value to be assigned.
-       *
-       *  This function fills a %list with @a n copies of the given
-       *  value.  Note that the assignment completely changes the %list
-       *  and that the resulting %list's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      void
-      assign(size_type __n, const value_type& __val)
-      { _M_fill_assign(__n, __val); }
-
-      /**
-       *  @brief  Assigns a range to a %list.
-       *  @param  first  An input iterator.
-       *  @param  last   An input iterator.
-       *
-       *  This function fills a %list with copies of the elements in the
-       *  range [@a first,@a last).
-       *
-       *  Note that the assignment completely changes the %list and
-       *  that the resulting %list's size is the same as the number of
-       *  elements assigned.  Old data may be lost.
-       */
-      template<typename _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-	  _M_assign_dispatch(__first, __last, _Integral());
-	}
-
-      /// Get a copy of the memory allocation object.
-      allocator_type
-      get_allocator() const
-      { return _Base::get_allocator(); }
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first element in the
-       *  %list.  Iteration is done in ordinary element order.
-       */
-      iterator
-      begin()
-      { return this->_M_impl._M_node._M_next; }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the
-       *  first element in the %list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      begin() const
-      { return this->_M_impl._M_node._M_next; }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  element in the %list.  Iteration is done in ordinary element
-       *  order.
-       */
-      iterator
-      end() { return &this->_M_impl._M_node; }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past
-       *  the last element in the %list.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      end() const
-      { return &this->_M_impl._M_node; }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last
-       *  element in the %list.  Iteration is done in reverse element
-       *  order.
-       */
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to
-       *  the last element in the %list.  Iteration is done in reverse
-       *  element order.
-       */
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one
-       *  before the first element in the %list.  Iteration is done in
-       *  reverse element order.
-       */
-      reverse_iterator
-      rend()
-      { return reverse_iterator(begin()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first element in the %list.  Iteration is done in reverse
-       *  element order.
-       */
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      // [23.2.2.2] capacity
-      /**
-       *  Returns true if the %list is empty.  (Thus begin() would equal
-       *  end().)
-       */
-      bool
-      empty() const
-      { return this->_M_impl._M_node._M_next == &this->_M_impl._M_node; }
-
-      /**  Returns the number of elements in the %list.  */
-      size_type
-      size() const
-      { return std::distance(begin(), end()); }
-
-      /**  Returns the size() of the largest possible %list.  */
-      size_type
-      max_size() const
-      { return size_type(-1); }
-
-      /**
-       *  @brief Resizes the %list to the specified number of elements.
-       *  @param new_size Number of elements the %list should contain.
-       *  @param x Data with which new elements should be populated.
-       *
-       *  This function will %resize the %list to the specified number
-       *  of elements.  If the number is smaller than the %list's
-       *  current size the %list is truncated, otherwise the %list is
-       *  extended and new elements are populated with given data.
-       */
-      void
-      resize(size_type __new_size, const value_type& __x);
-
-      /**
-       *  @brief  Resizes the %list to the specified number of elements.
-       *  @param  new_size  Number of elements the %list should contain.
-       *
-       *  This function will resize the %list to the specified number of
-       *  elements.  If the number is smaller than the %list's current
-       *  size the %list is truncated, otherwise the %list is extended
-       *  and new elements are default-constructed.
-       */
-      void
-      resize(size_type __new_size)
-      { this->resize(__new_size, value_type()); }
-
-      // element access
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %list.
-       */
-      reference
-      front()
-      { return *begin(); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %list.
-       */
-      const_reference
-      front() const
-      { return *begin(); }
-
-      /**
-       *  Returns a read/write reference to the data at the last element
-       *  of the %list.
-       */
-      reference
-      back()
-      { return *(--end()); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the last
-       *  element of the %list.
-       */
-      const_reference
-      back() const
-      { return *(--end()); }
-
-      // [23.2.2.3] modifiers
-      /**
-       *  @brief  Add data to the front of the %list.
-       *  @param  x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an
-       *  element at the front of the %list and assigns the given data
-       *  to it.  Due to the nature of a %list this operation can be
-       *  done in constant time, and does not invalidate iterators and
-       *  references.
-       */
-      void
-      push_front(const value_type& __x)
-      { this->_M_insert(begin(), __x); }
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical stack operation.  It shrinks the %list by
-       *  one.  Due to the nature of a %list this operation can be done
-       *  in constant time, and only invalidates iterators/references to
-       *  the element being removed.
-       *
-       *  Note that no data is returned, and if the first element's data
-       *  is needed, it should be retrieved before pop_front() is
-       *  called.
-       */
-      void
-      pop_front()
-      { this->_M_erase(begin()); }
-
-      /**
-       *  @brief  Add data to the end of the %list.
-       *  @param  x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an
-       *  element at the end of the %list and assigns the given data to
-       *  it.  Due to the nature of a %list this operation can be done
-       *  in constant time, and does not invalidate iterators and
-       *  references.
-       */
-      void
-      push_back(const value_type& __x)
-      { this->_M_insert(end(), __x); }
-
-      /**
-       *  @brief  Removes last element.
-       *
-       *  This is a typical stack operation.  It shrinks the %list by
-       *  one.  Due to the nature of a %list this operation can be done
-       *  in constant time, and only invalidates iterators/references to
-       *  the element being removed.
-       *
-       *  Note that no data is returned, and if the last element's data
-       *  is needed, it should be retrieved before pop_back() is called.
-       */
-      void
-      pop_back()
-      { this->_M_erase(this->_M_impl._M_node._M_prev); }
-
-      /**
-       *  @brief  Inserts given value into %list before specified iterator.
-       *  @param  position  An iterator into the %list.
-       *  @param  x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value before
-       *  the specified location.  Due to the nature of a %list this
-       *  operation can be done in constant time, and does not
-       *  invalidate iterators and references.
-       */
-      iterator
-      insert(iterator __position, const value_type& __x);
-
-      /**
-       *  @brief  Inserts a number of copies of given data into the %list.
-       *  @param  position  An iterator into the %list.
-       *  @param  n  Number of elements to be inserted.
-       *  @param  x  Data to be inserted.
-       *
-       *  This function will insert a specified number of copies of the
-       *  given data before the location specified by @a position.
-       *
-       *  Due to the nature of a %list this operation can be done in
-       *  constant time, and does not invalidate iterators and
-       *  references.
-       */
-      void
-      insert(iterator __position, size_type __n, const value_type& __x)
-      { _M_fill_insert(__position, __n, __x); }
-
-      /**
-       *  @brief  Inserts a range into the %list.
-       *  @param  position  An iterator into the %list.
-       *  @param  first  An input iterator.
-       *  @param  last   An input iterator.
-       *
-       *  This function will insert copies of the data in the range [@a
-       *  first,@a last) into the %list before the location specified by
-       *  @a position.
-       *
-       *  Due to the nature of a %list this operation can be done in
-       *  constant time, and does not invalidate iterators and
-       *  references.
-       */
-      template<typename _InputIterator>
-        void
-        insert(iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-	  _M_insert_dispatch(__position, __first, __last, _Integral());
-	}
-
-      /**
-       *  @brief  Remove element at given position.
-       *  @param  position  Iterator pointing to element to be erased.
-       *  @return  An iterator pointing to the next element (or end()).
-       *
-       *  This function will erase the element at the given position and thus
-       *  shorten the %list by one.
-       *
-       *  Due to the nature of a %list this operation can be done in
-       *  constant time, and only invalidates iterators/references to
-       *  the element being removed.  The user is also cautioned that
-       *  this function only erases the element, and that if the element
-       *  is itself a pointer, the pointed-to memory is not touched in
-       *  any way.  Managing the pointer is the user's responsibilty.
-       */
-      iterator
-      erase(iterator __position);
-
-      /**
-       *  @brief  Remove a range of elements.
-       *  @param  first  Iterator pointing to the first element to be erased.
-       *  @param  last  Iterator pointing to one past the last element to be
-       *                erased.
-       *  @return  An iterator pointing to the element pointed to by @a last
-       *           prior to erasing (or end()).
-       *
-       *  This function will erase the elements in the range @a
-       *  [first,last) and shorten the %list accordingly.
-       *
-       *  Due to the nature of a %list this operation can be done in
-       *  constant time, and only invalidates iterators/references to
-       *  the element being removed.  The user is also cautioned that
-       *  this function only erases the elements, and that if the
-       *  elements themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibilty.
-       */
-      iterator
-      erase(iterator __first, iterator __last)
-      {
-	while (__first != __last)
-	  __first = erase(__first);
-	return __last;
-      }
-
-      /**
-       *  @brief  Swaps data with another %list.
-       *  @param  x  A %list of the same element and allocator types.
-       *
-       *  This exchanges the elements between two lists in constant
-       *  time.  Note that the global std::swap() function is
-       *  specialized such that std::swap(l1,l2) will feed to this
-       *  function.
-       */
-      void
-      swap(list& __x)
-      { _List_node_base::swap(this->_M_impl._M_node,__x._M_impl._M_node); }
-
-      /**
-       *  Erases all the elements.  Note that this function only erases
-       *  the elements, and that if the elements themselves are
-       *  pointers, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibilty.
-       */
-      void
-      clear()
-      {
-        _Base::_M_clear();
-        _Base::_M_init();
-      }
-
-      // [23.2.2.4] list operations
-      /**
-       *  @brief  Insert contents of another %list.
-       *  @param  position  Iterator referencing the element to insert before.
-       *  @param  x  Source list.
-       *
-       *  The elements of @a x are inserted in constant time in front of
-       *  the element referenced by @a position.  @a x becomes an empty
-       *  list.
-       */
-      void
-      splice(iterator __position, list& __x)
-      {
-	if (!__x.empty())
-	  this->_M_transfer(__position, __x.begin(), __x.end());
-      }
-
-      /**
-       *  @brief  Insert element from another %list.
-       *  @param  position  Iterator referencing the element to insert before.
-       *  @param  x  Source list.
-       *  @param  i  Iterator referencing the element to move.
-       *
-       *  Removes the element in list @a x referenced by @a i and
-       *  inserts it into the current list before @a position.
-       */
-      void
-      splice(iterator __position, list&, iterator __i)
-      {
-	iterator __j = __i;
-	++__j;
-	if (__position == __i || __position == __j)
-	  return;
-	this->_M_transfer(__position, __i, __j);
-      }
-
-      /**
-       *  @brief  Insert range from another %list.
-       *  @param  position  Iterator referencing the element to insert before.
-       *  @param  x  Source list.
-       *  @param  first  Iterator referencing the start of range in x.
-       *  @param  last  Iterator referencing the end of range in x.
-       *
-       *  Removes elements in the range [first,last) and inserts them
-       *  before @a position in constant time.
-       *
-       *  Undefined if @a position is in [first,last).
-       */
-      void
-      splice(iterator __position, list&, iterator __first, iterator __last)
-      {
-	if (__first != __last)
-	  this->_M_transfer(__position, __first, __last);
-      }
-
-      /**
-       *  @brief  Remove all elements equal to value.
-       *  @param  value  The value to remove.
-       *
-       *  Removes every element in the list equal to @a value.
-       *  Remaining elements stay in list order.  Note that this
-       *  function only erases the elements, and that if the elements
-       *  themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's
-       *  responsibilty.
-       */
-      void
-      remove(const _Tp& __value);
-
-      /**
-       *  @brief  Remove all elements satisfying a predicate.
-       *  @param  Predicate  Unary predicate function or object.
-       *
-       *  Removes every element in the list for which the predicate
-       *  returns true.  Remaining elements stay in list order.  Note
-       *  that this function only erases the elements, and that if the
-       *  elements themselves are pointers, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibilty.
-       */
-      template<typename _Predicate>
-      void
-      remove_if(_Predicate);
-
-      /**
-       *  @brief  Remove consecutive duplicate elements.
-       *
-       *  For each consecutive set of elements with the same value,
-       *  remove all but the first one.  Remaining elements stay in
-       *  list order.  Note that this function only erases the
-       *  elements, and that if the elements themselves are pointers,
-       *  the pointed-to memory is not touched in any way.  Managing
-       *  the pointer is the user's responsibilty.
-       */
-      void
-      unique();
-
-      /**
-       *  @brief  Remove consecutive elements satisfying a predicate.
-       *  @param  BinaryPredicate  Binary predicate function or object.
-       *
-       *  For each consecutive set of elements [first,last) that
-       *  satisfy predicate(first,i) where i is an iterator in
-       *  [first,last), remove all but the first one.  Remaining
-       *  elements stay in list order.  Note that this function only
-       *  erases the elements, and that if the elements themselves are
-       *  pointers, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibilty.
-       */
-      template<typename _BinaryPredicate>
-        void
-        unique(_BinaryPredicate);
-
-      /**
-       *  @brief  Merge sorted lists.
-       *  @param  x  Sorted list to merge.
-       *
-       *  Assumes that both @a x and this list are sorted according to
-       *  operator<().  Merges elements of @a x into this list in
-       *  sorted order, leaving @a x empty when complete.  Elements in
-       *  this list precede elements in @a x that are equal.
-       */
-      void
-      merge(list& __x);
-
-      /**
-       *  @brief  Merge sorted lists according to comparison function.
-       *  @param  x  Sorted list to merge.
-       *  @param StrictWeakOrdering Comparison function definining
-       *  sort order.
-       *
-       *  Assumes that both @a x and this list are sorted according to
-       *  StrictWeakOrdering.  Merges elements of @a x into this list
-       *  in sorted order, leaving @a x empty when complete.  Elements
-       *  in this list precede elements in @a x that are equivalent
-       *  according to StrictWeakOrdering().
-       */
-      template<typename _StrictWeakOrdering>
-        void
-        merge(list&, _StrictWeakOrdering);
-
-      /**
-       *  @brief  Reverse the elements in list.
-       *
-       *  Reverse the order of elements in the list in linear time.
-       */
-      void
-      reverse()
-      { this->_M_impl._M_node.reverse(); }
-
-      /**
-       *  @brief  Sort the elements.
-       *
-       *  Sorts the elements of this list in NlogN time.  Equivalent
-       *  elements remain in list order.
-       */
-      void
-      sort();
-
-      /**
-       *  @brief  Sort the elements according to comparison function.
-       *
-       *  Sorts the elements of this list in NlogN time.  Equivalent
-       *  elements remain in list order.
-       */
-      template<typename _StrictWeakOrdering>
-        void
-        sort(_StrictWeakOrdering);
-
-    protected:
-      // Internal assign functions follow.
-
-      // Called by the range assign to implement [23.1.1]/9
-      template<typename _Integer>
-        void
-        _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-        {
-	  _M_fill_assign(static_cast<size_type>(__n),
-			 static_cast<value_type>(__val));
-	}
-
-      // Called by the range assign to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-			   __false_type);
-
-      // Called by assign(n,t), and the range assign when it turns out
-      // to be the same thing.
-      void
-      _M_fill_assign(size_type __n, const value_type& __val);
-
-
-      // Internal insert functions follow.
-
-      // Called by the range insert to implement [23.1.1]/9
-      template<typename _Integer>
-        void
-        _M_insert_dispatch(iterator __pos, _Integer __n, _Integer __x,
-			   __true_type)
-        {
-	  _M_fill_insert(__pos, static_cast<size_type>(__n),
-			 static_cast<value_type>(__x));
-	}
-
-      // Called by the range insert to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_insert_dispatch(iterator __pos,
-			   _InputIterator __first, _InputIterator __last,
-			   __false_type)
-        {
-	  for ( ; __first != __last; ++__first)
-	    _M_insert(__pos, *__first);
-	}
-
-      // Called by insert(p,n,x), and the range insert when it turns out
-      // to be the same thing.
-      void
-      _M_fill_insert(iterator __pos, size_type __n, const value_type& __x)
-      {
-	for ( ; __n > 0; --__n)
-	  _M_insert(__pos, __x);
-      }
-
-
-      // Moves the elements from [first,last) before position.
-      void
-      _M_transfer(iterator __position, iterator __first, iterator __last)
-      { __position._M_node->transfer(__first._M_node,__last._M_node); }
-
-      // Inserts new element at position given and with value given.
-      void
-      _M_insert(iterator __position, const value_type& __x)
-      {
-        _Node* __tmp = _M_create_node(__x);
-        __tmp->hook(__position._M_node);
-      }
-
-      // Erases element at position given.
-      void
-      _M_erase(iterator __position)
-      {
-        __position._M_node->unhook();
-        _Node* __n = static_cast<_Node*>(__position._M_node);
-        std::_Destroy(&__n->_M_data);
-        _M_put_node(__n);
-      }
-    };
-
-  /**
-   *  @brief  List equality comparison.
-   *  @param  x  A %list.
-   *  @param  y  A %list of the same type as @a x.
-   *  @return  True iff the size and elements of the lists are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of
-   *  the lists.  Lists are considered equivalent if their sizes are
-   *  equal, and if corresponding elements compare equal.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const list<_Tp,_Alloc>& __x, const list<_Tp,_Alloc>& __y)
-    {
-      typedef typename list<_Tp,_Alloc>::const_iterator const_iterator;
-      const_iterator __end1 = __x.end();
-      const_iterator __end2 = __y.end();
-
-      const_iterator __i1 = __x.begin();
-      const_iterator __i2 = __y.begin();
-      while (__i1 != __end1 && __i2 != __end2 && *__i1 == *__i2)
-	{
-	  ++__i1;
-	  ++__i2;
-	}
-      return __i1 == __end1 && __i2 == __end2;
-    }
-
-  /**
-   *  @brief  List ordering relation.
-   *  @param  x  A %list.
-   *  @param  y  A %list of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  lists.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const list<_Tp,_Alloc>& __x, const list<_Tp,_Alloc>& __y)
-    { return std::lexicographical_compare(__x.begin(), __x.end(),
-					  __y.begin(), __y.end()); }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const list<_Tp,_Alloc>& __x, const list<_Tp,_Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const list<_Tp,_Alloc>& __x, const list<_Tp,_Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const list<_Tp,_Alloc>& __x, const list<_Tp,_Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const list<_Tp,_Alloc>& __x, const list<_Tp,_Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::list::swap().
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(list<_Tp, _Alloc>& __x, list<_Tp, _Alloc>& __y)
-    { __x.swap(__y); }
-} // namespace std
-
-#endif /* _LIST_H */
-
diff --git a/include.new/c++/3.4/bits/stl_map.h b/include.new/c++/3.4/bits/stl_map.h
deleted file mode 100644
index 8535ae5..0000000
--- a/include.new/c++/3.4/bits/stl_map.h
+++ /dev/null
@@ -1,694 +0,0 @@
-// Map implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_map.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _MAP_H
-#define _MAP_H 1
-
-#include <bits/concept_check.h>
-
-namespace _GLIBCXX_STD
-{
-  /**
-   *  @brief A standard container made up of (key,value) pairs, which can be
-   *  retrieved based on a key, in logarithmic time.
-   *
-   *  @ingroup Containers
-   *  @ingroup Assoc_containers
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and an
-   *  <a href="tables.html#69">associative container</a> (using unique keys).
-   *  For a @c map<Key,T> the key_type is Key, the mapped_type is T, and the
-   *  value_type is std::pair<const Key,T>.
-   *
-   *  Maps support bidirectional iterators.
-   *
-   *  @if maint
-   *  The private tree data is declared exactly the same way for map and
-   *  multimap; the distinction is made entirely in how the tree functions are
-   *  called (*_unique versus *_equal, same as the standard).
-   *  @endif
-  */
-  template <typename _Key, typename _Tp, typename _Compare = less<_Key>,
-            typename _Alloc = allocator<pair<const _Key, _Tp> > >
-    class map
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Key, _Key,
-				_BinaryFunctionConcept)
-
-    public:
-      typedef _Key                                          key_type;
-      typedef _Tp                                           mapped_type;
-      typedef pair<const _Key, _Tp>                         value_type;
-      typedef _Compare                                      key_compare;
-
-      class value_compare
-      : public binary_function<value_type, value_type, bool>
-      {
-	friend class map<_Key,_Tp,_Compare,_Alloc>;
-      protected:
-	_Compare comp;
-
-	value_compare(_Compare __c)
-	: comp(__c) { }
-
-      public:
-	bool operator()(const value_type& __x, const value_type& __y) const
-	{ return comp(__x.first, __y.first); }
-      };
-
-    private:
-      /// @if maint  This turns a red-black tree into a [multi]map.  @endif
-      typedef _Rb_tree<key_type, value_type,
-		       _Select1st<value_type>, key_compare, _Alloc> _Rep_type;
-      /// @if maint  The actual tree structure.  @endif
-      _Rep_type _M_t;
-
-    public:
-      // many of these are specified differently in ISO, but the following are
-      // "functionally equivalent"
-      typedef typename _Alloc::pointer                   pointer;
-      typedef typename _Alloc::const_pointer             const_pointer;
-      typedef typename _Alloc::reference                 reference;
-      typedef typename _Alloc::const_reference           const_reference;
-      typedef typename _Rep_type::allocator_type         allocator_type;
-      typedef typename _Rep_type::iterator               iterator;
-      typedef typename _Rep_type::const_iterator         const_iterator;
-      typedef typename _Rep_type::size_type              size_type;
-      typedef typename _Rep_type::difference_type        difference_type;
-      typedef typename _Rep_type::reverse_iterator       reverse_iterator;
-      typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
-
-      // [23.3.1.1] construct/copy/destroy
-      // (get_allocator() is normally listed in this section, but seems to have
-      // been accidentally omitted in the printed standard)
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      map()
-      : _M_t(_Compare(), allocator_type()) { }
-
-      // for some reason this was made a separate function
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      explicit
-      map(const _Compare& __comp, const allocator_type& __a = allocator_type())
-      : _M_t(__comp, __a) { }
-
-      /**
-       *  @brief  Map copy constructor.
-       *  @param  x  A %map of identical element and allocator types.
-       *
-       *  The newly-created %map uses a copy of the allocation object used
-       *  by @a x.
-       */
-      map(const map& __x)
-      : _M_t(__x._M_t) { }
-
-      /**
-       *  @brief  Builds a %map from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *
-       *  Create a %map consisting of copies of the elements from [first,last).
-       *  This is linear in N if the range is already sorted, and NlogN
-       *  otherwise (where N is distance(first,last)).
-       */
-      template <typename _InputIterator>
-        map(_InputIterator __first, _InputIterator __last)
-	: _M_t(_Compare(), allocator_type())
-        { _M_t.insert_unique(__first, __last); }
-
-      /**
-       *  @brief  Builds a %map from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *  @param  comp  A comparison functor.
-       *  @param  a  An allocator object.
-       *
-       *  Create a %map consisting of copies of the elements from [first,last).
-       *  This is linear in N if the range is already sorted, and NlogN
-       *  otherwise (where N is distance(first,last)).
-       */
-      template <typename _InputIterator>
-        map(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp, const allocator_type& __a = allocator_type())
-	: _M_t(__comp, __a)
-        { _M_t.insert_unique(__first, __last); }
-
-      // FIXME There is no dtor declared, but we should have something generated
-      // by Doxygen.  I don't know what tags to add to this paragraph to make
-      // that happen:
-      /**
-       *  The dtor only erases the elements, and note that if the elements
-       *  themselves are pointers, the pointed-to memory is not touched in any
-       *  way.  Managing the pointer is the user's responsibilty.
-       */
-
-      /**
-       *  @brief  Map assignment operator.
-       *  @param  x  A %map of identical element and allocator types.
-       *
-       *  All the elements of @a x are copied, but unlike the copy constructor,
-       *  the allocator object is not copied.
-       */
-      map&
-      operator=(const map& __x)
-      {
-	_M_t = __x._M_t;
-	return *this;
-      }
-
-      /// Get a copy of the memory allocation object.
-      allocator_type
-      get_allocator() const
-      { return _M_t.get_allocator(); }
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first pair in the
-       *  %map.
-       *  Iteration is done in ascending order according to the keys.
-       */
-      iterator
-      begin()
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first pair
-       *  in the %map.  Iteration is done in ascending order according to the
-       *  keys.
-       */
-      const_iterator
-      begin() const
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last pair in
-       *  the %map.  Iteration is done in ascending order according to the keys.
-       */
-      iterator
-      end()
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  pair in the %map.  Iteration is done in ascending order according to
-       *  the keys.
-       */
-      const_iterator
-      end() const
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last pair in
-       *  the %map.  Iteration is done in descending order according to the
-       *  keys.
-       */
-      reverse_iterator
-      rbegin()
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last pair in the %map.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      const_reverse_iterator
-      rbegin() const
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one before the
-       *  first pair in the %map.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      rend()
-      { return _M_t.rend(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first pair in the %map.  Iteration is done in descending
-       *  order according to the keys.
-       */
-      const_reverse_iterator
-      rend() const
-      { return _M_t.rend(); }
-
-      // capacity
-      /** Returns true if the %map is empty.  (Thus begin() would equal
-       *  end().)
-      */
-      bool
-      empty() const
-      { return _M_t.empty(); }
-
-      /** Returns the size of the %map.  */
-      size_type
-      size() const
-      { return _M_t.size(); }
-
-      /** Returns the maximum size of the %map.  */
-      size_type
-      max_size() const
-      { return _M_t.max_size(); }
-
-      // [23.3.1.2] element access
-      /**
-       *  @brief  Subscript ( @c [] ) access to %map data.
-       *  @param  k  The key for which data should be retrieved.
-       *  @return  A reference to the data of the (key,data) %pair.
-       *
-       *  Allows for easy lookup with the subscript ( @c [] ) operator.  Returns
-       *  data associated with the key specified in subscript.  If the key does
-       *  not exist, a pair with that key is created using default values, which
-       *  is then returned.
-       *
-       *  Lookup requires logarithmic time.
-       */
-      mapped_type&
-      operator[](const key_type& __k)
-      {
-	// concept requirements
-	__glibcxx_function_requires(_DefaultConstructibleConcept<mapped_type>)
-
-	iterator __i = lower_bound(__k);
-	// __i->first is greater than or equivalent to __k.
-	if (__i == end() || key_comp()(__k, (*__i).first))
-          __i = insert(__i, value_type(__k, mapped_type()));
-	return (*__i).second;
-      }
-
-      // modifiers
-      /**
-       *  @brief Attempts to insert a std::pair into the %map.
-       *  @param  x  Pair to be inserted (see std::make_pair for easy creation of
-       *             pairs).
-       *  @return  A pair, of which the first element is an iterator that points
-       *           to the possibly inserted pair, and the second is a bool that
-       *           is true if the pair was actually inserted.
-       *
-       *  This function attempts to insert a (key, value) %pair into the %map.
-       *  A %map relies on unique keys and thus a %pair is only inserted if its
-       *  first element (the key) is not already present in the %map.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      pair<iterator,bool>
-      insert(const value_type& __x)
-      { return _M_t.insert_unique(__x); }
-
-      /**
-       *  @brief Attempts to insert a std::pair into the %map.
-       *  @param  position  An iterator that serves as a hint as to where the
-       *                    pair should be inserted.
-       *  @param  x  Pair to be inserted (see std::make_pair for easy creation of
-       *             pairs).
-       *  @return  An iterator that points to the element with key of @a x (may
-       *           or may not be the %pair passed in).
-       *
-       *  This function is not concerned about whether the insertion took place,
-       *  and thus does not return a boolean like the single-argument
-       *  insert() does.  Note that the first parameter is only a hint and can
-       *  potentially improve the performance of the insertion process.  A bad
-       *  hint would cause no gains in efficiency.
-       *
-       *  See http://gcc.gnu.org/onlinedocs/libstdc++/23_containers/howto.html#4
-       *  for more on "hinting".
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      iterator
-      insert(iterator position, const value_type& __x)
-      { return _M_t.insert_unique(position, __x); }
-
-      /**
-       *  @brief A template function that attemps to insert a range of elements.
-       *  @param  first  Iterator pointing to the start of the range to be
-       *                 inserted.
-       *  @param  last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template <typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        { _M_t.insert_unique(__first, __last); }
-
-      /**
-       *  @brief Erases an element from a %map.
-       *  @param  position  An iterator pointing to the element to be erased.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %map.  Note that this function only erases the element, and
-       *  that if the element is itself a pointer, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's responsibilty.
-       */
-      void
-      erase(iterator __position)
-      { _M_t.erase(__position); }
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all the elements located by the given key from
-       *  a %map.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibilty.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_t.erase(__x); }
-
-      /**
-       *  @brief Erases a [first,last) range of elements from a %map.
-       *  @param  first  Iterator pointing to the start of the range to be
-       *                 erased.
-       *  @param  last  Iterator pointing to the end of the range to be erased.
-       *
-       *  This function erases a sequence of elements from a %map.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibilty.
-       */
-      void
-      erase(iterator __first, iterator __last)
-      { _M_t.erase(__first, __last); }
-
-      /**
-       *  @brief  Swaps data with another %map.
-       *  @param  x  A %map of the same element and allocator types.
-       *
-       *  This exchanges the elements between two maps in constant time.
-       *  (It is only swapping a pointer, an integer, and an instance of
-       *  the @c Compare type (which itself is often stateless and empty), so it
-       *  should be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(m1,m2) will feed to this function.
-       */
-      void
-      swap(map& __x)
-      { _M_t.swap(__x._M_t); }
-
-      /**
-       *  Erases all elements in a %map.  Note that this function only erases
-       *  the elements, and that if the elements themselves are pointers, the
-       *  pointed-to memory is not touched in any way.  Managing the pointer is
-       *  the user's responsibilty.
-       */
-      void
-      clear()
-      { _M_t.clear(); }
-
-      // observers
-      /**
-       *  Returns the key comparison object out of which the %map was
-       *  constructed.
-       */
-      key_compare
-      key_comp() const
-      { return _M_t.key_comp(); }
-
-      /**
-       *  Returns a value comparison object, built from the key comparison
-       *  object out of which the %map was constructed.
-       */
-      value_compare
-      value_comp() const
-      { return value_compare(_M_t.key_comp()); }
-
-      // [23.3.1.3] map operations
-      /**
-       *  @brief Tries to locate an element in a %map.
-       *  @param  x  Key of (key, value) %pair to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after %pair.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_t.find(__x); }
-
-      /**
-       *  @brief Tries to locate an element in a %map.
-       *  @param  x  Key of (key, value) %pair to be located.
-       *  @return  Read-only (constant) iterator pointing to sought-after
-       *           element, or end() if not found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns a constant
-       *  iterator pointing to the sought after %pair. If unsuccessful it
-       *  returns the past-the-end ( @c end() ) iterator.
-       */
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_t.find(__x); }
-
-      /**
-       *  @brief  Finds the number of elements with given key.
-       *  @param  x  Key of (key, value) pairs to be located.
-       *  @return  Number of elements with specified key.
-       *
-       *  This function only makes sense for multimaps; for map the result will
-       *  either be 0 (not present) or 1 (present).
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_t.find(__x) == _M_t.end() ? 0 : 1; }
-
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return  Iterator pointing to first element equal to or greater
-       *           than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      iterator
-      lower_bound(const key_type& __x)
-      { return _M_t.lower_bound(__x); }
-
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to first element
-       *           equal to or greater than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return _M_t.lower_bound(__x); }
-
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return Iterator pointing to the first element
-       *          greater than key, or end().
-       */
-      iterator
-      upper_bound(const key_type& __x)
-      { return _M_t.upper_bound(__x); }
-
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to first iterator
-       *           greater than key, or end().
-       */
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return _M_t.upper_bound(__x); }
-
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  x  Key of (key, value) pairs to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       *
-       *  This function probably only makes sense for multimaps.
-       */
-      pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      { return _M_t.equal_range(__x); }
-
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  x  Key of (key, value) pairs to be located.
-       *  @return  Pair of read-only (constant) iterators that possibly points
-       *           to the subsequence matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       *
-       *  This function probably only makes sense for multimaps.
-       */
-      pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_t.equal_range(__x); }
-
-      template <typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator== (const map<_K1,_T1,_C1,_A1>&,
-		    const map<_K1,_T1,_C1,_A1>&);
-
-      template <typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator< (const map<_K1,_T1,_C1,_A1>&,
-		   const map<_K1,_T1,_C1,_A1>&);
-    };
-
-  /**
-   *  @brief  Map equality comparison.
-   *  @param  x  A %map.
-   *  @param  y  A %map of the same type as @a x.
-   *  @return  True iff the size and elements of the maps are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  maps.  Maps are considered equivalent if their sizes are equal,
-   *  and if corresponding elements compare equal.
-  */
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator==(const map<_Key,_Tp,_Compare,_Alloc>& __x,
-               const map<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return __x._M_t == __y._M_t; }
-
-  /**
-   *  @brief  Map ordering relation.
-   *  @param  x  A %map.
-   *  @param  y  A %map of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  maps.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator<(const map<_Key,_Tp,_Compare,_Alloc>& __x,
-              const map<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return __x._M_t < __y._M_t; }
-
-  /// Based on operator==
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator!=(const map<_Key,_Tp,_Compare,_Alloc>& __x,
-               const map<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator>(const map<_Key,_Tp,_Compare,_Alloc>& __x,
-              const map<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator<=(const map<_Key,_Tp,_Compare,_Alloc>& __x,
-               const map<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator>=(const map<_Key,_Tp,_Compare,_Alloc>& __x,
-               const map<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::map::swap().
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline void
-    swap(map<_Key,_Tp,_Compare,_Alloc>& __x, map<_Key,_Tp,_Compare,_Alloc>& __y)
-    { __x.swap(__y); }
-} // namespace std
-
-#endif /* _MAP_H */
diff --git a/include.new/c++/3.4/bits/stl_multimap.h b/include.new/c++/3.4/bits/stl_multimap.h
deleted file mode 100644
index e080f9a..0000000
--- a/include.new/c++/3.4/bits/stl_multimap.h
+++ /dev/null
@@ -1,677 +0,0 @@
-// Multimap implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_multimap.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _MULTIMAP_H
-#define _MULTIMAP_H 1
-
-#include <bits/concept_check.h>
-
-namespace _GLIBCXX_STD
-{
-  // Forward declaration of operators < and ==, needed for friend declaration.
-
-  template <typename _Key, typename _Tp,
-            typename _Compare = less<_Key>,
-            typename _Alloc = allocator<pair<const _Key, _Tp> > >
-    class multimap;
-
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator==(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
-	       const multimap<_Key,_Tp,_Compare,_Alloc>& __y);
-
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator<(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
-	      const multimap<_Key,_Tp,_Compare,_Alloc>& __y);
-
-  /**
-   *  @brief A standard container made up of (key,value) pairs, which can be
-   *  retrieved based on a key, in logarithmic time.
-   *
-   *  @ingroup Containers
-   *  @ingroup Assoc_containers
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and an
-   *  <a href="tables.html#69">associative container</a> (using equivalent
-   *  keys).  For a @c multimap<Key,T> the key_type is Key, the mapped_type
-   *  is T, and the value_type is std::pair<const Key,T>.
-   *
-   *  Multimaps support bidirectional iterators.
-   *
-   *  @if maint
-   *  The private tree data is declared exactly the same way for map and
-   *  multimap; the distinction is made entirely in how the tree functions are
-   *  called (*_unique versus *_equal, same as the standard).
-   *  @endif
-  */
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    class multimap
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Key, _Key,
-				_BinaryFunctionConcept)
-
-    public:
-      typedef _Key                                          key_type;
-      typedef _Tp                                           mapped_type;
-      typedef pair<const _Key, _Tp>                         value_type;
-      typedef _Compare                                      key_compare;
-
-      class value_compare
-      : public binary_function<value_type, value_type, bool>
-      {
-	friend class multimap<_Key,_Tp,_Compare,_Alloc>;
-      protected:
-	_Compare comp;
-
-	value_compare(_Compare __c)
-	: comp(__c) { }
-
-      public:
-	bool operator()(const value_type& __x, const value_type& __y) const
-	{ return comp(__x.first, __y.first); }
-      };
-
-    private:
-      /// @if maint  This turns a red-black tree into a [multi]map.  @endif
-      typedef _Rb_tree<key_type, value_type,
-		       _Select1st<value_type>, key_compare, _Alloc> _Rep_type;
-      /// @if maint  The actual tree structure.  @endif
-      _Rep_type _M_t;
-
-    public:
-      // many of these are specified differently in ISO, but the following are
-      // "functionally equivalent"
-      typedef typename _Alloc::pointer                   pointer;
-      typedef typename _Alloc::const_pointer             const_pointer;
-      typedef typename _Alloc::reference                 reference;
-      typedef typename _Alloc::const_reference           const_reference;
-      typedef typename _Rep_type::allocator_type         allocator_type;
-      typedef typename _Rep_type::iterator               iterator;
-      typedef typename _Rep_type::const_iterator         const_iterator;
-      typedef typename _Rep_type::size_type              size_type;
-      typedef typename _Rep_type::difference_type        difference_type;
-      typedef typename _Rep_type::reverse_iterator       reverse_iterator;
-      typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
-
-      // [23.3.2] construct/copy/destroy
-      // (get_allocator() is also listed in this section)
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      multimap()
-      : _M_t(_Compare(), allocator_type()) { }
-
-      // for some reason this was made a separate function
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      explicit
-      multimap(const _Compare& __comp,
-	       const allocator_type& __a = allocator_type())
-      : _M_t(__comp, __a) { }
-
-      /**
-       *  @brief  %Multimap copy constructor.
-       *  @param  x  A %multimap of identical element and allocator types.
-       *
-       *  The newly-created %multimap uses a copy of the allocation object used
-       *  by @a x.
-       */
-      multimap(const multimap& __x)
-      : _M_t(__x._M_t) { }
-
-      /**
-       *  @brief  Builds a %multimap from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *
-       *  Create a %multimap consisting of copies of the elements from
-       *  [first,last).  This is linear in N if the range is already sorted,
-       *  and NlogN otherwise (where N is distance(first,last)).
-       */
-      template <typename _InputIterator>
-        multimap(_InputIterator __first, _InputIterator __last)
-	: _M_t(_Compare(), allocator_type())
-        { _M_t.insert_equal(__first, __last); }
-
-      /**
-       *  @brief  Builds a %multimap from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *  @param  comp  A comparison functor.
-       *  @param  a  An allocator object.
-       *
-       *  Create a %multimap consisting of copies of the elements from
-       *  [first,last).  This is linear in N if the range is already sorted,
-       *  and NlogN otherwise (where N is distance(first,last)).
-       */
-      template <typename _InputIterator>
-        multimap(_InputIterator __first, _InputIterator __last,
-		 const _Compare& __comp,
-		 const allocator_type& __a = allocator_type())
-        : _M_t(__comp, __a)
-        { _M_t.insert_equal(__first, __last); }
-
-      // FIXME There is no dtor declared, but we should have something generated
-      // by Doxygen.  I don't know what tags to add to this paragraph to make
-      // that happen:
-      /**
-       *  The dtor only erases the elements, and note that if the elements
-       *  themselves are pointers, the pointed-to memory is not touched in any
-       *  way.  Managing the pointer is the user's responsibilty.
-       */
-
-      /**
-       *  @brief  %Multimap assignment operator.
-       *  @param  x  A %multimap of identical element and allocator types.
-       *
-       *  All the elements of @a x are copied, but unlike the copy constructor,
-       *  the allocator object is not copied.
-       */
-      multimap&
-      operator=(const multimap& __x)
-      {
-	_M_t = __x._M_t;
-	return *this;
-      }
-
-      /// Get a copy of the memory allocation object.
-      allocator_type
-      get_allocator() const
-      { return _M_t.get_allocator(); }
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first pair in the
-       *  %multimap.  Iteration is done in ascending order according to the
-       *  keys.
-       */
-      iterator
-      begin()
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the first pair
-       *  in the %multimap.  Iteration is done in ascending order according to
-       *  the keys.
-       */
-      const_iterator
-      begin() const
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last pair in
-       *  the %multimap.  Iteration is done in ascending order according to the
-       *  keys.
-       */
-      iterator
-      end()
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past the last
-       *  pair in the %multimap.  Iteration is done in ascending order according
-       *  to the keys.
-       */
-      const_iterator
-      end() const
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last pair in
-       *  the %multimap.  Iteration is done in descending order according to the
-       *  keys.
-       */
-      reverse_iterator
-      rbegin()
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last pair in the %multimap.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      const_reverse_iterator
-      rbegin() const
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one before the
-       *  first pair in the %multimap.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      rend()
-      { return _M_t.rend(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to one
-       *  before the first pair in the %multimap.  Iteration is done in
-       *  descending order according to the keys.
-       */
-      const_reverse_iterator
-      rend() const
-      { return _M_t.rend(); }
-
-      // capacity
-      /** Returns true if the %multimap is empty.  */
-      bool
-      empty() const
-      { return _M_t.empty(); }
-
-      /** Returns the size of the %multimap.  */
-      size_type
-      size() const
-      { return _M_t.size(); }
-
-      /** Returns the maximum size of the %multimap.  */
-      size_type
-      max_size() const
-      { return _M_t.max_size(); }
-
-      // modifiers
-      /**
-       *  @brief Inserts a std::pair into the %multimap.
-       *  @param  x  Pair to be inserted (see std::make_pair for easy creation
-       *             of pairs).
-       *  @return An iterator that points to the inserted (key,value) pair.
-       *
-       *  This function inserts a (key, value) pair into the %multimap.
-       *  Contrary to a std::map the %multimap does not rely on unique keys and
-       *  thus multiple pairs with the same key can be inserted.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      iterator
-      insert(const value_type& __x)
-      { return _M_t.insert_equal(__x); }
-
-      /**
-       *  @brief Inserts a std::pair into the %multimap.
-       *  @param  position  An iterator that serves as a hint as to where the
-       *                    pair should be inserted.
-       *  @param  x  Pair to be inserted (see std::make_pair for easy creation
-       *             of pairs).
-       *  @return An iterator that points to the inserted (key,value) pair.
-       *
-       *  This function inserts a (key, value) pair into the %multimap.
-       *  Contrary to a std::map the %multimap does not rely on unique keys and
-       *  thus multiple pairs with the same key can be inserted.
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  See http://gcc.gnu.org/onlinedocs/libstdc++/23_containers/howto.html#4
-       *  for more on "hinting".
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      iterator
-      insert(iterator __position, const value_type& __x)
-      { return _M_t.insert_equal(__position, __x); }
-
-      /**
-       *  @brief A template function that attemps to insert a range of elements.
-       *  @param  first  Iterator pointing to the start of the range to be
-       *                 inserted.
-       *  @param  last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template <typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        { _M_t.insert_equal(__first, __last); }
-
-      /**
-       *  @brief Erases an element from a %multimap.
-       *  @param  position  An iterator pointing to the element to be erased.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %multimap.  Note that this function only erases the element,
-       *  and that if the element is itself a pointer, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibilty.
-       */
-      void
-      erase(iterator __position)
-      { _M_t.erase(__position); }
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all elements located by the given key from a
-       *  %multimap.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibilty.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_t.erase(__x); }
-
-      /**
-       *  @brief Erases a [first,last) range of elements from a %multimap.
-       *  @param  first  Iterator pointing to the start of the range to be
-       *                 erased.
-       *  @param  last  Iterator pointing to the end of the range to be erased.
-       *
-       *  This function erases a sequence of elements from a %multimap.
-       *  Note that this function only erases the elements, and that if
-       *  the elements themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's responsibilty.
-       */
-      void
-      erase(iterator __first, iterator __last)
-      { _M_t.erase(__first, __last); }
-
-      /**
-       *  @brief  Swaps data with another %multimap.
-       *  @param  x  A %multimap of the same element and allocator types.
-       *
-       *  This exchanges the elements between two multimaps in constant time.
-       *  (It is only swapping a pointer, an integer, and an instance of
-       *  the @c Compare type (which itself is often stateless and empty), so it
-       *  should be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(m1,m2) will feed to this function.
-       */
-      void
-      swap(multimap& __x)
-      { _M_t.swap(__x._M_t); }
-
-      /**
-       *  Erases all elements in a %multimap.  Note that this function only
-       *  erases the elements, and that if the elements themselves are pointers,
-       *  the pointed-to memory is not touched in any way.  Managing the pointer
-       *  is the user's responsibilty.
-       */
-      void
-      clear()
-      { _M_t.clear(); }
-
-      // observers
-      /**
-       *  Returns the key comparison object out of which the %multimap
-       *  was constructed.
-       */
-      key_compare
-      key_comp() const
-      { return _M_t.key_comp(); }
-
-      /**
-       *  Returns a value comparison object, built from the key comparison
-       *  object out of which the %multimap was constructed.
-       */
-      value_compare
-      value_comp() const
-      { return value_compare(_M_t.key_comp()); }
-
-      // multimap operations
-      /**
-       *  @brief Tries to locate an element in a %multimap.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return  Iterator pointing to sought-after element,
-       *           or end() if not found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after %pair.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_t.find(__x); }
-
-      /**
-       *  @brief Tries to locate an element in a %multimap.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to sought-after
-       *           element, or end() if not found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns a constant
-       *  iterator pointing to the sought after %pair.  If unsuccessful it
-       *  returns the past-the-end ( @c end() ) iterator.
-       */
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_t.find(__x); }
-
-      /**
-       *  @brief Finds the number of elements with given key.
-       *  @param  x  Key of (key, value) pairs to be located.
-       *  @return Number of elements with specified key.
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_t.count(__x); }
-
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return  Iterator pointing to first element equal to or greater
-       *           than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      iterator
-      lower_bound(const key_type& __x)
-      { return _M_t.lower_bound(__x); }
-
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to first element
-       *           equal to or greater than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful the iterator will point
-       *  to the next greatest element or, if no such greater element exists, to
-       *  end().
-       */
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return _M_t.lower_bound(__x); }
-
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return Iterator pointing to the first element
-       *          greater than key, or end().
-       */
-      iterator
-      upper_bound(const key_type& __x)
-      { return _M_t.upper_bound(__x); }
-
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  x  Key of (key, value) pair to be located.
-       *  @return  Read-only (constant) iterator pointing to first iterator
-       *           greater than key, or end().
-       */
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return _M_t.upper_bound(__x); }
-
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  x  Key of (key, value) pairs to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       */
-      pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      { return _M_t.equal_range(__x); }
-
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  x  Key of (key, value) pairs to be located.
-       *  @return  Pair of read-only (constant) iterators that possibly points
-       *           to the subsequence matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       */
-      pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_t.equal_range(__x); }
-
-      template <typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator== (const multimap<_K1,_T1,_C1,_A1>&,
-		    const multimap<_K1,_T1,_C1,_A1>&);
-
-      template <typename _K1, typename _T1, typename _C1, typename _A1>
-        friend bool
-        operator< (const multimap<_K1,_T1,_C1,_A1>&,
-		   const multimap<_K1,_T1,_C1,_A1>&);
-  };
-
-  /**
-   *  @brief  Multimap equality comparison.
-   *  @param  x  A %multimap.
-   *  @param  y  A %multimap of the same type as @a x.
-   *  @return  True iff the size and elements of the maps are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  multimaps.  Multimaps are considered equivalent if their sizes are equal,
-   *  and if corresponding elements compare equal.
-  */
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator==(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
-               const multimap<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return __x._M_t == __y._M_t; }
-
-  /**
-   *  @brief  Multimap ordering relation.
-   *  @param  x  A %multimap.
-   *  @param  y  A %multimap of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  multimaps.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator<(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
-              const multimap<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return __x._M_t < __y._M_t; }
-
-  /// Based on operator==
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator!=(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
-               const multimap<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator>(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
-              const multimap<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator<=(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
-               const multimap<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline bool
-    operator>=(const multimap<_Key,_Tp,_Compare,_Alloc>& __x,
-               const multimap<_Key,_Tp,_Compare,_Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::multimap::swap().
-  template <typename _Key, typename _Tp, typename _Compare, typename _Alloc>
-    inline void
-    swap(multimap<_Key,_Tp,_Compare,_Alloc>& __x,
-         multimap<_Key,_Tp,_Compare,_Alloc>& __y)
-    { __x.swap(__y); }
-} // namespace std
-
-#endif /* _MULTIMAP_H */
diff --git a/include.new/c++/3.4/bits/stl_multiset.h b/include.new/c++/3.4/bits/stl_multiset.h
deleted file mode 100644
index c82dee6..0000000
--- a/include.new/c++/3.4/bits/stl_multiset.h
+++ /dev/null
@@ -1,585 +0,0 @@
-// Multiset implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_multiset.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _MULTISET_H
-#define _MULTISET_H 1
-
-#include <bits/concept_check.h>
-
-namespace _GLIBCXX_STD
-{
-
-  // Forward declaration of operators < and ==, needed for friend declaration.
-  template <class _Key, class _Compare = less<_Key>,
-	    class _Alloc = allocator<_Key> >
-    class multiset;
-
-  template <class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator==(const multiset<_Key,_Compare,_Alloc>& __x,
-	       const multiset<_Key,_Compare,_Alloc>& __y);
-
-  template <class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator<(const multiset<_Key,_Compare,_Alloc>& __x,
-	      const multiset<_Key,_Compare,_Alloc>& __y);
-
-  /**
-   *  @brief A standard container made up of elements, which can be retrieved
-   *  in logarithmic time.
-   *
-   *  @ingroup Containers
-   *  @ingroup Assoc_containers
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and an
-   *  <a href="tables.html#69">associative container</a> (using equivalent
-   *  keys).  For a @c multiset<Key> the key_type and value_type are Key.
-   *
-   *  Multisets support bidirectional iterators.
-   *
-   *  @if maint
-   *  The private tree data is declared exactly the same way for set and
-   *  multiset; the distinction is made entirely in how the tree functions are
-   *  called (*_unique versus *_equal, same as the standard).
-   *  @endif
-  */
-  template <class _Key, class _Compare, class _Alloc>
-    class multiset
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Key, _SGIAssignableConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Key, _Key,
-				_BinaryFunctionConcept)
-
-    public:
-      // typedefs:
-      typedef _Key     key_type;
-      typedef _Key     value_type;
-      typedef _Compare key_compare;
-      typedef _Compare value_compare;
-
-    private:
-      /// @if maint  This turns a red-black tree into a [multi]set.  @endif
-      typedef _Rb_tree<key_type, value_type,
-		       _Identity<value_type>, key_compare, _Alloc> _Rep_type;
-      /// @if maint  The actual tree structure.  @endif
-      _Rep_type _M_t;
-
-    public:
-      typedef typename _Alloc::pointer pointer;
-      typedef typename _Alloc::const_pointer const_pointer;
-      typedef typename _Alloc::reference reference;
-      typedef typename _Alloc::const_reference const_reference;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 103. set::iterator is required to be modifiable,
-      // but this allows modification of keys.
-      typedef typename _Rep_type::const_iterator iterator;
-      typedef typename _Rep_type::const_iterator const_iterator;
-      typedef typename _Rep_type::const_reverse_iterator reverse_iterator;
-      typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
-      typedef typename _Rep_type::size_type size_type;
-      typedef typename _Rep_type::difference_type difference_type;
-      typedef typename _Rep_type::allocator_type allocator_type;
-
-    // allocation/deallocation
-
-    /**
-     *  @brief  Default constructor creates no elements.
-     */
-      multiset()
-      : _M_t(_Compare(), allocator_type()) { }
-
-      explicit
-      multiset(const _Compare& __comp,
-	       const allocator_type& __a = allocator_type())
-      : _M_t(__comp, __a) { }
-
-      /**
-       *  @brief  Builds a %multiset from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *
-       *  Create a %multiset consisting of copies of the elements from
-       *  [first,last).  This is linear in N if the range is already sorted,
-       *  and NlogN otherwise (where N is distance(first,last)).
-       */
-      template <class _InputIterator>
-        multiset(_InputIterator __first, _InputIterator __last)
-	: _M_t(_Compare(), allocator_type())
-        { _M_t.insert_equal(__first, __last); }
-
-      /**
-       *  @brief  Builds a %multiset from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *  @param  comp  A comparison functor.
-       *  @param  a  An allocator object.
-       *
-       *  Create a %multiset consisting of copies of the elements from
-       *  [first,last).  This is linear in N if the range is already sorted,
-       *  and NlogN otherwise (where N is distance(first,last)).
-       */
-      template <class _InputIterator>
-        multiset(_InputIterator __first, _InputIterator __last,
-		 const _Compare& __comp,
-		 const allocator_type& __a = allocator_type())
-	: _M_t(__comp, __a)
-        { _M_t.insert_equal(__first, __last); }
-
-      /**
-       *  @brief  %Multiset copy constructor.
-       *  @param  x  A %multiset of identical element and allocator types.
-       *
-       *  The newly-created %multiset uses a copy of the allocation object used
-       *  by @a x.
-       */
-      multiset(const multiset<_Key,_Compare,_Alloc>& __x)
-      : _M_t(__x._M_t) { }
-
-      /**
-       *  @brief  %Multiset assignment operator.
-       *  @param  x  A %multiset of identical element and allocator types.
-       *
-       *  All the elements of @a x are copied, but unlike the copy constructor,
-       *  the allocator object is not copied.
-       */
-      multiset<_Key,_Compare,_Alloc>&
-      operator=(const multiset<_Key,_Compare,_Alloc>& __x)
-      {
-	_M_t = __x._M_t;
-	return *this;
-      }
-
-      // accessors:
-
-      ///  Returns the comparison object.
-      key_compare
-      key_comp() const
-      { return _M_t.key_comp(); }
-      ///  Returns the comparison object.
-      value_compare
-      value_comp() const
-      { return _M_t.key_comp(); }
-      ///  Returns the memory allocation object.
-      allocator_type
-      get_allocator() const
-      { return _M_t.get_allocator(); }
-
-      /**
-       *  Returns a read/write iterator that points to the first element in the
-       *  %multiset.  Iteration is done in ascending order according to the
-       *  keys.
-       */
-      iterator
-      begin() const
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last element in
-       *  the %multiset.  Iteration is done in ascending order according to the
-       *  keys.
-       */
-      iterator
-      end() const
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last element
-       *  in the %multiset.  Iteration is done in descending order according to
-       *  the keys.
-       */
-      reverse_iterator
-      rbegin() const
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last element
-       *  in the %multiset.  Iteration is done in descending order according to
-       *  the keys.
-       */
-      reverse_iterator
-      rend() const
-      { return _M_t.rend(); }
-
-      ///  Returns true if the %set is empty.
-      bool
-      empty() const
-      { return _M_t.empty(); }
-
-      ///  Returns the size of the %set.
-      size_type
-      size() const
-      { return _M_t.size(); }
-
-      ///  Returns the maximum size of the %set.
-      size_type
-      max_size() const
-      { return _M_t.max_size(); }
-
-      /**
-       *  @brief  Swaps data with another %multiset.
-       *  @param  x  A %multiset of the same element and allocator types.
-       *
-       *  This exchanges the elements between two multisets in constant time.
-       *  (It is only swapping a pointer, an integer, and an instance of the @c
-       *  Compare type (which itself is often stateless and empty), so it should
-       *  be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(s1,s2) will feed to this function.
-       */
-      void
-      swap(multiset<_Key,_Compare,_Alloc>& __x)
-      { _M_t.swap(__x._M_t); }
-
-      // insert/erase
-      /**
-       *  @brief Inserts an element into the %multiset.
-       *  @param  x  Element to be inserted.
-       *  @return An iterator that points to the inserted element.
-       *
-       *  This function inserts an element into the %multiset.  Contrary
-       *  to a std::set the %multiset does not rely on unique keys and thus
-       *  multiple copies of the same element can be inserted.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      iterator
-      insert(const value_type& __x)
-      { return _M_t.insert_equal(__x); }
-
-      /**
-       *  @brief Inserts an element into the %multiset.
-       *  @param  position  An iterator that serves as a hint as to where the
-       *                    element should be inserted.
-       *  @param  x  Element to be inserted.
-       *  @return An iterator that points to the inserted element.
-       *
-       *  This function inserts an element into the %multiset.  Contrary
-       *  to a std::set the %multiset does not rely on unique keys and thus
-       *  multiple copies of the same element can be inserted.
-       *
-       *  Note that the first parameter is only a hint and can potentially
-       *  improve the performance of the insertion process.  A bad hint would
-       *  cause no gains in efficiency.
-       *
-       *  See http://gcc.gnu.org/onlinedocs/libstdc++/23_containers/howto.html#4
-       *  for more on "hinting".
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      iterator
-      insert(iterator __position, const value_type& __x)
-      {
-	typedef typename _Rep_type::iterator _Rep_iterator;
-	return _M_t.insert_equal((_Rep_iterator&)__position, __x);
-      }
-
-      /**
-       *  @brief A template function that attemps to insert a range of elements.
-       *  @param  first  Iterator pointing to the start of the range to be
-       *                 inserted.
-       *  @param  last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template <class _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        { _M_t.insert_equal(__first, __last); }
-
-      /**
-       *  @brief Erases an element from a %multiset.
-       *  @param  position  An iterator pointing to the element to be erased.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %multiset.  Note that this function only erases the element,
-       *  and that if the element is itself a pointer, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibilty.
-       */
-      void
-      erase(iterator __position)
-      {
-	typedef typename _Rep_type::iterator _Rep_iterator;
-	_M_t.erase((_Rep_iterator&)__position);
-      }
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all elements located by the given key from a
-       *  %multiset.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibilty.
-       */
-      size_type
-      erase(const key_type& __x)
-      { return _M_t.erase(__x); }
-
-      /**
-       *  @brief Erases a [first,last) range of elements from a %multiset.
-       *  @param  first  Iterator pointing to the start of the range to be
-       *                 erased.
-       *  @param  last  Iterator pointing to the end of the range to be erased.
-       *
-       *  This function erases a sequence of elements from a %multiset.
-       *  Note that this function only erases the elements, and that if
-       *  the elements themselves are pointers, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's responsibilty.
-       */
-      void
-      erase(iterator __first, iterator __last)
-      {
-	typedef typename _Rep_type::iterator _Rep_iterator;
-	_M_t.erase((_Rep_iterator&)__first, (_Rep_iterator&)__last);
-      }
-
-      /**
-       *  Erases all elements in a %multiset.  Note that this function only
-       *  erases the elements, and that if the elements themselves are pointers,
-       *  the pointed-to memory is not touched in any way.  Managing the pointer
-       *  is the user's responsibilty.
-       */
-      void
-      clear()
-      { _M_t.clear(); }
-
-      // multiset operations:
-
-      /**
-       *  @brief Finds the number of elements with given key.
-       *  @param  x  Key of elements to be located.
-       *  @return Number of elements with specified key.
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_t.count(__x); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214.  set::find() missing const overload
-      //@{
-      /**
-       *  @brief Tries to locate an element in a %set.
-       *  @param  x  Element to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after element.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_t.find(__x); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_t.find(__x); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  x  Key to be located.
-       *  @return  Iterator pointing to first element equal to or greater
-       *           than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      iterator
-      lower_bound(const key_type& __x)
-      { return _M_t.lower_bound(__x); }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return _M_t.lower_bound(__x); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  x  Key to be located.
-       *  @return Iterator pointing to the first element
-       *          greater than key, or end().
-       */
-      iterator
-      upper_bound(const key_type& __x)
-      { return _M_t.upper_bound(__x); }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return _M_t.upper_bound(__x); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  x  Key to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       *
-       *  This function probably only makes sense for multisets.
-       */
-      pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      { return _M_t.equal_range(__x); }
-
-      pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_t.equal_range(__x); }
-
-      template <class _K1, class _C1, class _A1>
-        friend bool
-        operator== (const multiset<_K1,_C1,_A1>&,
-		    const multiset<_K1,_C1,_A1>&);
-
-      template <class _K1, class _C1, class _A1>
-        friend bool
-        operator< (const multiset<_K1,_C1,_A1>&,
-		   const multiset<_K1,_C1,_A1>&);
-    };
-
-  /**
-   *  @brief  Multiset equality comparison.
-   *  @param  x  A %multiset.
-   *  @param  y  A %multiset of the same type as @a x.
-   *  @return  True iff the size and elements of the multisets are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  multisets.
-   *  Multisets are considered equivalent if their sizes are equal, and if
-   *  corresponding elements compare equal.
-  */
-  template <class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator==(const multiset<_Key,_Compare,_Alloc>& __x,
-	       const multiset<_Key,_Compare,_Alloc>& __y)
-    { return __x._M_t == __y._M_t; }
-
-  /**
-   *  @brief  Multiset ordering relation.
-   *  @param  x  A %multiset.
-   *  @param  y  A %multiset of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  maps.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template <class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator<(const multiset<_Key,_Compare,_Alloc>& __x,
-	      const multiset<_Key,_Compare,_Alloc>& __y)
-    { return __x._M_t < __y._M_t; }
-
-  ///  Returns !(x == y).
-  template <class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator!=(const multiset<_Key,_Compare,_Alloc>& __x,
-	       const multiset<_Key,_Compare,_Alloc>& __y)
-    { return !(__x == __y); }
-
-  ///  Returns y < x.
-  template <class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator>(const multiset<_Key,_Compare,_Alloc>& __x,
-	      const multiset<_Key,_Compare,_Alloc>& __y)
-    { return __y < __x; }
-
-  ///  Returns !(y < x)
-  template <class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator<=(const multiset<_Key,_Compare,_Alloc>& __x,
-	       const multiset<_Key,_Compare,_Alloc>& __y)
-    { return !(__y < __x); }
-
-  ///  Returns !(x < y)
-  template <class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator>=(const multiset<_Key,_Compare,_Alloc>& __x,
-	       const multiset<_Key,_Compare,_Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::multiset::swap().
-  template <class _Key, class _Compare, class _Alloc>
-    inline void
-    swap(multiset<_Key,_Compare,_Alloc>& __x,
-	 multiset<_Key,_Compare,_Alloc>& __y)
-    { __x.swap(__y); }
-
-} // namespace std
-
-#endif /* _MULTISET_H */
diff --git a/include.new/c++/3.4/bits/stl_numeric.h b/include.new/c++/3.4/bits/stl_numeric.h
deleted file mode 100644
index 58762a4..0000000
--- a/include.new/c++/3.4/bits/stl_numeric.h
+++ /dev/null
@@ -1,326 +0,0 @@
-// Numeric functions implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_numeric.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STL_NUMERIC_H
-#define _STL_NUMERIC_H 1
-
-#include <debug/debug.h>
-
-namespace std
-{
-
-  /**
-   *  @brief  Accumulate values in a range.
-   *
-   *  Accumulates the values in the range [first,last) using operator+().  The
-   *  initial value is @a init.  The values are processed in order.
-   *
-   *  @param  first  Start of range.
-   *  @param  last  End of range.
-   *  @param  init  Starting value to add other values to.
-   *  @return  The final sum.
-   */
-  template<typename _InputIterator, typename _Tp>
-    _Tp
-    accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	__init = __init + *__first;
-      return __init;
-    }
-
-  /**
-   *  @brief  Accumulate values in a range with operation.
-   *
-   *  Accumulates the values in the range [first,last) using the function
-   *  object @a binary_op.  The initial value is @a init.  The values are
-   *  processed in order.
-   *
-   *  @param  first  Start of range.
-   *  @param  last  End of range.
-   *  @param  init  Starting value to add other values to.
-   *  @param  binary_op  Function object to accumulate with.
-   *  @return  The final sum.
-   */
-  template<typename _InputIterator, typename _Tp, typename _BinaryOperation>
-    _Tp
-    accumulate(_InputIterator __first, _InputIterator __last, _Tp __init,
-	       _BinaryOperation __binary_op)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	__init = __binary_op(__init, *__first);
-      return __init;
-    }
-
-  /**
-   *  @brief  Compute inner product of two ranges.
-   *
-   *  Starting with an initial value of @a init, multiplies successive
-   *  elements from the two ranges and adds each product into the accumulated
-   *  value using operator+().  The values in the ranges are processed in
-   *  order.
-   *
-   *  @param  first1  Start of range 1.
-   *  @param  last1  End of range 1.
-   *  @param  first2  Start of range 2.
-   *  @param  init  Starting value to add other values to.
-   *  @return  The final inner product.
-   */
-  template<typename _InputIterator1, typename _InputIterator2, typename _Tp>
-    _Tp
-    inner_product(_InputIterator1 __first1, _InputIterator1 __last1,
-		  _InputIterator2 __first2, _Tp __init)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for ( ; __first1 != __last1; ++__first1, ++__first2)
-	__init = __init + (*__first1 * *__first2);
-      return __init;
-    }
-
-  /**
-   *  @brief  Compute inner product of two ranges.
-   *
-   *  Starting with an initial value of @a init, applies @a binary_op2 to
-   *  successive elements from the two ranges and accumulates each result into
-   *  the accumulated value using @a binary_op1.  The values in the ranges are
-   *  processed in order.
-   *
-   *  @param  first1  Start of range 1.
-   *  @param  last1  End of range 1.
-   *  @param  first2  Start of range 2.
-   *  @param  init  Starting value to add other values to.
-   *  @param  binary_op1  Function object to accumulate with.
-   *  @param  binary_op2  Function object to apply to pairs of input values.
-   *  @return  The final inner product.
-   */
-  template<typename _InputIterator1, typename _InputIterator2, typename _Tp,
-	    typename _BinaryOperation1, typename _BinaryOperation2>
-    _Tp
-    inner_product(_InputIterator1 __first1, _InputIterator1 __last1,
-		  _InputIterator2 __first2, _Tp __init,
-		  _BinaryOperation1 __binary_op1,
-		  _BinaryOperation2 __binary_op2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-
-      for ( ; __first1 != __last1; ++__first1, ++__first2)
-	__init = __binary_op1(__init, __binary_op2(*__first1, *__first2));
-      return __init;
-    }
-
-  /**
-   *  @brief  Return list of partial sums
-   *
-   *  Accumulates the values in the range [first,last) using operator+().
-   *  As each successive input value is added into the total, that partial sum
-   *  is written to @a result.  Therefore, the first value in result is the
-   *  first value of the input, the second value in result is the sum of the
-   *  first and second input values, and so on.
-   *
-   *  @param  first  Start of input range.
-   *  @param  last  End of input range.
-   *  @param  result  Output to write sums to.
-   *  @return  Iterator pointing just beyond the values written to result.
-   */
-  template<typename _InputIterator, typename _OutputIterator>
-    _OutputIterator
-    partial_sum(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last) return __result;
-      *__result = *__first;
-      _ValueType __value = *__first;
-      while (++__first != __last) {
-	__value = __value + *__first;
-	*++__result = __value;
-      }
-      return ++__result;
-    }
-
-  /**
-   *  @brief  Return list of partial sums
-   *
-   *  Accumulates the values in the range [first,last) using operator+().
-   *  As each successive input value is added into the total, that partial sum
-   *  is written to @a result.  Therefore, the first value in result is the
-   *  first value of the input, the second value in result is the sum of the
-   *  first and second input values, and so on.
-   *
-   *  @param  first  Start of input range.
-   *  @param  last  End of input range.
-   *  @param  result  Output to write sums to.
-   *  @return  Iterator pointing just beyond the values written to result.
-   */
-  template<typename _InputIterator, typename _OutputIterator, typename _BinaryOperation>
-    _OutputIterator
-    partial_sum(_InputIterator __first, _InputIterator __last,
-		_OutputIterator __result, _BinaryOperation __binary_op)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last) return __result;
-      *__result = *__first;
-      _ValueType __value = *__first;
-      while (++__first != __last) {
-	__value = __binary_op(__value, *__first);
-	*++__result = __value;
-      }
-      return ++__result;
-    }
-
-  /**
-   *  @brief  Return differences between adjacent values.
-   *
-   *  Computes the difference between adjacent values in the range
-   *  [first,last) using operator-() and writes the result to @a result.
-   *
-   *  @param  first  Start of input range.
-   *  @param  last  End of input range.
-   *  @param  result  Output to write sums to.
-   *  @return  Iterator pointing just beyond the values written to result.
-   */
-  template<typename _InputIterator, typename _OutputIterator>
-    _OutputIterator
-    adjacent_difference(_InputIterator __first,
-			_InputIterator __last, _OutputIterator __result)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last) return __result;
-      *__result = *__first;
-      _ValueType __value = *__first;
-      while (++__first != __last) {
-	_ValueType __tmp = *__first;
-	*++__result = __tmp - __value;
-	__value = __tmp;
-      }
-      return ++__result;
-    }
-
-  /**
-   *  @brief  Return differences between adjacent values.
-   *
-   *  Computes the difference between adjacent values in the range
-   *  [first,last) using the function object @a binary_op and writes the
-   *  result to @a result.
-   *
-   *  @param  first  Start of input range.
-   *  @param  last  End of input range.
-   *  @param  result  Output to write sums to.
-   *  @return  Iterator pointing just beyond the values written to result.
-   */
-  template<typename _InputIterator, typename _OutputIterator, typename _BinaryOperation>
-    _OutputIterator
-    adjacent_difference(_InputIterator __first, _InputIterator __last,
-			_OutputIterator __result, _BinaryOperation __binary_op)
-    {
-      typedef typename iterator_traits<_InputIterator>::value_type _ValueType;
-
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator, _ValueType>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last) return __result;
-      *__result = *__first;
-      _ValueType __value = *__first;
-      while (++__first != __last) {
-	_ValueType __tmp = *__first;
-	*++__result = __binary_op(__tmp, __value);
-	__value = __tmp;
-      }
-      return ++__result;
-    }
-
-} // namespace std
-
-#endif /* _STL_NUMERIC_H */
diff --git a/include.new/c++/3.4/bits/stl_pair.h b/include.new/c++/3.4/bits/stl_pair.h
deleted file mode 100644
index d5146bb..0000000
--- a/include.new/c++/3.4/bits/stl_pair.h
+++ /dev/null
@@ -1,147 +0,0 @@
-// Pair implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_pair.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _PAIR_H
-#define _PAIR_H 1
-
-namespace std
-{
-  /// pair holds two objects of arbitrary type.
-  template<class _T1, class _T2>
-    struct pair
-    {
-      typedef _T1 first_type;    ///<  @c first_type is the first bound type
-      typedef _T2 second_type;   ///<  @c second_type is the second bound type
-
-      _T1 first;                 ///< @c first is a copy of the first object
-      _T2 second;                ///< @c second is a copy of the second object
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 265.  std::pair::pair() effects overly restrictive
-      /** The default constructor creates @c first and @c second using their
-       *  respective default constructors.  */
-      pair()
-      : first(), second() { }
-
-      /** Two objects may be passed to a @c pair constructor to be copied.  */
-      pair(const _T1& __a, const _T2& __b)
-      : first(__a), second(__b) { }
-
-      /** There is also a templated copy ctor for the @c pair class itself.  */
-      template<class _U1, class _U2>
-        pair(const pair<_U1, _U2>& __p)
-	: first(__p.first), second(__p.second) { }
-    };
-
-  /// Two pairs of the same type are equal iff their members are equal.
-  template<class _T1, class _T2>
-    inline bool
-    operator==(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return __x.first == __y.first && __x.second == __y.second; }
-
-  /// <http://gcc.gnu.org/onlinedocs/libstdc++/20_util/howto.html#pairlt>
-  template<class _T1, class _T2>
-    inline bool
-    operator<(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return __x.first < __y.first
-	     || (!(__y.first < __x.first) && __x.second < __y.second); }
-
-  /// Uses @c operator== to find the result.
-  template<class _T1, class _T2>
-    inline bool
-    operator!=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return !(__x == __y); }
-
-  /// Uses @c operator< to find the result.
-  template<class _T1, class _T2>
-    inline bool
-    operator>(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return __y < __x; }
-
-  /// Uses @c operator< to find the result.
-  template<class _T1, class _T2>
-    inline bool
-    operator<=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return !(__y < __x); }
-
-  /// Uses @c operator< to find the result.
-  template<class _T1, class _T2>
-    inline bool
-    operator>=(const pair<_T1, _T2>& __x, const pair<_T1, _T2>& __y)
-    { return !(__x < __y); }
-
-  /**
-   *  @brief A convenience wrapper for creating a pair from two objects.
-   *  @param  x  The first object.
-   *  @param  y  The second object.
-   *  @return   A newly-constructed pair<> object of the appropriate type.
-   *
-   *  The standard requires that the objects be passed by reference-to-const,
-   *  but LWG issue #181 says they should be passed by const value.  We follow
-   *  the LWG by default.
-   */
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 181.  make_pair() unintended behavior
-  template<class _T1, class _T2>
-    inline pair<_T1, _T2>
-    make_pair(_T1 __x, _T2 __y) { return pair<_T1, _T2>(__x, __y); }
-} // namespace std
-
-#endif /* _PAIR_H */
diff --git a/include.new/c++/3.4/bits/stl_queue.h b/include.new/c++/3.4/bits/stl_queue.h
deleted file mode 100644
index 3583547..0000000
--- a/include.new/c++/3.4/bits/stl_queue.h
+++ /dev/null
@@ -1,472 +0,0 @@
-// Queue implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_queue.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _QUEUE_H
-#define _QUEUE_H 1
-
-#include <bits/concept_check.h>
-#include <debug/debug.h>
-
-namespace std
-{
-  // Forward declarations of operators < and ==, needed for friend declaration.
-  template<typename _Tp, typename _Sequence = deque<_Tp> >
-    class queue;
-
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator==(const queue<_Tp,_Seq>&, const queue<_Tp,_Seq>&);
-
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator<(const queue<_Tp,_Seq>&, const queue<_Tp,_Seq>&);
-
-  /**
-   *  @brief  A standard container giving FIFO behavior.
-   *
-   *  @ingroup Containers
-   *  @ingroup Sequences
-   *
-   *  Meets many of the requirements of a
-   *  <a href="tables.html#65">container</a>,
-   *  but does not define anything to do with iterators.  Very few of the
-   *  other standard container interfaces are defined.
-   *
-   *  This is not a true container, but an @e adaptor.  It holds another
-   *  container, and provides a wrapper interface to that container.  The
-   *  wrapper is what enforces strict first-in-first-out %queue behavior.
-   *
-   *  The second template parameter defines the type of the underlying
-   *  sequence/container.  It defaults to std::deque, but it can be any type
-   *  that supports @c front, @c back, @c push_back, and @c pop_front,
-   *  such as std::list or an appropriate user-defined type.
-   *
-   *  Members not found in "normal" containers are @c container_type,
-   *  which is a typedef for the second Sequence parameter, and @c push and
-   *  @c pop, which are standard %queue/FIFO operations.
-  */
-  template<typename _Tp, typename _Sequence>
-    class queue
-    {
-      // concept requirements
-      typedef typename _Sequence::value_type _Sequence_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires(_Sequence, _FrontInsertionSequenceConcept)
-      __glibcxx_class_requires(_Sequence, _BackInsertionSequenceConcept)
-      __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
-
-      template<typename _Tp1, typename _Seq1>
-        friend bool
-        operator==(const queue<_Tp1, _Seq1>&, const queue<_Tp1, _Seq1>&);
-
-      template<typename _Tp1, typename _Seq1>
-        friend bool
-        operator<(const queue<_Tp1, _Seq1>&, const queue<_Tp1, _Seq1>&);
-
-    public:
-      typedef typename _Sequence::value_type                value_type;
-      typedef typename _Sequence::reference                 reference;
-      typedef typename _Sequence::const_reference           const_reference;
-      typedef typename _Sequence::size_type                 size_type;
-      typedef          _Sequence                            container_type;
-
-    protected:
-      /**
-       *  'c' is the underlying container.  Maintainers wondering why
-       *  this isn't uglified as per style guidelines should note that
-       *  this name is specified in the standard, [23.2.3.1].  (Why?
-       *  Presumably for the same reason that it's protected instead
-       *  of private: to allow derivation.  But none of the other
-       *  containers allow for derivation.  Odd.)
-       */
-      _Sequence c;
-
-    public:
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      explicit
-      queue(const _Sequence& __c = _Sequence()) : c(__c) {}
-
-      /**
-       *  Returns true if the %queue is empty.
-       */
-      bool
-      empty() const
-      { return c.empty(); }
-
-      /**  Returns the number of elements in the %queue.  */
-      size_type
-      size() const
-      { return c.size(); }
-
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %queue.
-       */
-      reference
-      front()
-      {
-	__glibcxx_requires_nonempty();
-	return c.front();
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %queue.
-       */
-      const_reference
-      front() const
-      {
-	__glibcxx_requires_nonempty();
-	return c.front();
-      }
-
-      /**
-       *  Returns a read/write reference to the data at the last
-       *  element of the %queue.
-       */
-      reference
-      back()
-      {
-	__glibcxx_requires_nonempty();
-	return c.back();
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the last
-       *  element of the %queue.
-       */
-      const_reference
-      back() const
-      {
-	__glibcxx_requires_nonempty();
-	return c.back();
-      }
-
-      /**
-       *  @brief  Add data to the end of the %queue.
-       *  @param  x  Data to be added.
-       *
-       *  This is a typical %queue operation.  The function creates an
-       *  element at the end of the %queue and assigns the given data
-       *  to it.  The time complexity of the operation depends on the
-       *  underlying sequence.
-       */
-      void
-      push(const value_type& __x)
-      { c.push_back(__x); }
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical %queue operation.  It shrinks the %queue by one.
-       *  The time complexity of the operation depends on the underlying
-       *  sequence.
-       *
-       *  Note that no data is returned, and if the first element's
-       *  data is needed, it should be retrieved before pop() is
-       *  called.
-       */
-      void
-      pop()
-      {
-	__glibcxx_requires_nonempty();
-	c.pop_front();
-      }
-    };
-
-
-  /**
-   *  @brief  Queue equality comparison.
-   *  @param  x  A %queue.
-   *  @param  y  A %queue of the same type as @a x.
-   *  @return  True iff the size and elements of the queues are equal.
-   *
-   *  This is an equivalence relation.  Complexity and semantics depend on the
-   *  underlying sequence type, but the expected rules are:  this relation is
-   *  linear in the size of the sequences, and queues are considered equivalent
-   *  if their sequences compare equal.
-  */
-  template<typename _Tp, typename _Sequence>
-    inline bool
-    operator==(const queue<_Tp,_Sequence>& __x,
-	       const queue<_Tp,_Sequence>& __y)
-    { return __x.c == __y.c; }
-
-  /**
-   *  @brief  Queue ordering relation.
-   *  @param  x  A %queue.
-   *  @param  y  A %queue of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is an total ordering relation.  Complexity and semantics
-   *  depend on the underlying sequence type, but the expected rules
-   *  are: this relation is linear in the size of the sequences, the
-   *  elements must be comparable with @c <, and
-   *  std::lexicographical_compare() is usually used to make the
-   *  determination.
-  */
-  template<typename _Tp, typename _Sequence>
-    inline bool
-    operator<(const queue<_Tp,_Sequence>& __x, const queue<_Tp,_Sequence>& __y)
-    { return __x.c < __y.c; }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Sequence>
-    inline bool
-    operator!=(const queue<_Tp,_Sequence>& __x,
-	       const queue<_Tp,_Sequence>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Sequence>
-    inline bool
-    operator>(const queue<_Tp,_Sequence>& __x, const queue<_Tp,_Sequence>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Sequence>
-    inline bool
-    operator<=(const queue<_Tp,_Sequence>& __x,
-	       const queue<_Tp,_Sequence>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Sequence>
-    inline bool
-    operator>=(const queue<_Tp,_Sequence>& __x,
-	       const queue<_Tp,_Sequence>& __y)
-    { return !(__x < __y); }
-
-  /**
-   *  @brief  A standard container automatically sorting its contents.
-   *
-   *  @ingroup Containers
-   *  @ingroup Sequences
-   *
-   *  This is not a true container, but an @e adaptor.  It holds
-   *  another container, and provides a wrapper interface to that
-   *  container.  The wrapper is what enforces sorting and
-   *  first-in-first-out %queue behavior.  Very few of the standard
-   *  container/sequence interface requirements are met (e.g.,
-   *  iterators).
-   *
-   *  The second template parameter defines the type of the underlying
-   *  sequence/container.  It defaults to std::vector, but it can be
-   *  any type that supports @c front(), @c push_back, @c pop_back,
-   *  and random-access iterators, such as std::deque or an
-   *  appropriate user-defined type.
-   *
-   *  The third template parameter supplies the means of making
-   *  priority comparisons.  It defaults to @c less<value_type> but
-   *  can be anything defining a strict weak ordering.
-   *
-   *  Members not found in "normal" containers are @c container_type,
-   *  which is a typedef for the second Sequence parameter, and @c
-   *  push, @c pop, and @c top, which are standard %queue/FIFO
-   *  operations.
-   *
-   *  @note No equality/comparison operators are provided for
-   *  %priority_queue.
-   *
-   *  @note Sorting of the elements takes place as they are added to,
-   *  and removed from, the %priority_queue using the
-   *  %priority_queue's member functions.  If you access the elements
-   *  by other means, and change their data such that the sorting
-   *  order would be different, the %priority_queue will not re-sort
-   *  the elements for you.  (How could it know to do so?)
-  */
-  template<typename _Tp, typename _Sequence = vector<_Tp>,
-	   typename _Compare  = less<typename _Sequence::value_type> >
-    class priority_queue
-    {
-      // concept requirements
-      typedef typename _Sequence::value_type _Sequence_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires(_Sequence, _SequenceConcept)
-      __glibcxx_class_requires(_Sequence, _RandomAccessContainerConcept)
-      __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Tp,_Tp,_BinaryFunctionConcept)
-
-    public:
-      typedef typename _Sequence::value_type                value_type;
-      typedef typename _Sequence::reference                 reference;
-      typedef typename _Sequence::const_reference           const_reference;
-      typedef typename _Sequence::size_type                 size_type;
-      typedef          _Sequence                            container_type;
-
-    protected:
-      //  See queue::c for notes on these names.
-      _Sequence  c;
-      _Compare   comp;
-
-    public:
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      explicit
-      priority_queue(const _Compare& __x = _Compare(),
-		     const _Sequence& __s = _Sequence())
-      : c(__s), comp(__x)
-      { std::make_heap(c.begin(), c.end(), comp); }
-
-      /**
-       *  @brief  Builds a %queue from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *  @param  x  A comparison functor describing a strict weak ordering.
-       *  @param  s  An initial sequence with which to start.
-       *
-       *  Begins by copying @a s, inserting a copy of the elements
-       *  from @a [first,last) into the copy of @a s, then ordering
-       *  the copy according to @a x.
-       *
-       *  For more information on function objects, see the
-       *  documentation on @link s20_3_1_base functor base
-       *  classes@endlink.
-       */
-      template<typename _InputIterator>
-        priority_queue(_InputIterator __first, _InputIterator __last,
-		       const _Compare& __x = _Compare(),
-		       const _Sequence& __s = _Sequence())
-	: c(__s), comp(__x)
-        {
-	  __glibcxx_requires_valid_range(__first, __last);
-	  c.insert(c.end(), __first, __last);
-	  std::make_heap(c.begin(), c.end(), comp);
-	}
-
-      /**
-       *  Returns true if the %queue is empty.
-       */
-      bool
-      empty() const { return c.empty(); }
-
-      /**  Returns the number of elements in the %queue.  */
-      size_type
-      size() const { return c.size(); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %queue.
-       */
-      const_reference
-      top() const
-      {
-	__glibcxx_requires_nonempty();
-	return c.front();
-      }
-
-      /**
-       *  @brief  Add data to the %queue.
-       *  @param  x  Data to be added.
-       *
-       *  This is a typical %queue operation.
-       *  The time complexity of the operation depends on the underlying
-       *  sequence.
-       */
-      void
-      push(const value_type& __x)
-      {
-	try
-        {
-          c.push_back(__x);
-          std::push_heap(c.begin(), c.end(), comp);
-        }
-	catch(...)
-        {
-          c.clear();
-          __throw_exception_again;
-        }
-      }
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical %queue operation.  It shrinks the %queue
-       *  by one.  The time complexity of the operation depends on the
-       *  underlying sequence.
-       *
-       *  Note that no data is returned, and if the first element's
-       *  data is needed, it should be retrieved before pop() is
-       *  called.
-       */
-      void
-      pop()
-      {
-	__glibcxx_requires_nonempty();
-	try
-        {
-          std::pop_heap(c.begin(), c.end(), comp);
-          c.pop_back();
-        }
-	catch(...)
-        {
-          c.clear();
-          __throw_exception_again;
-        }
-      }
-    };
-
-  // No equality/comparison operators are provided for priority_queue.
-} // namespace std
-
-#endif /* _QUEUE_H */
diff --git a/include.new/c++/3.4/bits/stl_raw_storage_iter.h b/include.new/c++/3.4/bits/stl_raw_storage_iter.h
deleted file mode 100644
index 732142e..0000000
--- a/include.new/c++/3.4/bits/stl_raw_storage_iter.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// -*- C++ -*-
-
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_raw_storage_iter.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STL_RAW_STORAGE_ITERATOR_H
-#define _STL_RAW_STORAGE_ITERATOR_H 1
-
-namespace std
-{
-  /**
-   *  This iterator class lets algorithms store their results into
-   *  uninitialized memory.
-  */
-  template <class _ForwardIterator, class _Tp>
-    class raw_storage_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    protected:
-      _ForwardIterator _M_iter;
-
-    public:
-      explicit
-      raw_storage_iterator(_ForwardIterator __x)
-      : _M_iter(__x) {}
-
-      raw_storage_iterator&
-      operator*() { return *this; }
-
-      raw_storage_iterator&
-      operator=(const _Tp& __element)
-      {
-	std::_Construct(&*_M_iter, __element);
-	return *this;
-      }
-
-      raw_storage_iterator<_ForwardIterator, _Tp>&
-      operator++()
-      {
-	++_M_iter;
-	return *this;
-      }
-
-      raw_storage_iterator<_ForwardIterator, _Tp>
-      operator++(int)
-      {
-	raw_storage_iterator<_ForwardIterator, _Tp> __tmp = *this;
-	++_M_iter;
-	return __tmp;
-      }
-    };
-} // namespace std
-
-#endif
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/bits/stl_relops.h b/include.new/c++/3.4/bits/stl_relops.h
deleted file mode 100644
index 3e9f060..0000000
--- a/include.new/c++/3.4/bits/stl_relops.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// std::rel_ops implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file stl_relops.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- *
- *  @if maint
- *  Inclusion of this file has been removed from
- *  all of the other STL headers for safety reasons, except std_utility.h.
- *  For more information, see the thread of about twenty messages starting
- *  with http://gcc.gnu.org/ml/libstdc++/2001-01/msg00223.html , or the
- *  FAQ at http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#4_4 .
- *
- *  Short summary:  the rel_ops operators should be avoided for the present.
- *  @endif
- */
-
-#ifndef _STL_RELOPS_H
-#define _STL_RELOPS_H 1
-
-namespace std
-{
-  namespace rel_ops
-  {
-    /** @namespace std::rel_ops
-     *  @brief  The generated relational operators are sequestered here.
-     */
-
-    /**
-     *  @brief Defines @c != for arbitrary types, in terms of @c ==.
-     *  @param  x  A thing.
-     *  @param  y  Another thing.
-     *  @return   x != y
-     *
-     *  This function uses @c == to determine its result.
-     */
-    template <class _Tp>
-      inline bool
-      operator!=(const _Tp& __x, const _Tp& __y)
-      { return !(__x == __y); }
-
-    /**
-     *  @brief Defines @c > for arbitrary types, in terms of @c <.
-     *  @param  x  A thing.
-     *  @param  y  Another thing.
-     *  @return   x > y
-     *
-     *  This function uses @c < to determine its result.
-     */
-    template <class _Tp>
-      inline bool
-      operator>(const _Tp& __x, const _Tp& __y)
-      { return __y < __x; }
-
-    /**
-     *  @brief Defines @c <= for arbitrary types, in terms of @c <.
-     *  @param  x  A thing.
-     *  @param  y  Another thing.
-     *  @return   x <= y
-     *
-     *  This function uses @c < to determine its result.
-     */
-    template <class _Tp>
-      inline bool
-      operator<=(const _Tp& __x, const _Tp& __y)
-      { return !(__y < __x); }
-
-    /**
-     *  @brief Defines @c >= for arbitrary types, in terms of @c <.
-     *  @param  x  A thing.
-     *  @param  y  Another thing.
-     *  @return   x >= y
-     *
-     *  This function uses @c < to determine its result.
-     */
-    template <class _Tp>
-      inline bool
-      operator>=(const _Tp& __x, const _Tp& __y)
-      { return !(__x < __y); }
-
-  } // namespace rel_ops
-} // namespace std
-
-#endif /* _STL_RELOPS_H */
diff --git a/include.new/c++/3.4/bits/stl_set.h b/include.new/c++/3.4/bits/stl_set.h
deleted file mode 100644
index bb28bdd..0000000
--- a/include.new/c++/3.4/bits/stl_set.h
+++ /dev/null
@@ -1,593 +0,0 @@
-// Set implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_set.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _SET_H
-#define _SET_H 1
-
-#include <bits/concept_check.h>
-
-namespace _GLIBCXX_STD
-{
-  // Forward declarations of operators < and ==, needed for friend declaration.
-  template<class _Key, class _Compare = less<_Key>,
-	   class _Alloc = allocator<_Key> >
-    class set;
-
-  template<class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator==(const set<_Key,_Compare,_Alloc>& __x,
-	       const set<_Key,_Compare,_Alloc>& __y);
-
-  template<class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator<(const set<_Key,_Compare,_Alloc>& __x,
-	      const set<_Key,_Compare,_Alloc>& __y);
-
-  /**
-   *  @brief A standard container made up of unique keys, which can be
-   *  retrieved in logarithmic time.
-   *
-   *  @ingroup Containers
-   *  @ingroup Assoc_containers
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and an
-   *  <a href="tables.html#69">associative container</a> (using unique keys).
-   *
-   *  Sets support bidirectional iterators.
-   *
-   *  @param  Key  Type of key objects.
-   *  @param  Compare  Comparison function object type, defaults to less<Key>.
-   *  @param  Alloc  Allocator type, defaults to allocator<Key>.
-   *
-   *  @if maint
-   *  The private tree data is declared exactly the same way for set and
-   *  multiset; the distinction is made entirely in how the tree functions are
-   *  called (*_unique versus *_equal, same as the standard).
-   *  @endif
-  */
-  template<class _Key, class _Compare, class _Alloc>
-    class set
-    {
-      // concept requirements
-      __glibcxx_class_requires(_Key, _SGIAssignableConcept)
-      __glibcxx_class_requires4(_Compare, bool, _Key, _Key,
-				_BinaryFunctionConcept)
-
-    public:
-      // typedefs:
-      //@{
-      /// Public typedefs.
-      typedef _Key     key_type;
-      typedef _Key     value_type;
-      typedef _Compare key_compare;
-      typedef _Compare value_compare;
-      //@}
-
-    private:
-      typedef _Rb_tree<key_type, value_type,
-		       _Identity<value_type>, key_compare, _Alloc> _Rep_type;
-      _Rep_type _M_t;  // red-black tree representing set
-    public:
-      //@{
-      ///  Iterator-related typedefs.
-      typedef typename _Alloc::pointer pointer;
-      typedef typename _Alloc::const_pointer const_pointer;
-      typedef typename _Alloc::reference reference;
-      typedef typename _Alloc::const_reference const_reference;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // DR 103. set::iterator is required to be modifiable,
-      // but this allows modification of keys.
-      typedef typename _Rep_type::const_iterator iterator;
-      typedef typename _Rep_type::const_iterator const_iterator;
-      typedef typename _Rep_type::const_reverse_iterator reverse_iterator;
-      typedef typename _Rep_type::const_reverse_iterator const_reverse_iterator;
-      typedef typename _Rep_type::size_type size_type;
-      typedef typename _Rep_type::difference_type difference_type;
-      typedef typename _Rep_type::allocator_type allocator_type;
-      //@}
-
-      // allocation/deallocation
-      ///  Default constructor creates no elements.
-      set()
-      : _M_t(_Compare(), allocator_type()) {}
-
-      /**
-       *  @brief  Default constructor creates no elements.
-       *
-       *  @param  comp  Comparator to use.
-       *  @param  a  Allocator to use.
-       */
-      explicit set(const _Compare& __comp,
-		   const allocator_type& __a = allocator_type())
-      : _M_t(__comp, __a) {}
-
-      /**
-       *  @brief  Builds a %set from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *
-       *  Create a %set consisting of copies of the elements from [first,last).
-       *  This is linear in N if the range is already sorted, and NlogN
-       *  otherwise (where N is distance(first,last)).
-       */
-      template<class _InputIterator>
-        set(_InputIterator __first, _InputIterator __last)
-        : _M_t(_Compare(), allocator_type())
-        { _M_t.insert_unique(__first, __last); }
-
-      /**
-       *  @brief  Builds a %set from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *  @param  comp  A comparison functor.
-       *  @param  a  An allocator object.
-       *
-       *  Create a %set consisting of copies of the elements from [first,last).
-       *  This is linear in N if the range is already sorted, and NlogN
-       *  otherwise (where N is distance(first,last)).
-       */
-      template<class _InputIterator>
-        set(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp,
-	    const allocator_type& __a = allocator_type())
-	: _M_t(__comp, __a)
-        { _M_t.insert_unique(__first, __last); }
-
-      /**
-       *  @brief  Set copy constructor.
-       *  @param  x  A %set of identical element and allocator types.
-       *
-       *  The newly-created %set uses a copy of the allocation object used
-       *  by @a x.
-       */
-      set(const set<_Key,_Compare,_Alloc>& __x)
-      : _M_t(__x._M_t) { }
-
-      /**
-       *  @brief  Set assignment operator.
-       *  @param  x  A %set of identical element and allocator types.
-       *
-       *  All the elements of @a x are copied, but unlike the copy constructor,
-       *  the allocator object is not copied.
-       */
-      set<_Key,_Compare,_Alloc>&
-      operator=(const set<_Key, _Compare, _Alloc>& __x)
-      {
-	_M_t = __x._M_t;
-	return *this;
-      }
-
-      // accessors:
-
-      ///  Returns the comparison object with which the %set was constructed.
-      key_compare
-      key_comp() const
-      { return _M_t.key_comp(); }
-      ///  Returns the comparison object with which the %set was constructed.
-      value_compare
-      value_comp() const
-      { return _M_t.key_comp(); }
-      ///  Returns the allocator object with which the %set was constructed.
-      allocator_type
-      get_allocator() const
-      { return _M_t.get_allocator(); }
-
-      /**
-       *  Returns a read/write iterator that points to the first element in the
-       *  %set.  Iteration is done in ascending order according to the keys.
-       */
-      iterator
-      begin() const
-      { return _M_t.begin(); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last element in
-       *  the %set.  Iteration is done in ascending order according to the keys.
-       */
-      iterator
-      end() const
-      { return _M_t.end(); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the last element
-       *  in the %set.  Iteration is done in descending order according to the
-       *  keys.
-       */
-      reverse_iterator
-      rbegin() const
-      { return _M_t.rbegin(); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points to the
-       *  last pair in the %map.  Iteration is done in descending order
-       *  according to the keys.
-       */
-      reverse_iterator
-      rend() const
-      { return _M_t.rend(); }
-
-      ///  Returns true if the %set is empty.
-      bool
-      empty() const
-      { return _M_t.empty(); }
-
-      ///  Returns the size of the %set.
-      size_type
-      size() const
-      { return _M_t.size(); }
-
-      ///  Returns the maximum size of the %set.
-      size_type
-      max_size() const
-      { return _M_t.max_size(); }
-
-      /**
-       *  @brief  Swaps data with another %set.
-       *  @param  x  A %set of the same element and allocator types.
-       *
-       *  This exchanges the elements between two sets in constant time.
-       *  (It is only swapping a pointer, an integer, and an instance of
-       *  the @c Compare type (which itself is often stateless and empty), so it
-       *  should be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(s1,s2) will feed to this function.
-       */
-      void
-      swap(set<_Key,_Compare,_Alloc>& __x)
-      { _M_t.swap(__x._M_t); }
-
-      // insert/erase
-      /**
-       *  @brief Attempts to insert an element into the %set.
-       *  @param  x  Element to be inserted.
-       *  @return  A pair, of which the first element is an iterator that points
-       *           to the possibly inserted element, and the second is a bool
-       *           that is true if the element was actually inserted.
-       *
-       *  This function attempts to insert an element into the %set.  A %set
-       *  relies on unique keys and thus an element is only inserted if it is
-       *  not already present in the %set.
-       *
-       *  Insertion requires logarithmic time.
-       */
-      pair<iterator,bool>
-      insert(const value_type& __x)
-      {
-	pair<typename _Rep_type::iterator, bool> __p = _M_t.insert_unique(__x);
-	return pair<iterator, bool>(__p.first, __p.second);
-      }
-
-      /**
-       *  @brief Attempts to insert an element into the %set.
-       *  @param  position  An iterator that serves as a hint as to where the
-       *                    element should be inserted.
-       *  @param  x  Element to be inserted.
-       *  @return  An iterator that points to the element with key of @a x (may
-       *           or may not be the element passed in).
-       *
-       *  This function is not concerned about whether the insertion took place,
-       *  and thus does not return a boolean like the single-argument insert()
-       *  does.  Note that the first parameter is only a hint and can
-       *  potentially improve the performance of the insertion process.  A bad
-       *  hint would cause no gains in efficiency.
-       *
-       *  See http://gcc.gnu.org/onlinedocs/libstdc++/23_containers/howto.html#4
-       *  for more on "hinting".
-       *
-       *  Insertion requires logarithmic time (if the hint is not taken).
-       */
-      iterator
-      insert(iterator __position, const value_type& __x)
-      {
-	typedef typename _Rep_type::iterator _Rep_iterator;
-	return _M_t.insert_unique((_Rep_iterator&)__position, __x);
-      }
-
-      /**
-       *  @brief A template function that attemps to insert a range of elements.
-       *  @param  first  Iterator pointing to the start of the range to be
-       *                 inserted.
-       *  @param  last  Iterator pointing to the end of the range.
-       *
-       *  Complexity similar to that of the range constructor.
-       */
-      template<class _InputIterator>
-      void
-      insert(_InputIterator __first, _InputIterator __last)
-      { _M_t.insert_unique(__first, __last); }
-
-      /**
-       *  @brief Erases an element from a %set.
-       *  @param  position  An iterator pointing to the element to be erased.
-       *
-       *  This function erases an element, pointed to by the given iterator,
-       *  from a %set.  Note that this function only erases the element, and
-       *  that if the element is itself a pointer, the pointed-to memory is not
-       *  touched in any way.  Managing the pointer is the user's responsibilty.
-       */
-      void
-      erase(iterator __position)
-      {
-	typedef typename _Rep_type::iterator _Rep_iterator;
-	_M_t.erase((_Rep_iterator&)__position);
-      }
-
-      /**
-       *  @brief Erases elements according to the provided key.
-       *  @param  x  Key of element to be erased.
-       *  @return  The number of elements erased.
-       *
-       *  This function erases all the elements located by the given key from
-       *  a %set.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibilty.
-       */
-      size_type
-      erase(const key_type& __x) { return _M_t.erase(__x); }
-
-      /**
-       *  @brief Erases a [first,last) range of elements from a %set.
-       *  @param  first  Iterator pointing to the start of the range to be
-       *                 erased.
-       *  @param  last  Iterator pointing to the end of the range to be erased.
-       *
-       *  This function erases a sequence of elements from a %set.
-       *  Note that this function only erases the element, and that if
-       *  the element is itself a pointer, the pointed-to memory is not touched
-       *  in any way.  Managing the pointer is the user's responsibilty.
-       */
-      void
-      erase(iterator __first, iterator __last)
-      {
-	typedef typename _Rep_type::iterator _Rep_iterator;
-	_M_t.erase((_Rep_iterator&)__first, (_Rep_iterator&)__last);
-      }
-
-      /**
-       *  Erases all elements in a %set.  Note that this function only erases
-       *  the elements, and that if the elements themselves are pointers, the
-       *  pointed-to memory is not touched in any way.  Managing the pointer is
-       *  the user's responsibilty.
-       */
-      void
-      clear()
-      { _M_t.clear(); }
-
-      // set operations:
-
-      /**
-       *  @brief  Finds the number of elements.
-       *  @param  x  Element to located.
-       *  @return  Number of elements with specified key.
-       *
-       *  This function only makes sense for multisets; for set the result will
-       *  either be 0 (not present) or 1 (present).
-       */
-      size_type
-      count(const key_type& __x) const
-      { return _M_t.find(__x) == _M_t.end() ? 0 : 1; }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214.  set::find() missing const overload
-      //@{
-      /**
-       *  @brief Tries to locate an element in a %set.
-       *  @param  x  Element to be located.
-       *  @return  Iterator pointing to sought-after element, or end() if not
-       *           found.
-       *
-       *  This function takes a key and tries to locate the element with which
-       *  the key matches.  If successful the function returns an iterator
-       *  pointing to the sought after element.  If unsuccessful it returns the
-       *  past-the-end ( @c end() ) iterator.
-       */
-      iterator
-      find(const key_type& __x)
-      { return _M_t.find(__x); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return _M_t.find(__x); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the beginning of a subsequence matching given key.
-       *  @param  x  Key to be located.
-       *  @return  Iterator pointing to first element equal to or greater
-       *           than key, or end().
-       *
-       *  This function returns the first element of a subsequence of elements
-       *  that matches the given key.  If unsuccessful it returns an iterator
-       *  pointing to the first element that has a greater value than given key
-       *  or end() if no such element exists.
-       */
-      iterator
-      lower_bound(const key_type& __x)
-      { return _M_t.lower_bound(__x); }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return _M_t.lower_bound(__x); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds the end of a subsequence matching given key.
-       *  @param  x  Key to be located.
-       *  @return Iterator pointing to the first element
-       *          greater than key, or end().
-       */
-      iterator
-      upper_bound(const key_type& __x)
-      { return _M_t.upper_bound(__x); }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return _M_t.upper_bound(__x); }
-      //@}
-
-      //@{
-      /**
-       *  @brief Finds a subsequence matching given key.
-       *  @param  x  Key to be located.
-       *  @return  Pair of iterators that possibly points to the subsequence
-       *           matching given key.
-       *
-       *  This function is equivalent to
-       *  @code
-       *    std::make_pair(c.lower_bound(val),
-       *                   c.upper_bound(val))
-       *  @endcode
-       *  (but is faster than making the calls separately).
-       *
-       *  This function probably only makes sense for multisets.
-       */
-      pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      { return _M_t.equal_range(__x); }
-
-      pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      { return _M_t.equal_range(__x); }
-      //@}
-
-      template<class _K1, class _C1, class _A1>
-        friend bool
-        operator== (const set<_K1,_C1,_A1>&, const set<_K1,_C1,_A1>&);
-
-      template<class _K1, class _C1, class _A1>
-        friend bool
-        operator< (const set<_K1,_C1,_A1>&, const set<_K1,_C1,_A1>&);
-    };
-
-
-  /**
-   *  @brief  Set equality comparison.
-   *  @param  x  A %set.
-   *  @param  y  A %set of the same type as @a x.
-   *  @return  True iff the size and elements of the sets are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the sets.
-   *  Sets are considered equivalent if their sizes are equal, and if
-   *  corresponding elements compare equal.
-  */
-  template<class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator==(const set<_Key,_Compare,_Alloc>& __x,
-	       const set<_Key,_Compare,_Alloc>& __y)
-    { return __x._M_t == __y._M_t; }
-
-  /**
-   *  @brief  Set ordering relation.
-   *  @param  x  A %set.
-   *  @param  y  A %set of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  maps.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator<(const set<_Key,_Compare,_Alloc>& __x,
-	      const set<_Key,_Compare,_Alloc>& __y)
-    { return __x._M_t < __y._M_t; }
-
-  ///  Returns !(x == y).
-  template<class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator!=(const set<_Key,_Compare,_Alloc>& __x,
-	       const set<_Key,_Compare,_Alloc>& __y)
-    { return !(__x == __y); }
-
-  ///  Returns y < x.
-  template<class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator>(const set<_Key,_Compare,_Alloc>& __x,
-	      const set<_Key,_Compare,_Alloc>& __y)
-    { return __y < __x; }
-
-  ///  Returns !(y < x)
-  template<class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator<=(const set<_Key,_Compare,_Alloc>& __x,
-	       const set<_Key,_Compare,_Alloc>& __y)
-    { return !(__y < __x); }
-
-  ///  Returns !(x < y)
-  template<class _Key, class _Compare, class _Alloc>
-    inline bool
-    operator>=(const set<_Key,_Compare,_Alloc>& __x,
-	       const set<_Key,_Compare,_Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::set::swap().
-  template<class _Key, class _Compare, class _Alloc>
-    inline void
-    swap(set<_Key,_Compare,_Alloc>& __x, set<_Key,_Compare,_Alloc>& __y)
-    { __x.swap(__y); }
-
-} // namespace std
-
-#endif /* _SET_H */
diff --git a/include.new/c++/3.4/bits/stl_stack.h b/include.new/c++/3.4/bits/stl_stack.h
deleted file mode 100644
index ada50ee..0000000
--- a/include.new/c++/3.4/bits/stl_stack.h
+++ /dev/null
@@ -1,272 +0,0 @@
-// Stack implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_stack.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STACK_H
-#define _STACK_H 1
-
-#include <bits/concept_check.h>
-#include <debug/debug.h>
-
-namespace std
-{
-  // Forward declarations of operators == and <, needed for friend
-  // declaration.
-  template<typename _Tp, typename _Sequence = deque<_Tp> >
-    class stack;
-
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator==(const stack<_Tp,_Seq>& __x, const stack<_Tp,_Seq>& __y);
-
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator<(const stack<_Tp,_Seq>& __x, const stack<_Tp,_Seq>& __y);
-
-  /**
-   *  @brief  A standard container giving FILO behavior.
-   *
-   *  @ingroup Containers
-   *  @ingroup Sequences
-   *
-   *  Meets many of the requirements of a
-   *  <a href="tables.html#65">container</a>,
-   *  but does not define anything to do with iterators.  Very few of the
-   *  other standard container interfaces are defined.
-   *
-   *  This is not a true container, but an @e adaptor.  It holds
-   *  another container, and provides a wrapper interface to that
-   *  container.  The wrapper is what enforces strict
-   *  first-in-last-out %stack behavior.
-   *
-   *  The second template parameter defines the type of the underlying
-   *  sequence/container.  It defaults to std::deque, but it can be
-   *  any type that supports @c back, @c push_back, and @c pop_front,
-   *  such as std::list, std::vector, or an appropriate user-defined
-   *  type.
-   *
-   *  Members not found in "normal" containers are @c container_type,
-   *  which is a typedef for the second Sequence parameter, and @c
-   *  push, @c pop, and @c top, which are standard %stack/FILO
-   *  operations.
-  */
-  template<typename _Tp, typename _Sequence>
-    class stack
-    {
-      // concept requirements
-      typedef typename _Sequence::value_type _Sequence_value_type;
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-      __glibcxx_class_requires(_Sequence, _BackInsertionSequenceConcept)
-      __glibcxx_class_requires2(_Tp, _Sequence_value_type, _SameTypeConcept)
-
-      template<typename _Tp1, typename _Seq1>
-        friend bool
-        operator==(const stack<_Tp1, _Seq1>&, const stack<_Tp1, _Seq1>&);
-
-      template<typename _Tp1, typename _Seq1>
-        friend bool
-        operator<(const stack<_Tp1, _Seq1>&, const stack<_Tp1, _Seq1>&);
-
-    public:
-      typedef typename _Sequence::value_type                value_type;
-      typedef typename _Sequence::reference                 reference;
-      typedef typename _Sequence::const_reference           const_reference;
-      typedef typename _Sequence::size_type                 size_type;
-      typedef          _Sequence                            container_type;
-
-    protected:
-      //  See queue::c for notes on this name.
-      _Sequence c;
-
-    public:
-      // XXX removed old def ctor, added def arg to this one to match 14882
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      explicit
-      stack(const _Sequence& __c = _Sequence())
-      : c(__c) {}
-
-      /**
-       *  Returns true if the %stack is empty.
-       */
-      bool
-      empty() const
-      { return c.empty(); }
-
-      /**  Returns the number of elements in the %stack.  */
-      size_type
-      size() const
-      { return c.size(); }
-
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %stack.
-       */
-      reference
-      top()
-      {
-	__glibcxx_requires_nonempty();
-	return c.back();
-      }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %stack.
-       */
-      const_reference
-      top() const
-      {
-	__glibcxx_requires_nonempty();
-	return c.back();
-      }
-
-      /**
-       *  @brief  Add data to the top of the %stack.
-       *  @param  x  Data to be added.
-       *
-       *  This is a typical %stack operation.  The function creates an
-       *  element at the top of the %stack and assigns the given data
-       *  to it.  The time complexity of the operation depends on the
-       *  underlying sequence.
-       */
-      void
-      push(const value_type& __x)
-      { c.push_back(__x); }
-
-      /**
-       *  @brief  Removes first element.
-       *
-       *  This is a typical %stack operation.  It shrinks the %stack
-       *  by one.  The time complexity of the operation depends on the
-       *  underlying sequence.
-       *
-       *  Note that no data is returned, and if the first element's
-       *  data is needed, it should be retrieved before pop() is
-       *  called.
-       */
-      void
-      pop()
-      {
-	__glibcxx_requires_nonempty();
-	c.pop_back();
-      }
-    };
-
-  /**
-   *  @brief  Stack equality comparison.
-   *  @param  x  A %stack.
-   *  @param  y  A %stack of the same type as @a x.
-   *  @return  True iff the size and elements of the stacks are equal.
-   *
-   *  This is an equivalence relation.  Complexity and semantics
-   *  depend on the underlying sequence type, but the expected rules
-   *  are: this relation is linear in the size of the sequences, and
-   *  stacks are considered equivalent if their sequences compare
-   *  equal.
-  */
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator==(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return __x.c == __y.c; }
-
-  /**
-   *  @brief  Stack ordering relation.
-   *  @param  x  A %stack.
-   *  @param  y  A %stack of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is an total ordering relation.  Complexity and semantics
-   *  depend on the underlying sequence type, but the expected rules
-   *  are: this relation is linear in the size of the sequences, the
-   *  elements must be comparable with @c <, and
-   *  std::lexicographical_compare() is usually used to make the
-   *  determination.
-  */
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator<(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return __x.c < __y.c; }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator!=(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator>(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator<=(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Seq>
-    inline bool
-    operator>=(const stack<_Tp, _Seq>& __x, const stack<_Tp, _Seq>& __y)
-    { return !(__x < __y); }
-} // namespace std
-
-#endif /* _STACK_H */
diff --git a/include.new/c++/3.4/bits/stl_tempbuf.h b/include.new/c++/3.4/bits/stl_tempbuf.h
deleted file mode 100644
index 399cffb..0000000
--- a/include.new/c++/3.4/bits/stl_tempbuf.h
+++ /dev/null
@@ -1,171 +0,0 @@
-// Temporary buffer implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_tempbuf.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _TEMPBUF_H
-#define _TEMPBUF_H 1
-
-#include <memory>
-
-namespace std
-{
-  /**
-   *  @if maint
-   *  This class is used in two places: stl_algo.h and ext/memory,
-   *  where it is wrapped as the temporary_buffer class.  See
-   *  temporary_buffer docs for more notes.
-   *  @endif
-   */
-  template<typename _ForwardIterator, typename _Tp>
-    class _Temporary_buffer
-    {
-      // concept requirements
-      __glibcxx_class_requires(_ForwardIterator, _ForwardIteratorConcept)
-
-	public:
-      typedef _Tp         value_type;
-      typedef value_type* pointer;
-      typedef pointer     iterator;
-      typedef ptrdiff_t   size_type;
-
-    protected:
-      size_type  _M_original_len;
-      size_type  _M_len;
-      pointer    _M_buffer;
-
-      void
-      _M_initialize_buffer(const _Tp&, __true_type) { }
-
-      void
-      _M_initialize_buffer(const _Tp& val, __false_type)
-      { std::uninitialized_fill_n(_M_buffer, _M_len, val); }
-
-    public:
-      /// As per Table mumble.
-      size_type
-      size() const
-      { return _M_len; }
-
-      /// Returns the size requested by the constructor; may be >size().
-      size_type
-      requested_size() const
-      { return _M_original_len; }
-
-      /// As per Table mumble.
-      iterator
-      begin()
-      { return _M_buffer; }
-
-      /// As per Table mumble.
-      iterator
-      end()
-      { return _M_buffer + _M_len; }
-
-      /**
-       * Constructs a temporary buffer of a size somewhere between
-       * zero and the size of the given range.
-       */
-      _Temporary_buffer(_ForwardIterator __first, _ForwardIterator __last);
-
-      ~_Temporary_buffer()
-      {
-	std::_Destroy(_M_buffer, _M_buffer + _M_len);
-	std::return_temporary_buffer(_M_buffer);
-      }
-
-    private:
-      // Disable copy constructor and assignment operator.
-      _Temporary_buffer(const _Temporary_buffer&);
-
-      void
-      operator=(const _Temporary_buffer&);
-    };
-
-
-  template<typename _ForwardIterator, typename _Tp>
-    _Temporary_buffer<_ForwardIterator, _Tp>::
-    _Temporary_buffer(_ForwardIterator __first, _ForwardIterator __last)
-    : _M_original_len(std::distance(__first, __last)),
-      _M_len(0), _M_buffer(0)
-    {
-      // Workaround for a __type_traits bug in the pre-7.3 compiler.
-      typedef typename __type_traits<_Tp>::has_trivial_default_constructor
-	      _Trivial;
-
-      try
-	{
-	  pair<pointer, size_type> __p(get_temporary_buffer<
-				       value_type>(_M_original_len));
-	  _M_buffer = __p.first;
-	  _M_len = __p.second;
-	  if (_M_len > 0)
-	    _M_initialize_buffer(*__first, _Trivial());
-	}
-      catch(...)
-	{
-	  std::return_temporary_buffer(_M_buffer);
-	  _M_buffer = 0;
-	  _M_len = 0;
-	  __throw_exception_again;
-	}
-    }
-} // namespace std
-
-#endif /* _TEMPBUF_H */
-
diff --git a/include.new/c++/3.4/bits/stl_threads.h b/include.new/c++/3.4/bits/stl_threads.h
deleted file mode 100644
index 04baf0a..0000000
--- a/include.new/c++/3.4/bits/stl_threads.h
+++ /dev/null
@@ -1,150 +0,0 @@
-// Threading support -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1997-1999
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_threads.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STL_THREADS_H
-#define _STL_THREADS_H 1
-
-#include <cstddef>
-
-// The only supported threading model is GCC's own gthr.h abstraction
-// layer.
-#include "bits/gthr.h"
-
-namespace __gnu_internal
-{
-#if !defined(__GTHREAD_MUTEX_INIT) && defined(__GTHREAD_MUTEX_INIT_FUNCTION)
-  extern __gthread_mutex_t _GLIBCXX_mutex;
-  extern __gthread_mutex_t *_GLIBCXX_mutex_address;
-  extern __gthread_once_t _GLIBCXX_once;
-  extern void _GLIBCXX_mutex_init(void);
-  extern void _GLIBCXX_mutex_address_init(void);
-#endif
-} // namespace __gnu_internal
-
-namespace __gnu_cxx
-{
-  // Locking class.  Note that this class *does not have a
-  // constructor*.  It must be initialized either statically, with
-  // __STL_MUTEX_INITIALIZER, or dynamically, by explicitly calling
-  // the _M_initialize member function.  (This is similar to the ways
-  // that a pthreads mutex can be initialized.)  There are explicit
-  // member functions for acquiring and releasing the lock.
-
-  // There is no constructor because static initialization is
-  // essential for some uses, and only a class aggregate (see section
-  // 8.5.1 of the C++ standard) can be initialized that way.  That
-  // means we must have no constructors, no base classes, no virtual
-  // functions, and no private or protected members.
-  struct _STL_mutex_lock
-  {
-    // The class must be statically initialized with __STL_MUTEX_INITIALIZER.
-#if !defined(__GTHREAD_MUTEX_INIT) && defined(__GTHREAD_MUTEX_INIT_FUNCTION)
-    volatile int _M_init_flag;
-    __gthread_once_t _M_once;
-#endif
-    __gthread_mutex_t _M_lock;
-
-    void
-    _M_initialize()
-    {
-#ifdef __GTHREAD_MUTEX_INIT
-      // There should be no code in this path given the usage rules above.
-#elif defined(__GTHREAD_MUTEX_INIT_FUNCTION)
-      if (_M_init_flag) return;
-      if (__gthread_once(&__gnu_internal::_GLIBCXX_once,
-			 __gnu_internal::_GLIBCXX_mutex_init) != 0
-	  && __gthread_active_p())
-	abort ();
-      __gthread_mutex_lock(&__gnu_internal::_GLIBCXX_mutex);
-      if (!_M_init_flag)
-	{
-	  // Even though we have a global lock, we use __gthread_once to be
-	  // absolutely certain the _M_lock mutex is only initialized once on
-	  // multiprocessor systems.
-	  __gnu_internal::_GLIBCXX_mutex_address = &_M_lock;
-	  if (__gthread_once(&_M_once,
-			     __gnu_internal::_GLIBCXX_mutex_address_init) != 0
-	    && __gthread_active_p())
-	    abort();
-	  _M_init_flag = 1;
-	}
-      __gthread_mutex_unlock(&__gnu_internal::_GLIBCXX_mutex);
-#endif
-    }
-
-    void
-    _M_acquire_lock()
-    {
-#if !defined(__GTHREAD_MUTEX_INIT) && defined(__GTHREAD_MUTEX_INIT_FUNCTION)
-      if (!_M_init_flag) _M_initialize();
-#endif
-      __gthread_mutex_lock(&_M_lock);
-    }
-
-    void
-    _M_release_lock()
-    {
-#if !defined(__GTHREAD_MUTEX_INIT) && defined(__GTHREAD_MUTEX_INIT_FUNCTION)
-      if (!_M_init_flag) _M_initialize();
-#endif
-      __gthread_mutex_unlock(&_M_lock);
-    }
-  };
-
-#ifdef __GTHREAD_MUTEX_INIT
-#define __STL_MUTEX_INITIALIZER = { __GTHREAD_MUTEX_INIT }
-#elif defined(__GTHREAD_MUTEX_INIT_FUNCTION)
-#ifdef __GTHREAD_MUTEX_INIT_DEFAULT
-#define __STL_MUTEX_INITIALIZER \
-  = { 0, __GTHREAD_ONCE_INIT, __GTHREAD_MUTEX_INIT_DEFAULT }
-#else
-#define __STL_MUTEX_INITIALIZER = { 0, __GTHREAD_ONCE_INIT }
-#endif
-#endif
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/bits/stl_tree.h b/include.new/c++/3.4/bits/stl_tree.h
deleted file mode 100644
index cea16f1..0000000
--- a/include.new/c++/3.4/bits/stl_tree.h
+++ /dev/null
@@ -1,1283 +0,0 @@
-// RB tree implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- */
-
-/** @file stl_tree.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _TREE_H
-#define _TREE_H 1
-
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_function.h>
-#include <bits/cpp_type_traits.h>
-
-namespace std
-{
-  // Red-black tree class, designed for use in implementing STL
-  // associative containers (set, multiset, map, and multimap). The
-  // insertion and deletion algorithms are based on those in Cormen,
-  // Leiserson, and Rivest, Introduction to Algorithms (MIT Press,
-  // 1990), except that
-  //
-  // (1) the header cell is maintained with links not only to the root
-  // but also to the leftmost node of the tree, to enable constant
-  // time begin(), and to the rightmost node of the tree, to enable
-  // linear time performance when used with the generic set algorithms
-  // (set_union, etc.)
-  // 
-  // (2) when a node being deleted has two children its successor node
-  // is relinked into its place, rather than copied, so that the only
-  // iterators invalidated are those referring to the deleted node.
-
-  enum _Rb_tree_color { _S_red = false, _S_black = true };
-
-  struct _Rb_tree_node_base
-  {
-    typedef _Rb_tree_node_base* _Base_ptr;
-    typedef const _Rb_tree_node_base* _Const_Base_ptr;
-
-    _Rb_tree_color	_M_color;
-    _Base_ptr		_M_parent;
-    _Base_ptr		_M_left;
-    _Base_ptr		_M_right;
-
-    static _Base_ptr
-    _S_minimum(_Base_ptr __x)
-    {
-      while (__x->_M_left != 0) __x = __x->_M_left;
-      return __x;
-    }
-
-    static _Const_Base_ptr
-    _S_minimum(_Const_Base_ptr __x)
-    {
-      while (__x->_M_left != 0) __x = __x->_M_left;
-      return __x;
-    }
-
-    static _Base_ptr
-    _S_maximum(_Base_ptr __x)
-    {
-      while (__x->_M_right != 0) __x = __x->_M_right;
-      return __x;
-    }
-
-    static _Const_Base_ptr
-    _S_maximum(_Const_Base_ptr __x)
-    {
-      while (__x->_M_right != 0) __x = __x->_M_right;
-      return __x;
-    }
-  };
-
-  template<typename _Val>
-    struct _Rb_tree_node : public _Rb_tree_node_base
-    {
-      typedef _Rb_tree_node<_Val>* _Link_type;
-      _Val _M_value_field;
-    };
-
-  _Rb_tree_node_base*
-  _Rb_tree_increment(_Rb_tree_node_base* __x);
-
-  const _Rb_tree_node_base*
-  _Rb_tree_increment(const _Rb_tree_node_base* __x);
-
-  _Rb_tree_node_base*
-  _Rb_tree_decrement(_Rb_tree_node_base* __x);
-
-  const _Rb_tree_node_base*
-  _Rb_tree_decrement(const _Rb_tree_node_base* __x);
-
-  template<typename _Tp>
-    struct _Rb_tree_iterator
-    {
-      typedef _Tp  value_type;
-      typedef _Tp& reference;
-      typedef _Tp* pointer;
-
-      typedef bidirectional_iterator_tag iterator_category;
-      typedef ptrdiff_t                  difference_type;
-
-      typedef _Rb_tree_iterator<_Tp>        _Self;
-      typedef _Rb_tree_node_base::_Base_ptr _Base_ptr;
-      typedef _Rb_tree_node<_Tp>*           _Link_type;
-
-      _Rb_tree_iterator()
-      : _M_node() { }
-
-      _Rb_tree_iterator(_Link_type __x)
-      : _M_node(__x) { }
-
-      reference
-      operator*() const
-      { return static_cast<_Link_type>(_M_node)->_M_value_field; }
-
-      pointer
-      operator->() const
-      { return &static_cast<_Link_type>(_M_node)->_M_value_field; }
-
-      _Self&
-      operator++()
-      {
-	_M_node = _Rb_tree_increment(_M_node);
-	return *this;
-      }
-
-      _Self
-      operator++(int)
-      {
-	_Self __tmp = *this;
-	_M_node = _Rb_tree_increment(_M_node);
-	return __tmp;
-      }
-
-      _Self&
-      operator--()
-      {
-	_M_node = _Rb_tree_decrement(_M_node);
-	return *this;
-      }
-
-      _Self
-      operator--(int)
-      {
-	_Self __tmp = *this;
-	_M_node = _Rb_tree_decrement(_M_node);
-	return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const
-      { return _M_node != __x._M_node; }
-
-      _Base_ptr _M_node;
-  };
-
-  template<typename _Tp>
-    struct _Rb_tree_const_iterator
-    {
-      typedef _Tp        value_type;
-      typedef const _Tp& reference;
-      typedef const _Tp* pointer;
-
-      typedef _Rb_tree_iterator<_Tp> iterator;
-
-      typedef bidirectional_iterator_tag iterator_category;
-      typedef ptrdiff_t                  difference_type;
-
-      typedef _Rb_tree_const_iterator<_Tp>        _Self;
-      typedef _Rb_tree_node_base::_Const_Base_ptr _Base_ptr;
-      typedef const _Rb_tree_node<_Tp>*           _Link_type;
-
-      _Rb_tree_const_iterator()
-      : _M_node() { }
-
-      _Rb_tree_const_iterator(_Link_type __x)
-      : _M_node(__x) { }
-
-      _Rb_tree_const_iterator(const iterator& __it)
-      : _M_node(__it._M_node) { }
-
-      reference
-      operator*() const
-      { return static_cast<_Link_type>(_M_node)->_M_value_field; }
-
-      pointer
-      operator->() const
-      { return &static_cast<_Link_type>(_M_node)->_M_value_field; }
-
-      _Self&
-      operator++()
-      {
-	_M_node = _Rb_tree_increment(_M_node);
-	return *this;
-      }
-
-      _Self
-      operator++(int)
-      {
-	_Self __tmp = *this;
-	_M_node = _Rb_tree_increment(_M_node);
-	return __tmp;
-      }
-
-      _Self&
-      operator--()
-      {
-	_M_node = _Rb_tree_decrement(_M_node);
-	return *this;
-      }
-
-      _Self
-      operator--(int)
-      {
-	_Self __tmp = *this;
-	_M_node = _Rb_tree_decrement(_M_node);
-	return __tmp;
-      }
-
-      bool
-      operator==(const _Self& __x) const
-      { return _M_node == __x._M_node; }
-
-      bool
-      operator!=(const _Self& __x) const
-      { return _M_node != __x._M_node; }
-
-      _Base_ptr _M_node;
-    };
-
-  template<typename _Val>
-    inline bool
-    operator==(const _Rb_tree_iterator<_Val>& __x,
-               const _Rb_tree_const_iterator<_Val>& __y)
-    { return __x._M_node == __y._M_node; }
-
-  template<typename _Val>
-    inline bool
-    operator!=(const _Rb_tree_iterator<_Val>& __x,
-               const _Rb_tree_const_iterator<_Val>& __y)
-    { return __x._M_node != __y._M_node; }
-
-  void
-  _Rb_tree_rotate_left(_Rb_tree_node_base* const __x,
-                       _Rb_tree_node_base*& __root);
-
-  void
-  _Rb_tree_rotate_right(_Rb_tree_node_base* const __x,
-                        _Rb_tree_node_base*& __root);
-
-  void
-  _Rb_tree_insert_and_rebalance(const bool __insert_left,
-                                _Rb_tree_node_base* __x,
-                                _Rb_tree_node_base* __p,
-                                _Rb_tree_node_base& __header);
-
-  _Rb_tree_node_base*
-  _Rb_tree_rebalance_for_erase(_Rb_tree_node_base* const __z,
-			       _Rb_tree_node_base& __header);
-
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc = allocator<_Val> >
-    class _Rb_tree
-    {
-      typedef typename _Alloc::template rebind<_Rb_tree_node<_Val> >::other
-              _Node_allocator;
-
-    protected:
-      typedef _Rb_tree_node_base* _Base_ptr;
-      typedef const _Rb_tree_node_base* _Const_Base_ptr;
-      typedef _Rb_tree_node<_Val> _Rb_tree_node;
-
-    public:
-      typedef _Key key_type;
-      typedef _Val value_type;
-      typedef value_type* pointer;
-      typedef const value_type* const_pointer;
-      typedef value_type& reference;
-      typedef const value_type& const_reference;
-      typedef _Rb_tree_node* _Link_type;
-      typedef const _Rb_tree_node* _Const_Link_type;
-      typedef size_t size_type;
-      typedef ptrdiff_t difference_type;
-      typedef _Alloc allocator_type;
-
-      allocator_type 
-      get_allocator() const
-      { return *static_cast<const _Node_allocator*>(&this->_M_impl); }
-
-    protected:
-      _Rb_tree_node*
-      _M_get_node()
-      { return _M_impl._Node_allocator::allocate(1); }
-
-      void
-      _M_put_node(_Rb_tree_node* __p)
-      { _M_impl._Node_allocator::deallocate(__p, 1); }
-
-      _Link_type
-      _M_create_node(const value_type& __x)
-      {
-	_Link_type __tmp = _M_get_node();
-	try
-	  { std::_Construct(&__tmp->_M_value_field, __x); }
-	catch(...)
-	  {
-	    _M_put_node(__tmp);
-	    __throw_exception_again;
-	  }
-	return __tmp;
-      }
-
-      _Link_type
-      _M_clone_node(_Const_Link_type __x)
-      {
-	_Link_type __tmp = _M_create_node(__x->_M_value_field);
-	__tmp->_M_color = __x->_M_color;
-	__tmp->_M_left = 0;
-	__tmp->_M_right = 0;
-	return __tmp;
-      }
-
-      void
-      destroy_node(_Link_type __p)
-      {
-	std::_Destroy(&__p->_M_value_field);
-	_M_put_node(__p);
-      }
-
-    protected:
-      template<typename _Key_compare, 
-	       bool _Is_pod_comparator = std::__is_pod<_Key_compare>::_M_type>
-        struct _Rb_tree_impl : public _Node_allocator
-        {
-	  _Key_compare		_M_key_compare;
-	  _Rb_tree_node_base 	_M_header;
-	  size_type 		_M_node_count; // Keeps track of size of tree.
-
-	  _Rb_tree_impl(const _Node_allocator& __a = _Node_allocator(),
-			const _Key_compare& __comp = _Key_compare())
-	  : _Node_allocator(__a), _M_key_compare(__comp), _M_node_count(0)
-	  {
-	    this->_M_header._M_color = _S_red;
-	    this->_M_header._M_parent = 0;
-	    this->_M_header._M_left = &this->_M_header;
-	    this->_M_header._M_right = &this->_M_header;
-	  }
-	};
-
-      // Specialization for _Comparison types that are not capable of
-      // being base classes / super classes.
-      template<typename _Key_compare>
-        struct _Rb_tree_impl<_Key_compare, true> : public _Node_allocator 
-	{
-	  _Key_compare 		_M_key_compare;
-	  _Rb_tree_node_base 	_M_header;
-	  size_type 		_M_node_count; // Keeps track of size of tree.
-
-	  _Rb_tree_impl(const _Node_allocator& __a = _Node_allocator(),
-			const _Key_compare& __comp = _Key_compare())
-	  : _Node_allocator(__a), _M_key_compare(__comp), _M_node_count(0)
-	  { 
-	    this->_M_header._M_color = _S_red;
-	    this->_M_header._M_parent = 0;
-	    this->_M_header._M_left = &this->_M_header;
-	    this->_M_header._M_right = &this->_M_header;
-	  }
-	};
-
-      _Rb_tree_impl<_Compare> _M_impl;
-
-    protected:
-      _Base_ptr&
-      _M_root()
-      { return this->_M_impl._M_header._M_parent; }
-
-      _Const_Base_ptr
-      _M_root() const
-      { return this->_M_impl._M_header._M_parent; }
-
-      _Base_ptr&
-      _M_leftmost()
-      { return this->_M_impl._M_header._M_left; }
-
-      _Const_Base_ptr
-      _M_leftmost() const
-      { return this->_M_impl._M_header._M_left; }
-
-      _Base_ptr&
-      _M_rightmost()
-      { return this->_M_impl._M_header._M_right; }
-
-      _Const_Base_ptr
-      _M_rightmost() const
-      { return this->_M_impl._M_header._M_right; }
-
-      _Link_type
-      _M_begin()
-      { return static_cast<_Link_type>(this->_M_impl._M_header._M_parent); }
-
-      _Const_Link_type
-      _M_begin() const
-      { return static_cast<_Const_Link_type>(this->_M_impl._M_header._M_parent); }
-
-      _Link_type
-      _M_end()
-      { return static_cast<_Link_type>(&this->_M_impl._M_header); }
-
-      _Const_Link_type
-      _M_end() const
-      { return static_cast<_Const_Link_type>(&this->_M_impl._M_header); }
-
-      static const_reference
-      _S_value(_Const_Link_type __x)
-      { return __x->_M_value_field; }
-
-      static const _Key&
-      _S_key(_Const_Link_type __x)
-      { return _KeyOfValue()(_S_value(__x)); }
-
-      static _Link_type
-      _S_left(_Base_ptr __x)
-      { return static_cast<_Link_type>(__x->_M_left); }
-
-      static _Const_Link_type
-      _S_left(_Const_Base_ptr __x)
-      { return static_cast<_Const_Link_type>(__x->_M_left); }
-
-      static _Link_type
-      _S_right(_Base_ptr __x)
-      { return static_cast<_Link_type>(__x->_M_right); }
-
-      static _Const_Link_type
-      _S_right(_Const_Base_ptr __x)
-      { return static_cast<_Const_Link_type>(__x->_M_right); }
-
-      static const_reference
-      _S_value(_Const_Base_ptr __x)
-      { return static_cast<_Const_Link_type>(__x)->_M_value_field; }
-
-      static const _Key&
-      _S_key(_Const_Base_ptr __x)
-      { return _KeyOfValue()(_S_value(__x)); }
-
-      static _Base_ptr
-      _S_minimum(_Base_ptr __x)
-      { return _Rb_tree_node_base::_S_minimum(__x); }
-
-      static _Const_Base_ptr
-      _S_minimum(_Const_Base_ptr __x)
-      { return _Rb_tree_node_base::_S_minimum(__x); }
-
-      static _Base_ptr
-      _S_maximum(_Base_ptr __x)
-      { return _Rb_tree_node_base::_S_maximum(__x); }
-
-      static _Const_Base_ptr
-      _S_maximum(_Const_Base_ptr __x)
-      { return _Rb_tree_node_base::_S_maximum(__x); }
-
-    public:
-      typedef _Rb_tree_iterator<value_type>       iterator;
-      typedef _Rb_tree_const_iterator<value_type> const_iterator;
-
-      typedef std::reverse_iterator<iterator>       reverse_iterator;
-      typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    private:
-      iterator
-      _M_insert(_Base_ptr __x, _Base_ptr __y, const value_type& __v);
-
-      _Link_type
-      _M_copy(_Const_Link_type __x, _Link_type __p);
-
-      void
-      _M_erase(_Link_type __x);
-
-    public:
-      // allocation/deallocation
-      _Rb_tree()
-      { }
-
-      _Rb_tree(const _Compare& __comp)
-      : _M_impl(allocator_type(), __comp)
-      { }
-
-      _Rb_tree(const _Compare& __comp, const allocator_type& __a)
-      : _M_impl(__a, __comp)
-      { }
-
-      _Rb_tree(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x)
-      : _M_impl(__x.get_allocator(), __x._M_impl._M_key_compare)
-      {
-	if (__x._M_root() != 0)
-	  {
-	    _M_root() = _M_copy(__x._M_begin(), _M_end());
-	    _M_leftmost() = _S_minimum(_M_root());
-	    _M_rightmost() = _S_maximum(_M_root());
-	    _M_impl._M_node_count = __x._M_impl._M_node_count;
-	  }
-      }
-
-      ~_Rb_tree()
-      { _M_erase(_M_begin()); }
-
-      _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>&
-      operator=(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x);
-
-      // Accessors.
-      _Compare
-      key_comp() const
-      { return _M_impl._M_key_compare; }
-
-      iterator
-      begin()
-      { return static_cast<_Link_type>(this->_M_impl._M_header._M_left); }
-
-      const_iterator
-      begin() const
-      { return static_cast<_Const_Link_type>(this->_M_impl._M_header._M_left); }
-
-      iterator
-      end()
-      { return static_cast<_Link_type>(&this->_M_impl._M_header); }
-
-      const_iterator
-      end() const
-      { return static_cast<_Const_Link_type>(&this->_M_impl._M_header); }
-
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend()
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      bool
-      empty() const
-      { return _M_impl._M_node_count == 0; }
-
-      size_type
-      size() const
-      { return _M_impl._M_node_count; }
-
-      size_type
-      max_size() const
-      { return size_type(-1); }
-
-      void
-      swap(_Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __t);
-
-      // Insert/erase.
-      pair<iterator,bool>
-      insert_unique(const value_type& __x);
-
-      iterator
-      insert_equal(const value_type& __x);
-
-      iterator
-      insert_unique(iterator __position, const value_type& __x);
-
-      iterator
-      insert_equal(iterator __position, const value_type& __x);
-
-      template<typename _InputIterator>
-      void
-      insert_unique(_InputIterator __first, _InputIterator __last);
-
-      template<typename _InputIterator>
-      void
-      insert_equal(_InputIterator __first, _InputIterator __last);
-
-      void
-      erase(iterator __position);
-
-      size_type
-      erase(const key_type& __x);
-
-      void
-      erase(iterator __first, iterator __last);
-
-      void
-      erase(const key_type* __first, const key_type* __last);
-
-      void
-      clear()
-      {
-        _M_erase(_M_begin());
-        _M_leftmost() = _M_end();
-        _M_root() = 0;
-        _M_rightmost() = _M_end();
-        _M_impl._M_node_count = 0;
-      }
-
-      // Set operations.
-      iterator
-      find(const key_type& __x);
-
-      const_iterator
-      find(const key_type& __x) const;
-
-      size_type
-      count(const key_type& __x) const;
-
-      iterator
-      lower_bound(const key_type& __x);
-
-      const_iterator
-      lower_bound(const key_type& __x) const;
-
-      iterator
-      upper_bound(const key_type& __x);
-
-      const_iterator
-      upper_bound(const key_type& __x) const;
-
-      pair<iterator,iterator>
-      equal_range(const key_type& __x);
-
-      pair<const_iterator, const_iterator>
-      equal_range(const key_type& __x) const;
-
-      // Debugging.
-      bool
-      __rb_verify() const;
-    };
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator==(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x,
-	       const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __y)
-    {
-      return __x.size() == __y.size()
-	     && std::equal(__x.begin(), __x.end(), __y.begin());
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator<(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x,
-	      const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __y)
-    {
-      return std::lexicographical_compare(__x.begin(), __x.end(), 
-					  __y.begin(), __y.end());
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator!=(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x,
-	       const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __y)
-    { return !(__x == __y); }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator>(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x,
-	      const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __y)
-    { return __y < __x; }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator<=(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x,
-	       const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __y)
-    { return !(__y < __x); }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline bool
-    operator>=(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x,
-	       const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __y)
-    { return !(__x < __y); }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline void
-    swap(_Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x,
-	 _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __y)
-    { __x.swap(__y); }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>&
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    operator=(const _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __x)
-    {
-      if (this != &__x)
-	{
-	  // Note that _Key may be a constant type.
-	  clear();
-	  _M_impl._M_key_compare = __x._M_impl._M_key_compare;
-	  if (__x._M_root() != 0)
-	    {
-	      _M_root() = _M_copy(__x._M_begin(), _M_end());
-	      _M_leftmost() = _S_minimum(_M_root());
-	      _M_rightmost() = _S_maximum(_M_root());
-	      _M_impl._M_node_count = __x._M_impl._M_node_count;
-	    }
-	}
-      return *this;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::iterator
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    _M_insert(_Base_ptr __x, _Base_ptr __p, const _Val& __v)
-    {
-      _Link_type __z = _M_create_node(__v);
-      bool __insert_left;
-
-      __insert_left = __x != 0 || __p == _M_end()
-	              || _M_impl._M_key_compare(_KeyOfValue()(__v), 
-						_S_key(__p));
-
-      _Rb_tree_insert_and_rebalance(__insert_left, __z, __p,  
-				    this->_M_impl._M_header);
-      ++_M_impl._M_node_count;
-      return iterator(__z);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::iterator
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    insert_equal(const _Val& __v)
-    {
-      _Link_type __x = _M_begin();
-      _Link_type __y = _M_end();
-      while (__x != 0)
-	{
-	  __y = __x;
-	  __x = _M_impl._M_key_compare(_KeyOfValue()(__v), _S_key(__x)) ?
-	        _S_left(__x) : _S_right(__x);
-	}
-      return _M_insert(__x, __y, __v);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    swap(_Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>& __t)
-    {
-      if (_M_root() == 0)
-      {
-	if (__t._M_root() != 0)
-	{
-	  _M_root() = __t._M_root();
-	  _M_leftmost() = __t._M_leftmost();
-	  _M_rightmost() = __t._M_rightmost();
-          _M_root()->_M_parent = _M_end();
-
-	  __t._M_root() = 0;
-	  __t._M_leftmost() = __t._M_end();
-	  __t._M_rightmost() = __t._M_end();
-	}
-      }
-      else if (__t._M_root() == 0)
-      {
-	__t._M_root() = _M_root();
-	__t._M_leftmost() = _M_leftmost();
-	__t._M_rightmost() = _M_rightmost();
-        __t._M_root()->_M_parent = __t._M_end();
-
-	_M_root() = 0;
-	_M_leftmost() = _M_end();
-	_M_rightmost() = _M_end();
-      }
-      else
-      {
-	std::swap(_M_root(),__t._M_root());
-	std::swap(_M_leftmost(),__t._M_leftmost());
-	std::swap(_M_rightmost(),__t._M_rightmost());
-
-	_M_root()->_M_parent = _M_end();
-	__t._M_root()->_M_parent = __t._M_end();
-      }
-      // No need to swap header's color as it does not change.
-      std::swap(this->_M_impl._M_node_count, __t._M_impl._M_node_count);
-      std::swap(this->_M_impl._M_key_compare, __t._M_impl._M_key_compare);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    pair<typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::iterator,
-    bool>
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    insert_unique(const _Val& __v)
-    {
-      _Link_type __x = _M_begin();
-      _Link_type __y = _M_end();
-      bool __comp = true;
-      while (__x != 0)
-	{
-	  __y = __x;
-	  __comp = _M_impl._M_key_compare(_KeyOfValue()(__v), _S_key(__x));
-	  __x = __comp ? _S_left(__x) : _S_right(__x);
-	}
-      iterator __j = iterator(__y);
-      if (__comp)
-	if (__j == begin())
-	  return pair<iterator,bool>(_M_insert(__x, __y, __v), true);
-	else
-	  --__j;
-      if (_M_impl._M_key_compare(_S_key(__j._M_node), _KeyOfValue()(__v)))
-	return pair<iterator,bool>(_M_insert(__x, __y, __v), true);
-      return pair<iterator,bool>(__j, false);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::iterator
-    _Rb_tree<_Key, _Val, _KeyOfValue, _Compare, _Alloc>::
-    insert_unique(iterator __position, const _Val& __v)
-    {
-      if (__position._M_node == _M_leftmost())
-	{
-	  // begin()
-	  if (size() > 0
-	      && _M_impl._M_key_compare(_KeyOfValue()(__v), 
-					_S_key(__position._M_node)))
-	    return _M_insert(__position._M_node, __position._M_node, __v);
-	  // First argument just needs to be non-null.
-	  else
-	    return insert_unique(__v).first;
-	}
-      else if (__position._M_node == _M_end())
-	{
-	  // end()
-	  if (_M_impl._M_key_compare(_S_key(_M_rightmost()), 
-				     _KeyOfValue()(__v)))
-	    return _M_insert(0, _M_rightmost(), __v);
-	  else
-	    return insert_unique(__v).first;
-	}
-      else
-	{
-	  iterator __before = __position;
-	  --__before;
-	  if (_M_impl._M_key_compare(_S_key(__before._M_node), 
-				     _KeyOfValue()(__v))
-	      && _M_impl._M_key_compare(_KeyOfValue()(__v),
-					_S_key(__position._M_node)))
-	    {
-	      if (_S_right(__before._M_node) == 0)
-		return _M_insert(0, __before._M_node, __v);
-	      else
-		return _M_insert(__position._M_node, __position._M_node, __v);
-	      // First argument just needs to be non-null.
-	    }
-	  else
-	    return insert_unique(__v).first;
-	}
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::iterator
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    insert_equal(iterator __position, const _Val& __v)
-    {
-      if (__position._M_node == _M_leftmost())
-	{
-	  // begin()
-	  if (size() > 0
-	      && !_M_impl._M_key_compare(_S_key(__position._M_node),
-					 _KeyOfValue()(__v)))
-	    return _M_insert(__position._M_node, __position._M_node, __v);
-	  // first argument just needs to be non-null
-	  else
-	    return insert_equal(__v);
-	}
-      else if (__position._M_node == _M_end())
-	{
-	  // end()
-	  if (!_M_impl._M_key_compare(_KeyOfValue()(__v), 
-				      _S_key(_M_rightmost())))
-	    return _M_insert(0, _M_rightmost(), __v);
-	  else
-	    return insert_equal(__v);
-	}
-      else
-	{
-	  iterator __before = __position;
-	  --__before;
-	  if (!_M_impl._M_key_compare(_KeyOfValue()(__v), 
-				      _S_key(__before._M_node))
-	      && !_M_impl._M_key_compare(_S_key(__position._M_node),
-					 _KeyOfValue()(__v)))
-	    {
-	      if (_S_right(__before._M_node) == 0)
-		return _M_insert(0, __before._M_node, __v);
-	      else
-		return _M_insert(__position._M_node, __position._M_node, __v);
-	      // First argument just needs to be non-null.
-	    }
-	  else
-	    return insert_equal(__v);
-	}
-    }
-
-  template<typename _Key, typename _Val, typename _KoV,
-           typename _Cmp, typename _Alloc>
-    template<class _II>
-      void
-      _Rb_tree<_Key,_Val,_KoV,_Cmp,_Alloc>::
-      insert_equal(_II __first, _II __last)
-      {
-	for ( ; __first != __last; ++__first)
-	  insert_equal(*__first);
-      }
-
-  template<typename _Key, typename _Val, typename _KoV,
-           typename _Cmp, typename _Alloc>
-    template<class _II>
-    void
-    _Rb_tree<_Key,_Val,_KoV,_Cmp,_Alloc>::
-    insert_unique(_II __first, _II __last)
-    {
-      for ( ; __first != __last; ++__first)
-	insert_unique(*__first);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline void
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::erase(iterator __position)
-    {
-      _Link_type __y =
-	static_cast<_Link_type>(_Rb_tree_rebalance_for_erase(__position._M_node,
-							     this->_M_impl._M_header));
-      destroy_node(__y);
-      --_M_impl._M_node_count;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::size_type
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::erase(const _Key& __x)
-    {
-      pair<iterator,iterator> __p = equal_range(__x);
-      size_type __n = std::distance(__p.first, __p.second);
-      erase(__p.first, __p.second);
-      return __n;
-    }
-
-  template<typename _Key, typename _Val, typename _KoV,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key, _Val, _KoV, _Compare, _Alloc>::_Link_type
-    _Rb_tree<_Key,_Val,_KoV,_Compare,_Alloc>::
-    _M_copy(_Const_Link_type __x, _Link_type __p)
-    {
-      // Structural copy.  __x and __p must be non-null.
-      _Link_type __top = _M_clone_node(__x);
-      __top->_M_parent = __p;
-
-      try
-	{
-	  if (__x->_M_right)
-	    __top->_M_right = _M_copy(_S_right(__x), __top);
-	  __p = __top;
-	  __x = _S_left(__x);
-
-	  while (__x != 0)
-	    {
-	      _Link_type __y = _M_clone_node(__x);
-	      __p->_M_left = __y;
-	      __y->_M_parent = __p;
-	      if (__x->_M_right)
-		__y->_M_right = _M_copy(_S_right(__x), __y);
-	      __p = __y;
-	      __x = _S_left(__x);
-	    }
-	}
-      catch(...)
-	{
-	  _M_erase(__top);
-	  __throw_exception_again;
-	}
-      return __top;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::_M_erase(_Link_type __x)
-    {
-      // Erase without rebalancing.
-      while (__x != 0)
-	{
-	  _M_erase(_S_right(__x));
-	  _Link_type __y = _S_left(__x);
-	  destroy_node(__x);
-	  __x = __y;
-	}
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    erase(iterator __first, iterator __last)
-    {
-      if (__first == begin() && __last == end())
-	clear();
-      else
-	while (__first != __last) erase(__first++);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    void
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    erase(const _Key* __first, const _Key* __last)
-    {
-      while (__first != __last)
-	erase(*__first++);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::iterator
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::find(const _Key& __k)
-    {
-      _Link_type __x = _M_begin(); // Current node.
-      _Link_type __y = _M_end(); // Last node which is not less than __k.
-
-      while (__x != 0)
-	if (!_M_impl._M_key_compare(_S_key(__x), __k))
-	  __y = __x, __x = _S_left(__x);
-	else
-	  __x = _S_right(__x);
-
-      iterator __j = iterator(__y);
-      return (__j == end() 
-	  || _M_impl._M_key_compare(__k, _S_key(__j._M_node))) ? end() : __j;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::const_iterator
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    find(const _Key& __k) const
-    {
-      _Const_Link_type __x = _M_begin(); // Current node.
-      _Const_Link_type __y = _M_end(); // Last node which is not less than __k.
-
-     while (__x != 0)
-       {
-	 if (!_M_impl._M_key_compare(_S_key(__x), __k))
-	   __y = __x, __x = _S_left(__x);
-	 else
-	   __x = _S_right(__x);
-       }
-     const_iterator __j = const_iterator(__y);
-     return (__j == end() 
-	  || _M_impl._M_key_compare(__k, _S_key(__j._M_node))) ? end() : __j;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::size_type
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    count(const _Key& __k) const
-    {
-      pair<const_iterator, const_iterator> __p = equal_range(__k);
-      const size_type __n = std::distance(__p.first, __p.second);
-      return __n;
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::iterator
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    lower_bound(const _Key& __k)
-    {
-      _Link_type __x = _M_begin(); // Current node.
-      _Link_type __y = _M_end(); // Last node which is not less than __k.
-
-      while (__x != 0)
-	if (!_M_impl._M_key_compare(_S_key(__x), __k))
-	  __y = __x, __x = _S_left(__x);
-	else
-	  __x = _S_right(__x);
-
-      return iterator(__y);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::const_iterator
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    lower_bound(const _Key& __k) const
-    {
-      _Const_Link_type __x = _M_begin(); // Current node.
-      _Const_Link_type __y = _M_end(); // Last node which is not less than __k.
-
-      while (__x != 0)
-	if (!_M_impl._M_key_compare(_S_key(__x), __k))
-	  __y = __x, __x = _S_left(__x);
-	else
-	  __x = _S_right(__x);
-
-      return const_iterator(__y);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::iterator
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    upper_bound(const _Key& __k)
-    {
-      _Link_type __x = _M_begin(); // Current node.
-      _Link_type __y = _M_end(); // Last node which is greater than __k.
-
-      while (__x != 0)
-	if (_M_impl._M_key_compare(__k, _S_key(__x)))
-	  __y = __x, __x = _S_left(__x);
-	else
-	  __x = _S_right(__x);
-
-      return iterator(__y);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::const_iterator
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    upper_bound(const _Key& __k) const
-    {
-      _Const_Link_type __x = _M_begin(); // Current node.
-      _Const_Link_type __y = _M_end(); // Last node which is greater than __k.
-
-      while (__x != 0)
-	if (_M_impl._M_key_compare(__k, _S_key(__x)))
-	  __y = __x, __x = _S_left(__x);
-	else
-	  __x = _S_right(__x);
-
-      return const_iterator(__y);
-    }
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    inline
-    pair<typename _Rb_tree<_Key,_Val,_KeyOfValue,
-			   _Compare,_Alloc>::iterator,
-	 typename _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::iterator>
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::
-    equal_range(const _Key& __k)
-    { return pair<iterator, iterator>(lower_bound(__k), upper_bound(__k)); }
-
-  template<typename _Key, typename _Val, typename _KoV,
-           typename _Compare, typename _Alloc>
-    inline
-    pair<typename _Rb_tree<_Key, _Val, _KoV,
-			   _Compare, _Alloc>::const_iterator,
-	 typename _Rb_tree<_Key, _Val, _KoV, _Compare, _Alloc>::const_iterator>
-    _Rb_tree<_Key, _Val, _KoV, _Compare, _Alloc>::
-    equal_range(const _Key& __k) const
-    { return pair<const_iterator, const_iterator>(lower_bound(__k),
-						  upper_bound(__k)); }
-
-  unsigned int
-  _Rb_tree_black_count(const _Rb_tree_node_base* __node,
-                       const _Rb_tree_node_base* __root);
-
-  template<typename _Key, typename _Val, typename _KeyOfValue,
-           typename _Compare, typename _Alloc>
-    bool
-    _Rb_tree<_Key,_Val,_KeyOfValue,_Compare,_Alloc>::__rb_verify() const
-    {
-      if (_M_impl._M_node_count == 0 || begin() == end())
-	return _M_impl._M_node_count == 0 && begin() == end()
-	       && this->_M_impl._M_header._M_left == _M_end()
-	       && this->_M_impl._M_header._M_right == _M_end();
-
-      unsigned int __len = _Rb_tree_black_count(_M_leftmost(), _M_root());
-      for (const_iterator __it = begin(); __it != end(); ++__it)
-	{
-	  _Const_Link_type __x = static_cast<_Const_Link_type>(__it._M_node);
-	  _Const_Link_type __L = _S_left(__x);
-	  _Const_Link_type __R = _S_right(__x);
-
-	  if (__x->_M_color == _S_red)
-	    if ((__L && __L->_M_color == _S_red)
-		|| (__R && __R->_M_color == _S_red))
-	      return false;
-
-	  if (__L && _M_impl._M_key_compare(_S_key(__x), _S_key(__L)))
-	    return false;
-	  if (__R && _M_impl._M_key_compare(_S_key(__R), _S_key(__x)))
-	    return false;
-
-	  if (!__L && !__R && _Rb_tree_black_count(__x, _M_root()) != __len)
-	    return false;
-	}
-
-      if (_M_leftmost() != _Rb_tree_node_base::_S_minimum(_M_root()))
-	return false;
-      if (_M_rightmost() != _Rb_tree_node_base::_S_maximum(_M_root()))
-	return false;
-      return true;
-    }
-} // namespace std
-
-#endif
-
diff --git a/include.new/c++/3.4/bits/stl_uninitialized.h b/include.new/c++/3.4/bits/stl_uninitialized.h
deleted file mode 100644
index f4f8d18..0000000
--- a/include.new/c++/3.4/bits/stl_uninitialized.h
+++ /dev/null
@@ -1,297 +0,0 @@
-// Raw memory manipulators -*- C++ -*-
-
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_uninitialized.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STL_UNINITIALIZED_H
-#define _STL_UNINITIALIZED_H 1
-
-#include <cstring>
-
-namespace std
-{
-  // uninitialized_copy
-  template<typename _InputIterator, typename _ForwardIterator>
-    inline _ForwardIterator
-    __uninitialized_copy_aux(_InputIterator __first, _InputIterator __last,
-			     _ForwardIterator __result,
-			     __true_type)
-    { return std::copy(__first, __last, __result); }
-
-  template<typename _InputIterator, typename _ForwardIterator>
-    inline _ForwardIterator
-    __uninitialized_copy_aux(_InputIterator __first, _InputIterator __last,
-			     _ForwardIterator __result,
-			     __false_type)
-    {
-      _ForwardIterator __cur = __result;
-      try
-	{
-	  for ( ; __first != __last; ++__first, ++__cur)
-	    std::_Construct(&*__cur, *__first);
-	  return __cur;
-	}
-      catch(...)
-	{
-	  std::_Destroy(__result, __cur);
-	  __throw_exception_again;
-	}
-    }
-
-  /**
-   *  @brief Copies the range [first,last) into result.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  result An output iterator.
-   *  @return   result + (first - last)
-   *
-   *  Like copy(), but does not require an initialized output range.
-  */
-  template<typename _InputIterator, typename _ForwardIterator>
-    inline _ForwardIterator
-    uninitialized_copy(_InputIterator __first, _InputIterator __last,
-		       _ForwardIterator __result)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
-      typedef typename __type_traits<_ValueType>::is_POD_type _Is_POD;
-      return std::__uninitialized_copy_aux(__first, __last, __result,
-					   _Is_POD());
-    }
-
-  inline char*
-  uninitialized_copy(const char* __first, const char* __last, char* __result)
-  {
-    std::memmove(__result, __first, __last - __first);
-    return __result + (__last - __first);
-  }
-
-  inline wchar_t*
-  uninitialized_copy(const wchar_t* __first, const wchar_t* __last,
-		     wchar_t* __result)
-  {
-    std::memmove(__result, __first, sizeof(wchar_t) * (__last - __first));
-    return __result + (__last - __first);
-  }
-
-  // Valid if copy construction is equivalent to assignment, and if the
-  // destructor is trivial.
-  template<typename _ForwardIterator, typename _Tp>
-    inline void
-    __uninitialized_fill_aux(_ForwardIterator __first,
-			     _ForwardIterator __last,
-			     const _Tp& __x, __true_type)
-    { std::fill(__first, __last, __x); }
-
-  template<typename _ForwardIterator, typename _Tp>
-    void
-    __uninitialized_fill_aux(_ForwardIterator __first, _ForwardIterator __last,
-			     const _Tp& __x, __false_type)
-    {
-      _ForwardIterator __cur = __first;
-      try
-	{
-	  for ( ; __cur != __last; ++__cur)
-	    std::_Construct(&*__cur, __x);
-	}
-      catch(...)
-	{
-	  std::_Destroy(__first, __cur);
-	  __throw_exception_again;
-	}
-    }
-
-  /**
-   *  @brief Copies the value x into the range [first,last).
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  x      The source value.
-   *  @return   Nothing.
-   *
-   *  Like fill(), but does not require an initialized output range.
-  */
-  template<typename _ForwardIterator, typename _Tp>
-    inline void
-    uninitialized_fill(_ForwardIterator __first, _ForwardIterator __last,
-		       const _Tp& __x)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
-      typedef typename __type_traits<_ValueType>::is_POD_type _Is_POD;
-      std::__uninitialized_fill_aux(__first, __last, __x, _Is_POD());
-    }
-
-  // Valid if copy construction is equivalent to assignment, and if the
-  //  destructor is trivial.
-  template<typename _ForwardIterator, typename _Size, typename _Tp>
-    inline _ForwardIterator
-    __uninitialized_fill_n_aux(_ForwardIterator __first, _Size __n,
-			       const _Tp& __x, __true_type)
-    { return std::fill_n(__first, __n, __x); }
-
-  template<typename _ForwardIterator, typename _Size, typename _Tp>
-    _ForwardIterator
-    __uninitialized_fill_n_aux(_ForwardIterator __first, _Size __n,
-			       const _Tp& __x, __false_type)
-    {
-      _ForwardIterator __cur = __first;
-      try
-	{
-	  for ( ; __n > 0; --__n, ++__cur)
-	    std::_Construct(&*__cur, __x);
-	  return __cur;
-	}
-      catch(...)
-	{
-	  std::_Destroy(__first, __cur);
-	  __throw_exception_again;
-	}
-    }
-
-  /**
-   *  @brief Copies the value x into the range [first,first+n).
-   *  @param  first  An input iterator.
-   *  @param  n      The number of copies to make.
-   *  @param  x      The source value.
-   *  @return   first+n
-   *
-   *  Like fill_n(), but does not require an initialized output range.
-  */
-  template<typename _ForwardIterator, typename _Size, typename _Tp>
-    inline _ForwardIterator
-    uninitialized_fill_n(_ForwardIterator __first, _Size __n, const _Tp& __x)
-    {
-      typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType;
-      typedef typename __type_traits<_ValueType>::is_POD_type _Is_POD;
-      return std::__uninitialized_fill_n_aux(__first, __n, __x, _Is_POD());
-    }
-
-  // Extensions: __uninitialized_copy_copy, __uninitialized_copy_fill,
-  // __uninitialized_fill_copy.
-
-  // __uninitialized_copy_copy
-  // Copies [first1, last1) into [result, result + (last1 - first1)), and
-  //  copies [first2, last2) into
-  //  [result, result + (last1 - first1) + (last2 - first2)).
-
-  template<typename _InputIterator1, typename _InputIterator2,
-	   typename _ForwardIterator>
-    inline _ForwardIterator
-    __uninitialized_copy_copy(_InputIterator1 __first1,
-			      _InputIterator1 __last1,
-			      _InputIterator2 __first2,
-			      _InputIterator2 __last2,
-			      _ForwardIterator __result)
-    {
-      _ForwardIterator __mid = std::uninitialized_copy(__first1, __last1,
-						       __result);
-      try
-	{
-	  return std::uninitialized_copy(__first2, __last2, __mid);
-	}
-      catch(...)
-	{
-	  std::_Destroy(__result, __mid);
-	  __throw_exception_again;
-	}
-    }
-
-  // __uninitialized_fill_copy
-  // Fills [result, mid) with x, and copies [first, last) into
-  //  [mid, mid + (last - first)).
-  template<typename _ForwardIterator, typename _Tp, typename _InputIterator>
-    inline _ForwardIterator
-    __uninitialized_fill_copy(_ForwardIterator __result, _ForwardIterator __mid,
-			      const _Tp& __x, _InputIterator __first,
-			      _InputIterator __last)
-    {
-      std::uninitialized_fill(__result, __mid, __x);
-      try
-	{
-	  return std::uninitialized_copy(__first, __last, __mid);
-	}
-      catch(...)
-	{
-	  std::_Destroy(__result, __mid);
-	  __throw_exception_again;
-	}
-    }
-
-  // __uninitialized_copy_fill
-  // Copies [first1, last1) into [first2, first2 + (last1 - first1)), and
-  //  fills [first2 + (last1 - first1), last2) with x.
-  template<typename _InputIterator, typename _ForwardIterator, typename _Tp>
-    inline void
-    __uninitialized_copy_fill(_InputIterator __first1, _InputIterator __last1,
-			      _ForwardIterator __first2,
-			      _ForwardIterator __last2, const _Tp& __x)
-    {
-      _ForwardIterator __mid2 = std::uninitialized_copy(__first1, __last1,
-							__first2);
-      try
-	{
-	  std::uninitialized_fill(__mid2, __last2, __x);
-	}
-      catch(...)
-	{
-	  std::_Destroy(__first2, __mid2);
-	  __throw_exception_again;
-	}
-    }
-
-} // namespace std
-
-#endif /* _STL_UNINITIALIZED_H */
diff --git a/include.new/c++/3.4/bits/stl_vector.h b/include.new/c++/3.4/bits/stl_vector.h
deleted file mode 100644
index fee413d..0000000
--- a/include.new/c++/3.4/bits/stl_vector.h
+++ /dev/null
@@ -1,932 +0,0 @@
-// Vector implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this  software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stl_vector.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _VECTOR_H
-#define _VECTOR_H 1
-
-#include <bits/stl_iterator_base_funcs.h>
-#include <bits/functexcept.h>
-#include <bits/concept_check.h>
-
-namespace _GLIBCXX_STD
-{
-  /**
-   *  @if maint
-   *  See bits/stl_deque.h's _Deque_base for an explanation.
-   *  @endif
-  */
-  template<typename _Tp, typename _Alloc>
-    struct _Vector_base
-    {
-      struct _Vector_impl 
-	: public _Alloc {
-	_Tp*           _M_start;
-	_Tp*           _M_finish;
-	_Tp*           _M_end_of_storage;
-	_Vector_impl (_Alloc const& __a)
-	  : _Alloc(__a), _M_start(0), _M_finish(0), _M_end_of_storage(0)
-	{ }
-      };
-      
-    public:
-      typedef _Alloc allocator_type;
-
-      allocator_type
-      get_allocator() const { return *static_cast<const _Alloc*>(&this->_M_impl); }
-
-      _Vector_base(const allocator_type& __a) : _M_impl(__a)
-      { }
-
-      _Vector_base(size_t __n, const allocator_type& __a)
-	: _M_impl(__a)
-      {
-	this->_M_impl._M_start = this->_M_allocate(__n);
-	this->_M_impl._M_finish = this->_M_impl._M_start;
-	this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
-      }
-
-      ~_Vector_base()
-      { _M_deallocate(this->_M_impl._M_start,
-		      this->_M_impl._M_end_of_storage - this->_M_impl._M_start); }
-
-    public:
-      _Vector_impl _M_impl;
-
-      _Tp*
-      _M_allocate(size_t __n) { return _M_impl.allocate(__n); }
-
-      void
-      _M_deallocate(_Tp* __p, size_t __n)
-      { if (__p) _M_impl.deallocate(__p, __n); }
-    };
-
-
-  /**
-   *  @brief A standard container which offers fixed time access to
-   *  individual elements in any order.
-   *
-   *  @ingroup Containers
-   *  @ingroup Sequences
-   *
-   *  Meets the requirements of a <a href="tables.html#65">container</a>, a
-   *  <a href="tables.html#66">reversible container</a>, and a
-   *  <a href="tables.html#67">sequence</a>, including the
-   *  <a href="tables.html#68">optional sequence requirements</a> with the
-   *  %exception of @c push_front and @c pop_front.
-   *
-   *  In some terminology a %vector can be described as a dynamic
-   *  C-style array, it offers fast and efficient access to individual
-   *  elements in any order and saves the user from worrying about
-   *  memory and size allocation.  Subscripting ( @c [] ) access is
-   *  also provided as with C-style arrays.
-  */
-  template<typename _Tp, typename _Alloc = allocator<_Tp> >
-    class vector : protected _Vector_base<_Tp, _Alloc>
-    {
-      // Concept requirements.
-      __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-
-      typedef _Vector_base<_Tp, _Alloc>			_Base;
-      typedef vector<_Tp, _Alloc>			vector_type;
-
-    public:
-      typedef _Tp					 value_type;
-      typedef typename _Alloc::pointer                   pointer;
-      typedef typename _Alloc::const_pointer             const_pointer;
-      typedef typename _Alloc::reference                 reference;
-      typedef typename _Alloc::const_reference           const_reference;
-      typedef __gnu_cxx::__normal_iterator<pointer, vector_type> iterator;
-      typedef __gnu_cxx::__normal_iterator<const_pointer, vector_type>
-      const_iterator;
-      typedef std::reverse_iterator<const_iterator>  const_reverse_iterator;
-      typedef std::reverse_iterator<iterator>		 reverse_iterator;
-      typedef size_t					 size_type;
-      typedef ptrdiff_t					 difference_type;
-      typedef typename _Base::allocator_type		 allocator_type;
-
-    protected:
-      /** @if maint
-       *  These two functions and three data members are all from the
-       *  base class.  They should be pretty self-explanatory, as
-       *  %vector uses a simple contiguous allocation scheme.  @endif
-       */
-      using _Base::_M_allocate;
-      using _Base::_M_deallocate;
-      using _Base::_M_impl;
-
-    public:
-      // [23.2.4.1] construct/copy/destroy
-      // (assign() and get_allocator() are also listed in this section)
-      /**
-       *  @brief  Default constructor creates no elements.
-       */
-      explicit
-      vector(const allocator_type& __a = allocator_type())
-      : _Base(__a) { }
-
-      /**
-       *  @brief  Create a %vector with copies of an exemplar element.
-       *  @param  n  The number of elements to initially create.
-       *  @param  value  An element to copy.
-       *
-       *  This constructor fills the %vector with @a n copies of @a value.
-       */
-      vector(size_type __n, const value_type& __value,
-	     const allocator_type& __a = allocator_type())
-      : _Base(__n, __a)
-      { this->_M_impl._M_finish = std::uninitialized_fill_n(this->_M_impl._M_start,
-						    __n, __value); }
-
-      /**
-       *  @brief  Create a %vector with default elements.
-       *  @param  n  The number of elements to initially create.
-       *
-       *  This constructor fills the %vector with @a n copies of a
-       *  default-constructed element.
-       */
-      explicit
-      vector(size_type __n)
-      : _Base(__n, allocator_type())
-      { this->_M_impl._M_finish = std::uninitialized_fill_n(this->_M_impl._M_start,
-						    __n, value_type()); }
-
-      /**
-       *  @brief  %Vector copy constructor.
-       *  @param  x  A %vector of identical element and allocator types.
-       *
-       *  The newly-created %vector uses a copy of the allocation
-       *  object used by @a x.  All the elements of @a x are copied,
-       *  but any extra memory in
-       *  @a x (for fast expansion) will not be copied.
-       */
-      vector(const vector& __x)
-      : _Base(__x.size(), __x.get_allocator())
-      { this->_M_impl._M_finish = std::uninitialized_copy(__x.begin(), __x.end(),
-						  this->_M_impl._M_start);
-      }
-
-      /**
-       *  @brief  Builds a %vector from a range.
-       *  @param  first  An input iterator.
-       *  @param  last  An input iterator.
-       *
-       *  Create a %vector consisting of copies of the elements from
-       *  [first,last).
-       *
-       *  If the iterators are forward, bidirectional, or
-       *  random-access, then this will call the elements' copy
-       *  constructor N times (where N is distance(first,last)) and do
-       *  no memory reallocation.  But if only input iterators are
-       *  used, then this will do at most 2N calls to the copy
-       *  constructor, and logN memory reallocations.
-       */
-      template<typename _InputIterator>
-        vector(_InputIterator __first, _InputIterator __last,
-	       const allocator_type& __a = allocator_type())
-	: _Base(__a)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-	  _M_initialize_dispatch(__first, __last, _Integral());
-	}
-
-      /**
-       *  The dtor only erases the elements, and note that if the
-       *  elements themselves are pointers, the pointed-to memory is
-       *  not touched in any way.  Managing the pointer is the user's
-       *  responsibilty.
-       */
-      ~vector() { std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish); }
-
-      /**
-       *  @brief  %Vector assignment operator.
-       *  @param  x  A %vector of identical element and allocator types.
-       *
-       *  All the elements of @a x are copied, but any extra memory in
-       *  @a x (for fast expansion) will not be copied.  Unlike the
-       *  copy constructor, the allocator object is not copied.
-       */
-      vector&
-      operator=(const vector& __x);
-
-      /**
-       *  @brief  Assigns a given value to a %vector.
-       *  @param  n  Number of elements to be assigned.
-       *  @param  val  Value to be assigned.
-       *
-       *  This function fills a %vector with @a n copies of the given
-       *  value.  Note that the assignment completely changes the
-       *  %vector and that the resulting %vector's size is the same as
-       *  the number of elements assigned.  Old data may be lost.
-       */
-      void
-      assign(size_type __n, const value_type& __val)
-      { _M_fill_assign(__n, __val); }
-
-      /**
-       *  @brief  Assigns a range to a %vector.
-       *  @param  first  An input iterator.
-       *  @param  last   An input iterator.
-       *
-       *  This function fills a %vector with copies of the elements in the
-       *  range [first,last).
-       *
-       *  Note that the assignment completely changes the %vector and
-       *  that the resulting %vector's size is the same as the number
-       *  of elements assigned.  Old data may be lost.
-       */
-      template<typename _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-	  _M_assign_dispatch(__first, __last, _Integral());
-	}
-
-      /// Get a copy of the memory allocation object.
-      using _Base::get_allocator;
-
-      // iterators
-      /**
-       *  Returns a read/write iterator that points to the first
-       *  element in the %vector.  Iteration is done in ordinary
-       *  element order.
-       */
-      iterator
-      begin() { return iterator (this->_M_impl._M_start); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points to the
-       *  first element in the %vector.  Iteration is done in ordinary
-       *  element order.
-       */
-      const_iterator
-      begin() const { return const_iterator (this->_M_impl._M_start); }
-
-      /**
-       *  Returns a read/write iterator that points one past the last
-       *  element in the %vector.  Iteration is done in ordinary
-       *  element order.
-       */
-      iterator
-      end() { return iterator (this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read-only (constant) iterator that points one past
-       *  the last element in the %vector.  Iteration is done in
-       *  ordinary element order.
-       */
-      const_iterator
-      end() const { return const_iterator (this->_M_impl._M_finish); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to the
-       *  last element in the %vector.  Iteration is done in reverse
-       *  element order.
-       */
-      reverse_iterator
-      rbegin() { return reverse_iterator(end()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to the last element in the %vector.  Iteration is done in
-       *  reverse element order.
-       */
-      const_reverse_iterator
-      rbegin() const { return const_reverse_iterator(end()); }
-
-      /**
-       *  Returns a read/write reverse iterator that points to one
-       *  before the first element in the %vector.  Iteration is done
-       *  in reverse element order.
-       */
-      reverse_iterator
-      rend() { return reverse_iterator(begin()); }
-
-      /**
-       *  Returns a read-only (constant) reverse iterator that points
-       *  to one before the first element in the %vector.  Iteration
-       *  is done in reverse element order.
-       */
-      const_reverse_iterator
-      rend() const { return const_reverse_iterator(begin()); }
-
-      // [23.2.4.2] capacity
-      /**  Returns the number of elements in the %vector.  */
-      size_type
-      size() const { return size_type(end() - begin()); }
-
-      /**  Returns the size() of the largest possible %vector.  */
-      size_type
-      max_size() const { return size_type(-1) / sizeof(value_type); }
-
-      /**
-       *  @brief  Resizes the %vector to the specified number of elements.
-       *  @param  new_size  Number of elements the %vector should contain.
-       *  @param  x  Data with which new elements should be populated.
-       *
-       *  This function will %resize the %vector to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %vector's current size the %vector is truncated, otherwise
-       *  the %vector is extended and new elements are populated with
-       *  given data.
-       */
-      void
-      resize(size_type __new_size, const value_type& __x)
-      {
-	if (__new_size < size())
-	  erase(begin() + __new_size, end());
-	else
-	  insert(end(), __new_size - size(), __x);
-      }
-
-      /**
-       *  @brief  Resizes the %vector to the specified number of elements.
-       *  @param  new_size  Number of elements the %vector should contain.
-       *
-       *  This function will resize the %vector to the specified
-       *  number of elements.  If the number is smaller than the
-       *  %vector's current size the %vector is truncated, otherwise
-       *  the %vector is extended and new elements are
-       *  default-constructed.
-       */
-      void
-      resize(size_type __new_size) { resize(__new_size, value_type()); }
-
-      /**
-       *  Returns the total number of elements that the %vector can
-       *  hold before needing to allocate more memory.
-       */
-      size_type
-      capacity() const
-      { return size_type(const_iterator(this->_M_impl._M_end_of_storage) - begin()); }
-
-      /**
-       *  Returns true if the %vector is empty.  (Thus begin() would
-       *  equal end().)
-       */
-      bool
-      empty() const { return begin() == end(); }
-
-      /**
-       *  @brief  Attempt to preallocate enough memory for specified number of
-       *          elements.
-       *  @param  n  Number of elements required.
-       *  @throw  std::length_error  If @a n exceeds @c max_size().
-       *
-       *  This function attempts to reserve enough memory for the
-       *  %vector to hold the specified number of elements.  If the
-       *  number requested is more than max_size(), length_error is
-       *  thrown.
-       *
-       *  The advantage of this function is that if optimal code is a
-       *  necessity and the user can determine the number of elements
-       *  that will be required, the user can reserve the memory in
-       *  %advance, and thus prevent a possible reallocation of memory
-       *  and copying of %vector data.
-       */
-      void
-      reserve(size_type __n);
-
-      // element access
-      /**
-       *  @brief  Subscript access to the data contained in the %vector.
-       *  @param n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read/write reference to data.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      reference
-      operator[](size_type __n) { return *(begin() + __n); }
-
-      /**
-       *  @brief  Subscript access to the data contained in the %vector.
-       *  @param n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read-only (constant) reference to data.
-       *
-       *  This operator allows for easy, array-style, data access.
-       *  Note that data access with this operator is unchecked and
-       *  out_of_range lookups are not defined. (For checked lookups
-       *  see at().)
-       */
-      const_reference
-      operator[](size_type __n) const { return *(begin() + __n); }
-
-    protected:
-      /// @if maint Safety check used only from at().  @endif
-      void
-      _M_range_check(size_type __n) const
-      {
-	if (__n >= this->size())
-	  __throw_out_of_range(__N("vector::_M_range_check"));
-      }
-
-    public:
-      /**
-       *  @brief  Provides access to the data contained in the %vector.
-       *  @param n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read/write reference to data.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter
-       *  is first checked that it is in the range of the vector.  The
-       *  function throws out_of_range if the check fails.
-       */
-      reference
-      at(size_type __n) { _M_range_check(__n); return (*this)[__n]; }
-
-      /**
-       *  @brief  Provides access to the data contained in the %vector.
-       *  @param n The index of the element for which data should be
-       *  accessed.
-       *  @return  Read-only (constant) reference to data.
-       *  @throw  std::out_of_range  If @a n is an invalid index.
-       *
-       *  This function provides for safer data access.  The parameter
-       *  is first checked that it is in the range of the vector.  The
-       *  function throws out_of_range if the check fails.
-       */
-      const_reference
-      at(size_type __n) const { _M_range_check(__n); return (*this)[__n]; }
-
-      /**
-       *  Returns a read/write reference to the data at the first
-       *  element of the %vector.
-       */
-      reference
-      front() { return *begin(); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the first
-       *  element of the %vector.
-       */
-      const_reference
-      front() const { return *begin(); }
-
-      /**
-       *  Returns a read/write reference to the data at the last
-       *  element of the %vector.
-       */
-      reference
-      back() { return *(end() - 1); }
-
-      /**
-       *  Returns a read-only (constant) reference to the data at the
-       *  last element of the %vector.
-       */
-      const_reference
-      back() const { return *(end() - 1); }
-
-      // [23.2.4.3] modifiers
-      /**
-       *  @brief  Add data to the end of the %vector.
-       *  @param  x  Data to be added.
-       *
-       *  This is a typical stack operation.  The function creates an
-       *  element at the end of the %vector and assigns the given data
-       *  to it.  Due to the nature of a %vector this operation can be
-       *  done in constant time if the %vector has preallocated space
-       *  available.
-       */
-      void
-      push_back(const value_type& __x)
-      {
-	if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
-	  {
-	    std::_Construct(this->_M_impl._M_finish, __x);
-	    ++this->_M_impl._M_finish;
-	  }
-	else
-	  _M_insert_aux(end(), __x);
-      }
-
-      /**
-       *  @brief  Removes last element.
-       *
-       *  This is a typical stack operation. It shrinks the %vector by one.
-       *
-       *  Note that no data is returned, and if the last element's
-       *  data is needed, it should be retrieved before pop_back() is
-       *  called.
-       */
-      void
-      pop_back()
-      {
-	--this->_M_impl._M_finish;
-	std::_Destroy(this->_M_impl._M_finish);
-      }
-
-      /**
-       *  @brief  Inserts given value into %vector before specified iterator.
-       *  @param  position  An iterator into the %vector.
-       *  @param  x  Data to be inserted.
-       *  @return  An iterator that points to the inserted data.
-       *
-       *  This function will insert a copy of the given value before
-       *  the specified location.  Note that this kind of operation
-       *  could be expensive for a %vector and if it is frequently
-       *  used the user should consider using std::list.
-       */
-      iterator
-      insert(iterator __position, const value_type& __x);
-
-      /**
-       *  @brief  Inserts a number of copies of given data into the %vector.
-       *  @param  position  An iterator into the %vector.
-       *  @param  n  Number of elements to be inserted.
-       *  @param  x  Data to be inserted.
-       *
-       *  This function will insert a specified number of copies of
-       *  the given data before the location specified by @a position.
-       *
-       *  Note that this kind of operation could be expensive for a
-       *  %vector and if it is frequently used the user should
-       *  consider using std::list.
-       */
-      void
-      insert(iterator __position, size_type __n, const value_type& __x)
-      { _M_fill_insert(__position, __n, __x); }
-
-      /**
-       *  @brief  Inserts a range into the %vector.
-       *  @param  position  An iterator into the %vector.
-       *  @param  first  An input iterator.
-       *  @param  last   An input iterator.
-       *
-       *  This function will insert copies of the data in the range
-       *  [first,last) into the %vector before the location specified
-       *  by @a pos.
-       *
-       *  Note that this kind of operation could be expensive for a
-       *  %vector and if it is frequently used the user should
-       *  consider using std::list.
-       */
-      template<typename _InputIterator>
-        void
-        insert(iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-        {
-	  // Check whether it's an integral type.  If so, it's not an iterator.
-	  typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-	  _M_insert_dispatch(__position, __first, __last, _Integral());
-	}
-
-      /**
-       *  @brief  Remove element at given position.
-       *  @param  position  Iterator pointing to element to be erased.
-       *  @return  An iterator pointing to the next element (or end()).
-       *
-       *  This function will erase the element at the given position and thus
-       *  shorten the %vector by one.
-       *
-       *  Note This operation could be expensive and if it is
-       *  frequently used the user should consider using std::list.
-       *  The user is also cautioned that this function only erases
-       *  the element, and that if the element is itself a pointer,
-       *  the pointed-to memory is not touched in any way.  Managing
-       *  the pointer is the user's responsibilty.
-       */
-      iterator
-      erase(iterator __position);
-
-      /**
-       *  @brief  Remove a range of elements.
-       *  @param  first  Iterator pointing to the first element to be erased.
-       *  @param  last  Iterator pointing to one past the last element to be
-       *                erased.
-       *  @return  An iterator pointing to the element pointed to by @a last
-       *           prior to erasing (or end()).
-       *
-       *  This function will erase the elements in the range [first,last) and
-       *  shorten the %vector accordingly.
-       *
-       *  Note This operation could be expensive and if it is
-       *  frequently used the user should consider using std::list.
-       *  The user is also cautioned that this function only erases
-       *  the elements, and that if the elements themselves are
-       *  pointers, the pointed-to memory is not touched in any way.
-       *  Managing the pointer is the user's responsibilty.
-       */
-      iterator
-      erase(iterator __first, iterator __last);
-
-      /**
-       *  @brief  Swaps data with another %vector.
-       *  @param  x  A %vector of the same element and allocator types.
-       *
-       *  This exchanges the elements between two vectors in constant time.
-       *  (Three pointers, so it should be quite fast.)
-       *  Note that the global std::swap() function is specialized such that
-       *  std::swap(v1,v2) will feed to this function.
-       */
-      void
-      swap(vector& __x)
-      {
-	std::swap(this->_M_impl._M_start, __x._M_impl._M_start);
-	std::swap(this->_M_impl._M_finish, __x._M_impl._M_finish);
-	std::swap(this->_M_impl._M_end_of_storage, __x._M_impl._M_end_of_storage);
-      }
-
-      /**
-       *  Erases all the elements.  Note that this function only erases the
-       *  elements, and that if the elements themselves are pointers, the
-       *  pointed-to memory is not touched in any way.  Managing the pointer is
-       *  the user's responsibilty.
-       */
-      void
-      clear() { erase(begin(), end()); }
-
-    protected:
-      /**
-       *  @if maint
-       *  Memory expansion handler.  Uses the member allocation function to
-       *  obtain @a n bytes of memory, and then copies [first,last) into it.
-       *  @endif
-       */
-      template<typename _ForwardIterator>
-        pointer
-        _M_allocate_and_copy(size_type __n,
-			     _ForwardIterator __first, _ForwardIterator __last)
-        {
-	  pointer __result = this->_M_allocate(__n);
-	  try
-	    {
-	      std::uninitialized_copy(__first, __last, __result);
-	      return __result;
-	    }
-	  catch(...)
-	    {
-	      _M_deallocate(__result, __n);
-	      __throw_exception_again;
-	    }
-	}
-
-
-      // Internal constructor functions follow.
-
-      // Called by the range constructor to implement [23.1.1]/9
-      template<typename _Integer>
-        void
-        _M_initialize_dispatch(_Integer __n, _Integer __value, __true_type)
-        {
-	  this->_M_impl._M_start = _M_allocate(__n);
-	  this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
-	  this->_M_impl._M_finish = std::uninitialized_fill_n(this->_M_impl._M_start,
-						      __n, __value);
-	}
-
-      // Called by the range constructor to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_initialize_dispatch(_InputIterator __first, _InputIterator __last,
-			       __false_type)
-        {
-	  typedef typename iterator_traits<_InputIterator>::iterator_category
-	    _IterCategory;
-	  _M_range_initialize(__first, __last, _IterCategory());
-	}
-
-      // Called by the second initialize_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_range_initialize(_InputIterator __first,
-			    _InputIterator __last, input_iterator_tag)
-        {
-	  for ( ; __first != __last; ++__first)
-	    push_back(*__first);
-	}
-
-      // Called by the second initialize_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_range_initialize(_ForwardIterator __first,
-			    _ForwardIterator __last, forward_iterator_tag)
-        {
-	  size_type __n = std::distance(__first, __last);
-	  this->_M_impl._M_start = this->_M_allocate(__n);
-	  this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
-	  this->_M_impl._M_finish = std::uninitialized_copy(__first, __last,
-						    this->_M_impl._M_start);
-	}
-
-
-      // Internal assign functions follow.  The *_aux functions do the actual
-      // assignment work for the range versions.
-
-      // Called by the range assign to implement [23.1.1]/9
-      template<typename _Integer>
-        void
-        _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-        {
-	  _M_fill_assign(static_cast<size_type>(__n),
-			 static_cast<value_type>(__val));
-	}
-
-      // Called by the range assign to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-			   __false_type)
-        {
-	  typedef typename iterator_traits<_InputIterator>::iterator_category
-	    _IterCategory;
-	  _M_assign_aux(__first, __last, _IterCategory());
-	}
-
-      // Called by the second assign_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_assign_aux(_InputIterator __first, _InputIterator __last,
-		      input_iterator_tag);
-
-      // Called by the second assign_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
-		      forward_iterator_tag);
-
-      // Called by assign(n,t), and the range assign when it turns out
-      // to be the same thing.
-      void
-      _M_fill_assign(size_type __n, const value_type& __val);
-
-
-      // Internal insert functions follow.
-
-      // Called by the range insert to implement [23.1.1]/9
-      template<typename _Integer>
-        void
-        _M_insert_dispatch(iterator __pos, _Integer __n, _Integer __val,
-			   __true_type)
-        {
-	  _M_fill_insert(__pos, static_cast<size_type>(__n),
-			 static_cast<value_type>(__val));
-	}
-
-      // Called by the range insert to implement [23.1.1]/9
-      template<typename _InputIterator>
-        void
-        _M_insert_dispatch(iterator __pos, _InputIterator __first,
-			   _InputIterator __last, __false_type)
-        {
-	  typedef typename iterator_traits<_InputIterator>::iterator_category
-	    _IterCategory;
-	  _M_range_insert(__pos, __first, __last, _IterCategory());
-	}
-
-      // Called by the second insert_dispatch above
-      template<typename _InputIterator>
-        void
-        _M_range_insert(iterator __pos, _InputIterator __first,
-			_InputIterator __last, input_iterator_tag);
-
-      // Called by the second insert_dispatch above
-      template<typename _ForwardIterator>
-        void
-        _M_range_insert(iterator __pos, _ForwardIterator __first,
-			_ForwardIterator __last, forward_iterator_tag);
-
-      // Called by insert(p,n,x), and the range insert when it turns out to be
-      // the same thing.
-      void
-      _M_fill_insert(iterator __pos, size_type __n, const value_type& __x);
-
-      // Called by insert(p,x)
-      void
-      _M_insert_aux(iterator __position, const value_type& __x);
-    };
-
-
-  /**
-   *  @brief  Vector equality comparison.
-   *  @param  x  A %vector.
-   *  @param  y  A %vector of the same type as @a x.
-   *  @return  True iff the size and elements of the vectors are equal.
-   *
-   *  This is an equivalence relation.  It is linear in the size of the
-   *  vectors.  Vectors are considered equivalent if their sizes are equal,
-   *  and if corresponding elements compare equal.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const vector<_Tp,_Alloc>& __x, const vector<_Tp,_Alloc>& __y)
-    {
-      return __x.size() == __y.size() &&
-             std::equal(__x.begin(), __x.end(), __y.begin());
-    }
-
-  /**
-   *  @brief  Vector ordering relation.
-   *  @param  x  A %vector.
-   *  @param  y  A %vector of the same type as @a x.
-   *  @return  True iff @a x is lexicographically less than @a y.
-   *
-   *  This is a total ordering relation.  It is linear in the size of the
-   *  vectors.  The elements must be comparable with @c <.
-   *
-   *  See std::lexicographical_compare() for how the determination is made.
-  */
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const vector<_Tp,_Alloc>& __x, const vector<_Tp,_Alloc>& __y)
-    {
-      return std::lexicographical_compare(__x.begin(), __x.end(),
-					  __y.begin(), __y.end());
-    }
-
-  /// Based on operator==
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const vector<_Tp,_Alloc>& __x, const vector<_Tp,_Alloc>& __y)
-    { return !(__x == __y); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const vector<_Tp,_Alloc>& __x, const vector<_Tp,_Alloc>& __y)
-    { return __y < __x; }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const vector<_Tp,_Alloc>& __x, const vector<_Tp,_Alloc>& __y)
-    { return !(__y < __x); }
-
-  /// Based on operator<
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const vector<_Tp,_Alloc>& __x, const vector<_Tp,_Alloc>& __y)
-    { return !(__x < __y); }
-
-  /// See std::vector::swap().
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(vector<_Tp,_Alloc>& __x, vector<_Tp,_Alloc>& __y)
-    { __x.swap(__y); }
-} // namespace std
-
-#endif /* _VECTOR_H */
diff --git a/include.new/c++/3.4/bits/stream_iterator.h b/include.new/c++/3.4/bits/stream_iterator.h
deleted file mode 100644
index fa11bd6..0000000
--- a/include.new/c++/3.4/bits/stream_iterator.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// Stream iterators
-
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file stream_iterator.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STREAM_ITERATOR_H
-#define _STREAM_ITERATOR_H 1
-
-#pragma GCC system_header
-
-#include <debug/debug.h>
-
-namespace std
-{
-  /// Provides input iterator semantics for streams.
-  template<typename _Tp, typename _CharT = char,
-           typename _Traits = char_traits<_CharT>, typename _Dist = ptrdiff_t>
-    class istream_iterator
-    : public iterator<input_iterator_tag, _Tp, _Dist, const _Tp*, const _Tp&>
-    {
-    public:
-      typedef _CharT                         char_type;
-      typedef _Traits                        traits_type;
-      typedef basic_istream<_CharT, _Traits> istream_type;
-
-    private:
-      istream_type*	_M_stream;
-      _Tp		_M_value;
-      bool		_M_ok;
-
-    public:
-      ///  Construct end of input stream iterator.
-      istream_iterator()
-      : _M_stream(0), _M_ok(false) {}
-
-      ///  Construct start of input stream iterator.
-      istream_iterator(istream_type& __s)
-      : _M_stream(&__s)
-      { _M_read(); }
-
-      istream_iterator(const istream_iterator& __obj)
-      : _M_stream(__obj._M_stream), _M_value(__obj._M_value),
-        _M_ok(__obj._M_ok)
-      { }
-
-      const _Tp&
-      operator*() const
-      {
-	__glibcxx_requires_cond(_M_ok,
-				_M_message(__gnu_debug::__msg_deref_istream)
-				._M_iterator(*this));
-	return _M_value;
-      }
-
-      const _Tp*
-      operator->() const { return &(operator*()); }
-
-      istream_iterator&
-      operator++()
-      {
-	__glibcxx_requires_cond(_M_ok,
-				_M_message(__gnu_debug::__msg_inc_istream)
-				._M_iterator(*this));
-	_M_read();
-	return *this;
-      }
-
-      istream_iterator
-      operator++(int)
-      {
-	__glibcxx_requires_cond(_M_ok,
-				_M_message(__gnu_debug::__msg_inc_istream)
-				._M_iterator(*this));
-	istream_iterator __tmp = *this;
-	_M_read();
-	return __tmp;
-      }
-
-      bool
-      _M_equal(const istream_iterator& __x) const
-      { return (_M_ok == __x._M_ok) && (!_M_ok || _M_stream == __x._M_stream); }
-
-    private:
-      void
-      _M_read()
-      {
-	_M_ok = (_M_stream && *_M_stream) ? true : false;
-	if (_M_ok)
-	  {
-	    *_M_stream >> _M_value;
-	    _M_ok = *_M_stream ? true : false;
-	  }
-      }
-    };
-
-  ///  Return true if x and y are both end or not end, or x and y are the same.
-  template<typename _Tp, typename _CharT, typename _Traits, typename _Dist>
-    inline bool
-    operator==(const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __x,
-	       const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __y)
-    { return __x._M_equal(__y); }
-
-  ///  Return false if x and y are both end or not end, or x and y are the same.
-  template <class _Tp, class _CharT, class _Traits, class _Dist>
-    inline bool
-    operator!=(const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __x,
-	       const istream_iterator<_Tp, _CharT, _Traits, _Dist>& __y)
-    { return !__x._M_equal(__y); }
-
-  /**
-   *  @brief  Provides output iterator semantics for streams.
-   *
-   *  This class provides an iterator to write to an ostream.  The type Tp is
-   *  the only type written by this iterator and there must be an
-   *  operator<<(Tp) defined.
-   *
-   *  @param  Tp  The type to write to the ostream.
-   *  @param  CharT  The ostream char_type.
-   *  @param  Traits  The ostream char_traits.
-  */
-  template<typename _Tp, typename _CharT = char,
-           typename _Traits = char_traits<_CharT> >
-    class ostream_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    public:
-      //@{
-      /// Public typedef
-      typedef _CharT                         char_type;
-      typedef _Traits                        traits_type;
-      typedef basic_ostream<_CharT, _Traits> ostream_type;
-      //@}
-
-    private:
-      ostream_type*	_M_stream;
-      const _CharT*	_M_string;
-
-    public:
-      /// Construct from an ostream.
-      ostream_iterator(ostream_type& __s) : _M_stream(&__s), _M_string(0) {}
-
-      /**
-       *  Construct from an ostream.
-       *
-       *  The delimiter string @a c is written to the stream after every Tp
-       *  written to the stream.  The delimiter is not copied, and thus must
-       *  not be destroyed while this iterator is in use.
-       *
-       *  @param  s  Underlying ostream to write to.
-       *  @param  c  CharT delimiter string to insert.
-      */
-      ostream_iterator(ostream_type& __s, const _CharT* __c)
-      : _M_stream(&__s), _M_string(__c)  { }
-
-      /// Copy constructor.
-      ostream_iterator(const ostream_iterator& __obj)
-      : _M_stream(__obj._M_stream), _M_string(__obj._M_string)  { }
-
-      /// Writes @a value to underlying ostream using operator<<.  If
-      /// constructed with delimiter string, writes delimiter to ostream.
-      ostream_iterator&
-      operator=(const _Tp& __value)
-      {
-	__glibcxx_requires_cond(_M_stream != 0,
-				_M_message(__gnu_debug::__msg_output_ostream)
-				._M_iterator(*this));
-	*_M_stream << __value;
-	if (_M_string) *_M_stream << _M_string;
-	return *this;
-      }
-
-      ostream_iterator&
-      operator*()
-      { return *this; }
-
-      ostream_iterator&
-      operator++()
-      { return *this; }
-
-      ostream_iterator&
-      operator++(int)
-      { return *this; }
-    };
-} // namespace std
-#endif
diff --git a/include.new/c++/3.4/bits/streambuf.tcc b/include.new/c++/3.4/bits/streambuf.tcc
deleted file mode 100644
index 554d061..0000000
--- a/include.new/c++/3.4/bits/streambuf.tcc
+++ /dev/null
@@ -1,163 +0,0 @@
-// Stream buffer classes -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.5  Stream buffers
-//
-
-#ifndef _STREAMBUF_TCC
-#define _STREAMBUF_TCC 1
-
-#pragma GCC system_header
-
-namespace std
-{
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_streambuf<_CharT, _Traits>::
-    xsgetn(char_type* __s, streamsize __n)
-    {
-      streamsize __ret = 0;
-      while (__ret < __n)
-	{
-	  const size_t __buf_len = this->egptr() - this->gptr();
-	  if (__buf_len)
-	    {
-	      const size_t __remaining = __n - __ret;
-	      const size_t __len = std::min(__buf_len, __remaining);
-	      traits_type::copy(__s, this->gptr(), __len);
-	      __ret += __len;
-	      __s += __len;
-	      this->gbump(__len);
-	    }
-
-	  if (__ret < __n)
-	    {
-	      const int_type __c = this->uflow();
-	      if (!traits_type::eq_int_type(__c, traits_type::eof()))
-		{
-		  traits_type::assign(*__s++, traits_type::to_char_type(__c));
-		  ++__ret;
-		}
-	      else
-		break;
-	    }
-	}
-      return __ret;
-    }
-
-  template<typename _CharT, typename _Traits>
-    streamsize
-    basic_streambuf<_CharT, _Traits>::
-    xsputn(const char_type* __s, streamsize __n)
-    {
-      streamsize __ret = 0;
-      while (__ret < __n)
-	{
-	  const size_t __buf_len = this->epptr() - this->pptr();
-	  if (__buf_len)
-	    {
-	      const size_t __remaining = __n - __ret;
-	      const size_t __len = std::min(__buf_len, __remaining);
-	      traits_type::copy(this->pptr(), __s, __len);
-	      __ret += __len;
-	      __s += __len;
-	      this->pbump(__len);
-	    }
-
-	  if (__ret < __n)
-	    {
-	      int_type __c = this->overflow(traits_type::to_int_type(*__s));
-	      if (!traits_type::eq_int_type(__c, traits_type::eof()))
-		{
-		  ++__ret;
-		  ++__s;
-		}
-	      else
-		break;
-	    }
-	}
-      return __ret;
-    }
-
-  // Conceivably, this could be used to implement buffer-to-buffer
-  // copies, if this was ever desired in an un-ambiguous way by the
-  // standard. If so, then checks for __ios being zero would be
-  // necessary.
-  template<typename _CharT, typename _Traits>
-    streamsize
-    __copy_streambufs(basic_streambuf<_CharT, _Traits>* __sbin,
-		      basic_streambuf<_CharT, _Traits>* __sbout)
-    {
-      streamsize __ret = 0;
-      typename _Traits::int_type __c = __sbin->sgetc();
-      while (!_Traits::eq_int_type(__c, _Traits::eof()))
-	{
-	  const size_t __n = __sbin->egptr() - __sbin->gptr();
-	  if (__n > 1)
-	    {
-	      const size_t __wrote = __sbout->sputn(__sbin->gptr(), __n);
-	      __sbin->gbump(__wrote);
-	      __ret += __wrote;
-	      if (__wrote < __n)
-		break;
-	      __c = __sbin->underflow();
-	    }
-	  else
-	    {
-	      __c = __sbout->sputc(_Traits::to_char_type(__c));
-	      if (_Traits::eq_int_type(__c, _Traits::eof()))
-		break;
-	      ++__ret;
-	      __c = __sbin->snextc();
-	    }
-	}
-      return __ret;
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.
-  // NB:  This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class basic_streambuf<char>;
-  extern template
-    streamsize
-    __copy_streambufs(basic_streambuf<char>*, basic_streambuf<char>*);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class basic_streambuf<wchar_t>;
-  extern template
-    streamsize
-    __copy_streambufs(basic_streambuf<wchar_t>*, basic_streambuf<wchar_t>*);
-#endif
-#endif
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/bits/streambuf_iterator.h b/include.new/c++/3.4/bits/streambuf_iterator.h
deleted file mode 100644
index 9709335..0000000
--- a/include.new/c++/3.4/bits/streambuf_iterator.h
+++ /dev/null
@@ -1,258 +0,0 @@
-// Streambuf iterators
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file streambuf_iterator.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STREAMBUF_ITERATOR_H
-#define _STREAMBUF_ITERATOR_H 1
-
-#pragma GCC system_header
-
-#include <streambuf>
-#include <debug/debug.h>
-
-// NB: Should specialize copy, find algorithms for streambuf iterators.
-
-namespace std
-{
-  // 24.5.3 Template class istreambuf_iterator
-  /// Provides input iterator semantics for streambufs.
-  template<typename _CharT, typename _Traits>
-    class istreambuf_iterator
-    : public iterator<input_iterator_tag, _CharT, typename _Traits::off_type,
-		      _CharT*, _CharT&>
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT					char_type;
-      typedef _Traits					traits_type;
-      typedef typename _Traits::int_type		int_type;
-      typedef basic_streambuf<_CharT, _Traits>		streambuf_type;
-      typedef basic_istream<_CharT, _Traits>		istream_type;
-      //@}
-
-    private:
-      // 24.5.3 istreambuf_iterator
-      // p 1
-      // If the end of stream is reached (streambuf_type::sgetc()
-      // returns traits_type::eof()), the iterator becomes equal to
-      // the "end of stream" iterator value.
-      // NB: This implementation assumes the "end of stream" value
-      // is EOF, or -1.
-      mutable streambuf_type*	_M_sbuf;
-      int_type			_M_c;
-
-    public:
-      ///  Construct end of input stream iterator.
-      istreambuf_iterator() throw()
-      : _M_sbuf(0), _M_c(traits_type::eof()) { }
-
-      ///  Construct start of input stream iterator.
-      istreambuf_iterator(istream_type& __s) throw()
-      : _M_sbuf(__s.rdbuf()), _M_c(traits_type::eof()) { }
-
-      ///  Construct start of streambuf iterator.
-      istreambuf_iterator(streambuf_type* __s) throw()
-      : _M_sbuf(__s), _M_c(traits_type::eof()) { }
-
-      ///  Return the current character pointed to by iterator.  This returns
-      ///  streambuf.sgetc().  It cannot be assigned.  NB: The result of
-      ///  operator*() on an end of stream is undefined.
-      char_type
-      operator*() const
-      {
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-	// Dereferencing a past-the-end istreambuf_iterator is a
-	// libstdc++ extension
-	__glibcxx_requires_cond(!_M_at_eof(),
-				_M_message(__gnu_debug::__msg_deref_istreambuf)
-				._M_iterator(*this));
-#endif
-	return traits_type::to_char_type(_M_get());
-      }
-
-      /// Advance the iterator.  Calls streambuf.sbumpc().
-      istreambuf_iterator&
-      operator++()
-      {
-	__glibcxx_requires_cond(!_M_at_eof(),
-				_M_message(__gnu_debug::__msg_inc_istreambuf)
-				._M_iterator(*this));
-	const int_type __eof = traits_type::eof();
-	if (_M_sbuf && traits_type::eq_int_type(_M_sbuf->sbumpc(), __eof))
-	  _M_sbuf = 0;
-	else
-	  _M_c = __eof;
-	return *this;
-      }
-
-      /// Advance the iterator.  Calls streambuf.sbumpc().
-      istreambuf_iterator
-      operator++(int)
-      {
-	__glibcxx_requires_cond(!_M_at_eof(),
-				_M_message(__gnu_debug::__msg_inc_istreambuf)
-				._M_iterator(*this));
-
-	const int_type __eof = traits_type::eof();
-	istreambuf_iterator __old = *this;
-	if (_M_sbuf
-	    && traits_type::eq_int_type((__old._M_c = _M_sbuf->sbumpc()),
-					__eof))
-	  _M_sbuf = 0;
-	else
-	  _M_c = __eof;
-	return __old;
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 110 istreambuf_iterator::equal not const
-      // NB: there is also number 111 (NAD, Future) pending on this function.
-      /// Return true both iterators are end or both are not end.
-      bool
-      equal(const istreambuf_iterator& __b) const
-      {
-	const bool __thiseof = _M_at_eof();
-	const bool __beof = __b._M_at_eof();
-	return (__thiseof && __beof || (!__thiseof && !__beof));
-      }
-
-    private:
-      int_type
-      _M_get() const
-      {
-	const int_type __eof = traits_type::eof();
-	int_type __ret = __eof;
-	if (_M_sbuf)
-	  {
-	    if (!traits_type::eq_int_type(_M_c, __eof))
-	      __ret = _M_c;
-	    else if (traits_type::eq_int_type((__ret = _M_sbuf->sgetc()),
-					      __eof))
-	      _M_sbuf = 0;
-	  }
-	return __ret;
-      }
-
-      bool
-      _M_at_eof() const
-      {
-	const int_type __eof = traits_type::eof();
-	return traits_type::eq_int_type(_M_get(), __eof);
-      }
-    };
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator==(const istreambuf_iterator<_CharT, _Traits>& __a,
-	       const istreambuf_iterator<_CharT, _Traits>& __b)
-    { return __a.equal(__b); }
-
-  template<typename _CharT, typename _Traits>
-    inline bool
-    operator!=(const istreambuf_iterator<_CharT, _Traits>& __a,
-	       const istreambuf_iterator<_CharT, _Traits>& __b)
-    { return !__a.equal(__b); }
-
-  /// Provides output iterator semantics for streambufs.
-  template<typename _CharT, typename _Traits>
-    class ostreambuf_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-    {
-    public:
-      // Types:
-      //@{
-      /// Public typedefs
-      typedef _CharT                           char_type;
-      typedef _Traits                          traits_type;
-      typedef basic_streambuf<_CharT, _Traits> streambuf_type;
-      typedef basic_ostream<_CharT, _Traits>   ostream_type;
-      //@}
-
-    private:
-      streambuf_type*	_M_sbuf;
-      bool		_M_failed;
-
-    public:
-      ///  Construct output iterator from ostream.
-      ostreambuf_iterator(ostream_type& __s) throw ()
-      : _M_sbuf(__s.rdbuf()), _M_failed(!_M_sbuf) { }
-
-      ///  Construct output iterator from streambuf.
-      ostreambuf_iterator(streambuf_type* __s) throw ()
-      : _M_sbuf(__s), _M_failed(!_M_sbuf) { }
-
-      ///  Write character to streambuf.  Calls streambuf.sputc().
-      ostreambuf_iterator&
-      operator=(_CharT __c)
-      {
-	if (!_M_failed &&
-	    _Traits::eq_int_type(_M_sbuf->sputc(__c), _Traits::eof()))
-	  _M_failed = true;
-	return *this;
-      }
-
-      /// Return *this.
-      ostreambuf_iterator&
-      operator*()
-      { return *this; }
-
-      /// Return *this.
-      ostreambuf_iterator&
-      operator++(int)
-      { return *this; }
-
-      /// Return *this.
-      ostreambuf_iterator&
-      operator++()
-      { return *this; }
-
-      /// Return true if previous operator=() failed.
-      bool
-      failed() const throw()
-      { return _M_failed; }
-
-      ostreambuf_iterator&
-      _M_put(const _CharT* __ws, streamsize __len)
-      {
-	if (__builtin_expect(!_M_failed, true)
-	    && __builtin_expect(this->_M_sbuf->sputn(__ws, __len) != __len,
-				false))
-	  _M_failed = true;
-	return *this;
-      }
-    };
-} // namespace std
-#endif
diff --git a/include.new/c++/3.4/bits/stringfwd.h b/include.new/c++/3.4/bits/stringfwd.h
deleted file mode 100644
index 99d3ce3..0000000
--- a/include.new/c++/3.4/bits/stringfwd.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// String support -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 21 Strings library
-//
-
-/** @file stringfwd.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _STRINGFWD_H
-#define _STRINGFWD_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-namespace std
-{
-  template<typename _Alloc>
-    class allocator;
-
-  template<class _CharT>
-    struct char_traits;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-           typename _Alloc = allocator<_CharT> >
-    class basic_string;
-
-  template<> struct char_traits<char>;
-
-  typedef basic_string<char>    string;
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<> struct char_traits<wchar_t>;
-
-  typedef basic_string<wchar_t> wstring;
-#endif
-} // namespace std
-
-#endif	// _STRINGFWD_H
diff --git a/include.new/c++/3.4/bits/time_members.h b/include.new/c++/3.4/bits/time_members.h
deleted file mode 100644
index 9801300..0000000
--- a/include.new/c++/3.4/bits/time_members.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// std::time_get, std::time_put implementation, generic version -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.2.5.1.2 - time_get functions
-// ISO C++ 14882: 22.2.5.3.2 - time_put functions
-//
-
-// Written by Benjamin Kosnik <bkoz@redhat.com>
-
-  template<typename _CharT>
-    __timepunct<_CharT>::__timepunct(size_t __refs) 
-    : facet(__refs), _M_data(NULL)
-    { 
-      _M_name_timepunct = _S_get_c_name();
-      _M_initialize_timepunct(); 
-    }
-
-  template<typename _CharT>
-    __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) 
-    : facet(__refs), _M_data(__cache)
-    { 
-      _M_name_timepunct = _S_get_c_name();
-      _M_initialize_timepunct(); 
-    }
-
-  template<typename _CharT>
-    __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, 
-				     size_t __refs) 
-    : facet(__refs), _M_data(NULL)
-    { 
-      char* __tmp = new char[std::strlen(__s) + 1];
-      std::strcpy(__tmp, __s);
-      _M_name_timepunct = __tmp;
-      _M_initialize_timepunct(__cloc); 
-    }
-
-  template<typename _CharT>
-    __timepunct<_CharT>::~__timepunct()
-    { 
-      if (_M_name_timepunct != _S_get_c_name())
-	delete [] _M_name_timepunct;
-      delete _M_data;
-      _S_destroy_c_locale(_M_c_locale_timepunct); 
-    }
diff --git a/include.new/c++/3.4/bits/type_traits.h b/include.new/c++/3.4/bits/type_traits.h
deleted file mode 100644
index 9b91e5c..0000000
--- a/include.new/c++/3.4/bits/type_traits.h
+++ /dev/null
@@ -1,405 +0,0 @@
-// Type traits implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file type_traits.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _TYPE_TRAITS_H
-#define _TYPE_TRAITS_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-/*
-This header file provides a framework for allowing compile time dispatch
-based on type attributes. This is useful when writing template code.
-For example, when making a copy of an array of an unknown type, it helps
-to know if the type has a trivial copy constructor or not, to help decide
-if a memcpy can be used.
-
-The class template __type_traits provides a series of typedefs each of
-which is either __true_type or __false_type. The argument to
-__type_traits can be any type. The typedefs within this template will
-attain their correct values by one of these means:
-    1. The general instantiation contain conservative values which work
-       for all types.
-    2. Specializations may be declared to make distinctions between types.
-    3. Some compilers (such as the Silicon Graphics N32 and N64 compilers)
-       will automatically provide the appropriate specializations for all
-       types.
-
-EXAMPLE:
-
-//Copy an array of elements which have non-trivial copy constructors
-template <class _Tp> void
-  copy(_Tp* __source,_Tp* __destination,int __n,__false_type);
-//Copy an array of elements which have trivial copy constructors. Use memcpy.
-template <class _Tp> void
-  copy(_Tp* __source,_Tp* __destination,int __n,__true_type);
-
-//Copy an array of any type by using the most efficient copy mechanism
-template <class _Tp> inline void copy(_Tp* __source,_Tp* __destination,int __n) {
-   copy(__source,__destination,__n,
-        typename __type_traits<_Tp>::has_trivial_copy_constructor());
-}
-*/
-
-struct __true_type {};
-struct __false_type {};
-
-template <class _Tp>
-  struct __type_traits
-  {
-    typedef __true_type     this_dummy_member_must_be_first;
-    /* Do not remove this member. It informs a compiler which
-       automatically specializes __type_traits that this
-       __type_traits template is special. It just makes sure that
-       things work if an implementation is using a template
-       called __type_traits for something unrelated. */
-
-   /* The following restrictions should be observed for the sake of
-      compilers which automatically produce type specific specializations
-      of this class:
-          - You may reorder the members below if you wish
-          - You may remove any of the members below if you wish
-          - You must not rename members without making the corresponding
-            name change in the compiler
-          - Members you add will be treated like regular members unless
-            you add the appropriate support in the compiler. */
-
-
-    typedef __false_type    has_trivial_default_constructor;
-    typedef __false_type    has_trivial_copy_constructor;
-    typedef __false_type    has_trivial_assignment_operator;
-    typedef __false_type    has_trivial_destructor;
-    typedef __false_type    is_POD_type;
-  };
-
-
-// Provide some specializations.
-
-template<>
-  struct __type_traits<bool>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<char>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<signed char>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<unsigned char>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<wchar_t>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<short>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<unsigned short>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<int>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<unsigned int>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<long>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<unsigned long>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<long long>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<unsigned long long>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<float>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<double>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template<>
-  struct __type_traits<long double>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-template <class _Tp>
-  struct __type_traits<_Tp*>
-  {
-    typedef __true_type    has_trivial_default_constructor;
-    typedef __true_type    has_trivial_copy_constructor;
-    typedef __true_type    has_trivial_assignment_operator;
-    typedef __true_type    has_trivial_destructor;
-    typedef __true_type    is_POD_type;
-  };
-
-// The following could be written in terms of numeric_limits.
-// We're doing it separately to reduce the number of dependencies.
-
-template <class _Tp>
-  struct _Is_integer
-  {
-    typedef __false_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<bool>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<char>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<signed char>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<unsigned char>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<wchar_t>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<short>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<unsigned short>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<int>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<unsigned int>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<long>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<unsigned long>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<long long>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<>
-  struct _Is_integer<unsigned long long>
-  {
-    typedef __true_type _Integral;
-  };
-
-template<typename _Tp>
-  struct _Is_normal_iterator
-  {
-    typedef __false_type _Normal;
-  };
-
-// Forward declaration hack, should really include this from somewhere.
-namespace __gnu_cxx
-{
-  template<typename _Iterator, typename _Container>
-    class __normal_iterator;
-}
-
-template<typename _Iterator, typename _Container>
-  struct _Is_normal_iterator< __gnu_cxx::__normal_iterator<_Iterator,
-							   _Container> >
-  {
-    typedef __true_type _Normal;
-  };
-
-#endif /* _TYPE_TRAITS_H */
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/bits/valarray_after.h b/include.new/c++/3.4/bits/valarray_after.h
deleted file mode 100644
index b74cab5..0000000
--- a/include.new/c++/3.4/bits/valarray_after.h
+++ /dev/null
@@ -1,499 +0,0 @@
-// The template and inlines for the -*- C++ -*- internal _Meta class.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@cmla.ens-cachan.fr>
-
-/** @file valarray_meta.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _VALARRAY_AFTER_H
-#define _VALARRAY_AFTER_H 1
-
-#pragma GCC system_header
-
-namespace std
-{
-
-    //
-    // gslice_array closure.
-    //
-    template<class _Dom> class _GBase {
-    public:
-        typedef typename _Dom::value_type value_type;
-
-        _GBase (const _Dom& __e, const valarray<size_t>& __i)
-                : _M_expr (__e), _M_index(__i) {}
-        value_type operator[] (size_t __i) const
-        { return _M_expr[_M_index[__i]]; }
-        size_t size () const { return _M_index.size(); }
-
-    private:
-        const _Dom&	 _M_expr;
-        const valarray<size_t>& _M_index;
-    };
-
-    template<typename _Tp> class _GBase<_Array<_Tp> > {
-    public:
-        typedef _Tp value_type;
-
-        _GBase (_Array<_Tp> __a, const valarray<size_t>& __i)
-                : _M_array (__a), _M_index(__i) {}
-        value_type operator[] (size_t __i) const
-        { return _M_array._M_data[_M_index[__i]]; }
-        size_t size () const { return _M_index.size(); }
-
-    private:
-        const _Array<_Tp>     _M_array;
-        const valarray<size_t>& _M_index;
-    };
-
-    template<class _Dom> struct _GClos<_Expr,_Dom> : _GBase<_Dom> {
-        typedef _GBase<_Dom> _Base;
-        typedef typename _Base::value_type value_type;
-
-        _GClos (const _Dom& __e, const valarray<size_t>& __i)
-                : _Base (__e, __i) {}
-    };
-
-    template<typename _Tp>
-    struct _GClos<_ValArray,_Tp> : _GBase<_Array<_Tp> > {
-        typedef _GBase<_Array<_Tp> > _Base;
-        typedef typename _Base::value_type value_type;
-
-        _GClos (_Array<_Tp> __a, const valarray<size_t>& __i)
-                : _Base (__a, __i) {}
-    };
-
-    //
-    // indirect_array closure
-    //
-    template<class _Dom> class _IBase {
-    public:
-        typedef typename _Dom::value_type value_type;
-
-        _IBase (const _Dom& __e, const valarray<size_t>& __i)
-                : _M_expr (__e), _M_index (__i) {}
-        value_type operator[] (size_t __i) const
-        { return _M_expr[_M_index[__i]]; }
-        size_t size() const { return _M_index.size(); }
-
-    private:
-        const _Dom&	    _M_expr;
-        const valarray<size_t>& _M_index;
-    };
-
-    template<class _Dom> struct _IClos<_Expr,_Dom> : _IBase<_Dom> {
-        typedef _IBase<_Dom> _Base;
-        typedef typename _Base::value_type value_type;
-
-        _IClos (const _Dom& __e, const valarray<size_t>& __i)
-                : _Base (__e, __i) {}
-    };
-
-    template<typename _Tp>
-    struct _IClos<_ValArray,_Tp>  : _IBase<valarray<_Tp> > {
-        typedef _IBase<valarray<_Tp> > _Base;
-        typedef _Tp value_type;
-
-        _IClos (const valarray<_Tp>& __a, const valarray<size_t>& __i)
-                : _Base (__a, __i) {}
-    };
-
-  //
-  // class _Expr
-  //
-  template<class _Clos, typename _Tp>
-    class _Expr
-    {
-    public:
-      typedef _Tp value_type;
-
-      _Expr(const _Clos&);
-
-      const _Clos& operator()() const;
-
-      value_type operator[](size_t) const;
-      valarray<value_type> operator[](slice) const;
-      valarray<value_type> operator[](const gslice&) const;
-      valarray<value_type> operator[](const valarray<bool>&) const;
-      valarray<value_type> operator[](const valarray<size_t>&) const;
-
-      _Expr<_UnClos<__unary_plus,std::_Expr,_Clos>, value_type>
-        operator+() const;
-
-      _Expr<_UnClos<__negate,std::_Expr,_Clos>, value_type>
-        operator-() const;
-
-      _Expr<_UnClos<__bitwise_not,std::_Expr,_Clos>, value_type>
-        operator~() const;
-
-      _Expr<_UnClos<__logical_not,std::_Expr,_Clos>, bool>
-        operator!() const;
-
-      size_t size() const;
-      value_type sum() const;
-
-      valarray<value_type> shift(int) const;
-      valarray<value_type> cshift(int) const;
-
-      value_type min() const;
-      value_type max() const;
-
-      valarray<value_type> apply(value_type (*)(const value_type&)) const;
-      valarray<value_type> apply(value_type (*)(value_type)) const;
-
-    private:
-      const _Clos _M_closure;
-    };
-
-  template<class _Clos, typename _Tp>
-    inline
-    _Expr<_Clos,_Tp>::_Expr(const _Clos& __c) : _M_closure(__c) {}
-
-  template<class _Clos, typename _Tp>
-    inline const _Clos&
-    _Expr<_Clos,_Tp>::operator()() const
-    { return _M_closure; }
-
-  template<class _Clos, typename _Tp>
-    inline _Tp
-    _Expr<_Clos,_Tp>::operator[](size_t __i) const
-    { return _M_closure[__i]; }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos,_Tp>::operator[](slice __s) const
-    { return _M_closure[__s]; }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos,_Tp>::operator[](const gslice& __gs) const
-    { return _M_closure[__gs]; }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos,_Tp>::operator[](const valarray<bool>& __m) const
-    { return _M_closure[__m]; }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos,_Tp>::operator[](const valarray<size_t>& __i) const
-    { return _M_closure[__i]; }
-
-  template<class _Clos, typename _Tp>
-    inline size_t
-    _Expr<_Clos,_Tp>::size() const  { return _M_closure.size (); }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::shift(int __n) const
-    { return valarray<_Tp>(_M_closure).shift(__n); }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::cshift(int __n) const
-    { return valarray<_Tp>(_M_closure).cshift(__n); }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::apply(_Tp __f(const _Tp&)) const
-    { return valarray<_Tp>(_M_closure).apply(__f); }
-
-  template<class _Clos, typename _Tp>
-    inline valarray<_Tp>
-    _Expr<_Clos, _Tp>::apply(_Tp __f(_Tp)) const
-    { return valarray<_Tp>(_M_closure).apply(__f); }
-
-  // XXX: replace this with a more robust summation algorithm.
-  template<class _Clos, typename _Tp>
-    inline _Tp
-    _Expr<_Clos,_Tp>::sum() const
-    {
-      size_t __n = _M_closure.size();
-      if (__n == 0)
-	return _Tp();
-      else
-	{
-	  _Tp __s = _M_closure[--__n];
-	  while (__n != 0)
-	    __s += _M_closure[--__n];
-	  return __s;
-        }
-    }
-
-  template<class _Clos, typename _Tp>
-    inline _Tp
-    _Expr<_Clos, _Tp>::min() const
-    { return __valarray_min(_M_closure); }
-
-  template<class _Clos, typename _Tp>
-    inline _Tp
-    _Expr<_Clos, _Tp>::max() const
-    { return __valarray_max(_M_closure); }
-
-  template<class _Dom, typename _Tp>
-    inline _Expr<_UnClos<__logical_not,_Expr,_Dom>, bool>
-    _Expr<_Dom,_Tp>::operator!() const
-    {
-      typedef _UnClos<__logical_not,std::_Expr,_Dom> _Closure;
-      return _Expr<_Closure,_Tp>(_Closure(this->_M_closure));
-    }
-
-#define _DEFINE_EXPR_UNARY_OPERATOR(_Op, _Name)                           \
-  template<class _Dom, typename _Tp>                                      \
-    inline _Expr<_UnClos<_Name,std::_Expr,_Dom>,_Tp>                      \
-    _Expr<_Dom,_Tp>::operator _Op() const                                 \
-    {                                                                     \
-      typedef _UnClos<_Name,std::_Expr,_Dom> _Closure;                    \
-      return _Expr<_Closure,_Tp>(_Closure(this->_M_closure));             \
-    }
-
-    _DEFINE_EXPR_UNARY_OPERATOR(+, __unary_plus)
-    _DEFINE_EXPR_UNARY_OPERATOR(-, __negate)
-    _DEFINE_EXPR_UNARY_OPERATOR(~, __bitwise_not)
-
-#undef _DEFINE_EXPR_UNARY_OPERATOR
-
-
-#define _DEFINE_EXPR_BINARY_OPERATOR(_Op, _Name)                        \
-  template<class _Dom1, class _Dom2>					\
-  inline _Expr<_BinClos<_Name,_Expr,_Expr,_Dom1,_Dom2>,                 \
-         typename __fun<_Name, typename _Dom1::value_type>::result_type>\
-  operator _Op(const _Expr<_Dom1,typename _Dom1::value_type>& __v,      \
-	       const _Expr<_Dom2,typename _Dom2::value_type>& __w)      \
-  {                                                                     \
-    typedef typename _Dom1::value_type _Arg;                            \
-    typedef typename __fun<_Name, _Arg>::result_type _Value;            \
-    typedef _BinClos<_Name,_Expr,_Expr,_Dom1,_Dom2> _Closure;           \
-    return _Expr<_Closure,_Value>(_Closure(__v(), __w()));              \
-  }                                                                     \
-                                                                        \
-template<class _Dom>                                                    \
-inline _Expr<_BinClos<_Name,_Expr,_Constant,_Dom,typename _Dom::value_type>,\
-             typename __fun<_Name, typename _Dom::value_type>::result_type>\
-operator _Op(const _Expr<_Dom,typename _Dom::value_type>& __v,          \
-             const typename _Dom::value_type& __t)                      \
-{                                                                       \
-  typedef typename _Dom::value_type _Arg;                               \
-  typedef typename __fun<_Name, _Arg>::result_type _Value;              \
-  typedef _BinClos<_Name,_Expr,_Constant,_Dom,_Arg> _Closure;           \
-  return _Expr<_Closure,_Value>(_Closure(__v(), __t));                  \
-}                                                                       \
-                                                                        \
-template<class _Dom>                                                    \
-inline _Expr<_BinClos<_Name,_Constant,_Expr,typename _Dom::value_type,_Dom>,\
-             typename __fun<_Name, typename _Dom::value_type>::result_type>\
-operator _Op(const typename _Dom::value_type& __t,                      \
-             const _Expr<_Dom,typename _Dom::value_type>& __v)          \
-{                                                                       \
-  typedef typename _Dom::value_type _Arg;                               \
-  typedef typename __fun<_Name, _Arg>::result_type _Value;              \
-  typedef _BinClos<_Name,_Constant,_Expr,_Arg,_Dom> _Closure;           \
-  return _Expr<_Closure,_Value>(_Closure(__t, __v()));                  \
-}                                                                       \
-                                                                        \
-template<class _Dom>                                                    \
-inline _Expr<_BinClos<_Name,_Expr,_ValArray,_Dom,typename _Dom::value_type>,\
-             typename __fun<_Name, typename _Dom::value_type>::result_type>\
-operator _Op(const _Expr<_Dom,typename _Dom::value_type>& __e,          \
-             const valarray<typename _Dom::value_type>& __v)            \
-{                                                                       \
-  typedef typename _Dom::value_type _Arg;                               \
-  typedef typename __fun<_Name, _Arg>::result_type _Value;              \
-  typedef _BinClos<_Name,_Expr,_ValArray,_Dom,_Arg> _Closure;           \
-  return  _Expr<_Closure,_Value>(_Closure(__e(), __v));                 \
-}                                                                       \
-                                                                        \
-template<class _Dom>                                                    \
-inline _Expr<_BinClos<_Name,_ValArray,_Expr,typename _Dom::value_type,_Dom>,\
-             typename __fun<_Name, typename _Dom::value_type>::result_type>\
-operator _Op(const valarray<typename _Dom::value_type>& __v,            \
-             const _Expr<_Dom,typename _Dom::value_type>& __e)          \
-{                                                                       \
-  typedef typename _Dom::value_type _Tp;                                \
-  typedef typename __fun<_Name, _Tp>::result_type _Value;               \
-  typedef _BinClos<_Name,_ValArray,_Expr,_Tp,_Dom> _Closure;            \
-  return _Expr<_Closure,_Value> (_Closure (__v, __e ()));               \
-}
-
-    _DEFINE_EXPR_BINARY_OPERATOR(+, __plus)
-    _DEFINE_EXPR_BINARY_OPERATOR(-, __minus)
-    _DEFINE_EXPR_BINARY_OPERATOR(*, __multiplies)
-    _DEFINE_EXPR_BINARY_OPERATOR(/, __divides)
-    _DEFINE_EXPR_BINARY_OPERATOR(%, __modulus)
-    _DEFINE_EXPR_BINARY_OPERATOR(^, __bitwise_xor)
-    _DEFINE_EXPR_BINARY_OPERATOR(&, __bitwise_and)
-    _DEFINE_EXPR_BINARY_OPERATOR(|, __bitwise_or)
-    _DEFINE_EXPR_BINARY_OPERATOR(<<, __shift_left)
-    _DEFINE_EXPR_BINARY_OPERATOR(>>, __shift_right)
-    _DEFINE_EXPR_BINARY_OPERATOR(&&, __logical_and)
-    _DEFINE_EXPR_BINARY_OPERATOR(||, __logical_or)
-    _DEFINE_EXPR_BINARY_OPERATOR(==, __equal_to)
-    _DEFINE_EXPR_BINARY_OPERATOR(!=, __not_equal_to)
-    _DEFINE_EXPR_BINARY_OPERATOR(<, __less)
-    _DEFINE_EXPR_BINARY_OPERATOR(>, __greater)
-    _DEFINE_EXPR_BINARY_OPERATOR(<=, __less_equal)
-    _DEFINE_EXPR_BINARY_OPERATOR(>=, __greater_equal)
-
-#undef _DEFINE_EXPR_BINARY_OPERATOR
-
-#define _DEFINE_EXPR_UNARY_FUNCTION(_Name)                               \
-  template<class _Dom>                                                   \
-    inline _Expr<_UnClos<__##_Name,_Expr,_Dom>,typename _Dom::value_type>\
-    _Name(const _Expr<_Dom,typename _Dom::value_type>& __e)              \
-    {                                                                    \
-      typedef typename _Dom::value_type _Tp;                             \
-      typedef _UnClos<__##_Name,_Expr,_Dom> _Closure;                    \
-      return _Expr<_Closure,_Tp>(_Closure(__e()));                       \
-    }                                                                    \
-                                                                         \
-  template<typename _Tp>                                                 \
-    inline _Expr<_UnClos<__##_Name,_ValArray,_Tp>,_Tp>                   \
-    _Name(const valarray<_Tp>& __v)                                      \
-    {                                                                    \
-      typedef _UnClos<__##_Name,_ValArray,_Tp> _Closure;                 \
-      return _Expr<_Closure,_Tp>(_Closure(__v));                         \
-    }
-
-    _DEFINE_EXPR_UNARY_FUNCTION(abs)
-    _DEFINE_EXPR_UNARY_FUNCTION(cos)
-    _DEFINE_EXPR_UNARY_FUNCTION(acos)
-    _DEFINE_EXPR_UNARY_FUNCTION(cosh)
-    _DEFINE_EXPR_UNARY_FUNCTION(sin)
-    _DEFINE_EXPR_UNARY_FUNCTION(asin)
-    _DEFINE_EXPR_UNARY_FUNCTION(sinh)
-    _DEFINE_EXPR_UNARY_FUNCTION(tan)
-    _DEFINE_EXPR_UNARY_FUNCTION(tanh)
-    _DEFINE_EXPR_UNARY_FUNCTION(atan)
-    _DEFINE_EXPR_UNARY_FUNCTION(exp)
-    _DEFINE_EXPR_UNARY_FUNCTION(log)
-    _DEFINE_EXPR_UNARY_FUNCTION(log10)
-    _DEFINE_EXPR_UNARY_FUNCTION(sqrt)
-
-#undef _DEFINE_EXPR_UNARY_FUNCTION
-
-#define _DEFINE_EXPR_BINARY_FUNCTION(_Fun)                             \
-  template<class _Dom1, class _Dom2>                                   \
-    inline _Expr<_BinClos<__##_Fun,_Expr,_Expr,_Dom1,_Dom2>,           \
-		 typename _Dom1::value_type>                           \
-    _Fun(const _Expr<_Dom1,typename _Dom1::value_type>& __e1,          \
-	  const _Expr<_Dom2,typename _Dom2::value_type>& __e2)         \
-    {                                                                  \
-      typedef typename _Dom1::value_type _Tp;                          \
-      typedef _BinClos<__##_Fun,_Expr,_Expr,_Dom1,_Dom2> _Closure;     \
-      return _Expr<_Closure,_Tp>(_Closure(__e1(), __e2()));            \
-    }                                                                  \
-                                                                       \
-  template<class _Dom>                                                 \
-    inline _Expr<_BinClos<__##_Fun, _Expr, _ValArray, _Dom,            \
-			  typename _Dom::value_type>,                  \
-		 typename _Dom::value_type>                            \
-    _Fun(const _Expr<_Dom,typename _Dom::value_type>& __e,             \
-	 const valarray<typename _Dom::value_type>& __v)               \
-    {                                                                  \
-      typedef typename _Dom::value_type _Tp;                           \
-      typedef _BinClos<__##_Fun, _Expr, _ValArray, _Dom, _Tp> _Closure;\
-      return _Expr<_Closure,_Tp>(_Closure(__e(), __v));                \
-    }                                                                  \
-                                                                       \
-  template<class _Dom>                                                 \
-    inline _Expr<_BinClos<__##_Fun, _ValArray, _Expr,                  \
-			  typename _Dom::value_type,_Dom>,             \
-		 typename _Dom::value_type>                            \
-    _Fun(const valarray<typename _Dom::valarray>& __v,                 \
-	 const _Expr<_Dom,typename _Dom::value_type>& __e)             \
-    {                                                                  \
-      typedef typename _Dom::value_type _Tp;                           \
-      typedef _BinClos<__##_Fun,_ValArray,_Expr,_Tp,_Dom> _Closure;    \
-      return _Expr<_Closure,_Tp>(_Closure(__v, __e()));                \
-    }                                                                  \
-                                                                       \
-  template<class _Dom>                                                 \
-    inline _Expr<_BinClos<__##_Fun,_Expr,_Constant,_Dom,               \
-			  typename _Dom::value_type>,                  \
-		 typename _Dom::value_type>                            \
-    _Fun(const _Expr<_Dom, typename _Dom::value_type>& __e,            \
-	 const typename _Dom::value_type& __t)                         \
-    {                                                                  \
-      typedef typename _Dom::value_type _Tp;                           \
-      typedef _BinClos<__##_Fun,_Expr,_Constant,_Dom,_Tp> _Closure;    \
-      return _Expr<_Closure,_Tp>(_Closure(__e(), __t));                \
-    }                                                                  \
-                                                                       \
-  template<class _Dom>                                                 \
-    inline _Expr<_BinClos<__##_Fun,_Constant,_Expr,                    \
-			  typename _Dom::value_type,_Dom>,             \
-		 typename _Dom::value_type>                            \
-    _Fun(const typename _Dom::value_type& __t,                         \
-	 const _Expr<_Dom,typename _Dom::value_type>& __e)             \
-    {                                                                  \
-      typedef typename _Dom::value_type _Tp;                           \
-      typedef _BinClos<__##_Fun, _Constant,_Expr,_Tp,_Dom> _Closure;   \
-      return _Expr<_Closure,_Tp>(_Closure(__t, __e()));                \
-    }                                                                  \
-                                                                       \
-  template<typename _Tp>                                               \
-    inline _Expr<_BinClos<__##_Fun,_ValArray,_ValArray,_Tp,_Tp>, _Tp>  \
-    _Fun(const valarray<_Tp>& __v, const valarray<_Tp>& __w)           \
-    {                                                                  \
-      typedef _BinClos<__##_Fun,_ValArray,_ValArray,_Tp,_Tp> _Closure; \
-      return _Expr<_Closure,_Tp>(_Closure(__v, __w));                  \
-    }                                                                  \
-                                                                       \
-  template<typename _Tp>                                               \
-    inline _Expr<_BinClos<__##_Fun,_ValArray,_Constant,_Tp,_Tp>,_Tp>   \
-    _Fun(const valarray<_Tp>& __v, const _Tp& __t)                     \
-    {                                                                  \
-      typedef _BinClos<__##_Fun,_ValArray,_Constant,_Tp,_Tp> _Closure; \
-      return _Expr<_Closure,_Tp>(_Closure(__v, __t));                  \
-    }                                                                  \
-								       \
-  template<typename _Tp>                                               \
-    inline _Expr<_BinClos<__##_Fun,_Constant,_ValArray,_Tp,_Tp>,_Tp>   \
-    _Fun(const _Tp& __t, const valarray<_Tp>& __v)                     \
-    {                                                                  \
-      typedef _BinClos<__##_Fun,_Constant,_ValArray,_Tp,_Tp> _Closure; \
-      return _Expr<_Closure,_Tp>(_Closure(__t, __v));                  \
-    }
-
-_DEFINE_EXPR_BINARY_FUNCTION(atan2)
-_DEFINE_EXPR_BINARY_FUNCTION(pow)
-
-#undef _DEFINE_EXPR_BINARY_FUNCTION
-
-} // std::
-
-
-#endif /* _CPP_VALARRAY_AFTER_H */
-
-// Local Variables:
-// mode:c++
-// End:
diff --git a/include.new/c++/3.4/bits/valarray_array.h b/include.new/c++/3.4/bits/valarray_array.h
deleted file mode 100644
index e18e8e8..0000000
--- a/include.new/c++/3.4/bits/valarray_array.h
+++ /dev/null
@@ -1,625 +0,0 @@
-// The template and inlines for the -*- C++ -*- internal _Array helper class.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2003
-//  Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-/** @file valarray_array.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _VALARRAY_ARRAY_H
-#define _VALARRAY_ARRAY_H 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/cpp_type_traits.h>
-#include <cstdlib>
-#include <cstring>
-#include <new>
-
-namespace std
-{
-  //
-  // Helper functions on raw pointers
-  //
-
-  // We get memory by the old fashion way
-  inline void*
-  __valarray_get_memory(size_t __n)
-  { return operator new(__n); }
-
-  template<typename _Tp>
-     inline _Tp*__restrict__
-     __valarray_get_storage(size_t __n)
-     {
-       return static_cast<_Tp*__restrict__>
-         (std::__valarray_get_memory(__n * sizeof(_Tp)));
-     }
-
-  // Return memory to the system
-  inline void
-  __valarray_release_memory(void* __p)
-  { operator delete(__p); }
-
-  // Turn a raw-memory into an array of _Tp filled with _Tp()
-  // This is required in 'valarray<T> v(n);'
-  template<typename _Tp, bool>
-     struct _Array_default_ctor
-     {
-       // Please note that this isn't exception safe.  But
-       // valarrays aren't required to be exception safe.
-       inline static void
-       _S_do_it(_Tp* __restrict__ __b, _Tp* __restrict__ __e)
-       { while (__b != __e) new(__b++) _Tp(); }
-     };
-
-  template<typename _Tp>
-     struct _Array_default_ctor<_Tp, true>
-     {
-       // For fundamental types, it suffices to say 'memset()'
-       inline static void
-       _S_do_it(_Tp* __restrict__ __b, _Tp* __restrict__ __e)
-       { std::memset(__b, 0, (__e - __b)*sizeof(_Tp)); }
-     };
-
-  template<typename _Tp>
-     inline void
-     __valarray_default_construct(_Tp* __restrict__ __b, _Tp* __restrict__ __e)
-     {
-       _Array_default_ctor<_Tp, __is_fundamental<_Tp>::_M_type>::
-         _S_do_it(__b, __e);
-     }
-
-  // Turn a raw-memory into an array of _Tp filled with __t
-  // This is the required in valarray<T> v(n, t).  Also
-  // used in valarray<>::resize().
-  template<typename _Tp, bool>
-     struct _Array_init_ctor
-     {
-       // Please note that this isn't exception safe.  But
-       // valarrays aren't required to be exception safe.
-       inline static void
-       _S_do_it(_Tp* __restrict__ __b, _Tp* __restrict__ __e, const _Tp __t)
-       { while (__b != __e) new(__b++) _Tp(__t); }
-     };
-
-  template<typename _Tp>
-     struct _Array_init_ctor<_Tp, true>
-     {
-       inline static void
-       _S_do_it(_Tp* __restrict__ __b, _Tp* __restrict__ __e,  const _Tp __t)
-       { while (__b != __e) *__b++ = __t; }
-     };
-
-  template<typename _Tp>
-     inline void
-     __valarray_fill_construct(_Tp* __restrict__ __b, _Tp* __restrict__ __e,
-                               const _Tp __t)
-     {
-       _Array_init_ctor<_Tp, __is_fundamental<_Tp>::_M_type>::
-         _S_do_it(__b, __e, __t);
-     }
-
-  //
-  // copy-construct raw array [__o, *) from plain array [__b, __e)
-  // We can't just say 'memcpy()'
-  //
-  template<typename _Tp, bool>
-     struct _Array_copy_ctor
-     {
-       // Please note that this isn't exception safe.  But
-       // valarrays aren't required to be exception safe.
-       inline static void
-       _S_do_it(const _Tp* __restrict__ __b, const _Tp* __restrict__ __e,
-                _Tp* __restrict__ __o)
-       { while (__b != __e) new(__o++) _Tp(*__b++); }
-     };
-
-  template<typename _Tp>
-     struct _Array_copy_ctor<_Tp, true>
-     {
-       inline static void
-       _S_do_it(const _Tp* __restrict__ __b, const _Tp* __restrict__ __e,
-                _Tp* __restrict__ __o)
-       { std::memcpy(__o, __b, (__e - __b)*sizeof(_Tp)); }
-     };
-
-  template<typename _Tp>
-     inline void
-     __valarray_copy_construct(const _Tp* __restrict__ __b,
-                               const _Tp* __restrict__ __e,
-                               _Tp* __restrict__ __o)
-     {
-       _Array_copy_ctor<_Tp, __is_fundamental<_Tp>::_M_type>::
-         _S_do_it(__b, __e, __o);
-     }
-
-  // copy-construct raw array [__o, *) from strided array __a[<__n : __s>]
-  template<typename _Tp>
-     inline void
-     __valarray_copy_construct (const _Tp* __restrict__ __a, size_t __n,
-                                size_t __s, _Tp* __restrict__ __o)
-     {
-       if (__is_fundamental<_Tp>::_M_type)
-         while (__n--) { *__o++ = *__a; __a += __s; }
-       else
-         while (__n--) { new(__o++) _Tp(*__a);  __a += __s; }
-     }
-
-  // copy-construct raw array [__o, *) from indexed array __a[__i[<__n>]]
-  template<typename _Tp>
-     inline void
-     __valarray_copy_construct (const _Tp* __restrict__ __a,
-                                const size_t* __restrict__ __i,
-                                _Tp* __restrict__ __o, size_t __n)
-     {
-       if (__is_fundamental<_Tp>::_M_type)
-         while (__n--) *__o++ = __a[*__i++];
-       else
-         while (__n--) new (__o++) _Tp(__a[*__i++]);
-     }
-
-  // Do the necessary cleanup when we're done with arrays.
-  template<typename _Tp>
-     inline void
-     __valarray_destroy_elements(_Tp* __restrict__ __b, _Tp* __restrict__ __e)
-     {
-       if (!__is_fundamental<_Tp>::_M_type)
-         while (__b != __e) { __b->~_Tp(); ++__b; }
-     }
-
-  // Fill a plain array __a[<__n>] with __t
-  template<typename _Tp>
-     inline void
-     __valarray_fill (_Tp* __restrict__ __a, size_t __n, const _Tp& __t)
-     { while (__n--) *__a++ = __t; }
-
-  // fill strided array __a[<__n-1 : __s>] with __t
-  template<typename _Tp>
-     inline void
-     __valarray_fill (_Tp* __restrict__ __a, size_t __n,
-                      size_t __s, const _Tp& __t)
-     { for (size_t __i=0; __i<__n; ++__i, __a+=__s) *__a = __t; }
-
-  // fill indir   ect array __a[__i[<__n>]] with __i
-  template<typename _Tp>
-     inline void
-     __valarray_fill(_Tp* __restrict__ __a, const size_t* __restrict__ __i,
-                     size_t __n, const _Tp& __t)
-     { for (size_t __j=0; __j<__n; ++__j, ++__i) __a[*__i] = __t; }
-
-  // copy plain array __a[<__n>] in __b[<__n>]
-  // For non-fundamental types, it is wrong to say 'memcpy()'
-  template<typename _Tp, bool>
-     struct _Array_copier
-     {
-       inline static void
-       _S_do_it(const _Tp* __restrict__ __a, size_t __n, _Tp* __restrict__ __b)
-       { while (__n--) *__b++ = *__a++; }
-     };
-
-  template<typename _Tp>
-     struct _Array_copier<_Tp, true>
-     {
-       inline static void
-       _S_do_it(const _Tp* __restrict__ __a, size_t __n, _Tp* __restrict__ __b)
-       { std::memcpy (__b, __a, __n * sizeof (_Tp)); }
-     };
-
-  // Copy a plain array __a[<__n>] into a play array __b[<>]
-  template<typename _Tp>
-     inline void
-     __valarray_copy(const _Tp* __restrict__ __a, size_t __n,
-                      _Tp* __restrict__ __b)
-     {
-       _Array_copier<_Tp, __is_fundamental<_Tp>::_M_type>::
-         _S_do_it(__a, __n, __b);
-     }
-
-  // Copy strided array __a[<__n : __s>] in plain __b[<__n>]
-  template<typename _Tp>
-     inline void
-     __valarray_copy(const _Tp* __restrict__ __a, size_t __n, size_t __s,
-                      _Tp* __restrict__ __b)
-     { for (size_t __i=0; __i<__n; ++__i, ++__b, __a += __s) *__b = *__a; }
-
-  // Copy a plain array  __a[<__n>] into a strided array __b[<__n : __s>]
-  template<typename _Tp>
-     inline void
-     __valarray_copy(const _Tp* __restrict__ __a, _Tp* __restrict__ __b,
-                      size_t __n, size_t __s)
-     { for (size_t __i=0; __i<__n; ++__i, ++__a, __b+=__s) *__b = *__a; }
-
-  // Copy strided array __src[<__n : __s1>] into another
-  // strided array __dst[< : __s2>].  Their sizes must match.
-  template<typename _Tp>
-     inline void
-     __valarray_copy(const _Tp* __restrict__ __src, size_t __n, size_t __s1,
-                     _Tp* __restrict__ __dst, size_t __s2)
-     {
-       for (size_t __i = 0; __i < __n; ++__i)
-         __dst[__i * __s2] = __src [ __i * __s1];
-     }
-
-
-  // Copy an indexed array __a[__i[<__n>]] in plain array __b[<__n>]
-  template<typename _Tp>
-     inline void
-     __valarray_copy (const _Tp* __restrict__ __a,
-                      const size_t* __restrict__ __i,
-                      _Tp* __restrict__ __b, size_t __n)
-     { for (size_t __j=0; __j<__n; ++__j, ++__b, ++__i) *__b = __a[*__i]; }
-
-  // Copy a plain array __a[<__n>] in an indexed array __b[__i[<__n>]]
-  template<typename _Tp>
-     inline void
-     __valarray_copy (const _Tp* __restrict__ __a, size_t __n,
-                      _Tp* __restrict__ __b, const size_t* __restrict__ __i)
-     { for (size_t __j=0; __j<__n; ++__j, ++__a, ++__i) __b[*__i] = *__a; }
-
-  // Copy the __n first elements of an indexed array __src[<__i>] into
-  // another indexed array __dst[<__j>].
-  template<typename _Tp>
-     inline void
-     __valarray_copy(const _Tp* __restrict__ __src, size_t __n,
-                     const size_t* __restrict__ __i,
-                     _Tp* __restrict__ __dst, const size_t* __restrict__ __j)
-     {
-       for (size_t __k = 0; __k < __n; ++__k)
-         __dst[*__j++] = __src[*__i++];
-     }
-
-  //
-  // Compute the sum of elements in range [__f, __l)
-  // This is a naive algorithm.  It suffers from cancelling.
-  // In the future try to specialize
-  // for _Tp = float, double, long double using a more accurate
-  // algorithm.
-  //
-  template<typename _Tp>
-     inline _Tp
-     __valarray_sum(const _Tp* __restrict__ __f, const _Tp* __restrict__ __l)
-     {
-       _Tp __r = _Tp();
-       while (__f != __l) __r += *__f++;
-       return __r;
-     }
-
-  // Compute the product of all elements in range [__f, __l)
-  template<typename _Tp>
-     inline _Tp
-     __valarray_product(const _Tp* __restrict__ __f,
-                        const _Tp* __restrict__ __l)
-     {
-       _Tp __r = _Tp(1);
-       while (__f != __l) __r = __r * *__f++;
-       return __r;
-     }
-
-  // Compute the min/max of an array-expression
-  template<typename _Ta>
-     inline typename _Ta::value_type
-     __valarray_min(const _Ta& __a)
-     {
-       size_t __s = __a.size();
-       typedef typename _Ta::value_type _Value_type;
-       _Value_type __r = __s == 0 ? _Value_type() : __a[0];
-       for (size_t __i = 1; __i < __s; ++__i)
-         {
-           _Value_type __t = __a[__i];
-           if (__t < __r)
-             __r = __t;
-         }
-       return __r;
-     }
-
-  template<typename _Ta>
-     inline typename _Ta::value_type
-     __valarray_max(const _Ta& __a)
-     {
-       size_t __s = __a.size();
-       typedef typename _Ta::value_type _Value_type;
-       _Value_type __r = __s == 0 ? _Value_type() : __a[0];
-       for (size_t __i = 1; __i < __s; ++__i)
-         {
-           _Value_type __t = __a[__i];
-           if (__t > __r)
-             __r = __t;
-         }
-       return __r;
-     }
-
-  //
-  // Helper class _Array, first layer of valarray abstraction.
-  // All operations on valarray should be forwarded to this class
-  // whenever possible. -- gdr
-  //
-
-  template<typename _Tp>
-     struct _Array
-     {
-       explicit _Array (size_t);
-       explicit _Array (_Tp* const __restrict__);
-       explicit _Array (const valarray<_Tp>&);
-       _Array (const _Tp* __restrict__, size_t);
-
-       _Tp* begin () const;
-
-       _Tp* const __restrict__ _M_data;
-     };
-
-  template<typename _Tp>
-     inline void
-     __valarray_fill (_Array<_Tp> __a, size_t __n, const _Tp& __t)
-     { std::__valarray_fill (__a._M_data, __n, __t); }
-
-  template<typename _Tp>
-     inline void
-     __valarray_fill (_Array<_Tp> __a, size_t __n, size_t __s, const _Tp& __t)
-     { std::__valarray_fill (__a._M_data, __n, __s, __t); }
-
-  template<typename _Tp>
-     inline void
-     __valarray_fill (_Array<_Tp> __a, _Array<size_t> __i,
-                      size_t __n, const _Tp& __t)
-     { std::__valarray_fill (__a._M_data, __i._M_data, __n, __t); }
-
-  // Copy a plain array __a[<__n>] into a play array __b[<>]
-  template<typename _Tp>
-     inline void
-     __valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b)
-     { std::__valarray_copy(__a._M_data, __n, __b._M_data); }
-
-  // Copy strided array __a[<__n : __s>] in plain __b[<__n>]
-  template<typename _Tp>
-     inline void
-     __valarray_copy(_Array<_Tp> __a, size_t __n, size_t __s, _Array<_Tp> __b)
-     { std::__valarray_copy(__a._M_data, __n, __s, __b._M_data); }
-
-  // Copy a plain array  __a[<__n>] into a strided array __b[<__n : __s>]
-  template<typename _Tp>
-     inline void
-     __valarray_copy(_Array<_Tp> __a, _Array<_Tp> __b, size_t __n, size_t __s)
-     { __valarray_copy(__a._M_data, __b._M_data, __n, __s); }
-
-  // Copy strided array __src[<__n : __s1>] into another
-  // strided array __dst[< : __s2>].  Their sizes must match.
-  template<typename _Tp>
-     inline void
-     __valarray_copy(_Array<_Tp> __a, size_t __n, size_t __s1,
-                     _Array<_Tp> __b, size_t __s2)
-     { std::__valarray_copy(__a._M_data, __n, __s1, __b._M_data, __s2); }
-
-
-  // Copy an indexed array __a[__i[<__n>]] in plain array __b[<__n>]
-  template<typename _Tp>
-     inline void
-     __valarray_copy(_Array<_Tp> __a, _Array<size_t> __i,
-                      _Array<_Tp> __b, size_t __n)
-     { std::__valarray_copy(__a._M_data, __i._M_data, __b._M_data, __n); }
-
-  // Copy a plain array __a[<__n>] in an indexed array __b[__i[<__n>]]
-  template<typename _Tp>
-     inline void
-     __valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b,
-                      _Array<size_t> __i)
-     { std::__valarray_copy(__a._M_data, __n, __b._M_data, __i._M_data); }
-
-  // Copy the __n first elements of an indexed array __src[<__i>] into
-  // another indexed array __dst[<__j>].
-  template<typename _Tp>
-     inline void
-     __valarray_copy(_Array<_Tp> __src, size_t __n, _Array<size_t> __i,
-                     _Array<_Tp> __dst, _Array<size_t> __j)
-     {
-       std::__valarray_copy(__src._M_data, __n, __i._M_data,
-			    __dst._M_data, __j._M_data);
-     }
-
-  template<typename _Tp>
-     inline
-     _Array<_Tp>::_Array (size_t __n)
-       : _M_data(__valarray_get_storage<_Tp>(__n))
-     { std::__valarray_default_construct(_M_data, _M_data + __n); }
-
-  template<typename _Tp>
-     inline
-     _Array<_Tp>::_Array (_Tp* const __restrict__ __p) : _M_data (__p) {}
-
-  template<typename _Tp>
-     inline _Array<_Tp>::_Array (const valarray<_Tp>& __v)
-         : _M_data (__v._M_data) {}
-
-  template<typename _Tp>
-     inline
-     _Array<_Tp>::_Array (const _Tp* __restrict__ __b, size_t __s)
-       : _M_data(__valarray_get_storage<_Tp>(__s))
-     { std::__valarray_copy_construct(__b, __s, _M_data); }
-
-  template<typename _Tp>
-     inline _Tp*
-     _Array<_Tp>::begin () const
-     { return _M_data; }
-
-#define _DEFINE_ARRAY_FUNCTION(_Op, _Name)				\
-template<typename _Tp>							\
-inline void								\
-_Array_augmented_##_Name (_Array<_Tp> __a, size_t __n, const _Tp& __t)	\
-{									\
-  for (_Tp* __p=__a._M_data; __p<__a._M_data+__n; ++__p)		\
-    *__p _Op##= __t;							\
-}									\
-									\
-template<typename _Tp>							\
-inline void								\
-_Array_augmented_##_Name (_Array<_Tp> __a, size_t __n, _Array<_Tp> __b)	\
-{									\
-  _Tp* __p = __a._M_data;						\
-  for (_Tp* __q=__b._M_data; __q<__b._M_data+__n; ++__p, ++__q)		\
-    *__p _Op##= *__q;							\
-}									\
-									\
-template<typename _Tp, class _Dom>					\
-void									\
-_Array_augmented_##_Name (_Array<_Tp> __a,				\
-                         const _Expr<_Dom,_Tp>& __e, size_t __n)	\
-{									\
-    _Tp* __p (__a._M_data);						\
-    for (size_t __i=0; __i<__n; ++__i, ++__p) *__p _Op##= __e[__i];	\
-}									\
-									\
-template<typename _Tp>							\
-inline void								\
-_Array_augmented_##_Name (_Array<_Tp> __a, size_t __n, size_t __s,	\
-			 _Array<_Tp> __b)				\
-{									\
-    _Tp* __q (__b._M_data);						\
-    for (_Tp* __p=__a._M_data; __p<__a._M_data+__s*__n; __p+=__s, ++__q) \
-      *__p _Op##= *__q;							\
-}									\
-									\
-template<typename _Tp>							\
-inline void								\
-_Array_augmented_##_Name (_Array<_Tp> __a, _Array<_Tp> __b,		\
-			 size_t __n, size_t __s)			\
-{									\
-    _Tp* __q (__b._M_data);						\
-    for (_Tp* __p=__a._M_data; __p<__a._M_data+__n; ++__p, __q+=__s)	\
-      *__p _Op##= *__q;							\
-}									\
-									\
-template<typename _Tp, class _Dom>					\
-void									\
-_Array_augmented_##_Name (_Array<_Tp> __a, size_t __s,			\
-                          const _Expr<_Dom,_Tp>& __e, size_t __n)	\
-{									\
-    _Tp* __p (__a._M_data);						\
-    for (size_t __i=0; __i<__n; ++__i, __p+=__s) *__p _Op##= __e[__i];	\
-}									\
-									\
-template<typename _Tp>							\
-inline void								\
-_Array_augmented_##_Name (_Array<_Tp> __a, _Array<size_t> __i,		\
-                          _Array<_Tp> __b, size_t __n)			\
-{									\
-    _Tp* __q (__b._M_data);						\
-    for (size_t* __j=__i._M_data; __j<__i._M_data+__n; ++__j, ++__q)	\
-        __a._M_data[*__j] _Op##= *__q;					\
-}									\
-									\
-template<typename _Tp>							\
-inline void								\
-_Array_augmented_##_Name (_Array<_Tp> __a, size_t __n,			\
-                          _Array<_Tp> __b, _Array<size_t> __i)		\
-{									\
-    _Tp* __p (__a._M_data);						\
-    for (size_t* __j=__i._M_data; __j<__i._M_data+__n; ++__j, ++__p)	\
-        *__p _Op##= __b._M_data[*__j];					\
-}									\
-									\
-template<typename _Tp, class _Dom>					\
-void									\
-_Array_augmented_##_Name (_Array<_Tp> __a, _Array<size_t> __i,		\
-                          const _Expr<_Dom, _Tp>& __e, size_t __n)	\
-{									\
-    size_t* __j (__i._M_data);						\
-    for (size_t __k=0; __k<__n; ++__k, ++__j)				\
-      __a._M_data[*__j] _Op##= __e[__k];				\
-}									\
-									\
-template<typename _Tp>							\
-void									\
-_Array_augmented_##_Name (_Array<_Tp> __a, _Array<bool> __m,		\
-                          _Array<_Tp> __b, size_t __n)			\
-{									\
-    bool* ok (__m._M_data);						\
-    _Tp* __p (__a._M_data);						\
-    for (_Tp* __q=__b._M_data; __q<__b._M_data+__n; ++__q, ++ok, ++__p) { \
-        while (! *ok) {							\
-            ++ok;							\
-            ++__p;							\
-        }								\
-        *__p _Op##= *__q;						\
-    }									\
-}									\
-									\
-template<typename _Tp>							\
-void									\
-_Array_augmented_##_Name (_Array<_Tp> __a, size_t __n,			\
-                         _Array<_Tp> __b, _Array<bool> __m)		\
-{									\
-    bool* ok (__m._M_data);						\
-    _Tp* __q (__b._M_data);						\
-    for (_Tp* __p=__a._M_data; __p<__a._M_data+__n; ++__p, ++ok, ++__q) { \
-        while (! *ok) {							\
-            ++ok;							\
-            ++__q;							\
-        }								\
-        *__p _Op##= *__q;						\
-    }									\
-}									\
-									\
-template<typename _Tp, class _Dom>					\
-void									\
-_Array_augmented_##_Name (_Array<_Tp> __a, _Array<bool> __m,		\
-                          const _Expr<_Dom, _Tp>& __e, size_t __n)	\
-{									\
-    bool* ok(__m._M_data);						\
-    _Tp* __p (__a._M_data);						\
-    for (size_t __i=0; __i<__n; ++__i, ++ok, ++__p) {			\
-        while (! *ok) {							\
-            ++ok;							\
-            ++__p;							\
-        }								\
-        *__p _Op##= __e[__i];						\
-    }									\
-}
-
-   _DEFINE_ARRAY_FUNCTION(+, __plus)
-   _DEFINE_ARRAY_FUNCTION(-, __minus)
-   _DEFINE_ARRAY_FUNCTION(*, __multiplies)
-   _DEFINE_ARRAY_FUNCTION(/, __divides)
-   _DEFINE_ARRAY_FUNCTION(%, __modulus)
-   _DEFINE_ARRAY_FUNCTION(^, __bitwise_xor)
-   _DEFINE_ARRAY_FUNCTION(|, __bitwise_or)
-   _DEFINE_ARRAY_FUNCTION(&, __bitwise_and)
-   _DEFINE_ARRAY_FUNCTION(<<, __shift_left)
-   _DEFINE_ARRAY_FUNCTION(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_FUNCTION
-} // namespace std
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/valarray_array.tcc>
-#endif
-
-#endif /* _ARRAY_H */
diff --git a/include.new/c++/3.4/bits/valarray_array.tcc b/include.new/c++/3.4/bits/valarray_array.tcc
deleted file mode 100644
index fac5de6..0000000
--- a/include.new/c++/3.4/bits/valarray_array.tcc
+++ /dev/null
@@ -1,240 +0,0 @@
-// The template and inlines for the -*- C++ -*- internal _Array helper class.
-
-// Copyright (C) 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-#ifndef _VALARRAY_ARRAY_TCC
-#define _VALARRAY_ARRAY_TCC 1
-
-namespace std
-{
-  template<typename _Tp>
-    void
-    __valarray_fill(_Array<_Tp> __a, size_t __n, _Array<bool> __m,
-		    const _Tp& __t)
-    {
-      _Tp* __p = __a._M_data;
-      bool* __ok (__m._M_data);
-      for (size_t __i=0; __i < __n; ++__i, ++__ok, ++__p)
-	{
-	  while (!*__ok)
-	  {
-	    ++__ok;
-	    ++__p;
-	  }
-	  *__p = __t;
-	}
-    }
-
-  // Copy n elements of a into consecutive elements of b.  When m is
-  // false, the corresponding element of a is skipped.  m must contain
-  // at least n true elements.  a must contain at least n elements and
-  // enough elements to match up with m through the nth true element
-  // of m.  I.e.  if n is 10, m has 15 elements with 5 false followed
-  // by 10 true, a must have 15 elements.
-  template<typename _Tp>
-    void
-    __valarray_copy(_Array<_Tp> __a, _Array<bool> __m, _Array<_Tp> __b,
-		    size_t __n)
-    {
-      _Tp* __p (__a._M_data);
-      bool* __ok (__m._M_data);
-      for (_Tp* __q = __b._M_data; __q < __b._M_data + __n;
-	   ++__q, ++__ok, ++__p)
-	{
-	  while (! *__ok)
-	    {
-	      ++__ok;
-	      ++__p;
-	    }
-	  *__q = *__p;
-	}
-    }
-
-  // Copy n consecutive elements from a into elements of b.  Elements
-  // of b are skipped if the corresponding element of m is false.  m
-  // must contain at least n true elements.  b must have at least as
-  // many elements as the index of the nth true element of m.  I.e. if
-  // m has 15 elements with 5 false followed by 10 true, b must have
-  // at least 15 elements.
-  template<typename _Tp>
-    void
-    __valarray_copy(_Array<_Tp> __a, size_t __n, _Array<_Tp> __b,
-		    _Array<bool> __m)
-    {
-      _Tp* __q (__b._M_data);
-      bool* __ok (__m._M_data);
-      for (_Tp* __p = __a._M_data; __p < __a._M_data+__n;
-	   ++__p, ++__ok, ++__q)
-	{
-	  while (! *__ok)
-	    {
-	      ++__ok;
-	      ++__q;
-	    }
-	  *__q = *__p;
-	}
-    }
-
-  // Copy n elements from a into elements of b.  Elements of a are
-  // skipped if the corresponding element of m is false.  Elements of
-  // b are skipped if the corresponding element of k is false.  m and
-  // k must contain at least n true elements.  a and b must have at
-  // least as many elements as the index of the nth true element of m.
-  template<typename _Tp>
-    void
-    __valarray_copy(_Array<_Tp> __a, _Array<bool> __m, size_t __n,
-		    _Array<_Tp> __b, _Array<bool> __k)
-    {
-      _Tp* __p (__a._M_data);
-      _Tp* __q (__b._M_data);
-      bool* __srcok (__m._M_data);
-      bool* __dstok (__k._M_data);
-      for (size_t __i = 0; __i < __n;
-	   ++__srcok, ++__p, ++__dstok, ++__q, ++__i)
-	{
-	  while (! *__srcok)
-	    {
-	      ++__srcok;
-	      ++__p;
-	    }
-	  while (! *__dstok) 
-	    {
-	      ++__dstok;
-	      ++__q;
-	    }
-	  *__q = *__p;
-	}
-    }
-
-  // Copy n consecutive elements of e into consecutive elements of a.
-  // I.e. a[i] = e[i].
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n, _Array<_Tp> __a)
-    {
-      _Tp* __p (__a._M_data);
-      for (size_t __i = 0; __i < __n; ++__i, ++__p)
-	*__p = __e[__i];
-    }
-
-  // Copy n consecutive elements of e into elements of a using stride
-  // s.  I.e., a[0] = e[0], a[s] = e[1], a[2*s] = e[2].
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n,
-		     _Array<_Tp> __a, size_t __s)
-    {
-      _Tp* __p (__a._M_data);
-      for (size_t __i = 0; __i < __n; ++__i, __p += __s)
-	*__p = __e[__i];
-    }
-
-  // Copy n consecutive elements of e into elements of a indexed by
-  // contents of i.  I.e., a[i[0]] = e[0].
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n,
-		    _Array<_Tp> __a, _Array<size_t> __i)
-    {
-      size_t* __j (__i._M_data);
-      for (size_t __k = 0; __k < __n; ++__k, ++__j)
-	__a._M_data[*__j] = __e[__k];
-    }
-
-  // Copy n elements of e indexed by contents of f into elements of a
-  // indexed by contents of i.  I.e., a[i[0]] = e[f[0]].
-  template<typename _Tp>
-    void
-    __valarray_copy(_Array<_Tp> __e, _Array<size_t> __f,
-		    size_t __n, 
-		    _Array<_Tp> __a, _Array<size_t> __i)
-    {
-      size_t* __g (__f._M_data);
-      size_t* __j (__i._M_data);
-      for (size_t __k = 0; __k < __n; ++__k, ++__j, ++__g) 
-	__a._M_data[*__j] = __e._M_data[*__g];
-    }
-
-  // Copy n consecutive elements of e into elements of a.  Elements of
-  // a are skipped if the corresponding element of m is false.  m must
-  // have at least n true elements and a must have at least as many
-  // elements as the index of the nth true element of m.  I.e. if m
-  // has 5 false followed by 10 true elements and n == 10, a must have
-  // at least 15 elements.
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy(const _Expr<_Dom, _Tp>& __e, size_t __n,
-		    _Array<_Tp> __a, _Array<bool> __m)
-    {
-      bool* __ok (__m._M_data);
-      _Tp* __p (__a._M_data);
-      for (size_t __i = 0; __i < __n; ++__i, ++__ok, ++__p)
-	{
-	  while (! *__ok)
-	    {
-	      ++__ok;
-	      ++__p;
-	    }
-	  *__p = __e[__i];
-	}
-    }
-
-
-  template<typename _Tp, class _Dom>
-    void
-    __valarray_copy_construct(const _Expr<_Dom, _Tp>& __e, size_t __n,
-			      _Array<_Tp> __a)
-    {
-      _Tp* __p (__a._M_data);
-      for (size_t __i = 0; __i < __n; ++__i, ++__p)
-	new (__p) _Tp(__e[__i]);
-    }
-
-
-  template<typename _Tp>
-    void
-    __valarray_copy_construct(_Array<_Tp> __a, _Array<bool> __m,
-			      _Array<_Tp> __b, size_t __n)
-    {
-      _Tp* __p (__a._M_data);
-      bool* __ok (__m._M_data);
-      for (_Tp* __q = __b._M_data; __q < __b._M_data+__n; ++__q, ++__ok, ++__p)
-	{
-	  while (! *__ok)
-	    {
-	      ++__ok;
-	      ++__p;
-	    }
-	  new (__q) _Tp(*__p);
-	}
-    }
-} // namespace std
-
-#endif /* _VALARRAY_ARRAY_TCC */
diff --git a/include.new/c++/3.4/bits/valarray_before.h b/include.new/c++/3.4/bits/valarray_before.h
deleted file mode 100644
index 263ac2f..0000000
--- a/include.new/c++/3.4/bits/valarray_before.h
+++ /dev/null
@@ -1,701 +0,0 @@
-// The template and inlines for the -*- C++ -*- internal _Meta class.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@cmla.ens-cachan.fr>
-
-/** @file valarray_meta.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _VALARRAY_BEFORE_H
-#define _VALARRAY_BEFORE_H 1
-
-#pragma GCC system_header
-
-#include <bits/slice_array.h>
-
-namespace std
-{
-  //
-  // Implementing a loosened valarray return value is tricky.
-  // First we need to meet 26.3.1/3: we should not add more than
-  // two levels of template nesting. Therefore we resort to template
-  // template to "flatten" loosened return value types.
-  // At some point we use partial specialization to remove one level
-  // template nesting due to _Expr<>
-  //
-
-  // This class is NOT defined. It doesn't need to.
-  template<typename _Tp1, typename _Tp2> class _Constant;
-
-  // Implementations of unary functions applied to valarray<>s.
-  // I use hard-coded object functions here instead of a generic
-  // approach like pointers to function:
-  //    1) correctness: some functions take references, others values.
-  //       we can't deduce the correct type afterwards.
-  //    2) efficiency -- object functions can be easily inlined
-  //    3) be Koenig-lookup-friendly
-
-  struct __abs
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return abs(__t); }
-  };
-
-  struct __cos
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return cos(__t); }
-  };
-
-  struct __acos
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return acos(__t); }
-  };
-
-  struct __cosh
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return cosh(__t); }
-  };
-
-  struct __sin
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return sin(__t); }
-  };
-
-  struct __asin
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return asin(__t); }
-  };
-
-  struct __sinh
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return sinh(__t); }
-  };
-
-  struct __tan
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return tan(__t); }
-  };
-
-  struct __atan
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return atan(__t); }
-  };
-
-  struct __tanh
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return tanh(__t); }
-  };
-
-  struct __exp
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return exp(__t); }
-  };
-
-  struct __log
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return log(__t); }
-  };
-
-  struct __log10
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return log10(__t); }
-  };
-
-  struct __sqrt
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return sqrt(__t); }
-  };
-
-  // In the past, we used to tailor operator applications semantics
-  // to the specialization of standard function objects (i.e. plus<>, etc.)
-  // That is incorrect.  Therefore we provide our own surrogates.
-
-  struct __unary_plus
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return +__t; }
-  };
-
-  struct __negate
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return -__t; }
-  };
-
-  struct __bitwise_not
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __t) const { return ~__t; }
-  };
-
-  struct __plus
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x + __y; }
-  };
-
-  struct __minus
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x - __y; }
-  };
-
-  struct __multiplies
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x * __y; }
-  };
-
-  struct __divides
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x / __y; }
-  };
-
-  struct __modulus
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x % __y; }
-  };
-
-  struct __bitwise_xor
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x ^ __y; }
-  };
-
-  struct __bitwise_and
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x & __y; }
-  };
-
-  struct __bitwise_or
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x | __y; }
-  };
-
-  struct __shift_left
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x << __y; }
-  };
-
-  struct __shift_right
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x >> __y; }
-  };
-
-  struct __logical_and
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x && __y; }
-  };
-
-  struct __logical_or
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x || __y; }
-  };
-
-  struct __logical_not
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x) const { return !__x; }
-  };
-
-  struct __equal_to
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x == __y; }
-  };
-
-  struct __not_equal_to
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x != __y; }
-  };
-
-  struct __less
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x < __y; }
-  };
-
-  struct __greater
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x > __y; }
-  };
-
-  struct __less_equal
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x <= __y; }
-  };
-
-  struct __greater_equal
-  {
-    template<typename _Tp>
-      bool operator()(const _Tp& __x, const _Tp& __y) const
-      { return __x >= __y; }
-  };
-
-  // The few binary functions we miss.
-  struct __atan2
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return atan2(__x, __y); }
-  };
-
-  struct __pow
-  {
-    template<typename _Tp>
-      _Tp operator()(const _Tp& __x, const _Tp& __y) const
-      { return pow(__x, __y); }
-  };
-
-
-  // We need these bits in order to recover the return type of
-  // some functions/operators now that we're no longer using
-  // function templates.
-  template<typename, typename _Tp>
-    struct __fun
-    {
-      typedef _Tp result_type;
-    };
-
-  // several specializations for relational operators.
-  template<typename _Tp>
-    struct __fun<__logical_not, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__logical_and, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__logical_or, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__less, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__greater, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__less_equal, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__greater_equal, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__equal_to, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-  template<typename _Tp>
-    struct __fun<__not_equal_to, _Tp>
-    {
-      typedef bool result_type;
-    };
-
-    //
-    // Apply function taking a value/const reference closure
-    //
-
-  template<typename _Dom, typename _Arg>
-    class _FunBase
-    {
-    public:
-      typedef typename _Dom::value_type value_type;
-
-      _FunBase(const _Dom& __e, value_type __f(_Arg))
-	: _M_expr(__e), _M_func(__f) {}
-
-      value_type operator[](size_t __i) const
-      { return _M_func (_M_expr[__i]); }
-
-      size_t size() const { return _M_expr.size ();}
-
-    private:
-        const _Dom& _M_expr;
-        value_type (*_M_func)(_Arg);
-    };
-
-  template<class _Dom>
-    struct _ValFunClos<_Expr,_Dom> : _FunBase<_Dom, typename _Dom::value_type>
-    {
-      typedef _FunBase<_Dom, typename _Dom::value_type> _Base;
-      typedef typename _Base::value_type value_type;
-      typedef value_type _Tp;
-
-      _ValFunClos(const _Dom& __e, _Tp __f(_Tp)) : _Base(__e, __f) {}
-    };
-
-  template<typename _Tp>
-    struct _ValFunClos<_ValArray,_Tp> : _FunBase<valarray<_Tp>, _Tp>
-    {
-      typedef _FunBase<valarray<_Tp>, _Tp> _Base;
-      typedef _Tp value_type;
-
-      _ValFunClos(const valarray<_Tp>& __v, _Tp __f(_Tp)) : _Base(__v, __f) {}
-    };
-
-  template<class _Dom>
-    struct _RefFunClos<_Expr,_Dom> :
-        _FunBase<_Dom, const typename _Dom::value_type&>
-    {
-      typedef _FunBase<_Dom, const typename _Dom::value_type&> _Base;
-      typedef typename _Base::value_type value_type;
-      typedef value_type _Tp;
-
-      _RefFunClos(const _Dom& __e, _Tp __f(const _Tp&))
-	: _Base(__e, __f) {}
-    };
-
-  template<typename _Tp>
-    struct _RefFunClos<_ValArray,_Tp> : _FunBase<valarray<_Tp>, const _Tp&>
-    {
-      typedef _FunBase<valarray<_Tp>, const _Tp&> _Base;
-      typedef _Tp value_type;
-
-      _RefFunClos(const valarray<_Tp>& __v, _Tp __f(const _Tp&))
-	: _Base(__v, __f) {}
-    };
-
-  //
-  // Unary expression closure.
-  //
-
-  template<class _Oper, class _Arg>
-    class _UnBase
-    {
-    public:
-      typedef typename _Arg::value_type _Vt;
-      typedef typename __fun<_Oper, _Vt>::result_type value_type;
-
-      _UnBase(const _Arg& __e) : _M_expr(__e) {}
-
-      value_type operator[](size_t __i) const
-      { return _Oper()(_M_expr[__i]); }
-
-      size_t size() const { return _M_expr.size(); }
-
-    private:
-      const _Arg& _M_expr;
-    };
-
-  template<class _Oper, class _Dom>
-    struct _UnClos<_Oper, _Expr, _Dom> :  _UnBase<_Oper, _Dom>
-    {
-      typedef _Dom _Arg;
-      typedef _UnBase<_Oper, _Dom> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _UnClos(const _Arg& __e) : _Base(__e) {}
-    };
-
-  template<class _Oper, typename _Tp>
-    struct _UnClos<_Oper, _ValArray, _Tp> : _UnBase<_Oper, valarray<_Tp> >
-    {
-      typedef valarray<_Tp> _Arg;
-      typedef _UnBase<_Oper, valarray<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-
-      _UnClos(const _Arg& __e) : _Base(__e) {}
-    };
-
-
-  //
-  // Binary expression closure.
-  //
-
-  template<class _Oper, class _FirstArg, class _SecondArg>
-    class _BinBase
-    {
-    public:
-        typedef typename _FirstArg::value_type _Vt;
-        typedef typename __fun<_Oper, _Vt>::result_type value_type;
-
-      _BinBase(const _FirstArg& __e1, const _SecondArg& __e2)
-	: _M_expr1(__e1), _M_expr2(__e2) {}
-
-      value_type operator[](size_t __i) const
-      { return _Oper()(_M_expr1[__i], _M_expr2[__i]); }
-
-      size_t size() const { return _M_expr1.size(); }
-
-    private:
-      const _FirstArg& _M_expr1;
-      const _SecondArg& _M_expr2;
-    };
-
-
-  template<class _Oper, class _Clos>
-    class _BinBase2
-    {
-    public:
-      typedef typename _Clos::value_type _Vt;
-      typedef typename __fun<_Oper, _Vt>::result_type value_type;
-
-      _BinBase2(const _Clos& __e, const _Vt& __t)
-	: _M_expr1(__e), _M_expr2(__t) {}
-
-      value_type operator[](size_t __i) const
-      { return _Oper()(_M_expr1[__i], _M_expr2); }
-
-      size_t size() const { return _M_expr1.size(); }
-
-    private:
-      const _Clos& _M_expr1;
-      const _Vt& _M_expr2;
-    };
-
-  template<class _Oper, class _Clos>
-    class _BinBase1
-    {
-    public:
-      typedef typename _Clos::value_type _Vt;
-      typedef typename __fun<_Oper, _Vt>::result_type value_type;
-
-      _BinBase1(const _Vt& __t, const _Clos& __e)
-	: _M_expr1(__t), _M_expr2(__e) {}
-
-      value_type operator[](size_t __i) const
-      { return _Oper()(_M_expr1, _M_expr2[__i]); }
-
-      size_t size() const { return _M_expr2.size(); }
-
-    private:
-      const _Vt& _M_expr1;
-      const _Clos& _M_expr2;
-    };
-
-  template<class _Oper, class _Dom1, class _Dom2>
-    struct _BinClos<_Oper, _Expr, _Expr, _Dom1, _Dom2>
-        : _BinBase<_Oper,_Dom1,_Dom2>
-    {
-      typedef _BinBase<_Oper,_Dom1,_Dom2> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Dom1& __e1, const _Dom2& __e2) : _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, typename _Tp>
-    struct _BinClos<_Oper,_ValArray,_ValArray,_Tp,_Tp>
-      : _BinBase<_Oper,valarray<_Tp>,valarray<_Tp> >
-    {
-      typedef _BinBase<_Oper,valarray<_Tp>,valarray<_Tp> > _Base;
-      typedef _Tp value_type;
-
-      _BinClos(const valarray<_Tp>& __v, const valarray<_Tp>& __w)
-	: _Base(__v, __w) {}
-    };
-
-  template<class _Oper, class _Dom>
-    struct _BinClos<_Oper,_Expr,_ValArray,_Dom,typename _Dom::value_type>
-      : _BinBase<_Oper,_Dom,valarray<typename _Dom::value_type> >
-    {
-      typedef typename _Dom::value_type _Tp;
-      typedef _BinBase<_Oper,_Dom,valarray<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Dom& __e1, const valarray<_Tp>& __e2)
-	: _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, class _Dom>
-    struct  _BinClos<_Oper,_ValArray,_Expr,typename _Dom::value_type,_Dom>
-      : _BinBase<_Oper,valarray<typename _Dom::value_type>,_Dom>
-    {
-      typedef typename _Dom::value_type _Tp;
-      typedef _BinBase<_Oper,valarray<_Tp>,_Dom> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const valarray<_Tp>& __e1, const _Dom& __e2)
-	: _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, class _Dom>
-    struct _BinClos<_Oper,_Expr,_Constant,_Dom,typename _Dom::value_type>
-      : _BinBase2<_Oper,_Dom>
-    {
-      typedef typename _Dom::value_type _Tp;
-      typedef _BinBase2<_Oper,_Dom> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Dom& __e1, const _Tp& __e2) : _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, class _Dom>
-    struct _BinClos<_Oper,_Constant,_Expr,typename _Dom::value_type,_Dom>
-      : _BinBase1<_Oper,_Dom>
-    {
-      typedef typename _Dom::value_type _Tp;
-      typedef _BinBase1<_Oper,_Dom> _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Tp& __e1, const _Dom& __e2) : _Base(__e1, __e2) {}
-    };
-
-  template<class _Oper, typename _Tp>
-    struct _BinClos<_Oper,_ValArray,_Constant,_Tp,_Tp>
-      : _BinBase2<_Oper,valarray<_Tp> >
-    {
-      typedef _BinBase2<_Oper,valarray<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const valarray<_Tp>& __v, const _Tp& __t) : _Base(__v, __t) {}
-    };
-
-  template<class _Oper, typename _Tp>
-    struct _BinClos<_Oper,_Constant,_ValArray,_Tp,_Tp>
-      : _BinBase1<_Oper,valarray<_Tp> >
-    {
-      typedef _BinBase1<_Oper,valarray<_Tp> > _Base;
-      typedef typename _Base::value_type value_type;
-
-      _BinClos(const _Tp& __t, const valarray<_Tp>& __v) : _Base(__t, __v) {}
-    };
-
-
-    //
-    // slice_array closure.
-    //
-    template<typename _Dom>  class _SBase {
-    public:
-        typedef typename _Dom::value_type value_type;
-
-        _SBase (const _Dom& __e, const slice& __s)
-                : _M_expr (__e), _M_slice (__s) {}
-        value_type operator[] (size_t __i) const
-        { return _M_expr[_M_slice.start () + __i * _M_slice.stride ()]; }
-        size_t size() const { return _M_slice.size (); }
-
-    private:
-        const _Dom& _M_expr;
-        const slice& _M_slice;
-    };
-
-    template<typename _Tp> class _SBase<_Array<_Tp> > {
-    public:
-        typedef _Tp value_type;
-
-        _SBase (_Array<_Tp> __a, const slice& __s)
-                : _M_array (__a._M_data+__s.start()), _M_size (__s.size()),
-                  _M_stride (__s.stride()) {}
-        value_type operator[] (size_t __i) const
-        { return _M_array._M_data[__i * _M_stride]; }
-        size_t size() const { return _M_size; }
-
-    private:
-        const _Array<_Tp> _M_array;
-        const size_t _M_size;
-        const size_t _M_stride;
-    };
-
-    template<class _Dom> struct  _SClos<_Expr,_Dom> : _SBase<_Dom> {
-        typedef _SBase<_Dom> _Base;
-        typedef typename _Base::value_type value_type;
-
-        _SClos (const _Dom& __e, const slice& __s) : _Base (__e, __s) {}
-    };
-
-    template<typename _Tp>
-    struct _SClos<_ValArray,_Tp> : _SBase<_Array<_Tp> > {
-        typedef  _SBase<_Array<_Tp> > _Base;
-        typedef _Tp value_type;
-
-        _SClos (_Array<_Tp> __a, const slice& __s) : _Base (__a, __s) {}
-    };
-
-} // std::
-
-
-#endif /* _CPP_VALARRAY_BEFORE_H */
-
-// Local Variables:
-// mode:c++
-// End:
diff --git a/include.new/c++/3.4/bits/vector.tcc b/include.new/c++/3.4/bits/vector.tcc
deleted file mode 100644
index 786afab..0000000
--- a/include.new/c++/3.4/bits/vector.tcc
+++ /dev/null
@@ -1,414 +0,0 @@
-// Vector implementation (out of line) -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this  software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file vector.tcc
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _VECTOR_TCC
-#define _VECTOR_TCC 1
-
-namespace _GLIBCXX_STD
-{
-  template<typename _Tp, typename _Alloc>
-    void
-    vector<_Tp,_Alloc>::
-    reserve(size_type __n)
-    {
-      if (__n > this->max_size())
-	__throw_length_error(__N("vector::reserve"));
-      if (this->capacity() < __n)
-	{
-	  const size_type __old_size = size();
-	  pointer __tmp = _M_allocate_and_copy(__n,
-					       this->_M_impl._M_start,
-					       this->_M_impl._M_finish);
-	  std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish);
-	  _M_deallocate(this->_M_impl._M_start,
-			this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
-	  this->_M_impl._M_start = __tmp;
-	  this->_M_impl._M_finish = __tmp + __old_size;
-	  this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
-	}
-    }
-
-  template<typename _Tp, typename _Alloc>
-    typename vector<_Tp,_Alloc>::iterator
-    vector<_Tp,_Alloc>::
-    insert(iterator __position, const value_type& __x)
-    {
-      size_type __n = __position - begin();
-      if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage && __position == end())
-      {
-        std::_Construct(this->_M_impl._M_finish, __x);
-        ++this->_M_impl._M_finish;
-      }
-      else
-        _M_insert_aux(__position, __x);
-      return begin() + __n;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    typename vector<_Tp,_Alloc>::iterator
-    vector<_Tp,_Alloc>::
-    erase(iterator __position)
-    {
-      if (__position + 1 != end())
-        std::copy(__position + 1, end(), __position);
-      --this->_M_impl._M_finish;
-      std::_Destroy(this->_M_impl._M_finish);
-      return __position;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    typename vector<_Tp,_Alloc>::iterator
-    vector<_Tp,_Alloc>::
-    erase(iterator __first, iterator __last)
-    {
-      iterator __i(std::copy(__last, end(), __first));
-      std::_Destroy(__i, end());
-      this->_M_impl._M_finish = this->_M_impl._M_finish - (__last - __first);
-      return __first;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    vector<_Tp,_Alloc>&
-    vector<_Tp,_Alloc>::
-    operator=(const vector<_Tp,_Alloc>& __x)
-    {
-      if (&__x != this)
-      {
-        const size_type __xlen = __x.size();
-        if (__xlen > capacity())
-        {
-          pointer __tmp = _M_allocate_and_copy(__xlen, __x.begin(), __x.end());
-          std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish);
-          _M_deallocate(this->_M_impl._M_start,
-			this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
-          this->_M_impl._M_start = __tmp;
-          this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __xlen;
-        }
-        else if (size() >= __xlen)
-        {
-          iterator __i(std::copy(__x.begin(), __x.end(), begin()));
-          std::_Destroy(__i, end());
-        }
-        else
-        {
-          std::copy(__x.begin(), __x.begin() + size(), this->_M_impl._M_start);
-          std::uninitialized_copy(__x.begin() + size(), __x.end(), this->_M_impl._M_finish);
-        }
-        this->_M_impl._M_finish = this->_M_impl._M_start + __xlen;
-      }
-      return *this;
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    vector<_Tp,_Alloc>::
-    _M_fill_assign(size_t __n, const value_type& __val)
-    {
-      if (__n > capacity())
-      {
-        vector __tmp(__n, __val, get_allocator());
-        __tmp.swap(*this);
-      }
-      else if (__n > size())
-      {
-        std::fill(begin(), end(), __val);
-        this->_M_impl._M_finish
-	  = std::uninitialized_fill_n(this->_M_impl._M_finish, __n - size(), __val);
-      }
-      else
-        erase(fill_n(begin(), __n, __val), end());
-    }
-
-  template<typename _Tp, typename _Alloc> template<typename _InputIterator>
-    void
-    vector<_Tp,_Alloc>::
-    _M_assign_aux(_InputIterator __first, _InputIterator __last, input_iterator_tag)
-    {
-      iterator __cur(begin());
-      for ( ; __first != __last && __cur != end(); ++__cur, ++__first)
-        *__cur = *__first;
-      if (__first == __last)
-        erase(__cur, end());
-      else
-        insert(end(), __first, __last);
-    }
-
-  template<typename _Tp, typename _Alloc> template<typename _ForwardIterator>
-    void
-    vector<_Tp,_Alloc>::
-    _M_assign_aux(_ForwardIterator __first, _ForwardIterator __last,
-                  forward_iterator_tag)
-    {
-      size_type __len = std::distance(__first, __last);
-
-      if (__len > capacity())
-      {
-        pointer __tmp(_M_allocate_and_copy(__len, __first, __last));
-        std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish);
-        _M_deallocate(this->_M_impl._M_start,
-		      this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
-        this->_M_impl._M_start = __tmp;
-        this->_M_impl._M_end_of_storage = this->_M_impl._M_finish = this->_M_impl._M_start + __len;
-      }
-      else if (size() >= __len)
-      {
-        iterator __new_finish(std::copy(__first, __last, this->_M_impl._M_start));
-        std::_Destroy(__new_finish, end());
-        this->_M_impl._M_finish = __new_finish.base();
-      }
-      else
-      {
-        _ForwardIterator __mid = __first;
-        std::advance(__mid, size());
-        std::copy(__first, __mid, this->_M_impl._M_start);
-        this->_M_impl._M_finish = std::uninitialized_copy(__mid, __last, this->_M_impl._M_finish);
-      }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    vector<_Tp,_Alloc>::
-    _M_insert_aux(iterator __position, const _Tp& __x)
-    {
-      if (this->_M_impl._M_finish != this->_M_impl._M_end_of_storage)
-      {
-        std::_Construct(this->_M_impl._M_finish, *(this->_M_impl._M_finish - 1));
-        ++this->_M_impl._M_finish;
-        _Tp __x_copy = __x;
-        std::copy_backward(__position,
-			   iterator(this->_M_impl._M_finish-2),
-			   iterator(this->_M_impl._M_finish-1));
-        *__position = __x_copy;
-      }
-      else
-      {
-        const size_type __old_size = size();
-        const size_type __len = __old_size != 0 ? 2 * __old_size : 1;
-        iterator __new_start(this->_M_allocate(__len));
-        iterator __new_finish(__new_start);
-        try
-          {
-            __new_finish = std::uninitialized_copy(iterator(this->_M_impl._M_start),
-						   __position,
-						   __new_start);
-            std::_Construct(__new_finish.base(), __x);
-            ++__new_finish;
-            __new_finish = std::uninitialized_copy(__position,
-						   iterator(this->_M_impl._M_finish),
-						   __new_finish);
-          }
-        catch(...)
-          {
-            std::_Destroy(__new_start,__new_finish);
-            _M_deallocate(__new_start.base(),__len);
-            __throw_exception_again;
-          }
-        std::_Destroy(begin(), end());
-        _M_deallocate(this->_M_impl._M_start,
-		      this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
-        this->_M_impl._M_start = __new_start.base();
-        this->_M_impl._M_finish = __new_finish.base();
-        this->_M_impl._M_end_of_storage = __new_start.base() + __len;
-      }
-    }
-
-  template<typename _Tp, typename _Alloc>
-    void
-    vector<_Tp,_Alloc>::
-    _M_fill_insert(iterator __position, size_type __n, const value_type& __x)
-    {
-      if (__n != 0)
-      {
-        if (size_type(this->_M_impl._M_end_of_storage - this->_M_impl._M_finish) >= __n)
-	  {
-           value_type __x_copy = __x;
-	   const size_type __elems_after = end() - __position;
-	   iterator __old_finish(this->_M_impl._M_finish);
-	   if (__elems_after > __n)
-	     {
-	       std::uninitialized_copy(this->_M_impl._M_finish - __n,
-				       this->_M_impl._M_finish,
-				       this->_M_impl._M_finish);
-	       this->_M_impl._M_finish += __n;
-	       std::copy_backward(__position, __old_finish - __n, __old_finish);
-	       std::fill(__position, __position + __n, __x_copy);
-	     }
-	   else
-	     {
-	       std::uninitialized_fill_n(this->_M_impl._M_finish,
-					 __n - __elems_after,
-					 __x_copy);
-	       this->_M_impl._M_finish += __n - __elems_after;
-	       std::uninitialized_copy(__position, __old_finish, this->_M_impl._M_finish);
-	       this->_M_impl._M_finish += __elems_after;
-	       std::fill(__position, __old_finish, __x_copy);
-	     }
-	  }
-        else
-	  {
-	    const size_type __old_size = size();
-	    const size_type __len = __old_size + std::max(__old_size, __n);
-	    iterator __new_start(this->_M_allocate(__len));
-	    iterator __new_finish(__new_start);
-	    try
-	      {
-		__new_finish = std::uninitialized_copy(begin(), __position,
-						       __new_start);
-		__new_finish = std::uninitialized_fill_n(__new_finish, __n, __x);
-		__new_finish = std::uninitialized_copy(__position, end(),
-						       __new_finish);
-	      }
-	    catch(...)
-	      {
-		std::_Destroy(__new_start,__new_finish);
-		_M_deallocate(__new_start.base(),__len);
-		__throw_exception_again;
-	      }
-	    std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish);
-	    _M_deallocate(this->_M_impl._M_start,
-			  this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
-	    this->_M_impl._M_start = __new_start.base();
-	    this->_M_impl._M_finish = __new_finish.base();
-	    this->_M_impl._M_end_of_storage = __new_start.base() + __len;
-	  }
-      }
-    }
-
-  template<typename _Tp, typename _Alloc> template<typename _InputIterator>
-    void
-    vector<_Tp,_Alloc>::
-    _M_range_insert(iterator __pos,
-                    _InputIterator __first, _InputIterator __last,
-                    input_iterator_tag)
-    {
-      for ( ; __first != __last; ++__first)
-      {
-        __pos = insert(__pos, *__first);
-        ++__pos;
-      }
-    }
-
-  template<typename _Tp, typename _Alloc> template<typename _ForwardIterator>
-    void
-    vector<_Tp,_Alloc>::
-    _M_range_insert(iterator __position,_ForwardIterator __first,
-		    _ForwardIterator __last, forward_iterator_tag)
-    {
-      if (__first != __last)
-      {
-        size_type __n = std::distance(__first, __last);
-        if (size_type(this->_M_impl._M_end_of_storage - this->_M_impl._M_finish) >= __n)
-        {
-          const size_type __elems_after = end() - __position;
-          iterator __old_finish(this->_M_impl._M_finish);
-          if (__elems_after > __n)
-          {
-            std::uninitialized_copy(this->_M_impl._M_finish - __n,
-				    this->_M_impl._M_finish,
-				    this->_M_impl._M_finish);
-            this->_M_impl._M_finish += __n;
-            std::copy_backward(__position, __old_finish - __n, __old_finish);
-            std::copy(__first, __last, __position);
-          }
-          else
-          {
-            _ForwardIterator __mid = __first;
-            std::advance(__mid, __elems_after);
-            std::uninitialized_copy(__mid, __last, this->_M_impl._M_finish);
-            this->_M_impl._M_finish += __n - __elems_after;
-            std::uninitialized_copy(__position, __old_finish, this->_M_impl._M_finish);
-            this->_M_impl._M_finish += __elems_after;
-            std::copy(__first, __mid, __position);
-          }
-        }
-        else
-        {
-          const size_type __old_size = size();
-          const size_type __len = __old_size + std::max(__old_size, __n);
-          iterator __new_start(this->_M_allocate(__len));
-          iterator __new_finish(__new_start);
-          try
-            {
-              __new_finish = std::uninitialized_copy(iterator(this->_M_impl._M_start),
-						     __position, __new_start);
-              __new_finish = std::uninitialized_copy(__first, __last,
-						     __new_finish);
-              __new_finish = std::uninitialized_copy(__position,
-						     iterator(this->_M_impl._M_finish),
-						     __new_finish);
-            }
-          catch(...)
-            {
-              std::_Destroy(__new_start,__new_finish);
-              _M_deallocate(__new_start.base(), __len);
-              __throw_exception_again;
-            }
-          std::_Destroy(this->_M_impl._M_start, this->_M_impl._M_finish);
-          _M_deallocate(this->_M_impl._M_start,
-			this->_M_impl._M_end_of_storage - this->_M_impl._M_start);
-          this->_M_impl._M_start = __new_start.base();
-          this->_M_impl._M_finish = __new_finish.base();
-          this->_M_impl._M_end_of_storage = __new_start.base() + __len;
-        }
-      }
-    }
-} // namespace std
-
-#endif /* _VECTOR_TCC */
diff --git a/include.new/c++/3.4/bitset b/include.new/c++/3.4/bitset
deleted file mode 100644
index 01e3f90..0000000
--- a/include.new/c++/3.4/bitset
+++ /dev/null
@@ -1,1229 +0,0 @@
-// <bitset> -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file bitset
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_BITSET
-#define _GLIBCXX_BITSET 1
-
-#pragma GCC system_header
-
-#include <cstddef>     // For size_t
-#include <cstring>     // For memset
-#include <limits>      // For numeric_limits
-#include <string>
-#include <bits/functexcept.h>   // For invalid_argument, out_of_range,
-                                // overflow_error
-#include <ostream>     // For ostream (operator<<)
-#include <istream>     // For istream (operator>>)
-
-#define _GLIBCXX_BITSET_BITS_PER_WORD  numeric_limits<unsigned long>::digits
-#define _GLIBCXX_BITSET_WORDS(__n) \
- ((__n) < 1 ? 0 : ((__n) + _GLIBCXX_BITSET_BITS_PER_WORD - 1)/_GLIBCXX_BITSET_BITS_PER_WORD)
-
-namespace _GLIBCXX_STD
-{
-  /**
-   *  @if maint
-   *  Base class, general case.  It is a class inveriant that _Nw will be
-   *  nonnegative.
-   *
-   *  See documentation for bitset.
-   *  @endif
-  */
-  template<size_t _Nw>
-    struct _Base_bitset
-    {
-      typedef unsigned long _WordT;
-
-      /// 0 is the least significant word.
-      _WordT 		_M_w[_Nw];
-
-      _Base_bitset() { _M_do_reset(); }
-      _Base_bitset(unsigned long __val)
-      {
-	_M_do_reset();
-	_M_w[0] = __val;
-      }
-
-      static size_t
-      _S_whichword(size_t __pos )
-      { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static size_t
-      _S_whichbyte(size_t __pos )
-      { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
-
-      static size_t
-      _S_whichbit(size_t __pos )
-      { return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static _WordT
-      _S_maskbit(size_t __pos )
-      { return (static_cast<_WordT>(1)) << _S_whichbit(__pos); }
-
-      _WordT&
-      _M_getword(size_t __pos)
-      { return _M_w[_S_whichword(__pos)]; }
-
-      _WordT
-      _M_getword(size_t __pos) const
-      { return _M_w[_S_whichword(__pos)]; }
-
-      _WordT&
-      _M_hiword() { return _M_w[_Nw - 1]; }
-
-      _WordT
-      _M_hiword() const { return _M_w[_Nw - 1]; }
-
-      void
-      _M_do_and(const _Base_bitset<_Nw>& __x)
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] &= __x._M_w[__i];
-      }
-
-      void
-      _M_do_or(const _Base_bitset<_Nw>& __x)
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] |= __x._M_w[__i];
-      }
-
-      void
-      _M_do_xor(const _Base_bitset<_Nw>& __x)
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] ^= __x._M_w[__i];
-      }
-
-      void
-      _M_do_left_shift(size_t __shift);
-
-      void
-      _M_do_right_shift(size_t __shift);
-
-      void
-      _M_do_flip()
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] = ~_M_w[__i];
-      }
-
-      void
-      _M_do_set()
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  _M_w[__i] = ~static_cast<_WordT>(0);
-      }
-
-      void
-      _M_do_reset() { memset(_M_w, 0, _Nw * sizeof(_WordT)); }
-
-      bool
-      _M_is_equal(const _Base_bitset<_Nw>& __x) const
-      {
-	for (size_t __i = 0; __i < _Nw; ++__i)
-	  {
-	    if (_M_w[__i] != __x._M_w[__i])
-	      return false;
-	  }
-	return true;
-      }
-
-      bool
-      _M_is_any() const
-      {
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  {
-	    if (_M_w[__i] != static_cast<_WordT>(0))
-	      return true;
-	  }
-	return false;
-      }
-
-      size_t
-      _M_do_count() const
-      {
-	size_t __result = 0;
-	for (size_t __i = 0; __i < _Nw; __i++)
-	  __result += __builtin_popcountl(_M_w[__i]);
-	return __result;
-      }
-
-      unsigned long
-      _M_do_to_ulong() const;
-
-      // find first "on" bit
-      size_t
-      _M_do_find_first(size_t __not_found) const;
-
-      // find the next "on" bit that follows "prev"
-      size_t
-      _M_do_find_next(size_t __prev, size_t __not_found) const;
-    };
-
-  // Definitions of non-inline functions from _Base_bitset.
-  template<size_t _Nw>
-    void
-    _Base_bitset<_Nw>::_M_do_left_shift(size_t __shift)
-    {
-      if (__builtin_expect(__shift != 0, 1))
-	{
-	  const size_t __wshift = __shift / _GLIBCXX_BITSET_BITS_PER_WORD;
-	  const size_t __offset = __shift % _GLIBCXX_BITSET_BITS_PER_WORD;
-
-	  if (__offset == 0)
-	    for (size_t __n = _Nw - 1; __n >= __wshift; --__n)
-	      _M_w[__n] = _M_w[__n - __wshift];
-	  else
-	    {
-	      const size_t __sub_offset = _GLIBCXX_BITSET_BITS_PER_WORD - __offset;
-	      for (size_t __n = _Nw - 1; __n > __wshift; --__n)
-		_M_w[__n] = (_M_w[__n - __wshift] << __offset) |
-		  (_M_w[__n - __wshift - 1] >> __sub_offset);
-	      _M_w[__wshift] = _M_w[0] << __offset;
-	    }
-
-	  std::fill(_M_w + 0, _M_w + __wshift, static_cast<_WordT>(0));
-	}
-    }
-
-  template<size_t _Nw>
-    void
-    _Base_bitset<_Nw>::_M_do_right_shift(size_t __shift)
-    {
-      if (__builtin_expect(__shift != 0, 1))
-	{
-	  const size_t __wshift = __shift / _GLIBCXX_BITSET_BITS_PER_WORD;
-	  const size_t __offset = __shift % _GLIBCXX_BITSET_BITS_PER_WORD;
-	  const size_t __limit = _Nw - __wshift - 1;
-
-	  if (__offset == 0)
-	    for (size_t __n = 0; __n <= __limit; ++__n)
-	      _M_w[__n] = _M_w[__n + __wshift];
-	  else
-	    {
-	      const size_t __sub_offset = _GLIBCXX_BITSET_BITS_PER_WORD - __offset;
-	      for (size_t __n = 0; __n < __limit; ++__n)
-		_M_w[__n] = (_M_w[__n + __wshift] >> __offset) |
-		  (_M_w[__n + __wshift + 1] << __sub_offset);
-	      _M_w[__limit] = _M_w[_Nw-1] >> __offset;
-	    }
-	  
-	  std::fill(_M_w + __limit + 1, _M_w + _Nw, static_cast<_WordT>(0));
-	}
-    }
-
-  template<size_t _Nw>
-    unsigned long
-    _Base_bitset<_Nw>::_M_do_to_ulong() const
-    {
-      for (size_t __i = 1; __i < _Nw; ++__i)
-	if (_M_w[__i])
-	  __throw_overflow_error(__N("_Base_bitset::_M_do_to_ulong"));
-      return _M_w[0];
-    }
-
-  template<size_t _Nw>
-    size_t
-    _Base_bitset<_Nw>::_M_do_find_first(size_t __not_found) const
-    {
-      for (size_t __i = 0; __i < _Nw; __i++)
-	{
-	  _WordT __thisword = _M_w[__i];
-	  if (__thisword != static_cast<_WordT>(0))
-	    return __i * _GLIBCXX_BITSET_BITS_PER_WORD
-	      + __builtin_ctzl(__thisword);
-	}
-      // not found, so return an indication of failure.
-      return __not_found;
-    }
-
-  template<size_t _Nw>
-    size_t
-    _Base_bitset<_Nw>::_M_do_find_next(size_t __prev, size_t __not_found) const
-    {
-      // make bound inclusive
-      ++__prev;
-
-      // check out of bounds
-      if (__prev >= _Nw * _GLIBCXX_BITSET_BITS_PER_WORD)
-	return __not_found;
-
-      // search first word
-      size_t __i = _S_whichword(__prev);
-      _WordT __thisword = _M_w[__i];
-
-      // mask off bits below bound
-      __thisword &= (~static_cast<_WordT>(0)) << _S_whichbit(__prev);
-
-      if (__thisword != static_cast<_WordT>(0))
-	return __i * _GLIBCXX_BITSET_BITS_PER_WORD
-	  + __builtin_ctzl(__thisword);
-
-      // check subsequent words
-      __i++;
-      for ( ; __i < _Nw; __i++ )
-	{
-	  __thisword = _M_w[__i];
-	  if (__thisword != static_cast<_WordT>(0))
-	    return __i * _GLIBCXX_BITSET_BITS_PER_WORD
-	      + __builtin_ctzl(__thisword);
-	}
-      // not found, so return an indication of failure.
-      return __not_found;
-    } // end _M_do_find_next
-
-
-  /**
-   *  @if maint
-   *  Base class, specialization for a single word.
-   *
-   *  See documentation for bitset.
-   *  @endif
-  */
-  template<>
-    struct _Base_bitset<1>
-    {
-      typedef unsigned long _WordT;
-      _WordT _M_w;
-
-      _Base_bitset( void ) : _M_w(0) {}
-      _Base_bitset(unsigned long __val) : _M_w(__val) {}
-
-      static size_t
-      _S_whichword(size_t __pos )
-      { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static size_t
-      _S_whichbyte(size_t __pos )
-      { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
-
-      static size_t
-      _S_whichbit(size_t __pos )
-      {  return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static _WordT
-      _S_maskbit(size_t __pos )
-      { return (static_cast<_WordT>(1)) << _S_whichbit(__pos); }
-
-      _WordT&
-      _M_getword(size_t) { return _M_w; }
-
-      _WordT
-      _M_getword(size_t) const { return _M_w; }
-
-      _WordT&
-      _M_hiword() { return _M_w; }
-
-      _WordT
-      _M_hiword() const { return _M_w; }
-
-      void
-      _M_do_and(const _Base_bitset<1>& __x) { _M_w &= __x._M_w; }
-
-      void
-      _M_do_or(const _Base_bitset<1>& __x)  { _M_w |= __x._M_w; }
-
-      void
-      _M_do_xor(const _Base_bitset<1>& __x) { _M_w ^= __x._M_w; }
-
-      void
-      _M_do_left_shift(size_t __shift) { _M_w <<= __shift; }
-
-      void
-      _M_do_right_shift(size_t __shift) { _M_w >>= __shift; }
-
-      void
-      _M_do_flip() { _M_w = ~_M_w; }
-
-      void
-      _M_do_set() { _M_w = ~static_cast<_WordT>(0); }
-
-      void
-      _M_do_reset() { _M_w = 0; }
-
-      bool
-      _M_is_equal(const _Base_bitset<1>& __x) const
-      { return _M_w == __x._M_w; }
-
-      bool
-      _M_is_any() const { return _M_w != 0; }
-
-      size_t
-      _M_do_count() const { return __builtin_popcountl(_M_w); }
-
-      unsigned long
-      _M_do_to_ulong() const { return _M_w; }
-
-      size_t
-      _M_do_find_first(size_t __not_found) const
-      {
-        if (_M_w != 0)
-          return __builtin_ctzl(_M_w);
-        else
-          return __not_found;
-      }
-
-      // find the next "on" bit that follows "prev"
-      size_t
-      _M_do_find_next(size_t __prev, size_t __not_found) const
-      {
-	++__prev;
-	if (__prev >= ((size_t) _GLIBCXX_BITSET_BITS_PER_WORD))
-	  return __not_found;
-
-	_WordT __x = _M_w >> __prev;
-	if (__x != 0)
-	  return __builtin_ctzl(__x) + __prev;
-	else
-	  return __not_found;
-      }
-    };
-
-
-  /**
-   *  @if maint
-   *  Base class, specialization for no storage (zero-length %bitset).
-   *
-   *  See documentation for bitset.
-   *  @endif
-  */
-  template<>
-    struct _Base_bitset<0>
-    {
-      typedef unsigned long _WordT;
-
-      _Base_bitset() {}
-      _Base_bitset(unsigned long) {}
-
-      static size_t
-      _S_whichword(size_t __pos )
-      { return __pos / _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static size_t
-      _S_whichbyte(size_t __pos )
-      { return (__pos % _GLIBCXX_BITSET_BITS_PER_WORD) / __CHAR_BIT__; }
-
-      static size_t
-      _S_whichbit(size_t __pos )
-      {  return __pos % _GLIBCXX_BITSET_BITS_PER_WORD; }
-
-      static _WordT
-      _S_maskbit(size_t __pos )
-      { return (static_cast<_WordT>(1)) << _S_whichbit(__pos); }
-
-      // This would normally give access to the data.  The bounds-checking
-      // in the bitset class will prevent the user from getting this far,
-      // but (1) it must still return an lvalue to compile, and (2) the
-      // user might call _Unchecked_set directly, in which case this /needs/
-      // to fail.  Let's not penalize zero-length users unless they actually
-      // make an unchecked call; all the memory ugliness is therefore
-      // localized to this single should-never-get-this-far function.
-      _WordT&
-      _M_getword(size_t) const
-      { 
-	__throw_out_of_range(__N("_Base_bitset::_M_getword")); 
-	return *new _WordT; 
-      }
-
-      _WordT
-      _M_hiword() const { return 0; }
-
-      void
-      _M_do_and(const _Base_bitset<0>&) { }
-
-      void
-      _M_do_or(const _Base_bitset<0>&)  { }
-
-      void
-      _M_do_xor(const _Base_bitset<0>&) { }
-
-      void
-      _M_do_left_shift(size_t) { }
-
-      void
-      _M_do_right_shift(size_t) { }
-
-      void
-      _M_do_flip() { }
-
-      void
-      _M_do_set() { }
-
-      void
-      _M_do_reset() { }
-
-      // Are all empty bitsets equal to each other?  Are they equal to
-      // themselves?  How to compare a thing which has no state?  What is
-      // the sound of one zero-length bitset clapping?
-      bool
-      _M_is_equal(const _Base_bitset<0>&) const { return true; }
-
-      bool
-      _M_is_any() const { return false; }
-
-      size_t
-      _M_do_count() const { return 0; }
-
-      unsigned long
-      _M_do_to_ulong() const { return 0; }
-
-      // Normally "not found" is the size, but that could also be
-      // misinterpreted as an index in this corner case.  Oh well.
-      size_t
-      _M_do_find_first(size_t) const { return 0; }
-
-      size_t
-      _M_do_find_next(size_t, size_t) const { return 0; }
-    };
-
-
-  // Helper class to zero out the unused high-order bits in the highest word.
-  template<size_t _Extrabits>
-    struct _Sanitize
-    {
-      static void _S_do_sanitize(unsigned long& __val)
-      { __val &= ~((~static_cast<unsigned long>(0)) << _Extrabits); }
-    };
-
-  template<>
-    struct _Sanitize<0>
-    { static void _S_do_sanitize(unsigned long) { } };
-
-
-  /**
-   *  @brief  The %bitset class represents a @e fixed-size sequence of bits.
-   *
-   *  @ingroup Containers
-   *
-   *  (Note that %bitset does @e not meet the formal requirements of a
-   *  <a href="tables.html#65">container</a>.  Mainly, it lacks iterators.)
-   *
-   *  The template argument, @a Nb, may be any non-negative number,
-   *  specifying the number of bits (e.g., "0", "12", "1024*1024").
-   *
-   *  In the general unoptimized case, storage is allocated in word-sized
-   *  blocks.  Let B be the number of bits in a word, then (Nb+(B-1))/B
-   *  words will be used for storage.  B - Nb%B bits are unused.  (They are
-   *  the high-order bits in the highest word.)  It is a class invariant
-   *  that those unused bits are always zero.
-   *
-   *  If you think of %bitset as "a simple array of bits," be aware that
-   *  your mental picture is reversed:  a %bitset behaves the same way as
-   *  bits in integers do, with the bit at index 0 in the "least significant
-   *  / right-hand" position, and the bit at index Nb-1 in the "most
-   *  significant / left-hand" position.  Thus, unlike other containers, a
-   *  %bitset's index "counts from right to left," to put it very loosely.
-   *
-   *  This behavior is preserved when translating to and from strings.  For
-   *  example, the first line of the following program probably prints
-   *  "b('a') is 0001100001" on a modern ASCII system.
-   *
-   *  @code
-   *     #include <bitset>
-   *     #include <iostream>
-   *     #include <sstream>
-   *
-   *     using namespace std;
-   *
-   *     int main()
-   *     {
-   *         long         a = 'a';
-   *         bitset<10>   b(a);
-   *
-   *         cout << "b('a') is " << b << endl;
-   *
-   *         ostringstream s;
-   *         s << b;
-   *         string  str = s.str();
-   *         cout << "index 3 in the string is " << str[3] << " but\n"
-   *              << "index 3 in the bitset is " << b[3] << endl;
-   *     }
-   *  @endcode
-   *
-   *  Also see http://gcc.gnu.org/onlinedocs/libstdc++/ext/sgiexts.html#ch23
-   *  for a description of extensions.
-   *
-   *  @if maint
-   *  Most of the actual code isn't contained in %bitset<> itself, but in the
-   *  base class _Base_bitset.  The base class works with whole words, not with
-   *  individual bits.  This allows us to specialize _Base_bitset for the
-   *  important special case where the %bitset is only a single word.
-   *
-   *  Extra confusion can result due to the fact that the storage for
-   *  _Base_bitset @e is a regular array, and is indexed as such.  This is
-   *  carefully encapsulated.
-   *  @endif
-  */
-  template<size_t _Nb>
-    class bitset : private _Base_bitset<_GLIBCXX_BITSET_WORDS(_Nb)>
-  {
-  private:
-    typedef _Base_bitset<_GLIBCXX_BITSET_WORDS(_Nb)> _Base;
-    typedef unsigned long _WordT;
-
-    void
-    _M_do_sanitize()
-    {
-      _Sanitize<_Nb%_GLIBCXX_BITSET_BITS_PER_WORD>::
-          _S_do_sanitize(this->_M_hiword());
-    }
-
-  public:
-    /**
-     *  This encapsulates the concept of a single bit.  An instance of this
-     *  class is a proxy for an actual bit; this way the individual bit
-     *  operations are done as faster word-size bitwise instructions.
-     *
-     *  Most users will never need to use this class directly; conversions
-     *  to and from bool are automatic and should be transparent.  Overloaded
-     *  operators help to preserve the illusion.
-     *
-     *  (On a typical system, this "bit %reference" is 64 times the size of
-     *  an actual bit.  Ha.)
-    */
-    class reference
-    {
-      friend class bitset;
-
-      _WordT *_M_wp;
-      size_t _M_bpos;
-
-      // left undefined
-      reference();
-
-    public:
-      reference(bitset& __b, size_t __pos)
-      {
-	_M_wp = &__b._M_getword(__pos);
-	_M_bpos = _Base::_S_whichbit(__pos);
-      }
-
-      ~reference() { }
-
-      // For b[i] = __x;
-      reference&
-      operator=(bool __x)
-      {
-	if ( __x )
-	  *_M_wp |= _Base::_S_maskbit(_M_bpos);
-	else
-	  *_M_wp &= ~_Base::_S_maskbit(_M_bpos);
-	return *this;
-      }
-
-      // For b[i] = b[__j];
-      reference&
-      operator=(const reference& __j)
-      {
-	if ( (*(__j._M_wp) & _Base::_S_maskbit(__j._M_bpos)) )
-	  *_M_wp |= _Base::_S_maskbit(_M_bpos);
-	else
-	  *_M_wp &= ~_Base::_S_maskbit(_M_bpos);
-	return *this;
-      }
-
-      // Flips the bit
-      bool
-      operator~() const
-      { return (*(_M_wp) & _Base::_S_maskbit(_M_bpos)) == 0; }
-
-      // For __x = b[i];
-      operator bool() const
-      { return (*(_M_wp) & _Base::_S_maskbit(_M_bpos)) != 0; }
-
-      // For b[i].flip();
-      reference&
-      flip()
-      {
-	*_M_wp ^= _Base::_S_maskbit(_M_bpos);
-	return *this;
-      }
-    };
-    friend class reference;
-
-    // 23.3.5.1 constructors:
-    /// All bits set to zero.
-    bitset() { }
-
-    /// Initial bits bitwise-copied from a single word (others set to zero).
-    bitset(unsigned long __val) : _Base(__val)
-    { _M_do_sanitize(); }
-
-    /**
-     *  @brief  Use a subset of a string.
-     *  @param  s  A string of '0' and '1' characters.
-     *  @param  position  Index of the first character in @a s to use; defaults
-     *               to zero.
-     *  @throw  std::out_of_range  If @a pos is bigger the size of @a s.
-     *  @throw  std::invalid_argument  If a character appears in the string
-     *                                 which is neither '0' nor '1'.
-    */
-    template<class _CharT, class _Traits, class _Alloc>
-      explicit bitset(const basic_string<_CharT, _Traits, _Alloc>& __s,
-		      size_t __position = 0) : _Base()
-      {
-	if (__position > __s.size())
-	  __throw_out_of_range(__N("bitset::bitset initial position "
-				   "not valid"));
-	_M_copy_from_string(__s, __position,
-			    basic_string<_CharT, _Traits, _Alloc>::npos);
-      }
-
-    /**
-     *  @brief  Use a subset of a string.
-     *  @param  s  A string of '0' and '1' characters.
-     *  @param  position  Index of the first character in @a s to use.
-     *  @param  n    The number of characters to copy.
-     *  @throw  std::out_of_range  If @a pos is bigger the size of @a s.
-     *  @throw  std::invalid_argument  If a character appears in the string
-     *                                 which is neither '0' nor '1'.
-    */
-    template<class _CharT, class _Traits, class _Alloc>
-      bitset(const basic_string<_CharT, _Traits, _Alloc>& __s,
-	     size_t __position, size_t __n) : _Base()
-      {
-	if (__position > __s.size())
-	 __throw_out_of_range(__N("bitset::bitset initial position "
-				  "not valid"));
-	_M_copy_from_string(__s, __position, __n);
-      }
-
-    // 23.3.5.2 bitset operations:
-    //@{
-    /**
-     *  @brief  Operations on bitsets.
-     *  @param  rhs  A same-sized bitset.
-     *
-     *  These should be self-explanatory.
-    */
-    bitset<_Nb>&
-    operator&=(const bitset<_Nb>& __rhs)
-    {
-      this->_M_do_and(__rhs);
-      return *this;
-    }
-
-    bitset<_Nb>&
-    operator|=(const bitset<_Nb>& __rhs)
-    {
-      this->_M_do_or(__rhs);
-      return *this;
-    }
-
-    bitset<_Nb>&
-    operator^=(const bitset<_Nb>& __rhs)
-    {
-      this->_M_do_xor(__rhs);
-      return *this;
-    }
-    //@}
-
-    //@{
-    /**
-     *  @brief  Operations on bitsets.
-     *  @param  position  The number of places to shift.
-     *
-     *  These should be self-explanatory.
-    */
-    bitset<_Nb>&
-    operator<<=(size_t __position)
-    {
-      if (__builtin_expect(__position < _Nb, 1))
-        {
-          this->_M_do_left_shift(__position);
-          this->_M_do_sanitize();
-        }
-      else
-	this->_M_do_reset();
-      return *this;
-    }
-
-    bitset<_Nb>&
-    operator>>=(size_t __position)
-    {
-      if (__builtin_expect(__position < _Nb, 1))
-        {
-          this->_M_do_right_shift(__position);
-          this->_M_do_sanitize();
-        }
-      else
-	this->_M_do_reset();
-      return *this;
-    }
-    //@}
-
-    //@{
-    /**
-     *  These versions of single-bit set, reset, flip, and test are
-     *  extensions from the SGI version.  They do no range checking.
-     *  @ingroup SGIextensions
-    */
-    bitset<_Nb>&
-    _Unchecked_set(size_t __pos)
-    {
-      this->_M_getword(__pos) |= _Base::_S_maskbit(__pos);
-      return *this;
-    }
-
-    bitset<_Nb>&
-    _Unchecked_set(size_t __pos, int __val)
-    {
-      if (__val)
-	this->_M_getword(__pos) |= _Base::_S_maskbit(__pos);
-      else
-	this->_M_getword(__pos) &= ~_Base::_S_maskbit(__pos);
-      return *this;
-    }
-
-    bitset<_Nb>&
-    _Unchecked_reset(size_t __pos)
-    {
-      this->_M_getword(__pos) &= ~_Base::_S_maskbit(__pos);
-      return *this;
-    }
-
-    bitset<_Nb>&
-    _Unchecked_flip(size_t __pos)
-    {
-      this->_M_getword(__pos) ^= _Base::_S_maskbit(__pos);
-      return *this;
-    }
-
-    bool
-    _Unchecked_test(size_t __pos) const
-    {
-      return (this->_M_getword(__pos) & _Base::_S_maskbit(__pos))
-	!= static_cast<_WordT>(0);
-    }
-    //@}
-
-    // Set, reset, and flip.
-    /**
-     *  @brief Sets every bit to true.
-    */
-    bitset<_Nb>&
-    set()
-    {
-      this->_M_do_set();
-      this->_M_do_sanitize();
-      return *this;
-    }
-
-    /**
-     *  @brief Sets a given bit to a particular value.
-     *  @param  position  The index of the bit.
-     *  @param  val  Either true or false, defaults to true.
-     *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
-    */
-    bitset<_Nb>&
-    set(size_t __position, bool __val = true)
-    {
-      if (__position >= _Nb)
-	__throw_out_of_range(__N("bitset::set"));
-      return _Unchecked_set(__position, __val);
-    }
-
-    /**
-     *  @brief Sets every bit to false.
-    */
-    bitset<_Nb>&
-    reset()
-    {
-      this->_M_do_reset();
-      return *this;
-    }
-
-    /**
-     *  @brief Sets a given bit to false.
-     *  @param  position  The index of the bit.
-     *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
-     *
-     *  Same as writing @c set(pos,false).
-    */
-    bitset<_Nb>&
-    reset(size_t __position)
-    {
-      if (__position >= _Nb)
-	__throw_out_of_range(__N("bitset::reset"));
-      return _Unchecked_reset(__position);
-    }
-
-    /**
-     *  @brief Toggles every bit to its opposite value.
-    */
-    bitset<_Nb>&
-    flip()
-    {
-      this->_M_do_flip();
-      this->_M_do_sanitize();
-      return *this;
-    }
-
-    /**
-     *  @brief Toggles a given bit to its opposite value.
-     *  @param  position  The index of the bit.
-     *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
-    */
-    bitset<_Nb>&
-    flip(size_t __position)
-    {
-      if (__position >= _Nb)
-	__throw_out_of_range(__N("bitset::flip"));
-      return _Unchecked_flip(__position);
-    }
-
-    /// See the no-argument flip().
-    bitset<_Nb>
-    operator~() const { return bitset<_Nb>(*this).flip(); }
-
-    //@{
-    /**
-     *  @brief  Array-indexing support.
-     *  @param  position  Index into the %bitset.
-     *  @return  A bool for a 'const %bitset'.  For non-const bitsets, an
-     *           instance of the reference proxy class.
-     *  @note  These operators do no range checking and throw no exceptions,
-     *         as required by DR 11 to the standard.
-     *
-     *  @if maint
-     *  _GLIBCXX_RESOLVE_LIB_DEFECTS Note that this implementation already
-     *  resolves DR 11 (items 1 and 2), but does not do the range-checking
-     *  required by that DR's resolution.  -pme
-     *  The DR has since been changed:  range-checking is a precondition
-     *  (users' responsibility), and these functions must not throw.  -pme
-     *  @endif
-    */
-    reference
-    operator[](size_t __position) { return reference(*this,__position); }
-
-    bool
-    operator[](size_t __position) const { return _Unchecked_test(__position); }
-    //@}
-
-    /**
-     *  @brief Retuns a numerical interpretation of the %bitset.
-     *  @return  The integral equivalent of the bits.
-     *  @throw  std::overflow_error  If there are too many bits to be
-     *                               represented in an @c unsigned @c long.
-    */
-    unsigned long
-    to_ulong() const { return this->_M_do_to_ulong(); }
-
-    /**
-     *  @brief Retuns a character interpretation of the %bitset.
-     *  @return  The string equivalent of the bits.
-     *
-     *  Note the ordering of the bits:  decreasing character positions
-     *  correspond to increasing bit positions (see the main class notes for
-     *  an example).
-     *
-     *  Also note that you must specify the string's template parameters
-     *  explicitly.  Given a bitset @c bs and a string @s:
-     *  @code
-     *     s = bs.to_string<char,char_traits<char>,allocator<char> >();
-     *  @endcode
-    */
-    template<class _CharT, class _Traits, class _Alloc>
-      basic_string<_CharT, _Traits, _Alloc>
-      to_string() const
-      {
-	basic_string<_CharT, _Traits, _Alloc> __result;
-	_M_copy_to_string(__result);
-	return __result;
-      }
-
-    // Helper functions for string operations.
-    template<class _CharT, class _Traits, class _Alloc>
-      void
-      _M_copy_from_string(const basic_string<_CharT,_Traits,_Alloc>& __s,
-                          size_t, size_t);
-
-    template<class _CharT, class _Traits, class _Alloc>
-      void
-      _M_copy_to_string(basic_string<_CharT,_Traits,_Alloc>&) const;
-
-    /// Returns the number of bits which are set.
-    size_t
-    count() const { return this->_M_do_count(); }
-
-    /// Returns the total number of bits.
-    size_t
-    size() const { return _Nb; }
-
-    //@{
-    /// These comparisons for equality/inequality are, well, @e bitwise.
-    bool
-    operator==(const bitset<_Nb>& __rhs) const
-    { return this->_M_is_equal(__rhs); }
-
-    bool
-    operator!=(const bitset<_Nb>& __rhs) const
-    { return !this->_M_is_equal(__rhs); }
-    //@}
-
-    /**
-     *  @brief Tests the value of a bit.
-     *  @param  position  The index of a bit.
-     *  @return  The value at @a pos.
-     *  @throw  std::out_of_range  If @a pos is bigger the size of the %set.
-    */
-    bool
-    test(size_t __position) const
-    {
-      if (__position >= _Nb)
-	__throw_out_of_range(__N("bitset::test"));
-      return _Unchecked_test(__position);
-    }
-
-    /**
-     *  @brief Tests whether any of the bits are on.
-     *  @return  True if at least one bit is set.
-    */
-    bool
-    any() const { return this->_M_is_any(); }
-
-    /**
-     *  @brief Tests whether any of the bits are on.
-     *  @return  True if none of the bits are set.
-    */
-    bool
-    none() const { return !this->_M_is_any(); }
-
-    //@{
-    /// Self-explanatory.
-    bitset<_Nb>
-    operator<<(size_t __position) const
-    { return bitset<_Nb>(*this) <<= __position; }
-
-    bitset<_Nb>
-    operator>>(size_t __position) const
-    { return bitset<_Nb>(*this) >>= __position; }
-    //@}
-
-    /**
-     *  @brief  Finds the index of the first "on" bit.
-     *  @return  The index of the first bit set, or size() if not found.
-     *  @ingroup SGIextensions
-     *  @sa  _Find_next
-    */
-    size_t
-    _Find_first() const
-    { return this->_M_do_find_first(_Nb); }
-
-    /**
-     *  @brief  Finds the index of the next "on" bit after prev.
-     *  @return  The index of the next bit set, or size() if not found.
-     *  @param  prev  Where to start searching.
-     *  @ingroup SGIextensions
-     *  @sa  _Find_first
-    */
-    size_t
-    _Find_next(size_t __prev ) const
-    { return this->_M_do_find_next(__prev, _Nb); }
-  };
-
-  // Definitions of non-inline member functions.
-  template<size_t _Nb>
-    template<class _CharT, class _Traits, class _Alloc>
-    void
-    bitset<_Nb>::_M_copy_from_string(const basic_string<_CharT, _Traits,
-				     _Alloc>& __s, size_t __pos, size_t __n)
-    {
-      reset();
-      const size_t __nbits = std::min(_Nb, std::min(__n, __s.size() - __pos));
-      for (size_t __i = 0; __i < __nbits; ++__i)
-	{
-	  switch(__s[__pos + __nbits - __i - 1])
-	    {
-	    case '0':
-	      break;
-	    case '1':
-	      set(__i);
-	      break;
-	    default:
-	      __throw_invalid_argument(__N("bitset::_M_copy_from_string"));
-	    }
-	}
-    }
-
-  template<size_t _Nb>
-    template<class _CharT, class _Traits, class _Alloc>
-    void
-    bitset<_Nb>::_M_copy_to_string(basic_string<_CharT, _Traits,
-				   _Alloc>& __s) const
-    {
-      __s.assign(_Nb, '0');
-      for (size_t __i = 0; __i < _Nb; ++__i)
-	if (_Unchecked_test(__i))
-	  __s[_Nb - 1 - __i] = '1';
-    }
-
-  // 23.3.5.3 bitset operations:
-  //@{
-  /**
-   *  @brief  Global bitwise operations on bitsets.
-   *  @param  x  A bitset.
-   *  @param  y  A bitset of the same size as @a x.
-   *  @return  A new bitset.
-   *
-   *  These should be self-explanatory.
-  */
-  template<size_t _Nb>
-    inline bitset<_Nb>
-    operator&(const bitset<_Nb>& __x, const bitset<_Nb>& __y)
-    {
-      bitset<_Nb> __result(__x);
-      __result &= __y;
-      return __result;
-    }
-
-  template<size_t _Nb>
-    inline bitset<_Nb>
-    operator|(const bitset<_Nb>& __x, const bitset<_Nb>& __y)
-    {
-      bitset<_Nb> __result(__x);
-      __result |= __y;
-      return __result;
-    }
-
-  template <size_t _Nb>
-    inline bitset<_Nb>
-    operator^(const bitset<_Nb>& __x, const bitset<_Nb>& __y)
-    {
-      bitset<_Nb> __result(__x);
-      __result ^= __y;
-      return __result;
-    }
-  //@}
-
-  //@{
-  /**
-   *  @brief Global I/O operators for bitsets.
-   *
-   *  Direct I/O between streams and bitsets is supported.  Output is
-   *  straightforward.  Input will skip whitespace, only accept '0' and '1'
-   *  characters, and will only extract as many digits as the %bitset will
-   *  hold.
-  */
-  template<class _CharT, class _Traits, size_t _Nb>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x)
-    {
-      typedef typename _Traits::char_type char_type;
-      basic_string<_CharT, _Traits> __tmp;
-      __tmp.reserve(_Nb);
-
-      ios_base::iostate __state = ios_base::goodbit;
-      typename basic_istream<_CharT, _Traits>::sentry __sentry(__is);
-      if (__sentry)
-	{
-	  try
-	    {
-	      basic_streambuf<_CharT, _Traits>* __buf = __is.rdbuf();
-	      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	      // 303. Bitset input operator underspecified
-	      const char_type __zero = __is.widen('0');
-	      const char_type __one = __is.widen('1');
-	      for (size_t __i = 0; __i < _Nb; ++__i)
-		{
-		  static typename _Traits::int_type __eof = _Traits::eof();
-		  
-		  typename _Traits::int_type __c1 = __buf->sbumpc();
-		  if (_Traits::eq_int_type(__c1, __eof))
-		    {
-		      __state |= ios_base::eofbit;
-		      break;
-		    }
-		  else
-		    {
-		      char_type __c2 = _Traits::to_char_type(__c1);
-		      if (__c2 == __zero)
-			__tmp.push_back('0');
-		      else if (__c2 == __one)
-			__tmp.push_back('1');
-		      else if (_Traits::eq_int_type(__buf->sputbackc(__c2),
-						    __eof))
-			{
-			  __state |= ios_base::failbit;
-			  break;
-			}
-		    }
-		}
-	    }
-	  catch(...)
-	    { __is._M_setstate(ios_base::badbit); }
-	}
-
-      if (__tmp.empty() && _Nb)
-	__state |= ios_base::failbit;
-      else
-	__x._M_copy_from_string(__tmp, static_cast<size_t>(0), _Nb);
-      if (__state)
-	__is.setstate(__state);
-      return __is;
-    }
-
-  template <class _CharT, class _Traits, size_t _Nb>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Nb>& __x)
-    {
-      basic_string<_CharT, _Traits> __tmp;
-      __x._M_copy_to_string(__tmp);
-      return __os << __tmp;
-    }
-  //@}
-} // namespace std
-
-#undef _GLIBCXX_BITSET_WORDS
-#undef _GLIBCXX_BITSET_BITS_PER_WORD
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/bitset>
-#endif
-
-#endif /* _GLIBCXX_BITSET */
diff --git a/include.new/c++/3.4/cassert b/include.new/c++/3.4/cassert
deleted file mode 100644
index 9fc1079..0000000
--- a/include.new/c++/3.4/cassert
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 19.2  Assertions
-//
-
-/** @file cassert
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c assert.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-// No include guards on this header...
-
-#pragma GCC system_header
-
-#include <assert.h>
diff --git a/include.new/c++/3.4/cctype b/include.new/c++/3.4/cctype
deleted file mode 100644
index 65a4214..0000000
--- a/include.new/c++/3.4/cctype
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: <ccytpe>
-//
-
-/** @file cctype
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c ctype.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CCTYPE
-#define _GLIBCXX_CCTYPE 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <ctype.h>
-
-// Get rid of those macros defined in <ctype.h> in lieu of real functions.
-#undef isalnum
-#undef isalpha
-#undef iscntrl
-#undef isdigit
-#undef isgraph
-#undef islower
-#undef isprint
-#undef ispunct
-#undef isspace
-#undef isupper
-#undef isxdigit
-#undef tolower
-#undef toupper
-
-namespace std
-{
-  using ::isalnum;
-  using ::isalpha;
-  using ::iscntrl;
-  using ::isdigit;
-  using ::isgraph;
-  using ::islower;
-  using ::isprint;
-  using ::ispunct;
-  using ::isspace;
-  using ::isupper;
-  using ::isxdigit;
-  using ::tolower;
-  using ::toupper;
-}
-
-#endif
diff --git a/include.new/c++/3.4/cerrno b/include.new/c++/3.4/cerrno
deleted file mode 100644
index 7915e14..0000000
--- a/include.new/c++/3.4/cerrno
+++ /dev/null
@@ -1,55 +0,0 @@
-// The -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 19.3  Error numbers
-//
-
-/** @file cerrno
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c errno.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CERRNO
-#define _GLIBCXX_CERRNO 1
-
-#pragma GCC system_header
-
-#include <errno.h>
-
-// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998
-#ifndef errno
-#define errno errno
-#endif
-
-#endif
diff --git a/include.new/c++/3.4/cfloat b/include.new/c++/3.4/cfloat
deleted file mode 100644
index 4c5bb00..0000000
--- a/include.new/c++/3.4/cfloat
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 18.2.2  Implementation properties: C library
-//
-
-/** @file cfloat
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c float.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CFLOAT
-#define _GLIBCXX_CFLOAT 1
-
-#pragma GCC system_header
-
-#include <float.h>
-
-#endif
diff --git a/include.new/c++/3.4/ciso646 b/include.new/c++/3.4/ciso646
deleted file mode 100644
index 0993a0a..0000000
--- a/include.new/c++/3.4/ciso646
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 2001 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file ciso646
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c iso646.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
diff --git a/include.new/c++/3.4/climits b/include.new/c++/3.4/climits
deleted file mode 100644
index f4e1d8f..0000000
--- a/include.new/c++/3.4/climits
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2002
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 18.2.2  Implementation properties: C library
-//
-
-/** @file climits
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c limits.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CLIMITS
-#define _GLIBCXX_CLIMITS 1
-
-#pragma GCC system_header
-
-#include <limits.h>
-
-#endif
diff --git a/include.new/c++/3.4/clocale b/include.new/c++/3.4/clocale
deleted file mode 100644
index 988b849..0000000
--- a/include.new/c++/3.4/clocale
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 18.2.2  Implementation properties: C library
-//
-
-/** @file clocale
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c locale.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CLOCALE
-#define _GLIBCXX_CLOCALE 1
-
-#pragma GCC system_header
-
-#include <locale.h>
-
-// Get rid of those macros defined in <locale.h> in lieu of real functions.
-#undef setlocale
-#undef localeconv
-
-namespace std
-{
-  using ::lconv;
-  using ::setlocale;
-  using ::localeconv;
-}
-
-#endif
diff --git a/include.new/c++/3.4/cmath b/include.new/c++/3.4/cmath
deleted file mode 100644
index 729f510..0000000
--- a/include.new/c++/3.4/cmath
+++ /dev/null
@@ -1,595 +0,0 @@
-// -*- C++ -*- C forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 26.5  C library
-//
-
-/** @file cmath
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c math.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CMATH
-#define _GLIBCXX_CMATH 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/cpp_type_traits.h>
-
-#include <math.h>
-
-// Get rid of those macros defined in <math.h> in lieu of real functions.
-#undef abs
-#undef div
-#undef acos
-#undef asin
-#undef atan
-#undef atan2
-#undef ceil
-#undef cos
-#undef cosh
-#undef exp
-#undef fabs
-#undef floor
-#undef fmod
-#undef frexp
-#undef ldexp
-#undef log
-#undef log10
-#undef modf
-#undef pow
-#undef sin
-#undef sinh
-#undef sqrt
-#undef tan
-#undef tanh
-
-
-namespace std
-{
-  // Forward declaration of a helper function.  This really should be
-  // an `exported' forward declaration.
-  template<typename _Tp> _Tp __cmath_power(_Tp, unsigned int);
-
-  inline double
-  abs(double __x)
-  { return __builtin_fabs(__x); }
-
-  inline float
-  abs(float __x)
-  { return __builtin_fabsf(__x); }
-
-  inline long double
-  abs(long double __x)
-  { return __builtin_fabsl(__x); }
-
-  using ::acos;
-
-  inline float
-  acos(float __x)
-  { return __builtin_acosf(__x); }
-
-  inline long double
-  acos(long double __x)
-  { return __builtin_acosl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    acos(_Tp __x)
-    {
-      return __builtin_acos(__x);
-    }
-
-  using ::asin;
-
-  inline float
-  asin(float __x)
-  { return __builtin_asinf(__x); }
-
-  inline long double
-  asin(long double __x)
-  { return __builtin_asinl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    asin(_Tp __x)
-    { return __builtin_asin(__x); }
-
-  using ::atan;
-
-  inline float
-  atan(float __x)
-  { return __builtin_atanf(__x); }
-
-  inline long double
-  atan(long double __x)
-  { return __builtin_atanl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    atan(_Tp __x)
-    { return __builtin_atan(__x); }
-
-  using ::atan2;
-
-  inline float
-  atan2(float __y, float __x)
-  { return __builtin_atan2f(__y, __x); }
-
-  inline long double
-  atan2(long double __y, long double __x)
-  { return __builtin_atan2l(__y, __x); }
-
-  template<typename _Tp, typename _Up>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type
-                                        && __is_integer<_Up>::_M_type>::_M_type
-    atan2(_Tp __y, _Up __x)
-    { return __builtin_atan2(__y, __x); }
-
-  using ::ceil;
-
-  inline float
-  ceil(float __x)
-  { return __builtin_ceilf(__x); }
-
-  inline long double
-  ceil(long double __x)
-  { return __builtin_ceill(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    ceil(_Tp __x)
-    { return __builtin_ceil(__x); }
-
-  using ::cos;
-
-  inline float
-  cos(float __x)
-  { return __builtin_cosf(__x); }
-
-  inline long double
-  cos(long double __x)
-  { return __builtin_cosl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    cos(_Tp __x)
-    { return __builtin_cos(__x); }
-
-  using ::cosh;
-
-  inline float
-  cosh(float __x)
-  { return __builtin_coshf(__x); }
-
-  inline long double
-  cosh(long double __x)
-  { return __builtin_coshl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    cosh(_Tp __x)
-    { return __builtin_cosh(__x); }
-
-  using ::exp;
-
-  inline float
-  exp(float __x)
-  { return __builtin_expf(__x); }
-
-  inline long double
-  exp(long double __x)
-  { return __builtin_expl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    exp(_Tp __x)
-    { return __builtin_exp(__x); }
-
-  using ::fabs;
-
-  inline float
-  fabs(float __x)
-  { return __builtin_fabsf(__x); }
-
-  inline long double
-  fabs(long double __x)
-  { return __builtin_fabsl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    fabs(_Tp __x)
-    { return __builtin_fabs(__x); }
-
-  using ::floor;
-
-  inline float
-  floor(float __x)
-  { return __builtin_floorf(__x); }
-
-  inline long double
-  floor(long double __x)
-  { return __builtin_floorl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    floor(_Tp __x)
-    { return __builtin_floor(__x); }
-
-  using ::fmod;
-
-  inline float
-  fmod(float __x, float __y)
-  { return __builtin_fmodf(__x, __y); }
-
-  inline long double
-  fmod(long double __x, long double __y)
-  { return __builtin_fmodl(__x, __y); }
-
-  using ::frexp;
-
-  inline float
-  frexp(float __x, int* __exp)
-  { return __builtin_frexpf(__x, __exp); }
-
-  inline long double
-  frexp(long double __x, int* __exp)
-  { return __builtin_frexpl(__x, __exp); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    frexp(_Tp __x, int* __exp)
-    { return __builtin_frexp(__x, __exp); }
-
-  using ::ldexp;
-
-  inline float
-  ldexp(float __x, int __exp)
-  { return __builtin_ldexpf(__x, __exp); }
-
-  inline long double
-  ldexp(long double __x, int __exp)
-  { return __builtin_ldexpl(__x, __exp); }
-
-  template<typename _Tp>
-  inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-  ldexp(_Tp __x, int __exp)
-  { return __builtin_ldexp(__x, __exp); }
-
-  using ::log;
-
-  inline float
-  log(float __x)
-  { return __builtin_logf(__x); }
-
-  inline long double
-  log(long double __x)
-  { return __builtin_logl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    log(_Tp __x)
-    { return __builtin_log(__x); }
-
-  using ::log10;
-
-  inline float
-  log10(float __x)
-  { return __builtin_log10f(__x); }
-
-  inline long double
-  log10(long double __x)
-  { return __builtin_log10l(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    log10(_Tp __x)
-    { return __builtin_log10(__x); }
-
-  using ::modf;
-
-  inline float
-  modf(float __x, float* __iptr)
-  { return __builtin_modff(__x, __iptr); }
-
-  inline long double
-  modf(long double __x, long double* __iptr)
-  { return __builtin_modfl(__x, __iptr); }
-
-  template<typename _Tp>
-    inline _Tp
-    __pow_helper(_Tp __x, int __n)
-    {
-      return __n < 0
-        ? _Tp(1)/__cmath_power(__x, -__n)
-        : __cmath_power(__x, __n);
-    }
-
-  using ::pow;
-
-  inline float
-  pow(float __x, float __y)
-  { return __builtin_powf(__x, __y); }
-
-  inline long double
-  pow(long double __x, long double __y)
-  { return __builtin_powl(__x, __y); }
-
-  inline double
-  pow(double __x, int __i)
-  { return __pow_helper(__x, __i); }
-
-  inline float
-  pow(float __x, int __n)
-  { return __pow_helper(__x, __n); }
-
-  inline long double
-  pow(long double __x, int __n)
-  { return __pow_helper(__x, __n); }
-
-  using ::sin;
-
-  inline float
-  sin(float __x)
-  { return __builtin_sinf(__x); }
-
-  inline long double
-  sin(long double __x)
-  { return __builtin_sinl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    sin(_Tp __x)
-    { return __builtin_sin(__x); }
-
-  using ::sinh;
-
-  inline float
-  sinh(float __x)
-  { return __builtin_sinhf(__x); }
-
-  inline long double
-  sinh(long double __x)
-  { return __builtin_sinhl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    sinh(_Tp __x)
-    { return __builtin_sinh(__x); }
-
-  using ::sqrt;
-
-  inline float
-  sqrt(float __x)
-  { return __builtin_sqrtf(__x); }
-
-  inline long double
-  sqrt(long double __x)
-  { return __builtin_sqrtl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    sqrt(_Tp __x)
-    { return __builtin_sqrt(__x); }
-
-  using ::tan;
-
-  inline float
-  tan(float __x)
-  { return __builtin_tanf(__x); }
-
-  inline long double
-  tan(long double __x)
-  { return __builtin_tanl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    tan(_Tp __x)
-    { return __builtin_tan(__x); }
-
-  using ::tanh;
-
-  inline float
-  tanh(float __x)
-  { return __builtin_tanhf(__x); }
-
-  inline long double
-  tanh(long double __x)
-  { return __builtin_tanhl(__x); }
-
-  template<typename _Tp>
-    inline typename __enable_if<double, __is_integer<_Tp>::_M_type>::_M_type
-    tanh(_Tp __x)
-    { return __builtin_tanh(__x); }
-}
-
-#if _GLIBCXX_USE_C99_MATH
-#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
-// These are possible macros imported from C99-land. For strict
-// conformance, remove possible C99-injected names from the global
-// namespace, and sequester them in the __gnu_cxx extension namespace.
-namespace __gnu_cxx
-{
-  template<typename _Tp>
-    inline int
-    __capture_fpclassify(_Tp __f) { return fpclassify(__f); }
-
-  template<typename _Tp>
-    inline int
-    __capture_isfinite(_Tp __f) { return isfinite(__f); }
-
-  template<typename _Tp>
-    inline int
-    __capture_isinf(_Tp __f) { return isinf(__f); }
-
-  template<typename _Tp>
-    inline int
-    __capture_isnan(_Tp __f) { return isnan(__f); }
-
-  template<typename _Tp>
-    inline int
-    __capture_isnormal(_Tp __f) { return isnormal(__f); }
-
-  template<typename _Tp>
-    inline int
-    __capture_signbit(_Tp __f) { return signbit(__f); }
-
-  template<typename _Tp>
-    inline int
-    __capture_isgreater(_Tp __f1, _Tp __f2)
-    { return isgreater(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    __capture_isgreaterequal(_Tp __f1, _Tp __f2)
-    { return isgreaterequal(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    __capture_isless(_Tp __f1, _Tp __f2) { return isless(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    __capture_islessequal(_Tp __f1, _Tp __f2)
-    { return islessequal(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    __capture_islessgreater(_Tp __f1, _Tp __f2)
-    { return islessgreater(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    __capture_isunordered(_Tp __f1, _Tp __f2)
-    { return isunordered(__f1, __f2); }
-}
-
-// Only undefine the C99 FP macros, if actually captured for namespace movement
-#undef fpclassify
-#undef isfinite
-#undef isinf
-#undef isnan
-#undef isnormal
-#undef signbit
-#undef isgreater
-#undef isgreaterequal
-#undef isless
-#undef islessequal
-#undef islessgreater
-#undef isunordered
-#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
-#endif
-
-#if _GLIBCXX_USE_C99_MATH
-#if !_GLIBCXX_USE_C99_FP_MACROS_DYNAMIC
-namespace __gnu_cxx
-{
-  template<typename _Tp>
-    inline int
-    fpclassify(_Tp __f) { return __capture_fpclassify(__f); }
-
-  template<typename _Tp>
-    inline int
-    isfinite(_Tp __f) { return __capture_isfinite(__f); }
-
-  template<typename _Tp>
-    inline int
-    isinf(_Tp __f) { return __capture_isinf(__f); }
-
-  template<typename _Tp>
-    inline int
-    isnan(_Tp __f) { return __capture_isnan(__f); }
-
-  template<typename _Tp>
-    inline int
-    isnormal(_Tp __f) { return __capture_isnormal(__f); }
-
-  template<typename _Tp>
-    inline int
-    signbit(_Tp __f) { return __capture_signbit(__f); }
-
-  template<typename _Tp>
-    inline int
-    isgreater(_Tp __f1, _Tp __f2) { return __capture_isgreater(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    isgreaterequal(_Tp __f1, _Tp __f2)
-    { return __capture_isgreaterequal(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    isless(_Tp __f1, _Tp __f2) { return __capture_isless(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    islessequal(_Tp __f1, _Tp __f2)
-    { return __capture_islessequal(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    islessgreater(_Tp __f1, _Tp __f2)
-    { return __capture_islessgreater(__f1, __f2); }
-
-  template<typename _Tp>
-    inline int
-    isunordered(_Tp __f1, _Tp __f2)
-    { return __capture_isunordered(__f1, __f2); }
-}
-
-namespace std
-{
-  using __gnu_cxx::fpclassify;
-  using __gnu_cxx::isfinite;
-  using __gnu_cxx::isinf;
-  using __gnu_cxx::isnan;
-  using __gnu_cxx::isnormal;
-  using __gnu_cxx::signbit;
-  using __gnu_cxx::isgreater;
-  using __gnu_cxx::isgreaterequal;
-  using __gnu_cxx::isless;
-  using __gnu_cxx::islessequal;
-  using __gnu_cxx::islessgreater;
-  using __gnu_cxx::isunordered;
-}
-#endif /* _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC */
-#endif
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/cmath.tcc>
-#endif
-
-#endif
diff --git a/include.new/c++/3.4/complex b/include.new/c++/3.4/complex
deleted file mode 100644
index 244ed28..0000000
--- a/include.new/c++/3.4/complex
+++ /dev/null
@@ -1,1226 +0,0 @@
-// The template and inlines for the -*- C++ -*- complex number classes.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 26.2  Complex Numbers
-// Note: this is not a conforming implementation.
-// Initially implemented by Ulrich Drepper <drepper@cygnus.com>
-// Improved by Gabriel Dos Reis <dosreis@cmla.ens-cachan.fr>
-//
-
-/** @file complex
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_COMPLEX
-#define _GLIBCXX_COMPLEX 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/cpp_type_traits.h>
-#include <cmath>
-#include <sstream>
-
-namespace std
-{
-  // Forward declarations
-  template<typename _Tp> class complex;
-  template<> class complex<float>;
-  template<> class complex<double>;
-  template<> class complex<long double>;
-
-  ///  Return magnitude of @a z.
-  template<typename _Tp> _Tp abs(const complex<_Tp>&);
-  ///  Return phase angle of @a z.
-  template<typename _Tp> _Tp arg(const complex<_Tp>&);
-  ///  Return @a z magnitude squared.
-  template<typename _Tp> _Tp norm(const complex<_Tp>&);
-
-  ///  Return complex conjugate of @a z.
-  template<typename _Tp> complex<_Tp> conj(const complex<_Tp>&);
-  ///  Return complex with magnitude @a rho and angle @a theta.
-  template<typename _Tp> complex<_Tp> polar(const _Tp&, const _Tp& = 0);
-
-  // Transcendentals:
-  /// Return complex cosine of @a z.
-  template<typename _Tp> complex<_Tp> cos(const complex<_Tp>&);
-  /// Return complex hyperbolic cosine of @a z.
-  template<typename _Tp> complex<_Tp> cosh(const complex<_Tp>&);
-  /// Return complex base e exponential of @a z.
-  template<typename _Tp> complex<_Tp> exp(const complex<_Tp>&);
-  /// Return complex natural logarithm of @a z.
-  template<typename _Tp> complex<_Tp> log(const complex<_Tp>&);
-  /// Return complex base 10 logarithm of @a z.
-  template<typename _Tp> complex<_Tp> log10(const complex<_Tp>&);
-  /// Return complex cosine of @a z.
-  template<typename _Tp> complex<_Tp> pow(const complex<_Tp>&, int);
-  /// Return @a x to the @a y'th power.
-  template<typename _Tp> complex<_Tp> pow(const complex<_Tp>&, const _Tp&);
-  /// Return @a x to the @a y'th power.
-  template<typename _Tp> complex<_Tp> pow(const complex<_Tp>&, 
-					   const complex<_Tp>&);
-  /// Return @a x to the @a y'th power.
-  template<typename _Tp> complex<_Tp> pow(const _Tp&, const complex<_Tp>&);
-  /// Return complex sine of @a z.
-  template<typename _Tp> complex<_Tp> sin(const complex<_Tp>&);
-  /// Return complex hyperbolic sine of @a z.
-  template<typename _Tp> complex<_Tp> sinh(const complex<_Tp>&);
-  /// Return complex square root of @a z.
-  template<typename _Tp> complex<_Tp> sqrt(const complex<_Tp>&);
-  /// Return complex tangent of @a z.
-  template<typename _Tp> complex<_Tp> tan(const complex<_Tp>&);
-  /// Return complex hyperbolic tangent of @a z.
-  template<typename _Tp> complex<_Tp> tanh(const complex<_Tp>&);
-  //@}
-    
-    
-  // 26.2.2  Primary template class complex
-  /**
-   *  Template to represent complex numbers.
-   *
-   *  Specializations for float, double, and long double are part of the
-   *  library.  Results with any other type are not guaranteed.
-   *
-   *  @param  Tp  Type of real and imaginary values.
-  */
-  template<typename _Tp>
-    class complex
-    {
-    public:
-      /// Value typedef.
-      typedef _Tp value_type;
-      
-      ///  Default constructor.  First parameter is x, second parameter is y.
-      ///  Unspecified parameters default to 0.
-      complex(const _Tp& = _Tp(), const _Tp & = _Tp());
-
-      // Lets the compiler synthesize the copy constructor   
-      // complex (const complex<_Tp>&);
-      ///  Copy constructor.
-      template<typename _Up>
-        complex(const complex<_Up>&);
-
-      ///  Return real part of complex number.
-      _Tp& real(); 
-      ///  Return real part of complex number.
-      const _Tp& real() const;
-      ///  Return imaginary part of complex number.
-      _Tp& imag();
-      ///  Return imaginary part of complex number.
-      const _Tp& imag() const;
-
-      /// Assign this complex number to scalar @a t.
-      complex<_Tp>& operator=(const _Tp&);
-      /// Add @a t to this complex number.
-      complex<_Tp>& operator+=(const _Tp&);
-      /// Subtract @a t from this complex number.
-      complex<_Tp>& operator-=(const _Tp&);
-      /// Multiply this complex number by @a t.
-      complex<_Tp>& operator*=(const _Tp&);
-      /// Divide this complex number by @a t.
-      complex<_Tp>& operator/=(const _Tp&);
-
-      // Lets the compiler synthesize the
-      // copy and assignment operator
-      // complex<_Tp>& operator= (const complex<_Tp>&);
-      /// Assign this complex number to complex @a z.
-      template<typename _Up>
-        complex<_Tp>& operator=(const complex<_Up>&);
-      /// Add @a z to this complex number.
-      template<typename _Up>
-        complex<_Tp>& operator+=(const complex<_Up>&);
-      /// Subtract @a z from this complex number.
-      template<typename _Up>
-        complex<_Tp>& operator-=(const complex<_Up>&);
-      /// Multiply this complex number by @a z.
-      template<typename _Up>
-        complex<_Tp>& operator*=(const complex<_Up>&);
-      /// Divide this complex number by @a z.
-      template<typename _Up>
-        complex<_Tp>& operator/=(const complex<_Up>&);
-
-    private:
-      _Tp _M_real;
-      _Tp _M_imag;
-    };
-
-  template<typename _Tp>
-    inline _Tp&
-    complex<_Tp>::real() { return _M_real; }
-
-  template<typename _Tp>
-    inline const _Tp&
-    complex<_Tp>::real() const { return _M_real; }
-
-  template<typename _Tp>
-    inline _Tp&
-    complex<_Tp>::imag() { return _M_imag; }
-
-  template<typename _Tp>
-    inline const _Tp&
-    complex<_Tp>::imag() const { return _M_imag; }
-
-  template<typename _Tp>
-    inline 
-    complex<_Tp>::complex(const _Tp& __r, const _Tp& __i)
-    : _M_real(__r), _M_imag(__i) { }
-
-  template<typename _Tp>
-    template<typename _Up>
-    inline 
-    complex<_Tp>::complex(const complex<_Up>& __z)
-    : _M_real(__z.real()), _M_imag(__z.imag()) { }
-        
-  template<typename _Tp>
-    complex<_Tp>&
-    complex<_Tp>::operator=(const _Tp& __t)
-    {
-     _M_real = __t;
-     _M_imag = _Tp();
-     return *this;
-    } 
-
-  // 26.2.5/1
-  template<typename _Tp>
-    inline complex<_Tp>&
-    complex<_Tp>::operator+=(const _Tp& __t)
-    {
-      _M_real += __t;
-      return *this;
-    }
-
-  // 26.2.5/3
-  template<typename _Tp>
-    inline complex<_Tp>&
-    complex<_Tp>::operator-=(const _Tp& __t)
-    {
-      _M_real -= __t;
-      return *this;
-    }
-
-  // 26.2.5/5
-  template<typename _Tp>
-    complex<_Tp>&
-    complex<_Tp>::operator*=(const _Tp& __t)
-    {
-      _M_real *= __t;
-      _M_imag *= __t;
-      return *this;
-    }
-
-  // 26.2.5/7
-  template<typename _Tp>
-    complex<_Tp>&
-    complex<_Tp>::operator/=(const _Tp& __t)
-    {
-      _M_real /= __t;
-      _M_imag /= __t;
-      return *this;
-    }
-
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator=(const complex<_Up>& __z)
-    {
-      _M_real = __z.real();
-      _M_imag = __z.imag();
-      return *this;
-    }
-
-  // 26.2.5/9
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator+=(const complex<_Up>& __z)
-    {
-      _M_real += __z.real();
-      _M_imag += __z.imag();
-      return *this;
-    }
-
-  // 26.2.5/11
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator-=(const complex<_Up>& __z)
-    {
-      _M_real -= __z.real();
-      _M_imag -= __z.imag();
-      return *this;
-    }
-
-  // 26.2.5/13
-  // XXX: This is a grammar school implementation.
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator*=(const complex<_Up>& __z)
-    {
-      const _Tp __r = _M_real * __z.real() - _M_imag * __z.imag();
-      _M_imag = _M_real * __z.imag() + _M_imag * __z.real();
-      _M_real = __r;
-      return *this;
-    }
-
-  // 26.2.5/15
-  // XXX: This is a grammar school implementation.
-  template<typename _Tp>
-    template<typename _Up>
-    complex<_Tp>&
-    complex<_Tp>::operator/=(const complex<_Up>& __z)
-    {
-      const _Tp __r =  _M_real * __z.real() + _M_imag * __z.imag();
-      const _Tp __n = std::norm(__z);
-      _M_imag = (_M_imag * __z.real() - _M_real * __z.imag()) / __n;
-      _M_real = __r / __n;
-      return *this;
-    }
-    
-  // Operators:
-  //@{
-  ///  Return new complex value @a x plus @a y.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator+(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r += __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator+(const complex<_Tp>& __x, const _Tp& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r.real() += __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator+(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __y;
-      __r.real() += __x;
-      return __r;
-    }
-  //@}
-
-  //@{
-  ///  Return new complex value @a x minus @a y.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator-(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r -= __y;
-      return __r;
-    }
-    
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator-(const complex<_Tp>& __x, const _Tp& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r.real() -= __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator-(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r(__x, -__y.imag());
-      __r.real() -= __y.real();
-      return __r;
-    }
-  //@}
-
-  //@{
-  ///  Return new complex value @a x times @a y.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator*(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r *= __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator*(const complex<_Tp>& __x, const _Tp& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r *= __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator*(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __y;
-      __r *= __x;
-      return __r;
-    }
-  //@}
-
-  //@{
-  ///  Return new complex value @a x divided by @a y.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator/(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r /= __y;
-      return __r;
-    }
-    
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator/(const complex<_Tp>& __x, const _Tp& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r /= __y;
-      return __r;
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator/(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      complex<_Tp> __r = __x;
-      __r /= __y;
-      return __r;
-    }
-  //@}
-
-  ///  Return @a x.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator+(const complex<_Tp>& __x)
-    { return __x; }
-
-  ///  Return complex negation of @a x.
-  template<typename _Tp>
-    inline complex<_Tp>
-    operator-(const complex<_Tp>& __x)
-    {  return complex<_Tp>(-__x.real(), -__x.imag()); }
-
-  //@{
-  ///  Return true if @a x is equal to @a y.
-  template<typename _Tp>
-    inline bool
-    operator==(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    { return __x.real() == __y.real() && __x.imag() == __y.imag(); }
-
-  template<typename _Tp>
-    inline bool
-    operator==(const complex<_Tp>& __x, const _Tp& __y)
-    { return __x.real() == __y && __x.imag() == _Tp(); }
-
-  template<typename _Tp>
-    inline bool
-    operator==(const _Tp& __x, const complex<_Tp>& __y)
-    { return __x == __y.real() && _Tp() == __y.imag(); }
-  //@}
-
-  //@{
-  ///  Return false if @a x is equal to @a y.
-  template<typename _Tp>
-    inline bool
-    operator!=(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    { return __x.real() != __y.real() || __x.imag() != __y.imag(); }
-
-  template<typename _Tp>
-    inline bool
-    operator!=(const complex<_Tp>& __x, const _Tp& __y)
-    { return __x.real() != __y || __x.imag() != _Tp(); }
-
-  template<typename _Tp>
-    inline bool
-    operator!=(const _Tp& __x, const complex<_Tp>& __y)
-    { return __x != __y.real() || _Tp() != __y.imag(); }
-  //@}
-
-  ///  Extraction operator for complex values.
-  template<typename _Tp, typename _CharT, class _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x)
-    {
-      _Tp __re_x, __im_x;
-      _CharT __ch;
-      __is >> __ch;
-      if (__ch == '(') 
-	{
-	  __is >> __re_x >> __ch;
-	  if (__ch == ',') 
-	    {
-	      __is >> __im_x >> __ch;
-	      if (__ch == ')') 
-		__x = complex<_Tp>(__re_x, __im_x);
-	      else
-		__is.setstate(ios_base::failbit);
-	    }
-	  else if (__ch == ')') 
-	    __x = __re_x;
-	  else
-	    __is.setstate(ios_base::failbit);
-	}
-      else 
-	{
-	  __is.putback(__ch);
-	  __is >> __re_x;
-	  __x = __re_x;
-	}
-      return __is;
-    }
-
-  ///  Insertion operator for complex values.
-  template<typename _Tp, typename _CharT, class _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __x)
-    {
-      basic_ostringstream<_CharT, _Traits> __s;
-      __s.flags(__os.flags());
-      __s.imbue(__os.getloc());
-      __s.precision(__os.precision());
-      __s << '(' << __x.real() << ',' << __x.imag() << ')';
-      return __os << __s.str();
-    }
-
-  // Values
-  template<typename _Tp>
-    inline _Tp&
-    real(complex<_Tp>& __z)
-    { return __z.real(); }
-    
-  template<typename _Tp>
-    inline const _Tp&
-    real(const complex<_Tp>& __z)
-    { return __z.real(); }
-    
-  template<typename _Tp>
-    inline _Tp&
-    imag(complex<_Tp>& __z)
-    { return __z.imag(); }
-    
-  template<typename _Tp>
-    inline const _Tp&
-    imag(const complex<_Tp>& __z)
-    { return __z.imag(); }
-
-  template<typename _Tp>
-    inline _Tp
-    abs(const complex<_Tp>& __z)
-    {
-      _Tp __x = __z.real();
-      _Tp __y = __z.imag();
-      const _Tp __s = std::max(abs(__x), abs(__y));
-      if (__s == _Tp())  // well ...
-        return __s;
-      __x /= __s; 
-      __y /= __s;
-      return __s * sqrt(__x * __x + __y * __y);
-    }
-
-  template<typename _Tp>
-    inline _Tp
-    arg(const complex<_Tp>& __z)
-    { return atan2(__z.imag(), __z.real()); }
-
-  // 26.2.7/5: norm(__z) returns the squared magintude of __z.
-  //     As defined, norm() is -not- a norm is the common mathematical
-  //     sens used in numerics.  The helper class _Norm_helper<> tries to
-  //     distinguish between builtin floating point and the rest, so as
-  //     to deliver an answer as close as possible to the real value.
-  template<bool>
-    struct _Norm_helper
-    {
-      template<typename _Tp>
-        static inline _Tp _S_do_it(const complex<_Tp>& __z)
-        {
-          const _Tp __x = __z.real();
-          const _Tp __y = __z.imag();
-          return __x * __x + __y * __y;
-        }
-    };
-
-  template<>
-    struct _Norm_helper<true>
-    {
-      template<typename _Tp>
-        static inline _Tp _S_do_it(const complex<_Tp>& __z)
-        {
-          _Tp __res = std::abs(__z);
-          return __res * __res;
-        }
-    };
-  
-  template<typename _Tp>
-    inline _Tp
-    norm(const complex<_Tp>& __z)
-    {
-      return _Norm_helper<__is_floating<_Tp>::_M_type && !_GLIBCXX_FAST_MATH>::_S_do_it(__z);
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    polar(const _Tp& __rho, const _Tp& __theta)
-    { return complex<_Tp>(__rho * cos(__theta), __rho * sin(__theta)); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    conj(const complex<_Tp>& __z)
-    { return complex<_Tp>(__z.real(), -__z.imag()); }
-  
-  // Transcendentals
-  template<typename _Tp>
-    inline complex<_Tp>
-    cos(const complex<_Tp>& __z)
-    {
-      const _Tp __x = __z.real();
-      const _Tp __y = __z.imag();
-      return complex<_Tp>(cos(__x) * cosh(__y), -sin(__x) * sinh(__y));
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    cosh(const complex<_Tp>& __z)
-    {
-      const _Tp __x = __z.real();
-      const _Tp __y = __z.imag();
-      return complex<_Tp>(cosh(__x) * cos(__y), sinh(__x) * sin(__y));
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    exp(const complex<_Tp>& __z)
-    { return std::polar(exp(__z.real()), __z.imag()); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    log(const complex<_Tp>& __z)
-    { return complex<_Tp>(log(std::abs(__z)), std::arg(__z)); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    log10(const complex<_Tp>& __z)
-    { return std::log(__z) / log(_Tp(10.0)); }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    sin(const complex<_Tp>& __z)
-    {
-      const _Tp __x = __z.real();
-      const _Tp __y = __z.imag();
-      return complex<_Tp>(sin(__x) * cosh(__y), cos(__x) * sinh(__y)); 
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    sinh(const complex<_Tp>& __z)
-    {
-      const _Tp __x = __z.real();
-      const _Tp  __y = __z.imag();
-      return complex<_Tp>(sinh(__x) * cos(__y), cosh(__x) * sin(__y));
-    }
-
-  template<typename _Tp>
-    complex<_Tp>
-    sqrt(const complex<_Tp>& __z)
-    {
-      _Tp __x = __z.real();
-      _Tp __y = __z.imag();
-
-      if (__x == _Tp())
-        {
-          _Tp __t = sqrt(abs(__y) / 2);
-          return complex<_Tp>(__t, __y < _Tp() ? -__t : __t);
-        }
-      else
-        {
-          _Tp __t = sqrt(2 * (std::abs(__z) + abs(__x)));
-          _Tp __u = __t / 2;
-          return __x > _Tp()
-            ? complex<_Tp>(__u, __y / __t)
-            : complex<_Tp>(abs(__y) / __t, __y < _Tp() ? -__u : __u);
-        }
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    tan(const complex<_Tp>& __z)
-    {
-      return std::sin(__z) / std::cos(__z);
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    tanh(const complex<_Tp>& __z)
-    {
-      return std::sinh(__z) / std::cosh(__z);
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    pow(const complex<_Tp>& __z, int __n)
-    {
-      return std::__pow_helper(__z, __n);
-    }
-
-  template<typename _Tp>
-    complex<_Tp>
-    pow(const complex<_Tp>& __x, const _Tp& __y)
-    {
-      if (__x.imag() == _Tp() && __x.real() > _Tp())
-        return pow(__x.real(), __y);
-
-      complex<_Tp> __t = std::log(__x);
-      return std::polar(exp(__y * __t.real()), __y * __t.imag());
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    pow(const complex<_Tp>& __x, const complex<_Tp>& __y)
-    {
-      return __x == _Tp() ? _Tp() : std::exp(__y * std::log(__x));
-    }
-
-  template<typename _Tp>
-    inline complex<_Tp>
-    pow(const _Tp& __x, const complex<_Tp>& __y)
-    {
-      return __x > _Tp() ? std::polar(pow(__x, __y.real()),
-				      __y.imag() * log(__x))
-	                 : std::pow(complex<_Tp>(__x, _Tp()), __y);
-    }
-
-  // 26.2.3  complex specializations
-  // complex<float> specialization
-  template<> class complex<float>
-  {
-  public:
-    typedef float value_type;
-    
-    complex(float = 0.0f, float = 0.0f);
-
-    explicit complex(const complex<double>&);
-    explicit complex(const complex<long double>&);
-
-    float& real();
-    const float& real() const;
-    float& imag();
-    const float& imag() const;
-
-    complex<float>& operator=(float);
-    complex<float>& operator+=(float);
-    complex<float>& operator-=(float);
-    complex<float>& operator*=(float);
-    complex<float>& operator/=(float);
-        
-    // Let's the compiler synthetize the copy and assignment
-    // operator.  It always does a pretty good job.
-    // complex& operator= (const complex&);
-    template<typename _Tp>
-      complex<float>&operator=(const complex<_Tp>&);
-    template<typename _Tp>
-      complex<float>& operator+=(const complex<_Tp>&);
-    template<class _Tp>
-      complex<float>& operator-=(const complex<_Tp>&);
-    template<class _Tp>
-      complex<float>& operator*=(const complex<_Tp>&);
-    template<class _Tp>
-      complex<float>&operator/=(const complex<_Tp>&);
-
-  private:
-    typedef __complex__ float _ComplexT;
-    _ComplexT _M_value;
-
-    complex(_ComplexT __z) : _M_value(__z) { }
-        
-    friend class complex<double>;
-    friend class complex<long double>;
-  };
-
-  inline float&
-  complex<float>::real()
-  { return __real__ _M_value; }
-
-  inline const float&
-  complex<float>::real() const
-  { return __real__ _M_value; }
-
-  inline float&
-  complex<float>::imag()
-  { return __imag__ _M_value; }
-
-  inline const float&
-  complex<float>::imag() const
-  { return __imag__ _M_value; }
-
-  inline
-  complex<float>::complex(float r, float i)
-  {
-    __real__ _M_value = r;
-    __imag__ _M_value = i;
-  }
-
-  inline complex<float>&
-  complex<float>::operator=(float __f)
-  {
-    __real__ _M_value = __f;
-    __imag__ _M_value = 0.0f;
-    return *this;
-  }
-
-  inline complex<float>&
-  complex<float>::operator+=(float __f)
-  {
-    __real__ _M_value += __f;
-    return *this;
-  }
-
-  inline complex<float>&
-  complex<float>::operator-=(float __f)
-  {
-    __real__ _M_value -= __f;
-    return *this;
-  }
-
-  inline complex<float>&
-  complex<float>::operator*=(float __f)
-  {
-    _M_value *= __f;
-    return *this;
-  }
-
-  inline complex<float>&
-  complex<float>::operator/=(float __f)
-  {
-    _M_value /= __f;
-    return *this;
-  }
-
-  template<typename _Tp>
-  inline complex<float>&
-  complex<float>::operator=(const complex<_Tp>& __z)
-  {
-    __real__ _M_value = __z.real();
-    __imag__ _M_value = __z.imag();
-    return *this;
-  }
-
-  template<typename _Tp>
-  inline complex<float>&
-  complex<float>::operator+=(const complex<_Tp>& __z)
-  {
-    __real__ _M_value += __z.real();
-    __imag__ _M_value += __z.imag();
-    return *this;
-  }
-    
-  template<typename _Tp>
-    inline complex<float>&
-    complex<float>::operator-=(const complex<_Tp>& __z)
-    {
-     __real__ _M_value -= __z.real();
-     __imag__ _M_value -= __z.imag();
-     return *this;
-    } 
-
-  template<typename _Tp>
-    inline complex<float>&
-    complex<float>::operator*=(const complex<_Tp>& __z)
-    {
-      _ComplexT __t;
-      __real__ __t = __z.real();
-      __imag__ __t = __z.imag();
-      _M_value *= __t;
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline complex<float>&
-    complex<float>::operator/=(const complex<_Tp>& __z)
-    {
-      _ComplexT __t;
-      __real__ __t = __z.real();
-      __imag__ __t = __z.imag();
-      _M_value /= __t;
-      return *this;
-    }
-
-  // 26.2.3  complex specializations
-  // complex<double> specialization
-  template<> class complex<double>
-  {
-  public:
-    typedef double value_type;
-
-    complex(double = 0.0, double = 0.0);
-
-    complex(const complex<float>&);
-    explicit complex(const complex<long double>&);
-
-    double& real();
-    const double& real() const;
-    double& imag();
-    const double& imag() const;
-        
-    complex<double>& operator=(double);
-    complex<double>& operator+=(double);
-    complex<double>& operator-=(double);
-    complex<double>& operator*=(double);
-    complex<double>& operator/=(double);
-
-    // The compiler will synthetize this, efficiently.
-    // complex& operator= (const complex&);
-    template<typename _Tp>
-      complex<double>& operator=(const complex<_Tp>&);
-    template<typename _Tp>
-      complex<double>& operator+=(const complex<_Tp>&);
-    template<typename _Tp>
-      complex<double>& operator-=(const complex<_Tp>&);
-    template<typename _Tp>
-      complex<double>& operator*=(const complex<_Tp>&);
-    template<typename _Tp>
-      complex<double>& operator/=(const complex<_Tp>&);
-
-  private:
-    typedef __complex__ double _ComplexT;
-    _ComplexT _M_value;
-
-    complex(_ComplexT __z) : _M_value(__z) { }
-        
-    friend class complex<float>;
-    friend class complex<long double>;
-  };
-
-  inline double&
-  complex<double>::real()
-  { return __real__ _M_value; }
-
-  inline const double&
-  complex<double>::real() const
-  { return __real__ _M_value; }
-
-  inline double&
-  complex<double>::imag()
-  { return __imag__ _M_value; }
-
-  inline const double&
-  complex<double>::imag() const
-  { return __imag__ _M_value; }
-
-  inline
-  complex<double>::complex(double __r, double __i)
-  {
-    __real__ _M_value = __r;
-    __imag__ _M_value = __i;
-  }
-
-  inline complex<double>&
-  complex<double>::operator=(double __d)
-  {
-    __real__ _M_value = __d;
-    __imag__ _M_value = 0.0;
-    return *this;
-  }
-
-  inline complex<double>&
-  complex<double>::operator+=(double __d)
-  {
-    __real__ _M_value += __d;
-    return *this;
-  }
-
-  inline complex<double>&
-  complex<double>::operator-=(double __d)
-  {
-    __real__ _M_value -= __d;
-    return *this;
-  }
-
-  inline complex<double>&
-  complex<double>::operator*=(double __d)
-  {
-    _M_value *= __d;
-    return *this;
-  }
-
-  inline complex<double>&
-  complex<double>::operator/=(double __d)
-  {
-    _M_value /= __d;
-    return *this;
-  }
-
-  template<typename _Tp>
-    inline complex<double>&
-    complex<double>::operator=(const complex<_Tp>& __z)
-    {
-      __real__ _M_value = __z.real();
-      __imag__ _M_value = __z.imag();
-      return *this;
-    }
-    
-  template<typename _Tp>
-    inline complex<double>&
-    complex<double>::operator+=(const complex<_Tp>& __z)
-    {
-      __real__ _M_value += __z.real();
-      __imag__ _M_value += __z.imag();
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline complex<double>&
-    complex<double>::operator-=(const complex<_Tp>& __z)
-    {
-      __real__ _M_value -= __z.real();
-      __imag__ _M_value -= __z.imag();
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline complex<double>&
-    complex<double>::operator*=(const complex<_Tp>& __z)
-    {
-      _ComplexT __t;
-      __real__ __t = __z.real();
-      __imag__ __t = __z.imag();
-      _M_value *= __t;
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline complex<double>&
-    complex<double>::operator/=(const complex<_Tp>& __z)
-    {
-      _ComplexT __t;
-      __real__ __t = __z.real();
-      __imag__ __t = __z.imag();
-      _M_value /= __t;
-      return *this;
-    }
-
-  // 26.2.3  complex specializations
-  // complex<long double> specialization
-  template<> class complex<long double>
-  {
-  public:
-    typedef long double value_type;
-
-    complex(long double = 0.0L, long double = 0.0L);
-
-    complex(const complex<float>&);
-    complex(const complex<double>&);
-
-    long double& real();
-    const long double& real() const;
-    long double& imag();
-    const long double& imag() const;
-
-    complex<long double>& operator= (long double);
-    complex<long double>& operator+= (long double);
-    complex<long double>& operator-= (long double);
-    complex<long double>& operator*= (long double);
-    complex<long double>& operator/= (long double);
-
-    // The compiler knows how to do this efficiently
-    // complex& operator= (const complex&);
-    template<typename _Tp>
-      complex<long double>& operator=(const complex<_Tp>&);
-    template<typename _Tp>
-      complex<long double>& operator+=(const complex<_Tp>&);
-    template<typename _Tp>
-      complex<long double>& operator-=(const complex<_Tp>&);
-    template<typename _Tp>
-      complex<long double>& operator*=(const complex<_Tp>&);
-    template<typename _Tp>
-      complex<long double>& operator/=(const complex<_Tp>&);
-
-  private:
-    typedef __complex__ long double _ComplexT;
-    _ComplexT _M_value;
-
-    complex(_ComplexT __z) : _M_value(__z) { }
-
-    friend class complex<float>;
-    friend class complex<double>;
-  };
-
-  inline
-  complex<long double>::complex(long double __r, long double __i)
-  {
-    __real__ _M_value = __r;
-    __imag__ _M_value = __i;
-  }
-
-  inline long double&
-  complex<long double>::real()
-  { return __real__ _M_value; }
-
-  inline const long double&
-  complex<long double>::real() const
-  { return __real__ _M_value; }
-
-  inline long double&
-  complex<long double>::imag()
-  { return __imag__ _M_value; }
-
-  inline const long double&
-  complex<long double>::imag() const
-  { return __imag__ _M_value; }
-
-  inline complex<long double>&   
-  complex<long double>::operator=(long double __r)
-  {
-    __real__ _M_value = __r;
-    __imag__ _M_value = 0.0L;
-    return *this;
-  }
-
-  inline complex<long double>&
-  complex<long double>::operator+=(long double __r)
-  {
-    __real__ _M_value += __r;
-    return *this;
-  }
-
-  inline complex<long double>&
-  complex<long double>::operator-=(long double __r)
-  {
-    __real__ _M_value -= __r;
-    return *this;
-  }
-
-  inline complex<long double>&
-  complex<long double>::operator*=(long double __r)
-  {
-    _M_value *= __r;
-    return *this;
-  }
-
-  inline complex<long double>&
-  complex<long double>::operator/=(long double __r)
-  {
-    _M_value /= __r;
-    return *this;
-  }
-
-  template<typename _Tp>
-    inline complex<long double>&
-    complex<long double>::operator=(const complex<_Tp>& __z)
-    {
-      __real__ _M_value = __z.real();
-      __imag__ _M_value = __z.imag();
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline complex<long double>&
-    complex<long double>::operator+=(const complex<_Tp>& __z)
-    {
-      __real__ _M_value += __z.real();
-      __imag__ _M_value += __z.imag();
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline complex<long double>&
-    complex<long double>::operator-=(const complex<_Tp>& __z)
-    {
-      __real__ _M_value -= __z.real();
-      __imag__ _M_value -= __z.imag();
-      return *this;
-    }
-    
-  template<typename _Tp>
-    inline complex<long double>&
-    complex<long double>::operator*=(const complex<_Tp>& __z)
-    {
-      _ComplexT __t;
-      __real__ __t = __z.real();
-      __imag__ __t = __z.imag();
-      _M_value *= __t;
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline complex<long double>&
-    complex<long double>::operator/=(const complex<_Tp>& __z)
-    {
-      _ComplexT __t;
-      __real__ __t = __z.real();
-      __imag__ __t = __z.imag();
-      _M_value /= __t;
-      return *this;
-    }
-
-  // These bits have to be at the end of this file, so that the
-  // specializations have all been defined.
-  // ??? No, they have to be there because of compiler limitation at
-  // inlining.  It suffices that class specializations be defined.
-  inline
-  complex<float>::complex(const complex<double>& __z)
-  : _M_value(_ComplexT(__z._M_value)) { }
-
-  inline
-  complex<float>::complex(const complex<long double>& __z)
-  : _M_value(_ComplexT(__z._M_value)) { }
-
-  inline
-  complex<double>::complex(const complex<float>& __z) 
-  : _M_value(_ComplexT(__z._M_value)) { }
-
-  inline
-  complex<double>::complex(const complex<long double>& __z)
-  {
-    __real__ _M_value = __z.real();
-    __imag__ _M_value = __z.imag();
-  }
-
-  inline
-  complex<long double>::complex(const complex<float>& __z)
-  : _M_value(_ComplexT(__z._M_value)) { }
-
-  inline
-  complex<long double>::complex(const complex<double>& __z)
-  : _M_value(_ComplexT(__z._M_value)) { }
-} // namespace std
-
-#endif	/* _GLIBCXX_COMPLEX */
diff --git a/include.new/c++/3.4/csetjmp b/include.new/c++/3.4/csetjmp
deleted file mode 100644
index d5fe073..0000000
--- a/include.new/c++/3.4/csetjmp
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-/** @file csetjmp
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c setjmp.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CSETJMP
-#define _GLIBCXX_CSETJMP 1
-
-#pragma GCC system_header
-
-#include <setjmp.h>
-
-// Get rid of those macros defined in <setjmp.h> in lieu of real functions.
-#undef longjmp
-
-// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998
-#ifndef setjmp
-#define setjmp(env) setjmp (env)
-#endif
-
-namespace std
-{
-  using ::jmp_buf;
-  using ::longjmp;
-}
-
-#endif
diff --git a/include.new/c++/3.4/csignal b/include.new/c++/3.4/csignal
deleted file mode 100644
index 5734cf6..0000000
--- a/include.new/c++/3.4/csignal
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-/** @file csignal
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c signal.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CSIGNAL
-#define _GLIBCXX_CSIGNAL 1
-
-#pragma GCC system_header
-
-#include <signal.h>
-
-// Get rid of those macros defined in <signal.h> in lieu of real functions.
-#undef raise
-
-namespace std
-{
-  using ::sig_atomic_t;
-  using ::signal;
-  using ::raise;
-}
-
-#endif
diff --git a/include.new/c++/3.4/cstdarg b/include.new/c++/3.4/cstdarg
deleted file mode 100644
index ca362e4..0000000
--- a/include.new/c++/3.4/cstdarg
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-/** @file cstdarg
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c stdarg.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CSTDARG
-#define _GLIBCXX_CSTDARG 1
-
-#pragma GCC system_header
-
-#include <stdarg.h>
-
-// Adhere to section 17.4.1.2 clause 5 of ISO 14882:1998
-#ifndef va_end
-#define va_end(ap) va_end (ap)
-#endif
-
-namespace std
-{
-  using ::va_list;
-}
-
-#endif
diff --git a/include.new/c++/3.4/cstddef b/include.new/c++/3.4/cstddef
deleted file mode 100644
index 4fa82c6..0000000
--- a/include.new/c++/3.4/cstddef
+++ /dev/null
@@ -1,56 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 18.1  Types
-//
-
-/** @file cstddef
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c stddef.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CSTDDEF
-#define _GLIBCXX_CSTDDEF 1
-
-#pragma GCC system_header
-
-#include <stddef.h>
-
-namespace std
-{
-  using ::ptrdiff_t;
-  using ::size_t;
-}
-
-#endif
diff --git a/include.new/c++/3.4/cstdio b/include.new/c++/3.4/cstdio
deleted file mode 100644
index f31e58e..0000000
--- a/include.new/c++/3.4/cstdio
+++ /dev/null
@@ -1,185 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.8.2  C Library files
-//
-
-/** @file cstdio
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c stdio.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CSTDIO
-#define _GLIBCXX_CSTDIO 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <cstddef>
-
-#include <stdio.h>
-
-// Get rid of those macros defined in <stdio.h> in lieu of real functions.
-#undef clearerr
-#undef fclose
-#undef feof
-#undef ferror
-#undef fflush
-#undef fgetc
-#undef fgetpos
-#undef fgets
-#undef fopen
-#undef fprintf
-#undef fputc
-#undef fputs
-#undef fread
-#undef freopen
-#undef fscanf
-#undef fseek
-#undef fsetpos
-#undef ftell
-#undef fwrite
-#undef getc
-#undef getchar
-#undef gets
-#undef perror
-#undef printf
-#undef putc
-#undef putchar
-#undef puts
-#undef remove
-#undef rename
-#undef rewind
-#undef scanf
-#undef setbuf
-#undef setvbuf
-#undef sprintf
-#undef sscanf
-#undef tmpfile
-#undef tmpnam
-#undef ungetc
-#undef vfprintf
-#undef vprintf
-#undef vsprintf
-
-namespace std
-{
-  using ::FILE;
-  using ::fpos_t;
-
-  using ::clearerr;
-  using ::fclose;
-  using ::feof;
-  using ::ferror;
-  using ::fflush;
-  using ::fgetc;
-  using ::fgetpos;
-  using ::fgets;
-  using ::fopen;
-  using ::fprintf;
-  using ::fputc;
-  using ::fputs;
-  using ::fread;
-  using ::freopen;
-  using ::fscanf;
-  using ::fseek;
-  using ::fsetpos;
-  using ::ftell;
-  using ::fwrite;
-  using ::getc;
-  using ::getchar;
-  using ::gets;
-  using ::perror;
-  using ::printf;
-  using ::putc;
-  using ::putchar;
-  using ::puts;
-  using ::remove;
-  using ::rename;
-  using ::rewind;
-  using ::scanf;
-  using ::setbuf;
-  using ::setvbuf;
-  using ::sprintf;
-  using ::sscanf;
-  using ::tmpfile;
-  using ::tmpnam;
-  using ::ungetc;
-  using ::vfprintf;
-  using ::vprintf;
-  using ::vsprintf;
-}
-
-#if _GLIBCXX_USE_C99
-
-#undef snprintf
-#undef vfscanf
-#undef vscanf
-#undef vsnprintf
-#undef vsscanf
-
-namespace __gnu_cxx
-{
-#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
-  extern "C" int
-    (snprintf)(char * restrict, size_t, const char * restrict, ...);
-  extern "C" int
-    (vfscanf)(FILE * restrict, const char * restrict, __gnuc_va_list);
-  extern "C" int (vscanf)(const char * restrict, __gnuc_va_list);
-  extern "C" int
-    (vsnprintf)(char * restrict, size_t, const char * restrict, __gnuc_va_list);
-  extern "C" int
-    (vsscanf)(const char * restrict, const char * restrict, __gnuc_va_list);
-#endif
-#if !_GLIBCXX_USE_C99_DYNAMIC
-  using ::snprintf;
-  using ::vfscanf;
-  using ::vscanf;
-  using ::vsnprintf;
-  using ::vsscanf;
-#endif
-}
-
-namespace std
-{
-  using __gnu_cxx::snprintf;
-  using __gnu_cxx::vfscanf;
-  using __gnu_cxx::vscanf;
-  using __gnu_cxx::vsnprintf;
-  using __gnu_cxx::vsscanf;
-}
-#endif
-
-#endif
diff --git a/include.new/c++/3.4/cstdlib b/include.new/c++/3.4/cstdlib
deleted file mode 100644
index d2d6e37..0000000
--- a/include.new/c++/3.4/cstdlib
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-/** @file cstdlib
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c stdlib.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CSTDLIB
-#define _GLIBCXX_CSTDLIB 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <cstddef>
-
-#include <stdlib.h>
-
-// Get rid of those macros defined in <stdlib.h> in lieu of real functions.
-#undef abort
-#undef abs
-#undef atexit
-#undef atof
-#undef atoi
-#undef atol
-#undef bsearch
-#undef calloc
-#undef div
-#undef exit
-#undef free
-#undef getenv
-#undef labs
-#undef ldiv
-#undef malloc
-#undef mblen
-#undef mbstowcs
-#undef mbtowc
-#undef qsort
-#undef rand
-#undef realloc
-#undef srand
-#undef strtod
-#undef strtol
-#undef strtoul
-#undef system
-#undef wcstombs
-#undef wctomb
-
-namespace std
-{
-  using ::div_t;
-  using ::ldiv_t;
-
-  using ::abort;
-  using ::abs;
-  using ::atexit;
-  using ::atof;
-  using ::atoi;
-  using ::atol;
-  using ::bsearch;
-  using ::calloc;
-  using ::div;
-  using ::exit;
-  using ::free;
-  using ::getenv;
-  using ::labs;
-  using ::ldiv;
-  using ::malloc;
-#ifdef _GLIBCXX_HAVE_MBSTATE_T
-  using ::mblen;
-  using ::mbstowcs;
-  using ::mbtowc;
-#endif // _GLIBCXX_HAVE_MBSTATE_T
-  using ::qsort;
-  using ::rand;
-  using ::realloc;
-  using ::srand;
-  using ::strtod;
-  using ::strtol;
-  using ::strtoul;
-  using ::system;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  using ::wcstombs;
-  using ::wctomb;
-#endif // _GLIBCXX_USE_WCHAR_T
-
-  inline long
-  abs(long __i) { return labs(__i); }
-
-  inline ldiv_t
-  div(long __i, long __j) { return ldiv(__i, __j); }
-}
-
-#if _GLIBCXX_USE_C99
-
-#undef _Exit
-#undef llabs
-#undef lldiv
-#undef atoll
-#undef strtoll
-#undef strtoull
-#undef strtof
-#undef strtold
-
-namespace __gnu_cxx
-{
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::lldiv_t;
-#endif
-#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
-  extern "C" void (_Exit)(int);
-#endif
-#if !_GLIBCXX_USE_C99_DYNAMIC
-  using ::_Exit;
-#endif
-
-  inline long long
-  abs(long long __x) { return __x >= 0 ? __x : -__x; }
-
-  inline long long
-  llabs(long long __x) { return __x >= 0 ? __x : -__x; }
-
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  inline lldiv_t
-  div(long long __n, long long __d)
-  { lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
-
-  inline lldiv_t
-  lldiv(long long __n, long long __d)
-  { lldiv_t __q; __q.quot = __n / __d; __q.rem = __n % __d; return __q; }
-#endif
-
-#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  extern "C" long long int (atoll)(const char *);
-  extern "C" long long int
-    (strtoll)(const char * restrict, char ** restrict, int);
-  extern "C" unsigned long long int
-    (strtoull)(const char * restrict, char ** restrict, int);
-#endif
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::atoll;
-  using ::strtoll;
-  using ::strtoull;
-#endif
-  using ::strtof;
-  using ::strtold;
-}
-
-namespace std
-{
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using __gnu_cxx::lldiv_t;
-#endif
-  using __gnu_cxx::_Exit;
-  using __gnu_cxx::abs;
-  using __gnu_cxx::llabs;
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using __gnu_cxx::div;
-  using __gnu_cxx::lldiv;
-#endif
-  using __gnu_cxx::atoll;
-  using __gnu_cxx::strtof;
-  using __gnu_cxx::strtoll;
-  using __gnu_cxx::strtoull;
-  using __gnu_cxx::strtold;
-}
-#endif
-
-#endif
diff --git a/include.new/c++/3.4/cstring b/include.new/c++/3.4/cstring
deleted file mode 100644
index dad40c2..0000000
--- a/include.new/c++/3.4/cstring
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 20.4.6  C library
-//
-
-/** @file cstring
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c string.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CSTRING
-#define _GLIBCXX_CSTRING 1
-
-#pragma GCC system_header
-
-#include <cstddef>
-
-#include <string.h>
-
-// Get rid of those macros defined in <string.h> in lieu of real functions.
-#undef memcpy
-#undef memmove
-#undef strcpy
-#undef strncpy
-#undef strcat
-#undef strncat
-#undef memcmp
-#undef strcmp
-#undef strcoll
-#undef strncmp
-#undef strxfrm
-#undef memchr
-#undef strchr
-#undef strcspn
-#undef strpbrk
-#undef strrchr
-#undef strspn
-#undef strstr
-#undef strtok
-#undef memset
-#undef strerror
-#undef strlen
-
-namespace std
-{
-  using ::memcpy;
-  using ::memmove;
-  using ::strcpy;
-  using ::strncpy;
-  using ::strcat;
-  using ::strncat;
-  using ::memcmp;
-  using ::strcmp;
-  using ::strcoll;
-  using ::strncmp;
-  using ::strxfrm;
-  using ::strcspn;
-  using ::strspn;
-  using ::strtok;
-  using ::memset;
-  using ::strerror;
-  using ::strlen;
-
-  using ::memchr;
-
-  inline void*
-  memchr(void* __p, int __c, size_t __n)
-  { return memchr(const_cast<const void*>(__p), __c, __n); }
-
-  using ::strchr;
-
-  inline char*
-  strchr(char* __s1, int __n)
-  { return __builtin_strchr(const_cast<const char*>(__s1), __n); }
-
-  using ::strpbrk;
-
-  inline char*
-  strpbrk(char* __s1, const char* __s2)
-  { return __builtin_strpbrk(const_cast<const char*>(__s1), __s2); }
-
-  using ::strrchr;
-
-  inline char*
-  strrchr(char* __s1, int __n)
-  { return __builtin_strrchr(const_cast<const char*>(__s1), __n); }
-
-  using ::strstr;
-
-  inline char*
-  strstr(char* __s1, const char* __s2)
-  { return __builtin_strstr(const_cast<const char*>(__s1), __s2); }
-}
-
-#endif
diff --git a/include.new/c++/3.4/ctime b/include.new/c++/3.4/ctime
deleted file mode 100644
index fe890df..0000000
--- a/include.new/c++/3.4/ctime
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 20.5  Date and time
-//
-
-/** @file ctime
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c time.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CTIME
-#define _GLIBCXX_CTIME 1
-
-#pragma GCC system_header
-
-#include <cstddef>
-
-#include <time.h>
-
-// Get rid of those macros defined in <time.h> in lieu of real functions.
-#undef clock
-#undef difftime
-#undef mktime
-#undef time
-#undef asctime
-#undef ctime
-#undef gmtime
-#undef localtime
-#undef strftime
-
-namespace std
-{
-  using ::clock_t;
-  using ::time_t;
-  using ::tm;
-
-  using ::clock;
-  using ::difftime;
-  using ::mktime;
-  using ::time;
-  using ::asctime;
-  using ::ctime;
-  using ::gmtime;
-  using ::localtime;
-  using ::strftime;
-}
-
-#endif
diff --git a/include.new/c++/3.4/cwchar b/include.new/c++/3.4/cwchar
deleted file mode 100644
index d9e11e9..0000000
--- a/include.new/c++/3.4/cwchar
+++ /dev/null
@@ -1,273 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 21.4
-//
-
-/** @file cwchar
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c wchar.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CWCHAR
-#define _GLIBCXX_CWCHAR 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <cstddef>
-#include <ctime>
-
-#if _GLIBCXX_HAVE_WCHAR_H
-#include <wchar.h>
-#endif
-
-// Need to do a bit of trickery here with mbstate_t as char_traits
-// assumes it is in wchar.h, regardless of wchar_t specializations.
-#ifndef _GLIBCXX_HAVE_MBSTATE_T
-extern "C"
-{
-  typedef struct
-  {
-    int __fill[6];
-  } mbstate_t;
-}
-#endif
-
-namespace std
-{
-  using ::mbstate_t;
-}
-
-// Get rid of those macros defined in <wchar.h> in lieu of real functions.
-#undef btowc
-#undef fgetwc
-#undef fgetws
-#undef fputwc
-#undef fputws
-#undef fwide
-#undef fwprintf
-#undef fwscanf
-#undef getwc
-#undef getwchar
-#undef mbrlen
-#undef mbrtowc
-#undef mbsinit
-#undef mbsrtowcs
-#undef putwc
-#undef putwchar
-#undef swprintf
-#undef swscanf
-#undef ungetwc
-#undef vfwprintf
-#if _GLIBCXX_HAVE_VFWSCANF
-# undef vfwscanf
-#endif
-#undef vswprintf
-#if _GLIBCXX_HAVE_VSWSCANF
-# undef vswscanf
-#endif
-#undef vwprintf
-#if _GLIBCXX_HAVE_VWSCANF
-# undef vwscanf
-#endif
-#undef wcrtomb
-#undef wcscat
-#undef wcschr
-#undef wcscmp
-#undef wcscoll
-#undef wcscpy
-#undef wcscspn
-#undef wcsftime
-#undef wcslen
-#undef wcsncat
-#undef wcsncmp
-#undef wcsncpy
-#undef wcspbrk
-#undef wcsrchr
-#undef wcsrtombs
-#undef wcsspn
-#undef wcsstr
-#undef wcstod
-#if _GLIBCXX_HAVE_WCSTOF
-# undef wcstof
-#endif
-#undef wcstok
-#undef wcstol
-#undef wcstoul
-#undef wcsxfrm
-#undef wctob
-#undef wmemchr
-#undef wmemcmp
-#undef wmemcpy
-#undef wmemmove
-#undef wmemset
-#undef wprintf
-#undef wscanf
-
-#if _GLIBCXX_USE_WCHAR_T
-namespace std
-{
-  using ::wint_t;
-
-  using ::btowc;
-  using ::fgetwc;
-  using ::fgetws;
-  using ::fputwc;
-  using ::fputws;
-  using ::fwide;
-  using ::fwprintf;
-  using ::fwscanf;
-  using ::getwc;
-  using ::getwchar;
-  using ::mbrlen;
-  using ::mbrtowc;
-  using ::mbsinit;
-  using ::mbsrtowcs;
-  using ::putwc;
-  using ::putwchar;
-  using ::swprintf;
-  using ::swscanf;
-  using ::ungetwc;
-  using ::vfwprintf;
-#if _GLIBCXX_HAVE_VFWSCANF
-  using ::vfwscanf;
-#endif
-  using ::vswprintf;
-#if _GLIBCXX_HAVE_VSWSCANF
-  using ::vswscanf;
-#endif
-  using ::vwprintf;
-#if _GLIBCXX_HAVE_VWSCANF
-  using ::vwscanf;
-#endif
-  using ::wcrtomb;
-  using ::wcscat;
-  using ::wcscmp;
-  using ::wcscoll;
-  using ::wcscpy;
-  using ::wcscspn;
-  using ::wcsftime;
-  using ::wcslen;
-  using ::wcsncat;
-  using ::wcsncmp;
-  using ::wcsncpy;
-  using ::wcsrtombs;
-  using ::wcsspn;
-  using ::wcstod;
-#if _GLIBCXX_HAVE_WCSTOF
-  using ::wcstof;
-#endif
-  using ::wcstok;
-  using ::wcstol;
-  using ::wcstoul;
-  using ::wcsxfrm;
-  using ::wctob;
-  using ::wmemcmp;
-  using ::wmemcpy;
-  using ::wmemmove;
-  using ::wmemset;
-  using ::wprintf;
-  using ::wscanf;
-
-  using ::wcschr;
-
-  inline wchar_t*
-  wcschr(wchar_t* __p, wchar_t __c)
-  { return wcschr(const_cast<const wchar_t*>(__p), __c); }
-
-  using ::wcspbrk;
-
-  inline wchar_t*
-  wcspbrk(wchar_t* __s1, wchar_t* __s2)
-  { return wcspbrk(const_cast<const wchar_t*>(__s1), __s2); }
-
-  using ::wcsrchr;
-
-  inline wchar_t*
-  wcsrchr(wchar_t* __p, wchar_t __c)
-  { return wcsrchr(const_cast<const wchar_t*>(__p), __c); }
-
-  using ::wcsstr;
-
-  inline wchar_t*
-  wcsstr(wchar_t* __s1, const wchar_t* __s2)
-  { return wcsstr(const_cast<const wchar_t*>(__s1), __s2); }
-
-  using ::wmemchr;
-
-  inline wchar_t*
-  wmemchr(wchar_t* __p, wchar_t __c, size_t __n)
-  { return wmemchr(const_cast<const wchar_t*>(__p), __c, __n); }
-}
-
-#if _GLIBCXX_USE_C99
-
-#undef wcstold
-#undef wcstoll
-#undef wcstoull
-
-namespace __gnu_cxx
-{
-#if _GLIBCXX_USE_C99_CHECK || _GLIBCXX_USE_C99_DYNAMIC
-  extern "C" long double
-    (wcstold)(const wchar_t * restrict, wchar_t ** restrict);
-#endif
-#if !_GLIBCXX_USE_C99_DYNAMIC
-  using ::wcstold;
-#endif
-#if _GLIBCXX_USE_C99_LONG_LONG_CHECK || _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  extern "C" long long int
-    (wcstoll)(const wchar_t * restrict, wchar_t ** restrict, int);
-  extern "C" unsigned long long int
-    (wcstoull)(const wchar_t * restrict, wchar_t ** restrict, int);
-#endif
-#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
-  using ::wcstoll;
-  using ::wcstoull;
-#endif
-}
-
-namespace std
-{
-  using __gnu_cxx::wcstold;
-  using __gnu_cxx::wcstoll;
-  using __gnu_cxx::wcstoull;
-}
-#endif
-
-#endif //_GLIBCXX_USE_WCHAR_T
-
-#endif
diff --git a/include.new/c++/3.4/cwctype b/include.new/c++/3.4/cwctype
deleted file mode 100644
index 970c53a..0000000
--- a/include.new/c++/3.4/cwctype
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*- forwarding header.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: <cwctype>
-//
-
-/** @file cwctype
- *  This is a Standard C++ Library file.  You should @c #include this file
- *  in your programs, rather than any of the "*.h" implementation files.
- *
- *  This is the C++ version of the Standard C Library header @c wctype.h,
- *  and its contents are (mostly) the same as that header, but are all
- *  contained in the namespace @c std.
- */
-
-#ifndef _GLIBCXX_CWCTYPE
-#define _GLIBCXX_CWCTYPE 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-#if _GLIBCXX_HAVE_WCTYPE_H
-#include <wctype.h>
-#endif
-
-// Get rid of those macros defined in <wctype.h> in lieu of real functions.
-#undef iswalnum
-#undef iswalpha
-#if _GLIBCXX_HAVE_ISWBLANK
-# undef iswblank
-#endif
-#undef iswcntrl
-#undef iswdigit
-#undef iswgraph
-#undef iswlower
-#undef iswprint
-#undef iswprint
-#undef iswpunct
-#undef iswspace
-#undef iswupper
-#undef iswxdigit
-#undef iswctype
-#undef towlower
-#undef towupper
-#undef towctrans
-#undef wctrans
-#undef wctype
-
-#if _GLIBCXX_USE_WCHAR_T
-namespace std
-{
-  using ::wint_t;	  // cwchar
-
-  using ::wctype_t;
-  using ::wctrans_t;
-
-  using ::iswalnum;
-  using ::iswalpha;
-#if _GLIBCXX_HAVE_ISWBLANK
-  using ::iswblank;
-#endif
-  using ::iswcntrl;
-  using ::iswdigit;
-  using ::iswgraph;
-  using ::iswlower;
-  using ::iswprint;
-  using ::iswprint;
-  using ::iswpunct;
-  using ::iswspace;
-  using ::iswupper;
-  using ::iswxdigit;
-  using ::iswctype;
-  using ::towlower;
-  using ::towupper;
-  using ::towctrans;
-  using ::wctrans;
-  using ::wctype;
-}
-#endif //_GLIBCXX_USE_WCHAR_T
-
-#endif
diff --git a/include.new/c++/3.4/cxxabi.h b/include.new/c++/3.4/cxxabi.h
deleted file mode 100644
index 3553549..0000000
--- a/include.new/c++/3.4/cxxabi.h
+++ /dev/null
@@ -1,528 +0,0 @@
-// new abi support -*- C++ -*-
-  
-// Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-// 
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with GCC; see the file COPYING.  If not, write to
-// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Nathan Sidwell, Codesourcery LLC, <nathan@codesourcery.com>
- 
-/* This file declares the new abi entry points into the runtime. It is not
-   normally necessary for user programs to include this header, or use the
-   entry points directly. However, this header is available should that be
-   needed.
-   
-   Some of the entry points are intended for both C and C++, thus this header
-   is includable from both C and C++. Though the C++ specific parts are not
-   available in C, naturally enough.  */
-
-#ifndef _CXXABI_H
-#define _CXXABI_H 1
-
-#include <stddef.h>
- 
-#ifdef __cplusplus
-namespace __cxxabiv1
-{  
-  extern "C" 
-  {
-#endif
-
-  // Allocate array.
-  void* 
-  __cxa_vec_new(size_t __element_count, size_t __element_size, 
-		size_t __padding_size, void (*__constructor) (void*),
-		void (*__destructor) (void*));
-
-  void*
-  __cxa_vec_new2(size_t __element_count, size_t __element_size,
-		 size_t __padding_size, void (*__constructor) (void*),
-		 void (*__destructor) (void*), void *(*__alloc) (size_t), 
-		 void (*__dealloc) (void*));
-
-  void*
-  __cxa_vec_new3(size_t __element_count, size_t __element_size,
-		 size_t __padding_size, void (*__constructor) (void*),
-		 void (*__destructor) (void*), void *(*__alloc) (size_t), 
-		 void (*__dealloc) (void*, size_t));
-
-  // Construct array.
-  void 
-  __cxa_vec_ctor(void* __array_address, size_t __element_count,
-		 size_t __element_size, void (*__constructor) (void*),
-		 void (*__destructor) (void*));
-
-  void 
-  __cxa_vec_cctor(void* dest_array, void* src_array, size_t element_count, 
-		  size_t element_size, void (*constructor) (void*, void*), 
-		  void (*destructor) (void*));
- 
-  // Destruct array.
-  void 
-  __cxa_vec_dtor(void* __array_address, size_t __element_count,
-		 size_t __element_size, void (*__destructor) (void*));
-  
-  void 
-  __cxa_vec_cleanup(void* __array_address, size_t __element_count,
-		    size_t __element_size, void (*__destructor) (void*));
-  
-  // Destruct and release array.
-  void 
-  __cxa_vec_delete(void* __array_address, size_t __element_size,
-		   size_t __padding_size, void (*__destructor) (void*));
-
-  void 
-  __cxa_vec_delete2(void* __array_address, size_t __element_size,
-		    size_t __padding_size, void (*__destructor) (void*),
-		    void (*__dealloc) (void*));
-                  
-  void 
-  __cxa_vec_delete3(void* __array_address, size_t __element_size,
-		    size_t __padding_size, void (*__destructor) (void*),
-		    void (*__dealloc) (void*, size_t));
-
-  // The ABI requires a 64-bit type.
-  __extension__ typedef int __guard __attribute__((mode (__DI__)));
-
-  int 
-  __cxa_guard_acquire(__guard*);
-
-  void 
-  __cxa_guard_release(__guard*);
-
-  void 
-  __cxa_guard_abort(__guard*);
-
-  // Pure virtual functions.
-  void
-  __cxa_pure_virtual(void);
-
-  // Exception handling.
-  void
-  __cxa_bad_cast();
-
-  void
-  __cxa_bad_typeid();
-
-  // DSO destruction.
-  int
-  __cxa_atexit(void (*)(void*), void*, void*);
-
-  int
-  __cxa_finalize(void*);
-
-  // Demangling routines. 
-  char*
-  __cxa_demangle(const char* __mangled_name, char* __output_buffer,
-		 size_t* __length, int* __status);
-#ifdef __cplusplus
-  }
-} // namespace __cxxabiv1
-#endif
-
-#ifdef __cplusplus
-
-#include <typeinfo>
-
-namespace __cxxabiv1
-{
-  // Type information for int, float etc.
-  class __fundamental_type_info : public std::type_info
-  {
-  public:
-    explicit 
-    __fundamental_type_info(const char* __n) : std::type_info(__n) { }
-
-    virtual 
-    ~__fundamental_type_info();
-  };
-
-  // Type information for array objects.
-  class __array_type_info : public std::type_info
-  {
-  public:
-    explicit 
-    __array_type_info(const char* __n) : std::type_info(__n) { }
-
-    virtual 
-    ~__array_type_info();
-  };
-
-  // Type information for functions (both member and non-member).
-  class __function_type_info : public std::type_info
-  {
-  public:
-    explicit 
-    __function_type_info(const char* __n) : std::type_info(__n) { }
-
-    virtual 
-    ~__function_type_info();
-
-  protected:
-    // Implementation defined member function.
-    virtual bool 
-    __is_function_p() const;
-  };
-
-  // Type information for enumerations.
-  class __enum_type_info : public std::type_info
-  {
-  public:
-    explicit 
-    __enum_type_info(const char* __n) : std::type_info(__n) { }
-
-    virtual 
-    ~__enum_type_info();
-  };
-
-  // Common type information for simple pointers and pointers to member.
-  class __pbase_type_info : public std::type_info
-  {
-  public:
-    unsigned int 		__flags; // Qualification of the target object.
-    const std::type_info* 	__pointee; // Type of pointed to object.
-
-    explicit 
-    __pbase_type_info(const char* __n, int __quals, 
-		      const std::type_info* __type)
-    : std::type_info(__n), __flags(__quals), __pointee(__type)
-    { }
-    
-    virtual 
-    ~__pbase_type_info();
-
-    // Implementation defined type.
-    enum __masks 
-      {
-	__const_mask = 0x1,
-	__volatile_mask = 0x2,
-	__restrict_mask = 0x4,
-	__incomplete_mask = 0x8,
-	__incomplete_class_mask = 0x10
-      };
-
-  protected:
-    __pbase_type_info(const __pbase_type_info&);
-
-    __pbase_type_info&
-    operator=(const __pbase_type_info&);
-
-    // Implementation defined member functions.
-    virtual bool 
-    __do_catch(const std::type_info* __thr_type, void** __thr_obj, 
-	       unsigned int __outer) const;
-
-    inline virtual bool 
-    __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
-		    unsigned __outer) const;
-  };
-
-  // Type information for simple pointers.
-  class __pointer_type_info : public __pbase_type_info
-  {
-  public:
-    explicit 
-    __pointer_type_info(const char* __n, int __quals, 
-			const std::type_info* __type)
-    : __pbase_type_info (__n, __quals, __type) { }
-
-
-    virtual 
-    ~__pointer_type_info();
-
-  protected:
-    // Implementation defined member functions.
-    virtual bool 
-    __is_pointer_p() const;
-
-    virtual bool 
-    __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj, 
-		    unsigned __outer) const;
-  };
-
-  class __class_type_info;
-
-  // Type information for a pointer to member variable.
-  class __pointer_to_member_type_info : public __pbase_type_info
-  {
-  public:
-    __class_type_info* __context;   // Class of the member.
-
-    explicit 
-    __pointer_to_member_type_info(const char* __n, int __quals,
-				  const std::type_info* __type, 
-				  __class_type_info* __klass)
-    : __pbase_type_info(__n, __quals, __type), __context(__klass) { }
-
-    virtual 
-    ~__pointer_to_member_type_info();
-
-  protected:
-    __pointer_to_member_type_info(const __pointer_to_member_type_info&);
-
-    __pointer_to_member_type_info&
-    operator=(const __pointer_to_member_type_info&);
-
-    // Implementation defined member function.
-    virtual bool 
-    __pointer_catch(const __pbase_type_info* __thr_type, void** __thr_obj,
-		    unsigned __outer) const;
-  };
-
-  // Helper class for __vmi_class_type.
-  class __base_class_type_info
-  {
-  public:
-    const __class_type_info* 	__base_type;  // Base class type.
-    long 			__offset_flags;  // Offset and info.
-
-    enum __offset_flags_masks 
-      {
-	__virtual_mask = 0x1,
-	__public_mask = 0x2,
-	__hwm_bit = 2,
-	__offset_shift = 8          // Bits to shift offset.
-      };
-  
-    // Implementation defined member functions.
-    bool 
-    __is_virtual_p() const
-    { return __offset_flags & __virtual_mask; }
-
-    bool 
-    __is_public_p() const
-    { return __offset_flags & __public_mask; }
-
-    ptrdiff_t 
-    __offset() const
-    { 
-      // This shift, being of a signed type, is implementation
-      // defined. GCC implements such shifts as arithmetic, which is
-      // what we want.
-      return static_cast<ptrdiff_t>(__offset_flags) >> __offset_shift;
-    }
-  };
-
-  // Type information for a class.
-  class __class_type_info : public std::type_info
-  {
-  public:
-    explicit 
-    __class_type_info (const char *__n) : type_info(__n) { }
-
-    virtual 
-    ~__class_type_info ();
-
-    // Implementation defined types.
-    // The type sub_kind tells us about how a base object is contained
-    // within a derived object. We often do this lazily, hence the
-    // UNKNOWN value. At other times we may use NOT_CONTAINED to mean
-    // not publicly contained.
-    enum __sub_kind
-      {
-	// We have no idea.
-	__unknown = 0, 
-
-	// Not contained within us (in some circumstances this might
-	// mean not contained publicly)
-	__not_contained, 
-
-	// Contained ambiguously.
-	__contained_ambig, 
-    
-	// Via a virtual path.
-	__contained_virtual_mask = __base_class_type_info::__virtual_mask, 
-
-	// Via a public path.
-	__contained_public_mask = __base_class_type_info::__public_mask,   
-
-	// Contained within us.
-	__contained_mask = 1 << __base_class_type_info::__hwm_bit,
-    
-	__contained_private = __contained_mask,
-	__contained_public = __contained_mask | __contained_public_mask
-      };
-
-    struct __upcast_result;
-    struct __dyncast_result;
-
-  protected:
-    // Implementation defined member functions.
-    virtual bool 
-    __do_upcast(const __class_type_info* __dst_type, void**__obj_ptr) const;
-
-    virtual bool 
-    __do_catch(const type_info* __thr_type, void** __thr_obj, 
-	       unsigned __outer) const;
-
-  public:
-    // Helper for upcast. See if DST is us, or one of our bases. 
-    // Return false if not found, true if found. 
-    virtual bool 
-    __do_upcast(const __class_type_info* __dst, const void* __obj,
-		__upcast_result& __restrict __result) const;
-
-    // Indicate whether SRC_PTR of type SRC_TYPE is contained publicly
-    // within OBJ_PTR. OBJ_PTR points to a base object of our type,
-    // which is the destination type. SRC2DST indicates how SRC
-    // objects might be contained within this type.  If SRC_PTR is one
-    // of our SRC_TYPE bases, indicate the virtuality. Returns
-    // not_contained for non containment or private containment.
-    inline __sub_kind 
-    __find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
-		      const __class_type_info* __src_type, 
-		      const void* __src_ptr) const;
-
-    // Helper for dynamic cast. ACCESS_PATH gives the access from the
-    // most derived object to this base. DST_TYPE indicates the
-    // desired type we want. OBJ_PTR points to a base of our type
-    // within the complete object. SRC_TYPE indicates the static type
-    // started from and SRC_PTR points to that base within the most
-    // derived object. Fill in RESULT with what we find. Return true
-    // if we have located an ambiguous match.
-    virtual bool 
-    __do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
-		 const __class_type_info* __dst_type, const void* __obj_ptr, 
-		 const __class_type_info* __src_type, const void* __src_ptr, 
-		 __dyncast_result& __result) const;
-    
-    // Helper for find_public_subobj. SRC2DST indicates how SRC_TYPE
-    // bases are inherited by the type started from -- which is not
-    // necessarily the current type. The current type will be a base
-    // of the destination type.  OBJ_PTR points to the current base.
-    virtual __sub_kind 
-    __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
-			 const __class_type_info* __src_type,
-			 const void* __src_ptr) const;
-  };
-
-  // Type information for a class with a single non-virtual base.
-  class __si_class_type_info : public __class_type_info
-  {
-  public:
-    const __class_type_info* __base_type;
-
-    explicit 
-    __si_class_type_info(const char *__n, const __class_type_info *__base)
-    : __class_type_info(__n), __base_type(__base) { }
-
-    virtual 
-    ~__si_class_type_info();
-
-  protected:
-    __si_class_type_info(const __si_class_type_info&);
-
-    __si_class_type_info&
-    operator=(const __si_class_type_info&);
-
-    // Implementation defined member functions.
-    virtual bool 
-    __do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
-		 const __class_type_info* __dst_type, const void* __obj_ptr,
-		 const __class_type_info* __src_type, const void* __src_ptr,
-		 __dyncast_result& __result) const;
-
-    virtual __sub_kind 
-    __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr,
-			 const __class_type_info* __src_type,
-			 const void* __sub_ptr) const;
-
-    virtual bool 
-    __do_upcast(const __class_type_info*__dst, const void*__obj,
-		__upcast_result& __restrict __result) const;
-  };
-
-  // Type information for a class with multiple and/or virtual bases.
-  class __vmi_class_type_info : public __class_type_info 
-  {
-  public:
-    unsigned int 		__flags;  // Details about the class hierarchy.
-    unsigned int 		__base_count;  // Dumber of direct bases.
-
-    // The array of bases uses the trailing array struct hack so this
-    // class is not constructable with a normal constructor. It is
-    // internally generated by the compiler.
-    __base_class_type_info 	__base_info[1];  // Array of bases.
-
-    explicit 
-    __vmi_class_type_info(const char* __n, int ___flags)
-    : __class_type_info(__n), __flags(___flags), __base_count(0) { }
-
-    virtual 
-    ~__vmi_class_type_info();
-
-    // Implementation defined types.
-    enum __flags_masks 
-      {
-	__non_diamond_repeat_mask = 0x1, // Distinct instance of repeated base.
-	__diamond_shaped_mask = 0x2, // Diamond shaped multiple inheritance.
-	__flags_unknown_mask = 0x10
-      };
-
-  protected:
-    // Implementation defined member functions.
-    virtual bool 
-    __do_dyncast(ptrdiff_t __src2dst, __sub_kind __access_path,
-		 const __class_type_info* __dst_type, const void* __obj_ptr,
-		 const __class_type_info* __src_type, const void* __src_ptr,
-		 __dyncast_result& __result) const;
-
-    virtual __sub_kind 
-    __do_find_public_src(ptrdiff_t __src2dst, const void* __obj_ptr, 
-			 const __class_type_info* __src_type,
-			 const void* __src_ptr) const;
-    
-    virtual bool 
-    __do_upcast(const __class_type_info* __dst, const void* __obj,
-		__upcast_result& __restrict __result) const;
-  };
-
-  // Dynamic cast runtime.
-  // src2dst has the following possible values
-  //  >-1: src_type is a unique public non-virtual base of dst_type
-  //       dst_ptr + src2dst == src_ptr
-  //   -1: unspecified relationship
-  //   -2: src_type is not a public base of dst_type
-  //   -3: src_type is a multiple public non-virtual base of dst_type
-  extern "C" void*
-  __dynamic_cast(const void* __src_ptr, // Starting object.
-		 const __class_type_info* __src_type, // Static type of object.
-		 const __class_type_info* __dst_type, // Desired target type.
-		 ptrdiff_t __src2dst); // How src and dst are related.
-
-
-  // Returns the type_info for the currently handled exception [15.3/8], or
-  // null if there is none.
-  extern "C" std::type_info*
-  __cxa_current_exception_type();
-} // namespace __cxxabiv1
-
-// User programs should use the alias `abi'. 
-namespace abi = __cxxabiv1;
-
-#endif // __cplusplus
-
-#endif // __CXXABI_H 
diff --git a/include.new/c++/3.4/debug/bitset b/include.new/c++/3.4/debug/bitset
deleted file mode 100644
index 2e2364f..0000000
--- a/include.new/c++/3.4/debug/bitset
+++ /dev/null
@@ -1,299 +0,0 @@
-// Debugging bitset implementation -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_BITSET
-#define _GLIBCXX_DEBUG_BITSET
-
-#include <bitset>
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug_def
-{
-  template<size_t _Nb>
-    class bitset
-    : public _GLIBCXX_STD::bitset<_Nb>, 
-      public __gnu_debug::_Safe_sequence_base
-    {
-      typedef _GLIBCXX_STD::bitset<_Nb> _Base;
-      typedef __gnu_debug::_Safe_sequence_base  _Safe_base;
-
-    public:
-      // bit reference:
-      class reference
-      : private _Base::reference, public __gnu_debug::_Safe_iterator_base
-      {
-	typedef typename _Base::reference _Base_ref;
-
-	friend class bitset;
-	reference();
-
-	reference(const _Base_ref& __base, bitset* __seq)
-	: _Base_ref(__base), _Safe_iterator_base(__seq, false)
-	{ }
-
-      public:
-	reference(const reference& __x)
-	: _Base_ref(__x), _Safe_iterator_base(__x, false)
-	{ }
-
-	reference&
-	operator=(bool __x)
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			      _M_message(::__gnu_debug::__msg_bad_bitset_write)
-				._M_iterator(*this));
-	  *static_cast<_Base_ref*>(this) = __x;
-	  return *this;
-	}
-
-	reference&
-	operator=(const reference& __x)
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! __x._M_singular(),
-			       _M_message(::__gnu_debug::__msg_bad_bitset_read)
-				._M_iterator(__x));
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			      _M_message(::__gnu_debug::__msg_bad_bitset_write)
-				._M_iterator(*this));
-	  *static_cast<_Base_ref*>(this) = __x;
-	  return *this;
-	}
-
-	bool
-	operator~() const
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			       _M_message(::__gnu_debug::__msg_bad_bitset_read)
-				._M_iterator(*this));
-	  return ~(*static_cast<const _Base_ref*>(this));
-	}
-
-	operator bool() const
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			      _M_message(::__gnu_debug::__msg_bad_bitset_read)
-				._M_iterator(*this));
-	  return *static_cast<const _Base_ref*>(this);
-	}
-
-	reference&
-	flip()
-	{
-	  _GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			      _M_message(::__gnu_debug::__msg_bad_bitset_flip)
-				._M_iterator(*this));
-	  _Base_ref::flip();
-	  return *this;
-	}
-      };
-
-      // 23.3.5.1 constructors:
-      bitset() : _Base() { }
-
-      bitset(unsigned long __val) : _Base(__val) { }
-
-      template<typename _CharT, typename _Traits, typename _Allocator>
-        explicit
-        bitset(const std::basic_string<_CharT,_Traits,_Allocator>& __str,
-	       typename std::basic_string<_CharT,_Traits,_Allocator>::size_type
-	       __pos = 0,
-	       typename std::basic_string<_CharT,_Traits,_Allocator>::size_type
-	       __n = (std::basic_string<_CharT,_Traits,_Allocator>::npos))
-	: _Base(__str, __pos, __n) { }
-
-      bitset(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-      // 23.3.5.2 bitset operations:
-      bitset<_Nb>&
-      operator&=(const bitset<_Nb>& __rhs)
-      {
-	_M_base() &= __rhs;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator|=(const bitset<_Nb>& __rhs)
-      {
-	_M_base() |= __rhs;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator^=(const bitset<_Nb>& __rhs)
-      {
-	_M_base() ^= __rhs;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator<<=(size_t __pos)
-      {
-	_M_base() <<= __pos;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      operator>>=(size_t __pos)
-      {
-	_M_base() >>= __pos;
-	return *this;
-      }
-
-      bitset<_Nb>&
-      set()
-      {
-	_Base::set();
-	return *this;
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 186. bitset::set() second parameter should be bool
-      bitset<_Nb>&
-      set(size_t __pos, bool __val = true)
-      {
-	_Base::set(__pos, __val);
-	return *this;
-      }
-
-      bitset<_Nb>&
-      reset()
-      {
-	_Base::reset();
-	return *this;
-      }
-
-      bitset<_Nb>&
-      reset(size_t __pos)
-      {
-	_Base::reset(__pos);
-	return *this;
-      }
-
-      bitset<_Nb> operator~() const { return bitset(~_M_base()); }
-
-      bitset<_Nb>&
-      flip()
-      {
-	_Base::flip();
-	return *this;
-      }
-
-      bitset<_Nb>&
-      flip(size_t __pos)
-      {
-	_Base::flip(__pos);
-	return *this;
-      }
-
-      // element access:
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 11. Bitset minor problems
-      reference
-      operator[](size_t __pos)
-      {
-	__glibcxx_check_subscript(__pos);
-	return reference(_M_base()[__pos], this);
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 11. Bitset minor problems
-      bool
-      operator[](size_t __pos) const
-      {
-	__glibcxx_check_subscript(__pos);
-	return _M_base()[__pos];
-      }
-
-      using _Base::to_ulong;
-
-      template <typename _CharT, typename _Traits, typename _Allocator>
-        std::basic_string<_CharT, _Traits, _Allocator>
-        to_string() const
-        { return _M_base().template to_string<_CharT, _Traits, _Allocator>(); }
-
-      using _Base::count;
-      using _Base::size;
-
-      bool
-      operator==(const bitset<_Nb>& __rhs) const
-      { return _M_base() == __rhs; }
-
-      bool
-      operator!=(const bitset<_Nb>& __rhs) const
-      { return _M_base() != __rhs; }
-
-      using _Base::test;
-      using _Base::any;
-      using _Base::none;
-
-      bitset<_Nb>
-      operator<<(size_t __pos) const
-      { return bitset<_Nb>(_M_base() << __pos); }
-
-      bitset<_Nb>
-      operator>>(size_t __pos) const
-      { return bitset<_Nb>(_M_base() >> __pos); }
-
-      _Base&
-      _M_base() { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-    };
-
-  template<size_t _Nb>
-    bitset<_Nb>
-    operator&(const bitset<_Nb>& __x, const bitset<_Nb>& __y)
-    { return bitset<_Nb>(__x) &= __y; }
-
-  template<size_t _Nb>
-    bitset<_Nb>
-    operator|(const bitset<_Nb>& __x, const bitset<_Nb>& __y)
-    { return bitset<_Nb>(__x) |= __y; }
-
-  template<size_t _Nb>
-    bitset<_Nb>
-    operator^(const bitset<_Nb>& __x, const bitset<_Nb>& __y)
-    { return bitset<_Nb>(__x) ^= __y; }
-
-  template<typename _CharT, typename _Traits, size_t _Nb>
-    std::basic_istream<_CharT, _Traits>&
-    operator>>(std::basic_istream<_CharT, _Traits>& __is, bitset<_Nb>& __x)
-    { return __is >> __x._M_base(); }
-
-  template<typename _CharT, typename _Traits, size_t _Nb>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const bitset<_Nb>& __x)
-    { return __os << __x._M_base(); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/debug.h b/include.new/c++/3.4/debug/debug.h
deleted file mode 100644
index 87bbcfa..0000000
--- a/include.new/c++/3.4/debug/debug.h
+++ /dev/null
@@ -1,531 +0,0 @@
-// Debugging support implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_DEBUG_H
-#define _GLIBCXX_DEBUG_DEBUG_H 1
-
-/**
- * Macros used by the implementation to verify certain
- * properties. These macros may only be used directly by the debug
- * wrappers. Note that these are macros (instead of the more obviously
- * "correct" choice of making them functions) because we need line and
- * file information at the call site, to minimize the distance between
- * the user error and where the error is reported.
- *
- */
-#define _GLIBCXX_DEBUG_VERIFY(_Condition,_ErrorMessage)		\
-  do {									\
-    if (! (_Condition))							\
-      ::__gnu_debug::_Error_formatter::_M_at(__FILE__, __LINE__)	\
-	  ._ErrorMessage._M_error();					\
-  } while (false)
-
-// Verify that [_First, _Last) forms a valid iterator range.
-#define __glibcxx_check_valid_range(_First,_Last)			\
-_GLIBCXX_DEBUG_VERIFY(::__gnu_debug::__valid_range(_First, _Last),	\
-		      _M_message(::__gnu_debug::__msg_valid_range)	\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))
-
-/** Verify that we can insert into *this with the iterator _Position.
- *  Insertion into a container at a specific position requires that
- *  the iterator be nonsingular (i.e., either dereferenceable or
- *  past-the-end) and that it reference the sequence we are inserting
- *  into. Note that this macro is only valid when the container is a
- *  _Safe_sequence and the iterator is a _Safe_iterator.
-*/
-#define __glibcxx_check_insert(_Position)				\
-_GLIBCXX_DEBUG_VERIFY(!_Position._M_singular(),				\
-		      _M_message(::__gnu_debug::__msg_insert_singular) \
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position));		\
-_GLIBCXX_DEBUG_VERIFY(_Position._M_attached_to(this),			\
-		      _M_message(::__gnu_debug::__msg_insert_different) \
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position))
-
-/** Verify that we can insert the values in the iterator range
- *  [_First, _Last) into *this with the iterator _Position.  Insertion
- *  into a container at a specific position requires that the iterator
- *  be nonsingular (i.e., either dereferenceable or past-the-end),
- *  that it reference the sequence we are inserting into, and that the
- *  iterator range [_First, Last) is a valid (possibly empty)
- *  range. Note that this macro is only valid when the container is a
- *  _Safe_sequence and the iterator is a _Safe_iterator.
- *
- *  @tbd We would like to be able to check for noninterference of
- *  _Position and the range [_First, _Last), but that can't (in
- *  general) be done.
-*/
-#define __glibcxx_check_insert_range(_Position,_First,_Last)		\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(!_Position._M_singular(),				\
-		      _M_message(::__gnu_debug::__msg_insert_singular) \
-                      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position));		\
-_GLIBCXX_DEBUG_VERIFY(_Position._M_attached_to(this),			\
-		      _M_message(::__gnu_debug::__msg_insert_different) \
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position))
-
-/** Verify that we can erase the element referenced by the iterator
- * _Position. We can erase the element if the _Position iterator is
- * dereferenceable and references this sequence.
-*/
-#define __glibcxx_check_erase(_Position)				\
-_GLIBCXX_DEBUG_VERIFY(_Position._M_dereferenceable(),			\
-		      _M_message(::__gnu_debug::__msg_erase_bad)	\
-                      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position));		\
-_GLIBCXX_DEBUG_VERIFY(_Position._M_attached_to(this),			\
-		      _M_message(::__gnu_debug::__msg_erase_different) \
-		      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_Position, #_Position))
-
-/** Verify that we can erase the elements in the iterator range
- *  [_First, _Last). We can erase the elements if [_First, _Last) is a
- *  valid iterator range within this sequence.
-*/
-#define __glibcxx_check_erase_range(_First,_Last)			\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(_First._M_attached_to(this),			\
-		      _M_message(::__gnu_debug::__msg_erase_different) \
-                      ._M_sequence(*this, "this")			\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))
-
-// Verify that the subscript _N is less than the container's size.
-#define __glibcxx_check_subscript(_N)					\
-_GLIBCXX_DEBUG_VERIFY(_N < this->size(),				\
-		      _M_message(::__gnu_debug::__msg_subscript_oob) \
-                      ._M_sequence(*this, "this")			\
-		      ._M_integer(_N, #_N)				\
-		      ._M_integer(this->size(), "size"))
-
-// Verify that the container is nonempty
-#define __glibcxx_check_nonempty()					\
-_GLIBCXX_DEBUG_VERIFY(! this->empty(),					\
-		      _M_message(::__gnu_debug::__msg_empty)	\
-                      ._M_sequence(*this, "this"))
-
-// Verify that the < operator for elements in the sequence is a
-// StrictWeakOrdering by checking that it is irreflexive.
-#define __glibcxx_check_strict_weak_ordering(_First,_Last)	\
-_GLIBCXX_DEBUG_ASSERT(_First == _Last || !(*_First < *_First))
-
-// Verify that the predicate is StrictWeakOrdering by checking that it
-// is irreflexive.
-#define __glibcxx_check_strict_weak_ordering_pred(_First,_Last,_Pred)	\
-_GLIBCXX_DEBUG_ASSERT(_First == _Last || !_Pred(*_First, *_First))
-
-
-// Verify that the iterator range [_First, _Last) is sorted
-#define __glibcxx_check_sorted(_First,_Last)				\
-__glibcxx_check_valid_range(_First,_Last);				\
-__glibcxx_check_strict_weak_ordering(_First,_Last);			\
-_GLIBCXX_DEBUG_VERIFY(::__gnu_debug::__check_sorted(_First, _Last),	\
-		      _M_message(::__gnu_debug::__msg_unsorted)	\
-                      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))
-
-/** Verify that the iterator range [_First, _Last) is sorted by the
-    predicate _Pred. */
-#define __glibcxx_check_sorted_pred(_First,_Last,_Pred)			\
-__glibcxx_check_valid_range(_First,_Last);				\
-__glibcxx_check_strict_weak_ordering_pred(_First,_Last,_Pred);	        \
-_GLIBCXX_DEBUG_VERIFY(::__gnu_debug::__check_sorted(_First, _Last, _Pred), \
-		      _M_message(::__gnu_debug::__msg_unsorted_pred) \
-                      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Pred))
-
-/** Verify that the iterator range [_First, _Last) is partitioned
-    w.r.t. the value _Value. */
-#define __glibcxx_check_partitioned(_First,_Last,_Value)		\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(::__gnu_debug::__check_partitioned(_First, _Last,	\
-							 _Value),	\
-		      _M_message(::__gnu_debug::__msg_unpartitioned) \
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Value))
-
-/** Verify that the iterator range [_First, _Last) is partitioned
-    w.r.t. the value _Value and predicate _Pred. */
-#define __glibcxx_check_partitioned_pred(_First,_Last,_Value,_Pred)	\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(::__gnu_debug::__check_partitioned(_First, _Last,	\
-							 _Value, _Pred), \
-		      _M_message(::__gnu_debug::__msg_unpartitioned_pred) \
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Pred)				\
-                      ._M_string(#_Value))
-
-// Verify that the iterator range [_First, _Last) is a heap
-#define __glibcxx_check_heap(_First,_Last)				\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(::std::__is_heap(_First, _Last),		\
-		      _M_message(::__gnu_debug::__msg_not_heap)	\
-		      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last))
-
-/** Verify that the iterator range [_First, _Last) is a heap
-    w.r.t. the predicate _Pred. */
-#define __glibcxx_check_heap_pred(_First,_Last,_Pred)			\
-__glibcxx_check_valid_range(_First,_Last);				\
-_GLIBCXX_DEBUG_VERIFY(::std::__is_heap(_First, _Last, _Pred),		\
-		      _M_message(::__gnu_debug::__msg_not_heap_pred) \
-                      ._M_iterator(_First, #_First)			\
-		      ._M_iterator(_Last, #_Last)			\
-		      ._M_string(#_Pred))
-
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-#  define __glibcxx_check_string(_String) _GLIBCXX_DEBUG_ASSERT(_String != 0)
-#  define __glibcxx_check_string_len(_String,_Len) \
-       _GLIBCXX_DEBUG_ASSERT(_String != 0 || _Len == 0)
-#else
-#  define __glibcxx_check_string(_String)
-#  define __glibcxx_check_string_len(_String,_Len)
-#endif
-
-/** Macros used by the implementation outside of debug wrappers to
- *  verify certain properties. The __glibcxx_requires_xxx macros are
- *  merely wrappers around the __glibcxx_check_xxx wrappers when we
- *  are compiling with debug mode, but disappear when we are in
- *  release mode so that there is no checking performed in, e.g., the
- *  standard library algorithms.
-*/
-#ifdef _GLIBCXX_DEBUG
-#  define _GLIBCXX_DEBUG_ASSERT(_Condition) assert(_Condition)
-
-#  ifdef _GLIBXX_DEBUG_PEDANTIC
-#    define _GLIBCXX_DEBUG_PEDASSERT(_Condition) assert(_Condition)
-#  else
-#    define _GLIBCXX_DEBUG_PEDASSERT(_Condition)
-#  endif
-
-#  define __glibcxx_requires_cond(_Cond,_Msg) _GLIBCXX_DEBUG_VERIFY(_Cond,_Msg)
-#  define __glibcxx_requires_valid_range(_First,_Last) \
-     __glibcxx_check_valid_range(_First,_Last)
-#  define __glibcxx_requires_sorted(_First,_Last) \
-     __glibcxx_check_sorted(_First,_Last)
-#  define __glibcxx_requires_sorted_pred(_First,_Last,_Pred) \
-     __glibcxx_check_sorted_pred(_First,_Last,_Pred)
-#  define __glibcxx_requires_partitioned(_First,_Last,_Value)	\
-     __glibcxx_check_partitioned(_First,_Last,_Value)
-#  define __glibcxx_requires_partitioned_pred(_First,_Last,_Value,_Pred) \
-     __glibcxx_check_partitioned_pred(_First,_Last,_Value,_Pred)
-#  define __glibcxx_requires_heap(_First,_Last) \
-     __glibcxx_check_heap(_First,_Last)
-#  define __glibcxx_requires_heap_pred(_First,_Last,_Pred) \
-     __glibcxx_check_heap_pred(_First,_Last,_Pred)
-#  define __glibcxx_requires_nonempty() __glibcxx_check_nonempty()
-#  define __glibcxx_requires_string(_String) __glibcxx_check_string(_String)
-#  define __glibcxx_requires_string_len(_String,_Len)	\
-     __glibcxx_check_string_len(_String,_Len)
-#  define __glibcxx_requires_subscript(_N) __glibcxx_check_subscript(_N)
-#else
-#  define _GLIBCXX_DEBUG_ASSERT(_Condition)
-#  define _GLIBCXX_DEBUG_PEDASSERT(_Condition)
-#  define __glibcxx_requires_cond(_Cond,_Msg)
-#  define __glibcxx_requires_valid_range(_First,_Last)
-#  define __glibcxx_requires_sorted(_First,_Last)
-#  define __glibcxx_requires_sorted_pred(_First,_Last,_Pred)
-#  define __glibcxx_requires_partitioned(_First,_Last,_Value)
-#  define __glibcxx_requires_partitioned_pred(_First,_Last,_Value,_Pred)
-#  define __glibcxx_requires_heap(_First,_Last)
-#  define __glibcxx_requires_heap_pred(_First,_Last,_Pred)
-#  define __glibcxx_requires_nonempty()
-#  define __glibcxx_requires_string(_String)
-#  define __glibcxx_requires_string_len(_String,_Len)
-#  define __glibcxx_requires_subscript(_N)
-#endif
-
-#include <cassert> // TBD: temporary
-
-#include <stddef.h>                       // for ptrdiff_t
-#include <bits/stl_iterator_base_types.h> // for iterator_traits, categories
-#include <bits/type_traits.h>             // for _Is_integer
-
-namespace __gnu_debug
-{
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_iterator;
-
-  // An arbitrary iterator pointer is not singular.
-  inline bool
-  __check_singular_aux(const void*) { return false; }
-
-  // We may have an iterator that derives from _Safe_iterator_base but isn't
-  // a _Safe_iterator.
-  template<typename _Iterator>
-    inline bool
-    __check_singular(_Iterator& __x)
-    { return __gnu_debug::__check_singular_aux(&__x); }
-
-  /** Non-NULL pointers are nonsingular. */
-  template<typename _Tp>
-    inline bool
-    __check_singular(const _Tp* __ptr)
-    { return __ptr == 0; }
-
-  /** Safe iterators know if they are singular. */
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    __check_singular(const _Safe_iterator<_Iterator, _Sequence>& __x)
-    { return __x._M_singular(); }
-
-  /** Assume that some arbitrary iterator is dereferenceable, because we
-      can't prove that it isn't. */
-  template<typename _Iterator>
-    inline bool
-    __check_dereferenceable(_Iterator&)
-    { return true; }
-
-  /** Non-NULL pointers are dereferenceable. */
-  template<typename _Tp>
-    inline bool
-    __check_dereferenceable(const _Tp* __ptr)
-    { return __ptr; }
-
-  /** Safe iterators know if they are singular. */
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    __check_dereferenceable(const _Safe_iterator<_Iterator, _Sequence>& __x)
-    { return __x._M_dereferenceable(); }
-
-  /** If the distance between two random access iterators is
-   *  nonnegative, assume the range is valid.
-  */
-  template<typename _RandomAccessIterator>
-    inline bool
-    __valid_range_aux2(const _RandomAccessIterator& __first,
-		       const _RandomAccessIterator& __last,
-		       std::random_access_iterator_tag)
-    { return __last - __first >= 0; }
-
-  /** Can't test for a valid range with input iterators, because
-   *  iteration may be destructive. So we just assume that the range
-   *  is valid.
-  */
-  template<typename _InputIterator>
-    inline bool
-    __valid_range_aux2(const _InputIterator&, const _InputIterator&,
-		       std::input_iterator_tag)
-    { return true; }
-
-  /** We say that integral types for a valid range, and defer to other
-   *  routines to realize what to do with integral types instead of
-   *  iterators.
-  */
-  template<typename _Integral>
-    inline bool
-    __valid_range_aux(const _Integral&, const _Integral&, __true_type)
-    { return true; }
-
-  /** We have iterators, so figure out what kind of iterators that are
-   *  to see if we can check the range ahead of time.
-  */
-  template<typename _InputIterator>
-    inline bool
-    __valid_range_aux(const _InputIterator& __first,
-		      const _InputIterator& __last, __false_type)
-  {
-    typedef typename std::iterator_traits<_InputIterator>::iterator_category
-      _Category;
-    return __gnu_debug::__valid_range_aux2(__first, __last, _Category());
-  }
-
-  /** Don't know what these iterators are, or if they are even
-   *  iterators (we may get an integral type for InputIterator), so
-   *  see if they are integral and pass them on to the next phase
-   *  otherwise.
-  */
-  template<typename _InputIterator>
-    inline bool
-    __valid_range(const _InputIterator& __first, const _InputIterator& __last)
-    {
-      typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-      return __gnu_debug::__valid_range_aux(__first, __last, _Integral());
-    }
-
-  /** Safe iterators know how to check if they form a valid range. */
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    __valid_range(const _Safe_iterator<_Iterator, _Sequence>& __first,
-		  const _Safe_iterator<_Iterator, _Sequence>& __last)
-    { return __first._M_valid_range(__last); }
-
-  /* Checks that [first, last) is a valid range, and then returns
-   * __first. This routine is useful when we can't use a separate
-   * assertion statement because, e.g., we are in a constructor.
-  */
-  template<typename _InputIterator>
-    inline _InputIterator
-    __check_valid_range(const _InputIterator& __first,
-			const _InputIterator& __last)
-    {
-      _GLIBCXX_DEBUG_ASSERT(__gnu_debug::__valid_range(__first, __last));
-      return __first;
-    }
-
-  /** Checks that __s is non-NULL or __n == 0, and then returns __s. */
-  template<typename _CharT, typename _Integer>
-    inline const _CharT*
-    __check_string(const _CharT* __s, const _Integer& __n)
-    {
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-      _GLIBCXX_DEBUG_ASSERT(__s != 0 || __n == 0);
-#endif
-      return __s;
-    }
-
-  /** Checks that __s is non-NULL and then returns __s. */
-  template<typename _CharT>
-    inline const _CharT*
-    __check_string(const _CharT* __s)
-    {
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-      _GLIBCXX_DEBUG_ASSERT(__s != 0);
-#endif
-      return __s;
-    }
-
-  // Can't check if an input iterator sequence is sorted, because we
-  // can't step through the sequence.
-  template<typename _InputIterator>
-    inline bool
-    __check_sorted_aux(const _InputIterator&, const _InputIterator&,
-                       std::input_iterator_tag)
-    { return true; }
-
-  // Can verify if a forward iterator sequence is in fact sorted using
-  // std::__is_sorted
-  template<typename _ForwardIterator>
-    inline bool
-    __check_sorted_aux(_ForwardIterator __first, _ForwardIterator __last,
-                       std::forward_iterator_tag)
-    {
-      if (__first == __last)
-        return true;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next) {
-        if (*__next < *__first)
-          return false;
-      }
-
-      return true;
-    }
-
-  // Can't check if an input iterator sequence is sorted, because we can't step
-  // through the sequence.
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    __check_sorted_aux(const _InputIterator&, const _InputIterator&,
-                       _Predicate, std::input_iterator_tag)
-    { return true; }
-
-  // Can verify if a forward iterator sequence is in fact sorted using
-  // std::__is_sorted
-  template<typename _ForwardIterator, typename _Predicate>
-    inline bool
-    __check_sorted_aux(_ForwardIterator __first, _ForwardIterator __last,
-                       _Predicate __pred, std::forward_iterator_tag)
-    {
-      if (__first == __last)
-        return true;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next) {
-        if (__pred(*__next, *__first))
-          return false;
-      }
-
-      return true;
-    }
-
-  // Determine if a sequence is sorted.
-  template<typename _InputIterator>
-    inline bool
-    __check_sorted(const _InputIterator& __first, const _InputIterator& __last)
-    {
-      typedef typename std::iterator_traits<_InputIterator>::iterator_category
-        _Category;
-      return __gnu_debug::__check_sorted_aux(__first, __last, _Category());
-    }
-
-  template<typename _InputIterator, typename _Predicate>
-    inline bool
-    __check_sorted(const _InputIterator& __first, const _InputIterator& __last,
-                   _Predicate __pred)
-    {
-      typedef typename std::iterator_traits<_InputIterator>::iterator_category
-        _Category;
-      return __gnu_debug::__check_sorted_aux(__first, __last, __pred,
-					     _Category());
-    }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // 270. Binary search requirements overly strict
-  // Determine if a sequence is partitioned w.r.t. this element.
-  template<typename _ForwardIterator, typename _Tp>
-    inline bool
-    __check_partitioned(_ForwardIterator __first, _ForwardIterator __last,
-			const _Tp& __value)
-    {
-      while (__first != __last && *__first < __value)
-	++__first;
-      while (__first != __last && !(*__first < __value))
-	++__first;
-      return __first == __last;
-    }
-
-  // Determine if a sequence is partitioned w.r.t. this element.
-  template<typename _ForwardIterator, typename _Tp, typename _Pred>
-    inline bool
-    __check_partitioned(_ForwardIterator __first, _ForwardIterator __last,
-			const _Tp& __value, _Pred __pred)
-    {
-      while (__first != __last && __pred(*__first, __value))
-	++__first;
-      while (__first != __last && !__pred(*__first, __value))
-	++__first;
-      return __first == __last;
-    }
-} // namespace __gnu_debug
-
-#ifdef _GLIBCXX_DEBUG
-// We need the error formatter
-#  include <debug/formatter.h>
-#endif
-
-#endif
diff --git a/include.new/c++/3.4/debug/deque b/include.new/c++/3.4/debug/deque
deleted file mode 100644
index c39a49c..0000000
--- a/include.new/c++/3.4/debug/deque
+++ /dev/null
@@ -1,386 +0,0 @@
-// Debugging deque implementation -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_DEQUE
-#define _GLIBCXX_DEBUG_DEQUE 1
-
-#include <deque>
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug_def
-{
-  template<typename _Tp, typename _Allocator = std::allocator<_Tp> >
-    class deque
-    : public _GLIBCXX_STD::deque<_Tp, _Allocator>,
-      public __gnu_debug::_Safe_sequence<deque<_Tp, _Allocator> >
-    {
-      typedef  _GLIBCXX_STD::deque<_Tp, _Allocator> _Base;
-      typedef __gnu_debug::_Safe_sequence<deque> _Safe_base;
-
-    public:
-      typedef typename _Allocator::reference        reference;
-      typedef typename _Allocator::const_reference  const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator,deque>
-						    iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,deque>
-						     const_iterator;
-
-      typedef typename _Base::size_type             size_type;
-      typedef typename _Base::difference_type       difference_type;
-
-      typedef _Tp				    value_type;
-      typedef _Allocator			    allocator_type;
-      typedef typename _Allocator::pointer          pointer;
-      typedef typename _Allocator::const_pointer    const_pointer;
-      typedef std::reverse_iterator<iterator>       reverse_iterator;
-      typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-      // 23.2.1.1 construct/copy/destroy:
-      explicit deque(const _Allocator& __a = _Allocator())
-      : _Base(__a) { }
-
-      explicit deque(size_type __n, const _Tp& __value = _Tp(),
-		     const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-
-      template<class _InputIterator>
-        deque(_InputIterator __first, _InputIterator __last,
-	      const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__check_valid_range(__first, __last), __last, __a)
-        { }
-
-      deque(const deque<_Tp,_Allocator>& __x) : _Base(__x), _Safe_base() { }
-
-      deque(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-      ~deque() { }
-
-      deque<_Tp,_Allocator>&
-      operator=(const deque<_Tp,_Allocator>& __x)
-      {
-	*static_cast<_Base*>(this) = __x;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      template<class _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::assign(__first, __last);
-	  this->_M_invalidate_all();
-	}
-
-      void
-      assign(size_type __n, const _Tp& __t)
-      {
-	_Base::assign(__n, __t);
-	this->_M_invalidate_all();
-      }
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin()
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end()
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend()
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      // 23.2.1.2 capacity:
-      using _Base::size;
-      using _Base::max_size;
-
-      void
-      resize(size_type __sz, _Tp __c = _Tp())
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	typedef __gnu_debug::_After_nth_from<_Base_const_iterator> _After_nth;
-
-	bool __invalidate_all = __sz > this->size();
-	if (__sz < this->size())
-	  this->_M_invalidate_if(_After_nth(__sz, _M_base().begin()));
-
-	_Base::resize(__sz, __c);
-
-	if (__invalidate_all)
-	  this->_M_invalidate_all();
-      }
-
-      using _Base::empty;
-
-      // element access:
-      reference
-      operator[](size_type __n)
-      {
-	__glibcxx_check_subscript(__n);
-	return _M_base()[__n];
-      }
-
-      const_reference
-      operator[](size_type __n) const
-      {
-	__glibcxx_check_subscript(__n);
-	return _M_base()[__n];
-      }
-
-      using _Base::at;
-
-      reference
-      front()
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      const_reference
-      front() const
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      reference
-      back()
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      const_reference
-      back() const
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      // 23.2.1.3 modifiers:
-      void
-      push_front(const _Tp& __x)
-      {
-	_Base::push_front(__x);
-	this->_M_invalidate_all();
-      }
-
-      void
-      push_back(const _Tp& __x)
-      {
-	_Base::push_back(__x);
-	this->_M_invalidate_all();
-      }
-
-      iterator
-      insert(iterator __position, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	typename _Base::iterator __res = _Base::insert(__position.base(), __x);
-	this->_M_invalidate_all();
-	return iterator(__res, this);
-      }
-
-      void
-      insert(iterator __position, size_type __n, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	_Base::insert(__position.base(), __n, __x);
-	this->_M_invalidate_all();
-      }
-
-      template<class _InputIterator>
-        void
-        insert(iterator __position,
-	       _InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_insert_range(__position, __first, __last);
-	  _Base::insert(__position.base(), __first, __last);
-	  this->_M_invalidate_all();
-	}
-
-      void
-      pop_front()
-      {
-	__glibcxx_check_nonempty();
-	iterator __victim = begin();
-	__victim._M_invalidate();
-	_Base::pop_front();
-      }
-
-      void
-      pop_back()
-      {
-	__glibcxx_check_nonempty();
-	iterator __victim = end();
-	--__victim;
-	__victim._M_invalidate();
-	_Base::pop_back();
-      }
-
-      iterator
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	if (__position == begin() || __position == end()-1)
-	  {
-	    __position._M_invalidate();
-	    return iterator(_Base::erase(__position.base()), this);
-	  }
-	else
-	  {
-	    typename _Base::iterator __res = _Base::erase(__position.base());
-	    this->_M_invalidate_all();
-	    return iterator(__res, this);
-	  }
-      }
-
-      iterator
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-        if (__first == begin() || __last == end())
-	  {
-	    this->_M_detach_singular();
-	    for (iterator __position = __first; __position != __last; )
-	      {
-		iterator __victim = __position++;
-		__victim._M_invalidate();
-	      }
-	    try
-	      {
-		return iterator(_Base::erase(__first.base(), __last.base()),
-				this);
-	      }
-	    catch (...)
-	      {
-		this->_M_revalidate_singular();
-		__throw_exception_again;
-	      }
-	  }
-	else
-	  {
-	    typename _Base::iterator __res = _Base::erase(__first.base(),
-							  __last.base());
-	    this->_M_invalidate_all();
-	    return iterator(__res, this);
-	  }
-      }
-
-      void
-      swap(deque<_Tp,_Allocator>& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear()
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      _Base&
-      _M_base()       { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const deque<_Tp, _Alloc>& __lhs, const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const deque<_Tp, _Alloc>& __lhs,
-	       const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const deque<_Tp, _Alloc>& __lhs, const deque<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(deque<_Tp, _Alloc>& __lhs, deque<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/formatter.h b/include.new/c++/3.4/debug/formatter.h
deleted file mode 100644
index db555b0..0000000
--- a/include.new/c++/3.4/debug/formatter.h
+++ /dev/null
@@ -1,391 +0,0 @@
-// Debug-mode error formatting implementation -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_FORMATTER_H
-#define _GLIBCXX_DEBUG_FORMATTER_H 1
-
-#include <typeinfo>
-#include <debug/debug.h>
-
-namespace __gnu_debug
-{
-  using std::type_info;
-
-  /** Determine if the two types are the same. */
-  template<typename _Type1, typename _Type2>
-    struct __is_same
-    {
-      static const bool value = false;
-    };
-
-  template<typename _Type>
-    struct __is_same<_Type, _Type>
-    {
-      static const bool value = true;
-    };
-
-  template<bool> struct __truth { };
-
-  class _Safe_sequence_base;
-
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_iterator;
-
-  template<typename _Sequence>
-    class _Safe_sequence;
-
-  enum _Debug_msg_id
-  {
-    // General checks
-    __msg_valid_range,
-    __msg_insert_singular,
-    __msg_insert_different,
-    __msg_erase_bad,
-    __msg_erase_different,
-    __msg_subscript_oob,
-    __msg_empty,
-    __msg_unpartitioned,
-    __msg_unpartitioned_pred,
-    __msg_unsorted,
-    __msg_unsorted_pred,
-    __msg_not_heap,
-    __msg_not_heap_pred,
-    // std::bitset checks
-    __msg_bad_bitset_write,
-    __msg_bad_bitset_read,
-    __msg_bad_bitset_flip,
-    // std::list checks
-    __msg_self_splice,
-    __msg_splice_alloc,
-    __msg_splice_bad,
-    __msg_splice_other,
-    __msg_splice_overlap,
-    // iterator checks
-    __msg_init_singular,
-    __msg_init_copy_singular,
-    __msg_init_const_singular,
-    __msg_copy_singular,
-    __msg_bad_deref,
-    __msg_bad_inc,
-    __msg_bad_dec,
-    __msg_iter_subscript_oob,
-    __msg_advance_oob,
-    __msg_retreat_oob,
-    __msg_iter_compare_bad,
-    __msg_compare_different,
-    __msg_iter_order_bad,
-    __msg_order_different,
-    __msg_distance_bad,
-    __msg_distance_different,
-    // istream_iterator
-    __msg_deref_istream,
-    __msg_inc_istream,
-    // ostream_iterator
-    __msg_output_ostream,
-    // istreambuf_iterator
-    __msg_deref_istreambuf,
-    __msg_inc_istreambuf
-  };
-
-  class _Error_formatter
-  {
-    /// Whether an iterator is constant, mutable, or unknown
-    enum _Constness
-    {
-      __unknown_constness,
-      __const_iterator,
-      __mutable_iterator,
-      __last_constness
-    };
-
-    // The state of the iterator (fine-grained), if we know it.
-    enum _Iterator_state
-    {
-      __unknown_state,
-      __singular,      // singular, may still be attached to a sequence
-      __begin,         // dereferenceable, and at the beginning
-      __middle,        // dereferenceable, not at the beginning
-      __end,           // past-the-end, may be at beginning if sequence empty
-      __last_state
-    };
-
-    // Tags denoting the type of parameter for construction
-    struct _Is_iterator { };
-    struct _Is_sequence { };
-
-    // A parameter that may be referenced by an error message
-    struct _Parameter
-    {
-      enum
-      {
-	__unused_param,
-	__iterator,
-	__sequence,
-	__integer,
-	__string
-      } _M_kind;
-
-      union
-      {
-	// When _M_kind == __iterator
-	struct
-	{
-	  const char*      _M_name;
-	  const void*      _M_address;
-	  const type_info* _M_type;
-	  _Constness       _M_constness;
-	  _Iterator_state  _M_state;
-	  const void*      _M_sequence;
-	  const type_info* _M_seq_type;
-	} _M_iterator;
-
-	// When _M_kind == __sequence
-	struct
-	{
-	  const char*      _M_name;
-	  const void*      _M_address;
-	  const type_info* _M_type;
-	} _M_sequence;
-
-	// When _M_kind == __integer
-	struct
-	{
-	  const char* _M_name;
-	  long        _M_value;
-	} _M_integer;
-
-	// When _M_kind == __string
-	struct
-	{
-	  const char* _M_name;
-	  const char* _M_value;
-	} _M_string;
-      } _M_variant;
-
-      _Parameter() : _M_kind(__unused_param), _M_variant() { }
-
-      _Parameter(long __value, const char* __name) 
-      : _M_kind(__integer), _M_variant()
-      {
-	_M_variant._M_integer._M_name = __name;
-	_M_variant._M_integer._M_value = __value;
-      }
-
-      _Parameter(const char* __value, const char* __name) 
-      : _M_kind(__string), _M_variant()
-      {
-	_M_variant._M_string._M_name = __name;
-	_M_variant._M_string._M_value = __value;
-      }
-
-      template<typename _Iterator, typename _Sequence>
-        _Parameter(const _Safe_iterator<_Iterator, _Sequence>& __it,
-		   const char* __name, _Is_iterator)
-	: _M_kind(__iterator),  _M_variant()
-        {
-	  _M_variant._M_iterator._M_name = __name;
-	  _M_variant._M_iterator._M_address = &__it;
-	  _M_variant._M_iterator._M_type = &typeid(__it);
-	  _M_variant._M_iterator._M_constness =
-	    __is_same<_Safe_iterator<_Iterator, _Sequence>,
-	                         typename _Sequence::iterator>::
-	      value? __mutable_iterator : __const_iterator;
-	  _M_variant._M_iterator._M_sequence = __it._M_get_sequence();
-	  _M_variant._M_iterator._M_seq_type = &typeid(_Sequence);
-
-	  if (__it._M_singular())
-	    _M_variant._M_iterator._M_state = __singular;
-	  else
-	    {
-	      bool __is_begin = __it._M_is_begin();
-	      bool __is_end = __it._M_is_end();
-	      if (__is_end)
-		_M_variant._M_iterator._M_state = __end;
-	      else if (__is_begin)
-		_M_variant._M_iterator._M_state = __begin;
-	      else
-		_M_variant._M_iterator._M_state = __middle;
-	    }
-	}
-
-      template<typename _Type>
-        _Parameter(const _Type*& __it, const char* __name, _Is_iterator)
-        : _M_kind(__iterator), _M_variant()
-        {
-	  _M_variant._M_iterator._M_name = __name;
-	  _M_variant._M_iterator._M_address = &__it;
-	  _M_variant._M_iterator._M_type = &typeid(__it);
-	  _M_variant._M_iterator._M_constness = __mutable_iterator;
-	  _M_variant._M_iterator._M_state = __it? __unknown_state : __singular;
-	  _M_variant._M_iterator._M_sequence = 0;
-	  _M_variant._M_iterator._M_seq_type = 0;
-	}
-
-      template<typename _Type>
-        _Parameter(_Type*& __it, const char* __name, _Is_iterator)
-        : _M_kind(__iterator), _M_variant()
-        {
-	  _M_variant._M_iterator._M_name = __name;
-	  _M_variant._M_iterator._M_address = &__it;
-	  _M_variant._M_iterator._M_type = &typeid(__it);
-	  _M_variant._M_iterator._M_constness = __const_iterator;
-	  _M_variant._M_iterator._M_state = __it? __unknown_state : __singular;
-	  _M_variant._M_iterator._M_sequence = 0;
-	  _M_variant._M_iterator._M_seq_type = 0;
-	}
-
-      template<typename _Iterator>
-        _Parameter(const _Iterator& __it, const char* __name, _Is_iterator)
-        : _M_kind(__iterator), _M_variant()
-        {
-	  _M_variant._M_iterator._M_name = __name;
-	  _M_variant._M_iterator._M_address = &__it;
-	  _M_variant._M_iterator._M_type = &typeid(__it);
-	  _M_variant._M_iterator._M_constness = __unknown_constness;
-	  _M_variant._M_iterator._M_state =
-	    __gnu_debug::__check_singular(__it)? __singular : __unknown_state;
-	  _M_variant._M_iterator._M_sequence = 0;
-	  _M_variant._M_iterator._M_seq_type = 0;
-	}
-
-      template<typename _Sequence>
-        _Parameter(const _Safe_sequence<_Sequence>& __seq,
-		   const char* __name, _Is_sequence)
-        : _M_kind(__sequence), _M_variant()
-        {
-	  _M_variant._M_sequence._M_name = __name;
-	  _M_variant._M_sequence._M_address =
-	    static_cast<const _Sequence*>(&__seq);
-	  _M_variant._M_sequence._M_type = &typeid(_Sequence);
-	}
-
-      template<typename _Sequence>
-        _Parameter(const _Sequence& __seq, const char* __name, _Is_sequence)
-        : _M_kind(__sequence), _M_variant()
-        {
-	  _M_variant._M_sequence._M_name = __name;
-	  _M_variant._M_sequence._M_address = &__seq;
-	  _M_variant._M_sequence._M_type = &typeid(_Sequence);
-	}
-
-      void
-      _M_print_field(const _Error_formatter* __formatter,
-		     const char* __name) const;
-
-      void
-      _M_print_description(const _Error_formatter* __formatter) const;
-    };
-
-    friend struct _Parameter;
-
-  public:
-    template<typename _Iterator>
-      const _Error_formatter&
-      _M_iterator(const _Iterator& __it, const char* __name = 0)  const
-      {
-	if (_M_num_parameters < __max_parameters)
-	  _M_parameters[_M_num_parameters++] = _Parameter(__it, __name,
-							  _Is_iterator());
-	return *this;
-      }
-
-    const _Error_formatter&
-    _M_integer(long __value, const char* __name = 0) const
-    {
-      if (_M_num_parameters < __max_parameters)
-	_M_parameters[_M_num_parameters++] = _Parameter(__value, __name);
-      return *this;
-    }
-
-    const _Error_formatter&
-    _M_string(const char* __value, const char* __name = 0) const
-    {
-      if (_M_num_parameters < __max_parameters)
-	_M_parameters[_M_num_parameters++] = _Parameter(__value, __name);
-      return *this;
-    }
-
-    template<typename _Sequence>
-      const _Error_formatter&
-      _M_sequence(const _Sequence& __seq, const char* __name = 0) const
-      {
-	if (_M_num_parameters < __max_parameters)
-	  _M_parameters[_M_num_parameters++] = _Parameter(__seq, __name,
-							  _Is_sequence());
-	return *this;
-      }
-
-    const _Error_formatter&
-    _M_message(const char* __text) const
-    { _M_text = __text; return *this; }
-
-    const _Error_formatter&
-    _M_message(_Debug_msg_id __id) const;
-
-    void
-    _M_error() const;
-
-  private:
-    _Error_formatter(const char* __file, size_t __line)
-    : _M_file(__file), _M_line(__line), _M_num_parameters(0), _M_text(0),
-      _M_max_length(78), _M_column(1), _M_first_line(true), _M_wordwrap(false)
-    { }
-
-    template<typename _Tp>
-      void
-      _M_format_word(char*, int, const char*, _Tp) const;
-
-    void
-    _M_print_word(const char* __word) const;
-
-    void
-    _M_print_string(const char* __string) const;
-
-    enum { __max_parameters = 9 };
-
-    const char*         _M_file;
-    size_t              _M_line;
-    mutable _Parameter  _M_parameters[__max_parameters];
-    mutable size_t      _M_num_parameters;
-    mutable const char* _M_text;
-    mutable size_t      _M_max_length;
-    enum { _M_indent = 4 } ;
-    mutable size_t      _M_column;
-    mutable bool        _M_first_line;
-    mutable bool        _M_wordwrap;
-
-  public:
-    static _Error_formatter
-    _M_at(const char* __file, size_t __line)
-    { return _Error_formatter(__file, __line); }
-  };
-} // namespace __gnu_debug
-
-#endif
diff --git a/include.new/c++/3.4/debug/hash_map b/include.new/c++/3.4/debug/hash_map
deleted file mode 100644
index 570a9af..0000000
--- a/include.new/c++/3.4/debug/hash_map
+++ /dev/null
@@ -1,38 +0,0 @@
-// Debugging hash_map/hash_multimap implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_HASH_MAP
-#define _GLIBCXX_DEBUG_HASH_MAP 1
-
-#include <hash_map>
-#include <debug/dbg_hash_map.h>
-#include <debug/dbg_hash_multimap.h>
-
-#endif
diff --git a/include.new/c++/3.4/debug/hash_map.h b/include.new/c++/3.4/debug/hash_map.h
deleted file mode 100644
index c2cd7b8..0000000
--- a/include.new/c++/3.4/debug/hash_map.h
+++ /dev/null
@@ -1,270 +0,0 @@
-// Debugging hash_map implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_HASH_MAP_H
-#define _GLIBCXX_DEBUG_HASH_MAP_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug_def
-{
-  template<typename _Value, typename _Tp,
-	   typename _HashFcn  = __gnu_cxx::hash<_Value>,
-	   typename _EqualKey = std::equal_to<_Value>,
-	   typename _Alloc = std::allocator<_Value> >
-    class hash_map
-    : public __gnu_cxx::hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>,
-      public __gnu_debug::_Safe_sequence<hash_map<_Value, _Tp, _HashFcn,
-						 _EqualKey, _Alloc> >
-    {
-      typedef __gnu_cxx::hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>
-      							_Base;
-      typedef __gnu_debug::_Safe_sequence<hash_map> 	_Safe_base;
-
-    public:
-      typedef typename _Base::key_type        key_type;
-      typedef typename _Base::data_type       data_type;
-      typedef typename _Base::mapped_type     mapped_type;
-      typedef typename _Base::value_type      value_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::difference_type difference_type;
-      typedef typename _Base::pointer         pointer;
-      typedef typename _Base::const_pointer   const_pointer;
-      typedef typename _Base::reference       reference;
-      typedef typename _Base::const_reference const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator, hash_map>
-					      iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
-					  hash_map>
-					      const_iterator;
-
-      typedef typename _Base::allocator_type  allocator_type;
-
-      using _Base::hash_funct;
-      using _Base::key_eq;
-      using _Base::get_allocator;
-
-      hash_map() { }
-
-      explicit hash_map(size_type __n) : _Base(__n) { }
-
-      hash_map(size_type __n, const hasher& __hf) : _Base(__n, __hf) { }
-
-      hash_map(size_type __n, const hasher& __hf, const key_equal& __eql,
-	       const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a) { }
-
-      template<typename _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l)
-        : _Base(__gnu_debug::__check_valid_range(__f, __l), __l) { }
-
-      template<typename _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n) { }
-
-      template<typename _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf)
-        : _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf) { }
-
-      template<typename _InputIterator>
-        hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf, const key_equal& __eql,
-		 const allocator_type& __a = allocator_type())
-	: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf,
-		__eql, __a) { }
-
-      hash_map(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-      using _Base::size;
-      using _Base::max_size;
-      using _Base::empty;
-
-      void
-      swap(hash_map& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      iterator
-      begin() { return iterator(_Base::begin(), this); }
-
-      iterator
-      end() { return iterator(_Base::end(),   this); }
-
-      const_iterator
-      begin() const
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_Base::end(),   this); }
-
-      std::pair<iterator, bool>
-      insert(const value_type& __obj)
-      {
-	std::pair<typename _Base::iterator, bool> __res = _Base::insert(__obj);
-	return std::make_pair(iterator(__res.first, this), __res.second);
-      }
-
-      template <typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__first.base(), __last.base());
-	}
-
-
-      std::pair<iterator, bool>
-      insert_noresize(const value_type& __obj)
-      {
-	std::pair<typename _Base::iterator, bool> __res =
-	                                        _Base::insert_noresize(__obj);
-	return std::make_pair(iterator(__res.first, this), __res.second);
-      }
-
-      iterator
-      find(const key_type& __key)
-      { return iterator(_Base::find(__key), this); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return const_iterator(_Base::find(__key), this); }
-
-      using _Base::operator[];
-      using _Base::count;
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      {
-	typedef typename _Base::iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	                  _Base::equal_range(__key);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      {
-	typedef typename _Base::const_iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	_Base::equal_range(__key);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      size_type
-      erase(const key_type& __key)
-      {
-	iterator __victim(_Base::find(__key), this);
-	if (__victim != end())
-	  return this->erase(__victim), 1;
-	else
-	  return 0;
-      }
-
-      void
-      erase(iterator __it)
-      {
-	__glibcxx_check_erase(__it);
-	__it._M_invalidate();
-	_Base::erase(__it.base());
-      }
-
-      void
-      erase(iterator __first, iterator __last)
-      {
-	__glibcxx_check_erase_range(__first, __last);
-	for (iterator __tmp = __first; __tmp != __last;)
-	{
-	  iterator __victim = __tmp++;
-	  __victim._M_invalidate();
-	}
-	_Base::erase(__first.base(), __last.base());
-      }
-
-      void
-      clear()
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      using _Base::resize;
-      using _Base::bucket_count;
-      using _Base::max_bucket_count;
-      using _Base::elems_in_bucket;
-
-      _Base&
-      _M_base()       { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-
-    private:
-      void
-      _M_invalidate_all()
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-	this->_M_invalidate_if(_Not_equal(_M_base().end()));
-      }
-    };
-
-  template<typename _Value, typename _Tp, typename _HashFcn,
-	   typename _EqualKey, typename _Alloc>
-    inline bool
-    operator==(const hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __x,
-	       const hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __y)
-    { return __x._M_base() == __y._M_base(); }
-
-  template<typename _Value, typename _Tp, typename _HashFcn,
-	   typename _EqualKey, typename _Alloc>
-    inline bool
-    operator!=(const hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __x,
-	       const hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __y)
-    { return __x._M_base() != __y._M_base(); }
-
-  template<typename _Value, typename _Tp, typename _HashFcn,
-	   typename _EqualKey, typename _Alloc>
-    inline void
-    swap(hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __x,
-	 hash_map<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __y)
-    { __x.swap(__y); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/hash_multimap.h b/include.new/c++/3.4/debug/hash_multimap.h
deleted file mode 100644
index 83b4425..0000000
--- a/include.new/c++/3.4/debug/hash_multimap.h
+++ /dev/null
@@ -1,261 +0,0 @@
-// Debugging hash_multimap implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_HASH_MULTIMAP_H
-#define _GLIBCXX_DEBUG_HASH_MULTIMAP_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug_def
-{
-  template<typename _Value, typename _Tp,
-	   typename _HashFcn  = __gnu_cxx::hash<_Value>,
-	   typename _EqualKey = std::equal_to<_Value>,
-	   typename _Alloc =  std::allocator<_Value> >
-    class hash_multimap
-    : public __gnu_cxx::hash_multimap<_Value,_Tp,_HashFcn, _EqualKey,_Alloc>,
-      public __gnu_debug::_Safe_sequence<hash_multimap<_Value, _Tp, _HashFcn,
-						       _EqualKey, _Alloc> >
-    {
-      typedef __gnu_cxx::hash_multimap<_Value,_Tp,_HashFcn, _EqualKey,_Alloc>
-							_Base;
-      typedef __gnu_debug::_Safe_sequence<hash_multimap> _Safe_base;
-
-  public:
-      typedef typename _Base::key_type			key_type;
-      typedef typename _Base::data_type			data_type;
-      typedef typename _Base::mapped_type		mapped_type;
-      typedef typename _Base::value_type		value_type;
-      typedef typename _Base::hasher			hasher;
-      typedef typename _Base::key_equal			key_equal;
-      typedef typename _Base::size_type			size_type;
-      typedef typename _Base::difference_type		difference_type;
-      typedef typename _Base::pointer			pointer;
-      typedef typename _Base::const_pointer		const_pointer;
-      typedef typename _Base::reference			reference;
-      typedef typename _Base::const_reference		const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator,
-					  hash_multimap> iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
-					  hash_multimap> const_iterator;
-
-      typedef typename _Base::allocator_type              allocator_type;
-
-      using _Base::hash_funct;
-      using _Base::key_eq;
-      using _Base::get_allocator;
-
-      hash_multimap() { }
-
-      explicit hash_multimap(size_type __n) : _Base(__n) { }
-
-      hash_multimap(size_type __n, const hasher& __hf) : _Base(__n, __hf) { }
-
-      hash_multimap(size_type __n, const hasher& __hf, const key_equal& __eql,
-		    const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a) { }
-
-      template<typename _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l)
-	: _Base(__gnu_debug::__check_valid_range(__f, __l), __l) { }
-
-      template<typename _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n)
-        : _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n) { }
-
-      template<typename _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf)
-	: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf) { }
-
-      template<typename _InputIterator>
-        hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
-		      const hasher& __hf, const key_equal& __eql,
-		      const allocator_type& __a = allocator_type())
-	: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf,
-		__eql, __a) { }
-
-      using _Base::size;
-      using _Base::max_size;
-      using _Base::empty;
-
-      void
-      swap(hash_multimap& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      iterator
-      begin() { return iterator(_Base::begin(), this); }
-
-      iterator
-      end()   { return iterator(_Base::end(),   this); }
-
-      const_iterator
-      begin() const
-      { return const_iterator(_Base::begin(), this); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_Base::end(),   this); }
-
-      iterator
-      insert(const value_type& __obj)
-      { return iterator(_Base::insert(__obj), this); }
-
-      template <typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__first.base(), __last.base());
-	}
-
-      iterator
-      insert_noresize(const value_type& __obj)
-      { return iterator(_Base::insert_noresize(__obj), this); }
-
-      iterator
-      find(const key_type& __key)
-      { return iterator(_Base::find(__key), this); }
-
-      const_iterator
-      find(const key_type& __key) const
-      { return const_iterator(_Base::find(__key), this); }
-
-      using _Base::count;
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __key)
-      {
-	typedef typename _Base::iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	                                             _Base::equal_range(__key);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator, const_iterator>
-      equal_range(const key_type& __key) const
-      {
-	typedef typename _Base::const_iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-        _Base::equal_range(__key);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      size_type
-      erase(const key_type& __key)
-      {
-	std::pair<iterator, iterator> __victims = this->equal_range(__key);
-	size_t __num_victims = 0;
-	while (__victims.first != __victims.second)
-	{
-	  this->erase(__victims.first++);
-	  ++__num_victims;
-	}
-	return __num_victims;
-      }
-
-      void
-      erase(iterator __it)
-      {
-	__glibcxx_check_erase(__it);
-	__it._M_invalidate();
-	_Base::erase(__it.base());
-      }
-
-      void
-      erase(iterator __first, iterator __last)
-      {
-	__glibcxx_check_erase_range(__first, __last);
-	for (iterator __tmp = __first; __tmp != __last;)
-	{
-	  iterator __victim = __tmp++;
-	  __victim._M_invalidate();
-	}
-	_Base::erase(__first.base(), __last.base());
-      }
-
-      void
-      clear()
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      using _Base::resize;
-      using _Base::bucket_count;
-      using _Base::max_bucket_count;
-      using _Base::elems_in_bucket;
-
-      _Base&
-      _M_base()       { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-
-    private:
-      void
-      _M_invalidate_all()
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-	this->_M_invalidate_if(_Not_equal(_M_base().end()));
-      }
-    };
-
-  template<typename _Value, typename _Tp, typename _HashFcn,
-	   typename _EqualKey, typename _Alloc>
-    inline bool
-    operator==(const hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>& __x,
-	       const hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>& __y)
-    { return __x._M_base() == __y._M_base(); }
-
-  template<typename _Value, typename _Tp, typename _HashFcn,
-	   typename _EqualKey, typename _Alloc>
-    inline bool
-    operator!=(const hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>& __x,
-	       const hash_multimap<_Value,_Tp,_HashFcn,_EqualKey,_Alloc>& __y)
-    { return __x._M_base() != __y._M_base(); }
-
-  template<typename _Value, typename _Tp, typename _HashFcn,
-	   typename _EqualKey, typename _Alloc>
-    inline void
-    swap(hash_multimap<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __x,
-	 hash_multimap<_Value, _Tp, _HashFcn, _EqualKey, _Alloc>& __y)
-    { __x.swap(__y); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/hash_multiset.h b/include.new/c++/3.4/debug/hash_multiset.h
deleted file mode 100644
index 705d8da..0000000
--- a/include.new/c++/3.4/debug/hash_multiset.h
+++ /dev/null
@@ -1,236 +0,0 @@
-// Debugging hash_multiset implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_HASH_MULTISET_H
-#define _GLIBCXX_DEBUG_HASH_MULTISET_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug_def
-{
-  template<typename _Value,
-	   typename _HashFcn  = __gnu_cxx::hash<_Value>,
-	   typename _EqualKey = std::equal_to<_Value>,
-	   typename _Alloc =  std::allocator<_Value> >
-    class hash_multiset
-    : public __gnu_cxx::hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>,
-      public __gnu_debug::_Safe_sequence<hash_multiset<_Value, _HashFcn,
-						       _EqualKey, _Alloc> >
-    {
-      typedef __gnu_cxx:: hash_multiset<_Value,_HashFcn, _EqualKey,_Alloc>
-							_Base;
-      typedef __gnu_debug::_Safe_sequence<hash_multiset> _Safe_base;
-
-  public:
-    typedef typename _Base::key_type			key_type;
-    typedef typename _Base::value_type			value_type;
-    typedef typename _Base::hasher			hasher;
-    typedef typename _Base::key_equal			key_equal;
-    typedef typename _Base::size_type			size_type;
-    typedef typename _Base::difference_type		difference_type;
-    typedef typename _Base::pointer			pointer;
-    typedef typename _Base::const_pointer		const_pointer;
-    typedef typename _Base::reference			reference;
-    typedef typename _Base::const_reference		const_reference;
-
-    typedef __gnu_debug::_Safe_iterator<typename _Base::iterator,
-					 hash_multiset> iterator;
-    typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
-					 hash_multiset> const_iterator;
-
-    typedef typename _Base::allocator_type              allocator_type;
-
-    using _Base::hash_funct;
-    using _Base::key_eq;
-    using _Base::get_allocator;
-
-    hash_multiset() { }
-
-    explicit hash_multiset(size_type __n) : _Base(__n) { }
-
-    hash_multiset(size_type __n, const hasher& __hf) : _Base(__n, __hf) { }
-
-    hash_multiset(size_type __n, const hasher& __hf, const key_equal& __eql,
-		  const allocator_type& __a = allocator_type())
-    : _Base(__n, __hf, __eql, __a)
-    { }
-
-    template<typename _InputIterator>
-      hash_multiset(_InputIterator __f, _InputIterator __l)
-      : _Base(__gnu_debug::__check_valid_range(__f, __l), __l)
-      { }
-
-    template<typename _InputIterator>
-      hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n)
-      : _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n)
-      { }
-
-    template<typename _InputIterator>
-      hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
-		    const hasher& __hf)
-      : _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf)
-      { }
-
-    template<typename _InputIterator>
-      hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
-		    const hasher& __hf, const key_equal& __eql,
-		    const allocator_type& __a = allocator_type())
-      : _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf,
-	      __eql, __a)
-      { }
-
-    hash_multiset(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-    using _Base::size;
-    using _Base::max_size;
-    using _Base::empty;
-
-    void
-    swap(hash_multiset& __x)
-    {
-      _Base::swap(__x);
-      this->_M_swap(__x);
-    }
-
-    iterator begin() const { return iterator(_Base::begin(), this); }
-    iterator end() const   { return iterator(_Base::end(),   this); }
-
-    iterator
-    insert(const value_type& __obj)
-    { return iterator(_Base::insert(__obj), this); }
-
-    template <typename _InputIterator>
-      void
-      insert(_InputIterator __first, _InputIterator __last)
-      {
-	__glibcxx_check_valid_range(__first, __last);
-	_Base::insert(__first.base(), __last.base());
-      }
-
-
-    iterator
-    insert_noresize(const value_type& __obj)
-    { return iterator(_Base::insert_noresize(__obj), this); }
-
-    iterator
-    find(const key_type& __key) const
-    { return iterator(_Base::find(__key), this); }
-
-    using _Base::count;
-
-    std::pair<iterator, iterator>
-    equal_range(const key_type& __key) const
-    {
-      typedef typename _Base::iterator _Base_iterator;
-      std::pair<_Base_iterator, _Base_iterator> __res =
-	_Base::equal_range(__key);
-      return std::make_pair(iterator(__res.first, this),
-			    iterator(__res.second, this));
-    }
-
-    size_type
-    erase(const key_type& __key)
-    {
-      size_type __count = 0;
-      std::pair<iterator, iterator> __victims = this->equal_range(__key);
-      while (__victims.first != __victims.second)
-	{
-	  this->erase(__victims++);
-	  ++__count;
-	}
-      return __count;
-    }
-
-    void
-    erase(iterator __it)
-    {
-      __glibcxx_check_erase(__it);
-      __it._M_invalidate();
-      _Base::erase(__it.base());
-    }
-
-    void
-    erase(iterator __first, iterator __last)
-    {
-      __glibcxx_check_erase_range(__first, __last);
-      for (iterator __tmp = __first; __tmp != __last;)
-	{
-	  iterator __victim = __tmp++;
-	  __victim._M_invalidate();
-	}
-      _Base::erase(__first.base(), __last.base());
-    }
-
-    void
-    clear()
-    {
-      _Base::clear();
-      this->_M_invalidate_all();
-    }
-
-    using _Base::resize;
-    using _Base::bucket_count;
-    using _Base::max_bucket_count;
-    using _Base::elems_in_bucket;
-
-    _Base&       _M_base()       { return *this; }
-    const _Base& _M_base() const { return *this; }
-
-  private:
-    void
-    _M_invalidate_all()
-    {
-      typedef typename _Base::const_iterator _Base_const_iterator;
-      typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-      this->_M_invalidate_if(_Not_equal(_M_base().end()));
-    }
-  };
-
-template<typename _Value, typename _HashFcn, typename _EqualKey, typename _Alloc>
-  inline bool
-  operator==(const hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>& __x,
-	     const hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>& __y)
-  { return __x._M_base() == __y._M_base(); }
-
-template<typename _Value, typename _HashFcn, typename _EqualKey, typename _Alloc>
-  inline bool
-  operator!=(const hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>& __x,
-	     const hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>& __y)
-  { return __x._M_base() != __y._M_base(); }
-
-template<typename _Value, typename _HashFcn, typename _EqualKey, typename _Alloc>
-  inline void
-  swap(hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>& __x,
-       hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc>& __y)
-  { __x.swap(__y); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/hash_set b/include.new/c++/3.4/debug/hash_set
deleted file mode 100644
index 282cba2..0000000
--- a/include.new/c++/3.4/debug/hash_set
+++ /dev/null
@@ -1,38 +0,0 @@
-// Debugging hash_set/hash_multiset implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_HASH_SET
-#define _GLIBCXX_DEBUG_HASH_SET 1
-
-#include <hash_set>
-#include <debug/dbg_hash_set.h>
-#include <debug/dbg_hash_multiset.h>
-
-#endif
diff --git a/include.new/c++/3.4/debug/hash_set.h b/include.new/c++/3.4/debug/hash_set.h
deleted file mode 100644
index 0f56d88..0000000
--- a/include.new/c++/3.4/debug/hash_set.h
+++ /dev/null
@@ -1,245 +0,0 @@
-// Debugging hash_set implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_HASH_SET_H
-#define _GLIBCXX_DEBUG_HASH_SET_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug_def
-{
-  template<typename _Value,
-	   typename _HashFcn  = __gnu_cxx::hash<_Value>,
-	   typename _EqualKey = std::equal_to<_Value>,
-	   typename _Alloc =  std::allocator<_Value> >
-    class hash_set
-    : public __gnu_cxx::hash_set<_Value, _HashFcn, _EqualKey, _Alloc>,
-      public __gnu_debug::_Safe_sequence<hash_set<_Value, _HashFcn, _EqualKey,
-						  _Alloc> >
-    {
-      typedef __gnu_cxx::hash_set<_Value, _HashFcn, _EqualKey, _Alloc> _Base;
-      typedef __gnu_debug::_Safe_sequence<hash_set> _Safe_base;
-
-    public:
-      typedef typename _Base::key_type        key_type;
-      typedef typename _Base::value_type      value_type;
-      typedef typename _Base::hasher          hasher;
-      typedef typename _Base::key_equal       key_equal;
-      typedef typename _Base::size_type       size_type;
-      typedef typename _Base::difference_type difference_type;
-      typedef typename _Base::pointer         pointer;
-      typedef typename _Base::const_pointer   const_pointer;
-      typedef typename _Base::reference       reference;
-      typedef typename _Base::const_reference const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator, hash_set>
-                                              iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
-					  hash_set>
-                                              const_iterator;
-
-      typedef typename _Base::allocator_type allocator_type;
-
-      using _Base::hash_funct;
-      using _Base::key_eq;
-      using _Base::get_allocator;
-
-      hash_set() { }
-
-      explicit hash_set(size_type __n) : _Base(__n) { }
-
-      hash_set(size_type __n, const hasher& __hf) : _Base(__n, __hf) { }
-
-      hash_set(size_type __n, const hasher& __hf, const key_equal& __eql,
-	       const allocator_type& __a = allocator_type())
-      : _Base(__n, __hf, __eql, __a) { }
-
-      template<typename _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l)
-        : _Base(__gnu_debug::__check_valid_range(__f, __l), __l) { }
-
-      template<typename _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l, size_type __n)
-	: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n) { }
-
-      template<typename _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf)
-	: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf) { }
-
-      template<typename _InputIterator>
-        hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
-		 const hasher& __hf, const key_equal& __eql,
-		 const allocator_type& __a = allocator_type())
-	: _Base(__gnu_debug::__check_valid_range(__f, __l), __l, __n, __hf,
-		__eql, __a) { }
-
-      hash_set(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-      using _Base::size;
-      using _Base::max_size;
-      using _Base::empty;
-
-      void
-      swap(hash_set& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      iterator
-      begin() const { return iterator(_Base::begin(), this); }
-
-      iterator
-      end() const   { return iterator(_Base::end(),   this); }
-
-      std::pair<iterator, bool>
-      insert(const value_type& __obj)
-      {
-	std::pair<typename _Base::iterator, bool> __res =
-        _Base::insert(__obj);
-	return std::make_pair(iterator(__res.first, this), __res.second);
-      }
-
-      template <typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__first.base(), __last.base());
-	}
-
-
-      std::pair<iterator, bool>
-      insert_noresize(const value_type& __obj)
-      {
-	std::pair<typename _Base::iterator, bool> __res =
-        _Base::insert_noresize(__obj);
-	return std::make_pair(iterator(__res.first, this), __res.second);
-      }
-
-      iterator
-      find(const key_type& __key) const
-      { return iterator(_Base::find(__key), this); }
-
-      using _Base::count;
-
-      std::pair<iterator, iterator>
-      equal_range(const key_type& __key) const
-      {
-	typedef typename _Base::iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	  _Base::equal_range(__key);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      size_type
-      erase(const key_type& __key)
-      {
-	iterator __victim(_Base::find(__key), this);
-	if (__victim != end())
-	  return this->erase(__victim), 1;
-	else
-	  return 0;
-      }
-
-      void
-      erase(iterator __it)
-      {
-	__glibcxx_check_erase(__it);
-	__it._M_invalidate();
-	_Base::erase(__it.base());
-      }
-
-      void
-      erase(iterator __first, iterator __last)
-      {
-	__glibcxx_check_erase_range(__first, __last);
-	for (iterator __tmp = __first; __tmp != __last;)
-	{
-	  iterator __victim = __tmp++;
-	  __victim._M_invalidate();
-	}
-	_Base::erase(__first.base(), __last.base());
-      }
-
-      void
-      clear()
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      using _Base::resize;
-      using _Base::bucket_count;
-      using _Base::max_bucket_count;
-      using _Base::elems_in_bucket;
-
-      _Base&
-      _M_base()       { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-
-    private:
-      void
-      _M_invalidate_all()
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-	this->_M_invalidate_if(_Not_equal(_M_base().end()));
-      }
-    };
-
-  template<typename _Value, typename _HashFcn, typename _EqualKey,
-	   typename _Alloc>
-    inline bool
-    operator==(const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __x,
-	       const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __y)
-    { return __x._M_base() == __y._M_base(); }
-
-  template<typename _Value, typename _HashFcn, typename _EqualKey,
-	   typename _Alloc>
-    inline bool
-    operator!=(const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __x,
-	       const hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __y)
-    { return __x._M_base() != __y._M_base(); }
-
-  template<typename _Value, typename _HashFcn, typename _EqualKey,
-	   typename _Alloc>
-    inline void
-    swap(hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __x,
-	 hash_set<_Value, _HashFcn, _EqualKey, _Alloc>& __y)
-    { __x.swap(__y); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/list b/include.new/c++/3.4/debug/list
deleted file mode 100644
index 556c9d9..0000000
--- a/include.new/c++/3.4/debug/list
+++ /dev/null
@@ -1,505 +0,0 @@
-// Debugging list implementation -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_LIST
-#define _GLIBCXX_DEBUG_LIST 1
-
-#include <list>
-#include <bits/stl_algo.h>
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug_def
-{
-  template<typename _Tp, typename _Allocator = std::allocator<_Tp> >
-    class list
-    : public _GLIBCXX_STD::list<_Tp, _Allocator>,
-      public __gnu_debug::_Safe_sequence<list<_Tp, _Allocator> >
-    {
-      typedef _GLIBCXX_STD::list<_Tp, _Allocator> _Base;
-      typedef __gnu_debug::_Safe_sequence<list>  _Safe_base;
-
-    public:
-      typedef typename _Allocator::reference        reference;
-      typedef typename _Allocator::const_reference  const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator, list>
-						    iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator, list>
-						    const_iterator;
-
-      typedef typename _Base::size_type             size_type;
-      typedef typename _Base::difference_type       difference_type;
-
-      typedef _Tp				    value_type;
-      typedef _Allocator			    allocator_type;
-      typedef typename _Allocator::pointer          pointer;
-      typedef typename _Allocator::const_pointer    const_pointer;
-      typedef std::reverse_iterator<iterator>       reverse_iterator;
-      typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-      // 23.2.2.1 construct/copy/destroy:
-      explicit list(const _Allocator& __a = _Allocator())
-      : _Base(__a) { }
-
-      explicit list(size_type __n, const _Tp& __value = _Tp(),
-		    const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a) { }
-
-      template<class _InputIterator>
-      list(_InputIterator __first, _InputIterator __last,
-	   const _Allocator& __a = _Allocator())
-      : _Base(__gnu_debug::__check_valid_range(__first, __last), __last, __a)
-      { }
-
-
-      list(const list& __x) : _Base(__x), _Safe_base() { }
-
-      list(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-      ~list() { }
-
-      list&
-      operator=(const list& __x)
-      {
-	static_cast<_Base&>(*this) = __x;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      template<class _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::assign(__first, __last);
-	  this->_M_invalidate_all();
-	}
-
-      void
-      assign(size_type __n, const _Tp& __t)
-      {
-	_Base::assign(__n, __t);
-	this->_M_invalidate_all();
-      }
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin()
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end()
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend()
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      // 23.2.2.2 capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-      void
-      resize(size_type __sz, _Tp __c = _Tp())
-      {
-	this->_M_detach_singular();
-
-	// if __sz < size(), invalidate all iterators in [begin+__sz, end())
-	iterator __victim = begin();
-	iterator __end = end();
-	for (size_type __i = __sz; __victim != __end && __i > 0; --__i)
-	  ++__victim;
-
-	while (__victim != __end)
-	  {
-	    iterator __real_victim = __victim++;
-	    __real_victim._M_invalidate();
-	  }
-
-	try
-	  {
-	    _Base::resize(__sz, __c);
-	  }
-	catch(...)
-	  {
-	    this->_M_revalidate_singular();
-	    __throw_exception_again;
-	  }
-      }
-
-      // element access:
-      reference
-      front()
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      const_reference
-      front() const
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      reference
-      back()
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      const_reference
-      back() const
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      // 23.2.2.3 modifiers:
-      using _Base::push_front;
-
-      void
-      pop_front()
-      {
-	__glibcxx_check_nonempty();
-	iterator __victim = begin();
-	__victim._M_invalidate();
-	_Base::pop_front();
-      }
-
-      using _Base::push_back;
-
-      void
-      pop_back()
-      {
-	__glibcxx_check_nonempty();
-	iterator __victim = end();
-	--__victim;
-	__victim._M_invalidate();
-	_Base::pop_back();
-      }
-
-      iterator
-      insert(iterator __position, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
-
-      void
-      insert(iterator __position, size_type __n, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	_Base::insert(__position.base(), __n, __x);
-      }
-
-      template<class _InputIterator>
-        void
-        insert(iterator __position, _InputIterator __first,
-	       _InputIterator __last)
-        {
-	  __glibcxx_check_insert_range(__position, __first, __last);
-	  _Base::insert(__position.base(), __first, __last);
-	}
-
-      iterator
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	__position._M_invalidate();
-	return iterator(_Base::erase(__position.base()), this);
-      }
-
-      iterator
-      erase(iterator __position, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__position, __last);
-	for (iterator __victim = __position; __victim != __last; )
-	  {
-	    iterator __old = __victim;
-	    ++__victim;
-	    __old._M_invalidate();
-	  }
-	return iterator(_Base::erase(__position.base(), __last.base()), this);
-      }
-
-      void
-      swap(list& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear()
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-      }
-
-      // 23.2.2.4 list operations:
-      void
-      splice(iterator __position, list& __x)
-      {
-	_GLIBCXX_DEBUG_VERIFY(&__x != this,
-			      _M_message(::__gnu_debug::__msg_self_splice)
-			      ._M_sequence(*this, "this"));
-	this->splice(__position, __x, __x.begin(), __x.end());
-      }
-
-      void
-      splice(iterator __position, list& __x, iterator __i)
-      {
-	__glibcxx_check_insert(__position);
-	_GLIBCXX_DEBUG_VERIFY(__x.get_allocator() == this->get_allocator(),
-			      _M_message(::__gnu_debug::__msg_splice_alloc)
-			    ._M_sequence(*this)._M_sequence(__x, "__x"));
-	_GLIBCXX_DEBUG_VERIFY(__i._M_dereferenceable(),
-			      _M_message(::__gnu_debug::__msg_splice_bad)
-			      ._M_iterator(__i, "__i"));
-	_GLIBCXX_DEBUG_VERIFY(__i._M_attached_to(&__x),
-			      _M_message(::__gnu_debug::__msg_splice_other)
-			     ._M_iterator(__i, "__i")._M_sequence(__x, "__x"));
-
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 250. splicing invalidates iterators
-	this->_M_transfer_iter(__i);
-	_Base::splice(__position.base(), __x._M_base(), __i.base());
-      }
-
-      void
-      splice(iterator __position, list& __x, iterator __first, iterator __last)
-      {
-	__glibcxx_check_insert(__position);
-	__glibcxx_check_valid_range(__first, __last);
-	_GLIBCXX_DEBUG_VERIFY(__first._M_attached_to(&__x),
-			      _M_message(::__gnu_debug::__msg_splice_other)
-			      ._M_sequence(__x, "x")
-			      ._M_iterator(__first, "first"));
-	_GLIBCXX_DEBUG_VERIFY(__x.get_allocator() == this->get_allocator(),
-			      _M_message(::__gnu_debug::__msg_splice_alloc)
-			      ._M_sequence(*this)._M_sequence(__x));
-
-	for (iterator __tmp = __first; __tmp != __last; )
-	  {
-	    _GLIBCXX_DEBUG_VERIFY(&__x != this || __tmp != __position,
-				_M_message(::__gnu_debug::__msg_splice_overlap)
-				  ._M_iterator(__tmp, "position")
-				  ._M_iterator(__first, "first")
-				  ._M_iterator(__last, "last"));
-	    iterator __victim = __tmp++;
-	    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-	    // 250. splicing invalidates iterators
-	    this->_M_transfer_iter(__victim);
-	  }
-
-	_Base::splice(__position.base(), __x._M_base(), __first.base(),
-		      __last.base());
-      }
-
-      void
-      remove(const _Tp& __value)
-      {
-	for (iterator __x = begin(); __x.base() != _Base::end(); )
-	  {
-	    if (*__x == __value)
-	      __x = erase(__x);
-	    else
-	      ++__x;
-	  }
-      }
-
-      template<class _Predicate>
-        void
-        remove_if(_Predicate __pred)
-        {
-	  for (iterator __x = begin(); __x.base() != _Base::end(); )
-	    {
-	      if (__pred(*__x))
-		__x = erase(__x);
-	      else
-		++__x;
-	    }
-	}
-
-      void
-      unique()
-      {
-	iterator __first = begin();
-	iterator __last = end();
-	if (__first == __last)
-	  return;
-	iterator __next = __first;
-	while (++__next != __last)
-	  {
-	    if (*__first == *__next)
-	      erase(__next);
-	    else
-	      __first = __next;
-	    __next = __first;
-	  }
-      }
-
-      template<class _BinaryPredicate>
-        void
-        unique(_BinaryPredicate __binary_pred)
-        {
-	  iterator __first = begin();
-	  iterator __last = end();
-	  if (__first == __last)
-	    return;
-	  iterator __next = __first;
-	  while (++__next != __last)
-	    {
-	      if (__binary_pred(*__first, *__next))
-		erase(__next);
-	      else
-		__first = __next;
-	      __next = __first;
-	    }
-	}
-
-      void
-      merge(list& __x)
-      {
-	__glibcxx_check_sorted(_Base::begin(), _Base::end());
-	__glibcxx_check_sorted(__x.begin().base(), __x.end().base());
-	for (iterator __tmp = __x.begin(); __tmp != __x.end(); )
-	  {
-	    iterator __victim = __tmp++;
-	    __victim._M_attach(&__x);
-	  }
-	_Base::merge(__x._M_base());
-      }
-
-      template<class _Compare>
-        void
-        merge(list& __x, _Compare __comp)
-        {
-	  __glibcxx_check_sorted_pred(_Base::begin(), _Base::end(), __comp);
-	  __glibcxx_check_sorted_pred(__x.begin().base(), __x.end().base(),
-				      __comp);
-	  for (iterator __tmp = __x.begin(); __tmp != __x.end(); )
-	    {
-	      iterator __victim = __tmp++;
-	      __victim._M_attach(&__x);
-	    }
-	  _Base::merge(__x._M_base(), __comp);
-	}
-
-      void
-      sort() { _Base::sort(); }
-
-      template<typename _StrictWeakOrdering>
-        void
-        sort(_StrictWeakOrdering __pred) { _Base::sort(__pred); }
-
-      using _Base::reverse;
-
-      _Base&
-      _M_base()       { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-
-    private:
-      void
-      _M_invalidate_all()
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-	this->_M_invalidate_if(_Not_equal(_M_base().end()));
-      }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const list<_Tp, _Alloc>& __lhs, const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const list<_Tp, _Alloc>& __lhs, const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const list<_Tp, _Alloc>& __lhs, const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const list<_Tp, _Alloc>& __lhs, const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const list<_Tp, _Alloc>& __lhs, const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const list<_Tp, _Alloc>& __lhs, const list<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(list<_Tp, _Alloc>& __lhs, list<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/map b/include.new/c++/3.4/debug/map
deleted file mode 100644
index 2c38404..0000000
--- a/include.new/c++/3.4/debug/map
+++ /dev/null
@@ -1,38 +0,0 @@
-// Debugging map/multimap implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_MAP
-#define _GLIBCXX_DEBUG_MAP 1
-
-#include <map>
-#include <debug/map.h>
-#include <debug/multimap.h>
-
-#endif
diff --git a/include.new/c++/3.4/debug/map.h b/include.new/c++/3.4/debug/map.h
deleted file mode 100644
index 0171584..0000000
--- a/include.new/c++/3.4/debug/map.h
+++ /dev/null
@@ -1,323 +0,0 @@
-// Debugging map implementation -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_MAP_H
-#define _GLIBCXX_DEBUG_MAP_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-#include <utility>
-
-namespace __gnu_debug_def
-{
-  template<typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<std::pair<const _Key, _Tp> > >
-    class map
-    : public _GLIBCXX_STD::map<_Key, _Tp, _Compare, _Allocator>,
-      public __gnu_debug::_Safe_sequence<map<_Key, _Tp, _Compare, _Allocator> >
-    {
-      typedef _GLIBCXX_STD::map<_Key, _Tp, _Compare, _Allocator> _Base;
-      typedef __gnu_debug::_Safe_sequence<map> _Safe_base;
-
-    public:
-      // types:
-      typedef _Key                                  key_type;
-      typedef _Tp                                   mapped_type;
-      typedef std::pair<const _Key, _Tp>            value_type;
-      typedef _Compare                              key_compare;
-      typedef _Allocator                            allocator_type;
-      typedef typename _Allocator::reference        reference;
-      typedef typename _Allocator::const_reference  const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator, map>
-                                                    iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator, map>
-                                                    const_iterator;
-
-      typedef typename _Base::size_type             size_type;
-      typedef typename _Base::difference_type       difference_type;
-      typedef typename _Allocator::pointer          pointer;
-      typedef typename _Allocator::const_pointer    const_pointer;
-      typedef std::reverse_iterator<iterator>       reverse_iterator;
-      typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-      using _Base::value_compare;
-
-      // 23.3.1.1 construct/copy/destroy:
-      explicit map(const _Compare& __comp = _Compare(),
-		   const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-      template<typename _InputIterator>
-        map(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp = _Compare(),
-	    const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__check_valid_range(__first, __last), __last,
-		__comp, __a), _Safe_base() { }
-
-      map(const map<_Key,_Tp,_Compare,_Allocator>& __x)
-      : _Base(__x), _Safe_base() { }
-
-      map(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-      ~map() { }
-
-      map<_Key,_Tp,_Compare,_Allocator>&
-      operator=(const map<_Key,_Tp,_Compare,_Allocator>& __x)
-      {
-	*static_cast<_Base*>(this) = __x;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 133. map missing get_allocator()
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator 
-      begin()
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end()
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend()
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      // capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-      // 23.3.1.2 element access:
-      using _Base::operator[];
-
-      // modifiers:
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      {
-	typedef typename _Base::iterator _Base_iterator;
-	std::pair<_Base_iterator, bool> __res = _Base::insert(__x);
-	return std::pair<iterator, bool>(iterator(__res.first, this),
-					 __res.second);
-      }
-
-      iterator
-      insert(iterator __position, const value_type& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
-
-      template<typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__first, __last);
-	}
-
-      void
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	__position._M_invalidate();
-	_Base::erase(__position.base());
-      }
-
-      size_type
-      erase(const key_type& __x)
-      {
-	iterator __victim = find(__x);
-	if (__victim == end())
-	  return 0;
-	else
-	{
-	  __victim._M_invalidate();
-	  _Base::erase(__victim.base());
-	  return 1;
-	}
-      }
-
-      void
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	while (__first != __last)
-	  this->erase(__first++);
-      }
-
-      void
-      swap(map<_Key,_Tp,_Compare,_Allocator>& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear()
-      { this->erase(begin(), end()); }
-
-      // observers:
-      using _Base::key_comp;
-      using _Base::value_comp;
-
-      // 23.3.1.3 map operations:
-      iterator
-      find(const key_type& __x)
-      { return iterator(_Base::find(__x), this); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return const_iterator(_Base::find(__x), this); }
-
-      using _Base::count;
-
-      iterator
-      lower_bound(const key_type& __x)
-      { return iterator(_Base::lower_bound(__x), this); }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return const_iterator(_Base::lower_bound(__x), this); }
-
-      iterator
-      upper_bound(const key_type& __x)
-      { return iterator(_Base::upper_bound(__x), this); }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return const_iterator(_Base::upper_bound(__x), this); }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	typedef typename _Base::iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	_Base::equal_range(__x);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	std::pair<_Base_const_iterator, _Base_const_iterator> __res =
-	_Base::equal_range(__x);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      _Base& 
-      _M_base() { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-
-    private:
-      void
-      _M_invalidate_all()
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-	this->_M_invalidate_if(_Not_equal(_M_base().end()));
-      }
-    };
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator==(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	       const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator!=(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	       const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator<(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	      const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator<=(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	       const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator>=(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	       const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator>(const map<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	      const map<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline void
-    swap(map<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	 map<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { __lhs.swap(__rhs); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/multimap.h b/include.new/c++/3.4/debug/multimap.h
deleted file mode 100644
index 4de1e3b..0000000
--- a/include.new/c++/3.4/debug/multimap.h
+++ /dev/null
@@ -1,314 +0,0 @@
-// Debugging multimap implementation -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_MULTIMAP_H
-#define _GLIBCXX_DEBUG_MULTIMAP_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-#include <utility>
-
-namespace __gnu_debug_def
-{
-  template<typename _Key, typename _Tp, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<std::pair<const _Key, _Tp> > >
-    class multimap
-    : public _GLIBCXX_STD::multimap<_Key, _Tp, _Compare, _Allocator>,
-    public __gnu_debug::_Safe_sequence<multimap<_Key,_Tp,_Compare,_Allocator> >
-    {
-      typedef _GLIBCXX_STD::multimap<_Key, _Tp, _Compare, _Allocator> _Base;
-      typedef __gnu_debug::_Safe_sequence<multimap> _Safe_base;
-
-    public:
-      // types:
-      typedef _Key				     key_type;
-      typedef _Tp				     mapped_type;
-      typedef std::pair<const _Key, _Tp>             value_type;
-      typedef _Compare                               key_compare;
-      typedef _Allocator                             allocator_type;
-      typedef typename _Allocator::reference         reference;
-      typedef typename _Allocator::const_reference   const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator, multimap>
-                                                     iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
-                                           multimap> const_iterator;
-
-      typedef typename _Base::size_type              size_type;
-      typedef typename _Base::difference_type        difference_type;
-      typedef typename _Allocator::pointer           pointer;
-      typedef typename _Allocator::const_pointer     const_pointer;
-      typedef std::reverse_iterator<iterator>        reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>  const_reverse_iterator;
-
-      using _Base::value_compare;
-
-      // 23.3.1.1 construct/copy/destroy:
-      explicit multimap(const _Compare& __comp = _Compare(),
-			const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-      template<typename _InputIterator>
-      multimap(_InputIterator __first, _InputIterator __last,
-	       const _Compare& __comp = _Compare(),
-	       const _Allocator& __a = _Allocator())
-      : _Base(__gnu_debug::__check_valid_range(__first, __last), __last,
-	      __comp, __a) { }
-
-      multimap(const multimap<_Key,_Tp,_Compare,_Allocator>& __x)
-      : _Base(__x), _Safe_base() { }
-
-      multimap(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-      ~multimap() { }
-
-      multimap<_Key,_Tp,_Compare,_Allocator>&
-      operator=(const multimap<_Key,_Tp,_Compare,_Allocator>& __x)
-      {
-	*static_cast<_Base*>(this) = __x;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin()
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end()
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend()
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      // capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-      // modifiers:
-      iterator
-      insert(const value_type& __x)
-      { return iterator(_Base::insert(__x), this); }
-
-      iterator
-      insert(iterator __position, const value_type& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
-
-      template<typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__first, __last);
-	}
-
-      void
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	__position._M_invalidate();
-	_Base::erase(__position.base());
-      }
-
-      size_type
-      erase(const key_type& __x)
-      {
-	std::pair<iterator, iterator> __victims = this->equal_range(__x);
-	size_type __count = 0;
-	while (__victims.first != __victims.second)
-	{
-	  iterator __victim = __victims.first++;
-	  __victim._M_invalidate();
-	  _Base::erase(__victim.base());
-	  ++__count;
-	}
-	return __count;
-      }
-
-      void
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	while (__first != __last)
-	this->erase(__first++);
-      }
-
-      void
-      swap(multimap<_Key,_Tp,_Compare,_Allocator>& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear()
-      { this->erase(begin(), end()); }
-
-      // observers:
-      using _Base::key_comp;
-      using _Base::value_comp;
-
-      // 23.3.1.3 multimap operations:
-      iterator
-      find(const key_type& __x)
-      { return iterator(_Base::find(__x), this); }
-
-      const_iterator
-      find(const key_type& __x) const
-      { return const_iterator(_Base::find(__x), this); }
-
-      using _Base::count;
-
-      iterator
-      lower_bound(const key_type& __x)
-      { return iterator(_Base::lower_bound(__x), this); }
-
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return const_iterator(_Base::lower_bound(__x), this); }
-
-      iterator
-      upper_bound(const key_type& __x)
-      { return iterator(_Base::upper_bound(__x), this); }
-
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return const_iterator(_Base::upper_bound(__x), this); }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	typedef typename _Base::iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-	_Base::equal_range(__x);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	std::pair<_Base_const_iterator, _Base_const_iterator> __res =
-	_Base::equal_range(__x);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      _Base&
-      _M_base() { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-
-    private:
-      void
-      _M_invalidate_all()
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-	this->_M_invalidate_if(_Not_equal(_M_base().end()));
-      }
-    };
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator==(const multimap<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	       const multimap<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator!=(const multimap<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	       const multimap<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator<(const multimap<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	      const multimap<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator<=(const multimap<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	       const multimap<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator>=(const multimap<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	       const multimap<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline bool
-    operator>(const multimap<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	      const multimap<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Key,typename _Tp,typename _Compare,typename _Allocator>
-    inline void
-    swap(multimap<_Key,_Tp,_Compare,_Allocator>& __lhs,
-	 multimap<_Key,_Tp,_Compare,_Allocator>& __rhs)
-    { __lhs.swap(__rhs); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/multiset.h b/include.new/c++/3.4/debug/multiset.h
deleted file mode 100644
index 92042fe..0000000
--- a/include.new/c++/3.4/debug/multiset.h
+++ /dev/null
@@ -1,320 +0,0 @@
-// Debugging multiset implementation -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_MULTISET_H
-#define _GLIBCXX_DEBUG_MULTISET_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-#include <utility>
-
-namespace __gnu_debug_def
-{
-  template<typename _Key, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<_Key> >
-    class multiset
-    : public _GLIBCXX_STD::multiset<_Key, _Compare, _Allocator>,
-      public __gnu_debug::_Safe_sequence<multiset<_Key, _Compare, _Allocator> >
-    {
-      typedef _GLIBCXX_STD::multiset<_Key, _Compare, _Allocator> _Base;
-      typedef __gnu_debug::_Safe_sequence<multiset> _Safe_base;
-
-    public:
-      // types:
-      typedef _Key				     key_type;
-      typedef _Key				     value_type;
-      typedef _Compare				     key_compare;
-      typedef _Compare				     value_compare;
-      typedef _Allocator			     allocator_type;
-      typedef typename _Allocator::reference	     reference;
-      typedef typename _Allocator::const_reference   const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator, multiset>
-      iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
-					  multiset> const_iterator;
-
-      typedef typename _Base::size_type              size_type;
-      typedef typename _Base::difference_type        difference_type;
-      typedef typename _Allocator::pointer           pointer;
-      typedef typename _Allocator::const_pointer     const_pointer;
-      typedef std::reverse_iterator<iterator>        reverse_iterator;
-      typedef std::reverse_iterator<const_iterator>  const_reverse_iterator;
-
-      // 23.3.3.1 construct/copy/destroy:
-      explicit multiset(const _Compare& __comp = _Compare(),
-			const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-      template<typename _InputIterator>
-        multiset(_InputIterator __first, _InputIterator __last,
-		 const _Compare& __comp = _Compare(),
-		 const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__check_valid_range(__first, __last), __last,
-		__comp, __a) { }
-
-      multiset(const multiset<_Key,_Compare,_Allocator>& __x)
-      : _Base(__x), _Safe_base() { }
-
-      multiset(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-      ~multiset() { }
-
-      multiset<_Key,_Compare,_Allocator>&
-      operator=(const multiset<_Key,_Compare,_Allocator>& __x)
-      {
-	*static_cast<_Base*>(this) = __x;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin()
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end()
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend()
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      // capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-      // modifiers:
-      iterator
-      insert(const value_type& __x)
-      { return iterator(_Base::insert(__x), this); }
-
-      iterator
-      insert(iterator __position, const value_type& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
-
-      template<typename _InputIterator>
-      void
-      insert(_InputIterator __first, _InputIterator __last)
-      {
-	__glibcxx_check_valid_range(__first, __last);
-	_Base::insert(__first, __last);
-      }
-
-      void
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	__position._M_invalidate();
-	_Base::erase(__position.base());
-      }
-
-      size_type
-      erase(const key_type& __x)
-      {
-	std::pair<iterator, iterator> __victims = this->equal_range(__x);
-	size_type __count = 0;
-	while (__victims.first != __victims.second)
-	{
-	  iterator __victim = __victims.first++;
-	  __victim._M_invalidate();
-	  _Base::erase(__victim.base());
-	  ++__count;
-	}
-	return __count;
-      }
-
-      void
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-	while (__first != __last)
-	this->erase(__first++);
-      }
-
-      void
-      swap(multiset<_Key,_Compare,_Allocator>& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear()
-      { this->erase(begin(), end()); }
-
-      // observers:
-      using _Base::key_comp;
-      using _Base::value_comp;
-
-      // multiset operations:
-      iterator
-      find(const key_type& __x)
-      { return iterator(_Base::find(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      find(const key_type& __x) const
-      { return const_iterator(_Base::find(__x), this); }
-
-      using _Base::count;
-
-      iterator
-      lower_bound(const key_type& __x)
-      { return iterator(_Base::lower_bound(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return const_iterator(_Base::lower_bound(__x), this); }
-
-      iterator
-      upper_bound(const key_type& __x)
-      { return iterator(_Base::upper_bound(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return const_iterator(_Base::upper_bound(__x), this); }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	typedef typename _Base::iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-        _Base::equal_range(__x);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	typedef typename _Base::const_iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-        _Base::equal_range(__x);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      _Base&
-      _M_base() { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-
-    private:
-      void
-      _M_invalidate_all()
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-	this->_M_invalidate_if(_Not_equal(_M_base().end()));
-      }
-    };
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const multiset<_Key,_Compare,_Allocator>& __lhs,
-	       const multiset<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const multiset<_Key,_Compare,_Allocator>& __lhs,
-	       const multiset<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const multiset<_Key,_Compare,_Allocator>& __lhs,
-	      const multiset<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const multiset<_Key,_Compare,_Allocator>& __lhs,
-	       const multiset<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const multiset<_Key,_Compare,_Allocator>& __lhs,
-	       const multiset<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const multiset<_Key,_Compare,_Allocator>& __lhs,
-	      const multiset<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    void
-    swap(multiset<_Key,_Compare,_Allocator>& __x,
-	 multiset<_Key,_Compare,_Allocator>& __y)
-    { return __x.swap(__y); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/safe_base.h b/include.new/c++/3.4/debug/safe_base.h
deleted file mode 100644
index a1af33a..0000000
--- a/include.new/c++/3.4/debug/safe_base.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// Safe sequence/iterator base implementation  -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_SAFE_BASE_H
-#define _GLIBCXX_DEBUG_SAFE_BASE_H 1
-
-namespace __gnu_debug
-{
-  class _Safe_sequence_base;
-
-  /** \brief Basic functionality for a "safe" iterator.
-   *
-   *  The %_Safe_iterator_base base class implements the functionality
-   *  of a safe iterator that is not specific to a particular iterator
-   *  type. It contains a pointer back to the sequence it references
-   *  along with iterator version information and pointers to form a
-   *  doubly-linked list of iterators referenced by the container.
-   *
-   *  This class must not perform any operations that can throw an
-   *  exception, or the exception guarantees of derived iterators will
-   *  be broken.
-   */
-  class _Safe_iterator_base
-  {
-  public:
-    /** The sequence this iterator references; may be NULL to indicate
-	a singular iterator. */
-    _Safe_sequence_base* _M_sequence;
-
-    /** The version number of this iterator. The sentinel value 0 is
-     *  used to indicate an invalidated iterator (i.e., one that is
-     *  singular because of an operation on the container). This
-     *  version number must equal the version number in the sequence
-     *  referenced by _M_sequence for the iterator to be
-     *  non-singular.
-     */
-    unsigned int         _M_version;
-
-    /** Pointer to the previous iterator in the sequence's list of
-	iterators. Only valid when _M_sequence != NULL. */
-    _Safe_iterator_base* _M_prior;
-
-    /** Pointer to the next iterator in the sequence's list of
-	iterators. Only valid when _M_sequence != NULL. */
-    _Safe_iterator_base* _M_next;
-
-  protected:
-    /** Initializes the iterator and makes it singular. */
-    _Safe_iterator_base()
-    : _M_sequence(0), _M_version(0), _M_prior(0), _M_next(0)
-    { }
-
-    /** Initialize the iterator to reference the sequence pointed to
-     *  by @p__seq. @p __constant is true when we are initializing a
-     *  constant iterator, and false if it is a mutable iterator. Note
-     *  that @p __seq may be NULL, in which case the iterator will be
-     *  singular. Otherwise, the iterator will reference @p __seq and
-     *  be nonsingular.
-     */
-    _Safe_iterator_base(const _Safe_sequence_base* __seq, bool __constant)
-    : _M_sequence(0), _M_version(0), _M_prior(0), _M_next(0)
-    { this->_M_attach(const_cast<_Safe_sequence_base*>(__seq), __constant); }
-
-    /** Initializes the iterator to reference the same sequence that
-	@p __x does. @p __constant is true if this is a constant
-	iterator, and false if it is mutable. */
-    _Safe_iterator_base(const _Safe_iterator_base& __x, bool __constant)
-    : _M_sequence(0), _M_version(0), _M_prior(0), _M_next(0)
-    { this->_M_attach(__x._M_sequence, __constant); }
-
-    _Safe_iterator_base&
-    operator=(const _Safe_iterator_base&);
-
-    explicit
-    _Safe_iterator_base(const _Safe_iterator_base&);
-
-    ~_Safe_iterator_base() { this->_M_detach(); }
-
-  public:
-    /** Attaches this iterator to the given sequence, detaching it
-     *	from whatever sequence it was attached to originally. If the
-     *	new sequence is the NULL pointer, the iterator is left
-     *	unattached.
-     */
-    void _M_attach(_Safe_sequence_base* __seq, bool __constant);
-
-    /** Detach the iterator for whatever sequence it is attached to,
-     *	if any.
-    */
-    void _M_detach();
-
-    /** Determines if we are attached to the given sequence. */
-    bool _M_attached_to(const _Safe_sequence_base* __seq) const
-    { return _M_sequence == __seq; }
-
-    /** Is this iterator singular? */
-    bool _M_singular() const;
-
-    /** Can we compare this iterator to the given iterator @p __x?
-	Returns true if both iterators are nonsingular and reference
-	the same sequence. */
-    bool _M_can_compare(const _Safe_iterator_base& __x) const;
-  };
-
-  /**
-   * @brief Base class that supports tracking of iterators that
-   * reference a sequence.
-   *
-   * The %_Safe_sequence_base class provides basic support for
-   * tracking iterators into a sequence. Sequences that track
-   * iterators must derived from %_Safe_sequence_base publicly, so
-   * that safe iterators (which inherit _Safe_iterator_base) can
-   * attach to them. This class contains two linked lists of
-   * iterators, one for constant iterators and one for mutable
-   * iterators, and a version number that allows very fast
-   * invalidation of all iterators that reference the container.
-   *
-   * This class must ensure that no operation on it may throw an
-   * exception, otherwise "safe" sequences may fail to provide the
-   * exception-safety guarantees required by the C++ standard.
-   */
-  class _Safe_sequence_base
-  {
-  public:
-    /// The list of mutable iterators that reference this container
-    _Safe_iterator_base* _M_iterators;
-
-    /// The list of constant iterators that reference this container
-    _Safe_iterator_base* _M_const_iterators;
-
-    /// The container version number. This number may never be 0.
-    mutable unsigned int _M_version;
-
-  protected:
-    // Initialize with a version number of 1 and no iterators
-    _Safe_sequence_base()
-    : _M_iterators(0), _M_const_iterators(0), _M_version(1)
-    { }
-
-    /** Notify all iterators that reference this sequence that the
-	sequence is being destroyed. */
-    ~_Safe_sequence_base()
-    { this->_M_detach_all(); }
-
-    /** Detach all iterators, leaving them singular. */
-    void
-    _M_detach_all();
-
-    /** Detach all singular iterators.
-     *  @post for all iterators i attached to this sequence,
-     *   i->_M_version == _M_version.
-     */
-    void
-    _M_detach_singular();
-
-    /** Revalidates all attached singular iterators.  This method may
-     *  be used to validate iterators that were invalidated before
-     *  (but for some reasion, such as an exception, need to become
-     *  valid again).
-     */
-    void
-    _M_revalidate_singular();
-
-    /** Swap this sequence with the given sequence. This operation
-     *  also swaps ownership of the iterators, so that when the
-     *  operation is complete all iterators that originally referenced
-     *  one container now reference the other container.
-     */
-    void
-    _M_swap(_Safe_sequence_base& __x);
-
-  public:
-    /** Invalidates all iterators. */
-    void
-    _M_invalidate_all() const
-    { if (++_M_version == 0) _M_version = 1; }
-  };
-} // namespace __gnu_debug
-
-#endif
diff --git a/include.new/c++/3.4/debug/safe_iterator.h b/include.new/c++/3.4/debug/safe_iterator.h
deleted file mode 100644
index 8a4123a..0000000
--- a/include.new/c++/3.4/debug/safe_iterator.h
+++ /dev/null
@@ -1,618 +0,0 @@
-// Safe iterator implementation  -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_SAFE_ITERATOR_H
-#define _GLIBCXX_DEBUG_SAFE_ITERATOR_H 1
-
-#include <bits/stl_pair.h>
-#include <debug/debug.h>
-#include <debug/formatter.h>
-#include <debug/safe_base.h>
-#include <bits/cpp_type_traits.h>
-
-namespace __gnu_debug
-{
-  using std::iterator_traits;
-  using std::pair;
-
-  /** Iterators that derive from _Safe_iterator_base but that aren't
-   *  _Safe_iterators can be determined singular or non-singular via
-   *  _Safe_iterator_base.
-   */
-  inline bool __check_singular_aux(const _Safe_iterator_base* __x)
-  { return __x->_M_singular(); }
-
-  /** \brief Safe iterator wrapper.
-   *
-   *  The class template %_Safe_iterator is a wrapper around an
-   *  iterator that tracks the iterator's movement among sequences and
-   *  checks that operations performed on the "safe" iterator are
-   *  legal. In additional to the basic iterator operations (which are
-   *  validated, and then passed to the underlying iterator),
-   *  %_Safe_iterator has member functions for iterator invalidation,
-   *  attaching/detaching the iterator from sequences, and querying
-   *  the iterator's state.
-   */
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_iterator : public _Safe_iterator_base
-    {
-      typedef _Safe_iterator _Self;
-
-      /** The precision to which we can calculate the distance between
-       *  two iterators.
-       */
-      enum _Distance_precision
-	{
-	  __dp_equality, //< Can compare iterator equality, only
-	  __dp_sign,     //< Can determine equality and ordering
-	  __dp_exact     //< Can determine distance precisely
-	};
-
-      /// The underlying iterator
-      _Iterator _M_current;
-
-      /// Determine if this is a constant iterator.
-      bool
-      _M_constant() const
-      {
-	typedef typename _Sequence::const_iterator const_iterator;
-	return __is_same<const_iterator, _Safe_iterator>::value;
-      }
-
-      typedef iterator_traits<_Iterator> _Traits;
-
-    public:
-      typedef _Iterator                           _Base_iterator;
-      typedef typename _Traits::iterator_category iterator_category;
-      typedef typename _Traits::value_type        value_type;
-      typedef typename _Traits::difference_type   difference_type;
-      typedef typename _Traits::reference         reference;
-      typedef typename _Traits::pointer           pointer;
-
-      /// @post the iterator is singular and unattached
-      _Safe_iterator() : _M_current() { }
-
-      /**
-       * @brief Safe iterator construction from an unsafe iterator and
-       * its sequence.
-       *
-       * @pre @p seq is not NULL
-       * @post this is not singular
-       */
-      _Safe_iterator(const _Iterator& __i, const _Sequence* __seq)
-      : _Safe_iterator_base(__seq, _M_constant()), _M_current(__i)
-      {
-	_GLIBCXX_DEBUG_VERIFY(! this->_M_singular(),
-			      _M_message(__msg_init_singular)
-			      ._M_iterator(*this, "this"));
-      }
-
-      /**
-       * @brief Copy construction.
-       * @pre @p x is not singular
-       */
-      _Safe_iterator(const _Safe_iterator& __x)
-      : _Safe_iterator_base(__x, _M_constant()), _M_current(__x._M_current)
-      {
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular(),
-			      _M_message(__msg_init_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-      }
-
-      /**
-       *  @brief Converting constructor from a mutable iterator to a
-       *  constant iterator.
-       *
-       *  @pre @p x is not singular
-      */
-      template<typename _MutableIterator>
-        _Safe_iterator(
-          const _Safe_iterator<_MutableIterator,
-          typename std::__enable_if<
-                     _Sequence,
-                     (std::__are_same<_MutableIterator,
-                      typename _Sequence::iterator::_Base_iterator>::_M_type)
-                   >::_M_type>& __x)
-	: _Safe_iterator_base(__x, _M_constant()), _M_current(__x.base())
-        {
-	  _GLIBCXX_DEBUG_VERIFY(!__x._M_singular(),
-				_M_message(__msg_init_const_singular)
-				._M_iterator(*this, "this")
-				._M_iterator(__x, "other"));
-	}
-
-      /**
-       * @brief Copy assignment.
-       * @pre @p x is not singular
-       */
-      _Safe_iterator&
-      operator=(const _Safe_iterator& __x)
-      {
-	_GLIBCXX_DEBUG_VERIFY(!__x._M_singular(),
-			      _M_message(__msg_copy_singular)
-			      ._M_iterator(*this, "this")
-			      ._M_iterator(__x, "other"));
-	_M_current = __x._M_current;
-	this->_M_attach(static_cast<_Sequence*>(__x._M_sequence));
-	return *this;
-      }
-
-      /**
-       *  @brief Iterator dereference.
-       *  @pre iterator is dereferenceable
-       */
-      reference
-      operator*() const
-      {
-
-	_GLIBCXX_DEBUG_VERIFY(this->_M_dereferenceable(),
-			      _M_message(__msg_bad_deref)
-			      ._M_iterator(*this, "this"));
-	return *_M_current;
-      }
-
-      /**
-       *  @brief Iterator dereference.
-       *  @pre iterator is dereferenceable
-       *  @todo Make this correct w.r.t. iterators that return proxies
-       *  @todo Use addressof() instead of & operator
-       */
-      pointer
-      operator->() const
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_dereferenceable(),
-			      _M_message(__msg_bad_deref)
-			      ._M_iterator(*this, "this"));
-	return &*_M_current;
-      }
-
-      // ------ Input iterator requirements ------
-      /**
-       *  @brief Iterator preincrement
-       *  @pre iterator is incrementable
-       */
-      _Safe_iterator&
-      operator++()
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(),
-			      _M_message(__msg_bad_inc)
-			      ._M_iterator(*this, "this"));
-	++_M_current;
-	return *this;
-      }
-
-      /**
-       *  @brief Iterator postincrement
-       *  @pre iterator is incrementable
-       */
-      _Safe_iterator
-      operator++(int)
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_incrementable(),
-			      _M_message(__msg_bad_inc)
-			      ._M_iterator(*this, "this"));
-	_Safe_iterator __tmp(*this);
-	++_M_current;
-	return __tmp;
-      }
-
-      // ------ Bidirectional iterator requirements ------
-      /**
-       *  @brief Iterator predecrement
-       *  @pre iterator is decrementable
-       */
-      _Safe_iterator&
-      operator--()
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_decrementable(),
-			      _M_message(__msg_bad_dec)
-			      ._M_iterator(*this, "this"));
-	--_M_current;
-	return *this;
-      }
-
-      /**
-       *  @brief Iterator postdecrement
-       *  @pre iterator is decrementable
-       */
-      _Safe_iterator
-      operator--(int)
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_decrementable(),
-			      _M_message(__msg_bad_dec)
-			      ._M_iterator(*this, "this"));
-	_Safe_iterator __tmp(*this);
-	--_M_current;
-	return __tmp;
-      }
-
-      // ------ Random access iterator requirements ------
-      reference
-      operator[](const difference_type& __n) const
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_can_advance(__n)
-			      && this->_M_can_advance(__n+1),
-			      _M_message(__msg_iter_subscript_oob)
-			      ._M_iterator(*this)._M_integer(__n));
-
-	return _M_current[__n];
-      }
-
-      _Safe_iterator&
-      operator+=(const difference_type& __n)
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_can_advance(__n),
-			      _M_message(__msg_advance_oob)
-			      ._M_iterator(*this)._M_integer(__n));
-	_M_current += __n;
-	return *this;
-      }
-
-      _Safe_iterator
-      operator+(const difference_type& __n) const
-      {
-	_Safe_iterator __tmp(*this);
-	__tmp += __n;
-	return __tmp;
-      }
-
-      _Safe_iterator&
-      operator-=(const difference_type& __n)
-      {
-	_GLIBCXX_DEBUG_VERIFY(this->_M_can_advance(-__n),
-			      _M_message(__msg_retreat_oob)
-			      ._M_iterator(*this)._M_integer(__n));
-	_M_current += -__n;
-	return *this;
-      }
-
-      _Safe_iterator
-      operator-(const difference_type& __n) const
-      {
-	_Safe_iterator __tmp(*this);
-	__tmp -= __n;
-	return __tmp;
-      }
-
-      // ------ Utilities ------
-      /**
-       * @brief Return the underlying iterator
-       */
-      _Iterator
-      base() const { return _M_current; }
-
-      /**
-       * @brief Conversion to underlying non-debug iterator to allow
-       * better interaction with non-debug containers.
-       */
-      operator _Iterator() const { return _M_current; }
-
-      /** Attach iterator to the given sequence. */
-      void
-      _M_attach(const _Sequence* __seq)
-      {
-	_Safe_iterator_base::_M_attach(const_cast<_Sequence*>(__seq),
-				       _M_constant());
-      }
-
-      /** Invalidate the iterator, making it singular. */
-      void
-      _M_invalidate();
-
-      /// Is the iterator dereferenceable?
-      bool
-      _M_dereferenceable() const
-      { return !this->_M_singular() && !_M_is_end(); }
-
-      /// Is the iterator incrementable?
-      bool
-      _M_incrementable() const { return this->_M_dereferenceable(); }
-
-      // Is the iterator decrementable?
-      bool
-      _M_decrementable() const { return !_M_singular() && !_M_is_begin(); }
-
-      // Can we advance the iterator @p __n steps (@p __n may be negative)
-      bool
-      _M_can_advance(const difference_type& __n) const;
-
-      // Is the iterator range [*this, __rhs) valid?
-      template<typename _Other>
-        bool
-        _M_valid_range(const _Safe_iterator<_Other, _Sequence>& __rhs) const;
-
-      // The sequence this iterator references.
-      const _Sequence*
-      _M_get_sequence() const
-      { return static_cast<const _Sequence*>(_M_sequence); }
-
-    /** Determine the distance between two iterators with some known
-     *	precision.
-    */
-    template<typename _Iterator1, typename _Iterator2>
-      static pair<difference_type, _Distance_precision>
-      _M_get_distance(const _Iterator1& __lhs, const _Iterator2& __rhs)
-      {
-        typedef typename iterator_traits<_Iterator1>::iterator_category
-	  _Category;
-        return _M_get_distance(__lhs, __rhs, _Category());
-      }
-
-    template<typename _Iterator1, typename _Iterator2>
-      static pair<difference_type, _Distance_precision>
-      _M_get_distance(const _Iterator1& __lhs, const _Iterator2& __rhs,
-		      std::random_access_iterator_tag)
-      {
-        return std::make_pair(__rhs.base() - __lhs.base(), __dp_exact);
-      }
-
-    template<typename _Iterator1, typename _Iterator2>
-      static pair<difference_type, _Distance_precision>
-      _M_get_distance(const _Iterator1& __lhs, const _Iterator2& __rhs,
-		    std::forward_iterator_tag)
-      {
-        return std::make_pair(__lhs.base() == __rhs.base()? 0 : 1,
-			      __dp_equality);
-      }
-
-      /// Is this iterator equal to the sequence's begin() iterator?
-      bool _M_is_begin() const
-      {	return *this == static_cast<const _Sequence*>(_M_sequence)->begin(); }
-
-      /// Is this iterator equal to the sequence's end() iterator?
-      bool _M_is_end() const
-      {	return *this == static_cast<const _Sequence*>(_M_sequence)->end(); }
-    };
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator==(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() == __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator==(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-               const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() == __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator!=(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() != __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator!=(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-               const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_compare_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_compare_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() != __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator<(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	      const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() < __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator<(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-	      const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() < __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator<=(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() <= __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator<=(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-               const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() <= __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator>(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	      const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() > __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator>(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-	      const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() > __rhs.base();
-    }
-
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline bool
-    operator>=(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	       const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() >= __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline bool
-    operator>=(const _Safe_iterator<_Iterator, _Sequence>& __lhs,
-               const _Safe_iterator<_Iterator, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_iter_order_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_order_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() >= __rhs.base();
-    }
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // According to the resolution of DR179 not only the various comparison
-  // operators but also operator- must accept mixed iterator/const_iterator
-  // parameters.
-  template<typename _IteratorL, typename _IteratorR, typename _Sequence>
-    inline typename _Safe_iterator<_IteratorL, _Sequence>::difference_type
-    operator-(const _Safe_iterator<_IteratorL, _Sequence>& __lhs,
-	      const _Safe_iterator<_IteratorR, _Sequence>& __rhs)
-    {
-      _GLIBCXX_DEBUG_VERIFY(! __lhs._M_singular() && ! __rhs._M_singular(),
-			    _M_message(__msg_distance_bad)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      _GLIBCXX_DEBUG_VERIFY(__lhs._M_can_compare(__rhs),
-			    _M_message(__msg_distance_different)
-			    ._M_iterator(__lhs, "lhs")
-			    ._M_iterator(__rhs, "rhs"));
-      return __lhs.base() - __rhs.base();
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    inline _Safe_iterator<_Iterator, _Sequence>
-    operator+(typename _Safe_iterator<_Iterator,_Sequence>::difference_type __n,
-	      const _Safe_iterator<_Iterator, _Sequence>& __i)
-    { return __i + __n; }
-} // namespace __gnu_debug
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-#  include <debug/safe_iterator.tcc>
-#endif
-
-#endif
diff --git a/include.new/c++/3.4/debug/safe_iterator.tcc b/include.new/c++/3.4/debug/safe_iterator.tcc
deleted file mode 100644
index cede969..0000000
--- a/include.new/c++/3.4/debug/safe_iterator.tcc
+++ /dev/null
@@ -1,140 +0,0 @@
-// Debugging iterator implementation (out of line) -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file safe_iterator.tcc
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#ifndef _GLIBCXX_DEBUG_SAFE_ITERATOR_TCC
-#define _GLIBCXX_DEBUG_SAFE_ITERATOR_TCC 1
-
-namespace __gnu_debug
-{
-  template<typename _Iterator, typename _Sequence>
-    bool
-    _Safe_iterator<_Iterator, _Sequence>::
-    _M_can_advance(const difference_type& __n) const
-    {
-      typedef typename _Sequence::const_iterator const_iterator;
-
-      if (this->_M_singular())
-	return false;
-      if (__n == 0)
-	return true;
-      if (__n < 0)
-	{
-	  const_iterator __begin =
-	    static_cast<const _Sequence*>(_M_sequence)->begin();
-	  pair<difference_type, _Distance_precision> __dist =
-	    this->_M_get_distance(__begin, *this);
-	  bool __ok =  (__dist.second == __dp_exact && __dist.first >= -__n
-			|| __dist.second != __dp_exact && __dist.first > 0);
-	  return __ok;
-	}
-      else
-	{
-	  const_iterator __end =
-	    static_cast<const _Sequence*>(_M_sequence)->end();
-	  pair<difference_type, _Distance_precision> __dist =
-	    this->_M_get_distance(*this, __end);
-	  bool __ok = (__dist.second == __dp_exact && __dist.first >= __n
-		       || __dist.second != __dp_exact && __dist.first > 0);
-	  return __ok;
-	}
-    }
-
-  template<typename _Iterator, typename _Sequence>
-    template<typename _Other>
-      bool
-      _Safe_iterator<_Iterator, _Sequence>::
-      _M_valid_range(const _Safe_iterator<_Other, _Sequence>& __rhs) const
-      {
-	if (!_M_can_compare(__rhs))
-	  return false;
-
-	/* Determine if we can order the iterators without the help of
-	   the container */
-	pair<difference_type, _Distance_precision> __dist =
-	  this->_M_get_distance(*this, __rhs);
-	switch (__dist.second) {
-	case __dp_equality:
-	  if (__dist.first == 0)
-	    return true;
-	  break;
-
-	case __dp_sign:
-	case __dp_exact:
-	  return __dist.first >= 0;
-	}
-
-	/* We can only test for equality, but check if one of the
-	   iterators is at an extreme. */
-	if (_M_is_begin() || __rhs._M_is_end())
-	  return true;
-	else if (_M_is_end() || __rhs._M_is_begin())
-	  return false;
-
-	// Assume that this is a valid range; we can't check anything else
-	return true;
-      }
-
-  template<typename _Iterator, typename _Sequence>
-    void
-    _Safe_iterator<_Iterator, _Sequence>::
-    _M_invalidate()
-    {
-      typedef typename _Sequence::iterator iterator;
-      typedef typename _Sequence::const_iterator const_iterator;
-
-      if (!this->_M_singular())
-	{
-	  for (_Safe_iterator_base* iter = _M_sequence->_M_iterators; iter; )
-	    {
-	      iterator* __victim = static_cast<iterator*>(iter);
-	      iter = iter->_M_next;
-	      if (this->base() == __victim->base())
-		__victim->_M_version = 0;
-	    }
-	  for (_Safe_iterator_base* iter2 = _M_sequence->_M_const_iterators;
-	       iter2; /* increment in loop */)
-	    {
-	      const_iterator* __victim = static_cast<const_iterator*>(iter2);
-	      iter2 = iter2->_M_next;
-	      if (this->base() == __victim->base())
-		__victim->_M_version = 0;
-	    }
-	  _M_version = 0;
-	}
-    }
-} // namespace __gnu_debug
-
-#endif
-
diff --git a/include.new/c++/3.4/debug/safe_sequence.h b/include.new/c++/3.4/debug/safe_sequence.h
deleted file mode 100644
index f050530..0000000
--- a/include.new/c++/3.4/debug/safe_sequence.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Safe sequence implementation  -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_SAFE_SEQUENCE_H
-#define _GLIBCXX_DEBUG_SAFE_SEQUENCE_H 1
-
-#include <debug/debug.h>
-#include <debug/safe_base.h>
-
-namespace __gnu_debug
-{
-  template<typename _Iterator, typename _Sequence>
-    class _Safe_iterator;
-
-  /** A simple function object that returns true if the passed-in
-   *  value is not equal to the stored value. It saves typing over
-   *  using both bind1st and not_equal.
-   */
-  template<typename _Type>
-    class _Not_equal_to
-    {
-      _Type __value;
-
-    public:
-      explicit _Not_equal_to(const _Type& __v) : __value(__v) { }
-
-      bool
-      operator()(const _Type& __x) const
-      { return __value != __x; }
-    };
-
-  /** A function object that returns true when the given random access
-      iterator is at least @c n steps away from the given iterator. */
-  template<typename _Iterator>
-    class _After_nth_from
-    {
-      typedef typename std::iterator_traits<_Iterator>::difference_type
-      difference_type;
-
-      _Iterator _M_base;
-      difference_type _M_n;
-
-    public:
-      _After_nth_from(const difference_type& __n, const _Iterator& __base)
-      : _M_base(__base), _M_n(__n) { }
-
-      bool
-      operator()(const _Iterator& __x) const
-      { return __x - _M_base >= _M_n; }
-    };
-
-  /**
-   * @brief Base class for constructing a "safe" sequence type that
-   * tracks iterators that reference it.
-   *
-   * The class template %_Safe_sequence simplifies the construction of
-   * "safe" sequences that track the iterators that reference the
-   * sequence, so that the iterators are notified of changes in the
-   * sequence that may affect their operation, e.g., if the container
-   * invalidates its iterators or is destructed. This class template
-   * may only be used by deriving from it and passing the name of the
-   * derived class as its template parameter via the curiously
-   * recurring template pattern. The derived class must have @c
-   * iterator and @const_iterator types that are instantiations of
-   * class template _Safe_iterator for this sequence. Iterators will
-   * then be tracked automatically.
-   */
-  template<typename _Sequence>
-    class _Safe_sequence : public _Safe_sequence_base
-    {
-    public:
-      /** Invalidates all iterators @c x that reference this sequence,
-	  are not singular, and for which @c pred(x) returns @c
-	  true. The user of this routine should be careful not to make
-	  copies of the iterators passed to @p pred, as the copies may
-	  interfere with the invalidation. */
-      template<typename _Predicate>
-        void
-        _M_invalidate_if(_Predicate __pred);
-
-      /** Transfers all iterators that reference this memory location
-	  to this sequence from whatever sequence they are attached
-	  to. */
-      template<typename _Iterator>
-        void
-        _M_transfer_iter(const _Safe_iterator<_Iterator, _Sequence>& __x);
-    };
-
-  template<typename _Sequence>
-    template<typename _Predicate>
-      void
-      _Safe_sequence<_Sequence>::
-      _M_invalidate_if(_Predicate __pred)
-      {
-        typedef typename _Sequence::iterator iterator;
-        typedef typename _Sequence::const_iterator const_iterator;
-
-        for (_Safe_iterator_base* __iter = _M_iterators; __iter; )
-        {
-          iterator* __victim = static_cast<iterator*>(__iter);
-          __iter = __iter->_M_next;
-          if (!__victim->_M_singular())
-          {
-	    if (__pred(__victim->base()))
-	      __victim->_M_invalidate();
-          }
-        }
-
-        for (_Safe_iterator_base* __iter2 = _M_const_iterators; __iter2; )
-        {
-          const_iterator* __victim = static_cast<const_iterator*>(__iter2);
-          __iter2 = __iter2->_M_next;
-          if (!__victim->_M_singular())
-          {
-	    if (__pred(__victim->base()))
-	      __victim->_M_invalidate();
-          }
-        }
-      }
-
-  template<typename _Sequence>
-    template<typename _Iterator>
-      void
-      _Safe_sequence<_Sequence>::
-      _M_transfer_iter(const _Safe_iterator<_Iterator, _Sequence>& __x)
-      {
-	_Safe_sequence_base* __from = __x._M_sequence;
-	if (!__from)
-	  return;
-
-        typedef typename _Sequence::iterator iterator;
-        typedef typename _Sequence::const_iterator const_iterator;
-
-        for (_Safe_iterator_base* __iter = __from->_M_iterators; __iter; )
-        {
-          iterator* __victim = static_cast<iterator*>(__iter);
-          __iter = __iter->_M_next;
-          if (!__victim->_M_singular() && __victim->base() == __x.base())
-	    __victim->_M_attach(static_cast<_Sequence*>(this));
-        }
-
-        for (_Safe_iterator_base* __iter2 = __from->_M_const_iterators; 
-	     __iter2;)
-        {
-          const_iterator* __victim = static_cast<const_iterator*>(__iter2);
-          __iter2 = __iter2->_M_next;
-          if (!__victim->_M_singular() && __victim->base() == __x.base())
-	    __victim->_M_attach(static_cast<_Sequence*>(this));
-        }
-      }
-} // namespace __gnu_debug
-
-#endif
diff --git a/include.new/c++/3.4/debug/set b/include.new/c++/3.4/debug/set
deleted file mode 100644
index a1a69ef..0000000
--- a/include.new/c++/3.4/debug/set
+++ /dev/null
@@ -1,38 +0,0 @@
-// Debugging set/multiset implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_SET
-#define _GLIBCXX_DEBUG_SET 1
-
-#include <set>
-#include <debug/set.h>
-#include <debug/multiset.h>
-
-#endif
diff --git a/include.new/c++/3.4/debug/set.h b/include.new/c++/3.4/debug/set.h
deleted file mode 100644
index 8656cb0..0000000
--- a/include.new/c++/3.4/debug/set.h
+++ /dev/null
@@ -1,325 +0,0 @@
-// Debugging set implementation -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_SET_H
-#define _GLIBCXX_DEBUG_SET_H 1
-
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-#include <utility>
-
-namespace __gnu_debug_def
-{
-  template<typename _Key, typename _Compare = std::less<_Key>,
-	   typename _Allocator = std::allocator<_Key> >
-    class set
-    : public _GLIBCXX_STD::set<_Key,_Compare,_Allocator>,
-      public __gnu_debug::_Safe_sequence<set<_Key, _Compare, _Allocator> >
-    {
-      typedef _GLIBCXX_STD::set<_Key,_Compare,_Allocator> _Base;
-      typedef __gnu_debug::_Safe_sequence<set> _Safe_base;
-
-    public:
-      // types:
-      typedef _Key				    key_type;
-      typedef _Key				    value_type;
-      typedef _Compare				    key_compare;
-      typedef _Compare				    value_compare;
-      typedef _Allocator			    allocator_type;
-      typedef typename _Allocator::reference        reference;
-      typedef typename _Allocator::const_reference  const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator, set>
-                                                    iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator, set>
-                                                    const_iterator;
-
-      typedef typename _Base::size_type             size_type;
-      typedef typename _Base::difference_type       difference_type;
-      typedef typename _Allocator::pointer          pointer;
-      typedef typename _Allocator::const_pointer    const_pointer;
-      typedef std::reverse_iterator<iterator>       reverse_iterator;
-      typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-      // 23.3.3.1 construct/copy/destroy:
-      explicit set(const _Compare& __comp = _Compare(),
-		   const _Allocator& __a = _Allocator())
-      : _Base(__comp, __a) { }
-
-      template<typename _InputIterator>
-        set(_InputIterator __first, _InputIterator __last,
-	    const _Compare& __comp = _Compare(),
-	    const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__check_valid_range(__first, __last), __last,
-		__comp, __a) { }
-
-      set(const set<_Key,_Compare,_Allocator>& __x)
-      : _Base(__x), _Safe_base() { }
-
-      set(const _Base& __x) : _Base(__x), _Safe_base() { }
-
-      ~set() { }
-
-      set<_Key,_Compare,_Allocator>&
-      operator=(const set<_Key,_Compare,_Allocator>& __x)
-      {
-	*static_cast<_Base*>(this) = __x;
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin()
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end()
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend()
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      // capacity:
-      using _Base::empty;
-      using _Base::size;
-      using _Base::max_size;
-
-      // modifiers:
-      std::pair<iterator, bool>
-      insert(const value_type& __x)
-      {
-	typedef typename _Base::iterator _Base_iterator;
-	std::pair<_Base_iterator, bool> __res = _Base::insert(__x);
-	return std::pair<iterator, bool>(iterator(__res.first, this),
-					 __res.second);
-      }
-
-      iterator
-      insert(iterator __position, const value_type& __x)
-      {
-	__glibcxx_check_insert(__position);
-	return iterator(_Base::insert(__position.base(), __x), this);
-      }
-
-      template <typename _InputIterator>
-        void
-        insert(_InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::insert(__first, __last);
-	}
-
-      void
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	__position._M_invalidate();
-	_Base::erase(__position.base());
-      }
-
-      size_type
-      erase(const key_type& __x)
-      {
-	iterator __victim = find(__x);
-	if (__victim == end())
-          return 0;
-	else
-        {
-	  __victim._M_invalidate();
-	  _Base::erase(__victim.base());
-	  return 1;
-        }
-      }
-
-      void
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-
-	while (__first != __last)
-        this->erase(__first++);
-      }
-
-      void
-      swap(set<_Key,_Compare,_Allocator>& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-      }
-
-      void
-      clear()
-      { this->erase(begin(), end()); }
-
-      // observers:
-      using _Base::key_comp;
-      using _Base::value_comp;
-
-      // set operations:
-      iterator
-      find(const key_type& __x)
-      { return iterator(_Base::find(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      find(const key_type& __x) const
-      { return const_iterator(_Base::find(__x), this); }
-
-      using _Base::count;
-
-      iterator
-      lower_bound(const key_type& __x)
-      { return iterator(_Base::lower_bound(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      lower_bound(const key_type& __x) const
-      { return const_iterator(_Base::lower_bound(__x), this); }
-
-      iterator
-      upper_bound(const key_type& __x)
-      { return iterator(_Base::upper_bound(__x), this); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      const_iterator
-      upper_bound(const key_type& __x) const
-      { return const_iterator(_Base::upper_bound(__x), this); }
-
-      std::pair<iterator,iterator>
-      equal_range(const key_type& __x)
-      {
-	typedef typename _Base::iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-        _Base::equal_range(__x);
-	return std::make_pair(iterator(__res.first, this),
-			      iterator(__res.second, this));
-      }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 214. set::find() missing const overload
-      std::pair<const_iterator,const_iterator>
-      equal_range(const key_type& __x) const
-      {
-	typedef typename _Base::const_iterator _Base_iterator;
-	std::pair<_Base_iterator, _Base_iterator> __res =
-        _Base::equal_range(__x);
-	return std::make_pair(const_iterator(__res.first, this),
-			      const_iterator(__res.second, this));
-      }
-
-      _Base&
-      _M_base() { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-
-    private:
-      void
-      _M_invalidate_all()
-      {
-	typedef typename _Base::const_iterator _Base_const_iterator;
-	typedef __gnu_debug::_Not_equal_to<_Base_const_iterator> _Not_equal;
-	this->_M_invalidate_if(_Not_equal(_M_base().end()));
-      }
-    };
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator==(const set<_Key,_Compare,_Allocator>& __lhs,
-	       const set<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator!=(const set<_Key,_Compare,_Allocator>& __lhs,
-	       const set<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<(const set<_Key,_Compare,_Allocator>& __lhs,
-	      const set<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator<=(const set<_Key,_Compare,_Allocator>& __lhs,
-	       const set<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>=(const set<_Key,_Compare,_Allocator>& __lhs,
-	       const set<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    inline bool
-    operator>(const set<_Key,_Compare,_Allocator>& __lhs,
-	      const set<_Key,_Compare,_Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Key, typename _Compare, typename _Allocator>
-    void
-    swap(set<_Key,_Compare,_Allocator>& __x,
-	 set<_Key,_Compare,_Allocator>& __y)
-    { return __x.swap(__y); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/debug/string b/include.new/c++/3.4/debug/string
deleted file mode 100644
index a91c004..0000000
--- a/include.new/c++/3.4/debug/string
+++ /dev/null
@@ -1,1001 +0,0 @@
-// Debugging string implementation -*- C++ -*-
-
-// Copyright (C) 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_STRING
-#define _GLIBCXX_DEBUG_STRING 1
-
-#include <string>
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-
-namespace __gnu_debug
-{
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    class basic_string
-    : public std::basic_string<_CharT, _Traits, _Allocator>,
-      public __gnu_debug::_Safe_sequence<basic_string<_CharT, _Traits,
-						      _Allocator> >
-    {
-      typedef std::basic_string<_CharT, _Traits, _Allocator> _Base;
-      typedef __gnu_debug::_Safe_sequence<basic_string>     _Safe_base;
-
-  public:
-    // types:
-    typedef _Traits				       traits_type;
-    typedef typename _Traits::char_type		       value_type;
-    typedef _Allocator				       allocator_type;
-    typedef typename _Allocator::size_type             size_type;
-    typedef typename _Allocator::difference_type       difference_type;
-    typedef typename _Allocator::reference             reference;
-    typedef typename _Allocator::const_reference       const_reference;
-    typedef typename _Allocator::pointer               pointer;
-    typedef typename _Allocator::const_pointer         const_pointer;
-
-    typedef __gnu_debug::_Safe_iterator<typename _Base::iterator, basic_string>
-                                                       iterator;
-    typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,
-                                         basic_string> const_iterator;
-
-    typedef std::reverse_iterator<iterator>            reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>      const_reverse_iterator;
-
-    using _Base::npos;
-
-    // 21.3.1 construct/copy/destroy:
-    explicit basic_string(const _Allocator& __a = _Allocator())
-    : _Base(__a)
-    { }
-
-    // Provides conversion from a release-mode string to a debug-mode string
-    basic_string(const _Base& __base) : _Base(__base), _Safe_base() { }
-
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // 42. string ctors specify wrong default allocator
-    basic_string(const basic_string& __str)
-    : _Base(__str, 0, _Base::npos, __str.get_allocator()), _Safe_base()
-    { }
-
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // 42. string ctors specify wrong default allocator
-    basic_string(const basic_string& __str, size_type __pos,
-		   size_type __n = _Base::npos,
-		   const _Allocator& __a = _Allocator())
-    : _Base(__str, __pos, __n, __a)
-    { }
-
-    basic_string(const _CharT* __s, size_type __n,
-		   const _Allocator& __a = _Allocator())
-    : _Base(__gnu_debug::__check_string(__s, __n), __n, __a)
-    { }
-
-    basic_string(const _CharT* __s, const _Allocator& __a = _Allocator())
-    : _Base(__gnu_debug::__check_string(__s), __a)
-    { this->assign(__s); }
-
-    basic_string(size_type __n, _CharT __c,
-		   const _Allocator& __a = _Allocator())
-    : _Base(__n, __c, __a)
-    { }
-
-    template<typename _InputIterator>
-      basic_string(_InputIterator __begin, _InputIterator __end,
-		     const _Allocator& __a = _Allocator())
-      : _Base(__gnu_debug::__check_valid_range(__begin, __end), __end, __a)
-      { }
-
-    ~basic_string() { }
-
-    basic_string&
-    operator=(const basic_string& __str)
-    {
-      *static_cast<_Base*>(this) = __str;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    operator=(const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      *static_cast<_Base*>(this) = __s;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    operator=(_CharT __c)
-    {
-      *static_cast<_Base*>(this) = __c;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    // 21.3.2 iterators:
-    iterator
-    begin()
-    { return iterator(_Base::begin(), this); }
-
-    const_iterator
-    begin() const
-    { return const_iterator(_Base::begin(), this); }
-
-    iterator
-    end()
-    { return iterator(_Base::end(), this); }
-
-    const_iterator
-    end() const
-    { return const_iterator(_Base::end(), this); }
-
-    reverse_iterator
-    rbegin()
-    { return reverse_iterator(end()); }
-
-    const_reverse_iterator
-    rbegin() const
-    { return const_reverse_iterator(end()); }
-
-    reverse_iterator
-    rend()
-    { return reverse_iterator(begin()); }
-
-    const_reverse_iterator
-    rend() const
-    { return const_reverse_iterator(begin()); }
-
-    // 21.3.3 capacity:
-    using _Base::size;
-    using _Base::length;
-    using _Base::max_size;
-
-    void
-    resize(size_type __n, _CharT __c)
-    {
-      _Base::resize(__n, __c);
-      this->_M_invalidate_all();
-    }
-
-    void
-    resize(size_type __n)
-    { this->resize(__n, _CharT()); }
-
-    using _Base::capacity;
-    using _Base::reserve;
-
-    void
-    clear()
-    {
-      _Base::clear();
-      this->_M_invalidate_all();
-    }
-
-    using _Base::empty;
-
-    // 21.3.4 element access:
-    const_reference
-    operator[](size_type __pos) const
-    {
-      _GLIBCXX_DEBUG_VERIFY(__pos <= this->size(),
-			    _M_message(::__gnu_debug::__msg_subscript_oob)
-			    ._M_sequence(*this, "this")
-			    ._M_integer(__pos, "__pos")
-			    ._M_integer(this->size(), "size"));
-      return _M_base()[__pos];
-    }
-
-    reference
-    operator[](size_type __pos)
-    {
-      __glibcxx_check_subscript(__pos);
-      return _M_base()[__pos];
-    }
-
-    using _Base::at;
-
-    // 21.3.5 modifiers:
-    basic_string&
-    operator+=(const basic_string& __str)
-    {
-      _M_base() += __str;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    operator+=(const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _M_base() += __s;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    operator+=(_CharT __c)
-    {
-      _M_base() += __c;
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    append(const basic_string& __str)
-    {
-      _Base::append(__str);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    append(const basic_string& __str, size_type __pos, size_type __n)
-    {
-      _Base::append(__str, __pos, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    append(const _CharT* __s, size_type __n)
-    {
-      __glibcxx_check_string_len(__s, __n);
-      _Base::append(__s, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    append(const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _Base::append(__s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    append(size_type __n, _CharT __c)
-    {
-      _Base::append(__n, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    template<typename _InputIterator>
-      basic_string&
-      append(_InputIterator __first, _InputIterator __last)
-      {
-	__glibcxx_check_valid_range(__first, __last);
-	_Base::append(__first, __last);
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-    // _GLIBCXX_RESOLVE_LIB_DEFECTS
-    // 7. string clause minor problems
-    void
-    push_back(_CharT __c)
-    {
-      _Base::push_back(__c);
-      this->_M_invalidate_all();
-    }
-
-    basic_string&
-    assign(const basic_string& __x)
-    {
-      _Base::assign(__x);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    assign(const basic_string& __str, size_type __pos, size_type __n)
-    {
-      _Base::assign(__str, __pos, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    assign(const _CharT* __s, size_type __n)
-    {
-      __glibcxx_check_string_len(__s, __n);
-      _Base::assign(__s, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    assign(const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _Base::assign(__s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    assign(size_type __n, _CharT __c)
-    {
-      _Base::assign(__n, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    template<typename _InputIterator>
-      basic_string&
-      assign(_InputIterator __first, _InputIterator __last)
-      {
-	__glibcxx_check_valid_range(__first, __last);
-	_Base::assign(__first, __last);
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-    basic_string&
-    insert(size_type __pos1, const basic_string& __str)
-    {
-      _Base::insert(__pos1, __str);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    insert(size_type __pos1, const basic_string& __str,
-	   size_type __pos2, size_type __n)
-    {
-      _Base::insert(__pos1, __str, __pos2, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    insert(size_type __pos, const _CharT* __s, size_type __n)
-    {
-      __glibcxx_check_string(__s);
-      _Base::insert(__pos, __s, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    insert(size_type __pos, const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _Base::insert(__pos, __s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    insert(size_type __pos, size_type __n, _CharT __c)
-    {
-      _Base::insert(__pos, __n, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    iterator
-    insert(iterator __p, _CharT __c)
-    {
-      __glibcxx_check_insert(__p);
-      typename _Base::iterator __res = _Base::insert(__p.base(), __c);
-      this->_M_invalidate_all();
-      return iterator(__res, this);
-    }
-
-    void
-    insert(iterator __p, size_type __n, _CharT __c)
-    {
-      __glibcxx_check_insert(__p);
-      _Base::insert(__p.base(), __n, __c);
-      this->_M_invalidate_all();
-    }
-
-    template<typename _InputIterator>
-      void
-      insert(iterator __p, _InputIterator __first, _InputIterator __last)
-      {
-	__glibcxx_check_insert_range(__p, __first, __last);
-	_Base::insert(__p.base(), __first, __last);
-	this->_M_invalidate_all();
-      }
-
-    basic_string&
-    erase(size_type __pos = 0, size_type __n = _Base::npos)
-    {
-      _Base::erase(__pos, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    iterator
-    erase(iterator __position)
-    {
-      __glibcxx_check_erase(__position);
-      typename _Base::iterator __res = _Base::erase(__position.base());
-      this->_M_invalidate_all();
-      return iterator(__res, this);
-    }
-
-    iterator
-    erase(iterator __first, iterator __last)
-    {
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 151. can't currently clear() empty container
-      __glibcxx_check_erase_range(__first, __last);
-      typename _Base::iterator __res = _Base::erase(__first.base(),
-						       __last.base());
-      this->_M_invalidate_all();
-      return iterator(__res, this);
-    }
-
-    basic_string&
-    replace(size_type __pos1, size_type __n1, const basic_string& __str)
-    {
-      _Base::replace(__pos1, __n1, __str);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(size_type __pos1, size_type __n1, const basic_string& __str,
-	    size_type __pos2, size_type __n2)
-    {
-      _Base::replace(__pos1, __n1, __str, __pos2, __n2);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(size_type __pos, size_type __n1, const _CharT* __s,
-	    size_type __n2)
-    {
-      __glibcxx_check_string_len(__s, __n2);
-      _Base::replace(__pos, __n1, __s, __n2);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(size_type __pos, size_type __n1, const _CharT* __s)
-    {
-      __glibcxx_check_string(__s);
-      _Base::replace(__pos, __n1, __s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(size_type __pos, size_type __n1, size_type __n2, _CharT __c)
-    {
-      _Base::replace(__pos, __n1, __n2, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(iterator __i1, iterator __i2, const basic_string& __str)
-    {
-      __glibcxx_check_erase_range(__i1, __i2);
-      _Base::replace(__i1.base(), __i2.base(), __str);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(iterator __i1, iterator __i2, const _CharT* __s, size_type __n)
-    {
-      __glibcxx_check_erase_range(__i1, __i2);
-      __glibcxx_check_string_len(__s, __n);
-      _Base::replace(__i1.base(), __i2.base(), __s, __n);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(iterator __i1, iterator __i2, const _CharT* __s)
-    {
-      __glibcxx_check_erase_range(__i1, __i2);
-      __glibcxx_check_string(__s);
-      _Base::replace(__i1.base(), __i2.base(), __s);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    basic_string&
-    replace(iterator __i1, iterator __i2, size_type __n, _CharT __c)
-    {
-      __glibcxx_check_erase_range(__i1, __i2);
-      _Base::replace(__i1.base(), __i2.base(), __n, __c);
-      this->_M_invalidate_all();
-      return *this;
-    }
-
-    template<typename _InputIterator>
-      basic_string&
-      replace(iterator __i1, iterator __i2,
-	      _InputIterator __j1, _InputIterator __j2)
-      {
-	__glibcxx_check_erase_range(__i1, __i2);
-	__glibcxx_check_valid_range(__j1, __j2);
-	_Base::replace(__i1.base(), __i2.base(), __j1, __j2);
-	this->_M_invalidate_all();
-	return *this;
-      }
-
-    size_type
-    copy(_CharT* __s, size_type __n, size_type __pos = 0) const
-    {
-      __glibcxx_check_string_len(__s, __n);
-      return _Base::copy(__s, __n, __pos);
-    }
-
-    void
-    swap(basic_string<_CharT,_Traits,_Allocator>& __x)
-    {
-      _Base::swap(__x);
-      this->_M_swap(__x);
-      this->_M_invalidate_all();
-      __x._M_invalidate_all();
-    }
-
-    // 21.3.6 string operations:
-    const _CharT*
-    c_str() const
-    {
-      const _CharT* __res = _Base::c_str();
-      this->_M_invalidate_all();
-      return __res;
-    }
-
-    const _CharT*
-    data() const
-    {
-      const _CharT* __res = _Base::data();
-      this->_M_invalidate_all();
-      return __res;
-    }
-
-    using _Base::get_allocator;
-
-    size_type
-    find(const basic_string& __str, size_type __pos = 0) const
-    { return _Base::find(__str, __pos); }
-
-    size_type
-    find(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find(__s, __pos, __n);
-    }
-
-    size_type
-    find(const _CharT* __s, size_type __pos = 0) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find(__s, __pos);
-    }
-
-    size_type
-    find(_CharT __c, size_type __pos = 0) const
-    { return _Base::find(__c, __pos); }
-
-    size_type
-    rfind(const basic_string& __str, size_type __pos = _Base::npos) const
-    { return _Base::rfind(__str, __pos); }
-
-    size_type
-    rfind(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string_len(__s, __n);
-      return _Base::rfind(__s, __pos, __n);
-    }
-
-    size_type
-    rfind(const _CharT* __s, size_type __pos = _Base::npos) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::rfind(__s, __pos);
-    }
-
-    size_type
-    rfind(_CharT __c, size_type __pos = _Base::npos) const
-    { return _Base::rfind(__c, __pos); }
-
-    size_type
-    find_first_of(const basic_string& __str, size_type __pos = 0) const
-    { return _Base::find_first_of(__str, __pos); }
-
-    size_type
-    find_first_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_first_of(__s, __pos, __n);
-    }
-
-    size_type
-    find_first_of(const _CharT* __s, size_type __pos = 0) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_first_of(__s, __pos);
-    }
-
-    size_type
-    find_first_of(_CharT __c, size_type __pos = 0) const
-    { return _Base::find_first_of(__c, __pos); }
-
-    size_type
-    find_last_of(const basic_string& __str, size_type __pos = _Base::npos) const
-    { return _Base::find_last_of(__str, __pos); }
-
-    size_type
-    find_last_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_last_of(__s, __pos, __n);
-    }
-
-    size_type
-    find_last_of(const _CharT* __s, size_type __pos = _Base::npos) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_last_of(__s, __pos);
-    }
-
-    size_type
-    find_last_of(_CharT __c, size_type __pos = _Base::npos) const
-    { return _Base::find_last_of(__c, __pos); }
-
-    size_type
-    find_first_not_of(const basic_string& __str, size_type __pos = 0) const
-    { return _Base::find_first_not_of(__str, __pos); }
-
-    size_type
-    find_first_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string_len(__s, __n);
-      return _Base::find_first_not_of(__s, __pos, __n);
-    }
-
-    size_type
-    find_first_not_of(const _CharT* __s, size_type __pos = 0) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_first_not_of(__s, __pos);
-    }
-
-    size_type
-    find_first_not_of(_CharT __c, size_type __pos = 0) const
-    { return _Base::find_first_not_of(__c, __pos); }
-
-    size_type
-    find_last_not_of(const basic_string& __str,
-				  size_type __pos = _Base::npos) const
-    { return _Base::find_last_not_of(__str, __pos); }
-
-    size_type
-    find_last_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_last_not_of(__s, __pos, __n);
-    }
-
-    size_type
-    find_last_not_of(const _CharT* __s, size_type __pos = _Base::npos) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::find_last_not_of(__s, __pos);
-    }
-
-    size_type
-    find_last_not_of(_CharT __c, size_type __pos = _Base::npos) const
-    { return _Base::find_last_not_of(__c, __pos); }
-
-    basic_string
-    substr(size_type __pos = 0, size_type __n = _Base::npos) const
-    { return basic_string(_Base::substr(__pos, __n)); }
-
-    int
-    compare(const basic_string& __str) const
-    { return _Base::compare(__str); }
-
-    int
-    compare(size_type __pos1, size_type __n1,
-		  const basic_string& __str) const
-    { return _Base::compare(__pos1, __n1, __str); }
-
-    int
-    compare(size_type __pos1, size_type __n1, const basic_string& __str,
-	      size_type __pos2, size_type __n2) const
-    { return _Base::compare(__pos1, __n1, __str, __pos2, __n2); }
-
-    int
-    compare(const _CharT* __s) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::compare(__s);
-    }
-
-    //  _GLIBCXX_RESOLVE_LIB_DEFECTS
-    //  5. string::compare specification questionable
-    int
-    compare(size_type __pos1, size_type __n1, const _CharT* __s) const
-    {
-      __glibcxx_check_string(__s);
-      return _Base::compare(__pos1, __n1, __s);
-    }
-
-    //  _GLIBCXX_RESOLVE_LIB_DEFECTS
-    //  5. string::compare specification questionable
-    int
-    compare(size_type __pos1, size_type __n1,const _CharT* __s,
-	      size_type __n2) const
-    {
-      __glibcxx_check_string_len(__s, __n2);
-      return _Base::compare(__pos1, __n1, __s, __n2);
-    }
-
-    _Base&
-    _M_base() { return *this; }
-
-    const _Base&
-    _M_base() const { return *this; }
-
-    using _Safe_base::_M_invalidate_all;
-  };
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return basic_string<_CharT,_Traits,_Allocator>(__lhs) += __rhs; }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(const _CharT* __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return basic_string<_CharT,_Traits,_Allocator>(__lhs) += __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(_CharT __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return basic_string<_CharT,_Traits,_Allocator>(1, __lhs) += __rhs; }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return basic_string<_CharT,_Traits,_Allocator>(__lhs) += __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline basic_string<_CharT,_Traits,_Allocator>
-    operator+(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      _CharT __rhs)
-    { return basic_string<_CharT,_Traits,_Allocator>(__lhs) += __rhs; }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator==(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator==(const _CharT* __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs == __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator==(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() == __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator!=(const _CharT* __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs != __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() != __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<(const _CharT* __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs < __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() < __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<=(const _CharT* __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs <= __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator<=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() <= __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>=(const _CharT* __lhs,
-	       const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs >= __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	       const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() >= __rhs;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>(const _CharT* __lhs,
-	      const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    {
-      __glibcxx_check_string(__lhs);
-      return __lhs > __rhs._M_base();
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline bool
-    operator>(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	      const _CharT* __rhs)
-    {
-      __glibcxx_check_string(__rhs);
-      return __lhs._M_base() > __rhs;
-    }
-
-  // 21.3.7.8:
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    inline void
-    swap(basic_string<_CharT,_Traits,_Allocator>& __lhs,
-	 basic_string<_CharT,_Traits,_Allocator>& __rhs)
-    { __lhs.swap(__rhs); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    std::basic_ostream<_CharT, _Traits>&
-    operator<<(std::basic_ostream<_CharT, _Traits>& __os,
-	       const basic_string<_CharT, _Traits, _Allocator>& __str)
-    { return __os << __str._M_base(); }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    std::basic_istream<_CharT,_Traits>&
-    operator>>(std::basic_istream<_CharT,_Traits>& __is,
-	       basic_string<_CharT,_Traits,_Allocator>& __str)
-    {
-      std::basic_istream<_CharT,_Traits>& __res = __is >> __str._M_base();
-      __str._M_invalidate_all();
-      return __res;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    std::basic_istream<_CharT,_Traits>&
-    getline(std::basic_istream<_CharT,_Traits>& __is,
-	    basic_string<_CharT,_Traits,_Allocator>& __str, _CharT __delim)
-    {
-      std::basic_istream<_CharT,_Traits>& __res = getline(__is,
-							  __str._M_base(),
-							__delim);
-      __str._M_invalidate_all();
-      return __res;
-    }
-
-  template<typename _CharT, typename _Traits, typename _Allocator>
-    std::basic_istream<_CharT,_Traits>&
-    getline(std::basic_istream<_CharT,_Traits>& __is,
-	    basic_string<_CharT,_Traits,_Allocator>& __str)
-    {
-      std::basic_istream<_CharT,_Traits>& __res = getline(__is,
-							  __str._M_base());
-      __str._M_invalidate_all();
-      return __res;
-    }
-} // namespace __gnu_debug
-
-#endif
diff --git a/include.new/c++/3.4/debug/vector b/include.new/c++/3.4/debug/vector
deleted file mode 100644
index 0cc2997..0000000
--- a/include.new/c++/3.4/debug/vector
+++ /dev/null
@@ -1,412 +0,0 @@
-// Debugging vector implementation -*- C++ -*-
-
-// Copyright (C) 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _GLIBCXX_DEBUG_VECTOR
-#define _GLIBCXX_DEBUG_VECTOR 1
-
-#include <vector>
-#include <debug/safe_sequence.h>
-#include <debug/safe_iterator.h>
-#include <utility>
-
-namespace __gnu_debug_def
-{
-  template<typename _Tp,
-	   typename _Allocator = std::allocator<_Tp> >
-    class vector
-    : public _GLIBCXX_STD::vector<_Tp, _Allocator>,
-      public __gnu_debug::_Safe_sequence<vector<_Tp, _Allocator> >
-    {
-      typedef _GLIBCXX_STD::vector<_Tp, _Allocator> _Base;
-      typedef __gnu_debug::_Safe_sequence<vector>              _Safe_base;
-
-      typedef typename _Base::const_iterator _Base_const_iterator;
-      typedef __gnu_debug::_After_nth_from<_Base_const_iterator> _After_nth;
-
-    public:
-      typedef typename _Base::reference             reference;
-      typedef typename _Base::const_reference       const_reference;
-
-      typedef __gnu_debug::_Safe_iterator<typename _Base::iterator,vector>
-      iterator;
-      typedef __gnu_debug::_Safe_iterator<typename _Base::const_iterator,vector>
-      const_iterator;
-
-      typedef typename _Base::size_type             size_type;
-      typedef typename _Base::difference_type       difference_type;
-
-      typedef _Tp				    value_type;
-      typedef _Allocator			    allocator_type;
-      typedef typename _Allocator::pointer          pointer;
-      typedef typename _Allocator::const_pointer    const_pointer;
-      typedef std::reverse_iterator<iterator>       reverse_iterator;
-      typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-      // 23.2.4.1 construct/copy/destroy:
-      explicit vector(const _Allocator& __a = _Allocator())
-      : _Base(__a), _M_guaranteed_capacity(0) { }
-
-      explicit vector(size_type __n, const _Tp& __value = _Tp(),
-		      const _Allocator& __a = _Allocator())
-      : _Base(__n, __value, __a), _M_guaranteed_capacity(__n) { }
-
-      template<class _InputIterator>
-        vector(_InputIterator __first, _InputIterator __last,
-	       const _Allocator& __a = _Allocator())
-	: _Base(__gnu_debug::__check_valid_range(__first, __last),
-		__last, __a),
-	  _M_guaranteed_capacity(0)
-        { _M_update_guaranteed_capacity(); }
-
-      vector(const vector<_Tp,_Allocator>& __x)
-      : _Base(__x), _Safe_base(), _M_guaranteed_capacity(__x.size()) { }
-
-      /// Construction from a release-mode vector
-      vector(const _Base& __x)
-      : _Base(__x), _Safe_base(), _M_guaranteed_capacity(__x.size()) { }
-
-      ~vector() { }
-
-      vector<_Tp,_Allocator>&
-      operator=(const vector<_Tp,_Allocator>& __x)
-      {
-	static_cast<_Base&>(*this) = __x;
-	this->_M_invalidate_all();
-	_M_update_guaranteed_capacity();
-	return *this;
-      }
-
-      template<typename _InputIterator>
-        void
-        assign(_InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_valid_range(__first, __last);
-	  _Base::assign(__first, __last);
-	  this->_M_invalidate_all();
-	  _M_update_guaranteed_capacity();
-	}
-
-      void
-      assign(size_type __n, const _Tp& __u)
-      {
-	_Base::assign(__n, __u);
-	this->_M_invalidate_all();
-	_M_update_guaranteed_capacity();
-      }
-
-      using _Base::get_allocator;
-
-      // iterators:
-      iterator
-      begin()
-      { return iterator(_Base::begin(), this); }
-
-      const_iterator
-      begin() const
-      { return const_iterator(_Base::begin(), this); }
-
-      iterator
-      end()
-      { return iterator(_Base::end(), this); }
-
-      const_iterator
-      end() const
-      { return const_iterator(_Base::end(), this); }
-
-      reverse_iterator
-      rbegin()
-      { return reverse_iterator(end()); }
-
-      const_reverse_iterator
-      rbegin() const
-      { return const_reverse_iterator(end()); }
-
-      reverse_iterator
-      rend()
-      { return reverse_iterator(begin()); }
-
-      const_reverse_iterator
-      rend() const
-      { return const_reverse_iterator(begin()); }
-
-      // 23.2.4.2 capacity:
-      using _Base::size;
-      using _Base::max_size;
-
-      void
-      resize(size_type __sz, _Tp __c = _Tp())
-      {
-	bool __realloc = _M_requires_reallocation(__sz);
-	if (__sz < this->size())
-	  this->_M_invalidate_if(_After_nth(__sz, _M_base().begin()));
-	_Base::resize(__sz, __c);
-	if (__realloc)
-	  this->_M_invalidate_all();
-      }
-
-      using _Base::capacity;
-      using _Base::empty;
-
-      void
-      reserve(size_type __n)
-      {
-	bool __realloc = _M_requires_reallocation(__n);
-	_Base::reserve(__n);
-	if (__n > _M_guaranteed_capacity)
-	  _M_guaranteed_capacity = __n;
-	if (__realloc)
-	  this->_M_invalidate_all();
-      }
-
-      // element access:
-      reference
-      operator[](size_type __n)
-      {
-	__glibcxx_check_subscript(__n);
-	return _M_base()[__n];
-      }
-
-      const_reference
-      operator[](size_type __n) const
-      {
-	__glibcxx_check_subscript(__n);
-	return _M_base()[__n];
-      }
-
-      using _Base::at;
-
-      reference
-      front()
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      const_reference
-      front() const
-      {
-	__glibcxx_check_nonempty();
-	return _Base::front();
-      }
-
-      reference
-      back()
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      const_reference
-      back() const
-      {
-	__glibcxx_check_nonempty();
-	return _Base::back();
-      }
-
-      // 23.2.4.3 modifiers:
-      void
-      push_back(const _Tp& __x)
-      {
-	bool __realloc = _M_requires_reallocation(this->size() + 1);
-	_Base::push_back(__x);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	_M_update_guaranteed_capacity();
-      }
-
-      void
-      pop_back()
-      {
-	__glibcxx_check_nonempty();
-	iterator __victim = end() - 1;
-	__victim._M_invalidate();
-	_Base::pop_back();
-      }
-
-      iterator
-      insert(iterator __position, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	bool __realloc = _M_requires_reallocation(this->size() + 1);
-	difference_type __offset = __position - begin();
-	typename _Base::iterator __res = _Base::insert(__position.base(),__x);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	else
-	  this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
-	_M_update_guaranteed_capacity();
-	return iterator(__res, this);
-      }
-
-      void
-      insert(iterator __position, size_type __n, const _Tp& __x)
-      {
-	__glibcxx_check_insert(__position);
-	bool __realloc = _M_requires_reallocation(this->size() + __n);
-	difference_type __offset = __position - begin();
-	_Base::insert(__position.base(), __n, __x);
-	if (__realloc)
-	  this->_M_invalidate_all();
-	else
-	  this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
-	_M_update_guaranteed_capacity();
-      }
-
-      template<class _InputIterator>
-        void
-        insert(iterator __position,
-	       _InputIterator __first, _InputIterator __last)
-        {
-	  __glibcxx_check_insert_range(__position, __first, __last);
-
-	  /* Hard to guess if invalidation will occur, because __last
-	     - __first can't be calculated in all cases, so we just
-	     punt here by checking if it did occur. */
-	  typename _Base::iterator __old_begin = _M_base().begin();
-	  difference_type __offset = __position - begin();
-	  _Base::insert(__position.base(), __first, __last);
-
-	  if (_M_base().begin() != __old_begin)
-	    this->_M_invalidate_all();
-	  else
-	    this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
-	  _M_update_guaranteed_capacity();
-	}
-
-      iterator
-      erase(iterator __position)
-      {
-	__glibcxx_check_erase(__position);
-	difference_type __offset = __position - begin();
-	typename _Base::iterator __res = _Base::erase(__position.base());
-	this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
-	return iterator(__res, this);
-      }
-
-      iterator
-      erase(iterator __first, iterator __last)
-      {
-	// _GLIBCXX_RESOLVE_LIB_DEFECTS
-	// 151. can't currently clear() empty container
-	__glibcxx_check_erase_range(__first, __last);
-
-	difference_type __offset = __first - begin();
-	typename _Base::iterator __res = _Base::erase(__first.base(),
-							 __last.base());
-	this->_M_invalidate_if(_After_nth(__offset, _M_base().begin()));
-	return iterator(__res, this);
-      }
-
-      void
-      swap(vector<_Tp,_Allocator>& __x)
-      {
-	_Base::swap(__x);
-	this->_M_swap(__x);
-        std::swap(_M_guaranteed_capacity, __x._M_guaranteed_capacity);
-      }
-
-      void
-      clear()
-      {
-	_Base::clear();
-	this->_M_invalidate_all();
-        _M_guaranteed_capacity = 0;
-      }
-
-      _Base&
-      _M_base() { return *this; }
-
-      const _Base&
-      _M_base() const { return *this; }
-
-    private:
-      size_type _M_guaranteed_capacity;
-
-      bool
-      _M_requires_reallocation(size_type __elements)
-      {
-#ifdef _GLIBCXX_DEBUG_PEDANTIC
-	return __elements > this->capacity();
-#else
-	return __elements > _M_guaranteed_capacity;
-#endif
-      }
-
-      void
-      _M_update_guaranteed_capacity()
-      {
-	if (this->size() > _M_guaranteed_capacity)
-	  _M_guaranteed_capacity = this->size();
-      }
-    };
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator==(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() == __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator!=(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() != __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<(const vector<_Tp, _Alloc>& __lhs,
-	      const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() < __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator<=(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() <= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>=(const vector<_Tp, _Alloc>& __lhs,
-	       const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() >= __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline bool
-    operator>(const vector<_Tp, _Alloc>& __lhs,
-	      const vector<_Tp, _Alloc>& __rhs)
-    { return __lhs._M_base() > __rhs._M_base(); }
-
-  template<typename _Tp, typename _Alloc>
-    inline void
-    swap(vector<_Tp, _Alloc>& __lhs, vector<_Tp, _Alloc>& __rhs)
-    { __lhs.swap(__rhs); }
-} // namespace __gnu_debug_def
-
-#endif
diff --git a/include.new/c++/3.4/deque b/include.new/c++/3.4/deque
deleted file mode 100644
index 80817f6..0000000
--- a/include.new/c++/3.4/deque
+++ /dev/null
@@ -1,81 +0,0 @@
-// <deque> -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file deque
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_DEQUE
-#define _GLIBCXX_DEQUE 1
-
-#pragma GCC system_header
-
-#include <bits/functexcept.h>
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_deque.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/deque.tcc>
-#endif
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/deque>
-#endif
-
-#endif /* _GLIBCXX_DEQUE */
diff --git a/include.new/c++/3.4/exception b/include.new/c++/3.4/exception
deleted file mode 100644
index 6a1a194..0000000
--- a/include.new/c++/3.4/exception
+++ /dev/null
@@ -1,120 +0,0 @@
-// Exception Handling support header for -*- C++ -*-
-
-// Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002
-// Free Software Foundation
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-// 
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with GCC; see the file COPYING.  If not, write to
-// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file exception
- *  This header defines several types and functions relating to the
- *  handling of exceptions in a C++ program.
- */
-
-#ifndef __EXCEPTION__
-#define __EXCEPTION__
-
-extern "C++" {
-
-namespace std 
-{
-  /**
-   *  @brief Base class for all library exceptions.
-   *
-   *  This is the base class for all exceptions thrown by the standard
-   *  library, and by certain language expressions.  You are free to derive
-   *  your own %exception classes, or use a different hierarchy, or to
-   *  throw non-class data (e.g., fundamental types).
-   */
-  class exception 
-  {
-  public:
-    exception() throw() { }
-    virtual ~exception() throw();
-    /** Returns a C-style character string describing the general cause
-     *  of the current error.  */
-    virtual const char* what() const throw();
-  };
-
-  /** If an %exception is thrown which is not listed in a function's
-   *  %exception specification, one of these may be thrown.  */
-  class bad_exception : public exception 
-  {
-  public:
-    bad_exception() throw() { }
-    // This declaration is not useless:
-    // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-    virtual ~bad_exception() throw();
-  };
-
-  /// If you write a replacement %terminate handler, it must be of this type.
-  typedef void (*terminate_handler) ();
-  /// If you write a replacement %unexpected handler, it must be of this type.
-  typedef void (*unexpected_handler) ();
-
-  /// Takes a new handler function as an argument, returns the old function.
-  terminate_handler set_terminate(terminate_handler) throw();
-  /** The runtime will call this function if %exception handling must be
-   *  abandoned for any reason.  It can also be called by the user.  */
-  void terminate() __attribute__ ((__noreturn__));
-
-  /// Takes a new handler function as an argument, returns the old function.
-  unexpected_handler set_unexpected(unexpected_handler) throw();
-  /** The runtime will call this function if an %exception is thrown which
-   *  violates the function's %exception specification.  */
-  void unexpected() __attribute__ ((__noreturn__));
-
-  /** [18.6.4]/1:  "Returns true after completing evaluation of a
-   *  throw-expression until either completing initialization of the
-   *  exception-declaration in the matching handler or entering @c unexpected()
-   *  due to the throw; or after entering @c terminate() for any reason
-   *  other than an explicit call to @c terminate().  [Note: This includes
-   *  stack unwinding [15.2].  end note]"
-   *
-   *  2:  "When @c uncaught_exception() is true, throwing an %exception can
-   *  result in a call of @c terminate() (15.5.1)."
-   */
-  bool uncaught_exception() throw();
-} // namespace std
-
-namespace __gnu_cxx
-{
-  /** A replacement for the standard terminate_handler which prints more
-      information about the terminating exception (if any) on stderr.  Call
-      @code
-        std::set_terminate (__gnu_cxx::__verbose_terminate_handler)
-      @endcode
-      to use.  For more info, see
-      http://gcc.gnu.org/onlinedocs/libstdc++/19_diagnostics/howto.html#4
-
-      In 3.4 and later, this is on by default.
-  */
-  void __verbose_terminate_handler ();
-} // namespace __gnu_cxx
-  
-} // extern "C++"
-
-#endif
diff --git a/include.new/c++/3.4/exception_defines.h b/include.new/c++/3.4/exception_defines.h
deleted file mode 100644
index 1466486..0000000
--- a/include.new/c++/3.4/exception_defines.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -fno-exceptions Support -*- C++ -*-
-
-// Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 19.1  Exception classes
-//
-
-#ifndef _EXCEPTION_DEFINES_H
-#define _EXCEPTION_DEFINES_H 1
-
-#ifndef __EXCEPTIONS
-// Iff -fno-exceptions, transform error handling code to work without it.
-# define try      if (true)
-# define catch(X) if (false)
-# define __throw_exception_again
-#else
-// Else proceed normally.
-# define __throw_exception_again throw
-#endif
-
-#endif
diff --git a/include.new/c++/3.4/ext/algorithm b/include.new/c++/3.4/ext/algorithm
deleted file mode 100644
index 07ac4cb..0000000
--- a/include.new/c++/3.4/ext/algorithm
+++ /dev/null
@@ -1,518 +0,0 @@
-// Algorithm extensions -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/algorithm
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _EXT_ALGORITHM
-#define _EXT_ALGORITHM 1
-
-#pragma GCC system_header
-
-#include <algorithm>
-
-namespace __gnu_cxx
-{
-  using std::ptrdiff_t;
-  using std::min;
-  using std::pair;
-  using std::input_iterator_tag;
-  using std::random_access_iterator_tag;
-  using std::iterator_traits;
-
-  //--------------------------------------------------
-  // copy_n (not part of the C++ standard)
-
-  template<typename _InputIterator, typename _Size, typename _OutputIterator>
-    pair<_InputIterator, _OutputIterator>
-    __copy_n(_InputIterator __first, _Size __count,
-	     _OutputIterator __result,
-	     input_iterator_tag)
-    {
-      for ( ; __count > 0; --__count) {
-	*__result = *__first;
-	++__first;
-	++__result;
-      }
-      return pair<_InputIterator, _OutputIterator>(__first, __result);
-    }
-
-  template<typename _RAIterator, typename _Size, typename _OutputIterator>
-    inline pair<_RAIterator, _OutputIterator>
-    __copy_n(_RAIterator __first, _Size __count,
-	     _OutputIterator __result,
-	     random_access_iterator_tag)
-    {
-      _RAIterator __last = __first + __count;
-      return pair<_RAIterator, _OutputIterator>(__last,
-					std::copy(__first, __last, __result));
-    }
-
-  /**
-   *  @brief Copies the range [first,first+count) into [result,result+count).
-   *  @param  first  An input iterator.
-   *  @param  count  The number of elements to copy.
-   *  @param  result An output iterator.
-   *  @return   A std::pair composed of first+count and result+count.
-   *
-   *  This is an SGI extension.
-   *  This inline function will boil down to a call to @c memmove whenever
-   *  possible.  Failing that, if random access iterators are passed, then the
-   *  loop count will be known (and therefore a candidate for compiler
-   *  optimizations such as unrolling).
-   *  @ingroup SGIextensions
-  */
-  template<typename _InputIterator, typename _Size, typename _OutputIterator>
-    inline pair<_InputIterator, _OutputIterator>
-    copy_n(_InputIterator __first, _Size __count, _OutputIterator __result)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-	    typename iterator_traits<_InputIterator>::value_type>)
-
-      return __copy_n(__first, __count, __result,
-		      std::__iterator_category(__first));
-    }
-
-  template<typename _InputIterator1, typename _InputIterator2>
-    int
-    __lexicographical_compare_3way(_InputIterator1 __first1, _InputIterator1 __last1,
-				   _InputIterator2 __first2, _InputIterator2 __last2)
-    {
-      while (__first1 != __last1 && __first2 != __last2) {
-	if (*__first1 < *__first2)
-	  return -1;
-	if (*__first2 < *__first1)
-	  return 1;
-	++__first1;
-	++__first2;
-      }
-      if (__first2 == __last2) {
-	return !(__first1 == __last1);
-      }
-      else {
-	return -1;
-      }
-    }
-
-  inline int
-  __lexicographical_compare_3way(const unsigned char* __first1,
-				 const unsigned char* __last1,
-				 const unsigned char* __first2,
-				 const unsigned char* __last2)
-  {
-    const ptrdiff_t __len1 = __last1 - __first1;
-    const ptrdiff_t __len2 = __last2 - __first2;
-    const int __result = std::memcmp(__first1, __first2, min(__len1, __len2));
-    return __result != 0 ? __result
-			 : (__len1 == __len2 ? 0 : (__len1 < __len2 ? -1 : 1));
-  }
-
-  inline int
-  __lexicographical_compare_3way(const char* __first1, const char* __last1,
-				 const char* __first2, const char* __last2)
-  {
-#if CHAR_MAX == SCHAR_MAX
-    return __lexicographical_compare_3way(
-				  (const signed char*) __first1,
-				  (const signed char*) __last1,
-				  (const signed char*) __first2,
-				  (const signed char*) __last2);
-#else
-    return __lexicographical_compare_3way((const unsigned char*) __first1,
-					  (const unsigned char*) __last1,
-					  (const unsigned char*) __first2,
-					  (const unsigned char*) __last2);
-#endif
-  }
-
-  /**
-   *  @brief @c memcmp on steroids.
-   *  @param  first1  An input iterator.
-   *  @param  last1   An input iterator.
-   *  @param  first2  An input iterator.
-   *  @param  last2   An input iterator.
-   *  @return   An int, as with @c memcmp.
-   *
-   *  The return value will be less than zero if the first range is
-   *  "lexigraphically less than" the second, greater than zero if the second
-   *  range is "lexigraphically less than" the first, and zero otherwise.
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-  */
-  template<typename _InputIterator1, typename _InputIterator2>
-    int
-    lexicographical_compare_3way(_InputIterator1 __first1, _InputIterator1 __last1,
-				 _InputIterator2 __first2, _InputIterator2 __last2)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator1>)
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator2>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator1>::value_type>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_InputIterator2>::value_type>)
-      __glibcxx_requires_valid_range(__first1, __last1);
-      __glibcxx_requires_valid_range(__first2, __last2);
-
-      return __lexicographical_compare_3way(__first1, __last1, __first2, __last2);
-    }
-
-  // count and count_if: this version, whose return type is void, was present
-  // in the HP STL, and is retained as an extension for backward compatibility.
-
-  template<typename _InputIterator, typename _Tp, typename _Size>
-    void
-    count(_InputIterator __first, _InputIterator __last,
-	  const _Tp& __value,
-	  _Size& __n)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_EqualityComparableConcept<
-	    typename iterator_traits<_InputIterator>::value_type >)
-      __glibcxx_function_requires(_EqualityComparableConcept<_Tp>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	if (*__first == __value)
-	  ++__n;
-    }
-
-  template<typename _InputIterator, typename _Predicate, typename _Size>
-    void
-    count_if(_InputIterator __first, _InputIterator __last,
-	     _Predicate __pred,
-	     _Size& __n)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_UnaryPredicateConcept<_Predicate,
-	    typename iterator_traits<_InputIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      for ( ; __first != __last; ++__first)
-	if (__pred(*__first))
-	  ++__n;
-    }
-
-  // random_sample and random_sample_n (extensions, not part of the standard).
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _ForwardIterator, typename _OutputIterator, typename _Distance>
-    _OutputIterator
-    random_sample_n(_ForwardIterator __first, _ForwardIterator __last,
-                    _OutputIterator __out, const _Distance __n)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      _Distance __remaining = std::distance(__first, __last);
-      _Distance __m = min(__n, __remaining);
-
-      while (__m > 0) {
-	if ((std::rand() % __remaining) < __m) {
-	      *__out = *__first;
-	      ++__out;
-	      --__m;
-	}
-
-	--__remaining;
-	++__first;
-      }
-      return __out;
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _ForwardIterator, typename _OutputIterator, typename _Distance,
-	   typename _RandomNumberGenerator>
-    _OutputIterator
-    random_sample_n(_ForwardIterator __first, _ForwardIterator __last,
-                   _OutputIterator __out, const _Distance __n,
-		   _RandomNumberGenerator& __rand)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator,
-		typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_function_requires(_UnaryFunctionConcept<
-		_RandomNumberGenerator, _Distance, _Distance>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      _Distance __remaining = std::distance(__first, __last);
-      _Distance __m = min(__n, __remaining);
-
-      while (__m > 0) {
-	if (__rand(__remaining) < __m) {
-	      *__out = *__first;
-	      ++__out;
-	      --__m;
-	}
-
-	--__remaining;
-	++__first;
-      }
-      return __out;
-    }
-
-  template<typename _InputIterator, typename _RandomAccessIterator, typename _Distance>
-    _RandomAccessIterator
-    __random_sample(_InputIterator __first, _InputIterator __last,
-		    _RandomAccessIterator __out,
-		    const _Distance __n)
-    {
-      _Distance __m = 0;
-      _Distance __t = __n;
-      for ( ; __first != __last && __m < __n; ++__m, ++__first)
-	__out[__m] = *__first;
-
-      while (__first != __last) {
-	++__t;
-	_Distance __M = std::rand() % (__t);
-	if (__M < __n)
-	  __out[__M] = *__first;
-	++__first;
-      }
-
-      return __out + __m;
-    }
-
-  template<typename _InputIterator, typename _RandomAccessIterator,
-	   typename _RandomNumberGenerator, typename _Distance>
-    _RandomAccessIterator
-    __random_sample(_InputIterator __first, _InputIterator __last,
-		    _RandomAccessIterator __out,
-		    _RandomNumberGenerator& __rand,
-		    const _Distance __n)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_UnaryFunctionConcept<
-	    _RandomNumberGenerator, _Distance, _Distance>)
-
-      _Distance __m = 0;
-      _Distance __t = __n;
-      for ( ; __first != __last && __m < __n; ++__m, ++__first)
-	__out[__m] = *__first;
-
-      while (__first != __last) {
-	++__t;
-	_Distance __M = __rand(__t);
-	if (__M < __n)
-	  __out[__M] = *__first;
-	++__first;
-      }
-
-      return __out + __m;
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _InputIterator, typename _RandomAccessIterator>
-    inline _RandomAccessIterator
-    random_sample(_InputIterator __first, _InputIterator __last,
-		  _RandomAccessIterator __out_first, _RandomAccessIterator __out_last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_valid_range(__out_first, __out_last);
-
-      return __random_sample(__first, __last,
-			     __out_first, __out_last - __out_first);
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _InputIterator, typename _RandomAccessIterator,
-	   typename _RandomNumberGenerator>
-    inline _RandomAccessIterator
-    random_sample(_InputIterator __first, _InputIterator __last,
-		  _RandomAccessIterator __out_first, _RandomAccessIterator __out_last,
-		  _RandomNumberGenerator& __rand)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      __glibcxx_function_requires(_Mutable_RandomAccessIteratorConcept<
-	    _RandomAccessIterator>)
-      __glibcxx_requires_valid_range(__first, __last);
-      __glibcxx_requires_valid_range(__out_first, __out_last);
-
-      return __random_sample(__first, __last,
-			     __out_first, __rand,
-			     __out_last - __out_first);
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _RandomAccessIterator>
-    inline bool
-    is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__is_heap(__first, __last - __first);
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _RandomAccessIterator, typename _StrictWeakOrdering>
-    inline bool
-    is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	    _StrictWeakOrdering __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering,
-	    typename iterator_traits<_RandomAccessIterator>::value_type,
-	    typename iterator_traits<_RandomAccessIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      return std::__is_heap(__first, __comp, __last - __first);
-    }
-
-  // is_sorted, a predicated testing whether a range is sorted in
-  // nondescending order.  This is an extension, not part of the C++
-  // standard.
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _ForwardIterator>
-    bool
-    is_sorted(_ForwardIterator __first, _ForwardIterator __last)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_LessThanComparableConcept<
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return true;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next) {
-	if (*__next < *__first)
-	  return false;
-      }
-
-      return true;
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _ForwardIterator, typename _StrictWeakOrdering>
-    bool
-    is_sorted(_ForwardIterator __first, _ForwardIterator __last, _StrictWeakOrdering __comp)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_ForwardIteratorConcept<_ForwardIterator>)
-      __glibcxx_function_requires(_BinaryPredicateConcept<_StrictWeakOrdering,
-	    typename iterator_traits<_ForwardIterator>::value_type,
-	    typename iterator_traits<_ForwardIterator>::value_type>)
-      __glibcxx_requires_valid_range(__first, __last);
-
-      if (__first == __last)
-	return true;
-
-      _ForwardIterator __next = __first;
-      for (++__next; __next != __last; __first = __next, ++__next) {
-	if (__comp(*__next, *__first))
-	  return false;
-      }
-
-      return true;
-    }
-} // namespace __gnu_cxx
-
-#endif /* _EXT_ALGORITHM */
diff --git a/include.new/c++/3.4/ext/bitmap_allocator.h b/include.new/c++/3.4/ext/bitmap_allocator.h
deleted file mode 100644
index 9a0d162..0000000
--- a/include.new/c++/3.4/ext/bitmap_allocator.h
+++ /dev/null
@@ -1,859 +0,0 @@
-// Bitmapped Allocator. -*- C++ -*-
-
-// Copyright (C) 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-
-
-#if !defined _BITMAP_ALLOCATOR_H
-#define _BITMAP_ALLOCATOR_H 1
-
-#include <cstddef>
-//For std::size_t, and ptrdiff_t.
-#include <utility>
-//For std::pair.
-#include <algorithm>
-//std::find_if, and std::lower_bound.
-#include <vector>
-//For the free list of exponentially growing memory blocks. At max,
-//size of the vector should be  not more than the number of bits in an
-//integer or an unsigned integer.
-#include <functional>
-//For greater_equal, and less_equal.
-#include <new>
-//For operator new.
-#include <bits/gthr.h>
-//For __gthread_mutex_t, __gthread_mutex_lock and __gthread_mutex_unlock.
-#include <ext/new_allocator.h>
-//For __gnu_cxx::new_allocator for std::vector.
-
-#include <cassert>
-#define NDEBUG
-
-//#define CHECK_FOR_ERRORS
-//#define __CPU_HAS_BACKWARD_BRANCH_PREDICTION
-
-namespace __gnu_cxx
-{
-  namespace {
-#if defined __GTHREADS
-    bool const __threads_enabled = __gthread_active_p();
-#endif
-
-  }
-
-#if defined __GTHREADS
-  class _Mutex {
-    __gthread_mutex_t _M_mut;
-    //Prevent Copying and assignment.
-    _Mutex (_Mutex const&);
-    _Mutex& operator= (_Mutex const&);
-  public:
-    _Mutex ()
-    {
-      if (__threads_enabled)
-	{
-#if !defined __GTHREAD_MUTEX_INIT
-	  __GTHREAD_MUTEX_INIT_FUNCTION(&_M_mut);
-#else
-	  __gthread_mutex_t __mtemp = __GTHREAD_MUTEX_INIT;
-	  _M_mut = __mtemp;
-#endif
-	}
-    }
-    ~_Mutex ()
-    {
-      //Gthreads does not define a Mutex Destruction Function.
-    }
-    __gthread_mutex_t *_M_get() { return &_M_mut; }
-  };
-
-  class _Lock {
-    _Mutex* _M_pmt;
-    bool _M_locked;
-    //Prevent Copying and assignment.
-    _Lock (_Lock const&);
-    _Lock& operator= (_Lock const&);
-  public:
-    _Lock(_Mutex* __mptr)
-      : _M_pmt(__mptr), _M_locked(false)
-    { this->_M_lock(); }
-    void _M_lock()
-    {
-      if (__threads_enabled)
-	{
-	  _M_locked = true;
-	  __gthread_mutex_lock(_M_pmt->_M_get());
-	}
-    }
-    void _M_unlock()
-    {
-      if (__threads_enabled)
-	{
-	  if (__builtin_expect(_M_locked, true))
-	    {
-	      __gthread_mutex_unlock(_M_pmt->_M_get());
-	      _M_locked = false;
-	    }
-	}
-    }
-    ~_Lock() { this->_M_unlock(); }
-  };
-#endif
-
-
-
-  namespace __aux_balloc {
-    static const unsigned int _Bits_Per_Byte = 8;
-    static const unsigned int _Bits_Per_Block = sizeof(unsigned int) * _Bits_Per_Byte;
-
-    template <typename _Addr_Pair_t>
-    inline size_t __balloc_num_blocks (_Addr_Pair_t __ap)
-    {
-      return (__ap.second - __ap.first) + 1;
-    }
-
-    template <typename _Addr_Pair_t>
-    inline size_t __balloc_num_bit_maps (_Addr_Pair_t __ap)
-    {
-      return __balloc_num_blocks(__ap) / _Bits_Per_Block;
-    }
-
-    //T should be a pointer type.
-    template <typename _Tp>
-    class _Inclusive_between : public std::unary_function<typename std::pair<_Tp, _Tp>, bool> {
-      typedef _Tp pointer;
-      pointer _M_ptr_value;
-      typedef typename std::pair<_Tp, _Tp> _Block_pair;
-
-    public:
-      _Inclusive_between (pointer __ptr) : _M_ptr_value(__ptr) { }
-      bool operator () (_Block_pair __bp) const throw ()
-      {
-	if (std::less_equal<pointer> ()(_M_ptr_value, __bp.second) && 
-	    std::greater_equal<pointer> ()(_M_ptr_value, __bp.first))
-	  return true;
-	else
-	  return false;
-      }
-    };
-  
-    //Used to pass a Functor to functions by reference.
-    template <typename _Functor>
-    class _Functor_Ref : 
-      public std::unary_function<typename _Functor::argument_type, typename _Functor::result_type> {
-      _Functor& _M_fref;
-    
-    public:
-      typedef typename _Functor::argument_type argument_type;
-      typedef typename _Functor::result_type result_type;
-
-      _Functor_Ref (_Functor& __fref) : _M_fref(__fref) { }
-      result_type operator() (argument_type __arg) { return _M_fref (__arg); }
-    };
-
-
-    //T should be a pointer type, and A is the Allocator for the vector.
-    template <typename _Tp, typename _Alloc>
-    class _Ffit_finder 
-      : public std::unary_function<typename std::pair<_Tp, _Tp>, bool> {
-      typedef typename std::vector<std::pair<_Tp, _Tp>, _Alloc> _BPVector;
-      typedef typename _BPVector::difference_type _Counter_type;
-      typedef typename std::pair<_Tp, _Tp> _Block_pair;
-
-      unsigned int *_M_pbitmap;
-      unsigned int _M_data_offset;
-
-    public:
-      _Ffit_finder () 
-	: _M_pbitmap (0), _M_data_offset (0)
-      { }
-
-      bool operator() (_Block_pair __bp) throw()
-      {
-	//Set the _rover to the last unsigned integer, which is the
-	//bitmap to the first free block. Thus, the bitmaps are in exact
-	//reverse order of the actual memory layout. So, we count down
-	//the bimaps, which is the same as moving up the memory.
-
-	//If the used count stored at the start of the Bit Map headers
-	//is equal to the number of Objects that the current Block can
-	//store, then there is definitely no space for another single
-	//object, so just return false.
-	_Counter_type __diff = __gnu_cxx::__aux_balloc::__balloc_num_bit_maps (__bp);
-
-	assert (*(reinterpret_cast<unsigned int*>(__bp.first) - (__diff + 1)) <= 
-		__gnu_cxx::__aux_balloc::__balloc_num_blocks (__bp));
-
-	if (*(reinterpret_cast<unsigned int*>(__bp.first) - (__diff + 1)) == 
-	    __gnu_cxx::__aux_balloc::__balloc_num_blocks (__bp))
-	  return false;
-
-	unsigned int *__rover = reinterpret_cast<unsigned int*>(__bp.first) - 1;
-	for (_Counter_type __i = 0; __i < __diff; ++__i)
-	  {
-	    _M_data_offset = __i;
-	    if (*__rover)
-	      {
-		_M_pbitmap = __rover;
-		return true;
-	      }
-	    --__rover;
-	  }
-	return false;
-      }
-    
-      unsigned int *_M_get () { return _M_pbitmap; }
-      unsigned int _M_offset () { return _M_data_offset * _Bits_Per_Block; }
-    };
-  
-    //T should be a pointer type.
-    template <typename _Tp, typename _Alloc>
-    class _Bit_map_counter {
-    
-      typedef typename std::vector<std::pair<_Tp, _Tp>, _Alloc> _BPVector;
-      typedef typename _BPVector::size_type _Index_type;
-      typedef _Tp pointer;
-    
-      _BPVector& _M_vbp;
-      unsigned int *_M_curr_bmap;
-      unsigned int *_M_last_bmap_in_block;
-      _Index_type _M_curr_index;
-    
-    public:
-      //Use the 2nd parameter with care. Make sure that such an entry
-      //exists in the vector before passing that particular index to
-      //this ctor.
-      _Bit_map_counter (_BPVector& Rvbp, int __index = -1) 
-	: _M_vbp(Rvbp)
-      {
-	this->_M_reset(__index);
-      }
-    
-      void _M_reset (int __index = -1) throw()
-      {
-	if (__index == -1)
-	  {
-	    _M_curr_bmap = 0;
-	    _M_curr_index = (_Index_type)-1;
-	    return;
-	  }
-
-	_M_curr_index = __index;
-	_M_curr_bmap = reinterpret_cast<unsigned int*>(_M_vbp[_M_curr_index].first) - 1;
-
-	assert (__index <= (int)_M_vbp.size() - 1);
-	
-	_M_last_bmap_in_block = _M_curr_bmap - 
-	  ((_M_vbp[_M_curr_index].second - _M_vbp[_M_curr_index].first + 1) / _Bits_Per_Block - 1);
-      }
-    
-      //Dangerous Function! Use with extreme care. Pass to this
-      //function ONLY those values that are known to be correct,
-      //otherwise this will mess up big time.
-      void _M_set_internal_bit_map (unsigned int *__new_internal_marker) throw()
-      {
-	_M_curr_bmap = __new_internal_marker;
-      }
-    
-      bool _M_finished () const throw()
-      {
-	return (_M_curr_bmap == 0);
-      }
-    
-      _Bit_map_counter& operator++ () throw()
-      {
-	if (_M_curr_bmap == _M_last_bmap_in_block)
-	  {
-	    if (++_M_curr_index == _M_vbp.size())
-	      {
-		_M_curr_bmap = 0;
-	      }
-	    else
-	      {
-		this->_M_reset (_M_curr_index);
-	      }
-	  }
-	else
-	  {
-	    --_M_curr_bmap;
-	  }
-	return *this;
-      }
-    
-      unsigned int *_M_get ()
-      {
-	return _M_curr_bmap;
-      }
-    
-      pointer _M_base () { return _M_vbp[_M_curr_index].first; }
-      unsigned int _M_offset ()
-      {
-	return _Bits_Per_Block * ((reinterpret_cast<unsigned int*>(this->_M_base()) - _M_curr_bmap) - 1);
-      }
-    
-      unsigned int _M_where () { return _M_curr_index; }
-    };
-  }
-
-  //Generic Version of the bsf instruction.
-  typedef unsigned int _Bit_map_type;
-  static inline unsigned int _Bit_scan_forward (register _Bit_map_type __num)
-  {
-    return static_cast<unsigned int>(__builtin_ctz(__num));
-  }
-
-  struct _OOM_handler {
-    static std::new_handler _S_old_handler;
-    static bool _S_handled_oom;
-    typedef void (*_FL_clear_proc)(void);
-    static _FL_clear_proc _S_oom_fcp;
-    
-    _OOM_handler (_FL_clear_proc __fcp)
-    {
-      _S_oom_fcp = __fcp;
-      _S_old_handler = std::set_new_handler (_S_handle_oom_proc);
-      _S_handled_oom = false;
-    }
-
-    static void _S_handle_oom_proc()
-    {
-      _S_oom_fcp();
-      std::set_new_handler (_S_old_handler);
-      _S_handled_oom = true;
-    }
-
-    ~_OOM_handler ()
-    {
-      if (!_S_handled_oom)
-	std::set_new_handler (_S_old_handler);
-    }
-  };
-  
-  std::new_handler _OOM_handler::_S_old_handler;
-  bool _OOM_handler::_S_handled_oom = false;
-  _OOM_handler::_FL_clear_proc _OOM_handler::_S_oom_fcp = 0;
-  
-
-  class _BA_free_list_store {
-    struct _LT_pointer_compare {
-      template <typename _Tp>
-      bool operator() (_Tp* __pt, _Tp const& __crt) const throw()
-      {
-	return *__pt < __crt;
-      }
-    };
-
-#if defined __GTHREADS
-    static _Mutex _S_bfl_mutex;
-#endif
-    static std::vector<unsigned int*> _S_free_list;
-    typedef std::vector<unsigned int*>::iterator _FLIter;
-
-    static void _S_validate_free_list(unsigned int *__addr) throw()
-    {
-      const unsigned int __max_size = 64;
-      if (_S_free_list.size() >= __max_size)
-	{
-	  //Ok, the threshold value has been reached.
-	  //We determine which block to remove from the list of free
-	  //blocks.
-	  if (*__addr >= *_S_free_list.back())
-	    {
-	      //Ok, the new block is greater than or equal to the last
-	      //block in the list of free blocks. We just free the new
-	      //block.
-	      operator delete((void*)__addr);
-	      return;
-	    }
-	  else
-	    {
-	      //Deallocate the last block in the list of free lists, and
-	      //insert the new one in it's correct position.
-	      operator delete((void*)_S_free_list.back());
-	      _S_free_list.pop_back();
-	    }
-	}
-	  
-      //Just add the block to the list of free lists
-      //unconditionally.
-      _FLIter __temp = std::lower_bound(_S_free_list.begin(), _S_free_list.end(), 
-					*__addr, _LT_pointer_compare ());
-      //We may insert the new free list before _temp;
-      _S_free_list.insert(__temp, __addr);
-    }
-
-    static bool _S_should_i_give(unsigned int __block_size, unsigned int __required_size) throw()
-    {
-      const unsigned int __max_wastage_percentage = 36;
-      if (__block_size >= __required_size && 
-	  (((__block_size - __required_size) * 100 / __block_size) < __max_wastage_percentage))
-	return true;
-      else
-	return false;
-    }
-
-  public:
-    typedef _BA_free_list_store _BFL_type;
-
-    static inline void _S_insert_free_list(unsigned int *__addr) throw()
-    {
-#if defined __GTHREADS
-      _Lock __bfl_lock(&_S_bfl_mutex);
-#endif
-      //Call _S_validate_free_list to decide what should be done with this
-      //particular free list.
-      _S_validate_free_list(--__addr);
-    }
-    
-    static unsigned int *_S_get_free_list(unsigned int __sz) throw (std::bad_alloc)
-    {
-#if defined __GTHREADS
-      _Lock __bfl_lock(&_S_bfl_mutex);
-#endif
-      _FLIter __temp = std::lower_bound(_S_free_list.begin(), _S_free_list.end(), 
-					__sz, _LT_pointer_compare());
-      if (__temp == _S_free_list.end() || !_S_should_i_give (**__temp, __sz))
-	{
-	  //We hold the lock because the OOM_Handler is a stateless
-	  //entity.
-	  _OOM_handler __set_handler(_BFL_type::_S_clear);
-	  unsigned int *__ret_val = reinterpret_cast<unsigned int*>
-	    (operator new (__sz + sizeof(unsigned int)));
-	  *__ret_val = __sz;
-	  return ++__ret_val;
-	}
-      else
-	{
-	  unsigned int* __ret_val = *__temp;
-	  _S_free_list.erase (__temp);
-	  return ++__ret_val;
-	}
-    }
-
-    //This function just clears the internal Free List, and gives back
-    //all the memory to the OS.
-    static void _S_clear()
-    {
-#if defined __GTHREADS
-      _Lock __bfl_lock(&_S_bfl_mutex);
-#endif
-      _FLIter __iter = _S_free_list.begin();
-      while (__iter != _S_free_list.end())
-	{
-	  operator delete((void*)*__iter);
-	  ++__iter;
-	}
-      _S_free_list.clear();
-    }
-
-  };
-
-#if defined __GTHREADS
-  _Mutex _BA_free_list_store::_S_bfl_mutex;
-#endif
-  std::vector<unsigned int*> _BA_free_list_store::_S_free_list;
-
-  template <typename _Tp> class bitmap_allocator;
-  // specialize for void:
-  template <> class bitmap_allocator<void> {
-  public:
-    typedef void*       pointer;
-    typedef const void* const_pointer;
-    //  reference-to-void members are impossible.
-    typedef void  value_type;
-    template <typename _Tp1> struct rebind { typedef bitmap_allocator<_Tp1> other; };
-  };
-
-  template <typename _Tp> class bitmap_allocator : private _BA_free_list_store {
-  public:
-    typedef size_t    size_type;
-    typedef ptrdiff_t difference_type;
-    typedef _Tp*        pointer;
-    typedef const _Tp*  const_pointer;
-    typedef _Tp&        reference;
-    typedef const _Tp&  const_reference;
-    typedef _Tp         value_type;
-    template <typename _Tp1> struct rebind { typedef bitmap_allocator<_Tp1> other; };
-
-  private:
-    static const unsigned int _Bits_Per_Byte = 8;
-    static const unsigned int _Bits_Per_Block = sizeof(unsigned int) * _Bits_Per_Byte;
-
-    static inline void _S_bit_allocate(unsigned int *__pbmap, unsigned int __pos) throw()
-    {
-      unsigned int __mask = 1 << __pos;
-      __mask = ~__mask;
-      *__pbmap &= __mask;
-    }
-  
-    static inline void _S_bit_free(unsigned int *__pbmap, unsigned int __pos) throw()
-    {
-      unsigned int __mask = 1 << __pos;
-      *__pbmap |= __mask;
-    }
-
-    static inline void *_S_memory_get(size_t __sz) throw (std::bad_alloc)
-    {
-      return operator new(__sz);
-    }
-
-    static inline void _S_memory_put(void *__vptr) throw ()
-    {
-      operator delete(__vptr);
-    }
-
-    typedef typename std::pair<pointer, pointer> _Block_pair;
-    typedef typename __gnu_cxx::new_allocator<_Block_pair> _BPVec_allocator_type;
-    typedef typename std::vector<_Block_pair, _BPVec_allocator_type> _BPVector;
-
-
-#if defined CHECK_FOR_ERRORS
-    //Complexity: O(lg(N)). Where, N is the number of block of size
-    //sizeof(value_type).
-    static void _S_check_for_free_blocks() throw()
-    {
-      typedef typename __gnu_cxx::__aux_balloc::_Ffit_finder<pointer, _BPVec_allocator_type> _FFF;
-      _FFF __fff;
-      typedef typename _BPVector::iterator _BPiter;
-      _BPiter __bpi = std::find_if(_S_mem_blocks.begin(), _S_mem_blocks.end(), 
-				   __gnu_cxx::__aux_balloc::_Functor_Ref<_FFF>(__fff));
-      assert(__bpi == _S_mem_blocks.end());
-    }
-#endif
-
-
-    //Complexity: O(1), but internally depends upon the complexity of
-    //the function _BA_free_list_store::_S_get_free_list. The part
-    //where the bitmap headers are written is of worst case complexity:
-    //O(X),where X is the number of blocks of size sizeof(value_type)
-    //within the newly acquired block. Having a tight bound.
-    static void _S_refill_pool() throw (std::bad_alloc)
-    {
-#if defined CHECK_FOR_ERRORS
-      _S_check_for_free_blocks();
-#endif
-
-      const unsigned int __num_bit_maps = _S_block_size / _Bits_Per_Block;
-      const unsigned int __size_to_allocate = sizeof(unsigned int) + 
-	_S_block_size * sizeof(value_type) + __num_bit_maps*sizeof(unsigned int);
-
-      unsigned int *__temp = 
-	reinterpret_cast<unsigned int*>(_BA_free_list_store::_S_get_free_list(__size_to_allocate));
-      *__temp = 0;
-      ++__temp;
-
-      //The Header information goes at the Beginning of the Block.
-      _Block_pair __bp = std::make_pair(reinterpret_cast<pointer>(__temp + __num_bit_maps), 
-				       reinterpret_cast<pointer>(__temp + __num_bit_maps) 
-					+ _S_block_size - 1);
-
-      //Fill the Vector with this information.
-      _S_mem_blocks.push_back(__bp);
-
-      unsigned int __bit_mask = 0; //0 Indicates all Allocated.
-      __bit_mask = ~__bit_mask; //1 Indicates all Free.
-
-      for (unsigned int __i = 0; __i < __num_bit_maps; ++__i)
-	__temp[__i] = __bit_mask;
-
-      //On some implementations, operator new might throw bad_alloc, or
-      //malloc might fail if the size passed is too large, therefore, we
-      //limit the size passed to malloc or operator new.
-      _S_block_size *= 2;
-    }
-
-    static _BPVector _S_mem_blocks;
-    static unsigned int _S_block_size;
-    static __gnu_cxx::__aux_balloc::_Bit_map_counter<pointer, _BPVec_allocator_type> _S_last_request;
-    static typename _BPVector::size_type _S_last_dealloc_index;
-#if defined __GTHREADS
-    static _Mutex _S_mut;
-#endif
-
-    //Complexity: Worst case complexity is O(N), but that is hardly ever
-    //hit. if and when this particular case is encountered, the next few
-    //cases are guaranteed to have a worst case complexity of O(1)!
-    //That's why this function performs very well on the average. you
-    //can consider this function to be having a complexity refrred to
-    //commonly as: Amortized Constant time.
-    static pointer _S_allocate_single_object()
-    {
-#if defined __GTHREADS
-      _Lock __bit_lock(&_S_mut);
-#endif
-
-      //The algorithm is something like this: The last_requst variable
-      //points to the last accessed Bit Map. When such a condition
-      //occurs, we try to find a free block in the current bitmap, or
-      //succeeding bitmaps until the last bitmap is reached. If no free
-      //block turns up, we resort to First Fit method.
-
-      //WARNING: Do not re-order the condition in the while statement
-      //below, because it relies on C++'s short-circuit
-      //evaluation. The return from _S_last_request->_M_get() will NOT
-      //be dereferenceable if _S_last_request->_M_finished() returns
-      //true. This would inevitibly lead to a NULL pointer dereference
-      //if tinkered with.
-      while (_S_last_request._M_finished() == false && (*(_S_last_request._M_get()) == 0))
-	{
-	  _S_last_request.operator++();
-	}
-
-      if (__builtin_expect(_S_last_request._M_finished() == true, false))
-	{
-	  //Fall Back to First Fit algorithm.
-	  typedef typename __gnu_cxx::__aux_balloc::_Ffit_finder<pointer, _BPVec_allocator_type> _FFF;
-	  _FFF __fff;
-	  typedef typename _BPVector::iterator _BPiter;
-	  _BPiter __bpi = std::find_if(_S_mem_blocks.begin(), _S_mem_blocks.end(), 
-				      __gnu_cxx::__aux_balloc::_Functor_Ref<_FFF>(__fff));
-
-	  if (__bpi != _S_mem_blocks.end())
-	    {
-	      //Search was successful. Ok, now mark the first bit from
-	      //the right as 0, meaning Allocated. This bit is obtained
-	      //by calling _M_get() on __fff.
-	      unsigned int __nz_bit = _Bit_scan_forward(*__fff._M_get());
-	      _S_bit_allocate(__fff._M_get(), __nz_bit);
-
-	      _S_last_request._M_reset(__bpi - _S_mem_blocks.begin());
-
-	      //Now, get the address of the bit we marked as allocated.
-	      pointer __ret_val = __bpi->first + __fff._M_offset() + __nz_bit;
-	      unsigned int *__puse_count = reinterpret_cast<unsigned int*>(__bpi->first) - 
-		(__gnu_cxx::__aux_balloc::__balloc_num_bit_maps(*__bpi) + 1);
-	      ++(*__puse_count);
-	      return __ret_val;
-	    }
-	  else
-	    {
-	      //Search was unsuccessful. We Add more memory to the pool
-	      //by calling _S_refill_pool().
-	      _S_refill_pool();
-
-	      //_M_Reset the _S_last_request structure to the first free
-	      //block's bit map.
-	      _S_last_request._M_reset(_S_mem_blocks.size() - 1);
-
-	      //Now, mark that bit as allocated.
-	    }
-	}
-      //_S_last_request holds a pointer to a valid bit map, that points
-      //to a free block in memory.
-      unsigned int __nz_bit = _Bit_scan_forward(*_S_last_request._M_get());
-      _S_bit_allocate(_S_last_request._M_get(), __nz_bit);
-
-      pointer __ret_val = _S_last_request._M_base() + _S_last_request._M_offset() + __nz_bit;
-
-      unsigned int *__puse_count = reinterpret_cast<unsigned int*>
-	(_S_mem_blocks[_S_last_request._M_where()].first) - 
-	(__gnu_cxx::__aux_balloc::__balloc_num_bit_maps(_S_mem_blocks[_S_last_request._M_where()]) + 1);
-      ++(*__puse_count);
-      return __ret_val;
-    }
-
-    //Complexity: O(lg(N)), but the worst case is hit quite often! I
-    //need to do something about this. I'll be able to work on it, only
-    //when I have some solid figures from a few real apps.
-    static void _S_deallocate_single_object(pointer __p) throw()
-    {
-#if defined __GTHREADS
-      _Lock __bit_lock(&_S_mut);
-#endif
-
-      typedef typename _BPVector::iterator _Iterator;
-      typedef typename _BPVector::difference_type _Difference_type;
-
-      _Difference_type __diff;
-      int __displacement;
-
-      assert(_S_last_dealloc_index >= 0);
-
-      if (__gnu_cxx::__aux_balloc::_Inclusive_between<pointer>(__p)(_S_mem_blocks[_S_last_dealloc_index]))
-	{
-	  assert(_S_last_dealloc_index <= _S_mem_blocks.size() - 1);
-
-	  //Initial Assumption was correct!
-	  __diff = _S_last_dealloc_index;
-	  __displacement = __p - _S_mem_blocks[__diff].first;
-	}
-      else
-	{
-	  _Iterator _iter = (std::find_if(_S_mem_blocks.begin(), _S_mem_blocks.end(), 
-					  __gnu_cxx::__aux_balloc::_Inclusive_between<pointer>(__p)));
-	  assert(_iter != _S_mem_blocks.end());
-
-	  __diff = _iter - _S_mem_blocks.begin();
-	  __displacement = __p - _S_mem_blocks[__diff].first;
-	  _S_last_dealloc_index = __diff;
-	}
-
-      //Get the position of the iterator that has been found.
-      const unsigned int __rotate = __displacement % _Bits_Per_Block;
-      unsigned int *__bit_mapC = reinterpret_cast<unsigned int*>(_S_mem_blocks[__diff].first) - 1;
-      __bit_mapC -= (__displacement / _Bits_Per_Block);
-      
-      _S_bit_free(__bit_mapC, __rotate);
-      unsigned int *__puse_count = reinterpret_cast<unsigned int*>
-	(_S_mem_blocks[__diff].first) - 
-	(__gnu_cxx::__aux_balloc::__balloc_num_bit_maps(_S_mem_blocks[__diff]) + 1);
-
-      assert(*__puse_count != 0);
-
-      --(*__puse_count);
-
-      if (__builtin_expect(*__puse_count == 0, false))
-	{
-	  _S_block_size /= 2;
-	  
-	  //We may safely remove this block.
-	  _Block_pair __bp = _S_mem_blocks[__diff];
-	  _S_insert_free_list(__puse_count);
-	  _S_mem_blocks.erase(_S_mem_blocks.begin() + __diff);
-
-	  //We reset the _S_last_request variable to reflect the erased
-	  //block. We do this to protect future requests after the last
-	  //block has been removed from a particular memory Chunk,
-	  //which in turn has been returned to the free list, and
-	  //hence had been erased from the vector, so the size of the
-	  //vector gets reduced by 1.
-	  if ((_Difference_type)_S_last_request._M_where() >= __diff--)
-	    {
-	      _S_last_request._M_reset(__diff);
-	      //	      assert(__diff >= 0);
-	    }
-
-	  //If the Index into the vector of the region of memory that
-	  //might hold the next address that will be passed to
-	  //deallocated may have been invalidated due to the above
-	  //erase procedure being called on the vector, hence we try
-	  //to restore this invariant too.
-	  if (_S_last_dealloc_index >= _S_mem_blocks.size())
-	    {
-	      _S_last_dealloc_index =(__diff != -1 ? __diff : 0);
-	      assert(_S_last_dealloc_index >= 0);
-	    }
-	}
-    }
-
-  public:
-    bitmap_allocator() throw()
-    { }
-
-    bitmap_allocator(const bitmap_allocator&) { }
-
-    template <typename _Tp1> bitmap_allocator(const bitmap_allocator<_Tp1>&) throw()
-    { }
-
-    ~bitmap_allocator() throw()
-    { }
-
-    //Complexity: O(1), but internally the complexity depends upon the
-    //complexity of the function(s) _S_allocate_single_object and
-    //_S_memory_get.
-    pointer allocate(size_type __n)
-    {
-      if (__builtin_expect(__n == 1, true))
-	return _S_allocate_single_object();
-      else
-	return reinterpret_cast<pointer>(_S_memory_get(__n * sizeof(value_type)));
-    }
-
-    //Complexity: Worst case complexity is O(N) where N is the number of
-    //blocks of size sizeof(value_type) within the free lists that the
-    //allocator holds. However, this worst case is hit only when the
-    //user supplies a bogus argument to hint. If the hint argument is
-    //sensible, then the complexity drops to O(lg(N)), and in extreme
-    //cases, even drops to as low as O(1). So, if the user supplied
-    //argument is good, then this function performs very well.
-    pointer allocate(size_type __n, typename bitmap_allocator<void>::const_pointer)
-    {
-      return allocate(__n);
-    }
-
-    void deallocate(pointer __p, size_type __n) throw()
-    {
-      if (__builtin_expect(__n == 1, true))
-	_S_deallocate_single_object(__p);
-      else
-	_S_memory_put(__p);
-    }
-
-    pointer address(reference r) const { return &r; }
-    const_pointer address(const_reference r) const { return &r; }
-
-    size_type max_size(void) const throw() { return (size_type()-1)/sizeof(value_type); }
-
-    void construct (pointer p, const_reference __data)
-    {
-      ::new(p) value_type(__data);
-    }
-
-    void destroy (pointer p)
-    {
-      p->~value_type();
-    }
-
-  };
-
-  template <typename _Tp>
-  typename bitmap_allocator<_Tp>::_BPVector bitmap_allocator<_Tp>::_S_mem_blocks;
-
-  template <typename _Tp>
-  unsigned int bitmap_allocator<_Tp>::_S_block_size = bitmap_allocator<_Tp>::_Bits_Per_Block;
-
-  template <typename _Tp>
-  typename __gnu_cxx::bitmap_allocator<_Tp>::_BPVector::size_type 
-  bitmap_allocator<_Tp>::_S_last_dealloc_index = 0;
-
-  template <typename _Tp>
-  __gnu_cxx::__aux_balloc::_Bit_map_counter 
-  <typename bitmap_allocator<_Tp>::pointer, typename bitmap_allocator<_Tp>::_BPVec_allocator_type> 
-  bitmap_allocator<_Tp>::_S_last_request(_S_mem_blocks);
-
-#if defined __GTHREADS
-  template <typename _Tp>
-  __gnu_cxx::_Mutex
-  bitmap_allocator<_Tp>::_S_mut;
-#endif
-
-  template <typename _Tp1, typename _Tp2>
-  bool operator== (const bitmap_allocator<_Tp1>&, const bitmap_allocator<_Tp2>&) throw()
-  {
-    return true;
-  }
-  
-  template <typename _Tp1, typename _Tp2>
-  bool operator!= (const bitmap_allocator<_Tp1>&, const bitmap_allocator<_Tp2>&) throw()
-  {
-    return false;
-  }
-}
-
-
-#endif //_BITMAP_ALLOCATOR_H
diff --git a/include.new/c++/3.4/ext/debug_allocator.h b/include.new/c++/3.4/ext/debug_allocator.h
deleted file mode 100644
index 7ea6fb4..0000000
--- a/include.new/c++/3.4/ext/debug_allocator.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Allocators -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996-1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/debug_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- *  You should only include this header if you are using GCC 3 or later.
- */
-
-#ifndef _DEBUG_ALLOCATOR_H
-#define _DEBUG_ALLOCATOR_H 1
-
-#include <cstdlib>
-
-namespace __gnu_cxx
-{
-  /**
-   *  @brief  A meta-allocator with debugging bits, as per [20.4].
-   *
-   *  This is precisely the allocator defined in the C++ Standard. 
-   *    - all allocation calls operator new
-   *    - all deallocation calls operator delete
-   *
-   *  (See @link Allocators allocators info @endlink for more.)
-   */
-  template<typename _Alloc>
-    class debug_allocator
-    {
-    public:
-      typedef typename _Alloc::size_type       	size_type;
-      typedef typename _Alloc::difference_type	difference_type;
-      typedef typename _Alloc::pointer       	pointer;
-      typedef typename _Alloc::const_pointer    const_pointer;
-      typedef typename _Alloc::reference       	reference;
-      typedef typename _Alloc::const_reference  const_reference;
-      typedef typename _Alloc::value_type       value_type;
-
-    private:
-      // _M_extra is the number of objects that correspond to the
-      // extra space where debug information is stored.
-      size_type 		_M_extra;
-      
-      _Alloc			_M_allocator;
-
-    public:
-      debug_allocator()
-      {
-	const size_t __obj_size = sizeof(value_type);
-	_M_extra = (sizeof(size_type) + __obj_size - 1) / __obj_size; 
-      }
-      
-      pointer
-      allocate(size_type __n)
-      {
-        pointer __res = _M_allocator.allocate(__n + _M_extra);      
-	size_type* __ps = reinterpret_cast<size_type*>(__res);
-	*__ps = __n;
-        return __res + _M_extra;
-      }
-
-      pointer
-      allocate(size_type __n, const void* __hint)
-      {
-        pointer __res = _M_allocator.allocate(__n + _M_extra, __hint);
-	size_type* __ps = reinterpret_cast<size_type*>(__res);
-	*__ps = __n;
-        return __res + _M_extra;
-      }
-
-      void
-      deallocate(pointer __p, size_type __n)
-      {
-	if (!__p)
-	  abort();
-	pointer __real_p = __p - _M_extra;
-        if (*reinterpret_cast<size_type*>(__real_p) != __n)
-          abort();
-        _M_allocator.deallocate(__real_p, __n + _M_extra);
-      }
-    };
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/ext/demangle.h b/include.new/c++/3.4/ext/demangle.h
deleted file mode 100644
index 5de4f04..0000000
--- a/include.new/c++/3.4/ext/demangle.h
+++ /dev/null
@@ -1,2789 +0,0 @@
-// C++ IA64 / g++ v3 demangler  -*- C++ -*-
-
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-// Written by Carlo Wood <carlo@alinoe.com>
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// This file implements demangling of "C++ ABI for Itanium"-mangled symbol
-// and type names as described in Revision 1.73 of the C++ ABI as can be found
-// at http://www.codesourcery.com/cxx-abi/abi.html#mangling
-
-#ifndef _DEMANGLER_H
-#define _DEMANGLER_H 1
-
-#include <vector>
-#include <string>
-#include <ext/new_allocator.h>
-
-#ifndef _GLIBCXX_DEMANGLER_DEBUG
-#define _GLIBCXX_DEMANGLER_CWDEBUG 0
-#define _GLIBCXX_DEMANGLER_DEBUG(x)
-#define _GLIBCXX_DEMANGLER_DOUT(cntrl, data)
-#define _GLIBCXX_DEMANGLER_DOUT_ENTERING(x)
-#define _GLIBCXX_DEMANGLER_DOUT_ENTERING2(x)
-#define _GLIBCXX_DEMANGLER_DOUT_ENTERING3(x)
-#define _GLIBCXX_DEMANGLER_RETURN return M_result
-#define _GLIBCXX_DEMANGLER_RETURN2 return M_result
-#define _GLIBCXX_DEMANGLER_RETURN3
-#define _GLIBCXX_DEMANGLER_FAILURE \
-    do { M_result = false; return false; } while(0)
-#else
-#define _GLIBCXX_DEMANGLER_CWDEBUG 1
-#endif
-
-namespace __gnu_cxx
-{
-  namespace demangler
-  {
-    enum substitution_nt
-    {
-      type,
-      template_template_param,
-      nested_name_prefix,
-      nested_name_template_prefix,
-      unscoped_template_name
-    };
-
-    struct substitution_st
-    {
-      int M_start_pos;
-      substitution_nt M_type;
-      int M_number_of_prefixes;
-
-      substitution_st(int start_pos,
-		      substitution_nt type,
-		      int number_of_prefixes)
-      : M_start_pos(start_pos), M_type(type),
-	M_number_of_prefixes(number_of_prefixes)
-      { }
-    };
-
-    enum simple_qualifier_nt
-    {
-      complex_or_imaginary = 'G',
-      pointer = 'P',
-      reference = 'R'
-    };
-
-    enum cv_qualifier_nt
-    {
-      cv_qualifier = 'K'
-    };
-
-    enum param_qualifier_nt
-    {
-      vendor_extension = 'U',
-      array = 'A',
-      pointer_to_member = 'M'
-    };
-
-    template<typename Tp, typename Allocator = __gnu_cxx::new_allocator<Tp> >
-      class qualifier;
-
-    template<typename Tp, typename Allocator = __gnu_cxx::new_allocator<Tp> >
-      class qualifier_list;
-
-    template<typename Tp, typename Allocator = __gnu_cxx::new_allocator<Tp> >
-      class session;
-
-    template<typename Tp, typename Allocator>
-      class qualifier
-      {
-	typedef typename Allocator::template rebind<char>::other
-	        char_Allocator;
-	typedef std::basic_string<char, std::char_traits<char>, char_Allocator>
-	    string_type;
-
-      private:
-	char M_qualifier1;
-	char M_qualifier2;
-	char M_qualifier3;
-	mutable unsigned char M_cnt;
-	string_type M_optional_type;
-	int M_start_pos;
-	bool M_part_of_substitution;
-
-      public:
-	qualifier(int start_pos,
-	          simple_qualifier_nt simple_qualifier,
-		  int inside_substitution)
-	: M_qualifier1(simple_qualifier),
-	  M_start_pos(start_pos),
-	  M_part_of_substitution(inside_substitution)
-	{ }
-
-	qualifier(int start_pos,
-	          cv_qualifier_nt,
-		  char const* start,
-		  int count,
-		  int inside_substitution)
-	: M_qualifier1(start[0]),
-	  M_qualifier2((count > 1) ? start[1] : '\0'),
-	  M_qualifier3((count > 2) ? start[2] : '\0'),
-	  M_start_pos(start_pos),
-	  M_part_of_substitution(inside_substitution)
-	{ }
-
-	qualifier(int start_pos,
-	          param_qualifier_nt param_qualifier,
-		  string_type optional_type,
-		  int inside_substitution)
-	: M_qualifier1(param_qualifier),
-	  M_optional_type(optional_type),
-	  M_start_pos(start_pos),
-	  M_part_of_substitution(inside_substitution)
-	{ }
-
-	int
-	get_start_pos(void) const
-	{ return M_start_pos; }
-
-	char
-	first_qualifier(void) const
-	{ M_cnt = 1; return M_qualifier1; }
-
-	char
-	next_qualifier(void) const
-	{
-	  return (++M_cnt == 2) ? M_qualifier2
-	                        : ((M_cnt == 3) ? M_qualifier3 : 0);
-	}
-
-	string_type const&
-	get_optional_type(void) const
-	{ return M_optional_type; }
-
-	bool
-	part_of_substitution(void) const
-	{ return M_part_of_substitution; }
-
-#if _GLIBCXX_DEMANGLER_CWDEBUG
-	friend std::ostream& operator<<(std::ostream& os, qualifier const& qual)
-	{
-	  os << (char)qual.M_qualifier1;
-	  if (qual.M_qualifier1 == vendor_extension ||
-	      qual.M_qualifier1 == array ||
-	      qual.M_qualifier1 == pointer_to_member)
-	    os << " [" << qual.M_optional_type << ']';
-	  else if (qual.M_qualifier1 == 'K' ||
-		   qual.M_qualifier1 == 'V' ||
-		   qual.M_qualifier1 == 'r')
-	  {
-	    if (qual.M_qualifier2)
-	    {
-	      os << (char)qual.M_qualifier2;
-	      if (qual.M_qualifier3)
-		os << (char)qual.M_qualifier3;
-	    }
-	  }
-	  return os;
-	}
-#endif
-      };
-
-    template<typename Tp, typename Allocator>
-      class qualifier_list
-      {
-	typedef typename Allocator::template rebind<char>::other
-	  char_Allocator;
-	typedef std::basic_string<char, std::char_traits<char>, char_Allocator>
-	  string_type;
-
-      private:
-	mutable bool M_printing_suppressed;
-	typedef qualifier<Tp, Allocator> qual;
-        typedef typename Allocator::template rebind<qual>::other qual_Allocator;
-	typedef std::vector<qual, qual_Allocator> qual_vector;
-	qual_vector M_qualifier_starts;
-	session<Tp, Allocator>& M_demangler;
-
-	void decode_KVrA(string_type& prefix, string_type& postfix, int cvq,
-			 typename qual_vector::
-			   const_reverse_iterator const& iter_array) const;
-
-      public:
-	qualifier_list(session<Tp, Allocator>& demangler_obj)
-	: M_printing_suppressed(false), M_demangler(demangler_obj)
-	{ }
-
-	void
-	add_qualifier_start(simple_qualifier_nt simple_qualifier,
-			    int start_pos,
-			    int inside_substitution)
-	{ M_qualifier_starts.
-	      push_back(qualifier<Tp, Allocator>(start_pos,
-		  simple_qualifier, inside_substitution)); }
-
-	void
-	add_qualifier_start(cv_qualifier_nt cv_qualifier,
-			    int start_pos,
-			    int count,
-			    int inside_substitution)
-	{ M_qualifier_starts.
-	      push_back(qualifier<Tp, Allocator>(start_pos,
-		    cv_qualifier, &M_demangler.M_str[start_pos],
-		    count, inside_substitution)); }
-
-	void
-	add_qualifier_start(param_qualifier_nt param_qualifier,
-			    int start_pos,
-			    string_type optional_type,
-			    int inside_substitution)
-	{ M_qualifier_starts.
-	      push_back(qualifier<Tp, Allocator>(start_pos,
-		    param_qualifier, optional_type, inside_substitution)); }
-
-	void
-	decode_qualifiers(string_type& prefix,
-			  string_type& postfix,
-			  bool member_function_pointer_qualifiers) const;
-
-	bool
-	suppressed(void) const
-	{ return M_printing_suppressed; }
-
-	void
-	printing_suppressed(void)
-	{ M_printing_suppressed = true; }
-
-	size_t
-	size(void) const
-	{ return M_qualifier_starts.size(); }
-
-#if _GLIBCXX_DEMANGLER_CWDEBUG
-	friend std::ostream& operator<<(std::ostream& os, qualifier_list const& list)
-	{
-	  typename qual_vector::const_iterator
-	      iter = list.M_qualifier_starts.begin();
-	  if (iter != list.M_qualifier_starts.end())
-	  {
-	    os << "{ " << *iter;
-	    while (++iter != list.M_qualifier_starts.end())
-	      os << ", " << *iter;
-	    os << " }";
-	  }
-	  else
-	    os << "{ }";
-	  return os;
-	}
-#endif
-      };
-
-    struct implementation_details
-    {
-      private:
-        unsigned int M_style;
-
-      public:
-	// The following flags change the behaviour of the demangler.  The
-	// default behaviour is that none of these flags is set.
-
-        static unsigned int const style_void = 1;
-	// Default behaviour:				int f()
-	// Use (void) instead of ():			int f(void)
-
-        static unsigned int const style_literal = 2;
-	// Default behaviour:				(long)13,
-	//						(unsigned long long)19
-	// Use extensions 'u', 'l' and 'll' for integral
-	// literals (as in template arguments):		13l, 19ull
-
-        static unsigned int const style_literal_int = 4;
-	// Default behaviour:				4
-	// Use also an explicit
-	//   cast for int in literals:			(int)4
-
-        static unsigned int const style_compact_expr_ops = 8;
-	// Default behaviour:				(i) < (3), sizeof (int)
-	// Don't output spaces around
-	//   operators in expressions:			(i)<(3), sizeof(int)
-
-        static unsigned int const style_sizeof_typename = 16;
-	// Default behaviour:				sizeof (X::t)
-	// Put 'typename' infront of <nested-name>
-	// types inside a 'sizeof':			sizeof (typename X::t)
-
-      public:
-	implementation_details(unsigned int style_flags = 0) :
-	    M_style(style_flags) { }
-	virtual ~implementation_details() { }
-	bool get_style_void(void) const
-	    { return (M_style & style_void); }
-	bool get_style_literal(void) const
-	    { return (M_style & style_literal); }
-	bool get_style_literal_int(void) const
-	    { return (M_style & style_literal_int); }
-	bool get_style_compact_expr_ops(void) const
-	    { return (M_style & style_compact_expr_ops); }
-	bool get_style_sizeof_typename(void) const
-	    { return (M_style & style_sizeof_typename); }
-        // This can be overridden by user implementations.
-        virtual bool decode_real(char* /* output */, unsigned long* /* input */,
-				 size_t /* size_of_real */) const
-            { return false; }
-    };
-
-    template<typename Tp, typename Allocator>
-      class session
-      {
-      public:
-	friend class qualifier_list<Tp, Allocator>;
-	typedef typename Allocator::template rebind<char>::other
-	    char_Allocator;
-	typedef std::basic_string<char, std::char_traits<char>, char_Allocator>
-	    string_type;
-
-      private:
-	char const* M_str;
-	int M_pos;
-	int M_maxpos;
-	bool M_result;
-	int M_inside_template_args;
-	int M_inside_type;
-	int M_inside_substitution;
-	bool M_saw_destructor;
-	bool M_name_is_cdtor;
-	bool M_name_is_template;
-	bool M_name_is_conversion_operator;
-	bool M_template_args_need_space;
-	string_type M_function_name;
-        typedef typename Allocator::template rebind<int>::other
-                int_Allocator;
-        typedef typename Allocator::template rebind<substitution_st>::other
-                subst_Allocator;
-	std::vector<int, int_Allocator> M_template_arg_pos;
-	int M_template_arg_pos_offset;
-	std::vector<substitution_st, subst_Allocator> M_substitutions_pos;
-	implementation_details const& M_implementation_details;
-	typedef typename Allocator::template
-	    rebind<qualifier_list<Allocator> >::other qualifier_list_Allocator;
-	qualifier_list_Allocator M_qualifier_list_alloc;
-#if _GLIBCXX_DEMANGLER_CWDEBUG
-	bool M_inside_add_substitution;
-#endif
-
-      public:
-	explicit session(char const* in, int len,
-	    implementation_details const& id = implementation_details())
-	: M_str(in), M_pos(0), M_maxpos(len - 1), M_result(true),
-	  M_inside_template_args(0), M_inside_type(0),
-	  M_inside_substitution(0), M_saw_destructor(false),
-	  M_name_is_cdtor(false), M_name_is_template(false),
-	  M_name_is_conversion_operator(false),
-	  M_template_args_need_space(false), M_template_arg_pos_offset(0),
-	  M_implementation_details(id)
-#if _GLIBCXX_DEMANGLER_CWDEBUG
-	  , M_inside_add_substitution(false)
-#endif
-	{ }
-
-	static int
-	decode_encoding(string_type& output, char const* input, int len,
-	  implementation_details const& id = implementation_details());
-
-	bool
-	decode_type(string_type& output,
-	            qualifier_list<Tp, Allocator>* qualifiers = NULL)
-	{
-	  string_type postfix;
-	  bool res = decode_type_with_postfix(output, postfix, qualifiers);
-	  output += postfix;
-	  return res;
-	}
-
-	bool
-	remaining_input_characters(void) const
-	{ return current() != 0; }
-
-      private:
-	char
-	current(void) const
-	{ return (M_pos > M_maxpos) ? 0 : M_str[M_pos]; }
-
-	char
-	next_peek(void) const
-	{ return (M_pos >= M_maxpos) ? 0 : M_str[M_pos + 1]; }
-
-	char
-	next(void)
-	{ return (M_pos >= M_maxpos) ? 0 : M_str[++M_pos]; }
-
-	char
-	eat_current(void)
-	{ return (M_pos > M_maxpos) ? 0 : M_str[M_pos++]; }
-
-	void
-	store(int& saved_pos)
-	{ saved_pos = M_pos; }
-
-	void
-	restore(int saved_pos)
-	{ M_pos = saved_pos; M_result = true; }
-
-	void
-	add_substitution(int start_pos,
-	                 substitution_nt sub_type,
-			 int number_of_prefixes);
-
-	bool decode_type_with_postfix(string_type& prefix,
-	    string_type& postfix, qualifier_list<Tp, Allocator>* qualifiers = NULL);
-	bool decode_bare_function_type(string_type& output);
-	bool decode_builtin_type(string_type& output);
-	bool decode_call_offset(string_type& output);
-	bool decode_class_enum_type(string_type& output);
-	bool decode_expression(string_type& output);
-	bool decode_literal(string_type& output);
-	bool decode_local_name(string_type& output);
-	bool decode_name(string_type& output,
-	    string_type& nested_name_qualifiers);
-	bool decode_nested_name(string_type& output,
-	    string_type& qualifiers);
-	bool decode_number(string_type& output);
-	bool decode_operator_name(string_type& output);
-	bool decode_source_name(string_type& output);
-	bool decode_substitution(string_type& output,
-	    qualifier_list<Tp, Allocator>* qualifiers = NULL);
-	bool decode_template_args(string_type& output);
-	bool decode_template_param(string_type& output,
-	    qualifier_list<Tp, Allocator>* qualifiers = NULL);
-	bool decode_unqualified_name(string_type& output);
-	bool decode_unscoped_name(string_type& output);
-	bool decode_non_negative_decimal_integer(string_type& output);
-	bool decode_special_name(string_type& output);
-        bool decode_real(string_type& output, size_t size_of_real);
-      };
-
-    template<typename Tp, typename Allocator>
-#if !_GLIBCXX_DEMANGLER_CWDEBUG
-      inline
-#endif
-      void
-      session<Tp, Allocator>::add_substitution(int start_pos,
-					   substitution_nt sub_type,
-					   int number_of_prefixes = 0)
-      {
-	if (!M_inside_substitution)
-	{
-#if _GLIBCXX_DEMANGLER_CWDEBUG
-	  if (M_inside_add_substitution)
-	    return;
-#endif
-	  M_substitutions_pos.
-	      push_back(substitution_st(start_pos,
-		  sub_type, number_of_prefixes));
-#if _GLIBCXX_DEMANGLER_CWDEBUG
-	  if (!DEBUGCHANNELS::dc::demangler.is_on())
-	    return;
-	  string_type substitution_name("S");
-	  int n = M_substitutions_pos.size() - 1;
-	  if (n > 0)
-	    substitution_name += (n <= 10) ? (char)(n + '0' - 1)
-					   : (char)(n + 'A' - 11);
-	  substitution_name += '_';
-	  string_type subst;
-	  int saved_pos = M_pos;
-	  M_pos = start_pos;
-	  M_inside_add_substitution = true;
-	  _GLIBCXX_DEMANGLER_DEBUG( dc::demangler.off() );
-	  switch(sub_type)
-	  {
-	    case type:
-	      decode_type(subst);
-	      break;
-	    case template_template_param:
-	      decode_template_param(subst);
-	      break;
-	    case nested_name_prefix:
-	    case nested_name_template_prefix:
-	      for (int cnt = number_of_prefixes; cnt > 0; --cnt)
-	      {
-		if (current() == 'I')
-		{
-		  subst += ' ';
-		  decode_template_args(subst);
-		}
-		else
-		{
-		  if (cnt < number_of_prefixes)
-		    subst += "::";
-		  if (current() == 'S')
-		    decode_substitution(subst);
-		  else if (current() == 'T')
-		    decode_template_param(subst);
-		  else
-		    decode_unqualified_name(subst);
-		}
-	      }
-	      break;
-	    case unscoped_template_name:
-	      decode_unscoped_name(subst);
-	      break;
-	  }
-	  M_pos = saved_pos;
-	  _GLIBCXX_DEMANGLER_DEBUG( dc::demangler.on() );
-	  _GLIBCXX_DEMANGLER_DOUT(dc::demangler,
-	      "Adding substitution " << substitution_name
-	      << " : " << subst
-	      << " (from " << location_ct((char*)__builtin_return_address(0)
-		                          + builtin_return_address_offset)
-	      << " <- " << location_ct((char*)__builtin_return_address(1)
-		                       + builtin_return_address_offset)
-	      << " <- " << location_ct((char*)__builtin_return_address(2)
-		                       + builtin_return_address_offset)
-	      << ").");
-	  M_inside_add_substitution = false;
-#endif
-	}
-      }
-
-    // We don't want to depend on locale (or include <cctype> for that matter).
-    // We also don't want to use "safe-ctype.h" because that headerfile is not
-    // available to the users.
-    inline bool isdigit(char c) { return c >= '0' && c <= '9'; }
-    inline bool islower(char c) { return c >= 'a' && c <= 'z'; }
-    inline bool isupper(char c) { return c >= 'A' && c <= 'Z'; }
-    inline char tolower(char c) { return isupper(c) ? c - 'A' + 'a' : c; }
-
-    //
-    // <non-negative decimal integer> ::= 0
-    //                                ::= 1|2|3|4|5|6|7|8|9 [<digit>+]
-    // <digit>                        ::= 0|1|2|3|4|5|6|7|8|9
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::
-	  decode_non_negative_decimal_integer(string_type& output)
-      {
-	char c = current();
-	if (c == '0')
-	{
-	  output += '0';
-	  eat_current();
-	}
-	else if (!isdigit(c))
-	  M_result = false;
-	else
-	{
-	  do
-	  {
-	    output += c;
-	  }
-	  while (isdigit((c = next())));
-	}
-	return M_result;
-      }
-
-    // <number> ::= [n] <non-negative decimal integer>
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_number(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_number");
-	if (current() != 'n')
-	  decode_non_negative_decimal_integer(output);
-	else
-	{
-	  output += '-';
-	  eat_current();
-	  decode_non_negative_decimal_integer(output);
-	}
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <builtin-type> ::= v  # void
-    //                ::= w  # wchar_t
-    //                ::= b  # bool
-    //                ::= c  # char
-    //                ::= a  # signed char
-    //                ::= h  # unsigned char
-    //                ::= s  # short
-    //                ::= t  # unsigned short
-    //                ::= i  # int
-    //                ::= j  # unsigned int
-    //                ::= l  # long
-    //                ::= m  # unsigned long
-    //                ::= x  # long long, __int64
-    //                ::= y  # unsigned long long, __int64
-    //                ::= n  # __int128
-    //                ::= o  # unsigned __int128
-    //                ::= f  # float
-    //                ::= d  # double
-    //                ::= e  # long double, __float80
-    //                ::= g  # __float128
-    //                ::= z  # ellipsis
-    //                ::= u <source-name>    # vendor extended type
-    //
-    char const* const builtin_type_c[26] =
-    {
-      "signed char",	// a
-      "bool",		// b
-      "char",		// c
-      "double",		// d
-      "long double",	// e
-      "float",		// f
-      "__float128",		// g
-      "unsigned char",	// h
-      "int",		// i
-      "unsigned int",	// j
-      NULL,			// k
-      "long",		// l
-      "unsigned long",	// m
-      "__int128",		// n
-      "unsigned __int128",	// o
-      NULL,			// p
-      NULL,			// q
-      NULL,			// r
-      "short",		// s
-      "unsigned short",	// t
-      NULL,			// u
-      "void",		// v
-      "wchar_t",		// w
-      "long long",		// x
-      "unsigned long long",	// y
-      "..."			// z
-    };
-
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_builtin_type(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_builtin_type");
-	char const* bt;
-	if (!islower(current()) || !(bt = builtin_type_c[current() - 'a']))
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	output += bt;
-	eat_current();
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <class-enum-type> ::= <name>
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_class_enum_type(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_class_enum_type");
-	string_type nested_name_qualifiers;
-	if (!decode_name(output, nested_name_qualifiers))
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	output += nested_name_qualifiers;
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <substitution> ::=
-    //   S <seq-id> _
-    //   S_
-    //   St # ::std::
-    //   Sa # ::std::allocator
-    //   Sb # ::std::basic_string
-    //   Ss # ::std::basic_string<char, std::char_traits<char>,
-    //                            std::allocator<char> >
-    //   Si # ::std::basic_istream<char,  std::char_traits<char> >
-    //   So # ::std::basic_ostream<char,  std::char_traits<char> >
-    //   Sd # ::std::basic_iostream<char, std::char_traits<char> >
-    //
-    // <seq-id> ::=
-    //   0|1|2|3|4|5|6|7|8|9|A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z
-    //       [<seq-id>]	# Base 36 number
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_substitution(string_type& output,
-	  qualifier_list<Tp, Allocator>* qualifiers)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_substitution");
-	unsigned int value = 0;
-	char c = next();
-	if (c != '_')
-	{
-	  switch(c)
-	  {
-	    case 'a':
-	    {
-	      output += "std::allocator";
-	      if (!M_inside_template_args)
-	      {
-		M_function_name = "allocator";
-		M_name_is_template = true;
-		M_name_is_cdtor = false;
-		M_name_is_conversion_operator = false;
-	      }
-	      eat_current();
-	      if (qualifiers)
-		qualifiers->printing_suppressed();
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    }
-	    case 'b':
-	    {
-	      output += "std::basic_string";
-	      if (!M_inside_template_args)
-	      {
-		M_function_name = "basic_string";
-		M_name_is_template = true;
-		M_name_is_cdtor = false;
-		M_name_is_conversion_operator = false;
-	      }
-	      eat_current();
-	      if (qualifiers)
-		qualifiers->printing_suppressed();
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    }
-	    case 'd':
-	      output += "std::iostream";
-	      if (!M_inside_template_args)
-	      {
-		M_function_name = "iostream";
-		M_name_is_template = true;
-		M_name_is_cdtor = false;
-		M_name_is_conversion_operator = false;
-	      }
-	      eat_current();
-	      if (qualifiers)
-		qualifiers->printing_suppressed();
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    case 'i':
-	      output += "std::istream";
-	      if (!M_inside_template_args)
-	      {
-		M_function_name = "istream";
-		M_name_is_template = true;
-		M_name_is_cdtor = false;
-		M_name_is_conversion_operator = false;
-	      }
-	      eat_current();
-	      if (qualifiers)
-		qualifiers->printing_suppressed();
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    case 'o':
-	      output += "std::ostream";
-	      if (!M_inside_template_args)
-	      {
-		M_function_name = "ostream";
-		M_name_is_template = true;
-		M_name_is_cdtor = false;
-		M_name_is_conversion_operator = false;
-	      }
-	      eat_current();
-	      if (qualifiers)
-		qualifiers->printing_suppressed();
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    case 's':
-	      output += "std::string";
-	      if (!M_inside_template_args)
-	      {
-		M_function_name = "string";
-		M_name_is_template = true;
-		M_name_is_cdtor = false;
-		M_name_is_conversion_operator = false;
-	      }
-	      eat_current();
-	      if (qualifiers)
-		qualifiers->printing_suppressed();
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    case 't':
-	      output += "std";
-	      eat_current();
-	      if (qualifiers)
-		qualifiers->printing_suppressed();
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    default:
-	      for(;; c = next())
-	      {
-		if (isdigit(c))
-		  value = value * 36 + c - '0';
-		else if (isupper(c))
-		  value = value * 36 + c - 'A' + 10;
-		else if (c == '_')
-		  break;
-		else
-		  _GLIBCXX_DEMANGLER_FAILURE;
-	      }
-	      ++value;
-	      break;
-	  }
-	}
-	eat_current();
-	if (value >= M_substitutions_pos.size() ||
-	    M_inside_type > 20)			// Rather than core dump.
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	++M_inside_substitution;
-	int saved_pos = M_pos;
-	substitution_st& substitution(M_substitutions_pos[value]);
-	M_pos = substitution.M_start_pos;
-	switch(substitution.M_type)
-	{
-	  case type:
-	    decode_type(output, qualifiers);
-	    break;
-	  case template_template_param:
-	    decode_template_param(output, qualifiers);
-	    break;
-	  case nested_name_prefix:
-	  case nested_name_template_prefix:
-	    for (int cnt = substitution.M_number_of_prefixes; cnt > 0; --cnt)
-	    {
-	      if (current() == 'I')
-	      {
-		if (M_template_args_need_space)
-		  output += ' ';
-		M_template_args_need_space = false;
-		if (!decode_template_args(output))
-		  _GLIBCXX_DEMANGLER_FAILURE;
-	      }
-	      else
-	      {
-		if (cnt < substitution.M_number_of_prefixes)
-		  output += "::";
-		if (current() == 'S')
-		{
-		  if (!decode_substitution(output))
-		    _GLIBCXX_DEMANGLER_FAILURE;
-		}
-		else if (!decode_unqualified_name(output))
-		  _GLIBCXX_DEMANGLER_FAILURE;
-	      }
-	    }
-	    if (qualifiers)
-	      qualifiers->printing_suppressed();
-	    break;
-	  case unscoped_template_name:
-	    decode_unscoped_name(output);
-	    if (qualifiers)
-	      qualifiers->printing_suppressed();
-	    break;
-	}
-	M_pos = saved_pos;
-	--M_inside_substitution;
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <template-param> ::= T_			# first template parameter
-    //                  ::= T <parameter-2 non-negative number> _
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_template_param(string_type& output,
-	  qualifier_list<Tp, Allocator>* qualifiers)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_template_parameter");
-	if (current() != 'T')
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	unsigned int value = 0;
-	char c;
-	if ((c = next()) != '_')
-	{
-	  while(isdigit(c))
-	  {
-	    value = value * 10 + c - '0';
-	    c = next();
-	  }
-	  ++value;
-	}
-	if (eat_current() != '_')
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	value += M_template_arg_pos_offset;
-	if (value >= M_template_arg_pos.size())
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	int saved_pos = M_pos;
-	M_pos = M_template_arg_pos[value];
-	if (M_inside_type > 20)		// Rather than core dump.
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	++M_inside_substitution;
-	if (current() == 'X')
-	{
-	  eat_current();
-	  decode_expression(output);
-	}
-	else if (current() == 'L')
-	  decode_literal(output);
-	else
-	  decode_type(output, qualifiers);
-	--M_inside_substitution;
-	M_pos = saved_pos;
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_real(string_type& output, size_t size_of_real)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_real");
-
-	unsigned long words[4];	// 32 bit per long, maximum of 128 bits.
-	unsigned long* word = &words[0];
-
-	int saved_pos;
-	store(saved_pos);
-
-	// The following assumes that leading zeroes are also included in the
-	// mangled name, I am not sure that is conforming to the C++-ABI, but
-	// it is what g++ does.
-	unsigned char nibble, c = current();
-	for(size_t word_cnt = size_of_real / 4; word_cnt > 0; --word_cnt)
-	{
-	  for (int nibble_cnt = 0; nibble_cnt < 8; ++nibble_cnt)
-	  {
-	    // Translate character into nibble.
-	    if (c < '0' || c > 'f')
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    if (c <= '9')
-	      nibble = c - '0';
-	    else if (c >= 'a')
-	      nibble = c - 'a' + 10;
-	    else
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    // Write nibble into word array.
-	    if (nibble_cnt == 0)
-	      *word = nibble << 28;
-	    else
-	      *word |= (nibble << (28 - 4 * nibble_cnt));
-	    c = next();
-	  }
-	  ++word;
-	}
-	char buf[24];
-	if (M_implementation_details.decode_real(buf, words, size_of_real))
-	{
-	  output += buf;
-	  _GLIBCXX_DEMANGLER_RETURN;
-	}
-	restore(saved_pos);
-
-	output += '[';
-	c = current();
-	for(size_t nibble_cnt = 0; nibble_cnt < 2 * size_of_real; ++nibble_cnt)
-	{
-	  if (c < '0' || c > 'f' || (c > '9' && c < 'a'))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  output += c;
-	  c = next();
-	}
-	output += ']';
-
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_literal(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_literal");
-	eat_current();	// Eat the 'L'.
-	if (current() == '_')
-	{
-	  if (next() != 'Z')
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  eat_current();
-	  if ((M_pos += decode_encoding(output, M_str + M_pos,
-		  M_maxpos - M_pos + 1, M_implementation_details)) < 0)
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	}
-	else
-	{
-	  // Special cases
-	  if (current() == 'b')
-	  {
-	    if (next() == '0')
-	      output += "false";
-	    else
-	      output += "true";
-	    eat_current();
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  }
-	  char c = current();
-	  if ((c == 'i' || c == 'j' || c == 'l' ||
-	       c == 'm' || c == 'x' || c == 'y') &&
-              M_implementation_details.get_style_literal())
-	    eat_current();
-	  else if (c == 'i' &&
-	      !M_implementation_details.get_style_literal_int())
-	    eat_current();
-	  else
-	  {
-	    output += '(';
-	    if (!decode_type(output))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    output += ')';
-	  }
-	  if (c >= 'd' && c <= 'g')
-	  {
-	    size_t size_of_real = (c == 'd') ? sizeof(double) :
-	        ((c == 'f') ? sizeof(float) :
-		(c == 'e') ?  sizeof(long double) : 16);
-	    if (!decode_real(output, size_of_real))
-		_GLIBCXX_DEMANGLER_FAILURE;
-	  }
-	  else if (!decode_number(output))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-          if (M_implementation_details.get_style_literal())
-	  {
-	    if (c == 'j' || c == 'm' || c == 'y')
-	      output += 'u';
-	    if (c == 'l' || c == 'm')
-	      output += 'l';
-	    if (c == 'x' || c == 'y')
-	      output += "ll";
-	  }
-	}
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <operator-name> ::=
-    //   nw				# new
-    //   na				# new[]
-    //   dl				# delete
-    //   da				# delete[]
-    //   ps				# + (unary)
-    //   ng				# - (unary)
-    //   ad				# & (unary)
-    //   de				# * (unary)
-    //   co				# ~
-    //   pl				# +
-    //   mi				# -
-    //   ml				# *
-    //   dv				# /
-    //   rm				# %
-    //   an				# &
-    //   or				# |
-    //   eo				# ^
-    //   aS				# =
-    //   pL				# +=
-    //   mI				# -=
-    //   mL				# *=
-    //   dV				# /=
-    //   rM				# %=
-    //   aN				# &=
-    //   oR				# |=
-    //   eO				# ^=
-    //   ls				# <<
-    //   rs				# >>
-    //   lS				# <<=
-    //   rS				# >>=
-    //   eq				# ==
-    //   ne				# !=
-    //   lt				# <
-    //   gt				# >
-    //   le				# <=
-    //   ge				# >=
-    //   nt				# !
-    //   aa				# &&
-    //   oo				# ||
-    //   pp				# ++
-    //   mm				# --
-    //   cm				# ,
-    //   pm				# ->*
-    //   pt				# ->
-    //   cl				# ()
-    //   ix				# []
-    //   qu				# ?
-    //   st				# sizeof (a type)
-    //   sz				# sizeof (an expression)
-    //   cv <type>			# (cast)
-    //   v <digit> <source-name>	# vendor extended operator
-    //
-    // Symbol operator codes exist of two characters, we need to find a
-    // quick hash so that their names can be looked up in a table.
-    //
-    // The puzzle :)
-    // Shift the rows so that there is at most one character per column.
-    //
-    // A perfect solution (Oh no, it's THE MATRIX!):
-    //                                              horizontal
-    //    .......................................   offset + 'a'
-    // a, a||d|||||||||n||||s||||||||||||||||||||       0
-    // c,  || |||||||lm o||| ||||||||||||||||||||       0
-    // d,  || a|||e||    l|| ||||||v|||||||||||||       4
-    // e,  ||  ||| ||     || |||o|q |||||||||||||       8
-    // g,  ||  ||| ||     || e|| |  ||||||||t||||      15
-    // i,  ||  ||| ||     ||  || |  |||||||| |||x      15
-    // l,  |e  ||| ||     st  || |  |||||||| |||       -2
-    // m,  |   |i| lm         || |  |||||||| |||       -2
-    // n,  a   e g            t| w  |||||||| |||        1
-    // o,                      |    ||||o||r |||       16
-    // p,                      |    ||lm |p  st|       17
-    // q,                      |    u|   |     |        6
-    // r,                      m     s   |     |        9
-    // s,                                t     z       12
-    //    .......................................
-    // ^            ^__ second character
-    // |___ first character
-    //
-
-    // Putting that solution in tables:
-
-    char const offset_table_c [1 + CHAR_MAX - CHAR_MIN ] =
-    {
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-#if (CHAR_MIN < 0)
-      // Add -CHAR_MIN extra zeroes (128):
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
-      //   a    b    c    d    e    f    g    h    i    j    k
-      0, -97,   0, -97, -93, -89,   0, -82,   0, -82,   0,   0,
-      //   l    m    n    o    p    q    r    s    t    u    v
-	 -99, -99, -96, -81, -80, -91, -88, -85,   0,   0,   0,
-#else
-      //   a    b    c    d    e    f    g    h    i    j    k
-      0, 159,   0, 159, 163, 167,   0, 174,   0, 174,   0,   0,
-      //   l    m    n    o    p    q    r    s    t    u    v
-	 157, 157, 160, 175, 176, 165, 168, 171,   0,   0,   0,
-#endif
-      // ... more zeros
-    };
-
-    enum xary_nt {
-      unary,
-      binary,
-      trinary
-    };
-
-    struct entry_st
-    {
-      char const* opcode;
-      char const* symbol_name;
-      xary_nt type;
-    };
-
-    entry_st const symbol_name_table_c[39] = {
-      { "aa",  "operator&&", binary },
-      { "na",  "operator new[]", unary },
-      { "le",  "operator<=", binary },
-      { "ad",  "operator&", unary },
-      { "da",  "operator delete[]", unary },
-      { "ne",  "operator!=", binary },
-      { "mi=", "operator-", binary },
-      { "ng",  "operator-", unary },
-      { "de",  "operator*", unary },
-      { "ml=", "operator*", binary },
-      { "mm",  "operator--", unary },
-      { "cl",  "operator()", unary },
-      { "cm",  "operator,", binary },
-      { "an=", "operator&", binary },
-      { "co",  "operator~", binary },
-      { "dl",  "operator delete", unary },
-      { "ls=", "operator<<", binary },
-      { "lt",  "operator<", binary },
-      { "as=", "operator", binary },
-      { "ge",  "operator>=", binary },
-      { "nt",  "operator!", unary },
-      { "rm=", "operator%", binary },
-      { "eo=", "operator^", binary },
-      { "nw",  "operator new", unary },
-      { "eq",  "operator==", binary },
-      { "dv=", "operator/", binary },
-      { "qu",  "operator?", trinary },
-      { "rs=", "operator>>", binary },
-      { "pl=", "operator+", binary },
-      { "pm",  "operator->*", binary },
-      { "oo",  "operator||", binary },
-      { "st",  "sizeof", unary },
-      { "pp",  "operator++", unary },
-      { "or=", "operator|", binary },
-      { "gt",  "operator>", binary },
-      { "ps",  "operator+", unary },
-      { "pt",  "operator->", binary },
-      { "sz",  "sizeof", unary },
-      { "ix",  "operator[]", unary }
-    };
-
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_operator_name(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_operator_name");
-
-	char opcode0 = current();
-	char opcode1 = tolower(next());
-
-	register char hash;
-	if ((hash = offset_table_c[opcode0 - CHAR_MIN]))
-	{
-	  hash += opcode1;
-	  if (
-#if (CHAR_MIN < 0)
-	      hash >= 0 &&
-#endif
-	      hash < 39)
-	  {
-	    int index = static_cast<int>(static_cast<unsigned char>(hash));
-	    entry_st entry = symbol_name_table_c[index];
-	    if (entry.opcode[0] == opcode0 && entry.opcode[1] == opcode1
-		&& (opcode1 == current() || entry.opcode[2] == '='))
-	    {
-	      output += entry.symbol_name;
-	      if (opcode1 != current())
-		output += '=';
-	      eat_current();
-	      if (hash == 16 || hash == 17)
-		M_template_args_need_space = true;
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    }
-	    else if (opcode0 == 'c' && opcode1 == 'v')	// casting operator
-	    {
-	      eat_current();
-	      output += "operator ";
-	      if (current() == 'T')
-	      {
-		// This is a templated cast operator.
-		// It must be of the form "cvT_I...E".
-		// Let M_template_arg_pos already point
-		// to the template argument.
-		M_template_arg_pos_offset = M_template_arg_pos.size();
-		M_template_arg_pos.push_back(M_pos + 3);
-	      }
-	      if (!decode_type(output))
-		_GLIBCXX_DEMANGLER_FAILURE;
-	      if (!M_inside_template_args)
-		M_name_is_conversion_operator = true;
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    }
-	  }
-	}
-	_GLIBCXX_DEMANGLER_FAILURE;
-      }
-
-    //
-    // <expression> ::= <unary operator-name> <expression>
-    //              ::= <binary operator-name> <expression> <expression>
-    //              ::= <trinary operator-name> <expression> <expression> <expression>
-    //              ::= st <type>
-    //              ::= <template-param>
-    //              ::= sr <type> <unqualified-name>                   # dependent name
-    //              ::= sr <type> <unqualified-name> <template-args>   # dependent template-id
-    //              ::= <expr-primary>
-    //
-    // <expr-primary> ::= L <type> <value number> E     # integer literal
-    //                ::= L <type> <value float> E	# floating literal
-    //                ::= L <mangled-name> E		# external name
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_expression(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_expression");
-	if (current() == 'T')
-	{
-	  if (!decode_template_param(output))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  _GLIBCXX_DEMANGLER_RETURN;
-	}
-	else if (current() == 'L')
-	{
-	  if (!decode_literal(output))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  if (current() != 'E')
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  eat_current();
-	  _GLIBCXX_DEMANGLER_RETURN;
-	}
-	else if (current() == 's')
-	{
-	  char opcode1 = next();
-	  if (opcode1 == 't' || opcode1 == 'z')
-	  {
-	    eat_current();
-	    if (M_implementation_details.get_style_compact_expr_ops())
-	      output += "sizeof(";
-	    else
-	      output += "sizeof (";
-	    if (opcode1 == 't')
-	    {
-	      // I cannot think of a mangled name that is valid for both cases
-	      // when just replacing the 't' by a 'z' or vica versa, which
-	      // indicates that there is no ambiguity that dictates the need
-	      // for a seperate "st" case, except to be able catch invalid
-	      // mangled names.  However there CAN be ambiguity in the demangled
-	      // name when there are both a type and a symbol of the same name,
-	      // which then leads to different encoding (of course) with
-	      // sizeof (type) or sizeof (expression) respectively, but that
-	      // ambiguity is not per se related to "sizeof" except that that
-	      // is the only place where both a type AND an expression are valid
-	      // in as part of a (template function) type.
-	      //
-	      // Example:
-	      //
-	      // struct B { typedef int t; };
-	      // struct A : public B { static int t[2]; };
-	      // template<int i, int j> struct C { typedef int q; };
-	      // template<int i, typename T>
-	      //   void f(typename C<sizeof (typename T::t),
-	      //                     sizeof (T::t)>::q) { }
-	      // void instantiate() { f<5, A>(0); }
-	      //
-	      // Leads to _Z1fILi5E1AEvN1CIXstN1T1tEEXszsrS2_1tEE1qE which
-	      // demangles as
-	      // void f<5, A>(C<sizeof (T::t), sizeof (T::t)>::q)
-	      //
-	      // This is ambiguity is very unlikely to happen and it is kind
-	      // of fuzzy to detect when adding a 'typename' makes sense.
-	      //
-	      if (M_implementation_details.get_style_sizeof_typename())
-	      {
-		// We can only get here inside a template parameter,
-		// so this is syntactically correct if the given type is
-		// a typedef.  The only disadvantage is that it is inconsistent
-		// with all other places where the 'typename' keyword should be
-		// used and we don't.
-		// With this, the above example will demangle as
-		// void f<5, A>(C<sizeof (typename T::t), sizeof (T::t)>::q)
-		if (current() == 'N' ||	// <nested-name>
-					  // This should be a safe bet.
-		    (current() == 'S' &&
-		     next_peek() == 't'))	// std::something, guess that
-					  // this involves a typedef.
-		  output += "typename ";
-	      }
-	      if (!decode_type(output))
-		_GLIBCXX_DEMANGLER_FAILURE;
-	    }
-	    else
-	    {
-	      if (!decode_expression(output))
-		_GLIBCXX_DEMANGLER_FAILURE;
-	    }
-	    output += ')';
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  }
-	  else if (current() == 'r')
-	  {
-	    eat_current();
-	    if (!decode_type(output))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    output += "::";
-	    if (!decode_unqualified_name(output))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    if (current() != 'I' || decode_template_args(output))
-	      _GLIBCXX_DEMANGLER_RETURN;
-	  }
-	}
-	else
-	{
-	  char opcode0 = current();
-	  char opcode1 = tolower(next());
-
-	  register char hash;
-	  if ((hash = offset_table_c[opcode0 - CHAR_MIN]))
-	  {
-	    hash += opcode1;
-	    if (
-#if (CHAR_MIN < 0)
-		hash >= 0 &&
-#endif
-		hash < 39)
-	    {
-	      int index = static_cast<int>(static_cast<unsigned char>(hash));
-	      entry_st entry = symbol_name_table_c[index];
-	      if (entry.opcode[0] == opcode0 && entry.opcode[1] == opcode1
-		  && (opcode1 == current() || entry.opcode[2] == '='))
-	      {
-		char const* op = entry.symbol_name + 8;	// Skip "operator".
-		if (*op == ' ')				// operator new and delete.
-		  ++op;
-		if (entry.type == unary)
-		  output += op;
-		bool is_eq = (opcode1 != current());
-		eat_current();
-		if (index == 34 && M_inside_template_args)	// operator>
-		  output += '(';
-		output += '(';
-		if (!decode_expression(output))
-		  _GLIBCXX_DEMANGLER_FAILURE;
-		output += ')';
-		if (entry.type != unary)
-		{
-	          if (!M_implementation_details.get_style_compact_expr_ops())
-		    output += ' ';
-		  output += op;
-		  if (is_eq)
-		    output += '=';
-	          if (!M_implementation_details.get_style_compact_expr_ops())
-		    output += ' ';
-		  output += '(';
-		  if (!decode_expression(output))
-		    _GLIBCXX_DEMANGLER_FAILURE;
-		  output += ')';
-		  if (index == 34 && M_inside_template_args)
-		    output += ')';
-		  if (entry.type == trinary)
-		  {
-		    if (M_implementation_details.get_style_compact_expr_ops())
-		      output += ":(";
-		    else
-		      output += " : (";
-		    if (!decode_expression(output))
-		      _GLIBCXX_DEMANGLER_FAILURE;
-		    output += ')';
-		  }
-		}
-		_GLIBCXX_DEMANGLER_RETURN;
-	      }
-	      else if (opcode0 == 'c' &&
-	               opcode1 == 'v')		// casting operator.
-	      {
-		eat_current();
-		output += '(';
-		if (!decode_type(output))
-		  _GLIBCXX_DEMANGLER_FAILURE;
-		output += ")(";
-		if (!decode_expression(output))
-		  _GLIBCXX_DEMANGLER_FAILURE;
-		output += ')';
-		_GLIBCXX_DEMANGLER_RETURN;
-	      }
-	    }
-	  }
-	}
-	_GLIBCXX_DEMANGLER_FAILURE;
-      }
-
-    //
-    // <template-args> ::= I <template-arg>+ E
-    // <template-arg> ::= <type>			# type or template
-    //                ::= L <type> <value number> E	# integer literal
-    //                ::= L <type> <value float> E	# floating literal
-    //                ::= L <mangled-name> E		# external name
-    //                ::= X <expression> E		# expression
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_template_args(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_template_args");
-	if (eat_current() != 'I')
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	int prev_size = M_template_arg_pos.size();
-	++M_inside_template_args;
-	if (M_template_args_need_space)
-	{
-	  output += ' ';
-	  M_template_args_need_space = false;
-	}
-	output += '<';
-	for(;;)
-	{
-	  if (M_inside_template_args == 1 && !M_inside_type)
-	    M_template_arg_pos.push_back(M_pos);
-	  if (current() == 'X')
-	  {
-	    eat_current();
-	    if (!decode_expression(output))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    if (current() != 'E')
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    eat_current();
-	  }
-	  else if (current() == 'L')
-	  {
-	    if (!decode_literal(output))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    if (current() != 'E')
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    eat_current();
-	  }
-	  else if (!decode_type(output))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  if (current() == 'E')
-	    break;
-	  output += ", ";
-	}
-	eat_current();
-	if (*(output.rbegin()) == '>')
-	  output += ' ';
-	output += '>';
-	--M_inside_template_args;
-	if (!M_inside_template_args && !M_inside_type)
-	{
-	  M_name_is_template = true;
-	  M_template_arg_pos_offset = prev_size;
-	}
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <bare-function-type> ::=
-    //   <signature type>+		# Types are parameter types.
-    //
-    // Note that the possible return type of the <bare-function-type>
-    // has already been eaten before we call this function.  This makes
-    // our <bare-function-type> slightly different from the one in
-    // the C++-ABI description.
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_bare_function_type(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_bare_function_type");
-	if (M_saw_destructor)
-	{
-	  if (eat_current() != 'v' || (current() != 'E' && current() != 0))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  output += "()";
-	  M_saw_destructor = false;
-	  _GLIBCXX_DEMANGLER_RETURN;
-	}
-	if (current() == 'v' && !M_implementation_details.get_style_void())
-	{
-	  eat_current();
-	  if (current() != 'E' && current() != 0)
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  output += "()";
-	  M_saw_destructor = false;
-	  _GLIBCXX_DEMANGLER_RETURN;
-	}
-	output += '(';
-	M_template_args_need_space = false;
-	if (!decode_type(output))	// Must have at least one parameter.
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	while (current() != 'E' && current() != 0)
-	{
-	  output += ", ";
-	  if (!decode_type(output))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	}
-	output += ')';
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <type> ::=
-    //   <builtin-type>		# Starts with a lower case character != r.
-    //   <function-type>	# Starts with F
-    //   <class-enum-type>	# Starts with N, S, C, D, Z, a digit or a lower
-    //				# case character.  Since a lower case character
-    //				# would be an operator name, that would be an
-    //				# error.  The S is a substitution or St
-    //				# (::std::).  A 'C' would be a constructor and
-    //				# thus also an error.
-    //   <template-param>	# Starts with T
-    //   <substitution>         # Starts with S
-    //   <template-template-param> <template-args>  # Starts with T or S,
-    //						    # equivalent with the above.
-    //
-    //   <array-type>			# Starts with A
-    //   <pointer-to-member-type>	# Starts with M
-    //   <CV-qualifiers> <type>		# Starts with r, V or K
-    //   P <type>   # pointer-to	# Starts with P
-    //   R <type>   # reference-to	# Starts with R
-    //   C <type>   # complex (C 2000)	# Starts with C
-    //   G <type>   # imaginary (C 2000)# Starts with G
-    //   U <source-name> <type>		# vendor extended type qualifier,
-    //					# starts with U
-    //
-    // <template-template-param> ::= <template-param>
-    //                           ::= <substitution>
-
-    // My own analysis of how to decode qualifiers:
-    //
-    // F is a <function-type>, <T> is a <builtin-type>, <class-enum-type>,
-    //   <template-param> or <template-template-param> <template-args>.
-    // <Q> represents a series of qualifiers (not G or C).
-    // <C> is an unqualified type.
-    // <R> is a qualified type.
-    // <B> is the bare-function-type without return type.
-    // <I> is the array index.
-    //						Substitutions:
-    // <Q>M<C><Q2>F<R><B>E  ==> R (C::*Q)B Q2	"<C>", "F<R><B>E"
-    //						    (<R> and <B> recursive),
-    //						    "M<C><Q2>F<R><B>E".
-    // <Q>F<R><B>E	    ==> R (Q)B		"<R>", "<B>" (<B> recursive)
-    //                                              and "F<R><B>E".
-    //
-    // Note that if <R> has postfix qualifiers (an array or function), then
-    // those are added AFTER the (member) function type.  For example:
-    // <Q>FPA<R><B>E ==> R (*(Q)B) [], where the PA added the prefix
-    // "(*" and the postfix ") []".
-    //
-    // <Q>G<T>		    ==> imaginary T Q	"<T>", "G<T>" (<T> recursive).
-    // <Q>C<T>		    ==> complex T Q	"<T>", "C<T>" (<T> recursive).
-    // <Q><T>		    ==> T Q		"<T>" (<T> recursive).
-    //
-    // where <Q> is any of:
-    //
-    // <Q>P		==> *Q				"P..."
-    // <Q>R		==> &Q				"R..."
-    // <Q>[K|V|r]+	==> [ const| volatile| restrict]+Q	"KVr..."
-    // <Q>U<S>		==>  SQ				"U<S>..."
-    // <Q>M<C>		==> C::*Q			"M<C>..." (<C> recurs.)
-    // A<I>		==>  [I]			"A<I>..." (<I> recurs.)
-    // <Q>A<I>		==>  (Q) [I]			"A<I>..." (<I> recurs.)
-    //   Note that when <Q> ends on an A<I2> then the brackets are omitted
-    //   and no space is written between the two:
-    //   A<I2>A<I>	==>  [I2][I]
-    //   If <Q> ends on [KVr]+, which can happen in combination with
-    //   substitutions only, then special handling is required, see below.
-    //
-    // A <substitution> is handled with an input position switch during which
-    // new substitutions are turned off.  Because recursive handling of types
-    // (and therefore the order in which substitutions must be generated) must
-    // be done left to right, but the generation of Q needs processing right to
-    // left, substitutions per <type> are generated by reading the input left
-    // to right and marking the starts of all substitutions only - implicitly
-    // finishing them at the end of the type.  Then the output and real
-    // substitutions are generated.
-    //
-    // The following comment was for the demangling of g++ version 3.0.x.  The
-    // mangling (and I believe even the ABI description) have been fixed now
-    // (as of g++ version 3.1).
-    //
-    // g++ 3.0.x only:
-    // The ABI specifies for pointer-to-member function types the format
-    // <Q>M<T>F<R><B>E.  In other words, the qualifier <Q2> (see above) is
-    // implicitely contained in <T> instead of explicitly part of the M format.
-    // I am convinced that this is a bug in the ABI.  Unfortunately, this is
-    // how we have to demangle things as it has a direct impact on the order
-    // in which substitutions are stored.  This ill-formed design results in
-    // rather ill-formed demangler code too however :/
-    //
-    // <Q2> is now explicitely part of the M format.
-    // For some weird reason, g++ (3.2.1) does not add substitutions for
-    // qualified member function pointers.  I think that is another bug.
-    //
-
-    // In the case of
-    // <Q>A<I>
-    // where <Q> ends on [K|V|r]+ then that part should be processed as
-    // if it was behind the A<I> instead of in front of it.  This is
-    // because a constant array of ints is normally always mangled as
-    // an array of constant ints.  KVr qualifiers can end up in front
-    // of an array when the array is part of a substitution or template
-    // parameter, but the demangling should still result in the same
-    // syntax; thus KA2_i (const array of ints) must result in the same
-    // demangling as A2_Ki (array of const ints).  As a result we must
-    // demangle ...[...[[KVr]+A<I0>][KVr]+A<I1>]...[KVr]+A<In>[KVr]+
-    // as A<I0>A<I1>...A<In>[KVr]+ where each K, V and r in the series
-    // collapses to a single character at the right of the string.
-    // For example:
-    // VA9_KrA6_KVi --> A9_A6_KVri --> int volatile const restrict [9][6]
-    // Note that substitutions are still added as usual (the translation
-    // to A9_A6_KVri does not really happen).
-    //
-    // This decoding is achieved by delaying the decoding of any sequence
-    // of [KVrA]'s and processing them together in the order: first the
-    // short-circuited KVr part and then the arrays.
-    static int const cvq_K = 1;		// Saw at least one K
-    static int const cvq_V = 2;		// Saw at least one V
-    static int const cvq_r = 4;		// Saw at least one r
-    static int const cvq_A = 8;		// Saw at least one A
-    static int const cvq_last = 16;	// No remaining qualifiers.
-    static int const cvq_A_cnt = 32;	// Bit 5 and higher represent the
-					//   number of A's in the series.
-    // In the function below, iter_array points to the first (right most)
-    // A in the series, if any.
-    template<typename Tp, typename Allocator>
-      void
-      qualifier_list<Tp, Allocator>::decode_KVrA(
-          string_type& prefix, string_type& postfix, int cvq,
-          typename qual_vector::const_reverse_iterator const& iter_array) const
-	{
-	  _GLIBCXX_DEMANGLER_DOUT_ENTERING3("decode_KVrA");
-	  if ((cvq & cvq_K))
-	    prefix += " const";
-	  if ((cvq & cvq_V))
-	    prefix += " volatile";
-	  if ((cvq & cvq_r))
-	    prefix += " restrict";
-	  if ((cvq & cvq_A))
-	  {
-	    int n = cvq >> 5;
-	    for (typename qual_vector::
-	        const_reverse_iterator iter = iter_array;
-		iter != M_qualifier_starts.rend(); ++iter)
-	    {
-	      switch((*iter).first_qualifier())
-	      {
-		case 'K':
-		case 'V':
-		case 'r':
-		  break;
-		case 'A':
-		{
-		  string_type index = (*iter).get_optional_type();
-		  if (--n == 0 && (cvq & cvq_last))
-		    postfix = " [" + index + "]" + postfix;
-		  else if (n > 0)
-		    postfix = "[" + index + "]" + postfix;
-		  else
-		  {
-		    prefix += " (";
-		    postfix = ") [" + index + "]" + postfix;
-		  }
-		  break;
-		}
-		default:
-		  _GLIBCXX_DEMANGLER_RETURN3;
-	      }
-	    }
-	  }
-	  _GLIBCXX_DEMANGLER_RETURN3;
-	}
-
-    template<typename Tp, typename Allocator>
-      void
-      qualifier_list<Tp, Allocator>::decode_qualifiers(
-	  string_type& prefix,
-	  string_type& postfix,
-	  bool member_function_pointer_qualifiers = false) const
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING3("decode_qualifiers");
-	int cvq = 0;
-	typename qual_vector::const_reverse_iterator iter_array;
-	for(typename qual_vector::
-	    const_reverse_iterator iter = M_qualifier_starts.rbegin();
-	    iter != M_qualifier_starts.rend(); ++iter)
-	{
-	  if (!member_function_pointer_qualifiers
-	      && !(*iter).part_of_substitution())
-	  {
-	    int saved_inside_substitution = M_demangler.M_inside_substitution;
-	    M_demangler.M_inside_substitution = 0;
-	    M_demangler.add_substitution((*iter).get_start_pos(), type);
-	    M_demangler.M_inside_substitution = saved_inside_substitution;
-	  }
-	  char qualifier_char = (*iter).first_qualifier();
-	  for(; qualifier_char; qualifier_char = (*iter).next_qualifier())
-	  {
-	    switch(qualifier_char)
-	    {
-	      case 'P':
-		if (cvq)
-		{
-		  decode_KVrA(prefix, postfix, cvq, iter_array);
-		  cvq = 0;
-		}
-		prefix += "*";
-		break;
-	      case 'R':
-		if (cvq)
-		{
-		  decode_KVrA(prefix, postfix, cvq, iter_array);
-		  cvq = 0;
-		}
-		prefix += "&";
-		break;
-	      case 'K':
-		cvq |= cvq_K;
-		continue;
-	      case 'V':
-		cvq |= cvq_V;
-		continue;
-	      case 'r':
-		cvq |= cvq_r;
-		continue;
-	      case 'A':
-	        if (!(cvq & cvq_A))
-		{
-		  cvq |= cvq_A;
-		  iter_array = iter;
-		}
-		cvq += cvq_A_cnt;
-		break;
-	      case 'M':
-	        if (cvq)
-		{
-		  decode_KVrA(prefix, postfix, cvq, iter_array);
-		  cvq = 0;
-		}
-		prefix += " ";
-		prefix += (*iter).get_optional_type();
-		prefix += "::*";
-		break;
-	      case 'U':
-	        if (cvq)
-		{
-		  decode_KVrA(prefix, postfix, cvq, iter_array);
-		  cvq = 0;
-		}
-		prefix += " ";
-		prefix += (*iter).get_optional_type();
-		break;
-	      case 'G':	// Only here so we added a substitution.
-		break;
-	    }
-	    break;
-	  }
-	}
-	if (cvq)
-	  decode_KVrA(prefix, postfix, cvq|cvq_last, iter_array);
-	M_printing_suppressed = false;
-	_GLIBCXX_DEMANGLER_RETURN3;
-      }
-
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_type_with_postfix(
-	  string_type& prefix, string_type& postfix,
-	  qualifier_list<Tp, Allocator>* qualifiers)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING2("decode_type");
-	++M_inside_type;
-	bool recursive_template_param_or_substitution_call;
-	if (!(recursive_template_param_or_substitution_call = qualifiers))
-	{
-          qualifier_list<Allocator>* raw_qualifiers = M_qualifier_list_alloc.allocate(1);
-	  qualifiers = new (raw_qualifiers) qualifier_list<Allocator>(*this);
-	}
-	// First eat all qualifiers.
-	bool failure = false;
-	for(;;)		// So we can use 'continue' to eat the next qualifier.
-	{
-	  int start_pos = M_pos;
-	  switch(current())
-	  {
-	    case 'P':
-	      qualifiers->add_qualifier_start(pointer, start_pos,
-		  M_inside_substitution);
-	      eat_current();
-	      continue;
-	    case 'R':
-	      qualifiers->add_qualifier_start(reference, start_pos,
-		  M_inside_substitution);
-	      eat_current();
-	      continue;
-	    case 'K':
-	    case 'V':
-	    case 'r':
-	    {
-	      char c;
-	      int count = 0;
-	      do
-	      {
-		++count;
-		c = next();
-	      }
-	      while(c == 'K' || c == 'V' || c == 'r');
-	      qualifiers->add_qualifier_start(cv_qualifier, start_pos, count,
-		  M_inside_substitution);
-	      continue;
-	    }
-	    case 'U':
-	    {
-	      eat_current();
-	      string_type source_name;
-	      if (!decode_source_name(source_name))
-	      {
-		failure = true;
-		break;
-	      }
-	      qualifiers->add_qualifier_start(vendor_extension, start_pos,
-		  source_name, M_inside_substitution);
-	      continue;
-	    }
-	    case 'A':
-	    {
-	      // <array-type> ::= A <positive dimension number> _ <element type>
-	      //              ::= A [<dimension expression>] _ <element type>
-	      //
-	      string_type index;
-	      int saved_pos;
-	      store(saved_pos);
-	      if (next() == 'n' || !decode_number(index))
-	      {
-		restore(saved_pos);
-		if (next() != '_' && !decode_expression(index))
-		{
-		  failure = true;
-		  break;
-		}
-	      }
-	      if (eat_current() != '_')
-	      {
-		failure = true;
-		break;
-	      }
-	      qualifiers->add_qualifier_start(array, start_pos, index,
-		  M_inside_substitution);
-	      continue;
-	    }
-	    case 'M':
-	    {
-	      // <pointer-to-member-type> ::= M <class type> <member type>
-	      // <Q>M<C> or <Q>M<C><Q2>F<R><B>E
-	      eat_current();
-	      string_type class_type;
-	      if (!decode_type(class_type))		// Substitution: "<C>".
-	      {
-		failure = true;
-		break;
-	      }
-	      char c = current();
-	      if (c == 'F' || c == 'K' || c == 'V' || c == 'r')
-		  // Must be CV-qualifiers and a member function pointer.
-	      {
-		// <Q>M<C><Q2>F<R><B>E	==> R (C::*Q)B Q2
-		//     substitutions: "<C>", "F<R><B>E" (<R> and <B>
-		//                    recursive), "M<C><Q2>F<R><B>E".
-		int count = 0;
-		int Q2_start_pos = M_pos;
-		while(c == 'K' || c == 'V' || c == 'r')		// Decode <Q2>.
-		{
-		  ++count;
-		  c = next();
-		}
-		qualifier_list<Tp, Allocator> class_type_qualifiers(*this);
-		if (count)
-		  class_type_qualifiers.
-		      add_qualifier_start(cv_qualifier, Q2_start_pos,
-			  count, M_inside_substitution);
-		string_type member_function_qualifiers;
-		// It is unclear why g++ doesn't add a substitution for
-		// "<Q2>F<R><B>E" as it should I think.
-		string_type member_function_qualifiers_postfix;
-		class_type_qualifiers.
-		    decode_qualifiers(member_function_qualifiers,
-			member_function_qualifiers_postfix, true);
-		member_function_qualifiers +=
-		    member_function_qualifiers_postfix;
-		// I don't think this substitution is actually ever used.
-		int function_pos = M_pos;
-		if (eat_current() != 'F')
-		{
-		  failure = true;
-		  break;
-		}
-		// Return type.
-		// Constructors, destructors and conversion operators don't
-		// have a return type, but seem to never get here.
-		string_type return_type_postfix;
-		if (!decode_type_with_postfix(prefix, return_type_postfix))
-		    // substitution: <R> recursive
-		{
-		  failure = true;
-		  break;
-		}
-		prefix += " (";
-		prefix += class_type;
-		prefix += "::*";
-		string_type bare_function_type;
-		if (!decode_bare_function_type(bare_function_type)
-		    || eat_current() != 'E')	// Substitution: <B> recursive.
-		{
-		  failure = true;
-		  break;
-		}
-		// substitution: "F<R><B>E".
-		add_substitution(function_pos, type);
-		// substitution: "M<C><Q2>F<R><B>E".
-		add_substitution(start_pos, type);
-		// substitution: all qualified types if any.
-		qualifiers->decode_qualifiers(prefix, postfix);
-		postfix += ")";
-		postfix += bare_function_type;
-		postfix += member_function_qualifiers;
-		postfix += return_type_postfix;
-		goto decode_type_exit;
-	      }
-	      qualifiers->add_qualifier_start(pointer_to_member, start_pos,
-		  class_type, M_inside_substitution);
-	      continue;
-	    }
-	    default:
-	      break;
-	  }
-	  break;
-	}
-	if (!failure)
-	{
-	  // <Q>G<T>			==> imaginary T Q
-	  //     substitutions: "<T>", "G<T>" (<T> recursive).
-	  // <Q>C<T>			==> complex T Q
-	  //     substitutions: "<T>", "C<T>" (<T> recursive).
-	  if (current() == 'C' || current() == 'G')
-	  {
-	    prefix += current() == 'C' ? "complex " : "imaginary ";
-	    qualifiers->add_qualifier_start(complex_or_imaginary, M_pos,
-		M_inside_substitution);
-	    eat_current();
-	  }
-	  int start_pos = M_pos;
-	  switch(current())
-	  {
-	    case 'F':
-	    {
-	      // <function-type> ::= F [Y] <bare-function-type> E
-	      //
-	      // Note that g++ never generates the 'Y', but we try to
-	      // demangle it anyway.
-	      bool extern_C = (next() == 'Y');
-	      if (extern_C)
-		eat_current();
-
-	      // <Q>F<R><B>E		==> R (Q)B
-	      //     substitution: "<R>", "<B>" (<B> recursive) and "F<R><B>E".
-
-	      // Return type.
-	      string_type return_type_postfix;
-	      if (!decode_type_with_postfix(prefix, return_type_postfix))
-		  // Substitution: "<R>".
-	      {
-		failure = true;
-		break;
-	      }
-	      // Only array and function (pointer) types have a postfix.
-	      // In that case we don't want the space but expect something
-	      // like prefix is "int (*" and postfix is ") [1]".
-	      // We do want the space if this pointer is qualified.
-	      if (return_type_postfix.size() == 0 ||
-	          (prefix.size() > 0 && *prefix.rbegin() != '*'))
-		prefix += ' ';
-	      prefix += '(';
-	      string_type bare_function_type;
-	      if (!decode_bare_function_type(bare_function_type)
-		  // substitution: "<B>" (<B> recursive).
-		  || eat_current() != 'E')
-	      {
-		failure = true;
-		break;
-	      }
-	      add_substitution(start_pos, type);  // Substitution: "F<R><B>E".
-	      qualifiers->decode_qualifiers(prefix, postfix);
-		  // substitution: all qualified types, if any.
-	      postfix += ")";
-	      if (extern_C)
-	        postfix += " [extern \"C\"] ";
-	      postfix += bare_function_type;
-	      postfix += return_type_postfix;
-	      break;
-	    }
-	    case 'T':
-	      if (!decode_template_param(prefix, qualifiers))
-	      {
-		failure = true;
-		break;
-	      }
-	      if (current() == 'I')
-	      {
-		add_substitution(start_pos, template_template_param);
-		    // substitution: "<template-template-param>".
-		if (!decode_template_args(prefix))
-		{
-		  failure = true;
-		  break;
-		}
-	      }
-	      if (!recursive_template_param_or_substitution_call
-		  && qualifiers->suppressed())
-	      {
-		add_substitution(start_pos, type);
-		    // substitution: "<template-param>" or
-		    // "<template-template-param> <template-args>".
-		qualifiers->decode_qualifiers(prefix, postfix);
-		    // substitution: all qualified types, if any.
-	      }
-	      break;
-	    case 'S':
-	      if (M_pos >= M_maxpos)
-	      {
-		failure = true;
-		break;
-	      }
-	      if (M_str[M_pos + 1] != 't')
-	      {
-		if (!decode_substitution(prefix, qualifiers))
-		{
-		  failure = true;
-		  break;
-		}
-		if (current() == 'I')
-		{
-		  if (!decode_template_args(prefix))
-		  {
-		    failure = true;
-		    break;
-		  }
-		  if (!recursive_template_param_or_substitution_call
-		      && qualifiers->suppressed())
-		    add_substitution(start_pos, type);
-			// Substitution:
-			//   "<template-template-param> <template-args>".
-		}
-		if (!recursive_template_param_or_substitution_call
-		    && qualifiers->suppressed())
-		  qualifiers->decode_qualifiers(prefix, postfix);
-		      // Substitution: all qualified types, if any.
-		break;
-	      }
-	      /* Fall-through for St */
-	    case 'N':
-	    case 'Z':
-	    case '0':
-	    case '1':
-	    case '2':
-	    case '3':
-	    case '4':
-	    case '5':
-	    case '6':
-	    case '7':
-	    case '8':
-	    case '9':
-	      // <Q><T>			==> T Q
-	      //     substitutions: "<T>" (<T> recursive).
-	      if (!decode_class_enum_type(prefix))
-	      {
-		failure = true;
-		break;
-	      }
-	      if (!recursive_template_param_or_substitution_call)
-	      {
-		add_substitution(start_pos, type);
-		    // substitution: "<class-enum-type>".
-		qualifiers->decode_qualifiers(prefix, postfix);
-		    // substitution: all qualified types, if any.
-	      }
-	      else
-		qualifiers->printing_suppressed();
-	      break;
-	    default:
-	      // <Q><T>			==> T Q
-	      //     substitutions: "<T>" (<T> recursive).
-	      if (!decode_builtin_type(prefix))
-	      {
-		failure = true;
-		break;
-	      }
-	      // If decode_type was called from decode_template_param then we
-	      // need to suppress calling qualifiers here in order to get a
-	      // substitution added anyway (for the <template-param>).
-	      if (!recursive_template_param_or_substitution_call)
-		qualifiers->decode_qualifiers(prefix, postfix);
-	      else
-		qualifiers->printing_suppressed();
-	      break;
-	  }
-	}
-    decode_type_exit:
-	--M_inside_type;
-	if (!recursive_template_param_or_substitution_call)
-	{
-	  qualifiers->~qualifier_list<Allocator>();
-	  M_qualifier_list_alloc.deallocate(qualifiers, 1);
-	}
-	if (failure)
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	_GLIBCXX_DEMANGLER_RETURN2;
-      }
-
-    // <nested-name> ::= N [<CV-qualifiers>] <prefix> <unqualified-name> E
-    //               ::= N [<CV-qualifiers>] <template-prefix> <template-args> E
-    //
-    // <prefix> ::= <prefix> <unqualified-name>
-    //          ::= <template-prefix> <template-args>
-    //          ::= <template-param>
-    //          ::= # empty
-    //          ::= <substitution>
-    //
-    // <template-prefix> ::= <prefix> <template unqualified-name>
-    //                   ::= <template-param>
-    //                   ::= <substitution>
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_nested_name(string_type& output,
-					     string_type& qualifiers)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_nested_name");
-
-	if (current() != 'N' || M_pos >= M_maxpos)
-	  _GLIBCXX_DEMANGLER_FAILURE;
-
-	// <CV-qualifiers> ::= [r] [V] [K]  # restrict (C99), volatile, const
-	char const* qualifiers_start = &M_str[M_pos + 1];
-	for (char c = next(); c == 'K' || c == 'V' || c == 'r'; c = next());
-	for (char const* qualifier_ptr = &M_str[M_pos - 1];
-	     qualifier_ptr >= qualifiers_start; --qualifier_ptr)
-	  switch(*qualifier_ptr)
-	  {
-	    case 'K':
-	      qualifiers += " const";
-	      break;
-	    case 'V':
-	      qualifiers += " volatile";
-	      break;
-	    case 'r':
-	      qualifiers += " restrict";
-	      break;
-	  }
-
-	int number_of_prefixes = 0;
-	int substitution_start = M_pos;
-	for(;;)
-	{
-	  ++number_of_prefixes;
-	  if (current() == 'S')
-	  {
-	    if (!decode_substitution(output))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	  }
-	  else if (current() == 'I')
-	  {
-	    if (!decode_template_args(output))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    if (current() != 'E')
-	    {
-	      // substitution: "<template-prefix> <template-args>".
-	      add_substitution(substitution_start, nested_name_prefix,
-			       number_of_prefixes);
-	    }
-	  }
-	  else
-	  {
-	    if (current() == 'T')
-	    {
-	      if (!decode_template_param(output))
-		_GLIBCXX_DEMANGLER_FAILURE;
-	    }
-	    else if (!decode_unqualified_name(output))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    if (current() != 'E')
-	    {
-	      // substitution: "<prefix> <unqualified-name>" or
-	      // "<prefix> <template unqualified-name>".
-	      add_substitution(substitution_start,
-		  (current() == 'I') ?  nested_name_template_prefix
-		                     : nested_name_prefix,
-		  number_of_prefixes);
-	    }
-	  }
-	  if (current() == 'E')
-	  {
-	    eat_current();
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  }
-	  if (current() != 'I')
-	    output += "::";
-	  else if (M_template_args_need_space)
-	    output += ' ';
-	  M_template_args_need_space = false;
-	}
-	_GLIBCXX_DEMANGLER_FAILURE;
-      }
-
-    // <local-name> := Z <function encoding> E <entity name> [<discriminator>]
-    //              := Z <function encoding> E s [<discriminator>]
-    // <discriminator> := _ <non-negative number>
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_local_name(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_local_name");
-	if (current() != 'Z' || M_pos >= M_maxpos)
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	if ((M_pos += decode_encoding(output, M_str + M_pos + 1,
-		M_maxpos - M_pos, M_implementation_details) + 1) < 0 ||
-		eat_current() != 'E')
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	output += "::";
-	if (current() == 's')
-	{
-	  eat_current();
-	  output += "string literal";
-	}
-	else
-	{
-	  string_type nested_name_qualifiers;
-	  if (!decode_name(output, nested_name_qualifiers))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  output += nested_name_qualifiers;
-	}
-	string_type discriminator;
-	if (current() == '_' && next() != 'n' && !decode_number(discriminator))
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <source-name> ::= <positive length number> <identifier>
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_source_name(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_source_name");
-	int length = current() - '0';
-	if (length < 1 || length > 9)
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	while(isdigit(next()))
-	  length = 10 * length + current() - '0';
-	char const* ptr = &M_str[M_pos];
-	if (length > 11 && !strncmp(ptr, "_GLOBAL_", 8) && ptr[9] == 'N'
-	    && ptr[8] == ptr[10])
-	{
-	  output += "(anonymous namespace)";
-	  if ((M_pos += length) > M_maxpos + 1)
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	}
-	else
-	  while(length--)
-	  {
-	    if (current() == 0)
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    output += eat_current();
-	  }
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <unqualified-name> ::= <operator-name>	# Starts with lower case.
-    //                    ::= <ctor-dtor-name>  # Starts with 'C' or 'D'.
-    //                    ::= <source-name>	# Starts with a digit.
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_unqualified_name(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_unqualified_name");
-	if (M_inside_template_args)
-	{
-	  if (!decode_source_name(output))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	}
-	else if (isdigit(current()))
-	{
-	  bool recursive_unqualified_name = (&M_function_name == &output);
-	  // This can be a recursive call when we are decoding
-	  // an <operator-name> that is a cast operator for a some
-	  // <unqualified-name>; for example "operator Foo()".
-	  // In that case this is thus not a ctor or dtor and we
-	  // are not interested in updating M_function_name.
-	  if (!recursive_unqualified_name)
-	    M_function_name.clear();
-	  M_name_is_template = false;
-	  M_name_is_cdtor = false;
-	  M_name_is_conversion_operator = false;
-	  if (!decode_source_name(M_function_name))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  if (!recursive_unqualified_name)
-	    output += M_function_name;
-	}
-	else if (islower(current()))
-	{
-	  M_function_name.clear();
-	  M_name_is_template = false;
-	  M_name_is_cdtor = false;
-	  M_name_is_conversion_operator = false;
-	  if (!decode_operator_name(M_function_name))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  output += M_function_name;
-	}
-	else if (current() == 'C' || current() == 'D')
-	{
-	  // <ctor-dtor-name> ::=
-	  //   C1	# complete object (in-charge) constructor
-	  //   C2	# base object (not-in-charge) constructor
-	  //   C3	# complete object (in-charge) allocating constructor
-	  //   D0	# deleting (in-charge) destructor
-	  //   D1	# complete object (in-charge) destructor
-	  //   D2	# base object (not-in-charge) destructor
-	  //
-	  if (current() == 'C')
-	  {
-	    char c = next();
-	    if (c < '1' || c > '3')
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	  }
-	  else
-	  {
-	    char c = next();
-	    if (c < '0' || c > '2')
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    output += '~';
-	    M_saw_destructor = true;
-	  }
-	  M_name_is_cdtor = true;
-	  eat_current();
-	  output += M_function_name;
-	}
-	else
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <unscoped-name> ::=
-    //   <unqualified-name>		# Starts not with an 'S'
-    //   St <unqualified-name>		# ::std::
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_unscoped_name(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_unscoped_name");
-	if (current() == 'S')
-	{
-	  if (next() != 't')
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  eat_current();
-	  output += "std::";
-	}
-	decode_unqualified_name(output);
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <name> ::=
-    //   <nested-name>				# Starts with 'N'
-    //   <unscoped-template-name> <template-args> # idem
-    //   <local-name>				# Starts with 'Z'
-    //   <unscoped-name>			# Starts with 'S', 'C', 'D',
-    //						# a digit or a lower case
-    //						# character.
-    //
-    // <unscoped-template-name> ::= <unscoped-name>
-    //                          ::= <substitution>
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_name(string_type& output,
-				      string_type& nested_name_qualifiers)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_name");
-	int substitution_start = M_pos;
-	if (current() == 'S' && (M_pos >= M_maxpos || M_str[M_pos + 1] != 't'))
-	{
-	  if (!decode_substitution(output))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	}
-	else if (current() == 'N')
-	{
-	  decode_nested_name(output, nested_name_qualifiers);
-	  _GLIBCXX_DEMANGLER_RETURN;
-	}
-	else if (current() == 'Z')
-	{
-	  decode_local_name(output);
-	  _GLIBCXX_DEMANGLER_RETURN;
-	}
-	else if (!decode_unscoped_name(output))
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	if (current() == 'I')
-	{
-	  // Must have been an <unscoped-template-name>.
-	  add_substitution(substitution_start, unscoped_template_name);
-	  if (!decode_template_args(output))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	}
-	M_template_args_need_space = false;
-	_GLIBCXX_DEMANGLER_RETURN;
-      }
-
-    // <call-offset> ::= h <nv-offset> _
-    //               ::= v <v-offset> _
-    // <nv-offset>   ::= <offset number>
-    //     non-virtual base override
-    //
-    // <v-offset>    ::= <offset number> _ <virtual offset number>
-    //     virtual base override, with vcall offset
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_call_offset(string_type&
-#if _GLIBCXX_DEMANGLER_CWDEBUG
-	  output
-#endif
-	  )
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_call_offset");
-	if (current() == 'h')
-	{
-	  string_type dummy;
-	  eat_current();
-	  if (decode_number(dummy) && current() == '_')
-	  {
-	    eat_current();
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  }
-	}
-	else if (current() == 'v')
-	{
-	  string_type dummy;
-	  eat_current();
-	  if (decode_number(dummy) && current() == '_')
-	  {
-	    eat_current();
-	    if (decode_number(dummy) && current() == '_')
-	    {
-	      eat_current();
-	      _GLIBCXX_DEMANGLER_RETURN;
-	    }
-	  }
-	}
-	_GLIBCXX_DEMANGLER_FAILURE;
-      }
-
-    //
-    // <special-name> ::=
-    //   TV <type>			# virtual table
-    //   TT <type>			# VTT structure (construction
-    //                                    vtable index).
-    //   TI <type>			# typeinfo structure
-    //   TS <type>			# typeinfo name (null-terminated
-    //                                    byte string).
-    //   GV <object name>		# Guard variable for one-time
-    //					  initialization of static objects in
-    //					  a local scope.
-    //   T <call-offset> <base encoding># base is the nominal target function
-    //					  of thunk.
-    //   Tc <call-offset> <call-offset> <base encoding> # base is the nominal
-    //                                    target function of thunk; first
-    //                                    call-offset is 'this' adjustment;
-    //					  second call-offset is result
-    //					  adjustment
-    //
-    template<typename Tp, typename Allocator>
-      bool
-      session<Tp, Allocator>::decode_special_name(string_type& output)
-      {
-	_GLIBCXX_DEMANGLER_DOUT_ENTERING("decode_special_name");
-	if (current() == 'G')
-	{
-	  if (next() != 'V')
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  output += "guard variable for ";
-	  string_type nested_name_qualifiers;
-	  eat_current();
-	  if (!decode_name(output, nested_name_qualifiers))
-	    _GLIBCXX_DEMANGLER_FAILURE;
-	  output += nested_name_qualifiers;
-	  _GLIBCXX_DEMANGLER_RETURN;
-	}
-	else if (current() != 'T')
-	  _GLIBCXX_DEMANGLER_FAILURE;
-	switch(next())
-	{
-	  case 'V':
-	    output += "vtable for ";
-	    eat_current();
-	    decode_type(output);
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  case 'T':
-	    output += "VTT for ";
-	    eat_current();
-	    decode_type(output);
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  case 'I':
-	    output += "typeinfo for ";
-	    eat_current();
-	    decode_type(output);
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  case 'S':
-	    output += "typeinfo name for ";
-	    eat_current();
-	    decode_type(output);
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  case 'c':
-	    output += "covariant return thunk to ";
-	    if (!decode_call_offset(output)
-		|| !decode_call_offset(output)
-		|| (M_pos += decode_encoding(output, M_str + M_pos,
-		    M_maxpos - M_pos + 1, M_implementation_details)) < 0)
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  case 'C':		// GNU extension?
-	  {
-	    string_type first;
-	    output += "construction vtable for ";
-	    eat_current();
-	    if (!decode_type(first))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    while(isdigit(current()))
-	      eat_current();
-	    if (eat_current() != '_')
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    if (!decode_type(output))
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    output += "-in-";
-	    output += first;
-	    _GLIBCXX_DEMANGLER_RETURN;
-	  }
-	  default:
-	    if (current() == 'v')
-	      output += "virtual thunk to ";
-	    else
-	      output += "non-virtual thunk to ";
-	    if (!decode_call_offset(output)
-		|| (M_pos += decode_encoding(output, M_str + M_pos,
-		    M_maxpos - M_pos + 1, M_implementation_details)) < 0)
-	      _GLIBCXX_DEMANGLER_FAILURE;
-	    _GLIBCXX_DEMANGLER_RETURN;
-	}
-      }
-
-    // <encoding> ::=
-    //   <function name> <bare-function-type>	# Starts with 'C', 'D', 'N',
-    //						  'S', a digit or a lower case
-    //						  character.
-    //   <data name>				# Idem.
-    //   <special-name>				# Starts with 'T' or 'G'.
-    template<typename Tp, typename Allocator>
-      int
-      session<Tp, Allocator>::decode_encoding(string_type& output,
-          char const* in, int len, implementation_details const& id)
-      {
-#if _GLIBCXX_DEMANGLER_CWDEBUG
-	_GLIBCXX_DEMANGLER_DOUT(dc::demangler,
-	    "Output thus far: \"" << output << '"');
-	string_type input(in, len > 0x40000000 ? strlen(in) : len);
-	_GLIBCXX_DEMANGLER_DOUT(
-	    dc::demangler, "Entering decode_encoding(\"" << input << "\")");
-#endif
-	if (len <= 0)
-	  return INT_MIN;
-	session<Tp, Allocator> demangler_session(in, len, id);
-	string_type nested_name_qualifiers;
-	int saved_pos;
-	demangler_session.store(saved_pos);
-	if (demangler_session.decode_special_name(output))
-	  return demangler_session.M_pos;
-	demangler_session.restore(saved_pos);
-	string_type name;
-	if (!demangler_session.decode_name(name, nested_name_qualifiers))
-	  return INT_MIN;
-	if (demangler_session.current() == 0
-	    || demangler_session.current() == 'E')
-	{
-	  output += name;
-	  output += nested_name_qualifiers;
-	  return demangler_session.M_pos;
-	}
-	// Must have been a <function name>.
-	string_type return_type_postfix;
-	if (demangler_session.M_name_is_template
-	    && !(demangler_session.M_name_is_cdtor
-	         || demangler_session.M_name_is_conversion_operator))
-	{
-	  // Return type of function
-	  if (!demangler_session.decode_type_with_postfix(output,
-	      return_type_postfix))
-	    return INT_MIN;
-	  output += ' ';
-	}
-	output += name;
-	if (!demangler_session.decode_bare_function_type(output))
-	  return INT_MIN;
-	output += nested_name_qualifiers;
-	output += return_type_postfix;
-	return demangler_session.M_pos;
-      }
-
-    } // namespace demangler
-
-  // Public interface
-  template<typename Tp, typename Allocator>
-    struct demangle
-    {
-      typedef typename Allocator::template rebind<char>::other char_Allocator;
-      typedef std::basic_string<char, std::char_traits<char>, char_Allocator>
-	  string_type;
-      static string_type symbol(char const* in,
-                                demangler::implementation_details const& id);
-      static string_type type(char const* in,
-                              demangler::implementation_details const& id);
-    };
-
-  // demangle::symbol()
-  //
-  // Demangle `input' which should be a mangled function name as for
-  // instance returned by nm(1).
-  template<typename Tp, typename Allocator>
-    typename demangle<Tp, Allocator>::string_type
-    demangle<Tp, Allocator>::symbol(char const* input,
-                                demangler::implementation_details const& id)
-    {
-      // <mangled-name> ::= _Z <encoding>
-      // <mangled-name> ::= _GLOBAL_ _<type>_ <disambiguation part>
-      //                    <type> can be I or D (GNU extension)
-      typedef demangler::session<Tp, Allocator> demangler_type;
-      string_type result;
-      bool failure = (input[0] != '_');
-
-      if (!failure)
-      {
-	if (input[1] == 'G')
-	{
-	  if (!strncmp(input, "_GLOBAL__", 9)
-	      && (input[9] == 'D' || input[9] == 'I')
-	      && input[10] == '_')
-	  {
-	    if (input[9] == 'D')
-	      result.assign("global destructors keyed to ", 28);
-	    else
-	      result.assign("global constructors keyed to ", 29);
-	    // Output the disambiguation part as-is.
-	    result += input + 11;
-	  }
-	  else
-	    failure = true;
-	}
-	else if (input[1] == 'Z')
-	{
-	  int cnt =
-	      demangler_type::decode_encoding(result, input + 2, INT_MAX, id);
-	  if (cnt < 0 || input[cnt + 2] != 0)
-	    failure = true;
-	}
-	else
-	  failure = true;
-      }
-
-      // Failure to demangle, return the mangled name.
-      if (failure)
-	result.assign(input, strlen(input));
-
-      return result;
-    }
-
-  // demangle::type()
-  // Demangle `input' which must be a zero terminated mangled type
-  // name as for instance returned by std::type_info::name().
-  template<typename Tp, typename Allocator>
-    typename demangle<Tp, Allocator>::string_type
-    demangle<Tp, Allocator>::type(char const* input,
-                              demangler::implementation_details const& id)
-    {
-      std::basic_string<char, std::char_traits<char>, Allocator> result;
-      if (input == NULL)
-	result = "(null)";
-      else
-      {
-	demangler::session<Tp, Allocator> demangler_session(input, INT_MAX, id);
-	if (!demangler_session.decode_type(result)
-	    || demangler_session.remaining_input_characters())
-	{
-	  // Failure to demangle, return the mangled name.
-	  result = input;
-	}
-      }
-      return result;
-    }
-} // namespace __gnu_cxx
-
-#endif // __DEMANGLE_H
diff --git a/include.new/c++/3.4/ext/enc_filebuf.h b/include.new/c++/3.4/ext/enc_filebuf.h
deleted file mode 100644
index 39f4ef7..0000000
--- a/include.new/c++/3.4/ext/enc_filebuf.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// filebuf with __enc_traits state type -*- C++ -*-
-
-// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#include <fstream>
-#include <locale>
-
-namespace __gnu_cxx
-{
-  // Custom traits type with __enc_traits for the state type, and the
-  // associated fpos<__enc_traits> for the position type, all other
-  // bits equivalent to the required char_traits instantiations.
-  template<typename _CharT>
-    struct enc_char_traits: public std::char_traits<_CharT>
-    {
-      typedef std::__enc_traits			state_type;
-      typedef typename std::fpos<state_type>	pos_type;
-    };
-
-  template<typename _CharT>
-    class enc_filebuf
-    : public std::basic_filebuf<_CharT, enc_char_traits<_CharT> >
-    {
-    public:
-      typedef enc_char_traits<_CharT>		traits_type;
-      typedef typename traits_type::state_type	state_type;
-      typedef typename traits_type::pos_type	pos_type;
-
-      enc_filebuf(state_type& __state)
-      : std::basic_filebuf<_CharT, enc_char_traits<_CharT> >()
-      {
-	this->_M_state_beg = __state;
-	this->_M_state_beg._M_init();
-      }
-
-    private:
-      // concept requirements:
-      // Set state type to something useful.
-      // Something more than copyconstructible is needed here, so
-      // require default and copy constructible + assignment operator.
-      __glibcxx_class_requires(state_type, _SGIAssignableConcept)
-    };
-} // namespace __gnu_cxx
diff --git a/include.new/c++/3.4/ext/functional b/include.new/c++/3.4/ext/functional
deleted file mode 100644
index 1a37817..0000000
--- a/include.new/c++/3.4/ext/functional
+++ /dev/null
@@ -1,395 +0,0 @@
-// Functional extensions -*- C++ -*-
-
-// Copyright (C) 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/functional
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _EXT_FUNCTIONAL
-#define _EXT_FUNCTIONAL 1
-
-#pragma GCC system_header
-
-#include <functional>
-
-namespace __gnu_cxx
-{
-using std::unary_function;
-using std::binary_function;
-using std::mem_fun1_t;
-using std::const_mem_fun1_t;
-using std::mem_fun1_ref_t;
-using std::const_mem_fun1_ref_t;
-
-/** The @c identity_element functions are not part of the C++ standard; SGI
- *  provided them as an extension.  Its argument is an operation, and its
- *  return value is the identity element for that operation.  It is overloaded
- *  for addition and multiplication, and you can overload it for your own
- *  nefarious operations.
- *
- *  @addtogroup SGIextensions
- *  @{
-*/
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Tp> inline _Tp identity_element(std::plus<_Tp>) {
-  return _Tp(0);
-}
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Tp> inline _Tp identity_element(std::multiplies<_Tp>) {
-  return _Tp(1);
-}
-/** @}  */
-
-/** As an extension to the binders, SGI provided composition functors and
- *  wrapper functions to aid in their creation.  The @c unary_compose
- *  functor is constructed from two functions/functors, @c f and @c g.
- *  Calling @c operator() with a single argument @c x returns @c f(g(x)).
- *  The function @c compose1 takes the two functions and constructs a
- *  @c unary_compose variable for you.
- *
- *  @c binary_compose is constructed from three functors, @c f, @c g1,
- *  and @c g2.  Its @c operator() returns @c f(g1(x),g2(x)).  The function
- *  @compose2 takes f, g1, and g2, and constructs the @c binary_compose
- *  instance for you.  For example, if @c f returns an int, then
- *  \code
- *  int answer = (compose2(f,g1,g2))(x);
- *  \endcode
- *  is equivalent to
- *  \code
- *  int temp1 = g1(x);
- *  int temp2 = g2(x);
- *  int answer = f(temp1,temp2);
- *  \endcode
- *  But the first form is more compact, and can be passed around as a
- *  functor to other algorithms.
- *
- *  @addtogroup SGIextensions
- *  @{
-*/
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Operation1, class _Operation2>
-class unary_compose
-  : public unary_function<typename _Operation2::argument_type,
-		       typename _Operation1::result_type>
-{
-protected:
-  _Operation1 _M_fn1;
-  _Operation2 _M_fn2;
-public:
-  unary_compose(const _Operation1& __x, const _Operation2& __y)
-    : _M_fn1(__x), _M_fn2(__y) {}
-  typename _Operation1::result_type
-  operator()(const typename _Operation2::argument_type& __x) const {
-    return _M_fn1(_M_fn2(__x));
-  }
-};
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Operation1, class _Operation2>
-inline unary_compose<_Operation1,_Operation2>
-compose1(const _Operation1& __fn1, const _Operation2& __fn2)
-{
-  return unary_compose<_Operation1,_Operation2>(__fn1, __fn2);
-}
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Operation1, class _Operation2, class _Operation3>
-class binary_compose
-  : public unary_function<typename _Operation2::argument_type,
-                          typename _Operation1::result_type> {
-protected:
-  _Operation1 _M_fn1;
-  _Operation2 _M_fn2;
-  _Operation3 _M_fn3;
-public:
-  binary_compose(const _Operation1& __x, const _Operation2& __y,
-                 const _Operation3& __z)
-    : _M_fn1(__x), _M_fn2(__y), _M_fn3(__z) { }
-  typename _Operation1::result_type
-  operator()(const typename _Operation2::argument_type& __x) const {
-    return _M_fn1(_M_fn2(__x), _M_fn3(__x));
-  }
-};
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Operation1, class _Operation2, class _Operation3>
-inline binary_compose<_Operation1, _Operation2, _Operation3>
-compose2(const _Operation1& __fn1, const _Operation2& __fn2,
-         const _Operation3& __fn3)
-{
-  return binary_compose<_Operation1,_Operation2,_Operation3>
-    (__fn1, __fn2, __fn3);
-}
-/** @}  */
-
-/** As an extension, SGI provided a functor called @c identity.  When a
- *  functor is required but no operations are desired, this can be used as a
- *  pass-through.  Its @c operator() returns its argument unchanged.
- *
- *  @addtogroup SGIextensions
-*/
-template <class _Tp> struct identity : public std::_Identity<_Tp> {};
-
-/** @c select1st and @c select2nd are extensions provided by SGI.  Their
- *  @c operator()s
- *  take a @c std::pair as an argument, and return either the first member
- *  or the second member, respectively.  They can be used (especially with
- *  the composition functors) to "strip" data from a sequence before
- *  performing the remainder of an algorithm.
- *
- *  @addtogroup SGIextensions
- *  @{
-*/
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Pair> struct select1st : public std::_Select1st<_Pair> {};
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Pair> struct select2nd : public std::_Select2nd<_Pair> {};
-/** @}  */
-
-// extension documented next
-template <class _Arg1, class _Arg2>
-struct _Project1st : public binary_function<_Arg1, _Arg2, _Arg1> {
-  _Arg1 operator()(const _Arg1& __x, const _Arg2&) const { return __x; }
-};
-
-template <class _Arg1, class _Arg2>
-struct _Project2nd : public binary_function<_Arg1, _Arg2, _Arg2> {
-  _Arg2 operator()(const _Arg1&, const _Arg2& __y) const { return __y; }
-};
-
-/** The @c operator() of the @c project1st functor takes two arbitrary
- *  arguments and returns the first one, while @c project2nd returns the
- *  second one.  They are extensions provided by SGI.
- *
- *  @addtogroup SGIextensions
- *  @{
-*/
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Arg1, class _Arg2>
-struct project1st : public _Project1st<_Arg1, _Arg2> {};
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Arg1, class _Arg2>
-struct project2nd : public _Project2nd<_Arg1, _Arg2> {};
-/** @}  */
-
-// extension documented next
-template <class _Result>
-struct _Constant_void_fun {
-  typedef _Result result_type;
-  result_type _M_val;
-
-  _Constant_void_fun(const result_type& __v) : _M_val(__v) {}
-  const result_type& operator()() const { return _M_val; }
-};
-
-template <class _Result, class _Argument>
-struct _Constant_unary_fun {
-  typedef _Argument argument_type;
-  typedef  _Result  result_type;
-  result_type _M_val;
-
-  _Constant_unary_fun(const result_type& __v) : _M_val(__v) {}
-  const result_type& operator()(const _Argument&) const { return _M_val; }
-};
-
-template <class _Result, class _Arg1, class _Arg2>
-struct _Constant_binary_fun {
-  typedef  _Arg1   first_argument_type;
-  typedef  _Arg2   second_argument_type;
-  typedef  _Result result_type;
-  _Result _M_val;
-
-  _Constant_binary_fun(const _Result& __v) : _M_val(__v) {}
-  const result_type& operator()(const _Arg1&, const _Arg2&) const {
-    return _M_val;
-  }
-};
-
-/** These three functors are each constructed from a single arbitrary
- *  variable/value.  Later, their @c operator()s completely ignore any
- *  arguments passed, and return the stored value.
- *  - @c constant_void_fun's @c operator() takes no arguments
- *  - @c constant_unary_fun's @c operator() takes one argument (ignored)
- *  - @c constant_binary_fun's @c operator() takes two arguments (ignored)
- *
- *  The helper creator functions @c constant0, @c constant1, and
- *  @c constant2 each take a "result" argument and construct variables of
- *  the appropriate functor type.
- *
- *  @addtogroup SGIextensions
- *  @{
-*/
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Result>
-struct constant_void_fun : public _Constant_void_fun<_Result> {
-  constant_void_fun(const _Result& __v) : _Constant_void_fun<_Result>(__v) {}
-};
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Result,
-          class _Argument = _Result>
-struct constant_unary_fun : public _Constant_unary_fun<_Result, _Argument>
-{
-  constant_unary_fun(const _Result& __v)
-    : _Constant_unary_fun<_Result, _Argument>(__v) {}
-};
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Result,
-          class _Arg1 = _Result,
-          class _Arg2 = _Arg1>
-struct constant_binary_fun
-  : public _Constant_binary_fun<_Result, _Arg1, _Arg2>
-{
-  constant_binary_fun(const _Result& __v)
-    : _Constant_binary_fun<_Result, _Arg1, _Arg2>(__v) {}
-};
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Result>
-inline constant_void_fun<_Result> constant0(const _Result& __val)
-{
-  return constant_void_fun<_Result>(__val);
-}
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Result>
-inline constant_unary_fun<_Result,_Result> constant1(const _Result& __val)
-{
-  return constant_unary_fun<_Result,_Result>(__val);
-}
-
-/// An \link SGIextensions SGI extension \endlink.
-template <class _Result>
-inline constant_binary_fun<_Result,_Result,_Result>
-constant2(const _Result& __val)
-{
-  return constant_binary_fun<_Result,_Result,_Result>(__val);
-}
-/** @}  */
-
-/** The @c subtractive_rng class is documented on
- *  <a href="http://www.sgi.com/tech/stl/">SGI's site</a>.
- *  Note that this code assumes that @c int is 32 bits.
- *
- *  @ingroup SGIextensions
-*/
-class subtractive_rng : public unary_function<unsigned int, unsigned int> {
-private:
-  unsigned int _M_table[55];
-  size_t _M_index1;
-  size_t _M_index2;
-public:
-  /// Returns a number less than the argument.
-  unsigned int operator()(unsigned int __limit) {
-    _M_index1 = (_M_index1 + 1) % 55;
-    _M_index2 = (_M_index2 + 1) % 55;
-    _M_table[_M_index1] = _M_table[_M_index1] - _M_table[_M_index2];
-    return _M_table[_M_index1] % __limit;
-  }
-
-  void _M_initialize(unsigned int __seed)
-  {
-    unsigned int __k = 1;
-    _M_table[54] = __seed;
-    size_t __i;
-    for (__i = 0; __i < 54; __i++) {
-        size_t __ii = (21 * (__i + 1) % 55) - 1;
-        _M_table[__ii] = __k;
-        __k = __seed - __k;
-        __seed = _M_table[__ii];
-    }
-    for (int __loop = 0; __loop < 4; __loop++) {
-        for (__i = 0; __i < 55; __i++)
-            _M_table[__i] = _M_table[__i] - _M_table[(1 + __i + 30) % 55];
-    }
-    _M_index1 = 0;
-    _M_index2 = 31;
-  }
-
-  /// Ctor allowing you to initialize the seed.
-  subtractive_rng(unsigned int __seed) { _M_initialize(__seed); }
-  /// Default ctor; initializes its state with some number you don't see.
-  subtractive_rng() { _M_initialize(161803398u); }
-};
-
-// Mem_fun adaptor helper functions mem_fun1 and mem_fun1_ref,
-// provided for backward compatibility, they are no longer part of
-// the C++ standard.
-
-template <class _Ret, class _Tp, class _Arg>
-inline mem_fun1_t<_Ret,_Tp,_Arg> mem_fun1(_Ret (_Tp::*__f)(_Arg))
-  { return mem_fun1_t<_Ret,_Tp,_Arg>(__f); }
-
-template <class _Ret, class _Tp, class _Arg>
-inline const_mem_fun1_t<_Ret,_Tp,_Arg> mem_fun1(_Ret (_Tp::*__f)(_Arg) const)
-  { return const_mem_fun1_t<_Ret,_Tp,_Arg>(__f); }
-
-template <class _Ret, class _Tp, class _Arg>
-inline mem_fun1_ref_t<_Ret,_Tp,_Arg> mem_fun1_ref(_Ret (_Tp::*__f)(_Arg))
-  { return mem_fun1_ref_t<_Ret,_Tp,_Arg>(__f); }
-
-template <class _Ret, class _Tp, class _Arg>
-inline const_mem_fun1_ref_t<_Ret,_Tp,_Arg>
-mem_fun1_ref(_Ret (_Tp::*__f)(_Arg) const)
-  { return const_mem_fun1_ref_t<_Ret,_Tp,_Arg>(__f); }
-} // namespace __gnu_cxx
-
-#endif
-
diff --git a/include.new/c++/3.4/ext/hash_fun.h b/include.new/c++/3.4/ext/hash_fun.h
deleted file mode 100644
index 27453a6..0000000
--- a/include.new/c++/3.4/ext/hash_fun.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// 'struct hash' from SGI -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file ext/hash_fun.h
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _HASH_FUN_H
-#define _HASH_FUN_H 1
-
-#include <cstddef>
-
-namespace __gnu_cxx
-{
-  using std::size_t;
-
-  template <class _Key> struct hash { };
-
-  inline size_t
-  __stl_hash_string(const char* __s)
-  {
-    unsigned long __h = 0;
-    for ( ; *__s; ++__s)
-      __h = 5*__h + *__s;
-    return size_t(__h);
-  }
-
-  template<> struct hash<char*>
-  {
-    size_t operator()(const char* __s) const
-    { return __stl_hash_string(__s); }
-  };
-
-  template<> struct hash<const char*>
-  {
-    size_t operator()(const char* __s) const
-    { return __stl_hash_string(__s); }
-  };
-
-  template<> struct hash<char>
-  { size_t operator()(char __x) const { return __x; } };
-
-  template<> struct hash<unsigned char>
-  { size_t operator()(unsigned char __x) const { return __x; } };
-
-  template<> struct hash<signed char>
-  { size_t operator()(unsigned char __x) const { return __x; } };
-
-  template<> struct hash<short>
-  { size_t operator()(short __x) const { return __x; } };
-
-  template<> struct hash<unsigned short>
-  { size_t operator()(unsigned short __x) const { return __x; } };
-
-  template<> struct hash<int>
-  { size_t operator()(int __x) const { return __x; } };
-
-  template<> struct hash<unsigned int>
-  { size_t operator()(unsigned int __x) const { return __x; } };
-
-  template<> struct hash<long>
-  { size_t operator()(long __x) const { return __x; } };
-
-  template<> struct hash<unsigned long>
-  { size_t operator()(unsigned long __x) const { return __x; } };
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/ext/hash_map b/include.new/c++/3.4/ext/hash_map
deleted file mode 100644
index 5032c7b..0000000
--- a/include.new/c++/3.4/ext/hash_map
+++ /dev/null
@@ -1,447 +0,0 @@
-// Hashing map implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file ext/hash_map
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _HASH_MAP
-#define _HASH_MAP 1
-
-#include <ext/hashtable.h>
-#include <bits/concept_check.h>
-
-namespace __gnu_cxx
-{
-  using std::equal_to;
-  using std::allocator;
-  using std::pair;
-  using std::_Select1st;
-
-  // Forward declaration of equality operator; needed for friend
-  // declaration.
-  template<class _Key, class _Tp, class _HashFcn  = hash<_Key>,
-	    class _EqualKey = equal_to<_Key>, class _Alloc =  allocator<_Tp> >
-    class hash_map;
-
-  template<class _Key, class _Tp, class _HashFn, class _EqKey, class _Alloc>
-  inline bool operator==(const hash_map<_Key, _Tp, _HashFn, _EqKey, _Alloc>&,
-			 const hash_map<_Key, _Tp, _HashFn, _EqKey, _Alloc>&);
-/**
- *  This is an SGI extension.
- *  @ingroup SGIextensions
- *  @doctodo
-*/
-template <class _Key, class _Tp, class _HashFcn, class _EqualKey,
-          class _Alloc>
-class hash_map
-{
-private:
-  typedef hashtable<pair<const _Key,_Tp>,_Key,_HashFcn,
-                    _Select1st<pair<const _Key,_Tp> >,_EqualKey,_Alloc> _Ht;
-  _Ht _M_ht;
-
-public:
-  typedef typename _Ht::key_type key_type;
-  typedef _Tp data_type;
-  typedef _Tp mapped_type;
-  typedef typename _Ht::value_type value_type;
-  typedef typename _Ht::hasher hasher;
-  typedef typename _Ht::key_equal key_equal;
-
-  typedef typename _Ht::size_type size_type;
-  typedef typename _Ht::difference_type difference_type;
-  typedef typename _Ht::pointer pointer;
-  typedef typename _Ht::const_pointer const_pointer;
-  typedef typename _Ht::reference reference;
-  typedef typename _Ht::const_reference const_reference;
-
-  typedef typename _Ht::iterator iterator;
-  typedef typename _Ht::const_iterator const_iterator;
-
-  typedef typename _Ht::allocator_type allocator_type;
-
-  hasher hash_funct() const { return _M_ht.hash_funct(); }
-  key_equal key_eq() const { return _M_ht.key_eq(); }
-  allocator_type get_allocator() const { return _M_ht.get_allocator(); }
-
-public:
-  hash_map() : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-  explicit hash_map(size_type __n)
-    : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-  hash_map(size_type __n, const hasher& __hf)
-    : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-  hash_map(size_type __n, const hasher& __hf, const key_equal& __eql,
-           const allocator_type& __a = allocator_type())
-    : _M_ht(__n, __hf, __eql, __a) {}
-
-  template <class _InputIterator>
-  hash_map(_InputIterator __f, _InputIterator __l)
-    : _M_ht(100, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_unique(__f, __l); }
-  template <class _InputIterator>
-  hash_map(_InputIterator __f, _InputIterator __l, size_type __n)
-    : _M_ht(__n, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_unique(__f, __l); }
-  template <class _InputIterator>
-  hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
-           const hasher& __hf)
-    : _M_ht(__n, __hf, key_equal(), allocator_type())
-    { _M_ht.insert_unique(__f, __l); }
-  template <class _InputIterator>
-  hash_map(_InputIterator __f, _InputIterator __l, size_type __n,
-           const hasher& __hf, const key_equal& __eql,
-           const allocator_type& __a = allocator_type())
-    : _M_ht(__n, __hf, __eql, __a)
-    { _M_ht.insert_unique(__f, __l); }
-
-public:
-  size_type size() const { return _M_ht.size(); }
-  size_type max_size() const { return _M_ht.max_size(); }
-  bool empty() const { return _M_ht.empty(); }
-  void swap(hash_map& __hs) { _M_ht.swap(__hs._M_ht); }
-
-  template <class _K1, class _T1, class _HF, class _EqK, class _Al>
-  friend bool operator== (const hash_map<_K1, _T1, _HF, _EqK, _Al>&,
-                          const hash_map<_K1, _T1, _HF, _EqK, _Al>&);
-
-  iterator begin() { return _M_ht.begin(); }
-  iterator end() { return _M_ht.end(); }
-  const_iterator begin() const { return _M_ht.begin(); }
-  const_iterator end() const { return _M_ht.end(); }
-
-public:
-  pair<iterator,bool> insert(const value_type& __obj)
-    { return _M_ht.insert_unique(__obj); }
-  template <class _InputIterator>
-  void insert(_InputIterator __f, _InputIterator __l)
-    { _M_ht.insert_unique(__f,__l); }
-  pair<iterator,bool> insert_noresize(const value_type& __obj)
-    { return _M_ht.insert_unique_noresize(__obj); }
-
-  iterator find(const key_type& __key) { return _M_ht.find(__key); }
-  const_iterator find(const key_type& __key) const
-    { return _M_ht.find(__key); }
-
-  _Tp& operator[](const key_type& __key) {
-    return _M_ht.find_or_insert(value_type(__key, _Tp())).second;
-  }
-
-  size_type count(const key_type& __key) const { return _M_ht.count(__key); }
-
-  pair<iterator, iterator> equal_range(const key_type& __key)
-    { return _M_ht.equal_range(__key); }
-  pair<const_iterator, const_iterator>
-  equal_range(const key_type& __key) const
-    { return _M_ht.equal_range(__key); }
-
-  size_type erase(const key_type& __key) {return _M_ht.erase(__key); }
-  void erase(iterator __it) { _M_ht.erase(__it); }
-  void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
-  void clear() { _M_ht.clear(); }
-
-  void resize(size_type __hint) { _M_ht.resize(__hint); }
-  size_type bucket_count() const { return _M_ht.bucket_count(); }
-  size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
-  size_type elems_in_bucket(size_type __n) const
-    { return _M_ht.elems_in_bucket(__n); }
-};
-
-template <class _Key, class _Tp, class _HashFcn, class _EqlKey, class _Alloc>
-inline bool
-operator==(const hash_map<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm1,
-           const hash_map<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm2)
-{
-  return __hm1._M_ht == __hm2._M_ht;
-}
-
-template <class _Key, class _Tp, class _HashFcn, class _EqlKey, class _Alloc>
-inline bool
-operator!=(const hash_map<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm1,
-           const hash_map<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm2) {
-  return !(__hm1 == __hm2);
-}
-
-template <class _Key, class _Tp, class _HashFcn, class _EqlKey, class _Alloc>
-inline void
-swap(hash_map<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm1,
-     hash_map<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm2)
-{
-  __hm1.swap(__hm2);
-}
-
-// Forward declaration of equality operator; needed for friend declaration.
-
-template <class _Key, class _Tp,
-          class _HashFcn  = hash<_Key>,
-          class _EqualKey = equal_to<_Key>,
-          class _Alloc =  allocator<_Tp> >
-class hash_multimap;
-
-template <class _Key, class _Tp, class _HF, class _EqKey, class _Alloc>
-inline bool
-operator==(const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm1,
-           const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm2);
-
-/**
- *  This is an SGI extension.
- *  @ingroup SGIextensions
- *  @doctodo
-*/
-template <class _Key, class _Tp, class _HashFcn, class _EqualKey, class _Alloc>
-class hash_multimap
-{
-  // concept requirements
-  __glibcxx_class_requires(_Key, _SGIAssignableConcept)
-  __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-  __glibcxx_class_requires3(_HashFcn, size_t, _Key, _UnaryFunctionConcept)
-  __glibcxx_class_requires3(_EqualKey, _Key, _Key, _BinaryPredicateConcept)
-
-private:
-  typedef hashtable<pair<const _Key, _Tp>, _Key, _HashFcn,
-                    _Select1st<pair<const _Key, _Tp> >, _EqualKey, _Alloc>
-          _Ht;
-  _Ht _M_ht;
-
-public:
-  typedef typename _Ht::key_type key_type;
-  typedef _Tp data_type;
-  typedef _Tp mapped_type;
-  typedef typename _Ht::value_type value_type;
-  typedef typename _Ht::hasher hasher;
-  typedef typename _Ht::key_equal key_equal;
-
-  typedef typename _Ht::size_type size_type;
-  typedef typename _Ht::difference_type difference_type;
-  typedef typename _Ht::pointer pointer;
-  typedef typename _Ht::const_pointer const_pointer;
-  typedef typename _Ht::reference reference;
-  typedef typename _Ht::const_reference const_reference;
-
-  typedef typename _Ht::iterator iterator;
-  typedef typename _Ht::const_iterator const_iterator;
-
-  typedef typename _Ht::allocator_type allocator_type;
-
-  hasher hash_funct() const { return _M_ht.hash_funct(); }
-  key_equal key_eq() const { return _M_ht.key_eq(); }
-  allocator_type get_allocator() const { return _M_ht.get_allocator(); }
-
-public:
-  hash_multimap() : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-  explicit hash_multimap(size_type __n)
-    : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-  hash_multimap(size_type __n, const hasher& __hf)
-    : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-  hash_multimap(size_type __n, const hasher& __hf, const key_equal& __eql,
-                const allocator_type& __a = allocator_type())
-    : _M_ht(__n, __hf, __eql, __a) {}
-
-  template <class _InputIterator>
-  hash_multimap(_InputIterator __f, _InputIterator __l)
-    : _M_ht(100, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_equal(__f, __l); }
-  template <class _InputIterator>
-  hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n)
-    : _M_ht(__n, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_equal(__f, __l); }
-  template <class _InputIterator>
-  hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
-                const hasher& __hf)
-    : _M_ht(__n, __hf, key_equal(), allocator_type())
-    { _M_ht.insert_equal(__f, __l); }
-  template <class _InputIterator>
-  hash_multimap(_InputIterator __f, _InputIterator __l, size_type __n,
-                const hasher& __hf, const key_equal& __eql,
-                const allocator_type& __a = allocator_type())
-    : _M_ht(__n, __hf, __eql, __a)
-    { _M_ht.insert_equal(__f, __l); }
-
-public:
-  size_type size() const { return _M_ht.size(); }
-  size_type max_size() const { return _M_ht.max_size(); }
-  bool empty() const { return _M_ht.empty(); }
-  void swap(hash_multimap& __hs) { _M_ht.swap(__hs._M_ht); }
-
-  template <class _K1, class _T1, class _HF, class _EqK, class _Al>
-  friend bool operator== (const hash_multimap<_K1, _T1, _HF, _EqK, _Al>&,
-                          const hash_multimap<_K1, _T1, _HF, _EqK, _Al>&);
-
-  iterator begin() { return _M_ht.begin(); }
-  iterator end() { return _M_ht.end(); }
-  const_iterator begin() const { return _M_ht.begin(); }
-  const_iterator end() const { return _M_ht.end(); }
-
-public:
-  iterator insert(const value_type& __obj)
-    { return _M_ht.insert_equal(__obj); }
-  template <class _InputIterator>
-  void insert(_InputIterator __f, _InputIterator __l)
-    { _M_ht.insert_equal(__f,__l); }
-  iterator insert_noresize(const value_type& __obj)
-    { return _M_ht.insert_equal_noresize(__obj); }
-
-  iterator find(const key_type& __key) { return _M_ht.find(__key); }
-  const_iterator find(const key_type& __key) const
-    { return _M_ht.find(__key); }
-
-  size_type count(const key_type& __key) const { return _M_ht.count(__key); }
-
-  pair<iterator, iterator> equal_range(const key_type& __key)
-    { return _M_ht.equal_range(__key); }
-  pair<const_iterator, const_iterator>
-  equal_range(const key_type& __key) const
-    { return _M_ht.equal_range(__key); }
-
-  size_type erase(const key_type& __key) {return _M_ht.erase(__key); }
-  void erase(iterator __it) { _M_ht.erase(__it); }
-  void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
-  void clear() { _M_ht.clear(); }
-
-public:
-  void resize(size_type __hint) { _M_ht.resize(__hint); }
-  size_type bucket_count() const { return _M_ht.bucket_count(); }
-  size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
-  size_type elems_in_bucket(size_type __n) const
-    { return _M_ht.elems_in_bucket(__n); }
-};
-
-template <class _Key, class _Tp, class _HF, class _EqKey, class _Alloc>
-inline bool
-operator==(const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm1,
-           const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm2)
-{
-  return __hm1._M_ht == __hm2._M_ht;
-}
-
-template <class _Key, class _Tp, class _HF, class _EqKey, class _Alloc>
-inline bool
-operator!=(const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm1,
-           const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm2) {
-  return !(__hm1 == __hm2);
-}
-
-template <class _Key, class _Tp, class _HashFcn, class _EqlKey, class _Alloc>
-inline void
-swap(hash_multimap<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm1,
-     hash_multimap<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm2)
-{
-  __hm1.swap(__hm2);
-}
-
-} // namespace __gnu_cxx
-
-namespace std
-{
-// Specialization of insert_iterator so that it will work for hash_map
-// and hash_multimap.
-
-template <class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
-class insert_iterator<__gnu_cxx::hash_map<_Key, _Tp, _HashFn, _EqKey, _Alloc> > {
-protected:
-  typedef __gnu_cxx::hash_map<_Key, _Tp, _HashFn, _EqKey, _Alloc> _Container;
-  _Container* container;
-public:
-  typedef _Container          container_type;
-  typedef output_iterator_tag iterator_category;
-  typedef void                value_type;
-  typedef void                difference_type;
-  typedef void                pointer;
-  typedef void                reference;
-
-  insert_iterator(_Container& __x) : container(&__x) {}
-  insert_iterator(_Container& __x, typename _Container::iterator)
-    : container(&__x) {}
-  insert_iterator<_Container>&
-  operator=(const typename _Container::value_type& __value) {
-    container->insert(__value);
-    return *this;
-  }
-  insert_iterator<_Container>& operator*() { return *this; }
-  insert_iterator<_Container>& operator++() { return *this; }
-  insert_iterator<_Container>& operator++(int) { return *this; }
-};
-
-template <class _Key, class _Tp, class _HashFn,  class _EqKey, class _Alloc>
-class insert_iterator<__gnu_cxx::hash_multimap<_Key, _Tp, _HashFn, _EqKey, _Alloc> > {
-protected:
-  typedef __gnu_cxx::hash_multimap<_Key, _Tp, _HashFn, _EqKey, _Alloc> _Container;
-  _Container* container;
-  typename _Container::iterator iter;
-public:
-  typedef _Container          container_type;
-  typedef output_iterator_tag iterator_category;
-  typedef void                value_type;
-  typedef void                difference_type;
-  typedef void                pointer;
-  typedef void                reference;
-
-  insert_iterator(_Container& __x) : container(&__x) {}
-  insert_iterator(_Container& __x, typename _Container::iterator)
-    : container(&__x) {}
-  insert_iterator<_Container>&
-  operator=(const typename _Container::value_type& __value) {
-    container->insert(__value);
-    return *this;
-  }
-  insert_iterator<_Container>& operator*() { return *this; }
-  insert_iterator<_Container>& operator++() { return *this; }
-  insert_iterator<_Container>& operator++(int) { return *this; }
-};
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/ext/hash_set b/include.new/c++/3.4/ext/hash_set
deleted file mode 100644
index fee64fc..0000000
--- a/include.new/c++/3.4/ext/hash_set
+++ /dev/null
@@ -1,439 +0,0 @@
-// Hashing set implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file ext/hash_set
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _HASH_SET
-#define _HASH_SET 1
-
-#include <ext/hashtable.h>
-#include <bits/concept_check.h>
-
-namespace __gnu_cxx
-{
-  using std::equal_to;
-  using std::allocator;
-  using std::pair;
-  using std::_Identity;
-
-  // Forward declaration of equality operator; needed for friend
-  // declaration.
-  template <class _Value, class _HashFcn  = hash<_Value>,
-	    class _EqualKey = equal_to<_Value>,
-	    class _Alloc =  allocator<_Value> >
-  class hash_set;
-
-  template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-    inline bool
-    operator==(const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs1,
-	       const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs2);
-
-/**
- *  This is an SGI extension.
- *  @ingroup SGIextensions
- *  @doctodo
-*/
-template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-class hash_set
-{
-  // concept requirements
-  __glibcxx_class_requires(_Value, _SGIAssignableConcept)
-  __glibcxx_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept)
-  __glibcxx_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept)
-
-private:
-  typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>,
-                    _EqualKey, _Alloc> _Ht;
-  _Ht _M_ht;
-
-public:
-  typedef typename _Ht::key_type key_type;
-  typedef typename _Ht::value_type value_type;
-  typedef typename _Ht::hasher hasher;
-  typedef typename _Ht::key_equal key_equal;
-
-  typedef typename _Ht::size_type size_type;
-  typedef typename _Ht::difference_type difference_type;
-  typedef typename _Alloc::pointer pointer;
-  typedef typename _Alloc::const_pointer const_pointer;
-  typedef typename _Alloc::reference reference;
-  typedef typename _Alloc::const_reference const_reference;
-
-  typedef typename _Ht::const_iterator iterator;
-  typedef typename _Ht::const_iterator const_iterator;
-
-  typedef typename _Ht::allocator_type allocator_type;
-
-  hasher hash_funct() const { return _M_ht.hash_funct(); }
-  key_equal key_eq() const { return _M_ht.key_eq(); }
-  allocator_type get_allocator() const { return _M_ht.get_allocator(); }
-
-public:
-  hash_set()
-    : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-  explicit hash_set(size_type __n)
-    : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-  hash_set(size_type __n, const hasher& __hf)
-    : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-  hash_set(size_type __n, const hasher& __hf, const key_equal& __eql,
-           const allocator_type& __a = allocator_type())
-    : _M_ht(__n, __hf, __eql, __a) {}
-
-  template <class _InputIterator>
-  hash_set(_InputIterator __f, _InputIterator __l)
-    : _M_ht(100, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_unique(__f, __l); }
-  template <class _InputIterator>
-  hash_set(_InputIterator __f, _InputIterator __l, size_type __n)
-    : _M_ht(__n, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_unique(__f, __l); }
-  template <class _InputIterator>
-  hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
-           const hasher& __hf)
-    : _M_ht(__n, __hf, key_equal(), allocator_type())
-    { _M_ht.insert_unique(__f, __l); }
-  template <class _InputIterator>
-  hash_set(_InputIterator __f, _InputIterator __l, size_type __n,
-           const hasher& __hf, const key_equal& __eql,
-           const allocator_type& __a = allocator_type())
-    : _M_ht(__n, __hf, __eql, __a)
-    { _M_ht.insert_unique(__f, __l); }
-
-public:
-  size_type size() const { return _M_ht.size(); }
-  size_type max_size() const { return _M_ht.max_size(); }
-  bool empty() const { return _M_ht.empty(); }
-  void swap(hash_set& __hs) { _M_ht.swap(__hs._M_ht); }
-
-  template <class _Val, class _HF, class _EqK, class _Al>
-  friend bool operator== (const hash_set<_Val, _HF, _EqK, _Al>&,
-                          const hash_set<_Val, _HF, _EqK, _Al>&);
-
-  iterator begin() const { return _M_ht.begin(); }
-  iterator end() const { return _M_ht.end(); }
-
-public:
-  pair<iterator, bool> insert(const value_type& __obj)
-    {
-      pair<typename _Ht::iterator, bool> __p = _M_ht.insert_unique(__obj);
-      return pair<iterator,bool>(__p.first, __p.second);
-    }
-  template <class _InputIterator>
-  void insert(_InputIterator __f, _InputIterator __l)
-    { _M_ht.insert_unique(__f,__l); }
-  pair<iterator, bool> insert_noresize(const value_type& __obj)
-  {
-    pair<typename _Ht::iterator, bool> __p =
-      _M_ht.insert_unique_noresize(__obj);
-    return pair<iterator, bool>(__p.first, __p.second);
-  }
-
-  iterator find(const key_type& __key) const { return _M_ht.find(__key); }
-
-  size_type count(const key_type& __key) const { return _M_ht.count(__key); }
-
-  pair<iterator, iterator> equal_range(const key_type& __key) const
-    { return _M_ht.equal_range(__key); }
-
-  size_type erase(const key_type& __key) {return _M_ht.erase(__key); }
-  void erase(iterator __it) { _M_ht.erase(__it); }
-  void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
-  void clear() { _M_ht.clear(); }
-
-public:
-  void resize(size_type __hint) { _M_ht.resize(__hint); }
-  size_type bucket_count() const { return _M_ht.bucket_count(); }
-  size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
-  size_type elems_in_bucket(size_type __n) const
-    { return _M_ht.elems_in_bucket(__n); }
-};
-
-template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-inline bool
-operator==(const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs1,
-           const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs2)
-{
-  return __hs1._M_ht == __hs2._M_ht;
-}
-
-template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-inline bool
-operator!=(const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs1,
-           const hash_set<_Value,_HashFcn,_EqualKey,_Alloc>& __hs2) {
-  return !(__hs1 == __hs2);
-}
-
-template <class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-inline void
-swap(hash_set<_Val,_HashFcn,_EqualKey,_Alloc>& __hs1,
-     hash_set<_Val,_HashFcn,_EqualKey,_Alloc>& __hs2)
-{
-  __hs1.swap(__hs2);
-}
-
-
-template <class _Value,
-          class _HashFcn  = hash<_Value>,
-          class _EqualKey = equal_to<_Value>,
-          class _Alloc =  allocator<_Value> >
-class hash_multiset;
-
-template <class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-inline bool
-operator==(const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs1,
-           const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs2);
-
-
-/**
- *  This is an SGI extension.
- *  @ingroup SGIextensions
- *  @doctodo
-*/
-template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-class hash_multiset
-{
-  // concept requirements
-  __glibcxx_class_requires(_Value, _SGIAssignableConcept)
-  __glibcxx_class_requires3(_HashFcn, size_t, _Value, _UnaryFunctionConcept)
-  __glibcxx_class_requires3(_EqualKey, _Value, _Value, _BinaryPredicateConcept)
-
-private:
-  typedef hashtable<_Value, _Value, _HashFcn, _Identity<_Value>,
-                    _EqualKey, _Alloc> _Ht;
-  _Ht _M_ht;
-
-public:
-  typedef typename _Ht::key_type key_type;
-  typedef typename _Ht::value_type value_type;
-  typedef typename _Ht::hasher hasher;
-  typedef typename _Ht::key_equal key_equal;
-
-  typedef typename _Ht::size_type size_type;
-  typedef typename _Ht::difference_type difference_type;
-  typedef typename _Alloc::pointer pointer;
-  typedef typename _Alloc::const_pointer const_pointer;
-  typedef typename _Alloc::reference reference;
-  typedef typename _Alloc::const_reference const_reference;
-
-  typedef typename _Ht::const_iterator iterator;
-  typedef typename _Ht::const_iterator const_iterator;
-
-  typedef typename _Ht::allocator_type allocator_type;
-
-  hasher hash_funct() const { return _M_ht.hash_funct(); }
-  key_equal key_eq() const { return _M_ht.key_eq(); }
-  allocator_type get_allocator() const { return _M_ht.get_allocator(); }
-
-public:
-  hash_multiset()
-    : _M_ht(100, hasher(), key_equal(), allocator_type()) {}
-  explicit hash_multiset(size_type __n)
-    : _M_ht(__n, hasher(), key_equal(), allocator_type()) {}
-  hash_multiset(size_type __n, const hasher& __hf)
-    : _M_ht(__n, __hf, key_equal(), allocator_type()) {}
-  hash_multiset(size_type __n, const hasher& __hf, const key_equal& __eql,
-                const allocator_type& __a = allocator_type())
-    : _M_ht(__n, __hf, __eql, __a) {}
-
-  template <class _InputIterator>
-  hash_multiset(_InputIterator __f, _InputIterator __l)
-    : _M_ht(100, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_equal(__f, __l); }
-  template <class _InputIterator>
-  hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n)
-    : _M_ht(__n, hasher(), key_equal(), allocator_type())
-    { _M_ht.insert_equal(__f, __l); }
-  template <class _InputIterator>
-  hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
-                const hasher& __hf)
-    : _M_ht(__n, __hf, key_equal(), allocator_type())
-    { _M_ht.insert_equal(__f, __l); }
-  template <class _InputIterator>
-  hash_multiset(_InputIterator __f, _InputIterator __l, size_type __n,
-                const hasher& __hf, const key_equal& __eql,
-                const allocator_type& __a = allocator_type())
-    : _M_ht(__n, __hf, __eql, __a)
-    { _M_ht.insert_equal(__f, __l); }
-
-public:
-  size_type size() const { return _M_ht.size(); }
-  size_type max_size() const { return _M_ht.max_size(); }
-  bool empty() const { return _M_ht.empty(); }
-  void swap(hash_multiset& hs) { _M_ht.swap(hs._M_ht); }
-
-  template <class _Val, class _HF, class _EqK, class _Al>
-  friend bool operator== (const hash_multiset<_Val, _HF, _EqK, _Al>&,
-                          const hash_multiset<_Val, _HF, _EqK, _Al>&);
-
-  iterator begin() const { return _M_ht.begin(); }
-  iterator end() const { return _M_ht.end(); }
-
-public:
-  iterator insert(const value_type& __obj)
-    { return _M_ht.insert_equal(__obj); }
-  template <class _InputIterator>
-  void insert(_InputIterator __f, _InputIterator __l)
-    { _M_ht.insert_equal(__f,__l); }
-  iterator insert_noresize(const value_type& __obj)
-    { return _M_ht.insert_equal_noresize(__obj); }
-
-  iterator find(const key_type& __key) const { return _M_ht.find(__key); }
-
-  size_type count(const key_type& __key) const { return _M_ht.count(__key); }
-
-  pair<iterator, iterator> equal_range(const key_type& __key) const
-    { return _M_ht.equal_range(__key); }
-
-  size_type erase(const key_type& __key) {return _M_ht.erase(__key); }
-  void erase(iterator __it) { _M_ht.erase(__it); }
-  void erase(iterator __f, iterator __l) { _M_ht.erase(__f, __l); }
-  void clear() { _M_ht.clear(); }
-
-public:
-  void resize(size_type __hint) { _M_ht.resize(__hint); }
-  size_type bucket_count() const { return _M_ht.bucket_count(); }
-  size_type max_bucket_count() const { return _M_ht.max_bucket_count(); }
-  size_type elems_in_bucket(size_type __n) const
-    { return _M_ht.elems_in_bucket(__n); }
-};
-
-template <class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-inline bool
-operator==(const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs1,
-           const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs2)
-{
-  return __hs1._M_ht == __hs2._M_ht;
-}
-
-template <class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-inline bool
-operator!=(const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs1,
-           const hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs2) {
-  return !(__hs1 == __hs2);
-}
-
-template <class _Val, class _HashFcn, class _EqualKey, class _Alloc>
-inline void
-swap(hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs1,
-     hash_multiset<_Val,_HashFcn,_EqualKey,_Alloc>& __hs2) {
-  __hs1.swap(__hs2);
-}
-
-} // namespace __gnu_cxx
-
-namespace std
-{
-// Specialization of insert_iterator so that it will work for hash_set
-// and hash_multiset.
-
-template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-class insert_iterator<__gnu_cxx::hash_set<_Value, _HashFcn, _EqualKey, _Alloc> > {
-protected:
-  typedef __gnu_cxx::hash_set<_Value, _HashFcn, _EqualKey, _Alloc> _Container;
-  _Container* container;
-public:
-  typedef _Container          container_type;
-  typedef output_iterator_tag iterator_category;
-  typedef void                value_type;
-  typedef void                difference_type;
-  typedef void                pointer;
-  typedef void                reference;
-
-  insert_iterator(_Container& __x) : container(&__x) {}
-  insert_iterator(_Container& __x, typename _Container::iterator)
-    : container(&__x) {}
-  insert_iterator<_Container>&
-  operator=(const typename _Container::value_type& __value) {
-    container->insert(__value);
-    return *this;
-  }
-  insert_iterator<_Container>& operator*() { return *this; }
-  insert_iterator<_Container>& operator++() { return *this; }
-  insert_iterator<_Container>& operator++(int) { return *this; }
-};
-
-template <class _Value, class _HashFcn, class _EqualKey, class _Alloc>
-class insert_iterator<__gnu_cxx::hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc> > {
-protected:
-  typedef __gnu_cxx::hash_multiset<_Value, _HashFcn, _EqualKey, _Alloc> _Container;
-  _Container* container;
-  typename _Container::iterator iter;
-public:
-  typedef _Container          container_type;
-  typedef output_iterator_tag iterator_category;
-  typedef void                value_type;
-  typedef void                difference_type;
-  typedef void                pointer;
-  typedef void                reference;
-
-  insert_iterator(_Container& __x) : container(&__x) {}
-  insert_iterator(_Container& __x, typename _Container::iterator)
-    : container(&__x) {}
-  insert_iterator<_Container>&
-  operator=(const typename _Container::value_type& __value) {
-    container->insert(__value);
-    return *this;
-  }
-  insert_iterator<_Container>& operator*() { return *this; }
-  insert_iterator<_Container>& operator++() { return *this; }
-  insert_iterator<_Container>& operator++(int) { return *this; }
-};
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/ext/hashtable.h b/include.new/c++/3.4/ext/hashtable.h
deleted file mode 100644
index 9f2fb1e..0000000
--- a/include.new/c++/3.4/ext/hashtable.h
+++ /dev/null
@@ -1,994 +0,0 @@
-// Hashtable implementation used by containers -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file ext/hashtable.h
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _HASHTABLE_H
-#define _HASHTABLE_H 1
-
-// Hashtable class, used to implement the hashed associative containers
-// hash_set, hash_map, hash_multiset, and hash_multimap.
-
-#include <vector>
-#include <iterator>
-#include <bits/stl_algo.h>
-#include <bits/stl_function.h>
-#include <ext/hash_fun.h>
-
-namespace __gnu_cxx
-{
-using std::size_t;
-using std::ptrdiff_t;
-using std::forward_iterator_tag;
-using std::input_iterator_tag;
-using std::_Construct;
-using std::_Destroy;
-using std::distance;
-using std::vector;
-using std::pair;
-using std::__iterator_category;
-
-template <class _Val>
-struct _Hashtable_node
-{
-  _Hashtable_node* _M_next;
-  _Val _M_val;
-};
-
-template <class _Val, class _Key, class _HashFcn, class _ExtractKey, 
-	  class _EqualKey, class _Alloc = std::allocator<_Val> >
-class hashtable;
-
-template <class _Val, class _Key, class _HashFcn,
-          class _ExtractKey, class _EqualKey, class _Alloc>
-struct _Hashtable_iterator;
-
-template <class _Val, class _Key, class _HashFcn,
-          class _ExtractKey, class _EqualKey, class _Alloc>
-struct _Hashtable_const_iterator;
-
-template <class _Val, class _Key, class _HashFcn,
-          class _ExtractKey, class _EqualKey, class _Alloc>
-struct _Hashtable_iterator {
-  typedef hashtable<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc>
-          _Hashtable;
-  typedef _Hashtable_iterator<_Val, _Key, _HashFcn,
-                              _ExtractKey, _EqualKey, _Alloc>
-          iterator;
-  typedef _Hashtable_const_iterator<_Val, _Key, _HashFcn,
-                                    _ExtractKey, _EqualKey, _Alloc>
-          const_iterator;
-  typedef _Hashtable_node<_Val> _Node;
-
-  typedef forward_iterator_tag iterator_category;
-  typedef _Val value_type;
-  typedef ptrdiff_t difference_type;
-  typedef size_t size_type;
-  typedef _Val& reference;
-  typedef _Val* pointer;
-
-  _Node* _M_cur;
-  _Hashtable* _M_ht;
-
-  _Hashtable_iterator(_Node* __n, _Hashtable* __tab)
-    : _M_cur(__n), _M_ht(__tab) {}
-  _Hashtable_iterator() {}
-  reference operator*() const { return _M_cur->_M_val; }
-  pointer operator->() const { return &(operator*()); }
-  iterator& operator++();
-  iterator operator++(int);
-  bool operator==(const iterator& __it) const
-    { return _M_cur == __it._M_cur; }
-  bool operator!=(const iterator& __it) const
-    { return _M_cur != __it._M_cur; }
-};
-
-
-template <class _Val, class _Key, class _HashFcn,
-          class _ExtractKey, class _EqualKey, class _Alloc>
-struct _Hashtable_const_iterator {
-  typedef hashtable<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc>
-          _Hashtable;
-  typedef _Hashtable_iterator<_Val,_Key,_HashFcn,
-                              _ExtractKey,_EqualKey,_Alloc>
-          iterator;
-  typedef _Hashtable_const_iterator<_Val, _Key, _HashFcn,
-                                    _ExtractKey, _EqualKey, _Alloc>
-          const_iterator;
-  typedef _Hashtable_node<_Val> _Node;
-
-  typedef forward_iterator_tag iterator_category;
-  typedef _Val value_type;
-  typedef ptrdiff_t difference_type;
-  typedef size_t size_type;
-  typedef const _Val& reference;
-  typedef const _Val* pointer;
-
-  const _Node* _M_cur;
-  const _Hashtable* _M_ht;
-
-  _Hashtable_const_iterator(const _Node* __n, const _Hashtable* __tab)
-    : _M_cur(__n), _M_ht(__tab) {}
-  _Hashtable_const_iterator() {}
-  _Hashtable_const_iterator(const iterator& __it)
-    : _M_cur(__it._M_cur), _M_ht(__it._M_ht) {}
-  reference operator*() const { return _M_cur->_M_val; }
-  pointer operator->() const { return &(operator*()); }
-  const_iterator& operator++();
-  const_iterator operator++(int);
-  bool operator==(const const_iterator& __it) const
-    { return _M_cur == __it._M_cur; }
-  bool operator!=(const const_iterator& __it) const
-    { return _M_cur != __it._M_cur; }
-};
-
-// Note: assumes long is at least 32 bits.
-enum { _S_num_primes = 28 };
-
-static const unsigned long __stl_prime_list[_S_num_primes] =
-{
-  53ul,         97ul,         193ul,       389ul,       769ul,
-  1543ul,       3079ul,       6151ul,      12289ul,     24593ul,
-  49157ul,      98317ul,      196613ul,    393241ul,    786433ul,
-  1572869ul,    3145739ul,    6291469ul,   12582917ul,  25165843ul,
-  50331653ul,   100663319ul,  201326611ul, 402653189ul, 805306457ul,
-  1610612741ul, 3221225473ul, 4294967291ul
-};
-
-inline unsigned long __stl_next_prime(unsigned long __n)
-{
-  const unsigned long* __first = __stl_prime_list;
-  const unsigned long* __last = __stl_prime_list + (int)_S_num_primes;
-  const unsigned long* pos = std::lower_bound(__first, __last, __n);
-  return pos == __last ? *(__last - 1) : *pos;
-}
-
-// Forward declaration of operator==.
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-class hashtable;
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-bool operator==(const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht1,
-                const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht2);
-
-
-// Hashtables handle allocators a bit differently than other
-// containers do.  If we're using standard-conforming allocators, then
-// a hashtable unconditionally has a member variable to hold its
-// allocator, even if it so happens that all instances of the
-// allocator type are identical.  This is because, for hashtables,
-// this extra storage is negligible.  Additionally, a base class
-// wouldn't serve any other purposes; it wouldn't, for example,
-// simplify the exception-handling code.
-
-template <class _Val, class _Key, class _HashFcn,
-          class _ExtractKey, class _EqualKey, class _Alloc>
-class hashtable {
-public:
-  typedef _Key key_type;
-  typedef _Val value_type;
-  typedef _HashFcn hasher;
-  typedef _EqualKey key_equal;
-
-  typedef size_t            size_type;
-  typedef ptrdiff_t         difference_type;
-  typedef value_type*       pointer;
-  typedef const value_type* const_pointer;
-  typedef value_type&       reference;
-  typedef const value_type& const_reference;
-
-  hasher hash_funct() const { return _M_hash; }
-  key_equal key_eq() const { return _M_equals; }
-
-private:
-  typedef _Hashtable_node<_Val> _Node;
-
-public:
-  typedef typename _Alloc::template rebind<value_type>::other allocator_type;
-  allocator_type get_allocator() const { return _M_node_allocator; }
-private:
-  typedef typename _Alloc::template rebind<_Node>::other _Node_Alloc;
-  typedef typename _Alloc::template rebind<_Node*>::other _Nodeptr_Alloc;
-  typedef vector<_Node*, _Nodeptr_Alloc> _Vector_type;
-
-  _Node_Alloc _M_node_allocator;
-  _Node* _M_get_node() { return _M_node_allocator.allocate(1); }
-  void _M_put_node(_Node* __p) { _M_node_allocator.deallocate(__p, 1); }
-
-private:
-  hasher                _M_hash;
-  key_equal             _M_equals;
-  _ExtractKey           _M_get_key;
-  _Vector_type          _M_buckets;
-  size_type             _M_num_elements;
-
-public:
-  typedef _Hashtable_iterator<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc>
-          iterator;
-  typedef _Hashtable_const_iterator<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,
-                                    _Alloc>
-          const_iterator;
-
-  friend struct
-  _Hashtable_iterator<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc>;
-  friend struct
-  _Hashtable_const_iterator<_Val,_Key,_HashFcn,_ExtractKey,_EqualKey,_Alloc>;
-
-public:
-  hashtable(size_type __n,
-            const _HashFcn&    __hf,
-            const _EqualKey&   __eql,
-            const _ExtractKey& __ext,
-            const allocator_type& __a = allocator_type())
-    : _M_node_allocator(__a),
-      _M_hash(__hf),
-      _M_equals(__eql),
-      _M_get_key(__ext),
-      _M_buckets(__a),
-      _M_num_elements(0)
-  {
-    _M_initialize_buckets(__n);
-  }
-
-  hashtable(size_type __n,
-            const _HashFcn&    __hf,
-            const _EqualKey&   __eql,
-            const allocator_type& __a = allocator_type())
-    : _M_node_allocator(__a),
-      _M_hash(__hf),
-      _M_equals(__eql),
-      _M_get_key(_ExtractKey()),
-      _M_buckets(__a),
-      _M_num_elements(0)
-  {
-    _M_initialize_buckets(__n);
-  }
-
-  hashtable(const hashtable& __ht)
-    : _M_node_allocator(__ht.get_allocator()),
-      _M_hash(__ht._M_hash),
-      _M_equals(__ht._M_equals),
-      _M_get_key(__ht._M_get_key),
-      _M_buckets(__ht.get_allocator()),
-      _M_num_elements(0)
-  {
-    _M_copy_from(__ht);
-  }
-
-  hashtable& operator= (const hashtable& __ht)
-  {
-    if (&__ht != this) {
-      clear();
-      _M_hash = __ht._M_hash;
-      _M_equals = __ht._M_equals;
-      _M_get_key = __ht._M_get_key;
-      _M_copy_from(__ht);
-    }
-    return *this;
-  }
-
-  ~hashtable() { clear(); }
-
-  size_type size() const { return _M_num_elements; }
-  size_type max_size() const { return size_type(-1); }
-  bool empty() const { return size() == 0; }
-
-  void swap(hashtable& __ht)
-  {
-    std::swap(_M_hash, __ht._M_hash);
-    std::swap(_M_equals, __ht._M_equals);
-    std::swap(_M_get_key, __ht._M_get_key);
-    _M_buckets.swap(__ht._M_buckets);
-    std::swap(_M_num_elements, __ht._M_num_elements);
-  }
-
-  iterator begin()
-  {
-    for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
-      if (_M_buckets[__n])
-        return iterator(_M_buckets[__n], this);
-    return end();
-  }
-
-  iterator end() { return iterator(0, this); }
-
-  const_iterator begin() const
-  {
-    for (size_type __n = 0; __n < _M_buckets.size(); ++__n)
-      if (_M_buckets[__n])
-        return const_iterator(_M_buckets[__n], this);
-    return end();
-  }
-
-  const_iterator end() const { return const_iterator(0, this); }
-
-  template <class _Vl, class _Ky, class _HF, class _Ex, class _Eq, class _Al>
-  friend bool operator== (const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&,
-                          const hashtable<_Vl, _Ky, _HF, _Ex, _Eq, _Al>&);
-public:
-
-  size_type bucket_count() const { return _M_buckets.size(); }
-
-  size_type max_bucket_count() const
-    { return __stl_prime_list[(int)_S_num_primes - 1]; }
-
-  size_type elems_in_bucket(size_type __bucket) const
-  {
-    size_type __result = 0;
-    for (_Node* __cur = _M_buckets[__bucket]; __cur; __cur = __cur->_M_next)
-      __result += 1;
-    return __result;
-  }
-
-  pair<iterator, bool> insert_unique(const value_type& __obj)
-  {
-    resize(_M_num_elements + 1);
-    return insert_unique_noresize(__obj);
-  }
-
-  iterator insert_equal(const value_type& __obj)
-  {
-    resize(_M_num_elements + 1);
-    return insert_equal_noresize(__obj);
-  }
-
-  pair<iterator, bool> insert_unique_noresize(const value_type& __obj);
-  iterator insert_equal_noresize(const value_type& __obj);
-
-  template <class _InputIterator>
-  void insert_unique(_InputIterator __f, _InputIterator __l)
-  {
-    insert_unique(__f, __l, __iterator_category(__f));
-  }
-
-  template <class _InputIterator>
-  void insert_equal(_InputIterator __f, _InputIterator __l)
-  {
-    insert_equal(__f, __l, __iterator_category(__f));
-  }
-
-  template <class _InputIterator>
-  void insert_unique(_InputIterator __f, _InputIterator __l,
-                     input_iterator_tag)
-  {
-    for ( ; __f != __l; ++__f)
-      insert_unique(*__f);
-  }
-
-  template <class _InputIterator>
-  void insert_equal(_InputIterator __f, _InputIterator __l,
-                    input_iterator_tag)
-  {
-    for ( ; __f != __l; ++__f)
-      insert_equal(*__f);
-  }
-
-  template <class _ForwardIterator>
-  void insert_unique(_ForwardIterator __f, _ForwardIterator __l,
-                     forward_iterator_tag)
-  {
-    size_type __n = distance(__f, __l);
-    resize(_M_num_elements + __n);
-    for ( ; __n > 0; --__n, ++__f)
-      insert_unique_noresize(*__f);
-  }
-
-  template <class _ForwardIterator>
-  void insert_equal(_ForwardIterator __f, _ForwardIterator __l,
-                    forward_iterator_tag)
-  {
-    size_type __n = distance(__f, __l);
-    resize(_M_num_elements + __n);
-    for ( ; __n > 0; --__n, ++__f)
-      insert_equal_noresize(*__f);
-  }
-
-  reference find_or_insert(const value_type& __obj);
-
-  iterator find(const key_type& __key)
-  {
-    size_type __n = _M_bkt_num_key(__key);
-    _Node* __first;
-    for ( __first = _M_buckets[__n];
-          __first && !_M_equals(_M_get_key(__first->_M_val), __key);
-          __first = __first->_M_next)
-      {}
-    return iterator(__first, this);
-  }
-
-  const_iterator find(const key_type& __key) const
-  {
-    size_type __n = _M_bkt_num_key(__key);
-    const _Node* __first;
-    for ( __first = _M_buckets[__n];
-          __first && !_M_equals(_M_get_key(__first->_M_val), __key);
-          __first = __first->_M_next)
-      {}
-    return const_iterator(__first, this);
-  }
-
-  size_type count(const key_type& __key) const
-  {
-    const size_type __n = _M_bkt_num_key(__key);
-    size_type __result = 0;
-
-    for (const _Node* __cur = _M_buckets[__n]; __cur; __cur = __cur->_M_next)
-      if (_M_equals(_M_get_key(__cur->_M_val), __key))
-        ++__result;
-    return __result;
-  }
-
-  pair<iterator, iterator>
-  equal_range(const key_type& __key);
-
-  pair<const_iterator, const_iterator>
-  equal_range(const key_type& __key) const;
-
-  size_type erase(const key_type& __key);
-  void erase(const iterator& __it);
-  void erase(iterator __first, iterator __last);
-
-  void erase(const const_iterator& __it);
-  void erase(const_iterator __first, const_iterator __last);
-
-  void resize(size_type __num_elements_hint);
-  void clear();
-
-private:
-  size_type _M_next_size(size_type __n) const
-    { return __stl_next_prime(__n); }
-
-  void _M_initialize_buckets(size_type __n)
-  {
-    const size_type __n_buckets = _M_next_size(__n);
-    _M_buckets.reserve(__n_buckets);
-    _M_buckets.insert(_M_buckets.end(), __n_buckets, (_Node*) 0);
-    _M_num_elements = 0;
-  }
-
-  size_type _M_bkt_num_key(const key_type& __key) const
-  {
-    return _M_bkt_num_key(__key, _M_buckets.size());
-  }
-
-  size_type _M_bkt_num(const value_type& __obj) const
-  {
-    return _M_bkt_num_key(_M_get_key(__obj));
-  }
-
-  size_type _M_bkt_num_key(const key_type& __key, size_t __n) const
-  {
-    return _M_hash(__key) % __n;
-  }
-
-  size_type _M_bkt_num(const value_type& __obj, size_t __n) const
-  {
-    return _M_bkt_num_key(_M_get_key(__obj), __n);
-  }
-
-  _Node* _M_new_node(const value_type& __obj)
-  {
-    _Node* __n = _M_get_node();
-    __n->_M_next = 0;
-    try {
-      _Construct(&__n->_M_val, __obj);
-      return __n;
-    }
-    catch(...)
-      {
-	_M_put_node(__n);
-	__throw_exception_again;
-      }
-  }
-
-  void _M_delete_node(_Node* __n)
-  {
-    _Destroy(&__n->_M_val);
-    _M_put_node(__n);
-  }
-
-  void _M_erase_bucket(const size_type __n, _Node* __first, _Node* __last);
-  void _M_erase_bucket(const size_type __n, _Node* __last);
-
-  void _M_copy_from(const hashtable& __ht);
-
-};
-
-template <class _Val, class _Key, class _HF, class _ExK, class _EqK,
-          class _All>
-_Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>&
-_Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>::operator++()
-{
-  const _Node* __old = _M_cur;
-  _M_cur = _M_cur->_M_next;
-  if (!_M_cur) {
-    size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val);
-    while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size())
-      _M_cur = _M_ht->_M_buckets[__bucket];
-  }
-  return *this;
-}
-
-template <class _Val, class _Key, class _HF, class _ExK, class _EqK,
-          class _All>
-inline _Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>
-_Hashtable_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>::operator++(int)
-{
-  iterator __tmp = *this;
-  ++*this;
-  return __tmp;
-}
-
-template <class _Val, class _Key, class _HF, class _ExK, class _EqK,
-          class _All>
-_Hashtable_const_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>&
-_Hashtable_const_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>::operator++()
-{
-  const _Node* __old = _M_cur;
-  _M_cur = _M_cur->_M_next;
-  if (!_M_cur) {
-    size_type __bucket = _M_ht->_M_bkt_num(__old->_M_val);
-    while (!_M_cur && ++__bucket < _M_ht->_M_buckets.size())
-      _M_cur = _M_ht->_M_buckets[__bucket];
-  }
-  return *this;
-}
-
-template <class _Val, class _Key, class _HF, class _ExK, class _EqK,
-          class _All>
-inline _Hashtable_const_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>
-_Hashtable_const_iterator<_Val,_Key,_HF,_ExK,_EqK,_All>::operator++(int)
-{
-  const_iterator __tmp = *this;
-  ++*this;
-  return __tmp;
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-bool operator==(const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht1,
-                const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht2)
-{
-  typedef typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::_Node _Node;
-  if (__ht1._M_buckets.size() != __ht2._M_buckets.size())
-    return false;
-  for (size_t __n = 0; __n < __ht1._M_buckets.size(); ++__n) {
-    _Node* __cur1 = __ht1._M_buckets[__n];
-    _Node* __cur2 = __ht2._M_buckets[__n];
-    // Check same length of lists
-    for ( ; __cur1 && __cur2;
-          __cur1 = __cur1->_M_next, __cur2 = __cur2->_M_next)
-      {}
-    if (__cur1 || __cur2)
-      return false;
-    // Now check one's elements are in the other
-    for (__cur1 = __ht1._M_buckets[__n] ; __cur1; __cur1 = __cur1->_M_next)
-    {
-      bool _found__cur1 = false;
-      for (_Node* __cur2 = __ht2._M_buckets[__n];
-           __cur2; __cur2 = __cur2->_M_next)
-      {
-        if (__cur1->_M_val == __cur2->_M_val)
-        {
-          _found__cur1 = true;
-          break;
-        }
-      }
-      if (!_found__cur1)
-        return false;
-    }
-  }
-  return true;
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-inline bool operator!=(const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht1,
-                       const hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>& __ht2) {
-  return !(__ht1 == __ht2);
-}
-
-template <class _Val, class _Key, class _HF, class _Extract, class _EqKey,
-          class _All>
-inline void swap(hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht1,
-                 hashtable<_Val, _Key, _HF, _Extract, _EqKey, _All>& __ht2) {
-  __ht1.swap(__ht2);
-}
-
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-pair<typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::iterator, bool>
-hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
-  ::insert_unique_noresize(const value_type& __obj)
-{
-  const size_type __n = _M_bkt_num(__obj);
-  _Node* __first = _M_buckets[__n];
-
-  for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
-    if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
-      return pair<iterator, bool>(iterator(__cur, this), false);
-
-  _Node* __tmp = _M_new_node(__obj);
-  __tmp->_M_next = __first;
-  _M_buckets[__n] = __tmp;
-  ++_M_num_elements;
-  return pair<iterator, bool>(iterator(__tmp, this), true);
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::iterator
-hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
-  ::insert_equal_noresize(const value_type& __obj)
-{
-  const size_type __n = _M_bkt_num(__obj);
-  _Node* __first = _M_buckets[__n];
-
-  for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
-    if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj))) {
-      _Node* __tmp = _M_new_node(__obj);
-      __tmp->_M_next = __cur->_M_next;
-      __cur->_M_next = __tmp;
-      ++_M_num_elements;
-      return iterator(__tmp, this);
-    }
-
-  _Node* __tmp = _M_new_node(__obj);
-  __tmp->_M_next = __first;
-  _M_buckets[__n] = __tmp;
-  ++_M_num_elements;
-  return iterator(__tmp, this);
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::reference
-hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::find_or_insert(const value_type& __obj)
-{
-  resize(_M_num_elements + 1);
-
-  size_type __n = _M_bkt_num(__obj);
-  _Node* __first = _M_buckets[__n];
-
-  for (_Node* __cur = __first; __cur; __cur = __cur->_M_next)
-    if (_M_equals(_M_get_key(__cur->_M_val), _M_get_key(__obj)))
-      return __cur->_M_val;
-
-  _Node* __tmp = _M_new_node(__obj);
-  __tmp->_M_next = __first;
-  _M_buckets[__n] = __tmp;
-  ++_M_num_elements;
-  return __tmp->_M_val;
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-pair<typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::iterator,
-     typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::iterator>
-hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::equal_range(const key_type& __key)
-{
-  typedef pair<iterator, iterator> _Pii;
-  const size_type __n = _M_bkt_num_key(__key);
-
-  for (_Node* __first = _M_buckets[__n]; __first; __first = __first->_M_next)
-    if (_M_equals(_M_get_key(__first->_M_val), __key)) {
-      for (_Node* __cur = __first->_M_next; __cur; __cur = __cur->_M_next)
-        if (!_M_equals(_M_get_key(__cur->_M_val), __key))
-          return _Pii(iterator(__first, this), iterator(__cur, this));
-      for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m)
-        if (_M_buckets[__m])
-          return _Pii(iterator(__first, this),
-                     iterator(_M_buckets[__m], this));
-      return _Pii(iterator(__first, this), end());
-    }
-  return _Pii(end(), end());
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-pair<typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::const_iterator,
-     typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::const_iterator>
-hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
-  ::equal_range(const key_type& __key) const
-{
-  typedef pair<const_iterator, const_iterator> _Pii;
-  const size_type __n = _M_bkt_num_key(__key);
-
-  for (const _Node* __first = _M_buckets[__n] ;
-       __first;
-       __first = __first->_M_next) {
-    if (_M_equals(_M_get_key(__first->_M_val), __key)) {
-      for (const _Node* __cur = __first->_M_next;
-           __cur;
-           __cur = __cur->_M_next)
-        if (!_M_equals(_M_get_key(__cur->_M_val), __key))
-          return _Pii(const_iterator(__first, this),
-                      const_iterator(__cur, this));
-      for (size_type __m = __n + 1; __m < _M_buckets.size(); ++__m)
-        if (_M_buckets[__m])
-          return _Pii(const_iterator(__first, this),
-                      const_iterator(_M_buckets[__m], this));
-      return _Pii(const_iterator(__first, this), end());
-    }
-  }
-  return _Pii(end(), end());
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-typename hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::size_type
-hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const key_type& __key)
-{
-  const size_type __n = _M_bkt_num_key(__key);
-  _Node* __first = _M_buckets[__n];
-  size_type __erased = 0;
-
-  if (__first) {
-    _Node* __cur = __first;
-    _Node* __next = __cur->_M_next;
-    while (__next) {
-      if (_M_equals(_M_get_key(__next->_M_val), __key)) {
-        __cur->_M_next = __next->_M_next;
-        _M_delete_node(__next);
-        __next = __cur->_M_next;
-        ++__erased;
-        --_M_num_elements;
-      }
-      else {
-        __cur = __next;
-        __next = __cur->_M_next;
-      }
-    }
-    if (_M_equals(_M_get_key(__first->_M_val), __key)) {
-      _M_buckets[__n] = __first->_M_next;
-      _M_delete_node(__first);
-      ++__erased;
-      --_M_num_elements;
-    }
-  }
-  return __erased;
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const iterator& __it)
-{
-  _Node* __p = __it._M_cur;
-  if (__p) {
-    const size_type __n = _M_bkt_num(__p->_M_val);
-    _Node* __cur = _M_buckets[__n];
-
-    if (__cur == __p) {
-      _M_buckets[__n] = __cur->_M_next;
-      _M_delete_node(__cur);
-      --_M_num_elements;
-    }
-    else {
-      _Node* __next = __cur->_M_next;
-      while (__next) {
-        if (__next == __p) {
-          __cur->_M_next = __next->_M_next;
-          _M_delete_node(__next);
-          --_M_num_elements;
-          break;
-        }
-        else {
-          __cur = __next;
-          __next = __cur->_M_next;
-        }
-      }
-    }
-  }
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
-  ::erase(iterator __first, iterator __last)
-{
-  size_type __f_bucket = __first._M_cur ?
-    _M_bkt_num(__first._M_cur->_M_val) : _M_buckets.size();
-  size_type __l_bucket = __last._M_cur ?
-    _M_bkt_num(__last._M_cur->_M_val) : _M_buckets.size();
-
-  if (__first._M_cur == __last._M_cur)
-    return;
-  else if (__f_bucket == __l_bucket)
-    _M_erase_bucket(__f_bucket, __first._M_cur, __last._M_cur);
-  else {
-    _M_erase_bucket(__f_bucket, __first._M_cur, 0);
-    for (size_type __n = __f_bucket + 1; __n < __l_bucket; ++__n)
-      _M_erase_bucket(__n, 0);
-    if (__l_bucket != _M_buckets.size())
-      _M_erase_bucket(__l_bucket, __last._M_cur);
-  }
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-inline void
-hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const_iterator __first,
-                                             const_iterator __last)
-{
-  erase(iterator(const_cast<_Node*>(__first._M_cur),
-                 const_cast<hashtable*>(__first._M_ht)),
-        iterator(const_cast<_Node*>(__last._M_cur),
-                 const_cast<hashtable*>(__last._M_ht)));
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-inline void
-hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::erase(const const_iterator& __it)
-{
-  erase(iterator(const_cast<_Node*>(__it._M_cur),
-                 const_cast<hashtable*>(__it._M_ht)));
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
-  ::resize(size_type __num_elements_hint)
-{
-  const size_type __old_n = _M_buckets.size();
-  if (__num_elements_hint > __old_n) {
-    const size_type __n = _M_next_size(__num_elements_hint);
-    if (__n > __old_n) {
-      _Vector_type __tmp(__n, (_Node*)(0), _M_buckets.get_allocator());
-      try {
-        for (size_type __bucket = 0; __bucket < __old_n; ++__bucket) {
-          _Node* __first = _M_buckets[__bucket];
-          while (__first) {
-            size_type __new_bucket = _M_bkt_num(__first->_M_val, __n);
-            _M_buckets[__bucket] = __first->_M_next;
-            __first->_M_next = __tmp[__new_bucket];
-            __tmp[__new_bucket] = __first;
-            __first = _M_buckets[__bucket];
-          }
-        }
-        _M_buckets.swap(__tmp);
-      }
-      catch(...) {
-        for (size_type __bucket = 0; __bucket < __tmp.size(); ++__bucket) {
-          while (__tmp[__bucket]) {
-            _Node* __next = __tmp[__bucket]->_M_next;
-            _M_delete_node(__tmp[__bucket]);
-            __tmp[__bucket] = __next;
-          }
-        }
-        __throw_exception_again;
-      }
-    }
-  }
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
-  ::_M_erase_bucket(const size_type __n, _Node* __first, _Node* __last)
-{
-  _Node* __cur = _M_buckets[__n];
-  if (__cur == __first)
-    _M_erase_bucket(__n, __last);
-  else {
-    _Node* __next;
-    for (__next = __cur->_M_next;
-         __next != __first;
-         __cur = __next, __next = __cur->_M_next)
-      ;
-    while (__next != __last) {
-      __cur->_M_next = __next->_M_next;
-      _M_delete_node(__next);
-      __next = __cur->_M_next;
-      --_M_num_elements;
-    }
-  }
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
-  ::_M_erase_bucket(const size_type __n, _Node* __last)
-{
-  _Node* __cur = _M_buckets[__n];
-  while (__cur != __last) {
-    _Node* __next = __cur->_M_next;
-    _M_delete_node(__cur);
-    __cur = __next;
-    _M_buckets[__n] = __cur;
-    --_M_num_elements;
-  }
-}
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>::clear()
-{
-  for (size_type __i = 0; __i < _M_buckets.size(); ++__i) {
-    _Node* __cur = _M_buckets[__i];
-    while (__cur != 0) {
-      _Node* __next = __cur->_M_next;
-      _M_delete_node(__cur);
-      __cur = __next;
-    }
-    _M_buckets[__i] = 0;
-  }
-  _M_num_elements = 0;
-}
-
-
-template <class _Val, class _Key, class _HF, class _Ex, class _Eq, class _All>
-void hashtable<_Val,_Key,_HF,_Ex,_Eq,_All>
-  ::_M_copy_from(const hashtable& __ht)
-{
-  _M_buckets.clear();
-  _M_buckets.reserve(__ht._M_buckets.size());
-  _M_buckets.insert(_M_buckets.end(), __ht._M_buckets.size(), (_Node*) 0);
-  try {
-    for (size_type __i = 0; __i < __ht._M_buckets.size(); ++__i) {
-      const _Node* __cur = __ht._M_buckets[__i];
-      if (__cur) {
-        _Node* __local_copy = _M_new_node(__cur->_M_val);
-        _M_buckets[__i] = __local_copy;
-
-        for (_Node* __next = __cur->_M_next;
-             __next;
-             __cur = __next, __next = __cur->_M_next) {
-          __local_copy->_M_next = _M_new_node(__next->_M_val);
-          __local_copy = __local_copy->_M_next;
-        }
-      }
-    }
-    _M_num_elements = __ht._M_num_elements;
-  }
-  catch(...)
-    {
-      clear();
-      __throw_exception_again;
-    }
-}
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/ext/iterator b/include.new/c++/3.4/ext/iterator
deleted file mode 100644
index 094313c..0000000
--- a/include.new/c++/3.4/ext/iterator
+++ /dev/null
@@ -1,113 +0,0 @@
-// HP/SGI iterator extensions -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996-1998
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/iterator
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _EXT_ITERATOR
-#define _EXT_ITERATOR 1
-
-#pragma GCC system_header
-
-#include <bits/concept_check.h>
-#include <iterator>
-
-namespace __gnu_cxx
-{
-  // There are two signatures for distance.  In addition to the one
-  // taking two iterators and returning a result, there is another
-  // taking two iterators and a reference-to-result variable, and
-  // returning nothing.  The latter seems to be an SGI extension.
-  // -- pedwards
-  template<typename _InputIterator, typename _Distance>
-    inline void
-    __distance(_InputIterator __first, _InputIterator __last,
-	       _Distance& __n, std::input_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_InputIteratorConcept<_InputIterator>)
-      while (__first != __last) { ++__first; ++__n; }
-    }
-
-  template<typename _RandomAccessIterator, typename _Distance>
-    inline void
-    __distance(_RandomAccessIterator __first, _RandomAccessIterator __last,
-	       _Distance& __n, std::random_access_iterator_tag)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_RandomAccessIteratorConcept<_RandomAccessIterator>)
-      __n += __last - __first;
-    }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _InputIterator, typename _Distance>
-    inline void
-    distance(_InputIterator __first, _InputIterator __last,
-             _Distance& __n)
-    {
-      // concept requirements -- taken care of in __distance
-      __distance(__first, __last, __n, std::__iterator_category(__first));
-    }
-} // namespace __gnu_cxx
-
-#endif
-
diff --git a/include.new/c++/3.4/ext/malloc_allocator.h b/include.new/c++/3.4/ext/malloc_allocator.h
deleted file mode 100644
index 938380c..0000000
--- a/include.new/c++/3.4/ext/malloc_allocator.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// Allocator that wraps "C" malloc -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _MALLOC_ALLOCATOR_H
-#define _MALLOC_ALLOCATOR_H 1
-
-#include <new>
-
-namespace __gnu_cxx
-{
-  /**
-   *  @brief  An allocator that uses malloc
-   *
-   *  This is precisely the allocator defined in the C++ Standard. 
-   *    - all allocation calls malloc
-   *    - all deallocation calls free
-   *
-   *  (See @link Allocators allocators info @endlink for more.)
-   */
-  template<typename _Tp>
-    class malloc_allocator
-    {
-    public:
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-      typedef _Tp*       pointer;
-      typedef const _Tp* const_pointer;
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef malloc_allocator<_Tp1> other; };
-
-      malloc_allocator() throw() { }
-
-      malloc_allocator(const malloc_allocator&) throw() { }
-
-      template<typename _Tp1>
-        malloc_allocator(const malloc_allocator<_Tp1>&) throw() { }
-
-      ~malloc_allocator() throw() { }
-
-      pointer
-      address(reference __x) const { return &__x; }
-
-      const_pointer
-      address(const_reference __x) const { return &__x; }
-
-      // NB: __n is permitted to be 0.  The C++ standard says nothing
-      // about what the return value is when __n == 0.
-      pointer
-      allocate(size_type __n, const void* = 0)
-      {
-	pointer __ret = static_cast<_Tp*>(malloc(__n * sizeof(_Tp)));
-	if (!__ret)
-	  throw std::bad_alloc();
-	return __ret;
-      }
-
-      // __p is not permitted to be a null pointer.
-      void
-      deallocate(pointer __p, size_type)
-      { free(static_cast<void*>(__p)); }
-
-      size_type
-      max_size() const throw() 
-      { return size_t(-1) / sizeof(_Tp); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_] allocator::construct
-      void 
-      construct(pointer __p, const _Tp& __val) 
-      { ::new(__p) value_type(__val); }
-
-      void 
-      destroy(pointer __p) { __p->~_Tp(); }
-    };
-
-  template<typename _Tp>
-    inline bool
-    operator==(const malloc_allocator<_Tp>&, const malloc_allocator<_Tp>&)
-    { return true; }
-  
-  template<typename _Tp>
-    inline bool
-    operator!=(const malloc_allocator<_Tp>&, const malloc_allocator<_Tp>&)
-    { return false; }
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/ext/memory b/include.new/c++/3.4/ext/memory
deleted file mode 100644
index 1d93f90..0000000
--- a/include.new/c++/3.4/ext/memory
+++ /dev/null
@@ -1,171 +0,0 @@
-// Memory extensions -*- C++ -*-
-
-// Copyright (C) 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/memory
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _EXT_MEMORY
-#define _EXT_MEMORY 1
-
-#pragma GCC system_header
-
-#include <memory>
-#include <bits/stl_tempbuf.h>
-
-namespace __gnu_cxx
-{
-  using std::ptrdiff_t;
-  using std::pair;
-  using std::__iterator_category;
-  using std::_Temporary_buffer;
-
-  template<typename _InputIter, typename _Size, typename _ForwardIter>
-    pair<_InputIter, _ForwardIter>
-    __uninitialized_copy_n(_InputIter __first, _Size __count,
-			   _ForwardIter __result, std::input_iterator_tag)
-    {
-      _ForwardIter __cur = __result;
-      try
-	{
-	  for ( ; __count > 0 ; --__count, ++__first, ++__cur)
-	    std::_Construct(&*__cur, *__first);
-	  return pair<_InputIter, _ForwardIter>(__first, __cur);
-	}
-      catch(...)
-	{
-	  std::_Destroy(__result, __cur);
-	  __throw_exception_again;
-	}
-    }
-
-  template<typename _RandomAccessIter, typename _Size, typename _ForwardIter>
-    inline pair<_RandomAccessIter, _ForwardIter>
-    __uninitialized_copy_n(_RandomAccessIter __first, _Size __count,
-			   _ForwardIter __result,
-			   std::random_access_iterator_tag)
-    {
-      _RandomAccessIter __last = __first + __count;
-      return pair<_RandomAccessIter, _ForwardIter>(
-		     __last,
-		     std::uninitialized_copy(__first, __last, __result));
-    }
-
-  template<typename _InputIter, typename _Size, typename _ForwardIter>
-    inline pair<_InputIter, _ForwardIter>
-    __uninitialized_copy_n(_InputIter __first, _Size __count,
-			 _ForwardIter __result)
-    {
-      return __uninitialized_copy_n(__first, __count, __result,
-				    __iterator_category(__first));
-    }
-
-  /**
-   *  @brief Copies the range [first,last) into result.
-   *  @param  first  An input iterator.
-   *  @param  last   An input iterator.
-   *  @param  result An output iterator.
-   *  @return   result + (first - last)
-   *  @ingroup SGIextensions
-   *
-   *  Like copy(), but does not require an initialized output range.
-  */
-  template<typename _InputIter, typename _Size, typename _ForwardIter>
-    inline pair<_InputIter, _ForwardIter>
-    uninitialized_copy_n(_InputIter __first, _Size __count,
-			 _ForwardIter __result)
-    {
-      return __uninitialized_copy_n(__first, __count, __result,
-				    __iterator_category(__first));
-    }
-
-
-  /**
-   *  This class provides similar behavior and semantics of the standard
-   *  functions get_temporary_buffer() and return_temporary_buffer(), but
-   *  encapsulated in a type vaguely resembling a standard container.
-   *
-   *  By default, a temporary_buffer<Iter> stores space for objects of
-   *  whatever type the Iter iterator points to.  It is constructed from a
-   *  typical [first,last) range, and provides the begin(), end(), size()
-   *  functions, as well as requested_size().  For non-trivial types, copies
-   *  of *first will be used to initialize the storage.
-   *
-   *  @c malloc is used to obtain underlying storage.
-   *
-   *  Like get_temporary_buffer(), not all the requested memory may be
-   *  available.  Ideally, the created buffer will be large enough to hold a
-   *  copy of [first,last), but if size() is less than requested_size(),
-   *  then this didn't happen.
-   *
-   *  @ingroup SGIextensions
-  */
-  template <class _ForwardIterator, class _Tp
-	      = typename std::iterator_traits<_ForwardIterator>::value_type >
-  struct temporary_buffer : public _Temporary_buffer<_ForwardIterator, _Tp>
-  {
-    /// Requests storage large enough to hold a copy of [first,last).
-    temporary_buffer(_ForwardIterator __first, _ForwardIterator __last)
-    : _Temporary_buffer<_ForwardIterator, _Tp>(__first, __last) { }
-
-    /// Destroys objects and frees storage.
-    ~temporary_buffer() { }
-  };
-} // namespace __gnu_cxx
-
-#endif
-
diff --git a/include.new/c++/3.4/ext/mt_allocator.h b/include.new/c++/3.4/ext/mt_allocator.h
deleted file mode 100644
index f0ee2eb..0000000
--- a/include.new/c++/3.4/ext/mt_allocator.h
+++ /dev/null
@@ -1,718 +0,0 @@
-// MT-optimized allocator -*- C++ -*-
-
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file ext/mt_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- *  You should only include this header if you are using GCC 3 or later.
- */
-
-#ifndef _MT_ALLOCATOR_H
-#define _MT_ALLOCATOR_H 1
-
-#include <new>
-#include <cstdlib>
-#include <bits/functexcept.h>
-#include <bits/gthr.h>
-#include <bits/atomicity.h>
-
-namespace __gnu_cxx
-{
-  /**
-   *  This is a fixed size (power of 2) allocator which - when
-   *  compiled with thread support - will maintain one freelist per
-   *  size per thread plus a "global" one. Steps are taken to limit
-   *  the per thread freelist sizes (by returning excess back to
-   *  "global").
-   *
-   *  Further details:
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/ext/mt_allocator.html
-   */
-  template<typename _Tp>
-    class __mt_alloc
-    {
-    public:
-      typedef size_t                    size_type;
-      typedef ptrdiff_t                 difference_type;
-      typedef _Tp*                      pointer;
-      typedef const _Tp*                const_pointer;
-      typedef _Tp&                      reference;
-      typedef const _Tp&                const_reference;
-      typedef _Tp                       value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef __mt_alloc<_Tp1> other; };
-
-      __mt_alloc() throw() 
-      {
-	// XXX
-      }
-
-      __mt_alloc(const __mt_alloc&) throw() 
-      {
-	// XXX
-      }
-
-      template<typename _Tp1>
-        __mt_alloc(const __mt_alloc<_Tp1>& obj) throw()  
-        {
-	  // XXX
-	}
-
-      ~__mt_alloc() throw() { }
-
-      pointer
-      address(reference __x) const
-      { return &__x; }
-
-      const_pointer
-      address(const_reference __x) const
-      { return &__x; }
-
-      size_type
-      max_size() const throw() 
-      { return size_t(-1) / sizeof(_Tp); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_] allocator::construct
-      void 
-      construct(pointer __p, const _Tp& __val) 
-      { ::new(__p) _Tp(__val); }
-
-      void 
-      destroy(pointer __p) { __p->~_Tp(); }
-
-      pointer
-      allocate(size_type __n, const void* = 0);
-
-      void
-      deallocate(pointer __p, size_type __n);
-
-      // Variables used to configure the behavior of the allocator,
-      // assigned and explained in detail below.
-      struct _Tune
-      {
-	// Alignment needed.
-	// NB: In any case must be >= sizeof(_Block_record), that
-	// is 4 on 32 bit machines and 8 on 64 bit machines.
-	size_t  _M_align;
-
-	// Allocation requests (after round-up to power of 2) below
-	// this value will be handled by the allocator. A raw new/
-	// call will be used for requests larger than this value.
-	size_t	_M_max_bytes; 
-
-	// Size in bytes of the smallest bin.
-	// NB: Must be a power of 2 and >= _M_align.
-	size_t  _M_min_bin;
-
-	// In order to avoid fragmenting and minimize the number of
-	// new() calls we always request new memory using this
-	// value. Based on previous discussions on the libstdc++
-	// mailing list we have choosen the value below.
-	// See http://gcc.gnu.org/ml/libstdc++/2001-07/msg00077.html
-	size_t 	_M_chunk_size;
-
-	// The maximum number of supported threads. Our Linux 2.4.18
-	// reports 4070 in /proc/sys/kernel/threads-max
-	size_t 	_M_max_threads;
-
-	// Each time a deallocation occurs in a threaded application
-	// we make sure that there are no more than
-	// _M_freelist_headroom % of used memory on the freelist. If
-	// the number of additional records is more than
-	// _M_freelist_headroom % of the freelist, we move these
-	// records back to the global pool.
-	size_t 	_M_freelist_headroom;
-
-	// Set to true forces all allocations to use new().
-	bool 	_M_force_new; 
-     
-	explicit
-	_Tune()
-	: _M_align(8), _M_max_bytes(128), _M_min_bin(8),
-	  _M_chunk_size(4096 - 4 * sizeof(void*)), 
-	  _M_max_threads(4096), _M_freelist_headroom(10), 
-	  _M_force_new(getenv("GLIBCXX_FORCE_NEW") ? true : false)
-	{ }
-
-	explicit
-	_Tune(size_t __align, size_t __maxb, size_t __minbin,
-	      size_t __chunk, size_t __maxthreads, size_t __headroom,
-	      bool __force) 
-	: _M_align(__align), _M_max_bytes(__maxb), _M_min_bin(__minbin),
-	  _M_chunk_size(__chunk), _M_max_threads(__maxthreads),
-	  _M_freelist_headroom(__headroom), _M_force_new(__force)
-	{ }
-      };
-
-    private:
-      // We need to create the initial lists and set up some variables
-      // before we can answer to the first request for memory.
-#ifdef __GTHREADS
-      static __gthread_once_t 		_S_once;
-#endif
-      static bool 			_S_init;
-
-      static void
-      _S_initialize();
-
-      // Configuration options.
-      static _Tune 	       		_S_options;
-
-      static const _Tune
-      _S_get_options()
-      { return _S_options; }
-
-      static void
-      _S_set_options(_Tune __t)
-      { 
-	if (!_S_init)
-	  _S_options = __t;
-      }
-
-      // Using short int as type for the binmap implies we are never
-      // caching blocks larger than 65535 with this allocator
-      typedef unsigned short int        _Binmap_type;
-      static _Binmap_type* 		_S_binmap;
-
-      // Each requesting thread is assigned an id ranging from 1 to
-      // _S_max_threads. Thread id 0 is used as a global memory pool.
-      // In order to get constant performance on the thread assignment
-      // routine, we keep a list of free ids. When a thread first
-      // requests memory we remove the first record in this list and
-      // stores the address in a __gthread_key. When initializing the
-      // __gthread_key we specify a destructor. When this destructor
-      // (i.e. the thread dies) is called, we return the thread id to
-      // the front of this list.
-#ifdef __GTHREADS
-      struct _Thread_record
-      {
-        // Points to next free thread id record. NULL if last record in list.
-        _Thread_record* volatile        _M_next;
-
-	// Thread id ranging from 1 to _S_max_threads.
-        size_t                          _M_id;
-      };
-
-      static _Thread_record* volatile 	_S_thread_freelist_first;
-      static __gthread_mutex_t 		_S_thread_freelist_mutex;
-      static __gthread_key_t 		_S_thread_key;
-
-      static void 
-      _S_destroy_thread_key(void* __freelist_pos);
-#endif
-
-      static size_t 
-      _S_get_thread_id();
-
-      union _Block_record
-      {
-	// Points to the block_record of the next free block.
-        _Block_record* volatile         _M_next;
-
-#ifdef __GTHREADS
-	// The thread id of the thread which has requested this block.
-        size_t                          _M_thread_id;
-#endif
-      };
-
-      struct _Bin_record
-      {
-	// An "array" of pointers to the first free block for each
-	// thread id. Memory to this "array" is allocated in _S_initialize()
-	// for _S_max_threads + global pool 0.
-        _Block_record** volatile        _M_first;
-
-#ifdef __GTHREADS
-	// An "array" of counters used to keep track of the amount of
-	// blocks that are on the freelist/used for each thread id.
-	// Memory to these "arrays" is allocated in _S_initialize() for
-	// _S_max_threads + global pool 0.
-        size_t* volatile                _M_free;
-        size_t* volatile                _M_used;
-
-	// Each bin has its own mutex which is used to ensure data
-	// integrity while changing "ownership" on a block.  The mutex
-	// is initialized in _S_initialize().
-        __gthread_mutex_t*              _M_mutex;
-#endif
-      };
-
-      // An "array" of bin_records each of which represents a specific
-      // power of 2 size. Memory to this "array" is allocated in
-      // _S_initialize().
-      static _Bin_record* volatile     	_S_bin;
-
-      // Actual value calculated in _S_initialize().
-      static size_t 	       	     	_S_bin_size; 
-    };
-
-  template<typename _Tp>
-    typename __mt_alloc<_Tp>::pointer
-    __mt_alloc<_Tp>::
-    allocate(size_type __n, const void*)
-    {
-      // Although the test in __gthread_once() would suffice, we wrap
-      // test of the once condition in our own unlocked check. This
-      // saves one function call to pthread_once() (which itself only
-      // tests for the once value unlocked anyway and immediately
-      // returns if set)
-      if (!_S_init)
-	{
-#ifdef __GTHREADS
-	  if (__gthread_active_p())
-	    __gthread_once(&_S_once, _S_initialize);
-#endif
-	  if (!_S_init)
-	    _S_initialize();
-	}
-      
-      // Requests larger than _M_max_bytes are handled by new/delete
-      // directly.
-      const size_t __bytes = __n * sizeof(_Tp);
-      if (__bytes > _S_options._M_max_bytes || _S_options._M_force_new)
-	{
-	  void* __ret = ::operator new(__bytes);
-	  return static_cast<_Tp*>(__ret);
-	}
-
-      // Round up to power of 2 and figure out which bin to use.
-      const size_t __which = _S_binmap[__bytes];      
-      const size_t __thread_id = _S_get_thread_id();
-      
-      // Find out if we have blocks on our freelist.  If so, go ahead
-      // and use them directly without having to lock anything.
-      const _Bin_record& __bin = _S_bin[__which];
-      _Block_record* __block = NULL;
-      if (__bin._M_first[__thread_id] == NULL)
-	{
-	  // NB: For alignment reasons, we can't use the first _M_align
-	  // bytes, even when sizeof(_Block_record) < _M_align.
-	  const size_t __bin_size = ((_S_options._M_min_bin << __which)
-				     + _S_options._M_align);
-	  size_t __block_count = _S_options._M_chunk_size / __bin_size;	  
-
-	  // Are we using threads?
-	  // - Yes, check if there are free blocks on the global
-	  //   list. If so, grab up to __block_count blocks in one
-	  //   lock and change ownership. If the global list is 
-	  //   empty, we allocate a new chunk and add those blocks 
-	  //   directly to our own freelist (with us as owner).
-	  // - No, all operations are made directly to global pool 0
-	  //   no need to lock or change ownership but check for free
-	  //   blocks on global list (and if not add new ones) and
-	  //   get the first one.
-#ifdef __GTHREADS
-	  if (__gthread_active_p())
-	    {
-	      __gthread_mutex_lock(__bin._M_mutex);
-	      if (__bin._M_first[0] == NULL)
-		{
-		  // No need to hold the lock when we are adding a
-		  // whole chunk to our own list.
-		  __gthread_mutex_unlock(__bin._M_mutex);
-		  
-		  void* __v = ::operator new(_S_options._M_chunk_size);
-		  __bin._M_first[__thread_id] = static_cast<_Block_record*>(__v);
-		  __bin._M_free[__thread_id] = __block_count;
-
-		  --__block_count;
-		  __block = __bin._M_first[__thread_id];
-		  while (__block_count-- > 0)
-		    {
-		      char* __c = reinterpret_cast<char*>(__block) + __bin_size;
-		      __block->_M_next = reinterpret_cast<_Block_record*>(__c);
-		      __block = __block->_M_next;
-		    }
-		  __block->_M_next = NULL;
-		}
-	      else
-		{
-		  // Is the number of required blocks greater than or
-		  // equal to the number that can be provided by the
-		  // global free list?
-		  __bin._M_first[__thread_id] = __bin._M_first[0];
-		  if (__block_count >= __bin._M_free[0])
-		    {
-		      __bin._M_free[__thread_id] = __bin._M_free[0];
-		      __bin._M_free[0] = 0;
-		      __bin._M_first[0] = NULL;
-		    }
-		  else
-		    {
-		      __bin._M_free[__thread_id] = __block_count;
-		      __bin._M_free[0] -= __block_count;
-		      --__block_count;
-		      __block = __bin._M_first[0];
-		      while (__block_count-- > 0)
-			__block = __block->_M_next;
-		      __bin._M_first[0] = __block->_M_next;
-		      __block->_M_next = NULL;
-		    }
-		  __gthread_mutex_unlock(__bin._M_mutex);
-		}
-	    }
-	  else
-#endif
-	    {
-	      void* __v = ::operator new(_S_options._M_chunk_size);
-	      __bin._M_first[0] = static_cast<_Block_record*>(__v);
-	      
-	      --__block_count;
-	      __block = __bin._M_first[0];
-	      while (__block_count-- > 0)
-		{
-		  char* __c = reinterpret_cast<char*>(__block) + __bin_size;
-		  __block->_M_next = reinterpret_cast<_Block_record*>(__c);
-		  __block = __block->_M_next;
-		}
-	      __block->_M_next = NULL;
-	    }
-	}
-
-      __block = __bin._M_first[__thread_id];
-      __bin._M_first[__thread_id] = __bin._M_first[__thread_id]->_M_next;
-#ifdef __GTHREADS
-      if (__gthread_active_p())
-	{
-	  __block->_M_thread_id = __thread_id;
-	  --__bin._M_free[__thread_id];
-	  ++__bin._M_used[__thread_id];
-	}
-#endif
-
-      char* __c = reinterpret_cast<char*>(__block) + _S_options._M_align;
-      return static_cast<_Tp*>(static_cast<void*>(__c));
-    }
-  
-  template<typename _Tp>
-    void
-    __mt_alloc<_Tp>::
-    deallocate(pointer __p, size_type __n)
-    {
-      // Requests larger than _M_max_bytes are handled by operators
-      // new/delete directly.
-      const size_t __bytes = __n * sizeof(_Tp);
-      if (__bytes > _S_options._M_max_bytes || _S_options._M_force_new)
-	{
-	  ::operator delete(__p);
-	  return;
-	}
-      
-      // Round up to power of 2 and figure out which bin to use.
-      const size_t __which = _S_binmap[__bytes];
-      const _Bin_record& __bin = _S_bin[__which];
-
-      char* __c = reinterpret_cast<char*>(__p) - _S_options._M_align;
-      _Block_record* __block = reinterpret_cast<_Block_record*>(__c);
-      
-#ifdef __GTHREADS
-      if (__gthread_active_p())
-	{
-	  // Calculate the number of records to remove from our freelist:
-	  // in order to avoid too much contention we wait until the
-	  // number of records is "high enough".
-	  const size_t __thread_id = _S_get_thread_id();
-
-	  long __remove = ((__bin._M_free[__thread_id]
-			    * _S_options._M_freelist_headroom)
-			   - __bin._M_used[__thread_id]);
-	  if (__remove > static_cast<long>(100 * (_S_bin_size - __which)
-					   * _S_options._M_freelist_headroom)
-	      && __remove > static_cast<long>(__bin._M_free[__thread_id]))
-	    {
-	      _Block_record* __tmp = __bin._M_first[__thread_id];
-	      _Block_record* __first = __tmp;
-	      __remove /= _S_options._M_freelist_headroom;
-	      const long __removed = __remove;
-	      --__remove;
-	      while (__remove-- > 0)
-		__tmp = __tmp->_M_next;
-	      __bin._M_first[__thread_id] = __tmp->_M_next;
-	      __bin._M_free[__thread_id] -= __removed;
-
-	      __gthread_mutex_lock(__bin._M_mutex);
-	      __tmp->_M_next = __bin._M_first[0];
-	      __bin._M_first[0] = __first;
-	      __bin._M_free[0] += __removed;
-	      __gthread_mutex_unlock(__bin._M_mutex);
-	    }
-	  
-	  // Return this block to our list and update counters and
-	  // owner id as needed.
-	  --__bin._M_used[__block->_M_thread_id];
-
-	  __block->_M_next = __bin._M_first[__thread_id];
-	  __bin._M_first[__thread_id] = __block;
-	  
-	  ++__bin._M_free[__thread_id];
-	}
-      else
-#endif
-	{
-	  // Single threaded application - return to global pool.
-	  __block->_M_next = __bin._M_first[0];
-	  __bin._M_first[0] = __block;
-	}
-    }
-  
-  template<typename _Tp>
-    void
-    __mt_alloc<_Tp>::
-    _S_initialize()
-    {
-      // This method is called on the first allocation (when _S_init is still
-      // false) to create the bins.
-      
-      // Ensure that the static initialization of _S_options has
-      // happened.  This depends on (a) _M_align == 0 being an invalid
-      // value that is only present at startup, and (b) the real
-      // static initialization that happens later not actually
-      // changing anything.
-      if (_S_options._M_align == 0) 
-        new (&_S_options) _Tune;
-  
-      // _M_force_new must not change after the first allocate(),
-      // which in turn calls this method, so if it's false, it's false
-      // forever and we don't need to return here ever again.
-      if (_S_options._M_force_new) 
-	{
-	  _S_init = true;
-	  return;
-	}
-
-      // Calculate the number of bins required based on _M_max_bytes.
-      // _S_bin_size is statically-initialized to one.
-      size_t __bin_size = _S_options._M_min_bin;
-      while (_S_options._M_max_bytes > __bin_size)
-	{
-	  __bin_size <<= 1;
-	  ++_S_bin_size;
-	}
-
-      // Setup the bin map for quick lookup of the relevant bin.
-      const size_t __j = (_S_options._M_max_bytes + 1) * sizeof(_Binmap_type);
-      _S_binmap = static_cast<_Binmap_type*>(::operator new(__j));
-
-      _Binmap_type* __bp = _S_binmap;
-      _Binmap_type __bin_max = _S_options._M_min_bin;
-      _Binmap_type __bint = 0;
-      for (_Binmap_type __ct = 0; __ct <= _S_options._M_max_bytes; ++__ct)
-        {
-          if (__ct > __bin_max)
-            {
-              __bin_max <<= 1;
-              ++__bint;
-            }
-          *__bp++ = __bint;
-        }
-
-      // Initialize _S_bin and its members.
-      void* __v = ::operator new(sizeof(_Bin_record) * _S_bin_size);
-      _S_bin = static_cast<_Bin_record*>(__v);
-
-      // If __gthread_active_p() create and initialize the list of
-      // free thread ids. Single threaded applications use thread id 0
-      // directly and have no need for this.
-#ifdef __GTHREADS
-      if (__gthread_active_p())
-        {
-	  const size_t __k = sizeof(_Thread_record) * _S_options._M_max_threads;
-	  __v = ::operator new(__k);
-          _S_thread_freelist_first = static_cast<_Thread_record*>(__v);
-
-	  // NOTE! The first assignable thread id is 1 since the
-	  // global pool uses id 0
-          size_t __i;
-          for (__i = 1; __i < _S_options._M_max_threads; ++__i)
-            {
-	      _Thread_record& __tr = _S_thread_freelist_first[__i - 1];
-              __tr._M_next = &_S_thread_freelist_first[__i];
-              __tr._M_id = __i;
-            }
-
-          // Set last record.
-          _S_thread_freelist_first[__i - 1]._M_next = NULL;
-          _S_thread_freelist_first[__i - 1]._M_id = __i;
-
-	  // Make sure this is initialized.
-#ifndef __GTHREAD_MUTEX_INIT
-	  __GTHREAD_MUTEX_INIT_FUNCTION(&_S_thread_freelist_mutex);
-#endif
-          // Initialize per thread key to hold pointer to
-          // _S_thread_freelist.
-          __gthread_key_create(&_S_thread_key, _S_destroy_thread_key);
-
-	  const size_t __max_threads = _S_options._M_max_threads + 1;
-	  for (size_t __n = 0; __n < _S_bin_size; ++__n)
-	    {
-	      _Bin_record& __bin = _S_bin[__n];
-	      __v = ::operator new(sizeof(_Block_record*) * __max_threads);
-	      __bin._M_first = static_cast<_Block_record**>(__v);
-
-	      __v = ::operator new(sizeof(size_t) * __max_threads);
-              __bin._M_free = static_cast<size_t*>(__v);
-
-	      __v = ::operator new(sizeof(size_t) * __max_threads);
-              __bin._M_used = static_cast<size_t*>(__v);
-
-	      __v = ::operator new(sizeof(__gthread_mutex_t));
-              __bin._M_mutex = static_cast<__gthread_mutex_t*>(__v);
-
-#ifdef __GTHREAD_MUTEX_INIT
-              {
-                // Do not copy a POSIX/gthr mutex once in use.
-                __gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT;
-                *__bin._M_mutex = __tmp;
-              }
-#else
-              { __GTHREAD_MUTEX_INIT_FUNCTION(__bin._M_mutex); }
-#endif
-
-	      for (size_t __threadn = 0; __threadn < __max_threads;
-		   ++__threadn)
-		{
-		  __bin._M_first[__threadn] = NULL;
-		  __bin._M_free[__threadn] = 0;
-		  __bin._M_used[__threadn] = 0;
-		}
-	    }
-	}
-      else
-#endif	
-	for (size_t __n = 0; __n < _S_bin_size; ++__n)
-	  {
-	    _Bin_record& __bin = _S_bin[__n];
-	    __v = ::operator new(sizeof(_Block_record*));
-	    __bin._M_first = static_cast<_Block_record**>(__v);
-	    __bin._M_first[0] = NULL;
-	  }
-
-      _S_init = true;
-    }
-
-  template<typename _Tp>
-    size_t
-    __mt_alloc<_Tp>::
-    _S_get_thread_id()
-    {
-#ifdef __GTHREADS
-      // If we have thread support and it's active we check the thread
-      // key value and return its id or if it's not set we take the
-      // first record from _S_thread_freelist and sets the key and
-      // returns it's id.
-      if (__gthread_active_p())
-        {
-          _Thread_record* __freelist_pos =
-	    static_cast<_Thread_record*>(__gthread_getspecific(_S_thread_key)); 
-	  if (__freelist_pos == NULL)
-            {
-	      // Since _S_options._M_max_threads must be larger than
-	      // the theoretical max number of threads of the OS the
-	      // list can never be empty.
-              __gthread_mutex_lock(&_S_thread_freelist_mutex);
-              __freelist_pos = _S_thread_freelist_first;
-              _S_thread_freelist_first = _S_thread_freelist_first->_M_next;
-              __gthread_mutex_unlock(&_S_thread_freelist_mutex);
-
-              __gthread_setspecific(_S_thread_key, 
-				    static_cast<void*>(__freelist_pos));
-            }
-          return __freelist_pos->_M_id;
-        }
-#endif
-      // Otherwise (no thread support or inactive) all requests are
-      // served from the global pool 0.
-      return 0;
-    }
-
-#ifdef __GTHREADS
-  template<typename _Tp>
-    void
-    __mt_alloc<_Tp>::
-    _S_destroy_thread_key(void* __freelist_pos)
-    {
-      // Return this thread id record to front of thread_freelist.
-      __gthread_mutex_lock(&_S_thread_freelist_mutex);
-      _Thread_record* __tr = static_cast<_Thread_record*>(__freelist_pos);
-      __tr->_M_next = _S_thread_freelist_first;
-      _S_thread_freelist_first = __tr;
-      __gthread_mutex_unlock(&_S_thread_freelist_mutex);
-    }
-#endif
-
-  template<typename _Tp>
-    inline bool
-    operator==(const __mt_alloc<_Tp>&, const __mt_alloc<_Tp>&)
-    { return true; }
-  
-  template<typename _Tp>
-    inline bool
-    operator!=(const __mt_alloc<_Tp>&, const __mt_alloc<_Tp>&)
-    { return false; }
-
-  template<typename _Tp> 
-    bool __mt_alloc<_Tp>::_S_init = false;
-
-  template<typename _Tp> 
-    typename __mt_alloc<_Tp>::_Tune __mt_alloc<_Tp>::_S_options;
-
-  template<typename _Tp> 
-    typename __mt_alloc<_Tp>::_Binmap_type* __mt_alloc<_Tp>::_S_binmap;
-
-  template<typename _Tp> 
-    typename __mt_alloc<_Tp>::_Bin_record* volatile __mt_alloc<_Tp>::_S_bin;
-
-  template<typename _Tp> 
-    size_t __mt_alloc<_Tp>::_S_bin_size = 1;
-
-  // Actual initialization in _S_initialize().
-#ifdef __GTHREADS
-  template<typename _Tp> 
-    __gthread_once_t __mt_alloc<_Tp>::_S_once = __GTHREAD_ONCE_INIT;
-
-  template<typename _Tp> 
-    typename __mt_alloc<_Tp>::_Thread_record*
-    volatile __mt_alloc<_Tp>::_S_thread_freelist_first = NULL;
-
-  template<typename _Tp> 
-    __gthread_key_t __mt_alloc<_Tp>::_S_thread_key;
-
-  template<typename _Tp> 
-    __gthread_mutex_t
-#ifdef __GTHREAD_MUTEX_INIT
-    __mt_alloc<_Tp>::_S_thread_freelist_mutex = __GTHREAD_MUTEX_INIT;
-#else
-    __mt_alloc<_Tp>::_S_thread_freelist_mutex;
-#endif
-#endif
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/ext/new_allocator.h b/include.new/c++/3.4/ext/new_allocator.h
deleted file mode 100644
index 1b0b4f6..0000000
--- a/include.new/c++/3.4/ext/new_allocator.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// Allocator that wraps operator new -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-#ifndef _NEW_ALLOCATOR_H
-#define _NEW_ALLOCATOR_H 1
-
-#include <new>
-
-namespace __gnu_cxx
-{
-  /**
-   *  @brief  An allocator that uses global new, as per [20.4].
-   *
-   *  This is precisely the allocator defined in the C++ Standard. 
-   *    - all allocation calls operator new
-   *    - all deallocation calls operator delete
-   *
-   *  (See @link Allocators allocators info @endlink for more.)
-   */
-  template<typename _Tp>
-    class new_allocator
-    {
-    public:
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-      typedef _Tp*       pointer;
-      typedef const _Tp* const_pointer;
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef new_allocator<_Tp1> other; };
-
-      new_allocator() throw() { }
-
-      new_allocator(const new_allocator&) throw() { }
-
-      template<typename _Tp1>
-        new_allocator(const new_allocator<_Tp1>&) throw() { }
-
-      ~new_allocator() throw() { }
-
-      pointer
-      address(reference __x) const { return &__x; }
-
-      const_pointer
-      address(const_reference __x) const { return &__x; }
-
-      // NB: __n is permitted to be 0.  The C++ standard says nothing
-      // about what the return value is when __n == 0.
-      pointer
-      allocate(size_type __n, const void* = 0)
-      { return static_cast<_Tp*>(::operator new(__n * sizeof(_Tp))); }
-
-      // __p is not permitted to be a null pointer.
-      void
-      deallocate(pointer __p, size_type)
-      { ::operator delete(__p); }
-
-      size_type
-      max_size() const throw() 
-      { return size_t(-1) / sizeof(_Tp); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_] allocator::construct
-      void 
-      construct(pointer __p, const _Tp& __val) 
-      { ::new(__p) _Tp(__val); }
-
-      void 
-      destroy(pointer __p) { __p->~_Tp(); }
-    };
-
-  template<typename _Tp>
-    inline bool
-    operator==(const new_allocator<_Tp>&, const new_allocator<_Tp>&)
-    { return true; }
-  
-  template<typename _Tp>
-    inline bool
-    operator!=(const new_allocator<_Tp>&, const new_allocator<_Tp>&)
-    { return false; }
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/ext/numeric b/include.new/c++/3.4/ext/numeric
deleted file mode 100644
index 40edf07..0000000
--- a/include.new/c++/3.4/ext/numeric
+++ /dev/null
@@ -1,148 +0,0 @@
-// Numeric extensions -*- C++ -*-
-
-// Copyright (C) 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/numeric
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _EXT_NUMERIC
-#define _EXT_NUMERIC 1
-
-#pragma GCC system_header
-
-#include <bits/concept_check.h>
-#include <numeric>
-
-#include <ext/functional> // For identity_element
-
-namespace __gnu_cxx
-{
-  // Returns __x ** __n, where __n >= 0.  _Note that "multiplication"
-  // is required to be associative, but not necessarily commutative.
-  template<typename _Tp, typename _Integer, typename _MonoidOperation>
-    _Tp
-    __power(_Tp __x, _Integer __n, _MonoidOperation __monoid_op)
-    {
-      if (__n == 0)
-	return identity_element(__monoid_op);
-      else {
-	while ((__n & 1) == 0) {
-	  __n >>= 1;
-	  __x = __monoid_op(__x, __x);
-	}
-
-	_Tp __result = __x;
-	__n >>= 1;
-	while (__n != 0) {
-	  __x = __monoid_op(__x, __x);
-	  if ((__n & 1) != 0)
-	    __result = __monoid_op(__result, __x);
-	  __n >>= 1;
-	}
-	return __result;
-      }
-    }
-
-  template<typename _Tp, typename _Integer>
-    inline _Tp
-    __power(_Tp __x, _Integer __n)
-    { return __power(__x, __n, std::multiplies<_Tp>()); }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  // Alias for the internal name __power.  Note that power is an extension,
-  // not part of the C++ standard.
-  template<typename _Tp, typename _Integer, typename _MonoidOperation>
-    inline _Tp
-    power(_Tp __x, _Integer __n, _MonoidOperation __monoid_op)
-    { return __power(__x, __n, __monoid_op); }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  template<typename _Tp, typename _Integer>
-    inline _Tp
-    power(_Tp __x, _Integer __n)
-    { return __power(__x, __n); }
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-  */
-  // iota is not part of the C++ standard.  It is an extension.
-  template<typename _ForwardIter, typename _Tp>
-    void
-    iota(_ForwardIter __first, _ForwardIter __last, _Tp __value)
-    {
-      // concept requirements
-      __glibcxx_function_requires(_Mutable_ForwardIteratorConcept<_ForwardIter>)
-      __glibcxx_function_requires(_ConvertibleConcept<_Tp,
-	    typename std::iterator_traits<_ForwardIter>::value_type>)
-
-      while (__first != __last)
-	*__first++ = __value++;
-    }
-} // namespace __gnu_cxx
-
-#endif
-
diff --git a/include.new/c++/3.4/ext/pod_char_traits.h b/include.new/c++/3.4/ext/pod_char_traits.h
deleted file mode 100644
index c69025e..0000000
--- a/include.new/c++/3.4/ext/pod_char_traits.h
+++ /dev/null
@@ -1,158 +0,0 @@
-// POD character, std::char_traits specialization -*- C++ -*-
-
-// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Gabriel Dos Reis <gdr@integrable-solutions.net>
-// Benjamin Kosnik <bkoz@redhat.com>
-
-#ifndef _POD_CHAR_TRAITS_H
-#define _POD_CHAR_TRAITS_H 1
-
-#include <string>
-
-namespace __gnu_cxx
-{
-  template<typename V, typename I, typename S = mbstate_t>
-    struct character
-    {
-      typedef V		value_type;
-      typedef I		int_type;
-      typedef S		state_type;
-      value_type	value;
-    };
-
-  template<typename V, typename I>
-    inline bool
-    operator==(const character<V, I>& lhs, const character<V, I>& rhs)
-    { return lhs.value == rhs.value; }
-
-  template<typename V, typename I>
-    inline bool
-    operator<(const character<V, I>& lhs, const character<V, I>& rhs)
-    { return lhs.value < rhs.value; }
-} // namespace __gnu_cxx
-
-namespace std
-{
-  // Provide std::char_traits specialization.
-  template<typename V, typename I, typename S>
-    struct char_traits<__gnu_cxx::character<V, I, S> >
-    {
-      typedef __gnu_cxx::character<V, I, S>	char_type;
-
-      // NB: This type should be bigger than char_type, so as to
-      // properly hold EOF values in addition to the full range of
-      // char_type values.
-      // Also, assumes
-      // int_type(value_type) is valid.
-      // int_type(-1) is possible.
-      typedef typename char_type::int_type	int_type;
-      typedef typename char_type::state_type	state_type;
-      typedef fpos<state_type>			pos_type;
-      typedef streamoff				off_type;
-
-      static void
-      assign(char_type& __c1, const char_type& __c2)
-      { __c1 = __c2; }
-
-      static bool
-      eq(const char_type& __c1, const char_type& __c2)
-      { return __c1 == __c2; }
-
-      static bool
-      lt(const char_type& __c1, const char_type& __c2)
-      { return __c1 < __c2; }
-
-      static int
-      compare(const char_type* __s1, const char_type* __s2, size_t __n)
-      {
-	for (size_t __i = 0; __i < __n; ++__i)
-	  if (!eq(__s1[__i], __s2[__i]))
-	    return lt(__s1[__i], __s2[__i]) ? -1 : 1;
-	return 0;
-      }
-
-      static size_t
-      length(const char_type* __s)
-      {
-	const char_type* __p = __s;
-	while (__p->value)
-	  ++__p;
-	return (__p - __s);
-      }
-
-      static const char_type*
-      find(const char_type* __s, size_t __n, const char_type& __a)
-      {
-	for (const char_type* __p = __s; size_t(__p - __s) < __n; ++__p)
-	  if (*__p == __a)
-	    return __p;
-	return 0;
-      }
-
-      static char_type*
-      move(char_type* __s1, const char_type* __s2, size_t __n)
-      { return (char_type*) memmove(__s1, __s2, __n * sizeof(char_type)); }
-
-      static char_type*
-      copy(char_type* __s1, const char_type* __s2, size_t __n)
-      { return (char_type*) memcpy(__s1, __s2, __n * sizeof(char_type)); }
-
-      static char_type*
-      assign(char_type* __s, size_t __n, char_type __a)
-      {
-	for (char_type* __p = __s; __p < __s + __n; ++__p)
-	  assign(*__p, __a);
-        return __s;
-      }
-
-      static char_type
-      to_char_type(const int_type& __c)
-      {
-	char_type __r = { __c };
-	return __r;
-      }
-
-      static int_type
-      to_int_type(const char_type& __c)
-      { return int_type(__c.value); }
-
-      static bool
-      eq_int_type(const int_type& __c1, const int_type& __c2)
-      { return __c1 == __c2; }
-
-      static int_type
-      eof() { return static_cast<int_type>(-1); }
-
-      static int_type
-      not_eof(const int_type& __c)
-      { return eq_int_type(__c, eof()) ? int_type(0) : __c; }
-    };
-}
-
-#endif
diff --git a/include.new/c++/3.4/ext/pool_allocator.h b/include.new/c++/3.4/ext/pool_allocator.h
deleted file mode 100644
index 0f087a0..0000000
--- a/include.new/c++/3.4/ext/pool_allocator.h
+++ /dev/null
@@ -1,255 +0,0 @@
-// Allocators -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1996-1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/pool_allocator.h
- *  This file is a GNU extension to the Standard C++ Library.
- *  You should only include this header if you are using GCC 3 or later.
- */
-#ifndef _POOL_ALLOCATOR_H
-#define _POOL_ALLOCATOR_H 1
-
-#include <bits/c++config.h>
-#include <cstdlib>
-#include <new>
-#include <bits/functexcept.h>
-#include <bits/atomicity.h>
-#include <bits/concurrence.h>
-
-namespace __gnu_cxx
-{
-  /**
-   *  @if maint
-   *  Uses various allocators to fulfill underlying requests (and makes as
-   *  few requests as possible when in default high-speed pool mode).
-   *
-   *  Important implementation properties:
-   *  0. If globally mandated, then allocate objects from new
-   *  1. If the clients request an object of size > _S_max_bytes, the resulting
-   *     object will be obtained directly from new
-   *  2. In all other cases, we allocate an object of size exactly
-   *     _S_round_up(requested_size).  Thus the client has enough size
-   *     information that we can return the object to the proper free list
-   *     without permanently losing part of the object.
-   *
-   *  @endif
-   *  (See @link Allocators allocators info @endlink for more.)
-   */
-    class __pool_alloc_base
-    {
-    protected:
-
-      enum { _S_align = 8 };
-      enum { _S_max_bytes = 128 };
-      enum { _S_free_list_size = _S_max_bytes / _S_align };
-      
-      union _Obj
-      {
-	union _Obj* _M_free_list_link;
-	char        _M_client_data[1];    // The client sees this.
-      };
-      
-      static _Obj* volatile         _S_free_list[_S_free_list_size];
-
-      // Chunk allocation state.
-      static char*                  _S_start_free;
-      static char*                  _S_end_free;
-      static size_t                 _S_heap_size;     
-      
-      size_t
-      _M_round_up(size_t __bytes)
-      { return ((__bytes + (size_t)_S_align - 1) & ~((size_t)_S_align - 1)); }
-      
-      _Obj* volatile*
-      _M_get_free_list(size_t __bytes);
-    
-      mutex_type&
-      _M_get_mutex();
-
-      // Returns an object of size __n, and optionally adds to size __n
-      // free list.
-      void*
-      _M_refill(size_t __n);
-      
-      // Allocates a chunk for nobjs of size size.  nobjs may be reduced
-      // if it is inconvenient to allocate the requested number.
-      char*
-      _M_allocate_chunk(size_t __n, int& __nobjs);
-    };
-
-
-  template<typename _Tp>
-    class __pool_alloc : private __pool_alloc_base
-    {
-    private:
-      static _Atomic_word	    _S_force_new;
-
-    public:
-      typedef size_t     size_type;
-      typedef ptrdiff_t  difference_type;
-      typedef _Tp*       pointer;
-      typedef const _Tp* const_pointer;
-      typedef _Tp&       reference;
-      typedef const _Tp& const_reference;
-      typedef _Tp        value_type;
-
-      template<typename _Tp1>
-        struct rebind
-        { typedef __pool_alloc<_Tp1> other; };
-
-      __pool_alloc() throw() { }
-
-      __pool_alloc(const __pool_alloc&) throw() { }
-
-      template<typename _Tp1>
-        __pool_alloc(const __pool_alloc<_Tp1>&) throw() { }
-
-      ~__pool_alloc() throw() { }
-
-      pointer
-      address(reference __x) const { return &__x; }
-
-      const_pointer
-      address(const_reference __x) const { return &__x; }
-
-      size_type
-      max_size() const throw() 
-      { return size_t(-1) / sizeof(_Tp); }
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 402. wrong new expression in [some_] allocator::construct
-      void 
-      construct(pointer __p, const _Tp& __val) 
-      { ::new(__p) _Tp(__val); }
-
-      void 
-      destroy(pointer __p) { __p->~_Tp(); }
-
-      pointer
-      allocate(size_type __n, const void* = 0);
-
-      void
-      deallocate(pointer __p, size_type __n);      
-    };
-
-  template<typename _Tp>
-    inline bool
-    operator==(const __pool_alloc<_Tp>&, const __pool_alloc<_Tp>&)
-    { return true; }
-
-  template<typename _Tp>
-    inline bool
-    operator!=(const __pool_alloc<_Tp>&, const __pool_alloc<_Tp>&)
-    { return false; }
-
-  template<typename _Tp>
-    _Atomic_word
-    __pool_alloc<_Tp>::_S_force_new;
-
-  template<typename _Tp>
-    _Tp*
-    __pool_alloc<_Tp>::allocate(size_type __n, const void*)
-    {
-      pointer __ret = 0;
-      if (__n)
-	{
-	  if (__n <= max_size())
-	    {
-	      // If there is a race through here, assume answer from getenv
-	      // will resolve in same direction.  Inspired by techniques
-	      // to efficiently support threading found in basic_string.h.
-	      if (_S_force_new == 0)
-		{
-		  if (getenv("GLIBCXX_FORCE_NEW"))
-		    __atomic_add(&_S_force_new, 1);
-		  else
-		    __atomic_add(&_S_force_new, -1);
-		}
-
-	      const size_t __bytes = __n * sizeof(_Tp);	      
-	      if (__bytes > size_t(_S_max_bytes) || _S_force_new == 1)
-		__ret = static_cast<_Tp*>(::operator new(__bytes));
-	      else
-		{
-		  _Obj* volatile* __free_list = _M_get_free_list(__bytes);
-
-		  lock sentry(_M_get_mutex());
-		  _Obj* __restrict__ __result = *__free_list;
-		  if (__builtin_expect(__result == 0, 0))
-		    __ret = static_cast<_Tp*>(_M_refill(_M_round_up(__bytes)));
-		  else
-		    {
-		      *__free_list = __result->_M_free_list_link;
-		      __ret = reinterpret_cast<_Tp*>(__result);
-		    }
-		  if (__builtin_expect(__ret == 0, 0))
-		    std::__throw_bad_alloc();
-		}
-	    }
-	  else
-	    std::__throw_bad_alloc();
-	}
-      return __ret;
-    }
-
-  template<typename _Tp>
-    void
-    __pool_alloc<_Tp>::deallocate(pointer __p, size_type __n)
-    {
-      if (__n)
-	{
-	  const size_t __bytes = __n * sizeof(_Tp);
-	  if (__bytes > static_cast<size_t>(_S_max_bytes) || _S_force_new == 1)
-	    ::operator delete(__p);
-	  else
-	    {
-	      _Obj* volatile* __free_list = _M_get_free_list(__bytes);
-	      _Obj* __q = reinterpret_cast<_Obj*>(__p);
-
-	      lock sentry(_M_get_mutex());
-	      __q ->_M_free_list_link = *__free_list;
-	      *__free_list = __q;
-	    }
-	}
-    }
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/ext/rb_tree b/include.new/c++/3.4/ext/rb_tree
deleted file mode 100644
index 2c38b39..0000000
--- a/include.new/c++/3.4/ext/rb_tree
+++ /dev/null
@@ -1,97 +0,0 @@
-// rb_tree extension -*- C++ -*-
-
-// Copyright (C) 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/rb_tree
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _RB_TREE
-#define _RB_TREE 1
-
-#pragma GCC system_header
-
-#include <bits/stl_tree.h>
-
-namespace __gnu_cxx
-{
-  using std::_Rb_tree;
-  using std::allocator;
-
-  // Class rb_tree is not part of the C++ standard.  It is provided for
-  // compatibility with the HP STL.
-
-  /**
-   *  This is an SGI extension.
-   *  @ingroup SGIextensions
-   *  @doctodo
-   */
-  template <class _Key, class _Value, class _KeyOfValue, class _Compare,
-	    class _Alloc = allocator<_Value> >
-  struct rb_tree : public _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc>
-  {
-    typedef _Rb_tree<_Key, _Value, _KeyOfValue, _Compare, _Alloc> _Base;
-    typedef typename _Base::allocator_type allocator_type;
-
-    rb_tree(const _Compare& __comp = _Compare(),
-	    const allocator_type& __a = allocator_type())
-      : _Base(__comp, __a) { }
-
-    ~rb_tree() { }
-  };
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/ext/rope b/include.new/c++/3.4/ext/rope
deleted file mode 100644
index b4bf2c9..0000000
--- a/include.new/c++/3.4/ext/rope
+++ /dev/null
@@ -1,2494 +0,0 @@
-// SGI's rope class -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ext/rope
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _ROPE
-#define _ROPE 1
-
-#include <bits/stl_algobase.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_algo.h>
-#include <bits/stl_function.h>
-#include <bits/stl_numeric.h>
-#include <bits/allocator.h>
-#include <ext/hash_fun.h>
-
-# ifdef __GC
-#   define __GC_CONST const
-# else
-#   include <bits/gthr.h>
-#   define __GC_CONST   // constant except for deallocation
-# endif
-
-#include <ext/memory> // For uninitialized_copy_n
-
-namespace __gnu_cxx
-{
-using std::size_t;
-using std::ptrdiff_t;
-using std::allocator;
-using std::iterator;
-using std::reverse_iterator;
-using std::_Destroy;
-
-// The _S_eos function is used for those functions that
-// convert to/from C-like strings to detect the end of the string.
-
-// The end-of-C-string character.
-// This is what the draft standard says it should be.
-template <class _CharT>
-inline _CharT _S_eos(_CharT*) { return _CharT(); }
-
-// Test for basic character types.
-// For basic character types leaves having a trailing eos.
-template <class _CharT>
-inline bool _S_is_basic_char_type(_CharT*) { return false; }
-template <class _CharT>
-inline bool _S_is_one_byte_char_type(_CharT*) { return false; }
-
-inline bool _S_is_basic_char_type(char*) { return true; }
-inline bool _S_is_one_byte_char_type(char*) { return true; }
-inline bool _S_is_basic_char_type(wchar_t*) { return true; }
-
-// Store an eos iff _CharT is a basic character type.
-// Do not reference _S_eos if it isn't.
-template <class _CharT>
-inline void _S_cond_store_eos(_CharT&) {}
-
-inline void _S_cond_store_eos(char& __c) { __c = 0; }
-inline void _S_cond_store_eos(wchar_t& __c) { __c = 0; }
-
-// char_producers are logically functions that generate a section of
-// a string.  These can be convereted to ropes.  The resulting rope
-// invokes the char_producer on demand.  This allows, for example,
-// files to be viewed as ropes without reading the entire file.
-template <class _CharT>
-class char_producer {
-    public:
-        virtual ~char_producer() {};
-        virtual void operator()(size_t __start_pos, size_t __len,
-                                _CharT* __buffer) = 0;
-        // Buffer should really be an arbitrary output iterator.
-        // That way we could flatten directly into an ostream, etc.
-        // This is thoroughly impossible, since iterator types don't
-        // have runtime descriptions.
-};
-
-// Sequence buffers:
-//
-// Sequence must provide an append operation that appends an
-// array to the sequence.  Sequence buffers are useful only if
-// appending an entire array is cheaper than appending element by element.
-// This is true for many string representations.
-// This should  perhaps inherit from ostream<sequence::value_type>
-// and be implemented correspondingly, so that they can be used
-// for formatted.  For the sake of portability, we don't do this yet.
-//
-// For now, sequence buffers behave as output iterators.  But they also
-// behave a little like basic_ostringstream<sequence::value_type> and a
-// little like containers.
-
-template<class _Sequence, size_t _Buf_sz = 100>
-class sequence_buffer : public iterator<std::output_iterator_tag,void,void,void,void>
-{
-    public:
-        typedef typename _Sequence::value_type value_type;
-    protected:
-        _Sequence* _M_prefix;
-        value_type _M_buffer[_Buf_sz];
-        size_t     _M_buf_count;
-    public:
-        void flush() {
-            _M_prefix->append(_M_buffer, _M_buffer + _M_buf_count);
-            _M_buf_count = 0;
-        }
-        ~sequence_buffer() { flush(); }
-        sequence_buffer() : _M_prefix(0), _M_buf_count(0) {}
-        sequence_buffer(const sequence_buffer& __x) {
-            _M_prefix = __x._M_prefix;
-            _M_buf_count = __x._M_buf_count;
-            std::copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
-        }
-        sequence_buffer(sequence_buffer& __x) {
-            __x.flush();
-            _M_prefix = __x._M_prefix;
-            _M_buf_count = 0;
-        }
-        sequence_buffer(_Sequence& __s) : _M_prefix(&__s), _M_buf_count(0) {}
-        sequence_buffer& operator= (sequence_buffer& __x) {
-            __x.flush();
-            _M_prefix = __x._M_prefix;
-            _M_buf_count = 0;
-            return *this;
-        }
-        sequence_buffer& operator= (const sequence_buffer& __x) {
-            _M_prefix = __x._M_prefix;
-            _M_buf_count = __x._M_buf_count;
-            std::copy(__x._M_buffer, __x._M_buffer + __x._M_buf_count, _M_buffer);
-            return *this;
-        }
-        void push_back(value_type __x)
-        {
-            if (_M_buf_count < _Buf_sz) {
-                _M_buffer[_M_buf_count] = __x;
-                ++_M_buf_count;
-            } else {
-                flush();
-                _M_buffer[0] = __x;
-                _M_buf_count = 1;
-            }
-        }
-        void append(value_type* __s, size_t __len)
-        {
-            if (__len + _M_buf_count <= _Buf_sz) {
-                size_t __i = _M_buf_count;
-                for (size_t __j = 0; __j < __len; __i++, __j++) {
-                    _M_buffer[__i] = __s[__j];
-                }
-                _M_buf_count += __len;
-            } else if (0 == _M_buf_count) {
-                _M_prefix->append(__s, __s + __len);
-            } else {
-                flush();
-                append(__s, __len);
-            }
-        }
-        sequence_buffer& write(value_type* __s, size_t __len)
-        {
-            append(__s, __len);
-            return *this;
-        }
-        sequence_buffer& put(value_type __x)
-        {
-            push_back(__x);
-            return *this;
-        }
-        sequence_buffer& operator=(const value_type& __rhs)
-        {
-            push_back(__rhs);
-            return *this;
-        }
-        sequence_buffer& operator*() { return *this; }
-        sequence_buffer& operator++() { return *this; }
-        sequence_buffer operator++(int) { return *this; }
-};
-
-// The following should be treated as private, at least for now.
-template<class _CharT>
-class _Rope_char_consumer {
-    public:
-        // If we had member templates, these should not be virtual.
-        // For now we need to use run-time parametrization where
-        // compile-time would do.  Hence this should all be private
-        // for now.
-        // The symmetry with char_producer is accidental and temporary.
-        virtual ~_Rope_char_consumer() {};
-        virtual bool operator()(const _CharT* __buffer, size_t __len) = 0;
-};
-
-// First a lot of forward declarations.  The standard seems to require
-// much stricter "declaration before use" than many of the implementations
-// that preceded it.
-template<class _CharT, class _Alloc = allocator<_CharT> > class rope;
-template<class _CharT, class _Alloc> struct _Rope_RopeConcatenation;
-template<class _CharT, class _Alloc> struct _Rope_RopeLeaf;
-template<class _CharT, class _Alloc> struct _Rope_RopeFunction;
-template<class _CharT, class _Alloc> struct _Rope_RopeSubstring;
-template<class _CharT, class _Alloc> class _Rope_iterator;
-template<class _CharT, class _Alloc> class _Rope_const_iterator;
-template<class _CharT, class _Alloc> class _Rope_char_ref_proxy;
-template<class _CharT, class _Alloc> class _Rope_char_ptr_proxy;
-
-template<class _CharT, class _Alloc>
-bool operator== (const _Rope_char_ptr_proxy<_CharT,_Alloc>& __x,
-                 const _Rope_char_ptr_proxy<_CharT,_Alloc>& __y);
-
-template<class _CharT, class _Alloc>
-_Rope_const_iterator<_CharT,_Alloc> operator-
-        (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-         ptrdiff_t __n);
-
-template<class _CharT, class _Alloc>
-_Rope_const_iterator<_CharT,_Alloc> operator+
-        (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-         ptrdiff_t __n);
-
-template<class _CharT, class _Alloc>
-_Rope_const_iterator<_CharT,_Alloc> operator+
-        (ptrdiff_t __n,
-         const _Rope_const_iterator<_CharT,_Alloc>& __x);
-
-template<class _CharT, class _Alloc>
-bool operator==
-        (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-         const _Rope_const_iterator<_CharT,_Alloc>& __y);
-
-template<class _CharT, class _Alloc>
-bool operator<
-        (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-         const _Rope_const_iterator<_CharT,_Alloc>& __y);
-
-template<class _CharT, class _Alloc>
-ptrdiff_t operator-
-        (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-         const _Rope_const_iterator<_CharT,_Alloc>& __y);
-
-template<class _CharT, class _Alloc>
-_Rope_iterator<_CharT,_Alloc> operator-
-        (const _Rope_iterator<_CharT,_Alloc>& __x,
-         ptrdiff_t __n);
-
-template<class _CharT, class _Alloc>
-_Rope_iterator<_CharT,_Alloc> operator+
-        (const _Rope_iterator<_CharT,_Alloc>& __x,
-         ptrdiff_t __n);
-
-template<class _CharT, class _Alloc>
-_Rope_iterator<_CharT,_Alloc> operator+
-        (ptrdiff_t __n,
-         const _Rope_iterator<_CharT,_Alloc>& __x);
-
-template<class _CharT, class _Alloc>
-bool operator==
-        (const _Rope_iterator<_CharT,_Alloc>& __x,
-         const _Rope_iterator<_CharT,_Alloc>& __y);
-
-template<class _CharT, class _Alloc>
-bool operator<
-        (const _Rope_iterator<_CharT,_Alloc>& __x,
-         const _Rope_iterator<_CharT,_Alloc>& __y);
-
-template<class _CharT, class _Alloc>
-ptrdiff_t operator-
-        (const _Rope_iterator<_CharT,_Alloc>& __x,
-         const _Rope_iterator<_CharT,_Alloc>& __y);
-
-template<class _CharT, class _Alloc>
-rope<_CharT,_Alloc> operator+ (const rope<_CharT,_Alloc>& __left,
-                               const rope<_CharT,_Alloc>& __right);
-
-template<class _CharT, class _Alloc>
-rope<_CharT,_Alloc> operator+ (const rope<_CharT,_Alloc>& __left,
-                               const _CharT* __right);
-
-template<class _CharT, class _Alloc>
-rope<_CharT,_Alloc> operator+ (const rope<_CharT,_Alloc>& __left,
-                               _CharT __right);
-
-// Some helpers, so we can use power on ropes.
-// See below for why this isn't local to the implementation.
-
-// This uses a nonstandard refcount convention.
-// The result has refcount 0.
-template<class _CharT, class _Alloc>
-struct _Rope_Concat_fn
-       : public std::binary_function<rope<_CharT,_Alloc>, rope<_CharT,_Alloc>,
-                                     rope<_CharT,_Alloc> > {
-        rope<_CharT,_Alloc> operator() (const rope<_CharT,_Alloc>& __x,
-                                const rope<_CharT,_Alloc>& __y) {
-                    return __x + __y;
-        }
-};
-
-template <class _CharT, class _Alloc>
-inline
-rope<_CharT,_Alloc>
-identity_element(_Rope_Concat_fn<_CharT, _Alloc>)
-{
-    return rope<_CharT,_Alloc>();
-}
-
-
-  // Class _Refcount_Base provides a type, _RC_t, a data member,
-  // _M_ref_count, and member functions _M_incr and _M_decr, which perform
-  // atomic preincrement/predecrement.  The constructor initializes
-  // _M_ref_count.
-  struct _Refcount_Base
-  {
-    // The type _RC_t
-    typedef size_t _RC_t;
-
-    // The data member _M_ref_count
-    volatile _RC_t _M_ref_count;
-
-    // Constructor
-    __gthread_mutex_t _M_ref_count_lock;
-
-    _Refcount_Base(_RC_t __n) : _M_ref_count(__n), _M_ref_count_lock()
-    {
-#ifdef __GTHREAD_MUTEX_INIT
-      __gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT;
-      _M_ref_count_lock = __tmp;
-#elif defined(__GTHREAD_MUTEX_INIT_FUNCTION)
-      __GTHREAD_MUTEX_INIT_FUNCTION (&_M_ref_count_lock);
-#else
-#error __GTHREAD_MUTEX_INIT or __GTHREAD_MUTEX_INIT_FUNCTION should be defined by gthr.h abstraction layer, report problem to libstdc++@gcc.gnu.org.
-#endif
-    }
-
-    void
-    _M_incr()
-    {
-      __gthread_mutex_lock(&_M_ref_count_lock);
-      ++_M_ref_count;
-      __gthread_mutex_unlock(&_M_ref_count_lock);
-    }
-
-    _RC_t
-    _M_decr()
-    {
-      __gthread_mutex_lock(&_M_ref_count_lock);
-      volatile _RC_t __tmp = --_M_ref_count;
-      __gthread_mutex_unlock(&_M_ref_count_lock);
-      return __tmp;
-    }
-  };
-
-//
-// What follows should really be local to rope.  Unfortunately,
-// that doesn't work, since it makes it impossible to define generic
-// equality on rope iterators.  According to the draft standard, the
-// template parameters for such an equality operator cannot be inferred
-// from the occurrence of a member class as a parameter.
-// (SGI compilers in fact allow this, but the __result wouldn't be
-// portable.)
-// Similarly, some of the static member functions are member functions
-// only to avoid polluting the global namespace, and to circumvent
-// restrictions on type inference for template functions.
-//
-
-//
-// The internal data structure for representing a rope.  This is
-// private to the implementation.  A rope is really just a pointer
-// to one of these.
-//
-// A few basic functions for manipulating this data structure
-// are members of _RopeRep.  Most of the more complex algorithms
-// are implemented as rope members.
-//
-// Some of the static member functions of _RopeRep have identically
-// named functions in rope that simply invoke the _RopeRep versions.
-
-#define __ROPE_DEFINE_ALLOCS(__a) \
-        __ROPE_DEFINE_ALLOC(_CharT,_Data) /* character data */ \
-        typedef _Rope_RopeConcatenation<_CharT,__a> __C; \
-        __ROPE_DEFINE_ALLOC(__C,_C) \
-        typedef _Rope_RopeLeaf<_CharT,__a> __L; \
-        __ROPE_DEFINE_ALLOC(__L,_L) \
-        typedef _Rope_RopeFunction<_CharT,__a> __F; \
-        __ROPE_DEFINE_ALLOC(__F,_F) \
-        typedef _Rope_RopeSubstring<_CharT,__a> __S; \
-        __ROPE_DEFINE_ALLOC(__S,_S)
-
-//  Internal rope nodes potentially store a copy of the allocator
-//  instance used to allocate them.  This is mostly redundant.
-//  But the alternative would be to pass allocator instances around
-//  in some form to nearly all internal functions, since any pointer
-//  assignment may result in a zero reference count and thus require
-//  deallocation.
-
-#define __STATIC_IF_SGI_ALLOC  /* not static */
-
-template <class _CharT, class _Alloc>
-struct _Rope_rep_base
-: public _Alloc
-{
-  typedef _Alloc allocator_type;
-
-  allocator_type
-  get_allocator() const { return *static_cast<const _Alloc*>(this); }
-
-  _Rope_rep_base(size_t __size, const allocator_type&)
-  : _M_size(__size) {}
-
-  size_t _M_size;
-
-# define __ROPE_DEFINE_ALLOC(_Tp, __name) \
-        typedef typename \
-          _Alloc::template rebind<_Tp>::other __name##Alloc; \
-        static _Tp* __name##_allocate(size_t __n) \
-          { return __name##Alloc().allocate(__n); } \
-        static void __name##_deallocate(_Tp *__p, size_t __n) \
-          { __name##Alloc().deallocate(__p, __n); }
-  __ROPE_DEFINE_ALLOCS(_Alloc)
-# undef __ROPE_DEFINE_ALLOC
-};
-
-namespace _Rope_constants
-{
-  enum { _S_max_rope_depth = 45 };
-  enum _Tag {_S_leaf, _S_concat, _S_substringfn, _S_function};
-}
-
-template<class _CharT, class _Alloc>
-struct _Rope_RopeRep : public _Rope_rep_base<_CharT,_Alloc>
-# ifndef __GC
-    , _Refcount_Base
-# endif
-{
-    public:
-    _Rope_constants::_Tag _M_tag:8;
-    bool _M_is_balanced:8;
-    unsigned char _M_depth;
-    __GC_CONST _CharT* _M_c_string;
-    __gthread_mutex_t _M_c_string_lock;
-                        /* Flattened version of string, if needed.  */
-                        /* typically 0.                             */
-                        /* If it's not 0, then the memory is owned  */
-                        /* by this node.                            */
-                        /* In the case of a leaf, this may point to */
-                        /* the same memory as the data field.       */
-    typedef typename _Rope_rep_base<_CharT,_Alloc>::allocator_type
-                        allocator_type;
-    using _Rope_rep_base<_CharT,_Alloc>::get_allocator;
-    _Rope_RopeRep(_Rope_constants::_Tag __t, int __d, bool __b, size_t __size,
-                  allocator_type __a)
-        : _Rope_rep_base<_CharT,_Alloc>(__size, __a),
-#         ifndef __GC
-          _Refcount_Base(1),
-#         endif
-          _M_tag(__t), _M_is_balanced(__b), _M_depth(__d), _M_c_string(0)
-#ifdef __GTHREAD_MUTEX_INIT
-    {
-	// Do not copy a POSIX/gthr mutex once in use.  However, bits are bits.
-	__gthread_mutex_t __tmp = __GTHREAD_MUTEX_INIT;
-	_M_c_string_lock = __tmp;
-    }
-#else
-    { __GTHREAD_MUTEX_INIT_FUNCTION (&_M_c_string_lock); }
-#endif
-#   ifdef __GC
-        void _M_incr () {}
-#   endif
-        static void _S_free_string(__GC_CONST _CharT*, size_t __len,
-                                   allocator_type __a);
-#       define __STL_FREE_STRING(__s, __l, __a) _S_free_string(__s, __l, __a);
-                        // Deallocate data section of a leaf.
-                        // This shouldn't be a member function.
-                        // But its hard to do anything else at the
-                        // moment, because it's templatized w.r.t.
-                        // an allocator.
-                        // Does nothing if __GC is defined.
-#   ifndef __GC
-          void _M_free_c_string();
-          void _M_free_tree();
-                        // Deallocate t. Assumes t is not 0.
-          void _M_unref_nonnil()
-          {
-              if (0 == _M_decr()) _M_free_tree();
-          }
-          void _M_ref_nonnil()
-          {
-              _M_incr();
-          }
-          static void _S_unref(_Rope_RopeRep* __t)
-          {
-              if (0 != __t) {
-                  __t->_M_unref_nonnil();
-              }
-          }
-          static void _S_ref(_Rope_RopeRep* __t)
-          {
-              if (0 != __t) __t->_M_incr();
-          }
-          static void _S_free_if_unref(_Rope_RopeRep* __t)
-          {
-              if (0 != __t && 0 == __t->_M_ref_count) __t->_M_free_tree();
-          }
-#   else /* __GC */
-          void _M_unref_nonnil() {}
-          void _M_ref_nonnil() {}
-          static void _S_unref(_Rope_RopeRep*) {}
-          static void _S_ref(_Rope_RopeRep*) {}
-          static void _S_free_if_unref(_Rope_RopeRep*) {}
-#   endif
-protected:
-  _Rope_RopeRep&
-  operator=(const _Rope_RopeRep&);
-
-  _Rope_RopeRep(const _Rope_RopeRep&);
-};
-
-template<class _CharT, class _Alloc>
-struct _Rope_RopeLeaf : public _Rope_RopeRep<_CharT,_Alloc> {
-  public:
-    // Apparently needed by VC++
-    // The data fields of leaves are allocated with some
-    // extra space, to accommodate future growth and for basic
-    // character types, to hold a trailing eos character.
-    enum { _S_alloc_granularity = 8 };
-    static size_t _S_rounded_up_size(size_t __n) {
-        size_t __size_with_eos;
-
-        if (_S_is_basic_char_type((_CharT*)0)) {
-            __size_with_eos = __n + 1;
-        } else {
-            __size_with_eos = __n;
-        }
-#       ifdef __GC
-           return __size_with_eos;
-#       else
-           // Allow slop for in-place expansion.
-           return (__size_with_eos + _S_alloc_granularity-1)
-                        &~ (_S_alloc_granularity-1);
-#       endif
-    }
-    __GC_CONST _CharT* _M_data; /* Not necessarily 0 terminated. */
-                                /* The allocated size is         */
-                                /* _S_rounded_up_size(size), except */
-                                /* in the GC case, in which it   */
-                                /* doesn't matter.               */
-    typedef typename _Rope_rep_base<_CharT,_Alloc>::allocator_type
-                        allocator_type;
-    _Rope_RopeLeaf(__GC_CONST _CharT* __d, size_t __size, allocator_type __a)
-        : _Rope_RopeRep<_CharT,_Alloc>(_Rope_constants::_S_leaf, 0, true, __size, __a), _M_data(__d)
-        {
-        if (_S_is_basic_char_type((_CharT *)0)) {
-            // already eos terminated.
-            this->_M_c_string = __d;
-        }
-    }
-        // The constructor assumes that d has been allocated with
-        // the proper allocator and the properly padded size.
-        // In contrast, the destructor deallocates the data:
-# ifndef __GC
-    ~_Rope_RopeLeaf() throw() {
-        if (_M_data != this->_M_c_string) {
-	  this->_M_free_c_string();
-        }
-        __STL_FREE_STRING(_M_data, this->_M_size, this->get_allocator());
-    }
-# endif
-protected:
-  _Rope_RopeLeaf&
-  operator=(const _Rope_RopeLeaf&);
-
-  _Rope_RopeLeaf(const _Rope_RopeLeaf&);
-};
-
-template<class _CharT, class _Alloc>
-struct _Rope_RopeConcatenation : public _Rope_RopeRep<_CharT,_Alloc> {
-  public:
-    _Rope_RopeRep<_CharT,_Alloc>* _M_left;
-    _Rope_RopeRep<_CharT,_Alloc>* _M_right;
-    typedef typename _Rope_rep_base<_CharT,_Alloc>::allocator_type
-                        allocator_type;
-    _Rope_RopeConcatenation(_Rope_RopeRep<_CharT,_Alloc>* __l,
-                             _Rope_RopeRep<_CharT,_Alloc>* __r,
-                             allocator_type __a)
-
-      : _Rope_RopeRep<_CharT,_Alloc>(_Rope_constants::_S_concat,
-                                     std::max(__l->_M_depth, __r->_M_depth) + 1,
-                                     false,
-                                     __l->_M_size + __r->_M_size, __a),
-        _M_left(__l), _M_right(__r)
-      {}
-# ifndef __GC
-    ~_Rope_RopeConcatenation() throw() {
-      this->_M_free_c_string();
-      _M_left->_M_unref_nonnil();
-      _M_right->_M_unref_nonnil();
-    }
-# endif
-protected:
-  _Rope_RopeConcatenation&
-  operator=(const _Rope_RopeConcatenation&);
-
-  _Rope_RopeConcatenation(const _Rope_RopeConcatenation&);
-};
-
-template<class _CharT, class _Alloc>
-struct _Rope_RopeFunction : public _Rope_RopeRep<_CharT,_Alloc> {
-  public:
-    char_producer<_CharT>* _M_fn;
-#   ifndef __GC
-      bool _M_delete_when_done; // Char_producer is owned by the
-                                // rope and should be explicitly
-                                // deleted when the rope becomes
-                                // inaccessible.
-#   else
-      // In the GC case, we either register the rope for
-      // finalization, or not.  Thus the field is unnecessary;
-      // the information is stored in the collector data structures.
-      // We do need a finalization procedure to be invoked by the
-      // collector.
-      static void _S_fn_finalization_proc(void * __tree, void *) {
-        delete ((_Rope_RopeFunction *)__tree) -> _M_fn;
-      }
-#   endif
-    typedef typename _Rope_rep_base<_CharT,_Alloc>::allocator_type
-                                        allocator_type;
-    _Rope_RopeFunction(char_producer<_CharT>* __f, size_t __size,
-                        bool __d, allocator_type __a)
-      : _Rope_RopeRep<_CharT,_Alloc>(_Rope_constants::_S_function,
-				     0, true, __size, __a)
-      , _M_fn(__f)
-#       ifndef __GC
-      , _M_delete_when_done(__d)
-#       endif
-    {
-#       ifdef __GC
-            if (__d) {
-                GC_REGISTER_FINALIZER(
-                  this, _Rope_RopeFunction::_S_fn_finalization_proc, 0, 0, 0);
-            }
-#       endif
-    }
-# ifndef __GC
-    ~_Rope_RopeFunction() throw() {
-          this->_M_free_c_string();
-          if (_M_delete_when_done) {
-              delete _M_fn;
-          }
-    }
-# endif
-protected:
-  _Rope_RopeFunction&
-  operator=(const _Rope_RopeFunction&);
-
-  _Rope_RopeFunction(const _Rope_RopeFunction&);
-};
-// Substring results are usually represented using just
-// concatenation nodes.  But in the case of very long flat ropes
-// or ropes with a functional representation that isn't practical.
-// In that case, we represent the __result as a special case of
-// RopeFunction, whose char_producer points back to the rope itself.
-// In all cases except repeated substring operations and
-// deallocation, we treat the __result as a RopeFunction.
-template<class _CharT, class _Alloc>
-struct _Rope_RopeSubstring : public _Rope_RopeFunction<_CharT,_Alloc>,
-                             public char_producer<_CharT> {
-  public:
-    // XXX this whole class should be rewritten.
-    _Rope_RopeRep<_CharT,_Alloc>* _M_base;      // not 0
-    size_t _M_start;
-    virtual void operator()(size_t __start_pos, size_t __req_len,
-                            _CharT* __buffer) {
-        switch(_M_base->_M_tag) {
-            case _Rope_constants::_S_function:
-            case _Rope_constants::_S_substringfn:
-              {
-                char_producer<_CharT>* __fn =
-                        ((_Rope_RopeFunction<_CharT,_Alloc>*)_M_base)->_M_fn;
-                (*__fn)(__start_pos + _M_start, __req_len, __buffer);
-              }
-              break;
-            case _Rope_constants::_S_leaf:
-              {
-                __GC_CONST _CharT* __s =
-                        ((_Rope_RopeLeaf<_CharT,_Alloc>*)_M_base)->_M_data;
-                uninitialized_copy_n(__s + __start_pos + _M_start, __req_len,
-                                     __buffer);
-              }
-              break;
-            default:
-	      break;
-        }
-    }
-    typedef typename _Rope_rep_base<_CharT,_Alloc>::allocator_type
-        allocator_type;
-    _Rope_RopeSubstring(_Rope_RopeRep<_CharT,_Alloc>* __b, size_t __s,
-                          size_t __l, allocator_type __a)
-      : _Rope_RopeFunction<_CharT,_Alloc>(this, __l, false, __a),
-        char_producer<_CharT>(),
-        _M_base(__b),
-        _M_start(__s)
-    {
-#       ifndef __GC
-            _M_base->_M_ref_nonnil();
-#       endif
-        this->_M_tag = _Rope_constants::_S_substringfn;
-    }
-    virtual ~_Rope_RopeSubstring() throw()
-      {
-#       ifndef __GC
-          _M_base->_M_unref_nonnil();
-          // _M_free_c_string();  -- done by parent class
-#       endif
-      }
-};
-
-
-// Self-destructing pointers to Rope_rep.
-// These are not conventional smart pointers.  Their
-// only purpose in life is to ensure that unref is called
-// on the pointer either at normal exit or if an exception
-// is raised.  It is the caller's responsibility to
-// adjust reference counts when these pointers are initialized
-// or assigned to.  (This convention significantly reduces
-// the number of potentially expensive reference count
-// updates.)
-#ifndef __GC
-  template<class _CharT, class _Alloc>
-  struct _Rope_self_destruct_ptr {
-    _Rope_RopeRep<_CharT,_Alloc>* _M_ptr;
-    ~_Rope_self_destruct_ptr()
-      { _Rope_RopeRep<_CharT,_Alloc>::_S_unref(_M_ptr); }
-#ifdef __EXCEPTIONS
-        _Rope_self_destruct_ptr() : _M_ptr(0) {};
-#else
-        _Rope_self_destruct_ptr() {};
-#endif
-    _Rope_self_destruct_ptr(_Rope_RopeRep<_CharT,_Alloc>* __p) : _M_ptr(__p) {}
-    _Rope_RopeRep<_CharT,_Alloc>& operator*() { return *_M_ptr; }
-    _Rope_RopeRep<_CharT,_Alloc>* operator->() { return _M_ptr; }
-    operator _Rope_RopeRep<_CharT,_Alloc>*() { return _M_ptr; }
-    _Rope_self_destruct_ptr& operator= (_Rope_RopeRep<_CharT,_Alloc>* __x)
-        { _M_ptr = __x; return *this; }
-  };
-#endif
-
-// Dereferencing a nonconst iterator has to return something
-// that behaves almost like a reference.  It's not possible to
-// return an actual reference since assignment requires extra
-// work.  And we would get into the same problems as with the
-// CD2 version of basic_string.
-template<class _CharT, class _Alloc>
-class _Rope_char_ref_proxy {
-    friend class rope<_CharT,_Alloc>;
-    friend class _Rope_iterator<_CharT,_Alloc>;
-    friend class _Rope_char_ptr_proxy<_CharT,_Alloc>;
-#   ifdef __GC
-        typedef _Rope_RopeRep<_CharT,_Alloc>* _Self_destruct_ptr;
-#   else
-        typedef _Rope_self_destruct_ptr<_CharT,_Alloc> _Self_destruct_ptr;
-#   endif
-    typedef _Rope_RopeRep<_CharT,_Alloc> _RopeRep;
-    typedef rope<_CharT,_Alloc> _My_rope;
-    size_t _M_pos;
-    _CharT _M_current;
-    bool _M_current_valid;
-    _My_rope* _M_root;     // The whole rope.
-  public:
-    _Rope_char_ref_proxy(_My_rope* __r, size_t __p)
-    :  _M_pos(__p), _M_current(), _M_current_valid(false), _M_root(__r) {}
-
-    _Rope_char_ref_proxy(const _Rope_char_ref_proxy& __x)
-    : _M_pos(__x._M_pos), _M_current(__x._M_current), _M_current_valid(false), 
-      _M_root(__x._M_root) {}
-
-  // Don't preserve cache if the reference can outlive the
-  // expression.  We claim that's not possible without calling
-  // a copy constructor or generating reference to a proxy
-  // reference.  We declare the latter to have undefined semantics.
-    _Rope_char_ref_proxy(_My_rope* __r, size_t __p, _CharT __c)
-      : _M_pos(__p), _M_current(__c), _M_current_valid(true), _M_root(__r) {}
-    inline operator _CharT () const;
-    _Rope_char_ref_proxy& operator= (_CharT __c);
-    _Rope_char_ptr_proxy<_CharT,_Alloc> operator& () const;
-    _Rope_char_ref_proxy& operator= (const _Rope_char_ref_proxy& __c) {
-        return operator=((_CharT)__c);
-    }
-};
-
-template<class _CharT, class __Alloc>
-inline void swap(_Rope_char_ref_proxy <_CharT, __Alloc > __a,
-                 _Rope_char_ref_proxy <_CharT, __Alloc > __b) {
-    _CharT __tmp = __a;
-    __a = __b;
-    __b = __tmp;
-}
-
-template<class _CharT, class _Alloc>
-class _Rope_char_ptr_proxy {
-    // XXX this class should be rewritten.
-    friend class _Rope_char_ref_proxy<_CharT,_Alloc>;
-    size_t _M_pos;
-    rope<_CharT,_Alloc>* _M_root;     // The whole rope.
-  public:
-    _Rope_char_ptr_proxy(const _Rope_char_ref_proxy<_CharT,_Alloc>& __x)
-      : _M_pos(__x._M_pos), _M_root(__x._M_root) {}
-    _Rope_char_ptr_proxy(const _Rope_char_ptr_proxy& __x)
-      : _M_pos(__x._M_pos), _M_root(__x._M_root) {}
-    _Rope_char_ptr_proxy() {}
-    _Rope_char_ptr_proxy(_CharT* __x) : _M_root(0), _M_pos(0) {
-    }
-    _Rope_char_ptr_proxy&
-    operator= (const _Rope_char_ptr_proxy& __x) {
-        _M_pos = __x._M_pos;
-        _M_root = __x._M_root;
-        return *this;
-    }
-    template<class _CharT2, class _Alloc2>
-    friend bool operator== (const _Rope_char_ptr_proxy<_CharT2,_Alloc2>& __x,
-                            const _Rope_char_ptr_proxy<_CharT2,_Alloc2>& __y);
-    _Rope_char_ref_proxy<_CharT,_Alloc> operator*() const {
-        return _Rope_char_ref_proxy<_CharT,_Alloc>(_M_root, _M_pos);
-    }
-};
-
-
-// Rope iterators:
-// Unlike in the C version, we cache only part of the stack
-// for rope iterators, since they must be efficiently copyable.
-// When we run out of cache, we have to reconstruct the iterator
-// value.
-// Pointers from iterators are not included in reference counts.
-// Iterators are assumed to be thread private.  Ropes can
-// be shared.
-
-template<class _CharT, class _Alloc>
-class _Rope_iterator_base
-  : public iterator<std::random_access_iterator_tag, _CharT>
-{
-    friend class rope<_CharT,_Alloc>;
-  public:
-    typedef _Alloc _allocator_type; // used in _Rope_rotate, VC++ workaround
-    typedef _Rope_RopeRep<_CharT,_Alloc> _RopeRep;
-        // Borland doesn't want this to be protected.
-  protected:
-    enum { _S_path_cache_len = 4 }; // Must be <= 9.
-    enum { _S_iterator_buf_len = 15 };
-    size_t _M_current_pos;
-    _RopeRep* _M_root;     // The whole rope.
-    size_t _M_leaf_pos;    // Starting position for current leaf
-    __GC_CONST _CharT* _M_buf_start;
-                        // Buffer possibly
-                        // containing current char.
-    __GC_CONST _CharT* _M_buf_ptr;
-                        // Pointer to current char in buffer.
-                        // != 0 ==> buffer valid.
-    __GC_CONST _CharT* _M_buf_end;
-                        // One past __last valid char in buffer.
-    // What follows is the path cache.  We go out of our
-    // way to make this compact.
-    // Path_end contains the bottom section of the path from
-    // the root to the current leaf.
-    const _RopeRep* _M_path_end[_S_path_cache_len];
-    int _M_leaf_index;     // Last valid __pos in path_end;
-                        // _M_path_end[0] ... _M_path_end[leaf_index-1]
-                        // point to concatenation nodes.
-    unsigned char _M_path_directions;
-                          // (path_directions >> __i) & 1 is 1
-                          // iff we got from _M_path_end[leaf_index - __i - 1]
-                          // to _M_path_end[leaf_index - __i] by going to the
-                          // __right. Assumes path_cache_len <= 9.
-    _CharT _M_tmp_buf[_S_iterator_buf_len];
-                        // Short buffer for surrounding chars.
-                        // This is useful primarily for
-                        // RopeFunctions.  We put the buffer
-                        // here to avoid locking in the
-                        // multithreaded case.
-    // The cached path is generally assumed to be valid
-    // only if the buffer is valid.
-    static void _S_setbuf(_Rope_iterator_base& __x);
-                                        // Set buffer contents given
-                                        // path cache.
-    static void _S_setcache(_Rope_iterator_base& __x);
-                                        // Set buffer contents and
-                                        // path cache.
-    static void _S_setcache_for_incr(_Rope_iterator_base& __x);
-                                        // As above, but assumes path
-                                        // cache is valid for previous posn.
-    _Rope_iterator_base() {}
-    _Rope_iterator_base(_RopeRep* __root, size_t __pos)
-      : _M_current_pos(__pos), _M_root(__root), _M_buf_ptr(0) {}
-    void _M_incr(size_t __n);
-    void _M_decr(size_t __n);
-  public:
-    size_t index() const { return _M_current_pos; }
-    _Rope_iterator_base(const _Rope_iterator_base& __x) {
-        if (0 != __x._M_buf_ptr) {
-            *this = __x;
-        } else {
-            _M_current_pos = __x._M_current_pos;
-            _M_root = __x._M_root;
-            _M_buf_ptr = 0;
-        }
-    }
-};
-
-template<class _CharT, class _Alloc> class _Rope_iterator;
-
-template<class _CharT, class _Alloc>
-class _Rope_const_iterator : public _Rope_iterator_base<_CharT,_Alloc> {
-    friend class rope<_CharT,_Alloc>;
-  protected:
-      typedef _Rope_RopeRep<_CharT,_Alloc> _RopeRep;
-      // The one from the base class may not be directly visible.
-    _Rope_const_iterator(const _RopeRep* __root, size_t __pos):
-                   _Rope_iterator_base<_CharT,_Alloc>(
-                     const_cast<_RopeRep*>(__root), __pos)
-                   // Only nonconst iterators modify root ref count
-    {}
-  public:
-    typedef _CharT reference;   // Really a value.  Returning a reference
-                                // Would be a mess, since it would have
-                                // to be included in refcount.
-    typedef const _CharT* pointer;
-
-  public:
-    _Rope_const_iterator() {};
-    _Rope_const_iterator(const _Rope_const_iterator& __x) :
-                                _Rope_iterator_base<_CharT,_Alloc>(__x) { }
-    _Rope_const_iterator(const _Rope_iterator<_CharT,_Alloc>& __x);
-    _Rope_const_iterator(const rope<_CharT,_Alloc>& __r, size_t __pos) :
-        _Rope_iterator_base<_CharT,_Alloc>(__r._M_tree_ptr, __pos) {}
-    _Rope_const_iterator& operator= (const _Rope_const_iterator& __x) {
-        if (0 != __x._M_buf_ptr) {
-            *(static_cast<_Rope_iterator_base<_CharT,_Alloc>*>(this)) = __x;
-        } else {
-            this->_M_current_pos = __x._M_current_pos;
-            this->_M_root = __x._M_root;
-            this->_M_buf_ptr = 0;
-        }
-        return(*this);
-    }
-    reference operator*() {
-        if (0 == this->_M_buf_ptr) _S_setcache(*this);
-        return *this->_M_buf_ptr;
-    }
-    _Rope_const_iterator& operator++() {
-        __GC_CONST _CharT* __next;
-        if (0 != this->_M_buf_ptr
-	    && (__next = this->_M_buf_ptr + 1) < this->_M_buf_end) {
-            this->_M_buf_ptr = __next;
-            ++this->_M_current_pos;
-        } else {
-            this->_M_incr(1);
-        }
-        return *this;
-    }
-    _Rope_const_iterator& operator+=(ptrdiff_t __n) {
-        if (__n >= 0) {
-            this->_M_incr(__n);
-        } else {
-	    this->_M_decr(-__n);
-        }
-        return *this;
-    }
-    _Rope_const_iterator& operator--() {
-        this->_M_decr(1);
-        return *this;
-    }
-    _Rope_const_iterator& operator-=(ptrdiff_t __n) {
-        if (__n >= 0) {
-            this->_M_decr(__n);
-        } else {
-            this->_M_incr(-__n);
-        }
-        return *this;
-    }
-    _Rope_const_iterator operator++(int) {
-        size_t __old_pos = this->_M_current_pos;
-        this->_M_incr(1);
-        return _Rope_const_iterator<_CharT,_Alloc>(this->_M_root, __old_pos);
-        // This makes a subsequent dereference expensive.
-        // Perhaps we should instead copy the iterator
-        // if it has a valid cache?
-    }
-    _Rope_const_iterator operator--(int) {
-        size_t __old_pos = this->_M_current_pos;
-        this->_M_decr(1);
-        return _Rope_const_iterator<_CharT,_Alloc>(this->_M_root, __old_pos);
-    }
-    template<class _CharT2, class _Alloc2>
-    friend _Rope_const_iterator<_CharT2,_Alloc2> operator-
-        (const _Rope_const_iterator<_CharT2,_Alloc2>& __x,
-         ptrdiff_t __n);
-    template<class _CharT2, class _Alloc2>
-    friend _Rope_const_iterator<_CharT2,_Alloc2> operator+
-        (const _Rope_const_iterator<_CharT2,_Alloc2>& __x,
-         ptrdiff_t __n);
-    template<class _CharT2, class _Alloc2>
-    friend _Rope_const_iterator<_CharT2,_Alloc2> operator+
-        (ptrdiff_t __n,
-         const _Rope_const_iterator<_CharT2,_Alloc2>& __x);
-    reference operator[](size_t __n) {
-        return rope<_CharT,_Alloc>::_S_fetch(this->_M_root,
-					     this->_M_current_pos + __n);
-    }
-
-    template<class _CharT2, class _Alloc2>
-    friend bool operator==
-        (const _Rope_const_iterator<_CharT2,_Alloc2>& __x,
-         const _Rope_const_iterator<_CharT2,_Alloc2>& __y);
-    template<class _CharT2, class _Alloc2>
-    friend bool operator<
-        (const _Rope_const_iterator<_CharT2,_Alloc2>& __x,
-         const _Rope_const_iterator<_CharT2,_Alloc2>& __y);
-    template<class _CharT2, class _Alloc2>
-    friend ptrdiff_t operator-
-        (const _Rope_const_iterator<_CharT2,_Alloc2>& __x,
-         const _Rope_const_iterator<_CharT2,_Alloc2>& __y);
-};
-
-template<class _CharT, class _Alloc>
-class _Rope_iterator : public _Rope_iterator_base<_CharT,_Alloc> {
-    friend class rope<_CharT,_Alloc>;
-  protected:
-    typedef typename _Rope_iterator_base<_CharT,_Alloc>::_RopeRep _RopeRep;
-    rope<_CharT,_Alloc>* _M_root_rope;
-        // root is treated as a cached version of this,
-        // and is used to detect changes to the underlying
-        // rope.
-        // Root is included in the reference count.
-        // This is necessary so that we can detect changes reliably.
-        // Unfortunately, it requires careful bookkeeping for the
-        // nonGC case.
-    _Rope_iterator(rope<_CharT,_Alloc>* __r, size_t __pos)
-      : _Rope_iterator_base<_CharT,_Alloc>(__r->_M_tree_ptr, __pos),
-        _M_root_rope(__r)
-      { _RopeRep::_S_ref(this->_M_root);
-        if (!(__r -> empty()))_S_setcache(*this); }
-
-    void _M_check();
-  public:
-    typedef _Rope_char_ref_proxy<_CharT,_Alloc>  reference;
-    typedef _Rope_char_ref_proxy<_CharT,_Alloc>* pointer;
-
-  public:
-    rope<_CharT,_Alloc>& container() { return *_M_root_rope; }
-    _Rope_iterator() {
-        this->_M_root = 0;  // Needed for reference counting.
-    };
-    _Rope_iterator(const _Rope_iterator& __x) :
-        _Rope_iterator_base<_CharT,_Alloc>(__x) {
-        _M_root_rope = __x._M_root_rope;
-        _RopeRep::_S_ref(this->_M_root);
-    }
-    _Rope_iterator(rope<_CharT,_Alloc>& __r, size_t __pos);
-    ~_Rope_iterator() {
-        _RopeRep::_S_unref(this->_M_root);
-    }
-    _Rope_iterator& operator= (const _Rope_iterator& __x) {
-        _RopeRep* __old = this->_M_root;
-
-        _RopeRep::_S_ref(__x._M_root);
-        if (0 != __x._M_buf_ptr) {
-            _M_root_rope = __x._M_root_rope;
-            *(static_cast<_Rope_iterator_base<_CharT,_Alloc>*>(this)) = __x;
-        } else {
-	    this->_M_current_pos = __x._M_current_pos;
-            this->_M_root = __x._M_root;
-            _M_root_rope = __x._M_root_rope;
-            this->_M_buf_ptr = 0;
-        }
-        _RopeRep::_S_unref(__old);
-        return(*this);
-    }
-    reference operator*() {
-        _M_check();
-        if (0 == this->_M_buf_ptr) {
-            return _Rope_char_ref_proxy<_CharT,_Alloc>(
-               _M_root_rope, this->_M_current_pos);
-        } else {
-            return _Rope_char_ref_proxy<_CharT,_Alloc>(
-               _M_root_rope, this->_M_current_pos, *this->_M_buf_ptr);
-        }
-    }
-    _Rope_iterator& operator++() {
-        this->_M_incr(1);
-        return *this;
-    }
-    _Rope_iterator& operator+=(ptrdiff_t __n) {
-        if (__n >= 0) {
-            this->_M_incr(__n);
-        } else {
-            this->_M_decr(-__n);
-        }
-        return *this;
-    }
-    _Rope_iterator& operator--() {
-        this->_M_decr(1);
-        return *this;
-    }
-    _Rope_iterator& operator-=(ptrdiff_t __n) {
-        if (__n >= 0) {
-            this->_M_decr(__n);
-        } else {
-            this->_M_incr(-__n);
-        }
-        return *this;
-    }
-    _Rope_iterator operator++(int) {
-        size_t __old_pos = this->_M_current_pos;
-        this->_M_incr(1);
-        return _Rope_iterator<_CharT,_Alloc>(_M_root_rope, __old_pos);
-    }
-    _Rope_iterator operator--(int) {
-        size_t __old_pos = this->_M_current_pos;
-        this->_M_decr(1);
-        return _Rope_iterator<_CharT,_Alloc>(_M_root_rope, __old_pos);
-    }
-    reference operator[](ptrdiff_t __n) {
-        return _Rope_char_ref_proxy<_CharT,_Alloc>(
-          _M_root_rope, this->_M_current_pos + __n);
-    }
-
-    template<class _CharT2, class _Alloc2>
-    friend bool operator==
-        (const _Rope_iterator<_CharT2,_Alloc2>& __x,
-         const _Rope_iterator<_CharT2,_Alloc2>& __y);
-    template<class _CharT2, class _Alloc2>
-    friend bool operator<
-        (const _Rope_iterator<_CharT2,_Alloc2>& __x,
-         const _Rope_iterator<_CharT2,_Alloc2>& __y);
-    template<class _CharT2, class _Alloc2>
-    friend ptrdiff_t operator-
-        (const _Rope_iterator<_CharT2,_Alloc2>& __x,
-         const _Rope_iterator<_CharT2,_Alloc2>& __y);
-    template<class _CharT2, class _Alloc2>
-    friend _Rope_iterator<_CharT2,_Alloc2> operator-
-        (const _Rope_iterator<_CharT2,_Alloc2>& __x,
-         ptrdiff_t __n);
-    template<class _CharT2, class _Alloc2>
-    friend _Rope_iterator<_CharT2,_Alloc2> operator+
-        (const _Rope_iterator<_CharT2,_Alloc2>& __x,
-         ptrdiff_t __n);
-    template<class _CharT2, class _Alloc2>
-    friend _Rope_iterator<_CharT2,_Alloc2> operator+
-        (ptrdiff_t __n,
-         const _Rope_iterator<_CharT2,_Alloc2>& __x);
-};
-
-
-template <class _CharT, class _Alloc>
-struct _Rope_base
-: public _Alloc
-{
-  typedef _Alloc allocator_type;
-
-  allocator_type
-  get_allocator() const { return *static_cast<const _Alloc*>(this); }
-
-  typedef _Rope_RopeRep<_CharT,_Alloc> _RopeRep;
-  // The one in _Base may not be visible due to template rules.
-
-  _Rope_base(_RopeRep* __t, const allocator_type&)
-  : _M_tree_ptr(__t) {}
-  _Rope_base(const allocator_type&) {}
-
-  // The only data member of a rope:
-  _RopeRep *_M_tree_ptr;
-
-# define __ROPE_DEFINE_ALLOC(_Tp, __name) \
-        typedef typename \
-          _Alloc::template rebind<_Tp>::other __name##Alloc; \
-        static _Tp* __name##_allocate(size_t __n) \
-          { return __name##Alloc().allocate(__n); } \
-        static void __name##_deallocate(_Tp *__p, size_t __n) \
-          { __name##Alloc().deallocate(__p, __n); }
-  __ROPE_DEFINE_ALLOCS(_Alloc)
-# undef __ROPE_DEFINE_ALLOC
-
-protected:
-  _Rope_base&
-  operator=(const _Rope_base&);
-
-  _Rope_base(const _Rope_base&);
-};
-
-
-/**
- *  This is an SGI extension.
- *  @ingroup SGIextensions
- *  @doctodo
-*/
-template <class _CharT, class _Alloc>
-class rope : public _Rope_base<_CharT,_Alloc> {
-    public:
-        typedef _CharT value_type;
-        typedef ptrdiff_t difference_type;
-        typedef size_t size_type;
-        typedef _CharT const_reference;
-        typedef const _CharT* const_pointer;
-        typedef _Rope_iterator<_CharT,_Alloc> iterator;
-        typedef _Rope_const_iterator<_CharT,_Alloc> const_iterator;
-        typedef _Rope_char_ref_proxy<_CharT,_Alloc> reference;
-        typedef _Rope_char_ptr_proxy<_CharT,_Alloc> pointer;
-
-        friend class _Rope_iterator<_CharT,_Alloc>;
-        friend class _Rope_const_iterator<_CharT,_Alloc>;
-        friend struct _Rope_RopeRep<_CharT,_Alloc>;
-        friend class _Rope_iterator_base<_CharT,_Alloc>;
-        friend class _Rope_char_ptr_proxy<_CharT,_Alloc>;
-        friend class _Rope_char_ref_proxy<_CharT,_Alloc>;
-        friend struct _Rope_RopeSubstring<_CharT,_Alloc>;
-
-    protected:
-        typedef _Rope_base<_CharT,_Alloc> _Base;
-        typedef typename _Base::allocator_type allocator_type;
-        using _Base::_M_tree_ptr;
-        using _Base::get_allocator;
-        typedef __GC_CONST _CharT* _Cstrptr;
-
-        static _CharT _S_empty_c_str[1];
-
-        static bool _S_is0(_CharT __c) { return __c == _S_eos((_CharT*)0); }
-        enum { _S_copy_max = 23 };
-                // For strings shorter than _S_copy_max, we copy to
-                // concatenate.
-
-        typedef _Rope_RopeRep<_CharT,_Alloc> _RopeRep;
-        typedef _Rope_RopeConcatenation<_CharT,_Alloc> _RopeConcatenation;
-        typedef _Rope_RopeLeaf<_CharT,_Alloc> _RopeLeaf;
-        typedef _Rope_RopeFunction<_CharT,_Alloc> _RopeFunction;
-        typedef _Rope_RopeSubstring<_CharT,_Alloc> _RopeSubstring;
-
-        // Retrieve a character at the indicated position.
-        static _CharT _S_fetch(_RopeRep* __r, size_type __pos);
-
-#       ifndef __GC
-            // Obtain a pointer to the character at the indicated position.
-            // The pointer can be used to change the character.
-            // If such a pointer cannot be produced, as is frequently the
-            // case, 0 is returned instead.
-            // (Returns nonzero only if all nodes in the path have a refcount
-            // of 1.)
-            static _CharT* _S_fetch_ptr(_RopeRep* __r, size_type __pos);
-#       endif
-
-        static bool _S_apply_to_pieces(
-                                // should be template parameter
-                                _Rope_char_consumer<_CharT>& __c,
-                                const _RopeRep* __r,
-                                size_t __begin, size_t __end);
-                                // begin and end are assumed to be in range.
-
-#       ifndef __GC
-          static void _S_unref(_RopeRep* __t)
-          {
-              _RopeRep::_S_unref(__t);
-          }
-          static void _S_ref(_RopeRep* __t)
-          {
-              _RopeRep::_S_ref(__t);
-          }
-#       else /* __GC */
-          static void _S_unref(_RopeRep*) {}
-          static void _S_ref(_RopeRep*) {}
-#       endif
-
-
-#       ifdef __GC
-            typedef _Rope_RopeRep<_CharT,_Alloc>* _Self_destruct_ptr;
-#       else
-            typedef _Rope_self_destruct_ptr<_CharT,_Alloc> _Self_destruct_ptr;
-#       endif
-
-        // _Result is counted in refcount.
-        static _RopeRep* _S_substring(_RopeRep* __base,
-                                    size_t __start, size_t __endp1);
-
-        static _RopeRep* _S_concat_char_iter(_RopeRep* __r,
-                                          const _CharT* __iter, size_t __slen);
-                // Concatenate rope and char ptr, copying __s.
-                // Should really take an arbitrary iterator.
-                // Result is counted in refcount.
-        static _RopeRep* _S_destr_concat_char_iter(_RopeRep* __r,
-                                          const _CharT* __iter, size_t __slen)
-                // As above, but one reference to __r is about to be
-                // destroyed.  Thus the pieces may be recycled if all
-                // relevant reference counts are 1.
-#           ifdef __GC
-                // We can't really do anything since refcounts are unavailable.
-                { return _S_concat_char_iter(__r, __iter, __slen); }
-#           else
-                ;
-#           endif
-
-        static _RopeRep* _S_concat(_RopeRep* __left, _RopeRep* __right);
-                // General concatenation on _RopeRep.  _Result
-                // has refcount of 1.  Adjusts argument refcounts.
-
-   public:
-        void apply_to_pieces( size_t __begin, size_t __end,
-                              _Rope_char_consumer<_CharT>& __c) const {
-            _S_apply_to_pieces(__c, this->_M_tree_ptr, __begin, __end);
-        }
-
-
-   protected:
-
-        static size_t _S_rounded_up_size(size_t __n) {
-            return _RopeLeaf::_S_rounded_up_size(__n);
-        }
-
-        static size_t _S_allocated_capacity(size_t __n) {
-            if (_S_is_basic_char_type((_CharT*)0)) {
-                return _S_rounded_up_size(__n) - 1;
-            } else {
-                return _S_rounded_up_size(__n);
-            }
-        }
-
-        // Allocate and construct a RopeLeaf using the supplied allocator
-        // Takes ownership of s instead of copying.
-        static _RopeLeaf* _S_new_RopeLeaf(__GC_CONST _CharT *__s,
-                                          size_t __size, allocator_type __a)
-        {
-            _RopeLeaf* __space = typename _Base::_LAlloc(__a).allocate(1);
-            return new(__space) _RopeLeaf(__s, __size, __a);
-        }
-
-        static _RopeConcatenation* _S_new_RopeConcatenation(
-                        _RopeRep* __left, _RopeRep* __right,
-                        allocator_type __a)
-        {
-            _RopeConcatenation* __space = typename _Base::_CAlloc(__a).allocate(1);
-            return new(__space) _RopeConcatenation(__left, __right, __a);
-        }
-
-        static _RopeFunction* _S_new_RopeFunction(char_producer<_CharT>* __f,
-                size_t __size, bool __d, allocator_type __a)
-        {
-            _RopeFunction* __space = typename _Base::_FAlloc(__a).allocate(1);
-            return new(__space) _RopeFunction(__f, __size, __d, __a);
-        }
-
-        static _RopeSubstring* _S_new_RopeSubstring(
-                _Rope_RopeRep<_CharT,_Alloc>* __b, size_t __s,
-                size_t __l, allocator_type __a)
-        {
-            _RopeSubstring* __space = typename _Base::_SAlloc(__a).allocate(1);
-            return new(__space) _RopeSubstring(__b, __s, __l, __a);
-        }
-
-          static
-          _RopeLeaf* _S_RopeLeaf_from_unowned_char_ptr(const _CharT *__s,
-                       size_t __size, allocator_type __a)
-#         define __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __size, __a) \
-                _S_RopeLeaf_from_unowned_char_ptr(__s, __size, __a)
-        {
-            if (0 == __size) return 0;
-            _CharT* __buf = __a.allocate(_S_rounded_up_size(__size));
-
-            uninitialized_copy_n(__s, __size, __buf);
-            _S_cond_store_eos(__buf[__size]);
-            try {
-              return _S_new_RopeLeaf(__buf, __size, __a);
-            }
-            catch(...)
-	      {
-		_RopeRep::__STL_FREE_STRING(__buf, __size, __a);
-		__throw_exception_again;
-	      }
-        }
-
-
-        // Concatenation of nonempty strings.
-        // Always builds a concatenation node.
-        // Rebalances if the result is too deep.
-        // Result has refcount 1.
-        // Does not increment left and right ref counts even though
-        // they are referenced.
-        static _RopeRep*
-        _S_tree_concat(_RopeRep* __left, _RopeRep* __right);
-
-        // Concatenation helper functions
-        static _RopeLeaf*
-        _S_leaf_concat_char_iter(_RopeLeaf* __r,
-                                 const _CharT* __iter, size_t __slen);
-                // Concatenate by copying leaf.
-                // should take an arbitrary iterator
-                // result has refcount 1.
-#       ifndef __GC
-          static _RopeLeaf* _S_destr_leaf_concat_char_iter
-                        (_RopeLeaf* __r, const _CharT* __iter, size_t __slen);
-          // A version that potentially clobbers __r if __r->_M_ref_count == 1.
-#       endif
-
-        private:
-
-        static size_t _S_char_ptr_len(const _CharT* __s);
-                        // slightly generalized strlen
-
-        rope(_RopeRep* __t, const allocator_type& __a = allocator_type())
-          : _Base(__t,__a) { }
-
-
-        // Copy __r to the _CharT buffer.
-        // Returns __buffer + __r->_M_size.
-        // Assumes that buffer is uninitialized.
-        static _CharT* _S_flatten(_RopeRep* __r, _CharT* __buffer);
-
-        // Again, with explicit starting position and length.
-        // Assumes that buffer is uninitialized.
-        static _CharT* _S_flatten(_RopeRep* __r,
-                                  size_t __start, size_t __len,
-                                  _CharT* __buffer);
-
-        static const unsigned long
-          _S_min_len[_Rope_constants::_S_max_rope_depth + 1];
-
-        static bool _S_is_balanced(_RopeRep* __r)
-                { return (__r->_M_size >= _S_min_len[__r->_M_depth]); }
-
-        static bool _S_is_almost_balanced(_RopeRep* __r)
-                { return (__r->_M_depth == 0 ||
-                          __r->_M_size >= _S_min_len[__r->_M_depth - 1]); }
-
-        static bool _S_is_roughly_balanced(_RopeRep* __r)
-                { return (__r->_M_depth <= 1 ||
-                          __r->_M_size >= _S_min_len[__r->_M_depth - 2]); }
-
-        // Assumes the result is not empty.
-        static _RopeRep* _S_concat_and_set_balanced(_RopeRep* __left,
-                                                     _RopeRep* __right)
-        {
-            _RopeRep* __result = _S_concat(__left, __right);
-            if (_S_is_balanced(__result)) __result->_M_is_balanced = true;
-            return __result;
-        }
-
-        // The basic rebalancing operation.  Logically copies the
-        // rope.  The result has refcount of 1.  The client will
-        // usually decrement the reference count of __r.
-        // The result is within height 2 of balanced by the above
-        // definition.
-        static _RopeRep* _S_balance(_RopeRep* __r);
-
-        // Add all unbalanced subtrees to the forest of balanceed trees.
-        // Used only by balance.
-        static void _S_add_to_forest(_RopeRep*__r, _RopeRep** __forest);
-
-        // Add __r to forest, assuming __r is already balanced.
-        static void _S_add_leaf_to_forest(_RopeRep* __r, _RopeRep** __forest);
-
-        // Print to stdout, exposing structure
-        static void _S_dump(_RopeRep* __r, int __indent = 0);
-
-        // Return -1, 0, or 1 if __x < __y, __x == __y, or __x > __y resp.
-        static int _S_compare(const _RopeRep* __x, const _RopeRep* __y);
-
-   public:
-        bool empty() const { return 0 == this->_M_tree_ptr; }
-
-        // Comparison member function.  This is public only for those
-        // clients that need a ternary comparison.  Others
-        // should use the comparison operators below.
-        int compare(const rope& __y) const {
-            return _S_compare(this->_M_tree_ptr, __y._M_tree_ptr);
-        }
-
-        rope(const _CharT* __s, const allocator_type& __a = allocator_type())
-        : _Base(__STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, _S_char_ptr_len(__s),
-                                                 __a),__a)
-        { }
-
-        rope(const _CharT* __s, size_t __len,
-             const allocator_type& __a = allocator_type())
-        : _Base(__STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __len, __a), __a)
-        { }
-
-        // Should perhaps be templatized with respect to the iterator type
-        // and use Sequence_buffer.  (It should perhaps use sequence_buffer
-        // even now.)
-        rope(const _CharT *__s, const _CharT *__e,
-             const allocator_type& __a = allocator_type())
-        : _Base(__STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __e - __s, __a), __a)
-        { }
-
-        rope(const const_iterator& __s, const const_iterator& __e,
-             const allocator_type& __a = allocator_type())
-        : _Base(_S_substring(__s._M_root, __s._M_current_pos,
-                             __e._M_current_pos), __a)
-        { }
-
-        rope(const iterator& __s, const iterator& __e,
-             const allocator_type& __a = allocator_type())
-        : _Base(_S_substring(__s._M_root, __s._M_current_pos,
-                             __e._M_current_pos), __a)
-        { }
-
-        rope(_CharT __c, const allocator_type& __a = allocator_type())
-        : _Base(__a)
-        {
-	    _CharT* __buf = this->_Data_allocate(_S_rounded_up_size(1));
-
-            std::_Construct(__buf, __c);
-            try {
-                this->_M_tree_ptr = _S_new_RopeLeaf(__buf, 1, __a);
-            }
-            catch(...)
-	      {
-		_RopeRep::__STL_FREE_STRING(__buf, 1, __a);
-		__throw_exception_again;
-	      }
-        }
-
-        rope(size_t __n, _CharT __c,
-             const allocator_type& __a = allocator_type());
-
-        rope(const allocator_type& __a = allocator_type())
-        : _Base(0, __a) {}
-
-        // Construct a rope from a function that can compute its members
-        rope(char_producer<_CharT> *__fn, size_t __len, bool __delete_fn,
-             const allocator_type& __a = allocator_type())
-            : _Base(__a)
-        {
-            this->_M_tree_ptr = (0 == __len) ?
-               0 : _S_new_RopeFunction(__fn, __len, __delete_fn, __a);
-        }
-
-        rope(const rope& __x, const allocator_type& __a = allocator_type())
-        : _Base(__x._M_tree_ptr, __a)
-        {
-            _S_ref(this->_M_tree_ptr);
-        }
-
-      ~rope() throw()
-       { _S_unref(this->_M_tree_ptr); }
-
-        rope& operator=(const rope& __x)
-        {
-            _RopeRep* __old = this->_M_tree_ptr;
-            this->_M_tree_ptr = __x._M_tree_ptr;
-            _S_ref(this->_M_tree_ptr);
-            _S_unref(__old);
-            return *this;
-        }
-
-        void clear()
-        {
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = 0;
-        }
-
-        void push_back(_CharT __x)
-        {
-            _RopeRep* __old = this->_M_tree_ptr;
-            this->_M_tree_ptr
-	      = _S_destr_concat_char_iter(this->_M_tree_ptr, &__x, 1);
-            _S_unref(__old);
-        }
-
-        void pop_back()
-        {
-            _RopeRep* __old = this->_M_tree_ptr;
-            this->_M_tree_ptr =
-              _S_substring(this->_M_tree_ptr,
-			   0,
-			   this->_M_tree_ptr->_M_size - 1);
-            _S_unref(__old);
-        }
-
-        _CharT back() const
-        {
-            return _S_fetch(this->_M_tree_ptr, this->_M_tree_ptr->_M_size - 1);
-        }
-
-        void push_front(_CharT __x)
-        {
-            _RopeRep* __old = this->_M_tree_ptr;
-            _RopeRep* __left =
-              __STL_ROPE_FROM_UNOWNED_CHAR_PTR(&__x, 1, this->get_allocator());
-            try {
-              this->_M_tree_ptr = _S_concat(__left, this->_M_tree_ptr);
-              _S_unref(__old);
-              _S_unref(__left);
-            }
-            catch(...)
-	      {
-		_S_unref(__left);
-		__throw_exception_again;
-	      }
-        }
-
-        void pop_front()
-        {
-            _RopeRep* __old = this->_M_tree_ptr;
-            this->_M_tree_ptr
-	      = _S_substring(this->_M_tree_ptr, 1, this->_M_tree_ptr->_M_size);
-            _S_unref(__old);
-        }
-
-        _CharT front() const
-        {
-            return _S_fetch(this->_M_tree_ptr, 0);
-        }
-
-        void balance()
-        {
-            _RopeRep* __old = this->_M_tree_ptr;
-            this->_M_tree_ptr = _S_balance(this->_M_tree_ptr);
-            _S_unref(__old);
-        }
-
-        void copy(_CharT* __buffer) const {
-            _Destroy(__buffer, __buffer + size());
-            _S_flatten(this->_M_tree_ptr, __buffer);
-        }
-
-        // This is the copy function from the standard, but
-        // with the arguments reordered to make it consistent with the
-        // rest of the interface.
-        // Note that this guaranteed not to compile if the draft standard
-        // order is assumed.
-        size_type copy(size_type __pos, size_type __n, _CharT* __buffer) const
-        {
-            size_t __size = size();
-            size_t __len = (__pos + __n > __size? __size - __pos : __n);
-
-            _Destroy(__buffer, __buffer + __len);
-            _S_flatten(this->_M_tree_ptr, __pos, __len, __buffer);
-            return __len;
-        }
-
-        // Print to stdout, exposing structure.  May be useful for
-        // performance debugging.
-        void dump() {
-            _S_dump(this->_M_tree_ptr);
-        }
-
-        // Convert to 0 terminated string in new allocated memory.
-        // Embedded 0s in the input do not terminate the copy.
-        const _CharT* c_str() const;
-
-        // As above, but lso use the flattened representation as the
-        // the new rope representation.
-        const _CharT* replace_with_c_str();
-
-        // Reclaim memory for the c_str generated flattened string.
-        // Intentionally undocumented, since it's hard to say when this
-        // is safe for multiple threads.
-        void delete_c_str () {
-            if (0 == this->_M_tree_ptr) return;
-            if (_Rope_constants::_S_leaf == this->_M_tree_ptr->_M_tag &&
-                ((_RopeLeaf*)this->_M_tree_ptr)->_M_data ==
-                      this->_M_tree_ptr->_M_c_string) {
-                // Representation shared
-                return;
-            }
-#           ifndef __GC
-              this->_M_tree_ptr->_M_free_c_string();
-#           endif
-            this->_M_tree_ptr->_M_c_string = 0;
-        }
-
-        _CharT operator[] (size_type __pos) const {
-            return _S_fetch(this->_M_tree_ptr, __pos);
-        }
-
-        _CharT at(size_type __pos) const {
-           // if (__pos >= size()) throw out_of_range;  // XXX
-           return (*this)[__pos];
-        }
-
-        const_iterator begin() const {
-            return(const_iterator(this->_M_tree_ptr, 0));
-        }
-
-        // An easy way to get a const iterator from a non-const container.
-        const_iterator const_begin() const {
-            return(const_iterator(this->_M_tree_ptr, 0));
-        }
-
-        const_iterator end() const {
-            return(const_iterator(this->_M_tree_ptr, size()));
-        }
-
-        const_iterator const_end() const {
-            return(const_iterator(this->_M_tree_ptr, size()));
-        }
-
-        size_type size() const {
-            return(0 == this->_M_tree_ptr? 0 : this->_M_tree_ptr->_M_size);
-        }
-
-        size_type length() const {
-            return size();
-        }
-
-        size_type max_size() const {
-            return _S_min_len[_Rope_constants::_S_max_rope_depth - 1] - 1;
-            //  Guarantees that the result can be sufficirntly
-            //  balanced.  Longer ropes will probably still work,
-            //  but it's harder to make guarantees.
-        }
-
-        typedef reverse_iterator<const_iterator> const_reverse_iterator;
-
-        const_reverse_iterator rbegin() const {
-            return const_reverse_iterator(end());
-        }
-
-        const_reverse_iterator const_rbegin() const {
-            return const_reverse_iterator(end());
-        }
-
-        const_reverse_iterator rend() const {
-            return const_reverse_iterator(begin());
-        }
-
-        const_reverse_iterator const_rend() const {
-            return const_reverse_iterator(begin());
-        }
-
-        template<class _CharT2, class _Alloc2>
-        friend rope<_CharT2,_Alloc2>
-        operator+ (const rope<_CharT2,_Alloc2>& __left,
-                   const rope<_CharT2,_Alloc2>& __right);
-
-        template<class _CharT2, class _Alloc2>
-        friend rope<_CharT2,_Alloc2>
-        operator+ (const rope<_CharT2,_Alloc2>& __left,
-                   const _CharT2* __right);
-
-        template<class _CharT2, class _Alloc2>
-        friend rope<_CharT2,_Alloc2>
-        operator+ (const rope<_CharT2,_Alloc2>& __left, _CharT2 __right);
-        // The symmetric cases are intentionally omitted, since they're presumed
-        // to be less common, and we don't handle them as well.
-
-        // The following should really be templatized.
-        // The first argument should be an input iterator or
-        // forward iterator with value_type _CharT.
-        rope& append(const _CharT* __iter, size_t __n) {
-            _RopeRep* __result =
-              _S_destr_concat_char_iter(this->_M_tree_ptr, __iter, __n);
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = __result;
-            return *this;
-        }
-
-        rope& append(const _CharT* __c_string) {
-            size_t __len = _S_char_ptr_len(__c_string);
-            append(__c_string, __len);
-            return(*this);
-        }
-
-        rope& append(const _CharT* __s, const _CharT* __e) {
-            _RopeRep* __result =
-                _S_destr_concat_char_iter(this->_M_tree_ptr, __s, __e - __s);
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = __result;
-            return *this;
-        }
-
-        rope& append(const_iterator __s, const_iterator __e) {
-            _Self_destruct_ptr __appendee(_S_substring(
-              __s._M_root, __s._M_current_pos, __e._M_current_pos));
-            _RopeRep* __result =
-              _S_concat(this->_M_tree_ptr, (_RopeRep*)__appendee);
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = __result;
-            return *this;
-        }
-
-        rope& append(_CharT __c) {
-            _RopeRep* __result =
-              _S_destr_concat_char_iter(this->_M_tree_ptr, &__c, 1);
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = __result;
-            return *this;
-        }
-
-        rope& append() { return append(_CharT()); }  // XXX why?
-
-        rope& append(const rope& __y) {
-            _RopeRep* __result = _S_concat(this->_M_tree_ptr, __y._M_tree_ptr);
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = __result;
-            return *this;
-        }
-
-        rope& append(size_t __n, _CharT __c) {
-            rope<_CharT,_Alloc> __last(__n, __c);
-            return append(__last);
-        }
-
-        void swap(rope& __b) {
-            _RopeRep* __tmp = this->_M_tree_ptr;
-            this->_M_tree_ptr = __b._M_tree_ptr;
-            __b._M_tree_ptr = __tmp;
-        }
-
-
-    protected:
-        // Result is included in refcount.
-        static _RopeRep* replace(_RopeRep* __old, size_t __pos1,
-                                  size_t __pos2, _RopeRep* __r) {
-            if (0 == __old) { _S_ref(__r); return __r; }
-            _Self_destruct_ptr __left(
-              _S_substring(__old, 0, __pos1));
-            _Self_destruct_ptr __right(
-              _S_substring(__old, __pos2, __old->_M_size));
-            _RopeRep* __result;
-
-            if (0 == __r) {
-                __result = _S_concat(__left, __right);
-            } else {
-                _Self_destruct_ptr __left_result(_S_concat(__left, __r));
-                __result = _S_concat(__left_result, __right);
-            }
-            return __result;
-        }
-
-    public:
-        void insert(size_t __p, const rope& __r) {
-            _RopeRep* __result =
-              replace(this->_M_tree_ptr, __p, __p, __r._M_tree_ptr);
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = __result;
-        }
-
-        void insert(size_t __p, size_t __n, _CharT __c) {
-            rope<_CharT,_Alloc> __r(__n,__c);
-            insert(__p, __r);
-        }
-
-        void insert(size_t __p, const _CharT* __i, size_t __n) {
-            _Self_destruct_ptr __left(_S_substring(this->_M_tree_ptr, 0, __p));
-            _Self_destruct_ptr __right(_S_substring(this->_M_tree_ptr,
-						    __p, size()));
-            _Self_destruct_ptr __left_result(
-              _S_concat_char_iter(__left, __i, __n));
-                // _S_ destr_concat_char_iter should be safe here.
-                // But as it stands it's probably not a win, since __left
-                // is likely to have additional references.
-            _RopeRep* __result = _S_concat(__left_result, __right);
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = __result;
-        }
-
-        void insert(size_t __p, const _CharT* __c_string) {
-            insert(__p, __c_string, _S_char_ptr_len(__c_string));
-        }
-
-        void insert(size_t __p, _CharT __c) {
-            insert(__p, &__c, 1);
-        }
-
-        void insert(size_t __p) {
-            _CharT __c = _CharT();
-            insert(__p, &__c, 1);
-        }
-
-        void insert(size_t __p, const _CharT* __i, const _CharT* __j) {
-            rope __r(__i, __j);
-            insert(__p, __r);
-        }
-
-        void insert(size_t __p, const const_iterator& __i,
-                              const const_iterator& __j) {
-            rope __r(__i, __j);
-            insert(__p, __r);
-        }
-
-        void insert(size_t __p, const iterator& __i,
-                              const iterator& __j) {
-            rope __r(__i, __j);
-            insert(__p, __r);
-        }
-
-        // (position, length) versions of replace operations:
-
-        void replace(size_t __p, size_t __n, const rope& __r) {
-            _RopeRep* __result =
-              replace(this->_M_tree_ptr, __p, __p + __n, __r._M_tree_ptr);
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = __result;
-        }
-
-        void replace(size_t __p, size_t __n,
-                     const _CharT* __i, size_t __i_len) {
-            rope __r(__i, __i_len);
-            replace(__p, __n, __r);
-        }
-
-        void replace(size_t __p, size_t __n, _CharT __c) {
-            rope __r(__c);
-            replace(__p, __n, __r);
-        }
-
-        void replace(size_t __p, size_t __n, const _CharT* __c_string) {
-            rope __r(__c_string);
-            replace(__p, __n, __r);
-        }
-
-        void replace(size_t __p, size_t __n,
-                     const _CharT* __i, const _CharT* __j) {
-            rope __r(__i, __j);
-            replace(__p, __n, __r);
-        }
-
-        void replace(size_t __p, size_t __n,
-                     const const_iterator& __i, const const_iterator& __j) {
-            rope __r(__i, __j);
-            replace(__p, __n, __r);
-        }
-
-        void replace(size_t __p, size_t __n,
-                     const iterator& __i, const iterator& __j) {
-            rope __r(__i, __j);
-            replace(__p, __n, __r);
-        }
-
-        // Single character variants:
-        void replace(size_t __p, _CharT __c) {
-            iterator __i(this, __p);
-            *__i = __c;
-        }
-
-        void replace(size_t __p, const rope& __r) {
-            replace(__p, 1, __r);
-        }
-
-        void replace(size_t __p, const _CharT* __i, size_t __i_len) {
-            replace(__p, 1, __i, __i_len);
-        }
-
-        void replace(size_t __p, const _CharT* __c_string) {
-            replace(__p, 1, __c_string);
-        }
-
-        void replace(size_t __p, const _CharT* __i, const _CharT* __j) {
-            replace(__p, 1, __i, __j);
-        }
-
-        void replace(size_t __p, const const_iterator& __i,
-                               const const_iterator& __j) {
-            replace(__p, 1, __i, __j);
-        }
-
-        void replace(size_t __p, const iterator& __i,
-                               const iterator& __j) {
-            replace(__p, 1, __i, __j);
-        }
-
-        // Erase, (position, size) variant.
-        void erase(size_t __p, size_t __n) {
-            _RopeRep* __result = replace(this->_M_tree_ptr, __p, __p + __n, 0);
-            _S_unref(this->_M_tree_ptr);
-            this->_M_tree_ptr = __result;
-        }
-
-        // Erase, single character
-        void erase(size_t __p) {
-            erase(__p, __p + 1);
-        }
-
-        // Insert, iterator variants.
-        iterator insert(const iterator& __p, const rope& __r)
-                { insert(__p.index(), __r); return __p; }
-        iterator insert(const iterator& __p, size_t __n, _CharT __c)
-                { insert(__p.index(), __n, __c); return __p; }
-        iterator insert(const iterator& __p, _CharT __c)
-                { insert(__p.index(), __c); return __p; }
-        iterator insert(const iterator& __p )
-                { insert(__p.index()); return __p; }
-        iterator insert(const iterator& __p, const _CharT* c_string)
-                { insert(__p.index(), c_string); return __p; }
-        iterator insert(const iterator& __p, const _CharT* __i, size_t __n)
-                { insert(__p.index(), __i, __n); return __p; }
-        iterator insert(const iterator& __p, const _CharT* __i,
-                        const _CharT* __j)
-                { insert(__p.index(), __i, __j);  return __p; }
-        iterator insert(const iterator& __p,
-                        const const_iterator& __i, const const_iterator& __j)
-                { insert(__p.index(), __i, __j); return __p; }
-        iterator insert(const iterator& __p,
-                        const iterator& __i, const iterator& __j)
-                { insert(__p.index(), __i, __j); return __p; }
-
-        // Replace, range variants.
-        void replace(const iterator& __p, const iterator& __q,
-                     const rope& __r)
-                { replace(__p.index(), __q.index() - __p.index(), __r); }
-        void replace(const iterator& __p, const iterator& __q, _CharT __c)
-                { replace(__p.index(), __q.index() - __p.index(), __c); }
-        void replace(const iterator& __p, const iterator& __q,
-                     const _CharT* __c_string)
-                { replace(__p.index(), __q.index() - __p.index(), __c_string); }
-        void replace(const iterator& __p, const iterator& __q,
-                     const _CharT* __i, size_t __n)
-                { replace(__p.index(), __q.index() - __p.index(), __i, __n); }
-        void replace(const iterator& __p, const iterator& __q,
-                     const _CharT* __i, const _CharT* __j)
-                { replace(__p.index(), __q.index() - __p.index(), __i, __j); }
-        void replace(const iterator& __p, const iterator& __q,
-                     const const_iterator& __i, const const_iterator& __j)
-                { replace(__p.index(), __q.index() - __p.index(), __i, __j); }
-        void replace(const iterator& __p, const iterator& __q,
-                     const iterator& __i, const iterator& __j)
-                { replace(__p.index(), __q.index() - __p.index(), __i, __j); }
-
-        // Replace, iterator variants.
-        void replace(const iterator& __p, const rope& __r)
-                { replace(__p.index(), __r); }
-        void replace(const iterator& __p, _CharT __c)
-                { replace(__p.index(), __c); }
-        void replace(const iterator& __p, const _CharT* __c_string)
-                { replace(__p.index(), __c_string); }
-        void replace(const iterator& __p, const _CharT* __i, size_t __n)
-                { replace(__p.index(), __i, __n); }
-        void replace(const iterator& __p, const _CharT* __i, const _CharT* __j)
-                { replace(__p.index(), __i, __j); }
-        void replace(const iterator& __p, const_iterator __i,
-                     const_iterator __j)
-                { replace(__p.index(), __i, __j); }
-        void replace(const iterator& __p, iterator __i, iterator __j)
-                { replace(__p.index(), __i, __j); }
-
-        // Iterator and range variants of erase
-        iterator erase(const iterator& __p, const iterator& __q) {
-            size_t __p_index = __p.index();
-            erase(__p_index, __q.index() - __p_index);
-            return iterator(this, __p_index);
-        }
-        iterator erase(const iterator& __p) {
-            size_t __p_index = __p.index();
-            erase(__p_index, 1);
-            return iterator(this, __p_index);
-        }
-
-        rope substr(size_t __start, size_t __len = 1) const {
-            return rope<_CharT,_Alloc>(
-                        _S_substring(this->_M_tree_ptr,
-				     __start,
-				     __start + __len));
-        }
-
-        rope substr(iterator __start, iterator __end) const {
-            return rope<_CharT,_Alloc>(
-                _S_substring(this->_M_tree_ptr,
-			     __start.index(),
-			     __end.index()));
-        }
-
-        rope substr(iterator __start) const {
-            size_t __pos = __start.index();
-            return rope<_CharT,_Alloc>(
-                        _S_substring(this->_M_tree_ptr, __pos, __pos + 1));
-        }
-
-        rope substr(const_iterator __start, const_iterator __end) const {
-            // This might eventually take advantage of the cache in the
-            // iterator.
-            return rope<_CharT,_Alloc>(
-              _S_substring(this->_M_tree_ptr, __start.index(), __end.index()));
-        }
-
-        rope<_CharT,_Alloc> substr(const_iterator __start) {
-            size_t __pos = __start.index();
-            return rope<_CharT,_Alloc>(
-              _S_substring(this->_M_tree_ptr, __pos, __pos + 1));
-        }
-
-        static const size_type npos;
-
-        size_type find(_CharT __c, size_type __pos = 0) const;
-        size_type find(const _CharT* __s, size_type __pos = 0) const {
-            size_type __result_pos;
-            const_iterator __result =
-	      std::search(const_begin() + __pos, const_end(),
-			  __s, __s + _S_char_ptr_len(__s));
-            __result_pos = __result.index();
-#           ifndef __STL_OLD_ROPE_SEMANTICS
-                if (__result_pos == size()) __result_pos = npos;
-#           endif
-            return __result_pos;
-        }
-
-        iterator mutable_begin() {
-            return(iterator(this, 0));
-        }
-
-        iterator mutable_end() {
-            return(iterator(this, size()));
-        }
-
-        typedef reverse_iterator<iterator> reverse_iterator;
-
-        reverse_iterator mutable_rbegin() {
-            return reverse_iterator(mutable_end());
-        }
-
-        reverse_iterator mutable_rend() {
-            return reverse_iterator(mutable_begin());
-        }
-
-        reference mutable_reference_at(size_type __pos) {
-            return reference(this, __pos);
-        }
-
-#       ifdef __STD_STUFF
-            reference operator[] (size_type __pos) {
-                return _char_ref_proxy(this, __pos);
-            }
-
-            reference at(size_type __pos) {
-                // if (__pos >= size()) throw out_of_range;  // XXX
-                return (*this)[__pos];
-            }
-
-            void resize(size_type __n, _CharT __c) {}
-            void resize(size_type __n) {}
-            void reserve(size_type __res_arg = 0) {}
-            size_type capacity() const {
-                return max_size();
-            }
-
-          // Stuff below this line is dangerous because it's error prone.
-          // I would really like to get rid of it.
-            // copy function with funny arg ordering.
-              size_type copy(_CharT* __buffer, size_type __n,
-                             size_type __pos = 0) const {
-                return copy(__pos, __n, __buffer);
-              }
-
-            iterator end() { return mutable_end(); }
-
-            iterator begin() { return mutable_begin(); }
-
-            reverse_iterator rend() { return mutable_rend(); }
-
-            reverse_iterator rbegin() { return mutable_rbegin(); }
-
-#       else
-
-            const_iterator end() { return const_end(); }
-
-            const_iterator begin() { return const_begin(); }
-
-            const_reverse_iterator rend() { return const_rend(); }
-
-            const_reverse_iterator rbegin() { return const_rbegin(); }
-
-#       endif
-
-};
-
-template <class _CharT, class _Alloc>
-const typename rope<_CharT, _Alloc>::size_type rope<_CharT, _Alloc>::npos =
-                        (size_type)(-1);
-
-template <class _CharT, class _Alloc>
-inline bool operator== (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-                        const _Rope_const_iterator<_CharT,_Alloc>& __y) {
-  return (__x._M_current_pos == __y._M_current_pos &&
-          __x._M_root == __y._M_root);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator< (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-                       const _Rope_const_iterator<_CharT,_Alloc>& __y) {
-  return (__x._M_current_pos < __y._M_current_pos);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator!= (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-                        const _Rope_const_iterator<_CharT,_Alloc>& __y) {
-  return !(__x == __y);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator> (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-                       const _Rope_const_iterator<_CharT,_Alloc>& __y) {
-  return __y < __x;
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator<= (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-                        const _Rope_const_iterator<_CharT,_Alloc>& __y) {
-  return !(__y < __x);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator>= (const _Rope_const_iterator<_CharT,_Alloc>& __x,
-                        const _Rope_const_iterator<_CharT,_Alloc>& __y) {
-  return !(__x < __y);
-}
-
-template <class _CharT, class _Alloc>
-inline ptrdiff_t operator-(const _Rope_const_iterator<_CharT,_Alloc>& __x,
-                           const _Rope_const_iterator<_CharT,_Alloc>& __y) {
-  return (ptrdiff_t)__x._M_current_pos - (ptrdiff_t)__y._M_current_pos;
-}
-
-template <class _CharT, class _Alloc>
-inline _Rope_const_iterator<_CharT,_Alloc>
-operator-(const _Rope_const_iterator<_CharT,_Alloc>& __x, ptrdiff_t __n) {
-  return _Rope_const_iterator<_CharT,_Alloc>(
-            __x._M_root, __x._M_current_pos - __n);
-}
-
-template <class _CharT, class _Alloc>
-inline _Rope_const_iterator<_CharT,_Alloc>
-operator+(const _Rope_const_iterator<_CharT,_Alloc>& __x, ptrdiff_t __n) {
-  return _Rope_const_iterator<_CharT,_Alloc>(
-           __x._M_root, __x._M_current_pos + __n);
-}
-
-template <class _CharT, class _Alloc>
-inline _Rope_const_iterator<_CharT,_Alloc>
-operator+(ptrdiff_t __n, const _Rope_const_iterator<_CharT,_Alloc>& __x) {
-  return _Rope_const_iterator<_CharT,_Alloc>(
-           __x._M_root, __x._M_current_pos + __n);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator== (const _Rope_iterator<_CharT,_Alloc>& __x,
-                        const _Rope_iterator<_CharT,_Alloc>& __y) {
-  return (__x._M_current_pos == __y._M_current_pos &&
-          __x._M_root_rope == __y._M_root_rope);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator< (const _Rope_iterator<_CharT,_Alloc>& __x,
-                       const _Rope_iterator<_CharT,_Alloc>& __y) {
-  return (__x._M_current_pos < __y._M_current_pos);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator!= (const _Rope_iterator<_CharT,_Alloc>& __x,
-                        const _Rope_iterator<_CharT,_Alloc>& __y) {
-  return !(__x == __y);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator> (const _Rope_iterator<_CharT,_Alloc>& __x,
-                       const _Rope_iterator<_CharT,_Alloc>& __y) {
-  return __y < __x;
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator<= (const _Rope_iterator<_CharT,_Alloc>& __x,
-                        const _Rope_iterator<_CharT,_Alloc>& __y) {
-  return !(__y < __x);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator>= (const _Rope_iterator<_CharT,_Alloc>& __x,
-                        const _Rope_iterator<_CharT,_Alloc>& __y) {
-  return !(__x < __y);
-}
-
-template <class _CharT, class _Alloc>
-inline ptrdiff_t operator-(const _Rope_iterator<_CharT,_Alloc>& __x,
-                           const _Rope_iterator<_CharT,_Alloc>& __y) {
-  return (ptrdiff_t)__x._M_current_pos - (ptrdiff_t)__y._M_current_pos;
-}
-
-template <class _CharT, class _Alloc>
-inline _Rope_iterator<_CharT,_Alloc>
-operator-(const _Rope_iterator<_CharT,_Alloc>& __x,
-          ptrdiff_t __n) {
-  return _Rope_iterator<_CharT,_Alloc>(
-    __x._M_root_rope, __x._M_current_pos - __n);
-}
-
-template <class _CharT, class _Alloc>
-inline _Rope_iterator<_CharT,_Alloc>
-operator+(const _Rope_iterator<_CharT,_Alloc>& __x,
-          ptrdiff_t __n) {
-  return _Rope_iterator<_CharT,_Alloc>(
-    __x._M_root_rope, __x._M_current_pos + __n);
-}
-
-template <class _CharT, class _Alloc>
-inline _Rope_iterator<_CharT,_Alloc>
-operator+(ptrdiff_t __n, const _Rope_iterator<_CharT,_Alloc>& __x) {
-  return _Rope_iterator<_CharT,_Alloc>(
-    __x._M_root_rope, __x._M_current_pos + __n);
-}
-
-template <class _CharT, class _Alloc>
-inline
-rope<_CharT,_Alloc>
-operator+ (const rope<_CharT,_Alloc>& __left,
-           const rope<_CharT,_Alloc>& __right)
-{
-    return rope<_CharT,_Alloc>(
-      rope<_CharT,_Alloc>::_S_concat(__left._M_tree_ptr, __right._M_tree_ptr));
-    // Inlining this should make it possible to keep __left and
-    // __right in registers.
-}
-
-template <class _CharT, class _Alloc>
-inline
-rope<_CharT,_Alloc>&
-operator+= (rope<_CharT,_Alloc>& __left,
-      const rope<_CharT,_Alloc>& __right)
-{
-    __left.append(__right);
-    return __left;
-}
-
-template <class _CharT, class _Alloc>
-inline
-rope<_CharT,_Alloc>
-operator+ (const rope<_CharT,_Alloc>& __left,
-           const _CharT* __right) {
-    size_t __rlen = rope<_CharT,_Alloc>::_S_char_ptr_len(__right);
-    return rope<_CharT,_Alloc>(
-      rope<_CharT,_Alloc>::_S_concat_char_iter(
-        __left._M_tree_ptr, __right, __rlen));
-}
-
-template <class _CharT, class _Alloc>
-inline
-rope<_CharT,_Alloc>&
-operator+= (rope<_CharT,_Alloc>& __left,
-            const _CharT* __right) {
-    __left.append(__right);
-    return __left;
-}
-
-template <class _CharT, class _Alloc>
-inline
-rope<_CharT,_Alloc>
-operator+ (const rope<_CharT,_Alloc>& __left, _CharT __right) {
-    return rope<_CharT,_Alloc>(
-      rope<_CharT,_Alloc>::_S_concat_char_iter(
-        __left._M_tree_ptr, &__right, 1));
-}
-
-template <class _CharT, class _Alloc>
-inline
-rope<_CharT,_Alloc>&
-operator+= (rope<_CharT,_Alloc>& __left, _CharT __right) {
-    __left.append(__right);
-    return __left;
-}
-
-template <class _CharT, class _Alloc>
-bool
-operator< (const rope<_CharT,_Alloc>& __left,
-           const rope<_CharT,_Alloc>& __right) {
-    return __left.compare(__right) < 0;
-}
-
-template <class _CharT, class _Alloc>
-bool
-operator== (const rope<_CharT,_Alloc>& __left,
-            const rope<_CharT,_Alloc>& __right) {
-    return __left.compare(__right) == 0;
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator== (const _Rope_char_ptr_proxy<_CharT,_Alloc>& __x,
-                        const _Rope_char_ptr_proxy<_CharT,_Alloc>& __y) {
-        return (__x._M_pos == __y._M_pos && __x._M_root == __y._M_root);
-}
-
-template <class _CharT, class _Alloc>
-inline bool
-operator!= (const rope<_CharT,_Alloc>& __x, const rope<_CharT,_Alloc>& __y) {
-  return !(__x == __y);
-}
-
-template <class _CharT, class _Alloc>
-inline bool
-operator> (const rope<_CharT,_Alloc>& __x, const rope<_CharT,_Alloc>& __y) {
-  return __y < __x;
-}
-
-template <class _CharT, class _Alloc>
-inline bool
-operator<= (const rope<_CharT,_Alloc>& __x, const rope<_CharT,_Alloc>& __y) {
-  return !(__y < __x);
-}
-
-template <class _CharT, class _Alloc>
-inline bool
-operator>= (const rope<_CharT,_Alloc>& __x, const rope<_CharT,_Alloc>& __y) {
-  return !(__x < __y);
-}
-
-template <class _CharT, class _Alloc>
-inline bool operator!= (const _Rope_char_ptr_proxy<_CharT,_Alloc>& __x,
-                        const _Rope_char_ptr_proxy<_CharT,_Alloc>& __y) {
-  return !(__x == __y);
-}
-
-template<class _CharT, class _Traits, class _Alloc>
-std::basic_ostream<_CharT, _Traits>& operator<<
-                                        (std::basic_ostream<_CharT, _Traits>& __o,
-                                         const rope<_CharT, _Alloc>& __r);
-
-typedef rope<char> crope;
-typedef rope<wchar_t> wrope;
-
-inline crope::reference __mutable_reference_at(crope& __c, size_t __i)
-{
-    return __c.mutable_reference_at(__i);
-}
-
-inline wrope::reference __mutable_reference_at(wrope& __c, size_t __i)
-{
-    return __c.mutable_reference_at(__i);
-}
-
-template <class _CharT, class _Alloc>
-inline void swap(rope<_CharT,_Alloc>& __x, rope<_CharT,_Alloc>& __y) {
-  __x.swap(__y);
-}
-
-// Hash functions should probably be revisited later:
-template<> struct hash<crope>
-{
-  size_t operator()(const crope& __str) const
-  {
-    size_t __size = __str.size();
-
-    if (0 == __size) return 0;
-    return 13*__str[0] + 5*__str[__size - 1] + __size;
-  }
-};
-
-
-template<> struct hash<wrope>
-{
-  size_t operator()(const wrope& __str) const
-  {
-    size_t __size = __str.size();
-
-    if (0 == __size) return 0;
-    return 13*__str[0] + 5*__str[__size - 1] + __size;
-  }
-};
-
-} // namespace __gnu_cxx
-
-# include <ext/ropeimpl.h>
-
-#endif
diff --git a/include.new/c++/3.4/ext/ropeimpl.h b/include.new/c++/3.4/ext/ropeimpl.h
deleted file mode 100644
index 29dc550..0000000
--- a/include.new/c++/3.4/ext/ropeimpl.h
+++ /dev/null
@@ -1,1539 +0,0 @@
-// SGI's rope class implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file ropeimpl.h
- *  This is an internal header file, included by other library headers.
- *  You should not attempt to use it directly.
- */
-
-#include <cstdio>
-#include <ostream>
-#include <bits/functexcept.h>
-
-#include <ext/algorithm> // For copy_n and lexicographical_compare_3way
-#include <ext/memory> // For uninitialized_copy_n
-#include <ext/numeric> // For power
-
-namespace __gnu_cxx
-{
-  using std::size_t;
-  using std::printf;
-  using std::basic_ostream;
-  using std::__throw_length_error;
-  using std::_Destroy;
-  using std::uninitialized_fill_n;
-
-// Set buf_start, buf_end, and buf_ptr appropriately, filling tmp_buf
-// if necessary.  Assumes _M_path_end[leaf_index] and leaf_pos are correct.
-// Results in a valid buf_ptr if the iterator can be legitimately
-// dereferenced.
-template <class _CharT, class _Alloc>
-void _Rope_iterator_base<_CharT,_Alloc>::_S_setbuf(
-  _Rope_iterator_base<_CharT,_Alloc>& __x)
-{
-    const _RopeRep* __leaf = __x._M_path_end[__x._M_leaf_index];
-    size_t __leaf_pos = __x._M_leaf_pos;
-    size_t __pos = __x._M_current_pos;
-
-    switch(__leaf->_M_tag) {
-	case _Rope_constants::_S_leaf:
-	    __x._M_buf_start =
-	      ((_Rope_RopeLeaf<_CharT,_Alloc>*)__leaf)->_M_data;
-	    __x._M_buf_ptr = __x._M_buf_start + (__pos - __leaf_pos);
-	    __x._M_buf_end = __x._M_buf_start + __leaf->_M_size;
-	    break;
-	case _Rope_constants::_S_function:
-	case _Rope_constants::_S_substringfn:
-	    {
-		size_t __len = _S_iterator_buf_len;
-		size_t __buf_start_pos = __leaf_pos;
-		size_t __leaf_end = __leaf_pos + __leaf->_M_size;
-		char_producer<_CharT>* __fn =
-			((_Rope_RopeFunction<_CharT,_Alloc>*)__leaf)->_M_fn;
-
-		if (__buf_start_pos + __len <= __pos) {
-		    __buf_start_pos = __pos - __len/4;
-		    if (__buf_start_pos + __len > __leaf_end) {
-			__buf_start_pos = __leaf_end - __len;
-		    }
-		}
-		if (__buf_start_pos + __len > __leaf_end) {
-		    __len = __leaf_end - __buf_start_pos;
-		}
-		(*__fn)(__buf_start_pos - __leaf_pos, __len, __x._M_tmp_buf);
-		__x._M_buf_ptr = __x._M_tmp_buf + (__pos - __buf_start_pos);
-		__x._M_buf_start = __x._M_tmp_buf;
-		__x._M_buf_end = __x._M_tmp_buf + __len;
-	    }
-	    break;
-	default:
-	  break;
-    }
-}
-
-// Set path and buffer inside a rope iterator.  We assume that
-// pos and root are already set.
-template <class _CharT, class _Alloc>
-void _Rope_iterator_base<_CharT,_Alloc>::_S_setcache
-(_Rope_iterator_base<_CharT,_Alloc>& __x)
-{
-    const _RopeRep* __path[_Rope_constants::_S_max_rope_depth + 1];
-    const _RopeRep* __curr_rope;
-    int __curr_depth = -1;  /* index into path    */
-    size_t __curr_start_pos = 0;
-    size_t __pos = __x._M_current_pos;
-    unsigned char __dirns = 0; // Bit vector marking right turns in the path
-
-    if (__pos >= __x._M_root->_M_size) {
-	__x._M_buf_ptr = 0;
-	return;
-    }
-    __curr_rope = __x._M_root;
-    if (0 != __curr_rope->_M_c_string) {
-	/* Treat the root as a leaf. */
-	__x._M_buf_start = __curr_rope->_M_c_string;
-	__x._M_buf_end = __curr_rope->_M_c_string + __curr_rope->_M_size;
-	__x._M_buf_ptr = __curr_rope->_M_c_string + __pos;
-	__x._M_path_end[0] = __curr_rope;
-	__x._M_leaf_index = 0;
-	__x._M_leaf_pos = 0;
-	return;
-    }
-    for(;;) {
-	++__curr_depth;
-	__path[__curr_depth] = __curr_rope;
-	switch(__curr_rope->_M_tag) {
-	  case _Rope_constants::_S_leaf:
-	  case _Rope_constants::_S_function:
-	  case _Rope_constants::_S_substringfn:
-	    __x._M_leaf_pos = __curr_start_pos;
-	    goto done;
-	  case _Rope_constants::_S_concat:
-	    {
-		_Rope_RopeConcatenation<_CharT,_Alloc>* __c =
-			(_Rope_RopeConcatenation<_CharT,_Alloc>*)__curr_rope;
-		_RopeRep* __left = __c->_M_left;
-		size_t __left_len = __left->_M_size;
-
-		__dirns <<= 1;
-		if (__pos >= __curr_start_pos + __left_len) {
-		    __dirns |= 1;
-		    __curr_rope = __c->_M_right;
-		    __curr_start_pos += __left_len;
-		} else {
-		    __curr_rope = __left;
-		}
-	    }
-	    break;
-	}
-    }
-  done:
-    // Copy last section of path into _M_path_end.
-      {
-	int __i = -1;
-	int __j = __curr_depth + 1 - _S_path_cache_len;
-
-	if (__j < 0) __j = 0;
-	while (__j <= __curr_depth) {
-	    __x._M_path_end[++__i] = __path[__j++];
-	}
-	__x._M_leaf_index = __i;
-      }
-      __x._M_path_directions = __dirns;
-      _S_setbuf(__x);
-}
-
-// Specialized version of the above.  Assumes that
-// the path cache is valid for the previous position.
-template <class _CharT, class _Alloc>
-void _Rope_iterator_base<_CharT,_Alloc>::_S_setcache_for_incr
-(_Rope_iterator_base<_CharT,_Alloc>& __x)
-{
-    int __current_index = __x._M_leaf_index;
-    const _RopeRep* __current_node = __x._M_path_end[__current_index];
-    size_t __len = __current_node->_M_size;
-    size_t __node_start_pos = __x._M_leaf_pos;
-    unsigned char __dirns = __x._M_path_directions;
-    _Rope_RopeConcatenation<_CharT,_Alloc>* __c;
-
-    if (__x._M_current_pos - __node_start_pos < __len) {
-	/* More stuff in this leaf, we just didn't cache it. */
-	_S_setbuf(__x);
-	return;
-    }
-    //  node_start_pos is starting position of last_node.
-    while (--__current_index >= 0) {
-	if (!(__dirns & 1) /* Path turned left */)
-	  break;
-	__current_node = __x._M_path_end[__current_index];
-	__c = (_Rope_RopeConcatenation<_CharT,_Alloc>*)__current_node;
-	// Otherwise we were in the right child.  Thus we should pop
-	// the concatenation node.
-	__node_start_pos -= __c->_M_left->_M_size;
-	__dirns >>= 1;
-    }
-    if (__current_index < 0) {
-	// We underflowed the cache. Punt.
-	_S_setcache(__x);
-	return;
-    }
-    __current_node = __x._M_path_end[__current_index];
-    __c = (_Rope_RopeConcatenation<_CharT,_Alloc>*)__current_node;
-    // current_node is a concatenation node.  We are positioned on the first
-    // character in its right child.
-    // node_start_pos is starting position of current_node.
-    __node_start_pos += __c->_M_left->_M_size;
-    __current_node = __c->_M_right;
-    __x._M_path_end[++__current_index] = __current_node;
-    __dirns |= 1;
-    while (_Rope_constants::_S_concat == __current_node->_M_tag) {
-	++__current_index;
-	if (_S_path_cache_len == __current_index) {
-	    int __i;
-	    for (__i = 0; __i < _S_path_cache_len-1; __i++) {
-		__x._M_path_end[__i] = __x._M_path_end[__i+1];
-	    }
-	    --__current_index;
-	}
-	__current_node =
-	    ((_Rope_RopeConcatenation<_CharT,_Alloc>*)__current_node)->_M_left;
-	__x._M_path_end[__current_index] = __current_node;
-	__dirns <<= 1;
-	// node_start_pos is unchanged.
-    }
-    __x._M_leaf_index = __current_index;
-    __x._M_leaf_pos = __node_start_pos;
-    __x._M_path_directions = __dirns;
-    _S_setbuf(__x);
-}
-
-template <class _CharT, class _Alloc>
-void _Rope_iterator_base<_CharT,_Alloc>::_M_incr(size_t __n) {
-    _M_current_pos += __n;
-    if (0 != _M_buf_ptr) {
-        size_t __chars_left = _M_buf_end - _M_buf_ptr;
-        if (__chars_left > __n) {
-            _M_buf_ptr += __n;
-        } else if (__chars_left == __n) {
-            _M_buf_ptr += __n;
-            _S_setcache_for_incr(*this);
-        } else {
-            _M_buf_ptr = 0;
-        }
-    }
-}
-
-template <class _CharT, class _Alloc>
-void _Rope_iterator_base<_CharT,_Alloc>::_M_decr(size_t __n) {
-    if (0 != _M_buf_ptr) {
-        size_t __chars_left = _M_buf_ptr - _M_buf_start;
-        if (__chars_left >= __n) {
-            _M_buf_ptr -= __n;
-        } else {
-            _M_buf_ptr = 0;
-        }
-    }
-    _M_current_pos -= __n;
-}
-
-template <class _CharT, class _Alloc>
-void _Rope_iterator<_CharT,_Alloc>::_M_check() {
-    if (_M_root_rope->_M_tree_ptr != this->_M_root) {
-        // _Rope was modified.  Get things fixed up.
-        _RopeRep::_S_unref(this->_M_root);
-        this->_M_root = _M_root_rope->_M_tree_ptr;
-        _RopeRep::_S_ref(this->_M_root);
-        this->_M_buf_ptr = 0;
-    }
-}
-
-template <class _CharT, class _Alloc>
-inline
-_Rope_const_iterator<_CharT, _Alloc>::_Rope_const_iterator(
-  const _Rope_iterator<_CharT,_Alloc>& __x)
-: _Rope_iterator_base<_CharT,_Alloc>(__x)
-{ }
-
-template <class _CharT, class _Alloc>
-inline _Rope_iterator<_CharT,_Alloc>::_Rope_iterator(
-  rope<_CharT,_Alloc>& __r, size_t __pos)
-: _Rope_iterator_base<_CharT,_Alloc>(__r._M_tree_ptr, __pos),
-  _M_root_rope(&__r)
-{
-    _RopeRep::_S_ref(this->_M_root);
-}
-
-template <class _CharT, class _Alloc>
-inline size_t
-rope<_CharT,_Alloc>::_S_char_ptr_len(const _CharT* __s)
-{
-    const _CharT* __p = __s;
-
-    while (!_S_is0(*__p)) { ++__p; }
-    return (__p - __s);
-}
-
-
-#ifndef __GC
-
-template <class _CharT, class _Alloc>
-inline void _Rope_RopeRep<_CharT,_Alloc>::_M_free_c_string()
-{
-    _CharT* __cstr = _M_c_string;
-    if (0 != __cstr) {
-	size_t __size = this->_M_size + 1;
-	_Destroy(__cstr, __cstr + __size);
-	this->_Data_deallocate(__cstr, __size);
-    }
-}
-
-
-template <class _CharT, class _Alloc>
-  inline void _Rope_RopeRep<_CharT,_Alloc>::_S_free_string(_CharT* __s,
-							   size_t __n,
-						           allocator_type __a)
-{
-    if (!_S_is_basic_char_type((_CharT*)0)) {
-	_Destroy(__s, __s + __n);
-    }
-//  This has to be a static member, so this gets a bit messy
-        __a.deallocate(
-	    __s, _Rope_RopeLeaf<_CharT,_Alloc>::_S_rounded_up_size(__n));
-}
-
-
-//  There are several reasons for not doing this with virtual destructors
-//  and a class specific delete operator:
-//  - A class specific delete operator can't easily get access to
-//    allocator instances if we need them.
-//  - Any virtual function would need a 4 or byte vtable pointer;
-//    this only requires a one byte tag per object.
-template <class _CharT, class _Alloc>
-void _Rope_RopeRep<_CharT,_Alloc>::_M_free_tree()
-{
-    switch(_M_tag) {
-	case _Rope_constants::_S_leaf:
-	    {
-	        _Rope_RopeLeaf<_CharT,_Alloc>* __l
-			= (_Rope_RopeLeaf<_CharT,_Alloc>*)this;
-	        __l->_Rope_RopeLeaf<_CharT,_Alloc>::~_Rope_RopeLeaf();
-	        _L_deallocate(__l, 1);
-	        break;
-	    }
-	case _Rope_constants::_S_concat:
-	    {
-	        _Rope_RopeConcatenation<_CharT,_Alloc>* __c
-		    = (_Rope_RopeConcatenation<_CharT,_Alloc>*)this;
-	        __c->_Rope_RopeConcatenation<_CharT,_Alloc>::
-		       ~_Rope_RopeConcatenation();
-	        _C_deallocate(__c, 1);
-	        break;
-	    }
-	case _Rope_constants::_S_function:
-	    {
-	        _Rope_RopeFunction<_CharT,_Alloc>* __f
-		    = (_Rope_RopeFunction<_CharT,_Alloc>*)this;
-	        __f->_Rope_RopeFunction<_CharT,_Alloc>::~_Rope_RopeFunction();
-	        _F_deallocate(__f, 1);
-	        break;
-	    }
-	case _Rope_constants::_S_substringfn:
-	    {
-	        _Rope_RopeSubstring<_CharT,_Alloc>* __ss =
-			(_Rope_RopeSubstring<_CharT,_Alloc>*)this;
-		__ss->_Rope_RopeSubstring<_CharT,_Alloc>::
-		        ~_Rope_RopeSubstring();
-		_S_deallocate(__ss, 1);
-		break;
-	    }
-    }
-}
-#else
-
-template <class _CharT, class _Alloc>
-  inline void _Rope_RopeRep<_CharT,_Alloc>::_S_free_string
-		(const _CharT*, size_t, allocator_type)
-{}
-
-#endif
-
-
-// Concatenate a C string onto a leaf rope by copying the rope data.
-// Used for short ropes.
-template <class _CharT, class _Alloc>
-typename rope<_CharT,_Alloc>::_RopeLeaf*
-rope<_CharT,_Alloc>::_S_leaf_concat_char_iter
-		(_RopeLeaf* __r, const _CharT* __iter, size_t __len)
-{
-    size_t __old_len = __r->_M_size;
-    _CharT* __new_data = (_CharT*)
-      _Data_allocate(_S_rounded_up_size(__old_len + __len));
-    _RopeLeaf* __result;
-
-    uninitialized_copy_n(__r->_M_data, __old_len, __new_data);
-    uninitialized_copy_n(__iter, __len, __new_data + __old_len);
-    _S_cond_store_eos(__new_data[__old_len + __len]);
-    try {
-	__result = _S_new_RopeLeaf(__new_data, __old_len + __len,
-				   __r->get_allocator());
-    }
-    catch(...)
-      {
-	_RopeRep::__STL_FREE_STRING(__new_data, __old_len + __len,
-				    __r->get_allocator());
-	__throw_exception_again;
-      }
-    return __result;
-}
-
-#ifndef __GC
-// As above, but it's OK to clobber original if refcount is 1
-template <class _CharT, class _Alloc>
-typename rope<_CharT,_Alloc>::_RopeLeaf*
-rope<_CharT,_Alloc>::_S_destr_leaf_concat_char_iter
-		(_RopeLeaf* __r, const _CharT* __iter, size_t __len)
-{
-    if (__r->_M_ref_count > 1)
-      return _S_leaf_concat_char_iter(__r, __iter, __len);
-    size_t __old_len = __r->_M_size;
-    if (_S_allocated_capacity(__old_len) >= __old_len + __len) {
-	// The space has been partially initialized for the standard
-	// character types.  But that doesn't matter for those types.
-	uninitialized_copy_n(__iter, __len, __r->_M_data + __old_len);
-	if (_S_is_basic_char_type((_CharT*)0)) {
-	    _S_cond_store_eos(__r->_M_data[__old_len + __len]);
-	} else if (__r->_M_c_string != __r->_M_data && 0 != __r->_M_c_string) {
-	    __r->_M_free_c_string();
-	    __r->_M_c_string = 0;
-	}
-	__r->_M_size = __old_len + __len;
-	__r->_M_ref_count = 2;
-	return __r;
-    } else {
-	_RopeLeaf* __result = _S_leaf_concat_char_iter(__r, __iter, __len);
-	return __result;
-    }
-}
-#endif
-
-// Assumes left and right are not 0.
-// Does not increment (nor decrement on exception) child reference counts.
-// Result has ref count 1.
-template <class _CharT, class _Alloc>
-typename rope<_CharT,_Alloc>::_RopeRep*
-rope<_CharT,_Alloc>::_S_tree_concat (_RopeRep* __left, _RopeRep* __right)
-{
-  _RopeConcatenation* __result = _S_new_RopeConcatenation(__left, __right,
-						      __left->get_allocator());
-  size_t __depth = __result->_M_depth;
-
-  if (__depth > 20 && (__result->_M_size < 1000 ||
-		       __depth > _Rope_constants::_S_max_rope_depth))
-    {
-      _RopeRep* __balanced;
-
-      try
-	{
-	  __balanced = _S_balance(__result);
-	  __result->_M_unref_nonnil();
-        }
-      catch(...)
-	{
-	  _C_deallocate(__result,1);
-	  __throw_exception_again;
-	}
-      // In case of exception, we need to deallocate
-      // otherwise dangling result node.  But caller
-      // still owns its children.  Thus unref is
-      // inappropriate.
-      return __balanced;
-    }
-  else
-    return __result;
-}
-
-template <class _CharT, class _Alloc>
-typename
-rope<_CharT,_Alloc>::_RopeRep* rope<_CharT,_Alloc>::_S_concat_char_iter
-		(_RopeRep* __r, const _CharT*__s, size_t __slen)
-{
-    _RopeRep* __result;
-    if (0 == __slen) {
-	_S_ref(__r);
-	return __r;
-    }
-    if (0 == __r)
-      return __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen,
-					      __r->get_allocator());
-    if (_Rope_constants::_S_leaf == __r->_M_tag &&
-          __r->_M_size + __slen <= _S_copy_max) {
-	__result = _S_leaf_concat_char_iter((_RopeLeaf*)__r, __s, __slen);
-	return __result;
-    }
-    if (_Rope_constants::_S_concat == __r->_M_tag
-	&& _Rope_constants::_S_leaf == ((_RopeConcatenation*)__r)->_M_right->_M_tag) {
-	_RopeLeaf* __right =
-	  (_RopeLeaf* )(((_RopeConcatenation* )__r)->_M_right);
-	if (__right->_M_size + __slen <= _S_copy_max) {
-	  _RopeRep* __left = ((_RopeConcatenation*)__r)->_M_left;
-	  _RopeRep* __nright =
-	    _S_leaf_concat_char_iter((_RopeLeaf*)__right, __s, __slen);
-	  __left->_M_ref_nonnil();
-	  try {
-	    __result = _S_tree_concat(__left, __nright);
-          }
-	  catch(...)
-	    {
-	      _S_unref(__left);
-	      _S_unref(__nright);
-	      __throw_exception_again;
-	    }
-	  return __result;
-	}
-    }
-    _RopeRep* __nright =
-      __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen, __r->get_allocator());
-    try {
-      __r->_M_ref_nonnil();
-      __result = _S_tree_concat(__r, __nright);
-    }
-    catch(...)
-      {
-	_S_unref(__r);
-	_S_unref(__nright);
-	__throw_exception_again;
-      }
-    return __result;
-}
-
-#ifndef __GC
-template <class _CharT, class _Alloc>
-typename rope<_CharT,_Alloc>::_RopeRep*
-rope<_CharT,_Alloc>::_S_destr_concat_char_iter(
-  _RopeRep* __r, const _CharT* __s, size_t __slen)
-{
-    _RopeRep* __result;
-    if (0 == __r)
-      return __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen,
-					      __r->get_allocator());
-    size_t __count = __r->_M_ref_count;
-    size_t __orig_size = __r->_M_size;
-    if (__count > 1) return _S_concat_char_iter(__r, __s, __slen);
-    if (0 == __slen) {
-	__r->_M_ref_count = 2;      // One more than before
-	return __r;
-    }
-    if (__orig_size + __slen <= _S_copy_max &&
-          _Rope_constants::_S_leaf == __r->_M_tag) {
-	__result = _S_destr_leaf_concat_char_iter((_RopeLeaf*)__r, __s, __slen);
-	return __result;
-    }
-    if (_Rope_constants::_S_concat == __r->_M_tag) {
-	_RopeLeaf* __right = (_RopeLeaf*)(((_RopeConcatenation*)__r)->_M_right);
-	if (_Rope_constants::_S_leaf == __right->_M_tag
-	    && __right->_M_size + __slen <= _S_copy_max) {
-	  _RopeRep* __new_right =
-	    _S_destr_leaf_concat_char_iter(__right, __s, __slen);
-	  if (__right == __new_right)
-	    __new_right->_M_ref_count = 1;
-	  else
-	    __right->_M_unref_nonnil();
-	  __r->_M_ref_count = 2;    // One more than before.
-	  ((_RopeConcatenation*)__r)->_M_right = __new_right;
-	  __r->_M_size = __orig_size + __slen;
-	  if (0 != __r->_M_c_string) {
-	      __r->_M_free_c_string();
-	      __r->_M_c_string = 0;
-	  }
-	  return __r;
-	}
-    }
-    _RopeRep* __right =
-      __STL_ROPE_FROM_UNOWNED_CHAR_PTR(__s, __slen, __r->get_allocator());
-    __r->_M_ref_nonnil();
-    try {
-      __result = _S_tree_concat(__r, __right);
-    }
-    catch(...)
-      {
-	_S_unref(__r);
-	_S_unref(__right);
-	__throw_exception_again;
-      }
-    return __result;
-}
-#endif /* !__GC */
-
-template <class _CharT, class _Alloc>
-typename rope<_CharT,_Alloc>::_RopeRep*
-rope<_CharT,_Alloc>::_S_concat(_RopeRep* __left, _RopeRep* __right)
-{
-    if (0 == __left) {
-	_S_ref(__right);
-	return __right;
-    }
-    if (0 == __right) {
-	__left->_M_ref_nonnil();
-	return __left;
-    }
-    if (_Rope_constants::_S_leaf == __right->_M_tag) {
-	if (_Rope_constants::_S_leaf == __left->_M_tag) {
-	  if (__right->_M_size + __left->_M_size <= _S_copy_max) {
-	    return _S_leaf_concat_char_iter((_RopeLeaf*)__left,
-					 ((_RopeLeaf*)__right)->_M_data,
-					 __right->_M_size);
-	  }
-	} else if (_Rope_constants::_S_concat == __left->_M_tag
-		   && _Rope_constants::_S_leaf ==
-		      ((_RopeConcatenation*)__left)->_M_right->_M_tag) {
-	  _RopeLeaf* __leftright =
-		    (_RopeLeaf*)(((_RopeConcatenation*)__left)->_M_right);
-	  if (__leftright->_M_size + __right->_M_size <= _S_copy_max) {
-	    _RopeRep* __leftleft = ((_RopeConcatenation*)__left)->_M_left;
-	    _RopeRep* __rest = _S_leaf_concat_char_iter(__leftright,
-					   ((_RopeLeaf*)__right)->_M_data,
-					   __right->_M_size);
-	    __leftleft->_M_ref_nonnil();
-	    try {
-	      return(_S_tree_concat(__leftleft, __rest));
-            }
-	    catch(...)
-	      {
-		_S_unref(__leftleft);
-		_S_unref(__rest);
-		__throw_exception_again;
-	      }
-	  }
-	}
-    }
-    __left->_M_ref_nonnil();
-    __right->_M_ref_nonnil();
-    try {
-      return(_S_tree_concat(__left, __right));
-    }
-    catch(...)
-      {
-	_S_unref(__left);
-	_S_unref(__right);
-	__throw_exception_again;
-      }	
-}
-
-template <class _CharT, class _Alloc>
-typename rope<_CharT,_Alloc>::_RopeRep*
-rope<_CharT,_Alloc>::_S_substring(_RopeRep* __base,
-                               size_t __start, size_t __endp1)
-{
-    if (0 == __base) return 0;
-    size_t __len = __base->_M_size;
-    size_t __adj_endp1;
-    const size_t __lazy_threshold = 128;
-
-    if (__endp1 >= __len) {
-	if (0 == __start) {
-	    __base->_M_ref_nonnil();
-	    return __base;
-	} else {
-	    __adj_endp1 = __len;
-	}
-    } else {
-	__adj_endp1 = __endp1;
-    }
-    switch(__base->_M_tag) {
-	case _Rope_constants::_S_concat:
-	    {
-		_RopeConcatenation* __c = (_RopeConcatenation*)__base;
-		_RopeRep* __left = __c->_M_left;
-		_RopeRep* __right = __c->_M_right;
-		size_t __left_len = __left->_M_size;
-		_RopeRep* __result;
-
-		if (__adj_endp1 <= __left_len) {
-		    return _S_substring(__left, __start, __endp1);
-		} else if (__start >= __left_len) {
-		    return _S_substring(__right, __start - __left_len,
-				  __adj_endp1 - __left_len);
-		}
-		_Self_destruct_ptr __left_result(
-		  _S_substring(__left, __start, __left_len));
-		_Self_destruct_ptr __right_result(
-		  _S_substring(__right, 0, __endp1 - __left_len));
-		__result = _S_concat(__left_result, __right_result);
-		return __result;
-	    }
-	case _Rope_constants::_S_leaf:
-	    {
-		_RopeLeaf* __l = (_RopeLeaf*)__base;
-		_RopeLeaf* __result;
-		size_t __result_len;
-		if (__start >= __adj_endp1) return 0;
-		__result_len = __adj_endp1 - __start;
-		if (__result_len > __lazy_threshold) goto lazy;
-#               ifdef __GC
-		    const _CharT* __section = __l->_M_data + __start;
-		    __result = _S_new_RopeLeaf(__section, __result_len,
-					  __base->get_allocator());
-		    __result->_M_c_string = 0;  // Not eos terminated.
-#               else
-		    // We should sometimes create substring node instead.
-		    __result = __STL_ROPE_FROM_UNOWNED_CHAR_PTR(
-					__l->_M_data + __start, __result_len,
-					__base->get_allocator());
-#               endif
-		return __result;
-	    }
-	case _Rope_constants::_S_substringfn:
-	    // Avoid introducing multiple layers of substring nodes.
-	    {
-		_RopeSubstring* __old = (_RopeSubstring*)__base;
-		size_t __result_len;
-		if (__start >= __adj_endp1) return 0;
-		__result_len = __adj_endp1 - __start;
-		if (__result_len > __lazy_threshold) {
-		    _RopeSubstring* __result =
-			_S_new_RopeSubstring(__old->_M_base,
-					  __start + __old->_M_start,
-					  __adj_endp1 - __start,
-					  __base->get_allocator());
-		    return __result;
-
-		} // *** else fall through: ***
-	    }
-	case _Rope_constants::_S_function:
-	    {
-		_RopeFunction* __f = (_RopeFunction*)__base;
-		_CharT* __section;
-		size_t __result_len;
-		if (__start >= __adj_endp1) return 0;
-		__result_len = __adj_endp1 - __start;
-
-		if (__result_len > __lazy_threshold) goto lazy;
-		__section = (_CharT*)
-		  _Data_allocate(_S_rounded_up_size(__result_len));
-		try {
-		  (*(__f->_M_fn))(__start, __result_len, __section);
-                }
-		catch(...)
-		  {
-		    _RopeRep::__STL_FREE_STRING(
-	               __section, __result_len, __base->get_allocator());
-		    __throw_exception_again;
-		  }
-		_S_cond_store_eos(__section[__result_len]);
-		return _S_new_RopeLeaf(__section, __result_len,
-				       __base->get_allocator());
-	    }
-    }
-  lazy:
-    {
-	// Create substring node.
-	return _S_new_RopeSubstring(__base, __start, __adj_endp1 - __start,
-			       __base->get_allocator());
-    }
-}
-
-template<class _CharT>
-class _Rope_flatten_char_consumer : public _Rope_char_consumer<_CharT> {
-    private:
-	_CharT* _M_buf_ptr;
-    public:
-
-	_Rope_flatten_char_consumer(_CharT* __buffer) {
-	    _M_buf_ptr = __buffer;
-	};
-	~_Rope_flatten_char_consumer() {}
-	bool operator() (const _CharT* __leaf, size_t __n) {
-	    uninitialized_copy_n(__leaf, __n, _M_buf_ptr);
-	    _M_buf_ptr += __n;
-	    return true;
-	}
-};
-
-template<class _CharT>
-class _Rope_find_char_char_consumer : public _Rope_char_consumer<_CharT> {
-    private:
-	_CharT _M_pattern;
-    public:
-	size_t _M_count;  // Number of nonmatching characters
-	_Rope_find_char_char_consumer(_CharT __p)
-	  : _M_pattern(__p), _M_count(0) {}
-	~_Rope_find_char_char_consumer() {}
-	bool operator() (const _CharT* __leaf, size_t __n) {
-	    size_t __i;
-	    for (__i = 0; __i < __n; __i++) {
-		if (__leaf[__i] == _M_pattern) {
-		    _M_count += __i; return false;
-		}
-	    }
-	    _M_count += __n; return true;
-	}
-};
-
-  template<class _CharT, class _Traits>
-  // Here _CharT is both the stream and rope character type.
-class _Rope_insert_char_consumer : public _Rope_char_consumer<_CharT> {
-    private:
-	  typedef basic_ostream<_CharT,_Traits> _Insert_ostream;
-	_Insert_ostream& _M_o;
-    public:
-	_Rope_insert_char_consumer(_Insert_ostream& __writer)
-	  : _M_o(__writer) {};
-	~_Rope_insert_char_consumer() { };
-		// Caller is presumed to own the ostream
-	bool operator() (const _CharT* __leaf, size_t __n);
-		// Returns true to continue traversal.
-};
-
-template<class _CharT, class _Traits>
-bool _Rope_insert_char_consumer<_CharT, _Traits>::operator()
-                                      (const _CharT* __leaf, size_t __n)
-{
-  size_t __i;
-  //  We assume that formatting is set up correctly for each element.
-  for (__i = 0; __i < __n; __i++) _M_o.put(__leaf[__i]);
-  return true;
-}
-
-template <class _CharT, class _Alloc>
-bool rope<_CharT, _Alloc>::_S_apply_to_pieces(
-				_Rope_char_consumer<_CharT>& __c,
-				const _RopeRep* __r,
-				size_t __begin, size_t __end)
-{
-    if (0 == __r) return true;
-    switch(__r->_M_tag) {
-	case _Rope_constants::_S_concat:
-	    {
-		_RopeConcatenation* __conc = (_RopeConcatenation*)__r;
-		_RopeRep* __left =  __conc->_M_left;
-		size_t __left_len = __left->_M_size;
-		if (__begin < __left_len) {
-		    size_t __left_end = std::min(__left_len, __end);
-		    if (!_S_apply_to_pieces(__c, __left, __begin, __left_end))
-			return false;
-		}
-		if (__end > __left_len) {
-		    _RopeRep* __right =  __conc->_M_right;
-		    size_t __right_start = std::max(__left_len, __begin);
-		    if (!_S_apply_to_pieces(__c, __right,
-					 __right_start - __left_len,
-					 __end - __left_len)) {
-			return false;
-		    }
-		}
-	    }
-	    return true;
-	case _Rope_constants::_S_leaf:
-	    {
-		_RopeLeaf* __l = (_RopeLeaf*)__r;
-		return __c(__l->_M_data + __begin, __end - __begin);
-	    }
-	case _Rope_constants::_S_function:
-	case _Rope_constants::_S_substringfn:
-	    {
-		_RopeFunction* __f = (_RopeFunction*)__r;
-		size_t __len = __end - __begin;
-		bool __result;
-		_CharT* __buffer =
-		  (_CharT*)_Alloc().allocate(__len * sizeof(_CharT));
-		try {
-		  (*(__f->_M_fn))(__begin, __len, __buffer);
-		  __result = __c(__buffer, __len);
-                  _Alloc().deallocate(__buffer, __len * sizeof(_CharT));
-                }
-		catch(...)
-		  {
-		    _Alloc().deallocate(__buffer, __len * sizeof(_CharT));
-		    __throw_exception_again;
-		  }
-		return __result;
-	    }
-	default:
-	  return false;
-    }
-}
-
-  template<class _CharT, class _Traits>
-  inline void _Rope_fill(basic_ostream<_CharT, _Traits>& __o, size_t __n)
-{
-    char __f = __o.fill();
-    size_t __i;
-
-    for (__i = 0; __i < __n; __i++) __o.put(__f);
-}
-
-
-template <class _CharT> inline bool _Rope_is_simple(_CharT*) { return false; }
-inline bool _Rope_is_simple(char*) { return true; }
-inline bool _Rope_is_simple(wchar_t*) { return true; }
-
-template<class _CharT, class _Traits, class _Alloc>
-basic_ostream<_CharT, _Traits>& operator<< (basic_ostream<_CharT, _Traits>& __o,
-                                            const rope<_CharT, _Alloc>& __r)
-{
-    size_t __w = __o.width();
-    bool __left = bool(__o.flags() & std::ios::left);
-    size_t __pad_len;
-    size_t __rope_len = __r.size();
-      _Rope_insert_char_consumer<_CharT, _Traits> __c(__o);
-    bool __is_simple = _Rope_is_simple((_CharT*)0);
-
-    if (__rope_len < __w) {
-	__pad_len = __w - __rope_len;
-    } else {
-	__pad_len = 0;
-    }
-    if (!__is_simple) __o.width(__w/__rope_len);
-    try {
-      if (__is_simple && !__left && __pad_len > 0) {
-	_Rope_fill(__o, __pad_len);
-      }
-      __r.apply_to_pieces(0, __r.size(), __c);
-      if (__is_simple && __left && __pad_len > 0) {
-	_Rope_fill(__o, __pad_len);
-      }
-      if (!__is_simple)
-        __o.width(__w);
-    }
-    catch(...)
-      {
-	if (!__is_simple)
-	  __o.width(__w);
-	__throw_exception_again;
-      }
-    return __o;
-}
-
-template <class _CharT, class _Alloc>
-_CharT*
-rope<_CharT,_Alloc>::_S_flatten(_RopeRep* __r,
-				 size_t __start, size_t __len,
-				 _CharT* __buffer)
-{
-    _Rope_flatten_char_consumer<_CharT> __c(__buffer);
-    _S_apply_to_pieces(__c, __r, __start, __start + __len);
-    return(__buffer + __len);
-}
-
-template <class _CharT, class _Alloc>
-size_t
-rope<_CharT,_Alloc>::find(_CharT __pattern, size_t __start) const
-{
-    _Rope_find_char_char_consumer<_CharT> __c(__pattern);
-    _S_apply_to_pieces(__c, this->_M_tree_ptr, __start, size());
-    size_type __result_pos = __start + __c._M_count;
-#   ifndef __STL_OLD_ROPE_SEMANTICS
-	if (__result_pos == size()) __result_pos = npos;
-#   endif
-    return __result_pos;
-}
-
-template <class _CharT, class _Alloc>
-_CharT*
-rope<_CharT,_Alloc>::_S_flatten(_RopeRep* __r, _CharT* __buffer)
-{
-    if (0 == __r) return __buffer;
-    switch(__r->_M_tag) {
-	case _Rope_constants::_S_concat:
-	    {
-		_RopeConcatenation* __c = (_RopeConcatenation*)__r;
-		_RopeRep* __left = __c->_M_left;
-		_RopeRep* __right = __c->_M_right;
-		_CharT* __rest = _S_flatten(__left, __buffer);
-		return _S_flatten(__right, __rest);
-	    }
-	case _Rope_constants::_S_leaf:
-	    {
-		_RopeLeaf* __l = (_RopeLeaf*)__r;
-		return copy_n(__l->_M_data, __l->_M_size, __buffer).second;
-	    }
-	case _Rope_constants::_S_function:
-	case _Rope_constants::_S_substringfn:
-	    // We don't yet do anything with substring nodes.
-	    // This needs to be fixed before ropefiles will work well.
-	    {
-		_RopeFunction* __f = (_RopeFunction*)__r;
-		(*(__f->_M_fn))(0, __f->_M_size, __buffer);
-		return __buffer + __f->_M_size;
-	    }
-	default:
-	    return 0;
-    }
-}
-
-
-// This needs work for _CharT != char
-template <class _CharT, class _Alloc>
-void
-rope<_CharT,_Alloc>::_S_dump(_RopeRep* __r, int __indent)
-{
-    for (int __i = 0; __i < __indent; __i++) putchar(' ');
-    if (0 == __r) {
-	printf("NULL\n"); return;
-    }
-    if (_Rope_constants::_S_concat == __r->_M_tag) {
-	_RopeConcatenation* __c = (_RopeConcatenation*)__r;
-	_RopeRep* __left = __c->_M_left;
-	_RopeRep* __right = __c->_M_right;
-
-#       ifdef __GC
-	  printf("Concatenation %p (depth = %d, len = %ld, %s balanced)\n",
-	    __r, __r->_M_depth, __r->_M_size, __r->_M_is_balanced? "" : "not");
-#       else
-	  printf("Concatenation %p (rc = %ld, depth = %d, "
-	           "len = %ld, %s balanced)\n",
-		 __r, __r->_M_ref_count, __r->_M_depth, __r->_M_size,
-		 __r->_M_is_balanced? "" : "not");
-#       endif
-	_S_dump(__left, __indent + 2);
-	_S_dump(__right, __indent + 2);
-	return;
-    } else {
-	char* __kind;
-
-	switch (__r->_M_tag) {
-	    case _Rope_constants::_S_leaf:
-		__kind = "Leaf";
-		break;
-	    case _Rope_constants::_S_function:
-		__kind = "Function";
-		break;
-	    case _Rope_constants::_S_substringfn:
-		__kind = "Function representing substring";
-		break;
-	    default:
-		__kind = "(corrupted kind field!)";
-	}
-#       ifdef __GC
-	  printf("%s %p (depth = %d, len = %ld) ",
-		 __kind, __r, __r->_M_depth, __r->_M_size);
-#       else
-	  printf("%s %p (rc = %ld, depth = %d, len = %ld) ",
-		 __kind, __r, __r->_M_ref_count, __r->_M_depth, __r->_M_size);
-#       endif
-	if (_S_is_one_byte_char_type((_CharT*)0)) {
-	    const int __max_len = 40;
-	    _Self_destruct_ptr __prefix(_S_substring(__r, 0, __max_len));
-	    _CharT __buffer[__max_len + 1];
-	    bool __too_big = __r->_M_size > __prefix->_M_size;
-
-	    _S_flatten(__prefix, __buffer);
-	    __buffer[__prefix->_M_size] = _S_eos((_CharT*)0);
-	    printf("%s%s\n",
-	           (char*)__buffer, __too_big? "...\n" : "\n");
-	} else {
-	    printf("\n");
-	}
-    }
-}
-
-template <class _CharT, class _Alloc>
-const unsigned long
-rope<_CharT,_Alloc>::_S_min_len[_Rope_constants::_S_max_rope_depth + 1] = {
-/* 0 */1, /* 1 */2, /* 2 */3, /* 3 */5, /* 4 */8, /* 5 */13, /* 6 */21,
-/* 7 */34, /* 8 */55, /* 9 */89, /* 10 */144, /* 11 */233, /* 12 */377,
-/* 13 */610, /* 14 */987, /* 15 */1597, /* 16 */2584, /* 17 */4181,
-/* 18 */6765, /* 19 */10946, /* 20 */17711, /* 21 */28657, /* 22 */46368,
-/* 23 */75025, /* 24 */121393, /* 25 */196418, /* 26 */317811,
-/* 27 */514229, /* 28 */832040, /* 29 */1346269, /* 30 */2178309,
-/* 31 */3524578, /* 32 */5702887, /* 33 */9227465, /* 34 */14930352,
-/* 35 */24157817, /* 36 */39088169, /* 37 */63245986, /* 38 */102334155,
-/* 39 */165580141, /* 40 */267914296, /* 41 */433494437,
-/* 42 */701408733, /* 43 */1134903170, /* 44 */1836311903,
-/* 45 */2971215073u };
-// These are Fibonacci numbers < 2**32.
-
-template <class _CharT, class _Alloc>
-typename rope<_CharT,_Alloc>::_RopeRep*
-rope<_CharT,_Alloc>::_S_balance(_RopeRep* __r)
-{
-    _RopeRep* __forest[_Rope_constants::_S_max_rope_depth + 1];
-    _RopeRep* __result = 0;
-    int __i;
-    // Invariant:
-    // The concatenation of forest in descending order is equal to __r.
-    // __forest[__i]._M_size >= _S_min_len[__i]
-    // __forest[__i]._M_depth = __i
-    // References from forest are included in refcount.
-
-    for (__i = 0; __i <= _Rope_constants::_S_max_rope_depth; ++__i)
-      __forest[__i] = 0;
-    try {
-      _S_add_to_forest(__r, __forest);
-      for (__i = 0; __i <= _Rope_constants::_S_max_rope_depth; ++__i)
-        if (0 != __forest[__i]) {
-#	ifndef __GC
-	  _Self_destruct_ptr __old(__result);
-#	endif
-	  __result = _S_concat(__forest[__i], __result);
-	__forest[__i]->_M_unref_nonnil();
-#	if !defined(__GC) && defined(__EXCEPTIONS)
-	  __forest[__i] = 0;
-#	endif
-      }
-    }
-    catch(...)
-      {
-	for(__i = 0; __i <= _Rope_constants::_S_max_rope_depth; __i++)
-	  _S_unref(__forest[__i]);
-	__throw_exception_again;
-      }
-
-    if (__result->_M_depth > _Rope_constants::_S_max_rope_depth)
-      __throw_length_error(__N("rope::_S_balance"));
-    return(__result);
-}
-
-
-template <class _CharT, class _Alloc>
-void
-rope<_CharT,_Alloc>::_S_add_to_forest(_RopeRep* __r, _RopeRep** __forest)
-{
-    if (__r->_M_is_balanced) {
-	_S_add_leaf_to_forest(__r, __forest);
-	return;
-    }
-
-    {
-	_RopeConcatenation* __c = (_RopeConcatenation*)__r;
-
-	_S_add_to_forest(__c->_M_left, __forest);
-	_S_add_to_forest(__c->_M_right, __forest);
-    }
-}
-
-
-template <class _CharT, class _Alloc>
-void
-rope<_CharT,_Alloc>::_S_add_leaf_to_forest(_RopeRep* __r, _RopeRep** __forest)
-{
-    _RopeRep* __insertee;		// included in refcount
-    _RopeRep* __too_tiny = 0;		// included in refcount
-    int __i;				// forest[0..__i-1] is empty
-    size_t __s = __r->_M_size;
-
-    for (__i = 0; __s >= _S_min_len[__i+1]/* not this bucket */; ++__i) {
-	if (0 != __forest[__i]) {
-#	    ifndef __GC
-	      _Self_destruct_ptr __old(__too_tiny);
-#	    endif
-	    __too_tiny = _S_concat_and_set_balanced(__forest[__i], __too_tiny);
-	    __forest[__i]->_M_unref_nonnil();
-	    __forest[__i] = 0;
-	}
-    }
-    {
-#	ifndef __GC
-	  _Self_destruct_ptr __old(__too_tiny);
-#	endif
-	__insertee = _S_concat_and_set_balanced(__too_tiny, __r);
-    }
-    // Too_tiny dead, and no longer included in refcount.
-    // Insertee is live and included.
-    for (;; ++__i) {
-	if (0 != __forest[__i]) {
-#	    ifndef __GC
-	      _Self_destruct_ptr __old(__insertee);
-#	    endif
-	    __insertee = _S_concat_and_set_balanced(__forest[__i], __insertee);
-	    __forest[__i]->_M_unref_nonnil();
-	    __forest[__i] = 0;
-	}
-	if (__i == _Rope_constants::_S_max_rope_depth ||
-	      __insertee->_M_size < _S_min_len[__i+1]) {
-	    __forest[__i] = __insertee;
-	    // refcount is OK since __insertee is now dead.
-	    return;
-	}
-    }
-}
-
-template <class _CharT, class _Alloc>
-_CharT
-rope<_CharT,_Alloc>::_S_fetch(_RopeRep* __r, size_type __i)
-{
-    __GC_CONST _CharT* __cstr = __r->_M_c_string;
-
-    if (0 != __cstr) return __cstr[__i];
-    for(;;) {
-      switch(__r->_M_tag) {
-	case _Rope_constants::_S_concat:
-	    {
-		_RopeConcatenation* __c = (_RopeConcatenation*)__r;
-		_RopeRep* __left = __c->_M_left;
-		size_t __left_len = __left->_M_size;
-
-		if (__i >= __left_len) {
-		    __i -= __left_len;
-		    __r = __c->_M_right;
-		} else {
-		    __r = __left;
-		}
-	    }
-	    break;
-	case _Rope_constants::_S_leaf:
-	    {
-		_RopeLeaf* __l = (_RopeLeaf*)__r;
-		return __l->_M_data[__i];
-	    }
-	case _Rope_constants::_S_function:
-	case _Rope_constants::_S_substringfn:
-	    {
-		_RopeFunction* __f = (_RopeFunction*)__r;
-		_CharT __result;
-
-		(*(__f->_M_fn))(__i, 1, &__result);
-		return __result;
-	    }
-      }
-    }
-}
-
-# ifndef __GC
-// Return a uniquely referenced character slot for the given
-// position, or 0 if that's not possible.
-template <class _CharT, class _Alloc>
-_CharT*
-rope<_CharT,_Alloc>::_S_fetch_ptr(_RopeRep* __r, size_type __i)
-{
-    _RopeRep* __clrstack[_Rope_constants::_S_max_rope_depth];
-    size_t __csptr = 0;
-
-    for(;;) {
-      if (__r->_M_ref_count > 1) return 0;
-      switch(__r->_M_tag) {
-        case _Rope_constants::_S_concat:
-	    {
-		_RopeConcatenation* __c = (_RopeConcatenation*)__r;
-		_RopeRep* __left = __c->_M_left;
-		size_t __left_len = __left->_M_size;
-
-		if (__c->_M_c_string != 0) __clrstack[__csptr++] = __c;
-		if (__i >= __left_len) {
-		    __i -= __left_len;
-		    __r = __c->_M_right;
-		} else {
-		    __r = __left;
-		}
-	    }
-	    break;
-	case _Rope_constants::_S_leaf:
-	    {
-		_RopeLeaf* __l = (_RopeLeaf*)__r;
-		if (__l->_M_c_string != __l->_M_data && __l->_M_c_string != 0)
-		    __clrstack[__csptr++] = __l;
-		while (__csptr > 0) {
-		    -- __csptr;
-		    _RopeRep* __d = __clrstack[__csptr];
-		    __d->_M_free_c_string();
-		    __d->_M_c_string = 0;
-		}
-		return __l->_M_data + __i;
-	    }
-	case _Rope_constants::_S_function:
-	case _Rope_constants::_S_substringfn:
-	    return 0;
-      }
-    }
-}
-# endif /* __GC */
-
-// The following could be implemented trivially using
-// lexicographical_compare_3way.
-// We do a little more work to avoid dealing with rope iterators for
-// flat strings.
-template <class _CharT, class _Alloc>
-int
-rope<_CharT,_Alloc>::_S_compare (const _RopeRep* __left,
-                                 const _RopeRep* __right)
-{
-    size_t __left_len;
-    size_t __right_len;
-
-    if (0 == __right) return 0 != __left;
-    if (0 == __left) return -1;
-    __left_len = __left->_M_size;
-    __right_len = __right->_M_size;
-    if (_Rope_constants::_S_leaf == __left->_M_tag) {
-	_RopeLeaf* __l = (_RopeLeaf*) __left;
-	if (_Rope_constants::_S_leaf == __right->_M_tag) {
-	    _RopeLeaf* __r = (_RopeLeaf*) __right;
-	    return lexicographical_compare_3way(
-			__l->_M_data, __l->_M_data + __left_len,
-			__r->_M_data, __r->_M_data + __right_len);
-	} else {
-	    const_iterator __rstart(__right, 0);
-	    const_iterator __rend(__right, __right_len);
-	    return lexicographical_compare_3way(
-			__l->_M_data, __l->_M_data + __left_len,
-			__rstart, __rend);
-	}
-    } else {
-	const_iterator __lstart(__left, 0);
-	const_iterator __lend(__left, __left_len);
-	if (_Rope_constants::_S_leaf == __right->_M_tag) {
-	    _RopeLeaf* __r = (_RopeLeaf*) __right;
-	    return lexicographical_compare_3way(
-				   __lstart, __lend,
-				   __r->_M_data, __r->_M_data + __right_len);
-	} else {
-	    const_iterator __rstart(__right, 0);
-	    const_iterator __rend(__right, __right_len);
-	    return lexicographical_compare_3way(
-				   __lstart, __lend,
-				   __rstart, __rend);
-	}
-    }
-}
-
-// Assignment to reference proxies.
-template <class _CharT, class _Alloc>
-_Rope_char_ref_proxy<_CharT, _Alloc>&
-_Rope_char_ref_proxy<_CharT, _Alloc>::operator= (_CharT __c) {
-    _RopeRep* __old = _M_root->_M_tree_ptr;
-#   ifndef __GC
-	// First check for the case in which everything is uniquely
-	// referenced.  In that case we can do this destructively.
-	_CharT* __ptr = _My_rope::_S_fetch_ptr(__old, _M_pos);
-	if (0 != __ptr) {
-	    *__ptr = __c;
-	    return *this;
-	}
-#   endif
-    _Self_destruct_ptr __left(
-      _My_rope::_S_substring(__old, 0, _M_pos));
-    _Self_destruct_ptr __right(
-      _My_rope::_S_substring(__old, _M_pos+1, __old->_M_size));
-    _Self_destruct_ptr __result_left(
-      _My_rope::_S_destr_concat_char_iter(__left, &__c, 1));
-
-    _RopeRep* __result =
-		_My_rope::_S_concat(__result_left, __right);
-#   ifndef __GC
-      _RopeRep::_S_unref(__old);
-#   endif
-    _M_root->_M_tree_ptr = __result;
-    return *this;
-}
-
-template <class _CharT, class _Alloc>
-inline _Rope_char_ref_proxy<_CharT, _Alloc>::operator _CharT () const
-{
-    if (_M_current_valid) {
-	return _M_current;
-    } else {
-        return _My_rope::_S_fetch(_M_root->_M_tree_ptr, _M_pos);
-    }
-}
-template <class _CharT, class _Alloc>
-_Rope_char_ptr_proxy<_CharT, _Alloc>
-_Rope_char_ref_proxy<_CharT, _Alloc>::operator& () const {
-    return _Rope_char_ptr_proxy<_CharT, _Alloc>(*this);
-}
-
-template <class _CharT, class _Alloc>
-rope<_CharT, _Alloc>::rope(size_t __n, _CharT __c,
-			   const allocator_type& __a)
-: _Base(__a)
-{
-    rope<_CharT,_Alloc> __result;
-    const size_t __exponentiate_threshold = 32;
-    size_t __exponent;
-    size_t __rest;
-    _CharT* __rest_buffer;
-    _RopeRep* __remainder;
-    rope<_CharT,_Alloc> __remainder_rope;
-
-    if (0 == __n)
-      return;
-
-    __exponent = __n / __exponentiate_threshold;
-    __rest = __n % __exponentiate_threshold;
-    if (0 == __rest) {
-	__remainder = 0;
-    } else {
-        __rest_buffer = this->_Data_allocate(_S_rounded_up_size(__rest));
-	uninitialized_fill_n(__rest_buffer, __rest, __c);
-	_S_cond_store_eos(__rest_buffer[__rest]);
-	try {
-	    __remainder = _S_new_RopeLeaf(__rest_buffer, __rest, __a);
-        }
-	catch(...)
-	  {
-	    _RopeRep::__STL_FREE_STRING(__rest_buffer, __rest, __a);
-	    __throw_exception_again;
-	  }
-    }
-    __remainder_rope._M_tree_ptr = __remainder;
-    if (__exponent != 0) {
-	_CharT* __base_buffer =
-	  this->_Data_allocate(_S_rounded_up_size(__exponentiate_threshold));
-	_RopeLeaf* __base_leaf;
-	rope __base_rope;
-	uninitialized_fill_n(__base_buffer, __exponentiate_threshold, __c);
-	_S_cond_store_eos(__base_buffer[__exponentiate_threshold]);
-	try {
-          __base_leaf = _S_new_RopeLeaf(__base_buffer,
-                                        __exponentiate_threshold, __a);
-        }
-	catch(...)
-	  {
-	    _RopeRep::__STL_FREE_STRING(__base_buffer,
-					__exponentiate_threshold, __a);
-	    __throw_exception_again;
-	  }
-	__base_rope._M_tree_ptr = __base_leaf;
-	if (1 == __exponent) {
-	  __result = __base_rope;
-	} else {
-	  __result = power(__base_rope, __exponent,
-			   _Rope_Concat_fn<_CharT,_Alloc>());
-	}
-	if (0 != __remainder) {
-	  __result += __remainder_rope;
-	}
-    } else {
-	__result = __remainder_rope;
-    }
-    this->_M_tree_ptr = __result._M_tree_ptr;
-    this->_M_tree_ptr->_M_ref_nonnil();
-}
-
-template<class _CharT, class _Alloc>
-  _CharT rope<_CharT,_Alloc>::_S_empty_c_str[1];
-
-template<class _CharT, class _Alloc>
-const _CharT* rope<_CharT,_Alloc>::c_str() const {
-    if (0 == this->_M_tree_ptr) {
-        _S_empty_c_str[0] = _S_eos((_CharT*)0);  // Possibly redundant,
-					     // but probably fast.
-        return _S_empty_c_str;
-    }
-    __gthread_mutex_lock (&this->_M_tree_ptr->_M_c_string_lock);
-    __GC_CONST _CharT* __result = this->_M_tree_ptr->_M_c_string;
-    if (0 == __result)
-      {
-	size_t __s = size();
-	__result = this->_Data_allocate(__s + 1);
-	_S_flatten(this->_M_tree_ptr, __result);
-	__result[__s] = _S_eos((_CharT*)0);
-	this->_M_tree_ptr->_M_c_string = __result;
-      }
-    __gthread_mutex_unlock (&this->_M_tree_ptr->_M_c_string_lock);
-    return(__result);
-}
-
-template<class _CharT, class _Alloc>
-const _CharT* rope<_CharT,_Alloc>::replace_with_c_str() {
-    if (0 == this->_M_tree_ptr) {
-        _S_empty_c_str[0] = _S_eos((_CharT*)0);
-        return _S_empty_c_str;
-    }
-    __GC_CONST _CharT* __old_c_string = this->_M_tree_ptr->_M_c_string;
-    if (_Rope_constants::_S_leaf == this->_M_tree_ptr->_M_tag
-	&& 0 != __old_c_string) {
-	return(__old_c_string);
-    }
-    size_t __s = size();
-    _CharT* __result = this->_Data_allocate(_S_rounded_up_size(__s));
-    _S_flatten(this->_M_tree_ptr, __result);
-    __result[__s] = _S_eos((_CharT*)0);
-    this->_M_tree_ptr->_M_unref_nonnil();
-    this->_M_tree_ptr = _S_new_RopeLeaf(__result, __s, this->get_allocator());
-    return(__result);
-}
-
-// Algorithm specializations.  More should be added.
-
-template<class _Rope_iterator>  // was templated on CharT and Alloc
-void				// VC++ workaround
-_Rope_rotate(_Rope_iterator __first,
-             _Rope_iterator __middle,
-             _Rope_iterator __last)
-{
-  typedef typename _Rope_iterator::value_type _CharT;
-  typedef typename _Rope_iterator::_allocator_type _Alloc;
-
-  rope<_CharT,_Alloc>& __r(__first.container());
-  rope<_CharT,_Alloc> __prefix = __r.substr(0, __first.index());
-  rope<_CharT,_Alloc> __suffix =
-    __r.substr(__last.index(), __r.size() - __last.index());
-  rope<_CharT,_Alloc> __part1 =
-    __r.substr(__middle.index(), __last.index() - __middle.index());
-  rope<_CharT,_Alloc> __part2 =
-    __r.substr(__first.index(), __middle.index() - __first.index());
-  __r = __prefix;
-  __r += __part1;
-  __r += __part2;
-  __r += __suffix;
-}
-
-#if !defined(__GNUC__)
-// Appears to confuse g++
-inline void rotate(_Rope_iterator<char,__STL_DEFAULT_ALLOCATOR(char)> __first,
-                   _Rope_iterator<char,__STL_DEFAULT_ALLOCATOR(char)> __middle,
-                   _Rope_iterator<char,__STL_DEFAULT_ALLOCATOR(char)> __last) {
-    _Rope_rotate(__first, __middle, __last);
-}
-#endif
-
-# if 0
-// Probably not useful for several reasons:
-// - for SGIs 7.1 compiler and probably some others,
-//   this forces lots of rope<wchar_t, ...> instantiations, creating a
-//   code bloat and compile time problem.  (Fixed in 7.2.)
-// - wchar_t is 4 bytes wide on most UNIX platforms, making it unattractive
-//   for unicode strings.  Unsigned short may be a better character
-//   type.
-inline void rotate(
-		_Rope_iterator<wchar_t,__STL_DEFAULT_ALLOCATOR(char)> __first,
-                _Rope_iterator<wchar_t,__STL_DEFAULT_ALLOCATOR(char)> __middle,
-                _Rope_iterator<wchar_t,__STL_DEFAULT_ALLOCATOR(char)> __last) {
-    _Rope_rotate(__first, __middle, __last);
-}
-# endif
-
-} // namespace __gnu_cxx
-
-// Local Variables:
-// mode:C++
-// End:
diff --git a/include.new/c++/3.4/ext/slist b/include.new/c++/3.4/ext/slist
deleted file mode 100644
index 4b58520..0000000
--- a/include.new/c++/3.4/ext/slist
+++ /dev/null
@@ -1,906 +0,0 @@
-// Singly-linked list implementation -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file ext/slist
- *  This file is a GNU extension to the Standard C++ Library (possibly
- *  containing extensions from the HP/SGI STL subset).  You should only
- *  include this header if you are using GCC 3 or later.
- */
-
-#ifndef _SLIST
-#define _SLIST 1
-
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/concept_check.h>
-
-namespace __gnu_cxx
-{
-using std::size_t;
-using std::ptrdiff_t;
-using std::_Construct;
-using std::_Destroy;
-using std::allocator;
-
-struct _Slist_node_base
-{
-  _Slist_node_base* _M_next;
-};
-
-inline _Slist_node_base*
-__slist_make_link(_Slist_node_base* __prev_node,
-                  _Slist_node_base* __new_node)
-{
-  __new_node->_M_next = __prev_node->_M_next;
-  __prev_node->_M_next = __new_node;
-  return __new_node;
-}
-
-inline _Slist_node_base*
-__slist_previous(_Slist_node_base* __head,
-                 const _Slist_node_base* __node)
-{
-  while (__head && __head->_M_next != __node)
-    __head = __head->_M_next;
-  return __head;
-}
-
-inline const _Slist_node_base*
-__slist_previous(const _Slist_node_base* __head,
-                 const _Slist_node_base* __node)
-{
-  while (__head && __head->_M_next != __node)
-    __head = __head->_M_next;
-  return __head;
-}
-
-inline void __slist_splice_after(_Slist_node_base* __pos,
-                                 _Slist_node_base* __before_first,
-                                 _Slist_node_base* __before_last)
-{
-  if (__pos != __before_first && __pos != __before_last) {
-    _Slist_node_base* __first = __before_first->_M_next;
-    _Slist_node_base* __after = __pos->_M_next;
-    __before_first->_M_next = __before_last->_M_next;
-    __pos->_M_next = __first;
-    __before_last->_M_next = __after;
-  }
-}
-
-inline void
-__slist_splice_after(_Slist_node_base* __pos, _Slist_node_base* __head)
-{
-  _Slist_node_base* __before_last = __slist_previous(__head, 0);
-  if (__before_last != __head) {
-    _Slist_node_base* __after = __pos->_M_next;
-    __pos->_M_next = __head->_M_next;
-    __head->_M_next = 0;
-    __before_last->_M_next = __after;
-  }
-}
-
-inline _Slist_node_base* __slist_reverse(_Slist_node_base* __node)
-{
-  _Slist_node_base* __result = __node;
-  __node = __node->_M_next;
-  __result->_M_next = 0;
-  while(__node) {
-    _Slist_node_base* __next = __node->_M_next;
-    __node->_M_next = __result;
-    __result = __node;
-    __node = __next;
-  }
-  return __result;
-}
-
-inline size_t __slist_size(_Slist_node_base* __node)
-{
-  size_t __result = 0;
-  for ( ; __node != 0; __node = __node->_M_next)
-    ++__result;
-  return __result;
-}
-
-template <class _Tp>
-struct _Slist_node : public _Slist_node_base
-{
-  _Tp _M_data;
-};
-
-struct _Slist_iterator_base
-{
-  typedef size_t                    size_type;
-  typedef ptrdiff_t                 difference_type;
-  typedef std::forward_iterator_tag iterator_category;
-
-  _Slist_node_base* _M_node;
-
-  _Slist_iterator_base(_Slist_node_base* __x) : _M_node(__x) {}
-  void _M_incr() { _M_node = _M_node->_M_next; }
-
-  bool operator==(const _Slist_iterator_base& __x) const {
-    return _M_node == __x._M_node;
-  }
-  bool operator!=(const _Slist_iterator_base& __x) const {
-    return _M_node != __x._M_node;
-  }
-};
-
-template <class _Tp, class _Ref, class _Ptr>
-struct _Slist_iterator : public _Slist_iterator_base
-{
-  typedef _Slist_iterator<_Tp, _Tp&, _Tp*>             iterator;
-  typedef _Slist_iterator<_Tp, const _Tp&, const _Tp*> const_iterator;
-  typedef _Slist_iterator<_Tp, _Ref, _Ptr>             _Self;
-
-  typedef _Tp              value_type;
-  typedef _Ptr             pointer;
-  typedef _Ref             reference;
-  typedef _Slist_node<_Tp> _Node;
-
-  _Slist_iterator(_Node* __x) : _Slist_iterator_base(__x) {}
-  _Slist_iterator() : _Slist_iterator_base(0) {}
-  _Slist_iterator(const iterator& __x) : _Slist_iterator_base(__x._M_node) {}
-
-  reference operator*() const { return ((_Node*) _M_node)->_M_data; }
-  pointer operator->() const { return &(operator*()); }
-
-  _Self& operator++()
-  {
-    _M_incr();
-    return *this;
-  }
-  _Self operator++(int)
-  {
-    _Self __tmp = *this;
-    _M_incr();
-    return __tmp;
-  }
-};
-
-template <class _Tp, class _Alloc>
-struct _Slist_base
-  : public _Alloc::template rebind<_Slist_node<_Tp> >::other
-{
-  typedef typename _Alloc::template rebind<_Slist_node<_Tp> >::other _Node_alloc;
-  typedef _Alloc allocator_type;
-  allocator_type get_allocator() const {
-    return *static_cast<const _Node_alloc*>(this);
-  }
-
-  _Slist_base(const allocator_type& __a)
-    : _Node_alloc(__a) { this->_M_head._M_next = 0; }
-  ~_Slist_base() { _M_erase_after(&this->_M_head, 0); }
-
-protected:
-  _Slist_node_base _M_head;
-
-  _Slist_node<_Tp>* _M_get_node() { return _Node_alloc::allocate(1); }
-  void _M_put_node(_Slist_node<_Tp>* __p) { _Node_alloc::deallocate(__p, 1); }
-
-protected:
-  _Slist_node_base* _M_erase_after(_Slist_node_base* __pos)
-  {
-    _Slist_node<_Tp>* __next = (_Slist_node<_Tp>*) (__pos->_M_next);
-    _Slist_node_base* __next_next = __next->_M_next;
-    __pos->_M_next = __next_next;
-    _Destroy(&__next->_M_data);
-    _M_put_node(__next);
-    return __next_next;
-  }
-  _Slist_node_base* _M_erase_after(_Slist_node_base*, _Slist_node_base*);
-};
-
-template <class _Tp, class _Alloc>
-_Slist_node_base*
-_Slist_base<_Tp,_Alloc>::_M_erase_after(_Slist_node_base* __before_first,
-                                        _Slist_node_base* __last_node) {
-  _Slist_node<_Tp>* __cur = (_Slist_node<_Tp>*) (__before_first->_M_next);
-  while (__cur != __last_node) {
-    _Slist_node<_Tp>* __tmp = __cur;
-    __cur = (_Slist_node<_Tp>*) __cur->_M_next;
-    _Destroy(&__tmp->_M_data);
-    _M_put_node(__tmp);
-  }
-  __before_first->_M_next = __last_node;
-  return __last_node;
-}
-
-/**
- *  This is an SGI extension.
- *  @ingroup SGIextensions
- *  @doctodo
-*/
-template <class _Tp, class _Alloc = allocator<_Tp> >
-class slist : private _Slist_base<_Tp,_Alloc>
-{
-  // concept requirements
-  __glibcxx_class_requires(_Tp, _SGIAssignableConcept)
-
-private:
-  typedef _Slist_base<_Tp,_Alloc> _Base;
-public:
-  typedef _Tp               value_type;
-  typedef value_type*       pointer;
-  typedef const value_type* const_pointer;
-  typedef value_type&       reference;
-  typedef const value_type& const_reference;
-  typedef size_t            size_type;
-  typedef ptrdiff_t         difference_type;
-
-  typedef _Slist_iterator<_Tp, _Tp&, _Tp*>             iterator;
-  typedef _Slist_iterator<_Tp, const _Tp&, const _Tp*> const_iterator;
-
-  typedef typename _Base::allocator_type allocator_type;
-  allocator_type get_allocator() const { return _Base::get_allocator(); }
-
-private:
-  typedef _Slist_node<_Tp>      _Node;
-  typedef _Slist_node_base      _Node_base;
-  typedef _Slist_iterator_base  _Iterator_base;
-
-  _Node* _M_create_node(const value_type& __x) {
-    _Node* __node = this->_M_get_node();
-    try {
-      _Construct(&__node->_M_data, __x);
-      __node->_M_next = 0;
-    }
-    catch(...)
-      {
-	this->_M_put_node(__node);
-	__throw_exception_again;
-      }
-    return __node;
-  }
-
-  _Node* _M_create_node() {
-    _Node* __node = this->_M_get_node();
-    try {
-      _Construct(&__node->_M_data);
-      __node->_M_next = 0;
-    }
-    catch(...)
-      {
-	this->_M_put_node(__node);
-	__throw_exception_again;
-      }
-    return __node;
-  }
-
-public:
-  explicit slist(const allocator_type& __a = allocator_type()) : _Base(__a) {}
-
-  slist(size_type __n, const value_type& __x,
-        const allocator_type& __a =  allocator_type()) : _Base(__a)
-    { _M_insert_after_fill(&this->_M_head, __n, __x); }
-
-  explicit slist(size_type __n) : _Base(allocator_type())
-    { _M_insert_after_fill(&this->_M_head, __n, value_type()); }
-
-  // We don't need any dispatching tricks here, because _M_insert_after_range
-  // already does them.
-  template <class _InputIterator>
-  slist(_InputIterator __first, _InputIterator __last,
-        const allocator_type& __a =  allocator_type()) : _Base(__a)
-    { _M_insert_after_range(&this->_M_head, __first, __last); }
-
-  slist(const slist& __x) : _Base(__x.get_allocator())
-    { _M_insert_after_range(&this->_M_head, __x.begin(), __x.end()); }
-
-  slist& operator= (const slist& __x);
-
-  ~slist() {}
-
-public:
-  // assign(), a generalized assignment member function.  Two
-  // versions: one that takes a count, and one that takes a range.
-  // The range version is a member template, so we dispatch on whether
-  // or not the type is an integer.
-
-  void assign(size_type __n, const _Tp& __val)
-    { _M_fill_assign(__n, __val); }
-
-  void _M_fill_assign(size_type __n, const _Tp& __val);
-
-  template <class _InputIterator>
-  void assign(_InputIterator __first, _InputIterator __last) {
-    typedef typename _Is_integer<_InputIterator>::_Integral _Integral;
-    _M_assign_dispatch(__first, __last, _Integral());
-  }
-
-  template <class _Integer>
-  void _M_assign_dispatch(_Integer __n, _Integer __val, __true_type)
-    { _M_fill_assign((size_type) __n, (_Tp) __val); }
-
-  template <class _InputIterator>
-  void _M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-                          __false_type);
-
-public:
-
-  iterator begin() { return iterator((_Node*)this->_M_head._M_next); }
-  const_iterator begin() const
-    { return const_iterator((_Node*)this->_M_head._M_next);}
-
-  iterator end() { return iterator(0); }
-  const_iterator end() const { return const_iterator(0); }
-
-  // Experimental new feature: before_begin() returns a
-  // non-dereferenceable iterator that, when incremented, yields
-  // begin().  This iterator may be used as the argument to
-  // insert_after, erase_after, etc.  Note that even for an empty
-  // slist, before_begin() is not the same iterator as end().  It
-  // is always necessary to increment before_begin() at least once to
-  // obtain end().
-  iterator before_begin() { return iterator((_Node*) &this->_M_head); }
-  const_iterator before_begin() const
-    { return const_iterator((_Node*) &this->_M_head); }
-
-  size_type size() const { return __slist_size(this->_M_head._M_next); }
-
-  size_type max_size() const { return size_type(-1); }
-
-  bool empty() const { return this->_M_head._M_next == 0; }
-
-  void swap(slist& __x)
-    { std::swap(this->_M_head._M_next, __x._M_head._M_next); }
-
-public:
-
-  reference front() { return ((_Node*) this->_M_head._M_next)->_M_data; }
-  const_reference front() const
-    { return ((_Node*) this->_M_head._M_next)->_M_data; }
-  void push_front(const value_type& __x)   {
-    __slist_make_link(&this->_M_head, _M_create_node(__x));
-  }
-  void push_front() { __slist_make_link(&this->_M_head, _M_create_node()); }
-  void pop_front() {
-    _Node* __node = (_Node*) this->_M_head._M_next;
-    this->_M_head._M_next = __node->_M_next;
-    _Destroy(&__node->_M_data);
-    this->_M_put_node(__node);
-  }
-
-  iterator previous(const_iterator __pos) {
-    return iterator((_Node*) __slist_previous(&this->_M_head, __pos._M_node));
-  }
-  const_iterator previous(const_iterator __pos) const {
-    return const_iterator((_Node*) __slist_previous(&this->_M_head,
-                                                    __pos._M_node));
-  }
-
-private:
-  _Node* _M_insert_after(_Node_base* __pos, const value_type& __x) {
-    return (_Node*) (__slist_make_link(__pos, _M_create_node(__x)));
-  }
-
-  _Node* _M_insert_after(_Node_base* __pos) {
-    return (_Node*) (__slist_make_link(__pos, _M_create_node()));
-  }
-
-  void _M_insert_after_fill(_Node_base* __pos,
-                            size_type __n, const value_type& __x) {
-    for (size_type __i = 0; __i < __n; ++__i)
-      __pos = __slist_make_link(__pos, _M_create_node(__x));
-  }
-
-  // Check whether it's an integral type.  If so, it's not an iterator.
-  template <class _InIterator>
-  void _M_insert_after_range(_Node_base* __pos,
-                             _InIterator __first, _InIterator __last) {
-    typedef typename _Is_integer<_InIterator>::_Integral _Integral;
-    _M_insert_after_range(__pos, __first, __last, _Integral());
-  }
-
-  template <class _Integer>
-  void _M_insert_after_range(_Node_base* __pos, _Integer __n, _Integer __x,
-                             __true_type) {
-    _M_insert_after_fill(__pos, __n, __x);
-  }
-
-  template <class _InIterator>
-  void _M_insert_after_range(_Node_base* __pos,
-                             _InIterator __first, _InIterator __last,
-                             __false_type) {
-    while (__first != __last) {
-      __pos = __slist_make_link(__pos, _M_create_node(*__first));
-      ++__first;
-    }
-  }
-
-public:
-
-  iterator insert_after(iterator __pos, const value_type& __x) {
-    return iterator(_M_insert_after(__pos._M_node, __x));
-  }
-
-  iterator insert_after(iterator __pos) {
-    return insert_after(__pos, value_type());
-  }
-
-  void insert_after(iterator __pos, size_type __n, const value_type& __x) {
-    _M_insert_after_fill(__pos._M_node, __n, __x);
-  }
-
-  // We don't need any dispatching tricks here, because _M_insert_after_range
-  // already does them.
-  template <class _InIterator>
-  void insert_after(iterator __pos, _InIterator __first, _InIterator __last) {
-    _M_insert_after_range(__pos._M_node, __first, __last);
-  }
-
-  iterator insert(iterator __pos, const value_type& __x) {
-    return iterator(_M_insert_after(__slist_previous(&this->_M_head,
-                                                     __pos._M_node),
-                    __x));
-  }
-
-  iterator insert(iterator __pos) {
-    return iterator(_M_insert_after(__slist_previous(&this->_M_head,
-                                                     __pos._M_node),
-                                    value_type()));
-  }
-
-  void insert(iterator __pos, size_type __n, const value_type& __x) {
-    _M_insert_after_fill(__slist_previous(&this->_M_head, __pos._M_node),
-                         __n, __x);
-  }
-
-  // We don't need any dispatching tricks here, because _M_insert_after_range
-  // already does them.
-  template <class _InIterator>
-  void insert(iterator __pos, _InIterator __first, _InIterator __last) {
-    _M_insert_after_range(__slist_previous(&this->_M_head, __pos._M_node),
-                          __first, __last);
-  }
-
-public:
-  iterator erase_after(iterator __pos) {
-    return iterator((_Node*) this->_M_erase_after(__pos._M_node));
-  }
-  iterator erase_after(iterator __before_first, iterator __last) {
-    return iterator((_Node*) this->_M_erase_after(__before_first._M_node,
-                                                  __last._M_node));
-  }
-
-  iterator erase(iterator __pos) {
-    return (_Node*) this->_M_erase_after(__slist_previous(&this->_M_head,
-                                                          __pos._M_node));
-  }
-  iterator erase(iterator __first, iterator __last) {
-    return (_Node*) this->_M_erase_after(
-      __slist_previous(&this->_M_head, __first._M_node), __last._M_node);
-  }
-
-  void resize(size_type new_size, const _Tp& __x);
-  void resize(size_type new_size) { resize(new_size, _Tp()); }
-  void clear() { this->_M_erase_after(&this->_M_head, 0); }
-
-public:
-  // Moves the range [__before_first + 1, __before_last + 1) to *this,
-  //  inserting it immediately after __pos.  This is constant time.
-  void splice_after(iterator __pos,
-                    iterator __before_first, iterator __before_last)
-  {
-    if (__before_first != __before_last)
-      __slist_splice_after(__pos._M_node, __before_first._M_node,
-                           __before_last._M_node);
-  }
-
-  // Moves the element that follows __prev to *this, inserting it immediately
-  //  after __pos.  This is constant time.
-  void splice_after(iterator __pos, iterator __prev)
-  {
-    __slist_splice_after(__pos._M_node,
-                         __prev._M_node, __prev._M_node->_M_next);
-  }
-
-
-  // Removes all of the elements from the list __x to *this, inserting
-  // them immediately after __pos.  __x must not be *this.  Complexity:
-  // linear in __x.size().
-  void splice_after(iterator __pos, slist& __x)
-  {
-    __slist_splice_after(__pos._M_node, &__x._M_head);
-  }
-
-  // Linear in distance(begin(), __pos), and linear in __x.size().
-  void splice(iterator __pos, slist& __x) {
-    if (__x._M_head._M_next)
-      __slist_splice_after(__slist_previous(&this->_M_head, __pos._M_node),
-                           &__x._M_head, __slist_previous(&__x._M_head, 0));
-  }
-
-  // Linear in distance(begin(), __pos), and in distance(__x.begin(), __i).
-  void splice(iterator __pos, slist& __x, iterator __i) {
-    __slist_splice_after(__slist_previous(&this->_M_head, __pos._M_node),
-                         __slist_previous(&__x._M_head, __i._M_node),
-                         __i._M_node);
-  }
-
-  // Linear in distance(begin(), __pos), in distance(__x.begin(), __first),
-  // and in distance(__first, __last).
-  void splice(iterator __pos, slist& __x, iterator __first, iterator __last)
-  {
-    if (__first != __last)
-      __slist_splice_after(__slist_previous(&this->_M_head, __pos._M_node),
-                           __slist_previous(&__x._M_head, __first._M_node),
-                           __slist_previous(__first._M_node, __last._M_node));
-  }
-
-public:
-  void reverse() {
-    if (this->_M_head._M_next)
-      this->_M_head._M_next = __slist_reverse(this->_M_head._M_next);
-  }
-
-  void remove(const _Tp& __val);
-  void unique();
-  void merge(slist& __x);
-  void sort();
-
-  template <class _Predicate>
-  void remove_if(_Predicate __pred);
-
-  template <class _BinaryPredicate>
-  void unique(_BinaryPredicate __pred);
-
-  template <class _StrictWeakOrdering>
-  void merge(slist&, _StrictWeakOrdering);
-
-  template <class _StrictWeakOrdering>
-  void sort(_StrictWeakOrdering __comp);
-};
-
-template <class _Tp, class _Alloc>
-slist<_Tp,_Alloc>& slist<_Tp,_Alloc>::operator=(const slist<_Tp,_Alloc>& __x)
-{
-  if (&__x != this) {
-    _Node_base* __p1 = &this->_M_head;
-    _Node* __n1 = (_Node*) this->_M_head._M_next;
-    const _Node* __n2 = (const _Node*) __x._M_head._M_next;
-    while (__n1 && __n2) {
-      __n1->_M_data = __n2->_M_data;
-      __p1 = __n1;
-      __n1 = (_Node*) __n1->_M_next;
-      __n2 = (const _Node*) __n2->_M_next;
-    }
-    if (__n2 == 0)
-      this->_M_erase_after(__p1, 0);
-    else
-      _M_insert_after_range(__p1, const_iterator((_Node*)__n2),
-                                  const_iterator(0));
-  }
-  return *this;
-}
-
-template <class _Tp, class _Alloc>
-void slist<_Tp, _Alloc>::_M_fill_assign(size_type __n, const _Tp& __val) {
-  _Node_base* __prev = &this->_M_head;
-  _Node* __node = (_Node*) this->_M_head._M_next;
-  for ( ; __node != 0 && __n > 0 ; --__n) {
-    __node->_M_data = __val;
-    __prev = __node;
-    __node = (_Node*) __node->_M_next;
-  }
-  if (__n > 0)
-    _M_insert_after_fill(__prev, __n, __val);
-  else
-    this->_M_erase_after(__prev, 0);
-}
-
-template <class _Tp, class _Alloc> template <class _InputIterator>
-void
-slist<_Tp, _Alloc>::_M_assign_dispatch(_InputIterator __first, _InputIterator __last,
-                                       __false_type)
-{
-  _Node_base* __prev = &this->_M_head;
-  _Node* __node = (_Node*) this->_M_head._M_next;
-  while (__node != 0 && __first != __last) {
-    __node->_M_data = *__first;
-    __prev = __node;
-    __node = (_Node*) __node->_M_next;
-    ++__first;
-  }
-  if (__first != __last)
-    _M_insert_after_range(__prev, __first, __last);
-  else
-    this->_M_erase_after(__prev, 0);
-}
-
-template <class _Tp, class _Alloc>
-inline bool
-operator==(const slist<_Tp,_Alloc>& _SL1, const slist<_Tp,_Alloc>& _SL2)
-{
-  typedef typename slist<_Tp,_Alloc>::const_iterator const_iterator;
-  const_iterator __end1 = _SL1.end();
-  const_iterator __end2 = _SL2.end();
-
-  const_iterator __i1 = _SL1.begin();
-  const_iterator __i2 = _SL2.begin();
-  while (__i1 != __end1 && __i2 != __end2 && *__i1 == *__i2) {
-    ++__i1;
-    ++__i2;
-  }
-  return __i1 == __end1 && __i2 == __end2;
-}
-
-
-template <class _Tp, class _Alloc>
-inline bool
-operator<(const slist<_Tp,_Alloc>& _SL1, const slist<_Tp,_Alloc>& _SL2)
-{
-  return std::lexicographical_compare(_SL1.begin(), _SL1.end(),
-				      _SL2.begin(), _SL2.end());
-}
-
-template <class _Tp, class _Alloc>
-inline bool
-operator!=(const slist<_Tp,_Alloc>& _SL1, const slist<_Tp,_Alloc>& _SL2) {
-  return !(_SL1 == _SL2);
-}
-
-template <class _Tp, class _Alloc>
-inline bool
-operator>(const slist<_Tp,_Alloc>& _SL1, const slist<_Tp,_Alloc>& _SL2) {
-  return _SL2 < _SL1;
-}
-
-template <class _Tp, class _Alloc>
-inline bool
-operator<=(const slist<_Tp,_Alloc>& _SL1, const slist<_Tp,_Alloc>& _SL2) {
-  return !(_SL2 < _SL1);
-}
-
-template <class _Tp, class _Alloc>
-inline bool
-operator>=(const slist<_Tp,_Alloc>& _SL1, const slist<_Tp,_Alloc>& _SL2) {
-  return !(_SL1 < _SL2);
-}
-
-template <class _Tp, class _Alloc>
-inline void swap(slist<_Tp,_Alloc>& __x, slist<_Tp,_Alloc>& __y) {
-  __x.swap(__y);
-}
-
-
-template <class _Tp, class _Alloc>
-void slist<_Tp,_Alloc>::resize(size_type __len, const _Tp& __x)
-{
-  _Node_base* __cur = &this->_M_head;
-  while (__cur->_M_next != 0 && __len > 0) {
-    --__len;
-    __cur = __cur->_M_next;
-  }
-  if (__cur->_M_next)
-    this->_M_erase_after(__cur, 0);
-  else
-    _M_insert_after_fill(__cur, __len, __x);
-}
-
-template <class _Tp, class _Alloc>
-void slist<_Tp,_Alloc>::remove(const _Tp& __val)
-{
-  _Node_base* __cur = &this->_M_head;
-  while (__cur && __cur->_M_next) {
-    if (((_Node*) __cur->_M_next)->_M_data == __val)
-      this->_M_erase_after(__cur);
-    else
-      __cur = __cur->_M_next;
-  }
-}
-
-template <class _Tp, class _Alloc>
-void slist<_Tp,_Alloc>::unique()
-{
-  _Node_base* __cur = this->_M_head._M_next;
-  if (__cur) {
-    while (__cur->_M_next) {
-      if (((_Node*)__cur)->_M_data ==
-          ((_Node*)(__cur->_M_next))->_M_data)
-        this->_M_erase_after(__cur);
-      else
-        __cur = __cur->_M_next;
-    }
-  }
-}
-
-template <class _Tp, class _Alloc>
-void slist<_Tp,_Alloc>::merge(slist<_Tp,_Alloc>& __x)
-{
-  _Node_base* __n1 = &this->_M_head;
-  while (__n1->_M_next && __x._M_head._M_next) {
-    if (((_Node*) __x._M_head._M_next)->_M_data <
-        ((_Node*)       __n1->_M_next)->_M_data)
-      __slist_splice_after(__n1, &__x._M_head, __x._M_head._M_next);
-    __n1 = __n1->_M_next;
-  }
-  if (__x._M_head._M_next) {
-    __n1->_M_next = __x._M_head._M_next;
-    __x._M_head._M_next = 0;
-  }
-}
-
-template <class _Tp, class _Alloc>
-void slist<_Tp,_Alloc>::sort()
-{
-  if (this->_M_head._M_next && this->_M_head._M_next->_M_next) {
-    slist __carry;
-    slist __counter[64];
-    int __fill = 0;
-    while (!empty()) {
-      __slist_splice_after(&__carry._M_head,
-                           &this->_M_head, this->_M_head._M_next);
-      int __i = 0;
-      while (__i < __fill && !__counter[__i].empty()) {
-        __counter[__i].merge(__carry);
-        __carry.swap(__counter[__i]);
-        ++__i;
-      }
-      __carry.swap(__counter[__i]);
-      if (__i == __fill)
-        ++__fill;
-    }
-
-    for (int __i = 1; __i < __fill; ++__i)
-      __counter[__i].merge(__counter[__i-1]);
-    this->swap(__counter[__fill-1]);
-  }
-}
-
-template <class _Tp, class _Alloc>
-template <class _Predicate>
-void slist<_Tp,_Alloc>::remove_if(_Predicate __pred)
-{
-  _Node_base* __cur = &this->_M_head;
-  while (__cur->_M_next) {
-    if (__pred(((_Node*) __cur->_M_next)->_M_data))
-      this->_M_erase_after(__cur);
-    else
-      __cur = __cur->_M_next;
-  }
-}
-
-template <class _Tp, class _Alloc> template <class _BinaryPredicate>
-void slist<_Tp,_Alloc>::unique(_BinaryPredicate __pred)
-{
-  _Node* __cur = (_Node*) this->_M_head._M_next;
-  if (__cur) {
-    while (__cur->_M_next) {
-      if (__pred(((_Node*)__cur)->_M_data,
-                 ((_Node*)(__cur->_M_next))->_M_data))
-        this->_M_erase_after(__cur);
-      else
-        __cur = (_Node*) __cur->_M_next;
-    }
-  }
-}
-
-template <class _Tp, class _Alloc> template <class _StrictWeakOrdering>
-void slist<_Tp,_Alloc>::merge(slist<_Tp,_Alloc>& __x,
-                              _StrictWeakOrdering __comp)
-{
-  _Node_base* __n1 = &this->_M_head;
-  while (__n1->_M_next && __x._M_head._M_next) {
-    if (__comp(((_Node*) __x._M_head._M_next)->_M_data,
-               ((_Node*)       __n1->_M_next)->_M_data))
-      __slist_splice_after(__n1, &__x._M_head, __x._M_head._M_next);
-    __n1 = __n1->_M_next;
-  }
-  if (__x._M_head._M_next) {
-    __n1->_M_next = __x._M_head._M_next;
-    __x._M_head._M_next = 0;
-  }
-}
-
-template <class _Tp, class _Alloc> template <class _StrictWeakOrdering>
-void slist<_Tp,_Alloc>::sort(_StrictWeakOrdering __comp)
-{
-  if (this->_M_head._M_next && this->_M_head._M_next->_M_next) {
-    slist __carry;
-    slist __counter[64];
-    int __fill = 0;
-    while (!empty()) {
-      __slist_splice_after(&__carry._M_head,
-                           &this->_M_head, this->_M_head._M_next);
-      int __i = 0;
-      while (__i < __fill && !__counter[__i].empty()) {
-        __counter[__i].merge(__carry, __comp);
-        __carry.swap(__counter[__i]);
-        ++__i;
-      }
-      __carry.swap(__counter[__i]);
-      if (__i == __fill)
-        ++__fill;
-    }
-
-    for (int __i = 1; __i < __fill; ++__i)
-      __counter[__i].merge(__counter[__i-1], __comp);
-    this->swap(__counter[__fill-1]);
-  }
-}
-
-} // namespace __gnu_cxx
-
-namespace std
-{
-// Specialization of insert_iterator so that insertions will be constant
-// time rather than linear time.
-
-template <class _Tp, class _Alloc>
-class insert_iterator<__gnu_cxx::slist<_Tp, _Alloc> > {
-protected:
-  typedef __gnu_cxx::slist<_Tp, _Alloc> _Container;
-  _Container* container;
-  typename _Container::iterator iter;
-public:
-  typedef _Container          container_type;
-  typedef output_iterator_tag iterator_category;
-  typedef void                value_type;
-  typedef void                difference_type;
-  typedef void                pointer;
-  typedef void                reference;
-
-  insert_iterator(_Container& __x, typename _Container::iterator __i)
-    : container(&__x) {
-    if (__i == __x.begin())
-      iter = __x.before_begin();
-    else
-      iter = __x.previous(__i);
-  }
-
-  insert_iterator<_Container>&
-  operator=(const typename _Container::value_type& __value) {
-    iter = container->insert_after(iter, __value);
-    return *this;
-  }
-  insert_iterator<_Container>& operator*() { return *this; }
-  insert_iterator<_Container>& operator++() { return *this; }
-  insert_iterator<_Container>& operator++(int) { return *this; }
-};
-
-} // namespace std
-
-#endif
diff --git a/include.new/c++/3.4/ext/stdio_filebuf.h b/include.new/c++/3.4/ext/stdio_filebuf.h
deleted file mode 100644
index cc22972..0000000
--- a/include.new/c++/3.4/ext/stdio_filebuf.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// File descriptor layer for filebuf -*- C++ -*-
-
-// Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file ext/stdio_filebuf.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _STDIO_FILEBUF_H
-#define _STDIO_FILEBUF_H 1
-
-#pragma GCC system_header
-
-#include <fstream>
-
-namespace __gnu_cxx
-{
-  /**
-   *  @class stdio_filebuf ext/stdio_filebuf.h <ext/stdio_filebuf.h>
-   *  @brief Provides a layer of compatibility for C/POSIX.
-   *
-   *  This GNU extension provides extensions for working with standard C
-   *  FILE*'s and POSIX file descriptors.  It must be instantiated by the
-   *  user with the type of character used in the file stream, e.g.,
-   *  stdio_filebuf<char>.
-  */
-  template<typename _CharT, typename _Traits = std::char_traits<_CharT> >
-    class stdio_filebuf : public std::basic_filebuf<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT				        char_type;
-      typedef _Traits				        traits_type;
-      typedef typename traits_type::int_type		int_type;
-      typedef typename traits_type::pos_type		pos_type;
-      typedef typename traits_type::off_type		off_type;
-      typedef std::size_t                               size_t;
-
-    public:
-      /**
-       * deferred initialization
-      */
-      stdio_filebuf() : std::basic_filebuf<_CharT, _Traits>() {}
-
-      /**
-       *  @param  fd  An open file descriptor.
-       *  @param  mode  Same meaning as in a standard filebuf.
-       *  @param  size  Optimal or preferred size of internal buffer, in chars.
-       *
-       *  This constructor associates a file stream buffer with an open
-       *  POSIX file descriptor. The file descriptor will be automatically
-       *  closed when the stdio_filebuf is closed/destroyed.
-      */
-      stdio_filebuf(int __fd, std::ios_base::openmode __mode,
-		    size_t __size = static_cast<size_t>(BUFSIZ));
-
-      /**
-       *  @param  f  An open @c FILE*.
-       *  @param  mode  Same meaning as in a standard filebuf.
-       *  @param  size  Optimal or preferred size of internal buffer, in chars.
-       *                Defaults to system's @c BUFSIZ.
-       *
-       *  This constructor associates a file stream buffer with an open
-       *  C @c FILE*.  The @c FILE* will not be automatically closed when the
-       *  stdio_filebuf is closed/destroyed.
-      */
-      stdio_filebuf(std::__c_file* __f, std::ios_base::openmode __mode,
-		    size_t __size = static_cast<size_t>(BUFSIZ));
-
-      /**
-       *  Closes the external data stream if the file descriptor constructor
-       *  was used.
-      */
-      virtual
-      ~stdio_filebuf();
-
-      /**
-       *  @return  The underlying file descriptor.
-       *
-       *  Once associated with an external data stream, this function can be
-       *  used to access the underlying POSIX file descriptor.  Note that
-       *  there is no way for the library to track what you do with the
-       *  descriptor, so be careful.
-      */
-      int
-      fd() { return this->_M_file.fd(); }
-
-      /**
-       *  @return  The underlying FILE*.
-       *
-       *  This function can be used to access the underlying "C" file pointer.
-       *  Note that there is no way for the library to track what you do
-       *  with the file, so be careful.
-       */
-      std::__c_file*
-      file() { return this->_M_file.file(); }
-    };
-
-  template<typename _CharT, typename _Traits>
-    stdio_filebuf<_CharT, _Traits>::~stdio_filebuf()
-    { }
-
-  template<typename _CharT, typename _Traits>
-    stdio_filebuf<_CharT, _Traits>::
-    stdio_filebuf(int __fd, std::ios_base::openmode __mode, size_t __size)
-    {
-      this->_M_file.sys_open(__fd, __mode);
-      if (this->is_open())
-	{
-	  this->_M_mode = __mode;
-	  this->_M_buf_size = __size;
-	  this->_M_allocate_internal_buffer();
-	  this->_M_reading = false;
-	  this->_M_writing = false;
-	  this->_M_set_buffer(-1);
-	}
-    }
-
-  template<typename _CharT, typename _Traits>
-    stdio_filebuf<_CharT, _Traits>::
-    stdio_filebuf(std::__c_file* __f, std::ios_base::openmode __mode,
-		  size_t __size)
-    {
-      this->_M_file.sys_open(__f, __mode);
-      if (this->is_open())
-	{
-	  this->_M_mode = __mode;
-	  this->_M_buf_size = __size;
-	  this->_M_allocate_internal_buffer();
-	  this->_M_reading = false;
-	  this->_M_writing = false;
-	  this->_M_set_buffer(-1);
-	}
-    }
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/ext/stdio_sync_filebuf.h b/include.new/c++/3.4/ext/stdio_sync_filebuf.h
deleted file mode 100644
index 367d310..0000000
--- a/include.new/c++/3.4/ext/stdio_sync_filebuf.h
+++ /dev/null
@@ -1,281 +0,0 @@
-// Iostreams wrapper for stdio FILE* -*- C++ -*-
-
-// Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file ext/stdiostream.h
- *  This file is a GNU extension to the Standard C++ Library.
- */
-
-#ifndef _STDIO_SYNC_FILEBUF_H
-#define _STDIO_SYNC_FILEBUF_H 1
-
-#pragma GCC system_header
-
-#include <streambuf>
-#include <unistd.h>
-#include <cstdio>
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-#include <cwchar>
-#endif
-
-namespace __gnu_cxx
-{
-  template<typename _CharT, typename _Traits = std::char_traits<_CharT> >
-    class stdio_sync_filebuf : public std::basic_streambuf<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT					char_type;
-      typedef _Traits					traits_type;
-      typedef typename traits_type::int_type		int_type;
-      typedef typename traits_type::pos_type		pos_type;
-      typedef typename traits_type::off_type		off_type;
-
-    private:
-      // Underlying stdio FILE
-      std::__c_file* const _M_file;
-
-      // Last character gotten. This is used when pbackfail is
-      // called from basic_streambuf::sungetc()
-      int_type _M_unget_buf;
-
-    public:
-      explicit
-      stdio_sync_filebuf(std::__c_file* __f)
-      : _M_file(__f), _M_unget_buf(traits_type::eof())
-      { }
-
-      /**
-       *  @return  The underlying FILE*.
-       *
-       *  This function can be used to access the underlying "C" file pointer.
-       *  Note that there is no way for the library to track what you do
-       *  with the file, so be careful.
-       */
-      std::__c_file* const
-      file() { return this->_M_file; }
-
-    protected:
-      int_type
-      syncgetc();
-
-      int_type
-      syncungetc(int_type __c);
-
-      int_type
-      syncputc(int_type __c);
-
-      virtual int_type
-      underflow()
-      {
-	int_type __c = this->syncgetc();
-	return this->syncungetc(__c);
-      }
-
-      virtual int_type
-      uflow()
-      {
-	// Store the gotten character in case we need to unget it.
-	_M_unget_buf = this->syncgetc();
-	return _M_unget_buf;
-      }
-
-      virtual int_type
-      pbackfail(int_type __c = traits_type::eof())
-      {
-	int_type __ret;
-	const int_type __eof = traits_type::eof();
-
-	// Check if the unget or putback was requested
-	if (traits_type::eq_int_type(__c, __eof)) // unget
-	  {
-	    if (!traits_type::eq_int_type(_M_unget_buf, __eof))
-	      __ret = this->syncungetc(_M_unget_buf);
-	    else // buffer invalid, fail.
-	      __ret = __eof;
-	  }
-	else // putback
-	  __ret = this->syncungetc(__c);
-
-	// The buffered character is no longer valid, discard it.
-	_M_unget_buf = __eof;
-	return __ret;
-      }
-
-      virtual std::streamsize
-      xsgetn(char_type* __s, std::streamsize __n);
-
-      virtual int_type
-      overflow(int_type __c = traits_type::eof())
-      {
-	int_type __ret;
-	if (traits_type::eq_int_type(__c, traits_type::eof()))
-	  {
-	    if (std::fflush(_M_file))
-	      __ret = traits_type::eof();
-	    else
-	      __ret = traits_type::not_eof(__c);
-	  }
-	else
-	  __ret = this->syncputc(__c);
-	return __ret;
-      }
-
-      virtual std::streamsize
-      xsputn(const char_type* __s, std::streamsize __n);
-
-      virtual int
-      sync()
-      { return std::fflush(_M_file); }
-
-      virtual std::streampos
-      seekoff(std::streamoff __off, std::ios_base::seekdir __dir,
-	      std::ios_base::openmode = std::ios_base::in | std::ios_base::out)
-      {
-	std::streampos __ret(std::streamoff(-1));
-	int __whence;
-	if (__dir == std::ios_base::beg)
-	  __whence = SEEK_SET;
-	else if (__dir == std::ios_base::cur)
-	  __whence = SEEK_CUR;
-	else
-	  __whence = SEEK_END;
-#ifdef _GLIBCXX_USE_LFS
-	if (!fseeko64(_M_file, __off, __whence))
-	  __ret = std::streampos(ftello64(_M_file));
-#else
-	if (!fseek(_M_file, __off, __whence))
-	  __ret = std::streampos(std::ftell(_M_file));
-#endif
-	return __ret;
-      }
-
-      virtual std::streampos
-      seekpos(std::streampos __pos,
-	      std::ios_base::openmode __mode =
-	      std::ios_base::in | std::ios_base::out)
-      { return seekoff(std::streamoff(__pos), std::ios_base::beg, __mode); }
-    };
-
-  template<>
-    inline stdio_sync_filebuf<char>::int_type
-    stdio_sync_filebuf<char>::syncgetc()
-    { return std::getc(_M_file); }
-
-  template<>
-    inline stdio_sync_filebuf<char>::int_type
-    stdio_sync_filebuf<char>::syncungetc(int_type __c)
-    { return std::ungetc(__c, _M_file); }
-
-  template<>
-    inline stdio_sync_filebuf<char>::int_type
-    stdio_sync_filebuf<char>::syncputc(int_type __c)
-    { return std::putc(__c, _M_file); }
-
-  template<>
-    inline std::streamsize
-    stdio_sync_filebuf<char>::xsgetn(char* __s, std::streamsize __n)
-    {
-      std::streamsize __ret = std::fread(__s, 1, __n, _M_file);
-      if (__ret > 0)
-	_M_unget_buf = traits_type::to_int_type(__s[__ret - 1]);
-      else
-	_M_unget_buf = traits_type::eof();
-      return __ret;
-    }
-
-  template<>
-    inline std::streamsize
-    stdio_sync_filebuf<char>::xsputn(const char* __s, std::streamsize __n)
-    { return std::fwrite(__s, 1, __n, _M_file); }
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  template<>
-    inline stdio_sync_filebuf<wchar_t>::int_type
-    stdio_sync_filebuf<wchar_t>::syncgetc()
-    { return std::getwc(_M_file); }
-
-  template<>
-    inline stdio_sync_filebuf<wchar_t>::int_type
-    stdio_sync_filebuf<wchar_t>::syncungetc(int_type __c)
-    { return std::ungetwc(__c, _M_file); }
-
-  template<>
-    inline stdio_sync_filebuf<wchar_t>::int_type
-    stdio_sync_filebuf<wchar_t>::syncputc(int_type __c)
-    { return std::putwc(__c, _M_file); }
-
-  template<>
-    inline std::streamsize
-    stdio_sync_filebuf<wchar_t>::xsgetn(wchar_t* __s, std::streamsize __n)
-    {
-      std::streamsize __ret = 0;
-      const int_type __eof = traits_type::eof();
-      while (__n--)
-	{
-	  int_type __c = this->syncgetc();
-	  if (traits_type::eq_int_type(__c, __eof))
-	    break;
-	  __s[__ret] = traits_type::to_char_type(__c);
-	  ++__ret;
-	}
-
-      if (__ret > 0)
-	_M_unget_buf = traits_type::to_int_type(__s[__ret - 1]);
-      else
-	_M_unget_buf = traits_type::eof();
-      return __ret;
-    }
-
-  template<>
-    inline std::streamsize
-    stdio_sync_filebuf<wchar_t>::xsputn(const wchar_t* __s,
-					std::streamsize __n)
-    {
-      std::streamsize __ret = 0;
-      const int_type __eof = traits_type::eof();
-      while (__n--)
-	{
-	  if (traits_type::eq_int_type(this->syncputc(*__s++), __eof))
-	    break;
-	  ++__ret;
-	}
-      return __ret;
-    }
-#endif
-
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template class stdio_sync_filebuf<char>;
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template class stdio_sync_filebuf<wchar_t>;
-#endif
-#endif
-} // namespace __gnu_cxx
-
-#endif
diff --git a/include.new/c++/3.4/fstream b/include.new/c++/3.4/fstream
deleted file mode 100644
index 3dec366..0000000
--- a/include.new/c++/3.4/fstream
+++ /dev/null
@@ -1,843 +0,0 @@
-// File based streams -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.8  File-based streams
-//
-
-/** @file fstream
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_FSTREAM
-#define _GLIBCXX_FSTREAM 1
-
-#pragma GCC system_header
-
-#include <istream>
-#include <ostream>
-#include <locale>	// For codecvt
-#include <cstdio>       // For SEEK_SET, SEEK_CUR, SEEK_END, BUFSIZ     
-#include <bits/basic_file.h>
-#include <bits/gthr.h>
-
-namespace std
-{
-  // [27.8.1.1] template class basic_filebuf
-  /**
-   *  @brief  The actual work of input and output (for files).
-   *
-   *  This class associates both its input and output sequence with an
-   *  external disk file, and maintains a joint file position for both
-   *  sequences.  Many of its sematics are described in terms of similar
-   *  behavior in the Standard C Library's @c FILE streams.
-  */
-  // Requirements on traits_type, specific to this class:
-  // traits_type::pos_type must be fpos<traits_type::state_type>
-  // traits_type::off_type must be streamoff
-  // traits_type::state_type must be Assignable and DefaultConstructable,
-  // and traits_type::state_type() must be the initial state for codecvt.
-  template<typename _CharT, typename _Traits>
-    class basic_filebuf : public basic_streambuf<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT                     	        char_type;
-      typedef _Traits                    	        traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      //@{
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      typedef basic_streambuf<char_type, traits_type>  	__streambuf_type;
-      typedef basic_filebuf<char_type, traits_type>     __filebuf_type;
-      typedef __basic_file<char>		        __file_type;
-      typedef typename traits_type::state_type          __state_type;
-      typedef codecvt<char_type, char, __state_type>    __codecvt_type;
-      //@}
-
-      friend class ios_base; // For sync_with_stdio.
-
-    protected:
-      // Data Members:
-      // MT lock inherited from libio or other low-level io library.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __c_lock          	_M_lock;
-
-      // External buffer.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __file_type 		_M_file;
-
-      /**
-       *  @if maint
-       *  Place to stash in || out || in | out settings for current filebuf.
-       *  @endif
-      */
-      ios_base::openmode 	_M_mode;
-
-      // Beginning state type for codecvt.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __state_type 		_M_state_beg;
-
-      // During output, the state that corresponds to pptr(),
-      // during input, the state that corresponds to egptr() and
-      // _M_ext_next.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __state_type		_M_state_cur;
-
-      // Not used for output. During input, the state that corresponds
-      // to eback() and _M_ext_buf.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __state_type		_M_state_last;
-
-      /**
-       *  @if maint
-       *  Pointer to the beginning of internal buffer.
-       *  @endif
-      */
-      char_type*		_M_buf; 	
-
-      /**
-       *  @if maint
-       *  Actual size of internal buffer. This number is equal to the size
-       *  of the put area + 1 position, reserved for the overflow char of
-       *  a full area.
-       *  @endif
-      */
-      size_t			_M_buf_size;
-
-      // Set iff _M_buf is allocated memory from _M_allocate_internal_buffer.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      bool			_M_buf_allocated;
-
-      /**
-       *  @if maint
-       *  _M_reading == false && _M_writing == false for 'uncommitted' mode;  
-       *  _M_reading == true for 'read' mode;
-       *  _M_writing == true for 'write' mode;
-       *
-       *  NB: _M_reading == true && _M_writing == true is unused.
-       *  @endif
-      */ 
-      bool                      _M_reading;
-      bool                      _M_writing;
-
-      //@{
-      /**
-       *  @if maint
-       *  Necessary bits for putback buffer management.
-       *
-       *  @note pbacks of over one character are not currently supported.
-       *  @endif
-      */
-      char_type			_M_pback; 
-      char_type*		_M_pback_cur_save;
-      char_type*		_M_pback_end_save;
-      bool			_M_pback_init; 
-      //@}
-
-      // Cached codecvt facet.
-      const __codecvt_type* 	_M_codecvt;
-
-      /**
-       *  @if maint
-       *  Buffer for external characters. Used for input when
-       *  codecvt::always_noconv() == false. When valid, this corresponds
-       *  to eback().
-       *  @endif
-      */ 
-      char*			_M_ext_buf;
-
-      /**
-       *  @if maint
-       *  Size of buffer held by _M_ext_buf.
-       *  @endif
-      */ 
-      streamsize		_M_ext_buf_size;
-
-      /**
-       *  @if maint
-       *  Pointers into the buffer held by _M_ext_buf that delimit a
-       *  subsequence of bytes that have been read but not yet converted.
-       *  When valid, _M_ext_next corresponds to egptr().
-       *  @endif
-      */ 
-      const char*		_M_ext_next;
-      char*			_M_ext_end;
-
-      /**
-       *  @if maint
-       *  Initializes pback buffers, and moves normal buffers to safety.
-       *  Assumptions:
-       *  _M_in_cur has already been moved back
-       *  @endif
-      */
-      void
-      _M_create_pback()
-      {
-	if (!_M_pback_init)
-	  {
-	    _M_pback_cur_save = this->gptr();
-	    _M_pback_end_save = this->egptr();
-	    this->setg(&_M_pback, &_M_pback, &_M_pback + 1);
-	    _M_pback_init = true;
-	  }
-      }
-
-      /**
-       *  @if maint
-       *  Deactivates pback buffer contents, and restores normal buffer.
-       *  Assumptions:
-       *  The pback buffer has only moved forward.
-       *  @endif
-      */ 
-      void
-      _M_destroy_pback() throw()
-      {
-	if (_M_pback_init)
-	  {
-	    // Length _M_in_cur moved in the pback buffer.
-	    _M_pback_cur_save += this->gptr() != this->eback();
-	    this->setg(this->_M_buf, _M_pback_cur_save, _M_pback_end_save);
-	    _M_pback_init = false;
-	  }
-      }
-
-    public:
-      // Constructors/destructor:
-      /**
-       *  @brief  Does not open any files.
-       *
-       *  The default constructor initializes the parent class using its
-       *  own default ctor.
-      */
-      basic_filebuf();
-
-      /**
-       *  @brief  The destructor closes the file first.
-      */
-      virtual
-      ~basic_filebuf()
-      { this->close(); }
-
-      // Members:
-      /**
-       *  @brief  Returns true if the external file is open.
-      */
-      bool
-      is_open() const throw() { return _M_file.is_open(); }
-
-      /**
-       *  @brief  Opens an external file.
-       *  @param  s  The name of the file.
-       *  @param  mode  The open mode flags.
-       *  @return  @c this on success, NULL on failure
-       *
-       *  If a file is already open, this function immediately fails.
-       *  Otherwise it tries to open the file named @a s using the flags
-       *  given in @a mode.
-       *
-       *  [Table 92 gives the relation between openmode combinations and the
-       *  equivalent fopen() flags, but the table has not been copied yet.]
-      */
-      __filebuf_type*
-      open(const char* __s, ios_base::openmode __mode);
-
-      /**
-       *  @brief  Closes the currently associated file.
-       *  @return  @c this on success, NULL on failure
-       *
-       *  If no file is currently open, this function immediately fails.
-       *
-       *  If a "put buffer area" exists, @c overflow(eof) is called to flush
-       *  all the characters.  The file is then closed.
-       *
-       *  If any operations fail, this function also fails.
-      */
-      __filebuf_type*
-      close() throw();
-
-    protected:
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      void
-      _M_allocate_internal_buffer();
-
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      void
-      _M_destroy_internal_buffer() throw();
-
-      // [27.8.1.4] overridden virtual functions
-      // [documentation is inherited]
-      virtual streamsize
-      showmanyc();
-
-      // Stroustrup, 1998, p. 628
-      // underflow() and uflow() functions are called to get the next
-      // charater from the real input source when the buffer is empty.
-      // Buffered input uses underflow()
-
-      // [documentation is inherited]
-      virtual int_type
-      underflow();
-
-      // [documentation is inherited]
-      virtual int_type
-      pbackfail(int_type __c = _Traits::eof());
-
-      // Stroustrup, 1998, p 648
-      // The overflow() function is called to transfer characters to the
-      // real output destination when the buffer is full. A call to
-      // overflow(c) outputs the contents of the buffer plus the
-      // character c.
-      // 27.5.2.4.5
-      // Consume some sequence of the characters in the pending sequence.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      virtual int_type
-      overflow(int_type __c = _Traits::eof());
-
-      // Convert internal byte sequence to external, char-based
-      // sequence via codecvt.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      bool
-      _M_convert_to_external(char_type*, streamsize);
-
-      /**
-       *  @brief  Manipulates the buffer.
-       *  @param  s  Pointer to a buffer area.
-       *  @param  n  Size of @a s.
-       *  @return  @c this
-       *
-       *  If no file has been opened, and both @a s and @a n are zero, then
-       *  the stream becomes unbuffered.  Otherwise, @c s is used as a
-       *  buffer; see
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#2
-       *  for more.
-      */
-      virtual __streambuf_type*
-      setbuf(char_type* __s, streamsize __n);
-
-      // [documentation is inherited]
-      virtual pos_type
-      seekoff(off_type __off, ios_base::seekdir __way,
-	      ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      // [documentation is inherited]
-      virtual pos_type
-      seekpos(pos_type __pos,
-	      ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      // Common code for seekoff and seekpos
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      pos_type
-      _M_seek(off_type __off, ios_base::seekdir __way, __state_type __state);
-
-      // [documentation is inherited]
-      virtual int
-      sync();
-
-      // [documentation is inherited]
-      virtual void
-      imbue(const locale& __loc);
-
-      // [documentation is inherited]
-      virtual streamsize
-      xsgetn(char_type* __s, streamsize __n);
-
-      // [documentation is inherited]
-      virtual streamsize
-      xsputn(const char_type* __s, streamsize __n);
-
-      // Flushes output buffer, then writes unshift sequence.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      bool
-      _M_terminate_output();
-
-      /**
-       *  @if maint 
-       *  This function sets the pointers of the internal buffer, both get
-       *  and put areas. Typically:
-       *
-       *   __off == egptr() - eback() upon underflow/uflow ('read' mode);
-       *   __off == 0 upon overflow ('write' mode);
-       *   __off == -1 upon open, setbuf, seekoff/pos ('uncommitted' mode).
-       * 
-       *  NB: epptr() - pbase() == _M_buf_size - 1, since _M_buf_size
-       *  reflects the actual allocated memory and the last cell is reserved
-       *  for the overflow char of a full put area.
-       *  @endif
-      */
-      void
-      _M_set_buffer(streamsize __off)
-      {
- 	const bool __testin = this->_M_mode & ios_base::in;
- 	const bool __testout = this->_M_mode & ios_base::out;
-	
-	if (__testin && __off > 0)
-	  this->setg(this->_M_buf, this->_M_buf, this->_M_buf + __off);
-	else
-	  this->setg(this->_M_buf, this->_M_buf, this->_M_buf);
-
-	if (__testout && __off == 0 && this->_M_buf_size > 1 )
-	  this->setp(this->_M_buf, this->_M_buf + this->_M_buf_size - 1);
-	else
-	  this->setp(NULL, NULL);
-      }
-    };
-
-  // [27.8.1.5] Template class basic_ifstream
-  /**
-   *  @brief  Controlling input for files.
-   *
-   *  This class supports reading from named files, using the inherited
-   *  functions from std::basic_istream.  To control the associated
-   *  sequence, an instance of std::basic_filebuf is used, which this page
-   *  refers to as @c sb.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_ifstream : public basic_istream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_filebuf<char_type, traits_type> 	__filebuf_type;
-      typedef basic_istream<char_type, traits_type>	__istream_type;
-
-    private:
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __filebuf_type	_M_filebuf;
-
-    public:
-      // Constructors/Destructors:
-      /**
-       *  @brief  Default constructor.
-       *
-       *  Initializes @c sb using its default constructor, and passes
-       *  @c &sb to the base class initializer.  Does not open any files
-       *  (you haven't given it a filename to open).
-      */
-      basic_ifstream() : __istream_type(), _M_filebuf()
-      { this->init(&_M_filebuf); }
-
-      /**
-       *  @brief  Create an input file stream.
-       *  @param  s  Null terminated string specifying the filename.
-       *  @param  mode  Open file in specified mode (see std::ios_base).
-       *
-       *  @c ios_base::in is automatically included in @a mode.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-      */
-      explicit
-      basic_ifstream(const char* __s, ios_base::openmode __mode = ios_base::in)
-      : __istream_type(), _M_filebuf()
-      {
-	this->init(&_M_filebuf);
-	this->open(__s, __mode);
-      }
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The file is closed by the filebuf object, not the formatting
-       *  stream.
-      */
-      ~basic_ifstream()
-      { }
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_filebuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-      */
-      __filebuf_type*
-      rdbuf() const
-      { return const_cast<__filebuf_type*>(&_M_filebuf); }
-
-      /**
-       *  @brief  Wrapper to test for an open file.
-       *  @return  @c rdbuf()->is_open()
-      */
-      bool
-      is_open() { return _M_filebuf.is_open(); }
-
-      /**
-       *  @brief  Opens an external file.
-       *  @param  s  The name of the file.
-       *  @param  mode  The open mode flags.
-       *
-       *  Calls @c std::basic_filebuf::open(s,mode|in).  If that function
-       *  fails, @c failbit is set in the stream's error state.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-      */
-      void
-      open(const char* __s, ios_base::openmode __mode = ios_base::in)
-      {
-	if (!_M_filebuf.open(__s, __mode | ios_base::in))
-	  this->setstate(ios_base::failbit);
-      }
-
-      /**
-       *  @brief  Close the file.
-       *
-       *  Calls @c std::basic_filebuf::close().  If that function
-       *  fails, @c failbit is set in the stream's error state.
-      */
-      void
-      close()
-      {
-	if (!_M_filebuf.close())
-	  this->setstate(ios_base::failbit);
-      }
-    };
-
-
-  // [27.8.1.8] Template class basic_ofstream
-  /**
-   *  @brief  Controlling output for files.
-   *
-   *  This class supports reading from named files, using the inherited
-   *  functions from std::basic_ostream.  To control the associated
-   *  sequence, an instance of std::basic_filebuf is used, which this page
-   *  refers to as @c sb.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_ofstream : public basic_ostream<_CharT,_Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_filebuf<char_type, traits_type> 	__filebuf_type;
-      typedef basic_ostream<char_type, traits_type>	__ostream_type;
-
-    private:
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __filebuf_type	_M_filebuf;
-
-    public:
-      // Constructors:
-      /**
-       *  @brief  Default constructor.
-       *
-       *  Initializes @c sb using its default constructor, and passes
-       *  @c &sb to the base class initializer.  Does not open any files
-       *  (you haven't given it a filename to open).
-      */
-      basic_ofstream(): __ostream_type(), _M_filebuf()
-      { this->init(&_M_filebuf); }
-
-      /**
-       *  @brief  Create an output file stream.
-       *  @param  s  Null terminated string specifying the filename.
-       *  @param  mode  Open file in specified mode (see std::ios_base).
-       *
-       *  @c ios_base::out|ios_base::trunc is automatically included in
-       *  @a mode.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-      */
-      explicit
-      basic_ofstream(const char* __s,
-		     ios_base::openmode __mode = ios_base::out|ios_base::trunc)
-      : __ostream_type(), _M_filebuf()
-      {
-	this->init(&_M_filebuf);
-	this->open(__s, __mode);
-      }
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The file is closed by the filebuf object, not the formatting
-       *  stream.
-      */
-      ~basic_ofstream()
-      { }
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_filebuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-      */
-      __filebuf_type*
-      rdbuf() const
-      { return const_cast<__filebuf_type*>(&_M_filebuf); }
-
-      /**
-       *  @brief  Wrapper to test for an open file.
-       *  @return  @c rdbuf()->is_open()
-      */
-      bool
-      is_open() { return _M_filebuf.is_open(); }
-
-      /**
-       *  @brief  Opens an external file.
-       *  @param  s  The name of the file.
-       *  @param  mode  The open mode flags.
-       *
-       *  Calls @c std::basic_filebuf::open(s,mode|out|trunc).  If that
-       *  function fails, @c failbit is set in the stream's error state.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-      */
-      void
-      open(const char* __s,
-	   ios_base::openmode __mode = ios_base::out | ios_base::trunc)
-      {
-	if (!_M_filebuf.open(__s, __mode | ios_base::out))
-	  this->setstate(ios_base::failbit);
-      }
-
-      /**
-       *  @brief  Close the file.
-       *
-       *  Calls @c std::basic_filebuf::close().  If that function
-       *  fails, @c failbit is set in the stream's error state.
-      */
-      void
-      close()
-      {
-	if (!_M_filebuf.close())
-	  this->setstate(ios_base::failbit);
-      }
-    };
-
-
-  // [27.8.1.11] Template class basic_fstream
-  /**
-   *  @brief  Controlling intput and output for files.
-   *
-   *  This class supports reading from and writing to named files, using
-   *  the inherited functions from std::basic_iostream.  To control the
-   *  associated sequence, an instance of std::basic_filebuf is used, which
-   *  this page refers to as @c sb.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_fstream : public basic_iostream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_filebuf<char_type, traits_type> 	__filebuf_type;
-      typedef basic_ios<char_type, traits_type>		__ios_type;
-      typedef basic_iostream<char_type, traits_type>	__iostream_type;
-
-    private:
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __filebuf_type	_M_filebuf;
-
-    public:
-      // Constructors/destructor:
-      /**
-       *  @brief  Default constructor.
-       *
-       *  Initializes @c sb using its default constructor, and passes
-       *  @c &sb to the base class initializer.  Does not open any files
-       *  (you haven't given it a filename to open).
-      */
-      basic_fstream()
-      : __iostream_type(), _M_filebuf()
-      { this->init(&_M_filebuf); }
-
-      /**
-       *  @brief  Create an input/output file stream.
-       *  @param  s  Null terminated string specifying the filename.
-       *  @param  mode  Open file in specified mode (see std::ios_base).
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-      */
-      explicit
-      basic_fstream(const char* __s,
-		    ios_base::openmode __mode = ios_base::in | ios_base::out)
-      : __iostream_type(NULL), _M_filebuf()
-      {
-	this->init(&_M_filebuf);
-	this->open(__s, __mode);
-      }
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The file is closed by the filebuf object, not the formatting
-       *  stream.
-      */
-      ~basic_fstream()
-      { }
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_filebuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-      */
-      __filebuf_type*
-      rdbuf() const
-      { return const_cast<__filebuf_type*>(&_M_filebuf); }
-
-      /**
-       *  @brief  Wrapper to test for an open file.
-       *  @return  @c rdbuf()->is_open()
-      */
-      bool
-      is_open() { return _M_filebuf.is_open(); }
-
-      /**
-       *  @brief  Opens an external file.
-       *  @param  s  The name of the file.
-       *  @param  mode  The open mode flags.
-       *
-       *  Calls @c std::basic_filebuf::open(s,mode).  If that
-       *  function fails, @c failbit is set in the stream's error state.
-       *
-       *  Tip:  When using std::string to hold the filename, you must use
-       *  .c_str() before passing it to this constructor.
-      */
-      void
-      open(const char* __s,
-	   ios_base::openmode __mode = ios_base::in | ios_base::out)
-      {
-	if (!_M_filebuf.open(__s, __mode))
-	  this->setstate(ios_base::failbit);
-      }
-
-      /**
-       *  @brief  Close the file.
-       *
-       *  Calls @c std::basic_filebuf::close().  If that function
-       *  fails, @c failbit is set in the stream's error state.
-      */
-      void
-      close()
-      {
-	if (!_M_filebuf.close())
-	  this->setstate(ios_base::failbit);
-      }
-    };
-} // namespace std
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/fstream.tcc>
-#endif
-
-#endif /* _GLIBCXX_FSTREAM */
diff --git a/include.new/c++/3.4/functional b/include.new/c++/3.4/functional
deleted file mode 100644
index 6819f20..0000000
--- a/include.new/c++/3.4/functional
+++ /dev/null
@@ -1,58 +0,0 @@
-// <functional> -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file functional
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_FUNCTIONAL
-#define _GLIBCXX_FUNCTIONAL 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <cstddef>
-#include <bits/stl_function.h>
-
-#endif /* _GLIBCXX_FUNCTIONAL */
diff --git a/include.new/c++/3.4/iomanip b/include.new/c++/3.4/iomanip
deleted file mode 100644
index 0d965c2..0000000
--- a/include.new/c++/3.4/iomanip
+++ /dev/null
@@ -1,300 +0,0 @@
-// Standard stream manipulators -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.6.3  Standard manipulators
-//
-
-/** @file iomanip
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_IOMANIP
-#define _GLIBCXX_IOMANIP 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <istream>
-#include <functional>
-
-namespace std
-{
-  // [27.6.3] standard manipulators
-  // Also see DR 183.
-
-  struct _Resetiosflags { ios_base::fmtflags _M_mask; };
-
-  /**
-   *  @brief  Manipulator for @c setf.
-   *  @param  mask  A format flags mask.
-   *
-   *  Sent to a stream object, this manipulator resets the specified flags,
-   *  via @e stream.setf(0,mask).
-  */
-  inline _Resetiosflags 
-  resetiosflags(ios_base::fmtflags __mask)
-  { 
-    _Resetiosflags __x; 
-    __x._M_mask = __mask; 
-    return __x; 
-  }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT,_Traits>& 
-    operator>>(basic_istream<_CharT,_Traits>& __is, _Resetiosflags __f)
-    { 
-      __is.setf(ios_base::fmtflags(0), __f._M_mask); 
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT,_Traits>& 
-    operator<<(basic_ostream<_CharT,_Traits>& __os, _Resetiosflags __f)
-    { 
-      __os.setf(ios_base::fmtflags(0), __f._M_mask); 
-      return __os; 
-    }
-
-
-  struct _Setiosflags { ios_base::fmtflags _M_mask; };
-
-  /**
-   *  @brief  Manipulator for @c setf.
-   *  @param  mask  A format flags mask.
-   *
-   *  Sent to a stream object, this manipulator sets the format flags
-   *  to @a mask.
-  */
-  inline _Setiosflags 
-  setiosflags(ios_base::fmtflags __mask)
-  { 
-    _Setiosflags __x; 
-    __x._M_mask = __mask; 
-    return __x; 
-  }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT,_Traits>& 
-    operator>>(basic_istream<_CharT,_Traits>& __is, _Setiosflags __f)
-    { 
-      __is.setf(__f._M_mask); 
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT,_Traits>& 
-    operator<<(basic_ostream<_CharT,_Traits>& __os, _Setiosflags __f)
-    { 
-      __os.setf(__f._M_mask); 
-      return __os; 
-    }
-
-
-  struct _Setbase { int _M_base; };
-
-  /**
-   *  @brief  Manipulator for @c setf.
-   *  @param  base  A numeric base.
-   *
-   *  Sent to a stream object, this manipulator changes the
-   *  @c ios_base::basefield flags to @c oct, @c dec, or @c hex when @a base
-   *  is 8, 10, or 16, accordingly, and to 0 if @a base is any other value.
-  */
-  inline _Setbase 
-  setbase(int __base)
-  { 
-    _Setbase __x; 
-    __x._M_base = __base; 
-    return __x; 
-  }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT,_Traits>& 
-    operator>>(basic_istream<_CharT,_Traits>& __is, _Setbase __f)
-    {
-      __is.setf(__f._M_base ==  8 ? ios_base::oct : 
-	      __f._M_base == 10 ? ios_base::dec : 
-	      __f._M_base == 16 ? ios_base::hex : 
-	      ios_base::fmtflags(0), ios_base::basefield);
-      return __is; 
-    }
-  
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT,_Traits>& 
-    operator<<(basic_ostream<_CharT,_Traits>& __os, _Setbase __f)
-    {
-      __os.setf(__f._M_base ==  8 ? ios_base::oct : 
-		__f._M_base == 10 ? ios_base::dec : 
-		__f._M_base == 16 ? ios_base::hex : 
-		ios_base::fmtflags(0), ios_base::basefield);
-      return __os; 
-    }
-  
-
-  template<typename _CharT> 
-    struct _Setfill { _CharT _M_c; };
-
-  /**
-   *  @brief  Manipulator for @c fill.
-   *  @param  c  The new fill character.
-   *
-   *  Sent to a stream object, this manipulator calls @c fill(c) for that
-   *  object.
-  */
-  template<typename _CharT> 
-    inline _Setfill<_CharT> 
-    setfill(_CharT __c)
-    { 
-      _Setfill<_CharT> __x; 
-      __x._M_c = __c; 
-      return __x; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT,_Traits>& 
-    operator>>(basic_istream<_CharT,_Traits>& __is, _Setfill<_CharT> __f)
-    { 
-      __is.fill(__f._M_c); 
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT,_Traits>& 
-    operator<<(basic_ostream<_CharT,_Traits>& __os, _Setfill<_CharT> __f)
-    { 
-      __os.fill(__f._M_c); 
-      return __os; 
-    }
-
-
-  struct _Setprecision { int _M_n; };
-
-  /**
-   *  @brief  Manipulator for @c precision.
-   *  @param  n  The new precision.
-   *
-   *  Sent to a stream object, this manipulator calls @c precision(n) for
-   *  that object.
-  */
-  inline _Setprecision 
-  setprecision(int __n)
-  { 
-    _Setprecision __x; 
-    __x._M_n = __n; 
-    return __x; 
-  }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT,_Traits>& 
-    operator>>(basic_istream<_CharT,_Traits>& __is, _Setprecision __f)
-    { 
-      __is.precision(__f._M_n); 
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT,_Traits>& 
-    operator<<(basic_ostream<_CharT,_Traits>& __os, _Setprecision __f)
-    { 
-      __os.precision(__f._M_n); 
-      return __os; 
-    }
-
-
-  struct _Setw { int _M_n; };
-
-  /**
-   *  @brief  Manipulator for @c width.
-   *  @param  n  The new width.
-   *
-   *  Sent to a stream object, this manipulator calls @c width(n) for
-   *  that object.
-  */
-  inline _Setw 
-  setw(int __n)
-  { 
-    _Setw __x; 
-    __x._M_n = __n; 
-    return __x; 
-  }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_istream<_CharT,_Traits>& 
-    operator>>(basic_istream<_CharT,_Traits>& __is, _Setw __f)
-    { 
-      __is.width(__f._M_n); 
-      return __is; 
-    }
-
-  template<typename _CharT, typename _Traits>
-    inline basic_ostream<_CharT,_Traits>& 
-    operator<<(basic_ostream<_CharT,_Traits>& __os, _Setw __f)
-    { 
-      __os.width(__f._M_n); 
-      return __os; 
-    }
-
-  // Inhibit implicit instantiations for required instantiations,
-  // which are defined via explicit instantiations elsewhere.  
-  // NB:  This syntax is a GNU extension.
-#if _GLIBCXX_EXTERN_TEMPLATE
-  extern template ostream& operator<<(ostream&, _Setfill<char>);
-  extern template ostream& operator<<(ostream&, _Setiosflags);
-  extern template ostream& operator<<(ostream&, _Resetiosflags);
-  extern template ostream& operator<<(ostream&, _Setbase);
-  extern template ostream& operator<<(ostream&, _Setprecision);
-  extern template ostream& operator<<(ostream&, _Setw);
-  extern template istream& operator>>(istream&, _Setfill<char>);
-  extern template istream& operator>>(istream&, _Setiosflags);
-  extern template istream& operator>>(istream&, _Resetiosflags);
-  extern template istream& operator>>(istream&, _Setbase);
-  extern template istream& operator>>(istream&, _Setprecision);
-  extern template istream& operator>>(istream&, _Setw);
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern template wostream& operator<<(wostream&, _Setfill<wchar_t>);
-  extern template wostream& operator<<(wostream&, _Setiosflags);
-  extern template wostream& operator<<(wostream&, _Resetiosflags);
-  extern template wostream& operator<<(wostream&, _Setbase);
-  extern template wostream& operator<<(wostream&, _Setprecision);
-  extern template wostream& operator<<(wostream&, _Setw);
-  extern template wistream& operator>>(wistream&, _Setfill<wchar_t>);
-  extern template wistream& operator>>(wistream&, _Setiosflags);
-  extern template wistream& operator>>(wistream&, _Resetiosflags);
-  extern template wistream& operator>>(wistream&, _Setbase);
-  extern template wistream& operator>>(wistream&, _Setprecision);
-  extern template wistream& operator>>(wistream&, _Setw);
-#endif
-#endif
-} // namespace std
-
-#endif /* _GLIBCXX_IOMANIP */
diff --git a/include.new/c++/3.4/ios b/include.new/c++/3.4/ios
deleted file mode 100644
index 596458f..0000000
--- a/include.new/c++/3.4/ios
+++ /dev/null
@@ -1,53 +0,0 @@
-// Iostreams base classes -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.4  Iostreams base classes
-//
-
-/** @file ios
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_IOS
-#define _GLIBCXX_IOS 1
-
-#pragma GCC system_header
-
-#include <iosfwd>
-#include <exception> 		// For ios_base::failure
-#include <bits/char_traits.h> 	// For char_traits, streamoff, streamsize, fpos
-#include <cstdio> 	// For SEEK_SET, SEEK_CUR, SEEK_END
-#include <bits/localefwd.h>	// For class locale
-#include <bits/ios_base.h>	// For ios_base declarations.
-#include <streambuf> 
-#include <bits/basic_ios.h>
-
-#endif	/* _GLIBCXX_IOS */
diff --git a/include.new/c++/3.4/iosfwd b/include.new/c++/3.4/iosfwd
deleted file mode 100644
index 050b9e8..0000000
--- a/include.new/c++/3.4/iosfwd
+++ /dev/null
@@ -1,168 +0,0 @@
-// Forwarding declarations -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.2  Forward declarations
-//
-
-/** @file iosfwd
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_IOSFWD
-#define _GLIBCXX_IOSFWD 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/c++locale.h> 
-#include <bits/c++io.h> 
-#include <cctype>		// For isspace, etc.
-#include <bits/stringfwd.h> 	// For string forward declarations.
-#include <bits/postypes.h>
-#include <bits/functexcept.h>
-
-namespace std 
-{
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_ios;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_streambuf;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_istream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_ostream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_iostream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	    typename _Alloc = allocator<_CharT> >
-    class basic_stringbuf;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-    class basic_istringstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-    class basic_ostringstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT>,
-	   typename _Alloc = allocator<_CharT> >
-    class basic_stringstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_filebuf;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_ifstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_ofstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class basic_fstream;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class istreambuf_iterator;
-
-  template<typename _CharT, typename _Traits = char_traits<_CharT> >
-    class ostreambuf_iterator;
-
-  // _GLIBCXX_RESOLVE_LIB_DEFECTS
-  // Not included.   (??? Apparently no LWG number?)
-  class ios_base; 
-
-  /** 
-   *  @defgroup s27_2_iosfwd I/O Forward Declarations
-   *
-   *  Nearly all of the I/O classes are parameterized on the type of
-   *  characters they read and write.  (The major exception is ios_base at
-   *  the top of the hierarchy.)  This is a change from pre-Standard
-   *  streams, which were not templates.
-   *
-   *  For ease of use and compatibility, all of the basic_* I/O-related
-   *  classes are given typedef names for both of the builtin character
-   *  widths (wide and narrow).  The typedefs are the same as the
-   *  pre-Standard names, for example:
-   *
-   *  @code
-   *     typedef basic_ifstream<char>  ifstream;
-   *  @endcode
-   *
-   *  Because properly forward-declaring these classes can be difficult, you
-   *  should not do it yourself.  Instead, include the &lt;iosfwd&gt;
-   *  header, which contains only declarations of all the I/O classes as
-   *  well as the typedefs.  Trying to forward-declare the typedefs
-   *  themselves (e.g., "class ostream;") is not valid ISO C++.
-   *
-   *  For more specific declarations, see
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#10
-   *
-   *  @{
-  */
-  typedef basic_ios<char> 		ios;		///< @isiosfwd
-  typedef basic_streambuf<char> 	streambuf;	///< @isiosfwd
-  typedef basic_istream<char> 		istream;	///< @isiosfwd
-  typedef basic_ostream<char> 		ostream;	///< @isiosfwd
-  typedef basic_iostream<char> 		iostream;	///< @isiosfwd
-  typedef basic_stringbuf<char> 	stringbuf;	///< @isiosfwd
-  typedef basic_istringstream<char> 	istringstream;	///< @isiosfwd
-  typedef basic_ostringstream<char> 	ostringstream;	///< @isiosfwd
-  typedef basic_stringstream<char> 	stringstream;	///< @isiosfwd
-  typedef basic_filebuf<char> 		filebuf;	///< @isiosfwd
-  typedef basic_ifstream<char> 		ifstream;	///< @isiosfwd
-  typedef basic_ofstream<char> 		ofstream;	///< @isiosfwd
-  typedef basic_fstream<char> 		fstream;	///< @isiosfwd
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  typedef basic_ios<wchar_t> 		wios;		///< @isiosfwd
-  typedef basic_streambuf<wchar_t> 	wstreambuf;	///< @isiosfwd
-  typedef basic_istream<wchar_t> 	wistream;	///< @isiosfwd
-  typedef basic_ostream<wchar_t> 	wostream;	///< @isiosfwd
-  typedef basic_iostream<wchar_t> 	wiostream;	///< @isiosfwd
-  typedef basic_stringbuf<wchar_t> 	wstringbuf;	///< @isiosfwd
-  typedef basic_istringstream<wchar_t> 	wistringstream;	///< @isiosfwd
-  typedef basic_ostringstream<wchar_t> 	wostringstream;	///< @isiosfwd
-  typedef basic_stringstream<wchar_t> 	wstringstream;	///< @isiosfwd
-  typedef basic_filebuf<wchar_t> 	wfilebuf;	///< @isiosfwd
-  typedef basic_ifstream<wchar_t> 	wifstream;	///< @isiosfwd
-  typedef basic_ofstream<wchar_t> 	wofstream;	///< @isiosfwd
-  typedef basic_fstream<wchar_t> 	wfstream;	///< @isiosfwd
-#endif
-  /** @}  */
-} // namespace std
-
-#endif /* _GLIBCXX_IOSFWD */
diff --git a/include.new/c++/3.4/iostream b/include.new/c++/3.4/iostream
deleted file mode 100644
index f5049db..0000000
--- a/include.new/c++/3.4/iostream
+++ /dev/null
@@ -1,80 +0,0 @@
-// Standard iostream objects -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.3  Standard iostream objects
-//
-
-/** @file iostream
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_IOSTREAM
-#define _GLIBCXX_IOSTREAM 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <ostream>
-#include <istream>
-
-namespace std 
-{
-  /**
-   *  @name Standard Stream Objects
-   *
-   *  The &lt;iostream&gt; header declares the eight <em>standard stream
-   *  objects</em>.  For other declarations, see
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#10 and the
-   *  @link s27_2_iosfwd I/O forward declarations @endlink
-   *
-   *  They are required by default to cooperate with the global C library's
-   *  @c FILE streams, and to be available during program startup and
-   *  termination.  For more information, see the HOWTO linked to above.
-  */
-  //@{
-  extern istream cin;		///< Linked to standard input
-  extern ostream cout;		///< Linked to standard output
-  extern ostream cerr;		///< Linked to standard error (unbuffered)
-  extern ostream clog;		///< Linked to standard error (buffered)
-
-#ifdef _GLIBCXX_USE_WCHAR_T
-  extern wistream wcin;		///< Linked to standard input
-  extern wostream wcout;	///< Linked to standard output
-  extern wostream wcerr;	///< Linked to standard error (unbuffered)
-  extern wostream wclog;	///< Linked to standard error (buffered)
-#endif
-  //@}
-
-  // For construction of filebuffers for cout, cin, cerr, clog et. al.
-  static ios_base::Init __ioinit;
-} // namespace std
-
-#endif /* _GLIBCXX_IOSTREAM */
diff --git a/include.new/c++/3.4/istream b/include.new/c++/3.4/istream
deleted file mode 100644
index a3a53ba..0000000
--- a/include.new/c++/3.4/istream
+++ /dev/null
@@ -1,774 +0,0 @@
-// Input streams -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.6.1  Input streams
-//
-
-/** @file istream
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_ISTREAM
-#define _GLIBCXX_ISTREAM 1
-
-#pragma GCC system_header
-
-#include <ios>
-#include <limits> // For numeric_limits
-
-namespace std
-{
-  // [27.6.1.1] Template class basic_istream
-  /**
-   *  @brief  Controlling input.
-   *
-   *  This is the base class for all input streams.  It provides text
-   *  formatting of all builtin types, and communicates with any class
-   *  derived from basic_streambuf to do the actual input.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_istream : virtual public basic_ios<_CharT, _Traits>
-    {
-    public:
-      // Types (inherited from basic_ios (27.4.4)):
-      typedef _CharT                     		char_type;
-      typedef typename _Traits::int_type 		int_type;
-      typedef typename _Traits::pos_type 		pos_type;
-      typedef typename _Traits::off_type 		off_type;
-      typedef _Traits                    		traits_type;
-      
-      // Non-standard Types:
-      typedef basic_streambuf<_CharT, _Traits> 		__streambuf_type;
-      typedef basic_ios<_CharT, _Traits>		__ios_type;
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef num_get<_CharT, istreambuf_iterator<_CharT, _Traits> >        
- 							__num_get_type;
-      typedef ctype<_CharT>           			__ctype_type;
-
-      template<typename _CharT2, typename _Traits2>
-        friend basic_istream<_CharT2, _Traits2>&
-        operator>>(basic_istream<_CharT2, _Traits2>&, _CharT2&);
- 
-      template<typename _CharT2, typename _Traits2>
-        friend basic_istream<_CharT2, _Traits2>&
-        operator>>(basic_istream<_CharT2, _Traits2>&, _CharT2*);
- 
-    protected:
-      // Data Members:
-      /**
-       *  @if maint
-       *  The number of characters extracted in the previous unformatted
-       *  function; see gcount().
-       *  @endif
-      */
-      streamsize 		_M_gcount;
-
-    public:
-      // [27.6.1.1.1] constructor/destructor
-      /**
-       *  @brief  Base constructor.
-       *
-       *  This ctor is almost never called by the user directly, rather from
-       *  derived classes' initialization lists, which pass a pointer to
-       *  their own stream buffer.
-      */
-      explicit 
-      basic_istream(__streambuf_type* __sb): _M_gcount(streamsize(0))
-      { this->init(__sb); }
-
-      /**
-       *  @brief  Base destructor.
-       *
-       *  This does very little apart from providing a virtual base dtor.
-      */
-      virtual 
-      ~basic_istream() 
-      { _M_gcount = streamsize(0); }
-
-      // [27.6.1.1.2] prefix/suffix
-      class sentry;
-      friend class sentry;
-
-      // [27.6.1.2] formatted input
-      // [27.6.1.2.3] basic_istream::operator>>
-      //@{
-      /**
-       *  @brief  Interface for manipulators.
-       *
-       *  Manuipulators such as @c std::ws and @c std::dec use these
-       *  functions in constructs like "std::cin >> std::ws".  For more
-       *  information, see the iomanip header.
-      */
-      inline __istream_type&
-      operator>>(__istream_type& (*__pf)(__istream_type&));
-
-      inline __istream_type&
-      operator>>(__ios_type& (*__pf)(__ios_type&));
-
-      inline __istream_type&
-      operator>>(ios_base& (*__pf)(ios_base&));
-      //@}
-      
-      // [27.6.1.2.2] arithmetic extractors
-      /**
-       *  @name Arithmetic Extractors
-       *
-       *  All the @c operator>> functions (aka <em>formatted input
-       *  functions</em>) have some common behavior.  Each starts by
-       *  constructing a temporary object of type std::basic_istream::sentry
-       *  with the second argument (noskipws) set to false.  This has several
-       *  effects, concluding with the setting of a status flag; see the
-       *  sentry documentation for more.
-       *
-       *  If the sentry status is good, the function tries to extract
-       *  whatever data is appropriate for the type of the argument.
-       *
-       *  If an exception is thrown during extraction, ios_base::badbit
-       *  will be turned on in the stream's error state without causing an
-       *  ios_base::failure to be thrown.  The original exception will then
-       *  be rethrown.
-      */
-      //@{
-      /**
-       *  @brief  Basic arithmetic extractors
-       *  @param  A variable of builtin type.
-       *  @return  @c *this if successful
-       *
-       *  These functions use the stream's current locale (specifically, the
-       *  @c num_get facet) to parse the input data.
-      */
-      __istream_type& 
-      operator>>(bool& __n);
-      
-      __istream_type& 
-      operator>>(short& __n);
-      
-      __istream_type& 
-      operator>>(unsigned short& __n);
-
-      __istream_type& 
-      operator>>(int& __n);
-      
-      __istream_type& 
-      operator>>(unsigned int& __n);
-
-      __istream_type& 
-      operator>>(long& __n);
-      
-      __istream_type& 
-      operator>>(unsigned long& __n);
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      __istream_type& 
-      operator>>(long long& __n);
-
-      __istream_type& 
-      operator>>(unsigned long long& __n);
-#endif
-
-      __istream_type& 
-      operator>>(float& __f);
-
-      __istream_type& 
-      operator>>(double& __f);
-
-      __istream_type& 
-      operator>>(long double& __f);
-
-      __istream_type& 
-      operator>>(void*& __p);
-
-      /**
-       *  @brief  Extracting into another streambuf.
-       *  @param  sb  A pointer to a streambuf
-       *
-       *  This function behaves like one of the basic arithmetic extractors,
-       *  in that it also constructs a sentry object and has the same error
-       *  handling behavior.
-       *
-       *  If @a sb is NULL, the stream will set failbit in its error state.
-       *
-       *  Characters are extracted from this stream and inserted into the
-       *  @a sb streambuf until one of the following occurs:
-       *
-       *  - the input stream reaches end-of-file,
-       *  - insertion into the output buffer fails (in this case, the
-       *    character that would have been inserted is not extracted), or
-       *  - an exception occurs (and in this case is caught)
-       *
-       *  If the function inserts no characters, failbit is set.
-      */
-      __istream_type& 
-      operator>>(__streambuf_type* __sb);
-      //@}
-      
-      // [27.6.1.3] unformatted input
-      /**
-       *  @brief  Character counting
-       *  @return  The number of characters extracted by the previous
-       *           unformatted input function dispatched for this stream.
-      */
-      inline streamsize 
-      gcount() const 
-      { return _M_gcount; }
-      
-      /**
-       *  @name Unformatted Input Functions
-       *
-       *  All the unformatted input functions have some common behavior.
-       *  Each starts by constructing a temporary object of type
-       *  std::basic_istream::sentry with the second argument (noskipws)
-       *  set to true.  This has several effects, concluding with the
-       *  setting of a status flag; see the sentry documentation for more.
-       *
-       *  If the sentry status is good, the function tries to extract
-       *  whatever data is appropriate for the type of the argument.
-       *
-       *  The number of characters extracted is stored for later retrieval
-       *  by gcount().
-       *
-       *  If an exception is thrown during extraction, ios_base::badbit
-       *  will be turned on in the stream's error state without causing an
-       *  ios_base::failure to be thrown.  The original exception will then
-       *  be rethrown.
-      */
-      //@{
-      /**
-       *  @brief  Simple extraction.
-       *  @return  A character, or eof().
-       *
-       *  Tries to extract a character.  If none are available, sets failbit
-       *  and returns traits::eof().
-      */
-      int_type 
-      get();
-
-      /**
-       *  @brief  Simple extraction.
-       *  @param  c  The character in which to store data.
-       *  @return  *this
-       *
-       *  Tries to extract a character and store it in @a c.  If none are
-       *  available, sets failbit and returns traits::eof().
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __istream_type& 
-      get(char_type& __c);
-
-      /**
-       *  @brief  Simple multiple-character extraction.
-       *  @param  s  Pointer to an array.
-       *  @param  n  Maximum number of characters to store in @a s.
-       *  @param  delim  A "stop" character.
-       *  @return  *this
-       *
-       *  Characters are extracted and stored into @a s until one of the
-       *  following happens:
-       *
-       *  - @c n-1 characters are stored
-       *  - the input sequence reaches EOF
-       *  - the next character equals @a delim, in which case the character
-       *    is not extracted
-       *
-       * If no characters are stored, failbit is set in the stream's error
-       * state.
-       *
-       * In any case, a null character is stored into the next location in
-       * the array.
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __istream_type& 
-      get(char_type* __s, streamsize __n, char_type __delim);
-
-      /**
-       *  @brief  Simple multiple-character extraction.
-       *  @param  s  Pointer to an array.
-       *  @param  n  Maximum number of characters to store in @a s.
-       *  @return  *this
-       *
-       *  Returns @c get(s,n,widen('\n')).
-      */
-      inline __istream_type& 
-      get(char_type* __s, streamsize __n)
-      { return this->get(__s, __n, this->widen('\n')); }
-
-      /**
-       *  @brief  Extraction into another streambuf.
-       *  @param  sb  A streambuf in which to store data.
-       *  @param  delim  A "stop" character.
-       *  @return  *this
-       *
-       *  Characters are extracted and inserted into @a sb until one of the
-       *  following happens:
-       *
-       *  - the input sequence reaches EOF
-       *  - insertion into the output buffer fails (in this case, the
-       *    character that would have been inserted is not extracted)
-       *  - the next character equals @a delim (in this case, the character
-       *    is not extracted)
-       *  - an exception occurs (and in this case is caught)
-       *
-       * If no characters are stored, failbit is set in the stream's error
-       * state.
-      */
-      __istream_type&
-      get(__streambuf_type& __sb, char_type __delim);
-
-      /**
-       *  @brief  Extraction into another streambuf.
-       *  @param  sb  A streambuf in which to store data.
-       *  @return  *this
-       *
-       *  Returns @c get(sb,widen('\n')).
-      */
-      inline __istream_type&
-      get(__streambuf_type& __sb)
-      { return this->get(__sb, this->widen('\n')); }
-
-      /**
-       *  @brief  String extraction.
-       *  @param  s  A character array in which to store the data.
-       *  @param  n  Maximum number of characters to extract.
-       *  @param  delim  A "stop" character.
-       *  @return  *this
-       *
-       *  Extracts and stores characters into @a s until one of the
-       *  following happens.  Note that these criteria are required to be
-       *  tested in the order listed here, to allow an input line to exactly
-       *  fill the @a s array without setting failbit.
-       *
-       *  -# the input sequence reaches end-of-file, in which case eofbit
-       *     is set in the stream error state
-       *  -# the next character equals @c delim, in which case the character
-       *     is extracted (and therefore counted in @c gcount()) but not stored
-       *  -# @c n-1 characters are stored, in which case failbit is set
-       *     in the stream error state
-       *
-       *  If no characters are extracted, failbit is set.  (An empty line of
-       *  input should therefore not cause failbit to be set.)
-       *
-       *  In any case, a null character is stored in the next location in
-       *  the array.
-      */
-      __istream_type& 
-      getline(char_type* __s, streamsize __n, char_type __delim);
-
-      /**
-       *  @brief  String extraction.
-       *  @param  s  A character array in which to store the data.
-       *  @param  n  Maximum number of characters to extract.
-       *  @return  *this
-       *
-       *  Returns @c getline(s,n,widen('\n')).
-      */
-      inline __istream_type& 
-      getline(char_type* __s, streamsize __n)
-      { return this->getline(__s, __n, this->widen('\n')); }
-
-      /**
-       *  @brief  Discarding characters
-       *  @param  n  Number of characters to discard.
-       *  @param  delim  A "stop" character.
-       *  @return  *this
-       *
-       *  Extracts characters and throws them away until one of the
-       *  following happens:
-       *  - if @a n @c != @c std::numeric_limits<int>::max(), @a n
-       *    characters are extracted
-       *  - the input sequence reaches end-of-file
-       *  - the next character equals @a delim (in this case, the character
-       *    is extracted); note that this condition will never occur if
-       *    @a delim equals @c traits::eof().
-      */
-      __istream_type& 
-      ignore(streamsize __n = 1, int_type __delim = traits_type::eof());
-      
-      /**
-       *  @brief  Looking ahead in the stream
-       *  @return  The next character, or eof().
-       *
-       *  If, after constructing the sentry object, @c good() is false,
-       *  returns @c traits::eof().  Otherwise reads but does not extract
-       *  the next input character.
-      */
-      int_type 
-      peek();
-      
-      /**
-       *  @brief  Extraction without delimiters.
-       *  @param  s  A character array.
-       *  @param  n  Maximum number of characters to store.
-       *  @return  *this
-       *
-       *  If the stream state is @c good(), extracts characters and stores
-       *  them into @a s until one of the following happens:
-       *  - @a n characters are stored
-       *  - the input sequence reaches end-of-file, in which case the error
-       *    state is set to @c failbit|eofbit.
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __istream_type& 
-      read(char_type* __s, streamsize __n);
-
-      /**
-       *  @brief  Extraction until the buffer is exhausted, but no more.
-       *  @param  s  A character array.
-       *  @param  n  Maximum number of characters to store.
-       *  @return  The number of characters extracted.
-       *
-       *  Extracts characters and stores them into @a s depending on the
-       *  number of characters remaining in the streambuf's buffer,
-       *  @c rdbuf()->in_avail(), called @c A here:
-       *  - if @c A @c == @c -1, sets eofbit and extracts no characters
-       *  - if @c A @c == @c 0, extracts no characters
-       *  - if @c A @c > @c 0, extracts @c min(A,n)
-       *
-       *  The goal is to empty the current buffer, and to not request any
-       *  more from the external input sequence controlled by the streambuf.
-      */
-      streamsize 
-      readsome(char_type* __s, streamsize __n);
-      
-      /**
-       *  @brief  Unextracting a single character.
-       *  @param  c  The character to push back into the input stream.
-       *  @return  *this
-       *
-       *  If @c rdbuf() is not null, calls @c rdbuf()->sputbackc(c).
-       *
-       *  If @c rdbuf() is null or if @c sputbackc() fails, sets badbit in
-       *  the error state.
-       *
-       *  @note  Since no characters are extracted, the next call to
-       *         @c gcount() will return 0, as required by DR 60.
-      */
-      __istream_type& 
-      putback(char_type __c);
-
-      /**
-       *  @brief  Unextracting the previous character.
-       *  @return  *this
-       *
-       *  If @c rdbuf() is not null, calls @c rdbuf()->sungetc(c).
-       *
-       *  If @c rdbuf() is null or if @c sungetc() fails, sets badbit in
-       *  the error state.
-       *
-       *  @note  Since no characters are extracted, the next call to
-       *         @c gcount() will return 0, as required by DR 60.
-      */
-      __istream_type& 
-      unget();
-
-      /**
-       *  @brief  Synchronizing the stream buffer.
-       *  @return  0 on success, -1 on failure
-       *
-       *  If @c rdbuf() is a null pointer, returns -1.
-       *
-       *  Otherwise, calls @c rdbuf()->pubsync(), and if that returns -1,
-       *  sets badbit and returns -1.
-       *
-       *  Otherwise, returns 0.
-       *
-       *  @note  This function does not count the number of characters
-       *         extracted, if any, and therefore does not affect the next
-       *         call to @c gcount().
-      */
-      int 
-      sync();
-
-      /**
-       *  @brief  Getting the current read position.
-       *  @return  A file position object.
-       *
-       *  If @c fail() is not false, returns @c pos_type(-1) to indicate
-       *  failure.  Otherwise returns @c rdbuf()->pubseekoff(0,cur,in).
-       *
-       *  @note  This function does not count the number of characters
-       *         extracted, if any, and therefore does not affect the next
-       *         call to @c gcount().
-      */
-      pos_type 
-      tellg();
-
-      /**
-       *  @brief  Changing the current read position.
-       *  @param  pos  A file position object.
-       *  @return  *this
-       *
-       *  If @c fail() is not true, calls @c rdbuf()->pubseekpos(pos).  If
-       *  that function fails, sets failbit.
-       *
-       *  @note  This function does not count the number of characters
-       *         extracted, if any, and therefore does not affect the next
-       *         call to @c gcount().
-      */
-      __istream_type& 
-      seekg(pos_type);
-
-      /**
-       *  @brief  Changing the current read position.
-       *  @param  off  A file offset object.
-       *  @param  dir  The direction in which to seek.
-       *  @return  *this
-       *
-       *  If @c fail() is not true, calls @c rdbuf()->pubseekoff(off,dir).
-       *  If that function fails, sets failbit.
-       *
-       *  @note  This function does not count the number of characters
-       *         extracted, if any, and therefore does not affect the next
-       *         call to @c gcount().
-      */
-      __istream_type& 
-      seekg(off_type, ios_base::seekdir);
-      //@}
-
-    protected:
-      explicit 
-      basic_istream(): _M_gcount(streamsize(0)) { }
-    };
-  
-  /**
-   *  @brief  Performs setup work for input streams.
-   *
-   *  Objects of this class are created before all of the standard
-   *  extractors are run.  It is responsible for "exception-safe prefix and
-   *  suffix operations," although only prefix actions are currently required
-   *  by the standard.  Additional actions may be added by the
-   *  implementation, and we list them in
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/17_intro/howto.html#5
-   *  under [27.6] notes.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_istream<_CharT, _Traits>::sentry
-    {
-    public:
-      /// Easy access to dependant types.
-      typedef _Traits 					traits_type;
-      typedef basic_streambuf<_CharT, _Traits> 		__streambuf_type;
-      typedef basic_istream<_CharT, _Traits> 		__istream_type;
-      typedef typename __istream_type::__ctype_type 	__ctype_type;
-      typedef typename _Traits::int_type		__int_type;
-
-      /**
-       *  @brief  The constructor performs all the work.
-       *  @param  is  The input stream to guard.
-       *  @param  noskipws  Whether to consume whitespace or not.
-       *
-       *  If the stream state is good (@a is.good() is true), then the
-       *  following actions are performed, otherwise the sentry state is
-       *  false ("not okay") and failbit is set in the stream state.
-       *
-       *  The sentry's preparatory actions are:
-       *
-       *  -# if the stream is tied to an output stream, @c is.tie()->flush()
-       *     is called to synchronize the output sequence
-       *  -# if @a noskipws is false, and @c ios_base::skipws is set in
-       *     @c is.flags(), the sentry extracts and discards whitespace
-       *     characters from the stream.  The currently imbued locale is
-       *     used to determine whether each character is whitespace.
-       *
-       *  If the stream state is still good, then the sentry state becomes
-       *  true ("okay").
-      */
-      explicit 
-      sentry(basic_istream<_CharT, _Traits>& __is, bool __noskipws = false);
-
-      /**
-       *  @brief  Quick status checking.
-       *  @return  The sentry state.
-       *
-       *  For ease of use, sentries may be converted to booleans.  The
-       *  return value is that of the sentry state (true == okay).
-      */
-      operator bool() const { return _M_ok; }
-
-    private:
-      bool _M_ok;
-    };
-
-  // [27.6.1.2.3] character extraction templates
-  //@{
-  /**
-   *  @brief  Character extractors
-   *  @param  in  An input stream.
-   *  @param  c  A character reference.
-   *  @return  in
-   *
-   *  Behaves like one of the formatted arithmetic extractors described in
-   *  std::basic_istream.  After constructing a sentry object with good
-   *  status, this function extracts a character (if one is available) and
-   *  stores it in @a c.  Otherwise, sets failbit in the input stream.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in, _CharT& __c);
-
-  template<class _Traits>
-    basic_istream<char, _Traits>&
-    operator>>(basic_istream<char, _Traits>& __in, unsigned char& __c)
-    { return (__in >> reinterpret_cast<char&>(__c)); }
-
-  template<class _Traits>
-    basic_istream<char, _Traits>&
-    operator>>(basic_istream<char, _Traits>& __in, signed char& __c)
-    { return (__in >> reinterpret_cast<char&>(__c)); }
-  //@}
-
-  //@{
-  /**
-   *  @brief  Character string extractors
-   *  @param  in  An input stream.
-   *  @param  s  A pointer to a character array.
-   *  @return  in
-   *
-   *  Behaves like one of the formatted arithmetic extractors described in
-   *  std::basic_istream.  After constructing a sentry object with good
-   *  status, this function extracts up to @c n characters and stores them
-   *  into the array starting at @a s.  @c n is defined as:
-   *
-   *  - if @c width() is greater than zero, @c n is width()
-   *  - otherwise @c n is "the number of elements of the largest array of
-   *    @c char_type that can store a terminating @c eos." [27.6.1.2.3]/6
-   *
-   *  Characters are extracted and stored until one of the following happens:
-   *  - @c n-1 characters are stored
-   *  - EOF is reached
-   *  - the next character is whitespace according to the current locale
-   *  - the next character is a null byte (i.e., @c charT() )
-   *
-   *  @c width(0) is then called for the input stream.
-   *
-   *  If no characters are extracted, sets failbit.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __in, _CharT* __s);
-  
-  template<class _Traits>
-    basic_istream<char,_Traits>&
-    operator>>(basic_istream<char,_Traits>& __in, unsigned char* __s)
-    { return (__in >> reinterpret_cast<char*>(__s)); }
-
-  template<class _Traits>
-    basic_istream<char,_Traits>&
-    operator>>(basic_istream<char,_Traits>& __in, signed char* __s)
-    { return (__in >> reinterpret_cast<char*>(__s)); }
-  //@}
-
-  // 27.6.1.5 Template class basic_iostream
-  /**
-   *  @brief  Merging istream and ostream capabilities.
-   *
-   *  This class multiply inherits from the input and output stream classes
-   *  simply to provide a single interface.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_iostream
-    : public basic_istream<_CharT, _Traits>, 
-      public basic_ostream<_CharT, _Traits>
-    {
-    public:
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 271. basic_iostream missing typedefs
-      // Types (inherited):
-      typedef _CharT                     		char_type;
-      typedef typename _Traits::int_type 		int_type;
-      typedef typename _Traits::pos_type 		pos_type;
-      typedef typename _Traits::off_type 		off_type;
-      typedef _Traits                    		traits_type;
-
-      // Non-standard Types:
-      typedef basic_istream<_CharT, _Traits>		__istream_type;
-      typedef basic_ostream<_CharT, _Traits>		__ostream_type;
-
-      /**
-       *  @brief  Constructor does nothing.
-       *
-       *  Both of the parent classes are initialized with the same
-       *  streambuf pointer passed to this constructor.
-      */
-      explicit 
-      basic_iostream(basic_streambuf<_CharT, _Traits>* __sb)
-      : __istream_type(), __ostream_type()
-      { this->init(__sb); }
-
-      /**
-       *  @brief  Destructor does nothing.
-      */
-      virtual 
-      ~basic_iostream() { }
-
-    protected:
-      explicit 
-      basic_iostream() : __istream_type(), __ostream_type()
-      { }
-    };
-
-  // [27.6.1.4] standard basic_istream manipulators
-  /**
-   *  @brief  Quick and easy way to eat whitespace
-   *
-   *  This manipulator extracts whitespace characters, stopping when the
-   *  next character is non-whitespace, or when the input sequence is empty.
-   *  If the sequence is empty, @c eofbit is set in the stream, but not
-   *  @c failbit.
-   *
-   *  The current locale is used to distinguish whitespace characters.
-   *
-   *  Example:
-   *  @code
-   *     MyClass   mc;
-   *
-   *     std::cin >> std::ws >> mc;
-   *  @endcode
-   *  will skip leading whitespace before calling operator>> on cin and your
-   *  object.  Note that the same effect can be achieved by creating a
-   *  std::basic_istream::sentry inside your definition of operator>>.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_istream<_CharT, _Traits>& 
-    ws(basic_istream<_CharT, _Traits>& __is);
-} // namespace std
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/istream.tcc>
-#endif
-
-#endif	/* _GLIBCXX_ISTREAM */
diff --git a/include.new/c++/3.4/iterator b/include.new/c++/3.4/iterator
deleted file mode 100644
index 6e3840b..0000000
--- a/include.new/c++/3.4/iterator
+++ /dev/null
@@ -1,76 +0,0 @@
-// <iterator> -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file iterator
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_ITERATOR
-#define _GLIBCXX_ITERATOR 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <cstddef>
-#include <bits/stl_iterator_base_types.h>
-#include <bits/stl_iterator_base_funcs.h>
-#include <bits/stl_iterator.h>
-#include <ostream>
-#include <istream>
-#include <bits/stream_iterator.h>
-#include <bits/streambuf_iterator.h>
-
-#endif /* _GLIBCXX_ITERATOR */
diff --git a/include.new/c++/3.4/limits b/include.new/c++/3.4/limits
deleted file mode 100644
index 7f96647..0000000
--- a/include.new/c++/3.4/limits
+++ /dev/null
@@ -1,1143 +0,0 @@
-// The template and inlines for the -*- C++ -*- numeric_limits classes.
-
-// Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Note: this is not a conforming implementation.
-// Written by Gabriel Dos Reis <gdr@codesourcery.com>
-
-//
-// ISO 14882:1998
-// 18.2.1
-//
-
-/** @file limits
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_NUMERIC_LIMITS
-#define _GLIBCXX_NUMERIC_LIMITS 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-
-//
-// The numeric_limits<> traits document implementation-defined aspects
-// of fundamental arithmetic data types (integers and floating points).
-// From Standard C++ point of view, there are 13 such types:
-//   * integers
-//         bool						        (1)
-//         char, signed char, unsigned char			(3)
-//         short, unsigned short				(2)
-//         int, unsigned					(2)
-//         long, unsigned long					(2)
-//
-//   * floating points
-//         float						(1)
-//         double						(1)
-//         long double						(1)
-//
-// GNU C++ undertstands (where supported by the host C-library)
-//   * integer
-//         long long, unsigned long long			(2)
-//
-// which brings us to 15 fundamental arithmetic data types in GNU C++.
-//
-//
-// Since a numeric_limits<> is a bit tricky to get right, we rely on
-// an interface composed of macros which should be defined in config/os
-// or config/cpu when they differ from the generic (read arbitrary)
-// definitions given here.
-//
-
-// These values can be overridden in the target configuration file.
-// The default values are appropriate for many 32-bit targets.
-
-// GCC only intrinsicly supports modulo integral types.  The only remaining
-// integral exceptional values is division by zero.  Only targets that do not
-// signal division by zero in some "hard to ignore" way should use false.
-#ifndef __glibcxx_integral_traps
-# define __glibcxx_integral_traps true
-#endif
-
-// float
-//
-
-// Default values.  Should be overriden in configuration files if necessary.
-
-#ifndef __glibcxx_float_has_denorm_loss
-#  define __glibcxx_float_has_denorm_loss false
-#endif
-#ifndef __glibcxx_float_traps
-#  define __glibcxx_float_traps false
-#endif
-#ifndef __glibcxx_float_tinyness_before
-#  define __glibcxx_float_tinyness_before false
-#endif
-
-// double
-
-// Default values.  Should be overriden in configuration files if necessary.
-
-#ifndef __glibcxx_double_has_denorm_loss
-#  define __glibcxx_double_has_denorm_loss false
-#endif
-#ifndef __glibcxx_double_traps
-#  define __glibcxx_double_traps false
-#endif
-#ifndef __glibcxx_double_tinyness_before
-#  define __glibcxx_double_tinyness_before false
-#endif
-
-// long double
-
-// Default values.  Should be overriden in configuration files if necessary.
-
-#ifndef __glibcxx_long_double_has_denorm_loss
-#  define __glibcxx_long_double_has_denorm_loss false
-#endif
-#ifndef __glibcxx_long_double_traps
-#  define __glibcxx_long_double_traps false
-#endif
-#ifndef __glibcxx_long_double_tinyness_before
-#  define __glibcxx_long_double_tinyness_before false
-#endif
-
-// You should not need to define any macros below this point.
-
-#define __glibcxx_signed(T)	((T)(-1) < 0)
-
-#define __glibcxx_min(T) \
-  (__glibcxx_signed (T) ? (T)1 << __glibcxx_digits (T) : (T)0)
-
-#define __glibcxx_max(T) \
-  (__glibcxx_signed (T) ? ((T)1 << __glibcxx_digits (T)) - 1 : ~(T)0)
-
-#define __glibcxx_digits(T) \
-  (sizeof(T) * __CHAR_BIT__ - __glibcxx_signed (T))
-
-// The fraction 643/2136 approximates log10(2) to 7 significant digits.
-#define __glibcxx_digits10(T) \
-  (__glibcxx_digits (T) * 643 / 2136)
-
-
-namespace std
-{
-  /**
-   *  @brief Describes the rounding style for floating-point types.
-   *
-   *  This is used in the std::numeric_limits class.
-  */
-  enum float_round_style
-  {
-    round_indeterminate       = -1,    ///< Self-explanatory.
-    round_toward_zero         = 0,     ///< Self-explanatory.
-    round_to_nearest          = 1,     ///< To the nearest representable value.
-    round_toward_infinity     = 2,     ///< Self-explanatory.
-    round_toward_neg_infinity = 3      ///< Self-explanatory.
-  };
-
-  /**
-   *  @brief Describes the denormalization for floating-point types.
-   *
-   *  These values represent the presence or absence of a variable number
-   *  of exponent bits.  This type is used in the std::numeric_limits class.
-  */
-  enum float_denorm_style
-  {
-    /// Indeterminate at compile time whether denormalized values are allowed.
-    denorm_indeterminate = -1,
-    /// The type does not allow denormalized values.
-    denorm_absent        = 0,
-    /// The type allows denormalized values.
-    denorm_present       = 1
-  };
-
-  /**
-   *  @brief Part of std::numeric_limits.
-   *
-   *  The @c static @c const members are usable as integral constant
-   *  expressions.
-   *
-   *  @note This is a seperate class for purposes of efficiency; you
-   *        should only access these members as part of an instantiation
-   *        of the std::numeric_limits class.
-  */
-  struct __numeric_limits_base
-  {
-    /** This will be true for all fundamental types (which have
-        specializations), and false for everything else.  */
-    static const bool is_specialized = false;
-
-    /** The number of @c radix digits that be represented without change:  for
-        integer types, the number of non-sign bits in the mantissa; for
-        floating types, the number of @c radix digits in the mantissa.  */
-    static const int digits = 0;
-    /** The number of base 10 digits that can be represented without change. */
-    static const int digits10 = 0;
-    /** True if the type is signed.  */
-    static const bool is_signed = false;
-    /** True if the type is integer.
-     *  @if maint
-     *  Is this supposed to be "if the type is integral"?
-     *  @endif
-    */
-    static const bool is_integer = false;
-    /** True if the type uses an exact representation.  "All integer types are
-        exact, but not all exact types are integer.  For example, rational and
-        fixed-exponent representations are exact but not integer."
-        [18.2.1.2]/15  */
-    static const bool is_exact = false;
-    /** For integer types, specifies the base of the representation.  For
-        floating types, specifies the base of the exponent representation.  */
-    static const int radix = 0;
-
-    /** The minimum negative integer such that @c radix raised to the power of
-        (one less than that integer) is a normalized floating point number.  */
-    static const int min_exponent = 0;
-    /** The minimum negative integer such that 10 raised to that power is in
-        the range of normalized floating point numbers.  */
-    static const int min_exponent10 = 0;
-    /** The maximum positive integer such that @c radix raised to the power of
-        (one less than that integer) is a representable finite floating point
-	number.  */
-    static const int max_exponent = 0;
-    /** The maximum positive integer such that 10 raised to that power is in
-        the range of representable finite floating point numbers.  */
-    static const int max_exponent10 = 0;
-
-    /** True if the type has a representation for positive infinity.  */
-    static const bool has_infinity = false;
-    /** True if the type has a representation for a quiet (non-signaling)
-        "Not a Number."  */
-    static const bool has_quiet_NaN = false;
-    /** True if the type has a representation for a signaling
-        "Not a Number."  */
-    static const bool has_signaling_NaN = false;
-    /** See std::float_denorm_style for more information.  */
-    static const float_denorm_style has_denorm = denorm_absent;
-    /** "True if loss of accuracy is detected as a denormalization loss,
-        rather than as an inexact result." [18.2.1.2]/42  */
-    static const bool has_denorm_loss = false;
-
-    /** True if-and-only-if the type adheres to the IEC 559 standard, also
-        known as IEEE 754.  (Only makes sense for floating point types.)  */
-    static const bool is_iec559 = false;
-    /** "True if the set of values representable by the type is finite.   All
-        built-in types are bounded, this member would be false for arbitrary
-	precision types." [18.2.1.2]/54  */
-    static const bool is_bounded = false;
-    /** True if the type is @e modulo, that is, if it is possible to add two
-        positive numbers and have a result that wraps around to a third number
-        that is less.  Typically false for floating types, true for unsigned
-        integers, and true for signed integers.  */
-    static const bool is_modulo = false;
-
-    /** True if trapping is implemented for this type.  */
-    static const bool traps = false;
-    /** True if tinyness is detected before rounding.  (see IEC 559)  */
-    static const bool tinyness_before = false;
-    /** See std::float_round_style for more information.  This is only
-        meaningful for floating types; integer types will all be
-	round_toward_zero.  */
-    static const float_round_style round_style = round_toward_zero;
-  };
-
-  /**
-   *  @brief Properties of fundamental types.
-   *
-   *  This class allows a program to obtain information about the
-   *  representation of a fundamental type on a given platform.  For
-   *  non-fundamental types, the functions will return 0 and the data
-   *  members will all be @c false.
-   *
-   *  @if maint
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS:  DRs 201 and 184 (hi Gaby!) are
-   *  noted, but not incorporated in this documented (yet).
-   *  @endif
-  */
-  template<typename _Tp>
-    struct numeric_limits : public __numeric_limits_base
-    {
-      /** The minimum finite value, or for floating types with
-          denormalization, the minimum positive normalized value.  */
-      static _Tp min() throw() { return static_cast<_Tp>(0); }
-      /** The maximum finite value.  */
-      static _Tp max() throw() { return static_cast<_Tp>(0); }
-      /** The @e machine @e epsilon:  the difference between 1 and the least
-          value greater than 1 that is representable.  */
-      static _Tp epsilon() throw() { return static_cast<_Tp>(0); }
-      /** The maximum rounding error measurement (see LIA-1).  */
-      static _Tp round_error() throw() { return static_cast<_Tp>(0); }
-      /** The representation of positive infinity, if @c has_infinity.  */
-      static _Tp infinity() throw()  { return static_cast<_Tp>(0); }
-      /** The representation of a quiet "Not a Number," if @c has_quiet_NaN. */
-      static _Tp quiet_NaN() throw() { return static_cast<_Tp>(0); }
-      /** The representation of a signaling "Not a Number," if
-          @c has_signaling_NaN. */
-      static _Tp signaling_NaN() throw() { return static_cast<_Tp>(0); }
-      /** The minimum positive denormalized value.  For types where
-          @c has_denorm is false, this is the minimum positive normalized
-	  value.  */
-      static _Tp denorm_min() throw() { return static_cast<_Tp>(0); }
-    };
-
-  // Now there follow 15 explicit specializations.  Yes, 15.  Make sure
-  // you get the count right.
-  template<>
-    struct numeric_limits<bool>
-    {
-      static const bool is_specialized = true;
-
-      static bool min() throw()
-      { return false; }
-      static bool max() throw()
-      { return true; }
-
-      static const int digits = 1;
-      static const int digits10 = 0;
-      static const bool is_signed = false;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static bool epsilon() throw()
-      { return false; }
-      static bool round_error() throw()
-      { return false; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static bool infinity() throw()
-      { return false; }
-      static bool quiet_NaN() throw()
-      { return false; }
-      static bool signaling_NaN() throw()
-      { return false; }
-      static bool denorm_min() throw()
-      { return false; }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = false;
-
-      // It is not clear what it means for a boolean type to trap.
-      // This is a DR on the LWG issue list.  Here, I use integer
-      // promotion semantics.
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<char>
-    {
-      static const bool is_specialized = true;
-
-      static char min() throw()
-      { return __glibcxx_min(char); }
-      static char max() throw()
-      { return __glibcxx_max(char); }
-
-      static const int digits = __glibcxx_digits (char);
-      static const int digits10 = __glibcxx_digits10 (char);
-      static const bool is_signed = __glibcxx_signed (char);
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static char epsilon() throw()
-      { return 0; }
-      static char round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static char infinity() throw()
-      { return char(); }
-      static char quiet_NaN() throw()
-      { return char(); }
-      static char signaling_NaN() throw()
-      { return char(); }
-      static char denorm_min() throw()
-      { return static_cast<char>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<signed char>
-    {
-      static const bool is_specialized = true;
-
-      static signed char min() throw()
-      { return -__SCHAR_MAX__ - 1; }
-      static signed char max() throw()
-      { return __SCHAR_MAX__; }
-
-      static const int digits = __glibcxx_digits (signed char);
-      static const int digits10 = __glibcxx_digits10 (signed char);
-      static const bool is_signed = true;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static signed char epsilon() throw()
-      { return 0; }
-      static signed char round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static signed char infinity() throw()
-      { return static_cast<signed char>(0); }
-      static signed char quiet_NaN() throw()
-      { return static_cast<signed char>(0); }
-      static signed char signaling_NaN() throw()
-      { return static_cast<signed char>(0); }
-      static signed char denorm_min() throw()
-      { return static_cast<signed char>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<unsigned char>
-    {
-      static const bool is_specialized = true;
-
-      static unsigned char min() throw()
-      { return 0; }
-      static unsigned char max() throw()
-      { return __SCHAR_MAX__ * 2U + 1; }
-
-      static const int digits = __glibcxx_digits (unsigned char);
-      static const int digits10 = __glibcxx_digits10 (unsigned char);
-      static const bool is_signed = false;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static unsigned char epsilon() throw()
-      { return 0; }
-      static unsigned char round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static unsigned char infinity() throw()
-      { return static_cast<unsigned char>(0); }
-      static unsigned char quiet_NaN() throw()
-      { return static_cast<unsigned char>(0); }
-      static unsigned char signaling_NaN() throw()
-      { return static_cast<unsigned char>(0); }
-      static unsigned char denorm_min() throw()
-      { return static_cast<unsigned char>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<wchar_t>
-    {
-      static const bool is_specialized = true;
-
-      static wchar_t min() throw()
-      { return __glibcxx_min (wchar_t); }
-      static wchar_t max() throw()
-      { return __glibcxx_max (wchar_t); }
-
-      static const int digits = __glibcxx_digits (wchar_t);
-      static const int digits10 = __glibcxx_digits10 (wchar_t);
-      static const bool is_signed = __glibcxx_signed (wchar_t);
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static wchar_t epsilon() throw()
-      { return 0; }
-      static wchar_t round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static wchar_t infinity() throw()
-      { return wchar_t(); }
-      static wchar_t quiet_NaN() throw()
-      { return wchar_t(); }
-      static wchar_t signaling_NaN() throw()
-      { return wchar_t(); }
-      static wchar_t denorm_min() throw()
-      { return wchar_t(); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<short>
-    {
-      static const bool is_specialized = true;
-
-      static short min() throw()
-      { return -__SHRT_MAX__ - 1; }
-      static short max() throw()
-      { return __SHRT_MAX__; }
-
-      static const int digits = __glibcxx_digits (short);
-      static const int digits10 = __glibcxx_digits10 (short);
-      static const bool is_signed = true;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static short epsilon() throw()
-      { return 0; }
-      static short round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static short infinity() throw()
-      { return short(); }
-      static short quiet_NaN() throw()
-      { return short(); }
-      static short signaling_NaN() throw()
-      { return short(); }
-      static short denorm_min() throw()
-      { return short(); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<unsigned short>
-    {
-      static const bool is_specialized = true;
-
-      static unsigned short min() throw()
-      { return 0; }
-      static unsigned short max() throw()
-      { return __SHRT_MAX__ * 2U + 1; }
-
-      static const int digits = __glibcxx_digits (unsigned short);
-      static const int digits10 = __glibcxx_digits10 (unsigned short);
-      static const bool is_signed = false;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static unsigned short epsilon() throw()
-      { return 0; }
-      static unsigned short round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static unsigned short infinity() throw()
-      { return static_cast<unsigned short>(0); }
-      static unsigned short quiet_NaN() throw()
-      { return static_cast<unsigned short>(0); }
-      static unsigned short signaling_NaN() throw()
-      { return static_cast<unsigned short>(0); }
-      static unsigned short denorm_min() throw()
-      { return static_cast<unsigned short>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<int>
-    {
-      static const bool is_specialized = true;
-
-      static int min() throw()
-      { return -__INT_MAX__ - 1; }
-      static int max() throw()
-      { return __INT_MAX__; }
-
-      static const int digits = __glibcxx_digits (int);
-      static const int digits10 = __glibcxx_digits10 (int);
-      static const bool is_signed = true;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static int epsilon() throw()
-      { return 0; }
-      static int round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static int infinity() throw()
-      { return static_cast<int>(0); }
-      static int quiet_NaN() throw()
-      { return static_cast<int>(0); }
-      static int signaling_NaN() throw()
-      { return static_cast<int>(0); }
-      static int denorm_min() throw()
-      { return static_cast<int>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<unsigned int>
-    {
-      static const bool is_specialized = true;
-
-      static unsigned int min() throw()
-      { return 0; }
-      static unsigned int max() throw()
-      { return __INT_MAX__ * 2U + 1; }
-
-      static const int digits = __glibcxx_digits (unsigned int);
-      static const int digits10 = __glibcxx_digits10 (unsigned int);
-      static const bool is_signed = false;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static unsigned int epsilon() throw()
-      { return 0; }
-      static unsigned int round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static unsigned int infinity() throw()
-      { return static_cast<unsigned int>(0); }
-      static unsigned int quiet_NaN() throw()
-      { return static_cast<unsigned int>(0); }
-      static unsigned int signaling_NaN() throw()
-      { return static_cast<unsigned int>(0); }
-      static unsigned int denorm_min() throw()
-      { return static_cast<unsigned int>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<long>
-    {
-      static const bool is_specialized = true;
-
-      static long min() throw()
-      { return -__LONG_MAX__ - 1; }
-      static long max() throw()
-      { return __LONG_MAX__; }
-
-      static const int digits = __glibcxx_digits (long);
-      static const int digits10 = __glibcxx_digits10 (long);
-      static const bool is_signed = true;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static long epsilon() throw()
-      { return 0; }
-      static long round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static long infinity() throw()
-      { return static_cast<long>(0); }
-      static long quiet_NaN() throw()
-      { return static_cast<long>(0); }
-      static long signaling_NaN() throw()
-      { return static_cast<long>(0); }
-      static long denorm_min() throw()
-      { return static_cast<long>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<unsigned long>
-    {
-      static const bool is_specialized = true;
-
-      static unsigned long min() throw()
-      { return 0; }
-      static unsigned long max() throw()
-      { return __LONG_MAX__ * 2UL + 1; }
-
-      static const int digits = __glibcxx_digits (unsigned long);
-      static const int digits10 = __glibcxx_digits10 (unsigned long);
-      static const bool is_signed = false;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static unsigned long epsilon() throw()
-      { return 0; }
-      static unsigned long round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static unsigned long infinity() throw()
-      { return static_cast<unsigned long>(0); }
-      static unsigned long quiet_NaN() throw()
-      { return static_cast<unsigned long>(0); }
-      static unsigned long signaling_NaN() throw()
-      { return static_cast<unsigned long>(0); }
-      static unsigned long denorm_min() throw()
-      { return static_cast<unsigned long>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<long long>
-    {
-      static const bool is_specialized = true;
-
-      static long long min() throw()
-      { return -__LONG_LONG_MAX__ - 1; }
-      static long long max() throw()
-      { return __LONG_LONG_MAX__; }
-
-      static const int digits = __glibcxx_digits (long long);
-      static const int digits10 = __glibcxx_digits10 (long long);
-      static const bool is_signed = true;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static long long epsilon() throw()
-      { return 0; }
-      static long long round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static long long infinity() throw()
-      { return static_cast<long long>(0); }
-      static long long quiet_NaN() throw()
-      { return static_cast<long long>(0); }
-      static long long signaling_NaN() throw()
-      { return static_cast<long long>(0); }
-      static long long denorm_min() throw()
-      { return static_cast<long long>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<unsigned long long>
-    {
-      static const bool is_specialized = true;
-
-      static unsigned long long min() throw()
-      { return 0; }
-      static unsigned long long max() throw()
-      { return __LONG_LONG_MAX__ * 2ULL + 1; }
-
-      static const int digits = __glibcxx_digits (unsigned long long);
-      static const int digits10 = __glibcxx_digits10 (unsigned long long);
-      static const bool is_signed = false;
-      static const bool is_integer = true;
-      static const bool is_exact = true;
-      static const int radix = 2;
-      static unsigned long long epsilon() throw()
-      { return 0; }
-      static unsigned long long round_error() throw()
-      { return 0; }
-
-      static const int min_exponent = 0;
-      static const int min_exponent10 = 0;
-      static const int max_exponent = 0;
-      static const int max_exponent10 = 0;
-
-      static const bool has_infinity = false;
-      static const bool has_quiet_NaN = false;
-      static const bool has_signaling_NaN = false;
-      static const float_denorm_style has_denorm = denorm_absent;
-      static const bool has_denorm_loss = false;
-
-      static unsigned long long infinity() throw()
-      { return static_cast<unsigned long long>(0); }
-      static unsigned long long quiet_NaN() throw()
-      { return static_cast<unsigned long long>(0); }
-      static unsigned long long signaling_NaN() throw()
-      { return static_cast<unsigned long long>(0); }
-      static unsigned long long denorm_min() throw()
-      { return static_cast<unsigned long long>(0); }
-
-      static const bool is_iec559 = false;
-      static const bool is_bounded = true;
-      static const bool is_modulo = true;
-
-      static const bool traps = __glibcxx_integral_traps;
-      static const bool tinyness_before = false;
-      static const float_round_style round_style = round_toward_zero;
-    };
-
-  template<>
-    struct numeric_limits<float>
-    {
-      static const bool is_specialized = true;
-
-      static float min() throw()
-      { return __FLT_MIN__; }
-      static float max() throw()
-      { return __FLT_MAX__; }
-
-      static const int digits = __FLT_MANT_DIG__;
-      static const int digits10 = __FLT_DIG__;
-      static const bool is_signed = true;
-      static const bool is_integer = false;
-      static const bool is_exact = false;
-      static const int radix = __FLT_RADIX__;
-      static float epsilon() throw()
-      { return __FLT_EPSILON__; }
-      static float round_error() throw()
-      { return 0.5F; }
-
-      static const int min_exponent = __FLT_MIN_EXP__;
-      static const int min_exponent10 = __FLT_MIN_10_EXP__;
-      static const int max_exponent = __FLT_MAX_EXP__;
-      static const int max_exponent10 = __FLT_MAX_10_EXP__;
-
-      static const bool has_infinity = __FLT_HAS_INFINITY__;
-      static const bool has_quiet_NaN = __FLT_HAS_QUIET_NAN__;
-      static const bool has_signaling_NaN = has_quiet_NaN;
-      static const float_denorm_style has_denorm
-	= __FLT_DENORM_MIN__ ? denorm_present : denorm_absent;
-      static const bool has_denorm_loss = __glibcxx_float_has_denorm_loss;
-
-      static float infinity() throw()
-      { return __builtin_huge_valf (); }
-      static float quiet_NaN() throw()
-      { return __builtin_nanf (""); }
-      static float signaling_NaN() throw()
-      { return __builtin_nansf (""); }
-      static float denorm_min() throw()
-      { return __FLT_DENORM_MIN__; }
-
-      static const bool is_iec559
-	= has_infinity && has_quiet_NaN && has_denorm == denorm_present;
-      static const bool is_bounded = true;
-      static const bool is_modulo = false;
-
-      static const bool traps = __glibcxx_float_traps;
-      static const bool tinyness_before = __glibcxx_float_tinyness_before;
-      static const float_round_style round_style = round_to_nearest;
-    };
-
-#undef __glibcxx_float_has_denorm_loss
-#undef __glibcxx_float_traps
-#undef __glibcxx_float_tinyness_before
-
-  template<>
-    struct numeric_limits<double>
-    {
-      static const bool is_specialized = true;
-
-      static double min() throw()
-      { return __DBL_MIN__; }
-      static double max() throw()
-      { return __DBL_MAX__; }
-
-      static const int digits = __DBL_MANT_DIG__;
-      static const int digits10 = __DBL_DIG__;
-      static const bool is_signed = true;
-      static const bool is_integer = false;
-      static const bool is_exact = false;
-      static const int radix = __FLT_RADIX__;
-      static double epsilon() throw()
-      { return __DBL_EPSILON__; }
-      static double round_error() throw()
-      { return 0.5; }
-
-      static const int min_exponent = __DBL_MIN_EXP__;
-      static const int min_exponent10 = __DBL_MIN_10_EXP__;
-      static const int max_exponent = __DBL_MAX_EXP__;
-      static const int max_exponent10 = __DBL_MAX_10_EXP__;
-
-      static const bool has_infinity = __DBL_HAS_INFINITY__;
-      static const bool has_quiet_NaN = __DBL_HAS_QUIET_NAN__;
-      static const bool has_signaling_NaN = has_quiet_NaN;
-      static const float_denorm_style has_denorm
-	= __DBL_DENORM_MIN__ ? denorm_present : denorm_absent;
-      static const bool has_denorm_loss = __glibcxx_double_has_denorm_loss;
-
-      static double infinity() throw()
-      { return __builtin_huge_val(); }
-      static double quiet_NaN() throw()
-      { return __builtin_nan (""); }
-      static double signaling_NaN() throw()
-      { return __builtin_nans (""); }
-      static double denorm_min() throw()
-      { return __DBL_DENORM_MIN__; }
-
-      static const bool is_iec559
-	= has_infinity && has_quiet_NaN && has_denorm == denorm_present;
-      static const bool is_bounded = true;
-      static const bool is_modulo = false;
-
-      static const bool traps = __glibcxx_double_traps;
-      static const bool tinyness_before = __glibcxx_double_tinyness_before;
-      static const float_round_style round_style = round_to_nearest;
-    };
-
-#undef __glibcxx_double_has_denorm_loss
-#undef __glibcxx_double_traps
-#undef __glibcxx_double_tinyness_before
-
-  template<>
-    struct numeric_limits<long double>
-    {
-      static const bool is_specialized = true;
-
-      static long double min() throw()
-      { return __LDBL_MIN__; }
-      static long double max() throw()
-      { return __LDBL_MAX__; }
-
-      static const int digits = __LDBL_MANT_DIG__;
-      static const int digits10 = __LDBL_DIG__;
-      static const bool is_signed = true;
-      static const bool is_integer = false;
-      static const bool is_exact = false;
-      static const int radix = __FLT_RADIX__;
-      static long double epsilon() throw()
-      { return __LDBL_EPSILON__; }
-      static long double round_error() throw()
-      { return 0.5L; }
-
-      static const int min_exponent = __LDBL_MIN_EXP__;
-      static const int min_exponent10 = __LDBL_MIN_10_EXP__;
-      static const int max_exponent = __LDBL_MAX_EXP__;
-      static const int max_exponent10 = __LDBL_MAX_10_EXP__;
-
-      static const bool has_infinity = __LDBL_HAS_INFINITY__;
-      static const bool has_quiet_NaN = __LDBL_HAS_QUIET_NAN__;
-      static const bool has_signaling_NaN = has_quiet_NaN;
-      static const float_denorm_style has_denorm
-	= __LDBL_DENORM_MIN__ ? denorm_present : denorm_absent;
-      static const bool has_denorm_loss
-	= __glibcxx_long_double_has_denorm_loss;
-
-      static long double infinity() throw()
-      { return __builtin_huge_vall (); }
-      static long double quiet_NaN() throw()
-      { return __builtin_nanl (""); }
-      static long double signaling_NaN() throw()
-      { return __builtin_nansl (""); }
-      static long double denorm_min() throw()
-      { return __LDBL_DENORM_MIN__; }
-
-      static const bool is_iec559
-	= has_infinity && has_quiet_NaN && has_denorm == denorm_present;
-      static const bool is_bounded = true;
-      static const bool is_modulo = false;
-
-      static const bool traps = __glibcxx_long_double_traps;
-      static const bool tinyness_before = __glibcxx_long_double_tinyness_before;
-      static const float_round_style round_style = round_to_nearest;
-    };
-
-#undef __glibcxx_long_double_has_denorm_loss
-#undef __glibcxx_long_double_traps
-#undef __glibcxx_long_double_tinyness_before
-
-} // namespace std
-
-#undef __glibcxx_signed
-#undef __glibcxx_min
-#undef __glibcxx_max
-#undef __glibcxx_digits
-#undef __glibcxx_digits10
-
-#endif // _GLIBCXX_NUMERIC_LIMITS
diff --git a/include.new/c++/3.4/list b/include.new/c++/3.4/list
deleted file mode 100644
index 285a29d..0000000
--- a/include.new/c++/3.4/list
+++ /dev/null
@@ -1,82 +0,0 @@
-// <list> -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file list
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_LIST
-#define _GLIBCXX_LIST 1
-
-#pragma GCC system_header
-
-#include <bits/functexcept.h>
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_list.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/list.tcc>
-#endif
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/list>
-#endif
-
-#endif /* _GLIBCXX_LIST */
-
diff --git a/include.new/c++/3.4/locale b/include.new/c++/3.4/locale
deleted file mode 100644
index 43417fb..0000000
--- a/include.new/c++/3.4/locale
+++ /dev/null
@@ -1,49 +0,0 @@
-// Locale support -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 22.1  Locales
-//
-
-/** @file locale
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_LOCALE
-#define _GLIBCXX_LOCALE	1
-
-#pragma GCC system_header
-
-#include <bits/localefwd.h>
-#include <bits/locale_classes.h>
-#include <bits/locale_facets.h>
-#include <bits/locale_facets.tcc>
-
-#endif /* _GLIBCXX_LOCALE */
diff --git a/include.new/c++/3.4/map b/include.new/c++/3.4/map
deleted file mode 100644
index 4a88ae2..0000000
--- a/include.new/c++/3.4/map
+++ /dev/null
@@ -1,74 +0,0 @@
-// <map> -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file map
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_MAP
-#define _GLIBCXX_MAP 1
-
-#pragma GCC system_header
-
-#include <bits/stl_tree.h>
-#include <bits/stl_map.h>
-#include <bits/stl_multimap.h>
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/map>
-#endif
-
-#endif /* _GLIBCXX_MAP */
diff --git a/include.new/c++/3.4/memory b/include.new/c++/3.4/memory
deleted file mode 100644
index 1d278e6..0000000
--- a/include.new/c++/3.4/memory
+++ /dev/null
@@ -1,375 +0,0 @@
-// <memory> -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- * Copyright (c) 1997-1999
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- */
-
-/** @file memory
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_MEMORY
-#define _GLIBCXX_MEMORY 1
-
-#pragma GCC system_header
-
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_iterator_base_types.h> //for iterator_traits
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_raw_storage_iter.h>
-#include <debug/debug.h>
-#include <limits>
-
-namespace std
-{
-  /**
-   *  @if maint
-   *  This is a helper function.  The unused second parameter exists to
-   *  permit the real get_temporary_buffer to use template parameter deduction.
-   *
-   *  XXX This should perhaps use the pool.
-   *  @endif
-   */
-  template<typename _Tp>
-    pair<_Tp*, ptrdiff_t>
-    __get_temporary_buffer(ptrdiff_t __len, _Tp*)
-    {
-      const ptrdiff_t __max = numeric_limits<ptrdiff_t>::max() / sizeof(_Tp);
-      if (__len > __max)
-	__len = __max;
-      
-      while (__len > 0) 
-	{
-	  _Tp* __tmp = static_cast<_Tp*>(::operator new(__len * sizeof(_Tp), 
-							nothrow));
-	  if (__tmp != 0)
-	    return pair<_Tp*, ptrdiff_t>(__tmp, __len);
-	  __len /= 2;
-	}
-      return pair<_Tp*, ptrdiff_t>(static_cast<_Tp*>(0), 0);
-    }
-
-  /**
-   *  @brief Allocates a temporary buffer.
-   *  @param  len  The number of objects of type Tp.
-   *  @return See full description.
-   *
-   *  Reinventing the wheel, but this time with prettier spokes!
-   *
-   *  This function tries to obtain storage for @c len adjacent Tp
-   *  objects.  The objects themselves are not constructed, of course.
-   *  A pair<> is returned containing "the buffer s address and
-   *  capacity (in the units of sizeof(Tp)), or a pair of 0 values if
-   *  no storage can be obtained."  Note that the capacity obtained
-   *  may be less than that requested if the memory is unavailable;
-   *  you should compare len with the .second return value.
-   *
-   * Provides the nothrow exception guarantee.
-   */
-  template<typename _Tp>
-    inline pair<_Tp*, ptrdiff_t>
-    get_temporary_buffer(ptrdiff_t __len)
-    { return std::__get_temporary_buffer(__len, static_cast<_Tp*>(0)); }
-
-  /**
-   *  @brief The companion to get_temporary_buffer().
-   *  @param  p  A buffer previously allocated by get_temporary_buffer.
-   *  @return   None.
-   *
-   *  Frees the memory pointed to by p.
-   */
-  template<typename _Tp>
-    void
-    return_temporary_buffer(_Tp* __p)
-    { ::operator delete(__p, nothrow); }
-
-  /**
-   *  A wrapper class to provide auto_ptr with reference semantics.
-   *  For example, an auto_ptr can be assigned (or constructed from)
-   *  the result of a function which returns an auto_ptr by value.
-   *
-   *  All the auto_ptr_ref stuff should happen behind the scenes.
-   */
-  template<typename _Tp1>
-    struct auto_ptr_ref
-    {
-      _Tp1* _M_ptr;
-      
-      explicit
-      auto_ptr_ref(_Tp1* __p): _M_ptr(__p) { }
-    };
-
-
-  /**
-   *  @brief  A simple smart pointer providing strict ownership semantics.
-   *
-   *  The Standard says:
-   *  <pre>
-   *  An @c auto_ptr owns the object it holds a pointer to.  Copying
-   *  an @c auto_ptr copies the pointer and transfers ownership to the
-   *  destination.  If more than one @c auto_ptr owns the same object
-   *  at the same time the behavior of the program is undefined.
-   *
-   *  The uses of @c auto_ptr include providing temporary
-   *  exception-safety for dynamically allocated memory, passing
-   *  ownership of dynamically allocated memory to a function, and
-   *  returning dynamically allocated memory from a function.  @c
-   *  auto_ptr does not meet the CopyConstructible and Assignable
-   *  requirements for Standard Library <a
-   *  href="tables.html#65">container</a> elements and thus
-   *  instantiating a Standard Library container with an @c auto_ptr
-   *  results in undefined behavior.
-   *  </pre>
-   *  Quoted from [20.4.5]/3.
-   *
-   *  Good examples of what can and cannot be done with auto_ptr can
-   *  be found in the libstdc++ testsuite.
-   *
-   *  @if maint
-   *  _GLIBCXX_RESOLVE_LIB_DEFECTS
-   *  127.  auto_ptr<> conversion issues
-   *  These resolutions have all been incorporated.
-   *  @endif
-   */
-  template<typename _Tp>
-    class auto_ptr
-    {
-    private:
-      _Tp* _M_ptr;
-      
-    public:
-      /// The pointed-to type.
-      typedef _Tp element_type;
-      
-      /**
-       *  @brief  An %auto_ptr is usually constructed from a raw pointer.
-       *  @param  p  A pointer (defaults to NULL).
-       *
-       *  This object now @e owns the object pointed to by @a p.
-       */
-      explicit
-      auto_ptr(element_type* __p = 0) throw() : _M_ptr(__p) { }
-
-      /**
-       *  @brief  An %auto_ptr can be constructed from another %auto_ptr.
-       *  @param  a  Another %auto_ptr of the same type.
-       *
-       *  This object now @e owns the object previously owned by @a a,
-       *  which has given up ownsership.
-       */
-      auto_ptr(auto_ptr& __a) throw() : _M_ptr(__a.release()) { }
-
-      /**
-       *  @brief  An %auto_ptr can be constructed from another %auto_ptr.
-       *  @param  a  Another %auto_ptr of a different but related type.
-       *
-       *  A pointer-to-Tp1 must be convertible to a
-       *  pointer-to-Tp/element_type.
-       *
-       *  This object now @e owns the object previously owned by @a a,
-       *  which has given up ownsership.
-       */
-      template<typename _Tp1>
-        auto_ptr(auto_ptr<_Tp1>& __a) throw() : _M_ptr(__a.release()) { }
-
-      /**
-       *  @brief  %auto_ptr assignment operator.
-       *  @param  a  Another %auto_ptr of the same type.
-       *
-       *  This object now @e owns the object previously owned by @a a,
-       *  which has given up ownsership.  The object that this one @e
-       *  used to own and track has been deleted.
-       */
-      auto_ptr&
-      operator=(auto_ptr& __a) throw()
-      {
-	reset(__a.release());
-	return *this;
-      }
-
-      /**
-       *  @brief  %auto_ptr assignment operator.
-       *  @param  a  Another %auto_ptr of a different but related type.
-       *
-       *  A pointer-to-Tp1 must be convertible to a pointer-to-Tp/element_type.
-       *
-       *  This object now @e owns the object previously owned by @a a,
-       *  which has given up ownsership.  The object that this one @e
-       *  used to own and track has been deleted.
-       */
-      template<typename _Tp1>
-        auto_ptr&
-        operator=(auto_ptr<_Tp1>& __a) throw()
-        {
-	  reset(__a.release());
-	  return *this;
-	}
-
-      /**
-       *  When the %auto_ptr goes out of scope, the object it owns is
-       *  deleted.  If it no longer owns anything (i.e., @c get() is
-       *  @c NULL), then this has no effect.
-       *
-       *  @if maint
-       *  The C++ standard says there is supposed to be an empty throw
-       *  specification here, but omitting it is standard conforming.  Its
-       *  presence can be detected only if _Tp::~_Tp() throws, but this is
-       *  prohibited.  [17.4.3.6]/2
-       *  @end maint
-       */
-      ~auto_ptr() { delete _M_ptr; }
-      
-      /**
-       *  @brief  Smart pointer dereferencing.
-       *
-       *  If this %auto_ptr no longer owns anything, then this
-       *  operation will crash.  (For a smart pointer, "no longer owns
-       *  anything" is the same as being a null pointer, and you know
-       *  what happens when you dereference one of those...)
-       */
-      element_type&
-      operator*() const throw() 
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_ptr != 0);
-	return *_M_ptr; 
-      }
-      
-      /**
-       *  @brief  Smart pointer dereferencing.
-       *
-       *  This returns the pointer itself, which the language then will
-       *  automatically cause to be dereferenced.
-       */
-      element_type*
-      operator->() const throw() 
-      {
-	_GLIBCXX_DEBUG_ASSERT(_M_ptr != 0);
-	return _M_ptr; 
-      }
-      
-      /**
-       *  @brief  Bypassing the smart pointer.
-       *  @return  The raw pointer being managed.
-       *
-       *  You can get a copy of the pointer that this object owns, for
-       *  situations such as passing to a function which only accepts
-       *  a raw pointer.
-       *
-       *  @note  This %auto_ptr still owns the memory.
-       */
-      element_type*
-      get() const throw() { return _M_ptr; }
-      
-      /**
-       *  @brief  Bypassing the smart pointer.
-       *  @return  The raw pointer being managed.
-       *
-       *  You can get a copy of the pointer that this object owns, for
-       *  situations such as passing to a function which only accepts
-       *  a raw pointer.
-       *
-       *  @note  This %auto_ptr no longer owns the memory.  When this object
-       *  goes out of scope, nothing will happen.
-       */
-      element_type*
-      release() throw()
-      {
-	element_type* __tmp = _M_ptr;
-	_M_ptr = 0;
-	return __tmp;
-      }
-      
-      /**
-       *  @brief  Forcibly deletes the managed object.
-       *  @param  p  A pointer (defaults to NULL).
-       *
-       *  This object now @e owns the object pointed to by @a p.  The
-       *  previous object has been deleted.
-       */
-      void
-      reset(element_type* __p = 0) throw()
-      {
-	if (__p != _M_ptr)
-	  {
-	    delete _M_ptr;
-	    _M_ptr = __p;
-	  }
-      }
-      
-      /** @{
-       *  @brief  Automatic conversions
-       *
-       *  These operations convert an %auto_ptr into and from an auto_ptr_ref
-       *  automatically as needed.  This allows constructs such as
-       *  @code
-       *    auto_ptr<Derived>  func_returning_auto_ptr(.....);
-       *    ...
-       *    auto_ptr<Base> ptr = func_returning_auto_ptr(.....);
-       *  @endcode
-       */
-      auto_ptr(auto_ptr_ref<element_type> __ref) throw()
-      : _M_ptr(__ref._M_ptr) { }
-      
-      auto_ptr&
-      operator=(auto_ptr_ref<element_type> __ref) throw()
-      {
-	if (__ref._M_ptr != this->get())
-	  {
-	    delete _M_ptr;
-	    _M_ptr = __ref._M_ptr;
-	  }
-	return *this;
-      }
-      
-      template<typename _Tp1>
-        operator auto_ptr_ref<_Tp1>() throw()
-        { return auto_ptr_ref<_Tp1>(this->release()); }
-
-      template<typename _Tp1>
-        operator auto_ptr<_Tp1>() throw()
-        { return auto_ptr<_Tp1>(this->release()); }
-      /** @}  */
-  };
-} // namespace std
-
-#endif /* _GLIBCXX_MEMORY */
diff --git a/include.new/c++/3.4/new b/include.new/c++/3.4/new
deleted file mode 100644
index 00e9946..0000000
--- a/include.new/c++/3.4/new
+++ /dev/null
@@ -1,101 +0,0 @@
-// The -*- C++ -*- dynamic memory management header.
-
-// Copyright (C) 1994, 1996, 1997, 1998, 2000, 2001, 2002
-// Free Software Foundation
-
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-// 
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with GCC; see the file COPYING.  If not, write to
-// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file new
- *  The header @c new defines several functions to manage dynamic memory and
- *  handling memory allocation errors; see
- *  http://gcc.gnu.org/onlinedocs/libstdc++/18_support/howto.html#4 for more.
- */
-
-#ifndef _NEW
-#define _NEW
-
-#include <cstddef>
-#include <exception>
-
-extern "C++" {
-
-namespace std 
-{
-  /**
-   *  @brief  Exception possibly thrown by @c new.
-   *
-   *  @c bad_alloc (or classes derived from it) is used to report allocation
-   *  errors from the throwing forms of @c new.  */
-  class bad_alloc : public exception 
-  {
-  public:
-    bad_alloc() throw() { }
-    // This declaration is not useless:
-    // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-    virtual ~bad_alloc() throw();
-  };
-
-  struct nothrow_t { };
-  extern const nothrow_t nothrow;
-  /** If you write your own error handler to be called by @c new, it must
-   *  be of this type.  */
-  typedef void (*new_handler)();
-  /// Takes a replacement handler as the argument, returns the previous handler.
-  new_handler set_new_handler(new_handler) throw();
-} // namespace std
-
-//@{
-/** These are replaceable signatures:
- *  - normal single new and delete (no arguments, throw @c bad_alloc on error)
- *  - normal array new and delete (same)
- *  - @c nothrow single new and delete (take a @c nothrow argument, return
- *    @c NULL on error)
- *  - @c nothrow array new and delete (same)
- *
- *  Placement new and delete signatures (take a memory address argument,
- *  does nothing) may not be replaced by a user's program.
-*/
-void* operator new(std::size_t) throw (std::bad_alloc);
-void* operator new[](std::size_t) throw (std::bad_alloc);
-void operator delete(void*) throw();
-void operator delete[](void*) throw();
-void* operator new(std::size_t, const std::nothrow_t&) throw();
-void* operator new[](std::size_t, const std::nothrow_t&) throw();
-void operator delete(void*, const std::nothrow_t&) throw();
-void operator delete[](void*, const std::nothrow_t&) throw();
-
-// Default placement versions of operator new.
-inline void* operator new(std::size_t, void* __p) throw() { return __p; }
-inline void* operator new[](std::size_t, void* __p) throw() { return __p; }
-
-// Default placement versions of operator delete.
-inline void  operator delete  (void*, void*) throw() { }
-inline void  operator delete[](void*, void*) throw() { }
-//@}
-} // extern "C++"
-
-#endif
diff --git a/include.new/c++/3.4/numeric b/include.new/c++/3.4/numeric
deleted file mode 100644
index 88661e9..0000000
--- a/include.new/c++/3.4/numeric
+++ /dev/null
@@ -1,72 +0,0 @@
-// <numeric> -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file numeric
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_NUMERIC
-#define _GLIBCXX_NUMERIC 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <cstddef>
-#include <iterator>
-#include <bits/stl_function.h>
-#include <bits/stl_numeric.h>
-
-#endif /* _GLIBCXX_NUMERIC */
diff --git a/include.new/c++/3.4/ostream b/include.new/c++/3.4/ostream
deleted file mode 100644
index e3590f2..0000000
--- a/include.new/c++/3.4/ostream
+++ /dev/null
@@ -1,548 +0,0 @@
-// Output streams -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.6.2  Output streams
-//
-
-/** @file ostream
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_OSTREAM
-#define _GLIBCXX_OSTREAM 1
-
-#pragma GCC system_header
-
-#include <ios>
-
-namespace std
-{
-  // [27.6.2.1] Template class basic_ostream
-  /**
-   *  @brief  Controlling output.
-   *
-   *  This is the base class for all output streams.  It provides text
-   *  formatting of all builtin types, and communicates with any class
-   *  derived from basic_streambuf to do the actual output.
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_ostream : virtual public basic_ios<_CharT, _Traits>
-    {
-    public:
-      // Types (inherited from basic_ios (27.4.4)):
-      typedef _CharT                     		char_type;
-      typedef typename _Traits::int_type 		int_type;
-      typedef typename _Traits::pos_type 		pos_type;
-      typedef typename _Traits::off_type 		off_type;
-      typedef _Traits                    		traits_type;
-      
-      // Non-standard Types:
-      typedef basic_streambuf<_CharT, _Traits> 		__streambuf_type;
-      typedef basic_ios<_CharT, _Traits>		__ios_type;
-      typedef basic_ostream<_CharT, _Traits>		__ostream_type;
-      typedef num_put<_CharT, ostreambuf_iterator<_CharT, _Traits> >        
-      							__num_put_type;
-      typedef ctype<_CharT>           			__ctype_type;
-
-      template<typename _CharT2, typename _Traits2>
-        friend basic_ostream<_CharT2, _Traits2>&
-        operator<<(basic_ostream<_CharT2, _Traits2>&, _CharT2);
- 
-      template<typename _Traits2>
-        friend basic_ostream<char, _Traits2>&
-        operator<<(basic_ostream<char, _Traits2>&, char);
- 
-      template<typename _CharT2, typename _Traits2>
-        friend basic_ostream<_CharT2, _Traits2>&
-        operator<<(basic_ostream<_CharT2, _Traits2>&, const _CharT2*);
- 
-      template<typename _Traits2>
-        friend basic_ostream<char, _Traits2>&
-        operator<<(basic_ostream<char, _Traits2>&, const char*);
- 
-      template<typename _CharT2, typename _Traits2>
-        friend basic_ostream<_CharT2, _Traits2>&
-        operator<<(basic_ostream<_CharT2, _Traits2>&, const char*);
-
-      // [27.6.2.2] constructor/destructor
-      /**
-       *  @brief  Base constructor.
-       *
-       *  This ctor is almost never called by the user directly, rather from
-       *  derived classes' initialization lists, which pass a pointer to
-       *  their own stream buffer.
-      */
-      explicit 
-      basic_ostream(__streambuf_type* __sb)
-      { this->init(__sb); }
-
-      /**
-       *  @brief  Base destructor.
-       *
-       *  This does very little apart from providing a virtual base dtor.
-      */
-      virtual 
-      ~basic_ostream() { }
-
-      // [27.6.2.3] prefix/suffix
-      class sentry;
-      friend class sentry;
-      
-      // [27.6.2.5] formatted output
-      // [27.6.2.5.3]  basic_ostream::operator<<
-      //@{
-      /**
-       *  @brief  Interface for manipulators.
-       *
-       *  Manuipulators such as @c std::endl and @c std::hex use these
-       *  functions in constructs like "std::cout << std::endl".  For more
-       *  information, see the iomanip header.
-      */
-      inline __ostream_type&
-      operator<<(__ostream_type& (*__pf)(__ostream_type&));
-      
-      inline __ostream_type&
-      operator<<(__ios_type& (*__pf)(__ios_type&));
-      
-      inline __ostream_type&
-      operator<<(ios_base& (*__pf) (ios_base&));
-      //@}
-
-      // [27.6.2.5.2] arithmetic inserters
-      /**
-       *  @name Arithmetic Inserters
-       *
-       *  All the @c operator<< functions (aka <em>formatted output
-       *  functions</em>) have some common behavior.  Each starts by
-       *  constructing a temporary object of type std::basic_ostream::sentry.
-       *  This can have several effects, concluding with the setting of a
-       *  status flag; see the sentry documentation for more.
-       *
-       *  If the sentry status is good, the function tries to generate
-       *  whatever data is appropriate for the type of the argument.
-       *
-       *  If an exception is thrown during insertion, ios_base::badbit
-       *  will be turned on in the stream's error state without causing an
-       *  ios_base::failure to be thrown.  The original exception will then
-       *  be rethrown.
-      */
-      //@{
-      /**
-       *  @brief  Basic arithmetic inserters
-       *  @param  A variable of builtin type.
-       *  @return  @c *this if successful
-       *
-       *  These functions use the stream's current locale (specifically, the
-       *  @c num_get facet) to perform numeric formatting.
-      */
-      __ostream_type& 
-      operator<<(long __n);
-      
-      __ostream_type& 
-      operator<<(unsigned long __n);
-
-      __ostream_type& 
-      operator<<(bool __n);
-
-      __ostream_type& 
-      operator<<(short __n)
-      { 
-	ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
-	if (__fmt & ios_base::oct || __fmt & ios_base::hex)
-	  return this->operator<<(static_cast<unsigned long>
-				  (static_cast<unsigned short>(__n)));
-	else
-	  return this->operator<<(static_cast<long>(__n));
-      }
-
-      __ostream_type& 
-      operator<<(unsigned short __n)
-      { return this->operator<<(static_cast<unsigned long>(__n)); }
-
-      __ostream_type& 
-      operator<<(int __n)
-      { 
-	ios_base::fmtflags __fmt = this->flags() & ios_base::basefield;
-	if (__fmt & ios_base::oct || __fmt & ios_base::hex)
-	  return this->operator<<(static_cast<unsigned long>
-				  (static_cast<unsigned int>(__n)));
-	else
-	  return this->operator<<(static_cast<long>(__n));
-      }
-
-      __ostream_type& 
-      operator<<(unsigned int __n)
-      { return this->operator<<(static_cast<unsigned long>(__n)); }
-
-#ifdef _GLIBCXX_USE_LONG_LONG
-      __ostream_type& 
-      operator<<(long long __n);
-
-      __ostream_type& 
-      operator<<(unsigned long long __n);
-#endif
-
-      __ostream_type& 
-      operator<<(double __f);
-
-      __ostream_type& 
-      operator<<(float __f)
-      { return this->operator<<(static_cast<double>(__f)); }
-
-      __ostream_type& 
-      operator<<(long double __f);
-
-      __ostream_type& 
-      operator<<(const void* __p);
-
-      /**
-       *  @brief  Extracting from another streambuf.
-       *  @param  sb  A pointer to a streambuf
-       *
-       *  This function behaves like one of the basic arithmetic extractors,
-       *  in that it also constructs a sentry object and has the same error
-       *  handling behavior.
-       *
-       *  If @a sb is NULL, the stream will set failbit in its error state.
-       *
-       *  Characters are extracted from @a sb and inserted into @c *this
-       *  until one of the following occurs:
-       *
-       *  - the input stream reaches end-of-file,
-       *  - insertion into the output sequence fails (in this case, the
-       *    character that would have been inserted is not extracted), or
-       *  - an exception occurs while getting a character from @a sb, which
-       *    sets failbit in the error state
-       *
-       *  If the function inserts no characters, failbit is set.
-      */
-      __ostream_type& 
-      operator<<(__streambuf_type* __sb);
-      //@}
-
-      // [27.6.2.6] unformatted output functions
-      /**
-       *  @name Unformatted Output Functions
-       *
-       *  All the unformatted output functions have some common behavior.
-       *  Each starts by constructing a temporary object of type
-       *  std::basic_ostream::sentry.  This has several effects, concluding
-       *  with the setting of a status flag; see the sentry documentation
-       *  for more.
-       *
-       *  If the sentry status is good, the function tries to generate
-       *  whatever data is appropriate for the type of the argument.
-       *
-       *  If an exception is thrown during insertion, ios_base::badbit
-       *  will be turned on in the stream's error state.  If badbit is on in
-       *  the stream's exceptions mask, the exception will be rethrown
-       *  without completing its actions.
-      */
-      //@{
-      /**
-       *  @brief  Simple insertion.
-       *  @param  c  The character to insert.
-       *  @return  *this
-       *
-       *  Tries to insert @a c.
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __ostream_type& 
-      put(char_type __c);
-
-      // Core write functionality, without sentry.
-      void
-      _M_write(const char_type* __s, streamsize __n)
-      {
-	streamsize __put = this->rdbuf()->sputn(__s, __n);
-	if (__put != __n)
-	  this->setstate(ios_base::badbit);
-      }
-
-      /**
-       *  @brief  Character string insertion.
-       *  @param  s  The array to insert.
-       *  @param  n  Maximum number of characters to insert.
-       *  @return  *this
-       *
-       *  Characters are copied from @a s and inserted into the stream until
-       *  one of the following happens:
-       *
-       *  - @a n characters are inserted
-       *  - inserting into the output sequence fails (in this case, badbit
-       *    will be set in the stream's error state)
-       *
-       *  @note  This function is not overloaded on signed char and
-       *         unsigned char.
-      */
-      __ostream_type& 
-      write(const char_type* __s, streamsize __n);
-      //@}
-
-      /**
-       *  @brief  Synchronizing the stream buffer.
-       *  @return  *this
-       *
-       *  If @c rdbuf() is a null pointer, changes nothing.
-       *
-       *  Otherwise, calls @c rdbuf()->pubsync(), and if that returns -1,
-       *  sets badbit.
-      */
-      __ostream_type& 
-      flush();
-
-      // [27.6.2.4] seek members
-      /**
-       *  @brief  Getting the current write position.
-       *  @return  A file position object.
-       *
-       *  If @c fail() is not false, returns @c pos_type(-1) to indicate
-       *  failure.  Otherwise returns @c rdbuf()->pubseekoff(0,cur,out).
-      */
-      pos_type 
-      tellp();
-
-      /**
-       *  @brief  Changing the current write position.
-       *  @param  pos  A file position object.
-       *  @return  *this
-       *
-       *  If @c fail() is not true, calls @c rdbuf()->pubseekpos(pos).  If
-       *  that function fails, sets failbit.
-      */
-      __ostream_type& 
-      seekp(pos_type);
-
-      /**
-       *  @brief  Changing the current write position.
-       *  @param  off  A file offset object.
-       *  @param  dir  The direction in which to seek.
-       *  @return  *this
-       *
-       *  If @c fail() is not true, calls @c rdbuf()->pubseekoff(off,dir).
-       *  If that function fails, sets failbit.
-      */
-       __ostream_type& 
-      seekp(off_type, ios_base::seekdir);
-      
-    protected:
-      explicit 
-      basic_ostream() { }
-    };
-
-  /**
-   *  @brief  Performs setup work for output streams.
-   *
-   *  Objects of this class are created before all of the standard
-   *  inserters are run.  It is responsible for "exception-safe prefix and
-   *  suffix operations."  Additional actions may be added by the
-   *  implementation, and we list them in
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/17_intro/howto.html#5
-   *  under [27.6] notes.
-  */
-  template <typename _CharT, typename _Traits>
-    class basic_ostream<_CharT, _Traits>::sentry
-    {
-      // Data Members:
-      bool 				_M_ok;
-      basic_ostream<_CharT,_Traits>& 	_M_os;
-      
-    public:
-      /**
-       *  @brief  The constructor performs preparatory work.
-       *  @param  os  The output stream to guard.
-       *
-       *  If the stream state is good (@a os.good() is true), then if the
-       *  stream is tied to another output stream, @c is.tie()->flush()
-       *  is called to synchronize the output sequences.
-       *
-       *  If the stream state is still good, then the sentry state becomes
-       *  true ("okay").
-      */
-      explicit
-      sentry(basic_ostream<_CharT,_Traits>& __os);
-
-      /**
-       *  @brief  Possibly flushes the stream.
-       *
-       *  If @c ios_base::unitbuf is set in @c os.flags(), and
-       *  @c std::uncaught_exception() is true, the sentry destructor calls
-       *  @c flush() on the output stream.
-      */
-      ~sentry()
-      {
-	// XXX MT
-	if (_M_os.flags() & ios_base::unitbuf && !uncaught_exception())
-	  {
-	    // Can't call flush directly or else will get into recursive lock.
-	    if (_M_os.rdbuf() && _M_os.rdbuf()->pubsync() == -1)
-	      _M_os.setstate(ios_base::badbit);
-	  }
-      }
-
-      /**
-       *  @brief  Quick status checking.
-       *  @return  The sentry state.
-       *
-       *  For ease of use, sentries may be converted to booleans.  The
-       *  return value is that of the sentry state (true == okay).
-      */
-      operator bool() const
-      { return _M_ok; }
-    };
-
-  // [27.6.2.5.4] character insertion templates
-  //@{
-  /**
-   *  @brief  Character inserters
-   *  @param  out  An output stream.
-   *  @param  c  A character.
-   *  @return  out
-   *
-   *  Behaves like one of the formatted arithmetic inserters described in
-   *  std::basic_ostream.  After constructing a sentry object with good
-   *  status, this function inserts a single character and any required
-   *  padding (as determined by [22.2.2.2.2]).  @c out.width(0) is then
-   *  called.
-   *
-   *  If @a c is of type @c char and the character type of the stream is not
-   *  @c char, the character is widened before insertion.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, _CharT __c);
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, char __c)
-    { return (__out << __out.widen(__c)); }
-
-  // Specialization
-  template <class _Traits> 
-    basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, char __c);
-
-  // Signed and unsigned
-  template<class _Traits>
-    basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, signed char __c)
-    { return (__out << static_cast<char>(__c)); }
-  
-  template<class _Traits>
-    basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, unsigned char __c)
-    { return (__out << static_cast<char>(__c)); }
-  //@}
-  
-  //@{
-  /**
-   *  @brief  String inserters
-   *  @param  out  An output stream.
-   *  @param  s  A character string.
-   *  @return  out
-   *  @pre  @a s must be a non-NULL pointer
-   *
-   *  Behaves like one of the formatted arithmetic inserters described in
-   *  std::basic_ostream.  After constructing a sentry object with good
-   *  status, this function inserts @c traits::length(s) characters starting
-   *  at @a s, widened if necessary, followed by any required padding (as
-   *  determined by [22.2.2.2.2]).  @c out.width(0) is then called.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __out, const _CharT* __s);
-
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits> &
-    operator<<(basic_ostream<_CharT, _Traits>& __out, const char* __s);
-
-  // Partial specializationss
-  template<class _Traits>
-    basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, const char* __s);
- 
-  // Signed and unsigned
-  template<class _Traits>
-    basic_ostream<char, _Traits>&
-    operator<<(basic_ostream<char, _Traits>& __out, const signed char* __s)
-    { return (__out << reinterpret_cast<const char*>(__s)); }
-
-  template<class _Traits>
-    basic_ostream<char, _Traits> &
-    operator<<(basic_ostream<char, _Traits>& __out, const unsigned char* __s)
-    { return (__out << reinterpret_cast<const char*>(__s)); }
-  //@}
-
-  // [27.6.2.7] standard basic_ostream manipulators
-  /**
-   *  @brief  Write a newline and flush the stream.
-   *
-   *  This manipulator is often mistakenly used when a simple newline is
-   *  desired, leading to poor buffering performance.  See
-   *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#2 for more
-   *  on this subject.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>& 
-    endl(basic_ostream<_CharT, _Traits>& __os)
-    { return flush(__os.put(__os.widen('\n'))); }
-
-  /**
-   *  @brief  Write a null character into the output sequence.
-   *
-   *  "Null character" is @c CharT() by definition.  For CharT of @c char,
-   *  this correctly writes the ASCII @c NUL character string terminator.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>& 
-    ends(basic_ostream<_CharT, _Traits>& __os)
-    { return __os.put(_CharT()); }
-  
-  /**
-   *  @brief  Flushes the output stream.
-   *
-   *  This manipulator simply calls the stream's @c flush() member function.
-  */
-  template<typename _CharT, typename _Traits>
-    basic_ostream<_CharT, _Traits>& 
-    flush(basic_ostream<_CharT, _Traits>& __os)
-    { return __os.flush(); }
-
-} // namespace std
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/ostream.tcc>
-#endif
-
-#endif	/* _GLIBCXX_OSTREAM */
diff --git a/include.new/c++/3.4/queue b/include.new/c++/3.4/queue
deleted file mode 100644
index 9a6523b..0000000
--- a/include.new/c++/3.4/queue
+++ /dev/null
@@ -1,78 +0,0 @@
-// <queue> -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file queue
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_QUEUE
-#define _GLIBCXX_QUEUE 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/functexcept.h>
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_heap.h>
-#include <bits/stl_function.h>
-#include <deque>
-#include <vector>
-#include <bits/stl_queue.h>
-
-#endif /* _GLIBCXX_QUEUE */
diff --git a/include.new/c++/3.4/set b/include.new/c++/3.4/set
deleted file mode 100644
index 7ef8c9f..0000000
--- a/include.new/c++/3.4/set
+++ /dev/null
@@ -1,74 +0,0 @@
-// <set> -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file set
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_SET
-#define _GLIBCXX_SET 1
-
-#pragma GCC system_header
-
-#include <bits/stl_tree.h>
-#include <bits/stl_set.h>
-#include <bits/stl_multiset.h>
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/set>
-#endif
-
-#endif /* _GLIBCXX_SET */
diff --git a/include.new/c++/3.4/sstream b/include.new/c++/3.4/sstream
deleted file mode 100644
index 0a6738a..0000000
--- a/include.new/c++/3.4/sstream
+++ /dev/null
@@ -1,643 +0,0 @@
-// String based streams -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.7  String-based streams
-//
-
-/** @file sstream
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_SSTREAM
-#define _GLIBCXX_SSTREAM 1
-
-#pragma GCC system_header
-
-#include <istream>
-#include <ostream>
-
-namespace std
-{
-  // [27.7.1] template class basic_stringbuf
-  /**
-   *  @brief  The actual work of input and output (for std::string).
-   *
-   *  This class associates either or both of its input and output sequences
-   *  with a sequence of characters, which can be initialized from, or made
-   *  available as, a @c std::basic_string.  (Paraphrased from [27.7.1]/1.)
-   *
-   *  For this class, open modes (of type @c ios_base::openmode) have
-   *  @c in set if the input sequence can be read, and @c out set if the
-   *  output sequence can be written.
-  */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class basic_stringbuf : public basic_streambuf<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      //@{
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      typedef basic_streambuf<char_type, traits_type>  	__streambuf_type;
-      typedef basic_string<char_type, _Traits, _Alloc> 	__string_type;
-      typedef typename __string_type::size_type		__size_type;
-      //@}
-
-    protected:
-      /**
-       *  @if maint
-       *  Place to stash in || out || in | out settings for current stringbuf.
-       *  @endif
-      */
-      ios_base::openmode 	_M_mode;
-
-      // Data Members:
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __string_type 		_M_string;
-
-    public:
-      // Constructors:
-      /**
-       *  @brief  Starts with an empty string buffer.
-       *  @param  mode  Whether the buffer can read, or write, or both.
-       *
-       *  The default constructor initializes the parent class using its
-       *  own default ctor.
-      */
-      explicit
-      basic_stringbuf(ios_base::openmode __mode = ios_base::in | ios_base::out)
-      : __streambuf_type(), _M_mode(__mode), _M_string()
-      { }
-
-      /**
-       *  @brief  Starts with an existing string buffer.
-       *  @param  str  A string to copy as a starting buffer.
-       *  @param  mode  Whether the buffer can read, or write, or both.
-       *
-       *  This constructor initializes the parent class using its
-       *  own default ctor.
-      */
-      explicit
-      basic_stringbuf(const __string_type& __str,
-		      ios_base::openmode __mode = ios_base::in | ios_base::out)
-      : __streambuf_type(), _M_mode(), _M_string(__str.data(), __str.size())
-      { _M_stringbuf_init(__mode); }
-
-      // Get and set:
-      /**
-       *  @brief  Copying out the string buffer.
-       *  @return  A copy of one of the underlying sequences.
-       *
-       *  "If the buffer is only created in input mode, the underlying
-       *  character sequence is equal to the input sequence; otherwise, it
-       *  is equal to the output sequence." [27.7.1.2]/1
-      */
-      __string_type
-      str() const
-      {
-	if (this->pptr())
-	  {
-	    // The current egptr() may not be the actual string end.
-	    if (this->pptr() > this->egptr())
-	      return __string_type(this->pbase(), this->pptr());
-	    else
- 	      return __string_type(this->pbase(), this->egptr());
-	  }
-	else
-	  return _M_string;
-      }
-
-      /**
-       *  @brief  Setting a new buffer.
-       *  @param  s  The string to use as a new sequence.
-       *
-       *  Deallocates any previous stored sequence, then copies @a s to
-       *  use as a new one.
-      */
-      void
-      str(const __string_type& __s)
-      {
-	// Cannot use _M_string = __s, since v3 strings are COW.
-	_M_string.assign(__s.data(), __s.size());
-	_M_stringbuf_init(this->_M_mode);
-      }
-
-    protected:
-      // Common initialization code goes here.
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      void
-      _M_stringbuf_init(ios_base::openmode __mode)
-      {
-	this->_M_mode = __mode;
-
-	__size_type __len = 0;
-	if (this->_M_mode & (ios_base::ate | ios_base::app))
-	  __len = _M_string.size();
-	_M_sync(const_cast<char_type*>(_M_string.data()), 0, __len);
-      }
-
-      // [documentation is inherited]
-      virtual int_type
-      underflow();
-
-      // [documentation is inherited]
-      virtual int_type
-      pbackfail(int_type __c = traits_type::eof());
-
-      // [documentation is inherited]
-      virtual int_type
-      overflow(int_type __c = traits_type::eof());
-
-      /**
-       *  @brief  Manipulates the buffer.
-       *  @param  s  Pointer to a buffer area.
-       *  @param  n  Size of @a s.
-       *  @return  @c this
-       *
-       *  If no buffer has already been created, and both @a s and @a n are
-       *  non-zero, then @c s is used as a buffer; see
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#2
-       *  for more.
-      */
-      virtual __streambuf_type*
-      setbuf(char_type* __s, streamsize __n)
-      {
-	if (__s && __n >= 0)
-	  {
-	    // This is implementation-defined behavior, and assumes
-	    // that an external char_type array of length __n exists
-	    // and has been pre-allocated. If this is not the case,
-	    // things will quickly blow up.
-	    
-	    // Step 1: Destroy the current internal array.
-	    _M_string = __string_type(__s, __n);
-	    
-	    // Step 2: Use the external array.
-	    _M_sync(__s, 0, 0);
-	  }
-	return this;
-      }
-
-      // [documentation is inherited]
-      virtual pos_type
-      seekoff(off_type __off, ios_base::seekdir __way,
-	      ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      // [documentation is inherited]
-      virtual pos_type
-      seekpos(pos_type __sp,
-	      ios_base::openmode __mode = ios_base::in | ios_base::out);
-
-      // Internal function for correctly updating the internal buffer
-      // for a particular _M_string, due to initialization or
-      // re-sizing of an existing _M_string.
-      // Assumes: contents of _M_string and internal buffer match exactly.
-      // __i == _M_in_cur - _M_in_beg
-      // __o == _M_out_cur - _M_out_beg
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      void
-      _M_sync(char_type* __base, __size_type __i, __size_type __o)
-      {
-	const bool __testin = this->_M_mode & ios_base::in;
-	const bool __testout = this->_M_mode & ios_base::out;
-	const __size_type __len = _M_string.size();
-
-	if (__testin)
-	  this->setg(__base, __base + __i, __base + __len);
-	if (__testout)
-	  {
-	    this->setp(__base, __base + _M_string.capacity());
-	    this->pbump(__o);
-	    // We need a pointer to the string end anyway, even when
-	    // !__testin: in that case, however, for the correct
-	    // functioning of the streambuf inlines all the get area
-	    // pointers must be identical.
-	    if (!__testin)
-	      this->setg(__base + __len, __base + __len, __base + __len);
-	  }
-      }
-
-      // Internal function for correctly updating egptr() to the actual
-      // string end.
-      void
-      _M_update_egptr()
-      {
-	const bool __testin = this->_M_mode & ios_base::in;
-
-	if (this->pptr() && this->pptr() > this->egptr())
-	  if (__testin)
-	    this->setg(this->eback(), this->gptr(), this->pptr());
-	  else
-	    this->setg(this->pptr(), this->pptr(), this->pptr());
-      }
-    };
-
-
-  // [27.7.2] Template class basic_istringstream
-  /**
-   *  @brief  Controlling input for std::string.
-   *
-   *  This class supports reading from objects of type std::basic_string,
-   *  using the inherited functions from std::basic_istream.  To control
-   *  the associated sequence, an instance of std::basic_stringbuf is used,
-   *  which this page refers to as @c sb.
-  */
-  template<typename _CharT, typename _Traits, typename _Alloc>
-    class basic_istringstream : public basic_istream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_string<_CharT, _Traits, _Alloc> 	__string_type;
-      typedef basic_stringbuf<_CharT, _Traits, _Alloc> 	__stringbuf_type;
-      typedef basic_istream<char_type, traits_type>	__istream_type;
-
-    private:
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __stringbuf_type	_M_stringbuf;
-
-    public:
-      // Constructors:
-      /**
-       *  @brief  Default constructor starts with an empty string buffer.
-       *  @param  mode  Whether the buffer can read, or write, or both.
-       *
-       *  @c ios_base::in is automatically included in @a mode.
-       *
-       *  Initializes @c sb using @c mode|in, and passes @c &sb to the base
-       *  class initializer.  Does not allocate any buffer.
-       *
-       *  @if maint
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-       *  @endif
-      */
-      explicit
-      basic_istringstream(ios_base::openmode __mode = ios_base::in)
-      : __istream_type(), _M_stringbuf(__mode | ios_base::in)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  Starts with an existing string buffer.
-       *  @param  str  A string to copy as a starting buffer.
-       *  @param  mode  Whether the buffer can read, or write, or both.
-       *
-       *  @c ios_base::in is automatically included in @a mode.
-       *
-       *  Initializes @c sb using @a str and @c mode|in, and passes @c &sb
-       *  to the base class initializer.
-       *
-       *  @if maint
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-       *  @endif
-      */
-      explicit
-      basic_istringstream(const __string_type& __str,
-			  ios_base::openmode __mode = ios_base::in)
-      : __istream_type(), _M_stringbuf(__str, __mode | ios_base::in)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The buffer is deallocated by the stringbuf object, not the
-       *  formatting stream.
-      */
-      ~basic_istringstream()
-      { }
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_stringbuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-      */
-      __stringbuf_type*
-      rdbuf() const
-      { return const_cast<__stringbuf_type*>(&_M_stringbuf); }
-
-      /**
-       *  @brief  Copying out the string buffer.
-       *  @return  @c rdbuf()->str()
-      */
-      __string_type
-      str() const
-      { return _M_stringbuf.str(); }
-
-      /**
-       *  @brief  Setting a new buffer.
-       *  @param  s  The string to use as a new sequence.
-       *
-       *  Calls @c rdbuf()->str(s).
-      */
-      void
-      str(const __string_type& __s)
-      { _M_stringbuf.str(__s); }
-    };
-
-
-  // [27.7.3] Template class basic_ostringstream
-  /**
-   *  @brief  Controlling output for std::string.
-   *
-   *  This class supports writing to objects of type std::basic_string,
-   *  using the inherited functions from std::basic_ostream.  To control
-   *  the associated sequence, an instance of std::basic_stringbuf is used,
-   *  which this page refers to as @c sb.
-  */
-  template <typename _CharT, typename _Traits, typename _Alloc>
-    class basic_ostringstream : public basic_ostream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard types:
-      typedef basic_string<_CharT, _Traits, _Alloc> 	__string_type;
-      typedef basic_stringbuf<_CharT, _Traits, _Alloc> 	__stringbuf_type;
-      typedef basic_ostream<char_type, traits_type>	__ostream_type;
-
-    private:
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __stringbuf_type	_M_stringbuf;
-
-    public:
-      // Constructors/destructor:
-      /**
-       *  @brief  Default constructor starts with an empty string buffer.
-       *  @param  mode  Whether the buffer can read, or write, or both.
-       *
-       *  @c ios_base::out is automatically included in @a mode.
-       *
-       *  Initializes @c sb using @c mode|out, and passes @c &sb to the base
-       *  class initializer.  Does not allocate any buffer.
-       *
-       *  @if maint
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-       *  @endif
-      */
-      explicit
-      basic_ostringstream(ios_base::openmode __mode = ios_base::out)
-      : __ostream_type(), _M_stringbuf(__mode | ios_base::out)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  Starts with an existing string buffer.
-       *  @param  str  A string to copy as a starting buffer.
-       *  @param  mode  Whether the buffer can read, or write, or both.
-       *
-       *  @c ios_base::out is automatically included in @a mode.
-       *
-       *  Initializes @c sb using @a str and @c mode|out, and passes @c &sb
-       *  to the base class initializer.
-       *
-       *  @if maint
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-       *  @endif
-      */
-      explicit
-      basic_ostringstream(const __string_type& __str,
-			  ios_base::openmode __mode = ios_base::out)
-      : __ostream_type(), _M_stringbuf(__str, __mode | ios_base::out)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The buffer is deallocated by the stringbuf object, not the
-       *  formatting stream.
-      */
-      ~basic_ostringstream()
-      { }
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_stringbuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-      */
-      __stringbuf_type*
-      rdbuf() const
-      { return const_cast<__stringbuf_type*>(&_M_stringbuf); }
-
-      /**
-       *  @brief  Copying out the string buffer.
-       *  @return  @c rdbuf()->str()
-      */
-      __string_type
-      str() const
-      { return _M_stringbuf.str(); }
-
-      /**
-       *  @brief  Setting a new buffer.
-       *  @param  s  The string to use as a new sequence.
-       *
-       *  Calls @c rdbuf()->str(s).
-      */
-      void
-      str(const __string_type& __s)
-      { _M_stringbuf.str(__s); }
-    };
-
-
-  // [27.7.4] Template class basic_stringstream
-  /**
-   *  @brief  Controlling input and output for std::string.
-   *
-   *  This class supports reading from and writing to objects of type
-   *  std::basic_string, using the inherited functions from
-   *  std::basic_iostream.  To control the associated sequence, an instance
-   *  of std::basic_stringbuf is used, which this page refers to as @c sb.
-  */
-  template <typename _CharT, typename _Traits, typename _Alloc>
-    class basic_stringstream : public basic_iostream<_CharT, _Traits>
-    {
-    public:
-      // Types:
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 251. basic_stringbuf missing allocator_type
-      typedef _Alloc				       	allocator_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-
-      // Non-standard Types:
-      typedef basic_string<_CharT, _Traits, _Alloc> 	__string_type;
-      typedef basic_stringbuf<_CharT, _Traits, _Alloc> 	__stringbuf_type;
-      typedef basic_iostream<char_type, traits_type>	__iostream_type;
-
-    private:
-      /**
-       *  @if maint
-       *  @doctodo
-       *  @endif
-      */
-      __stringbuf_type	_M_stringbuf;
-
-    public:
-      // Constructors/destructors
-      /**
-       *  @brief  Default constructor starts with an empty string buffer.
-       *  @param  mode  Whether the buffer can read, or write, or both.
-       *
-       *  Initializes @c sb using @c mode, and passes @c &sb to the base
-       *  class initializer.  Does not allocate any buffer.
-       *
-       *  @if maint
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-       *  @endif
-      */
-      explicit
-      basic_stringstream(ios_base::openmode __m = ios_base::out | ios_base::in)
-      : __iostream_type(), _M_stringbuf(__m)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  Starts with an existing string buffer.
-       *  @param  str  A string to copy as a starting buffer.
-       *  @param  mode  Whether the buffer can read, or write, or both.
-       *
-       *  Initializes @c sb using @a str and @c mode, and passes @c &sb
-       *  to the base class initializer.
-       *
-       *  @if maint
-       *  That's a lie.  We initialize the base class with NULL, because the
-       *  string class does its own memory management.
-       *  @endif
-      */
-      explicit
-      basic_stringstream(const __string_type& __str,
-			 ios_base::openmode __m = ios_base::out | ios_base::in)
-      : __iostream_type(), _M_stringbuf(__str, __m)
-      { this->init(&_M_stringbuf); }
-
-      /**
-       *  @brief  The destructor does nothing.
-       *
-       *  The buffer is deallocated by the stringbuf object, not the
-       *  formatting stream.
-      */
-      ~basic_stringstream()
-      { }
-
-      // Members:
-      /**
-       *  @brief  Accessing the underlying buffer.
-       *  @return  The current basic_stringbuf buffer.
-       *
-       *  This hides both signatures of std::basic_ios::rdbuf().
-      */
-      __stringbuf_type*
-      rdbuf() const
-      { return const_cast<__stringbuf_type*>(&_M_stringbuf); }
-
-      /**
-       *  @brief  Copying out the string buffer.
-       *  @return  @c rdbuf()->str()
-      */
-      __string_type
-      str() const
-      { return _M_stringbuf.str(); }
-
-      /**
-       *  @brief  Setting a new buffer.
-       *  @param  s  The string to use as a new sequence.
-       *
-       *  Calls @c rdbuf()->str(s).
-      */
-      void
-      str(const __string_type& __s)
-      { _M_stringbuf.str(__s); }
-    };
-} // namespace std
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/sstream.tcc>
-#endif
-
-#endif /* _GLIBCXX_SSTREAM */
diff --git a/include.new/c++/3.4/stack b/include.new/c++/3.4/stack
deleted file mode 100644
index 70f0456..0000000
--- a/include.new/c++/3.4/stack
+++ /dev/null
@@ -1,73 +0,0 @@
-// <stack> -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file stack
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_STACK
-#define _GLIBCXX_STACK 1
-
-#pragma GCC system_header
-
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <deque>
-#include <bits/stl_stack.h>
-
-#endif /* _GLIBCXX_STACK */
diff --git a/include.new/c++/3.4/stdexcept b/include.new/c++/3.4/stdexcept
deleted file mode 100644
index ebd97f5..0000000
--- a/include.new/c++/3.4/stdexcept
+++ /dev/null
@@ -1,148 +0,0 @@
-// Standard exception classes  -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 19.1  Exception classes
-//
-
-/** @file stdexcept
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_STDEXCEPT
-#define _GLIBCXX_STDEXCEPT 1
-
-#pragma GCC system_header
-
-#include <exception>
-#include <string>
-
-namespace std 
-{
-  /** Logic errors represent problems in the internal logic of a program;
-   *  in theory, these are preventable, and even detectable before the
-   *  program runs (e.g., violations of class invariants).
-   *  @brief One of two subclasses of exception.
-   */
-  class logic_error : public exception 
-  {
-    string _M_msg;
-
-  public:
-    /** Takes a character string describing the error.  */
-    explicit 
-    logic_error(const string&  __arg);
-
-    virtual 
-    ~logic_error() throw();
-
-    /** Returns a C-style character string describing the general cause of
-     *  the current error (the same string passed to the ctor).  */
-    virtual const char* 
-    what() const throw();
-  };
-
-  /** Thrown by the library, or by you, to report domain errors (domain in
-   *  the mathmatical sense).  */
-  class domain_error : public logic_error 
-  {
-  public:
-    explicit domain_error(const string&  __arg);
-  };
-
-  /** Thrown to report invalid arguments to functions.  */
-  class invalid_argument : public logic_error 
-  {
-  public:
-    explicit invalid_argument(const string&  __arg);
-  };
-
-  /** Thrown when an object is constructed that would exceed its maximum
-   *  permitted size (e.g., a basic_string instance).  */
-  class length_error : public logic_error 
-  {
-  public:
-    explicit length_error(const string&  __arg);
-  };
-
-  /** This represents an argument whose value is not within the expected
-   *  range (e.g., boundary checks in basic_string).  */
-  class out_of_range : public logic_error 
-  {
-  public:
-    explicit out_of_range(const string&  __arg);
-  };
-
-  /** Runtime errors represent problems outside the scope of a program;
-   *  they cannot be easily predicted and can generally only be caught as
-   *  the program executes.
-   *  @brief One of two subclasses of exception.
-   */
-  class runtime_error : public exception 
-  {
-    string _M_msg;
-
-  public:
-    /** Takes a character string describing the error.  */
-    explicit 
-    runtime_error(const string&  __arg);
-
-    virtual 
-    ~runtime_error() throw();
-
-    /** Returns a C-style character string describing the general cause of
-     *  the current error (the same string passed to the ctor).  */
-    virtual const char* 
-    what() const throw();
-  };
-
-  /** Thrown to indicate range errors in internal computations.  */
-  class range_error : public runtime_error 
-  {
-  public:
-    explicit range_error(const string&  __arg);
-  };
-
-  /** Thrown to indicate arithmetic overflow.  */
-  class overflow_error : public runtime_error 
-  {
-  public:
-    explicit overflow_error(const string&  __arg);
-  };
-
-  /** Thrown to indicate arithmetic underflow.  */
-  class underflow_error : public runtime_error 
-  {
-  public:
-    explicit underflow_error(const string&  __arg);
-  };
-} // namespace std
-
-#endif /* _GLIBCXX_STDEXCEPT */
diff --git a/include.new/c++/3.4/streambuf b/include.new/c++/3.4/streambuf
deleted file mode 100644
index 42b3d78..0000000
--- a/include.new/c++/3.4/streambuf
+++ /dev/null
@@ -1,784 +0,0 @@
-// Stream buffer classes -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 27.5  Stream buffers
-//
-
-/** @file streambuf
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _CLIBXX_STREAMBUF
-#define _CLIBXX_STREAMBUF 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <iosfwd>
-#include <bits/localefwd.h>
-#include <bits/ios_base.h>
-
-namespace std
-{
-  /**
-   *  @if maint
-   *  Does stuff.
-   *  @endif
-  */
-  template<typename _CharT, typename _Traits>
-    streamsize
-    __copy_streambufs(basic_streambuf<_CharT, _Traits>* __sbin,
-		      basic_streambuf<_CharT, _Traits>* __sbout);
-  
-  /**
-   *  @brief  The actual work of input and output (interface).
-   *
-   *  This is a base class.  Derived stream buffers each control a
-   *  pair of character sequences:  one for input, and one for output.
-   *
-   *  Section [27.5.1] of the standard describes the requirements and
-   *  behavior of stream buffer classes.  That section (three paragraphs)
-   *  is reproduced here, for simplicity and accuracy.
-   *
-   *  -# Stream buffers can impose various constraints on the sequences
-   *     they control.  Some constraints are:
-   *     - The controlled input sequence can be not readable.
-   *     - The controlled output sequence can be not writable.
-   *     - The controlled sequences can be associated with the contents of
-   *       other representations for character sequences, such as external
-   *       files.
-   *     - The controlled sequences can support operations @e directly to or
-   *       from associated sequences.
-   *     - The controlled sequences can impose limitations on how the
-   *       program can read characters from a sequence, write characters to
-   *       a sequence, put characters back into an input sequence, or alter
-   *       the stream position.
-   *     .
-   *  -# Each sequence is characterized by three pointers which, if non-null,
-   *     all point into the same @c charT array object.  The array object
-   *     represents, at any moment, a (sub)sequence of characters from the
-   *     sequence.  Operations performed on a sequence alter the values
-   *     stored in these pointers, perform reads and writes directly to or
-   *     from associated sequences, and alter "the stream position" and
-   *     conversion state as needed to maintain this subsequence relationship.
-   *     The three pointers are:
-   *     - the <em>beginning pointer</em>, or lowest element address in the
-   *       array (called @e xbeg here);
-   *     - the <em>next pointer</em>, or next element address that is a
-   *       current candidate for reading or writing (called @e xnext here);
-   *     - the <em>end pointer</em>, or first element address beyond the
-   *       end of the array (called @e xend here).
-   *     .
-   *  -# The following semantic constraints shall always apply for any set
-   *     of three pointers for a sequence, using the pointer names given
-   *     immediately above:
-   *     - If @e xnext is not a null pointer, then @e xbeg and @e xend shall
-   *       also be non-null pointers into the same @c charT array, as
-   *       described above; otherwise, @e xbeg and @e xend shall also be null.
-   *     - If @e xnext is not a null pointer and @e xnext < @e xend for an
-   *       output sequence, then a <em>write position</em> is available.
-   *       In this case, @e *xnext shall be assignable as the next element
-   *       to write (to put, or to store a character value, into the sequence).
-   *     - If @e xnext is not a null pointer and @e xbeg < @e xnext for an
-   *       input sequence, then a <em>putback position</em> is available.
-   *       In this case, @e xnext[-1] shall have a defined value and is the
-   *       next (preceding) element to store a character that is put back
-   *       into the input sequence.
-   *     - If @e xnext is not a null pointer and @e xnext< @e xend for an
-   *       input sequence, then a <em>read position</em> is available.
-   *       In this case, @e *xnext shall have a defined value and is the
-   *       next element to read (to get, or to obtain a character value,
-   *       from the sequence).
-  */
-  template<typename _CharT, typename _Traits>
-    class basic_streambuf 
-    {
-    public:
-      //@{
-      /**
-       *  These are standard types.  They permit a standardized way of
-       *  referring to names of (or names dependant on) the template
-       *  parameters, which are specific to the implementation.
-      */
-      typedef _CharT 					char_type;
-      typedef _Traits 					traits_type;
-      typedef typename traits_type::int_type 		int_type;
-      typedef typename traits_type::pos_type 		pos_type;
-      typedef typename traits_type::off_type 		off_type;
-      //@}
-
-      //@{
-      /**
-       *  @if maint
-       *  This is a non-standard type.
-       *  @endif
-      */
-      typedef basic_streambuf<char_type, traits_type>  	__streambuf_type;
-      //@}
-      
-      friend class basic_ios<char_type, traits_type>;
-      friend class basic_istream<char_type, traits_type>;
-      friend class basic_ostream<char_type, traits_type>;
-      friend class istreambuf_iterator<char_type, traits_type>;
-      friend class ostreambuf_iterator<char_type, traits_type>;
-
-      friend streamsize
-      __copy_streambufs<>(__streambuf_type* __sbin,
-			  __streambuf_type* __sbout);
-      
-    protected:
-      //@{
-      /**
-       *  @if maint
-       *  This is based on _IO_FILE, just reordered to be more consistent,
-       *  and is intended to be the most minimal abstraction for an
-       *  internal buffer.
-       *  -  get == input == read
-       *  -  put == output == write
-       *  @endif
-      */
-      char_type* 		_M_in_beg;     // Start of get area. 
-      char_type* 		_M_in_cur;     // Current read area. 
-      char_type* 		_M_in_end;     // End of get area. 
-      char_type* 		_M_out_beg;    // Start of put area. 
-      char_type* 		_M_out_cur;    // Current put area. 
-      char_type* 		_M_out_end;    // End of put area.
-
-      /**
-       *  @if maint
-       *  Current locale setting.
-       *  @endif
-      */
-      locale 			_M_buf_locale;	
-
-  public:
-      /// Destructor deallocates no buffer space.
-      virtual 
-      ~basic_streambuf() 
-      { }
-
-      // [27.5.2.2.1] locales
-      /**
-       *  @brief  Entry point for imbue().
-       *  @param  loc  The new locale.
-       *  @return  The previous locale.
-       *
-       *  Calls the derived imbue(loc).
-      */
-      locale 
-      pubimbue(const locale &__loc)
-      {
-	locale __tmp(this->getloc());
-	this->imbue(__loc);
-	_M_buf_locale = __loc;
-	return __tmp;
-      }
-
-      /**
-       *  @brief  Locale access.
-       *  @return  The current locale in effect.
-       *
-       *  If pubimbue(loc) has been called, then the most recent @c loc
-       *  is returned.  Otherwise the global locale in effect at the time
-       *  of construction is returned.
-      */
-      locale   
-      getloc() const
-      { return _M_buf_locale; } 
-
-      // [27.5.2.2.2] buffer management and positioning
-      //@{
-      /**
-       *  @brief  Entry points for derived buffer functions.
-       *
-       *  The public versions of @c pubfoo dispatch to the protected
-       *  derived @c foo member functions, passing the arguments (if any)
-       *  and returning the result unchanged.
-      */
-      __streambuf_type* 
-      pubsetbuf(char_type* __s, streamsize __n) 
-      { return this->setbuf(__s, __n); }
-
-      pos_type 
-      pubseekoff(off_type __off, ios_base::seekdir __way, 
-		 ios_base::openmode __mode = ios_base::in | ios_base::out)
-      { return this->seekoff(__off, __way, __mode); }
-
-      pos_type 
-      pubseekpos(pos_type __sp,
-		 ios_base::openmode __mode = ios_base::in | ios_base::out)
-      { return this->seekpos(__sp, __mode); }
-
-      int 
-      pubsync() { return this->sync(); }
-      //@}
-
-      // [27.5.2.2.3] get area
-      /**
-       *  @brief  Looking ahead into the stream.
-       *  @return  The number of characters available.
-       *
-       *  If a read position is available, returns the number of characters
-       *  available for reading before the buffer must be refilled.
-       *  Otherwise returns the derived @c showmanyc().
-      */
-      streamsize 
-      in_avail() 
-      { 
-	const streamsize __ret = this->egptr() - this->gptr();
-	return __ret ? __ret : this->showmanyc();
-      }
-
-      /**
-       *  @brief  Getting the next character.
-       *  @return  The next character, or eof.
-       *
-       *  Calls @c sbumpc(), and if that function returns
-       *  @c traits::eof(), so does this function.  Otherwise, @c sgetc().
-      */
-      int_type 
-      snextc()
-      {
-	int_type __ret = traits_type::eof();
-	if (__builtin_expect(!traits_type::eq_int_type(this->sbumpc(), 
-						       __ret), true))
-	  __ret = this->sgetc();
-	return __ret;
-      }
-
-      /**
-       *  @brief  Getting the next character.
-       *  @return  The next character, or eof.
-       *
-       *  If the input read position is available, returns that character
-       *  and increments the read pointer, otherwise calls and returns
-       *  @c uflow().
-      */
-      int_type 
-      sbumpc()
-      {
-	int_type __ret;
-	if (__builtin_expect(this->gptr() < this->egptr(), true))
-	  {
-	    __ret = traits_type::to_int_type(*this->gptr());
-	    this->gbump(1);
-	  }
-	else 
-	  __ret = this->uflow();
-	return __ret;
-      }
-
-      /**
-       *  @brief  Getting the next character.
-       *  @return  The next character, or eof.
-       *
-       *  If the input read position is available, returns that character,
-       *  otherwise calls and returns @c underflow().  Does not move the 
-       *  read position after fetching the character.
-      */
-      int_type 
-      sgetc()
-      {
-	int_type __ret;
-	if (__builtin_expect(this->gptr() < this->egptr(), true))
-	  __ret = traits_type::to_int_type(*this->gptr());
-	else 
-	  __ret = this->underflow();
-	return __ret;
-      }
-
-      /**
-       *  @brief  Entry point for xsgetn.
-       *  @param  s  A buffer area.
-       *  @param  n  A count.
-       *
-       *  Returns xsgetn(s,n).  The effect is to fill @a s[0] through
-       *  @a s[n-1] with characters from the input sequence, if possible.
-      */
-      streamsize 
-      sgetn(char_type* __s, streamsize __n)
-      { return this->xsgetn(__s, __n); }
-
-      // [27.5.2.2.4] putback
-      /**
-       *  @brief  Pushing characters back into the input stream.
-       *  @param  c  The character to push back.
-       *  @return  The previous character, if possible.
-       *
-       *  Similar to sungetc(), but @a c is pushed onto the stream instead
-       *  of "the previous character".  If successful, the next character
-       *  fetched from the input stream will be @a c.
-      */
-      int_type 
-      sputbackc(char_type __c)
-      {
-	int_type __ret;
-	const bool __testpos = this->eback() < this->gptr();
-	if (__builtin_expect(!__testpos || 
-			     !traits_type::eq(__c, this->gptr()[-1]), false))
-	  __ret = this->pbackfail(traits_type::to_int_type(__c));
-	else 
-	  {
-	    this->gbump(-1);
-	    __ret = traits_type::to_int_type(*this->gptr());
-	  }
-	return __ret;
-      }
-
-      /**
-       *  @brief  Moving backwards in the input stream.
-       *  @return  The previous character, if possible.
-       *
-       *  If a putback position is available, this function decrements the
-       *  input pointer and returns that character.  Otherwise, calls and
-       *  returns pbackfail().  The effect is to "unget" the last character
-       *  "gotten".
-      */
-      int_type 
-      sungetc()
-      {
-	int_type __ret;
-	if (__builtin_expect(this->eback() < this->gptr(), true))
-	  {
-	    this->gbump(-1);
-	    __ret = traits_type::to_int_type(*this->gptr());
-	  }
-	else 
-	  __ret = this->pbackfail();
-	return __ret;
-      }
-
-      // [27.5.2.2.5] put area
-      /**
-       *  @brief  Entry point for all single-character output functions.
-       *  @param  c  A character to output.
-       *  @return  @a c, if possible.
-       *
-       *  One of two public output functions.
-       *
-       *  If a write position is available for the output sequence (i.e.,
-       *  the buffer is not full), stores @a c in that position, increments
-       *  the position, and returns @c traits::to_int_type(c).  If a write
-       *  position is not available, returns @c overflow(c).
-      */
-      int_type 
-      sputc(char_type __c)
-      {
-	int_type __ret;
-	if (__builtin_expect(this->pptr() < this->epptr(), true))
-	  {
-	    *this->pptr() = __c;
-	    this->pbump(1);
-	    __ret = traits_type::to_int_type(__c);
-	  }
-	else
-	  __ret = this->overflow(traits_type::to_int_type(__c));
-	return __ret;
-      }
-
-      /**
-       *  @brief  Entry point for all single-character output functions.
-       *  @param  s  A buffer read area.
-       *  @param  n  A count.
-       *
-       *  One of two public output functions.
-       *
-       *
-       *  Returns xsputn(s,n).  The effect is to write @a s[0] through
-       *  @a s[n-1] to the output sequence, if possible.
-      */
-      streamsize 
-      sputn(const char_type* __s, streamsize __n)
-      { return this->xsputn(__s, __n); }
-
-    protected:
-      /**
-       *  @brief  Base constructor.
-       *
-       *  Only called from derived constructors, and sets up all the
-       *  buffer data to zero, including the pointers described in the
-       *  basic_streambuf class description.  Note that, as a result,
-       *  - the class starts with no read nor write positions available,
-       *  - this is not an error
-      */
-      basic_streambuf()
-      : _M_in_beg(0), _M_in_cur(0), _M_in_end(0), 
-      _M_out_beg(0), _M_out_cur(0), _M_out_end(0),
-      _M_buf_locale(locale()) 
-      { }
-
-      // [27.5.2.3.1] get area access
-      //@{
-      /**
-       *  @brief  Access to the get area.
-       *
-       *  These functions are only available to other protected functions,
-       *  including derived classes.
-       *
-       *  - eback() returns the beginning pointer for the input sequence
-       *  - gptr() returns the next pointer for the input sequence
-       *  - egptr() returns the end pointer for the input sequence
-      */
-      char_type* 
-      eback() const { return _M_in_beg; }
-
-      char_type* 
-      gptr()  const { return _M_in_cur;  }
-
-      char_type* 
-      egptr() const { return _M_in_end; }
-      //@}
-
-      /**
-       *  @brief  Moving the read position.
-       *  @param  n  The delta by which to move.
-       *
-       *  This just advances the read position without returning any data.
-      */
-      void 
-      gbump(int __n) { _M_in_cur += __n; }
-
-      /**
-       *  @brief  Setting the three read area pointers.
-       *  @param  gbeg  A pointer.
-       *  @param  gnext  A pointer.
-       *  @param  gend  A pointer.
-       *  @post  @a gbeg == @c eback(), @a gnext == @c gptr(), and
-       *         @a gend == @c egptr()
-      */
-      void 
-      setg(char_type* __gbeg, char_type* __gnext, char_type* __gend)
-      {
-	_M_in_beg = __gbeg;
-	_M_in_cur = __gnext;
-	_M_in_end = __gend;
-      }
-
-      // [27.5.2.3.2] put area access
-      //@{
-      /**
-       *  @brief  Access to the put area.
-       *
-       *  These functions are only available to other protected functions,
-       *  including derived classes.
-       *
-       *  - pbase() returns the beginning pointer for the output sequence
-       *  - pptr() returns the next pointer for the output sequence
-       *  - epptr() returns the end pointer for the output sequence
-      */
-      char_type* 
-      pbase() const { return _M_out_beg; }
-
-      char_type* 
-      pptr() const { return _M_out_cur; }
-
-      char_type* 
-      epptr() const { return _M_out_end; }
-      //@}
-
-      /**
-       *  @brief  Moving the write position.
-       *  @param  n  The delta by which to move.
-       *
-       *  This just advances the write position without returning any data.
-      */
-      void 
-      pbump(int __n) { _M_out_cur += __n; }
-
-      /**
-       *  @brief  Setting the three write area pointers.
-       *  @param  pbeg  A pointer.
-       *  @param  pend  A pointer.
-       *  @post  @a pbeg == @c pbase(), @a pbeg == @c pptr(), and
-       *         @a pend == @c epptr()
-      */
-      void 
-      setp(char_type* __pbeg, char_type* __pend)
-      { 
-	_M_out_beg = _M_out_cur = __pbeg; 
-	_M_out_end = __pend;
-      }
-
-      // [27.5.2.4] virtual functions
-      // [27.5.2.4.1] locales
-      /**
-       *  @brief  Changes translations.
-       *  @param  loc  A new locale.
-       *
-       *  Translations done during I/O which depend on the current locale
-       *  are changed by this call.  The standard adds, "Between invocations
-       *  of this function a class derived from streambuf can safely cache
-       *  results of calls to locale functions and to members of facets
-       *  so obtained."
-       *
-       *  @note  Base class version does nothing.
-      */
-      virtual void 
-      imbue(const locale&) 
-      { }
-
-      // [27.5.2.4.2] buffer management and positioning
-      /**
-       *  @brief  Maniuplates the buffer.
-       *
-       *  Each derived class provides its own appropriate behavior.  See
-       *  the next-to-last paragraph of 
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#2 for
-       *  more on this function.
-       *
-       *  @note  Base class version does nothing, returns @c this.
-      */
-      virtual basic_streambuf<char_type,_Traits>* 
-      setbuf(char_type*, streamsize)
-      {	return this; }
-      
-      /**
-       *  @brief  Alters the stream positions.
-       *
-       *  Each derived class provides its own appropriate behavior.
-       *  @note  Base class version does nothing, returns a @c pos_type
-       *         that represents an invalid stream position.
-      */
-      virtual pos_type 
-      seekoff(off_type, ios_base::seekdir,
-	      ios_base::openmode /*__mode*/ = ios_base::in | ios_base::out)
-      { return pos_type(off_type(-1)); } 
-
-      /**
-       *  @brief  Alters the stream positions.
-       *
-       *  Each derived class provides its own appropriate behavior.
-       *  @note  Base class version does nothing, returns a @c pos_type
-       *         that represents an invalid stream position.
-      */
-      virtual pos_type 
-      seekpos(pos_type, 
-	      ios_base::openmode /*__mode*/ = ios_base::in | ios_base::out)
-      { return pos_type(off_type(-1)); } 
-
-      /**
-       *  @brief  Synchronizes the buffer arrays with the controlled sequences.
-       *  @return  -1 on failure.
-       *
-       *  Each derived class provides its own appropriate behavior,
-       *  including the definition of "failure".
-       *  @note  Base class version does nothing, returns zero.
-      */
-      virtual int 
-      sync() { return 0; }
-
-      // [27.5.2.4.3] get area
-      /**
-       *  @brief  Investigating the data available.
-       *  @return  An estimate of the number of characters available in the
-       *           input sequence, or -1.
-       *
-       *  "If it returns a positive value, then successive calls to
-       *  @c underflow() will not return @c traits::eof() until at least that
-       *  number of characters have been supplied.  If @c showmanyc()
-       *  returns -1, then calls to @c underflow() or @c uflow() will fail."
-       *  [27.5.2.4.3]/1
-       *
-       *  @note  Base class version does nothing, returns zero.
-       *  @note  The standard adds that "the intention is not only that the
-       *         calls [to underflow or uflow] will not return @c eof() but
-       *         that they will return "immediately".
-       *  @note  The standard adds that "the morphemes of @c showmanyc are
-       *         "es-how-many-see", not "show-manic".
-      */
-      virtual streamsize 
-      showmanyc() { return 0; }
-
-      /**
-       *  @brief  Multiple character extraction.
-       *  @param  s  A buffer area.
-       *  @param  n  Maximum number of characters to assign.
-       *  @return  The number of characters assigned.
-       *
-       *  Fills @a s[0] through @a s[n-1] with characters from the input
-       *  sequence, as if by @c sbumpc().  Stops when either @a n characters
-       *  have been copied, or when @c traits::eof() would be copied.
-       *
-       *  It is expected that derived classes provide a more efficient
-       *  implementation by overriding this definition.
-      */
-      virtual streamsize 
-      xsgetn(char_type* __s, streamsize __n);
-
-      /**
-       *  @brief  Fetches more data from the controlled sequence.
-       *  @return  The first character from the <em>pending sequence</em>.
-       *
-       *  Informally, this function is called when the input buffer is
-       *  exhausted (or does not exist, as buffering need not actually be
-       *  done).  If a buffer exists, it is "refilled".  In either case, the
-       *  next available character is returned, or @c traits::eof() to
-       *  indicate a null pending sequence.
-       *
-       *  For a formal definiton of the pending sequence, see a good text
-       *  such as Langer & Kreft, or [27.5.2.4.3]/7-14.
-       *
-       *  A functioning input streambuf can be created by overriding only
-       *  this function (no buffer area will be used).  For an example, see
-       *  http://gcc.gnu.org/onlinedocs/libstdc++/27_io/howto.html#6
-       *
-       *  @note  Base class version does nothing, returns eof().
-      */
-      virtual int_type 
-      underflow()
-      { return traits_type::eof(); }
-
-      /**
-       *  @brief  Fetches more data from the controlled sequence.
-       *  @return  The first character from the <em>pending sequence</em>.
-       *
-       *  Informally, this function does the same thing as @c underflow(),
-       *  and in fact is required to call that function.  It also returns
-       *  the new character, like @c underflow() does.  However, this
-       *  function also moves the read position forward by one.
-      */
-      virtual int_type 
-      uflow() 
-      {
-	int_type __ret = traits_type::eof();
-	const bool __testeof = traits_type::eq_int_type(this->underflow(), 
-							__ret);
-	if (!__testeof)
-	  {
-	    __ret = traits_type::to_int_type(*this->gptr());
-	    this->gbump(1);
-	  }
-	return __ret;    
-      }
-
-      // [27.5.2.4.4] putback
-      /**
-       *  @brief  Tries to back up the input sequence.
-       *  @param  c  The character to be inserted back into the sequence.
-       *  @return  eof() on failure, "some other value" on success
-       *  @post  The constraints of @c gptr(), @c eback(), and @c pptr()
-       *         are the same as for @c underflow().
-       *
-       *  @note  Base class version does nothing, returns eof().
-      */
-      virtual int_type 
-      pbackfail(int_type /* __c */  = traits_type::eof())
-      { return traits_type::eof(); }
-
-      // Put area:
-      /**
-       *  @brief  Multiple character insertion.
-       *  @param  s  A buffer area.
-       *  @param  n  Maximum number of characters to write.
-       *  @return  The number of characters written.
-       *
-       *  Writes @a s[0] through @a s[n-1] to the output sequence, as if
-       *  by @c sputc().  Stops when either @a n characters have been
-       *  copied, or when @c sputc() would return @c traits::eof().
-       *
-       *  It is expected that derived classes provide a more efficient
-       *  implementation by overriding this definition.
-      */
-      virtual streamsize 
-      xsputn(const char_type* __s, streamsize __n);
-
-      /**
-       *  @brief  Consumes data from the buffer; writes to the
-       *          controlled sequence.
-       *  @param  c  An additional character to consume.
-       *  @return  eof() to indicate failure, something else (usually
-       *           @a c, or not_eof())
-       *
-       *  Informally, this function is called when the output buffer is full
-       *  (or does not exist, as buffering need not actually be done).  If a
-       *  buffer exists, it is "consumed", with "some effect" on the
-       *  controlled sequence.  (Typically, the buffer is written out to the
-       *  sequence verbatim.)  In either case, the character @a c is also
-       *  written out, if @a c is not @c eof().
-       *
-       *  For a formal definiton of this function, see a good text
-       *  such as Langer & Kreft, or [27.5.2.4.5]/3-7.
-       *
-       *  A functioning output streambuf can be created by overriding only
-       *  this function (no buffer area will be used).
-       *
-       *  @note  Base class version does nothing, returns eof().
-      */
-      virtual int_type 
-      overflow(int_type /* __c */ = traits_type::eof())
-      { return traits_type::eof(); }
-
-#ifdef _GLIBCXX_DEPRECATED
-    // Annex D.6
-    public:
-      /**
-       *  @brief  Tosses a character.
-       *
-       *  Advances the read pointer, ignoring the character that would have
-       *  been read.
-       *
-       *  See http://gcc.gnu.org/ml/libstdc++/2002-05/msg00168.html
-       *
-       *  @note  This function has been deprecated by the standard.  You
-       *         must define @c _GLIBCXX_DEPRECATED to make this visible; see
-       *         c++config.h.
-      */
-      void 
-      stossc() 
-      {
-	if (this->gptr() < this->egptr()) 
-	  this->gbump(1);
-	else 
-	  this->uflow();
-      }
-#endif
-
-    private:
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // Side effect of DR 50. 
-      basic_streambuf(const __streambuf_type& __sb)
-      : _M_in_beg(__sb._M_in_beg), _M_in_cur(__sb._M_in_cur), 
-      _M_in_end(__sb._M_in_end), _M_out_beg(__sb._M_out_beg), 
-      _M_out_cur(__sb._M_out_cur), _M_out_end(__sb._M_out_cur),
-      _M_buf_locale(__sb._M_buf_locale) 
-      { }
-
-      __streambuf_type& 
-      operator=(const __streambuf_type&) { return *this; };
-    };
-} // namespace std
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/streambuf.tcc>
-#endif
-
-#endif /* _GLIBCXX_STREAMBUF */
diff --git a/include.new/c++/3.4/string b/include.new/c++/3.4/string
deleted file mode 100644
index 2b15658..0000000
--- a/include.new/c++/3.4/string
+++ /dev/null
@@ -1,60 +0,0 @@
-// Components for manipulating sequences of characters -*- C++ -*-
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-//
-// ISO C++ 14882: 21  Strings library
-//
-
-/** @file string
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_STRING
-#define _GLIBCXX_STRING	1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stringfwd.h>
-#include <bits/char_traits.h>
-#include <memory> 	// For allocator.
-#include <bits/type_traits.h>
-#include <iosfwd> 	// For operators >>, <<, and getline decls.
-#include <bits/stl_iterator.h>
-#include <bits/stl_function.h>  // For less
-#include <bits/basic_string.h>
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <algorithm> // for find_if
-# include <bits/basic_string.tcc> 
-#endif
-
-#endif /* _GLIBCXX_STRING */
diff --git a/include.new/c++/3.4/typeinfo b/include.new/c++/3.4/typeinfo
deleted file mode 100644
index 1396baa..0000000
--- a/include.new/c++/3.4/typeinfo
+++ /dev/null
@@ -1,156 +0,0 @@
-// RTTI support for -*- C++ -*-
-// Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002
-// Free Software Foundation
-//
-// This file is part of GCC.
-//
-// GCC is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2, or (at your option)
-// any later version.
-// 
-// GCC is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with GCC; see the file COPYING.  If not, write to
-// the Free Software Foundation, 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/** @file typeinfo
- *  This header provides RTTI support.
- */
-
-#ifndef _TYPEINFO
-#define _TYPEINFO
-
-#include <exception>
-
-extern "C++" {
-
-namespace __cxxabiv1
-{
-  class __class_type_info;
-} // namespace __cxxabiv1
-
-#if !__GXX_WEAK__
-  // If weak symbols are not supported, typeinfo names are not merged.
-  #define __GXX_MERGED_TYPEINFO_NAMES 0
-#else
-  // On platforms that support weak symbols, typeinfo names are merged.
-  #define __GXX_MERGED_TYPEINFO_NAMES 1
-#endif
-
-namespace std 
-{
-  /**
-   *  @brief  Part of RTTI.
-   *
-   *  The @c type_info class describes type information generated by
-   *  an implementation.
-  */
-  class type_info 
-  {
-  public:
-    /** Destructor. Being the first non-inline virtual function, this
-     *  controls in which translation unit the vtable is emitted. The
-     *  compiler makes use of that information to know where to emit
-     *  the runtime-mandated type_info structures in the new-abi.  */
-    virtual ~type_info();
-
-  private:
-    /// Assigning type_info is not supported.  Made private.
-    type_info& operator=(const type_info&);
-    type_info(const type_info&);
-    
-  protected:
-    const char *__name;
-    
-  protected:
-    explicit type_info(const char *__n): __name(__n) { }
-    
-  public:
-    // the public interface
-    /** Returns an @e implementation-defined byte string; this is not
-     *  portable between compilers!  */
-    const char* name() const
-    { return __name; }
-
-#if !__GXX_MERGED_TYPEINFO_NAMES
-    bool before(const type_info& __arg) const;
-    // In old abi, or when weak symbols are not supported, there can
-    // be multiple instances of a type_info object for one
-    // type. Uniqueness must use the _name value, not object address.
-    bool operator==(const type_info& __arg) const;
-#else
-    /** Returns true if @c *this precedes @c __arg in the implementation's
-     *  collation order.  */
-    // In new abi we can rely on type_info's NTBS being unique,
-    // and therefore address comparisons are sufficient.
-    bool before(const type_info& __arg) const
-    { return __name < __arg.__name; }
-    bool operator==(const type_info& __arg) const
-    { return __name == __arg.__name; }
-#endif
-    bool operator!=(const type_info& __arg) const
-    { return !operator==(__arg); }
-    
-    // the internal interface
-  public:
-    // return true if this is a pointer type of some kind
-    virtual bool __is_pointer_p() const;
-    // return true if this is a function type
-    virtual bool __is_function_p() const;
-
-    // Try and catch a thrown type. Store an adjusted pointer to the
-    // caught type in THR_OBJ. If THR_TYPE is not a pointer type, then
-    // THR_OBJ points to the thrown object. If THR_TYPE is a pointer
-    // type, then THR_OBJ is the pointer itself. OUTER indicates the
-    // number of outer pointers, and whether they were const
-    // qualified.
-    virtual bool __do_catch(const type_info *__thr_type, void **__thr_obj,
-			    unsigned __outer) const;
-
-    // internally used during catch matching
-    virtual bool __do_upcast(const __cxxabiv1::__class_type_info *__target,
-			     void **__obj_ptr) const;
-  };
-
-  /**
-   *  @brief  Thrown during incorrect typecasting.
-   *
-   *  If you attempt an invalid @c dynamic_cast expression, an instance of
-   *  this class (or something derived from this class) is thrown.  */
-  class bad_cast : public exception 
-  {
-  public:
-    bad_cast() throw() { }
-    // This declaration is not useless:
-    // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-    virtual ~bad_cast() throw();
-  };
-  
-  /** If you use a NULL pointer in a @c typeid expression, this is thrown.  */
-  class bad_typeid : public exception 
-  {
-  public:
-    bad_typeid () throw() { }
-    // This declaration is not useless:
-    // http://gcc.gnu.org/onlinedocs/gcc-3.0.2/gcc_6.html#SEC118
-    virtual ~bad_typeid() throw();
-  };
-} // namespace std
-
-} // extern "C++"
-#endif
diff --git a/include.new/c++/3.4/utility b/include.new/c++/3.4/utility
deleted file mode 100644
index fe93090..0000000
--- a/include.new/c++/3.4/utility
+++ /dev/null
@@ -1,70 +0,0 @@
-// <utility> -*- C++ -*-
-
-// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996,1997
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file utility
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_UTILITY
-#define _GLIBCXX_UTILITY 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <bits/stl_relops.h>
-#include <bits/stl_pair.h>
-
-#endif /* _GLIBCXX_UTILITY */
diff --git a/include.new/c++/3.4/valarray b/include.new/c++/3.4/valarray
deleted file mode 100644
index b893b33..0000000
--- a/include.new/c++/3.4/valarray
+++ /dev/null
@@ -1,1017 +0,0 @@
-// The template and inlines for the -*- C++ -*- valarray class.
-
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
-// Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-// Written by Gabriel Dos Reis <Gabriel.Dos-Reis@DPTMaths.ENS-Cachan.Fr>
-
-/** @file valarray
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_VALARRAY
-#define _GLIBCXX_VALARRAY 1
-
-#pragma GCC system_header
-
-#include <bits/c++config.h>
-#include <cstddef>
-#include <cmath>
-#include <cstdlib>
-#include <numeric>
-#include <algorithm>
-#include <debug/debug.h>
-
-namespace std
-{
-  template<class _Clos, typename _Tp> 
-    class _Expr;
-
-  template<typename _Tp1, typename _Tp2> 
-    class _ValArray;    
-
-  template<class _Oper, template<class, class> class _Meta, class _Dom>
-    struct _UnClos;
-
-  template<class _Oper,
-        template<class, class> class _Meta1,
-        template<class, class> class _Meta2,
-        class _Dom1, class _Dom2> 
-    class _BinClos;
-
-  template<template<class, class> class _Meta, class _Dom> 
-    class _SClos;
-
-  template<template<class, class> class _Meta, class _Dom> 
-    class _GClos;
-    
-  template<template<class, class> class _Meta, class _Dom> 
-    class _IClos;
-    
-  template<template<class, class> class _Meta, class _Dom> 
-    class _ValFunClos;
-  
-  template<template<class, class> class _Meta, class _Dom> 
-    class _RefFunClos;
-
-  template<class _Tp> class valarray;   // An array of type _Tp
-  class slice;                          // BLAS-like slice out of an array
-  template<class _Tp> class slice_array;
-  class gslice;                         // generalized slice out of an array
-  template<class _Tp> class gslice_array;
-  template<class _Tp> class mask_array;     // masked array
-  template<class _Tp> class indirect_array; // indirected array
-
-} // namespace std
-
-#include <bits/valarray_array.h>
-#include <bits/valarray_before.h>
-  
-namespace std
-{
-  /**
-   *  @brief  Smart array designed to support numeric processing.
-   *
-   *  A valarray is an array that provides constraints intended to allow for
-   *  effective optimization of numeric array processing by reducing the
-   *  aliasing that can result from pointer representations.  It represents a
-   *  one-dimensional array from which different multidimensional subsets can
-   *  be accessed and modified.
-   *  
-   *  @param  Tp  Type of object in the array.
-   */
-  template<class _Tp> 
-    class valarray
-    {
-      template<class _Op>
-	struct _UnaryOp 
-	{
-	  typedef typename __fun<_Op, _Tp>::result_type __rt;
-	  typedef _Expr<_UnClos<_Op, _ValArray, _Tp>, __rt> _Rt;
-	};
-    public:
-      typedef _Tp value_type;
-      
-	// _lib.valarray.cons_ construct/destroy:
-      ///  Construct an empty array.
-      valarray();
-
-      ///  Construct an array with @a n elements.
-      explicit valarray(size_t);
-
-      ///  Construct an array with @a n elements initialized to @a t.
-      valarray(const _Tp&, size_t);
-
-      ///  Construct an array initialized to the first @a n elements of @a t.
-      valarray(const _Tp* __restrict__, size_t);
-
-      ///  Copy constructor.
-      valarray(const valarray&);
-
-      ///  Construct an array with the same size and values in @a sa.
-      valarray(const slice_array<_Tp>&);
-
-      ///  Construct an array with the same size and values in @a ga.
-      valarray(const gslice_array<_Tp>&);
-
-      ///  Construct an array with the same size and values in @a ma.
-      valarray(const mask_array<_Tp>&);
-
-      ///  Construct an array with the same size and values in @a ia.
-      valarray(const indirect_array<_Tp>&);
-
-      template<class _Dom>
-	valarray(const _Expr<_Dom,_Tp>& __e);
-      ~valarray();
-
-      // _lib.valarray.assign_ assignment:
-      /**
-       *  @brief  Assign elements to an array.
-       *
-       *  Assign elements of array to values in @a v.  Results are undefined
-       *  if @a v is not the same size as this array.
-       *
-       *  @param  v  Valarray to get values from.
-       */
-      valarray<_Tp>& operator=(const valarray<_Tp>&);
-
-      /**
-       *  @brief  Assign elements to a value.
-       *
-       *  Assign all elements of array to @a t.
-       *
-       *  @param  t  Value for elements.
-       */
-      valarray<_Tp>& operator=(const _Tp&);
-
-      /**
-       *  @brief  Assign elements to an array subset.
-       *
-       *  Assign elements of array to values in @a sa.  Results are undefined
-       *  if @a sa is not the same size as this array.
-       *
-       *  @param  sa  Array slice to get values from.
-       */
-      valarray<_Tp>& operator=(const slice_array<_Tp>&);
-
-      /**
-       *  @brief  Assign elements to an array subset.
-       *
-       *  Assign elements of array to values in @a ga.  Results are undefined
-       *  if @a ga is not the same size as this array.
-       *
-       *  @param  ga  Array slice to get values from.
-       */
-      valarray<_Tp>& operator=(const gslice_array<_Tp>&);
-
-      /**
-       *  @brief  Assign elements to an array subset.
-       *
-       *  Assign elements of array to values in @a ma.  Results are undefined
-       *  if @a ma is not the same size as this array.
-       *
-       *  @param  ma  Array slice to get values from.
-       */
-      valarray<_Tp>& operator=(const mask_array<_Tp>&);
-
-      /**
-       *  @brief  Assign elements to an array subset.
-       *
-       *  Assign elements of array to values in @a ia.  Results are undefined
-       *  if @a ia is not the same size as this array.
-       *
-       *  @param  ia  Array slice to get values from.
-       */
-      valarray<_Tp>& operator=(const indirect_array<_Tp>&);
-
-      template<class _Dom> valarray<_Tp>&
-	operator= (const _Expr<_Dom,_Tp>&);
-
-      // _lib.valarray.access_ element access:
-      /**
-       *  Return a reference to the i'th array element.  
-       *
-       *  @param  i  Index of element to return.
-       *  @return  Reference to the i'th element.
-       */
-      _Tp&                operator[](size_t);
-
-      // _GLIBCXX_RESOLVE_LIB_DEFECTS
-      // 389. Const overload of valarray::operator[] returns by value.
-      const _Tp&          operator[](size_t) const;
-
-      // _lib.valarray.sub_ subset operations:
-      /**
-       *  @brief  Return an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the slice argument.  The new valarray is the size of
-       *  the input slice.  @see slice.
-       *
-       *  @param  s  The source slice.
-       *  @return  New valarray containing elements in @a s.
-       */
-      _Expr<_SClos<_ValArray,_Tp>, _Tp> operator[](slice) const;
-
-      /**
-       *  @brief  Return a reference to an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the slice argument.  The new valarray is the size of
-       *  the input slice.  @see slice.
-       *
-       *  @param  s  The source slice.
-       *  @return  New valarray containing elements in @a s.
-       */
-      slice_array<_Tp>    operator[](slice);
-
-      /**
-       *  @brief  Return an array subset.
-       *
-       *  Returns a slice_array referencing the elements of the array
-       *  indicated by the slice argument.  @see gslice.
-       *
-       *  @param  s  The source slice.
-       *  @return  Slice_array referencing elements indicated by @a s.
-       */
-      _Expr<_GClos<_ValArray,_Tp>, _Tp> operator[](const gslice&) const;
-
-      /**
-       *  @brief  Return a reference to an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the gslice argument.  The new valarray is
-       *  the size of the input gslice.  @see gslice.
-       *
-       *  @param  s  The source gslice.
-       *  @return  New valarray containing elements in @a s.
-       */
-      gslice_array<_Tp>   operator[](const gslice&);
-
-      /**
-       *  @brief  Return an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the argument.  The input is a valarray of bool which
-       *  represents a bitmask indicating which elements should be copied into
-       *  the new valarray.  Each element of the array is added to the return
-       *  valarray if the corresponding element of the argument is true.
-       *
-       *  @param  m  The valarray bitmask.
-       *  @return  New valarray containing elements indicated by @a m.
-       */
-      valarray<_Tp>     	 operator[](const valarray<bool>&) const;
-
-      /**
-       *  @brief  Return a reference to an array subset.
-       *
-       *  Returns a new mask_array referencing the elements of the array
-       *  indicated by the argument.  The input is a valarray of bool which
-       *  represents a bitmask indicating which elements are part of the
-       *  subset.  Elements of the array are part of the subset if the
-       *  corresponding element of the argument is true.
-       *
-       *  @param  m  The valarray bitmask.
-       *  @return  New valarray containing elements indicated by @a m.
-       */
-      mask_array<_Tp>     operator[](const valarray<bool>&);
-
-      /**
-       *  @brief  Return an array subset.
-       *
-       *  Returns a new valarray containing the elements of the array
-       *  indicated by the argument.  The elements in the argument are
-       *  interpreted as the indices of elements of this valarray to copy to
-       *  the return valarray.
-       *
-       *  @param  i  The valarray element index list.
-       *  @return  New valarray containing elements in @a s.
-       */
-      _Expr<_IClos<_ValArray, _Tp>, _Tp>
-        operator[](const valarray<size_t>&) const;
-
-      /**
-       *  @brief  Return a reference to an array subset.
-       *
-       *  Returns an indirect_array referencing the elements of the array
-       *  indicated by the argument.  The elements in the argument are
-       *  interpreted as the indices of elements of this valarray to include
-       *  in the subset.  The returned indirect_array refers to these
-       *  elements.
-       *
-       *  @param  i  The valarray element index list.
-       *  @return  Indirect_array referencing elements in @a i.
-       */
-      indirect_array<_Tp> operator[](const valarray<size_t>&);
-
-      // _lib.valarray.unary_ unary operators:
-      ///  Return a new valarray by applying unary + to each element.
-      typename _UnaryOp<__unary_plus>::_Rt  operator+() const;
-
-      ///  Return a new valarray by applying unary - to each element.
-      typename _UnaryOp<__negate>::_Rt      operator-() const;
-
-      ///  Return a new valarray by applying unary ~ to each element.
-      typename _UnaryOp<__bitwise_not>::_Rt operator~() const;
-
-      ///  Return a new valarray by applying unary ! to each element.
-      typename _UnaryOp<__logical_not>::_Rt operator!() const;
-
-      // _lib.valarray.cassign_ computed assignment:
-      ///  Multiply each element of array by @a t.
-      valarray<_Tp>& operator*=(const _Tp&);
-
-      ///  Divide each element of array by @a t.
-      valarray<_Tp>& operator/=(const _Tp&);
-
-      ///  Set each element e of array to e % @a t.
-      valarray<_Tp>& operator%=(const _Tp&);
-
-      ///  Add @a t to each element of array.
-      valarray<_Tp>& operator+=(const _Tp&);
-
-      ///  Subtract @a t to each element of array.
-      valarray<_Tp>& operator-=(const _Tp&);
-
-      ///  Set each element e of array to e ^ @a t.
-      valarray<_Tp>& operator^=(const _Tp&);
-
-      ///  Set each element e of array to e & @a t.
-      valarray<_Tp>& operator&=(const _Tp&);
-
-      ///  Set each element e of array to e | @a t.
-      valarray<_Tp>& operator|=(const _Tp&);
-
-      ///  Left shift each element e of array by @a t bits.
-      valarray<_Tp>& operator<<=(const _Tp&);
-
-      ///  Right shift each element e of array by @a t bits.
-      valarray<_Tp>& operator>>=(const _Tp&);
-
-      ///  Multiply elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator*=(const valarray<_Tp>&);
-
-      ///  Divide elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator/=(const valarray<_Tp>&);
-
-      ///  Modulo elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator%=(const valarray<_Tp>&);
-
-      ///  Add corresponding elements of @a v to elements of array.
-      valarray<_Tp>& operator+=(const valarray<_Tp>&);
-
-      ///  Subtract corresponding elements of @a v from elements of array.
-      valarray<_Tp>& operator-=(const valarray<_Tp>&);
-
-      ///  Logical xor corresponding elements of @a v with elements of array.
-      valarray<_Tp>& operator^=(const valarray<_Tp>&);
-
-      ///  Logical or corresponding elements of @a v with elements of array.
-      valarray<_Tp>& operator|=(const valarray<_Tp>&);
-
-      ///  Logical and corresponding elements of @a v with elements of array.
-      valarray<_Tp>& operator&=(const valarray<_Tp>&);
-
-      ///  Left shift elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator<<=(const valarray<_Tp>&);
-
-      ///  Right shift elements of array by corresponding elements of @a v.
-      valarray<_Tp>& operator>>=(const valarray<_Tp>&);
-
-      template<class _Dom>
-	valarray<_Tp>& operator*=(const _Expr<_Dom,_Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator/=(const _Expr<_Dom,_Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator%=(const _Expr<_Dom,_Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator+=(const _Expr<_Dom,_Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator-=(const _Expr<_Dom,_Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator^=(const _Expr<_Dom,_Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator|=(const _Expr<_Dom,_Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator&=(const _Expr<_Dom,_Tp>&);
-      template<class _Dom>
-      valarray<_Tp>& operator<<=(const _Expr<_Dom,_Tp>&);
-      template<class _Dom>
-	valarray<_Tp>& operator>>=(const _Expr<_Dom,_Tp>&);
-
-
-      // _lib.valarray.members_ member functions:
-      ///  Return the number of elements in array.
-      size_t size() const;
-
-      /**
-       *  @brief  Return the sum of all elements in the array.
-       *
-       *  Accumulates the sum of all elements into a Tp using +=.  The order
-       *  of adding the elements is unspecified.
-       */
-      _Tp    sum() const;
-
-      ///  Return the minimum element using operator<().
-      _Tp    min() const;	
-
-      ///  Return the maximum element using operator<().
-      _Tp    max() const;	
-
-  //           // FIXME: Extension
-  //       _Tp    product () const;
-
-      /**
-       *  @brief  Return a shifted array.
-       *
-       *  A new valarray is constructed as a copy of this array with elements
-       *  in shifted positions.  For an element with index i, the new position
-       *  is i - n.  The new valarray is the same size as the current one.
-       *  New elements without a value are set to 0.  Elements whos new
-       *  position is outside the bounds of the array are discarded.
-       *
-       *  Positive arguments shift toward index 0, discarding elements [0, n).
-       *  Negative arguments discard elements from the top of the array.
-       *
-       *  @param  n  Number of element positions to shift.
-       *  @return  New valarray with elements in shifted positions.
-       */
-      valarray<_Tp> shift (int) const;
-
-      /**
-       *  @brief  Return a rotated array.
-       *
-       *  A new valarray is constructed as a copy of this array with elements
-       *  in shifted positions.  For an element with index i, the new position
-       *  is (i - n) % size().  The new valarray is the same size as the
-       *  current one.  Elements that are shifted beyond the array bounds are
-       *  shifted into the other end of the array.  No elements are lost.
-       *
-       *  Positive arguments shift toward index 0, wrapping around the top.
-       *  Negative arguments shift towards the top, wrapping around to 0.
-       *
-       *  @param  n  Number of element positions to rotate.
-       *  @return  New valarray with elements in shifted positions.
-       */
-      valarray<_Tp> cshift(int) const;
-
-      /**
-       *  @brief  Apply a function to the array.
-       *
-       *  Returns a new valarray with elements assigned to the result of
-       *  applying func to the corresponding element of this array.  The new
-       *  array is the same size as this one.
-       *
-       *  @param  func  Function of Tp returning Tp to apply.
-       *  @return  New valarray with transformed elements.
-       */
-      _Expr<_ValFunClos<_ValArray,_Tp>,_Tp> apply(_Tp func(_Tp)) const;
-
-      /**
-       *  @brief  Apply a function to the array.
-       *
-       *  Returns a new valarray with elements assigned to the result of
-       *  applying func to the corresponding element of this array.  The new
-       *  array is the same size as this one.
-       *
-       *  @param  func  Function of const Tp& returning Tp to apply.
-       *  @return  New valarray with transformed elements.
-       */
-      _Expr<_RefFunClos<_ValArray,_Tp>,_Tp> apply(_Tp func(const _Tp&)) const;
-
-      /**
-       *  @brief  Resize array.
-       *
-       *  Resize this array to be @a size and set all elements to @a c.  All
-       *  references and iterators are invalidated.
-       *
-       *  @param  size  New array size.
-       *  @param  c  New value for all elements.
-       */
-      void resize(size_t __size, _Tp __c = _Tp());
-
-    private:
-      size_t _M_size;
-      _Tp* __restrict__ _M_data;
-      
-      friend class _Array<_Tp>;
-    };
-  
-  template<typename _Tp>
-    inline const _Tp&
-    valarray<_Tp>::operator[](size_t __i) const
-    { 
-      __glibcxx_requires_subscript(__i);
-      return _M_data[__i]; 
-    }
-
-  template<typename _Tp>
-    inline _Tp&
-    valarray<_Tp>::operator[](size_t __i)
-    { 
-      __glibcxx_requires_subscript(__i);
-      return _M_data[__i]; 
-    }
-
-} // std::
-
-#include <bits/valarray_after.h>
-
-#include <bits/slice_array.h>
-#include <bits/gslice.h>
-#include <bits/gslice_array.h>
-#include <bits/mask_array.h>
-#include <bits/indirect_array.h>
-
-namespace std
-{
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray() : _M_size(0), _M_data(0) {}
-
-  template<typename _Tp>
-    inline 
-    valarray<_Tp>::valarray(size_t __n) 
-	: _M_size(__n), _M_data(__valarray_get_storage<_Tp>(__n))
-    { std::__valarray_default_construct(_M_data, _M_data + __n); }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const _Tp& __t, size_t __n)
-      : _M_size(__n), _M_data(__valarray_get_storage<_Tp>(__n))
-    { std::__valarray_fill_construct(_M_data, _M_data + __n, __t); }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const _Tp* __restrict__ __p, size_t __n)
-      : _M_size(__n), _M_data(__valarray_get_storage<_Tp>(__n))
-    { 
-      _GLIBCXX_DEBUG_ASSERT(__p != 0 || __n == 0);
-      std::__valarray_copy_construct(__p, __p + __n, _M_data); 
-    }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const valarray<_Tp>& __v)
-      : _M_size(__v._M_size), _M_data(__valarray_get_storage<_Tp>(__v._M_size))
-    { std::__valarray_copy_construct(__v._M_data, __v._M_data + _M_size, _M_data); }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const slice_array<_Tp>& __sa)
-      : _M_size(__sa._M_sz), _M_data(__valarray_get_storage<_Tp>(__sa._M_sz))
-    {
-      std::__valarray_copy
-	(__sa._M_array, __sa._M_sz, __sa._M_stride, _Array<_Tp>(_M_data));
-    }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const gslice_array<_Tp>& __ga)
-      : _M_size(__ga._M_index.size()),
-	_M_data(__valarray_get_storage<_Tp>(_M_size))
-    {
-      std::__valarray_copy
-	(__ga._M_array, _Array<size_t>(__ga._M_index),
-	 _Array<_Tp>(_M_data), _M_size);
-    }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const mask_array<_Tp>& __ma)
-      : _M_size(__ma._M_sz), _M_data(__valarray_get_storage<_Tp>(__ma._M_sz))
-    {
-      std::__valarray_copy
-	(__ma._M_array, __ma._M_mask, _Array<_Tp>(_M_data), _M_size);
-    }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::valarray(const indirect_array<_Tp>& __ia)
-      : _M_size(__ia._M_sz), _M_data(__valarray_get_storage<_Tp>(__ia._M_sz))
-    {
-      std::__valarray_copy
-	(__ia._M_array, __ia._M_index, _Array<_Tp>(_M_data), _M_size);
-    }
-
-  template<typename _Tp> template<class _Dom>
-    inline
-    valarray<_Tp>::valarray(const _Expr<_Dom, _Tp>& __e)
-      : _M_size(__e.size()), _M_data(__valarray_get_storage<_Tp>(_M_size))
-    { std::__valarray_copy(__e, _M_size, _Array<_Tp>(_M_data)); }
-
-  template<typename _Tp>
-    inline
-    valarray<_Tp>::~valarray()
-    {
-      std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
-      std::__valarray_release_memory(_M_data);
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const valarray<_Tp>& __v)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __v._M_size);
-      std::__valarray_copy(__v._M_data, _M_size, _M_data);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const _Tp& __t)
-    {
-      std::__valarray_fill(_M_data, _M_size, __t);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const slice_array<_Tp>& __sa)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __sa._M_sz);
-      std::__valarray_copy(__sa._M_array, __sa._M_sz,
-			   __sa._M_stride, _Array<_Tp>(_M_data));
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const gslice_array<_Tp>& __ga)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __ga._M_index.size());
-      std::__valarray_copy(__ga._M_array, _Array<size_t>(__ga._M_index),
-			   _Array<_Tp>(_M_data), _M_size);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const mask_array<_Tp>& __ma)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __ma._M_sz);
-      std::__valarray_copy(__ma._M_array, __ma._M_mask,
-			   _Array<_Tp>(_M_data), _M_size);
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const indirect_array<_Tp>& __ia)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __ia._M_sz);
-      std::__valarray_copy(__ia._M_array, __ia._M_index,
-			   _Array<_Tp>(_M_data), _M_size);
-      return *this;
-    }
-
-  template<typename _Tp> template<class _Dom>
-    inline valarray<_Tp>&
-    valarray<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e)
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __e.size());
-      std::__valarray_copy(__e, _M_size, _Array<_Tp>(_M_data));
-      return *this;
-    }
-
-  template<typename _Tp>
-    inline _Expr<_SClos<_ValArray,_Tp>, _Tp>
-    valarray<_Tp>::operator[](slice __s) const
-    {
-      typedef _SClos<_ValArray,_Tp> _Closure;
-      return _Expr<_Closure, _Tp>(_Closure (_Array<_Tp>(_M_data), __s));
-    }
-
-  template<typename _Tp>
-    inline slice_array<_Tp>
-    valarray<_Tp>::operator[](slice __s)
-    {
-      return slice_array<_Tp>(_Array<_Tp>(_M_data), __s);
-    }
-
-  template<typename _Tp>
-    inline _Expr<_GClos<_ValArray,_Tp>, _Tp>
-    valarray<_Tp>::operator[](const gslice& __gs) const
-    {
-      typedef _GClos<_ValArray,_Tp> _Closure;
-      return _Expr<_Closure, _Tp>
-	(_Closure(_Array<_Tp>(_M_data), __gs._M_index->_M_index));
-    }
-
-  template<typename _Tp>
-    inline gslice_array<_Tp>
-    valarray<_Tp>::operator[](const gslice& __gs)
-    {
-      return gslice_array<_Tp>
-	(_Array<_Tp>(_M_data), __gs._M_index->_M_index);
-    }
-
-  template<typename _Tp>
-    inline valarray<_Tp>
-    valarray<_Tp>::operator[](const valarray<bool>& __m) const
-    {
-      size_t __s = 0;
-      size_t __e = __m.size();
-      for (size_t __i=0; __i<__e; ++__i)
-	if (__m[__i]) ++__s;
-      return valarray<_Tp>(mask_array<_Tp>(_Array<_Tp>(_M_data), __s,
-					   _Array<bool> (__m)));
-    }
-
-  template<typename _Tp>
-    inline mask_array<_Tp>
-    valarray<_Tp>::operator[](const valarray<bool>& __m)
-    {
-      size_t __s = 0;
-      size_t __e = __m.size();
-      for (size_t __i=0; __i<__e; ++__i)
-	if (__m[__i]) ++__s;
-      return mask_array<_Tp>(_Array<_Tp>(_M_data), __s, _Array<bool>(__m));
-    }
-
-  template<typename _Tp>
-    inline _Expr<_IClos<_ValArray,_Tp>, _Tp>
-    valarray<_Tp>::operator[](const valarray<size_t>& __i) const
-    {
-      typedef _IClos<_ValArray,_Tp> _Closure;
-      return _Expr<_Closure, _Tp>(_Closure(*this, __i));
-    }
-
-  template<typename _Tp>
-    inline indirect_array<_Tp>
-    valarray<_Tp>::operator[](const valarray<size_t>& __i)
-    {
-      return indirect_array<_Tp>(_Array<_Tp>(_M_data), __i.size(),
-				 _Array<size_t>(__i));
-    }
-
-  template<class _Tp>
-    inline size_t 
-    valarray<_Tp>::size() const
-    { return _M_size; }
-
-  template<class _Tp>
-    inline _Tp
-    valarray<_Tp>::sum() const
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
-      return std::__valarray_sum(_M_data, _M_data + _M_size);
-    }
-
-//   template<typename _Tp>
-//   inline _Tp
-//   valarray<_Tp>::product () const
-//   {
-//       return __valarray_product(_M_data, _M_data + _M_size);
-//   }
-
-  template <class _Tp>
-     inline valarray<_Tp>
-     valarray<_Tp>::shift(int __n) const
-     {
-       _Tp* const __a = static_cast<_Tp*>
-         (__builtin_alloca(sizeof(_Tp) * _M_size));
-       if (__n == 0)                          // no shift
-         std::__valarray_copy_construct(_M_data, _M_data + _M_size, __a);
-       else if (__n > 0)         // __n > 0: shift left
-         {                 
-           if (size_t(__n) > _M_size)
-             std::__valarray_default_construct(__a, __a + __n);
-           else
-             {
-               std::__valarray_copy_construct(_M_data+__n, _M_data + _M_size, __a);
-               std::__valarray_default_construct(__a+_M_size-__n, __a + _M_size);
-             }
-         }
-       else                        // __n < 0: shift right
-         {                          
-           std::__valarray_copy_construct (_M_data, _M_data+_M_size+__n, __a-__n);
-           std::__valarray_default_construct(__a, __a - __n);
-         }
-       return valarray<_Tp> (__a, _M_size);
-     }
-
-  template <class _Tp>
-     inline valarray<_Tp>
-     valarray<_Tp>::cshift (int __n) const
-     {
-       _Tp* const __a = static_cast<_Tp*>
-         (__builtin_alloca (sizeof(_Tp) * _M_size));
-       if (__n == 0)               // no cshift
-         std::__valarray_copy_construct(_M_data, _M_data + _M_size, __a);
-       else if (__n > 0)           // cshift left
-         {               
-           std::__valarray_copy_construct(_M_data, _M_data+__n, __a+_M_size-__n);
-           std::__valarray_copy_construct(_M_data+__n, _M_data + _M_size, __a);
-         }
-       else                        // cshift right
-         {                       
-           std::__valarray_copy_construct
-             (_M_data + _M_size+__n, _M_data + _M_size, __a);
-           std::__valarray_copy_construct
-             (_M_data, _M_data + _M_size+__n, __a - __n);
-         }
-       return valarray<_Tp>(__a, _M_size);
-     }
-
-  template <class _Tp>
-    inline void
-    valarray<_Tp>::resize (size_t __n, _Tp __c)
-    {
-      // This complication is so to make valarray<valarray<T> > work
-      // even though it is not required by the standard.  Nobody should
-      // be saying valarray<valarray<T> > anyway.  See the specs.
-      std::__valarray_destroy_elements(_M_data, _M_data + _M_size);
-      if (_M_size != __n)
-	{
-	  std::__valarray_release_memory(_M_data);
-	  _M_size = __n;
-	  _M_data = __valarray_get_storage<_Tp>(__n);
-	}
-      std::__valarray_fill_construct(_M_data, _M_data + __n, __c);
-    }
-    
-  template<typename _Tp>
-    inline _Tp
-    valarray<_Tp>::min() const
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
-      return *std::min_element (_M_data, _M_data+_M_size);
-    }
-
-  template<typename _Tp>
-    inline _Tp
-    valarray<_Tp>::max() const
-    {
-      _GLIBCXX_DEBUG_ASSERT(_M_size > 0);
-      return *std::max_element (_M_data, _M_data+_M_size);
-    }
-  
-  template<class _Tp>
-    inline _Expr<_ValFunClos<_ValArray,_Tp>,_Tp>
-    valarray<_Tp>::apply(_Tp func(_Tp)) const
-    {
-      typedef _ValFunClos<_ValArray,_Tp> _Closure;
-      return _Expr<_Closure,_Tp>(_Closure(*this, func));
-    }
-
-  template<class _Tp>
-    inline _Expr<_RefFunClos<_ValArray,_Tp>,_Tp>
-    valarray<_Tp>::apply(_Tp func(const _Tp &)) const
-    {
-      typedef _RefFunClos<_ValArray,_Tp> _Closure;
-      return _Expr<_Closure,_Tp>(_Closure(*this, func));
-    }
-
-#define _DEFINE_VALARRAY_UNARY_OPERATOR(_Op, _Name)                     \
-  template<typename _Tp>						\
-  inline typename valarray<_Tp>::template _UnaryOp<_Name>::_Rt         	\
-  valarray<_Tp>::operator _Op() const					\
-  {									\
-    typedef _UnClos<_Name,_ValArray,_Tp> _Closure;	                \
-    typedef typename __fun<_Name, _Tp>::result_type _Rt;                \
-    return _Expr<_Closure, _Rt>(_Closure(*this));			\
-  }
-
-    _DEFINE_VALARRAY_UNARY_OPERATOR(+, __unary_plus)
-    _DEFINE_VALARRAY_UNARY_OPERATOR(-, __negate)
-    _DEFINE_VALARRAY_UNARY_OPERATOR(~, __bitwise_not)
-    _DEFINE_VALARRAY_UNARY_OPERATOR (!, __logical_not)
-
-#undef _DEFINE_VALARRAY_UNARY_OPERATOR
-
-#define _DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(_Op, _Name)               \
-  template<class _Tp>							\
-    inline valarray<_Tp>&						\
-    valarray<_Tp>::operator _Op##=(const _Tp &__t)			\
-    {									\
-      _Array_augmented_##_Name(_Array<_Tp>(_M_data), _M_size, __t);	\
-      return *this;							\
-    }									\
-									\
-  template<class _Tp>							\
-    inline valarray<_Tp>&						\
-    valarray<_Tp>::operator _Op##=(const valarray<_Tp> &__v)		\
-    {									\
-      _GLIBCXX_DEBUG_ASSERT(_M_size == __v._M_size);                    \
-      _Array_augmented_##_Name(_Array<_Tp>(_M_data), _M_size, 		\
-			       _Array<_Tp>(__v._M_data));		\
-      return *this;							\
-    }
-
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(+, __plus)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(-, __minus)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(*, __multiplies)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(/, __divides)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(%, __modulus)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(^, __bitwise_xor)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(&, __bitwise_and)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(|, __bitwise_or)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(<<, __shift_left)
-_DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_AUGMENTED_ASSIGNMENT
-
-#define _DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(_Op, _Name)          \
-  template<class _Tp> template<class _Dom>				\
-    inline valarray<_Tp>&						\
-    valarray<_Tp>::operator _Op##=(const _Expr<_Dom,_Tp>& __e)		\
-    {									\
-      _Array_augmented_##_Name(_Array<_Tp>(_M_data), __e, _M_size);	\
-      return *this;							\
-    }
-
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(+, __plus)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(-, __minus)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(*, __multiplies)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(/, __divides)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(%, __modulus)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(^, __bitwise_xor)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(&, __bitwise_and)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(|, __bitwise_or)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(<<, __shift_left)
-_DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT(>>, __shift_right)
-
-#undef _DEFINE_VALARRAY_EXPR_AUGMENTED_ASSIGNMENT
-    
-
-#define _DEFINE_BINARY_OPERATOR(_Op, _Name)				\
-  template<typename _Tp>						\
-    inline _Expr<_BinClos<_Name,_ValArray,_ValArray,_Tp,_Tp>,           \
-                 typename __fun<_Name, _Tp>::result_type>               \
-    operator _Op(const valarray<_Tp>& __v, const valarray<_Tp>& __w)	\
-    {									\
-      _GLIBCXX_DEBUG_ASSERT(__v.size() == __w.size());                  \
-      typedef _BinClos<_Name,_ValArray,_ValArray,_Tp,_Tp> _Closure;     \
-      typedef typename __fun<_Name, _Tp>::result_type _Rt;              \
-      return _Expr<_Closure, _Rt>(_Closure(__v, __w));                  \
-    }									\
-									\
-  template<typename _Tp>						\
-  inline _Expr<_BinClos<_Name,_ValArray,_Constant,_Tp,_Tp>,             \
-               typename __fun<_Name, _Tp>::result_type>                 \
-  operator _Op(const valarray<_Tp>& __v, const _Tp& __t)		\
-  {									\
-    typedef _BinClos<_Name,_ValArray,_Constant,_Tp,_Tp> _Closure;	\
-    typedef typename __fun<_Name, _Tp>::result_type _Rt;                \
-    return _Expr<_Closure, _Rt>(_Closure(__v, __t));	                \
-  }									\
-									\
-  template<typename _Tp>						\
-  inline _Expr<_BinClos<_Name,_Constant,_ValArray,_Tp,_Tp>,             \
-               typename __fun<_Name, _Tp>::result_type>                 \
-  operator _Op(const _Tp& __t, const valarray<_Tp>& __v)		\
-  {									\
-    typedef _BinClos<_Name,_Constant,_ValArray,_Tp,_Tp> _Closure;       \
-    typedef typename __fun<_Name, _Tp>::result_type _Rt;                \
-    return _Expr<_Closure, _Tp>(_Closure(__t, __v));        	        \
-  }
-
-_DEFINE_BINARY_OPERATOR(+, __plus)
-_DEFINE_BINARY_OPERATOR(-, __minus)
-_DEFINE_BINARY_OPERATOR(*, __multiplies)
-_DEFINE_BINARY_OPERATOR(/, __divides)
-_DEFINE_BINARY_OPERATOR(%, __modulus)
-_DEFINE_BINARY_OPERATOR(^, __bitwise_xor)
-_DEFINE_BINARY_OPERATOR(&, __bitwise_and)
-_DEFINE_BINARY_OPERATOR(|, __bitwise_or)
-_DEFINE_BINARY_OPERATOR(<<, __shift_left)
-_DEFINE_BINARY_OPERATOR(>>, __shift_right)
-_DEFINE_BINARY_OPERATOR(&&, __logical_and)
-_DEFINE_BINARY_OPERATOR(||, __logical_or)
-_DEFINE_BINARY_OPERATOR(==, __equal_to)
-_DEFINE_BINARY_OPERATOR(!=, __not_equal_to)
-_DEFINE_BINARY_OPERATOR(<, __less)
-_DEFINE_BINARY_OPERATOR(>, __greater)
-_DEFINE_BINARY_OPERATOR(<=, __less_equal)
-_DEFINE_BINARY_OPERATOR(>=, __greater_equal)
-
-} // namespace std
-
-#endif /* _GLIBCXX_VALARRAY */
diff --git a/include.new/c++/3.4/vector b/include.new/c++/3.4/vector
deleted file mode 100644
index 16e50a9..0000000
--- a/include.new/c++/3.4/vector
+++ /dev/null
@@ -1,83 +0,0 @@
-// <vector> -*- C++ -*-
-
-// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 2, or (at your option)
-// any later version.
-
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING.  If not, write to the Free
-// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-// USA.
-
-// As a special exception, you may use this file as part of a free software
-// library without restriction.  Specifically, if other files instantiate
-// templates or use macros or inline functions from this file, or you compile
-// this file and link it with other files to produce an executable, this
-// file does not by itself cause the resulting executable to be covered by
-// the GNU General Public License.  This exception does not however
-// invalidate any other reasons why the executable file might be covered by
-// the GNU General Public License.
-
-/*
- *
- * Copyright (c) 1994
- * Hewlett-Packard Company
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Hewlett-Packard Company makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- *
- * Copyright (c) 1996
- * Silicon Graphics Computer Systems, Inc.
- *
- * Permission to use, copy, modify, distribute and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appear in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation.  Silicon Graphics makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- */
-
-/** @file vector
- *  This is a Standard C++ Library header.  You should @c #include this header
- *  in your programs, rather than any of the "st[dl]_*.h" implementation files.
- */
-
-#ifndef _GLIBCXX_VECTOR
-#define _GLIBCXX_VECTOR 1
-
-#pragma GCC system_header
-
-#include <bits/functexcept.h>
-#include <bits/stl_algobase.h>
-#include <bits/allocator.h>
-#include <bits/stl_construct.h>
-#include <bits/stl_uninitialized.h>
-#include <bits/stl_vector.h>
-#include <bits/stl_bvector.h> 
-
-#ifndef _GLIBCXX_EXPORT_TEMPLATE
-# include <bits/vector.tcc>
-#endif
-
-#ifdef _GLIBCXX_DEBUG
-# include <debug/vector>
-#endif
-
-#endif /* _GLIBCXX_VECTOR */
-
diff --git a/include.new/c++/v1/__bit_reference b/include.new/c++/v1/__bit_reference
deleted file mode 100644
index 5659ed0..0000000
--- a/include.new/c++/v1/__bit_reference
+++ /dev/null
@@ -1,1286 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___BIT_REFERENCE
-#define _LIBCPP___BIT_REFERENCE
-
-#include <__config>
-#include <algorithm>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Cp, bool _IsConst, typename _Cp::__storage_type = 0> class __bit_iterator;
-template <class _Cp> class __bit_const_reference;
-
-template <class _Tp>
-struct __has_storage_type
-{
-    static const bool value = false;
-};
-
-template <class _Cp, bool = __has_storage_type<_Cp>::value>
-class __bit_reference
-{
-    typedef typename _Cp::__storage_type    __storage_type;
-    typedef typename _Cp::__storage_pointer __storage_pointer;
-
-    __storage_pointer __seg_;
-    __storage_type    __mask_;
-
-#if defined(__clang__) || defined(__IBMCPP__) || defined(_LIBCPP_MSVC)
-    friend typename _Cp::__self;
-#else
-    friend class _Cp::__self;
-#endif
-    friend class __bit_const_reference<_Cp>;
-    friend class __bit_iterator<_Cp, false>;
-public:
-    _LIBCPP_INLINE_VISIBILITY operator bool() const _NOEXCEPT
-        {return static_cast<bool>(*__seg_ & __mask_);}
-    _LIBCPP_INLINE_VISIBILITY bool operator ~() const _NOEXCEPT
-        {return !static_cast<bool>(*this);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_reference& operator=(bool __x) _NOEXCEPT
-    {
-        if (__x)
-            *__seg_ |= __mask_;
-        else
-            *__seg_ &= ~__mask_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_reference& operator=(const __bit_reference& __x) _NOEXCEPT
-        {return operator=(static_cast<bool>(__x));}
-
-    _LIBCPP_INLINE_VISIBILITY void flip() _NOEXCEPT {*__seg_ ^= __mask_;}
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, false> operator&() const _NOEXCEPT
-        {return __bit_iterator<_Cp, false>(__seg_, static_cast<unsigned>(__ctz(__mask_)));}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
-        : __seg_(__s), __mask_(__m) {}
-};
-
-template <class _Cp>
-class __bit_reference<_Cp, false>
-{
-};
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__bit_reference<_Cp> __x, __bit_reference<_Cp> __y) _NOEXCEPT
-{
-    bool __t = __x;
-    __x = __y;
-    __y = __t;
-}
-
-template <class _Cp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__bit_reference<_Cp> __x, __bit_reference<_Dp> __y) _NOEXCEPT
-{
-    bool __t = __x;
-    __x = __y;
-    __y = __t;
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__bit_reference<_Cp> __x, bool& __y) _NOEXCEPT
-{
-    bool __t = __x;
-    __x = __y;
-    __y = __t;
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(bool& __x, __bit_reference<_Cp> __y) _NOEXCEPT
-{
-    bool __t = __x;
-    __x = __y;
-    __y = __t;
-}
-
-template <class _Cp>
-class __bit_const_reference
-{
-    typedef typename _Cp::__storage_type          __storage_type;
-    typedef typename _Cp::__const_storage_pointer __storage_pointer;
-
-    __storage_pointer        __seg_;
-    __storage_type __mask_;
-
-#if defined(__clang__) || defined(__IBMCPP__) || defined(_LIBCPP_MSVC)
-    friend typename _Cp::__self;
-#else
-    friend class _Cp::__self;
-#endif
-    friend class __bit_iterator<_Cp, true>;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_const_reference(const __bit_reference<_Cp>& __x) _NOEXCEPT
-        : __seg_(__x.__seg_), __mask_(__x.__mask_) {}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR operator bool() const _NOEXCEPT
-        {return static_cast<bool>(*__seg_ & __mask_);}
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, true> operator&() const _NOEXCEPT
-        {return __bit_iterator<_Cp, true>(__seg_, static_cast<unsigned>(__ctz(__mask_)));}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR
-    __bit_const_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
-        : __seg_(__s), __mask_(__m) {}
-
-    __bit_const_reference& operator=(const __bit_const_reference& __x);
-};
-
-// find
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, _IsConst>
-__find_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _It;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __storage_type __b = *__first.__seg_ & __m;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-        if (__n == __dn)
-            return __first + __n;
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-        if (*__first.__seg_)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(*__first.__seg_)));
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __storage_type __b = *__first.__seg_ & __m;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-    }
-    return _It(__first.__seg_, static_cast<unsigned>(__n));
-}
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, _IsConst>
-__find_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _It;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __storage_type __b = ~*__first.__seg_ & __m;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-        if (__n == __dn)
-            return __first + __n;
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-    {
-        __storage_type __b = ~*__first.__seg_;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-    }
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __storage_type __b = ~*__first.__seg_ & __m;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-    }
-    return _It(__first.__seg_, static_cast<unsigned>(__n));
-}
-
-template <class _Cp, bool _IsConst, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, _IsConst>
-find(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, const _Tp& __value_)
-{
-    if (static_cast<bool>(__value_))
-        return __find_bool_true(__first, static_cast<typename _Cp::size_type>(__last - __first));
-    return __find_bool_false(__first, static_cast<typename _Cp::size_type>(__last - __first));
-}
-
-// count
-
-template <class _Cp, bool _IsConst>
-typename __bit_iterator<_Cp, _IsConst>::difference_type
-__count_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _It;
-    typedef typename _It::__storage_type __storage_type;
-    typedef typename _It::difference_type difference_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    difference_type __r = 0;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __r = _VSTD::__pop_count(*__first.__seg_ & __m);
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-        __r += _VSTD::__pop_count(*__first.__seg_);
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __r += _VSTD::__pop_count(*__first.__seg_ & __m);
-    }
-    return __r;
-}
-
-template <class _Cp, bool _IsConst>
-typename __bit_iterator<_Cp, _IsConst>::difference_type
-__count_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _It;
-    typedef typename _It::__storage_type __storage_type;
-    typedef typename _It::difference_type difference_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    difference_type __r = 0;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __r = _VSTD::__pop_count(~*__first.__seg_ & __m);
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-        __r += _VSTD::__pop_count(~*__first.__seg_);
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __r += _VSTD::__pop_count(~*__first.__seg_ & __m);
-    }
-    return __r;
-}
-
-template <class _Cp, bool _IsConst, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __bit_iterator<_Cp, _IsConst>::difference_type
-count(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, const _Tp& __value_)
-{
-    if (static_cast<bool>(__value_))
-        return __count_bool_true(__first, static_cast<typename _Cp::size_type>(__last - __first));
-    return __count_bool_false(__first, static_cast<typename _Cp::size_type>(__last - __first));
-}
-
-// fill_n
-
-template <class _Cp>
-void
-__fill_n_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, false> _It;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        *__first.__seg_ &= ~__m;
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    __storage_type __nw = __n / __bits_per_word;
-    _VSTD::memset(_VSTD::__to_raw_pointer(__first.__seg_), 0, __nw * sizeof(__storage_type));
-    __n -= __nw * __bits_per_word;
-    // do last partial word
-    if (__n > 0)
-    {
-        __first.__seg_ += __nw;
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        *__first.__seg_ &= ~__m;
-    }
-}
-
-template <class _Cp>
-void
-__fill_n_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, false> _It;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        *__first.__seg_ |= __m;
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    __storage_type __nw = __n / __bits_per_word;
-    _VSTD::memset(_VSTD::__to_raw_pointer(__first.__seg_), -1, __nw * sizeof(__storage_type));
-    __n -= __nw * __bits_per_word;
-    // do last partial word
-    if (__n > 0)
-    {
-        __first.__seg_ += __nw;
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        *__first.__seg_ |= __m;
-    }
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n, bool __value_)
-{
-    if (__n > 0)
-    {
-        if (__value_)
-            __fill_n_true(__first, __n);
-        else
-            __fill_n_false(__first, __n);
-    }
-}
-
-// fill
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-fill(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, bool __value_)
-{
-    _VSTD::fill_n(__first, static_cast<typename _Cp::size_type>(__last - __first), __value_);
-}
-
-// copy
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, false>
-__copy_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
-                                                     __bit_iterator<_Cp, false> __result)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _In;
-    typedef  typename _In::difference_type difference_type;
-    typedef typename _In::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _In::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first.__ctz_ != 0)
-        {
-            unsigned __clz = __bits_per_word - __first.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
-            __storage_type __b = *__first.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b;
-            __result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_)  % __bits_per_word);
-            ++__first.__seg_;
-            // __first.__ctz_ = 0;
-        }
-        // __first.__ctz_ == 0;
-        // do middle words
-        __storage_type __nw = __n / __bits_per_word;
-        _VSTD::memmove(_VSTD::__to_raw_pointer(__result.__seg_),
-                       _VSTD::__to_raw_pointer(__first.__seg_),
-                       __nw * sizeof(__storage_type));
-        __n -= __nw * __bits_per_word;
-        __result.__seg_ += __nw;
-        // do last word
-        if (__n > 0)
-        {
-            __first.__seg_ += __nw;
-            __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b = *__first.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b;
-            __result.__ctz_ = static_cast<unsigned>(__n);
-        }
-    }
-    return __result;
-}
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, false>
-__copy_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
-                                                       __bit_iterator<_Cp, false> __result)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _In;
-    typedef  typename _In::difference_type difference_type;
-    typedef typename _In::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _In::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first.__ctz_ != 0)
-        {
-            unsigned __clz_f = __bits_per_word - __first.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-            __storage_type __b = *__first.__seg_ & __m;
-            unsigned __clz_r = __bits_per_word - __result.__ctz_;
-            __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r);
-            __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
-            *__result.__seg_ &= ~__m;
-            if (__result.__ctz_ > __first.__ctz_)
-                *__result.__seg_ |= __b << (__result.__ctz_ - __first.__ctz_);
-            else
-                *__result.__seg_ |= __b >> (__first.__ctz_ - __result.__ctz_);
-            __result.__seg_ += (__ddn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__ddn + __result.__ctz_)  % __bits_per_word);
-            __dn -= __ddn;
-            if (__dn > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __dn);
-                *__result.__seg_ &= ~__m;
-                *__result.__seg_ |= __b >> (__first.__ctz_ + __ddn);
-                __result.__ctz_ = static_cast<unsigned>(__dn);
-            }
-            ++__first.__seg_;
-            // __first.__ctz_ = 0;
-        }
-        // __first.__ctz_ == 0;
-        // do middle words
-        unsigned __clz_r = __bits_per_word - __result.__ctz_;
-        __storage_type __m = ~__storage_type(0) << __result.__ctz_;
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_)
-        {
-            __storage_type __b = *__first.__seg_;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b << __result.__ctz_;
-            ++__result.__seg_;
-            *__result.__seg_ &= __m;
-            *__result.__seg_ |= __b >> __clz_r;
-        }
-        // do last word
-        if (__n > 0)
-        {
-            __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b = *__first.__seg_ & __m;
-            __storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__clz_r));
-            __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b << __result.__ctz_;
-            __result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_)  % __bits_per_word);
-            __n -= __dn;
-            if (__n > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __n);
-                *__result.__seg_ &= ~__m;
-                *__result.__seg_ |= __b >> __dn;
-                __result.__ctz_ = static_cast<unsigned>(__n);
-            }
-        }
-    }
-    return __result;
-}
-
-template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, false>
-copy(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
-{
-    if (__first.__ctz_ == __result.__ctz_)
-        return __copy_aligned(__first, __last, __result);
-    return __copy_unaligned(__first, __last, __result);
-}
-
-// copy_backward
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, false>
-__copy_backward_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
-                                                     __bit_iterator<_Cp, false> __result)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _In;
-    typedef  typename _In::difference_type difference_type;
-    typedef typename _In::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _In::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__last.__ctz_ != 0)
-        {
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__last.__ctz_), __n);
-            __n -= __dn;
-            unsigned __clz = __bits_per_word - __last.__ctz_;
-            __storage_type __m = (~__storage_type(0) << (__last.__ctz_ - __dn)) & (~__storage_type(0) >> __clz);
-            __storage_type __b = *__last.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b;
-            __result.__ctz_ = static_cast<unsigned>(((-__dn & (__bits_per_word - 1)) +
-                                                       __result.__ctz_)  % __bits_per_word);
-            // __last.__ctz_ = 0
-         }
-        // __last.__ctz_ == 0 || __n == 0
-        // __result.__ctz_ == 0 || __n == 0
-        // do middle words
-        __storage_type __nw = __n / __bits_per_word;
-        __result.__seg_ -= __nw;
-        __last.__seg_ -= __nw;
-        _VSTD::memmove(_VSTD::__to_raw_pointer(__result.__seg_),
-                       _VSTD::__to_raw_pointer(__last.__seg_),
-                       __nw * sizeof(__storage_type));
-        __n -= __nw * __bits_per_word;
-        // do last word
-        if (__n > 0)
-        {
-            __storage_type __m = ~__storage_type(0) << (__bits_per_word - __n);
-            __storage_type __b = *--__last.__seg_ & __m;
-            *--__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b;
-            __result.__ctz_ = static_cast<unsigned>(-__n & (__bits_per_word - 1));
-        }
-    }
-    return __result;
-}
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, false>
-__copy_backward_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
-                                                       __bit_iterator<_Cp, false> __result)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _In;
-    typedef  typename _In::difference_type difference_type;
-    typedef typename _In::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _In::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__last.__ctz_ != 0)
-        {
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__last.__ctz_), __n);
-            __n -= __dn;
-            unsigned __clz_l = __bits_per_word - __last.__ctz_;
-            __storage_type __m = (~__storage_type(0) << (__last.__ctz_ - __dn)) & (~__storage_type(0) >> __clz_l);
-            __storage_type __b = *__last.__seg_ & __m;
-            unsigned __clz_r = __bits_per_word - __result.__ctz_;
-            __storage_type __ddn = _VSTD::min(__dn, static_cast<difference_type>(__result.__ctz_));
-            if (__ddn > 0)
-            {
-                __m = (~__storage_type(0) << (__result.__ctz_ - __ddn)) & (~__storage_type(0) >> __clz_r);
-                *__result.__seg_ &= ~__m;
-                if (__result.__ctz_ > __last.__ctz_)
-                    *__result.__seg_ |= __b << (__result.__ctz_ - __last.__ctz_);
-                else
-                    *__result.__seg_ |= __b >> (__last.__ctz_ - __result.__ctz_);
-                __result.__ctz_ = static_cast<unsigned>(((-__ddn & (__bits_per_word - 1)) +
-                                                         __result.__ctz_)  % __bits_per_word);
-                __dn -= __ddn;
-            }
-            if (__dn > 0)
-            {
-                // __result.__ctz_ == 0
-                --__result.__seg_;
-                __result.__ctz_ = static_cast<unsigned>(-__dn & (__bits_per_word - 1));
-                __m = ~__storage_type(0) << __result.__ctz_;
-                *__result.__seg_ &= ~__m;
-                __last.__ctz_ -= __dn + __ddn;
-                *__result.__seg_ |= __b << (__result.__ctz_ - __last.__ctz_);
-            }
-            // __last.__ctz_ = 0
-         }
-        // __last.__ctz_ == 0 || __n == 0
-        // __result.__ctz_ != 0 || __n == 0
-        // do middle words
-        unsigned __clz_r = __bits_per_word - __result.__ctz_;
-        __storage_type __m = ~__storage_type(0) >> __clz_r;
-        for (; __n >= __bits_per_word; __n -= __bits_per_word)
-        {
-            __storage_type __b = *--__last.__seg_;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b >> __clz_r;
-            *--__result.__seg_ &= __m;
-            *__result.__seg_ |= __b << __result.__ctz_;
-        }
-        // do last word
-        if (__n > 0)
-        {
-            __m = ~__storage_type(0) << (__bits_per_word - __n);
-            __storage_type __b = *--__last.__seg_ & __m;
-            __clz_r = __bits_per_word - __result.__ctz_;
-            __storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__result.__ctz_));
-            __m = (~__storage_type(0) << (__result.__ctz_ - __dn)) & (~__storage_type(0) >> __clz_r);
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b >> (__bits_per_word - __result.__ctz_);
-            __result.__ctz_ = static_cast<unsigned>(((-__dn & (__bits_per_word - 1)) +
-                                                     __result.__ctz_)  % __bits_per_word);
-            __n -= __dn;
-            if (__n > 0)
-            {
-                // __result.__ctz_ == 0
-                --__result.__seg_;
-                __result.__ctz_ = static_cast<unsigned>(-__n & (__bits_per_word - 1));
-                __m = ~__storage_type(0) << __result.__ctz_;
-                *__result.__seg_ &= ~__m;
-                *__result.__seg_ |= __b << (__result.__ctz_ - (__bits_per_word - __n - __dn));
-            }
-        }
-    }
-    return __result;
-}
-
-template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, false>
-copy_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
-{
-    if (__last.__ctz_ == __result.__ctz_)
-        return __copy_backward_aligned(__first, __last, __result);
-    return __copy_backward_unaligned(__first, __last, __result);
-}
-
-// move
-
-template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, false>
-move(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
-{
-    return _VSTD::copy(__first, __last, __result);
-}
-
-// move_backward
-
-template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, false>
-move_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
-{
-    return _VSTD::copy_backward(__first, __last, __result);
-}
-
-// swap_ranges
-
-template <class __C1, class __C2>
-__bit_iterator<__C2, false>
-__swap_ranges_aligned(__bit_iterator<__C1, false> __first, __bit_iterator<__C1, false> __last,
-                      __bit_iterator<__C2, false> __result)
-{
-    typedef __bit_iterator<__C1, false> _I1;
-    typedef  typename _I1::difference_type difference_type;
-    typedef typename _I1::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _I1::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first.__ctz_ != 0)
-        {
-            unsigned __clz = __bits_per_word - __first.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
-            __storage_type __b1 = *__first.__seg_ & __m;
-            *__first.__seg_ &= ~__m;
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b1;
-            *__first.__seg_  |= __b2;
-            __result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_)  % __bits_per_word);
-            ++__first.__seg_;
-            // __first.__ctz_ = 0;
-        }
-        // __first.__ctz_ == 0;
-        // do middle words
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_, ++__result.__seg_)
-            swap(*__first.__seg_, *__result.__seg_);
-        // do last word
-        if (__n > 0)
-        {
-            __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b1 = *__first.__seg_ & __m;
-            *__first.__seg_ &= ~__m;
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b1;
-            *__first.__seg_  |= __b2;
-            __result.__ctz_ = static_cast<unsigned>(__n);
-        }
-    }
-    return __result;
-}
-
-template <class __C1, class __C2>
-__bit_iterator<__C2, false>
-__swap_ranges_unaligned(__bit_iterator<__C1, false> __first, __bit_iterator<__C1, false> __last,
-                        __bit_iterator<__C2, false> __result)
-{
-    typedef __bit_iterator<__C1, false> _I1;
-    typedef  typename _I1::difference_type difference_type;
-    typedef typename _I1::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _I1::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first.__ctz_ != 0)
-        {
-            unsigned __clz_f = __bits_per_word - __first.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-            __storage_type __b1 = *__first.__seg_ & __m;
-            *__first.__seg_ &= ~__m;
-            unsigned __clz_r = __bits_per_word - __result.__ctz_;
-            __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r);
-            __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            if (__result.__ctz_ > __first.__ctz_)
-            {
-                unsigned __s = __result.__ctz_ - __first.__ctz_;
-                *__result.__seg_ |= __b1 << __s;
-                *__first.__seg_  |= __b2 >> __s;
-            }
-            else
-            {
-                unsigned __s = __first.__ctz_ - __result.__ctz_;
-                *__result.__seg_ |= __b1 >> __s;
-                *__first.__seg_  |= __b2 << __s;
-            }
-            __result.__seg_ += (__ddn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__ddn + __result.__ctz_)  % __bits_per_word);
-            __dn -= __ddn;
-            if (__dn > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __dn);
-                __b2 = *__result.__seg_ & __m;
-                *__result.__seg_ &= ~__m;
-                unsigned __s = __first.__ctz_ + __ddn;
-                *__result.__seg_ |= __b1 >> __s;
-                *__first.__seg_  |= __b2 << __s;
-                __result.__ctz_ = static_cast<unsigned>(__dn);
-            }
-            ++__first.__seg_;
-            // __first.__ctz_ = 0;
-        }
-        // __first.__ctz_ == 0;
-        // do middle words
-        __storage_type __m = ~__storage_type(0) << __result.__ctz_;
-        unsigned __clz_r = __bits_per_word - __result.__ctz_;
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_)
-        {
-            __storage_type __b1 = *__first.__seg_;
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b1 << __result.__ctz_;
-            *__first.__seg_  = __b2 >> __result.__ctz_;
-            ++__result.__seg_;
-            __b2 = *__result.__seg_ & ~__m;
-            *__result.__seg_ &= __m;
-            *__result.__seg_ |= __b1 >> __clz_r;
-            *__first.__seg_  |= __b2 << __clz_r;
-        }
-        // do last word
-        if (__n > 0)
-        {
-            __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b1 = *__first.__seg_ & __m;
-            *__first.__seg_ &= ~__m;
-            __storage_type __dn = _VSTD::min<__storage_type>(__n, __clz_r);
-            __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b1 << __result.__ctz_;
-            *__first.__seg_  |= __b2 >> __result.__ctz_;
-            __result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_)  % __bits_per_word);
-            __n -= __dn;
-            if (__n > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __n);
-                __b2 = *__result.__seg_ & __m;
-                *__result.__seg_ &= ~__m;
-                *__result.__seg_ |= __b1 >> __dn;
-                *__first.__seg_  |= __b2 << __dn;
-                __result.__ctz_ = static_cast<unsigned>(__n);
-            }
-        }
-    }
-    return __result;
-}
-
-template <class __C1, class __C2>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<__C2, false>
-swap_ranges(__bit_iterator<__C1, false> __first1, __bit_iterator<__C1, false> __last1,
-            __bit_iterator<__C2, false> __first2)
-{
-    if (__first1.__ctz_ == __first2.__ctz_)
-        return __swap_ranges_aligned(__first1, __last1, __first2);
-    return __swap_ranges_unaligned(__first1, __last1, __first2);
-}
-
-// rotate
-
-template <class _Cp>
-struct __bit_array
-{
-    typedef typename _Cp::difference_type difference_type;
-    typedef typename _Cp::__storage_type  __storage_type;
-    typedef typename _Cp::__storage_pointer __storage_pointer;
-    typedef typename _Cp::iterator        iterator;
-    static const unsigned __bits_per_word = _Cp::__bits_per_word;
-    static const unsigned _Np = 4;
-
-    difference_type __size_;
-    __storage_type __word_[_Np];
-
-    _LIBCPP_INLINE_VISIBILITY static difference_type capacity()
-        {return static_cast<difference_type>(_Np * __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY explicit __bit_array(difference_type __s) : __size_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY iterator begin()
-    {
-        return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]), 0);
-    }
-    _LIBCPP_INLINE_VISIBILITY iterator end()
-    {
-        return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]) + __size_ / __bits_per_word,
-                                                  static_cast<unsigned>(__size_ % __bits_per_word));
-    }
-};
-
-template <class _Cp>
-__bit_iterator<_Cp, false>
-rotate(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __middle, __bit_iterator<_Cp, false> __last)
-{
-    typedef __bit_iterator<_Cp, false> _I1;
-    typedef  typename _I1::difference_type difference_type;
-    difference_type __d1 = __middle - __first;
-    difference_type __d2 = __last - __middle;
-    _I1 __r = __first + __d2;
-    while (__d1 != 0 && __d2 != 0)
-    {
-        if (__d1 <= __d2)
-        {
-            if (__d1 <= __bit_array<_Cp>::capacity())
-            {
-                __bit_array<_Cp> __b(__d1);
-                _VSTD::copy(__first, __middle, __b.begin());
-                _VSTD::copy(__b.begin(), __b.end(), _VSTD::copy(__middle, __last, __first));
-                break;
-            }
-            else
-            {
-                __bit_iterator<_Cp, false> __mp = _VSTD::swap_ranges(__first, __middle, __middle);
-                __first = __middle;
-                __middle = __mp;
-                __d2 -= __d1;
-            }
-        }
-        else
-        {
-            if (__d2 <= __bit_array<_Cp>::capacity())
-            {
-                __bit_array<_Cp> __b(__d2);
-                _VSTD::copy(__middle, __last, __b.begin());
-                _VSTD::copy_backward(__b.begin(), __b.end(), _VSTD::copy_backward(__first, __middle, __last));
-                break;
-            }
-            else
-            {
-                __bit_iterator<_Cp, false> __mp = __first + __d2;
-                _VSTD::swap_ranges(__first, __mp, __middle);
-                __first = __mp;
-                __d1 -= __d2;
-            }
-        }
-    }
-    return __r;
-}
-
-// equal
-
-template <class _Cp, bool _IC1, bool _IC2>
-bool
-__equal_unaligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1,
-                  __bit_iterator<_Cp, _IC2> __first2)
-{
-    typedef __bit_iterator<_Cp, _IC1> _It;
-    typedef  typename _It::difference_type difference_type;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    difference_type __n = __last1 - __first1;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first1.__ctz_ != 0)
-        {
-            unsigned __clz_f = __bits_per_word - __first1.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first1.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-            __storage_type __b = *__first1.__seg_ & __m;
-            unsigned __clz_r = __bits_per_word - __first2.__ctz_;
-            __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r);
-            __m = (~__storage_type(0) << __first2.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
-            if (__first2.__ctz_ > __first1.__ctz_)
-            {
-                if ((*__first2.__seg_ & __m) != (__b << (__first2.__ctz_ - __first1.__ctz_)))
-                    return false;
-            }
-            else
-            {
-                if ((*__first2.__seg_ & __m) != (__b >> (__first1.__ctz_ - __first2.__ctz_)))
-                    return false;
-            }
-            __first2.__seg_ += (__ddn + __first2.__ctz_) / __bits_per_word;
-            __first2.__ctz_ = static_cast<unsigned>((__ddn + __first2.__ctz_)  % __bits_per_word);
-            __dn -= __ddn;
-            if (__dn > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __dn);
-                if ((*__first2.__seg_ & __m) != (__b >> (__first1.__ctz_ + __ddn)))
-                    return false;
-                __first2.__ctz_ = static_cast<unsigned>(__dn);
-            }
-            ++__first1.__seg_;
-            // __first1.__ctz_ = 0;
-        }
-        // __first1.__ctz_ == 0;
-        // do middle words
-        unsigned __clz_r = __bits_per_word - __first2.__ctz_;
-        __storage_type __m = ~__storage_type(0) << __first2.__ctz_;
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first1.__seg_)
-        {
-            __storage_type __b = *__first1.__seg_;
-            if ((*__first2.__seg_ & __m) != (__b << __first2.__ctz_))
-                return false;
-            ++__first2.__seg_;
-            if ((*__first2.__seg_ & ~__m) != (__b >> __clz_r))
-                return false;
-        }
-        // do last word
-        if (__n > 0)
-        {
-            __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b = *__first1.__seg_ & __m;
-            __storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__clz_r));
-            __m = (~__storage_type(0) << __first2.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
-            if ((*__first2.__seg_ & __m) != (__b << __first2.__ctz_))
-                return false;
-            __first2.__seg_ += (__dn + __first2.__ctz_) / __bits_per_word;
-            __first2.__ctz_ = static_cast<unsigned>((__dn + __first2.__ctz_)  % __bits_per_word);
-            __n -= __dn;
-            if (__n > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __n);
-                if ((*__first2.__seg_ & __m) != (__b >> __dn))
-                    return false;
-            }
-        }
-    }
-    return true;
-}
-
-template <class _Cp, bool _IC1, bool _IC2>
-bool
-__equal_aligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1,
-                __bit_iterator<_Cp, _IC2> __first2)
-{
-    typedef __bit_iterator<_Cp, _IC1> _It;
-    typedef  typename _It::difference_type difference_type;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    difference_type __n = __last1 - __first1;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first1.__ctz_ != 0)
-        {
-            unsigned __clz = __bits_per_word - __first1.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first1.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
-            if ((*__first2.__seg_ & __m) != (*__first1.__seg_ & __m))
-                return false;
-            ++__first2.__seg_;
-            ++__first1.__seg_;
-            // __first1.__ctz_ = 0;
-            // __first2.__ctz_ = 0;
-        }
-        // __first1.__ctz_ == 0;
-        // __first2.__ctz_ == 0;
-        // do middle words
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first1.__seg_, ++__first2.__seg_)
-            if (*__first2.__seg_ != *__first1.__seg_)
-                return false;
-        // do last word
-        if (__n > 0)
-        {
-            __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            if ((*__first2.__seg_ & __m) != (*__first1.__seg_ & __m))
-                return false;
-        }
-    }
-    return true;
-}
-
-template <class _Cp, bool _IC1, bool _IC2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1, __bit_iterator<_Cp, _IC2> __first2)
-{
-    if (__first1.__ctz_ == __first2.__ctz_)
-        return __equal_aligned(__first1, __last1, __first2);
-    return __equal_unaligned(__first1, __last1, __first2);
-}
-
-template <class _Cp, bool _IsConst,
-          typename _Cp::__storage_type>
-class __bit_iterator
-{
-public:
-    typedef typename _Cp::difference_type                                                          difference_type;
-    typedef bool                                                                                  value_type;
-    typedef __bit_iterator                                                                        pointer;
-    typedef typename conditional<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> >::type reference;
-    typedef random_access_iterator_tag                                                            iterator_category;
-
-private:
-    typedef typename _Cp::__storage_type                                           __storage_type;
-    typedef typename conditional<_IsConst, typename _Cp::__const_storage_pointer,
-                                           typename _Cp::__storage_pointer>::type  __storage_pointer;
-    static const unsigned __bits_per_word = _Cp::__bits_per_word;
-
-    __storage_pointer __seg_;
-    unsigned          __ctz_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __seg_(nullptr), __ctz_(0)
-#endif
-    {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_iterator(const __bit_iterator<_Cp, false>& __it) _NOEXCEPT
-        : __seg_(__it.__seg_), __ctz_(__it.__ctz_) {}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const _NOEXCEPT
-        {return reference(__seg_, __storage_type(1) << __ctz_);}
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator& operator++()
-    {
-        if (__ctz_ != __bits_per_word-1)
-            ++__ctz_;
-        else
-        {
-            __ctz_ = 0;
-            ++__seg_;
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator operator++(int)
-    {
-        __bit_iterator __tmp = *this;
-        ++(*this);
-        return __tmp;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator& operator--()
-    {
-        if (__ctz_ != 0)
-            --__ctz_;
-        else
-        {
-            __ctz_ = __bits_per_word - 1;
-            --__seg_;
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator operator--(int)
-    {
-        __bit_iterator __tmp = *this;
-        --(*this);
-        return __tmp;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator& operator+=(difference_type __n)
-    {
-        if (__n >= 0)
-            __seg_ += (__n + __ctz_) / __bits_per_word;
-        else
-            __seg_ += static_cast<difference_type>(__n - __bits_per_word + __ctz_ + 1)
-                    / static_cast<difference_type>(__bits_per_word);
-        __n &= (__bits_per_word - 1);
-        __ctz_ = static_cast<unsigned>((__n + __ctz_)  % __bits_per_word);
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator& operator-=(difference_type __n)
-    {
-        return *this += -__n;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator operator+(difference_type __n) const
-    {
-        __bit_iterator __t(*this);
-        __t += __n;
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator operator-(difference_type __n) const
-    {
-        __bit_iterator __t(*this);
-        __t -= __n;
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    friend __bit_iterator operator+(difference_type __n, const __bit_iterator& __it) {return __it + __n;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    friend difference_type operator-(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return (__x.__seg_ - __y.__seg_) * __bits_per_word + __x.__ctz_ - __y.__ctz_;}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator[](difference_type __n) const {return *(*this + __n);}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator==(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return __x.__seg_ == __y.__seg_ && __x.__ctz_ == __y.__ctz_;}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator!=(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return !(__x == __y);}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator<(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return __x.__seg_ < __y.__seg_ || (__x.__seg_ == __y.__seg_ && __x.__ctz_ < __y.__ctz_);}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator>(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return __y < __x;}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator<=(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return !(__y < __x);}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator>=(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return !(__x < __y);}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_iterator(__storage_pointer __s, unsigned __ctz) _NOEXCEPT
-        : __seg_(__s), __ctz_(__ctz) {}
-
-#if defined(__clang__) || defined(__IBMCPP__) || defined(_LIBCPP_MSVC)
-    friend typename _Cp::__self;
-#else
-    friend class _Cp::__self;
-#endif
-    friend class __bit_reference<_Cp>;
-    friend class __bit_const_reference<_Cp>;
-    friend class __bit_iterator<_Cp, true>;
-    template <class _Dp> friend struct __bit_array;
-    template <class _Dp> friend void __fill_n_false(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n);
-    template <class _Dp> friend void __fill_n_true(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_aligned(__bit_iterator<_Dp, _IC> __first,
-                                                                                  __bit_iterator<_Dp, _IC> __last,
-                                                                                  __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_unaligned(__bit_iterator<_Dp, _IC> __first,
-                                                                                    __bit_iterator<_Dp, _IC> __last,
-                                                                                    __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> copy(__bit_iterator<_Dp, _IC> __first,
-                                                                        __bit_iterator<_Dp, _IC> __last,
-                                                                        __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_backward_aligned(__bit_iterator<_Dp, _IC> __first,
-                                                                                           __bit_iterator<_Dp, _IC> __last,
-                                                                                           __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_backward_unaligned(__bit_iterator<_Dp, _IC> __first,
-                                                                                             __bit_iterator<_Dp, _IC> __last,
-                                                                                             __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> copy_backward(__bit_iterator<_Dp, _IC> __first,
-                                                                                 __bit_iterator<_Dp, _IC> __last,
-                                                                                 __bit_iterator<_Dp, false> __result);
-    template <class __C1, class __C2>friend __bit_iterator<__C2, false> __swap_ranges_aligned(__bit_iterator<__C1, false>,
-                                                                                           __bit_iterator<__C1, false>,
-                                                                                           __bit_iterator<__C2, false>);
-    template <class __C1, class __C2>friend __bit_iterator<__C2, false> __swap_ranges_unaligned(__bit_iterator<__C1, false>,
-                                                                                             __bit_iterator<__C1, false>,
-                                                                                             __bit_iterator<__C2, false>);
-    template <class __C1, class __C2>friend __bit_iterator<__C2, false> swap_ranges(__bit_iterator<__C1, false>,
-                                                                                 __bit_iterator<__C1, false>,
-                                                                                 __bit_iterator<__C2, false>);
-    template <class _Dp> friend __bit_iterator<_Dp, false> rotate(__bit_iterator<_Dp, false>,
-                                                                __bit_iterator<_Dp, false>,
-                                                                __bit_iterator<_Dp, false>);
-    template <class _Dp, bool _IC1, bool _IC2> friend bool __equal_aligned(__bit_iterator<_Dp, _IC1>,
-                                                    __bit_iterator<_Dp, _IC1>,
-                                                    __bit_iterator<_Dp, _IC2>);
-    template <class _Dp, bool _IC1, bool _IC2> friend bool __equal_unaligned(__bit_iterator<_Dp, _IC1>,
-                                                      __bit_iterator<_Dp, _IC1>,
-                                                      __bit_iterator<_Dp, _IC2>);
-    template <class _Dp, bool _IC1, bool _IC2> friend bool equal(__bit_iterator<_Dp, _IC1>,
-                                                                __bit_iterator<_Dp, _IC1>,
-                                                                __bit_iterator<_Dp, _IC2>);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, _IC> __find_bool_true(__bit_iterator<_Dp, _IC>,
-                                                                          typename _Dp::size_type);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, _IC> __find_bool_false(__bit_iterator<_Dp, _IC>,
-                                                                           typename _Dp::size_type);
-    template <class _Dp, bool _IC> friend typename __bit_iterator<_Dp, _IC>::difference_type
-                   __count_bool_true(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
-    template <class _Dp, bool _IC> friend typename __bit_iterator<_Dp, _IC>::difference_type
-                   __count_bool_false(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___BIT_REFERENCE
diff --git a/include.new/c++/v1/__config b/include.new/c++/v1/__config
deleted file mode 100644
index c5b9a6b..0000000
--- a/include.new/c++/v1/__config
+++ /dev/null
@@ -1,734 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- __config ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CONFIG
-#define _LIBCPP_CONFIG
-
-#if !defined(_MSC_VER) || defined(__clang__)
-#pragma GCC system_header
-#endif
-
-#ifdef __GNUC__
-#define _GNUC_VER (__GNUC__ * 100 + __GNUC_MINOR__)
-#endif
-
-#if !_WIN32
-#include <unistd.h>
-#include <errno.h>  // for ELAST on FreeBSD
-#endif
-
-#define _LIBCPP_VERSION 1101
-
-#define _LIBCPP_ABI_VERSION 1
-
-#define _LIBCPP_CONCAT1(_LIBCPP_X,_LIBCPP_Y) _LIBCPP_X##_LIBCPP_Y
-#define _LIBCPP_CONCAT(_LIBCPP_X,_LIBCPP_Y) _LIBCPP_CONCAT1(_LIBCPP_X,_LIBCPP_Y)
-
-#define _LIBCPP_NAMESPACE _LIBCPP_CONCAT(__,_LIBCPP_ABI_VERSION)
-
-#ifdef __LITTLE_ENDIAN__
-#if __LITTLE_ENDIAN__
-#define _LIBCPP_LITTLE_ENDIAN 1
-#define _LIBCPP_BIG_ENDIAN    0
-#endif  // __LITTLE_ENDIAN__
-#endif  // __LITTLE_ENDIAN__
-
-#ifdef __BIG_ENDIAN__
-#if __BIG_ENDIAN__
-#define _LIBCPP_LITTLE_ENDIAN 0
-#define _LIBCPP_BIG_ENDIAN    1
-#endif  // __BIG_ENDIAN__
-#endif  // __BIG_ENDIAN__
-
-#ifdef __FreeBSD__
-# include <sys/endian.h>
-#  if _BYTE_ORDER == _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 1
-#   define _LIBCPP_BIG_ENDIAN    0
-# else  // _BYTE_ORDER == _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 0
-#   define _LIBCPP_BIG_ENDIAN    1
-# endif  // _BYTE_ORDER == _LITTLE_ENDIAN
-# ifndef __LONG_LONG_SUPPORTED
-#  define _LIBCPP_HAS_NO_LONG_LONG
-# endif  // __LONG_LONG_SUPPORTED
-#endif  // __FreeBSD__
-
-#ifdef __NetBSD__
-# include <sys/endian.h>
-#  if _BYTE_ORDER == _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 1
-#   define _LIBCPP_BIG_ENDIAN    0
-# else  // _BYTE_ORDER == _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 0
-#   define _LIBCPP_BIG_ENDIAN    1
-# endif  // _BYTE_ORDER == _LITTLE_ENDIAN
-# define _LIBCPP_HAS_QUICK_EXIT
-#endif  // __NetBSD__
-
-#ifdef _WIN32
-#  define _LIBCPP_LITTLE_ENDIAN 1
-#  define _LIBCPP_BIG_ENDIAN    0
-// Compiler intrinsics (GCC or MSVC)
-#  if defined(__clang__) \
-   || (defined(_MSC_VER) && _MSC_VER >= 1400) \
-   || (defined(__GNUC__) && _GNUC_VER > 403)
-#    define _LIBCPP_HAS_IS_BASE_OF
-#  endif
-#  if defined(_MSC_VER) && !defined(__clang__)
-#    define _LIBCPP_MSVC // Using Microsoft Visual C++ compiler
-#    define _LIBCPP_TOSTRING2(x) #x
-#    define _LIBCPP_TOSTRING(x) _LIBCPP_TOSTRING2(x)
-#    define _LIBCPP_WARNING(x) __pragma(message(__FILE__ "(" _LIBCPP_TOSTRING(__LINE__) ") : warning note: " x))
-#  endif
-#  // If mingw not explicitly detected, assume using MS C runtime only.
-#  ifndef __MINGW32__
-#    define _LIBCPP_MSVCRT // Using Microsoft's C Runtime library
-#  endif
-#endif  // _WIN32
-
-#ifdef __linux__
-#  if defined(__GNUC__) && _GNUC_VER >= 403
-#    define _LIBCPP_HAS_IS_BASE_OF
-#  endif
-#endif
-
-#ifdef __sun__
-# include <sys/isa_defs.h>
-# ifdef _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 1
-#   define _LIBCPP_BIG_ENDIAN    0
-# else
-#   define _LIBCPP_LITTLE_ENDIAN 0
-#   define _LIBCPP_BIG_ENDIAN    1
-# endif
-#endif // __sun__
-
-#if defined(__native_client__)
-  // NaCl's sandbox (which PNaCl also runs in) doesn't allow filesystem access,
-  // including accesses to the special files under /dev. C++11's
-  // std::random_device is instead exposed through a NaCl syscall.
-# define _LIBCPP_USING_NACL_RANDOM
-#endif // defined(__native_client__)
-
-#if !defined(_LIBCPP_LITTLE_ENDIAN) || !defined(_LIBCPP_BIG_ENDIAN)
-# include <endian.h>
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define _LIBCPP_LITTLE_ENDIAN 1
-#  define _LIBCPP_BIG_ENDIAN    0
-# elif __BYTE_ORDER == __BIG_ENDIAN
-#  define _LIBCPP_LITTLE_ENDIAN 0
-#  define _LIBCPP_BIG_ENDIAN    1
-# else  // __BYTE_ORDER == __BIG_ENDIAN
-#  error unable to determine endian
-# endif
-#endif  // !defined(_LIBCPP_LITTLE_ENDIAN) || !defined(_LIBCPP_BIG_ENDIAN)
-
-#ifdef _WIN32
-
-// only really useful for a DLL
-#ifdef _LIBCPP_DLL // this should be a compiler builtin define ideally...
-# ifdef cxx_EXPORTS
-#  define _LIBCPP_HIDDEN
-#  define _LIBCPP_FUNC_VIS __declspec(dllexport)
-#  define _LIBCPP_TYPE_VIS __declspec(dllexport)
-# else
-#  define _LIBCPP_HIDDEN
-#  define _LIBCPP_FUNC_VIS __declspec(dllimport)
-#  define _LIBCPP_TYPE_VIS __declspec(dllimport)
-# endif
-#else
-# define _LIBCPP_HIDDEN
-# define _LIBCPP_FUNC_VIS
-# define _LIBCPP_TYPE_VIS
-#endif
-
-#define _LIBCPP_TYPE_VIS_ONLY
-#define _LIBCPP_FUNC_VIS_ONLY
-
-#ifndef _LIBCPP_INLINE_VISIBILITY
-# ifdef _LIBCPP_MSVC
-#  define _LIBCPP_INLINE_VISIBILITY __forceinline
-# else // MinGW GCC and Clang
-#  define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__always_inline__))
-# endif
-#endif
-
-#ifndef _LIBCPP_EXCEPTION_ABI
-#define _LIBCPP_EXCEPTION_ABI _LIBCPP_TYPE_VIS
-#endif
-
-#ifndef _LIBCPP_ALWAYS_INLINE
-# ifdef _LIBCPP_MSVC
-#  define _LIBCPP_ALWAYS_INLINE __forceinline
-# endif
-#endif
-
-#endif // _WIN32
-
-#ifndef __has_attribute
-#define __has_attribute(__x) 0
-#endif
-
-#ifndef _LIBCPP_HIDDEN
-#define _LIBCPP_HIDDEN __attribute__ ((__visibility__("hidden")))
-#endif
-
-#ifndef _LIBCPP_FUNC_VIS
-#define _LIBCPP_FUNC_VIS __attribute__ ((__visibility__("default")))
-#endif
-
-#ifndef _LIBCPP_TYPE_VIS
-#  if __has_attribute(__type_visibility__)
-#    define _LIBCPP_TYPE_VIS __attribute__ ((__type_visibility__("default")))
-#  else
-#    define _LIBCPP_TYPE_VIS __attribute__ ((__visibility__("default")))
-#  endif
-#endif
-
-#ifndef _LIBCPP_TYPE_VIS_ONLY
-# define _LIBCPP_TYPE_VIS_ONLY _LIBCPP_TYPE_VIS
-#endif
-
-#ifndef _LIBCPP_FUNC_VIS_ONLY
-# define _LIBCPP_FUNC_VIS_ONLY _LIBCPP_FUNC_VIS
-#endif
-
-#ifndef _LIBCPP_INLINE_VISIBILITY
-#define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__visibility__("hidden"), __always_inline__))
-#endif
-
-#ifndef _LIBCPP_EXCEPTION_ABI
-#define _LIBCPP_EXCEPTION_ABI __attribute__ ((__visibility__("default")))
-#endif
-
-#ifndef _LIBCPP_ALWAYS_INLINE
-#define _LIBCPP_ALWAYS_INLINE  __attribute__ ((__visibility__("hidden"), __always_inline__))
-#endif
-
-#if defined(__clang__)
-
-#if defined(__APPLE__) && !defined(__i386__) && !defined(__x86_64__) &&        \
-    !defined(__arm__)
-#define _LIBCPP_ALTERNATE_STRING_LAYOUT
-#endif
-
-#if __has_feature(cxx_alignas)
-#  define _ALIGNAS_TYPE(x) alignas(x)
-#  define _ALIGNAS(x) alignas(x)
-#else
-#  define _ALIGNAS_TYPE(x) __attribute__((__aligned__(__alignof(x))))
-#  define _ALIGNAS(x) __attribute__((__aligned__(x)))
-#endif
-
-#if !__has_feature(cxx_alias_templates)
-#define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-#endif
-
-#if __cplusplus < 201103L
-typedef __char16_t char16_t;
-typedef __char32_t char32_t;
-#endif
-
-#if !(__has_feature(cxx_exceptions))
-#define _LIBCPP_NO_EXCEPTIONS
-#endif
-
-#if !(__has_feature(cxx_rtti))
-#define _LIBCPP_NO_RTTI
-#endif
-
-#if !(__has_feature(cxx_strong_enums))
-#define _LIBCPP_HAS_NO_STRONG_ENUMS
-#endif
-
-#if !(__has_feature(cxx_decltype))
-#define _LIBCPP_HAS_NO_DECLTYPE
-#endif
-
-#if __has_feature(cxx_attributes)
-#  define _LIBCPP_NORETURN [[noreturn]]
-#else
-#  define _LIBCPP_NORETURN __attribute__ ((noreturn))
-#endif
-
-#define _LIBCPP_UNUSED __attribute__((__unused__))
-
-#if !(__has_feature(cxx_defaulted_functions))
-#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#endif  // !(__has_feature(cxx_defaulted_functions))
-
-#if !(__has_feature(cxx_deleted_functions))
-#define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-#endif  // !(__has_feature(cxx_deleted_functions))
-
-#if !(__has_feature(cxx_lambdas))
-#define _LIBCPP_HAS_NO_LAMBDAS
-#endif
-
-#if !(__has_feature(cxx_nullptr))
-#define _LIBCPP_HAS_NO_NULLPTR
-#endif
-
-#if !(__has_feature(cxx_rvalue_references))
-#define _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#endif
-
-#if !(__has_feature(cxx_static_assert))
-#define _LIBCPP_HAS_NO_STATIC_ASSERT
-#endif
-
-#if !(__has_feature(cxx_auto_type))
-#define _LIBCPP_HAS_NO_AUTO_TYPE
-#endif
-
-#if !(__has_feature(cxx_access_control_sfinae)) || !__has_feature(cxx_trailing_return)
-#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
-#endif
-
-#if !(__has_feature(cxx_variadic_templates))
-#define _LIBCPP_HAS_NO_VARIADICS
-#endif
-
-#if !(__has_feature(cxx_trailing_return))
-#define _LIBCPP_HAS_NO_TRAILING_RETURN
-#endif
-
-#if !(__has_feature(cxx_generalized_initializers))
-#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#endif
-
-#if __has_feature(is_base_of)
-#  define _LIBCPP_HAS_IS_BASE_OF
-#endif
-
-// Objective-C++ features (opt-in)
-#if __has_feature(objc_arc)
-#define _LIBCPP_HAS_OBJC_ARC
-#endif
-
-#if __has_feature(objc_arc_weak)
-#define _LIBCPP_HAS_OBJC_ARC_WEAK
-#define _LIBCPP_HAS_NO_STRONG_ENUMS
-#endif
-
-#if !(__has_feature(cxx_constexpr))
-#define _LIBCPP_HAS_NO_CONSTEXPR
-#endif
-
-#if !(__has_feature(cxx_relaxed_constexpr))
-#define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
-#endif
-
-#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
-#if defined(__FreeBSD__)
-#define _LIBCPP_HAS_QUICK_EXIT
-#define _LIBCPP_HAS_C11_FEATURES
-#elif defined(__ANDROID__)
-#define _LIBCPP_HAS_QUICK_EXIT
-#elif defined(__linux__)
-#include <features.h>
-#if __GLIBC_PREREQ(2, 15)
-#define _LIBCPP_HAS_QUICK_EXIT
-#endif
-#if __GLIBC_PREREQ(2, 17)
-#define _LIBCPP_HAS_C11_FEATURES
-#endif
-#endif
-#endif
-
-#if (__has_feature(cxx_noexcept))
-#  define _NOEXCEPT noexcept
-#  define _NOEXCEPT_(x) noexcept(x)
-#  define _NOEXCEPT_OR_FALSE(x) noexcept(x)
-#else
-#  define _NOEXCEPT throw()
-#  define _NOEXCEPT_(x)
-#  define _NOEXCEPT_OR_FALSE(x) false
-#endif
-
-#if __has_feature(underlying_type)
-#  define _LIBCPP_UNDERLYING_TYPE(T) __underlying_type(T)
-#endif
-
-#if __has_feature(is_literal)
-#  define _LIBCPP_IS_LITERAL(T) __is_literal(T)
-#endif
-
-// Inline namespaces are available in Clang regardless of C++ dialect.
-#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE {
-#define _LIBCPP_END_NAMESPACE_STD  } }
-#define _VSTD std::_LIBCPP_NAMESPACE
-
-namespace std {
-  inline namespace _LIBCPP_NAMESPACE {
-  }
-}
-
-#if !defined(_LIBCPP_HAS_NO_ASAN) && !__has_feature(address_sanitizer)
-#define _LIBCPP_HAS_NO_ASAN
-#endif
-
-#elif defined(__GNUC__)
-
-#define _ALIGNAS(x) __attribute__((__aligned__(x)))
-#define _ALIGNAS_TYPE(x) __attribute__((__aligned__(__alignof(x))))
-
-#define _LIBCPP_NORETURN __attribute__((noreturn))
-
-#define _LIBCPP_UNUSED __attribute__((__unused__))
-
-#if _GNUC_VER >= 407
-#define _LIBCPP_UNDERLYING_TYPE(T) __underlying_type(T)
-#define _LIBCPP_IS_LITERAL(T) __is_literal_type(T)
-#endif
-
-#if !__EXCEPTIONS
-#define _LIBCPP_NO_EXCEPTIONS
-#endif
-
-#define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-// constexpr was added to GCC in 4.6.
-#if _GNUC_VER < 406
-#define _LIBCPP_HAS_NO_CONSTEXPR
-// Can only use constexpr in c++11 mode.
-#elif !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L
-#define _LIBCPP_HAS_NO_CONSTEXPR
-#endif
-
-// No version of GCC supports relaxed constexpr rules
-#define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
-
-#define _NOEXCEPT throw()
-#define _NOEXCEPT_(x)
-#define _NOEXCEPT_OR_FALSE(x) false
-
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
-
-#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
-#define _LIBCPP_HAS_NO_DECLTYPE
-#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-#define _LIBCPP_HAS_NO_NULLPTR
-#define _LIBCPP_HAS_NO_STATIC_ASSERT
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_NO_VARIADICS
-#define _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS
-#define _LIBCPP_HAS_NO_STRONG_ENUMS
-
-#else  // __GXX_EXPERIMENTAL_CXX0X__
-
-#define _LIBCPP_HAS_NO_TRAILING_RETURN
-#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS
-
-#if _GNUC_VER < 403
-#define _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#endif
-
-#if _GNUC_VER < 403
-#define _LIBCPP_HAS_NO_STATIC_ASSERT
-#endif
-
-#if _GNUC_VER < 404
-#define _LIBCPP_HAS_NO_DECLTYPE
-#define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_NO_VARIADICS
-#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#endif  // _GNUC_VER < 404
-
-#if _GNUC_VER < 406
-#define _LIBCPP_HAS_NO_NULLPTR
-#endif
-
-#if _GNUC_VER < 407
-#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
-#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#endif
-
-#endif  // __GXX_EXPERIMENTAL_CXX0X__
-
-#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { namespace _LIBCPP_NAMESPACE {
-#define _LIBCPP_END_NAMESPACE_STD  } }
-#define _VSTD std::_LIBCPP_NAMESPACE
-
-namespace std {
-namespace _LIBCPP_NAMESPACE {
-}
-using namespace _LIBCPP_NAMESPACE __attribute__((__strong__));
-}
-
-#if !defined(_LIBCPP_HAS_NO_ASAN) && !defined(__SANITIZE_ADDRESS__)
-#define _LIBCPP_HAS_NO_ASAN
-#endif
-
-#elif defined(_LIBCPP_MSVC)
-
-#define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-#define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-#define _LIBCPP_HAS_NO_CONSTEXPR
-#define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#define __alignof__ __alignof
-#define _LIBCPP_NORETURN __declspec(noreturn)
-#define _LIBCPP_UNUSED
-#define _ALIGNAS(x) __declspec(align(x))
-#define _LIBCPP_HAS_NO_VARIADICS
-
-#define _NOEXCEPT throw ()
-#define _NOEXCEPT_(x)
-#define _NOEXCEPT_OR_FALSE(x) false
-
-#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {
-#define _LIBCPP_END_NAMESPACE_STD  }
-#define _VSTD std
-
-#  define _LIBCPP_WEAK
-namespace std {
-}
-
-#define _LIBCPP_HAS_NO_ASAN
-
-#elif defined(__IBMCPP__)
-
-#define _ALIGNAS(x) __attribute__((__aligned__(x)))
-#define _ALIGNAS_TYPE(x) __attribute__((__aligned__(__alignof(x))))
-#define _ATTRIBUTE(x) __attribute__((x))
-#define _LIBCPP_NORETURN __attribute__((noreturn))
-#define _LIBCPP_UNUSED
-
-#define _NOEXCEPT throw()
-#define _NOEXCEPT_(x)
-#define _NOEXCEPT_OR_FALSE(x) false
-
-#define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
-#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS
-#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#define _LIBCPP_HAS_NO_NULLPTR
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_IS_BASE_OF
-
-#if defined(_AIX)
-#define __MULTILOCALE_API
-#endif
-
-#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE {
-#define _LIBCPP_END_NAMESPACE_STD  } }
-#define _VSTD std::_LIBCPP_NAMESPACE
-
-namespace std {
-  inline namespace _LIBCPP_NAMESPACE {
-  }
-}
-
-#define _LIBCPP_HAS_NO_ASAN
-
-#endif // __clang__ || __GNUC__ || _MSC_VER || __IBMCPP__
-
-#ifdef _LIBCPP_HAS_NO_UNICODE_CHARS
-typedef unsigned short char16_t;
-typedef unsigned int   char32_t;
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-#ifndef __SIZEOF_INT128__
-#define _LIBCPP_HAS_NO_INT128
-#endif
-
-#ifdef _LIBCPP_HAS_NO_STATIC_ASSERT
-
-template <bool> struct __static_assert_test;
-template <> struct __static_assert_test<true> {};
-template <unsigned> struct __static_assert_check {};
-#define static_assert(__b, __m) \
-    typedef __static_assert_check<sizeof(__static_assert_test<(__b)>)> \
-    _LIBCPP_CONCAT(__t, __LINE__)
-
-#endif  // _LIBCPP_HAS_NO_STATIC_ASSERT
-
-#ifdef _LIBCPP_HAS_NO_DECLTYPE
-#define decltype(x) __typeof__(x)
-#endif
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-#define _LIBCPP_CONSTEXPR
-#else
-#define _LIBCPP_CONSTEXPR constexpr
-#endif
-
-#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#define _LIBCPP_DEFAULT {}
-#else
-#define _LIBCPP_DEFAULT = default;
-#endif
-
-#ifdef __GNUC__
-#define _NOALIAS __attribute__((__malloc__))
-#else
-#define _NOALIAS
-#endif
-
-#ifndef __has_feature
-#define __has_feature(__x) 0
-#endif
-
-#ifndef __has_builtin
-#define __has_builtin(__x) 0
-#endif
-
-#if __has_feature(cxx_explicit_conversions) || defined(__IBMCPP__)
-#   define _LIBCPP_EXPLICIT explicit
-#else
-#   define _LIBCPP_EXPLICIT
-#endif
-
-#if !__has_builtin(__builtin_operator_new) || !__has_builtin(__builtin_operator_delete)
-#   define _LIBCPP_HAS_NO_BUILTIN_OPERATOR_NEW_DELETE
-#endif
-
-#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-#define _LIBCPP_DECLARE_STRONG_ENUM(x) struct _LIBCPP_TYPE_VIS x { enum __lx
-#define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x) \
-    __lx __v_; \
-    _LIBCPP_ALWAYS_INLINE x(__lx __v) : __v_(__v) {} \
-    _LIBCPP_ALWAYS_INLINE explicit x(int __v) : __v_(static_cast<__lx>(__v)) {} \
-    _LIBCPP_ALWAYS_INLINE operator int() const {return __v_;} \
-    };
-#else  // _LIBCPP_HAS_NO_STRONG_ENUMS
-#define _LIBCPP_DECLARE_STRONG_ENUM(x) enum class _LIBCPP_TYPE_VIS x
-#define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x)
-#endif  // _LIBCPP_HAS_NO_STRONG_ENUMS
-
-#ifdef _LIBCPP_DEBUG
-#   if _LIBCPP_DEBUG == 0
-#       define _LIBCPP_DEBUG_LEVEL 1
-#   elif _LIBCPP_DEBUG == 1
-#       define _LIBCPP_DEBUG_LEVEL 2
-#   else
-#       error Supported values for _LIBCPP_DEBUG are 0 and 1
-#   endif
-#   define _LIBCPP_EXTERN_TEMPLATE(...)
-#endif
-
-#ifndef _LIBCPP_EXTERN_TEMPLATE
-#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
-#endif
-
-#ifndef _LIBCPP_EXTERN_TEMPLATE2
-#define _LIBCPP_EXTERN_TEMPLATE2(...) extern template __VA_ARGS__;
-#endif
-
-#if defined(__APPLE__) && defined(__LP64__) && !defined(__x86_64__)
-#define _LIBCPP_NONUNIQUE_RTTI_BIT (1ULL << 63)
-#endif
-
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__) || defined(__NetBSD__)
-#define _LIBCPP_LOCALE__L_EXTENSIONS 1
-#endif
-
-#ifdef __FreeBSD__
-#define _DECLARE_C99_LDBL_MATH 1
-#endif
-
-#if defined(__APPLE__) || defined(__FreeBSD__)
-#define _LIBCPP_HAS_DEFAULTRUNELOCALE
-#endif
-
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__)
-#define _LIBCPP_WCTYPE_IS_MASK
-#endif
-
-#if defined(ELAST)
-#define _LIBCPP_ELAST ELAST
-#elif defined(__linux__)
-#define _LIBCPP_ELAST 4095
-#elif defined(_NEWLIB_VERSION)
-#define _LIBCPP_ELAST __ELASTERROR
-#elif defined(__APPLE__)
-// Not _LIBCPP_ELAST needed on Apple
-#elif defined(__sun__)
-#define _LIBCPP_ELAST ESTALE
-#else
-// Warn here so that the person doing the libcxx port has an easier time:
-#warning This platform's ELAST hasn't been ported yet
-#endif
-
-#ifndef _LIBCPP_TRIVIAL_PAIR_COPY_CTOR
-#  if defined(__FreeBSD__)
-// Making the std::pair copy constructor trivial breaks ABI compatibility with
-// earlier versions of libc++ shipped by FreeBSD, so turn it off by default.
-// See also http://svnweb.freebsd.org/changeset/base/261801
-#    define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 0
-#  else
-#    define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 1
-#  endif
-#endif
-
-#ifndef _LIBCPP_STD_VER
-#  if  __cplusplus <= 201103L
-#    define _LIBCPP_STD_VER 11
-#  elif __cplusplus <= 201402L
-#    define _LIBCPP_STD_VER 14
-#  else
-#    define _LIBCPP_STD_VER 15  // current year, or date of c++17 ratification
-#  endif
-#endif  // _LIBCPP_STD_VER
-
-#if _LIBCPP_STD_VER > 11
-#define _LIBCPP_DEPRECATED [[deprecated]]
-#else
-#define _LIBCPP_DEPRECATED
-#endif
-
-#if _LIBCPP_STD_VER <= 11
-#define _LIBCPP_EXPLICIT_AFTER_CXX11
-#define _LIBCPP_DEPRECATED_AFTER_CXX11
-#else
-#define _LIBCPP_EXPLICIT_AFTER_CXX11 explicit
-#define _LIBCPP_DEPRECATED_AFTER_CXX11 [[deprecated]]
-#endif
-
-#if _LIBCPP_STD_VER > 11 && !defined(_LIBCPP_HAS_NO_CXX14_CONSTEXPR)
-#define _LIBCPP_CONSTEXPR_AFTER_CXX11 constexpr
-#else
-#define _LIBCPP_CONSTEXPR_AFTER_CXX11
-#endif
-
-#ifndef _LIBCPP_HAS_NO_ASAN
-extern "C" void __sanitizer_annotate_contiguous_container(
-  const void *, const void *, const void *, const void *);
-#endif
-
-// Try to find out if RTTI is disabled.
-// g++ and cl.exe have RTTI on by default and define a macro when it is.
-// g++ only defines the macro in 4.3.2 and onwards.
-#if !defined(_LIBCPP_NO_RTTI)
-#  if defined(__GNUG__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \
-   (__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2))) && !defined(__GXX_RTTI)
-#    define _LIBCPP_NO_RTTI
-#  elif (defined(_MSC_VER) && !defined(__clang__)) && !defined(_CPPRTTI)
-#    define _LIBCPP_NO_RTTI
-#  endif
-#endif
-
-#ifndef _LIBCPP_WEAK
-#  define _LIBCPP_WEAK __attribute__((__weak__))
-#endif
-
-#if defined(_LIBCPP_HAS_NO_MONOTONIC_CLOCK) && !defined(_LIBCPP_HAS_NO_THREADS)
-#  error _LIBCPP_HAS_NO_MONOTONIC_CLOCK may only be defined when \
-         _LIBCPP_HAS_NO_THREADS is defined.
-#endif
-
-#endif  // _LIBCPP_CONFIG
diff --git a/include.new/c++/v1/__debug b/include.new/c++/v1/__debug
deleted file mode 100644
index c151224..0000000
--- a/include.new/c++/v1/__debug
+++ /dev/null
@@ -1,222 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- __debug ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_DEBUG_H
-#define _LIBCPP_DEBUG_H
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#if _LIBCPP_DEBUG_LEVEL >= 1
-#   include <cstdlib>
-#   include <cstdio>
-#   include <cstddef>
-#   ifndef _LIBCPP_ASSERT
-#      define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : (_VSTD::printf("%s\n", m), _VSTD::abort()))
-#   endif
-#endif
-
-#ifndef _LIBCPP_ASSERT
-#   define _LIBCPP_ASSERT(x, m) ((void)0)
-#endif
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-struct _LIBCPP_TYPE_VIS __c_node;
-
-struct _LIBCPP_TYPE_VIS __i_node
-{
-    void* __i_;
-    __i_node* __next_;
-    __c_node* __c_;
-
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __i_node(const __i_node&) = delete;
-    __i_node& operator=(const __i_node&) = delete;
-#else
-private:
-    __i_node(const __i_node&);
-    __i_node& operator=(const __i_node&);
-public:
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    __i_node(void* __i, __i_node* __next, __c_node* __c)
-        : __i_(__i), __next_(__next), __c_(__c) {}
-    ~__i_node();
-};
-
-struct _LIBCPP_TYPE_VIS __c_node
-{
-    void* __c_;
-    __c_node* __next_;
-    __i_node** beg_;
-    __i_node** end_;
-    __i_node** cap_;
-
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __c_node(const __c_node&) = delete;
-    __c_node& operator=(const __c_node&) = delete;
-#else
-private:
-    __c_node(const __c_node&);
-    __c_node& operator=(const __c_node&);
-public:
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    __c_node(void* __c, __c_node* __next)
-        : __c_(__c), __next_(__next), beg_(nullptr), end_(nullptr), cap_(nullptr) {}
-    virtual ~__c_node();
-
-    virtual bool __dereferenceable(const void*) const = 0;
-    virtual bool __decrementable(const void*) const = 0;
-    virtual bool __addable(const void*, ptrdiff_t) const = 0;
-    virtual bool __subscriptable(const void*, ptrdiff_t) const = 0;
-
-    void __add(__i_node* __i);
-    _LIBCPP_HIDDEN void __remove(__i_node* __i);
-};
-
-template <class _Cont>
-struct _C_node
-    : public __c_node
-{
-    _C_node(void* __c, __c_node* __n)
-        : __c_node(__c, __n) {}
-
-    virtual bool __dereferenceable(const void*) const;
-    virtual bool __decrementable(const void*) const;
-    virtual bool __addable(const void*, ptrdiff_t) const;
-    virtual bool __subscriptable(const void*, ptrdiff_t) const;
-};
-
-template <class _Cont>
-bool
-_C_node<_Cont>::__dereferenceable(const void* __i) const
-{
-    typedef typename _Cont::const_iterator iterator;
-    const iterator* __j = static_cast<const iterator*>(__i);
-    _Cont* _Cp = static_cast<_Cont*>(__c_);
-    return _Cp->__dereferenceable(__j);
-}
-
-template <class _Cont>
-bool
-_C_node<_Cont>::__decrementable(const void* __i) const
-{
-    typedef typename _Cont::const_iterator iterator;
-    const iterator* __j = static_cast<const iterator*>(__i);
-    _Cont* _Cp = static_cast<_Cont*>(__c_);
-    return _Cp->__decrementable(__j);
-}
-
-template <class _Cont>
-bool
-_C_node<_Cont>::__addable(const void* __i, ptrdiff_t __n) const
-{
-    typedef typename _Cont::const_iterator iterator;
-    const iterator* __j = static_cast<const iterator*>(__i);
-    _Cont* _Cp = static_cast<_Cont*>(__c_);
-    return _Cp->__addable(__j, __n);
-}
-
-template <class _Cont>
-bool
-_C_node<_Cont>::__subscriptable(const void* __i, ptrdiff_t __n) const
-{
-    typedef typename _Cont::const_iterator iterator;
-    const iterator* __j = static_cast<const iterator*>(__i);
-    _Cont* _Cp = static_cast<_Cont*>(__c_);
-    return _Cp->__subscriptable(__j, __n);
-}
-
-class _LIBCPP_TYPE_VIS __libcpp_db
-{
-    __c_node** __cbeg_;
-    __c_node** __cend_;
-    size_t   __csz_;
-    __i_node** __ibeg_;
-    __i_node** __iend_;
-    size_t   __isz_;
-
-    __libcpp_db();
-public:
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __libcpp_db(const __libcpp_db&) = delete;
-    __libcpp_db& operator=(const __libcpp_db&) = delete;
-#else
-private:
-    __libcpp_db(const __libcpp_db&);
-    __libcpp_db& operator=(const __libcpp_db&);
-public:
-#endif
-    ~__libcpp_db();
-
-    class __db_c_iterator;
-    class __db_c_const_iterator;
-    class __db_i_iterator;
-    class __db_i_const_iterator;
-
-    __db_c_const_iterator __c_end() const;
-    __db_i_const_iterator __i_end() const;
-
-    template <class _Cont>
-    _LIBCPP_INLINE_VISIBILITY
-    void __insert_c(_Cont* __c)
-    {
-        __c_node* __n = __insert_c(static_cast<void*>(__c));
-        ::new(__n) _C_node<_Cont>(__n->__c_, __n->__next_);
-    }
-
-    void __insert_i(void* __i);
-    __c_node* __insert_c(void* __c);
-    void __erase_c(void* __c);
-
-    void __insert_ic(void* __i, const void* __c);
-    void __iterator_copy(void* __i, const void* __i0);
-    void __erase_i(void* __i);
-
-    void* __find_c_from_i(void* __i) const;
-    void __invalidate_all(void* __c);
-    __c_node* __find_c_and_lock(void* __c) const;
-    __c_node* __find_c(void* __c) const;
-    void unlock() const;
-
-    void swap(void* __c1, void* __c2);
-
-
-    bool __dereferenceable(const void* __i) const;
-    bool __decrementable(const void* __i) const;
-    bool __addable(const void* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const void* __i, ptrdiff_t __n) const;
-    bool __less_than_comparable(const void* __i, const void* __j) const;
-private:
-    _LIBCPP_HIDDEN
-    __i_node* __insert_iterator(void* __i);
-    _LIBCPP_HIDDEN
-    __i_node* __find_iterator(const void* __i) const;
-
-    friend _LIBCPP_FUNC_VIS __libcpp_db* __get_db();
-};
-
-_LIBCPP_FUNC_VIS __libcpp_db* __get_db();
-_LIBCPP_FUNC_VIS const __libcpp_db* __get_const_db();
-
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif
-
-#endif  // _LIBCPP_DEBUG_H
-
diff --git a/include.new/c++/v1/__functional_03 b/include.new/c++/v1/__functional_03
deleted file mode 100644
index d8a9f05..0000000
--- a/include.new/c++/v1/__functional_03
+++ /dev/null
@@ -1,2135 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUNCTIONAL_03
-#define _LIBCPP_FUNCTIONAL_03
-
-// manual variadic expansion for <functional>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-template <class _Tp>
-class __mem_fn
-    : public __weak_result_type<_Tp>
-{
-public:
-    // types
-    typedef _Tp type;
-private:
-    type __f_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY __mem_fn(type __f) : __f_(__f) {}
-
-    // invoke
-
-    typename __invoke_return<type>::type
-       operator() () const
-       {
-           return __invoke(__f_);
-       }
-
-    template <class _A0>
-       typename __invoke_return0<type, _A0>::type
-          operator() (_A0& __a0) const
-          {
-              return __invoke(__f_, __a0);
-          }
-
-    template <class _A0, class _A1>
-       typename __invoke_return1<type, _A0, _A1>::type
-          operator() (_A0& __a0, _A1& __a1) const
-          {
-              return __invoke(__f_, __a0, __a1);
-          }
-
-    template <class _A0, class _A1, class _A2>
-       typename __invoke_return2<type, _A0, _A1, _A2>::type
-          operator() (_A0& __a0, _A1& __a1, _A2& __a2) const
-          {
-              return __invoke(__f_, __a0, __a1, __a2);
-          }
-};
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp _Tp::*>
-mem_fn(_Rp _Tp::* __pm)
-{
-    return __mem_fn<_Rp _Tp::*>(__pm);
-}
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)()>
-mem_fn(_Rp (_Tp::* __pm)())
-{
-    return __mem_fn<_Rp (_Tp::*)()>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0)>
-mem_fn(_Rp (_Tp::* __pm)(_A0))
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0)>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1)>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1))
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1)>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2)>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2))
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2)>(__pm);
-}
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)() const>
-mem_fn(_Rp (_Tp::* __pm)() const)
-{
-    return __mem_fn<_Rp (_Tp::*)() const>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0) const>
-mem_fn(_Rp (_Tp::* __pm)(_A0) const)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0) const>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1) const>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1) const)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1) const>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2) const)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const>(__pm);
-}
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)() volatile>
-mem_fn(_Rp (_Tp::* __pm)() volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)() volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0) volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0) volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0) volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1) volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1) volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1) volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2) volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) volatile>(__pm);
-}
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)() const volatile>
-mem_fn(_Rp (_Tp::* __pm)() const volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)() const volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0) const volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0) const volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0) const volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1) const volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1) const volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1) const volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2) const volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const volatile>(__pm);
-}
-
-// bad_function_call
-
-class _LIBCPP_EXCEPTION_ABI bad_function_call
-    : public exception
-{
-};
-
-template<class _Fp> class _LIBCPP_TYPE_VIS_ONLY function; // undefined
-
-namespace __function
-{
-
-template<class _Fp>
-struct __maybe_derive_from_unary_function
-{
-};
-
-template<class _Rp, class _A1>
-struct __maybe_derive_from_unary_function<_Rp(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template<class _Fp>
-struct __maybe_derive_from_binary_function
-{
-};
-
-template<class _Rp, class _A1, class _A2>
-struct __maybe_derive_from_binary_function<_Rp(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template<class _Fp> class __base;
-
-template<class _Rp>
-class __base<_Rp()>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    __base() {}
-    virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()() = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const = 0;
-    virtual const std::type_info& target_type() const = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0>
-class __base<_Rp(_A0)>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    __base() {}
-    virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()(_A0) = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const = 0;
-    virtual const std::type_info& target_type() const = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0, class _A1>
-class __base<_Rp(_A0, _A1)>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    __base() {}
-    virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()(_A0, _A1) = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const = 0;
-    virtual const std::type_info& target_type() const = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0, class _A1, class _A2>
-class __base<_Rp(_A0, _A1, _A2)>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    __base() {}
-    virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()(_A0, _A1, _A2) = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const = 0;
-    virtual const std::type_info& target_type() const = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _FD, class _Alloc, class _FB> class __func;
-
-template<class _Fp, class _Alloc, class _Rp>
-class __func<_Fp, _Alloc, _Rp()>
-    : public  __base<_Rp()>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    explicit __func(_Fp __f) : __f_(_VSTD::move(__f)) {}
-    explicit __func(_Fp __f, _Alloc __a) : __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
-    virtual __base<_Rp()>* __clone() const;
-    virtual void __clone(__base<_Rp()>*) const;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()();
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const;
-    virtual const std::type_info& target_type() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp>
-__base<_Rp()>*
-__func<_Fp, _Alloc, _Rp()>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-void
-__func<_Fp, _Alloc, _Rp()>::__clone(__base<_Rp()>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-void
-__func<_Fp, _Alloc, _Rp()>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-void
-__func<_Fp, _Alloc, _Rp()>::destroy_deallocate()
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-_Rp
-__func<_Fp, _Alloc, _Rp()>::operator()()
-{
-    return __invoke(__f_.first());
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp>
-const void*
-__func<_Fp, _Alloc, _Rp()>::target(const type_info& __ti) const
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp()>::target_type() const
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-class __func<_Fp, _Alloc, _Rp(_A0)>
-    : public  __base<_Rp(_A0)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f) : __f_(_VSTD::move(__f)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f, _Alloc __a)
-        : __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
-    virtual __base<_Rp(_A0)>* __clone() const;
-    virtual void __clone(__base<_Rp(_A0)>*) const;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()(_A0);
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const;
-    virtual const std::type_info& target_type() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-__base<_Rp(_A0)>*
-__func<_Fp, _Alloc, _Rp(_A0)>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-void
-__func<_Fp, _Alloc, _Rp(_A0)>::__clone(__base<_Rp(_A0)>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-void
-__func<_Fp, _Alloc, _Rp(_A0)>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-void
-__func<_Fp, _Alloc, _Rp(_A0)>::destroy_deallocate()
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-_Rp
-__func<_Fp, _Alloc, _Rp(_A0)>::operator()(_A0 __a0)
-{
-    return __invoke(__f_.first(), __a0);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-const void*
-__func<_Fp, _Alloc, _Rp(_A0)>::target(const type_info& __ti) const
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp(_A0)>::target_type() const
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-class __func<_Fp, _Alloc, _Rp(_A0, _A1)>
-    : public  __base<_Rp(_A0, _A1)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f) : __f_(_VSTD::move(__f)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f, _Alloc __a)
-        : __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
-    virtual __base<_Rp(_A0, _A1)>* __clone() const;
-    virtual void __clone(__base<_Rp(_A0, _A1)>*) const;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()(_A0, _A1);
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const;
-    virtual const std::type_info& target_type() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-__base<_Rp(_A0, _A1)>*
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::__clone(__base<_Rp(_A0, _A1)>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::destroy_deallocate()
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-_Rp
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::operator()(_A0 __a0, _A1 __a1)
-{
-    return __invoke(__f_.first(), __a0, __a1);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-const void*
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::target(const type_info& __ti) const
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::target_type() const
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-class __func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>
-    : public  __base<_Rp(_A0, _A1, _A2)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f) : __f_(_VSTD::move(__f)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f, _Alloc __a)
-        : __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
-    virtual __base<_Rp(_A0, _A1, _A2)>* __clone() const;
-    virtual void __clone(__base<_Rp(_A0, _A1, _A2)>*) const;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()(_A0, _A1, _A2);
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const;
-    virtual const std::type_info& target_type() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-__base<_Rp(_A0, _A1, _A2)>*
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::__clone(__base<_Rp(_A0, _A1, _A2)>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::destroy_deallocate()
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-_Rp
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::operator()(_A0 __a0, _A1 __a1, _A2 __a2)
-{
-    return __invoke(__f_.first(), __a0, __a1, __a2);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-const void*
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::target(const type_info& __ti) const
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::target_type() const
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-}  // __function
-
-template<class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp()>
-{
-    typedef __function::__base<_Rp()> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)()) {return __p;}
-    template <class _R2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2()>& __p) {return __p;}
-public:
-    typedef _Rp result_type;
-
-    // 20.7.16.2.1, construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
-    function(const function&);
-    template<class _Fp>
-      function(_Fp,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(nullptr_t);
-    template<class _Fp>
-      typename enable_if
-      <
-        !is_integral<_Fp>::value,
-        function&
-      >::type
-      operator=(_Fp);
-
-    ~function();
-
-    // 20.7.16.2.2, function modifiers:
-    void swap(function&);
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp __f, const _Alloc& __a)
-        {function(allocator_arg, __a, __f).swap(*this);}
-
-    // 20.7.16.2.3, function capacity:
-    _LIBCPP_INLINE_VISIBILITY operator bool() const {return __f_;}
-
-private:
-    // deleted overloads close possible hole in the type system
-    template<class _R2>
-      bool operator==(const function<_R2()>&) const;// = delete;
-    template<class _R2>
-      bool operator!=(const function<_R2()>&) const;// = delete;
-public:
-    // 20.7.16.2.4, function invocation:
-    _Rp operator()() const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // 20.7.16.2.5, function target access:
-    const std::type_info& target_type() const;
-    template <typename _Tp> _Tp* target();
-    template <typename _Tp> const _Tp* target() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp>
-function<_Rp()>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp>
-template<class _Alloc>
-function<_Rp()>::function(allocator_arg_t, const _Alloc&, const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp>
-template <class _Fp>
-function<_Rp()>::function(_Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp()> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp>
-template <class _Fp, class _Alloc>
-function<_Rp()>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp()> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<_FF>
-#else
-                rebind_alloc<_FF>::other
-#endif
-                                                         _Ap;
-            _Ap __a(__a0);
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp>
-function<_Rp()>&
-function<_Rp()>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp>
-function<_Rp()>&
-function<_Rp()>::operator=(nullptr_t)
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-}
-
-template<class _Rp>
-template <class _Fp>
-typename enable_if
-<
-    !is_integral<_Fp>::value,
-    function<_Rp()>&
->::type
-function<_Rp()>::operator=(_Fp __f)
-{
-    function(_VSTD::move(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp>
-function<_Rp()>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp>
-void
-function<_Rp()>::swap(function& __f)
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp>
-_Rp
-function<_Rp()>::operator()() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)();
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp>
-const std::type_info&
-function<_Rp()>::target_type() const
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp>
-template <typename _Tp>
-_Tp*
-function<_Rp()>::target()
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp>
-template <typename _Tp>
-const _Tp*
-function<_Rp()>::target() const
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp(_A0)>
-    : public unary_function<_A0, _Rp>
-{
-    typedef __function::__base<_Rp(_A0)> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2, class _B0>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)(_B0)) {return __p;}
-    template <class _R2, class _Cp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)()) {return __p;}
-    template <class _R2, class _Cp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)() const) {return __p;}
-    template <class _R2, class _Cp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)() volatile) {return __p;}
-    template <class _R2, class _Cp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)() const volatile) {return __p;}
-    template <class _R2, class _B0>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2(_B0)>& __p) {return __p;}
-public:
-    typedef _Rp result_type;
-
-    // 20.7.16.2.1, construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
-    function(const function&);
-    template<class _Fp>
-      function(_Fp,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(nullptr_t);
-    template<class _Fp>
-      typename enable_if
-      <
-        !is_integral<_Fp>::value,
-        function&
-      >::type
-      operator=(_Fp);
-
-    ~function();
-
-    // 20.7.16.2.2, function modifiers:
-    void swap(function&);
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp __f, const _Alloc& __a)
-        {function(allocator_arg, __a, __f).swap(*this);}
-
-    // 20.7.16.2.3, function capacity:
-    _LIBCPP_INLINE_VISIBILITY operator bool() const {return __f_;}
-
-private:
-    // deleted overloads close possible hole in the type system
-    template<class _R2, class _B0>
-      bool operator==(const function<_R2(_B0)>&) const;// = delete;
-    template<class _R2, class _B0>
-      bool operator!=(const function<_R2(_B0)>&) const;// = delete;
-public:
-    // 20.7.16.2.4, function invocation:
-    _Rp operator()(_A0) const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // 20.7.16.2.5, function target access:
-    const std::type_info& target_type() const;
-    template <typename _Tp> _Tp* target();
-    template <typename _Tp> const _Tp* target() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0>
-function<_Rp(_A0)>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0>
-template<class _Alloc>
-function<_Rp(_A0)>::function(allocator_arg_t, const _Alloc&, const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0>
-template <class _Fp>
-function<_Rp(_A0)>::function(_Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0>
-template <class _Fp, class _Alloc>
-function<_Rp(_A0)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp(_A0)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<_FF>
-#else
-                rebind_alloc<_FF>::other
-#endif
-                                                         _Ap;
-            _Ap __a(__a0);
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0>
-function<_Rp(_A0)>&
-function<_Rp(_A0)>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0>
-function<_Rp(_A0)>&
-function<_Rp(_A0)>::operator=(nullptr_t)
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-}
-
-template<class _Rp, class _A0>
-template <class _Fp>
-typename enable_if
-<
-    !is_integral<_Fp>::value,
-    function<_Rp(_A0)>&
->::type
-function<_Rp(_A0)>::operator=(_Fp __f)
-{
-    function(_VSTD::move(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0>
-function<_Rp(_A0)>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class _A0>
-void
-function<_Rp(_A0)>::swap(function& __f)
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class _A0>
-_Rp
-function<_Rp(_A0)>::operator()(_A0 __a0) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)(__a0);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0>
-const std::type_info&
-function<_Rp(_A0)>::target_type() const
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp, class _A0>
-template <typename _Tp>
-_Tp*
-function<_Rp(_A0)>::target()
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp, class _A0>
-template <typename _Tp>
-const _Tp*
-function<_Rp(_A0)>::target() const
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0, class _A1>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp(_A0, _A1)>
-    : public binary_function<_A0, _A1, _Rp>
-{
-    typedef __function::__base<_Rp(_A0, _A1)> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2, class _B0, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)(_B0, _B1)) {return __p;}
-    template <class _R2, class _Cp, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1)) {return __p;}
-    template <class _R2, class _Cp, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1) const) {return __p;}
-    template <class _R2, class _Cp, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1) volatile) {return __p;}
-    template <class _R2, class _Cp, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1) const volatile) {return __p;}
-    template <class _R2, class _B0, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2(_B0, _B1)>& __p) {return __p;}
-public:
-    typedef _Rp result_type;
-
-    // 20.7.16.2.1, construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
-    function(const function&);
-    template<class _Fp>
-      function(_Fp,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(nullptr_t);
-    template<class _Fp>
-      typename enable_if
-      <
-        !is_integral<_Fp>::value,
-        function&
-      >::type
-      operator=(_Fp);
-
-    ~function();
-
-    // 20.7.16.2.2, function modifiers:
-    void swap(function&);
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp __f, const _Alloc& __a)
-        {function(allocator_arg, __a, __f).swap(*this);}
-
-    // 20.7.16.2.3, function capacity:
-    operator bool() const {return __f_;}
-
-private:
-    // deleted overloads close possible hole in the type system
-    template<class _R2, class _B0, class _B1>
-      bool operator==(const function<_R2(_B0, _B1)>&) const;// = delete;
-    template<class _R2, class _B0, class _B1>
-      bool operator!=(const function<_R2(_B0, _B1)>&) const;// = delete;
-public:
-    // 20.7.16.2.4, function invocation:
-    _Rp operator()(_A0, _A1) const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // 20.7.16.2.5, function target access:
-    const std::type_info& target_type() const;
-    template <typename _Tp> _Tp* target();
-    template <typename _Tp> const _Tp* target() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0, class _A1>
-function<_Rp(_A0, _A1)>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0, class _A1>
-template<class _Alloc>
-function<_Rp(_A0, _A1)>::function(allocator_arg_t, const _Alloc&, const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0, class _A1>
-template <class _Fp>
-function<_Rp(_A0, _A1)>::function(_Fp __f,
-                                 typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0, _A1)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0, class _A1>
-template <class _Fp, class _Alloc>
-function<_Rp(_A0, _A1)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                 typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp(_A0, _A1)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<_FF>
-#else
-                rebind_alloc<_FF>::other
-#endif
-                                                         _Ap;
-            _Ap __a(__a0);
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0, class _A1>
-function<_Rp(_A0, _A1)>&
-function<_Rp(_A0, _A1)>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0, class _A1>
-function<_Rp(_A0, _A1)>&
-function<_Rp(_A0, _A1)>::operator=(nullptr_t)
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-}
-
-template<class _Rp, class _A0, class _A1>
-template <class _Fp>
-typename enable_if
-<
-    !is_integral<_Fp>::value,
-    function<_Rp(_A0, _A1)>&
->::type
-function<_Rp(_A0, _A1)>::operator=(_Fp __f)
-{
-    function(_VSTD::move(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0, class _A1>
-function<_Rp(_A0, _A1)>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class _A0, class _A1>
-void
-function<_Rp(_A0, _A1)>::swap(function& __f)
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class _A0, class _A1>
-_Rp
-function<_Rp(_A0, _A1)>::operator()(_A0 __a0, _A1 __a1) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)(__a0, __a1);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0, class _A1>
-const std::type_info&
-function<_Rp(_A0, _A1)>::target_type() const
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp, class _A0, class _A1>
-template <typename _Tp>
-_Tp*
-function<_Rp(_A0, _A1)>::target()
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp, class _A0, class _A1>
-template <typename _Tp>
-const _Tp*
-function<_Rp(_A0, _A1)>::target() const
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0, class _A1, class _A2>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp(_A0, _A1, _A2)>
-{
-    typedef __function::__base<_Rp(_A0, _A1, _A2)> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2, class _B0, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)(_B0, _B1, _B2)) {return __p;}
-    template <class _R2, class _Cp, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2)) {return __p;}
-    template <class _R2, class _Cp, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2) const) {return __p;}
-    template <class _R2, class _Cp, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2) volatile) {return __p;}
-    template <class _R2, class _Cp, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2) const volatile) {return __p;}
-    template <class _R2, class _B0, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2(_B0, _B1, _B2)>& __p) {return __p;}
-public:
-    typedef _Rp result_type;
-
-    // 20.7.16.2.1, construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
-    function(const function&);
-    template<class _Fp>
-      function(_Fp,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(nullptr_t);
-    template<class _Fp>
-      typename enable_if
-      <
-        !is_integral<_Fp>::value,
-        function&
-      >::type
-      operator=(_Fp);
-
-    ~function();
-
-    // 20.7.16.2.2, function modifiers:
-    void swap(function&);
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp __f, const _Alloc& __a)
-        {function(allocator_arg, __a, __f).swap(*this);}
-
-    // 20.7.16.2.3, function capacity:
-    _LIBCPP_INLINE_VISIBILITY operator bool() const {return __f_;}
-
-private:
-    // deleted overloads close possible hole in the type system
-    template<class _R2, class _B0, class _B1, class _B2>
-      bool operator==(const function<_R2(_B0, _B1, _B2)>&) const;// = delete;
-    template<class _R2, class _B0, class _B1, class _B2>
-      bool operator!=(const function<_R2(_B0, _B1, _B2)>&) const;// = delete;
-public:
-    // 20.7.16.2.4, function invocation:
-    _Rp operator()(_A0, _A1, _A2) const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // 20.7.16.2.5, function target access:
-    const std::type_info& target_type() const;
-    template <typename _Tp> _Tp* target();
-    template <typename _Tp> const _Tp* target() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0, class _A1, class _A2>
-function<_Rp(_A0, _A1, _A2)>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template<class _Alloc>
-function<_Rp(_A0, _A1, _A2)>::function(allocator_arg_t, const _Alloc&,
-                                      const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <class _Fp>
-function<_Rp(_A0, _A1, _A2)>::function(_Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0, _A1, _A2)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <class _Fp, class _Alloc>
-function<_Rp(_A0, _A1, _A2)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<_FF>
-#else
-                rebind_alloc<_FF>::other
-#endif
-                                                         _Ap;
-            _Ap __a(__a0);
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-function<_Rp(_A0, _A1, _A2)>&
-function<_Rp(_A0, _A1, _A2)>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-function<_Rp(_A0, _A1, _A2)>&
-function<_Rp(_A0, _A1, _A2)>::operator=(nullptr_t)
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <class _Fp>
-typename enable_if
-<
-    !is_integral<_Fp>::value,
-    function<_Rp(_A0, _A1, _A2)>&
->::type
-function<_Rp(_A0, _A1, _A2)>::operator=(_Fp __f)
-{
-    function(_VSTD::move(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-function<_Rp(_A0, _A1, _A2)>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-void
-function<_Rp(_A0, _A1, _A2)>::swap(function& __f)
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-_Rp
-function<_Rp(_A0, _A1, _A2)>::operator()(_A0 __a0, _A1 __a1, _A2 __a2) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)(__a0, __a1, __a2);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0, class _A1, class _A2>
-const std::type_info&
-function<_Rp(_A0, _A1, _A2)>::target_type() const
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <typename _Tp>
-_Tp*
-function<_Rp(_A0, _A1, _A2)>::target()
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <typename _Tp>
-const _Tp*
-function<_Rp(_A0, _A1, _A2)>::target() const
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const function<_Fp>& __f, nullptr_t) {return !__f;}
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(nullptr_t, const function<_Fp>& __f) {return !__f;}
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const function<_Fp>& __f, nullptr_t) {return (bool)__f;}
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(nullptr_t, const function<_Fp>& __f) {return (bool)__f;}
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(function<_Fp>& __x, function<_Fp>& __y)
-{return __x.swap(__y);}
-
-template<class _Tp> struct __is_bind_expression : public false_type {};
-template<class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_bind_expression
-    : public __is_bind_expression<typename remove_cv<_Tp>::type> {};
-
-template<class _Tp> struct __is_placeholder : public integral_constant<int, 0> {};
-template<class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_placeholder
-    : public __is_placeholder<typename remove_cv<_Tp>::type> {};
-
-namespace placeholders
-{
-
-template <int _Np> struct __ph {};
-
-extern __ph<1>   _1;
-extern __ph<2>   _2;
-extern __ph<3>   _3;
-extern __ph<4>   _4;
-extern __ph<5>   _5;
-extern __ph<6>   _6;
-extern __ph<7>   _7;
-extern __ph<8>   _8;
-extern __ph<9>   _9;
-extern __ph<10> _10;
-
-}  // placeholders
-
-template<int _Np>
-struct __is_placeholder<placeholders::__ph<_Np> >
-    : public integral_constant<int, _Np> {};
-
-template <class _Tp, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp&
-__mu(reference_wrapper<_Tp> __t, _Uj&)
-{
-    return __t.get();
-}
-/*
-template <bool _IsBindExpr, class _Ti, class ..._Uj>
-struct __mu_return1 {};
-
-template <class _Ti, class ..._Uj>
-struct __mu_return1<true, _Ti, _Uj...>
-{
-    typedef typename result_of<_Ti(_Uj...)>::type type;
-};
-
-template <class _Ti, class ..._Uj, size_t ..._Indx>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __mu_return1<true, _Ti, _Uj...>::type
-__mu_expand(_Ti& __ti, tuple<_Uj...>&& __uj, __tuple_indices<_Indx...>)
-{
-    __ti(_VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(_VSTD::get<_Indx>(__uj))...);
-}
-
-template <class _Ti, class ..._Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_bind_expression<_Ti>::value,
-    typename __mu_return1<is_bind_expression<_Ti>::value, _Ti, _Uj...>::type
->::type
-__mu(_Ti& __ti, tuple<_Uj...>& __uj)
-{
-    typedef typename __make_tuple_indices<sizeof...(_Uj)>::type __indices;
-    return  __mu_expand(__ti, __uj, __indices());
-}
-
-template <bool IsPh, class _Ti, class _Uj>
-struct __mu_return2 {};
-
-template <class _Ti, class _Uj>
-struct __mu_return2<true, _Ti, _Uj>
-{
-    typedef typename tuple_element<is_placeholder<_Ti>::value - 1, _Uj>::type type;
-};
-
-template <class _Ti, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    0 < is_placeholder<_Ti>::value,
-    typename __mu_return2<0 < is_placeholder<_Ti>::value, _Ti, _Uj>::type
->::type
-__mu(_Ti&, _Uj& __uj)
-{
-    const size_t _Indx = is_placeholder<_Ti>::value - 1;
-    // compiler bug workaround
-    typename tuple_element<_Indx, _Uj>::type __t = _VSTD::get<_Indx>(__uj);
-    return __t;
-//    return _VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(_VSTD::get<_Indx>(__uj));
-}
-
-template <class _Ti, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_bind_expression<_Ti>::value &&
-    is_placeholder<_Ti>::value == 0 &&
-    !__is_reference_wrapper<_Ti>::value,
-    _Ti&
->::type
-__mu(_Ti& __ti, _Uj& __uj)
-{
-    return __ti;
-}
-
-template <class _Ti, bool IsBindEx, bool IsPh, class _TupleUj>
-struct ____mu_return;
-
-template <class _Ti, class ..._Uj>
-struct ____mu_return<_Ti, true, false, tuple<_Uj...> >
-{
-    typedef typename result_of<_Ti(_Uj...)>::type type;
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, false, true, _TupleUj>
-{
-    typedef typename tuple_element<is_placeholder<_Ti>::value - 1,
-                                   _TupleUj>::type&& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, false, false, _TupleUj>
-{
-    typedef _Ti& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct __mu_return
-    : public ____mu_return<_Ti,
-                           is_bind_expression<_Ti>::value,
-                           0 < is_placeholder<_Ti>::value,
-                           _TupleUj>
-{
-};
-
-template <class _Ti, class _TupleUj>
-struct __mu_return<reference_wrapper<_Ti>, _TupleUj>
-{
-    typedef _Ti& type;
-};
-
-template <class _Fp, class _BoundArgs, class _TupleUj>
-struct __bind_return;
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, tuple<_BoundArgs...>, _TupleUj>
-{
-    typedef typename __ref_return
-    <
-        _Fp&,
-        typename __mu_return
-        <
-            _BoundArgs,
-            _TupleUj
-        >::type...
-    >::type type;
-};
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, const tuple<_BoundArgs...>, _TupleUj>
-{
-    typedef typename __ref_return
-    <
-        _Fp&,
-        typename __mu_return
-        <
-            const _BoundArgs,
-            _TupleUj
-        >::type...
-    >::type type;
-};
-
-template <class _Fp, class _BoundArgs, size_t ..._Indx, class _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __bind_return<_Fp, _BoundArgs, _Args>::type
-__apply_functor(_Fp& __f, _BoundArgs& __bound_args, __tuple_indices<_Indx...>,
-                _Args&& __args)
-{
-    return __invoke(__f, __mu(_VSTD::get<_Indx>(__bound_args), __args)...);
-}
-
-template<class _Fp, class ..._BoundArgs>
-class __bind
-{
-    _Fp __f_;
-    tuple<_BoundArgs...> __bound_args_;
-
-    typedef typename __make_tuple_indices<sizeof...(_BoundArgs)>::type __indices;
-public:
-    template <class _Gp, class ..._BA>
-      explicit __bind(_Gp&& __f, _BA&& ...__bound_args)
-        : __f_(_VSTD::forward<_Gp>(__f)),
-          __bound_args_(_VSTD::forward<_BA>(__bound_args)...) {}
-
-    template <class ..._Args>
-        typename __bind_return<_Fp, tuple<_BoundArgs...>, tuple<_Args&&...> >::type
-        operator()(_Args&& ...__args)
-        {
-            // compiler bug workaround
-            return __apply_functor(__f_, __bound_args_, __indices(),
-                                  tuple<_Args&&...>(__args...));
-        }
-
-    template <class ..._Args>
-        typename __bind_return<_Fp, tuple<_BoundArgs...>, tuple<_Args&&...> >::type
-        operator()(_Args&& ...__args) const
-        {
-            return __apply_functor(__f_, __bound_args_, __indices(),
-                                   tuple<_Args&&...>(__args...));
-        }
-};
-
-template<class _Fp, class ..._BoundArgs>
-struct __is_bind_expression<__bind<_Fp, _BoundArgs...> > : public true_type {};
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-class __bind_r
-    : public __bind<_Fp, _BoundArgs...>
-{
-    typedef __bind<_Fp, _BoundArgs...> base;
-public:
-    typedef _Rp result_type;
-
-    template <class _Gp, class ..._BA>
-      explicit __bind_r(_Gp&& __f, _BA&& ...__bound_args)
-        : base(_VSTD::forward<_Gp>(__f),
-               _VSTD::forward<_BA>(__bound_args)...) {}
-
-    template <class ..._Args>
-        result_type
-        operator()(_Args&& ...__args)
-        {
-            return base::operator()(_VSTD::forward<_Args>(__args)...);
-        }
-
-    template <class ..._Args>
-        result_type
-        operator()(_Args&& ...__args) const
-        {
-            return base::operator()(_VSTD::forward<_Args>(__args)...);
-        }
-};
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-struct __is_bind_expression<__bind_r<_Rp, _Fp, _BoundArgs...> > : public true_type {};
-
-template<class _Fp, class ..._BoundArgs>
-inline _LIBCPP_INLINE_VISIBILITY
-__bind<typename decay<_Fp>::type, typename decay<_BoundArgs>::type...>
-bind(_Fp&& __f, _BoundArgs&&... __bound_args)
-{
-    typedef __bind<typename decay<_Fp>::type, typename decay<_BoundArgs>::type...> type;
-    return type(_VSTD::forward<_Fp>(__f), _VSTD::forward<_BoundArgs>(__bound_args)...);
-}
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-inline _LIBCPP_INLINE_VISIBILITY
-__bind_r<_Rp, typename decay<_Fp>::type, typename decay<_BoundArgs>::type...>
-bind(_Fp&& __f, _BoundArgs&&... __bound_args)
-{
-    typedef __bind_r<_Rp, typename decay<_Fp>::type, typename decay<_BoundArgs>::type...> type;
-    return type(_VSTD::forward<_Fp>(__f), _VSTD::forward<_BoundArgs>(__bound_args)...);
-}
-*/
-
-#endif  // _LIBCPP_FUNCTIONAL_03
diff --git a/include.new/c++/v1/__functional_base b/include.new/c++/v1/__functional_base
deleted file mode 100644
index 6766793..0000000
--- a/include.new/c++/v1/__functional_base
+++ /dev/null
@@ -1,615 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUNCTIONAL_BASE
-#define _LIBCPP_FUNCTIONAL_BASE
-
-#include <__config>
-#include <type_traits>
-#include <typeinfo>
-#include <exception>
-#include <new>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Arg, class _Result>
-struct _LIBCPP_TYPE_VIS_ONLY unary_function
-{
-    typedef _Arg    argument_type;
-    typedef _Result result_type;
-};
-
-template <class _Arg1, class _Arg2, class _Result>
-struct _LIBCPP_TYPE_VIS_ONLY binary_function
-{
-    typedef _Arg1   first_argument_type;
-    typedef _Arg2   second_argument_type;
-    typedef _Result result_type;
-};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY hash;
-
-template <class _Tp>
-struct __has_result_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::result_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY less : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY 
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x < __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY less<void>
-{
-    template <class _T1, class _T2> 
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) < _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-// addressof
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-addressof(_Tp& __x) _NOEXCEPT
-{
-    return (_Tp*)&reinterpret_cast<const volatile char&>(__x);
-}
-
-#if defined(_LIBCPP_HAS_OBJC_ARC) && !defined(_LIBCPP_PREDEFINED_OBJC_ARC_ADDRESSOF)
-// Objective-C++ Automatic Reference Counting uses qualified pointers
-// that require special addressof() signatures. When
-// _LIBCPP_PREDEFINED_OBJC_ARC_ADDRESSOF is defined, the compiler
-// itself is providing these definitions. Otherwise, we provide them.
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__strong _Tp*
-addressof(__strong _Tp& __x) _NOEXCEPT
-{
-  return &__x;
-}
-
-#ifdef _LIBCPP_HAS_OBJC_ARC_WEAK
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__weak _Tp*
-addressof(__weak _Tp& __x) _NOEXCEPT
-{
-  return &__x;
-}
-#endif
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__autoreleasing _Tp*
-addressof(__autoreleasing _Tp& __x) _NOEXCEPT
-{
-  return &__x;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__unsafe_unretained _Tp*
-addressof(__unsafe_unretained _Tp& __x) _NOEXCEPT
-{
-  return &__x;
-}
-#endif
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-#include <__functional_base_03>
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-// __weak_result_type
-
-template <class _Tp>
-struct __derives_from_unary_function
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    static __two __test(...);
-    template <class _Ap, class _Rp>
-        static unary_function<_Ap, _Rp>
-        __test(const volatile unary_function<_Ap, _Rp>*);
-public:
-    static const bool value = !is_same<decltype(__test((_Tp*)0)), __two>::value;
-    typedef decltype(__test((_Tp*)0)) type;
-};
-
-template <class _Tp>
-struct __derives_from_binary_function
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    static __two __test(...);
-    template <class _A1, class _A2, class _Rp>
-        static binary_function<_A1, _A2, _Rp>
-        __test(const volatile binary_function<_A1, _A2, _Rp>*);
-public:
-    static const bool value = !is_same<decltype(__test((_Tp*)0)), __two>::value;
-    typedef decltype(__test((_Tp*)0)) type;
-};
-
-template <class _Tp, bool = __derives_from_unary_function<_Tp>::value>
-struct __maybe_derive_from_unary_function  // bool is true
-    : public __derives_from_unary_function<_Tp>::type
-{
-};
-
-template <class _Tp>
-struct __maybe_derive_from_unary_function<_Tp, false>
-{
-};
-
-template <class _Tp, bool = __derives_from_binary_function<_Tp>::value>
-struct __maybe_derive_from_binary_function  // bool is true
-    : public __derives_from_binary_function<_Tp>::type
-{
-};
-
-template <class _Tp>
-struct __maybe_derive_from_binary_function<_Tp, false>
-{
-};
-
-template <class _Tp, bool = __has_result_type<_Tp>::value>
-struct __weak_result_type_imp // bool is true
-    : public __maybe_derive_from_unary_function<_Tp>,
-      public __maybe_derive_from_binary_function<_Tp>
-{
-    typedef typename _Tp::result_type result_type;
-};
-
-template <class _Tp>
-struct __weak_result_type_imp<_Tp, false>
-    : public __maybe_derive_from_unary_function<_Tp>,
-      public __maybe_derive_from_binary_function<_Tp>
-{
-};
-
-template <class _Tp>
-struct __weak_result_type
-    : public __weak_result_type_imp<_Tp>
-{
-};
-
-// 0 argument case
-
-template <class _Rp>
-struct __weak_result_type<_Rp ()>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp>
-struct __weak_result_type<_Rp (&)()>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp>
-struct __weak_result_type<_Rp (*)()>
-{
-    typedef _Rp result_type;
-};
-
-// 1 argument case
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (&)(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (*)(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)()>
-    : public unary_function<_Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() const>
-    : public unary_function<const _Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() volatile>
-    : public unary_function<volatile _Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() const volatile>
-    : public unary_function<const volatile _Cp*, _Rp>
-{
-};
-
-// 2 argument case
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (*)(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (&)(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1)>
-    : public binary_function<_Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) const>
-    : public binary_function<const _Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) volatile>
-    : public binary_function<volatile _Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) const volatile>
-    : public binary_function<const volatile _Cp*, _A1, _Rp>
-{
-};
-
-// 3 or more arguments
-
-template <class _Rp, class _A1, class _A2, class _A3, class ..._A4>
-struct __weak_result_type<_Rp (_A1, _A2, _A3, _A4...)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _A1, class _A2, class _A3, class ..._A4>
-struct __weak_result_type<_Rp (&)(_A1, _A2, _A3, _A4...)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _A1, class _A2, class _A3, class ..._A4>
-struct __weak_result_type<_Rp (*)(_A1, _A2, _A3, _A4...)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2, class ..._A3>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2, class ..._A3>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) const>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2, class ..._A3>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) volatile>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2, class ..._A3>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) const volatile>
-{
-    typedef _Rp result_type;
-};
-
-// __invoke
-
-// bullets 1 and 2
-
-template <class _Fp, class _A0, class ..._Args,
-            class>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
-    -> decltype((_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...))
-{
-    return (_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...);
-}
-
-template <class _Fp, class _A0, class ..._Args,
-            class>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
-    -> decltype(((*_VSTD::forward<_A0>(__a0)).*__f)(_VSTD::forward<_Args>(__args)...))
-{
-    return ((*_VSTD::forward<_A0>(__a0)).*__f)(_VSTD::forward<_Args>(__args)...);
-}
-
-// bullets 3 and 4
-
-template <class _Fp, class _A0,
-            class>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0)
-    -> decltype(_VSTD::forward<_A0>(__a0).*__f)
-{
-    return _VSTD::forward<_A0>(__a0).*__f;
-}
-
-template <class _Fp, class _A0,
-            class>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0)
-    -> decltype((*_VSTD::forward<_A0>(__a0)).*__f)
-{
-    return (*_VSTD::forward<_A0>(__a0)).*__f;
-}
-
-// bullet 5
-
-template <class _Fp, class ..._Args>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _Args&& ...__args)
-    -> decltype(_VSTD::forward<_Fp>(__f)(_VSTD::forward<_Args>(__args)...))
-{
-    return _VSTD::forward<_Fp>(__f)(_VSTD::forward<_Args>(__args)...);
-}
-
-template <class _Tp, class ..._Args>
-struct __invoke_return
-{
-    typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_Args>()...)) type;
-};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY reference_wrapper
-    : public __weak_result_type<_Tp>
-{
-public:
-    // types
-    typedef _Tp type;
-private:
-    type* __f_;
-
-public:
-    // construct/copy/destroy
-    _LIBCPP_INLINE_VISIBILITY reference_wrapper(type& __f) _NOEXCEPT
-        : __f_(_VSTD::addressof(__f)) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    private: reference_wrapper(type&&); public: // = delete; // do not bind to temps
-#endif
-
-    // access
-    _LIBCPP_INLINE_VISIBILITY operator type&    () const _NOEXCEPT {return *__f_;}
-    _LIBCPP_INLINE_VISIBILITY          type& get() const _NOEXCEPT {return *__f_;}
-
-    // invoke
-    template <class... _ArgTypes>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_of<type&, _ArgTypes...>::type
-          operator() (_ArgTypes&&... __args) const
-          {
-              return __invoke(get(), _VSTD::forward<_ArgTypes>(__args)...);
-          }
-};
-
-template <class _Tp> struct __is_reference_wrapper_impl : public false_type {};
-template <class _Tp> struct __is_reference_wrapper_impl<reference_wrapper<_Tp> > : public true_type {};
-template <class _Tp> struct __is_reference_wrapper
-    : public __is_reference_wrapper_impl<typename remove_cv<_Tp>::type> {};
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<_Tp>
-ref(_Tp& __t) _NOEXCEPT
-{
-    return reference_wrapper<_Tp>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<_Tp>
-ref(reference_wrapper<_Tp> __t) _NOEXCEPT
-{
-    return ref(__t.get());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<const _Tp>
-cref(const _Tp& __t) _NOEXCEPT
-{
-    return reference_wrapper<const _Tp>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<const _Tp>
-cref(reference_wrapper<_Tp> __t) _NOEXCEPT
-{
-    return cref(__t.get());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-
-template <class _Tp> void ref(const _Tp&&) = delete;
-template <class _Tp> void cref(const _Tp&&) = delete;
-
-#else  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-
-template <class _Tp> void ref(const _Tp&&);// = delete;
-template <class _Tp> void cref(const _Tp&&);// = delete;
-
-#endif  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp1, class _Tp2 = void>
-struct __is_transparent
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::is_transparent* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp1>(0)) == 1;
-};
-#endif
-
-// allocator_arg_t
-
-struct _LIBCPP_TYPE_VIS_ONLY allocator_arg_t { };
-
-#if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_MEMORY)
-extern const allocator_arg_t allocator_arg;
-#else
-constexpr allocator_arg_t allocator_arg = allocator_arg_t();
-#endif
-
-// uses_allocator
-
-template <class _Tp>
-struct __has_allocator_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::allocator_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Tp, class _Alloc, bool = __has_allocator_type<_Tp>::value>
-struct __uses_allocator
-    : public integral_constant<bool,
-        is_convertible<_Alloc, typename _Tp::allocator_type>::value>
-{
-};
-
-template <class _Tp, class _Alloc>
-struct __uses_allocator<_Tp, _Alloc, false>
-    : public false_type
-{
-};
-
-template <class _Tp, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator
-    : public __uses_allocator<_Tp, _Alloc>
-{
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// allocator construction
-
-template <class _Tp, class _Alloc, class ..._Args>
-struct __uses_alloc_ctor_imp
-{
-    static const bool __ua = uses_allocator<_Tp, _Alloc>::value;
-    static const bool __ic =
-        is_constructible<_Tp, allocator_arg_t, _Alloc, _Args...>::value;
-    static const int value = __ua ? 2 - __ic : 0;
-};
-
-template <class _Tp, class _Alloc, class ..._Args>
-struct __uses_alloc_ctor
-    : integral_constant<int, __uses_alloc_ctor_imp<_Tp, _Alloc, _Args...>::value>
-    {};
-
-template <class _Tp, class _Allocator, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void __user_alloc_construct_impl (integral_constant<int, 0>, _Tp *__storage, const _Allocator &, _Args &&... __args )
-{
-    new (__storage) _Tp (_VSTD::forward<_Args>(__args)...);
-}
-
-template <class _Tp, class _Allocator, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void __user_alloc_construct_impl (integral_constant<int, 1>, _Tp *__storage, const _Allocator &__a, _Args &&... __args )
-{
-    new (__storage) _Tp (allocator_arg, __a, _VSTD::forward<_Args>(__args)...);
-}
-
-template <class _Tp, class _Allocator, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void __user_alloc_construct_impl (integral_constant<int, 2>, _Tp *__storage, const _Allocator &__a, _Args &&... __args )
-{
-    new (__storage) _Tp (_VSTD::forward<_Args>(__args)..., __a);
-}
-
-template <class _Tp, class _Allocator, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void __user_alloc_construct (_Tp *__storage, const _Allocator &__a, _Args &&... __args)
-{ 
-    __user_alloc_construct_impl( 
-             __uses_alloc_ctor<_Tp, _Allocator>(), 
-             __storage, __a, _VSTD::forward<_Args>(__args)...
-        );
-}
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_FUNCTIONAL_BASE
diff --git a/include.new/c++/v1/__functional_base_03 b/include.new/c++/v1/__functional_base_03
deleted file mode 100644
index 22c06ad..0000000
--- a/include.new/c++/v1/__functional_base_03
+++ /dev/null
@@ -1,1087 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUNCTIONAL_BASE_03
-#define _LIBCPP_FUNCTIONAL_BASE_03
-
-// manual variadic expansion for <functional>
-
-// __weak_result_type
-
-template <class _Tp>
-struct __derives_from_unary_function
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    static __two __test(...);
-    template <class _Ap, class _Rp>
-        static unary_function<_Ap, _Rp>
-        __test(const volatile unary_function<_Ap, _Rp>*);
-public:
-    static const bool value = !is_same<decltype(__test((_Tp*)0)), __two>::value;
-    typedef decltype(__test((_Tp*)0)) type;
-};
-
-template <class _Tp>
-struct __derives_from_binary_function
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    static __two __test(...);
-    template <class _A1, class _A2, class _Rp>
-        static binary_function<_A1, _A2, _Rp>
-        __test(const volatile binary_function<_A1, _A2, _Rp>*);
-public:
-    static const bool value = !is_same<decltype(__test((_Tp*)0)), __two>::value;
-    typedef decltype(__test((_Tp*)0)) type;
-};
-
-template <class _Tp, bool = __derives_from_unary_function<_Tp>::value>
-struct __maybe_derive_from_unary_function  // bool is true
-    : public __derives_from_unary_function<_Tp>::type
-{
-};
-
-template <class _Tp>
-struct __maybe_derive_from_unary_function<_Tp, false>
-{
-};
-
-template <class _Tp, bool = __derives_from_binary_function<_Tp>::value>
-struct __maybe_derive_from_binary_function  // bool is true
-    : public __derives_from_binary_function<_Tp>::type
-{
-};
-
-template <class _Tp>
-struct __maybe_derive_from_binary_function<_Tp, false>
-{
-};
-
-template <class _Tp, bool = __has_result_type<_Tp>::value>
-struct __weak_result_type_imp // bool is true
-    : public __maybe_derive_from_unary_function<_Tp>,
-      public __maybe_derive_from_binary_function<_Tp>
-{
-    typedef typename _Tp::result_type result_type;
-};
-
-template <class _Tp>
-struct __weak_result_type_imp<_Tp, false>
-    : public __maybe_derive_from_unary_function<_Tp>,
-      public __maybe_derive_from_binary_function<_Tp>
-{
-};
-
-template <class _Tp>
-struct __weak_result_type
-    : public __weak_result_type_imp<typename remove_reference<_Tp>::type>
-{
-};
-
-// 0 argument case
-
-template <class _Rp>
-struct __weak_result_type<_Rp ()>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp>
-struct __weak_result_type<_Rp (&)()>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp>
-struct __weak_result_type<_Rp (*)()>
-{
-    typedef _Rp result_type;
-};
-
-// 1 argument case
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (&)(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (*)(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)()>
-    : public unary_function<_Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() const>
-    : public unary_function<const _Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() volatile>
-    : public unary_function<volatile _Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() const volatile>
-    : public unary_function<const volatile _Cp*, _Rp>
-{
-};
-
-// 2 argument case
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (*)(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (&)(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1)>
-    : public binary_function<_Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) const>
-    : public binary_function<const _Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) volatile>
-    : public binary_function<volatile _Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) const volatile>
-    : public binary_function<const volatile _Cp*, _A1, _Rp>
-{
-};
-
-// 3 or more arguments
-
-template <class _Rp, class _A1, class _A2, class _A3>
-struct __weak_result_type<_Rp (_A1, _A2, _A3)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _A1, class _A2, class _A3>
-struct __weak_result_type<_Rp (&)(_A1, _A2, _A3)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _A1, class _A2, class _A3>
-struct __weak_result_type<_Rp (*)(_A1, _A2, _A3)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2) const>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2) volatile>
-{
-    typedef _Rp result_type;
-};
-
-// __invoke
-
-// __ref_return0
-//
-// template <class _Tp, bool _HasResultType>
-// struct ________ref_return0  // _HasResultType is true
-// {
-//     typedef typename _Tp::result_type type;
-// };
-//
-// template <class _Tp>
-// struct ________ref_return0<_Tp, false>
-// {
-//     typedef void type;
-// };
-//
-// template <class _Tp, bool _IsClass>
-// struct ____ref_return0  // _IsClass is true
-//     : public ________ref_return0<_Tp, __has_result_type<typename remove_cv<_Tp>::type>::value>
-// {
-// };
-//
-// template <class _Tp, bool _HasResultType>
-// struct ______ref_return0  // _HasResultType is true
-// {
-//     typedef typename __callable_type<_Tp>::result_type type;
-// };
-//
-// template <class _Tp>
-// struct ______ref_return0<_Tp, false>  // pointer to member data
-// {
-//     typedef void type;
-// };
-//
-// template <class _Tp>
-// struct ____ref_return0<_Tp, false>
-//     : public ______ref_return0<typename remove_cv<_Tp>::type,
-//                  __has_result_type<__callable_type<typename remove_cv<_Tp>::type> >::value>
-// {
-// };
-//
-// template <class _Tp>
-// struct __ref_return0
-//     : public ____ref_return0<typename remove_reference<_Tp>::type,
-//                    is_class<typename remove_reference<_Tp>::type>::value>
-// {
-// };
-//
-// __ref_return1
-//
-// template <class _Tp, bool _IsClass, class _A0>
-// struct ____ref_return1  // _IsClass is true
-// {
-//     typedef typename result_of<_Tp(_A0)>::type type;
-// };
-//
-// template <class _Tp, bool _HasResultType, class _A0>
-// struct ______ref_return1  // _HasResultType is true
-// {
-//     typedef typename __callable_type<_Tp>::result_type type;
-// };
-//
-// template <class _Tp, class _A0, bool>
-// struct __ref_return1_member_data1;
-//
-// template <class _Rp, class _Cp, class _A0>
-// struct __ref_return1_member_data1<_Rp _Cp::*, _A0, true>
-// {
-//     typedef typename __apply_cv<_A0, _Rp>::type& type;
-// };
-//
-// template <class _Rp, class _Cp, class _A0>
-// struct __ref_return1_member_data1<_Rp _Cp::*, _A0, false>
-// {
-//     static _A0 __a;
-//     typedef typename __apply_cv<decltype(*__a), _Rp>::type& type;
-// };
-//
-// template <class _Tp, class _A0>
-// struct __ref_return1_member_data;
-//
-// template <class _Rp, class _Cp, class _A0>
-// struct __ref_return1_member_data<_Rp _Cp::*, _A0>
-//     : public __ref_return1_member_data1<_Rp _Cp::*, _A0,
-//                 is_same<typename remove_cv<_Cp>::type,
-//                         typename remove_cv<typename remove_reference<_A0>::type>::type>::value>
-// {
-// };
-//
-// template <class _Tp, class _A0>
-// struct ______ref_return1<_Tp, false, _A0>  // pointer to member data
-//     : public __ref_return1_member_data<typename remove_cv<_Tp>::type, _A0>
-// {
-// };
-//
-// template <class _Tp, class _A0>
-// struct ____ref_return1<_Tp, false, _A0>
-//     : public ______ref_return1<typename remove_cv<_Tp>::type,
-//                  __has_result_type<__callable_type<typename remove_cv<_Tp>::type> >::value, _A0>
-// {
-// };
-//
-// template <class _Tp, class _A0>
-// struct __ref_return1
-//     : public ____ref_return1<typename remove_reference<_Tp>::type,
-//                    is_class<typename remove_reference<_Tp>::type>::value, _A0>
-// {
-// };
-//
-// __ref_return2
-//
-// template <class _Tp, bool _IsClass, class _A0, class _A1>
-// struct ____ref_return2  // _IsClass is true
-// {
-//     typedef typename result_of<_Tp(_A0, _A1)>::type type;
-// };
-//
-// template <class _Tp, bool _HasResultType, class _A0, class _A1>
-// struct ______ref_return2  // _HasResultType is true
-// {
-//     typedef typename __callable_type<_Tp>::result_type type;
-// };
-//
-// template <class _Tp>
-// struct ______ref_return2<_Tp, false, class _A0, class _A1>  // pointer to member data
-// {
-//     static_assert(sizeof(_Tp) == 0, "An attempt has been made to `call` a pointer"
-//                          " to member data with too many arguments.");
-// };
-//
-// template <class _Tp, class _A0, class _A1>
-// struct ____ref_return2<_Tp, false, _A0, _A1>
-//     : public ______ref_return2<typename remove_cv<_Tp>::type,
-//                  __has_result_type<__callable_type<typename remove_cv<_Tp>::type> >::value, _A0, _A1>
-// {
-// };
-//
-// template <class _Tp, class _A0, class _A1>
-// struct __ref_return2
-//     : public ____ref_return2<typename remove_reference<_Tp>::type,
-//                    is_class<typename remove_reference<_Tp>::type>::value, _A0, _A1>
-// {
-// };
-//
-// __ref_return3
-//
-// template <class _Tp, bool _IsClass, class _A0, class _A1, class _A2>
-// struct ____ref_return3  // _IsClass is true
-// {
-//     typedef typename result_of<_Tp(_A0, _A1, _A2)>::type type;
-// };
-//
-// template <class _Tp, bool _HasResultType, class _A0, class _A1, class _A2>
-// struct ______ref_return3  // _HasResultType is true
-// {
-//     typedef typename __callable_type<_Tp>::result_type type;
-// };
-//
-// template <class _Tp>
-// struct ______ref_return3<_Tp, false, class _A0, class _A1, class _A2>  // pointer to member data
-// {
-//     static_assert(sizeof(_Tp) == 0, "An attempt has been made to `call` a pointer"
-//                          " to member data with too many arguments.");
-// };
-//
-// template <class _Tp, class _A0, class _A1, class _A2>
-// struct ____ref_return3<_Tp, false, _A0, _A1, _A2>
-//     : public ______ref_return3<typename remove_cv<_Tp>::type,
-//                  __has_result_type<__callable_type<typename remove_cv<_Tp>::type> >::value, _A0, _A1, _A2>
-// {
-// };
-//
-// template <class _Tp, class _A0, class _A1, class _A2>
-// struct __ref_return3
-//     : public ____ref_return3<typename remove_reference<_Tp>::type,
-//                    is_class<typename remove_reference<_Tp>::type>::value, _A0, _A1, _A2>
-// {
-// };
-
-// first bullet
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(), _T1& __t1)
-{
-    return (__t1.*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0), _T1& __t1, _A0& __a0)
-{
-    return (__t1.*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1), _T1& __t1, _A0& __a0, _A1& __a1)
-{
-    return (__t1.*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2), _T1& __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return (__t1.*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() const, _T1& __t1)
-{
-    return (__t1.*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) const, _T1& __t1, _A0& __a0)
-{
-    return (__t1.*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) const, _T1& __t1, _A0& __a0, _A1& __a1)
-{
-    return (__t1.*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) const, _T1& __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return (__t1.*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() volatile, _T1& __t1)
-{
-    return (__t1.*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) volatile, _T1& __t1, _A0& __a0)
-{
-    return (__t1.*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) volatile, _T1& __t1, _A0& __a0, _A1& __a1)
-{
-    return (__t1.*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) volatile, _T1& __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return (__t1.*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() const volatile, _T1& __t1)
-{
-    return (__t1.*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) const volatile, _T1& __t1, _A0& __a0)
-{
-    return (__t1.*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) const volatile, _T1& __t1, _A0& __a0, _A1& __a1)
-{
-    return (__t1.*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) const volatile, _T1& __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return (__t1.*__f)(__a0, __a1, __a2);
-}
-
-// second bullet
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(), _T1 __t1)
-{
-    return ((*__t1).*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0), _T1 __t1, _A0& __a0)
-{
-    return ((*__t1).*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1), _T1 __t1, _A0& __a0, _A1& __a1)
-{
-    return ((*__t1).*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2), _T1 __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return ((*__t1).*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() const, _T1 __t1)
-{
-    return ((*__t1).*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) const, _T1 __t1, _A0& __a0)
-{
-    return ((*__t1).*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) const, _T1 __t1, _A0& __a0, _A1& __a1)
-{
-    return ((*__t1).*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) const, _T1 __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return ((*__t1).*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() volatile, _T1 __t1)
-{
-    return ((*__t1).*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) volatile, _T1 __t1, _A0& __a0)
-{
-    return ((*__t1).*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) volatile, _T1 __t1, _A0& __a0, _A1& __a1)
-{
-    return ((*__t1).*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) volatile, _T1 __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return ((*__t1).*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() const volatile, _T1 __t1)
-{
-    return ((*__t1).*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) const volatile, _T1 __t1, _A0& __a0)
-{
-    return ((*__t1).*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) const volatile, _T1 __t1, _A0& __a0, _A1& __a1)
-{
-    return ((*__t1).*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) const volatile, _T1 __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return ((*__t1).*__f)(__a0, __a1, __a2);
-}
-
-// third bullet
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    typename __apply_cv<_T1, _Rp>::type&
->::type
-__invoke(_Rp _Tp::* __f, _T1& __t1)
-{
-    return __t1.*__f;
-}
-
-template <class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__invoke(_Rp _Tp::*)
-{
-}
-
-// template <class _Dp, class _Rp, class _Tp, class _T1>
-// inline _LIBCPP_INLINE_VISIBILITY
-// typename enable_if
-// <
-//     is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-//     typename __ref_return1<_Rp _Tp::*, _T1>::type
-// >::type
-// __invoke(_Rp _Tp::* __f, _T1& __t1)
-// {
-//     return __t1.*__f;
-// }
-
-// forth bullet
-
-template <class _T1, class _Rp, bool>
-struct __4th_helper
-{
-};
-
-template <class _T1, class _Rp>
-struct __4th_helper<_T1, _Rp, true>
-{
-    typedef typename __apply_cv<decltype(*_VSTD::declval<_T1>()), _Rp>::type type;
-};
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __4th_helper<_T1, _Rp,
-                      !is_base_of<_Tp,
-                                  typename remove_reference<_T1>::type
-                                 >::value
-                     >::type&
-__invoke(_Rp _Tp::* __f, _T1& __t1)
-{
-    return (*__t1).*__f;
-}
-
-// template <class _Dp, class _Rp, class _Tp, class _T1>
-// inline _LIBCPP_INLINE_VISIBILITY
-// typename enable_if
-// <
-//     !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-//     typename __ref_return1<_Rp _Tp::*, _T1>::type
-// >::type
-// __invoke(_Rp _Tp::* __f, _T1 __t1)
-// {
-//     return (*__t1).*__f;
-// }
-
-// fifth bullet
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-decltype(declval<_Fp>()())
-__invoke(_Fp __f)
-{
-    return __f();
-}
-
-template <class _Fp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-decltype(declval<_Fp>()(declval<_A0&>()))
-__invoke(_Fp __f, _A0& __a0)
-{
-    return __f(__a0);
-}
-
-template <class _Fp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-decltype(declval<_Fp>()(declval<_A0&>(), declval<_A1&>()))
-__invoke(_Fp __f, _A0& __a0, _A1& __a1)
-{
-    return __f(__a0, __a1);
-}
-
-template <class _Fp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-decltype(declval<_Fp>()(declval<_A0&>(), declval<_A1&>(), declval<_A2&>()))
-__invoke(_Fp __f, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return __f(__a0, __a1, __a2);
-}
-
-// template <class _Rp, class _Fp>
-// inline _LIBCPP_INLINE_VISIBILITY
-// _Rp
-// __invoke(_Fp& __f)
-// {
-//     return __f();
-// }
-//
-// template <class _Rp, class _Fp, class _A0>
-// inline _LIBCPP_INLINE_VISIBILITY
-// typename enable_if
-// <
-//     !is_member_pointer<_Fp>::value,
-//     _Rp
-// >::type
-// __invoke(_Fp& __f, _A0& __a0)
-// {
-//     return __f(__a0);
-// }
-//
-// template <class _Rp, class _Fp, class _A0, class _A1>
-// inline _LIBCPP_INLINE_VISIBILITY
-// _Rp
-// __invoke(_Fp& __f, _A0& __a0, _A1& __a1)
-// {
-//     return __f(__a0, __a1);
-// }
-//
-// template <class _Rp, class _Fp, class _A0, class _A1, class _A2>
-// inline _LIBCPP_INLINE_VISIBILITY
-// _Rp
-// __invoke(_Fp& __f, _A0& __a0, _A1& __a1, _A2& __a2)
-// {
-//     return __f(__a0, __a1, __a2);
-// }
-
-template <class _Tp>
-struct __has_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Fp, bool = __has_result_type<__weak_result_type<_Fp> >::value>
-struct __invoke_return
-{
-    typedef typename __weak_result_type<_Fp>::result_type type;
-};
-
-template <class _Fp>
-struct __invoke_return<_Fp, false>
-{
-    typedef decltype(__invoke(_VSTD::declval<_Fp>())) type;
-};
-
-template <class _Tp, class _A0>
-struct __invoke_return0
-{
-    typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_A0>())) type;
-};
-
-template <class _Rp, class _Tp, class _A0>
-struct __invoke_return0<_Rp _Tp::*, _A0>
-{
-    typedef typename __apply_cv<_A0, _Rp>::type& type;
-};
-
-template <class _Rp, class _Tp, class _A0>
-struct __invoke_return0<_Rp _Tp::*, _A0*>
-{
-    typedef typename __apply_cv<_A0, _Rp>::type& type;
-};
-
-template <class _Tp, class _A0, class _A1>
-struct __invoke_return1
-{
-    typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_A0>(),
-                                                    _VSTD::declval<_A1>())) type;
-};
-
-template <class _Tp, class _A0, class _A1, class _A2>
-struct __invoke_return2
-{
-    typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_A0>(),
-                                                    _VSTD::declval<_A1>(),
-                                                    _VSTD::declval<_A2>())) type;
-};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY reference_wrapper
-    : public __weak_result_type<_Tp>
-{
-public:
-    // types
-    typedef _Tp type;
-private:
-    type* __f_;
-
-public:
-    // construct/copy/destroy
-    _LIBCPP_INLINE_VISIBILITY reference_wrapper(type& __f) : __f_(&__f) {}
-
-    // access
-    _LIBCPP_INLINE_VISIBILITY operator type&    () const {return *__f_;}
-    _LIBCPP_INLINE_VISIBILITY          type& get() const {return *__f_;}
-
-    // invoke
-
-    _LIBCPP_INLINE_VISIBILITY
-    typename __invoke_return<type&>::type
-       operator() () const
-       {
-           return __invoke(get());
-       }
-
-    template <class _A0>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_return0<type&, _A0>::type
-          operator() (_A0& __a0) const
-          {
-              return __invoke<type&, _A0>(get(), __a0);
-          }
-
-    template <class _A0, class _A1>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_return1<type&, _A0, _A1>::type
-          operator() (_A0& __a0, _A1& __a1) const
-          {
-              return __invoke<type&, _A0, _A1>(get(), __a0, __a1);
-          }
-
-    template <class _A0, class _A1, class _A2>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_return2<type&, _A0, _A1, _A2>::type
-          operator() (_A0& __a0, _A1& __a1, _A2& __a2) const
-          {
-              return __invoke<type&, _A0, _A1, _A2>(get(), __a0, __a1, __a2);
-          }
-};
-
-template <class _Tp> struct __is_reference_wrapper_impl : public false_type {};
-template <class _Tp> struct __is_reference_wrapper_impl<reference_wrapper<_Tp> > : public true_type {};
-template <class _Tp> struct __is_reference_wrapper
-    : public __is_reference_wrapper_impl<typename remove_cv<_Tp>::type> {};
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<_Tp>
-ref(_Tp& __t)
-{
-    return reference_wrapper<_Tp>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<_Tp>
-ref(reference_wrapper<_Tp> __t)
-{
-    return ref(__t.get());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<const _Tp>
-cref(const _Tp& __t)
-{
-    return reference_wrapper<const _Tp>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<const _Tp>
-cref(reference_wrapper<_Tp> __t)
-{
-    return cref(__t.get());
-}
-
-#endif  // _LIBCPP_FUNCTIONAL_BASE_03
diff --git a/include.new/c++/v1/__hash_table b/include.new/c++/v1/__hash_table
deleted file mode 100644
index 7c954b6..0000000
--- a/include.new/c++/v1/__hash_table
+++ /dev/null
@@ -1,2453 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP__HASH_TABLE
-#define _LIBCPP__HASH_TABLE
-
-#include <__config>
-#include <initializer_list>
-#include <memory>
-#include <iterator>
-#include <algorithm>
-#include <cmath>
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-_LIBCPP_FUNC_VIS
-size_t __next_prime(size_t __n);
-
-template <class _NodePtr>
-struct __hash_node_base
-{
-    typedef __hash_node_base __first_node;
-
-    _NodePtr    __next_;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_node_base() _NOEXCEPT : __next_(nullptr) {}
-};
-
-template <class _Tp, class _VoidPtr>
-struct __hash_node
-    : public __hash_node_base
-             <
-                 typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                     rebind<__hash_node<_Tp, _VoidPtr> >
-#else
-                     rebind<__hash_node<_Tp, _VoidPtr> >::other
-#endif
-             >
-{
-    typedef _Tp value_type;
-
-    size_t     __hash_;
-    value_type __value_;
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__is_power2(size_t __bc)
-{
-    return __bc > 2 && !(__bc & (__bc - 1));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-__constrain_hash(size_t __h, size_t __bc)
-{
-    return !(__bc & (__bc - 1)) ? __h & (__bc - 1) : __h % __bc;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-__next_pow2(size_t __n)
-{
-    return size_t(1) << (std::numeric_limits<size_t>::digits - __clz(__n-1));
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc> class __hash_table;
-template <class _ConstNodePtr> class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-template <class _HashIterator> class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator;
-template <class _HashIterator> class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator;
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-
-template <class _NodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __hash_iterator
-{
-    typedef _NodePtr __node_pointer;
-
-    __node_pointer            __node_;
-
-public:
-    typedef forward_iterator_tag                         iterator_category;
-    typedef typename pointer_traits<__node_pointer>::element_type::value_type value_type;
-    typedef typename pointer_traits<__node_pointer>::difference_type difference_type;
-    typedef value_type&                                  reference;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                     rebind<value_type>
-#else
-                     rebind<value_type>::other
-#endif
-                                                         pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __node_(nullptr)
-#endif
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator(const __hash_iterator& __i)
-        : __node_(__i.__node_)
-    {
-        __get_db()->__iterator_copy(this, &__i);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator& operator=(const __hash_iterator& __i)
-    {
-        if (this != &__i)
-        {
-            __get_db()->__iterator_copy(this, &__i);
-            __node_ = __i.__node_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-        reference operator*() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container iterator");
-#endif
-            return __node_->__value_;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container iterator");
-#endif
-            return pointer_traits<pointer>::pointer_to(__node_->__value_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable unordered container iterator");
-#endif
-        __node_ = __node_->__next_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator operator++(int)
-    {
-        __hash_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __hash_iterator& __x, const __hash_iterator& __y)
-    {
-        return __x.__node_ == __y.__node_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __hash_iterator& __x, const __hash_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator(__node_pointer __node, const void* __c) _NOEXCEPT
-        : __node_(__node)
-        {
-            __get_db()->__insert_ic(this, __c);
-        }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator(__node_pointer __node) _NOEXCEPT
-        : __node_(__node)
-        {}
-#endif
-
-    template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-};
-
-template <class _ConstNodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator
-{
-    typedef _ConstNodePtr __node_pointer;
-
-    __node_pointer         __node_;
-
-    typedef typename remove_const<
-        typename pointer_traits<__node_pointer>::element_type
-                                 >::type __node;
-
-public:
-    typedef forward_iterator_tag                       iterator_category;
-    typedef typename __node::value_type                value_type;
-    typedef typename pointer_traits<__node_pointer>::difference_type difference_type;
-    typedef const value_type&                          reference;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                       pointer;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__node>
-#else
-            rebind<__node>::other
-#endif
-                                                      __non_const_node_pointer;
-    typedef __hash_iterator<__non_const_node_pointer> __non_const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_const_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __node_(nullptr)
-#endif
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY 
-    __hash_const_iterator(const __non_const_iterator& __x) _NOEXCEPT
-        : __node_(__x.__node_)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__iterator_copy(this, &__x);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator(const __hash_const_iterator& __i)
-        : __node_(__i.__node_)
-    {
-        __get_db()->__iterator_copy(this, &__i);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_const_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator& operator=(const __hash_const_iterator& __i)
-    {
-        if (this != &__i)
-        {
-            __get_db()->__iterator_copy(this, &__i);
-            __node_ = __i.__node_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-        reference operator*() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container const_iterator");
-#endif
-            return __node_->__value_;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container const_iterator");
-#endif
-            return pointer_traits<pointer>::pointer_to(__node_->__value_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable unordered container const_iterator");
-#endif
-        __node_ = __node_->__next_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator operator++(int)
-    {
-        __hash_const_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __hash_const_iterator& __x, const __hash_const_iterator& __y)
-    {
-        return __x.__node_ == __y.__node_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __hash_const_iterator& __x, const __hash_const_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator(__node_pointer __node, const void* __c) _NOEXCEPT
-        : __node_(__node)
-        {
-            __get_db()->__insert_ic(this, __c);
-        }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator(__node_pointer __node) _NOEXCEPT
-        : __node_(__node)
-        {}
-#endif
-
-    template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-};
-
-template <class _ConstNodePtr> class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-
-template <class _NodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __hash_local_iterator
-{
-    typedef _NodePtr __node_pointer;
-
-    __node_pointer         __node_;
-    size_t                 __bucket_;
-    size_t                 __bucket_count_;
-
-    typedef pointer_traits<__node_pointer>          __pointer_traits;
-public:
-    typedef forward_iterator_tag                                iterator_category;
-    typedef typename __pointer_traits::element_type::value_type value_type;
-    typedef typename __pointer_traits::difference_type          difference_type;
-    typedef value_type&                                         reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                                                pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_local_iterator() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator(const __hash_local_iterator& __i)
-        : __node_(__i.__node_),
-          __bucket_(__i.__bucket_),
-          __bucket_count_(__i.__bucket_count_)
-    {
-        __get_db()->__iterator_copy(this, &__i);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_local_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator& operator=(const __hash_local_iterator& __i)
-    {
-        if (this != &__i)
-        {
-            __get_db()->__iterator_copy(this, &__i);
-            __node_ = __i.__node_;
-            __bucket_ = __i.__bucket_;
-            __bucket_count_ = __i.__bucket_count_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-        reference operator*() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container local_iterator");
-#endif
-            return __node_->__value_;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container local_iterator");
-#endif
-            return pointer_traits<pointer>::pointer_to(__node_->__value_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable unordered container local_iterator");
-#endif
-        __node_ = __node_->__next_;
-        if (__node_ != nullptr && __constrain_hash(__node_->__hash_, __bucket_count_) != __bucket_)
-            __node_ = nullptr;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator operator++(int)
-    {
-        __hash_local_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __hash_local_iterator& __x, const __hash_local_iterator& __y)
-    {
-        return __x.__node_ == __y.__node_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __hash_local_iterator& __x, const __hash_local_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator(__node_pointer __node, size_t __bucket,
-                          size_t __bucket_count, const void* __c) _NOEXCEPT
-        : __node_(__node),
-          __bucket_(__bucket),
-          __bucket_count_(__bucket_count)
-        {
-            __get_db()->__insert_ic(this, __c);
-            if (__node_ != nullptr)
-                __node_ = __node_->__next_;
-        }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator(__node_pointer __node, size_t __bucket,
-                          size_t __bucket_count) _NOEXCEPT
-        : __node_(__node),
-          __bucket_(__bucket),
-          __bucket_count_(__bucket_count)
-        {
-            if (__node_ != nullptr)
-                __node_ = __node_->__next_;
-        }
-#endif
-    template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator;
-};
-
-template <class _ConstNodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator
-{
-    typedef _ConstNodePtr __node_pointer;
-
-    __node_pointer         __node_;
-    size_t                 __bucket_;
-    size_t                 __bucket_count_;
-
-    typedef pointer_traits<__node_pointer>          __pointer_traits;
-    typedef typename __pointer_traits::element_type __node;
-    typedef typename remove_const<__node>::type     __non_const_node;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__non_const_node>
-#else
-            rebind<__non_const_node>::other
-#endif
-                                                    __non_const_node_pointer;
-    typedef __hash_local_iterator<__non_const_node_pointer>
-                                                    __non_const_iterator;
-public:
-    typedef forward_iterator_tag                       iterator_category;
-    typedef typename remove_const<
-                        typename __pointer_traits::element_type::value_type
-                     >::type                           value_type;
-    typedef typename __pointer_traits::difference_type difference_type;
-    typedef const value_type&                          reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                       pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_const_local_iterator() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator(const __non_const_iterator& __x) _NOEXCEPT
-        : __node_(__x.__node_),
-          __bucket_(__x.__bucket_),
-          __bucket_count_(__x.__bucket_count_)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__iterator_copy(this, &__x);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator(const __hash_const_local_iterator& __i)
-        : __node_(__i.__node_),
-          __bucket_(__i.__bucket_),
-          __bucket_count_(__i.__bucket_count_)
-    {
-        __get_db()->__iterator_copy(this, &__i);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_const_local_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator& operator=(const __hash_const_local_iterator& __i)
-    {
-        if (this != &__i)
-        {
-            __get_db()->__iterator_copy(this, &__i);
-            __node_ = __i.__node_;
-            __bucket_ = __i.__bucket_;
-            __bucket_count_ = __i.__bucket_count_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-        reference operator*() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container const_local_iterator");
-#endif
-            return __node_->__value_;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container const_local_iterator");
-#endif
-            return pointer_traits<pointer>::pointer_to(__node_->__value_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable unordered container const_local_iterator");
-#endif
-        __node_ = __node_->__next_;
-        if (__node_ != nullptr && __constrain_hash(__node_->__hash_, __bucket_count_) != __bucket_)
-            __node_ = nullptr;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator operator++(int)
-    {
-        __hash_const_local_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __hash_const_local_iterator& __x, const __hash_const_local_iterator& __y)
-    {
-        return __x.__node_ == __y.__node_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __hash_const_local_iterator& __x, const __hash_const_local_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator(__node_pointer __node, size_t __bucket,
-                                size_t __bucket_count, const void* __c) _NOEXCEPT
-        : __node_(__node),
-          __bucket_(__bucket),
-          __bucket_count_(__bucket_count)
-        {
-            __get_db()->__insert_ic(this, __c);
-            if (__node_ != nullptr)
-                __node_ = __node_->__next_;
-        }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator(__node_pointer __node, size_t __bucket,
-                                size_t __bucket_count) _NOEXCEPT
-        : __node_(__node),
-          __bucket_(__bucket),
-          __bucket_count_(__bucket_count)
-        {
-            if (__node_ != nullptr)
-                __node_ = __node_->__next_;
-        }
-#endif
-    template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator;
-};
-
-template <class _Alloc>
-class __bucket_list_deallocator
-{
-    typedef _Alloc                                          allocator_type;
-    typedef allocator_traits<allocator_type>                __alloc_traits;
-    typedef typename __alloc_traits::size_type              size_type;
-
-    __compressed_pair<size_type, allocator_type> __data_;
-public:
-    typedef typename __alloc_traits::pointer pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bucket_list_deallocator()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-        : __data_(0) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bucket_list_deallocator(const allocator_type& __a, size_type __size)
-        _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)
-        : __data_(__size, __a) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bucket_list_deallocator(__bucket_list_deallocator&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-        : __data_(_VSTD::move(__x.__data_))
-    {
-        __x.size() = 0;
-    }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type& size() _NOEXCEPT {return __data_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type  size() const _NOEXCEPT {return __data_.first();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type& __alloc() _NOEXCEPT {return __data_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const allocator_type& __alloc() const _NOEXCEPT {return __data_.second();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        __alloc_traits::deallocate(__alloc(), __p, size());
-    }
-};
-
-template <class _Alloc> class __hash_map_node_destructor;
-
-template <class _Alloc>
-class __hash_node_destructor
-{
-    typedef _Alloc                                          allocator_type;
-    typedef allocator_traits<allocator_type>                __alloc_traits;
-    typedef typename __alloc_traits::value_type::value_type value_type;
-public:
-    typedef typename __alloc_traits::pointer                pointer;
-private:
-
-    allocator_type& __na_;
-
-    __hash_node_destructor& operator=(const __hash_node_destructor&);
-
-public:
-    bool __value_constructed;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __hash_node_destructor(allocator_type& __na,
-                                    bool __constructed = false) _NOEXCEPT
-        : __na_(__na),
-          __value_constructed(__constructed)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        if (__value_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_));
-        if (__p)
-            __alloc_traits::deallocate(__na_, __p, 1);
-    }
-
-    template <class> friend class __hash_map_node_destructor;
-};
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-class __hash_table
-{
-public:
-    typedef _Tp    value_type;
-    typedef _Hash  hasher;
-    typedef _Equal key_equal;
-    typedef _Alloc allocator_type;
-
-private:
-    typedef allocator_traits<allocator_type> __alloc_traits;
-public:
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-public:
-    // Create __node
-    typedef __hash_node<value_type, typename __alloc_traits::void_pointer> __node;
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__node>
-#else
-            rebind_alloc<__node>::other
-#endif
-                                                     __node_allocator;
-    typedef allocator_traits<__node_allocator>       __node_traits;
-    typedef typename __node_traits::pointer          __node_pointer;
-    typedef typename __node_traits::pointer          __node_const_pointer;
-    typedef __hash_node_base<__node_pointer>         __first_node;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__first_node>
-#else
-            rebind<__first_node>::other
-#endif
-                                                     __node_base_pointer;
-
-private:
-
-    typedef typename __node_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__node_pointer>
-#else
-            rebind_alloc<__node_pointer>::other
-#endif
-                                                            __pointer_allocator;
-    typedef __bucket_list_deallocator<__pointer_allocator> __bucket_list_deleter;
-    typedef unique_ptr<__node_pointer[], __bucket_list_deleter> __bucket_list;
-    typedef allocator_traits<__pointer_allocator>          __pointer_alloc_traits;
-    typedef typename __bucket_list_deleter::pointer __node_pointer_pointer;
-
-    // --- Member data begin ---
-    __bucket_list                                     __bucket_list_;
-    __compressed_pair<__first_node, __node_allocator> __p1_;
-    __compressed_pair<size_type, hasher>              __p2_;
-    __compressed_pair<float, key_equal>               __p3_;
-    // --- Member data end ---
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type& size() _NOEXCEPT {return __p2_.first();}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    size_type  size() const _NOEXCEPT {return __p2_.first();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher& hash_function() _NOEXCEPT {return __p2_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const hasher& hash_function() const _NOEXCEPT {return __p2_.second();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float& max_load_factor() _NOEXCEPT {return __p3_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    float  max_load_factor() const _NOEXCEPT {return __p3_.first();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal& key_eq() _NOEXCEPT {return __p3_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const key_equal& key_eq() const _NOEXCEPT {return __p3_.second();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __node_allocator& __node_alloc() _NOEXCEPT {return __p1_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_allocator& __node_alloc() const _NOEXCEPT
-        {return __p1_.second();}
-
-public:
-    typedef __hash_iterator<__node_pointer>                   iterator;
-    typedef __hash_const_iterator<__node_pointer>             const_iterator;
-    typedef __hash_local_iterator<__node_pointer>             local_iterator;
-    typedef __hash_const_local_iterator<__node_pointer>       const_local_iterator;
-
-    __hash_table()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<__bucket_list>::value &&
-            is_nothrow_default_constructible<__first_node>::value &&
-            is_nothrow_default_constructible<__node_allocator>::value &&
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value);
-    __hash_table(const hasher& __hf, const key_equal& __eql);
-    __hash_table(const hasher& __hf, const key_equal& __eql,
-                 const allocator_type& __a);
-    explicit __hash_table(const allocator_type& __a);
-    __hash_table(const __hash_table& __u);
-    __hash_table(const __hash_table& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __hash_table(__hash_table&& __u)
-        _NOEXCEPT_(
-            is_nothrow_move_constructible<__bucket_list>::value &&
-            is_nothrow_move_constructible<__first_node>::value &&
-            is_nothrow_move_constructible<__node_allocator>::value &&
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value);
-    __hash_table(__hash_table&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~__hash_table();
-
-    __hash_table& operator=(const __hash_table& __u);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __hash_table& operator=(__hash_table&& __u)
-        _NOEXCEPT_(
-            __node_traits::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<__node_allocator>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-#endif
-    template <class _InputIterator>
-        void __assign_unique(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        void __assign_multi(_InputIterator __first, _InputIterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-    {
-        return allocator_traits<__pointer_allocator>::max_size(
-            __bucket_list_.get_deleter().__alloc());
-    }
-
-    pair<iterator, bool> __node_insert_unique(__node_pointer __nd);
-    iterator             __node_insert_multi(__node_pointer __nd);
-    iterator             __node_insert_multi(const_iterator __p,
-                                             __node_pointer __nd);
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        pair<iterator, bool> __emplace_unique(_Args&&... __args);
-    template <class... _Args>
-        iterator __emplace_multi(_Args&&... __args);
-    template <class... _Args>
-        iterator __emplace_hint_multi(const_iterator __p, _Args&&... __args);
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-    pair<iterator, bool> __insert_unique(const value_type& __x);
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp>
-        pair<iterator, bool> __insert_unique(_Pp&& __x);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp>
-        iterator __insert_multi(_Pp&& __x);
-    template <class _Pp>
-        iterator __insert_multi(const_iterator __p, _Pp&& __x);
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator __insert_multi(const value_type& __x);
-    iterator __insert_multi(const_iterator __p, const value_type& __x);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    void clear() _NOEXCEPT;
-    void rehash(size_type __n);
-    _LIBCPP_INLINE_VISIBILITY void reserve(size_type __n)
-        {rehash(static_cast<size_type>(ceil(__n / max_load_factor())));}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT
-    {
-        return __bucket_list_.get_deleter().size();
-    }
-
-    iterator       begin() _NOEXCEPT;
-    iterator       end() _NOEXCEPT;
-    const_iterator begin() const _NOEXCEPT;
-    const_iterator end() const _NOEXCEPT;
-
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        size_type bucket(const _Key& __k) const
-        {
-            _LIBCPP_ASSERT(bucket_count() > 0,
-                "unordered container::bucket(key) called when bucket_count() == 0");
-            return __constrain_hash(hash_function()(__k), bucket_count());
-        }
-
-    template <class _Key>
-        iterator       find(const _Key& __x);
-    template <class _Key>
-        const_iterator find(const _Key& __x) const;
-
-    typedef __hash_node_destructor<__node_allocator> _Dp;
-    typedef unique_ptr<__node, _Dp> __node_holder;
-
-    iterator erase(const_iterator __p);
-    iterator erase(const_iterator __first, const_iterator __last);
-    template <class _Key>
-        size_type __erase_unique(const _Key& __k);
-    template <class _Key>
-        size_type __erase_multi(const _Key& __k);
-    __node_holder remove(const_iterator __p) _NOEXCEPT;
-
-    template <class _Key>
-        size_type __count_unique(const _Key& __k) const;
-    template <class _Key>
-        size_type __count_multi(const _Key& __k) const;
-
-    template <class _Key>
-        pair<iterator, iterator>
-        __equal_range_unique(const _Key& __k);
-    template <class _Key>
-        pair<const_iterator, const_iterator>
-        __equal_range_unique(const _Key& __k) const;
-
-    template <class _Key>
-        pair<iterator, iterator>
-        __equal_range_multi(const _Key& __k);
-    template <class _Key>
-        pair<const_iterator, const_iterator>
-        __equal_range_multi(const _Key& __k) const;
-
-    void swap(__hash_table& __u)
-        _NOEXCEPT_(
-            (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<__pointer_allocator>::value) &&
-            (!__node_traits::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<__node_allocator>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT
-        {return __pointer_alloc_traits::max_size(__bucket_list_.get_deleter().__alloc());}
-    size_type bucket_size(size_type __n) const;
-    _LIBCPP_INLINE_VISIBILITY float load_factor() const _NOEXCEPT
-    {
-        size_type __bc = bucket_count();
-        return __bc != 0 ? (float)size() / __bc : 0.f;
-    }
-    _LIBCPP_INLINE_VISIBILITY void max_load_factor(float __mlf) _NOEXCEPT
-    {
-        _LIBCPP_ASSERT(__mlf > 0,
-            "unordered container::max_load_factor(lf) called with lf <= 0");
-        max_load_factor() = _VSTD::max(__mlf, load_factor());
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator
-    begin(size_type __n)
-    {
-        _LIBCPP_ASSERT(__n < bucket_count(),
-            "unordered container::begin(n) called with n >= bucket_count()");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return local_iterator(__bucket_list_[__n], __n, bucket_count(), this);
-#else
-        return local_iterator(__bucket_list_[__n], __n, bucket_count());
-#endif
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator
-    end(size_type __n)
-    {
-        _LIBCPP_ASSERT(__n < bucket_count(),
-            "unordered container::end(n) called with n >= bucket_count()");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return local_iterator(nullptr, __n, bucket_count(), this);
-#else
-        return local_iterator(nullptr, __n, bucket_count());
-#endif
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator
-    cbegin(size_type __n) const
-    {
-        _LIBCPP_ASSERT(__n < bucket_count(),
-            "unordered container::cbegin(n) called with n >= bucket_count()");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return const_local_iterator(__bucket_list_[__n], __n, bucket_count(), this);
-#else
-        return const_local_iterator(__bucket_list_[__n], __n, bucket_count());
-#endif
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator
-    cend(size_type __n) const
-    {
-        _LIBCPP_ASSERT(__n < bucket_count(),
-            "unordered container::cend(n) called with n >= bucket_count()");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return const_local_iterator(nullptr, __n, bucket_count(), this);
-#else
-        return const_local_iterator(nullptr, __n, bucket_count());
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const;
-    bool __decrementable(const const_iterator* __i) const;
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const;
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-    void __rehash(size_type __n);
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class ..._Args>
-        __node_holder __construct_node(_Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-    __node_holder __construct_node(value_type&& __v, size_t __hash);
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node(const value_type& __v);
-#endif
-    __node_holder __construct_node(const value_type& __v, size_t __hash);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __hash_table& __u)
-        {__copy_assign_alloc(__u, integral_constant<bool,
-             __node_traits::propagate_on_container_copy_assignment::value>());}
-    void __copy_assign_alloc(const __hash_table& __u, true_type);
-    _LIBCPP_INLINE_VISIBILITY
-        void __copy_assign_alloc(const __hash_table&, false_type) {}
-
-    void __move_assign(__hash_table& __u, false_type);
-    void __move_assign(__hash_table& __u, true_type)
-        _NOEXCEPT_(
-            is_nothrow_move_assignable<__node_allocator>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__hash_table& __u)
-        _NOEXCEPT_(
-            !__node_traits::propagate_on_container_move_assignment::value ||
-            (is_nothrow_move_assignable<__pointer_allocator>::value &&
-             is_nothrow_move_assignable<__node_allocator>::value))
-        {__move_assign_alloc(__u, integral_constant<bool,
-             __node_traits::propagate_on_container_move_assignment::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__hash_table& __u, true_type)
-        _NOEXCEPT_(
-            is_nothrow_move_assignable<__pointer_allocator>::value &&
-            is_nothrow_move_assignable<__node_allocator>::value)
-    {
-        __bucket_list_.get_deleter().__alloc() =
-                _VSTD::move(__u.__bucket_list_.get_deleter().__alloc());
-        __node_alloc() = _VSTD::move(__u.__node_alloc());
-    }
-    _LIBCPP_INLINE_VISIBILITY
-        void __move_assign_alloc(__hash_table&, false_type) _NOEXCEPT {}
-
-    template <class _Ap>
-    _LIBCPP_INLINE_VISIBILITY
-    static
-    void
-    __swap_alloc(_Ap& __x, _Ap& __y)
-        _NOEXCEPT_(
-            !allocator_traits<_Ap>::propagate_on_container_swap::value ||
-            __is_nothrow_swappable<_Ap>::value)
-    {
-        __swap_alloc(__x, __y,
-                     integral_constant<bool,
-                        allocator_traits<_Ap>::propagate_on_container_swap::value
-                                      >());
-    }
-
-    template <class _Ap>
-    _LIBCPP_INLINE_VISIBILITY
-    static
-    void
-    __swap_alloc(_Ap& __x, _Ap& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<_Ap>::value)
-    {
-        using _VSTD::swap;
-        swap(__x, __y);
-    }
-
-    template <class _Ap>
-    _LIBCPP_INLINE_VISIBILITY
-    static
-    void
-    __swap_alloc(_Ap&, _Ap&, false_type) _NOEXCEPT {}
-
-    void __deallocate(__node_pointer __np) _NOEXCEPT;
-    __node_pointer __detach() _NOEXCEPT;
-
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-};
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table()
-    _NOEXCEPT_(
-        is_nothrow_default_constructible<__bucket_list>::value &&
-        is_nothrow_default_constructible<__first_node>::value &&
-        is_nothrow_default_constructible<hasher>::value &&
-        is_nothrow_default_constructible<key_equal>::value)
-    : __p2_(0),
-      __p3_(1.0f)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const hasher& __hf,
-                                                       const key_equal& __eql)
-    : __bucket_list_(nullptr, __bucket_list_deleter()),
-      __p1_(),
-      __p2_(0, __hf),
-      __p3_(1.0f, __eql)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const hasher& __hf,
-                                                       const key_equal& __eql,
-                                                       const allocator_type& __a)
-    : __bucket_list_(nullptr, __bucket_list_deleter(__pointer_allocator(__a), 0)),
-      __p1_(__node_allocator(__a)),
-      __p2_(0, __hf),
-      __p3_(1.0f, __eql)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const allocator_type& __a)
-    : __bucket_list_(nullptr, __bucket_list_deleter(__pointer_allocator(__a), 0)),
-      __p1_(__node_allocator(__a)),
-      __p2_(0),
-      __p3_(1.0f)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const __hash_table& __u)
-    : __bucket_list_(nullptr,
-          __bucket_list_deleter(allocator_traits<__pointer_allocator>::
-              select_on_container_copy_construction(
-                  __u.__bucket_list_.get_deleter().__alloc()), 0)),
-      __p1_(allocator_traits<__node_allocator>::
-          select_on_container_copy_construction(__u.__node_alloc())),
-      __p2_(0, __u.hash_function()),
-      __p3_(__u.__p3_)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const __hash_table& __u,
-                                                       const allocator_type& __a)
-    : __bucket_list_(nullptr, __bucket_list_deleter(__pointer_allocator(__a), 0)),
-      __p1_(__node_allocator(__a)),
-      __p2_(0, __u.hash_function()),
-      __p3_(__u.__p3_)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(__hash_table&& __u)
-        _NOEXCEPT_(
-            is_nothrow_move_constructible<__bucket_list>::value &&
-            is_nothrow_move_constructible<__first_node>::value &&
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value)
-    : __bucket_list_(_VSTD::move(__u.__bucket_list_)),
-      __p1_(_VSTD::move(__u.__p1_)),
-      __p2_(_VSTD::move(__u.__p2_)),
-      __p3_(_VSTD::move(__u.__p3_))
-{
-    if (size() > 0)
-    {
-        __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-        __u.__p1_.first().__next_ = nullptr;
-        __u.size() = 0;
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(__hash_table&& __u,
-                                                       const allocator_type& __a)
-    : __bucket_list_(nullptr, __bucket_list_deleter(__pointer_allocator(__a), 0)),
-      __p1_(__node_allocator(__a)),
-      __p2_(0, _VSTD::move(__u.hash_function())),
-      __p3_(_VSTD::move(__u.__p3_))
-{
-    if (__a == allocator_type(__u.__node_alloc()))
-    {
-        __bucket_list_.reset(__u.__bucket_list_.release());
-        __bucket_list_.get_deleter().size() = __u.__bucket_list_.get_deleter().size();
-        __u.__bucket_list_.get_deleter().size() = 0;
-        if (__u.size() > 0)
-        {
-            __p1_.first().__next_ = __u.__p1_.first().__next_;
-            __u.__p1_.first().__next_ = nullptr;
-            __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-                static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-            size() = __u.size();
-            __u.size() = 0;
-        }
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::~__hash_table()
-{
-    __deallocate(__p1_.first().__next_);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__erase_c(this);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__copy_assign_alloc(
-        const __hash_table& __u, true_type)
-{
-    if (__node_alloc() != __u.__node_alloc())
-    {
-        clear();
-        __bucket_list_.reset();
-        __bucket_list_.get_deleter().size() = 0;
-    }
-    __bucket_list_.get_deleter().__alloc() = __u.__bucket_list_.get_deleter().__alloc();
-    __node_alloc() = __u.__node_alloc();
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>&
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::operator=(const __hash_table& __u)
-{
-    if (this != &__u)
-    {
-        __copy_assign_alloc(__u);
-        hash_function() = __u.hash_function();
-        key_eq() = __u.key_eq();
-        max_load_factor() = __u.max_load_factor();
-        __assign_multi(__u.begin(), __u.end());
-    }
-    return *this;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__deallocate(__node_pointer __np)
-    _NOEXCEPT
-{
-    __node_allocator& __na = __node_alloc();
-    while (__np != nullptr)
-    {
-        __node_pointer __next = __np->__next_;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __c_node* __c = __get_db()->__find_c_and_lock(this);
-        for (__i_node** __p = __c->end_; __p != __c->beg_; )
-        {
-            --__p;
-            iterator* __i = static_cast<iterator*>((*__p)->__i_);
-            if (__i->__node_ == __np)
-            {
-                (*__p)->__c_ = nullptr;
-                if (--__c->end_ != __p)
-                    memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __get_db()->unlock();
-#endif
-        __node_traits::destroy(__na, _VSTD::addressof(__np->__value_));
-        __node_traits::deallocate(__na, __np, 1);
-        __np = __next;
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_pointer
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__detach() _NOEXCEPT
-{
-    size_type __bc = bucket_count();
-    for (size_type __i = 0; __i < __bc; ++__i)
-        __bucket_list_[__i] = nullptr;
-    size() = 0;
-    __node_pointer __cache = __p1_.first().__next_;
-    __p1_.first().__next_ = nullptr;
-    return __cache;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__move_assign(
-        __hash_table& __u, true_type)
-    _NOEXCEPT_(
-        is_nothrow_move_assignable<__node_allocator>::value &&
-        is_nothrow_move_assignable<hasher>::value &&
-        is_nothrow_move_assignable<key_equal>::value)
-{
-    clear();
-    __bucket_list_.reset(__u.__bucket_list_.release());
-    __bucket_list_.get_deleter().size() = __u.__bucket_list_.get_deleter().size();
-    __u.__bucket_list_.get_deleter().size() = 0;
-    __move_assign_alloc(__u);
-    size() = __u.size();
-    hash_function() = _VSTD::move(__u.hash_function());
-    max_load_factor() = __u.max_load_factor();
-    key_eq() = _VSTD::move(__u.key_eq());
-    __p1_.first().__next_ = __u.__p1_.first().__next_;
-    if (size() > 0)
-    {
-        __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-        __u.__p1_.first().__next_ = nullptr;
-        __u.size() = 0;
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__move_assign(
-        __hash_table& __u, false_type)
-{
-    if (__node_alloc() == __u.__node_alloc())
-        __move_assign(__u, true_type());
-    else
-    {
-        hash_function() = _VSTD::move(__u.hash_function());
-        key_eq() = _VSTD::move(__u.key_eq());
-        max_load_factor() = __u.max_load_factor();
-        if (bucket_count() != 0)
-        {
-            __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            try
-            {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                const_iterator __i = __u.begin();
-                while (__cache != nullptr && __u.size() != 0)
-                {
-                    __cache->__value_ = _VSTD::move(__u.remove(__i++)->__value_);
-                    __node_pointer __next = __cache->__next_;
-                    __node_insert_multi(__cache);
-                    __cache = __next;
-                }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            }
-            catch (...)
-            {
-                __deallocate(__cache);
-                throw;
-            }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __deallocate(__cache);
-        }
-        const_iterator __i = __u.begin();
-        while (__u.size() != 0)
-        {
-            __node_holder __h =
-                    __construct_node(_VSTD::move(__u.remove(__i++)->__value_));
-            __node_insert_multi(__h.get());
-            __h.release();
-        }
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__hash_table<_Tp, _Hash, _Equal, _Alloc>&
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::operator=(__hash_table&& __u)
-    _NOEXCEPT_(
-        __node_traits::propagate_on_container_move_assignment::value &&
-        is_nothrow_move_assignable<__node_allocator>::value &&
-        is_nothrow_move_assignable<hasher>::value &&
-        is_nothrow_move_assignable<key_equal>::value)
-{
-    __move_assign(__u, integral_constant<bool,
-                  __node_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _InputIterator>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__assign_unique(_InputIterator __first,
-                                                          _InputIterator __last)
-{
-    if (bucket_count() != 0)
-    {
-        __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __cache != nullptr && __first != __last; ++__first)
-            {
-                __cache->__value_ = *__first;
-                __node_pointer __next = __cache->__next_;
-                __node_insert_unique(__cache);
-                __cache = __next;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            __deallocate(__cache);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __deallocate(__cache);
-    }
-    for (; __first != __last; ++__first)
-        __insert_unique(*__first);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _InputIterator>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__assign_multi(_InputIterator __first,
-                                                         _InputIterator __last)
-{
-    if (bucket_count() != 0)
-    {
-        __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __cache != nullptr && __first != __last; ++__first)
-            {
-                __cache->__value_ = *__first;
-                __node_pointer __next = __cache->__next_;
-                __node_insert_multi(__cache);
-                __cache = __next;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            __deallocate(__cache);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __deallocate(__cache);
-    }
-    for (; __first != __last; ++__first)
-        __insert_multi(*__first);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::begin() _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__p1_.first().__next_, this);
-#else
-    return iterator(__p1_.first().__next_);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::end() _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(nullptr, this);
-#else
-    return iterator(nullptr);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::begin() const _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return const_iterator(__p1_.first().__next_, this);
-#else
-    return const_iterator(__p1_.first().__next_);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::end() const _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return const_iterator(nullptr, this);
-#else
-    return const_iterator(nullptr);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::clear() _NOEXCEPT
-{
-    if (size() > 0)
-    {
-        __deallocate(__p1_.first().__next_);
-        __p1_.first().__next_ = nullptr;
-        size_type __bc = bucket_count();
-        for (size_type __i = 0; __i < __bc; ++__i)
-            __bucket_list_[__i] = nullptr;
-        size() = 0;
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator, bool>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_unique(__node_pointer __nd)
-{
-    __nd->__hash_ = hash_function()(__nd->__value_);
-    size_type __bc = bucket_count();
-    bool __inserted = false;
-    __node_pointer __ndptr;
-    size_t __chash;
-    if (__bc != 0)
-    {
-        __chash = __constrain_hash(__nd->__hash_, __bc);
-        __ndptr = __bucket_list_[__chash];
-        if (__ndptr != nullptr)
-        {
-            for (__ndptr = __ndptr->__next_; __ndptr != nullptr &&
-                                             __constrain_hash(__ndptr->__hash_, __bc) == __chash;
-                                                     __ndptr = __ndptr->__next_)
-            {
-                if (key_eq()(__ndptr->__value_, __nd->__value_))
-                    goto __done;
-            }
-        }
-    }
-    {
-        if (size()+1 > __bc * max_load_factor() || __bc == 0)
-        {
-            rehash(_VSTD::max<size_type>(2 * __bc + !__is_power2(__bc),
-                           size_type(ceil(float(size() + 1) / max_load_factor()))));
-            __bc = bucket_count();
-            __chash = __constrain_hash(__nd->__hash_, __bc);
-        }
-        // insert_after __bucket_list_[__chash], or __first_node if bucket is null
-        __node_pointer __pn = __bucket_list_[__chash];
-        if (__pn == nullptr)
-        {
-            __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-            __nd->__next_ = __pn->__next_;
-            __pn->__next_ = __nd;
-            // fix up __bucket_list_
-            __bucket_list_[__chash] = __pn;
-            if (__nd->__next_ != nullptr)
-                __bucket_list_[__constrain_hash(__nd->__next_->__hash_, __bc)] = __nd;
-        }
-        else
-        {
-            __nd->__next_ = __pn->__next_;
-            __pn->__next_ = __nd;
-        }
-        __ndptr = __nd;
-        // increment size
-        ++size();
-        __inserted = true;
-    }
-__done:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return pair<iterator, bool>(iterator(__ndptr, this), __inserted);
-#else
-    return pair<iterator, bool>(iterator(__ndptr), __inserted);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_multi(__node_pointer __cp)
-{
-    __cp->__hash_ = hash_function()(__cp->__value_);
-    size_type __bc = bucket_count();
-    if (size()+1 > __bc * max_load_factor() || __bc == 0)
-    {
-        rehash(_VSTD::max<size_type>(2 * __bc + !__is_power2(__bc),
-                       size_type(ceil(float(size() + 1) / max_load_factor()))));
-        __bc = bucket_count();
-    }
-    size_t __chash = __constrain_hash(__cp->__hash_, __bc);
-    __node_pointer __pn = __bucket_list_[__chash];
-    if (__pn == nullptr)
-    {
-        __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-        __cp->__next_ = __pn->__next_;
-        __pn->__next_ = __cp;
-        // fix up __bucket_list_
-        __bucket_list_[__chash] = __pn;
-        if (__cp->__next_ != nullptr)
-            __bucket_list_[__constrain_hash(__cp->__next_->__hash_, __bc)] = __cp;
-    }
-    else
-    {
-        for (bool __found = false; __pn->__next_ != nullptr &&
-                                   __constrain_hash(__pn->__next_->__hash_, __bc) == __chash;
-                                                           __pn = __pn->__next_)
-        {
-            //      __found    key_eq()     action
-            //      false       false       loop
-            //      true        true        loop
-            //      false       true        set __found to true
-            //      true        false       break
-            if (__found != (__pn->__next_->__hash_ == __cp->__hash_ &&
-                            key_eq()(__pn->__next_->__value_, __cp->__value_)))
-            {
-                if (!__found)
-                    __found = true;
-                else
-                    break;
-            }
-        }
-        __cp->__next_ = __pn->__next_;
-        __pn->__next_ = __cp;
-        if (__cp->__next_ != nullptr)
-        {
-            size_t __nhash = __constrain_hash(__cp->__next_->__hash_, __bc);
-            if (__nhash != __chash)
-                __bucket_list_[__nhash] = __cp;
-        }
-    }
-    ++size();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__cp, this);
-#else
-    return iterator(__cp);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_multi(
-        const_iterator __p, __node_pointer __cp)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container::emplace_hint(const_iterator, args...) called with an iterator not"
-        " referring to this unordered container");
-#endif
-    if (__p != end() && key_eq()(*__p, __cp->__value_))
-    {
-        __node_pointer __np = __p.__node_;
-        __cp->__hash_ = __np->__hash_;
-        size_type __bc = bucket_count();
-        if (size()+1 > __bc * max_load_factor() || __bc == 0)
-        {
-            rehash(_VSTD::max<size_type>(2 * __bc + !__is_power2(__bc),
-                           size_type(ceil(float(size() + 1) / max_load_factor()))));
-            __bc = bucket_count();
-        }
-        size_t __chash = __constrain_hash(__cp->__hash_, __bc);
-        __node_pointer __pp = __bucket_list_[__chash];
-        while (__pp->__next_ != __np)
-            __pp = __pp->__next_;
-        __cp->__next_ = __np;
-        __pp->__next_ = __cp;
-        ++size();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return iterator(__cp, this);
-#else
-        return iterator(__cp);
-#endif
-    }
-    return __node_insert_multi(__cp);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator, bool>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_unique(const value_type& __x)
-{
-    size_t __hash = hash_function()(__x);
-    size_type __bc = bucket_count();
-    bool __inserted = false;
-    __node_pointer __nd;
-    size_t __chash;
-    if (__bc != 0)
-    {
-        __chash = __constrain_hash(__hash, __bc);
-        __nd = __bucket_list_[__chash];
-        if (__nd != nullptr)
-        {
-            for (__nd = __nd->__next_; __nd != nullptr &&
-                                       __constrain_hash(__nd->__hash_, __bc) == __chash;
-                                                           __nd = __nd->__next_)
-            {
-                if (key_eq()(__nd->__value_, __x))
-                    goto __done;
-            }
-        }
-    }
-    {
-        __node_holder __h = __construct_node(__x, __hash);
-        if (size()+1 > __bc * max_load_factor() || __bc == 0)
-        {
-            rehash(_VSTD::max<size_type>(2 * __bc + !__is_power2(__bc),
-                           size_type(ceil(float(size() + 1) / max_load_factor()))));
-            __bc = bucket_count();
-            __chash = __constrain_hash(__hash, __bc);
-        }
-        // insert_after __bucket_list_[__chash], or __first_node if bucket is null
-        __node_pointer __pn = __bucket_list_[__chash];
-        if (__pn == nullptr)
-        {
-            __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-            __h->__next_ = __pn->__next_;
-            __pn->__next_ = __h.get();
-            // fix up __bucket_list_
-            __bucket_list_[__chash] = __pn;
-            if (__h->__next_ != nullptr)
-                __bucket_list_[__constrain_hash(__h->__next_->__hash_, __bc)] = __h.get();
-        }
-        else
-        {
-            __h->__next_ = __pn->__next_;
-            __pn->__next_ = __h.get();
-        }
-        __nd = __h.release();
-        // increment size
-        ++size();
-        __inserted = true;
-    }
-__done:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return pair<iterator, bool>(iterator(__nd, this), __inserted);
-#else
-    return pair<iterator, bool>(iterator(__nd), __inserted);
-#endif
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class... _Args>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator, bool>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_unique(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    pair<iterator, bool> __r = __node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class... _Args>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_multi(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class... _Args>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_hint_multi(
-        const_iterator __p, _Args&&... __args)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container::emplace_hint(const_iterator, args...) called with an iterator not"
-        " referring to this unordered container");
-#endif
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __node_insert_multi(__p, __h.get());
-    __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Pp>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator, bool>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_unique(_Pp&& __x)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Pp>(__x));
-    pair<iterator, bool> __r = __node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Pp>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_multi(_Pp&& __x)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Pp>(__x));
-    iterator __r = __node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Pp>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_multi(const_iterator __p,
-                                                         _Pp&& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container::insert(const_iterator, rvalue) called with an iterator not"
-        " referring to this unordered container");
-#endif
-    __node_holder __h = __construct_node(_VSTD::forward<_Pp>(__x));
-    iterator __r = __node_insert_multi(__p, __h.get());
-    __h.release();
-    return __r;
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_multi(const value_type& __x)
-{
-    __node_holder __h = __construct_node(__x);
-    iterator __r = __node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_multi(const_iterator __p,
-                                                         const value_type& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container::insert(const_iterator, lvalue) called with an iterator not"
-        " referring to this unordered container");
-#endif
-    __node_holder __h = __construct_node(__x);
-    iterator __r = __node_insert_multi(__p, __h.get());
-    __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::rehash(size_type __n)
-{
-    if (__n == 1)
-        __n = 2;
-    else if (__n & (__n - 1))
-        __n = __next_prime(__n);
-    size_type __bc = bucket_count();
-    if (__n > __bc)
-        __rehash(__n);
-    else if (__n < __bc)
-    {
-        __n = _VSTD::max<size_type>
-              (
-                  __n,
-                  __is_power2(__bc) ? __next_pow2(size_t(ceil(float(size()) / max_load_factor()))) :
-                                      __next_prime(size_t(ceil(float(size()) / max_load_factor())))
-              );
-        if (__n < __bc)
-            __rehash(__n);
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__rehash(size_type __nbc)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__invalidate_all(this);
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-    __pointer_allocator& __npa = __bucket_list_.get_deleter().__alloc();
-    __bucket_list_.reset(__nbc > 0 ?
-                      __pointer_alloc_traits::allocate(__npa, __nbc) : nullptr);
-    __bucket_list_.get_deleter().size() = __nbc;
-    if (__nbc > 0)
-    {
-        for (size_type __i = 0; __i < __nbc; ++__i)
-            __bucket_list_[__i] = nullptr;
-        __node_pointer __pp(static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())));
-        __node_pointer __cp = __pp->__next_;
-        if (__cp != nullptr)
-        {
-            size_type __chash = __constrain_hash(__cp->__hash_, __nbc);
-            __bucket_list_[__chash] = __pp;
-            size_type __phash = __chash;
-            for (__pp = __cp, __cp = __cp->__next_; __cp != nullptr;
-                                                           __cp = __pp->__next_)
-            {
-                __chash = __constrain_hash(__cp->__hash_, __nbc);
-                if (__chash == __phash)
-                    __pp = __cp;
-                else
-                {
-                    if (__bucket_list_[__chash] == nullptr)
-                    {
-                        __bucket_list_[__chash] = __pp;
-                        __pp = __cp;
-                        __phash = __chash;
-                    }
-                    else
-                    {
-                        __node_pointer __np = __cp;
-                        for (; __np->__next_ != nullptr &&
-                               key_eq()(__cp->__value_, __np->__next_->__value_);
-                                                           __np = __np->__next_)
-                            ;
-                        __pp->__next_ = __np->__next_;
-                        __np->__next_ = __bucket_list_[__chash]->__next_;
-                        __bucket_list_[__chash]->__next_ = __cp;
-
-                    }
-                }
-            }
-        }
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::find(const _Key& __k)
-{
-    size_t __hash = hash_function()(__k);
-    size_type __bc = bucket_count();
-    if (__bc != 0)
-    {
-        size_t __chash = __constrain_hash(__hash, __bc);
-        __node_pointer __nd = __bucket_list_[__chash];
-        if (__nd != nullptr)
-        {
-            for (__nd = __nd->__next_; __nd != nullptr &&
-                                       __constrain_hash(__nd->__hash_, __bc) == __chash;
-                                                           __nd = __nd->__next_)
-            {
-                if (key_eq()(__nd->__value_, __k))
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                    return iterator(__nd, this);
-#else
-                    return iterator(__nd);
-#endif
-            }
-        }
-    }
-    return end();
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::find(const _Key& __k) const
-{
-    size_t __hash = hash_function()(__k);
-    size_type __bc = bucket_count();
-    if (__bc != 0)
-    {
-        size_t __chash = __constrain_hash(__hash, __bc);
-        __node_const_pointer __nd = __bucket_list_[__chash];
-        if (__nd != nullptr)
-        {
-            for (__nd = __nd->__next_; __nd != nullptr &&
-                                           __constrain_hash(__nd->__hash_, __bc) == __chash;
-                                                           __nd = __nd->__next_)
-            {
-                if (key_eq()(__nd->__value_, __k))
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                    return const_iterator(__nd, this);
-#else
-                    return const_iterator(__nd);
-#endif
-            }
-        }
-
-    }
-    return end();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class ..._Args>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__construct_node(_Args&& ...__args)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__value_constructed = true;
-    __h->__hash_ = hash_function()(__h->__value_);
-    __h->__next_ = nullptr;
-    return __h;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__construct_node(value_type&& __v,
-                                                           size_t __hash)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::move(__v));
-    __h.get_deleter().__value_constructed = true;
-    __h->__hash_ = __hash;
-    __h->__next_ = nullptr;
-    return __h;
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__construct_node(const value_type& __v)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), __v);
-    __h.get_deleter().__value_constructed = true;
-    __h->__hash_ = hash_function()(__h->__value_);
-    __h->__next_ = nullptr;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__construct_node(const value_type& __v,
-                                                           size_t __hash)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), __v);
-    __h.get_deleter().__value_constructed = true;
-    __h->__hash_ = __hash;
-    __h->__next_ = nullptr;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::erase(const_iterator __p)
-{
-    __node_pointer __np = __p.__node_;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container erase(iterator) called with an iterator not"
-        " referring to this container");
-    _LIBCPP_ASSERT(__p != end(),
-        "unordered container erase(iterator) called with a non-dereferenceable iterator");
-    iterator __r(__np, this);
-#else
-    iterator __r(__np);
-#endif
-    ++__r;
-    remove(__p);
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::erase(const_iterator __first,
-                                                const_iterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__first) == this,
-        "unodered container::erase(iterator, iterator) called with an iterator not"
-        " referring to this unodered container");
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__last) == this,
-        "unodered container::erase(iterator, iterator) called with an iterator not"
-        " referring to this unodered container");
-#endif
-    for (const_iterator __p = __first; __first != __last; __p = __first)
-    {
-        ++__first;
-        erase(__p);
-    }
-    __node_pointer __np = __last.__node_;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator (__np, this);
-#else
-    return iterator (__np);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__erase_unique(const _Key& __k)
-{
-    iterator __i = find(__k);
-    if (__i == end())
-        return 0;
-    erase(__i);
-    return 1;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__erase_multi(const _Key& __k)
-{
-    size_type __r = 0;
-    iterator __i = find(__k);
-    if (__i != end())
-    {
-        iterator __e = end();
-        do
-        {
-            erase(__i++);
-            ++__r;
-        } while (__i != __e && key_eq()(*__i, __k));
-    }
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::remove(const_iterator __p) _NOEXCEPT
-{
-    // current node
-    __node_pointer __cn = __p.__node_;
-    size_type __bc = bucket_count();
-    size_t __chash = __constrain_hash(__cn->__hash_, __bc);
-    // find previous node
-    __node_pointer __pn = __bucket_list_[__chash];
-    for (; __pn->__next_ != __cn; __pn = __pn->__next_)
-        ;
-    // Fix up __bucket_list_
-        // if __pn is not in same bucket (before begin is not in same bucket) &&
-        //    if __cn->__next_ is not in same bucket (nullptr is not in same bucket)
-    if (__pn == static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()))
-                            || __constrain_hash(__pn->__hash_, __bc) != __chash)
-    {
-        if (__cn->__next_ == nullptr || __constrain_hash(__cn->__next_->__hash_, __bc) != __chash)
-            __bucket_list_[__chash] = nullptr;
-    }
-        // if __cn->__next_ is not in same bucket (nullptr is in same bucket)
-    if (__cn->__next_ != nullptr)
-    {
-        size_t __nhash = __constrain_hash(__cn->__next_->__hash_, __bc);
-        if (__nhash != __chash)
-            __bucket_list_[__nhash] = __pn;
-    }
-    // remove __cn
-    __pn->__next_ = __cn->__next_;
-    __cn->__next_ = nullptr;
-    --size();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    for (__i_node** __p = __c->end_; __p != __c->beg_; )
-    {
-        --__p;
-        iterator* __i = static_cast<iterator*>((*__p)->__i_);
-        if (__i->__node_ == __cn)
-        {
-            (*__p)->__c_ = nullptr;
-            if (--__c->end_ != __p)
-                memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-        }
-    }
-    __get_db()->unlock();
-#endif
-    return __node_holder(__cn, _Dp(__node_alloc(), true));
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__count_unique(const _Key& __k) const
-{
-    return static_cast<size_type>(find(__k) != end());
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__count_multi(const _Key& __k) const
-{
-    size_type __r = 0;
-    const_iterator __i = find(__k);
-    if (__i != end())
-    {
-        const_iterator __e = end();
-        do
-        {
-            ++__i;
-            ++__r;
-        } while (__i != __e && key_eq()(*__i, __k));
-    }
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator,
-     typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__equal_range_unique(
-        const _Key& __k)
-{
-    iterator __i = find(__k);
-    iterator __j = __i;
-    if (__i != end())
-        ++__j;
-    return pair<iterator, iterator>(__i, __j);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator,
-     typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__equal_range_unique(
-        const _Key& __k) const
-{
-    const_iterator __i = find(__k);
-    const_iterator __j = __i;
-    if (__i != end())
-        ++__j;
-    return pair<const_iterator, const_iterator>(__i, __j);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator,
-     typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__equal_range_multi(
-        const _Key& __k)
-{
-    iterator __i = find(__k);
-    iterator __j = __i;
-    if (__i != end())
-    {
-        iterator __e = end();
-        do
-        {
-            ++__j;
-        } while (__j != __e && key_eq()(*__j, __k));
-    }
-    return pair<iterator, iterator>(__i, __j);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator,
-     typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__equal_range_multi(
-        const _Key& __k) const
-{
-    const_iterator __i = find(__k);
-    const_iterator __j = __i;
-    if (__i != end())
-    {
-        const_iterator __e = end();
-        do
-        {
-            ++__j;
-        } while (__j != __e && key_eq()(*__j, __k));
-    }
-    return pair<const_iterator, const_iterator>(__i, __j);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::swap(__hash_table& __u)
-    _NOEXCEPT_(
-        (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value ||
-         __is_nothrow_swappable<__pointer_allocator>::value) &&
-        (!__node_traits::propagate_on_container_swap::value ||
-         __is_nothrow_swappable<__node_allocator>::value) &&
-        __is_nothrow_swappable<hasher>::value &&
-        __is_nothrow_swappable<key_equal>::value)
-{
-    {
-    __node_pointer_pointer __npp = __bucket_list_.release();
-    __bucket_list_.reset(__u.__bucket_list_.release());
-    __u.__bucket_list_.reset(__npp);
-    }
-    _VSTD::swap(__bucket_list_.get_deleter().size(), __u.__bucket_list_.get_deleter().size());
-    __swap_alloc(__bucket_list_.get_deleter().__alloc(),
-             __u.__bucket_list_.get_deleter().__alloc());
-    __swap_alloc(__node_alloc(), __u.__node_alloc());
-    _VSTD::swap(__p1_.first().__next_, __u.__p1_.first().__next_);
-    __p2_.swap(__u.__p2_);
-    __p3_.swap(__u.__p3_);
-    if (size() > 0)
-        __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-    if (__u.size() > 0)
-        __u.__bucket_list_[__constrain_hash(__u.__p1_.first().__next_->__hash_, __u.bucket_count())] =
-            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__u.__p1_.first()));
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::bucket_size(size_type __n) const
-{
-    _LIBCPP_ASSERT(__n < bucket_count(),
-        "unordered container::bucket_size(n) called with n >= bucket_count()");
-    __node_const_pointer __np = __bucket_list_[__n];
-    size_type __bc = bucket_count();
-    size_type __r = 0;
-    if (__np != nullptr)
-    {
-        for (__np = __np->__next_; __np != nullptr &&
-                                   __constrain_hash(__np->__hash_, __bc) == __n;
-                                                    __np = __np->__next_, ++__r)
-            ;
-    }
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__hash_table<_Tp, _Hash, _Equal, _Alloc>& __x,
-     __hash_table<_Tp, _Hash, _Equal, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-bool
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__dereferenceable(const const_iterator* __i) const
-{
-    return __i->__node_ != nullptr;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-bool
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__decrementable(const const_iterator*) const
-{
-    return false;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-bool
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__addable(const const_iterator*, ptrdiff_t) const
-{
-    return false;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-bool
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__subscriptable(const const_iterator*, ptrdiff_t) const
-{
-    return false;
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP__HASH_TABLE
diff --git a/include.new/c++/v1/__locale b/include.new/c++/v1/__locale
deleted file mode 100644
index 0097fc2..0000000
--- a/include.new/c++/v1/__locale
+++ /dev/null
@@ -1,1463 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___LOCALE
-#define _LIBCPP___LOCALE
-
-#include <__config>
-#include <string>
-#include <memory>
-#include <utility>
-#include <mutex>
-#include <cstdint>
-#include <cctype>
-#include <locale.h>
-#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-# include <support/win32/locale_win32.h>
-#elif defined(_AIX)
-# include <support/ibm/xlocale.h>
-#elif defined(__ANDROID__)
-// Android gained the locale aware functions in L (API level 21)
-# include <android/api-level.h>
-# if __ANDROID_API__ <= 20
-#  include <support/android/locale_bionic.h>
-# endif
-#elif defined(__sun__)
-# include <support/solaris/xlocale.h>
-#elif defined(_NEWLIB_VERSION)
-# include <support/newlib/xlocale.h>
-#elif (defined(__GLIBC__) || defined(__APPLE__)      || defined(__FreeBSD__) \
-    || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
-# include <xlocale.h>
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS locale;
-
-template <class _Facet>
-_LIBCPP_INLINE_VISIBILITY
-bool
-has_facet(const locale&) _NOEXCEPT;
-
-template <class _Facet>
-_LIBCPP_INLINE_VISIBILITY
-const _Facet&
-use_facet(const locale&);
-
-class _LIBCPP_TYPE_VIS locale
-{
-public:
-    // types:
-    class _LIBCPP_TYPE_VIS facet;
-    class _LIBCPP_TYPE_VIS id;
-
-    typedef int category;
-    static const category // values assigned here are for exposition only
-        none     = 0,
-        collate  = LC_COLLATE_MASK,
-        ctype    = LC_CTYPE_MASK,
-        monetary = LC_MONETARY_MASK,
-        numeric  = LC_NUMERIC_MASK,
-        time     = LC_TIME_MASK,
-        messages = LC_MESSAGES_MASK,
-        all = collate | ctype | monetary | numeric | time | messages;
-
-    // construct/copy/destroy:
-    locale()  _NOEXCEPT;
-    locale(const locale&)  _NOEXCEPT;
-    explicit locale(const char*);
-    explicit locale(const string&);
-    locale(const locale&, const char*, category);
-    locale(const locale&, const string&, category);
-    template <class _Facet>
-        _LIBCPP_INLINE_VISIBILITY locale(const locale&, _Facet*);
-    locale(const locale&, const locale&, category);
-
-    ~locale();
-
-    const locale& operator=(const locale&)  _NOEXCEPT;
-
-    template <class _Facet> locale combine(const locale&) const;
-
-    // locale operations:
-    string name() const;
-    bool operator==(const locale&) const;
-    bool operator!=(const locale& __y) const {return !(*this == __y);}
-    template <class _CharT, class _Traits, class _Allocator>
-      bool operator()(const basic_string<_CharT, _Traits, _Allocator>&,
-                      const basic_string<_CharT, _Traits, _Allocator>&) const;
-
-    // global locale objects:
-    static locale global(const locale&);
-    static const locale& classic();
-
-private:
-    class __imp;
-    __imp* __locale_;
-
-    void __install_ctor(const locale&, facet*, long);
-    static locale& __global();
-    bool has_facet(id&) const;
-    const facet* use_facet(id&) const;
-
-    template <class _Facet> friend bool has_facet(const locale&)  _NOEXCEPT;
-    template <class _Facet> friend const _Facet& use_facet(const locale&);
-};
-
-class _LIBCPP_TYPE_VIS locale::facet
-    : public __shared_count
-{
-protected:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit facet(size_t __refs = 0)
-        : __shared_count(static_cast<long>(__refs)-1) {}
-
-    virtual ~facet();
-
-//    facet(const facet&) = delete;     // effectively done in __shared_count
-//    void operator=(const facet&) = delete;
-private:
-    virtual void __on_zero_shared() _NOEXCEPT;
-};
-
-class _LIBCPP_TYPE_VIS locale::id
-{
-    once_flag      __flag_;
-    int32_t        __id_;
-
-    static int32_t __next_id;
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR id() :__id_(0) {}
-private:
-    void __init();
-    void operator=(const id&); // = delete;
-    id(const id&); // = delete;
-public:  // only needed for tests
-    long __get();
-
-    friend class locale;
-    friend class locale::__imp;
-};
-
-template <class _Facet>
-inline _LIBCPP_INLINE_VISIBILITY
-locale::locale(const locale& __other, _Facet* __f)
-{
-    __install_ctor(__other, __f, __f ? __f->id.__get() : 0);
-}
-
-template <class _Facet>
-locale
-locale::combine(const locale& __other) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!_VSTD::has_facet<_Facet>(__other))
-        throw runtime_error("locale::combine: locale missing facet");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return locale(*this, &const_cast<_Facet&>(_VSTD::use_facet<_Facet>(__other)));
-}
-
-template <class _Facet>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-has_facet(const locale& __l)  _NOEXCEPT
-{
-    return __l.has_facet(_Facet::id);
-}
-
-template <class _Facet>
-inline _LIBCPP_INLINE_VISIBILITY
-const _Facet&
-use_facet(const locale& __l)
-{
-    return static_cast<const _Facet&>(*__l.use_facet(_Facet::id));
-}
-
-// template <class _CharT> class collate;
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY collate
-    : public locale::facet
-{
-public:
-    typedef _CharT char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit collate(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const char_type* __lo1, const char_type* __hi1,
-                const char_type* __lo2, const char_type* __hi2) const
-    {
-        return do_compare(__lo1, __hi1, __lo2, __hi2);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    string_type transform(const char_type* __lo, const char_type* __hi) const
-    {
-        return do_transform(__lo, __hi);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    long hash(const char_type* __lo, const char_type* __hi) const
-    {
-        return do_hash(__lo, __hi);
-    }
-
-    static locale::id id;
-
-protected:
-    ~collate();
-    virtual int do_compare(const char_type* __lo1, const char_type* __hi1,
-                           const char_type* __lo2, const char_type* __hi2) const;
-    virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const
-        {return string_type(__lo, __hi);}
-    virtual long do_hash(const char_type* __lo, const char_type* __hi) const;
-};
-
-template <class _CharT> locale::id collate<_CharT>::id;
-
-template <class _CharT>
-collate<_CharT>::~collate()
-{
-}
-
-template <class _CharT>
-int
-collate<_CharT>::do_compare(const char_type* __lo1, const char_type* __hi1,
-                            const char_type* __lo2, const char_type* __hi2) const
-{
-    for (; __lo2 != __hi2; ++__lo1, ++__lo2)
-    {
-        if (__lo1 == __hi1 || *__lo1 < *__lo2)
-            return -1;
-        if (*__lo2 < *__lo1)
-            return 1;
-    }
-    return __lo1 != __hi1;
-}
-
-template <class _CharT>
-long
-collate<_CharT>::do_hash(const char_type* __lo, const char_type* __hi) const
-{
-    size_t __h = 0;
-    const size_t __sr = __CHAR_BIT__ * sizeof(size_t) - 8;
-    const size_t __mask = size_t(0xF) << (__sr + 4);
-    for(const char_type* __p = __lo; __p != __hi; ++__p)
-    {
-        __h = (__h << 4) + static_cast<size_t>(*__p);
-        size_t __g = __h & __mask;
-        __h ^= __g | (__g >> __sr);
-    }
-    return static_cast<long>(__h);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS collate<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS collate<wchar_t>)
-
-// template <class CharT> class collate_byname;
-
-template <class _CharT> class _LIBCPP_TYPE_VIS_ONLY collate_byname;
-
-template <>
-class _LIBCPP_TYPE_VIS collate_byname<char>
-    : public collate<char>
-{
-    locale_t __l;
-public:
-    typedef char char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit collate_byname(const char* __n, size_t __refs = 0);
-    explicit collate_byname(const string& __n, size_t __refs = 0);
-
-protected:
-    ~collate_byname();
-    virtual int do_compare(const char_type* __lo1, const char_type* __hi1,
-                           const char_type* __lo2, const char_type* __hi2) const;
-    virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const;
-};
-
-template <>
-class _LIBCPP_TYPE_VIS collate_byname<wchar_t>
-    : public collate<wchar_t>
-{
-    locale_t __l;
-public:
-    typedef wchar_t char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit collate_byname(const char* __n, size_t __refs = 0);
-    explicit collate_byname(const string& __n, size_t __refs = 0);
-
-protected:
-    ~collate_byname();
-
-    virtual int do_compare(const char_type* __lo1, const char_type* __hi1,
-                           const char_type* __lo2, const char_type* __hi2) const;
-    virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const;
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-bool
-locale::operator()(const basic_string<_CharT, _Traits, _Allocator>& __x,
-                   const basic_string<_CharT, _Traits, _Allocator>& __y) const
-{
-    return _VSTD::use_facet<_VSTD::collate<_CharT> >(*this).compare(
-                                       __x.data(), __x.data() + __x.size(),
-                                       __y.data(), __y.data() + __y.size()) < 0;
-}
-
-// template <class charT> class ctype
-
-class _LIBCPP_TYPE_VIS ctype_base
-{
-public:
-#ifdef __GLIBC__
-    typedef unsigned short mask;
-    static const mask space  = _ISspace;
-    static const mask print  = _ISprint;
-    static const mask cntrl  = _IScntrl;
-    static const mask upper  = _ISupper;
-    static const mask lower  = _ISlower;
-    static const mask alpha  = _ISalpha;
-    static const mask digit  = _ISdigit;
-    static const mask punct  = _ISpunct;
-    static const mask xdigit = _ISxdigit;
-    static const mask blank  = _ISblank;
-#elif defined(_WIN32)
-    typedef unsigned short mask;
-    static const mask space  = _SPACE;
-    static const mask print  = _BLANK|_PUNCT|_ALPHA|_DIGIT;
-    static const mask cntrl  = _CONTROL;
-    static const mask upper  = _UPPER;
-    static const mask lower  = _LOWER;
-    static const mask alpha  = _ALPHA;
-    static const mask digit  = _DIGIT;
-    static const mask punct  = _PUNCT;
-    static const mask xdigit = _HEX;
-    static const mask blank  = _BLANK;
-#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__) || defined(__ANDROID__)
-#ifdef __APPLE__
-    typedef __uint32_t mask;
-#elif defined(__FreeBSD__)
-    typedef unsigned long mask;
-#elif defined(__EMSCRIPTEN__) ||  defined(__NetBSD__)
-    typedef unsigned short mask;
-#elif defined(__ANDROID__)
-    typedef unsigned char mask;
-#endif
-    static const mask space  = _CTYPE_S;
-    static const mask print  = _CTYPE_R;
-    static const mask cntrl  = _CTYPE_C;
-    static const mask upper  = _CTYPE_U;
-    static const mask lower  = _CTYPE_L;
-    static const mask alpha  = _CTYPE_A;
-    static const mask digit  = _CTYPE_D;
-    static const mask punct  = _CTYPE_P;
-# if defined(__ANDROID__)
-    static const mask xdigit = _CTYPE_X | _CTYPE_D;
-# else
-    static const mask xdigit = _CTYPE_X;
-# endif
-
-# if defined(__NetBSD__)
-    static const mask blank  = _CTYPE_BL;
-# else
-    static const mask blank  = _CTYPE_B;
-# endif
-#elif defined(__sun__) || defined(_AIX)
-    typedef unsigned int mask;
-    static const mask space  = _ISSPACE;
-    static const mask print  = _ISPRINT;
-    static const mask cntrl  = _ISCNTRL;
-    static const mask upper  = _ISUPPER;
-    static const mask lower  = _ISLOWER;
-    static const mask alpha  = _ISALPHA;
-    static const mask digit  = _ISDIGIT;
-    static const mask punct  = _ISPUNCT;
-    static const mask xdigit = _ISXDIGIT;
-    static const mask blank  = _ISBLANK;
-#else  // __GLIBC__ || _WIN32 || __APPLE__ || __FreeBSD__ || __EMSCRIPTEN__ || __sun__
-    typedef unsigned long mask;
-    static const mask space  = 1<<0;
-    static const mask print  = 1<<1;
-    static const mask cntrl  = 1<<2;
-    static const mask upper  = 1<<3;
-    static const mask lower  = 1<<4;
-    static const mask alpha  = 1<<5;
-    static const mask digit  = 1<<6;
-    static const mask punct  = 1<<7;
-    static const mask xdigit = 1<<8;
-    static const mask blank  = 1<<9;
-#endif  // __GLIBC__ || _WIN32 || __APPLE__ || __FreeBSD__
-    static const mask alnum  = alpha | digit;
-    static const mask graph  = alnum | punct;
-
-    _LIBCPP_ALWAYS_INLINE ctype_base() {}
-};
-
-template <class _CharT> class _LIBCPP_TYPE_VIS_ONLY ctype;
-
-template <>
-class _LIBCPP_TYPE_VIS ctype<wchar_t>
-    : public locale::facet,
-      public ctype_base
-{
-public:
-    typedef wchar_t char_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit ctype(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    bool is(mask __m, char_type __c) const
-    {
-        return do_is(__m, __c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* is(const char_type* __low, const char_type* __high, mask* __vec) const
-    {
-        return do_is(__low, __high, __vec);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* scan_is(mask __m, const char_type* __low, const char_type* __high) const
-    {
-        return do_scan_is(__m, __low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* scan_not(mask __m, const char_type* __low, const char_type* __high) const
-    {
-        return do_scan_not(__m, __low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type toupper(char_type __c) const
-    {
-        return do_toupper(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* toupper(char_type* __low, const char_type* __high) const
-    {
-        return do_toupper(__low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type tolower(char_type __c) const
-    {
-        return do_tolower(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* tolower(char_type* __low, const char_type* __high) const
-    {
-        return do_tolower(__low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type widen(char __c) const
-    {
-        return do_widen(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char* widen(const char* __low, const char* __high, char_type* __to) const
-    {
-        return do_widen(__low, __high, __to);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char narrow(char_type __c, char __dfault) const
-    {
-        return do_narrow(__c, __dfault);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* narrow(const char_type* __low, const char_type* __high, char __dfault, char* __to) const
-    {
-        return do_narrow(__low, __high, __dfault, __to);
-    }
-
-    static locale::id id;
-
-protected:
-    ~ctype();
-    virtual bool do_is(mask __m, char_type __c) const;
-    virtual const char_type* do_is(const char_type* __low, const char_type* __high, mask* __vec) const;
-    virtual const char_type* do_scan_is(mask __m, const char_type* __low, const char_type* __high) const;
-    virtual const char_type* do_scan_not(mask __m, const char_type* __low, const char_type* __high) const;
-    virtual char_type do_toupper(char_type) const;
-    virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;
-    virtual char_type do_tolower(char_type) const;
-    virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;
-    virtual char_type do_widen(char) const;
-    virtual const char* do_widen(const char* __low, const char* __high, char_type* __dest) const;
-    virtual char do_narrow(char_type, char __dfault) const;
-    virtual const char_type* do_narrow(const char_type* __low, const char_type* __high, char __dfault, char* __dest) const;
-};
-
-template <>
-class _LIBCPP_TYPE_VIS ctype<char>
-    : public locale::facet, public ctype_base
-{
-    const mask* __tab_;
-    bool        __del_;
-public:
-    typedef char char_type;
-
-    explicit ctype(const mask* __tab = 0, bool __del = false, size_t __refs = 0);
-
-    _LIBCPP_ALWAYS_INLINE
-    bool is(mask __m, char_type __c) const
-    {
-        return isascii(__c) ? (__tab_[static_cast<int>(__c)] & __m) !=0 : false;
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* is(const char_type* __low, const char_type* __high, mask* __vec) const
-    {
-        for (; __low != __high; ++__low, ++__vec)
-            *__vec = isascii(*__low) ? __tab_[static_cast<int>(*__low)] : 0;
-        return __low;
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* scan_is (mask __m, const char_type* __low, const char_type* __high) const
-    {
-        for (; __low != __high; ++__low)
-            if (isascii(*__low) && (__tab_[static_cast<int>(*__low)] & __m))
-                break;
-        return __low;
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* scan_not(mask __m, const char_type* __low, const char_type* __high) const
-    {
-        for (; __low != __high; ++__low)
-            if (!(isascii(*__low) && (__tab_[static_cast<int>(*__low)] & __m)))
-                break;
-        return __low;
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type toupper(char_type __c) const
-    {
-        return do_toupper(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* toupper(char_type* __low, const char_type* __high) const
-    {
-        return do_toupper(__low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type tolower(char_type __c) const
-    {
-        return do_tolower(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* tolower(char_type* __low, const char_type* __high) const
-    {
-        return do_tolower(__low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type widen(char __c) const
-    {
-        return do_widen(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char* widen(const char* __low, const char* __high, char_type* __to) const
-    {
-        return do_widen(__low, __high, __to);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char narrow(char_type __c, char __dfault) const
-    {
-        return do_narrow(__c, __dfault);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char* narrow(const char_type* __low, const char_type* __high, char __dfault, char* __to) const
-    {
-        return do_narrow(__low, __high, __dfault, __to);
-    }
-
-    static locale::id id;
-
-#ifdef _CACHED_RUNES
-    static const size_t table_size = _CACHED_RUNES;
-#else
-    static const size_t table_size = 256;  // FIXME: Don't hardcode this.
-#endif
-    _LIBCPP_ALWAYS_INLINE const mask* table() const  _NOEXCEPT {return __tab_;}
-    static const mask* classic_table()  _NOEXCEPT;
-#if defined(__GLIBC__) || defined(__EMSCRIPTEN__)
-    static const int* __classic_upper_table() _NOEXCEPT;
-    static const int* __classic_lower_table() _NOEXCEPT;
-#endif
-#if defined(__NetBSD__)
-    static const short* __classic_upper_table() _NOEXCEPT;
-    static const short* __classic_lower_table() _NOEXCEPT;
-#endif
-
-protected:
-    ~ctype();
-    virtual char_type do_toupper(char_type __c) const;
-    virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;
-    virtual char_type do_tolower(char_type __c) const;
-    virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;
-    virtual char_type do_widen(char __c) const;
-    virtual const char* do_widen(const char* __low, const char* __high, char_type* __to) const;
-    virtual char do_narrow(char_type __c, char __dfault) const;
-    virtual const char* do_narrow(const char_type* __low, const char_type* __high, char __dfault, char* __to) const;
-};
-
-// template <class CharT> class ctype_byname;
-
-template <class _CharT> class _LIBCPP_TYPE_VIS_ONLY ctype_byname;
-
-template <>
-class _LIBCPP_TYPE_VIS ctype_byname<char>
-    : public ctype<char>
-{
-    locale_t __l;
-
-public:
-    explicit ctype_byname(const char*, size_t = 0);
-    explicit ctype_byname(const string&, size_t = 0);
-
-protected:
-    ~ctype_byname();
-    virtual char_type do_toupper(char_type) const;
-    virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;
-    virtual char_type do_tolower(char_type) const;
-    virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;
-};
-
-template <>
-class _LIBCPP_TYPE_VIS ctype_byname<wchar_t>
-    : public ctype<wchar_t>
-{
-    locale_t __l;
-
-public:
-    explicit ctype_byname(const char*, size_t = 0);
-    explicit ctype_byname(const string&, size_t = 0);
-
-protected:
-    ~ctype_byname();
-    virtual bool do_is(mask __m, char_type __c) const;
-    virtual const char_type* do_is(const char_type* __low, const char_type* __high, mask* __vec) const;
-    virtual const char_type* do_scan_is(mask __m, const char_type* __low, const char_type* __high) const;
-    virtual const char_type* do_scan_not(mask __m, const char_type* __low, const char_type* __high) const;
-    virtual char_type do_toupper(char_type) const;
-    virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;
-    virtual char_type do_tolower(char_type) const;
-    virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;
-    virtual char_type do_widen(char) const;
-    virtual const char* do_widen(const char* __low, const char* __high, char_type* __dest) const;
-    virtual char do_narrow(char_type, char __dfault) const;
-    virtual const char_type* do_narrow(const char_type* __low, const char_type* __high, char __dfault, char* __dest) const;
-};
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isspace(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::space, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isprint(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-iscntrl(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::cntrl, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isupper(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::upper, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-islower(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::lower, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isalpha(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alpha, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isdigit(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::digit, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ispunct(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::punct, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isxdigit(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::xdigit, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isalnum(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alnum, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isgraph(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::graph, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-toupper(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).toupper(__c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-tolower(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).tolower(__c);
-}
-
-// codecvt_base
-
-class _LIBCPP_TYPE_VIS codecvt_base
-{
-public:
-    _LIBCPP_ALWAYS_INLINE codecvt_base() {}
-    enum result {ok, partial, error, noconv};
-};
-
-// template <class internT, class externT, class stateT> class codecvt;
-
-template <class _InternT, class _ExternT, class _StateT> class _LIBCPP_TYPE_VIS_ONLY codecvt;
-
-// template <> class codecvt<char, char, mbstate_t>
-
-template <>
-class _LIBCPP_TYPE_VIS codecvt<char, char, mbstate_t>
-    : public locale::facet,
-      public codecvt_base
-{
-public:
-    typedef char      intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    result out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_out(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_unshift(__st, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const
-    {
-        return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int encoding() const  _NOEXCEPT
-    {
-        return do_encoding();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    bool always_noconv() const  _NOEXCEPT
-    {
-        return do_always_noconv();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const
-    {
-        return do_length(__st, __frm, __end, __mx);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int max_length() const  _NOEXCEPT
-    {
-        return do_max_length();
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(const char*, size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    ~codecvt();
-
-    virtual result do_out(state_type& __st,
-                          const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-                          extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result do_in(state_type& __st,
-                         const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-                         intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result do_unshift(state_type& __st,
-                              extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const  _NOEXCEPT;
-    virtual bool do_always_noconv() const  _NOEXCEPT;
-    virtual int do_length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const;
-    virtual int do_max_length() const  _NOEXCEPT;
-};
-
-// template <> class codecvt<wchar_t, char, mbstate_t>
-
-template <>
-class _LIBCPP_TYPE_VIS codecvt<wchar_t, char, mbstate_t>
-    : public locale::facet,
-      public codecvt_base
-{
-    locale_t __l;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    explicit codecvt(size_t __refs = 0);
-
-    _LIBCPP_ALWAYS_INLINE
-    result out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_out(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_unshift(__st, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const
-    {
-        return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int encoding() const  _NOEXCEPT
-    {
-        return do_encoding();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    bool always_noconv() const  _NOEXCEPT
-    {
-        return do_always_noconv();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const
-    {
-        return do_length(__st, __frm, __end, __mx);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int max_length() const  _NOEXCEPT
-    {
-        return do_max_length();
-    }
-
-    static locale::id id;
-
-protected:
-    explicit codecvt(const char*, size_t __refs = 0);
-
-    ~codecvt();
-
-    virtual result do_out(state_type& __st,
-                          const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-                          extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result do_in(state_type& __st,
-                         const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-                         intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result do_unshift(state_type& __st,
-                              extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const  _NOEXCEPT;
-    virtual bool do_always_noconv() const  _NOEXCEPT;
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const;
-    virtual int do_max_length() const  _NOEXCEPT;
-};
-
-// template <> class codecvt<char16_t, char, mbstate_t>
-
-template <>
-class _LIBCPP_TYPE_VIS codecvt<char16_t, char, mbstate_t>
-    : public locale::facet,
-      public codecvt_base
-{
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    result out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_out(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_unshift(__st, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const
-    {
-        return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int encoding() const  _NOEXCEPT
-    {
-        return do_encoding();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    bool always_noconv() const  _NOEXCEPT
-    {
-        return do_always_noconv();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const
-    {
-        return do_length(__st, __frm, __end, __mx);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int max_length() const  _NOEXCEPT
-    {
-        return do_max_length();
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(const char*, size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    ~codecvt();
-
-    virtual result do_out(state_type& __st,
-                          const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-                          extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result do_in(state_type& __st,
-                         const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-                         intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result do_unshift(state_type& __st,
-                              extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const  _NOEXCEPT;
-    virtual bool do_always_noconv() const  _NOEXCEPT;
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const;
-    virtual int do_max_length() const  _NOEXCEPT;
-};
-
-// template <> class codecvt<char32_t, char, mbstate_t>
-
-template <>
-class _LIBCPP_TYPE_VIS codecvt<char32_t, char, mbstate_t>
-    : public locale::facet,
-      public codecvt_base
-{
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    result out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_out(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_unshift(__st, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const
-    {
-        return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int encoding() const  _NOEXCEPT
-    {
-        return do_encoding();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    bool always_noconv() const  _NOEXCEPT
-    {
-        return do_always_noconv();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const
-    {
-        return do_length(__st, __frm, __end, __mx);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int max_length() const  _NOEXCEPT
-    {
-        return do_max_length();
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(const char*, size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    ~codecvt();
-
-    virtual result do_out(state_type& __st,
-                          const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-                          extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result do_in(state_type& __st,
-                         const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-                         intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result do_unshift(state_type& __st,
-                              extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const  _NOEXCEPT;
-    virtual bool do_always_noconv() const  _NOEXCEPT;
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const;
-    virtual int do_max_length() const  _NOEXCEPT;
-};
-
-// template <class _InternT, class _ExternT, class _StateT> class codecvt_byname
-
-template <class _InternT, class _ExternT, class _StateT>
-class _LIBCPP_TYPE_VIS_ONLY codecvt_byname
-    : public codecvt<_InternT, _ExternT, _StateT>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_byname(const char* __nm, size_t __refs = 0)
-        : codecvt<_InternT, _ExternT, _StateT>(__nm, __refs) {}
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_byname(const string& __nm, size_t __refs = 0)
-        : codecvt<_InternT, _ExternT, _StateT>(__nm.c_str(), __refs) {}
-protected:
-    ~codecvt_byname();
-};
-
-template <class _InternT, class _ExternT, class _StateT>
-codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname()
-{
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS codecvt_byname<char, char, mbstate_t>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS codecvt_byname<wchar_t, char, mbstate_t>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS codecvt_byname<char16_t, char, mbstate_t>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS codecvt_byname<char32_t, char, mbstate_t>)
-
-_LIBCPP_FUNC_VIS void __throw_runtime_error(const char*);
-
-template <size_t _Np>
-struct __narrow_to_utf8
-{
-    template <class _OutputIterator, class _CharT>
-    _OutputIterator
-    operator()(_OutputIterator __s, const _CharT* __wb, const _CharT* __we) const;
-};
-
-template <>
-struct __narrow_to_utf8<8>
-{
-    template <class _OutputIterator, class _CharT>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const _CharT* __wb, const _CharT* __we) const
-    {
-        for (; __wb < __we; ++__wb, ++__s)
-            *__s = *__wb;
-        return __s;
-    }
-};
-
-template <>
-struct __narrow_to_utf8<16>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    _LIBCPP_ALWAYS_INLINE
-    __narrow_to_utf8() : codecvt<char16_t, char, mbstate_t>(1) {}
-
-    ~__narrow_to_utf8();
-
-    template <class _OutputIterator, class _CharT>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const _CharT* __wb, const _CharT* __we) const
-    {
-        result __r = ok;
-        mbstate_t __mb;
-        while (__wb < __we && __r != error)
-        {
-            const int __sz = 32;
-            char __buf[__sz];
-            char* __bn;
-            const char16_t* __wn = (const char16_t*)__wb;
-            __r = do_out(__mb, (const char16_t*)__wb, (const char16_t*)__we, __wn,
-                         __buf, __buf+__sz, __bn);
-            if (__r == codecvt_base::error || __wn == (const char16_t*)__wb)
-                __throw_runtime_error("locale not supported");
-            for (const char* __p = __buf; __p < __bn; ++__p, ++__s)
-                *__s = *__p;
-            __wb = (const _CharT*)__wn;
-        }
-        return __s;
-    }
-};
-
-template <>
-struct __narrow_to_utf8<32>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    _LIBCPP_ALWAYS_INLINE
-    __narrow_to_utf8() : codecvt<char32_t, char, mbstate_t>(1) {}
-
-    ~__narrow_to_utf8();
-
-    template <class _OutputIterator, class _CharT>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const _CharT* __wb, const _CharT* __we) const
-    {
-        result __r = ok;
-        mbstate_t __mb;
-        while (__wb < __we && __r != error)
-        {
-            const int __sz = 32;
-            char __buf[__sz];
-            char* __bn;
-            const char32_t* __wn = (const char32_t*)__wb;
-            __r = do_out(__mb, (const char32_t*)__wb, (const char32_t*)__we, __wn,
-                         __buf, __buf+__sz, __bn);
-            if (__r == codecvt_base::error || __wn == (const char32_t*)__wb)
-                __throw_runtime_error("locale not supported");
-            for (const char* __p = __buf; __p < __bn; ++__p, ++__s)
-                *__s = *__p;
-            __wb = (const _CharT*)__wn;
-        }
-        return __s;
-    }
-};
-
-template <size_t _Np>
-struct __widen_from_utf8
-{
-    template <class _OutputIterator>
-    _OutputIterator
-    operator()(_OutputIterator __s, const char* __nb, const char* __ne) const;
-};
-
-template <>
-struct __widen_from_utf8<8>
-{
-    template <class _OutputIterator>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const char* __nb, const char* __ne) const
-    {
-        for (; __nb < __ne; ++__nb, ++__s)
-            *__s = *__nb;
-        return __s;
-    }
-};
-
-template <>
-struct __widen_from_utf8<16>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    _LIBCPP_ALWAYS_INLINE
-    __widen_from_utf8() : codecvt<char16_t, char, mbstate_t>(1) {}
-
-    ~__widen_from_utf8();
-
-    template <class _OutputIterator>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const char* __nb, const char* __ne) const
-    {
-        result __r = ok;
-        mbstate_t __mb;
-        while (__nb < __ne && __r != error)
-        {
-            const int __sz = 32;
-            char16_t __buf[__sz];
-            char16_t* __bn;
-            const char* __nn = __nb;
-            __r = do_in(__mb, __nb, __ne - __nb > __sz ? __nb+__sz : __ne, __nn,
-                        __buf, __buf+__sz, __bn);
-            if (__r == codecvt_base::error || __nn == __nb)
-                __throw_runtime_error("locale not supported");
-            for (const char16_t* __p = __buf; __p < __bn; ++__p, ++__s)
-                *__s = (wchar_t)*__p;
-            __nb = __nn;
-        }
-        return __s;
-    }
-};
-
-template <>
-struct __widen_from_utf8<32>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    _LIBCPP_ALWAYS_INLINE
-    __widen_from_utf8() : codecvt<char32_t, char, mbstate_t>(1) {}
-
-    ~__widen_from_utf8();
-
-    template <class _OutputIterator>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const char* __nb, const char* __ne) const
-    {
-        result __r = ok;
-        mbstate_t __mb;
-        while (__nb < __ne && __r != error)
-        {
-            const int __sz = 32;
-            char32_t __buf[__sz];
-            char32_t* __bn;
-            const char* __nn = __nb;
-            __r = do_in(__mb, __nb, __ne - __nb > __sz ? __nb+__sz : __ne, __nn,
-                        __buf, __buf+__sz, __bn);
-            if (__r == codecvt_base::error || __nn == __nb)
-                __throw_runtime_error("locale not supported");
-            for (const char32_t* __p = __buf; __p < __bn; ++__p, ++__s)
-                *__s = (wchar_t)*__p;
-            __nb = __nn;
-        }
-        return __s;
-    }
-};
-
-// template <class charT> class numpunct
-
-template <class _CharT> class _LIBCPP_TYPE_VIS_ONLY numpunct;
-
-template <>
-class _LIBCPP_TYPE_VIS numpunct<char>
-    : public locale::facet
-{
-public:
-    typedef char char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit numpunct(size_t __refs = 0);
-
-    _LIBCPP_ALWAYS_INLINE char_type decimal_point() const {return do_decimal_point();}
-    _LIBCPP_ALWAYS_INLINE char_type thousands_sep() const {return do_thousands_sep();}
-    _LIBCPP_ALWAYS_INLINE string grouping() const         {return do_grouping();}
-    _LIBCPP_ALWAYS_INLINE string_type truename() const    {return do_truename();}
-    _LIBCPP_ALWAYS_INLINE string_type falsename() const   {return do_falsename();}
-
-    static locale::id id;
-
-protected:
-    ~numpunct();
-    virtual char_type do_decimal_point() const;
-    virtual char_type do_thousands_sep() const;
-    virtual string do_grouping() const;
-    virtual string_type do_truename() const;
-    virtual string_type do_falsename() const;
-
-    char_type __decimal_point_;
-    char_type __thousands_sep_;
-    string __grouping_;
-};
-
-template <>
-class _LIBCPP_TYPE_VIS numpunct<wchar_t>
-    : public locale::facet
-{
-public:
-    typedef wchar_t char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit numpunct(size_t __refs = 0);
-
-    _LIBCPP_ALWAYS_INLINE char_type decimal_point() const {return do_decimal_point();}
-    _LIBCPP_ALWAYS_INLINE char_type thousands_sep() const {return do_thousands_sep();}
-    _LIBCPP_ALWAYS_INLINE string grouping() const         {return do_grouping();}
-    _LIBCPP_ALWAYS_INLINE string_type truename() const    {return do_truename();}
-    _LIBCPP_ALWAYS_INLINE string_type falsename() const   {return do_falsename();}
-
-    static locale::id id;
-
-protected:
-    ~numpunct();
-    virtual char_type do_decimal_point() const;
-    virtual char_type do_thousands_sep() const;
-    virtual string do_grouping() const;
-    virtual string_type do_truename() const;
-    virtual string_type do_falsename() const;
-
-    char_type __decimal_point_;
-    char_type __thousands_sep_;
-    string __grouping_;
-};
-
-// template <class charT> class numpunct_byname
-
-template <class charT> class _LIBCPP_TYPE_VIS_ONLY numpunct_byname;
-
-template <>
-class _LIBCPP_TYPE_VIS numpunct_byname<char>
-: public numpunct<char>
-{
-public:
-    typedef char char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit numpunct_byname(const char* __nm, size_t __refs = 0);
-    explicit numpunct_byname(const string& __nm, size_t __refs = 0);
-
-protected:
-    ~numpunct_byname();
-
-private:
-    void __init(const char*);
-};
-
-template <>
-class _LIBCPP_TYPE_VIS numpunct_byname<wchar_t>
-: public numpunct<wchar_t>
-{
-public:
-    typedef wchar_t char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit numpunct_byname(const char* __nm, size_t __refs = 0);
-    explicit numpunct_byname(const string& __nm, size_t __refs = 0);
-
-protected:
-    ~numpunct_byname();
-
-private:
-    void __init(const char*);
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___LOCALE
diff --git a/include.new/c++/v1/__mutex_base b/include.new/c++/v1/__mutex_base
deleted file mode 100644
index d5ece7c..0000000
--- a/include.new/c++/v1/__mutex_base
+++ /dev/null
@@ -1,407 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___MUTEX_BASE
-#define _LIBCPP___MUTEX_BASE
-
-#include <__config>
-#include <chrono>
-#include <system_error>
-#include <pthread.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_THREADS
-
-class _LIBCPP_TYPE_VIS mutex
-{
-    pthread_mutex_t __m_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
-     constexpr mutex() _NOEXCEPT : __m_(PTHREAD_MUTEX_INITIALIZER) {}
-#else
-     mutex() _NOEXCEPT {__m_ = (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER;}
-#endif
-     ~mutex();
-
-private:
-    mutex(const mutex&);// = delete;
-    mutex& operator=(const mutex&);// = delete;
-
-public:
-    void lock();
-    bool try_lock() _NOEXCEPT;
-    void unlock() _NOEXCEPT;
-
-    typedef pthread_mutex_t* native_handle_type;
-    _LIBCPP_INLINE_VISIBILITY native_handle_type native_handle() {return &__m_;}
-};
-
-struct _LIBCPP_TYPE_VIS defer_lock_t {};
-struct _LIBCPP_TYPE_VIS try_to_lock_t {};
-struct _LIBCPP_TYPE_VIS adopt_lock_t {};
-
-#if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_MUTEX)
-
-extern const defer_lock_t  defer_lock;
-extern const try_to_lock_t try_to_lock;
-extern const adopt_lock_t  adopt_lock;
-
-#else
-
-constexpr defer_lock_t  defer_lock  = defer_lock_t();
-constexpr try_to_lock_t try_to_lock = try_to_lock_t();
-constexpr adopt_lock_t  adopt_lock  = adopt_lock_t();
-
-#endif
-
-template <class _Mutex>
-class _LIBCPP_TYPE_VIS_ONLY lock_guard
-{
-public:
-    typedef _Mutex mutex_type;
-
-private:
-    mutex_type& __m_;
-public:
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit lock_guard(mutex_type& __m)
-        : __m_(__m) {__m_.lock();}
-    _LIBCPP_INLINE_VISIBILITY
-    lock_guard(mutex_type& __m, adopt_lock_t)
-        : __m_(__m) {}
-    _LIBCPP_INLINE_VISIBILITY
-    ~lock_guard() {__m_.unlock();}
-
-private:
-    lock_guard(lock_guard const&);// = delete;
-    lock_guard& operator=(lock_guard const&);// = delete;
-};
-
-template <class _Mutex>
-class _LIBCPP_TYPE_VIS_ONLY unique_lock
-{
-public:
-    typedef _Mutex mutex_type;
-
-private:
-    mutex_type* __m_;
-    bool __owns_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock() _NOEXCEPT : __m_(nullptr), __owns_(false) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit unique_lock(mutex_type& __m)
-        : __m_(&__m), __owns_(true) {__m_->lock();}
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT
-        : __m_(&__m), __owns_(false) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock(mutex_type& __m, try_to_lock_t)
-        : __m_(&__m), __owns_(__m.try_lock()) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock(mutex_type& __m, adopt_lock_t)
-        : __m_(&__m), __owns_(true) {}
-    template <class _Clock, class _Duration>
-    _LIBCPP_INLINE_VISIBILITY
-        unique_lock(mutex_type& __m, const chrono::time_point<_Clock, _Duration>& __t)
-            : __m_(&__m), __owns_(__m.try_lock_until(__t)) {}
-    template <class _Rep, class _Period>
-    _LIBCPP_INLINE_VISIBILITY
-        unique_lock(mutex_type& __m, const chrono::duration<_Rep, _Period>& __d)
-            : __m_(&__m), __owns_(__m.try_lock_for(__d)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    ~unique_lock()
-    {
-        if (__owns_)
-            __m_->unlock();
-    }
-
-private:
-    unique_lock(unique_lock const&); // = delete;
-    unique_lock& operator=(unique_lock const&); // = delete;
-
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock(unique_lock&& __u) _NOEXCEPT
-        : __m_(__u.__m_), __owns_(__u.__owns_)
-        {__u.__m_ = nullptr; __u.__owns_ = false;}
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock& operator=(unique_lock&& __u) _NOEXCEPT
-        {
-            if (__owns_)
-                __m_->unlock();
-            __m_ = __u.__m_;
-            __owns_ = __u.__owns_;
-            __u.__m_ = nullptr;
-            __u.__owns_ = false;
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    void lock();
-    bool try_lock();
-
-    template <class _Rep, class _Period>
-        bool try_lock_for(const chrono::duration<_Rep, _Period>& __d);
-    template <class _Clock, class _Duration>
-        bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);
-
-    void unlock();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unique_lock& __u) _NOEXCEPT
-    {
-        _VSTD::swap(__m_, __u.__m_);
-        _VSTD::swap(__owns_, __u.__owns_);
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    mutex_type* release() _NOEXCEPT
-    {
-        mutex_type* __m = __m_;
-        __m_ = nullptr;
-        __owns_ = false;
-        return __m;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool owns_lock() const _NOEXCEPT {return __owns_;}
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_EXPLICIT
-        operator bool () const _NOEXCEPT {return __owns_;}
-    _LIBCPP_INLINE_VISIBILITY
-    mutex_type* mutex() const _NOEXCEPT {return __m_;}
-};
-
-template <class _Mutex>
-void
-unique_lock<_Mutex>::lock()
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "unique_lock::lock: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "unique_lock::lock: already locked");
-    __m_->lock();
-    __owns_ = true;
-}
-
-template <class _Mutex>
-bool
-unique_lock<_Mutex>::try_lock()
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "unique_lock::try_lock: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "unique_lock::try_lock: already locked");
-    __owns_ = __m_->try_lock();
-    return __owns_;
-}
-
-template <class _Mutex>
-template <class _Rep, class _Period>
-bool
-unique_lock<_Mutex>::try_lock_for(const chrono::duration<_Rep, _Period>& __d)
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "unique_lock::try_lock_for: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "unique_lock::try_lock_for: already locked");
-    __owns_ = __m_->try_lock_for(__d);
-    return __owns_;
-}
-
-template <class _Mutex>
-template <class _Clock, class _Duration>
-bool
-unique_lock<_Mutex>::try_lock_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "unique_lock::try_lock_until: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "unique_lock::try_lock_until: already locked");
-    __owns_ = __m_->try_lock_until(__t);
-    return __owns_;
-}
-
-template <class _Mutex>
-void
-unique_lock<_Mutex>::unlock()
-{
-    if (!__owns_)
-        __throw_system_error(EPERM, "unique_lock::unlock: not locked");
-    __m_->unlock();
-    __owns_ = false;
-}
-
-template <class _Mutex>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unique_lock<_Mutex>& __x, unique_lock<_Mutex>& __y) _NOEXCEPT
-    {__x.swap(__y);}
-
-//enum class cv_status
-_LIBCPP_DECLARE_STRONG_ENUM(cv_status)
-{
-    no_timeout,
-    timeout
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(cv_status)
-
-class _LIBCPP_TYPE_VIS condition_variable
-{
-    pthread_cond_t __cv_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
-    constexpr condition_variable() : __cv_(PTHREAD_COND_INITIALIZER) {}
-#else
-    condition_variable() {__cv_ = (pthread_cond_t)PTHREAD_COND_INITIALIZER;}
-#endif
-    ~condition_variable();
-
-private:
-    condition_variable(const condition_variable&); // = delete;
-    condition_variable& operator=(const condition_variable&); // = delete;
-
-public:
-    void notify_one() _NOEXCEPT;
-    void notify_all() _NOEXCEPT;
-
-    void wait(unique_lock<mutex>& __lk) _NOEXCEPT;
-    template <class _Predicate>
-        void wait(unique_lock<mutex>& __lk, _Predicate __pred);
-
-    template <class _Clock, class _Duration>
-        cv_status
-        wait_until(unique_lock<mutex>& __lk,
-                   const chrono::time_point<_Clock, _Duration>& __t);
-
-    template <class _Clock, class _Duration, class _Predicate>
-        bool
-        wait_until(unique_lock<mutex>& __lk,
-                   const chrono::time_point<_Clock, _Duration>& __t,
-                   _Predicate __pred);
-
-    template <class _Rep, class _Period>
-        cv_status
-        wait_for(unique_lock<mutex>& __lk,
-                 const chrono::duration<_Rep, _Period>& __d);
-
-    template <class _Rep, class _Period, class _Predicate>
-        bool
-        wait_for(unique_lock<mutex>& __lk,
-                 const chrono::duration<_Rep, _Period>& __d,
-                 _Predicate __pred);
-
-    typedef pthread_cond_t* native_handle_type;
-    _LIBCPP_INLINE_VISIBILITY native_handle_type native_handle() {return &__cv_;}
-
-private:
-    void __do_timed_wait(unique_lock<mutex>& __lk,
-       chrono::time_point<chrono::system_clock, chrono::nanoseconds>) _NOEXCEPT;
-};
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-template <class _To, class _Rep, class _Period>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    chrono::__is_duration<_To>::value,
-    _To
->::type
-__ceil(chrono::duration<_Rep, _Period> __d)
-{
-    using namespace chrono;
-    _To __r = duration_cast<_To>(__d);
-    if (__r < __d)
-        ++__r;
-    return __r;
-}
-
-#ifndef _LIBCPP_HAS_NO_THREADS
-template <class _Predicate>
-void
-condition_variable::wait(unique_lock<mutex>& __lk, _Predicate __pred)
-{
-    while (!__pred())
-        wait(__lk);
-}
-
-template <class _Clock, class _Duration>
-cv_status
-condition_variable::wait_until(unique_lock<mutex>& __lk,
-                               const chrono::time_point<_Clock, _Duration>& __t)
-{
-    using namespace chrono;
-    wait_for(__lk, __t - _Clock::now());
-    return _Clock::now() < __t ? cv_status::no_timeout : cv_status::timeout;
-}
-
-template <class _Clock, class _Duration, class _Predicate>
-bool
-condition_variable::wait_until(unique_lock<mutex>& __lk,
-                   const chrono::time_point<_Clock, _Duration>& __t,
-                   _Predicate __pred)
-{
-    while (!__pred())
-    {
-        if (wait_until(__lk, __t) == cv_status::timeout)
-            return __pred();
-    }
-    return true;
-}
-
-template <class _Rep, class _Period>
-cv_status
-condition_variable::wait_for(unique_lock<mutex>& __lk,
-                             const chrono::duration<_Rep, _Period>& __d)
-{
-    using namespace chrono;
-    if (__d <= __d.zero())
-        return cv_status::timeout;
-    typedef time_point<system_clock, duration<long double, nano> > __sys_tpf;
-    typedef time_point<system_clock, nanoseconds> __sys_tpi;
-    __sys_tpf _Max = __sys_tpi::max();
-    system_clock::time_point __s_now = system_clock::now();
-    steady_clock::time_point __c_now = steady_clock::now();
-    if (_Max - __d > __s_now)
-        __do_timed_wait(__lk, __s_now + __ceil<nanoseconds>(__d));
-    else
-        __do_timed_wait(__lk, __sys_tpi::max());
-    return steady_clock::now() - __c_now < __d ? cv_status::no_timeout :
-                                                 cv_status::timeout;
-}
-
-template <class _Rep, class _Period, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-condition_variable::wait_for(unique_lock<mutex>& __lk,
-                             const chrono::duration<_Rep, _Period>& __d,
-                             _Predicate __pred)
-{
-    return wait_until(__lk, chrono::steady_clock::now() + __d,
-                      _VSTD::move(__pred));
-}
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___MUTEX_BASE
diff --git a/include.new/c++/v1/__refstring b/include.new/c++/v1/__refstring
deleted file mode 100644
index 6866bf1..0000000
--- a/include.new/c++/v1/__refstring
+++ /dev/null
@@ -1,139 +0,0 @@
-//===------------------------ __refstring ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___REFSTRING
-#define _LIBCPP___REFSTRING
-
-#include <__config>
-#include <cstddef>
-#include <cstring>
-#if __APPLE__
-#include <dlfcn.h>
-#include <mach-o/dyld.h>
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_HIDDEN __libcpp_refstring
-{
-private:
-    const char* str_;
-
-    typedef int count_t;
-
-    struct _Rep_base
-    {
-        std::size_t len;
-        std::size_t cap;
-        count_t     count;
-    };
-
-    static
-    _Rep_base*
-    rep_from_data(const char *data_) _NOEXCEPT
-    {
-        char *data = const_cast<char *>(data_);
-        return reinterpret_cast<_Rep_base *>(data - sizeof(_Rep_base));
-    }
-    static
-    char *
-    data_from_rep(_Rep_base *rep) _NOEXCEPT
-    {
-        char *data = reinterpret_cast<char *>(rep);
-        return data + sizeof(*rep);
-    }
-
-#if __APPLE__
-    static
-    const char*
-    compute_gcc_empty_string_storage() _NOEXCEPT
-    {
-        void* handle = dlopen("/usr/lib/libstdc++.6.dylib", RTLD_NOLOAD);
-        if (handle == nullptr)
-            return nullptr;
-        void* sym = dlsym(handle, "_ZNSs4_Rep20_S_empty_rep_storageE");
-        if (sym == nullptr)
-            return nullptr;
-        return data_from_rep(reinterpret_cast<_Rep_base *>(sym));
-    }
-
-    static
-    const char*
-    get_gcc_empty_string_storage() _NOEXCEPT
-    {
-        static const char* p = compute_gcc_empty_string_storage();
-        return p;
-    }
-
-    bool
-    uses_refcount() const
-    {
-        return str_ != get_gcc_empty_string_storage();
-    }
-#else
-    bool
-    uses_refcount() const
-    {
-        return true;
-    }
-#endif
-
-public:
-    explicit __libcpp_refstring(const char* msg) {
-        std::size_t len = strlen(msg);
-        _Rep_base* rep = static_cast<_Rep_base *>(::operator new(sizeof(*rep) + len + 1));
-        rep->len = len;
-        rep->cap = len;
-        rep->count = 0;
-        char *data = data_from_rep(rep);
-        std::memcpy(data, msg, len + 1);
-        str_ = data;
-    }
-
-    __libcpp_refstring(const __libcpp_refstring& s) _NOEXCEPT : str_(s.str_)
-    {
-        if (uses_refcount())
-            __sync_add_and_fetch(&rep_from_data(str_)->count, 1);
-    }
-
-    __libcpp_refstring& operator=(const __libcpp_refstring& s) _NOEXCEPT
-    {
-        bool adjust_old_count = uses_refcount();
-        struct _Rep_base *old_rep = rep_from_data(str_);
-        str_ = s.str_;
-        if (uses_refcount())
-            __sync_add_and_fetch(&rep_from_data(str_)->count, 1);
-        if (adjust_old_count)
-        {
-            if (__sync_add_and_fetch(&old_rep->count, count_t(-1)) < 0)
-            {
-                ::operator delete(old_rep);
-            }
-        }
-        return *this;
-    }
-
-    ~__libcpp_refstring()
-    {
-        if (uses_refcount())
-        {
-            _Rep_base* rep = rep_from_data(str_);
-            if (__sync_add_and_fetch(&rep->count, count_t(-1)) < 0)
-            {
-                ::operator delete(rep);
-            }
-        }
-    }
-
-    const char* c_str() const _NOEXCEPT {return str_;}
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif //_LIBCPP___REFSTRING
diff --git a/include.new/c++/v1/__split_buffer b/include.new/c++/v1/__split_buffer
deleted file mode 100644
index 1d529cb..0000000
--- a/include.new/c++/v1/__split_buffer
+++ /dev/null
@@ -1,654 +0,0 @@
-// -*- C++ -*-
-#ifndef _LIBCPP_SPLIT_BUFFER
-#define _LIBCPP_SPLIT_BUFFER
-
-#include <__config>
-#include <type_traits>
-#include <algorithm>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <bool>
-class __split_buffer_common
-{
-protected:
-    void __throw_length_error() const;
-    void __throw_out_of_range() const;
-};
-
-template <class _Tp, class _Allocator = allocator<_Tp> >
-struct __split_buffer
-    : private __split_buffer_common<true>
-{
-private:
-    __split_buffer(const __split_buffer&);
-    __split_buffer& operator=(const __split_buffer&);
-public:
-    typedef _Tp                                             value_type;
-    typedef _Allocator                                      allocator_type;
-    typedef typename remove_reference<allocator_type>::type __alloc_rr;
-    typedef allocator_traits<__alloc_rr>                    __alloc_traits;
-    typedef value_type&                                     reference;
-    typedef const value_type&                               const_reference;
-    typedef typename __alloc_traits::size_type              size_type;
-    typedef typename __alloc_traits::difference_type        difference_type;
-    typedef typename __alloc_traits::pointer                pointer;
-    typedef typename __alloc_traits::const_pointer          const_pointer;
-    typedef pointer                                         iterator;
-    typedef const_pointer                                   const_iterator;
-
-    pointer                                         __first_;
-    pointer                                         __begin_;
-    pointer                                         __end_;
-    __compressed_pair<pointer, allocator_type> __end_cap_;
-
-    typedef typename add_lvalue_reference<allocator_type>::type __alloc_ref;
-    typedef typename add_lvalue_reference<allocator_type>::type __alloc_const_ref;
-
-    _LIBCPP_INLINE_VISIBILITY __alloc_rr&           __alloc() _NOEXCEPT         {return __end_cap_.second();}
-    _LIBCPP_INLINE_VISIBILITY const __alloc_rr&     __alloc() const _NOEXCEPT   {return __end_cap_.second();}
-    _LIBCPP_INLINE_VISIBILITY pointer&              __end_cap() _NOEXCEPT       {return __end_cap_.first();}
-    _LIBCPP_INLINE_VISIBILITY const pointer&        __end_cap() const _NOEXCEPT {return __end_cap_.first();}
-
-    __split_buffer()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    explicit __split_buffer(__alloc_rr& __a);
-    explicit __split_buffer(const __alloc_rr& __a);
-    __split_buffer(size_type __cap, size_type __start, __alloc_rr& __a);
-    ~__split_buffer();
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __split_buffer(__split_buffer&& __c)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    __split_buffer(__split_buffer&& __c, const __alloc_rr& __a);
-    __split_buffer& operator=(__split_buffer&& __c)
-        _NOEXCEPT_((__alloc_traits::propagate_on_container_move_assignment::value &&
-                is_nothrow_move_assignable<allocator_type>::value) ||
-               !__alloc_traits::propagate_on_container_move_assignment::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY       iterator begin() _NOEXCEPT       {return __begin_;}
-    _LIBCPP_INLINE_VISIBILITY const_iterator begin() const _NOEXCEPT {return __begin_;}
-    _LIBCPP_INLINE_VISIBILITY       iterator end() _NOEXCEPT         {return __end_;}
-    _LIBCPP_INLINE_VISIBILITY const_iterator end() const _NOEXCEPT   {return __end_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT
-        {__destruct_at_end(__begin_);}
-    _LIBCPP_INLINE_VISIBILITY size_type size() const {return static_cast<size_type>(__end_ - __begin_);}
-    _LIBCPP_INLINE_VISIBILITY bool empty()     const {return __end_ == __begin_;}
-    _LIBCPP_INLINE_VISIBILITY size_type capacity() const {return static_cast<size_type>(__end_cap() - __first_);}
-    _LIBCPP_INLINE_VISIBILITY size_type __front_spare() const {return static_cast<size_type>(__begin_ - __first_);}
-    _LIBCPP_INLINE_VISIBILITY size_type __back_spare() const {return static_cast<size_type>(__end_cap() - __end_);}
-
-    _LIBCPP_INLINE_VISIBILITY       reference front()       {return *__begin_;}
-    _LIBCPP_INLINE_VISIBILITY const_reference front() const {return *__begin_;}
-    _LIBCPP_INLINE_VISIBILITY       reference back()        {return *(__end_ - 1);}
-    _LIBCPP_INLINE_VISIBILITY const_reference back() const  {return *(__end_ - 1);}
-
-    void reserve(size_type __n);
-    void shrink_to_fit() _NOEXCEPT;
-    void push_front(const_reference __x);
-    _LIBCPP_INLINE_VISIBILITY void push_back(const_reference __x);
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-    void push_front(value_type&& __x);
-    void push_back(value_type&& __x);
-#if !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        void emplace_back(_Args&&... __args);
-#endif  // !defined(_LIBCPP_HAS_NO_VARIADICS)
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY void pop_front() {__destruct_at_begin(__begin_+1);}
-    _LIBCPP_INLINE_VISIBILITY void pop_back() {__destruct_at_end(__end_-1);}
-
-    void __construct_at_end(size_type __n);
-    void __construct_at_end(size_type __n, const_reference __x);
-    template <class _InputIter>
-        typename enable_if
-        <
-            __is_input_iterator<_InputIter>::value &&
-           !__is_forward_iterator<_InputIter>::value,
-            void
-        >::type
-        __construct_at_end(_InputIter __first, _InputIter __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            void
-        >::type
-        __construct_at_end(_ForwardIterator __first, _ForwardIterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY void __destruct_at_begin(pointer __new_begin)
-        {__destruct_at_begin(__new_begin, is_trivially_destructible<value_type>());}
-        void __destruct_at_begin(pointer __new_begin, false_type);
-        void __destruct_at_begin(pointer __new_begin, true_type);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __destruct_at_end(pointer __new_last) _NOEXCEPT
-        {__destruct_at_end(__new_last, false_type());}
-    _LIBCPP_INLINE_VISIBILITY
-        void __destruct_at_end(pointer __new_last, false_type) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-        void __destruct_at_end(pointer __new_last, true_type) _NOEXCEPT;
-
-    void swap(__split_buffer& __x)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
-                   __is_nothrow_swappable<__alloc_rr>::value);
-
-    bool __invariants() const;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__split_buffer& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__split_buffer&, false_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__alloc_rr& __x, __alloc_rr& __y)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
-                   __is_nothrow_swappable<__alloc_rr>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_swap::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__alloc_rr& __x, __alloc_rr& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<__alloc_rr>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__alloc_rr&, __alloc_rr&, false_type) _NOEXCEPT
-        {}
-};
-
-template <class _Tp, class _Allocator>
-bool
-__split_buffer<_Tp, _Allocator>::__invariants() const
-{
-    if (__first_ == nullptr)
-    {
-        if (__begin_ != nullptr)
-            return false;
-        if (__end_ != nullptr)
-            return false;
-        if (__end_cap() != nullptr)
-            return false;
-    }
-    else
-    {
-        if (__begin_ < __first_)
-            return false;
-        if (__end_ < __begin_)
-            return false;
-        if (__end_cap() < __end_)
-            return false;
-    }
-    return true;
-}
-
-//  Default constructs __n objects starting at __end_
-//  throws if construction throws
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == size() + __n
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n)
-{
-    __alloc_rr& __a = this->__alloc();
-    do
-    {
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_));
-        ++this->__end_;
-        --__n;
-    } while (__n > 0);
-}
-
-//  Copy constructs __n objects starting at __end_ from __x
-//  throws if construction throws
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == old size() + __n
-//  Postcondition:  [i] == __x for all i in [size() - __n, __n)
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)
-{
-    __alloc_rr& __a = this->__alloc();
-    do
-    {
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), __x);
-        ++this->__end_;
-        --__n;
-    } while (__n > 0);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-typename enable_if
-<
-     __is_input_iterator<_InputIter>::value &&
-    !__is_forward_iterator<_InputIter>::value,
-    void
->::type
-__split_buffer<_Tp, _Allocator>::__construct_at_end(_InputIter __first, _InputIter __last)
-{
-    __alloc_rr& __a = this->__alloc();
-    for (; __first != __last; ++__first)
-    {
-        if (__end_ == __end_cap())
-        {
-            size_type __old_cap = __end_cap() - __first_;
-            size_type __new_cap = _VSTD::max<size_type>(2 * __old_cap, 8);
-            __split_buffer __buf(__new_cap, 0, __a);
-            for (pointer __p = __begin_; __p != __end_; ++__p, ++__buf.__end_)
-                __alloc_traits::construct(__buf.__alloc(),
-                        _VSTD::__to_raw_pointer(__buf.__end_), _VSTD::move(*__p));
-            swap(__buf);
-        }
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), *__first);
-        ++this->__end_;
-    }
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    void
->::type
-__split_buffer<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last)
-{
-    __alloc_rr& __a = this->__alloc();
-    for (; __first != __last; ++__first)
-    {
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), *__first);
-        ++this->__end_;
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, false_type)
-{
-    while (__begin_ != __new_begin)
-        __alloc_traits::destroy(__alloc(), __to_raw_pointer(__begin_++));
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, true_type)
-{
-    __begin_ = __new_begin;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, false_type) _NOEXCEPT
-{
-    while (__new_last != __end_)
-        __alloc_traits::destroy(__alloc(), __to_raw_pointer(--__end_));
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, true_type) _NOEXCEPT
-{
-    __end_ = __new_last;
-}
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>::__split_buffer(size_type __cap, size_type __start, __alloc_rr& __a)
-    : __end_cap_(nullptr, __a)
-{
-    __first_ = __cap != 0 ? __alloc_traits::allocate(__alloc(), __cap) : nullptr;
-    __begin_ = __end_ = __first_ + __start;
-    __end_cap() = __first_ + __cap;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__split_buffer<_Tp, _Allocator>::__split_buffer()
-    _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-    : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr)
-{
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__split_buffer<_Tp, _Allocator>::__split_buffer(__alloc_rr& __a)
-    : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a)
-{
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__split_buffer<_Tp, _Allocator>::__split_buffer(const __alloc_rr& __a)
-    : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a)
-{
-}
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>::~__split_buffer()
-{
-    clear();
-    if (__first_)
-        __alloc_traits::deallocate(__alloc(), __first_, capacity());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c)
-    _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __first_(_VSTD::move(__c.__first_)),
-      __begin_(_VSTD::move(__c.__begin_)),
-      __end_(_VSTD::move(__c.__end_)),
-      __end_cap_(_VSTD::move(__c.__end_cap_))
-{
-    __c.__first_ = nullptr;
-    __c.__begin_ = nullptr;
-    __c.__end_ = nullptr;
-    __c.__end_cap() = nullptr;
-}
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c, const __alloc_rr& __a)
-    : __end_cap_(__a)
-{
-    if (__a == __c.__alloc())
-    {
-        __first_ = __c.__first_;
-        __begin_ = __c.__begin_;
-        __end_ = __c.__end_;
-        __end_cap() = __c.__end_cap();
-        __c.__first_ = nullptr;
-        __c.__begin_ = nullptr;
-        __c.__end_ = nullptr;
-        __c.__end_cap() = nullptr;
-    }
-    else
-    {
-        size_type __cap = __c.size();
-        __first_ = __alloc_traits::allocate(__alloc(), __cap);
-        __begin_ = __end_ = __first_;
-        __end_cap() = __first_ + __cap;
-        typedef move_iterator<iterator> _Ip;
-        __construct_at_end(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-}
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>&
-__split_buffer<_Tp, _Allocator>::operator=(__split_buffer&& __c)
-    _NOEXCEPT_((__alloc_traits::propagate_on_container_move_assignment::value &&
-                is_nothrow_move_assignable<allocator_type>::value) ||
-               !__alloc_traits::propagate_on_container_move_assignment::value)
-{
-    clear();
-    shrink_to_fit();
-    __first_ = __c.__first_;
-    __begin_ = __c.__begin_;
-    __end_ = __c.__end_;
-    __end_cap() = __c.__end_cap();
-    __move_assign_alloc(__c,
-        integral_constant<bool,
-                          __alloc_traits::propagate_on_container_move_assignment::value>());
-    __c.__first_ = __c.__begin_ = __c.__end_ = __c.__end_cap() = nullptr;
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::swap(__split_buffer& __x)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
-                   __is_nothrow_swappable<__alloc_rr>::value)
-{
-    _VSTD::swap(__first_, __x.__first_);
-    _VSTD::swap(__begin_, __x.__begin_);
-    _VSTD::swap(__end_, __x.__end_);
-    _VSTD::swap(__end_cap(), __x.__end_cap());
-    __swap_alloc(__alloc(), __x.__alloc());
-}
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::reserve(size_type __n)
-{
-    if (__n < capacity())
-    {
-        __split_buffer<value_type, __alloc_rr&> __t(__n, 0, __alloc());
-        __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                               move_iterator<pointer>(__end_));
-        _VSTD::swap(__first_, __t.__first_);
-        _VSTD::swap(__begin_, __t.__begin_);
-        _VSTD::swap(__end_, __t.__end_);
-        _VSTD::swap(__end_cap(), __t.__end_cap());
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
-{
-    if (capacity() > size())
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __split_buffer<value_type, __alloc_rr&> __t(size(), 0, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            __t.__end_ = __t.__begin_ + (__end_ - __begin_);
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::push_front(const_reference __x)
-{
-    if (__begin_ == __first_)
-    {
-        if (__end_ < __end_cap())
-        {
-            difference_type __d = __end_cap() - __end_;
-            __d = (__d + 1) / 2;
-            __begin_ = _VSTD::move_backward(__begin_, __end_, __end_ + __d);
-            __end_ += __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 3) / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__begin_-1), __x);
-    --__begin_;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::push_front(value_type&& __x)
-{
-    if (__begin_ == __first_)
-    {
-        if (__end_ < __end_cap())
-        {
-            difference_type __d = __end_cap() - __end_;
-            __d = (__d + 1) / 2;
-            __begin_ = _VSTD::move_backward(__begin_, __end_, __end_ + __d);
-            __end_ += __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 3) / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__begin_-1),
-            _VSTD::move(__x));
-    --__begin_;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::push_back(const_reference __x)
-{
-    if (__end_ == __end_cap())
-    {
-        if (__begin_ > __first_)
-        {
-            difference_type __d = __begin_ - __first_;
-            __d = (__d + 1) / 2;
-            __end_ = _VSTD::move(__begin_, __end_, __begin_ - __d);
-            __begin_ -= __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, __c / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__end_), __x);
-    ++__end_;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::push_back(value_type&& __x)
-{
-    if (__end_ == __end_cap())
-    {
-        if (__begin_ > __first_)
-        {
-            difference_type __d = __begin_ - __first_;
-            __d = (__d + 1) / 2;
-            __end_ = _VSTD::move(__begin_, __end_, __begin_ - __d);
-            __begin_ -= __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, __c / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__end_),
-            _VSTD::move(__x));
-    ++__end_;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-void
-__split_buffer<_Tp, _Allocator>::emplace_back(_Args&&... __args)
-{
-    if (__end_ == __end_cap())
-    {
-        if (__begin_ > __first_)
-        {
-            difference_type __d = __begin_ - __first_;
-            __d = (__d + 1) / 2;
-            __end_ = _VSTD::move(__begin_, __end_, __begin_ - __d);
-            __begin_ -= __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, __c / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__end_),
-                              _VSTD::forward<_Args>(__args)...);
-    ++__end_;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__split_buffer<_Tp, _Allocator>& __x, __split_buffer<_Tp, _Allocator>& __y)
-        _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SPLIT_BUFFER
diff --git a/include.new/c++/v1/__sso_allocator b/include.new/c++/v1/__sso_allocator
deleted file mode 100644
index 645f2ba..0000000
--- a/include.new/c++/v1/__sso_allocator
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___SSO_ALLOCATOR
-#define _LIBCPP___SSO_ALLOCATOR
-
-#include <__config>
-#include <type_traits>
-#include <new>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, size_t _Np> class _LIBCPP_HIDDEN __sso_allocator;
-
-template <size_t _Np>
-class _LIBCPP_HIDDEN __sso_allocator<void, _Np>
-{
-public:
-    typedef const void*       const_pointer;
-    typedef void              value_type;
-};
-
-template <class _Tp, size_t _Np>
-class _LIBCPP_HIDDEN __sso_allocator
-{
-    typename aligned_storage<sizeof(_Tp) * _Np>::type buf_;
-    bool __allocated_;
-public:
-    typedef size_t            size_type;
-    typedef _Tp*              pointer;
-    typedef _Tp               value_type;
-
-    _LIBCPP_INLINE_VISIBILITY __sso_allocator() throw() : __allocated_(false) {}
-    _LIBCPP_INLINE_VISIBILITY __sso_allocator(const __sso_allocator&) throw() : __allocated_(false) {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY __sso_allocator(const __sso_allocator<_Up, _Np>&) throw()
-         : __allocated_(false) {}
-private:
-    __sso_allocator& operator=(const __sso_allocator&);
-public:
-    _LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, typename __sso_allocator<void, _Np>::const_pointer = 0)
-    {
-        if (!__allocated_ && __n <= _Np)
-        {
-            __allocated_ = true;
-            return (pointer)&buf_;
-        }
-        return static_cast<pointer>(_VSTD::__allocate(__n * sizeof(_Tp)));
-    }
-    _LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type)
-    {
-        if (__p == (pointer)&buf_)
-            __allocated_ = false;
-        else
-            _VSTD::__deallocate(__p);
-    }
-    _LIBCPP_INLINE_VISIBILITY size_type max_size() const throw() {return size_type(~0) / sizeof(_Tp);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator==(__sso_allocator& __a) const {return &buf_ == &__a.buf_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(__sso_allocator& __a) const {return &buf_ != &__a.buf_;}
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___SSO_ALLOCATOR
diff --git a/include.new/c++/v1/__std_stream b/include.new/c++/v1/__std_stream
deleted file mode 100644
index 5403ada..0000000
--- a/include.new/c++/v1/__std_stream
+++ /dev/null
@@ -1,359 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___STD_STREAM
-#define _LIBCPP___STD_STREAM
-
-#include <__config>
-#include <ostream>
-#include <istream>
-#include <__locale>
-#include <cstdio>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-static const int __limit = 8;
-
-// __stdinbuf
-
-template <class _CharT>
-class _LIBCPP_HIDDEN __stdinbuf
-    : public basic_streambuf<_CharT, char_traits<_CharT> >
-{
-public:
-    typedef _CharT                           char_type;
-    typedef char_traits<char_type>           traits_type;
-    typedef typename traits_type::int_type   int_type;
-    typedef typename traits_type::pos_type   pos_type;
-    typedef typename traits_type::off_type   off_type;
-    typedef typename traits_type::state_type state_type;
-
-    __stdinbuf(FILE* __fp, state_type* __st);
-
-protected:
-    virtual int_type underflow();
-    virtual int_type uflow();
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-    virtual void imbue(const locale& __loc);
-
-private:
-
-    FILE* __file_;
-    const codecvt<char_type, char, state_type>* __cv_;
-    state_type* __st_;
-    int __encoding_;
-    int_type __last_consumed_;
-    bool __last_consumed_is_next_;
-    bool __always_noconv_;
-
-    __stdinbuf(const __stdinbuf&);
-    __stdinbuf& operator=(const __stdinbuf&);
-
-    int_type __getchar(bool __consume);
-};
-
-template <class _CharT>
-__stdinbuf<_CharT>::__stdinbuf(FILE* __fp, state_type* __st)
-    : __file_(__fp),
-      __st_(__st),
-      __last_consumed_(traits_type::eof()),
-      __last_consumed_is_next_(false)
-{
-    imbue(this->getloc());
-}
-
-template <class _CharT>
-void
-__stdinbuf<_CharT>::imbue(const locale& __loc)
-{
-    __cv_ = &use_facet<codecvt<char_type, char, state_type> >(__loc);
-    __encoding_ = __cv_->encoding();
-    __always_noconv_ = __cv_->always_noconv();
-    if (__encoding_ > __limit)
-        __throw_runtime_error("unsupported locale for standard input");
-}
-
-template <class _CharT>
-typename __stdinbuf<_CharT>::int_type
-__stdinbuf<_CharT>::underflow()
-{
-    return __getchar(false);
-}
-
-template <class _CharT>
-typename __stdinbuf<_CharT>::int_type
-__stdinbuf<_CharT>::uflow()
-{
-    return __getchar(true);
-}
-
-template <class _CharT>
-typename __stdinbuf<_CharT>::int_type
-__stdinbuf<_CharT>::__getchar(bool __consume)
-{
-    if (__last_consumed_is_next_)
-    {
-        int_type __result = __last_consumed_;
-        if (__consume)
-        {
-            __last_consumed_ = traits_type::eof();
-            __last_consumed_is_next_ = false;
-        }
-        return __result;
-    }
-    char __extbuf[__limit];
-    int __nread = _VSTD::max(1, __encoding_);
-    for (int __i = 0; __i < __nread; ++__i)
-    {
-        int __c = getc(__file_);
-        if (__c == EOF)
-            return traits_type::eof();
-        __extbuf[__i] = static_cast<char>(__c);
-    }
-    char_type __1buf;
-    if (__always_noconv_)
-        __1buf = static_cast<char_type>(__extbuf[0]);
-    else
-    {
-        const char* __enxt;
-        char_type* __inxt;
-        codecvt_base::result __r;
-        do
-        {
-            state_type __sv_st = *__st_;
-            __r = __cv_->in(*__st_, __extbuf, __extbuf + __nread, __enxt,
-                                   &__1buf, &__1buf + 1, __inxt);
-            switch (__r)
-            {
-            case _VSTD::codecvt_base::ok:
-                break;
-            case codecvt_base::partial:
-                *__st_ = __sv_st;
-                if (__nread == sizeof(__extbuf))
-                    return traits_type::eof();
-                {
-                    int __c = getc(__file_);
-                    if (__c == EOF)
-                        return traits_type::eof();
-                    __extbuf[__nread] = static_cast<char>(__c);
-                }
-                ++__nread;
-                break;
-            case codecvt_base::error:
-                return traits_type::eof();
-            case _VSTD::codecvt_base::noconv:
-                __1buf = static_cast<char_type>(__extbuf[0]);
-                break;
-            }
-        } while (__r == _VSTD::codecvt_base::partial);
-    }
-    if (!__consume)
-    {
-        for (int __i = __nread; __i > 0;)
-        {
-            if (ungetc(traits_type::to_int_type(__extbuf[--__i]), __file_) == EOF)
-                return traits_type::eof();
-        }
-    }
-    else
-        __last_consumed_ = traits_type::to_int_type(__1buf);
-    return traits_type::to_int_type(__1buf);
-}
-
-template <class _CharT>
-typename __stdinbuf<_CharT>::int_type
-__stdinbuf<_CharT>::pbackfail(int_type __c)
-{
-    if (traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        if (!__last_consumed_is_next_)
-        {
-            __c = __last_consumed_;
-            __last_consumed_is_next_ = !traits_type::eq_int_type(__last_consumed_,
-                                                                 traits_type::eof());
-        }
-        return __c;
-    }
-    if (__last_consumed_is_next_)
-    {
-        char __extbuf[__limit];
-        char* __enxt;
-        const char_type __ci = traits_type::to_char_type(__last_consumed_);
-        const char_type* __inxt;
-        switch (__cv_->out(*__st_, &__ci, &__ci + 1, __inxt,
-                                  __extbuf, __extbuf + sizeof(__extbuf), __enxt))
-        {
-        case _VSTD::codecvt_base::ok:
-            break;
-        case _VSTD::codecvt_base::noconv:
-            __extbuf[0] = static_cast<char>(__last_consumed_);
-            __enxt = __extbuf + 1;
-            break;
-        case codecvt_base::partial:
-        case codecvt_base::error:
-            return traits_type::eof();
-        }
-        while (__enxt > __extbuf)
-            if (ungetc(*--__enxt, __file_) == EOF)
-                return traits_type::eof();
-    }
-    __last_consumed_ = __c;
-    __last_consumed_is_next_ = true;
-    return __c;
-}
-
-// __stdoutbuf
-
-template <class _CharT>
-class _LIBCPP_HIDDEN __stdoutbuf
-    : public basic_streambuf<_CharT, char_traits<_CharT> >
-{
-public:
-    typedef _CharT                           char_type;
-    typedef char_traits<char_type>           traits_type;
-    typedef typename traits_type::int_type   int_type;
-    typedef typename traits_type::pos_type   pos_type;
-    typedef typename traits_type::off_type   off_type;
-    typedef typename traits_type::state_type state_type;
-
-    __stdoutbuf(FILE* __fp, state_type* __st);
-
-protected:
-    virtual int_type overflow (int_type __c = traits_type::eof());
-    virtual streamsize xsputn(const char_type* __s, streamsize __n);
-    virtual int sync();
-    virtual void imbue(const locale& __loc);
-
-private:
-    FILE* __file_;
-    const codecvt<char_type, char, state_type>* __cv_;
-    state_type* __st_;
-    bool __always_noconv_;
-
-    __stdoutbuf(const __stdoutbuf&);
-    __stdoutbuf& operator=(const __stdoutbuf&);
-};
-
-template <class _CharT>
-__stdoutbuf<_CharT>::__stdoutbuf(FILE* __fp, state_type* __st)
-    : __file_(__fp),
-      __cv_(&use_facet<codecvt<char_type, char, state_type> >(this->getloc())),
-      __st_(__st),
-      __always_noconv_(__cv_->always_noconv())
-{
-}
-
-template <class _CharT>
-typename __stdoutbuf<_CharT>::int_type
-__stdoutbuf<_CharT>::overflow(int_type __c)
-{
-    char __extbuf[__limit];
-    char_type __1buf;
-    if (!traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        __1buf = traits_type::to_char_type(__c);
-        if (__always_noconv_)
-        {
-            if (fwrite(&__1buf, sizeof(char_type), 1, __file_) != 1)
-                return traits_type::eof();
-        }
-        else
-        {
-            char* __extbe = __extbuf;
-            codecvt_base::result __r;
-            char_type* pbase = &__1buf;
-            char_type* pptr = pbase + 1;
-            char_type* epptr = pptr;
-            do
-            {
-                const char_type* __e;
-                __r = __cv_->out(*__st_, pbase, pptr, __e,
-                                        __extbuf,
-                                        __extbuf + sizeof(__extbuf),
-                                        __extbe);
-                if (__e == pbase)
-                    return traits_type::eof();
-                if (__r == codecvt_base::noconv)
-                {
-                    if (fwrite(pbase, 1, 1, __file_) != 1)
-                        return traits_type::eof();
-                }
-                else if (__r == codecvt_base::ok || __r == codecvt_base::partial)
-                {
-                    size_t __nmemb = static_cast<size_t>(__extbe - __extbuf);
-                    if (fwrite(__extbuf, 1, __nmemb, __file_) != __nmemb)
-                        return traits_type::eof();
-                    if (__r == codecvt_base::partial)
-                    {
-                        pbase = (char_type*)__e;
-                    }
-                }
-                else
-                    return traits_type::eof();
-            } while (__r == codecvt_base::partial);
-        }
-    }
-    return traits_type::not_eof(__c);
-}
-
-template <class _CharT>
-streamsize
-__stdoutbuf<_CharT>::xsputn(const char_type* __s, streamsize __n)
-{
-    if (__always_noconv_)
-        return fwrite(__s, sizeof(char_type), __n, __file_);
-    streamsize __i = 0;
-    for (; __i < __n; ++__i, ++__s)
-        if (overflow(traits_type::to_int_type(*__s)) == traits_type::eof())
-            break;
-    return __i;
-}
-
-template <class _CharT>
-int
-__stdoutbuf<_CharT>::sync()
-{
-    char __extbuf[__limit];
-    codecvt_base::result __r;
-    do
-    {
-        char* __extbe;
-        __r = __cv_->unshift(*__st_, __extbuf,
-                                    __extbuf + sizeof(__extbuf),
-                                    __extbe);
-        size_t __nmemb = static_cast<size_t>(__extbe - __extbuf);
-        if (fwrite(__extbuf, 1, __nmemb, __file_) != __nmemb)
-            return -1;
-    } while (__r == codecvt_base::partial);
-    if (__r == codecvt_base::error)
-        return -1;
-    if (fflush(__file_))
-        return -1;
-    return 0;
-}
-
-template <class _CharT>
-void
-__stdoutbuf<_CharT>::imbue(const locale& __loc)
-{
-    sync();
-    __cv_ = &use_facet<codecvt<char_type, char, state_type> >(__loc);
-    __always_noconv_ = __cv_->always_noconv();
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___STD_STREAM
diff --git a/include.new/c++/v1/__tree b/include.new/c++/v1/__tree
deleted file mode 100644
index 9007dbf..0000000
--- a/include.new/c++/v1/__tree
+++ /dev/null
@@ -1,2308 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___TREE
-#define _LIBCPP___TREE
-
-#include <__config>
-#include <iterator>
-#include <memory>
-#include <stdexcept>
-#include <algorithm>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _Compare, class _Allocator> class __tree;
-template <class _Tp, class _NodePtr, class _DiffType>
-    class _LIBCPP_TYPE_VIS_ONLY __tree_iterator;
-template <class _Tp, class _ConstNodePtr, class _DiffType>
-    class _LIBCPP_TYPE_VIS_ONLY __tree_const_iterator;
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class _LIBCPP_TYPE_VIS_ONLY map;
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class _LIBCPP_TYPE_VIS_ONLY multimap;
-template <class _Key, class _Compare, class _Allocator>
-    class _LIBCPP_TYPE_VIS_ONLY set;
-template <class _Key, class _Compare, class _Allocator>
-    class _LIBCPP_TYPE_VIS_ONLY multiset;
-
-/*
-
-_NodePtr algorithms
-
-The algorithms taking _NodePtr are red black tree algorithms.  Those
-algorithms taking a parameter named __root should assume that __root
-points to a proper red black tree (unless otherwise specified).
-
-Each algorithm herein assumes that __root->__parent_ points to a non-null
-structure which has a member __left_ which points back to __root.  No other
-member is read or written to at __root->__parent_.
-
-__root->__parent_ will be referred to below (in comments only) as end_node.
-end_node->__left_ is an externably accessible lvalue for __root, and can be
-changed by node insertion and removal (without explicit reference to end_node).
-
-All nodes (with the exception of end_node), even the node referred to as
-__root, have a non-null __parent_ field.
-
-*/
-
-// Returns:  true if __x is a left child of its parent, else false
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__tree_is_left_child(_NodePtr __x) _NOEXCEPT
-{
-    return __x == __x->__parent_->__left_;
-}
-
-// Determintes if the subtree rooted at __x is a proper red black subtree.  If
-//    __x is a proper subtree, returns the black height (null counts as 1).  If
-//    __x is an improper subtree, returns 0.
-template <class _NodePtr>
-unsigned
-__tree_sub_invariant(_NodePtr __x)
-{
-    if (__x == nullptr)
-        return 1;
-    // parent consistency checked by caller
-    // check __x->__left_ consistency
-    if (__x->__left_ != nullptr && __x->__left_->__parent_ != __x)
-        return 0;
-    // check __x->__right_ consistency
-    if (__x->__right_ != nullptr && __x->__right_->__parent_ != __x)
-        return 0;
-    // check __x->__left_ != __x->__right_ unless both are nullptr
-    if (__x->__left_ == __x->__right_ && __x->__left_ != nullptr)
-        return 0;
-    // If this is red, neither child can be red
-    if (!__x->__is_black_)
-    {
-        if (__x->__left_ && !__x->__left_->__is_black_)
-            return 0;
-        if (__x->__right_ && !__x->__right_->__is_black_)
-            return 0;
-    }
-    unsigned __h = __tree_sub_invariant(__x->__left_);
-    if (__h == 0)
-        return 0;  // invalid left subtree
-    if (__h != __tree_sub_invariant(__x->__right_))
-        return 0;  // invalid or different height right subtree
-    return __h + __x->__is_black_;  // return black height of this node
-}
-
-// Determintes if the red black tree rooted at __root is a proper red black tree.
-//    __root == nullptr is a proper tree.  Returns true is __root is a proper
-//    red black tree, else returns false.
-template <class _NodePtr>
-bool
-__tree_invariant(_NodePtr __root)
-{
-    if (__root == nullptr)
-        return true;
-    // check __x->__parent_ consistency
-    if (__root->__parent_ == nullptr)
-        return false;
-    if (!__tree_is_left_child(__root))
-        return false;
-    // root must be black
-    if (!__root->__is_black_)
-        return false;
-    // do normal node checks
-    return __tree_sub_invariant(__root) != 0;
-}
-
-// Returns:  pointer to the left-most node under __x.
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-inline _LIBCPP_INLINE_VISIBILITY
-_NodePtr
-__tree_min(_NodePtr __x) _NOEXCEPT
-{
-    while (__x->__left_ != nullptr)
-        __x = __x->__left_;
-    return __x;
-}
-
-// Returns:  pointer to the right-most node under __x.
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-inline _LIBCPP_INLINE_VISIBILITY
-_NodePtr
-__tree_max(_NodePtr __x) _NOEXCEPT
-{
-    while (__x->__right_ != nullptr)
-        __x = __x->__right_;
-    return __x;
-}
-
-// Returns:  pointer to the next in-order node after __x.
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-_NodePtr
-__tree_next(_NodePtr __x) _NOEXCEPT
-{
-    if (__x->__right_ != nullptr)
-        return __tree_min(__x->__right_);
-    while (!__tree_is_left_child(__x))
-        __x = __x->__parent_;
-    return __x->__parent_;
-}
-
-// Returns:  pointer to the previous in-order node before __x.
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-_NodePtr
-__tree_prev(_NodePtr __x) _NOEXCEPT
-{
-    if (__x->__left_ != nullptr)
-        return __tree_max(__x->__left_);
-    while (__tree_is_left_child(__x))
-        __x = __x->__parent_;
-    return __x->__parent_;
-}
-
-// Returns:  pointer to a node which has no children
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-_NodePtr
-__tree_leaf(_NodePtr __x) _NOEXCEPT
-{
-    while (true)
-    {
-        if (__x->__left_ != nullptr)
-        {
-            __x = __x->__left_;
-            continue;
-        }
-        if (__x->__right_ != nullptr)
-        {
-            __x = __x->__right_;
-            continue;
-        }
-        break;
-    }
-    return __x;
-}
-
-// Effects:  Makes __x->__right_ the subtree root with __x as its left child
-//           while preserving in-order order.
-// Precondition:  __x->__right_ != nullptr
-template <class _NodePtr>
-void
-__tree_left_rotate(_NodePtr __x) _NOEXCEPT
-{
-    _NodePtr __y = __x->__right_;
-    __x->__right_ = __y->__left_;
-    if (__x->__right_ != nullptr)
-        __x->__right_->__parent_ = __x;
-    __y->__parent_ = __x->__parent_;
-    if (__tree_is_left_child(__x))
-        __x->__parent_->__left_ = __y;
-    else
-        __x->__parent_->__right_ = __y;
-    __y->__left_ = __x;
-    __x->__parent_ = __y;
-}
-
-// Effects:  Makes __x->__left_ the subtree root with __x as its right child
-//           while preserving in-order order.
-// Precondition:  __x->__left_ != nullptr
-template <class _NodePtr>
-void
-__tree_right_rotate(_NodePtr __x) _NOEXCEPT
-{
-    _NodePtr __y = __x->__left_;
-    __x->__left_ = __y->__right_;
-    if (__x->__left_ != nullptr)
-        __x->__left_->__parent_ = __x;
-    __y->__parent_ = __x->__parent_;
-    if (__tree_is_left_child(__x))
-        __x->__parent_->__left_ = __y;
-    else
-        __x->__parent_->__right_ = __y;
-    __y->__right_ = __x;
-    __x->__parent_ = __y;
-}
-
-// Effects:  Rebalances __root after attaching __x to a leaf.
-// Precondition:  __root != nulptr && __x != nullptr.
-//                __x has no children.
-//                __x == __root or == a direct or indirect child of __root.
-//                If __x were to be unlinked from __root (setting __root to
-//                  nullptr if __root == __x), __tree_invariant(__root) == true.
-// Postcondition: __tree_invariant(end_node->__left_) == true.  end_node->__left_
-//                may be different than the value passed in as __root.
-template <class _NodePtr>
-void
-__tree_balance_after_insert(_NodePtr __root, _NodePtr __x) _NOEXCEPT
-{
-    __x->__is_black_ = __x == __root;
-    while (__x != __root && !__x->__parent_->__is_black_)
-    {
-        // __x->__parent_ != __root because __x->__parent_->__is_black == false
-        if (__tree_is_left_child(__x->__parent_))
-        {
-            _NodePtr __y = __x->__parent_->__parent_->__right_;
-            if (__y != nullptr && !__y->__is_black_)
-            {
-                __x = __x->__parent_;
-                __x->__is_black_ = true;
-                __x = __x->__parent_;
-                __x->__is_black_ = __x == __root;
-                __y->__is_black_ = true;
-            }
-            else
-            {
-                if (!__tree_is_left_child(__x))
-                {
-                    __x = __x->__parent_;
-                    __tree_left_rotate(__x);
-                }
-                __x = __x->__parent_;
-                __x->__is_black_ = true;
-                __x = __x->__parent_;
-                __x->__is_black_ = false;
-                __tree_right_rotate(__x);
-                break;
-            }
-        }
-        else
-        {
-            _NodePtr __y = __x->__parent_->__parent_->__left_;
-            if (__y != nullptr && !__y->__is_black_)
-            {
-                __x = __x->__parent_;
-                __x->__is_black_ = true;
-                __x = __x->__parent_;
-                __x->__is_black_ = __x == __root;
-                __y->__is_black_ = true;
-            }
-            else
-            {
-                if (__tree_is_left_child(__x))
-                {
-                    __x = __x->__parent_;
-                    __tree_right_rotate(__x);
-                }
-                __x = __x->__parent_;
-                __x->__is_black_ = true;
-                __x = __x->__parent_;
-                __x->__is_black_ = false;
-                __tree_left_rotate(__x);
-                break;
-            }
-        }
-    }
-}
-
-// Precondition:  __root != nullptr && __z != nullptr.
-//                __tree_invariant(__root) == true.
-//                __z == __root or == a direct or indirect child of __root.
-// Effects:  unlinks __z from the tree rooted at __root, rebalancing as needed.
-// Postcondition: __tree_invariant(end_node->__left_) == true && end_node->__left_
-//                nor any of its children refer to __z.  end_node->__left_
-//                may be different than the value passed in as __root.
-template <class _NodePtr>
-void
-__tree_remove(_NodePtr __root, _NodePtr __z) _NOEXCEPT
-{
-    // __z will be removed from the tree.  Client still needs to destruct/deallocate it
-    // __y is either __z, or if __z has two children, __tree_next(__z).
-    // __y will have at most one child.
-    // __y will be the initial hole in the tree (make the hole at a leaf)
-    _NodePtr __y = (__z->__left_ == nullptr || __z->__right_ == nullptr) ?
-                    __z : __tree_next(__z);
-    // __x is __y's possibly null single child
-    _NodePtr __x = __y->__left_ != nullptr ? __y->__left_ : __y->__right_;
-    // __w is __x's possibly null uncle (will become __x's sibling)
-    _NodePtr __w = nullptr;
-    // link __x to __y's parent, and find __w
-    if (__x != nullptr)
-        __x->__parent_ = __y->__parent_;
-    if (__tree_is_left_child(__y))
-    {
-        __y->__parent_->__left_ = __x;
-        if (__y != __root)
-            __w = __y->__parent_->__right_;
-        else
-            __root = __x;  // __w == nullptr
-    }
-    else
-    {
-        __y->__parent_->__right_ = __x;
-        // __y can't be root if it is a right child
-        __w = __y->__parent_->__left_;
-    }
-    bool __removed_black = __y->__is_black_;
-    // If we didn't remove __z, do so now by splicing in __y for __z,
-    //    but copy __z's color.  This does not impact __x or __w.
-    if (__y != __z)
-    {
-        // __z->__left_ != nulptr but __z->__right_ might == __x == nullptr
-        __y->__parent_ = __z->__parent_;
-        if (__tree_is_left_child(__z))
-            __y->__parent_->__left_ = __y;
-        else
-            __y->__parent_->__right_ = __y;
-        __y->__left_ = __z->__left_;
-        __y->__left_->__parent_ = __y;
-        __y->__right_ = __z->__right_;
-        if (__y->__right_ != nullptr)
-            __y->__right_->__parent_ = __y;
-        __y->__is_black_ = __z->__is_black_;
-        if (__root == __z)
-            __root = __y;
-    }
-    // There is no need to rebalance if we removed a red, or if we removed
-    //     the last node.
-    if (__removed_black && __root != nullptr)
-    {
-        // Rebalance:
-        // __x has an implicit black color (transferred from the removed __y)
-        //    associated with it, no matter what its color is.
-        // If __x is __root (in which case it can't be null), it is supposed
-        //    to be black anyway, and if it is doubly black, then the double
-        //    can just be ignored.
-        // If __x is red (in which case it can't be null), then it can absorb
-        //    the implicit black just by setting its color to black.
-        // Since __y was black and only had one child (which __x points to), __x
-        //   is either red with no children, else null, otherwise __y would have
-        //   different black heights under left and right pointers.
-        // if (__x == __root || __x != nullptr && !__x->__is_black_)
-        if (__x != nullptr)
-            __x->__is_black_ = true;
-        else
-        {
-            //  Else __x isn't root, and is "doubly black", even though it may
-            //     be null.  __w can not be null here, else the parent would
-            //     see a black height >= 2 on the __x side and a black height
-            //     of 1 on the __w side (__w must be a non-null black or a red
-            //     with a non-null black child).
-            while (true)
-            {
-                if (!__tree_is_left_child(__w))  // if x is left child
-                {
-                    if (!__w->__is_black_)
-                    {
-                        __w->__is_black_ = true;
-                        __w->__parent_->__is_black_ = false;
-                        __tree_left_rotate(__w->__parent_);
-                        // __x is still valid
-                        // reset __root only if necessary
-                        if (__root == __w->__left_)
-                            __root = __w;
-                        // reset sibling, and it still can't be null
-                        __w = __w->__left_->__right_;
-                    }
-                    // __w->__is_black_ is now true, __w may have null children
-                    if ((__w->__left_  == nullptr || __w->__left_->__is_black_) &&
-                        (__w->__right_ == nullptr || __w->__right_->__is_black_))
-                    {
-                        __w->__is_black_ = false;
-                        __x = __w->__parent_;
-                        // __x can no longer be null
-                        if (__x == __root || !__x->__is_black_)
-                        {
-                            __x->__is_black_ = true;
-                            break;
-                        }
-                        // reset sibling, and it still can't be null
-                        __w = __tree_is_left_child(__x) ?
-                                    __x->__parent_->__right_ :
-                                    __x->__parent_->__left_;
-                        // continue;
-                    }
-                    else  // __w has a red child
-                    {
-                        if (__w->__right_ == nullptr || __w->__right_->__is_black_)
-                        {
-                            // __w left child is non-null and red
-                            __w->__left_->__is_black_ = true;
-                            __w->__is_black_ = false;
-                            __tree_right_rotate(__w);
-                            // __w is known not to be root, so root hasn't changed
-                            // reset sibling, and it still can't be null
-                            __w = __w->__parent_;
-                        }
-                        // __w has a right red child, left child may be null
-                        __w->__is_black_ = __w->__parent_->__is_black_;
-                        __w->__parent_->__is_black_ = true;
-                        __w->__right_->__is_black_ = true;
-                        __tree_left_rotate(__w->__parent_);
-                        break;
-                    }
-                }
-                else
-                {
-                    if (!__w->__is_black_)
-                    {
-                        __w->__is_black_ = true;
-                        __w->__parent_->__is_black_ = false;
-                        __tree_right_rotate(__w->__parent_);
-                        // __x is still valid
-                        // reset __root only if necessary
-                        if (__root == __w->__right_)
-                            __root = __w;
-                        // reset sibling, and it still can't be null
-                        __w = __w->__right_->__left_;
-                    }
-                    // __w->__is_black_ is now true, __w may have null children
-                    if ((__w->__left_  == nullptr || __w->__left_->__is_black_) &&
-                        (__w->__right_ == nullptr || __w->__right_->__is_black_))
-                    {
-                        __w->__is_black_ = false;
-                        __x = __w->__parent_;
-                        // __x can no longer be null
-                        if (!__x->__is_black_ || __x == __root)
-                        {
-                            __x->__is_black_ = true;
-                            break;
-                        }
-                        // reset sibling, and it still can't be null
-                        __w = __tree_is_left_child(__x) ?
-                                    __x->__parent_->__right_ :
-                                    __x->__parent_->__left_;
-                        // continue;
-                    }
-                    else  // __w has a red child
-                    {
-                        if (__w->__left_ == nullptr || __w->__left_->__is_black_)
-                        {
-                            // __w right child is non-null and red
-                            __w->__right_->__is_black_ = true;
-                            __w->__is_black_ = false;
-                            __tree_left_rotate(__w);
-                            // __w is known not to be root, so root hasn't changed
-                            // reset sibling, and it still can't be null
-                            __w = __w->__parent_;
-                        }
-                        // __w has a left red child, right child may be null
-                        __w->__is_black_ = __w->__parent_->__is_black_;
-                        __w->__parent_->__is_black_ = true;
-                        __w->__left_->__is_black_ = true;
-                        __tree_right_rotate(__w->__parent_);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
-
-template <class _Allocator> class __map_node_destructor;
-
-template <class _Allocator>
-class __tree_node_destructor
-{
-    typedef _Allocator                                      allocator_type;
-    typedef allocator_traits<allocator_type>                __alloc_traits;
-    typedef typename __alloc_traits::value_type::value_type value_type;
-public:
-    typedef typename __alloc_traits::pointer                pointer;
-private:
-
-    allocator_type& __na_;
-
-    __tree_node_destructor& operator=(const __tree_node_destructor&);
-
-public:
-    bool __value_constructed;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __tree_node_destructor(allocator_type& __na) _NOEXCEPT
-        : __na_(__na),
-          __value_constructed(false)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        if (__value_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_));
-        if (__p)
-            __alloc_traits::deallocate(__na_, __p, 1);
-    }
-
-    template <class> friend class __map_node_destructor;
-};
-
-// node
-
-template <class _Pointer>
-class __tree_end_node
-{
-public:
-    typedef _Pointer pointer;
-    pointer __left_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_end_node() _NOEXCEPT : __left_() {}
-};
-
-template <class _VoidPtr>
-class __tree_node_base
-    : public __tree_end_node
-             <
-                typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                     rebind<__tree_node_base<_VoidPtr> >
-#else
-                     rebind<__tree_node_base<_VoidPtr> >::other
-#endif
-             >
-{
-    __tree_node_base(const __tree_node_base&);
-    __tree_node_base& operator=(const __tree_node_base&);
-public:
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__tree_node_base>
-#else
-            rebind<__tree_node_base>::other
-#endif
-                                                pointer;
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const __tree_node_base>
-#else
-            rebind<const __tree_node_base>::other
-#endif
-                                                const_pointer;
-    typedef __tree_end_node<pointer> base;
-
-    pointer __right_;
-    pointer __parent_;
-    bool __is_black_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_node_base() _NOEXCEPT
-        : __right_(), __parent_(), __is_black_(false) {}
-};
-
-template <class _Tp, class _VoidPtr>
-class __tree_node
-    : public __tree_node_base<_VoidPtr>
-{
-public:
-    typedef __tree_node_base<_VoidPtr> base;
-    typedef _Tp value_type;
-
-    value_type __value_;
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tree_node(_Args&& ...__args)
-            : __value_(_VSTD::forward<_Args>(__args)...) {}
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __tree_node(const value_type& __v)
-            : __value_(__v) {}
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-};
-
-template <class _TreeIterator> class _LIBCPP_TYPE_VIS_ONLY __map_iterator;
-template <class _TreeIterator> class _LIBCPP_TYPE_VIS_ONLY __map_const_iterator;
-
-template <class _Tp, class _NodePtr, class _DiffType>
-class _LIBCPP_TYPE_VIS_ONLY __tree_iterator
-{
-    typedef _NodePtr                                              __node_pointer;
-    typedef typename pointer_traits<__node_pointer>::element_type __node;
-    typedef typename __node::base                                 __node_base;
-    typedef typename __node_base::pointer                         __node_base_pointer;
-
-    __node_pointer __ptr_;
-
-    typedef pointer_traits<__node_pointer> __pointer_traits;
-public:
-    typedef bidirectional_iterator_tag iterator_category;
-    typedef _Tp                        value_type;
-    typedef _DiffType                  difference_type;
-    typedef value_type&                reference;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                       pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __tree_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __ptr_(nullptr)
-#endif
-    {}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const
-        {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_iterator& operator++()
-        {__ptr_ = static_cast<__node_pointer>(__tree_next(static_cast<__node_base_pointer>(__ptr_)));
-         return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_iterator operator++(int)
-        {__tree_iterator __t(*this); ++(*this); return __t;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_iterator& operator--()
-        {__ptr_ = static_cast<__node_pointer>(__tree_prev(static_cast<__node_base_pointer>(__ptr_)));
-         return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_iterator operator--(int)
-        {__tree_iterator __t(*this); --(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY 
-        bool operator==(const __tree_iterator& __x, const __tree_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const __tree_iterator& __x, const __tree_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __tree_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
-    template <class, class, class> friend class __tree;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY __tree_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __map_iterator;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY set;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multiset;
-};
-
-template <class _Tp, class _ConstNodePtr, class _DiffType>
-class _LIBCPP_TYPE_VIS_ONLY __tree_const_iterator
-{
-    typedef _ConstNodePtr                                         __node_pointer;
-    typedef typename pointer_traits<__node_pointer>::element_type __node;
-    typedef typename __node::base                                 __node_base;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__node_base>
-#else
-            rebind<__node_base>::other
-#endif
-                                                                  __node_base_pointer;
-
-    __node_pointer __ptr_;
-
-    typedef pointer_traits<__node_pointer> __pointer_traits;
-public:
-    typedef bidirectional_iterator_tag       iterator_category;
-    typedef _Tp                              value_type;
-    typedef _DiffType                        difference_type;
-    typedef const value_type&                reference;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                       pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __tree_const_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __ptr_(nullptr)
-#endif
-    {}
-
-private:
-    typedef typename remove_const<__node>::type  __non_const_node;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__non_const_node>
-#else
-            rebind<__non_const_node>::other
-#endif
-                                                 __non_const_node_pointer;
-    typedef __tree_iterator<value_type, __non_const_node_pointer, difference_type>
-                                                 __non_const_iterator;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator(__non_const_iterator __p) _NOEXCEPT
-        : __ptr_(__p.__ptr_) {}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const
-        {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator& operator++()
-        {__ptr_ = static_cast<__node_pointer>(__tree_next(static_cast<__node_base_pointer>(__ptr_)));
-         return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator operator++(int)
-        {__tree_const_iterator __t(*this); ++(*this); return __t;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator& operator--()
-        {__ptr_ = static_cast<__node_pointer>(__tree_prev(static_cast<__node_base_pointer>(__ptr_)));
-         return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator operator--(int)
-        {__tree_const_iterator __t(*this); --(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const __tree_const_iterator& __x, const __tree_const_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const __tree_const_iterator& __x, const __tree_const_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __tree_const_iterator(__node_pointer __p) _NOEXCEPT
-        : __ptr_(__p) {}
-    template <class, class, class> friend class __tree;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY set;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multiset;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __map_const_iterator;
-};
-
-template <class _Tp, class _Compare, class _Allocator>
-class __tree
-{
-public:
-    typedef _Tp                                      value_type;
-    typedef _Compare                                 value_compare;
-    typedef _Allocator                               allocator_type;
-    typedef allocator_traits<allocator_type>         __alloc_traits;
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-
-    typedef typename __alloc_traits::void_pointer  __void_pointer;
-
-    typedef __tree_node<value_type, __void_pointer> __node;
-    typedef __tree_node_base<__void_pointer>        __node_base;
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__node>
-#else
-            rebind_alloc<__node>::other
-#endif
-                                                     __node_allocator;
-    typedef allocator_traits<__node_allocator>       __node_traits;
-    typedef typename __node_traits::pointer          __node_pointer;
-    typedef typename __node_traits::pointer          __node_const_pointer;
-    typedef typename __node_base::pointer            __node_base_pointer;
-    typedef typename __node_base::pointer            __node_base_const_pointer;
-private:
-    typedef typename __node_base::base __end_node_t;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__end_node_t>
-#else
-            rebind<__end_node_t>::other
-#endif
-                                                     __end_node_ptr;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__end_node_t>
-#else
-            rebind<__end_node_t>::other
-#endif
-                                                     __end_node_const_ptr;
-
-    __node_pointer                                          __begin_node_;
-    __compressed_pair<__end_node_t, __node_allocator>  __pair1_;
-    __compressed_pair<size_type, value_compare>        __pair3_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __node_pointer __end_node() _NOEXCEPT
-    {
-        return static_cast<__node_pointer>
-               (
-                   pointer_traits<__end_node_ptr>::pointer_to(__pair1_.first())
-               );
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __node_const_pointer __end_node() const _NOEXCEPT
-    {
-        return static_cast<__node_const_pointer>
-               (
-                   pointer_traits<__end_node_const_ptr>::pointer_to(const_cast<__end_node_t&>(__pair1_.first()))
-               );
-    }
-    _LIBCPP_INLINE_VISIBILITY
-          __node_allocator& __node_alloc() _NOEXCEPT {return __pair1_.second();}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_allocator& __node_alloc() const _NOEXCEPT
-        {return __pair1_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-          __node_pointer& __begin_node() _NOEXCEPT {return __begin_node_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_pointer& __begin_node() const _NOEXCEPT {return __begin_node_;}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type __alloc() const _NOEXCEPT
-        {return allocator_type(__node_alloc());}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-          size_type& size() _NOEXCEPT {return __pair3_.first();}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    const size_type& size() const _NOEXCEPT {return __pair3_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-          value_compare& value_comp() _NOEXCEPT {return __pair3_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_compare& value_comp() const _NOEXCEPT
-        {return __pair3_.second();}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __node_pointer __root() _NOEXCEPT
-        {return static_cast<__node_pointer>      (__end_node()->__left_);}
-    _LIBCPP_INLINE_VISIBILITY
-    __node_const_pointer __root() const _NOEXCEPT
-        {return static_cast<__node_const_pointer>(__end_node()->__left_);}
-
-    typedef __tree_iterator<value_type, __node_pointer, difference_type>             iterator;
-    typedef __tree_const_iterator<value_type, __node_pointer, difference_type> const_iterator;
-
-    explicit __tree(const value_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<__node_allocator>::value &&
-            is_nothrow_copy_constructible<value_compare>::value);
-    explicit __tree(const allocator_type& __a);
-    __tree(const value_compare& __comp, const allocator_type& __a);
-    __tree(const __tree& __t);
-    __tree& operator=(const __tree& __t);
-    template <class _InputIterator>
-        void __assign_unique(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        void __assign_multi(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __tree(__tree&& __t)
-        _NOEXCEPT_(
-            is_nothrow_move_constructible<__node_allocator>::value &&
-            is_nothrow_move_constructible<value_compare>::value);
-    __tree(__tree&& __t, const allocator_type& __a);
-    __tree& operator=(__tree&& __t)
-        _NOEXCEPT_(
-            __node_traits::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<value_compare>::value &&
-            is_nothrow_move_assignable<__node_allocator>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    ~__tree();
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin()  _NOEXCEPT {return       iterator(__begin_node());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return const_iterator(__begin_node());}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT {return       iterator(__end_node());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT {return const_iterator(__end_node());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-        {return __node_traits::max_size(__node_alloc());}
-
-    void clear() _NOEXCEPT;
-
-    void swap(__tree& __t)
-        _NOEXCEPT_(
-            __is_nothrow_swappable<value_compare>::value &&
-            (!__node_traits::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<__node_allocator>::value));
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        pair<iterator, bool>
-        __emplace_unique(_Args&&... __args);
-    template <class... _Args>
-        iterator
-        __emplace_multi(_Args&&... __args);
-
-    template <class... _Args>
-        iterator
-        __emplace_hint_unique(const_iterator __p, _Args&&... __args);
-    template <class... _Args>
-        iterator
-        __emplace_hint_multi(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Vp>
-        pair<iterator, bool> __insert_unique(_Vp&& __v);
-    template <class _Vp>
-        iterator __insert_unique(const_iterator __p, _Vp&& __v);
-    template <class _Vp>
-        iterator __insert_multi(_Vp&& __v);
-    template <class _Vp>
-        iterator __insert_multi(const_iterator __p, _Vp&& __v);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    pair<iterator, bool> __insert_unique(const value_type& __v);
-    iterator __insert_unique(const_iterator __p, const value_type& __v);
-    iterator __insert_multi(const value_type& __v);
-    iterator __insert_multi(const_iterator __p, const value_type& __v);
-
-    pair<iterator, bool> __node_insert_unique(__node_pointer __nd);
-    iterator             __node_insert_unique(const_iterator __p,
-                                              __node_pointer __nd);
-
-    iterator __node_insert_multi(__node_pointer __nd);
-    iterator __node_insert_multi(const_iterator __p, __node_pointer __nd);
-
-    iterator erase(const_iterator __p);
-    iterator erase(const_iterator __f, const_iterator __l);
-    template <class _Key>
-        size_type __erase_unique(const _Key& __k);
-    template <class _Key>
-        size_type __erase_multi(const _Key& __k);
-
-    void __insert_node_at(__node_base_pointer __parent,
-                          __node_base_pointer& __child,
-                          __node_base_pointer __new_node);
-
-    template <class _Key>
-        iterator find(const _Key& __v);
-    template <class _Key>
-        const_iterator find(const _Key& __v) const;
-
-    template <class _Key>
-        size_type __count_unique(const _Key& __k) const;
-    template <class _Key>
-        size_type __count_multi(const _Key& __k) const;
-
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator lower_bound(const _Key& __v)
-            {return __lower_bound(__v, __root(), __end_node());}
-    template <class _Key>
-        iterator __lower_bound(const _Key& __v,
-                               __node_pointer __root,
-                               __node_pointer __result);
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        const_iterator lower_bound(const _Key& __v) const
-            {return __lower_bound(__v, __root(), __end_node());}
-    template <class _Key>
-        const_iterator __lower_bound(const _Key& __v,
-                                     __node_const_pointer __root,
-                                     __node_const_pointer __result) const;
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator upper_bound(const _Key& __v)
-            {return __upper_bound(__v, __root(), __end_node());}
-    template <class _Key>
-        iterator __upper_bound(const _Key& __v,
-                               __node_pointer __root,
-                               __node_pointer __result);
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        const_iterator upper_bound(const _Key& __v) const
-            {return __upper_bound(__v, __root(), __end_node());}
-    template <class _Key>
-        const_iterator __upper_bound(const _Key& __v,
-                                     __node_const_pointer __root,
-                                     __node_const_pointer __result) const;
-    template <class _Key>
-        pair<iterator, iterator>
-        __equal_range_unique(const _Key& __k);
-    template <class _Key>
-        pair<const_iterator, const_iterator>
-        __equal_range_unique(const _Key& __k) const;
-
-    template <class _Key>
-        pair<iterator, iterator>
-        __equal_range_multi(const _Key& __k);
-    template <class _Key>
-        pair<const_iterator, const_iterator>
-        __equal_range_multi(const _Key& __k) const;
-
-    typedef __tree_node_destructor<__node_allocator> _Dp;
-    typedef unique_ptr<__node, _Dp> __node_holder;
-
-    __node_holder remove(const_iterator __p) _NOEXCEPT;
-private:
-    typename __node_base::pointer&
-        __find_leaf_low(typename __node_base::pointer& __parent, const value_type& __v);
-    typename __node_base::pointer&
-        __find_leaf_high(typename __node_base::pointer& __parent, const value_type& __v);
-    typename __node_base::pointer&
-        __find_leaf(const_iterator __hint,
-                    typename __node_base::pointer& __parent, const value_type& __v);
-    template <class _Key>
-        typename __node_base::pointer&
-        __find_equal(typename __node_base::pointer& __parent, const _Key& __v);
-    template <class _Key>
-        typename __node_base::pointer&
-        __find_equal(const_iterator __hint, typename __node_base::pointer& __parent,
-                     const _Key& __v);
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class ..._Args>
-        __node_holder __construct_node(_Args&& ...__args);
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-        __node_holder __construct_node(const value_type& __v);
-#endif
-
-    void destroy(__node_pointer __nd) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __tree& __t)
-        {__copy_assign_alloc(__t, integral_constant<bool,
-             __node_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __tree& __t, true_type)
-        {__node_alloc() = __t.__node_alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __tree& __t, false_type) {}
-
-    void __move_assign(__tree& __t, false_type);
-    void __move_assign(__tree& __t, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<value_compare>::value &&
-                   is_nothrow_move_assignable<__node_allocator>::value);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__tree& __t)
-        _NOEXCEPT_(
-            !__node_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<__node_allocator>::value)
-        {__move_assign_alloc(__t, integral_constant<bool,
-             __node_traits::propagate_on_container_move_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__tree& __t, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value)
-        {__node_alloc() = _VSTD::move(__t.__node_alloc());}
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__tree& __t, false_type) _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y)
-        _NOEXCEPT_(
-            !__node_traits::propagate_on_container_swap::value ||
-            __is_nothrow_swappable<__node_allocator>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __node_traits::propagate_on_container_swap::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<__node_allocator>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y, false_type)
-        _NOEXCEPT
-        {}
-
-    __node_pointer __detach();
-    static __node_pointer __detach(__node_pointer);
-
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-};
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(const value_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<__node_allocator>::value &&
-            is_nothrow_copy_constructible<value_compare>::value)
-    : __pair3_(0, __comp)
-{
-    __begin_node() = __end_node();
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(const allocator_type& __a)
-    : __pair1_(__node_allocator(__a)),
-      __begin_node_(__node_pointer()),
-      __pair3_(0)
-{
-    __begin_node() = __end_node();
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(const value_compare& __comp,
-                                           const allocator_type& __a)
-    : __pair1_(__node_allocator(__a)),
-      __begin_node_(__node_pointer()),
-      __pair3_(0, __comp)
-{
-    __begin_node() = __end_node();
-}
-
-// Precondition:  size() != 0
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_pointer
-__tree<_Tp, _Compare, _Allocator>::__detach()
-{
-    __node_pointer __cache = __begin_node();
-    __begin_node() = __end_node();
-    __end_node()->__left_->__parent_ = nullptr;
-    __end_node()->__left_ = nullptr;
-    size() = 0;
-    // __cache->__left_ == nullptr
-    if (__cache->__right_ != nullptr)
-        __cache = static_cast<__node_pointer>(__cache->__right_);
-    // __cache->__left_ == nullptr
-    // __cache->__right_ == nullptr
-    return __cache;
-}
-
-// Precondition:  __cache != nullptr
-//    __cache->left_ == nullptr
-//    __cache->right_ == nullptr
-//    This is no longer a red-black tree
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_pointer
-__tree<_Tp, _Compare, _Allocator>::__detach(__node_pointer __cache)
-{
-    if (__cache->__parent_ == nullptr)
-        return nullptr;
-    if (__tree_is_left_child(static_cast<__node_base_pointer>(__cache)))
-    {
-        __cache->__parent_->__left_ = nullptr;
-        __cache = static_cast<__node_pointer>(__cache->__parent_);
-        if (__cache->__right_ == nullptr)
-            return __cache;
-        return static_cast<__node_pointer>(__tree_leaf(__cache->__right_));
-    }
-    // __cache is right child
-    __cache->__parent_->__right_ = nullptr;
-    __cache = static_cast<__node_pointer>(__cache->__parent_);
-    if (__cache->__left_ == nullptr)
-        return __cache;
-    return static_cast<__node_pointer>(__tree_leaf(__cache->__left_));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>&
-__tree<_Tp, _Compare, _Allocator>::operator=(const __tree& __t)
-{
-    if (this != &__t)
-    {
-        value_comp() = __t.value_comp();
-        __copy_assign_alloc(__t);
-        __assign_multi(__t.begin(), __t.end());
-    }
-    return *this;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _InputIterator>
-void
-__tree<_Tp, _Compare, _Allocator>::__assign_unique(_InputIterator __first, _InputIterator __last)
-{
-    if (size() != 0)
-    {
-        __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __cache != nullptr && __first != __last; ++__first)
-            {
-                __cache->__value_ = *__first;
-                __node_pointer __next = __detach(__cache);
-                __node_insert_unique(__cache);
-                __cache = __next;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (__cache->__parent_ != nullptr)
-                __cache = static_cast<__node_pointer>(__cache->__parent_);
-            destroy(__cache);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if (__cache != nullptr)
-        {
-            while (__cache->__parent_ != nullptr)
-                __cache = static_cast<__node_pointer>(__cache->__parent_);
-            destroy(__cache);
-        }
-    }
-    for (; __first != __last; ++__first)
-        __insert_unique(*__first);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _InputIterator>
-void
-__tree<_Tp, _Compare, _Allocator>::__assign_multi(_InputIterator __first, _InputIterator __last)
-{
-    if (size() != 0)
-    {
-        __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __cache != nullptr && __first != __last; ++__first)
-            {
-                __cache->__value_ = *__first;
-                __node_pointer __next = __detach(__cache);
-                __node_insert_multi(__cache);
-                __cache = __next;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (__cache->__parent_ != nullptr)
-                __cache = static_cast<__node_pointer>(__cache->__parent_);
-            destroy(__cache);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if (__cache != nullptr)
-        {
-            while (__cache->__parent_ != nullptr)
-                __cache = static_cast<__node_pointer>(__cache->__parent_);
-            destroy(__cache);
-        }
-    }
-    for (; __first != __last; ++__first)
-        __insert_multi(*__first);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(const __tree& __t)
-    : __begin_node_(__node_pointer()),
-      __pair1_(__node_traits::select_on_container_copy_construction(__t.__node_alloc())),
-      __pair3_(0, __t.value_comp())
-{
-    __begin_node() = __end_node();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t)
-    _NOEXCEPT_(
-        is_nothrow_move_constructible<__node_allocator>::value &&
-        is_nothrow_move_constructible<value_compare>::value)
-    : __begin_node_(_VSTD::move(__t.__begin_node_)),
-      __pair1_(_VSTD::move(__t.__pair1_)),
-      __pair3_(_VSTD::move(__t.__pair3_))
-{
-    if (size() == 0)
-        __begin_node() = __end_node();
-    else
-    {
-        __end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__end_node());
-        __t.__begin_node() = __t.__end_node();
-        __t.__end_node()->__left_ = nullptr;
-        __t.size() = 0;
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t, const allocator_type& __a)
-    : __pair1_(__node_allocator(__a)),
-      __pair3_(0, _VSTD::move(__t.value_comp()))
-{
-    if (__a == __t.__alloc())
-    {
-        if (__t.size() == 0)
-            __begin_node() = __end_node();
-        else
-        {
-            __begin_node() = __t.__begin_node();
-            __end_node()->__left_ = __t.__end_node()->__left_;
-            __end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__end_node());
-            size() = __t.size();
-            __t.__begin_node() = __t.__end_node();
-            __t.__end_node()->__left_ = nullptr;
-            __t.size() = 0;
-        }
-    }
-    else
-    {
-        __begin_node() = __end_node();
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<value_compare>::value &&
-               is_nothrow_move_assignable<__node_allocator>::value)
-{
-    destroy(static_cast<__node_pointer>(__end_node()->__left_));
-    __begin_node_ = __t.__begin_node_;
-    __pair1_.first() = __t.__pair1_.first();
-    __move_assign_alloc(__t);
-    __pair3_ = _VSTD::move(__t.__pair3_);
-    if (size() == 0)
-        __begin_node() = __end_node();
-    else
-    {
-        __end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__end_node());
-        __t.__begin_node() = __t.__end_node();
-        __t.__end_node()->__left_ = nullptr;
-        __t.size() = 0;
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, false_type)
-{
-    if (__node_alloc() == __t.__node_alloc())
-        __move_assign(__t, true_type());
-    else
-    {
-        value_comp() = _VSTD::move(__t.value_comp());
-        const_iterator __e = end();
-        if (size() != 0)
-        {
-            __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            try
-            {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                while (__cache != nullptr && __t.size() != 0)
-                {
-                    __cache->__value_ = _VSTD::move(__t.remove(__t.begin())->__value_);
-                    __node_pointer __next = __detach(__cache);
-                    __node_insert_multi(__cache);
-                    __cache = __next;
-                }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            }
-            catch (...)
-            {
-                while (__cache->__parent_ != nullptr)
-                    __cache = static_cast<__node_pointer>(__cache->__parent_);
-                destroy(__cache);
-                throw;
-            }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            if (__cache != nullptr)
-            {
-                while (__cache->__parent_ != nullptr)
-                    __cache = static_cast<__node_pointer>(__cache->__parent_);
-                destroy(__cache);
-            }
-        }
-        while (__t.size() != 0)
-            __insert_multi(__e, _VSTD::move(__t.remove(__t.begin())->__value_));
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>&
-__tree<_Tp, _Compare, _Allocator>::operator=(__tree&& __t)
-    _NOEXCEPT_(
-        __node_traits::propagate_on_container_move_assignment::value &&
-        is_nothrow_move_assignable<value_compare>::value &&
-        is_nothrow_move_assignable<__node_allocator>::value)
-        
-{
-    __move_assign(__t, integral_constant<bool,
-                  __node_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::~__tree()
-{
-    destroy(__root());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::destroy(__node_pointer __nd) _NOEXCEPT
-{
-    if (__nd != nullptr)
-    {
-        destroy(static_cast<__node_pointer>(__nd->__left_));
-        destroy(static_cast<__node_pointer>(__nd->__right_));
-        __node_allocator& __na = __node_alloc();
-        __node_traits::destroy(__na, _VSTD::addressof(__nd->__value_));
-        __node_traits::deallocate(__na, __nd, 1);
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::swap(__tree& __t)
-    _NOEXCEPT_(
-        __is_nothrow_swappable<value_compare>::value &&
-        (!__node_traits::propagate_on_container_swap::value ||
-         __is_nothrow_swappable<__node_allocator>::value))
-{
-    using _VSTD::swap;
-    swap(__begin_node_, __t.__begin_node_);
-    swap(__pair1_.first(), __t.__pair1_.first());
-    __swap_alloc(__node_alloc(), __t.__node_alloc());
-    __pair3_.swap(__t.__pair3_);
-    if (size() == 0)
-        __begin_node() = __end_node();
-    else
-        __end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__end_node());
-    if (__t.size() == 0)
-        __t.__begin_node() = __t.__end_node();
-    else
-        __t.__end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__t.__end_node());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::clear() _NOEXCEPT
-{
-    destroy(__root());
-    size() = 0;
-    __begin_node() = __end_node();
-    __end_node()->__left_ = nullptr;
-}
-
-// Find lower_bound place to insert
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_leaf_low(typename __node_base::pointer& __parent,
-                                                   const value_type& __v)
-{
-    __node_pointer __nd = __root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (value_comp()(__nd->__value_, __v))
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__right_;
-                }
-            }
-            else
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__left_;
-                }
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__end_node());
-    return __parent->__left_;
-}
-
-// Find upper_bound place to insert
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_leaf_high(typename __node_base::pointer& __parent,
-                                                    const value_type& __v)
-{
-    __node_pointer __nd = __root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (value_comp()(__v, __nd->__value_))
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__left_;
-                }
-            }
-            else
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__right_;
-                }
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__end_node());
-    return __parent->__left_;
-}
-
-// Find leaf place to insert closest to __hint
-// First check prior to __hint.
-// Next check after __hint.
-// Next do O(log N) search.
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_leaf(const_iterator __hint,
-                                               typename __node_base::pointer& __parent,
-                                               const value_type& __v)
-{
-    if (__hint == end() || !value_comp()(*__hint, __v))  // check before
-    {
-        // __v <= *__hint
-        const_iterator __prior = __hint;
-        if (__prior == begin() || !value_comp()(__v, *--__prior))
-        {
-            // *prev(__hint) <= __v <= *__hint
-            if (__hint.__ptr_->__left_ == nullptr)
-            {
-                __parent = static_cast<__node_base_pointer>(__hint.__ptr_);
-                return __parent->__left_;
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__prior.__ptr_);
-                return __parent->__right_;
-            }
-        }
-        // __v < *prev(__hint)
-        return __find_leaf_high(__parent, __v);
-    }
-    // else __v > *__hint
-    return __find_leaf_low(__parent, __v);
-}
-
-// Find place to insert if __v doesn't exist
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-// If __v exists, set parent to node of __v and return reference to node of __v
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_equal(typename __node_base::pointer& __parent,
-                                                const _Key& __v)
-{
-    __node_pointer __nd = __root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (value_comp()(__v, __nd->__value_))
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__left_;
-                }
-            }
-            else if (value_comp()(__nd->__value_, __v))
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__right_;
-                }
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__nd);
-                return __parent;
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__end_node());
-    return __parent->__left_;
-}
-
-// Find place to insert if __v doesn't exist
-// First check prior to __hint.
-// Next check after __hint.
-// Next do O(log N) search.
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-// If __v exists, set parent to node of __v and return reference to node of __v
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_equal(const_iterator __hint,
-                                                typename __node_base::pointer& __parent,
-                                                const _Key& __v)
-{
-    if (__hint == end() || value_comp()(__v, *__hint))  // check before
-    {
-        // __v < *__hint
-        const_iterator __prior = __hint;
-        if (__prior == begin() || value_comp()(*--__prior, __v))
-        {
-            // *prev(__hint) < __v < *__hint
-            if (__hint.__ptr_->__left_ == nullptr)
-            {
-                __parent = static_cast<__node_base_pointer>(__hint.__ptr_);
-                return __parent->__left_;
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__prior.__ptr_);
-                return __parent->__right_;
-            }
-        }
-        // __v <= *prev(__hint)
-        return __find_equal(__parent, __v);
-    }
-    else if (value_comp()(*__hint, __v))  // check after
-    {
-        // *__hint < __v
-        const_iterator __next = _VSTD::next(__hint);
-        if (__next == end() || value_comp()(__v, *__next))
-        {
-            // *__hint < __v < *_VSTD::next(__hint)
-            if (__hint.__ptr_->__right_ == nullptr)
-            {
-                __parent = static_cast<__node_base_pointer>(__hint.__ptr_);
-                return __parent->__right_;
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__next.__ptr_);
-                return __parent->__left_;
-            }
-        }
-        // *next(__hint) <= __v
-        return __find_equal(__parent, __v);
-    }
-    // else __v == *__hint
-    __parent = static_cast<__node_base_pointer>(__hint.__ptr_);
-    return __parent;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::__insert_node_at(__node_base_pointer __parent,
-                                                    __node_base_pointer& __child,
-                                                    __node_base_pointer __new_node)
-{
-    __new_node->__left_   = nullptr;
-    __new_node->__right_  = nullptr;
-    __new_node->__parent_ = __parent;
-    __child = __new_node;
-    if (__begin_node()->__left_ != nullptr)
-        __begin_node() = static_cast<__node_pointer>(__begin_node()->__left_);
-    __tree_balance_after_insert(__end_node()->__left_, __child);
-    ++size();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-typename __tree<_Tp, _Compare, _Allocator>::__node_holder
-__tree<_Tp, _Compare, _Allocator>::__construct_node(_Args&& ...__args)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__value_constructed = true;
-    return __h;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class... _Args>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>
-__tree<_Tp, _Compare, _Allocator>::__emplace_unique(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__parent, __h->__value_);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    bool __inserted = false;
-    if (__child == nullptr)
-    {
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-        __inserted = true;
-    }
-    return pair<iterator, bool>(iterator(__r), __inserted);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class... _Args>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__emplace_hint_unique(const_iterator __p, _Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__p, __parent, __h->__value_);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class... _Args>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__emplace_multi(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf_high(__parent, __h->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(static_cast<__node_pointer>(__h.release()));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class... _Args>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__emplace_hint_multi(const_iterator __p,
-                                                        _Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf(__p, __parent, __h->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(static_cast<__node_pointer>(__h.release()));
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Vp>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>
-__tree<_Tp, _Compare, _Allocator>::__insert_unique(_Vp&& __v)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Vp>(__v));
-    pair<iterator, bool> __r = __node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Vp>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_unique(const_iterator __p, _Vp&& __v)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Vp>(__v));
-    iterator __r = __node_insert_unique(__p, __h.get());
-    if (__r.__ptr_ == __h.get())
-        __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Vp>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_multi(_Vp&& __v)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Vp>(__v));
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf_high(__parent, __h->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(__h.release());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Vp>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_multi(const_iterator __p, _Vp&& __v)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Vp>(__v));
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf(__p, __parent, __h->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(__h.release());
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_holder
-__tree<_Tp, _Compare, _Allocator>::__construct_node(const value_type& __v)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), __v);
-    __h.get_deleter().__value_constructed = true;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Compare, class _Allocator>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>
-__tree<_Tp, _Compare, _Allocator>::__insert_unique(const value_type& __v)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__parent, __v);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    bool __inserted = false;
-    if (__child == nullptr)
-    {
-        __node_holder __h = __construct_node(__v);
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-        __inserted = true;
-    }
-    return pair<iterator, bool>(iterator(__r), __inserted);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_unique(const_iterator __p, const value_type& __v)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__p, __parent, __v);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __node_holder __h = __construct_node(__v);
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_multi(const value_type& __v)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf_high(__parent, __v);
-    __node_holder __h = __construct_node(__v);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(__h.release());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_multi(const_iterator __p, const value_type& __v)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf(__p, __parent, __v);
-    __node_holder __h = __construct_node(__v);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(__h.release());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>
-__tree<_Tp, _Compare, _Allocator>::__node_insert_unique(__node_pointer __nd)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__parent, __nd->__value_);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    bool __inserted = false;
-    if (__child == nullptr)
-    {
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
-        __r = __nd;
-        __inserted = true;
-    }
-    return pair<iterator, bool>(iterator(__r), __inserted);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__node_insert_unique(const_iterator __p,
-                                                        __node_pointer __nd)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__p, __parent, __nd->__value_);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
-        __r = __nd;
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__node_insert_multi(__node_pointer __nd)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf_high(__parent, __nd->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
-    return iterator(__nd);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__node_insert_multi(const_iterator __p,
-                                                       __node_pointer __nd)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf(__p, __parent, __nd->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
-    return iterator(__nd);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::erase(const_iterator __p)
-{
-    __node_pointer __np = __p.__ptr_;
-    iterator __r(__np);
-    ++__r;
-    if (__begin_node() == __np)
-        __begin_node() = __r.__ptr_;
-    --size();
-    __node_allocator& __na = __node_alloc();
-    __tree_remove(__end_node()->__left_,
-                  static_cast<__node_base_pointer>(__np));
-    __node_traits::destroy(__na, const_cast<value_type*>(_VSTD::addressof(*__p)));
-    __node_traits::deallocate(__na, __np, 1);
-    return __r;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::erase(const_iterator __f, const_iterator __l)
-{
-    while (__f != __l)
-        __f = erase(__f);
-    return iterator(__l.__ptr_);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
-__tree<_Tp, _Compare, _Allocator>::__erase_unique(const _Key& __k)
-{
-    iterator __i = find(__k);
-    if (__i == end())
-        return 0;
-    erase(__i);
-    return 1;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
-__tree<_Tp, _Compare, _Allocator>::__erase_multi(const _Key& __k)
-{
-    pair<iterator, iterator> __p = __equal_range_multi(__k);
-    size_type __r = 0;
-    for (; __p.first != __p.second; ++__r)
-        __p.first = erase(__p.first);
-    return __r;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::find(const _Key& __v)
-{
-    iterator __p = __lower_bound(__v, __root(), __end_node());
-    if (__p != end() && !value_comp()(__v, *__p))
-        return __p;
-    return end();
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::const_iterator
-__tree<_Tp, _Compare, _Allocator>::find(const _Key& __v) const
-{
-    const_iterator __p = __lower_bound(__v, __root(), __end_node());
-    if (__p != end() && !value_comp()(__v, *__p))
-        return __p;
-    return end();
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
-__tree<_Tp, _Compare, _Allocator>::__count_unique(const _Key& __k) const
-{
-    __node_const_pointer __result = __end_node();
-    __node_const_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_const_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_const_pointer>(__rt->__right_);
-        else
-            return 1;
-    }
-    return 0;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
-__tree<_Tp, _Compare, _Allocator>::__count_multi(const _Key& __k) const
-{
-    __node_const_pointer __result = __end_node();
-    __node_const_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_const_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_const_pointer>(__rt->__right_);
-        else
-            return _VSTD::distance(
-                __lower_bound(__k, static_cast<__node_const_pointer>(__rt->__left_), __rt),
-                __upper_bound(__k, static_cast<__node_const_pointer>(__rt->__right_), __result)
-            );
-    }
-    return 0;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__lower_bound(const _Key& __v,
-                                                 __node_pointer __root,
-                                                 __node_pointer __result)
-{
-    while (__root != nullptr)
-    {
-        if (!value_comp()(__root->__value_, __v))
-        {
-            __result = __root;
-            __root = static_cast<__node_pointer>(__root->__left_);
-        }
-        else
-            __root = static_cast<__node_pointer>(__root->__right_);
-    }
-    return iterator(__result);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::const_iterator
-__tree<_Tp, _Compare, _Allocator>::__lower_bound(const _Key& __v,
-                                                 __node_const_pointer __root,
-                                                 __node_const_pointer __result) const
-{
-    while (__root != nullptr)
-    {
-        if (!value_comp()(__root->__value_, __v))
-        {
-            __result = __root;
-            __root = static_cast<__node_const_pointer>(__root->__left_);
-        }
-        else
-            __root = static_cast<__node_const_pointer>(__root->__right_);
-    }
-    return const_iterator(__result);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__upper_bound(const _Key& __v,
-                                                 __node_pointer __root,
-                                                 __node_pointer __result)
-{
-    while (__root != nullptr)
-    {
-        if (value_comp()(__v, __root->__value_))
-        {
-            __result = __root;
-            __root = static_cast<__node_pointer>(__root->__left_);
-        }
-        else
-            __root = static_cast<__node_pointer>(__root->__right_);
-    }
-    return iterator(__result);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::const_iterator
-__tree<_Tp, _Compare, _Allocator>::__upper_bound(const _Key& __v,
-                                                 __node_const_pointer __root,
-                                                 __node_const_pointer __result) const
-{
-    while (__root != nullptr)
-    {
-        if (value_comp()(__v, __root->__value_))
-        {
-            __result = __root;
-            __root = static_cast<__node_const_pointer>(__root->__left_);
-        }
-        else
-            __root = static_cast<__node_const_pointer>(__root->__right_);
-    }
-    return const_iterator(__result);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::iterator>
-__tree<_Tp, _Compare, _Allocator>::__equal_range_unique(const _Key& __k)
-{
-    typedef pair<iterator, iterator> _Pp;
-    __node_pointer __result = __end_node();
-    __node_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_pointer>(__rt->__right_);
-        else
-            return _Pp(iterator(__rt),
-                      iterator(
-                          __rt->__right_ != nullptr ?
-                              static_cast<__node_pointer>(__tree_min(__rt->__right_))
-                            : __result));
-    }
-    return _Pp(iterator(__result), iterator(__result));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::const_iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::const_iterator>
-__tree<_Tp, _Compare, _Allocator>::__equal_range_unique(const _Key& __k) const
-{
-    typedef pair<const_iterator, const_iterator> _Pp;
-    __node_const_pointer __result = __end_node();
-    __node_const_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_const_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_const_pointer>(__rt->__right_);
-        else
-            return _Pp(const_iterator(__rt),
-                      const_iterator(
-                          __rt->__right_ != nullptr ?
-                              static_cast<__node_const_pointer>(__tree_min(__rt->__right_))
-                            : __result));
-    }
-    return _Pp(const_iterator(__result), const_iterator(__result));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::iterator>
-__tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k)
-{
-    typedef pair<iterator, iterator> _Pp;
-    __node_pointer __result = __end_node();
-    __node_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_pointer>(__rt->__right_);
-        else
-            return _Pp(__lower_bound(__k, static_cast<__node_pointer>(__rt->__left_), __rt),
-                      __upper_bound(__k, static_cast<__node_pointer>(__rt->__right_), __result));
-    }
-    return _Pp(iterator(__result), iterator(__result));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::const_iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::const_iterator>
-__tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k) const
-{
-    typedef pair<const_iterator, const_iterator> _Pp;
-    __node_const_pointer __result = __end_node();
-    __node_const_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_const_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_const_pointer>(__rt->__right_);
-        else
-            return _Pp(__lower_bound(__k, static_cast<__node_const_pointer>(__rt->__left_), __rt),
-                      __upper_bound(__k, static_cast<__node_const_pointer>(__rt->__right_), __result));
-    }
-    return _Pp(const_iterator(__result), const_iterator(__result));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_holder
-__tree<_Tp, _Compare, _Allocator>::remove(const_iterator __p) _NOEXCEPT
-{
-    __node_pointer __np = __p.__ptr_;
-    if (__begin_node() == __np)
-    {
-        if (__np->__right_ != nullptr)
-            __begin_node() = static_cast<__node_pointer>(__np->__right_);
-        else
-            __begin_node() = static_cast<__node_pointer>(__np->__parent_);
-    }
-    --size();
-    __tree_remove(__end_node()->__left_,
-                  static_cast<__node_base_pointer>(__np));
-    return __node_holder(__np, _Dp(__node_alloc()));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__tree<_Tp, _Compare, _Allocator>& __x,
-     __tree<_Tp, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___TREE
diff --git a/include.new/c++/v1/__tuple b/include.new/c++/v1/__tuple
deleted file mode 100644
index bffb95c..0000000
--- a/include.new/c++/v1/__tuple
+++ /dev/null
@@ -1,361 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___TUPLE
-#define _LIBCPP___TUPLE
-
-#include <__config>
-#include <cstddef>
-#include <type_traits>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-#include <__tuple_03>
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// __lazy_and
-
-template <bool _Last, class ..._Preds>
-struct __lazy_and_impl;
-
-template <class ..._Preds>
-struct __lazy_and_impl<false, _Preds...> : false_type {};
-
-template <>
-struct __lazy_and_impl<true> : true_type {};
-
-template <class _Pred>
-struct __lazy_and_impl<true, _Pred> : integral_constant<bool, _Pred::type::value> {};
-
-template <class _Hp, class ..._Tp>
-struct __lazy_and_impl<true, _Hp, _Tp...> : __lazy_and_impl<_Hp::type::value, _Tp...> {};
-
-template <class _P1, class ..._Pr>
-struct __lazy_and : __lazy_and_impl<_P1::type::value, _Pr...> {};
-
-// __lazy_not
-
-template <class _Pred>
-struct __lazy_not : integral_constant<bool, !_Pred::type::value> {};
-
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size;
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<const _Tp>
-    : public tuple_size<_Tp> {};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<volatile _Tp>
-    : public tuple_size<_Tp> {};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<const volatile _Tp>
-    : public tuple_size<_Tp> {};
-
-template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_element;
-
-template <size_t _Ip, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, const _Tp>
-{
-public:
-    typedef typename add_const<typename tuple_element<_Ip, _Tp>::type>::type type;
-};
-
-template <size_t _Ip, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, volatile _Tp>
-{
-public:
-    typedef typename add_volatile<typename tuple_element<_Ip, _Tp>::type>::type type;
-};
-
-template <size_t _Ip, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, const volatile _Tp>
-{
-public:
-    typedef typename add_cv<typename tuple_element<_Ip, _Tp>::type>::type type;
-};
-
-template <class ..._Tp> class _LIBCPP_TYPE_VIS_ONLY tuple;
-template <class _T1, class _T2> struct _LIBCPP_TYPE_VIS_ONLY pair;
-template <class _Tp, size_t _Size> struct _LIBCPP_TYPE_VIS_ONLY array;
-
-template <class _Tp> struct __tuple_like : false_type {};
-
-template <class _Tp> struct __tuple_like<const _Tp> : public __tuple_like<_Tp> {};
-template <class _Tp> struct __tuple_like<volatile _Tp> : public __tuple_like<_Tp> {};
-template <class _Tp> struct __tuple_like<const volatile _Tp> : public __tuple_like<_Tp> {};
-
-template <class... _Tp> struct __tuple_like<tuple<_Tp...> > : true_type {};
-template <class _T1, class _T2> struct __tuple_like<pair<_T1, _T2> > : true_type {};
-template <class _Tp, size_t _Size> struct __tuple_like<array<_Tp, _Size> > : true_type {};
-
-template <size_t _Ip, class ..._Tp>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, tuple<_Tp...> >::type&
-get(tuple<_Tp...>&) _NOEXCEPT;
-
-template <size_t _Ip, class ..._Tp>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const typename tuple_element<_Ip, tuple<_Tp...> >::type&
-get(const tuple<_Tp...>&) _NOEXCEPT;
-
-template <size_t _Ip, class ..._Tp>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, tuple<_Tp...> >::type&&
-get(tuple<_Tp...>&&) _NOEXCEPT;
-
-template <size_t _Ip, class _T1, class _T2>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-get(pair<_T1, _T2>&) _NOEXCEPT;
-
-template <size_t _Ip, class _T1, class _T2>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-get(const pair<_T1, _T2>&) _NOEXCEPT;
-
-template <size_t _Ip, class _T1, class _T2>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
-get(pair<_T1, _T2>&&) _NOEXCEPT;
-
-template <size_t _Ip, class _Tp, size_t _Size>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&
-get(array<_Tp, _Size>&) _NOEXCEPT;
-
-template <size_t _Ip, class _Tp, size_t _Size>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-get(const array<_Tp, _Size>&) _NOEXCEPT;
-
-template <size_t _Ip, class _Tp, size_t _Size>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&&
-get(array<_Tp, _Size>&&) _NOEXCEPT;
-
-// __make_tuple_indices
-
-template <size_t...> struct __tuple_indices {};
-
-template <size_t _Sp, class _IntTuple, size_t _Ep>
-struct __make_indices_imp;
-
-template <size_t _Sp, size_t ..._Indices, size_t _Ep>
-struct __make_indices_imp<_Sp, __tuple_indices<_Indices...>, _Ep>
-{
-    typedef typename __make_indices_imp<_Sp+1, __tuple_indices<_Indices..., _Sp>, _Ep>::type type;
-};
-
-template <size_t _Ep, size_t ..._Indices>
-struct __make_indices_imp<_Ep, __tuple_indices<_Indices...>, _Ep>
-{
-    typedef __tuple_indices<_Indices...> type;
-};
-
-template <size_t _Ep, size_t _Sp = 0>
-struct __make_tuple_indices
-{
-    static_assert(_Sp <= _Ep, "__make_tuple_indices input error");
-    typedef typename __make_indices_imp<_Sp, __tuple_indices<>, _Ep>::type type;
-};
-
-// __tuple_types
-
-template <class ..._Tp> struct __tuple_types {};
-
-template <size_t _Ip>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, __tuple_types<> >
-{
-public:
-    static_assert(_Ip == 0, "tuple_element index out of range");
-    static_assert(_Ip != 0, "tuple_element index out of range");
-};
-
-template <class _Hp, class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<0, __tuple_types<_Hp, _Tp...> >
-{
-public:
-    typedef _Hp type;
-};
-
-template <size_t _Ip, class _Hp, class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, __tuple_types<_Hp, _Tp...> >
-{
-public:
-    typedef typename tuple_element<_Ip-1, __tuple_types<_Tp...> >::type type;
-};
-
-template <class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<__tuple_types<_Tp...> >
-    : public integral_constant<size_t, sizeof...(_Tp)>
-{
-};
-
-template <class... _Tp> struct __tuple_like<__tuple_types<_Tp...> > : true_type {};
-
-// __make_tuple_types
-
-// __make_tuple_types<_Tuple<_Types...>, _Ep, _Sp>::type is a
-// __tuple_types<_Types...> using only those _Types in the range [_Sp, _Ep).
-// _Sp defaults to 0 and _Ep defaults to tuple_size<_Tuple>.  If _Tuple is a
-// lvalue_reference type, then __tuple_types<_Types&...> is the result.
-
-template <class _TupleTypes, class _Tp, size_t _Sp, size_t _Ep>
-struct __make_tuple_types_imp;
-
-template <class ..._Types, class _Tp, size_t _Sp, size_t _Ep>
-struct __make_tuple_types_imp<__tuple_types<_Types...>, _Tp, _Sp, _Ep>
-{
-    typedef typename remove_reference<_Tp>::type _Tpr;
-    typedef typename __make_tuple_types_imp<__tuple_types<_Types...,
-                                            typename conditional<is_lvalue_reference<_Tp>::value,
-                                                typename tuple_element<_Sp, _Tpr>::type&,
-                                                typename tuple_element<_Sp, _Tpr>::type>::type>,
-                                            _Tp, _Sp+1, _Ep>::type type;
-};
-
-template <class ..._Types, class _Tp, size_t _Ep>
-struct __make_tuple_types_imp<__tuple_types<_Types...>, _Tp, _Ep, _Ep>
-{
-    typedef __tuple_types<_Types...> type;
-};
-
-template <class _Tp, size_t _Ep = tuple_size<typename remove_reference<_Tp>::type>::value, size_t _Sp = 0>
-struct __make_tuple_types
-{
-    static_assert(_Sp <= _Ep, "__make_tuple_types input error");
-    typedef typename __make_tuple_types_imp<__tuple_types<>, _Tp, _Sp, _Ep>::type type;
-};
-
-// __tuple_convertible
-
-template <class, class>
-struct __tuple_convertible_imp : public false_type {};
-
-template <class _Tp0, class ..._Tp, class _Up0, class ..._Up>
-struct __tuple_convertible_imp<__tuple_types<_Tp0, _Tp...>, __tuple_types<_Up0, _Up...> >
-    : public integral_constant<bool,
-                               is_convertible<_Tp0, _Up0>::value &&
-                               __tuple_convertible_imp<__tuple_types<_Tp...>, __tuple_types<_Up...> >::value> {};
-
-template <>
-struct __tuple_convertible_imp<__tuple_types<>, __tuple_types<> >
-    : public true_type {};
-
-template <bool, class, class>
-struct __tuple_convertible_apply : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_convertible_apply<true, _Tp, _Up>
-  : public __tuple_convertible_imp<
-      typename __make_tuple_types<_Tp>::type
-    , typename __make_tuple_types<_Up>::type
-    >
-{};
-
-template <class _Tp, class _Up, bool = __tuple_like<typename remove_reference<_Tp>::type>::value,
-                                bool = __tuple_like<_Up>::value>
-struct __tuple_convertible
-    : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_convertible<_Tp, _Up, true, true>
-    : public __tuple_convertible_apply<tuple_size<typename remove_reference<_Tp>::type>::value ==
-                                     tuple_size<_Up>::value, _Tp, _Up>
-{};
-
-// __tuple_constructible
-
-template <class, class>
-struct __tuple_constructible_imp : public false_type {};
-
-template <class _Tp0, class ..._Tp, class _Up0, class ..._Up>
-struct __tuple_constructible_imp<__tuple_types<_Tp0, _Tp...>, __tuple_types<_Up0, _Up...> >
-    : public integral_constant<bool,
-                               is_constructible<_Up0, _Tp0>::value &&
-                               __tuple_constructible_imp<__tuple_types<_Tp...>, __tuple_types<_Up...> >::value> {};
-
-template <>
-struct __tuple_constructible_imp<__tuple_types<>, __tuple_types<> >
-    : public true_type {};
-
-template <bool _SameSize, class, class>
-struct __tuple_constructible_apply : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_constructible_apply<true, _Tp, _Up>
-  : public __tuple_constructible_imp<
-      typename __make_tuple_types<_Tp>::type
-    , typename __make_tuple_types<_Up>::type
-    >
-{};
-
-template <class _Tp, class _Up, bool = __tuple_like<typename remove_reference<_Tp>::type>::value,
-                                bool = __tuple_like<_Up>::value>
-struct __tuple_constructible
-    : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_constructible<_Tp, _Up, true, true>
-    : public __tuple_constructible_apply<tuple_size<typename remove_reference<_Tp>::type>::value ==
-                                     tuple_size<_Up>::value, _Tp, _Up>
-{};
-
-// __tuple_assignable
-
-template <class, class>
-struct __tuple_assignable_imp : public false_type {};
-
-template <class _Tp0, class ..._Tp, class _Up0, class ..._Up>
-struct __tuple_assignable_imp<__tuple_types<_Tp0, _Tp...>, __tuple_types<_Up0, _Up...> >
-    : public integral_constant<bool,
-                               is_assignable<_Up0&, _Tp0>::value &&
-                               __tuple_assignable_imp<__tuple_types<_Tp...>, __tuple_types<_Up...> >::value> {};
-
-template <>
-struct __tuple_assignable_imp<__tuple_types<>, __tuple_types<> >
-    : public true_type {};
-
-template <bool, class, class>
-struct __tuple_assignable_apply : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_assignable_apply<true, _Tp, _Up>
-  : __tuple_assignable_imp<
-      typename __make_tuple_types<_Tp>::type
-    , typename __make_tuple_types<_Up>::type
-    >
-{};
-
-template <class _Tp, class _Up, bool = __tuple_like<typename remove_reference<_Tp>::type>::value,
-                                bool = __tuple_like<_Up>::value>
-struct __tuple_assignable
-    : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_assignable<_Tp, _Up, true, true>
-    : public __tuple_assignable_apply<tuple_size<typename remove_reference<_Tp>::type>::value ==
-                                    tuple_size<_Up>::value, _Tp, _Up>
-{};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif  // _LIBCPP___TUPLE
diff --git a/include.new/c++/v1/__tuple_03 b/include.new/c++/v1/__tuple_03
deleted file mode 100644
index b91c2cd..0000000
--- a/include.new/c++/v1/__tuple_03
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___TUPLE_03
-#define _LIBCPP___TUPLE_03
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size;
-template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_element;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___TUPLE_03
diff --git a/include.new/c++/v1/__undef_min_max b/include.new/c++/v1/__undef_min_max
deleted file mode 100644
index 5df9412..0000000
--- a/include.new/c++/v1/__undef_min_max
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifdef min
-#if defined(_MSC_VER) && ! defined(__clang__)
-_LIBCPP_WARNING("macro min is incompatible with C++.  Try #define NOMINMAX "
-                "before any Windows header. #undefing min")
-#else
-#warning: macro min is incompatible with C++.  #undefing min
-#endif
-#undef min
-#endif
-
-#ifdef max
-#if defined(_MSC_VER) && ! defined(__clang__)
-_LIBCPP_WARNING("macro max is incompatible with C++.  Try #define NOMINMAX "
-                "before any Windows header. #undefing max")
-#else
-#warning: macro max is incompatible with C++.  #undefing max
-#endif
-#undef max
-#endif
diff --git a/include.new/c++/v1/algorithm b/include.new/c++/v1/algorithm
deleted file mode 100644
index 61b0143..0000000
--- a/include.new/c++/v1/algorithm
+++ /dev/null
@@ -1,5761 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ALGORITHM
-#define _LIBCPP_ALGORITHM
-
-/*
-    algorithm synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-template <class InputIterator, class Predicate>
-    bool
-    all_of(InputIterator first, InputIterator last, Predicate pred);
-
-template <class InputIterator, class Predicate>
-    bool
-    any_of(InputIterator first, InputIterator last, Predicate pred);
-
-template <class InputIterator, class Predicate>
-    bool
-    none_of(InputIterator first, InputIterator last, Predicate pred);
-
-template <class InputIterator, class Function>
-    Function
-    for_each(InputIterator first, InputIterator last, Function f);
-
-template <class InputIterator, class T>
-    InputIterator
-    find(InputIterator first, InputIterator last, const T& value);
-
-template <class InputIterator, class Predicate>
-    InputIterator
-    find_if(InputIterator first, InputIterator last, Predicate pred);
-
-template<class InputIterator, class Predicate>
-    InputIterator
-    find_if_not(InputIterator first, InputIterator last, Predicate pred);
-
-template <class ForwardIterator1, class ForwardIterator2>
-    ForwardIterator1
-    find_end(ForwardIterator1 first1, ForwardIterator1 last1,
-             ForwardIterator2 first2, ForwardIterator2 last2);
-
-template <class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    ForwardIterator1
-    find_end(ForwardIterator1 first1, ForwardIterator1 last1,
-             ForwardIterator2 first2, ForwardIterator2 last2, BinaryPredicate pred);
-
-template <class ForwardIterator1, class ForwardIterator2>
-    ForwardIterator1
-    find_first_of(ForwardIterator1 first1, ForwardIterator1 last1,
-                  ForwardIterator2 first2, ForwardIterator2 last2);
-
-template <class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    ForwardIterator1
-    find_first_of(ForwardIterator1 first1, ForwardIterator1 last1,
-                  ForwardIterator2 first2, ForwardIterator2 last2, BinaryPredicate pred);
-
-template <class ForwardIterator>
-    ForwardIterator
-    adjacent_find(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class BinaryPredicate>
-    ForwardIterator
-    adjacent_find(ForwardIterator first, ForwardIterator last, BinaryPredicate pred);
-
-template <class InputIterator, class T>
-    typename iterator_traits<InputIterator>::difference_type
-    count(InputIterator first, InputIterator last, const T& value);
-
-template <class InputIterator, class Predicate>
-    typename iterator_traits<InputIterator>::difference_type
-    count_if(InputIterator first, InputIterator last, Predicate pred);
-
-template <class InputIterator1, class InputIterator2>
-    pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
-
-template <class InputIterator1, class InputIterator2>
-    pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 first1, InputIterator1 last1, 
-             InputIterator2 first2, InputIterator2 last2); // **C++14**
-
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-    pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 first1, InputIterator1 last1,
-             InputIterator2 first2, BinaryPredicate pred);
-
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-    pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 first1, InputIterator1 last1,
-             InputIterator2 first2, InputIterator2 last2,
-             BinaryPredicate pred); // **C++14**
-
-template <class InputIterator1, class InputIterator2>
-    bool
-    equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
-
-template <class InputIterator1, class InputIterator2>
-    bool
-    equal(InputIterator1 first1, InputIterator1 last1, 
-          InputIterator2 first2, InputIterator2 last2); // **C++14**
-
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-    bool
-    equal(InputIterator1 first1, InputIterator1 last1,
-          InputIterator2 first2, BinaryPredicate pred);
-
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-    bool
-    equal(InputIterator1 first1, InputIterator1 last1,
-          InputIterator2 first2, InputIterator2 last2,
-          BinaryPredicate pred); // **C++14**
-
-template<class ForwardIterator1, class ForwardIterator2>
-    bool
-    is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
-                   ForwardIterator2 first2);
-
-template<class ForwardIterator1, class ForwardIterator2>
-    bool
-    is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
-                   ForwardIterator2 first2, ForwardIterator2 last2); // **C++14**
-
-template<class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    bool
-    is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
-                   ForwardIterator2 first2, BinaryPredicate pred);
-
-template<class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    bool
-    is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
-                   ForwardIterator2 first2, ForwardIterator2 last2,
-                   BinaryPredicate pred);  // **C++14**
-
-template <class ForwardIterator1, class ForwardIterator2>
-    ForwardIterator1
-    search(ForwardIterator1 first1, ForwardIterator1 last1,
-           ForwardIterator2 first2, ForwardIterator2 last2);
-
-template <class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    ForwardIterator1
-    search(ForwardIterator1 first1, ForwardIterator1 last1,
-           ForwardIterator2 first2, ForwardIterator2 last2, BinaryPredicate pred);
-
-template <class ForwardIterator, class Size, class T>
-    ForwardIterator
-    search_n(ForwardIterator first, ForwardIterator last, Size count, const T& value);
-
-template <class ForwardIterator, class Size, class T, class BinaryPredicate>
-    ForwardIterator
-    search_n(ForwardIterator first, ForwardIterator last,
-             Size count, const T& value, BinaryPredicate pred);
-
-template <class InputIterator, class OutputIterator>
-    OutputIterator
-    copy(InputIterator first, InputIterator last, OutputIterator result);
-
-template<class InputIterator, class OutputIterator, class Predicate>
-    OutputIterator
-    copy_if(InputIterator first, InputIterator last,
-            OutputIterator result, Predicate pred);
-
-template<class InputIterator, class Size, class OutputIterator>
-    OutputIterator
-    copy_n(InputIterator first, Size n, OutputIterator result);
-
-template <class BidirectionalIterator1, class BidirectionalIterator2>
-    BidirectionalIterator2
-    copy_backward(BidirectionalIterator1 first, BidirectionalIterator1 last,
-                  BidirectionalIterator2 result);
-
-template <class ForwardIterator1, class ForwardIterator2>
-    ForwardIterator2
-    swap_ranges(ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2);
-
-template <class ForwardIterator1, class ForwardIterator2>
-    void
-    iter_swap(ForwardIterator1 a, ForwardIterator2 b);
-
-template <class InputIterator, class OutputIterator, class UnaryOperation>
-    OutputIterator
-    transform(InputIterator first, InputIterator last, OutputIterator result, UnaryOperation op);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class BinaryOperation>
-    OutputIterator
-    transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2,
-              OutputIterator result, BinaryOperation binary_op);
-
-template <class ForwardIterator, class T>
-    void
-    replace(ForwardIterator first, ForwardIterator last, const T& old_value, const T& new_value);
-
-template <class ForwardIterator, class Predicate, class T>
-    void
-    replace_if(ForwardIterator first, ForwardIterator last, Predicate pred, const T& new_value);
-
-template <class InputIterator, class OutputIterator, class T>
-    OutputIterator
-    replace_copy(InputIterator first, InputIterator last, OutputIterator result,
-                 const T& old_value, const T& new_value);
-
-template <class InputIterator, class OutputIterator, class Predicate, class T>
-    OutputIterator
-    replace_copy_if(InputIterator first, InputIterator last, OutputIterator result, Predicate pred, const T& new_value);
-
-template <class ForwardIterator, class T>
-    void
-    fill(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class OutputIterator, class Size, class T>
-    OutputIterator
-    fill_n(OutputIterator first, Size n, const T& value);
-
-template <class ForwardIterator, class Generator>
-    void
-    generate(ForwardIterator first, ForwardIterator last, Generator gen);
-
-template <class OutputIterator, class Size, class Generator>
-    OutputIterator
-    generate_n(OutputIterator first, Size n, Generator gen);
-
-template <class ForwardIterator, class T>
-    ForwardIterator
-    remove(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class Predicate>
-    ForwardIterator
-    remove_if(ForwardIterator first, ForwardIterator last, Predicate pred);
-
-template <class InputIterator, class OutputIterator, class T>
-    OutputIterator
-    remove_copy(InputIterator first, InputIterator last, OutputIterator result, const T& value);
-
-template <class InputIterator, class OutputIterator, class Predicate>
-    OutputIterator
-    remove_copy_if(InputIterator first, InputIterator last, OutputIterator result, Predicate pred);
-
-template <class ForwardIterator>
-    ForwardIterator
-    unique(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class BinaryPredicate>
-    ForwardIterator
-    unique(ForwardIterator first, ForwardIterator last, BinaryPredicate pred);
-
-template <class InputIterator, class OutputIterator>
-    OutputIterator
-    unique_copy(InputIterator first, InputIterator last, OutputIterator result);
-
-template <class InputIterator, class OutputIterator, class BinaryPredicate>
-    OutputIterator
-    unique_copy(InputIterator first, InputIterator last, OutputIterator result, BinaryPredicate pred);
-
-template <class BidirectionalIterator>
-    void
-    reverse(BidirectionalIterator first, BidirectionalIterator last);
-
-template <class BidirectionalIterator, class OutputIterator>
-    OutputIterator
-    reverse_copy(BidirectionalIterator first, BidirectionalIterator last, OutputIterator result);
-
-template <class ForwardIterator>
-    ForwardIterator
-    rotate(ForwardIterator first, ForwardIterator middle, ForwardIterator last);
-
-template <class ForwardIterator, class OutputIterator>
-    OutputIterator
-    rotate_copy(ForwardIterator first, ForwardIterator middle, ForwardIterator last, OutputIterator result);
-
-template <class RandomAccessIterator>
-    void
-    random_shuffle(RandomAccessIterator first, RandomAccessIterator last); // deprecated in C++14
-
-template <class RandomAccessIterator, class RandomNumberGenerator>
-    void
-    random_shuffle(RandomAccessIterator first, RandomAccessIterator last,
-                   RandomNumberGenerator& rand);  // deprecated in C++14
-
-template<class RandomAccessIterator, class UniformRandomNumberGenerator>
-    void shuffle(RandomAccessIterator first, RandomAccessIterator last,
-                 UniformRandomNumberGenerator&& g);
-
-template <class InputIterator, class Predicate>
-    bool
-    is_partitioned(InputIterator first, InputIterator last, Predicate pred);
-
-template <class ForwardIterator, class Predicate>
-    ForwardIterator
-    partition(ForwardIterator first, ForwardIterator last, Predicate pred);
-
-template <class InputIterator, class OutputIterator1,
-          class OutputIterator2, class Predicate>
-    pair<OutputIterator1, OutputIterator2>
-    partition_copy(InputIterator first, InputIterator last,
-                   OutputIterator1 out_true, OutputIterator2 out_false,
-                   Predicate pred);
-
-template <class ForwardIterator, class Predicate>
-    ForwardIterator
-    stable_partition(ForwardIterator first, ForwardIterator last, Predicate pred);
-
-template<class ForwardIterator, class Predicate>
-    ForwardIterator
-    partition_point(ForwardIterator first, ForwardIterator last, Predicate pred);
-
-template <class ForwardIterator>
-    bool
-    is_sorted(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class Compare>
-    bool
-    is_sorted(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template<class ForwardIterator>
-    ForwardIterator
-    is_sorted_until(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class Compare>
-    ForwardIterator
-    is_sorted_until(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    sort(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    sort(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    stable_sort(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    stable_sort(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    partial_sort(RandomAccessIterator first, RandomAccessIterator middle, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    partial_sort(RandomAccessIterator first, RandomAccessIterator middle, RandomAccessIterator last, Compare comp);
-
-template <class InputIterator, class RandomAccessIterator>
-    RandomAccessIterator
-    partial_sort_copy(InputIterator first, InputIterator last,
-                      RandomAccessIterator result_first, RandomAccessIterator result_last);
-
-template <class InputIterator, class RandomAccessIterator, class Compare>
-    RandomAccessIterator
-    partial_sort_copy(InputIterator first, InputIterator last,
-                      RandomAccessIterator result_first, RandomAccessIterator result_last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    nth_element(RandomAccessIterator first, RandomAccessIterator nth, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    nth_element(RandomAccessIterator first, RandomAccessIterator nth, RandomAccessIterator last, Compare comp);
-
-template <class ForwardIterator, class T>
-    ForwardIterator
-    lower_bound(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class T, class Compare>
-    ForwardIterator
-    lower_bound(ForwardIterator first, ForwardIterator last, const T& value, Compare comp);
-
-template <class ForwardIterator, class T>
-    ForwardIterator
-    upper_bound(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class T, class Compare>
-    ForwardIterator
-    upper_bound(ForwardIterator first, ForwardIterator last, const T& value, Compare comp);
-
-template <class ForwardIterator, class T>
-    pair<ForwardIterator, ForwardIterator>
-    equal_range(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class T, class Compare>
-    pair<ForwardIterator, ForwardIterator>
-    equal_range(ForwardIterator first, ForwardIterator last, const T& value, Compare comp);
-
-template <class ForwardIterator, class T>
-    bool
-    binary_search(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class T, class Compare>
-    bool
-    binary_search(ForwardIterator first, ForwardIterator last, const T& value, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    merge(InputIterator1 first1, InputIterator1 last1,
-          InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    merge(InputIterator1 first1, InputIterator1 last1,
-          InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class BidirectionalIterator>
-    void
-    inplace_merge(BidirectionalIterator first, BidirectionalIterator middle, BidirectionalIterator last);
-
-template <class BidirectionalIterator, class Compare>
-    void
-    inplace_merge(BidirectionalIterator first, BidirectionalIterator middle, BidirectionalIterator last, Compare comp);
-
-template <class InputIterator1, class InputIterator2>
-    bool
-    includes(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2);
-
-template <class InputIterator1, class InputIterator2, class Compare>
-    bool
-    includes(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    set_union(InputIterator1 first1, InputIterator1 last1,
-              InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    set_union(InputIterator1 first1, InputIterator1 last1,
-              InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    set_intersection(InputIterator1 first1, InputIterator1 last1,
-                     InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    set_intersection(InputIterator1 first1, InputIterator1 last1,
-                     InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    set_difference(InputIterator1 first1, InputIterator1 last1,
-                   InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    set_difference(InputIterator1 first1, InputIterator1 last1,
-                   InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    set_symmetric_difference(InputIterator1 first1, InputIterator1 last1,
-                             InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    set_symmetric_difference(InputIterator1 first1, InputIterator1 last1,
-                             InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    push_heap(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    push_heap(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    pop_heap(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    pop_heap(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    make_heap(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    make_heap(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    sort_heap(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    sort_heap(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    bool
-    is_heap(RandomAccessIterator first, RandomAccessiterator last);
-
-template <class RandomAccessIterator, class Compare>
-    bool
-    is_heap(RandomAccessIterator first, RandomAccessiterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    RandomAccessIterator
-    is_heap_until(RandomAccessIterator first, RandomAccessiterator last);
-
-template <class RandomAccessIterator, class Compare>
-    RandomAccessIterator
-    is_heap_until(RandomAccessIterator first, RandomAccessiterator last, Compare comp);
-
-template <class ForwardIterator>
-    ForwardIterator
-    min_element(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class Compare>
-    ForwardIterator
-    min_element(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template <class T>
-    const T&
-    min(const T& a, const T& b);  // constexpr in C++14
-
-template <class T, class Compare>
-    const T&
-    min(const T& a, const T& b, Compare comp);  // constexpr in C++14
-
-template<class T>
-    T
-    min(initializer_list<T> t);  // constexpr in C++14
-
-template<class T, class Compare>
-    T
-    min(initializer_list<T> t, Compare comp);  // constexpr in C++14
-
-template <class ForwardIterator>
-    ForwardIterator
-    max_element(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class Compare>
-    ForwardIterator
-    max_element(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template <class T>
-    const T&
-    max(const T& a, const T& b); // constexpr in C++14
-
-template <class T, class Compare>
-    const T&
-    max(const T& a, const T& b, Compare comp);  // constexpr in C++14
-
-template<class T>
-    T
-    max(initializer_list<T> t);  // constexpr in C++14
-
-template<class T, class Compare>
-    T
-    max(initializer_list<T> t, Compare comp);  // constexpr in C++14
-
-template<class ForwardIterator>
-    pair<ForwardIterator, ForwardIterator>
-    minmax_element(ForwardIterator first, ForwardIterator last);
-
-template<class ForwardIterator, class Compare>
-    pair<ForwardIterator, ForwardIterator>
-    minmax_element(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template<class T>
-    pair<const T&, const T&>
-    minmax(const T& a, const T& b);  // constexpr in C++14
-
-template<class T, class Compare>
-    pair<const T&, const T&>
-    minmax(const T& a, const T& b, Compare comp);  // constexpr in C++14
-
-template<class T>
-    pair<T, T>
-    minmax(initializer_list<T> t);  // constexpr in C++14
-
-template<class T, class Compare>
-    pair<T, T>
-    minmax(initializer_list<T> t, Compare comp);  // constexpr in C++14
-
-template <class InputIterator1, class InputIterator2>
-    bool
-    lexicographical_compare(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2);
-
-template <class InputIterator1, class InputIterator2, class Compare>
-    bool
-    lexicographical_compare(InputIterator1 first1, InputIterator1 last1,
-                            InputIterator2 first2, InputIterator2 last2, Compare comp);
-
-template <class BidirectionalIterator>
-    bool
-    next_permutation(BidirectionalIterator first, BidirectionalIterator last);
-
-template <class BidirectionalIterator, class Compare>
-    bool
-    next_permutation(BidirectionalIterator first, BidirectionalIterator last, Compare comp);
-
-template <class BidirectionalIterator>
-    bool
-    prev_permutation(BidirectionalIterator first, BidirectionalIterator last);
-
-template <class BidirectionalIterator, class Compare>
-    bool
-    prev_permutation(BidirectionalIterator first, BidirectionalIterator last, Compare comp);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <initializer_list>
-#include <type_traits>
-#include <cstring>
-#include <utility>
-#include <memory>
-#include <iterator>
-#include <cstddef>
-
-#if defined(__IBMCPP__)
-#include "support/ibm/support.h"
-#endif
-#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-#include "support/win32/support.h"
-#endif
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// I'd like to replace these with _VSTD::equal_to<void>, but can't because:
-//   * That only works with C++14 and later, and
-//   * We haven't included <functional> here.
-template <class _T1, class _T2 = _T1>
-struct __equal_to
-{
-    _LIBCPP_INLINE_VISIBILITY bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-    _LIBCPP_INLINE_VISIBILITY bool operator()(const _T1& __x, const _T2& __y) const {return __x == __y;}
-    _LIBCPP_INLINE_VISIBILITY bool operator()(const _T2& __x, const _T1& __y) const {return __x == __y;}
-    _LIBCPP_INLINE_VISIBILITY bool operator()(const _T2& __x, const _T2& __y) const {return __x == __y;}
-};
-
-template <class _T1>
-struct __equal_to<_T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-};
-
-template <class _T1>
-struct __equal_to<const _T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-};
-
-template <class _T1>
-struct __equal_to<_T1, const _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-};
-
-template <class _T1, class _T2 = _T1>
-struct __less
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T2& __y) const {return __x < __y;}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T2& __x, const _T1& __y) const {return __x < __y;}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T2& __x, const _T2& __y) const {return __x < __y;}
-};
-
-template <class _T1>
-struct __less<_T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
-};
-
-template <class _T1>
-struct __less<const _T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
-};
-
-template <class _T1>
-struct __less<_T1, const _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
-};
-
-template <class _Predicate>
-class __negate
-{
-private:
-    _Predicate __p_;
-public:
-    _LIBCPP_INLINE_VISIBILITY __negate() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __negate(_Predicate __p) : __p_(__p) {}
-
-    template <class _T1>
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _T1& __x) {return !__p_(__x);}
-
-    template <class _T1, class _T2>
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _T1& __x, const _T2& __y) {return !__p_(__x, __y);}
-};
-
-#ifdef _LIBCPP_DEBUG
-
-template <class _Compare>
-struct __debug_less
-{
-    _Compare __comp_;
-    __debug_less(_Compare& __c) : __comp_(__c) {}
-    template <class _Tp, class _Up>
-    bool operator()(const _Tp& __x, const _Up& __y)
-    {
-        bool __r = __comp_(__x, __y);
-        if (__r)
-            _LIBCPP_ASSERT(!__comp_(__y, __x), "Comparator does not induce a strict weak ordering");
-        return __r;
-    }
-};
-
-#endif  // _LIBCPP_DEBUG
-
-// Precondition:  __x != 0
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned
-__ctz(unsigned __x)
-{
-    return static_cast<unsigned>(__builtin_ctz(__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-__ctz(unsigned long __x)
-{
-    return static_cast<unsigned long>(__builtin_ctzl(__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__ctz(unsigned long long __x)
-{
-    return static_cast<unsigned long long>(__builtin_ctzll(__x));
-}
-
-// Precondition:  __x != 0
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned
-__clz(unsigned __x)
-{
-    return static_cast<unsigned>(__builtin_clz(__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-__clz(unsigned long __x)
-{
-    return static_cast<unsigned long>(__builtin_clzl (__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__clz(unsigned long long __x)
-{
-    return static_cast<unsigned long long>(__builtin_clzll(__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY int __pop_count(unsigned           __x) {return __builtin_popcount  (__x);}
-inline _LIBCPP_INLINE_VISIBILITY int __pop_count(unsigned      long __x) {return __builtin_popcountl (__x);}
-inline _LIBCPP_INLINE_VISIBILITY int __pop_count(unsigned long long __x) {return __builtin_popcountll(__x);}
-
-// all_of
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (!__pred(*__first))
-            return false;
-    return true;
-}
-
-// any_of
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            return true;
-    return false;
-}
-
-// none_of
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            return false;
-    return true;
-}
-
-// for_each
-
-template <class _InputIterator, class _Function>
-inline _LIBCPP_INLINE_VISIBILITY
-_Function
-for_each(_InputIterator __first, _InputIterator __last, _Function __f)
-{
-    for (; __first != __last; ++__first)
-        __f(*__first);
-    return _VSTD::move(__f);  // explicitly moved for (emulated) C++03
-}
-
-// find
-
-template <class _InputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_InputIterator
-find(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
-{
-    for (; __first != __last; ++__first)
-        if (*__first == __value_)
-            break;
-    return __first;
-}
-
-// find_if
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_InputIterator
-find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            break;
-    return __first;
-}
-
-// find_if_not
-
-template<class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_InputIterator
-find_if_not(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (!__pred(*__first))
-            break;
-    return __first;
-}
-
-// find_end
-
-template <class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2>
-_ForwardIterator1
-__find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-           _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred,
-           forward_iterator_tag, forward_iterator_tag)
-{
-    // modeled after search algorithm
-    _ForwardIterator1 __r = __last1;  // __last1 is the "default" answer
-    if (__first2 == __last2)
-        return __r;
-    while (true)
-    {
-        while (true)
-        {
-            if (__first1 == __last1)         // if source exhausted return last correct answer
-                return __r;                  //    (or __last1 if never found)
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        }
-        // *__first1 matches *__first2, now match elements after here
-        _ForwardIterator1 __m1 = __first1;
-        _ForwardIterator2 __m2 = __first2;
-        while (true)
-        {
-            if (++__m2 == __last2)
-            {                         // Pattern exhaused, record answer and search for another one
-                __r = __first1;
-                ++__first1;
-                break;
-            }
-            if (++__m1 == __last1)     // Source exhausted, return last answer
-                return __r;
-            if (!__pred(*__m1, *__m2))  // mismatch, restart with a new __first
-            {
-                ++__first1;
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _BinaryPredicate, class _BidirectionalIterator1, class _BidirectionalIterator2>
-_BidirectionalIterator1
-__find_end(_BidirectionalIterator1 __first1, _BidirectionalIterator1 __last1,
-           _BidirectionalIterator2 __first2, _BidirectionalIterator2 __last2, _BinaryPredicate __pred,
-           bidirectional_iterator_tag, bidirectional_iterator_tag)
-{
-    // modeled after search algorithm (in reverse)
-    if (__first2 == __last2)
-        return __last1;  // Everything matches an empty sequence
-    _BidirectionalIterator1 __l1 = __last1;
-    _BidirectionalIterator2 __l2 = __last2;
-    --__l2;
-    while (true)
-    {
-        // Find last element in sequence 1 that matchs *(__last2-1), with a mininum of loop checks
-        while (true)
-        {
-            if (__first1 == __l1)  // return __last1 if no element matches *__first2
-                return __last1;
-            if (__pred(*--__l1, *__l2))
-                break;
-        }
-        // *__l1 matches *__l2, now match elements before here
-        _BidirectionalIterator1 __m1 = __l1;
-        _BidirectionalIterator2 __m2 = __l2;
-        while (true)
-        {
-            if (__m2 == __first2)  // If pattern exhausted, __m1 is the answer (works for 1 element pattern)
-                return __m1;
-            if (__m1 == __first1)  // Otherwise if source exhaused, pattern not found
-                return __last1;
-            if (!__pred(*--__m1, *--__m2))  // if there is a mismatch, restart with a new __l1
-            {
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _RandomAccessIterator1
-__find_end(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,
-           _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _BinaryPredicate __pred,
-           random_access_iterator_tag, random_access_iterator_tag)
-{
-    // Take advantage of knowing source and pattern lengths.  Stop short when source is smaller than pattern
-    typename iterator_traits<_RandomAccessIterator2>::difference_type __len2 = __last2 - __first2;
-    if (__len2 == 0)
-        return __last1;
-    typename iterator_traits<_RandomAccessIterator1>::difference_type __len1 = __last1 - __first1;
-    if (__len1 < __len2)
-        return __last1;
-    const _RandomAccessIterator1 __s = __first1 + (__len2 - 1);  // End of pattern match can't go before here
-    _RandomAccessIterator1 __l1 = __last1;
-    _RandomAccessIterator2 __l2 = __last2;
-    --__l2;
-    while (true)
-    {
-        while (true)
-        {
-            if (__s == __l1)
-                return __last1;
-            if (__pred(*--__l1, *__l2))
-                break;
-        }
-        _RandomAccessIterator1 __m1 = __l1;
-        _RandomAccessIterator2 __m2 = __l2;
-        while (true)
-        {
-            if (__m2 == __first2)
-                return __m1;
-                                 // no need to check range on __m1 because __s guarantees we have enough source
-            if (!__pred(*--__m1, *--__m2))
-            {
-                break;
-            }
-        }
-    }
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-         _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
-{
-    return _VSTD::__find_end<typename add_lvalue_reference<_BinaryPredicate>::type>
-                         (__first1, __last1, __first2, __last2, __pred,
-                          typename iterator_traits<_ForwardIterator1>::iterator_category(),
-                          typename iterator_traits<_ForwardIterator2>::iterator_category());
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-         _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-{
-    typedef typename iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::find_end(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
-}
-
-// find_first_of
-
-template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator1
-__find_first_of_ce(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-              _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
-{
-    for (; __first1 != __last1; ++__first1)
-        for (_ForwardIterator2 __j = __first2; __j != __last2; ++__j)
-            if (__pred(*__first1, *__j))
-                return __first1;
-    return __last1;
-}
-
-
-template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-              _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
-{
-    return _VSTD::__find_first_of_ce(__first1, __last1, __first2, __last2, __pred);
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-              _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-{
-    typedef typename iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::__find_first_of_ce(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
-}
-
-// adjacent_find
-
-template <class _ForwardIterator, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-adjacent_find(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (__pred(*__first, *__i))
-                return __first;
-            __first = __i;
-        }
-    }
-    return __last;
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-adjacent_find(_ForwardIterator __first, _ForwardIterator __last)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type __v;
-    return _VSTD::adjacent_find(__first, __last, __equal_to<__v>());
-}
-
-// count
-
-template <class _InputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_InputIterator>::difference_type
-count(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
-{
-    typename iterator_traits<_InputIterator>::difference_type __r(0);
-    for (; __first != __last; ++__first)
-        if (*__first == __value_)
-            ++__r;
-    return __r;
-}
-
-// count_if
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_InputIterator>::difference_type
-count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    typename iterator_traits<_InputIterator>::difference_type __r(0);
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            ++__r;
-    return __r;
-}
-
-// mismatch
-
-template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_InputIterator1, _InputIterator2>
-mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-         _InputIterator2 __first2, _BinaryPredicate __pred)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            break;
-    return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_InputIterator1, _InputIterator2>
-mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return _VSTD::mismatch(__first1, __last1, __first2, __equal_to<__v1, __v2>());
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_InputIterator1, _InputIterator2>
-mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-         _InputIterator2 __first2, _InputIterator2 __last2,
-         _BinaryPredicate __pred)
-{
-    for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            break;
-    return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_InputIterator1, _InputIterator2>
-mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-         _InputIterator2 __first2, _InputIterator2 __last2)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return _VSTD::mismatch(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
-}
-#endif
-
-// equal
-
-template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _BinaryPredicate __pred)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            return false;
-    return true;
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return _VSTD::equal(__first1, __last1, __first2, __equal_to<__v1, __v2>());
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _BinaryPredicate, class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__equal(_InputIterator1 __first1, _InputIterator1 __last1, 
-        _InputIterator2 __first2, _InputIterator2 __last2, _BinaryPredicate __pred,
-        input_iterator_tag, input_iterator_tag )
-{
-    for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            return false;
-    return __first1 == __last1 && __first2 == __last2;
-}
-
-template <class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__equal(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, 
-        _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _BinaryPredicate __pred, 
-      random_access_iterator_tag, random_access_iterator_tag )
-{
-    if ( _VSTD::distance(__first1, __last1) != _VSTD::distance(__first2, __last2))
-        return false;
-    return _VSTD::equal<_RandomAccessIterator1, _RandomAccessIterator2,
-                        typename add_lvalue_reference<_BinaryPredicate>::type>
-                       (__first1, __last1, __first2, __pred );
-}
-
-template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(_InputIterator1 __first1, _InputIterator1 __last1, 
-      _InputIterator2 __first2, _InputIterator2 __last2, _BinaryPredicate __pred )
-{
-    return _VSTD::__equal<typename add_lvalue_reference<_BinaryPredicate>::type>
-       (__first1, __last1, __first2, __last2, __pred, 
-        typename iterator_traits<_InputIterator1>::iterator_category(),
-        typename iterator_traits<_InputIterator2>::iterator_category());
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(_InputIterator1 __first1, _InputIterator1 __last1, 
-      _InputIterator2 __first2, _InputIterator2 __last2)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return _VSTD::__equal(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>(),
-        typename iterator_traits<_InputIterator1>::iterator_category(),
-        typename iterator_traits<_InputIterator2>::iterator_category());
-}
-#endif
-
-// is_permutation
-
-template<class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-bool
-is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-               _ForwardIterator2 __first2, _BinaryPredicate __pred)
-{
-    // shorten sequences as much as possible by lopping of any equal parts
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            goto __not_done;
-    return true;
-__not_done:
-    // __first1 != __last1 && *__first1 != *__first2
-    typedef typename iterator_traits<_ForwardIterator1>::difference_type _D1;
-    _D1 __l1 = _VSTD::distance(__first1, __last1);
-    if (__l1 == _D1(1))
-        return false;
-    _ForwardIterator2 __last2 = _VSTD::next(__first2, __l1);
-    // For each element in [f1, l1) see if there are the same number of
-    //    equal elements in [f2, l2)
-    for (_ForwardIterator1 __i = __first1; __i != __last1; ++__i)
-    {
-        // Have we already counted the number of *__i in [f1, l1)?
-        for (_ForwardIterator1 __j = __first1; __j != __i; ++__j)
-            if (__pred(*__j, *__i))
-                goto __next_iter;
-        {
-            // Count number of *__i in [f2, l2)
-            _D1 __c2 = 0;
-            for (_ForwardIterator2 __j = __first2; __j != __last2; ++__j)
-                if (__pred(*__i, *__j))
-                    ++__c2;
-            if (__c2 == 0)
-                return false;
-            // Count number of *__i in [__i, l1) (we can start with 1)
-            _D1 __c1 = 1;
-            for (_ForwardIterator1 __j = _VSTD::next(__i); __j != __last1; ++__j)
-                if (__pred(*__i, *__j))
-                    ++__c1;
-            if (__c1 != __c2)
-                return false;
-        }
-__next_iter:;
-    }
-    return true;
-}
-
-template<class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-               _ForwardIterator2 __first2)
-{
-    typedef typename iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::is_permutation(__first1, __last1, __first2, __equal_to<__v1, __v2>());
-}
-
-#if _LIBCPP_STD_VER > 11
-template<class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2>
-bool
-__is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-                 _ForwardIterator2 __first2, _ForwardIterator2 __last2, 
-                 _BinaryPredicate __pred,
-                 forward_iterator_tag, forward_iterator_tag )
-{
-    // shorten sequences as much as possible by lopping of any equal parts
-    for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            goto __not_done;
-    return __first1 == __last1 && __first2 == __last2;
-__not_done:
-    // __first1 != __last1 && __first2 != __last2 && *__first1 != *__first2
-    typedef typename iterator_traits<_ForwardIterator1>::difference_type _D1;
-    _D1 __l1 = _VSTD::distance(__first1, __last1);
-
-    typedef typename iterator_traits<_ForwardIterator2>::difference_type _D2;
-    _D2 __l2 = _VSTD::distance(__first2, __last2);
-    if (__l1 != __l2)
-        return false;
-
-    // For each element in [f1, l1) see if there are the same number of
-    //    equal elements in [f2, l2)
-    for (_ForwardIterator1 __i = __first1; __i != __last1; ++__i)
-    {
-        // Have we already counted the number of *__i in [f1, l1)?
-        for (_ForwardIterator1 __j = __first1; __j != __i; ++__j)
-            if (__pred(*__j, *__i))
-                goto __next_iter;
-        {
-            // Count number of *__i in [f2, l2)
-            _D1 __c2 = 0;
-            for (_ForwardIterator2 __j = __first2; __j != __last2; ++__j)
-                if (__pred(*__i, *__j))
-                    ++__c2;
-            if (__c2 == 0)
-                return false;
-            // Count number of *__i in [__i, l1) (we can start with 1)
-            _D1 __c1 = 1;
-            for (_ForwardIterator1 __j = _VSTD::next(__i); __j != __last1; ++__j)
-                if (__pred(*__i, *__j))
-                    ++__c1;
-            if (__c1 != __c2)
-                return false;
-        }
-__next_iter:;
-    }
-    return true;
-}
-
-template<class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-bool
-__is_permutation(_RandomAccessIterator1 __first1, _RandomAccessIterator2 __last1,
-               _RandomAccessIterator1 __first2, _RandomAccessIterator2 __last2, 
-               _BinaryPredicate __pred,
-               random_access_iterator_tag, random_access_iterator_tag )
-{
-    if ( _VSTD::distance(__first1, __last1) != _VSTD::distance(__first2, __last2))
-        return false;
-    return _VSTD::is_permutation<_RandomAccessIterator1, _RandomAccessIterator2,
-                                 typename add_lvalue_reference<_BinaryPredicate>::type>
-                                (__first1, __last1, __first2, __pred );
-}
-
-template<class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-               _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-               _BinaryPredicate __pred )
-{
-    return _VSTD::__is_permutation<typename add_lvalue_reference<_BinaryPredicate>::type>
-       (__first1, __last1, __first2, __last2, __pred,
-        typename iterator_traits<_ForwardIterator1>::iterator_category(),
-        typename iterator_traits<_ForwardIterator2>::iterator_category());
-}
-
-template<class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-               _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-{
-    typedef typename iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::__is_permutation(__first1, __last1, __first2, __last2,
-        __equal_to<__v1, __v2>(),
-        typename iterator_traits<_ForwardIterator1>::iterator_category(),
-        typename iterator_traits<_ForwardIterator2>::iterator_category());
-}
-#endif
-
-// search
-
-template <class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2>
-_ForwardIterator1
-__search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-         _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred,
-         forward_iterator_tag, forward_iterator_tag)
-{
-    if (__first2 == __last2)
-        return __first1;  // Everything matches an empty sequence
-    while (true)
-    {
-        // Find first element in sequence 1 that matchs *__first2, with a mininum of loop checks
-        while (true)
-        {
-            if (__first1 == __last1)  // return __last1 if no element matches *__first2
-                return __last1;
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        }
-        // *__first1 matches *__first2, now match elements after here
-        _ForwardIterator1 __m1 = __first1;
-        _ForwardIterator2 __m2 = __first2;
-        while (true)
-        {
-            if (++__m2 == __last2)  // If pattern exhausted, __first1 is the answer (works for 1 element pattern)
-                return __first1;
-            if (++__m1 == __last1)  // Otherwise if source exhaused, pattern not found
-                return __last1;
-            if (!__pred(*__m1, *__m2))  // if there is a mismatch, restart with a new __first1
-            {
-                ++__first1;
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _RandomAccessIterator1
-__search(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,
-           _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _BinaryPredicate __pred,
-           random_access_iterator_tag, random_access_iterator_tag)
-{
-    typedef typename std::iterator_traits<_RandomAccessIterator1>::difference_type _D1;
-    typedef typename std::iterator_traits<_RandomAccessIterator2>::difference_type _D2;
-    // Take advantage of knowing source and pattern lengths.  Stop short when source is smaller than pattern
-    _D2 __len2 = __last2 - __first2;
-    if (__len2 == 0)
-        return __first1;
-    _D1 __len1 = __last1 - __first1;
-    if (__len1 < __len2)
-        return __last1;
-    const _RandomAccessIterator1 __s = __last1 - (__len2 - 1);  // Start of pattern match can't go beyond here
-    while (true)
-    {
-#if !_LIBCPP_UNROLL_LOOPS
-        while (true)
-        {
-            if (__first1 == __s)
-                return __last1;
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        }
-#else  // !_LIBCPP_UNROLL_LOOPS
-        for (_D1 __loop_unroll = (__s - __first1) / 4; __loop_unroll > 0; --__loop_unroll)
-        {
-            if (__pred(*__first1, *__first2))
-                goto __phase2;
-            if (__pred(*++__first1, *__first2))
-                goto __phase2;
-            if (__pred(*++__first1, *__first2))
-                goto __phase2;
-            if (__pred(*++__first1, *__first2))
-                goto __phase2;
-            ++__first1;
-        }
-        switch (__s - __first1)
-        {
-        case 3:
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        case 2:
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        case 1:
-            if (__pred(*__first1, *__first2))
-                break;
-        case 0:
-            return __last1;
-        }
-    __phase2:
-#endif  // !_LIBCPP_UNROLL_LOOPS
-        _RandomAccessIterator1 __m1 = __first1;
-        _RandomAccessIterator2 __m2 = __first2;
-#if !_LIBCPP_UNROLL_LOOPS
-         while (true)
-         {
-             if (++__m2 == __last2)
-                 return __first1;
-             ++__m1;          // no need to check range on __m1 because __s guarantees we have enough source
-             if (!__pred(*__m1, *__m2))
-             {
-                 ++__first1;
-                 break;
-             }
-         }
-#else  // !_LIBCPP_UNROLL_LOOPS
-        ++__m2;
-        ++__m1;
-        for (_D2 __loop_unroll = (__last2 - __m2) / 4; __loop_unroll > 0; --__loop_unroll)
-        {
-            if (!__pred(*__m1, *__m2))
-                goto __continue;
-            if (!__pred(*++__m1, *++__m2))
-                goto __continue;
-            if (!__pred(*++__m1, *++__m2))
-                goto __continue;
-            if (!__pred(*++__m1, *++__m2))
-                goto __continue;
-            ++__m1;
-            ++__m2;
-        }
-        switch (__last2 - __m2)
-        {
-        case 3:
-            if (!__pred(*__m1, *__m2))
-                break;
-            ++__m1;
-            ++__m2;
-        case 2:
-            if (!__pred(*__m1, *__m2))
-                break;
-            ++__m1;
-            ++__m2;
-        case 1:
-            if (!__pred(*__m1, *__m2))
-                break;
-        case 0:
-            return __first1;
-        }
-    __continue:
-        ++__first1;
-#endif  // !_LIBCPP_UNROLL_LOOPS
-    }
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-       _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
-{
-    return _VSTD::__search<typename add_lvalue_reference<_BinaryPredicate>::type>
-                         (__first1, __last1, __first2, __last2, __pred,
-                          typename std::iterator_traits<_ForwardIterator1>::iterator_category(),
-                          typename std::iterator_traits<_ForwardIterator2>::iterator_category());
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-       _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-{
-    typedef typename std::iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename std::iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::search(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
-}
-
-// search_n
-
-template <class _BinaryPredicate, class _ForwardIterator, class _Size, class _Tp>
-_ForwardIterator
-__search_n(_ForwardIterator __first, _ForwardIterator __last,
-           _Size __count, const _Tp& __value_, _BinaryPredicate __pred, forward_iterator_tag)
-{
-    if (__count <= 0)
-        return __first;
-    while (true)
-    {
-        // Find first element in sequence that matchs __value_, with a mininum of loop checks
-        while (true)
-        {
-            if (__first == __last)  // return __last if no element matches __value_
-                return __last;
-            if (__pred(*__first, __value_))
-                break;
-            ++__first;
-        }
-        // *__first matches __value_, now match elements after here
-        _ForwardIterator __m = __first;
-        _Size __c(0);
-        while (true)
-        {
-            if (++__c == __count)  // If pattern exhausted, __first is the answer (works for 1 element pattern)
-                return __first;
-            if (++__m == __last)  // Otherwise if source exhaused, pattern not found
-                return __last;
-            if (!__pred(*__m, __value_))  // if there is a mismatch, restart with a new __first
-            {
-                __first = __m;
-                ++__first;
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _BinaryPredicate, class _RandomAccessIterator, class _Size, class _Tp>
-_RandomAccessIterator
-__search_n(_RandomAccessIterator __first, _RandomAccessIterator __last,
-           _Size __count, const _Tp& __value_, _BinaryPredicate __pred, random_access_iterator_tag)
-{
-    if (__count <= 0)
-        return __first;
-    _Size __len = static_cast<_Size>(__last - __first);
-    if (__len < __count)
-        return __last;
-    const _RandomAccessIterator __s = __last - (__count - 1);  // Start of pattern match can't go beyond here
-    while (true)
-    {
-        // Find first element in sequence that matchs __value_, with a mininum of loop checks
-        while (true)
-        {
-            if (__first >= __s)  // return __last if no element matches __value_
-                return __last;
-            if (__pred(*__first, __value_))
-                break;
-            ++__first;
-        }
-        // *__first matches __value_, now match elements after here
-        _RandomAccessIterator __m = __first;
-        _Size __c(0);
-        while (true)
-        {
-            if (++__c == __count)  // If pattern exhausted, __first is the answer (works for 1 element pattern)
-                return __first;
-             ++__m;          // no need to check range on __m because __s guarantees we have enough source
-            if (!__pred(*__m, __value_))  // if there is a mismatch, restart with a new __first
-            {
-                __first = __m;
-                ++__first;
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _ForwardIterator, class _Size, class _Tp, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-search_n(_ForwardIterator __first, _ForwardIterator __last,
-         _Size __count, const _Tp& __value_, _BinaryPredicate __pred)
-{
-    return _VSTD::__search_n<typename add_lvalue_reference<_BinaryPredicate>::type>
-           (__first, __last, __count, __value_, __pred, typename iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-template <class _ForwardIterator, class _Size, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value_)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type __v;
-    return _VSTD::search_n(__first, __last, __count, __value_, __equal_to<__v, _Tp>());
-}
-
-// copy
-
-template <class _Iter>
-struct __libcpp_is_trivial_iterator
-{
-    static const bool value = is_pointer<_Iter>::value;
-};
-
-template <class _Iter>
-struct __libcpp_is_trivial_iterator<move_iterator<_Iter> >
-{
-    static const bool value = is_pointer<_Iter>::value;
-};
-
-template <class _Iter>
-struct __libcpp_is_trivial_iterator<__wrap_iter<_Iter> >
-{
-    static const bool value = is_pointer<_Iter>::value;
-};
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-_Iter
-__unwrap_iter(_Iter __i)
-{
-    return __i;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_trivially_copy_assignable<_Tp>::value,
-    _Tp*
->::type
-__unwrap_iter(move_iterator<_Tp*> __i)
-{
-    return __i.base();
-}
-
-#if _LIBCPP_DEBUG_LEVEL < 2
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_trivially_copy_assignable<_Tp>::value,
-    _Tp*
->::type
-__unwrap_iter(__wrap_iter<_Tp*> __i)
-{
-    return __i.base();
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL < 2
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        *__result = *__first;
-    return __result;
-}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_same<typename remove_const<_Tp>::type, _Up>::value &&
-    is_trivially_copy_assignable<_Up>::value,
-    _Up*
->::type
-__copy(_Tp* __first, _Tp* __last, _Up* __result)
-{
-    const size_t __n = static_cast<size_t>(__last - __first);
-    _VSTD::memmove(__result, __first, __n * sizeof(_Up));
-    return __result + __n;
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    return _VSTD::__copy(__unwrap_iter(__first), __unwrap_iter(__last), __unwrap_iter(__result));
-}
-
-// copy_backward
-
-template <class _BidirectionalIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__copy_backward(_BidirectionalIterator __first, _BidirectionalIterator __last, _OutputIterator __result)
-{
-    while (__first != __last)
-        *--__result = *--__last;
-    return __result;
-}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_same<typename remove_const<_Tp>::type, _Up>::value &&
-    is_trivially_copy_assignable<_Up>::value,
-    _Up*
->::type
-__copy_backward(_Tp* __first, _Tp* __last, _Up* __result)
-{
-    const size_t __n = static_cast<size_t>(__last - __first);
-    __result -= __n;
-    _VSTD::memmove(__result, __first, __n * sizeof(_Up));
-    return __result;
-}
-
-template <class _BidirectionalIterator1, class _BidirectionalIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_BidirectionalIterator2
-copy_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last,
-              _BidirectionalIterator2 __result)
-{
-    return _VSTD::__copy_backward(__unwrap_iter(__first), __unwrap_iter(__last), __unwrap_iter(__result));
-}
-
-// copy_if
-
-template<class _InputIterator, class _OutputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-copy_if(_InputIterator __first, _InputIterator __last,
-        _OutputIterator __result, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-    {
-        if (__pred(*__first))
-        {
-            *__result = *__first;
-            ++__result;
-        }
-    }
-    return __result;
-}
-
-// copy_n
-
-template<class _InputIterator, class _Size, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value &&
-   !__is_random_access_iterator<_InputIterator>::value,
-    _OutputIterator
->::type
-copy_n(_InputIterator __first, _Size __n, _OutputIterator __result)
-{
-    if (__n > 0)
-    {
-        *__result = *__first;
-        ++__result;
-        for (--__n; __n > 0; --__n)
-        {
-            ++__first;
-            *__result = *__first;
-            ++__result;
-        }
-    }
-    return __result;
-}
-
-template<class _InputIterator, class _Size, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_random_access_iterator<_InputIterator>::value,
-    _OutputIterator
->::type
-copy_n(_InputIterator __first, _Size __n, _OutputIterator __result)
-{
-    return _VSTD::copy(__first, __first + __n, __result);
-}
-
-// move
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__move(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        *__result = _VSTD::move(*__first);
-    return __result;
-}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_same<typename remove_const<_Tp>::type, _Up>::value &&
-    is_trivially_copy_assignable<_Up>::value,
-    _Up*
->::type
-__move(_Tp* __first, _Tp* __last, _Up* __result)
-{
-    const size_t __n = static_cast<size_t>(__last - __first);
-    _VSTD::memmove(__result, __first, __n * sizeof(_Up));
-    return __result + __n;
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-move(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    return _VSTD::__move(__unwrap_iter(__first), __unwrap_iter(__last), __unwrap_iter(__result));
-}
-
-// move_backward
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__move_backward(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    while (__first != __last)
-        *--__result = _VSTD::move(*--__last);
-    return __result;
-}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_same<typename remove_const<_Tp>::type, _Up>::value &&
-    is_trivially_copy_assignable<_Up>::value,
-    _Up*
->::type
-__move_backward(_Tp* __first, _Tp* __last, _Up* __result)
-{
-    const size_t __n = static_cast<size_t>(__last - __first);
-    __result -= __n;
-    _VSTD::memmove(__result, __first, __n * sizeof(_Up));
-    return __result;
-}
-
-template <class _BidirectionalIterator1, class _BidirectionalIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_BidirectionalIterator2
-move_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last,
-              _BidirectionalIterator2 __result)
-{
-    return _VSTD::__move_backward(__unwrap_iter(__first), __unwrap_iter(__last), __unwrap_iter(__result));
-}
-
-// iter_swap
-
-// moved to <type_traits> for better swap / noexcept support
-
-// transform
-
-template <class _InputIterator, class _OutputIterator, class _UnaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-transform(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _UnaryOperation __op)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        *__result = __op(*__first);
-    return __result;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _BinaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-transform(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2,
-          _OutputIterator __result, _BinaryOperation __binary_op)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2, ++__result)
-        *__result = __binary_op(*__first1, *__first2);
-    return __result;
-}
-
-// replace
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-replace(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __old_value, const _Tp& __new_value)
-{
-    for (; __first != __last; ++__first)
-        if (*__first == __old_value)
-            *__first = __new_value;
-}
-
-// replace_if
-
-template <class _ForwardIterator, class _Predicate, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-replace_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred, const _Tp& __new_value)
-{
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            *__first = __new_value;
-}
-
-// replace_copy
-
-template <class _InputIterator, class _OutputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-replace_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
-             const _Tp& __old_value, const _Tp& __new_value)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        if (*__first == __old_value)
-            *__result = __new_value;
-        else
-            *__result = *__first;
-    return __result;
-}
-
-// replace_copy_if
-
-template <class _InputIterator, class _OutputIterator, class _Predicate, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-replace_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
-                _Predicate __pred, const _Tp& __new_value)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        if (__pred(*__first))
-            *__result = __new_value;
-        else
-            *__result = *__first;
-    return __result;
-}
-
-// fill_n
-
-template <class _OutputIterator, class _Size, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__fill_n(_OutputIterator __first, _Size __n, const _Tp& __value_)
-{
-    for (; __n > 0; ++__first, (void) --__n)
-        *__first = __value_;
-    return __first;
-}
-
-template <class _Tp, class _Size, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && sizeof(_Tp) == 1 &&
-    !is_same<_Tp, bool>::value &&
-    is_integral<_Up>::value && sizeof(_Up) == 1,
-    _Tp*
->::type
-__fill_n(_Tp* __first, _Size __n,_Up __value_)
-{
-    if (__n > 0)
-        _VSTD::memset(__first, (unsigned char)__value_, (size_t)(__n));
-    return __first + __n;
-}
-
-template <class _OutputIterator, class _Size, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-fill_n(_OutputIterator __first, _Size __n, const _Tp& __value_)
-{
-   return _VSTD::__fill_n(__first, __n, __value_);
-}
-
-// fill
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, forward_iterator_tag)
-{
-    for (; __first != __last; ++__first)
-        *__first = __value_;
-}
-
-template <class _RandomAccessIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__fill(_RandomAccessIterator __first, _RandomAccessIterator __last, const _Tp& __value_, random_access_iterator_tag)
-{
-    _VSTD::fill_n(__first, __last - __first, __value_);
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    _VSTD::__fill(__first, __last, __value_, typename iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-// generate
-
-template <class _ForwardIterator, class _Generator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen)
-{
-    for (; __first != __last; ++__first)
-        *__first = __gen();
-}
-
-// generate_n
-
-template <class _OutputIterator, class _Size, class _Generator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-generate_n(_OutputIterator __first, _Size __n, _Generator __gen)
-{
-    for (; __n > 0; ++__first, (void) --__n)
-        *__first = __gen();
-    return __first;
-}
-
-// remove
-
-template <class _ForwardIterator, class _Tp>
-_ForwardIterator
-remove(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    __first = _VSTD::find(__first, __last, __value_);
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (!(*__i == __value_))
-            {
-                *__first = _VSTD::move(*__i);
-                ++__first;
-            }
-        }
-    }
-    return __first;
-}
-
-// remove_if
-
-template <class _ForwardIterator, class _Predicate>
-_ForwardIterator
-remove_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
-{
-    __first = _VSTD::find_if<_ForwardIterator, typename add_lvalue_reference<_Predicate>::type>
-                           (__first, __last, __pred);
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (!__pred(*__i))
-            {
-                *__first = _VSTD::move(*__i);
-                ++__first;
-            }
-        }
-    }
-    return __first;
-}
-
-// remove_copy
-
-template <class _InputIterator, class _OutputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-remove_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result, const _Tp& __value_)
-{
-    for (; __first != __last; ++__first)
-    {
-        if (!(*__first == __value_))
-        {
-            *__result = *__first;
-            ++__result;
-        }
-    }
-    return __result;
-}
-
-// remove_copy_if
-
-template <class _InputIterator, class _OutputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-remove_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-    {
-        if (!__pred(*__first))
-        {
-            *__result = *__first;
-            ++__result;
-        }
-    }
-    return __result;
-}
-
-// unique
-
-template <class _ForwardIterator, class _BinaryPredicate>
-_ForwardIterator
-unique(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred)
-{
-    __first = _VSTD::adjacent_find<_ForwardIterator, typename add_lvalue_reference<_BinaryPredicate>::type>
-                                 (__first, __last, __pred);
-    if (__first != __last)
-    {
-        // ...  a  a  ?  ...
-        //      f     i
-        _ForwardIterator __i = __first;
-        for (++__i; ++__i != __last;)
-            if (!__pred(*__first, *__i))
-                *++__first = _VSTD::move(*__i);
-        ++__first;
-    }
-    return __first;
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-unique(_ForwardIterator __first, _ForwardIterator __last)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type __v;
-    return _VSTD::unique(__first, __last, __equal_to<__v>());
-}
-
-// unique_copy
-
-template <class _BinaryPredicate, class _InputIterator, class _OutputIterator>
-_OutputIterator
-__unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _BinaryPredicate __pred,
-              input_iterator_tag, output_iterator_tag)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t(*__first);
-        *__result = __t;
-        ++__result;
-        while (++__first != __last)
-        {
-            if (!__pred(__t, *__first))
-            {
-                __t = *__first;
-                *__result = __t;
-                ++__result;
-            }
-        }
-    }
-    return __result;
-}
-
-template <class _BinaryPredicate, class _ForwardIterator, class _OutputIterator>
-_OutputIterator
-__unique_copy(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result, _BinaryPredicate __pred,
-              forward_iterator_tag, output_iterator_tag)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        *__result = *__i;
-        ++__result;
-        while (++__first != __last)
-        {
-            if (!__pred(*__i, *__first))
-            {
-                *__result = *__first;
-                ++__result;
-                __i = __first;
-            }
-        }
-    }
-    return __result;
-}
-
-template <class _BinaryPredicate, class _InputIterator, class _ForwardIterator>
-_ForwardIterator
-__unique_copy(_InputIterator __first, _InputIterator __last, _ForwardIterator __result, _BinaryPredicate __pred,
-              input_iterator_tag, forward_iterator_tag)
-{
-    if (__first != __last)
-    {
-        *__result = *__first;
-        while (++__first != __last)
-            if (!__pred(*__result, *__first))
-                *++__result = *__first;
-        ++__result;
-    }
-    return __result;
-}
-
-template <class _InputIterator, class _OutputIterator, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _BinaryPredicate __pred)
-{
-    return _VSTD::__unique_copy<typename add_lvalue_reference<_BinaryPredicate>::type>
-                              (__first, __last, __result, __pred,
-                               typename iterator_traits<_InputIterator>::iterator_category(),
-                               typename iterator_traits<_OutputIterator>::iterator_category());
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    typedef typename iterator_traits<_InputIterator>::value_type __v;
-    return _VSTD::unique_copy(__first, __last, __result, __equal_to<__v>());
-}
-
-// reverse
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__reverse(_BidirectionalIterator __first, _BidirectionalIterator __last, bidirectional_iterator_tag)
-{
-    while (__first != __last)
-    {
-        if (__first == --__last)
-            break;
-        swap(*__first, *__last);
-        ++__first;
-    }
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__reverse(_RandomAccessIterator __first, _RandomAccessIterator __last, random_access_iterator_tag)
-{
-    if (__first != __last)
-        for (; __first < --__last; ++__first)
-            swap(*__first, *__last);
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-reverse(_BidirectionalIterator __first, _BidirectionalIterator __last)
-{
-    _VSTD::__reverse(__first, __last, typename iterator_traits<_BidirectionalIterator>::iterator_category());
-}
-
-// reverse_copy
-
-template <class _BidirectionalIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-reverse_copy(_BidirectionalIterator __first, _BidirectionalIterator __last, _OutputIterator __result)
-{
-    for (; __first != __last; ++__result)
-        *__result = *--__last;
-    return __result;
-}
-
-// rotate
-
-template <class _ForwardIterator>
-_ForwardIterator
-__rotate_left(_ForwardIterator __first, _ForwardIterator __last)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-    value_type __tmp = _VSTD::move(*__first);
-    _ForwardIterator __lm1 = _VSTD::move(_VSTD::next(__first), __last, __first);
-    *__lm1 = _VSTD::move(__tmp);
-    return __lm1;
-}
-
-template <class _BidirectionalIterator>
-_BidirectionalIterator
-__rotate_right(_BidirectionalIterator __first, _BidirectionalIterator __last)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-    _BidirectionalIterator __lm1 = _VSTD::prev(__last);
-    value_type __tmp = _VSTD::move(*__lm1);
-    _BidirectionalIterator __fp1 = _VSTD::move_backward(__first, __lm1, __last);
-    *__first = _VSTD::move(__tmp);
-    return __fp1;
-}
-
-template <class _ForwardIterator>
-_ForwardIterator
-__rotate_forward(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last)
-{
-    _ForwardIterator __i = __middle;
-    while (true)
-    {
-        swap(*__first, *__i);
-        ++__first;
-        if (++__i == __last)
-            break;
-        if (__first == __middle)
-            __middle = __i;
-    }
-    _ForwardIterator __r = __first;
-    if (__first != __middle)
-    {
-        __i = __middle;
-        while (true)
-        {
-            swap(*__first, *__i);
-            ++__first;
-            if (++__i == __last)
-            {
-                if (__first == __middle)
-                    break;
-                __i = __middle;
-            }
-            else if (__first == __middle)
-                __middle = __i;
-        }
-    }
-    return __r;
-}
-
-template<typename _Integral>
-inline _LIBCPP_INLINE_VISIBILITY
-_Integral
-__gcd(_Integral __x, _Integral __y)
-{
-    do
-    {
-        _Integral __t = __x % __y;
-        __x = __y;
-        __y = __t;
-    } while (__y);
-    return __x;
-}
-
-template<typename _RandomAccessIterator>
-_RandomAccessIterator
-__rotate_gcd(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-
-    const difference_type __m1 = __middle - __first;
-    const difference_type __m2 = __last - __middle;
-    if (__m1 == __m2)
-    {
-        _VSTD::swap_ranges(__first, __middle, __middle);
-        return __middle;
-    }
-    const difference_type __g = _VSTD::__gcd(__m1, __m2);
-    for (_RandomAccessIterator __p = __first + __g; __p != __first;)
-    {
-        value_type __t(_VSTD::move(*--__p));
-        _RandomAccessIterator __p1 = __p;
-        _RandomAccessIterator __p2 = __p1 + __m1;
-        do
-        {
-            *__p1 = _VSTD::move(*__p2);
-            __p1 = __p2;
-            const difference_type __d = __last - __p2;
-            if (__m1 < __d)
-                __p2 += __m1;
-            else
-                __p2 = __first + (__m1 - __d);
-        } while (__p2 != __p);
-        *__p1 = _VSTD::move(__t);
-    }
-    return __first + __m2;
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-__rotate(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last,
-         _VSTD::forward_iterator_tag)
-{
-    typedef typename _VSTD::iterator_traits<_ForwardIterator>::value_type value_type;
-    if (_VSTD::is_trivially_move_assignable<value_type>::value)
-    {
-        if (_VSTD::next(__first) == __middle)
-            return _VSTD::__rotate_left(__first, __last);
-    }
-    return _VSTD::__rotate_forward(__first, __middle, __last);
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_BidirectionalIterator
-__rotate(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last,
-         _VSTD::bidirectional_iterator_tag)
-{
-    typedef typename _VSTD::iterator_traits<_BidirectionalIterator>::value_type value_type;
-    if (_VSTD::is_trivially_move_assignable<value_type>::value)
-    {
-        if (_VSTD::next(__first) == __middle)
-            return _VSTD::__rotate_left(__first, __last);
-        if (_VSTD::next(__middle) == __last)
-            return _VSTD::__rotate_right(__first, __last);
-    }
-    return _VSTD::__rotate_forward(__first, __middle, __last);
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_RandomAccessIterator
-__rotate(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last,
-         _VSTD::random_access_iterator_tag)
-{
-    typedef typename _VSTD::iterator_traits<_RandomAccessIterator>::value_type value_type;
-    if (_VSTD::is_trivially_move_assignable<value_type>::value)
-    {
-        if (_VSTD::next(__first) == __middle)
-            return _VSTD::__rotate_left(__first, __last);
-        if (_VSTD::next(__middle) == __last)
-            return _VSTD::__rotate_right(__first, __last);
-        return _VSTD::__rotate_gcd(__first, __middle, __last);
-    }
-    return _VSTD::__rotate_forward(__first, __middle, __last);
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-rotate(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last)
-{
-    if (__first == __middle)
-        return __last;
-    if (__middle == __last)
-        return __first;
-    return _VSTD::__rotate(__first, __middle, __last,
-                           typename _VSTD::iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-// rotate_copy
-
-template <class _ForwardIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-rotate_copy(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last, _OutputIterator __result)
-{
-    return _VSTD::copy(__first, __middle, _VSTD::copy(__middle, __last, __result));
-}
-
-// min_element
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_ForwardIterator
-__min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-            if (__comp(*__i, *__first))
-                __first = __i;
-    }
-    return __first;
-}
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    return __min_element(__first, __last, __comp);
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-min_element(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return __min_element(__first, __last,
-              __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// min
-
-template <class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-min(const _Tp& __a, const _Tp& __b, _Compare __comp)
-{
-    return __comp(__b, __a) ? __b : __a;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-min(const _Tp& __a, const _Tp& __b)
-{
-    return _VSTD::min(__a, __b, __less<_Tp>());
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-min(initializer_list<_Tp> __t, _Compare __comp)
-{
-    return *__min_element(__t.begin(), __t.end(), __comp);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-min(initializer_list<_Tp> __t)
-{
-    return *__min_element(__t.begin(), __t.end(), __less<_Tp>());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-// max_element
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_ForwardIterator
-__max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-            if (__comp(*__first, *__i))
-                __first = __i;
-    }
-    return __first;
-}
-
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    return __max_element(__first, __last, __comp);
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-max_element(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return __max_element(__first, __last,
-              __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// max
-
-template <class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-max(const _Tp& __a, const _Tp& __b, _Compare __comp)
-{
-    return __comp(__a, __b) ? __b : __a;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-max(const _Tp& __a, const _Tp& __b)
-{
-    return _VSTD::max(__a, __b, __less<_Tp>());
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-max(initializer_list<_Tp> __t, _Compare __comp)
-{
-    return *__max_element(__t.begin(), __t.end(), __comp);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-max(initializer_list<_Tp> __t)
-{
-    return *__max_element(__t.begin(), __t.end(), __less<_Tp>());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-// minmax_element
-
-template <class _ForwardIterator, class _Compare>
-std::pair<_ForwardIterator, _ForwardIterator>
-minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-  std::pair<_ForwardIterator, _ForwardIterator> __result(__first, __first);
-  if (__first != __last)
-  {
-      if (++__first != __last)
-      {
-          if (__comp(*__first, *__result.first))
-              __result.first = __first;
-          else
-              __result.second = __first;
-          while (++__first != __last)
-          {
-              _ForwardIterator __i = __first;
-              if (++__first == __last)
-              {
-                  if (__comp(*__i, *__result.first))
-                      __result.first = __i;
-                  else if (!__comp(*__i, *__result.second))
-                      __result.second = __i;
-                  break;
-              }
-              else
-              {
-                  if (__comp(*__first, *__i))
-                  {
-                      if (__comp(*__first, *__result.first))
-                          __result.first = __first;
-                      if (!__comp(*__i, *__result.second))
-                          __result.second = __i;
-                  }
-                  else
-                  {
-                      if (__comp(*__i, *__result.first))
-                          __result.first = __i;
-                      if (!__comp(*__first, *__result.second))
-                          __result.second = __first;
-                  }
-              }
-          }
-      }
-  }
-  return __result;
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-std::pair<_ForwardIterator, _ForwardIterator>
-minmax_element(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return _VSTD::minmax_element(__first, __last,
-              __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// minmax
-
-template<class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<const _Tp&, const _Tp&>
-minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)
-{
-    return __comp(__b, __a) ? pair<const _Tp&, const _Tp&>(__b, __a) :
-                              pair<const _Tp&, const _Tp&>(__a, __b);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<const _Tp&, const _Tp&>
-minmax(const _Tp& __a, const _Tp& __b)
-{
-    return _VSTD::minmax(__a, __b, __less<_Tp>());
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<_Tp, _Tp>
-minmax(initializer_list<_Tp> __t, _Compare __comp)
-{
-    typedef typename initializer_list<_Tp>::const_iterator _Iter;
-    _Iter __first = __t.begin();
-    _Iter __last  = __t.end();
-    std::pair<_Tp, _Tp> __result ( *__first, *__first );
-
-    ++__first;
-    if (__t.size() % 2 == 0)
-    {
-        if (__comp(*__first,  __result.first))
-            __result.first  = *__first;
-        else
-            __result.second = *__first;
-        ++__first;
-    }
-    
-    while (__first != __last)
-    {
-        _Tp __prev = *__first++;
-        if (__comp(__prev, *__first)) {
-            if (__comp(__prev, __result.first))    __result.first  = __prev;
-            if (__comp(__result.second, *__first)) __result.second = *__first;
-            }
-        else {
-            if (__comp(*__first, __result.first)) __result.first  = *__first;
-            if (__comp(__result.second, __prev))  __result.second = __prev;
-            }
-                
-        __first++;
-    }
-    return __result;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<_Tp, _Tp>
-minmax(initializer_list<_Tp> __t)
-{
-    return _VSTD::minmax(__t, __less<_Tp>());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-// random_shuffle
-
-// __independent_bits_engine
-
-template <unsigned long long _Xp, size_t _Rp>
-struct __log2_imp
-{
-    static const size_t value = _Xp & ((unsigned long long)(1) << _Rp) ? _Rp
-                                           : __log2_imp<_Xp, _Rp - 1>::value;
-};
-
-template <unsigned long long _Xp>
-struct __log2_imp<_Xp, 0>
-{
-    static const size_t value = 0;
-};
-
-template <size_t _Rp>
-struct __log2_imp<0, _Rp>
-{
-    static const size_t value = _Rp + 1;
-};
-
-template <class _UI, _UI _Xp>
-struct __log2
-{
-    static const size_t value = __log2_imp<_Xp,
-                                         sizeof(_UI) * __CHAR_BIT__ - 1>::value;
-};
-
-template<class _Engine, class _UIntType>
-class __independent_bits_engine
-{
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    typedef typename _Engine::result_type _Engine_result_type;
-    typedef typename conditional
-        <
-            sizeof(_Engine_result_type) <= sizeof(result_type),
-                result_type,
-                _Engine_result_type
-        >::type _Working_result_type;
-
-    _Engine& __e_;
-    size_t __w_;
-    size_t __w0_;
-    size_t __n_;
-    size_t __n0_;
-    _Working_result_type __y0_;
-    _Working_result_type __y1_;
-    _Engine_result_type __mask0_;
-    _Engine_result_type __mask1_;
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    static const _Working_result_type _Rp = _Engine::_Max - _Engine::_Min
-                                          + _Working_result_type(1);
-#else
-    static _LIBCPP_CONSTEXPR const _Working_result_type _Rp = _Engine::max() - _Engine::min()
-                                                      + _Working_result_type(1);
-#endif
-    static _LIBCPP_CONSTEXPR const size_t __m = __log2<_Working_result_type, _Rp>::value;
-    static _LIBCPP_CONSTEXPR const size_t _WDt = numeric_limits<_Working_result_type>::digits;
-    static _LIBCPP_CONSTEXPR const size_t _EDt = numeric_limits<_Engine_result_type>::digits;
-
-public:
-    // constructors and seeding functions
-    __independent_bits_engine(_Engine& __e, size_t __w);
-
-    // generating functions
-    result_type operator()() {return __eval(integral_constant<bool, _Rp != 0>());}
-
-private:
-    result_type __eval(false_type);
-    result_type __eval(true_type);
-};
-
-template<class _Engine, class _UIntType>
-__independent_bits_engine<_Engine, _UIntType>
-    ::__independent_bits_engine(_Engine& __e, size_t __w)
-        : __e_(__e),
-          __w_(__w)
-{
-    __n_ = __w_ / __m + (__w_ % __m != 0);
-    __w0_ = __w_ / __n_;
-    if (_Rp == 0)
-        __y0_ = _Rp;
-    else if (__w0_ < _WDt)
-        __y0_ = (_Rp >> __w0_) << __w0_;
-    else
-        __y0_ = 0;
-    if (_Rp - __y0_ > __y0_ / __n_)
-    {
-        ++__n_;
-        __w0_ = __w_ / __n_;
-        if (__w0_ < _WDt)
-            __y0_ = (_Rp >> __w0_) << __w0_;
-        else
-            __y0_ = 0;
-    }
-    __n0_ = __n_ - __w_ % __n_;
-    if (__w0_ < _WDt - 1)
-        __y1_ = (_Rp >> (__w0_ + 1)) << (__w0_ + 1);
-    else
-        __y1_ = 0;
-    __mask0_ = __w0_ > 0 ? _Engine_result_type(~0) >> (_EDt - __w0_) :
-                          _Engine_result_type(0);
-    __mask1_ = __w0_ < _EDt - 1 ?
-                               _Engine_result_type(~0) >> (_EDt - (__w0_ + 1)) :
-                               _Engine_result_type(~0);
-}
-
-template<class _Engine, class _UIntType>
-inline
-_UIntType
-__independent_bits_engine<_Engine, _UIntType>::__eval(false_type)
-{
-    return static_cast<result_type>(__e_() & __mask0_);
-}
-
-template<class _Engine, class _UIntType>
-_UIntType
-__independent_bits_engine<_Engine, _UIntType>::__eval(true_type)
-{
-    result_type _Sp = 0;
-    for (size_t __k = 0; __k < __n0_; ++__k)
-    {
-        _Engine_result_type __u;
-        do
-        {
-            __u = __e_() - _Engine::min();
-        } while (__u >= __y0_);
-        if (__w0_ < _WDt)
-            _Sp <<= __w0_;
-        else
-            _Sp = 0;
-        _Sp += __u & __mask0_;
-    }
-    for (size_t __k = __n0_; __k < __n_; ++__k)
-    {
-        _Engine_result_type __u;
-        do
-        {
-            __u = __e_() - _Engine::min();
-        } while (__u >= __y1_);
-        if (__w0_ < _WDt - 1)
-            _Sp <<= __w0_ + 1;
-        else
-            _Sp = 0;
-        _Sp += __u & __mask1_;
-    }
-    return _Sp;
-}
-
-// uniform_int_distribution
-
-template<class _IntType = int>
-class uniform_int_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef uniform_int_distribution distribution_type;
-
-        explicit param_type(result_type __a = 0,
-                            result_type __b = numeric_limits<result_type>::max())
-            : __a_(__a), __b_(__b) {}
-
-        result_type a() const {return __a_;}
-        result_type b() const {return __b_;}
-
-        friend bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    explicit uniform_int_distribution(result_type __a = 0,
-                                      result_type __b = numeric_limits<result_type>::max())
-        : __p_(param_type(__a, __b)) {}
-    explicit uniform_int_distribution(const param_type& __p) : __p_(__p) {}
-    void reset() {}
-
-    // generating functions
-    template<class _URNG> result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    result_type a() const {return __p_.a();}
-    result_type b() const {return __p_.b();}
-
-    param_type param() const {return __p_;}
-    void param(const param_type& __p) {__p_ = __p;}
-
-    result_type min() const {return a();}
-    result_type max() const {return b();}
-
-    friend bool operator==(const uniform_int_distribution& __x,
-                           const uniform_int_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend bool operator!=(const uniform_int_distribution& __x,
-                           const uniform_int_distribution& __y)
-            {return !(__x == __y);}
-};
-
-template<class _IntType>
-template<class _URNG>
-typename uniform_int_distribution<_IntType>::result_type
-uniform_int_distribution<_IntType>::operator()(_URNG& __g, const param_type& __p)
-{
-    typedef typename conditional<sizeof(result_type) <= sizeof(uint32_t),
-                                            uint32_t, uint64_t>::type _UIntType;
-    const _UIntType _Rp = __p.b() - __p.a() + _UIntType(1);
-    if (_Rp == 1)
-        return __p.a();
-    const size_t _Dt = numeric_limits<_UIntType>::digits;
-    typedef __independent_bits_engine<_URNG, _UIntType> _Eng;
-    if (_Rp == 0)
-        return static_cast<result_type>(_Eng(__g, _Dt)());
-    size_t __w = _Dt - __clz(_Rp) - 1;
-    if ((_Rp & (_UIntType(~0) >> (_Dt - __w))) != 0)
-        ++__w;
-    _Eng __e(__g, __w);
-    _UIntType __u;
-    do
-    {
-        __u = __e();
-    } while (__u >= _Rp);
-    return static_cast<result_type>(__u + __p.a());
-}
-
-class _LIBCPP_TYPE_VIS __rs_default;
-
-_LIBCPP_FUNC_VIS __rs_default __rs_get();
-
-class _LIBCPP_TYPE_VIS __rs_default
-{
-    static unsigned __c_;
-
-    __rs_default();
-public:
-    typedef uint_fast32_t result_type;
-
-    static const result_type _Min = 0;
-    static const result_type _Max = 0xFFFFFFFF;
-
-    __rs_default(const __rs_default&);
-    ~__rs_default();
-
-    result_type operator()();
-
-    static _LIBCPP_CONSTEXPR result_type min() {return _Min;}
-    static _LIBCPP_CONSTEXPR result_type max() {return _Max;}
-
-    friend _LIBCPP_FUNC_VIS __rs_default __rs_get();
-};
-
-_LIBCPP_FUNC_VIS __rs_default __rs_get();
-
-template <class _RandomAccessIterator>
-void
-random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef uniform_int_distribution<ptrdiff_t> _Dp;
-    typedef typename _Dp::param_type _Pp;
-    difference_type __d = __last - __first;
-    if (__d > 1)
-    {
-        _Dp __uid;
-        __rs_default __g = __rs_get();
-        for (--__last, --__d; __first < __last; ++__first, --__d)
-        {
-            difference_type __i = __uid(__g, _Pp(0, __d));
-            if (__i != difference_type(0))
-                swap(*__first, *(__first + __i));
-        }
-    }
-}
-
-template <class _RandomAccessIterator, class _RandomNumberGenerator>
-void
-random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-               _RandomNumberGenerator&& __rand)
-#else
-               _RandomNumberGenerator& __rand)
-#endif
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    difference_type __d = __last - __first;
-    if (__d > 1)
-    {
-        for (--__last; __first < __last; ++__first, --__d)
-        {
-            difference_type __i = __rand(__d);
-            swap(*__first, *(__first + __i));
-        }
-    }
-}
-
-template<class _RandomAccessIterator, class _UniformRandomNumberGenerator>
-    void shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-                 _UniformRandomNumberGenerator&& __g)
-#else
-                 _UniformRandomNumberGenerator& __g)
-#endif
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef uniform_int_distribution<ptrdiff_t> _Dp;
-    typedef typename _Dp::param_type _Pp;
-    difference_type __d = __last - __first;
-    if (__d > 1)
-    {
-        _Dp __uid;
-        for (--__last, --__d; __first < __last; ++__first, --__d)
-        {
-            difference_type __i = __uid(__g, _Pp(0, __d));
-            if (__i != difference_type(0))
-                swap(*__first, *(__first + __i));
-        }
-    }
-}
-
-template <class _InputIterator, class _Predicate>
-bool
-is_partitioned(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (!__pred(*__first))
-            break;
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            return false;
-    return true;
-}
-
-// partition
-
-template <class _Predicate, class _ForwardIterator>
-_ForwardIterator
-__partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred, forward_iterator_tag)
-{
-    while (true)
-    {
-        if (__first == __last)
-            return __first;
-        if (!__pred(*__first))
-            break;
-        ++__first;
-    }
-    for (_ForwardIterator __p = __first; ++__p != __last;)
-    {
-        if (__pred(*__p))
-        {
-            swap(*__first, *__p);
-            ++__first;
-        }
-    }
-    return __first;
-}
-
-template <class _Predicate, class _BidirectionalIterator>
-_BidirectionalIterator
-__partition(_BidirectionalIterator __first, _BidirectionalIterator __last, _Predicate __pred,
-            bidirectional_iterator_tag)
-{
-    while (true)
-    {
-        while (true)
-        {
-            if (__first == __last)
-                return __first;
-            if (!__pred(*__first))
-                break;
-            ++__first;
-        }
-        do
-        {
-            if (__first == --__last)
-                return __first;
-        } while (!__pred(*__last));
-        swap(*__first, *__last);
-        ++__first;
-    }
-}
-
-template <class _ForwardIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
-{
-    return _VSTD::__partition<typename add_lvalue_reference<_Predicate>::type>
-                            (__first, __last, __pred, typename iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-// partition_copy
-
-template <class _InputIterator, class _OutputIterator1,
-          class _OutputIterator2, class _Predicate>
-pair<_OutputIterator1, _OutputIterator2>
-partition_copy(_InputIterator __first, _InputIterator __last,
-               _OutputIterator1 __out_true, _OutputIterator2 __out_false,
-               _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-    {
-        if (__pred(*__first))
-        {
-            *__out_true = *__first;
-            ++__out_true;
-        }
-        else
-        {
-            *__out_false = *__first;
-            ++__out_false;
-        }
-    }
-    return pair<_OutputIterator1, _OutputIterator2>(__out_true, __out_false);
-}
-
-// partition_point
-
-template<class _ForwardIterator, class _Predicate>
-_ForwardIterator
-partition_point(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
-{
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    while (__len != 0)
-    {
-        difference_type __l2 = __len / 2;
-        _ForwardIterator __m = __first;
-        _VSTD::advance(__m, __l2);
-        if (__pred(*__m))
-        {
-            __first = ++__m;
-            __len -= __l2 + 1;
-        }
-        else
-            __len = __l2;
-    }
-    return __first;
-}
-
-// stable_partition
-
-template <class _Predicate, class _ForwardIterator, class _Distance, class _Pair>
-_ForwardIterator
-__stable_partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,
-                   _Distance __len, _Pair __p, forward_iterator_tag __fit)
-{
-    // *__first is known to be false
-    // __len >= 1
-    if (__len == 1)
-        return __first;
-    if (__len == 2)
-    {
-        _ForwardIterator __m = __first;
-        if (__pred(*++__m))
-        {
-            swap(*__first, *__m);
-            return __m;
-        }
-        return __first;
-    }
-    if (__len <= __p.second)
-    {   // The buffer is big enough to use
-        typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-        __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h(__p.first, __d);
-        // Move the falses into the temporary buffer, and the trues to the front of the line
-        // Update __first to always point to the end of the trues
-        value_type* __t = __p.first;
-        ::new(__t) value_type(_VSTD::move(*__first));
-        __d.__incr((value_type*)0);
-        ++__t;
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (__pred(*__i))
-            {
-                *__first = _VSTD::move(*__i);
-                ++__first;
-            }
-            else
-            {
-                ::new(__t) value_type(_VSTD::move(*__i));
-                __d.__incr((value_type*)0);
-                ++__t;
-            }
-        }
-        // All trues now at start of range, all falses in buffer
-        // Move falses back into range, but don't mess up __first which points to first false
-        __i = __first;
-        for (value_type* __t2 = __p.first; __t2 < __t; ++__t2, ++__i)
-            *__i = _VSTD::move(*__t2);
-        // __h destructs moved-from values out of the temp buffer, but doesn't deallocate buffer
-        return __first;
-    }
-    // Else not enough buffer, do in place
-    // __len >= 3
-    _ForwardIterator __m = __first;
-    _Distance __len2 = __len / 2;  // __len2 >= 2
-    _VSTD::advance(__m, __len2);
-    // recurse on [__first, __m), *__first know to be false
-    // F?????????????????
-    // f       m         l
-    typedef typename add_lvalue_reference<_Predicate>::type _PredRef;
-    _ForwardIterator __first_false = __stable_partition<_PredRef>(__first, __m, __pred, __len2, __p, __fit);
-    // TTTFFFFF??????????
-    // f  ff   m         l
-    // recurse on [__m, __last], except increase __m until *(__m) is false, *__last know to be true
-    _ForwardIterator __m1 = __m;
-    _ForwardIterator __second_false = __last;
-    _Distance __len_half = __len - __len2;
-    while (__pred(*__m1))
-    {
-        if (++__m1 == __last)
-            goto __second_half_done;
-        --__len_half;
-    }
-    // TTTFFFFFTTTF??????
-    // f  ff   m  m1     l
-    __second_false = __stable_partition<_PredRef>(__m1, __last, __pred, __len_half, __p, __fit);
-__second_half_done:
-    // TTTFFFFFTTTTTFFFFF
-    // f  ff   m    sf   l
-    return _VSTD::rotate(__first_false, __m, __second_false);
-    // TTTTTTTTFFFFFFFFFF
-    //         |
-}
-
-struct __return_temporary_buffer
-{
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void operator()(_Tp* __p) const {_VSTD::return_temporary_buffer(__p);}
-};
-
-template <class _Predicate, class _ForwardIterator>
-_ForwardIterator
-__stable_partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,
-                   forward_iterator_tag)
-{
-    const unsigned __alloc_limit = 3;  // might want to make this a function of trivial assignment
-    // Either prove all true and return __first or point to first false
-    while (true)
-    {
-        if (__first == __last)
-            return __first;
-        if (!__pred(*__first))
-            break;
-        ++__first;
-    }
-    // We now have a reduced range [__first, __last)
-    // *__first is known to be false
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    pair<value_type*, ptrdiff_t> __p(0, 0);
-    unique_ptr<value_type, __return_temporary_buffer> __h;
-    if (__len >= __alloc_limit)
-    {
-        __p = _VSTD::get_temporary_buffer<value_type>(__len);
-        __h.reset(__p.first);
-    }
-    return __stable_partition<typename add_lvalue_reference<_Predicate>::type>
-                             (__first, __last, __pred, __len, __p, forward_iterator_tag());
-}
-
-template <class _Predicate, class _BidirectionalIterator, class _Distance, class _Pair>
-_BidirectionalIterator
-__stable_partition(_BidirectionalIterator __first, _BidirectionalIterator __last, _Predicate __pred,
-                   _Distance __len, _Pair __p, bidirectional_iterator_tag __bit)
-{
-    // *__first is known to be false
-    // *__last is known to be true
-    // __len >= 2
-    if (__len == 2)
-    {
-        swap(*__first, *__last);
-        return __last;
-    }
-    if (__len == 3)
-    {
-        _BidirectionalIterator __m = __first;
-        if (__pred(*++__m))
-        {
-            swap(*__first, *__m);
-            swap(*__m, *__last);
-            return __last;
-        }
-        swap(*__m, *__last);
-        swap(*__first, *__m);
-        return __m;
-    }
-    if (__len <= __p.second)
-    {   // The buffer is big enough to use
-        typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-        __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h(__p.first, __d);
-        // Move the falses into the temporary buffer, and the trues to the front of the line
-        // Update __first to always point to the end of the trues
-        value_type* __t = __p.first;
-        ::new(__t) value_type(_VSTD::move(*__first));
-        __d.__incr((value_type*)0);
-        ++__t;
-        _BidirectionalIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (__pred(*__i))
-            {
-                *__first = _VSTD::move(*__i);
-                ++__first;
-            }
-            else
-            {
-                ::new(__t) value_type(_VSTD::move(*__i));
-                __d.__incr((value_type*)0);
-                ++__t;
-            }
-        }
-        // move *__last, known to be true
-        *__first = _VSTD::move(*__i);
-        __i = ++__first;
-        // All trues now at start of range, all falses in buffer
-        // Move falses back into range, but don't mess up __first which points to first false
-        for (value_type* __t2 = __p.first; __t2 < __t; ++__t2, ++__i)
-            *__i = _VSTD::move(*__t2);
-        // __h destructs moved-from values out of the temp buffer, but doesn't deallocate buffer
-        return __first;
-    }
-    // Else not enough buffer, do in place
-    // __len >= 4
-    _BidirectionalIterator __m = __first;
-    _Distance __len2 = __len / 2;  // __len2 >= 2
-    _VSTD::advance(__m, __len2);
-    // recurse on [__first, __m-1], except reduce __m-1 until *(__m-1) is true, *__first know to be false
-    // F????????????????T
-    // f       m        l
-    _BidirectionalIterator __m1 = __m;
-    _BidirectionalIterator __first_false = __first;
-    _Distance __len_half = __len2;
-    while (!__pred(*--__m1))
-    {
-        if (__m1 == __first)
-            goto __first_half_done;
-        --__len_half;
-    }
-    // F???TFFF?????????T
-    // f   m1  m        l
-    typedef typename add_lvalue_reference<_Predicate>::type _PredRef;
-    __first_false = __stable_partition<_PredRef>(__first, __m1, __pred, __len_half, __p, __bit);
-__first_half_done:
-    // TTTFFFFF?????????T
-    // f  ff   m        l
-    // recurse on [__m, __last], except increase __m until *(__m) is false, *__last know to be true
-    __m1 = __m;
-    _BidirectionalIterator __second_false = __last;
-    ++__second_false;
-    __len_half = __len - __len2;
-    while (__pred(*__m1))
-    {
-        if (++__m1 == __last)
-            goto __second_half_done;
-        --__len_half;
-    }
-    // TTTFFFFFTTTF?????T
-    // f  ff   m  m1    l
-    __second_false = __stable_partition<_PredRef>(__m1, __last, __pred, __len_half, __p, __bit);
-__second_half_done:
-    // TTTFFFFFTTTTTFFFFF
-    // f  ff   m    sf  l
-    return _VSTD::rotate(__first_false, __m, __second_false);
-    // TTTTTTTTFFFFFFFFFF
-    //         |
-}
-
-template <class _Predicate, class _BidirectionalIterator>
-_BidirectionalIterator
-__stable_partition(_BidirectionalIterator __first, _BidirectionalIterator __last, _Predicate __pred,
-                   bidirectional_iterator_tag)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-    const difference_type __alloc_limit = 4;  // might want to make this a function of trivial assignment
-    // Either prove all true and return __first or point to first false
-    while (true)
-    {
-        if (__first == __last)
-            return __first;
-        if (!__pred(*__first))
-            break;
-        ++__first;
-    }
-    // __first points to first false, everything prior to __first is already set.
-    // Either prove [__first, __last) is all false and return __first, or point __last to last true
-    do
-    {
-        if (__first == --__last)
-            return __first;
-    } while (!__pred(*__last));
-    // We now have a reduced range [__first, __last]
-    // *__first is known to be false
-    // *__last is known to be true
-    // __len >= 2
-    difference_type __len = _VSTD::distance(__first, __last) + 1;
-    pair<value_type*, ptrdiff_t> __p(0, 0);
-    unique_ptr<value_type, __return_temporary_buffer> __h;
-    if (__len >= __alloc_limit)
-    {
-        __p = _VSTD::get_temporary_buffer<value_type>(__len);
-        __h.reset(__p.first);
-    }
-    return __stable_partition<typename add_lvalue_reference<_Predicate>::type>
-                             (__first, __last, __pred, __len, __p, bidirectional_iterator_tag());
-}
-
-template <class _ForwardIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-stable_partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
-{
-    return __stable_partition<typename add_lvalue_reference<_Predicate>::type>
-                             (__first, __last, __pred, typename iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-// is_sorted_until
-
-template <class _ForwardIterator, class _Compare>
-_ForwardIterator
-is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (__comp(*__i, *__first))
-                return __i;
-            __first = __i;
-        }
-    }
-    return __last;
-}
-
-template<class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return _VSTD::is_sorted_until(__first, __last, __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// is_sorted
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    return _VSTD::is_sorted_until(__first, __last, __comp) == __last;
-}
-
-template<class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_sorted(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return _VSTD::is_sorted(__first, __last, __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// sort
-
-// stable, 2-3 compares, 0-2 swaps
-
-template <class _Compare, class _ForwardIterator>
-unsigned
-__sort3(_ForwardIterator __x, _ForwardIterator __y, _ForwardIterator __z, _Compare __c)
-{
-    unsigned __r = 0;
-    if (!__c(*__y, *__x))          // if x <= y
-    {
-        if (!__c(*__z, *__y))      // if y <= z
-            return __r;            // x <= y && y <= z
-                                   // x <= y && y > z
-        swap(*__y, *__z);          // x <= z && y < z
-        __r = 1;
-        if (__c(*__y, *__x))       // if x > y
-        {
-            swap(*__x, *__y);      // x < y && y <= z
-            __r = 2;
-        }
-        return __r;                // x <= y && y < z
-    }
-    if (__c(*__z, *__y))           // x > y, if y > z
-    {
-        swap(*__x, *__z);          // x < y && y < z
-        __r = 1;
-        return __r;
-    }
-    swap(*__x, *__y);              // x > y && y <= z
-    __r = 1;                       // x < y && x <= z
-    if (__c(*__z, *__y))           // if y > z
-    {
-        swap(*__y, *__z);          // x <= y && y < z
-        __r = 2;
-    }
-    return __r;
-}                                  // x <= y && y <= z
-
-// stable, 3-6 compares, 0-5 swaps
-
-template <class _Compare, class _ForwardIterator>
-unsigned
-__sort4(_ForwardIterator __x1, _ForwardIterator __x2, _ForwardIterator __x3,
-            _ForwardIterator __x4, _Compare __c)
-{
-    unsigned __r = __sort3<_Compare>(__x1, __x2, __x3, __c);
-    if (__c(*__x4, *__x3))
-    {
-        swap(*__x3, *__x4);
-        ++__r;
-        if (__c(*__x3, *__x2))
-        {
-            swap(*__x2, *__x3);
-            ++__r;
-            if (__c(*__x2, *__x1))
-            {
-                swap(*__x1, *__x2);
-                ++__r;
-            }
-        }
-    }
-    return __r;
-}
-
-// stable, 4-10 compares, 0-9 swaps
-
-template <class _Compare, class _ForwardIterator>
-unsigned
-__sort5(_ForwardIterator __x1, _ForwardIterator __x2, _ForwardIterator __x3,
-            _ForwardIterator __x4, _ForwardIterator __x5, _Compare __c)
-{
-    unsigned __r = __sort4<_Compare>(__x1, __x2, __x3, __x4, __c);
-    if (__c(*__x5, *__x4))
-    {
-        swap(*__x4, *__x5);
-        ++__r;
-        if (__c(*__x4, *__x3))
-        {
-            swap(*__x3, *__x4);
-            ++__r;
-            if (__c(*__x3, *__x2))
-            {
-                swap(*__x2, *__x3);
-                ++__r;
-                if (__c(*__x2, *__x1))
-                {
-                    swap(*__x1, *__x2);
-                    ++__r;
-                }
-            }
-        }
-    }
-    return __r;
-}
-
-// Assumes size > 0
-template <class _Compare, class _BirdirectionalIterator>
-void
-__selection_sort(_BirdirectionalIterator __first, _BirdirectionalIterator __last, _Compare __comp)
-{
-    _BirdirectionalIterator __lm1 = __last;
-    for (--__lm1; __first != __lm1; ++__first)
-    {
-        _BirdirectionalIterator __i = _VSTD::min_element<_BirdirectionalIterator,
-                                                        typename add_lvalue_reference<_Compare>::type>
-                                                       (__first, __last, __comp);
-        if (__i != __first)
-            swap(*__first, *__i);
-    }
-}
-
-template <class _Compare, class _BirdirectionalIterator>
-void
-__insertion_sort(_BirdirectionalIterator __first, _BirdirectionalIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_BirdirectionalIterator>::value_type value_type;
-    if (__first != __last)
-    {
-        _BirdirectionalIterator __i = __first;
-        for (++__i; __i != __last; ++__i)
-        {
-            _BirdirectionalIterator __j = __i;
-            value_type __t(_VSTD::move(*__j));
-            for (_BirdirectionalIterator __k = __i; __k != __first && __comp(__t,  *--__k); --__j)
-                *__j = _VSTD::move(*__k);
-            *__j = _VSTD::move(__t);
-        }
-    }
-}
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__insertion_sort_3(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    _RandomAccessIterator __j = __first+2;
-    __sort3<_Compare>(__first, __first+1, __j, __comp);
-    for (_RandomAccessIterator __i = __j+1; __i != __last; ++__i)
-    {
-        if (__comp(*__i, *__j))
-        {
-            value_type __t(_VSTD::move(*__i));
-            _RandomAccessIterator __k = __j;
-            __j = __i;
-            do
-            {
-                *__j = _VSTD::move(*__k);
-                __j = __k;
-            } while (__j != __first && __comp(__t, *--__k));
-            *__j = _VSTD::move(__t);
-        }
-        __j = __i;
-    }
-}
-
-template <class _Compare, class _RandomAccessIterator>
-bool
-__insertion_sort_incomplete(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    switch (__last - __first)
-    {
-    case 0:
-    case 1:
-        return true;
-    case 2:
-        if (__comp(*--__last, *__first))
-            swap(*__first, *__last);
-        return true;
-    case 3:
-        _VSTD::__sort3<_Compare>(__first, __first+1, --__last, __comp);
-        return true;
-    case 4:
-        _VSTD::__sort4<_Compare>(__first, __first+1, __first+2, --__last, __comp);
-        return true;
-    case 5:
-        _VSTD::__sort5<_Compare>(__first, __first+1, __first+2, __first+3, --__last, __comp);
-        return true;
-    }
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    _RandomAccessIterator __j = __first+2;
-    __sort3<_Compare>(__first, __first+1, __j, __comp);
-    const unsigned __limit = 8;
-    unsigned __count = 0;
-    for (_RandomAccessIterator __i = __j+1; __i != __last; ++__i)
-    {
-        if (__comp(*__i, *__j))
-        {
-            value_type __t(_VSTD::move(*__i));
-            _RandomAccessIterator __k = __j;
-            __j = __i;
-            do
-            {
-                *__j = _VSTD::move(*__k);
-                __j = __k;
-            } while (__j != __first && __comp(__t, *--__k));
-            *__j = _VSTD::move(__t);
-            if (++__count == __limit)
-                return ++__i == __last;
-        }
-        __j = __i;
-    }
-    return true;
-}
-
-template <class _Compare, class _BirdirectionalIterator>
-void
-__insertion_sort_move(_BirdirectionalIterator __first1, _BirdirectionalIterator __last1,
-                      typename iterator_traits<_BirdirectionalIterator>::value_type* __first2, _Compare __comp)
-{
-    typedef typename iterator_traits<_BirdirectionalIterator>::value_type value_type;
-    if (__first1 != __last1)
-    {
-        __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h(__first2, __d);
-        value_type* __last2 = __first2;
-        ::new(__last2) value_type(_VSTD::move(*__first1));
-        __d.__incr((value_type*)0);
-        for (++__last2; ++__first1 != __last1; ++__last2)
-        {
-            value_type* __j2 = __last2;
-            value_type* __i2 = __j2;
-            if (__comp(*__first1, *--__i2))
-            {
-                ::new(__j2) value_type(_VSTD::move(*__i2));
-                __d.__incr((value_type*)0);
-                for (--__j2; __i2 != __first2 && __comp(*__first1,  *--__i2); --__j2)
-                    *__j2 = _VSTD::move(*__i2);
-                *__j2 = _VSTD::move(*__first1);
-            }
-            else
-            {
-                ::new(__j2) value_type(_VSTD::move(*__first1));
-                __d.__incr((value_type*)0);
-            }
-        }
-        __h.release();
-    }
-}
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    // _Compare is known to be a reference type
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    const difference_type __limit = is_trivially_copy_constructible<value_type>::value &&
-                                    is_trivially_copy_assignable<value_type>::value ? 30 : 6;
-    while (true)
-    {
-    __restart:
-        difference_type __len = __last - __first;
-        switch (__len)
-        {
-        case 0:
-        case 1:
-            return;
-        case 2:
-            if (__comp(*--__last, *__first))
-                swap(*__first, *__last);
-            return;
-        case 3:
-            _VSTD::__sort3<_Compare>(__first, __first+1, --__last, __comp);
-            return;
-        case 4:
-            _VSTD::__sort4<_Compare>(__first, __first+1, __first+2, --__last, __comp);
-            return;
-        case 5:
-            _VSTD::__sort5<_Compare>(__first, __first+1, __first+2, __first+3, --__last, __comp);
-            return;
-        }
-        if (__len <= __limit)
-        {
-            _VSTD::__insertion_sort_3<_Compare>(__first, __last, __comp);
-            return;
-        }
-        // __len > 5
-        _RandomAccessIterator __m = __first;
-        _RandomAccessIterator __lm1 = __last;
-        --__lm1;
-        unsigned __n_swaps;
-        {
-        difference_type __delta;
-        if (__len >= 1000)
-        {
-            __delta = __len/2;
-            __m += __delta;
-            __delta /= 2;
-            __n_swaps = _VSTD::__sort5<_Compare>(__first, __first + __delta, __m, __m+__delta, __lm1, __comp);
-        }
-        else
-        {
-            __delta = __len/2;
-            __m += __delta;
-            __n_swaps = _VSTD::__sort3<_Compare>(__first, __m, __lm1, __comp);
-        }
-        }
-        // *__m is median
-        // partition [__first, __m) < *__m and *__m <= [__m, __last)
-        // (this inhibits tossing elements equivalent to __m around unnecessarily)
-        _RandomAccessIterator __i = __first;
-        _RandomAccessIterator __j = __lm1;
-        // j points beyond range to be tested, *__m is known to be <= *__lm1
-        // The search going up is known to be guarded but the search coming down isn't.
-        // Prime the downward search with a guard.
-        if (!__comp(*__i, *__m))  // if *__first == *__m
-        {
-            // *__first == *__m, *__first doesn't go in first part
-            // manually guard downward moving __j against __i
-            while (true)
-            {
-                if (__i == --__j)
-                {
-                    // *__first == *__m, *__m <= all other elements
-                    // Parition instead into [__first, __i) == *__first and *__first < [__i, __last)
-                    ++__i;  // __first + 1
-                    __j = __last;
-                    if (!__comp(*__first, *--__j))  // we need a guard if *__first == *(__last-1)
-                    {
-                        while (true)
-                        {
-                            if (__i == __j)
-                                return;  // [__first, __last) all equivalent elements
-                            if (__comp(*__first, *__i))
-                            {
-                                swap(*__i, *__j);
-                                ++__n_swaps;
-                                ++__i;
-                                break;
-                            }
-                            ++__i;
-                        }
-                    }
-                    // [__first, __i) == *__first and *__first < [__j, __last) and __j == __last - 1
-                    if (__i == __j)
-                        return;
-                    while (true)
-                    {
-                        while (!__comp(*__first, *__i))
-                            ++__i;
-                        while (__comp(*__first, *--__j))
-                            ;
-                        if (__i >= __j)
-                            break;
-                        swap(*__i, *__j);
-                        ++__n_swaps;
-                        ++__i;
-                    }
-                    // [__first, __i) == *__first and *__first < [__i, __last)
-                    // The first part is sorted, sort the secod part
-                    // _VSTD::__sort<_Compare>(__i, __last, __comp);
-                    __first = __i;
-                    goto __restart;
-                }
-                if (__comp(*__j, *__m))
-                {
-                    swap(*__i, *__j);
-                    ++__n_swaps;
-                    break;  // found guard for downward moving __j, now use unguarded partition
-                }
-            }
-        }
-        // It is known that *__i < *__m
-        ++__i;
-        // j points beyond range to be tested, *__m is known to be <= *__lm1
-        // if not yet partitioned...
-        if (__i < __j)
-        {
-            // known that *(__i - 1) < *__m
-            // known that __i <= __m
-            while (true)
-            {
-                // __m still guards upward moving __i
-                while (__comp(*__i, *__m))
-                    ++__i;
-                // It is now known that a guard exists for downward moving __j
-                while (!__comp(*--__j, *__m))
-                    ;
-                if (__i > __j)
-                    break;
-                swap(*__i, *__j);
-                ++__n_swaps;
-                // It is known that __m != __j
-                // If __m just moved, follow it
-                if (__m == __i)
-                    __m = __j;
-                ++__i;
-            }
-        }
-        // [__first, __i) < *__m and *__m <= [__i, __last)
-        if (__i != __m && __comp(*__m, *__i))
-        {
-            swap(*__i, *__m);
-            ++__n_swaps;
-        }
-        // [__first, __i) < *__i and *__i <= [__i+1, __last)
-        // If we were given a perfect partition, see if insertion sort is quick...
-        if (__n_swaps == 0)
-        {
-            bool __fs = _VSTD::__insertion_sort_incomplete<_Compare>(__first, __i, __comp);
-            if (_VSTD::__insertion_sort_incomplete<_Compare>(__i+1, __last, __comp))
-            {
-                if (__fs)
-                    return;
-                __last = __i;
-                continue;
-            }
-            else
-            {
-                if (__fs)
-                {
-                    __first = ++__i;
-                    continue;
-                }
-            }
-        }
-        // sort smaller range with recursive call and larger with tail recursion elimination
-        if (__i - __first < __last - __i)
-        {
-            _VSTD::__sort<_Compare>(__first, __i, __comp);
-            // _VSTD::__sort<_Compare>(__i+1, __last, __comp);
-            __first = ++__i;
-        }
-        else
-        {
-            _VSTD::__sort<_Compare>(__i+1, __last, __comp);
-            // _VSTD::__sort<_Compare>(__first, __i, __comp);
-            __last = __i;
-        }
-    }
-}
-
-// This forwarder keeps the top call and the recursive calls using the same instantiation, forcing a reference _Compare
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __sort<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __sort<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::sort(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(_Tp** __first, _Tp** __last)
-{
-    _VSTD::sort((size_t*)__first, (size_t*)__last, __less<size_t>());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(__wrap_iter<_Tp*> __first, __wrap_iter<_Tp*> __last)
-{
-    _VSTD::sort(__first.base(), __last.base());
-}
-
-template <class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(__wrap_iter<_Tp*> __first, __wrap_iter<_Tp*> __last, _Compare __comp)
-{
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    _VSTD::sort<_Tp*, _Comp_ref>(__first.base(), __last.base(), __comp);
-}
-
-#ifdef _LIBCPP_MSVC
-#pragma warning( push )
-#pragma warning( disable: 4231)
-#endif // _LIBCPP_MSVC
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<char>&, char*>(char*, char*, __less<char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<wchar_t>&, wchar_t*>(wchar_t*, wchar_t*, __less<wchar_t>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<signed char>&, signed char*>(signed char*, signed char*, __less<signed char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned char>&, unsigned char*>(unsigned char*, unsigned char*, __less<unsigned char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<short>&, short*>(short*, short*, __less<short>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned short>&, unsigned short*>(unsigned short*, unsigned short*, __less<unsigned short>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<int>&, int*>(int*, int*, __less<int>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned>&, unsigned*>(unsigned*, unsigned*, __less<unsigned>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<long>&, long*>(long*, long*, __less<long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned long>&, unsigned long*>(unsigned long*, unsigned long*, __less<unsigned long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<long long>&, long long*>(long long*, long long*, __less<long long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned long long>&, unsigned long long*>(unsigned long long*, unsigned long long*, __less<unsigned long long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<float>&, float*>(float*, float*, __less<float>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<double>&, double*>(double*, double*, __less<double>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<long double>&, long double*>(long double*, long double*, __less<long double>&))
-
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<char>&, char*>(char*, char*, __less<char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<wchar_t>&, wchar_t*>(wchar_t*, wchar_t*, __less<wchar_t>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<signed char>&, signed char*>(signed char*, signed char*, __less<signed char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned char>&, unsigned char*>(unsigned char*, unsigned char*, __less<unsigned char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<short>&, short*>(short*, short*, __less<short>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned short>&, unsigned short*>(unsigned short*, unsigned short*, __less<unsigned short>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<int>&, int*>(int*, int*, __less<int>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned>&, unsigned*>(unsigned*, unsigned*, __less<unsigned>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<long>&, long*>(long*, long*, __less<long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned long>&, unsigned long*>(unsigned long*, unsigned long*, __less<unsigned long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<long long>&, long long*>(long long*, long long*, __less<long long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned long long>&, unsigned long long*>(unsigned long long*, unsigned long long*, __less<unsigned long long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<float>&, float*>(float*, float*, __less<float>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<double>&, double*>(double*, double*, __less<double>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<long double>&, long double*>(long double*, long double*, __less<long double>&))
-
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS unsigned __sort5<__less<long double>&, long double*>(long double*, long double*, long double*, long double*, long double*, __less<long double>&))
-#ifdef _LIBCPP_MSVC
-#pragma warning( pop )
-#endif  // _LIBCPP_MSVC
-
-// lower_bound
-
-template <class _Compare, class _ForwardIterator, class _Tp>
-_ForwardIterator
-__lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    while (__len != 0)
-    {
-        difference_type __l2 = __len / 2;
-        _ForwardIterator __m = __first;
-        _VSTD::advance(__m, __l2);
-        if (__comp(*__m, __value_))
-        {
-            __first = ++__m;
-            __len -= __l2 + 1;
-        }
-        else
-            __len = __l2;
-    }
-    return __first;
-}
-
-template <class _ForwardIterator, class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __lower_bound<_Comp_ref>(__first, __last, __value_, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __lower_bound<_Comp_ref>(__first, __last, __value_, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    return _VSTD::lower_bound(__first, __last, __value_,
-                             __less<typename iterator_traits<_ForwardIterator>::value_type, _Tp>());
-}
-
-// upper_bound
-
-template <class _Compare, class _ForwardIterator, class _Tp>
-_ForwardIterator
-__upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    while (__len != 0)
-    {
-        difference_type __l2 = __len / 2;
-        _ForwardIterator __m = __first;
-        _VSTD::advance(__m, __l2);
-        if (__comp(__value_, *__m))
-            __len = __l2;
-        else
-        {
-            __first = ++__m;
-            __len -= __l2 + 1;
-        }
-    }
-    return __first;
-}
-
-template <class _ForwardIterator, class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __upper_bound<_Comp_ref>(__first, __last, __value_, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __upper_bound<_Comp_ref>(__first, __last, __value_, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    return _VSTD::upper_bound(__first, __last, __value_,
-                             __less<_Tp, typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// equal_range
-
-template <class _Compare, class _ForwardIterator, class _Tp>
-pair<_ForwardIterator, _ForwardIterator>
-__equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    while (__len != 0)
-    {
-        difference_type __l2 = __len / 2;
-        _ForwardIterator __m = __first;
-        _VSTD::advance(__m, __l2);
-        if (__comp(*__m, __value_))
-        {
-            __first = ++__m;
-            __len -= __l2 + 1;
-        }
-        else if (__comp(__value_, *__m))
-        {
-            __last = __m;
-            __len = __l2;
-        }
-        else
-        {
-            _ForwardIterator __mp1 = __m;
-            return pair<_ForwardIterator, _ForwardIterator>
-                   (
-                      __lower_bound<_Compare>(__first, __m, __value_, __comp),
-                      __upper_bound<_Compare>(++__mp1, __last, __value_, __comp)
-                   );
-        }
-    }
-    return pair<_ForwardIterator, _ForwardIterator>(__first, __first);
-}
-
-template <class _ForwardIterator, class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_ForwardIterator, _ForwardIterator>
-equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __equal_range<_Comp_ref>(__first, __last, __value_, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __equal_range<_Comp_ref>(__first, __last, __value_, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_ForwardIterator, _ForwardIterator>
-equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    return _VSTD::equal_range(__first, __last, __value_,
-                             __less<typename iterator_traits<_ForwardIterator>::value_type, _Tp>());
-}
-
-// binary_search
-
-template <class _Compare, class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-    __first = __lower_bound<_Compare>(__first, __last, __value_, __comp);
-    return __first != __last && !__comp(__value_, *__first);
-}
-
-template <class _ForwardIterator, class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __binary_search<_Comp_ref>(__first, __last, __value_, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __binary_search<_Comp_ref>(__first, __last, __value_, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    return _VSTD::binary_search(__first, __last, __value_,
-                             __less<typename iterator_traits<_ForwardIterator>::value_type, _Tp>());
-}
-
-// merge
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__merge(_InputIterator1 __first1, _InputIterator1 __last1,
-        _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    for (; __first1 != __last1; ++__result)
-    {
-        if (__first2 == __last2)
-            return _VSTD::copy(__first1, __last1, __result);
-        if (__comp(*__first2, *__first1))
-        {
-            *__result = *__first2;
-            ++__first2;
-        }
-        else
-        {
-            *__result = *__first1;
-            ++__first1;
-        }
-    }
-    return _VSTD::copy(__first2, __last2, __result);
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-merge(_InputIterator1 __first1, _InputIterator1 __last1,
-      _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-merge(_InputIterator1 __first1, _InputIterator1 __last1,
-      _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return merge(__first1, __last1, __first2, __last2, __result, __less<__v1, __v2>());
-}
-
-// inplace_merge
-
-template <class _Compare, class _BidirectionalIterator>
-void
-__buffered_inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last,
-                _Compare __comp, typename iterator_traits<_BidirectionalIterator>::difference_type __len1,
-                                 typename iterator_traits<_BidirectionalIterator>::difference_type __len2,
-                typename iterator_traits<_BidirectionalIterator>::value_type* __buff)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-    __destruct_n __d(0);
-    unique_ptr<value_type, __destruct_n&> __h2(__buff, __d);
-    if (__len1 <= __len2)
-    {
-        value_type* __p = __buff;
-        for (_BidirectionalIterator __i = __first; __i != __middle; __d.__incr((value_type*)0), (void) ++__i, ++__p)
-            ::new(__p) value_type(_VSTD::move(*__i));
-        __merge<_Compare>(move_iterator<value_type*>(__buff),
-                          move_iterator<value_type*>(__p),
-                          move_iterator<_BidirectionalIterator>(__middle),
-                          move_iterator<_BidirectionalIterator>(__last),
-                          __first, __comp);
-    }
-    else
-    {
-        value_type* __p = __buff;
-        for (_BidirectionalIterator __i = __middle; __i != __last; __d.__incr((value_type*)0), (void) ++__i, ++__p)
-            ::new(__p) value_type(_VSTD::move(*__i));
-        typedef reverse_iterator<_BidirectionalIterator> _RBi;
-        typedef reverse_iterator<value_type*> _Rv;
-        __merge(move_iterator<_RBi>(_RBi(__middle)), move_iterator<_RBi>(_RBi(__first)),
-                move_iterator<_Rv>(_Rv(__p)), move_iterator<_Rv>(_Rv(__buff)),
-                _RBi(__last), __negate<_Compare>(__comp));
-    }
-}
-
-template <class _Compare, class _BidirectionalIterator>
-void
-__inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last,
-                _Compare __comp, typename iterator_traits<_BidirectionalIterator>::difference_type __len1,
-                                 typename iterator_traits<_BidirectionalIterator>::difference_type __len2,
-                typename iterator_traits<_BidirectionalIterator>::value_type* __buff, ptrdiff_t __buff_size)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type;
-    while (true)
-    {
-        // if __middle == __last, we're done
-        if (__len2 == 0)
-            return;
-        // shrink [__first, __middle) as much as possible (with no moves), returning if it shrinks to 0
-        for (; true; ++__first, (void) --__len1)
-        {
-            if (__len1 == 0)
-                return;
-            if (__comp(*__middle, *__first))
-                break;
-        }
-        if (__len1 <= __buff_size || __len2 <= __buff_size)
-        {
-            __buffered_inplace_merge<_Compare>(__first, __middle, __last, __comp, __len1, __len2, __buff);
-            return;
-        }
-        // __first < __middle < __last
-        // *__first > *__middle
-        // partition [__first, __m1) [__m1, __middle) [__middle, __m2) [__m2, __last) such that
-        //     all elements in:
-        //         [__first, __m1)  <= [__middle, __m2)
-        //         [__middle, __m2) <  [__m1, __middle)
-        //         [__m1, __middle) <= [__m2, __last)
-        //     and __m1 or __m2 is in the middle of its range
-        _BidirectionalIterator __m1;  // "median" of [__first, __middle)
-        _BidirectionalIterator __m2;  // "median" of [__middle, __last)
-        difference_type __len11;      // distance(__first, __m1)
-        difference_type __len21;      // distance(__middle, __m2)
-        // binary search smaller range
-        if (__len1 < __len2)
-        {   // __len >= 1, __len2 >= 2
-            __len21 = __len2 / 2;
-            __m2 = __middle;
-            _VSTD::advance(__m2, __len21);
-            __m1 = __upper_bound<_Compare>(__first, __middle, *__m2, __comp);
-            __len11 = _VSTD::distance(__first, __m1);
-        }
-        else
-        {
-            if (__len1 == 1)
-            {   // __len1 >= __len2 && __len2 > 0, therefore __len2 == 1
-                // It is known *__first > *__middle
-                swap(*__first, *__middle);
-                return;
-            }
-            // __len1 >= 2, __len2 >= 1
-            __len11 = __len1 / 2;
-            __m1 = __first;
-            _VSTD::advance(__m1, __len11);
-            __m2 = __lower_bound<_Compare>(__middle, __last, *__m1, __comp);
-            __len21 = _VSTD::distance(__middle, __m2);
-        }
-        difference_type __len12 = __len1 - __len11;  // distance(__m1, __middle)
-        difference_type __len22 = __len2 - __len21;  // distance(__m2, __last)
-        // [__first, __m1) [__m1, __middle) [__middle, __m2) [__m2, __last)
-        // swap middle two partitions
-        __middle = _VSTD::rotate(__m1, __middle, __m2);
-        // __len12 and __len21 now have swapped meanings
-        // merge smaller range with recurisve call and larger with tail recursion elimination
-        if (__len11 + __len21 < __len12 + __len22)
-        {
-            __inplace_merge<_Compare>(__first, __m1, __middle, __comp, __len11, __len21, __buff, __buff_size);
-//          __inplace_merge<_Compare>(__middle, __m2, __last, __comp, __len12, __len22, __buff, __buff_size);
-            __first = __middle;
-            __middle = __m2;
-            __len1 = __len12;
-            __len2 = __len22;
-        }
-        else
-        {
-            __inplace_merge<_Compare>(__middle, __m2, __last, __comp, __len12, __len22, __buff, __buff_size);
-//          __inplace_merge<_Compare>(__first, __m1, __middle, __comp, __len11, __len21, __buff, __buff_size);
-            __last = __middle;
-            __middle = __m1;
-            __len1 = __len11;
-            __len2 = __len21;
-        }
-    }
-}
-
-template <class _Tp>
-struct __inplace_merge_switch
-{
-    static const unsigned value = is_trivially_copy_assignable<_Tp>::value;
-};
-
-template <class _BidirectionalIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last,
-              _Compare __comp)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-    typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type;
-    difference_type __len1 = _VSTD::distance(__first, __middle);
-    difference_type __len2 = _VSTD::distance(__middle, __last);
-    difference_type __buf_size = _VSTD::min(__len1, __len2);
-    pair<value_type*, ptrdiff_t> __buf(0, 0);
-    unique_ptr<value_type, __return_temporary_buffer> __h;
-    if (__inplace_merge_switch<value_type>::value && __buf_size > 8)
-    {
-        __buf = _VSTD::get_temporary_buffer<value_type>(__buf_size);
-        __h.reset(__buf.first);
-    }
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return _VSTD::__inplace_merge<_Comp_ref>(__first, __middle, __last, __c, __len1, __len2,
-                                            __buf.first, __buf.second);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return _VSTD::__inplace_merge<_Comp_ref>(__first, __middle, __last, __comp, __len1, __len2,
-                                            __buf.first, __buf.second);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last)
-{
-    _VSTD::inplace_merge(__first, __middle, __last,
-                        __less<typename iterator_traits<_BidirectionalIterator>::value_type>());
-}
-
-// stable_sort
-
-template <class _Compare, class _InputIterator1, class _InputIterator2>
-void
-__merge_move_construct(_InputIterator1 __first1, _InputIterator1 __last1,
-        _InputIterator2 __first2, _InputIterator2 __last2,
-        typename iterator_traits<_InputIterator1>::value_type* __result, _Compare __comp)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type value_type;
-    __destruct_n __d(0);
-    unique_ptr<value_type, __destruct_n&> __h(__result, __d);
-    for (; true; ++__result)
-    {
-        if (__first1 == __last1)
-        {
-            for (; __first2 != __last2; ++__first2, ++__result, __d.__incr((value_type*)0))
-                ::new (__result) value_type(_VSTD::move(*__first2));
-            __h.release();
-            return;
-        }
-        if (__first2 == __last2)
-        {
-            for (; __first1 != __last1; ++__first1, ++__result, __d.__incr((value_type*)0))
-                ::new (__result) value_type(_VSTD::move(*__first1));
-            __h.release();
-            return;
-        }
-        if (__comp(*__first2, *__first1))
-        {
-            ::new (__result) value_type(_VSTD::move(*__first2));
-            __d.__incr((value_type*)0);
-            ++__first2;
-        }
-        else
-        {
-            ::new (__result) value_type(_VSTD::move(*__first1));
-            __d.__incr((value_type*)0);
-            ++__first1;
-        }
-    }
-}
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-void
-__merge_move_assign(_InputIterator1 __first1, _InputIterator1 __last1,
-        _InputIterator2 __first2, _InputIterator2 __last2,
-        _OutputIterator __result, _Compare __comp)
-{
-    for (; __first1 != __last1; ++__result)
-    {
-        if (__first2 == __last2)
-        {
-            for (; __first1 != __last1; ++__first1, ++__result)
-                *__result = _VSTD::move(*__first1);
-            return;
-        }
-        if (__comp(*__first2, *__first1))
-        {
-            *__result = _VSTD::move(*__first2);
-            ++__first2;
-        }
-        else
-        {
-            *__result = _VSTD::move(*__first1);
-            ++__first1;
-        }
-    }
-    for (; __first2 != __last2; ++__first2, ++__result)
-        *__result = _VSTD::move(*__first2);
-}
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-              typename iterator_traits<_RandomAccessIterator>::difference_type __len,
-              typename iterator_traits<_RandomAccessIterator>::value_type* __buff, ptrdiff_t __buff_size);
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__stable_sort_move(_RandomAccessIterator __first1, _RandomAccessIterator __last1, _Compare __comp,
-                   typename iterator_traits<_RandomAccessIterator>::difference_type __len,
-                   typename iterator_traits<_RandomAccessIterator>::value_type* __first2)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    switch (__len)
-    {
-    case 0:
-        return;
-    case 1:
-        ::new(__first2) value_type(_VSTD::move(*__first1));
-        return;
-    case 2:
-       __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h2(__first2, __d);
-         if (__comp(*--__last1, *__first1))
-        {
-            ::new(__first2) value_type(_VSTD::move(*__last1));
-            __d.__incr((value_type*)0);
-            ++__first2;
-            ::new(__first2) value_type(_VSTD::move(*__first1));
-        }
-        else
-        {
-            ::new(__first2) value_type(_VSTD::move(*__first1));
-            __d.__incr((value_type*)0);
-            ++__first2;
-            ::new(__first2) value_type(_VSTD::move(*__last1));
-        }
-        __h2.release();
-        return;
-    }
-    if (__len <= 8)
-    {
-        __insertion_sort_move<_Compare>(__first1, __last1, __first2, __comp);
-        return;
-    }
-    typename iterator_traits<_RandomAccessIterator>::difference_type __l2 = __len / 2;
-    _RandomAccessIterator __m = __first1 + __l2;
-    __stable_sort<_Compare>(__first1, __m, __comp, __l2, __first2, __l2);
-    __stable_sort<_Compare>(__m, __last1, __comp, __len - __l2, __first2 + __l2, __len - __l2);
-    __merge_move_construct<_Compare>(__first1, __m, __m, __last1, __first2, __comp);
-}
-
-template <class _Tp>
-struct __stable_sort_switch
-{
-    static const unsigned value = 128*is_trivially_copy_assignable<_Tp>::value;
-};
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-              typename iterator_traits<_RandomAccessIterator>::difference_type __len,
-              typename iterator_traits<_RandomAccessIterator>::value_type* __buff, ptrdiff_t __buff_size)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    switch (__len)
-    {
-    case 0:
-    case 1:
-        return;
-    case 2:
-        if (__comp(*--__last, *__first))
-            swap(*__first, *__last);
-        return;
-    }
-    if (__len <= static_cast<difference_type>(__stable_sort_switch<value_type>::value))
-    {
-        __insertion_sort<_Compare>(__first, __last, __comp);
-        return;
-    }
-    typename iterator_traits<_RandomAccessIterator>::difference_type __l2 = __len / 2;
-    _RandomAccessIterator __m = __first + __l2;
-    if (__len <= __buff_size)
-    {
-        __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h2(__buff, __d);
-        __stable_sort_move<_Compare>(__first, __m, __comp, __l2, __buff);
-        __d.__set(__l2, (value_type*)0);
-        __stable_sort_move<_Compare>(__m, __last, __comp, __len - __l2, __buff + __l2);
-        __d.__set(__len, (value_type*)0);
-        __merge_move_assign<_Compare>(__buff, __buff + __l2, __buff + __l2, __buff + __len, __first, __comp);
-//         __merge<_Compare>(move_iterator<value_type*>(__buff),
-//                           move_iterator<value_type*>(__buff + __l2),
-//                           move_iterator<_RandomAccessIterator>(__buff + __l2),
-//                           move_iterator<_RandomAccessIterator>(__buff + __len),
-//                           __first, __comp);
-        return;
-    }
-    __stable_sort<_Compare>(__first, __m, __comp, __l2, __buff, __buff_size);
-    __stable_sort<_Compare>(__m, __last, __comp, __len - __l2, __buff, __buff_size);
-    __inplace_merge<_Compare>(__first, __m, __last, __comp, __l2, __len - __l2, __buff, __buff_size);
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    difference_type __len = __last - __first;
-    pair<value_type*, ptrdiff_t> __buf(0, 0);
-    unique_ptr<value_type, __return_temporary_buffer> __h;
-    if (__len > static_cast<difference_type>(__stable_sort_switch<value_type>::value))
-    {
-        __buf = _VSTD::get_temporary_buffer<value_type>(__len);
-        __h.reset(__buf.first);
-    }
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __stable_sort<_Comp_ref>(__first, __last, __c, __len, __buf.first, __buf.second);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __stable_sort<_Comp_ref>(__first, __last, __comp, __len, __buf.first, __buf.second);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::stable_sort(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// is_heap_until
-
-template <class _RandomAccessIterator, class _Compare>
-_RandomAccessIterator
-is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename _VSTD::iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    difference_type __len = __last - __first;
-    difference_type __p = 0;
-    difference_type __c = 1;
-    _RandomAccessIterator __pp = __first;
-    while (__c < __len)
-    {
-        _RandomAccessIterator __cp = __first + __c;
-        if (__comp(*__pp, *__cp))
-            return __cp;
-        ++__c;
-        ++__cp;
-        if (__c == __len)
-            return __last;
-        if (__comp(*__pp, *__cp))
-            return __cp;
-        ++__p;
-        ++__pp;
-        __c = 2 * __p + 1;
-    }
-    return __last;
-}
-
-template<class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_RandomAccessIterator
-is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    return _VSTD::is_heap_until(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// is_heap
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    return _VSTD::is_heap_until(__first, __last, __comp) == __last;
-}
-
-template<class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    return _VSTD::is_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// push_heap
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__sift_up(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-          typename iterator_traits<_RandomAccessIterator>::difference_type __len)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    if (__len > 1)
-    {
-        __len = (__len - 2) / 2;
-        _RandomAccessIterator __ptr = __first + __len;
-        if (__comp(*__ptr, *--__last))
-        {
-            value_type __t(_VSTD::move(*__last));
-            do
-            {
-                *__last = _VSTD::move(*__ptr);
-                __last = __ptr;
-                if (__len == 0)
-                    break;
-                __len = (__len - 1) / 2;
-                __ptr = __first + __len;
-            } while (__comp(*__ptr, __t));
-            *__last = _VSTD::move(__t);
-        }
-    }
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __sift_up<_Comp_ref>(__first, __last, __c, __last - __first);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __sift_up<_Comp_ref>(__first, __last, __comp, __last - __first);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::push_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// pop_heap
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__sift_down(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-            typename iterator_traits<_RandomAccessIterator>::difference_type __len,
-            _RandomAccessIterator __start)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    // left-child of __start is at 2 * __start + 1
-    // right-child of __start is at 2 * __start + 2
-    difference_type __child = __start - __first;
-
-    if (__len < 2 || (__len - 2) / 2 < __child)
-        return;
-
-    __child = 2 * __child + 1;
-    _RandomAccessIterator __child_i = __first + __child;
-
-    if ((__child + 1) < __len && __comp(*__child_i, *(__child_i + 1))) {
-        // right-child exists and is greater than left-child
-        ++__child_i;
-        ++__child;
-    }
-
-    // check if we are in heap-order
-    if (__comp(*__child_i, *__start))
-        // we are, __start is larger than it's largest child
-        return;
-
-    value_type __top(_VSTD::move(*__start));
-    do
-    {
-        // we are not in heap-order, swap the parent with it's largest child
-        *__start = _VSTD::move(*__child_i);
-        __start = __child_i;
-
-        if ((__len - 2) / 2 < __child)
-            break;
-
-        // recompute the child based off of the updated parent
-        __child = 2 * __child + 1;
-        __child_i = __first + __child;
-
-        if ((__child + 1) < __len && __comp(*__child_i, *(__child_i + 1))) {
-            // right-child exists and is greater than left-child
-            ++__child_i;
-            ++__child;
-        }
-
-        // check if we are in heap-order
-    } while (!__comp(*__child_i, __top));
-    *__start = _VSTD::move(__top);
-}
-
-template <class _Compare, class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-           typename iterator_traits<_RandomAccessIterator>::difference_type __len)
-{
-    if (__len > 1)
-    {
-        swap(*__first, *--__last);
-        __sift_down<_Compare>(__first, __last, __comp, __len - 1, __first);
-    }
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __pop_heap<_Comp_ref>(__first, __last, __c, __last - __first);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __pop_heap<_Comp_ref>(__first, __last, __comp, __last - __first);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::pop_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// make_heap
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    difference_type __n = __last - __first;
-    if (__n > 1)
-    {
-        // start from the first parent, there is no need to consider children
-        for (difference_type __start = (__n - 2) / 2; __start >= 0; --__start)
-        {
-            __sift_down<_Compare>(__first, __last, __comp, __n, __first + __start);
-        }
-    }
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __make_heap<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __make_heap<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::make_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// sort_heap
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    for (difference_type __n = __last - __first; __n > 1; --__last, --__n)
-        __pop_heap<_Compare>(__first, __last, __comp, __n);
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __sort_heap<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __sort_heap<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::sort_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// partial_sort
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last,
-             _Compare __comp)
-{
-    __make_heap<_Compare>(__first, __middle, __comp);
-    typename iterator_traits<_RandomAccessIterator>::difference_type __len = __middle - __first;
-    for (_RandomAccessIterator __i = __middle; __i != __last; ++__i)
-    {
-        if (__comp(*__i, *__first))
-        {
-            swap(*__i, *__first);
-            __sift_down<_Compare>(__first, __middle, __comp, __len, __first);
-        }
-    }
-    __sort_heap<_Compare>(__first, __middle, __comp);
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last,
-             _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __partial_sort<_Comp_ref>(__first, __middle, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __partial_sort<_Comp_ref>(__first, __middle, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last)
-{
-    _VSTD::partial_sort(__first, __middle, __last,
-                       __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// partial_sort_copy
-
-template <class _Compare, class _InputIterator, class _RandomAccessIterator>
-_RandomAccessIterator
-__partial_sort_copy(_InputIterator __first, _InputIterator __last,
-                    _RandomAccessIterator __result_first, _RandomAccessIterator __result_last, _Compare __comp)
-{
-    _RandomAccessIterator __r = __result_first;
-    if (__r != __result_last)
-    {
-        for (; __first != __last && __r != __result_last; (void) ++__first, ++__r)
-            *__r = *__first;
-        __make_heap<_Compare>(__result_first, __r, __comp);
-        typename iterator_traits<_RandomAccessIterator>::difference_type __len = __r - __result_first;
-        for (; __first != __last; ++__first)
-            if (__comp(*__first, *__result_first))
-            {
-                *__result_first = *__first;
-                __sift_down<_Compare>(__result_first, __r, __comp, __len, __result_first);
-            }
-        __sort_heap<_Compare>(__result_first, __r, __comp);
-    }
-    return __r;
-}
-
-template <class _InputIterator, class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_RandomAccessIterator
-partial_sort_copy(_InputIterator __first, _InputIterator __last,
-                  _RandomAccessIterator __result_first, _RandomAccessIterator __result_last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __partial_sort_copy<_Comp_ref>(__first, __last, __result_first, __result_last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __partial_sort_copy<_Comp_ref>(__first, __last, __result_first, __result_last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator, class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_RandomAccessIterator
-partial_sort_copy(_InputIterator __first, _InputIterator __last,
-                  _RandomAccessIterator __result_first, _RandomAccessIterator __result_last)
-{
-    return _VSTD::partial_sort_copy(__first, __last, __result_first, __result_last,
-                                   __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// nth_element
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last, _Compare __comp)
-{
-    // _Compare is known to be a reference type
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    const difference_type __limit = 7;
-    while (true)
-    {
-    __restart:
-        if (__nth == __last)
-            return;
-        difference_type __len = __last - __first;
-        switch (__len)
-        {
-        case 0:
-        case 1:
-            return;
-        case 2:
-            if (__comp(*--__last, *__first))
-                swap(*__first, *__last);
-            return;
-        case 3:
-            {
-            _RandomAccessIterator __m = __first;
-            _VSTD::__sort3<_Compare>(__first, ++__m, --__last, __comp);
-            return;
-            }
-        }
-        if (__len <= __limit)
-        {
-            __selection_sort<_Compare>(__first, __last, __comp);
-            return;
-        }
-        // __len > __limit >= 3
-        _RandomAccessIterator __m = __first + __len/2;
-        _RandomAccessIterator __lm1 = __last;
-        unsigned __n_swaps = _VSTD::__sort3<_Compare>(__first, __m, --__lm1, __comp);
-        // *__m is median
-        // partition [__first, __m) < *__m and *__m <= [__m, __last)
-        // (this inhibits tossing elements equivalent to __m around unnecessarily)
-        _RandomAccessIterator __i = __first;
-        _RandomAccessIterator __j = __lm1;
-        // j points beyond range to be tested, *__lm1 is known to be <= *__m
-        // The search going up is known to be guarded but the search coming down isn't.
-        // Prime the downward search with a guard.
-        if (!__comp(*__i, *__m))  // if *__first == *__m
-        {
-            // *__first == *__m, *__first doesn't go in first part
-            // manually guard downward moving __j against __i
-            while (true)
-            {
-                if (__i == --__j)
-                {
-                    // *__first == *__m, *__m <= all other elements
-                    // Parition instead into [__first, __i) == *__first and *__first < [__i, __last)
-                    ++__i;  // __first + 1
-                    __j = __last;
-                    if (!__comp(*__first, *--__j))  // we need a guard if *__first == *(__last-1)
-                    {
-                        while (true)
-                        {
-                            if (__i == __j)
-                                return;  // [__first, __last) all equivalent elements
-                            if (__comp(*__first, *__i))
-                            {
-                                swap(*__i, *__j);
-                                ++__n_swaps;
-                                ++__i;
-                                break;
-                            }
-                            ++__i;
-                        }
-                    }
-                    // [__first, __i) == *__first and *__first < [__j, __last) and __j == __last - 1
-                    if (__i == __j)
-                        return;
-                    while (true)
-                    {
-                        while (!__comp(*__first, *__i))
-                            ++__i;
-                        while (__comp(*__first, *--__j))
-                            ;
-                        if (__i >= __j)
-                            break;
-                        swap(*__i, *__j);
-                        ++__n_swaps;
-                        ++__i;
-                    }
-                    // [__first, __i) == *__first and *__first < [__i, __last)
-                    // The first part is sorted,
-                    if (__nth < __i)
-                        return;
-                    // __nth_element the secod part
-                    // __nth_element<_Compare>(__i, __nth, __last, __comp);
-                    __first = __i;
-                    goto __restart;
-                }
-                if (__comp(*__j, *__m))
-                {
-                    swap(*__i, *__j);
-                    ++__n_swaps;
-                    break;  // found guard for downward moving __j, now use unguarded partition
-                }
-            }
-        }
-        ++__i;
-        // j points beyond range to be tested, *__lm1 is known to be <= *__m
-        // if not yet partitioned...
-        if (__i < __j)
-        {
-            // known that *(__i - 1) < *__m
-            while (true)
-            {
-                // __m still guards upward moving __i
-                while (__comp(*__i, *__m))
-                    ++__i;
-                // It is now known that a guard exists for downward moving __j
-                while (!__comp(*--__j, *__m))
-                    ;
-                if (__i >= __j)
-                    break;
-                swap(*__i, *__j);
-                ++__n_swaps;
-                // It is known that __m != __j
-                // If __m just moved, follow it
-                if (__m == __i)
-                    __m = __j;
-                ++__i;
-            }
-        }
-        // [__first, __i) < *__m and *__m <= [__i, __last)
-        if (__i != __m && __comp(*__m, *__i))
-        {
-            swap(*__i, *__m);
-            ++__n_swaps;
-        }
-        // [__first, __i) < *__i and *__i <= [__i+1, __last)
-        if (__nth == __i)
-            return;
-        if (__n_swaps == 0)
-        {
-            // We were given a perfectly partitioned sequence.  Coincidence?
-            if (__nth < __i)
-            {
-                // Check for [__first, __i) already sorted
-                __j = __m = __first;
-                while (++__j != __i)
-                {
-                    if (__comp(*__j, *__m))
-                        // not yet sorted, so sort
-                        goto not_sorted;
-                    __m = __j;
-                }
-                // [__first, __i) sorted
-                return;
-            }
-            else
-            {
-                // Check for [__i, __last) already sorted
-                __j = __m = __i;
-                while (++__j != __last)
-                {
-                    if (__comp(*__j, *__m))
-                        // not yet sorted, so sort
-                        goto not_sorted;
-                    __m = __j;
-                }
-                // [__i, __last) sorted
-                return;
-            }
-        }
-not_sorted:
-        // __nth_element on range containing __nth
-        if (__nth < __i)
-        {
-            // __nth_element<_Compare>(__first, __nth, __i, __comp);
-            __last = __i;
-        }
-        else
-        {
-            // __nth_element<_Compare>(__i+1, __nth, __last, __comp);
-            __first = ++__i;
-        }
-    }
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __nth_element<_Comp_ref>(__first, __nth, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __nth_element<_Comp_ref>(__first, __nth, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last)
-{
-    _VSTD::nth_element(__first, __nth, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// includes
-
-template <class _Compare, class _InputIterator1, class _InputIterator2>
-bool
-__includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,
-           _Compare __comp)
-{
-    for (; __first2 != __last2; ++__first1)
-    {
-        if (__first1 == __last1 || __comp(*__first2, *__first1))
-            return false;
-        if (!__comp(*__first1, *__first2))
-            ++__first2;
-    }
-    return true;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,
-         _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __includes<_Comp_ref>(__first1, __last1, __first2, __last2, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __includes<_Comp_ref>(__first1, __last1, __first2, __last2, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2)
-{
-    return _VSTD::includes(__first1, __last1, __first2, __last2,
-                          __less<typename iterator_traits<_InputIterator1>::value_type,
-                                 typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// set_union
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-            _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    for (; __first1 != __last1; ++__result)
-    {
-        if (__first2 == __last2)
-            return _VSTD::copy(__first1, __last1, __result);
-        if (__comp(*__first2, *__first1))
-        {
-            *__result = *__first2;
-            ++__first2;
-        }
-        else
-        {
-            *__result = *__first1;
-            if (!__comp(*__first1, *__first2))
-                ++__first2;
-            ++__first1;
-        }
-    }
-    return _VSTD::copy(__first2, __last2, __result);
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-          _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __set_union<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __set_union<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-          _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    return _VSTD::set_union(__first1, __last1, __first2, __last2, __result,
-                          __less<typename iterator_traits<_InputIterator1>::value_type,
-                                 typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// set_intersection
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-                   _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    while (__first1 != __last1 && __first2 != __last2)
-    {
-        if (__comp(*__first1, *__first2))
-            ++__first1;
-        else
-        {
-            if (!__comp(*__first2, *__first1))
-            {
-                *__result = *__first1;
-                ++__result;
-                ++__first1;
-            }
-            ++__first2;
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-                 _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __set_intersection<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __set_intersection<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-                 _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    return _VSTD::set_intersection(__first1, __last1, __first2, __last2, __result,
-                                  __less<typename iterator_traits<_InputIterator1>::value_type,
-                                         typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// set_difference
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-                 _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    while (__first1 != __last1)
-    {
-        if (__first2 == __last2)
-            return _VSTD::copy(__first1, __last1, __result);
-        if (__comp(*__first1, *__first2))
-        {
-            *__result = *__first1;
-            ++__result;
-            ++__first1;
-        }
-        else
-        {
-            if (!__comp(*__first2, *__first1))
-                ++__first1;
-            ++__first2;
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-               _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-               _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    return _VSTD::set_difference(__first1, __last1, __first2, __last2, __result,
-                                __less<typename iterator_traits<_InputIterator1>::value_type,
-                                       typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// set_symmetric_difference
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-                           _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    while (__first1 != __last1)
-    {
-        if (__first2 == __last2)
-            return _VSTD::copy(__first1, __last1, __result);
-        if (__comp(*__first1, *__first2))
-        {
-            *__result = *__first1;
-            ++__result;
-            ++__first1;
-        }
-        else
-        {
-            if (__comp(*__first2, *__first1))
-            {
-                *__result = *__first2;
-                ++__result;
-            }
-            else
-                ++__first1;
-            ++__first2;
-        }
-    }
-    return _VSTD::copy(__first2, __last2, __result);
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-                         _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __set_symmetric_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __set_symmetric_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-                         _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    return _VSTD::set_symmetric_difference(__first1, __last1, __first2, __last2, __result,
-                                          __less<typename iterator_traits<_InputIterator1>::value_type,
-                                                 typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// lexicographical_compare
-
-template <class _Compare, class _InputIterator1, class _InputIterator2>
-bool
-__lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
-                          _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
-{
-    for (; __first2 != __last2; ++__first1, (void) ++__first2)
-    {
-        if (__first1 == __last1 || __comp(*__first1, *__first2))
-            return true;
-        if (__comp(*__first2, *__first1))
-            return false;
-    }
-    return false;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
-                        _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
-                        _InputIterator2 __first2, _InputIterator2 __last2)
-{
-    return _VSTD::lexicographical_compare(__first1, __last1, __first2, __last2,
-                                         __less<typename iterator_traits<_InputIterator1>::value_type,
-                                                typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// next_permutation
-
-template <class _Compare, class _BidirectionalIterator>
-bool
-__next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
-{
-    _BidirectionalIterator __i = __last;
-    if (__first == __last || __first == --__i)
-        return false;
-    while (true)
-    {
-        _BidirectionalIterator __ip1 = __i;
-        if (__comp(*--__i, *__ip1))
-        {
-            _BidirectionalIterator __j = __last;
-            while (!__comp(*__i, *--__j))
-                ;
-            swap(*__i, *__j);
-            _VSTD::reverse(__ip1, __last);
-            return true;
-        }
-        if (__i == __first)
-        {
-            _VSTD::reverse(__first, __last);
-            return false;
-        }
-    }
-}
-
-template <class _BidirectionalIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __next_permutation<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __next_permutation<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
-{
-    return _VSTD::next_permutation(__first, __last,
-                                  __less<typename iterator_traits<_BidirectionalIterator>::value_type>());
-}
-
-// prev_permutation
-
-template <class _Compare, class _BidirectionalIterator>
-bool
-__prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
-{
-    _BidirectionalIterator __i = __last;
-    if (__first == __last || __first == --__i)
-        return false;
-    while (true)
-    {
-        _BidirectionalIterator __ip1 = __i;
-        if (__comp(*__ip1, *--__i))
-        {
-            _BidirectionalIterator __j = __last;
-            while (!__comp(*--__j, *__i))
-                ;
-            swap(*__i, *__j);
-            _VSTD::reverse(__ip1, __last);
-            return true;
-        }
-        if (__i == __first)
-        {
-            _VSTD::reverse(__first, __last);
-            return false;
-        }
-    }
-}
-
-template <class _BidirectionalIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __prev_permutation<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __prev_permutation<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
-{
-    return _VSTD::prev_permutation(__first, __last,
-                                  __less<typename iterator_traits<_BidirectionalIterator>::value_type>());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    _Tp
->::type
-__rotate_left(_Tp __t, _Tp __n = 1)
-{
-    const unsigned __bits = static_cast<unsigned>(sizeof(_Tp) * __CHAR_BIT__ - 1);
-    __n &= __bits;
-    return static_cast<_Tp>((__t << __n) | (static_cast<typename make_unsigned<_Tp>::type>(__t) >> (__bits - __n)));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    _Tp
->::type
-__rotate_right(_Tp __t, _Tp __n = 1)
-{
-    const unsigned __bits = static_cast<unsigned>(sizeof(_Tp) * __CHAR_BIT__ - 1);
-    __n &= __bits;
-    return static_cast<_Tp>((__t << (__bits - __n)) | (static_cast<typename make_unsigned<_Tp>::type>(__t) >> __n));
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_ALGORITHM
diff --git a/include.new/c++/v1/array b/include.new/c++/v1/array
deleted file mode 100644
index d37075d..0000000
--- a/include.new/c++/v1/array
+++ /dev/null
@@ -1,342 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- array -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ARRAY
-#define _LIBCPP_ARRAY
-
-/*
-    array synopsis
-
-namespace std
-{
-template <class T, size_t N >
-struct array
-{
-    // types:
-    typedef T & reference;
-    typedef const T & const_reference;
-    typedef implementation defined iterator;
-    typedef implementation defined const_iterator;
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef const T* const_pointer;
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    // No explicit construct/copy/destroy for aggregate type
-    void fill(const T& u);
-    void swap(array& a) noexcept(noexcept(swap(declval<T&>(), declval<T&>())));
-
-    // iterators:
-    iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator end() noexcept;
-    const_iterator end() const noexcept;
-
-    reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-
-    const_iterator cbegin() const noexcept;
-    const_iterator cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
-
-    // capacity:
-    constexpr size_type size() const noexcept;
-    constexpr size_type max_size() const noexcept;
-    constexpr bool empty() const noexcept;
-
-    // element access:
-    reference operator[](size_type n);
-    const_reference operator[](size_type n) const; // constexpr in C++14
-    const_reference at(size_type n) const; // constexpr in C++14
-    reference at(size_type n);
-
-    reference front();
-    const_reference front() const; // constexpr in C++14
-    reference back();
-    const_reference back() const; // constexpr in C++14
-
-    T* data() noexcept;
-    const T* data() const noexcept;
-};
-
-template <class T, size_t N>
-  bool operator==(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator!=(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator<(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator>(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator<=(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator>=(const array<T,N>& x, const array<T,N>& y);
-
-template <class T, size_t N >
-  void swap(array<T,N>& x, array<T,N>& y) noexcept(noexcept(x.swap(y)));
-
-template <class T> class tuple_size;
-template <int I, class T> class tuple_element;
-template <class T, size_t N> struct tuple_size<array<T, N>>;
-template <int I, class T, size_t N> struct tuple_element<I, array<T, N>>;
-template <int I, class T, size_t N> T& get(array<T, N>&) noexcept; // constexpr in C++14
-template <int I, class T, size_t N> const T& get(const array<T, N>&) noexcept; // constexpr in C++14
-template <int I, class T, size_t N> T&& get(array<T, N>&&) noexcept; // constexpr in C++14
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__tuple>
-#include <type_traits>
-#include <utility>
-#include <iterator>
-#include <algorithm>
-#include <stdexcept>
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-    #include <cassert>
-#endif
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, size_t _Size>
-struct _LIBCPP_TYPE_VIS_ONLY array
-{
-    // types:
-    typedef array __self;
-    typedef _Tp                                   value_type;
-    typedef value_type&                           reference;
-    typedef const value_type&                     const_reference;
-    typedef value_type*                           iterator;
-    typedef const value_type*                     const_iterator;
-    typedef value_type*                           pointer;
-    typedef const value_type*                     const_pointer;
-    typedef size_t                                size_type;
-    typedef ptrdiff_t                             difference_type;
-    typedef std::reverse_iterator<iterator>       reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    value_type __elems_[_Size > 0 ? _Size : 1];
-
-    // No explicit construct/copy/destroy for aggregate type
-    _LIBCPP_INLINE_VISIBILITY void fill(const value_type& __u)
-        {_VSTD::fill_n(__elems_, _Size, __u);}
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(array& __a) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value)
-        {_VSTD::swap_ranges(__elems_, __elems_ + _Size, __a.__elems_);}
-
-    // iterators:
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT {return iterator(__elems_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return const_iterator(__elems_);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT {return iterator(__elems_ + _Size);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT {return const_iterator(__elems_ + _Size);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rbegin() _NOEXCEPT {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rend() _NOEXCEPT {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    // capacity:
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR size_type size() const _NOEXCEPT {return _Size;}
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR size_type max_size() const _NOEXCEPT {return _Size;}
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR bool empty() const _NOEXCEPT {return _Size == 0;}
-
-    // element access:
-    _LIBCPP_INLINE_VISIBILITY reference operator[](size_type __n)             {return __elems_[__n];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference operator[](size_type __n) const {return __elems_[__n];}
-    reference at(size_type __n);
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference at(size_type __n) const;
-
-    _LIBCPP_INLINE_VISIBILITY reference front()             {return __elems_[0];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference front() const {return __elems_[0];}
-    _LIBCPP_INLINE_VISIBILITY reference back()              {return __elems_[_Size > 0 ? _Size-1 : 0];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference back() const  {return __elems_[_Size > 0 ? _Size-1 : 0];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type* data() _NOEXCEPT {return __elems_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* data() const _NOEXCEPT {return __elems_;}
-};
-
-template <class _Tp, size_t _Size>
-typename array<_Tp, _Size>::reference
-array<_Tp, _Size>::at(size_type __n)
-{
-    if (__n >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("array::at");
-#else
-        assert(!"array::at out_of_range");
-#endif
-    return __elems_[__n];
-}
-
-template <class _Tp, size_t _Size>
-_LIBCPP_CONSTEXPR_AFTER_CXX11
-typename array<_Tp, _Size>::const_reference
-array<_Tp, _Size>::at(size_type __n) const
-{
-    if (__n >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("array::at");
-#else
-        assert(!"array::at out_of_range");
-#endif
-    return __elems_[__n];
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return _VSTD::equal(__x.__elems_, __x.__elems_ + _Size, __y.__elems_);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.__elems_, __x.__elems_ + _Size, __y.__elems_, __y.__elems_ + _Size);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_swappable<_Tp>::value,
-    void
->::type
-swap(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-                                  _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value)
-{
-    __x.swap(__y);
-}
-
-template <class _Tp, size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<array<_Tp, _Size> >
-    : public integral_constant<size_t, _Size> {};
-
-template <class _Tp, size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<const array<_Tp, _Size> >
-    : public integral_constant<size_t, _Size> {};
-
-template <size_t _Ip, class _Tp, size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, array<_Tp, _Size> >
-{
-public:
-    typedef _Tp type;
-};
-
-template <size_t _Ip, class _Tp, size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, const array<_Tp, _Size> >
-{
-public:
-    typedef const _Tp type;
-};
-
-template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&
-get(array<_Tp, _Size>& __a) _NOEXCEPT
-{
-    static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::array)");
-    return __a.__elems_[_Ip];
-}
-
-template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-get(const array<_Tp, _Size>& __a) _NOEXCEPT
-{
-    static_assert(_Ip < _Size, "Index out of bounds in std::get<> (const std::array)");
-    return __a.__elems_[_Ip];
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&&
-get(array<_Tp, _Size>&& __a) _NOEXCEPT
-{
-    static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::array &&)");
-    return _VSTD::move(__a.__elems_[_Ip]);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_ARRAY
diff --git a/include.new/c++/v1/atomic b/include.new/c++/v1/atomic
deleted file mode 100644
index b01a59f..0000000
--- a/include.new/c++/v1/atomic
+++ /dev/null
@@ -1,1788 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- atomic -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ATOMIC
-#define _LIBCPP_ATOMIC
-
-/*
-    atomic synopsis
-
-namespace std
-{
-
-// order and consistency
-
-typedef enum memory_order
-{
-    memory_order_relaxed,
-    memory_order_consume,  // load-consume
-    memory_order_acquire,  // load-acquire
-    memory_order_release,  // store-release
-    memory_order_acq_rel,  // store-release load-acquire
-    memory_order_seq_cst   // store-release load-acquire
-} memory_order;
-
-template <class T> T kill_dependency(T y) noexcept;
-
-// lock-free property
-
-#define ATOMIC_BOOL_LOCK_FREE unspecified
-#define ATOMIC_CHAR_LOCK_FREE unspecified
-#define ATOMIC_CHAR16_T_LOCK_FREE unspecified
-#define ATOMIC_CHAR32_T_LOCK_FREE unspecified
-#define ATOMIC_WCHAR_T_LOCK_FREE unspecified
-#define ATOMIC_SHORT_LOCK_FREE unspecified
-#define ATOMIC_INT_LOCK_FREE unspecified
-#define ATOMIC_LONG_LOCK_FREE unspecified
-#define ATOMIC_LLONG_LOCK_FREE unspecified
-#define ATOMIC_POINTER_LOCK_FREE unspecified
-
-// flag type and operations
-
-typedef struct atomic_flag
-{
-    bool test_and_set(memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool test_and_set(memory_order m = memory_order_seq_cst) noexcept;
-    void clear(memory_order m = memory_order_seq_cst) volatile noexcept;
-    void clear(memory_order m = memory_order_seq_cst) noexcept;
-    atomic_flag()  noexcept = default;
-    atomic_flag(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) volatile = delete;
-} atomic_flag;
-
-bool
-    atomic_flag_test_and_set(volatile atomic_flag* obj) noexcept;
-
-bool
-    atomic_flag_test_and_set(atomic_flag* obj) noexcept;
-
-bool
-    atomic_flag_test_and_set_explicit(volatile atomic_flag* obj,
-                                      memory_order m) noexcept;
-
-bool
-    atomic_flag_test_and_set_explicit(atomic_flag* obj, memory_order m) noexcept;
-
-void
-    atomic_flag_clear(volatile atomic_flag* obj) noexcept;
-
-void
-    atomic_flag_clear(atomic_flag* obj) noexcept;
-
-void
-    atomic_flag_clear_explicit(volatile atomic_flag* obj, memory_order m) noexcept;
-
-void
-    atomic_flag_clear_explicit(atomic_flag* obj, memory_order m) noexcept;
-
-#define ATOMIC_FLAG_INIT see below
-#define ATOMIC_VAR_INIT(value) see below
-
-template <class T>
-struct atomic
-{
-    bool is_lock_free() const volatile noexcept;
-    bool is_lock_free() const noexcept;
-    void store(T desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    void store(T desr, memory_order m = memory_order_seq_cst) noexcept;
-    T load(memory_order m = memory_order_seq_cst) const volatile noexcept;
-    T load(memory_order m = memory_order_seq_cst) const noexcept;
-    operator T() const volatile noexcept;
-    operator T() const noexcept;
-    T exchange(T desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    T exchange(T desr, memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_weak(T& expc, T desr,
-                               memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_weak(T& expc, T desr, memory_order s, memory_order f) noexcept;
-    bool compare_exchange_strong(T& expc, T desr,
-                                 memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_strong(T& expc, T desr,
-                                 memory_order s, memory_order f) noexcept;
-    bool compare_exchange_weak(T& expc, T desr,
-                               memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_weak(T& expc, T desr,
-                               memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_strong(T& expc, T desr,
-                                memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_strong(T& expc, T desr,
-                                 memory_order m = memory_order_seq_cst) noexcept;
-
-    atomic() noexcept = default;
-    constexpr atomic(T desr) noexcept;
-    atomic(const atomic&) = delete;
-    atomic& operator=(const atomic&) = delete;
-    atomic& operator=(const atomic&) volatile = delete;
-    T operator=(T) volatile noexcept;
-    T operator=(T) noexcept;
-};
-
-template <>
-struct atomic<integral>
-{
-    bool is_lock_free() const volatile noexcept;
-    bool is_lock_free() const noexcept;
-    void store(integral desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    void store(integral desr, memory_order m = memory_order_seq_cst) noexcept;
-    integral load(memory_order m = memory_order_seq_cst) const volatile noexcept;
-    integral load(memory_order m = memory_order_seq_cst) const noexcept;
-    operator integral() const volatile noexcept;
-    operator integral() const noexcept;
-    integral exchange(integral desr,
-                      memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral exchange(integral desr, memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_weak(integral& expc, integral desr,
-                               memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_weak(integral& expc, integral desr,
-                               memory_order s, memory_order f) noexcept;
-    bool compare_exchange_strong(integral& expc, integral desr,
-                                 memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_strong(integral& expc, integral desr,
-                                 memory_order s, memory_order f) noexcept;
-    bool compare_exchange_weak(integral& expc, integral desr,
-                               memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_weak(integral& expc, integral desr,
-                               memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_strong(integral& expc, integral desr,
-                                memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_strong(integral& expc, integral desr,
-                                 memory_order m = memory_order_seq_cst) noexcept;
-
-    integral
-        fetch_add(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_add(integral op, memory_order m = memory_order_seq_cst) noexcept;
-    integral
-        fetch_sub(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_sub(integral op, memory_order m = memory_order_seq_cst) noexcept;
-    integral
-        fetch_and(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_and(integral op, memory_order m = memory_order_seq_cst) noexcept;
-    integral
-        fetch_or(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_or(integral op, memory_order m = memory_order_seq_cst) noexcept;
-    integral
-        fetch_xor(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_xor(integral op, memory_order m = memory_order_seq_cst) noexcept;
-
-    atomic() noexcept = default;
-    constexpr atomic(integral desr) noexcept;
-    atomic(const atomic&) = delete;
-    atomic& operator=(const atomic&) = delete;
-    atomic& operator=(const atomic&) volatile = delete;
-    integral operator=(integral desr) volatile noexcept;
-    integral operator=(integral desr) noexcept;
-
-    integral operator++(int) volatile noexcept;
-    integral operator++(int) noexcept;
-    integral operator--(int) volatile noexcept;
-    integral operator--(int) noexcept;
-    integral operator++() volatile noexcept;
-    integral operator++() noexcept;
-    integral operator--() volatile noexcept;
-    integral operator--() noexcept;
-    integral operator+=(integral op) volatile noexcept;
-    integral operator+=(integral op) noexcept;
-    integral operator-=(integral op) volatile noexcept;
-    integral operator-=(integral op) noexcept;
-    integral operator&=(integral op) volatile noexcept;
-    integral operator&=(integral op) noexcept;
-    integral operator|=(integral op) volatile noexcept;
-    integral operator|=(integral op) noexcept;
-    integral operator^=(integral op) volatile noexcept;
-    integral operator^=(integral op) noexcept;
-};
-
-template <class T>
-struct atomic<T*>
-{
-    bool is_lock_free() const volatile noexcept;
-    bool is_lock_free() const noexcept;
-    void store(T* desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    void store(T* desr, memory_order m = memory_order_seq_cst) noexcept;
-    T* load(memory_order m = memory_order_seq_cst) const volatile noexcept;
-    T* load(memory_order m = memory_order_seq_cst) const noexcept;
-    operator T*() const volatile noexcept;
-    operator T*() const noexcept;
-    T* exchange(T* desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    T* exchange(T* desr, memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_weak(T*& expc, T* desr,
-                               memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_weak(T*& expc, T* desr,
-                               memory_order s, memory_order f) noexcept;
-    bool compare_exchange_strong(T*& expc, T* desr,
-                                 memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_strong(T*& expc, T* desr,
-                                 memory_order s, memory_order f) noexcept;
-    bool compare_exchange_weak(T*& expc, T* desr,
-                               memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_weak(T*& expc, T* desr,
-                               memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_strong(T*& expc, T* desr,
-                                memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_strong(T*& expc, T* desr,
-                                 memory_order m = memory_order_seq_cst) noexcept;
-    T* fetch_add(ptrdiff_t op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    T* fetch_add(ptrdiff_t op, memory_order m = memory_order_seq_cst) noexcept;
-    T* fetch_sub(ptrdiff_t op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    T* fetch_sub(ptrdiff_t op, memory_order m = memory_order_seq_cst) noexcept;
-
-    atomic() noexcept = default;
-    constexpr atomic(T* desr) noexcept;
-    atomic(const atomic&) = delete;
-    atomic& operator=(const atomic&) = delete;
-    atomic& operator=(const atomic&) volatile = delete;
-
-    T* operator=(T*) volatile noexcept;
-    T* operator=(T*) noexcept;
-    T* operator++(int) volatile noexcept;
-    T* operator++(int) noexcept;
-    T* operator--(int) volatile noexcept;
-    T* operator--(int) noexcept;
-    T* operator++() volatile noexcept;
-    T* operator++() noexcept;
-    T* operator--() volatile noexcept;
-    T* operator--() noexcept;
-    T* operator+=(ptrdiff_t op) volatile noexcept;
-    T* operator+=(ptrdiff_t op) noexcept;
-    T* operator-=(ptrdiff_t op) volatile noexcept;
-    T* operator-=(ptrdiff_t op) noexcept;
-};
-
-
-template <class T>
-    bool
-    atomic_is_lock_free(const volatile atomic<T>* obj) noexcept;
-
-template <class T>
-    bool
-    atomic_is_lock_free(const atomic<T>* obj) noexcept;
-
-template <class T>
-    void
-    atomic_init(volatile atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    void
-    atomic_init(atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    void
-    atomic_store(volatile atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    void
-    atomic_store(atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    void
-    atomic_store_explicit(volatile atomic<T>* obj, T desr, memory_order m) noexcept;
-
-template <class T>
-    void
-    atomic_store_explicit(atomic<T>* obj, T desr, memory_order m) noexcept;
-
-template <class T>
-    T
-    atomic_load(const volatile atomic<T>* obj) noexcept;
-
-template <class T>
-    T
-    atomic_load(const atomic<T>* obj) noexcept;
-
-template <class T>
-    T
-    atomic_load_explicit(const volatile atomic<T>* obj, memory_order m) noexcept;
-
-template <class T>
-    T
-    atomic_load_explicit(const atomic<T>* obj, memory_order m) noexcept;
-
-template <class T>
-    T
-    atomic_exchange(volatile atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    T
-    atomic_exchange(atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    T
-    atomic_exchange_explicit(volatile atomic<T>* obj, T desr, memory_order m) noexcept;
-
-template <class T>
-    T
-    atomic_exchange_explicit(atomic<T>* obj, T desr, memory_order m) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_weak(volatile atomic<T>* obj, T* expc, T desr) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_weak(atomic<T>* obj, T* expc, T desr) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_strong(volatile atomic<T>* obj, T* expc, T desr) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_strong(atomic<T>* obj, T* expc, T desr) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_weak_explicit(volatile atomic<T>* obj, T* expc,
-                                          T desr,
-                                          memory_order s, memory_order f) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_weak_explicit(atomic<T>* obj, T* expc, T desr,
-                                          memory_order s, memory_order f) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_strong_explicit(volatile atomic<T>* obj,
-                                            T* expc, T desr,
-                                            memory_order s, memory_order f) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_strong_explicit(atomic<T>* obj, T* expc,
-                                            T desr,
-                                            memory_order s, memory_order f) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_add(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_add(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_add_explicit(volatile atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_add_explicit(atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_sub(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_sub(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_sub_explicit(volatile atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_sub_explicit(atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_and(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_and(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_and_explicit(volatile atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_and_explicit(atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_or(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_or(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_or_explicit(volatile atomic<Integral>* obj, Integral op,
-                             memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_or_explicit(atomic<Integral>* obj, Integral op,
-                             memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_xor(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_xor(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_xor_explicit(volatile atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_xor_explicit(atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_add(volatile atomic<T*>* obj, ptrdiff_t op) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_add(atomic<T*>* obj, ptrdiff_t op) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_add_explicit(volatile atomic<T*>* obj, ptrdiff_t op,
-                              memory_order m) noexcept;
-template <class T>
-    T*
-    atomic_fetch_add_explicit(atomic<T*>* obj, ptrdiff_t op, memory_order m) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_sub(volatile atomic<T*>* obj, ptrdiff_t op) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_sub(atomic<T*>* obj, ptrdiff_t op) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_sub_explicit(volatile atomic<T*>* obj, ptrdiff_t op,
-                              memory_order m) noexcept;
-template <class T>
-    T*
-    atomic_fetch_sub_explicit(atomic<T*>* obj, ptrdiff_t op, memory_order m) noexcept;
-
-// Atomics for standard typedef types
-
-typedef atomic<bool>               atomic_bool;
-typedef atomic<char>               atomic_char;
-typedef atomic<signed char>        atomic_schar;
-typedef atomic<unsigned char>      atomic_uchar;
-typedef atomic<short>              atomic_short;
-typedef atomic<unsigned short>     atomic_ushort;
-typedef atomic<int>                atomic_int;
-typedef atomic<unsigned int>       atomic_uint;
-typedef atomic<long>               atomic_long;
-typedef atomic<unsigned long>      atomic_ulong;
-typedef atomic<long long>          atomic_llong;
-typedef atomic<unsigned long long> atomic_ullong;
-typedef atomic<char16_t>           atomic_char16_t;
-typedef atomic<char32_t>           atomic_char32_t;
-typedef atomic<wchar_t>            atomic_wchar_t;
-
-typedef atomic<int_least8_t>   atomic_int_least8_t;
-typedef atomic<uint_least8_t>  atomic_uint_least8_t;
-typedef atomic<int_least16_t>  atomic_int_least16_t;
-typedef atomic<uint_least16_t> atomic_uint_least16_t;
-typedef atomic<int_least32_t>  atomic_int_least32_t;
-typedef atomic<uint_least32_t> atomic_uint_least32_t;
-typedef atomic<int_least64_t>  atomic_int_least64_t;
-typedef atomic<uint_least64_t> atomic_uint_least64_t;
-
-typedef atomic<int_fast8_t>   atomic_int_fast8_t;
-typedef atomic<uint_fast8_t>  atomic_uint_fast8_t;
-typedef atomic<int_fast16_t>  atomic_int_fast16_t;
-typedef atomic<uint_fast16_t> atomic_uint_fast16_t;
-typedef atomic<int_fast32_t>  atomic_int_fast32_t;
-typedef atomic<uint_fast32_t> atomic_uint_fast32_t;
-typedef atomic<int_fast64_t>  atomic_int_fast64_t;
-typedef atomic<uint_fast64_t> atomic_uint_fast64_t;
-
-typedef atomic<intptr_t>  atomic_intptr_t;
-typedef atomic<uintptr_t> atomic_uintptr_t;
-typedef atomic<size_t>    atomic_size_t;
-typedef atomic<ptrdiff_t> atomic_ptrdiff_t;
-typedef atomic<intmax_t>  atomic_intmax_t;
-typedef atomic<uintmax_t> atomic_uintmax_t;
-
-// fences
-
-void atomic_thread_fence(memory_order m) noexcept;
-void atomic_signal_fence(memory_order m) noexcept;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cstddef>
-#include <cstdint>
-#include <type_traits>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifdef _LIBCPP_HAS_NO_THREADS
-#error <atomic> is not supported on this single threaded system
-#else // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#if !__has_feature(cxx_atomic) && _GNUC_VER < 407
-#error <atomic> is not implemented
-#else
-
-typedef enum memory_order
-{
-    memory_order_relaxed, memory_order_consume, memory_order_acquire,
-    memory_order_release, memory_order_acq_rel, memory_order_seq_cst
-} memory_order;
-
-#if _GNUC_VER >= 407
-namespace __gcc_atomic {
-template <typename T>
-struct __gcc_atomic_t {
-  __gcc_atomic_t() _NOEXCEPT {}
-  explicit __gcc_atomic_t(T value) _NOEXCEPT : __a_value(value) {}
-  T __a_value;
-};
-#define _Atomic(x) __gcc_atomic::__gcc_atomic_t<x>
-
-template <typename T> T __create();
-
-template <typename __Tp, typename __Td>
-typename enable_if<sizeof(__Tp()->__a_value = __create<__Td>()), char>::type
-    __test_atomic_assignable(int);
-template <typename T, typename U>
-__two __test_atomic_assignable(...);
-
-template <typename __Tp, typename __Td>
-struct __can_assign {
-  static const bool value =
-      sizeof(__test_atomic_assignable<__Tp, __Td>(1)) == sizeof(char);
-};
-
-static inline constexpr int __to_gcc_order(memory_order __order) {
-  // Avoid switch statement to make this a constexpr.
-  return __order == memory_order_relaxed ? __ATOMIC_RELAXED:
-         (__order == memory_order_acquire ? __ATOMIC_ACQUIRE:
-          (__order == memory_order_release ? __ATOMIC_RELEASE:
-           (__order == memory_order_seq_cst ? __ATOMIC_SEQ_CST:
-            (__order == memory_order_acq_rel ? __ATOMIC_ACQ_REL:
-              __ATOMIC_CONSUME))));
-}
-
-} // namespace __gcc_atomic
-
-template <typename _Tp>
-static inline
-typename enable_if<
-    __gcc_atomic::__can_assign<volatile _Atomic(_Tp)*, _Tp>::value>::type
-__c11_atomic_init(volatile _Atomic(_Tp)* __a,  _Tp __val) {
-  __a->__a_value = __val;
-}
-
-template <typename _Tp>
-static inline
-typename enable_if<
-    !__gcc_atomic::__can_assign<volatile _Atomic(_Tp)*, _Tp>::value &&
-     __gcc_atomic::__can_assign<         _Atomic(_Tp)*, _Tp>::value>::type
-__c11_atomic_init(volatile _Atomic(_Tp)* __a,  _Tp __val) {
-  // [atomics.types.generic]p1 guarantees _Tp is trivially copyable. Because
-  // the default operator= in an object is not volatile, a byte-by-byte copy
-  // is required.
-  volatile char* to = reinterpret_cast<volatile char*>(&__a->__a_value);
-  volatile char* end = to + sizeof(_Tp);
-  char* from = reinterpret_cast<char*>(&__val);
-  while (to != end) {
-    *to++ = *from++;
-  }
-}
-
-template <typename _Tp>
-static inline void __c11_atomic_init(_Atomic(_Tp)* __a,  _Tp __val) {
-  __a->__a_value = __val;
-}
-
-static inline void __c11_atomic_thread_fence(memory_order __order) {
-  __atomic_thread_fence(__gcc_atomic::__to_gcc_order(__order));
-}
-
-static inline void __c11_atomic_signal_fence(memory_order __order) {
-  __atomic_signal_fence(__gcc_atomic::__to_gcc_order(__order));
-}
-
-static inline bool __c11_atomic_is_lock_free(size_t __size) {
-  return __atomic_is_lock_free(__size, 0);
-}
-
-template <typename _Tp>
-static inline void __c11_atomic_store(volatile _Atomic(_Tp)* __a,  _Tp __val,
-                                      memory_order __order) {
-  return __atomic_store(&__a->__a_value, &__val,
-                        __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline void __c11_atomic_store(_Atomic(_Tp)* __a,  _Tp __val,
-                                      memory_order __order) {
-  return __atomic_store(&__a->__a_value, &__val,
-                        __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_load(volatile _Atomic(_Tp)* __a,
-                                    memory_order __order) {
-  _Tp __ret;
-  __atomic_load(&__a->__a_value, &__ret,
-                __gcc_atomic::__to_gcc_order(__order));
-  return __ret;
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_load(_Atomic(_Tp)* __a, memory_order __order) {
-  _Tp __ret;
-  __atomic_load(&__a->__a_value, &__ret,
-                __gcc_atomic::__to_gcc_order(__order));
-  return __ret;
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_exchange(volatile _Atomic(_Tp)* __a,
-                                        _Tp __value, memory_order __order) {
-  _Tp __ret;
-  __atomic_exchange(&__a->__a_value, &__value, &__ret,
-                    __gcc_atomic::__to_gcc_order(__order));
-  return __ret;
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_exchange(_Atomic(_Tp)* __a, _Tp __value,
-                                        memory_order __order) {
-  _Tp __ret;
-  __atomic_exchange(&__a->__a_value, &__value, &__ret,
-                    __gcc_atomic::__to_gcc_order(__order));
-  return __ret;
-}
-
-template <typename _Tp>
-static inline bool __c11_atomic_compare_exchange_strong(
-    volatile _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value,
-    memory_order __success, memory_order __failure) {
-  return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
-                                   false,
-                                   __gcc_atomic::__to_gcc_order(__success),
-                                   __gcc_atomic::__to_gcc_order(__failure));
-}
-
-template <typename _Tp>
-static inline bool __c11_atomic_compare_exchange_strong(
-    _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value, memory_order __success,
-    memory_order __failure) {
-  return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
-                                   false,
-                                   __gcc_atomic::__to_gcc_order(__success),
-                                   __gcc_atomic::__to_gcc_order(__failure));
-}
-
-template <typename _Tp>
-static inline bool __c11_atomic_compare_exchange_weak(
-    volatile _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value,
-    memory_order __success, memory_order __failure) {
-  return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
-                                   true,
-                                   __gcc_atomic::__to_gcc_order(__success),
-                                   __gcc_atomic::__to_gcc_order(__failure));
-}
-
-template <typename _Tp>
-static inline bool __c11_atomic_compare_exchange_weak(
-    _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value, memory_order __success,
-    memory_order __failure) {
-  return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
-                                   true,
-                                   __gcc_atomic::__to_gcc_order(__success),
-                                   __gcc_atomic::__to_gcc_order(__failure));
-}
-
-template <typename _Tp>
-struct __skip_amt { enum {value = 1}; };
-
-template <typename _Tp>
-struct __skip_amt<_Tp*> { enum {value = sizeof(_Tp)}; };
-
-// FIXME: Haven't figured out what the spec says about using arrays with
-// atomic_fetch_add. Force a failure rather than creating bad behavior.
-template <typename _Tp>
-struct __skip_amt<_Tp[]> { };
-template <typename _Tp, int n>
-struct __skip_amt<_Tp[n]> { };
-
-template <typename _Tp, typename _Td>
-static inline _Tp __c11_atomic_fetch_add(volatile _Atomic(_Tp)* __a,
-                                         _Td __delta, memory_order __order) {
-  return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp, typename _Td>
-static inline _Tp __c11_atomic_fetch_add(_Atomic(_Tp)* __a, _Td __delta,
-                                         memory_order __order) {
-  return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp, typename _Td>
-static inline _Tp __c11_atomic_fetch_sub(volatile _Atomic(_Tp)* __a,
-                                         _Td __delta, memory_order __order) {
-  return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp, typename _Td>
-static inline _Tp __c11_atomic_fetch_sub(_Atomic(_Tp)* __a, _Td __delta,
-                                         memory_order __order) {
-  return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_and(volatile _Atomic(_Tp)* __a,
-                                         _Tp __pattern, memory_order __order) {
-  return __atomic_fetch_and(&__a->__a_value, __pattern,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_and(_Atomic(_Tp)* __a,
-                                         _Tp __pattern, memory_order __order) {
-  return __atomic_fetch_and(&__a->__a_value, __pattern,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_or(volatile _Atomic(_Tp)* __a,
-                                        _Tp __pattern, memory_order __order) {
-  return __atomic_fetch_or(&__a->__a_value, __pattern,
-                           __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_or(_Atomic(_Tp)* __a, _Tp __pattern,
-                                        memory_order __order) {
-  return __atomic_fetch_or(&__a->__a_value, __pattern,
-                           __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_xor(volatile _Atomic(_Tp)* __a,
-                                         _Tp __pattern, memory_order __order) {
-  return __atomic_fetch_xor(&__a->__a_value, __pattern,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_xor(_Atomic(_Tp)* __a, _Tp __pattern,
-                                         memory_order __order) {
-  return __atomic_fetch_xor(&__a->__a_value, __pattern,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-#endif // _GNUC_VER >= 407
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-kill_dependency(_Tp __y) _NOEXCEPT
-{
-    return __y;
-}
-
-// general atomic<T>
-
-template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
-struct __atomic_base  // false
-{
-    mutable _Atomic(_Tp) __a_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool is_lock_free() const volatile _NOEXCEPT
-        {return __c11_atomic_is_lock_free(sizeof(_Tp));}
-    _LIBCPP_INLINE_VISIBILITY
-    bool is_lock_free() const _NOEXCEPT
-        {return __c11_atomic_is_lock_free(sizeof(_Tp));}
-    _LIBCPP_INLINE_VISIBILITY
-    void store(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {__c11_atomic_store(&__a_, __d, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    void store(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {__c11_atomic_store(&__a_, __d, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp load(memory_order __m = memory_order_seq_cst) const volatile _NOEXCEPT
-        {return __c11_atomic_load(&__a_, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp load(memory_order __m = memory_order_seq_cst) const _NOEXCEPT
-        {return __c11_atomic_load(&__a_, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    operator _Tp() const volatile _NOEXCEPT {return load();}
-    _LIBCPP_INLINE_VISIBILITY
-    operator _Tp() const _NOEXCEPT          {return load();}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_exchange(&__a_, __d, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_exchange(&__a_, __d, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_weak(_Tp& __e, _Tp __d,
-                               memory_order __s, memory_order __f) volatile _NOEXCEPT
-        {return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_weak(_Tp& __e, _Tp __d,
-                               memory_order __s, memory_order __f) _NOEXCEPT
-        {return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_strong(_Tp& __e, _Tp __d,
-                                 memory_order __s, memory_order __f) volatile _NOEXCEPT
-        {return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_strong(_Tp& __e, _Tp __d,
-                                 memory_order __s, memory_order __f) _NOEXCEPT
-        {return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_weak(_Tp& __e, _Tp __d,
-                              memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_weak(_Tp& __e, _Tp __d,
-                               memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_strong(_Tp& __e, _Tp __d,
-                              memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_strong(_Tp& __e, _Tp __d,
-                                 memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
-
-    _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    __atomic_base() _NOEXCEPT = default;
-#else
-    __atomic_base() _NOEXCEPT : __a_() {}
-#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR __atomic_base(_Tp __d) _NOEXCEPT : __a_(__d) {}
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __atomic_base(const __atomic_base&) = delete;
-    __atomic_base& operator=(const __atomic_base&) = delete;
-    __atomic_base& operator=(const __atomic_base&) volatile = delete;
-#else  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-private:
-    __atomic_base(const __atomic_base&);
-    __atomic_base& operator=(const __atomic_base&);
-    __atomic_base& operator=(const __atomic_base&) volatile;
-#endif  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-};
-
-// atomic<Integral>
-
-template <class _Tp>
-struct __atomic_base<_Tp, true>
-    : public __atomic_base<_Tp, false>
-{
-    typedef __atomic_base<_Tp, false> __base;
-    _LIBCPP_INLINE_VISIBILITY
-    __atomic_base() _NOEXCEPT _LIBCPP_DEFAULT
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR __atomic_base(_Tp __d) _NOEXCEPT : __base(__d) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_add(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_add(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_and(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_and(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_or(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_or(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_xor(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_xor(&this->__a_, __op, __m);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator++(int) volatile _NOEXCEPT      {return fetch_add(_Tp(1));}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator++(int) _NOEXCEPT               {return fetch_add(_Tp(1));}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator--(int) volatile _NOEXCEPT      {return fetch_sub(_Tp(1));}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator--(int) _NOEXCEPT               {return fetch_sub(_Tp(1));}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator++() volatile _NOEXCEPT         {return fetch_add(_Tp(1)) + _Tp(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator++() _NOEXCEPT                  {return fetch_add(_Tp(1)) + _Tp(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator--() volatile _NOEXCEPT         {return fetch_sub(_Tp(1)) - _Tp(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator--() _NOEXCEPT                  {return fetch_sub(_Tp(1)) - _Tp(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator+=(_Tp __op) volatile _NOEXCEPT {return fetch_add(__op) + __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator+=(_Tp __op) _NOEXCEPT          {return fetch_add(__op) + __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator-=(_Tp __op) volatile _NOEXCEPT {return fetch_sub(__op) - __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator-=(_Tp __op) _NOEXCEPT          {return fetch_sub(__op) - __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator&=(_Tp __op) volatile _NOEXCEPT {return fetch_and(__op) & __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator&=(_Tp __op) _NOEXCEPT          {return fetch_and(__op) & __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator|=(_Tp __op) volatile _NOEXCEPT {return fetch_or(__op) | __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator|=(_Tp __op) _NOEXCEPT          {return fetch_or(__op) | __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator^=(_Tp __op) volatile _NOEXCEPT {return fetch_xor(__op) ^ __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator^=(_Tp __op) _NOEXCEPT          {return fetch_xor(__op) ^ __op;}
-};
-
-// atomic<T>
-
-template <class _Tp>
-struct atomic
-    : public __atomic_base<_Tp>
-{
-    typedef __atomic_base<_Tp> __base;
-    _LIBCPP_INLINE_VISIBILITY
-    atomic() _NOEXCEPT _LIBCPP_DEFAULT
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator=(_Tp __d) volatile _NOEXCEPT
-        {__base::store(__d); return __d;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator=(_Tp __d) _NOEXCEPT
-        {__base::store(__d); return __d;}
-};
-
-// atomic<T*>
-
-template <class _Tp>
-struct atomic<_Tp*>
-    : public __atomic_base<_Tp*>
-{
-    typedef __atomic_base<_Tp*> __base;
-    _LIBCPP_INLINE_VISIBILITY
-    atomic() _NOEXCEPT _LIBCPP_DEFAULT
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR atomic(_Tp* __d) _NOEXCEPT : __base(__d) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator=(_Tp* __d) volatile _NOEXCEPT
-        {__base::store(__d); return __d;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator=(_Tp* __d) _NOEXCEPT
-        {__base::store(__d); return __d;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst)
-                                                                        volatile _NOEXCEPT
-        {return __c11_atomic_fetch_add(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_add(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst)
-                                                                        volatile _NOEXCEPT
-        {return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator++(int) volatile _NOEXCEPT            {return fetch_add(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator++(int) _NOEXCEPT                     {return fetch_add(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator--(int) volatile _NOEXCEPT            {return fetch_sub(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator--(int) _NOEXCEPT                     {return fetch_sub(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator++() volatile _NOEXCEPT               {return fetch_add(1) + 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator++() _NOEXCEPT                        {return fetch_add(1) + 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator--() volatile _NOEXCEPT               {return fetch_sub(1) - 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator--() _NOEXCEPT                        {return fetch_sub(1) - 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator+=(ptrdiff_t __op) volatile _NOEXCEPT {return fetch_add(__op) + __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator+=(ptrdiff_t __op) _NOEXCEPT          {return fetch_add(__op) + __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator-=(ptrdiff_t __op) volatile _NOEXCEPT {return fetch_sub(__op) - __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator-=(ptrdiff_t __op) _NOEXCEPT          {return fetch_sub(__op) - __op;}
-};
-
-// atomic_is_lock_free
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_is_lock_free(const volatile atomic<_Tp>* __o) _NOEXCEPT
-{
-    return __o->is_lock_free();
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_is_lock_free(const atomic<_Tp>* __o) _NOEXCEPT
-{
-    return __o->is_lock_free();
-}
-
-// atomic_init
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_init(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    __c11_atomic_init(&__o->__a_, __d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_init(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    __c11_atomic_init(&__o->__a_, __d);
-}
-
-// atomic_store
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    __o->store(__d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    __o->store(__d);
-}
-
-// atomic_store_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
-{
-    __o->store(__d, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
-{
-    __o->store(__d, __m);
-}
-
-// atomic_load
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_load(const volatile atomic<_Tp>* __o) _NOEXCEPT
-{
-    return __o->load();
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_load(const atomic<_Tp>* __o) _NOEXCEPT
-{
-    return __o->load();
-}
-
-// atomic_load_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_load_explicit(const volatile atomic<_Tp>* __o, memory_order __m) _NOEXCEPT
-{
-    return __o->load(__m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_load_explicit(const atomic<_Tp>* __o, memory_order __m) _NOEXCEPT
-{
-    return __o->load(__m);
-}
-
-// atomic_exchange
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_exchange(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    return __o->exchange(__d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_exchange(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    return __o->exchange(__d);
-}
-
-// atomic_exchange_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_exchange_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
-{
-    return __o->exchange(__d, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_exchange_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
-{
-    return __o->exchange(__d, __m);
-}
-
-// atomic_compare_exchange_weak
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
-{
-    return __o->compare_exchange_weak(*__e, __d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
-{
-    return __o->compare_exchange_weak(*__e, __d);
-}
-
-// atomic_compare_exchange_strong
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
-{
-    return __o->compare_exchange_strong(*__e, __d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
-{
-    return __o->compare_exchange_strong(*__e, __d);
-}
-
-// atomic_compare_exchange_weak_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak_explicit(volatile atomic<_Tp>* __o, _Tp* __e,
-                                      _Tp __d,
-                                      memory_order __s, memory_order __f) _NOEXCEPT
-{
-    return __o->compare_exchange_weak(*__e, __d, __s, __f);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak_explicit(atomic<_Tp>* __o, _Tp* __e, _Tp __d,
-                                      memory_order __s, memory_order __f) _NOEXCEPT
-{
-    return __o->compare_exchange_weak(*__e, __d, __s, __f);
-}
-
-// atomic_compare_exchange_strong_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong_explicit(volatile atomic<_Tp>* __o,
-                                        _Tp* __e, _Tp __d,
-                                        memory_order __s, memory_order __f) _NOEXCEPT
-{
-    return __o->compare_exchange_strong(*__e, __d, __s, __f);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong_explicit(atomic<_Tp>* __o, _Tp* __e,
-                                        _Tp __d,
-                                        memory_order __s, memory_order __f) _NOEXCEPT
-{
-    return __o->compare_exchange_strong(*__e, __d, __s, __f);
-}
-
-// atomic_fetch_add
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_add(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_add(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_add(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_add(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_add(volatile atomic<_Tp*>* __o, ptrdiff_t __op) _NOEXCEPT
-{
-    return __o->fetch_add(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_add(atomic<_Tp*>* __o, ptrdiff_t __op) _NOEXCEPT
-{
-    return __o->fetch_add(__op);
-}
-
-// atomic_fetch_add_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_add_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_add(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_add_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_add(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_add_explicit(volatile atomic<_Tp*>* __o, ptrdiff_t __op,
-                          memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_add(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_add_explicit(atomic<_Tp*>* __o, ptrdiff_t __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_add(__op, __m);
-}
-
-// atomic_fetch_sub
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_sub(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_sub(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_sub(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_sub(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_sub(volatile atomic<_Tp*>* __o, ptrdiff_t __op) _NOEXCEPT
-{
-    return __o->fetch_sub(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_sub(atomic<_Tp*>* __o, ptrdiff_t __op) _NOEXCEPT
-{
-    return __o->fetch_sub(__op);
-}
-
-// atomic_fetch_sub_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_sub_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_sub(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_sub_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_sub(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_sub_explicit(volatile atomic<_Tp*>* __o, ptrdiff_t __op,
-                          memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_sub(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_sub_explicit(atomic<_Tp*>* __o, ptrdiff_t __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_sub(__op, __m);
-}
-
-// atomic_fetch_and
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_and(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_and(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_and(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_and(__op);
-}
-
-// atomic_fetch_and_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_and_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_and(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_and_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_and(__op, __m);
-}
-
-// atomic_fetch_or
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_or(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_or(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_or(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_or(__op);
-}
-
-// atomic_fetch_or_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_or_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_or(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_or_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_or(__op, __m);
-}
-
-// atomic_fetch_xor
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_xor(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_xor(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_xor(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_xor(__op);
-}
-
-// atomic_fetch_xor_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_xor_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_xor(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_xor_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_xor(__op, __m);
-}
-
-// flag type and operations
-
-typedef struct atomic_flag
-{
-    _Atomic(bool) __a_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool test_and_set(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_exchange(&__a_, true, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool test_and_set(memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_exchange(&__a_, true, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {__c11_atomic_store(&__a_, false, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear(memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {__c11_atomic_store(&__a_, false, __m);}
-
-    _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    atomic_flag() _NOEXCEPT = default;
-#else
-    atomic_flag() _NOEXCEPT : __a_() {}
-#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    _LIBCPP_INLINE_VISIBILITY
-    atomic_flag(bool __b) _NOEXCEPT : __a_(__b) {}
-
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    atomic_flag(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) volatile = delete;
-#else  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-private:
-    atomic_flag(const atomic_flag&);
-    atomic_flag& operator=(const atomic_flag&);
-    atomic_flag& operator=(const atomic_flag&) volatile;
-#endif  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-} atomic_flag;
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_flag_test_and_set(volatile atomic_flag* __o) _NOEXCEPT
-{
-    return __o->test_and_set();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_flag_test_and_set(atomic_flag* __o) _NOEXCEPT
-{
-    return __o->test_and_set();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_flag_test_and_set_explicit(volatile atomic_flag* __o, memory_order __m) _NOEXCEPT
-{
-    return __o->test_and_set(__m);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_flag_test_and_set_explicit(atomic_flag* __o, memory_order __m) _NOEXCEPT
-{
-    return __o->test_and_set(__m);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_flag_clear(volatile atomic_flag* __o) _NOEXCEPT
-{
-    __o->clear();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_flag_clear(atomic_flag* __o) _NOEXCEPT
-{
-    __o->clear();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_flag_clear_explicit(volatile atomic_flag* __o, memory_order __m) _NOEXCEPT
-{
-    __o->clear(__m);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_flag_clear_explicit(atomic_flag* __o, memory_order __m) _NOEXCEPT
-{
-    __o->clear(__m);
-}
-
-// fences
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_thread_fence(memory_order __m) _NOEXCEPT
-{
-    __c11_atomic_thread_fence(__m);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_signal_fence(memory_order __m) _NOEXCEPT
-{
-    __c11_atomic_signal_fence(__m);
-}
-
-// Atomics for standard typedef types
-
-typedef atomic<bool>               atomic_bool;
-typedef atomic<char>               atomic_char;
-typedef atomic<signed char>        atomic_schar;
-typedef atomic<unsigned char>      atomic_uchar;
-typedef atomic<short>              atomic_short;
-typedef atomic<unsigned short>     atomic_ushort;
-typedef atomic<int>                atomic_int;
-typedef atomic<unsigned int>       atomic_uint;
-typedef atomic<long>               atomic_long;
-typedef atomic<unsigned long>      atomic_ulong;
-typedef atomic<long long>          atomic_llong;
-typedef atomic<unsigned long long> atomic_ullong;
-typedef atomic<char16_t>           atomic_char16_t;
-typedef atomic<char32_t>           atomic_char32_t;
-typedef atomic<wchar_t>            atomic_wchar_t;
-
-typedef atomic<int_least8_t>   atomic_int_least8_t;
-typedef atomic<uint_least8_t>  atomic_uint_least8_t;
-typedef atomic<int_least16_t>  atomic_int_least16_t;
-typedef atomic<uint_least16_t> atomic_uint_least16_t;
-typedef atomic<int_least32_t>  atomic_int_least32_t;
-typedef atomic<uint_least32_t> atomic_uint_least32_t;
-typedef atomic<int_least64_t>  atomic_int_least64_t;
-typedef atomic<uint_least64_t> atomic_uint_least64_t;
-
-typedef atomic<int_fast8_t>   atomic_int_fast8_t;
-typedef atomic<uint_fast8_t>  atomic_uint_fast8_t;
-typedef atomic<int_fast16_t>  atomic_int_fast16_t;
-typedef atomic<uint_fast16_t> atomic_uint_fast16_t;
-typedef atomic<int_fast32_t>  atomic_int_fast32_t;
-typedef atomic<uint_fast32_t> atomic_uint_fast32_t;
-typedef atomic<int_fast64_t>  atomic_int_fast64_t;
-typedef atomic<uint_fast64_t> atomic_uint_fast64_t;
-
-typedef atomic<intptr_t>  atomic_intptr_t;
-typedef atomic<uintptr_t> atomic_uintptr_t;
-typedef atomic<size_t>    atomic_size_t;
-typedef atomic<ptrdiff_t> atomic_ptrdiff_t;
-typedef atomic<intmax_t>  atomic_intmax_t;
-typedef atomic<uintmax_t> atomic_uintmax_t;
-
-#define ATOMIC_FLAG_INIT {false}
-#define ATOMIC_VAR_INIT(__v) {__v}
-
-// lock-free property
-
-#define ATOMIC_BOOL_LOCK_FREE      __GCC_ATOMIC_BOOL_LOCK_FREE
-#define ATOMIC_CHAR_LOCK_FREE      __GCC_ATOMIC_CHAR_LOCK_FREE
-#define ATOMIC_CHAR16_T_LOCK_FREE  __GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#define ATOMIC_CHAR32_T_LOCK_FREE  __GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#define ATOMIC_WCHAR_T_LOCK_FREE   __GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#define ATOMIC_SHORT_LOCK_FREE     __GCC_ATOMIC_SHORT_LOCK_FREE
-#define ATOMIC_INT_LOCK_FREE       __GCC_ATOMIC_INT_LOCK_FREE
-#define ATOMIC_LONG_LOCK_FREE      __GCC_ATOMIC_LONG_LOCK_FREE
-#define ATOMIC_LLONG_LOCK_FREE     __GCC_ATOMIC_LLONG_LOCK_FREE
-#define ATOMIC_POINTER_LOCK_FREE   __GCC_ATOMIC_POINTER_LOCK_FREE
-
-#endif  //  !__has_feature(cxx_atomic)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_ATOMIC
diff --git a/include.new/c++/v1/bitset b/include.new/c++/v1/bitset
deleted file mode 100644
index 8c278cc..0000000
--- a/include.new/c++/v1/bitset
+++ /dev/null
@@ -1,1081 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- bitset ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_BITSET
-#define _LIBCPP_BITSET
-
-/*
-    bitset synopsis
-
-namespace std
-{
-
-namespace std {
-
-template <size_t N>
-class bitset
-{
-public:
-    // bit reference:
-    class reference
-    {
-        friend class bitset;
-        reference() noexcept;
-    public:
-        ~reference() noexcept;
-        reference& operator=(bool x) noexcept;           // for b[i] = x;
-        reference& operator=(const reference&) noexcept; // for b[i] = b[j];
-        bool operator~() const noexcept;                 // flips the bit
-        operator bool() const noexcept;                  // for x = b[i];
-        reference& flip() noexcept;                      // for b[i].flip();
-    };
-
-    // 23.3.5.1 constructors:
-    constexpr bitset() noexcept;
-    constexpr bitset(unsigned long long val) noexcept;
-    template <class charT>
-        explicit bitset(const charT* str,
-                        typename basic_string<charT>::size_type n = basic_string<charT>::npos,
-                        charT zero = charT('0'), charT one = charT('1'));
-    template<class charT, class traits, class Allocator>
-        explicit bitset(const basic_string<charT,traits,Allocator>& str,
-                        typename basic_string<charT,traits,Allocator>::size_type pos = 0,
-                        typename basic_string<charT,traits,Allocator>::size_type n =
-                                 basic_string<charT,traits,Allocator>::npos,
-                        charT zero = charT('0'), charT one = charT('1'));
-
-    // 23.3.5.2 bitset operations:
-    bitset& operator&=(const bitset& rhs) noexcept;
-    bitset& operator|=(const bitset& rhs) noexcept;
-    bitset& operator^=(const bitset& rhs) noexcept;
-    bitset& operator<<=(size_t pos) noexcept;
-    bitset& operator>>=(size_t pos) noexcept;
-    bitset& set() noexcept;
-    bitset& set(size_t pos, bool val = true);
-    bitset& reset() noexcept;
-    bitset& reset(size_t pos);
-    bitset operator~() const noexcept;
-    bitset& flip() noexcept;
-    bitset& flip(size_t pos);
-
-    // element access:
-    constexpr bool operator[](size_t pos) const; // for b[i];
-    reference operator[](size_t pos);            // for b[i];
-    unsigned long to_ulong() const;
-    unsigned long long to_ullong() const;
-    template <class charT, class traits, class Allocator>
-        basic_string<charT, traits, Allocator> to_string(charT zero = charT('0'), charT one = charT('1')) const;
-    template <class charT, class traits>
-        basic_string<charT, traits, allocator<charT> > to_string(charT zero = charT('0'), charT one = charT('1')) const;
-    template <class charT>
-        basic_string<charT, char_traits<charT>, allocator<charT> > to_string(charT zero = charT('0'), charT one = charT('1')) const;
-    basic_string<char, char_traits<char>, allocator<char> > to_string(char zero = '0', char one = '1') const;
-    size_t count() const noexcept;
-    constexpr size_t size() const noexcept;
-    bool operator==(const bitset& rhs) const noexcept;
-    bool operator!=(const bitset& rhs) const noexcept;
-    bool test(size_t pos) const;
-    bool all() const noexcept;
-    bool any() const noexcept;
-    bool none() const noexcept;
-    bitset operator<<(size_t pos) const noexcept;
-    bitset operator>>(size_t pos) const noexcept;
-};
-
-// 23.3.5.3 bitset operators:
-template <size_t N>
-bitset<N> operator&(const bitset<N>&, const bitset<N>&) noexcept;
-
-template <size_t N>
-bitset<N> operator|(const bitset<N>&, const bitset<N>&) noexcept;
-
-template <size_t N>
-bitset<N> operator^(const bitset<N>&, const bitset<N>&) noexcept;
-
-template <class charT, class traits, size_t N>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is, bitset<N>& x);
-
-template <class charT, class traits, size_t N>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os, const bitset<N>& x);
-
-template <size_t N> struct hash<std::bitset<N>>;
-
-}  // std
-
-*/
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#include <__config>
-#include <__bit_reference>
-#include <cstddef>
-#include <climits>
-#include <string>
-#include <stdexcept>
-#include <iosfwd>
-#include <__functional_base>
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-    #include <cassert>
-#endif
-
-#include <__undef_min_max>
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <size_t _N_words, size_t _Size>
-class __bitset;
-
-template <size_t _N_words, size_t _Size>
-struct __has_storage_type<__bitset<_N_words, _Size> >
-{
-    static const bool value = true;
-};
-
-template <size_t _N_words, size_t _Size>
-class __bitset
-{
-public:
-    typedef ptrdiff_t              difference_type;
-    typedef size_t                 size_type;
-    typedef size_type              __storage_type;
-protected:
-    typedef __bitset __self;
-    typedef       __storage_type*  __storage_pointer;
-    typedef const __storage_type*  __const_storage_pointer;
-    static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);
-
-    friend class __bit_reference<__bitset>;
-    friend class __bit_const_reference<__bitset>;
-    friend class __bit_iterator<__bitset, false>;
-    friend class __bit_iterator<__bitset, true>;
-    friend struct __bit_array<__bitset>;
-
-    __storage_type __first_[_N_words];
-
-    typedef __bit_reference<__bitset>                  reference;
-    typedef __bit_const_reference<__bitset>            const_reference;
-    typedef __bit_iterator<__bitset, false>            iterator;
-    typedef __bit_iterator<__bitset, true>             const_iterator;
-
-    _LIBCPP_CONSTEXPR __bitset() _NOEXCEPT;
-    explicit _LIBCPP_CONSTEXPR __bitset(unsigned long long __v) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_t __pos) _NOEXCEPT
-        {return reference(__first_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR const_reference __make_ref(size_t __pos) const _NOEXCEPT
-        {return const_reference(__first_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_t __pos) _NOEXCEPT
-        {return iterator(__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_t __pos) const _NOEXCEPT
-        {return const_iterator(__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-
-    void operator&=(const __bitset& __v) _NOEXCEPT;
-    void operator|=(const __bitset& __v) _NOEXCEPT;
-    void operator^=(const __bitset& __v) _NOEXCEPT;
-
-    void flip() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY unsigned long to_ulong() const
-        {return to_ulong(integral_constant<bool, _Size < sizeof(unsigned long) * CHAR_BIT>());}
-    _LIBCPP_INLINE_VISIBILITY unsigned long long to_ullong() const
-        {return to_ullong(integral_constant<bool, _Size < sizeof(unsigned long long) * CHAR_BIT>());}
-
-    bool all() const _NOEXCEPT;
-    bool any() const _NOEXCEPT;
-    size_t __hash_code() const _NOEXCEPT;
-private:
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    void __init(unsigned long long __v, false_type) _NOEXCEPT;
-    void __init(unsigned long long __v, true_type) _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_CONSTEXPR
-    unsigned long to_ulong(false_type) const;
-    unsigned long to_ulong(true_type) const;
-    unsigned long long to_ullong(false_type) const;
-    unsigned long long to_ullong(true_type) const;
-    unsigned long long to_ullong(true_type, false_type) const;
-    unsigned long long to_ullong(true_type, true_type) const;
-};
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<_N_words, _Size>::__bitset() _NOEXCEPT
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
-    : __first_{0}
-#endif
-{
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    _VSTD::fill_n(__first_, _N_words, __storage_type(0));
-#endif
-}
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-
-template <size_t _N_words, size_t _Size>
-void
-__bitset<_N_words, _Size>::__init(unsigned long long __v, false_type) _NOEXCEPT
-{
-    __storage_type __t[sizeof(unsigned long long) / sizeof(__storage_type)];
-    for (size_t __i = 0; __i < sizeof(__t)/sizeof(__t[0]); ++__i, __v >>= __bits_per_word)
-        __t[__i] = static_cast<__storage_type>(__v);
-    _VSTD::copy(__t, __t + sizeof(__t)/sizeof(__t[0]), __first_);
-    _VSTD::fill(__first_ + sizeof(__t)/sizeof(__t[0]), __first_ + sizeof(__first_)/sizeof(__first_[0]),
-               __storage_type(0));
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<_N_words, _Size>::__init(unsigned long long __v, true_type) _NOEXCEPT
-{
-    __first_[0] = __v;
-    _VSTD::fill(__first_ + 1, __first_ + sizeof(__first_)/sizeof(__first_[0]), __storage_type(0));
-}
-
-#endif  // _LIBCPP_HAS_NO_CONSTEXPR
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<_N_words, _Size>::__bitset(unsigned long long __v) _NOEXCEPT
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
-#if __SIZEOF_SIZE_T__ == 8
-    : __first_{__v}
-#elif __SIZEOF_SIZE_T__ == 4
-    : __first_{__v, __v >> __bits_per_word}
-#else
-#error This constructor has not been ported to this platform
-#endif
-#endif
-{
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    __init(__v, integral_constant<bool, sizeof(unsigned long long) == sizeof(__storage_type)>());
-#endif
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<_N_words, _Size>::operator&=(const __bitset& __v) _NOEXCEPT
-{
-    for (size_type __i = 0; __i < _N_words; ++__i)
-        __first_[__i] &= __v.__first_[__i];
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<_N_words, _Size>::operator|=(const __bitset& __v) _NOEXCEPT
-{
-    for (size_type __i = 0; __i < _N_words; ++__i)
-        __first_[__i] |= __v.__first_[__i];
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<_N_words, _Size>::operator^=(const __bitset& __v) _NOEXCEPT
-{
-    for (size_type __i = 0; __i < _N_words; ++__i)
-        __first_[__i] ^= __v.__first_[__i];
-}
-
-template <size_t _N_words, size_t _Size>
-void
-__bitset<_N_words, _Size>::flip() _NOEXCEPT
-{
-    // do middle whole words
-    size_type __n = _Size;
-    __storage_pointer __p = __first_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        *__p = ~*__p;
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __storage_type __b = *__p & __m;
-        *__p &= ~__m;
-        *__p |= ~__b & __m;
-    }
-}
-
-template <size_t _N_words, size_t _Size>
-unsigned long
-__bitset<_N_words, _Size>::to_ulong(false_type) const
-{
-    const_iterator __e = __make_iter(_Size);
-    const_iterator __i = _VSTD::find(__make_iter(sizeof(unsigned long) * CHAR_BIT), __e, true);
-    if (__i != __e)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw overflow_error("bitset to_ulong overflow error");
-#else
-        assert(!"bitset to_ulong overflow error");
-#endif
-    return __first_[0];
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-__bitset<_N_words, _Size>::to_ulong(true_type) const
-{
-    return __first_[0];
-}
-
-template <size_t _N_words, size_t _Size>
-unsigned long long
-__bitset<_N_words, _Size>::to_ullong(false_type) const
-{
-    const_iterator __e = __make_iter(_Size);
-    const_iterator __i = _VSTD::find(__make_iter(sizeof(unsigned long long) * CHAR_BIT), __e, true);
-    if (__i != __e)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw overflow_error("bitset to_ullong overflow error");
-#else
-        assert(!"bitset to_ullong overflow error");
-#endif
-    return to_ullong(true_type());
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__bitset<_N_words, _Size>::to_ullong(true_type) const
-{
-    return to_ullong(true_type(), integral_constant<bool, sizeof(__storage_type) < sizeof(unsigned long long)>());
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__bitset<_N_words, _Size>::to_ullong(true_type, false_type) const
-{
-    return __first_[0];
-}
-
-template <size_t _N_words, size_t _Size>
-unsigned long long
-__bitset<_N_words, _Size>::to_ullong(true_type, true_type) const
-{
-    unsigned long long __r = __first_[0];
-    for (std::size_t __i = 1; __i < sizeof(unsigned long long) / sizeof(__storage_type); ++__i)
-        __r |= static_cast<unsigned long long>(__first_[__i]) << (sizeof(__storage_type) * CHAR_BIT);
-    return __r;
-}
-
-template <size_t _N_words, size_t _Size>
-bool
-__bitset<_N_words, _Size>::all() const _NOEXCEPT
-{
-    // do middle whole words
-    size_type __n = _Size;
-    __const_storage_pointer __p = __first_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        if (~*__p)
-            return false;
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        if (~*__p & __m)
-            return false;
-    }
-    return true;
-}
-
-template <size_t _N_words, size_t _Size>
-bool
-__bitset<_N_words, _Size>::any() const _NOEXCEPT
-{
-    // do middle whole words
-    size_type __n = _Size;
-    __const_storage_pointer __p = __first_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        if (*__p)
-            return true;
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        if (*__p & __m)
-            return true;
-    }
-    return false;
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-__bitset<_N_words, _Size>::__hash_code() const _NOEXCEPT
-{
-    size_t __h = 0;
-    for (size_type __i = 0; __i < _N_words; ++__i)
-        __h ^= __first_[__i];
-    return __h;
-}
-
-template <size_t _Size>
-class __bitset<1, _Size>
-{
-public:
-    typedef ptrdiff_t              difference_type;
-    typedef size_t                 size_type;
-    typedef size_type              __storage_type;
-protected:
-    typedef __bitset __self;
-    typedef       __storage_type*  __storage_pointer;
-    typedef const __storage_type*  __const_storage_pointer;
-    static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);
-
-    friend class __bit_reference<__bitset>;
-    friend class __bit_const_reference<__bitset>;
-    friend class __bit_iterator<__bitset, false>;
-    friend class __bit_iterator<__bitset, true>;
-    friend struct __bit_array<__bitset>;
-
-    __storage_type __first_;
-
-    typedef __bit_reference<__bitset>                  reference;
-    typedef __bit_const_reference<__bitset>            const_reference;
-    typedef __bit_iterator<__bitset, false>            iterator;
-    typedef __bit_iterator<__bitset, true>             const_iterator;
-
-    _LIBCPP_CONSTEXPR __bitset() _NOEXCEPT;
-    explicit _LIBCPP_CONSTEXPR __bitset(unsigned long long __v) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_t __pos) _NOEXCEPT
-        {return reference(&__first_, __storage_type(1) << __pos);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR const_reference __make_ref(size_t __pos) const _NOEXCEPT
-        {return const_reference(&__first_, __storage_type(1) << __pos);}
-    _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_t __pos) _NOEXCEPT
-        {return iterator(&__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_t __pos) const _NOEXCEPT
-        {return const_iterator(&__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-
-    void operator&=(const __bitset& __v) _NOEXCEPT;
-    void operator|=(const __bitset& __v) _NOEXCEPT;
-    void operator^=(const __bitset& __v) _NOEXCEPT;
-
-    void flip() _NOEXCEPT;
-
-    unsigned long to_ulong() const;
-    unsigned long long to_ullong() const;
-
-    bool all() const _NOEXCEPT;
-    bool any() const _NOEXCEPT;
-
-    size_t __hash_code() const _NOEXCEPT;
-};
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<1, _Size>::__bitset() _NOEXCEPT
-    : __first_(0)
-{
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<1, _Size>::__bitset(unsigned long long __v) _NOEXCEPT
-    : __first_(static_cast<__storage_type>(__v))
-{
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<1, _Size>::operator&=(const __bitset& __v) _NOEXCEPT
-{
-    __first_ &= __v.__first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<1, _Size>::operator|=(const __bitset& __v) _NOEXCEPT
-{
-    __first_ |= __v.__first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<1, _Size>::operator^=(const __bitset& __v) _NOEXCEPT
-{
-    __first_ ^= __v.__first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<1, _Size>::flip() _NOEXCEPT
-{
-    __storage_type __m = ~__storage_type(0) >> (__bits_per_word - _Size);
-    __first_ = ~__first_;
-    __first_ &= __m;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-__bitset<1, _Size>::to_ulong() const
-{
-    return __first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__bitset<1, _Size>::to_ullong() const
-{
-    return __first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__bitset<1, _Size>::all() const _NOEXCEPT
-{
-    __storage_type __m = ~__storage_type(0) >> (__bits_per_word - _Size);
-    return !(~__first_ & __m);
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__bitset<1, _Size>::any() const _NOEXCEPT
-{
-    __storage_type __m = ~__storage_type(0) >> (__bits_per_word - _Size);
-    return __first_ & __m;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-__bitset<1, _Size>::__hash_code() const _NOEXCEPT
-{
-    return __first_;
-}
-
-template <>
-class __bitset<0, 0>
-{
-public:
-    typedef ptrdiff_t              difference_type;
-    typedef size_t                 size_type;
-    typedef size_type              __storage_type;
-protected:
-    typedef __bitset __self;
-    typedef       __storage_type*  __storage_pointer;
-    typedef const __storage_type*  __const_storage_pointer;
-    static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);
-
-    friend class __bit_reference<__bitset>;
-    friend class __bit_const_reference<__bitset>;
-    friend class __bit_iterator<__bitset, false>;
-    friend class __bit_iterator<__bitset, true>;
-    friend struct __bit_array<__bitset>;
-
-    typedef __bit_reference<__bitset>                  reference;
-    typedef __bit_const_reference<__bitset>            const_reference;
-    typedef __bit_iterator<__bitset, false>            iterator;
-    typedef __bit_iterator<__bitset, true>             const_iterator;
-
-    _LIBCPP_CONSTEXPR __bitset() _NOEXCEPT;
-    explicit _LIBCPP_CONSTEXPR __bitset(unsigned long long) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_t) _NOEXCEPT
-        {return reference(0, 1);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR const_reference __make_ref(size_t) const _NOEXCEPT
-        {return const_reference(0, 1);}
-    _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_t) _NOEXCEPT
-        {return iterator(0, 0);}
-    _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_t) const _NOEXCEPT
-        {return const_iterator(0, 0);}
-
-    _LIBCPP_INLINE_VISIBILITY void operator&=(const __bitset&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY void operator|=(const __bitset&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY void operator^=(const __bitset&) _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY void flip() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY unsigned long to_ulong() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY unsigned long long to_ullong() const {return 0;}
-
-    _LIBCPP_INLINE_VISIBILITY bool all() const _NOEXCEPT {return true;}
-    _LIBCPP_INLINE_VISIBILITY bool any() const _NOEXCEPT {return false;}
-
-    _LIBCPP_INLINE_VISIBILITY size_t __hash_code() const _NOEXCEPT {return 0;}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<0, 0>::__bitset() _NOEXCEPT
-{
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<0, 0>::__bitset(unsigned long long) _NOEXCEPT
-{
-}
-
-template <size_t _Size> class _LIBCPP_TYPE_VIS_ONLY bitset;
-template <size_t _Size> struct _LIBCPP_TYPE_VIS_ONLY hash<bitset<_Size> >;
-
-template <size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY bitset
-    : private __bitset<_Size == 0 ? 0 : (_Size - 1) / (sizeof(size_t) * CHAR_BIT) + 1, _Size>
-{
-public:
-    static const unsigned __n_words = _Size == 0 ? 0 : (_Size - 1) / (sizeof(size_t) * CHAR_BIT) + 1;
-    typedef __bitset<__n_words, _Size> base;
-
-public:
-    typedef typename base::reference       reference;
-    typedef typename base::const_reference const_reference;
-
-    // 23.3.5.1 constructors:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR bitset() _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-        bitset(unsigned long long __v) _NOEXCEPT : base(__v) {}
-    template<class _CharT>
-        explicit bitset(const _CharT* __str,
-                        typename basic_string<_CharT>::size_type __n = basic_string<_CharT>::npos,
-                        _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'));
-    template<class _CharT, class _Traits, class _Allocator>
-        explicit bitset(const basic_string<_CharT,_Traits,_Allocator>& __str,
-                        typename basic_string<_CharT,_Traits,_Allocator>::size_type __pos = 0,
-                        typename basic_string<_CharT,_Traits,_Allocator>::size_type __n =
-                                (basic_string<_CharT,_Traits,_Allocator>::npos),
-                        _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'));
-
-    // 23.3.5.2 bitset operations:
-    bitset& operator&=(const bitset& __rhs) _NOEXCEPT;
-    bitset& operator|=(const bitset& __rhs) _NOEXCEPT;
-    bitset& operator^=(const bitset& __rhs) _NOEXCEPT;
-    bitset& operator<<=(size_t __pos) _NOEXCEPT;
-    bitset& operator>>=(size_t __pos) _NOEXCEPT;
-    bitset& set() _NOEXCEPT;
-    bitset& set(size_t __pos, bool __val = true);
-    bitset& reset() _NOEXCEPT;
-    bitset& reset(size_t __pos);
-    bitset  operator~() const _NOEXCEPT;
-    bitset& flip() _NOEXCEPT;
-    bitset& flip(size_t __pos);
-
-    // element access:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-                              const_reference operator[](size_t __p) const {return base::__make_ref(__p);}
-    _LIBCPP_INLINE_VISIBILITY       reference operator[](size_t __p)       {return base::__make_ref(__p);}
-    unsigned long to_ulong() const;
-    unsigned long long to_ullong() const;
-    template <class _CharT, class _Traits, class _Allocator>
-        basic_string<_CharT, _Traits, _Allocator> to_string(_CharT __zero = _CharT('0'),
-                                                            _CharT __one = _CharT('1')) const;
-    template <class _CharT, class _Traits>
-        basic_string<_CharT, _Traits, allocator<_CharT> > to_string(_CharT __zero = _CharT('0'),
-                                                                    _CharT __one = _CharT('1')) const;
-    template <class _CharT>
-        basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> > to_string(_CharT __zero = _CharT('0'),
-                                                                                _CharT __one = _CharT('1')) const;
-    basic_string<char, char_traits<char>, allocator<char> > to_string(char __zero = '0',
-                                                                      char __one = '1') const;
-    size_t count() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR size_t size() const _NOEXCEPT {return _Size;}
-    bool operator==(const bitset& __rhs) const _NOEXCEPT;
-    bool operator!=(const bitset& __rhs) const _NOEXCEPT;
-    bool test(size_t __pos) const;
-    bool all() const _NOEXCEPT;
-    bool any() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY bool none() const _NOEXCEPT {return !any();}
-    bitset operator<<(size_t __pos) const _NOEXCEPT;
-    bitset operator>>(size_t __pos) const _NOEXCEPT;
-
-private:
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t __hash_code() const _NOEXCEPT {return base::__hash_code();}
-
-    friend struct hash<bitset>;
-};
-
-template <size_t _Size>
-template<class _CharT>
-bitset<_Size>::bitset(const _CharT* __str,
-                      typename basic_string<_CharT>::size_type __n,
-                      _CharT __zero, _CharT __one)
-{
-    size_t __rlen = _VSTD::min(__n, char_traits<_CharT>::length(__str));
-    for (size_t __i = 0; __i < __rlen; ++__i)
-        if (__str[__i] != __zero && __str[__i] != __one)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            throw invalid_argument("bitset string ctor has invalid argument");
-#else
-            assert(!"bitset string ctor has invalid argument");
-#endif
-    size_t _Mp = _VSTD::min(__rlen, _Size);
-    size_t __i = 0;
-    for (; __i < _Mp; ++__i)
-    {
-        _CharT __c = __str[_Mp - 1 - __i];
-        if (__c == __zero)
-            (*this)[__i] = false;
-        else
-            (*this)[__i] = true;
-    }
-    _VSTD::fill(base::__make_iter(__i), base::__make_iter(_Size), false);
-}
-
-template <size_t _Size>
-template<class _CharT, class _Traits, class _Allocator>
-bitset<_Size>::bitset(const basic_string<_CharT,_Traits,_Allocator>& __str,
-       typename basic_string<_CharT,_Traits,_Allocator>::size_type __pos,
-       typename basic_string<_CharT,_Traits,_Allocator>::size_type __n,
-       _CharT __zero, _CharT __one)
-{
-    if (__pos > __str.size())
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset string pos out of range");
-#else
-        assert(!"bitset string pos out of range");
-#endif
-    size_t __rlen = _VSTD::min(__n, __str.size() - __pos);
-    for (size_t __i = __pos; __i < __pos + __rlen; ++__i)
-        if (!_Traits::eq(__str[__i], __zero) && !_Traits::eq(__str[__i], __one))
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            throw invalid_argument("bitset string ctor has invalid argument");
-#else
-            assert(!"bitset string ctor has invalid argument");
-#endif
-    size_t _Mp = _VSTD::min(__rlen, _Size);
-    size_t __i = 0;
-    for (; __i < _Mp; ++__i)
-    {
-        _CharT __c = __str[__pos + _Mp - 1 - __i];
-        if (_Traits::eq(__c, __zero))
-            (*this)[__i] = false;
-        else
-            (*this)[__i] = true;
-    }
-    _VSTD::fill(base::__make_iter(__i), base::__make_iter(_Size), false);
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::operator&=(const bitset& __rhs) _NOEXCEPT
-{
-    base::operator&=(__rhs);
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::operator|=(const bitset& __rhs) _NOEXCEPT
-{
-    base::operator|=(__rhs);
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::operator^=(const bitset& __rhs) _NOEXCEPT
-{
-    base::operator^=(__rhs);
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::operator<<=(size_t __pos) _NOEXCEPT
-{
-    __pos = _VSTD::min(__pos, _Size);
-    _VSTD::copy_backward(base::__make_iter(0), base::__make_iter(_Size - __pos), base::__make_iter(_Size));
-    _VSTD::fill_n(base::__make_iter(0), __pos, false);
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::operator>>=(size_t __pos) _NOEXCEPT
-{
-    __pos = _VSTD::min(__pos, _Size);
-    _VSTD::copy(base::__make_iter(__pos), base::__make_iter(_Size), base::__make_iter(0));
-    _VSTD::fill_n(base::__make_iter(_Size - __pos), __pos, false);
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::set() _NOEXCEPT
-{
-    _VSTD::fill_n(base::__make_iter(0), _Size, true);
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::set(size_t __pos, bool __val)
-{
-    if (__pos >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset set argument out of range");
-#else
-        assert(!"bitset set argument out of range");
-#endif
-    (*this)[__pos] = __val;
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::reset() _NOEXCEPT
-{
-    _VSTD::fill_n(base::__make_iter(0), _Size, false);
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::reset(size_t __pos)
-{
-    if (__pos >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset reset argument out of range");
-#else
-        assert(!"bitset reset argument out of range");
-#endif
-    (*this)[__pos] = false;
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-bitset<_Size>::operator~() const _NOEXCEPT
-{
-    bitset __x(*this);
-    __x.flip();
-    return __x;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::flip() _NOEXCEPT
-{
-    base::flip();
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::flip(size_t __pos)
-{
-    if (__pos >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset flip argument out of range");
-#else
-        assert(!"bitset flip argument out of range");
-#endif
-    reference r = base::__make_ref(__pos);
-    r = ~r;
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-bitset<_Size>::to_ulong() const
-{
-    return base::to_ulong();
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-bitset<_Size>::to_ullong() const
-{
-    return base::to_ullong();
-}
-
-template <size_t _Size>
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(_Size, __zero);
-    for (size_t __i = 0; __i < _Size; ++__i)
-    {
-        if ((*this)[__i])
-            __r[_Size - 1 - __i] = __one;
-    }
-    return __r;
-}
-
-template <size_t _Size>
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, allocator<_CharT> >
-bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
-{
-    return to_string<_CharT, _Traits, allocator<_CharT> >(__zero, __one);
-}
-
-template <size_t _Size>
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> >
-bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
-{
-    return to_string<_CharT, char_traits<_CharT>, allocator<_CharT> >(__zero, __one);
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<char, char_traits<char>, allocator<char> >
-bitset<_Size>::to_string(char __zero, char __one) const
-{
-    return to_string<char, char_traits<char>, allocator<char> >(__zero, __one);
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-bitset<_Size>::count() const _NOEXCEPT
-{
-    return static_cast<size_t>(_VSTD::count(base::__make_iter(0), base::__make_iter(_Size), true));
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-bitset<_Size>::operator==(const bitset& __rhs) const _NOEXCEPT
-{
-    return _VSTD::equal(base::__make_iter(0), base::__make_iter(_Size), __rhs.__make_iter(0));
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-bitset<_Size>::operator!=(const bitset& __rhs) const _NOEXCEPT
-{
-    return !(*this == __rhs);
-}
-
-template <size_t _Size>
-bool
-bitset<_Size>::test(size_t __pos) const
-{
-    if (__pos >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset test argument out of range");
-#else
-        assert(!"bitset test argument out of range");
-#endif
-    return (*this)[__pos];
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-bitset<_Size>::all() const _NOEXCEPT
-{
-    return base::all();
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-bitset<_Size>::any() const _NOEXCEPT
-{
-    return base::any();
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-bitset<_Size>::operator<<(size_t __pos) const _NOEXCEPT
-{
-    bitset __r = *this;
-    __r <<= __pos;
-    return __r;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-bitset<_Size>::operator>>(size_t __pos) const _NOEXCEPT
-{
-    bitset __r = *this;
-    __r >>= __pos;
-    return __r;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-operator&(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
-{
-    bitset<_Size> __r = __x;
-    __r &= __y;
-    return __r;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-operator|(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
-{
-    bitset<_Size> __r = __x;
-    __r |= __y;
-    return __r;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-operator^(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
-{
-    bitset<_Size> __r = __x;
-    __r ^= __y;
-    return __r;
-}
-
-template <size_t _Size>
-struct _LIBCPP_TYPE_VIS_ONLY hash<bitset<_Size> >
-    : public unary_function<bitset<_Size>, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const bitset<_Size>& __bs) const _NOEXCEPT
-        {return __bs.__hash_code();}
-};
-
-template <class _CharT, class _Traits, size_t _Size>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x);
-
-template <class _CharT, class _Traits, size_t _Size>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Size>& __x);
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_BITSET
diff --git a/include.new/c++/v1/cassert b/include.new/c++/v1/cassert
deleted file mode 100644
index 3775990..0000000
--- a/include.new/c++/v1/cassert
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- cassert -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-/*
-    cassert synopsis
-
-Macros:
-
-    assert
-
-*/
-
-#include <__config>
-#include <assert.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
diff --git a/include.new/c++/v1/ccomplex b/include.new/c++/v1/ccomplex
deleted file mode 100644
index 6ed1164..0000000
--- a/include.new/c++/v1/ccomplex
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- ccomplex ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CCOMPLEX
-#define _LIBCPP_CCOMPLEX
-
-/*
-    ccomplex synopsis
-
-#include <complex>
-
-*/
-
-#include <complex>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-// hh 080623 Created
-
-#endif  // _LIBCPP_CCOMPLEX
diff --git a/include.new/c++/v1/cctype b/include.new/c++/v1/cctype
deleted file mode 100644
index b647903..0000000
--- a/include.new/c++/v1/cctype
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- cctype ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CCTYPE
-#define _LIBCPP_CCTYPE
-
-/*
-    cctype synopsis
-
-namespace std
-{
-
-int isalnum(int c);
-int isalpha(int c);
-int isblank(int c);  // C99
-int iscntrl(int c);
-int isdigit(int c);
-int isgraph(int c);
-int islower(int c);
-int isprint(int c);
-int ispunct(int c);
-int isspace(int c);
-int isupper(int c);
-int isxdigit(int c);
-int tolower(int c);
-int toupper(int c);
-
-}  // std
-*/
-
-#include <__config>
-#include <ctype.h>
-#if defined(_LIBCPP_MSVCRT)
-#include "support/win32/support.h"
-#endif // _LIBCPP_MSVCRT
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifdef isalnum
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isalnum(int __c) {return isalnum(__c);}
-#undef isalnum
-inline _LIBCPP_INLINE_VISIBILITY int isalnum(int __c) {return __libcpp_isalnum(__c);}
-#else  // isalnum
-using ::isalnum;
-#endif  // isalnum
-
-#ifdef isalpha
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isalpha(int __c) {return isalpha(__c);}
-#undef isalpha
-inline _LIBCPP_INLINE_VISIBILITY int isalpha(int __c) {return __libcpp_isalpha(__c);}
-#else  // isalpha
-using ::isalpha;
-#endif  // isalpha
-
-#ifdef isblank
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isblank(int __c) {return isblank(__c);}
-#undef isblank
-inline _LIBCPP_INLINE_VISIBILITY int isblank(int __c) {return __libcpp_isblank(__c);}
-#else  // isblank
-using ::isblank;
-#endif  // isblank
-
-#ifdef iscntrl
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iscntrl(int __c) {return iscntrl(__c);}
-#undef iscntrl
-inline _LIBCPP_INLINE_VISIBILITY int iscntrl(int __c) {return __libcpp_iscntrl(__c);}
-#else  // iscntrl
-using ::iscntrl;
-#endif  // iscntrl
-
-#ifdef isdigit
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isdigit(int __c) {return isdigit(__c);}
-#undef isdigit
-inline _LIBCPP_INLINE_VISIBILITY int isdigit(int __c) {return __libcpp_isdigit(__c);}
-#else  // isdigit
-using ::isdigit;
-#endif  // isdigit
-
-#ifdef isgraph
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isgraph(int __c) {return isgraph(__c);}
-#undef isgraph
-inline _LIBCPP_INLINE_VISIBILITY int isgraph(int __c) {return __libcpp_isgraph(__c);}
-#else  // isgraph
-using ::isgraph;
-#endif  // isgraph
-
-#ifdef islower
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_islower(int __c) {return islower(__c);}
-#undef islower
-inline _LIBCPP_INLINE_VISIBILITY int islower(int __c) {return __libcpp_islower(__c);}
-#else  // islower
-using ::islower;
-#endif  // islower
-
-#ifdef isprint
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isprint(int __c) {return isprint(__c);}
-#undef isprint
-inline _LIBCPP_INLINE_VISIBILITY int isprint(int __c) {return __libcpp_isprint(__c);}
-#else  // isprint
-using ::isprint;
-#endif  // isprint
-
-#ifdef ispunct
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_ispunct(int __c) {return ispunct(__c);}
-#undef ispunct
-inline _LIBCPP_INLINE_VISIBILITY int ispunct(int __c) {return __libcpp_ispunct(__c);}
-#else  // ispunct
-using ::ispunct;
-#endif  // ispunct
-
-#ifdef isspace
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isspace(int __c) {return isspace(__c);}
-#undef isspace
-inline _LIBCPP_INLINE_VISIBILITY int isspace(int __c) {return __libcpp_isspace(__c);}
-#else  // isspace
-using ::isspace;
-#endif  // isspace
-
-#ifdef isupper
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isupper(int __c) {return isupper(__c);}
-#undef isupper
-inline _LIBCPP_INLINE_VISIBILITY int isupper(int __c) {return __libcpp_isupper(__c);}
-#else  // isupper
-using ::isupper;
-#endif  // isupper
-
-#ifdef isxdigit
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isxdigit(int __c) {return isxdigit(__c);}
-#undef isxdigit
-inline _LIBCPP_INLINE_VISIBILITY int isxdigit(int __c) {return __libcpp_isxdigit(__c);}
-#else  // isxdigit
-using ::isxdigit;
-#endif  // isxdigit
-
-#ifdef tolower
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_tolower(int __c) {return tolower(__c);}
-#undef tolower
-inline _LIBCPP_INLINE_VISIBILITY int tolower(int __c) {return __libcpp_tolower(__c);}
-#else  // tolower
-using ::tolower;
-#endif  // tolower
-
-#ifdef toupper
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_toupper(int __c) {return toupper(__c);}
-#undef toupper
-inline _LIBCPP_INLINE_VISIBILITY int toupper(int __c) {return __libcpp_toupper(__c);}
-#else  // toupper
-using ::toupper;
-#endif  // toupper
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CCTYPE
diff --git a/include.new/c++/v1/cerrno b/include.new/c++/v1/cerrno
deleted file mode 100644
index 9804e4e..0000000
--- a/include.new/c++/v1/cerrno
+++ /dev/null
@@ -1,393 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- cerrno ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CERRNO
-#define _LIBCPP_CERRNO
-
-/*
-    cerrno synopsis
-
-Macros:
-
-    EDOM
-    EILSEQ  // C99
-    ERANGE
-    errno
-
-*/
-
-#include <__config>
-#include <errno.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE)
-
-#ifdef ELAST
-
-const int __elast1 = ELAST+1;
-const int __elast2 = ELAST+2;
-
-#else
-
-const int __elast1 = 104;
-const int __elast2 = 105;
-
-#endif
-
-#ifdef ENOTRECOVERABLE
-
-#define EOWNERDEAD __elast1
-
-#ifdef ELAST
-#undef ELAST
-#define ELAST EOWNERDEAD
-#endif
-
-#elif defined(EOWNERDEAD)
-
-#define ENOTRECOVERABLE __elast1
-#ifdef ELAST
-#undef ELAST
-#define ELAST ENOTRECOVERABLE
-#endif
-
-#else  // defined(EOWNERDEAD)
-
-#define EOWNERDEAD __elast1
-#define ENOTRECOVERABLE __elast2
-#ifdef ELAST
-#undef ELAST
-#define ELAST ENOTRECOVERABLE
-#endif
-
-#endif  // defined(EOWNERDEAD)
-
-#endif  // !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE)
-
-//  supply errno values likely to be missing, particularly on Windows
-
-#ifndef EAFNOSUPPORT
-#define EAFNOSUPPORT 9901
-#endif
-
-#ifndef EADDRINUSE
-#define EADDRINUSE 9902
-#endif
-
-#ifndef EADDRNOTAVAIL
-#define EADDRNOTAVAIL 9903
-#endif
-
-#ifndef EISCONN
-#define EISCONN 9904
-#endif
-
-#ifndef EBADMSG
-#define EBADMSG 9905
-#endif
-
-#ifndef ECONNABORTED
-#define ECONNABORTED 9906
-#endif
-
-#ifndef EALREADY
-#define EALREADY 9907
-#endif
-
-#ifndef ECONNREFUSED
-#define ECONNREFUSED 9908
-#endif
-
-#ifndef ECONNRESET
-#define ECONNRESET 9909
-#endif
-
-#ifndef EDESTADDRREQ
-#define EDESTADDRREQ 9910
-#endif
-
-#ifndef EHOSTUNREACH
-#define EHOSTUNREACH 9911
-#endif
-
-#ifndef EIDRM
-#define EIDRM 9912
-#endif
-
-#ifndef EMSGSIZE
-#define EMSGSIZE 9913
-#endif
-
-#ifndef ENETDOWN
-#define ENETDOWN 9914
-#endif
-
-#ifndef ENETRESET
-#define ENETRESET 9915
-#endif
-
-#ifndef ENETUNREACH
-#define ENETUNREACH 9916
-#endif
-
-#ifndef ENOBUFS
-#define ENOBUFS 9917
-#endif
-
-#ifndef ENOLINK
-#define ENOLINK 9918
-#endif
-
-#ifndef ENODATA
-#define ENODATA 9919
-#endif
-
-#ifndef ENOMSG
-#define ENOMSG 9920
-#endif
-
-#ifndef ENOPROTOOPT
-#define ENOPROTOOPT 9921
-#endif
-
-#ifndef ENOSR
-#define ENOSR 9922
-#endif
-
-#ifndef ENOTSOCK
-#define ENOTSOCK 9923
-#endif
-
-#ifndef ENOSTR
-#define ENOSTR 9924
-#endif
-
-#ifndef ENOTCONN
-#define ENOTCONN 9925
-#endif
-
-#ifndef ENOTSUP
-#define ENOTSUP 9926
-#endif
-
-#ifndef ECANCELED
-#define ECANCELED 9927
-#endif
-
-#ifndef EINPROGRESS
-#define EINPROGRESS 9928
-#endif
-
-#ifndef EOPNOTSUPP
-#define EOPNOTSUPP 9929
-#endif
-
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK 9930
-#endif
-
-#ifndef EOWNERDEAD
-#define EOWNERDEAD  9931
-#endif
-
-#ifndef EPROTO
-#define EPROTO 9932
-#endif
-
-#ifndef EPROTONOSUPPORT
-#define EPROTONOSUPPORT 9933
-#endif
-
-#ifndef ENOTRECOVERABLE
-#define ENOTRECOVERABLE 9934
-#endif
-
-#ifndef ETIME
-#define ETIME 9935
-#endif
-
-#ifndef ETXTBSY
-#define ETXTBSY 9936
-#endif
-
-#ifndef ETIMEDOUT
-#define ETIMEDOUT 9938
-#endif
-
-#ifndef ELOOP
-#define ELOOP 9939
-#endif
-
-#ifndef EOVERFLOW
-#define EOVERFLOW 9940
-#endif
-
-#ifndef EPROTOTYPE
-#define EPROTOTYPE 9941
-#endif
-
-#ifndef ENOSYS
-#define ENOSYS 9942
-#endif
-
-#ifndef EINVAL
-#define EINVAL 9943
-#endif
-
-#ifndef ERANGE
-#define ERANGE 9944
-#endif
-
-#ifndef EILSEQ
-#define EILSEQ 9945
-#endif
-
-//  Windows Mobile doesn't appear to define these:
-
-#ifndef E2BIG
-#define E2BIG 9946
-#endif
-
-#ifndef EDOM
-#define EDOM 9947
-#endif
-
-#ifndef EFAULT
-#define EFAULT 9948
-#endif
-
-#ifndef EBADF
-#define EBADF 9949
-#endif
-
-#ifndef EPIPE
-#define EPIPE 9950
-#endif
-
-#ifndef EXDEV
-#define EXDEV 9951
-#endif
-
-#ifndef EBUSY
-#define EBUSY 9952
-#endif
-
-#ifndef ENOTEMPTY
-#define ENOTEMPTY 9953
-#endif
-
-#ifndef ENOEXEC
-#define ENOEXEC 9954
-#endif
-
-#ifndef EEXIST
-#define EEXIST 9955
-#endif
-
-#ifndef EFBIG
-#define EFBIG 9956
-#endif
-
-#ifndef ENAMETOOLONG
-#define ENAMETOOLONG 9957
-#endif
-
-#ifndef ENOTTY
-#define ENOTTY 9958
-#endif
-
-#ifndef EINTR
-#define EINTR 9959
-#endif
-
-#ifndef ESPIPE
-#define ESPIPE 9960
-#endif
-
-#ifndef EIO
-#define EIO 9961
-#endif
-
-#ifndef EISDIR
-#define EISDIR 9962
-#endif
-
-#ifndef ECHILD
-#define ECHILD 9963
-#endif
-
-#ifndef ENOLCK
-#define ENOLCK 9964
-#endif
-
-#ifndef ENOSPC
-#define ENOSPC 9965
-#endif
-
-#ifndef ENXIO
-#define ENXIO 9966
-#endif
-
-#ifndef ENODEV
-#define ENODEV 9967
-#endif
-
-#ifndef ENOENT
-#define ENOENT 9968
-#endif
-
-#ifndef ESRCH
-#define ESRCH 9969
-#endif
-
-#ifndef ENOTDIR
-#define ENOTDIR 9970
-#endif
-
-#ifndef ENOMEM
-#define ENOMEM 9971
-#endif
-
-#ifndef EPERM
-#define EPERM 9972
-#endif
-
-#ifndef EACCES
-#define EACCES 9973
-#endif
-
-#ifndef EROFS
-#define EROFS 9974
-#endif
-
-#ifndef EDEADLK
-#define EDEADLK 9975
-#endif
-
-#ifndef EAGAIN
-#define EAGAIN 9976
-#endif
-
-#ifndef ENFILE
-#define ENFILE 9977
-#endif
-
-#ifndef EMFILE
-#define EMFILE 9978
-#endif
-
-#ifndef EMLINK
-#define EMLINK 9979
-#endif
-
-#endif  // _LIBCPP_CERRNO
diff --git a/include.new/c++/v1/cfenv b/include.new/c++/v1/cfenv
deleted file mode 100644
index dd7db37..0000000
--- a/include.new/c++/v1/cfenv
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- cctype ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CFENV
-#define _LIBCPP_CFENV
-
-/*
-    cfenv synopsis
-
-This entire header is C99 / C++0X
-
-Macros:
-
-    FE_DIVBYZERO
-    FE_INEXACT
-    FE_INVALID
-    FE_OVERFLOW
-    FE_UNDERFLOW
-    FE_ALL_EXCEPT
-    FE_DOWNWARD
-    FE_TONEAREST
-    FE_TOWARDZERO
-    FE_UPWARD
-    FE_DFL_ENV
-
-namespace std
-{
-
-Types:
-
-    fenv_t
-    fexcept_t
-
-int feclearexcept(int excepts);
-int fegetexceptflag(fexcept_t* flagp, int excepts);
-int feraiseexcept(int excepts);
-int fesetexceptflag(const fexcept_t* flagp, int excepts);
-int fetestexcept(int excepts);
-int fegetround();
-int fesetround(int round);
-int fegetenv(fenv_t* envp);
-int feholdexcept(fenv_t* envp);
-int fesetenv(const fenv_t* envp);
-int feupdateenv(const fenv_t* envp);
-
-}  // std
-*/
-
-#include <__config>
-#include <fenv.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::fenv_t;
-using ::fexcept_t;
-
-using ::feclearexcept;
-using ::fegetexceptflag;
-using ::feraiseexcept;
-using ::fesetexceptflag;
-using ::fetestexcept;
-using ::fegetround;
-using ::fesetround;
-using ::fegetenv;
-using ::feholdexcept;
-using ::fesetenv;
-using ::feupdateenv;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CFENV
diff --git a/include.new/c++/v1/cfloat b/include.new/c++/v1/cfloat
deleted file mode 100644
index 5fa5655..0000000
--- a/include.new/c++/v1/cfloat
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cfloat -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CFLOAT
-#define _LIBCPP_CFLOAT
-
-/*
-    cfloat synopsis
-
-Macros:
-
-    FLT_ROUNDS
-    FLT_EVAL_METHOD     // C99
-    FLT_RADIX
-
-    FLT_MANT_DIG
-    DBL_MANT_DIG
-    LDBL_MANT_DIG
-
-    DECIMAL_DIG         // C99
-
-    FLT_DIG
-    DBL_DIG
-    LDBL_DIG
-
-    FLT_MIN_EXP
-    DBL_MIN_EXP
-    LDBL_MIN_EXP
-
-    FLT_MIN_10_EXP
-    DBL_MIN_10_EXP
-    LDBL_MIN_10_EXP
-
-    FLT_MAX_EXP
-    DBL_MAX_EXP
-    LDBL_MAX_EXP
-
-    FLT_MAX_10_EXP
-    DBL_MAX_10_EXP
-    LDBL_MAX_10_EXP
-
-    FLT_MAX
-    DBL_MAX
-    LDBL_MAX
-
-    FLT_EPSILON
-    DBL_EPSILON
-    LDBL_EPSILON
-
-    FLT_MIN
-    DBL_MIN
-    LDBL_MIN
-
-*/
-
-#include <__config>
-#include <float.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifndef FLT_EVAL_METHOD
-#define FLT_EVAL_METHOD __FLT_EVAL_METHOD__
-#endif
-
-#ifndef DECIMAL_DIG
-#define DECIMAL_DIG __DECIMAL_DIG__
-#endif
-
-#endif  // _LIBCPP_CFLOAT
diff --git a/include.new/c++/v1/chrono b/include.new/c++/v1/chrono
deleted file mode 100644
index 9229234..0000000
--- a/include.new/c++/v1/chrono
+++ /dev/null
@@ -1,1031 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- chrono ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CHRONO
-#define _LIBCPP_CHRONO
-
-/*
-    chrono synopsis
-
-namespace std
-{
-namespace chrono
-{
-
-template <class ToDuration, class Rep, class Period>
-constexpr
-ToDuration
-duration_cast(const duration<Rep, Period>& fd);
-
-template <class Rep> struct treat_as_floating_point : is_floating_point<Rep> {};
-
-template <class Rep>
-struct duration_values
-{
-public:
-    static constexpr Rep zero();
-    static constexpr Rep max();
-    static constexpr Rep min();
-};
-
-// duration
-
-template <class Rep, class Period = ratio<1>>
-class duration
-{
-    static_assert(!__is_duration<Rep>::value, "A duration representation can not be a duration");
-    static_assert(__is_ratio<Period>::value, "Second template parameter of duration must be a std::ratio");
-    static_assert(Period::num > 0, "duration period must be positive");
-public:
-    typedef Rep rep;
-    typedef Period period;
-
-    constexpr duration() = default;
-    template <class Rep2>
-        constexpr explicit duration(const Rep2& r,
-            typename enable_if
-            <
-               is_convertible<Rep2, rep>::value &&
-               (treat_as_floating_point<rep>::value ||
-               !treat_as_floating_point<rep>::value && !treat_as_floating_point<Rep2>::value)
-            >::type* = 0);
-
-    // conversions
-    template <class Rep2, class Period2>
-        constexpr duration(const duration<Rep2, Period2>& d,
-            typename enable_if
-            <
-                treat_as_floating_point<rep>::value ||
-                ratio_divide<Period2, period>::type::den == 1
-            >::type* = 0);
-
-    // observer
-
-    constexpr rep count() const;
-
-    // arithmetic
-
-    constexpr duration  operator+() const;
-    constexpr duration  operator-() const;
-    duration& operator++();
-    duration  operator++(int);
-    duration& operator--();
-    duration  operator--(int);
-
-    duration& operator+=(const duration& d);
-    duration& operator-=(const duration& d);
-
-    duration& operator*=(const rep& rhs);
-    duration& operator/=(const rep& rhs);
-
-    // special values
-
-    static constexpr duration zero();
-    static constexpr duration min();
-    static constexpr duration max();
-};
-
-typedef duration<long long,         nano> nanoseconds;
-typedef duration<long long,        micro> microseconds;
-typedef duration<long long,        milli> milliseconds;
-typedef duration<long long              > seconds;
-typedef duration<     long, ratio<  60> > minutes;
-typedef duration<     long, ratio<3600> > hours;
-
-template <class Clock, class Duration = typename Clock::duration>
-class time_point
-{
-public:
-    typedef Clock                     clock;
-    typedef Duration                  duration;
-    typedef typename duration::rep    rep;
-    typedef typename duration::period period;
-private:
-    duration d_;  // exposition only
-
-public:
-    time_point();  // has value "epoch" // constexpr in C++14
-    explicit time_point(const duration& d);  // same as time_point() + d // constexpr in C++14
-
-    // conversions
-    template <class Duration2>
-       time_point(const time_point<clock, Duration2>& t); // constexpr in C++14
-
-    // observer
-
-    duration time_since_epoch() const; // constexpr in C++14
-
-    // arithmetic
-
-    time_point& operator+=(const duration& d);
-    time_point& operator-=(const duration& d);
-
-    // special values
-
-    static constexpr time_point min();
-    static constexpr time_point max();
-};
-
-} // chrono
-
-// common_type traits
-template <class Rep1, class Period1, class Rep2, class Period2>
-  struct common_type<chrono::duration<Rep1, Period1>, chrono::duration<Rep2, Period2>>;
-
-template <class Clock, class Duration1, class Duration2>
-  struct common_type<chrono::time_point<Clock, Duration1>, chrono::time_point<Clock, Duration2>>;
-
-namespace chrono {
-
-// duration arithmetic
-template <class Rep1, class Period1, class Rep2, class Period2>
-  constexpr
-  typename common_type<duration<Rep1, Period1>, duration<Rep2, Period2>>::type
-  operator+(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-  constexpr
-  typename common_type<duration<Rep1, Period1>, duration<Rep2, Period2>>::type
-  operator-(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period, class Rep2>
-  constexpr
-  duration<typename common_type<Rep1, Rep2>::type, Period>
-  operator*(const duration<Rep1, Period>& d, const Rep2& s);
-template <class Rep1, class Period, class Rep2>
-  constexpr
-  duration<typename common_type<Rep1, Rep2>::type, Period>
-  operator*(const Rep1& s, const duration<Rep2, Period>& d);
-template <class Rep1, class Period, class Rep2>
-  constexpr
-  duration<typename common_type<Rep1, Rep2>::type, Period>
-  operator/(const duration<Rep1, Period>& d, const Rep2& s);
-template <class Rep1, class Period1, class Rep2, class Period2>
-  constexpr
-  typename common_type<Rep1, Rep2>::type
-  operator/(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-
-// duration comparisons
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator==(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator!=(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator< (const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator<=(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator> (const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator>=(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-
-// duration_cast
-template <class ToDuration, class Rep, class Period>
-  ToDuration duration_cast(const duration<Rep, Period>& d);
-
-// time_point arithmetic (all constexpr in C++14)
-template <class Clock, class Duration1, class Rep2, class Period2>
-  time_point<Clock, typename common_type<Duration1, duration<Rep2, Period2>>::type>
-  operator+(const time_point<Clock, Duration1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Clock, class Duration2>
-  time_point<Clock, typename common_type<duration<Rep1, Period1>, Duration2>::type>
-  operator+(const duration<Rep1, Period1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Rep2, class Period2>
-  time_point<Clock, typename common_type<Duration1, duration<Rep2, Period2>>::type>
-  operator-(const time_point<Clock, Duration1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-  typename common_type<Duration1, Duration2>::type
-  operator-(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-
-// time_point comparisons (all constexpr in C++14)
-template <class Clock, class Duration1, class Duration2>
-   bool operator==(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator!=(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator< (const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator<=(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator> (const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator>=(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-
-// time_point_cast (constexpr in C++14)
-
-template <class ToDuration, class Clock, class Duration>
-  time_point<Clock, ToDuration> time_point_cast(const time_point<Clock, Duration>& t);
-
-// Clocks
-
-class system_clock
-{
-public:
-    typedef microseconds                     duration;
-    typedef duration::rep                    rep;
-    typedef duration::period                 period;
-    typedef chrono::time_point<system_clock> time_point;
-    static const bool is_steady =            false; // constexpr in C++14
-
-    static time_point now() noexcept;
-    static time_t     to_time_t  (const time_point& __t) noexcept;
-    static time_point from_time_t(time_t __t) noexcept;
-};
-
-class steady_clock
-{
-public:
-    typedef nanoseconds                                   duration;
-    typedef duration::rep                                 rep;
-    typedef duration::period                              period;
-    typedef chrono::time_point<steady_clock, duration>    time_point;
-    static const bool is_steady =                         true; // constexpr in C++14
-
-    static time_point now() noexcept;
-};
-
-typedef steady_clock high_resolution_clock;
-
-}  // chrono
-
-constexpr chrono::hours                                 operator "" h(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , ratio<3600,1>> operator "" h(long double); // C++14
-constexpr chrono::minutes                               operator "" min(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , ratio<60,1>>   operator "" min(long double); // C++14
-constexpr chrono::seconds                               operator "" s(unsigned long long); // C++14
-constexpr chrono::duration<unspecified >                operator "" s(long double); // C++14
-constexpr chrono::milliseconds                          operator "" ms(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , milli>         operator "" ms(long double); // C++14
-constexpr chrono::microseconds                          operator "" us(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , micro>         operator "" us(long double); // C++14
-constexpr chrono::nanoseconds                           operator "" ns(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , nano>          operator "" ns(long double); // C++14
-
-}  // std
-*/
-
-#include <__config>
-#include <ctime>
-#include <type_traits>
-#include <ratio>
-#include <limits>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-namespace chrono
-{
-
-template <class _Rep, class _Period = ratio<1> > class _LIBCPP_TYPE_VIS_ONLY duration;
-
-template <class _Tp>
-struct __is_duration : false_type {};
-
-template <class _Rep, class _Period>
-struct __is_duration<duration<_Rep, _Period> > : true_type  {};
-
-template <class _Rep, class _Period>
-struct __is_duration<const duration<_Rep, _Period> > : true_type  {};
-
-template <class _Rep, class _Period>
-struct __is_duration<volatile duration<_Rep, _Period> > : true_type  {};
-
-template <class _Rep, class _Period>
-struct __is_duration<const volatile duration<_Rep, _Period> > : true_type  {};
-
-} // chrono
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<chrono::duration<_Rep1, _Period1>,
-                                         chrono::duration<_Rep2, _Period2> >
-{
-    typedef chrono::duration<typename common_type<_Rep1, _Rep2>::type,
-                             typename __ratio_gcd<_Period1, _Period2>::type> type;
-};
-
-namespace chrono {
-
-// duration_cast
-
-template <class _FromDuration, class _ToDuration,
-          class _Period = typename ratio_divide<typename _FromDuration::period, typename _ToDuration::period>::type,
-          bool = _Period::num == 1,
-          bool = _Period::den == 1>
-struct __duration_cast;
-
-template <class _FromDuration, class _ToDuration, class _Period>
-struct __duration_cast<_FromDuration, _ToDuration, _Period, true, true>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    _ToDuration operator()(const _FromDuration& __fd) const
-    {
-        return _ToDuration(static_cast<typename _ToDuration::rep>(__fd.count()));
-    }
-};
-
-template <class _FromDuration, class _ToDuration, class _Period>
-struct __duration_cast<_FromDuration, _ToDuration, _Period, true, false>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    _ToDuration operator()(const _FromDuration& __fd) const
-    {
-        typedef typename common_type<typename _ToDuration::rep, typename _FromDuration::rep, intmax_t>::type _Ct;
-        return _ToDuration(static_cast<typename _ToDuration::rep>(
-                           static_cast<_Ct>(__fd.count()) / static_cast<_Ct>(_Period::den)));
-    }
-};
-
-template <class _FromDuration, class _ToDuration, class _Period>
-struct __duration_cast<_FromDuration, _ToDuration, _Period, false, true>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    _ToDuration operator()(const _FromDuration& __fd) const
-    {
-        typedef typename common_type<typename _ToDuration::rep, typename _FromDuration::rep, intmax_t>::type _Ct;
-        return _ToDuration(static_cast<typename _ToDuration::rep>(
-                           static_cast<_Ct>(__fd.count()) * static_cast<_Ct>(_Period::num)));
-    }
-};
-
-template <class _FromDuration, class _ToDuration, class _Period>
-struct __duration_cast<_FromDuration, _ToDuration, _Period, false, false>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    _ToDuration operator()(const _FromDuration& __fd) const
-    {
-        typedef typename common_type<typename _ToDuration::rep, typename _FromDuration::rep, intmax_t>::type _Ct;
-        return _ToDuration(static_cast<typename _ToDuration::rep>(
-                           static_cast<_Ct>(__fd.count()) * static_cast<_Ct>(_Period::num)
-                                                          / static_cast<_Ct>(_Period::den)));
-    }
-};
-
-template <class _ToDuration, class _Rep, class _Period>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename enable_if
-<
-    __is_duration<_ToDuration>::value,
-    _ToDuration
->::type
-duration_cast(const duration<_Rep, _Period>& __fd)
-{
-    return __duration_cast<duration<_Rep, _Period>, _ToDuration>()(__fd);
-}
-
-template <class _Rep>
-struct _LIBCPP_TYPE_VIS_ONLY treat_as_floating_point : is_floating_point<_Rep> {};
-
-template <class _Rep>
-struct _LIBCPP_TYPE_VIS_ONLY duration_values
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR _Rep zero() {return _Rep(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR _Rep max()  {return numeric_limits<_Rep>::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR _Rep min()  {return numeric_limits<_Rep>::lowest();}
-};
-
-// duration
-
-template <class _Rep, class _Period>
-class _LIBCPP_TYPE_VIS_ONLY duration
-{
-    static_assert(!__is_duration<_Rep>::value, "A duration representation can not be a duration");
-    static_assert(__is_ratio<_Period>::value, "Second template parameter of duration must be a std::ratio");
-    static_assert(_Period::num > 0, "duration period must be positive");
-
-    template <class _R1, class _R2>
-    struct __no_overflow
-    {
-    private:
-        static const intmax_t __gcd_n1_n2 = __static_gcd<_R1::num, _R2::num>::value;
-        static const intmax_t __gcd_d1_d2 = __static_gcd<_R1::den, _R2::den>::value;
-        static const intmax_t __n1 = _R1::num / __gcd_n1_n2;
-        static const intmax_t __d1 = _R1::den / __gcd_d1_d2;
-        static const intmax_t __n2 = _R2::num / __gcd_n1_n2;
-        static const intmax_t __d2 = _R2::den / __gcd_d1_d2;
-        static const intmax_t max = -((intmax_t(1) << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1);
-
-        template <intmax_t _Xp, intmax_t _Yp, bool __overflow>
-        struct __mul    // __overflow == false
-        {
-            static const intmax_t value = _Xp * _Yp;
-        };
-
-        template <intmax_t _Xp, intmax_t _Yp>
-        struct __mul<_Xp, _Yp, true>
-        {
-            static const intmax_t value = 1;
-        };
-
-    public:
-        static const bool value = (__n1 <= max / __d2) && (__n2 <= max / __d1);
-        typedef ratio<__mul<__n1, __d2, !value>::value,
-                      __mul<__n2, __d1, !value>::value> type;
-    };
-    
-public:
-    typedef _Rep rep;
-    typedef _Period period;
-private:
-    rep __rep_;
-public:
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-        duration() = default;
-#else
-        duration() {}
-#endif
-
-    template <class _Rep2>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-        explicit duration(const _Rep2& __r,
-            typename enable_if
-            <
-               is_convertible<_Rep2, rep>::value &&
-               (treat_as_floating_point<rep>::value ||
-               !treat_as_floating_point<_Rep2>::value)
-            >::type* = 0)
-                : __rep_(__r) {}
-
-    // conversions
-    template <class _Rep2, class _Period2>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-        duration(const duration<_Rep2, _Period2>& __d,
-            typename enable_if
-            <
-                __no_overflow<_Period2, period>::value && (
-                treat_as_floating_point<rep>::value ||
-                (__no_overflow<_Period2, period>::type::den == 1 &&
-                 !treat_as_floating_point<_Rep2>::value))
-            >::type* = 0)
-                : __rep_(_VSTD::chrono::duration_cast<duration>(__d).count()) {}
-
-    // observer
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR rep count() const {return __rep_;}
-
-    // arithmetic
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR duration  operator+() const {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR duration  operator-() const {return duration(-__rep_);}
-    _LIBCPP_INLINE_VISIBILITY duration& operator++()      {++__rep_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration  operator++(int)   {return duration(__rep_++);}
-    _LIBCPP_INLINE_VISIBILITY duration& operator--()      {--__rep_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration  operator--(int)   {return duration(__rep_--);}
-
-    _LIBCPP_INLINE_VISIBILITY duration& operator+=(const duration& __d) {__rep_ += __d.count(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration& operator-=(const duration& __d) {__rep_ -= __d.count(); return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY duration& operator*=(const rep& rhs) {__rep_ *= rhs; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration& operator/=(const rep& rhs) {__rep_ /= rhs; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration& operator%=(const rep& rhs) {__rep_ %= rhs; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration& operator%=(const duration& rhs) {__rep_ %= rhs.count(); return *this;}
-
-    // special values
-
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR duration zero() {return duration(duration_values<rep>::zero());}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR duration min()  {return duration(duration_values<rep>::min());}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR duration max()  {return duration(duration_values<rep>::max());}
-};
-
-typedef duration<long long,         nano> nanoseconds;
-typedef duration<long long,        micro> microseconds;
-typedef duration<long long,        milli> milliseconds;
-typedef duration<long long              > seconds;
-typedef duration<     long, ratio<  60> > minutes;
-typedef duration<     long, ratio<3600> > hours;
-
-// Duration ==
-
-template <class _LhsDuration, class _RhsDuration>
-struct __duration_eq
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs) const
-        {
-            typedef typename common_type<_LhsDuration, _RhsDuration>::type _Ct;
-            return _Ct(__lhs).count() == _Ct(__rhs).count();
-        }
-};
-
-template <class _LhsDuration>
-struct __duration_eq<_LhsDuration, _LhsDuration>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs) const
-        {return __lhs.count() == __rhs.count();}
-};
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator==(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return __duration_eq<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >()(__lhs, __rhs);
-}
-
-// Duration !=
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator!=(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return !(__lhs == __rhs);
-}
-
-// Duration <
-
-template <class _LhsDuration, class _RhsDuration>
-struct __duration_lt
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs) const
-        {
-            typedef typename common_type<_LhsDuration, _RhsDuration>::type _Ct;
-            return _Ct(__lhs).count() < _Ct(__rhs).count();
-        }
-};
-
-template <class _LhsDuration>
-struct __duration_lt<_LhsDuration, _LhsDuration>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs) const
-        {return __lhs.count() < __rhs.count();}
-};
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator< (const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return __duration_lt<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >()(__lhs, __rhs);
-}
-
-// Duration >
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator> (const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return __rhs < __lhs;
-}
-
-// Duration <=
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator<=(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return !(__rhs < __lhs);
-}
-
-// Duration >=
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator>=(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return !(__lhs < __rhs);
-}
-
-// Duration +
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
-operator+(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Cd;
-    return _Cd(_Cd(__lhs).count() + _Cd(__rhs).count());
-}
-
-// Duration -
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
-operator-(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Cd;
-    return _Cd(_Cd(__lhs).count() - _Cd(__rhs).count());
-}
-
-// Duration *
-
-template <class _Rep1, class _Period, class _Rep2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename enable_if
-<
-    is_convertible<_Rep2, typename common_type<_Rep1, _Rep2>::type>::value,
-    duration<typename common_type<_Rep1, _Rep2>::type, _Period>
->::type
-operator*(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
-{
-    typedef typename common_type<_Rep1, _Rep2>::type _Cr;
-    typedef duration<_Cr, _Period> _Cd;
-    return _Cd(_Cd(__d).count() * static_cast<_Cr>(__s));
-}
-
-template <class _Rep1, class _Period, class _Rep2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename enable_if
-<
-    is_convertible<_Rep1, typename common_type<_Rep1, _Rep2>::type>::value,
-    duration<typename common_type<_Rep1, _Rep2>::type, _Period>
->::type
-operator*(const _Rep1& __s, const duration<_Rep2, _Period>& __d)
-{
-    return __d * __s;
-}
-
-// Duration /
-
-template <class _Duration, class _Rep, bool = __is_duration<_Rep>::value>
-struct __duration_divide_result
-{
-};
-
-template <class _Duration, class _Rep2,
-    bool = is_convertible<_Rep2,
-                          typename common_type<typename _Duration::rep, _Rep2>::type>::value>
-struct __duration_divide_imp
-{
-};
-
-template <class _Rep1, class _Period, class _Rep2>
-struct __duration_divide_imp<duration<_Rep1, _Period>, _Rep2, true>
-{
-    typedef duration<typename common_type<_Rep1, _Rep2>::type, _Period> type;
-};
-
-template <class _Rep1, class _Period, class _Rep2>
-struct __duration_divide_result<duration<_Rep1, _Period>, _Rep2, false>
-    : __duration_divide_imp<duration<_Rep1, _Period>, _Rep2>
-{
-};
-
-template <class _Rep1, class _Period, class _Rep2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename __duration_divide_result<duration<_Rep1, _Period>, _Rep2>::type
-operator/(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
-{
-    typedef typename common_type<_Rep1, _Rep2>::type _Cr;
-    typedef duration<_Cr, _Period> _Cd;
-    return _Cd(_Cd(__d).count() / static_cast<_Cr>(__s));
-}
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename common_type<_Rep1, _Rep2>::type
-operator/(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Ct;
-    return _Ct(__lhs).count() / _Ct(__rhs).count();
-}
-
-// Duration %
-
-template <class _Rep1, class _Period, class _Rep2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename __duration_divide_result<duration<_Rep1, _Period>, _Rep2>::type
-operator%(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
-{
-    typedef typename common_type<_Rep1, _Rep2>::type _Cr;
-    typedef duration<_Cr, _Period> _Cd;
-    return _Cd(_Cd(__d).count() % static_cast<_Cr>(__s));
-}
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
-operator%(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef typename common_type<_Rep1, _Rep2>::type _Cr;
-    typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Cd;
-    return _Cd(static_cast<_Cr>(_Cd(__lhs).count()) % static_cast<_Cr>(_Cd(__rhs).count()));
-}
-
-//////////////////////////////////////////////////////////
-///////////////////// time_point /////////////////////////
-//////////////////////////////////////////////////////////
-
-template <class _Clock, class _Duration = typename _Clock::duration>
-class _LIBCPP_TYPE_VIS_ONLY time_point
-{
-    static_assert(__is_duration<_Duration>::value,
-                  "Second template parameter of time_point must be a std::chrono::duration");
-public:
-    typedef _Clock                    clock;
-    typedef _Duration                 duration;
-    typedef typename duration::rep    rep;
-    typedef typename duration::period period;
-private:
-    duration __d_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 time_point() : __d_(duration::zero()) {}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 explicit time_point(const duration& __d) : __d_(__d) {}
-
-    // conversions
-    template <class _Duration2>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    time_point(const time_point<clock, _Duration2>& t,
-        typename enable_if
-        <
-            is_convertible<_Duration2, duration>::value
-        >::type* = 0)
-            : __d_(t.time_since_epoch()) {}
-
-    // observer
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 duration time_since_epoch() const {return __d_;}
-
-    // arithmetic
-
-    _LIBCPP_INLINE_VISIBILITY time_point& operator+=(const duration& __d) {__d_ += __d; return *this;}
-    _LIBCPP_INLINE_VISIBILITY time_point& operator-=(const duration& __d) {__d_ -= __d; return *this;}
-
-    // special values
-
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR time_point min() {return time_point(duration::min());}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR time_point max() {return time_point(duration::max());}
-};
-
-} // chrono
-
-template <class _Clock, class _Duration1, class _Duration2>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<chrono::time_point<_Clock, _Duration1>,
-                                         chrono::time_point<_Clock, _Duration2> >
-{
-    typedef chrono::time_point<_Clock, typename common_type<_Duration1, _Duration2>::type> type;
-};
-
-namespace chrono {
-
-template <class _ToDuration, class _Clock, class _Duration>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-time_point<_Clock, _ToDuration>
-time_point_cast(const time_point<_Clock, _Duration>& __t)
-{
-    return time_point<_Clock, _ToDuration>(_VSTD::chrono::duration_cast<_ToDuration>(__t.time_since_epoch()));
-}
-
-// time_point ==
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __lhs.time_since_epoch() == __rhs.time_since_epoch();
-}
-
-// time_point !=
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return !(__lhs == __rhs);
-}
-
-// time_point <
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __lhs.time_since_epoch() < __rhs.time_since_epoch();
-}
-
-// time_point >
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __rhs < __lhs;
-}
-
-// time_point <=
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return !(__rhs < __lhs);
-}
-
-// time_point >=
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return !(__lhs < __rhs);
-}
-
-// time_point operator+(time_point x, duration y);
-
-template <class _Clock, class _Duration1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
-operator+(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type> _Tr;
-    return _Tr (__lhs.time_since_epoch() + __rhs);
-}
-
-// time_point operator+(duration x, time_point y);
-
-template <class _Rep1, class _Period1, class _Clock, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-time_point<_Clock, typename common_type<duration<_Rep1, _Period1>, _Duration2>::type>
-operator+(const duration<_Rep1, _Period1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __rhs + __lhs;
-}
-
-// time_point operator-(time_point x, duration y);
-
-template <class _Clock, class _Duration1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
-operator-(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return __lhs + (-__rhs);
-}
-
-// duration operator-(time_point x, time_point y);
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename common_type<_Duration1, _Duration2>::type
-operator-(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __lhs.time_since_epoch() - __rhs.time_since_epoch();
-}
-
-//////////////////////////////////////////////////////////
-/////////////////////// clocks ///////////////////////////
-//////////////////////////////////////////////////////////
-
-class _LIBCPP_TYPE_VIS system_clock
-{
-public:
-    typedef microseconds                     duration;
-    typedef duration::rep                    rep;
-    typedef duration::period                 period;
-    typedef chrono::time_point<system_clock> time_point;
-    static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = false;
-
-    static time_point now() _NOEXCEPT;
-    static time_t     to_time_t  (const time_point& __t) _NOEXCEPT;
-    static time_point from_time_t(time_t __t) _NOEXCEPT;
-};
-
-#ifndef _LIBCPP_HAS_NO_MONOTONIC_CLOCK
-class _LIBCPP_TYPE_VIS steady_clock
-{
-public:
-    typedef nanoseconds                                   duration;
-    typedef duration::rep                                 rep;
-    typedef duration::period                              period;
-    typedef chrono::time_point<steady_clock, duration>    time_point;
-    static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = true;
-
-    static time_point now() _NOEXCEPT;
-};
-
-typedef steady_clock high_resolution_clock;
-#else
-typedef system_clock high_resolution_clock;
-#endif
-
-} // chrono
-
-#if _LIBCPP_STD_VER > 11
-// Suffixes for duration literals [time.duration.literals]
-inline namespace literals
-{ 
-  inline namespace chrono_literals
-  {
-
-    constexpr chrono::hours operator"" h(unsigned long long __h)
-    {
-        return chrono::hours(static_cast<chrono::hours::rep>(__h));
-    }
-
-    constexpr chrono::duration<long double, ratio<3600,1>> operator"" h(long double __h)
-    {
-        return chrono::duration<long double, ratio<3600,1>>(__h);
-    }
-
-
-    constexpr chrono::minutes operator"" min(unsigned long long __m)
-    {
-        return chrono::minutes(static_cast<chrono::minutes::rep>(__m));
-    }
-
-    constexpr chrono::duration<long double, ratio<60,1>> operator"" min(long double __m)
-    {
-        return chrono::duration<long double, ratio<60,1>> (__m);
-    }
-
-
-    constexpr chrono::seconds operator"" s(unsigned long long __s)
-    {
-        return chrono::seconds(static_cast<chrono::seconds::rep>(__s));
-    }
-
-    constexpr chrono::duration<long double> operator"" s(long double __s)
-    {
-        return chrono::duration<long double> (__s);
-    }
-
-
-    constexpr chrono::milliseconds operator"" ms(unsigned long long __ms)
-    {
-        return chrono::milliseconds(static_cast<chrono::milliseconds::rep>(__ms));
-    }
-
-    constexpr chrono::duration<long double, milli> operator"" ms(long double __ms)
-    {
-        return chrono::duration<long double, milli>(__ms);
-    }
-
-
-    constexpr chrono::microseconds operator"" us(unsigned long long __us)
-    {
-        return chrono::microseconds(static_cast<chrono::microseconds::rep>(__us));
-    }
-
-    constexpr chrono::duration<long double, micro> operator"" us(long double __us)
-    {
-        return chrono::duration<long double, micro> (__us);
-    }
-    
-
-    constexpr chrono::nanoseconds operator"" ns(unsigned long long __ns)
-    {
-        return chrono::nanoseconds(static_cast<chrono::nanoseconds::rep>(__ns));
-    }
-
-    constexpr chrono::duration<long double, nano> operator"" ns(long double __ns)
-    {
-        return chrono::duration<long double, nano> (__ns);
-    }
-
-}}
-
-namespace chrono { // hoist the literals into namespace std::chrono
-   using namespace literals::chrono_literals;
-}
-
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CHRONO
diff --git a/include.new/c++/v1/cinttypes b/include.new/c++/v1/cinttypes
deleted file mode 100644
index 786692b..0000000
--- a/include.new/c++/v1/cinttypes
+++ /dev/null
@@ -1,259 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cinttypes --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CINTTYPES
-#define _LIBCPP_CINTTYPES
-
-/*
-    cinttypes synopsis
-
-This entire header is C99 / C++0X
-
-#include <cstdint>  // <cinttypes> includes <cstdint>
-
-Macros:
-
-    PRId8
-    PRId16
-    PRId32
-    PRId64
-
-    PRIdLEAST8
-    PRIdLEAST16
-    PRIdLEAST32
-    PRIdLEAST64
-
-    PRIdFAST8
-    PRIdFAST16
-    PRIdFAST32
-    PRIdFAST64
-
-    PRIdMAX
-    PRIdPTR
-
-    PRIi8
-    PRIi16
-    PRIi32
-    PRIi64
-
-    PRIiLEAST8
-    PRIiLEAST16
-    PRIiLEAST32
-    PRIiLEAST64
-
-    PRIiFAST8
-    PRIiFAST16
-    PRIiFAST32
-    PRIiFAST64
-
-    PRIiMAX
-    PRIiPTR
-
-    PRIo8
-    PRIo16
-    PRIo32
-    PRIo64
-
-    PRIoLEAST8
-    PRIoLEAST16
-    PRIoLEAST32
-    PRIoLEAST64
-
-    PRIoFAST8
-    PRIoFAST16
-    PRIoFAST32
-    PRIoFAST64
-
-    PRIoMAX
-    PRIoPTR
-
-    PRIu8
-    PRIu16
-    PRIu32
-    PRIu64
-
-    PRIuLEAST8
-    PRIuLEAST16
-    PRIuLEAST32
-    PRIuLEAST64
-
-    PRIuFAST8
-    PRIuFAST16
-    PRIuFAST32
-    PRIuFAST64
-
-    PRIuMAX
-    PRIuPTR
-
-    PRIx8
-    PRIx16
-    PRIx32
-    PRIx64
-
-    PRIxLEAST8
-    PRIxLEAST16
-    PRIxLEAST32
-    PRIxLEAST64
-
-    PRIxFAST8
-    PRIxFAST16
-    PRIxFAST32
-    PRIxFAST64
-
-    PRIxMAX
-    PRIxPTR
-
-    PRIX8
-    PRIX16
-    PRIX32
-    PRIX64
-
-    PRIXLEAST8
-    PRIXLEAST16
-    PRIXLEAST32
-    PRIXLEAST64
-
-    PRIXFAST8
-    PRIXFAST16
-    PRIXFAST32
-    PRIXFAST64
-
-    PRIXMAX
-    PRIXPTR
-
-    SCNd8
-    SCNd16
-    SCNd32
-    SCNd64
-
-    SCNdLEAST8
-    SCNdLEAST16
-    SCNdLEAST32
-    SCNdLEAST64
-
-    SCNdFAST8
-    SCNdFAST16
-    SCNdFAST32
-    SCNdFAST64
-
-    SCNdMAX
-    SCNdPTR
-
-    SCNi8
-    SCNi16
-    SCNi32
-    SCNi64
-
-    SCNiLEAST8
-    SCNiLEAST16
-    SCNiLEAST32
-    SCNiLEAST64
-
-    SCNiFAST8
-    SCNiFAST16
-    SCNiFAST32
-    SCNiFAST64
-
-    SCNiMAX
-    SCNiPTR
-
-    SCNo8
-    SCNo16
-    SCNo32
-    SCNo64
-
-    SCNoLEAST8
-    SCNoLEAST16
-    SCNoLEAST32
-    SCNoLEAST64
-
-    SCNoFAST8
-    SCNoFAST16
-    SCNoFAST32
-    SCNoFAST64
-
-    SCNoMAX
-    SCNoPTR
-
-    SCNu8
-    SCNu16
-    SCNu32
-    SCNu64
-
-    SCNuLEAST8
-    SCNuLEAST16
-    SCNuLEAST32
-    SCNuLEAST64
-
-    SCNuFAST8
-    SCNuFAST16
-    SCNuFAST32
-    SCNuFAST64
-
-    SCNuMAX
-    SCNuPTR
-
-    SCNx8
-    SCNx16
-    SCNx32
-    SCNx64
-
-    SCNxLEAST8
-    SCNxLEAST16
-    SCNxLEAST32
-    SCNxLEAST64
-
-    SCNxFAST8
-    SCNxFAST16
-    SCNxFAST32
-    SCNxFAST64
-
-    SCNxMAX
-    SCNxPTR
-
-namespace std
-{
-
-Types:
-
-    imaxdiv_t
-
-intmax_t  imaxabs(intmax_t j);
-imaxdiv_t imaxdiv(intmax_t numer, intmax_t denom);
-intmax_t  strtoimax(const char* restrict nptr, char** restrict endptr, int base);
-uintmax_t strtoumax(const char* restrict nptr, char** restrict endptr, int base);
-intmax_t  wcstoimax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
-uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
-
-}  // std
-*/
-
-#include <__config>
-#include <cstdint>
-#include <inttypes.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using::imaxdiv_t;
-
-using::imaxabs;
-using::imaxdiv;
-using::strtoimax;
-using::strtoumax;
-using::wcstoimax;
-using::wcstoumax;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CINTTYPES
diff --git a/include.new/c++/v1/ciso646 b/include.new/c++/v1/ciso646
deleted file mode 100644
index b2efc72..0000000
--- a/include.new/c++/v1/ciso646
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- ciso646 ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CISO646
-#define _LIBCPP_CISO646
-
-/*
-    ciso646 synopsis
-
-*/
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_CISO646
diff --git a/include.new/c++/v1/climits b/include.new/c++/v1/climits
deleted file mode 100644
index 81ffecd..0000000
--- a/include.new/c++/v1/climits
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- climits ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CLIMITS
-#define _LIBCPP_CLIMITS
-
-/*
-    climits synopsis
-
-Macros:
-
-    CHAR_BIT
-    SCHAR_MIN
-    SCHAR_MAX
-    UCHAR_MAX
-    CHAR_MIN
-    CHAR_MAX
-    MB_LEN_MAX
-    SHRT_MIN
-    SHRT_MAX
-    USHRT_MAX
-    INT_MIN
-    INT_MAX
-    UINT_MAX
-    LONG_MIN
-    LONG_MAX
-    ULONG_MAX
-    LLONG_MIN   // C99
-    LLONG_MAX   // C99
-    ULLONG_MAX  // C99
-
-*/
-
-#include <__config>
-#include <limits.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_CLIMITS
diff --git a/include.new/c++/v1/clocale b/include.new/c++/v1/clocale
deleted file mode 100644
index f8b8f0d..0000000
--- a/include.new/c++/v1/clocale
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- clocale ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CLOCALE
-#define _LIBCPP_CLOCALE
-
-/*
-    clocale synopsis
-
-Macros:
-
-    LC_ALL
-    LC_COLLATE
-    LC_CTYPE
-    LC_MONETARY
-    LC_NUMERIC
-    LC_TIME
-    NULL
-
-namespace std
-{
-
-struct lconv;
-char* setlocale(int category, const char* locale);
-lconv* localeconv();
-
-}  // std
-
-*/
-
-#include <__config>
-#include <locale.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::lconv;
-using ::setlocale;
-using ::localeconv;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CLOCALE
diff --git a/include.new/c++/v1/cmath b/include.new/c++/v1/cmath
deleted file mode 100644
index d3aa4be..0000000
--- a/include.new/c++/v1/cmath
+++ /dev/null
@@ -1,1685 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- cmath -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CMATH
-#define _LIBCPP_CMATH
-
-/*
-    cmath synopsis
-
-Macros:
-
-    HUGE_VAL
-    HUGE_VALF               // C99
-    HUGE_VALL               // C99
-    INFINITY                // C99
-    NAN                     // C99
-    FP_INFINITE             // C99
-    FP_NAN                  // C99
-    FP_NORMAL               // C99
-    FP_SUBNORMAL            // C99
-    FP_ZERO                 // C99
-    FP_FAST_FMA             // C99
-    FP_FAST_FMAF            // C99
-    FP_FAST_FMAL            // C99
-    FP_ILOGB0               // C99
-    FP_ILOGBNAN             // C99
-    MATH_ERRNO              // C99
-    MATH_ERREXCEPT          // C99
-    math_errhandling        // C99
-
-namespace std
-{
-
-Types:
-
-    float_t                 // C99
-    double_t                // C99
-
-// C90
-
-floating_point abs(floating_point x);
-
-floating_point acos (arithmetic x);
-float          acosf(float x);
-long double    acosl(long double x);
-
-floating_point asin (arithmetic x);
-float          asinf(float x);
-long double    asinl(long double x);
-
-floating_point atan (arithmetic x);
-float          atanf(float x);
-long double    atanl(long double x);
-
-floating_point atan2 (arithmetic y, arithmetic x);
-float          atan2f(float y, float x);
-long double    atan2l(long double y, long double x);
-
-floating_point ceil (arithmetic x);
-float          ceilf(float x);
-long double    ceill(long double x);
-
-floating_point cos (arithmetic x);
-float          cosf(float x);
-long double    cosl(long double x);
-
-floating_point cosh (arithmetic x);
-float          coshf(float x);
-long double    coshl(long double x);
-
-floating_point exp (arithmetic x);
-float          expf(float x);
-long double    expl(long double x);
-
-floating_point fabs (arithmetic x);
-float          fabsf(float x);
-long double    fabsl(long double x);
-
-floating_point floor (arithmetic x);
-float          floorf(float x);
-long double    floorl(long double x);
-
-floating_point fmod (arithmetic x, arithmetic y);
-float          fmodf(float x, float y);
-long double    fmodl(long double x, long double y);
-
-floating_point frexp (arithmetic value, int* exp);
-float          frexpf(float value, int* exp);
-long double    frexpl(long double value, int* exp);
-
-floating_point ldexp (arithmetic value, int exp);
-float          ldexpf(float value, int exp);
-long double    ldexpl(long double value, int exp);
-
-floating_point log (arithmetic x);
-float          logf(float x);
-long double    logl(long double x);
-
-floating_point log10 (arithmetic x);
-float          log10f(float x);
-long double    log10l(long double x);
-
-floating_point modf (floating_point value, floating_point* iptr);
-float          modff(float value, float* iptr);
-long double    modfl(long double value, long double* iptr);
-
-floating_point pow (arithmetic x, arithmetic y);
-float          powf(float x, float y);
-long double    powl(long double x, long double y);
-
-floating_point sin (arithmetic x);
-float          sinf(float x);
-long double    sinl(long double x);
-
-floating_point sinh (arithmetic x);
-float          sinhf(float x);
-long double    sinhl(long double x);
-
-floating_point sqrt (arithmetic x);
-float          sqrtf(float x);
-long double    sqrtl(long double x);
-
-floating_point tan (arithmetic x);
-float          tanf(float x);
-long double    tanl(long double x);
-
-floating_point tanh (arithmetic x);
-float          tanhf(float x);
-long double    tanhl(long double x);
-
-//  C99
-
-bool signbit(arithmetic x);
-
-int fpclassify(arithmetic x);
-
-bool isfinite(arithmetic x);
-bool isinf(arithmetic x);
-bool isnan(arithmetic x);
-bool isnormal(arithmetic x);
-
-bool isgreater(arithmetic x, arithmetic y);
-bool isgreaterequal(arithmetic x, arithmetic y);
-bool isless(arithmetic x, arithmetic y);
-bool islessequal(arithmetic x, arithmetic y);
-bool islessgreater(arithmetic x, arithmetic y);
-bool isunordered(arithmetic x, arithmetic y);
-
-floating_point acosh (arithmetic x);
-float          acoshf(float x);
-long double    acoshl(long double x);
-
-floating_point asinh (arithmetic x);
-float          asinhf(float x);
-long double    asinhl(long double x);
-
-floating_point atanh (arithmetic x);
-float          atanhf(float x);
-long double    atanhl(long double x);
-
-floating_point cbrt (arithmetic x);
-float          cbrtf(float x);
-long double    cbrtl(long double x);
-
-floating_point copysign (arithmetic x, arithmetic y);
-float          copysignf(float x, float y);
-long double    copysignl(long double x, long double y);
-
-floating_point erf (arithmetic x);
-float          erff(float x);
-long double    erfl(long double x);
-
-floating_point erfc (arithmetic x);
-float          erfcf(float x);
-long double    erfcl(long double x);
-
-floating_point exp2 (arithmetic x);
-float          exp2f(float x);
-long double    exp2l(long double x);
-
-floating_point expm1 (arithmetic x);
-float          expm1f(float x);
-long double    expm1l(long double x);
-
-floating_point fdim (arithmetic x, arithmetic y);
-float          fdimf(float x, float y);
-long double    fdiml(long double x, long double y);
-
-floating_point fma (arithmetic x, arithmetic y, arithmetic z);
-float          fmaf(float x, float y, float z);
-long double    fmal(long double x, long double y, long double z);
-
-floating_point fmax (arithmetic x, arithmetic y);
-float          fmaxf(float x, float y);
-long double    fmaxl(long double x, long double y);
-
-floating_point fmin (arithmetic x, arithmetic y);
-float          fminf(float x, float y);
-long double    fminl(long double x, long double y);
-
-floating_point hypot (arithmetic x, arithmetic y);
-float          hypotf(float x, float y);
-long double    hypotl(long double x, long double y);
-
-int ilogb (arithmetic x);
-int ilogbf(float x);
-int ilogbl(long double x);
-
-floating_point lgamma (arithmetic x);
-float          lgammaf(float x);
-long double    lgammal(long double x);
-
-long long llrint (arithmetic x);
-long long llrintf(float x);
-long long llrintl(long double x);
-
-long long llround (arithmetic x);
-long long llroundf(float x);
-long long llroundl(long double x);
-
-floating_point log1p (arithmetic x);
-float          log1pf(float x);
-long double    log1pl(long double x);
-
-floating_point log2 (arithmetic x);
-float          log2f(float x);
-long double    log2l(long double x);
-
-floating_point logb (arithmetic x);
-float          logbf(float x);
-long double    logbl(long double x);
-
-long lrint (arithmetic x);
-long lrintf(float x);
-long lrintl(long double x);
-
-long lround (arithmetic x);
-long lroundf(float x);
-long lroundl(long double x);
-
-double      nan (const char* str);
-float       nanf(const char* str);
-long double nanl(const char* str);
-
-floating_point nearbyint (arithmetic x);
-float          nearbyintf(float x);
-long double    nearbyintl(long double x);
-
-floating_point nextafter (arithmetic x, arithmetic y);
-float          nextafterf(float x, float y);
-long double    nextafterl(long double x, long double y);
-
-floating_point nexttoward (arithmetic x, long double y);
-float          nexttowardf(float x, long double y);
-long double    nexttowardl(long double x, long double y);
-
-floating_point remainder (arithmetic x, arithmetic y);
-float          remainderf(float x, float y);
-long double    remainderl(long double x, long double y);
-
-floating_point remquo (arithmetic x, arithmetic y, int* pquo);
-float          remquof(float x, float y, int* pquo);
-long double    remquol(long double x, long double y, int* pquo);
-
-floating_point rint (arithmetic x);
-float          rintf(float x);
-long double    rintl(long double x);
-
-floating_point round (arithmetic x);
-float          roundf(float x);
-long double    roundl(long double x);
-
-floating_point scalbln (arithmetic x, long ex);
-float          scalblnf(float x, long ex);
-long double    scalblnl(long double x, long ex);
-
-floating_point scalbn (arithmetic x, int ex);
-float          scalbnf(float x, int ex);
-long double    scalbnl(long double x, int ex);
-
-floating_point tgamma (arithmetic x);
-float          tgammaf(float x);
-long double    tgammal(long double x);
-
-floating_point trunc (arithmetic x);
-float          truncf(float x);
-long double    truncl(long double x);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <math.h>
-#include <type_traits>
-
-#ifdef _LIBCPP_MSVCRT
-#include "support/win32/math_win32.h"
-#endif
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-// signbit
-
-#ifdef signbit
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_signbit(_A1 __lcpp_x) _NOEXCEPT
-{
-    return signbit(__lcpp_x);
-}
-
-#undef signbit
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-signbit(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_signbit((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // signbit
-
-// fpclassify
-
-#ifdef fpclassify
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-int
-__libcpp_fpclassify(_A1 __lcpp_x) _NOEXCEPT
-{
-    return fpclassify(__lcpp_x);
-}
-
-#undef fpclassify
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, int>::type
-fpclassify(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_fpclassify((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // fpclassify
-
-// isfinite
-
-#ifdef isfinite
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isfinite(_A1 __lcpp_x) _NOEXCEPT
-{
-    return isfinite(__lcpp_x);
-}
-
-#undef isfinite
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-isfinite(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_isfinite((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // isfinite
-
-// isinf
-
-#ifdef isinf
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isinf(_A1 __lcpp_x) _NOEXCEPT
-{
-    return isinf(__lcpp_x);
-}
-
-#undef isinf
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-isinf(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_isinf((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // isinf
-
-// isnan
-
-#ifdef isnan
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isnan(_A1 __lcpp_x) _NOEXCEPT
-{
-    return isnan(__lcpp_x);
-}
-
-#undef isnan
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-isnan(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_isnan((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // isnan
-
-// isnormal
-
-#ifdef isnormal
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isnormal(_A1 __lcpp_x) _NOEXCEPT
-{
-    return isnormal(__lcpp_x);
-}
-
-#undef isnormal
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-isnormal(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_isnormal((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // isnormal
-
-// isgreater
-
-#ifdef isgreater
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return isgreater(__lcpp_x, __lcpp_y);
-}
-
-#undef isgreater
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-isgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_isgreater((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // isgreater
-
-// isgreaterequal
-
-#ifdef isgreaterequal
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isgreaterequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return isgreaterequal(__lcpp_x, __lcpp_y);
-}
-
-#undef isgreaterequal
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-isgreaterequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_isgreaterequal((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // isgreaterequal
-
-// isless
-
-#ifdef isless
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isless(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return isless(__lcpp_x, __lcpp_y);
-}
-
-#undef isless
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-isless(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_isless((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // isless
-
-// islessequal
-
-#ifdef islessequal
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_islessequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return islessequal(__lcpp_x, __lcpp_y);
-}
-
-#undef islessequal
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-islessequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_islessequal((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // islessequal
-
-// islessgreater
-
-#ifdef islessgreater
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_islessgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return islessgreater(__lcpp_x, __lcpp_y);
-}
-
-#undef islessgreater
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-islessgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_islessgreater((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // islessgreater
-
-// isunordered
-
-#ifdef isunordered
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isunordered(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return isunordered(__lcpp_x, __lcpp_y);
-}
-
-#undef isunordered
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-isunordered(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_isunordered((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // isunordered
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::signbit;
-using ::fpclassify;
-using ::isfinite;
-using ::isinf;
-using ::isnan;
-using ::isnormal;
-using ::isgreater;
-using ::isgreaterequal;
-using ::isless;
-using ::islessequal;
-using ::islessgreater;
-using ::isunordered;
-using ::isunordered;
-
-using ::float_t;
-using ::double_t;
-
-// abs
-
-#if !defined(_AIX)
-inline _LIBCPP_INLINE_VISIBILITY
-float
-abs(float __lcpp_x) _NOEXCEPT {return fabsf(__lcpp_x);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-double
-abs(double __lcpp_x) _NOEXCEPT {return fabs(__lcpp_x);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-long double
-abs(long double __lcpp_x) _NOEXCEPT {return fabsl(__lcpp_x);}
-#endif // !defined(_AIX)
-
-#ifndef __sun__
-
-// acos
-
-using ::acos;
-using ::acosf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       acos(float __lcpp_x) _NOEXCEPT       {return acosf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double acos(long double __lcpp_x) _NOEXCEPT {return acosl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-acos(_A1 __lcpp_x) _NOEXCEPT {return acos((double)__lcpp_x);}
-
-// asin
-
-using ::asin;
-using ::asinf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       asin(float __lcpp_x) _NOEXCEPT       {return asinf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double asin(long double __lcpp_x) _NOEXCEPT {return asinl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-asin(_A1 __lcpp_x) _NOEXCEPT {return asin((double)__lcpp_x);}
-
-// atan
-
-using ::atan;
-using ::atanf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       atan(float __lcpp_x) _NOEXCEPT       {return atanf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double atan(long double __lcpp_x) _NOEXCEPT {return atanl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-atan(_A1 __lcpp_x) _NOEXCEPT {return atan((double)__lcpp_x);}
-
-// atan2
-
-using ::atan2;
-using ::atan2f;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       atan2(float __lcpp_y, float __lcpp_x) _NOEXCEPT             {return atan2f(__lcpp_y, __lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double atan2(long double __lcpp_y, long double __lcpp_x) _NOEXCEPT {return atan2l(__lcpp_y, __lcpp_x);}
-#endif
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-atan2(_A1 __lcpp_y, _A2 __lcpp_x) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return atan2((__result_type)__lcpp_y, (__result_type)__lcpp_x);
-}
-
-// ceil
-
-using ::ceil;
-using ::ceilf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       ceil(float __lcpp_x) _NOEXCEPT       {return ceilf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double ceil(long double __lcpp_x) _NOEXCEPT {return ceill(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-ceil(_A1 __lcpp_x) _NOEXCEPT {return ceil((double)__lcpp_x);}
-
-// cos
-
-using ::cos;
-using ::cosf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       cos(float __lcpp_x) _NOEXCEPT       {return cosf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double cos(long double __lcpp_x) _NOEXCEPT {return cosl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-cos(_A1 __lcpp_x) _NOEXCEPT {return cos((double)__lcpp_x);}
-
-// cosh
-
-using ::cosh;
-using ::coshf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       cosh(float __lcpp_x) _NOEXCEPT       {return coshf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double cosh(long double __lcpp_x) _NOEXCEPT {return coshl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-cosh(_A1 __lcpp_x) _NOEXCEPT {return cosh((double)__lcpp_x);}
-
-#endif // __sun__
-// exp
-
-using ::exp;
-using ::expf;
-
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       exp(float __lcpp_x) _NOEXCEPT       {return expf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double exp(long double __lcpp_x) _NOEXCEPT {return expl(__lcpp_x);}
-#endif
-
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-exp(_A1 __lcpp_x) _NOEXCEPT {return exp((double)__lcpp_x);}
-
-// fabs
-
-using ::fabs;
-using ::fabsf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       fabs(float __lcpp_x) _NOEXCEPT       {return fabsf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double fabs(long double __lcpp_x) _NOEXCEPT {return fabsl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-fabs(_A1 __lcpp_x) _NOEXCEPT {return fabs((double)__lcpp_x);}
-
-// floor
-
-using ::floor;
-using ::floorf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       floor(float __lcpp_x) _NOEXCEPT       {return floorf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double floor(long double __lcpp_x) _NOEXCEPT {return floorl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-floor(_A1 __lcpp_x) _NOEXCEPT {return floor((double)__lcpp_x);}
-
-// fmod
-
-#endif //__sun__
-using ::fmod;
-using ::fmodf;
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       fmod(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return fmodf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double fmod(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return fmodl(__lcpp_x, __lcpp_y);}
-#endif
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-fmod(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return fmod((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-
-// frexp
-
-using ::frexp;
-using ::frexpf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       frexp(float __lcpp_x, int* __lcpp_e) _NOEXCEPT       {return frexpf(__lcpp_x, __lcpp_e);}
-inline _LIBCPP_INLINE_VISIBILITY long double frexp(long double __lcpp_x, int* __lcpp_e) _NOEXCEPT {return frexpl(__lcpp_x, __lcpp_e);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-frexp(_A1 __lcpp_x, int* __lcpp_e) _NOEXCEPT {return frexp((double)__lcpp_x, __lcpp_e);}
-
-// ldexp
-
-using ::ldexp;
-using ::ldexpf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       ldexp(float __lcpp_x, int __lcpp_e) _NOEXCEPT       {return ldexpf(__lcpp_x, __lcpp_e);}
-inline _LIBCPP_INLINE_VISIBILITY long double ldexp(long double __lcpp_x, int __lcpp_e) _NOEXCEPT {return ldexpl(__lcpp_x, __lcpp_e);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-ldexp(_A1 __lcpp_x, int __lcpp_e) _NOEXCEPT {return ldexp((double)__lcpp_x, __lcpp_e);}
-
-// log
-
-#endif // __sun__
-using ::log;
-using ::logf;
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       log(float __lcpp_x) _NOEXCEPT       {return logf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double log(long double __lcpp_x) _NOEXCEPT {return logl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-log(_A1 __lcpp_x) _NOEXCEPT {return log((double)__lcpp_x);}
-
-
-// log10
-
-using ::log10;
-using ::log10f;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       log10(float __lcpp_x) _NOEXCEPT       {return log10f(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double log10(long double __lcpp_x) _NOEXCEPT {return log10l(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-log10(_A1 __lcpp_x) _NOEXCEPT {return log10((double)__lcpp_x);}
-
-// modf
-
-using ::modf;
-using ::modff;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       modf(float __lcpp_x, float* __lcpp_y) _NOEXCEPT             {return modff(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double modf(long double __lcpp_x, long double* __lcpp_y) _NOEXCEPT {return modfl(__lcpp_x, __lcpp_y);}
-#endif
-
-// pow
-
-#endif // __sun__ 
-using ::pow;
-using ::powf;
-
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       pow(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return powf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double pow(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return powl(__lcpp_x, __lcpp_y);}
-#endif
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-pow(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return pow((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// sin
-
-using ::sin;
-using ::sinf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       sin(float __lcpp_x) _NOEXCEPT       {return sinf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double sin(long double __lcpp_x) _NOEXCEPT {return sinl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-sin(_A1 __lcpp_x) _NOEXCEPT {return sin((double)__lcpp_x);}
-
-// sinh
-
-using ::sinh;
-using ::sinhf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       sinh(float __lcpp_x) _NOEXCEPT       {return sinhf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double sinh(long double __lcpp_x) _NOEXCEPT {return sinhl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-sinh(_A1 __lcpp_x) _NOEXCEPT {return sinh((double)__lcpp_x);}
-
-// sqrt
-
-#endif // __sun__
-using ::sqrt;
-using ::sqrtf;
-
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(__sun__) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       sqrt(float __lcpp_x) _NOEXCEPT       {return sqrtf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double sqrt(long double __lcpp_x) _NOEXCEPT {return sqrtl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-sqrt(_A1 __lcpp_x) _NOEXCEPT {return sqrt((double)__lcpp_x);}
-
-// tan
-
-using ::tan;
-using ::tanf;
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       tan(float __lcpp_x) _NOEXCEPT       {return tanf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double tan(long double __lcpp_x) _NOEXCEPT {return tanl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-tan(_A1 __lcpp_x) _NOEXCEPT {return tan((double)__lcpp_x);}
-
-// tanh
-
-using ::tanh;
-using ::tanhf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       tanh(float __lcpp_x) _NOEXCEPT       {return tanhf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double tanh(long double __lcpp_x) _NOEXCEPT {return tanhl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-tanh(_A1 __lcpp_x) _NOEXCEPT {return tanh((double)__lcpp_x);}
-
-// acosh
-
-#ifndef _LIBCPP_MSVCRT
-using ::acosh;
-using ::acoshf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       acosh(float __lcpp_x) _NOEXCEPT       {return acoshf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double acosh(long double __lcpp_x) _NOEXCEPT {return acoshl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-acosh(_A1 __lcpp_x) _NOEXCEPT {return acosh((double)__lcpp_x);}
-#endif
-
-// asinh
-
-#ifndef _LIBCPP_MSVCRT
-using ::asinh;
-using ::asinhf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       asinh(float __lcpp_x) _NOEXCEPT       {return asinhf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double asinh(long double __lcpp_x) _NOEXCEPT {return asinhl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-asinh(_A1 __lcpp_x) _NOEXCEPT {return asinh((double)__lcpp_x);}
-#endif
-
-// atanh
-
-#ifndef _LIBCPP_MSVCRT
-using ::atanh;
-using ::atanhf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       atanh(float __lcpp_x) _NOEXCEPT       {return atanhf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double atanh(long double __lcpp_x) _NOEXCEPT {return atanhl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-atanh(_A1 __lcpp_x) _NOEXCEPT {return atanh((double)__lcpp_x);}
-#endif
-
-// cbrt
-
-#ifndef _LIBCPP_MSVCRT
-using ::cbrt;
-using ::cbrtf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       cbrt(float __lcpp_x) _NOEXCEPT       {return cbrtf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double cbrt(long double __lcpp_x) _NOEXCEPT {return cbrtl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-cbrt(_A1 __lcpp_x) _NOEXCEPT {return cbrt((double)__lcpp_x);}
-#endif
-
-// copysign
-
-using ::copysign;
-using ::copysignf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       copysign(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return copysignf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double copysign(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return copysignl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-copysign(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return copysign((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-#ifndef _LIBCPP_MSVCRT
-
-// erf
-
-using ::erf;
-using ::erff;
-
-inline _LIBCPP_INLINE_VISIBILITY float       erf(float __lcpp_x) _NOEXCEPT       {return erff(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double erf(long double __lcpp_x) _NOEXCEPT {return erfl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-erf(_A1 __lcpp_x) _NOEXCEPT {return erf((double)__lcpp_x);}
-
-// erfc
-
-using ::erfc;
-using ::erfcf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       erfc(float __lcpp_x) _NOEXCEPT       {return erfcf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double erfc(long double __lcpp_x) _NOEXCEPT {return erfcl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-erfc(_A1 __lcpp_x) _NOEXCEPT {return erfc((double)__lcpp_x);}
-
-// exp2
-
-using ::exp2;
-using ::exp2f;
-
-inline _LIBCPP_INLINE_VISIBILITY float       exp2(float __lcpp_x) _NOEXCEPT       {return exp2f(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double exp2(long double __lcpp_x) _NOEXCEPT {return exp2l(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-exp2(_A1 __lcpp_x) _NOEXCEPT {return exp2((double)__lcpp_x);}
-
-// expm1
-
-using ::expm1;
-using ::expm1f;
-
-inline _LIBCPP_INLINE_VISIBILITY float       expm1(float __lcpp_x) _NOEXCEPT       {return expm1f(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double expm1(long double __lcpp_x) _NOEXCEPT {return expm1l(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-expm1(_A1 __lcpp_x) _NOEXCEPT {return expm1((double)__lcpp_x);}
-
-// fdim
-
-using ::fdim;
-using ::fdimf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       fdim(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return fdimf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double fdim(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return fdiml(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-fdim(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return fdim((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// fma
-
-using ::fmaf;
-using ::fma;
-
-inline _LIBCPP_INLINE_VISIBILITY float       fma(float __lcpp_x, float __lcpp_y, float __lcpp_z) _NOEXCEPT                   {return fmaf(__lcpp_x, __lcpp_y, __lcpp_z);}
-inline _LIBCPP_INLINE_VISIBILITY long double fma(long double __lcpp_x, long double __lcpp_y, long double __lcpp_z) _NOEXCEPT {return fmal(__lcpp_x, __lcpp_y, __lcpp_z);}
-
-template <class _A1, class _A2, class _A3>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value &&
-    is_arithmetic<_A3>::value,
-    __promote<_A1, _A2, _A3>
->::type
-fma(_A1 __lcpp_x, _A2 __lcpp_y, _A3 __lcpp_z) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2, _A3>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value &&
-                      is_same<_A3, __result_type>::value)), "");
-    return fma((__result_type)__lcpp_x, (__result_type)__lcpp_y, (__result_type)__lcpp_z);
-}
-
-// fmax
-
-using ::fmax;
-using ::fmaxf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       fmax(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return fmaxf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double fmax(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return fmaxl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-fmax(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return fmax((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// fmin
-
-using ::fmin;
-using ::fminf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       fmin(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return fminf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double fmin(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return fminl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-fmin(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return fmin((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// hypot
-
-using ::hypot;
-using ::hypotf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       hypot(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return hypotf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double hypot(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return hypotl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-hypot(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return hypot((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// ilogb
-
-using ::ilogb;
-using ::ilogbf;
-
-inline _LIBCPP_INLINE_VISIBILITY int ilogb(float __lcpp_x) _NOEXCEPT       {return ilogbf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY int ilogb(long double __lcpp_x) _NOEXCEPT {return ilogbl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, int>::type
-ilogb(_A1 __lcpp_x) _NOEXCEPT {return ilogb((double)__lcpp_x);}
-
-// lgamma
-
-using ::lgamma;
-using ::lgammaf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       lgamma(float __lcpp_x) _NOEXCEPT       {return lgammaf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double lgamma(long double __lcpp_x) _NOEXCEPT {return lgammal(__lcpp_x);}
-
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-lgamma(_A1 __lcpp_x) _NOEXCEPT {return lgamma((double)__lcpp_x);}
-
-
-// llrint
-
-using ::llrint;
-using ::llrintf;
-
-inline _LIBCPP_INLINE_VISIBILITY long long llrint(float __lcpp_x) _NOEXCEPT       {return llrintf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long long llrint(long double __lcpp_x) _NOEXCEPT {return llrintl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, long long>::type
-llrint(_A1 __lcpp_x) _NOEXCEPT {return llrint((double)__lcpp_x);}
-
-// llround
-
-using ::llround;
-using ::llroundf;
-
-inline _LIBCPP_INLINE_VISIBILITY long long llround(float __lcpp_x) _NOEXCEPT       {return llroundf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long long llround(long double __lcpp_x) _NOEXCEPT {return llroundl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, long long>::type
-llround(_A1 __lcpp_x) _NOEXCEPT {return llround((double)__lcpp_x);}
-
-// log1p
-
-using ::log1p;
-using ::log1pf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       log1p(float __lcpp_x) _NOEXCEPT       {return log1pf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double log1p(long double __lcpp_x) _NOEXCEPT {return log1pl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-log1p(_A1 __lcpp_x) _NOEXCEPT {return log1p((double)__lcpp_x);}
-
-// log2
-
-using ::log2;
-using ::log2f;
-
-inline _LIBCPP_INLINE_VISIBILITY float       log2(float __lcpp_x) _NOEXCEPT       {return log2f(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double log2(long double __lcpp_x) _NOEXCEPT {return log2l(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-log2(_A1 __lcpp_x) _NOEXCEPT {return log2((double)__lcpp_x);}
-
-// logb
-
-using ::logb;
-using ::logbf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       logb(float __lcpp_x) _NOEXCEPT       {return logbf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double logb(long double __lcpp_x) _NOEXCEPT {return logbl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-logb(_A1 __lcpp_x) _NOEXCEPT {return logb((double)__lcpp_x);}
-
-// lrint
-
-using ::lrint;
-using ::lrintf;
-
-inline _LIBCPP_INLINE_VISIBILITY long lrint(float __lcpp_x) _NOEXCEPT       {return lrintf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long lrint(long double __lcpp_x) _NOEXCEPT {return lrintl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, long>::type
-lrint(_A1 __lcpp_x) _NOEXCEPT {return lrint((double)__lcpp_x);}
-
-// lround
-
-using ::lround;
-using ::lroundf;
-
-inline _LIBCPP_INLINE_VISIBILITY long lround(float __lcpp_x) _NOEXCEPT       {return lroundf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long lround(long double __lcpp_x) _NOEXCEPT {return lroundl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, long>::type
-lround(_A1 __lcpp_x) _NOEXCEPT {return lround((double)__lcpp_x);}
-
-#endif // _LIBCPP_MSVCRT
-#endif // __sun__
-
-// nan
-
-#ifndef _LIBCPP_MSVCRT
-using ::nan;
-using ::nanf;
-#endif // _LIBCPP_MSVCRT
-
-#ifndef __sun__
-#ifndef _LIBCPP_MSVCRT
-
-// nearbyint
-
-using ::nearbyint;
-using ::nearbyintf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       nearbyint(float __lcpp_x) _NOEXCEPT       {return nearbyintf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double nearbyint(long double __lcpp_x) _NOEXCEPT {return nearbyintl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-nearbyint(_A1 __lcpp_x) _NOEXCEPT {return nearbyint((double)__lcpp_x);}
-
-// nextafter
-
-using ::nextafter;
-using ::nextafterf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       nextafter(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return nextafterf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double nextafter(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return nextafterl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-nextafter(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return nextafter((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// nexttoward
-
-using ::nexttoward;
-using ::nexttowardf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       nexttoward(float __lcpp_x, long double __lcpp_y) _NOEXCEPT       {return nexttowardf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double nexttoward(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return nexttowardl(__lcpp_x, __lcpp_y);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-nexttoward(_A1 __lcpp_x, long double __lcpp_y) _NOEXCEPT {return nexttoward((double)__lcpp_x, __lcpp_y);}
-
-// remainder
-
-using ::remainder;
-using ::remainderf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       remainder(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return remainderf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double remainder(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return remainderl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-remainder(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return remainder((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// remquo
-
-using ::remquo;
-using ::remquof;
-
-inline _LIBCPP_INLINE_VISIBILITY float       remquo(float __lcpp_x, float __lcpp_y, int* __lcpp_z) _NOEXCEPT             {return remquof(__lcpp_x, __lcpp_y, __lcpp_z);}
-inline _LIBCPP_INLINE_VISIBILITY long double remquo(long double __lcpp_x, long double __lcpp_y, int* __lcpp_z) _NOEXCEPT {return remquol(__lcpp_x, __lcpp_y, __lcpp_z);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-remquo(_A1 __lcpp_x, _A2 __lcpp_y, int* __lcpp_z) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return remquo((__result_type)__lcpp_x, (__result_type)__lcpp_y, __lcpp_z);
-}
-
-// rint
-
-using ::rint;
-using ::rintf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       rint(float __lcpp_x) _NOEXCEPT       {return rintf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double rint(long double __lcpp_x) _NOEXCEPT {return rintl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-rint(_A1 __lcpp_x) _NOEXCEPT {return rint((double)__lcpp_x);}
-
-// round
-
-using ::round;
-using ::roundf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       round(float __lcpp_x) _NOEXCEPT       {return roundf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double round(long double __lcpp_x) _NOEXCEPT {return roundl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-round(_A1 __lcpp_x) _NOEXCEPT {return round((double)__lcpp_x);}
-
-// scalbln
-
-using ::scalbln;
-using ::scalblnf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       scalbln(float __lcpp_x, long __lcpp_y) _NOEXCEPT       {return scalblnf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double scalbln(long double __lcpp_x, long __lcpp_y) _NOEXCEPT {return scalblnl(__lcpp_x, __lcpp_y);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-scalbln(_A1 __lcpp_x, long __lcpp_y) _NOEXCEPT {return scalbln((double)__lcpp_x, __lcpp_y);}
-
-// scalbn
-
-using ::scalbn;
-using ::scalbnf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       scalbn(float __lcpp_x, int __lcpp_y) _NOEXCEPT       {return scalbnf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double scalbn(long double __lcpp_x, int __lcpp_y) _NOEXCEPT {return scalbnl(__lcpp_x, __lcpp_y);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-scalbn(_A1 __lcpp_x, int __lcpp_y) _NOEXCEPT {return scalbn((double)__lcpp_x, __lcpp_y);}
-
-// tgamma
-
-using ::tgamma;
-using ::tgammaf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       tgamma(float __lcpp_x) _NOEXCEPT       {return tgammaf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double tgamma(long double __lcpp_x) _NOEXCEPT {return tgammal(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-tgamma(_A1 __lcpp_x) _NOEXCEPT {return tgamma((double)__lcpp_x);}
-
-// trunc
-
-using ::trunc;
-using ::truncf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       trunc(float __lcpp_x) _NOEXCEPT       {return truncf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double trunc(long double __lcpp_x) _NOEXCEPT {return truncl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-trunc(_A1 __lcpp_x) _NOEXCEPT {return trunc((double)__lcpp_x);}
-
-#endif // !_LIBCPP_MSVCRT
-
-using ::acosl;
-using ::asinl;
-using ::atanl;
-using ::atan2l;
-using ::ceill;
-using ::cosl;
-using ::coshl;
-using ::expl;
-using ::fabsl;
-using ::floorl;
-using ::fmodl;
-using ::frexpl;
-using ::ldexpl;
-using ::logl;
-using ::log10l;
-using ::modfl;
-using ::powl;
-using ::sinl;
-using ::sinhl;
-using ::sqrtl;
-using ::tanl;
-#ifndef _LIBCPP_MSVCRT
-using ::tanhl;
-using ::acoshl;
-using ::asinhl;
-using ::atanhl;
-using ::cbrtl;
-#endif  // !_LIBCPP_MSVCRT
-using ::copysignl;
-#ifndef _LIBCPP_MSVCRT
-using ::erfl;
-using ::erfcl;
-using ::exp2l;
-using ::expm1l;
-using ::fdiml;
-using ::fmal;
-using ::fmaxl;
-using ::fminl;
-using ::hypotl;
-using ::ilogbl;
-using ::lgammal;
-using ::llrintl;
-using ::llroundl;
-using ::log1pl;
-using ::log2l;
-using ::logbl;
-using ::lrintl;
-using ::lroundl;
-using ::nanl;
-using ::nearbyintl;
-using ::nextafterl;
-using ::nexttowardl;
-using ::remainderl;
-using ::remquol;
-using ::rintl;
-using ::roundl;
-using ::scalblnl;
-using ::scalbnl;
-using ::tgammal;
-using ::truncl;
-#endif // !_LIBCPP_MSVCRT
-
-#else 
-using ::lgamma;
-using ::lgammaf;
-#endif // __sun__
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CMATH
diff --git a/include.new/c++/v1/codecvt b/include.new/c++/v1/codecvt
deleted file mode 100644
index 6eff107..0000000
--- a/include.new/c++/v1/codecvt
+++ /dev/null
@@ -1,550 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- codecvt -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CODECVT
-#define _LIBCPP_CODECVT
-
-/*
-    codecvt synopsis
-
-namespace std
-{
-
-enum codecvt_mode
-{
-    consume_header = 4,
-    generate_header = 2,
-    little_endian = 1
-};
-
-template <class Elem, unsigned long Maxcode = 0x10ffff,
-          codecvt_mode Mode = (codecvt_mode)0>
-class codecvt_utf8
-    : public codecvt<Elem, char, mbstate_t>
-{
-    explicit codecvt_utf8(size_t refs = 0);
-    ~codecvt_utf8();
-};
-
-template <class Elem, unsigned long Maxcode = 0x10ffff,
-          codecvt_mode Mode = (codecvt_mode)0>
-class codecvt_utf16
-    : public codecvt<Elem, char, mbstate_t>
-{
-    explicit codecvt_utf16(size_t refs = 0);
-    ~codecvt_utf16();
-};
-
-template <class Elem, unsigned long Maxcode = 0x10ffff,
-          codecvt_mode Mode = (codecvt_mode)0>
-class codecvt_utf8_utf16
-    : public codecvt<Elem, char, mbstate_t>
-{
-    explicit codecvt_utf8_utf16(size_t refs = 0);
-    ~codecvt_utf8_utf16();
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__locale>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-enum codecvt_mode
-{
-    consume_header = 4,
-    generate_header = 2,
-    little_endian = 1
-};
-
-// codecvt_utf8
-
-template <class _Elem> class __codecvt_utf8;
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8<wchar_t>
-    : public codecvt<wchar_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8<char16_t>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8<char32_t>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <class _Elem, unsigned long _Maxcode = 0x10ffff,
-          codecvt_mode _Mode = (codecvt_mode)0>
-class _LIBCPP_TYPE_VIS_ONLY codecvt_utf8
-    : public __codecvt_utf8<_Elem>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_utf8(size_t __refs = 0)
-        : __codecvt_utf8<_Elem>(__refs, _Maxcode, _Mode) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    ~codecvt_utf8() {}
-};
-
-// codecvt_utf16
-
-template <class _Elem, bool _LittleEndian> class __codecvt_utf16;
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<wchar_t, false>
-    : public codecvt<wchar_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<wchar_t, true>
-    : public codecvt<wchar_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<char16_t, false>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<char16_t, true>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<char32_t, false>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<char32_t, true>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <class _Elem, unsigned long _Maxcode = 0x10ffff,
-          codecvt_mode _Mode = (codecvt_mode)0>
-class _LIBCPP_TYPE_VIS_ONLY codecvt_utf16
-    : public __codecvt_utf16<_Elem, _Mode & little_endian>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_utf16(size_t __refs = 0)
-        : __codecvt_utf16<_Elem, _Mode & little_endian>(__refs, _Maxcode, _Mode) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    ~codecvt_utf16() {}
-};
-
-// codecvt_utf8_utf16
-
-template <class _Elem> class __codecvt_utf8_utf16;
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<wchar_t>
-    : public codecvt<wchar_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<char32_t>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<char16_t>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <class _Elem, unsigned long _Maxcode = 0x10ffff,
-          codecvt_mode _Mode = (codecvt_mode)0>
-class _LIBCPP_TYPE_VIS_ONLY codecvt_utf8_utf16
-    : public __codecvt_utf8_utf16<_Elem>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_utf8_utf16(size_t __refs = 0)
-        : __codecvt_utf8_utf16<_Elem>(__refs, _Maxcode, _Mode) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    ~codecvt_utf8_utf16() {}
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CODECVT
diff --git a/include.new/c++/v1/complex b/include.new/c++/v1/complex
deleted file mode 100644
index 2943da1..0000000
--- a/include.new/c++/v1/complex
+++ /dev/null
@@ -1,1567 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- complex ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_COMPLEX
-#define _LIBCPP_COMPLEX
-
-/*
-    complex synopsis
-
-namespace std
-{
-
-template<class T>
-class complex
-{
-public:
-    typedef T value_type;
-
-    complex(const T& re = T(), const T& im = T()); // constexpr in C++14
-    complex(const complex&);  // constexpr in C++14
-    template<class X> complex(const complex<X>&);  // constexpr in C++14
-
-    T real() const; // constexpr in C++14
-    T imag() const; // constexpr in C++14
-
-    void real(T);
-    void imag(T);
-
-    complex<T>& operator= (const T&);
-    complex<T>& operator+=(const T&);
-    complex<T>& operator-=(const T&);
-    complex<T>& operator*=(const T&);
-    complex<T>& operator/=(const T&);
-
-    complex& operator=(const complex&);
-    template<class X> complex<T>& operator= (const complex<X>&);
-    template<class X> complex<T>& operator+=(const complex<X>&);
-    template<class X> complex<T>& operator-=(const complex<X>&);
-    template<class X> complex<T>& operator*=(const complex<X>&);
-    template<class X> complex<T>& operator/=(const complex<X>&);
-};
-
-template<>
-class complex<float>
-{
-public:
-    typedef float value_type;
-
-    constexpr complex(float re = 0.0f, float im = 0.0f);
-    explicit constexpr complex(const complex<double>&);
-    explicit constexpr complex(const complex<long double>&);
-
-    constexpr float real() const;
-    void real(float);
-    constexpr float imag() const;
-    void imag(float);
-
-    complex<float>& operator= (float);
-    complex<float>& operator+=(float);
-    complex<float>& operator-=(float);
-    complex<float>& operator*=(float);
-    complex<float>& operator/=(float);
-
-    complex<float>& operator=(const complex<float>&);
-    template<class X> complex<float>& operator= (const complex<X>&);
-    template<class X> complex<float>& operator+=(const complex<X>&);
-    template<class X> complex<float>& operator-=(const complex<X>&);
-    template<class X> complex<float>& operator*=(const complex<X>&);
-    template<class X> complex<float>& operator/=(const complex<X>&);
-};
-
-template<>
-class complex<double>
-{
-public:
-    typedef double value_type;
-
-    constexpr complex(double re = 0.0, double im = 0.0);
-    constexpr complex(const complex<float>&);
-    explicit constexpr complex(const complex<long double>&);
-
-    constexpr double real() const;
-    void real(double);
-    constexpr double imag() const;
-    void imag(double);
-
-    complex<double>& operator= (double);
-    complex<double>& operator+=(double);
-    complex<double>& operator-=(double);
-    complex<double>& operator*=(double);
-    complex<double>& operator/=(double);
-    complex<double>& operator=(const complex<double>&);
-
-    template<class X> complex<double>& operator= (const complex<X>&);
-    template<class X> complex<double>& operator+=(const complex<X>&);
-    template<class X> complex<double>& operator-=(const complex<X>&);
-    template<class X> complex<double>& operator*=(const complex<X>&);
-    template<class X> complex<double>& operator/=(const complex<X>&);
-};
-
-template<>
-class complex<long double>
-{
-public:
-    typedef long double value_type;
-
-    constexpr complex(long double re = 0.0L, long double im = 0.0L);
-    constexpr complex(const complex<float>&);
-    constexpr complex(const complex<double>&);
-
-    constexpr long double real() const;
-    void real(long double);
-    constexpr long double imag() const;
-    void imag(long double);
-
-    complex<long double>& operator=(const complex<long double>&);
-    complex<long double>& operator= (long double);
-    complex<long double>& operator+=(long double);
-    complex<long double>& operator-=(long double);
-    complex<long double>& operator*=(long double);
-    complex<long double>& operator/=(long double);
-
-    template<class X> complex<long double>& operator= (const complex<X>&);
-    template<class X> complex<long double>& operator+=(const complex<X>&);
-    template<class X> complex<long double>& operator-=(const complex<X>&);
-    template<class X> complex<long double>& operator*=(const complex<X>&);
-    template<class X> complex<long double>& operator/=(const complex<X>&);
-};
-
-// 26.3.6 operators:
-template<class T> complex<T> operator+(const complex<T>&, const complex<T>&);
-template<class T> complex<T> operator+(const complex<T>&, const T&);
-template<class T> complex<T> operator+(const T&, const complex<T>&);
-template<class T> complex<T> operator-(const complex<T>&, const complex<T>&);
-template<class T> complex<T> operator-(const complex<T>&, const T&);
-template<class T> complex<T> operator-(const T&, const complex<T>&);
-template<class T> complex<T> operator*(const complex<T>&, const complex<T>&);
-template<class T> complex<T> operator*(const complex<T>&, const T&);
-template<class T> complex<T> operator*(const T&, const complex<T>&);
-template<class T> complex<T> operator/(const complex<T>&, const complex<T>&);
-template<class T> complex<T> operator/(const complex<T>&, const T&);
-template<class T> complex<T> operator/(const T&, const complex<T>&);
-template<class T> complex<T> operator+(const complex<T>&);
-template<class T> complex<T> operator-(const complex<T>&);
-template<class T> bool operator==(const complex<T>&, const complex<T>&); // constexpr in C++14
-template<class T> bool operator==(const complex<T>&, const T&); // constexpr in C++14
-template<class T> bool operator==(const T&, const complex<T>&); // constexpr in C++14
-template<class T> bool operator!=(const complex<T>&, const complex<T>&); // constexpr in C++14
-template<class T> bool operator!=(const complex<T>&, const T&); // constexpr in C++14
-template<class T> bool operator!=(const T&, const complex<T>&); // constexpr in C++14
-
-template<class T, class charT, class traits>
-  basic_istream<charT, traits>&
-  operator>>(basic_istream<charT, traits>&, complex<T>&);
-template<class T, class charT, class traits>
-  basic_ostream<charT, traits>&
-  operator<<(basic_ostream<charT, traits>&, const complex<T>&);
-
-// 26.3.7 values:
-
-template<class T>              T real(const complex<T>&); // constexpr in C++14
-                     long double real(long double);       // constexpr in C++14
-                          double real(double);            // constexpr in C++14
-template<Integral T>      double real(T);                 // constexpr in C++14
-                          float  real(float);             // constexpr in C++14
-
-template<class T>              T imag(const complex<T>&); // constexpr in C++14
-                     long double imag(long double);       // constexpr in C++14
-                          double imag(double);            // constexpr in C++14
-template<Integral T>      double imag(T);                 // constexpr in C++14
-                          float  imag(float);             // constexpr in C++14
-
-template<class T> T abs(const complex<T>&);
-
-template<class T>              T arg(const complex<T>&);
-                     long double arg(long double);
-                          double arg(double);
-template<Integral T>      double arg(T);
-                          float  arg(float);
-
-template<class T>              T norm(const complex<T>&);
-                     long double norm(long double);
-                          double norm(double);
-template<Integral T>      double norm(T);
-                          float  norm(float);
-
-template<class T>      complex<T>           conj(const complex<T>&);
-                       complex<long double> conj(long double);
-                       complex<double>      conj(double);
-template<Integral T>   complex<double>      conj(T);
-                       complex<float>       conj(float);
-
-template<class T>    complex<T>           proj(const complex<T>&);
-                     complex<long double> proj(long double);
-                     complex<double>      proj(double);
-template<Integral T> complex<double>      proj(T);
-                     complex<float>       proj(float);
-
-template<class T> complex<T> polar(const T&, const T& = 0);
-
-// 26.3.8 transcendentals:
-template<class T> complex<T> acos(const complex<T>&);
-template<class T> complex<T> asin(const complex<T>&);
-template<class T> complex<T> atan(const complex<T>&);
-template<class T> complex<T> acosh(const complex<T>&);
-template<class T> complex<T> asinh(const complex<T>&);
-template<class T> complex<T> atanh(const complex<T>&);
-template<class T> complex<T> cos (const complex<T>&);
-template<class T> complex<T> cosh (const complex<T>&);
-template<class T> complex<T> exp (const complex<T>&);
-template<class T> complex<T> log (const complex<T>&);
-template<class T> complex<T> log10(const complex<T>&);
-
-template<class T> complex<T> pow(const complex<T>&, const T&);
-template<class T> complex<T> pow(const complex<T>&, const complex<T>&);
-template<class T> complex<T> pow(const T&, const complex<T>&);
-
-template<class T> complex<T> sin (const complex<T>&);
-template<class T> complex<T> sinh (const complex<T>&);
-template<class T> complex<T> sqrt (const complex<T>&);
-template<class T> complex<T> tan (const complex<T>&);
-template<class T> complex<T> tanh (const complex<T>&);
-
-template<class T, class charT, class traits>
-  basic_istream<charT, traits>&
-  operator>>(basic_istream<charT, traits>& is, complex<T>& x);
-
-template<class T, class charT, class traits>
-  basic_ostream<charT, traits>&
-  operator<<(basic_ostream<charT, traits>& o, const complex<T>& x);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <type_traits>
-#include <stdexcept>
-#include <cmath>
-#include <sstream>
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-    #include <cassert>
-#endif
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template<class _Tp> class _LIBCPP_TYPE_VIS_ONLY complex;
-
-template<class _Tp> complex<_Tp> operator*(const complex<_Tp>& __z, const complex<_Tp>& __w);
-template<class _Tp> complex<_Tp> operator/(const complex<_Tp>& __x, const complex<_Tp>& __y);
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY complex
-{
-public:
-    typedef _Tp value_type;
-private:
-    value_type __re_;
-    value_type __im_;
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    complex(const value_type& __re = value_type(), const value_type& __im = value_type())
-        : __re_(__re), __im_(__im) {}
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    complex(const complex<_Xp>& __c)
-        : __re_(__c.real()), __im_(__c.imag()) {}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 value_type real() const {return __re_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 value_type imag() const {return __im_;}
-
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
-
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (const value_type& __re)
-        {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(const value_type& __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(const value_type& __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(const value_type& __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(const value_type& __re) {__re_ /= __re; __im_ /= __re; return *this;}
-
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
-        {
-            __re_ = __c.real();
-            __im_ = __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
-        {
-            __re_ += __c.real();
-            __im_ += __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
-        {
-            __re_ -= __c.real();
-            __im_ -= __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
-        {
-            *this = *this * complex(__c.real(), __c.imag());
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
-        {
-            *this = *this / complex(__c.real(), __c.imag());
-            return *this;
-        }
-};
-
-template<> class _LIBCPP_TYPE_VIS_ONLY complex<double>;
-template<> class _LIBCPP_TYPE_VIS_ONLY complex<long double>;
-
-template<>
-class _LIBCPP_TYPE_VIS_ONLY complex<float>
-{
-    float __re_;
-    float __im_;
-public:
-    typedef float value_type;
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR complex(float __re = 0.0f, float __im = 0.0f)
-        : __re_(__re), __im_(__im) {}
-    explicit _LIBCPP_CONSTEXPR complex(const complex<double>& __c);
-    explicit _LIBCPP_CONSTEXPR complex(const complex<long double>& __c);
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR float real() const {return __re_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR float imag() const {return __im_;}
-
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
-
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (float __re)
-        {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(float __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(float __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(float __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(float __re) {__re_ /= __re; __im_ /= __re; return *this;}
-
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
-        {
-            __re_ = __c.real();
-            __im_ = __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
-        {
-            __re_ += __c.real();
-            __im_ += __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
-        {
-            __re_ -= __c.real();
-            __im_ -= __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
-        {
-            *this = *this * complex(__c.real(), __c.imag());
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
-        {
-            *this = *this / complex(__c.real(), __c.imag());
-            return *this;
-        }
-};
-
-template<>
-class _LIBCPP_TYPE_VIS_ONLY complex<double>
-{
-    double __re_;
-    double __im_;
-public:
-    typedef double value_type;
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR complex(double __re = 0.0, double __im = 0.0)
-        : __re_(__re), __im_(__im) {}
-    _LIBCPP_CONSTEXPR complex(const complex<float>& __c);
-    explicit _LIBCPP_CONSTEXPR complex(const complex<long double>& __c);
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR double real() const {return __re_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR double imag() const {return __im_;}
-
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
-
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (double __re)
-        {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(double __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(double __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(double __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(double __re) {__re_ /= __re; __im_ /= __re; return *this;}
-
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
-        {
-            __re_ = __c.real();
-            __im_ = __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
-        {
-            __re_ += __c.real();
-            __im_ += __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
-        {
-            __re_ -= __c.real();
-            __im_ -= __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
-        {
-            *this = *this * complex(__c.real(), __c.imag());
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
-        {
-            *this = *this / complex(__c.real(), __c.imag());
-            return *this;
-        }
-};
-
-template<>
-class _LIBCPP_TYPE_VIS_ONLY complex<long double>
-{
-    long double __re_;
-    long double __im_;
-public:
-    typedef long double value_type;
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR complex(long double __re = 0.0L, long double __im = 0.0L)
-        : __re_(__re), __im_(__im) {}
-    _LIBCPP_CONSTEXPR complex(const complex<float>& __c);
-    _LIBCPP_CONSTEXPR complex(const complex<double>& __c);
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR long double real() const {return __re_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR long double imag() const {return __im_;}
-
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
-
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (long double __re)
-        {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(long double __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(long double __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(long double __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(long double __re) {__re_ /= __re; __im_ /= __re; return *this;}
-
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
-        {
-            __re_ = __c.real();
-            __im_ = __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
-        {
-            __re_ += __c.real();
-            __im_ += __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
-        {
-            __re_ -= __c.real();
-            __im_ -= __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
-        {
-            *this = *this * complex(__c.real(), __c.imag());
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
-        {
-            *this = *this / complex(__c.real(), __c.imag());
-            return *this;
-        }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<float>::complex(const complex<double>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<float>::complex(const complex<long double>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<double>::complex(const complex<float>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<double>::complex(const complex<long double>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<long double>::complex(const complex<float>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<long double>::complex(const complex<double>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-// 26.3.6 operators:
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator+(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__x);
-    __t += __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator+(const complex<_Tp>& __x, const _Tp& __y)
-{
-    complex<_Tp> __t(__x);
-    __t += __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator+(const _Tp& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__y);
-    __t += __x;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator-(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__x);
-    __t -= __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator-(const complex<_Tp>& __x, const _Tp& __y)
-{
-    complex<_Tp> __t(__x);
-    __t -= __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator-(const _Tp& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(-__y);
-    __t += __x;
-    return __t;
-}
-
-template<class _Tp>
-complex<_Tp>
-operator*(const complex<_Tp>& __z, const complex<_Tp>& __w)
-{
-    _Tp __a = __z.real();
-    _Tp __b = __z.imag();
-    _Tp __c = __w.real();
-    _Tp __d = __w.imag();
-    _Tp __ac = __a * __c;
-    _Tp __bd = __b * __d;
-    _Tp __ad = __a * __d;
-    _Tp __bc = __b * __c;
-    _Tp __x = __ac - __bd;
-    _Tp __y = __ad + __bc;
-    if (isnan(__x) && isnan(__y))
-    {
-        bool __recalc = false;
-        if (isinf(__a) || isinf(__b))
-        {
-            __a = copysign(isinf(__a) ? _Tp(1) : _Tp(0), __a);
-            __b = copysign(isinf(__b) ? _Tp(1) : _Tp(0), __b);
-            if (isnan(__c))
-                __c = copysign(_Tp(0), __c);
-            if (isnan(__d))
-                __d = copysign(_Tp(0), __d);
-            __recalc = true;
-        }
-        if (isinf(__c) || isinf(__d))
-        {
-            __c = copysign(isinf(__c) ? _Tp(1) : _Tp(0), __c);
-            __d = copysign(isinf(__d) ? _Tp(1) : _Tp(0), __d);
-            if (isnan(__a))
-                __a = copysign(_Tp(0), __a);
-            if (isnan(__b))
-                __b = copysign(_Tp(0), __b);
-            __recalc = true;
-        }
-        if (!__recalc && (isinf(__ac) || isinf(__bd) ||
-                          isinf(__ad) || isinf(__bc)))
-        {
-            if (isnan(__a))
-                __a = copysign(_Tp(0), __a);
-            if (isnan(__b))
-                __b = copysign(_Tp(0), __b);
-            if (isnan(__c))
-                __c = copysign(_Tp(0), __c);
-            if (isnan(__d))
-                __d = copysign(_Tp(0), __d);
-            __recalc = true;
-        }
-        if (__recalc)
-        {
-            __x = _Tp(INFINITY) * (__a * __c - __b * __d);
-            __y = _Tp(INFINITY) * (__a * __d + __b * __c);
-        }
-    }
-    return complex<_Tp>(__x, __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator*(const complex<_Tp>& __x, const _Tp& __y)
-{
-    complex<_Tp> __t(__x);
-    __t *= __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator*(const _Tp& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__y);
-    __t *= __x;
-    return __t;
-}
-
-template<class _Tp>
-complex<_Tp>
-operator/(const complex<_Tp>& __z, const complex<_Tp>& __w)
-{
-    int __ilogbw = 0;
-    _Tp __a = __z.real();
-    _Tp __b = __z.imag();
-    _Tp __c = __w.real();
-    _Tp __d = __w.imag();
-    _Tp __logbw = logb(fmax(fabs(__c), fabs(__d)));
-    if (isfinite(__logbw))
-    {
-        __ilogbw = static_cast<int>(__logbw);
-        __c = scalbn(__c, -__ilogbw);
-        __d = scalbn(__d, -__ilogbw);
-    }
-    _Tp __denom = __c * __c + __d * __d;
-    _Tp __x = scalbn((__a * __c + __b * __d) / __denom, -__ilogbw);
-    _Tp __y = scalbn((__b * __c - __a * __d) / __denom, -__ilogbw);
-    if (isnan(__x) && isnan(__y))
-    {
-        if ((__denom == _Tp(0)) && (!isnan(__a) || !isnan(__b)))
-        {
-            __x = copysign(_Tp(INFINITY), __c) * __a;
-            __y = copysign(_Tp(INFINITY), __c) * __b;
-        }
-        else if ((isinf(__a) || isinf(__b)) && isfinite(__c) && isfinite(__d))
-        {
-            __a = copysign(isinf(__a) ? _Tp(1) : _Tp(0), __a);
-            __b = copysign(isinf(__b) ? _Tp(1) : _Tp(0), __b);
-            __x = _Tp(INFINITY) * (__a * __c + __b * __d);
-            __y = _Tp(INFINITY) * (__b * __c - __a * __d);
-        }
-        else if (isinf(__logbw) && __logbw > _Tp(0) && isfinite(__a) && isfinite(__b))
-        {
-            __c = copysign(isinf(__c) ? _Tp(1) : _Tp(0), __c);
-            __d = copysign(isinf(__d) ? _Tp(1) : _Tp(0), __d);
-            __x = _Tp(0) * (__a * __c + __b * __d);
-            __y = _Tp(0) * (__b * __c - __a * __d);
-        }
-    }
-    return complex<_Tp>(__x, __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator/(const complex<_Tp>& __x, const _Tp& __y)
-{
-    return complex<_Tp>(__x.real() / __y, __x.imag() / __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator/(const _Tp& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__x);
-    __t /= __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator+(const complex<_Tp>& __x)
-{
-    return __x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator-(const complex<_Tp>& __x)
-{
-    return complex<_Tp>(-__x.real(), -__x.imag());
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    return __x.real() == __y.real() && __x.imag() == __y.imag();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const complex<_Tp>& __x, const _Tp& __y)
-{
-    return __x.real() == __y && __x.imag() == 0;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const _Tp& __x, const complex<_Tp>& __y)
-{
-    return __x == __y.real() && 0 == __y.imag();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    return !(__x == __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const complex<_Tp>& __x, const _Tp& __y)
-{
-    return !(__x == __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const _Tp& __x, const complex<_Tp>& __y)
-{
-    return !(__x == __y);
-}
-
-// 26.3.7 values:
-
-// real
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-real(const complex<_Tp>& __c)
-{
-    return __c.real();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-long double
-real(long double __re)
-{
-    return __re;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-double
-real(double __re)
-{
-    return __re;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    double
->::type
-real(_Tp  __re)
-{
-    return __re;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-float
-real(float  __re)
-{
-    return __re;
-}
-
-// imag
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-imag(const complex<_Tp>& __c)
-{
-    return __c.imag();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-long double
-imag(long double __re)
-{
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-double
-imag(double __re)
-{
-    return 0;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    double
->::type
-imag(_Tp  __re)
-{
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-float
-imag(float  __re)
-{
-    return 0;
-}
-
-// abs
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-abs(const complex<_Tp>& __c)
-{
-    return hypot(__c.real(), __c.imag());
-}
-
-// arg
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-arg(const complex<_Tp>& __c)
-{
-    return atan2(__c.imag(), __c.real());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-long double
-arg(long double __re)
-{
-    return atan2l(0.L, __re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-double
-arg(double __re)
-{
-    return atan2(0., __re);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    double
->::type
-arg(_Tp __re)
-{
-    return atan2(0., __re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-float
-arg(float __re)
-{
-    return atan2f(0.F, __re);
-}
-
-// norm
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-norm(const complex<_Tp>& __c)
-{
-    if (isinf(__c.real()))
-        return abs(__c.real());
-    if (isinf(__c.imag()))
-        return abs(__c.imag());
-    return __c.real() * __c.real() + __c.imag() * __c.imag();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-long double
-norm(long double __re)
-{
-    return __re * __re;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-double
-norm(double __re)
-{
-    return __re * __re;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    double
->::type
-norm(_Tp __re)
-{
-    return (double)__re * __re;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-float
-norm(float __re)
-{
-    return __re * __re;
-}
-
-// conj
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-conj(const complex<_Tp>& __c)
-{
-    return complex<_Tp>(__c.real(), -__c.imag());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<long double>
-conj(long double __re)
-{
-    return complex<long double>(__re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<double>
-conj(double __re)
-{
-    return complex<double>(__re);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    complex<double>
->::type
-conj(_Tp __re)
-{
-    return complex<double>(__re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<float>
-conj(float __re)
-{
-    return complex<float>(__re);
-}
-
-// proj
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-proj(const complex<_Tp>& __c)
-{
-    std::complex<_Tp> __r = __c;
-    if (isinf(__c.real()) || isinf(__c.imag()))
-        __r = complex<_Tp>(INFINITY, copysign(_Tp(0), __c.imag()));
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<long double>
-proj(long double __re)
-{
-    if (isinf(__re))
-        __re = abs(__re);
-    return complex<long double>(__re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<double>
-proj(double __re)
-{
-    if (isinf(__re))
-        __re = abs(__re);
-    return complex<double>(__re);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    complex<double>
->::type
-proj(_Tp __re)
-{
-    return complex<double>(__re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<float>
-proj(float __re)
-{
-    if (isinf(__re))
-        __re = abs(__re);
-    return complex<float>(__re);
-}
-
-// polar
-
-template<class _Tp>
-complex<_Tp>
-polar(const _Tp& __rho, const _Tp& __theta = _Tp(0))
-{
-    if (isnan(__rho) || signbit(__rho))
-        return complex<_Tp>(_Tp(NAN), _Tp(NAN));
-    if (isnan(__theta))
-    {
-        if (isinf(__rho))
-            return complex<_Tp>(__rho, __theta);
-        return complex<_Tp>(__theta, __theta);
-    }
-    if (isinf(__theta))
-    {
-        if (isinf(__rho))
-            return complex<_Tp>(__rho, _Tp(NAN));
-        return complex<_Tp>(_Tp(NAN), _Tp(NAN));
-    }
-    _Tp __x = __rho * cos(__theta);
-    if (isnan(__x))
-        __x = 0;
-    _Tp __y = __rho * sin(__theta);
-    if (isnan(__y))
-        __y = 0;
-    return complex<_Tp>(__x, __y);
-}
-
-// log
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-log(const complex<_Tp>& __x)
-{
-    return complex<_Tp>(log(abs(__x)), arg(__x));
-}
-
-// log10
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-log10(const complex<_Tp>& __x)
-{
-    return log(__x) / log(_Tp(10));
-}
-
-// sqrt
-
-template<class _Tp>
-complex<_Tp>
-sqrt(const complex<_Tp>& __x)
-{
-    if (isinf(__x.imag()))
-        return complex<_Tp>(_Tp(INFINITY), __x.imag());
-    if (isinf(__x.real()))
-    {
-        if (__x.real() > _Tp(0))
-            return complex<_Tp>(__x.real(), isnan(__x.imag()) ? __x.imag() : copysign(_Tp(0), __x.imag()));
-        return complex<_Tp>(isnan(__x.imag()) ? __x.imag() : _Tp(0), copysign(__x.real(), __x.imag()));
-    }
-    return polar(sqrt(abs(__x)), arg(__x) / _Tp(2));
-}
-
-// exp
-
-template<class _Tp>
-complex<_Tp>
-exp(const complex<_Tp>& __x)
-{
-    _Tp __i = __x.imag();
-    if (isinf(__x.real()))
-    {
-        if (__x.real() < _Tp(0))
-        {
-            if (!isfinite(__i))
-                __i = _Tp(1);
-        }
-        else if (__i == 0 || !isfinite(__i))
-        {
-            if (isinf(__i))
-                __i = _Tp(NAN);
-            return complex<_Tp>(__x.real(), __i);
-        }
-    }
-    else if (isnan(__x.real()) && __x.imag() == 0)
-        return __x;
-    _Tp __e = exp(__x.real());
-    return complex<_Tp>(__e * cos(__i), __e * sin(__i));
-}
-
-// pow
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-pow(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    return exp(__y * log(__x));
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<typename __promote<_Tp, _Up>::type>
-pow(const complex<_Tp>& __x, const complex<_Up>& __y)
-{
-    typedef complex<typename __promote<_Tp, _Up>::type> result_type;
-    return _VSTD::pow(result_type(__x), result_type(__y));
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_arithmetic<_Up>::value,
-    complex<typename __promote<_Tp, _Up>::type>
->::type
-pow(const complex<_Tp>& __x, const _Up& __y)
-{
-    typedef complex<typename __promote<_Tp, _Up>::type> result_type;
-    return _VSTD::pow(result_type(__x), result_type(__y));
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_arithmetic<_Tp>::value,
-    complex<typename __promote<_Tp, _Up>::type>
->::type
-pow(const _Tp& __x, const complex<_Up>& __y)
-{
-    typedef complex<typename __promote<_Tp, _Up>::type> result_type;
-    return _VSTD::pow(result_type(__x), result_type(__y));
-}
-
-// asinh
-
-template<class _Tp>
-complex<_Tp>
-asinh(const complex<_Tp>& __x)
-{
-    const _Tp __pi(atan2(+0., -0.));
-    if (isinf(__x.real()))
-    {
-        if (isnan(__x.imag()))
-            return __x;
-        if (isinf(__x.imag()))
-            return complex<_Tp>(__x.real(), copysign(__pi * _Tp(0.25), __x.imag()));
-        return complex<_Tp>(__x.real(), copysign(_Tp(0), __x.imag()));
-    }
-    if (isnan(__x.real()))
-    {
-        if (isinf(__x.imag()))
-            return complex<_Tp>(__x.imag(), __x.real());
-        if (__x.imag() == 0)
-            return __x;
-        return complex<_Tp>(__x.real(), __x.real());
-    }
-    if (isinf(__x.imag()))
-        return complex<_Tp>(copysign(__x.imag(), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
-    complex<_Tp> __z = log(__x + sqrt(pow(__x, _Tp(2)) + _Tp(1)));
-    return complex<_Tp>(copysign(__z.real(), __x.real()), copysign(__z.imag(), __x.imag()));
-}
-
-// acosh
-
-template<class _Tp>
-complex<_Tp>
-acosh(const complex<_Tp>& __x)
-{
-    const _Tp __pi(atan2(+0., -0.));
-    if (isinf(__x.real()))
-    {
-        if (isnan(__x.imag()))
-            return complex<_Tp>(abs(__x.real()), __x.imag());
-        if (isinf(__x.imag()))
-        {
-            if (__x.real() > 0)
-                return complex<_Tp>(__x.real(), copysign(__pi * _Tp(0.25), __x.imag()));
-            else
-                return complex<_Tp>(-__x.real(), copysign(__pi * _Tp(0.75), __x.imag()));
-        }
-        if (__x.real() < 0)
-            return complex<_Tp>(-__x.real(), copysign(__pi, __x.imag()));
-        return complex<_Tp>(__x.real(), copysign(_Tp(0), __x.imag()));
-    }
-    if (isnan(__x.real()))
-    {
-        if (isinf(__x.imag()))
-            return complex<_Tp>(abs(__x.imag()), __x.real());
-        return complex<_Tp>(__x.real(), __x.real());
-    }
-    if (isinf(__x.imag()))
-        return complex<_Tp>(abs(__x.imag()), copysign(__pi/_Tp(2), __x.imag()));
-    complex<_Tp> __z = log(__x + sqrt(pow(__x, _Tp(2)) - _Tp(1)));
-    return complex<_Tp>(copysign(__z.real(), _Tp(0)), copysign(__z.imag(), __x.imag()));
-}
-
-// atanh
-
-template<class _Tp>
-complex<_Tp>
-atanh(const complex<_Tp>& __x)
-{
-    const _Tp __pi(atan2(+0., -0.));
-    if (isinf(__x.imag()))
-    {
-        return complex<_Tp>(copysign(_Tp(0), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
-    }
-    if (isnan(__x.imag()))
-    {
-        if (isinf(__x.real()) || __x.real() == 0)
-            return complex<_Tp>(copysign(_Tp(0), __x.real()), __x.imag());
-        return complex<_Tp>(__x.imag(), __x.imag());
-    }
-    if (isnan(__x.real()))
-    {
-        return complex<_Tp>(__x.real(), __x.real());
-    }
-    if (isinf(__x.real()))
-    {
-        return complex<_Tp>(copysign(_Tp(0), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
-    }
-    if (abs(__x.real()) == _Tp(1) && __x.imag() == _Tp(0))
-    {
-        return complex<_Tp>(copysign(_Tp(INFINITY), __x.real()), copysign(_Tp(0), __x.imag()));
-    }
-    complex<_Tp> __z = log((_Tp(1) + __x) / (_Tp(1) - __x)) / _Tp(2);
-    return complex<_Tp>(copysign(__z.real(), __x.real()), copysign(__z.imag(), __x.imag()));
-}
-
-// sinh
-
-template<class _Tp>
-complex<_Tp>
-sinh(const complex<_Tp>& __x)
-{
-    if (isinf(__x.real()) && !isfinite(__x.imag()))
-        return complex<_Tp>(__x.real(), _Tp(NAN));
-    if (__x.real() == 0 && !isfinite(__x.imag()))
-        return complex<_Tp>(__x.real(), _Tp(NAN));
-    if (__x.imag() == 0 && !isfinite(__x.real()))
-        return __x;
-    return complex<_Tp>(sinh(__x.real()) * cos(__x.imag()), cosh(__x.real()) * sin(__x.imag()));
-}
-
-// cosh
-
-template<class _Tp>
-complex<_Tp>
-cosh(const complex<_Tp>& __x)
-{
-    if (isinf(__x.real()) && !isfinite(__x.imag()))
-        return complex<_Tp>(abs(__x.real()), _Tp(NAN));
-    if (__x.real() == 0 && !isfinite(__x.imag()))
-        return complex<_Tp>(_Tp(NAN), __x.real());
-    if (__x.real() == 0 && __x.imag() == 0)
-        return complex<_Tp>(_Tp(1), __x.imag());
-    if (__x.imag() == 0 && !isfinite(__x.real()))
-        return complex<_Tp>(abs(__x.real()), __x.imag());
-    return complex<_Tp>(cosh(__x.real()) * cos(__x.imag()), sinh(__x.real()) * sin(__x.imag()));
-}
-
-// tanh
-
-template<class _Tp>
-complex<_Tp>
-tanh(const complex<_Tp>& __x)
-{
-    if (isinf(__x.real()))
-    {
-        if (!isfinite(__x.imag()))
-            return complex<_Tp>(_Tp(1), _Tp(0));
-        return complex<_Tp>(_Tp(1), copysign(_Tp(0), sin(_Tp(2) * __x.imag())));
-    }
-    if (isnan(__x.real()) && __x.imag() == 0)
-        return __x;
-    _Tp __2r(_Tp(2) * __x.real());
-    _Tp __2i(_Tp(2) * __x.imag());
-    _Tp __d(cosh(__2r) + cos(__2i));
-    _Tp __2rsh(sinh(__2r));
-    if (isinf(__2rsh) && isinf(__d))
-        return complex<_Tp>(__2rsh > _Tp(0) ? _Tp(1) : _Tp(-1),
-                            __2i > _Tp(0) ? _Tp(0) : _Tp(-0.));
-    return  complex<_Tp>(__2rsh/__d, sin(__2i)/__d);
-}
-
-// asin
-
-template<class _Tp>
-complex<_Tp>
-asin(const complex<_Tp>& __x)
-{
-    complex<_Tp> __z = asinh(complex<_Tp>(-__x.imag(), __x.real()));
-    return complex<_Tp>(__z.imag(), -__z.real());
-}
-
-// acos
-
-template<class _Tp>
-complex<_Tp>
-acos(const complex<_Tp>& __x)
-{
-    const _Tp __pi(atan2(+0., -0.));
-    if (isinf(__x.real()))
-    {
-        if (isnan(__x.imag()))
-            return complex<_Tp>(__x.imag(), __x.real());
-        if (isinf(__x.imag()))
-        {
-            if (__x.real() < _Tp(0))
-                return complex<_Tp>(_Tp(0.75) * __pi, -__x.imag());
-            return complex<_Tp>(_Tp(0.25) * __pi, -__x.imag());
-        }
-        if (__x.real() < _Tp(0))
-            return complex<_Tp>(__pi, signbit(__x.imag()) ? -__x.real() : __x.real());
-        return complex<_Tp>(_Tp(0), signbit(__x.imag()) ? __x.real() : -__x.real());
-    }
-    if (isnan(__x.real()))
-    {
-        if (isinf(__x.imag()))
-            return complex<_Tp>(__x.real(), -__x.imag());
-        return complex<_Tp>(__x.real(), __x.real());
-    }
-    if (isinf(__x.imag()))
-        return complex<_Tp>(__pi/_Tp(2), -__x.imag());
-    if (__x.real() == 0)
-        return complex<_Tp>(__pi/_Tp(2), -__x.imag());
-    complex<_Tp> __z = log(__x + sqrt(pow(__x, _Tp(2)) - _Tp(1)));
-    if (signbit(__x.imag()))
-        return complex<_Tp>(abs(__z.imag()), abs(__z.real()));
-    return complex<_Tp>(abs(__z.imag()), -abs(__z.real()));
-}
-
-// atan
-
-template<class _Tp>
-complex<_Tp>
-atan(const complex<_Tp>& __x)
-{
-    complex<_Tp> __z = atanh(complex<_Tp>(-__x.imag(), __x.real()));
-    return complex<_Tp>(__z.imag(), -__z.real());
-}
-
-// sin
-
-template<class _Tp>
-complex<_Tp>
-sin(const complex<_Tp>& __x)
-{
-    complex<_Tp> __z = sinh(complex<_Tp>(-__x.imag(), __x.real()));
-    return complex<_Tp>(__z.imag(), -__z.real());
-}
-
-// cos
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-cos(const complex<_Tp>& __x)
-{
-    return cosh(complex<_Tp>(-__x.imag(), __x.real()));
-}
-
-// tan
-
-template<class _Tp>
-complex<_Tp>
-tan(const complex<_Tp>& __x)
-{
-    complex<_Tp> __z = tanh(complex<_Tp>(-__x.imag(), __x.real()));
-    return complex<_Tp>(__z.imag(), -__z.real());
-}
-
-template<class _Tp, class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x)
-{
-    if (__is.good())
-    {
-        ws(__is);
-        if (__is.peek() == _CharT('('))
-        {
-            __is.get();
-            _Tp __r;
-            __is >> __r;
-            if (!__is.fail())
-            {
-                ws(__is);
-                _CharT __c = __is.peek();
-                if (__c == _CharT(','))
-                {
-                    __is.get();
-                    _Tp __i;
-                    __is >> __i;
-                    if (!__is.fail())
-                    {
-                        ws(__is);
-                        __c = __is.peek();
-                        if (__c == _CharT(')'))
-                        {
-                            __is.get();
-                            __x = complex<_Tp>(__r, __i);
-                        }
-                        else
-                            __is.setstate(ios_base::failbit);
-                    }
-                    else
-                        __is.setstate(ios_base::failbit);
-                }
-                else if (__c == _CharT(')'))
-                {
-                    __is.get();
-                    __x = complex<_Tp>(__r, _Tp(0));
-                }
-                else
-                    __is.setstate(ios_base::failbit);
-            }
-            else
-                __is.setstate(ios_base::failbit);
-        }
-        else
-        {
-            _Tp __r;
-            __is >> __r;
-            if (!__is.fail())
-                __x = complex<_Tp>(__r, _Tp(0));
-            else
-                __is.setstate(ios_base::failbit);
-        }
-    }
-    else
-        __is.setstate(ios_base::failbit);
-    return __is;
-}
-
-template<class _Tp, class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __x)
-{
-    basic_ostringstream<_CharT, _Traits> __s;
-    __s.flags(__os.flags());
-    __s.imbue(__os.getloc());
-    __s.precision(__os.precision());
-    __s << '(' << __x.real() << ',' << __x.imag() << ')';
-    return __os << __s.str();
-}
-
-#if _LIBCPP_STD_VER > 11 
-// Literal suffix for complex number literals [complex.literals]
-inline namespace literals
-{ 
-  inline namespace complex_literals
-  {
-    constexpr complex<long double> operator""il(long double __im)
-    {
-        return { 0.0l, __im };
-    }
-
-    constexpr complex<long double> operator""il(unsigned long long __im)
-    {
-        return { 0.0l, static_cast<long double>(__im) };
-    }
-
-
-    constexpr complex<double> operator""i(long double __im)
-    {
-        return { 0.0, static_cast<double>(__im) };
-    }
-
-    constexpr complex<double> operator""i(unsigned long long __im)
-    {
-        return { 0.0, static_cast<double>(__im) };
-    }
-
-
-    constexpr complex<float> operator""if(long double __im)
-    {
-        return { 0.0f, static_cast<float>(__im) };
-    }
-
-    constexpr complex<float> operator""if(unsigned long long __im)
-    {
-        return { 0.0f, static_cast<float>(__im) };
-    }
-  }
-}
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_COMPLEX
diff --git a/include.new/c++/v1/complex.h b/include.new/c++/v1/complex.h
deleted file mode 100644
index 7003d31..0000000
--- a/include.new/c++/v1/complex.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- complex.h --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_COMPLEX_H
-#define _LIBCPP_COMPLEX_H
-
-/*
-    complex.h synopsis
-
-#include <ccomplex>
-
-*/
-
-#ifdef __cplusplus
-
-#include <ccomplex>
-
-#else  // __cplusplus
-
-#include_next <complex.h>
-
-#endif  // __cplusplus
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_COMPLEX_H
diff --git a/include.new/c++/v1/condition_variable b/include.new/c++/v1/condition_variable
deleted file mode 100644
index 1af2484..0000000
--- a/include.new/c++/v1/condition_variable
+++ /dev/null
@@ -1,260 +0,0 @@
-// -*- C++ -*-
-//===---------------------- condition_variable ----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CONDITION_VARIABLE
-#define _LIBCPP_CONDITION_VARIABLE
-
-/*
-    condition_variable synopsis
-
-namespace std
-{
-
-enum class cv_status { no_timeout, timeout };
-
-class condition_variable
-{
-public:
-    condition_variable();
-    ~condition_variable();
-
-    condition_variable(const condition_variable&) = delete;
-    condition_variable& operator=(const condition_variable&) = delete;
-
-    void notify_one() noexcept;
-    void notify_all() noexcept;
-
-    void wait(unique_lock<mutex>& lock);
-    template <class Predicate>
-        void wait(unique_lock<mutex>& lock, Predicate pred);
-
-    template <class Clock, class Duration>
-        cv_status
-        wait_until(unique_lock<mutex>& lock,
-                   const chrono::time_point<Clock, Duration>& abs_time);
-
-    template <class Clock, class Duration, class Predicate>
-        bool
-        wait_until(unique_lock<mutex>& lock,
-                   const chrono::time_point<Clock, Duration>& abs_time,
-                   Predicate pred);
-
-    template <class Rep, class Period>
-        cv_status
-        wait_for(unique_lock<mutex>& lock,
-                 const chrono::duration<Rep, Period>& rel_time);
-
-    template <class Rep, class Period, class Predicate>
-        bool
-        wait_for(unique_lock<mutex>& lock,
-                 const chrono::duration<Rep, Period>& rel_time,
-                 Predicate pred);
-
-    typedef pthread_cond_t* native_handle_type;
-    native_handle_type native_handle();
-};
-
-void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk);
-
-class condition_variable_any
-{
-public:
-    condition_variable_any();
-    ~condition_variable_any();
-
-    condition_variable_any(const condition_variable_any&) = delete;
-    condition_variable_any& operator=(const condition_variable_any&) = delete;
-
-    void notify_one() noexcept;
-    void notify_all() noexcept;
-
-    template <class Lock>
-        void wait(Lock& lock);
-    template <class Lock, class Predicate>
-        void wait(Lock& lock, Predicate pred);
-
-    template <class Lock, class Clock, class Duration>
-        cv_status
-        wait_until(Lock& lock,
-                   const chrono::time_point<Clock, Duration>& abs_time);
-
-    template <class Lock, class Clock, class Duration, class Predicate>
-        bool
-        wait_until(Lock& lock,
-                   const chrono::time_point<Clock, Duration>& abs_time,
-                   Predicate pred);
-
-    template <class Lock, class Rep, class Period>
-        cv_status
-        wait_for(Lock& lock,
-                 const chrono::duration<Rep, Period>& rel_time);
-
-    template <class Lock, class Rep, class Period, class Predicate>
-        bool
-        wait_for(Lock& lock,
-                 const chrono::duration<Rep, Period>& rel_time,
-                 Predicate pred);
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__mutex_base>
-#include <memory>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifndef _LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS condition_variable_any
-{
-    condition_variable __cv_;
-    shared_ptr<mutex>  __mut_;
-public:
-    condition_variable_any();
-
-    void notify_one() _NOEXCEPT;
-    void notify_all() _NOEXCEPT;
-
-    template <class _Lock>
-        void wait(_Lock& __lock);
-    template <class _Lock, class _Predicate>
-        void wait(_Lock& __lock, _Predicate __pred);
-
-    template <class _Lock, class _Clock, class _Duration>
-        cv_status
-        wait_until(_Lock& __lock,
-                   const chrono::time_point<_Clock, _Duration>& __t);
-
-    template <class _Lock, class _Clock, class _Duration, class _Predicate>
-        bool
-        wait_until(_Lock& __lock,
-                   const chrono::time_point<_Clock, _Duration>& __t,
-                   _Predicate __pred);
-
-    template <class _Lock, class _Rep, class _Period>
-        cv_status
-        wait_for(_Lock& __lock,
-                 const chrono::duration<_Rep, _Period>& __d);
-
-    template <class _Lock, class _Rep, class _Period, class _Predicate>
-        bool
-        wait_for(_Lock& __lock,
-                 const chrono::duration<_Rep, _Period>& __d,
-                 _Predicate __pred);
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-condition_variable_any::condition_variable_any()
-    : __mut_(make_shared<mutex>()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-condition_variable_any::notify_one() _NOEXCEPT
-{
-    {lock_guard<mutex> __lx(*__mut_);}
-    __cv_.notify_one();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-condition_variable_any::notify_all() _NOEXCEPT
-{
-    {lock_guard<mutex> __lx(*__mut_);}
-    __cv_.notify_all();
-}
-
-struct __lock_external
-{
-    template <class _Lock>
-    void operator()(_Lock* __m) {__m->lock();}
-};
-
-template <class _Lock>
-void
-condition_variable_any::wait(_Lock& __lock)
-{
-    shared_ptr<mutex> __mut = __mut_;
-    unique_lock<mutex> __lk(*__mut);
-    __lock.unlock();
-    unique_ptr<_Lock, __lock_external> __lxx(&__lock);
-    lock_guard<unique_lock<mutex> > __lx(__lk, adopt_lock);
-    __cv_.wait(__lk);
-}  // __mut_.unlock(), __lock.lock()
-
-template <class _Lock, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-condition_variable_any::wait(_Lock& __lock, _Predicate __pred)
-{
-    while (!__pred())
-        wait(__lock);
-}
-
-template <class _Lock, class _Clock, class _Duration>
-cv_status
-condition_variable_any::wait_until(_Lock& __lock,
-                                   const chrono::time_point<_Clock, _Duration>& __t)
-{
-    shared_ptr<mutex> __mut = __mut_;
-    unique_lock<mutex> __lk(*__mut);
-    __lock.unlock();
-    unique_ptr<_Lock, __lock_external> __lxx(&__lock);
-    lock_guard<unique_lock<mutex> > __lx(__lk, adopt_lock);
-    return __cv_.wait_until(__lk, __t);
-}  // __mut_.unlock(), __lock.lock()
-
-template <class _Lock, class _Clock, class _Duration, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-condition_variable_any::wait_until(_Lock& __lock,
-                                   const chrono::time_point<_Clock, _Duration>& __t,
-                                   _Predicate __pred)
-{
-    while (!__pred())
-        if (wait_until(__lock, __t) == cv_status::timeout)
-            return __pred();
-    return true;
-}
-
-template <class _Lock, class _Rep, class _Period>
-inline _LIBCPP_INLINE_VISIBILITY
-cv_status
-condition_variable_any::wait_for(_Lock& __lock,
-                                 const chrono::duration<_Rep, _Period>& __d)
-{
-    return wait_until(__lock, chrono::steady_clock::now() + __d);
-}
-
-template <class _Lock, class _Rep, class _Period, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-condition_variable_any::wait_for(_Lock& __lock,
-                                 const chrono::duration<_Rep, _Period>& __d,
-                                 _Predicate __pred)
-{
-    return wait_until(__lock, chrono::steady_clock::now() + __d,
-                      _VSTD::move(__pred));
-}
-
-_LIBCPP_FUNC_VIS
-void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk);
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_CONDITION_VARIABLE
diff --git a/include.new/c++/v1/csetjmp b/include.new/c++/v1/csetjmp
deleted file mode 100644
index d0b2c07..0000000
--- a/include.new/c++/v1/csetjmp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- csetjmp ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSETJMP
-#define _LIBCPP_CSETJMP
-
-/*
-    csetjmp synopsis
-
-Macros:
-
-    setjmp
-
-namespace std
-{
-
-Types:
-
-    jmp_buf
-
-void longjmp(jmp_buf env, int val);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <setjmp.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifndef setjmp
-#define setjmp(env) setjmp(env)
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::jmp_buf;
-using ::longjmp;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSETJMP
diff --git a/include.new/c++/v1/csignal b/include.new/c++/v1/csignal
deleted file mode 100644
index 9728266..0000000
--- a/include.new/c++/v1/csignal
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- csignal ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSIGNAL
-#define _LIBCPP_CSIGNAL
-
-/*
-    csignal synopsis
-
-Macros:
-
-    SIG_DFL
-    SIG_ERR
-    SIG_IGN
-    SIGABRT
-    SIGFPE
-    SIGILL
-    SIGINT
-    SIGSEGV
-    SIGTERM
-
-namespace std
-{
-
-Types:
-
-    sig_atomic_t
-
-void (*signal(int sig, void (*func)(int)))(int);
-int raise(int sig);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <signal.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::sig_atomic_t;
-using ::signal;
-using ::raise;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSIGNAL
diff --git a/include.new/c++/v1/cstdarg b/include.new/c++/v1/cstdarg
deleted file mode 100644
index c8b6999..0000000
--- a/include.new/c++/v1/cstdarg
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstdarg ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDARG
-#define _LIBCPP_CSTDARG
-
-/*
-    cstdarg synopsis
-
-Macros:
-
-    type va_arg(va_list ap, type);
-    void va_copy(va_list dest, va_list src);  // C99
-    void va_end(va_list ap);
-    void va_start(va_list ap, parmN);
-
-namespace std
-{
-
-Types:
-
-    va_list
-
-}  // std
-
-*/
-
-#include <__config>
-#include <stdarg.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::va_list;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTDARG
diff --git a/include.new/c++/v1/cstdbool b/include.new/c++/v1/cstdbool
deleted file mode 100644
index 2c764a6..0000000
--- a/include.new/c++/v1/cstdbool
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstdbool ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDBOOL
-#define _LIBCPP_CSTDBOOL
-
-/*
-    cstdbool synopsis
-
-Macros:
-
-    __bool_true_false_are_defined
-
-*/
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#undef __bool_true_false_are_defined
-#define __bool_true_false_are_defined 1
-
-#endif  // _LIBCPP_CSTDBOOL
diff --git a/include.new/c++/v1/cstddef b/include.new/c++/v1/cstddef
deleted file mode 100644
index c3ca64a..0000000
--- a/include.new/c++/v1/cstddef
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstddef ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDDEF
-#define _LIBCPP_CSTDDEF
-
-/*
-    cstddef synopsis
-
-Macros:
-
-    offsetof(type,member-designator)
-    NULL
-
-namespace std
-{
-
-Types:
-
-    ptrdiff_t
-    size_t
-    max_align_t
-    nullptr_t
-
-}  // std
-
-*/
-
-#include <__config>
-
-#include <stddef.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::ptrdiff_t;
-using ::size_t;
-
-#if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T)
-// Re-use the compiler's <stddef.h> max_align_t where possible.
-using ::max_align_t;
-#else
-typedef long double max_align_t;
-#endif
-
-#ifdef _LIBCPP_HAS_NO_NULLPTR
-
-struct _LIBCPP_TYPE_VIS_ONLY nullptr_t
-{
-    void* __lx;
-
-    struct __nat {int __for_bool_;};
-
-    _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t() : __lx(0) {}
-    _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t(int __nat::*) : __lx(0) {}
-
-    _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR operator int __nat::*() const {return 0;}
-
-    template <class _Tp>
-        _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR
-        operator _Tp* () const {return 0;}
-
-    template <class _Tp, class _Up>
-        _LIBCPP_ALWAYS_INLINE
-        operator _Tp _Up::* () const {return 0;}
-
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator==(nullptr_t, nullptr_t) {return true;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator!=(nullptr_t, nullptr_t) {return false;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator<(nullptr_t, nullptr_t) {return false;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator<=(nullptr_t, nullptr_t) {return true;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator>(nullptr_t, nullptr_t) {return false;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator>=(nullptr_t, nullptr_t) {return true;}
-};
-
-inline _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t __get_nullptr_t() {return nullptr_t(0);}
-
-#define nullptr _VSTD::__get_nullptr_t()
-
-#endif  // _LIBCPP_HAS_NO_NULLPTR
-
-_LIBCPP_END_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_NULLPTR
-
-namespace std
-{
-    typedef decltype(nullptr) nullptr_t;
-}
-
-#endif  // _LIBCPP_HAS_NO_NULLPTR
-
-#endif  // _LIBCPP_CSTDDEF
diff --git a/include.new/c++/v1/cstdint b/include.new/c++/v1/cstdint
deleted file mode 100644
index 7a187d3..0000000
--- a/include.new/c++/v1/cstdint
+++ /dev/null
@@ -1,191 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstdint ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDINT
-#define _LIBCPP_CSTDINT
-
-/*
-    cstdint synopsis
-
-Macros:
-
-    INT8_MIN
-    INT16_MIN
-    INT32_MIN
-    INT64_MIN
-
-    INT8_MAX
-    INT16_MAX
-    INT32_MAX
-    INT64_MAX
-
-    UINT8_MAX
-    UINT16_MAX
-    UINT32_MAX
-    UINT64_MAX
-
-    INT_LEAST8_MIN
-    INT_LEAST16_MIN
-    INT_LEAST32_MIN
-    INT_LEAST64_MIN
-
-    INT_LEAST8_MAX
-    INT_LEAST16_MAX
-    INT_LEAST32_MAX
-    INT_LEAST64_MAX
-
-    UINT_LEAST8_MAX
-    UINT_LEAST16_MAX
-    UINT_LEAST32_MAX
-    UINT_LEAST64_MAX
-
-    INT_FAST8_MIN
-    INT_FAST16_MIN
-    INT_FAST32_MIN
-    INT_FAST64_MIN
-
-    INT_FAST8_MAX
-    INT_FAST16_MAX
-    INT_FAST32_MAX
-    INT_FAST64_MAX
-
-    UINT_FAST8_MAX
-    UINT_FAST16_MAX
-    UINT_FAST32_MAX
-    UINT_FAST64_MAX
-
-    INTPTR_MIN
-    INTPTR_MAX
-    UINTPTR_MAX
-
-    INTMAX_MIN
-    INTMAX_MAX
-
-    UINTMAX_MAX
-
-    PTRDIFF_MIN
-    PTRDIFF_MAX
-
-    SIG_ATOMIC_MIN
-    SIG_ATOMIC_MAX
-
-    SIZE_MAX
-
-    WCHAR_MIN
-    WCHAR_MAX
-
-    WINT_MIN
-    WINT_MAX
-
-    INT8_C(value)
-    INT16_C(value)
-    INT32_C(value)
-    INT64_C(value)
-
-    UINT8_C(value)
-    UINT16_C(value)
-    UINT32_C(value)
-    UINT64_C(value)
-
-    INTMAX_C(value)
-    UINTMAX_C(value)
-
-namespace std
-{
-
-Types:
-
-    int8_t
-    int16_t
-    int32_t
-    int64_t
-
-    uint8_t
-    uint16_t
-    uint32_t
-    uint64_t
-
-    int_least8_t
-    int_least16_t
-    int_least32_t
-    int_least64_t
-
-    uint_least8_t
-    uint_least16_t
-    uint_least32_t
-    uint_least64_t
-
-    int_fast8_t
-    int_fast16_t
-    int_fast32_t
-    int_fast64_t
-
-    uint_fast8_t
-    uint_fast16_t
-    uint_fast32_t
-    uint_fast64_t
-
-    intptr_t
-    uintptr_t
-
-    intmax_t
-    uintmax_t
-
-}  // std
-*/
-
-#include <__config>
-#include <stdint.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using::int8_t;
-using::int16_t;
-using::int32_t;
-using::int64_t;
-
-using::uint8_t;
-using::uint16_t;
-using::uint32_t;
-using::uint64_t;
-
-using::int_least8_t;
-using::int_least16_t;
-using::int_least32_t;
-using::int_least64_t;
-
-using::uint_least8_t;
-using::uint_least16_t;
-using::uint_least32_t;
-using::uint_least64_t;
-
-using::int_fast8_t;
-using::int_fast16_t;
-using::int_fast32_t;
-using::int_fast64_t;
-
-using::uint_fast8_t;
-using::uint_fast16_t;
-using::uint_fast32_t;
-using::uint_fast64_t;
-
-using::intptr_t;
-using::uintptr_t;
-
-using::intmax_t;
-using::uintmax_t;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTDINT
diff --git a/include.new/c++/v1/cstdio b/include.new/c++/v1/cstdio
deleted file mode 100644
index ce3af4d..0000000
--- a/include.new/c++/v1/cstdio
+++ /dev/null
@@ -1,182 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- cstdio ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDIO
-#define _LIBCPP_CSTDIO
-
-/*
-    cstdio synopsis
-
-Macros:
-
-    BUFSIZ
-    EOF
-    FILENAME_MAX
-    FOPEN_MAX
-    L_tmpnam
-    NULL
-    SEEK_CUR
-    SEEK_END
-    SEEK_SET
-    TMP_MAX
-    _IOFBF
-    _IOLBF
-    _IONBF
-    stderr
-    stdin
-    stdout
-
-namespace std
-{
-
-Types:
-
-FILE
-fpos_t
-size_t
-
-int remove(const char* filename);
-int rename(const char* old, const char* new);
-FILE* tmpfile(void);
-char* tmpnam(char* s);
-int fclose(FILE* stream);
-int fflush(FILE* stream);
-FILE* fopen(const char* restrict filename, const char* restrict mode);
-FILE* freopen(const char* restrict filename, const char * restrict mode,
-              FILE * restrict stream);
-void setbuf(FILE* restrict stream, char* restrict buf);
-int setvbuf(FILE* restrict stream, char* restrict buf, int mode, size_t size);
-int fprintf(FILE* restrict stream, const char* restrict format, ...);
-int fscanf(FILE* restrict stream, const char * restrict format, ...);
-int printf(const char* restrict format, ...);
-int scanf(const char* restrict format, ...);
-int snprintf(char* restrict s, size_t n, const char* restrict format, ...);    // C99
-int sprintf(char* restrict s, const char* restrict format, ...);
-int sscanf(const char* restrict s, const char* restrict format, ...);
-int vfprintf(FILE* restrict stream, const char* restrict format, va_list arg);
-int vfscanf(FILE* restrict stream, const char* restrict format, va_list arg);  // C99
-int vprintf(const char* restrict format, va_list arg);
-int vscanf(const char* restrict format, va_list arg);                          // C99
-int vsnprintf(char* restrict s, size_t n, const char* restrict format,         // C99
-              va_list arg);
-int vsprintf(char* restrict s, const char* restrict format, va_list arg);
-int vsscanf(const char* restrict s, const char* restrict format, va_list arg); // C99
-int fgetc(FILE* stream);
-char* fgets(char* restrict s, int n, FILE* restrict stream);
-int fputc(int c, FILE* stream);
-int fputs(const char* restrict s, FILE* restrict stream);
-int getc(FILE* stream);
-int getchar(void);
-char* gets(char* s);  // removed in C++14
-int putc(int c, FILE* stream);
-int putchar(int c);
-int puts(const char* s);
-int ungetc(int c, FILE* stream);
-size_t fread(void* restrict ptr, size_t size, size_t nmemb,
-             FILE* restrict stream);
-size_t fwrite(const void* restrict ptr, size_t size, size_t nmemb,
-              FILE* restrict stream);
-int fgetpos(FILE* restrict stream, fpos_t* restrict pos);
-int fseek(FILE* stream, long offset, int whence);
-int fsetpos(FILE*stream, const fpos_t* pos);
-long ftell(FILE* stream);
-void rewind(FILE* stream);
-void clearerr(FILE* stream);
-int feof(FILE* stream);
-int ferror(FILE* stream);
-void perror(const char* s);
-
-}  // std
-*/
-
-#include <__config>
-#include <stdio.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-// snprintf
-#if defined(_LIBCPP_MSVCRT)
-#include "support/win32/support.h"
-#endif
-
-#ifdef getc
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_getc(FILE* __stream) {return getc(__stream);}
-#undef getc
-inline _LIBCPP_INLINE_VISIBILITY int getc(FILE* __stream) {return __libcpp_getc(__stream);}
-#endif  // getc
-
-#ifdef putc
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_putc(int __c, FILE* __stream) {return putc(__c, __stream);}
-#undef putc
-inline _LIBCPP_INLINE_VISIBILITY int putc(int __c, FILE* __stream) {return __libcpp_putc(__c, __stream);}
-#endif  // putc
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::FILE;
-using ::fpos_t;
-using ::size_t;
-
-using ::remove;
-using ::rename;
-using ::tmpfile;
-using ::tmpnam;
-using ::fclose;
-using ::fflush;
-using ::fopen;
-using ::freopen;
-using ::setbuf;
-using ::setvbuf;
-using ::fprintf;
-using ::fscanf;
-using ::printf;
-using ::scanf;
-using ::snprintf;
-using ::sprintf;
-using ::sscanf;
-#ifndef _LIBCPP_MSVCRT
-using ::vfprintf;
-using ::vfscanf;
-using ::vscanf;
-using ::vsscanf;
-#endif // _LIBCPP_MSVCRT
-using ::vprintf;
-using ::vsnprintf;
-using ::vsprintf;
-using ::fgetc;
-using ::fgets;
-using ::fputc;
-using ::fputs;
-using ::getc;
-using ::getchar;
-#if _LIBCPP_STD_VER <= 11
-using ::gets;
-#endif
-using ::putc;
-using ::putchar;
-using ::puts;
-using ::ungetc;
-using ::fread;
-using ::fwrite;
-using ::fgetpos;
-using ::fseek;
-using ::fsetpos;
-using ::ftell;
-using ::rewind;
-using ::clearerr;
-using ::feof;
-using ::ferror;
-using ::perror;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTDIO
diff --git a/include.new/c++/v1/cstdlib b/include.new/c++/v1/cstdlib
deleted file mode 100644
index 152b891..0000000
--- a/include.new/c++/v1/cstdlib
+++ /dev/null
@@ -1,172 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstdlib ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDLIB
-#define _LIBCPP_CSTDLIB
-
-/*
-    cstdlib synopsis
-
-Macros:
-
-    EXIT_FAILURE
-    EXIT_SUCCESS
-    MB_CUR_MAX
-    NULL
-    RAND_MAX
-
-namespace std
-{
-
-Types:
-
-    size_t
-    div_t
-    ldiv_t
-    lldiv_t                                                               // C99
-
-double    atof (const char* nptr);
-int       atoi (const char* nptr);
-long      atol (const char* nptr);
-long long atoll(const char* nptr);                                        // C99
-double             strtod  (const char* restrict nptr, char** restrict endptr);
-float              strtof  (const char* restrict nptr, char** restrict endptr); // C99
-long double        strtold (const char* restrict nptr, char** restrict endptr); // C99
-long               strtol  (const char* restrict nptr, char** restrict endptr, int base);
-long long          strtoll (const char* restrict nptr, char** restrict endptr, int base); // C99
-unsigned long      strtoul (const char* restrict nptr, char** restrict endptr, int base);
-unsigned long long strtoull(const char* restrict nptr, char** restrict endptr, int base); // C99
-int rand(void);
-void srand(unsigned int seed);
-void* calloc(size_t nmemb, size_t size);
-void free(void* ptr);
-void* malloc(size_t size);
-void* realloc(void* ptr, size_t size);
-void abort(void);
-int atexit(void (*func)(void));
-void exit(int status);
-void _Exit(int status);
-char* getenv(const char* name);
-int system(const char* string);
-void* bsearch(const void* key, const void* base, size_t nmemb, size_t size,
-              int (*compar)(const void *, const void *));
-void qsort(void* base, size_t nmemb, size_t size,
-           int (*compar)(const void *, const void *));
-int         abs(      int j);
-long        abs(     long j);
-long long   abs(long long j);                                             // C++0X
-long       labs(     long j);
-long long llabs(long long j);                                             // C99
-div_t     div(      int numer,       int denom);
-ldiv_t    div(     long numer,      long denom);
-lldiv_t   div(long long numer, long long denom);                          // C++0X
-ldiv_t   ldiv(     long numer,      long denom);
-lldiv_t lldiv(long long numer, long long denom);                          // C99
-int mblen(const char* s, size_t n);
-int mbtowc(wchar_t* restrict pwc, const char* restrict s, size_t n);
-int wctomb(char* s, wchar_t wchar);
-size_t mbstowcs(wchar_t* restrict pwcs, const char* restrict s, size_t n);
-size_t wcstombs(char* restrict s, const wchar_t* restrict pwcs, size_t n);
-int at_quick_exit(void (*func)(void))                                     // C++11
-void quick_exit(int status);                                              // C++11
-void *aligned_alloc(size_t alignment, size_t size);                       // C11
-
-}  // std
-
-*/
-
-#include <__config>
-#include <stdlib.h>
-#ifdef _LIBCPP_MSVCRT
-#include "support/win32/locale_win32.h"
-#endif // _LIBCPP_MSVCRT
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::size_t;
-using ::div_t;
-using ::ldiv_t;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::lldiv_t;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::atof;
-using ::atoi;
-using ::atol;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::atoll;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::strtod;
-using ::strtof;
-using ::strtold;
-using ::strtol;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::strtoll;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::strtoul;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::strtoull;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::rand;
-using ::srand;
-using ::calloc;
-using ::free;
-using ::malloc;
-using ::realloc;
-using ::abort;
-using ::atexit;
-using ::exit;
-using ::_Exit;
-using ::getenv;
-using ::system;
-using ::bsearch;
-using ::qsort;
-using ::abs;
-using ::labs;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::llabs;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::div;
-using ::ldiv;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::lldiv;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::mblen;
-using ::mbtowc;
-using ::wctomb;
-using ::mbstowcs;
-using ::wcstombs;
-#ifdef _LIBCPP_HAS_QUICK_EXIT
-using ::at_quick_exit;
-using ::quick_exit;
-#endif
-#ifdef _LIBCPP_HAS_C11_FEATURES
-using ::aligned_alloc;
-#endif
-
-// MSVCRT already has the correct prototype in <stdlib.h> #ifdef __cplusplus
-#if !defined(_LIBCPP_MSVCRT) && !defined(__sun__) && !defined(_AIX)
-inline _LIBCPP_INLINE_VISIBILITY long      abs(     long __x) _NOEXCEPT {return  labs(__x);}
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);}
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-
-inline _LIBCPP_INLINE_VISIBILITY  ldiv_t div(     long __x,      long __y) _NOEXCEPT {return  ldiv(__x, __y);}
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-inline _LIBCPP_INLINE_VISIBILITY lldiv_t div(long long __x, long long __y) _NOEXCEPT {return lldiv(__x, __y);}
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-#endif // _LIBCPP_MSVCRT
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTDLIB
diff --git a/include.new/c++/v1/cstring b/include.new/c++/v1/cstring
deleted file mode 100644
index 21c9155..0000000
--- a/include.new/c++/v1/cstring
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstring ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTRING
-#define _LIBCPP_CSTRING
-
-/*
-    cstring synopsis
-
-Macros:
-
-    NULL
-
-namespace std
-{
-
-Types:
-
-    size_t
-
-void* memcpy(void* restrict s1, const void* restrict s2, size_t n);
-void* memmove(void* s1, const void* s2, size_t n);
-char* strcpy (char* restrict s1, const char* restrict s2);
-char* strncpy(char* restrict s1, const char* restrict s2, size_t n);
-char* strcat (char* restrict s1, const char* restrict s2);
-char* strncat(char* restrict s1, const char* restrict s2, size_t n);
-int memcmp(const void* s1, const void* s2, size_t n);
-int strcmp (const char* s1, const char* s2);
-int strncmp(const char* s1, const char* s2, size_t n);
-int strcoll(const char* s1, const char* s2);
-size_t strxfrm(char* restrict s1, const char* restrict s2, size_t n);
-const void* memchr(const void* s, int c, size_t n);
-      void* memchr(      void* s, int c, size_t n);
-const char* strchr(const char* s, int c);
-      char* strchr(      char* s, int c);
-size_t strcspn(const char* s1, const char* s2);
-const char* strpbrk(const char* s1, const char* s2);
-      char* strpbrk(      char* s1, const char* s2);
-const char* strrchr(const char* s, int c);
-      char* strrchr(      char* s, int c);
-size_t strspn(const char* s1, const char* s2);
-const char* strstr(const char* s1, const char* s2);
-      char* strstr(      char* s1, const char* s2);
-char* strtok(char* restrict s1, const char* restrict s2);
-void* memset(void* s, int c, size_t n);
-char* strerror(int errnum);
-size_t strlen(const char* s);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <string.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::size_t;
-using ::memcpy;
-using ::memmove;
-using ::strcpy;
-using ::strncpy;
-using ::strcat;
-using ::strncat;
-using ::memcmp;
-using ::strcmp;
-using ::strncmp;
-using ::strcoll;
-using ::strxfrm;
-
-using ::memchr;
-
-using ::strchr;
-
-using ::strcspn;
-
-using ::strpbrk;
-
-using ::strrchr;
-
-using ::strspn;
-
-using ::strstr;
-
-// MSVCRT, GNU libc and its derivates already have the correct prototype in <string.h> #ifdef __cplusplus
-#if !defined(__GLIBC__) && !defined(_LIBCPP_MSVCRT) && !defined(__sun__) && !defined(_STRING_H_CPLUSPLUS_98_CONFORMANCE_)
-inline _LIBCPP_INLINE_VISIBILITY       char* strchr(      char* __s, int __c) {return ::strchr(__s, __c);}
-inline _LIBCPP_INLINE_VISIBILITY       char* strpbrk(      char* __s1, const char* __s2) {return ::strpbrk(__s1, __s2);}
-inline _LIBCPP_INLINE_VISIBILITY       char* strrchr(      char* __s, int __c) {return ::strrchr(__s, __c);}
-inline _LIBCPP_INLINE_VISIBILITY       void* memchr(      void* __s, int __c, size_t __n) {return ::memchr(__s, __c, __n);}
-inline _LIBCPP_INLINE_VISIBILITY       char* strstr(      char* __s1, const char* __s2) {return ::strstr(__s1, __s2);}
-#endif
-
-using ::strtok;
-using ::memset;
-using ::strerror;
-using ::strlen;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTRING
diff --git a/include.new/c++/v1/ctgmath b/include.new/c++/v1/ctgmath
deleted file mode 100644
index 535eb7d..0000000
--- a/include.new/c++/v1/ctgmath
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- ctgmath -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CTGMATH
-#define _LIBCPP_CTGMATH
-
-/*
-    ctgmath synopsis
-
-#include <ccomplex>
-#include <cmath>
-
-*/
-
-#include <ccomplex>
-#include <cmath>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_CTGMATH
diff --git a/include.new/c++/v1/ctime b/include.new/c++/v1/ctime
deleted file mode 100644
index fc4eb26..0000000
--- a/include.new/c++/v1/ctime
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- ctime -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CTIME
-#define _LIBCPP_CTIME
-
-/*
-    ctime synopsis
-
-Macros:
-
-    NULL
-    CLOCKS_PER_SEC
-
-namespace std
-{
-
-Types:
-
-    clock_t
-    size_t
-    time_t
-    tm
-
-clock_t clock();
-double difftime(time_t time1, time_t time0);
-time_t mktime(tm* timeptr);
-time_t time(time_t* timer);
-char* asctime(const tm* timeptr);
-char* ctime(const time_t* timer);
-tm*    gmtime(const time_t* timer);
-tm* localtime(const time_t* timer);
-size_t strftime(char* restrict s, size_t maxsize, const char* restrict format,
-                const tm* restrict timeptr);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <time.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::clock_t;
-using ::size_t;
-using ::time_t;
-using ::tm;
-using ::clock;
-using ::difftime;
-using ::mktime;
-using ::time;
-using ::asctime;
-using ::ctime;
-using ::gmtime;
-using ::localtime;
-using ::strftime;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CTIME
diff --git a/include.new/c++/v1/cwchar b/include.new/c++/v1/cwchar
deleted file mode 100644
index 9f51587..0000000
--- a/include.new/c++/v1/cwchar
+++ /dev/null
@@ -1,217 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cwchar -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CWCHAR
-#define _LIBCPP_CWCHAR
-
-/*
-    cwchar synopsis
-
-Macros:
-
-    NULL
-    WCHAR_MAX
-    WCHAR_MIN
-    WEOF
-
-namespace std
-{
-
-Types:
-
-    mbstate_t
-    size_t
-    tm
-    wint_t
-
-int fwprintf(FILE* restrict stream, const wchar_t* restrict format, ...);
-int fwscanf(FILE* restrict stream, const wchar_t* restrict format, ...);
-int swprintf(wchar_t* restrict s, size_t n, const wchar_t* restrict format, ...);
-int swscanf(const wchar_t* restrict s, const wchar_t* restrict format, ...);
-int vfwprintf(FILE* restrict stream, const wchar_t* restrict format, va_list arg);
-int vfwscanf(FILE* restrict stream, const wchar_t* restrict format, va_list arg);  // C99
-int vswprintf(wchar_t* restrict s, size_t n, const wchar_t* restrict format, va_list arg);
-int vswscanf(const wchar_t* restrict s, const wchar_t* restrict format, va_list arg);  // C99
-int vwprintf(const wchar_t* restrict format, va_list arg);
-int vwscanf(const wchar_t* restrict format, va_list arg);  // C99
-int wprintf(const wchar_t* restrict format, ...);
-int wscanf(const wchar_t* restrict format, ...);
-wint_t fgetwc(FILE* stream);
-wchar_t* fgetws(wchar_t* restrict s, int n, FILE* restrict stream);
-wint_t fputwc(wchar_t c, FILE* stream);
-int fputws(const wchar_t* restrict s, FILE* restrict stream);
-int fwide(FILE* stream, int mode);
-wint_t getwc(FILE* stream);
-wint_t getwchar();
-wint_t putwc(wchar_t c, FILE* stream);
-wint_t putwchar(wchar_t c);
-wint_t ungetwc(wint_t c, FILE* stream);
-double wcstod(const wchar_t* restrict nptr, wchar_t** restrict endptr);
-float wcstof(const wchar_t* restrict nptr, wchar_t** restrict endptr);         // C99
-long double wcstold(const wchar_t* restrict nptr, wchar_t** restrict endptr);  // C99
-long wcstol(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
-long long wcstoll(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);  // C99
-unsigned long wcstoul(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
-unsigned long long wcstoull(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);  // C99
-wchar_t* wcscpy(wchar_t* restrict s1, const wchar_t* restrict s2);
-wchar_t* wcsncpy(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-wchar_t* wcscat(wchar_t* restrict s1, const wchar_t* restrict s2);
-wchar_t* wcsncat(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-int wcscmp(const wchar_t* s1, const wchar_t* s2);
-int wcscoll(const wchar_t* s1, const wchar_t* s2);
-int wcsncmp(const wchar_t* s1, const wchar_t* s2, size_t n);
-size_t wcsxfrm(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-const wchar_t* wcschr(const wchar_t* s, wchar_t c);
-      wchar_t* wcschr(      wchar_t* s, wchar_t c);
-size_t wcscspn(const wchar_t* s1, const wchar_t* s2);
-size_t wcslen(const wchar_t* s);
-const wchar_t* wcspbrk(const wchar_t* s1, const wchar_t* s2);
-      wchar_t* wcspbrk(      wchar_t* s1, const wchar_t* s2);
-const wchar_t* wcsrchr(const wchar_t* s, wchar_t c);
-      wchar_t* wcsrchr(      wchar_t* s, wchar_t c);
-size_t wcsspn(const wchar_t* s1, const wchar_t* s2);
-const wchar_t* wcsstr(const wchar_t* s1, const wchar_t* s2);
-      wchar_t* wcsstr(      wchar_t* s1, const wchar_t* s2);
-wchar_t* wcstok(wchar_t* restrict s1, const wchar_t* restrict s2, wchar_t** restrict ptr);
-const wchar_t* wmemchr(const wchar_t* s, wchar_t c, size_t n);
-      wchar_t* wmemchr(      wchar_t* s, wchar_t c, size_t n);
-int wmemcmp(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-wchar_t* wmemcpy(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-wchar_t* wmemmove(wchar_t* s1, const wchar_t* s2, size_t n);
-wchar_t* wmemset(wchar_t* s, wchar_t c, size_t n);
-size_t wcsftime(wchar_t* restrict s, size_t maxsize, const wchar_t* restrict format,
-                const tm* restrict timeptr);
-wint_t btowc(int c);
-int wctob(wint_t c);
-int mbsinit(const mbstate_t* ps);
-size_t mbrlen(const char* restrict s, size_t n, mbstate_t* restrict ps);
-size_t mbrtowc(wchar_t* restrict pwc, const char* restrict s, size_t n, mbstate_t* restrict ps);
-size_t wcrtomb(char* restrict s, wchar_t wc, mbstate_t* restrict ps);
-size_t mbsrtowcs(wchar_t* restrict dst, const char** restrict src, size_t len,
-                 mbstate_t* restrict ps);
-size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
-                 mbstate_t* restrict ps);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cwctype>
-#include <wchar.h>
-#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-#include <support/win32/support.h> // pull in *swprintf defines
-#endif // _LIBCPP_MSVCRT
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::mbstate_t;
-using ::size_t;
-using ::tm;
-using ::wint_t;
-using ::FILE;
-using ::fwprintf;
-using ::fwscanf;
-using ::swprintf;
-using ::vfwprintf;
-using ::vswprintf;
-using ::vwprintf;
-#ifndef _LIBCPP_MSVCRT
-using ::swscanf;
-using ::vfwscanf;
-using ::vswscanf;
-using ::vwscanf;
-#endif // _LIBCPP_MSVCRT
-using ::wprintf;
-using ::wscanf;
-using ::fgetwc;
-using ::fgetws;
-using ::fputwc;
-using ::fputws;
-using ::fwide;
-using ::getwc;
-using ::getwchar;
-using ::putwc;
-using ::putwchar;
-using ::ungetwc;
-using ::wcstod;
-#ifndef _LIBCPP_MSVCRT
-using ::wcstof;
-using ::wcstold;
-#endif // _LIBCPP_MSVCRT
-using ::wcstol;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::wcstoll;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::wcstoul;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::wcstoull;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::wcscpy;
-using ::wcsncpy;
-using ::wcscat;
-using ::wcsncat;
-using ::wcscmp;
-using ::wcscoll;
-using ::wcsncmp;
-using ::wcsxfrm;
-
-#if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)
-
-using ::wcschr;
-using ::wcspbrk;
-using ::wcsrchr;
-using ::wcsstr;
-using ::wmemchr;
-
-#else
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcschr(const wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcschr(      wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcspbrk(const wchar_t* __s1, const wchar_t* __s2) {return ::wcspbrk(__s1, __s2);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcspbrk(      wchar_t* __s1, const wchar_t* __s2) {return ::wcspbrk(__s1, __s2);}
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcsrchr(const wchar_t* __s, wchar_t __c) {return ::wcsrchr(__s, __c);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcsrchr(      wchar_t* __s, wchar_t __c) {return ::wcsrchr(__s, __c);}
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcsstr(const wchar_t* __s1, const wchar_t* __s2) {return ::wcsstr(__s1, __s2);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcsstr(      wchar_t* __s1, const wchar_t* __s2) {return ::wcsstr(__s1, __s2);}
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wmemchr(const wchar_t* __s, wchar_t __c, size_t __n) {return ::wmemchr(__s, __c, __n);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wmemchr(      wchar_t* __s, wchar_t __c, size_t __n) {return ::wmemchr(__s, __c, __n);}
-
-#endif
-
-using ::wcscspn;
-using ::wcslen;
-using ::wcsspn;
-using ::wcstok;
-using ::wmemcmp;
-using ::wmemcpy;
-using ::wmemmove;
-using ::wmemset;
-using ::wcsftime;
-using ::btowc;
-using ::wctob;
-using ::mbsinit;
-using ::mbrlen;
-using ::mbrtowc;
-using ::wcrtomb;
-using ::mbsrtowcs;
-using ::wcsrtombs;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CWCHAR
diff --git a/include.new/c++/v1/cwctype b/include.new/c++/v1/cwctype
deleted file mode 100644
index 4f89b52..0000000
--- a/include.new/c++/v1/cwctype
+++ /dev/null
@@ -1,213 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cwctype ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CWCTYPE
-#define _LIBCPP_CWCTYPE
-
-/*
-    cwctype synopsis
-
-Macros:
-
-    WEOF
-
-namespace std
-{
-
-Types:
-
-    wint_t
-    wctrans_t
-    wctype_t
-
-int iswalnum(wint_t wc);
-int iswalpha(wint_t wc);
-int iswblank(wint_t wc);  // C99
-int iswcntrl(wint_t wc);
-int iswdigit(wint_t wc);
-int iswgraph(wint_t wc);
-int iswlower(wint_t wc);
-int iswprint(wint_t wc);
-int iswpunct(wint_t wc);
-int iswspace(wint_t wc);
-int iswupper(wint_t wc);
-int iswxdigit(wint_t wc);
-int iswctype(wint_t wc, wctype_t desc);
-wctype_t wctype(const char* property);
-wint_t towlower(wint_t wc);
-wint_t towupper(wint_t wc);
-wint_t towctrans(wint_t wc, wctrans_t desc);
-wctrans_t wctrans(const char* property);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cctype>
-#include <wctype.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::wint_t;
-using ::wctrans_t;
-using ::wctype_t;
-
-#ifdef iswalnum
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswalnum(wint_t __wc) {return iswalnum(__wc);}
-#undef iswalnum
-inline _LIBCPP_INLINE_VISIBILITY int iswalnum(wint_t __wc) {return __libcpp_iswalnum(__wc);}
-#else  // iswalnum
-using ::iswalnum;
-#endif
-
-#ifdef iswalpha
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswalpha(wint_t __wc) {return iswalpha(__wc);}
-#undef iswalpha
-inline _LIBCPP_INLINE_VISIBILITY int iswalpha(wint_t __wc) {return __libcpp_iswalpha(__wc);}
-#else  // iswalpha
-using ::iswalpha;
-#endif
-
-#ifdef iswblank
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswblank(wint_t __wc) {return iswblank(__wc);}
-#undef iswblank
-inline _LIBCPP_INLINE_VISIBILITY int iswblank(wint_t __wc) {return __libcpp_iswblank(__wc);}
-#else  // iswblank
-using ::iswblank;
-#endif
-
-#ifdef iswcntrl
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswcntrl(wint_t __wc) {return iswcntrl(__wc);}
-#undef iswcntrl
-inline _LIBCPP_INLINE_VISIBILITY int iswcntrl(wint_t __wc) {return __libcpp_iswcntrl(__wc);}
-#else  // iswcntrl
-using ::iswcntrl;
-#endif
-
-#ifdef iswdigit
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswdigit(wint_t __wc) {return iswdigit(__wc);}
-#undef iswdigit
-inline _LIBCPP_INLINE_VISIBILITY int iswdigit(wint_t __wc) {return __libcpp_iswdigit(__wc);}
-#else  // iswdigit
-using ::iswdigit;
-#endif
-
-#ifdef iswgraph
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswgraph(wint_t __wc) {return iswgraph(__wc);}
-#undef iswgraph
-inline _LIBCPP_INLINE_VISIBILITY int iswgraph(wint_t __wc) {return __libcpp_iswgraph(__wc);}
-#else  // iswgraph
-using ::iswgraph;
-#endif
-
-#ifdef iswlower
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswlower(wint_t __wc) {return iswlower(__wc);}
-#undef iswlower
-inline _LIBCPP_INLINE_VISIBILITY int iswlower(wint_t __wc) {return __libcpp_iswlower(__wc);}
-#else  // iswlower
-using ::iswlower;
-#endif
-
-#ifdef iswprint
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswprint(wint_t __wc) {return iswprint(__wc);}
-#undef iswprint
-inline _LIBCPP_INLINE_VISIBILITY int iswprint(wint_t __wc) {return __libcpp_iswprint(__wc);}
-#else  // iswprint
-using ::iswprint;
-#endif
-
-#ifdef iswpunct
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswpunct(wint_t __wc) {return iswpunct(__wc);}
-#undef iswpunct
-inline _LIBCPP_INLINE_VISIBILITY int iswpunct(wint_t __wc) {return __libcpp_iswpunct(__wc);}
-#else  // iswpunct
-using ::iswpunct;
-#endif
-
-#ifdef iswspace
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswspace(wint_t __wc) {return iswspace(__wc);}
-#undef iswspace
-inline _LIBCPP_INLINE_VISIBILITY int iswspace(wint_t __wc) {return __libcpp_iswspace(__wc);}
-#else  // iswspace
-using ::iswspace;
-#endif
-
-#ifdef iswupper
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswupper(wint_t __wc) {return iswupper(__wc);}
-#undef iswupper
-inline _LIBCPP_INLINE_VISIBILITY int iswupper(wint_t __wc) {return __libcpp_iswupper(__wc);}
-#else  // iswupper
-using ::iswupper;
-#endif
-
-#ifdef iswxdigit
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswxdigit(wint_t __wc) {return iswxdigit(__wc);}
-#undef iswxdigit
-inline _LIBCPP_INLINE_VISIBILITY int iswxdigit(wint_t __wc) {return __libcpp_iswxdigit(__wc);}
-#else  // iswxdigit
-using ::iswxdigit;
-#endif
-
-#ifdef iswctype
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswctype(wint_t __w, wctype_t __d) {return iswctype(__w, __d);}
-#undef iswctype
-inline _LIBCPP_INLINE_VISIBILITY int iswctype(wint_t __w, wctype_t __d) {return __libcpp_iswctype(__w, __d);}
-#else  // iswctype
-using ::iswctype;
-#endif
-
-#ifdef wctype
-inline _LIBCPP_INLINE_VISIBILITY wctype_t __libcpp_wctype(const char* __p) {return wctype(__p);}
-#undef wctype
-inline _LIBCPP_INLINE_VISIBILITY wctype_t wctype(const char* __p) {return __libcpp_wctype(__p);}
-#else  // wctype
-using ::wctype;
-#endif
-
-#ifdef towlower
-inline _LIBCPP_INLINE_VISIBILITY wint_t __libcpp_towlower(wint_t __wc) {return towlower(__wc);}
-#undef towlower
-inline _LIBCPP_INLINE_VISIBILITY wint_t towlower(wint_t __wc) {return __libcpp_towlower(__wc);}
-#else  // towlower
-using ::towlower;
-#endif
-
-#ifdef towupper
-inline _LIBCPP_INLINE_VISIBILITY wint_t __libcpp_towupper(wint_t __wc) {return towupper(__wc);}
-#undef towupper
-inline _LIBCPP_INLINE_VISIBILITY wint_t towupper(wint_t __wc) {return __libcpp_towupper(__wc);}
-#else  // towupper
-using ::towupper;
-#endif
-
-#ifdef towctrans
-inline _LIBCPP_INLINE_VISIBILITY wint_t __libcpp_towctrans(wint_t __wc, wctype_t __d) {return towctrans(__wc, __d);}
-#undef towctrans
-inline _LIBCPP_INLINE_VISIBILITY wint_t towctrans(wint_t __wc, wctype_t __d) {return __libcpp_towctrans(__wc, __d);}
-#else  // towctrans
-using ::towctrans;
-#endif
-
-#ifdef wctrans
-inline _LIBCPP_INLINE_VISIBILITY wctrans_t __libcpp_wctrans(const char* __p) {return wctrans(__p);}
-#undef wctrans
-inline _LIBCPP_INLINE_VISIBILITY wctrans_t wctrans(const char* __p) {return __libcpp_wctrans(__p);}
-#else  // wctrans
-using ::wctrans;
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CWCTYPE
diff --git a/include.new/c++/v1/cxxabi.h b/include.new/c++/v1/cxxabi.h
deleted file mode 100644
index 411c4c7..0000000
--- a/include.new/c++/v1/cxxabi.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/* 
- * Copyright 2012 David Chisnall. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */ 
-
-#ifndef __CXXABI_H_
-#define __CXXABI_H_
-#include <stddef.h>
-#include <stdint.h>
-#include "unwind.h"
-namespace std 
-{
-	class type_info;
-}
-/*
- * The cxxabi.h header provides a set of public definitions for types and
- * functions defined by the Itanium C++ ABI specification.  For reference, see
- * the ABI specification here:
- *
- * http://sourcery.mentor.com/public/cxx-abi/abi.html
- *
- * All deviations from this specification, unless otherwise noted, are
- * accidental.
- */
-
-#ifdef __cplusplus
-namespace __cxxabiv1 {
-extern "C" {
-#endif
-/**
- * Function type to call when an unexpected exception is encountered.
- */
-typedef void (*unexpected_handler)();
-/**
- * Function type to call when an unrecoverable condition is encountered.
- */
-typedef void (*terminate_handler)();
-
-
-/**
- * Structure used as a header on thrown exceptions.  This is the same layout as
- * defined by the Itanium ABI spec, so should be interoperable with any other
- * implementation of this spec, such as GNU libsupc++.
- *
- * This structure is allocated when an exception is thrown.  Unwinding happens
- * in two phases, the first looks for a handler and the second installs the
- * context.  This structure stores a cache of the handler location between
- * phase 1 and phase 2.  Unfortunately, cleanup information is not cached, so
- * must be looked up in both phases.  This happens for two reasons.  The first
- * is that we don't know how many frames containing cleanups there will be, and
- * we should avoid dynamic allocation during unwinding (the exception may be
- * reporting that we've run out of memory).  The second is that finding
- * cleanups is much cheaper than finding handlers, because we don't have to
- * look at the type table at all.
- *
- * Note: Several fields of this structure have not-very-informative names.
- * These are taken from the ABI spec and have not been changed to make it
- * easier for people referring to to the spec while reading this code.
- */
-struct __cxa_exception
-{
-#if __LP64__
-	/**
-	 * Reference count.  Used to support the C++11 exception_ptr class.  This
-	 * is prepended to the structure in 64-bit mode and squeezed in to the
-	 * padding left before the 64-bit aligned _Unwind_Exception at the end in
-	 * 32-bit mode.
-	 *
-	 * Note that it is safe to extend this structure at the beginning, rather
-	 * than the end, because the public API for creating it returns the address
-	 * of the end (where the exception object can be stored).
-	 */
-	uintptr_t referenceCount;
-#endif
-	/** Type info for the thrown object. */
-	std::type_info *exceptionType;
-	/** Destructor for the object, if one exists. */
-	void (*exceptionDestructor) (void *); 
-	/** Handler called when an exception specification is violated. */
-	unexpected_handler unexpectedHandler;
-	/** Hander called to terminate. */
-	terminate_handler terminateHandler;
-	/**
-	 * Next exception in the list.  If an exception is thrown inside a catch
-	 * block and caught in a nested catch, this points to the exception that
-	 * will be handled after the inner catch block completes.
-	 */
-	__cxa_exception *nextException;
-	/**
-	 * The number of handlers that currently have references to this
-	 * exception.  The top (non-sign) bit of this is used as a flag to indicate
-	 * that the exception is being rethrown, so should not be deleted when its
-	 * handler count reaches 0 (which it doesn't with the top bit set).
-	 */
-	int handlerCount;
-#if defined(__arm__) && !defined(__ARM_DWARF_EH__)
-	/**
-	 * The ARM EH ABI requires the unwind library to keep track of exceptions
-	 * during cleanups.  These support nesting, so we need to keep a list of
-	 * them.
-	 */
-	_Unwind_Exception *nextCleanup;
-	/**
-	 * The number of cleanups that are currently being run on this exception. 
-	 */
-	int cleanupCount;
-#endif
-	/**
-	 * The selector value to be returned when installing the catch handler.
-	 * Used at the call site to determine which catch() block should execute.
-	 * This is found in phase 1 of unwinding then installed in phase 2.
-	 */
-	int handlerSwitchValue;
-	/**
-	 * The action record for the catch.  This is cached during phase 1
-	 * unwinding.
-	 */
-	const char *actionRecord;
-	/**
-	 * Pointer to the language-specific data area (LSDA) for the handler
-	 * frame.  This is unused in this implementation, but set for ABI
-	 * compatibility in case we want to mix code in very weird ways.
-	 */
-	const char *languageSpecificData;
-	/** The cached landing pad for the catch handler.*/
-	void *catchTemp;
-	/**
-	 * The pointer that will be returned as the pointer to the object.  When
-	 * throwing a class and catching a virtual superclass (for example), we
-	 * need to adjust the thrown pointer to make it all work correctly.
-	 */
-	void *adjustedPtr;
-#if !__LP64__
-	/**
-	 * Reference count.  Used to support the C++11 exception_ptr class.  This
-	 * is prepended to the structure in 64-bit mode and squeezed in to the
-	 * padding left before the 64-bit aligned _Unwind_Exception at the end in
-	 * 32-bit mode.
-	 *
-	 * Note that it is safe to extend this structure at the beginning, rather
-	 * than the end, because the public API for creating it returns the address
-	 * of the end (where the exception object can be stored) 
-	 */
-	uintptr_t referenceCount;
-#endif
-	/** The language-agnostic part of the exception header. */
-	_Unwind_Exception unwindHeader;
-};
-
-/**
- * ABI-specified globals structure.  Returned by the __cxa_get_globals()
- * function and its fast variant.  This is a per-thread structure - every
- * thread will have one lazily allocated.
- *
- * This structure is defined by the ABI, so may be used outside of this
- * library.
- */
-struct __cxa_eh_globals
-{
-	/**
-	 * A linked list of exceptions that are currently caught.  There may be
-	 * several of these in nested catch() blocks.
-	 */
-	__cxa_exception *caughtExceptions;
-	/**
-	 * The number of uncaught exceptions.
-	 */
-	unsigned int uncaughtExceptions;
-};
-/**
- * ABI function returning the __cxa_eh_globals structure.
- */
-__cxa_eh_globals *__cxa_get_globals(void);
-/**
- * Version of __cxa_get_globals() assuming that __cxa_get_globals() has already
- * been called at least once by this thread.
- */
-__cxa_eh_globals *__cxa_get_globals_fast(void);
-
-std::type_info * __cxa_current_exception_type();
-
-/**
- * Throws an exception returned by __cxa_current_primary_exception().  This
- * exception may have been caught in another thread.
- */
-void __cxa_rethrow_primary_exception(void* thrown_exception);
-/**
- * Returns the current exception in a form that can be stored in an
- * exception_ptr object and then rethrown by a call to
- * __cxa_rethrow_primary_exception().
- */
-void *__cxa_current_primary_exception(void);
-/**
- * Increments the reference count of an exception.  Called when an
- * exception_ptr is copied.
- */
-void __cxa_increment_exception_refcount(void* thrown_exception);
-/**
- * Decrements the reference count of an exception.  Called when an
- * exception_ptr is deleted.
- */
-void __cxa_decrement_exception_refcount(void* thrown_exception);
-/**
- * Demangles a C++ symbol or type name.  The buffer, if non-NULL, must be
- * allocated with malloc() and must be *n bytes or more long.  This function
- * may call realloc() on the value pointed to by buf, and will return the
- * length of the string via *n.
- *
- * The value pointed to by status is set to one of the following:
- *
- * 0: success
- * -1: memory allocation failure
- * -2: invalid mangled name
- * -3: invalid arguments
- */
-char* __cxa_demangle(const char* mangled_name,
-                     char* buf,
-                     size_t* n,
-                     int* status);
-#ifdef __cplusplus
-} // extern "C"
-} // namespace
-
-namespace abi = __cxxabiv1;
-
-#endif /* __cplusplus */
-#endif /* __CXXABI_H_ */
diff --git a/include.new/c++/v1/deque b/include.new/c++/v1/deque
deleted file mode 100644
index 5602d4a..0000000
--- a/include.new/c++/v1/deque
+++ /dev/null
@@ -1,2873 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- deque -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_DEQUE
-#define _LIBCPP_DEQUE
-
-/*
-    deque synopsis
-
-namespace std
-{
-
-template <class T, class Allocator = allocator<T> >
-class deque
-{
-public:
-    // types:
-    typedef T value_type;
-    typedef Allocator allocator_type;
-
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    // construct/copy/destroy:
-    deque() noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit deque(const allocator_type& a);
-    explicit deque(size_type n);
-    explicit deque(size_type n, const allocator_type& a); // C++14
-    deque(size_type n, const value_type& v);
-    deque(size_type n, const value_type& v, const allocator_type& a);
-    template <class InputIterator>
-        deque(InputIterator f, InputIterator l);
-    template <class InputIterator>
-        deque(InputIterator f, InputIterator l, const allocator_type& a);
-    deque(const deque& c);
-    deque(deque&& c)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    deque(initializer_list<value_type> il, const Allocator& a = allocator_type());
-    deque(const deque& c, const allocator_type& a);
-    deque(deque&& c, const allocator_type& a);
-    ~deque();
-
-    deque& operator=(const deque& c);
-    deque& operator=(deque&& c)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    deque& operator=(initializer_list<value_type> il);
-
-    template <class InputIterator>
-        void assign(InputIterator f, InputIterator l);
-    void assign(size_type n, const value_type& v);
-    void assign(initializer_list<value_type> il);
-
-    allocator_type get_allocator() const noexcept;
-
-    // iterators:
-
-    iterator       begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator       end() noexcept;
-    const_iterator end() const noexcept;
-
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-
-    const_iterator         cbegin() const noexcept;
-    const_iterator         cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
-
-    // capacity:
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    void resize(size_type n);
-    void resize(size_type n, const value_type& v);
-    void shrink_to_fit();
-    bool empty() const noexcept;
-
-    // element access:
-    reference operator[](size_type i);
-    const_reference operator[](size_type i) const;
-    reference at(size_type i);
-    const_reference at(size_type i) const;
-    reference front();
-    const_reference front() const;
-    reference back();
-    const_reference back() const;
-
-    // modifiers:
-    void push_front(const value_type& v);
-    void push_front(value_type&& v);
-    void push_back(const value_type& v);
-    void push_back(value_type&& v);
-    template <class... Args> void emplace_front(Args&&... args);
-    template <class... Args> void emplace_back(Args&&... args);
-    template <class... Args> iterator emplace(const_iterator p, Args&&... args);
-    iterator insert(const_iterator p, const value_type& v);
-    iterator insert(const_iterator p, value_type&& v);
-    iterator insert(const_iterator p, size_type n, const value_type& v);
-    template <class InputIterator>
-        iterator insert (const_iterator p, InputIterator f, InputIterator l);
-    iterator insert(const_iterator p, initializer_list<value_type> il);
-    void pop_front();
-    void pop_back();
-    iterator erase(const_iterator p);
-    iterator erase(const_iterator f, const_iterator l);
-    void swap(deque& c)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-    void clear() noexcept;
-};
-
-template <class T, class Allocator>
-    bool operator==(const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator< (const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator!=(const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator> (const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator>=(const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator<=(const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-
-// specialized algorithms:
-template <class T, class Allocator>
-    void swap(deque<T,Allocator>& x, deque<T,Allocator>& y)
-         noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#include <__config>
-#include <__split_buffer>
-#include <type_traits>
-#include <initializer_list>
-#include <iterator>
-#include <algorithm>
-#include <stdexcept>
-
-#include <__undef_min_max>
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _Allocator> class __deque_base;
-
-template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,
-          class _DiffType, _DiffType _BlockSize>
-class _LIBCPP_TYPE_VIS_ONLY __deque_iterator;
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy(_RAIter __f,
-     _RAIter __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-     typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     _OutputIterator __r);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy_backward(_RAIter __f,
-              _RAIter __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-              typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              _OutputIterator __r);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move(_RAIter __f,
-     _RAIter __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-     typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     _OutputIterator __r);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move_backward(_RAIter __f,
-              _RAIter __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-              typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              _OutputIterator __r);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,
-          class _DiffType, _DiffType _BlockSize>
-class _LIBCPP_TYPE_VIS_ONLY __deque_iterator
-{
-    typedef _MapPointer __map_iterator;
-public:
-    typedef _Pointer  pointer;
-    typedef _DiffType difference_type;
-private:
-    __map_iterator __m_iter_;
-    pointer        __ptr_;
-
-    static const difference_type __block_size = _BlockSize;
-public:
-    typedef _ValueType                  value_type;
-    typedef random_access_iterator_tag  iterator_category;
-    typedef _Reference                  reference;
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-     : __m_iter_(nullptr), __ptr_(nullptr)
-#endif
-     {}
-
-    template <class _Pp, class _Rp, class _MP>
-    _LIBCPP_INLINE_VISIBILITY
-    __deque_iterator(const __deque_iterator<value_type, _Pp, _Rp, _MP, difference_type, __block_size>& __it,
-                typename enable_if<is_convertible<_Pp, pointer>::value>::type* = 0) _NOEXCEPT
-        : __m_iter_(__it.__m_iter_), __ptr_(__it.__ptr_) {}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {return *__ptr_;}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const {return __ptr_;}
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator& operator++()
-    {
-        if (++__ptr_ - *__m_iter_ == __block_size)
-        {
-            ++__m_iter_;
-            __ptr_ = *__m_iter_;
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator operator++(int)
-    {
-        __deque_iterator __tmp = *this;
-        ++(*this);
-        return __tmp;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator& operator--()
-    {
-        if (__ptr_ == *__m_iter_)
-        {
-            --__m_iter_;
-            __ptr_ = *__m_iter_ + __block_size;
-        }
-        --__ptr_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator operator--(int)
-    {
-        __deque_iterator __tmp = *this;
-        --(*this);
-        return __tmp;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator& operator+=(difference_type __n)
-    {
-        if (__n != 0)
-        {
-            __n += __ptr_ - *__m_iter_;
-            if (__n > 0)
-            {
-                __m_iter_ += __n / __block_size;
-                __ptr_ = *__m_iter_ + __n % __block_size;
-            }
-            else // (__n < 0)
-            {
-                difference_type __z = __block_size - 1 - __n;
-                __m_iter_ -= __z / __block_size;
-                __ptr_ = *__m_iter_ + (__block_size - 1 - __z % __block_size);
-            }
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator& operator-=(difference_type __n)
-    {
-        return *this += -__n;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator operator+(difference_type __n) const
-    {
-        __deque_iterator __t(*this);
-        __t += __n;
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator operator-(difference_type __n) const
-    {
-        __deque_iterator __t(*this);
-        __t -= __n;
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    friend __deque_iterator operator+(difference_type __n, const __deque_iterator& __it)
-        {return __it + __n;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    friend difference_type operator-(const __deque_iterator& __x, const __deque_iterator& __y)
-    {
-        if (__x != __y)
-            return (__x.__m_iter_ - __y.__m_iter_) * __block_size
-                 + (__x.__ptr_ - *__x.__m_iter_)
-                 - (__y.__ptr_ - *__y.__m_iter_);
-        return 0;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY reference operator[](difference_type __n) const
-        {return *(*this + __n);}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator==(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator!=(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return !(__x == __y);}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator<(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return __x.__m_iter_ < __y.__m_iter_ ||
-               (__x.__m_iter_ == __y.__m_iter_ && __x.__ptr_ < __y.__ptr_);}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator>(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return __y < __x;}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator<=(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return !(__y < __x);}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator>=(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return !(__x < __y);}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator(__map_iterator __m, pointer __p) _NOEXCEPT
-        : __m_iter_(__m), __ptr_(__p) {}
-
-    template <class _Tp, class _Ap> friend class __deque_base;
-    template <class _Tp, class _Ap> friend class _LIBCPP_TYPE_VIS_ONLY deque;
-    template <class _Vp, class _Pp, class _Rp, class _MP, class _Dp, _Dp>
-        friend class _LIBCPP_TYPE_VIS_ONLY __deque_iterator;
-
-    template <class _RAIter,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    copy(_RAIter __f,
-         _RAIter __l,
-         __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-         typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _OutputIterator>
-    friend
-    _OutputIterator
-    copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-         __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-         _OutputIterator __r);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-         __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-         __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-    template <class _RAIter,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    copy_backward(_RAIter __f,
-                  _RAIter __l,
-                  __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-                  typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _OutputIterator>
-    friend
-    _OutputIterator
-    copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-                  __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-                  _OutputIterator __r);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-                  __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-                  __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-    template <class _RAIter,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    move(_RAIter __f,
-         _RAIter __l,
-         __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-         typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _OutputIterator>
-    friend
-    _OutputIterator
-    move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-         __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-         _OutputIterator __r);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-         __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-         __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-    template <class _RAIter,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    move_backward(_RAIter __f,
-                  _RAIter __l,
-                  __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-                  typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _OutputIterator>
-    friend
-    _OutputIterator
-    move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-                  __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-                  _OutputIterator __r);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-                  __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-                  __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-};
-
-// copy
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy(_RAIter __f,
-     _RAIter __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-     typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
-    while (__f != __l)
-    {
-        pointer __rb = __r.__ptr_;
-        pointer __re = *__r.__m_iter_ + _B2;
-        difference_type __bs = __re - __rb;
-        difference_type __n = __l - __f;
-        _RAIter __m = __l;
-        if (__n > __bs)
-        {
-            __n = __bs;
-            __m = __f + __n;
-        }
-        _VSTD::copy(__f, __m, __rb);
-        __f = __m;
-        __r += __n;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     _OutputIterator __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + _B1;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        __r = _VSTD::copy(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + _B1;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        __r = _VSTD::copy(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-// copy_backward
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy_backward(_RAIter __f,
-              _RAIter __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-              typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
-    while (__f != __l)
-    {
-        __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = _VSTD::prev(__r);
-        pointer __rb = *__rp.__m_iter_;
-        pointer __re = __rp.__ptr_ + 1;
-        difference_type __bs = __re - __rb;
-        difference_type __n = __l - __f;
-        _RAIter __m = __f;
-        if (__n > __bs)
-        {
-            __n = __bs;
-            __m = __l - __n;
-        }
-        _VSTD::copy_backward(__m, __l, __re);
-        __l = __m;
-        __r -= __n;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              _OutputIterator __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        __r = _VSTD::copy_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        __r = _VSTD::copy_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-// move
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move(_RAIter __f,
-     _RAIter __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-     typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
-    while (__f != __l)
-    {
-        pointer __rb = __r.__ptr_;
-        pointer __re = *__r.__m_iter_ + _B2;
-        difference_type __bs = __re - __rb;
-        difference_type __n = __l - __f;
-        _RAIter __m = __l;
-        if (__n > __bs)
-        {
-            __n = __bs;
-            __m = __f + __n;
-        }
-        _VSTD::move(__f, __m, __rb);
-        __f = __m;
-        __r += __n;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     _OutputIterator __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + _B1;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        __r = _VSTD::move(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + _B1;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        __r = _VSTD::move(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-// move_backward
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move_backward(_RAIter __f,
-              _RAIter __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-              typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
-    while (__f != __l)
-    {
-        __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = _VSTD::prev(__r);
-        pointer __rb = *__rp.__m_iter_;
-        pointer __re = __rp.__ptr_ + 1;
-        difference_type __bs = __re - __rb;
-        difference_type __n = __l - __f;
-        _RAIter __m = __f;
-        if (__n > __bs)
-        {
-            __n = __bs;
-            __m = __l - __n;
-        }
-        _VSTD::move_backward(__m, __l, __re);
-        __l = __m;
-        __r -= __n;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              _OutputIterator __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        __r = _VSTD::move_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        __r = _VSTD::move_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-template <bool>
-class __deque_base_common
-{
-protected:
-    void __throw_length_error() const;
-    void __throw_out_of_range() const;
-};
-
-template <bool __b>
-void
-__deque_base_common<__b>::__throw_length_error() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw length_error("deque");
-#endif
-}
-
-template <bool __b>
-void
-__deque_base_common<__b>::__throw_out_of_range() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw out_of_range("deque");
-#endif
-}
-
-template <class _Tp, class _Allocator>
-class __deque_base
-    : protected __deque_base_common<true>
-{
-    __deque_base(const __deque_base& __c);
-    __deque_base& operator=(const __deque_base& __c);
-protected:
-    typedef _Tp                                      value_type;
-    typedef _Allocator                               allocator_type;
-    typedef allocator_traits<allocator_type>         __alloc_traits;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-
-    static const difference_type __block_size = sizeof(value_type) < 256 ? 4096 / sizeof(value_type) : 16;
-
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<pointer>
-#else
-                rebind_alloc<pointer>::other
-#endif
-                                                         __pointer_allocator;
-    typedef allocator_traits<__pointer_allocator>        __map_traits;
-    typedef typename __map_traits::pointer               __map_pointer;
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<const_pointer>
-#else
-                rebind_alloc<const_pointer>::other
-#endif
-                                                         __const_pointer_allocator;
-    typedef typename allocator_traits<__const_pointer_allocator>::const_pointer __map_const_pointer;
-    typedef __split_buffer<pointer, __pointer_allocator> __map;
-
-    typedef __deque_iterator<value_type, pointer, reference, __map_pointer,
-                             difference_type, __block_size>    iterator;
-    typedef __deque_iterator<value_type, const_pointer, const_reference, __map_const_pointer,
-                             difference_type, __block_size>    const_iterator;
-
-    __map __map_;
-    size_type __start_;
-    __compressed_pair<size_type, allocator_type> __size_;
-
-    iterator       begin() _NOEXCEPT;
-    const_iterator begin() const _NOEXCEPT;
-    iterator       end() _NOEXCEPT;
-    const_iterator end() const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY size_type&            size()          {return __size_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    const size_type& size() const _NOEXCEPT {return __size_.first();}
-    _LIBCPP_INLINE_VISIBILITY allocator_type&       __alloc()       {return __size_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const allocator_type& __alloc() const _NOEXCEPT {return __size_.second();}
-
-    __deque_base()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    explicit __deque_base(const allocator_type& __a);
-public:
-    ~__deque_base();
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    __deque_base(__deque_base&& __c)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    __deque_base(__deque_base&& __c, const allocator_type& __a);
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void swap(__deque_base& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-protected:
-    void clear() _NOEXCEPT;
-
-    bool __invariants() const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign(__deque_base& __c)
-        _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-                   is_nothrow_move_assignable<allocator_type>::value)
-    {
-        __map_ = _VSTD::move(__c.__map_);
-        __start_ = __c.__start_;
-        size() = __c.size();
-        __move_assign_alloc(__c);
-        __c.__start_ = __c.size() = 0;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__deque_base& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_move_assignment::value ||
-                   is_nothrow_move_assignable<allocator_type>::value)
-        {__move_assign_alloc(__c, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_move_assignment::value>());}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__deque_base& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__deque_base&, false_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_swap::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<allocator_type>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type&, allocator_type&, false_type)
-        _NOEXCEPT
-        {}
-};
-
-template <class _Tp, class _Allocator>
-bool
-__deque_base<_Tp, _Allocator>::__invariants() const
-{
-    if (!__map_.__invariants())
-        return false;
-    if (__map_.size() >= size_type(-1) / __block_size)
-        return false;
-    for (typename __map::const_iterator __i = __map_.begin(), __e = __map_.end();
-         __i != __e; ++__i)
-        if (*__i == nullptr)
-            return false;
-    if (__map_.size() != 0)
-    {
-        if (size() >= __map_.size() * __block_size)
-            return false;
-        if (__start_ >= __map_.size() * __block_size - size())
-            return false;
-    }
-    else
-    {
-        if (size() != 0)
-            return false;
-        if (__start_ != 0)
-            return false;
-    }
-    return true;
-}
-
-template <class _Tp, class _Allocator>
-typename __deque_base<_Tp, _Allocator>::iterator
-__deque_base<_Tp, _Allocator>::begin() _NOEXCEPT
-{
-    __map_pointer __mp = __map_.begin() + __start_ / __block_size;
-    return iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
-}
-
-template <class _Tp, class _Allocator>
-typename __deque_base<_Tp, _Allocator>::const_iterator
-__deque_base<_Tp, _Allocator>::begin() const _NOEXCEPT
-{
-    __map_const_pointer __mp = static_cast<__map_const_pointer>(__map_.begin() + __start_ / __block_size);
-    return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
-}
-
-template <class _Tp, class _Allocator>
-typename __deque_base<_Tp, _Allocator>::iterator
-__deque_base<_Tp, _Allocator>::end() _NOEXCEPT
-{
-    size_type __p = size() + __start_;
-    __map_pointer __mp = __map_.begin() + __p / __block_size;
-    return iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
-}
-
-template <class _Tp, class _Allocator>
-typename __deque_base<_Tp, _Allocator>::const_iterator
-__deque_base<_Tp, _Allocator>::end() const _NOEXCEPT
-{
-    size_type __p = size() + __start_;
-    __map_const_pointer __mp = static_cast<__map_const_pointer>(__map_.begin() + __p / __block_size);
-    return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__deque_base<_Tp, _Allocator>::__deque_base()
-    _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-    : __start_(0), __size_(0) {}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__deque_base<_Tp, _Allocator>::__deque_base(const allocator_type& __a)
-    : __map_(__pointer_allocator(__a)), __start_(0), __size_(0, __a) {}
-
-template <class _Tp, class _Allocator>
-__deque_base<_Tp, _Allocator>::~__deque_base()
-{
-    clear();
-    typename __map::iterator __i = __map_.begin();
-    typename __map::iterator __e = __map_.end();
-    for (; __i != __e; ++__i)
-        __alloc_traits::deallocate(__alloc(), *__i, __block_size);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-__deque_base<_Tp, _Allocator>::__deque_base(__deque_base&& __c)
-    _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __map_(_VSTD::move(__c.__map_)),
-      __start_(_VSTD::move(__c.__start_)),
-      __size_(_VSTD::move(__c.__size_))
-{
-    __c.__start_ = 0;
-    __c.size() = 0;
-}
-
-template <class _Tp, class _Allocator>
-__deque_base<_Tp, _Allocator>::__deque_base(__deque_base&& __c, const allocator_type& __a)
-    : __map_(_VSTD::move(__c.__map_), __pointer_allocator(__a)),
-      __start_(_VSTD::move(__c.__start_)),
-      __size_(_VSTD::move(__c.size()), __a)
-{
-    if (__a == __c.__alloc())
-    {
-        __c.__start_ = 0;
-        __c.size() = 0;
-    }
-    else
-    {
-        __map_.clear();
-        __start_ = 0;
-        size() = 0;
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-__deque_base<_Tp, _Allocator>::swap(__deque_base& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-    __map_.swap(__c.__map_);
-    _VSTD::swap(__start_, __c.__start_);
-    _VSTD::swap(size(), __c.size());
-    __swap_alloc(__alloc(), __c.__alloc());
-}
-
-template <class _Tp, class _Allocator>
-void
-__deque_base<_Tp, _Allocator>::clear() _NOEXCEPT
-{
-    allocator_type& __a = __alloc();
-    for (iterator __i = begin(), __e = end(); __i != __e; ++__i)
-        __alloc_traits::destroy(__a, _VSTD::addressof(*__i));
-    size() = 0;
-    while (__map_.size() > 2)
-    {
-        __alloc_traits::deallocate(__a, __map_.front(), __block_size);
-        __map_.pop_front();
-    }
-    switch (__map_.size())
-    {
-    case 1:
-        __start_ = __block_size / 2;
-        break;
-    case 2:
-        __start_ = __block_size;
-        break;
-    }
-}
-
-template <class _Tp, class _Allocator = allocator<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY deque
-    : private __deque_base<_Tp, _Allocator>
-{
-public:
-    // types:
-
-    typedef _Tp value_type;
-    typedef _Allocator allocator_type;
-
-    typedef __deque_base<value_type, allocator_type> __base;
-
-    typedef typename __base::__alloc_traits        __alloc_traits;
-    typedef typename __base::reference             reference;
-    typedef typename __base::const_reference       const_reference;
-    typedef typename __base::iterator              iterator;
-    typedef typename __base::const_iterator        const_iterator;
-    typedef typename __base::size_type             size_type;
-    typedef typename __base::difference_type       difference_type;
-
-    typedef typename __base::pointer               pointer;
-    typedef typename __base::const_pointer         const_pointer;
-    typedef _VSTD::reverse_iterator<iterator>       reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    deque()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-        {}
-    _LIBCPP_INLINE_VISIBILITY explicit deque(const allocator_type& __a) : __base(__a) {}
-    explicit deque(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit deque(size_type __n, const _Allocator& __a);
-#endif
-    deque(size_type __n, const value_type& __v);
-    deque(size_type __n, const value_type& __v, const allocator_type& __a);
-    template <class _InputIter>
-        deque(_InputIter __f, _InputIter __l,
-              typename enable_if<__is_input_iterator<_InputIter>::value>::type* = 0);
-    template <class _InputIter>
-        deque(_InputIter __f, _InputIter __l, const allocator_type& __a,
-              typename enable_if<__is_input_iterator<_InputIter>::value>::type* = 0);
-    deque(const deque& __c);
-    deque(const deque& __c, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    deque(initializer_list<value_type> __il);
-    deque(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    deque& operator=(const deque& __c);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    deque& operator=(initializer_list<value_type> __il) {assign(__il); return *this;}
-#endif   // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    deque(deque&& __c) _NOEXCEPT_(is_nothrow_move_constructible<__base>::value);
-    deque(deque&& __c, const allocator_type& __a);
-    deque& operator=(deque&& __c)
-        _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-                   is_nothrow_move_assignable<allocator_type>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _InputIter>
-        void assign(_InputIter __f, _InputIter __l,
-                    typename enable_if<__is_input_iterator<_InputIter>::value &&
-                                      !__is_random_access_iterator<_InputIter>::value>::type* = 0);
-    template <class _RAIter>
-        void assign(_RAIter __f, _RAIter __l,
-                    typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-    void assign(size_type __n, const value_type& __v);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void assign(initializer_list<value_type> __il) {assign(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    allocator_type get_allocator() const _NOEXCEPT;
-
-    // iterators:
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT       {return __base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT         {return __base::end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()   const _NOEXCEPT {return __base::end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator       rbegin() _NOEXCEPT
-        {return       reverse_iterator(__base::end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(__base::end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator       rend() _NOEXCEPT
-        {return       reverse_iterator(__base::begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend()   const _NOEXCEPT
-        {return const_reverse_iterator(__base::begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cbegin()  const _NOEXCEPT
-        {return __base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cend()    const _NOEXCEPT
-        {return __base::end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return const_reverse_iterator(__base::end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend()   const _NOEXCEPT
-        {return const_reverse_iterator(__base::begin());}
-
-    // capacity:
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __base::size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-        {return __alloc_traits::max_size(__base::__alloc());}
-    void resize(size_type __n);
-    void resize(size_type __n, const value_type& __v);
-    void shrink_to_fit() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __base::size() == 0;}
-
-    // element access:
-    reference operator[](size_type __i);
-    const_reference operator[](size_type __i) const;
-    reference at(size_type __i);
-    const_reference at(size_type __i) const;
-    reference front();
-    const_reference front() const;
-    reference back();
-    const_reference back() const;
-
-    // 23.2.2.3 modifiers:
-    void push_front(const value_type& __v);
-    void push_back(const value_type& __v);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args> void emplace_front(_Args&&... __args);
-    template <class... _Args> void emplace_back(_Args&&... __args);
-    template <class... _Args> iterator emplace(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-    void push_front(value_type&& __v);
-    void push_back(value_type&& __v);
-    iterator insert(const_iterator __p, value_type&& __v);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator insert(const_iterator __p, const value_type& __v);
-    iterator insert(const_iterator __p, size_type __n, const value_type& __v);
-    template <class _InputIter>
-        iterator insert (const_iterator __p, _InputIter __f, _InputIter __l,
-                         typename enable_if<__is_input_iterator<_InputIter>::value
-                                         &&!__is_bidirectional_iterator<_InputIter>::value>::type* = 0);
-    template <class _BiIter>
-        iterator insert (const_iterator __p, _BiIter __f, _BiIter __l,
-                         typename enable_if<__is_bidirectional_iterator<_BiIter>::value>::type* = 0);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, initializer_list<value_type> __il)
-        {return insert(__p, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    void pop_front();
-    void pop_back();
-    iterator erase(const_iterator __p);
-    iterator erase(const_iterator __f, const_iterator __l);
-
-    void swap(deque& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-    void clear() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __invariants() const {return __base::__invariants();}
-private:
-    typedef typename __base::__map_const_pointer __map_const_pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __recommend_blocks(size_type __n)
-    {
-        return __n / __base::__block_size + (__n % __base::__block_size != 0);
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __capacity() const
-    {
-        return __base::__map_.size() == 0 ? 0 : __base::__map_.size() * __base::__block_size - 1;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __front_spare() const
-    {
-        return __base::__start_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __back_spare() const
-    {
-        return __capacity() - (__base::__start_ + __base::size());
-    }
-
-    template <class _InpIter>
-        void __append(_InpIter __f, _InpIter __l,
-                 typename enable_if<__is_input_iterator<_InpIter>::value &&
-                                   !__is_forward_iterator<_InpIter>::value>::type* = 0);
-    template <class _ForIter>
-        void __append(_ForIter __f, _ForIter __l,
-                      typename enable_if<__is_forward_iterator<_ForIter>::value>::type* = 0);
-    void __append(size_type __n);
-    void __append(size_type __n, const value_type& __v);
-    void __erase_to_end(const_iterator __f);
-    void __add_front_capacity();
-    void __add_front_capacity(size_type __n);
-    void __add_back_capacity();
-    void __add_back_capacity(size_type __n);
-    iterator __move_and_check(iterator __f, iterator __l, iterator __r,
-                              const_pointer& __vt);
-    iterator __move_backward_and_check(iterator __f, iterator __l, iterator __r,
-                                       const_pointer& __vt);
-    void __move_construct_and_check(iterator __f, iterator __l,
-                                    iterator __r, const_pointer& __vt);
-    void __move_construct_backward_and_check(iterator __f, iterator __l,
-                                             iterator __r, const_pointer& __vt);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const deque& __c)
-        {__copy_assign_alloc(__c, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const deque& __c, true_type)
-        {
-            if (__base::__alloc() != __c.__alloc())
-            {
-                clear();
-                shrink_to_fit();
-            }
-            __base::__alloc() = __c.__alloc();
-            __base::__map_.__alloc() = __c.__map_.__alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const deque&, false_type)
-        {}
-
-    void __move_assign(deque& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-    void __move_assign(deque& __c, false_type);
-};
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(size_type __n)
-{
-    if (__n > 0)
-        __append(__n);
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(size_type __n, const _Allocator& __a)
-    : __base(__a)
-{
-    if (__n > 0)
-        __append(__n);
-}
-#endif
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(size_type __n, const value_type& __v)
-{
-    if (__n > 0)
-        __append(__n, __v);
-}
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(size_type __n, const value_type& __v, const allocator_type& __a)
-    : __base(__a)
-{
-    if (__n > 0)
-        __append(__n, __v);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-deque<_Tp, _Allocator>::deque(_InputIter __f, _InputIter __l,
-              typename enable_if<__is_input_iterator<_InputIter>::value>::type*)
-{
-    __append(__f, __l);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-deque<_Tp, _Allocator>::deque(_InputIter __f, _InputIter __l, const allocator_type& __a,
-              typename enable_if<__is_input_iterator<_InputIter>::value>::type*)
-    : __base(__a)
-{
-    __append(__f, __l);
-}
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(const deque& __c)
-    : __base(__alloc_traits::select_on_container_copy_construction(__c.__alloc()))
-{
-    __append(__c.begin(), __c.end());
-}
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(const deque& __c, const allocator_type& __a)
-    : __base(__a)
-{
-    __append(__c.begin(), __c.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il)
-{
-    __append(__il.begin(), __il.end());
-}
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il, const allocator_type& __a)
-    : __base(__a)
-{
-    __append(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>&
-deque<_Tp, _Allocator>::operator=(const deque& __c)
-{
-    if (this != &__c)
-    {
-        __copy_assign_alloc(__c);
-        assign(__c.begin(), __c.end());
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-deque<_Tp, _Allocator>::deque(deque&& __c)
-    _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-    : __base(_VSTD::move(__c))
-{
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-deque<_Tp, _Allocator>::deque(deque&& __c, const allocator_type& __a)
-    : __base(_VSTD::move(__c), __a)
-{
-    if (__a != __c.__alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-deque<_Tp, _Allocator>&
-deque<_Tp, _Allocator>::operator=(deque&& __c)
-        _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-                   is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__c, integral_constant<bool,
-          __alloc_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__move_assign(deque& __c, false_type)
-{
-    if (__base::__alloc() != __c.__alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-    else
-        __move_assign(__c, true_type());
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__move_assign(deque& __c, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    clear();
-    shrink_to_fit();
-    __base::__move_assign(__c);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-void
-deque<_Tp, _Allocator>::assign(_InputIter __f, _InputIter __l,
-                               typename enable_if<__is_input_iterator<_InputIter>::value &&
-                                                 !__is_random_access_iterator<_InputIter>::value>::type*)
-{
-    iterator __i = __base::begin();
-    iterator __e = __base::end();
-    for (; __f != __l && __i != __e; ++__f, (void) ++__i)
-        *__i = *__f;
-    if (__f != __l)
-        __append(__f, __l);
-    else
-        __erase_to_end(__i);
-}
-
-template <class _Tp, class _Allocator>
-template <class _RAIter>
-void
-deque<_Tp, _Allocator>::assign(_RAIter __f, _RAIter __l,
-                               typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    if (static_cast<size_type>(__l - __f) > __base::size())
-    {
-        _RAIter __m = __f + __base::size();
-        _VSTD::copy(__f, __m, __base::begin());
-        __append(__m, __l);
-    }
-    else
-        __erase_to_end(_VSTD::copy(__f, __l, __base::begin()));
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::assign(size_type __n, const value_type& __v)
-{
-    if (__n > __base::size())
-    {
-        _VSTD::fill_n(__base::begin(), __base::size(), __v);
-        __n -= __base::size();
-        __append(__n, __v);
-    }
-    else
-        __erase_to_end(_VSTD::fill_n(__base::begin(), __n, __v));
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-_Allocator
-deque<_Tp, _Allocator>::get_allocator() const _NOEXCEPT
-{
-    return __base::__alloc();
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::resize(size_type __n)
-{
-    if (__n > __base::size())
-        __append(__n - __base::size());
-    else if (__n < __base::size())
-        __erase_to_end(__base::begin() + __n);
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::resize(size_type __n, const value_type& __v)
-{
-    if (__n > __base::size())
-        __append(__n - __base::size(), __v);
-    else if (__n < __base::size())
-        __erase_to_end(__base::begin() + __n);
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
-{
-    allocator_type& __a = __base::__alloc();
-    if (empty())
-    {
-        while (__base::__map_.size() > 0)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-            __base::__map_.pop_back();
-        }
-        __base::__start_ = 0;
-    }
-    else
-    {
-        if (__front_spare() >= __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.front(), __base::__block_size);
-            __base::__map_.pop_front();
-            __base::__start_ -= __base::__block_size;
-        }
-        if (__back_spare() >= __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-            __base::__map_.pop_back();
-        }
-    }
-    __base::__map_.shrink_to_fit();
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::operator[](size_type __i)
-{
-    size_type __p = __base::__start_ + __i;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::operator[](size_type __i) const
-{
-    size_type __p = __base::__start_ + __i;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::at(size_type __i)
-{
-    if (__i >= __base::size())
-        __base::__throw_out_of_range();
-    size_type __p = __base::__start_ + __i;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::at(size_type __i) const
-{
-    if (__i >= __base::size())
-        __base::__throw_out_of_range();
-    size_type __p = __base::__start_ + __i;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::front()
-{
-    return *(*(__base::__map_.begin() + __base::__start_ / __base::__block_size)
-                                      + __base::__start_ % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::front() const
-{
-    return *(*(__base::__map_.begin() + __base::__start_ / __base::__block_size)
-                                      + __base::__start_ % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::back()
-{
-    size_type __p = __base::size() + __base::__start_ - 1;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::back() const
-{
-    size_type __p = __base::size() + __base::__start_ - 1;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::push_back(const value_type& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__back_spare() == 0)
-        __add_back_capacity();
-    // __back_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), __v);
-    ++__base::size();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::push_back(value_type&& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__back_spare() == 0)
-        __add_back_capacity();
-    // __back_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::move(__v));
-    ++__base::size();
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-void
-deque<_Tp, _Allocator>::emplace_back(_Args&&... __args)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__back_spare() == 0)
-        __add_back_capacity();
-    // __back_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::forward<_Args>(__args)...);
-    ++__base::size();
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::push_front(const value_type& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__front_spare() == 0)
-        __add_front_capacity();
-    // __front_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), __v);
-    --__base::__start_;
-    ++__base::size();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::push_front(value_type&& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__front_spare() == 0)
-        __add_front_capacity();
-    // __front_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::move(__v));
-    --__base::__start_;
-    ++__base::size();
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-void
-deque<_Tp, _Allocator>::emplace_front(_Args&&... __args)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__front_spare() == 0)
-        __add_front_capacity();
-    // __front_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::forward<_Args>(__args)...);
-    --__base::__start_;
-    ++__base::size();
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, const value_type& __v)
-{
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__front_spare() == 0)
-            __add_front_capacity();
-        // __front_spare() >= 1
-        if (__pos == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), __v);
-            --__base::__start_;
-            ++__base::size();
-        }
-        else
-        {
-            const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
-            iterator __b = __base::begin();
-            iterator __bm1 = _VSTD::prev(__b);
-            if (__vt == pointer_traits<const_pointer>::pointer_to(*__b))
-                __vt = pointer_traits<const_pointer>::pointer_to(*__bm1);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__bm1), _VSTD::move(*__b));
-            --__base::__start_;
-            ++__base::size();
-            if (__pos > 1)
-                __b = __move_and_check(_VSTD::next(__b), __b + __pos, __b, __vt);
-            *__b = *__vt;
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        if (__back_spare() == 0)
-            __add_back_capacity();
-        // __back_capacity >= 1
-        size_type __de = __base::size() - __pos;
-        if (__de == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), __v);
-            ++__base::size();
-        }
-        else
-        {
-            const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
-            iterator __e = __base::end();
-            iterator __em1 = _VSTD::prev(__e);
-            if (__vt == pointer_traits<const_pointer>::pointer_to(*__em1))
-                __vt = pointer_traits<const_pointer>::pointer_to(*__e);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__e), _VSTD::move(*__em1));
-            ++__base::size();
-            if (__de > 1)
-                __e = __move_backward_and_check(__e - __de, __em1, __e, __vt);
-            *--__e = *__vt;
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, value_type&& __v)
-{
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__front_spare() == 0)
-            __add_front_capacity();
-        // __front_spare() >= 1
-        if (__pos == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::move(__v));
-            --__base::__start_;
-            ++__base::size();
-        }
-        else
-        {
-            iterator __b = __base::begin();
-            iterator __bm1 = _VSTD::prev(__b);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__bm1), _VSTD::move(*__b));
-            --__base::__start_;
-            ++__base::size();
-            if (__pos > 1)
-                __b = _VSTD::move(_VSTD::next(__b), __b + __pos, __b);
-            *__b = _VSTD::move(__v);
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        if (__back_spare() == 0)
-            __add_back_capacity();
-        // __back_capacity >= 1
-        size_type __de = __base::size() - __pos;
-        if (__de == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::move(__v));
-            ++__base::size();
-        }
-        else
-        {
-            iterator __e = __base::end();
-            iterator __em1 = _VSTD::prev(__e);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__e), _VSTD::move(*__em1));
-            ++__base::size();
-            if (__de > 1)
-                __e = _VSTD::move_backward(__e - __de, __em1, __e);
-            *--__e = _VSTD::move(__v);
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::emplace(const_iterator __p, _Args&&... __args)
-{
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__front_spare() == 0)
-            __add_front_capacity();
-        // __front_spare() >= 1
-        if (__pos == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::forward<_Args>(__args)...);
-            --__base::__start_;
-            ++__base::size();
-        }
-        else
-        {
-            value_type __tmp(_VSTD::forward<_Args>(__args)...);
-            iterator __b = __base::begin();
-            iterator __bm1 = _VSTD::prev(__b);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__bm1), _VSTD::move(*__b));
-            --__base::__start_;
-            ++__base::size();
-            if (__pos > 1)
-                __b = _VSTD::move(_VSTD::next(__b), __b + __pos, __b);
-            *__b = _VSTD::move(__tmp);
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        if (__back_spare() == 0)
-            __add_back_capacity();
-        // __back_capacity >= 1
-        size_type __de = __base::size() - __pos;
-        if (__de == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::forward<_Args>(__args)...);
-            ++__base::size();
-        }
-        else
-        {
-            value_type __tmp(_VSTD::forward<_Args>(__args)...);
-            iterator __e = __base::end();
-            iterator __em1 = _VSTD::prev(__e);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__e), _VSTD::move(*__em1));
-            ++__base::size();
-            if (__de > 1)
-                __e = _VSTD::move_backward(__e - __de, __em1, __e);
-            *--__e = _VSTD::move(__tmp);
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, size_type __n, const value_type& __v)
-{
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__n > __front_spare())
-            __add_front_capacity(__n - __front_spare());
-        // __n <= __front_spare()
-        size_type __old_n = __n;
-        iterator __old_begin = __base::begin();
-        iterator __i = __old_begin;
-        if (__n > __pos)
-        {
-            for (size_type __m = __n - __pos; __m; --__m, --__base::__start_, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*--__i), __v);
-            __n = __pos;
-        }
-        if (__n > 0)
-        {
-            const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
-            iterator __obn = __old_begin + __n;
-            __move_construct_backward_and_check(__old_begin, __obn, __i, __vt);
-            if (__n < __pos)
-                __old_begin = __move_and_check(__obn, __old_begin + __pos, __old_begin, __vt);
-            _VSTD::fill_n(__old_begin, __n, *__vt);
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        size_type __back_capacity = __back_spare();
-        if (__n > __back_capacity)
-            __add_back_capacity(__n - __back_capacity);
-        // __n <= __back_capacity
-        size_type __old_n = __n;
-        iterator __old_end = __base::end();
-        iterator __i = __old_end;
-        size_type __de = __base::size() - __pos;
-        if (__n > __de)
-        {
-            for (size_type __m = __n - __de; __m; --__m, ++__i, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*__i), __v);
-            __n = __de;
-        }
-        if (__n > 0)
-        {
-            const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
-            iterator __oen = __old_end - __n;
-            __move_construct_and_check(__oen, __old_end, __i, __vt);
-            if (__n < __de)
-                __old_end = __move_backward_and_check(__old_end - __de, __oen, __old_end, __vt);
-            _VSTD::fill_n(__old_end - __n, __n, *__vt);
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, _InputIter __f, _InputIter __l,
-                               typename enable_if<__is_input_iterator<_InputIter>::value
-                                               &&!__is_bidirectional_iterator<_InputIter>::value>::type*)
-{
-    __split_buffer<value_type, allocator_type&> __buf(__base::__alloc());
-    __buf.__construct_at_end(__f, __l);
-    typedef typename __split_buffer<value_type, allocator_type&>::iterator __bi;
-    return insert(__p, move_iterator<__bi>(__buf.begin()), move_iterator<__bi>(__buf.end()));
-}
-
-template <class _Tp, class _Allocator>
-template <class _BiIter>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, _BiIter __f, _BiIter __l,
-                               typename enable_if<__is_bidirectional_iterator<_BiIter>::value>::type*)
-{
-    size_type __n = _VSTD::distance(__f, __l);
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__n > __front_spare())
-            __add_front_capacity(__n - __front_spare());
-        // __n <= __front_spare()
-        size_type __old_n = __n;
-        iterator __old_begin = __base::begin();
-        iterator __i = __old_begin;
-        _BiIter __m = __f;
-        if (__n > __pos)
-        {
-            __m = __pos < __n / 2 ? _VSTD::prev(__l, __pos) : _VSTD::next(__f, __n - __pos);
-            for (_BiIter __j = __m; __j != __f; --__base::__start_, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*--__i), *--__j);
-            __n = __pos;
-        }
-        if (__n > 0)
-        {
-            iterator __obn = __old_begin + __n;
-            for (iterator __j = __obn; __j != __old_begin;)
-            {
-                __alloc_traits::construct(__a, _VSTD::addressof(*--__i), _VSTD::move(*--__j));
-                --__base::__start_;
-                ++__base::size();
-            }
-            if (__n < __pos)
-                __old_begin = _VSTD::move(__obn, __old_begin + __pos, __old_begin);
-            _VSTD::copy(__m, __l, __old_begin);
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        size_type __back_capacity = __back_spare();
-        if (__n > __back_capacity)
-            __add_back_capacity(__n - __back_capacity);
-        // __n <= __back_capacity
-        size_type __old_n = __n;
-        iterator __old_end = __base::end();
-        iterator __i = __old_end;
-        _BiIter __m = __l;
-        size_type __de = __base::size() - __pos;
-        if (__n > __de)
-        {
-            __m = __de < __n / 2 ? _VSTD::next(__f, __de) : _VSTD::prev(__l, __n - __de);
-            for (_BiIter __j = __m; __j != __l; ++__i, (void) ++__j, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*__i), *__j);
-            __n = __de;
-        }
-        if (__n > 0)
-        {
-            iterator __oen = __old_end - __n;
-            for (iterator __j = __oen; __j != __old_end; ++__i, ++__j, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*__i), _VSTD::move(*__j));
-            if (__n < __de)
-                __old_end = _VSTD::move_backward(__old_end - __de, __oen, __old_end);
-            _VSTD::copy_backward(__f, __m, __old_end);
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-template <class _Tp, class _Allocator>
-template <class _InpIter>
-void
-deque<_Tp, _Allocator>::__append(_InpIter __f, _InpIter __l,
-                                 typename enable_if<__is_input_iterator<_InpIter>::value &&
-                                                   !__is_forward_iterator<_InpIter>::value>::type*)
-{
-    for (; __f != __l; ++__f)
-        push_back(*__f);
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForIter>
-void
-deque<_Tp, _Allocator>::__append(_ForIter __f, _ForIter __l,
-                                 typename enable_if<__is_forward_iterator<_ForIter>::value>::type*)
-{
-    size_type __n = _VSTD::distance(__f, __l);
-    allocator_type& __a = __base::__alloc();
-    size_type __back_capacity = __back_spare();
-    if (__n > __back_capacity)
-        __add_back_capacity(__n - __back_capacity);
-    // __n <= __back_capacity
-    for (iterator __i = __base::end(); __f != __l; ++__i, (void) ++__f, ++__base::size())
-        __alloc_traits::construct(__a, _VSTD::addressof(*__i), *__f);
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__append(size_type __n)
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __back_capacity = __back_spare();
-    if (__n > __back_capacity)
-        __add_back_capacity(__n - __back_capacity);
-    // __n <= __back_capacity
-    for (iterator __i = __base::end(); __n; --__n, ++__i, ++__base::size())
-        __alloc_traits::construct(__a, _VSTD::addressof(*__i));
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__append(size_type __n, const value_type& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __back_capacity = __back_spare();
-    if (__n > __back_capacity)
-        __add_back_capacity(__n - __back_capacity);
-    // __n <= __back_capacity
-    for (iterator __i = __base::end(); __n; --__n, ++__i, ++__base::size())
-        __alloc_traits::construct(__a, _VSTD::addressof(*__i), __v);
-}
-
-// Create front capacity for one block of elements.
-// Strong guarantee.  Either do it or don't touch anything.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__add_front_capacity()
-{
-    allocator_type& __a = __base::__alloc();
-    if (__back_spare() >= __base::__block_size)
-    {
-        __base::__start_ += __base::__block_size;
-        pointer __pt = __base::__map_.back();
-        __base::__map_.pop_back();
-        __base::__map_.push_front(__pt);
-    }
-    // Else if __base::__map_.size() < __base::__map_.capacity() then we need to allocate 1 buffer
-    else if (__base::__map_.size() < __base::__map_.capacity())
-    {   // we can put the new buffer into the map, but don't shift things around
-        // until all buffers are allocated.  If we throw, we don't need to fix
-        // anything up (any added buffers are undetectible)
-        if (__base::__map_.__front_spare() > 0)
-            __base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));
-        else
-        {
-            __base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-            // Done allocating, reorder capacity
-            pointer __pt = __base::__map_.back();
-            __base::__map_.pop_back();
-            __base::__map_.push_front(__pt);
-        }
-        __base::__start_ = __base::__map_.size() == 1 ?
-                               __base::__block_size / 2 :
-                               __base::__start_ + __base::__block_size;
-    }
-    // Else need to allocate 1 buffer, *and* we need to reallocate __map_.
-    else
-    {
-        __split_buffer<pointer, typename __base::__pointer_allocator&>
-            __buf(max<size_type>(2 * __base::__map_.capacity(), 1),
-                  0, __base::__map_.__alloc());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            __alloc_traits::deallocate(__a, __buf.front(), __base::__block_size);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (typename __base::__map_pointer __i = __base::__map_.begin();
-                __i != __base::__map_.end(); ++__i)
-            __buf.push_back(*__i);
-        _VSTD::swap(__base::__map_.__first_, __buf.__first_);
-        _VSTD::swap(__base::__map_.__begin_, __buf.__begin_);
-        _VSTD::swap(__base::__map_.__end_, __buf.__end_);
-        _VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());
-        __base::__start_ = __base::__map_.size() == 1 ?
-                               __base::__block_size / 2 :
-                               __base::__start_ + __base::__block_size;
-    }
-}
-
-// Create front capacity for __n elements.
-// Strong guarantee.  Either do it or don't touch anything.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__add_front_capacity(size_type __n)
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __nb = __recommend_blocks(__n + __base::__map_.empty());
-    // Number of unused blocks at back:
-    size_type __back_capacity = __back_spare() / __base::__block_size;
-    __back_capacity = _VSTD::min(__back_capacity, __nb);  // don't take more than you need
-    __nb -= __back_capacity;  // number of blocks need to allocate
-    // If __nb == 0, then we have sufficient capacity.
-    if (__nb == 0)
-    {
-        __base::__start_ += __base::__block_size * __back_capacity;
-        for (; __back_capacity > 0; --__back_capacity)
-        {
-            pointer __pt = __base::__map_.back();
-            __base::__map_.pop_back();
-            __base::__map_.push_front(__pt);
-        }
-    }
-    // Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers
-    else if (__nb <= __base::__map_.capacity() - __base::__map_.size())
-    {   // we can put the new buffers into the map, but don't shift things around
-        // until all buffers are allocated.  If we throw, we don't need to fix
-        // anything up (any added buffers are undetectible)
-        for (; __nb > 0; --__nb, __base::__start_ += __base::__block_size - (__base::__map_.size() == 1))
-        {
-            if (__base::__map_.__front_spare() == 0)
-                break;
-            __base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));
-        }
-        for (; __nb > 0; --__nb, ++__back_capacity)
-            __base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-        // Done allocating, reorder capacity
-        __base::__start_ += __back_capacity * __base::__block_size;
-        for (; __back_capacity > 0; --__back_capacity)
-        {
-            pointer __pt = __base::__map_.back();
-            __base::__map_.pop_back();
-            __base::__map_.push_front(__pt);
-        }
-    }
-    // Else need to allocate __nb buffers, *and* we need to reallocate __map_.
-    else
-    {
-        size_type __ds = (__nb + __back_capacity) * __base::__block_size - __base::__map_.empty();
-        __split_buffer<pointer, typename __base::__pointer_allocator&>
-            __buf(max<size_type>(2* __base::__map_.capacity(),
-                                 __nb + __base::__map_.size()),
-                  0, __base::__map_.__alloc());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __nb > 0; --__nb)
-                __buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            for (typename __base::__map_pointer __i = __buf.begin();
-                    __i != __buf.end(); ++__i)
-                __alloc_traits::deallocate(__a, *__i, __base::__block_size);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (; __back_capacity > 0; --__back_capacity)
-        {
-            __buf.push_back(__base::__map_.back());
-            __base::__map_.pop_back();
-        }
-        for (typename __base::__map_pointer __i = __base::__map_.begin();
-                __i != __base::__map_.end(); ++__i)
-            __buf.push_back(*__i);
-        _VSTD::swap(__base::__map_.__first_, __buf.__first_);
-        _VSTD::swap(__base::__map_.__begin_, __buf.__begin_);
-        _VSTD::swap(__base::__map_.__end_, __buf.__end_);
-        _VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());
-        __base::__start_ += __ds;
-    }
-}
-
-// Create back capacity for one block of elements.
-// Strong guarantee.  Either do it or don't touch anything.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__add_back_capacity()
-{
-    allocator_type& __a = __base::__alloc();
-    if (__front_spare() >= __base::__block_size)
-    {
-        __base::__start_ -= __base::__block_size;
-        pointer __pt = __base::__map_.front();
-        __base::__map_.pop_front();
-        __base::__map_.push_back(__pt);
-    }
-    // Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers
-    else if (__base::__map_.size() < __base::__map_.capacity())
-    {   // we can put the new buffer into the map, but don't shift things around
-        // until it is allocated.  If we throw, we don't need to fix
-        // anything up (any added buffers are undetectible)
-        if (__base::__map_.__back_spare() != 0)
-            __base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-        else
-        {
-            __base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));
-            // Done allocating, reorder capacity
-            pointer __pt = __base::__map_.front();
-            __base::__map_.pop_front();
-            __base::__map_.push_back(__pt);
-        }
-    }
-    // Else need to allocate 1 buffer, *and* we need to reallocate __map_.
-    else
-    {
-        __split_buffer<pointer, typename __base::__pointer_allocator&>
-            __buf(max<size_type>(2* __base::__map_.capacity(), 1),
-                  __base::__map_.size(),
-                  __base::__map_.__alloc());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            __alloc_traits::deallocate(__a, __buf.back(), __base::__block_size);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (typename __base::__map_pointer __i = __base::__map_.end();
-                __i != __base::__map_.begin();)
-            __buf.push_front(*--__i);
-        _VSTD::swap(__base::__map_.__first_, __buf.__first_);
-        _VSTD::swap(__base::__map_.__begin_, __buf.__begin_);
-        _VSTD::swap(__base::__map_.__end_, __buf.__end_);
-        _VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());
-    }
-}
-
-// Create back capacity for __n elements.
-// Strong guarantee.  Either do it or don't touch anything.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__add_back_capacity(size_type __n)
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __nb = __recommend_blocks(__n + __base::__map_.empty());
-    // Number of unused blocks at front:
-    size_type __front_capacity = __front_spare() / __base::__block_size;
-    __front_capacity = _VSTD::min(__front_capacity, __nb);  // don't take more than you need
-    __nb -= __front_capacity;  // number of blocks need to allocate
-    // If __nb == 0, then we have sufficient capacity.
-    if (__nb == 0)
-    {
-        __base::__start_ -= __base::__block_size * __front_capacity;
-        for (; __front_capacity > 0; --__front_capacity)
-        {
-            pointer __pt = __base::__map_.front();
-            __base::__map_.pop_front();
-            __base::__map_.push_back(__pt);
-        }
-    }
-    // Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers
-    else if (__nb <= __base::__map_.capacity() - __base::__map_.size())
-    {   // we can put the new buffers into the map, but don't shift things around
-        // until all buffers are allocated.  If we throw, we don't need to fix
-        // anything up (any added buffers are undetectible)
-        for (; __nb > 0; --__nb)
-        {
-            if (__base::__map_.__back_spare() == 0)
-                break;
-            __base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-        }
-        for (; __nb > 0; --__nb, ++__front_capacity, __base::__start_ +=
-                                 __base::__block_size - (__base::__map_.size() == 1))
-            __base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));
-        // Done allocating, reorder capacity
-        __base::__start_ -= __base::__block_size * __front_capacity;
-        for (; __front_capacity > 0; --__front_capacity)
-        {
-            pointer __pt = __base::__map_.front();
-            __base::__map_.pop_front();
-            __base::__map_.push_back(__pt);
-        }
-    }
-    // Else need to allocate __nb buffers, *and* we need to reallocate __map_.
-    else
-    {
-        size_type __ds = __front_capacity * __base::__block_size;
-        __split_buffer<pointer, typename __base::__pointer_allocator&>
-            __buf(max<size_type>(2* __base::__map_.capacity(),
-                                 __nb + __base::__map_.size()),
-                  __base::__map_.size() - __front_capacity,
-                  __base::__map_.__alloc());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __nb > 0; --__nb)
-                __buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            for (typename __base::__map_pointer __i = __buf.begin();
-                    __i != __buf.end(); ++__i)
-                __alloc_traits::deallocate(__a, *__i, __base::__block_size);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (; __front_capacity > 0; --__front_capacity)
-        {
-            __buf.push_back(__base::__map_.front());
-            __base::__map_.pop_front();
-        }
-        for (typename __base::__map_pointer __i = __base::__map_.end();
-                __i != __base::__map_.begin();)
-            __buf.push_front(*--__i);
-        _VSTD::swap(__base::__map_.__first_, __buf.__first_);
-        _VSTD::swap(__base::__map_.__begin_, __buf.__begin_);
-        _VSTD::swap(__base::__map_.__end_, __buf.__end_);
-        _VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());
-        __base::__start_ -= __ds;
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::pop_front()
-{
-    allocator_type& __a = __base::__alloc();
-    __alloc_traits::destroy(__a, __to_raw_pointer(*(__base::__map_.begin() +
-                                                    __base::__start_ / __base::__block_size) +
-                                                    __base::__start_ % __base::__block_size));
-    --__base::size();
-    if (++__base::__start_ >= 2 * __base::__block_size)
-    {
-        __alloc_traits::deallocate(__a, __base::__map_.front(), __base::__block_size);
-        __base::__map_.pop_front();
-        __base::__start_ -= __base::__block_size;
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::pop_back()
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __p = __base::size() + __base::__start_ - 1;
-    __alloc_traits::destroy(__a, __to_raw_pointer(*(__base::__map_.begin() +
-                                                    __p / __base::__block_size) +
-                                                    __p % __base::__block_size));
-    --__base::size();
-    if (__back_spare() >= 2 * __base::__block_size)
-    {
-        __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-        __base::__map_.pop_back();
-    }
-}
-
-// move assign [__f, __l) to [__r, __r + (__l-__f)).
-// If __vt points into [__f, __l), then subtract (__f - __r) from __vt.
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::__move_and_check(iterator __f, iterator __l, iterator __r,
-                                         const_pointer& __vt)
-{
-    // as if
-    //   for (; __f != __l; ++__f, ++__r)
-    //       *__r = _VSTD::move(*__f);
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + __base::__block_size;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        if (__fb <= __vt && __vt < __fe)
-            __vt = (const_iterator(static_cast<__map_const_pointer>(__f.__m_iter_), __vt) -= __f - __r).__ptr_;
-        __r = _VSTD::move(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-// move assign [__f, __l) to [__r - (__l-__f), __r) backwards.
-// If __vt points into [__f, __l), then add (__r - __l) to __vt.
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::__move_backward_and_check(iterator __f, iterator __l, iterator __r,
-                                                  const_pointer& __vt)
-{
-    // as if
-    //   while (__f != __l)
-    //       *--__r = _VSTD::move(*--__l);
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        if (__lb <= __vt && __vt < __le)
-            __vt = (const_iterator(static_cast<__map_const_pointer>(__l.__m_iter_), __vt) += __r - __l - 1).__ptr_;
-        __r = _VSTD::move_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-// move construct [__f, __l) to [__r, __r + (__l-__f)).
-// If __vt points into [__f, __l), then add (__r - __f) to __vt.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__move_construct_and_check(iterator __f, iterator __l,
-                                                   iterator __r, const_pointer& __vt)
-{
-    allocator_type& __a = __base::__alloc();
-    // as if
-    //   for (; __f != __l; ++__r, ++__f, ++__base::size())
-    //       __alloc_traits::construct(__a, _VSTD::addressof(*__r), _VSTD::move(*__f));
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + __base::__block_size;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        if (__fb <= __vt && __vt < __fe)
-            __vt = (const_iterator(static_cast<__map_const_pointer>(__f.__m_iter_), __vt) += __r - __f).__ptr_;
-        for (; __fb != __fe; ++__fb, ++__r, ++__base::size())
-            __alloc_traits::construct(__a, _VSTD::addressof(*__r), _VSTD::move(*__fb));
-        __n -= __bs;
-        __f += __bs;
-    }
-}
-
-// move construct [__f, __l) to [__r - (__l-__f), __r) backwards.
-// If __vt points into [__f, __l), then subtract (__l - __r) from __vt.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__move_construct_backward_and_check(iterator __f, iterator __l,
-                                                            iterator __r, const_pointer& __vt)
-{
-    allocator_type& __a = __base::__alloc();
-    // as if
-    //   for (iterator __j = __l; __j != __f;)
-    //   {
-    //       __alloc_traitsconstruct(__a, _VSTD::addressof(*--__r), _VSTD::move(*--__j));
-    //       --__base::__start_;
-    //       ++__base::size();
-    //   }
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        if (__lb <= __vt && __vt < __le)
-            __vt = (const_iterator(static_cast<__map_const_pointer>(__l.__m_iter_), __vt) -= __l - __r + 1).__ptr_;
-        while (__le != __lb)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*--__r), _VSTD::move(*--__le));
-            --__base::__start_;
-            ++__base::size();
-        }
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-}
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::erase(const_iterator __f)
-{
-    difference_type __n = 1;
-    iterator __b = __base::begin();
-    difference_type __pos = __f - __b;
-    iterator __p = __b + __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < (__base::size() - 1) / 2)
-    {   // erase from front
-        _VSTD::move_backward(__b, __p, _VSTD::next(__p));
-        __alloc_traits::destroy(__a, _VSTD::addressof(*__b));
-        --__base::size();
-        ++__base::__start_;
-        if (__front_spare() >= 2 * __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.front(), __base::__block_size);
-            __base::__map_.pop_front();
-            __base::__start_ -= __base::__block_size;
-        }
-    }
-    else
-    {   // erase from back
-        iterator __i = _VSTD::move(_VSTD::next(__p), __base::end(), __p);
-        __alloc_traits::destroy(__a, _VSTD::addressof(*__i));
-        --__base::size();
-        if (__back_spare() >= 2 * __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-            __base::__map_.pop_back();
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::erase(const_iterator __f, const_iterator __l)
-{
-    difference_type __n = __l - __f;
-    iterator __b = __base::begin();
-    difference_type __pos = __f - __b;
-    iterator __p = __b + __pos;
-    if (__n > 0)
-    {
-        allocator_type& __a = __base::__alloc();
-        if (__pos < (__base::size() - __n) / 2)
-        {   // erase from front
-            iterator __i = _VSTD::move_backward(__b, __p, __p + __n);
-            for (; __b != __i; ++__b)
-                __alloc_traits::destroy(__a, _VSTD::addressof(*__b));
-            __base::size() -= __n;
-            __base::__start_ += __n;
-            while (__front_spare() >= 2 * __base::__block_size)
-            {
-                __alloc_traits::deallocate(__a, __base::__map_.front(), __base::__block_size);
-                __base::__map_.pop_front();
-                __base::__start_ -= __base::__block_size;
-            }
-        }
-        else
-        {   // erase from back
-            iterator __i = _VSTD::move(__p + __n, __base::end(), __p);
-            for (iterator __e = __base::end(); __i != __e; ++__i)
-                __alloc_traits::destroy(__a, _VSTD::addressof(*__i));
-            __base::size() -= __n;
-            while (__back_spare() >= 2 * __base::__block_size)
-            {
-                __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-                __base::__map_.pop_back();
-            }
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__erase_to_end(const_iterator __f)
-{
-    iterator __e = __base::end();
-    difference_type __n = __e - __f;
-    if (__n > 0)
-    {
-        allocator_type& __a = __base::__alloc();
-        iterator __b = __base::begin();
-        difference_type __pos = __f - __b;
-        for (iterator __p = __b + __pos; __p != __e; ++__p)
-            __alloc_traits::destroy(__a, _VSTD::addressof(*__p));
-        __base::size() -= __n;
-        while (__back_spare() >= 2 * __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-            __base::__map_.pop_back();
-        }
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-deque<_Tp, _Allocator>::swap(deque& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-    __base::swap(__c);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-deque<_Tp, _Allocator>::clear() _NOEXCEPT
-{
-    __base::clear();
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    const typename deque<_Tp, _Allocator>::size_type __sz = __x.size();
-    return __sz == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(deque<_Tp, _Allocator>& __x, deque<_Tp, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_DEQUE
diff --git a/include.new/c++/v1/exception b/include.new/c++/v1/exception
deleted file mode 100644
index cad802e..0000000
--- a/include.new/c++/v1/exception
+++ /dev/null
@@ -1,250 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- exception ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_EXCEPTION
-#define _LIBCPP_EXCEPTION
-
-/*
-    exception synopsis
-
-namespace std
-{
-
-class exception
-{
-public:
-    exception() noexcept;
-    exception(const exception&) noexcept;
-    exception& operator=(const exception&) noexcept;
-    virtual ~exception() noexcept;
-    virtual const char* what() const noexcept;
-};
-
-class bad_exception
-    : public exception
-{
-public:
-    bad_exception() noexcept;
-    bad_exception(const bad_exception&) noexcept;
-    bad_exception& operator=(const bad_exception&) noexcept;
-    virtual ~bad_exception() noexcept;
-    virtual const char* what() const noexcept;
-};
-
-typedef void (*unexpected_handler)();
-unexpected_handler set_unexpected(unexpected_handler  f ) noexcept;
-unexpected_handler get_unexpected() noexcept;
-[[noreturn]] void unexpected();
-
-typedef void (*terminate_handler)();
-terminate_handler set_terminate(terminate_handler  f ) noexcept;
-terminate_handler get_terminate() noexcept;
-[[noreturn]] void terminate() noexcept;
-
-bool uncaught_exception() noexcept;
-
-typedef unspecified exception_ptr;
-
-exception_ptr current_exception() noexcept;
-void rethrow_exception [[noreturn]] (exception_ptr p);
-template<class E> exception_ptr make_exception_ptr(E e) noexcept;
-
-class nested_exception
-{
-public:
-    nested_exception() noexcept;
-    nested_exception(const nested_exception&) noexcept = default;
-    nested_exception& operator=(const nested_exception&) noexcept = default;
-    virtual ~nested_exception() = default;
-
-    // access functions
-    [[noreturn]] void rethrow_nested() const;
-    exception_ptr nested_ptr() const noexcept;
-};
-
-template <class T> [[noreturn]] void throw_with_nested(T&& t);
-template <class E> void rethrow_if_nested(const E& e);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cstddef>
-#include <type_traits>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-namespace std  // purposefully not using versioning namespace
-{
-
-class _LIBCPP_EXCEPTION_ABI exception
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY exception() _NOEXCEPT {}
-    virtual ~exception() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI bad_exception
-    : public exception
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY bad_exception() _NOEXCEPT {}
-    virtual ~bad_exception() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-typedef void (*unexpected_handler)();
-_LIBCPP_FUNC_VIS unexpected_handler set_unexpected(unexpected_handler) _NOEXCEPT;
-_LIBCPP_FUNC_VIS unexpected_handler get_unexpected() _NOEXCEPT;
-_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void unexpected();
-
-typedef void (*terminate_handler)();
-_LIBCPP_FUNC_VIS terminate_handler set_terminate(terminate_handler) _NOEXCEPT;
-_LIBCPP_FUNC_VIS terminate_handler get_terminate() _NOEXCEPT;
-_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void terminate() _NOEXCEPT;
-
-_LIBCPP_FUNC_VIS bool uncaught_exception() _NOEXCEPT;
-
-class _LIBCPP_TYPE_VIS exception_ptr;
-
-_LIBCPP_FUNC_VIS exception_ptr current_exception() _NOEXCEPT;
-_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void rethrow_exception(exception_ptr);
-
-class _LIBCPP_TYPE_VIS exception_ptr
-{
-    void* __ptr_;
-public:
-    _LIBCPP_INLINE_VISIBILITY exception_ptr() _NOEXCEPT : __ptr_() {}
-    _LIBCPP_INLINE_VISIBILITY exception_ptr(nullptr_t) _NOEXCEPT : __ptr_() {}
-    exception_ptr(const exception_ptr&) _NOEXCEPT;
-    exception_ptr& operator=(const exception_ptr&) _NOEXCEPT;
-    ~exception_ptr() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_EXPLICIT
-        operator bool() const _NOEXCEPT {return __ptr_ != nullptr;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT
-        {return !(__x == __y);}
-
-    friend _LIBCPP_FUNC_VIS exception_ptr current_exception() _NOEXCEPT;
-    friend _LIBCPP_FUNC_VIS void rethrow_exception(exception_ptr);
-};
-
-template<class _Ep>
-exception_ptr
-make_exception_ptr(_Ep __e) _NOEXCEPT
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-        throw __e;
-    }
-    catch (...)
-    {
-        return current_exception();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-// nested_exception
-
-class _LIBCPP_EXCEPTION_ABI nested_exception
-{
-    exception_ptr __ptr_;
-public:
-    nested_exception() _NOEXCEPT;
-//     nested_exception(const nested_exception&) noexcept = default;
-//     nested_exception& operator=(const nested_exception&) noexcept = default;
-    virtual ~nested_exception() _NOEXCEPT;
-
-    // access functions
-    _LIBCPP_NORETURN void rethrow_nested() const;
-    _LIBCPP_INLINE_VISIBILITY exception_ptr nested_ptr() const _NOEXCEPT {return __ptr_;}
-};
-
-template <class _Tp>
-struct __nested
-    : public _Tp,
-      public nested_exception
-{
-    _LIBCPP_INLINE_VISIBILITY explicit __nested(const _Tp& __t) : _Tp(__t) {}
-};
-
-template <class _Tp>
-_LIBCPP_NORETURN
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-throw_with_nested(_Tp&& __t, typename enable_if<
-                  is_class<typename remove_reference<_Tp>::type>::value &&
-                  !is_base_of<nested_exception, typename remove_reference<_Tp>::type>::value
-                                    >::type* = 0)
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-throw_with_nested (_Tp& __t, typename enable_if<
-                  is_class<_Tp>::value && !is_base_of<nested_exception, _Tp>::value
-                                    >::type* = 0)
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw __nested<typename remove_reference<_Tp>::type>(_VSTD::forward<_Tp>(__t));
-#endif
-}
-
-template <class _Tp>
-_LIBCPP_NORETURN
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-throw_with_nested(_Tp&& __t, typename enable_if<
-                  !is_class<typename remove_reference<_Tp>::type>::value ||
-                  is_base_of<nested_exception, typename remove_reference<_Tp>::type>::value
-                                    >::type* = 0)
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-throw_with_nested (_Tp& __t, typename enable_if<
-                  !is_class<_Tp>::value || is_base_of<nested_exception, _Tp>::value
-                                    >::type* = 0)
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw _VSTD::forward<_Tp>(__t);
-#endif
-}
-
-template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-rethrow_if_nested(const _Ep& __e, typename enable_if<
-                                   is_polymorphic<_Ep>::value
-                                                   >::type* = 0)
-{
-    const nested_exception* __nep = dynamic_cast<const nested_exception*>(&__e);
-    if (__nep)
-        __nep->rethrow_nested();
-}
-
-template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-rethrow_if_nested(const _Ep&, typename enable_if<
-                                   !is_polymorphic<_Ep>::value
-                                                   >::type* = 0)
-{
-}
-
-}  // std
-
-#endif  // _LIBCPP_EXCEPTION
diff --git a/include.new/c++/v1/experimental/__config b/include.new/c++/v1/experimental/__config
deleted file mode 100644
index 684a3b4..0000000
--- a/include.new/c++/v1/experimental/__config
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- __config ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_EXPERIMENTAL_CONFIG
-#define _LIBCPP_EXPERIMENTAL_CONFIG
-
-#include <__config>
-
-#define _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL namespace std { namespace experimental {
-#define _LIBCPP_END_NAMESPACE_EXPERIMENTAL  } }
-#define _VSTD_EXPERIMENTAL std::experimental
-
-#define _LIBCPP_BEGIN_NAMESPACE_LFTS _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL inline namespace fundamentals_v1 {
-#define _LIBCPP_END_NAMESPACE_LFTS  } } }
-#define _VSTD_LFTS _VSTD_EXPERIMENTAL::fundamentals_v1
-
-#endif
diff --git a/include.new/c++/v1/experimental/dynarray b/include.new/c++/v1/experimental/dynarray
deleted file mode 100644
index 0bc8dfe..0000000
--- a/include.new/c++/v1/experimental/dynarray
+++ /dev/null
@@ -1,314 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- dynarray ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_DYNARRAY
-#define _LIBCPP_DYNARRAY
-
-#include <__config>
-#if _LIBCPP_STD_VER > 11
-
-/*
-    dynarray synopsis
-
-namespace std { namespace experimental {
-
-template< typename T >
-class dynarray
-{
-    // types:
-    typedef       T                               value_type;
-    typedef       T&                              reference;
-    typedef const T&                              const_reference;
-    typedef       T*                              pointer;
-    typedef const T*                              const_pointer;
-    typedef       implementation-defined          iterator;
-    typedef       implementation-defined          const_iterator;
-    typedef reverse_iterator<iterator>            reverse_iterator;
-    typedef reverse_iterator<const_iterator>      const_reverse_iterator;
-    typedef size_t                                size_type;
-    typedef ptrdiff_t                             difference_type;
-
-public:
-    // construct/copy/destroy:
-    explicit dynarray(size_type c);
-    dynarray(size_type c, const T& v);
-    dynarray(const dynarray& d);
-    dynarray(initializer_list<T>);
-
-    template <class Alloc>
-      dynarray(allocator_arg_t, const Alloc& a, size_type c, const Alloc& alloc);
-    template <class Alloc>
-      dynarray(allocator_arg_t, const Alloc& a, size_type c, const T& v, const Alloc& alloc);
-    template <class Alloc>
-      dynarray(allocator_arg_t, const Alloc& a, const dynarray& d, const Alloc& alloc);
-    template <class Alloc>
-      dynarray(allocator_arg_t, const Alloc& a, initializer_list<T>, const Alloc& alloc);
-    dynarray& operator=(const dynarray&) = delete;
-    ~dynarray();
-
-    // iterators:
-    iterator       begin()        noexcept;
-    const_iterator begin()  const noexcept;
-    const_iterator cbegin() const noexcept;
-    iterator       end()          noexcept;
-    const_iterator end()    const noexcept;
-    const_iterator cend()   const noexcept;
-
-    reverse_iterator       rbegin()        noexcept;
-    const_reverse_iterator rbegin()  const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    reverse_iterator       rend()          noexcept;
-    const_reverse_iterator rend()    const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    // capacity:
-    size_type size()     const noexcept;
-    size_type max_size() const noexcept;
-    bool      empty()    const noexcept;
-
-    // element access:
-    reference       operator[](size_type n);
-    const_reference operator[](size_type n) const;
-
-    reference       front();
-    const_reference front() const;
-    reference       back();
-    const_reference back()  const;
-
-    const_reference at(size_type n) const;
-    reference       at(size_type n);
-
-    // data access:
-    T*       data()       noexcept;
-    const T* data() const noexcept;
-
-    // mutating member functions:
-    void fill(const T& v);
-};
-
-}}  // std::experimental
-
-*/
-
-#include <__functional_base>
-#include <iterator>
-#include <stdexcept>
-#include <initializer_list>
-#include <new>
-#include <algorithm>
-
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-    #include <cassert>
-#endif
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-namespace std { namespace experimental { inline namespace __array_extensions_v1 {
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY dynarray
-{
-public:
-    // types:
-    typedef dynarray __self;
-    typedef _Tp                                   value_type;
-    typedef value_type&                           reference;
-    typedef const value_type&                     const_reference;
-    typedef value_type*                           iterator;
-    typedef const value_type*                     const_iterator;
-    typedef value_type*                           pointer;
-    typedef const value_type*                     const_pointer;
-    typedef size_t                                size_type;
-    typedef ptrdiff_t                             difference_type;
-    typedef std::reverse_iterator<iterator>       reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-private:
-    size_t                  __size_;
-    value_type *            __base_;
-    _LIBCPP_ALWAYS_INLINE dynarray () noexcept : __base_(nullptr), __size_(0) {}
-    
-    static inline _LIBCPP_INLINE_VISIBILITY value_type* __allocate ( size_t count )
-    {
-        if ( numeric_limits<size_t>::max() / sizeof (value_type) <= count )
-        {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            throw bad_array_length();
-#else
-            assert(!"dynarray::allocation");
-#endif
-        }
-        return static_cast<value_type *> (_VSTD::__allocate (sizeof(value_type) * count));
-    }
-
-    static inline _LIBCPP_INLINE_VISIBILITY void __deallocate ( value_type* __ptr ) noexcept
-    {
-        _VSTD::__deallocate (static_cast<void *> (__ptr));
-    }
-
-public:
-
-    explicit dynarray(size_type __c);
-    dynarray(size_type __c, const value_type& __v);
-    dynarray(const dynarray& __d);
-    dynarray(initializer_list<value_type>);
-
-//  We're not implementing these right now.
-//  Updated with the resolution of LWG issue #2255
-//     template <typename _Alloc>
-//       dynarray(allocator_arg_t, const _Alloc& __alloc, size_type __c);
-//     template <typename _Alloc>
-//       dynarray(allocator_arg_t, const _Alloc& __alloc, size_type __c, const value_type& __v);
-//     template <typename _Alloc>
-//       dynarray(allocator_arg_t, const _Alloc& __alloc, const dynarray& __d);
-//     template <typename _Alloc>
-//       dynarray(allocator_arg_t, const _Alloc& __alloc, initializer_list<value_type>);
-
-    dynarray& operator=(const dynarray&) = delete;
-    ~dynarray();
-
-    // iterators:
-    inline _LIBCPP_INLINE_VISIBILITY iterator       begin()        noexcept { return iterator(data()); }
-    inline _LIBCPP_INLINE_VISIBILITY const_iterator begin()  const noexcept { return const_iterator(data()); }
-    inline _LIBCPP_INLINE_VISIBILITY const_iterator cbegin() const noexcept { return const_iterator(data()); }
-    inline _LIBCPP_INLINE_VISIBILITY iterator       end()          noexcept { return iterator(data() + __size_); }
-    inline _LIBCPP_INLINE_VISIBILITY const_iterator end()    const noexcept { return const_iterator(data() + __size_); }
-    inline _LIBCPP_INLINE_VISIBILITY const_iterator cend()   const noexcept { return const_iterator(data() + __size_); }
-
-    inline _LIBCPP_INLINE_VISIBILITY reverse_iterator       rbegin()        noexcept { return reverse_iterator(end()); }
-    inline _LIBCPP_INLINE_VISIBILITY const_reverse_iterator rbegin()  const noexcept { return const_reverse_iterator(end()); }
-    inline _LIBCPP_INLINE_VISIBILITY const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); }
-    inline _LIBCPP_INLINE_VISIBILITY reverse_iterator       rend()          noexcept { return reverse_iterator(begin()); }
-    inline _LIBCPP_INLINE_VISIBILITY const_reverse_iterator rend()    const noexcept { return const_reverse_iterator(begin()); }
-    inline _LIBCPP_INLINE_VISIBILITY const_reverse_iterator crend()   const noexcept { return const_reverse_iterator(begin()); }
-
-    // capacity:
-    inline _LIBCPP_INLINE_VISIBILITY size_type size()     const noexcept { return __size_; }
-    inline _LIBCPP_INLINE_VISIBILITY size_type max_size() const noexcept { return __size_; }
-    inline _LIBCPP_INLINE_VISIBILITY bool      empty()    const noexcept { return __size_ == 0; }
-
-    // element access:
-    inline _LIBCPP_INLINE_VISIBILITY reference       operator[](size_type __n)       { return data()[__n]; }
-    inline _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const { return data()[__n]; }
-
-    inline _LIBCPP_INLINE_VISIBILITY reference       front()       { return data()[0]; }
-    inline _LIBCPP_INLINE_VISIBILITY const_reference front() const { return data()[0]; }
-    inline _LIBCPP_INLINE_VISIBILITY reference       back()        { return data()[__size_-1]; }
-    inline _LIBCPP_INLINE_VISIBILITY const_reference back()  const { return data()[__size_-1]; }
-
-    inline _LIBCPP_INLINE_VISIBILITY const_reference at(size_type __n) const;
-    inline _LIBCPP_INLINE_VISIBILITY reference       at(size_type __n);
-
-    // data access:
-    inline _LIBCPP_INLINE_VISIBILITY _Tp*       data()       noexcept { return __base_; }
-    inline _LIBCPP_INLINE_VISIBILITY const _Tp* data() const noexcept { return __base_; }
-
-    // mutating member functions:
-    inline _LIBCPP_INLINE_VISIBILITY void fill(const value_type& __v) { fill_n(begin(), __size_, __v); }
-};
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-dynarray<_Tp>::dynarray(size_type __c) : dynarray ()
-{
-    __base_ = __allocate (__c);
-    value_type *__data = data ();
-    for ( __size_ = 0; __size_ < __c; ++__size_, ++__data )
-        ::new (__data) value_type;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-dynarray<_Tp>::dynarray(size_type __c, const value_type& __v) : dynarray ()
-{
-    __base_ = __allocate (__c);
-    value_type *__data = data ();
-    for ( __size_ = 0; __size_ < __c; ++__size_, ++__data )
-        ::new (__data) value_type (__v);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-dynarray<_Tp>::dynarray(initializer_list<value_type> __il) : dynarray ()
-{
-    size_t sz = __il.size();
-    __base_ = __allocate (sz);
-    value_type *__data = data ();
-    auto src = __il.begin();
-    for ( __size_ = 0; __size_ < sz; ++__size_, ++__data, ++src )
-        ::new (__data) value_type (*src);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-dynarray<_Tp>::dynarray(const dynarray& __d) : dynarray ()
-{
-    size_t sz = __d.size();
-    __base_ = __allocate (sz);
-    value_type *__data = data ();
-    auto src = __d.begin();
-    for ( __size_ = 0; __size_ < sz; ++__size_, ++__data, ++src )
-        ::new (__data) value_type (*src);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-dynarray<_Tp>::~dynarray()
-{ 
-    value_type *__data = data () + __size_;
-    for ( size_t i = 0; i < __size_; ++i )
-        (--__data)->value_type::~value_type();
-    __deallocate ( __base_ );
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename dynarray<_Tp>::reference
-dynarray<_Tp>::at(size_type __n)
-{
-    if (__n >= __size_)
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("dynarray::at");
-#else
-        assert(!"dynarray::at out_of_range");
-#endif
-    }
-    return data()[__n];
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename dynarray<_Tp>::const_reference
-dynarray<_Tp>::at(size_type __n) const
-{
-    if (__n >= __size_)
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("dynarray::at");
-#else
-        assert(!"dynarray::at out_of_range");
-#endif
-    }
-    return data()[__n];
-}
-
-}}}
-
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-template <class _Tp, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<std::experimental::dynarray<_Tp>, _Alloc> : true_type {};
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // if _LIBCPP_STD_VER > 11 
-#endif  // _LIBCPP_DYNARRAY
diff --git a/include.new/c++/v1/experimental/optional b/include.new/c++/v1/experimental/optional
deleted file mode 100644
index a384882..0000000
--- a/include.new/c++/v1/experimental/optional
+++ /dev/null
@@ -1,894 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- optional ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_OPTIONAL
-#define _LIBCPP_OPTIONAL
-
-/*
-    optional synopsis
-
-// C++1y
-
-namespace std { namespace experimental { inline namespace fundamentals_v1 {
-
-    // 5.3, optional for object types
-    template <class T> class optional;
-
-    // 5.4, In-place construction
-    struct in_place_t{};
-    constexpr in_place_t in_place{};
-
-    // 5.5, No-value state indicator
-    struct nullopt_t{see below};
-    constexpr nullopt_t nullopt(unspecified);
-
-    // 5.6, Class bad_optional_access
-    class bad_optional_access;
-
-    // 5.7, Relational operators
-    template <class T>
-      constexpr bool operator==(const optional<T>&, const optional<T>&);
-    template <class T>
-      constexpr bool operator!=(const optional<T>&, const optional<T>&);
-    template <class T>
-      constexpr bool operator<(const optional<T>&, const optional<T>&);
-    template <class T>
-      constexpr bool operator>(const optional<T>&, const optional<T>&);
-    template <class T>
-      constexpr bool operator<=(const optional<T>&, const optional<T>&);
-    template <class T>
-      constexpr bool operator>=(const optional<T>&, const optional<T>&);
-
-    // 5.8, Comparison with nullopt
-    template <class T> constexpr bool operator==(const optional<T>&, nullopt_t) noexcept;
-    template <class T> constexpr bool operator==(nullopt_t, const optional<T>&) noexcept;
-    template <class T> constexpr bool operator!=(const optional<T>&, nullopt_t) noexcept;
-    template <class T> constexpr bool operator!=(nullopt_t, const optional<T>&) noexcept;
-    template <class T> constexpr bool operator<(const optional<T>&, nullopt_t) noexcept;
-    template <class T> constexpr bool operator<(nullopt_t, const optional<T>&) noexcept;
-    template <class T> constexpr bool operator<=(const optional<T>&, nullopt_t) noexcept;
-    template <class T> constexpr bool operator<=(nullopt_t, const optional<T>&) noexcept;
-    template <class T> constexpr bool operator>(const optional<T>&, nullopt_t) noexcept;
-    template <class T> constexpr bool operator>(nullopt_t, const optional<T>&) noexcept;
-    template <class T> constexpr bool operator>=(const optional<T>&, nullopt_t) noexcept;
-    template <class T> constexpr bool operator>=(nullopt_t, const optional<T>&) noexcept;
-
-    // 5.9, Comparison with T
-    template <class T> constexpr bool operator==(const optional<T>&, const T&);
-    template <class T> constexpr bool operator==(const T&, const optional<T>&);
-    template <class T> constexpr bool operator!=(const optional<T>&, const T&);
-    template <class T> constexpr bool operator!=(const T&, const optional<T>&);
-    template <class T> constexpr bool operator<(const optional<T>&, const T&);
-    template <class T> constexpr bool operator<(const T&, const optional<T>&);
-    template <class T> constexpr bool operator<=(const optional<T>&, const T&);
-    template <class T> constexpr bool operator<=(const T&, const optional<T>&);
-    template <class T> constexpr bool operator>(const optional<T>&, const T&);
-    template <class T> constexpr bool operator>(const T&, const optional<T>&);
-    template <class T> constexpr bool operator>=(const optional<T>&, const T&);
-    template <class T> constexpr bool operator>=(const T&, const optional<T>&);
-
-    // 5.10, Specialized algorithms
-    template <class T> void swap(optional<T>&, optional<T>&) noexcept(see below);
-    template <class T> constexpr optional<see below> make_optional(T&&);
-
-	template <class T>
-	class optional
-	{
-	public:
-	  typedef T value_type;
-
-	  // 5.3.1, Constructors
-	  constexpr optional() noexcept;
-	  constexpr optional(nullopt_t) noexcept;
-	  optional(const optional&);
-	  optional(optional&&) noexcept(see below);
-	  constexpr optional(const T&);
-	  constexpr optional(T&&);
-	  template <class... Args> constexpr explicit optional(in_place_t, Args&&...);
-	  template <class U, class... Args>
-		constexpr explicit optional(in_place_t, initializer_list<U>, Args&&...);
-
-	  // 5.3.2, Destructor
-	  ~optional();
-
-	  // 5.3.3, Assignment
-	  optional& operator=(nullopt_t) noexcept;
-	  optional& operator=(const optional&);
-	  optional& operator=(optional&&) noexcept(see below);
-	  template <class U> optional& operator=(U&&);
-	  template <class... Args> void emplace(Args&&...);
-	  template <class U, class... Args>
-		void emplace(initializer_list<U>, Args&&...);
-
-	  // 5.3.4, Swap
-	  void swap(optional&) noexcept(see below);
-
-	  // 5.3.5, Observers
-	  constexpr T const* operator ->() const;
-	  constexpr T* operator ->();
-	  constexpr T const& operator *() const &;
-	  constexpr T& operator *() &;
-	  constexpr T&& operator *() &&;
-	  constexpr const T&& operator *() const &&;
-	  constexpr explicit operator bool() const noexcept;
-	  constexpr T const& value() const &;
-	  constexpr T& value() &;
-	  constexpr T&& value() &&;
-	  constexpr const T&& value() const &&;
-	  template <class U> constexpr T value_or(U&&) const &;
-	  template <class U> constexpr T value_or(U&&) &&;
-
-	private:
-	  T*   val;  // exposition only
-	};
-
-  } // namespace fundamentals_v1
-  } // namespace experimental
-
-  // 5.11, Hash support
-  template <class T> struct hash;
-  template <class T> struct hash<experimental::optional<T>>;
-
-} // namespace std
-
-*/
-
-#include <experimental/__config>
-#include <functional>
-#include <stdexcept>
-
-_LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL
-class _LIBCPP_EXCEPTION_ABI bad_optional_access
-    : public std::logic_error
-{
-public:
-	bad_optional_access() : std::logic_error("Bad optional Access") {}
-
-//	Get the key function ~bad_optional_access() into the dylib
-    virtual ~bad_optional_access() _NOEXCEPT;
-};
-
-_LIBCPP_END_NAMESPACE_EXPERIMENTAL
-
-
-#if _LIBCPP_STD_VER > 11
-
-#include <initializer_list>
-#include <type_traits>
-#include <new>
-#include <__functional_base>
-#include <__undef_min_max>
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_LFTS
-
-struct in_place_t {};
-constexpr in_place_t in_place{};
-
-struct nullopt_t
-{
-    explicit constexpr nullopt_t(int) noexcept {}
-};
-
-constexpr nullopt_t nullopt{0};
-
-template <class _Tp, bool = is_trivially_destructible<_Tp>::value>
-class __optional_storage
-{
-protected:
-    typedef _Tp value_type;
-    union
-    {
-        char __null_state_;
-        value_type __val_;
-    };
-    bool __engaged_ = false;
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__optional_storage()
-    {
-        if (__engaged_)
-            __val_.~value_type();
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr __optional_storage() noexcept
-        :  __null_state_('\0') {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __optional_storage(const __optional_storage& __x)
-        :  __engaged_(__x.__engaged_)
-        {
-            if (__engaged_)
-                ::new(_VSTD::addressof(__val_)) value_type(__x.__val_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __optional_storage(__optional_storage&& __x)
-                      noexcept(is_nothrow_move_constructible<value_type>::value)
-        :  __engaged_(__x.__engaged_)
-        {
-            if (__engaged_)
-                ::new(_VSTD::addressof(__val_)) value_type(_VSTD::move(__x.__val_));
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr __optional_storage(const value_type& __v)
-        :  __val_(__v),
-           __engaged_(true) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr __optional_storage(value_type&& __v)
-        :  __val_(_VSTD::move(__v)),
-           __engaged_(true) {}
-
-    template <class... _Args>
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr
-    explicit __optional_storage(in_place_t, _Args&&... __args)
-       :  __val_(_VSTD::forward<_Args>(__args)...),
-           __engaged_(true) {}
-};
-
-template <class _Tp>
-class __optional_storage<_Tp, true>
-{
-protected:
-    typedef _Tp value_type;
-    union
-    {
-        char __null_state_;
-        value_type __val_;
-    };
-    bool __engaged_ = false;
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr __optional_storage() noexcept
-        :  __null_state_('\0') {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __optional_storage(const __optional_storage& __x)
-        :  __engaged_(__x.__engaged_)
-        {
-            if (__engaged_)
-                ::new(_VSTD::addressof(__val_)) value_type(__x.__val_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __optional_storage(__optional_storage&& __x)
-                      noexcept(is_nothrow_move_constructible<value_type>::value)
-        :  __engaged_(__x.__engaged_)
-        {
-            if (__engaged_)
-                ::new(_VSTD::addressof(__val_)) value_type(_VSTD::move(__x.__val_));
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr __optional_storage(const value_type& __v)
-        :  __val_(__v),
-           __engaged_(true) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr __optional_storage(value_type&& __v)
-        :  __val_(_VSTD::move(__v)),
-           __engaged_(true) {}
-
-    template <class... _Args>
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr
-    explicit __optional_storage(in_place_t, _Args&&... __args)
-       :  __val_(_VSTD::forward<_Args>(__args)...),
-           __engaged_(true) {}
-};
-
-template <class _Tp>
-class optional
-    : private __optional_storage<_Tp>
-{
-    typedef __optional_storage<_Tp> __base;
-public:
-    typedef _Tp value_type;
-
-    static_assert(!is_reference<value_type>::value,
-              "Instantiation of optional with a reference type is ill-formed.");
-    static_assert(!is_same<typename remove_cv<value_type>::type, in_place_t>::value,
-              "Instantiation of optional with a in_place_t type is ill-formed.");
-    static_assert(!is_same<typename remove_cv<value_type>::type, nullopt_t>::value,
-              "Instantiation of optional with a nullopt_t type is ill-formed.");
-    static_assert(is_object<value_type>::value,
-        "Instantiation of optional with a non-object type is undefined behavior.");
-    static_assert(is_nothrow_destructible<value_type>::value,
-        "Instantiation of optional with an object type that is not noexcept destructible is undefined behavior.");
-
-    _LIBCPP_INLINE_VISIBILITY constexpr optional() noexcept {}
-    _LIBCPP_INLINE_VISIBILITY optional(const optional&) = default;
-    _LIBCPP_INLINE_VISIBILITY optional(optional&&) = default;
-    _LIBCPP_INLINE_VISIBILITY ~optional() = default;
-    _LIBCPP_INLINE_VISIBILITY constexpr optional(nullopt_t) noexcept {}
-    _LIBCPP_INLINE_VISIBILITY constexpr optional(const value_type& __v)
-        : __base(__v) {}
-    _LIBCPP_INLINE_VISIBILITY constexpr optional(value_type&& __v)
-        : __base(_VSTD::move(__v)) {}
-
-    template <class... _Args,
-              class = typename enable_if
-                      <
-                           is_constructible<value_type, _Args...>::value
-                      >::type
-             >
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr
-    explicit optional(in_place_t, _Args&&... __args)
-        : __base(in_place, _VSTD::forward<_Args>(__args)...) {}
-
-    template <class _Up, class... _Args,
-              class = typename enable_if
-                      <
-                           is_constructible<value_type, initializer_list<_Up>&, _Args...>::value
-                      >::type
-             >
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr
-    explicit optional(in_place_t, initializer_list<_Up> __il, _Args&&... __args)
-        : __base(in_place, __il, _VSTD::forward<_Args>(__args)...) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    optional& operator=(nullopt_t) noexcept
-    {
-        if (this->__engaged_)
-        {
-            this->__val_.~value_type();
-            this->__engaged_ = false;
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    optional&
-    operator=(const optional& __opt)
-    {
-        if (this->__engaged_ == __opt.__engaged_)
-        {
-            if (this->__engaged_)
-                this->__val_ = __opt.__val_;
-        }
-        else
-        {
-            if (this->__engaged_)
-                this->__val_.~value_type();
-            else
-                ::new(_VSTD::addressof(this->__val_)) value_type(__opt.__val_);
-            this->__engaged_ = __opt.__engaged_;
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    optional&
-    operator=(optional&& __opt)
-        noexcept(is_nothrow_move_assignable<value_type>::value &&
-                 is_nothrow_move_constructible<value_type>::value)
-    {
-        if (this->__engaged_ == __opt.__engaged_)
-        {
-            if (this->__engaged_)
-                this->__val_ = _VSTD::move(__opt.__val_);
-        }
-        else
-        {
-            if (this->__engaged_)
-                this->__val_.~value_type();
-            else
-                ::new(_VSTD::addressof(this->__val_)) value_type(_VSTD::move(__opt.__val_));
-            this->__engaged_ = __opt.__engaged_;
-        }
-        return *this;
-    }
-
-    template <class _Up,
-              class = typename enable_if
-                      <
-                          is_same<typename remove_reference<_Up>::type, value_type>::value &&
-                          is_constructible<value_type, _Up>::value &&
-                          is_assignable<value_type&, _Up>::value
-                      >::type
-             >
-    _LIBCPP_INLINE_VISIBILITY
-    optional&
-    operator=(_Up&& __v)
-    {
-        if (this->__engaged_)
-            this->__val_ = _VSTD::forward<_Up>(__v);
-        else
-        {
-            ::new(_VSTD::addressof(this->__val_)) value_type(_VSTD::forward<_Up>(__v));
-            this->__engaged_ = true;
-        }
-        return *this;
-    }
-
-    template <class... _Args,
-              class = typename enable_if
-                      <
-                          is_constructible<value_type, _Args...>::value
-                      >::type
-             >
-    _LIBCPP_INLINE_VISIBILITY
-    void
-    emplace(_Args&&... __args)
-    {
-        *this = nullopt;
-        ::new(_VSTD::addressof(this->__val_)) value_type(_VSTD::forward<_Args>(__args)...);
-        this->__engaged_ = true;
-    }
-
-    template <class _Up, class... _Args,
-              class = typename enable_if
-                      <
-                          is_constructible<value_type, initializer_list<_Up>&, _Args...>::value
-                      >::type
-             >
-    _LIBCPP_INLINE_VISIBILITY
-    void
-    emplace(initializer_list<_Up> __il, _Args&&... __args)
-    {
-        *this = nullopt;
-        ::new(_VSTD::addressof(this->__val_)) value_type(__il, _VSTD::forward<_Args>(__args)...);
-        this->__engaged_ = true;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void
-    swap(optional& __opt)
-        noexcept(is_nothrow_move_constructible<value_type>::value &&
-                 __is_nothrow_swappable<value_type>::value)
-    {
-        using _VSTD::swap;
-        if (this->__engaged_ == __opt.__engaged_)
-        {
-            if (this->__engaged_)
-                swap(this->__val_, __opt.__val_);
-        }
-        else
-        {
-            if (this->__engaged_)
-            {
-                ::new(_VSTD::addressof(__opt.__val_)) value_type(_VSTD::move(this->__val_));
-                this->__val_.~value_type();
-            }
-            else
-            {
-                ::new(_VSTD::addressof(this->__val_)) value_type(_VSTD::move(__opt.__val_));
-                __opt.__val_.~value_type();
-            }
-            swap(this->__engaged_, __opt.__engaged_);
-        }
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr
-    value_type const*
-    operator->() const
-    {
-        _LIBCPP_ASSERT(this->__engaged_, "optional operator-> called for disengaged value");
-        return __operator_arrow(__has_operator_addressof<value_type>{});
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type*
-    operator->()
-    {
-        _LIBCPP_ASSERT(this->__engaged_, "optional operator-> called for disengaged value");
-        return _VSTD::addressof(this->__val_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr
-    const value_type&
-    operator*() const
-    {
-        _LIBCPP_ASSERT(this->__engaged_, "optional operator* called for disengaged value");
-        return this->__val_;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type&
-    operator*()
-    {
-        _LIBCPP_ASSERT(this->__engaged_, "optional operator* called for disengaged value");
-        return this->__val_;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr explicit operator bool() const noexcept {return this->__engaged_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr value_type const& value() const
-    {
-        if (!this->__engaged_)
-            throw bad_optional_access();
-        return this->__val_;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type& value()
-    {
-        if (!this->__engaged_)
-            throw bad_optional_access();
-        return this->__val_;
-    }
-
-    template <class _Up>
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr value_type value_or(_Up&& __v) const&
-    {
-        static_assert(is_copy_constructible<value_type>::value,
-                      "optional<T>::value_or: T must be copy constructible");
-        static_assert(is_convertible<_Up, value_type>::value,
-                      "optional<T>::value_or: U must be convertible to T");
-        return this->__engaged_ ? this->__val_ :
-                                  static_cast<value_type>(_VSTD::forward<_Up>(__v));
-    }
-
-    template <class _Up>
-    _LIBCPP_INLINE_VISIBILITY
-    value_type value_or(_Up&& __v) &&
-    {
-        static_assert(is_move_constructible<value_type>::value,
-                      "optional<T>::value_or: T must be move constructible");
-        static_assert(is_convertible<_Up, value_type>::value,
-                      "optional<T>::value_or: U must be convertible to T");
-        return this->__engaged_ ? _VSTD::move(this->__val_) :
-                                  static_cast<value_type>(_VSTD::forward<_Up>(__v));
-    }
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    value_type const*
-    __operator_arrow(true_type) const
-    {
-        return _VSTD::addressof(this->__val_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr
-    value_type const*
-    __operator_arrow(false_type) const
-    {
-        return &this->__val_;
-    }
-};
-
-// Comparisons between optionals
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator==(const optional<_Tp>& __x, const optional<_Tp>& __y)
-{
-    if (static_cast<bool>(__x) != static_cast<bool>(__y))
-        return false;
-    if (!static_cast<bool>(__x))
-        return true;
-    return *__x == *__y;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator!=(const optional<_Tp>& __x, const optional<_Tp>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<(const optional<_Tp>& __x, const optional<_Tp>& __y)
-{
-    if (!static_cast<bool>(__y))
-        return false;
-    if (!static_cast<bool>(__x))
-        return true;
-    return *__x < *__y;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>(const optional<_Tp>& __x, const optional<_Tp>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<=(const optional<_Tp>& __x, const optional<_Tp>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>=(const optional<_Tp>& __x, const optional<_Tp>& __y)
-{
-    return !(__x < __y);
-}
-
-
-// Comparisons with nullopt
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator==(const optional<_Tp>& __x, nullopt_t) noexcept
-{
-    return !static_cast<bool>(__x);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator==(nullopt_t, const optional<_Tp>& __x) noexcept
-{
-    return !static_cast<bool>(__x);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator!=(const optional<_Tp>& __x, nullopt_t) noexcept
-{
-    return static_cast<bool>(__x);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator!=(nullopt_t, const optional<_Tp>& __x) noexcept
-{
-    return static_cast<bool>(__x);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<(const optional<_Tp>&, nullopt_t) noexcept
-{
-    return false;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<(nullopt_t, const optional<_Tp>& __x) noexcept
-{
-    return static_cast<bool>(__x);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<=(const optional<_Tp>& __x, nullopt_t) noexcept
-{
-    return !static_cast<bool>(__x);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<=(nullopt_t, const optional<_Tp>& __x) noexcept
-{
-    return true;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>(const optional<_Tp>& __x, nullopt_t) noexcept
-{
-    return static_cast<bool>(__x);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>(nullopt_t, const optional<_Tp>& __x) noexcept
-{
-    return false;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>=(const optional<_Tp>&, nullopt_t) noexcept
-{
-    return true;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>=(nullopt_t, const optional<_Tp>& __x) noexcept
-{
-    return !static_cast<bool>(__x);
-}
-
-// Comparisons with T
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator==(const optional<_Tp>& __x, const _Tp& __v)
-{
-    return static_cast<bool>(__x) ? *__x == __v : false;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator==(const _Tp& __v, const optional<_Tp>& __x)
-{
-    return static_cast<bool>(__x) ? *__x == __v : false;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator!=(const optional<_Tp>& __x, const _Tp& __v)
-{
-    return static_cast<bool>(__x) ? !(*__x == __v) : true;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator!=(const _Tp& __v, const optional<_Tp>& __x)
-{
-    return static_cast<bool>(__x) ? !(*__x == __v) : true;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<(const optional<_Tp>& __x, const _Tp& __v)
-{
-    return static_cast<bool>(__x) ? less<_Tp>{}(*__x, __v) : true;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<(const _Tp& __v, const optional<_Tp>& __x)
-{
-    return static_cast<bool>(__x) ? less<_Tp>{}(__v, *__x) : false;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<=(const optional<_Tp>& __x, const _Tp& __v)
-{
-    return !(__x > __v);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator<=(const _Tp& __v, const optional<_Tp>& __x)
-{
-    return !(__v > __x);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>(const optional<_Tp>& __x, const _Tp& __v)
-{
-    return static_cast<bool>(__x) ? __v < __x : false;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>(const _Tp& __v, const optional<_Tp>& __x)
-{
-    return static_cast<bool>(__x) ? __x < __v : true;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>=(const optional<_Tp>& __x, const _Tp& __v)
-{
-    return !(__x < __v);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-bool
-operator>=(const _Tp& __v, const optional<_Tp>& __x)
-{
-    return !(__v < __x);
-}
-
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(optional<_Tp>& __x, optional<_Tp>& __y) noexcept(noexcept(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr
-optional<typename decay<_Tp>::type>
-make_optional(_Tp&& __v)
-{
-    return optional<typename decay<_Tp>::type>(_VSTD::forward<_Tp>(__v));
-}
-
-_LIBCPP_END_NAMESPACE_LFTS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY hash<std::experimental::optional<_Tp> >
-{
-    typedef std::experimental::optional<_Tp> argument_type;
-    typedef size_t        result_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()(const argument_type& __opt) const _NOEXCEPT
-    {
-        return static_cast<bool>(__opt) ? hash<_Tp>()(*__opt) : 0;
-    }
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_STD_VER > 11
-
-#endif  // _LIBCPP_OPTIONAL
diff --git a/include.new/c++/v1/experimental/string_view b/include.new/c++/v1/experimental/string_view
deleted file mode 100644
index d423f39..0000000
--- a/include.new/c++/v1/experimental/string_view
+++ /dev/null
@@ -1,815 +0,0 @@
-// -*- C++ -*-
-//===------------------------ string_view ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_LFTS_STRING_VIEW
-#define _LIBCPP_LFTS_STRING_VIEW
-
-/*
-string_view synopsis
-
-namespace std {
- namespace experimental {
-  inline namespace library_fundamentals_v1 {
-
-    // 7.2, Class template basic_string_view
-    template<class charT, class traits = char_traits<charT>>
-        class basic_string_view;
-
-    // 7.9, basic_string_view non-member comparison functions
-    template<class charT, class traits>
-    constexpr bool operator==(basic_string_view<charT, traits> x,
-                              basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
-    constexpr bool operator!=(basic_string_view<charT, traits> x,
-                              basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
-    constexpr bool operator< (basic_string_view<charT, traits> x,
-                                 basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
-    constexpr bool operator> (basic_string_view<charT, traits> x,
-                              basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
-    constexpr bool operator<=(basic_string_view<charT, traits> x,
-                                 basic_string_view<charT, traits> y) noexcept;
-    template<class charT, class traits>
-    constexpr bool operator>=(basic_string_view<charT, traits> x,
-                              basic_string_view<charT, traits> y) noexcept;
-    // see below, sufficient additional overloads of comparison functions
-
-    // 7.10, Inserters and extractors
-    template<class charT, class traits>
-      basic_ostream<charT, traits>&
-        operator<<(basic_ostream<charT, traits>& os,
-                   basic_string_view<charT, traits> str);
-
-    // basic_string_view typedef names
-    typedef basic_string_view<char> string_view;
-    typedef basic_string_view<char16_t> u16string_view;
-    typedef basic_string_view<char32_t> u32string_view;
-    typedef basic_string_view<wchar_t> wstring_view;
-
-    template<class charT, class traits = char_traits<charT>>
-    class basic_string_view {
-      public:
-      // types
-      typedef traits traits_type;
-      typedef charT value_type;
-      typedef charT* pointer;
-      typedef const charT* const_pointer;
-      typedef charT& reference;
-      typedef const charT& const_reference;
-      typedef implementation-defined const_iterator;
-      typedef const_iterator iterator;
-      typedef reverse_iterator<const_iterator> const_reverse_iterator;
-      typedef const_reverse_iterator reverse_iterator;
-      typedef size_t size_type;
-      typedef ptrdiff_t difference_type;
-      static constexpr size_type npos = size_type(-1);
-
-      // 7.3, basic_string_view constructors and assignment operators
-      constexpr basic_string_view() noexcept;
-      constexpr basic_string_view(const basic_string_view&) noexcept = default;
-      basic_string_view& operator=(const basic_string_view&) noexcept = default;
-      template<class Allocator>
-      basic_string_view(const basic_string<charT, traits, Allocator>& str) noexcept;
-      constexpr basic_string_view(const charT* str);
-      constexpr basic_string_view(const charT* str, size_type len);
-
-      // 7.4, basic_string_view iterator support
-      constexpr const_iterator begin() const noexcept;
-      constexpr const_iterator end() const noexcept;
-      constexpr const_iterator cbegin() const noexcept;
-      constexpr const_iterator cend() const noexcept;
-      const_reverse_iterator rbegin() const noexcept;
-      const_reverse_iterator rend() const noexcept;
-      const_reverse_iterator crbegin() const noexcept;
-      const_reverse_iterator crend() const noexcept;
-
-      // 7.5, basic_string_view capacity
-      constexpr size_type size() const noexcept;
-      constexpr size_type length() const noexcept;
-      constexpr size_type max_size() const noexcept;
-      constexpr bool empty() const noexcept;
-
-      // 7.6, basic_string_view element access
-      constexpr const_reference operator[](size_type pos) const;
-      constexpr const_reference at(size_type pos) const;
-      constexpr const_reference front() const;
-      constexpr const_reference back() const;
-      constexpr const_pointer data() const noexcept;
-
-      // 7.7, basic_string_view modifiers
-      constexpr void clear() noexcept;
-      constexpr void remove_prefix(size_type n);
-      constexpr void remove_suffix(size_type n);
-      constexpr void swap(basic_string_view& s) noexcept;
-
-      // 7.8, basic_string_view string operations
-      template<class Allocator>
-      explicit operator basic_string<charT, traits, Allocator>() const;
-      template<class Allocator = allocator<charT>>
-      basic_string<charT, traits, Allocator> to_string(
-        const Allocator& a = Allocator()) const;
-
-      size_type copy(charT* s, size_type n, size_type pos = 0) const;
-
-      constexpr basic_string_view substr(size_type pos = 0, size_type n = npos) const;
-      constexpr int compare(basic_string_view s) const noexcept;
-      constexpr int compare(size_type pos1, size_type n1, basic_string_view s) const;
-      constexpr int compare(size_type pos1, size_type n1,
-                            basic_string_view s, size_type pos2, size_type n2) const;
-      constexpr int compare(const charT* s) const;
-      constexpr int compare(size_type pos1, size_type n1, const charT* s) const;
-      constexpr int compare(size_type pos1, size_type n1,
-                            const charT* s, size_type n2) const;
-      constexpr size_type find(basic_string_view s, size_type pos = 0) const noexcept;
-      constexpr size_type find(charT c, size_type pos = 0) const noexcept;
-      constexpr size_type find(const charT* s, size_type pos, size_type n) const;
-      constexpr size_type find(const charT* s, size_type pos = 0) const;
-      constexpr size_type rfind(basic_string_view s, size_type pos = npos) const noexcept;
-      constexpr size_type rfind(charT c, size_type pos = npos) const noexcept;
-      constexpr size_type rfind(const charT* s, size_type pos, size_type n) const;
-      constexpr size_type rfind(const charT* s, size_type pos = npos) const;
-      constexpr size_type find_first_of(basic_string_view s, size_type pos = 0) const noexcept;
-      constexpr size_type find_first_of(charT c, size_type pos = 0) const noexcept;
-      constexpr size_type find_first_of(const charT* s, size_type pos, size_type n) const;
-      constexpr size_type find_first_of(const charT* s, size_type pos = 0) const;
-      constexpr size_type find_last_of(basic_string_view s, size_type pos = npos) const noexcept;
-      constexpr size_type find_last_of(charT c, size_type pos = npos) const noexcept;
-      constexpr size_type find_last_of(const charT* s, size_type pos, size_type n) const;
-      constexpr size_type find_last_of(const charT* s, size_type pos = npos) const;
-      constexpr size_type find_first_not_of(basic_string_view s, size_type pos = 0) const noexcept;
-      constexpr size_type find_first_not_of(charT c, size_type pos = 0) const noexcept;
-      constexpr size_type find_first_not_of(const charT* s, size_type pos, size_type n) const;
-      constexpr size_type find_first_not_of(const charT* s, size_type pos = 0) const;
-      constexpr size_type find_last_not_of(basic_string_view s, size_type pos = npos) const noexcept;
-      constexpr size_type find_last_not_of(charT c, size_type pos = npos) const noexcept;
-      constexpr size_type find_last_not_of(const charT* s, size_type pos, size_type n) const;
-      constexpr size_type find_last_not_of(const charT* s, size_type pos = npos) const;
-
-     private:
-      const_pointer data_;  // exposition only
-      size_type     size_;  // exposition only
-    };
-
-  }  // namespace fundamentals_v1
- }  // namespace experimental
-
-  // 7.11, Hash support
-  template <class T> struct hash;
-  template <> struct hash<experimental::string_view>;
-  template <> struct hash<experimental::u16string_view>;
-  template <> struct hash<experimental::u32string_view>;
-  template <> struct hash<experimental::wstring_view>;
-
-}  // namespace std
-
-
-*/
-
-#include <experimental/__config>
-
-#include <string>
-#include <algorithm>
-#include <iterator>
-#include <ostream>
-#include <iomanip>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_LFTS
-
-    template<class _CharT, class _Traits = _VSTD::char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_string_view {
-    public:
-        // types
-        typedef _Traits                                    traits_type;
-        typedef _CharT                                     value_type;
-        typedef const _CharT*                              pointer;
-        typedef const _CharT*                              const_pointer;
-        typedef const _CharT&                              reference;
-        typedef const _CharT&                              const_reference;
-        typedef const_pointer                              const_iterator; // See [string.view.iterators]
-        typedef const_iterator                             iterator;
-        typedef _VSTD::reverse_iterator<const_iterator>    const_reverse_iterator;
-        typedef const_reverse_iterator                     reverse_iterator;
-        typedef size_t                                     size_type;
-        typedef ptrdiff_t                                  difference_type;
-        static _LIBCPP_CONSTEXPR const size_type npos = -1; // size_type(-1);
-
-        // [string.view.cons], construct/copy
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        basic_string_view() _NOEXCEPT : __data (nullptr), __size(0) {}
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        basic_string_view(const basic_string_view&) _NOEXCEPT = default;
-
-        _LIBCPP_INLINE_VISIBILITY
-        basic_string_view& operator=(const basic_string_view&) _NOEXCEPT = default;
-
-        template<class _Allocator>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_string_view(const basic_string<_CharT, _Traits, _Allocator>& __str) _NOEXCEPT
-            : __data (__str.data()), __size(__str.size()) {}
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        basic_string_view(const _CharT* __s, size_type __len)
-            : __data(__s), __size(__len)
-        {
-//             _LIBCPP_ASSERT(__len == 0 || __s != nullptr, "string_view::string_view(_CharT *, size_t): recieved nullptr");
-        }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        basic_string_view(const _CharT* __s)
-            : __data(__s), __size(_Traits::length(__s)) {}
-
-        // [string.view.iterators], iterators
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        const_iterator begin()  const _NOEXCEPT { return cbegin(); }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        const_iterator end()    const _NOEXCEPT { return cend(); }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        const_iterator cbegin() const _NOEXCEPT { return __data; }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        const_iterator cend()   const _NOEXCEPT { return __data + __size; }
-
-        _LIBCPP_INLINE_VISIBILITY
-        const_reverse_iterator rbegin()   const _NOEXCEPT { return const_reverse_iterator(cend()); }
-
-        _LIBCPP_INLINE_VISIBILITY
-        const_reverse_iterator rend()     const _NOEXCEPT { return const_reverse_iterator(cbegin()); }
-
-        _LIBCPP_INLINE_VISIBILITY
-        const_reverse_iterator crbegin()  const _NOEXCEPT { return const_reverse_iterator(cend()); }
-
-        _LIBCPP_INLINE_VISIBILITY
-        const_reverse_iterator crend()    const _NOEXCEPT { return const_reverse_iterator(cbegin()); }
-
-        // [string.view.capacity], capacity
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        size_type size()     const _NOEXCEPT { return __size; }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        size_type length()   const _NOEXCEPT { return __size; }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        size_type max_size() const _NOEXCEPT { return _VSTD::numeric_limits<size_type>::max(); }
-
-        _LIBCPP_CONSTEXPR bool _LIBCPP_INLINE_VISIBILITY
-        empty()         const _NOEXCEPT { return __size == 0; }
-
-        // [string.view.access], element access
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        const_reference operator[](size_type __pos) const { return __data[__pos]; }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        const_reference at(size_type __pos) const
-        {
-            return __pos >= size()
-                ? throw out_of_range("string_view::at")
-                : __data[__pos];
-//             if (__pos >= size())
-//                 throw out_of_range("string_view::at");
-//             return __data[__pos]; 
-        }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        const_reference front() const
-        {
-            return _LIBCPP_ASSERT(!empty(), "string_view::front(): string is empty"), __data[0];
-        }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        const_reference back() const
-        {
-            return _LIBCPP_ASSERT(!empty(), "string_view::back(): string is empty"), __data[__size-1];
-        }
-
-        _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY
-        const_pointer data() const _NOEXCEPT { return __data; }
-
-        // [string.view.modifiers], modifiers:
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        void clear() _NOEXCEPT
-        {
-            __data = nullptr;
-            __size = 0;
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        void remove_prefix(size_type __n) _NOEXCEPT
-        {
-            _LIBCPP_ASSERT(n <= size(), "remove_prefix() can't remove more than size()");
-            __data += __n;
-            __size -= __n;
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        void remove_suffix(size_type __n) _NOEXCEPT
-        {
-            _LIBCPP_ASSERT(n <= size(), "remove_suffix() can't remove more than size()");
-            __size -= __n;
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        void swap(basic_string_view& __other) _NOEXCEPT
-        {
-            const value_type *__p = __data;
-            __data = __other.__data;
-            __other.__data = __p;
-
-            size_type __sz = __size;
-            __size = __other.__size;
-            __other.__size = __sz;
-//             _VSTD::swap( __data, __other.__data );
-//             _VSTD::swap( __size, __other.__size );
-        }
-
-        // [string.view.ops], string operations:
-        template<class _Allocator>
-        _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_EXPLICIT operator basic_string<_CharT, _Traits, _Allocator>() const
-        { return basic_string<_CharT, _Traits, _Allocator>( begin(), end()); }
-
-        template<class _Allocator = allocator<_CharT> >
-        _LIBCPP_INLINE_VISIBILITY
-        basic_string<_CharT, _Traits, _Allocator>
-        to_string( const _Allocator& __a = _Allocator()) const
-        { return basic_string<_CharT, _Traits, _Allocator> ( begin(), end(), __a ); }
-
-        size_type copy(_CharT* __s, size_type __n, size_type __pos = 0) const
-        {
-            if ( __pos > size())
-                throw out_of_range("string_view::copy");
-            size_type __rlen = _VSTD::min( __n, size() - __pos );
-            _VSTD::copy_n(begin() + __pos, __rlen, __s );
-            return __rlen;
-        }
-
-        _LIBCPP_CONSTEXPR
-        basic_string_view substr(size_type __pos = 0, size_type __n = npos) const
-        {
-//             if (__pos > size())
-//                 throw out_of_range("string_view::substr");
-//             size_type __rlen = _VSTD::min( __n, size() - __pos );
-//             return basic_string_view(data() + __pos, __rlen);
-            return __pos > size()
-                ? throw out_of_range("string_view::substr")
-                : basic_string_view(data() + __pos, _VSTD::min(__n, size() - __pos));
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 int compare(basic_string_view __sv) const _NOEXCEPT
-        {
-            size_type __rlen = _VSTD::min( size(), __sv.size());
-            int __retval = _Traits::compare(data(), __sv.data(), __rlen);
-            if ( __retval == 0 ) // first __rlen chars matched
-                __retval = size() == __sv.size() ? 0 : ( size() < __sv.size() ? -1 : 1 );
-            return __retval;
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        int compare(size_type __pos1, size_type __n1, basic_string_view __sv) const
-        {
-            return substr(__pos1, __n1).compare(__sv);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        int compare(                       size_type __pos1, size_type __n1, 
-                    basic_string_view _sv, size_type __pos2, size_type __n2) const
-        {
-            return substr(__pos1, __n1).compare(_sv.substr(__pos2, __n2));
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        int compare(const _CharT* __s) const
-        {
-            return compare(basic_string_view(__s));
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        int compare(size_type __pos1, size_type __n1, const _CharT* __s) const
-        {
-            return substr(__pos1, __n1).compare(basic_string_view(__s));
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        int compare(size_type __pos1, size_type __n1, const _CharT* __s, size_type __n2) const
-        {
-            return substr(__pos1, __n1).compare(basic_string_view(__s, __n2));
-        }
-
-        // find
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find(basic_string_view __s, size_type __pos = 0) const _NOEXCEPT
-        {
-            _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find(): recieved nullptr");
-            return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-                (data(), size(), __s.data(), __pos, __s.size());
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find(_CharT __c, size_type __pos = 0) const _NOEXCEPT
-        {
-            return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-                (data(), size(), __c, __pos);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find(const _CharT* __s, size_type __pos, size_type __n) const
-        {
-            _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find(): recieved nullptr");
-            return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, __n);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find(const _CharT* __s, size_type __pos = 0) const
-        {
-            _LIBCPP_ASSERT(__s != nullptr, "string_view::find(): recieved nullptr");
-            return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, traits_type::length(__s));
-        }
-
-        // rfind
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type rfind(basic_string_view __s, size_type __pos = npos) const _NOEXCEPT
-        {
-            _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find(): recieved nullptr");
-            return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-                (data(), size(), __s.data(), __pos, __s.size());
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type rfind(_CharT __c, size_type __pos = npos) const _NOEXCEPT
-        {
-            return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-                (data(), size(), __c, __pos);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type rfind(const _CharT* __s, size_type __pos, size_type __n) const
-        {
-            _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::rfind(): recieved nullptr");
-            return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, __n);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type rfind(const _CharT* __s, size_type __pos=npos) const
-        {
-            _LIBCPP_ASSERT(__s != nullptr, "string_view::rfind(): recieved nullptr");
-            return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, traits_type::length(__s));
-        }
-
-        // find_first_of
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_first_of(basic_string_view __s, size_type __pos = 0) const _NOEXCEPT
-        {
-            _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find_first_of(): recieved nullptr");
-            return _VSTD::__str_find_first_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s.data(), __pos, __s.size());
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_first_of(_CharT __c, size_type __pos = 0) const _NOEXCEPT
-        { return find(__c, __pos); }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_first_of(const _CharT* __s, size_type __pos, size_type __n) const
-        {
-            _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find_first_of(): recieved nullptr");
-            return _VSTD::__str_find_first_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, __n);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_first_of(const _CharT* __s, size_type __pos=0) const
-        {
-            _LIBCPP_ASSERT(__s != nullptr, "string_view::find_first_of(): recieved nullptr");
-            return _VSTD::__str_find_first_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, traits_type::length(__s));
-        }
-
-        // find_last_of
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_last_of(basic_string_view __s, size_type __pos=npos) const _NOEXCEPT
-        {
-            _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find_last_of(): recieved nullptr");
-            return _VSTD::__str_find_last_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s.data(), __pos, __s.size());
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_last_of(_CharT __c, size_type __pos = npos) const _NOEXCEPT
-        { return rfind(__c, __pos); }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_last_of(const _CharT* __s, size_type __pos, size_type __n) const
-        {
-            _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find_last_of(): recieved nullptr");
-            return _VSTD::__str_find_last_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, __n);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_last_of(const _CharT* __s, size_type __pos=npos) const
-        {
-            _LIBCPP_ASSERT(__s != nullptr, "string_view::find_last_of(): recieved nullptr");
-            return _VSTD::__str_find_last_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, traits_type::length(__s));
-        }
-
-        // find_first_not_of
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_first_not_of(basic_string_view __s, size_type __pos=0) const _NOEXCEPT
-        {
-            _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find_first_not_of(): recieved nullptr");
-            return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s.data(), __pos, __s.size());
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_first_not_of(_CharT __c, size_type __pos=0) const _NOEXCEPT
-        {
-            return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __c, __pos);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_first_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-        {
-            _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find_first_not_of(): recieved nullptr");
-            return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, __n);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_first_not_of(const _CharT* __s, size_type __pos=0) const
-        {
-            _LIBCPP_ASSERT(__s != nullptr, "string_view::find_first_not_of(): recieved nullptr");
-            return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, traits_type::length(__s));
-        }
-
-        // find_last_not_of
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_last_not_of(basic_string_view __s, size_type __pos=npos) const _NOEXCEPT
-        {
-            _LIBCPP_ASSERT(__s.size() == 0 || __s.data() != nullptr, "string_view::find_last_not_of(): recieved nullptr");
-            return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s.data(), __pos, __s.size());
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_last_not_of(_CharT __c, size_type __pos=npos) const _NOEXCEPT
-        {
-            return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __c, __pos);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_last_not_of(const _CharT* __s, size_type __pos, size_type __n) const
-        {
-            _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string_view::find_last_not_of(): recieved nullptr");
-            return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, __n);
-        }
-
-        _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-        size_type find_last_not_of(const _CharT* __s, size_type __pos=npos) const
-        {
-            _LIBCPP_ASSERT(__s != nullptr, "string_view::find_last_not_of(): recieved nullptr");
-            return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-                (data(), size(), __s, __pos, traits_type::length(__s));
-        }
-
-    private:
-        const   value_type* __data;
-        size_type           __size;
-    };
-
-
-    // [string.view.comparison]
-    // operator ==
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator==(basic_string_view<_CharT, _Traits> __lhs,
-                    basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        if ( __lhs.size() != __rhs.size()) return false;
-        return __lhs.compare(__rhs) == 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator==(basic_string_view<_CharT, _Traits> __lhs,
-                    typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
-    {
-        if ( __lhs.size() != __rhs.size()) return false;
-        return __lhs.compare(__rhs) == 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator==(typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __lhs, 
-                    basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        if ( __lhs.size() != __rhs.size()) return false;
-        return __lhs.compare(__rhs) == 0;
-    }
-
-
-    // operator !=
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        if ( __lhs.size() != __rhs.size())
-            return true;
-        return __lhs.compare(__rhs) != 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(basic_string_view<_CharT, _Traits> __lhs,
-                    typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
-    {
-        if ( __lhs.size() != __rhs.size())
-            return true;
-        return __lhs.compare(__rhs) != 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __lhs, 
-                    basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        if ( __lhs.size() != __rhs.size())
-            return true;
-        return __lhs.compare(__rhs) != 0;
-    }
-
-
-    // operator <
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator<(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) < 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator<(basic_string_view<_CharT, _Traits> __lhs,
-                    typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) < 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator<(typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __lhs, 
-                    basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) < 0;
-    }
-
-
-    // operator >
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator> (basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) > 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator>(basic_string_view<_CharT, _Traits> __lhs,
-                    typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) > 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator>(typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __lhs, 
-                    basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) > 0;
-    }
-
-
-    // operator <=
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator<=(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) <= 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator<=(basic_string_view<_CharT, _Traits> __lhs,
-                    typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) <= 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator<=(typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __lhs, 
-                    basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) <= 0;
-    }
-
-
-    // operator >=
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator>=(basic_string_view<_CharT, _Traits> __lhs, basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) >= 0;
-    }
-
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator>=(basic_string_view<_CharT, _Traits> __lhs,
-                    typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) >= 0;
-    }
-
-    template<class _CharT, class _Traits>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator>=(typename _VSTD::common_type<basic_string_view<_CharT, _Traits> >::type __lhs, 
-                    basic_string_view<_CharT, _Traits> __rhs) _NOEXCEPT
-    {
-        return __lhs.compare(__rhs) >= 0;
-    }
-
-
-    // [string.view.io]
-    template<class _CharT, class _Traits>
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, basic_string_view<_CharT, _Traits> __sv)
-    {
-        return _VSTD::__put_character_sequence(__os, __sv.data(), __sv.size());
-    }
-
-  typedef basic_string_view<char>     string_view;
-  typedef basic_string_view<char16_t> u16string_view;
-  typedef basic_string_view<char32_t> u32string_view;
-  typedef basic_string_view<wchar_t>  wstring_view;
-
-_LIBCPP_END_NAMESPACE_LFTS
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// [string.view.hash]
-// Shamelessly stolen from <string>
-template<class _CharT, class _Traits>
-struct _LIBCPP_TYPE_VIS_ONLY hash<std::experimental::basic_string_view<_CharT, _Traits> >
-    : public unary_function<std::experimental::basic_string_view<_CharT, _Traits>, size_t>
-{
-    size_t operator()(const std::experimental::basic_string_view<_CharT, _Traits>& __val) const _NOEXCEPT;
-};
-
-template<class _CharT, class _Traits>
-size_t
-hash<std::experimental::basic_string_view<_CharT, _Traits> >::operator()(
-        const std::experimental::basic_string_view<_CharT, _Traits>& __val) const _NOEXCEPT
-{
-    return __do_string_hash(__val.data(), __val.data() + __val.size());
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _CharT, class _Traits>
-__quoted_output_proxy<_CharT, const _CharT *, _Traits>
-quoted ( std::experimental::basic_string_view <_CharT, _Traits> __sv,
-             _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
-{
-    return __quoted_output_proxy<_CharT, const _CharT *, _Traits> 
-         ( __sv.data(), __sv.data() + __sv.size(), __delim, __escape );
-}
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif // _LIBCPP_LFTS_STRING_VIEW
diff --git a/include.new/c++/v1/experimental/type_traits b/include.new/c++/v1/experimental/type_traits
deleted file mode 100644
index ab2c8cd..0000000
--- a/include.new/c++/v1/experimental/type_traits
+++ /dev/null
@@ -1,423 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- type_traits -------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_EXPERIMENTAL_TYPE_TRAITS
-#define _LIBCPP_EXPERIMENTAL_TYPE_TRAITS
-
-/**
-    experimental/type_traits synopsis
-
-// C++1y
-#include <type_traits>
-
-namespace std {
-namespace experimental {
-inline namespace fundamentals_v1 {
-
-  // See C++14 20.10.4.1, primary type categories
-  template <class T> constexpr bool is_void_v
-    = is_void<T>::value;
-  template <class T> constexpr bool is_null_pointer_v
-    = is_null_pointer<T>::value;
-  template <class T> constexpr bool is_integral_v
-    = is_integral<T>::value;
-  template <class T> constexpr bool is_floating_point_v
-    = is_floating_point<T>::value;
-  template <class T> constexpr bool is_array_v
-    = is_array<T>::value;
-  template <class T> constexpr bool is_pointer_v
-    = is_pointer<T>::value;
-  template <class T> constexpr bool is_lvalue_reference_v
-    = is_lvalue_reference<T>::value;
-  template <class T> constexpr bool is_rvalue_reference_v
-    = is_rvalue_reference<T>::value;
-  template <class T> constexpr bool is_member_object_pointer_v
-    = is_member_object_pointer<T>::value;
-  template <class T> constexpr bool is_member_function_pointer_v
-    = is_member_function_pointer<T>::value;
-  template <class T> constexpr bool is_enum_v
-    = is_enum<T>::value;
-  template <class T> constexpr bool is_union_v
-    = is_union<T>::value;
-  template <class T> constexpr bool is_class_v
-    = is_class<T>::value;
-  template <class T> constexpr bool is_function_v
-    = is_function<T>::value;
-
-  // See C++14 20.10.4.2, composite type categories
-  template <class T> constexpr bool is_reference_v
-    = is_reference<T>::value;
-  template <class T> constexpr bool is_arithmetic_v
-    = is_arithmetic<T>::value;
-  template <class T> constexpr bool is_fundamental_v
-    = is_fundamental<T>::value;
-  template <class T> constexpr bool is_object_v
-    = is_object<T>::value;
-  template <class T> constexpr bool is_scalar_v
-    = is_scalar<T>::value;
-  template <class T> constexpr bool is_compound_v
-    = is_compound<T>::value;
-  template <class T> constexpr bool is_member_pointer_v
-    = is_member_pointer<T>::value;
-
-  // See C++14 20.10.4.3, type properties
-  template <class T> constexpr bool is_const_v
-    = is_const<T>::value;
-  template <class T> constexpr bool is_volatile_v
-    = is_volatile<T>::value;
-  template <class T> constexpr bool is_trivial_v
-    = is_trivial<T>::value;
-  template <class T> constexpr bool is_trivially_copyable_v
-    = is_trivially_copyable<T>::value;
-  template <class T> constexpr bool is_standard_layout_v
-    = is_standard_layout<T>::value;
-  template <class T> constexpr bool is_pod_v
-    = is_pod<T>::value;
-  template <class T> constexpr bool is_literal_type_v
-    = is_literal_type<T>::value;
-  template <class T> constexpr bool is_empty_v
-    = is_empty<T>::value;
-  template <class T> constexpr bool is_polymorphic_v
-    = is_polymorphic<T>::value;
-  template <class T> constexpr bool is_abstract_v
-    = is_abstract<T>::value;
-  template <class T> constexpr bool is_final_v
-    = is_final<T>::value;
-  template <class T> constexpr bool is_signed_v
-    = is_signed<T>::value;
-  template <class T> constexpr bool is_unsigned_v
-    = is_unsigned<T>::value;
-  template <class T, class... Args> constexpr bool is_constructible_v
-    = is_constructible<T, Args...>::value;
-  template <class T> constexpr bool is_default_constructible_v
-    = is_default_constructible<T>::value;
-  template <class T> constexpr bool is_copy_constructible_v
-    = is_copy_constructible<T>::value;
-  template <class T> constexpr bool is_move_constructible_v
-    = is_move_constructible<T>::value;
-  template <class T, class U> constexpr bool is_assignable_v
-    = is_assignable<T, U>::value;
-  template <class T> constexpr bool is_copy_assignable_v
-    = is_copy_assignable<T>::value;
-  template <class T> constexpr bool is_move_assignable_v
-    = is_move_assignable<T>::value;
-  template <class T> constexpr bool is_destructible_v
-    = is_destructible<T>::value;
-  template <class T, class... Args> constexpr bool is_trivially_constructible_v
-    = is_trivially_constructible<T, Args...>::value;
-  template <class T> constexpr bool is_trivially_default_constructible_v
-    = is_trivially_default_constructible<T>::value;
-  template <class T> constexpr bool is_trivially_copy_constructible_v
-    = is_trivially_copy_constructible<T>::value;
-  template <class T> constexpr bool is_trivially_move_constructible_v
-    = is_trivially_move_constructible<T>::value;
-  template <class T, class U> constexpr bool is_trivially_assignable_v
-    = is_trivially_assignable<T, U>::value;
-  template <class T> constexpr bool is_trivially_copy_assignable_v
-    = is_trivially_copy_assignable<T>::value;
-  template <class T> constexpr bool is_trivially_move_assignable_v
-    = is_trivially_move_assignable<T>::value;
-  template <class T> constexpr bool is_trivially_destructible_v
-    = is_trivially_destructible<T>::value;
-  template <class T, class... Args> constexpr bool is_nothrow_constructible_v
-    = is_nothrow_constructible<T, Args...>::value;
-  template <class T> constexpr bool is_nothrow_default_constructible_v
-    = is_nothrow_default_constructible<T>::value;
-  template <class T> constexpr bool is_nothrow_copy_constructible_v
-    = is_nothrow_copy_constructible<T>::value;
-  template <class T> constexpr bool is_nothrow_move_constructible_v
-    = is_nothrow_move_constructible<T>::value;
-  template <class T, class U> constexpr bool is_nothrow_assignable_v
-    = is_nothrow_assignable<T, U>::value;
-  template <class T> constexpr bool is_nothrow_copy_assignable_v
-    = is_nothrow_copy_assignable<T>::value;
-  template <class T> constexpr bool is_nothrow_move_assignable_v
-    = is_nothrow_move_assignable<T>::value;
-  template <class T> constexpr bool is_nothrow_destructible_v
-    = is_nothrow_destructible<T>::value;
-  template <class T> constexpr bool has_virtual_destructor_v
-    = has_virtual_destructor<T>::value;
-
-  // See C++14 20.10.5, type property queries
-  template <class T> constexpr size_t alignment_of_v
-    = alignment_of<T>::value;
-  template <class T> constexpr size_t rank_v
-    = rank<T>::value;
-  template <class T, unsigned I = 0> constexpr size_t extent_v
-    = extent<T, I>::value;
-
-  // See C++14 20.10.6, type relations
-  template <class T, class U> constexpr bool is_same_v
-    = is_same<T, U>::value;
-  template <class Base, class Derived> constexpr bool is_base_of_v
-    = is_base_of<Base, Derived>::value;
-  template <class From, class To> constexpr bool is_convertible_v
-    = is_convertible<From, To>::value;
-
-  // 3.3.2, Other type transformations
-  template <class> class invocation_type; // not defined
-  template <class F, class... ArgTypes> class invocation_type<F(ArgTypes...)>;
-  template <class> class raw_invocation_type; // not defined
-  template <class F, class... ArgTypes> class raw_invocation_type<F(ArgTypes...)>;
-
-  template <class T>
-    using invocation_type_t = typename invocation_type<T>::type;
-  template <class T>
-    using raw_invocation_type_t = typename raw_invocation_type<T>::type;
-
-} // namespace fundamentals_v1
-} // namespace experimental
-} // namespace std
-
- */
-
-#include <experimental/__config>
-
-#if _LIBCPP_STD_VER > 11
-
-#include <type_traits>
-
-_LIBCPP_BEGIN_NAMESPACE_LFTS
-
-#if __has_feature(cxx_variable_templates)
-
-// C++14 20.10.4.1, primary type categories
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_void_v
-    = is_void<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_null_pointer_v
-    = is_null_pointer<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_integral_v
-    = is_integral<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_floating_point_v
-    = is_floating_point<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_array_v
-    = is_array<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_pointer_v
-    = is_pointer<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_lvalue_reference_v
-    = is_lvalue_reference<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_rvalue_reference_v
-    = is_rvalue_reference<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_member_object_pointer_v
-    = is_member_object_pointer<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_member_function_pointer_v
-    = is_member_function_pointer<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_enum_v
-    = is_enum<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_union_v
-    = is_union<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_class_v
-    = is_class<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_function_v
-    = is_function<_Tp>::value;
-
-// C++14 20.10.4.2,  composite type categories
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_reference_v
-    = is_reference<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_arithmetic_v
-    = is_arithmetic<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_fundamental_v
-    = is_fundamental<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_object_v
-    = is_object<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_scalar_v
-    = is_scalar<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_compound_v
-    = is_compound<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_member_pointer_v
-    = is_member_pointer<_Tp>::value;
-
-// C++14 20.10.4.3, type properties
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_const_v
-    = is_const<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_volatile_v
-    = is_volatile<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_trivial_v
-    = is_trivial<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_trivially_copyable_v
-    = is_trivially_copyable<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_standard_layout_v
-    = is_standard_layout<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_pod_v
-    = is_pod<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_literal_type_v
-    = is_literal_type<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_empty_v
-    = is_empty<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_polymorphic_v
-    = is_polymorphic<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_abstract_v
-    = is_abstract<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_final_v
-    = is_final<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_signed_v
-    = is_signed<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_unsigned_v
-    = is_unsigned<_Tp>::value;
-
-template <class _Tp, class ..._Ts> _LIBCPP_CONSTEXPR bool is_constructible_v
-    = is_constructible<_Tp, _Ts...>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_default_constructible_v
-    = is_default_constructible<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_copy_constructible_v
-    = is_copy_constructible<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_move_constructible_v
-    = is_move_constructible<_Tp>::value;
-
-template <class _Tp, class _Up> _LIBCPP_CONSTEXPR bool is_assignable_v
-    = is_assignable<_Tp, _Up>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_copy_assignable_v
-    = is_copy_assignable<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_move_assignable_v
-    = is_move_assignable<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_destructible_v
-    = is_destructible<_Tp>::value;
-
-template <class _Tp, class ..._Ts> _LIBCPP_CONSTEXPR bool is_trivially_constructible_v
-    = is_trivially_constructible<_Tp, _Ts...>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_trivially_default_constructible_v
-    = is_trivially_default_constructible<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_trivially_copy_constructible_v
-    = is_trivially_copy_constructible<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_trivially_move_constructible_v
-    = is_trivially_move_constructible<_Tp>::value;
-
-template <class _Tp, class _Up> _LIBCPP_CONSTEXPR bool is_trivially_assignable_v
-    = is_trivially_assignable<_Tp, _Up>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_trivially_copy_assignable_v
-    = is_trivially_copy_assignable<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_trivially_move_assignable_v
-    = is_trivially_move_assignable<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_trivially_destructible_v
-    = is_trivially_destructible<_Tp>::value;
-
-template <class _Tp, class ..._Ts> _LIBCPP_CONSTEXPR bool is_nothrow_constructible_v
-    = is_nothrow_constructible<_Tp, _Ts...>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_nothrow_default_constructible_v
-    = is_nothrow_default_constructible<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_nothrow_copy_constructible_v
-    = is_nothrow_copy_constructible<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_nothrow_move_constructible_v
-    = is_nothrow_move_constructible<_Tp>::value;
-
-template <class _Tp, class _Up> _LIBCPP_CONSTEXPR bool is_nothrow_assignable_v
-    = is_nothrow_assignable<_Tp, _Up>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_nothrow_copy_assignable_v
-    = is_nothrow_copy_assignable<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_nothrow_move_assignable_v
-    = is_nothrow_move_assignable<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool is_nothrow_destructible_v
-    = is_nothrow_destructible<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR bool has_virtual_destructor_v
-    = has_virtual_destructor<_Tp>::value;
-
-// C++14 20.10.5, type properties queries
-
-template <class _Tp> _LIBCPP_CONSTEXPR size_t alignment_of_v
-    = alignment_of<_Tp>::value;
-
-template <class _Tp> _LIBCPP_CONSTEXPR size_t rank_v
-    = rank<_Tp>::value;
-
-template <class _Tp, unsigned _Id = 0> _LIBCPP_CONSTEXPR size_t extent_v
-    = extent<_Tp, _Id>::value;
-
-// C++14 20.10.6, type relations
-
-template <class _Tp, class _Up> _LIBCPP_CONSTEXPR bool is_same_v
-    = is_same<_Tp, _Up>::value;
-
-template <class _Tp, class _Up> _LIBCPP_CONSTEXPR bool is_base_of_v
-    = is_base_of<_Tp, _Up>::value;
-
-template <class _Tp, class _Up> _LIBCPP_CONSTEXPR bool is_convertible_v
-    = is_convertible<_Tp, _Up>::value;
-
-#endif /* __has_feature(cxx_variable_templates) */
-
-// 3.3.2, Other type transformations
-/*
-template <class>
-class _LIBCPP_TYPE_VIS_ONLY raw_invocation_type;
-
-template <class _Fn, class ..._Args>
-class _LIBCPP_TYPE_VIS_ONLY raw_invocation_type<_Fn(_Args...)>;
-
-template <class>
-class _LIBCPP_TYPE_VIS_ONLY invokation_type;
-
-template <class _Fn, class ..._Args>
-class _LIBCPP_TYPE_VIS_ONLY invokation_type<_Fn(_Args...)>;
-
-template <class _Tp>
-using invokation_type_t = typename invokation_type<_Tp>::type;
-
-template <class _Tp>
-using raw_invocation_type_t = typename raw_invocation_type<_Tp>::type;
-*/
-
-_LIBCPP_END_NAMESPACE_LFTS
-
-#endif /* _LIBCPP_STD_VER > 11 */
-
-#endif /* _LIBCPP_EXPERIMENTAL_TYPE_TRAITS */
diff --git a/include.new/c++/v1/experimental/utility b/include.new/c++/v1/experimental/utility
deleted file mode 100644
index 84e461a..0000000
--- a/include.new/c++/v1/experimental/utility
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- utility ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_EXPERIMENTAL_UTILITY
-#define _LIBCPP_EXPERIMENTAL_UTILITY
-
-/*
-    experimental/utility synopsis
-
-// C++1y
-
-#include <utility>
-
-namespace std {
-namespace experimental {
-inline namespace fundamentals_v1 {
-
-  3.1.2, erased-type placeholder
-  struct erased_type { };
-
-} // namespace fundamentals_v1
-} // namespace experimental
-} // namespace std
-
- */
-
-# include <experimental/__config>
-
-# include <utility>
-
-_LIBCPP_BEGIN_NAMESPACE_LFTS
-
-  struct _LIBCPP_TYPE_VIS_ONLY erased_type { };
-
-_LIBCPP_END_NAMESPACE_LFTS
-
-#endif /* _LIBCPP_EXPERIMENTAL_UTILITY */
diff --git a/include.new/c++/v1/ext/__hash b/include.new/c++/v1/ext/__hash
deleted file mode 100644
index 5675d54..0000000
--- a/include.new/c++/v1/ext/__hash
+++ /dev/null
@@ -1,135 +0,0 @@
-// -*- C++ -*-
-//===------------------------- hash_set ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_EXT_HASH
-#define _LIBCPP_EXT_HASH
-
-#pragma GCC system_header
-
-#include <string>
-#include <cstring>
-
-namespace __gnu_cxx {
-using namespace std;
-
-template <typename _Tp> struct _LIBCPP_TYPE_VIS_ONLY hash { };
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<const char*>
-    : public unary_function<const char*, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const char *__c) const _NOEXCEPT
-    {
-        return __do_string_hash(__c, __c + strlen(__c));
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<char *>
-    : public unary_function<char*, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(char *__c) const _NOEXCEPT
-    {
-        return __do_string_hash<const char *>(__c, __c + strlen(__c));
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<char>
-    : public unary_function<char, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(char __c) const _NOEXCEPT
-    {
-        return __c;
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<signed char>
-    : public unary_function<signed char, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(signed char __c) const _NOEXCEPT
-    {
-        return __c;
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned char>
-    : public unary_function<unsigned char, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned char __c) const _NOEXCEPT
-    {
-        return __c;
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<short>
-    : public unary_function<short, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(short __c) const _NOEXCEPT
-    {
-        return __c;
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned short>
-    : public unary_function<unsigned short, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned short __c) const _NOEXCEPT
-    {
-        return __c;
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<int>
-    : public unary_function<int, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(int __c) const _NOEXCEPT
-    {
-        return __c;
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned int>
-    : public unary_function<unsigned int, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned int __c) const _NOEXCEPT
-    {
-        return __c;
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<long>
-    : public unary_function<long, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(long __c) const _NOEXCEPT
-    {
-        return __c;
-    }
-};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned long>
-    : public unary_function<unsigned long, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned long __c) const _NOEXCEPT
-    {
-        return __c;
-    }
-};
-}
-
-#endif  // _LIBCPP_EXT_HASH
diff --git a/include.new/c++/v1/ext/hash_map b/include.new/c++/v1/ext/hash_map
deleted file mode 100644
index 36cd595..0000000
--- a/include.new/c++/v1/ext/hash_map
+++ /dev/null
@@ -1,1007 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- hash_map ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_HASH_MAP
-#define _LIBCPP_HASH_MAP
-
-/*
-
-    hash_map synopsis
-
-namespace __gnu_cxx
-{
-
-template <class Key, class T, class Hash = hash<Key>, class Pred = equal_to<Key>,
-          class Alloc = allocator<pair<const Key, T>>>
-class hash_map
-{
-public:
-    // types
-    typedef Key                                                        key_type;
-    typedef T                                                          mapped_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef pair<const key_type, mapped_type>                          value_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-
-    explicit hash_map(size_type n = 193, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        hash_map(InputIterator f, InputIterator l,
-                      size_type n = 193, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    hash_map(const hash_map&);
-    ~hash_map();
-    hash_map& operator=(const hash_map&);
-
-    allocator_type get_allocator() const;
-
-    bool      empty() const;
-    size_type size() const;
-    size_type max_size() const;
-
-    iterator       begin();
-    iterator       end();
-    const_iterator begin()  const;
-    const_iterator end()    const;
-
-    pair<iterator, bool> insert(const value_type& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-
-    void erase(const_iterator position);
-    size_type erase(const key_type& k);
-    void erase(const_iterator first, const_iterator last);
-    void clear();
-
-    void swap(hash_map&);
-
-    hasher hash_funct() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    mapped_type& operator[](const key_type& k);
-
-    size_type bucket_count() const;
-    size_type max_bucket_count() const;
-
-    size_type elems_in_bucket(size_type n) const;
-
-    void resize(size_type n);
-};
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    void swap(hash_map<Key, T, Hash, Pred, Alloc>& x,
-              hash_map<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const hash_map<Key, T, Hash, Pred, Alloc>& x,
-               const hash_map<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const hash_map<Key, T, Hash, Pred, Alloc>& x,
-               const hash_map<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash = hash<Key>, class Pred = equal_to<Key>,
-          class Alloc = allocator<pair<const Key, T>>>
-class hash_multimap
-{
-public:
-    // types
-    typedef Key                                                        key_type;
-    typedef T                                                          mapped_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef pair<const key_type, mapped_type>                          value_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-
-    explicit hash_multimap(size_type n = 193, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        hash_multimap(InputIterator f, InputIterator l,
-                      size_type n = 193, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    explicit hash_multimap(const allocator_type&);
-    hash_multimap(const hash_multimap&);
-    ~hash_multimap();
-    hash_multimap& operator=(const hash_multimap&);
-
-    allocator_type get_allocator() const;
-
-    bool      empty() const;
-    size_type size() const;
-    size_type max_size() const;
-
-    iterator       begin();
-    iterator       end();
-    const_iterator begin()  const;
-    const_iterator end()    const;
-
-    iterator insert(const value_type& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-
-    void erase(const_iterator position);
-    size_type erase(const key_type& k);
-    void erase(const_iterator first, const_iterator last);
-    void clear();
-
-    void swap(hash_multimap&);
-
-    hasher hash_funct() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    size_type bucket_count() const;
-    size_type max_bucket_count() const;
-
-    size_type elems_in_bucket(size_type n) const;
-
-    void resize(size_type n);
-};
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    void swap(hash_multimap<Key, T, Hash, Pred, Alloc>& x,
-              hash_multimap<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const hash_multimap<Key, T, Hash, Pred, Alloc>& x,
-               const hash_multimap<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const hash_multimap<Key, T, Hash, Pred, Alloc>& x,
-               const hash_multimap<Key, T, Hash, Pred, Alloc>& y);
-
-}  // __gnu_cxx
-
-*/
-
-#include <__config>
-#include <__hash_table>
-#include <functional>
-#include <stdexcept>
-#include <ext/__hash>
-
-#if __DEPRECATED
-#if defined(_MSC_VER) && ! defined(__clang__)
-    _LIBCPP_WARNING("Use of the header <ext/hash_map> is deprecated.  Migrate to <unordered_map>")
-#else
-#   warning Use of the header <ext/hash_map> is deprecated.  Migrate to <unordered_map>
-#endif
-#endif
-
-#pragma GCC system_header
-
-namespace __gnu_cxx {
-
-using namespace std;
-
-template <class _Tp, class _Hash, bool = is_empty<_Hash>::value
-#if __has_feature(is_final)
-                                         && !__is_final(_Hash)
-#endif
-        >
-class __hash_map_hasher
-    : private _Hash
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY __hash_map_hasher() : _Hash() {}
-    _LIBCPP_INLINE_VISIBILITY __hash_map_hasher(const _Hash& __h) : _Hash(__h) {}
-    _LIBCPP_INLINE_VISIBILITY const _Hash& hash_function() const {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Tp& __x) const
-        {return static_cast<const _Hash&>(*this)(__x.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const typename _Tp::first_type& __x) const
-        {return static_cast<const _Hash&>(*this)(__x);}
-};
-
-template <class _Tp, class _Hash>
-class __hash_map_hasher<_Tp, _Hash, false>
-{
-    _Hash __hash_;
-public:
-    _LIBCPP_INLINE_VISIBILITY __hash_map_hasher() : __hash_() {}
-    _LIBCPP_INLINE_VISIBILITY __hash_map_hasher(const _Hash& __h) : __hash_(__h) {}
-    _LIBCPP_INLINE_VISIBILITY const _Hash& hash_function() const {return __hash_;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Tp& __x) const
-        {return __hash_(__x.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const typename _Tp::first_type& __x) const
-        {return __hash_(__x);}
-};
-
-template <class _Tp, class _Pred, bool = is_empty<_Pred>::value
-#if __has_feature(is_final)
-                                         && !__is_final(_Pred)
-#endif
-         >
-class __hash_map_equal
-    : private _Pred
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY __hash_map_equal() : _Pred() {}
-    _LIBCPP_INLINE_VISIBILITY __hash_map_equal(const _Pred& __p) : _Pred(__p) {}
-    _LIBCPP_INLINE_VISIBILITY const _Pred& key_eq() const {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return static_cast<const _Pred&>(*this)(__x.first, __y.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const typename _Tp::first_type& __x, const _Tp& __y) const
-        {return static_cast<const _Pred&>(*this)(__x, __y.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const typename _Tp::first_type& __y) const
-        {return static_cast<const _Pred&>(*this)(__x.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const typename _Tp::first_type& __x,
-                    const typename _Tp::first_type& __y) const
-        {return static_cast<const _Pred&>(*this)(__x, __y);}
-};
-
-template <class _Tp, class _Pred>
-class __hash_map_equal<_Tp, _Pred, false>
-{
-    _Pred __pred_;
-public:
-    _LIBCPP_INLINE_VISIBILITY __hash_map_equal() : __pred_() {}
-    _LIBCPP_INLINE_VISIBILITY __hash_map_equal(const _Pred& __p) : __pred_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY const _Pred& key_eq() const {return __pred_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __pred_(__x.first, __y.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const typename _Tp::first_type& __x, const _Tp& __y) const
-        {return __pred_(__x, __y.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const typename _Tp::first_type& __y) const
-        {return __pred_(__x.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const typename _Tp::first_type& __x,
-                    const typename _Tp::first_type& __y) const
-        {return __pred_(__x, __y);}
-};
-
-template <class _Alloc>
-class __hash_map_node_destructor
-{
-    typedef _Alloc                              allocator_type;
-    typedef allocator_traits<allocator_type>    __alloc_traits;
-    typedef typename __alloc_traits::value_type::value_type value_type;
-public:
-    typedef typename __alloc_traits::pointer    pointer;
-private:
-    typedef typename value_type::first_type     first_type;
-    typedef typename value_type::second_type    second_type;
-
-    allocator_type& __na_;
-
-    __hash_map_node_destructor& operator=(const __hash_map_node_destructor&);
-
-public:
-    bool __first_constructed;
-    bool __second_constructed;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __hash_map_node_destructor(allocator_type& __na)
-        : __na_(__na),
-          __first_constructed(false),
-          __second_constructed(false)
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_node_destructor(__hash_node_destructor<allocator_type>&& __x)
-        : __na_(__x.__na_),
-          __first_constructed(__x.__value_constructed),
-          __second_constructed(__x.__value_constructed)
-        {
-            __x.__value_constructed = false;
-        }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_node_destructor(const __hash_node_destructor<allocator_type>& __x)
-        : __na_(__x.__na_),
-          __first_constructed(__x.__value_constructed),
-          __second_constructed(__x.__value_constructed)
-        {
-            const_cast<bool&>(__x.__value_constructed) = false;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p)
-    {
-        if (__second_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.second));
-        if (__first_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.first));
-        if (__p)
-            __alloc_traits::deallocate(__na_, __p, 1);
-    }
-};
-
-template <class _HashIterator>
-class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator
-{
-    _HashIterator __i_;
-
-    typedef pointer_traits<typename _HashIterator::pointer>      __pointer_traits;
-    typedef const typename _HashIterator::value_type::first_type key_type;
-    typedef typename _HashIterator::value_type::second_type      mapped_type;
-public:
-    typedef forward_iterator_tag                                 iterator_category;
-    typedef pair<key_type, mapped_type>                          value_type;
-    typedef typename _HashIterator::difference_type              difference_type;
-    typedef value_type&                                          reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_map_iterator() {}
-
-    _LIBCPP_INLINE_VISIBILITY __hash_map_iterator(_HashIterator __i) : __i_(__i) {}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {return *operator->();}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const {return (pointer)__i_.operator->();}
-
-    _LIBCPP_INLINE_VISIBILITY __hash_map_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_iterator operator++(int)
-    {
-        __hash_map_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY 
-    bool operator==(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend _LIBCPP_INLINE_VISIBILITY 
-    bool operator!=(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY hash_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY hash_multimap;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator;
-};
-
-template <class _HashIterator>
-class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator
-{
-    _HashIterator __i_;
-
-    typedef pointer_traits<typename _HashIterator::pointer>      __pointer_traits;
-    typedef const typename _HashIterator::value_type::first_type key_type;
-    typedef typename _HashIterator::value_type::second_type      mapped_type;
-public:
-    typedef forward_iterator_tag                                 iterator_category;
-    typedef pair<key_type, mapped_type>                          value_type;
-    typedef typename _HashIterator::difference_type              difference_type;
-    typedef const value_type&                                    reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_map_const_iterator() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator(_HashIterator __i) : __i_(__i) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator(
-            __hash_map_iterator<typename _HashIterator::__non_const_iterator> __i)
-                : __i_(__i.__i_) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return *operator->();}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return (pointer)__i_.operator->();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator operator++(int)
-    {
-        __hash_map_const_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __hash_map_const_iterator& __x, const __hash_map_const_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __hash_map_const_iterator& __x, const __hash_map_const_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY hash_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY hash_multimap;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-};
-
-template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
-          class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY hash_map
-{
-public:
-    // types
-    typedef _Key                                           key_type;
-    typedef _Tp                                            mapped_type;
-    typedef _Tp                                            data_type;
-    typedef _Hash                                          hasher;
-    typedef _Pred                                          key_equal;
-    typedef _Alloc                                         allocator_type;
-    typedef pair<const key_type, mapped_type>              value_type;
-    typedef value_type&                                    reference;
-    typedef const value_type&                              const_reference;
-
-private:
-    typedef pair<key_type, mapped_type>                    __value_type;
-    typedef __hash_map_hasher<__value_type, hasher>   __hasher;
-    typedef __hash_map_equal<__value_type, key_equal> __key_equal;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                           __allocator_type;
-
-    typedef __hash_table<__value_type, __hasher,
-                         __key_equal,  __allocator_type>   __table;
-
-    __table __table_;
-
-    typedef typename __table::__node_pointer               __node_pointer;
-    typedef typename __table::__node_const_pointer         __node_const_pointer;
-    typedef typename __table::__node_traits                __node_traits;
-    typedef typename __table::__node_allocator             __node_allocator;
-    typedef typename __table::__node                       __node;
-    typedef __hash_map_node_destructor<__node_allocator>   _Dp;
-    typedef unique_ptr<__node, _Dp>                         __node_holder;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
-public:
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-
-    typedef __hash_map_iterator<typename __table::iterator>       iterator;
-    typedef __hash_map_const_iterator<typename __table::const_iterator> const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY hash_map() {__table_.rehash(193);}
-    explicit hash_map(size_type __n, const hasher& __hf = hasher(),
-                           const key_equal& __eql = key_equal());
-    hash_map(size_type __n, const hasher& __hf,
-                  const key_equal& __eql,
-                  const allocator_type& __a);
-    template <class _InputIterator>
-        hash_map(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        hash_map(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        hash_map(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf,
-                      const key_equal& __eql,
-                      const allocator_type& __a);
-    hash_map(const hash_map& __u);
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin()        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end()          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const {return __table_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool> insert(const value_type& __x)
-        {return __table_.__insert_unique(__x);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator, const value_type& __x) {return insert(__x).first;}
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void erase(const_iterator __p) {__table_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    void erase(const_iterator __first, const_iterator __last)
-        {__table_.erase(__first.__i_, __last.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(hash_map& __u) {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_funct() const
-        {return __table_.hash_function().hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const
-        {return __table_.key_eq().key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_unique(__k);}
-
-    mapped_type& operator[](const key_type& __k);
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type elems_in_bucket(size_type __n) const
-        {return __table_.bucket_size(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void resize(size_type __n) {__table_.rehash(__n);}
-
-private:
-    __node_holder __construct_node(const key_type& __k);
-};
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_map(
-        size_type __n, const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_map(
-        size_type __n, const hasher& __hf, const key_equal& __eql,
-        const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_map(
-        _InputIterator __first, _InputIterator __last)
-{
-    __table_.rehash(193);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_map(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_map(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_map(
-        const hash_map& __u)
-    : __table_(__u.__table_)
-{
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-typename hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(const key_type& __k)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.first), __k);
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.second));
-    __h.get_deleter().__second_constructed = true;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                       _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_unique(*__first);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-_Tp&
-hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator[](const key_type& __k)
-{
-    iterator __i = find(__k);
-    if (__i != end())
-        return __i->second;
-    __node_holder __h = __construct_node(__k);
-    pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
-    __h.release();
-    return __r.first->second;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-     hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(), __ey = __y.end();
-            __i != __ex; ++__i)
-    {
-        const_iterator __j = __y.find(__i->first);
-        if (__j == __ey || !(*__i == *__j))
-            return false;
-    }
-    return true;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const hash_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
-          class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY hash_multimap
-{
-public:
-    // types
-    typedef _Key                                           key_type;
-    typedef _Tp                                            mapped_type;
-    typedef _Tp                                            data_type;
-    typedef _Hash                                          hasher;
-    typedef _Pred                                          key_equal;
-    typedef _Alloc                                         allocator_type;
-    typedef pair<const key_type, mapped_type>              value_type;
-    typedef value_type&                                    reference;
-    typedef const value_type&                              const_reference;
-
-private:
-    typedef pair<key_type, mapped_type>                    __value_type;
-    typedef __hash_map_hasher<__value_type, hasher>   __hasher;
-    typedef __hash_map_equal<__value_type, key_equal> __key_equal;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                           __allocator_type;
-
-    typedef __hash_table<__value_type, __hasher,
-                         __key_equal,  __allocator_type>   __table;
-
-    __table __table_;
-
-    typedef typename __table::__node_traits                __node_traits;
-    typedef typename __table::__node_allocator             __node_allocator;
-    typedef typename __table::__node                       __node;
-    typedef __hash_map_node_destructor<__node_allocator>   _Dp;
-    typedef unique_ptr<__node, _Dp>                         __node_holder;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
-public:
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-
-    typedef __hash_map_iterator<typename __table::iterator>       iterator;
-    typedef __hash_map_const_iterator<typename __table::const_iterator> const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    hash_multimap() {__table_.rehash(193);}
-    explicit hash_multimap(size_type __n, const hasher& __hf = hasher(),
-                                const key_equal& __eql = key_equal());
-    hash_multimap(size_type __n, const hasher& __hf,
-                                const key_equal& __eql,
-                                const allocator_type& __a);
-    template <class _InputIterator>
-        hash_multimap(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        hash_multimap(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        hash_multimap(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf,
-                      const key_equal& __eql,
-                      const allocator_type& __a);
-    hash_multimap(const hash_multimap& __u);
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin()        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end()          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const {return __table_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __x) {return __table_.__insert_multi(__x);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator, const value_type& __x) {return insert(__x);}
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void erase(const_iterator __p) {__table_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    void erase(const_iterator __first, const_iterator __last)
-        {__table_.erase(__first.__i_, __last.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(hash_multimap& __u) {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_funct() const
-        {return __table_.hash_function().hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const
-        {return __table_.key_eq().key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_multi(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type elems_in_bucket(size_type __n) const
-        {return __table_.bucket_size(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void resize(size_type __n) {__table_.rehash(__n);}
-};
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_multimap(
-        size_type __n, const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_multimap(
-        size_type __n, const hasher& __hf, const key_equal& __eql,
-        const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_multimap(
-        _InputIterator __first, _InputIterator __last)
-{
-    __table_.rehash(193);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_multimap(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_multimap(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::hash_multimap(
-        const hash_multimap& __u)
-    : __table_(__u.__table_)
-{
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                            _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_multi(*__first);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-     hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    typedef pair<const_iterator, const_iterator> _EqRng;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(); __i != __ex;)
-    {
-        _EqRng __xeq = __x.equal_range(__i->first);
-        _EqRng __yeq = __y.equal_range(__i->first);
-        if (_VSTD::distance(__xeq.first, __xeq.second) !=
-            _VSTD::distance(__yeq.first, __yeq.second) ||
-                  !_VSTD::is_permutation(__xeq.first, __xeq.second, __yeq.first))
-            return false;
-        __i = __xeq.second;
-    }
-    return true;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const hash_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-} // __gnu_cxx
-
-#endif  // _LIBCPP_HASH_MAP
diff --git a/include.new/c++/v1/ext/hash_set b/include.new/c++/v1/ext/hash_set
deleted file mode 100644
index c4bb898..0000000
--- a/include.new/c++/v1/ext/hash_set
+++ /dev/null
@@ -1,661 +0,0 @@
-// -*- C++ -*-
-//===------------------------- hash_set ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_HASH_SET
-#define _LIBCPP_HASH_SET
-
-/*
-
-    hash_set synopsis
-
-namespace __gnu_cxx
-{
-
-template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
-          class Alloc = allocator<Value>>
-class hash_set
-{
-public:
-    // types
-    typedef Value                                                      key_type;
-    typedef key_type                                                   value_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-
-    explicit hash_set(size_type n = 193, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        hash_set(InputIterator f, InputIterator l,
-                      size_type n = 193, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    hash_set(const hash_set&);
-    ~hash_set();
-    hash_set& operator=(const hash_set&);
-
-    allocator_type get_allocator() const;
-
-    bool      empty() const;
-    size_type size() const;
-    size_type max_size() const;
-
-    iterator       begin();
-    iterator       end();
-    const_iterator begin()  const;
-    const_iterator end()    const;
-
-    pair<iterator, bool> insert(const value_type& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-
-    void erase(const_iterator position);
-    size_type erase(const key_type& k);
-    void erase(const_iterator first, const_iterator last);
-    void clear();
-
-    void swap(hash_set&);
-
-    hasher hash_funct() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    size_type bucket_count() const;
-    size_type max_bucket_count() const;
-
-    size_type elems_in_bucket(size_type n) const;
-
-    void resize(size_type n);
-};
-
-template <class Value, class Hash, class Pred, class Alloc>
-    void swap(hash_set<Value, Hash, Pred, Alloc>& x,
-              hash_set<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const hash_set<Value, Hash, Pred, Alloc>& x,
-               const hash_set<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const hash_set<Value, Hash, Pred, Alloc>& x,
-               const hash_set<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
-          class Alloc = allocator<Value>>
-class hash_multiset
-{
-public:
-    // types
-    typedef Value                                                      key_type;
-    typedef key_type                                                   value_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-
-    explicit hash_multiset(size_type n = 193, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        hash_multiset(InputIterator f, InputIterator l,
-                      size_type n = 193, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    hash_multiset(const hash_multiset&);
-    ~hash_multiset();
-    hash_multiset& operator=(const hash_multiset&);
-
-    allocator_type get_allocator() const;
-
-    bool      empty() const;
-    size_type size() const;
-    size_type max_size() const;
-
-    iterator       begin();
-    iterator       end();
-    const_iterator begin()  const;
-    const_iterator end()    const;
-
-    iterator insert(const value_type& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-
-    void erase(const_iterator position);
-    size_type erase(const key_type& k);
-    void erase(const_iterator first, const_iterator last);
-    void clear();
-
-    void swap(hash_multiset&);
-
-    hasher hash_funct() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    size_type bucket_count() const;
-    size_type max_bucket_count() const;
-
-    size_type elems_in_bucket(size_type n) const;
-
-    void resize(size_type n);
-};
-
-template <class Value, class Hash, class Pred, class Alloc>
-    void swap(hash_multiset<Value, Hash, Pred, Alloc>& x,
-              hash_multiset<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const hash_multiset<Value, Hash, Pred, Alloc>& x,
-               const hash_multiset<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const hash_multiset<Value, Hash, Pred, Alloc>& x,
-               const hash_multiset<Value, Hash, Pred, Alloc>& y);
-}  // __gnu_cxx
-
-*/
-
-#include <__config>
-#include <__hash_table>
-#include <functional>
-#include <ext/__hash>
-
-#if __DEPRECATED
-#if defined(_MSC_VER) && ! defined(__clang__)
-    _LIBCPP_WARNING("Use of the header <ext/hash_set> is deprecated.  Migrate to <unordered_set>")
-#else
-#   warning Use of the header <ext/hash_set> is deprecated.  Migrate to <unordered_set>
-#endif
-#endif
-
-namespace __gnu_cxx {
-
-using namespace std;
-
-template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
-          class _Alloc = allocator<_Value> >
-class _LIBCPP_TYPE_VIS_ONLY hash_set
-{
-public:
-    // types
-    typedef _Value                                                     key_type;
-    typedef key_type                                                   value_type;
-    typedef _Hash                                                      hasher;
-    typedef _Pred                                                      key_equal;
-    typedef _Alloc                                                     allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-
-private:
-    typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;
-
-    __table __table_;
-
-public:
-    typedef typename __table::pointer         pointer;
-    typedef typename __table::const_pointer   const_pointer;
-    typedef typename __table::size_type       size_type;
-    typedef typename __table::difference_type difference_type;
-
-    typedef typename __table::const_iterator       iterator;
-    typedef typename __table::const_iterator       const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    hash_set() {__table_.rehash(193);}
-    explicit hash_set(size_type __n, const hasher& __hf = hasher(),
-                           const key_equal& __eql = key_equal());
-    hash_set(size_type __n, const hasher& __hf, const key_equal& __eql,
-                  const allocator_type& __a);
-    template <class _InputIterator>
-        hash_set(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        hash_set(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        hash_set(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf, const key_equal& __eql,
-                      const allocator_type& __a);
-    hash_set(const hash_set& __u);
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin()        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end()          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const {return __table_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool> insert(const value_type& __x)
-        {return __table_.__insert_unique(__x);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator, const value_type& __x) {return insert(__x).first;}
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void erase(const_iterator __p) {__table_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    void erase(const_iterator __first, const_iterator __last)
-        {__table_.erase(__first, __last);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(hash_set& __u) {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_funct() const {return __table_.hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const {return __table_.key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_unique(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type elems_in_bucket(size_type __n) const {return __table_.bucket_size(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void resize(size_type __n) {__table_.rehash(__n);}
-};
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-hash_set<_Value, _Hash, _Pred, _Alloc>::hash_set(size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-hash_set<_Value, _Hash, _Pred, _Alloc>::hash_set(size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_set<_Value, _Hash, _Pred, _Alloc>::hash_set(
-        _InputIterator __first, _InputIterator __last)
-{
-    __table_.rehash(193);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_set<_Value, _Hash, _Pred, _Alloc>::hash_set(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_set<_Value, _Hash, _Pred, _Alloc>::hash_set(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-hash_set<_Value, _Hash, _Pred, _Alloc>::hash_set(
-        const hash_set& __u)
-    : __table_(__u.__table_)
-{
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-hash_set<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                    _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_unique(*__first);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(hash_set<_Value, _Hash, _Pred, _Alloc>& __x,
-     hash_set<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const hash_set<_Value, _Hash, _Pred, _Alloc>& __x,
-           const hash_set<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename hash_set<_Value, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(), __ey = __y.end();
-            __i != __ex; ++__i)
-    {
-        const_iterator __j = __y.find(*__i);
-        if (__j == __ey || !(*__i == *__j))
-            return false;
-    }
-    return true;
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const hash_set<_Value, _Hash, _Pred, _Alloc>& __x,
-           const hash_set<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
-          class _Alloc = allocator<_Value> >
-class _LIBCPP_TYPE_VIS_ONLY hash_multiset
-{
-public:
-    // types
-    typedef _Value                                                     key_type;
-    typedef key_type                                                   value_type;
-    typedef _Hash                                                      hasher;
-    typedef _Pred                                                      key_equal;
-    typedef _Alloc                                                     allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-
-private:
-    typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;
-
-    __table __table_;
-
-public:
-    typedef typename __table::pointer         pointer;
-    typedef typename __table::const_pointer   const_pointer;
-    typedef typename __table::size_type       size_type;
-    typedef typename __table::difference_type difference_type;
-
-    typedef typename __table::const_iterator       iterator;
-    typedef typename __table::const_iterator       const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    hash_multiset() {__table_.rehash(193);}
-    explicit hash_multiset(size_type __n, const hasher& __hf = hasher(),
-                                const key_equal& __eql = key_equal());
-    hash_multiset(size_type __n, const hasher& __hf,
-                       const key_equal& __eql, const allocator_type& __a);
-    template <class _InputIterator>
-        hash_multiset(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        hash_multiset(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        hash_multiset(_InputIterator __first, _InputIterator __last,
-                      size_type __n , const hasher& __hf,
-                      const key_equal& __eql, const allocator_type& __a);
-    hash_multiset(const hash_multiset& __u);
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin()        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end()          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const {return __table_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __x) {return __table_.__insert_multi(__x);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator, const value_type& __x) {return insert(__x);}
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void erase(const_iterator __p) {__table_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    void erase(const_iterator __first, const_iterator __last)
-        {__table_.erase(__first, __last);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(hash_multiset& __u) {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_funct() const {return __table_.hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const {return __table_.key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_multi(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type elems_in_bucket(size_type __n) const {return __table_.bucket_size(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void resize(size_type __n) {__table_.rehash(__n);}
-};
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-hash_multiset<_Value, _Hash, _Pred, _Alloc>::hash_multiset(
-        size_type __n, const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-hash_multiset<_Value, _Hash, _Pred, _Alloc>::hash_multiset(
-        size_type __n, const hasher& __hf, const key_equal& __eql,
-        const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_multiset<_Value, _Hash, _Pred, _Alloc>::hash_multiset(
-        _InputIterator __first, _InputIterator __last)
-{
-    __table_.rehash(193);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_multiset<_Value, _Hash, _Pred, _Alloc>::hash_multiset(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-hash_multiset<_Value, _Hash, _Pred, _Alloc>::hash_multiset(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-hash_multiset<_Value, _Hash, _Pred, _Alloc>::hash_multiset(
-        const hash_multiset& __u)
-    : __table_(__u.__table_)
-{
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-hash_multiset<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                         _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_multi(*__first);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-     hash_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-           const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename hash_multiset<_Value, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    typedef pair<const_iterator, const_iterator> _EqRng;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(); __i != __ex;)
-    {
-        _EqRng __xeq = __x.equal_range(*__i);
-        _EqRng __yeq = __y.equal_range(*__i);
-        if (_VSTD::distance(__xeq.first, __xeq.second) !=
-            _VSTD::distance(__yeq.first, __yeq.second) ||
-                  !_VSTD::is_permutation(__xeq.first, __xeq.second, __yeq.first))
-            return false;
-        __i = __xeq.second;
-    }
-    return true;
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-           const hash_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-} // __gnu_cxx
-
-#endif  // _LIBCPP_HASH_SET
diff --git a/include.new/c++/v1/forward_list b/include.new/c++/v1/forward_list
deleted file mode 100644
index 651452f..0000000
--- a/include.new/c++/v1/forward_list
+++ /dev/null
@@ -1,1669 +0,0 @@
-// -*- C++ -*-
-//===----------------------- forward_list ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FORWARD_LIST
-#define _LIBCPP_FORWARD_LIST
-
-/*
-    forward_list synopsis
-
-namespace std
-{
-
-template <class T, class Allocator = allocator<T>>
-class forward_list
-{
-public:
-    typedef T         value_type;
-    typedef Allocator allocator_type;
-
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef <details> iterator;
-    typedef <details> const_iterator;
-
-    forward_list()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit forward_list(const allocator_type& a);
-    explicit forward_list(size_type n);
-    explicit forward_list(size_type n, const allocator_type& a); // C++14
-    forward_list(size_type n, const value_type& v);
-    forward_list(size_type n, const value_type& v, const allocator_type& a);
-    template <class InputIterator>
-        forward_list(InputIterator first, InputIterator last);
-    template <class InputIterator>
-        forward_list(InputIterator first, InputIterator last, const allocator_type& a);
-    forward_list(const forward_list& x);
-    forward_list(const forward_list& x, const allocator_type& a);
-    forward_list(forward_list&& x)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    forward_list(forward_list&& x, const allocator_type& a);
-    forward_list(initializer_list<value_type> il);
-    forward_list(initializer_list<value_type> il, const allocator_type& a);
-
-    ~forward_list();
-
-    forward_list& operator=(const forward_list& x);
-    forward_list& operator=(forward_list&& x)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    forward_list& operator=(initializer_list<value_type> il);
-
-    template <class InputIterator>
-        void assign(InputIterator first, InputIterator last);
-    void assign(size_type n, const value_type& v);
-    void assign(initializer_list<value_type> il);
-
-    allocator_type get_allocator() const noexcept;
-
-    iterator       begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator       end() noexcept;
-    const_iterator end() const noexcept;
-
-    const_iterator cbegin() const noexcept;
-    const_iterator cend() const noexcept;
-
-    iterator       before_begin() noexcept;
-    const_iterator before_begin() const noexcept;
-    const_iterator cbefore_begin() const noexcept;
-
-    bool empty() const noexcept;
-    size_type max_size() const noexcept;
-
-    reference       front();
-    const_reference front() const;
-
-    template <class... Args> void emplace_front(Args&&... args);
-    void push_front(const value_type& v);
-    void push_front(value_type&& v);
-
-    void pop_front();
-
-    template <class... Args>
-        iterator emplace_after(const_iterator p, Args&&... args);
-    iterator insert_after(const_iterator p, const value_type& v);
-    iterator insert_after(const_iterator p, value_type&& v);
-    iterator insert_after(const_iterator p, size_type n, const value_type& v);
-    template <class InputIterator>
-        iterator insert_after(const_iterator p,
-                              InputIterator first, InputIterator last);
-    iterator insert_after(const_iterator p, initializer_list<value_type> il);
-
-    iterator erase_after(const_iterator p);
-    iterator erase_after(const_iterator first, const_iterator last);
-
-    void swap(forward_list& x)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-
-    void resize(size_type n);
-    void resize(size_type n, const value_type& v);
-    void clear() noexcept;
-
-    void splice_after(const_iterator p, forward_list& x);
-    void splice_after(const_iterator p, forward_list&& x);
-    void splice_after(const_iterator p, forward_list& x, const_iterator i);
-    void splice_after(const_iterator p, forward_list&& x, const_iterator i);
-    void splice_after(const_iterator p, forward_list& x,
-                      const_iterator first, const_iterator last);
-    void splice_after(const_iterator p, forward_list&& x,
-                      const_iterator first, const_iterator last);
-    void remove(const value_type& v);
-    template <class Predicate> void remove_if(Predicate pred);
-    void unique();
-    template <class BinaryPredicate> void unique(BinaryPredicate binary_pred);
-    void merge(forward_list& x);
-    void merge(forward_list&& x);
-    template <class Compare> void merge(forward_list& x, Compare comp);
-    template <class Compare> void merge(forward_list&& x, Compare comp);
-    void sort();
-    template <class Compare> void sort(Compare comp);
-    void reverse() noexcept;
-};
-
-template <class T, class Allocator>
-    bool operator==(const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator< (const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator!=(const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator> (const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator>=(const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator<=(const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    void swap(forward_list<T, Allocator>& x, forward_list<T, Allocator>& y)
-         noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-
-#include <initializer_list>
-#include <memory>
-#include <limits>
-#include <iterator>
-#include <algorithm>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _VoidPtr> struct __forward_list_node;
-
-template <class _NodePtr>
-struct __forward_begin_node
-{
-    typedef _NodePtr pointer;
-
-    pointer __next_;
-
-     _LIBCPP_INLINE_VISIBILITY __forward_begin_node() : __next_(nullptr) {}
-};
-
-template <class _Tp, class _VoidPtr>
-struct _LIBCPP_HIDDEN __begin_node_of
-{
-    typedef __forward_begin_node
-        <
-             typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                 rebind<__forward_list_node<_Tp, _VoidPtr> >
-#else
-                 rebind<__forward_list_node<_Tp, _VoidPtr> >::other
-#endif
-         > type;
-};
-
-template <class _Tp, class _VoidPtr>
-struct __forward_list_node
-    : public __begin_node_of<_Tp, _VoidPtr>::type
-{
-    typedef _Tp value_type;
-
-    value_type __value_;
-};
-
-template<class _Tp, class _Alloc> class _LIBCPP_TYPE_VIS_ONLY forward_list;
-template<class _NodeConstPtr> class _LIBCPP_TYPE_VIS_ONLY __forward_list_const_iterator;
-
-template <class _NodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __forward_list_iterator
-{
-    typedef _NodePtr __node_pointer;
-
-    __node_pointer __ptr_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __forward_list_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
-
-    template<class, class> friend class _LIBCPP_TYPE_VIS_ONLY forward_list;
-    template<class> friend class _LIBCPP_TYPE_VIS_ONLY __forward_list_const_iterator;
-
-public:
-    typedef forward_iterator_tag                              iterator_category;
-    typedef typename pointer_traits<__node_pointer>::element_type::value_type
-                                                              value_type;
-    typedef value_type&                                       reference;
-    typedef typename pointer_traits<__node_pointer>::difference_type
-                                                              difference_type;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                                              pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_iterator() _NOEXCEPT : __ptr_(nullptr) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_iterator& operator++()
-    {
-        __ptr_ = __ptr_->__next_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_iterator operator++(int)
-    {
-        __forward_list_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __forward_list_iterator& __x,
-                    const __forward_list_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __forward_list_iterator& __x,
-                    const __forward_list_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _NodeConstPtr>
-class _LIBCPP_TYPE_VIS_ONLY __forward_list_const_iterator
-{
-    typedef _NodeConstPtr __node_const_pointer;
-
-    __node_const_pointer __ptr_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __forward_list_const_iterator(__node_const_pointer __p) _NOEXCEPT
-        : __ptr_(__p) {}
-
-    typedef typename remove_const
-        <
-            typename pointer_traits<__node_const_pointer>::element_type
-        >::type                                               __node;
-    typedef typename pointer_traits<__node_const_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__node>
-#else
-            rebind<__node>::other
-#endif
-                                                              __node_pointer;
-
-    template<class, class> friend class forward_list;
-
-public:
-    typedef forward_iterator_tag                              iterator_category;
-    typedef typename __node::value_type                       value_type;
-    typedef const value_type&                                 reference;
-    typedef typename pointer_traits<__node_const_pointer>::difference_type
-                                                              difference_type;
-    typedef typename pointer_traits<__node_const_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                              pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_const_iterator() _NOEXCEPT : __ptr_(nullptr) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_const_iterator(__forward_list_iterator<__node_pointer> __p) _NOEXCEPT
-        : __ptr_(__p.__ptr_) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_const_iterator& operator++()
-    {
-        __ptr_ = __ptr_->__next_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_const_iterator operator++(int)
-    {
-        __forward_list_const_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __forward_list_const_iterator& __x,
-                    const __forward_list_const_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __forward_list_const_iterator& __x,
-                           const __forward_list_const_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _Tp, class _Alloc>
-class __forward_list_base
-{
-protected:
-    typedef _Tp    value_type;
-    typedef _Alloc allocator_type;
-
-    typedef typename allocator_traits<allocator_type>::void_pointer  void_pointer;
-    typedef __forward_list_node<value_type, void_pointer>            __node;
-    typedef typename __begin_node_of<value_type, void_pointer>::type __begin_node;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__node>
-#else
-                rebind_alloc<__node>::other
-#endif
-                                                      __node_allocator;
-    typedef allocator_traits<__node_allocator>        __node_traits;
-    typedef typename __node_traits::pointer           __node_pointer;
-    typedef typename __node_traits::pointer           __node_const_pointer;
-
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__begin_node>
-#else
-                rebind_alloc<__begin_node>::other
-#endif
-                                                      __begin_node_allocator;
-    typedef typename allocator_traits<__begin_node_allocator>::pointer __begin_node_pointer;
-
-    __compressed_pair<__begin_node, __node_allocator> __before_begin_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __node_pointer        __before_begin() _NOEXCEPT
-        {return static_cast<__node_pointer>(pointer_traits<__begin_node_pointer>::
-                                        pointer_to(__before_begin_.first()));}
-    _LIBCPP_INLINE_VISIBILITY
-    __node_const_pointer  __before_begin() const _NOEXCEPT
-        {return static_cast<__node_const_pointer>(pointer_traits<__begin_node_pointer>::
-                                        pointer_to(const_cast<__begin_node&>(__before_begin_.first())));}
-
-    _LIBCPP_INLINE_VISIBILITY
-          __node_allocator& __alloc() _NOEXCEPT
-            {return __before_begin_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_allocator& __alloc() const _NOEXCEPT
-        {return __before_begin_.second();}
-
-    typedef __forward_list_iterator<__node_pointer>             iterator;
-    typedef __forward_list_const_iterator<__node_pointer>       const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_base()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value)
-        : __before_begin_(__begin_node()) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_base(const allocator_type& __a)
-        : __before_begin_(__begin_node(), __node_allocator(__a)) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-public:
-    __forward_list_base(__forward_list_base&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<__node_allocator>::value);
-    __forward_list_base(__forward_list_base&& __x, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-private:
-    __forward_list_base(const __forward_list_base&);
-    __forward_list_base& operator=(const __forward_list_base&);
-
-public:
-    ~__forward_list_base();
-
-protected:
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __forward_list_base& __x)
-        {__copy_assign_alloc(__x, integral_constant<bool,
-              __node_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__forward_list_base& __x)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_move_assignment::value ||
-                   is_nothrow_move_assignable<__node_allocator>::value)
-        {__move_assign_alloc(__x, integral_constant<bool,
-              __node_traits::propagate_on_container_move_assignment::value>());}
-
-public:
-    void swap(__forward_list_base& __x)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value);
-protected:
-    void clear() _NOEXCEPT;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __forward_list_base&, false_type) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __forward_list_base& __x, true_type)
-    {
-        if (__alloc() != __x.__alloc())
-            clear();
-        __alloc() = __x.__alloc();
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__forward_list_base& __x, false_type) _NOEXCEPT
-        {}
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__forward_list_base& __x, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value)
-        {__alloc() = _VSTD::move(__x.__alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                         __node_traits::propagate_on_container_swap::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y,
-                                                                     false_type)
-        _NOEXCEPT
-        {}
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y,
-                                                                      true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<__node_allocator>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__forward_list_base<_Tp, _Alloc>::__forward_list_base(__forward_list_base&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<__node_allocator>::value)
-    : __before_begin_(_VSTD::move(__x.__before_begin_))
-{
-    __x.__before_begin()->__next_ = nullptr;
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__forward_list_base<_Tp, _Alloc>::__forward_list_base(__forward_list_base&& __x,
-                                                      const allocator_type& __a)
-    : __before_begin_(__begin_node(), __node_allocator(__a))
-{
-    if (__alloc() == __x.__alloc())
-    {
-        __before_begin()->__next_ = __x.__before_begin()->__next_;
-        __x.__before_begin()->__next_ = nullptr;
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-__forward_list_base<_Tp, _Alloc>::~__forward_list_base()
-{
-    clear();
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__forward_list_base<_Tp, _Alloc>::swap(__forward_list_base& __x)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-{
-    __swap_alloc(__alloc(), __x.__alloc());
-    using _VSTD::swap;
-    swap(__before_begin()->__next_, __x.__before_begin()->__next_);
-}
-
-template <class _Tp, class _Alloc>
-void
-__forward_list_base<_Tp, _Alloc>::clear() _NOEXCEPT
-{
-    __node_allocator& __a = __alloc();
-    for (__node_pointer __p = __before_begin()->__next_; __p != nullptr;)
-    {
-        __node_pointer __next = __p->__next_;
-        __node_traits::destroy(__a, _VSTD::addressof(__p->__value_));
-        __node_traits::deallocate(__a, __p, 1);
-        __p = __next;
-    }
-    __before_begin()->__next_ = nullptr;
-}
-
-template <class _Tp, class _Alloc = allocator<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY forward_list
-    : private __forward_list_base<_Tp, _Alloc>
-{
-    typedef __forward_list_base<_Tp, _Alloc> base;
-    typedef typename base::__node_allocator  __node_allocator;
-    typedef typename base::__node            __node;
-    typedef typename base::__node_traits     __node_traits;
-    typedef typename base::__node_pointer    __node_pointer;
-
-public:
-    typedef _Tp    value_type;
-    typedef _Alloc allocator_type;
-
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef typename base::iterator       iterator;
-    typedef typename base::const_iterator const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    forward_list()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value)
-        {} // = default;
-    explicit forward_list(const allocator_type& __a);
-    explicit forward_list(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit forward_list(size_type __n, const allocator_type& __a);
-#endif
-    forward_list(size_type __n, const value_type& __v);
-    forward_list(size_type __n, const value_type& __v, const allocator_type& __a);
-    template <class _InputIterator>
-        forward_list(_InputIterator __f, _InputIterator __l,
-                     typename enable_if<
-                       __is_input_iterator<_InputIterator>::value
-                     >::type* = nullptr);
-    template <class _InputIterator>
-        forward_list(_InputIterator __f, _InputIterator __l,
-                     const allocator_type& __a,
-                     typename enable_if<
-                       __is_input_iterator<_InputIterator>::value
-                     >::type* = nullptr);
-    forward_list(const forward_list& __x);
-    forward_list(const forward_list& __x, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    forward_list(forward_list&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<base>::value)
-        : base(_VSTD::move(__x)) {}
-    forward_list(forward_list&& __x, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    forward_list(initializer_list<value_type> __il);
-    forward_list(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    // ~forward_list() = default;
-
-    forward_list& operator=(const forward_list& __x);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    forward_list& operator=(forward_list&& __x)
-        _NOEXCEPT_(
-             __node_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-#endif
-#ifndef  _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    forward_list& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template <class _InputIterator>
-        typename enable_if
-        <
-            __is_input_iterator<_InputIterator>::value,
-            void
-        >::type
-        assign(_InputIterator __f, _InputIterator __l);
-    void assign(size_type __n, const value_type& __v);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    void assign(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(base::__alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT
-        {return       iterator(base::__before_begin()->__next_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT
-        {return const_iterator(base::__before_begin()->__next_);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT
-        {return       iterator(nullptr);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT
-        {return const_iterator(nullptr);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT
-        {return const_iterator(base::__before_begin()->__next_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT
-        {return const_iterator(nullptr);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       before_begin() _NOEXCEPT
-        {return       iterator(base::__before_begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator before_begin() const _NOEXCEPT
-        {return const_iterator(base::__before_begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbefore_begin() const _NOEXCEPT
-        {return const_iterator(base::__before_begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT
-        {return base::__before_begin()->__next_ == nullptr;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-        {return numeric_limits<size_type>::max();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference       front()       {return base::__before_begin()->__next_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference front() const {return base::__before_begin()->__next_->__value_;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args> void emplace_front(_Args&&... __args);
-#endif
-    void push_front(value_type&& __v);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void push_front(const value_type& __v);
-
-    void pop_front();
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        iterator emplace_after(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-    iterator insert_after(const_iterator __p, value_type&& __v);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator insert_after(const_iterator __p, const value_type& __v);
-    iterator insert_after(const_iterator __p, size_type __n, const value_type& __v);
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_input_iterator<_InputIterator>::value,
-            iterator
-        >::type
-        insert_after(const_iterator __p, _InputIterator __f, _InputIterator __l);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    iterator insert_after(const_iterator __p, initializer_list<value_type> __il)
-        {return insert_after(__p, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    iterator erase_after(const_iterator __p);
-    iterator erase_after(const_iterator __f, const_iterator __l);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(forward_list& __x)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-        {base::swap(__x);}
-
-    void resize(size_type __n);
-    void resize(size_type __n, const value_type& __v);
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {base::clear();}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void splice_after(const_iterator __p, forward_list&& __x);
-    _LIBCPP_INLINE_VISIBILITY
-    void splice_after(const_iterator __p, forward_list&& __x, const_iterator __i);
-    _LIBCPP_INLINE_VISIBILITY
-    void splice_after(const_iterator __p, forward_list&& __x,
-                      const_iterator __f, const_iterator __l);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void splice_after(const_iterator __p, forward_list& __x);
-    void splice_after(const_iterator __p, forward_list& __x, const_iterator __i);
-    void splice_after(const_iterator __p, forward_list& __x,
-                      const_iterator __f, const_iterator __l);
-    void remove(const value_type& __v);
-    template <class _Predicate> void remove_if(_Predicate __pred);
-    _LIBCPP_INLINE_VISIBILITY
-    void unique() {unique(__equal_to<value_type>());}
-    template <class _BinaryPredicate> void unique(_BinaryPredicate __binary_pred);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void merge(forward_list&& __x) {merge(__x, __less<value_type>());}
-    template <class _Compare>
-        _LIBCPP_INLINE_VISIBILITY
-        void merge(forward_list&& __x, _Compare __comp)
-        {merge(__x, _VSTD::move(__comp));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void merge(forward_list& __x) {merge(__x, __less<value_type>());}
-    template <class _Compare> void merge(forward_list& __x, _Compare __comp);
-    _LIBCPP_INLINE_VISIBILITY
-    void sort() {sort(__less<value_type>());}
-    template <class _Compare> void sort(_Compare __comp);
-    void reverse() _NOEXCEPT;
-
-private:
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void __move_assign(forward_list& __x, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-    void __move_assign(forward_list& __x, false_type);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _Compare>
-        static
-        __node_pointer
-        __merge(__node_pointer __f1, __node_pointer __f2, _Compare& __comp);
-
-    template <class _Compare>
-        static
-        __node_pointer
-        __sort(__node_pointer __f, difference_type __sz, _Compare& __comp);
-};
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-forward_list<_Tp, _Alloc>::forward_list(const allocator_type& __a)
-    : base(__a)
-{
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(size_type __n)
-{
-    if (__n > 0)
-    {
-        __node_allocator& __a = base::__alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __h(nullptr, _Dp(__a, 1));
-        for (__node_pointer __p = base::__before_begin(); __n > 0; --__n,
-                                                             __p = __p->__next_)
-        {
-            __h.reset(__node_traits::allocate(__a, 1));
-            __node_traits::construct(__a, _VSTD::addressof(__h->__value_));
-            __h->__next_ = nullptr;
-            __p->__next_ = __h.release();
-        }
-    }
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(size_type __n, const allocator_type& __a)
-    : base ( __a )
-{
-    if (__n > 0)
-    {
-        __node_allocator& __a = base::__alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __h(nullptr, _Dp(__a, 1));
-        for (__node_pointer __p = base::__before_begin(); __n > 0; --__n,
-                                                             __p = __p->__next_)
-        {
-            __h.reset(__node_traits::allocate(__a, 1));
-            __node_traits::construct(__a, _VSTD::addressof(__h->__value_));
-            __h->__next_ = nullptr;
-            __p->__next_ = __h.release();
-        }
-    }
-}
-#endif
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(size_type __n, const value_type& __v)
-{
-    insert_after(cbefore_begin(), __n, __v);
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(size_type __n, const value_type& __v,
-                                        const allocator_type& __a)
-    : base(__a)
-{
-    insert_after(cbefore_begin(), __n, __v);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InputIterator>
-forward_list<_Tp, _Alloc>::forward_list(_InputIterator __f, _InputIterator __l,
-                                        typename enable_if<
-                                          __is_input_iterator<_InputIterator>::value
-                                        >::type*)
-{
-    insert_after(cbefore_begin(), __f, __l);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InputIterator>
-forward_list<_Tp, _Alloc>::forward_list(_InputIterator __f, _InputIterator __l,
-                                        const allocator_type& __a,
-                                        typename enable_if<
-                                          __is_input_iterator<_InputIterator>::value
-                                        >::type*)
-    : base(__a)
-{
-    insert_after(cbefore_begin(), __f, __l);
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(const forward_list& __x)
-    : base(allocator_type(
-             __node_traits::select_on_container_copy_construction(__x.__alloc())
-                         )
-          )
-{
-    insert_after(cbefore_begin(), __x.begin(), __x.end());
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(const forward_list& __x,
-                                        const allocator_type& __a)
-    : base(__a)
-{
-    insert_after(cbefore_begin(), __x.begin(), __x.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(forward_list&& __x,
-                                        const allocator_type& __a)
-    : base(_VSTD::move(__x), __a)
-{
-    if (base::__alloc() != __x.__alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        insert_after(cbefore_begin(), _Ip(__x.begin()), _Ip(__x.end()));
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(initializer_list<value_type> __il)
-{
-    insert_after(cbefore_begin(), __il.begin(), __il.end());
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(initializer_list<value_type> __il,
-                                        const allocator_type& __a)
-    : base(__a)
-{
-    insert_after(cbefore_begin(), __il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>&
-forward_list<_Tp, _Alloc>::operator=(const forward_list& __x)
-{
-    if (this != &__x)
-    {
-        base::__copy_assign_alloc(__x);
-        assign(__x.begin(), __x.end());
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::__move_assign(forward_list& __x, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    clear();
-    base::__move_assign_alloc(__x);
-    base::__before_begin()->__next_ = __x.__before_begin()->__next_;
-    __x.__before_begin()->__next_ = nullptr;
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::__move_assign(forward_list& __x, false_type)
-{
-    if (base::__alloc() == __x.__alloc())
-        __move_assign(__x, true_type());
-    else
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__x.begin()), _Ip(__x.end()));
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-forward_list<_Tp, _Alloc>&
-forward_list<_Tp, _Alloc>::operator=(forward_list&& __x)
-    _NOEXCEPT_(
-             __node_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__x, integral_constant<bool,
-          __node_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-forward_list<_Tp, _Alloc>&
-forward_list<_Tp, _Alloc>::operator=(initializer_list<value_type> __il)
-{
-    assign(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-template <class _InputIterator>
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value,
-    void
->::type
-forward_list<_Tp, _Alloc>::assign(_InputIterator __f, _InputIterator __l)
-{
-    iterator __i = before_begin();
-    iterator __j = _VSTD::next(__i);
-    iterator __e = end();
-    for (; __j != __e && __f != __l; ++__i, (void) ++__j, ++__f)
-        *__j = *__f;
-    if (__j == __e)
-        insert_after(__i, __f, __l);
-    else
-        erase_after(__i, __e);
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::assign(size_type __n, const value_type& __v)
-{
-    iterator __i = before_begin();
-    iterator __j = _VSTD::next(__i);
-    iterator __e = end();
-    for (; __j != __e && __n > 0; --__n, ++__i, ++__j)
-        *__j = __v;
-    if (__j == __e)
-        insert_after(__i, __n, __v);
-    else
-        erase_after(__i, __e);
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::assign(initializer_list<value_type> __il)
-{
-    assign(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-void
-forward_list<_Tp, _Alloc>::emplace_front(_Args&&... __args)
-{
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_),
-                                  _VSTD::forward<_Args>(__args)...);
-    __h->__next_ = base::__before_begin()->__next_;
-    base::__before_begin()->__next_ = __h.release();
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::push_front(value_type&& __v)
-{
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_), _VSTD::move(__v));
-    __h->__next_ = base::__before_begin()->__next_;
-    base::__before_begin()->__next_ = __h.release();
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::push_front(const value_type& __v)
-{
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-    __h->__next_ = base::__before_begin()->__next_;
-    base::__before_begin()->__next_ = __h.release();
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::pop_front()
-{
-    __node_allocator& __a = base::__alloc();
-    __node_pointer __p = base::__before_begin()->__next_;
-    base::__before_begin()->__next_ = __p->__next_;
-    __node_traits::destroy(__a, _VSTD::addressof(__p->__value_));
-    __node_traits::deallocate(__a, __p, 1);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::emplace_after(const_iterator __p, _Args&&... __args)
-{
-    __node_pointer const __r = __p.__ptr_;
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_),
-                                  _VSTD::forward<_Args>(__args)...);
-    __h->__next_ = __r->__next_;
-    __r->__next_ = __h.release();
-    return iterator(__r->__next_);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, value_type&& __v)
-{
-    __node_pointer const __r = __p.__ptr_;
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_), _VSTD::move(__v));
-    __h->__next_ = __r->__next_;
-    __r->__next_ = __h.release();
-    return iterator(__r->__next_);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, const value_type& __v)
-{
-    __node_pointer const __r = __p.__ptr_;
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-    __h->__next_ = __r->__next_;
-    __r->__next_ = __h.release();
-    return iterator(__r->__next_);
-}
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, size_type __n,
-                                        const value_type& __v)
-{
-    __node_pointer __r = __p.__ptr_;
-    if (__n > 0)
-    {
-        __node_allocator& __a = base::__alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-        __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-        __node_pointer __first = __h.release();
-        __node_pointer __last = __first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (--__n; __n != 0; --__n, __last = __last->__next_)
-            {
-                __h.reset(__node_traits::allocate(__a, 1));
-                __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-                __last->__next_ = __h.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (__first != nullptr)
-            {
-                __node_pointer __next = __first->__next_;
-                __node_traits::destroy(__a, _VSTD::addressof(__first->__value_));
-                __node_traits::deallocate(__a, __first, 1);
-                __first = __next;
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __last->__next_ = __r->__next_;
-        __r->__next_ = __first;
-        __r = __last;
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InputIterator>
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value,
-    typename forward_list<_Tp, _Alloc>::iterator
->::type
-forward_list<_Tp, _Alloc>::insert_after(const_iterator __p,
-                                        _InputIterator __f, _InputIterator __l)
-{
-    __node_pointer __r = __p.__ptr_;
-    if (__f != __l)
-    {
-        __node_allocator& __a = base::__alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-        __node_traits::construct(__a, _VSTD::addressof(__h->__value_), *__f);
-        __node_pointer __first = __h.release();
-        __node_pointer __last = __first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (++__f; __f != __l; ++__f, ((void)(__last = __last->__next_)))
-            {
-                __h.reset(__node_traits::allocate(__a, 1));
-                __node_traits::construct(__a, _VSTD::addressof(__h->__value_), *__f);
-                __last->__next_ = __h.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (__first != nullptr)
-            {
-                __node_pointer __next = __first->__next_;
-                __node_traits::destroy(__a, _VSTD::addressof(__first->__value_));
-                __node_traits::deallocate(__a, __first, 1);
-                __first = __next;
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __last->__next_ = __r->__next_;
-        __r->__next_ = __first;
-        __r = __last;
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::erase_after(const_iterator __f)
-{
-    __node_pointer __p = __f.__ptr_;
-    __node_pointer __n = __p->__next_;
-    __p->__next_ = __n->__next_;
-    __node_allocator& __a = base::__alloc();
-    __node_traits::destroy(__a, _VSTD::addressof(__n->__value_));
-    __node_traits::deallocate(__a, __n, 1);
-    return iterator(__p->__next_);
-}
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::erase_after(const_iterator __f, const_iterator __l)
-{
-    __node_pointer __e = __l.__ptr_;
-    if (__f != __l)
-    {
-        __node_pointer __p = __f.__ptr_;
-        __node_pointer __n = __p->__next_;
-        if (__n != __e)
-        {
-            __p->__next_ = __e;
-            __node_allocator& __a = base::__alloc();
-            do
-            {
-                __p = __n->__next_;
-                __node_traits::destroy(__a, _VSTD::addressof(__n->__value_));
-                __node_traits::deallocate(__a, __n, 1);
-                __n = __p;
-            } while (__n != __e);
-        }
-    }
-    return iterator(__e);
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::resize(size_type __n)
-{
-    size_type __sz = 0;
-    iterator __p = before_begin();
-    iterator __i = begin();
-    iterator __e = end();
-    for (; __i != __e && __sz < __n; ++__p, ++__i, ++__sz)
-        ;
-    if (__i != __e)
-        erase_after(__p, __e);
-    else
-    {
-        __n -= __sz;
-        if (__n > 0)
-        {
-            __node_allocator& __a = base::__alloc();
-            typedef __allocator_destructor<__node_allocator> _Dp;
-            unique_ptr<__node, _Dp> __h(nullptr, _Dp(__a, 1));
-            for (__node_pointer __ptr = __p.__ptr_; __n > 0; --__n,
-                                                         __ptr = __ptr->__next_)
-            {
-                __h.reset(__node_traits::allocate(__a, 1));
-                __node_traits::construct(__a, _VSTD::addressof(__h->__value_));
-                __h->__next_ = nullptr;
-                __ptr->__next_ = __h.release();
-            }
-        }
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::resize(size_type __n, const value_type& __v)
-{
-    size_type __sz = 0;
-    iterator __p = before_begin();
-    iterator __i = begin();
-    iterator __e = end();
-    for (; __i != __e && __sz < __n; ++__p, ++__i, ++__sz)
-        ;
-    if (__i != __e)
-        erase_after(__p, __e);
-    else
-    {
-        __n -= __sz;
-        if (__n > 0)
-        {
-            __node_allocator& __a = base::__alloc();
-            typedef __allocator_destructor<__node_allocator> _Dp;
-            unique_ptr<__node, _Dp> __h(nullptr, _Dp(__a, 1));
-            for (__node_pointer __ptr = __p.__ptr_; __n > 0; --__n,
-                                                         __ptr = __ptr->__next_)
-            {
-                __h.reset(__node_traits::allocate(__a, 1));
-                __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-                __h->__next_ = nullptr;
-                __ptr->__next_ = __h.release();
-            }
-        }
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list& __x)
-{
-    if (!__x.empty())
-    {
-        if (__p.__ptr_->__next_ != nullptr)
-        {
-            const_iterator __lm1 = __x.before_begin();
-            while (__lm1.__ptr_->__next_ != nullptr)
-                ++__lm1;
-            __lm1.__ptr_->__next_ = __p.__ptr_->__next_;
-        }
-        __p.__ptr_->__next_ = __x.__before_begin()->__next_;
-        __x.__before_begin()->__next_ = nullptr;
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list& __x,
-                                        const_iterator __i)
-{
-    const_iterator __lm1 = _VSTD::next(__i);
-    if (__p != __i && __p != __lm1)
-    {
-        __i.__ptr_->__next_ = __lm1.__ptr_->__next_;
-        __lm1.__ptr_->__next_ = __p.__ptr_->__next_;
-        __p.__ptr_->__next_ = __lm1.__ptr_;
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list& __x,
-                                        const_iterator __f, const_iterator __l)
-{
-    if (__f != __l && __p != __f)
-    {
-        const_iterator __lm1 = __f;
-        while (__lm1.__ptr_->__next_ != __l.__ptr_)
-            ++__lm1;
-        if (__f != __lm1)
-        {
-            __lm1.__ptr_->__next_ = __p.__ptr_->__next_;
-            __p.__ptr_->__next_ = __f.__ptr_->__next_;
-            __f.__ptr_->__next_ = __l.__ptr_;
-        }
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list&& __x)
-{
-    splice_after(__p, __x);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list&& __x,
-                                        const_iterator __i)
-{
-    splice_after(__p, __x, __i);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list&& __x,
-                                        const_iterator __f, const_iterator __l)
-{
-    splice_after(__p, __x, __f, __l);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::remove(const value_type& __v)
-{
-    forward_list<_Tp, _Alloc> __deleted_nodes; // collect the nodes we're removing
-    iterator __e = end();
-    for (iterator __i = before_begin(); __i.__ptr_->__next_ != nullptr;)
-    {
-        if (__i.__ptr_->__next_->__value_ == __v)
-        {
-            iterator __j = _VSTD::next(__i, 2);
-            for (; __j != __e && *__j == __v; ++__j)
-                ;
-            __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j);
-            if (__j == __e)
-                break;
-            __i = __j;
-        }
-        else
-            ++__i;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _Predicate>
-void
-forward_list<_Tp, _Alloc>::remove_if(_Predicate __pred)
-{
-    iterator __e = end();
-    for (iterator __i = before_begin(); __i.__ptr_->__next_ != nullptr;)
-    {
-        if (__pred(__i.__ptr_->__next_->__value_))
-        {
-            iterator __j = _VSTD::next(__i, 2);
-            for (; __j != __e && __pred(*__j); ++__j)
-                ;
-            erase_after(__i, __j);
-            if (__j == __e)
-                break;
-            __i = __j;
-        }
-        else
-            ++__i;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _BinaryPredicate>
-void
-forward_list<_Tp, _Alloc>::unique(_BinaryPredicate __binary_pred)
-{
-    for (iterator __i = begin(), __e = end(); __i != __e;)
-    {
-        iterator __j = _VSTD::next(__i);
-        for (; __j != __e && __binary_pred(*__i, *__j); ++__j)
-            ;
-        if (__i.__ptr_->__next_ != __j.__ptr_)
-            erase_after(__i, __j);
-        __i = __j;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _Compare>
-void
-forward_list<_Tp, _Alloc>::merge(forward_list& __x, _Compare __comp)
-{
-    if (this != &__x)
-    {
-        base::__before_begin()->__next_ = __merge(base::__before_begin()->__next_,
-                                                    __x.__before_begin()->__next_,
-                                                    __comp);
-        __x.__before_begin()->__next_ = nullptr;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _Compare>
-typename forward_list<_Tp, _Alloc>::__node_pointer
-forward_list<_Tp, _Alloc>::__merge(__node_pointer __f1, __node_pointer __f2,
-                                   _Compare& __comp)
-{
-    if (__f1 == nullptr)
-        return __f2;
-    if (__f2 == nullptr)
-        return __f1;
-    __node_pointer __r;
-    if (__comp(__f2->__value_, __f1->__value_))
-    {
-        __node_pointer __t = __f2;
-        while (__t->__next_ != nullptr &&
-                             __comp(__t->__next_->__value_, __f1->__value_))
-            __t = __t->__next_;
-        __r = __f2;
-        __f2 = __t->__next_;
-        __t->__next_ = __f1;
-    }
-    else
-        __r = __f1;
-    __node_pointer __p = __f1;
-    __f1 = __f1->__next_;
-    while (__f1 != nullptr && __f2 != nullptr)
-    {
-        if (__comp(__f2->__value_, __f1->__value_))
-        {
-            __node_pointer __t = __f2;
-            while (__t->__next_ != nullptr &&
-                                 __comp(__t->__next_->__value_, __f1->__value_))
-                __t = __t->__next_;
-            __p->__next_ = __f2;
-            __f2 = __t->__next_;
-            __t->__next_ = __f1;
-        }
-        __p = __f1;
-        __f1 = __f1->__next_;
-    }
-    if (__f2 != nullptr)
-        __p->__next_ = __f2;
-    return __r;
-}
-
-template <class _Tp, class _Alloc>
-template <class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::sort(_Compare __comp)
-{
-    base::__before_begin()->__next_ = __sort(base::__before_begin()->__next_,
-                                       _VSTD::distance(begin(), end()), __comp);
-}
-
-template <class _Tp, class _Alloc>
-template <class _Compare>
-typename forward_list<_Tp, _Alloc>::__node_pointer
-forward_list<_Tp, _Alloc>::__sort(__node_pointer __f1, difference_type __sz,
-                                  _Compare& __comp)
-{
-    switch (__sz)
-    {
-    case 0:
-    case 1:
-        return __f1;
-    case 2:
-        if (__comp(__f1->__next_->__value_, __f1->__value_))
-        {
-            __node_pointer __t = __f1->__next_;
-            __t->__next_ = __f1;
-            __f1->__next_ = nullptr;
-            __f1 = __t;
-        }
-        return __f1;
-    }
-    difference_type __sz1 = __sz / 2;
-    difference_type __sz2 = __sz - __sz1;
-    __node_pointer __t = _VSTD::next(iterator(__f1), __sz1 - 1).__ptr_;
-    __node_pointer __f2 = __t->__next_;
-    __t->__next_ = nullptr;
-    return __merge(__sort(__f1, __sz1, __comp),
-                   __sort(__f2, __sz2, __comp), __comp);
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::reverse() _NOEXCEPT
-{
-    __node_pointer __p = base::__before_begin()->__next_;
-    if (__p != nullptr)
-    {
-        __node_pointer __f = __p->__next_;
-        __p->__next_ = nullptr;
-        while (__f != nullptr)
-        {
-            __node_pointer __t = __f->__next_;
-            __f->__next_ = __p;
-            __p = __f;
-            __f = __t;
-        }
-        base::__before_begin()->__next_ = __p;
-    }
-}
-
-template <class _Tp, class _Alloc>
-bool operator==(const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    typedef forward_list<_Tp, _Alloc> _Cp;
-    typedef typename _Cp::const_iterator _Ip;
-    _Ip __ix = __x.begin();
-    _Ip __ex = __x.end();
-    _Ip __iy = __y.begin();
-    _Ip __ey = __y.end();
-    for (; __ix != __ex && __iy != __ey; ++__ix, ++__iy)
-        if (!(*__ix == *__iy))
-            return false;
-    return (__ix == __ex) == (__iy == __ey);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator!=(const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator< (const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(),
-                                         __y.begin(), __y.end());
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator> (const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator>=(const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator<=(const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(forward_list<_Tp, _Alloc>& __x, forward_list<_Tp, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_FORWARD_LIST
diff --git a/include.new/c++/v1/fstream b/include.new/c++/v1/fstream
deleted file mode 100644
index 38778c6..0000000
--- a/include.new/c++/v1/fstream
+++ /dev/null
@@ -1,1431 +0,0 @@
-// -*- C++ -*-
-//===------------------------- fstream ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FSTREAM
-#define _LIBCPP_FSTREAM
-
-/*
-    fstream synopsis
-
-template <class charT, class traits = char_traits<charT> >
-class basic_filebuf
-    : public basic_streambuf<charT, traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.9.1.2 Constructors/destructor:
-    basic_filebuf();
-    basic_filebuf(basic_filebuf&& rhs);
-    virtual ~basic_filebuf();
-
-    // 27.9.1.3 Assign/swap:
-    basic_filebuf& operator=(basic_filebuf&& rhs);
-    void swap(basic_filebuf& rhs);
-
-    // 27.9.1.4 Members:
-    bool is_open() const;
-    basic_filebuf* open(const char* s, ios_base::openmode mode);
-    basic_filebuf* open(const string& s, ios_base::openmode mode);
-    basic_filebuf* close();
-
-protected:
-    // 27.9.1.5 Overridden virtual functions:
-    virtual streamsize showmanyc();
-    virtual int_type underflow();
-    virtual int_type uflow();
-    virtual int_type pbackfail(int_type c = traits_type::eof());
-    virtual int_type overflow (int_type c = traits_type::eof());
-    virtual basic_streambuf<char_type, traits_type>* setbuf(char_type* s, streamsize n);
-    virtual pos_type seekoff(off_type off, ios_base::seekdir way,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type sp,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual int sync();
-    virtual void imbue(const locale& loc);
-};
-
-template <class charT, class traits>
-  void
-  swap(basic_filebuf<charT, traits>& x, basic_filebuf<charT, traits>& y);
-
-typedef basic_filebuf<char>    filebuf;
-typedef basic_filebuf<wchar_t> wfilebuf;
-
-template <class charT, class traits = char_traits<charT> >
-class basic_ifstream
-    : public basic_istream<charT,traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_ifstream();
-    explicit basic_ifstream(const char* s, ios_base::openmode mode = ios_base::in);
-    explicit basic_ifstream(const string& s, ios_base::openmode mode = ios_base::in);
-    basic_ifstream(basic_ifstream&& rhs);
-
-    basic_ifstream& operator=(basic_ifstream&& rhs);
-    void swap(basic_ifstream& rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* s, ios_base::openmode mode = ios_base::in);
-    void open(const string& s, ios_base::openmode mode = ios_base::in);
-    void close();
-};
-
-template <class charT, class traits>
-  void
-  swap(basic_ifstream<charT, traits>& x, basic_ifstream<charT, traits>& y);
-
-typedef basic_ifstream<char>    ifstream;
-typedef basic_ifstream<wchar_t> wifstream;
-
-template <class charT, class traits = char_traits<charT> >
-class basic_ofstream
-    : public basic_ostream<charT,traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_ofstream();
-    explicit basic_ofstream(const char* s, ios_base::openmode mode = ios_base::out);
-    explicit basic_ofstream(const string& s, ios_base::openmode mode = ios_base::out);
-    basic_ofstream(basic_ofstream&& rhs);
-
-    basic_ofstream& operator=(basic_ofstream&& rhs);
-    void swap(basic_ofstream& rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* s, ios_base::openmode mode = ios_base::out);
-    void open(const string& s, ios_base::openmode mode = ios_base::out);
-    void close();
-};
-
-template <class charT, class traits>
-  void
-  swap(basic_ofstream<charT, traits>& x, basic_ofstream<charT, traits>& y);
-
-typedef basic_ofstream<char>    ofstream;
-typedef basic_ofstream<wchar_t> wofstream;
-
-template <class charT, class traits=char_traits<charT> >
-class basic_fstream
-    : public basic_iostream<charT,traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_fstream();
-    explicit basic_fstream(const char* s, ios_base::openmode mode = ios_base::in|ios_base::out);
-    explicit basic_fstream(const string& s, ios_base::openmode mode = ios_base::in|ios_base::out);
-    basic_fstream(basic_fstream&& rhs);
-
-    basic_fstream& operator=(basic_fstream&& rhs);
-    void swap(basic_fstream& rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* s, ios_base::openmode mode = ios_base::in|ios_base::out);
-    void open(const string& s, ios_base::openmode mode = ios_base::in|ios_base::out);
-    void close();
-};
-
-template <class charT, class traits>
-  void swap(basic_fstream<charT, traits>& x, basic_fstream<charT, traits>& y);
-
-typedef basic_fstream<char>    fstream;
-typedef basic_fstream<wchar_t> wfstream;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ostream>
-#include <istream>
-#include <__locale>
-#include <cstdio>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_filebuf
-    : public basic_streambuf<_CharT, _Traits>
-{
-public:
-    typedef _CharT                           char_type;
-    typedef _Traits                          traits_type;
-    typedef typename traits_type::int_type   int_type;
-    typedef typename traits_type::pos_type   pos_type;
-    typedef typename traits_type::off_type   off_type;
-    typedef typename traits_type::state_type state_type;
-
-    // 27.9.1.2 Constructors/destructor:
-    basic_filebuf();
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_filebuf(basic_filebuf&& __rhs);
-#endif
-    virtual ~basic_filebuf();
-
-    // 27.9.1.3 Assign/swap:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_filebuf& operator=(basic_filebuf&& __rhs);
-#endif
-    void swap(basic_filebuf& __rhs);
-
-    // 27.9.1.4 Members:
-    bool is_open() const;
-    basic_filebuf* open(const char* __s, ios_base::openmode __mode);
-    basic_filebuf* open(const string& __s, ios_base::openmode __mode);
-    basic_filebuf* close();
-
-protected:
-    // 27.9.1.5 Overridden virtual functions:
-    virtual int_type underflow();
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-    virtual int_type overflow (int_type __c = traits_type::eof());
-    virtual basic_streambuf<char_type, traits_type>* setbuf(char_type* __s, streamsize __n);
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual int sync();
-    virtual void imbue(const locale& __loc);
-
-private:
-    char*       __extbuf_;
-    const char* __extbufnext_;
-    const char* __extbufend_;
-    char __extbuf_min_[8];
-    size_t __ebs_;
-    char_type* __intbuf_;
-    size_t __ibs_;
-    FILE* __file_;
-    const codecvt<char_type, char, state_type>* __cv_;
-    state_type __st_;
-    state_type __st_last_;
-    ios_base::openmode __om_;
-    ios_base::openmode __cm_;
-    bool __owns_eb_;
-    bool __owns_ib_;
-    bool __always_noconv_;
-
-    bool __read_mode();
-    void __write_mode();
-};
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>::basic_filebuf()
-    : __extbuf_(0),
-      __extbufnext_(0),
-      __extbufend_(0),
-      __ebs_(0),
-      __intbuf_(0),
-      __ibs_(0),
-      __file_(0),
-      __cv_(nullptr),
-      __st_(),
-      __st_last_(),
-      __om_(0),
-      __cm_(0),
-      __owns_eb_(false),
-      __owns_ib_(false),
-      __always_noconv_(false)
-{
-    if (has_facet<codecvt<char_type, char, state_type> >(this->getloc()))
-    {
-        __cv_ = &use_facet<codecvt<char_type, char, state_type> >(this->getloc());
-        __always_noconv_ = __cv_->always_noconv();
-    }
-    setbuf(0, 4096);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>::basic_filebuf(basic_filebuf&& __rhs)
-    : basic_streambuf<_CharT, _Traits>(__rhs)
-{
-    if (__rhs.__extbuf_ == __rhs.__extbuf_min_)
-    {
-        __extbuf_ = __extbuf_min_;
-        __extbufnext_ = __extbuf_ + (__rhs.__extbufnext_ - __rhs.__extbuf_);
-        __extbufend_ = __extbuf_ + (__rhs.__extbufend_ - __rhs.__extbuf_);
-    }
-    else
-    {
-        __extbuf_ = __rhs.__extbuf_;
-        __extbufnext_ = __rhs.__extbufnext_;
-        __extbufend_ = __rhs.__extbufend_;
-    }
-    __ebs_ = __rhs.__ebs_;
-    __intbuf_ = __rhs.__intbuf_;
-    __ibs_ = __rhs.__ibs_;
-    __file_ = __rhs.__file_;
-    __cv_ = __rhs.__cv_;
-    __st_ = __rhs.__st_;
-    __st_last_ = __rhs.__st_last_;
-    __om_ = __rhs.__om_;
-    __cm_ = __rhs.__cm_;
-    __owns_eb_ = __rhs.__owns_eb_;
-    __owns_ib_ = __rhs.__owns_ib_;
-    __always_noconv_ = __rhs.__always_noconv_;
-    if (__rhs.pbase())
-    {
-        if (__rhs.pbase() == __rhs.__intbuf_)
-            this->setp(__intbuf_, __intbuf_ + (__rhs. epptr() - __rhs.pbase()));
-        else
-            this->setp((char_type*)__extbuf_,
-                       (char_type*)__extbuf_ + (__rhs. epptr() - __rhs.pbase()));
-        this->pbump(__rhs. pptr() - __rhs.pbase());
-    }
-    else if (__rhs.eback())
-    {
-        if (__rhs.eback() == __rhs.__intbuf_)
-            this->setg(__intbuf_, __intbuf_ + (__rhs.gptr() - __rhs.eback()),
-                                  __intbuf_ + (__rhs.egptr() - __rhs.eback()));
-        else
-            this->setg((char_type*)__extbuf_,
-                       (char_type*)__extbuf_ + (__rhs.gptr() - __rhs.eback()),
-                       (char_type*)__extbuf_ + (__rhs.egptr() - __rhs.eback()));
-    }
-    __rhs.__extbuf_ = 0;
-    __rhs.__extbufnext_ = 0;
-    __rhs.__extbufend_ = 0;
-    __rhs.__ebs_ = 0;
-    __rhs.__intbuf_ = 0;
-    __rhs.__ibs_ = 0;
-    __rhs.__file_ = 0;
-    __rhs.__st_ = state_type();
-    __rhs.__st_last_ = state_type();
-    __rhs.__om_ = 0;
-    __rhs.__cm_ = 0;
-    __rhs.__owns_eb_ = false;
-    __rhs.__owns_ib_ = false;
-    __rhs.setg(0, 0, 0);
-    __rhs.setp(0, 0);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>&
-basic_filebuf<_CharT, _Traits>::operator=(basic_filebuf&& __rhs)
-{
-    close();
-    swap(__rhs);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>::~basic_filebuf()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        close();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    if (__owns_eb_)
-        delete [] __extbuf_;
-    if (__owns_ib_)
-        delete [] __intbuf_;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_filebuf<_CharT, _Traits>::swap(basic_filebuf& __rhs)
-{
-    basic_streambuf<char_type, traits_type>::swap(__rhs);
-    if (__extbuf_ != __extbuf_min_ && __rhs.__extbuf_ != __rhs.__extbuf_min_)
-    {
-        _VSTD::swap(__extbuf_, __rhs.__extbuf_);
-        _VSTD::swap(__extbufnext_, __rhs.__extbufnext_);
-        _VSTD::swap(__extbufend_, __rhs.__extbufend_);
-    }
-    else
-    {
-        ptrdiff_t __ln = __extbufnext_ - __extbuf_;
-        ptrdiff_t __le = __extbufend_ - __extbuf_;
-        ptrdiff_t __rn = __rhs.__extbufnext_ - __rhs.__extbuf_;
-        ptrdiff_t __re = __rhs.__extbufend_ - __rhs.__extbuf_;
-        if (__extbuf_ == __extbuf_min_ && __rhs.__extbuf_ != __rhs.__extbuf_min_)
-        {
-            __extbuf_ = __rhs.__extbuf_;
-            __rhs.__extbuf_ = __rhs.__extbuf_min_;
-        }
-        else if (__extbuf_ != __extbuf_min_ && __rhs.__extbuf_ == __rhs.__extbuf_min_)
-        {
-            __rhs.__extbuf_ = __extbuf_;
-            __extbuf_ = __extbuf_min_;
-        }
-        __extbufnext_ = __extbuf_ + __rn;
-        __extbufend_ = __extbuf_ + __re;
-        __rhs.__extbufnext_ = __rhs.__extbuf_ + __ln;
-        __rhs.__extbufend_ = __rhs.__extbuf_ + __le;
-    }
-    _VSTD::swap(__ebs_, __rhs.__ebs_);
-    _VSTD::swap(__intbuf_, __rhs.__intbuf_);
-    _VSTD::swap(__ibs_, __rhs.__ibs_);
-    _VSTD::swap(__file_, __rhs.__file_);
-    _VSTD::swap(__cv_, __rhs.__cv_);
-    _VSTD::swap(__st_, __rhs.__st_);
-    _VSTD::swap(__st_last_, __rhs.__st_last_);
-    _VSTD::swap(__om_, __rhs.__om_);
-    _VSTD::swap(__cm_, __rhs.__cm_);
-    _VSTD::swap(__owns_eb_, __rhs.__owns_eb_);
-    _VSTD::swap(__owns_ib_, __rhs.__owns_ib_);
-    _VSTD::swap(__always_noconv_, __rhs.__always_noconv_);
-    if (this->eback() == (char_type*)__rhs.__extbuf_min_)
-    {
-        ptrdiff_t __n = this->gptr() - this->eback();
-        ptrdiff_t __e = this->egptr() - this->eback();
-        this->setg((char_type*)__extbuf_min_,
-                   (char_type*)__extbuf_min_ + __n,
-                   (char_type*)__extbuf_min_ + __e);
-    }
-    else if (this->pbase() == (char_type*)__rhs.__extbuf_min_)
-    {
-        ptrdiff_t __n = this->pptr() - this->pbase();
-        ptrdiff_t __e = this->epptr() - this->pbase();
-        this->setp((char_type*)__extbuf_min_,
-                   (char_type*)__extbuf_min_ + __e);
-        this->pbump(__n);
-    }
-    if (__rhs.eback() == (char_type*)__extbuf_min_)
-    {
-        ptrdiff_t __n = __rhs.gptr() - __rhs.eback();
-        ptrdiff_t __e = __rhs.egptr() - __rhs.eback();
-        __rhs.setg((char_type*)__rhs.__extbuf_min_,
-                   (char_type*)__rhs.__extbuf_min_ + __n,
-                   (char_type*)__rhs.__extbuf_min_ + __e);
-    }
-    else if (__rhs.pbase() == (char_type*)__extbuf_min_)
-    {
-        ptrdiff_t __n = __rhs.pptr() - __rhs.pbase();
-        ptrdiff_t __e = __rhs.epptr() - __rhs.pbase();
-        __rhs.setp((char_type*)__rhs.__extbuf_min_,
-                   (char_type*)__rhs.__extbuf_min_ + __e);
-        __rhs.pbump(__n);
-    }
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_filebuf<_CharT, _Traits>& __x, basic_filebuf<_CharT, _Traits>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_filebuf<_CharT, _Traits>::is_open() const
-{
-    return __file_ != 0;
-}
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>*
-basic_filebuf<_CharT, _Traits>::open(const char* __s, ios_base::openmode __mode)
-{
-    basic_filebuf<_CharT, _Traits>* __rt = 0;
-    if (__file_ == 0)
-    {
-        __rt = this;
-        const char* __mdstr;
-        switch (__mode & ~ios_base::ate)
-        {
-        case ios_base::out:
-        case ios_base::out | ios_base::trunc:
-            __mdstr = "w";
-            break;
-        case ios_base::out | ios_base::app:
-        case ios_base::app:
-            __mdstr = "a";
-            break;
-        case ios_base::in:
-            __mdstr = "r";
-            break;
-        case ios_base::in | ios_base::out:
-            __mdstr = "r+";
-            break;
-        case ios_base::in | ios_base::out | ios_base::trunc:
-            __mdstr = "w+";
-            break;
-        case ios_base::in | ios_base::out | ios_base::app:
-        case ios_base::in | ios_base::app:
-            __mdstr = "a+";
-            break;
-        case ios_base::out | ios_base::binary:
-        case ios_base::out | ios_base::trunc | ios_base::binary:
-            __mdstr = "wb";
-            break;
-        case ios_base::out | ios_base::app | ios_base::binary:
-        case ios_base::app | ios_base::binary:
-            __mdstr = "ab";
-            break;
-        case ios_base::in | ios_base::binary:
-            __mdstr = "rb";
-            break;
-        case ios_base::in | ios_base::out | ios_base::binary:
-            __mdstr = "r+b";
-            break;
-        case ios_base::in | ios_base::out | ios_base::trunc | ios_base::binary:
-            __mdstr = "w+b";
-            break;
-        case ios_base::in | ios_base::out | ios_base::app | ios_base::binary:
-        case ios_base::in | ios_base::app | ios_base::binary:
-            __mdstr = "a+b";
-            break;
-        default:
-            __rt = 0;
-            break;
-        }
-        if (__rt)
-        {
-            __file_ = fopen(__s, __mdstr);
-            if (__file_)
-            {
-                __om_ = __mode;
-                if (__mode & ios_base::ate)
-                {
-                    if (fseek(__file_, 0, SEEK_END))
-                    {
-                        fclose(__file_);
-                        __file_ = 0;
-                        __rt = 0;
-                    }
-                }
-            }
-            else
-                __rt = 0;
-        }
-    }
-    return __rt;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>*
-basic_filebuf<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mode)
-{
-    return open(__s.c_str(), __mode);
-}
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>*
-basic_filebuf<_CharT, _Traits>::close()
-{
-    basic_filebuf<_CharT, _Traits>* __rt = 0;
-    if (__file_)
-    {
-        __rt = this;
-        unique_ptr<FILE, int(*)(FILE*)> __h(__file_, fclose);
-        if (sync())
-            __rt = 0;
-        if (fclose(__h.release()) == 0)
-            __file_ = 0;
-        else
-            __rt = 0;
-    }
-    return __rt;
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::int_type
-basic_filebuf<_CharT, _Traits>::underflow()
-{
-    if (__file_ == 0)
-        return traits_type::eof();
-    bool __initial = __read_mode();
-    char_type __1buf;
-    if (this->gptr() == 0)
-        this->setg(&__1buf, &__1buf+1, &__1buf+1);
-    const size_t __unget_sz = __initial ? 0 : min<size_t>((this->egptr() - this->eback()) / 2, 4);
-    int_type __c = traits_type::eof();
-    if (this->gptr() == this->egptr())
-    {
-        memmove(this->eback(), this->egptr() - __unget_sz, __unget_sz * sizeof(char_type));
-        if (__always_noconv_)
-        {
-            size_t __nmemb = static_cast<size_t>(this->egptr() - this->eback() - __unget_sz);
-            __nmemb = fread(this->eback() + __unget_sz, 1, __nmemb, __file_);
-            if (__nmemb != 0)
-            {
-                this->setg(this->eback(),
-                           this->eback() + __unget_sz,
-                           this->eback() + __unget_sz + __nmemb);
-                __c = traits_type::to_int_type(*this->gptr());
-            }
-        }
-        else
-        {
-            memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
-            __extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
-            __extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
-            size_t __nmemb = _VSTD::min(static_cast<size_t>(__ibs_ - __unget_sz),
-                                 static_cast<size_t>(__extbufend_ - __extbufnext_));
-            codecvt_base::result __r;
-            __st_last_ = __st_;
-            size_t __nr = fread((void*)__extbufnext_, 1, __nmemb, __file_);
-            if (__nr != 0)
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (!__cv_)
-                    throw bad_cast();
-#endif
-                __extbufend_ = __extbufnext_ + __nr;
-                char_type*  __inext;
-                __r = __cv_->in(__st_, __extbuf_, __extbufend_, __extbufnext_,
-                                       this->eback() + __unget_sz,
-                                       this->eback() + __ibs_, __inext);
-                if (__r == codecvt_base::noconv)
-                {
-                    this->setg((char_type*)__extbuf_, (char_type*)__extbuf_, (char_type*)__extbufend_);
-                    __c = traits_type::to_int_type(*this->gptr());
-                }
-                else if (__inext != this->eback() + __unget_sz)
-                {
-                    this->setg(this->eback(), this->eback() + __unget_sz, __inext);
-                    __c = traits_type::to_int_type(*this->gptr());
-                }
-            }
-        }
-    }
-    else
-        __c = traits_type::to_int_type(*this->gptr());
-    if (this->eback() == &__1buf)
-        this->setg(0, 0, 0);
-    return __c;
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::int_type
-basic_filebuf<_CharT, _Traits>::pbackfail(int_type __c)
-{
-    if (__file_ && this->eback() < this->gptr())
-    {
-        if (traits_type::eq_int_type(__c, traits_type::eof()))
-        {
-            this->gbump(-1);
-            return traits_type::not_eof(__c);
-        }
-        if ((__om_ & ios_base::out) ||
-            traits_type::eq(traits_type::to_char_type(__c), this->gptr()[-1]))
-        {
-            this->gbump(-1);
-            *this->gptr() = traits_type::to_char_type(__c);
-            return __c;
-        }
-    }
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::int_type
-basic_filebuf<_CharT, _Traits>::overflow(int_type __c)
-{
-    if (__file_ == 0)
-        return traits_type::eof();
-    __write_mode();
-    char_type __1buf;
-    char_type* __pb_save = this->pbase();
-    char_type* __epb_save = this->epptr();
-    if (!traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        if (this->pptr() == 0)
-            this->setp(&__1buf, &__1buf+1);
-        *this->pptr() = traits_type::to_char_type(__c);
-        this->pbump(1);
-    }
-    if (this->pptr() != this->pbase())
-    {
-        if (__always_noconv_)
-        {
-            size_t __nmemb = static_cast<size_t>(this->pptr() - this->pbase());
-            if (fwrite(this->pbase(), sizeof(char_type), __nmemb, __file_) != __nmemb)
-                return traits_type::eof();
-        }
-        else
-        {
-            char* __extbe = __extbuf_;
-            codecvt_base::result __r;
-            do
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (!__cv_)
-                    throw bad_cast();
-#endif
-                const char_type* __e;
-                __r = __cv_->out(__st_, this->pbase(), this->pptr(), __e,
-                                        __extbuf_, __extbuf_ + __ebs_, __extbe);
-                if (__e == this->pbase())
-                    return traits_type::eof();
-                if (__r == codecvt_base::noconv)
-                {
-                    size_t __nmemb = static_cast<size_t>(this->pptr() - this->pbase());
-                    if (fwrite(this->pbase(), 1, __nmemb, __file_) != __nmemb)
-                        return traits_type::eof();
-                }
-                else if (__r == codecvt_base::ok || __r == codecvt_base::partial)
-                {
-                    size_t __nmemb = static_cast<size_t>(__extbe - __extbuf_);
-                    if (fwrite(__extbuf_, 1, __nmemb, __file_) != __nmemb)
-                        return traits_type::eof();
-                    if (__r == codecvt_base::partial)
-                    {
-                        this->setp((char_type*)__e, this->pptr());
-                        this->pbump(this->epptr() - this->pbase());
-                    }
-                }
-                else
-                    return traits_type::eof();
-            } while (__r == codecvt_base::partial);
-        }
-        this->setp(__pb_save, __epb_save);
-    }
-    return traits_type::not_eof(__c);
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>*
-basic_filebuf<_CharT, _Traits>::setbuf(char_type* __s, streamsize __n)
-{
-    this->setg(0, 0, 0);
-    this->setp(0, 0);
-    if (__owns_eb_)
-        delete [] __extbuf_;
-    if (__owns_ib_)
-        delete [] __intbuf_;
-    __ebs_ = __n;
-    if (__ebs_ > sizeof(__extbuf_min_))
-    {
-        if (__always_noconv_ && __s)
-        {
-            __extbuf_ = (char*)__s;
-            __owns_eb_ = false;
-        }
-        else
-        {
-            __extbuf_ = new char[__ebs_];
-            __owns_eb_ = true;
-        }
-    }
-    else
-    {
-        __extbuf_ = __extbuf_min_;
-        __ebs_ = sizeof(__extbuf_min_);
-        __owns_eb_ = false;
-    }
-    if (!__always_noconv_)
-    {
-        __ibs_ = max<streamsize>(__n, sizeof(__extbuf_min_));
-        if (__s && __ibs_ >= sizeof(__extbuf_min_))
-        {
-            __intbuf_ = __s;
-            __owns_ib_ = false;
-        }
-        else
-        {
-            __intbuf_ = new char_type[__ibs_];
-            __owns_ib_ = true;
-        }
-    }
-    else
-    {
-        __ibs_ = 0;
-        __intbuf_ = 0;
-        __owns_ib_ = false;
-    }
-    return this;
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::pos_type
-basic_filebuf<_CharT, _Traits>::seekoff(off_type __off, ios_base::seekdir __way,
-                                        ios_base::openmode)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!__cv_)
-        throw bad_cast();
-#endif
-    int __width = __cv_->encoding();
-    if (__file_ == 0 || (__width <= 0 && __off != 0) || sync())
-        return pos_type(off_type(-1));
-    // __width > 0 || __off == 0
-    int __whence;
-    switch (__way)
-    {
-    case ios_base::beg:
-        __whence = SEEK_SET;
-        break;
-    case ios_base::cur:
-        __whence = SEEK_CUR;
-        break;
-    case ios_base::end:
-        __whence = SEEK_END;
-        break;
-    default:
-        return pos_type(off_type(-1));
-    }
-#if _WIN32
-    if (fseek(__file_, __width > 0 ? __width * __off : 0, __whence))
-        return pos_type(off_type(-1));
-    pos_type __r = ftell(__file_);
-#else
-    if (fseeko(__file_, __width > 0 ? __width * __off : 0, __whence))
-        return pos_type(off_type(-1));
-    pos_type __r = ftello(__file_);
-#endif
-    __r.state(__st_);
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::pos_type
-basic_filebuf<_CharT, _Traits>::seekpos(pos_type __sp, ios_base::openmode)
-{
-    if (__file_ == 0 || sync())
-        return pos_type(off_type(-1));
-#if _WIN32
-    if (fseek(__file_, __sp, SEEK_SET))
-        return pos_type(off_type(-1));
-#else
-    if (fseeko(__file_, __sp, SEEK_SET))
-        return pos_type(off_type(-1));
-#endif
-    __st_ = __sp.state();
-    return __sp;
-}
-
-template <class _CharT, class _Traits>
-int
-basic_filebuf<_CharT, _Traits>::sync()
-{
-    if (__file_ == 0)
-        return 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!__cv_)
-        throw bad_cast();
-#endif
-    if (__cm_ & ios_base::out)
-    {
-        if (this->pptr() != this->pbase())
-            if (overflow() == traits_type::eof())
-                return -1;
-        codecvt_base::result __r;
-        do
-        {
-            char* __extbe;
-            __r = __cv_->unshift(__st_, __extbuf_, __extbuf_ + __ebs_, __extbe);
-            size_t __nmemb = static_cast<size_t>(__extbe - __extbuf_);
-            if (fwrite(__extbuf_, 1, __nmemb, __file_) != __nmemb)
-                return -1;
-        } while (__r == codecvt_base::partial);
-        if (__r == codecvt_base::error)
-            return -1;
-        if (fflush(__file_))
-            return -1;
-    }
-    else if (__cm_ & ios_base::in)
-    {
-        off_type __c;
-        state_type __state = __st_last_;
-        bool __update_st = false;
-        if (__always_noconv_)
-            __c = this->egptr() - this->gptr();
-        else
-        {
-            int __width = __cv_->encoding();
-            __c = __extbufend_ - __extbufnext_;
-            if (__width > 0)
-                __c += __width * (this->egptr() - this->gptr());
-            else
-            {
-                if (this->gptr() != this->egptr())
-                {
-                    const int __off =  __cv_->length(__state, __extbuf_,
-                                                     __extbufnext_,
-                                                     this->gptr() - this->eback());
-                    __c += __extbufnext_ - __extbuf_ - __off;
-                    __update_st = true;
-                }
-            }
-        }
-#if _WIN32
-        if (fseek(__file_, -__c, SEEK_CUR))
-            return -1;
-#else
-        if (fseeko(__file_, -__c, SEEK_CUR))
-            return -1;
-#endif
-        if (__update_st)
-            __st_ = __state;
-        __extbufnext_ = __extbufend_ = __extbuf_;
-        this->setg(0, 0, 0);
-        __cm_ = 0;
-    }
-    return 0;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_filebuf<_CharT, _Traits>::imbue(const locale& __loc)
-{
-    sync();
-    __cv_ = &use_facet<codecvt<char_type, char, state_type> >(__loc);
-    bool __old_anc = __always_noconv_;
-    __always_noconv_ = __cv_->always_noconv();
-    if (__old_anc != __always_noconv_)
-    {
-        this->setg(0, 0, 0);
-        this->setp(0, 0);
-        // invariant, char_type is char, else we couldn't get here
-        if (__always_noconv_)  // need to dump __intbuf_
-        {
-            if (__owns_eb_)
-                delete [] __extbuf_;
-            __owns_eb_ = __owns_ib_;
-            __ebs_ = __ibs_;
-            __extbuf_ = (char*)__intbuf_;
-            __ibs_ = 0;
-            __intbuf_ = 0;
-            __owns_ib_ = false;
-        }
-        else  // need to obtain an __intbuf_.
-        {     // If __extbuf_ is user-supplied, use it, else new __intbuf_
-            if (!__owns_eb_ && __extbuf_ != __extbuf_min_)
-            {
-                __ibs_ = __ebs_;
-                __intbuf_ = (char_type*)__extbuf_;
-                __owns_ib_ = false;
-                __extbuf_ = new char[__ebs_];
-                __owns_eb_ = true;
-            }
-            else
-            {
-                __ibs_ = __ebs_;
-                __intbuf_ = new char_type[__ibs_];
-                __owns_ib_ = true;
-            }
-        }
-    }
-}
-
-template <class _CharT, class _Traits>
-bool
-basic_filebuf<_CharT, _Traits>::__read_mode()
-{
-    if (!(__cm_ & ios_base::in))
-    {
-        this->setp(0, 0);
-        if (__always_noconv_)
-            this->setg((char_type*)__extbuf_,
-                       (char_type*)__extbuf_ + __ebs_,
-                       (char_type*)__extbuf_ + __ebs_);
-        else
-            this->setg(__intbuf_, __intbuf_ + __ibs_, __intbuf_ + __ibs_);
-        __cm_ = ios_base::in;
-        return true;
-    }
-    return false;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_filebuf<_CharT, _Traits>::__write_mode()
-{
-    if (!(__cm_ & ios_base::out))
-    {
-        this->setg(0, 0, 0);
-        if (__ebs_ > sizeof(__extbuf_min_))
-        {
-            if (__always_noconv_)
-                this->setp((char_type*)__extbuf_,
-                           (char_type*)__extbuf_ + (__ebs_ - 1));
-            else
-                this->setp(__intbuf_, __intbuf_ + (__ibs_ - 1));
-        }
-        else
-            this->setp(0, 0);
-        __cm_ = ios_base::out;
-    }
-}
-
-// basic_ifstream
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ifstream
-    : public basic_istream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_ifstream();
-    explicit basic_ifstream(const char* __s, ios_base::openmode __mode = ios_base::in);
-    explicit basic_ifstream(const string& __s, ios_base::openmode __mode = ios_base::in);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ifstream(basic_ifstream&& __rhs);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ifstream& operator=(basic_ifstream&& __rhs);
-#endif
-    void swap(basic_ifstream& __rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* __s, ios_base::openmode __mode = ios_base::in);
-    void open(const string& __s, ios_base::openmode __mode = ios_base::in);
-    void close();
-
-private:
-    basic_filebuf<char_type, traits_type> __sb_;
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>::basic_ifstream()
-    : basic_istream<char_type, traits_type>(&__sb_)
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>::basic_ifstream(const char* __s, ios_base::openmode __mode)
-    : basic_istream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode | ios_base::in) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>::basic_ifstream(const string& __s, ios_base::openmode __mode)
-    : basic_istream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode | ios_base::in) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>::basic_ifstream(basic_ifstream&& __rhs)
-    : basic_istream<char_type, traits_type>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    this->set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>&
-basic_ifstream<_CharT, _Traits>::operator=(basic_ifstream&& __rhs)
-{
-    basic_istream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ifstream<_CharT, _Traits>::swap(basic_ifstream& __rhs)
-{
-    basic_istream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_ifstream<_CharT, _Traits>& __x, basic_ifstream<_CharT, _Traits>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>*
-basic_ifstream<_CharT, _Traits>::rdbuf() const
-{
-    return const_cast<basic_filebuf<char_type, traits_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_ifstream<_CharT, _Traits>::is_open() const
-{
-    return __sb_.is_open();
-}
-
-template <class _CharT, class _Traits>
-void
-basic_ifstream<_CharT, _Traits>::open(const char* __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode | ios_base::in))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-void
-basic_ifstream<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode | ios_base::in))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ifstream<_CharT, _Traits>::close()
-{
-    if (__sb_.close() == 0)
-        this->setstate(ios_base::failbit);
-}
-
-// basic_ofstream
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ofstream
-    : public basic_ostream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_ofstream();
-    explicit basic_ofstream(const char* __s, ios_base::openmode __mode = ios_base::out);
-    explicit basic_ofstream(const string& __s, ios_base::openmode __mode = ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ofstream(basic_ofstream&& __rhs);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ofstream& operator=(basic_ofstream&& __rhs);
-#endif
-    void swap(basic_ofstream& __rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* __s, ios_base::openmode __mode = ios_base::out);
-    void open(const string& __s, ios_base::openmode __mode = ios_base::out);
-    void close();
-
-private:
-    basic_filebuf<char_type, traits_type> __sb_;
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>::basic_ofstream()
-    : basic_ostream<char_type, traits_type>(&__sb_)
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>::basic_ofstream(const char* __s, ios_base::openmode __mode)
-    : basic_ostream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode | ios_base::out) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>::basic_ofstream(const string& __s, ios_base::openmode __mode)
-    : basic_ostream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode | ios_base::out) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>::basic_ofstream(basic_ofstream&& __rhs)
-    : basic_ostream<char_type, traits_type>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    this->set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>&
-basic_ofstream<_CharT, _Traits>::operator=(basic_ofstream&& __rhs)
-{
-    basic_ostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ofstream<_CharT, _Traits>::swap(basic_ofstream& __rhs)
-{
-    basic_ostream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_ofstream<_CharT, _Traits>& __x, basic_ofstream<_CharT, _Traits>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>*
-basic_ofstream<_CharT, _Traits>::rdbuf() const
-{
-    return const_cast<basic_filebuf<char_type, traits_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_ofstream<_CharT, _Traits>::is_open() const
-{
-    return __sb_.is_open();
-}
-
-template <class _CharT, class _Traits>
-void
-basic_ofstream<_CharT, _Traits>::open(const char* __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode | ios_base::out))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-void
-basic_ofstream<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode | ios_base::out))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ofstream<_CharT, _Traits>::close()
-{
-    if (__sb_.close() == 0)
-        this->setstate(ios_base::failbit);
-}
-
-// basic_fstream
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_fstream
-    : public basic_iostream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_fstream();
-    explicit basic_fstream(const char* __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
-    explicit basic_fstream(const string& __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_fstream(basic_fstream&& __rhs);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_fstream& operator=(basic_fstream&& __rhs);
-#endif
-    void swap(basic_fstream& __rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
-    void open(const string& __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
-    void close();
-
-private:
-    basic_filebuf<char_type, traits_type> __sb_;
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>::basic_fstream()
-    : basic_iostream<char_type, traits_type>(&__sb_)
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>::basic_fstream(const char* __s, ios_base::openmode __mode)
-    : basic_iostream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>::basic_fstream(const string& __s, ios_base::openmode __mode)
-    : basic_iostream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>::basic_fstream(basic_fstream&& __rhs)
-    : basic_iostream<char_type, traits_type>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    this->set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>&
-basic_fstream<_CharT, _Traits>::operator=(basic_fstream&& __rhs)
-{
-    basic_iostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_fstream<_CharT, _Traits>::swap(basic_fstream& __rhs)
-{
-    basic_iostream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_fstream<_CharT, _Traits>& __x, basic_fstream<_CharT, _Traits>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>*
-basic_fstream<_CharT, _Traits>::rdbuf() const
-{
-    return const_cast<basic_filebuf<char_type, traits_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_fstream<_CharT, _Traits>::is_open() const
-{
-    return __sb_.is_open();
-}
-
-template <class _CharT, class _Traits>
-void
-basic_fstream<_CharT, _Traits>::open(const char* __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-void
-basic_fstream<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_fstream<_CharT, _Traits>::close()
-{
-    if (__sb_.close() == 0)
-        this->setstate(ios_base::failbit);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_FSTREAM
diff --git a/include.new/c++/v1/functional b/include.new/c++/v1/functional
deleted file mode 100644
index d14b46b..0000000
--- a/include.new/c++/v1/functional
+++ /dev/null
@@ -1,2419 +0,0 @@
-// -*- C++ -*-
-//===------------------------ functional ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUNCTIONAL
-#define _LIBCPP_FUNCTIONAL
-
-/*
-    functional synopsis
-
-namespace std
-{
-
-template <class Arg, class Result>
-struct unary_function
-{
-    typedef Arg    argument_type;
-    typedef Result result_type;
-};
-
-template <class Arg1, class Arg2, class Result>
-struct binary_function
-{
-    typedef Arg1   first_argument_type;
-    typedef Arg2   second_argument_type;
-    typedef Result result_type;
-};
-
-template <class T>
-class reference_wrapper
-    : public unary_function<T1, R> // if wrapping a unary functor
-    : public binary_function<T1, T2, R> // if wraping a binary functor
-{
-public:
-    // types
-    typedef T type;
-    typedef see below result_type; // Not always defined
-
-    // construct/copy/destroy
-    reference_wrapper(T&) noexcept;
-    reference_wrapper(T&&) = delete; // do not bind to temps
-    reference_wrapper(const reference_wrapper<T>& x) noexcept;
-
-    // assignment
-    reference_wrapper& operator=(const reference_wrapper<T>& x) noexcept;
-
-    // access
-    operator T& () const noexcept;
-    T& get() const noexcept;
-
-    // invoke
-    template <class... ArgTypes>
-      typename result_of<T&(ArgTypes&&...)>::type
-          operator() (ArgTypes&&...) const;
-};
-
-template <class T> reference_wrapper<T> ref(T& t) noexcept;
-template <class T> void ref(const T&& t) = delete;
-template <class T> reference_wrapper<T> ref(reference_wrapper<T>t) noexcept;
-
-template <class T> reference_wrapper<const T> cref(const T& t) noexcept;
-template <class T> void cref(const T&& t) = delete;
-template <class T> reference_wrapper<const T> cref(reference_wrapper<T> t) noexcept;
-
-template <class T> // <class T=void> in C++14
-struct plus : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct minus : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct multiplies : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct divides : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct modulus : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct negate : unary_function<T, T>
-{
-    T operator()(const T& x) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct equal_to : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct not_equal_to : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct greater : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct less : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct greater_equal : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct less_equal : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct logical_and : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct logical_or : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct logical_not : unary_function<T, bool>
-{
-    bool operator()(const T& x) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct bit_and : unary_function<T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct bit_or : unary_function<T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct bit_xor : unary_function<T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T=void> // C++14
-struct bit_xor : unary_function<T, bool>
-{
-    bool operator()(const T& x) const;
-};
-
-template <class Predicate>
-class unary_negate
-    : public unary_function<typename Predicate::argument_type, bool>
-{
-public:
-    explicit unary_negate(const Predicate& pred);
-    bool operator()(const typename Predicate::argument_type& x) const;
-};
-
-template <class Predicate> unary_negate<Predicate> not1(const Predicate& pred);
-
-template <class Predicate>
-class binary_negate
-    : public binary_function<typename Predicate::first_argument_type,
-                             typename Predicate::second_argument_type,
-                             bool>
-{
-public:
-    explicit binary_negate(const Predicate& pred);
-    bool operator()(const typename Predicate::first_argument_type& x,
-                    const typename Predicate::second_argument_type& y) const;
-};
-
-template <class Predicate> binary_negate<Predicate> not2(const Predicate& pred);
-
-template<class T> struct is_bind_expression;
-template<class T> struct is_placeholder;
-
-template<class Fn, class... BoundArgs>
-  unspecified bind(Fn&&, BoundArgs&&...);
-template<class R, class Fn, class... BoundArgs>
-  unspecified bind(Fn&&, BoundArgs&&...);
-
-namespace placeholders {
-  // M is the implementation-defined number of placeholders
-  extern unspecified _1;
-  extern unspecified _2;
-  .
-  .
-  .
-  extern unspecified _Mp;
-}
-
-template <class Operation>
-class binder1st
-    : public unary_function<typename Operation::second_argument_type,
-                            typename Operation::result_type>
-{
-protected:
-    Operation                               op;
-    typename Operation::first_argument_type value;
-public:
-    binder1st(const Operation& x, const typename Operation::first_argument_type y);
-    typename Operation::result_type operator()(      typename Operation::second_argument_type& x) const;
-    typename Operation::result_type operator()(const typename Operation::second_argument_type& x) const;
-};
-
-template <class Operation, class T>
-binder1st<Operation> bind1st(const Operation& op, const T& x);
-
-template <class Operation>
-class binder2nd
-    : public unary_function<typename Operation::first_argument_type,
-                            typename Operation::result_type>
-{
-protected:
-    Operation                                op;
-    typename Operation::second_argument_type value;
-public:
-    binder2nd(const Operation& x, const typename Operation::second_argument_type y);
-    typename Operation::result_type operator()(      typename Operation::first_argument_type& x) const;
-    typename Operation::result_type operator()(const typename Operation::first_argument_type& x) const;
-};
-
-template <class Operation, class T>
-binder2nd<Operation> bind2nd(const Operation& op, const T& x);
-
-template <class Arg, class Result>
-class pointer_to_unary_function : public unary_function<Arg, Result>
-{
-public:
-    explicit pointer_to_unary_function(Result (*f)(Arg));
-    Result operator()(Arg x) const;
-};
-
-template <class Arg, class Result>
-pointer_to_unary_function<Arg,Result> ptr_fun(Result (*f)(Arg));
-
-template <class Arg1, class Arg2, class Result>
-class pointer_to_binary_function : public binary_function<Arg1, Arg2, Result>
-{
-public:
-    explicit pointer_to_binary_function(Result (*f)(Arg1, Arg2));
-    Result operator()(Arg1 x, Arg2 y) const;
-};
-
-template <class Arg1, class Arg2, class Result>
-pointer_to_binary_function<Arg1,Arg2,Result> ptr_fun(Result (*f)(Arg1,Arg2));
-
-template<class S, class T>
-class mem_fun_t : public unary_function<T*, S>
-{
-public:
-    explicit mem_fun_t(S (T::*p)());
-    S operator()(T* p) const;
-};
-
-template<class S, class T, class A>
-class mem_fun1_t : public binary_function<T*, A, S>
-{
-public:
-    explicit mem_fun1_t(S (T::*p)(A));
-    S operator()(T* p, A x) const;
-};
-
-template<class S, class T>          mem_fun_t<S,T>    mem_fun(S (T::*f)());
-template<class S, class T, class A> mem_fun1_t<S,T,A> mem_fun(S (T::*f)(A));
-
-template<class S, class T>
-class mem_fun_ref_t : public unary_function<T, S>
-{
-public:
-    explicit mem_fun_ref_t(S (T::*p)());
-    S operator()(T& p) const;
-};
-
-template<class S, class T, class A>
-class mem_fun1_ref_t : public binary_function<T, A, S>
-{
-public:
-    explicit mem_fun1_ref_t(S (T::*p)(A));
-    S operator()(T& p, A x) const;
-};
-
-template<class S, class T>          mem_fun_ref_t<S,T>    mem_fun_ref(S (T::*f)());
-template<class S, class T, class A> mem_fun1_ref_t<S,T,A> mem_fun_ref(S (T::*f)(A));
-
-template <class S, class T>
-class const_mem_fun_t : public unary_function<const T*, S>
-{
-public:
-    explicit const_mem_fun_t(S (T::*p)() const);
-    S operator()(const T* p) const;
-};
-
-template <class S, class T, class A>
-class const_mem_fun1_t : public binary_function<const T*, A, S>
-{
-public:
-    explicit const_mem_fun1_t(S (T::*p)(A) const);
-    S operator()(const T* p, A x) const;
-};
-
-template <class S, class T>          const_mem_fun_t<S,T>    mem_fun(S (T::*f)() const);
-template <class S, class T, class A> const_mem_fun1_t<S,T,A> mem_fun(S (T::*f)(A) const);
-
-template <class S, class T>
-class const_mem_fun_ref_t : public unary_function<T, S>
-{
-public:
-    explicit const_mem_fun_ref_t(S (T::*p)() const);
-    S operator()(const T& p) const;
-};
-
-template <class S, class T, class A>
-class const_mem_fun1_ref_t : public binary_function<T, A, S>
-{
-public:
-    explicit const_mem_fun1_ref_t(S (T::*p)(A) const);
-    S operator()(const T& p, A x) const;
-};
-
-template <class S, class T>          const_mem_fun_ref_t<S,T>    mem_fun_ref(S (T::*f)() const);
-template <class S, class T, class A> const_mem_fun1_ref_t<S,T,A> mem_fun_ref(S (T::*f)(A) const);
-
-template<class R, class T> unspecified mem_fn(R T::*);
-
-class bad_function_call
-    : public exception
-{
-};
-
-template<class> class function; // undefined
-
-template<class R, class... ArgTypes>
-class function<R(ArgTypes...)>
-  : public unary_function<T1, R>      // iff sizeof...(ArgTypes) == 1 and
-                                      // ArgTypes contains T1
-  : public binary_function<T1, T2, R> // iff sizeof...(ArgTypes) == 2 and
-                                      // ArgTypes contains T1 and T2
-{
-public:
-    typedef R result_type;
-
-    // construct/copy/destroy:
-    function() noexcept;
-    function(nullptr_t) noexcept;
-    function(const function&);
-    function(function&&) noexcept;
-    template<class F>
-      function(F);
-    template<Allocator Alloc>
-      function(allocator_arg_t, const Alloc&) noexcept;
-    template<Allocator Alloc>
-      function(allocator_arg_t, const Alloc&, nullptr_t) noexcept;
-    template<Allocator Alloc>
-      function(allocator_arg_t, const Alloc&, const function&);
-    template<Allocator Alloc>
-      function(allocator_arg_t, const Alloc&, function&&);
-    template<class F, Allocator Alloc>
-      function(allocator_arg_t, const Alloc&, F);
-
-    function& operator=(const function&);
-    function& operator=(function&&) noexcept;
-    function& operator=(nullptr_t) noexcept;
-    template<class F>
-      function& operator=(F&&);
-    template<class F>
-      function& operator=(reference_wrapper<F>) noexcept;
-
-    ~function();
-
-    // function modifiers:
-    void swap(function&) noexcept;
-    template<class F, class Alloc>
-      void assign(F&&, const Alloc&);
-
-    // function capacity:
-    explicit operator bool() const noexcept;
-
-    // function invocation:
-    R operator()(ArgTypes...) const;
-
-    // function target access:
-    const std::type_info& target_type() const noexcept;
-    template <typename T>       T* target() noexcept;
-    template <typename T> const T* target() const noexcept;
-};
-
-// Null pointer comparisons:
-template <class R, class ... ArgTypes>
-  bool operator==(const function<R(ArgTypes...)>&, nullptr_t) noexcept;
-
-template <class R, class ... ArgTypes>
-  bool operator==(nullptr_t, const function<R(ArgTypes...)>&) noexcept;
-
-template <class R, class ... ArgTypes>
-  bool operator!=(const function<R(ArgTypes...)>&, nullptr_t) noexcept;
-
-template <class  R, class ... ArgTypes>
-  bool operator!=(nullptr_t, const function<R(ArgTypes...)>&) noexcept;
-
-// specialized algorithms:
-template <class  R, class ... ArgTypes>
-  void swap(function<R(ArgTypes...)>&, function<R(ArgTypes...)>&) noexcept;
-
-template <class T> struct hash;
-
-template <> struct hash<bool>;
-template <> struct hash<char>;
-template <> struct hash<signed char>;
-template <> struct hash<unsigned char>;
-template <> struct hash<char16_t>;
-template <> struct hash<char32_t>;
-template <> struct hash<wchar_t>;
-template <> struct hash<short>;
-template <> struct hash<unsigned short>;
-template <> struct hash<int>;
-template <> struct hash<unsigned int>;
-template <> struct hash<long>;
-template <> struct hash<long long>;
-template <> struct hash<unsigned long>;
-template <> struct hash<unsigned long long>;
-
-template <> struct hash<float>;
-template <> struct hash<double>;
-template <> struct hash<long double>;
-
-template<class T> struct hash<T*>;
-
-}  // std
-
-POLICY:  For non-variadic implementations, the number of arguments is limited
-         to 3.  It is hoped that the need for non-variadic implementations
-         will be minimal.
-
-*/
-
-#include <__config>
-#include <type_traits>
-#include <typeinfo>
-#include <exception>
-#include <memory>
-#include <tuple>
-
-#include <__functional_base>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY plus : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x + __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY plus<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) + _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY minus : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x - __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY minus<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) - _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY multiplies : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x * __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY multiplies<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) * _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY divides : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x / __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY divides<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) / _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY modulus : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x % __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY modulus<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) % _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY negate : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return -__x;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY negate<void>
-{
-    template <class _Tp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_Tp&& __x) const
-        { return -_VSTD::forward<_Tp>(__x); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY equal_to : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x == __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY equal_to<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) == _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY not_equal_to : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x != __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY not_equal_to<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) != _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY greater : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x > __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY greater<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) > _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-// less in <__functional_base>
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY greater_equal : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x >= __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY greater_equal<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) >= _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY less_equal : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x <= __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY less_equal<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) <= _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY logical_and : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x && __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY logical_and<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) && _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY logical_or : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x || __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY logical_or<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) || _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY logical_not : unary_function<_Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x) const
-        {return !__x;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY logical_not<void>
-{
-    template <class _Tp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_Tp&& __x) const
-        { return !_VSTD::forward<_Tp>(__x); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY bit_and : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x & __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY bit_and<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) & _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY bit_or : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x | __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY bit_or<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) | _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY bit_xor : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x ^ __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY bit_xor<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) ^ _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-struct _LIBCPP_TYPE_VIS_ONLY bit_not : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return ~__x;}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY bit_not<void>
-{
-    template <class _Tp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_Tp&& __x) const
-        { return ~_VSTD::forward<_Tp>(__x); }
-    typedef void is_transparent;
-};
-#endif
-
-template <class _Predicate>
-class _LIBCPP_TYPE_VIS_ONLY unary_negate
-    : public unary_function<typename _Predicate::argument_type, bool>
-{
-    _Predicate __pred_;
-public:
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    explicit unary_negate(const _Predicate& __pred)
-        : __pred_(__pred) {}
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const typename _Predicate::argument_type& __x) const
-        {return !__pred_(__x);}
-};
-
-template <class _Predicate>
-inline _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-unary_negate<_Predicate>
-not1(const _Predicate& __pred) {return unary_negate<_Predicate>(__pred);}
-
-template <class _Predicate>
-class _LIBCPP_TYPE_VIS_ONLY binary_negate
-    : public binary_function<typename _Predicate::first_argument_type,
-                             typename _Predicate::second_argument_type,
-                             bool>
-{
-    _Predicate __pred_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit _LIBCPP_CONSTEXPR_AFTER_CXX11 
-    binary_negate(const _Predicate& __pred) : __pred_(__pred) {}
-
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const typename _Predicate::first_argument_type& __x,
-                    const typename _Predicate::second_argument_type& __y) const
-        {return !__pred_(__x, __y);}
-};
-
-template <class _Predicate>
-inline _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-binary_negate<_Predicate>
-not2(const _Predicate& __pred) {return binary_negate<_Predicate>(__pred);}
-
-template <class __Operation>
-class _LIBCPP_TYPE_VIS_ONLY binder1st
-    : public unary_function<typename __Operation::second_argument_type,
-                            typename __Operation::result_type>
-{
-protected:
-    __Operation                               op;
-    typename __Operation::first_argument_type value;
-public:
-    _LIBCPP_INLINE_VISIBILITY binder1st(const __Operation& __x,
-                               const typename __Operation::first_argument_type __y)
-        : op(__x), value(__y) {}
-    _LIBCPP_INLINE_VISIBILITY typename __Operation::result_type operator()
-        (typename __Operation::second_argument_type& __x) const
-            {return op(value, __x);}
-    _LIBCPP_INLINE_VISIBILITY typename __Operation::result_type operator()
-        (const typename __Operation::second_argument_type& __x) const
-            {return op(value, __x);}
-};
-
-template <class __Operation, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-binder1st<__Operation>
-bind1st(const __Operation& __op, const _Tp& __x)
-    {return binder1st<__Operation>(__op, __x);}
-
-template <class __Operation>
-class _LIBCPP_TYPE_VIS_ONLY binder2nd
-    : public unary_function<typename __Operation::first_argument_type,
-                            typename __Operation::result_type>
-{
-protected:
-    __Operation                                op;
-    typename __Operation::second_argument_type value;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    binder2nd(const __Operation& __x, const typename __Operation::second_argument_type __y)
-        : op(__x), value(__y) {}
-    _LIBCPP_INLINE_VISIBILITY typename __Operation::result_type operator()
-        (      typename __Operation::first_argument_type& __x) const
-            {return op(__x, value);}
-    _LIBCPP_INLINE_VISIBILITY typename __Operation::result_type operator()
-        (const typename __Operation::first_argument_type& __x) const
-            {return op(__x, value);}
-};
-
-template <class __Operation, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-binder2nd<__Operation>
-bind2nd(const __Operation& __op, const _Tp& __x)
-    {return binder2nd<__Operation>(__op, __x);}
-
-template <class _Arg, class _Result>
-class _LIBCPP_TYPE_VIS_ONLY pointer_to_unary_function
-    : public unary_function<_Arg, _Result>
-{
-    _Result (*__f_)(_Arg);
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit pointer_to_unary_function(_Result (*__f)(_Arg))
-        : __f_(__f) {}
-    _LIBCPP_INLINE_VISIBILITY _Result operator()(_Arg __x) const
-        {return __f_(__x);}
-};
-
-template <class _Arg, class _Result>
-inline _LIBCPP_INLINE_VISIBILITY
-pointer_to_unary_function<_Arg,_Result>
-ptr_fun(_Result (*__f)(_Arg))
-    {return pointer_to_unary_function<_Arg,_Result>(__f);}
-
-template <class _Arg1, class _Arg2, class _Result>
-class _LIBCPP_TYPE_VIS_ONLY pointer_to_binary_function
-    : public binary_function<_Arg1, _Arg2, _Result>
-{
-    _Result (*__f_)(_Arg1, _Arg2);
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit pointer_to_binary_function(_Result (*__f)(_Arg1, _Arg2))
-        : __f_(__f) {}
-    _LIBCPP_INLINE_VISIBILITY _Result operator()(_Arg1 __x, _Arg2 __y) const
-        {return __f_(__x, __y);}
-};
-
-template <class _Arg1, class _Arg2, class _Result>
-inline _LIBCPP_INLINE_VISIBILITY
-pointer_to_binary_function<_Arg1,_Arg2,_Result>
-ptr_fun(_Result (*__f)(_Arg1,_Arg2))
-    {return pointer_to_binary_function<_Arg1,_Arg2,_Result>(__f);}
-
-template<class _Sp, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY mem_fun_t : public unary_function<_Tp*, _Sp>
-{
-    _Sp (_Tp::*__p_)();
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit mem_fun_t(_Sp (_Tp::*__p)())
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(_Tp* __p) const
-        {return (__p->*__p_)();}
-};
-
-template<class _Sp, class _Tp, class _Ap>
-class _LIBCPP_TYPE_VIS_ONLY mem_fun1_t : public binary_function<_Tp*, _Ap, _Sp>
-{
-    _Sp (_Tp::*__p_)(_Ap);
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit mem_fun1_t(_Sp (_Tp::*__p)(_Ap))
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(_Tp* __p, _Ap __x) const
-        {return (__p->*__p_)(__x);}
-};
-
-template<class _Sp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-mem_fun_t<_Sp,_Tp>
-mem_fun(_Sp (_Tp::*__f)())
-    {return mem_fun_t<_Sp,_Tp>(__f);}
-
-template<class _Sp, class _Tp, class _Ap>
-inline _LIBCPP_INLINE_VISIBILITY
-mem_fun1_t<_Sp,_Tp,_Ap>
-mem_fun(_Sp (_Tp::*__f)(_Ap))
-    {return mem_fun1_t<_Sp,_Tp,_Ap>(__f);}
-
-template<class _Sp, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY mem_fun_ref_t : public unary_function<_Tp, _Sp>
-{
-    _Sp (_Tp::*__p_)();
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit mem_fun_ref_t(_Sp (_Tp::*__p)())
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(_Tp& __p) const
-        {return (__p.*__p_)();}
-};
-
-template<class _Sp, class _Tp, class _Ap>
-class _LIBCPP_TYPE_VIS_ONLY mem_fun1_ref_t : public binary_function<_Tp, _Ap, _Sp>
-{
-    _Sp (_Tp::*__p_)(_Ap);
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit mem_fun1_ref_t(_Sp (_Tp::*__p)(_Ap))
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(_Tp& __p, _Ap __x) const
-        {return (__p.*__p_)(__x);}
-};
-
-template<class _Sp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-mem_fun_ref_t<_Sp,_Tp>
-mem_fun_ref(_Sp (_Tp::*__f)())
-    {return mem_fun_ref_t<_Sp,_Tp>(__f);}
-
-template<class _Sp, class _Tp, class _Ap>
-inline _LIBCPP_INLINE_VISIBILITY
-mem_fun1_ref_t<_Sp,_Tp,_Ap>
-mem_fun_ref(_Sp (_Tp::*__f)(_Ap))
-    {return mem_fun1_ref_t<_Sp,_Tp,_Ap>(__f);}
-
-template <class _Sp, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY const_mem_fun_t : public unary_function<const _Tp*, _Sp>
-{
-    _Sp (_Tp::*__p_)() const;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit const_mem_fun_t(_Sp (_Tp::*__p)() const)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(const _Tp* __p) const
-        {return (__p->*__p_)();}
-};
-
-template <class _Sp, class _Tp, class _Ap>
-class _LIBCPP_TYPE_VIS_ONLY const_mem_fun1_t : public binary_function<const _Tp*, _Ap, _Sp>
-{
-    _Sp (_Tp::*__p_)(_Ap) const;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit const_mem_fun1_t(_Sp (_Tp::*__p)(_Ap) const)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(const _Tp* __p, _Ap __x) const
-        {return (__p->*__p_)(__x);}
-};
-
-template <class _Sp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const_mem_fun_t<_Sp,_Tp>
-mem_fun(_Sp (_Tp::*__f)() const)
-    {return const_mem_fun_t<_Sp,_Tp>(__f);}
-
-template <class _Sp, class _Tp, class _Ap>
-inline _LIBCPP_INLINE_VISIBILITY
-const_mem_fun1_t<_Sp,_Tp,_Ap>
-mem_fun(_Sp (_Tp::*__f)(_Ap) const)
-    {return const_mem_fun1_t<_Sp,_Tp,_Ap>(__f);}
-
-template <class _Sp, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY const_mem_fun_ref_t : public unary_function<_Tp, _Sp>
-{
-    _Sp (_Tp::*__p_)() const;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit const_mem_fun_ref_t(_Sp (_Tp::*__p)() const)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(const _Tp& __p) const
-        {return (__p.*__p_)();}
-};
-
-template <class _Sp, class _Tp, class _Ap>
-class _LIBCPP_TYPE_VIS_ONLY const_mem_fun1_ref_t
-    : public binary_function<_Tp, _Ap, _Sp>
-{
-    _Sp (_Tp::*__p_)(_Ap) const;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit const_mem_fun1_ref_t(_Sp (_Tp::*__p)(_Ap) const)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(const _Tp& __p, _Ap __x) const
-        {return (__p.*__p_)(__x);}
-};
-
-template <class _Sp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const_mem_fun_ref_t<_Sp,_Tp>
-mem_fun_ref(_Sp (_Tp::*__f)() const)
-    {return const_mem_fun_ref_t<_Sp,_Tp>(__f);}
-
-template <class _Sp, class _Tp, class _Ap>
-inline _LIBCPP_INLINE_VISIBILITY
-const_mem_fun1_ref_t<_Sp,_Tp,_Ap>
-mem_fun_ref(_Sp (_Tp::*__f)(_Ap) const)
-    {return const_mem_fun1_ref_t<_Sp,_Tp,_Ap>(__f);}
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-#include <__functional_03>
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp>
-class __mem_fn
-    : public __weak_result_type<_Tp>
-{
-public:
-    // types
-    typedef _Tp type;
-private:
-    type __f_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY __mem_fn(type __f) : __f_(__f) {}
-
-    // invoke
-    template <class... _ArgTypes>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_return<type, _ArgTypes...>::type
-          operator() (_ArgTypes&&... __args) const
-          {
-              return __invoke(__f_, _VSTD::forward<_ArgTypes>(__args)...);
-          }
-};
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp _Tp::*>
-mem_fn(_Rp _Tp::* __pm)
-{
-    return __mem_fn<_Rp _Tp::*>(__pm);
-}
-
-// bad_function_call
-
-class _LIBCPP_EXCEPTION_ABI bad_function_call
-    : public exception
-{
-};
-
-template<class _Fp> class _LIBCPP_TYPE_VIS_ONLY function; // undefined
-
-namespace __function
-{
-
-template<class _Rp, class ..._ArgTypes>
-struct __maybe_derive_from_unary_function
-{
-};
-
-template<class _Rp, class _A1>
-struct __maybe_derive_from_unary_function<_Rp(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template<class _Rp, class ..._ArgTypes>
-struct __maybe_derive_from_binary_function
-{
-};
-
-template<class _Rp, class _A1, class _A2>
-struct __maybe_derive_from_binary_function<_Rp(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template<class _Fp> class __base;
-
-template<class _Rp, class ..._ArgTypes>
-class __base<_Rp(_ArgTypes...)>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    _LIBCPP_INLINE_VISIBILITY __base() {}
-    _LIBCPP_INLINE_VISIBILITY virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() _NOEXCEPT = 0;
-    virtual void destroy_deallocate() _NOEXCEPT = 0;
-    virtual _Rp operator()(_ArgTypes&& ...) = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const _NOEXCEPT = 0;
-    virtual const std::type_info& target_type() const _NOEXCEPT = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _FD, class _Alloc, class _FB> class __func;
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-class __func<_Fp, _Alloc, _Rp(_ArgTypes...)>
-    : public  __base<_Rp(_ArgTypes...)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __func(_Fp&& __f)
-        : __f_(piecewise_construct, _VSTD::forward_as_tuple(_VSTD::move(__f)),
-                                    _VSTD::forward_as_tuple()) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __func(const _Fp& __f, const _Alloc& __a)
-        : __f_(piecewise_construct, _VSTD::forward_as_tuple(__f),
-                                    _VSTD::forward_as_tuple(__a)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __func(const _Fp& __f, _Alloc&& __a)
-        : __f_(piecewise_construct, _VSTD::forward_as_tuple(__f),
-                                    _VSTD::forward_as_tuple(_VSTD::move(__a))) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __func(_Fp&& __f, _Alloc&& __a)
-        : __f_(piecewise_construct, _VSTD::forward_as_tuple(_VSTD::move(__f)),
-                                    _VSTD::forward_as_tuple(_VSTD::move(__a))) {}
-    virtual __base<_Rp(_ArgTypes...)>* __clone() const;
-    virtual void __clone(__base<_Rp(_ArgTypes...)>*) const;
-    virtual void destroy() _NOEXCEPT;
-    virtual void destroy_deallocate() _NOEXCEPT;
-    virtual _Rp operator()(_ArgTypes&& ... __arg);
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const _NOEXCEPT;
-    virtual const std::type_info& target_type() const _NOEXCEPT;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-__base<_Rp(_ArgTypes...)>*
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__clone(__base<_Rp(_ArgTypes...)>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy() _NOEXCEPT
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy_deallocate() _NOEXCEPT
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-_Rp
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::operator()(_ArgTypes&& ... __arg)
-{
-    return __invoke(__f_.first(), _VSTD::forward<_ArgTypes>(__arg)...);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-const void*
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::target(const type_info& __ti) const _NOEXCEPT
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::target_type() const _NOEXCEPT
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-}  // __function
-
-template<class _Rp, class ..._ArgTypes>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp(_ArgTypes...)>
-    : public __function::__maybe_derive_from_unary_function<_Rp(_ArgTypes...)>,
-      public __function::__maybe_derive_from_binary_function<_Rp(_ArgTypes...)>
-{
-    typedef __function::__base<_Rp(_ArgTypes...)> __base;
-    typename aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)(_Ap...)) {return __p;}
-    template <class _R2, class _Cp, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_Ap...)) {return __p;}
-    template <class _R2, class _Cp, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_Ap...) const) {return __p;}
-    template <class _R2, class _Cp, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_Ap...) volatile) {return __p;}
-    template <class _R2, class _Cp, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_Ap...) const volatile) {return __p;}
-    template <class _R2, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2(_Ap...)>& __p) {return !!__p;}
-
-    template <class _Fp, bool = !is_same<_Fp, function>::value &&
-                                __invokable<_Fp&, _ArgTypes...>::value>
-        struct __callable;
-    template <class _Fp>
-        struct __callable<_Fp, true>
-        {
-            static const bool value =
-                is_convertible<typename __invoke_of<_Fp&, _ArgTypes...>::type,
-                               _Rp>::value;
-        };
-    template <class _Fp>
-        struct __callable<_Fp, false>
-        {
-            static const bool value = false;
-        };
-public:
-    typedef _Rp result_type;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    function() _NOEXCEPT : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    function(nullptr_t) _NOEXCEPT : __f_(0) {}
-    function(const function&);
-    function(function&&) _NOEXCEPT;
-    template<class _Fp>
-      function(_Fp, typename enable_if
-                                     <
-                                        __callable<_Fp>::value &&
-                                        !is_same<_Fp, function>::value
-                                      >::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) _NOEXCEPT : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) _NOEXCEPT : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, function&&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<__callable<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(function&&) _NOEXCEPT;
-    function& operator=(nullptr_t) _NOEXCEPT;
-    template<class _Fp>
-      typename enable_if
-      <
-        __callable<typename decay<_Fp>::type>::value &&
-        !is_same<typename remove_reference<_Fp>::type, function>::value,
-        function&
-      >::type
-      operator=(_Fp&&);
-
-    ~function();
-
-    // function modifiers:
-    void swap(function&) _NOEXCEPT;
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp&& __f, const _Alloc& __a)
-        {function(allocator_arg, __a, _VSTD::forward<_Fp>(__f)).swap(*this);}
-
-    // function capacity:
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT {return __f_;}
-
-    // deleted overloads close possible hole in the type system
-    template<class _R2, class... _ArgTypes2>
-      bool operator==(const function<_R2(_ArgTypes2...)>&) const = delete;
-    template<class _R2, class... _ArgTypes2>
-      bool operator!=(const function<_R2(_ArgTypes2...)>&) const = delete;
-public:
-    // function invocation:
-    _Rp operator()(_ArgTypes...) const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // function target access:
-    const std::type_info& target_type() const _NOEXCEPT;
-    template <typename _Tp> _Tp* target() _NOEXCEPT;
-    template <typename _Tp> const _Tp* target() const _NOEXCEPT;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Alloc>
-function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc&,
-                                     const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>::function(function&& __f) _NOEXCEPT
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = 0;
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Alloc>
-function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc&,
-                                     function&& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = 0;
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp>
-function<_Rp(_ArgTypes...)>::function(_Fp __f,
-                                     typename enable_if
-                                     <
-                                        __callable<_Fp>::value &&
-                                        !is_same<_Fp, function>::value
-                                     >::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_ArgTypes...)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_) && is_nothrow_copy_constructible<_Fp>::value)
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(_VSTD::move(__f));
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(_VSTD::move(__f), allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp, class _Alloc>
-function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                     typename enable_if<__callable<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp(_ArgTypes...)> _FF;
-        typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<_FF>
-#else
-            rebind_alloc<_FF>::other
-#endif
-            _Ap;
-        _Ap __a(__a0);
-        if (sizeof(_FF) <= sizeof(__buf_) && 
-            is_nothrow_copy_constructible<_Fp>::value && is_nothrow_copy_constructible<_Ap>::value)
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(_VSTD::move(__f), _Alloc(__a));
-        }
-        else
-        {
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(_VSTD::move(__f), _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>&
-function<_Rp(_ArgTypes...)>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>&
-function<_Rp(_ArgTypes...)>::operator=(function&& __f) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = 0;
-    }
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>&
-function<_Rp(_ArgTypes...)>::operator=(nullptr_t) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp>
-typename enable_if
-<
-    function<_Rp(_ArgTypes...)>::template __callable<typename decay<_Fp>::type>::value &&
-    !is_same<typename remove_reference<_Fp>::type, function<_Rp(_ArgTypes...)>>::value,
-    function<_Rp(_ArgTypes...)>&
->::type
-function<_Rp(_ArgTypes...)>::operator=(_Fp&& __f)
-{
-    function(_VSTD::forward<_Fp>(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class ..._ArgTypes>
-void
-function<_Rp(_ArgTypes...)>::swap(function& __f) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class ..._ArgTypes>
-_Rp
-function<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __arg) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)(_VSTD::forward<_ArgTypes>(__arg)...);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp, class ..._ArgTypes>
-const std::type_info&
-function<_Rp(_ArgTypes...)>::target_type() const _NOEXCEPT
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <typename _Tp>
-_Tp*
-function<_Rp(_ArgTypes...)>::target() _NOEXCEPT
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <typename _Tp>
-const _Tp*
-function<_Rp(_ArgTypes...)>::target() const _NOEXCEPT
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const function<_Rp(_ArgTypes...)>& __f, nullptr_t) _NOEXCEPT {return !__f;}
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(nullptr_t, const function<_Rp(_ArgTypes...)>& __f) _NOEXCEPT {return !__f;}
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const function<_Rp(_ArgTypes...)>& __f, nullptr_t) _NOEXCEPT {return (bool)__f;}
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(nullptr_t, const function<_Rp(_ArgTypes...)>& __f) _NOEXCEPT {return (bool)__f;}
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(function<_Rp(_ArgTypes...)>& __x, function<_Rp(_ArgTypes...)>& __y) _NOEXCEPT
-{return __x.swap(__y);}
-
-template<class _Tp> struct __is_bind_expression : public false_type {};
-template<class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_bind_expression
-    : public __is_bind_expression<typename remove_cv<_Tp>::type> {};
-
-template<class _Tp> struct __is_placeholder : public integral_constant<int, 0> {};
-template<class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_placeholder
-    : public __is_placeholder<typename remove_cv<_Tp>::type> {};
-
-namespace placeholders
-{
-
-template <int _Np> struct __ph {};
-
-_LIBCPP_FUNC_VIS extern __ph<1>   _1;
-_LIBCPP_FUNC_VIS extern __ph<2>   _2;
-_LIBCPP_FUNC_VIS extern __ph<3>   _3;
-_LIBCPP_FUNC_VIS extern __ph<4>   _4;
-_LIBCPP_FUNC_VIS extern __ph<5>   _5;
-_LIBCPP_FUNC_VIS extern __ph<6>   _6;
-_LIBCPP_FUNC_VIS extern __ph<7>   _7;
-_LIBCPP_FUNC_VIS extern __ph<8>   _8;
-_LIBCPP_FUNC_VIS extern __ph<9>   _9;
-_LIBCPP_FUNC_VIS extern __ph<10> _10;
-
-}  // placeholders
-
-template<int _Np>
-struct __is_placeholder<placeholders::__ph<_Np> >
-    : public integral_constant<int, _Np> {};
-
-template <class _Tp, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp&
-__mu(reference_wrapper<_Tp> __t, _Uj&)
-{
-    return __t.get();
-}
-
-template <class _Ti, class ..._Uj, size_t ..._Indx>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __invoke_of<_Ti&, _Uj...>::type
-__mu_expand(_Ti& __ti, tuple<_Uj...>& __uj, __tuple_indices<_Indx...>)
-{
-    return __ti(_VSTD::forward<_Uj>(_VSTD::get<_Indx>(__uj))...);
-}
-
-template <class _Ti, class ..._Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_bind_expression<_Ti>::value,
-    __invoke_of<_Ti&, _Uj...>
->::type
-__mu(_Ti& __ti, tuple<_Uj...>& __uj)
-{
-    typedef typename __make_tuple_indices<sizeof...(_Uj)>::type __indices;
-    return  __mu_expand(__ti, __uj, __indices());
-}
-
-template <bool IsPh, class _Ti, class _Uj>
-struct __mu_return2 {};
-
-template <class _Ti, class _Uj>
-struct __mu_return2<true, _Ti, _Uj>
-{
-    typedef typename tuple_element<is_placeholder<_Ti>::value - 1, _Uj>::type type;
-};
-
-template <class _Ti, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    0 < is_placeholder<_Ti>::value,
-    typename __mu_return2<0 < is_placeholder<_Ti>::value, _Ti, _Uj>::type
->::type
-__mu(_Ti&, _Uj& __uj)
-{
-    const size_t _Indx = is_placeholder<_Ti>::value - 1;
-    return _VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(_VSTD::get<_Indx>(__uj));
-}
-
-template <class _Ti, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_bind_expression<_Ti>::value &&
-    is_placeholder<_Ti>::value == 0 &&
-    !__is_reference_wrapper<_Ti>::value,
-    _Ti&
->::type
-__mu(_Ti& __ti, _Uj&)
-{
-    return __ti;
-}
-
-template <class _Ti, bool IsReferenceWrapper, bool IsBindEx, bool IsPh,
-          class _TupleUj>
-struct ____mu_return;
-
-template <bool _Invokable, class _Ti, class ..._Uj>
-struct ____mu_return_invokable  // false
-{
-    typedef __nat type;
-};
-
-template <class _Ti, class ..._Uj>
-struct ____mu_return_invokable<true, _Ti, _Uj...>
-{
-    typedef typename __invoke_of<_Ti&, _Uj...>::type type;
-};
-
-template <class _Ti, class ..._Uj>
-struct ____mu_return<_Ti, false, true, false, tuple<_Uj...> >
-    : public ____mu_return_invokable<__invokable<_Ti&, _Uj...>::value, _Ti, _Uj...>
-{
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, false, false, true, _TupleUj>
-{
-    typedef typename tuple_element<is_placeholder<_Ti>::value - 1,
-                                   _TupleUj>::type&& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, true, false, false, _TupleUj>
-{
-    typedef typename _Ti::type& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, false, false, false, _TupleUj>
-{
-    typedef _Ti& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct __mu_return
-    : public ____mu_return<_Ti,
-                           __is_reference_wrapper<_Ti>::value,
-                           is_bind_expression<_Ti>::value,
-                           0 < is_placeholder<_Ti>::value &&
-                           is_placeholder<_Ti>::value <= tuple_size<_TupleUj>::value,
-                           _TupleUj>
-{
-};
-
-template <class _Fp, class _BoundArgs, class _TupleUj>
-struct _is_valid_bind_return
-{
-    static const bool value = false;
-};
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct _is_valid_bind_return<_Fp, tuple<_BoundArgs...>, _TupleUj>
-{
-    static const bool value = __invokable<_Fp,
-                    typename __mu_return<_BoundArgs, _TupleUj>::type...>::value;
-};
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct _is_valid_bind_return<_Fp, const tuple<_BoundArgs...>, _TupleUj>
-{
-    static const bool value = __invokable<_Fp,
-                    typename __mu_return<const _BoundArgs, _TupleUj>::type...>::value;
-};
-
-template <class _Fp, class _BoundArgs, class _TupleUj,
-          bool = _is_valid_bind_return<_Fp, _BoundArgs, _TupleUj>::value>
-struct __bind_return;
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, tuple<_BoundArgs...>, _TupleUj, true>
-{
-    typedef typename __invoke_of
-    <
-        _Fp&,
-        typename __mu_return
-        <
-            _BoundArgs,
-            _TupleUj
-        >::type...
-    >::type type;
-};
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, const tuple<_BoundArgs...>, _TupleUj, true>
-{
-    typedef typename __invoke_of
-    <
-        _Fp&,
-        typename __mu_return
-        <
-            const _BoundArgs,
-            _TupleUj
-        >::type...
-    >::type type;
-};
-
-template <class _Fp, class _BoundArgs, size_t ..._Indx, class _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __bind_return<_Fp, _BoundArgs, _Args>::type
-__apply_functor(_Fp& __f, _BoundArgs& __bound_args, __tuple_indices<_Indx...>,
-                _Args&& __args)
-{
-    return __invoke(__f, __mu(_VSTD::get<_Indx>(__bound_args), __args)...);
-}
-
-template<class _Fp, class ..._BoundArgs>
-class __bind
-    : public __weak_result_type<typename decay<_Fp>::type>
-{
-protected:
-    typedef typename decay<_Fp>::type _Fd;
-    typedef tuple<typename decay<_BoundArgs>::type...> _Td;
-private:
-    _Fd __f_;
-    _Td __bound_args_;
-
-    typedef typename __make_tuple_indices<sizeof...(_BoundArgs)>::type __indices;
-public:
-#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind(const __bind& __b)
-        : __f_(__b.__f_),
-          __bound_args_(__b.__bound_args_) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind& operator=(const __bind& __b)
-    {
-        __f_ = __b.__f_;
-        __bound_args_ = __b.__bound_args_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind(__bind&& __b)
-        : __f_(_VSTD::move(__b.__f_)),
-          __bound_args_(_VSTD::move(__b.__bound_args_)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind& operator=(__bind&& __b)
-    {
-        __f_ = _VSTD::move(__b.__f_);
-        __bound_args_ = _VSTD::move(__b.__bound_args_);
-        return *this;
-    }
-
-#endif  // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    template <class _Gp, class ..._BA,
-              class = typename enable_if
-                               <
-                                  is_constructible<_Fd, _Gp>::value &&
-                                  !is_same<typename remove_reference<_Gp>::type,
-                                           __bind>::value
-                               >::type>
-      _LIBCPP_INLINE_VISIBILITY
-      explicit __bind(_Gp&& __f, _BA&& ...__bound_args)
-        : __f_(_VSTD::forward<_Gp>(__f)),
-          __bound_args_(_VSTD::forward<_BA>(__bound_args)...) {}
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type
-        operator()(_Args&& ...__args)
-        {
-            return __apply_functor(__f_, __bound_args_, __indices(),
-                                  tuple<_Args&&...>(_VSTD::forward<_Args>(__args)...));
-        }
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type
-        operator()(_Args&& ...__args) const
-        {
-            return __apply_functor(__f_, __bound_args_, __indices(),
-                                   tuple<_Args&&...>(_VSTD::forward<_Args>(__args)...));
-        }
-};
-
-template<class _Fp, class ..._BoundArgs>
-struct __is_bind_expression<__bind<_Fp, _BoundArgs...> > : public true_type {};
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-class __bind_r
-    : public __bind<_Fp, _BoundArgs...>
-{
-    typedef __bind<_Fp, _BoundArgs...> base;
-    typedef typename base::_Fd _Fd;
-    typedef typename base::_Td _Td;
-public:
-    typedef _Rp result_type;
-
-#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind_r(const __bind_r& __b)
-        : base(_VSTD::forward<const base&>(__b)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind_r& operator=(const __bind_r& __b)
-    {
-        base::operator=(_VSTD::forward<const base&>(__b));
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind_r(__bind_r&& __b)
-        : base(_VSTD::forward<base>(__b)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind_r& operator=(__bind_r&& __b)
-    {
-        base::operator=(_VSTD::forward<base>(__b));
-        return *this;
-    }
-
-#endif  // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    template <class _Gp, class ..._BA,
-              class = typename enable_if
-                               <
-                                  is_constructible<_Fd, _Gp>::value &&
-                                  !is_same<typename remove_reference<_Gp>::type,
-                                           __bind_r>::value
-                               >::type>
-      _LIBCPP_INLINE_VISIBILITY
-      explicit __bind_r(_Gp&& __f, _BA&& ...__bound_args)
-        : base(_VSTD::forward<_Gp>(__f),
-               _VSTD::forward<_BA>(__bound_args)...) {}
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            is_convertible<typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type,
-                           result_type>::value,
-            result_type
-        >::type
-        operator()(_Args&& ...__args)
-        {
-            return base::operator()(_VSTD::forward<_Args>(__args)...);
-        }
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            is_convertible<typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type,
-                           result_type>::value,
-            result_type
-        >::type
-        operator()(_Args&& ...__args) const
-        {
-            return base::operator()(_VSTD::forward<_Args>(__args)...);
-        }
-};
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-struct __is_bind_expression<__bind_r<_Rp, _Fp, _BoundArgs...> > : public true_type {};
-
-template<class _Fp, class ..._BoundArgs>
-inline _LIBCPP_INLINE_VISIBILITY
-__bind<_Fp, _BoundArgs...>
-bind(_Fp&& __f, _BoundArgs&&... __bound_args)
-{
-    typedef __bind<_Fp, _BoundArgs...> type;
-    return type(_VSTD::forward<_Fp>(__f), _VSTD::forward<_BoundArgs>(__bound_args)...);
-}
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-inline _LIBCPP_INLINE_VISIBILITY
-__bind_r<_Rp, _Fp, _BoundArgs...>
-bind(_Fp&& __f, _BoundArgs&&... __bound_args)
-{
-    typedef __bind_r<_Rp, _Fp, _BoundArgs...> type;
-    return type(_VSTD::forward<_Fp>(__f), _VSTD::forward<_BoundArgs>(__bound_args)...);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<bool>
-    : public unary_function<bool, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(bool __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<char>
-    : public unary_function<char, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(char __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<signed char>
-    : public unary_function<signed char, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(signed char __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned char>
-    : public unary_function<unsigned char, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned char __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<char16_t>
-    : public unary_function<char16_t, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(char16_t __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<char32_t>
-    : public unary_function<char32_t, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(char32_t __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<wchar_t>
-    : public unary_function<wchar_t, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(wchar_t __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<short>
-    : public unary_function<short, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(short __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned short>
-    : public unary_function<unsigned short, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned short __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<int>
-    : public unary_function<int, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(int __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned int>
-    : public unary_function<unsigned int, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned int __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<long>
-    : public unary_function<long, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(long __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned long>
-    : public unary_function<unsigned long, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned long __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<long long>
-    : public __scalar_hash<long long>
-{
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned long long>
-    : public __scalar_hash<unsigned long long>
-{
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<float>
-    : public __scalar_hash<float>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(float __v) const _NOEXCEPT
-    {
-        // -0.0 and 0.0 should return same hash
-       if (__v == 0)
-           return 0;
-        return __scalar_hash<float>::operator()(__v);
-    }
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<double>
-    : public __scalar_hash<double>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(double __v) const _NOEXCEPT
-    {
-        // -0.0 and 0.0 should return same hash
-       if (__v == 0)
-           return 0;
-        return __scalar_hash<double>::operator()(__v);
-    }
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<long double>
-    : public __scalar_hash<long double>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(long double __v) const _NOEXCEPT
-    {
-        // -0.0 and 0.0 should return same hash
-        if (__v == 0)
-            return 0;
-#if defined(__i386__)
-        // Zero out padding bits
-        union
-        {
-            long double __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-                size_t __c;
-                size_t __d;
-            };
-        } __u;
-        __u.__a = 0;
-        __u.__b = 0;
-        __u.__c = 0;
-        __u.__d = 0;
-        __u.__t = __v;
-        return __u.__a ^ __u.__b ^ __u.__c ^ __u.__d;
-#elif defined(__x86_64__)
-        // Zero out padding bits
-        union
-        {
-            long double __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-            };
-        } __u;
-        __u.__a = 0;
-        __u.__b = 0;
-        __u.__t = __v;
-        return __u.__a ^ __u.__b;
-#else
-        return __scalar_hash<long double>::operator()(__v);
-#endif
-    }
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY hash
-    : public unary_function<_Tp, size_t>
-{
-    static_assert(is_enum<_Tp>::value, "This hash only works for enumeration types");
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        typedef typename underlying_type<_Tp>::type type;
-        return hash<type>{}(static_cast<type>(__v));
-    }
-};
-#endif
-
-// struct hash<T*> in <memory>
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_FUNCTIONAL
diff --git a/include.new/c++/v1/future b/include.new/c++/v1/future
deleted file mode 100644
index 6fe6f8d..0000000
--- a/include.new/c++/v1/future
+++ /dev/null
@@ -1,2629 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- future -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUTURE
-#define _LIBCPP_FUTURE
-
-/*
-    future synopsis
-
-namespace std
-{
-
-enum class future_errc
-{
-    future_already_retrieved = 1,
-    promise_already_satisfied,
-    no_state,
-    broken_promise
-};
-
-enum class launch
-{
-    async = 1,
-    deferred = 2,
-    any = async | deferred
-};
-
-enum class future_status
-{
-    ready,
-    timeout,
-    deferred
-};
-
-template <> struct is_error_code_enum<future_errc> : public true_type { };
-error_code make_error_code(future_errc e) noexcept;
-error_condition make_error_condition(future_errc e) noexcept;
-
-const error_category& future_category() noexcept;
-
-class future_error
-    : public logic_error
-{
-public:
-    future_error(error_code ec);  // exposition only
-
-    const error_code& code() const noexcept;
-    const char*       what() const noexcept;
-};
-
-template <class R>
-class promise
-{
-public:
-    promise();
-    template <class Allocator>
-        promise(allocator_arg_t, const Allocator& a);
-    promise(promise&& rhs) noexcept;
-    promise(const promise& rhs) = delete;
-    ~promise();
-
-    // assignment
-    promise& operator=(promise&& rhs) noexcept;
-    promise& operator=(const promise& rhs) = delete;
-    void swap(promise& other) noexcept;
-
-    // retrieving the result
-    future<R> get_future();
-
-    // setting the result
-    void set_value(const R& r);
-    void set_value(R&& r);
-    void set_exception(exception_ptr p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit(const R& r);
-    void set_value_at_thread_exit(R&& r);
-    void set_exception_at_thread_exit(exception_ptr p);
-};
-
-template <class R>
-class promise<R&>
-{
-public:
-    promise();
-    template <class Allocator>
-        promise(allocator_arg_t, const Allocator& a);
-    promise(promise&& rhs) noexcept;
-    promise(const promise& rhs) = delete;
-    ~promise();
-
-    // assignment
-    promise& operator=(promise&& rhs) noexcept;
-    promise& operator=(const promise& rhs) = delete;
-    void swap(promise& other) noexcept;
-
-    // retrieving the result
-    future<R&> get_future();
-
-    // setting the result
-    void set_value(R& r);
-    void set_exception(exception_ptr p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit(R&);
-    void set_exception_at_thread_exit(exception_ptr p);
-};
-
-template <>
-class promise<void>
-{
-public:
-    promise();
-    template <class Allocator>
-        promise(allocator_arg_t, const Allocator& a);
-    promise(promise&& rhs) noexcept;
-    promise(const promise& rhs) = delete;
-    ~promise();
-
-    // assignment
-    promise& operator=(promise&& rhs) noexcept;
-    promise& operator=(const promise& rhs) = delete;
-    void swap(promise& other) noexcept;
-
-    // retrieving the result
-    future<void> get_future();
-
-    // setting the result
-    void set_value();
-    void set_exception(exception_ptr p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit();
-    void set_exception_at_thread_exit(exception_ptr p);
-};
-
-template <class R> void swap(promise<R>& x, promise<R>& y) noexcept;
-
-template <class R, class Alloc>
-    struct uses_allocator<promise<R>, Alloc> : public true_type {};
-
-template <class R>
-class future
-{
-public:
-    future() noexcept;
-    future(future&&) noexcept;
-    future(const future& rhs) = delete;
-    ~future();
-    future& operator=(const future& rhs) = delete;
-    future& operator=(future&&) noexcept;
-    shared_future<R> share();
-
-    // retrieving the value
-    R get();
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <class R>
-class future<R&>
-{
-public:
-    future() noexcept;
-    future(future&&) noexcept;
-    future(const future& rhs) = delete;
-    ~future();
-    future& operator=(const future& rhs) = delete;
-    future& operator=(future&&) noexcept;
-    shared_future<R&> share();
-
-    // retrieving the value
-    R& get();
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <>
-class future<void>
-{
-public:
-    future() noexcept;
-    future(future&&) noexcept;
-    future(const future& rhs) = delete;
-    ~future();
-    future& operator=(const future& rhs) = delete;
-    future& operator=(future&&) noexcept;
-    shared_future<void> share();
-
-    // retrieving the value
-    void get();
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <class R>
-class shared_future
-{
-public:
-    shared_future() noexcept;
-    shared_future(const shared_future& rhs);
-    shared_future(future<R>&&) noexcept;
-    shared_future(shared_future&& rhs) noexcept;
-    ~shared_future();
-    shared_future& operator=(const shared_future& rhs);
-    shared_future& operator=(shared_future&& rhs) noexcept;
-
-    // retrieving the value
-    const R& get() const;
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <class R>
-class shared_future<R&>
-{
-public:
-    shared_future() noexcept;
-    shared_future(const shared_future& rhs);
-    shared_future(future<R&>&&) noexcept;
-    shared_future(shared_future&& rhs) noexcept;
-    ~shared_future();
-    shared_future& operator=(const shared_future& rhs);
-    shared_future& operator=(shared_future&& rhs) noexcept;
-
-    // retrieving the value
-    R& get() const;
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <>
-class shared_future<void>
-{
-public:
-    shared_future() noexcept;
-    shared_future(const shared_future& rhs);
-    shared_future(future<void>&&) noexcept;
-    shared_future(shared_future&& rhs) noexcept;
-    ~shared_future();
-    shared_future& operator=(const shared_future& rhs);
-    shared_future& operator=(shared_future&& rhs) noexcept;
-
-    // retrieving the value
-    void get() const;
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <class F, class... Args>
-  future<typename result_of<typename decay<F>::type(typename decay<Args>::type...)>::type>
-  async(F&& f, Args&&... args);
-
-template <class F, class... Args>
-  future<typename result_of<typename decay<F>::type(typename decay<Args>::type...)>::type>
-  async(launch policy, F&& f, Args&&... args);
-
-template <class> class packaged_task; // undefined
-
-template <class R, class... ArgTypes>
-class packaged_task<R(ArgTypes...)>
-{
-public:
-    typedef R result_type;
-
-    // construction and destruction
-    packaged_task() noexcept;
-    template <class F>
-        explicit packaged_task(F&& f);
-    template <class F, class Allocator>
-        explicit packaged_task(allocator_arg_t, const Allocator& a, F&& f);
-    ~packaged_task();
-
-    // no copy
-    packaged_task(const packaged_task&) = delete;
-    packaged_task& operator=(const packaged_task&) = delete;
-
-    // move support
-    packaged_task(packaged_task&& other) noexcept;
-    packaged_task& operator=(packaged_task&& other) noexcept;
-    void swap(packaged_task& other) noexcept;
-
-    bool valid() const noexcept;
-
-    // result retrieval
-    future<R> get_future();
-
-    // execution
-    void operator()(ArgTypes... );
-    void make_ready_at_thread_exit(ArgTypes...);
-
-    void reset();
-};
-
-template <class R>
-  void swap(packaged_task<R(ArgTypes...)&, packaged_task<R(ArgTypes...)>&) noexcept;
-
-template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <system_error>
-#include <memory>
-#include <chrono>
-#include <exception>
-#include <mutex>
-#include <thread>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifdef _LIBCPP_HAS_NO_THREADS
-#error <future> is not supported on this single threaded system
-#else // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-//enum class future_errc
-_LIBCPP_DECLARE_STRONG_ENUM(future_errc)
-{
-    future_already_retrieved = 1,
-    promise_already_satisfied,
-    no_state,
-    broken_promise
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(future_errc)
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum<future_errc> : public true_type {};
-
-#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum<future_errc::__lx> : public true_type { };
-#endif
-
-//enum class launch
-_LIBCPP_DECLARE_STRONG_ENUM(launch)
-{
-    async = 1,
-    deferred = 2,
-    any = async | deferred
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(launch)
-
-#ifndef _LIBCPP_HAS_NO_STRONG_ENUMS
-
-#ifdef _LIBCXX_UNDERLYING_TYPE
-typedef underlying_type<launch>::type __launch_underlying_type;
-#else
-typedef int __launch_underlying_type;
-#endif
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-launch
-operator&(launch __x, launch __y)
-{
-    return static_cast<launch>(static_cast<__launch_underlying_type>(__x) &
-                               static_cast<__launch_underlying_type>(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-launch
-operator|(launch __x, launch __y)
-{
-    return static_cast<launch>(static_cast<__launch_underlying_type>(__x) |
-                               static_cast<__launch_underlying_type>(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-launch
-operator^(launch __x, launch __y)
-{
-    return static_cast<launch>(static_cast<__launch_underlying_type>(__x) ^
-                               static_cast<__launch_underlying_type>(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-launch
-operator~(launch __x)
-{
-    return static_cast<launch>(~static_cast<__launch_underlying_type>(__x) & 3);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-launch&
-operator&=(launch& __x, launch __y)
-{
-    __x = __x & __y; return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-launch&
-operator|=(launch& __x, launch __y)
-{
-    __x = __x | __y; return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-launch&
-operator^=(launch& __x, launch __y)
-{
-    __x = __x ^ __y; return __x;
-}
-
-#endif  // !_LIBCPP_HAS_NO_STRONG_ENUMS
-
-//enum class future_status
-_LIBCPP_DECLARE_STRONG_ENUM(future_status)
-{
-    ready,
-    timeout,
-    deferred
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(future_status)
-
-_LIBCPP_FUNC_VIS
-const error_category& future_category() _NOEXCEPT;
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_code
-make_error_code(future_errc __e) _NOEXCEPT
-{
-    return error_code(static_cast<int>(__e), future_category());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_condition
-make_error_condition(future_errc __e) _NOEXCEPT
-{
-    return error_condition(static_cast<int>(__e), future_category());
-}
-
-class _LIBCPP_EXCEPTION_ABI future_error
-    : public logic_error
-{
-    error_code __ec_;
-public:
-    future_error(error_code __ec);
-
-    _LIBCPP_INLINE_VISIBILITY
-    const error_code& code() const _NOEXCEPT {return __ec_;}
-
-    virtual ~future_error() _NOEXCEPT;
-};
-
-class _LIBCPP_TYPE_VIS __assoc_sub_state
-    : public __shared_count
-{
-protected:
-    exception_ptr __exception_;
-    mutable mutex __mut_;
-    mutable condition_variable __cv_;
-    unsigned __state_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-    void __sub_wait(unique_lock<mutex>& __lk);
-public:
-    enum
-    {
-        __constructed = 1,
-        __future_attached = 2,
-        ready = 4,
-        deferred = 8
-    };
-
-    _LIBCPP_INLINE_VISIBILITY
-    __assoc_sub_state() : __state_(0) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __has_value() const
-        {return (__state_ & __constructed) || (__exception_ != nullptr);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_future_attached()
-    {
-        lock_guard<mutex> __lk(__mut_);
-        __state_ |= __future_attached;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    bool __has_future_attached() const {return (__state_ & __future_attached) != 0;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_deferred() {__state_ |= deferred;}
-
-    void __make_ready();
-    _LIBCPP_INLINE_VISIBILITY
-    bool __is_ready() const {return (__state_ & ready) != 0;}
-
-    void set_value();
-    void set_value_at_thread_exit();
-
-    void set_exception(exception_ptr __p);
-    void set_exception_at_thread_exit(exception_ptr __p);
-
-    void copy();
-
-    void wait();
-    template <class _Rep, class _Period>
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const;
-    template <class _Clock, class _Duration>
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const;
-
-    virtual void __execute();
-};
-
-template <class _Clock, class _Duration>
-future_status
-__assoc_sub_state::wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-{
-    unique_lock<mutex> __lk(__mut_);
-    if (__state_ & deferred)
-        return future_status::deferred;
-    while (!(__state_ & ready) && _Clock::now() < __abs_time)
-        __cv_.wait_until(__lk, __abs_time);
-    if (__state_ & ready)
-        return future_status::ready;
-    return future_status::timeout;
-}
-
-template <class _Rep, class _Period>
-inline _LIBCPP_INLINE_VISIBILITY
-future_status
-__assoc_sub_state::wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-{
-    return wait_until(chrono::steady_clock::now() + __rel_time);
-}
-
-template <class _Rp>
-class __assoc_state
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-    typedef typename aligned_storage<sizeof(_Rp), alignment_of<_Rp>::value>::type _Up;
-protected:
-    _Up __value_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-
-    template <class _Arg>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        void set_value(_Arg&& __arg);
-#else
-        void set_value(_Arg& __arg);
-#endif
-
-    template <class _Arg>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        void set_value_at_thread_exit(_Arg&& __arg);
-#else
-        void set_value_at_thread_exit(_Arg& __arg);
-#endif
-
-    _Rp move();
-    typename add_lvalue_reference<_Rp>::type copy();
-};
-
-template <class _Rp>
-void
-__assoc_state<_Rp>::__on_zero_shared() _NOEXCEPT
-{
-    if (this->__state_ & base::__constructed)
-        reinterpret_cast<_Rp*>(&__value_)->~_Rp();
-    delete this;
-}
-
-template <class _Rp>
-template <class _Arg>
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__assoc_state<_Rp>::set_value(_Arg&& __arg)
-#else
-__assoc_state<_Rp>::set_value(_Arg& __arg)
-#endif
-{
-    unique_lock<mutex> __lk(this->__mut_);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (this->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-#endif
-    ::new(&__value_) _Rp(_VSTD::forward<_Arg>(__arg));
-    this->__state_ |= base::__constructed | base::ready;
-    __lk.unlock();
-    __cv_.notify_all();
-}
-
-template <class _Rp>
-template <class _Arg>
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__assoc_state<_Rp>::set_value_at_thread_exit(_Arg&& __arg)
-#else
-__assoc_state<_Rp>::set_value_at_thread_exit(_Arg& __arg)
-#endif
-{
-    unique_lock<mutex> __lk(this->__mut_);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (this->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-#endif
-    ::new(&__value_) _Rp(_VSTD::forward<_Arg>(__arg));
-    this->__state_ |= base::__constructed;
-    __thread_local_data()->__make_ready_at_thread_exit(this);
-    __lk.unlock();
-}
-
-template <class _Rp>
-_Rp
-__assoc_state<_Rp>::move()
-{
-    unique_lock<mutex> __lk(this->__mut_);
-    this->__sub_wait(__lk);
-    if (this->__exception_ != nullptr)
-        rethrow_exception(this->__exception_);
-    return _VSTD::move(*reinterpret_cast<_Rp*>(&__value_));
-}
-
-template <class _Rp>
-typename add_lvalue_reference<_Rp>::type
-__assoc_state<_Rp>::copy()
-{
-    unique_lock<mutex> __lk(this->__mut_);
-    this->__sub_wait(__lk);
-    if (this->__exception_ != nullptr)
-        rethrow_exception(this->__exception_);
-    return *reinterpret_cast<_Rp*>(&__value_);
-}
-
-template <class _Rp>
-class __assoc_state<_Rp&>
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-    typedef _Rp* _Up;
-protected:
-    _Up __value_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-
-    void set_value(_Rp& __arg);
-    void set_value_at_thread_exit(_Rp& __arg);
-
-    _Rp& copy();
-};
-
-template <class _Rp>
-void
-__assoc_state<_Rp&>::__on_zero_shared() _NOEXCEPT
-{
-    delete this;
-}
-
-template <class _Rp>
-void
-__assoc_state<_Rp&>::set_value(_Rp& __arg)
-{
-    unique_lock<mutex> __lk(this->__mut_);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (this->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-#endif
-    __value_ = _VSTD::addressof(__arg);
-    this->__state_ |= base::__constructed | base::ready;
-    __lk.unlock();
-    __cv_.notify_all();
-}
-
-template <class _Rp>
-void
-__assoc_state<_Rp&>::set_value_at_thread_exit(_Rp& __arg)
-{
-    unique_lock<mutex> __lk(this->__mut_);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (this->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-#endif
-    __value_ = _VSTD::addressof(__arg);
-    this->__state_ |= base::__constructed;
-    __thread_local_data()->__make_ready_at_thread_exit(this);
-    __lk.unlock();
-}
-
-template <class _Rp>
-_Rp&
-__assoc_state<_Rp&>::copy()
-{
-    unique_lock<mutex> __lk(this->__mut_);
-    this->__sub_wait(__lk);
-    if (this->__exception_ != nullptr)
-        rethrow_exception(this->__exception_);
-    return *__value_;
-}
-
-template <class _Rp, class _Alloc>
-class __assoc_state_alloc
-    : public __assoc_state<_Rp>
-{
-    typedef __assoc_state<_Rp> base;
-    _Alloc __alloc_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __assoc_state_alloc(const _Alloc& __a)
-        : __alloc_(__a) {}
-};
-
-template <class _Rp, class _Alloc>
-void
-__assoc_state_alloc<_Rp, _Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    if (this->__state_ & base::__constructed)
-        reinterpret_cast<_Rp*>(_VSTD::addressof(this->__value_))->~_Rp();
-    typedef typename __allocator_traits_rebind<_Alloc, __assoc_state_alloc>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _A __a(__alloc_);
-    this->~__assoc_state_alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template <class _Rp, class _Alloc>
-class __assoc_state_alloc<_Rp&, _Alloc>
-    : public __assoc_state<_Rp&>
-{
-    typedef __assoc_state<_Rp&> base;
-    _Alloc __alloc_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __assoc_state_alloc(const _Alloc& __a)
-        : __alloc_(__a) {}
-};
-
-template <class _Rp, class _Alloc>
-void
-__assoc_state_alloc<_Rp&, _Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __assoc_state_alloc>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _A __a(__alloc_);
-    this->~__assoc_state_alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template <class _Alloc>
-class __assoc_sub_state_alloc
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-    _Alloc __alloc_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __assoc_sub_state_alloc(const _Alloc& __a)
-        : __alloc_(__a) {}
-};
-
-template <class _Alloc>
-void
-__assoc_sub_state_alloc<_Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __assoc_sub_state_alloc>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _A __a(__alloc_);
-    this->~__assoc_sub_state_alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template <class _Rp, class _Fp>
-class __deferred_assoc_state
-    : public __assoc_state<_Rp>
-{
-    typedef __assoc_state<_Rp> base;
-
-    _Fp __func_;
-
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit __deferred_assoc_state(_Fp&& __f);
-#endif
-
-    virtual void __execute();
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp, class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-__deferred_assoc_state<_Rp, _Fp>::__deferred_assoc_state(_Fp&& __f)
-    : __func_(_VSTD::forward<_Fp>(__f))
-{
-    this->__set_deferred();
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp, class _Fp>
-void
-__deferred_assoc_state<_Rp, _Fp>::__execute()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->set_value(__func_());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Fp>
-class __deferred_assoc_state<void, _Fp>
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-
-    _Fp __func_;
-
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit __deferred_assoc_state(_Fp&& __f);
-#endif
-
-    virtual void __execute();
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-__deferred_assoc_state<void, _Fp>::__deferred_assoc_state(_Fp&& __f)
-    : __func_(_VSTD::forward<_Fp>(__f))
-{
-    this->__set_deferred();
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Fp>
-void
-__deferred_assoc_state<void, _Fp>::__execute()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __func_();
-        this->set_value();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Rp, class _Fp>
-class __async_assoc_state
-    : public __assoc_state<_Rp>
-{
-    typedef __assoc_state<_Rp> base;
-
-    _Fp __func_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit __async_assoc_state(_Fp&& __f);
-#endif
-
-    virtual void __execute();
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp, class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-__async_assoc_state<_Rp, _Fp>::__async_assoc_state(_Fp&& __f)
-    : __func_(_VSTD::forward<_Fp>(__f))
-{
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp, class _Fp>
-void
-__async_assoc_state<_Rp, _Fp>::__execute()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->set_value(__func_());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Rp, class _Fp>
-void
-__async_assoc_state<_Rp, _Fp>::__on_zero_shared() _NOEXCEPT
-{
-    this->wait();
-    base::__on_zero_shared();
-}
-
-template <class _Fp>
-class __async_assoc_state<void, _Fp>
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-
-    _Fp __func_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit __async_assoc_state(_Fp&& __f);
-#endif
-
-    virtual void __execute();
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-__async_assoc_state<void, _Fp>::__async_assoc_state(_Fp&& __f)
-    : __func_(_VSTD::forward<_Fp>(__f))
-{
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Fp>
-void
-__async_assoc_state<void, _Fp>::__execute()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __func_();
-        this->set_value();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Fp>
-void
-__async_assoc_state<void, _Fp>::__on_zero_shared() _NOEXCEPT
-{
-    this->wait();
-    base::__on_zero_shared();
-}
-
-template <class _Rp> class _LIBCPP_TYPE_VIS_ONLY promise;
-template <class _Rp> class _LIBCPP_TYPE_VIS_ONLY shared_future;
-
-// future
-
-template <class _Rp> class _LIBCPP_TYPE_VIS_ONLY future;
-
-template <class _Rp, class _Fp>
-future<_Rp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__make_deferred_assoc_state(_Fp&& __f);
-#else
-__make_deferred_assoc_state(_Fp __f);
-#endif
-
-template <class _Rp, class _Fp>
-future<_Rp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__make_async_assoc_state(_Fp&& __f);
-#else
-__make_async_assoc_state(_Fp __f);
-#endif
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY future
-{
-    __assoc_state<_Rp>* __state_;
-
-    explicit future(__assoc_state<_Rp>* __state);
-
-    template <class> friend class promise;
-    template <class> friend class shared_future;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp&& __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp&& __f);
-#else
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp __f);
-#endif
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    future() _NOEXCEPT : __state_(nullptr) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    future(future&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    future(const future&) = delete;
-    future& operator=(const future&) = delete;
-    _LIBCPP_INLINE_VISIBILITY
-    future& operator=(future&& __rhs) _NOEXCEPT
-        {
-            future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    future(const future&);
-    future& operator=(const future&);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~future();
-    shared_future<_Rp> share();
-
-    // retrieving the value
-    _Rp get();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-future<_Rp>::future(__assoc_state<_Rp>* __state)
-    : __state_(__state)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_->__has_future_attached())
-        throw future_error(make_error_code(future_errc::future_already_retrieved));
-#endif
-    __state_->__add_shared();
-    __state_->__set_future_attached();
-}
-
-struct __release_shared_count
-{
-    void operator()(__shared_count* p) {p->__release_shared();}
-};
-
-template <class _Rp>
-future<_Rp>::~future()
-{
-    if (__state_)
-        __state_->__release_shared();
-}
-
-template <class _Rp>
-_Rp
-future<_Rp>::get()
-{
-    unique_ptr<__shared_count, __release_shared_count> __(__state_);
-    __assoc_state<_Rp>* __s = __state_;
-    __state_ = nullptr;
-    return __s->move();
-}
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY future<_Rp&>
-{
-    __assoc_state<_Rp&>* __state_;
-
-    explicit future(__assoc_state<_Rp&>* __state);
-
-    template <class> friend class promise;
-    template <class> friend class shared_future;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp&& __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp&& __f);
-#else
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp __f);
-#endif
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    future() _NOEXCEPT : __state_(nullptr) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    future(future&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    future(const future&) = delete;
-    future& operator=(const future&) = delete;
-    _LIBCPP_INLINE_VISIBILITY
-    future& operator=(future&& __rhs) _NOEXCEPT
-        {
-            future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    future(const future&);
-    future& operator=(const future&);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~future();
-    shared_future<_Rp&> share();
-
-    // retrieving the value
-    _Rp& get();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-future<_Rp&>::future(__assoc_state<_Rp&>* __state)
-    : __state_(__state)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_->__has_future_attached())
-        throw future_error(make_error_code(future_errc::future_already_retrieved));
-#endif
-    __state_->__add_shared();
-    __state_->__set_future_attached();
-}
-
-template <class _Rp>
-future<_Rp&>::~future()
-{
-    if (__state_)
-        __state_->__release_shared();
-}
-
-template <class _Rp>
-_Rp&
-future<_Rp&>::get()
-{
-    unique_ptr<__shared_count, __release_shared_count> __(__state_);
-    __assoc_state<_Rp&>* __s = __state_;
-    __state_ = nullptr;
-    return __s->copy();
-}
-
-template <>
-class _LIBCPP_TYPE_VIS future<void>
-{
-    __assoc_sub_state* __state_;
-
-    explicit future(__assoc_sub_state* __state);
-
-    template <class> friend class promise;
-    template <class> friend class shared_future;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp&& __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp&& __f);
-#else
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp __f);
-#endif
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    future() _NOEXCEPT : __state_(nullptr) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    future(future&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    future(const future&) = delete;
-    future& operator=(const future&) = delete;
-    _LIBCPP_INLINE_VISIBILITY
-    future& operator=(future&& __rhs) _NOEXCEPT
-        {
-            future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    future(const future&);
-    future& operator=(const future&);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~future();
-    shared_future<void> share();
-
-    // retrieving the value
-    void get();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(future<_Rp>& __x, future<_Rp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-// promise<R>
-
-template <class _Callable> class packaged_task;
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY promise
-{
-    __assoc_state<_Rp>* __state_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit promise(nullptr_t) _NOEXCEPT : __state_(nullptr) {}
-
-    template <class> friend class packaged_task;
-public:
-    promise();
-    template <class _Alloc>
-        promise(allocator_arg_t, const _Alloc& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise(promise&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    promise(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~promise();
-
-    // assignment
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise& operator=(promise&& __rhs) _NOEXCEPT
-        {
-            promise(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-    promise& operator=(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise& operator=(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(promise& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // retrieving the result
-    future<_Rp> get_future();
-
-    // setting the result
-    void set_value(const _Rp& __r);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void set_value(_Rp&& __r);
-#endif
-    void set_exception(exception_ptr __p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit(const _Rp& __r);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void set_value_at_thread_exit(_Rp&& __r);
-#endif
-    void set_exception_at_thread_exit(exception_ptr __p);
-};
-
-template <class _Rp>
-promise<_Rp>::promise()
-    : __state_(new __assoc_state<_Rp>)
-{
-}
-
-template <class _Rp>
-template <class _Alloc>
-promise<_Rp>::promise(allocator_arg_t, const _Alloc& __a0)
-{
-    typedef __assoc_state_alloc<_Rp, _Alloc> _State;
-    typedef typename __allocator_traits_rebind<_Alloc, _State>::type _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a(__a0);
-    unique_ptr<_State, _D2> __hold(__a.allocate(1), _D2(__a, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold.get()))) _State(__a0);
-    __state_ = _VSTD::addressof(*__hold.release());
-}
-
-template <class _Rp>
-promise<_Rp>::~promise()
-{
-    if (__state_)
-    {
-        if (!__state_->__has_value() && __state_->use_count() > 1)
-            __state_->set_exception(make_exception_ptr(
-                      future_error(make_error_code(future_errc::broken_promise))
-                                                      ));
-        __state_->__release_shared();
-    }
-}
-
-template <class _Rp>
-future<_Rp>
-promise<_Rp>::get_future()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    return future<_Rp>(__state_);
-}
-
-template <class _Rp>
-void
-promise<_Rp>::set_value(const _Rp& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value(__r);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp>
-void
-promise<_Rp>::set_value(_Rp&& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value(_VSTD::move(__r));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp>
-void
-promise<_Rp>::set_exception(exception_ptr __p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_exception(__p);
-}
-
-template <class _Rp>
-void
-promise<_Rp>::set_value_at_thread_exit(const _Rp& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value_at_thread_exit(__r);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp>
-void
-promise<_Rp>::set_value_at_thread_exit(_Rp&& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value_at_thread_exit(_VSTD::move(__r));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp>
-void
-promise<_Rp>::set_exception_at_thread_exit(exception_ptr __p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_exception_at_thread_exit(__p);
-}
-
-// promise<R&>
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY promise<_Rp&>
-{
-    __assoc_state<_Rp&>* __state_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit promise(nullptr_t) _NOEXCEPT : __state_(nullptr) {}
-
-    template <class> friend class packaged_task;
-
-public:
-    promise();
-    template <class _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise(promise&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    promise(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~promise();
-
-    // assignment
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise& operator=(promise&& __rhs) _NOEXCEPT
-        {
-            promise(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-    promise& operator=(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise& operator=(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(promise& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // retrieving the result
-    future<_Rp&> get_future();
-
-    // setting the result
-    void set_value(_Rp& __r);
-    void set_exception(exception_ptr __p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit(_Rp&);
-    void set_exception_at_thread_exit(exception_ptr __p);
-};
-
-template <class _Rp>
-promise<_Rp&>::promise()
-    : __state_(new __assoc_state<_Rp&>)
-{
-}
-
-template <class _Rp>
-template <class _Alloc>
-promise<_Rp&>::promise(allocator_arg_t, const _Alloc& __a0)
-{
-    typedef __assoc_state_alloc<_Rp&, _Alloc> _State;
-    typedef typename __allocator_traits_rebind<_Alloc, _State>::type _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a(__a0);
-    unique_ptr<_State, _D2> __hold(__a.allocate(1), _D2(__a, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold.get()))) _State(__a0);
-    __state_ = _VSTD::addressof(*__hold.release());
-}
-
-template <class _Rp>
-promise<_Rp&>::~promise()
-{
-    if (__state_)
-    {
-        if (!__state_->__has_value() && __state_->use_count() > 1)
-            __state_->set_exception(make_exception_ptr(
-                      future_error(make_error_code(future_errc::broken_promise))
-                                                      ));
-        __state_->__release_shared();
-    }
-}
-
-template <class _Rp>
-future<_Rp&>
-promise<_Rp&>::get_future()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    return future<_Rp&>(__state_);
-}
-
-template <class _Rp>
-void
-promise<_Rp&>::set_value(_Rp& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value(__r);
-}
-
-template <class _Rp>
-void
-promise<_Rp&>::set_exception(exception_ptr __p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_exception(__p);
-}
-
-template <class _Rp>
-void
-promise<_Rp&>::set_value_at_thread_exit(_Rp& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value_at_thread_exit(__r);
-}
-
-template <class _Rp>
-void
-promise<_Rp&>::set_exception_at_thread_exit(exception_ptr __p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_exception_at_thread_exit(__p);
-}
-
-// promise<void>
-
-template <>
-class _LIBCPP_TYPE_VIS promise<void>
-{
-    __assoc_sub_state* __state_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit promise(nullptr_t) _NOEXCEPT : __state_(nullptr) {}
-
-    template <class> friend class packaged_task;
-
-public:
-    promise();
-    template <class _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise(promise&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    promise(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~promise();
-
-    // assignment
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise& operator=(promise&& __rhs) _NOEXCEPT
-        {
-            promise(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-    promise& operator=(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise& operator=(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(promise& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // retrieving the result
-    future<void> get_future();
-
-    // setting the result
-    void set_value();
-    void set_exception(exception_ptr __p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit();
-    void set_exception_at_thread_exit(exception_ptr __p);
-};
-
-template <class _Alloc>
-promise<void>::promise(allocator_arg_t, const _Alloc& __a0)
-{
-    typedef __assoc_sub_state_alloc<_Alloc> _State;
-    typedef typename __allocator_traits_rebind<_Alloc, _State>::type _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a(__a0);
-    unique_ptr<_State, _D2> __hold(__a.allocate(1), _D2(__a, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold.get()))) _State(__a0);
-    __state_ = _VSTD::addressof(*__hold.release());
-}
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(promise<_Rp>& __x, promise<_Rp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template <class _Rp, class _Alloc>
-    struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<promise<_Rp>, _Alloc>
-        : public true_type {};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// packaged_task
-
-template<class _Fp> class __packaged_task_base;
-
-template<class _Rp, class ..._ArgTypes>
-class __packaged_task_base<_Rp(_ArgTypes...)>
-{
-    __packaged_task_base(const __packaged_task_base&);
-    __packaged_task_base& operator=(const __packaged_task_base&);
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __packaged_task_base() {}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual ~__packaged_task_base() {}
-    virtual void __move_to(__packaged_task_base*) _NOEXCEPT = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()(_ArgTypes&& ...) = 0;
-};
-
-template<class _FD, class _Alloc, class _FB> class __packaged_task_func;
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-class __packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>
-    : public  __packaged_task_base<_Rp(_ArgTypes...)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __packaged_task_func(const _Fp& __f) : __f_(__f) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __packaged_task_func(_Fp&& __f) : __f_(_VSTD::move(__f)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __packaged_task_func(const _Fp& __f, const _Alloc& __a)
-        : __f_(__f, __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __packaged_task_func(_Fp&& __f, const _Alloc& __a)
-        : __f_(_VSTD::move(__f), __a) {}
-    virtual void __move_to(__packaged_task_base<_Rp(_ArgTypes...)>*) _NOEXCEPT;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()(_ArgTypes&& ... __args);
-};
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__move_to(
-                              __packaged_task_base<_Rp(_ArgTypes...)>* __p) _NOEXCEPT
-{
-    ::new (__p) __packaged_task_func(_VSTD::move(__f_.first()), _VSTD::move(__f_.second()));
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy_deallocate()
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __packaged_task_func>::type _Ap;
-    typedef allocator_traits<_Ap> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-_Rp
-__packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::operator()(_ArgTypes&& ... __arg)
-{
-    return __invoke(__f_.first(), _VSTD::forward<_ArgTypes>(__arg)...);
-}
-
-template <class _Callable> class __packaged_task_function;
-
-template<class _Rp, class ..._ArgTypes>
-class __packaged_task_function<_Rp(_ArgTypes...)>
-{
-    typedef __packaged_task_base<_Rp(_ArgTypes...)> __base;
-    typename aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-public:
-    typedef _Rp result_type;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    __packaged_task_function() _NOEXCEPT : __f_(nullptr) {}
-    template<class _Fp>
-      __packaged_task_function(_Fp&& __f);
-    template<class _Fp, class _Alloc>
-      __packaged_task_function(allocator_arg_t, const _Alloc& __a, _Fp&& __f);
-
-    __packaged_task_function(__packaged_task_function&&) _NOEXCEPT;
-    __packaged_task_function& operator=(__packaged_task_function&&) _NOEXCEPT;
-
-    __packaged_task_function(const __packaged_task_function&) =  delete;
-    __packaged_task_function& operator=(const __packaged_task_function&) =  delete;
-
-    ~__packaged_task_function();
-
-    void swap(__packaged_task_function&) _NOEXCEPT;
-
-    _Rp operator()(_ArgTypes...) const;
-};
-
-template<class _Rp, class ..._ArgTypes>
-__packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function(__packaged_task_function&& __f) _NOEXCEPT
-{
-    if (__f.__f_ == nullptr)
-        __f_ = nullptr;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__move_to(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = nullptr;
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp>
-__packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function(_Fp&& __f)
-    : __f_(nullptr)
-{
-    typedef typename remove_reference<typename decay<_Fp>::type>::type _FR;
-    typedef __packaged_task_func<_FR, allocator<_FR>, _Rp(_ArgTypes...)> _FF;
-    if (sizeof(_FF) <= sizeof(__buf_))
-    {
-        __f_ = (__base*)&__buf_;
-        ::new (__f_) _FF(_VSTD::forward<_Fp>(__f));
-    }
-    else
-    {
-        typedef allocator<_FF> _Ap;
-        _Ap __a;
-        typedef __allocator_destructor<_Ap> _Dp;
-        unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-        ::new (__hold.get()) _FF(_VSTD::forward<_Fp>(__f), allocator<_FR>(__a));
-        __f_ = __hold.release();
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp, class _Alloc>
-__packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function(
-                                  allocator_arg_t, const _Alloc& __a0, _Fp&& __f)
-    : __f_(nullptr)
-{
-    typedef typename remove_reference<typename decay<_Fp>::type>::type _FR;
-    typedef __packaged_task_func<_FR, _Alloc, _Rp(_ArgTypes...)> _FF;
-    if (sizeof(_FF) <= sizeof(__buf_))
-    {
-        __f_ = (__base*)&__buf_;
-        ::new (__f_) _FF(_VSTD::forward<_Fp>(__f));
-    }
-    else
-    {
-        typedef typename __allocator_traits_rebind<_Alloc, _FF>::type _Ap;
-        _Ap __a(__a0);
-        typedef __allocator_destructor<_Ap> _Dp;
-        unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-        ::new (static_cast<void*>(_VSTD::addressof(*__hold.get())))
-            _FF(_VSTD::forward<_Fp>(__f), _Alloc(__a));
-        __f_ = _VSTD::addressof(*__hold.release());
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-__packaged_task_function<_Rp(_ArgTypes...)>&
-__packaged_task_function<_Rp(_ArgTypes...)>::operator=(__packaged_task_function&& __f) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = nullptr;
-    if (__f.__f_ == nullptr)
-        __f_ = nullptr;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__move_to(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = nullptr;
-    }
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-__packaged_task_function<_Rp(_ArgTypes...)>::~__packaged_task_function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class ..._ArgTypes>
-void
-__packaged_task_function<_Rp(_ArgTypes...)>::swap(__packaged_task_function& __f) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__move_to(__t);
-        __f_->destroy();
-        __f_ = nullptr;
-        __f.__f_->__move_to((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = nullptr;
-        __f_ = (__base*)&__buf_;
-        __t->__move_to((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__move_to((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__move_to((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class ..._ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-_Rp
-__packaged_task_function<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __arg) const
-{
-    return (*__f_)(_VSTD::forward<_ArgTypes>(__arg)...);
-}
-
-template<class _Rp, class ..._ArgTypes>
-class _LIBCPP_TYPE_VIS_ONLY packaged_task<_Rp(_ArgTypes...)>
-{
-public:
-    typedef _Rp result_type;
-
-private:
-    __packaged_task_function<result_type(_ArgTypes...)> __f_;
-    promise<result_type>                                __p_;
-
-public:
-    // construction and destruction
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task() _NOEXCEPT : __p_(nullptr) {}
-    template <class _Fp,
-              class = typename enable_if
-              <
-                  !is_same<
-                      typename decay<_Fp>::type, 
-                      packaged_task
-                      >::value
-                  >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        explicit packaged_task(_Fp&& __f) : __f_(_VSTD::forward<_Fp>(__f)) {}
-    template <class _Fp, class _Allocator,
-              class = typename enable_if
-              <
-                  !is_same<
-                      typename decay<_Fp>::type, 
-                      packaged_task
-                      >::value
-                  >::type
-              >
-        _LIBCPP_INLINE_VISIBILITY
-        explicit packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f)
-             : __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)),
-               __p_(allocator_arg, __a) {}
-    // ~packaged_task() = default;
-
-    // no copy
-    packaged_task(const packaged_task&) = delete;
-    packaged_task& operator=(const packaged_task&) = delete;
-
-    // move support
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task(packaged_task&& __other) _NOEXCEPT
-        : __f_(_VSTD::move(__other.__f_)), __p_(_VSTD::move(__other.__p_)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task& operator=(packaged_task&& __other) _NOEXCEPT
-    {
-        __f_ = _VSTD::move(__other.__f_);
-        __p_ = _VSTD::move(__other.__p_);
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(packaged_task& __other) _NOEXCEPT
-    {
-        __f_.swap(__other.__f_);
-        __p_.swap(__other.__p_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __p_.__state_ != nullptr;}
-
-    // result retrieval
-    _LIBCPP_INLINE_VISIBILITY
-    future<result_type> get_future() {return __p_.get_future();}
-
-    // execution
-    void operator()(_ArgTypes... __args);
-    void make_ready_at_thread_exit(_ArgTypes... __args);
-
-    void reset();
-};
-
-template<class _Rp, class ..._ArgTypes>
-void
-packaged_task<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __args)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__p_.__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-    if (__p_.__state_->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __p_.set_value(__f_(_VSTD::forward<_ArgTypes>(__args)...));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __p_.set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Rp, class ..._ArgTypes>
-void
-packaged_task<_Rp(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... __args)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__p_.__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-    if (__p_.__state_->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __p_.set_value_at_thread_exit(__f_(_VSTD::forward<_ArgTypes>(__args)...));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __p_.set_exception_at_thread_exit(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Rp, class ..._ArgTypes>
-void
-packaged_task<_Rp(_ArgTypes...)>::reset()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!valid())
-        throw future_error(make_error_code(future_errc::no_state));
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    __p_ = promise<result_type>();
-}
-
-template<class ..._ArgTypes>
-class _LIBCPP_TYPE_VIS_ONLY packaged_task<void(_ArgTypes...)>
-{
-public:
-    typedef void result_type;
-
-private:
-    __packaged_task_function<result_type(_ArgTypes...)> __f_;
-    promise<result_type>                                __p_;
-
-public:
-    // construction and destruction
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task() _NOEXCEPT : __p_(nullptr) {}
-    template <class _Fp,
-              class = typename enable_if
-              <
-                  !is_same<
-                      typename decay<_Fp>::type, 
-                      packaged_task
-                      >::value
-                  >::type
-              >
-        _LIBCPP_INLINE_VISIBILITY
-        explicit packaged_task(_Fp&& __f) : __f_(_VSTD::forward<_Fp>(__f)) {}
-    template <class _Fp, class _Allocator,
-              class = typename enable_if
-              <
-                  !is_same<
-                      typename decay<_Fp>::type, 
-                      packaged_task
-                      >::value
-                  >::type
-              >    
-        _LIBCPP_INLINE_VISIBILITY
-        explicit packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f)
-             : __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)),
-               __p_(allocator_arg, __a) {}
-    // ~packaged_task() = default;
-
-    // no copy
-    packaged_task(const packaged_task&) = delete;
-    packaged_task& operator=(const packaged_task&) = delete;
-
-    // move support
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task(packaged_task&& __other) _NOEXCEPT
-        : __f_(_VSTD::move(__other.__f_)), __p_(_VSTD::move(__other.__p_)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task& operator=(packaged_task&& __other) _NOEXCEPT
-    {
-        __f_ = _VSTD::move(__other.__f_);
-        __p_ = _VSTD::move(__other.__p_);
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(packaged_task& __other) _NOEXCEPT
-    {
-        __f_.swap(__other.__f_);
-        __p_.swap(__other.__p_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __p_.__state_ != nullptr;}
-
-    // result retrieval
-    _LIBCPP_INLINE_VISIBILITY
-    future<result_type> get_future() {return __p_.get_future();}
-
-    // execution
-    void operator()(_ArgTypes... __args);
-    void make_ready_at_thread_exit(_ArgTypes... __args);
-
-    void reset();
-};
-
-template<class ..._ArgTypes>
-void
-packaged_task<void(_ArgTypes...)>::operator()(_ArgTypes... __args)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__p_.__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-    if (__p_.__state_->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __f_(_VSTD::forward<_ArgTypes>(__args)...);
-        __p_.set_value();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __p_.set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class ..._ArgTypes>
-void
-packaged_task<void(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... __args)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__p_.__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-    if (__p_.__state_->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __f_(_VSTD::forward<_ArgTypes>(__args)...);
-        __p_.set_value_at_thread_exit();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __p_.set_exception_at_thread_exit(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class ..._ArgTypes>
-void
-packaged_task<void(_ArgTypes...)>::reset()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!valid())
-        throw future_error(make_error_code(future_errc::no_state));
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    __p_ = promise<result_type>();
-}
-
-template <class _Callable>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(packaged_task<_Callable>& __x, packaged_task<_Callable>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template <class _Callable, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<packaged_task<_Callable>, _Alloc>
-    : public true_type {};
-
-template <class _Rp, class _Fp>
-future<_Rp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__make_deferred_assoc_state(_Fp&& __f)
-#else
-__make_deferred_assoc_state(_Fp __f)
-#endif
-{
-    unique_ptr<__deferred_assoc_state<_Rp, _Fp>, __release_shared_count>
-        __h(new __deferred_assoc_state<_Rp, _Fp>(_VSTD::forward<_Fp>(__f)));
-    return future<_Rp>(__h.get());
-}
-
-template <class _Rp, class _Fp>
-future<_Rp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__make_async_assoc_state(_Fp&& __f)
-#else
-__make_async_assoc_state(_Fp __f)
-#endif
-{
-    unique_ptr<__async_assoc_state<_Rp, _Fp>, __release_shared_count>
-        __h(new __async_assoc_state<_Rp, _Fp>(_VSTD::forward<_Fp>(__f)));
-    _VSTD::thread(&__async_assoc_state<_Rp, _Fp>::__execute, __h.get()).detach();
-    return future<_Rp>(__h.get());
-}
-
-template <class _Fp, class... _Args>
-class __async_func
-{
-    tuple<_Fp, _Args...> __f_;
-
-public:
-    typedef typename __invoke_of<_Fp, _Args...>::type _Rp;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __async_func(_Fp&& __f, _Args&&... __args)
-        : __f_(_VSTD::move(__f), _VSTD::move(__args)...) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __async_func(__async_func&& __f) : __f_(_VSTD::move(__f.__f_)) {}
-
-    _Rp operator()()
-    {
-        typedef typename __make_tuple_indices<1+sizeof...(_Args), 1>::type _Index;
-        return __execute(_Index());
-    }
-private:
-    template <size_t ..._Indices>
-    _Rp
-    __execute(__tuple_indices<_Indices...>)
-    {
-        return __invoke(_VSTD::move(_VSTD::get<0>(__f_)), _VSTD::move(_VSTD::get<_Indices>(__f_))...);
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY bool __does_policy_contain(launch __policy, launch __value )
-{ return (int(__policy) & int(__value)) != 0; }
-
-template <class _Fp, class... _Args>
-future<typename __invoke_of<typename decay<_Fp>::type, typename decay<_Args>::type...>::type>
-async(launch __policy, _Fp&& __f, _Args&&... __args)
-{
-    typedef __async_func<typename decay<_Fp>::type, typename decay<_Args>::type...> _BF;
-    typedef typename _BF::_Rp _Rp;
-
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif
-        if (__does_policy_contain(__policy, launch::async))
-        return _VSTD::__make_async_assoc_state<_Rp>(_BF(__decay_copy(_VSTD::forward<_Fp>(__f)),
-                                                     __decay_copy(_VSTD::forward<_Args>(__args))...));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch ( ... ) { if (__policy == launch::async) throw ; }
-#endif
-
-    if (__does_policy_contain(__policy, launch::deferred))
-        return _VSTD::__make_deferred_assoc_state<_Rp>(_BF(__decay_copy(_VSTD::forward<_Fp>(__f)),
-                                                        __decay_copy(_VSTD::forward<_Args>(__args))...));
-    return future<_Rp>{};
-}
-
-template <class _Fp, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-future<typename __invoke_of<typename decay<_Fp>::type, typename decay<_Args>::type...>::type>
-async(_Fp&& __f, _Args&&... __args)
-{
-    return _VSTD::async(launch::any, _VSTD::forward<_Fp>(__f),
-                                    _VSTD::forward<_Args>(__args)...);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-// shared_future
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY shared_future
-{
-    __assoc_state<_Rp>* __state_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future() _NOEXCEPT : __state_(nullptr) {}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(const shared_future& __rhs) : __state_(__rhs.__state_)
-        {if (__state_) __state_->__add_shared();}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(future<_Rp>&& __f) _NOEXCEPT : __state_(__f.__state_)
-        {__f.__state_ = nullptr;}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(shared_future&& __rhs) _NOEXCEPT : __state_(__rhs.__state_)
-        {__rhs.__state_ = nullptr;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~shared_future();
-    shared_future& operator=(const shared_future& __rhs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future& operator=(shared_future&& __rhs) _NOEXCEPT
-        {
-            shared_future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    // retrieving the value
-    _LIBCPP_INLINE_VISIBILITY
-    const _Rp& get() const {return __state_->copy();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(shared_future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-shared_future<_Rp>::~shared_future()
-{
-    if (__state_)
-        __state_->__release_shared();
-}
-
-template <class _Rp>
-shared_future<_Rp>&
-shared_future<_Rp>::operator=(const shared_future& __rhs)
-{
-    if (__rhs.__state_)
-        __rhs.__state_->__add_shared();
-    if (__state_)
-        __state_->__release_shared();
-    __state_ = __rhs.__state_;
-    return *this;
-}
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY shared_future<_Rp&>
-{
-    __assoc_state<_Rp&>* __state_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future() _NOEXCEPT : __state_(nullptr) {}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(const shared_future& __rhs) : __state_(__rhs.__state_)
-        {if (__state_) __state_->__add_shared();}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(future<_Rp&>&& __f) _NOEXCEPT : __state_(__f.__state_)
-        {__f.__state_ = nullptr;}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(shared_future&& __rhs) _NOEXCEPT : __state_(__rhs.__state_)
-        {__rhs.__state_ = nullptr;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~shared_future();
-    shared_future& operator=(const shared_future& __rhs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future& operator=(shared_future&& __rhs) _NOEXCEPT
-        {
-            shared_future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    // retrieving the value
-    _LIBCPP_INLINE_VISIBILITY
-    _Rp& get() const {return __state_->copy();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(shared_future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-shared_future<_Rp&>::~shared_future()
-{
-    if (__state_)
-        __state_->__release_shared();
-}
-
-template <class _Rp>
-shared_future<_Rp&>&
-shared_future<_Rp&>::operator=(const shared_future& __rhs)
-{
-    if (__rhs.__state_)
-        __rhs.__state_->__add_shared();
-    if (__state_)
-        __state_->__release_shared();
-    __state_ = __rhs.__state_;
-    return *this;
-}
-
-template <>
-class _LIBCPP_TYPE_VIS shared_future<void>
-{
-    __assoc_sub_state* __state_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future() _NOEXCEPT : __state_(nullptr) {}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(const shared_future& __rhs) : __state_(__rhs.__state_)
-        {if (__state_) __state_->__add_shared();}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(future<void>&& __f) _NOEXCEPT : __state_(__f.__state_)
-        {__f.__state_ = nullptr;}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(shared_future&& __rhs) _NOEXCEPT : __state_(__rhs.__state_)
-        {__rhs.__state_ = nullptr;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~shared_future();
-    shared_future& operator=(const shared_future& __rhs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future& operator=(shared_future&& __rhs) _NOEXCEPT
-        {
-            shared_future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    // retrieving the value
-    _LIBCPP_INLINE_VISIBILITY
-    void get() const {__state_->copy();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(shared_future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(shared_future<_Rp>& __x, shared_future<_Rp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_future<_Rp>
-future<_Rp>::share()
-{
-    return shared_future<_Rp>(_VSTD::move(*this));
-}
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_future<_Rp&>
-future<_Rp&>::share()
-{
-    return shared_future<_Rp&>(_VSTD::move(*this));
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-inline _LIBCPP_INLINE_VISIBILITY
-shared_future<void>
-future<void>::share()
-{
-    return shared_future<void>(_VSTD::move(*this));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_FUTURE
diff --git a/include.new/c++/v1/initializer_list b/include.new/c++/v1/initializer_list
deleted file mode 100644
index 663e49b..0000000
--- a/include.new/c++/v1/initializer_list
+++ /dev/null
@@ -1,118 +0,0 @@
-// -*- C++ -*-
-//===----------------------- initializer_list -----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_INITIALIZER_LIST
-#define _LIBCPP_INITIALIZER_LIST
-
-/*
-    initializer_list synopsis
-
-namespace std
-{
-
-template<class E>
-class initializer_list
-{
-public:
-    typedef E        value_type;
-    typedef const E& reference;
-    typedef const E& const_reference;
-    typedef size_t   size_type;
-
-    typedef const E* iterator;
-    typedef const E* const_iterator;
-
-    initializer_list() noexcept; // constexpr in C++14
-
-    size_t   size()  const noexcept; // constexpr in C++14
-    const E* begin() const noexcept; // constexpr in C++14
-    const E* end()   const noexcept; // constexpr in C++14
-};
-
-template<class E> const E* begin(initializer_list<E> il) noexcept; // constexpr in C++14
-template<class E> const E* end(initializer_list<E> il) noexcept; // constexpr in C++14
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cstddef>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-namespace std  // purposefully not versioned
-{
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _Ep>
-class _LIBCPP_TYPE_VIS_ONLY initializer_list
-{
-    const _Ep* __begin_;
-    size_t    __size_;
-
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    initializer_list(const _Ep* __b, size_t __s) _NOEXCEPT
-        : __begin_(__b),
-          __size_(__s)
-        {}
-public:
-    typedef _Ep        value_type;
-    typedef const _Ep& reference;
-    typedef const _Ep& const_reference;
-    typedef size_t    size_type;
-
-    typedef const _Ep* iterator;
-    typedef const _Ep* const_iterator;
-
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    initializer_list() _NOEXCEPT : __begin_(nullptr), __size_(0) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    size_t    size()  const _NOEXCEPT {return __size_;}
-    
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const _Ep* begin() const _NOEXCEPT {return __begin_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const _Ep* end()   const _NOEXCEPT {return __begin_ + __size_;}
-};
-
-template<class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Ep*
-begin(initializer_list<_Ep> __il) _NOEXCEPT
-{
-    return __il.begin();
-}
-
-template<class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Ep*
-end(initializer_list<_Ep> __il) _NOEXCEPT
-{
-    return __il.end();
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-}  // std
-
-#endif  // _LIBCPP_INITIALIZER_LIST
diff --git a/include.new/c++/v1/iomanip b/include.new/c++/v1/iomanip
deleted file mode 100644
index a5042c7..0000000
--- a/include.new/c++/v1/iomanip
+++ /dev/null
@@ -1,654 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- iomanip ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_IOMANIP
-#define _LIBCPP_IOMANIP
-
-/*
-    iomanip synopsis
-
-namespace std {
-
-// types T1, T2, ... are unspecified implementation types
-T1 resetiosflags(ios_base::fmtflags mask);
-T2 setiosflags (ios_base::fmtflags mask);
-T3 setbase(int base);
-template<charT> T4 setfill(charT c);
-T5 setprecision(int n);
-T6 setw(int n);
-template <class moneyT> T7 get_money(moneyT& mon, bool intl = false);
-template <class charT, class moneyT> T8 put_money(const moneyT& mon, bool intl = false);
-template <class charT> T9 get_time(struct tm* tmb, const charT* fmt);
-template <class charT> T10 put_time(const struct tm* tmb, const charT* fmt);
-
-template <class charT>
-  T11 quoted(const charT* s, charT delim=charT('"'), charT escape=charT('\\')); // C++14
-
-template <class charT, class traits, class Allocator>
-  T12 quoted(const basic_string<charT, traits, Allocator>& s,
-             charT delim=charT('"'), charT escape=charT('\\')); // C++14
-
-template <class charT, class traits, class Allocator>
-  T13 quoted(basic_string<charT, traits, Allocator>& s,
-             charT delim=charT('"'), charT escape=charT('\\')); // C++14
-
-}  // std
-
-*/
-
-#include <__config>
-#include <istream>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// resetiosflags
-
-class __iom_t1
-{
-    ios_base::fmtflags __mask_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t1(ios_base::fmtflags __m) : __mask_(__m) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t1& __x)
-    {
-        __is.unsetf(__x.__mask_);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t1& __x)
-    {
-        __os.unsetf(__x.__mask_);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t1
-resetiosflags(ios_base::fmtflags __mask)
-{
-    return __iom_t1(__mask);
-}
-
-// setiosflags
-
-class __iom_t2
-{
-    ios_base::fmtflags __mask_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t2(ios_base::fmtflags __m) : __mask_(__m) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t2& __x)
-    {
-        __is.setf(__x.__mask_);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t2& __x)
-    {
-        __os.setf(__x.__mask_);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t2
-setiosflags(ios_base::fmtflags __mask)
-{
-    return __iom_t2(__mask);
-}
-
-// setbase
-
-class __iom_t3
-{
-    int __base_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t3(int __b) : __base_(__b) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t3& __x)
-    {
-        __is.setf(__x.__base_ == 8  ? ios_base::oct :
-                  __x.__base_ == 10 ? ios_base::dec :
-                  __x.__base_ == 16 ? ios_base::hex :
-                  ios_base::fmtflags(0), ios_base::basefield);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t3& __x)
-    {
-        __os.setf(__x.__base_ == 8  ? ios_base::oct :
-                  __x.__base_ == 10 ? ios_base::dec :
-                  __x.__base_ == 16 ? ios_base::hex :
-                  ios_base::fmtflags(0), ios_base::basefield);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t3
-setbase(int __base)
-{
-    return __iom_t3(__base);
-}
-
-// setfill
-
-template<class _CharT>
-class __iom_t4
-{
-    _CharT __fill_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t4(_CharT __c) : __fill_(__c) {}
-
-    template <class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t4& __x)
-    {
-        __os.fill(__x.__fill_);
-        return __os;
-    }
-};
-
-template<class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t4<_CharT>
-setfill(_CharT __c)
-{
-    return __iom_t4<_CharT>(__c);
-}
-
-// setprecision
-
-class __iom_t5
-{
-    int __n_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t5(int __n) : __n_(__n) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t5& __x)
-    {
-        __is.precision(__x.__n_);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t5& __x)
-    {
-        __os.precision(__x.__n_);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t5
-setprecision(int __n)
-{
-    return __iom_t5(__n);
-}
-
-// setw
-
-class __iom_t6
-{
-    int __n_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t6(int __n) : __n_(__n) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t6& __x)
-    {
-        __is.width(__x.__n_);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t6& __x)
-    {
-        __os.width(__x.__n_);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t6
-setw(int __n)
-{
-    return __iom_t6(__n);
-}
-
-// get_money
-
-template <class _MoneyT> class __iom_t7;
-
-template <class _CharT, class _Traits, class _MoneyT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x);
-
-template <class _MoneyT>
-class __iom_t7
-{
-    _MoneyT& __mon_;
-    bool __intl_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __iom_t7(_MoneyT& __mon, bool __intl)
-        : __mon_(__mon), __intl_(__intl) {}
-
-    template <class _CharT, class _Traits, class _Mp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_Mp>& __x);
-};
-
-template <class _CharT, class _Traits, class _MoneyT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __s(__is);
-        if (__s)
-        {
-            typedef istreambuf_iterator<_CharT, _Traits> _Ip;
-            typedef money_get<_CharT, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            const _Fp& __mf = use_facet<_Fp>(__is.getloc());
-            __mf.get(_Ip(__is), _Ip(), __x.__intl_, __is, __err, __x.__mon_);
-            __is.setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template <class _MoneyT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t7<_MoneyT>
-get_money(_MoneyT& __mon, bool __intl = false)
-{
-    return __iom_t7<_MoneyT>(__mon, __intl);
-}
-
-// put_money
-
-template <class _MoneyT> class __iom_t8;
-
-template <class _CharT, class _Traits, class _MoneyT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x);
-
-template <class _MoneyT>
-class __iom_t8
-{
-    const _MoneyT& __mon_;
-    bool __intl_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __iom_t8(const _MoneyT& __mon, bool __intl)
-        : __mon_(__mon), __intl_(__intl) {}
-
-    template <class _CharT, class _Traits, class _Mp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_Mp>& __x);
-};
-
-template <class _CharT, class _Traits, class _MoneyT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Op;
-            typedef money_put<_CharT, _Op> _Fp;
-            const _Fp& __mf = use_facet<_Fp>(__os.getloc());
-            if (__mf.put(_Op(__os), __x.__intl_, __os, __os.fill(), __x.__mon_).failed())
-                __os.setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-template <class _MoneyT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t8<_MoneyT>
-put_money(const _MoneyT& __mon, bool __intl = false)
-{
-    return __iom_t8<_MoneyT>(__mon, __intl);
-}
-
-// get_time
-
-template <class _CharT> class __iom_t9;
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x);
-
-template <class _CharT>
-class __iom_t9
-{
-    tm* __tm_;
-    const _CharT* __fmt_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __iom_t9(tm* __tm, const _CharT* __fmt)
-        : __tm_(__tm), __fmt_(__fmt) {}
-
-    template <class _Cp, class _Traits>
-    friend
-    basic_istream<_Cp, _Traits>&
-    operator>>(basic_istream<_Cp, _Traits>& __is, const __iom_t9<_Cp>& __x);
-};
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __s(__is);
-        if (__s)
-        {
-            typedef istreambuf_iterator<_CharT, _Traits> _Ip;
-            typedef time_get<_CharT, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            const _Fp& __tf = use_facet<_Fp>(__is.getloc());
-            __tf.get(_Ip(__is), _Ip(), __is, __err, __x.__tm_,
-                     __x.__fmt_, __x.__fmt_ + _Traits::length(__x.__fmt_));
-            __is.setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t9<_CharT>
-get_time(tm* __tm, const _CharT* __fmt)
-{
-    return __iom_t9<_CharT>(__tm, __fmt);
-}
-
-// put_time
-
-template <class _CharT> class __iom_t10;
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x);
-
-template <class _CharT>
-class __iom_t10
-{
-    const tm* __tm_;
-    const _CharT* __fmt_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __iom_t10(const tm* __tm, const _CharT* __fmt)
-        : __tm_(__tm), __fmt_(__fmt) {}
-
-    template <class _Cp, class _Traits>
-    friend
-    basic_ostream<_Cp, _Traits>&
-    operator<<(basic_ostream<_Cp, _Traits>& __os, const __iom_t10<_Cp>& __x);
-};
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Op;
-            typedef time_put<_CharT, _Op> _Fp;
-            const _Fp& __tf = use_facet<_Fp>(__os.getloc());
-            if (__tf.put(_Op(__os), __os, __os.fill(), __x.__tm_,
-                         __x.__fmt_, __x.__fmt_ + _Traits::length(__x.__fmt_)).failed())
-                __os.setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t10<_CharT>
-put_time(const tm* __tm, const _CharT* __fmt)
-{
-    return __iom_t10<_CharT>(__tm, __fmt);
-}
-
-#if _LIBCPP_STD_VER > 11
-
-template <class _CharT, class _Traits, class _ForwardIterator>
-std::basic_ostream<_CharT, _Traits> &
-__quoted_output ( basic_ostream<_CharT, _Traits> &__os, 
-        _ForwardIterator __first, _ForwardIterator __last, _CharT __delim, _CharT __escape )
-{
-    _VSTD::basic_string<_CharT, _Traits> __str;
-    __str.push_back(__delim);
-    for ( ; __first != __last; ++ __first )
-    {
-        if (_Traits::eq (*__first, __escape) || _Traits::eq (*__first, __delim))
-            __str.push_back(__escape);
-        __str.push_back(*__first);
-    }
-    __str.push_back(__delim);
-    return __put_character_sequence(__os, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _String>
-basic_istream<_CharT, _Traits> &
-__quoted_input ( basic_istream<_CharT, _Traits> &__is, _String & __string, _CharT __delim, _CharT __escape )
-{
-    __string.clear ();
-    _CharT __c;
-    __is >> __c;
-    if ( __is.fail ())
-        return __is;
-
-    if (!_Traits::eq (__c, __delim))    // no delimiter, read the whole string
-    {
-        __is.unget ();
-        __is >> __string;
-        return __is;
-    }
-
-    __save_flags<_CharT, _Traits> sf(__is);
-    noskipws (__is);
-    while (true)
-        {
-        __is >> __c;
-        if ( __is.fail ())
-            break;
-        if (_Traits::eq (__c, __escape))
-        {
-            __is >> __c;
-            if ( __is.fail ())
-                break;
-        }
-        else if (_Traits::eq (__c, __delim))
-            break;
-        __string.push_back ( __c );
-        }
-    return __is;
-}
-
-
-template <class _CharT, class _Iter, class _Traits=char_traits<_CharT>>
-struct __quoted_output_proxy
-{
-    _Iter  __first;
-    _Iter  __last;
-    _CharT  __delim;
-    _CharT  __escape;
-
-    __quoted_output_proxy(_Iter __f, _Iter __l, _CharT __d, _CharT __e)
-    : __first(__f), __last(__l), __delim(__d), __escape(__e) {}
-    //  This would be a nice place for a string_ref 
-};
-
-template <class _CharT, class _Traits, class _Iter>
-basic_ostream<_CharT, _Traits>& operator<<(
-         basic_ostream<_CharT, _Traits>& __os, 
-         const __quoted_output_proxy<_CharT, _Iter, _Traits> & __proxy)
-{
-    return __quoted_output (__os, __proxy.__first, __proxy.__last, __proxy.__delim, __proxy.__escape);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-struct __quoted_proxy
-{
-    basic_string<_CharT, _Traits, _Allocator> &__string;
-    _CharT  __delim;
-    _CharT  __escape;
-
-    __quoted_proxy(basic_string<_CharT, _Traits, _Allocator> &__s, _CharT __d, _CharT __e)
-    : __string(__s), __delim(__d), __escape(__e) {}
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-_LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>& operator<<(
-        basic_ostream<_CharT, _Traits>& __os, 
-        const __quoted_proxy<_CharT, _Traits, _Allocator> & __proxy)
-{
-    return __quoted_output (__os, __proxy.__string.cbegin (), __proxy.__string.cend (), __proxy.__delim, __proxy.__escape);
-}
-
-//  extractor for non-const basic_string& proxies
-template <class _CharT, class _Traits, class _Allocator>
-_LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>& operator>>(
-        basic_istream<_CharT, _Traits>& __is, 
-        const __quoted_proxy<_CharT, _Traits, _Allocator> & __proxy)
-{
-    return __quoted_input ( __is, __proxy.__string, __proxy.__delim, __proxy.__escape );
-}
-
-
-template <class _CharT>
-_LIBCPP_INLINE_VISIBILITY
-__quoted_output_proxy<_CharT, const _CharT *>
-quoted ( const _CharT *__s, _CharT __delim = _CharT('"'), _CharT __escape =_CharT('\\'))
-{
-    const _CharT *__end = __s;
-    while ( *__end ) ++__end;
-    return __quoted_output_proxy<_CharT, const _CharT *> ( __s, __end, __delim, __escape );
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-_LIBCPP_INLINE_VISIBILITY
-__quoted_output_proxy<_CharT, typename basic_string <_CharT, _Traits, _Allocator>::const_iterator>
-quoted ( const basic_string <_CharT, _Traits, _Allocator> &__s, _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
-{
-    return __quoted_output_proxy<_CharT, 
-            typename basic_string <_CharT, _Traits, _Allocator>::const_iterator> 
-                    ( __s.cbegin(), __s.cend (), __delim, __escape );
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-__quoted_proxy<_CharT, _Traits, _Allocator>
-quoted ( basic_string <_CharT, _Traits, _Allocator> &__s, _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
-{
-    return __quoted_proxy<_CharT, _Traits, _Allocator>( __s, __delim, __escape );
-}
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_IOMANIP
diff --git a/include.new/c++/v1/ios b/include.new/c++/v1/ios
deleted file mode 100644
index ff79998..0000000
--- a/include.new/c++/v1/ios
+++ /dev/null
@@ -1,1023 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- ios -------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_IOS
-#define _LIBCPP_IOS
-
-/*
-    ios synopsis
-
-#include <iosfwd>
-
-namespace std
-{
-
-typedef OFF_T streamoff;
-typedef SZ_T streamsize;
-template <class stateT> class fpos;
-
-class ios_base
-{
-public:
-    class failure;
-
-    typedef T1 fmtflags;
-    static constexpr fmtflags boolalpha;
-    static constexpr fmtflags dec;
-    static constexpr fmtflags fixed;
-    static constexpr fmtflags hex;
-    static constexpr fmtflags internal;
-    static constexpr fmtflags left;
-    static constexpr fmtflags oct;
-    static constexpr fmtflags right;
-    static constexpr fmtflags scientific;
-    static constexpr fmtflags showbase;
-    static constexpr fmtflags showpoint;
-    static constexpr fmtflags showpos;
-    static constexpr fmtflags skipws;
-    static constexpr fmtflags unitbuf;
-    static constexpr fmtflags uppercase;
-    static constexpr fmtflags adjustfield;
-    static constexpr fmtflags basefield;
-    static constexpr fmtflags floatfield;
-
-    typedef T2 iostate;
-    static constexpr iostate badbit;
-    static constexpr iostate eofbit;
-    static constexpr iostate failbit;
-    static constexpr iostate goodbit;
-
-    typedef T3 openmode;
-    static constexpr openmode app;
-    static constexpr openmode ate;
-    static constexpr openmode binary;
-    static constexpr openmode in;
-    static constexpr openmode out;
-    static constexpr openmode trunc;
-
-    typedef T4 seekdir;
-    static constexpr seekdir beg;
-    static constexpr seekdir cur;
-    static constexpr seekdir end;
-
-    class Init;
-
-    // 27.5.2.2 fmtflags state:
-    fmtflags flags() const;
-    fmtflags flags(fmtflags fmtfl);
-    fmtflags setf(fmtflags fmtfl);
-    fmtflags setf(fmtflags fmtfl, fmtflags mask);
-    void unsetf(fmtflags mask);
-
-    streamsize precision() const;
-    streamsize precision(streamsize prec);
-    streamsize width() const;
-    streamsize width(streamsize wide);
-
-    // 27.5.2.3 locales:
-    locale imbue(const locale& loc);
-    locale getloc() const;
-
-    // 27.5.2.5 storage:
-    static int xalloc();
-    long& iword(int index);
-    void*& pword(int index);
-
-    // destructor
-    virtual ~ios_base();
-
-    // 27.5.2.6 callbacks;
-    enum event { erase_event, imbue_event, copyfmt_event };
-    typedef void (*event_callback)(event, ios_base&, int index);
-    void register_callback(event_callback fn, int index);
-
-    ios_base(const ios_base&) = delete;
-    ios_base& operator=(const ios_base&) = delete;
-
-    static bool sync_with_stdio(bool sync = true);
-
-protected:
-    ios_base();
-};
-
-template <class charT, class traits = char_traits<charT> >
-class basic_ios
-    : public ios_base
-{
-public:
-    // types:
-    typedef charT char_type;
-    typedef typename traits::int_type int_type;
-    typedef typename traits::pos_type pos_type;
-    typedef typename traits::off_type off_type;
-    typedef traits traits_type;
-
-    operator unspecified-bool-type() const;
-    bool operator!() const;
-    iostate rdstate() const;
-    void clear(iostate state = goodbit);
-    void setstate(iostate state);
-    bool good() const;
-    bool eof() const;
-    bool fail() const;
-    bool bad() const;
-
-    iostate exceptions() const;
-    void exceptions(iostate except);
-
-    // 27.5.4.1 Constructor/destructor:
-    explicit basic_ios(basic_streambuf<charT,traits>* sb);
-    virtual ~basic_ios();
-
-    // 27.5.4.2 Members:
-    basic_ostream<charT,traits>* tie() const;
-    basic_ostream<charT,traits>* tie(basic_ostream<charT,traits>* tiestr);
-
-    basic_streambuf<charT,traits>* rdbuf() const;
-    basic_streambuf<charT,traits>* rdbuf(basic_streambuf<charT,traits>* sb);
-
-    basic_ios& copyfmt(const basic_ios& rhs);
-
-    char_type fill() const;
-    char_type fill(char_type ch);
-
-    locale imbue(const locale& loc);
-
-    char narrow(char_type c, char dfault) const;
-    char_type widen(char c) const;
-
-    basic_ios(const basic_ios& ) = delete;
-    basic_ios& operator=(const basic_ios&) = delete;
-
-protected:
-    basic_ios();
-    void init(basic_streambuf<charT,traits>* sb);
-    void move(basic_ios& rhs);
-    void swap(basic_ios& rhs) noexcept;
-    void set_rdbuf(basic_streambuf<charT, traits>* sb);
-};
-
-// 27.5.5, manipulators:
-ios_base& boolalpha (ios_base& str);
-ios_base& noboolalpha(ios_base& str);
-ios_base& showbase (ios_base& str);
-ios_base& noshowbase (ios_base& str);
-ios_base& showpoint (ios_base& str);
-ios_base& noshowpoint(ios_base& str);
-ios_base& showpos (ios_base& str);
-ios_base& noshowpos (ios_base& str);
-ios_base& skipws (ios_base& str);
-ios_base& noskipws (ios_base& str);
-ios_base& uppercase (ios_base& str);
-ios_base& nouppercase(ios_base& str);
-ios_base& unitbuf (ios_base& str);
-ios_base& nounitbuf (ios_base& str);
-
-// 27.5.5.2 adjustfield:
-ios_base& internal (ios_base& str);
-ios_base& left (ios_base& str);
-ios_base& right (ios_base& str);
-
-// 27.5.5.3 basefield:
-ios_base& dec (ios_base& str);
-ios_base& hex (ios_base& str);
-ios_base& oct (ios_base& str);
-
-// 27.5.5.4 floatfield:
-ios_base& fixed (ios_base& str);
-ios_base& scientific (ios_base& str);
-ios_base& hexfloat (ios_base& str);
-ios_base& defaultfloat(ios_base& str);
-
-// 27.5.5.5 error reporting:
-enum class io_errc
-{
-    stream = 1
-};
-
-concept_map ErrorCodeEnum<io_errc> { };
-error_code make_error_code(io_errc e) noexcept; 
-error_condition make_error_condition(io_errc e) noexcept; 
-storage-class-specifier const error_category& iostream_category() noexcept;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iosfwd>
-#include <__locale>
-#include <system_error>
-
-#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-#include <atomic>     // for __xindex_
-#endif
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-typedef ptrdiff_t streamsize;
-
-class _LIBCPP_TYPE_VIS ios_base
-{
-public:
-    class _LIBCPP_TYPE_VIS failure;
-
-    typedef unsigned int fmtflags;
-    static const fmtflags boolalpha   = 0x0001;
-    static const fmtflags dec         = 0x0002;
-    static const fmtflags fixed       = 0x0004;
-    static const fmtflags hex         = 0x0008;
-    static const fmtflags internal    = 0x0010;
-    static const fmtflags left        = 0x0020;
-    static const fmtflags oct         = 0x0040;
-    static const fmtflags right       = 0x0080;
-    static const fmtflags scientific  = 0x0100;
-    static const fmtflags showbase    = 0x0200;
-    static const fmtflags showpoint   = 0x0400;
-    static const fmtflags showpos     = 0x0800;
-    static const fmtflags skipws      = 0x1000;
-    static const fmtflags unitbuf     = 0x2000;
-    static const fmtflags uppercase   = 0x4000;
-    static const fmtflags adjustfield = left | right | internal;
-    static const fmtflags basefield   = dec | oct | hex;
-    static const fmtflags floatfield  = scientific | fixed;
-
-    typedef unsigned int iostate;
-    typedef iostate      io_state;
-    static const iostate badbit  = 0x1;
-    static const iostate eofbit  = 0x2;
-    static const iostate failbit = 0x4;
-    static const iostate goodbit = 0x0;
-
-    typedef unsigned int openmode;
-    typedef openmode     open_mode;
-    static const openmode app    = 0x01;
-    static const openmode ate    = 0x02;
-    static const openmode binary = 0x04;
-    static const openmode in     = 0x08;
-    static const openmode out    = 0x10;
-    static const openmode trunc  = 0x20;
-
-    enum seekdir {beg, cur, end};
-    typedef seekdir seek_dir;
-
-    typedef _VSTD::streamoff streamoff;
-    typedef _VSTD::streampos streampos;
-
-    class _LIBCPP_TYPE_VIS Init;
-
-    // 27.5.2.2 fmtflags state:
-    _LIBCPP_INLINE_VISIBILITY fmtflags flags() const;
-    _LIBCPP_INLINE_VISIBILITY fmtflags flags(fmtflags __fmtfl);
-    _LIBCPP_INLINE_VISIBILITY fmtflags setf(fmtflags __fmtfl);
-    _LIBCPP_INLINE_VISIBILITY fmtflags setf(fmtflags __fmtfl, fmtflags __mask);
-    _LIBCPP_INLINE_VISIBILITY void unsetf(fmtflags __mask);
-
-    _LIBCPP_INLINE_VISIBILITY streamsize precision() const;
-    _LIBCPP_INLINE_VISIBILITY streamsize precision(streamsize __prec);
-    _LIBCPP_INLINE_VISIBILITY streamsize width() const;
-    _LIBCPP_INLINE_VISIBILITY streamsize width(streamsize __wide);
-
-    // 27.5.2.3 locales:
-    locale imbue(const locale& __loc);
-    locale getloc() const;
-
-    // 27.5.2.5 storage:
-    static int xalloc();
-    long& iword(int __index);
-    void*& pword(int __index);
-
-    // destructor
-    virtual ~ios_base();
-
-    // 27.5.2.6 callbacks;
-    enum event { erase_event, imbue_event, copyfmt_event };
-    typedef void (*event_callback)(event, ios_base&, int __index);
-    void register_callback(event_callback __fn, int __index);
-
-private:
-    ios_base(const ios_base&); // = delete;
-    ios_base& operator=(const ios_base&); // = delete;
-
-public:
-    static bool sync_with_stdio(bool __sync = true);
-
-    _LIBCPP_INLINE_VISIBILITY iostate rdstate() const;
-    void clear(iostate __state = goodbit);
-    _LIBCPP_INLINE_VISIBILITY void setstate(iostate __state);
-
-    _LIBCPP_INLINE_VISIBILITY bool good() const;
-    _LIBCPP_INLINE_VISIBILITY bool eof() const;
-    _LIBCPP_INLINE_VISIBILITY bool fail() const;
-    _LIBCPP_INLINE_VISIBILITY bool bad() const;
-
-    _LIBCPP_INLINE_VISIBILITY iostate exceptions() const;
-    _LIBCPP_INLINE_VISIBILITY void exceptions(iostate __iostate);
-
-    void __set_badbit_and_consider_rethrow();
-    void __set_failbit_and_consider_rethrow();
-
-protected:
-    _LIBCPP_INLINE_VISIBILITY
-    ios_base() {// purposefully does no initialization
-               }
-
-    void init(void* __sb);
-    _LIBCPP_ALWAYS_INLINE void* rdbuf() const {return __rdbuf_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    void rdbuf(void* __sb)
-    {
-        __rdbuf_ = __sb;
-        clear();
-    }
-
-    void __call_callbacks(event);
-    void copyfmt(const ios_base&);
-    void move(ios_base&);
-    void swap(ios_base&) _NOEXCEPT;
-
-    _LIBCPP_ALWAYS_INLINE
-    void set_rdbuf(void* __sb)
-    {
-        __rdbuf_ = __sb;
-    }
-
-private:
-    // All data members must be scalars
-    fmtflags        __fmtflags_;
-    streamsize      __precision_;
-    streamsize      __width_;
-    iostate         __rdstate_;
-    iostate         __exceptions_;
-    void*           __rdbuf_;
-    void*           __loc_;
-    event_callback* __fn_;
-    int*            __index_;
-    size_t          __event_size_;
-    size_t          __event_cap_;
-#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-    static atomic<int> __xindex_;
-#else
-    static int      __xindex_;
-#endif
-    long*           __iarray_;
-    size_t          __iarray_size_;
-    size_t          __iarray_cap_;
-    void**          __parray_;
-    size_t          __parray_size_;
-    size_t          __parray_cap_;
-};
-
-//enum class io_errc
-_LIBCPP_DECLARE_STRONG_ENUM(io_errc)
-{
-    stream = 1
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(io_errc)
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum<io_errc> : public true_type { };
-
-#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum<io_errc::__lx> : public true_type { };
-#endif
-
-_LIBCPP_FUNC_VIS
-const error_category& iostream_category() _NOEXCEPT;
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_code
-make_error_code(io_errc __e) _NOEXCEPT
-{
-    return error_code(static_cast<int>(__e), iostream_category());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_condition
-make_error_condition(io_errc __e) _NOEXCEPT
-{
-    return error_condition(static_cast<int>(__e), iostream_category());
-}
-
-class _LIBCPP_EXCEPTION_ABI ios_base::failure
-    : public system_error
-{
-public:
-    explicit failure(const string& __msg, const error_code& __ec = io_errc::stream);
-    explicit failure(const char* __msg, const error_code& __ec = io_errc::stream);
-    virtual ~failure() throw();
-};
-
-class _LIBCPP_TYPE_VIS ios_base::Init
-{
-public:
-    Init();
-    ~Init();
-};
-
-// fmtflags
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::fmtflags
-ios_base::flags() const
-{
-    return __fmtflags_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::fmtflags
-ios_base::flags(fmtflags __fmtfl)
-{
-    fmtflags __r = __fmtflags_;
-    __fmtflags_ = __fmtfl;
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::fmtflags
-ios_base::setf(fmtflags __fmtfl)
-{
-    fmtflags __r = __fmtflags_;
-    __fmtflags_ |= __fmtfl;
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-ios_base::unsetf(fmtflags __mask)
-{
-    __fmtflags_ &= ~__mask;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::fmtflags
-ios_base::setf(fmtflags __fmtfl, fmtflags __mask)
-{
-    fmtflags __r = __fmtflags_;
-    unsetf(__mask);
-    __fmtflags_ |= __fmtfl & __mask;
-    return __r;
-}
-
-// precision
-
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-ios_base::precision() const
-{
-    return __precision_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-ios_base::precision(streamsize __prec)
-{
-    streamsize __r = __precision_;
-    __precision_ = __prec;
-    return __r;
-}
-
-// width
-
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-ios_base::width() const
-{
-    return __width_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-ios_base::width(streamsize __wide)
-{
-    streamsize __r = __width_;
-    __width_ = __wide;
-    return __r;
-}
-
-// iostate
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::iostate
-ios_base::rdstate() const
-{
-    return __rdstate_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-ios_base::setstate(iostate __state)
-{
-    clear(__rdstate_ | __state);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ios_base::good() const
-{
-    return __rdstate_ == 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ios_base::eof() const
-{
-    return (__rdstate_ & eofbit) != 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ios_base::fail() const
-{
-    return (__rdstate_ & (failbit | badbit)) != 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ios_base::bad() const
-{
-    return (__rdstate_ & badbit) != 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::iostate
-ios_base::exceptions() const
-{
-    return __exceptions_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-ios_base::exceptions(iostate __iostate)
-{
-    __exceptions_ = __iostate;
-    clear(__rdstate_);
-}
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ios
-    : public ios_base
-{
-public:
-    // types:
-    typedef _CharT char_type;
-    typedef _Traits traits_type;
-
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    _LIBCPP_ALWAYS_INLINE
-        _LIBCPP_EXPLICIT
-        operator bool() const {return !fail();}
-    _LIBCPP_ALWAYS_INLINE bool operator!() const    {return  fail();}
-    _LIBCPP_ALWAYS_INLINE iostate rdstate() const   {return ios_base::rdstate();}
-    _LIBCPP_ALWAYS_INLINE void clear(iostate __state = goodbit) {ios_base::clear(__state);}
-    _LIBCPP_ALWAYS_INLINE void setstate(iostate __state) {ios_base::setstate(__state);}
-    _LIBCPP_ALWAYS_INLINE bool good() const {return ios_base::good();}
-    _LIBCPP_ALWAYS_INLINE bool eof() const  {return ios_base::eof();}
-    _LIBCPP_ALWAYS_INLINE bool fail() const {return ios_base::fail();}
-    _LIBCPP_ALWAYS_INLINE bool bad() const  {return ios_base::bad();}
-
-    _LIBCPP_ALWAYS_INLINE iostate exceptions() const {return ios_base::exceptions();}
-    _LIBCPP_ALWAYS_INLINE void exceptions(iostate __iostate) {ios_base::exceptions(__iostate);}
-
-    // 27.5.4.1 Constructor/destructor:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit basic_ios(basic_streambuf<char_type,traits_type>* __sb);
-    virtual ~basic_ios();
-
-    // 27.5.4.2 Members:
-    _LIBCPP_INLINE_VISIBILITY 
-    basic_ostream<char_type, traits_type>* tie() const;
-    _LIBCPP_INLINE_VISIBILITY 
-    basic_ostream<char_type, traits_type>* tie(basic_ostream<char_type, traits_type>* __tiestr);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    basic_streambuf<char_type, traits_type>* rdbuf() const;
-    _LIBCPP_INLINE_VISIBILITY 
-    basic_streambuf<char_type, traits_type>* rdbuf(basic_streambuf<char_type, traits_type>* __sb);
-
-    basic_ios& copyfmt(const basic_ios& __rhs);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    char_type fill() const;
-    _LIBCPP_INLINE_VISIBILITY 
-    char_type fill(char_type __ch);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    locale imbue(const locale& __loc);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    char narrow(char_type __c, char __dfault) const;
-    _LIBCPP_INLINE_VISIBILITY 
-    char_type widen(char __c) const;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    basic_ios() {// purposefully does no initialization
-                }
-    _LIBCPP_INLINE_VISIBILITY 
-    void init(basic_streambuf<char_type, traits_type>* __sb);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    void move(basic_ios& __rhs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_ALWAYS_INLINE
-    void move(basic_ios&& __rhs) {move(__rhs);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY 
-    void swap(basic_ios& __rhs) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY 
-    void set_rdbuf(basic_streambuf<char_type, traits_type>* __sb);
-private:
-    basic_ostream<char_type, traits_type>* __tie_;
-     mutable int_type __fill_;
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ios<_CharT, _Traits>::basic_ios(basic_streambuf<char_type,traits_type>* __sb)
-{
-    init(__sb);
-}
-
-template <class _CharT, class _Traits>
-basic_ios<_CharT, _Traits>::~basic_ios()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ios<_CharT, _Traits>::init(basic_streambuf<char_type, traits_type>* __sb)
-{
-    ios_base::init(__sb);
-    __tie_ = 0;
-    __fill_ = traits_type::eof();
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>*
-basic_ios<_CharT, _Traits>::tie() const
-{
-    return __tie_;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>*
-basic_ios<_CharT, _Traits>::tie(basic_ostream<char_type, traits_type>* __tiestr)
-{
-    basic_ostream<char_type, traits_type>* __r = __tie_;
-    __tie_ = __tiestr;
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_streambuf<_CharT, _Traits>*
-basic_ios<_CharT, _Traits>::rdbuf() const
-{
-    return static_cast<basic_streambuf<char_type, traits_type>*>(ios_base::rdbuf());
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_streambuf<_CharT, _Traits>*
-basic_ios<_CharT, _Traits>::rdbuf(basic_streambuf<char_type, traits_type>* __sb)
-{
-    basic_streambuf<char_type, traits_type>* __r = rdbuf();
-    ios_base::rdbuf(__sb);
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-locale
-basic_ios<_CharT, _Traits>::imbue(const locale& __loc)
-{
-    locale __r = getloc();
-    ios_base::imbue(__loc);
-    if (rdbuf())
-        rdbuf()->pubimbue(__loc);
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-char
-basic_ios<_CharT, _Traits>::narrow(char_type __c, char __dfault) const
-{
-    return use_facet<ctype<char_type> >(getloc()).narrow(__c, __dfault);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-basic_ios<_CharT, _Traits>::widen(char __c) const
-{
-    return use_facet<ctype<char_type> >(getloc()).widen(__c);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-basic_ios<_CharT, _Traits>::fill() const
-{
-    if (traits_type::eq_int_type(traits_type::eof(), __fill_))
-        __fill_ = widen(' ');
-    return __fill_;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-basic_ios<_CharT, _Traits>::fill(char_type __ch)
-{
-    char_type __r = __fill_;
-    __fill_ = __ch;
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-basic_ios<_CharT, _Traits>&
-basic_ios<_CharT, _Traits>::copyfmt(const basic_ios& __rhs)
-{
-    if (this != &__rhs)
-    {
-        __call_callbacks(erase_event);
-        ios_base::copyfmt(__rhs);
-        __tie_ = __rhs.__tie_;
-        __fill_ = __rhs.__fill_;
-        __call_callbacks(copyfmt_event);
-        exceptions(__rhs.exceptions());
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ios<_CharT, _Traits>::move(basic_ios& __rhs)
-{
-    ios_base::move(__rhs);
-    __tie_ = __rhs.__tie_;
-    __rhs.__tie_ = 0;
-    __fill_ = __rhs.__fill_;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ios<_CharT, _Traits>::swap(basic_ios& __rhs) _NOEXCEPT
-{
-    ios_base::swap(__rhs);
-    _VSTD::swap(__tie_, __rhs.__tie_);
-    _VSTD::swap(__fill_, __rhs.__fill_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ios<_CharT, _Traits>::set_rdbuf(basic_streambuf<char_type, traits_type>* __sb)
-{
-    ios_base::set_rdbuf(__sb);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-boolalpha(ios_base& __str)
-{
-    __str.setf(ios_base::boolalpha);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noboolalpha(ios_base& __str)
-{
-    __str.unsetf(ios_base::boolalpha);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-showbase(ios_base& __str)
-{
-    __str.setf(ios_base::showbase);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noshowbase(ios_base& __str)
-{
-    __str.unsetf(ios_base::showbase);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-showpoint(ios_base& __str)
-{
-    __str.setf(ios_base::showpoint);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noshowpoint(ios_base& __str)
-{
-    __str.unsetf(ios_base::showpoint);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-showpos(ios_base& __str)
-{
-    __str.setf(ios_base::showpos);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noshowpos(ios_base& __str)
-{
-    __str.unsetf(ios_base::showpos);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-skipws(ios_base& __str)
-{
-    __str.setf(ios_base::skipws);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noskipws(ios_base& __str)
-{
-    __str.unsetf(ios_base::skipws);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-uppercase(ios_base& __str)
-{
-    __str.setf(ios_base::uppercase);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-nouppercase(ios_base& __str)
-{
-    __str.unsetf(ios_base::uppercase);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-unitbuf(ios_base& __str)
-{
-    __str.setf(ios_base::unitbuf);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-nounitbuf(ios_base& __str)
-{
-    __str.unsetf(ios_base::unitbuf);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-internal(ios_base& __str)
-{
-    __str.setf(ios_base::internal, ios_base::adjustfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-left(ios_base& __str)
-{
-    __str.setf(ios_base::left, ios_base::adjustfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-right(ios_base& __str)
-{
-    __str.setf(ios_base::right, ios_base::adjustfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-dec(ios_base& __str)
-{
-    __str.setf(ios_base::dec, ios_base::basefield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-hex(ios_base& __str)
-{
-    __str.setf(ios_base::hex, ios_base::basefield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-oct(ios_base& __str)
-{
-    __str.setf(ios_base::oct, ios_base::basefield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-fixed(ios_base& __str)
-{
-    __str.setf(ios_base::fixed, ios_base::floatfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-scientific(ios_base& __str)
-{
-    __str.setf(ios_base::scientific, ios_base::floatfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-hexfloat(ios_base& __str)
-{
-    __str.setf(ios_base::fixed | ios_base::scientific, ios_base::floatfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-defaultfloat(ios_base& __str)
-{
-    __str.unsetf(ios_base::floatfield);
-    return __str;
-}
-
-template <class _CharT, class _Traits>
-class __save_flags
-{
-    typedef basic_ios<_CharT, _Traits> __stream_type;
-    typedef typename __stream_type::fmtflags fmtflags;
-
-    __stream_type& __stream_;
-    fmtflags       __fmtflags_;
-    _CharT         __fill_;
-
-    __save_flags(const __save_flags&);
-    __save_flags& operator=(const __save_flags&);
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __save_flags(__stream_type& __stream)
-        : __stream_(__stream),
-          __fmtflags_(__stream.flags()),
-          __fill_(__stream.fill())
-        {}
-    _LIBCPP_INLINE_VISIBILITY
-    ~__save_flags()
-    {
-        __stream_.flags(__fmtflags_);
-        __stream_.fill(__fill_);
-    }
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_IOS
diff --git a/include.new/c++/v1/iosfwd b/include.new/c++/v1/iosfwd
deleted file mode 100644
index d24c227..0000000
--- a/include.new/c++/v1/iosfwd
+++ /dev/null
@@ -1,194 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- iosfwd -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_IOSFWD
-#define _LIBCPP_IOSFWD
-
-/*
-    iosfwd synopsis
-
-namespace std
-{
-
-template<class charT> struct char_traits;
-template<class T>     class allocator;
-
-class ios_base;
-template <class charT, class traits = char_traits<charT> > class basic_ios;
-
-template <class charT, class traits = char_traits<charT> > class basic_streambuf;
-template <class charT, class traits = char_traits<charT> > class basic_istream;
-template <class charT, class traits = char_traits<charT> > class basic_ostream;
-template <class charT, class traits = char_traits<charT> > class basic_iostream;
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-    class basic_stringbuf;
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-    class basic_istringstream;
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-    class basic_ostringstream;
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-    class basic_stringstream;
-
-template <class charT, class traits = char_traits<charT> > class basic_filebuf;
-template <class charT, class traits = char_traits<charT> > class basic_ifstream;
-template <class charT, class traits = char_traits<charT> > class basic_ofstream;
-template <class charT, class traits = char_traits<charT> > class basic_fstream;
-
-template <class charT, class traits = char_traits<charT> > class istreambuf_iterator;
-template <class charT, class traits = char_traits<charT> > class ostreambuf_iterator;
-
-typedef basic_ios<char>              ios;
-typedef basic_ios<wchar_t>           wios;
-
-typedef basic_streambuf<char>        streambuf;
-typedef basic_istream<char>          istream;
-typedef basic_ostream<char>          ostream;
-typedef basic_iostream<char>         iostream;
-
-typedef basic_stringbuf<char>        stringbuf;
-typedef basic_istringstream<char>    istringstream;
-typedef basic_ostringstream<char>    ostringstream;
-typedef basic_stringstream<char>     stringstream;
-
-typedef basic_filebuf<char>          filebuf;
-typedef basic_ifstream<char>         ifstream;
-typedef basic_ofstream<char>         ofstream;
-typedef basic_fstream<char>          fstream;
-
-typedef basic_streambuf<wchar_t>     wstreambuf;
-typedef basic_istream<wchar_t>       wistream;
-typedef basic_ostream<wchar_t>       wostream;
-typedef basic_iostream<wchar_t>      wiostream;
-
-typedef basic_stringbuf<wchar_t>     wstringbuf;
-typedef basic_istringstream<wchar_t> wistringstream;
-typedef basic_ostringstream<wchar_t> wostringstream;
-typedef basic_stringstream<wchar_t>  wstringstream;
-
-typedef basic_filebuf<wchar_t>       wfilebuf;
-typedef basic_ifstream<wchar_t>      wifstream;
-typedef basic_ofstream<wchar_t>      wofstream;
-typedef basic_fstream<wchar_t>       wfstream;
-
-template <class state> class fpos;
-typedef fpos<char_traits<char>::state_type>    streampos;
-typedef fpos<char_traits<wchar_t>::state_type> wstreampos;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <wchar.h>  // for mbstate_t
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS ios_base;
-
-template<class _CharT>  struct _LIBCPP_TYPE_VIS_ONLY char_traits;
-template<class _Tp>     class _LIBCPP_TYPE_VIS_ONLY allocator;
-
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ios;
-
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_streambuf;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_istream;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ostream;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_iostream;
-
-template <class _CharT, class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_stringbuf;
-template <class _CharT, class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_istringstream;
-template <class _CharT, class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ostringstream;
-template <class _CharT, class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_stringstream;
-
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_filebuf;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ifstream;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ofstream;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_fstream;
-
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY istreambuf_iterator;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY ostreambuf_iterator;
-
-typedef basic_ios<char>              ios;
-typedef basic_ios<wchar_t>           wios;
-
-typedef basic_streambuf<char>        streambuf;
-typedef basic_istream<char>          istream;
-typedef basic_ostream<char>          ostream;
-typedef basic_iostream<char>         iostream;
-
-typedef basic_stringbuf<char>        stringbuf;
-typedef basic_istringstream<char>    istringstream;
-typedef basic_ostringstream<char>    ostringstream;
-typedef basic_stringstream<char>     stringstream;
-
-typedef basic_filebuf<char>          filebuf;
-typedef basic_ifstream<char>         ifstream;
-typedef basic_ofstream<char>         ofstream;
-typedef basic_fstream<char>          fstream;
-
-typedef basic_streambuf<wchar_t>     wstreambuf;
-typedef basic_istream<wchar_t>       wistream;
-typedef basic_ostream<wchar_t>       wostream;
-typedef basic_iostream<wchar_t>      wiostream;
-
-typedef basic_stringbuf<wchar_t>     wstringbuf;
-typedef basic_istringstream<wchar_t> wistringstream;
-typedef basic_ostringstream<wchar_t> wostringstream;
-typedef basic_stringstream<wchar_t>  wstringstream;
-
-typedef basic_filebuf<wchar_t>       wfilebuf;
-typedef basic_ifstream<wchar_t>      wifstream;
-typedef basic_ofstream<wchar_t>      wofstream;
-typedef basic_fstream<wchar_t>       wfstream;
-
-template <class _State>             class _LIBCPP_TYPE_VIS_ONLY fpos;
-typedef fpos<mbstate_t>    streampos;
-typedef fpos<mbstate_t>    wstreampos;
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-typedef fpos<mbstate_t>    u16streampos;
-typedef fpos<mbstate_t>    u32streampos;
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-typedef long long streamoff;        // for char_traits in <string>
-
-template <class _CharT,             // for <stdexcept>
-          class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_string;
-typedef basic_string<char, char_traits<char>, allocator<char> > string;
-typedef basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > wstring;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_IOSFWD
diff --git a/include.new/c++/v1/iostream b/include.new/c++/v1/iostream
deleted file mode 100644
index ddf2484..0000000
--- a/include.new/c++/v1/iostream
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- iostream ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_IOSTREAM
-#define _LIBCPP_IOSTREAM
-
-/*
-    iostream synopsis
-
-#include <ios>
-#include <streambuf>
-#include <istream>
-#include <ostream>
-
-namespace std {
-
-extern istream cin;
-extern ostream cout;
-extern ostream cerr;
-extern ostream clog;
-extern wistream wcin;
-extern wostream wcout;
-extern wostream wcerr;
-extern wostream wclog;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ios>
-#include <streambuf>
-#include <istream>
-#include <ostream>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-extern _LIBCPP_FUNC_VIS istream cin;
-extern _LIBCPP_FUNC_VIS ostream cout;
-extern _LIBCPP_FUNC_VIS ostream cerr;
-extern _LIBCPP_FUNC_VIS ostream clog;
-extern _LIBCPP_FUNC_VIS wistream wcin;
-extern _LIBCPP_FUNC_VIS wostream wcout;
-extern _LIBCPP_FUNC_VIS wostream wcerr;
-extern _LIBCPP_FUNC_VIS wostream wclog;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_IOSTREAM
diff --git a/include.new/c++/v1/istream b/include.new/c++/v1/istream
deleted file mode 100644
index 168a4d0..0000000
--- a/include.new/c++/v1/istream
+++ /dev/null
@@ -1,1732 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- istream ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ISTREAM
-#define _LIBCPP_ISTREAM
-
-/*
-    istream synopsis
-
-template <class charT, class traits = char_traits<charT> >
-class basic_istream
-    : virtual public basic_ios<charT,traits>
-{
-public:
-    // types (inherited from basic_ios (27.5.4)):
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.7.1.1.1 Constructor/destructor:
-    explicit basic_istream(basic_streambuf<char_type, traits_type>* sb);
-    basic_istream(basic_istream&& rhs);
-    virtual ~basic_istream();
-
-    // 27.7.1.1.2 Assign/swap:
-    basic_istream& operator=(basic_istream&& rhs);
-    void swap(basic_istream& rhs);
-
-    // 27.7.1.1.3 Prefix/suffix:
-    class sentry;
-
-    // 27.7.1.2 Formatted input:
-    basic_istream& operator>>(basic_istream& (*pf)(basic_istream&));
-    basic_istream& operator>>(basic_ios<char_type, traits_type>&
-                              (*pf)(basic_ios<char_type, traits_type>&));
-    basic_istream& operator>>(ios_base& (*pf)(ios_base&));
-    basic_istream& operator>>(basic_streambuf<char_type, traits_type>* sb);
-    basic_istream& operator>>(bool& n);
-    basic_istream& operator>>(short& n);
-    basic_istream& operator>>(unsigned short& n);
-    basic_istream& operator>>(int& n);
-    basic_istream& operator>>(unsigned int& n);
-    basic_istream& operator>>(long& n);
-    basic_istream& operator>>(unsigned long& n);
-    basic_istream& operator>>(long long& n);
-    basic_istream& operator>>(unsigned long long& n);
-    basic_istream& operator>>(float& f);
-    basic_istream& operator>>(double& f);
-    basic_istream& operator>>(long double& f);
-    basic_istream& operator>>(void*& p);
-
-    // 27.7.1.3 Unformatted input:
-    streamsize gcount() const;
-    int_type get();
-    basic_istream& get(char_type& c);
-    basic_istream& get(char_type* s, streamsize n);
-    basic_istream& get(char_type* s, streamsize n, char_type delim);
-    basic_istream& get(basic_streambuf<char_type,traits_type>& sb);
-    basic_istream& get(basic_streambuf<char_type,traits_type>& sb, char_type delim);
-
-    basic_istream& getline(char_type* s, streamsize n);
-    basic_istream& getline(char_type* s, streamsize n, char_type delim);
-
-    basic_istream& ignore(streamsize n = 1, int_type delim = traits_type::eof());
-    int_type peek();
-    basic_istream& read (char_type* s, streamsize n);
-    streamsize readsome(char_type* s, streamsize n);
-
-    basic_istream& putback(char_type c);
-    basic_istream& unget();
-    int sync();
-
-    pos_type tellg();
-    basic_istream& seekg(pos_type);
-    basic_istream& seekg(off_type, ios_base::seekdir);
-protected:
-    basic_istream(const basic_istream& rhs) = delete;
-    basic_istream(basic_istream&& rhs);
-    // 27.7.2.1.2 Assign/swap:
-    basic_istream& operator=(const basic_istream& rhs) = delete;
-    basic_istream& operator=(basic_istream&& rhs);
-    void swap(basic_istream& rhs);
-};
-
-// 27.7.1.2.3 character extraction templates:
-template<class charT, class traits>
-  basic_istream<charT,traits>& operator>>(basic_istream<charT,traits>&, charT&);
-
-template<class traits>
-  basic_istream<char,traits>& operator>>(basic_istream<char,traits>&, unsigned char&);
-
-template<class traits>
-  basic_istream<char,traits>& operator>>(basic_istream<char,traits>&, signed char&);
-
-template<class charT, class traits>
-  basic_istream<charT,traits>& operator>>(basic_istream<charT,traits>&, charT*);
-
-template<class traits>
-  basic_istream<char,traits>& operator>>(basic_istream<char,traits>&, unsigned char*);
-
-template<class traits>
-  basic_istream<char,traits>& operator>>(basic_istream<char,traits>&, signed char*);
-
-template <class charT, class traits>
-  void
-  swap(basic_istream<charT, traits>& x, basic_istream<charT, traits>& y);
-
-typedef basic_istream<char> istream;
-typedef basic_istream<wchar_t> wistream;
-
-template <class charT, class traits = char_traits<charT> >
-class basic_iostream :
-    public basic_istream<charT,traits>,
-    public basic_ostream<charT,traits>
-{
-public:
-    // types:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // constructor/destructor
-    explicit basic_iostream(basic_streambuf<char_type, traits_type>* sb);
-    basic_iostream(basic_iostream&& rhs);
-    virtual ~basic_iostream();
-
-    // assign/swap
-    basic_iostream& operator=(basic_iostream&& rhs);
-    void swap(basic_iostream& rhs);
-};
-
-template <class charT, class traits>
-  void
-  swap(basic_iostream<charT, traits>& x, basic_iostream<charT, traits>& y);
-
-typedef basic_iostream<char> iostream;
-typedef basic_iostream<wchar_t> wiostream;
-
-template <class charT, class traits>
-  basic_istream<charT,traits>&
-  ws(basic_istream<charT,traits>& is);
-
-template <class charT, class traits, class T>
-  basic_istream<charT, traits>&
-  operator>>(basic_istream<charT, traits>&& is, T& x);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ostream>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_istream
-    : virtual public basic_ios<_CharT, _Traits>
-{
-    streamsize __gc_;
-public:
-    // types (inherited from basic_ios (27.5.4)):
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.7.1.1.1 Constructor/destructor:
-    explicit basic_istream(basic_streambuf<char_type, traits_type>* __sb);
-    virtual ~basic_istream();
-protected:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream(basic_istream&& __rhs);
-#endif
-    // 27.7.1.1.2 Assign/swap:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream& operator=(basic_istream&& __rhs);
-#endif
-    void swap(basic_istream& __rhs);
-
-#if _LIBCPP_STD_VER > 11
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    basic_istream           (const basic_istream& __rhs) = delete;
-    basic_istream& operator=(const basic_istream& __rhs) = delete;
-#else
-    basic_istream           (const basic_istream& __rhs); // not defined
-    basic_istream& operator=(const basic_istream& __rhs); // not defined
-#endif
-#endif
-public:
-
-    // 27.7.1.1.3 Prefix/suffix:
-    class _LIBCPP_TYPE_VIS_ONLY sentry;
-
-    // 27.7.1.2 Formatted input:
-    basic_istream& operator>>(basic_istream& (*__pf)(basic_istream&));
-    basic_istream& operator>>(basic_ios<char_type, traits_type>&
-                              (*__pf)(basic_ios<char_type, traits_type>&));
-    basic_istream& operator>>(ios_base& (*__pf)(ios_base&));
-    basic_istream& operator>>(basic_streambuf<char_type, traits_type>* __sb);
-    basic_istream& operator>>(bool& __n);
-    basic_istream& operator>>(short& __n);
-    basic_istream& operator>>(unsigned short& __n);
-    basic_istream& operator>>(int& __n);
-    basic_istream& operator>>(unsigned int& __n);
-    basic_istream& operator>>(long& __n);
-    basic_istream& operator>>(unsigned long& __n);
-    basic_istream& operator>>(long long& __n);
-    basic_istream& operator>>(unsigned long long& __n);
-    basic_istream& operator>>(float& __f);
-    basic_istream& operator>>(double& __f);
-    basic_istream& operator>>(long double& __f);
-    basic_istream& operator>>(void*& __p);
-
-    // 27.7.1.3 Unformatted input:
-    _LIBCPP_INLINE_VISIBILITY
-    streamsize gcount() const {return __gc_;}
-    int_type get();
-    basic_istream& get(char_type& __c);
-    basic_istream& get(char_type* __s, streamsize __n);
-    basic_istream& get(char_type* __s, streamsize __n, char_type __dlm);
-    basic_istream& get(basic_streambuf<char_type, traits_type>& __sb);
-    basic_istream& get(basic_streambuf<char_type, traits_type>& __sb, char_type __dlm);
-
-    basic_istream& getline(char_type* __s, streamsize __n);
-    basic_istream& getline(char_type* __s, streamsize __n, char_type __dlm);
-
-    basic_istream& ignore(streamsize __n = 1, int_type __dlm = traits_type::eof());
-    int_type peek();
-    basic_istream& read (char_type* __s, streamsize __n);
-    streamsize readsome(char_type* __s, streamsize __n);
-
-    basic_istream& putback(char_type __c);
-    basic_istream& unget();
-    int sync();
-
-    pos_type tellg();
-    basic_istream& seekg(pos_type __pos);
-    basic_istream& seekg(off_type __off, ios_base::seekdir __dir);
-};
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_istream<_CharT, _Traits>::sentry
-{
-    bool __ok_;
-
-    sentry(const sentry&); // = delete;
-    sentry& operator=(const sentry&); // = delete;
-
-public:
-    explicit sentry(basic_istream<_CharT, _Traits>& __is, bool __noskipws = false);
-//    ~sentry() = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_EXPLICIT
-        operator bool() const {return __ok_;}
-};
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>::sentry::sentry(basic_istream<_CharT, _Traits>& __is,
-                                               bool __noskipws)
-    : __ok_(false)
-{
-    if (__is.good())
-    {
-        if (__is.tie())
-            __is.tie()->flush();
-        if (!__noskipws && (__is.flags() & ios_base::skipws))
-        {
-            typedef istreambuf_iterator<_CharT, _Traits> _Ip;
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            _Ip __i(__is);
-            _Ip __eof;
-            for (; __i != __eof; ++__i)
-                if (!__ct.is(__ct.space, *__i))
-                    break;
-            if (__i == __eof)
-                __is.setstate(ios_base::failbit | ios_base::eofbit);
-        }
-        __ok_ = __is.good();
-    }
-    else
-        __is.setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>::basic_istream(basic_streambuf<char_type, traits_type>* __sb)
-    : __gc_(0)
-{
-    this->init(__sb);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>::basic_istream(basic_istream&& __rhs)
-    : __gc_(__rhs.__gc_)
-{
-    __rhs.__gc_ = 0;
-    this->move(__rhs);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator=(basic_istream&& __rhs)
-{
-    swap(__rhs);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>::~basic_istream()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_istream<_CharT, _Traits>::swap(basic_istream& __rhs)
-{
-    _VSTD::swap(__gc_, __rhs.__gc_);
-    basic_ios<char_type, traits_type>::swap(__rhs);
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(unsigned short& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(unsigned int& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(long& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(unsigned long& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(long long& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(unsigned long long& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(float& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(double& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(long double& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(bool& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(void*& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(short& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            long __temp;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __temp);
-            if (__temp < numeric_limits<short>::min())
-            {
-                __err |= ios_base::failbit;
-                __n = numeric_limits<short>::min();
-            }
-            else if (__temp > numeric_limits<short>::max())
-            {
-                __err |= ios_base::failbit;
-                __n = numeric_limits<short>::max();
-            }
-            else
-                __n = static_cast<short>(__temp);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(int& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            long __temp;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __temp);
-            if (__temp < numeric_limits<int>::min())
-            {
-                __err |= ios_base::failbit;
-                __n = numeric_limits<int>::min();
-            }
-            else if (__temp > numeric_limits<int>::max())
-            {
-                __err |= ios_base::failbit;
-                __n = numeric_limits<int>::max();
-            }
-            else
-                __n = static_cast<int>(__temp);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(basic_istream& (*__pf)(basic_istream&))
-{
-    return __pf(*this);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(basic_ios<char_type, traits_type>&
-                                           (*__pf)(basic_ios<char_type, traits_type>&))
-{
-    __pf(*this);
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(ios_base& (*__pf)(ios_base&))
-{
-    __pf(*this);
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, _CharT* __s)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
-        if (__sen)
-        {
-            streamsize __n = __is.width();
-            if (__n <= 0)
-                __n = numeric_limits<streamsize>::max() / sizeof(_CharT) - 1;
-            streamsize __c = 0;
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            ios_base::iostate __err = ios_base::goodbit;
-            while (__c < __n-1)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sgetc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                _CharT __ch = _Traits::to_char_type(__i);
-                if (__ct.is(__ct.space, __ch))
-                    break;
-                *__s++ = __ch;
-                ++__c;
-                 __is.rdbuf()->sbumpc();
-            }
-            *__s = _CharT();
-            __is.width(0);
-            if (__c == 0)
-               __err |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template<class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<char, _Traits>&
-operator>>(basic_istream<char, _Traits>& __is, unsigned char* __s)
-{
-    return __is >> (char*)__s;
-}
-
-template<class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<char, _Traits>&
-operator>>(basic_istream<char, _Traits>& __is, signed char* __s)
-{
-    return __is >> (char*)__s;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, _CharT& __c)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
-        if (__sen)
-        {
-            typename _Traits::int_type __i = __is.rdbuf()->sbumpc();
-            if (_Traits::eq_int_type(__i, _Traits::eof()))
-                __is.setstate(ios_base::eofbit | ios_base::failbit);
-            else
-                __c = _Traits::to_char_type(__i);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template<class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<char, _Traits>&
-operator>>(basic_istream<char, _Traits>& __is, unsigned char& __c)
-{
-    return __is >> (char&)__c;
-}
-
-template<class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<char, _Traits>&
-operator>>(basic_istream<char, _Traits>& __is, signed char& __c)
-{
-    return __is >> (char&)__c;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(basic_streambuf<char_type, traits_type>* __sb)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this, true);
-        if (__s)
-        {
-            if (__sb)
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                try
-                {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    ios_base::iostate __err = ios_base::goodbit;
-                    while (true)
-                    {
-                        typename traits_type::int_type __i = this->rdbuf()->sgetc();
-                        if (traits_type::eq_int_type(__i, _Traits::eof()))
-                        {
-                           __err |= ios_base::eofbit;
-                           break;
-                        }
-                        if (traits_type::eq_int_type(
-                                __sb->sputc(traits_type::to_char_type(__i)),
-                                traits_type::eof()))
-                            break;
-                        ++__gc_;
-                        this->rdbuf()->sbumpc();
-                    }
-                    if (__gc_ == 0)
-                       __err |= ios_base::failbit;
-                    this->setstate(__err);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                }
-                catch (...)
-                {
-                    if (__gc_ == 0)
-                        this->__set_failbit_and_consider_rethrow();
-                }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            }
-            else
-                this->setstate(ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-typename basic_istream<_CharT, _Traits>::int_type
-basic_istream<_CharT, _Traits>::get()
-{
-    __gc_ = 0;
-    int_type __r = traits_type::eof();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this, true);
-        if (__s)
-        {
-            __r = this->rdbuf()->sbumpc();
-            if (traits_type::eq_int_type(__r, traits_type::eof()))
-               this->setstate(ios_base::failbit | ios_base::eofbit);
-            else
-                __gc_ = 1;
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __r;
-}
-
-template<class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(char_type& __c)
-{
-    int_type __ch = get();
-    if (__ch != traits_type::eof())
-        __c = traits_type::to_char_type(__ch);
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(char_type* __s, streamsize __n, char_type __dlm)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (__n > 0)
-            {
-                ios_base::iostate __err = ios_base::goodbit;
-                while (__gc_ < __n-1)
-                {
-                    int_type __i = this->rdbuf()->sgetc();
-                    if (traits_type::eq_int_type(__i, traits_type::eof()))
-                    {
-                       __err |= ios_base::eofbit;
-                       break;
-                    }
-                    char_type __ch = traits_type::to_char_type(__i);
-                    if (traits_type::eq(__ch, __dlm))
-                        break;
-                    *__s++ = __ch;
-                    ++__gc_;
-                     this->rdbuf()->sbumpc();
-                }
-                *__s = char_type();
-                if (__gc_ == 0)
-                   __err |= ios_base::failbit;
-                this->setstate(__err);
-            }
-            else
-                this->setstate(ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(char_type* __s, streamsize __n)
-{
-    return get(__s, __n, this->widen('\n'));
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(basic_streambuf<char_type, traits_type>& __sb,
-                                    char_type __dlm)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            ios_base::iostate __err = ios_base::goodbit;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            try
-            {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                while (true)
-                {
-                    typename traits_type::int_type __i = this->rdbuf()->sgetc();
-                    if (traits_type::eq_int_type(__i, traits_type::eof()))
-                    {
-                       __err |= ios_base::eofbit;
-                       break;
-                    }
-                    char_type __ch = traits_type::to_char_type(__i);
-                    if (traits_type::eq(__ch, __dlm))
-                        break;
-                    if (traits_type::eq_int_type(__sb.sputc(__ch), traits_type::eof()))
-                        break;
-                    ++__gc_;
-                    this->rdbuf()->sbumpc();
-                }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            }
-            catch (...)
-            {
-            }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            if (__gc_ == 0)
-               __err |= ios_base::failbit;
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(basic_streambuf<char_type, traits_type>& __sb)
-{
-    return get(__sb, this->widen('\n'));
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n, char_type __dlm)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            ios_base::iostate __err = ios_base::goodbit;
-            while (true)
-            {
-                typename traits_type::int_type __i = this->rdbuf()->sgetc();
-                if (traits_type::eq_int_type(__i, traits_type::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                char_type __ch = traits_type::to_char_type(__i);
-                if (traits_type::eq(__ch, __dlm))
-                {
-                    this->rdbuf()->sbumpc();
-                    ++__gc_;
-                    break;
-                }
-                if (__gc_ >= __n-1)
-                {
-                    __err |= ios_base::failbit;
-                    break;
-                }
-                *__s++ = __ch;
-                this->rdbuf()->sbumpc();
-                ++__gc_;
-            }
-            if (__n > 0)
-                *__s = char_type();
-            if (__gc_ == 0)
-               __err |= ios_base::failbit;
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n)
-{
-    return getline(__s, __n, this->widen('\n'));
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            ios_base::iostate __err = ios_base::goodbit;
-            if (__n == numeric_limits<streamsize>::max())
-            {
-                while (true)
-                {
-                    typename traits_type::int_type __i = this->rdbuf()->sbumpc();
-                    if (traits_type::eq_int_type(__i, traits_type::eof()))
-                    {
-                       __err |= ios_base::eofbit;
-                       break;
-                    }
-                    ++__gc_;
-                    if (traits_type::eq_int_type(__i, __dlm))
-                        break;
-                }
-            }
-            else
-            {
-                while (__gc_ < __n)
-                {
-                    typename traits_type::int_type __i = this->rdbuf()->sbumpc();
-                    if (traits_type::eq_int_type(__i, traits_type::eof()))
-                    {
-                       __err |= ios_base::eofbit;
-                       break;
-                    }
-                    ++__gc_;
-                    if (traits_type::eq_int_type(__i, __dlm))
-                        break;
-                }
-            }
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-typename basic_istream<_CharT, _Traits>::int_type
-basic_istream<_CharT, _Traits>::peek()
-{
-    __gc_ = 0;
-    int_type __r = traits_type::eof();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            __r = this->rdbuf()->sgetc();
-            if (traits_type::eq_int_type(__r, traits_type::eof()))
-                this->setstate(ios_base::eofbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __r;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::read(char_type* __s, streamsize __n)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            __gc_ = this->rdbuf()->sgetn(__s, __n);
-            if (__gc_ != __n)
-                this->setstate(ios_base::failbit | ios_base::eofbit);
-        }
-        else
-            this->setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-streamsize
-basic_istream<_CharT, _Traits>::readsome(char_type* __s, streamsize __n)
-{
-    __gc_ = 0;
-    streamsize __c = this->rdbuf()->in_avail();
-    switch (__c)
-    {
-    case -1:
-        this->setstate(ios_base::eofbit);
-        break;
-    case 0:
-        break;
-    default:
-        read(__s, _VSTD::min(__c, __n));
-        break;
-    }
-    return __gc_;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::putback(char_type __c)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf() == 0 || this->rdbuf()->sputbackc(__c) == traits_type::eof())
-                this->setstate(ios_base::badbit);
-        }
-        else
-            this->setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::unget()
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf() == 0 || this->rdbuf()->sungetc() == traits_type::eof())
-                this->setstate(ios_base::badbit);
-        }
-        else
-            this->setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-int
-basic_istream<_CharT, _Traits>::sync()
-{
-    int __r = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf() == 0)
-                return -1;
-            if (this->rdbuf()->pubsync() == -1)
-            {
-                this->setstate(ios_base::badbit);
-                return -1;
-            }
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __r;
-}
-
-template<class _CharT, class _Traits>
-typename basic_istream<_CharT, _Traits>::pos_type
-basic_istream<_CharT, _Traits>::tellg()
-{
-    pos_type __r(-1);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-            __r = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __r;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::seekg(pos_type __pos)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf()->pubseekpos(__pos, ios_base::in) == pos_type(-1))
-                this->setstate(ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::seekg(off_type __off, ios_base::seekdir __dir)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf()->pubseekoff(__off, __dir, ios_base::in) == pos_type(-1))
-                this->setstate(ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-ws(basic_istream<_CharT, _Traits>& __is)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
-        if (__sen)
-        {
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            while (true)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sgetc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __is.setstate(ios_base::eofbit);
-                   break;
-                }
-                if (!__ct.is(__ct.space, _Traits::to_char_type(__i)))
-                    break;
-                __is.rdbuf()->sbumpc();
-            }
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>&& __is, _Tp& __x)
-{
-    __is >> __x;
-    return __is;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_iostream
-    : public basic_istream<_CharT, _Traits>,
-      public basic_ostream<_CharT, _Traits>
-{
-public:
-    // types:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // constructor/destructor
-    explicit basic_iostream(basic_streambuf<char_type, traits_type>* __sb);
-    virtual ~basic_iostream();
-protected:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_iostream(basic_iostream&& __rhs);
-#endif
-
-    // assign/swap
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_iostream& operator=(basic_iostream&& __rhs);
-#endif
-    void swap(basic_iostream& __rhs);
-public:
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_iostream<_CharT, _Traits>::basic_iostream(basic_streambuf<char_type, traits_type>* __sb)
-    : basic_istream<_CharT, _Traits>(__sb)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_iostream<_CharT, _Traits>::basic_iostream(basic_iostream&& __rhs)
-    : basic_istream<_CharT, _Traits>(_VSTD::move(__rhs))
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_iostream<_CharT, _Traits>&
-basic_iostream<_CharT, _Traits>::operator=(basic_iostream&& __rhs)
-{
-    swap(__rhs);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_iostream<_CharT, _Traits>::~basic_iostream()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_iostream<_CharT, _Traits>::swap(basic_iostream& __rhs)
-{
-    basic_istream<char_type, traits_type>::swap(__rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           basic_string<_CharT, _Traits, _Allocator>& __str)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
-        if (__sen)
-        {
-            __str.clear();
-            streamsize __n = __is.width();
-            if (__n <= 0)
-                __n = __str.max_size();
-            if (__n <= 0)
-                __n = numeric_limits<streamsize>::max();
-            streamsize __c = 0;
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            ios_base::iostate __err = ios_base::goodbit;
-            while (__c < __n)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sgetc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                _CharT __ch = _Traits::to_char_type(__i);
-                if (__ct.is(__ct.space, __ch))
-                    break;
-                __str.push_back(__ch);
-                ++__c;
-                 __is.rdbuf()->sbumpc();
-            }
-            __is.width(0);
-            if (__c == 0)
-               __err |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-        else
-            __is.setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
-        if (__sen)
-        {
-            __str.clear();
-            ios_base::iostate __err = ios_base::goodbit;
-            streamsize __extr = 0;
-            while (true)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sbumpc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                ++__extr;
-                _CharT __ch = _Traits::to_char_type(__i);
-                if (_Traits::eq(__ch, __dlm))
-                    break;
-                __str.push_back(__ch);
-                if (__str.size() == __str.max_size())
-                {
-                    __err |= ios_base::failbit;
-                    break;
-                }
-            }
-            if (__extr == 0)
-               __err |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str)
-{
-    return getline(__is, __str, __is.widen('\n'));
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>&& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm)
-{
-    return getline(__is, __str, __dlm);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>&& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str)
-{
-    return getline(__is, __str, __is.widen('\n'));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, size_t _Size>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
-        if (__sen)
-        {
-            basic_string<_CharT, _Traits> __str;
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            streamsize __c = 0;
-            ios_base::iostate __err = ios_base::goodbit;
-            _CharT __zero = __ct.widen('0');
-            _CharT __one = __ct.widen('1');
-            while (__c < _Size)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sgetc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                _CharT __ch = _Traits::to_char_type(__i);
-                if (!_Traits::eq(__ch, __zero) && !_Traits::eq(__ch, __one))
-                    break;
-                __str.push_back(__ch);
-                ++__c;
-                 __is.rdbuf()->sbumpc();
-            }
-            __x = bitset<_Size>(__str);
-            if (__c == 0)
-               __err |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-        else
-            __is.setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_istream<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_istream<wchar_t>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_iostream<char>)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_ISTREAM
diff --git a/include.new/c++/v1/iterator b/include.new/c++/v1/iterator
deleted file mode 100644
index bcf142a..0000000
--- a/include.new/c++/v1/iterator
+++ /dev/null
@@ -1,1614 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- iterator ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ITERATOR
-#define _LIBCPP_ITERATOR
-
-/*
-    iterator synopsis
-
-namespace std
-{
-
-template<class Iterator>
-struct iterator_traits
-{
-    typedef typename Iterator::difference_type difference_type;
-    typedef typename Iterator::value_type value_type;
-    typedef typename Iterator::pointer pointer;
-    typedef typename Iterator::reference reference;
-    typedef typename Iterator::iterator_category iterator_category;
-};
-
-template<class T>
-struct iterator_traits<T*>
-{
-    typedef ptrdiff_t difference_type;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef T& reference;
-    typedef random_access_iterator_tag iterator_category;
-};
-
-template<class T>
-struct iterator_traits<const T*>
-{
-    typedef ptrdiff_t difference_type;
-    typedef T value_type;
-    typedef const T* pointer;
-    typedef const T& reference;
-    typedef random_access_iterator_tag iterator_category;
-};
-
-template<class Category, class T, class Distance = ptrdiff_t,
-         class Pointer = T*, class Reference = T&>
-struct iterator
-{
-    typedef T         value_type;
-    typedef Distance  difference_type;
-    typedef Pointer   pointer;
-    typedef Reference reference;
-    typedef Category  iterator_category;
-};
-
-struct input_iterator_tag  {};
-struct output_iterator_tag {};
-struct forward_iterator_tag       : public input_iterator_tag         {};
-struct bidirectional_iterator_tag : public forward_iterator_tag       {};
-struct random_access_iterator_tag : public bidirectional_iterator_tag {};
-
-// extension: second argument not conforming to C++03
-template <class InputIterator>
-void advance(InputIterator& i,
-             typename iterator_traits<InputIterator>::difference_type n);
-
-template <class InputIterator>
-typename iterator_traits<InputIterator>::difference_type
-distance(InputIterator first, InputIterator last);
-
-template <class Iterator>
-class reverse_iterator
-    : public iterator<typename iterator_traits<Iterator>::iterator_category,
-                      typename iterator_traits<Iterator>::value_type,
-                      typename iterator_traits<Iterator>::difference_type,
-                      typename iterator_traits<Iterator>::pointer,
-                      typename iterator_traits<Iterator>::reference>
-{
-protected:
-    Iterator current;
-public:
-    typedef Iterator                                            iterator_type;
-    typedef typename iterator_traits<Iterator>::difference_type difference_type;
-    typedef typename iterator_traits<Iterator>::reference       reference;
-    typedef typename iterator_traits<Iterator>::pointer         pointer;
-
-    reverse_iterator();
-    explicit reverse_iterator(Iterator x);
-    template <class U> reverse_iterator(const reverse_iterator<U>& u);
-    Iterator base() const;
-    reference operator*() const;
-    pointer   operator->() const;
-    reverse_iterator& operator++();
-    reverse_iterator  operator++(int);
-    reverse_iterator& operator--();
-    reverse_iterator  operator--(int);
-    reverse_iterator  operator+ (difference_type n) const;
-    reverse_iterator& operator+=(difference_type n);
-    reverse_iterator  operator- (difference_type n) const;
-    reverse_iterator& operator-=(difference_type n);
-    reference         operator[](difference_type n) const;
-};
-
-template <class Iterator1, class Iterator2>
-bool
-operator==(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator<(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator!=(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator>(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator>=(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator<=(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-typename reverse_iterator<Iterator1>::difference_type
-operator-(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator>
-reverse_iterator<Iterator>
-operator+(typename reverse_iterator<Iterator>::difference_type n, const reverse_iterator<Iterator>& x);
-
-template <class Iterator> reverse_iterator<Iterator> make_reverse_iterator(Iterator i); // C++14
-
-template <class Container>
-class back_insert_iterator
-{
-protected:
-    Container* container;
-public:
-    typedef Container                   container_type;
-    typedef void                        value_type;
-    typedef void                        difference_type;
-    typedef back_insert_iterator<Cont>& reference;
-    typedef void                        pointer;
-
-    explicit back_insert_iterator(Container& x);
-    back_insert_iterator& operator=(const typename Container::value_type& value);
-    back_insert_iterator& operator*();
-    back_insert_iterator& operator++();
-    back_insert_iterator  operator++(int);
-};
-
-template <class Container> back_insert_iterator<Container> back_inserter(Container& x);
-
-template <class Container>
-class front_insert_iterator
-{
-protected:
-    Container* container;
-public:
-    typedef Container                    container_type;
-    typedef void                         value_type;
-    typedef void                         difference_type;
-    typedef front_insert_iterator<Cont>& reference;
-    typedef void                         pointer;
-
-    explicit front_insert_iterator(Container& x);
-    front_insert_iterator& operator=(const typename Container::value_type& value);
-    front_insert_iterator& operator*();
-    front_insert_iterator& operator++();
-    front_insert_iterator  operator++(int);
-};
-
-template <class Container> front_insert_iterator<Container> front_inserter(Container& x);
-
-template <class Container>
-class insert_iterator
-{
-protected:
-    Container* container;
-    typename Container::iterator iter;
-public:
-    typedef Container              container_type;
-    typedef void                   value_type;
-    typedef void                   difference_type;
-    typedef insert_iterator<Cont>& reference;
-    typedef void                   pointer;
-
-    insert_iterator(Container& x, typename Container::iterator i);
-    insert_iterator& operator=(const typename Container::value_type& value);
-    insert_iterator& operator*();
-    insert_iterator& operator++();
-    insert_iterator& operator++(int);
-};
-
-template <class Container, class Iterator>
-insert_iterator<Container> inserter(Container& x, Iterator i);
-
-template <class T, class charT = char, class traits = char_traits<charT>, class Distance = ptrdiff_t>
-class istream_iterator
-    : public iterator<input_iterator_tag, T, Distance, const T*, const T&>
-{
-public:
-    typedef charT char_type;
-    typedef traits traits_type;
-    typedef basic_istream<charT,traits> istream_type;
-
-    istream_iterator();
-    istream_iterator(istream_type& s);
-    istream_iterator(const istream_iterator& x);
-    ~istream_iterator();
-
-    const T& operator*() const;
-    const T* operator->() const;
-    istream_iterator& operator++();
-    istream_iterator  operator++(int);
-};
-
-template <class T, class charT, class traits, class Distance>
-bool operator==(const istream_iterator<T,charT,traits,Distance>& x,
-                const istream_iterator<T,charT,traits,Distance>& y);
-template <class T, class charT, class traits, class Distance>
-bool operator!=(const istream_iterator<T,charT,traits,Distance>& x,
-                const istream_iterator<T,charT,traits,Distance>& y);
-
-template <class T, class charT = char, class traits = char_traits<charT> >
-class ostream_iterator
-    : public iterator<output_iterator_tag, void, void, void ,void>
-{
-public:
-    typedef charT char_type;
-    typedef traits traits_type;
-    typedef basic_ostream<charT,traits> ostream_type;
-
-    ostream_iterator(ostream_type& s);
-    ostream_iterator(ostream_type& s, const charT* delimiter);
-    ostream_iterator(const ostream_iterator& x);
-    ~ostream_iterator();
-    ostream_iterator& operator=(const T& value);
-
-    ostream_iterator& operator*();
-    ostream_iterator& operator++();
-    ostream_iterator& operator++(int);
-};
-
-template<class charT, class traits = char_traits<charT> >
-class istreambuf_iterator
-    : public iterator<input_iterator_tag, charT,
-                      typename traits::off_type, unspecified,
-                      charT>
-{
-public:
-    typedef charT                         char_type;
-    typedef traits                        traits_type;
-    typedef typename traits::int_type     int_type;
-    typedef basic_streambuf<charT,traits> streambuf_type;
-    typedef basic_istream<charT,traits>   istream_type;
-
-    istreambuf_iterator() noexcept;
-    istreambuf_iterator(istream_type& s) noexcept;
-    istreambuf_iterator(streambuf_type* s) noexcept;
-    istreambuf_iterator(a-private-type) noexcept;
-
-    charT                operator*() const;
-    pointer operator->() const;
-    istreambuf_iterator& operator++();
-    a-private-type       operator++(int);
-
-    bool equal(const istreambuf_iterator& b) const;
-};
-
-template <class charT, class traits>
-bool operator==(const istreambuf_iterator<charT,traits>& a,
-                const istreambuf_iterator<charT,traits>& b);
-template <class charT, class traits>
-bool operator!=(const istreambuf_iterator<charT,traits>& a,
-                const istreambuf_iterator<charT,traits>& b);
-
-template <class charT, class traits = char_traits<charT> >
-class ostreambuf_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-{
-public:
-    typedef charT                         char_type;
-    typedef traits                        traits_type;
-    typedef basic_streambuf<charT,traits> streambuf_type;
-    typedef basic_ostream<charT,traits>   ostream_type;
-
-    ostreambuf_iterator(ostream_type& s) noexcept;
-    ostreambuf_iterator(streambuf_type* s) noexcept;
-    ostreambuf_iterator& operator=(charT c);
-    ostreambuf_iterator& operator*();
-    ostreambuf_iterator& operator++();
-    ostreambuf_iterator& operator++(int);
-    bool failed() const noexcept;
-};
-
-template <class C> auto begin(C& c) -> decltype(c.begin());
-template <class C> auto begin(const C& c) -> decltype(c.begin());
-template <class C> auto end(C& c) -> decltype(c.end());
-template <class C> auto end(const C& c) -> decltype(c.end());
-template <class T, size_t N> T* begin(T (&array)[N]);
-template <class T, size_t N> T* end(T (&array)[N]);
-
-template <class C> auto cbegin(const C& c) -> decltype(std::begin(c));        // C++14
-template <class C> auto cend(const C& c) -> decltype(std::end(c));            // C++14
-template <class C> auto rbegin(C& c) -> decltype(c.rbegin());                 // C++14
-template <class C> auto rbegin(const C& c) -> decltype(c.rbegin());           // C++14
-template <class C> auto rend(C& c) -> decltype(c.rend());                     // C++14
-template <class C> auto rend(const C& c) -> decltype(c.rend());               // C++14
-template <class E> reverse_iterator<const E*> rbegin(initializer_list<E> il); // C++14
-template <class E> reverse_iterator<const E*> rend(initializer_list<E> il);   // C++14
-template <class T, size_t N> reverse_iterator<T*> rbegin(T (&array)[N]);      // C++14
-template <class T, size_t N> reverse_iterator<T*> rend(T (&array)[N]);        // C++14
-template <class C> auto crbegin(const C& c) -> decltype(std::rbegin(c));      // C++14
-template <class C> auto crend(const C& c) -> decltype(std::rend(c));          // C++14
-
-// 24.8, container access:
-template <class C> constexpr auto size(const C& c) -> decltype(c.size());         // C++17
-template <class T, size_t N> constexpr size_t size(const T (&array)[N]) noexcept; // C++17
-template <class C> constexpr auto empty(const C& c) -> decltype(c.empty());       // C++17
-template <class T, size_t N> constexpr bool empty(const T (&array)[N]) noexcept;  // C++17
-template <class E> constexpr bool empty(initializer_list<E> il) noexcept;         // C++17
-template <class C> constexpr auto data(C& c) -> decltype(c.data());               // C++17
-template <class C> constexpr auto data(const C& c) -> decltype(c.data());         // C++17
-template <class T, size_t N> constexpr T* data(T (&array)[N]) noexcept;           // C++17
-template <class E> constexpr const E* data(initializer_list<E> il) noexcept;      // C++17
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__functional_base>
-#include <type_traits>
-#include <cstddef>
-#include <iosfwd>
-#include <initializer_list>
-#ifdef __APPLE__
-#include <Availability.h>
-#endif
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-struct _LIBCPP_TYPE_VIS_ONLY input_iterator_tag {};
-struct _LIBCPP_TYPE_VIS_ONLY output_iterator_tag {};
-struct _LIBCPP_TYPE_VIS_ONLY forward_iterator_tag       : public input_iterator_tag {};
-struct _LIBCPP_TYPE_VIS_ONLY bidirectional_iterator_tag : public forward_iterator_tag {};
-struct _LIBCPP_TYPE_VIS_ONLY random_access_iterator_tag : public bidirectional_iterator_tag {};
-
-template <class _Tp>
-struct __has_iterator_category
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::iterator_category* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Iter, bool> struct __iterator_traits_impl {};
-
-template <class _Iter>
-struct __iterator_traits_impl<_Iter, true>
-{
-    typedef typename _Iter::difference_type   difference_type;
-    typedef typename _Iter::value_type        value_type;
-    typedef typename _Iter::pointer           pointer;
-    typedef typename _Iter::reference         reference;
-    typedef typename _Iter::iterator_category iterator_category;
-};
-
-template <class _Iter, bool> struct __iterator_traits {};
-
-template <class _Iter>
-struct __iterator_traits<_Iter, true>
-    :  __iterator_traits_impl
-      <
-        _Iter,
-        is_convertible<typename _Iter::iterator_category, input_iterator_tag>::value ||
-        is_convertible<typename _Iter::iterator_category, output_iterator_tag>::value
-      >
-{};
-
-// iterator_traits<Iterator> will only have the nested types if Iterator::iterator_category
-//    exists.  Else iterator_traits<Iterator> will be an empty class.  This is a
-//    conforming extension which allows some programs to compile and behave as
-//    the client expects instead of failing at compile time.
-
-template <class _Iter>
-struct _LIBCPP_TYPE_VIS_ONLY iterator_traits
-    : __iterator_traits<_Iter, __has_iterator_category<_Iter>::value> {};
-
-template<class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY iterator_traits<_Tp*>
-{
-    typedef ptrdiff_t difference_type;
-    typedef typename remove_const<_Tp>::type value_type;
-    typedef _Tp* pointer;
-    typedef _Tp& reference;
-    typedef random_access_iterator_tag iterator_category;
-};
-
-template <class _Tp, class _Up, bool = __has_iterator_category<iterator_traits<_Tp> >::value>
-struct __has_iterator_category_convertible_to
-    : public integral_constant<bool, is_convertible<typename iterator_traits<_Tp>::iterator_category, _Up>::value>
-{};
-
-template <class _Tp, class _Up>
-struct __has_iterator_category_convertible_to<_Tp, _Up, false> : public false_type {};
-
-template <class _Tp>
-struct __is_input_iterator : public __has_iterator_category_convertible_to<_Tp, input_iterator_tag> {};
-
-template <class _Tp>
-struct __is_forward_iterator : public __has_iterator_category_convertible_to<_Tp, forward_iterator_tag> {};
-
-template <class _Tp>
-struct __is_bidirectional_iterator : public __has_iterator_category_convertible_to<_Tp, bidirectional_iterator_tag> {};
-
-template <class _Tp>
-struct __is_random_access_iterator : public __has_iterator_category_convertible_to<_Tp, random_access_iterator_tag> {};
-
-template<class _Category, class _Tp, class _Distance = ptrdiff_t,
-         class _Pointer = _Tp*, class _Reference = _Tp&>
-struct _LIBCPP_TYPE_VIS_ONLY iterator
-{
-    typedef _Tp        value_type;
-    typedef _Distance  difference_type;
-    typedef _Pointer   pointer;
-    typedef _Reference reference;
-    typedef _Category  iterator_category;
-};
-
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-void __advance(_InputIter& __i,
-             typename iterator_traits<_InputIter>::difference_type __n, input_iterator_tag)
-{
-    for (; __n > 0; --__n)
-        ++__i;
-}
-
-template <class _BiDirIter>
-inline _LIBCPP_INLINE_VISIBILITY
-void __advance(_BiDirIter& __i,
-             typename iterator_traits<_BiDirIter>::difference_type __n, bidirectional_iterator_tag)
-{
-    if (__n >= 0)
-        for (; __n > 0; --__n)
-            ++__i;
-    else
-        for (; __n < 0; ++__n)
-            --__i;
-}
-
-template <class _RandIter>
-inline _LIBCPP_INLINE_VISIBILITY
-void __advance(_RandIter& __i,
-             typename iterator_traits<_RandIter>::difference_type __n, random_access_iterator_tag)
-{
-   __i += __n;
-}
-
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-void advance(_InputIter& __i,
-             typename iterator_traits<_InputIter>::difference_type __n)
-{
-    __advance(__i, __n, typename iterator_traits<_InputIter>::iterator_category());
-}
-
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_InputIter>::difference_type
-__distance(_InputIter __first, _InputIter __last, input_iterator_tag)
-{
-    typename iterator_traits<_InputIter>::difference_type __r(0);
-    for (; __first != __last; ++__first)
-        ++__r;
-    return __r;
-}
-
-template <class _RandIter>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_RandIter>::difference_type
-__distance(_RandIter __first, _RandIter __last, random_access_iterator_tag)
-{
-    return __last - __first;
-}
-
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_InputIter>::difference_type
-distance(_InputIter __first, _InputIter __last)
-{
-    return __distance(__first, __last, typename iterator_traits<_InputIter>::iterator_category());
-}
-
-template <class _ForwardIter>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIter
-next(_ForwardIter __x,
-     typename iterator_traits<_ForwardIter>::difference_type __n = 1,
-     typename enable_if<__is_forward_iterator<_ForwardIter>::value>::type* = 0)
-{
-    _VSTD::advance(__x, __n);
-    return __x;
-}
-
-template <class _BidiretionalIter>
-inline _LIBCPP_INLINE_VISIBILITY
-_BidiretionalIter
-prev(_BidiretionalIter __x,
-     typename iterator_traits<_BidiretionalIter>::difference_type __n = 1,
-     typename enable_if<__is_bidirectional_iterator<_BidiretionalIter>::value>::type* = 0)
-{
-    _VSTD::advance(__x, -__n);
-    return __x;
-}
-
-template <class _Iter>
-class _LIBCPP_TYPE_VIS_ONLY reverse_iterator
-    : public iterator<typename iterator_traits<_Iter>::iterator_category,
-                      typename iterator_traits<_Iter>::value_type,
-                      typename iterator_traits<_Iter>::difference_type,
-                      typename iterator_traits<_Iter>::pointer,
-                      typename iterator_traits<_Iter>::reference>
-{
-private:
-    mutable _Iter __t;  // no longer used as of LWG #2360, not removed due to ABI break
-protected:
-    _Iter current;
-public:
-    typedef _Iter                                            iterator_type;
-    typedef typename iterator_traits<_Iter>::difference_type difference_type;
-    typedef typename iterator_traits<_Iter>::reference       reference;
-    typedef typename iterator_traits<_Iter>::pointer         pointer;
-
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator() : current() {}
-    _LIBCPP_INLINE_VISIBILITY explicit reverse_iterator(_Iter __x) : __t(__x), current(__x) {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY reverse_iterator(const reverse_iterator<_Up>& __u)
-        : __t(__u.base()), current(__u.base()) {}
-    _LIBCPP_INLINE_VISIBILITY _Iter base() const {return current;}
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {_Iter __tmp = current; return *--__tmp;}
-    _LIBCPP_INLINE_VISIBILITY pointer  operator->() const {return _VSTD::addressof(operator*());}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator& operator++() {--current; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator  operator++(int)
-        {reverse_iterator __tmp(*this); --current; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator& operator--() {++current; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator  operator--(int)
-        {reverse_iterator __tmp(*this); ++current; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator  operator+ (difference_type __n) const
-        {return reverse_iterator(current - __n);}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator& operator+=(difference_type __n)
-        {current -= __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator  operator- (difference_type __n) const
-        {return reverse_iterator(current + __n);}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator& operator-=(difference_type __n)
-        {current += __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reference         operator[](difference_type __n) const
-        {return current[-__n-1];}
-};
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() == __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() > __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() != __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() < __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() <= __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() >= __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename reverse_iterator<_Iter1>::difference_type
-operator-(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __y.base() - __x.base();
-}
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<_Iter>
-operator+(typename reverse_iterator<_Iter>::difference_type __n, const reverse_iterator<_Iter>& __x)
-{
-    return reverse_iterator<_Iter>(__x.base() - __n);
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<_Iter> make_reverse_iterator(_Iter __i)
-{
-    return reverse_iterator<_Iter>(__i);
-}
-#endif
-
-template <class _Container>
-class _LIBCPP_TYPE_VIS_ONLY back_insert_iterator
-    : public iterator<output_iterator_tag,
-                      void,
-                      void,
-                      void,
-                      back_insert_iterator<_Container>&>
-{
-protected:
-    _Container* container;
-public:
-    typedef _Container container_type;
-
-    _LIBCPP_INLINE_VISIBILITY explicit back_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {}
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator=(const typename _Container::value_type& __value_)
-        {container->push_back(__value_); return *this;}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator=(typename _Container::value_type&& __value_)
-        {container->push_back(_VSTD::move(__value_)); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator*()     {return *this;}
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator++()    {return *this;}
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator  operator++(int) {return *this;}
-};
-
-template <class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-back_insert_iterator<_Container>
-back_inserter(_Container& __x)
-{
-    return back_insert_iterator<_Container>(__x);
-}
-
-template <class _Container>
-class _LIBCPP_TYPE_VIS_ONLY front_insert_iterator
-    : public iterator<output_iterator_tag,
-                      void,
-                      void,
-                      void,
-                      front_insert_iterator<_Container>&>
-{
-protected:
-    _Container* container;
-public:
-    typedef _Container container_type;
-
-    _LIBCPP_INLINE_VISIBILITY explicit front_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {}
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator=(const typename _Container::value_type& __value_)
-        {container->push_front(__value_); return *this;}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator=(typename _Container::value_type&& __value_)
-        {container->push_front(_VSTD::move(__value_)); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator*()     {return *this;}
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator++()    {return *this;}
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator  operator++(int) {return *this;}
-};
-
-template <class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-front_insert_iterator<_Container>
-front_inserter(_Container& __x)
-{
-    return front_insert_iterator<_Container>(__x);
-}
-
-template <class _Container>
-class _LIBCPP_TYPE_VIS_ONLY insert_iterator
-    : public iterator<output_iterator_tag,
-                      void,
-                      void,
-                      void,
-                      insert_iterator<_Container>&>
-{
-protected:
-    _Container* container;
-    typename _Container::iterator iter;
-public:
-    typedef _Container container_type;
-
-    _LIBCPP_INLINE_VISIBILITY insert_iterator(_Container& __x, typename _Container::iterator __i)
-        : container(_VSTD::addressof(__x)), iter(__i) {}
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator=(const typename _Container::value_type& __value_)
-        {iter = container->insert(iter, __value_); ++iter; return *this;}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator=(typename _Container::value_type&& __value_)
-        {iter = container->insert(iter, _VSTD::move(__value_)); ++iter; return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator*()        {return *this;}
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator++()       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator++(int)    {return *this;}
-};
-
-template <class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-insert_iterator<_Container>
-inserter(_Container& __x, typename _Container::iterator __i)
-{
-    return insert_iterator<_Container>(__x, __i);
-}
-
-template <class _Tp, class _CharT = char,
-          class _Traits = char_traits<_CharT>, class _Distance = ptrdiff_t>
-class _LIBCPP_TYPE_VIS_ONLY istream_iterator
-    : public iterator<input_iterator_tag, _Tp, _Distance, const _Tp*, const _Tp&>
-{
-public:
-    typedef _CharT char_type;
-    typedef _Traits traits_type;
-    typedef basic_istream<_CharT,_Traits> istream_type;
-private:
-    istream_type* __in_stream_;
-    _Tp __value_;
-public:
-    _LIBCPP_INLINE_VISIBILITY istream_iterator() : __in_stream_(0) {}
-    _LIBCPP_INLINE_VISIBILITY istream_iterator(istream_type& __s) : __in_stream_(&__s)
-        {
-            if (!(*__in_stream_ >> __value_))
-                __in_stream_ = 0;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY const _Tp& operator*() const {return __value_;}
-    _LIBCPP_INLINE_VISIBILITY const _Tp* operator->() const {return &(operator*());}
-    _LIBCPP_INLINE_VISIBILITY istream_iterator& operator++()
-        {
-            if (!(*__in_stream_ >> __value_))
-                __in_stream_ = 0;
-            return *this;
-        }
-    _LIBCPP_INLINE_VISIBILITY istream_iterator  operator++(int)
-        {istream_iterator __t(*this); ++(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const istream_iterator& __x, const istream_iterator& __y)
-        {return __x.__in_stream_ == __y.__in_stream_;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const istream_iterator& __x, const istream_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _Tp, class _CharT = char, class _Traits = char_traits<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY ostream_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-{
-public:
-    typedef _CharT char_type;
-    typedef _Traits traits_type;
-    typedef basic_ostream<_CharT,_Traits> ostream_type;
-private:
-    ostream_type* __out_stream_;
-    const char_type* __delim_;
-public:
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator(ostream_type& __s)
-        : __out_stream_(&__s), __delim_(0) {}
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator(ostream_type& __s, const _CharT* __delimiter)
-        : __out_stream_(&__s), __delim_(__delimiter) {}
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator& operator=(const _Tp& __value_)
-        {
-            *__out_stream_ << __value_;
-            if (__delim_)
-                *__out_stream_ << __delim_;
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator& operator*()     {return *this;}
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator& operator++()    {return *this;}
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator& operator++(int) {return *this;}
-};
-
-template<class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY istreambuf_iterator
-    : public iterator<input_iterator_tag, _CharT,
-                      typename _Traits::off_type, _CharT*,
-                      _CharT>
-{
-public:
-    typedef _CharT                          char_type;
-    typedef _Traits                         traits_type;
-    typedef typename _Traits::int_type      int_type;
-    typedef basic_streambuf<_CharT,_Traits> streambuf_type;
-    typedef basic_istream<_CharT,_Traits>   istream_type;
-private:
-    mutable streambuf_type* __sbuf_;
-
-    class __proxy
-    {
-        char_type __keep_;
-        streambuf_type* __sbuf_;
-        _LIBCPP_INLINE_VISIBILITY __proxy(char_type __c, streambuf_type* __s)
-            : __keep_(__c), __sbuf_(__s) {}
-        friend class istreambuf_iterator;
-    public:
-        _LIBCPP_INLINE_VISIBILITY char_type operator*() const {return __keep_;}
-    };
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __test_for_eof() const
-    {
-        if (__sbuf_ && traits_type::eq_int_type(__sbuf_->sgetc(), traits_type::eof()))
-            __sbuf_ = 0;
-        return __sbuf_ == 0;
-    }
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR istreambuf_iterator() _NOEXCEPT : __sbuf_(0) {}
-    _LIBCPP_INLINE_VISIBILITY istreambuf_iterator(istream_type& __s) _NOEXCEPT
-        : __sbuf_(__s.rdbuf()) {}
-    _LIBCPP_INLINE_VISIBILITY istreambuf_iterator(streambuf_type* __s) _NOEXCEPT
-        : __sbuf_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY istreambuf_iterator(const __proxy& __p) _NOEXCEPT
-        : __sbuf_(__p.__sbuf_) {}
-
-    _LIBCPP_INLINE_VISIBILITY char_type  operator*() const
-        {return static_cast<char_type>(__sbuf_->sgetc());}
-    _LIBCPP_INLINE_VISIBILITY char_type* operator->() const {return nullptr;}
-    _LIBCPP_INLINE_VISIBILITY istreambuf_iterator& operator++()
-        {
-            __sbuf_->sbumpc();
-            return *this;
-        }
-    _LIBCPP_INLINE_VISIBILITY __proxy              operator++(int)
-        {
-            return __proxy(__sbuf_->sbumpc(), __sbuf_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY bool equal(const istreambuf_iterator& __b) const
-        {return __test_for_eof() == __b.__test_for_eof();}
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator==(const istreambuf_iterator<_CharT,_Traits>& __a,
-                const istreambuf_iterator<_CharT,_Traits>& __b)
-                {return __a.equal(__b);}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator!=(const istreambuf_iterator<_CharT,_Traits>& __a,
-                const istreambuf_iterator<_CharT,_Traits>& __b)
-                {return !__a.equal(__b);}
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY ostreambuf_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-{
-public:
-    typedef _CharT                          char_type;
-    typedef _Traits                         traits_type;
-    typedef basic_streambuf<_CharT,_Traits> streambuf_type;
-    typedef basic_ostream<_CharT,_Traits>   ostream_type;
-private:
-    streambuf_type* __sbuf_;
-public:
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator(ostream_type& __s) _NOEXCEPT
-        : __sbuf_(__s.rdbuf()) {}
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator(streambuf_type* __s) _NOEXCEPT
-        : __sbuf_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator=(_CharT __c)
-        {
-            if (__sbuf_ && traits_type::eq_int_type(__sbuf_->sputc(__c), traits_type::eof()))
-                __sbuf_ = 0;
-            return *this;
-        }
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator*()     {return *this;}
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator++()    {return *this;}
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator++(int) {return *this;}
-    _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
-
-#if !defined(__APPLE__) || \
-    (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
-    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-
-    template <class _Ch, class _Tr>
-    friend
-    _LIBCPP_HIDDEN
-    ostreambuf_iterator<_Ch, _Tr>
-    __pad_and_output(ostreambuf_iterator<_Ch, _Tr> __s,
-                     const _Ch* __ob, const _Ch* __op, const _Ch* __oe,
-                     ios_base& __iob, _Ch __fl);
-#endif
-};
-
-template <class _Iter>
-class _LIBCPP_TYPE_VIS_ONLY move_iterator
-{
-private:
-    _Iter __i;
-public:
-    typedef _Iter                                            iterator_type;
-    typedef typename iterator_traits<iterator_type>::iterator_category iterator_category;
-    typedef typename iterator_traits<iterator_type>::value_type value_type;
-    typedef typename iterator_traits<iterator_type>::difference_type difference_type;
-    typedef typename iterator_traits<iterator_type>::pointer pointer;
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    typedef value_type&& reference;
-#else
-    typedef typename iterator_traits<iterator_type>::reference reference;
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY move_iterator() : __i() {}
-    _LIBCPP_INLINE_VISIBILITY explicit move_iterator(_Iter __x) : __i(__x) {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY move_iterator(const move_iterator<_Up>& __u)
-        : __i(__u.base()) {}
-    _LIBCPP_INLINE_VISIBILITY _Iter base() const {return __i;}
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {
-      return static_cast<reference>(*__i);
-    }
-    _LIBCPP_INLINE_VISIBILITY pointer  operator->() const {
-      typename iterator_traits<iterator_type>::reference __ref = *__i;
-      return &__ref;
-    }
-    _LIBCPP_INLINE_VISIBILITY move_iterator& operator++() {++__i; return *this;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator  operator++(int)
-        {move_iterator __tmp(*this); ++__i; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator& operator--() {--__i; return *this;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator  operator--(int)
-        {move_iterator __tmp(*this); --__i; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator  operator+ (difference_type __n) const
-        {return move_iterator(__i + __n);}
-    _LIBCPP_INLINE_VISIBILITY move_iterator& operator+=(difference_type __n)
-        {__i += __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator  operator- (difference_type __n) const
-        {return move_iterator(__i - __n);}
-    _LIBCPP_INLINE_VISIBILITY move_iterator& operator-=(difference_type __n)
-        {__i -= __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reference         operator[](difference_type __n) const
-    {
-      return static_cast<reference>(__i[__n]);
-    }
-};
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() == __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() < __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() != __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() > __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() >= __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() <= __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename move_iterator<_Iter1>::difference_type
-operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() - __y.base();
-}
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-move_iterator<_Iter>
-operator+(typename move_iterator<_Iter>::difference_type __n, const move_iterator<_Iter>& __x)
-{
-    return move_iterator<_Iter>(__x.base() + __n);
-}
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-move_iterator<_Iter>
-make_move_iterator(_Iter __i)
-{
-    return move_iterator<_Iter>(__i);
-}
-
-// __wrap_iter
-
-template <class _Iter> class __wrap_iter;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-typename __wrap_iter<_Iter1>::difference_type
-operator-(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter>
-_LIBCPP_INLINE_VISIBILITY
-__wrap_iter<_Iter>
-operator+(typename __wrap_iter<_Iter>::difference_type, __wrap_iter<_Iter>) _NOEXCEPT;
-
-template <class _Ip, class _Op> _Op _LIBCPP_INLINE_VISIBILITY copy(_Ip, _Ip, _Op);
-template <class _B1, class _B2> _B2 _LIBCPP_INLINE_VISIBILITY copy_backward(_B1, _B1, _B2);
-template <class _Ip, class _Op> _Op _LIBCPP_INLINE_VISIBILITY move(_Ip, _Ip, _Op);
-template <class _B1, class _B2> _B2 _LIBCPP_INLINE_VISIBILITY move_backward(_B1, _B1, _B2);
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_trivially_copy_assignable<_Tp>::value,
-    _Tp*
->::type
-__unwrap_iter(__wrap_iter<_Tp*>);
-
-template <class _Iter>
-class __wrap_iter
-{
-public:
-    typedef _Iter                                                      iterator_type;
-    typedef typename iterator_traits<iterator_type>::iterator_category iterator_category;
-    typedef typename iterator_traits<iterator_type>::value_type        value_type;
-    typedef typename iterator_traits<iterator_type>::difference_type   difference_type;
-    typedef typename iterator_traits<iterator_type>::pointer           pointer;
-    typedef typename iterator_traits<iterator_type>::reference         reference;
-private:
-    iterator_type __i;
-public:
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-                : __i{}
-#endif
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY __wrap_iter(const __wrap_iter<_Up>& __u,
-        typename enable_if<is_convertible<_Up, iterator_type>::value>::type* = 0) _NOEXCEPT
-        : __i(__u.base())
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__iterator_copy(this, &__u);
-#endif
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __wrap_iter(const __wrap_iter& __x)
-        : __i(__x.base())
-    {
-        __get_db()->__iterator_copy(this, &__x);
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __wrap_iter& operator=(const __wrap_iter& __x)
-    {
-        if (this != &__x)
-        {
-            __get_db()->__iterator_copy(this, &__x);
-            __i = __x.__i;
-        }
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    ~__wrap_iter()
-    {
-        __get_db()->__erase_i(this);
-    }
-#endif
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable iterator");
-#endif
-        return *__i;
-    }
-    _LIBCPP_INLINE_VISIBILITY pointer  operator->() const _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable iterator");
-#endif
-        return (pointer)&reinterpret_cast<const volatile char&>(*__i);
-    }
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter& operator++() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable iterator");
-#endif
-        ++__i;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter  operator++(int) _NOEXCEPT
-        {__wrap_iter __tmp(*this); ++(*this); return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter& operator--() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__decrementable(this),
-                       "Attempted to decrement non-decrementable iterator");
-#endif
-        --__i;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter  operator--(int) _NOEXCEPT
-        {__wrap_iter __tmp(*this); --(*this); return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter  operator+ (difference_type __n) const _NOEXCEPT
-        {__wrap_iter __w(*this); __w += __n; return __w;}
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter& operator+=(difference_type __n) _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__addable(this, __n),
-                   "Attempted to add/subtract iterator outside of valid range");
-#endif
-        __i += __n;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter  operator- (difference_type __n) const _NOEXCEPT
-        {return *this + (-__n);}
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter& operator-=(difference_type __n) _NOEXCEPT
-        {*this += -__n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reference        operator[](difference_type __n) const _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__subscriptable(this, __n),
-                   "Attempted to subscript iterator outside of valid range");
-#endif
-        return __i[__n];
-    }
-
-    _LIBCPP_INLINE_VISIBILITY iterator_type base() const _NOEXCEPT {return __i;}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter(const void* __p, iterator_type __x) : __i(__x)
-    {
-        __get_db()->__insert_ic(this, __p);
-    }
-#else
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter(iterator_type __x) _NOEXCEPT : __i(__x) {}
-#endif
-
-    template <class _Up> friend class __wrap_iter;
-    template <class _CharT, class _Traits, class _Alloc> friend class basic_string;
-    template <class _Tp, class _Alloc> friend class vector;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator==(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator<(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator!=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator>(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator>=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    typename __wrap_iter<_Iter1>::difference_type
-    operator-(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1>
-    friend
-    __wrap_iter<_Iter1>
-    operator+(typename __wrap_iter<_Iter1>::difference_type, __wrap_iter<_Iter1>) _NOEXCEPT;
-
-    template <class _Ip, class _Op> friend _Op copy(_Ip, _Ip, _Op);
-    template <class _B1, class _B2> friend _B2 copy_backward(_B1, _B1, _B2);
-    template <class _Ip, class _Op> friend _Op move(_Ip, _Ip, _Op);
-    template <class _B1, class _B2> friend _B2 move_backward(_B1, _B1, _B2);
-
-    template <class _Tp>
-    friend
-    typename enable_if
-    <
-        is_trivially_copy_assignable<_Tp>::value,
-        _Tp*
-    >::type
-    __unwrap_iter(__wrap_iter<_Tp*>);
-};
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return __x.base() == __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__less_than_comparable(&__x, &__y),
-                   "Attempted to compare incomparable iterators");
-#endif
-    return __x.base() < __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return !(__x == __y);
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return __y < __x;
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return !(__x < __y);
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return !(__y < __x);
-}
-
-template <class _Iter1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
-{
-    return !(__x == __y);
-}
-
-template <class _Iter1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
-{
-    return __y < __x;
-}
-
-template <class _Iter1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
-{
-    return !(__x < __y);
-}
-
-template <class _Iter1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
-{
-    return !(__y < __x);
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __wrap_iter<_Iter1>::difference_type
-operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__less_than_comparable(&__x, &__y),
-                   "Attempted to subtract incompatible iterators");
-#endif
-    return __x.base() - __y.base();
-}
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-__wrap_iter<_Iter>
-operator+(typename __wrap_iter<_Iter>::difference_type __n,
-          __wrap_iter<_Iter> __x) _NOEXCEPT
-{
-    __x += __n;
-    return __x;
-}
-
-template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp*
-begin(_Tp (&__array)[_Np])
-{
-    return __array;
-}
-
-template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp*
-end(_Tp (&__array)[_Np])
-{
-    return __array + _Np;
-}
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN)
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-begin(_Cp& __c) -> decltype(__c.begin())
-{
-    return __c.begin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-begin(const _Cp& __c) -> decltype(__c.begin())
-{
-    return __c.begin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-end(_Cp& __c) -> decltype(__c.end())
-{
-    return __c.end();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-end(const _Cp& __c) -> decltype(__c.end())
-{
-    return __c.end();
-}
-
-#if _LIBCPP_STD_VER > 11
-
-template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np])
-{
-    return reverse_iterator<_Tp*>(__array + _Np);
-}
-
-template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np])
-{
-    return reverse_iterator<_Tp*>(__array);
-}
-
-template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<const _Ep*> rbegin(initializer_list<_Ep> __il)
-{
-    return reverse_iterator<const _Ep*>(__il.end());
-}
-
-template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<const _Ep*> rend(initializer_list<_Ep> __il)
-{
-    return reverse_iterator<const _Ep*>(__il.begin());
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-auto cbegin(const _Cp& __c) -> decltype(begin(__c))
-{
-    return begin(__c);
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-auto cend(const _Cp& __c) -> decltype(end(__c))
-{
-    return end(__c);
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto rbegin(_Cp& __c) -> decltype(__c.rbegin())
-{
-    return __c.rbegin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto rbegin(const _Cp& __c) -> decltype(__c.rbegin())
-{
-    return __c.rbegin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto rend(_Cp& __c) -> decltype(__c.rend())
-{
-    return __c.rend();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto rend(const _Cp& __c) -> decltype(__c.rend())
-{
-    return __c.rend();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto crbegin(const _Cp& __c) -> decltype(rbegin(__c))
-{
-    return rbegin(__c);
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto crend(const _Cp& __c) -> decltype(rend(__c))
-{
-    return rend(__c);
-}
-
-#endif
-
-
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN)
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename _Cp::iterator
-begin(_Cp& __c)
-{
-    return __c.begin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename _Cp::const_iterator
-begin(const _Cp& __c)
-{
-    return __c.begin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename _Cp::iterator
-end(_Cp& __c)
-{
-    return __c.end();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename _Cp::const_iterator
-end(const _Cp& __c)
-{
-    return __c.end();
-}
-
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN)
-
-#if _LIBCPP_STD_VER > 14
-template <class _C>
-constexpr auto size(const _C& __c) -> decltype(__c.size()) { return __c.size(); }
-
-template <class _Tp, size_t _N>
-constexpr size_t size(const _Tp (&__array)[_N]) noexcept { return _N; }
-
-template <class _C>
-constexpr auto empty(const _C& __c) -> decltype(__c.empty()) { return __c.empty(); }
-
-template <class _Tp, size_t _N>
-constexpr bool empty(const _Tp (&__array)[_N]) noexcept { return false; }
-
-template <class _Ep>
-constexpr bool empty(initializer_list<_Ep> __il) noexcept { return __il.size() == 0; }
-
-template <class _C> constexpr
-auto data(_C& __c) -> decltype(__c.data()) { return __c.data(); }
-
-template <class _C> constexpr
-auto data(const _C& __c) -> decltype(__c.data()) { return __c.data(); }
-
-template <class _Tp, size_t _N>
-constexpr _Tp* data(_Tp (&__array)[_N]) noexcept { return __array; }
-
-template <class _Ep>
-constexpr const _Ep* data(initializer_list<_Ep> __il) noexcept { return __il.begin(); }
-#endif
-
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_ITERATOR
diff --git a/include.new/c++/v1/limits b/include.new/c++/v1/limits
deleted file mode 100644
index ce967ea..0000000
--- a/include.new/c++/v1/limits
+++ /dev/null
@@ -1,813 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- limits ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_LIMITS
-#define _LIBCPP_LIMITS
-
-/*
-    limits synopsis
-
-namespace std
-{
-
-template<class T>
-class numeric_limits
-{
-public:
-    static constexpr bool is_specialized = false;
-    static constexpr T min() noexcept;
-    static constexpr T max() noexcept;
-    static constexpr T lowest() noexcept;
-
-    static constexpr int  digits = 0;
-    static constexpr int  digits10 = 0;
-    static constexpr int  max_digits10 = 0;
-    static constexpr bool is_signed = false;
-    static constexpr bool is_integer = false;
-    static constexpr bool is_exact = false;
-    static constexpr int  radix = 0;
-    static constexpr T epsilon() noexcept;
-    static constexpr T round_error() noexcept;
-
-    static constexpr int  min_exponent = 0;
-    static constexpr int  min_exponent10 = 0;
-    static constexpr int  max_exponent = 0;
-    static constexpr int  max_exponent10 = 0;
-
-    static constexpr bool has_infinity = false;
-    static constexpr bool has_quiet_NaN = false;
-    static constexpr bool has_signaling_NaN = false;
-    static constexpr float_denorm_style has_denorm = denorm_absent;
-    static constexpr bool has_denorm_loss = false;
-    static constexpr T infinity() noexcept;
-    static constexpr T quiet_NaN() noexcept;
-    static constexpr T signaling_NaN() noexcept;
-    static constexpr T denorm_min() noexcept;
-
-    static constexpr bool is_iec559 = false;
-    static constexpr bool is_bounded = false;
-    static constexpr bool is_modulo = false;
-
-    static constexpr bool traps = false;
-    static constexpr bool tinyness_before = false;
-    static constexpr float_round_style round_style = round_toward_zero;
-};
-
-enum float_round_style
-{
-    round_indeterminate       = -1,
-    round_toward_zero         =  0,
-    round_to_nearest          =  1,
-    round_toward_infinity     =  2,
-    round_toward_neg_infinity =  3
-};
-
-enum float_denorm_style
-{
-    denorm_indeterminate = -1,
-    denorm_absent = 0,
-    denorm_present = 1
-};
-
-template<> class numeric_limits<cv bool>;
-
-template<> class numeric_limits<cv char>;
-template<> class numeric_limits<cv signed char>;
-template<> class numeric_limits<cv unsigned char>;
-template<> class numeric_limits<cv wchar_t>;
-template<> class numeric_limits<cv char16_t>;
-template<> class numeric_limits<cv char32_t>;
-
-template<> class numeric_limits<cv short>;
-template<> class numeric_limits<cv int>;
-template<> class numeric_limits<cv long>;
-template<> class numeric_limits<cv long long>;
-template<> class numeric_limits<cv unsigned short>;
-template<> class numeric_limits<cv unsigned int>;
-template<> class numeric_limits<cv unsigned long>;
-template<> class numeric_limits<cv unsigned long long>;
-
-template<> class numeric_limits<cv float>;
-template<> class numeric_limits<cv double>;
-template<> class numeric_limits<cv long double>;
-
-}  // std
-
-*/
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#include <__config>
-#include <type_traits>
-
-#include <__undef_min_max>
-
-#if defined(_LIBCPP_MSVCRT)
-#include "support/win32/limits_win32.h"
-#endif // _LIBCPP_MSVCRT
-
-#if defined(__IBMCPP__)
-#include "support/ibm/limits.h"
-#endif // __IBMCPP__
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-enum float_round_style
-{
-    round_indeterminate       = -1,
-    round_toward_zero         =  0,
-    round_to_nearest          =  1,
-    round_toward_infinity     =  2,
-    round_toward_neg_infinity =  3
-};
-
-enum float_denorm_style
-{
-    denorm_indeterminate = -1,
-    denorm_absent = 0,
-    denorm_present = 1
-};
-
-template <class _Tp, bool = is_arithmetic<_Tp>::value>
-class __libcpp_numeric_limits
-{
-protected:
-    typedef _Tp type;
-
-    static _LIBCPP_CONSTEXPR const  bool is_specialized = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return type();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = 0;
-    static _LIBCPP_CONSTEXPR const int  digits10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 0;
-    static _LIBCPP_CONSTEXPR const bool is_signed = false;
-    static _LIBCPP_CONSTEXPR const bool is_integer = false;
-    static _LIBCPP_CONSTEXPR const bool is_exact = false;
-    static _LIBCPP_CONSTEXPR const int  radix = 0;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return type();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = 0;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = false;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = false;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = false;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_absent;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return type();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = false;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_toward_zero;
-};
-
-template <class _Tp, int digits, bool is_signed>
-struct __libcpp_compute_min
-{
-    static _LIBCPP_CONSTEXPR const _Tp value = _Tp(_Tp(1) << digits);
-};
-
-template <class _Tp, int digits>
-struct __libcpp_compute_min<_Tp, digits, false>
-{
-    static _LIBCPP_CONSTEXPR const _Tp value = _Tp(0);
-};
-
-template <class _Tp>
-class __libcpp_numeric_limits<_Tp, true>
-{
-protected:
-    typedef _Tp type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = type(-1) < type(0);
-    static _LIBCPP_CONSTEXPR const int  digits = static_cast<int>(sizeof(type) * __CHAR_BIT__ - is_signed);
-    static _LIBCPP_CONSTEXPR const int  digits10 = digits * 3 / 10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 0;
-    static _LIBCPP_CONSTEXPR const type __min = __libcpp_compute_min<type, digits, is_signed>::value;
-    static _LIBCPP_CONSTEXPR const type __max = is_signed ? type(type(~0) ^ __min) : type(~0);
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __min;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __max;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = true;
-    static _LIBCPP_CONSTEXPR const bool is_exact = true;
-    static _LIBCPP_CONSTEXPR const int  radix = 2;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return type(0);}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = 0;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = false;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = false;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = false;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_absent;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return type(0);}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = !_VSTD::is_signed<_Tp>::value;
-
-#if defined(__i386__) || defined(__x86_64__) || defined(__pnacl__)
-    static _LIBCPP_CONSTEXPR const bool traps = true;
-#else
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-#endif
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_toward_zero;
-};
-
-template <>
-class __libcpp_numeric_limits<bool, true>
-{
-protected:
-    typedef bool type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = false;
-    static _LIBCPP_CONSTEXPR const int  digits = 1;
-    static _LIBCPP_CONSTEXPR const int  digits10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 0;
-    static _LIBCPP_CONSTEXPR const type __min = false;
-    static _LIBCPP_CONSTEXPR const type __max = true;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __min;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __max;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = true;
-    static _LIBCPP_CONSTEXPR const bool is_exact = true;
-    static _LIBCPP_CONSTEXPR const int  radix = 2;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return type(0);}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = 0;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = false;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = false;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = false;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_absent;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return type(0);}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_toward_zero;
-};
-
-template <>
-class __libcpp_numeric_limits<float, true>
-{
-protected:
-    typedef float type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = true;
-    static _LIBCPP_CONSTEXPR const int  digits = __FLT_MANT_DIG__;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __FLT_DIG__;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 2+(digits * 30103)/100000;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __FLT_MIN__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __FLT_MAX__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return -max();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = false;
-    static _LIBCPP_CONSTEXPR const bool is_exact = false;
-    static _LIBCPP_CONSTEXPR const int  radix = __FLT_RADIX__;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __FLT_EPSILON__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return 0.5F;}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __FLT_MIN_EXP__;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __FLT_MIN_10_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __FLT_MAX_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __FLT_MAX_10_EXP__;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = true;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = true;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = true;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_present;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __builtin_huge_valf();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __builtin_nanf("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansf("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __FLT_DENORM_MIN__;}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_to_nearest;
-};
-
-template <>
-class __libcpp_numeric_limits<double, true>
-{
-protected:
-    typedef double type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = true;
-    static _LIBCPP_CONSTEXPR const int  digits = __DBL_MANT_DIG__;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __DBL_DIG__;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 2+(digits * 30103)/100000;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __DBL_MIN__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __DBL_MAX__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return -max();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = false;
-    static _LIBCPP_CONSTEXPR const bool is_exact = false;
-    static _LIBCPP_CONSTEXPR const int  radix = __FLT_RADIX__;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __DBL_EPSILON__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return 0.5;}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __DBL_MIN_EXP__;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __DBL_MIN_10_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __DBL_MAX_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __DBL_MAX_10_EXP__;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = true;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = true;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = true;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_present;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __builtin_huge_val();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __builtin_nan("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nans("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __DBL_DENORM_MIN__;}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_to_nearest;
-};
-
-template <>
-class __libcpp_numeric_limits<long double, true>
-{
-protected:
-    typedef long double type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = true;
-    static _LIBCPP_CONSTEXPR const int  digits = __LDBL_MANT_DIG__;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __LDBL_DIG__;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 2+(digits * 30103)/100000;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __LDBL_MIN__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __LDBL_MAX__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return -max();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = false;
-    static _LIBCPP_CONSTEXPR const bool is_exact = false;
-    static _LIBCPP_CONSTEXPR const int  radix = __FLT_RADIX__;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __LDBL_EPSILON__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return 0.5;}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __LDBL_MIN_EXP__;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __LDBL_MIN_10_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __LDBL_MAX_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __LDBL_MAX_10_EXP__;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = true;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = true;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = true;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_present;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __builtin_huge_vall();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __builtin_nanl("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;}
-
-#if (defined(__ppc__) || defined(__ppc64__))
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
-#else
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
-#endif
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_to_nearest;
-};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY numeric_limits
-    : private __libcpp_numeric_limits<typename remove_cv<_Tp>::type>
-{
-    typedef __libcpp_numeric_limits<typename remove_cv<_Tp>::type> __base;
-    typedef typename __base::type type;
-public:
-    static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __base::min();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __base::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return __base::lowest();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = __base::digits;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __base::digits10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = __base::max_digits10;
-    static _LIBCPP_CONSTEXPR const bool is_signed = __base::is_signed;
-    static _LIBCPP_CONSTEXPR const bool is_integer = __base::is_integer;
-    static _LIBCPP_CONSTEXPR const bool is_exact = __base::is_exact;
-    static _LIBCPP_CONSTEXPR const int  radix = __base::radix;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __base::epsilon();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return __base::round_error();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __base::min_exponent;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __base::min_exponent10;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __base::max_exponent;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __base::max_exponent10;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = __base::has_infinity;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = __base::has_quiet_NaN;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = __base::has_signaling_NaN;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = __base::has_denorm;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = __base::has_denorm_loss;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __base::infinity();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __base::quiet_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __base::signaling_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __base::denorm_min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = __base::is_iec559;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = __base::is_bounded;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = __base::is_modulo;
-
-    static _LIBCPP_CONSTEXPR const bool traps = __base::traps;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = __base::tinyness_before;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = __base::round_style;
-};
-
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_specialized;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::digits;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::max_digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_signed;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_integer;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_exact;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::radix;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::min_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::min_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::max_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::max_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::has_infinity;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::has_quiet_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::has_signaling_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_denorm_style numeric_limits<_Tp>::has_denorm;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::has_denorm_loss;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_iec559;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_bounded;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_modulo;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::traps;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::tinyness_before;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_round_style numeric_limits<_Tp>::round_style;
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY numeric_limits<const _Tp>
-    : private numeric_limits<_Tp>
-{
-    typedef numeric_limits<_Tp> __base;
-    typedef _Tp type;
-public:
-    static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __base::min();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __base::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return __base::lowest();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = __base::digits;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __base::digits10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = __base::max_digits10;
-    static _LIBCPP_CONSTEXPR const bool is_signed = __base::is_signed;
-    static _LIBCPP_CONSTEXPR const bool is_integer = __base::is_integer;
-    static _LIBCPP_CONSTEXPR const bool is_exact = __base::is_exact;
-    static _LIBCPP_CONSTEXPR const int  radix = __base::radix;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __base::epsilon();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return __base::round_error();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __base::min_exponent;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __base::min_exponent10;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __base::max_exponent;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __base::max_exponent10;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = __base::has_infinity;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = __base::has_quiet_NaN;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = __base::has_signaling_NaN;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = __base::has_denorm;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = __base::has_denorm_loss;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __base::infinity();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __base::quiet_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __base::signaling_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __base::denorm_min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = __base::is_iec559;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = __base::is_bounded;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = __base::is_modulo;
-
-    static _LIBCPP_CONSTEXPR const bool traps = __base::traps;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = __base::tinyness_before;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = __base::round_style;
-};
-
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_specialized;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::digits;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::max_digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_signed;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_integer;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_exact;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::radix;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::min_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::min_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::max_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::max_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::has_infinity;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::has_quiet_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::has_signaling_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_denorm_style numeric_limits<const _Tp>::has_denorm;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::has_denorm_loss;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_iec559;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_bounded;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_modulo;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::traps;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::tinyness_before;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_round_style numeric_limits<const _Tp>::round_style;
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY numeric_limits<volatile _Tp>
-    : private numeric_limits<_Tp>
-{
-    typedef numeric_limits<_Tp> __base;
-    typedef _Tp type;
-public:
-    static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __base::min();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __base::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return __base::lowest();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = __base::digits;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __base::digits10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = __base::max_digits10;
-    static _LIBCPP_CONSTEXPR const bool is_signed = __base::is_signed;
-    static _LIBCPP_CONSTEXPR const bool is_integer = __base::is_integer;
-    static _LIBCPP_CONSTEXPR const bool is_exact = __base::is_exact;
-    static _LIBCPP_CONSTEXPR const int  radix = __base::radix;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __base::epsilon();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return __base::round_error();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __base::min_exponent;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __base::min_exponent10;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __base::max_exponent;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __base::max_exponent10;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = __base::has_infinity;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = __base::has_quiet_NaN;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = __base::has_signaling_NaN;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = __base::has_denorm;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = __base::has_denorm_loss;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __base::infinity();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __base::quiet_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __base::signaling_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __base::denorm_min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = __base::is_iec559;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = __base::is_bounded;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = __base::is_modulo;
-
-    static _LIBCPP_CONSTEXPR const bool traps = __base::traps;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = __base::tinyness_before;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = __base::round_style;
-};
-
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_specialized;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::digits;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::max_digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_signed;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_integer;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_exact;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::radix;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::min_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::min_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::max_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::max_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::has_infinity;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::has_quiet_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::has_signaling_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_denorm_style numeric_limits<volatile _Tp>::has_denorm;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::has_denorm_loss;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_iec559;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_bounded;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_modulo;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::traps;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::tinyness_before;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_round_style numeric_limits<volatile _Tp>::round_style;
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY numeric_limits<const volatile _Tp>
-    : private numeric_limits<_Tp>
-{
-    typedef numeric_limits<_Tp> __base;
-    typedef _Tp type;
-public:
-    static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __base::min();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __base::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return __base::lowest();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = __base::digits;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __base::digits10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = __base::max_digits10;
-    static _LIBCPP_CONSTEXPR const bool is_signed = __base::is_signed;
-    static _LIBCPP_CONSTEXPR const bool is_integer = __base::is_integer;
-    static _LIBCPP_CONSTEXPR const bool is_exact = __base::is_exact;
-    static _LIBCPP_CONSTEXPR const int  radix = __base::radix;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __base::epsilon();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return __base::round_error();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __base::min_exponent;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __base::min_exponent10;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __base::max_exponent;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __base::max_exponent10;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = __base::has_infinity;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = __base::has_quiet_NaN;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = __base::has_signaling_NaN;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = __base::has_denorm;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = __base::has_denorm_loss;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __base::infinity();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __base::quiet_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __base::signaling_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __base::denorm_min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = __base::is_iec559;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = __base::is_bounded;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = __base::is_modulo;
-
-    static _LIBCPP_CONSTEXPR const bool traps = __base::traps;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = __base::tinyness_before;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = __base::round_style;
-};
-
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_specialized;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::digits;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::max_digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_signed;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_integer;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_exact;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::radix;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::min_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::min_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::max_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::max_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::has_infinity;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::has_quiet_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::has_signaling_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_denorm_style numeric_limits<const volatile _Tp>::has_denorm;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::has_denorm_loss;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_iec559;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_bounded;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_modulo;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::traps;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::tinyness_before;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_round_style numeric_limits<const volatile _Tp>::round_style;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_LIMITS
diff --git a/include.new/c++/v1/list b/include.new/c++/v1/list
deleted file mode 100644
index 13f8a53..0000000
--- a/include.new/c++/v1/list
+++ /dev/null
@@ -1,2377 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- list ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_LIST
-#define _LIBCPP_LIST
-
-/*
-    list synopsis
-
-namespace std
-{
-
-template <class T, class Alloc = allocator<T> >
-class list
-{
-public:
-
-    // types:
-    typedef T value_type;
-    typedef Alloc allocator_type;
-    typedef typename allocator_type::reference reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::pointer pointer;
-    typedef typename allocator_type::const_pointer const_pointer;
-    typedef implementation-defined iterator;
-    typedef implementation-defined const_iterator;
-    typedef implementation-defined size_type;
-    typedef implementation-defined difference_type;
-    typedef reverse_iterator<iterator> reverse_iterator;
-    typedef reverse_iterator<const_iterator> const_reverse_iterator;
-
-    list()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit list(const allocator_type& a);
-    explicit list(size_type n);
-    explicit list(size_type n, const allocator_type& a); // C++14
-    list(size_type n, const value_type& value);
-    list(size_type n, const value_type& value, const allocator_type& a);
-    template <class Iter>
-        list(Iter first, Iter last);
-    template <class Iter>
-        list(Iter first, Iter last, const allocator_type& a);
-    list(const list& x);
-    list(const list&, const allocator_type& a);
-    list(list&& x)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    list(list&&, const allocator_type& a);
-    list(initializer_list<value_type>);
-    list(initializer_list<value_type>, const allocator_type& a);
-
-    ~list();
-
-    list& operator=(const list& x);
-    list& operator=(list&& x)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    list& operator=(initializer_list<value_type>);
-    template <class Iter>
-        void assign(Iter first, Iter last);
-    void assign(size_type n, const value_type& t);
-    void assign(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator end() noexcept;
-    const_iterator end() const noexcept;
-    reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
-
-    reference front();
-    const_reference front() const;
-    reference back();
-    const_reference back() const;
-
-    bool empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    template <class... Args>
-        void emplace_front(Args&&... args);
-    void pop_front();
-    template <class... Args>
-        void emplace_back(Args&&... args);
-    void pop_back();
-    void push_front(const value_type& x);
-    void push_front(value_type&& x);
-    void push_back(const value_type& x);
-    void push_back(value_type&& x);
-    template <class... Args>
-        iterator emplace(const_iterator position, Args&&... args);
-    iterator insert(const_iterator position, const value_type& x);
-    iterator insert(const_iterator position, value_type&& x);
-    iterator insert(const_iterator position, size_type n, const value_type& x);
-    template <class Iter>
-        iterator insert(const_iterator position, Iter first, Iter last);
-    iterator insert(const_iterator position, initializer_list<value_type> il);
-
-    iterator erase(const_iterator position);
-    iterator erase(const_iterator position, const_iterator last);
-
-    void resize(size_type sz);
-    void resize(size_type sz, const value_type& c);
-
-    void swap(list&)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-    void clear() noexcept;
-
-    void splice(const_iterator position, list& x);
-    void splice(const_iterator position, list&& x);
-    void splice(const_iterator position, list& x, const_iterator i);
-    void splice(const_iterator position, list&& x, const_iterator i);
-    void splice(const_iterator position, list& x, const_iterator first,
-                                                  const_iterator last);
-    void splice(const_iterator position, list&& x, const_iterator first,
-                                                  const_iterator last);
-
-    void remove(const value_type& value);
-    template <class Pred> void remove_if(Pred pred);
-    void unique();
-    template <class BinaryPredicate>
-        void unique(BinaryPredicate binary_pred);
-    void merge(list& x);
-    void merge(list&& x);
-    template <class Compare>
-        void merge(list& x, Compare comp);
-    template <class Compare>
-        void merge(list&& x, Compare comp);
-    void sort();
-    template <class Compare>
-        void sort(Compare comp);
-    void reverse() noexcept;
-};
-
-template <class T, class Alloc>
-    bool operator==(const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator< (const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator!=(const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator> (const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator>=(const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator<=(const list<T,Alloc>& x, const list<T,Alloc>& y);
-
-template <class T, class Alloc>
-    void swap(list<T,Alloc>& x, list<T,Alloc>& y)
-         noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-
-#include <memory>
-#include <limits>
-#include <initializer_list>
-#include <iterator>
-#include <algorithm>
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _VoidPtr> struct __list_node;
-
-template <class _Tp, class _VoidPtr>
-struct __list_node_base
-{
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-        rebind<__list_node<_Tp, _VoidPtr> > pointer;
-#else
-        rebind<__list_node<_Tp, _VoidPtr> >::other pointer;
-#endif
-
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-        rebind<__list_node_base> __base_pointer;
-#else
-        rebind<__list_node_base>::other __base_pointer;
-#endif
-
-    pointer __prev_;
-    pointer __next_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_node_base() : __prev_(__self()), __next_(__self()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    pointer __self()
-    {
-        return static_cast<pointer>(pointer_traits<__base_pointer>::pointer_to(*this));
-    }
-};
-
-template <class _Tp, class _VoidPtr>
-struct __list_node
-    : public __list_node_base<_Tp, _VoidPtr>
-{
-    _Tp __value_;
-};
-
-template <class _Tp, class _Alloc> class _LIBCPP_TYPE_VIS_ONLY list;
-template <class _Tp, class _Alloc> class __list_imp;
-template <class _Tp, class _VoidPtr> class _LIBCPP_TYPE_VIS_ONLY __list_const_iterator;
-
-template <class _Tp, class _VoidPtr>
-class _LIBCPP_TYPE_VIS_ONLY __list_iterator
-{
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-        rebind<__list_node<_Tp, _VoidPtr> > __node_pointer;
-#else
-        rebind<__list_node<_Tp, _VoidPtr> >::other __node_pointer;
-#endif
-
-    __node_pointer __ptr_;
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __list_iterator(__node_pointer __p, const void* __c) _NOEXCEPT
-        : __ptr_(__p)
-    {
-        __get_db()->__insert_ic(this, __c);
-    }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __list_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
-#endif
-
-
-
-    template<class, class> friend class list;
-    template<class, class> friend class __list_imp;
-    template<class, class> friend class __list_const_iterator;
-public:
-    typedef bidirectional_iterator_tag       iterator_category;
-    typedef _Tp                              value_type;
-    typedef value_type&                      reference;
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                             pointer;
-    typedef typename pointer_traits<pointer>::difference_type difference_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator() _NOEXCEPT : __ptr_(nullptr)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator(const __list_iterator& __p)
-        : __ptr_(__p.__ptr_)
-    {
-        __get_db()->__iterator_copy(this, &__p);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__list_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator& operator=(const __list_iterator& __p)
-    {
-        if (this != &__p)
-        {
-            __get_db()->__iterator_copy(this, &__p);
-            __ptr_ = __p.__ptr_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable list::iterator");
-#endif
-        return __ptr_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable list::iterator");
-#endif
-        return pointer_traits<pointer>::pointer_to(__ptr_->__value_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable list::iterator");
-#endif
-        __ptr_ = __ptr_->__next_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator operator++(int) {__list_iterator __t(*this); ++(*this); return __t;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator& operator--()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__decrementable(this),
-                       "Attempted to decrement non-decrementable list::iterator");
-#endif
-        __ptr_ = __ptr_->__prev_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator operator--(int) {__list_iterator __t(*this); --(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __list_iterator& __x, const __list_iterator& __y)
-    {
-        return __x.__ptr_ == __y.__ptr_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-     bool operator!=(const __list_iterator& __x, const __list_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _Tp, class _VoidPtr>
-class _LIBCPP_TYPE_VIS_ONLY __list_const_iterator
-{
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-        rebind<__list_node<_Tp, _VoidPtr> > __node_pointer;
-#else
-        rebind<__list_node<_Tp, _VoidPtr> >::other __node_pointer;
-#endif
-
-    __node_pointer __ptr_;
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __list_const_iterator(__node_pointer __p, const void* __c) _NOEXCEPT
-        : __ptr_(__p)
-    {
-        __get_db()->__insert_ic(this, __c);
-    }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __list_const_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
-#endif
-
-    template<class, class> friend class list;
-    template<class, class> friend class __list_imp;
-public:
-    typedef bidirectional_iterator_tag       iterator_category;
-    typedef _Tp                              value_type;
-    typedef const value_type&                reference;
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                             pointer;
-    typedef typename pointer_traits<pointer>::difference_type difference_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator() _NOEXCEPT : __ptr_(nullptr)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator(const __list_iterator<_Tp, _VoidPtr>& __p) _NOEXCEPT
-        : __ptr_(__p.__ptr_)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__iterator_copy(this, &__p);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator(const __list_const_iterator& __p)
-        : __ptr_(__p.__ptr_)
-    {
-        __get_db()->__iterator_copy(this, &__p);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__list_const_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator& operator=(const __list_const_iterator& __p)
-    {
-        if (this != &__p)
-        {
-            __get_db()->__iterator_copy(this, &__p);
-            __ptr_ = __p.__ptr_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable list::const_iterator");
-#endif
-        return __ptr_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable list::iterator");
-#endif
-        return pointer_traits<pointer>::pointer_to(__ptr_->__value_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable list::const_iterator");
-#endif
-        __ptr_ = __ptr_->__next_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator operator++(int) {__list_const_iterator __t(*this); ++(*this); return __t;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator& operator--()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__decrementable(this),
-                       "Attempted to decrement non-decrementable list::const_iterator");
-#endif
-        __ptr_ = __ptr_->__prev_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator operator--(int) {__list_const_iterator __t(*this); --(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __list_const_iterator& __x, const __list_const_iterator& __y)
-    {
-        return __x.__ptr_ == __y.__ptr_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __list_const_iterator& __x, const __list_const_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _Tp, class _Alloc>
-class __list_imp
-{
-    __list_imp(const __list_imp&);
-    __list_imp& operator=(const __list_imp&);
-protected:
-    typedef _Tp                                                     value_type;
-    typedef _Alloc                                                  allocator_type;
-    typedef allocator_traits<allocator_type>                        __alloc_traits;
-    typedef typename __alloc_traits::size_type                      size_type;
-    typedef typename __alloc_traits::void_pointer                   __void_pointer;
-    typedef __list_iterator<value_type, __void_pointer>             iterator;
-    typedef __list_const_iterator<value_type, __void_pointer>       const_iterator;
-    typedef __list_node_base<value_type, __void_pointer>            __node_base;
-    typedef __list_node<value_type, __void_pointer>                 __node;
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__node>
-#else
-                rebind_alloc<__node>::other
-#endif
-                                                                     __node_allocator;
-    typedef allocator_traits<__node_allocator>                       __node_alloc_traits;
-    typedef typename __node_alloc_traits::pointer                    __node_pointer;
-    typedef typename __node_alloc_traits::pointer                    __node_const_pointer;
-    typedef typename __alloc_traits::pointer                         pointer;
-    typedef typename __alloc_traits::const_pointer                   const_pointer;
-    typedef typename __alloc_traits::difference_type                 difference_type;
-
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__node_base>
-#else
-                rebind_alloc<__node_base>::other
-#endif
-                                                                     __node_base_allocator;
-    typedef typename allocator_traits<__node_base_allocator>::pointer __node_base_pointer;
-
-    __node_base __end_;
-    __compressed_pair<size_type, __node_allocator> __size_alloc_;
-
-    _LIBCPP_INLINE_VISIBILITY
-          size_type& __sz() _NOEXCEPT {return __size_alloc_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    const size_type& __sz() const _NOEXCEPT
-        {return __size_alloc_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-          __node_allocator& __node_alloc() _NOEXCEPT
-          {return __size_alloc_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_allocator& __node_alloc() const _NOEXCEPT
-        {return __size_alloc_.second();}
-
-    static void __unlink_nodes(__node_pointer __f, __node_pointer __l) _NOEXCEPT;
-
-    __list_imp()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value);
-    __list_imp(const allocator_type& __a);
-    ~__list_imp();
-    void clear() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __sz() == 0;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return iterator(__end_.__next_, this);
-#else
-        return iterator(__end_.__next_);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const  _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return const_iterator(__end_.__next_, this);
-#else
-        return const_iterator(__end_.__next_);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return iterator(static_cast<__node_pointer>(
-                pointer_traits<__node_base_pointer>::pointer_to(__end_)), this);
-#else
-        return iterator(static_cast<__node_pointer>(
-                      pointer_traits<__node_base_pointer>::pointer_to(__end_)));
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return const_iterator(static_cast<__node_const_pointer>(
-        pointer_traits<__node_base_pointer>::pointer_to(const_cast<__node_base&>(__end_))), this);
-#else
-        return const_iterator(static_cast<__node_const_pointer>(
-        pointer_traits<__node_base_pointer>::pointer_to(const_cast<__node_base&>(__end_))));
-#endif
-    }
-
-    void swap(__list_imp& __c)
-        _NOEXCEPT_(!__node_alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __list_imp& __c)
-        {__copy_assign_alloc(__c, integral_constant<bool,
-                      __node_alloc_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__list_imp& __c)
-        _NOEXCEPT_(
-            !__node_alloc_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<__node_allocator>::value)
-        {__move_assign_alloc(__c, integral_constant<bool,
-                      __node_alloc_traits::propagate_on_container_move_assignment::value>());}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y)
-        _NOEXCEPT_(!__node_alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __node_alloc_traits::propagate_on_container_swap::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<__node_allocator>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y, false_type)
-        _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __list_imp& __c, true_type)
-        {
-            if (__node_alloc() != __c.__node_alloc())
-                clear();
-            __node_alloc() = __c.__node_alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __list_imp& __c, false_type)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__list_imp& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value)
-        {
-            __node_alloc() = _VSTD::move(__c.__node_alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__list_imp& __c, false_type)
-        _NOEXCEPT
-        {}
-};
-
-// Unlink nodes [__f, __l]
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__list_imp<_Tp, _Alloc>::__unlink_nodes(__node_pointer __f, __node_pointer __l)
-    _NOEXCEPT
-{
-    __f->__prev_->__next_ = __l->__next_;
-    __l->__next_->__prev_ = __f->__prev_;
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__list_imp<_Tp, _Alloc>::__list_imp()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value)
-    : __size_alloc_(0)
-{
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__list_imp<_Tp, _Alloc>::__list_imp(const allocator_type& __a)
-    : __size_alloc_(0, __node_allocator(__a))
-{
-}
-
-template <class _Tp, class _Alloc>
-__list_imp<_Tp, _Alloc>::~__list_imp()
-{
-    clear();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__erase_c(this);
-#endif
-}
-
-template <class _Tp, class _Alloc>
-void
-__list_imp<_Tp, _Alloc>::clear() _NOEXCEPT
-{
-    if (!empty())
-    {
-        __node_allocator& __na = __node_alloc();
-        __node_pointer __f = __end_.__next_;
-        __node_pointer __l = static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__end_));
-        __unlink_nodes(__f, __l->__prev_);
-        __sz() = 0;
-        while (__f != __l)
-        {
-            __node_pointer __n = __f;
-            __f = __f->__next_;
-            __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-            __node_alloc_traits::deallocate(__na, __n, 1);
-        }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __c_node* __c = __get_db()->__find_c_and_lock(this);
-        for (__i_node** __p = __c->end_; __p != __c->beg_; )
-        {
-            --__p;
-            const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-            if (__i->__ptr_ != __l)
-            {
-                (*__p)->__c_ = nullptr;
-                if (--__c->end_ != __p)
-                    memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __get_db()->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-__list_imp<_Tp, _Alloc>::swap(__list_imp& __c)
-        _NOEXCEPT_(!__node_alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-{
-    _LIBCPP_ASSERT(__alloc_traits::propagate_on_container_swap::value ||
-                   this->__node_alloc() == __c.__node_alloc(),
-                   "list::swap: Either propagate_on_container_swap must be true"
-                   " or the allocators must compare equal");
-    using _VSTD::swap;
-    __swap_alloc(__node_alloc(), __c.__node_alloc());
-    swap(__sz(), __c.__sz());
-    swap(__end_, __c.__end_);
-    if (__sz() == 0)
-        __end_.__next_ = __end_.__prev_ = __end_.__self();
-    else
-        __end_.__prev_->__next_ = __end_.__next_->__prev_ = __end_.__self();
-    if (__c.__sz() == 0)
-        __c.__end_.__next_ = __c.__end_.__prev_ = __c.__end_.__self();
-    else
-        __c.__end_.__prev_->__next_ = __c.__end_.__next_->__prev_ = __c.__end_.__self();
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __libcpp_db* __db = __get_db();
-    __c_node* __cn1 = __db->__find_c_and_lock(this);
-    __c_node* __cn2 = __db->__find_c(&__c);
-    std::swap(__cn1->beg_, __cn2->beg_);
-    std::swap(__cn1->end_, __cn2->end_);
-    std::swap(__cn1->cap_, __cn2->cap_);
-    for (__i_node** __p = __cn1->end_; __p != __cn1->beg_;)
-    {
-        --__p;
-        const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__c.__end_)))
-        {
-            __cn2->__add(*__p);
-            if (--__cn1->end_ != __p)
-                memmove(__p, __p+1, (__cn1->end_ - __p)*sizeof(__i_node*));
-        }
-        else
-            (*__p)->__c_ = __cn1;
-    }
-    for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-    {
-        --__p;
-        const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__end_)))
-        {
-            __cn1->__add(*__p);
-            if (--__cn2->end_ != __p)
-                memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-        }
-        else
-            (*__p)->__c_ = __cn2;
-    }
-    __db->unlock();
-#endif
-}
-
-template <class _Tp, class _Alloc = allocator<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY list
-    : private __list_imp<_Tp, _Alloc>
-{
-    typedef __list_imp<_Tp, _Alloc> base;
-    typedef typename base::__node              __node;
-    typedef typename base::__node_allocator    __node_allocator;
-    typedef typename base::__node_pointer      __node_pointer;
-    typedef typename base::__node_alloc_traits __node_alloc_traits;
-    typedef typename base::__node_base         __node_base;
-    typedef typename base::__node_base_pointer __node_base_pointer;
-
-public:
-    typedef _Tp                                      value_type;
-    typedef _Alloc                                   allocator_type;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-    typedef typename base::pointer                   pointer;
-    typedef typename base::const_pointer             const_pointer;
-    typedef typename base::size_type                 size_type;
-    typedef typename base::difference_type           difference_type;
-    typedef typename base::iterator                  iterator;
-    typedef typename base::const_iterator            const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>         reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    list()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_c(this);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    explicit list(const allocator_type& __a) : base(__a)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_c(this);
-#endif
-    }
-    explicit list(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit list(size_type __n, const allocator_type& __a);
-#endif
-    list(size_type __n, const value_type& __x);
-    list(size_type __n, const value_type& __x, const allocator_type& __a);
-    template <class _InpIter>
-        list(_InpIter __f, _InpIter __l,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type* = 0);
-    template <class _InpIter>
-        list(_InpIter __f, _InpIter __l, const allocator_type& __a,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type* = 0);
-
-    list(const list& __c);
-    list(const list& __c, const allocator_type& __a);
-    list& operator=(const list& __c);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    list(initializer_list<value_type> __il);
-    list(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    list(list&& __c)
-        _NOEXCEPT_(is_nothrow_move_constructible<__node_allocator>::value);
-    list(list&& __c, const allocator_type& __a);
-    list& operator=(list&& __c)
-        _NOEXCEPT_(
-            __node_alloc_traits::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<__node_allocator>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    list& operator=(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end()); return *this;}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template <class _InpIter>
-        void assign(_InpIter __f, _InpIter __l,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type* = 0);
-    void assign(size_type __n, const value_type& __x);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void assign(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    allocator_type get_allocator() const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT     {return base::__sz();}
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT         {return base::empty();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-        {return numeric_limits<difference_type>::max();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT        {return base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT          {return base::end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return base::end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return base::end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT
-            {return       reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin()  const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT
-            {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend()    const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend()   const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference front()
-    {
-        _LIBCPP_ASSERT(!empty(), "list::front called on empty list");
-        return base::__end_.__next_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference front() const
-    {
-        _LIBCPP_ASSERT(!empty(), "list::front called on empty list");
-        return base::__end_.__next_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    reference back()
-    {
-        _LIBCPP_ASSERT(!empty(), "list::back called on empty list");
-        return base::__end_.__prev_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference back() const
-    {
-        _LIBCPP_ASSERT(!empty(), "list::back called on empty list");
-        return base::__end_.__prev_->__value_;
-    }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void push_front(value_type&& __x);
-    void push_back(value_type&& __x);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-       void emplace_front(_Args&&... __args);
-    template <class... _Args>
-        void emplace_back(_Args&&... __args);
-    template <class... _Args>
-        iterator emplace(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-    iterator insert(const_iterator __p, value_type&& __x);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    void push_front(const value_type& __x);
-    void push_back(const value_type& __x);
-
-    iterator insert(const_iterator __p, const value_type& __x);
-    iterator insert(const_iterator __p, size_type __n, const value_type& __x);
-    template <class _InpIter>
-        iterator insert(const_iterator __p, _InpIter __f, _InpIter __l,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type* = 0);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, initializer_list<value_type> __il)
-        {return insert(__p, __il.begin(), __il.end());}
-#endif   // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(list& __c)
-        _NOEXCEPT_(!__node_alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-        {base::swap(__c);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {base::clear();}
-
-    void pop_front();
-    void pop_back();
-
-    iterator erase(const_iterator __p);
-    iterator erase(const_iterator __f, const_iterator __l);
-
-    void resize(size_type __n);
-    void resize(size_type __n, const value_type& __x);
-
-    void splice(const_iterator __p, list& __c);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void splice(const_iterator __p, list&& __c) {splice(__p, __c);}
-#endif
-    void splice(const_iterator __p, list& __c, const_iterator __i);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void splice(const_iterator __p, list&& __c, const_iterator __i)
-        {splice(__p, __c, __i);}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void splice(const_iterator __p, list& __c, const_iterator __f, const_iterator __l);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void splice(const_iterator __p, list&& __c, const_iterator __f, const_iterator __l)
-        {splice(__p, __c, __f, __l);}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    void remove(const value_type& __x);
-    template <class _Pred> void remove_if(_Pred __pred);
-    void unique();
-    template <class _BinaryPred>
-        void unique(_BinaryPred __binary_pred);
-    void merge(list& __c);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void merge(list&& __c) {merge(__c);}
-#endif
-    template <class _Comp>
-        void merge(list& __c, _Comp __comp);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Comp>
-    _LIBCPP_INLINE_VISIBILITY
-        void merge(list&& __c, _Comp __comp) {merge(__c, __comp);}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void sort();
-    template <class _Comp>
-        void sort(_Comp __comp);
-
-    void reverse() _NOEXCEPT;
-
-    bool __invariants() const;
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const;
-    bool __decrementable(const const_iterator* __i) const;
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const;
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-    static void __link_nodes  (__node_pointer __p, __node_pointer __f, __node_pointer __l);
-    void __link_nodes_at_front(__node_pointer __f, __node_pointer __l);
-    void __link_nodes_at_back (__node_pointer __f, __node_pointer __l);
-    iterator __iterator(size_type __n);
-    template <class _Comp>
-        static iterator __sort(iterator __f1, iterator __e2, size_type __n, _Comp& __comp);
-
-    void __move_assign(list& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value);
-    void __move_assign(list& __c, false_type);
-};
-
-// Link in nodes [__f, __l] just prior to __p
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::__link_nodes(__node_pointer __p, __node_pointer __f, __node_pointer __l)
-{
-    __p->__prev_->__next_ = __f;
-    __f->__prev_ = __p->__prev_;
-    __p->__prev_ = __l;
-    __l->__next_ = __p;
-}
-
-// Link in nodes [__f, __l] at the front of the list
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::__link_nodes_at_front(__node_pointer __f, __node_pointer __l)
-{
-    __f->__prev_ = base::__end_.__self();
-    __l->__next_ = base::__end_.__next_;
-    __l->__next_->__prev_ = __l;
-    base::__end_.__next_ = __f;
-}
-
-// Link in nodes [__f, __l] at the front of the list
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::__link_nodes_at_back(__node_pointer __f, __node_pointer __l)
-{
-    __l->__next_ = base::__end_.__self();
-    __f->__prev_ = base::__end_.__prev_;
-    __f->__prev_->__next_ = __f;
-    base::__end_.__prev_ = __l;
-}
-
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::__iterator(size_type __n)
-{
-    return __n <= base::__sz() / 2 ? _VSTD::next(begin(), __n)
-                                   : _VSTD::prev(end(), base::__sz() - __n);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(size_type __n)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __n > 0; --__n)
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        emplace_back();
-#else
-        push_back(value_type());
-#endif
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(size_type __n, const allocator_type& __a) : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __n > 0; --__n)
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        emplace_back();
-#else
-        push_back(value_type());
-#endif
-}
-#endif
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(size_type __n, const value_type& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __n > 0; --__n)
-        push_back(__x);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(size_type __n, const value_type& __x, const allocator_type& __a)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __n > 0; --__n)
-        push_back(__x);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InpIter>
-list<_Tp, _Alloc>::list(_InpIter __f, _InpIter __l,
-                        typename enable_if<__is_input_iterator<_InpIter>::value>::type*)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __f != __l; ++__f)
-        push_back(*__f);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InpIter>
-list<_Tp, _Alloc>::list(_InpIter __f, _InpIter __l, const allocator_type& __a,
-                        typename enable_if<__is_input_iterator<_InpIter>::value>::type*)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __f != __l; ++__f)
-        push_back(*__f);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(const list& __c)
-    : base(allocator_type(
-           __node_alloc_traits::select_on_container_copy_construction(
-                __c.__node_alloc())))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (const_iterator __i = __c.begin(), __e = __c.end(); __i != __e; ++__i)
-        push_back(*__i);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(const list& __c, const allocator_type& __a)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (const_iterator __i = __c.begin(), __e = __c.end(); __i != __e; ++__i)
-        push_back(*__i);
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(initializer_list<value_type> __il, const allocator_type& __a)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (typename initializer_list<value_type>::const_iterator __i = __il.begin(),
-            __e = __il.end(); __i != __e; ++__i)
-        push_back(*__i);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (typename initializer_list<value_type>::const_iterator __i = __il.begin(),
-            __e = __il.end(); __i != __e; ++__i)
-        push_back(*__i);
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-list<_Tp, _Alloc>&
-list<_Tp, _Alloc>::operator=(const list& __c)
-{
-    if (this != &__c)
-    {
-        base::__copy_assign_alloc(__c);
-        assign(__c.begin(), __c.end());
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-list<_Tp, _Alloc>::list(list&& __c)
-    _NOEXCEPT_(is_nothrow_move_constructible<__node_allocator>::value)
-    : base(allocator_type(_VSTD::move(__c.__node_alloc())))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    splice(end(), __c);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-list<_Tp, _Alloc>::list(list&& __c, const allocator_type& __a)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a == __c.get_allocator())
-        splice(end(), __c);
-    else
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-list<_Tp, _Alloc>&
-list<_Tp, _Alloc>::operator=(list&& __c)
-        _NOEXCEPT_(
-            __node_alloc_traits::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<__node_allocator>::value)
-{
-    __move_assign(__c, integral_constant<bool,
-          __node_alloc_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::__move_assign(list& __c, false_type)
-{
-    if (base::__node_alloc() != __c.__node_alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-    else
-        __move_assign(__c, true_type());
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::__move_assign(list& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value)
-{
-    clear();
-    base::__move_assign_alloc(__c);
-    splice(end(), __c);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-template <class _InpIter>
-void
-list<_Tp, _Alloc>::assign(_InpIter __f, _InpIter __l,
-                          typename enable_if<__is_input_iterator<_InpIter>::value>::type*)
-{
-    iterator __i = begin();
-    iterator __e = end();
-    for (; __f != __l && __i != __e; ++__f, ++__i)
-        *__i = *__f;
-    if (__i == __e)
-        insert(__e, __f, __l);
-    else
-        erase(__i, __e);
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::assign(size_type __n, const value_type& __x)
-{
-    iterator __i = begin();
-    iterator __e = end();
-    for (; __n > 0 && __i != __e; --__n, ++__i)
-        *__i = __x;
-    if (__i == __e)
-        insert(__e, __n, __x);
-    else
-        erase(__i, __e);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-_Alloc
-list<_Tp, _Alloc>::get_allocator() const _NOEXCEPT
-{
-    return allocator_type(base::__node_alloc());
-}
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::insert(const_iterator __p, const value_type& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::insert(iterator, x) called with an iterator not"
-        " referring to this list");
-#endif
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __hold->__prev_ = 0;
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-    __link_nodes(__p.__ptr_, __hold.get(), __hold.get());
-    ++base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__hold.release(), this);
-#else
-    return iterator(__hold.release());
-#endif
-}
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::insert(const_iterator __p, size_type __n, const value_type& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::insert(iterator, n, x) called with an iterator not"
-        " referring to this list");
-    iterator __r(__p.__ptr_, this);
-#else
-    iterator __r(__p.__ptr_);
-#endif
-    if (__n > 0)
-    {
-        size_type __ds = 0;
-        __node_allocator& __na = base::__node_alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-        __hold->__prev_ = 0;
-        __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-        ++__ds;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __r = iterator(__hold.get(), this);
-#else
-        __r = iterator(__hold.get());
-#endif
-        __hold.release();
-        iterator __e = __r;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (--__n; __n != 0; --__n, ++__e, ++__ds)
-            {
-                __hold.reset(__node_alloc_traits::allocate(__na, 1));
-                __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-                __e.__ptr_->__next_ = __hold.get();
-                __hold->__prev_ = __e.__ptr_;
-                __hold.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (true)
-            {
-                __node_alloc_traits::destroy(__na, _VSTD::addressof(*__e));
-                __node_pointer __prev = __e.__ptr_->__prev_;
-                __node_alloc_traits::deallocate(__na, __e.__ptr_, 1);
-                if (__prev == 0)
-                    break;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                __e = iterator(__prev, this);
-#else
-                __e = iterator(__prev);
-#endif
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __link_nodes(__p.__ptr_, __r.__ptr_, __e.__ptr_);
-        base::__sz() += __ds;
-    }
-    return __r;
-}
-
-template <class _Tp, class _Alloc>
-template <class _InpIter>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::insert(const_iterator __p, _InpIter __f, _InpIter __l,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type*)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::insert(iterator, range) called with an iterator not"
-        " referring to this list");
-    iterator __r(__p.__ptr_, this);
-#else
-    iterator __r(__p.__ptr_);
-#endif
-    if (__f != __l)
-    {
-        size_type __ds = 0;
-        __node_allocator& __na = base::__node_alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-        __hold->__prev_ = 0;
-        __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), *__f);
-        ++__ds;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __r = iterator(__hold.get(), this);
-#else
-        __r = iterator(__hold.get());
-#endif
-        __hold.release();
-        iterator __e = __r;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (++__f; __f != __l; ++__f, ++__e, ++__ds)
-            {
-                __hold.reset(__node_alloc_traits::allocate(__na, 1));
-                __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), *__f);
-                __e.__ptr_->__next_ = __hold.get();
-                __hold->__prev_ = __e.__ptr_;
-                __hold.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (true)
-            {
-                __node_alloc_traits::destroy(__na, _VSTD::addressof(*__e));
-                __node_pointer __prev = __e.__ptr_->__prev_;
-                __node_alloc_traits::deallocate(__na, __e.__ptr_, 1);
-                if (__prev == 0)
-                    break;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                __e = iterator(__prev, this);
-#else
-                __e = iterator(__prev);
-#endif
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __link_nodes(__p.__ptr_, __r.__ptr_, __e.__ptr_);
-        base::__sz() += __ds;
-    }
-    return __r;
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::push_front(const value_type& __x)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-    __link_nodes_at_front(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::push_back(const value_type& __x)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-    __link_nodes_at_back(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::push_front(value_type&& __x)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::move(__x));
-    __link_nodes_at_front(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::push_back(value_type&& __x)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::move(__x));
-    __link_nodes_at_back(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-void
-list<_Tp, _Alloc>::emplace_front(_Args&&... __args)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::forward<_Args>(__args)...);
-    __link_nodes_at_front(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-void
-list<_Tp, _Alloc>::emplace_back(_Args&&... __args)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::forward<_Args>(__args)...);
-    __link_nodes_at_back(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::emplace(const_iterator __p, _Args&&... __args)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::emplace(iterator, args...) called with an iterator not"
-        " referring to this list");
-#endif
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __hold->__prev_ = 0;
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::forward<_Args>(__args)...);
-    __link_nodes(__p.__ptr_, __hold.get(), __hold.get());
-    ++base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__hold.release(), this);
-#else
-    return iterator(__hold.release());
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::insert(const_iterator __p, value_type&& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::insert(iterator, x) called with an iterator not"
-        " referring to this list");
-#endif
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __hold->__prev_ = 0;
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::move(__x));
-    __link_nodes(__p.__ptr_, __hold.get(), __hold.get());
-    ++base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__hold.release(), this);
-#else
-    return iterator(__hold.release());
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::pop_front()
-{
-    _LIBCPP_ASSERT(!empty(), "list::pop_front() called with empty list");
-    __node_allocator& __na = base::__node_alloc();
-    __node_pointer __n = base::__end_.__next_;
-    base::__unlink_nodes(__n, __n);
-    --base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    for (__i_node** __p = __c->end_; __p != __c->beg_; )
-    {
-        --__p;
-        iterator* __i = static_cast<iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == __n)
-        {
-            (*__p)->__c_ = nullptr;
-            if (--__c->end_ != __p)
-                memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-        }
-    }
-    __get_db()->unlock();
-#endif
-    __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-    __node_alloc_traits::deallocate(__na, __n, 1);
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::pop_back()
-{
-    _LIBCPP_ASSERT(!empty(), "list::pop_back() called with empty list");
-    __node_allocator& __na = base::__node_alloc();
-    __node_pointer __n = base::__end_.__prev_;
-    base::__unlink_nodes(__n, __n);
-    --base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    for (__i_node** __p = __c->end_; __p != __c->beg_; )
-    {
-        --__p;
-        iterator* __i = static_cast<iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == __n)
-        {
-            (*__p)->__c_ = nullptr;
-            if (--__c->end_ != __p)
-                memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-        }
-    }
-    __get_db()->unlock();
-#endif
-    __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-    __node_alloc_traits::deallocate(__na, __n, 1);
-}
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::erase(const_iterator __p)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::erase(iterator) called with an iterator not"
-        " referring to this list");
-#endif
-    _LIBCPP_ASSERT(__p != end(),
-        "list::erase(iterator) called with a non-dereferenceable iterator");
-    __node_allocator& __na = base::__node_alloc();
-    __node_pointer __n = __p.__ptr_;
-    __node_pointer __r = __n->__next_;
-    base::__unlink_nodes(__n, __n);
-    --base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    for (__i_node** __p = __c->end_; __p != __c->beg_; )
-    {
-        --__p;
-        iterator* __i = static_cast<iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == __n)
-        {
-            (*__p)->__c_ = nullptr;
-            if (--__c->end_ != __p)
-                memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-        }
-    }
-    __get_db()->unlock();
-#endif
-    __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-    __node_alloc_traits::deallocate(__na, __n, 1);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__r, this);
-#else
-    return iterator(__r);
-#endif
-}
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::erase(const_iterator __f, const_iterator __l)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__f) == this,
-        "list::erase(iterator, iterator) called with an iterator not"
-        " referring to this list");
-#endif
-    if (__f != __l)
-    {
-        __node_allocator& __na = base::__node_alloc();
-        base::__unlink_nodes(__f.__ptr_, __l.__ptr_->__prev_);
-        while (__f != __l)
-        {
-            __node_pointer __n = __f.__ptr_;
-            ++__f;
-            --base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __c_node* __c = __get_db()->__find_c_and_lock(this);
-            for (__i_node** __p = __c->end_; __p != __c->beg_; )
-            {
-                --__p;
-                iterator* __i = static_cast<iterator*>((*__p)->__i_);
-                if (__i->__ptr_ == __n)
-                {
-                    (*__p)->__c_ = nullptr;
-                    if (--__c->end_ != __p)
-                        memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-                }
-            }
-            __get_db()->unlock();
-#endif
-            __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-            __node_alloc_traits::deallocate(__na, __n, 1);
-        }
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__l.__ptr_, this);
-#else
-    return iterator(__l.__ptr_);
-#endif
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::resize(size_type __n)
-{
-    if (__n < base::__sz())
-        erase(__iterator(__n), end());
-    else if (__n > base::__sz())
-    {
-        __n -= base::__sz();
-        size_type __ds = 0;
-        __node_allocator& __na = base::__node_alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-        __hold->__prev_ = 0;
-        __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_));
-        ++__ds;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator __r = iterator(__hold.release(), this);
-#else
-        iterator __r = iterator(__hold.release());
-#endif
-        iterator __e = __r;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (--__n; __n != 0; --__n, ++__e, ++__ds)
-            {
-                __hold.reset(__node_alloc_traits::allocate(__na, 1));
-                __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_));
-                __e.__ptr_->__next_ = __hold.get();
-                __hold->__prev_ = __e.__ptr_;
-                __hold.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (true)
-            {
-                __node_alloc_traits::destroy(__na, _VSTD::addressof(*__e));
-                __node_pointer __prev = __e.__ptr_->__prev_;
-                __node_alloc_traits::deallocate(__na, __e.__ptr_, 1);
-                if (__prev == 0)
-                    break;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                __e = iterator(__prev, this);
-#else
-                __e = iterator(__prev);
-#endif
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __link_nodes_at_back(__r.__ptr_, __e.__ptr_);
-        base::__sz() += __ds;
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::resize(size_type __n, const value_type& __x)
-{
-    if (__n < base::__sz())
-        erase(__iterator(__n), end());
-    else if (__n > base::__sz())
-    {
-        __n -= base::__sz();
-        size_type __ds = 0;
-        __node_allocator& __na = base::__node_alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-        __hold->__prev_ = 0;
-        __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-        ++__ds;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator __r = iterator(__hold.release(), this);
-#else
-        iterator __r = iterator(__hold.release());
-#endif
-        iterator __e = __r;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (--__n; __n != 0; --__n, ++__e, ++__ds)
-            {
-                __hold.reset(__node_alloc_traits::allocate(__na, 1));
-                __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-                __e.__ptr_->__next_ = __hold.get();
-                __hold->__prev_ = __e.__ptr_;
-                __hold.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (true)
-            {
-                __node_alloc_traits::destroy(__na, _VSTD::addressof(*__e));
-                __node_pointer __prev = __e.__ptr_->__prev_;
-                __node_alloc_traits::deallocate(__na, __e.__ptr_, 1);
-                if (__prev == 0)
-                    break;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                __e = iterator(__prev, this);
-#else
-                __e = iterator(__prev);
-#endif
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __link_nodes(static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::
-                         pointer_to(base::__end_)), __r.__ptr_, __e.__ptr_);
-        base::__sz() += __ds;
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::splice(const_iterator __p, list& __c)
-{
-    _LIBCPP_ASSERT(this != &__c,
-                   "list::splice(iterator, list) called with this == &list");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::splice(iterator, list) called with an iterator not"
-        " referring to this list");
-#endif
-    if (!__c.empty())
-    {
-        __node_pointer __f = __c.__end_.__next_;
-        __node_pointer __l = __c.__end_.__prev_;
-        base::__unlink_nodes(__f, __l);
-        __link_nodes(__p.__ptr_, __f, __l);
-        base::__sz() += __c.__sz();
-        __c.__sz() = 0;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
-        __c_node* __cn2 = __db->__find_c(&__c);
-        for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-        {
-            --__p;
-            iterator* __i = static_cast<iterator*>((*__p)->__i_);
-            if (__i->__ptr_ != static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__c.__end_)))
-            {
-                __cn1->__add(*__p);
-                (*__p)->__c_ = __cn1;
-                if (--__cn2->end_ != __p)
-                    memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __db->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::splice(const_iterator __p, list& __c, const_iterator __i)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::splice(iterator, list, iterator) called with first iterator not"
-        " referring to this list");
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__i) == &__c,
-        "list::splice(iterator, list, iterator) called with second iterator not"
-        " referring to list argument");
-    _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(&__i),
-        "list::splice(iterator, list, iterator) called with second iterator not"
-        " derefereceable");
-#endif
-    if (__p.__ptr_ != __i.__ptr_ && __p.__ptr_ != __i.__ptr_->__next_)
-    {
-        __node_pointer __f = __i.__ptr_;
-        base::__unlink_nodes(__f, __f);
-        __link_nodes(__p.__ptr_, __f, __f);
-        --__c.__sz();
-        ++base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
-        __c_node* __cn2 = __db->__find_c(&__c);
-        for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-        {
-            --__p;
-            iterator* __j = static_cast<iterator*>((*__p)->__i_);
-            if (__j->__ptr_ == __f)
-            {
-                __cn1->__add(*__p);
-                (*__p)->__c_ = __cn1;
-                if (--__cn2->end_ != __p)
-                    memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __db->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::splice(const_iterator __p, list& __c, const_iterator __f, const_iterator __l)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::splice(iterator, list, iterator, iterator) called with first iterator not"
-        " referring to this list");
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__f) == &__c,
-        "list::splice(iterator, list, iterator, iterator) called with second iterator not"
-        " referring to list argument");
-    if (this == &__c)
-    {
-        for (const_iterator __i = __f; __i != __l; ++__i)
-            _LIBCPP_ASSERT(__i != __p,
-                           "list::splice(iterator, list, iterator, iterator)"
-                           " called with the first iterator within the range"
-                           " of the second and third iterators");
-    }
-#endif
-    if (__f != __l)
-    {
-        if (this != &__c)
-        {
-            size_type __s = _VSTD::distance(__f, __l);
-            __c.__sz() -= __s;
-            base::__sz() += __s;
-        }
-        __node_pointer __first = __f.__ptr_;
-        --__l;
-        __node_pointer __last = __l.__ptr_;
-        base::__unlink_nodes(__first, __last);
-        __link_nodes(__p.__ptr_, __first, __last);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
-        __c_node* __cn2 = __db->__find_c(&__c);
-        for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-        {
-            --__p;
-            iterator* __j = static_cast<iterator*>((*__p)->__i_);
-            for (__node_pointer __k = __f.__ptr_;
-                                          __k != __l.__ptr_; __k = __k->__next_)
-            {
-                if (__j->__ptr_ == __k)
-                {
-                    __cn1->__add(*__p);
-                    (*__p)->__c_ = __cn1;
-                    if (--__cn2->end_ != __p)
-                        memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-                }
-            }
-        }
-        __db->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::remove(const value_type& __x)
-{
-    list<_Tp, _Alloc> __deleted_nodes; // collect the nodes we're removing
-    for (const_iterator __i = begin(), __e = end(); __i != __e;)
-    {
-        if (*__i == __x)
-        {
-            const_iterator __j = _VSTD::next(__i);
-            for (; __j != __e && *__j == __x; ++__j)
-                ;
-            __deleted_nodes.splice(__deleted_nodes.end(), *this, __i, __j);
-            __i = __j;
-            if (__i != __e)
-                ++__i;
-        }
-        else
-            ++__i;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _Pred>
-void
-list<_Tp, _Alloc>::remove_if(_Pred __pred)
-{
-    for (iterator __i = begin(), __e = end(); __i != __e;)
-    {
-        if (__pred(*__i))
-        {
-            iterator __j = _VSTD::next(__i);
-            for (; __j != __e && __pred(*__j); ++__j)
-                ;
-            __i = erase(__i, __j);
-            if (__i != __e)
-                ++__i;
-        }
-        else
-            ++__i;
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::unique()
-{
-    unique(__equal_to<value_type>());
-}
-
-template <class _Tp, class _Alloc>
-template <class _BinaryPred>
-void
-list<_Tp, _Alloc>::unique(_BinaryPred __binary_pred)
-{
-    for (iterator __i = begin(), __e = end(); __i != __e;)
-    {
-        iterator __j = _VSTD::next(__i);
-        for (; __j != __e && __binary_pred(*__i, *__j); ++__j)
-            ;
-        if (++__i != __j)
-            __i = erase(__i, __j);
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::merge(list& __c)
-{
-    merge(__c, __less<value_type>());
-}
-
-template <class _Tp, class _Alloc>
-template <class _Comp>
-void
-list<_Tp, _Alloc>::merge(list& __c, _Comp __comp)
-{
-    if (this != &__c)
-    {
-        iterator __f1 = begin();
-        iterator __e1 = end();
-        iterator __f2 = __c.begin();
-        iterator __e2 = __c.end();
-        while (__f1 != __e1 && __f2 != __e2)
-        {
-            if (__comp(*__f2, *__f1))
-            {
-                size_type __ds = 1;
-                iterator __m2 = _VSTD::next(__f2);
-                for (; __m2 != __e2 && __comp(*__m2, *__f1); ++__m2, ++__ds)
-                    ;
-                base::__sz() += __ds;
-                __c.__sz() -= __ds;
-                __node_pointer __f = __f2.__ptr_;
-                __node_pointer __l = __m2.__ptr_->__prev_;
-                __f2 = __m2;
-                base::__unlink_nodes(__f, __l);
-                __m2 = _VSTD::next(__f1);
-                __link_nodes(__f1.__ptr_, __f, __l);
-                __f1 = __m2;
-            }
-            else
-                ++__f1;
-        }
-        splice(__e1, __c);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
-        __c_node* __cn2 = __db->__find_c(&__c);
-        for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-        {
-            --__p;
-            iterator* __i = static_cast<iterator*>((*__p)->__i_);
-            if (__i->__ptr_ != static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__c.__end_)))
-            {
-                __cn1->__add(*__p);
-                (*__p)->__c_ = __cn1;
-                if (--__cn2->end_ != __p)
-                    memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __db->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::sort()
-{
-    sort(__less<value_type>());
-}
-
-template <class _Tp, class _Alloc>
-template <class _Comp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::sort(_Comp __comp)
-{
-    __sort(begin(), end(), base::__sz(), __comp);
-}
-
-template <class _Tp, class _Alloc>
-template <class _Comp>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::__sort(iterator __f1, iterator __e2, size_type __n, _Comp& __comp)
-{
-    switch (__n)
-    {
-    case 0:
-    case 1:
-        return __f1;
-    case 2:
-        if (__comp(*--__e2, *__f1))
-        {
-            __node_pointer __f = __e2.__ptr_;
-            base::__unlink_nodes(__f, __f);
-            __link_nodes(__f1.__ptr_, __f, __f);
-            return __e2;
-        }
-        return __f1;
-    }
-    size_type __n2 = __n / 2;
-    iterator __e1 = _VSTD::next(__f1, __n2);
-    iterator  __r = __f1 = __sort(__f1, __e1, __n2, __comp);
-    iterator __f2 = __e1 = __sort(__e1, __e2, __n - __n2, __comp);
-    if (__comp(*__f2, *__f1))
-    {
-        iterator __m2 = _VSTD::next(__f2);
-        for (; __m2 != __e2 && __comp(*__m2, *__f1); ++__m2)
-            ;
-        __node_pointer __f = __f2.__ptr_;
-        __node_pointer __l = __m2.__ptr_->__prev_;
-        __r = __f2;
-        __e1 = __f2 = __m2;
-        base::__unlink_nodes(__f, __l);
-        __m2 = _VSTD::next(__f1);
-        __link_nodes(__f1.__ptr_, __f, __l);
-        __f1 = __m2;
-    }
-    else
-        ++__f1;
-    while (__f1 != __e1 && __f2 != __e2)
-    {
-        if (__comp(*__f2, *__f1))
-        {
-            iterator __m2 = _VSTD::next(__f2);
-            for (; __m2 != __e2 && __comp(*__m2, *__f1); ++__m2)
-                ;
-            __node_pointer __f = __f2.__ptr_;
-            __node_pointer __l = __m2.__ptr_->__prev_;
-            if (__e1 == __f2)
-                __e1 = __m2;
-            __f2 = __m2;
-            base::__unlink_nodes(__f, __l);
-            __m2 = _VSTD::next(__f1);
-            __link_nodes(__f1.__ptr_, __f, __l);
-            __f1 = __m2;
-        }
-        else
-            ++__f1;
-    }
-    return __r;
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::reverse() _NOEXCEPT
-{
-    if (base::__sz() > 1)
-    {
-        iterator __e = end();
-        for (iterator __i = begin(); __i.__ptr_ != __e.__ptr_;)
-        {
-            _VSTD::swap(__i.__ptr_->__prev_, __i.__ptr_->__next_);
-            __i.__ptr_ = __i.__ptr_->__prev_;
-        }
-        _VSTD::swap(__e.__ptr_->__prev_, __e.__ptr_->__next_);
-    }
-}
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__invariants() const
-{
-    return size() == _VSTD::distance(begin(), end());
-}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__dereferenceable(const const_iterator* __i) const
-{
-    return __i->__ptr_ != static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(const_cast<__node_base&>(this->__end_)));
-}
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__decrementable(const const_iterator* __i) const
-{
-    return !empty() &&  __i->__ptr_ != base::__end_.__next_;
-}
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__addable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    return false;
-}
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    return false;
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(list<_Tp, _Alloc>& __x, list<_Tp, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_LIST
diff --git a/include.new/c++/v1/locale b/include.new/c++/v1/locale
deleted file mode 100644
index 0d01002..0000000
--- a/include.new/c++/v1/locale
+++ /dev/null
@@ -1,4473 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- locale ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_LOCALE
-#define _LIBCPP_LOCALE
-
-/*
-    locale synopsis
-
-namespace std
-{
-
-class locale
-{
-public:
-    // types:
-    class facet;
-    class id;
-
-    typedef int category;
-    static const category // values assigned here are for exposition only
-        none     = 0x000,
-        collate  = 0x010,
-        ctype    = 0x020,
-        monetary = 0x040,
-        numeric  = 0x080,
-        time     = 0x100,
-        messages = 0x200,
-        all = collate | ctype | monetary | numeric | time | messages;
-
-    // construct/copy/destroy:
-    locale() noexcept;
-    locale(const locale& other) noexcept;
-    explicit locale(const char* std_name);
-    explicit locale(const string& std_name);
-    locale(const locale& other, const char* std_name, category);
-    locale(const locale& other, const string& std_name, category);
-    template <class Facet> locale(const locale& other, Facet* f);
-    locale(const locale& other, const locale& one, category);
-
-    ~locale(); // not virtual
-
-    const locale& operator=(const locale& other) noexcept;
-
-    template <class Facet> locale combine(const locale& other) const;
-
-    // locale operations:
-    basic_string<char> name() const;
-    bool operator==(const locale& other) const;
-    bool operator!=(const locale& other) const;
-    template <class charT, class Traits, class Allocator>
-      bool operator()(const basic_string<charT,Traits,Allocator>& s1,
-                      const basic_string<charT,Traits,Allocator>& s2) const;
-
-    // global locale objects:
-    static locale global(const locale&);
-    static const locale& classic();
-};
-
-template <class Facet> const Facet& use_facet(const locale&);
-template <class Facet> bool has_facet(const locale&) noexcept;
-
-// 22.3.3, convenience interfaces:
-template <class charT> bool isspace (charT c, const locale& loc);
-template <class charT> bool isprint (charT c, const locale& loc);
-template <class charT> bool iscntrl (charT c, const locale& loc);
-template <class charT> bool isupper (charT c, const locale& loc);
-template <class charT> bool islower (charT c, const locale& loc);
-template <class charT> bool isalpha (charT c, const locale& loc);
-template <class charT> bool isdigit (charT c, const locale& loc);
-template <class charT> bool ispunct (charT c, const locale& loc);
-template <class charT> bool isxdigit(charT c, const locale& loc);
-template <class charT> bool isalnum (charT c, const locale& loc);
-template <class charT> bool isgraph (charT c, const locale& loc);
-template <class charT> charT toupper(charT c, const locale& loc);
-template <class charT> charT tolower(charT c, const locale& loc);
-
-template<class Codecvt, class Elem = wchar_t,
-         class Wide_alloc = allocator<Elem>,
-         class Byte_alloc = allocator<char>>
-class wstring_convert
-{
-public:
-    typedef basic_string<char, char_traits<char>, Byte_alloc> byte_string;
-    typedef basic_string<Elem, char_traits<Elem>, Wide_alloc> wide_string;
-    typedef typename Codecvt::state_type                      state_type;
-    typedef typename wide_string::traits_type::int_type       int_type;
-
-    explicit wstring_convert(Codecvt* pcvt = new Codecvt);          // explicit in C++14
-    wstring_convert(Codecvt* pcvt, state_type state);
-    explicit wstring_convert(const byte_string& byte_err,           // explicit in C++14
-                    const wide_string& wide_err = wide_string());
-    wstring_convert(const wstring_convert&) = delete;               // C++14
-    wstring_convert & operator=(const wstring_convert &) = delete;  // C++14
-    ~wstring_convert();
-
-    wide_string from_bytes(char byte);
-    wide_string from_bytes(const char* ptr);
-    wide_string from_bytes(const byte_string& str);
-    wide_string from_bytes(const char* first, const char* last);
-
-    byte_string to_bytes(Elem wchar);
-    byte_string to_bytes(const Elem* wptr);
-    byte_string to_bytes(const wide_string& wstr);
-    byte_string to_bytes(const Elem* first, const Elem* last);
-
-    size_t converted() const; // noexcept in C++14
-    state_type state() const;
-};
-
-template <class Codecvt, class Elem = wchar_t, class Tr = char_traits<Elem>>
-class wbuffer_convert
-    : public basic_streambuf<Elem, Tr>
-{
-public:
-    typedef typename Tr::state_type state_type;
-
-    explicit wbuffer_convert(streambuf* bytebuf = 0, Codecvt* pcvt = new Codecvt,
-                    state_type state = state_type());       // explicit in C++14
-    wbuffer_convert(const wbuffer_convert&) = delete;               // C++14
-    wbuffer_convert & operator=(const wbuffer_convert &) = delete;  // C++14
-    ~wbuffer_convert();                                             // C++14
-    
-    streambuf* rdbuf() const;
-    streambuf* rdbuf(streambuf* bytebuf);
-
-    state_type state() const;
-};
-
-// 22.4.1 and 22.4.1.3, ctype:
-class ctype_base;
-template <class charT> class ctype;
-template <> class ctype<char>; // specialization
-template <class charT> class ctype_byname;
-template <> class ctype_byname<char>; // specialization
-
-class codecvt_base;
-template <class internT, class externT, class stateT> class codecvt;
-template <class internT, class externT, class stateT> class codecvt_byname;
-
-// 22.4.2 and 22.4.3, numeric:
-template <class charT, class InputIterator> class num_get;
-template <class charT, class OutputIterator> class num_put;
-template <class charT> class numpunct;
-template <class charT> class numpunct_byname;
-
-// 22.4.4, col lation:
-template <class charT> class collate;
-template <class charT> class collate_byname;
-
-// 22.4.5, date and time:
-class time_base;
-template <class charT, class InputIterator> class time_get;
-template <class charT, class InputIterator> class time_get_byname;
-template <class charT, class OutputIterator> class time_put;
-template <class charT, class OutputIterator> class time_put_byname;
-
-// 22.4.6, money:
-class money_base;
-template <class charT, class InputIterator> class money_get;
-template <class charT, class OutputIterator> class money_put;
-template <class charT, bool Intl> class moneypunct;
-template <class charT, bool Intl> class moneypunct_byname;
-
-// 22.4.7, message retrieval:
-class messages_base;
-template <class charT> class messages;
-template <class charT> class messages_byname;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__locale>
-#include <algorithm>
-#include <memory>
-#include <ios>
-#include <streambuf>
-#include <iterator>
-#include <limits>
-#ifndef __APPLE__
-#include <cstdarg>
-#endif
-#include <cstdlib>
-#include <ctime>
-#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-#include <support/win32/locale_win32.h>
-#elif defined(_NEWLIB_VERSION)
-// FIXME: replace all the uses of _NEWLIB_VERSION with __NEWLIB__ preceded by an
-// include of <sys/cdefs.h> once https://sourceware.org/ml/newlib-cvs/2014-q3/msg00038.html
-// has had a chance to bake for a bit
-#include <support/newlib/xlocale.h>
-#elif !defined(__ANDROID__)
-#include <nl_types.h>
-#endif
-
-#ifdef __APPLE__
-#include <Availability.h>
-#endif
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#if defined(__APPLE__) || defined(__FreeBSD__)
-#  define _LIBCPP_GET_C_LOCALE 0
-#elif defined(__NetBSD__)
-#  define _LIBCPP_GET_C_LOCALE LC_C_LOCALE
-#else
-#  define _LIBCPP_GET_C_LOCALE __cloc()
-   // Get the C locale object
-   _LIBCPP_FUNC_VIS locale_t __cloc();
-#define __cloc_defined
-#endif
-
-typedef _VSTD::remove_pointer<locale_t>::type __locale_struct;
-typedef _VSTD::unique_ptr<__locale_struct, decltype(&freelocale)> __locale_unique_ptr;
-#ifndef _LIBCPP_LOCALE__L_EXTENSIONS
-typedef _VSTD::unique_ptr<__locale_struct, decltype(&uselocale)> __locale_raii;
-#endif
-
-// OSX has nice foo_l() functions that let you turn off use of the global
-// locale.  Linux, not so much.  The following functions avoid the locale when
-// that's possible and otherwise do the wrong thing.  FIXME.
-#if defined(__linux__) || defined(__EMSCRIPTEN__) || defined(_AIX) || \
-    defined(_NEWLIB_VERSION)
-
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-decltype(MB_CUR_MAX_L(_VSTD::declval<locale_t>()))
-inline _LIBCPP_INLINE_VISIBILITY
-__mb_cur_max_l(locale_t __l)
-{
-  return MB_CUR_MAX_L(__l);
-}
-#else  // _LIBCPP_LOCALE__L_EXTENSIONS
-inline _LIBCPP_ALWAYS_INLINE
-decltype(MB_CUR_MAX) __mb_cur_max_l(locale_t __l)
-{
-  __locale_raii __current(uselocale(__l), uselocale);
-  return MB_CUR_MAX;
-}
-#endif // _LIBCPP_LOCALE__L_EXTENSIONS
-
-inline _LIBCPP_ALWAYS_INLINE
-wint_t __btowc_l(int __c, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return btowc_l(__c, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return btowc(__c);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-int __wctob_l(wint_t __c, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return wctob_l(__c, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return wctob(__c);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __wcsnrtombs_l(char *__dest, const wchar_t **__src, size_t __nwc,
-                      size_t __len, mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return wcsnrtombs_l(__dest, __src, __nwc, __len, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return wcsnrtombs(__dest, __src, __nwc, __len, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __wcrtomb_l(char *__s, wchar_t __wc, mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return wcrtomb_l(__s, __wc, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return wcrtomb(__s, __wc, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __mbsnrtowcs_l(wchar_t * __dest, const char **__src, size_t __nms,
-                      size_t __len, mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbsnrtowcs_l(__dest, __src, __nms, __len, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbsnrtowcs(__dest, __src, __nms, __len, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __mbrtowc_l(wchar_t *__pwc, const char *__s, size_t __n,
-                   mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbrtowc_l(__pwc, __s, __n, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbrtowc(__pwc, __s, __n, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-int __mbtowc_l(wchar_t *__pwc, const char *__pmb, size_t __max, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbtowc_l(__pwc, __pmb, __max, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbtowc(__pwc, __pmb, __max);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __mbrlen_l(const char *__s, size_t __n, mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbrlen_l(__s, __n, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbrlen(__s, __n, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-lconv *__localeconv_l(locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return localeconv_l(__l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return localeconv();
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __mbsrtowcs_l(wchar_t *__dest, const char **__src, size_t __len,
-                     mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbsrtowcs_l(__dest, __src, __len, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbsrtowcs(__dest, __src, __len, __ps);
-#endif
-}
-
-inline
-int __snprintf_l(char *__s, size_t __n, locale_t __l, const char *__format, ...) {
-  va_list __va;
-  va_start(__va, __format);
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  int __res = vsnprintf_l(__s, __n, __l, __format, __va);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  int __res = vsnprintf(__s, __n, __format, __va);
-#endif
-  va_end(__va);
-  return __res;
-}
-
-inline
-int __asprintf_l(char **__s, locale_t __l, const char *__format, ...) {
-  va_list __va;
-  va_start(__va, __format);
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  int __res = vasprintf_l(__s, __l, __format, __va);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  int __res = vasprintf(__s, __format, __va);
-#endif
-  va_end(__va);
-  return __res;
-}
-
-inline
-int __sscanf_l(const char *__s, locale_t __l, const char *__format, ...) {
-  va_list __va;
-  va_start(__va, __format);
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  int __res = vsscanf_l(__s, __l, __format, __va);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  int __res = vsscanf(__s, __format, __va);
-#endif
-  va_end(__va);
-  return __res;
-}
-
-#endif  // __linux__
-
-// __scan_keyword
-// Scans [__b, __e) until a match is found in the basic_strings range
-//  [__kb, __ke) or until it can be shown that there is no match in [__kb, __ke).
-//  __b will be incremented (visibly), consuming CharT until a match is found
-//  or proved to not exist.  A keyword may be "", in which will match anything.
-//  If one keyword is a prefix of another, and the next CharT in the input
-//  might match another keyword, the algorithm will attempt to find the longest
-//  matching keyword.  If the longer matching keyword ends up not matching, then
-//  no keyword match is found.  If no keyword match is found, __ke is returned
-//  and failbit is set in __err.
-//  Else an iterator pointing to the matching keyword is found.  If more than
-//  one keyword matches, an iterator to the first matching keyword is returned.
-//  If on exit __b == __e, eofbit is set in __err.  If __case_sensitive is false,
-//  __ct is used to force to lower case before comparing characters.
-//  Examples:
-//  Keywords:  "a", "abb"
-//  If the input is "a", the first keyword matches and eofbit is set.
-//  If the input is "abc", no match is found and "ab" are consumed.
-template <class _InputIterator, class _ForwardIterator, class _Ctype>
-_LIBCPP_HIDDEN
-_ForwardIterator
-__scan_keyword(_InputIterator& __b, _InputIterator __e,
-               _ForwardIterator __kb, _ForwardIterator __ke,
-               const _Ctype& __ct, ios_base::iostate& __err,
-               bool __case_sensitive = true)
-{
-    typedef typename iterator_traits<_InputIterator>::value_type _CharT;
-    size_t __nkw = static_cast<size_t>(_VSTD::distance(__kb, __ke));
-    const unsigned char __doesnt_match = '\0';
-    const unsigned char __might_match = '\1';
-    const unsigned char __does_match = '\2';
-    unsigned char __statbuf[100];
-    unsigned char* __status = __statbuf;
-    unique_ptr<unsigned char, void(*)(void*)> __stat_hold(0, free);
-    if (__nkw > sizeof(__statbuf))
-    {
-        __status = (unsigned char*)malloc(__nkw);
-        if (__status == 0)
-            __throw_bad_alloc();
-        __stat_hold.reset(__status);
-    }
-    size_t __n_might_match = __nkw;  // At this point, any keyword might match
-    size_t __n_does_match = 0;       // but none of them definitely do
-    // Initialize all statuses to __might_match, except for "" keywords are __does_match
-    unsigned char* __st = __status;
-    for (_ForwardIterator __ky = __kb; __ky != __ke; ++__ky, (void) ++__st)
-    {
-        if (!__ky->empty())
-            *__st = __might_match;
-        else
-        {
-            *__st = __does_match;
-            --__n_might_match;
-            ++__n_does_match;
-        }
-    }
-    // While there might be a match, test keywords against the next CharT
-    for (size_t __indx = 0; __b != __e && __n_might_match > 0; ++__indx)
-    {
-        // Peek at the next CharT but don't consume it
-        _CharT __c = *__b;
-        if (!__case_sensitive)
-            __c = __ct.toupper(__c);
-        bool __consume = false;
-        // For each keyword which might match, see if the __indx character is __c
-        // If a match if found, consume __c
-        // If a match is found, and that is the last character in the keyword,
-        //    then that keyword matches.
-        // If the keyword doesn't match this character, then change the keyword
-        //    to doesn't match
-        __st = __status;
-        for (_ForwardIterator __ky = __kb; __ky != __ke; ++__ky, (void) ++__st)
-        {
-            if (*__st == __might_match)
-            {
-                _CharT __kc = (*__ky)[__indx];
-                if (!__case_sensitive)
-                    __kc = __ct.toupper(__kc);
-                if (__c == __kc)
-                {
-                    __consume = true;
-                    if (__ky->size() == __indx+1)
-                    {
-                        *__st = __does_match;
-                        --__n_might_match;
-                        ++__n_does_match;
-                    }
-                }
-                else
-                {
-                    *__st = __doesnt_match;
-                    --__n_might_match;
-                }
-            }
-        }
-        // consume if we matched a character
-        if (__consume)
-        {
-            ++__b;
-            // If we consumed a character and there might be a matched keyword that
-            //   was marked matched on a previous iteration, then such keywords
-            //   which are now marked as not matching.
-            if (__n_might_match + __n_does_match > 1)
-            {
-                __st = __status;
-                for (_ForwardIterator __ky = __kb; __ky != __ke; ++__ky, (void) ++__st)
-                {
-                    if (*__st == __does_match && __ky->size() != __indx+1)
-                    {
-                        *__st = __doesnt_match;
-                        --__n_does_match;
-                    }
-                }
-            }
-        }
-    }
-    // We've exited the loop because we hit eof and/or we have no more "might matches".
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    // Return the first matching result
-    for (__st = __status; __kb != __ke; ++__kb, (void) ++__st)
-        if (*__st == __does_match)
-            break;
-    if (__kb == __ke)
-        __err |= ios_base::failbit;
-    return __kb;
-}
-
-struct _LIBCPP_TYPE_VIS __num_get_base
-{
-    static const int __num_get_buf_sz = 40;
-
-    static int __get_base(ios_base&);
-    static const char __src[33];
-};
-
-_LIBCPP_FUNC_VIS
-void __check_grouping(const string& __grouping, unsigned* __g, unsigned* __g_end,
-                      ios_base::iostate& __err);
-
-template <class _CharT>
-struct __num_get
-    : protected __num_get_base
-{
-    static string __stage2_int_prep(ios_base& __iob, _CharT* __atoms, _CharT& __thousands_sep);
-    static string __stage2_float_prep(ios_base& __iob, _CharT* __atoms, _CharT& __decimal_point,
-                                      _CharT& __thousands_sep);
-    static int __stage2_int_loop(_CharT __ct, int __base, char* __a, char*& __a_end,
-                  unsigned& __dc, _CharT __thousands_sep, const string& __grouping,
-                  unsigned* __g, unsigned*& __g_end, _CharT* __atoms);
-    static int __stage2_float_loop(_CharT __ct, bool& __in_units, char& __exp,
-                                   char* __a, char*& __a_end,
-                                   _CharT __decimal_point, _CharT __thousands_sep,
-                                   const string& __grouping, unsigned* __g,
-                                   unsigned*& __g_end, unsigned& __dc, _CharT* __atoms);
-};
-
-template <class _CharT>
-string
-__num_get<_CharT>::__stage2_int_prep(ios_base& __iob, _CharT* __atoms, _CharT& __thousands_sep)
-{
-    locale __loc = __iob.getloc();
-    use_facet<ctype<_CharT> >(__loc).widen(__src, __src + 26, __atoms);
-    const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc);
-    __thousands_sep = __np.thousands_sep();
-    return __np.grouping();
-}
-
-template <class _CharT>
-string
-__num_get<_CharT>::__stage2_float_prep(ios_base& __iob, _CharT* __atoms, _CharT& __decimal_point,
-                    _CharT& __thousands_sep)
-{
-    locale __loc = __iob.getloc();
-    use_facet<ctype<_CharT> >(__loc).widen(__src, __src + 32, __atoms);
-    const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc);
-    __decimal_point = __np.decimal_point();
-    __thousands_sep = __np.thousands_sep();
-    return __np.grouping();
-}
-
-template <class _CharT>
-int
-__num_get<_CharT>::__stage2_int_loop(_CharT __ct, int __base, char* __a, char*& __a_end,
-                  unsigned& __dc, _CharT __thousands_sep, const string& __grouping,
-                  unsigned* __g, unsigned*& __g_end, _CharT* __atoms)
-{
-    if (__a_end == __a && (__ct == __atoms[24] || __ct == __atoms[25]))
-    {
-        *__a_end++ = __ct == __atoms[24] ? '+' : '-';
-        __dc = 0;
-        return 0;
-    }
-    if (__grouping.size() != 0 && __ct == __thousands_sep)
-    {
-        if (__g_end-__g < __num_get_buf_sz)
-        {
-            *__g_end++ = __dc;
-            __dc = 0;
-        }
-        return 0;
-    }
-    ptrdiff_t __f = find(__atoms, __atoms + 26, __ct) - __atoms;
-    if (__f >= 24)
-        return -1;
-    switch (__base)
-    {
-    case 8:
-    case 10:
-        if (__f >= __base)
-            return -1;
-        break;
-    case 16:
-        if (__f < 22)
-            break;
-        if (__a_end != __a && __a_end - __a <= 2 && __a_end[-1] == '0')
-        {
-            __dc = 0;
-            *__a_end++ = __src[__f];
-            return 0;
-        }
-        return -1;
-    }
-    *__a_end++ = __src[__f];
-    ++__dc;
-    return 0;
-}
-
-template <class _CharT>
-int
-__num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __exp, char* __a, char*& __a_end,
-                    _CharT __decimal_point, _CharT __thousands_sep, const string& __grouping,
-                    unsigned* __g, unsigned*& __g_end, unsigned& __dc, _CharT* __atoms)
-{
-    if (__ct == __decimal_point)
-    {
-        if (!__in_units)
-            return -1;
-        __in_units = false;
-        *__a_end++ = '.';
-        if (__grouping.size() != 0 && __g_end-__g < __num_get_buf_sz)
-            *__g_end++ = __dc;
-        return 0;
-    }
-    if (__ct == __thousands_sep && __grouping.size() != 0)
-    {
-        if (!__in_units)
-            return -1;
-        if (__g_end-__g < __num_get_buf_sz)
-        {
-            *__g_end++ = __dc;
-            __dc = 0;
-        }
-        return 0;
-    }
-    ptrdiff_t __f = find(__atoms, __atoms + 32, __ct) - __atoms;
-    if (__f >= 32)
-        return -1;
-    char __x = __src[__f];
-    if (__x == '-' || __x == '+')
-    {
-        if (__a_end == __a || (__a_end[-1] & 0x5F) == (__exp & 0x7F))
-        {
-            *__a_end++ = __x;
-            return 0;
-        }
-        return -1;
-    }
-    if (__x == 'x' || __x == 'X')
-        __exp = 'P';
-    else if ((__x & 0x5F) == __exp)
-    {
-        __exp |= 0x80;
-        if (__in_units)
-        {
-            __in_units = false;
-            if (__grouping.size() != 0 && __g_end-__g < __num_get_buf_sz)
-                *__g_end++ = __dc;
-        }
-    }
-    *__a_end++ = __x;
-    if (__f >= 22)
-        return 0;
-    ++__dc;
-    return 0;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(struct _LIBCPP_TYPE_VIS __num_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(struct _LIBCPP_TYPE_VIS __num_get<wchar_t>)
-
-template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY num_get
-    : public locale::facet,
-      private __num_get<_CharT>
-{
-public:
-    typedef _CharT char_type;
-    typedef _InputIterator iter_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit num_get(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, bool& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, long& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, long long& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, unsigned short& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, unsigned int& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, unsigned long& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, unsigned long long& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, float& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, double& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, long double& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, void*& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~num_get() {}
-
-    template <class _Fp>
-    iter_type __do_get_floating_point
-                            (iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, _Fp& __v) const;
-
-    template <class _Signed>
-    iter_type __do_get_signed
-                            (iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, _Signed& __v) const;
-
-    template <class _Unsigned>
-    iter_type __do_get_unsigned
-                            (iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, _Unsigned& __v) const;
-
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, bool& __v) const;
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, long& __v) const
-    { return this->__do_get_signed ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, long long& __v) const
-    { return this->__do_get_signed ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, unsigned short& __v) const
-    { return this->__do_get_unsigned ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, unsigned int& __v) const
-    { return this->__do_get_unsigned ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, unsigned long& __v) const
-    { return this->__do_get_unsigned ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, unsigned long long& __v) const
-    { return this->__do_get_unsigned ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, float& __v) const
-    { return this->__do_get_floating_point ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, double& __v) const
-    { return this->__do_get_floating_point ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, long double& __v) const
-    { return this->__do_get_floating_point ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, void*& __v) const;
-};
-
-template <class _CharT, class _InputIterator>
-locale::id
-num_get<_CharT, _InputIterator>::id;
-
-template <class _Tp>
-_Tp
-__num_get_signed_integral(const char* __a, const char* __a_end,
-                          ios_base::iostate& __err, int __base)
-{
-    if (__a != __a_end)
-    {
-        typename remove_reference<decltype(errno)>::type __save_errno = errno;
-        errno = 0;
-        char *__p2;
-        long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-        typename remove_reference<decltype(errno)>::type __current_errno = errno;
-        if (__current_errno == 0)
-            errno = __save_errno;
-        if (__p2 != __a_end)
-        {
-            __err = ios_base::failbit;
-            return 0;
-        }
-        else if (__current_errno == ERANGE         ||
-                 __ll < numeric_limits<_Tp>::min() ||
-                 numeric_limits<_Tp>::max() < __ll)
-        {
-            __err = ios_base::failbit;
-            if (__ll > 0)
-                return numeric_limits<_Tp>::max();
-            else
-                return numeric_limits<_Tp>::min();
-        }
-        return static_cast<_Tp>(__ll);
-    }
-    __err = ios_base::failbit;
-    return 0;
-}
-
-template <class _Tp>
-_Tp
-__num_get_unsigned_integral(const char* __a, const char* __a_end,
-                            ios_base::iostate& __err, int __base)
-{
-    if (__a != __a_end)
-    {
-        if (*__a == '-')
-        {
-            __err = ios_base::failbit;
-            return 0;
-        }
-        typename remove_reference<decltype(errno)>::type __save_errno = errno;
-        errno = 0;
-        char *__p2;
-        unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-        typename remove_reference<decltype(errno)>::type __current_errno = errno;
-        if (__current_errno == 0)
-            errno = __save_errno;
-        if (__p2 != __a_end)
-        {
-            __err = ios_base::failbit;
-            return 0;
-        }
-        else if (__current_errno == ERANGE ||
-                 numeric_limits<_Tp>::max() < __ll)
-        {
-            __err = ios_base::failbit;
-            return numeric_limits<_Tp>::max();
-        }
-        return static_cast<_Tp>(__ll);
-    }
-    __err = ios_base::failbit;
-    return 0;
-}
-
-template <class _Tp>
-_Tp
-__num_get_float(const char* __a, const char* __a_end, ios_base::iostate& __err)
-{
-    if (__a != __a_end)
-    {
-        typename remove_reference<decltype(errno)>::type __save_errno = errno;
-        errno = 0;
-        char *__p2;
-        long double __ld = strtold_l(__a, &__p2, _LIBCPP_GET_C_LOCALE);
-        typename remove_reference<decltype(errno)>::type __current_errno = errno;
-        if (__current_errno == 0)
-            errno = __save_errno;
-        if (__p2 != __a_end)
-        {
-            __err = ios_base::failbit;
-            return 0;
-        }
-        else if (__current_errno == ERANGE)
-            __err = ios_base::failbit;
-        return static_cast<_Tp>(__ld);
-    }
-    __err = ios_base::failbit;
-    return 0;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        bool& __v) const
-{
-    if ((__iob.flags() & ios_base::boolalpha) == 0)
-    {
-        long __lv = -1;
-        __b = do_get(__b, __e, __iob, __err, __lv);
-        switch (__lv)
-        {
-        case 0:
-            __v = false;
-            break;
-        case 1:
-            __v = true;
-            break;
-        default:
-            __v = true;
-            __err = ios_base::failbit;
-            break;
-        }
-        return __b;
-    }
-    const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__iob.getloc());
-    const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__iob.getloc());
-    typedef typename numpunct<_CharT>::string_type string_type;
-    const string_type __names[2] = {__np.truename(), __np.falsename()};
-    const string_type* __i = __scan_keyword(__b, __e, __names, __names+2,
-                                            __ct, __err);
-    __v = __i == __names;
-    return __b;
-}
-
-// signed
-
-template <class _CharT, class _InputIterator>
-template <class _Signed>
-_InputIterator
-num_get<_CharT, _InputIterator>::__do_get_signed(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        _Signed& __v) const
-{
-    // Stage 1
-    int __base = this->__get_base(__iob);
-    // Stage 2
-    char_type __atoms[26];
-    char_type __thousands_sep;
-    string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    string __buf;
-    __buf.resize(__buf.capacity());
-    char* __a = &__buf[0];
-    char* __a_end = __a;
-    unsigned __g[__num_get_base::__num_get_buf_sz];
-    unsigned* __g_end = __g;
-    unsigned __dc = 0;
-    for (; __b != __e; ++__b)
-    {
-        if (__a_end == __a + __buf.size())
-        {
-            size_t __tmp = __buf.size();
-            __buf.resize(2*__buf.size());
-            __buf.resize(__buf.capacity());
-            __a = &__buf[0];
-            __a_end = __a + __tmp;
-        }
-        if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
-                                    __thousands_sep, __grouping, __g, __g_end,
-                                    __atoms))
-            break;
-    }
-    if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
-        *__g_end++ = __dc;
-    // Stage 3
-    __v = __num_get_signed_integral<_Signed>(__a, __a_end, __err, __base);
-    // Digit grouping checked
-    __check_grouping(__grouping, __g, __g_end, __err);
-    // EOF checked
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-// unsigned
-
-template <class _CharT, class _InputIterator>
-template <class _Unsigned>
-_InputIterator
-num_get<_CharT, _InputIterator>::__do_get_unsigned(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        _Unsigned& __v) const
-{
-    // Stage 1
-    int __base = this->__get_base(__iob);
-    // Stage 2
-    char_type __atoms[26];
-    char_type __thousands_sep;
-    string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    string __buf;
-    __buf.resize(__buf.capacity());
-    char* __a = &__buf[0];
-    char* __a_end = __a;
-    unsigned __g[__num_get_base::__num_get_buf_sz];
-    unsigned* __g_end = __g;
-    unsigned __dc = 0;
-    for (; __b != __e; ++__b)
-    {
-        if (__a_end == __a + __buf.size())
-        {
-            size_t __tmp = __buf.size();
-            __buf.resize(2*__buf.size());
-            __buf.resize(__buf.capacity());
-            __a = &__buf[0];
-            __a_end = __a + __tmp;
-        }
-        if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
-                                    __thousands_sep, __grouping, __g, __g_end,
-                                    __atoms))
-            break;
-    }
-    if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
-        *__g_end++ = __dc;
-    // Stage 3
-    __v = __num_get_unsigned_integral<_Unsigned>(__a, __a_end, __err, __base);
-    // Digit grouping checked
-    __check_grouping(__grouping, __g, __g_end, __err);
-    // EOF checked
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-// floating point
-
-template <class _CharT, class _InputIterator>
-template <class _Fp>
-_InputIterator
-num_get<_CharT, _InputIterator>::__do_get_floating_point(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        _Fp& __v) const
-{
-    // Stage 1, nothing to do
-    // Stage 2
-    char_type __atoms[32];
-    char_type __decimal_point;
-    char_type __thousands_sep;
-    string __grouping = this->__stage2_float_prep(__iob, __atoms,
-                                                  __decimal_point,
-                                                  __thousands_sep);
-    string __buf;
-    __buf.resize(__buf.capacity());
-    char* __a = &__buf[0];
-    char* __a_end = __a;
-    unsigned __g[__num_get_base::__num_get_buf_sz];
-    unsigned* __g_end = __g;
-    unsigned __dc = 0;
-    bool __in_units = true;
-    char __exp = 'E';
-    for (; __b != __e; ++__b)
-    {
-        if (__a_end == __a + __buf.size())
-        {
-            size_t __tmp = __buf.size();
-            __buf.resize(2*__buf.size());
-            __buf.resize(__buf.capacity());
-            __a = &__buf[0];
-            __a_end = __a + __tmp;
-        }
-        if (this->__stage2_float_loop(*__b, __in_units, __exp, __a, __a_end,
-                                      __decimal_point, __thousands_sep,
-                                      __grouping, __g, __g_end,
-                                      __dc, __atoms))
-            break;
-    }
-    if (__grouping.size() != 0 && __in_units && __g_end-__g < __num_get_base::__num_get_buf_sz)
-        *__g_end++ = __dc;
-    // Stage 3
-    __v = __num_get_float<_Fp>(__a, __a_end, __err);
-    // Digit grouping checked
-    __check_grouping(__grouping, __g, __g_end, __err);
-    // EOF checked
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        void*& __v) const
-{
-    // Stage 1
-    int __base = 16;
-    // Stage 2
-    char_type __atoms[26];
-    char_type __thousands_sep = 0;
-    string __grouping;
-    use_facet<ctype<_CharT> >(__iob.getloc()).widen(__num_get_base::__src,
-                                                    __num_get_base::__src + 26, __atoms);
-    string __buf;
-    __buf.resize(__buf.capacity());
-    char* __a = &__buf[0];
-    char* __a_end = __a;
-    unsigned __g[__num_get_base::__num_get_buf_sz];
-    unsigned* __g_end = __g;
-    unsigned __dc = 0;
-    for (; __b != __e; ++__b)
-    {
-        if (__a_end == __a + __buf.size())
-        {
-            size_t __tmp = __buf.size();
-            __buf.resize(2*__buf.size());
-            __buf.resize(__buf.capacity());
-            __a = &__buf[0];
-            __a_end = __a + __tmp;
-        }
-        if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
-                                    __thousands_sep, __grouping,
-                                    __g, __g_end, __atoms))
-            break;
-    }
-    // Stage 3
-    __buf.resize(__a_end - __a);
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    if (sscanf_l(__buf.c_str(), _LIBCPP_GET_C_LOCALE, "%p", &__v) != 1)
-#else
-    if (__sscanf_l(__buf.c_str(), __cloc(), "%p", &__v) != 1)
-#endif
-        __err = ios_base::failbit;
-    // EOF checked
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS num_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS num_get<wchar_t>)
-
-struct _LIBCPP_TYPE_VIS __num_put_base
-{
-protected:
-    static void __format_int(char* __fmt, const char* __len, bool __signd,
-                             ios_base::fmtflags __flags);
-    static bool __format_float(char* __fmt, const char* __len,
-                               ios_base::fmtflags __flags);
-    static char* __identify_padding(char* __nb, char* __ne,
-                                    const ios_base& __iob);
-};
-
-template <class _CharT>
-struct __num_put
-    : protected __num_put_base
-{
-    static void __widen_and_group_int(char* __nb, char* __np, char* __ne,
-                                      _CharT* __ob, _CharT*& __op, _CharT*& __oe,
-                                      const locale& __loc);
-    static void __widen_and_group_float(char* __nb, char* __np, char* __ne,
-                                        _CharT* __ob, _CharT*& __op, _CharT*& __oe,
-                                        const locale& __loc);
-};
-
-template <class _CharT>
-void
-__num_put<_CharT>::__widen_and_group_int(char* __nb, char* __np, char* __ne,
-                                         _CharT* __ob, _CharT*& __op, _CharT*& __oe,
-                                         const locale& __loc)
-{
-    const ctype<_CharT>&    __ct = use_facet<ctype<_CharT> >   (__loc);
-    const numpunct<_CharT>& __npt = use_facet<numpunct<_CharT> >(__loc);
-    string __grouping = __npt.grouping();
-    if (__grouping.empty())
-    {
-        __ct.widen(__nb, __ne, __ob);
-        __oe = __ob + (__ne - __nb);
-    }
-    else
-    {
-        __oe = __ob;
-        char* __nf = __nb;
-        if (*__nf == '-' || *__nf == '+')
-            *__oe++ = __ct.widen(*__nf++);
-        if (__ne - __nf >= 2 && __nf[0] == '0' && (__nf[1] == 'x' ||
-                                                   __nf[1] == 'X'))
-        {
-            *__oe++ = __ct.widen(*__nf++);
-            *__oe++ = __ct.widen(*__nf++);
-        }
-        reverse(__nf, __ne);
-        _CharT __thousands_sep = __npt.thousands_sep();
-        unsigned __dc = 0;
-        unsigned __dg = 0;
-        for (char* __p = __nf; __p < __ne; ++__p)
-        {
-            if (static_cast<unsigned>(__grouping[__dg]) > 0 &&
-                __dc == static_cast<unsigned>(__grouping[__dg]))
-            {
-                *__oe++ = __thousands_sep;
-                __dc = 0;
-                if (__dg < __grouping.size()-1)
-                    ++__dg;
-            }
-            *__oe++ = __ct.widen(*__p);
-            ++__dc;
-        }
-        reverse(__ob + (__nf - __nb), __oe);
-    }
-    if (__np == __ne)
-        __op = __oe;
-    else
-        __op = __ob + (__np - __nb);
-}
-
-template <class _CharT>
-void
-__num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne,
-                                           _CharT* __ob, _CharT*& __op, _CharT*& __oe,
-                                           const locale& __loc)
-{
-    const ctype<_CharT>&    __ct = use_facet<ctype<_CharT> >   (__loc);
-    const numpunct<_CharT>& __npt = use_facet<numpunct<_CharT> >(__loc);
-    string __grouping = __npt.grouping();
-    __oe = __ob;
-    char* __nf = __nb;
-    if (*__nf == '-' || *__nf == '+')
-        *__oe++ = __ct.widen(*__nf++);
-    char* __ns;
-    if (__ne - __nf >= 2 && __nf[0] == '0' && (__nf[1] == 'x' ||
-                                               __nf[1] == 'X'))
-    {
-        *__oe++ = __ct.widen(*__nf++);
-        *__oe++ = __ct.widen(*__nf++);
-        for (__ns = __nf; __ns < __ne; ++__ns)
-            if (!isxdigit_l(*__ns, _LIBCPP_GET_C_LOCALE))
-                break;
-    }
-    else
-    {
-        for (__ns = __nf; __ns < __ne; ++__ns)
-            if (!isdigit_l(*__ns, _LIBCPP_GET_C_LOCALE))
-                break;
-    }
-    if (__grouping.empty())
-    {
-        __ct.widen(__nf, __ns, __oe);
-        __oe += __ns - __nf;
-    }
-    else
-    {
-        reverse(__nf, __ns);
-        _CharT __thousands_sep = __npt.thousands_sep();
-        unsigned __dc = 0;
-        unsigned __dg = 0;
-        for (char* __p = __nf; __p < __ns; ++__p)
-        {
-            if (__grouping[__dg] > 0 && __dc == static_cast<unsigned>(__grouping[__dg]))
-            {
-                *__oe++ = __thousands_sep;
-                __dc = 0;
-                if (__dg < __grouping.size()-1)
-                    ++__dg;
-            }
-            *__oe++ = __ct.widen(*__p);
-            ++__dc;
-        }
-        reverse(__ob + (__nf - __nb), __oe);
-    }
-    for (__nf = __ns; __nf < __ne; ++__nf)
-    {
-        if (*__nf == '.')
-        {
-            *__oe++ = __npt.decimal_point();
-            ++__nf;
-            break;
-        }
-        else
-            *__oe++ = __ct.widen(*__nf);
-    }
-    __ct.widen(__nf, __ne, __oe);
-    __oe += __ne - __nf;
-    if (__np == __ne)
-        __op = __oe;
-    else
-        __op = __ob + (__np - __nb);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(struct _LIBCPP_TYPE_VIS __num_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(struct _LIBCPP_TYPE_VIS __num_put<wchar_t>)
-
-template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY num_put
-    : public locale::facet,
-      private __num_put<_CharT>
-{
-public:
-    typedef _CharT char_type;
-    typedef _OutputIterator iter_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit num_put(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  bool __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  long __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  long long __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  unsigned long __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  unsigned long long __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  double __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  long double __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  const void* __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~num_put() {}
-
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             bool __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             long __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             long long __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             unsigned long) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             unsigned long long) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             double __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             long double __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             const void* __v) const;
-};
-
-template <class _CharT, class _OutputIterator>
-locale::id
-num_put<_CharT, _OutputIterator>::id;
-
-template <class _CharT, class _OutputIterator>
-_LIBCPP_HIDDEN
-_OutputIterator
-__pad_and_output(_OutputIterator __s,
-                 const _CharT* __ob, const _CharT* __op, const _CharT* __oe,
-                 ios_base& __iob, _CharT __fl)
-{
-    streamsize __sz = __oe - __ob;
-    streamsize __ns = __iob.width();
-    if (__ns > __sz)
-        __ns -= __sz;
-    else
-        __ns = 0;
-    for (;__ob < __op; ++__ob, ++__s)
-        *__s = *__ob;
-    for (; __ns; --__ns, ++__s)
-        *__s = __fl;
-    for (; __ob < __oe; ++__ob, ++__s)
-        *__s = *__ob;
-    __iob.width(0);
-    return __s;
-}
-
-#if !defined(__APPLE__) || \
-    (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
-    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-
-template <class _CharT, class _Traits>
-_LIBCPP_HIDDEN
-ostreambuf_iterator<_CharT, _Traits>
-__pad_and_output(ostreambuf_iterator<_CharT, _Traits> __s,
-                 const _CharT* __ob, const _CharT* __op, const _CharT* __oe,
-                 ios_base& __iob, _CharT __fl)
-{
-    if (__s.__sbuf_ == nullptr)
-        return __s;
-    streamsize __sz = __oe - __ob;
-    streamsize __ns = __iob.width();
-    if (__ns > __sz)
-        __ns -= __sz;
-    else
-        __ns = 0;
-    streamsize __np = __op - __ob;
-    if (__np > 0)
-    {
-        if (__s.__sbuf_->sputn(__ob, __np) != __np)
-        {
-            __s.__sbuf_ = nullptr;
-            return __s;
-        }
-    }
-    if (__ns > 0)
-    {
-        basic_string<_CharT, _Traits> __sp(__ns, __fl);
-        if (__s.__sbuf_->sputn(__sp.data(), __ns) != __ns)
-        {
-            __s.__sbuf_ = nullptr;
-            return __s;
-        }
-    }
-    __np = __oe - __op;
-    if (__np > 0)
-    {
-        if (__s.__sbuf_->sputn(__op, __np) != __np)
-        {
-            __s.__sbuf_ = nullptr;
-            return __s;
-        }
-    }
-    __iob.width(0);
-    return __s;
-}
-
-#endif
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, bool __v) const
-{
-    if ((__iob.flags() & ios_base::boolalpha) == 0)
-        return do_put(__s, __iob, __fl, (unsigned long)__v);
-    const numpunct<char_type>& __np = use_facet<numpunct<char_type> >(__iob.getloc());
-    typedef typename numpunct<char_type>::string_type string_type;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    string_type __tmp(__v ? __np.truename() : __np.falsename());
-    string_type __nm = _VSTD::move(__tmp);
-#else
-    string_type __nm = __v ? __np.truename() : __np.falsename();
-#endif
-    for (typename string_type::iterator __i = __nm.begin(); __i != __nm.end(); ++__i, ++__s)
-        *__s = *__i;
-    return __s;
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, long __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[6] = {'%', 0};
-    const char* __len = "l";
-    this->__format_int(__fmt+1, __len, true, __iob.flags());
-    const unsigned __nbuf = (numeric_limits<long>::digits / 3)
-                          + ((numeric_limits<long>::digits % 3) != 0)
-                          + 1;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, long long __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[8] = {'%', 0};
-    const char* __len = "ll";
-    this->__format_int(__fmt+1, __len, true, __iob.flags());
-    const unsigned __nbuf = (numeric_limits<long long>::digits / 3)
-                          + ((numeric_limits<long long>::digits % 3) != 0)
-                          + 1;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, unsigned long __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[6] = {'%', 0};
-    const char* __len = "l";
-    this->__format_int(__fmt+1, __len, false, __iob.flags());
-    const unsigned __nbuf = (numeric_limits<unsigned long>::digits / 3)
-                          + ((numeric_limits<unsigned long>::digits % 3) != 0)
-                          + 1;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, unsigned long long __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[8] = {'%', 0};
-    const char* __len = "ll";
-    this->__format_int(__fmt+1, __len, false, __iob.flags());
-    const unsigned __nbuf = (numeric_limits<unsigned long long>::digits / 3)
-                          + ((numeric_limits<unsigned long long>::digits % 3) != 0)
-                          + 1;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, double __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[8] = {'%', 0};
-    const char* __len = "";
-    bool __specify_precision = this->__format_float(__fmt+1, __len, __iob.flags());
-    const unsigned __nbuf = 30;
-    char __nar[__nbuf];
-    char* __nb = __nar;
-    int __nc;
-    if (__specify_precision)
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __nc = snprintf_l(__nb, __nbuf, _LIBCPP_GET_C_LOCALE, __fmt,
-                                   (int)__iob.precision(), __v);
-#else
-        __nc = __snprintf_l(__nb, __nbuf, __cloc(), __fmt,
-                            (int)__iob.precision(), __v);
-#endif
-    else
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __nc = snprintf_l(__nb, __nbuf, _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-        __nc = __snprintf_l(__nb, __nbuf, __cloc(), __fmt, __v);
-#endif
-    unique_ptr<char, void(*)(void*)> __nbh(0, free);
-    if (__nc > static_cast<int>(__nbuf-1))
-    {
-        if (__specify_precision)
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-            __nc = asprintf_l(&__nb, _LIBCPP_GET_C_LOCALE, __fmt, (int)__iob.precision(), __v);
-#else
-            __nc = __asprintf_l(&__nb, __cloc(), __fmt,
-                              (int)__iob.precision(), __v);
-#endif
-        else
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-            __nc = asprintf_l(&__nb, _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-            __nc = __asprintf_l(&__nb, __cloc(), __fmt, (int)__iob.precision(), __v);
-#endif
-        if (__nb == 0)
-            __throw_bad_alloc();
-        __nbh.reset(__nb);
-    }
-    char* __ne = __nb + __nc;
-    char* __np = this->__identify_padding(__nb, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __ob = __o;
-    unique_ptr<char_type, void(*)(void*)> __obh(0, free);
-    if (__nb != __nar)
-    {
-        __ob = (char_type*)malloc(2*static_cast<size_t>(__nc)*sizeof(char_type));
-        if (__ob == 0)
-            __throw_bad_alloc();
-        __obh.reset(__ob);
-    }
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_float(__nb, __np, __ne, __ob, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    __s = __pad_and_output(__s, __ob, __op, __oe, __iob, __fl);
-    return __s;
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, long double __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[8] = {'%', 0};
-    const char* __len = "L";
-    bool __specify_precision = this->__format_float(__fmt+1, __len, __iob.flags());
-    const unsigned __nbuf = 30;
-    char __nar[__nbuf];
-    char* __nb = __nar;
-    int __nc;
-    if (__specify_precision)
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __nc = snprintf_l(__nb, __nbuf, _LIBCPP_GET_C_LOCALE, __fmt,
-                                   (int)__iob.precision(), __v);
-#else
-        __nc = __snprintf_l(__nb, __nbuf, __cloc(), __fmt,
-                            (int)__iob.precision(), __v);
-#endif
-    else
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __nc = snprintf_l(__nb, __nbuf, _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-        __nc = __snprintf_l(__nb, __nbuf, __cloc(), __fmt, __v);
-#endif
-    unique_ptr<char, void(*)(void*)> __nbh(0, free);
-    if (__nc > static_cast<int>(__nbuf-1))
-    {
-        if (__specify_precision)
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-            __nc = asprintf_l(&__nb, _LIBCPP_GET_C_LOCALE, __fmt, (int)__iob.precision(), __v);
-#else
-            __nc = __asprintf_l(&__nb, __cloc(), __fmt,
-                              (int)__iob.precision(), __v);
-#endif
-        else
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-            __nc = asprintf_l(&__nb, _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-            __nc = __asprintf_l(&__nb, __cloc(), __fmt, __v);
-#endif
-        if (__nb == 0)
-            __throw_bad_alloc();
-        __nbh.reset(__nb);
-    }
-    char* __ne = __nb + __nc;
-    char* __np = this->__identify_padding(__nb, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __ob = __o;
-    unique_ptr<char_type, void(*)(void*)> __obh(0, free);
-    if (__nb != __nar)
-    {
-        __ob = (char_type*)malloc(2*static_cast<size_t>(__nc)*sizeof(char_type));
-        if (__ob == 0)
-            __throw_bad_alloc();
-        __obh.reset(__ob);
-    }
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_float(__nb, __np, __ne, __ob, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    __s = __pad_and_output(__s, __ob, __op, __oe, __iob, __fl);
-    return __s;
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, const void* __v) const
-{
-    // Stage 1 - Get pointer in narrow char
-    char __fmt[6] = "%p";
-    const unsigned __nbuf = 20;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __ct.widen(__nar, __ne, __o);
-    __oe = __o + (__ne - __nar);
-    if (__np == __ne)
-        __op = __oe;
-    else
-        __op = __o + (__np - __nar);
-    // [__o, __oe) contains wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS num_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS num_put<wchar_t>)
-
-template <class _CharT, class _InputIterator>
-_LIBCPP_HIDDEN
-int
-__get_up_to_n_digits(_InputIterator& __b, _InputIterator __e,
-                     ios_base::iostate& __err, const ctype<_CharT>& __ct, int __n)
-{
-    // Precondition:  __n >= 1
-    if (__b == __e)
-    {
-        __err |= ios_base::eofbit | ios_base::failbit;
-        return 0;
-    }
-    // get first digit
-    _CharT __c = *__b;
-    if (!__ct.is(ctype_base::digit, __c))
-    {
-        __err |= ios_base::failbit;
-        return 0;
-    }
-    int __r = __ct.narrow(__c, 0) - '0';
-    for (++__b, (void) --__n; __b != __e && __n > 0; ++__b, (void) --__n)
-    {
-        // get next digit
-        __c = *__b;
-        if (!__ct.is(ctype_base::digit, __c))
-            return __r;
-        __r = __r * 10 + __ct.narrow(__c, 0) - '0';
-    }
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __r;
-}
-
-class _LIBCPP_TYPE_VIS time_base
-{
-public:
-    enum dateorder {no_order, dmy, mdy, ymd, ydm};
-};
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY __time_get_c_storage
-{
-protected:
-    typedef basic_string<_CharT> string_type;
-
-    virtual const string_type* __weeks() const;
-    virtual const string_type* __months() const;
-    virtual const string_type* __am_pm() const;
-    virtual const string_type& __c() const;
-    virtual const string_type& __r() const;
-    virtual const string_type& __x() const;
-    virtual const string_type& __X() const;
-};
-
-template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY time_get
-    : public locale::facet,
-      public time_base,
-      private __time_get_c_storage<_CharT>
-{
-public:
-    typedef _CharT                  char_type;
-    typedef _InputIterator          iter_type;
-    typedef time_base::dateorder    dateorder;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_get(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    dateorder date_order() const
-    {
-        return this->do_date_order();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_time(iter_type __b, iter_type __e, ios_base& __iob,
-                       ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_time(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_date(iter_type __b, iter_type __e, ios_base& __iob,
-                       ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_date(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_weekday(iter_type __b, iter_type __e, ios_base& __iob,
-                          ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_weekday(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_monthname(iter_type __b, iter_type __e, ios_base& __iob,
-                            ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_monthname(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_year(iter_type __b, iter_type __e, ios_base& __iob,
-                       ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_year(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, tm *__tm,
-                  char __fmt, char __mod = 0) const
-    {
-        return do_get(__b, __e, __iob, __err, __tm, __fmt, __mod);
-    }
-
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, tm* __tm,
-                  const char_type* __fmtb, const char_type* __fmte) const;
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~time_get() {}
-
-    virtual dateorder do_date_order() const;
-    virtual iter_type do_get_time(iter_type __b, iter_type __e, ios_base& __iob,
-                                  ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get_date(iter_type __b, iter_type __e, ios_base& __iob,
-                                  ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get_weekday(iter_type __b, iter_type __e, ios_base& __iob,
-                                     ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get_monthname(iter_type __b, iter_type __e, ios_base& __iob,
-                                       ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get_year(iter_type __b, iter_type __e, ios_base& __iob,
-                                  ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, tm* __tm,
-                             char __fmt, char __mod) const;
-private:
-    void __get_white_space(iter_type& __b, iter_type __e,
-                           ios_base::iostate& __err, const ctype<char_type>& __ct) const;
-    void __get_percent(iter_type& __b, iter_type __e, ios_base::iostate& __err,
-                       const ctype<char_type>& __ct) const;
-
-    void __get_weekdayname(int& __m,
-                           iter_type& __b, iter_type __e,
-                           ios_base::iostate& __err,
-                           const ctype<char_type>& __ct) const;
-    void __get_monthname(int& __m,
-                         iter_type& __b, iter_type __e,
-                         ios_base::iostate& __err,
-                         const ctype<char_type>& __ct) const;
-    void __get_day(int& __d,
-                   iter_type& __b, iter_type __e,
-                   ios_base::iostate& __err,
-                   const ctype<char_type>& __ct) const;
-    void __get_month(int& __m,
-                     iter_type& __b, iter_type __e,
-                     ios_base::iostate& __err,
-                     const ctype<char_type>& __ct) const;
-    void __get_year(int& __y,
-                   iter_type& __b, iter_type __e,
-                   ios_base::iostate& __err,
-                   const ctype<char_type>& __ct) const;
-    void __get_year4(int& __y,
-                    iter_type& __b, iter_type __e,
-                    ios_base::iostate& __err,
-                    const ctype<char_type>& __ct) const;
-    void __get_hour(int& __d,
-                    iter_type& __b, iter_type __e,
-                    ios_base::iostate& __err,
-                    const ctype<char_type>& __ct) const;
-    void __get_12_hour(int& __h,
-                       iter_type& __b, iter_type __e,
-                       ios_base::iostate& __err,
-                       const ctype<char_type>& __ct) const;
-    void __get_am_pm(int& __h,
-                     iter_type& __b, iter_type __e,
-                     ios_base::iostate& __err,
-                     const ctype<char_type>& __ct) const;
-    void __get_minute(int& __m,
-                      iter_type& __b, iter_type __e,
-                      ios_base::iostate& __err,
-                      const ctype<char_type>& __ct) const;
-    void __get_second(int& __s,
-                      iter_type& __b, iter_type __e,
-                      ios_base::iostate& __err,
-                      const ctype<char_type>& __ct) const;
-    void __get_weekday(int& __w,
-                       iter_type& __b, iter_type __e,
-                       ios_base::iostate& __err,
-                       const ctype<char_type>& __ct) const;
-    void __get_day_year_num(int& __w,
-                            iter_type& __b, iter_type __e,
-                            ios_base::iostate& __err,
-                            const ctype<char_type>& __ct) const;
-};
-
-template <class _CharT, class _InputIterator>
-locale::id
-time_get<_CharT, _InputIterator>::id;
-
-// time_get primitives
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_weekdayname(int& __w,
-                                                    iter_type& __b, iter_type __e,
-                                                    ios_base::iostate& __err,
-                                                    const ctype<char_type>& __ct) const
-{
-    // Note:  ignoring case comes from the POSIX strptime spec
-    const string_type* __wk = this->__weeks();
-    ptrdiff_t __i = __scan_keyword(__b, __e, __wk, __wk+14, __ct, __err, false) - __wk;
-    if (__i < 14)
-        __w = __i % 7;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_monthname(int& __m,
-                                                  iter_type& __b, iter_type __e,
-                                                  ios_base::iostate& __err,
-                                                  const ctype<char_type>& __ct) const
-{
-    // Note:  ignoring case comes from the POSIX strptime spec
-    const string_type* __month = this->__months();
-    ptrdiff_t __i = __scan_keyword(__b, __e, __month, __month+24, __ct, __err, false) - __month;
-    if (__i < 24)
-        __m = __i % 12;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_day(int& __d,
-                                            iter_type& __b, iter_type __e,
-                                            ios_base::iostate& __err,
-                                            const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && 1 <= __t && __t <= 31)
-        __d = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_month(int& __m,
-                                              iter_type& __b, iter_type __e,
-                                              ios_base::iostate& __err,
-                                              const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2) - 1;
-    if (!(__err & ios_base::failbit) && __t <= 11)
-        __m = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_year(int& __y,
-                                             iter_type& __b, iter_type __e,
-                                             ios_base::iostate& __err,
-                                             const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 4);
-    if (!(__err & ios_base::failbit))
-    {
-        if (__t < 69)
-            __t += 2000;
-        else if (69 <= __t && __t <= 99)
-            __t += 1900;
-        __y = __t - 1900;
-    }
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_year4(int& __y,
-                                              iter_type& __b, iter_type __e,
-                                              ios_base::iostate& __err,
-                                              const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 4);
-    if (!(__err & ios_base::failbit))
-        __y = __t - 1900;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_hour(int& __h,
-                                             iter_type& __b, iter_type __e,
-                                             ios_base::iostate& __err,
-                                             const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && __t <= 23)
-        __h = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_12_hour(int& __h,
-                                                iter_type& __b, iter_type __e,
-                                                ios_base::iostate& __err,
-                                                const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && 1 <= __t && __t <= 12)
-        __h = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_minute(int& __m,
-                                               iter_type& __b, iter_type __e,
-                                               ios_base::iostate& __err,
-                                               const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && __t <= 59)
-        __m = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_second(int& __s,
-                                               iter_type& __b, iter_type __e,
-                                               ios_base::iostate& __err,
-                                               const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && __t <= 60)
-        __s = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_weekday(int& __w,
-                                                iter_type& __b, iter_type __e,
-                                                ios_base::iostate& __err,
-                                                const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 1);
-    if (!(__err & ios_base::failbit) && __t <= 6)
-        __w = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_day_year_num(int& __d,
-                                                     iter_type& __b, iter_type __e,
-                                                     ios_base::iostate& __err,
-                                                     const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 3);
-    if (!(__err & ios_base::failbit) && __t <= 365)
-        __d = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_white_space(iter_type& __b, iter_type __e,
-                                                    ios_base::iostate& __err,
-                                                    const ctype<char_type>& __ct) const
-{
-    for (; __b != __e && __ct.is(ctype_base::space, *__b); ++__b)
-        ;
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_am_pm(int& __h,
-                                              iter_type& __b, iter_type __e,
-                                              ios_base::iostate& __err,
-                                              const ctype<char_type>& __ct) const
-{
-    const string_type* __ap = this->__am_pm();
-    if (__ap[0].size() + __ap[1].size() == 0)
-    {
-        __err |= ios_base::failbit;
-        return;
-    }
-    ptrdiff_t __i = __scan_keyword(__b, __e, __ap, __ap+2, __ct, __err, false) - __ap;
-    if (__i == 0 && __h == 12)
-        __h = 0;
-    else if (__i == 1 && __h < 12)
-        __h += 12;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_percent(iter_type& __b, iter_type __e,
-                                                ios_base::iostate& __err,
-                                                const ctype<char_type>& __ct) const
-{
-    if (__b == __e)
-    {
-        __err |= ios_base::eofbit | ios_base::failbit;
-        return;
-    }
-    if (__ct.narrow(*__b, 0) != '%')
-        __err |= ios_base::failbit;
-    else if(++__b == __e)
-        __err |= ios_base::eofbit;
-}
-
-// time_get end primitives
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::get(iter_type __b, iter_type __e,
-                                      ios_base& __iob,
-                                      ios_base::iostate& __err, tm* __tm,
-                                      const char_type* __fmtb, const char_type* __fmte) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __err = ios_base::goodbit;
-    while (__fmtb != __fmte && __err == ios_base::goodbit)
-    {
-        if (__b == __e)
-        {
-            __err = ios_base::failbit;
-            break;
-        }
-        if (__ct.narrow(*__fmtb, 0) == '%')
-        {
-            if (++__fmtb == __fmte)
-            {
-                __err = ios_base::failbit;
-                break;
-            }
-            char __cmd = __ct.narrow(*__fmtb, 0);
-            char __opt = '\0';
-            if (__cmd == 'E' || __cmd == '0')
-            {
-                if (++__fmtb == __fmte)
-                {
-                    __err = ios_base::failbit;
-                    break;
-                }
-                __opt = __cmd;
-                __cmd = __ct.narrow(*__fmtb, 0);
-            }
-            __b = do_get(__b, __e, __iob, __err, __tm, __cmd, __opt);
-            ++__fmtb;
-        }
-        else if (__ct.is(ctype_base::space, *__fmtb))
-        {
-            for (++__fmtb; __fmtb != __fmte && __ct.is(ctype_base::space, *__fmtb); ++__fmtb)
-                ;
-            for (        ;    __b != __e    && __ct.is(ctype_base::space, *__b);    ++__b)
-                ;
-        }
-        else if (__ct.toupper(*__b) == __ct.toupper(*__fmtb))
-        {
-            ++__b;
-            ++__fmtb;
-        }
-        else
-            __err = ios_base::failbit;
-    }
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-typename time_get<_CharT, _InputIterator>::dateorder
-time_get<_CharT, _InputIterator>::do_date_order() const
-{
-    return mdy;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_time(iter_type __b, iter_type __e,
-                                              ios_base& __iob,
-                                              ios_base::iostate& __err,
-                                              tm* __tm) const
-{
-    const char_type __fmt[] = {'%', 'H', ':', '%', 'M', ':', '%', 'S'};
-    return get(__b, __e, __iob, __err, __tm, __fmt, __fmt + sizeof(__fmt)/sizeof(__fmt[0]));
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_date(iter_type __b, iter_type __e,
-                                              ios_base& __iob,
-                                              ios_base::iostate& __err,
-                                              tm* __tm) const
-{
-    const string_type& __fmt = this->__x();
-    return get(__b, __e, __iob, __err, __tm, __fmt.data(), __fmt.data() + __fmt.size());
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_weekday(iter_type __b, iter_type __e,
-                                                 ios_base& __iob,
-                                                 ios_base::iostate& __err,
-                                                 tm* __tm) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __get_weekdayname(__tm->tm_wday, __b, __e, __err, __ct);
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_monthname(iter_type __b, iter_type __e,
-                                                   ios_base& __iob,
-                                                   ios_base::iostate& __err,
-                                                   tm* __tm) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __get_monthname(__tm->tm_mon, __b, __e, __err, __ct);
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_year(iter_type __b, iter_type __e,
-                                              ios_base& __iob,
-                                              ios_base::iostate& __err,
-                                              tm* __tm) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __get_year(__tm->tm_year, __b, __e, __err, __ct);
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                         ios_base& __iob,
-                                         ios_base::iostate& __err, tm* __tm,
-                                         char __fmt, char) const
-{
-    __err = ios_base::goodbit;
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    switch (__fmt)
-    {
-    case 'a':
-    case 'A':
-        __get_weekdayname(__tm->tm_wday, __b, __e, __err, __ct);
-        break;
-    case 'b':
-    case 'B':
-    case 'h':
-        __get_monthname(__tm->tm_mon, __b, __e, __err, __ct);
-        break;
-    case 'c':
-        {
-        const string_type& __fm = this->__c();
-        __b = get(__b, __e, __iob, __err, __tm, __fm.data(), __fm.data() + __fm.size());
-        }
-        break;
-    case 'd':
-    case 'e':
-        __get_day(__tm->tm_mday, __b, __e, __err, __ct);
-        break;
-    case 'D':
-        {
-        const char_type __fm[] = {'%', 'm', '/', '%', 'd', '/', '%', 'y'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'F':
-        {
-        const char_type __fm[] = {'%', 'Y', '-', '%', 'm', '-', '%', 'd'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'H':
-        __get_hour(__tm->tm_hour, __b, __e, __err, __ct);
-        break;
-    case 'I':
-        __get_12_hour(__tm->tm_hour, __b, __e, __err, __ct);
-        break;
-    case 'j':
-        __get_day_year_num(__tm->tm_yday, __b, __e, __err, __ct);
-        break;
-    case 'm':
-        __get_month(__tm->tm_mon, __b, __e, __err, __ct);
-        break;
-    case 'M':
-        __get_minute(__tm->tm_min, __b, __e, __err, __ct);
-        break;
-    case 'n':
-    case 't':
-        __get_white_space(__b, __e, __err, __ct);
-        break;
-    case 'p':
-        __get_am_pm(__tm->tm_hour, __b, __e, __err, __ct);
-        break;
-    case 'r':
-        {
-        const char_type __fm[] = {'%', 'I', ':', '%', 'M', ':', '%', 'S', ' ', '%', 'p'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'R':
-        {
-        const char_type __fm[] = {'%', 'H', ':', '%', 'M'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'S':
-        __get_second(__tm->tm_sec, __b, __e, __err, __ct);
-        break;
-    case 'T':
-        {
-        const char_type __fm[] = {'%', 'H', ':', '%', 'M', ':', '%', 'S'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'w':
-        __get_weekday(__tm->tm_wday, __b, __e, __err, __ct);
-        break;
-    case 'x':
-        return do_get_date(__b, __e, __iob, __err, __tm);
-    case 'X':
-        {
-        const string_type& __fm = this->__X();
-        __b = get(__b, __e, __iob, __err, __tm, __fm.data(), __fm.data() + __fm.size());
-        }
-        break;
-    case 'y':
-        __get_year(__tm->tm_year, __b, __e, __err, __ct);
-        break;
-    case 'Y':
-        __get_year4(__tm->tm_year, __b, __e, __err, __ct);
-        break;
-    case '%':
-        __get_percent(__b, __e, __err, __ct);
-        break;
-    default:
-        __err |= ios_base::failbit;
-    }
-    return __b;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_get<wchar_t>)
-
-class _LIBCPP_TYPE_VIS __time_get
-{
-protected:
-    locale_t __loc_;
-
-    __time_get(const char* __nm);
-    __time_get(const string& __nm);
-    ~__time_get();
-};
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY __time_get_storage
-    : public __time_get
-{
-protected:
-    typedef basic_string<_CharT> string_type;
-
-    string_type __weeks_[14];
-    string_type __months_[24];
-    string_type __am_pm_[2];
-    string_type __c_;
-    string_type __r_;
-    string_type __x_;
-    string_type __X_;
-
-    explicit __time_get_storage(const char* __nm);
-    explicit __time_get_storage(const string& __nm);
-
-    _LIBCPP_ALWAYS_INLINE ~__time_get_storage() {}
-
-    time_base::dateorder __do_date_order() const;
-
-private:
-    void init(const ctype<_CharT>&);
-    string_type __analyze(char __fmt, const ctype<_CharT>&);
-};
-
-template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY time_get_byname
-    : public time_get<_CharT, _InputIterator>,
-      private __time_get_storage<_CharT>
-{
-public:
-    typedef time_base::dateorder    dateorder;
-    typedef _InputIterator          iter_type;
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit time_get_byname(const char* __nm, size_t __refs = 0)
-        : time_get<_CharT, _InputIterator>(__refs),
-          __time_get_storage<_CharT>(__nm) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit time_get_byname(const string& __nm, size_t __refs = 0)
-        : time_get<_CharT, _InputIterator>(__refs),
-          __time_get_storage<_CharT>(__nm) {}
-
-protected:
-    _LIBCPP_INLINE_VISIBILITY
-    ~time_get_byname() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    virtual dateorder do_date_order() const {return this->__do_date_order();}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type* __weeks() const  {return this->__weeks_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type* __months() const {return this->__months_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type* __am_pm() const  {return this->__am_pm_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type& __c() const      {return this->__c_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type& __r() const      {return this->__r_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type& __x() const      {return this->__x_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type& __X() const      {return this->__X_;}
-};
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_get_byname<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_get_byname<wchar_t>)
-
-class _LIBCPP_TYPE_VIS __time_put
-{
-    locale_t __loc_;
-protected:
-    _LIBCPP_ALWAYS_INLINE __time_put() : __loc_(_LIBCPP_GET_C_LOCALE) {}
-    __time_put(const char* __nm);
-    __time_put(const string& __nm);
-    ~__time_put();
-    void __do_put(char* __nb, char*& __ne, const tm* __tm,
-                  char __fmt, char __mod) const;
-    void __do_put(wchar_t* __wb, wchar_t*& __we, const tm* __tm,
-                  char __fmt, char __mod) const;
-};
-
-template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY time_put
-    : public locale::facet,
-      private __time_put
-{
-public:
-    typedef _CharT char_type;
-    typedef _OutputIterator iter_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl, const tm* __tm,
-                  const char_type* __pb, const char_type* __pe) const;
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  const tm* __tm, char __fmt, char __mod = 0) const
-    {
-        return do_put(__s, __iob, __fl, __tm, __fmt, __mod);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~time_put() {}
-    virtual iter_type do_put(iter_type __s, ios_base&, char_type, const tm* __tm,
-                             char __fmt, char __mod) const;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put(const char* __nm, size_t __refs)
-        : locale::facet(__refs),
-          __time_put(__nm) {}
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put(const string& __nm, size_t __refs)
-        : locale::facet(__refs),
-          __time_put(__nm) {}
-};
-
-template <class _CharT, class _OutputIterator>
-locale::id
-time_put<_CharT, _OutputIterator>::id;
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-time_put<_CharT, _OutputIterator>::put(iter_type __s, ios_base& __iob,
-                                       char_type __fl, const tm* __tm,
-                                       const char_type* __pb,
-                                       const char_type* __pe) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    for (; __pb != __pe; ++__pb)
-    {
-        if (__ct.narrow(*__pb, 0) == '%')
-        {
-            if (++__pb == __pe)
-            {
-                *__s++ = __pb[-1];
-                break;
-            }
-            char __mod = 0;
-            char __fmt = __ct.narrow(*__pb, 0);
-            if (__fmt == 'E' || __fmt == 'O')
-            {
-                if (++__pb == __pe)
-                {
-                    *__s++ = __pb[-2];
-                    *__s++ = __pb[-1];
-                    break;
-                }
-                __mod = __fmt;
-                __fmt = __ct.narrow(*__pb, 0);
-            }
-            __s = do_put(__s, __iob, __fl, __tm, __fmt, __mod);
-        }
-        else
-            *__s++ = *__pb;
-    }
-    return __s;
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-time_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base&,
-                                          char_type, const tm* __tm,
-                                          char __fmt, char __mod) const
-{
-    char_type __nar[100];
-    char_type* __nb = __nar;
-    char_type* __ne = __nb + 100;
-    __do_put(__nb, __ne, __tm, __fmt, __mod);
-    return _VSTD::copy(__nb, __ne, __s);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_put<wchar_t>)
-
-template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY time_put_byname
-    : public time_put<_CharT, _OutputIterator>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put_byname(const char* __nm, size_t __refs = 0)
-        : time_put<_CharT, _OutputIterator>(__nm, __refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put_byname(const string& __nm, size_t __refs = 0)
-        : time_put<_CharT, _OutputIterator>(__nm, __refs) {}
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~time_put_byname() {}
-};
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_put_byname<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_put_byname<wchar_t>)
-
-// money_base
-
-class _LIBCPP_TYPE_VIS money_base
-{
-public:
-    enum part {none, space, symbol, sign, value};
-    struct pattern {char field[4];};
-
-    _LIBCPP_ALWAYS_INLINE money_base() {}
-};
-
-// moneypunct
-
-template <class _CharT, bool _International = false>
-class _LIBCPP_TYPE_VIS_ONLY moneypunct
-    : public locale::facet,
-      public money_base
-{
-public:
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit moneypunct(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE char_type   decimal_point() const {return do_decimal_point();}
-    _LIBCPP_ALWAYS_INLINE char_type   thousands_sep() const {return do_thousands_sep();}
-    _LIBCPP_ALWAYS_INLINE string      grouping()      const {return do_grouping();}
-    _LIBCPP_ALWAYS_INLINE string_type curr_symbol()   const {return do_curr_symbol();}
-    _LIBCPP_ALWAYS_INLINE string_type positive_sign() const {return do_positive_sign();}
-    _LIBCPP_ALWAYS_INLINE string_type negative_sign() const {return do_negative_sign();}
-    _LIBCPP_ALWAYS_INLINE int         frac_digits()   const {return do_frac_digits();}
-    _LIBCPP_ALWAYS_INLINE pattern     pos_format()    const {return do_pos_format();}
-    _LIBCPP_ALWAYS_INLINE pattern     neg_format()    const {return do_neg_format();}
-
-    static locale::id id;
-    static const bool intl = _International;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~moneypunct() {}
-
-    virtual char_type   do_decimal_point() const {return numeric_limits<char_type>::max();}
-    virtual char_type   do_thousands_sep() const {return numeric_limits<char_type>::max();}
-    virtual string      do_grouping()      const {return string();}
-    virtual string_type do_curr_symbol()   const {return string_type();}
-    virtual string_type do_positive_sign() const {return string_type();}
-    virtual string_type do_negative_sign() const {return string_type(1, '-');}
-    virtual int         do_frac_digits()   const {return 0;}
-    virtual pattern     do_pos_format()    const
-        {pattern __p = {{symbol, sign, none, value}}; return __p;}
-    virtual pattern     do_neg_format()    const
-        {pattern __p = {{symbol, sign, none, value}}; return __p;}
-};
-
-template <class _CharT, bool _International>
-locale::id
-moneypunct<_CharT, _International>::id;
-
-template <class _CharT, bool _International>
-const bool
-moneypunct<_CharT, _International>::intl;
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct<char, false>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct<char, true>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct<wchar_t, false>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct<wchar_t, true>)
-
-// moneypunct_byname
-
-template <class _CharT, bool _International = false>
-class _LIBCPP_TYPE_VIS_ONLY moneypunct_byname
-    : public moneypunct<_CharT, _International>
-{
-public:
-    typedef money_base::pattern  pattern;
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit moneypunct_byname(const char* __nm, size_t __refs = 0)
-        : moneypunct<_CharT, _International>(__refs) {init(__nm);}
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit moneypunct_byname(const string& __nm, size_t __refs = 0)
-        : moneypunct<_CharT, _International>(__refs) {init(__nm.c_str());}
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~moneypunct_byname() {}
-
-    virtual char_type   do_decimal_point() const {return __decimal_point_;}
-    virtual char_type   do_thousands_sep() const {return __thousands_sep_;}
-    virtual string      do_grouping()      const {return __grouping_;}
-    virtual string_type do_curr_symbol()   const {return __curr_symbol_;}
-    virtual string_type do_positive_sign() const {return __positive_sign_;}
-    virtual string_type do_negative_sign() const {return __negative_sign_;}
-    virtual int         do_frac_digits()   const {return __frac_digits_;}
-    virtual pattern     do_pos_format()    const {return __pos_format_;}
-    virtual pattern     do_neg_format()    const {return __neg_format_;}
-
-private:
-    char_type   __decimal_point_;
-    char_type   __thousands_sep_;
-    string      __grouping_;
-    string_type __curr_symbol_;
-    string_type __positive_sign_;
-    string_type __negative_sign_;
-    int         __frac_digits_;
-    pattern     __pos_format_;
-    pattern     __neg_format_;
-
-    void init(const char*);
-};
-
-template<> void moneypunct_byname<char, false>::init(const char*);
-template<> void moneypunct_byname<char, true>::init(const char*);
-template<> void moneypunct_byname<wchar_t, false>::init(const char*);
-template<> void moneypunct_byname<wchar_t, true>::init(const char*);
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct_byname<char, false>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct_byname<char, true>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct_byname<wchar_t, false>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct_byname<wchar_t, true>)
-
-// money_get
-
-template <class _CharT>
-class __money_get
-{
-protected:
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE __money_get() {}
-
-    static void __gather_info(bool __intl, const locale& __loc,
-                              money_base::pattern& __pat, char_type& __dp,
-                              char_type& __ts, string& __grp,
-                              string_type& __sym, string_type& __psn,
-                              string_type& __nsn, int& __fd);
-};
-
-template <class _CharT>
-void
-__money_get<_CharT>::__gather_info(bool __intl, const locale& __loc,
-                                   money_base::pattern& __pat, char_type& __dp,
-                                   char_type& __ts, string& __grp,
-                                   string_type& __sym, string_type& __psn,
-                                   string_type& __nsn, int& __fd)
-{
-    if (__intl)
-    {
-        const moneypunct<char_type, true>& __mp =
-            use_facet<moneypunct<char_type, true> >(__loc);
-        __pat = __mp.neg_format();
-        __nsn = __mp.negative_sign();
-        __psn = __mp.positive_sign();
-        __dp = __mp.decimal_point();
-        __ts = __mp.thousands_sep();
-        __grp = __mp.grouping();
-        __sym = __mp.curr_symbol();
-        __fd = __mp.frac_digits();
-    }
-    else
-    {
-        const moneypunct<char_type, false>& __mp =
-            use_facet<moneypunct<char_type, false> >(__loc);
-        __pat = __mp.neg_format();
-        __nsn = __mp.negative_sign();
-        __psn = __mp.positive_sign();
-        __dp = __mp.decimal_point();
-        __ts = __mp.thousands_sep();
-        __grp = __mp.grouping();
-        __sym = __mp.curr_symbol();
-        __fd = __mp.frac_digits();
-    }
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS __money_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS __money_get<wchar_t>)
-
-template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY money_get
-    : public locale::facet,
-      private __money_get<_CharT>
-{
-public:
-    typedef _CharT                  char_type;
-    typedef _InputIterator          iter_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit money_get(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, bool __intl, ios_base& __iob,
-                  ios_base::iostate& __err, long double& __v) const
-    {
-        return do_get(__b, __e, __intl, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, bool __intl, ios_base& __iob,
-                  ios_base::iostate& __err, string_type& __v) const
-    {
-        return do_get(__b, __e, __intl, __iob, __err, __v);
-    }
-
-    static locale::id id;
-
-protected:
-
-    _LIBCPP_ALWAYS_INLINE
-    ~money_get() {}
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, bool __intl,
-                             ios_base& __iob, ios_base::iostate& __err,
-                             long double& __v) const;
-    virtual iter_type do_get(iter_type __b, iter_type __e, bool __intl,
-                             ios_base& __iob, ios_base::iostate& __err,
-                             string_type& __v) const;
-
-private:
-    static bool __do_get(iter_type& __b, iter_type __e,
-                         bool __intl, const locale& __loc,
-                         ios_base::fmtflags __flags, ios_base::iostate& __err,
-                         bool& __neg, const ctype<char_type>& __ct,
-                         unique_ptr<char_type, void(*)(void*)>& __wb,
-                         char_type*& __wn, char_type* __we);
-};
-
-template <class _CharT, class _InputIterator>
-locale::id
-money_get<_CharT, _InputIterator>::id;
-
-_LIBCPP_FUNC_VIS void __do_nothing(void*);
-
-template <class _Tp>
-_LIBCPP_HIDDEN
-void
-__double_or_nothing(unique_ptr<_Tp, void(*)(void*)>& __b, _Tp*& __n, _Tp*& __e)
-{
-    bool __owns = __b.get_deleter() != __do_nothing;
-    size_t __cur_cap = static_cast<size_t>(__e-__b.get()) * sizeof(_Tp);
-    size_t __new_cap = __cur_cap < numeric_limits<size_t>::max() / 2 ?
-                       2 * __cur_cap : numeric_limits<size_t>::max();
-    if (__new_cap == 0)
-        __new_cap = sizeof(_Tp);
-    size_t __n_off = static_cast<size_t>(__n - __b.get());
-    _Tp* __t = (_Tp*)realloc(__owns ? __b.get() : 0, __new_cap);
-    if (__t == 0)
-        __throw_bad_alloc();
-    if (__owns)
-        __b.release();
-    __b = unique_ptr<_Tp, void(*)(void*)>(__t, free);
-    __new_cap /= sizeof(_Tp);
-    __n = __b.get() + __n_off;
-    __e = __b.get() + __new_cap;
-}
-
-// true == success
-template <class _CharT, class _InputIterator>
-bool
-money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,
-                                            bool __intl, const locale& __loc,
-                                            ios_base::fmtflags __flags,
-                                            ios_base::iostate& __err,
-                                            bool& __neg,
-                                            const ctype<char_type>& __ct,
-                                            unique_ptr<char_type, void(*)(void*)>& __wb,
-                                            char_type*& __wn, char_type* __we)
-{
-    const unsigned __bz = 100;
-    unsigned __gbuf[__bz];
-    unique_ptr<unsigned, void(*)(void*)> __gb(__gbuf, __do_nothing);
-    unsigned* __gn = __gb.get();
-    unsigned* __ge = __gn + __bz;
-    money_base::pattern __pat;
-    char_type __dp;
-    char_type __ts;
-    string __grp;
-    string_type __sym;
-    string_type __psn;
-    string_type __nsn;
-    // Capture the spaces read into money_base::{space,none} so they
-    // can be compared to initial spaces in __sym.
-    string_type __spaces;
-    int __fd;
-    __money_get<_CharT>::__gather_info(__intl, __loc, __pat, __dp, __ts, __grp,
-                                       __sym, __psn, __nsn, __fd);
-    const string_type* __trailing_sign = 0;
-    __wn = __wb.get();
-    for (unsigned __p = 0; __p < 4 && __b != __e; ++__p)
-    {
-        switch (__pat.field[__p])
-        {
-        case money_base::space:
-            if (__p != 3)
-            {
-                if (__ct.is(ctype_base::space, *__b))
-                    __spaces.push_back(*__b++);
-                else
-                {
-                    __err |= ios_base::failbit;
-                    return false;
-                }
-            }
-            // drop through
-        case money_base::none:
-            if (__p != 3)
-            {
-                while (__b != __e && __ct.is(ctype_base::space, *__b))
-                    __spaces.push_back(*__b++);
-            }
-            break;
-        case money_base::sign:
-            if (__psn.size() + __nsn.size() > 0)
-            {
-                if (__psn.size() == 0 || __nsn.size() == 0)
-                {   // sign is optional
-                    if (__psn.size() > 0)
-                    {   // __nsn.size() == 0
-                        if (*__b == __psn[0])
-                        {
-                            ++__b;
-                            if (__psn.size() > 1)
-                                __trailing_sign = &__psn;
-                        }
-                        else
-                            __neg = true;
-                    }
-                    else if (*__b == __nsn[0])  // __nsn.size() > 0 &&  __psn.size() == 0
-                    {
-                        ++__b;
-                        __neg = true;
-                        if (__nsn.size() > 1)
-                            __trailing_sign = &__nsn;
-                    }
-                }
-                else  // sign is required
-                {
-                    if (*__b == __psn[0])
-                    {
-                        ++__b;
-                        if (__psn.size() > 1)
-                            __trailing_sign = &__psn;
-                    }
-                    else if (*__b == __nsn[0])
-                    {
-                        ++__b;
-                        __neg = true;
-                        if (__nsn.size() > 1)
-                            __trailing_sign = &__nsn;
-                    }
-                    else
-                    {
-                        __err |= ios_base::failbit;
-                        return false;
-                    }
-                }
-            }
-            break;
-        case money_base::symbol:
-            {
-            bool __more_needed = __trailing_sign ||
-                                 (__p < 2)       ||
-                                 (__p == 2 && __pat.field[3] != static_cast<char>(money_base::none));
-            bool __sb = (__flags & ios_base::showbase) != 0;
-            if (__sb || __more_needed)
-            {
-                typename string_type::const_iterator __sym_space_end = __sym.begin();
-                if (__p > 0 && (__pat.field[__p - 1] == money_base::none ||
-                                __pat.field[__p - 1] == money_base::space)) {
-                    // Match spaces we've already read against spaces at
-                    // the beginning of __sym.
-                    while (__sym_space_end != __sym.end() &&
-                           __ct.is(ctype_base::space, *__sym_space_end))
-                        ++__sym_space_end;
-                    const size_t __num_spaces = __sym_space_end - __sym.begin();
-                    if (__num_spaces > __spaces.size() ||
-                        !equal(__spaces.end() - __num_spaces, __spaces.end(),
-                               __sym.begin())) {
-                        // No match. Put __sym_space_end back at the
-                        // beginning of __sym, which will prevent a
-                        // match in the next loop.
-                        __sym_space_end = __sym.begin();
-                    }
-                }
-                typename string_type::const_iterator __sym_curr_char = __sym_space_end;
-                while (__sym_curr_char != __sym.end() && __b != __e &&
-                       *__b == *__sym_curr_char) {
-                    ++__b;
-                    ++__sym_curr_char;
-                }
-                if (__sb && __sym_curr_char != __sym.end())
-                {
-                    __err |= ios_base::failbit;
-                    return false;
-                }
-            }
-            }
-            break;
-        case money_base::value:
-            {
-            unsigned __ng = 0;
-            for (; __b != __e; ++__b)
-            {
-                char_type __c = *__b;
-                if (__ct.is(ctype_base::digit, __c))
-                {
-                    if (__wn == __we)
-                        __double_or_nothing(__wb, __wn, __we);
-                    *__wn++ = __c;
-                    ++__ng;
-                }
-                else if (__grp.size() > 0 && __ng > 0 && __c == __ts)
-                {
-                    if (__gn == __ge)
-                        __double_or_nothing(__gb, __gn, __ge);
-                    *__gn++ = __ng;
-                    __ng = 0;
-                }
-                else
-                    break;
-            }
-            if (__gb.get() != __gn && __ng > 0)
-            {
-                if (__gn == __ge)
-                    __double_or_nothing(__gb, __gn, __ge);
-                *__gn++ = __ng;
-            }
-            if (__fd > 0)
-            {
-                if (__b == __e || *__b != __dp)
-                {
-                    __err |= ios_base::failbit;
-                    return false;
-                }
-                for (++__b; __fd > 0; --__fd, ++__b)
-                {
-                    if (__b == __e || !__ct.is(ctype_base::digit, *__b))
-                    {
-                        __err |= ios_base::failbit;
-                        return false;
-                    }
-                    if (__wn == __we)
-                        __double_or_nothing(__wb, __wn, __we);
-                    *__wn++ = *__b;
-                }
-            }
-            if (__wn == __wb.get())
-            {
-                __err |= ios_base::failbit;
-                return false;
-            }
-            }
-            break;
-        }
-    }
-    if (__trailing_sign)
-    {
-        for (unsigned __i = 1; __i < __trailing_sign->size(); ++__i, ++__b)
-        {
-            if (__b == __e || *__b != (*__trailing_sign)[__i])
-            {
-                __err |= ios_base::failbit;
-                return false;
-            }
-        }
-    }
-    if (__gb.get() != __gn)
-    {
-        ios_base::iostate __et = ios_base::goodbit;
-        __check_grouping(__grp, __gb.get(), __gn, __et);
-        if (__et)
-        {
-            __err |= ios_base::failbit;
-            return false;
-        }
-    }
-    return true;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                          bool __intl, ios_base& __iob,
-                                          ios_base::iostate& __err,
-                                          long double& __v) const
-{
-    const int __bz = 100;
-    char_type __wbuf[__bz];
-    unique_ptr<char_type, void(*)(void*)> __wb(__wbuf, __do_nothing);
-    char_type* __wn;
-    char_type* __we = __wbuf + __bz;
-    locale __loc = __iob.getloc();
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);
-    bool __neg = false;
-    if (__do_get(__b, __e, __intl, __loc, __iob.flags(), __err, __neg, __ct,
-                 __wb, __wn, __we))
-    {
-        const char __src[] = "0123456789";
-        char_type __atoms[sizeof(__src)-1];
-        __ct.widen(__src, __src + (sizeof(__src)-1), __atoms);
-        char __nbuf[__bz];
-        char* __nc = __nbuf;
-        unique_ptr<char, void(*)(void*)> __h(0, free);
-        if (__wn - __wb.get() > __bz-2)
-        {
-            __h.reset((char*)malloc(static_cast<size_t>(__wn - __wb.get() + 2)));
-            if (__h.get() == 0)
-                __throw_bad_alloc();
-            __nc = __h.get();
-        }
-        if (__neg)
-            *__nc++ = '-';
-        for (const char_type* __w = __wb.get(); __w < __wn; ++__w, ++__nc)
-            *__nc = __src[find(__atoms, _VSTD::end(__atoms), *__w) - __atoms];
-        *__nc = char();
-        if (sscanf(__nbuf, "%Lf", &__v) != 1)
-            __throw_runtime_error("money_get error");
-    }
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                          bool __intl, ios_base& __iob,
-                                          ios_base::iostate& __err,
-                                          string_type& __v) const
-{
-    const int __bz = 100;
-    char_type __wbuf[__bz];
-    unique_ptr<char_type, void(*)(void*)> __wb(__wbuf, __do_nothing);
-    char_type* __wn;
-    char_type* __we = __wbuf + __bz;
-    locale __loc = __iob.getloc();
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);
-    bool __neg = false;
-    if (__do_get(__b, __e, __intl, __loc, __iob.flags(), __err, __neg, __ct,
-                 __wb, __wn, __we))
-    {
-        __v.clear();
-        if (__neg)
-            __v.push_back(__ct.widen('-'));
-        char_type __z = __ct.widen('0');
-        char_type* __w;
-        for (__w = __wb.get(); __w < __wn-1; ++__w)
-            if (*__w != __z)
-                break;
-        __v.append(__w, __wn);
-    }
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS money_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS money_get<wchar_t>)
-
-// money_put
-
-template <class _CharT>
-class __money_put
-{
-protected:
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE __money_put() {}
-
-    static void __gather_info(bool __intl, bool __neg, const locale& __loc,
-                              money_base::pattern& __pat, char_type& __dp,
-                              char_type& __ts, string& __grp,
-                              string_type& __sym, string_type& __sn,
-                              int& __fd);
-    static void __format(char_type* __mb, char_type*& __mi, char_type*& __me,
-                         ios_base::fmtflags __flags,
-                         const char_type* __db, const char_type* __de,
-                         const ctype<char_type>& __ct, bool __neg,
-                         const money_base::pattern& __pat, char_type __dp,
-                         char_type __ts, const string& __grp,
-                         const string_type& __sym, const string_type& __sn,
-                         int __fd);
-};
-
-template <class _CharT>
-void
-__money_put<_CharT>::__gather_info(bool __intl, bool __neg, const locale& __loc,
-                                   money_base::pattern& __pat, char_type& __dp,
-                                   char_type& __ts, string& __grp,
-                                   string_type& __sym, string_type& __sn,
-                                   int& __fd)
-{
-    if (__intl)
-    {
-        const moneypunct<char_type, true>& __mp =
-            use_facet<moneypunct<char_type, true> >(__loc);
-        if (__neg)
-        {
-            __pat = __mp.neg_format();
-            __sn = __mp.negative_sign();
-        }
-        else
-        {
-            __pat = __mp.pos_format();
-            __sn = __mp.positive_sign();
-        }
-        __dp = __mp.decimal_point();
-        __ts = __mp.thousands_sep();
-        __grp = __mp.grouping();
-        __sym = __mp.curr_symbol();
-        __fd = __mp.frac_digits();
-    }
-    else
-    {
-        const moneypunct<char_type, false>& __mp =
-            use_facet<moneypunct<char_type, false> >(__loc);
-        if (__neg)
-        {
-            __pat = __mp.neg_format();
-            __sn = __mp.negative_sign();
-        }
-        else
-        {
-            __pat = __mp.pos_format();
-            __sn = __mp.positive_sign();
-        }
-        __dp = __mp.decimal_point();
-        __ts = __mp.thousands_sep();
-        __grp = __mp.grouping();
-        __sym = __mp.curr_symbol();
-        __fd = __mp.frac_digits();
-    }
-}
-
-template <class _CharT>
-void
-__money_put<_CharT>::__format(char_type* __mb, char_type*& __mi, char_type*& __me,
-                              ios_base::fmtflags __flags,
-                              const char_type* __db, const char_type* __de,
-                              const ctype<char_type>& __ct, bool __neg,
-                              const money_base::pattern& __pat, char_type __dp,
-                              char_type __ts, const string& __grp,
-                              const string_type& __sym, const string_type& __sn,
-                              int __fd)
-{
-    __me = __mb;
-    for (unsigned __p = 0; __p < 4; ++__p)
-    {
-        switch (__pat.field[__p])
-        {
-        case money_base::none:
-            __mi = __me;
-            break;
-        case money_base::space:
-            __mi = __me;
-            *__me++ = __ct.widen(' ');
-            break;
-        case money_base::sign:
-            if (!__sn.empty())
-                *__me++ = __sn[0];
-            break;
-        case money_base::symbol:
-            if (!__sym.empty() && (__flags & ios_base::showbase))
-                __me = _VSTD::copy(__sym.begin(), __sym.end(), __me);
-            break;
-        case money_base::value:
-            {
-            // remember start of value so we can reverse it
-            char_type* __t = __me;
-            // find beginning of digits
-            if (__neg)
-                ++__db;
-            // find end of digits
-            const char_type* __d;
-            for (__d = __db; __d < __de; ++__d)
-                if (!__ct.is(ctype_base::digit, *__d))
-                    break;
-            // print fractional part
-            if (__fd > 0)
-            {
-                int __f;
-                for (__f = __fd; __d > __db && __f > 0; --__f)
-                    *__me++ = *--__d;
-                char_type __z = __f > 0 ? __ct.widen('0') : char_type();
-                for (; __f > 0; --__f)
-                    *__me++ = __z;
-                *__me++ = __dp;
-            }
-            // print units part
-            if (__d == __db)
-            {
-                *__me++ = __ct.widen('0');
-            }
-            else
-            {
-                unsigned __ng = 0;
-                unsigned __ig = 0;
-                unsigned __gl = __grp.empty() ? numeric_limits<unsigned>::max()
-                                              : static_cast<unsigned>(__grp[__ig]);
-                while (__d != __db)
-                {
-                    if (__ng == __gl)
-                    {
-                        *__me++ = __ts;
-                        __ng = 0;
-                        if (++__ig < __grp.size())
-                            __gl = __grp[__ig] == numeric_limits<char>::max() ?
-                                        numeric_limits<unsigned>::max() :
-                                        static_cast<unsigned>(__grp[__ig]);
-                    }
-                    *__me++ = *--__d;
-                    ++__ng;
-                }
-            }
-            // reverse it
-            reverse(__t, __me);
-            }
-            break;
-        }
-    }
-    // print rest of sign, if any
-    if (__sn.size() > 1)
-        __me = _VSTD::copy(__sn.begin()+1, __sn.end(), __me);
-    // set alignment
-    if ((__flags & ios_base::adjustfield) == ios_base::left)
-        __mi = __me;
-    else if ((__flags & ios_base::adjustfield) != ios_base::internal)
-        __mi = __mb;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS __money_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS __money_put<wchar_t>)
-
-template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY money_put
-    : public locale::facet,
-      private __money_put<_CharT>
-{
-public:
-    typedef _CharT                  char_type;
-    typedef _OutputIterator         iter_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit money_put(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, bool __intl, ios_base& __iob, char_type __fl,
-                  long double __units) const
-    {
-        return do_put(__s, __intl, __iob, __fl, __units);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, bool __intl, ios_base& __iob, char_type __fl,
-                  const string_type& __digits) const
-    {
-        return do_put(__s, __intl, __iob, __fl, __digits);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~money_put() {}
-
-    virtual iter_type do_put(iter_type __s, bool __intl, ios_base& __iob,
-                             char_type __fl, long double __units) const;
-    virtual iter_type do_put(iter_type __s, bool __intl, ios_base& __iob,
-                             char_type __fl, const string_type& __digits) const;
-};
-
-template <class _CharT, class _OutputIterator>
-locale::id
-money_put<_CharT, _OutputIterator>::id;
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,
-                                           ios_base& __iob, char_type __fl,
-                                           long double __units) const
-{
-    // convert to char
-    const size_t __bs = 100;
-    char __buf[__bs];
-    char* __bb = __buf;
-    char_type __digits[__bs];
-    char_type* __db = __digits;
-    size_t __n = static_cast<size_t>(snprintf(__bb, __bs, "%.0Lf", __units));
-    unique_ptr<char, void(*)(void*)> __hn(0, free);
-    unique_ptr<char_type, void(*)(void*)> __hd(0, free);
-    // secure memory for digit storage
-    if (__n > __bs-1)
-    {
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __n = static_cast<size_t>(asprintf_l(&__bb, _LIBCPP_GET_C_LOCALE, "%.0Lf", __units));
-#else
-        __n = __asprintf_l(&__bb, __cloc(), "%.0Lf", __units);
-#endif
-        if (__bb == 0)
-            __throw_bad_alloc();
-        __hn.reset(__bb);
-        __hd.reset((char_type*)malloc(__n * sizeof(char_type)));
-        if (__hd == nullptr)
-            __throw_bad_alloc();
-        __db = __hd.get();
-    }
-    // gather info
-    locale __loc = __iob.getloc();
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);
-    __ct.widen(__bb, __bb + __n, __db);
-    bool __neg = __n > 0 && __bb[0] == '-';
-    money_base::pattern __pat;
-    char_type __dp;
-    char_type __ts;
-    string __grp;
-    string_type __sym;
-    string_type __sn;
-    int __fd;
-    this->__gather_info(__intl, __neg, __loc, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
-    // secure memory for formatting
-    char_type __mbuf[__bs];
-    char_type* __mb = __mbuf;
-    unique_ptr<char_type, void(*)(void*)> __hw(0, free);
-    size_t __exn = static_cast<int>(__n) > __fd ?
-                   (__n - static_cast<size_t>(__fd)) * 2 + __sn.size() +
-                    __sym.size() + static_cast<size_t>(__fd) + 1
-                 : __sn.size() + __sym.size() + static_cast<size_t>(__fd) + 2;
-    if (__exn > __bs)
-    {
-        __hw.reset((char_type*)malloc(__exn * sizeof(char_type)));
-        __mb = __hw.get();
-        if (__mb == 0)
-            __throw_bad_alloc();
-    }
-    // format
-    char_type* __mi;
-    char_type* __me;
-    this->__format(__mb, __mi, __me, __iob.flags(),
-                   __db, __db + __n, __ct,
-                   __neg, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
-    return __pad_and_output(__s, __mb, __mi, __me, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,
-                                           ios_base& __iob, char_type __fl,
-                                           const string_type& __digits) const
-{
-    // gather info
-    locale __loc = __iob.getloc();
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);
-    bool __neg = __digits.size() > 0 && __digits[0] == __ct.widen('-');
-    money_base::pattern __pat;
-    char_type __dp;
-    char_type __ts;
-    string __grp;
-    string_type __sym;
-    string_type __sn;
-    int __fd;
-    this->__gather_info(__intl, __neg, __loc, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
-    // secure memory for formatting
-    char_type __mbuf[100];
-    char_type* __mb = __mbuf;
-    unique_ptr<char_type, void(*)(void*)> __h(0, free);
-    size_t __exn = static_cast<int>(__digits.size()) > __fd ?
-                   (__digits.size() - static_cast<size_t>(__fd)) * 2 +
-                    __sn.size() + __sym.size() + static_cast<size_t>(__fd) + 1
-                 : __sn.size() + __sym.size() + static_cast<size_t>(__fd) + 2;
-    if (__exn > 100)
-    {
-        __h.reset((char_type*)malloc(__exn * sizeof(char_type)));
-        __mb = __h.get();
-        if (__mb == 0)
-            __throw_bad_alloc();
-    }
-    // format
-    char_type* __mi;
-    char_type* __me;
-    this->__format(__mb, __mi, __me, __iob.flags(),
-                   __digits.data(), __digits.data() + __digits.size(), __ct,
-                   __neg, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
-    return __pad_and_output(__s, __mb, __mi, __me, __iob, __fl);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS money_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS money_put<wchar_t>)
-
-// messages
-
-class _LIBCPP_TYPE_VIS messages_base
-{
-public:
-    typedef ptrdiff_t catalog;
-
-    _LIBCPP_ALWAYS_INLINE messages_base() {}
-};
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY messages
-    : public locale::facet,
-      public messages_base
-{
-public:
-    typedef _CharT               char_type;
-    typedef basic_string<_CharT> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit messages(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    catalog open(const basic_string<char>& __nm, const locale& __loc) const
-    {
-        return do_open(__nm, __loc);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    string_type get(catalog __c, int __set, int __msgid,
-                    const string_type& __dflt) const
-    {
-        return do_get(__c, __set, __msgid, __dflt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    void close(catalog __c) const
-    {
-        do_close(__c);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~messages() {}
-
-    virtual catalog do_open(const basic_string<char>&, const locale&) const;
-    virtual string_type do_get(catalog, int __set, int __msgid,
-                               const string_type& __dflt) const;
-    virtual void do_close(catalog) const;
-};
-
-template <class _CharT>
-locale::id
-messages<_CharT>::id;
-
-template <class _CharT>
-typename messages<_CharT>::catalog
-messages<_CharT>::do_open(const basic_string<char>& __nm, const locale&) const
-{
-#if defined(_WIN32) || defined(__ANDROID__) || defined(_NEWLIB_VERSION)
-    return -1;
-#else // _WIN32 || __ANDROID__
-    catalog __cat = (catalog)catopen(__nm.c_str(), NL_CAT_LOCALE);
-    if (__cat != -1)
-        __cat = static_cast<catalog>((static_cast<size_t>(__cat) >> 1));
-    return __cat;
-#endif // _WIN32 || __ANDROID__
-}
-
-template <class _CharT>
-typename messages<_CharT>::string_type
-messages<_CharT>::do_get(catalog __c, int __set, int __msgid,
-                         const string_type& __dflt) const
-{
-#if defined(_WIN32) || defined(__ANDROID__) || defined(_NEWLIB_VERSION)
-    return __dflt;
-#else // _WIN32
-    string __ndflt;
-    __narrow_to_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__ndflt),
-                                                       __dflt.c_str(),
-                                                       __dflt.c_str() + __dflt.size());
-    if (__c != -1)
-        __c <<= 1;
-    nl_catd __cat = (nl_catd)__c;
-    char* __n = catgets(__cat, __set, __msgid, __ndflt.c_str());
-    string_type __w;
-    __widen_from_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__w),
-                                                        __n, __n + strlen(__n));
-    return __w;
-#endif // _WIN32
-}
-
-template <class _CharT>
-void
-messages<_CharT>::do_close(catalog __c) const
-{
-#if !defined(_WIN32) && !defined(__ANDROID__) && !defined(_NEWLIB_VERSION)
-    if (__c != -1)
-        __c <<= 1;
-    nl_catd __cat = (nl_catd)__c;
-    catclose(__cat);
-#endif // !_WIN32
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS messages<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS messages<wchar_t>)
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY messages_byname
-    : public messages<_CharT>
-{
-public:
-    typedef messages_base::catalog catalog;
-    typedef basic_string<_CharT> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit messages_byname(const char*, size_t __refs = 0)
-        : messages<_CharT>(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit messages_byname(const string&, size_t __refs = 0)
-        : messages<_CharT>(__refs) {}
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~messages_byname() {}
-};
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS messages_byname<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS messages_byname<wchar_t>)
-
-template<class _Codecvt, class _Elem = wchar_t,
-         class _Wide_alloc = allocator<_Elem>,
-         class _Byte_alloc = allocator<char> >
-class _LIBCPP_TYPE_VIS_ONLY wstring_convert
-{
-public:
-    typedef basic_string<char, char_traits<char>, _Byte_alloc>   byte_string;
-    typedef basic_string<_Elem, char_traits<_Elem>, _Wide_alloc> wide_string;
-    typedef typename _Codecvt::state_type                        state_type;
-    typedef typename wide_string::traits_type::int_type          int_type;
-
-private:
-    byte_string __byte_err_string_;
-    wide_string __wide_err_string_;
-    _Codecvt* __cvtptr_;
-    state_type __cvtstate_;
-    size_t __cvtcount_;
-
-    wstring_convert(const wstring_convert& __wc);
-    wstring_convert& operator=(const wstring_convert& __wc);
-public:
-    _LIBCPP_EXPLICIT_AFTER_CXX11 wstring_convert(_Codecvt* __pcvt = new _Codecvt);
-    wstring_convert(_Codecvt* __pcvt, state_type __state);
-    _LIBCPP_EXPLICIT_AFTER_CXX11 wstring_convert(const byte_string& __byte_err,
-                    const wide_string& __wide_err = wide_string());
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    wstring_convert(wstring_convert&& __wc);
-#endif
-    ~wstring_convert();
-
-    _LIBCPP_ALWAYS_INLINE
-    wide_string from_bytes(char __byte)
-        {return from_bytes(&__byte, &__byte+1);}
-    _LIBCPP_ALWAYS_INLINE
-    wide_string from_bytes(const char* __ptr)
-        {return from_bytes(__ptr, __ptr + char_traits<char>::length(__ptr));}
-    _LIBCPP_ALWAYS_INLINE
-    wide_string from_bytes(const byte_string& __str)
-        {return from_bytes(__str.data(), __str.data() + __str.size());}
-    wide_string from_bytes(const char* __first, const char* __last);
-
-    _LIBCPP_ALWAYS_INLINE
-    byte_string to_bytes(_Elem __wchar)
-        {return to_bytes(&__wchar, &__wchar+1);}
-    _LIBCPP_ALWAYS_INLINE
-    byte_string to_bytes(const _Elem* __wptr)
-        {return to_bytes(__wptr, __wptr + char_traits<_Elem>::length(__wptr));}
-    _LIBCPP_ALWAYS_INLINE
-    byte_string to_bytes(const wide_string& __wstr)
-        {return to_bytes(__wstr.data(), __wstr.data() + __wstr.size());}
-    byte_string to_bytes(const _Elem* __first, const _Elem* __last);
-
-    _LIBCPP_ALWAYS_INLINE
-    size_t converted() const _NOEXCEPT {return __cvtcount_;}
-    _LIBCPP_ALWAYS_INLINE
-    state_type state() const {return __cvtstate_;}
-};
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-inline _LIBCPP_ALWAYS_INLINE
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    wstring_convert(_Codecvt* __pcvt)
-        : __cvtptr_(__pcvt), __cvtstate_(), __cvtcount_(0)
-{
-}
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-inline _LIBCPP_ALWAYS_INLINE
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    wstring_convert(_Codecvt* __pcvt, state_type __state)
-        : __cvtptr_(__pcvt), __cvtstate_(__state), __cvtcount_(0)
-{
-}
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    wstring_convert(const byte_string& __byte_err, const wide_string& __wide_err)
-        : __byte_err_string_(__byte_err), __wide_err_string_(__wide_err),
-          __cvtstate_(), __cvtcount_(0)
-{
-    __cvtptr_ = new _Codecvt;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-inline _LIBCPP_ALWAYS_INLINE
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    wstring_convert(wstring_convert&& __wc)
-        : __byte_err_string_(_VSTD::move(__wc.__byte_err_string_)),
-          __wide_err_string_(_VSTD::move(__wc.__wide_err_string_)),
-          __cvtptr_(__wc.__cvtptr_),
-          __cvtstate_(__wc.__cvtstate_), __cvtcount_(__wc.__cvtstate_)
-{
-    __wc.__cvtptr_ = nullptr;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::~wstring_convert()
-{
-    delete __cvtptr_;
-}
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-typename wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::wide_string
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    from_bytes(const char* __frm, const char* __frm_end)
-{
-    __cvtcount_ = 0;
-    if (__cvtptr_ != nullptr)
-    {
-        wide_string __ws(2*(__frm_end - __frm), _Elem());
-        if (__frm != __frm_end)
-            __ws.resize(__ws.capacity());
-        codecvt_base::result __r = codecvt_base::ok;
-        state_type __st = __cvtstate_;
-        if (__frm != __frm_end)
-        {
-            _Elem* __to = &__ws[0];
-            _Elem* __to_end = __to + __ws.size();
-            const char* __frm_nxt;
-            do
-            {
-                _Elem* __to_nxt;
-                __r = __cvtptr_->in(__st, __frm, __frm_end, __frm_nxt,
-                                          __to, __to_end, __to_nxt);
-                __cvtcount_ += __frm_nxt - __frm;
-                if (__frm_nxt == __frm)
-                {
-                    __r = codecvt_base::error;
-                }
-                else if (__r == codecvt_base::noconv)
-                {
-                    __ws.resize(__to - &__ws[0]);
-                    // This only gets executed if _Elem is char
-                    __ws.append((const _Elem*)__frm, (const _Elem*)__frm_end);
-                    __frm = __frm_nxt;
-                    __r = codecvt_base::ok;
-                }
-                else if (__r == codecvt_base::ok)
-                {
-                    __ws.resize(__to_nxt - &__ws[0]);
-                    __frm = __frm_nxt;
-                }
-                else if (__r == codecvt_base::partial)
-                {
-                    ptrdiff_t __s = __to_nxt - &__ws[0];
-                    __ws.resize(2 * __s);
-                    __to = &__ws[0] + __s;
-                    __to_end = &__ws[0] + __ws.size();
-                    __frm = __frm_nxt;
-                }
-            } while (__r == codecvt_base::partial && __frm_nxt < __frm_end);
-        }
-        if (__r == codecvt_base::ok)
-            return __ws;
-    }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__wide_err_string_.empty())
-        throw range_error("wstring_convert: from_bytes error");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __wide_err_string_;
-}
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-typename wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::byte_string
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    to_bytes(const _Elem* __frm, const _Elem* __frm_end)
-{
-    __cvtcount_ = 0;
-    if (__cvtptr_ != nullptr)
-    {
-        byte_string __bs(2*(__frm_end - __frm), char());
-        if (__frm != __frm_end)
-            __bs.resize(__bs.capacity());
-        codecvt_base::result __r = codecvt_base::ok;
-        state_type __st = __cvtstate_;
-        if (__frm != __frm_end)
-        {
-            char* __to = &__bs[0];
-            char* __to_end = __to + __bs.size();
-            const _Elem* __frm_nxt;
-            do
-            {
-                char* __to_nxt;
-                __r = __cvtptr_->out(__st, __frm, __frm_end, __frm_nxt,
-                                           __to, __to_end, __to_nxt);
-                __cvtcount_ += __frm_nxt - __frm;
-                if (__frm_nxt == __frm)
-                {
-                    __r = codecvt_base::error;
-                }
-                else if (__r == codecvt_base::noconv)
-                {
-                    __bs.resize(__to - &__bs[0]);
-                    // This only gets executed if _Elem is char
-                    __bs.append((const char*)__frm, (const char*)__frm_end);
-                    __frm = __frm_nxt;
-                    __r = codecvt_base::ok;
-                }
-                else if (__r == codecvt_base::ok)
-                {
-                    __bs.resize(__to_nxt - &__bs[0]);
-                    __frm = __frm_nxt;
-                }
-                else if (__r == codecvt_base::partial)
-                {
-                    ptrdiff_t __s = __to_nxt - &__bs[0];
-                    __bs.resize(2 * __s);
-                    __to = &__bs[0] + __s;
-                    __to_end = &__bs[0] + __bs.size();
-                    __frm = __frm_nxt;
-                }
-            } while (__r == codecvt_base::partial && __frm_nxt < __frm_end);
-        }
-        if (__r == codecvt_base::ok)
-        {
-            size_t __s = __bs.size();
-            __bs.resize(__bs.capacity());
-            char* __to = &__bs[0] + __s;
-            char* __to_end = __to + __bs.size();
-            do
-            {
-                char* __to_nxt;
-                __r = __cvtptr_->unshift(__st, __to, __to_end, __to_nxt);
-                if (__r == codecvt_base::noconv)
-                {
-                    __bs.resize(__to - &__bs[0]);
-                    __r = codecvt_base::ok;
-                }
-                else if (__r == codecvt_base::ok)
-                {
-                    __bs.resize(__to_nxt - &__bs[0]);
-                }
-                else if (__r == codecvt_base::partial)
-                {
-                    ptrdiff_t __sp = __to_nxt - &__bs[0];
-                    __bs.resize(2 * __sp);
-                    __to = &__bs[0] + __sp;
-                    __to_end = &__bs[0] + __bs.size();
-                }
-            } while (__r == codecvt_base::partial);
-            if (__r == codecvt_base::ok)
-                return __bs;
-        }
-    }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__byte_err_string_.empty())
-        throw range_error("wstring_convert: to_bytes error");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __byte_err_string_;
-}
-
-template <class _Codecvt, class _Elem = wchar_t, class _Tr = char_traits<_Elem> >
-class _LIBCPP_TYPE_VIS_ONLY wbuffer_convert
-    : public basic_streambuf<_Elem, _Tr>
-{
-public:
-    // types:
-    typedef _Elem                          char_type;
-    typedef _Tr                            traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef typename _Codecvt::state_type  state_type;
-
-private:
-    char*       __extbuf_;
-    const char* __extbufnext_;
-    const char* __extbufend_;
-    char __extbuf_min_[8];
-    size_t __ebs_;
-    char_type* __intbuf_;
-    size_t __ibs_;
-    streambuf* __bufptr_;
-    _Codecvt* __cv_;
-    state_type __st_;
-    ios_base::openmode __cm_;
-    bool __owns_eb_;
-    bool __owns_ib_;
-    bool __always_noconv_;
-
-    wbuffer_convert(const wbuffer_convert&);
-    wbuffer_convert& operator=(const wbuffer_convert&);
-public:
-    _LIBCPP_EXPLICIT_AFTER_CXX11 wbuffer_convert(streambuf* __bytebuf = 0, 
-            _Codecvt* __pcvt = new _Codecvt, state_type __state = state_type());
-    ~wbuffer_convert();
-
-    _LIBCPP_INLINE_VISIBILITY
-    streambuf* rdbuf() const {return __bufptr_;}
-    _LIBCPP_INLINE_VISIBILITY
-    streambuf* rdbuf(streambuf* __bytebuf)
-    {
-        streambuf* __r = __bufptr_;
-        __bufptr_ = __bytebuf;
-        return __r;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    state_type state() const {return __st_;}
-
-protected:
-    virtual int_type underflow();
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-    virtual int_type overflow (int_type __c = traits_type::eof());
-    virtual basic_streambuf<char_type, traits_type>* setbuf(char_type* __s,
-                                                            streamsize __n);
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual int sync();
-
-private:
-    bool __read_mode();
-    void __write_mode();
-    wbuffer_convert* __close();
-};
-
-template <class _Codecvt, class _Elem, class _Tr>
-wbuffer_convert<_Codecvt, _Elem, _Tr>::
-    wbuffer_convert(streambuf* __bytebuf, _Codecvt* __pcvt, state_type __state)
-    : __extbuf_(0),
-      __extbufnext_(0),
-      __extbufend_(0),
-      __ebs_(0),
-      __intbuf_(0),
-      __ibs_(0),
-      __bufptr_(__bytebuf),
-      __cv_(__pcvt),
-      __st_(__state),
-      __cm_(0),
-      __owns_eb_(false),
-      __owns_ib_(false),
-      __always_noconv_(__cv_ ? __cv_->always_noconv() : false)
-{
-    setbuf(0, 4096);
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-wbuffer_convert<_Codecvt, _Elem, _Tr>::~wbuffer_convert()
-{
-    __close();
-    delete __cv_;
-    if (__owns_eb_)
-        delete [] __extbuf_;
-    if (__owns_ib_)
-        delete [] __intbuf_;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::int_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::underflow()
-{
-    if (__cv_ == 0 || __bufptr_ == 0)
-        return traits_type::eof();
-    bool __initial = __read_mode();
-    char_type __1buf;
-    if (this->gptr() == 0)
-        this->setg(&__1buf, &__1buf+1, &__1buf+1);
-    const size_t __unget_sz = __initial ? 0 : min<size_t>((this->egptr() - this->eback()) / 2, 4);
-    int_type __c = traits_type::eof();
-    if (this->gptr() == this->egptr())
-    {
-        memmove(this->eback(), this->egptr() - __unget_sz, __unget_sz * sizeof(char_type));
-        if (__always_noconv_)
-        {
-            streamsize __nmemb = static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz);
-            __nmemb = __bufptr_->sgetn((char*)this->eback() + __unget_sz, __nmemb);
-            if (__nmemb != 0)
-            {
-                this->setg(this->eback(),
-                           this->eback() + __unget_sz,
-                           this->eback() + __unget_sz + __nmemb);
-                __c = *this->gptr();
-            }
-        }
-        else
-        {
-            memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
-            __extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
-            __extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
-            streamsize __nmemb = _VSTD::min(static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz),
-                                 static_cast<streamsize>(__extbufend_ - __extbufnext_));
-            codecvt_base::result __r;
-            state_type __svs = __st_;
-            streamsize __nr = __bufptr_->sgetn(const_cast<char*>(__extbufnext_), __nmemb);
-            if (__nr != 0)
-            {
-                __extbufend_ = __extbufnext_ + __nr;
-                char_type*  __inext;
-                __r = __cv_->in(__st_, __extbuf_, __extbufend_, __extbufnext_,
-                                       this->eback() + __unget_sz,
-                                       this->egptr(), __inext);
-                if (__r == codecvt_base::noconv)
-                {
-                    this->setg((char_type*)__extbuf_, (char_type*)__extbuf_, (char_type*)__extbufend_);
-                    __c = *this->gptr();
-                }
-                else if (__inext != this->eback() + __unget_sz)
-                {
-                    this->setg(this->eback(), this->eback() + __unget_sz, __inext);
-                    __c = *this->gptr();
-                }
-            }
-        }
-    }
-    else
-        __c = *this->gptr();
-    if (this->eback() == &__1buf)
-        this->setg(0, 0, 0);
-    return __c;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::int_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::pbackfail(int_type __c)
-{
-    if (__cv_ != 0 && __bufptr_ != 0 && this->eback() < this->gptr())
-    {
-        if (traits_type::eq_int_type(__c, traits_type::eof()))
-        {
-            this->gbump(-1);
-            return traits_type::not_eof(__c);
-        }
-        if (traits_type::eq(traits_type::to_char_type(__c), this->gptr()[-1]))
-        {
-            this->gbump(-1);
-            *this->gptr() = traits_type::to_char_type(__c);
-            return __c;
-        }
-    }
-    return traits_type::eof();
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::int_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::overflow(int_type __c)
-{
-    if (__cv_ == 0 || __bufptr_ == 0)
-        return traits_type::eof();
-    __write_mode();
-    char_type __1buf;
-    char_type* __pb_save = this->pbase();
-    char_type* __epb_save = this->epptr();
-    if (!traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        if (this->pptr() == 0)
-            this->setp(&__1buf, &__1buf+1);
-        *this->pptr() = traits_type::to_char_type(__c);
-        this->pbump(1);
-    }
-    if (this->pptr() != this->pbase())
-    {
-        if (__always_noconv_)
-        {
-            streamsize __nmemb = static_cast<streamsize>(this->pptr() - this->pbase());
-            if (__bufptr_->sputn((const char*)this->pbase(), __nmemb) != __nmemb)
-                return traits_type::eof();
-        }
-        else
-        {
-            char* __extbe = __extbuf_;
-            codecvt_base::result __r;
-            do
-            {
-                const char_type* __e;
-                __r = __cv_->out(__st_, this->pbase(), this->pptr(), __e,
-                                        __extbuf_, __extbuf_ + __ebs_, __extbe);
-                if (__e == this->pbase())
-                    return traits_type::eof();
-                if (__r == codecvt_base::noconv)
-                {
-                    streamsize __nmemb = static_cast<size_t>(this->pptr() - this->pbase());
-                    if (__bufptr_->sputn((const char*)this->pbase(), __nmemb) != __nmemb)
-                        return traits_type::eof();
-                }
-                else if (__r == codecvt_base::ok || __r == codecvt_base::partial)
-                {
-                    streamsize __nmemb = static_cast<size_t>(__extbe - __extbuf_);
-                    if (__bufptr_->sputn(__extbuf_, __nmemb) != __nmemb)
-                        return traits_type::eof();
-                    if (__r == codecvt_base::partial)
-                    {
-                        this->setp((char_type*)__e, this->pptr());
-                        this->pbump(this->epptr() - this->pbase());
-                    }
-                }
-                else
-                    return traits_type::eof();
-            } while (__r == codecvt_base::partial);
-        }
-        this->setp(__pb_save, __epb_save);
-    }
-    return traits_type::not_eof(__c);
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-basic_streambuf<_Elem, _Tr>*
-wbuffer_convert<_Codecvt, _Elem, _Tr>::setbuf(char_type* __s, streamsize __n)
-{
-    this->setg(0, 0, 0);
-    this->setp(0, 0);
-    if (__owns_eb_)
-        delete [] __extbuf_;
-    if (__owns_ib_)
-        delete [] __intbuf_;
-    __ebs_ = __n;
-    if (__ebs_ > sizeof(__extbuf_min_))
-    {
-        if (__always_noconv_ && __s)
-        {
-            __extbuf_ = (char*)__s;
-            __owns_eb_ = false;
-        }
-        else
-        {
-            __extbuf_ = new char[__ebs_];
-            __owns_eb_ = true;
-        }
-    }
-    else
-    {
-        __extbuf_ = __extbuf_min_;
-        __ebs_ = sizeof(__extbuf_min_);
-        __owns_eb_ = false;
-    }
-    if (!__always_noconv_)
-    {
-        __ibs_ = max<streamsize>(__n, sizeof(__extbuf_min_));
-        if (__s && __ibs_ >= sizeof(__extbuf_min_))
-        {
-            __intbuf_ = __s;
-            __owns_ib_ = false;
-        }
-        else
-        {
-            __intbuf_ = new char_type[__ibs_];
-            __owns_ib_ = true;
-        }
-    }
-    else
-    {
-        __ibs_ = 0;
-        __intbuf_ = 0;
-        __owns_ib_ = false;
-    }
-    return this;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::pos_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::seekoff(off_type __off, ios_base::seekdir __way,
-                                        ios_base::openmode __om)
-{
-    int __width = __cv_->encoding();
-    if (__cv_ == 0 || __bufptr_ == 0 || (__width <= 0 && __off != 0) || sync())
-        return pos_type(off_type(-1));
-    // __width > 0 || __off == 0
-    switch (__way)
-    {
-    case ios_base::beg:
-        break;
-    case ios_base::cur:
-        break;
-    case ios_base::end:
-        break;
-    default:
-        return pos_type(off_type(-1));
-    }
-    pos_type __r = __bufptr_->pubseekoff(__width * __off, __way, __om);
-    __r.state(__st_);
-    return __r;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::pos_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::seekpos(pos_type __sp, ios_base::openmode __wch)
-{
-    if (__cv_ == 0 || __bufptr_ == 0 || sync())
-        return pos_type(off_type(-1));
-    if (__bufptr_->pubseekpos(__sp, __wch) == pos_type(off_type(-1)))
-        return pos_type(off_type(-1));
-    return __sp;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-int
-wbuffer_convert<_Codecvt, _Elem, _Tr>::sync()
-{
-    if (__cv_ == 0 || __bufptr_ == 0)
-        return 0;
-    if (__cm_ & ios_base::out)
-    {
-        if (this->pptr() != this->pbase())
-            if (overflow() == traits_type::eof())
-                return -1;
-        codecvt_base::result __r;
-        do
-        {
-            char* __extbe;
-            __r = __cv_->unshift(__st_, __extbuf_, __extbuf_ + __ebs_, __extbe);
-            streamsize __nmemb = static_cast<streamsize>(__extbe - __extbuf_);
-            if (__bufptr_->sputn(__extbuf_, __nmemb) != __nmemb)
-                return -1;
-        } while (__r == codecvt_base::partial);
-        if (__r == codecvt_base::error)
-            return -1;
-        if (__bufptr_->pubsync())
-            return -1;
-    }
-    else if (__cm_ & ios_base::in)
-    {
-        off_type __c;
-        if (__always_noconv_)
-            __c = this->egptr() - this->gptr();
-        else
-        {
-            int __width = __cv_->encoding();
-            __c = __extbufend_ - __extbufnext_;
-            if (__width > 0)
-                __c += __width * (this->egptr() - this->gptr());
-            else
-            {
-                if (this->gptr() != this->egptr())
-                {
-                    reverse(this->gptr(), this->egptr());
-                    codecvt_base::result __r;
-                    const char_type* __e = this->gptr();
-                    char* __extbe;
-                    do
-                    {
-                        __r = __cv_->out(__st_, __e, this->egptr(), __e,
-                                         __extbuf_, __extbuf_ + __ebs_, __extbe);
-                        switch (__r)
-                        {
-                        case codecvt_base::noconv:
-                            __c += this->egptr() - this->gptr();
-                            break;
-                        case codecvt_base::ok:
-                        case codecvt_base::partial:
-                            __c += __extbe - __extbuf_;
-                            break;
-                        default:
-                            return -1;
-                        }
-                    } while (__r == codecvt_base::partial);
-                }
-            }
-        }
-        if (__bufptr_->pubseekoff(-__c, ios_base::cur, __cm_) == pos_type(off_type(-1)))
-            return -1;
-        this->setg(0, 0, 0);
-        __cm_ = 0;
-    }
-    return 0;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-bool
-wbuffer_convert<_Codecvt, _Elem, _Tr>::__read_mode()
-{
-    if (!(__cm_ & ios_base::in))
-    {
-        this->setp(0, 0);
-        if (__always_noconv_)
-            this->setg((char_type*)__extbuf_,
-                       (char_type*)__extbuf_ + __ebs_,
-                       (char_type*)__extbuf_ + __ebs_);
-        else
-            this->setg(__intbuf_, __intbuf_ + __ibs_, __intbuf_ + __ibs_);
-        __cm_ = ios_base::in;
-        return true;
-    }
-    return false;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-void
-wbuffer_convert<_Codecvt, _Elem, _Tr>::__write_mode()
-{
-    if (!(__cm_ & ios_base::out))
-    {
-        this->setg(0, 0, 0);
-        if (__ebs_ > sizeof(__extbuf_min_))
-        {
-            if (__always_noconv_)
-                this->setp((char_type*)__extbuf_,
-                           (char_type*)__extbuf_ + (__ebs_ - 1));
-            else
-                this->setp(__intbuf_, __intbuf_ + (__ibs_ - 1));
-        }
-        else
-            this->setp(0, 0);
-        __cm_ = ios_base::out;
-    }
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-wbuffer_convert<_Codecvt, _Elem, _Tr>*
-wbuffer_convert<_Codecvt, _Elem, _Tr>::__close()
-{
-    wbuffer_convert* __rt = 0;
-    if (__cv_ != 0 && __bufptr_ != 0)
-    {
-        __rt = this;
-        if ((__cm_ & ios_base::out) && sync())
-            __rt = 0;
-    }
-    return __rt;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_LOCALE
diff --git a/include.new/c++/v1/map b/include.new/c++/v1/map
deleted file mode 100644
index 5c3969a..0000000
--- a/include.new/c++/v1/map
+++ /dev/null
@@ -1,2075 +0,0 @@
-// -*- C++ -*-
-//===----------------------------- map ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_MAP
-#define _LIBCPP_MAP
-
-/*
-
-    map synopsis
-
-namespace std
-{
-
-template <class Key, class T, class Compare = less<Key>,
-          class Allocator = allocator<pair<const Key, T>>>
-class map
-{
-public:
-    // types:
-    typedef Key                                      key_type;
-    typedef T                                        mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef Compare                                  key_compare;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    class value_compare
-        : public binary_function<value_type, value_type, bool>
-    {
-        friend class map;
-    protected:
-        key_compare comp;
-
-        value_compare(key_compare c);
-    public:
-        bool operator()(const value_type& x, const value_type& y) const;
-    };
-
-    // construct/copy/destroy:
-    map()
-        noexcept(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value);
-    explicit map(const key_compare& comp);
-    map(const key_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        map(InputIterator first, InputIterator last,
-            const key_compare& comp = key_compare());
-    template <class InputIterator>
-        map(InputIterator first, InputIterator last,
-            const key_compare& comp, const allocator_type& a);
-    map(const map& m);
-    map(map&& m)
-        noexcept(
-            is_nothrow_move_constructible<allocator_type>::value &&
-            is_nothrow_move_constructible<key_compare>::value);
-    explicit map(const allocator_type& a);
-    map(const map& m, const allocator_type& a);
-    map(map&& m, const allocator_type& a);
-    map(initializer_list<value_type> il, const key_compare& comp = key_compare());
-    map(initializer_list<value_type> il, const key_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        map(InputIterator first, InputIterator last, const allocator_type& a)
-            : map(first, last, Compare(), a) {}  // C++14
-    map(initializer_list<value_type> il, const allocator_type& a)
-        : map(il, Compare(), a) {}  // C++14
-   ~map();
-
-    map& operator=(const map& m);
-    map& operator=(map&& m)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<key_compare>::value);
-    map& operator=(initializer_list<value_type> il);
-
-    // iterators:
-          iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-          iterator end() noexcept;
-    const_iterator end()   const noexcept;
-
-          reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-          reverse_iterator rend() noexcept;
-    const_reverse_iterator rend()   const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    // capacity:
-    bool      empty()    const noexcept;
-    size_type size()     const noexcept;
-    size_type max_size() const noexcept;
-
-    // element access:
-    mapped_type& operator[](const key_type& k);
-    mapped_type& operator[](key_type&& k);
-
-          mapped_type& at(const key_type& k);
-    const mapped_type& at(const key_type& k) const;
-
-    // modifiers:
-    template <class... Args>
-        pair<iterator, bool> emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    pair<iterator, bool> insert(const value_type& v);
-    template <class P>
-        pair<iterator, bool> insert(P&& p);
-    iterator insert(const_iterator position, const value_type& v);
-    template <class P>
-        iterator insert(const_iterator position, P&& p);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type> il);
-
-    iterator  erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator  erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(map& m)
-        noexcept(
-            __is_nothrow_swappable<key_compare>::value &&
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value));
-
-    // observers:
-    allocator_type get_allocator() const noexcept;
-    key_compare    key_comp()      const;
-    value_compare  value_comp()    const;
-
-    // map operations:
-          iterator find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    template<typename K>
-        iterator find(const K& x);              // C++14
-    template<typename K>
-        const_iterator find(const K& x) const;  // C++14
-    template<typename K>
-      size_type count(const K& x) const;        // C++14
-
-    size_type      count(const key_type& k) const;
-          iterator lower_bound(const key_type& k);
-    const_iterator lower_bound(const key_type& k) const;
-    template<typename K>
-        iterator lower_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator lower_bound(const K& x) const;  // C++14
-
-          iterator upper_bound(const key_type& k);
-    const_iterator upper_bound(const key_type& k) const;
-    template<typename K>
-        iterator upper_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator upper_bound(const K& x) const;  // C++14
-
-    pair<iterator,iterator>             equal_range(const key_type& k);
-    pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
-    template<typename K>
-        pair<iterator,iterator>             equal_range(const K& x);        // C++14
-    template<typename K>
-        pair<const_iterator,const_iterator> equal_range(const K& x) const;  // C++14
-};
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator==(const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator< (const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator!=(const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator> (const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator>=(const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator<=(const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-// specialized algorithms:
-template <class Key, class T, class Compare, class Allocator>
-void
-swap(map<Key, T, Compare, Allocator>& x, map<Key, T, Compare, Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-template <class Key, class T, class Compare = less<Key>,
-          class Allocator = allocator<pair<const Key, T>>>
-class multimap
-{
-public:
-    // types:
-    typedef Key                                      key_type;
-    typedef T                                        mapped_type;
-    typedef pair<const key_type,mapped_type>         value_type;
-    typedef Compare                                  key_compare;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    class value_compare
-        : public binary_function<value_type,value_type,bool>
-    {
-        friend class multimap;
-    protected:
-        key_compare comp;
-        value_compare(key_compare c);
-    public:
-        bool operator()(const value_type& x, const value_type& y) const;
-    };
-
-    // construct/copy/destroy:
-    multimap()
-        noexcept(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value);
-    explicit multimap(const key_compare& comp);
-    multimap(const key_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        multimap(InputIterator first, InputIterator last, const key_compare& comp);
-    template <class InputIterator>
-        multimap(InputIterator first, InputIterator last, const key_compare& comp,
-                 const allocator_type& a);
-    multimap(const multimap& m);
-    multimap(multimap&& m)
-        noexcept(
-            is_nothrow_move_constructible<allocator_type>::value &&
-            is_nothrow_move_constructible<key_compare>::value);
-    explicit multimap(const allocator_type& a);
-    multimap(const multimap& m, const allocator_type& a);
-    multimap(multimap&& m, const allocator_type& a);
-    multimap(initializer_list<value_type> il, const key_compare& comp = key_compare());
-    multimap(initializer_list<value_type> il, const key_compare& comp,
-             const allocator_type& a);
-    template <class InputIterator>
-        multimap(InputIterator first, InputIterator last, const allocator_type& a)
-            : multimap(first, last, Compare(), a) {} // C++14
-    multimap(initializer_list<value_type> il, const allocator_type& a)
-        : multimap(il, Compare(), a) {} // C++14
-    ~multimap();
-
-    multimap& operator=(const multimap& m);
-    multimap& operator=(multimap&& m)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<key_compare>::value);
-    multimap& operator=(initializer_list<value_type> il);
-
-    // iterators:
-          iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-          iterator end() noexcept;
-    const_iterator end()   const noexcept;
-
-          reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-          reverse_iterator rend() noexcept;
-    const_reverse_iterator rend()   const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    // capacity:
-    bool      empty()    const noexcept;
-    size_type size()     const noexcept;
-    size_type max_size() const noexcept;
-
-    // modifiers:
-    template <class... Args>
-        iterator emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    iterator insert(const value_type& v);
-    template <class P>
-        iterator insert(P&& p);
-    iterator insert(const_iterator position, const value_type& v);
-    template <class P>
-        iterator insert(const_iterator position, P&& p);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type> il);
-
-    iterator  erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator  erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(multimap& m)
-        noexcept(
-            __is_nothrow_swappable<key_compare>::value &&
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value));
-
-    // observers:
-    allocator_type get_allocator() const noexcept;
-    key_compare    key_comp()      const;
-    value_compare  value_comp()    const;
-
-    // map operations:
-          iterator find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    template<typename K>
-        iterator find(const K& x);              // C++14
-    template<typename K>
-        const_iterator find(const K& x) const;  // C++14
-    template<typename K>
-      size_type count(const K& x) const;        // C++14
-
-    size_type      count(const key_type& k) const;
-          iterator lower_bound(const key_type& k);
-    const_iterator lower_bound(const key_type& k) const;
-    template<typename K>
-        iterator lower_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator lower_bound(const K& x) const;  // C++14
-
-          iterator upper_bound(const key_type& k);
-    const_iterator upper_bound(const key_type& k) const;
-    template<typename K>
-        iterator upper_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator upper_bound(const K& x) const;  // C++14
-
-    pair<iterator,iterator>             equal_range(const key_type& k);
-    pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
-    template<typename K>
-        pair<iterator,iterator>             equal_range(const K& x);        // C++14
-    template<typename K>
-        pair<const_iterator,const_iterator> equal_range(const K& x) const;  // C++14
-};
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator==(const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator< (const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator!=(const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator> (const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator>=(const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator<=(const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-// specialized algorithms:
-template <class Key, class T, class Compare, class Allocator>
-void
-swap(multimap<Key, T, Compare, Allocator>& x,
-     multimap<Key, T, Compare, Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__tree>
-#include <iterator>
-#include <memory>
-#include <utility>
-#include <functional>
-#include <initializer_list>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Key, class _CP, class _Compare, bool = is_empty<_Compare>::value
-#if __has_feature(is_final)
-                                                        && !__is_final(_Compare)
-#endif
-         >
-class __map_value_compare
-    : private _Compare
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __map_value_compare()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Compare>::value)
-        : _Compare() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_value_compare(_Compare c)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Compare>::value)
-        : _Compare(c) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Compare& key_comp() const _NOEXCEPT {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _CP& __x, const _CP& __y) const
-        {return static_cast<const _Compare&>(*this)(__x.__cc.first, __y.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _CP& __x, const _Key& __y) const
-        {return static_cast<const _Compare&>(*this)(__x.__cc.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Key& __x, const _CP& __y) const
-        {return static_cast<const _Compare&>(*this)(__x, __y.__cc.first);}
-
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type
-    operator () ( const _K2& __x, const _CP& __y ) const
-        {return static_cast<const _Compare&>(*this) (__x, __y.__cc.first);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type
-    operator () (const _CP& __x, const _K2& __y) const
-        {return static_cast<const _Compare&>(*this) (__x.__cc.first, __y);}
-#endif
-};
-
-template <class _Key, class _CP, class _Compare>
-class __map_value_compare<_Key, _CP, _Compare, false>
-{
-    _Compare comp;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __map_value_compare()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Compare>::value)
-        : comp() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_value_compare(_Compare c)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Compare>::value)
-        : comp(c) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Compare& key_comp() const _NOEXCEPT {return comp;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _CP& __x, const _CP& __y) const
-        {return comp(__x.__cc.first, __y.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _CP& __x, const _Key& __y) const
-        {return comp(__x.__cc.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Key& __x, const _CP& __y) const
-        {return comp(__x, __y.__cc.first);}
-
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type
-    operator () ( const _K2& __x, const _CP& __y ) const
-        {return comp (__x, __y.__cc.first);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type
-    operator () (const _CP& __x, const _K2& __y) const
-        {return comp (__x.__cc.first, __y);}
-#endif
-};
-
-template <class _Allocator>
-class __map_node_destructor
-{
-    typedef _Allocator                          allocator_type;
-    typedef allocator_traits<allocator_type>    __alloc_traits;
-    typedef typename __alloc_traits::value_type::value_type value_type;
-public:
-    typedef typename __alloc_traits::pointer    pointer;
-private:
-    typedef typename value_type::value_type::first_type     first_type;
-    typedef typename value_type::value_type::second_type    second_type;
-
-    allocator_type& __na_;
-
-    __map_node_destructor& operator=(const __map_node_destructor&);
-
-public:
-    bool __first_constructed;
-    bool __second_constructed;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __map_node_destructor(allocator_type& __na) _NOEXCEPT
-        : __na_(__na),
-          __first_constructed(false),
-          __second_constructed(false)
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    __map_node_destructor(__tree_node_destructor<allocator_type>&& __x) _NOEXCEPT
-        : __na_(__x.__na_),
-          __first_constructed(__x.__value_constructed),
-          __second_constructed(__x.__value_constructed)
-        {
-            __x.__value_constructed = false;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        if (__second_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.__cc.second));
-        if (__first_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.__cc.first));
-        if (__p)
-            __alloc_traits::deallocate(__na_, __p, 1);
-    }
-};
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class map;
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class multimap;
-template <class _TreeIterator> class __map_const_iterator;
-
-#if __cplusplus >= 201103L
-
-template <class _Key, class _Tp>
-union __value_type
-{
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef pair<key_type, mapped_type>              __nc_value_type;
-
-    value_type __cc;
-    __nc_value_type __nc;
-
-    template <class ..._Args>
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(_Args&& ...__args)
-        : __cc(std::forward<_Args>(__args)...) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(const __value_type& __v)
-        : __cc(__v.__cc) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(__value_type& __v)
-        : __cc(__v.__cc) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(__value_type&& __v)
-        : __nc(std::move(__v.__nc)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type& operator=(const __value_type& __v)
-        {__nc = __v.__cc; return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type& operator=(__value_type&& __v)
-        {__nc = std::move(__v.__nc); return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__value_type() {__cc.~value_type();}
-};
-
-#else
-
-template <class _Key, class _Tp>
-struct __value_type
-{
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-
-    value_type __cc;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type() {}
-
-    template <class _A0>
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(const _A0& __a0)
-        : __cc(__a0) {}
-
-    template <class _A0, class _A1>
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(const _A0& __a0, const _A1& __a1)
-        : __cc(__a0, __a1) {}
-};
-
-#endif
-
-template <class _TreeIterator>
-class _LIBCPP_TYPE_VIS_ONLY __map_iterator
-{
-    _TreeIterator __i_;
-
-    typedef typename _TreeIterator::__pointer_traits             __pointer_traits;
-    typedef const typename _TreeIterator::value_type::value_type::first_type __key_type;
-    typedef typename _TreeIterator::value_type::value_type::second_type      __mapped_type;
-public:
-    typedef bidirectional_iterator_tag                           iterator_category;
-    typedef pair<__key_type, __mapped_type>                      value_type;
-    typedef typename _TreeIterator::difference_type              difference_type;
-    typedef value_type&                                          reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator(_TreeIterator __i) _NOEXCEPT : __i_(__i) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __i_->__cc;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__i_->__cc);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator operator++(int)
-    {
-        __map_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator& operator--() {--__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator operator--(int)
-    {
-        __map_iterator __t(*this);
-        --(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __map_iterator& __x, const __map_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend 
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __map_iterator& __x, const __map_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __map_const_iterator;
-};
-
-template <class _TreeIterator>
-class _LIBCPP_TYPE_VIS_ONLY __map_const_iterator
-{
-    _TreeIterator __i_;
-
-    typedef typename _TreeIterator::__pointer_traits             __pointer_traits;
-    typedef const typename _TreeIterator::value_type::value_type::first_type __key_type;
-    typedef typename _TreeIterator::value_type::value_type::second_type      __mapped_type;
-public:
-    typedef bidirectional_iterator_tag                           iterator_category;
-    typedef pair<__key_type, __mapped_type>                      value_type;
-    typedef typename _TreeIterator::difference_type              difference_type;
-    typedef const value_type&                                    reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator(_TreeIterator __i) _NOEXCEPT : __i_(__i) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator(
-            __map_iterator<typename _TreeIterator::__non_const_iterator> __i)
-                _NOEXCEPT
-                : __i_(__i.__i_) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __i_->__cc;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__i_->__cc);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator operator++(int)
-    {
-        __map_const_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator& operator--() {--__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator operator--(int)
-    {
-        __map_const_iterator __t(*this);
-        --(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __map_const_iterator& __x, const __map_const_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __map_const_iterator& __x, const __map_const_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY __tree_const_iterator;
-};
-
-template <class _Key, class _Tp, class _Compare = less<_Key>,
-          class _Allocator = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY map
-{
-public:
-    // types:
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef pair<key_type, mapped_type>              __nc_value_type;
-    typedef _Compare                                 key_compare;
-    typedef _Allocator                               allocator_type;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-
-    class _LIBCPP_TYPE_VIS_ONLY value_compare
-        : public binary_function<value_type, value_type, bool>
-    {
-        friend class map;
-    protected:
-        key_compare comp;
-
-        _LIBCPP_INLINE_VISIBILITY value_compare(key_compare c) : comp(c) {}
-    public:
-        _LIBCPP_INLINE_VISIBILITY
-        bool operator()(const value_type& __x, const value_type& __y) const
-            {return comp(__x.first, __y.first);}
-    };
-
-private:
-
-    typedef _VSTD::__value_type<key_type, mapped_type>             __value_type;
-    typedef __map_value_compare<key_type, __value_type, key_compare> __vc;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                           __allocator_type;
-    typedef __tree<__value_type, __vc, __allocator_type>   __base;
-    typedef typename __base::__node_traits                 __node_traits;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
-
-    __base __tree_;
-
-public:
-    typedef typename __alloc_traits::pointer               pointer;
-    typedef typename __alloc_traits::const_pointer         const_pointer;
-    typedef typename __alloc_traits::size_type             size_type;
-    typedef typename __alloc_traits::difference_type       difference_type;
-    typedef __map_iterator<typename __base::iterator>      iterator;
-    typedef __map_const_iterator<typename __base::const_iterator> const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>               reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>         const_reverse_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    map()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__vc(key_compare())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit map(const key_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__vc(__comp)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit map(const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a) {}
-
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-        map(_InputIterator __f, _InputIterator __l,
-            const key_compare& __comp = key_compare())
-        : __tree_(__vc(__comp))
-        {
-            insert(__f, __l);
-        }
-
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-        map(_InputIterator __f, _InputIterator __l,
-            const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a)
-        {
-            insert(__f, __l);
-        }
-
-#if _LIBCPP_STD_VER > 11
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY 
-    map(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
-        : map(__f, __l, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(const map& __m)
-        : __tree_(__m.__tree_)
-        {
-            insert(__m.begin(), __m.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    map& operator=(const map& __m)
-        {
-#if __cplusplus >= 201103L
-            __tree_ = __m.__tree_;
-#else
-            if (this != &__m) {
-                __tree_.clear();
-                __tree_.value_comp() = __m.__tree_.value_comp();
-                __tree_.__copy_assign_alloc(__m.__tree_);
-                insert(__m.begin(), __m.end());
-            }
-#endif
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(map&& __m)
-        _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-        : __tree_(_VSTD::move(__m.__tree_))
-        {
-        }
-
-    map(map&& __m, const allocator_type& __a);
-
-    _LIBCPP_INLINE_VISIBILITY
-    map& operator=(map&& __m)
-        _NOEXCEPT_(is_nothrow_move_assignable<__base>::value)
-        {
-            __tree_ = _VSTD::move(__m.__tree_);
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(initializer_list<value_type> __il, const key_compare& __comp = key_compare())
-        : __tree_(__vc(__comp))
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(initializer_list<value_type> __il, const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY 
-    map(initializer_list<value_type> __il, const allocator_type& __a)
-        : map(__il, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    map& operator=(initializer_list<value_type> __il)
-        {
-            __tree_.__assign_unique(__il.begin(), __il.end());
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit map(const allocator_type& __a)
-        : __tree_(__a)
-        {
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(const map& __m, const allocator_type& __a)
-        : __tree_(__m.__tree_.value_comp(), __a)
-        {
-            insert(__m.begin(), __m.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT {return __tree_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT {return __tree_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT
-            {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __tree_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __tree_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __tree_.max_size();}
-
-    mapped_type& operator[](const key_type& __k);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    mapped_type& operator[](key_type&& __k);
-#endif
-
-          mapped_type& at(const key_type& __k);
-    const mapped_type& at(const key_type& __k) const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __tree_.__alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_compare    key_comp()      const {return __tree_.value_comp().key_comp();}
-    _LIBCPP_INLINE_VISIBILITY
-    value_compare  value_comp()    const {return value_compare(__tree_.value_comp().key_comp());}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class ..._Args>
-        pair<iterator, bool>
-        emplace(_Args&& ...__args);
-
-    template <class ..._Args>
-        iterator
-        emplace_hint(const_iterator __p, _Args&& ...__args);
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        pair<iterator, bool> insert(_Pp&& __p)
-            {return __tree_.__insert_unique(_VSTD::forward<_Pp>(__p));}
-
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(const_iterator __pos, _Pp&& __p)
-            {return __tree_.__insert_unique(__pos.__i_, _VSTD::forward<_Pp>(__p));}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool>
-        insert(const value_type& __v) {return __tree_.__insert_unique(__v);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator
-        insert(const_iterator __p, const value_type& __v)
-            {return __tree_.__insert_unique(__p.__i_, __v);}
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void insert(_InputIterator __f, _InputIterator __l)
-        {
-            for (const_iterator __e = cend(); __f != __l; ++__f)
-                insert(__e.__i_, *__f);
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __tree_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k)
-        {return __tree_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __f, const_iterator __l)
-        {return __tree_.erase(__f.__i_, __l.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__tree_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(map& __m)
-        _NOEXCEPT_(__is_nothrow_swappable<__base>::value)
-        {__tree_.swap(__m.__tree_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator find(const key_type& __k)             {return __tree_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __tree_.find(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    find(const _K2& __k)                           {return __tree_.find(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    find(const _K2& __k) const                     {return __tree_.find(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type      count(const key_type& __k) const
-        {return __tree_.__count_unique(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
-    count(const _K2& __k)                  {return __tree_.__count_unique(__k);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    iterator lower_bound(const key_type& __k)
-        {return __tree_.lower_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator lower_bound(const key_type& __k) const
-        {return __tree_.lower_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    lower_bound(const _K2& __k)       {return __tree_.lower_bound(__k);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator upper_bound(const key_type& __k)
-        {return __tree_.upper_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator upper_bound(const key_type& __k) const
-        {return __tree_.upper_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    upper_bound(const _K2& __k)       {return __tree_.upper_bound(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,iterator> equal_range(const key_type& __k)
-        {return __tree_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator,const_iterator> equal_range(const key_type& __k) const
-        {return __tree_.__equal_range_unique(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type
-    equal_range(const _K2& __k)       {return __tree_.__equal_range_unique(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type
-    equal_range(const _K2& __k) const {return __tree_.__equal_range_unique(__k);}
-#endif
-
-private:
-    typedef typename __base::__node                    __node;
-    typedef typename __base::__node_allocator          __node_allocator;
-    typedef typename __base::__node_pointer            __node_pointer;
-    typedef typename __base::__node_const_pointer      __node_const_pointer;
-    typedef typename __base::__node_base_pointer       __node_base_pointer;
-    typedef typename __base::__node_base_const_pointer __node_base_const_pointer;
-    typedef __map_node_destructor<__node_allocator> _Dp;
-    typedef unique_ptr<__node, _Dp> __node_holder;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node();
-    template <class _A0>
-        __node_holder __construct_node(_A0&& __a0);
-    __node_holder __construct_node_with_key(key_type&& __k);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _A0, class _A1, class ..._Args>
-        __node_holder __construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif
-    __node_holder __construct_node_with_key(const key_type& __k);
-
-    __node_base_pointer&
-        __find_equal_key(__node_base_pointer& __parent, const key_type& __k);
-    __node_base_const_pointer
-        __find_equal_key(__node_base_const_pointer& __parent, const key_type& __k) const;
-};
-
-// Find place to insert if __k doesn't exist
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-// If __k exists, set parent to node of __k and return reference to node of __k
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_base_pointer&
-map<_Key, _Tp, _Compare, _Allocator>::__find_equal_key(__node_base_pointer& __parent,
-                                                       const key_type& __k)
-{
-    __node_pointer __nd = __tree_.__root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (__tree_.value_comp().key_comp()(__k, __nd->__value_.__cc.first))
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__left_;
-                }
-            }
-            else if (__tree_.value_comp().key_comp()(__nd->__value_.__cc.first, __k))
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__right_;
-                }
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__nd);
-                return __parent;
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__tree_.__end_node());
-    return __parent->__left_;
-}
-
-// Find __k
-// Set __parent to parent of null leaf and
-//    return reference to null leaf iv __k does not exist.
-// If __k exists, set parent to node of __k and return reference to node of __k
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_base_const_pointer
-map<_Key, _Tp, _Compare, _Allocator>::__find_equal_key(__node_base_const_pointer& __parent,
-                                                       const key_type& __k) const
-{
-    __node_const_pointer __nd = __tree_.__root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (__tree_.value_comp().key_comp()(__k, __nd->__value_.__cc.first))
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return const_cast<const __node_base_const_pointer&>(__parent->__left_);
-                }
-            }
-            else if (__tree_.value_comp().key_comp()(__nd->__value_.__cc.first, __k))
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return const_cast<const __node_base_const_pointer&>(__parent->__right_);
-                }
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__nd);
-                return __parent;
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__tree_.__end_node());
-    return const_cast<const __node_base_const_pointer&>(__parent->__left_);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-map<_Key, _Tp, _Compare, _Allocator>::map(map&& __m, const allocator_type& __a)
-    : __tree_(_VSTD::move(__m.__tree_), __a)
-{
-    if (__a != __m.get_allocator())
-    {
-        const_iterator __e = cend();
-        while (!__m.empty())
-            __tree_.__insert_unique(__e.__i_,
-                    _VSTD::move(__m.__tree_.remove(__m.begin().__i_)->__value_));
-    }
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node()
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first));
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class _A0>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::forward<_A0>(__a0));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node_with_key(key_type&& __k)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first), _VSTD::move(__k));
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class _A0, class _A1, class ..._Args>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0), _VSTD::forward<_A1>(__a1),
-                             _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node_with_key(const key_type& __k)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first), __k);
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-_Tp&
-map<_Key, _Tp, _Compare, _Allocator>::operator[](const key_type& __k)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal_key(__parent, __k);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __node_holder __h = __construct_node_with_key(__k);
-        __tree_.__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-    }
-    return __r->__value_.__cc.second;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-_Tp&
-map<_Key, _Tp, _Compare, _Allocator>::operator[](key_type&& __k)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal_key(__parent, __k);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __node_holder __h = __construct_node_with_key(_VSTD::move(__k));
-        __tree_.__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-    }
-    return __r->__value_.__cc.second;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-_Tp&
-map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal_key(__parent, __k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__child == nullptr)
-        throw out_of_range("map::at:  key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return static_cast<__node_pointer>(__child)->__value_.__cc.second;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-const _Tp&
-map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k) const
-{
-    __node_base_const_pointer __parent;
-    __node_base_const_pointer __child = __find_equal_key(__parent, __k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__child == nullptr)
-        throw out_of_range("map::at:  key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return static_cast<__node_const_pointer>(__child)->__value_.__cc.second;
-}
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-pair<typename map<_Key, _Tp, _Compare, _Allocator>::iterator, bool>
-map<_Key, _Tp, _Compare, _Allocator>::emplace(_Args&& ...__args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    pair<iterator, bool> __r = __tree_.__node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-typename map<_Key, _Tp, _Compare, _Allocator>::iterator
-map<_Key, _Tp, _Compare, _Allocator>::emplace_hint(const_iterator __p,
-                                                   _Args&& ...__args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __tree_.__node_insert_unique(__p.__i_, __h.get());
-    if (__r.__i_.__ptr_ == __h.get())
-        __h.release();
-    return __r;
-}
-
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(map<_Key, _Tp, _Compare, _Allocator>& __x,
-     map<_Key, _Tp, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Tp, class _Compare = less<_Key>,
-          class _Allocator = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY multimap
-{
-public:
-    // types:
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef pair<key_type, mapped_type>              __nc_value_type;
-    typedef _Compare                                 key_compare;
-    typedef _Allocator                               allocator_type;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-
-    class _LIBCPP_TYPE_VIS_ONLY value_compare
-        : public binary_function<value_type, value_type, bool>
-    {
-        friend class multimap;
-    protected:
-        key_compare comp;
-
-        _LIBCPP_INLINE_VISIBILITY
-        value_compare(key_compare c) : comp(c) {}
-    public:
-        _LIBCPP_INLINE_VISIBILITY
-        bool operator()(const value_type& __x, const value_type& __y) const
-            {return comp(__x.first, __y.first);}
-    };
-
-private:
-
-    typedef _VSTD::__value_type<key_type, mapped_type>             __value_type;
-    typedef __map_value_compare<key_type, __value_type, key_compare> __vc;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                                    __allocator_type;
-    typedef __tree<__value_type, __vc, __allocator_type>            __base;
-    typedef typename __base::__node_traits                          __node_traits;
-    typedef allocator_traits<allocator_type>                        __alloc_traits;
-
-    __base __tree_;
-
-public:
-    typedef typename __alloc_traits::pointer               pointer;
-    typedef typename __alloc_traits::const_pointer         const_pointer;
-    typedef typename __alloc_traits::size_type             size_type;
-    typedef typename __alloc_traits::difference_type       difference_type;
-    typedef __map_iterator<typename __base::iterator>      iterator;
-    typedef __map_const_iterator<typename __base::const_iterator> const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>               reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>         const_reverse_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__vc(key_compare())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multimap(const key_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__vc(__comp)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multimap(const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a) {}
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        multimap(_InputIterator __f, _InputIterator __l,
-            const key_compare& __comp = key_compare())
-        : __tree_(__vc(__comp))
-        {
-            insert(__f, __l);
-        }
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        multimap(_InputIterator __f, _InputIterator __l,
-            const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a)
-        {
-            insert(__f, __l);
-        }
-
-#if _LIBCPP_STD_VER > 11
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY 
-    multimap(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
-        : multimap(__f, __l, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(const multimap& __m)
-        : __tree_(__m.__tree_.value_comp(),
-          __alloc_traits::select_on_container_copy_construction(__m.__tree_.__alloc()))
-        {
-            insert(__m.begin(), __m.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap& operator=(const multimap& __m)
-        {
-#if __cplusplus >= 201103L
-            __tree_ = __m.__tree_;
-#else
-            if (this != &__m) {
-                __tree_.clear();
-                __tree_.value_comp() = __m.__tree_.value_comp();
-                __tree_.__copy_assign_alloc(__m.__tree_);
-                insert(__m.begin(), __m.end());
-            }
-#endif
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(multimap&& __m)
-        _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-        : __tree_(_VSTD::move(__m.__tree_))
-        {
-        }
-
-    multimap(multimap&& __m, const allocator_type& __a);
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap& operator=(multimap&& __m)
-        _NOEXCEPT_(is_nothrow_move_assignable<__base>::value)
-        {
-            __tree_ = _VSTD::move(__m.__tree_);
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(initializer_list<value_type> __il, const key_compare& __comp = key_compare())
-        : __tree_(__vc(__comp))
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(initializer_list<value_type> __il, const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY 
-    multimap(initializer_list<value_type> __il, const allocator_type& __a)
-        : multimap(__il, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap& operator=(initializer_list<value_type> __il)
-        {
-            __tree_.__assign_multi(__il.begin(), __il.end());
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multimap(const allocator_type& __a)
-        : __tree_(__a)
-        {
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(const multimap& __m, const allocator_type& __a)
-        : __tree_(__m.__tree_.value_comp(), __a)
-        {
-            insert(__m.begin(), __m.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT {return __tree_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT {return __tree_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin()  const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __tree_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __tree_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __tree_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __tree_.__alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_compare    key_comp() const {return __tree_.value_comp().key_comp();}
-    _LIBCPP_INLINE_VISIBILITY
-    value_compare  value_comp() const
-        {return value_compare(__tree_.value_comp().key_comp());}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class ..._Args>
-        iterator
-        emplace(_Args&& ...__args);
-
-    template <class ..._Args>
-        iterator
-        emplace_hint(const_iterator __p, _Args&& ...__args);
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(_Pp&& __p)
-            {return __tree_.__insert_multi(_VSTD::forward<_Pp>(__p));}
-
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(const_iterator __pos, _Pp&& __p)
-            {return __tree_.__insert_multi(__pos.__i_, _VSTD::forward<_Pp>(__p));}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __v) {return __tree_.__insert_multi(__v);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __v)
-            {return __tree_.__insert_multi(__p.__i_, __v);}
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void insert(_InputIterator __f, _InputIterator __l)
-        {
-            for (const_iterator __e = cend(); __f != __l; ++__f)
-                __tree_.__insert_multi(__e.__i_, *__f);
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __tree_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __tree_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __f, const_iterator __l)
-        {return __tree_.erase(__f.__i_, __l.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() {__tree_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(multimap& __m)
-        _NOEXCEPT_(__is_nothrow_swappable<__base>::value)
-        {__tree_.swap(__m.__tree_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator find(const key_type& __k)             {return __tree_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __tree_.find(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    find(const _K2& __k)                           {return __tree_.find(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    find(const _K2& __k) const                     {return __tree_.find(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type      count(const key_type& __k) const
-        {return __tree_.__count_multi(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
-    count(const _K2& __k)                   {return __tree_.__count_multi(__k);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    iterator lower_bound(const key_type& __k)
-        {return __tree_.lower_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator lower_bound(const key_type& __k) const
-            {return __tree_.lower_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    lower_bound(const _K2& __k)       {return __tree_.lower_bound(__k);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator upper_bound(const key_type& __k)
-            {return __tree_.upper_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator upper_bound(const key_type& __k) const
-            {return __tree_.upper_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    upper_bound(const _K2& __k)       {return __tree_.upper_bound(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,iterator>             equal_range(const key_type& __k)
-            {return __tree_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator,const_iterator> equal_range(const key_type& __k) const
-            {return __tree_.__equal_range_multi(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type
-    equal_range(const _K2& __k)       {return __tree_.__equal_range_multi(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type
-    equal_range(const _K2& __k) const {return __tree_.__equal_range_multi(__k);}
-#endif
-
-private:
-    typedef typename __base::__node                    __node;
-    typedef typename __base::__node_allocator          __node_allocator;
-    typedef typename __base::__node_pointer            __node_pointer;
-    typedef typename __base::__node_const_pointer      __node_const_pointer;
-    typedef __map_node_destructor<__node_allocator> _Dp;
-    typedef unique_ptr<__node, _Dp> __node_holder;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node();
-    template <class _A0>
-        __node_holder
-         __construct_node(_A0&& __a0);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _A0, class _A1, class ..._Args>
-        __node_holder __construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-multimap<_Key, _Tp, _Compare, _Allocator>::multimap(multimap&& __m, const allocator_type& __a)
-    : __tree_(_VSTD::move(__m.__tree_), __a)
-{
-    if (__a != __m.get_allocator())
-    {
-        const_iterator __e = cend();
-        while (!__m.empty())
-            __tree_.__insert_multi(__e.__i_,
-                    _VSTD::move(__m.__tree_.remove(__m.begin().__i_)->__value_));
-    }
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::__node_holder
-multimap<_Key, _Tp, _Compare, _Allocator>::__construct_node()
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first));
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class _A0>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::__node_holder
-multimap<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::forward<_A0>(__a0));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class _A0, class _A1, class ..._Args>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::__node_holder
-multimap<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0), _VSTD::forward<_A1>(__a1),
-                             _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::iterator
-multimap<_Key, _Tp, _Compare, _Allocator>::emplace(_Args&& ...__args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __tree_.__node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::iterator
-multimap<_Key, _Tp, _Compare, _Allocator>::emplace_hint(const_iterator __p,
-                                                        _Args&& ...__args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __tree_.__node_insert_multi(__p.__i_, __h.get());
-    __h.release();
-    return __r;
-}
-
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-     multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_MAP
diff --git a/include.new/c++/v1/memory b/include.new/c++/v1/memory
deleted file mode 100644
index 662faa0..0000000
--- a/include.new/c++/v1/memory
+++ /dev/null
@@ -1,5443 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- memory ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_MEMORY
-#define _LIBCPP_MEMORY
-
-/*
-    memory synopsis
-
-namespace std
-{
-
-struct allocator_arg_t { };
-constexpr allocator_arg_t allocator_arg = allocator_arg_t();
-
-template <class T, class Alloc> struct uses_allocator;
-
-template <class Ptr>
-struct pointer_traits
-{
-    typedef Ptr pointer;
-    typedef <details> element_type;
-    typedef <details> difference_type;
-
-    template <class U> using rebind = <details>;
-
-    static pointer pointer_to(<details>);
-};
-
-template <class T>
-struct pointer_traits<T*>
-{
-    typedef T* pointer;
-    typedef T element_type;
-    typedef ptrdiff_t difference_type;
-
-    template <class U> using rebind = U*;
-
-    static pointer pointer_to(<details>) noexcept;
-};
-
-template <class Alloc>
-struct allocator_traits
-{
-    typedef Alloc                        allocator_type;
-    typedef typename allocator_type::value_type
-                                         value_type;
-
-    typedef Alloc::pointer | value_type* pointer;
-    typedef Alloc::const_pointer
-          | pointer_traits<pointer>::rebind<const value_type>
-                                         const_pointer;
-    typedef Alloc::void_pointer
-          | pointer_traits<pointer>::rebind<void>
-                                         void_pointer;
-    typedef Alloc::const_void_pointer
-          | pointer_traits<pointer>::rebind<const void>
-                                         const_void_pointer;
-    typedef Alloc::difference_type
-          | pointer_traits<pointer>::difference_type
-                                         difference_type;
-    typedef Alloc::size_type
-          | make_unsigned<difference_type>::type
-                                         size_type;
-    typedef Alloc::propagate_on_container_copy_assignment
-          | false_type                   propagate_on_container_copy_assignment;
-    typedef Alloc::propagate_on_container_move_assignment
-          | false_type                   propagate_on_container_move_assignment;
-    typedef Alloc::propagate_on_container_swap
-          | false_type                   propagate_on_container_swap;
-
-    template <class T> using rebind_alloc  = Alloc::rebind<U>::other | Alloc<T, Args...>;
-    template <class T> using rebind_traits = allocator_traits<rebind_alloc<T>>;
-
-    static pointer allocate(allocator_type& a, size_type n);
-    static pointer allocate(allocator_type& a, size_type n, const_void_pointer hint);
-
-    static void deallocate(allocator_type& a, pointer p, size_type n) noexcept;
-
-    template <class T, class... Args>
-        static void construct(allocator_type& a, T* p, Args&&... args);
-
-    template <class T>
-        static void destroy(allocator_type& a, T* p);
-
-    static size_type max_size(const allocator_type& a); // noexcept in C++14
-
-    static allocator_type
-        select_on_container_copy_construction(const allocator_type& a);
-};
-
-template <>
-class allocator<void>
-{
-public:
-    typedef void*                                 pointer;
-    typedef const void*                           const_pointer;
-    typedef void                                  value_type;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-};
-
-template <class T>
-class allocator
-{
-public:
-    typedef size_t                                size_type;
-    typedef ptrdiff_t                             difference_type;
-    typedef T*                                    pointer;
-    typedef const T*                              const_pointer;
-    typedef typename add_lvalue_reference<T>::type       reference;
-    typedef typename add_lvalue_reference<const T>::type const_reference;
-    typedef T                                     value_type;
-
-    template <class U> struct rebind {typedef allocator<U> other;};
-
-    allocator() noexcept;
-    allocator(const allocator&) noexcept;
-    template <class U> allocator(const allocator<U>&) noexcept;
-    ~allocator();
-    pointer address(reference x) const noexcept;
-    const_pointer address(const_reference x) const noexcept;
-    pointer allocate(size_type, allocator<void>::const_pointer hint = 0);
-    void deallocate(pointer p, size_type n) noexcept;
-    size_type max_size() const noexcept;
-    template<class U, class... Args>
-        void construct(U* p, Args&&... args);
-    template <class U>
-        void destroy(U* p);
-};
-
-template <class T, class U>
-bool operator==(const allocator<T>&, const allocator<U>&) noexcept;
-
-template <class T, class U>
-bool operator!=(const allocator<T>&, const allocator<U>&) noexcept;
-
-template <class OutputIterator, class T>
-class raw_storage_iterator
-    : public iterator<output_iterator_tag,
-                      T,                               // purposefully not C++03
-                      ptrdiff_t,                       // purposefully not C++03
-                      T*,                              // purposefully not C++03
-                      raw_storage_iterator&>           // purposefully not C++03
-{
-public:
-    explicit raw_storage_iterator(OutputIterator x);
-    raw_storage_iterator& operator*();
-    raw_storage_iterator& operator=(const T& element);
-    raw_storage_iterator& operator++();
-    raw_storage_iterator  operator++(int);
-};
-
-template <class T> pair<T*,ptrdiff_t> get_temporary_buffer(ptrdiff_t n) noexcept;
-template <class T> void               return_temporary_buffer(T* p) noexcept;
-
-template <class T> T* addressof(T& r) noexcept;
-
-template <class InputIterator, class ForwardIterator>
-ForwardIterator
-uninitialized_copy(InputIterator first, InputIterator last, ForwardIterator result);
-
-template <class InputIterator, class Size, class ForwardIterator>
-ForwardIterator
-uninitialized_copy_n(InputIterator first, Size n, ForwardIterator result);
-
-template <class ForwardIterator, class T>
-void uninitialized_fill(ForwardIterator first, ForwardIterator last, const T& x);
-
-template <class ForwardIterator, class Size, class T>
-ForwardIterator
-uninitialized_fill_n(ForwardIterator first, Size n, const T& x);
-
-template <class Y> struct auto_ptr_ref {};
-
-template<class X>
-class auto_ptr
-{
-public:
-    typedef X element_type;
-
-    explicit auto_ptr(X* p =0) throw();
-    auto_ptr(auto_ptr&) throw();
-    template<class Y> auto_ptr(auto_ptr<Y>&) throw();
-    auto_ptr& operator=(auto_ptr&) throw();
-    template<class Y> auto_ptr& operator=(auto_ptr<Y>&) throw();
-    auto_ptr& operator=(auto_ptr_ref<X> r) throw();
-    ~auto_ptr() throw();
-
-    typename add_lvalue_reference<X>::type operator*() const throw();
-    X* operator->() const throw();
-    X* get() const throw();
-    X* release() throw();
-    void reset(X* p =0) throw();
-
-    auto_ptr(auto_ptr_ref<X>) throw();
-    template<class Y> operator auto_ptr_ref<Y>() throw();
-    template<class Y> operator auto_ptr<Y>() throw();
-};
-
-template <class T>
-struct default_delete
-{
-    constexpr default_delete() noexcept = default;
-    template <class U> default_delete(const default_delete<U>&) noexcept;
-
-    void operator()(T*) const noexcept;
-};
-
-template <class T>
-struct default_delete<T[]>
-{
-    constexpr default_delete() noexcept = default;
-    void operator()(T*) const noexcept;
-    template <class U> void operator()(U*) const = delete;
-};
-
-template <class T, class D = default_delete<T>>
-class unique_ptr
-{
-public:
-    typedef see below pointer;
-    typedef T element_type;
-    typedef D deleter_type;
-
-    // constructors
-    constexpr unique_ptr() noexcept;
-    explicit unique_ptr(pointer p) noexcept;
-    unique_ptr(pointer p, see below d1) noexcept;
-    unique_ptr(pointer p, see below d2) noexcept;
-    unique_ptr(unique_ptr&& u) noexcept;
-    unique_ptr(nullptr_t) noexcept : unique_ptr() { }
-    template <class U, class E>
-        unique_ptr(unique_ptr<U, E>&& u) noexcept;
-    template <class U>
-        unique_ptr(auto_ptr<U>&& u) noexcept;
-
-    // destructor
-    ~unique_ptr();
-
-    // assignment
-    unique_ptr& operator=(unique_ptr&& u) noexcept;
-    template <class U, class E> unique_ptr& operator=(unique_ptr<U, E>&& u) noexcept;
-    unique_ptr& operator=(nullptr_t) noexcept;
-
-    // observers
-    typename add_lvalue_reference<T>::type operator*() const;
-    pointer operator->() const noexcept;
-    pointer get() const noexcept;
-    deleter_type& get_deleter() noexcept;
-    const deleter_type& get_deleter() const noexcept;
-    explicit operator bool() const noexcept;
-
-    // modifiers
-    pointer release() noexcept;
-    void reset(pointer p = pointer()) noexcept;
-    void swap(unique_ptr& u) noexcept;
-};
-
-template <class T, class D>
-class unique_ptr<T[], D>
-{
-public:
-    typedef implementation-defined pointer;
-    typedef T element_type;
-    typedef D deleter_type;
-
-    // constructors
-    constexpr unique_ptr() noexcept;
-    explicit unique_ptr(pointer p) noexcept;
-    unique_ptr(pointer p, see below d) noexcept;
-    unique_ptr(pointer p, see below d) noexcept;
-    unique_ptr(unique_ptr&& u) noexcept;
-    unique_ptr(nullptr_t) noexcept : unique_ptr() { }
-
-    // destructor
-    ~unique_ptr();
-
-    // assignment
-    unique_ptr& operator=(unique_ptr&& u) noexcept;
-    unique_ptr& operator=(nullptr_t) noexcept;
-
-    // observers
-    T& operator[](size_t i) const;
-    pointer get() const noexcept;
-    deleter_type& get_deleter() noexcept;
-    const deleter_type& get_deleter() const noexcept;
-    explicit operator bool() const noexcept;
-
-    // modifiers
-    pointer release() noexcept;
-    void reset(pointer p = pointer()) noexcept;
-    void reset(nullptr_t) noexcept;
-    template <class U> void reset(U) = delete;
-    void swap(unique_ptr& u) noexcept;
-};
-
-template <class T, class D>
-    void swap(unique_ptr<T, D>& x, unique_ptr<T, D>& y) noexcept;
-
-template <class T1, class D1, class T2, class D2>
-    bool operator==(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator!=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator<(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator<=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator>(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator>=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-
-template <class T, class D>
-    bool operator==(const unique_ptr<T, D>& x, nullptr_t) noexcept;
-template <class T, class D>
-    bool operator==(nullptr_t, const unique_ptr<T, D>& y) noexcept;
-template <class T, class D>
-    bool operator!=(const unique_ptr<T, D>& x, nullptr_t) noexcept;
-template <class T, class D>
-    bool operator!=(nullptr_t, const unique_ptr<T, D>& y) noexcept;
-
-template <class T, class D>
-    bool operator<(const unique_ptr<T, D>& x, nullptr_t);
-template <class T, class D>
-    bool operator<(nullptr_t, const unique_ptr<T, D>& y);
-template <class T, class D>
-    bool operator<=(const unique_ptr<T, D>& x, nullptr_t);
-template <class T, class D>
-    bool operator<=(nullptr_t, const unique_ptr<T, D>& y);
-template <class T, class D>
-    bool operator>(const unique_ptr<T, D>& x, nullptr_t);
-template <class T, class D>
-    bool operator>(nullptr_t, const unique_ptr<T, D>& y);
-template <class T, class D>
-    bool operator>=(const unique_ptr<T, D>& x, nullptr_t);
-template <class T, class D>
-    bool operator>=(nullptr_t, const unique_ptr<T, D>& y);
-
-class bad_weak_ptr
-    : public std::exception
-{
-    bad_weak_ptr() noexcept;
-};
-
-template<class T, class... Args> unique_ptr<T> make_unique(Args&&... args);     // C++14
-template<class T>                unique_ptr<T> make_unique(size_t n);           // C++14
-template<class T, class... Args> unspecified   make_unique(Args&&...) = delete; // C++14, T == U[N]
-
-template<class T>
-class shared_ptr
-{
-public:
-    typedef T element_type;
-
-    // constructors:
-    constexpr shared_ptr() noexcept;
-    template<class Y> explicit shared_ptr(Y* p);
-    template<class Y, class D> shared_ptr(Y* p, D d);
-    template<class Y, class D, class A> shared_ptr(Y* p, D d, A a);
-    template <class D> shared_ptr(nullptr_t p, D d);
-    template <class D, class A> shared_ptr(nullptr_t p, D d, A a);
-    template<class Y> shared_ptr(const shared_ptr<Y>& r, T *p) noexcept;
-    shared_ptr(const shared_ptr& r) noexcept;
-    template<class Y> shared_ptr(const shared_ptr<Y>& r) noexcept;
-    shared_ptr(shared_ptr&& r) noexcept;
-    template<class Y> shared_ptr(shared_ptr<Y>&& r) noexcept;
-    template<class Y> explicit shared_ptr(const weak_ptr<Y>& r);
-    template<class Y> shared_ptr(auto_ptr<Y>&& r);
-    template <class Y, class D> shared_ptr(unique_ptr<Y, D>&& r);
-    shared_ptr(nullptr_t) : shared_ptr() { }
-
-    // destructor:
-    ~shared_ptr();
-
-    // assignment:
-    shared_ptr& operator=(const shared_ptr& r) noexcept;
-    template<class Y> shared_ptr& operator=(const shared_ptr<Y>& r) noexcept;
-    shared_ptr& operator=(shared_ptr&& r) noexcept;
-    template<class Y> shared_ptr& operator=(shared_ptr<Y>&& r);
-    template<class Y> shared_ptr& operator=(auto_ptr<Y>&& r);
-    template <class Y, class D> shared_ptr& operator=(unique_ptr<Y, D>&& r);
-
-    // modifiers:
-    void swap(shared_ptr& r) noexcept;
-    void reset() noexcept;
-    template<class Y> void reset(Y* p);
-    template<class Y, class D> void reset(Y* p, D d);
-    template<class Y, class D, class A> void reset(Y* p, D d, A a);
-
-    // observers:
-    T* get() const noexcept;
-    T& operator*() const noexcept;
-    T* operator->() const noexcept;
-    long use_count() const noexcept;
-    bool unique() const noexcept;
-    explicit operator bool() const noexcept;
-    template<class U> bool owner_before(shared_ptr<U> const& b) const;
-    template<class U> bool owner_before(weak_ptr<U> const& b) const;
-};
-
-// shared_ptr comparisons:
-template<class T, class U>
-    bool operator==(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator!=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator<(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator>(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator<=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator>=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-
-template <class T>
-    bool operator==(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator==(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator!=(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator!=(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator<(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-bool operator<(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator<=(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator<=(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator>(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator>(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator>=(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator>=(nullptr_t, const shared_ptr<T>& y) noexcept;
-
-// shared_ptr specialized algorithms:
-template<class T> void swap(shared_ptr<T>& a, shared_ptr<T>& b) noexcept;
-
-// shared_ptr casts:
-template<class T, class U>
-    shared_ptr<T> static_pointer_cast(shared_ptr<U> const& r) noexcept;
-template<class T, class U>
-    shared_ptr<T> dynamic_pointer_cast(shared_ptr<U> const& r) noexcept;
-template<class T, class U>
-    shared_ptr<T> const_pointer_cast(shared_ptr<U> const& r) noexcept;
-
-// shared_ptr I/O:
-template<class E, class T, class Y>
-    basic_ostream<E, T>& operator<< (basic_ostream<E, T>& os, shared_ptr<Y> const& p);
-
-// shared_ptr get_deleter:
-template<class D, class T> D* get_deleter(shared_ptr<T> const& p) noexcept;
-
-template<class T, class... Args>
-    shared_ptr<T> make_shared(Args&&... args);
-template<class T, class A, class... Args>
-    shared_ptr<T> allocate_shared(const A& a, Args&&... args);
-
-template<class T>
-class weak_ptr
-{
-public:
-    typedef T element_type;
-
-    // constructors
-    constexpr weak_ptr() noexcept;
-    template<class Y> weak_ptr(shared_ptr<Y> const& r) noexcept;
-    weak_ptr(weak_ptr const& r) noexcept;
-    template<class Y> weak_ptr(weak_ptr<Y> const& r) noexcept;
-    weak_ptr(weak_ptr&& r) noexcept;                      // C++14
-    template<class Y> weak_ptr(weak_ptr<Y>&& r) noexcept; // C++14
-
-    // destructor
-    ~weak_ptr();
-
-    // assignment
-    weak_ptr& operator=(weak_ptr const& r) noexcept;
-    template<class Y> weak_ptr& operator=(weak_ptr<Y> const& r) noexcept;
-    template<class Y> weak_ptr& operator=(shared_ptr<Y> const& r) noexcept;
-    weak_ptr& operator=(weak_ptr&& r) noexcept;                      // C++14
-    template<class Y> weak_ptr& operator=(weak_ptr<Y>&& r) noexcept; // C++14
-
-    // modifiers
-    void swap(weak_ptr& r) noexcept;
-    void reset() noexcept;
-
-    // observers
-    long use_count() const noexcept;
-    bool expired() const noexcept;
-    shared_ptr<T> lock() const noexcept;
-    template<class U> bool owner_before(shared_ptr<U> const& b) const;
-    template<class U> bool owner_before(weak_ptr<U> const& b) const;
-};
-
-// weak_ptr specialized algorithms:
-template<class T> void swap(weak_ptr<T>& a, weak_ptr<T>& b) noexcept;
-
-// class owner_less:
-template<class T> struct owner_less;
-
-template<class T>
-struct owner_less<shared_ptr<T>>
-    : binary_function<shared_ptr<T>, shared_ptr<T>, bool>
-{
-    typedef bool result_type;
-    bool operator()(shared_ptr<T> const&, shared_ptr<T> const&) const;
-    bool operator()(shared_ptr<T> const&, weak_ptr<T> const&) const;
-    bool operator()(weak_ptr<T> const&, shared_ptr<T> const&) const;
-};
-
-template<class T>
-struct owner_less<weak_ptr<T>>
-    : binary_function<weak_ptr<T>, weak_ptr<T>, bool>
-{
-    typedef bool result_type;
-    bool operator()(weak_ptr<T> const&, weak_ptr<T> const&) const;
-    bool operator()(shared_ptr<T> const&, weak_ptr<T> const&) const;
-    bool operator()(weak_ptr<T> const&, shared_ptr<T> const&) const;
-};
-
-template<class T>
-class enable_shared_from_this
-{
-protected:
-    constexpr enable_shared_from_this() noexcept;
-    enable_shared_from_this(enable_shared_from_this const&) noexcept;
-    enable_shared_from_this& operator=(enable_shared_from_this const&) noexcept;
-    ~enable_shared_from_this();
-public:
-    shared_ptr<T> shared_from_this();
-    shared_ptr<T const> shared_from_this() const;
-};
-
-template<class T>
-    bool atomic_is_lock_free(const shared_ptr<T>* p);
-template<class T>
-    shared_ptr<T> atomic_load(const shared_ptr<T>* p);
-template<class T>
-    shared_ptr<T> atomic_load_explicit(const shared_ptr<T>* p, memory_order mo);
-template<class T>
-    void atomic_store(shared_ptr<T>* p, shared_ptr<T> r);
-template<class T>
-    void atomic_store_explicit(shared_ptr<T>* p, shared_ptr<T> r, memory_order mo);
-template<class T>
-    shared_ptr<T> atomic_exchange(shared_ptr<T>* p, shared_ptr<T> r);
-template<class T>
-    shared_ptr<T>
-    atomic_exchange_explicit(shared_ptr<T>* p, shared_ptr<T> r, memory_order mo);
-template<class T>
-    bool
-    atomic_compare_exchange_weak(shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w);
-template<class T>
-    bool
-    atomic_compare_exchange_strong( shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w);
-template<class T>
-    bool
-    atomic_compare_exchange_weak_explicit(shared_ptr<T>* p, shared_ptr<T>* v,
-                                          shared_ptr<T> w, memory_order success,
-                                          memory_order failure);
-template<class T>
-    bool
-    atomic_compare_exchange_strong_explicit(shared_ptr<T>* p, shared_ptr<T>* v,
-                                            shared_ptr<T> w, memory_order success,
-                                            memory_order failure);
-// Hash support
-template <class T> struct hash;
-template <class T, class D> struct hash<unique_ptr<T, D> >;
-template <class T> struct hash<shared_ptr<T> >;
-
-// Pointer safety
-enum class pointer_safety { relaxed, preferred, strict };
-void declare_reachable(void *p);
-template <class T> T *undeclare_reachable(T *p);
-void declare_no_pointers(char *p, size_t n);
-void undeclare_no_pointers(char *p, size_t n);
-pointer_safety get_pointer_safety() noexcept;
-
-void* align(size_t alignment, size_t size, void*& ptr, size_t& space);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <type_traits>
-#include <typeinfo>
-#include <cstddef>
-#include <cstdint>
-#include <new>
-#include <utility>
-#include <limits>
-#include <iterator>
-#include <__functional_base>
-#include <iosfwd>
-#include <tuple>
-#include <cstring>
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-    #include <cassert>
-#endif
-
-#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-#  include <atomic>
-#endif
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// addressof moved to <__functional_base>
-
-template <class _Tp> class allocator;
-
-template <>
-class _LIBCPP_TYPE_VIS_ONLY allocator<void>
-{
-public:
-    typedef void*             pointer;
-    typedef const void*       const_pointer;
-    typedef void              value_type;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-};
-
-template <>
-class _LIBCPP_TYPE_VIS_ONLY allocator<const void>
-{
-public:
-    typedef const void*       pointer;
-    typedef const void*       const_pointer;
-    typedef const void        value_type;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-};
-
-// pointer_traits
-
-template <class _Tp>
-struct __has_element_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::element_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Ptr, bool = __has_element_type<_Ptr>::value>
-struct __pointer_traits_element_type;
-
-template <class _Ptr>
-struct __pointer_traits_element_type<_Ptr, true>
-{
-    typedef typename _Ptr::element_type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class, class...> class _Sp, class _Tp, class ..._Args>
-struct __pointer_traits_element_type<_Sp<_Tp, _Args...>, true>
-{
-    typedef typename _Sp<_Tp, _Args...>::element_type type;
-};
-
-template <template <class, class...> class _Sp, class _Tp, class ..._Args>
-struct __pointer_traits_element_type<_Sp<_Tp, _Args...>, false>
-{
-    typedef _Tp type;
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class> class _Sp, class _Tp>
-struct __pointer_traits_element_type<_Sp<_Tp>, true>
-{
-    typedef typename _Sp<_Tp>::element_type type;
-};
-
-template <template <class> class _Sp, class _Tp>
-struct __pointer_traits_element_type<_Sp<_Tp>, false>
-{
-    typedef _Tp type;
-};
-
-template <template <class, class> class _Sp, class _Tp, class _A0>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0>, true>
-{
-    typedef typename _Sp<_Tp, _A0>::element_type type;
-};
-
-template <template <class, class> class _Sp, class _Tp, class _A0>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0>, false>
-{
-    typedef _Tp type;
-};
-
-template <template <class, class, class> class _Sp, class _Tp, class _A0, class _A1>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0, _A1>, true>
-{
-    typedef typename _Sp<_Tp, _A0, _A1>::element_type type;
-};
-
-template <template <class, class, class> class _Sp, class _Tp, class _A0, class _A1>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0, _A1>, false>
-{
-    typedef _Tp type;
-};
-
-template <template <class, class, class, class> class _Sp, class _Tp, class _A0,
-                                                           class _A1, class _A2>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0, _A1, _A2>, true>
-{
-    typedef typename _Sp<_Tp, _A0, _A1, _A2>::element_type type;
-};
-
-template <template <class, class, class, class> class _Sp, class _Tp, class _A0,
-                                                           class _A1, class _A2>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0, _A1, _A2>, false>
-{
-    typedef _Tp type;
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp>
-struct __has_difference_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::difference_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Ptr, bool = __has_difference_type<_Ptr>::value>
-struct __pointer_traits_difference_type
-{
-    typedef ptrdiff_t type;
-};
-
-template <class _Ptr>
-struct __pointer_traits_difference_type<_Ptr, true>
-{
-    typedef typename _Ptr::difference_type type;
-};
-
-template <class _Tp, class _Up>
-struct __has_rebind
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Xp> static __two __test(...);
-    template <class _Xp> static char __test(typename _Xp::template rebind<_Up>* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Tp, class _Up, bool = __has_rebind<_Tp, _Up>::value>
-struct __pointer_traits_rebind
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Tp::template rebind<_Up> type;
-#else
-    typedef typename _Tp::template rebind<_Up>::other type;
-#endif
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class, class...> class _Sp, class _Tp, class ..._Args, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _Args...>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp, _Args...>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp, _Args...>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class, class...> class _Sp, class _Tp, class ..._Args, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _Args...>, _Up, false>
-{
-    typedef _Sp<_Up, _Args...> type;
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class> class _Sp, class _Tp, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class> class _Sp, class _Tp, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp>, _Up, false>
-{
-    typedef _Sp<_Up> type;
-};
-
-template <template <class, class> class _Sp, class _Tp, class _A0, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp, _A0>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp, _A0>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class, class> class _Sp, class _Tp, class _A0, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0>, _Up, false>
-{
-    typedef _Sp<_Up, _A0> type;
-};
-
-template <template <class, class, class> class _Sp, class _Tp, class _A0,
-                                         class _A1, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0, _A1>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp, _A0, _A1>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp, _A0, _A1>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class, class, class> class _Sp, class _Tp, class _A0,
-                                         class _A1, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0, _A1>, _Up, false>
-{
-    typedef _Sp<_Up, _A0, _A1> type;
-};
-
-template <template <class, class, class, class> class _Sp, class _Tp, class _A0,
-                                                class _A1, class _A2, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0, _A1, _A2>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp, _A0, _A1, _A2>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp, _A0, _A1, _A2>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class, class, class, class> class _Sp, class _Tp, class _A0,
-                                                class _A1, class _A2, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0, _A1, _A2>, _Up, false>
-{
-    typedef _Sp<_Up, _A0, _A1, _A2> type;
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Ptr>
-struct _LIBCPP_TYPE_VIS_ONLY pointer_traits
-{
-    typedef _Ptr                                                     pointer;
-    typedef typename __pointer_traits_element_type<pointer>::type    element_type;
-    typedef typename __pointer_traits_difference_type<pointer>::type difference_type;
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    template <class _Up> using rebind = typename __pointer_traits_rebind<pointer, _Up>::type;
-#else
-    template <class _Up> struct rebind
-        {typedef typename __pointer_traits_rebind<pointer, _Up>::type other;};
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-private:
-    struct __nat {};
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer pointer_to(typename conditional<is_void<element_type>::value,
-                                           __nat, element_type>::type& __r)
-        {return pointer::pointer_to(__r);}
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY pointer_traits<_Tp*>
-{
-    typedef _Tp*      pointer;
-    typedef _Tp       element_type;
-    typedef ptrdiff_t difference_type;
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    template <class _Up> using rebind = _Up*;
-#else
-    template <class _Up> struct rebind {typedef _Up* other;};
-#endif
-
-private:
-    struct __nat {};
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer pointer_to(typename conditional<is_void<element_type>::value,
-                                      __nat, element_type>::type& __r) _NOEXCEPT
-        {return _VSTD::addressof(__r);}
-};
-
-// allocator_traits
-
-namespace __has_pointer_type_imp
-{
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::pointer* = 0);
-}
-
-template <class _Tp>
-struct __has_pointer_type
-    : public integral_constant<bool, sizeof(__has_pointer_type_imp::__test<_Tp>(0)) == 1>
-{
-};
-
-namespace __pointer_type_imp
-{
-
-template <class _Tp, class _Dp, bool = __has_pointer_type<_Dp>::value>
-struct __pointer_type
-{
-    typedef typename _Dp::pointer type;
-};
-
-template <class _Tp, class _Dp>
-struct __pointer_type<_Tp, _Dp, false>
-{
-    typedef _Tp* type;
-};
-
-}  // __pointer_type_imp
-
-template <class _Tp, class _Dp>
-struct __pointer_type
-{
-    typedef typename __pointer_type_imp::__pointer_type<_Tp, typename remove_reference<_Dp>::type>::type type;
-};
-
-template <class _Tp>
-struct __has_const_pointer
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::const_pointer* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Tp, class _Ptr, class _Alloc, bool = __has_const_pointer<_Alloc>::value>
-struct __const_pointer
-{
-    typedef typename _Alloc::const_pointer type;
-};
-
-template <class _Tp, class _Ptr, class _Alloc>
-struct __const_pointer<_Tp, _Ptr, _Alloc, false>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename pointer_traits<_Ptr>::template rebind<const _Tp> type;
-#else
-    typedef typename pointer_traits<_Ptr>::template rebind<const _Tp>::other type;
-#endif
-};
-
-template <class _Tp>
-struct __has_void_pointer
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::void_pointer* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Ptr, class _Alloc, bool = __has_void_pointer<_Alloc>::value>
-struct __void_pointer
-{
-    typedef typename _Alloc::void_pointer type;
-};
-
-template <class _Ptr, class _Alloc>
-struct __void_pointer<_Ptr, _Alloc, false>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename pointer_traits<_Ptr>::template rebind<void> type;
-#else
-    typedef typename pointer_traits<_Ptr>::template rebind<void>::other type;
-#endif
-};
-
-template <class _Tp>
-struct __has_const_void_pointer
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::const_void_pointer* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Ptr, class _Alloc, bool = __has_const_void_pointer<_Alloc>::value>
-struct __const_void_pointer
-{
-    typedef typename _Alloc::const_void_pointer type;
-};
-
-template <class _Ptr, class _Alloc>
-struct __const_void_pointer<_Ptr, _Alloc, false>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename pointer_traits<_Ptr>::template rebind<const void> type;
-#else
-    typedef typename pointer_traits<_Ptr>::template rebind<const void>::other type;
-#endif
-};
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-__to_raw_pointer(_Tp* __p) _NOEXCEPT
-{
-    return __p;
-}
-
-template <class _Pointer>
-inline _LIBCPP_INLINE_VISIBILITY
-typename pointer_traits<_Pointer>::element_type*
-__to_raw_pointer(_Pointer __p) _NOEXCEPT
-{
-    return _VSTD::__to_raw_pointer(__p.operator->());
-}
-
-template <class _Tp>
-struct __has_size_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::size_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Alloc, class _DiffType, bool = __has_size_type<_Alloc>::value>
-struct __size_type
-{
-    typedef typename make_unsigned<_DiffType>::type type;
-};
-
-template <class _Alloc, class _DiffType>
-struct __size_type<_Alloc, _DiffType, true>
-{
-    typedef typename _Alloc::size_type type;
-};
-
-template <class _Tp>
-struct __has_propagate_on_container_copy_assignment
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::propagate_on_container_copy_assignment* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Alloc, bool = __has_propagate_on_container_copy_assignment<_Alloc>::value>
-struct __propagate_on_container_copy_assignment
-{
-    typedef false_type type;
-};
-
-template <class _Alloc>
-struct __propagate_on_container_copy_assignment<_Alloc, true>
-{
-    typedef typename _Alloc::propagate_on_container_copy_assignment type;
-};
-
-template <class _Tp>
-struct __has_propagate_on_container_move_assignment
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::propagate_on_container_move_assignment* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Alloc, bool = __has_propagate_on_container_move_assignment<_Alloc>::value>
-struct __propagate_on_container_move_assignment
-{
-    typedef false_type type;
-};
-
-template <class _Alloc>
-struct __propagate_on_container_move_assignment<_Alloc, true>
-{
-    typedef typename _Alloc::propagate_on_container_move_assignment type;
-};
-
-template <class _Tp>
-struct __has_propagate_on_container_swap
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::propagate_on_container_swap* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Alloc, bool = __has_propagate_on_container_swap<_Alloc>::value>
-struct __propagate_on_container_swap
-{
-    typedef false_type type;
-};
-
-template <class _Alloc>
-struct __propagate_on_container_swap<_Alloc, true>
-{
-    typedef typename _Alloc::propagate_on_container_swap type;
-};
-
-template <class _Tp, class _Up, bool = __has_rebind<_Tp, _Up>::value>
-struct __has_rebind_other
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Xp> static __two __test(...);
-    template <class _Xp> static char __test(typename _Xp::template rebind<_Up>::other* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Tp, class _Up>
-struct __has_rebind_other<_Tp, _Up, false>
-{
-    static const bool value = false;
-};
-
-template <class _Tp, class _Up, bool = __has_rebind_other<_Tp, _Up>::value>
-struct __allocator_traits_rebind
-{
-    typedef typename _Tp::template rebind<_Up>::other type;
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class, class...> class _Alloc, class _Tp, class ..._Args, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, true>
-{
-    typedef typename _Alloc<_Tp, _Args...>::template rebind<_Up>::other type;
-};
-
-template <template <class, class...> class _Alloc, class _Tp, class ..._Args, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, false>
-{
-    typedef _Alloc<_Up, _Args...> type;
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class> class _Alloc, class _Tp, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp>, _Up, true>
-{
-    typedef typename _Alloc<_Tp>::template rebind<_Up>::other type;
-};
-
-template <template <class> class _Alloc, class _Tp, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp>, _Up, false>
-{
-    typedef _Alloc<_Up> type;
-};
-
-template <template <class, class> class _Alloc, class _Tp, class _A0, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0>, _Up, true>
-{
-    typedef typename _Alloc<_Tp, _A0>::template rebind<_Up>::other type;
-};
-
-template <template <class, class> class _Alloc, class _Tp, class _A0, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0>, _Up, false>
-{
-    typedef _Alloc<_Up, _A0> type;
-};
-
-template <template <class, class, class> class _Alloc, class _Tp, class _A0,
-                                         class _A1, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0, _A1>, _Up, true>
-{
-    typedef typename _Alloc<_Tp, _A0, _A1>::template rebind<_Up>::other type;
-};
-
-template <template <class, class, class> class _Alloc, class _Tp, class _A0,
-                                         class _A1, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0, _A1>, _Up, false>
-{
-    typedef _Alloc<_Up, _A0, _A1> type;
-};
-
-template <template <class, class, class, class> class _Alloc, class _Tp, class _A0,
-                                                class _A1, class _A2, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0, _A1, _A2>, _Up, true>
-{
-    typedef typename _Alloc<_Tp, _A0, _A1, _A2>::template rebind<_Up>::other type;
-};
-
-template <template <class, class, class, class> class _Alloc, class _Tp, class _A0,
-                                                class _A1, class _A2, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0, _A1, _A2>, _Up, false>
-{
-    typedef _Alloc<_Up, _A0, _A1, _A2> type;
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-template <class _Alloc, class _SizeType, class _ConstVoidPtr>
-auto
-__has_allocate_hint_test(_Alloc&& __a, _SizeType&& __sz, _ConstVoidPtr&& __p)
-    -> decltype(__a.allocate(__sz, __p), true_type());
-
-template <class _Alloc, class _SizeType, class _ConstVoidPtr>
-auto
-__has_allocate_hint_test(const _Alloc& __a, _SizeType&& __sz, _ConstVoidPtr&& __p)
-    -> false_type;
-
-template <class _Alloc, class _SizeType, class _ConstVoidPtr>
-struct __has_allocate_hint
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_allocate_hint_test(declval<_Alloc>(),
-                                          declval<_SizeType>(),
-                                          declval<_ConstVoidPtr>())),
-            true_type>::value>
-{
-};
-
-#else  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-template <class _Alloc, class _SizeType, class _ConstVoidPtr>
-struct __has_allocate_hint
-    : true_type
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-#if !defined(_LIBCPP_HAS_NO_ADVANCED_SFINAE) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Alloc, class _Tp, class ..._Args>
-decltype(_VSTD::declval<_Alloc>().construct(_VSTD::declval<_Tp*>(),
-                                           _VSTD::declval<_Args>()...),
-                                           true_type())
-__has_construct_test(_Alloc&& __a, _Tp* __p, _Args&& ...__args);
-
-template <class _Alloc, class _Pointer, class ..._Args>
-false_type
-__has_construct_test(const _Alloc& __a, _Pointer&& __p, _Args&& ...__args);
-
-template <class _Alloc, class _Pointer, class ..._Args>
-struct __has_construct
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_construct_test(declval<_Alloc>(),
-                                          declval<_Pointer>(),
-                                          declval<_Args>()...)),
-            true_type>::value>
-{
-};
-
-template <class _Alloc, class _Pointer>
-auto
-__has_destroy_test(_Alloc&& __a, _Pointer&& __p)
-    -> decltype(__a.destroy(__p), true_type());
-
-template <class _Alloc, class _Pointer>
-auto
-__has_destroy_test(const _Alloc& __a, _Pointer&& __p)
-    -> false_type;
-
-template <class _Alloc, class _Pointer>
-struct __has_destroy
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_destroy_test(declval<_Alloc>(),
-                                        declval<_Pointer>())),
-            true_type>::value>
-{
-};
-
-template <class _Alloc>
-auto
-__has_max_size_test(_Alloc&& __a)
-    -> decltype(__a.max_size(), true_type());
-
-template <class _Alloc>
-auto
-__has_max_size_test(const volatile _Alloc& __a)
-    -> false_type;
-
-template <class _Alloc>
-struct __has_max_size
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_max_size_test(declval<_Alloc&>())),
-            true_type>::value>
-{
-};
-
-template <class _Alloc>
-auto
-__has_select_on_container_copy_construction_test(_Alloc&& __a)
-    -> decltype(__a.select_on_container_copy_construction(), true_type());
-
-template <class _Alloc>
-auto
-__has_select_on_container_copy_construction_test(const volatile _Alloc& __a)
-    -> false_type;
-
-template <class _Alloc>
-struct __has_select_on_container_copy_construction
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_select_on_container_copy_construction_test(declval<_Alloc&>())),
-            true_type>::value>
-{
-};
-
-#else  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Alloc, class _Pointer, class ..._Args>
-struct __has_construct
-    : false_type
-{
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Alloc, class _Pointer, class _Args>
-struct __has_construct
-    : false_type
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Alloc, class _Pointer>
-struct __has_destroy
-    : false_type
-{
-};
-
-template <class _Alloc>
-struct __has_max_size
-    : true_type
-{
-};
-
-template <class _Alloc>
-struct __has_select_on_container_copy_construction
-    : false_type
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-template <class _Alloc, class _Ptr, bool = __has_difference_type<_Alloc>::value>
-struct __alloc_traits_difference_type
-{
-    typedef typename pointer_traits<_Ptr>::difference_type type;
-};
-
-template <class _Alloc, class _Ptr>
-struct __alloc_traits_difference_type<_Alloc, _Ptr, true>
-{
-    typedef typename _Alloc::difference_type type;
-};
-
-template <class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY allocator_traits
-{
-    typedef _Alloc                              allocator_type;
-    typedef typename allocator_type::value_type value_type;
-
-    typedef typename __pointer_type<value_type, allocator_type>::type pointer;
-    typedef typename __const_pointer<value_type, pointer, allocator_type>::type const_pointer;
-    typedef typename __void_pointer<pointer, allocator_type>::type void_pointer;
-    typedef typename __const_void_pointer<pointer, allocator_type>::type const_void_pointer;
-
-    typedef typename __alloc_traits_difference_type<allocator_type, pointer>::type difference_type;
-    typedef typename __size_type<allocator_type, difference_type>::type size_type;
-
-    typedef typename __propagate_on_container_copy_assignment<allocator_type>::type
-                     propagate_on_container_copy_assignment;
-    typedef typename __propagate_on_container_move_assignment<allocator_type>::type
-                     propagate_on_container_move_assignment;
-    typedef typename __propagate_on_container_swap<allocator_type>::type
-                     propagate_on_container_swap;
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    template <class _Tp> using rebind_alloc =
-                  typename __allocator_traits_rebind<allocator_type, _Tp>::type;
-    template <class _Tp> using rebind_traits = allocator_traits<rebind_alloc<_Tp>>;
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    template <class _Tp> struct rebind_alloc
-        {typedef typename __allocator_traits_rebind<allocator_type, _Tp>::type other;};
-    template <class _Tp> struct rebind_traits
-        {typedef allocator_traits<typename rebind_alloc<_Tp>::other> other;};
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer allocate(allocator_type& __a, size_type __n)
-        {return __a.allocate(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer allocate(allocator_type& __a, size_type __n, const_void_pointer __hint)
-        {return allocate(__a, __n, __hint,
-            __has_allocate_hint<allocator_type, size_type, const_void_pointer>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void deallocate(allocator_type& __a, pointer __p, size_type __n) _NOEXCEPT
-        {__a.deallocate(__p, __n);}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p, _Args&&... __args)
-            {__construct(__has_construct<allocator_type, _Tp*, _Args...>(),
-                         __a, __p, _VSTD::forward<_Args>(__args)...);}
-#else  // _LIBCPP_HAS_NO_VARIADICS
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p)
-            {
-                ::new ((void*)__p) _Tp();
-            }
-    template <class _Tp, class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0)
-            {
-                ::new ((void*)__p) _Tp(__a0);
-            }
-    template <class _Tp, class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0,
-                              const _A1& __a1)
-            {
-                ::new ((void*)__p) _Tp(__a0, __a1);
-            }
-    template <class _Tp, class _A0, class _A1, class _A2>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0,
-                              const _A1& __a1, const _A2& __a2)
-            {
-                ::new ((void*)__p) _Tp(__a0, __a1, __a2);
-            }
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static void destroy(allocator_type& __a, _Tp* __p)
-            {__destroy(__has_destroy<allocator_type, _Tp*>(), __a, __p);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type max_size(const allocator_type& __a) _NOEXCEPT
-        {return __max_size(__has_max_size<const allocator_type>(), __a);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static allocator_type
-        select_on_container_copy_construction(const allocator_type& __a)
-            {return select_on_container_copy_construction(
-                __has_select_on_container_copy_construction<const allocator_type>(),
-                __a);}
-
-    template <class _Ptr>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        void
-        __construct_forward(allocator_type& __a, _Ptr __begin1, _Ptr __end1, _Ptr& __begin2)
-        {
-            for (; __begin1 != __end1; ++__begin1, ++__begin2)
-                construct(__a, _VSTD::__to_raw_pointer(__begin2), _VSTD::move_if_noexcept(*__begin1));
-        }
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (is_same<allocator_type, allocator<_Tp> >::value
-                || !__has_construct<allocator_type, _Tp*, _Tp>::value) &&
-             is_trivially_move_constructible<_Tp>::value,
-            void
-        >::type
-        __construct_forward(allocator_type& __a, _Tp* __begin1, _Tp* __end1, _Tp*& __begin2)
-        {
-            ptrdiff_t _Np = __end1 - __begin1;
-            _VSTD::memcpy(__begin2, __begin1, _Np * sizeof(_Tp));
-            __begin2 += _Np;
-        }
-
-    template <class _Ptr>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        void
-        __construct_backward(allocator_type& __a, _Ptr __begin1, _Ptr __end1, _Ptr& __end2)
-        {
-            while (__end1 != __begin1)
-            {
-                construct(__a, _VSTD::__to_raw_pointer(__end2-1), _VSTD::move_if_noexcept(*--__end1));
-                --__end2;
-            }
-        }
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (is_same<allocator_type, allocator<_Tp> >::value
-                || !__has_construct<allocator_type, _Tp*, _Tp>::value) &&
-             is_trivially_move_constructible<_Tp>::value,
-            void
-        >::type
-        __construct_backward(allocator_type& __a, _Tp* __begin1, _Tp* __end1, _Tp*& __end2)
-        {
-            ptrdiff_t _Np = __end1 - __begin1;
-            __end2 -= _Np;
-            _VSTD::memcpy(__end2, __begin1, _Np * sizeof(_Tp));
-        }
-
-private:
-
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer allocate(allocator_type& __a, size_type __n,
-        const_void_pointer __hint, true_type)
-        {return __a.allocate(__n, __hint);}
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer allocate(allocator_type& __a, size_type __n,
-        const_void_pointer, false_type)
-        {return __a.allocate(__n);}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        static void __construct(true_type, allocator_type& __a, _Tp* __p, _Args&&... __args)
-            {__a.construct(__p, _VSTD::forward<_Args>(__args)...);}
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        static void __construct(false_type, allocator_type&, _Tp* __p, _Args&&... __args)
-            {
-                ::new ((void*)__p) _Tp(_VSTD::forward<_Args>(__args)...);
-            }
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static void __destroy(true_type, allocator_type& __a, _Tp* __p)
-            {__a.destroy(__p);}
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static void __destroy(false_type, allocator_type&, _Tp* __p)
-            {
-                __p->~_Tp();
-            }
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __max_size(true_type, const allocator_type& __a)
-            {return __a.max_size();}
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __max_size(false_type, const allocator_type&)
-            {return numeric_limits<size_type>::max();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static allocator_type
-        select_on_container_copy_construction(true_type, const allocator_type& __a)
-            {return __a.select_on_container_copy_construction();}
-    _LIBCPP_INLINE_VISIBILITY
-    static allocator_type
-        select_on_container_copy_construction(false_type, const allocator_type& __a)
-            {return __a;}
-};
-
-// allocator
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY allocator
-{
-public:
-    typedef size_t            size_type;
-    typedef ptrdiff_t         difference_type;
-    typedef _Tp*              pointer;
-    typedef const _Tp*        const_pointer;
-    typedef _Tp&              reference;
-    typedef const _Tp&        const_reference;
-    typedef _Tp               value_type;
-
-    typedef true_type propagate_on_container_move_assignment;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-
-    _LIBCPP_INLINE_VISIBILITY allocator() _NOEXCEPT {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY allocator(const allocator<_Up>&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY pointer address(reference __x) const _NOEXCEPT
-        {return _VSTD::addressof(__x);}
-    _LIBCPP_INLINE_VISIBILITY const_pointer address(const_reference __x) const _NOEXCEPT
-        {return _VSTD::addressof(__x);}
-    _LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, allocator<void>::const_pointer = 0)
-        {return static_cast<pointer>(_VSTD::__allocate(__n * sizeof(_Tp)));}
-    _LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type) _NOEXCEPT
-        {_VSTD::__deallocate((void*)__p);}
-    _LIBCPP_INLINE_VISIBILITY size_type max_size() const _NOEXCEPT
-        {return size_type(~0) / sizeof(_Tp);}
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class _Up, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(_Up* __p, _Args&&... __args)
-        {
-            ::new((void*)__p) _Up(_VSTD::forward<_Args>(__args)...);
-        }
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p)
-        {
-            ::new((void*)__p) _Tp();
-        }
-# if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0)
-        {
-            ::new((void*)__p) _Tp(__a0);
-        }
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0)
-        {
-            ::new((void*)__p) _Tp(__a0);
-        }
-# endif  // defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0, _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0, _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0, const _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0, const _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY void destroy(pointer __p) {__p->~_Tp();}
-};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY allocator<const _Tp>
-{
-public:
-    typedef size_t            size_type;
-    typedef ptrdiff_t         difference_type;
-    typedef const _Tp*        pointer;
-    typedef const _Tp*        const_pointer;
-    typedef const _Tp&        reference;
-    typedef const _Tp&        const_reference;
-    typedef const _Tp         value_type;
-
-    typedef true_type propagate_on_container_move_assignment;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-
-    _LIBCPP_INLINE_VISIBILITY allocator() _NOEXCEPT {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY allocator(const allocator<_Up>&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY const_pointer address(const_reference __x) const _NOEXCEPT
-        {return _VSTD::addressof(__x);}
-    _LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, allocator<void>::const_pointer = 0)
-        {return static_cast<pointer>(_VSTD::__allocate(__n * sizeof(_Tp)));}
-    _LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type) _NOEXCEPT
-        {_VSTD::__deallocate((void*)__p);}
-    _LIBCPP_INLINE_VISIBILITY size_type max_size() const _NOEXCEPT
-        {return size_type(~0) / sizeof(_Tp);}
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class _Up, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(_Up* __p, _Args&&... __args)
-        {
-            ::new((void*)__p) _Up(_VSTD::forward<_Args>(__args)...);
-        }
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p)
-        {
-            ::new((void*)__p) _Tp();
-        }
-# if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0)
-        {
-            ::new((void*)__p) _Tp(__a0);
-        }
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0)
-        {
-            ::new((void*)__p) _Tp(__a0);
-        }
-# endif  // defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0, _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0, _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0, const _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0, const _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY void destroy(pointer __p) {__p->~_Tp();}
-};
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator==(const allocator<_Tp>&, const allocator<_Up>&) _NOEXCEPT {return true;}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator!=(const allocator<_Tp>&, const allocator<_Up>&) _NOEXCEPT {return false;}
-
-template <class _OutputIterator, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY raw_storage_iterator
-    : public iterator<output_iterator_tag,
-                      _Tp,                                         // purposefully not C++03
-                      ptrdiff_t,                                   // purposefully not C++03
-                      _Tp*,                                        // purposefully not C++03
-                      raw_storage_iterator<_OutputIterator, _Tp>&> // purposefully not C++03
-{
-private:
-    _OutputIterator __x_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit raw_storage_iterator(_OutputIterator __x) : __x_(__x) {}
-    _LIBCPP_INLINE_VISIBILITY raw_storage_iterator& operator*() {return *this;}
-    _LIBCPP_INLINE_VISIBILITY raw_storage_iterator& operator=(const _Tp& __element)
-        {::new(&*__x_) _Tp(__element); return *this;}
-    _LIBCPP_INLINE_VISIBILITY raw_storage_iterator& operator++() {++__x_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY raw_storage_iterator  operator++(int)
-        {raw_storage_iterator __t(*this); ++__x_; return __t;}
-};
-
-template <class _Tp>
-pair<_Tp*, ptrdiff_t>
-get_temporary_buffer(ptrdiff_t __n) _NOEXCEPT
-{
-    pair<_Tp*, ptrdiff_t> __r(0, 0);
-    const ptrdiff_t __m = (~ptrdiff_t(0) ^
-                           ptrdiff_t(ptrdiff_t(1) << (sizeof(ptrdiff_t) * __CHAR_BIT__ - 1)))
-                           / sizeof(_Tp);
-    if (__n > __m)
-        __n = __m;
-    while (__n > 0)
-    {
-        __r.first = static_cast<_Tp*>(::operator new(__n * sizeof(_Tp), nothrow));
-        if (__r.first)
-        {
-            __r.second = __n;
-            break;
-        }
-        __n /= 2;
-    }
-    return __r;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void return_temporary_buffer(_Tp* __p) _NOEXCEPT {::operator delete(__p);}
-
-template <class _Tp>
-struct auto_ptr_ref
-{
-    _Tp* __ptr_;
-};
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY auto_ptr
-{
-private:
-    _Tp* __ptr_;
-public:
-    typedef _Tp element_type;
-
-    _LIBCPP_INLINE_VISIBILITY explicit auto_ptr(_Tp* __p = 0) throw() : __ptr_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY auto_ptr(auto_ptr& __p) throw() : __ptr_(__p.release()) {}
-    template<class _Up> _LIBCPP_INLINE_VISIBILITY auto_ptr(auto_ptr<_Up>& __p) throw()
-        : __ptr_(__p.release()) {}
-    _LIBCPP_INLINE_VISIBILITY auto_ptr& operator=(auto_ptr& __p) throw()
-        {reset(__p.release()); return *this;}
-    template<class _Up> _LIBCPP_INLINE_VISIBILITY auto_ptr& operator=(auto_ptr<_Up>& __p) throw()
-        {reset(__p.release()); return *this;}
-    _LIBCPP_INLINE_VISIBILITY auto_ptr& operator=(auto_ptr_ref<_Tp> __p) throw()
-        {reset(__p.__ptr_); return *this;}
-    _LIBCPP_INLINE_VISIBILITY ~auto_ptr() throw() {delete __ptr_;}
-
-    _LIBCPP_INLINE_VISIBILITY _Tp& operator*() const throw()
-        {return *__ptr_;}
-    _LIBCPP_INLINE_VISIBILITY _Tp* operator->() const throw() {return __ptr_;}
-    _LIBCPP_INLINE_VISIBILITY _Tp* get() const throw() {return __ptr_;}
-    _LIBCPP_INLINE_VISIBILITY _Tp* release() throw()
-    {
-        _Tp* __t = __ptr_;
-        __ptr_ = 0;
-        return __t;
-    }
-    _LIBCPP_INLINE_VISIBILITY void reset(_Tp* __p = 0) throw()
-    {
-        if (__ptr_ != __p)
-            delete __ptr_;
-        __ptr_ = __p;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY auto_ptr(auto_ptr_ref<_Tp> __p) throw() : __ptr_(__p.__ptr_) {}
-    template<class _Up> _LIBCPP_INLINE_VISIBILITY operator auto_ptr_ref<_Up>() throw()
-        {auto_ptr_ref<_Up> __t; __t.__ptr_ = release(); return __t;}
-    template<class _Up> _LIBCPP_INLINE_VISIBILITY operator auto_ptr<_Up>() throw()
-        {return auto_ptr<_Up>(release());}
-};
-
-template <>
-class _LIBCPP_TYPE_VIS_ONLY auto_ptr<void>
-{
-public:
-    typedef void element_type;
-};
-
-template <class _T1, class _T2, bool = is_same<typename remove_cv<_T1>::type,
-                                                     typename remove_cv<_T2>::type>::value,
-                                bool = is_empty<_T1>::value
-#if __has_feature(is_final)
-                                       && !__is_final(_T1)
-#endif
-                                ,
-                                bool = is_empty<_T2>::value
-#if __has_feature(is_final)
-                                       && !__is_final(_T2)
-#endif
-         >
-struct __libcpp_compressed_pair_switch;
-
-template <class _T1, class _T2, bool IsSame>
-struct __libcpp_compressed_pair_switch<_T1, _T2, IsSame, false, false> {enum {value = 0};};
-
-template <class _T1, class _T2, bool IsSame>
-struct __libcpp_compressed_pair_switch<_T1, _T2, IsSame, true, false>  {enum {value = 1};};
-
-template <class _T1, class _T2, bool IsSame>
-struct __libcpp_compressed_pair_switch<_T1, _T2, IsSame, false, true>  {enum {value = 2};};
-
-template <class _T1, class _T2>
-struct __libcpp_compressed_pair_switch<_T1, _T2, false, true, true>    {enum {value = 3};};
-
-template <class _T1, class _T2>
-struct __libcpp_compressed_pair_switch<_T1, _T2, true, true, true>     {enum {value = 1};};
-
-template <class _T1, class _T2, unsigned = __libcpp_compressed_pair_switch<_T1, _T2>::value>
-class __libcpp_compressed_pair_imp;
-
-template <class _T1, class _T2>
-class __libcpp_compressed_pair_imp<_T1, _T2, 0>
-{
-private:
-    _T1 __first_;
-    _T2 __second_;
-public:
-    typedef _T1 _T1_param;
-    typedef _T2 _T2_param;
-
-    typedef typename remove_reference<_T1>::type& _T1_reference;
-    typedef typename remove_reference<_T2>::type& _T2_reference;
-
-    typedef const typename remove_reference<_T1>::type& _T1_const_reference;
-    typedef const typename remove_reference<_T2>::type& _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T1_param __t1)
-        : __first_(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T2_param __t2)
-        : __second_(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp(_T1_param __t1, _T2_param __t2)
-        : __first_(_VSTD::forward<_T1_param>(__t1)), __second_(_VSTD::forward<_T2_param>(__t2)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : __first_(__p.first()),
-          __second_(__p.second()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            __first_ = __p.first();
-            __second_ = __p.second();
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : __first_(_VSTD::forward<_T1>(__p.first())),
-          __second_(_VSTD::forward<_T2>(__p.second())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            __first_ = _VSTD::forward<_T1>(__p.first());
-            __second_ = _VSTD::forward<_T2>(__p.second());
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        __libcpp_compressed_pair_imp(piecewise_construct_t __pc,
-                                     tuple<_Args1...> __first_args,
-                                     tuple<_Args2...> __second_args,
-                                     __tuple_indices<_I1...>,
-                                     __tuple_indices<_I2...>)
-            : __first_(_VSTD::forward<_Args1>(_VSTD::get<_I1>(__first_args))...),
-              __second_(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...)
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return __first_;}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return __first_;}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return __second_;}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return __second_;}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {
-        using _VSTD::swap;
-        swap(__first_, __x.__first_);
-        swap(__second_, __x.__second_);
-    }
-};
-
-template <class _T1, class _T2>
-class __libcpp_compressed_pair_imp<_T1, _T2, 1>
-    : private _T1
-{
-private:
-    _T2 __second_;
-public:
-    typedef _T1 _T1_param;
-    typedef _T2 _T2_param;
-
-    typedef _T1&                                        _T1_reference;
-    typedef typename remove_reference<_T2>::type& _T2_reference;
-
-    typedef const _T1&                                        _T1_const_reference;
-    typedef const typename remove_reference<_T2>::type& _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T1_param __t1)
-        : _T1(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T2_param __t2)
-        : __second_(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp(_T1_param __t1, _T2_param __t2)
-        : _T1(_VSTD::forward<_T1_param>(__t1)), __second_(_VSTD::forward<_T2_param>(__t2)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : _T1(__p.first()), __second_(__p.second()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            _T1::operator=(__p.first());
-            __second_ = __p.second();
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : _T1(_VSTD::move(__p.first())), __second_(_VSTD::forward<_T2>(__p.second())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            _T1::operator=(_VSTD::move(__p.first()));
-            __second_ = _VSTD::forward<_T2>(__p.second());
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        __libcpp_compressed_pair_imp(piecewise_construct_t __pc,
-                                     tuple<_Args1...> __first_args,
-                                     tuple<_Args2...> __second_args,
-                                     __tuple_indices<_I1...>,
-                                     __tuple_indices<_I2...>)
-            : _T1(_VSTD::forward<_Args1>(_VSTD::get<_I1>(__first_args))...),
-              __second_(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...)
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return __second_;}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return __second_;}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {
-        using _VSTD::swap;
-        swap(__second_, __x.__second_);
-    }
-};
-
-template <class _T1, class _T2>
-class __libcpp_compressed_pair_imp<_T1, _T2, 2>
-    : private _T2
-{
-private:
-    _T1 __first_;
-public:
-    typedef _T1 _T1_param;
-    typedef _T2 _T2_param;
-
-    typedef typename remove_reference<_T1>::type& _T1_reference;
-    typedef _T2&                                        _T2_reference;
-
-    typedef const typename remove_reference<_T1>::type& _T1_const_reference;
-    typedef const _T2&                                        _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T1_param __t1)
-        : __first_(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T2_param __t2)
-        : _T2(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp(_T1_param __t1, _T2_param __t2)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : _T2(_VSTD::forward<_T2_param>(__t2)), __first_(_VSTD::forward<_T1_param>(__t1)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : _T2(__p.second()), __first_(__p.first()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            _T2::operator=(__p.second());
-            __first_ = __p.first();
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : _T2(_VSTD::forward<_T2>(__p.second())), __first_(_VSTD::move(__p.first())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            _T2::operator=(_VSTD::forward<_T2>(__p.second()));
-            __first_ = _VSTD::move(__p.first());
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        __libcpp_compressed_pair_imp(piecewise_construct_t __pc,
-                                     tuple<_Args1...> __first_args,
-                                     tuple<_Args2...> __second_args,
-                                     __tuple_indices<_I1...>,
-                                     __tuple_indices<_I2...>)
-            : _T2(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...),
-              __first_(_VSTD::forward<_Args1>(_VSTD::get<_I1>(__first_args))...)
-              
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return __first_;}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return __first_;}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {
-        using _VSTD::swap;
-        swap(__first_, __x.__first_);
-    }
-};
-
-template <class _T1, class _T2>
-class __libcpp_compressed_pair_imp<_T1, _T2, 3>
-    : private _T1,
-      private _T2
-{
-public:
-    typedef _T1 _T1_param;
-    typedef _T2 _T2_param;
-
-    typedef _T1& _T1_reference;
-    typedef _T2& _T2_reference;
-
-    typedef const _T1& _T1_const_reference;
-    typedef const _T2& _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T1_param __t1)
-        : _T1(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T2_param __t2)
-        : _T2(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp(_T1_param __t1, _T2_param __t2)
-        : _T1(_VSTD::forward<_T1_param>(__t1)), _T2(_VSTD::forward<_T2_param>(__t2)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : _T1(__p.first()), _T2(__p.second()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            _T1::operator=(__p.first());
-            _T2::operator=(__p.second());
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : _T1(_VSTD::move(__p.first())), _T2(_VSTD::move(__p.second())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            _T1::operator=(_VSTD::move(__p.first()));
-            _T2::operator=(_VSTD::move(__p.second()));
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        __libcpp_compressed_pair_imp(piecewise_construct_t __pc,
-                                     tuple<_Args1...> __first_args,
-                                     tuple<_Args2...> __second_args,
-                                     __tuple_indices<_I1...>,
-                                     __tuple_indices<_I2...>)
-            : _T1(_VSTD::forward<_Args1>(_VSTD::get<_I1>(__first_args))...),
-              _T2(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...)
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp&)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {
-    }
-};
-
-template <class _T1, class _T2>
-class __compressed_pair
-    : private __libcpp_compressed_pair_imp<_T1, _T2>
-{
-    typedef __libcpp_compressed_pair_imp<_T1, _T2> base;
-public:
-    typedef typename base::_T1_param _T1_param;
-    typedef typename base::_T2_param _T2_param;
-
-    typedef typename base::_T1_reference _T1_reference;
-    typedef typename base::_T2_reference _T2_reference;
-
-    typedef typename base::_T1_const_reference _T1_const_reference;
-    typedef typename base::_T2_const_reference _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __compressed_pair() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __compressed_pair(_T1_param __t1)
-        : base(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __compressed_pair(_T2_param __t2)
-        : base(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __compressed_pair(_T1_param __t1, _T2_param __t2)
-        : base(_VSTD::forward<_T1_param>(__t1), _VSTD::forward<_T2_param>(__t2)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __compressed_pair(const __compressed_pair& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : base(__p) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __compressed_pair& operator=(const __compressed_pair& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            base::operator=(__p);
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __compressed_pair(__compressed_pair&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : base(_VSTD::move(__p)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __compressed_pair& operator=(__compressed_pair&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            base::operator=(_VSTD::move(__p));
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2>
-        _LIBCPP_INLINE_VISIBILITY
-        __compressed_pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args,
-                                                      tuple<_Args2...> __second_args)
-            : base(__pc, _VSTD::move(__first_args), _VSTD::move(__second_args),
-                   typename __make_tuple_indices<sizeof...(_Args1)>::type(),
-                   typename __make_tuple_indices<sizeof...(_Args2) >::type())
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return base::first();}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return base::first();}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return base::second();}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return base::second();}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__compressed_pair& __x)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-        {base::swap(__x);}
-};
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__compressed_pair<_T1, _T2>& __x, __compressed_pair<_T1, _T2>& __y)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {__x.swap(__y);}
-
-// __same_or_less_cv_qualified
-
-template <class _Ptr1, class _Ptr2,
-          bool = is_same<typename remove_cv<typename pointer_traits<_Ptr1>::element_type>::type,
-                         typename remove_cv<typename pointer_traits<_Ptr2>::element_type>::type
-                        >::value
-         >
-struct __same_or_less_cv_qualified_imp
-    : is_convertible<_Ptr1, _Ptr2> {};
-
-template <class _Ptr1, class _Ptr2>
-struct __same_or_less_cv_qualified_imp<_Ptr1, _Ptr2, false>
-    : false_type {};
-
-template <class _Ptr1, class _Ptr2, bool = is_pointer<_Ptr1>::value ||
-                                           is_same<_Ptr1, _Ptr2>::value ||
-                                           __has_element_type<_Ptr1>::value>
-struct __same_or_less_cv_qualified
-    : __same_or_less_cv_qualified_imp<_Ptr1, _Ptr2> {};
-
-template <class _Ptr1, class _Ptr2>
-struct __same_or_less_cv_qualified<_Ptr1, _Ptr2, false>
-    : false_type {};
-
-// default_delete
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY default_delete
-{
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT = default;
-#else
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT {}
-#endif
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY default_delete(const default_delete<_Up>&,
-             typename enable_if<is_convertible<_Up*, _Tp*>::value>::type* = 0) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY void operator() (_Tp* __ptr) const _NOEXCEPT
-        {
-            static_assert(sizeof(_Tp) > 0, "default_delete can not delete incomplete type");
-            static_assert(!is_void<_Tp>::value, "default_delete can not delete incomplete type");
-            delete __ptr;
-        }
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY default_delete<_Tp[]>
-{
-public:
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT = default;
-#else
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT {}
-#endif
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY default_delete(const default_delete<_Up[]>&,
-             typename enable_if<__same_or_less_cv_qualified<_Up*, _Tp*>::value>::type* = 0) _NOEXCEPT {}
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        void operator() (_Up* __ptr,
-                         typename enable_if<__same_or_less_cv_qualified<_Up*, _Tp*>::value>::type* = 0) const _NOEXCEPT
-        {
-            static_assert(sizeof(_Tp) > 0, "default_delete can not delete incomplete type");
-            static_assert(!is_void<_Tp>::value, "default_delete can not delete incomplete type");
-            delete [] __ptr;
-        }
-};
-
-template <class _Tp, class _Dp = default_delete<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY unique_ptr
-{
-public:
-    typedef _Tp element_type;
-    typedef _Dp deleter_type;
-    typedef typename __pointer_type<_Tp, deleter_type>::type pointer;
-private:
-    __compressed_pair<pointer, deleter_type> __ptr_;
-
-#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unique_ptr(unique_ptr&);
-    template <class _Up, class _Ep>
-        unique_ptr(unique_ptr<_Up, _Ep>&);
-    unique_ptr& operator=(unique_ptr&);
-    template <class _Up, class _Ep>
-        unique_ptr& operator=(unique_ptr<_Up, _Ep>&);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    struct __nat {int __for_bool_;};
-
-    typedef       typename remove_reference<deleter_type>::type& _Dp_reference;
-    typedef const typename remove_reference<deleter_type>::type& _Dp_const_reference;
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT
-        : __ptr_(pointer())
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT
-        : __ptr_(pointer())
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-    _LIBCPP_INLINE_VISIBILITY explicit unique_ptr(pointer __p) _NOEXCEPT
-        : __ptr_(_VSTD::move(__p))
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(pointer __p, typename conditional<
-                                        is_reference<deleter_type>::value,
-                                        deleter_type,
-                                        typename add_lvalue_reference<const deleter_type>::type>::type __d)
-             _NOEXCEPT
-        : __ptr_(__p, __d) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(pointer __p, typename remove_reference<deleter_type>::type&& __d)
-             _NOEXCEPT
-        : __ptr_(__p, _VSTD::move(__d))
-        {
-            static_assert(!is_reference<deleter_type>::value, "rvalue deleter bound to reference");
-        }
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(unique_ptr&& __u) _NOEXCEPT
-        : __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {}
-    template <class _Up, class _Ep>
-        _LIBCPP_INLINE_VISIBILITY
-        unique_ptr(unique_ptr<_Up, _Ep>&& __u,
-                   typename enable_if
-                      <
-                        !is_array<_Up>::value &&
-                         is_convertible<typename unique_ptr<_Up, _Ep>::pointer, pointer>::value &&
-                         is_convertible<_Ep, deleter_type>::value &&
-                         (
-                            !is_reference<deleter_type>::value ||
-                            is_same<deleter_type, _Ep>::value
-                         ),
-                         __nat
-                      >::type = __nat()) _NOEXCEPT
-            : __ptr_(__u.release(), _VSTD::forward<_Ep>(__u.get_deleter())) {}
-
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY unique_ptr(auto_ptr<_Up>&& __p,
-                typename enable_if<
-                                      is_convertible<_Up*, _Tp*>::value &&
-                                      is_same<_Dp, default_delete<_Tp> >::value,
-                                      __nat
-                                  >::type = __nat()) _NOEXCEPT
-            : __ptr_(__p.release())
-            {
-            }
-
-        _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT
-            {
-                reset(__u.release());
-                __ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());
-                return *this;
-            }
-
-        template <class _Up, class _Ep>
-            _LIBCPP_INLINE_VISIBILITY
-            typename enable_if
-            <
-                !is_array<_Up>::value &&
-                is_convertible<typename unique_ptr<_Up, _Ep>::pointer, pointer>::value &&
-                is_assignable<deleter_type&, _Ep&&>::value,
-                unique_ptr&
-            >::type
-            operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT
-            {
-                reset(__u.release());
-                __ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());
-                return *this;
-            }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY operator __rv<unique_ptr>()
-    {
-        return __rv<unique_ptr>(*this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(__rv<unique_ptr> __u)
-        : __ptr_(__u->release(), _VSTD::forward<deleter_type>(__u->get_deleter())) {}
-
-    template <class _Up, class _Ep>
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(unique_ptr<_Up, _Ep> __u)
-    {
-        reset(__u.release());
-        __ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(pointer __p, deleter_type __d)
-        : __ptr_(_VSTD::move(__p), _VSTD::move(__d)) {}
-
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-                typename enable_if<
-                                      is_convertible<_Up*, _Tp*>::value &&
-                                      is_same<_Dp, default_delete<_Tp> >::value,
-                                      unique_ptr&
-                                  >::type
-        operator=(auto_ptr<_Up> __p)
-            {reset(__p.release()); return *this;}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY ~unique_ptr() {reset();}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(nullptr_t) _NOEXCEPT
-    {
-        reset();
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY typename add_lvalue_reference<_Tp>::type operator*() const
-        {return *__ptr_.first();}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const _NOEXCEPT {return __ptr_.first();}
-    _LIBCPP_INLINE_VISIBILITY pointer get() const _NOEXCEPT {return __ptr_.first();}
-    _LIBCPP_INLINE_VISIBILITY       _Dp_reference get_deleter() _NOEXCEPT
-        {return __ptr_.second();}
-    _LIBCPP_INLINE_VISIBILITY _Dp_const_reference get_deleter() const _NOEXCEPT
-        {return __ptr_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT
-        {return __ptr_.first() != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY pointer release() _NOEXCEPT
-    {
-        pointer __t = __ptr_.first();
-        __ptr_.first() = pointer();
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY void reset(pointer __p = pointer()) _NOEXCEPT
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = __p;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY void swap(unique_ptr& __u) _NOEXCEPT
-        {__ptr_.swap(__u.__ptr_);}
-};
-
-template <class _Tp, class _Dp>
-class _LIBCPP_TYPE_VIS_ONLY unique_ptr<_Tp[], _Dp>
-{
-public:
-    typedef _Tp element_type;
-    typedef _Dp deleter_type;
-    typedef typename __pointer_type<_Tp, deleter_type>::type pointer;
-private:
-    __compressed_pair<pointer, deleter_type> __ptr_;
-
-#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unique_ptr(unique_ptr&);
-    template <class _Up>
-        unique_ptr(unique_ptr<_Up>&);
-    unique_ptr& operator=(unique_ptr&);
-    template <class _Up>
-        unique_ptr& operator=(unique_ptr<_Up>&);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    struct __nat {int __for_bool_;};
-
-    typedef       typename remove_reference<deleter_type>::type& _Dp_reference;
-    typedef const typename remove_reference<deleter_type>::type& _Dp_const_reference;
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT
-        : __ptr_(pointer())
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT
-        : __ptr_(pointer())
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp>
-    _LIBCPP_INLINE_VISIBILITY explicit unique_ptr(_Pp __p,
-            typename enable_if<__same_or_less_cv_qualified<_Pp, pointer>::value, __nat>::type = __nat()) _NOEXCEPT
-        : __ptr_(__p)
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-
-    template <class _Pp>
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(_Pp __p, typename conditional<
-                                       is_reference<deleter_type>::value,
-                                       deleter_type,
-                                       typename add_lvalue_reference<const deleter_type>::type>::type __d,
-                                       typename enable_if<__same_or_less_cv_qualified<_Pp, pointer>::value, __nat>::type = __nat())
-             _NOEXCEPT
-        : __ptr_(__p, __d) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(nullptr_t, typename conditional<
-                                       is_reference<deleter_type>::value,
-                                       deleter_type,
-                                       typename add_lvalue_reference<const deleter_type>::type>::type __d)
-             _NOEXCEPT
-        : __ptr_(pointer(), __d) {}
-
-    template <class _Pp>
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(_Pp __p,
-                                         typename remove_reference<deleter_type>::type&& __d,
-                                         typename enable_if<__same_or_less_cv_qualified<_Pp, pointer>::value, __nat>::type = __nat())
-             _NOEXCEPT
-        : __ptr_(__p, _VSTD::move(__d))
-        {
-            static_assert(!is_reference<deleter_type>::value, "rvalue deleter bound to reference");
-        }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(nullptr_t, typename remove_reference<deleter_type>::type&& __d)
-             _NOEXCEPT
-        : __ptr_(pointer(), _VSTD::move(__d))
-        {
-            static_assert(!is_reference<deleter_type>::value, "rvalue deleter bound to reference");
-        }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(unique_ptr&& __u) _NOEXCEPT
-        : __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT
-        {
-            reset(__u.release());
-            __ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());
-            return *this;
-        }
-
-    template <class _Up, class _Ep>
-        _LIBCPP_INLINE_VISIBILITY
-        unique_ptr(unique_ptr<_Up, _Ep>&& __u,
-                   typename enable_if
-                            <
-                                is_array<_Up>::value &&
-                                __same_or_less_cv_qualified<typename unique_ptr<_Up, _Ep>::pointer, pointer>::value
-                                && is_convertible<_Ep, deleter_type>::value &&
-                                (
-                                    !is_reference<deleter_type>::value ||
-                                    is_same<deleter_type, _Ep>::value
-                                ),
-                                __nat
-                            >::type = __nat()
-                  ) _NOEXCEPT
-        : __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {}
-
-
-        template <class _Up, class _Ep>
-            _LIBCPP_INLINE_VISIBILITY
-            typename enable_if
-            <
-                is_array<_Up>::value &&
-                __same_or_less_cv_qualified<typename unique_ptr<_Up, _Ep>::pointer, pointer>::value &&
-                is_assignable<deleter_type&, _Ep&&>::value,
-                unique_ptr&
-            >::type
-            operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT
-            {
-                reset(__u.release());
-                __ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());
-                return *this;
-            }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY explicit unique_ptr(pointer __p)
-        : __ptr_(__p)
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(pointer __p, deleter_type __d)
-        : __ptr_(__p, _VSTD::forward<deleter_type>(__d)) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(nullptr_t, deleter_type __d)
-        : __ptr_(pointer(), _VSTD::forward<deleter_type>(__d)) {}
-
-    _LIBCPP_INLINE_VISIBILITY operator __rv<unique_ptr>()
-    {
-        return __rv<unique_ptr>(*this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(__rv<unique_ptr> __u)
-        : __ptr_(__u->release(), _VSTD::forward<deleter_type>(__u->get_deleter())) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(__rv<unique_ptr> __u)
-    {
-        reset(__u->release());
-        __ptr_.second() = _VSTD::forward<deleter_type>(__u->get_deleter());
-        return *this;
-    }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY ~unique_ptr() {reset();}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(nullptr_t) _NOEXCEPT
-    {
-        reset();
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY typename add_lvalue_reference<_Tp>::type operator[](size_t __i) const
-        {return __ptr_.first()[__i];}
-    _LIBCPP_INLINE_VISIBILITY pointer get() const _NOEXCEPT {return __ptr_.first();}
-    _LIBCPP_INLINE_VISIBILITY       _Dp_reference get_deleter() _NOEXCEPT
-        {return __ptr_.second();}
-    _LIBCPP_INLINE_VISIBILITY _Dp_const_reference get_deleter() const _NOEXCEPT
-        {return __ptr_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT
-        {return __ptr_.first() != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY pointer release() _NOEXCEPT
-    {
-        pointer __t = __ptr_.first();
-        __ptr_.first() = pointer();
-        return __t;
-    }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__same_or_less_cv_qualified<_Pp, pointer>::value, void>::type
-    reset(_Pp __p) _NOEXCEPT
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = __p;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-    _LIBCPP_INLINE_VISIBILITY void reset(nullptr_t) _NOEXCEPT
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = nullptr;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-    _LIBCPP_INLINE_VISIBILITY void reset() _NOEXCEPT
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = nullptr;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY void reset(pointer __p = pointer())
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = __p;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY void swap(unique_ptr& __u) {__ptr_.swap(__u.__ptr_);}
-private:
-
-#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Up>
-        explicit unique_ptr(_Up);
-    template <class _Up>
-        unique_ptr(_Up __u,
-                   typename conditional<
-                                       is_reference<deleter_type>::value,
-                                       deleter_type,
-                                       typename add_lvalue_reference<const deleter_type>::type>::type,
-                   typename enable_if
-                      <
-                         is_convertible<_Up, pointer>::value,
-                         __nat
-                      >::type = __nat());
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-template <class _Tp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unique_ptr<_Tp, _Dp>& __x, unique_ptr<_Tp, _Dp>& __y) _NOEXCEPT {__x.swap(__y);}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return __x.get() == __y.get();}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__x == __y);}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y)
-{
-    typedef typename unique_ptr<_T1, _D1>::pointer _P1;
-    typedef typename unique_ptr<_T2, _D2>::pointer _P2;
-    typedef typename common_type<_P1, _P2>::type _V;
-    return less<_V>()(__x.get(), __y.get());
-}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return __y < __x;}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__y < __x);}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__x < __y);}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const unique_ptr<_T1, _D1>& __x, nullptr_t) _NOEXCEPT
-{
-    return !__x;
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(nullptr_t, const unique_ptr<_T1, _D1>& __x) _NOEXCEPT
-{
-    return !__x;
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unique_ptr<_T1, _D1>& __x, nullptr_t) _NOEXCEPT
-{
-    return static_cast<bool>(__x);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(nullptr_t, const unique_ptr<_T1, _D1>& __x) _NOEXCEPT
-{
-    return static_cast<bool>(__x);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const unique_ptr<_T1, _D1>& __x, nullptr_t)
-{
-    typedef typename unique_ptr<_T1, _D1>::pointer _P1;
-    return less<_P1>()(__x.get(), nullptr);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(nullptr_t, const unique_ptr<_T1, _D1>& __x)
-{
-    typedef typename unique_ptr<_T1, _D1>::pointer _P1;
-    return less<_P1>()(nullptr, __x.get());
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const unique_ptr<_T1, _D1>& __x, nullptr_t)
-{
-    return nullptr < __x;
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(nullptr_t, const unique_ptr<_T1, _D1>& __x)
-{
-    return __x < nullptr;
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const unique_ptr<_T1, _D1>& __x, nullptr_t)
-{
-    return !(nullptr < __x);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(nullptr_t, const unique_ptr<_T1, _D1>& __x)
-{
-    return !(__x < nullptr);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const unique_ptr<_T1, _D1>& __x, nullptr_t)
-{
-    return !(__x < nullptr);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(nullptr_t, const unique_ptr<_T1, _D1>& __x)
-{
-    return !(nullptr < __x);
-}
-
-#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-unique_ptr<_Tp, _Dp>
-move(unique_ptr<_Tp, _Dp>& __t)
-{
-    return unique_ptr<_Tp, _Dp>(__rv<unique_ptr<_Tp, _Dp> >(__t));
-}
-
-#endif
-
-#if _LIBCPP_STD_VER > 11
-
-template<class _Tp>
-struct __unique_if
-{
-    typedef unique_ptr<_Tp> __unique_single;
-};
-
-template<class _Tp>
-struct __unique_if<_Tp[]>
-{
-    typedef unique_ptr<_Tp[]> __unique_array_unknown_bound;
-};
-
-template<class _Tp, size_t _Np>
-struct __unique_if<_Tp[_Np]>
-{
-    typedef void __unique_array_known_bound;
-};
-
-template<class _Tp, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __unique_if<_Tp>::__unique_single
-make_unique(_Args&&... __args)
-{
-    return unique_ptr<_Tp>(new _Tp(_VSTD::forward<_Args>(__args)...));
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __unique_if<_Tp>::__unique_array_unknown_bound
-make_unique(size_t __n)
-{
-    typedef typename remove_extent<_Tp>::type _Up;
-    return unique_ptr<_Tp>(new _Up[__n]());
-}
-
-template<class _Tp, class... _Args>
-    typename __unique_if<_Tp>::__unique_array_known_bound
-    make_unique(_Args&&...) = delete;
-
-#endif  // _LIBCPP_STD_VER > 11
-
-template <class _Tp> struct hash;
-
-template <class _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_Size
-__loadword(const void* __p)
-{
-    _Size __r;
-    std::memcpy(&__r, __p, sizeof(__r));
-    return __r;
-}
-
-// We use murmur2 when size_t is 32 bits, and cityhash64 when size_t
-// is 64 bits.  This is because cityhash64 uses 64bit x 64bit
-// multiplication, which can be very slow on 32-bit systems.
-template <class _Size, size_t = sizeof(_Size)*__CHAR_BIT__>
-struct __murmur2_or_cityhash;
-
-template <class _Size>
-struct __murmur2_or_cityhash<_Size, 32>
-{
-    _Size operator()(const void* __key, _Size __len);
-};
-
-// murmur2
-template <class _Size>
-_Size
-__murmur2_or_cityhash<_Size, 32>::operator()(const void* __key, _Size __len)
-{
-    const _Size __m = 0x5bd1e995;
-    const _Size __r = 24;
-    _Size __h = __len;
-    const unsigned char* __data = static_cast<const unsigned char*>(__key);
-    for (; __len >= 4; __data += 4, __len -= 4)
-    {
-        _Size __k = __loadword<_Size>(__data);
-        __k *= __m;
-        __k ^= __k >> __r;
-        __k *= __m;
-        __h *= __m;
-        __h ^= __k;
-    }
-    switch (__len)
-    {
-    case 3:
-        __h ^= __data[2] << 16;
-    case 2:
-        __h ^= __data[1] << 8;
-    case 1:
-        __h ^= __data[0];
-        __h *= __m;
-    }
-    __h ^= __h >> 13;
-    __h *= __m;
-    __h ^= __h >> 15;
-    return __h;
-}
-
-template <class _Size>
-struct __murmur2_or_cityhash<_Size, 64>
-{
-    _Size operator()(const void* __key, _Size __len);
-
- private:
-  // Some primes between 2^63 and 2^64.
-  static const _Size __k0 = 0xc3a5c85c97cb3127ULL;
-  static const _Size __k1 = 0xb492b66fbe98f273ULL;
-  static const _Size __k2 = 0x9ae16a3b2f90404fULL;
-  static const _Size __k3 = 0xc949d7c7509e6557ULL;
-
-  static _Size __rotate(_Size __val, int __shift) {
-    return __shift == 0 ? __val : ((__val >> __shift) | (__val << (64 - __shift)));
-  }
-
-  static _Size __rotate_by_at_least_1(_Size __val, int __shift) {
-    return (__val >> __shift) | (__val << (64 - __shift));
-  }
-
-  static _Size __shift_mix(_Size __val) {
-    return __val ^ (__val >> 47);
-  }
-
-  static _Size __hash_len_16(_Size __u, _Size __v) {
-    const _Size __mul = 0x9ddfea08eb382d69ULL;
-    _Size __a = (__u ^ __v) * __mul;
-    __a ^= (__a >> 47);
-    _Size __b = (__v ^ __a) * __mul;
-    __b ^= (__b >> 47);
-    __b *= __mul;
-    return __b;
-  }
-
-  static _Size __hash_len_0_to_16(const char* __s, _Size __len) {
-    if (__len > 8) {
-      const _Size __a = __loadword<_Size>(__s);
-      const _Size __b = __loadword<_Size>(__s + __len - 8);
-      return __hash_len_16(__a, __rotate_by_at_least_1(__b + __len, __len)) ^ __b;
-    }
-    if (__len >= 4) {
-      const uint32_t __a = __loadword<uint32_t>(__s);
-      const uint32_t __b = __loadword<uint32_t>(__s + __len - 4);
-      return __hash_len_16(__len + (__a << 3), __b);
-    }
-    if (__len > 0) {
-      const unsigned char __a = __s[0];
-      const unsigned char __b = __s[__len >> 1];
-      const unsigned char __c = __s[__len - 1];
-      const uint32_t __y = static_cast<uint32_t>(__a) +
-                           (static_cast<uint32_t>(__b) << 8);
-      const uint32_t __z = __len + (static_cast<uint32_t>(__c) << 2);
-      return __shift_mix(__y * __k2 ^ __z * __k3) * __k2;
-    }
-    return __k2;
-  }
-
-  static _Size __hash_len_17_to_32(const char *__s, _Size __len) {
-    const _Size __a = __loadword<_Size>(__s) * __k1;
-    const _Size __b = __loadword<_Size>(__s + 8);
-    const _Size __c = __loadword<_Size>(__s + __len - 8) * __k2;
-    const _Size __d = __loadword<_Size>(__s + __len - 16) * __k0;
-    return __hash_len_16(__rotate(__a - __b, 43) + __rotate(__c, 30) + __d,
-                         __a + __rotate(__b ^ __k3, 20) - __c + __len);
-  }
-
-  // Return a 16-byte hash for 48 bytes.  Quick and dirty.
-  // Callers do best to use "random-looking" values for a and b.
-  static pair<_Size, _Size> __weak_hash_len_32_with_seeds(
-      _Size __w, _Size __x, _Size __y, _Size __z, _Size __a, _Size __b) {
-    __a += __w;
-    __b = __rotate(__b + __a + __z, 21);
-    const _Size __c = __a;
-    __a += __x;
-    __a += __y;
-    __b += __rotate(__a, 44);
-    return pair<_Size, _Size>(__a + __z, __b + __c);
-  }
-
-  // Return a 16-byte hash for s[0] ... s[31], a, and b.  Quick and dirty.
-  static pair<_Size, _Size> __weak_hash_len_32_with_seeds(
-      const char* __s, _Size __a, _Size __b) {
-    return __weak_hash_len_32_with_seeds(__loadword<_Size>(__s),
-                                         __loadword<_Size>(__s + 8),
-                                         __loadword<_Size>(__s + 16),
-                                         __loadword<_Size>(__s + 24),
-                                         __a,
-                                         __b);
-  }
-
-  // Return an 8-byte hash for 33 to 64 bytes.
-  static _Size __hash_len_33_to_64(const char *__s, size_t __len) {
-    _Size __z = __loadword<_Size>(__s + 24);
-    _Size __a = __loadword<_Size>(__s) +
-                (__len + __loadword<_Size>(__s + __len - 16)) * __k0;
-    _Size __b = __rotate(__a + __z, 52);
-    _Size __c = __rotate(__a, 37);
-    __a += __loadword<_Size>(__s + 8);
-    __c += __rotate(__a, 7);
-    __a += __loadword<_Size>(__s + 16);
-    _Size __vf = __a + __z;
-    _Size __vs = __b + __rotate(__a, 31) + __c;
-    __a = __loadword<_Size>(__s + 16) + __loadword<_Size>(__s + __len - 32);
-    __z += __loadword<_Size>(__s + __len - 8);
-    __b = __rotate(__a + __z, 52);
-    __c = __rotate(__a, 37);
-    __a += __loadword<_Size>(__s + __len - 24);
-    __c += __rotate(__a, 7);
-    __a += __loadword<_Size>(__s + __len - 16);
-    _Size __wf = __a + __z;
-    _Size __ws = __b + __rotate(__a, 31) + __c;
-    _Size __r = __shift_mix((__vf + __ws) * __k2 + (__wf + __vs) * __k0);
-    return __shift_mix(__r * __k0 + __vs) * __k2;
-  }
-};
-
-// cityhash64
-template <class _Size>
-_Size
-__murmur2_or_cityhash<_Size, 64>::operator()(const void* __key, _Size __len)
-{
-  const char* __s = static_cast<const char*>(__key);
-  if (__len <= 32) {
-    if (__len <= 16) {
-      return __hash_len_0_to_16(__s, __len);
-    } else {
-      return __hash_len_17_to_32(__s, __len);
-    }
-  } else if (__len <= 64) {
-    return __hash_len_33_to_64(__s, __len);
-  }
-
-  // For strings over 64 bytes we hash the end first, and then as we
-  // loop we keep 56 bytes of state: v, w, x, y, and z.
-  _Size __x = __loadword<_Size>(__s + __len - 40);
-  _Size __y = __loadword<_Size>(__s + __len - 16) +
-              __loadword<_Size>(__s + __len - 56);
-  _Size __z = __hash_len_16(__loadword<_Size>(__s + __len - 48) + __len,
-                          __loadword<_Size>(__s + __len - 24));
-  pair<_Size, _Size> __v = __weak_hash_len_32_with_seeds(__s + __len - 64, __len, __z);
-  pair<_Size, _Size> __w = __weak_hash_len_32_with_seeds(__s + __len - 32, __y + __k1, __x);
-  __x = __x * __k1 + __loadword<_Size>(__s);
-
-  // Decrease len to the nearest multiple of 64, and operate on 64-byte chunks.
-  __len = (__len - 1) & ~static_cast<_Size>(63);
-  do {
-    __x = __rotate(__x + __y + __v.first + __loadword<_Size>(__s + 8), 37) * __k1;
-    __y = __rotate(__y + __v.second + __loadword<_Size>(__s + 48), 42) * __k1;
-    __x ^= __w.second;
-    __y += __v.first + __loadword<_Size>(__s + 40);
-    __z = __rotate(__z + __w.first, 33) * __k1;
-    __v = __weak_hash_len_32_with_seeds(__s, __v.second * __k1, __x + __w.first);
-    __w = __weak_hash_len_32_with_seeds(__s + 32, __z + __w.second,
-                                        __y + __loadword<_Size>(__s + 16));
-    std::swap(__z, __x);
-    __s += 64;
-    __len -= 64;
-  } while (__len != 0);
-  return __hash_len_16(
-      __hash_len_16(__v.first, __w.first) + __shift_mix(__y) * __k1 + __z,
-      __hash_len_16(__v.second, __w.second) + __x);
-}
-
-template <class _Tp, size_t = sizeof(_Tp) / sizeof(size_t)>
-struct __scalar_hash;
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 0>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp    __t;
-            size_t __a;
-        } __u;
-        __u.__a = 0;
-        __u.__t = __v;
-        return __u.__a;
-    }
-};
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 1>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp    __t;
-            size_t __a;
-        } __u;
-        __u.__t = __v;
-        return __u.__a;
-    }
-};
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 2>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-            };
-        } __u;
-        __u.__t = __v;
-        return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u));
-    }
-};
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 3>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-                size_t __c;
-            };
-        } __u;
-        __u.__t = __v;
-        return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u));
-    }
-};
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 4>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-                size_t __c;
-                size_t __d;
-            };
-        } __u;
-        __u.__t = __v;
-        return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u));
-    }
-};
-
-template<class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY hash<_Tp*>
-    : public unary_function<_Tp*, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp* __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp* __t;
-            size_t __a;
-        } __u;
-        __u.__t = __v;
-        return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u));
-    }
-};
-
-template <class _Tp, class _Dp>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unique_ptr<_Tp, _Dp> >
-{
-    typedef unique_ptr<_Tp, _Dp> argument_type;
-    typedef size_t               result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()(const argument_type& __ptr) const _NOEXCEPT
-    {
-        typedef typename argument_type::pointer pointer;
-        return hash<pointer>()(__ptr.get());
-    }
-};
-
-struct __destruct_n
-{
-private:
-    size_t size;
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __process(_Tp* __p, false_type) _NOEXCEPT
-        {for (size_t __i = 0; __i < size; ++__i, ++__p) __p->~_Tp();}
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __process(_Tp*, true_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY void __incr(false_type) _NOEXCEPT
-        {++size;}
-    _LIBCPP_INLINE_VISIBILITY void __incr(true_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY void __set(size_t __s, false_type) _NOEXCEPT
-        {size = __s;}
-    _LIBCPP_INLINE_VISIBILITY void __set(size_t, true_type) _NOEXCEPT
-        {}
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit __destruct_n(size_t __s) _NOEXCEPT
-        : size(__s) {}
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __incr(_Tp*) _NOEXCEPT
-        {__incr(integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __set(size_t __s, _Tp*) _NOEXCEPT
-        {__set(__s, integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void operator()(_Tp* __p) _NOEXCEPT
-        {__process(__p, integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
-};
-
-template <class _Alloc>
-class __allocator_destructor
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-public:
-    typedef typename __alloc_traits::pointer pointer;
-    typedef typename __alloc_traits::size_type size_type;
-private:
-    _Alloc& __alloc_;
-    size_type __s_;
-public:
-    _LIBCPP_INLINE_VISIBILITY __allocator_destructor(_Alloc& __a, size_type __s)
-             _NOEXCEPT
-        : __alloc_(__a), __s_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-        {__alloc_traits::deallocate(__alloc_, __p, __s_);}
-};
-
-template <class _InputIterator, class _ForwardIterator>
-_ForwardIterator
-uninitialized_copy(_InputIterator __f, _InputIterator __l, _ForwardIterator __r)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    _ForwardIterator __s = __r;
-    try
-    {
-#endif
-        for (; __f != __l; ++__f, ++__r)
-            ::new(&*__r) value_type(*__f);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        for (; __s != __r; ++__s)
-            __s->~value_type();
-        throw;
-    }
-#endif
-    return __r;
-}
-
-template <class _InputIterator, class _Size, class _ForwardIterator>
-_ForwardIterator
-uninitialized_copy_n(_InputIterator __f, _Size __n, _ForwardIterator __r)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    _ForwardIterator __s = __r;
-    try
-    {
-#endif
-        for (; __n > 0; ++__f, ++__r, --__n)
-            ::new(&*__r) value_type(*__f);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        for (; __s != __r; ++__s)
-            __s->~value_type();
-        throw;
-    }
-#endif
-    return __r;
-}
-
-template <class _ForwardIterator, class _Tp>
-void
-uninitialized_fill(_ForwardIterator __f, _ForwardIterator __l, const _Tp& __x)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    _ForwardIterator __s = __f;
-    try
-    {
-#endif
-        for (; __f != __l; ++__f)
-            ::new(&*__f) value_type(__x);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        for (; __s != __f; ++__s)
-            __s->~value_type();
-        throw;
-    }
-#endif
-}
-
-template <class _ForwardIterator, class _Size, class _Tp>
-_ForwardIterator
-uninitialized_fill_n(_ForwardIterator __f, _Size __n, const _Tp& __x)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    _ForwardIterator __s = __f;
-    try
-    {
-#endif
-        for (; __n > 0; ++__f, --__n)
-            ::new(&*__f) value_type(__x);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        for (; __s != __f; ++__s)
-            __s->~value_type();
-        throw;
-    }
-#endif
-    return __f;
-}
-
-class _LIBCPP_EXCEPTION_ABI bad_weak_ptr
-    : public std::exception
-{
-public:
-    virtual ~bad_weak_ptr() _NOEXCEPT;
-    virtual const char* what() const  _NOEXCEPT;
-};
-
-template<class _Tp> class _LIBCPP_TYPE_VIS_ONLY weak_ptr;
-
-class _LIBCPP_TYPE_VIS __shared_count
-{
-    __shared_count(const __shared_count&);
-    __shared_count& operator=(const __shared_count&);
-
-protected:
-    long __shared_owners_;
-    virtual ~__shared_count();
-private:
-    virtual void __on_zero_shared() _NOEXCEPT = 0;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __shared_count(long __refs = 0) _NOEXCEPT
-        : __shared_owners_(__refs) {}
-
-    void __add_shared() _NOEXCEPT;
-    bool __release_shared() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    long use_count() const _NOEXCEPT {return __shared_owners_ + 1;}
-};
-
-class _LIBCPP_TYPE_VIS __shared_weak_count
-    : private __shared_count
-{
-    long __shared_weak_owners_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __shared_weak_count(long __refs = 0) _NOEXCEPT
-        : __shared_count(__refs),
-          __shared_weak_owners_(__refs) {}
-protected:
-    virtual ~__shared_weak_count();
-
-public:
-    void __add_shared() _NOEXCEPT;
-    void __add_weak() _NOEXCEPT;
-    void __release_shared() _NOEXCEPT;
-    void __release_weak() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    long use_count() const _NOEXCEPT {return __shared_count::use_count();}
-    __shared_weak_count* lock() _NOEXCEPT;
-
-    // Define the function out only if we build static libc++ without RTTI.
-    // Otherwise we may break clients who need to compile their projects with
-    // -fno-rtti and yet link against a libc++.dylib compiled
-    // without -fno-rtti.
-#if !defined(_LIBCPP_NO_RTTI) || !defined(_LIBCPP_BUILD_STATIC)
-    virtual const void* __get_deleter(const type_info&) const _NOEXCEPT;
-#endif
-private:
-    virtual void __on_zero_shared_weak() _NOEXCEPT = 0;
-};
-
-template <class _Tp, class _Dp, class _Alloc>
-class __shared_ptr_pointer
-    : public __shared_weak_count
-{
-    __compressed_pair<__compressed_pair<_Tp, _Dp>, _Alloc> __data_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __shared_ptr_pointer(_Tp __p, _Dp __d, _Alloc __a)
-        :  __data_(__compressed_pair<_Tp, _Dp>(__p, _VSTD::move(__d)), _VSTD::move(__a)) {}
-
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* __get_deleter(const type_info&) const _NOEXCEPT;
-#endif
-
-private:
-    virtual void __on_zero_shared() _NOEXCEPT;
-    virtual void __on_zero_shared_weak() _NOEXCEPT;
-};
-
-#ifndef _LIBCPP_NO_RTTI
-
-template <class _Tp, class _Dp, class _Alloc>
-const void*
-__shared_ptr_pointer<_Tp, _Dp, _Alloc>::__get_deleter(const type_info& __t) const _NOEXCEPT
-{
-    return __t == typeid(_Dp) ? _VSTD::addressof(__data_.first().second()) : 0;
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template <class _Tp, class _Dp, class _Alloc>
-void
-__shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    __data_.first().second()(__data_.first().first());
-    __data_.first().second().~_Dp();
-}
-
-template <class _Tp, class _Dp, class _Alloc>
-void
-__shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __shared_ptr_pointer>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-
-    _A __a(__data_.second());
-    __data_.second().~_Alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template <class _Tp, class _Alloc>
-class __shared_ptr_emplace
-    : public __shared_weak_count
-{
-    __compressed_pair<_Alloc, _Tp> __data_;
-public:
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY
-    __shared_ptr_emplace(_Alloc __a)
-        :  __data_(_VSTD::move(__a)) {}
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        __shared_ptr_emplace(_Alloc __a, _Args&& ...__args)
-            :  __data_(piecewise_construct, _VSTD::forward_as_tuple(__a),
-                   _VSTD::forward_as_tuple(_VSTD::forward<_Args>(__args)...)) {}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY
-    __shared_ptr_emplace(_Alloc __a)
-        :  __data_(__a) {}
-
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        __shared_ptr_emplace(_Alloc __a, _A0& __a0)
-            :  __data_(__a, _Tp(__a0)) {}
-
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        __shared_ptr_emplace(_Alloc __a, _A0& __a0, _A1& __a1)
-            :  __data_(__a, _Tp(__a0, __a1)) {}
-
-    template <class _A0, class _A1, class _A2>
-        _LIBCPP_INLINE_VISIBILITY
-        __shared_ptr_emplace(_Alloc __a, _A0& __a0, _A1& __a1, _A2& __a2)
-            :  __data_(__a, _Tp(__a0, __a1, __a2)) {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-private:
-    virtual void __on_zero_shared() _NOEXCEPT;
-    virtual void __on_zero_shared_weak() _NOEXCEPT;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* get() _NOEXCEPT {return &__data_.second();}
-};
-
-template <class _Tp, class _Alloc>
-void
-__shared_ptr_emplace<_Tp, _Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    __data_.second().~_Tp();
-}
-
-template <class _Tp, class _Alloc>
-void
-__shared_ptr_emplace<_Tp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _A __a(__data_.first());
-    __data_.first().~_Alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template<class _Tp> class _LIBCPP_TYPE_VIS_ONLY enable_shared_from_this;
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY shared_ptr
-{
-public:
-    typedef _Tp element_type;
-private:
-    element_type*      __ptr_;
-    __shared_weak_count* __cntrl_;
-
-    struct __nat {int __for_bool_;};
-public:
-    _LIBCPP_CONSTEXPR shared_ptr() _NOEXCEPT;
-    _LIBCPP_CONSTEXPR shared_ptr(nullptr_t) _NOEXCEPT;
-    template<class _Yp>
-        explicit shared_ptr(_Yp* __p,
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-    template<class _Yp, class _Dp>
-        shared_ptr(_Yp* __p, _Dp __d,
-                   typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-    template<class _Yp, class _Dp, class _Alloc>
-        shared_ptr(_Yp* __p, _Dp __d, _Alloc __a,
-                   typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-    template <class _Dp> shared_ptr(nullptr_t __p, _Dp __d);
-    template <class _Dp, class _Alloc> shared_ptr(nullptr_t __p, _Dp __d, _Alloc __a);
-    template<class _Yp> shared_ptr(const shared_ptr<_Yp>& __r, element_type* __p) _NOEXCEPT;
-    shared_ptr(const shared_ptr& __r) _NOEXCEPT;
-    template<class _Yp>
-        shared_ptr(const shared_ptr<_Yp>& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type = __nat())
-                       _NOEXCEPT;
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    shared_ptr(shared_ptr&& __r) _NOEXCEPT;
-    template<class _Yp> shared_ptr(shared_ptr<_Yp>&& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type = __nat())
-                       _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template<class _Yp> explicit shared_ptr(const weak_ptr<_Yp>& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type= __nat());
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template<class _Yp>
-        shared_ptr(auto_ptr<_Yp>&& __r,
-                   typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-#else
-    template<class _Yp>
-        shared_ptr(auto_ptr<_Yp> __r,
-                   typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-#endif
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Yp, class _Dp>
-        shared_ptr(unique_ptr<_Yp, _Dp>&&,
-                   typename enable_if
-                   <
-                       !is_lvalue_reference<_Dp>::value &&
-                       !is_array<_Yp>::value &&
-                       is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                       __nat
-                   >::type = __nat());
-    template <class _Yp, class _Dp>
-        shared_ptr(unique_ptr<_Yp, _Dp>&&,
-                   typename enable_if
-                   <
-                       is_lvalue_reference<_Dp>::value &&
-                       !is_array<_Yp>::value &&
-                       is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                       __nat
-                   >::type = __nat());
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Yp, class _Dp>
-        shared_ptr(unique_ptr<_Yp, _Dp>,
-                   typename enable_if
-                   <
-                       !is_lvalue_reference<_Dp>::value &&
-                       !is_array<_Yp>::value &&
-                       is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                       __nat
-                   >::type = __nat());
-    template <class _Yp, class _Dp>
-        shared_ptr(unique_ptr<_Yp, _Dp>,
-                   typename enable_if
-                   <
-                       is_lvalue_reference<_Dp>::value &&
-                       !is_array<_Yp>::value &&
-                       is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                       __nat
-                   >::type = __nat());
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    ~shared_ptr();
-
-    shared_ptr& operator=(const shared_ptr& __r) _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            shared_ptr&
-        >::type
-        operator=(const shared_ptr<_Yp>& __r) _NOEXCEPT;
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    shared_ptr& operator=(shared_ptr&& __r) _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            shared_ptr<_Tp>&
-        >::type
-        operator=(shared_ptr<_Yp>&& __r);
-    template<class _Yp>
-        typename enable_if
-        <
-            !is_array<_Yp>::value &&
-            is_convertible<_Yp*, element_type*>::value,
-            shared_ptr
-        >::type&
-        operator=(auto_ptr<_Yp>&& __r);
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template<class _Yp>
-        typename enable_if
-        <
-            !is_array<_Yp>::value &&
-            is_convertible<_Yp*, element_type*>::value,
-            shared_ptr&
-        >::type
-        operator=(auto_ptr<_Yp> __r);
-#endif
-    template <class _Yp, class _Dp>
-        typename enable_if
-        <
-            !is_array<_Yp>::value &&
-            is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-            shared_ptr&
-        >::type
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        operator=(unique_ptr<_Yp, _Dp>&& __r);
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        operator=(unique_ptr<_Yp, _Dp> __r);
-#endif
-
-    void swap(shared_ptr& __r) _NOEXCEPT;
-    void reset() _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            void
-        >::type
-        reset(_Yp* __p);
-    template<class _Yp, class _Dp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            void
-        >::type
-        reset(_Yp* __p, _Dp __d);
-    template<class _Yp, class _Dp, class _Alloc>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            void
-        >::type
-        reset(_Yp* __p, _Dp __d, _Alloc __a);
-
-    _LIBCPP_INLINE_VISIBILITY
-    element_type* get() const _NOEXCEPT {return __ptr_;}
-    _LIBCPP_INLINE_VISIBILITY
-    typename add_lvalue_reference<element_type>::type operator*() const _NOEXCEPT
-        {return *__ptr_;}
-    _LIBCPP_INLINE_VISIBILITY
-    element_type* operator->() const _NOEXCEPT {return __ptr_;}
-    _LIBCPP_INLINE_VISIBILITY
-    long use_count() const _NOEXCEPT {return __cntrl_ ? __cntrl_->use_count() : 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool unique() const _NOEXCEPT {return use_count() == 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT {return get() != 0;}
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        bool owner_before(shared_ptr<_Up> const& __p) const
-        {return __cntrl_ < __p.__cntrl_;}
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        bool owner_before(weak_ptr<_Up> const& __p) const
-        {return __cntrl_ < __p.__cntrl_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool
-    __owner_equivalent(const shared_ptr& __p) const
-        {return __cntrl_ == __p.__cntrl_;}
-
-#ifndef _LIBCPP_NO_RTTI
-    template <class _Dp>
-        _LIBCPP_INLINE_VISIBILITY
-        _Dp* __get_deleter() const _NOEXCEPT
-            {return (_Dp*)(__cntrl_ ? __cntrl_->__get_deleter(typeid(_Dp)) : 0);}
-#endif  // _LIBCPP_NO_RTTI
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template<class ..._Args>
-        static
-        shared_ptr<_Tp>
-        make_shared(_Args&& ...__args);
-
-    template<class _Alloc, class ..._Args>
-        static
-        shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a, _Args&& ...__args);
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-    static shared_ptr<_Tp> make_shared();
-
-    template<class _A0>
-        static shared_ptr<_Tp> make_shared(_A0&);
-
-    template<class _A0, class _A1>
-        static shared_ptr<_Tp> make_shared(_A0&, _A1&);
-
-    template<class _A0, class _A1, class _A2>
-        static shared_ptr<_Tp> make_shared(_A0&, _A1&, _A2&);
-
-    template<class _Alloc>
-        static shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a);
-
-    template<class _Alloc, class _A0>
-        static shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a, _A0& __a0);
-
-    template<class _Alloc, class _A0, class _A1>
-        static shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1);
-
-    template<class _Alloc, class _A0, class _A1, class _A2>
-        static shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1, _A2& __a2);
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-private:
-
-    template <class _Yp>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        __enable_weak_this(const enable_shared_from_this<_Yp>* __e) _NOEXCEPT
-        {
-            if (__e)
-                __e->__weak_this_ = *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __enable_weak_this(const void*) _NOEXCEPT {}
-
-    template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY shared_ptr;
-    template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY weak_ptr;
-};
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-shared_ptr<_Tp>::shared_ptr() _NOEXCEPT
-    : __ptr_(0),
-      __cntrl_(0)
-{
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-shared_ptr<_Tp>::shared_ptr(nullptr_t) _NOEXCEPT
-    : __ptr_(0),
-      __cntrl_(0)
-{
-}
-
-template<class _Tp>
-template<class _Yp>
-shared_ptr<_Tp>::shared_ptr(_Yp* __p,
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type)
-    : __ptr_(__p)
-{
-    unique_ptr<_Yp> __hold(__p);
-    typedef __shared_ptr_pointer<_Yp*, default_delete<_Yp>, allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__p, default_delete<_Yp>(), allocator<_Yp>());
-    __hold.release();
-    __enable_weak_this(__p);
-}
-
-template<class _Tp>
-template<class _Yp, class _Dp>
-shared_ptr<_Tp>::shared_ptr(_Yp* __p, _Dp __d,
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type)
-    : __ptr_(__p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typedef __shared_ptr_pointer<_Yp*, _Dp, allocator<_Yp> > _CntrlBlk;
-        __cntrl_ = new _CntrlBlk(__p, __d, allocator<_Yp>());
-        __enable_weak_this(__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __d(__p);
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Tp>
-template<class _Dp>
-shared_ptr<_Tp>::shared_ptr(nullptr_t __p, _Dp __d)
-    : __ptr_(0)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typedef __shared_ptr_pointer<nullptr_t, _Dp, allocator<_Tp> > _CntrlBlk;
-        __cntrl_ = new _CntrlBlk(__p, __d, allocator<_Tp>());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __d(__p);
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Tp>
-template<class _Yp, class _Dp, class _Alloc>
-shared_ptr<_Tp>::shared_ptr(_Yp* __p, _Dp __d, _Alloc __a,
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type)
-    : __ptr_(__p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typedef __shared_ptr_pointer<_Yp*, _Dp, _Alloc> _CntrlBlk;
-        typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _A2;
-        typedef __allocator_destructor<_A2> _D2;
-        _A2 __a2(__a);
-        unique_ptr<_CntrlBlk, _D2> __hold2(__a2.allocate(1), _D2(__a2, 1));
-        ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-            _CntrlBlk(__p, __d, __a);
-        __cntrl_ = _VSTD::addressof(*__hold2.release());
-        __enable_weak_this(__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __d(__p);
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Tp>
-template<class _Dp, class _Alloc>
-shared_ptr<_Tp>::shared_ptr(nullptr_t __p, _Dp __d, _Alloc __a)
-    : __ptr_(0)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typedef __shared_ptr_pointer<nullptr_t, _Dp, _Alloc> _CntrlBlk;
-        typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _A2;
-        typedef __allocator_destructor<_A2> _D2;
-        _A2 __a2(__a);
-        unique_ptr<_CntrlBlk, _D2> __hold2(__a2.allocate(1), _D2(__a2, 1));
-        ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-            _CntrlBlk(__p, __d, __a);
-        __cntrl_ = _VSTD::addressof(*__hold2.release());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __d(__p);
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(const shared_ptr<_Yp>& __r, element_type *__p) _NOEXCEPT
-    : __ptr_(__p),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_shared();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(const shared_ptr& __r) _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_shared();
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(const shared_ptr<_Yp>& __r,
-                            typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type)
-         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_shared();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(shared_ptr&& __r) _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    __r.__ptr_ = 0;
-    __r.__cntrl_ = 0;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(shared_ptr<_Yp>&& __r,
-                            typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type)
-         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    __r.__ptr_ = 0;
-    __r.__cntrl_ = 0;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-template<class _Yp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-shared_ptr<_Tp>::shared_ptr(auto_ptr<_Yp>&& __r,
-#else
-shared_ptr<_Tp>::shared_ptr(auto_ptr<_Yp> __r,
-#endif
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type)
-    : __ptr_(__r.get())
-{
-    typedef __shared_ptr_pointer<_Yp*, default_delete<_Yp>, allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__r.get(), default_delete<_Yp>(), allocator<_Yp>());
-    __enable_weak_this(__r.get());
-    __r.release();
-}
-
-template<class _Tp>
-template <class _Yp, class _Dp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-shared_ptr<_Tp>::shared_ptr(unique_ptr<_Yp, _Dp>&& __r,
-#else
-shared_ptr<_Tp>::shared_ptr(unique_ptr<_Yp, _Dp> __r,
-#endif
-                            typename enable_if
-                            <
-                                !is_lvalue_reference<_Dp>::value &&
-                                !is_array<_Yp>::value &&
-                                is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                                __nat
-                            >::type)
-    : __ptr_(__r.get())
-{
-    typedef __shared_ptr_pointer<_Yp*, _Dp, allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__r.get(), __r.get_deleter(), allocator<_Yp>());
-    __enable_weak_this(__r.get());
-    __r.release();
-}
-
-template<class _Tp>
-template <class _Yp, class _Dp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-shared_ptr<_Tp>::shared_ptr(unique_ptr<_Yp, _Dp>&& __r,
-#else
-shared_ptr<_Tp>::shared_ptr(unique_ptr<_Yp, _Dp> __r,
-#endif
-                            typename enable_if
-                            <
-                                is_lvalue_reference<_Dp>::value &&
-                                !is_array<_Yp>::value &&
-                                is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                                __nat
-                            >::type)
-    : __ptr_(__r.get())
-{
-    typedef __shared_ptr_pointer<_Yp*,
-                                 reference_wrapper<typename remove_reference<_Dp>::type>,
-                                 allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__r.get(), ref(__r.get_deleter()), allocator<_Yp>());
-    __enable_weak_this(__r.get());
-    __r.release();
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp>
-template<class ..._Args>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared(_Args&& ...__args)
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__a2.allocate(1), _D2(__a2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__a2, _VSTD::forward<_Args>(__args)...);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc, class ..._Args>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a, _Args&& ...__args)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__a2.allocate(1), _D2(__a2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a, _VSTD::forward<_Args>(__args)...);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared()
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__alloc2);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _A0>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared(_A0& __a0)
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__alloc2, __a0);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _A0, class _A1>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared(_A0& __a0, _A1& __a1)
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__alloc2, __a0, __a1);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _A0, class _A1, class _A2>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared(_A0& __a0, _A1& __a1, _A2& __a2)
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__alloc2, __a0, __a1, __a2);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc, class _A0>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a, _A0& __a0)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a, __a0);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc, class _A0, class _A1>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a, __a0, __a1);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc, class _A0, class _A1, class _A2>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a, __a0, __a1, __a2);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp>
-shared_ptr<_Tp>::~shared_ptr()
-{
-    if (__cntrl_)
-        __cntrl_->__release_shared();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>&
-shared_ptr<_Tp>::operator=(const shared_ptr& __r) _NOEXCEPT
-{
-    shared_ptr(__r).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(const shared_ptr<_Yp>& __r) _NOEXCEPT
-{
-    shared_ptr(__r).swap(*this);
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>&
-shared_ptr<_Tp>::operator=(shared_ptr&& __r) _NOEXCEPT
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(shared_ptr<_Yp>&& __r)
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Yp>::value &&
-    is_convertible<_Yp*, _Tp*>::value,
-    shared_ptr<_Tp>
->::type&
-shared_ptr<_Tp>::operator=(auto_ptr<_Yp>&& __r)
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template <class _Yp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Yp>::value &&
-    is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(unique_ptr<_Yp, _Dp>&& __r)
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Yp>::value &&
-    is_convertible<_Yp*, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(auto_ptr<_Yp> __r)
-{
-    shared_ptr(__r).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template <class _Yp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Yp>::value &&
-    is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(unique_ptr<_Yp, _Dp> __r)
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-shared_ptr<_Tp>::swap(shared_ptr& __r) _NOEXCEPT
-{
-    _VSTD::swap(__ptr_, __r.__ptr_);
-    _VSTD::swap(__cntrl_, __r.__cntrl_);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-shared_ptr<_Tp>::reset() _NOEXCEPT
-{
-    shared_ptr().swap(*this);
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    void
->::type
-shared_ptr<_Tp>::reset(_Yp* __p)
-{
-    shared_ptr(__p).swap(*this);
-}
-
-template<class _Tp>
-template<class _Yp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    void
->::type
-shared_ptr<_Tp>::reset(_Yp* __p, _Dp __d)
-{
-    shared_ptr(__p, __d).swap(*this);
-}
-
-template<class _Tp>
-template<class _Yp, class _Dp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    void
->::type
-shared_ptr<_Tp>::reset(_Yp* __p, _Dp __d, _Alloc __a)
-{
-    shared_ptr(__p, __d, __a).swap(*this);
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp, class ..._Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Tp>::value,
-    shared_ptr<_Tp>
->::type
-make_shared(_Args&& ...__args)
-{
-    return shared_ptr<_Tp>::make_shared(_VSTD::forward<_Args>(__args)...);
-}
-
-template<class _Tp, class _Alloc, class ..._Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Tp>::value,
-    shared_ptr<_Tp>
->::type
-allocate_shared(const _Alloc& __a, _Args&& ...__args)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a, _VSTD::forward<_Args>(__args)...);
-}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-make_shared()
-{
-    return shared_ptr<_Tp>::make_shared();
-}
-
-template<class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-make_shared(_A0& __a0)
-{
-    return shared_ptr<_Tp>::make_shared(__a0);
-}
-
-template<class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-make_shared(_A0& __a0, _A1& __a1)
-{
-    return shared_ptr<_Tp>::make_shared(__a0, __a1);
-}
-
-template<class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-make_shared(_A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return shared_ptr<_Tp>::make_shared(__a0, __a1, __a2);
-}
-
-template<class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-allocate_shared(const _Alloc& __a)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a);
-}
-
-template<class _Tp, class _Alloc, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-allocate_shared(const _Alloc& __a, _A0& __a0)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a, __a0);
-}
-
-template<class _Tp, class _Alloc, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a, __a0, __a1);
-}
-
-template<class _Tp, class _Alloc, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a, __a0, __a1, __a2);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return __x.get() == __y.get();
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return !(__x == __y);
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    typedef typename common_type<_Tp*, _Up*>::type _V;
-    return less<_V>()(__x.get(), __y.get());
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return __y < __x;
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return !(__y < __x);
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return !(__x < __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return !__x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return !__x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return static_cast<bool>(__x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return static_cast<bool>(__x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return less<_Tp*>()(__x.get(), nullptr);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return less<_Tp*>()(nullptr, __x.get());
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return nullptr < __x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return __x < nullptr;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return !(nullptr < __x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return !(__x < nullptr);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return !(__x < nullptr);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return !(nullptr < __x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(shared_ptr<_Tp>& __x, shared_ptr<_Tp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Tp>::value && !is_array<_Up>::value,
-    shared_ptr<_Tp>
->::type
-static_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
-{
-    return shared_ptr<_Tp>(__r, static_cast<_Tp*>(__r.get()));
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Tp>::value && !is_array<_Up>::value,
-    shared_ptr<_Tp>
->::type
-dynamic_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
-{
-    _Tp* __p = dynamic_cast<_Tp*>(__r.get());
-    return __p ? shared_ptr<_Tp>(__r, __p) : shared_ptr<_Tp>();
-}
-
-template<class _Tp, class _Up>
-typename enable_if
-<
-    is_array<_Tp>::value == is_array<_Up>::value,
-    shared_ptr<_Tp>
->::type
-const_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
-{
-    typedef typename remove_extent<_Tp>::type _RTp;
-    return shared_ptr<_Tp>(__r, const_cast<_RTp*>(__r.get()));
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Dp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Dp*
-get_deleter(const shared_ptr<_Tp>& __p) _NOEXCEPT
-{
-    return __p.template __get_deleter<_Dp>();
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY weak_ptr
-{
-public:
-    typedef _Tp element_type;
-private:
-    element_type*        __ptr_;
-    __shared_weak_count* __cntrl_;
-
-public:
-    _LIBCPP_CONSTEXPR weak_ptr() _NOEXCEPT;
-    template<class _Yp> weak_ptr(shared_ptr<_Yp> const& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type = 0)
-                        _NOEXCEPT;
-    weak_ptr(weak_ptr const& __r) _NOEXCEPT;
-    template<class _Yp> weak_ptr(weak_ptr<_Yp> const& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type = 0)
-                         _NOEXCEPT;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    weak_ptr(weak_ptr&& __r) _NOEXCEPT;
-    template<class _Yp> weak_ptr(weak_ptr<_Yp>&& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type = 0)
-                         _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~weak_ptr();
-
-    weak_ptr& operator=(weak_ptr const& __r) _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            weak_ptr&
-        >::type
-        operator=(weak_ptr<_Yp> const& __r) _NOEXCEPT;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    weak_ptr& operator=(weak_ptr&& __r) _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            weak_ptr&
-        >::type
-        operator=(weak_ptr<_Yp>&& __r) _NOEXCEPT;
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            weak_ptr&
-        >::type
-        operator=(shared_ptr<_Yp> const& __r) _NOEXCEPT;
-
-    void swap(weak_ptr& __r) _NOEXCEPT;
-    void reset() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    long use_count() const _NOEXCEPT
-        {return __cntrl_ ? __cntrl_->use_count() : 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool expired() const _NOEXCEPT
-        {return __cntrl_ == 0 || __cntrl_->use_count() == 0;}
-    shared_ptr<_Tp> lock() const _NOEXCEPT;
-    template<class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        bool owner_before(const shared_ptr<_Up>& __r) const
-        {return __cntrl_ < __r.__cntrl_;}
-    template<class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        bool owner_before(const weak_ptr<_Up>& __r) const
-        {return __cntrl_ < __r.__cntrl_;}
-
-    template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY weak_ptr;
-    template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY shared_ptr;
-};
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-weak_ptr<_Tp>::weak_ptr() _NOEXCEPT
-    : __ptr_(0),
-      __cntrl_(0)
-{
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(weak_ptr const& __r) _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_weak();
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(shared_ptr<_Yp> const& __r,
-                        typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type)
-                         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_weak();
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(weak_ptr<_Yp> const& __r,
-                        typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type)
-         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_weak();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(weak_ptr&& __r) _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    __r.__ptr_ = 0;
-    __r.__cntrl_ = 0;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(weak_ptr<_Yp>&& __r,
-                        typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type)
-         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    __r.__ptr_ = 0;
-    __r.__cntrl_ = 0;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-weak_ptr<_Tp>::~weak_ptr()
-{
-    if (__cntrl_)
-        __cntrl_->__release_weak();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>&
-weak_ptr<_Tp>::operator=(weak_ptr const& __r) _NOEXCEPT
-{
-    weak_ptr(__r).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    weak_ptr<_Tp>&
->::type
-weak_ptr<_Tp>::operator=(weak_ptr<_Yp> const& __r) _NOEXCEPT
-{
-    weak_ptr(__r).swap(*this);
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>&
-weak_ptr<_Tp>::operator=(weak_ptr&& __r) _NOEXCEPT
-{
-    weak_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    weak_ptr<_Tp>&
->::type
-weak_ptr<_Tp>::operator=(weak_ptr<_Yp>&& __r) _NOEXCEPT
-{
-    weak_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    weak_ptr<_Tp>&
->::type
-weak_ptr<_Tp>::operator=(shared_ptr<_Yp> const& __r) _NOEXCEPT
-{
-    weak_ptr(__r).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-weak_ptr<_Tp>::swap(weak_ptr& __r) _NOEXCEPT
-{
-    _VSTD::swap(__ptr_, __r.__ptr_);
-    _VSTD::swap(__cntrl_, __r.__cntrl_);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(weak_ptr<_Tp>& __x, weak_ptr<_Tp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-weak_ptr<_Tp>::reset() _NOEXCEPT
-{
-    weak_ptr().swap(*this);
-}
-
-template<class _Tp>
-template<class _Yp>
-shared_ptr<_Tp>::shared_ptr(const weak_ptr<_Yp>& __r,
-                            typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type)
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_ ? __r.__cntrl_->lock() : __r.__cntrl_)
-{
-    if (__cntrl_ == 0)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw bad_weak_ptr();
-#else
-        assert(!"bad_weak_ptr");
-#endif
-}
-
-template<class _Tp>
-shared_ptr<_Tp>
-weak_ptr<_Tp>::lock() const _NOEXCEPT
-{
-    shared_ptr<_Tp> __r;
-    __r.__cntrl_ = __cntrl_ ? __cntrl_->lock() : __cntrl_;
-    if (__r.__cntrl_)
-        __r.__ptr_ = __ptr_;
-    return __r;
-}
-
-template <class _Tp> struct owner_less;
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY owner_less<shared_ptr<_Tp> >
-    : binary_function<shared_ptr<_Tp>, shared_ptr<_Tp>, bool>
-{
-    typedef bool result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(shared_ptr<_Tp> const& __x, shared_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(shared_ptr<_Tp> const& __x,   weak_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(  weak_ptr<_Tp> const& __x, shared_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY owner_less<weak_ptr<_Tp> >
-    : binary_function<weak_ptr<_Tp>, weak_ptr<_Tp>, bool>
-{
-    typedef bool result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(  weak_ptr<_Tp> const& __x,   weak_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(shared_ptr<_Tp> const& __x,   weak_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(  weak_ptr<_Tp> const& __x, shared_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-};
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY enable_shared_from_this
-{
-    mutable weak_ptr<_Tp> __weak_this_;
-protected:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    enable_shared_from_this() _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY
-    enable_shared_from_this(enable_shared_from_this const&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY
-    enable_shared_from_this& operator=(enable_shared_from_this const&) _NOEXCEPT
-        {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    ~enable_shared_from_this() {}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_ptr<_Tp> shared_from_this()
-        {return shared_ptr<_Tp>(__weak_this_);}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_ptr<_Tp const> shared_from_this() const
-        {return shared_ptr<const _Tp>(__weak_this_);}
-
-    template <class _Up> friend class shared_ptr;
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY hash<shared_ptr<_Tp> >
-{
-    typedef shared_ptr<_Tp>      argument_type;
-    typedef size_t               result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()(const argument_type& __ptr) const _NOEXCEPT
-    {
-        return hash<_Tp*>()(__ptr.get());
-    }
-};
-
-template<class _CharT, class _Traits, class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, shared_ptr<_Yp> const& __p);
-
-#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-
-class _LIBCPP_TYPE_VIS __sp_mut
-{
-    void* __lx;
-public:
-    void lock() _NOEXCEPT;
-    void unlock() _NOEXCEPT;
-
-private:
-    _LIBCPP_CONSTEXPR __sp_mut(void*) _NOEXCEPT;
-    __sp_mut(const __sp_mut&);
-    __sp_mut& operator=(const __sp_mut&);
-
-    friend _LIBCPP_FUNC_VIS __sp_mut& __get_sp_mut(const void*);
-};
-
-_LIBCPP_FUNC_VIS __sp_mut& __get_sp_mut(const void*);
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_is_lock_free(const shared_ptr<_Tp>*)
-{
-    return false;
-}
-
-template <class _Tp>
-shared_ptr<_Tp>
-atomic_load(const shared_ptr<_Tp>* __p)
-{
-    __sp_mut& __m = __get_sp_mut(__p);
-    __m.lock();
-    shared_ptr<_Tp> __q = *__p;
-    __m.unlock();
-    return __q;
-}
-  
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-atomic_load_explicit(const shared_ptr<_Tp>* __p, memory_order)
-{
-    return atomic_load(__p);
-}
-
-template <class _Tp>
-void
-atomic_store(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r)
-{
-    __sp_mut& __m = __get_sp_mut(__p);
-    __m.lock();
-    __p->swap(__r);
-    __m.unlock();
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r, memory_order)
-{
-    atomic_store(__p, __r);
-}
-
-template <class _Tp>
-shared_ptr<_Tp>
-atomic_exchange(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r)
-{
-    __sp_mut& __m = __get_sp_mut(__p);
-    __m.lock();
-    __p->swap(__r);
-    __m.unlock();
-    return __r;
-}
-  
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-atomic_exchange_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r, memory_order)
-{
-    return atomic_exchange(__p, __r);
-}
-
-template <class _Tp>
-bool
-atomic_compare_exchange_strong(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v, shared_ptr<_Tp> __w)
-{
-    __sp_mut& __m = __get_sp_mut(__p);
-    __m.lock();
-    if (__p->__owner_equivalent(*__v))
-    {
-        *__p = __w;
-        __m.unlock();
-        return true;
-    }
-    *__v = *__p;
-    __m.unlock();
-    return false;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v, shared_ptr<_Tp> __w)
-{
-    return atomic_compare_exchange_strong(__p, __v, __w);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v,
-                                        shared_ptr<_Tp> __w, memory_order, memory_order)
-{
-    return atomic_compare_exchange_strong(__p, __v, __w);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v,
-                                      shared_ptr<_Tp> __w, memory_order, memory_order)
-{
-    return atomic_compare_exchange_weak(__p, __v, __w);
-}
-
-#endif  // __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-
-//enum class
-struct _LIBCPP_TYPE_VIS pointer_safety
-{
-    enum __lx
-    {
-        relaxed,
-        preferred,
-        strict
-    };
-
-    __lx __v_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    pointer_safety(__lx __v) : __v_(__v) {}
-    _LIBCPP_INLINE_VISIBILITY
-    operator int() const {return __v_;}
-};
-
-_LIBCPP_FUNC_VIS void declare_reachable(void* __p);
-_LIBCPP_FUNC_VIS void declare_no_pointers(char* __p, size_t __n);
-_LIBCPP_FUNC_VIS void undeclare_no_pointers(char* __p, size_t __n);
-_LIBCPP_FUNC_VIS pointer_safety get_pointer_safety() _NOEXCEPT;
-_LIBCPP_FUNC_VIS void* __undeclare_reachable(void* __p);
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-undeclare_reachable(_Tp* __p)
-{
-    return static_cast<_Tp*>(__undeclare_reachable(__p));
-}
-
-_LIBCPP_FUNC_VIS void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space);
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_MEMORY
diff --git a/include.new/c++/v1/mutex b/include.new/c++/v1/mutex
deleted file mode 100644
index e2a0daa..0000000
--- a/include.new/c++/v1/mutex
+++ /dev/null
@@ -1,571 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- mutex ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_MUTEX
-#define _LIBCPP_MUTEX
-
-/*
-    mutex synopsis
-
-namespace std
-{
-
-class mutex
-{
-public:
-     constexpr mutex() noexcept;
-     ~mutex();
-
-    mutex(const mutex&) = delete;
-    mutex& operator=(const mutex&) = delete;
-
-    void lock();
-    bool try_lock();
-    void unlock();
-
-    typedef pthread_mutex_t* native_handle_type;
-    native_handle_type native_handle();
-};
-
-class recursive_mutex
-{
-public:
-     recursive_mutex();
-     ~recursive_mutex();
-
-    recursive_mutex(const recursive_mutex&) = delete;
-    recursive_mutex& operator=(const recursive_mutex&) = delete;
-
-    void lock();
-    bool try_lock() noexcept;
-    void unlock();
-
-    typedef pthread_mutex_t* native_handle_type;
-    native_handle_type native_handle();
-};
-
-class timed_mutex
-{
-public:
-     timed_mutex();
-     ~timed_mutex();
-
-    timed_mutex(const timed_mutex&) = delete;
-    timed_mutex& operator=(const timed_mutex&) = delete;
-
-    void lock();
-    bool try_lock();
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-};
-
-class recursive_timed_mutex
-{
-public:
-     recursive_timed_mutex();
-     ~recursive_timed_mutex();
-
-    recursive_timed_mutex(const recursive_timed_mutex&) = delete;
-    recursive_timed_mutex& operator=(const recursive_timed_mutex&) = delete;
-
-    void lock();
-    bool try_lock() noexcept;
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-};
-
-struct defer_lock_t {};
-struct try_to_lock_t {};
-struct adopt_lock_t {};
-
-constexpr defer_lock_t  defer_lock{};
-constexpr try_to_lock_t try_to_lock{};
-constexpr adopt_lock_t  adopt_lock{};
-
-template <class Mutex>
-class lock_guard
-{
-public:
-    typedef Mutex mutex_type;
-
-    explicit lock_guard(mutex_type& m);
-    lock_guard(mutex_type& m, adopt_lock_t);
-    ~lock_guard();
-
-    lock_guard(lock_guard const&) = delete;
-    lock_guard& operator=(lock_guard const&) = delete;
-};
-
-template <class Mutex>
-class unique_lock
-{
-public:
-    typedef Mutex mutex_type;
-    unique_lock() noexcept;
-    explicit unique_lock(mutex_type& m);
-    unique_lock(mutex_type& m, defer_lock_t) noexcept;
-    unique_lock(mutex_type& m, try_to_lock_t);
-    unique_lock(mutex_type& m, adopt_lock_t);
-    template <class Clock, class Duration>
-        unique_lock(mutex_type& m, const chrono::time_point<Clock, Duration>& abs_time);
-    template <class Rep, class Period>
-        unique_lock(mutex_type& m, const chrono::duration<Rep, Period>& rel_time);
-    ~unique_lock();
-
-    unique_lock(unique_lock const&) = delete;
-    unique_lock& operator=(unique_lock const&) = delete;
-
-    unique_lock(unique_lock&& u) noexcept;
-    unique_lock& operator=(unique_lock&& u) noexcept;
-
-    void lock();
-    bool try_lock();
-
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-
-    void unlock();
-
-    void swap(unique_lock& u) noexcept;
-    mutex_type* release() noexcept;
-
-    bool owns_lock() const noexcept;
-    explicit operator bool () const noexcept;
-    mutex_type* mutex() const noexcept;
-};
-
-template <class Mutex>
-  void swap(unique_lock<Mutex>& x, unique_lock<Mutex>& y) noexcept;
-
-template <class L1, class L2, class... L3>
-  int try_lock(L1&, L2&, L3&...);
-template <class L1, class L2, class... L3>
-  void lock(L1&, L2&, L3&...);
-
-struct once_flag
-{
-    constexpr once_flag() noexcept;
-
-    once_flag(const once_flag&) = delete;
-    once_flag& operator=(const once_flag&) = delete;
-};
-
-template<class Callable, class ...Args>
-  void call_once(once_flag& flag, Callable&& func, Args&&... args);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__mutex_base>
-#include <functional>
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-#include <tuple>
-#endif
-#include <sched.h>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_THREADS
-
-class _LIBCPP_TYPE_VIS recursive_mutex
-{
-    pthread_mutex_t __m_;
-
-public:
-     recursive_mutex();
-     ~recursive_mutex();
-
-private:
-    recursive_mutex(const recursive_mutex&); // = delete;
-    recursive_mutex& operator=(const recursive_mutex&); // = delete;
-
-public:
-    void lock();
-    bool try_lock() _NOEXCEPT;
-    void unlock()  _NOEXCEPT;
-
-    typedef pthread_mutex_t* native_handle_type;
-    _LIBCPP_INLINE_VISIBILITY
-    native_handle_type native_handle() {return &__m_;}
-};
-
-class _LIBCPP_TYPE_VIS timed_mutex
-{
-    mutex              __m_;
-    condition_variable __cv_;
-    bool               __locked_;
-public:
-     timed_mutex();
-     ~timed_mutex();
-
-private:
-    timed_mutex(const timed_mutex&); // = delete;
-    timed_mutex& operator=(const timed_mutex&); // = delete;
-
-public:
-    void lock();
-    bool try_lock() _NOEXCEPT;
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        bool try_lock_for(const chrono::duration<_Rep, _Period>& __d)
-            {return try_lock_until(chrono::steady_clock::now() + __d);}
-    template <class _Clock, class _Duration>
-        bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);
-    void unlock() _NOEXCEPT;
-};
-
-template <class _Clock, class _Duration>
-bool
-timed_mutex::try_lock_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    using namespace chrono;
-    unique_lock<mutex> __lk(__m_);
-    bool no_timeout = _Clock::now() < __t;
-    while (no_timeout && __locked_)
-        no_timeout = __cv_.wait_until(__lk, __t) == cv_status::no_timeout;
-    if (!__locked_)
-    {
-        __locked_ = true;
-        return true;
-    }
-    return false;
-}
-
-class _LIBCPP_TYPE_VIS recursive_timed_mutex
-{
-    mutex              __m_;
-    condition_variable __cv_;
-    size_t             __count_;
-    pthread_t          __id_;
-public:
-     recursive_timed_mutex();
-     ~recursive_timed_mutex();
-
-private:
-    recursive_timed_mutex(const recursive_timed_mutex&); // = delete;
-    recursive_timed_mutex& operator=(const recursive_timed_mutex&); // = delete;
-
-public:
-    void lock();
-    bool try_lock() _NOEXCEPT;
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        bool try_lock_for(const chrono::duration<_Rep, _Period>& __d)
-            {return try_lock_until(chrono::steady_clock::now() + __d);}
-    template <class _Clock, class _Duration>
-        bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);
-    void unlock() _NOEXCEPT;
-};
-
-template <class _Clock, class _Duration>
-bool
-recursive_timed_mutex::try_lock_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    using namespace chrono;
-    pthread_t __id = pthread_self();
-    unique_lock<mutex> lk(__m_);
-    if (pthread_equal(__id, __id_))
-    {
-        if (__count_ == numeric_limits<size_t>::max())
-            return false;
-        ++__count_;
-        return true;
-    }
-    bool no_timeout = _Clock::now() < __t;
-    while (no_timeout && __count_ != 0)
-        no_timeout = __cv_.wait_until(lk, __t) == cv_status::no_timeout;
-    if (__count_ == 0)
-    {
-        __count_ = 1;
-        __id_ = __id;
-        return true;
-    }
-    return false;
-}
-
-template <class _L0, class _L1>
-int
-try_lock(_L0& __l0, _L1& __l1)
-{
-    unique_lock<_L0> __u0(__l0, try_to_lock);
-    if (__u0.owns_lock())
-    {
-        if (__l1.try_lock())
-        {
-            __u0.release();
-            return -1;
-        }
-        else
-            return 1;
-    }
-    return 0;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _L0, class _L1, class _L2, class... _L3>
-int
-try_lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3&... __l3)
-{
-    int __r = 0;
-    unique_lock<_L0> __u0(__l0, try_to_lock);
-    if (__u0.owns_lock())
-    {
-        __r = try_lock(__l1, __l2, __l3...);
-        if (__r == -1)
-            __u0.release();
-        else
-            ++__r;
-    }
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _L0, class _L1>
-void
-lock(_L0& __l0, _L1& __l1)
-{
-    while (true)
-    {
-        {
-            unique_lock<_L0> __u0(__l0);
-            if (__l1.try_lock())
-            {
-                __u0.release();
-                break;
-            }
-        }
-        sched_yield();
-        {
-            unique_lock<_L1> __u1(__l1);
-            if (__l0.try_lock())
-            {
-                __u1.release();
-                break;
-            }
-        }
-        sched_yield();
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _L0, class _L1, class _L2, class ..._L3>
-void
-__lock_first(int __i, _L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)
-{
-    while (true)
-    {
-        switch (__i)
-        {
-        case 0:
-            {
-                unique_lock<_L0> __u0(__l0);
-                __i = try_lock(__l1, __l2, __l3...);
-                if (__i == -1)
-                {
-                    __u0.release();
-                    return;
-                }
-            }
-            ++__i;
-            sched_yield();
-            break;
-        case 1:
-            {
-                unique_lock<_L1> __u1(__l1);
-                __i = try_lock(__l2, __l3..., __l0);
-                if (__i == -1)
-                {
-                    __u1.release();
-                    return;
-                }
-            }
-            if (__i == sizeof...(_L3) + 1)
-                __i = 0;
-            else
-                __i += 2;
-            sched_yield();
-            break;
-        default:
-            __lock_first(__i - 2, __l2, __l3..., __l0, __l1);
-            return;
-        }
-    }
-}
-
-template <class _L0, class _L1, class _L2, class ..._L3>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)
-{
-    __lock_first(0, __l0, __l1, __l2, __l3...);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-struct _LIBCPP_TYPE_VIS_ONLY once_flag;
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Callable, class... _Args>
-_LIBCPP_INLINE_VISIBILITY
-void call_once(once_flag&, _Callable&&, _Args&&...);
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Callable>
-_LIBCPP_INLINE_VISIBILITY
-void call_once(once_flag&, _Callable);
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-struct _LIBCPP_TYPE_VIS_ONLY once_flag
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR
-        once_flag() _NOEXCEPT : __state_(0) {}
-
-private:
-    once_flag(const once_flag&); // = delete;
-    once_flag& operator=(const once_flag&); // = delete;
-
-    unsigned long __state_;
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template<class _Callable, class... _Args>
-    friend
-    void call_once(once_flag&, _Callable&&, _Args&&...);
-#else  // _LIBCPP_HAS_NO_VARIADICS
-    template<class _Callable>
-    friend
-    void call_once(once_flag&, _Callable);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Fp>
-class __call_once_param
-{
-    _Fp __f_;
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __call_once_param(_Fp&& __f) : __f_(_VSTD::move(__f)) {}
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __call_once_param(const _Fp& __f) : __f_(__f) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()()
-    {
-        typedef typename __make_tuple_indices<tuple_size<_Fp>::value, 1>::type _Index;
-        __execute(_Index());
-    }
-
-private:
-    template <size_t ..._Indices>
-    _LIBCPP_INLINE_VISIBILITY
-    void __execute(__tuple_indices<_Indices...>)
-    {
-        __invoke(_VSTD::move(_VSTD::get<0>(__f_)), _VSTD::move(_VSTD::get<_Indices>(__f_))...);
-    }
-};
-
-#else
-
-template <class _Fp>
-class __call_once_param
-{
-    _Fp __f_;
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __call_once_param(_Fp&& __f) : __f_(_VSTD::move(__f)) {}
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __call_once_param(const _Fp& __f) : __f_(__f) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()()
-    {
-        __f_();
-    }
-};
-
-#endif
-
-template <class _Fp>
-void
-__call_once_proxy(void* __vp)
-{
-    __call_once_param<_Fp>* __p = static_cast<__call_once_param<_Fp>*>(__vp);
-    (*__p)();
-}
-
-_LIBCPP_FUNC_VIS void __call_once(volatile unsigned long&, void*, void(*)(void*));
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Callable, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-call_once(once_flag& __flag, _Callable&& __func, _Args&&... __args)
-{
-    if (__flag.__state_ != ~0ul)
-    {
-        typedef tuple<typename decay<_Callable>::type, typename decay<_Args>::type...> _Gp;
-        __call_once_param<_Gp> __p(_Gp(__decay_copy(_VSTD::forward<_Callable>(__func)),
-                                __decay_copy(_VSTD::forward<_Args>(__args))...));
-        __call_once(__flag.__state_, &__p, &__call_once_proxy<_Gp>);
-    }
-}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Callable>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-call_once(once_flag& __flag, _Callable __func)
-{
-    if (__flag.__state_ != ~0ul)
-    {
-        __call_once_param<_Callable> __p(__func);
-        __call_once(__flag.__state_, &__p, &__call_once_proxy<_Callable>);
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_MUTEX
diff --git a/include.new/c++/v1/new b/include.new/c++/v1/new
deleted file mode 100644
index a710ed9..0000000
--- a/include.new/c++/v1/new
+++ /dev/null
@@ -1,170 +0,0 @@
-// -*- C++ -*-
-//===----------------------------- new ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_NEW
-#define _LIBCPP_NEW
-
-/*
-    new synopsis
-
-namespace std
-{
-
-class bad_alloc
-    : public exception
-{
-public:
-    bad_alloc() noexcept;
-    bad_alloc(const bad_alloc&) noexcept;
-    bad_alloc& operator=(const bad_alloc&) noexcept;
-    virtual const char* what() const noexcept;
-};
-
-class bad_array_length : public bad_alloc // C++14
-{
-public:
-    bad_array_length() noexcept;
-};
-
-class bad_array_new_length : public bad_alloc
-{
-public:
-    bad_array_new_length() noexcept;
-};
-
-struct nothrow_t {};
-extern const nothrow_t nothrow;
-typedef void (*new_handler)();
-new_handler set_new_handler(new_handler new_p) noexcept;
-new_handler get_new_handler() noexcept;
-
-}  // std
-
-void* operator new(std::size_t size);                                   // replaceable
-void* operator new(std::size_t size, const std::nothrow_t&) noexcept;   // replaceable
-void  operator delete(void* ptr) noexcept;                              // replaceable
-void  operator delete(void* ptr, const std::nothrow_t&) noexcept;       // replaceable
-
-void* operator new[](std::size_t size);                                 // replaceable
-void* operator new[](std::size_t size, const std::nothrow_t&) noexcept; // replaceable
-void  operator delete[](void* ptr) noexcept;                            // replaceable
-void  operator delete[](void* ptr, const std::nothrow_t&) noexcept;     // replaceable
-
-void* operator new  (std::size_t size, void* ptr) noexcept;
-void* operator new[](std::size_t size, void* ptr) noexcept;
-void  operator delete  (void* ptr, void*) noexcept;
-void  operator delete[](void* ptr, void*) noexcept;
-
-*/
-
-#include <__config>
-#include <exception>
-#include <cstddef>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-namespace std  // purposefully not using versioning namespace
-{
-
-class _LIBCPP_EXCEPTION_ABI bad_alloc
-    : public exception
-{
-public:
-    bad_alloc() _NOEXCEPT;
-    virtual ~bad_alloc() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI bad_array_new_length
-    : public bad_alloc
-{
-public:
-    bad_array_new_length() _NOEXCEPT;
-    virtual ~bad_array_new_length() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-#if defined(_LIBCPP_BUILDING_NEW) || (_LIBCPP_STD_VER > 11)
-
-class _LIBCPP_EXCEPTION_ABI bad_array_length
-    : public bad_alloc
-{
-public:
-    bad_array_length() _NOEXCEPT;
-    virtual ~bad_array_length() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-#define _LIBCPP_BAD_ARRAY_LENGTH_DEFINED
-
-#endif  // defined(_LIBCPP_BUILDING_NEW) || (_LIBCPP_STD_VER > 11)
-
-_LIBCPP_FUNC_VIS void __throw_bad_alloc();  // not in C++ spec
-
-struct _LIBCPP_TYPE_VIS nothrow_t {};
-extern _LIBCPP_FUNC_VIS const nothrow_t nothrow;
-typedef void (*new_handler)();
-_LIBCPP_FUNC_VIS new_handler set_new_handler(new_handler) _NOEXCEPT;
-_LIBCPP_FUNC_VIS new_handler get_new_handler() _NOEXCEPT;
-
-}  // std
-
-#if defined(_WIN32) && !defined(cxx_EXPORTS)
-# define _LIBCPP_NEW_DELETE_VIS _LIBCPP_FUNC_VIS_ONLY
-#else
-# define _LIBCPP_NEW_DELETE_VIS _LIBCPP_FUNC_VIS
-#endif
-
-_LIBCPP_NEW_DELETE_VIS void* operator new(std::size_t __sz)
-#if !__has_feature(cxx_noexcept)
-    throw(std::bad_alloc)
-#endif
-;
-_LIBCPP_NEW_DELETE_VIS void* operator new(std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
-_LIBCPP_NEW_DELETE_VIS void  operator delete(void* __p) _NOEXCEPT;
-_LIBCPP_NEW_DELETE_VIS void  operator delete(void* __p, const std::nothrow_t&) _NOEXCEPT;
-
-_LIBCPP_NEW_DELETE_VIS void* operator new[](std::size_t __sz)
-#if !__has_feature(cxx_noexcept)
-    throw(std::bad_alloc)
-#endif
-;
-_LIBCPP_NEW_DELETE_VIS void* operator new[](std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
-_LIBCPP_NEW_DELETE_VIS void  operator delete[](void* __p) _NOEXCEPT;
-_LIBCPP_NEW_DELETE_VIS void  operator delete[](void* __p, const std::nothrow_t&) _NOEXCEPT;
-
-inline _LIBCPP_INLINE_VISIBILITY void* operator new  (std::size_t, void* __p) _NOEXCEPT {return __p;}
-inline _LIBCPP_INLINE_VISIBILITY void* operator new[](std::size_t, void* __p) _NOEXCEPT {return __p;}
-inline _LIBCPP_INLINE_VISIBILITY void  operator delete  (void*, void*) _NOEXCEPT {}
-inline _LIBCPP_INLINE_VISIBILITY void  operator delete[](void*, void*) _NOEXCEPT {}
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-inline _LIBCPP_INLINE_VISIBILITY void *__allocate(size_t __size) {
-#ifdef _LIBCPP_HAS_NO_BUILTIN_OPERATOR_NEW_DELETE
-  return ::operator new(__size);
-#else
-  return __builtin_operator_new(__size);
-#endif
-}
-
-inline _LIBCPP_INLINE_VISIBILITY void __deallocate(void *__ptr) {
-#ifdef _LIBCPP_HAS_NO_BUILTIN_OPERATOR_NEW_DELETE
-  ::operator delete(__ptr);
-#else
-  __builtin_operator_delete(__ptr);
-#endif
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_NEW
diff --git a/include.new/c++/v1/numeric b/include.new/c++/v1/numeric
deleted file mode 100644
index 21c3781..0000000
--- a/include.new/c++/v1/numeric
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- numeric ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_NUMERIC
-#define _LIBCPP_NUMERIC
-
-/*
-    numeric synopsis
-
-namespace std
-{
-
-template <class InputIterator, class T>
-    T
-    accumulate(InputIterator first, InputIterator last, T init);
-
-template <class InputIterator, class T, class BinaryOperation>
-    T
-    accumulate(InputIterator first, InputIterator last, T init, BinaryOperation binary_op);
-
-template <class InputIterator1, class InputIterator2, class T>
-    T
-    inner_product(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, T init);
-
-template <class InputIterator1, class InputIterator2, class T, class BinaryOperation1, class BinaryOperation2>
-    T
-    inner_product(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2,
-                  T init, BinaryOperation1 binary_op1, BinaryOperation2 binary_op2);
-
-template <class InputIterator, class OutputIterator>
-    OutputIterator
-    partial_sum(InputIterator first, InputIterator last, OutputIterator result);
-
-template <class InputIterator, class OutputIterator, class BinaryOperation>
-    OutputIterator
-    partial_sum(InputIterator first, InputIterator last, OutputIterator result, BinaryOperation binary_op);
-
-template <class InputIterator, class OutputIterator>
-    OutputIterator
-    adjacent_difference(InputIterator first, InputIterator last, OutputIterator result);
-
-template <class InputIterator, class OutputIterator, class BinaryOperation>
-    OutputIterator
-    adjacent_difference(InputIterator first, InputIterator last, OutputIterator result, BinaryOperation binary_op);
-
-template <class ForwardIterator, class T>
-    void iota(ForwardIterator first, ForwardIterator last, T value);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iterator>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _InputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)
-{
-    for (; __first != __last; ++__first)
-        __init = __init + *__first;
-    return __init;
-}
-
-template <class _InputIterator, class _Tp, class _BinaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-accumulate(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOperation __binary_op)
-{
-    for (; __first != __last; ++__first)
-        __init = __binary_op(__init, *__first);
-    return __init;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        __init = __init + *__first1 * *__first2;
-    return __init;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _Tp, class _BinaryOperation1, class _BinaryOperation2>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2,
-              _Tp __init, _BinaryOperation1 __binary_op1, _BinaryOperation2 __binary_op2)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        __init = __binary_op1(__init, __binary_op2(*__first1, *__first2));
-    return __init;
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t(*__first);
-        *__result = __t;
-        for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result)
-        {
-            __t = __t + *__first;
-            *__result = __t;
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
-              _BinaryOperation __binary_op)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t(*__first);
-        *__result = __t;
-        for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result)
-        {
-            __t = __binary_op(__t, *__first);
-            *__result = __t;
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t1(*__first);
-        *__result = __t1;
-        for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result)
-        {
-            typename iterator_traits<_InputIterator>::value_type __t2(*__first);
-            *__result = __t2 - __t1;
-            __t1 = _VSTD::move(__t2);
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
-                      _BinaryOperation __binary_op)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t1(*__first);
-        *__result = __t1;
-        for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result)
-        {
-            typename iterator_traits<_InputIterator>::value_type __t2(*__first);
-            *__result = __binary_op(__t2, __t1);
-            __t1 = _VSTD::move(__t2);
-        }
-    }
-    return __result;
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value_)
-{
-    for (; __first != __last; ++__first, (void) ++__value_)
-        *__first = __value_;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_NUMERIC
diff --git a/include.new/c++/v1/ostream b/include.new/c++/v1/ostream
deleted file mode 100644
index a7af299..0000000
--- a/include.new/c++/v1/ostream
+++ /dev/null
@@ -1,1113 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- ostream -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_OSTREAM
-#define _LIBCPP_OSTREAM
-
-/*
-    ostream synopsis
-
-template <class charT, class traits = char_traits<charT> >
-class basic_ostream
-    : virtual public basic_ios<charT,traits>
-{
-public:
-    // types (inherited from basic_ios (27.5.4)):
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.7.2.2 Constructor/destructor:
-    explicit basic_ostream(basic_streambuf<char_type,traits>* sb);
-    basic_ostream(basic_ostream&& rhs);
-    virtual ~basic_ostream();
-
-    // 27.7.2.3 Assign/swap
-    basic_ostream& operator=(const basic_ostream& rhs) = delete; // C++14
-    basic_ostream& operator=(basic_ostream&& rhs);
-    void swap(basic_ostream& rhs);
-
-    // 27.7.2.4 Prefix/suffix:
-    class sentry;
-
-    // 27.7.2.6 Formatted output:
-    basic_ostream& operator<<(basic_ostream& (*pf)(basic_ostream&));
-    basic_ostream& operator<<(basic_ios<charT, traits>& (*pf)(basic_ios<charT,traits>&));
-    basic_ostream& operator<<(ios_base& (*pf)(ios_base&));
-    basic_ostream& operator<<(bool n);
-    basic_ostream& operator<<(short n);
-    basic_ostream& operator<<(unsigned short n);
-    basic_ostream& operator<<(int n);
-    basic_ostream& operator<<(unsigned int n);
-    basic_ostream& operator<<(long n);
-    basic_ostream& operator<<(unsigned long n);
-    basic_ostream& operator<<(long long n);
-    basic_ostream& operator<<(unsigned long long n);
-    basic_ostream& operator<<(float f);
-    basic_ostream& operator<<(double f);
-    basic_ostream& operator<<(long double f);
-    basic_ostream& operator<<(const void* p);
-    basic_ostream& operator<<(basic_streambuf<char_type,traits>* sb);
-
-    // 27.7.2.7 Unformatted output:
-    basic_ostream& put(char_type c);
-    basic_ostream& write(const char_type* s, streamsize n);
-    basic_ostream& flush();
-
-    // 27.7.2.5 seeks:
-    pos_type tellp();
-    basic_ostream& seekp(pos_type);
-    basic_ostream& seekp(off_type, ios_base::seekdir);
-protected:
-    basic_ostream(const basic_ostream& rhs) = delete;
-    basic_ostream(basic_ostream&& rhs);
-    // 27.7.3.3 Assign/swap
-    basic_ostream& operator=(basic_ostream& rhs) = delete;
-    basic_ostream& operator=(const basic_ostream&& rhs);
-    void swap(basic_ostream& rhs);
-};
-
-// 27.7.2.6.4 character inserters
-
-template<class charT, class traits>
-  basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>&, charT);
-
-template<class charT, class traits>
-  basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>&, char);
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, char);
-
-// signed and unsigned
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, signed char);
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, unsigned char);
-
-// NTBS
-template<class charT, class traits>
-  basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>&, const charT*);
-
-template<class charT, class traits>
-  basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>&, const char*);
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, const char*);
-
-// signed and unsigned
-template<class traits>
-basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, const signed char*);
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, const unsigned char*);
-
-// swap:
-template <class charT, class traits>
-  void swap(basic_ostream<charT, traits>& x, basic_ostream<charT, traits>& y);
-
-template <class charT, class traits>
-  basic_ostream<charT,traits>& endl(basic_ostream<charT,traits>& os);
-
-template <class charT, class traits>
-  basic_ostream<charT,traits>& ends(basic_ostream<charT,traits>& os);
-
-template <class charT, class traits>
-  basic_ostream<charT,traits>& flush(basic_ostream<charT,traits>& os);
-
-// rvalue stream insertion
-template <class charT, class traits, class T>
-  basic_ostream<charT, traits>&
-  operator<<(basic_ostream<charT, traits>&& os, const T& x);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ios>
-#include <streambuf>
-#include <locale>
-#include <iterator>
-#include <bitset>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ostream
-    : virtual public basic_ios<_CharT, _Traits>
-{
-public:
-    // types (inherited from basic_ios (27.5.4)):
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.7.2.2 Constructor/destructor:
-    explicit basic_ostream(basic_streambuf<char_type, traits_type>* __sb);
-    virtual ~basic_ostream();
-protected:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream(basic_ostream&& __rhs);
-#endif
-
-    // 27.7.2.3 Assign/swap
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream& operator=(basic_ostream&& __rhs);
-#endif
-    void swap(basic_ostream& __rhs);
-
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    basic_ostream           (const basic_ostream& __rhs) = delete;
-    basic_ostream& operator=(const basic_ostream& __rhs) = delete;
-#else
-    basic_ostream           (const basic_ostream& __rhs); // not defined
-    basic_ostream& operator=(const basic_ostream& __rhs); // not defined
-#endif
-public:
-
-    // 27.7.2.4 Prefix/suffix:
-    class _LIBCPP_TYPE_VIS_ONLY sentry;
-
-    // 27.7.2.6 Formatted output:
-    basic_ostream& operator<<(basic_ostream& (*__pf)(basic_ostream&));
-    basic_ostream& operator<<(basic_ios<char_type, traits_type>&
-                              (*__pf)(basic_ios<char_type,traits_type>&));
-    basic_ostream& operator<<(ios_base& (*__pf)(ios_base&));
-    basic_ostream& operator<<(bool __n);
-    basic_ostream& operator<<(short __n);
-    basic_ostream& operator<<(unsigned short __n);
-    basic_ostream& operator<<(int __n);
-    basic_ostream& operator<<(unsigned int __n);
-    basic_ostream& operator<<(long __n);
-    basic_ostream& operator<<(unsigned long __n);
-    basic_ostream& operator<<(long long __n);
-    basic_ostream& operator<<(unsigned long long __n);
-    basic_ostream& operator<<(float __f);
-    basic_ostream& operator<<(double __f);
-    basic_ostream& operator<<(long double __f);
-    basic_ostream& operator<<(const void* __p);
-    basic_ostream& operator<<(basic_streambuf<char_type, traits_type>* __sb);
-
-    // 27.7.2.7 Unformatted output:
-    basic_ostream& put(char_type __c);
-    basic_ostream& write(const char_type* __s, streamsize __n);
-    basic_ostream& flush();
-
-    // 27.7.2.5 seeks:
-    pos_type tellp();
-    basic_ostream& seekp(pos_type __pos);
-    basic_ostream& seekp(off_type __off, ios_base::seekdir __dir);
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    basic_ostream() {}  // extension, intentially does not initialize
-};
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ostream<_CharT, _Traits>::sentry
-{
-    bool __ok_;
-    basic_ostream<_CharT, _Traits>& __os_;
-
-    sentry(const sentry&); // = delete;
-    sentry& operator=(const sentry&); // = delete;
-
-public:
-    explicit sentry(basic_ostream<_CharT, _Traits>& __os);
-    ~sentry();
-
-    _LIBCPP_ALWAYS_INLINE
-        _LIBCPP_EXPLICIT
-        operator bool() const {return __ok_;}
-};
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>::sentry::sentry(basic_ostream<_CharT, _Traits>& __os)
-    : __ok_(false),
-      __os_(__os)
-{
-    if (__os.good())
-    {
-        if (__os.tie())
-            __os.tie()->flush();
-        __ok_ = true;
-    }
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>::sentry::~sentry()
-{
-    if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf)
-                      && !uncaught_exception())
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            if (__os_.rdbuf()->pubsync() == -1)
-                __os_.setstate(ios_base::badbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>::basic_ostream(basic_streambuf<char_type, traits_type>* __sb)
-{
-    this->init(__sb);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>::basic_ostream(basic_ostream&& __rhs)
-{
-    this->move(__rhs);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator=(basic_ostream&& __rhs)
-{
-    swap(__rhs);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>::~basic_ostream()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ostream<_CharT, _Traits>::swap(basic_ostream& __rhs)
-{
-    basic_ios<char_type, traits_type>::swap(__rhs);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(basic_ostream& (*__pf)(basic_ostream&))
-{
-    return __pf(*this);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(basic_ios<char_type, traits_type>&
-                                           (*__pf)(basic_ios<char_type,traits_type>&))
-{
-    __pf(*this);
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(ios_base& (*__pf)(ios_base&))
-{
-    __pf(*this);
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(basic_streambuf<char_type, traits_type>* __sb)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            if (__sb)
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                try
-                {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    typedef istreambuf_iterator<_CharT, _Traits> _Ip;
-                    typedef ostreambuf_iterator<_CharT, _Traits> _Op;
-                    _Ip __i(__sb);
-                    _Ip __eof;
-                    _Op __o(*this);
-                    size_t __c = 0;
-                    for (; __i != __eof; ++__i, ++__o, ++__c)
-                    {
-                        *__o = *__i;
-                        if (__o.failed())
-                            break;
-                    }
-                    if (__c == 0)
-                        this->setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                }
-                catch (...)
-                {
-                    this->__set_failbit_and_consider_rethrow();
-                }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            }
-            else
-                this->setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(bool __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(short __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            ios_base::fmtflags __flags = ios_base::flags() & ios_base::basefield;
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(),
-                        __flags == ios_base::oct || __flags == ios_base::hex ?
-                        static_cast<long>(static_cast<unsigned short>(__n))  :
-                        static_cast<long>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(unsigned short __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), static_cast<unsigned long>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(int __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            ios_base::fmtflags __flags = ios_base::flags() & ios_base::basefield;
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(),
-                        __flags == ios_base::oct || __flags == ios_base::hex ?
-                        static_cast<long>(static_cast<unsigned int>(__n))  :
-                        static_cast<long>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(unsigned int __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), static_cast<unsigned long>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(long __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(unsigned long __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(long long __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(unsigned long long __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(float __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), static_cast<double>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(double __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(long double __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(const void* __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-__put_character_sequence(basic_ostream<_CharT, _Traits>& __os,
-                          const _CharT* __str, size_t __len)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
-            if (__pad_and_output(_Ip(__os),
-                                 __str,
-                                 (__os.flags() & ios_base::adjustfield) == ios_base::left ?
-                                     __str + __len :
-                                     __str,
-                                 __str + __len,
-                                 __os,
-                                 __os.fill()).failed())
-                __os.setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, _CharT __c)
-{
-    return _VSTD::__put_character_sequence(__os, &__c, 1);
-}
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, char __cn)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            _CharT __c = __os.widen(__cn);
-            typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
-            if (__pad_and_output(_Ip(__os),
-                                 &__c,
-                                 (__os.flags() & ios_base::adjustfield) == ios_base::left ?
-                                     &__c + 1 :
-                                     &__c,
-                                 &__c + 1,
-                                 __os,
-                                 __os.fill()).failed())
-                __os.setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, char __c)
-{
-    return _VSTD::__put_character_sequence(__os, &__c, 1);
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, signed char __c)
-{
-    return _VSTD::__put_character_sequence(__os, (char *) &__c, 1);
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, unsigned char __c)
-{
-    return _VSTD::__put_character_sequence(__os, (char *) &__c, 1);
-}
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const _CharT* __str)
-{
-    return _VSTD::__put_character_sequence(__os, __str, _Traits::length(__str));
-}
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const char* __strn)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
-            size_t __len = char_traits<char>::length(__strn);
-            const int __bs = 100;
-            _CharT __wbb[__bs];
-            _CharT* __wb = __wbb;
-            unique_ptr<_CharT, void(*)(void*)> __h(0, free);
-            if (__len > __bs)
-            {
-                __wb = (_CharT*)malloc(__len*sizeof(_CharT));
-                if (__wb == 0)
-                    __throw_bad_alloc();
-                __h.reset(__wb);
-            }
-            for (_CharT* __p = __wb; *__strn != '\0'; ++__strn, ++__p)
-                *__p = __os.widen(*__strn);
-            if (__pad_and_output(_Ip(__os),
-                                 __wb,
-                                 (__os.flags() & ios_base::adjustfield) == ios_base::left ?
-                                     __wb + __len :
-                                     __wb,
-                                 __wb + __len,
-                                 __os,
-                                 __os.fill()).failed())
-                __os.setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, const char* __str)
-{
-    return _VSTD::__put_character_sequence(__os, __str, _Traits::length(__str));
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, const signed char* __str)
-{
-    const char *__s = (const char *) __str;
-    return _VSTD::__put_character_sequence(__os, __s, _Traits::length(__s));
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, const unsigned char* __str)
-{
-    const char *__s = (const char *) __str;
-    return _VSTD::__put_character_sequence(__os, __s, _Traits::length(__s));
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::put(char_type __c)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Op;
-            _Op __o(*this);
-            *__o = __c;
-            if (__o.failed())
-                this->setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::write(const char_type* __s, streamsize __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this);
-        if (__sen && __n)
-        {
-            if (this->rdbuf()->sputn(__s, __n) != __n)
-                this->setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::flush()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if (this->rdbuf())
-        {
-            sentry __s(*this);
-            if (__s)
-            {
-                if (this->rdbuf()->pubsync() == -1)
-                    this->setstate(ios_base::badbit);
-            }
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_ostream<_CharT, _Traits>::pos_type
-basic_ostream<_CharT, _Traits>::tellp()
-{
-    if (this->fail())
-        return pos_type(-1);
-    return this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::out);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::seekp(pos_type __pos)
-{
-    sentry __s(*this);
-    if (__s)
-    {
-        if (this->rdbuf()->pubseekpos(__pos, ios_base::out) == pos_type(-1))
-            this->setstate(ios_base::failbit);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::seekp(off_type __off, ios_base::seekdir __dir)
-{
-    sentry __s(*this);
-    if (__s)
-    {
-        if (this->rdbuf()->pubseekoff(__off, __dir, ios_base::out) == pos_type(-1))
-            this->setstate(ios_base::failbit);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-endl(basic_ostream<_CharT, _Traits>& __os)
-{
-    __os.put(__os.widen('\n'));
-    __os.flush();
-    return __os;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-ends(basic_ostream<_CharT, _Traits>& __os)
-{
-    __os.put(_CharT());
-    return __os;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-flush(basic_ostream<_CharT, _Traits>& __os)
-{
-    __os.flush();
-    return __os;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Stream, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_lvalue_reference<_Stream>::value &&
-    is_base_of<ios_base, _Stream>::value,
-    _Stream&&
->::type
-operator<<(_Stream&& __os, const _Tp& __x)
-{
-    __os << __x;
-    return _VSTD::move(__os);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const basic_string<_CharT, _Traits, _Allocator>& __str)
-{
-    return _VSTD::__put_character_sequence(__os, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const error_code& __ec)
-{
-    return __os << __ec.category().name() << ':' << __ec.value();
-}
-
-template<class _CharT, class _Traits, class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, shared_ptr<_Yp> const& __p)
-{
-    return __os << __p.get();
-}
-
-template <class _CharT, class _Traits, size_t _Size>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Size>& __x)
-{
-    return __os << __x.template to_string<_CharT, _Traits>
-                        (use_facet<ctype<_CharT> >(__os.getloc()).widen('0'),
-                         use_facet<ctype<_CharT> >(__os.getloc()).widen('1'));
-}
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ostream<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ostream<wchar_t>)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_OSTREAM
diff --git a/include.new/c++/v1/queue b/include.new/c++/v1/queue
deleted file mode 100644
index bdfd706..0000000
--- a/include.new/c++/v1/queue
+++ /dev/null
@@ -1,717 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- queue ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_QUEUE
-#define _LIBCPP_QUEUE
-
-/*
-    queue synopsis
-
-namespace std
-{
-
-template <class T, class Container = deque<T>>
-class queue
-{
-public:
-    typedef Container                                container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-
-public:
-    queue() = default;
-    ~queue() = default;
-
-    queue(const queue& q) = default;
-    queue(queue&& q) = default;
-
-    queue& operator=(const queue& q) = default;
-    queue& operator=(queue&& q) = default;
-
-    explicit queue(const container_type& c);
-    explicit queue(container_type&& c)
-    template <class Alloc>
-        explicit queue(const Alloc& a);
-    template <class Alloc>
-        queue(const container_type& c, const Alloc& a);
-    template <class Alloc>
-        queue(container_type&& c, const Alloc& a);
-    template <class Alloc>
-        queue(const queue& q, const Alloc& a);
-    template <class Alloc>
-        queue(queue&& q, const Alloc& a);
-
-    bool      empty() const;
-    size_type size() const;
-
-    reference       front();
-    const_reference front() const;
-    reference       back();
-    const_reference back() const;
-
-    void push(const value_type& v);
-    void push(value_type&& v);
-    template <class... Args> void emplace(Args&&... args);
-    void pop();
-
-    void swap(queue& q) noexcept(noexcept(swap(c, q.c)));
-};
-
-template <class T, class Container>
-  bool operator==(const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator< (const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator!=(const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator> (const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator>=(const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator<=(const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  void swap(queue<T, Container>& x, queue<T, Container>& y)
-  noexcept(noexcept(x.swap(y)));
-
-template <class T, class Container = vector<T>,
-          class Compare = less<typename Container::value_type>>
-class priority_queue
-{
-public:
-    typedef Container                                container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-    Compare comp;
-
-public:
-    priority_queue() = default;
-    ~priority_queue() = default;
-
-    priority_queue(const priority_queue& q) = default;
-    priority_queue(priority_queue&& q) = default;
-
-    priority_queue& operator=(const priority_queue& q) = default;
-    priority_queue& operator=(priority_queue&& q) = default;
-
-    explicit priority_queue(const Compare& comp);
-    priority_queue(const Compare& comp, const container_type& c);
-    explicit priority_queue(const Compare& comp, container_type&& c);
-    template <class InputIterator>
-        priority_queue(InputIterator first, InputIterator last,
-                       const Compare& comp = Compare());
-    template <class InputIterator>
-        priority_queue(InputIterator first, InputIterator last,
-                       const Compare& comp, const container_type& c);
-    template <class InputIterator>
-        priority_queue(InputIterator first, InputIterator last,
-                       const Compare& comp, container_type&& c);
-    template <class Alloc>
-        explicit priority_queue(const Alloc& a);
-    template <class Alloc>
-        priority_queue(const Compare& comp, const Alloc& a);
-    template <class Alloc>
-        priority_queue(const Compare& comp, const container_type& c,
-                       const Alloc& a);
-    template <class Alloc>
-        priority_queue(const Compare& comp, container_type&& c,
-                       const Alloc& a);
-    template <class Alloc>
-        priority_queue(const priority_queue& q, const Alloc& a);
-    template <class Alloc>
-        priority_queue(priority_queue&& q, const Alloc& a);
-
-    bool            empty() const;
-    size_type       size() const;
-    const_reference top() const;
-
-    void push(const value_type& v);
-    void push(value_type&& v);
-    template <class... Args> void emplace(Args&&... args);
-    void pop();
-
-    void swap(priority_queue& q)
-        noexcept(noexcept(swap(c, q.c)) && noexcept(swap(comp.q.comp)));
-};
-
-template <class T, class Container, class Compare>
-  void swap(priority_queue<T, Container, Compare>& x,
-            priority_queue<T, Container, Compare>& y)
-            noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <deque>
-#include <vector>
-#include <functional>
-#include <algorithm>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _Container> class _LIBCPP_TYPE_VIS_ONLY queue;
-
-template <class _Tp, class _Container>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y);
-
-template <class _Tp, class _Container>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y);
-
-template <class _Tp, class _Container = deque<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY queue
-{
-public:
-    typedef _Container                               container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    queue()
-        _NOEXCEPT_(is_nothrow_default_constructible<container_type>::value)
-        : c() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    queue(const queue& __q) : c(__q.c) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    queue(queue&& __q)
-        _NOEXCEPT_(is_nothrow_move_constructible<container_type>::value)
-        : c(_VSTD::move(__q.c)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    queue& operator=(const queue& __q) {c = __q.c; return *this;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    queue& operator=(queue&& __q)
-        _NOEXCEPT_(is_nothrow_move_assignable<container_type>::value)
-        {c = _VSTD::move(__q.c); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit queue(const container_type& __c)  : c(__c) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit queue(container_type&& __c) : c(_VSTD::move(__c)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit queue(const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(__a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        queue(const queue& __q, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(__q.c, __a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        queue(const container_type& __c, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(__c, __a) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        queue(container_type&& __c, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(_VSTD::move(__c), __a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        queue(queue&& __q, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(_VSTD::move(__q.c), __a) {}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const {return c.empty();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const  {return c.size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference       front()       {return c.front();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference front() const {return c.front();}
-    _LIBCPP_INLINE_VISIBILITY
-    reference       back()        {return c.back();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference back() const  {return c.back();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void push(const value_type& __v) {c.push_back(__v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void push(value_type&& __v)      {c.push_back(_VSTD::move(__v));}
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void emplace(_Args&&... __args)
-            {c.emplace_back(_VSTD::forward<_Args>(__args)...);}
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void pop() {c.pop_front();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(queue& __q)
-        _NOEXCEPT_(__is_nothrow_swappable<container_type>::value)
-    {
-        using _VSTD::swap;
-        swap(c, __q.c);
-    }
-
-    template <class _T1, class _C1>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    bool
-    operator==(const queue<_T1, _C1>& __x,const queue<_T1, _C1>& __y);
-
-    template <class _T1, class _C1>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    bool
-    operator< (const queue<_T1, _C1>& __x,const queue<_T1, _C1>& __y);
-};
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return __x.c == __y.c;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return __x.c < __y.c;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(queue<_Tp, _Container>& __x, queue<_Tp, _Container>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Tp, class _Container, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<queue<_Tp, _Container>, _Alloc>
-    : public uses_allocator<_Container, _Alloc>
-{
-};
-
-template <class _Tp, class _Container = vector<_Tp>,
-          class _Compare = less<typename _Container::value_type> >
-class _LIBCPP_TYPE_VIS_ONLY priority_queue
-{
-public:
-    typedef _Container                               container_type;
-    typedef _Compare                                 value_compare;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-    value_compare comp;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue()
-        _NOEXCEPT_(is_nothrow_default_constructible<container_type>::value &&
-                   is_nothrow_default_constructible<value_compare>::value)
-        : c(), comp() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue(const priority_queue& __q) : c(__q.c), comp(__q.comp) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue(priority_queue&& __q)
-        _NOEXCEPT_(is_nothrow_move_constructible<container_type>::value &&
-                   is_nothrow_move_constructible<value_compare>::value)
-        : c(_VSTD::move(__q.c)), comp(_VSTD::move(__q.comp)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue& operator=(const priority_queue& __q)
-        {c = __q.c; comp = __q.comp; return *this;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue& operator=(priority_queue&& __q)
-        _NOEXCEPT_(is_nothrow_move_assignable<container_type>::value &&
-                   is_nothrow_move_assignable<value_compare>::value)
-        {c = _VSTD::move(__q.c); comp = _VSTD::move(__q.comp); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit priority_queue(const value_compare& __comp)
-        : c(), comp(__comp) {}
-    priority_queue(const value_compare& __comp, const container_type& __c);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit priority_queue(const value_compare& __comp, container_type&& __c);
-#endif
-    template <class _InputIter>
-        priority_queue(_InputIter __f, _InputIter __l,
-                       const value_compare& __comp = value_compare());
-    template <class _InputIter>
-        priority_queue(_InputIter __f, _InputIter __l,
-                       const value_compare& __comp, const container_type& __c);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIter>
-        priority_queue(_InputIter __f, _InputIter __l,
-                       const value_compare& __comp, container_type&& __c);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        explicit priority_queue(const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-    template <class _Alloc>
-        priority_queue(const value_compare& __comp, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-    template <class _Alloc>
-        priority_queue(const value_compare& __comp, const container_type& __c,
-                       const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-    template <class _Alloc>
-        priority_queue(const priority_queue& __q, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        priority_queue(const value_compare& __comp, container_type&& __c,
-                       const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-    template <class _Alloc>
-        priority_queue(priority_queue&& __q, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool            empty() const {return c.empty();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type       size() const  {return c.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference top() const   {return c.front();}
-
-    void push(const value_type& __v);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void push(value_type&& __v);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args> void emplace(_Args&&... __args);
-#endif
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void pop();
-
-    void swap(priority_queue& __q)
-        _NOEXCEPT_(__is_nothrow_swappable<container_type>::value &&
-                   __is_nothrow_swappable<value_compare>::value);
-};
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const _Compare& __comp,
-                                                          const container_type& __c)
-    : c(__c),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const value_compare& __comp,
-                                                          container_type&& __c)
-    : c(_VSTD::move(__c)),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(_InputIter __f, _InputIter __l,
-                                                          const value_compare& __comp)
-    : c(__f, __l),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(_InputIter __f, _InputIter __l,
-                                                          const value_compare& __comp,
-                                                          const container_type& __c)
-    : c(__c),
-      comp(__comp)
-{
-    c.insert(c.end(), __f, __l);
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(_InputIter __f, _InputIter __l,
-                                                          const value_compare& __comp,
-                                                          container_type&& __c)
-    : c(_VSTD::move(__c)),
-      comp(__comp)
-{
-    c.insert(c.end(), __f, __l);
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(__a)
-{
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const value_compare& __comp,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(__a),
-      comp(__comp)
-{
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const value_compare& __comp,
-                                                          const container_type& __c,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(__c, __a),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const priority_queue& __q,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(__q.c, __a),
-      comp(__q.comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const value_compare& __comp,
-                                                          container_type&& __c,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(_VSTD::move(__c), __a),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(priority_queue&& __q,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(_VSTD::move(__q.c), __a),
-      comp(_VSTD::move(__q.comp))
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::push(const value_type& __v)
-{
-    c.push_back(__v);
-    _VSTD::push_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::push(value_type&& __v)
-{
-    c.push_back(_VSTD::move(__v));
-    _VSTD::push_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Container, class _Compare>
-template <class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::emplace(_Args&&... __args)
-{
-    c.emplace_back(_VSTD::forward<_Args>(__args)...);
-    _VSTD::push_heap(c.begin(), c.end(), comp);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::pop()
-{
-    _VSTD::pop_heap(c.begin(), c.end(), comp);
-    c.pop_back();
-}
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::swap(priority_queue& __q)
-        _NOEXCEPT_(__is_nothrow_swappable<container_type>::value &&
-                   __is_nothrow_swappable<value_compare>::value)
-{
-    using _VSTD::swap;
-    swap(c, __q.c);
-    swap(comp, __q.comp);
-}
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(priority_queue<_Tp, _Container, _Compare>& __x,
-     priority_queue<_Tp, _Container, _Compare>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Tp, class _Container, class _Compare, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<priority_queue<_Tp, _Container, _Compare>, _Alloc>
-    : public uses_allocator<_Container, _Alloc>
-{
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_QUEUE
diff --git a/include.new/c++/v1/random b/include.new/c++/v1/random
deleted file mode 100644
index a8d21a2..0000000
--- a/include.new/c++/v1/random
+++ /dev/null
@@ -1,6728 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- random -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_RANDOM
-#define _LIBCPP_RANDOM
-
-/*
-    random synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-// Engines
-
-template <class UIntType, UIntType a, UIntType c, UIntType m>
-class linear_congruential_engine
-{
-public:
-    // types
-    typedef UIntType result_type;
-
-    // engine characteristics
-    static constexpr result_type multiplier = a;
-    static constexpr result_type increment = c;
-    static constexpr result_type modulus = m;
-    static constexpr result_type min() { return c == 0u ? 1u: 0u;}
-    static constexpr result_type max() { return m - 1u;}
-    static constexpr result_type default_seed = 1u;
-
-    // constructors and seeding functions
-    explicit linear_congruential_engine(result_type s = default_seed);
-    template<class Sseq> explicit linear_congruential_engine(Sseq& q);
-    void seed(result_type s = default_seed);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-};
-
-template <class UIntType, UIntType a, UIntType c, UIntType m>
-bool
-operator==(const linear_congruential_engine<UIntType, a, c, m>& x,
-           const linear_congruential_engine<UIntType, a, c, m>& y);
-
-template <class UIntType, UIntType a, UIntType c, UIntType m>
-bool
-operator!=(const linear_congruential_engine<UIntType, a, c, m>& x,
-           const linear_congruential_engine<UIntType, a, c, m>& y);
-
-template <class charT, class traits,
-          class UIntType, UIntType a, UIntType c, UIntType m>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const linear_congruential_engine<UIntType, a, c, m>& x);
-
-template <class charT, class traits,
-          class UIntType, UIntType a, UIntType c, UIntType m>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           linear_congruential_engine<UIntType, a, c, m>& x);
-
-template <class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-class mersenne_twister_engine
-{
-public:
-    // types
-    typedef UIntType result_type;
-
-    // engine characteristics
-    static constexpr size_t word_size = w;
-    static constexpr size_t state_size = n;
-    static constexpr size_t shift_size = m;
-    static constexpr size_t mask_bits = r;
-    static constexpr result_type xor_mask = a;
-    static constexpr size_t tempering_u = u;
-    static constexpr result_type tempering_d = d;
-    static constexpr size_t tempering_s = s;
-    static constexpr result_type tempering_b = b;
-    static constexpr size_t tempering_t = t;
-    static constexpr result_type tempering_c = c;
-    static constexpr size_t tempering_l = l;
-    static constexpr result_type initialization_multiplier = f;
-    static constexpr result_type min () { return 0; }
-    static constexpr result_type max() { return 2^w - 1; }
-    static constexpr result_type default_seed = 5489u;
-
-    // constructors and seeding functions
-    explicit mersenne_twister_engine(result_type value = default_seed);
-    template<class Sseq> explicit mersenne_twister_engine(Sseq& q);
-    void seed(result_type value = default_seed);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-};
-
-template <class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-bool
-operator==(
-    const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& x,
-    const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& y);
-
-template <class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-bool
-operator!=(
-    const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& x,
-    const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& y);
-
-template <class charT, class traits,
-          class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& x);
-
-template <class charT, class traits,
-          class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& x);
-
-template<class UIntType, size_t w, size_t s, size_t r>
-class subtract_with_carry_engine
-{
-public:
-    // types
-    typedef UIntType result_type;
-
-    // engine characteristics
-    static constexpr size_t word_size = w;
-    static constexpr size_t short_lag = s;
-    static constexpr size_t long_lag = r;
-    static constexpr result_type min() { return 0; }
-    static constexpr result_type max() { return m-1; }
-    static constexpr result_type default_seed = 19780503u;
-
-    // constructors and seeding functions
-    explicit subtract_with_carry_engine(result_type value = default_seed);
-    template<class Sseq> explicit subtract_with_carry_engine(Sseq& q);
-    void seed(result_type value = default_seed);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-};
-
-template<class UIntType, size_t w, size_t s, size_t r>
-bool
-operator==(
-    const subtract_with_carry_engine<UIntType, w, s, r>& x,
-    const subtract_with_carry_engine<UIntType, w, s, r>& y);
-
-template<class UIntType, size_t w, size_t s, size_t r>
-bool
-operator!=(
-    const subtract_with_carry_engine<UIntType, w, s, r>& x,
-    const subtract_with_carry_engine<UIntType, w, s, r>& y);
-
-template <class charT, class traits,
-          class UIntType, size_t w, size_t s, size_t r>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const subtract_with_carry_engine<UIntType, w, s, r>& x);
-
-template <class charT, class traits,
-          class UIntType, size_t w, size_t s, size_t r>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           subtract_with_carry_engine<UIntType, w, s, r>& x);
-
-template<class Engine, size_t p, size_t r>
-class discard_block_engine
-{
-public:
-    // types
-    typedef typename Engine::result_type result_type;
-
-    // engine characteristics
-    static constexpr size_t block_size = p;
-    static constexpr size_t used_block = r;
-    static constexpr result_type min() { return Engine::min(); }
-    static constexpr result_type max() { return Engine::max(); }
-
-    // constructors and seeding functions
-    discard_block_engine();
-    explicit discard_block_engine(const Engine& e);
-    explicit discard_block_engine(Engine&& e);
-    explicit discard_block_engine(result_type s);
-    template<class Sseq> explicit discard_block_engine(Sseq& q);
-    void seed();
-    void seed(result_type s);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-
-    // property functions
-    const Engine& base() const noexcept;
-};
-
-template<class Engine, size_t p, size_t r>
-bool
-operator==(
-    const discard_block_engine<Engine, p, r>& x,
-    const discard_block_engine<Engine, p, r>& y);
-
-template<class Engine, size_t p, size_t r>
-bool
-operator!=(
-    const discard_block_engine<Engine, p, r>& x,
-    const discard_block_engine<Engine, p, r>& y);
-
-template <class charT, class traits,
-          class Engine, size_t p, size_t r>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const discard_block_engine<Engine, p, r>& x);
-
-template <class charT, class traits,
-          class Engine, size_t p, size_t r>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           discard_block_engine<Engine, p, r>& x);
-
-template<class Engine, size_t w, class UIntType>
-class independent_bits_engine
-{
-public:
-    // types
-    typedef UIntType result_type;
-
-    // engine characteristics
-    static constexpr result_type min() { return 0; }
-    static constexpr result_type max() { return 2^w - 1; }
-
-    // constructors and seeding functions
-    independent_bits_engine();
-    explicit independent_bits_engine(const Engine& e);
-    explicit independent_bits_engine(Engine&& e);
-    explicit independent_bits_engine(result_type s);
-    template<class Sseq> explicit independent_bits_engine(Sseq& q);
-    void seed();
-    void seed(result_type s);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()(); void discard(unsigned long long z);
-
-    // property functions
-    const Engine& base() const noexcept;
-};
-
-template<class Engine, size_t w, class UIntType>
-bool
-operator==(
-    const independent_bits_engine<Engine, w, UIntType>& x,
-    const independent_bits_engine<Engine, w, UIntType>& y);
-
-template<class Engine, size_t w, class UIntType>
-bool
-operator!=(
-    const independent_bits_engine<Engine, w, UIntType>& x,
-    const independent_bits_engine<Engine, w, UIntType>& y);
-
-template <class charT, class traits,
-          class Engine, size_t w, class UIntType>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const independent_bits_engine<Engine, w, UIntType>& x);
-
-template <class charT, class traits,
-          class Engine, size_t w, class UIntType>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           independent_bits_engine<Engine, w, UIntType>& x);
-
-template<class Engine, size_t k>
-class shuffle_order_engine
-{
-public:
-    // types
-    typedef typename Engine::result_type result_type;
-
-    // engine characteristics
-    static constexpr size_t table_size = k;
-    static constexpr result_type min() { return Engine::min; }
-    static constexpr result_type max() { return Engine::max; }
-
-    // constructors and seeding functions
-    shuffle_order_engine();
-    explicit shuffle_order_engine(const Engine& e);
-    explicit shuffle_order_engine(Engine&& e);
-    explicit shuffle_order_engine(result_type s);
-    template<class Sseq> explicit shuffle_order_engine(Sseq& q);
-    void seed();
-    void seed(result_type s);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-
-    // property functions
-    const Engine& base() const noexcept;
-};
-
-template<class Engine, size_t k>
-bool
-operator==(
-    const shuffle_order_engine<Engine, k>& x,
-    const shuffle_order_engine<Engine, k>& y);
-
-template<class Engine, size_t k>
-bool
-operator!=(
-    const shuffle_order_engine<Engine, k>& x,
-    const shuffle_order_engine<Engine, k>& y);
-
-template <class charT, class traits,
-          class Engine, size_t k>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const shuffle_order_engine<Engine, k>& x);
-
-template <class charT, class traits,
-          class Engine, size_t k>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           shuffle_order_engine<Engine, k>& x);
-
-typedef linear_congruential_engine<uint_fast32_t, 16807, 0, 2147483647>
-                                                                   minstd_rand0;
-typedef linear_congruential_engine<uint_fast32_t, 48271, 0, 2147483647>
-                                                                    minstd_rand;
-typedef mersenne_twister_engine<uint_fast32_t, 32, 624, 397, 31,
-                                0x9908b0df,
-                                11, 0xffffffff,
-                                7,  0x9d2c5680,
-                                15, 0xefc60000,
-                                18, 1812433253>                         mt19937;
-typedef mersenne_twister_engine<uint_fast64_t, 64, 312, 156, 31,
-                                0xb5026f5aa96619e9,
-                                29, 0x5555555555555555,
-                                17, 0x71d67fffeda60000,
-                                37, 0xfff7eee000000000,
-                                43, 6364136223846793005>             mt19937_64;
-typedef subtract_with_carry_engine<uint_fast32_t, 24, 10, 24>     ranlux24_base;
-typedef subtract_with_carry_engine<uint_fast64_t, 48,  5, 12>     ranlux48_base;
-typedef discard_block_engine<ranlux24_base, 223, 23>                   ranlux24;
-typedef discard_block_engine<ranlux48_base, 389, 11>                   ranlux48;
-typedef shuffle_order_engine<minstd_rand0, 256>                         knuth_b;
-typedef minstd_rand                                       default_random_engine;
-
-// Generators
-
-class random_device
-{
-public:
-    // types
-    typedef unsigned int result_type;
-
-    // generator characteristics
-    static constexpr result_type min() { return numeric_limits<result_type>::min(); }
-    static constexpr result_type max() { return numeric_limits<result_type>::max(); }
-
-    // constructors
-    explicit random_device(const string& token = "/dev/urandom");
-
-    // generating functions
-    result_type operator()();
-
-    // property functions
-    double entropy() const noexcept;
-
-    // no copy functions
-    random_device(const random_device& ) = delete;
-    void operator=(const random_device& ) = delete;
-};
-
-// Utilities
-
-class seed_seq
-{
-public:
-    // types
-    typedef uint_least32_t result_type;
-
-    // constructors
-    seed_seq();
-    template<class T>
-        seed_seq(initializer_list<T> il);
-    template<class InputIterator>
-        seed_seq(InputIterator begin, InputIterator end);
-
-    // generating functions
-    template<class RandomAccessIterator>
-        void generate(RandomAccessIterator begin, RandomAccessIterator end);
-
-    // property functions
-    size_t size() const;
-    template<class OutputIterator>
-        void param(OutputIterator dest) const;
-
-    // no copy functions
-    seed_seq(const seed_seq&) = delete;
-    void operator=(const seed_seq& ) = delete;
-};
-
-template<class RealType, size_t bits, class URNG>
-    RealType generate_canonical(URNG& g);
-
-// Distributions
-
-template<class IntType = int>
-class uniform_int_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef uniform_int_distribution distribution_type;
-
-        explicit param_type(IntType a = 0,
-                                    IntType b = numeric_limits<IntType>::max());
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit uniform_int_distribution(IntType a = 0,
-                                    IntType b = numeric_limits<IntType>::max());
-    explicit uniform_int_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const uniform_int_distribution& x,
-                           const uniform_int_distribution& y);
-    friend bool operator!=(const uniform_int_distribution& x,
-                           const uniform_int_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const uniform_int_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               uniform_int_distribution& x);
-};
-
-template<class RealType = double>
-class uniform_real_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef uniform_real_distribution distribution_type;
-
-        explicit param_type(RealType a = 0,
-                            RealType b = 1);
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit uniform_real_distribution(RealType a = 0.0, RealType b = 1.0);
-    explicit uniform_real_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const uniform_real_distribution& x,
-                           const uniform_real_distribution& y);
-    friend bool operator!=(const uniform_real_distribution& x,
-                           const uniform_real_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const uniform_real_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               uniform_real_distribution& x);
-};
-
-class bernoulli_distribution
-{
-public:
-    // types
-    typedef bool result_type;
-
-    class param_type
-    {
-    public:
-        typedef bernoulli_distribution distribution_type;
-
-        explicit param_type(double p = 0.5);
-
-        double p() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit bernoulli_distribution(double p = 0.5);
-    explicit bernoulli_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    double p() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const bernoulli_distribution& x,
-                           const bernoulli_distribution& y);
-    friend bool operator!=(const bernoulli_distribution& x,
-                           const bernoulli_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const bernoulli_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               bernoulli_distribution& x);
-};
-
-template<class IntType = int>
-class binomial_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef binomial_distribution distribution_type;
-
-        explicit param_type(IntType t = 1, double p = 0.5);
-
-        IntType t() const;
-        double p() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit binomial_distribution(IntType t = 1, double p = 0.5);
-    explicit binomial_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    IntType t() const;
-    double p() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const binomial_distribution& x,
-                           const binomial_distribution& y);
-    friend bool operator!=(const binomial_distribution& x,
-                           const binomial_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const binomial_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               binomial_distribution& x);
-};
-
-template<class IntType = int>
-class geometric_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef geometric_distribution distribution_type;
-
-        explicit param_type(double p = 0.5);
-
-        double p() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit geometric_distribution(double p = 0.5);
-    explicit geometric_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    double p() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const geometric_distribution& x,
-                           const geometric_distribution& y);
-    friend bool operator!=(const geometric_distribution& x,
-                           const geometric_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const geometric_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               geometric_distribution& x);
-};
-
-template<class IntType = int>
-class negative_binomial_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef negative_binomial_distribution distribution_type;
-
-        explicit param_type(result_type k = 1, double p = 0.5);
-
-        result_type k() const;
-        double p() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit negative_binomial_distribution(result_type k = 1, double p = 0.5);
-    explicit negative_binomial_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type k() const;
-    double p() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const negative_binomial_distribution& x,
-                           const negative_binomial_distribution& y);
-    friend bool operator!=(const negative_binomial_distribution& x,
-                           const negative_binomial_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const negative_binomial_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               negative_binomial_distribution& x);
-};
-
-template<class IntType = int>
-class poisson_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef poisson_distribution distribution_type;
-
-        explicit param_type(double mean = 1.0);
-
-        double mean() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit poisson_distribution(double mean = 1.0);
-    explicit poisson_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    double mean() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const poisson_distribution& x,
-                           const poisson_distribution& y);
-    friend bool operator!=(const poisson_distribution& x,
-                           const poisson_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const poisson_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               poisson_distribution& x);
-};
-
-template<class RealType = double>
-class exponential_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef exponential_distribution distribution_type;
-
-        explicit param_type(result_type lambda = 1.0);
-
-        result_type lambda() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit exponential_distribution(result_type lambda = 1.0);
-    explicit exponential_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type lambda() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const exponential_distribution& x,
-                           const exponential_distribution& y);
-    friend bool operator!=(const exponential_distribution& x,
-                           const exponential_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const exponential_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               exponential_distribution& x);
-};
-
-template<class RealType = double>
-class gamma_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef gamma_distribution distribution_type;
-
-        explicit param_type(result_type alpha = 1, result_type beta = 1);
-
-        result_type alpha() const;
-        result_type beta() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit gamma_distribution(result_type alpha = 1, result_type beta = 1);
-    explicit gamma_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type alpha() const;
-    result_type beta() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const gamma_distribution& x,
-                           const gamma_distribution& y);
-    friend bool operator!=(const gamma_distribution& x,
-                           const gamma_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const gamma_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               gamma_distribution& x);
-};
-
-template<class RealType = double>
-class weibull_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef weibull_distribution distribution_type;
-
-        explicit param_type(result_type alpha = 1, result_type beta = 1);
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit weibull_distribution(result_type a = 1, result_type b = 1);
-    explicit weibull_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const weibull_distribution& x,
-                           const weibull_distribution& y);
-    friend bool operator!=(const weibull_distribution& x,
-                           const weibull_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const weibull_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               weibull_distribution& x);
-};
-
-template<class RealType = double>
-class extreme_value_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef extreme_value_distribution distribution_type;
-
-        explicit param_type(result_type a = 0, result_type b = 1);
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit extreme_value_distribution(result_type a = 0, result_type b = 1);
-    explicit extreme_value_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const extreme_value_distribution& x,
-                           const extreme_value_distribution& y);
-    friend bool operator!=(const extreme_value_distribution& x,
-                           const extreme_value_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const extreme_value_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               extreme_value_distribution& x);
-};
-
-template<class RealType = double>
-class normal_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef normal_distribution distribution_type;
-
-        explicit param_type(result_type mean = 0, result_type stddev = 1);
-
-        result_type mean() const;
-        result_type stddev() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit normal_distribution(result_type mean = 0, result_type stddev = 1);
-    explicit normal_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type mean() const;
-    result_type stddev() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const normal_distribution& x,
-                           const normal_distribution& y);
-    friend bool operator!=(const normal_distribution& x,
-                           const normal_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const normal_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               normal_distribution& x);
-};
-
-template<class RealType = double>
-class lognormal_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef lognormal_distribution distribution_type;
-
-        explicit param_type(result_type m = 0, result_type s = 1);
-
-        result_type m() const;
-        result_type s() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit lognormal_distribution(result_type m = 0, result_type s = 1);
-    explicit lognormal_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type m() const;
-    result_type s() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const lognormal_distribution& x,
-                           const lognormal_distribution& y);
-    friend bool operator!=(const lognormal_distribution& x,
-                           const lognormal_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const lognormal_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               lognormal_distribution& x);
-};
-
-template<class RealType = double>
-class chi_squared_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef chi_squared_distribution distribution_type;
-
-        explicit param_type(result_type n = 1);
-
-        result_type n() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit chi_squared_distribution(result_type n = 1);
-    explicit chi_squared_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type n() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const chi_squared_distribution& x,
-                           const chi_squared_distribution& y);
-    friend bool operator!=(const chi_squared_distribution& x,
-                           const chi_squared_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const chi_squared_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               chi_squared_distribution& x);
-};
-
-template<class RealType = double>
-class cauchy_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef cauchy_distribution distribution_type;
-
-        explicit param_type(result_type a = 0, result_type b = 1);
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit cauchy_distribution(result_type a = 0, result_type b = 1);
-    explicit cauchy_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const cauchy_distribution& x,
-                           const cauchy_distribution& y);
-    friend bool operator!=(const cauchy_distribution& x,
-                           const cauchy_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const cauchy_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               cauchy_distribution& x);
-};
-
-template<class RealType = double>
-class fisher_f_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef fisher_f_distribution distribution_type;
-
-        explicit param_type(result_type m = 1, result_type n = 1);
-
-        result_type m() const;
-        result_type n() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit fisher_f_distribution(result_type m = 1, result_type n = 1);
-    explicit fisher_f_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type m() const;
-    result_type n() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const fisher_f_distribution& x,
-                           const fisher_f_distribution& y);
-    friend bool operator!=(const fisher_f_distribution& x,
-                           const fisher_f_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const fisher_f_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               fisher_f_distribution& x);
-};
-
-template<class RealType = double>
-class student_t_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef student_t_distribution distribution_type;
-
-        explicit param_type(result_type n = 1);
-
-        result_type n() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit student_t_distribution(result_type n = 1);
-    explicit student_t_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type n() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const student_t_distribution& x,
-                           const student_t_distribution& y);
-    friend bool operator!=(const student_t_distribution& x,
-                           const student_t_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const student_t_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               student_t_distribution& x);
-};
-
-template<class IntType = int>
-class discrete_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef discrete_distribution distribution_type;
-
-        param_type();
-        template<class InputIterator>
-            param_type(InputIterator firstW, InputIterator lastW);
-        param_type(initializer_list<double> wl);
-        template<class UnaryOperation>
-            param_type(size_t nw, double xmin, double xmax, UnaryOperation fw);
-
-        vector<double> probabilities() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    discrete_distribution();
-    template<class InputIterator>
-        discrete_distribution(InputIterator firstW, InputIterator lastW);
-    discrete_distribution(initializer_list<double> wl);
-    template<class UnaryOperation>
-        discrete_distribution(size_t nw, double xmin, double xmax,
-                              UnaryOperation fw);
-    explicit discrete_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    vector<double> probabilities() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const discrete_distribution& x,
-                           const discrete_distribution& y);
-    friend bool operator!=(const discrete_distribution& x,
-                           const discrete_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const discrete_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               discrete_distribution& x);
-};
-
-template<class RealType = double>
-class piecewise_constant_distribution
-{
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef piecewise_constant_distribution distribution_type;
-
-        param_type();
-        template<class InputIteratorB, class InputIteratorW>
-            param_type(InputIteratorB firstB, InputIteratorB lastB,
-                       InputIteratorW firstW);
-        template<class UnaryOperation>
-            param_type(initializer_list<result_type> bl, UnaryOperation fw);
-        template<class UnaryOperation>
-            param_type(size_t nw, result_type xmin, result_type xmax,
-                       UnaryOperation fw);
-
-        vector<result_type> intervals() const;
-        vector<result_type> densities() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    piecewise_constant_distribution();
-    template<class InputIteratorB, class InputIteratorW>
-        piecewise_constant_distribution(InputIteratorB firstB,
-                                        InputIteratorB lastB,
-                                        InputIteratorW firstW);
-    template<class UnaryOperation>
-        piecewise_constant_distribution(initializer_list<result_type> bl,
-                                        UnaryOperation fw);
-    template<class UnaryOperation>
-        piecewise_constant_distribution(size_t nw, result_type xmin,
-                                        result_type xmax, UnaryOperation fw);
-    explicit piecewise_constant_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    vector<result_type> intervals() const;
-    vector<result_type> densities() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const piecewise_constant_distribution& x,
-                           const piecewise_constant_distribution& y);
-    friend bool operator!=(const piecewise_constant_distribution& x,
-                           const piecewise_constant_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const piecewise_constant_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               piecewise_constant_distribution& x);
-};
-
-template<class RealType = double>
-class piecewise_linear_distribution
-{
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef piecewise_linear_distribution distribution_type;
-
-        param_type();
-        template<class InputIteratorB, class InputIteratorW>
-            param_type(InputIteratorB firstB, InputIteratorB lastB,
-                       InputIteratorW firstW);
-        template<class UnaryOperation>
-            param_type(initializer_list<result_type> bl, UnaryOperation fw);
-        template<class UnaryOperation>
-            param_type(size_t nw, result_type xmin, result_type xmax,
-                       UnaryOperation fw);
-
-        vector<result_type> intervals() const;
-        vector<result_type> densities() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    piecewise_linear_distribution();
-    template<class InputIteratorB, class InputIteratorW>
-        piecewise_linear_distribution(InputIteratorB firstB,
-                                      InputIteratorB lastB,
-                                      InputIteratorW firstW);
-
-    template<class UnaryOperation>
-        piecewise_linear_distribution(initializer_list<result_type> bl,
-                                      UnaryOperation fw);
-
-    template<class UnaryOperation>
-        piecewise_linear_distribution(size_t nw, result_type xmin,
-                                      result_type xmax, UnaryOperation fw);
-
-    explicit piecewise_linear_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    vector<result_type> intervals() const;
-    vector<result_type> densities() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const piecewise_linear_distribution& x,
-                           const piecewise_linear_distribution& y);
-    friend bool operator!=(const piecewise_linear_distribution& x,
-                           const piecewise_linear_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const piecewise_linear_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               piecewise_linear_distribution& x);
-};
-
-} // std
-*/
-
-#include <__config>
-#include <cstddef>
-#include <type_traits>
-#include <initializer_list>
-#include <cstdint>
-#include <limits>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <string>
-#include <istream>
-#include <ostream>
-#include <cmath>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// __is_seed_sequence
-
-template <class _Sseq, class _Engine>
-struct __is_seed_sequence
-{
-    static _LIBCPP_CONSTEXPR const bool value =
-              !is_convertible<_Sseq, typename _Engine::result_type>::value &&
-              !is_same<typename remove_cv<_Sseq>::type, _Engine>::value;
-};
-
-// linear_congruential_engine
-
-template <unsigned long long __a, unsigned long long __c,
-          unsigned long long __m, unsigned long long _Mp,
-          bool _MightOverflow = (__a != 0 && __m != 0 && __m-1 > (_Mp-__c)/__a)>
-struct __lce_ta;
-
-// 64
-
-template <unsigned long long __a, unsigned long long __c, unsigned long long __m>
-struct __lce_ta<__a, __c, __m, (unsigned long long)(~0), true>
-{
-    typedef unsigned long long result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        // Schrage's algorithm
-        const result_type __q = __m / __a;
-        const result_type __r = __m % __a;
-        const result_type __t0 = __a * (__x % __q);
-        const result_type __t1 = __r * (__x / __q);
-        __x = __t0 + (__t0 < __t1) * __m - __t1;
-        __x += __c - (__x >= __m - __c) * __m;
-        return __x;
-    }
-};
-
-template <unsigned long long __a, unsigned long long __m>
-struct __lce_ta<__a, 0, __m, (unsigned long long)(~0), true>
-{
-    typedef unsigned long long result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        // Schrage's algorithm
-        const result_type __q = __m / __a;
-        const result_type __r = __m % __a;
-        const result_type __t0 = __a * (__x % __q);
-        const result_type __t1 = __r * (__x / __q);
-        __x = __t0 + (__t0 < __t1) * __m - __t1;
-        return __x;
-    }
-};
-
-template <unsigned long long __a, unsigned long long __c, unsigned long long __m>
-struct __lce_ta<__a, __c, __m, (unsigned long long)(~0), false>
-{
-    typedef unsigned long long result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        return (__a * __x + __c) % __m;
-    }
-};
-
-template <unsigned long long __a, unsigned long long __c>
-struct __lce_ta<__a, __c, 0, (unsigned long long)(~0), false>
-{
-    typedef unsigned long long result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        return __a * __x + __c;
-    }
-};
-
-// 32
-
-template <unsigned long long _Ap, unsigned long long _Cp, unsigned long long _Mp>
-struct __lce_ta<_Ap, _Cp, _Mp, unsigned(~0), true>
-{
-    typedef unsigned result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        const result_type __a = static_cast<result_type>(_Ap);
-        const result_type __c = static_cast<result_type>(_Cp);
-        const result_type __m = static_cast<result_type>(_Mp);
-        // Schrage's algorithm
-        const result_type __q = __m / __a;
-        const result_type __r = __m % __a;
-        const result_type __t0 = __a * (__x % __q);
-        const result_type __t1 = __r * (__x / __q);
-        __x = __t0 + (__t0 < __t1) * __m - __t1;
-        __x += __c - (__x >= __m - __c) * __m;
-        return __x;
-    }
-};
-
-template <unsigned long long _Ap, unsigned long long _Mp>
-struct __lce_ta<_Ap, 0, _Mp, unsigned(~0), true>
-{
-    typedef unsigned result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        const result_type __a = static_cast<result_type>(_Ap);
-        const result_type __m = static_cast<result_type>(_Mp);
-        // Schrage's algorithm
-        const result_type __q = __m / __a;
-        const result_type __r = __m % __a;
-        const result_type __t0 = __a * (__x % __q);
-        const result_type __t1 = __r * (__x / __q);
-        __x = __t0 + (__t0 < __t1) * __m - __t1;
-        return __x;
-    }
-};
-
-template <unsigned long long _Ap, unsigned long long _Cp, unsigned long long _Mp>
-struct __lce_ta<_Ap, _Cp, _Mp, unsigned(~0), false>
-{
-    typedef unsigned result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        const result_type __a = static_cast<result_type>(_Ap);
-        const result_type __c = static_cast<result_type>(_Cp);
-        const result_type __m = static_cast<result_type>(_Mp);
-        return (__a * __x + __c) % __m;
-    }
-};
-
-template <unsigned long long _Ap, unsigned long long _Cp>
-struct __lce_ta<_Ap, _Cp, 0, unsigned(~0), false>
-{
-    typedef unsigned result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        const result_type __a = static_cast<result_type>(_Ap);
-        const result_type __c = static_cast<result_type>(_Cp);
-        return __a * __x + __c;
-    }
-};
-
-// 16
-
-template <unsigned long long __a, unsigned long long __c, unsigned long long __m, bool __b>
-struct __lce_ta<__a, __c, __m, (unsigned short)(~0), __b>
-{
-    typedef unsigned short result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        return static_cast<result_type>(__lce_ta<__a, __c, __m, unsigned(~0)>::next(__x));
-    }
-};
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-class _LIBCPP_TYPE_VIS_ONLY linear_congruential_engine;
-
-template <class _CharT, class _Traits,
-          class _Up, _Up _Ap, _Up _Cp, _Up _Np>
-_LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const linear_congruential_engine<_Up, _Ap, _Cp, _Np>&);
-
-template <class _CharT, class _Traits,
-          class _Up, _Up _Ap, _Up _Cp, _Up _Np>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           linear_congruential_engine<_Up, _Ap, _Cp, _Np>& __x);
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-class _LIBCPP_TYPE_VIS_ONLY linear_congruential_engine
-{
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    result_type __x_;
-
-    static _LIBCPP_CONSTEXPR const result_type _Mp = result_type(~0);
-
-    static_assert(__m == 0 || __a < __m, "linear_congruential_engine invalid parameters");
-    static_assert(__m == 0 || __c < __m, "linear_congruential_engine invalid parameters");
-public:
-    static _LIBCPP_CONSTEXPR const result_type _Min = __c == 0u ? 1u: 0u;
-    static _LIBCPP_CONSTEXPR const result_type _Max = __m - 1u;
-    static_assert(_Min < _Max,           "linear_congruential_engine invalid parameters");
-
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const result_type multiplier = __a;
-    static _LIBCPP_CONSTEXPR const result_type increment = __c;
-    static _LIBCPP_CONSTEXPR const result_type modulus = __m;
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() {return _Min;}
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() {return _Max;}
-    static _LIBCPP_CONSTEXPR const result_type default_seed = 1u;
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit linear_congruential_engine(result_type __s = default_seed)
-        {seed(__s);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit linear_congruential_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, linear_congruential_engine>::value>::type* = 0)
-        {seed(__q);}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __s = default_seed)
-        {seed(integral_constant<bool, __m == 0>(),
-              integral_constant<bool, __c == 0>(), __s);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, linear_congruential_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q)
-            {__seed(__q, integral_constant<unsigned,
-                1 + (__m == 0 ? (sizeof(result_type) * __CHAR_BIT__ - 1)/32
-                             :  (__m > 0x100000000ull))>());}
-
-    // generating functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()()
-        {return __x_ = static_cast<result_type>(__lce_ta<__a, __c, __m, _Mp>::next(__x_));}
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const linear_congruential_engine& __x,
-                    const linear_congruential_engine& __y)
-        {return __x.__x_ == __y.__x_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const linear_congruential_engine& __x,
-                    const linear_congruential_engine& __y)
-        {return !(__x == __y);}
-
-private:
-
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(true_type, true_type, result_type __s) {__x_ = __s == 0 ? 1 : __s;}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(true_type, false_type, result_type __s) {__x_ = __s;}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(false_type, true_type, result_type __s) {__x_ = __s % __m == 0 ?
-                                                                 1 : __s % __m;}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(false_type, false_type, result_type __s) {__x_ = __s % __m;}
-
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 1>);
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 2>);
-
-    template <class _CharT, class _Traits,
-              class _Up, _Up _Ap, _Up _Cp, _Up _Np>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const linear_congruential_engine<_Up, _Ap, _Cp, _Np>&);
-
-    template <class _CharT, class _Traits,
-              class _Up, _Up _Ap, _Up _Cp, _Up _Np>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               linear_congruential_engine<_Up, _Ap, _Cp, _Np>& __x);
-};
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    _LIBCPP_CONSTEXPR const typename linear_congruential_engine<_UIntType, __a, __c, __m>::result_type
-    linear_congruential_engine<_UIntType, __a, __c, __m>::multiplier;
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    _LIBCPP_CONSTEXPR const typename linear_congruential_engine<_UIntType, __a, __c, __m>::result_type
-    linear_congruential_engine<_UIntType, __a, __c, __m>::increment;
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    _LIBCPP_CONSTEXPR const typename linear_congruential_engine<_UIntType, __a, __c, __m>::result_type
-    linear_congruential_engine<_UIntType, __a, __c, __m>::modulus;
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    _LIBCPP_CONSTEXPR const typename linear_congruential_engine<_UIntType, __a, __c, __m>::result_type
-    linear_congruential_engine<_UIntType, __a, __c, __m>::default_seed;
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-template<class _Sseq>
-void
-linear_congruential_engine<_UIntType, __a, __c, __m>::__seed(_Sseq& __q,
-                                                 integral_constant<unsigned, 1>)
-{
-    const unsigned __k = 1;
-    uint32_t __ar[__k+3];
-    __q.generate(__ar, __ar + __k + 3);
-    result_type __s = static_cast<result_type>(__ar[3] % __m);
-    __x_ = __c == 0 && __s == 0 ? result_type(1) : __s;
-}
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-template<class _Sseq>
-void
-linear_congruential_engine<_UIntType, __a, __c, __m>::__seed(_Sseq& __q,
-                                                 integral_constant<unsigned, 2>)
-{
-    const unsigned __k = 2;
-    uint32_t __ar[__k+3];
-    __q.generate(__ar, __ar + __k + 3);
-    result_type __s = static_cast<result_type>((__ar[3] +
-                                              ((uint64_t)__ar[4] << 32)) % __m);
-    __x_ = __c == 0 && __s == 0 ? result_type(1) : __s;
-}
-
-template <class _CharT, class _Traits,
-          class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const linear_congruential_engine<_UIntType, __a, __c, __m>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    __os.fill(__os.widen(' '));
-    return __os << __x.__x_;
-}
-
-template <class _CharT, class _Traits,
-          class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           linear_congruential_engine<_UIntType, __a, __c, __m>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _UIntType __t;
-    __is >> __t;
-    if (!__is.fail())
-        __x.__x_ = __t;
-    return __is;
-}
-
-typedef linear_congruential_engine<uint_fast32_t, 16807, 0, 2147483647>
-                                                                   minstd_rand0;
-typedef linear_congruential_engine<uint_fast32_t, 48271, 0, 2147483647>
-                                                                    minstd_rand;
-typedef minstd_rand                                       default_random_engine;
-// mersenne_twister_engine
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-class _LIBCPP_TYPE_VIS_ONLY mersenne_twister_engine;
-
-template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-bool
-operator==(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __y);
-
-template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __y);
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x);
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                   _Bp, _Tp, _Cp, _Lp, _Fp>& __x);
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-class _LIBCPP_TYPE_VIS_ONLY mersenne_twister_engine
-{
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    result_type __x_[__n];
-    size_t      __i_;
-
-    static_assert(  0 <  __m, "mersenne_twister_engine invalid parameters");
-    static_assert(__m <= __n, "mersenne_twister_engine invalid parameters");
-    static _LIBCPP_CONSTEXPR const result_type _Dt = numeric_limits<result_type>::digits;
-    static_assert(__w <= _Dt, "mersenne_twister_engine invalid parameters");
-    static_assert(  2 <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__r <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__u <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__s <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__t <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__l <= __w, "mersenne_twister_engine invalid parameters");
-public:
-    static _LIBCPP_CONSTEXPR const result_type _Min = 0;
-    static _LIBCPP_CONSTEXPR const result_type _Max = __w == _Dt ? result_type(~0) :
-                                                      (result_type(1) << __w) - result_type(1);
-    static_assert(_Min < _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__a <= _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__b <= _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__c <= _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__d <= _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__f <= _Max, "mersenne_twister_engine invalid parameters");
-
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const size_t word_size = __w;
-    static _LIBCPP_CONSTEXPR const size_t state_size = __n;
-    static _LIBCPP_CONSTEXPR const size_t shift_size = __m;
-    static _LIBCPP_CONSTEXPR const size_t mask_bits = __r;
-    static _LIBCPP_CONSTEXPR const result_type xor_mask = __a;
-    static _LIBCPP_CONSTEXPR const size_t tempering_u = __u;
-    static _LIBCPP_CONSTEXPR const result_type tempering_d = __d;
-    static _LIBCPP_CONSTEXPR const size_t tempering_s = __s;
-    static _LIBCPP_CONSTEXPR const result_type tempering_b = __b;
-    static _LIBCPP_CONSTEXPR const size_t tempering_t = __t;
-    static _LIBCPP_CONSTEXPR const result_type tempering_c = __c;
-    static _LIBCPP_CONSTEXPR const size_t tempering_l = __l;
-    static _LIBCPP_CONSTEXPR const result_type initialization_multiplier = __f;
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
-    static _LIBCPP_CONSTEXPR const result_type default_seed = 5489u;
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit mersenne_twister_engine(result_type __sd = default_seed)
-        {seed(__sd);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit mersenne_twister_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, mersenne_twister_engine>::value>::type* = 0)
-        {seed(__q);}
-    void seed(result_type __sd = default_seed);
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, mersenne_twister_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q)
-            {__seed(__q, integral_constant<unsigned, 1 + (__w - 1) / 32>());}
-
-    // generating functions
-    result_type operator()();
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-              _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-              _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-    friend
-    bool
-    operator==(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-               const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __y);
-
-    template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-              _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-              _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-    friend
-    bool
-    operator!=(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-               const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __y);
-
-    template <class _CharT, class _Traits,
-              class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-              _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-              _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __x);
-
-    template <class _CharT, class _Traits,
-              class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-              _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-              _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                       _Bp, _Tp, _Cp, _Lp, _Fp>& __x);
-private:
-
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 1>);
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 2>);
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            __count < __w,
-            result_type
-        >::type
-        __lshift(result_type __x) {return (__x << __count) & _Max;}
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (__count >= __w),
-            result_type
-        >::type
-        __lshift(result_type) {return result_type(0);}
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            __count < _Dt,
-            result_type
-        >::type
-        __rshift(result_type __x) {return __x >> __count;}
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (__count >= _Dt),
-            result_type
-        >::type
-        __rshift(result_type) {return result_type(0);}
-};
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::word_size;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::state_size;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::shift_size;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::mask_bits;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::xor_mask;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_u;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_d;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_s;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_b;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_t;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_c;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_l;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::initialization_multiplier;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::default_seed;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-void
-mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,
-    __t, __c, __l, __f>::seed(result_type __sd)
-{   // __w >= 2
-    __x_[0] = __sd & _Max;
-    for (size_t __i = 1; __i < __n; ++__i)
-        __x_[__i] = (__f * (__x_[__i-1] ^ __rshift<__w - 2>(__x_[__i-1])) + __i) & _Max;
-    __i_ = 0;
-}
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-template<class _Sseq>
-void
-mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,
-    __t, __c, __l, __f>::__seed(_Sseq& __q, integral_constant<unsigned, 1>)
-{
-    const unsigned __k = 1;
-    uint32_t __ar[__n * __k];
-    __q.generate(__ar, __ar + __n * __k);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __x_[__i] = static_cast<result_type>(__ar[__i] & _Max);
-    const result_type __mask = __r == _Dt ? result_type(~0) :
-                                       (result_type(1) << __r) - result_type(1);
-    __i_ = 0;
-    if ((__x_[0] & ~__mask) == 0)
-    {
-        for (size_t __i = 1; __i < __n; ++__i)
-            if (__x_[__i] != 0)
-                return;
-        __x_[0] = _Max;
-    }
-}
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-template<class _Sseq>
-void
-mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,
-    __t, __c, __l, __f>::__seed(_Sseq& __q, integral_constant<unsigned, 2>)
-{
-    const unsigned __k = 2;
-    uint32_t __ar[__n * __k];
-    __q.generate(__ar, __ar + __n * __k);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __x_[__i] = static_cast<result_type>(
-            (__ar[2 * __i] + ((uint64_t)__ar[2 * __i + 1] << 32)) & _Max);
-    const result_type __mask = __r == _Dt ? result_type(~0) :
-                                       (result_type(1) << __r) - result_type(1);
-    __i_ = 0;
-    if ((__x_[0] & ~__mask) == 0)
-    {
-        for (size_t __i = 1; __i < __n; ++__i)
-            if (__x_[__i] != 0)
-                return;
-        __x_[0] = _Max;
-    }
-}
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-_UIntType
-mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,
-    __t, __c, __l, __f>::operator()()
-{
-    const size_t __j = (__i_ + 1) % __n;
-    const result_type __mask = __r == _Dt ? result_type(~0) :
-                                       (result_type(1) << __r) - result_type(1);
-    const result_type _Yp = (__x_[__i_] & ~__mask) | (__x_[__j] & __mask);
-    const size_t __k = (__i_ + __m) % __n;
-    __x_[__i_] = __x_[__k] ^ __rshift<1>(_Yp) ^ (__a * (_Yp & 1));
-    result_type __z = __x_[__i_] ^ (__rshift<__u>(__x_[__i_]) & __d);
-    __i_ = __j;
-    __z ^= __lshift<__s>(__z) & __b;
-    __z ^= __lshift<__t>(__z) & __c;
-    return __z ^ __rshift<__l>(__z);
-}
-
-template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-bool
-operator==(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __y)
-{
-    if (__x.__i_ == __y.__i_)
-        return _VSTD::equal(__x.__x_, __x.__x_ + _Np, __y.__x_);
-    if (__x.__i_ == 0 || __y.__i_ == 0)
-    {
-        size_t __j = _VSTD::min(_Np - __x.__i_, _Np - __y.__i_);
-        if (!_VSTD::equal(__x.__x_ + __x.__i_, __x.__x_ + __x.__i_ + __j,
-                         __y.__x_ + __y.__i_))
-            return false;
-        if (__x.__i_ == 0)
-            return _VSTD::equal(__x.__x_ + __j, __x.__x_ + _Np, __y.__x_);
-        return _VSTD::equal(__x.__x_, __x.__x_ + (_Np - __j), __y.__x_ + __j);
-    }
-    if (__x.__i_ < __y.__i_)
-    {
-        size_t __j = _Np - __y.__i_;
-        if (!_VSTD::equal(__x.__x_ + __x.__i_, __x.__x_ + (__x.__i_ + __j),
-                         __y.__x_ + __y.__i_))
-            return false;
-        if (!_VSTD::equal(__x.__x_ + (__x.__i_ + __j), __x.__x_ + _Np,
-                         __y.__x_))
-            return false;
-        return _VSTD::equal(__x.__x_, __x.__x_ + __x.__i_,
-                           __y.__x_ + (_Np - (__x.__i_ + __j)));
-    }
-    size_t __j = _Np - __x.__i_;
-    if (!_VSTD::equal(__y.__x_ + __y.__i_, __y.__x_ + (__y.__i_ + __j),
-                     __x.__x_ + __x.__i_))
-        return false;
-    if (!_VSTD::equal(__y.__x_ + (__y.__i_ + __j), __y.__x_ + _Np,
-                     __x.__x_))
-        return false;
-    return _VSTD::equal(__y.__x_, __y.__x_ + __y.__i_,
-                       __x.__x_ + (_Np - (__y.__i_ + __j)));
-}
-
-template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.__x_[__x.__i_];
-    for (size_t __j = __x.__i_ + 1; __j < _Np; ++__j)
-        __os << __sp << __x.__x_[__j];
-    for (size_t __j = 0; __j < __x.__i_; ++__j)
-        __os << __sp << __x.__x_[__j];
-    return __os;
-}
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                   _Bp, _Tp, _Cp, _Lp, _Fp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _UI __t[_Np];
-    for (size_t __i = 0; __i < _Np; ++__i)
-        __is >> __t[__i];
-    if (!__is.fail())
-    {
-        for (size_t __i = 0; __i < _Np; ++__i)
-            __x.__x_[__i] = __t[__i];
-        __x.__i_ = 0;
-    }
-    return __is;
-}
-
-typedef mersenne_twister_engine<uint_fast32_t, 32, 624, 397, 31,
-                                0x9908b0df, 11, 0xffffffff,
-                                7,  0x9d2c5680,
-                                15, 0xefc60000,
-                                18, 1812433253>                         mt19937;
-typedef mersenne_twister_engine<uint_fast64_t, 64, 312, 156, 31,
-                                0xb5026f5aa96619e9ULL, 29, 0x5555555555555555ULL,
-                                17, 0x71d67fffeda60000ULL,
-                                37, 0xfff7eee000000000ULL,
-                                43, 6364136223846793005ULL>          mt19937_64;
-
-// subtract_with_carry_engine
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-class _LIBCPP_TYPE_VIS_ONLY subtract_with_carry_engine;
-
-template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-bool
-operator==(
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y);
-
-template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y);
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x);
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x);
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-class _LIBCPP_TYPE_VIS_ONLY subtract_with_carry_engine
-{
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    result_type __x_[__r];
-    result_type  __c_;
-    size_t      __i_;
-
-    static _LIBCPP_CONSTEXPR const result_type _Dt = numeric_limits<result_type>::digits;
-    static_assert(  0 <  __w, "subtract_with_carry_engine invalid parameters");
-    static_assert(__w <= _Dt, "subtract_with_carry_engine invalid parameters");
-    static_assert(  0 <  __s, "subtract_with_carry_engine invalid parameters");
-    static_assert(__s <  __r, "subtract_with_carry_engine invalid parameters");
-public:
-    static _LIBCPP_CONSTEXPR const result_type _Min = 0;
-    static _LIBCPP_CONSTEXPR const result_type _Max = __w == _Dt ? result_type(~0) :
-                                                      (result_type(1) << __w) - result_type(1);
-    static_assert(_Min < _Max, "subtract_with_carry_engine invalid parameters");
-
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const size_t word_size = __w;
-    static _LIBCPP_CONSTEXPR const size_t short_lag = __s;
-    static _LIBCPP_CONSTEXPR const size_t long_lag = __r;
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
-    static _LIBCPP_CONSTEXPR const result_type default_seed = 19780503u;
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit subtract_with_carry_engine(result_type __sd = default_seed)
-        {seed(__sd);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit subtract_with_carry_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, subtract_with_carry_engine>::value>::type* = 0)
-        {seed(__q);}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __sd = default_seed)
-        {seed(__sd, integral_constant<unsigned, 1 + (__w - 1) / 32>());}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, subtract_with_carry_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q)
-            {__seed(__q, integral_constant<unsigned, 1 + (__w - 1) / 32>());}
-
-    // generating functions
-    result_type operator()();
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-    friend
-    bool
-    operator==(
-        const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-        const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y);
-
-    template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-    friend
-    bool
-    operator!=(
-        const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-        const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y);
-
-    template <class _CharT, class _Traits,
-              class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x);
-
-    template <class _CharT, class _Traits,
-              class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x);
-
-private:
-
-    void seed(result_type __sd, integral_constant<unsigned, 1>);
-    void seed(result_type __sd, integral_constant<unsigned, 2>);
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 1>);
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 2>);
-};
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t subtract_with_carry_engine<_UIntType, __w, __s, __r>::word_size;
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t subtract_with_carry_engine<_UIntType, __w, __s, __r>::short_lag;
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t subtract_with_carry_engine<_UIntType, __w, __s, __r>::long_lag;
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-    _LIBCPP_CONSTEXPR const typename subtract_with_carry_engine<_UIntType, __w, __s, __r>::result_type
-    subtract_with_carry_engine<_UIntType, __w, __s, __r>::default_seed;
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-void
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::seed(result_type __sd,
-        integral_constant<unsigned, 1>)
-{
-    linear_congruential_engine<result_type, 40014u, 0u, 2147483563u>
-        __e(__sd == 0u ? default_seed : __sd);
-    for (size_t __i = 0; __i < __r; ++__i)
-        __x_[__i] = static_cast<result_type>(__e() & _Max);
-    __c_ = __x_[__r-1] == 0;
-    __i_ = 0;
-}
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-void
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::seed(result_type __sd,
-        integral_constant<unsigned, 2>)
-{
-    linear_congruential_engine<result_type, 40014u, 0u, 2147483563u>
-        __e(__sd == 0u ? default_seed : __sd);
-    for (size_t __i = 0; __i < __r; ++__i)
-    {
-        result_type __e0 = __e();
-        __x_[__i] = static_cast<result_type>(
-                                    (__e0 + ((uint64_t)__e() << 32)) & _Max);
-    }
-    __c_ = __x_[__r-1] == 0;
-    __i_ = 0;
-}
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-template<class _Sseq>
-void
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::__seed(_Sseq& __q,
-        integral_constant<unsigned, 1>)
-{
-    const unsigned __k = 1;
-    uint32_t __ar[__r * __k];
-    __q.generate(__ar, __ar + __r * __k);
-    for (size_t __i = 0; __i < __r; ++__i)
-        __x_[__i] = static_cast<result_type>(__ar[__i] & _Max);
-    __c_ = __x_[__r-1] == 0;
-    __i_ = 0;
-}
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-template<class _Sseq>
-void
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::__seed(_Sseq& __q,
-        integral_constant<unsigned, 2>)
-{
-    const unsigned __k = 2;
-    uint32_t __ar[__r * __k];
-    __q.generate(__ar, __ar + __r * __k);
-    for (size_t __i = 0; __i < __r; ++__i)
-        __x_[__i] = static_cast<result_type>(
-                  (__ar[2 * __i] + ((uint64_t)__ar[2 * __i + 1] << 32)) & _Max);
-    __c_ = __x_[__r-1] == 0;
-    __i_ = 0;
-}
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-_UIntType
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::operator()()
-{
-    const result_type& __xs = __x_[(__i_ + (__r - __s)) % __r];
-    result_type& __xr = __x_[__i_];
-    result_type __new_c = __c_ == 0 ? __xs < __xr : __xs != 0 ? __xs <= __xr : 1;
-    __xr = (__xs - __xr - __c_) & _Max;
-    __c_ = __new_c;
-    __i_ = (__i_ + 1) % __r;
-    return __xr;
-}
-
-template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-bool
-operator==(
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y)
-{
-    if (__x.__c_ != __y.__c_)
-        return false;
-    if (__x.__i_ == __y.__i_)
-        return _VSTD::equal(__x.__x_, __x.__x_ + _Rp, __y.__x_);
-    if (__x.__i_ == 0 || __y.__i_ == 0)
-    {
-        size_t __j = _VSTD::min(_Rp - __x.__i_, _Rp - __y.__i_);
-        if (!_VSTD::equal(__x.__x_ + __x.__i_, __x.__x_ + __x.__i_ + __j,
-                         __y.__x_ + __y.__i_))
-            return false;
-        if (__x.__i_ == 0)
-            return _VSTD::equal(__x.__x_ + __j, __x.__x_ + _Rp, __y.__x_);
-        return _VSTD::equal(__x.__x_, __x.__x_ + (_Rp - __j), __y.__x_ + __j);
-    }
-    if (__x.__i_ < __y.__i_)
-    {
-        size_t __j = _Rp - __y.__i_;
-        if (!_VSTD::equal(__x.__x_ + __x.__i_, __x.__x_ + (__x.__i_ + __j),
-                         __y.__x_ + __y.__i_))
-            return false;
-        if (!_VSTD::equal(__x.__x_ + (__x.__i_ + __j), __x.__x_ + _Rp,
-                         __y.__x_))
-            return false;
-        return _VSTD::equal(__x.__x_, __x.__x_ + __x.__i_,
-                           __y.__x_ + (_Rp - (__x.__i_ + __j)));
-    }
-    size_t __j = _Rp - __x.__i_;
-    if (!_VSTD::equal(__y.__x_ + __y.__i_, __y.__x_ + (__y.__i_ + __j),
-                     __x.__x_ + __x.__i_))
-        return false;
-    if (!_VSTD::equal(__y.__x_ + (__y.__i_ + __j), __y.__x_ + _Rp,
-                     __x.__x_))
-        return false;
-    return _VSTD::equal(__y.__x_, __y.__x_ + __y.__i_,
-                       __x.__x_ + (_Rp - (__y.__i_ + __j)));
-}
-
-template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.__x_[__x.__i_];
-    for (size_t __j = __x.__i_ + 1; __j < _Rp; ++__j)
-        __os << __sp << __x.__x_[__j];
-    for (size_t __j = 0; __j < __x.__i_; ++__j)
-        __os << __sp << __x.__x_[__j];
-    __os << __sp << __x.__c_;
-    return __os;
-}
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _UI __t[_Rp+1];
-    for (size_t __i = 0; __i < _Rp+1; ++__i)
-        __is >> __t[__i];
-    if (!__is.fail())
-    {
-        for (size_t __i = 0; __i < _Rp; ++__i)
-            __x.__x_[__i] = __t[__i];
-        __x.__c_ = __t[_Rp];
-        __x.__i_ = 0;
-    }
-    return __is;
-}
-
-typedef subtract_with_carry_engine<uint_fast32_t, 24, 10, 24>     ranlux24_base;
-typedef subtract_with_carry_engine<uint_fast64_t, 48,  5, 12>     ranlux48_base;
-
-// discard_block_engine
-
-template<class _Engine, size_t __p, size_t __r>
-class _LIBCPP_TYPE_VIS_ONLY discard_block_engine
-{
-    _Engine __e_;
-    int     __n_;
-
-    static_assert(  0 <  __r, "discard_block_engine invalid parameters");
-    static_assert(__r <= __p, "discard_block_engine invalid parameters");
-public:
-    // types
-    typedef typename _Engine::result_type result_type;
-
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const size_t block_size = __p;
-    static _LIBCPP_CONSTEXPR const size_t used_block = __r;
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    static const result_type _Min = _Engine::_Min;
-    static const result_type _Max = _Engine::_Max;
-#else
-    static _LIBCPP_CONSTEXPR const result_type _Min = _Engine::min();
-    static _LIBCPP_CONSTEXPR const result_type _Max = _Engine::max();
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Engine::min(); }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Engine::max(); }
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    discard_block_engine() : __n_(0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit discard_block_engine(const _Engine& __e)
-        : __e_(__e), __n_(0) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit discard_block_engine(_Engine&& __e)
-        : __e_(_VSTD::move(__e)), __n_(0) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit discard_block_engine(result_type __sd) : __e_(__sd), __n_(0) {}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit discard_block_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, discard_block_engine>::value &&
-                           !is_convertible<_Sseq, _Engine>::value>::type* = 0)
-        : __e_(__q), __n_(0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed() {__e_.seed(); __n_ = 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __sd) {__e_.seed(__sd); __n_ = 0;}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, discard_block_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q) {__e_.seed(__q); __n_ = 0;}
-
-    // generating functions
-    result_type operator()();
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    const _Engine& base() const _NOEXCEPT {return __e_;}
-
-    template<class _Eng, size_t _Pp, size_t _Rp>
-    friend
-    bool
-    operator==(
-        const discard_block_engine<_Eng, _Pp, _Rp>& __x,
-        const discard_block_engine<_Eng, _Pp, _Rp>& __y);
-
-    template<class _Eng, size_t _Pp, size_t _Rp>
-    friend
-    bool
-    operator!=(
-        const discard_block_engine<_Eng, _Pp, _Rp>& __x,
-        const discard_block_engine<_Eng, _Pp, _Rp>& __y);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Pp, size_t _Rp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const discard_block_engine<_Eng, _Pp, _Rp>& __x);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Pp, size_t _Rp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               discard_block_engine<_Eng, _Pp, _Rp>& __x);
-};
-
-template<class _Engine, size_t __p, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t discard_block_engine<_Engine, __p, __r>::block_size;
-
-template<class _Engine, size_t __p, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t discard_block_engine<_Engine, __p, __r>::used_block;
-
-template<class _Engine, size_t __p, size_t __r>
-typename discard_block_engine<_Engine, __p, __r>::result_type
-discard_block_engine<_Engine, __p, __r>::operator()()
-{
-    if (__n_ >= __r)
-    {
-        __e_.discard(__p - __r);
-        __n_ = 0;
-    }
-    ++__n_;
-    return __e_();
-}
-
-template<class _Eng, size_t _Pp, size_t _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const discard_block_engine<_Eng, _Pp, _Rp>& __x,
-           const discard_block_engine<_Eng, _Pp, _Rp>& __y)
-{
-    return __x.__n_ == __y.__n_ && __x.__e_ == __y.__e_;
-}
-
-template<class _Eng, size_t _Pp, size_t _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const discard_block_engine<_Eng, _Pp, _Rp>& __x,
-           const discard_block_engine<_Eng, _Pp, _Rp>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Pp, size_t _Rp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const discard_block_engine<_Eng, _Pp, _Rp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.__e_ << __sp << __x.__n_;
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Pp, size_t _Rp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           discard_block_engine<_Eng, _Pp, _Rp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _Eng __e;
-    int __n;
-    __is >> __e >> __n;
-    if (!__is.fail())
-    {
-        __x.__e_ = __e;
-        __x.__n_ = __n;
-    }
-    return __is;
-}
-
-typedef discard_block_engine<ranlux24_base, 223, 23> ranlux24;
-typedef discard_block_engine<ranlux48_base, 389, 11> ranlux48;
-
-// independent_bits_engine
-
-template<class _Engine, size_t __w, class _UIntType>
-class _LIBCPP_TYPE_VIS_ONLY independent_bits_engine
-{
-    template <class _UI, _UI _R0, size_t _Wp, size_t _Mp>
-    class __get_n
-    {
-        static _LIBCPP_CONSTEXPR const size_t _Dt = numeric_limits<_UI>::digits;
-        static _LIBCPP_CONSTEXPR const size_t _Np = _Wp / _Mp + (_Wp % _Mp != 0);
-        static _LIBCPP_CONSTEXPR const size_t _W0 = _Wp / _Np;
-        static _LIBCPP_CONSTEXPR const _UI _Y0 = _W0 >= _Dt ? 0 : (_R0 >> _W0) << _W0;
-    public:
-        static _LIBCPP_CONSTEXPR const size_t value = _R0 - _Y0 > _Y0 / _Np ? _Np + 1 : _Np;
-    };
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    _Engine __e_;
-
-    static _LIBCPP_CONSTEXPR const result_type _Dt = numeric_limits<result_type>::digits;
-    static_assert(  0 <  __w, "independent_bits_engine invalid parameters");
-    static_assert(__w <= _Dt, "independent_bits_engine invalid parameters");
-
-    typedef typename _Engine::result_type _Engine_result_type;
-    typedef typename conditional
-        <
-            sizeof(_Engine_result_type) <= sizeof(result_type),
-                result_type,
-                _Engine_result_type
-        >::type _Working_result_type;
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    static const _Working_result_type _Rp = _Engine::_Max - _Engine::_Min
-                                          + _Working_result_type(1);
-#else
-    static _LIBCPP_CONSTEXPR const _Working_result_type _Rp = _Engine::max() - _Engine::min()
-                                                            + _Working_result_type(1);
-#endif
-    static _LIBCPP_CONSTEXPR const size_t __m = __log2<_Working_result_type, _Rp>::value;
-    static _LIBCPP_CONSTEXPR const size_t __n = __get_n<_Working_result_type, _Rp, __w, __m>::value;
-    static _LIBCPP_CONSTEXPR const size_t __w0 = __w / __n;
-    static _LIBCPP_CONSTEXPR const size_t __n0 = __n - __w % __n;
-    static _LIBCPP_CONSTEXPR const size_t _WDt = numeric_limits<_Working_result_type>::digits;
-    static _LIBCPP_CONSTEXPR const size_t _EDt = numeric_limits<_Engine_result_type>::digits;
-    static _LIBCPP_CONSTEXPR const _Working_result_type __y0 = __w0 >= _WDt ? 0 :
-                                                               (_Rp >> __w0) << __w0;
-    static _LIBCPP_CONSTEXPR const _Working_result_type __y1 = __w0 >= _WDt - 1 ? 0 :
-                                                               (_Rp >> (__w0+1)) << (__w0+1);
-    static _LIBCPP_CONSTEXPR const _Engine_result_type __mask0 = __w0 > 0 ?
-                                _Engine_result_type(~0) >> (_EDt - __w0) :
-                                _Engine_result_type(0);
-    static _LIBCPP_CONSTEXPR const _Engine_result_type __mask1 = __w0 < _EDt - 1 ?
-                                _Engine_result_type(~0) >> (_EDt - (__w0 + 1)) :
-                                _Engine_result_type(~0);
-public:
-    static _LIBCPP_CONSTEXPR const result_type _Min = 0;
-    static _LIBCPP_CONSTEXPR const result_type _Max = __w == _Dt ? result_type(~0) :
-                                                      (result_type(1) << __w) - result_type(1);
-    static_assert(_Min < _Max, "independent_bits_engine invalid parameters");
-
-    // engine characteristics
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    independent_bits_engine() {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit independent_bits_engine(const _Engine& __e)
-        : __e_(__e) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit independent_bits_engine(_Engine&& __e)
-        : __e_(_VSTD::move(__e)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit independent_bits_engine(result_type __sd) : __e_(__sd) {}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit independent_bits_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, independent_bits_engine>::value &&
-                           !is_convertible<_Sseq, _Engine>::value>::type* = 0)
-         : __e_(__q) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed() {__e_.seed();}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __sd) {__e_.seed(__sd);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, independent_bits_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q) {__e_.seed(__q);}
-
-    // generating functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()() {return __eval(integral_constant<bool, _Rp != 0>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    const _Engine& base() const _NOEXCEPT {return __e_;}
-
-    template<class _Eng, size_t _Wp, class _UI>
-    friend
-    bool
-    operator==(
-        const independent_bits_engine<_Eng, _Wp, _UI>& __x,
-        const independent_bits_engine<_Eng, _Wp, _UI>& __y);
-
-    template<class _Eng, size_t _Wp, class _UI>
-    friend
-    bool
-    operator!=(
-        const independent_bits_engine<_Eng, _Wp, _UI>& __x,
-        const independent_bits_engine<_Eng, _Wp, _UI>& __y);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Wp, class _UI>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const independent_bits_engine<_Eng, _Wp, _UI>& __x);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Wp, class _UI>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               independent_bits_engine<_Eng, _Wp, _UI>& __x);
-
-private:
-    result_type __eval(false_type);
-    result_type __eval(true_type);
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            __count < _Dt,
-            result_type
-        >::type
-        __lshift(result_type __x) {return __x << __count;}
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (__count >= _Dt),
-            result_type
-        >::type
-        __lshift(result_type) {return result_type(0);}
-};
-
-template<class _Engine, size_t __w, class _UIntType>
-inline _LIBCPP_INLINE_VISIBILITY
-_UIntType
-independent_bits_engine<_Engine, __w, _UIntType>::__eval(false_type)
-{
-    return static_cast<result_type>(__e_() & __mask0);
-}
-
-template<class _Engine, size_t __w, class _UIntType>
-_UIntType
-independent_bits_engine<_Engine, __w, _UIntType>::__eval(true_type)
-{
-    result_type _Sp = 0;
-    for (size_t __k = 0; __k < __n0; ++__k)
-    {
-        _Engine_result_type __u;
-        do
-        {
-            __u = __e_() - _Engine::min();
-        } while (__u >= __y0);
-        _Sp = static_cast<result_type>(__lshift<__w0>(_Sp) + (__u & __mask0));
-    }
-    for (size_t __k = __n0; __k < __n; ++__k)
-    {
-        _Engine_result_type __u;
-        do
-        {
-            __u = __e_() - _Engine::min();
-        } while (__u >= __y1);
-        _Sp = static_cast<result_type>(__lshift<__w0+1>(_Sp) + (__u & __mask1));
-    }
-    return _Sp;
-}
-
-template<class _Eng, size_t _Wp, class _UI>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(
-    const independent_bits_engine<_Eng, _Wp, _UI>& __x,
-    const independent_bits_engine<_Eng, _Wp, _UI>& __y)
-{
-    return __x.base() == __y.base();
-}
-
-template<class _Eng, size_t _Wp, class _UI>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(
-    const independent_bits_engine<_Eng, _Wp, _UI>& __x,
-    const independent_bits_engine<_Eng, _Wp, _UI>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Wp, class _UI>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const independent_bits_engine<_Eng, _Wp, _UI>& __x)
-{
-    return __os << __x.base();
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Wp, class _UI>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           independent_bits_engine<_Eng, _Wp, _UI>& __x)
-{
-    _Eng __e;
-    __is >> __e;
-    if (!__is.fail())
-        __x.__e_ = __e;
-    return __is;
-}
-
-// shuffle_order_engine
-
-template <uint64_t _Xp, uint64_t _Yp>
-struct __ugcd
-{
-    static _LIBCPP_CONSTEXPR const uint64_t value = __ugcd<_Yp, _Xp % _Yp>::value;
-};
-
-template <uint64_t _Xp>
-struct __ugcd<_Xp, 0>
-{
-    static _LIBCPP_CONSTEXPR const uint64_t value = _Xp;
-};
-
-template <uint64_t _Np, uint64_t _Dp>
-class __uratio
-{
-    static_assert(_Dp != 0, "__uratio divide by 0");
-    static _LIBCPP_CONSTEXPR const uint64_t __gcd = __ugcd<_Np, _Dp>::value;
-public:
-    static _LIBCPP_CONSTEXPR const uint64_t num = _Np / __gcd;
-    static _LIBCPP_CONSTEXPR const uint64_t den = _Dp / __gcd;
-
-    typedef __uratio<num, den> type;
-};
-
-template<class _Engine, size_t __k>
-class _LIBCPP_TYPE_VIS_ONLY shuffle_order_engine
-{
-    static_assert(0 < __k, "shuffle_order_engine invalid parameters");
-public:
-    // types
-    typedef typename _Engine::result_type result_type;
-
-private:
-    _Engine __e_;
-    result_type _V_[__k];
-    result_type _Y_;
-
-public:
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const size_t table_size = __k;
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    static const result_type _Min = _Engine::_Min;
-    static const result_type _Max = _Engine::_Max;
-#else
-    static _LIBCPP_CONSTEXPR const result_type _Min = _Engine::min();
-    static _LIBCPP_CONSTEXPR const result_type _Max = _Engine::max();
-#endif
-    static_assert(_Min < _Max, "shuffle_order_engine invalid parameters");
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
-
-    static _LIBCPP_CONSTEXPR const unsigned long long _Rp = _Max - _Min + 1ull;
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    shuffle_order_engine() {__init();}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit shuffle_order_engine(const _Engine& __e)
-        : __e_(__e) {__init();}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit shuffle_order_engine(_Engine&& __e)
-        : __e_(_VSTD::move(__e)) {__init();}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit shuffle_order_engine(result_type __sd) : __e_(__sd) {__init();}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit shuffle_order_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, shuffle_order_engine>::value &&
-                           !is_convertible<_Sseq, _Engine>::value>::type* = 0)
-         : __e_(__q) {__init();}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed() {__e_.seed(); __init();}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __sd) {__e_.seed(__sd); __init();}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, shuffle_order_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q) {__e_.seed(__q); __init();}
-
-    // generating functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()() {return __eval(integral_constant<bool, _Rp != 0>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    const _Engine& base() const _NOEXCEPT {return __e_;}
-
-private:
-    template<class _Eng, size_t _Kp>
-    friend
-    bool
-    operator==(
-        const shuffle_order_engine<_Eng, _Kp>& __x,
-        const shuffle_order_engine<_Eng, _Kp>& __y);
-
-    template<class _Eng, size_t _Kp>
-    friend
-    bool
-    operator!=(
-        const shuffle_order_engine<_Eng, _Kp>& __x,
-        const shuffle_order_engine<_Eng, _Kp>& __y);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Kp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const shuffle_order_engine<_Eng, _Kp>& __x);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Kp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               shuffle_order_engine<_Eng, _Kp>& __x);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __init()
-    {
-        for (size_t __i = 0; __i < __k; ++__i)
-            _V_[__i] = __e_();
-        _Y_ = __e_();
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type __eval(false_type) {return __eval2(integral_constant<bool, __k & 1>());}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type __eval(true_type) {return __eval(__uratio<__k, _Rp>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type __eval2(false_type) {return __eval(__uratio<__k/2, 0x8000000000000000ull>());}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type __eval2(true_type) {return __evalf<__k, 0>();}
-
-    template <uint64_t _Np, uint64_t _Dp>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            (__uratio<_Np, _Dp>::num > 0xFFFFFFFFFFFFFFFFull / (_Max - _Min)),
-            result_type
-        >::type
-        __eval(__uratio<_Np, _Dp>)
-            {return __evalf<__uratio<_Np, _Dp>::num, __uratio<_Np, _Dp>::den>();}
-
-    template <uint64_t _Np, uint64_t _Dp>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __uratio<_Np, _Dp>::num <= 0xFFFFFFFFFFFFFFFFull / (_Max - _Min),
-            result_type
-        >::type
-        __eval(__uratio<_Np, _Dp>)
-        {
-            const size_t __j = static_cast<size_t>(__uratio<_Np, _Dp>::num * (_Y_ - _Min)
-                                                   / __uratio<_Np, _Dp>::den);
-            _Y_ = _V_[__j];
-            _V_[__j] = __e_();
-            return _Y_;
-        }
-
-    template <uint64_t __n, uint64_t __d>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type __evalf()
-        {
-            const double _Fp = __d == 0 ?
-                __n / (2. * 0x8000000000000000ull) :
-                __n / (double)__d;
-            const size_t __j = static_cast<size_t>(_Fp * (_Y_ - _Min));
-            _Y_ = _V_[__j];
-            _V_[__j] = __e_();
-            return _Y_;
-        }
-};
-
-template<class _Engine, size_t __k>
-    _LIBCPP_CONSTEXPR const size_t shuffle_order_engine<_Engine, __k>::table_size;
-
-template<class _Eng, size_t _Kp>
-bool
-operator==(
-    const shuffle_order_engine<_Eng, _Kp>& __x,
-    const shuffle_order_engine<_Eng, _Kp>& __y)
-{
-    return __x._Y_ == __y._Y_ && _VSTD::equal(__x._V_, __x._V_ + _Kp, __y._V_) &&
-           __x.__e_ == __y.__e_;
-}
-
-template<class _Eng, size_t _Kp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(
-    const shuffle_order_engine<_Eng, _Kp>& __x,
-    const shuffle_order_engine<_Eng, _Kp>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Kp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const shuffle_order_engine<_Eng, _Kp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.__e_ << __sp << __x._V_[0];
-    for (size_t __i = 1; __i < _Kp; ++__i)
-        __os << __sp << __x._V_[__i];
-    return __os << __sp << __x._Y_;
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Kp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           shuffle_order_engine<_Eng, _Kp>& __x)
-{
-    typedef typename shuffle_order_engine<_Eng, _Kp>::result_type result_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _Eng __e;
-    result_type _Vp[_Kp+1];
-    __is >> __e;
-    for (size_t __i = 0; __i < _Kp+1; ++__i)
-        __is >> _Vp[__i];
-    if (!__is.fail())
-    {
-        __x.__e_ = __e;
-        for (size_t __i = 0; __i < _Kp; ++__i)
-            __x._V_[__i] = _Vp[__i];
-        __x._Y_ = _Vp[_Kp];
-    }
-    return __is;
-}
-
-typedef shuffle_order_engine<minstd_rand0, 256>                         knuth_b;
-
-// random_device
-
-class _LIBCPP_TYPE_VIS random_device
-{
-#if !(defined(_WIN32) || defined(_LIBCPP_USING_NACL_RANDOM))
-    int __f_;
-#endif // !(defined(_WIN32) || defined(_LIBCPP_USING_NACL_RANDOM))
-public:
-    // types
-    typedef unsigned result_type;
-
-    // generator characteristics
-    static _LIBCPP_CONSTEXPR const result_type _Min = 0;
-    static _LIBCPP_CONSTEXPR const result_type _Max = 0xFFFFFFFFu;
-
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min;}
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max;}
-
-    // constructors
-    explicit random_device(const string& __token = "/dev/urandom");
-    ~random_device();
-
-    // generating functions
-    result_type operator()();
-
-    // property functions
-    double entropy() const _NOEXCEPT;
-
-private:
-    // no copy functions
-    random_device(const random_device&); // = delete;
-    random_device& operator=(const random_device&); // = delete;
-};
-
-// seed_seq
-
-class _LIBCPP_TYPE_VIS_ONLY seed_seq
-{
-public:
-    // types
-    typedef uint32_t result_type;
-
-private:
-    vector<result_type> __v_;
-
-    template<class _InputIterator>
-        void init(_InputIterator __first, _InputIterator __last);
-public:
-    // constructors
-    _LIBCPP_INLINE_VISIBILITY
-    seed_seq() _NOEXCEPT {}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template<class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        seed_seq(initializer_list<_Tp> __il) {init(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template<class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        seed_seq(_InputIterator __first, _InputIterator __last)
-             {init(__first, __last);}
-
-    // generating functions
-    template<class _RandomAccessIterator>
-        void generate(_RandomAccessIterator __first, _RandomAccessIterator __last);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const _NOEXCEPT {return __v_.size();}
-    template<class _OutputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void param(_OutputIterator __dest) const
-            {_VSTD::copy(__v_.begin(), __v_.end(), __dest);}
-
-private:
-    // no copy functions
-    seed_seq(const seed_seq&); // = delete;
-    void operator=(const seed_seq&); // = delete;
-
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type _Tp(result_type __x) {return __x ^ (__x >> 27);}
-};
-
-template<class _InputIterator>
-void
-seed_seq::init(_InputIterator __first, _InputIterator __last)
-{
-    for (_InputIterator __s = __first; __s != __last; ++__s)
-        __v_.push_back(*__s & 0xFFFFFFFF);
-}
-
-template<class _RandomAccessIterator>
-void
-seed_seq::generate(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    if (__first != __last)
-    {
-        _VSTD::fill(__first, __last, 0x8b8b8b8b);
-        const size_t __n = static_cast<size_t>(__last - __first);
-        const size_t __s = __v_.size();
-        const size_t __t = (__n >= 623) ? 11
-                         : (__n >= 68) ? 7
-                         : (__n >= 39) ? 5
-                         : (__n >= 7)  ? 3
-                         : (__n - 1) / 2;
-        const size_t __p = (__n - __t) / 2;
-        const size_t __q = __p + __t;
-        const size_t __m = _VSTD::max(__s + 1, __n);
-        // __k = 0;
-        {
-            result_type __r = 1664525 * _Tp(__first[0] ^ __first[__p]
-                                                      ^  __first[__n - 1]);
-            __first[__p] += __r;
-            __r += __s;
-            __first[__q] += __r;
-            __first[0] = __r;
-        }
-        for (size_t __k = 1; __k <= __s; ++__k)
-        {
-            const size_t __kmodn = __k % __n;
-            const size_t __kpmodn = (__k + __p) % __n;
-            result_type __r = 1664525 * _Tp(__first[__kmodn] ^ __first[__kpmodn]
-                                           ^ __first[(__k - 1) % __n]);
-            __first[__kpmodn] += __r;
-            __r +=  __kmodn + __v_[__k-1];
-            __first[(__k + __q) % __n] += __r;
-            __first[__kmodn] = __r;
-        }
-        for (size_t __k = __s + 1; __k < __m; ++__k)
-        {
-            const size_t __kmodn = __k % __n;
-            const size_t __kpmodn = (__k + __p) % __n;
-            result_type __r = 1664525 * _Tp(__first[__kmodn] ^ __first[__kpmodn]
-                                           ^ __first[(__k - 1) % __n]);
-            __first[__kpmodn] += __r;
-            __r +=  __kmodn;
-            __first[(__k + __q) % __n] += __r;
-            __first[__kmodn] = __r;
-        }
-        for (size_t __k = __m; __k < __m + __n; ++__k)
-        {
-            const size_t __kmodn = __k % __n;
-            const size_t __kpmodn = (__k + __p) % __n;
-            result_type __r = 1566083941 * _Tp(__first[__kmodn] +
-                                              __first[__kpmodn] +
-                                              __first[(__k - 1) % __n]);
-            __first[__kpmodn] ^= __r;
-            __r -= __kmodn;
-            __first[(__k + __q) % __n] ^= __r;
-            __first[__kmodn] = __r;
-        }
-    }
-}
-
-// generate_canonical
-
-template<class _RealType, size_t __bits, class _URNG>
-_RealType
-generate_canonical(_URNG& __g)
-{
-    const size_t _Dt = numeric_limits<_RealType>::digits;
-    const size_t __b = _Dt < __bits ? _Dt : __bits;
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    const size_t __logR = __log2<uint64_t, _URNG::_Max - _URNG::_Min + uint64_t(1)>::value;
-#else
-    const size_t __logR = __log2<uint64_t, _URNG::max() - _URNG::min() + uint64_t(1)>::value;
-#endif
-    const size_t __k = __b / __logR + (__b % __logR != 0) + (__b == 0);
-    const _RealType _Rp = _URNG::max() - _URNG::min() + _RealType(1);
-    _RealType __base = _Rp;
-    _RealType _Sp = __g() - _URNG::min();
-    for (size_t __i = 1; __i < __k; ++__i, __base *= _Rp)
-        _Sp += (__g() - _URNG::min()) * __base;
-    return _Sp / __base;
-}
-
-// uniform_int_distribution
-
-// in <algorithm>
-
-template <class _CharT, class _Traits, class _IT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const uniform_int_distribution<_IT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.a() << __sp << __x.b();
-}
-
-template <class _CharT, class _Traits, class _IT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           uniform_int_distribution<_IT>& __x)
-{
-    typedef uniform_int_distribution<_IT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-// uniform_real_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY uniform_real_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef uniform_real_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __a = 0,
-                            result_type __b = 1)
-            : __a_(__a), __b_(__b) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type a() const {return __a_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type b() const {return __b_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit uniform_real_distribution(result_type __a = 0, result_type __b = 1)
-        : __p_(param_type(__a, __b)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit uniform_real_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type a() const {return __p_.a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type b() const {return __p_.b();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return b();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const uniform_real_distribution& __x,
-                        const uniform_real_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const uniform_real_distribution& __x,
-                        const uniform_real_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _RealType>
-template<class _URNG>
-inline _LIBCPP_INLINE_VISIBILITY
-typename uniform_real_distribution<_RealType>::result_type
-uniform_real_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    return (__p.b() - __p.a())
-        * _VSTD::generate_canonical<_RealType, numeric_limits<_RealType>::digits>(__g)
-        + __p.a();
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const uniform_real_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.a() << __sp << __x.b();
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           uniform_real_distribution<_RT>& __x)
-{
-    typedef uniform_real_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-// bernoulli_distribution
-
-class _LIBCPP_TYPE_VIS_ONLY bernoulli_distribution
-{
-public:
-    // types
-    typedef bool result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        double __p_;
-    public:
-        typedef bernoulli_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(double __p = 0.5) : __p_(__p) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        double p() const {return __p_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit bernoulli_distribution(double __p = 0.5)
-        : __p_(param_type(__p)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit bernoulli_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    double p() const {return __p_.p();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return false;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return true;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const bernoulli_distribution& __x,
-                        const bernoulli_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const bernoulli_distribution& __x,
-                        const bernoulli_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _URNG>
-inline _LIBCPP_INLINE_VISIBILITY
-bernoulli_distribution::result_type
-bernoulli_distribution::operator()(_URNG& __g, const param_type& __p)
-{
-    uniform_real_distribution<double> __gen;
-    return __gen(__g) < __p.p();
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const bernoulli_distribution& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.p();
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, bernoulli_distribution& __x)
-{
-    typedef bernoulli_distribution _Eng;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    double __p;
-    __is >> __p;
-    if (!__is.fail())
-        __x.param(param_type(__p));
-    return __is;
-}
-
-// binomial_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY binomial_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __t_;
-        double __p_;
-        double __pr_;
-        double __odds_ratio_;
-        result_type __r0_;
-    public:
-        typedef binomial_distribution distribution_type;
-
-        explicit param_type(result_type __t = 1, double __p = 0.5);
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type t() const {return __t_;}
-        _LIBCPP_INLINE_VISIBILITY
-        double p() const {return __p_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__t_ == __y.__t_ && __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-        friend class binomial_distribution;
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit binomial_distribution(result_type __t = 1, double __p = 0.5)
-        : __p_(param_type(__t, __p)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit binomial_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type t() const {return __p_.t();}
-    _LIBCPP_INLINE_VISIBILITY
-    double p() const {return __p_.p();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return t();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const binomial_distribution& __x,
-                        const binomial_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const binomial_distribution& __x,
-                        const binomial_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _IntType>
-binomial_distribution<_IntType>::param_type::param_type(result_type __t, double __p)
-    : __t_(__t), __p_(__p)
-{
-    if (0 < __p_ && __p_ < 1)
-    {
-        __r0_ = static_cast<result_type>((__t_ + 1) * __p_);
-        __pr_ = _VSTD::exp(_VSTD::lgamma(__t_ + 1.) - _VSTD::lgamma(__r0_ + 1.) -
-                          _VSTD::lgamma(__t_ - __r0_ + 1.) + __r0_ * _VSTD::log(__p_) +
-                          (__t_ - __r0_) * _VSTD::log(1 - __p_));
-        __odds_ratio_ = __p_ / (1 - __p_);
-    }
-}
-
-// Reference: Kemp, C.D. (1986). `A modal method for generating binomial
-//           variables', Commun. Statist. - Theor. Meth. 15(3), 805-813.
-template<class _IntType>
-template<class _URNG>
-_IntType
-binomial_distribution<_IntType>::operator()(_URNG& __g, const param_type& __pr)
-{
-    if (__pr.__t_ == 0 || __pr.__p_ == 0)
-        return 0;
-    if (__pr.__p_ == 1)
-        return __pr.__t_;
-    uniform_real_distribution<double> __gen;
-    double __u = __gen(__g) - __pr.__pr_;
-    if (__u < 0)
-        return __pr.__r0_;
-    double __pu = __pr.__pr_;
-    double __pd = __pu;
-    result_type __ru = __pr.__r0_;
-    result_type __rd = __ru;
-    while (true)
-    {
-        if (__rd >= 1)
-        {
-            __pd *= __rd / (__pr.__odds_ratio_ * (__pr.__t_ - __rd + 1));
-            __u -= __pd;
-            if (__u < 0)
-                return __rd - 1;
-        }
-        if ( __rd != 0 )
-            --__rd;
-        ++__ru;
-        if (__ru <= __pr.__t_)
-        {
-            __pu *= (__pr.__t_ - __ru + 1) * __pr.__odds_ratio_ / __ru;
-            __u -= __pu;
-            if (__u < 0)
-                return __ru;
-        }
-    }
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const binomial_distribution<_IntType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.t() << __sp << __x.p();
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           binomial_distribution<_IntType>& __x)
-{
-    typedef binomial_distribution<_IntType> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __t;
-    double __p;
-    __is >> __t >> __p;
-    if (!__is.fail())
-        __x.param(param_type(__t, __p));
-    return __is;
-}
-
-// exponential_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY exponential_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __lambda_;
-    public:
-        typedef exponential_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __lambda = 1) : __lambda_(__lambda) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type lambda() const {return __lambda_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__lambda_ == __y.__lambda_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit exponential_distribution(result_type __lambda = 1)
-        : __p_(param_type(__lambda)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit exponential_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type lambda() const {return __p_.lambda();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const exponential_distribution& __x,
-                        const exponential_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const exponential_distribution& __x,
-                        const exponential_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-exponential_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    return -_VSTD::log
-                  (
-                      result_type(1) -
-                      _VSTD::generate_canonical<result_type,
-                                       numeric_limits<result_type>::digits>(__g)
-                  )
-                  / __p.lambda();
-}
-
-template <class _CharT, class _Traits, class _RealType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const exponential_distribution<_RealType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    return __os << __x.lambda();
-}
-
-template <class _CharT, class _Traits, class _RealType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           exponential_distribution<_RealType>& __x)
-{
-    typedef exponential_distribution<_RealType> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __lambda;
-    __is >> __lambda;
-    if (!__is.fail())
-        __x.param(param_type(__lambda));
-    return __is;
-}
-
-// normal_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY normal_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __mean_;
-        result_type __stddev_;
-    public:
-        typedef normal_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __mean = 0, result_type __stddev = 1)
-            : __mean_(__mean), __stddev_(__stddev) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type mean() const {return __mean_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type stddev() const {return __stddev_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__mean_ == __y.__mean_ && __x.__stddev_ == __y.__stddev_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-    result_type _V_;
-    bool _V_hot_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit normal_distribution(result_type __mean = 0, result_type __stddev = 1)
-        : __p_(param_type(__mean, __stddev)), _V_hot_(false) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit normal_distribution(const param_type& __p)
-        : __p_(__p), _V_hot_(false) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {_V_hot_ = false;}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type mean() const {return __p_.mean();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type stddev() const {return __p_.stddev();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return -numeric_limits<result_type>::infinity();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const normal_distribution& __x,
-                        const normal_distribution& __y)
-        {return __x.__p_ == __y.__p_ && __x._V_hot_ == __y._V_hot_ &&
-                (!__x._V_hot_ || __x._V_ == __y._V_);}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const normal_distribution& __x,
-                        const normal_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const normal_distribution<_RT>& __x);
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               normal_distribution<_RT>& __x);
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-normal_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    result_type _Up;
-    if (_V_hot_)
-    {
-        _V_hot_ = false;
-        _Up = _V_;
-    }
-    else
-    {
-        uniform_real_distribution<result_type> _Uni(-1, 1);
-        result_type __u;
-        result_type __v;
-        result_type __s;
-        do
-        {
-            __u = _Uni(__g);
-            __v = _Uni(__g);
-            __s = __u * __u + __v * __v;
-        } while (__s > 1 || __s == 0);
-        result_type _Fp = _VSTD::sqrt(-2 * _VSTD::log(__s) / __s);
-        _V_ = __v * _Fp;
-        _V_hot_ = true;
-        _Up = __u * _Fp;
-    }
-    return _Up * __p.stddev() + __p.mean();
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const normal_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.mean() << __sp << __x.stddev() << __sp << __x._V_hot_;
-    if (__x._V_hot_)
-        __os << __sp << __x._V_;
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           normal_distribution<_RT>& __x)
-{
-    typedef normal_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __mean;
-    result_type __stddev;
-    result_type _Vp = 0;
-    bool _V_hot = false;
-    __is >> __mean >> __stddev >> _V_hot;
-    if (_V_hot)
-        __is >> _Vp;
-    if (!__is.fail())
-    {
-        __x.param(param_type(__mean, __stddev));
-        __x._V_hot_ = _V_hot;
-        __x._V_ = _Vp;
-    }
-    return __is;
-}
-
-// lognormal_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY lognormal_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        normal_distribution<result_type> __nd_;
-    public:
-        typedef lognormal_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __m = 0, result_type __s = 1)
-            : __nd_(__m, __s) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type m() const {return __nd_.mean();}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type s() const {return __nd_.stddev();}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__nd_ == __y.__nd_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-        friend class lognormal_distribution;
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_ostream<_CharT, _Traits>&
-        operator<<(basic_ostream<_CharT, _Traits>& __os,
-                   const lognormal_distribution<_RT>& __x);
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_istream<_CharT, _Traits>&
-        operator>>(basic_istream<_CharT, _Traits>& __is,
-                   lognormal_distribution<_RT>& __x);
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit lognormal_distribution(result_type __m = 0, result_type __s = 1)
-        : __p_(param_type(__m, __s)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit lognormal_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {__p_.__nd_.reset();}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g, const param_type& __p)
-        {return _VSTD::exp(const_cast<normal_distribution<result_type>&>(__p.__nd_)(__g));}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type m() const {return __p_.m();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type s() const {return __p_.s();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const lognormal_distribution& __x,
-                        const lognormal_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const lognormal_distribution& __x,
-                        const lognormal_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const lognormal_distribution<_RT>& __x);
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               lognormal_distribution<_RT>& __x);
-};
-
-template <class _CharT, class _Traits, class _RT>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const lognormal_distribution<_RT>& __x)
-{
-    return __os << __x.__p_.__nd_;
-}
-
-template <class _CharT, class _Traits, class _RT>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           lognormal_distribution<_RT>& __x)
-{
-    return __is >> __x.__p_.__nd_;
-}
-
-// poisson_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY poisson_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        double __mean_;
-        double __s_;
-        double __d_;
-        double __l_;
-        double __omega_;
-        double __c0_;
-        double __c1_;
-        double __c2_;
-        double __c3_;
-        double __c_;
-
-    public:
-        typedef poisson_distribution distribution_type;
-
-        explicit param_type(double __mean = 1.0);
-
-        _LIBCPP_INLINE_VISIBILITY
-        double mean() const {return __mean_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__mean_ == __y.__mean_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-        friend class poisson_distribution;
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit poisson_distribution(double __mean = 1.0) : __p_(__mean) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit poisson_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    double mean() const {return __p_.mean();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::max();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const poisson_distribution& __x,
-                        const poisson_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const poisson_distribution& __x,
-                        const poisson_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _IntType>
-poisson_distribution<_IntType>::param_type::param_type(double __mean)
-    : __mean_(__mean)
-{
-    if (__mean_ < 10)
-    {
-        __s_ = 0;
-        __d_ = 0;
-        __l_ = _VSTD::exp(-__mean_);
-        __omega_ = 0;
-        __c3_ = 0;
-        __c2_ = 0;
-        __c1_ = 0;
-        __c0_ = 0;
-        __c_ = 0;
-    }
-    else
-    {
-        __s_ = _VSTD::sqrt(__mean_);
-        __d_ = 6 * __mean_ * __mean_;
-        __l_ = static_cast<result_type>(__mean_ - 1.1484);
-        __omega_ = .3989423 / __s_;
-        double __b1_ = .4166667E-1 / __mean_;
-        double __b2_ = .3 * __b1_ * __b1_;
-        __c3_ = .1428571 * __b1_ * __b2_;
-        __c2_ = __b2_ - 15. * __c3_;
-        __c1_ = __b1_ - 6. * __b2_ + 45. * __c3_;
-        __c0_ = 1. - __b1_ + 3. * __b2_ - 15. * __c3_;
-        __c_ = .1069 / __mean_;
-    }
-}
-
-template <class _IntType>
-template<class _URNG>
-_IntType
-poisson_distribution<_IntType>::operator()(_URNG& __urng, const param_type& __pr)
-{
-    result_type __x;
-    uniform_real_distribution<double> __urd;
-    if (__pr.__mean_ < 10)
-    {
-         __x = 0;
-        for (double __p = __urd(__urng); __p > __pr.__l_; ++__x)
-            __p *= __urd(__urng);
-    }
-    else
-    {
-        double __difmuk;
-        double __g = __pr.__mean_ + __pr.__s_ * normal_distribution<double>()(__urng);
-        double __u;
-        if (__g > 0)
-        {
-            __x = static_cast<result_type>(__g);
-            if (__x >= __pr.__l_)
-                return __x;
-            __difmuk = __pr.__mean_ - __x;
-            __u = __urd(__urng);
-            if (__pr.__d_ * __u >= __difmuk * __difmuk * __difmuk)
-                return __x;
-        }
-        exponential_distribution<double> __edist;
-        for (bool __using_exp_dist = false; true; __using_exp_dist = true)
-        {
-            double __e;
-            if (__using_exp_dist || __g < 0)
-            {
-                double __t;
-                do
-                {
-                    __e = __edist(__urng);
-                    __u = __urd(__urng);
-                    __u += __u - 1;
-                    __t = 1.8 + (__u < 0 ? -__e : __e);
-                } while (__t <= -.6744);
-                __x = __pr.__mean_ + __pr.__s_ * __t;
-                __difmuk = __pr.__mean_ - __x;
-                __using_exp_dist = true;
-            }
-            double __px;
-            double __py;
-            if (__x < 10)
-            {
-                const result_type __fac[] = {1, 1, 2, 6, 24, 120, 720, 5040,
-                                             40320, 362880};
-                __px = -__pr.__mean_;
-                __py = _VSTD::pow(__pr.__mean_, (double)__x) / __fac[__x];
-            }
-            else
-            {
-                double __del = .8333333E-1 / __x;
-                __del -= 4.8 * __del * __del * __del;
-                double __v = __difmuk / __x;
-                if (_VSTD::abs(__v) > 0.25)
-                    __px = __x * _VSTD::log(1 + __v) - __difmuk - __del;
-                else
-                    __px = __x * __v * __v * (((((((.1250060 * __v + -.1384794) *
-                           __v + .1421878) * __v + -.1661269) * __v + .2000118) *
-                           __v + -.2500068) * __v + .3333333) * __v + -.5) - __del;
-                __py = .3989423 / _VSTD::sqrt(__x);
-            }
-            double __r = (0.5 - __difmuk) / __pr.__s_;
-            double __r2 = __r * __r;
-            double __fx = -0.5 * __r2;
-            double __fy = __pr.__omega_ * (((__pr.__c3_ * __r2 + __pr.__c2_) *
-                                        __r2 + __pr.__c1_) * __r2 + __pr.__c0_);
-            if (__using_exp_dist)
-            {
-                if (__pr.__c_ * _VSTD::abs(__u) <= __py * _VSTD::exp(__px + __e) -
-                                                   __fy * _VSTD::exp(__fx + __e))
-                    break;
-            }
-            else
-            {
-                if (__fy - __u * __fy <= __py * _VSTD::exp(__px - __fx))
-                    break;
-            }
-        }
-    }
-    return __x;
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const poisson_distribution<_IntType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    return __os << __x.mean();
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           poisson_distribution<_IntType>& __x)
-{
-    typedef poisson_distribution<_IntType> _Eng;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    double __mean;
-    __is >> __mean;
-    if (!__is.fail())
-        __x.param(param_type(__mean));
-    return __is;
-}
-
-// weibull_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY weibull_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef weibull_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __a = 1, result_type __b = 1)
-            : __a_(__a), __b_(__b) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type a() const {return __a_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type b() const {return __b_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit weibull_distribution(result_type __a = 1, result_type __b = 1)
-        : __p_(param_type(__a, __b)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit weibull_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g, const param_type& __p)
-        {return __p.b() *
-            _VSTD::pow(exponential_distribution<result_type>()(__g), 1/__p.a());}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type a() const {return __p_.a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type b() const {return __p_.b();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const weibull_distribution& __x,
-                        const weibull_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const weibull_distribution& __x,
-                        const weibull_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const weibull_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.a() << __sp << __x.b();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           weibull_distribution<_RT>& __x)
-{
-    typedef weibull_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY extreme_value_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef extreme_value_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __a = 0, result_type __b = 1)
-            : __a_(__a), __b_(__b) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type a() const {return __a_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type b() const {return __b_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit extreme_value_distribution(result_type __a = 0, result_type __b = 1)
-        : __p_(param_type(__a, __b)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit extreme_value_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type a() const {return __p_.a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type b() const {return __p_.b();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return -numeric_limits<result_type>::infinity();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const extreme_value_distribution& __x,
-                        const extreme_value_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const extreme_value_distribution& __x,
-                        const extreme_value_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _RealType>
-template<class _URNG>
-_RealType
-extreme_value_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    return __p.a() - __p.b() *
-         _VSTD::log(-_VSTD::log(1-uniform_real_distribution<result_type>()(__g)));
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const extreme_value_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.a() << __sp << __x.b();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           extreme_value_distribution<_RT>& __x)
-{
-    typedef extreme_value_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-// gamma_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY gamma_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __alpha_;
-        result_type __beta_;
-    public:
-        typedef gamma_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __alpha = 1, result_type __beta = 1)
-            : __alpha_(__alpha), __beta_(__beta) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type alpha() const {return __alpha_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type beta() const {return __beta_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__alpha_ == __y.__alpha_ && __x.__beta_ == __y.__beta_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit gamma_distribution(result_type __alpha = 1, result_type __beta = 1)
-        : __p_(param_type(__alpha, __beta)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit gamma_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type alpha() const {return __p_.alpha();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type beta() const {return __p_.beta();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const gamma_distribution& __x,
-                        const gamma_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const gamma_distribution& __x,
-                        const gamma_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-gamma_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    result_type __a = __p.alpha();
-    uniform_real_distribution<result_type> __gen(0, 1);
-    exponential_distribution<result_type> __egen;
-    result_type __x;
-    if (__a == 1)
-        __x = __egen(__g);
-    else if (__a > 1)
-    {
-        const result_type __b = __a - 1;
-        const result_type __c = 3 * __a - result_type(0.75);
-        while (true)
-        {
-            const result_type __u = __gen(__g);
-            const result_type __v = __gen(__g);
-            const result_type __w = __u * (1 - __u);
-            if (__w != 0)
-            {
-                const result_type __y = _VSTD::sqrt(__c / __w) *
-                                        (__u - result_type(0.5));
-                __x = __b + __y;
-                if (__x >= 0)
-                {
-                    const result_type __z = 64 * __w * __w * __w * __v * __v;
-                    if (__z <= 1 - 2 * __y * __y / __x)
-                        break;
-                    if (_VSTD::log(__z) <= 2 * (__b * _VSTD::log(__x / __b) - __y))
-                        break;
-                }
-            }
-        }
-    }
-    else  // __a < 1
-    {
-        while (true)
-        {
-            const result_type __u = __gen(__g);
-            const result_type __es = __egen(__g);
-            if (__u <= 1 - __a)
-            {
-                __x = _VSTD::pow(__u, 1 / __a);
-                if (__x <= __es)
-                    break;
-            }
-            else
-            {
-                const result_type __e = -_VSTD::log((1-__u)/__a);
-                __x = _VSTD::pow(1 - __a + __a * __e, 1 / __a);
-                if (__x <= __e + __es)
-                    break;
-            }
-        }
-    }
-    return __x * __p.beta();
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const gamma_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.alpha() << __sp << __x.beta();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           gamma_distribution<_RT>& __x)
-{
-    typedef gamma_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __alpha;
-    result_type __beta;
-    __is >> __alpha >> __beta;
-    if (!__is.fail())
-        __x.param(param_type(__alpha, __beta));
-    return __is;
-}
-
-// negative_binomial_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY negative_binomial_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __k_;
-        double __p_;
-    public:
-        typedef negative_binomial_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __k = 1, double __p = 0.5)
-            : __k_(__k), __p_(__p) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type k() const {return __k_;}
-        _LIBCPP_INLINE_VISIBILITY
-        double p() const {return __p_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__k_ == __y.__k_ && __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit negative_binomial_distribution(result_type __k = 1, double __p = 0.5)
-        : __p_(__k, __p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit negative_binomial_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type k() const {return __p_.k();}
-    _LIBCPP_INLINE_VISIBILITY
-    double p() const {return __p_.p();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::max();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const negative_binomial_distribution& __x,
-                        const negative_binomial_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const negative_binomial_distribution& __x,
-                        const negative_binomial_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _IntType>
-template<class _URNG>
-_IntType
-negative_binomial_distribution<_IntType>::operator()(_URNG& __urng, const param_type& __pr)
-{
-    result_type __k = __pr.k();
-    double __p = __pr.p();
-    if (__k <= 21 * __p)
-    {
-        bernoulli_distribution __gen(__p);
-        result_type __f = 0;
-        result_type __s = 0;
-        while (__s < __k)
-        {
-            if (__gen(__urng))
-                ++__s;
-            else
-                ++__f;
-        }
-        return __f;
-    }
-    return poisson_distribution<result_type>(gamma_distribution<double>
-                                            (__k, (1-__p)/__p)(__urng))(__urng);
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const negative_binomial_distribution<_IntType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.k() << __sp << __x.p();
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           negative_binomial_distribution<_IntType>& __x)
-{
-    typedef negative_binomial_distribution<_IntType> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __k;
-    double __p;
-    __is >> __k >> __p;
-    if (!__is.fail())
-        __x.param(param_type(__k, __p));
-    return __is;
-}
-
-// geometric_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY geometric_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        double __p_;
-    public:
-        typedef geometric_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(double __p = 0.5) : __p_(__p) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        double p() const {return __p_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit geometric_distribution(double __p = 0.5) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit geometric_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g, const param_type& __p)
-        {return negative_binomial_distribution<result_type>(1, __p.p())(__g);}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    double p() const {return __p_.p();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::max();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const geometric_distribution& __x,
-                        const geometric_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const geometric_distribution& __x,
-                        const geometric_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _CharT, class _Traits, class _IntType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const geometric_distribution<_IntType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    return __os << __x.p();
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           geometric_distribution<_IntType>& __x)
-{
-    typedef geometric_distribution<_IntType> _Eng;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    double __p;
-    __is >> __p;
-    if (!__is.fail())
-        __x.param(param_type(__p));
-    return __is;
-}
-
-// chi_squared_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY chi_squared_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __n_;
-    public:
-        typedef chi_squared_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __n = 1) : __n_(__n) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type n() const {return __n_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__n_ == __y.__n_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit chi_squared_distribution(result_type __n = 1)
-        : __p_(param_type(__n)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit chi_squared_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g, const param_type& __p)
-        {return gamma_distribution<result_type>(__p.n() / 2, 2)(__g);}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type n() const {return __p_.n();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const chi_squared_distribution& __x,
-                        const chi_squared_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const chi_squared_distribution& __x,
-                        const chi_squared_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const chi_squared_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    __os << __x.n();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           chi_squared_distribution<_RT>& __x)
-{
-    typedef chi_squared_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __n;
-    __is >> __n;
-    if (!__is.fail())
-        __x.param(param_type(__n));
-    return __is;
-}
-
-// cauchy_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY cauchy_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef cauchy_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __a = 0, result_type __b = 1)
-            : __a_(__a), __b_(__b) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type a() const {return __a_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type b() const {return __b_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit cauchy_distribution(result_type __a = 0, result_type __b = 1)
-        : __p_(param_type(__a, __b)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit cauchy_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type a() const {return __p_.a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type b() const {return __p_.b();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return -numeric_limits<result_type>::infinity();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const cauchy_distribution& __x,
-                        const cauchy_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const cauchy_distribution& __x,
-                        const cauchy_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-inline _LIBCPP_INLINE_VISIBILITY
-_RealType
-cauchy_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    uniform_real_distribution<result_type> __gen;
-    // purposefully let tan arg get as close to pi/2 as it wants, tan will return a finite
-    return __p.a() + __p.b() * _VSTD::tan(3.1415926535897932384626433832795 * __gen(__g));
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const cauchy_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.a() << __sp << __x.b();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           cauchy_distribution<_RT>& __x)
-{
-    typedef cauchy_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-// fisher_f_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY fisher_f_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __m_;
-        result_type __n_;
-    public:
-        typedef fisher_f_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __m = 1, result_type __n = 1)
-            : __m_(__m), __n_(__n) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type m() const {return __m_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type n() const {return __n_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__m_ == __y.__m_ && __x.__n_ == __y.__n_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit fisher_f_distribution(result_type __m = 1, result_type __n = 1)
-        : __p_(param_type(__m, __n)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit fisher_f_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type m() const {return __p_.m();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type n() const {return __p_.n();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const fisher_f_distribution& __x,
-                        const fisher_f_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const fisher_f_distribution& __x,
-                        const fisher_f_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-fisher_f_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    gamma_distribution<result_type> __gdm(__p.m() * result_type(.5));
-    gamma_distribution<result_type> __gdn(__p.n() * result_type(.5));
-    return __p.n() * __gdm(__g) / (__p.m() * __gdn(__g));
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const fisher_f_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.m() << __sp << __x.n();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           fisher_f_distribution<_RT>& __x)
-{
-    typedef fisher_f_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __m;
-    result_type __n;
-    __is >> __m >> __n;
-    if (!__is.fail())
-        __x.param(param_type(__m, __n));
-    return __is;
-}
-
-// student_t_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY student_t_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __n_;
-    public:
-        typedef student_t_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __n = 1) : __n_(__n) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type n() const {return __n_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__n_ == __y.__n_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-    normal_distribution<result_type> __nd_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit student_t_distribution(result_type __n = 1)
-        : __p_(param_type(__n)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit student_t_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {__nd_.reset();}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type n() const {return __p_.n();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return -numeric_limits<result_type>::infinity();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const student_t_distribution& __x,
-                        const student_t_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const student_t_distribution& __x,
-                        const student_t_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-student_t_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    gamma_distribution<result_type> __gd(__p.n() * .5, 2);
-    return __nd_(__g) * _VSTD::sqrt(__p.n()/__gd(__g));
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const student_t_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    __os << __x.n();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           student_t_distribution<_RT>& __x)
-{
-    typedef student_t_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __n;
-    __is >> __n;
-    if (!__is.fail())
-        __x.param(param_type(__n));
-    return __is;
-}
-
-// discrete_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY discrete_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        vector<double> __p_;
-    public:
-        typedef discrete_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        param_type() {}
-        template<class _InputIterator>
-            _LIBCPP_INLINE_VISIBILITY
-            param_type(_InputIterator __f, _InputIterator __l)
-            : __p_(__f, __l) {__init();}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        _LIBCPP_INLINE_VISIBILITY
-        param_type(initializer_list<double> __wl)
-            : __p_(__wl.begin(), __wl.end()) {__init();}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(size_t __nw, double __xmin, double __xmax,
-                       _UnaryOperation __fw);
-
-        vector<double> probabilities() const;
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-    private:
-        void __init();
-
-        friend class discrete_distribution;
-
-        template <class _CharT, class _Traits, class _IT>
-        friend
-        basic_ostream<_CharT, _Traits>&
-        operator<<(basic_ostream<_CharT, _Traits>& __os,
-                   const discrete_distribution<_IT>& __x);
-
-        template <class _CharT, class _Traits, class _IT>
-        friend
-        basic_istream<_CharT, _Traits>&
-        operator>>(basic_istream<_CharT, _Traits>& __is,
-                   discrete_distribution<_IT>& __x);
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    discrete_distribution() {}
-    template<class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        discrete_distribution(_InputIterator __f, _InputIterator __l)
-            : __p_(__f, __l) {}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    discrete_distribution(initializer_list<double> __wl)
-        : __p_(__wl) {}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        discrete_distribution(size_t __nw, double __xmin, double __xmax,
-                              _UnaryOperation __fw)
-        : __p_(__nw, __xmin, __xmax, __fw) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit discrete_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    vector<double> probabilities() const {return __p_.probabilities();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return __p_.__p_.size();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const discrete_distribution& __x,
-                        const discrete_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const discrete_distribution& __x,
-                        const discrete_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _IT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const discrete_distribution<_IT>& __x);
-
-    template <class _CharT, class _Traits, class _IT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               discrete_distribution<_IT>& __x);
-};
-
-template<class _IntType>
-template<class _UnaryOperation>
-discrete_distribution<_IntType>::param_type::param_type(size_t __nw,
-                                                        double __xmin,
-                                                        double __xmax,
-                                                        _UnaryOperation __fw)
-{
-    if (__nw > 1)
-    {
-        __p_.reserve(__nw - 1);
-        double __d = (__xmax - __xmin) / __nw;
-        double __d2 = __d / 2;
-        for (size_t __k = 0; __k < __nw; ++__k)
-            __p_.push_back(__fw(__xmin + __k * __d + __d2));
-        __init();
-    }
-}
-
-template<class _IntType>
-void
-discrete_distribution<_IntType>::param_type::__init()
-{
-    if (!__p_.empty())
-    {
-        if (__p_.size() > 1)
-        {
-            double __s = _VSTD::accumulate(__p_.begin(), __p_.end(), 0.0);
-            for (_VSTD::vector<double>::iterator __i = __p_.begin(), __e = __p_.end();
-                                                                       __i < __e; ++__i)
-                *__i /= __s;
-            vector<double> __t(__p_.size() - 1);
-            _VSTD::partial_sum(__p_.begin(), __p_.end() - 1, __t.begin());
-            swap(__p_, __t);
-        }
-        else
-        {
-            __p_.clear();
-            __p_.shrink_to_fit();
-        }
-    }
-}
-
-template<class _IntType>
-vector<double>
-discrete_distribution<_IntType>::param_type::probabilities() const
-{
-    size_t __n = __p_.size();
-    _VSTD::vector<double> __p(__n+1);
-    _VSTD::adjacent_difference(__p_.begin(), __p_.end(), __p.begin());
-    if (__n > 0)
-        __p[__n] = 1 - __p_[__n-1];
-    else
-        __p[0] = 1;
-    return __p;
-}
-
-template<class _IntType>
-template<class _URNG>
-_IntType
-discrete_distribution<_IntType>::operator()(_URNG& __g, const param_type& __p)
-{
-    uniform_real_distribution<double> __gen;
-    return static_cast<_IntType>(
-           _VSTD::upper_bound(__p.__p_.begin(), __p.__p_.end(), __gen(__g)) -
-                                                              __p.__p_.begin());
-}
-
-template <class _CharT, class _Traits, class _IT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const discrete_distribution<_IT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    size_t __n = __x.__p_.__p_.size();
-    __os << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__p_[__i];
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _IT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           discrete_distribution<_IT>& __x)
-{
-    typedef discrete_distribution<_IT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    size_t __n;
-    __is >> __n;
-    vector<double> __p(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __p[__i];
-    if (!__is.fail())
-        swap(__x.__p_.__p_, __p);
-    return __is;
-}
-
-// piecewise_constant_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY piecewise_constant_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        vector<result_type> __b_;
-        vector<result_type> __densities_;
-        vector<result_type> __areas_;
-    public:
-        typedef piecewise_constant_distribution distribution_type;
-
-        param_type();
-        template<class _InputIteratorB, class _InputIteratorW>
-            param_type(_InputIteratorB __fB, _InputIteratorB __lB,
-                       _InputIteratorW __fW);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(initializer_list<result_type> __bl, _UnaryOperation __fw);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(size_t __nw, result_type __xmin, result_type __xmax,
-                       _UnaryOperation __fw);
-        param_type & operator=(const param_type& __rhs);
-
-        _LIBCPP_INLINE_VISIBILITY
-        vector<result_type> intervals() const {return __b_;}
-        _LIBCPP_INLINE_VISIBILITY
-        vector<result_type> densities() const {return __densities_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__densities_ == __y.__densities_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-    private:
-        void __init();
-
-        friend class piecewise_constant_distribution;
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_ostream<_CharT, _Traits>&
-        operator<<(basic_ostream<_CharT, _Traits>& __os,
-                   const piecewise_constant_distribution<_RT>& __x);
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_istream<_CharT, _Traits>&
-        operator>>(basic_istream<_CharT, _Traits>& __is,
-                   piecewise_constant_distribution<_RT>& __x);
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    piecewise_constant_distribution() {}
-    template<class _InputIteratorB, class _InputIteratorW>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_constant_distribution(_InputIteratorB __fB,
-                                        _InputIteratorB __lB,
-                                        _InputIteratorW __fW)
-        : __p_(__fB, __lB, __fW) {}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_constant_distribution(initializer_list<result_type> __bl,
-                                        _UnaryOperation __fw)
-        : __p_(__bl, __fw) {}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_constant_distribution(size_t __nw, result_type __xmin,
-                                        result_type __xmax, _UnaryOperation __fw)
-        : __p_(__nw, __xmin, __xmax, __fw) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit piecewise_constant_distribution(const param_type& __p)
-        : __p_(__p) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    vector<result_type> intervals() const {return __p_.intervals();}
-    _LIBCPP_INLINE_VISIBILITY
-    vector<result_type> densities() const {return __p_.densities();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return __p_.__b_.front();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return __p_.__b_.back();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const piecewise_constant_distribution& __x,
-                        const piecewise_constant_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const piecewise_constant_distribution& __x,
-                           const piecewise_constant_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const piecewise_constant_distribution<_RT>& __x);
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               piecewise_constant_distribution<_RT>& __x);
-};
-
-template<class _RealType>
-typename piecewise_constant_distribution<_RealType>::param_type &
-piecewise_constant_distribution<_RealType>::param_type::operator=
-                                                       (const param_type& __rhs)
-{
-//  These can throw
-    __b_.reserve        (__rhs.__b_.size ());
-    __densities_.reserve(__rhs.__densities_.size());
-    __areas_.reserve    (__rhs.__areas_.size());
-
-//  These can not throw
-    __b_         = __rhs.__b_;
-    __densities_ = __rhs.__densities_;
-    __areas_     =  __rhs.__areas_;
-    return *this;
-}
-
-template<class _RealType>
-void
-piecewise_constant_distribution<_RealType>::param_type::__init()
-{
-    // __densities_ contains non-normalized areas
-    result_type __total_area = _VSTD::accumulate(__densities_.begin(),
-                                                __densities_.end(),
-                                                result_type());
-    for (size_t __i = 0; __i < __densities_.size(); ++__i)
-        __densities_[__i] /= __total_area;
-    // __densities_ contains normalized areas
-    __areas_.assign(__densities_.size(), result_type());
-    _VSTD::partial_sum(__densities_.begin(), __densities_.end() - 1,
-                                                          __areas_.begin() + 1);
-    // __areas_ contains partial sums of normalized areas: [0, __densities_ - 1]
-    __densities_.back() = 1 - __areas_.back();  // correct round off error
-    for (size_t __i = 0; __i < __densities_.size(); ++__i)
-        __densities_[__i] /= (__b_[__i+1] - __b_[__i]);
-    // __densities_ now contains __densities_
-}
-
-template<class _RealType>
-piecewise_constant_distribution<_RealType>::param_type::param_type()
-    : __b_(2),
-      __densities_(1, 1.0),
-      __areas_(1, 0.0)
-{
-    __b_[1] = 1;
-}
-
-template<class _RealType>
-template<class _InputIteratorB, class _InputIteratorW>
-piecewise_constant_distribution<_RealType>::param_type::param_type(
-        _InputIteratorB __fB, _InputIteratorB __lB, _InputIteratorW __fW)
-    : __b_(__fB, __lB)
-{
-    if (__b_.size() < 2)
-    {
-        __b_.resize(2);
-        __b_[0] = 0;
-        __b_[1] = 1;
-        __densities_.assign(1, 1.0);
-        __areas_.assign(1, 0.0);
-    }
-    else
-    {
-        __densities_.reserve(__b_.size() - 1);
-        for (size_t __i = 0; __i < __b_.size() - 1; ++__i, ++__fW)
-            __densities_.push_back(*__fW);
-        __init();
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _RealType>
-template<class _UnaryOperation>
-piecewise_constant_distribution<_RealType>::param_type::param_type(
-        initializer_list<result_type> __bl, _UnaryOperation __fw)
-    : __b_(__bl.begin(), __bl.end())
-{
-    if (__b_.size() < 2)
-    {
-        __b_.resize(2);
-        __b_[0] = 0;
-        __b_[1] = 1;
-        __densities_.assign(1, 1.0);
-        __areas_.assign(1, 0.0);
-    }
-    else
-    {
-        __densities_.reserve(__b_.size() - 1);
-        for (size_t __i = 0; __i < __b_.size() - 1; ++__i)
-            __densities_.push_back(__fw((__b_[__i+1] + __b_[__i])*.5));
-        __init();
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _RealType>
-template<class _UnaryOperation>
-piecewise_constant_distribution<_RealType>::param_type::param_type(
-        size_t __nw, result_type __xmin, result_type __xmax, _UnaryOperation __fw)
-    : __b_(__nw == 0 ? 2 : __nw + 1)
-{
-    size_t __n = __b_.size() - 1;
-    result_type __d = (__xmax - __xmin) / __n;
-    __densities_.reserve(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-    {
-        __b_[__i] = __xmin + __i * __d;
-        __densities_.push_back(__fw(__b_[__i] + __d*.5));
-    }
-    __b_[__n] = __xmax;
-    __init();
-}
-
-template<class _RealType>
-template<class _URNG>
-_RealType
-piecewise_constant_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    typedef uniform_real_distribution<result_type> _Gen;
-    result_type __u = _Gen()(__g);
-    ptrdiff_t __k = _VSTD::upper_bound(__p.__areas_.begin(), __p.__areas_.end(),
-                                      __u) - __p.__areas_.begin() - 1;
-    return (__u - __p.__areas_[__k]) / __p.__densities_[__k] + __p.__b_[__k];
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const piecewise_constant_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    size_t __n = __x.__p_.__b_.size();
-    __os << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__b_[__i];
-    __n = __x.__p_.__densities_.size();
-    __os << __sp << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__densities_[__i];
-    __n = __x.__p_.__areas_.size();
-    __os << __sp << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__areas_[__i];
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           piecewise_constant_distribution<_RT>& __x)
-{
-    typedef piecewise_constant_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    size_t __n;
-    __is >> __n;
-    vector<result_type> __b(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __b[__i];
-    __is >> __n;
-    vector<result_type> __densities(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __densities[__i];
-    __is >> __n;
-    vector<result_type> __areas(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __areas[__i];
-    if (!__is.fail())
-    {
-        swap(__x.__p_.__b_, __b);
-        swap(__x.__p_.__densities_, __densities);
-        swap(__x.__p_.__areas_, __areas);
-    }
-    return __is;
-}
-
-// piecewise_linear_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY piecewise_linear_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        vector<result_type> __b_;
-        vector<result_type> __densities_;
-        vector<result_type> __areas_;
-    public:
-        typedef piecewise_linear_distribution distribution_type;
-
-        param_type();
-        template<class _InputIteratorB, class _InputIteratorW>
-            param_type(_InputIteratorB __fB, _InputIteratorB __lB,
-                       _InputIteratorW __fW);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(initializer_list<result_type> __bl, _UnaryOperation __fw);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(size_t __nw, result_type __xmin, result_type __xmax,
-                       _UnaryOperation __fw);
-        param_type & operator=(const param_type& __rhs);
-        
-        _LIBCPP_INLINE_VISIBILITY
-        vector<result_type> intervals() const {return __b_;}
-        _LIBCPP_INLINE_VISIBILITY
-        vector<result_type> densities() const {return __densities_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__densities_ == __y.__densities_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-    private:
-        void __init();
-
-        friend class piecewise_linear_distribution;
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_ostream<_CharT, _Traits>&
-        operator<<(basic_ostream<_CharT, _Traits>& __os,
-                   const piecewise_linear_distribution<_RT>& __x);
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_istream<_CharT, _Traits>&
-        operator>>(basic_istream<_CharT, _Traits>& __is,
-                   piecewise_linear_distribution<_RT>& __x);
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    piecewise_linear_distribution() {}
-    template<class _InputIteratorB, class _InputIteratorW>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_linear_distribution(_InputIteratorB __fB,
-                                      _InputIteratorB __lB,
-                                      _InputIteratorW __fW)
-        : __p_(__fB, __lB, __fW) {}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_linear_distribution(initializer_list<result_type> __bl,
-                                      _UnaryOperation __fw)
-        : __p_(__bl, __fw) {}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_linear_distribution(size_t __nw, result_type __xmin,
-                                      result_type __xmax, _UnaryOperation __fw)
-        : __p_(__nw, __xmin, __xmax, __fw) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit piecewise_linear_distribution(const param_type& __p)
-        : __p_(__p) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    vector<result_type> intervals() const {return __p_.intervals();}
-    _LIBCPP_INLINE_VISIBILITY
-    vector<result_type> densities() const {return __p_.densities();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return __p_.__b_.front();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return __p_.__b_.back();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const piecewise_linear_distribution& __x,
-                        const piecewise_linear_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const piecewise_linear_distribution& __x,
-                        const piecewise_linear_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const piecewise_linear_distribution<_RT>& __x);
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               piecewise_linear_distribution<_RT>& __x);
-};
-
-template<class _RealType>
-typename piecewise_linear_distribution<_RealType>::param_type &
-piecewise_linear_distribution<_RealType>::param_type::operator=
-                                                       (const param_type& __rhs)
-{
-//  These can throw
-    __b_.reserve        (__rhs.__b_.size ());
-    __densities_.reserve(__rhs.__densities_.size());
-    __areas_.reserve    (__rhs.__areas_.size());
-
-//  These can not throw
-    __b_         = __rhs.__b_;
-    __densities_ = __rhs.__densities_;
-    __areas_     =  __rhs.__areas_;
-    return *this;
-}
-
-
-template<class _RealType>
-void
-piecewise_linear_distribution<_RealType>::param_type::__init()
-{
-    __areas_.assign(__densities_.size() - 1, result_type());
-    result_type _Sp = 0;
-    for (size_t __i = 0; __i < __areas_.size(); ++__i)
-    {
-        __areas_[__i] = (__densities_[__i+1] + __densities_[__i]) *
-                        (__b_[__i+1] - __b_[__i]) * .5;
-        _Sp += __areas_[__i];
-    }
-    for (size_t __i = __areas_.size(); __i > 1;)
-    {
-        --__i;
-        __areas_[__i] = __areas_[__i-1] / _Sp;
-    }
-    __areas_[0] = 0;
-    for (size_t __i = 1; __i < __areas_.size(); ++__i)
-        __areas_[__i] += __areas_[__i-1];
-    for (size_t __i = 0; __i < __densities_.size(); ++__i)
-        __densities_[__i] /= _Sp;
-}
-
-template<class _RealType>
-piecewise_linear_distribution<_RealType>::param_type::param_type()
-    : __b_(2),
-      __densities_(2, 1.0),
-      __areas_(1, 0.0)
-{
-    __b_[1] = 1;
-}
-
-template<class _RealType>
-template<class _InputIteratorB, class _InputIteratorW>
-piecewise_linear_distribution<_RealType>::param_type::param_type(
-        _InputIteratorB __fB, _InputIteratorB __lB, _InputIteratorW __fW)
-    : __b_(__fB, __lB)
-{
-    if (__b_.size() < 2)
-    {
-        __b_.resize(2);
-        __b_[0] = 0;
-        __b_[1] = 1;
-        __densities_.assign(2, 1.0);
-        __areas_.assign(1, 0.0);
-    }
-    else
-    {
-        __densities_.reserve(__b_.size());
-        for (size_t __i = 0; __i < __b_.size(); ++__i, ++__fW)
-            __densities_.push_back(*__fW);
-        __init();
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _RealType>
-template<class _UnaryOperation>
-piecewise_linear_distribution<_RealType>::param_type::param_type(
-        initializer_list<result_type> __bl, _UnaryOperation __fw)
-    : __b_(__bl.begin(), __bl.end())
-{
-    if (__b_.size() < 2)
-    {
-        __b_.resize(2);
-        __b_[0] = 0;
-        __b_[1] = 1;
-        __densities_.assign(2, 1.0);
-        __areas_.assign(1, 0.0);
-    }
-    else
-    {
-        __densities_.reserve(__b_.size());
-        for (size_t __i = 0; __i < __b_.size(); ++__i)
-            __densities_.push_back(__fw(__b_[__i]));
-        __init();
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _RealType>
-template<class _UnaryOperation>
-piecewise_linear_distribution<_RealType>::param_type::param_type(
-        size_t __nw, result_type __xmin, result_type __xmax, _UnaryOperation __fw)
-    : __b_(__nw == 0 ? 2 : __nw + 1)
-{
-    size_t __n = __b_.size() - 1;
-    result_type __d = (__xmax - __xmin) / __n;
-    __densities_.reserve(__b_.size());
-    for (size_t __i = 0; __i < __n; ++__i)
-    {
-        __b_[__i] = __xmin + __i * __d;
-        __densities_.push_back(__fw(__b_[__i]));
-    }
-    __b_[__n] = __xmax;
-    __densities_.push_back(__fw(__b_[__n]));
-    __init();
-}
-
-template<class _RealType>
-template<class _URNG>
-_RealType
-piecewise_linear_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    typedef uniform_real_distribution<result_type> _Gen;
-    result_type __u = _Gen()(__g);
-    ptrdiff_t __k = _VSTD::upper_bound(__p.__areas_.begin(), __p.__areas_.end(),
-                                      __u) - __p.__areas_.begin() - 1;
-    __u -= __p.__areas_[__k];
-    const result_type __dk = __p.__densities_[__k];
-    const result_type __dk1 = __p.__densities_[__k+1];
-    const result_type __deltad = __dk1 - __dk;
-    const result_type __bk = __p.__b_[__k];
-    if (__deltad == 0)
-        return __u / __dk + __bk;
-    const result_type __bk1 = __p.__b_[__k+1];
-    const result_type __deltab = __bk1 - __bk;
-    return (__bk * __dk1 - __bk1 * __dk +
-        _VSTD::sqrt(__deltab * (__deltab * __dk * __dk + 2 * __deltad * __u))) /
-        __deltad;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const piecewise_linear_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    size_t __n = __x.__p_.__b_.size();
-    __os << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__b_[__i];
-    __n = __x.__p_.__densities_.size();
-    __os << __sp << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__densities_[__i];
-    __n = __x.__p_.__areas_.size();
-    __os << __sp << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__areas_[__i];
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           piecewise_linear_distribution<_RT>& __x)
-{
-    typedef piecewise_linear_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    size_t __n;
-    __is >> __n;
-    vector<result_type> __b(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __b[__i];
-    __is >> __n;
-    vector<result_type> __densities(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __densities[__i];
-    __is >> __n;
-    vector<result_type> __areas(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __areas[__i];
-    if (!__is.fail())
-    {
-        swap(__x.__p_.__b_, __b);
-        swap(__x.__p_.__densities_, __densities);
-        swap(__x.__p_.__areas_, __areas);
-    }
-    return __is;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_RANDOM
diff --git a/include.new/c++/v1/ratio b/include.new/c++/v1/ratio
deleted file mode 100644
index 48dcd81..0000000
--- a/include.new/c++/v1/ratio
+++ /dev/null
@@ -1,487 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- ratio -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_RATIO
-#define _LIBCPP_RATIO
-
-/*
-    ratio synopsis
-
-namespace std
-{
-
-template <intmax_t N, intmax_t D = 1>
-class ratio
-{
-public:
-    static const intmax_t num;
-    static const intmax_t den;
-    typedef ratio<num, den> type;
-};
-
-// ratio arithmetic
-template <class R1, class R2> using ratio_add = ...;
-template <class R1, class R2> using ratio_subtract = ...;
-template <class R1, class R2> using ratio_multiply = ...;
-template <class R1, class R2> using ratio_divide = ...;
-
-// ratio comparison
-template <class R1, class R2> struct ratio_equal;
-template <class R1, class R2> struct ratio_not_equal;
-template <class R1, class R2> struct ratio_less;
-template <class R1, class R2> struct ratio_less_equal;
-template <class R1, class R2> struct ratio_greater;
-template <class R1, class R2> struct ratio_greater_equal;
-
-// convenience SI typedefs
-typedef ratio<1, 1000000000000000000000000> yocto;  // not supported
-typedef ratio<1,    1000000000000000000000> zepto;  // not supported
-typedef ratio<1,       1000000000000000000> atto;
-typedef ratio<1,          1000000000000000> femto;
-typedef ratio<1,             1000000000000> pico;
-typedef ratio<1,                1000000000> nano;
-typedef ratio<1,                   1000000> micro;
-typedef ratio<1,                      1000> milli;
-typedef ratio<1,                       100> centi;
-typedef ratio<1,                        10> deci;
-typedef ratio<                       10, 1> deca;
-typedef ratio<                      100, 1> hecto;
-typedef ratio<                     1000, 1> kilo;
-typedef ratio<                  1000000, 1> mega;
-typedef ratio<               1000000000, 1> giga;
-typedef ratio<            1000000000000, 1> tera;
-typedef ratio<         1000000000000000, 1> peta;
-typedef ratio<      1000000000000000000, 1> exa;
-typedef ratio<   1000000000000000000000, 1> zetta;  // not supported
-typedef ratio<1000000000000000000000000, 1> yotta;  // not supported
-
-}
-*/
-
-#include <__config>
-#include <cstdint>
-#include <climits>
-#include <type_traits>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// __static_gcd
-
-template <intmax_t _Xp, intmax_t _Yp>
-struct __static_gcd
-{
-    static const intmax_t value = __static_gcd<_Yp, _Xp % _Yp>::value;
-};
-
-template <intmax_t _Xp>
-struct __static_gcd<_Xp, 0>
-{
-    static const intmax_t value = _Xp;
-};
-
-template <>
-struct __static_gcd<0, 0>
-{
-    static const intmax_t value = 1;
-};
-
-// __static_lcm
-
-template <intmax_t _Xp, intmax_t _Yp>
-struct __static_lcm
-{
-    static const intmax_t value = _Xp / __static_gcd<_Xp, _Yp>::value * _Yp;
-};
-
-template <intmax_t _Xp>
-struct __static_abs
-{
-    static const intmax_t value = _Xp < 0 ? -_Xp : _Xp;
-};
-
-template <intmax_t _Xp>
-struct __static_sign
-{
-    static const intmax_t value = _Xp == 0 ? 0 : (_Xp < 0 ? -1 : 1);
-};
-
-template <intmax_t _Xp, intmax_t _Yp, intmax_t = __static_sign<_Yp>::value>
-class __ll_add;
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_add<_Xp, _Yp, 1>
-{
-    static const intmax_t min = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1;
-    static const intmax_t max = -min;
-
-    static_assert(_Xp <= max - _Yp, "overflow in __ll_add");
-public:
-    static const intmax_t value = _Xp + _Yp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_add<_Xp, _Yp, 0>
-{
-public:
-    static const intmax_t value = _Xp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_add<_Xp, _Yp, -1>
-{
-    static const intmax_t min = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1;
-    static const intmax_t max = -min;
-
-    static_assert(min - _Yp <= _Xp, "overflow in __ll_add");
-public:
-    static const intmax_t value = _Xp + _Yp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp, intmax_t = __static_sign<_Yp>::value>
-class __ll_sub;
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_sub<_Xp, _Yp, 1>
-{
-    static const intmax_t min = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1;
-    static const intmax_t max = -min;
-
-    static_assert(min + _Yp <= _Xp, "overflow in __ll_sub");
-public:
-    static const intmax_t value = _Xp - _Yp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_sub<_Xp, _Yp, 0>
-{
-public:
-    static const intmax_t value = _Xp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_sub<_Xp, _Yp, -1>
-{
-    static const intmax_t min = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1;
-    static const intmax_t max = -min;
-
-    static_assert(_Xp <= max + _Yp, "overflow in __ll_sub");
-public:
-    static const intmax_t value = _Xp - _Yp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_mul
-{
-    static const intmax_t nan = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1));
-    static const intmax_t min = nan + 1;
-    static const intmax_t max = -min;
-    static const intmax_t __a_x = __static_abs<_Xp>::value;
-    static const intmax_t __a_y = __static_abs<_Yp>::value;
-
-    static_assert(_Xp != nan && _Yp != nan && __a_x <= max / __a_y, "overflow in __ll_mul");
-public:
-    static const intmax_t value = _Xp * _Yp;
-};
-
-template <intmax_t _Yp>
-class __ll_mul<0, _Yp>
-{
-public:
-    static const intmax_t value = 0;
-};
-
-template <intmax_t _Xp>
-class __ll_mul<_Xp, 0>
-{
-public:
-    static const intmax_t value = 0;
-};
-
-template <>
-class __ll_mul<0, 0>
-{
-public:
-    static const intmax_t value = 0;
-};
-
-// Not actually used but left here in case needed in future maintenance
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_div
-{
-    static const intmax_t nan = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1));
-    static const intmax_t min = nan + 1;
-    static const intmax_t max = -min;
-
-    static_assert(_Xp != nan && _Yp != nan && _Yp != 0, "overflow in __ll_div");
-public:
-    static const intmax_t value = _Xp / _Yp;
-};
-
-template <intmax_t _Num, intmax_t _Den = 1>
-class _LIBCPP_TYPE_VIS_ONLY ratio
-{
-    static_assert(__static_abs<_Num>::value >= 0, "ratio numerator is out of range");
-    static_assert(_Den != 0, "ratio divide by 0");
-    static_assert(__static_abs<_Den>::value >  0, "ratio denominator is out of range");
-    static const intmax_t __na = __static_abs<_Num>::value;
-    static const intmax_t __da = __static_abs<_Den>::value;
-    static const intmax_t __s = __static_sign<_Num>::value * __static_sign<_Den>::value;
-    static const intmax_t __gcd = __static_gcd<__na, __da>::value;
-public:
-    static const intmax_t num = __s * __na / __gcd;
-    static const intmax_t den = __da / __gcd;
-
-    typedef ratio<num, den> type;
-};
-
-template <intmax_t _Num, intmax_t _Den> const intmax_t ratio<_Num, _Den>::num;
-template <intmax_t _Num, intmax_t _Den> const intmax_t ratio<_Num, _Den>::den;
-
-template <class _Tp>                    struct __is_ratio                     : false_type {};
-template <intmax_t _Num, intmax_t _Den> struct __is_ratio<ratio<_Num, _Den> > : true_type  {};
-
-typedef ratio<1LL, 1000000000000000000LL> atto;
-typedef ratio<1LL,    1000000000000000LL> femto;
-typedef ratio<1LL,       1000000000000LL> pico;
-typedef ratio<1LL,          1000000000LL> nano;
-typedef ratio<1LL,             1000000LL> micro;
-typedef ratio<1LL,                1000LL> milli;
-typedef ratio<1LL,                 100LL> centi;
-typedef ratio<1LL,                  10LL> deci;
-typedef ratio<                 10LL, 1LL> deca;
-typedef ratio<                100LL, 1LL> hecto;
-typedef ratio<               1000LL, 1LL> kilo;
-typedef ratio<            1000000LL, 1LL> mega;
-typedef ratio<         1000000000LL, 1LL> giga;
-typedef ratio<      1000000000000LL, 1LL> tera;
-typedef ratio<   1000000000000000LL, 1LL> peta;
-typedef ratio<1000000000000000000LL, 1LL> exa;
-
-template <class _R1, class _R2>
-struct __ratio_multiply
-{
-private:
-    static const intmax_t __gcd_n1_d2 = __static_gcd<_R1::num, _R2::den>::value;
-    static const intmax_t __gcd_d1_n2 = __static_gcd<_R1::den, _R2::num>::value;
-public:
-    typedef typename ratio
-        <
-            __ll_mul<_R1::num / __gcd_n1_d2, _R2::num / __gcd_d1_n2>::value,
-            __ll_mul<_R2::den / __gcd_n1_d2, _R1::den / __gcd_d1_n2>::value
-        >::type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2> using ratio_multiply
-                                    = typename __ratio_multiply<_R1, _R2>::type;
-
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_multiply
-    : public __ratio_multiply<_R1, _R2>::type {};
-
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct __ratio_divide
-{
-private:
-    static const intmax_t __gcd_n1_n2 = __static_gcd<_R1::num, _R2::num>::value;
-    static const intmax_t __gcd_d1_d2 = __static_gcd<_R1::den, _R2::den>::value;
-public:
-    typedef typename ratio
-        <
-            __ll_mul<_R1::num / __gcd_n1_n2, _R2::den / __gcd_d1_d2>::value,
-            __ll_mul<_R2::num / __gcd_n1_n2, _R1::den / __gcd_d1_d2>::value
-        >::type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2> using ratio_divide
-                                      = typename __ratio_divide<_R1, _R2>::type;
-
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_divide
-    : public __ratio_divide<_R1, _R2>::type {};
-
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct __ratio_add
-{
-private:
-    static const intmax_t __gcd_n1_n2 = __static_gcd<_R1::num, _R2::num>::value;
-    static const intmax_t __gcd_d1_d2 = __static_gcd<_R1::den, _R2::den>::value;
-public:
-    typedef typename ratio_multiply
-        <
-            ratio<__gcd_n1_n2, _R1::den / __gcd_d1_d2>,
-            ratio
-            <
-                __ll_add
-                <
-                    __ll_mul<_R1::num / __gcd_n1_n2, _R2::den / __gcd_d1_d2>::value,
-                    __ll_mul<_R2::num / __gcd_n1_n2, _R1::den / __gcd_d1_d2>::value
-                >::value,
-                _R2::den
-            >
-        >::type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2> using ratio_add
-                                         = typename __ratio_add<_R1, _R2>::type;
-
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_add
-    : public __ratio_add<_R1, _R2>::type {};
-
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct __ratio_subtract
-{
-private:
-    static const intmax_t __gcd_n1_n2 = __static_gcd<_R1::num, _R2::num>::value;
-    static const intmax_t __gcd_d1_d2 = __static_gcd<_R1::den, _R2::den>::value;
-public:
-    typedef typename ratio_multiply
-        <
-            ratio<__gcd_n1_n2, _R1::den / __gcd_d1_d2>,
-            ratio
-            <
-                __ll_sub
-                <
-                    __ll_mul<_R1::num / __gcd_n1_n2, _R2::den / __gcd_d1_d2>::value,
-                    __ll_mul<_R2::num / __gcd_n1_n2, _R1::den / __gcd_d1_d2>::value
-                >::value,
-                _R2::den
-            >
-        >::type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2> using ratio_subtract
-                                    = typename __ratio_subtract<_R1, _R2>::type;
-
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_subtract
-    : public __ratio_subtract<_R1, _R2>::type {};
-
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-// ratio_equal
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_equal
-    : public integral_constant<bool, _R1::num == _R2::num && _R1::den == _R2::den> {};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_not_equal
-    : public integral_constant<bool, !ratio_equal<_R1, _R2>::value> {};
-
-// ratio_less
-
-template <class _R1, class _R2, bool _Odd = false,
-          intmax_t _Q1 = _R1::num / _R1::den, intmax_t _M1 = _R1::num % _R1::den,
-          intmax_t _Q2 = _R2::num / _R2::den, intmax_t _M2 = _R2::num % _R2::den>
-struct __ratio_less1
-{
-    static const bool value = _Odd ? _Q2 < _Q1 : _Q1 < _Q2;
-};
-
-template <class _R1, class _R2, bool _Odd, intmax_t _Qp>
-struct __ratio_less1<_R1, _R2, _Odd, _Qp, 0, _Qp, 0>
-{
-    static const bool value = false;
-};
-
-template <class _R1, class _R2, bool _Odd, intmax_t _Qp, intmax_t _M2>
-struct __ratio_less1<_R1, _R2, _Odd, _Qp, 0, _Qp, _M2>
-{
-    static const bool value = !_Odd;
-};
-
-template <class _R1, class _R2, bool _Odd, intmax_t _Qp, intmax_t _M1>
-struct __ratio_less1<_R1, _R2, _Odd, _Qp, _M1, _Qp, 0>
-{
-    static const bool value = _Odd;
-};
-
-template <class _R1, class _R2, bool _Odd, intmax_t _Qp, intmax_t _M1,
-                                                        intmax_t _M2>
-struct __ratio_less1<_R1, _R2, _Odd, _Qp, _M1, _Qp, _M2>
-{
-    static const bool value = __ratio_less1<ratio<_R1::den, _M1>,
-                                            ratio<_R2::den, _M2>, !_Odd>::value;
-};
-
-template <class _R1, class _R2, intmax_t _S1 = __static_sign<_R1::num>::value,
-                                intmax_t _S2 = __static_sign<_R2::num>::value>
-struct __ratio_less
-{
-    static const bool value = _S1 < _S2;
-};
-
-template <class _R1, class _R2>
-struct __ratio_less<_R1, _R2, 1LL, 1LL>
-{
-    static const bool value = __ratio_less1<_R1, _R2>::value;
-};
-
-template <class _R1, class _R2>
-struct __ratio_less<_R1, _R2, -1LL, -1LL>
-{
-    static const bool value = __ratio_less1<ratio<-_R2::num, _R2::den>, ratio<-_R1::num, _R1::den> >::value;
-};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_less
-    : public integral_constant<bool, __ratio_less<_R1, _R2>::value> {};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_less_equal
-    : public integral_constant<bool, !ratio_less<_R2, _R1>::value> {};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_greater
-    : public integral_constant<bool, ratio_less<_R2, _R1>::value> {};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_greater_equal
-    : public integral_constant<bool, !ratio_less<_R1, _R2>::value> {};
-
-template <class _R1, class _R2>
-struct __ratio_gcd
-{
-    typedef ratio<__static_gcd<_R1::num, _R2::num>::value,
-                  __static_lcm<_R1::den, _R2::den>::value> type;
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_RATIO
diff --git a/include.new/c++/v1/regex b/include.new/c++/v1/regex
deleted file mode 100644
index 690213a..0000000
--- a/include.new/c++/v1/regex
+++ /dev/null
@@ -1,6591 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- regex ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_REGEX
-#define _LIBCPP_REGEX
-
-/*
-    regex synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-namespace regex_constants
-{
-
-emum syntax_option_type
-{
-    icase      = unspecified,
-    nosubs     = unspecified,
-    optimize   = unspecified,
-    collate    = unspecified,
-    ECMAScript = unspecified,
-    basic      = unspecified,
-    extended   = unspecified,
-    awk        = unspecified,
-    grep       = unspecified,
-    egrep      = unspecified
-};
-
-constexpr syntax_option_type operator~(syntax_option_type f);
-constexpr syntax_option_type operator&(syntax_option_type lhs, syntax_option_type rhs);
-constexpr syntax_option_type operator|(syntax_option_type lhs, syntax_option_type rhs);
-
-enum match_flag_type
-{
-    match_default     = 0,
-    match_not_bol     = unspecified,
-    match_not_eol     = unspecified,
-    match_not_bow     = unspecified,
-    match_not_eow     = unspecified,
-    match_any         = unspecified,
-    match_not_null    = unspecified,
-    match_continuous  = unspecified,
-    match_prev_avail  = unspecified,
-    format_default    = 0,
-    format_sed        = unspecified,
-    format_no_copy    = unspecified,
-    format_first_only = unspecified
-};
-
-constexpr match_flag_type operator~(match_flag_type f);
-constexpr match_flag_type operator&(match_flag_type lhs, match_flag_type rhs);
-constexpr match_flag_type operator|(match_flag_type lhs, match_flag_type rhs);
-
-enum error_type
-{
-    error_collate    = unspecified,
-    error_ctype      = unspecified,
-    error_escape     = unspecified,
-    error_backref    = unspecified,
-    error_brack      = unspecified,
-    error_paren      = unspecified,
-    error_brace      = unspecified,
-    error_badbrace   = unspecified,
-    error_range      = unspecified,
-    error_space      = unspecified,
-    error_badrepeat  = unspecified,
-    error_complexity = unspecified,
-    error_stack      = unspecified
-};
-
-}  // regex_constants
-
-class regex_error
-    : public runtime_error
-{
-public:
-    explicit regex_error(regex_constants::error_type ecode);
-    regex_constants::error_type code() const;
-};
-
-template <class charT>
-struct regex_traits
-{
-public:
-    typedef charT                   char_type;
-    typedef basic_string<char_type> string_type;
-    typedef locale                  locale_type;
-    typedef /bitmask_type/          char_class_type;
-
-    regex_traits();
-
-    static size_t length(const char_type* p);
-    charT translate(charT c) const;
-    charT translate_nocase(charT c) const;
-    template <class ForwardIterator>
-        string_type
-        transform(ForwardIterator first, ForwardIterator last) const;
-    template <class ForwardIterator>
-        string_type
-        transform_primary( ForwardIterator first, ForwardIterator last) const;
-    template <class ForwardIterator>
-        string_type
-        lookup_collatename(ForwardIterator first, ForwardIterator last) const;
-    template <class ForwardIterator>
-        char_class_type
-        lookup_classname(ForwardIterator first, ForwardIterator last,
-                         bool icase = false) const;
-    bool isctype(charT c, char_class_type f) const;
-    int value(charT ch, int radix) const;
-    locale_type imbue(locale_type l);
-    locale_type getloc()const;
-};
-
-template <class charT, class traits = regex_traits<charT>>
-class basic_regex
-{
-public:
-    // types:
-    typedef charT                               value_type;
-    typedef regex_constants::syntax_option_type flag_type;
-    typedef typename traits::locale_type        locale_type;
-
-    // constants:
-    static constexpr regex_constants::syntax_option_type icase = regex_constants::icase;
-    static constexpr regex_constants::syntax_option_type nosubs = regex_constants::nosubs;
-    static constexpr regex_constants::syntax_option_type optimize = regex_constants::optimize;
-    static constexpr regex_constants::syntax_option_type collate = regex_constants::collate;
-    static constexpr regex_constants::syntax_option_type ECMAScript = regex_constants::ECMAScript;
-    static constexpr regex_constants::syntax_option_type basic = regex_constants::basic;
-    static constexpr regex_constants::syntax_option_type extended = regex_constants::extended;
-    static constexpr regex_constants::syntax_option_type awk = regex_constants::awk;
-    static constexpr regex_constants::syntax_option_type grep = regex_constants::grep;
-    static constexpr regex_constants::syntax_option_type egrep = regex_constants::egrep;
-
-    // construct/copy/destroy:
-    basic_regex();
-    explicit basic_regex(const charT* p, flag_type f = regex_constants::ECMAScript);
-    basic_regex(const charT* p, size_t len, flag_type f);
-    basic_regex(const basic_regex&);
-    basic_regex(basic_regex&&) noexcept;
-    template <class ST, class SA>
-        explicit basic_regex(const basic_string<charT, ST, SA>& p,
-                             flag_type f = regex_constants::ECMAScript);
-    template <class ForwardIterator>
-        basic_regex(ForwardIterator first, ForwardIterator last,
-                    flag_type f = regex_constants::ECMAScript);
-    basic_regex(initializer_list<charT>, flag_type = regex_constants::ECMAScript);
-
-    ~basic_regex();
-
-    basic_regex& operator=(const basic_regex&);
-    basic_regex& operator=(basic_regex&&) noexcept;
-    basic_regex& operator=(const charT* ptr);
-    basic_regex& operator=(initializer_list<charT> il);
-    template <class ST, class SA>
-        basic_regex& operator=(const basic_string<charT, ST, SA>& p);
-
-    // assign:
-    basic_regex& assign(const basic_regex& that);
-    basic_regex& assign(basic_regex&& that) noexcept;
-    basic_regex& assign(const charT* ptr, flag_type f = regex_constants::ECMAScript);
-    basic_regex& assign(const charT* p, size_t len, flag_type f);
-    template <class string_traits, class A>
-        basic_regex& assign(const basic_string<charT, string_traits, A>& s,
-                            flag_type f = regex_constants::ECMAScript);
-    template <class InputIterator>
-        basic_regex& assign(InputIterator first, InputIterator last,
-                            flag_type f = regex_constants::ECMAScript);
-    basic_regex& assign(initializer_list<charT>, flag_type = regex_constants::ECMAScript);
-
-    // const operations:
-    unsigned mark_count() const;
-    flag_type flags() const;
-
-    // locale:
-    locale_type imbue(locale_type loc);
-    locale_type getloc() const;
-
-    // swap:
-    void swap(basic_regex&);
-};
-
-typedef basic_regex<char>    regex;
-typedef basic_regex<wchar_t> wregex;
-
-template <class charT, class traits>
-    void swap(basic_regex<charT, traits>& e1, basic_regex<charT, traits>& e2);
-
-template <class BidirectionalIterator>
-class sub_match
-    : public pair<BidirectionalIterator, BidirectionalIterator>
-{
-public:
-    typedef typename iterator_traits<BidirectionalIterator>::value_type value_type;
-    typedef typename iterator_traits<BidirectionalIterator>::difference_type difference_type;
-    typedef BidirectionalIterator                                      iterator;
-    typedef basic_string<value_type>                                string_type;
-
-    bool matched;
-
-    constexpr sub_match();
-
-    difference_type length() const;
-    operator string_type() const;
-    string_type str() const;
-
-    int compare(const sub_match& s) const;
-    int compare(const string_type& s) const;
-    int compare(const value_type* s) const;
-};
-
-typedef sub_match<const char*>             csub_match;
-typedef sub_match<const wchar_t*>          wcsub_match;
-typedef sub_match<string::const_iterator>  ssub_match;
-typedef sub_match<wstring::const_iterator> wssub_match;
-
-template <class BiIter>
-    bool
-    operator==(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator!=(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<=(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>=(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator==(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator!=(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator<(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator>(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool operator>=(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-                    const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator<=(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator==(const sub_match<BiIter>& lhs,
-               const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator!=(const sub_match<BiIter>& lhs,
-               const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator<(const sub_match<BiIter>& lhs,
-              const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool operator>(const sub_match<BiIter>& lhs,
-                   const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator>=(const sub_match<BiIter>& lhs,
-               const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator<=(const sub_match<BiIter>& lhs,
-               const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter>
-    bool
-    operator==(typename iterator_traits<BiIter>::value_type const* lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator!=(typename iterator_traits<BiIter>::value_type const* lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<(typename iterator_traits<BiIter>::value_type const* lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>(typename iterator_traits<BiIter>::value_type const* lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>=(typename iterator_traits<BiIter>::value_type const* lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<=(typename iterator_traits<BiIter>::value_type const* lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator==(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator!=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator<(const sub_match<BiIter>& lhs,
-              typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator>(const sub_match<BiIter>& lhs,
-              typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator>=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator<=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator==(typename iterator_traits<BiIter>::value_type const& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator!=(typename iterator_traits<BiIter>::value_type const& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<(typename iterator_traits<BiIter>::value_type const& lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>(typename iterator_traits<BiIter>::value_type const& lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>=(typename iterator_traits<BiIter>::value_type const& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<=(typename iterator_traits<BiIter>::value_type const& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator==(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator!=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator<(const sub_match<BiIter>& lhs,
-              typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator>(const sub_match<BiIter>& lhs,
-              typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator>=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator<=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class charT, class ST, class BiIter>
-    basic_ostream<charT, ST>&
-    operator<<(basic_ostream<charT, ST>& os, const sub_match<BiIter>& m);
-
-template <class BidirectionalIterator,
-          class Allocator = allocator<sub_match<BidirectionalIterator>>>
-class match_results
-{
-public:
-    typedef sub_match<BidirectionalIterator>                  value_type;
-    typedef const value_type&                                 const_reference;
-    typedef value_type&                                       reference;
-    typedef /implementation-defined/                          const_iterator;
-    typedef const_iterator                                    iterator;
-    typedef typename iterator_traits<BidirectionalIterator>::difference_type difference_type;
-    typedef typename allocator_traits<Allocator>::size_type   size_type;
-    typedef Allocator                                         allocator_type;
-    typedef typename iterator_traits<BidirectionalIterator>::value_type char_type;
-    typedef basic_string<char_type>                           string_type;
-
-    // construct/copy/destroy:
-    explicit match_results(const Allocator& a = Allocator());
-    match_results(const match_results& m);
-    match_results(match_results&& m) noexcept;
-    match_results& operator=(const match_results& m);
-    match_results& operator=(match_results&& m);
-    ~match_results();
-
-    bool ready() const;
-
-    // size:
-    size_type size() const;
-    size_type max_size() const;
-    bool empty() const;
-
-    // element access:
-    difference_type length(size_type sub = 0) const;
-    difference_type position(size_type sub = 0) const;
-    string_type str(size_type sub = 0) const;
-    const_reference operator[](size_type n) const;
-
-    const_reference prefix() const;
-    const_reference suffix() const;
-
-    const_iterator begin() const;
-    const_iterator end() const;
-    const_iterator cbegin() const;
-    const_iterator cend() const;
-
-    // format:
-    template <class OutputIter>
-        OutputIter
-        format(OutputIter out, const char_type* fmt_first,
-               const char_type* fmt_last,
-               regex_constants::match_flag_type flags = regex_constants::format_default) const;
-    template <class OutputIter, class ST, class SA>
-        OutputIter
-        format(OutputIter out, const basic_string<char_type, ST, SA>& fmt,
-               regex_constants::match_flag_type flags = regex_constants::format_default) const;
-    template <class ST, class SA>
-        basic_string<char_type, ST, SA>
-        format(const basic_string<char_type, ST, SA>& fmt,
-               regex_constants::match_flag_type flags = regex_constants::format_default) const;
-    string_type
-        format(const char_type* fmt,
-               regex_constants::match_flag_type flags = regex_constants::format_default) const;
-
-    // allocator:
-    allocator_type get_allocator() const;
-
-    // swap:
-    void swap(match_results& that);
-};
-
-typedef match_results<const char*>             cmatch;
-typedef match_results<const wchar_t*>          wcmatch;
-typedef match_results<string::const_iterator>  smatch;
-typedef match_results<wstring::const_iterator> wsmatch;
-
-template <class BidirectionalIterator, class Allocator>
-    bool
-    operator==(const match_results<BidirectionalIterator, Allocator>& m1,
-               const match_results<BidirectionalIterator, Allocator>& m2);
-
-template <class BidirectionalIterator, class Allocator>
-    bool
-    operator!=(const match_results<BidirectionalIterator, Allocator>& m1,
-               const match_results<BidirectionalIterator, Allocator>& m2);
-
-template <class BidirectionalIterator, class Allocator>
-    void
-    swap(match_results<BidirectionalIterator, Allocator>& m1,
-         match_results<BidirectionalIterator, Allocator>& m2);
-
-template <class BidirectionalIterator, class Allocator, class charT, class traits>
-    bool
-    regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                match_results<BidirectionalIterator, Allocator>& m,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class BidirectionalIterator, class charT, class traits>
-    bool
-    regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class charT, class Allocator, class traits>
-    bool
-    regex_match(const charT* str, match_results<const charT*, Allocator>& m,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class Allocator, class charT, class traits>
-    bool
-    regex_match(const basic_string<charT, ST, SA>& s,
-                match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class Allocator, class charT, class traits>
-    bool
-    regex_match(const basic_string<charT, ST, SA>&& s,
-                match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default) = delete; // C++14
-
-template <class charT, class traits>
-    bool
-    regex_match(const charT* str, const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class charT, class traits>
-    bool
-    regex_match(const basic_string<charT, ST, SA>& s,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class BidirectionalIterator, class Allocator, class charT, class traits>
-    bool
-    regex_search(BidirectionalIterator first, BidirectionalIterator last,
-                 match_results<BidirectionalIterator, Allocator>& m,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class BidirectionalIterator, class charT, class traits>
-    bool
-    regex_search(BidirectionalIterator first, BidirectionalIterator last,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class charT, class Allocator, class traits>
-    bool
-    regex_search(const charT* str, match_results<const charT*, Allocator>& m,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class charT, class traits>
-    bool
-    regex_search(const charT* str, const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class charT, class traits>
-    bool
-    regex_search(const basic_string<charT, ST, SA>& s,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class Allocator, class charT, class traits>
-    bool
-    regex_search(const basic_string<charT, ST, SA>& s,
-                 match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class Allocator, class charT, class traits>
-    bool
-    regex_search(const basic_string<charT, ST, SA>&& s,
-                 match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default) = delete; // C++14
-
-template <class OutputIterator, class BidirectionalIterator,
-          class traits, class charT, class ST, class SA>
-    OutputIterator
-    regex_replace(OutputIterator out,
-                  BidirectionalIterator first, BidirectionalIterator last,
-                  const basic_regex<charT, traits>& e,
-                  const basic_string<charT, ST, SA>& fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class OutputIterator, class BidirectionalIterator,
-          class traits, class charT>
-    OutputIterator
-    regex_replace(OutputIterator out,
-                  BidirectionalIterator first, BidirectionalIterator last,
-                  const basic_regex<charT, traits>& e, const charT* fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class traits, class charT, class ST, class SA, class FST, class FSA>>
-    basic_string<charT, ST, SA>
-    regex_replace(const basic_string<charT, ST, SA>& s,
-                  const basic_regex<charT, traits>& e,
-                  const basic_string<charT, FST, FSA>& fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class traits, class charT, class ST, class SA>
-    basic_string<charT, ST, SA>
-    regex_replace(const basic_string<charT, ST, SA>& s,
-                  const basic_regex<charT, traits>& e, const charT* fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class traits, class charT, class ST, class SA>
-    basic_string<charT>
-    regex_replace(const charT* s,
-                  const basic_regex<charT, traits>& e,
-                  const basic_string<charT, ST, SA>& fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class traits, class charT>
-    basic_string<charT>
-    regex_replace(const charT* s,
-                  const basic_regex<charT, traits>& e,
-                  const charT* fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class BidirectionalIterator,
-          class charT = typename iterator_traits< BidirectionalIterator>::value_type,
-          class traits = regex_traits<charT>>
-class regex_iterator
-{
-public:
-    typedef basic_regex<charT, traits>           regex_type;
-    typedef match_results<BidirectionalIterator> value_type;
-    typedef ptrdiff_t                            difference_type;
-    typedef const value_type*                    pointer;
-    typedef const value_type&                    reference;
-    typedef forward_iterator_tag                 iterator_category;
-
-    regex_iterator();
-    regex_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                   const regex_type& re,
-                   regex_constants::match_flag_type m = regex_constants::match_default);
-    regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                   const regex_type&& __re,
-                   regex_constants::match_flag_type __m 
-                                     = regex_constants::match_default) = delete; // C++14
-    regex_iterator(const regex_iterator&);
-    regex_iterator& operator=(const regex_iterator&);
-
-    bool operator==(const regex_iterator&) const;
-    bool operator!=(const regex_iterator&) const;
-
-    const value_type& operator*() const;
-    const value_type* operator->() const;
-
-    regex_iterator& operator++();
-    regex_iterator operator++(int);
-};
-
-typedef regex_iterator<const char*>             cregex_iterator;
-typedef regex_iterator<const wchar_t*>          wcregex_iterator;
-typedef regex_iterator<string::const_iterator>  sregex_iterator;
-typedef regex_iterator<wstring::const_iterator> wsregex_iterator;
-
-template <class BidirectionalIterator,
-          class charT = typename iterator_traits< BidirectionalIterator>::value_type,
-          class traits = regex_traits<charT>>
-class regex_token_iterator
-{
-public:
-    typedef basic_regex<charT, traits>       regex_type;
-    typedef sub_match<BidirectionalIterator> value_type;
-    typedef ptrdiff_t                        difference_type;
-    typedef const value_type*                pointer;
-    typedef const value_type&                reference;
-    typedef forward_iterator_tag             iterator_category;
-
-    regex_token_iterator();
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type& re, int submatch = 0,
-                         regex_constants::match_flag_type m = regex_constants::match_default);
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type&& re, int submatch = 0,
-                         regex_constants::match_flag_type m = regex_constants::match_default) = delete; // C++14
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type& re, const vector<int>& submatches,
-                         regex_constants::match_flag_type m = regex_constants::match_default);
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type&& re, const vector<int>& submatches,
-                         regex_constants::match_flag_type m = regex_constants::match_default) = delete; // C++14
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type& re, initializer_list<int> submatches,
-                         regex_constants::match_flag_type m = regex_constants::match_default);
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type&& re, initializer_list<int> submatches,
-                         regex_constants::match_flag_type m = regex_constants::match_default) = delete; // C++14
-    template <size_t N>
-        regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                             const regex_type& re, const int (&submatches)[N],
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-    template <size_t N>
-        regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                             const regex_type& re, const int (&submatches)[N],
-                             regex_constants::match_flag_type m = regex_constants::match_default) = delete // C++14;
-    regex_token_iterator(const regex_token_iterator&);
-    regex_token_iterator& operator=(const regex_token_iterator&);
-
-    bool operator==(const regex_token_iterator&) const;
-    bool operator!=(const regex_token_iterator&) const;
-
-    const value_type& operator*() const;
-    const value_type* operator->() const;
-
-    regex_token_iterator& operator++();
-    regex_token_iterator operator++(int);
-};
-
-typedef regex_token_iterator<const char*>             cregex_token_iterator;
-typedef regex_token_iterator<const wchar_t*>          wcregex_token_iterator;
-typedef regex_token_iterator<string::const_iterator>  sregex_token_iterator;
-typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
-
-} // std
-*/
-
-#include <__config>
-#include <stdexcept>
-#include <__locale>
-#include <initializer_list>
-#include <utility>
-#include <iterator>
-#include <string>
-#include <memory>
-#include <vector>
-#include <deque>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-namespace regex_constants
-{
-
-// syntax_option_type
-
-enum syntax_option_type
-{
-    icase      = 1 << 0,
-    nosubs     = 1 << 1,
-    optimize   = 1 << 2,
-    collate    = 1 << 3,
-    ECMAScript = 0,
-    basic      = 1 << 4,
-    extended   = 1 << 5,
-    awk        = 1 << 6,
-    grep       = 1 << 7,
-    egrep      = 1 << 8
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-syntax_option_type
-operator~(syntax_option_type __x)
-{
-    return syntax_option_type(~int(__x) & 0x1FF);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-syntax_option_type
-operator&(syntax_option_type __x, syntax_option_type __y)
-{
-    return syntax_option_type(int(__x) & int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-syntax_option_type
-operator|(syntax_option_type __x, syntax_option_type __y)
-{
-    return syntax_option_type(int(__x) | int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-syntax_option_type
-operator^(syntax_option_type __x, syntax_option_type __y)
-{
-    return syntax_option_type(int(__x) ^ int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-syntax_option_type&
-operator&=(syntax_option_type& __x, syntax_option_type __y)
-{
-    __x = __x & __y;
-    return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-syntax_option_type&
-operator|=(syntax_option_type& __x, syntax_option_type __y)
-{
-    __x = __x | __y;
-    return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-syntax_option_type&
-operator^=(syntax_option_type& __x, syntax_option_type __y)
-{
-    __x = __x ^ __y;
-    return __x;
-}
-
-// match_flag_type
-
-enum match_flag_type
-{
-    match_default     = 0,
-    match_not_bol     = 1 << 0,
-    match_not_eol     = 1 << 1,
-    match_not_bow     = 1 << 2,
-    match_not_eow     = 1 << 3,
-    match_any         = 1 << 4,
-    match_not_null    = 1 << 5,
-    match_continuous  = 1 << 6,
-    match_prev_avail  = 1 << 7,
-    format_default    = 0,
-    format_sed        = 1 << 8,
-    format_no_copy    = 1 << 9,
-    format_first_only = 1 << 10,
-    __no_update_pos   = 1 << 11
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-match_flag_type
-operator~(match_flag_type __x)
-{
-    return match_flag_type(~int(__x) & 0x0FFF);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-match_flag_type
-operator&(match_flag_type __x, match_flag_type __y)
-{
-    return match_flag_type(int(__x) & int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-match_flag_type
-operator|(match_flag_type __x, match_flag_type __y)
-{
-    return match_flag_type(int(__x) | int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-match_flag_type
-operator^(match_flag_type __x, match_flag_type __y)
-{
-    return match_flag_type(int(__x) ^ int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-match_flag_type&
-operator&=(match_flag_type& __x, match_flag_type __y)
-{
-    __x = __x & __y;
-    return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-match_flag_type&
-operator|=(match_flag_type& __x, match_flag_type __y)
-{
-    __x = __x | __y;
-    return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-match_flag_type&
-operator^=(match_flag_type& __x, match_flag_type __y)
-{
-    __x = __x ^ __y;
-    return __x;
-}
-
-enum error_type
-{
-    error_collate = 1,
-    error_ctype,
-    error_escape,
-    error_backref,
-    error_brack,
-    error_paren,
-    error_brace,
-    error_badbrace,
-    error_range,
-    error_space,
-    error_badrepeat,
-    error_complexity,
-    error_stack,
-    __re_err_grammar,
-    __re_err_empty,
-    __re_err_unknown
-};
-
-}  // regex_constants
-
-class _LIBCPP_EXCEPTION_ABI regex_error
-    : public runtime_error
-{
-    regex_constants::error_type __code_;
-public:
-    explicit regex_error(regex_constants::error_type __ecode);
-    virtual ~regex_error() throw();
-     _LIBCPP_INLINE_VISIBILITY
-    regex_constants::error_type code() const {return __code_;}
-};
-
-template <class _CharT>
-struct _LIBCPP_TYPE_VIS_ONLY regex_traits
-{
-public:
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-    typedef locale                  locale_type;
-    typedef ctype_base::mask        char_class_type;
-
-    static const char_class_type __regex_word = 0x80;
-private:
-    locale __loc_;
-    const ctype<char_type>* __ct_;
-    const collate<char_type>* __col_;
-
-public:
-    regex_traits();
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_t length(const char_type* __p)
-        {return char_traits<char_type>::length(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    char_type translate(char_type __c) const {return __c;}
-    char_type translate_nocase(char_type __c) const;
-    template <class _ForwardIterator>
-        string_type
-        transform(_ForwardIterator __f, _ForwardIterator __l) const;
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        string_type
-        transform_primary( _ForwardIterator __f, _ForwardIterator __l) const
-            {return __transform_primary(__f, __l, char_type());}
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        string_type
-        lookup_collatename(_ForwardIterator __f, _ForwardIterator __l) const
-            {return __lookup_collatename(__f, __l, char_type());}
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        char_class_type
-        lookup_classname(_ForwardIterator __f, _ForwardIterator __l,
-                         bool __icase = false) const
-            {return __lookup_classname(__f, __l, __icase, char_type());}
-    bool isctype(char_type __c, char_class_type __m) const;
-    _LIBCPP_INLINE_VISIBILITY
-    int value(char_type __ch, int __radix) const
-        {return __regex_traits_value(__ch, __radix);}
-    locale_type imbue(locale_type __l);
-    _LIBCPP_INLINE_VISIBILITY
-    locale_type getloc()const {return __loc_;}
-
-private:
-    void __init();
-
-    template <class _ForwardIterator>
-        string_type
-        __transform_primary(_ForwardIterator __f, _ForwardIterator __l, char) const;
-    template <class _ForwardIterator>
-        string_type
-        __transform_primary(_ForwardIterator __f, _ForwardIterator __l, wchar_t) const;
-
-    template <class _ForwardIterator>
-        string_type
-        __lookup_collatename(_ForwardIterator __f, _ForwardIterator __l, char) const;
-    template <class _ForwardIterator>
-        string_type
-        __lookup_collatename(_ForwardIterator __f, _ForwardIterator __l, wchar_t) const;
-
-    template <class _ForwardIterator>
-        char_class_type
-        __lookup_classname(_ForwardIterator __f, _ForwardIterator __l,
-                           bool __icase, char) const;
-    template <class _ForwardIterator>
-        char_class_type
-        __lookup_classname(_ForwardIterator __f, _ForwardIterator __l,
-                           bool __icase, wchar_t) const;
-
-    static int __regex_traits_value(unsigned char __ch, int __radix);
-    _LIBCPP_INLINE_VISIBILITY
-    int __regex_traits_value(char __ch, int __radix) const
-        {return __regex_traits_value(static_cast<unsigned char>(__ch), __radix);}
-    int __regex_traits_value(wchar_t __ch, int __radix) const;
-};
-
-template <class _CharT>
-const typename regex_traits<_CharT>::char_class_type
-regex_traits<_CharT>::__regex_word;
-
-template <class _CharT>
-regex_traits<_CharT>::regex_traits()
-{
-    __init();
-}
-
-template <class _CharT>
-typename regex_traits<_CharT>::char_type
-regex_traits<_CharT>::translate_nocase(char_type __c) const
-{
-    return __ct_->tolower(__c);
-}
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::transform(_ForwardIterator __f, _ForwardIterator __l) const
-{
-    string_type __s(__f, __l);
-    return __col_->transform(__s.data(), __s.data() + __s.size());
-}
-
-template <class _CharT>
-void
-regex_traits<_CharT>::__init()
-{
-    __ct_ = &use_facet<ctype<char_type> >(__loc_);
-    __col_ = &use_facet<collate<char_type> >(__loc_);
-}
-
-template <class _CharT>
-typename regex_traits<_CharT>::locale_type
-regex_traits<_CharT>::imbue(locale_type __l)
-{
-    locale __r = __loc_;
-    __loc_ = __l;
-    __init();
-    return __r;
-}
-
-// transform_primary is very FreeBSD-specific
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::__transform_primary(_ForwardIterator __f,
-                                          _ForwardIterator __l, char) const
-{
-    const string_type __s(__f, __l);
-    string_type __d = __col_->transform(__s.data(), __s.data() + __s.size());
-    switch (__d.size())
-    {
-    case 1:
-        break;
-    case 12:
-        __d[11] = __d[3];
-        break;
-    default:
-        __d.clear();
-        break;
-    }
-    return __d;
-}
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::__transform_primary(_ForwardIterator __f,
-                                          _ForwardIterator __l, wchar_t) const
-{
-    const string_type __s(__f, __l);
-    string_type __d = __col_->transform(__s.data(), __s.data() + __s.size());
-    switch (__d.size())
-    {
-    case 1:
-        break;
-    case 3:
-        __d[2] = __d[0];
-        break;
-    default:
-        __d.clear();
-        break;
-    }
-    return __d;
-}
-
-// lookup_collatename is very FreeBSD-specific
-
-_LIBCPP_FUNC_VIS string __get_collation_name(const char* __s);
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::__lookup_collatename(_ForwardIterator __f,
-                                           _ForwardIterator __l, char) const
-{
-    string_type __s(__f, __l);
-    string_type __r;
-    if (!__s.empty())
-    {
-        __r = __get_collation_name(__s.c_str());
-        if (__r.empty() && __s.size() <= 2)
-        {
-            __r = __col_->transform(__s.data(), __s.data() + __s.size());
-            if (__r.size() == 1 || __r.size() == 12)
-                __r = __s;
-            else
-                __r.clear();
-        }
-    }
-    return __r;
-}
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::__lookup_collatename(_ForwardIterator __f,
-                                           _ForwardIterator __l, wchar_t) const
-{
-    string_type __s(__f, __l);
-    string __n;
-    __n.reserve(__s.size());
-    for (typename string_type::const_iterator __i = __s.begin(), __e = __s.end();
-                                                              __i != __e; ++__i)
-    {
-        if (static_cast<unsigned>(*__i) >= 127)
-            return string_type();
-        __n.push_back(char(*__i));
-    }
-    string_type __r;
-    if (!__s.empty())
-    {
-        __n = __get_collation_name(__n.c_str());
-        if (!__n.empty())
-            __r.assign(__n.begin(), __n.end());
-        else if (__s.size() <= 2)
-        {
-            __r = __col_->transform(__s.data(), __s.data() + __s.size());
-            if (__r.size() == 1 || __r.size() == 3)
-                __r = __s;
-            else
-                __r.clear();
-        }
-    }
-    return __r;
-}
-
-// lookup_classname
-
-regex_traits<char>::char_class_type _LIBCPP_FUNC_VIS
-__get_classname(const char* __s, bool __icase);
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::char_class_type
-regex_traits<_CharT>::__lookup_classname(_ForwardIterator __f,
-                                         _ForwardIterator __l,
-                                         bool __icase, char) const
-{
-    string_type __s(__f, __l);
-    __ct_->tolower(&__s[0], &__s[0] + __s.size());
-    return __get_classname(__s.c_str(), __icase);
-}
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::char_class_type
-regex_traits<_CharT>::__lookup_classname(_ForwardIterator __f,
-                                         _ForwardIterator __l,
-                                         bool __icase, wchar_t) const
-{
-    string_type __s(__f, __l);
-    __ct_->tolower(&__s[0], &__s[0] + __s.size());
-    string __n;
-    __n.reserve(__s.size());
-    for (typename string_type::const_iterator __i = __s.begin(), __e = __s.end();
-                                                              __i != __e; ++__i)
-    {
-        if (static_cast<unsigned>(*__i) >= 127)
-            return char_class_type();
-        __n.push_back(char(*__i));
-    }
-    return __get_classname(__n.c_str(), __icase);
-}
-
-template <class _CharT>
-bool
-regex_traits<_CharT>::isctype(char_type __c, char_class_type __m) const
-{
-    if (__ct_->is(__m, __c))
-        return true;
-    return (__c == '_' && (__m & __regex_word));
-}
-
-template <class _CharT>
-int
-regex_traits<_CharT>::__regex_traits_value(unsigned char __ch, int __radix)
-{
-    if ((__ch & 0xF8u) == 0x30)  // '0' <= __ch && __ch <= '7'
-        return __ch - '0';
-    if (__radix != 8)
-    {
-        if ((__ch & 0xFEu) == 0x38)  // '8' <= __ch && __ch <= '9'
-            return __ch - '0';
-        if (__radix == 16)
-        {
-            __ch |= 0x20;  // tolower
-            if ('a' <= __ch && __ch <= 'f')
-                return __ch - ('a' - 10);
-        }
-    }
-    return -1;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-int
-regex_traits<_CharT>::__regex_traits_value(wchar_t __ch, int __radix) const
-{
-    return __regex_traits_value(static_cast<unsigned char>(__ct_->narrow(__ch, char_type())), __radix);
-}
-
-template <class _CharT> class __node;
-
-template <class _BidirectionalIterator> class _LIBCPP_TYPE_VIS_ONLY sub_match;
-
-template <class _BidirectionalIterator,
-          class _Allocator = allocator<sub_match<_BidirectionalIterator> > >
-class _LIBCPP_TYPE_VIS_ONLY match_results;
-
-template <class _CharT>
-struct __state
-{
-    enum
-    {
-        __end_state = -1000,
-        __consume_input,  // -999
-        __begin_marked_expr, // -998
-        __end_marked_expr,   // -997
-        __pop_state,           // -996
-        __accept_and_consume,  // -995
-        __accept_but_not_consume,  // -994
-        __reject,                  // -993
-        __split,
-        __repeat
-    };
-
-    int __do_;
-    const _CharT* __first_;
-    const _CharT* __current_;
-    const _CharT* __last_;
-    vector<sub_match<const _CharT*> > __sub_matches_;
-    vector<pair<size_t, const _CharT*> > __loop_data_;
-    const __node<_CharT>* __node_;
-    regex_constants::match_flag_type __flags_;
-    bool __at_first_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __state()
-        : __do_(0), __first_(nullptr), __current_(nullptr), __last_(nullptr),
-          __node_(nullptr), __flags_() {}
-};
-
-// __node
-
-template <class _CharT>
-class __node
-{
-    __node(const __node&);
-    __node& operator=(const __node&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __node() {}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual ~__node() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    virtual void __exec(__state&) const {};
-    _LIBCPP_INLINE_VISIBILITY
-    virtual void __exec_split(bool, __state&) const {};
-};
-
-// __end_state
-
-template <class _CharT>
-class __end_state
-    : public __node<_CharT>
-{
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __end_state() {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__end_state<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__end_state;
-}
-
-// __has_one_state
-
-template <class _CharT>
-class __has_one_state
-    : public __node<_CharT>
-{
-    __node<_CharT>* __first_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __has_one_state(__node<_CharT>* __s)
-        : __first_(__s) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __node<_CharT>*  first() const {return __first_;}
-    _LIBCPP_INLINE_VISIBILITY
-    __node<_CharT>*& first()       {return __first_;}
-};
-
-// __owns_one_state
-
-template <class _CharT>
-class __owns_one_state
-    : public __has_one_state<_CharT>
-{
-    typedef __has_one_state<_CharT> base;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __owns_one_state(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual ~__owns_one_state();
-};
-
-template <class _CharT>
-__owns_one_state<_CharT>::~__owns_one_state()
-{
-    delete this->first();
-}
-
-// __empty_state
-
-template <class _CharT>
-class __empty_state
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __empty_state(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__empty_state<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    __s.__node_ = this->first();
-}
-
-// __empty_non_own_state
-
-template <class _CharT>
-class __empty_non_own_state
-    : public __has_one_state<_CharT>
-{
-    typedef __has_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __empty_non_own_state(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__empty_non_own_state<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    __s.__node_ = this->first();
-}
-
-// __repeat_one_loop
-
-template <class _CharT>
-class __repeat_one_loop
-    : public __has_one_state<_CharT>
-{
-    typedef __has_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __repeat_one_loop(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__repeat_one_loop<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__repeat;
-    __s.__node_ = this->first();
-}
-
-// __owns_two_states
-
-template <class _CharT>
-class __owns_two_states
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    base* __second_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __owns_two_states(__node<_CharT>* __s1, base* __s2)
-        : base(__s1), __second_(__s2) {}
-
-    virtual ~__owns_two_states();
-
-    _LIBCPP_INLINE_VISIBILITY
-    base*  second() const {return __second_;}
-    _LIBCPP_INLINE_VISIBILITY
-    base*& second()       {return __second_;}
-};
-
-template <class _CharT>
-__owns_two_states<_CharT>::~__owns_two_states()
-{
-    delete __second_;
-}
-
-// __loop
-
-template <class _CharT>
-class __loop
-    : public __owns_two_states<_CharT>
-{
-    typedef __owns_two_states<_CharT> base;
-
-    size_t __min_;
-    size_t __max_;
-    unsigned __loop_id_;
-    unsigned __mexp_begin_;
-    unsigned __mexp_end_;
-    bool __greedy_;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __loop(unsigned __loop_id,
-                          __node<_CharT>* __s1, __owns_one_state<_CharT>* __s2,
-                          unsigned __mexp_begin, unsigned __mexp_end,
-                          bool __greedy = true,
-                          size_t __min = 0,
-                          size_t __max = numeric_limits<size_t>::max())
-        : base(__s1, __s2), __min_(__min), __max_(__max), __loop_id_(__loop_id),
-          __mexp_begin_(__mexp_begin), __mexp_end_(__mexp_end),
-          __greedy_(__greedy) {}
-
-    virtual void __exec(__state& __s) const;
-    virtual void __exec_split(bool __second, __state& __s) const;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __init_repeat(__state& __s) const
-    {
-        __s.__loop_data_[__loop_id_].second = __s.__current_;
-        for (size_t __i = __mexp_begin_-1; __i != __mexp_end_-1; ++__i)
-        {
-            __s.__sub_matches_[__i].first = __s.__last_;
-            __s.__sub_matches_[__i].second = __s.__last_;
-            __s.__sub_matches_[__i].matched = false;
-        }
-    }
-};
-
-template <class _CharT>
-void
-__loop<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__do_ == __state::__repeat)
-    {
-        bool __do_repeat = ++__s.__loop_data_[__loop_id_].first < __max_;
-        bool __do_alt = __s.__loop_data_[__loop_id_].first >= __min_;
-        if (__do_repeat && __do_alt &&
-                               __s.__loop_data_[__loop_id_].second == __s.__current_)
-            __do_repeat = false;
-        if (__do_repeat && __do_alt)
-            __s.__do_ = __state::__split;
-        else if (__do_repeat)
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__node_ = this->first();
-            __init_repeat(__s);
-        }
-        else
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__node_ = this->second();
-        }
-    }
-    else
-    {
-        __s.__loop_data_[__loop_id_].first = 0;
-        bool __do_repeat = 0 < __max_;
-        bool __do_alt = 0 >= __min_;
-        if (__do_repeat && __do_alt)
-            __s.__do_ = __state::__split;
-        else if (__do_repeat)
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__node_ = this->first();
-            __init_repeat(__s);
-        }
-        else
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__node_ = this->second();
-        }
-    }
-}
-
-template <class _CharT>
-void
-__loop<_CharT>::__exec_split(bool __second, __state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    if (__greedy_ != __second)
-    {
-        __s.__node_ = this->first();
-        __init_repeat(__s);
-    }
-    else
-        __s.__node_ = this->second();
-}
-
-// __alternate
-
-template <class _CharT>
-class __alternate
-    : public __owns_two_states<_CharT>
-{
-    typedef __owns_two_states<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __alternate(__owns_one_state<_CharT>* __s1,
-                         __owns_one_state<_CharT>* __s2)
-        : base(__s1, __s2) {}
-
-    virtual void __exec(__state& __s) const;
-    virtual void __exec_split(bool __second, __state& __s) const;
-};
-
-template <class _CharT>
-void
-__alternate<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__split;
-}
-
-template <class _CharT>
-void
-__alternate<_CharT>::__exec_split(bool __second, __state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    if (__second)
-        __s.__node_ = this->second();
-    else
-        __s.__node_ = this->first();
-}
-
-// __begin_marked_subexpression
-
-template <class _CharT>
-class __begin_marked_subexpression
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __begin_marked_subexpression(unsigned __mexp, __node<_CharT>* __s)
-        : base(__s), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__begin_marked_subexpression<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    __s.__sub_matches_[__mexp_-1].first = __s.__current_;
-    __s.__node_ = this->first();
-}
-
-// __end_marked_subexpression
-
-template <class _CharT>
-class __end_marked_subexpression
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __end_marked_subexpression(unsigned __mexp, __node<_CharT>* __s)
-        : base(__s), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__end_marked_subexpression<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    __s.__sub_matches_[__mexp_-1].second = __s.__current_;
-    __s.__sub_matches_[__mexp_-1].matched = true;
-    __s.__node_ = this->first();
-}
-
-// __back_ref
-
-template <class _CharT>
-class __back_ref
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __back_ref(unsigned __mexp, __node<_CharT>* __s)
-        : base(__s), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__back_ref<_CharT>::__exec(__state& __s) const
-{
-    sub_match<const _CharT*>& __sm = __s.__sub_matches_[__mexp_-1];
-    if (__sm.matched)
-    {
-        ptrdiff_t __len = __sm.second - __sm.first;
-        if (__s.__last_ - __s.__current_ >= __len &&
-            _VSTD::equal(__sm.first, __sm.second, __s.__current_))
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__current_ += __len;
-            __s.__node_ = this->first();
-        }
-        else
-        {
-            __s.__do_ = __state::__reject;
-            __s.__node_ = nullptr;
-        }
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __back_ref_icase
-
-template <class _CharT, class _Traits>
-class __back_ref_icase
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __back_ref_icase(const _Traits& __traits, unsigned __mexp,
-                              __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__back_ref_icase<_CharT, _Traits>::__exec(__state& __s) const
-{
-    sub_match<const _CharT*>& __sm = __s.__sub_matches_[__mexp_-1];
-    if (__sm.matched)
-    {
-        ptrdiff_t __len = __sm.second - __sm.first;
-        if (__s.__last_ - __s.__current_ >= __len)
-        {
-            for (ptrdiff_t __i = 0; __i < __len; ++__i)
-            {
-                if (__traits_.translate_nocase(__sm.first[__i]) !=
-                                __traits_.translate_nocase(__s.__current_[__i]))
-                    goto __not_equal;
-            }
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__current_ += __len;
-            __s.__node_ = this->first();
-        }
-        else
-        {
-            __s.__do_ = __state::__reject;
-            __s.__node_ = nullptr;
-        }
-    }
-    else
-    {
-__not_equal:
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __back_ref_collate
-
-template <class _CharT, class _Traits>
-class __back_ref_collate
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __back_ref_collate(const _Traits& __traits, unsigned __mexp,
-                              __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__back_ref_collate<_CharT, _Traits>::__exec(__state& __s) const
-{
-    sub_match<const _CharT*>& __sm = __s.__sub_matches_[__mexp_-1];
-    if (__sm.matched)
-    {
-        ptrdiff_t __len = __sm.second - __sm.first;
-        if (__s.__last_ - __s.__current_ >= __len)
-        {
-            for (ptrdiff_t __i = 0; __i < __len; ++__i)
-            {
-                if (__traits_.translate(__sm.first[__i]) !=
-                                       __traits_.translate(__s.__current_[__i]))
-                    goto __not_equal;
-            }
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__current_ += __len;
-            __s.__node_ = this->first();
-        }
-        else
-        {
-            __s.__do_ = __state::__reject;
-            __s.__node_ = nullptr;
-        }
-    }
-    else
-    {
-__not_equal:
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __word_boundary
-
-template <class _CharT, class _Traits>
-class __word_boundary
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    bool __invert_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __word_boundary(const _Traits& __traits, bool __invert,
-                             __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __invert_(__invert) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__word_boundary<_CharT, _Traits>::__exec(__state& __s) const
-{
-    bool __is_word_b = false;
-    if (__s.__first_ != __s.__last_)
-    {
-        if (__s.__current_ == __s.__last_)
-        {
-            if (!(__s.__flags_ & regex_constants::match_not_eow))
-            {
-                _CharT __c = __s.__current_[-1];
-                __is_word_b = __c == '_' ||
-                              __traits_.isctype(__c, ctype_base::alnum);
-            }
-        }
-        else if (__s.__current_ == __s.__first_ &&
-                !(__s.__flags_ & regex_constants::match_prev_avail))
-        {
-            if (!(__s.__flags_ & regex_constants::match_not_bow))
-            {
-                _CharT __c = *__s.__current_;
-                __is_word_b = __c == '_' ||
-                              __traits_.isctype(__c, ctype_base::alnum);
-            }
-        }
-        else
-        {
-            _CharT __c1 = __s.__current_[-1];
-            _CharT __c2 = *__s.__current_;
-            bool __is_c1_b = __c1 == '_' ||
-                             __traits_.isctype(__c1, ctype_base::alnum);
-            bool __is_c2_b = __c2 == '_' ||
-                             __traits_.isctype(__c2, ctype_base::alnum);
-            __is_word_b = __is_c1_b != __is_c2_b;
-        }
-    }
-    if (__is_word_b != __invert_)
-    {
-        __s.__do_ = __state::__accept_but_not_consume;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __l_anchor
-
-template <class _CharT>
-class __l_anchor
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __l_anchor(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__l_anchor<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__at_first_ && __s.__current_ == __s.__first_)
-    {
-        __s.__do_ = __state::__accept_but_not_consume;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __r_anchor
-
-template <class _CharT>
-class __r_anchor
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __r_anchor(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__r_anchor<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__current_ == __s.__last_)
-    {
-        __s.__do_ = __state::__accept_but_not_consume;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __match_any
-
-template <class _CharT>
-class __match_any
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_any(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__match_any<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__current_ != __s.__last_ && *__s.__current_ != 0)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        ++__s.__current_;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __match_any_but_newline
-
-template <class _CharT>
-class __match_any_but_newline
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_any_but_newline(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <> _LIBCPP_FUNC_VIS void __match_any_but_newline<char>::__exec(__state&) const;
-template <> _LIBCPP_FUNC_VIS void __match_any_but_newline<wchar_t>::__exec(__state&) const;
-
-// __match_char
-
-template <class _CharT>
-class __match_char
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _CharT __c_;
-
-    __match_char(const __match_char&);
-    __match_char& operator=(const __match_char&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_char(_CharT __c, __node<_CharT>* __s)
-        : base(__s), __c_(__c) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__match_char<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__current_ != __s.__last_ && *__s.__current_ == __c_)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        ++__s.__current_;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __match_char_icase
-
-template <class _CharT, class _Traits>
-class __match_char_icase
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    _CharT __c_;
-
-    __match_char_icase(const __match_char_icase&);
-    __match_char_icase& operator=(const __match_char_icase&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_char_icase(const _Traits& __traits, _CharT __c, __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __c_(__traits.translate_nocase(__c)) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__match_char_icase<_CharT, _Traits>::__exec(__state& __s) const
-{
-    if (__s.__current_ != __s.__last_ &&
-        __traits_.translate_nocase(*__s.__current_) == __c_)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        ++__s.__current_;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __match_char_collate
-
-template <class _CharT, class _Traits>
-class __match_char_collate
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    _CharT __c_;
-
-    __match_char_collate(const __match_char_collate&);
-    __match_char_collate& operator=(const __match_char_collate&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_char_collate(const _Traits& __traits, _CharT __c, __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __c_(__traits.translate(__c)) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__match_char_collate<_CharT, _Traits>::__exec(__state& __s) const
-{
-    if (__s.__current_ != __s.__last_ &&
-        __traits_.translate(*__s.__current_) == __c_)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        ++__s.__current_;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __bracket_expression
-
-template <class _CharT, class _Traits>
-class __bracket_expression
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-    typedef typename _Traits::string_type string_type;
-
-    _Traits __traits_;
-    vector<_CharT> __chars_;
-    vector<_CharT> __neg_chars_;
-    vector<pair<string_type, string_type> > __ranges_;
-    vector<pair<_CharT, _CharT> > __digraphs_;
-    vector<string_type> __equivalences_;
-    typename regex_traits<_CharT>::char_class_type __mask_;
-    typename regex_traits<_CharT>::char_class_type __neg_mask_;
-    bool __negate_;
-    bool __icase_;
-    bool __collate_;
-    bool __might_have_digraph_;
-
-    __bracket_expression(const __bracket_expression&);
-    __bracket_expression& operator=(const __bracket_expression&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bracket_expression(const _Traits& __traits, __node<_CharT>* __s,
-                                 bool __negate, bool __icase, bool __collate)
-        : base(__s), __traits_(__traits), __mask_(), __neg_mask_(),
-          __negate_(__negate), __icase_(__icase), __collate_(__collate),
-          __might_have_digraph_(__traits_.getloc().name() != "C") {}
-
-    virtual void __exec(__state&) const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __negated() const {return __negate_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_char(_CharT __c)
-        {
-            if (__icase_)
-                __chars_.push_back(__traits_.translate_nocase(__c));
-            else if (__collate_)
-                __chars_.push_back(__traits_.translate(__c));
-            else
-                __chars_.push_back(__c);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_neg_char(_CharT __c)
-        {
-            if (__icase_)
-                __neg_chars_.push_back(__traits_.translate_nocase(__c));
-            else if (__collate_)
-                __neg_chars_.push_back(__traits_.translate(__c));
-            else
-                __neg_chars_.push_back(__c);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_range(string_type __b, string_type __e)
-        {
-            if (__collate_)
-            {
-                if (__icase_)
-                {
-                    for (size_t __i = 0; __i < __b.size(); ++__i)
-                        __b[__i] = __traits_.translate_nocase(__b[__i]);
-                    for (size_t __i = 0; __i < __e.size(); ++__i)
-                        __e[__i] = __traits_.translate_nocase(__e[__i]);
-                }
-                else
-                {
-                    for (size_t __i = 0; __i < __b.size(); ++__i)
-                        __b[__i] = __traits_.translate(__b[__i]);
-                    for (size_t __i = 0; __i < __e.size(); ++__i)
-                        __e[__i] = __traits_.translate(__e[__i]);
-                }
-                __ranges_.push_back(make_pair(
-                                  __traits_.transform(__b.begin(), __b.end()),
-                                  __traits_.transform(__e.begin(), __e.end())));
-            }
-            else
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__b.size() != 1 || __e.size() != 1)
-                    throw regex_error(regex_constants::error_collate);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                if (__icase_)
-                {
-                    __b[0] = __traits_.translate_nocase(__b[0]);
-                    __e[0] = __traits_.translate_nocase(__e[0]);
-                }
-                __ranges_.push_back(make_pair(_VSTD::move(__b), _VSTD::move(__e)));
-            }
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_digraph(_CharT __c1, _CharT __c2)
-        {
-            if (__icase_)
-                __digraphs_.push_back(make_pair(__traits_.translate_nocase(__c1),
-                                                __traits_.translate_nocase(__c2)));
-            else if (__collate_)
-                __digraphs_.push_back(make_pair(__traits_.translate(__c1),
-                                                __traits_.translate(__c2)));
-            else
-                __digraphs_.push_back(make_pair(__c1, __c2));
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_equivalence(const string_type& __s)
-        {__equivalences_.push_back(__s);}
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_class(typename regex_traits<_CharT>::char_class_type __mask)
-        {__mask_ |= __mask;}
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_neg_class(typename regex_traits<_CharT>::char_class_type __mask)
-        {__neg_mask_ |= __mask;}
-};
-
-template <class _CharT, class _Traits>
-void
-__bracket_expression<_CharT, _Traits>::__exec(__state& __s) const
-{
-    bool __found = false;
-    unsigned __consumed = 0;
-    if (__s.__current_ != __s.__last_)
-    {
-        ++__consumed;
-        if (__might_have_digraph_)
-        {
-            const _CharT* __next = _VSTD::next(__s.__current_);
-            if (__next != __s.__last_)
-            {
-                pair<_CharT, _CharT> __ch2(*__s.__current_, *__next);
-                if (__icase_)
-                {
-                    __ch2.first = __traits_.translate_nocase(__ch2.first);
-                    __ch2.second = __traits_.translate_nocase(__ch2.second);
-                }
-                else if (__collate_)
-                {
-                    __ch2.first = __traits_.translate(__ch2.first);
-                    __ch2.second = __traits_.translate(__ch2.second);
-                }
-                if (!__traits_.lookup_collatename(&__ch2.first, &__ch2.first+2).empty())
-                {
-                    // __ch2 is a digraph in this locale
-                    ++__consumed;
-                    for (size_t __i = 0; __i < __digraphs_.size(); ++__i)
-                    {
-                        if (__ch2 == __digraphs_[__i])
-                        {
-                            __found = true;
-                            goto __exit;
-                        }
-                    }
-                    if (__collate_ && !__ranges_.empty())
-                    {
-                        string_type __s2 = __traits_.transform(&__ch2.first,
-                                                               &__ch2.first + 2);
-                        for (size_t __i = 0; __i < __ranges_.size(); ++__i)
-                        {
-                            if (__ranges_[__i].first <= __s2 &&
-                                __s2 <= __ranges_[__i].second)
-                            {
-                                __found = true;
-                                goto __exit;
-                            }
-                        }
-                    }
-                    if (!__equivalences_.empty())
-                    {
-                        string_type __s2 = __traits_.transform_primary(&__ch2.first,
-                                                                       &__ch2.first + 2);
-                        for (size_t __i = 0; __i < __equivalences_.size(); ++__i)
-                        {
-                            if (__s2 == __equivalences_[__i])
-                            {
-                                __found = true;
-                                goto __exit;
-                            }
-                        }
-                    }
-                    if (__traits_.isctype(__ch2.first, __mask_) &&
-                        __traits_.isctype(__ch2.second, __mask_))
-                    {
-                        __found = true;
-                        goto __exit;
-                    }
-                    if (!__traits_.isctype(__ch2.first, __neg_mask_) &&
-                        !__traits_.isctype(__ch2.second, __neg_mask_))
-                    {
-                        __found = true;
-                        goto __exit;
-                    }
-                    goto __exit;
-                }
-            }
-        }
-        // test *__s.__current_ as not a digraph
-        _CharT __ch = *__s.__current_;
-        if (__icase_)
-            __ch = __traits_.translate_nocase(__ch);
-        else if (__collate_)
-            __ch = __traits_.translate(__ch);
-        for (size_t __i = 0; __i < __chars_.size(); ++__i)
-        {
-            if (__ch == __chars_[__i])
-            {
-                __found = true;
-                goto __exit;
-            }
-        }
-        if (!__neg_chars_.empty())
-        {
-            for (size_t __i = 0; __i < __neg_chars_.size(); ++__i)
-            {
-                if (__ch == __neg_chars_[__i])
-                    goto __is_neg_char;
-            }
-            __found = true;
-            goto __exit;
-        }
-__is_neg_char:
-        if (!__ranges_.empty())
-        {
-            string_type __s2 = __collate_ ?
-                                   __traits_.transform(&__ch, &__ch + 1) :
-                                   string_type(1, __ch);
-            for (size_t __i = 0; __i < __ranges_.size(); ++__i)
-            {
-                if (__ranges_[__i].first <= __s2 && __s2 <= __ranges_[__i].second)
-                {
-                    __found = true;
-                    goto __exit;
-                }
-            }
-        }
-        if (!__equivalences_.empty())
-        {
-            string_type __s2 = __traits_.transform_primary(&__ch, &__ch + 1);
-            for (size_t __i = 0; __i < __equivalences_.size(); ++__i)
-            {
-                if (__s2 == __equivalences_[__i])
-                {
-                    __found = true;
-                    goto __exit;
-                }
-            }
-        }
-        if (__traits_.isctype(__ch, __mask_))
-        {
-            __found = true;
-            goto __exit;
-        }
-        if (__neg_mask_ && !__traits_.isctype(__ch, __neg_mask_))
-        {
-            __found = true;
-            goto __exit;
-        }
-    }
-    else
-        __found = __negate_;  // force reject
-__exit:
-    if (__found != __negate_)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        __s.__current_ += __consumed;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-template <class _CharT, class _Traits> class __lookahead;
-
-template <class _CharT, class _Traits = regex_traits<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY basic_regex
-{
-public:
-    // types:
-    typedef _CharT                              value_type;
-    typedef regex_constants::syntax_option_type flag_type;
-    typedef typename _Traits::locale_type       locale_type;
-
-private:
-    _Traits   __traits_;
-    flag_type __flags_;
-    unsigned __marked_count_;
-    unsigned __loop_count_;
-    int __open_count_;
-    shared_ptr<__empty_state<_CharT> > __start_;
-    __owns_one_state<_CharT>* __end_;
-
-    typedef _VSTD::__state<_CharT> __state;
-    typedef _VSTD::__node<_CharT> __node;
-
-public:
-    // constants:
-    static const regex_constants::syntax_option_type icase = regex_constants::icase;
-    static const regex_constants::syntax_option_type nosubs = regex_constants::nosubs;
-    static const regex_constants::syntax_option_type optimize = regex_constants::optimize;
-    static const regex_constants::syntax_option_type collate = regex_constants::collate;
-    static const regex_constants::syntax_option_type ECMAScript = regex_constants::ECMAScript;
-    static const regex_constants::syntax_option_type basic = regex_constants::basic;
-    static const regex_constants::syntax_option_type extended = regex_constants::extended;
-    static const regex_constants::syntax_option_type awk = regex_constants::awk;
-    static const regex_constants::syntax_option_type grep = regex_constants::grep;
-    static const regex_constants::syntax_option_type egrep = regex_constants::egrep;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex()
-        : __flags_(), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit basic_regex(const value_type* __p, flag_type __f = regex_constants::ECMAScript)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__p, __p + __traits_.length(__p));}
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex(const value_type* __p, size_t __len, flag_type __f)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__p, __p + __len);}
-//     basic_regex(const basic_regex&) = default;
-//     basic_regex(basic_regex&&) = default;
-    template <class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit basic_regex(const basic_string<value_type, _ST, _SA>& __p,
-                             flag_type __f = regex_constants::ECMAScript)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__p.begin(), __p.end());}
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_regex(_ForwardIterator __first, _ForwardIterator __last,
-                    flag_type __f = regex_constants::ECMAScript)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__first, __last);}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex(initializer_list<value_type> __il,
-                flag_type __f = regex_constants::ECMAScript)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-//    ~basic_regex() = default;
-
-//     basic_regex& operator=(const basic_regex&) = default;
-//     basic_regex& operator=(basic_regex&&) = default;
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& operator=(const value_type* __p)
-        {return assign(__p);}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& operator=(initializer_list<value_type> __il)
-        {return assign(__il);}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template <class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_regex& operator=(const basic_string<value_type, _ST, _SA>& __p)
-        {return assign(__p);}
-
-    // assign:
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(const basic_regex& __that)
-        {return *this = __that;}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(basic_regex&& __that) _NOEXCEPT
-        {return *this = _VSTD::move(__that);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(const value_type* __p, flag_type __f = regex_constants::ECMAScript)
-        {return assign(__p, __p + __traits_.length(__p), __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(const value_type* __p, size_t __len, flag_type __f)
-        {return assign(__p, __p + __len, __f);}
-    template <class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_regex& assign(const basic_string<value_type, _ST, _SA>& __s,
-                            flag_type __f = regex_constants::ECMAScript)
-            {return assign(__s.begin(), __s.end(), __f);}
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            basic_regex&
-        >::type
-        assign(_InputIterator __first, _InputIterator __last,
-                            flag_type __f = regex_constants::ECMAScript)
-        {
-            basic_string<_CharT> __t(__first, __last);
-            return assign(__t.begin(), __t.end(), __f);
-        }
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __member_init(flag_type __f)
-    {
-        __flags_ = __f;
-        __marked_count_ = 0;
-        __loop_count_ = 0;
-        __open_count_ = 0;
-        __end_ = nullptr;
-    }
-public:
-
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            basic_regex&
-        >::type
-        assign(_ForwardIterator __first, _ForwardIterator __last,
-                            flag_type __f = regex_constants::ECMAScript)
-        {
-            __member_init(__f);
-            __parse(__first, __last);
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(initializer_list<value_type> __il,
-                        flag_type __f = regex_constants::ECMAScript)
-        {return assign(__il.begin(), __il.end(), __f);}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    // const operations:
-    _LIBCPP_INLINE_VISIBILITY
-    unsigned mark_count() const {return __marked_count_;}
-    _LIBCPP_INLINE_VISIBILITY
-    flag_type flags() const {return __flags_;}
-
-    // locale:
-    _LIBCPP_INLINE_VISIBILITY
-    locale_type imbue(locale_type __loc)
-    {
-        __member_init(ECMAScript);
-        __start_.reset();
-        return __traits_.imbue(__loc);
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    locale_type getloc() const {return __traits_.getloc();}
-
-    // swap:
-    void swap(basic_regex& __r);
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    unsigned __loop_count() const {return __loop_count_;}
-
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_basic_reg_exp(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_RE_expression(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_simple_RE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_nondupl_RE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_one_char_or_coll_elem_RE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_Back_open_paren(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_Back_close_paren(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_Back_open_brace(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_Back_close_brace(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_BACKREF(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ORD_CHAR(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_QUOTED_CHAR(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_RE_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last,
-                               __owns_one_state<_CharT>* __s,
-                               unsigned __mexp_begin, unsigned __mexp_end);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ERE_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last,
-                                __owns_one_state<_CharT>* __s,
-                                unsigned __mexp_begin, unsigned __mexp_end);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_bracket_expression(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_follow_list(_ForwardIterator __first, _ForwardIterator __last,
-                            __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_expression_term(_ForwardIterator __first, _ForwardIterator __last,
-                                __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_equivalence_class(_ForwardIterator __first, _ForwardIterator __last,
-                                  __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_character_class(_ForwardIterator __first, _ForwardIterator __last,
-                                __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_collating_symbol(_ForwardIterator __first, _ForwardIterator __last,
-                                 basic_string<_CharT>& __col_sym);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_DUP_COUNT(_ForwardIterator __first, _ForwardIterator __last, int& __c);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_extended_reg_exp(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ERE_branch(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ERE_expression(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_one_char_or_coll_elem_ERE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ORD_CHAR_ERE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_QUOTED_CHAR_ERE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ecma_exp(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_alternative(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_term(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_assertion(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_atom(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_atom_escape(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_decimal_escape(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_character_class_escape(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_character_escape(_ForwardIterator __first, _ForwardIterator __last,
-                                 basic_string<_CharT>* __str = nullptr);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_pattern_character(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_grep(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_egrep(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_class_escape(_ForwardIterator __first, _ForwardIterator __last,
-                          basic_string<_CharT>& __str,
-                          __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_awk_escape(_ForwardIterator __first, _ForwardIterator __last,
-                          basic_string<_CharT>* __str = nullptr);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __push_l_anchor();
-    void __push_r_anchor();
-    void __push_match_any();
-    void __push_match_any_but_newline();
-    _LIBCPP_INLINE_VISIBILITY
-    void __push_greedy_inf_repeat(size_t __min, __owns_one_state<_CharT>* __s,
-                                  unsigned __mexp_begin = 0, unsigned __mexp_end = 0)
-        {__push_loop(__min, numeric_limits<size_t>::max(), __s,
-                     __mexp_begin, __mexp_end);}
-    _LIBCPP_INLINE_VISIBILITY
-    void __push_nongreedy_inf_repeat(size_t __min, __owns_one_state<_CharT>* __s,
-                                  unsigned __mexp_begin = 0, unsigned __mexp_end = 0)
-        {__push_loop(__min, numeric_limits<size_t>::max(), __s,
-                     __mexp_begin, __mexp_end, false);}
-    void __push_loop(size_t __min, size_t __max, __owns_one_state<_CharT>* __s,
-                     size_t __mexp_begin = 0, size_t __mexp_end = 0,
-                     bool __greedy = true);
-    __bracket_expression<_CharT, _Traits>* __start_matching_list(bool __negate);
-    void __push_char(value_type __c);
-    void __push_back_ref(int __i);
-    void __push_alternation(__owns_one_state<_CharT>* __sa,
-                            __owns_one_state<_CharT>* __sb);
-    void __push_begin_marked_subexpression();
-    void __push_end_marked_subexpression(unsigned);
-    void __push_empty();
-    void __push_word_boundary(bool);
-    void __push_lookahead(const basic_regex&, bool, unsigned);
-
-    template <class _Allocator>
-        bool
-        __search(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags) const;
-
-    template <class _Allocator>
-        bool
-        __match_at_start(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags, bool) const;
-    template <class _Allocator>
-        bool
-        __match_at_start_ecma(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags, bool) const;
-    template <class _Allocator>
-        bool
-        __match_at_start_posix_nosubs(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags, bool) const;
-    template <class _Allocator>
-        bool
-        __match_at_start_posix_subs(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags, bool) const;
-
-    template <class _Bp, class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(_Bp, _Bp, match_results<_Bp, _Ap>&, const basic_regex<_Cp, _Tp>&,
-                 regex_constants::match_flag_type);
-
-    template <class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(const _Cp*, const _Cp*, match_results<const _Cp*, _Ap>&,
-                 const basic_regex<_Cp, _Tp>&, regex_constants::match_flag_type);
-
-    template <class _Bp, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(_Bp, _Bp, const basic_regex<_Cp, _Tp>&,
-                 regex_constants::match_flag_type);
-
-    template <class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(const _Cp*, const _Cp*,
-                 const basic_regex<_Cp, _Tp>&, regex_constants::match_flag_type);
-
-    template <class _Cp, class _Ap, class _Tp>
-    friend
-    bool
-    regex_search(const _Cp*, match_results<const _Cp*, _Ap>&, const basic_regex<_Cp, _Tp>&,
-                 regex_constants::match_flag_type);
-
-    template <class _ST, class _SA, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(const basic_string<_Cp, _ST, _SA>& __s,
-                 const basic_regex<_Cp, _Tp>& __e,
-                 regex_constants::match_flag_type __flags);
-
-    template <class _ST, class _SA, class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(const basic_string<_Cp, _ST, _SA>& __s,
-                 match_results<typename basic_string<_Cp, _ST, _SA>::const_iterator, _Ap>&,
-                 const basic_regex<_Cp, _Tp>& __e,
-                 regex_constants::match_flag_type __flags);
-
-    template <class _Iter, class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(__wrap_iter<_Iter> __first,
-                 __wrap_iter<_Iter> __last,
-                 match_results<__wrap_iter<_Iter>, _Ap>& __m,
-                 const basic_regex<_Cp, _Tp>& __e,
-                 regex_constants::match_flag_type __flags);
-
-    template <class, class> friend class __lookahead;
-};
-
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::icase;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::nosubs;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::optimize;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::collate;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::ECMAScript;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::basic;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::extended;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::awk;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::grep;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::egrep;
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::swap(basic_regex& __r)
-{
-    using _VSTD::swap;
-    swap(__traits_, __r.__traits_);
-    swap(__flags_, __r.__flags_);
-    swap(__marked_count_, __r.__marked_count_);
-    swap(__loop_count_, __r.__loop_count_);
-    swap(__open_count_, __r.__open_count_);
-    swap(__start_, __r.__start_);
-    swap(__end_, __r.__end_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_regex<_CharT, _Traits>& __x, basic_regex<_CharT, _Traits>& __y)
-{
-    return __x.swap(__y);
-}
-
-// __lookahead
-
-template <class _CharT, class _Traits>
-class __lookahead
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    basic_regex<_CharT, _Traits> __exp_;
-    unsigned __mexp_;
-    bool __invert_;
-
-    __lookahead(const __lookahead&);
-    __lookahead& operator=(const __lookahead&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __lookahead(const basic_regex<_CharT, _Traits>& __exp, bool __invert, __node<_CharT>* __s, unsigned __mexp)
-        : base(__s), __exp_(__exp), __invert_(__invert), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__lookahead<_CharT, _Traits>::__exec(__state& __s) const
-{
-    match_results<const _CharT*> __m;
-    __m.__init(1 + __exp_.mark_count(), __s.__current_, __s.__last_);
-    bool __matched = __exp_.__match_at_start_ecma(__s.__current_, __s.__last_,
-                                                  __m,
-                                                  __s.__flags_ | regex_constants::match_continuous,
-                                                  __s.__at_first_ && __s.__current_ == __s.__first_);
-    if (__matched != __invert_)
-    {
-        __s.__do_ = __state::__accept_but_not_consume;
-        __s.__node_ = this->first();
-        for (unsigned __i = 1; __i < __m.size(); ++__i) {
-            __s.__sub_matches_[__mexp_ + __i - 1] = __m.__matches_[__i];
-        }
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse(_ForwardIterator __first,
-                                      _ForwardIterator __last)
-{
-    {
-        unique_ptr<__node> __h(new __end_state<_CharT>);
-        __start_.reset(new __empty_state<_CharT>(__h.get()));
-        __h.release();
-        __end_ = __start_.get();
-    }
-    switch (__flags_ & 0x1F0)
-    {
-    case ECMAScript:
-        __first = __parse_ecma_exp(__first, __last);
-        break;
-    case basic:
-        __first = __parse_basic_reg_exp(__first, __last);
-        break;
-    case extended:
-    case awk:
-        __first = __parse_extended_reg_exp(__first, __last);
-        break;
-    case grep:
-        __first = __parse_grep(__first, __last);
-        break;
-    case egrep:
-        __first = __parse_egrep(__first, __last);
-        break;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    default:
-        throw regex_error(regex_constants::__re_err_grammar);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_basic_reg_exp(_ForwardIterator __first,
-                                                    _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        if (*__first == '^')
-        {
-            __push_l_anchor();
-            ++__first;
-        }
-        if (__first != __last)
-        {
-            __first = __parse_RE_expression(__first, __last);
-            if (__first != __last)
-            {
-                _ForwardIterator __temp = _VSTD::next(__first);
-                if (__temp == __last && *__first == '$')
-                {
-                    __push_r_anchor();
-                    ++__first;
-                }
-            }
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first != __last)
-            throw regex_error(regex_constants::__re_err_empty);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_extended_reg_exp(_ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __sa = __end_;
-    _ForwardIterator __temp = __parse_ERE_branch(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __first)
-        throw regex_error(regex_constants::__re_err_empty);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    __first = __temp;
-    while (__first != __last && *__first == '|')
-    {
-        __owns_one_state<_CharT>* __sb = __end_;
-        __temp = __parse_ERE_branch(++__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__temp == __first)
-            throw regex_error(regex_constants::__re_err_empty);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __push_alternation(__sa, __sb);
-        __first = __temp;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ERE_branch(_ForwardIterator __first,
-                                                 _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __parse_ERE_expression(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __first)
-        throw regex_error(regex_constants::__re_err_empty);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    do
-    {
-        __first = __temp;
-        __temp = __parse_ERE_expression(__first, __last);
-    } while (__temp != __first);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ERE_expression(_ForwardIterator __first,
-                                                     _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __e = __end_;
-    unsigned __mexp_begin = __marked_count_;
-    _ForwardIterator __temp = __parse_one_char_or_coll_elem_ERE(__first, __last);
-    if (__temp == __first && __temp != __last)
-    {
-        switch (*__temp)
-        {
-        case '^':
-            __push_l_anchor();
-            ++__temp;
-            break;
-        case '$':
-            __push_r_anchor();
-            ++__temp;
-            break;
-        case '(':
-            __push_begin_marked_subexpression();
-            unsigned __temp_count = __marked_count_;
-            ++__open_count_;
-            __temp = __parse_extended_reg_exp(++__temp, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__temp == __last || *__temp != ')')
-                throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __push_end_marked_subexpression(__temp_count);
-            --__open_count_;
-            ++__temp;
-            break;
-        }
-    }
-    if (__temp != __first)
-        __temp = __parse_ERE_dupl_symbol(__temp, __last, __e, __mexp_begin+1,
-                                         __marked_count_+1);
-    __first = __temp;
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_RE_expression(_ForwardIterator __first,
-                                                    _ForwardIterator __last)
-{
-    while (true)
-    {
-        _ForwardIterator __temp = __parse_simple_RE(__first, __last);
-        if (__temp == __first)
-            break;
-        __first = __temp;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_simple_RE(_ForwardIterator __first,
-                                                _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        __owns_one_state<_CharT>* __e = __end_;
-        unsigned __mexp_begin = __marked_count_;
-        _ForwardIterator __temp = __parse_nondupl_RE(__first, __last);
-        if (__temp != __first)
-            __first = __parse_RE_dupl_symbol(__temp, __last, __e,
-                                             __mexp_begin+1, __marked_count_+1);
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_nondupl_RE(_ForwardIterator __first,
-                                                 _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __first;
-    __first = __parse_one_char_or_coll_elem_RE(__first, __last);
-    if (__temp == __first)
-    {
-        __temp = __parse_Back_open_paren(__first, __last);
-        if (__temp != __first)
-        {
-            __push_begin_marked_subexpression();
-            unsigned __temp_count = __marked_count_;
-            __first = __parse_RE_expression(__temp, __last);
-            __temp = __parse_Back_close_paren(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__temp == __first)
-                throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __push_end_marked_subexpression(__temp_count);
-            __first = __temp;
-        }
-        else
-            __first = __parse_BACKREF(__first, __last);
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_one_char_or_coll_elem_RE(
-                                                       _ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __parse_ORD_CHAR(__first, __last);
-    if (__temp == __first)
-    {
-        __temp = __parse_QUOTED_CHAR(__first, __last);
-        if (__temp == __first)
-        {
-            if (__temp != __last && *__temp == '.')
-            {
-                __push_match_any();
-                ++__temp;
-            }
-            else
-                __temp = __parse_bracket_expression(__first, __last);
-        }
-    }
-    __first = __temp;
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_one_char_or_coll_elem_ERE(
-                                                       _ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __parse_ORD_CHAR_ERE(__first, __last);
-    if (__temp == __first)
-    {
-        __temp = __parse_QUOTED_CHAR_ERE(__first, __last);
-        if (__temp == __first)
-        {
-            if (__temp != __last && *__temp == '.')
-            {
-                __push_match_any();
-                ++__temp;
-            }
-            else
-                __temp = __parse_bracket_expression(__first, __last);
-        }
-    }
-    __first = __temp;
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_Back_open_paren(_ForwardIterator __first,
-                                                      _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\' && *__temp == '(')
-                __first = ++__temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_Back_close_paren(_ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\' && *__temp == ')')
-                __first = ++__temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_Back_open_brace(_ForwardIterator __first,
-                                                      _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\' && *__temp == '{')
-                __first = ++__temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_Back_close_brace(_ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\' && *__temp == '}')
-                __first = ++__temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_BACKREF(_ForwardIterator __first,
-                                              _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\')
-            { 
-                int __val = __traits_.value(*__temp, 10);
-                if (__val >= 1 && __val <= 9)
-                {
-                    __push_back_ref(__val);
-                    __first = ++__temp;
-                }
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ORD_CHAR(_ForwardIterator __first,
-                                               _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp == __last && *__first == '$')
-            return __first;
-        // Not called inside a bracket
-        if (*__first == '.' || *__first == '\\' || *__first == '[')
-            return __first;
-        __push_char(*__first);
-        ++__first;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ORD_CHAR_ERE(_ForwardIterator __first,
-                                                   _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        switch (*__first)
-        {
-        case '^':
-        case '.':
-        case '[':
-        case '$':
-        case '(':
-        case '|':
-        case '*':
-        case '+':
-        case '?':
-        case '{':
-        case '\\':
-            break;
-        case ')':
-            if (__open_count_ == 0)
-            {
-                __push_char(*__first);
-                ++__first;
-            }
-            break;
-        default:
-            __push_char(*__first);
-            ++__first;
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR(_ForwardIterator __first,
-                                                  _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\')
-            {
-                switch (*__temp)
-                {
-                case '^':
-                case '.':
-                case '*':
-                case '[':
-                case '$':
-                case '\\':
-                    __push_char(*__temp);
-                    __first = ++__temp;
-                    break;
-                }
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR_ERE(_ForwardIterator __first,
-                                                      _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\')
-            {
-                switch (*__temp)
-                {
-                case '^':
-                case '.':
-                case '*':
-                case '[':
-                case '$':
-                case '\\':
-                case '(':
-                case ')':
-                case '|':
-                case '+':
-                case '?':
-                case '{':
-                case '}':
-                    __push_char(*__temp);
-                    __first = ++__temp;
-                    break;
-                default:
-                    if ((__flags_ & 0x1F0) == awk)
-                        __first = __parse_awk_escape(++__first, __last);
-                    break;
-                }
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_RE_dupl_symbol(_ForwardIterator __first,
-                                                     _ForwardIterator __last,
-                                                     __owns_one_state<_CharT>* __s,
-                                                     unsigned __mexp_begin,
-                                                     unsigned __mexp_end)
-{
-    if (__first != __last)
-    {
-        if (*__first == '*')
-        {
-            __push_greedy_inf_repeat(0, __s, __mexp_begin, __mexp_end);
-            ++__first;
-        }
-        else
-        {
-            _ForwardIterator __temp = __parse_Back_open_brace(__first, __last);
-            if (__temp != __first)
-            {
-                int __min = 0;
-                __first = __temp;
-                __temp = __parse_DUP_COUNT(__first, __last, __min);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__temp == __first)
-                    throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                __first = __temp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__first == __last)
-                    throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                if (*__first != ',')
-                {
-                    __temp = __parse_Back_close_brace(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__temp == __first)
-                        throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    __push_loop(__min, __min, __s, __mexp_begin, __mexp_end,
-                                    true);
-                    __first = __temp;
-                }
-                else
-                {
-                    ++__first;  // consume ','
-                    int __max = -1;
-                    __first = __parse_DUP_COUNT(__first, __last, __max);
-                    __temp = __parse_Back_close_brace(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__temp == __first)
-                        throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    if (__max == -1)
-                        __push_greedy_inf_repeat(__min, __s, __mexp_begin, __mexp_end);
-                    else
-                    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                        if (__max < __min)
-                            throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                        __push_loop(__min, __max, __s, __mexp_begin, __mexp_end,
-                                    true);
-                    }
-                    __first = __temp;
-                }
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ERE_dupl_symbol(_ForwardIterator __first,
-                                                      _ForwardIterator __last,
-                                                      __owns_one_state<_CharT>* __s,
-                                                      unsigned __mexp_begin,
-                                                      unsigned __mexp_end)
-{
-    if (__first != __last)
-    {
-        unsigned __grammar = __flags_ & 0x1F0;
-        switch (*__first)
-        {
-        case '*':
-            ++__first;
-            if (__grammar == ECMAScript && __first != __last && *__first == '?')
-            {
-                ++__first;
-                __push_nongreedy_inf_repeat(0, __s, __mexp_begin, __mexp_end);
-            }
-            else
-                __push_greedy_inf_repeat(0, __s, __mexp_begin, __mexp_end);
-            break;
-        case '+':
-            ++__first;
-            if (__grammar == ECMAScript && __first != __last && *__first == '?')
-            {
-                ++__first;
-                __push_nongreedy_inf_repeat(1, __s, __mexp_begin, __mexp_end);
-            }
-            else
-                __push_greedy_inf_repeat(1, __s, __mexp_begin, __mexp_end);
-            break;
-        case '?':
-            ++__first;
-            if (__grammar == ECMAScript && __first != __last && *__first == '?')
-            {
-                ++__first;
-                __push_loop(0, 1, __s, __mexp_begin, __mexp_end, false);
-            }
-            else
-                __push_loop(0, 1, __s, __mexp_begin, __mexp_end);
-            break;
-        case '{':
-            {
-                int __min;
-                _ForwardIterator __temp = __parse_DUP_COUNT(++__first, __last, __min);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__temp == __first)
-                    throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                __first = __temp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__first == __last)
-                    throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                switch (*__first)
-                {
-                case '}':
-                    ++__first;
-                    if (__grammar == ECMAScript && __first != __last && *__first == '?')
-                    {
-                        ++__first;
-                        __push_loop(__min, __min, __s, __mexp_begin, __mexp_end, false);
-                    }
-                    else
-                        __push_loop(__min, __min, __s, __mexp_begin, __mexp_end);
-                    break;
-                case ',':
-                    ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__first == __last)
-                        throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    if (*__first == '}')
-                    {
-                        ++__first;
-                        if (__grammar == ECMAScript && __first != __last && *__first == '?')
-                        {
-                            ++__first;
-                            __push_nongreedy_inf_repeat(__min, __s, __mexp_begin, __mexp_end);
-                        }
-                        else
-                            __push_greedy_inf_repeat(__min, __s, __mexp_begin, __mexp_end);
-                    }
-                    else
-                    {
-                        int __max = -1;
-                        __temp = __parse_DUP_COUNT(__first, __last, __max);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                        if (__temp == __first)
-                            throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                        __first = __temp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                        if (__first == __last || *__first != '}')
-                            throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                        ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                        if (__max < __min)
-                            throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                        if (__grammar == ECMAScript && __first != __last && *__first == '?')
-                        {
-                            ++__first;
-                            __push_loop(__min, __max, __s, __mexp_begin, __mexp_end, false);
-                        }
-                        else
-                            __push_loop(__min, __max, __s, __mexp_begin, __mexp_end);
-                    }
-                    break;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                default:
-                    throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                }
-            }
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_bracket_expression(_ForwardIterator __first,
-                                                         _ForwardIterator __last)
-{
-    if (__first != __last && *__first == '[')
-    {
-        ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first == __last)
-            throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        bool __negate = false;
-        if (*__first == '^')
-        {
-            ++__first;
-            __negate = true;
-        }
-        __bracket_expression<_CharT, _Traits>* __ml = __start_matching_list(__negate);
-        // __ml owned by *this
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first == __last)
-            throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if ((__flags_ & 0x1F0) != ECMAScript && *__first == ']')
-        {
-            __ml->__add_char(']');
-            ++__first;
-        }
-        __first = __parse_follow_list(__first, __last, __ml);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first == __last)
-            throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if (*__first == '-')
-        {
-            __ml->__add_char('-');
-            ++__first;
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first == __last || *__first != ']')
-            throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        ++__first;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_follow_list(_ForwardIterator __first,
-                                    _ForwardIterator __last,
-                                    __bracket_expression<_CharT, _Traits>* __ml)
-{
-    if (__first != __last)
-    {
-        while (true)
-        {
-            _ForwardIterator __temp = __parse_expression_term(__first, __last,
-                                                              __ml);
-            if (__temp == __first)
-                break;
-            __first = __temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_expression_term(_ForwardIterator __first,
-                                    _ForwardIterator __last,
-                                    __bracket_expression<_CharT, _Traits>* __ml)
-{
-    if (__first != __last && *__first != ']')
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        basic_string<_CharT> __start_range;
-        if (__temp != __last && *__first == '[')
-        {
-            if (*__temp == '=')
-                return __parse_equivalence_class(++__temp, __last, __ml);
-            else if (*__temp == ':')
-                return __parse_character_class(++__temp, __last, __ml);
-            else if (*__temp == '.')
-                __first = __parse_collating_symbol(++__temp, __last, __start_range);
-        }
-        unsigned __grammar = __flags_ & 0x1F0;
-        if (__start_range.empty())
-        {
-            if ((__grammar == ECMAScript || __grammar == awk) && *__first == '\\')
-            {
-                if (__grammar == ECMAScript)
-                    __first = __parse_class_escape(++__first, __last, __start_range, __ml);
-                else
-                    __first = __parse_awk_escape(++__first, __last, &__start_range);
-            }
-            else
-            {
-                __start_range = *__first;
-                ++__first;
-            }
-        }
-        if (__first != __last && *__first != ']')
-        {
-            __temp = _VSTD::next(__first);
-            if (__temp != __last && *__first == '-' && *__temp != ']')
-            {
-                // parse a range
-                basic_string<_CharT> __end_range;
-                __first = __temp;
-                ++__temp;
-                if (__temp != __last && *__first == '[' && *__temp == '.')
-                    __first = __parse_collating_symbol(++__temp, __last, __end_range);
-                else
-                {
-                    if ((__grammar == ECMAScript || __grammar == awk) && *__first == '\\')
-                    {
-                        if (__grammar == ECMAScript)
-                            __first = __parse_class_escape(++__first, __last,
-                                                           __end_range, __ml);
-                        else
-                            __first = __parse_awk_escape(++__first, __last,
-                                                         &__end_range);
-                    }
-                    else
-                    {
-                        __end_range = *__first;
-                        ++__first;
-                    }
-                }
-                __ml->__add_range(_VSTD::move(__start_range), _VSTD::move(__end_range));
-            }
-            else if (!__start_range.empty())
-            {
-                if (__start_range.size() == 1)
-                    __ml->__add_char(__start_range[0]);
-                else
-                    __ml->__add_digraph(__start_range[0], __start_range[1]);
-            }
-        }
-        else if (!__start_range.empty())
-        {
-            if (__start_range.size() == 1)
-                __ml->__add_char(__start_range[0]);
-            else
-                __ml->__add_digraph(__start_range[0], __start_range[1]);
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_class_escape(_ForwardIterator __first,
-                          _ForwardIterator __last,
-                          basic_string<_CharT>& __str,
-                          __bracket_expression<_CharT, _Traits>* __ml)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__first == __last)
-        throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    switch (*__first)
-    {
-    case 0:
-        __str = *__first;
-        return ++__first;
-    case 'b':
-        __str = _CharT(8);
-        return ++__first;
-    case 'd':
-        __ml->__add_class(ctype_base::digit);
-        return ++__first;
-    case 'D':
-        __ml->__add_neg_class(ctype_base::digit);
-        return ++__first;
-    case 's':
-        __ml->__add_class(ctype_base::space);
-        return ++__first;
-    case 'S':
-        __ml->__add_neg_class(ctype_base::space);
-        return ++__first;
-    case 'w':
-        __ml->__add_class(ctype_base::alnum);
-        __ml->__add_char('_');
-        return ++__first;
-    case 'W':
-        __ml->__add_neg_class(ctype_base::alnum);
-        __ml->__add_neg_char('_');
-        return ++__first;
-    }
-    __first = __parse_character_escape(__first, __last, &__str);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_awk_escape(_ForwardIterator __first,
-                          _ForwardIterator __last,
-                          basic_string<_CharT>* __str)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__first == __last)
-        throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    switch (*__first)
-    {
-    case '\\':
-    case '"':
-    case '/':
-        if (__str)
-            *__str = *__first;
-        else
-            __push_char(*__first);
-        return ++__first;
-    case 'a':
-        if (__str)
-            *__str = _CharT(7);
-        else
-            __push_char(_CharT(7));
-        return ++__first;
-    case 'b':
-        if (__str)
-            *__str = _CharT(8);
-        else
-            __push_char(_CharT(8));
-        return ++__first;
-    case 'f':
-        if (__str)
-            *__str = _CharT(0xC);
-        else
-            __push_char(_CharT(0xC));
-        return ++__first;
-    case 'n':
-        if (__str)
-            *__str = _CharT(0xA);
-        else
-            __push_char(_CharT(0xA));
-        return ++__first;
-    case 'r':
-        if (__str)
-            *__str = _CharT(0xD);
-        else
-            __push_char(_CharT(0xD));
-        return ++__first;
-    case 't':
-        if (__str)
-            *__str = _CharT(0x9);
-        else
-            __push_char(_CharT(0x9));
-        return ++__first;
-    case 'v':
-        if (__str)
-            *__str = _CharT(0xB);
-        else
-            __push_char(_CharT(0xB));
-        return ++__first;
-    }
-    if ('0' <= *__first && *__first <= '7')
-    {
-        unsigned __val = *__first - '0';
-        if (++__first != __last && ('0' <= *__first && *__first <= '7'))
-        {
-            __val = 8 * __val + *__first - '0';
-            if (++__first != __last && ('0' <= *__first && *__first <= '7'))
-                __val = 8 * __val + *__first++ - '0';
-        }
-        if (__str)
-            *__str = _CharT(__val);
-        else
-            __push_char(_CharT(__val));
-    }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    else
-        throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_equivalence_class(_ForwardIterator __first,
-                                    _ForwardIterator __last,
-                                    __bracket_expression<_CharT, _Traits>* __ml)
-{
-    // Found [=
-    //   This means =] must exist
-    value_type _Equal_close[2] = {'=', ']'};
-    _ForwardIterator __temp = _VSTD::search(__first, __last, _Equal_close,
-                                                            _Equal_close+2);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __last)
-        throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    // [__first, __temp) contains all text in [= ... =]
-    typedef typename _Traits::string_type string_type;
-    string_type __collate_name =
-        __traits_.lookup_collatename(__first, __temp);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__collate_name.empty())
-        throw regex_error(regex_constants::error_collate);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    string_type __equiv_name =
-        __traits_.transform_primary(__collate_name.begin(),
-                                    __collate_name.end());
-    if (!__equiv_name.empty())
-        __ml->__add_equivalence(__equiv_name);
-    else
-    {
-        switch (__collate_name.size())
-        {
-        case 1:
-            __ml->__add_char(__collate_name[0]);
-            break;
-        case 2:
-            __ml->__add_digraph(__collate_name[0], __collate_name[1]);
-            break;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        default:
-            throw regex_error(regex_constants::error_collate);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        }
-    }
-    __first = _VSTD::next(__temp, 2);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_character_class(_ForwardIterator __first,
-                                    _ForwardIterator __last,
-                                    __bracket_expression<_CharT, _Traits>* __ml)
-{
-    // Found [:
-    //   This means :] must exist
-    value_type _Colon_close[2] = {':', ']'};
-    _ForwardIterator __temp = _VSTD::search(__first, __last, _Colon_close,
-                                                            _Colon_close+2);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __last)
-        throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    // [__first, __temp) contains all text in [: ... :]
-    typedef typename _Traits::char_class_type char_class_type;
-    char_class_type __class_type =
-        __traits_.lookup_classname(__first, __temp, __flags_ & icase);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__class_type == 0)
-        throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    __ml->__add_class(__class_type);
-    __first = _VSTD::next(__temp, 2);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_collating_symbol(_ForwardIterator __first,
-                                                _ForwardIterator __last,
-                                                basic_string<_CharT>& __col_sym)
-{
-    // Found [.
-    //   This means .] must exist
-    value_type _Dot_close[2] = {'.', ']'};
-    _ForwardIterator __temp = _VSTD::search(__first, __last, _Dot_close,
-                                                            _Dot_close+2);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __last)
-        throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    // [__first, __temp) contains all text in [. ... .]
-    typedef typename _Traits::string_type string_type;
-    __col_sym = __traits_.lookup_collatename(__first, __temp);
-    switch (__col_sym.size())
-    {
-    case 1:
-    case 2:
-        break;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    default:
-        throw regex_error(regex_constants::error_collate);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    __first = _VSTD::next(__temp, 2);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_DUP_COUNT(_ForwardIterator __first,
-                                                _ForwardIterator __last,
-                                                int& __c)
-{
-    if (__first != __last )
-    {
-        int __val = __traits_.value(*__first, 10);
-        if ( __val != -1 )
-        {
-            __c = __val;
-            for (++__first; 
-                 __first != __last && ( __val = __traits_.value(*__first, 10)) != -1;
-                 ++__first)
-            {
-                __c *= 10;
-                __c += __val;
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ecma_exp(_ForwardIterator __first,
-                                               _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __sa = __end_;
-    _ForwardIterator __temp = __parse_alternative(__first, __last);
-    if (__temp == __first)
-        __push_empty();
-    __first = __temp;
-    while (__first != __last && *__first == '|')
-    {
-        __owns_one_state<_CharT>* __sb = __end_;
-        __temp = __parse_alternative(++__first, __last);
-        if (__temp == __first)
-            __push_empty();
-        __push_alternation(__sa, __sb);
-        __first = __temp;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_alternative(_ForwardIterator __first,
-                                                  _ForwardIterator __last)
-{
-    while (true)
-    {
-        _ForwardIterator __temp = __parse_term(__first, __last);
-        if (__temp == __first)
-            break;
-        __first = __temp;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_term(_ForwardIterator __first,
-                                           _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __parse_assertion(__first, __last);
-    if (__temp == __first)
-    {
-        __owns_one_state<_CharT>* __e = __end_;
-        unsigned __mexp_begin = __marked_count_;
-        __temp = __parse_atom(__first, __last);
-        if (__temp != __first)
-            __first = __parse_ERE_dupl_symbol(__temp, __last, __e,
-                                              __mexp_begin+1, __marked_count_+1);
-    }
-    else
-        __first = __temp;
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_assertion(_ForwardIterator __first,
-                                                _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        switch (*__first)
-        {
-        case '^':
-            __push_l_anchor();
-            ++__first;
-            break;
-        case '$':
-            __push_r_anchor();
-            ++__first;
-            break;
-        case '\\':
-            {
-                _ForwardIterator __temp = _VSTD::next(__first);
-                if (__temp != __last)
-                {
-                    if (*__temp == 'b')
-                    {
-                        __push_word_boundary(false);
-                        __first = ++__temp;
-                    }
-                    else if (*__temp == 'B')
-                    {
-                        __push_word_boundary(true);
-                        __first = ++__temp;
-                    }
-                }
-            }
-            break;
-        case '(':
-            {
-                _ForwardIterator __temp = _VSTD::next(__first);
-                if (__temp != __last && *__temp == '?')
-                {
-                    if (++__temp != __last)
-                    {
-                        switch (*__temp)
-                        {
-                        case '=':
-                            {
-                                basic_regex __exp;
-                                __exp.__flags_ = __flags_;
-                                __temp = __exp.__parse(++__temp, __last);
-                                unsigned __mexp = __exp.__marked_count_;
-                                __push_lookahead(_VSTD::move(__exp), false, __marked_count_);
-                                __marked_count_ += __mexp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                                if (__temp == __last || *__temp != ')')
-                                    throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                                __first = ++__temp;
-                            }
-                            break;
-                        case '!':
-                            {
-                                basic_regex __exp;
-                                __exp.__flags_ = __flags_;
-                                __temp = __exp.__parse(++__temp, __last);
-                                unsigned __mexp = __exp.__marked_count_;
-                                __push_lookahead(_VSTD::move(__exp), true, __marked_count_);
-                                __marked_count_ += __mexp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                                if (__temp == __last || *__temp != ')')
-                                    throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                                __first = ++__temp;
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_atom(_ForwardIterator __first,
-                                           _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        switch (*__first)
-        {
-        case '.':
-            __push_match_any_but_newline();
-            ++__first;
-            break;
-        case '\\':
-            __first = __parse_atom_escape(__first, __last);
-            break;
-        case '[':
-            __first = __parse_bracket_expression(__first, __last);
-            break;
-        case '(':
-            {
-                ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__first == __last)
-                    throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                _ForwardIterator __temp = _VSTD::next(__first);
-                if (__temp != __last && *__first == '?' && *__temp == ':')
-                {
-                    ++__open_count_;
-                    __first = __parse_ecma_exp(++__temp, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__first == __last || *__first != ')')
-                        throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    --__open_count_;
-                    ++__first;
-                }
-                else
-                {
-                    __push_begin_marked_subexpression();
-                    unsigned __temp_count = __marked_count_;
-                    ++__open_count_;
-                    __first = __parse_ecma_exp(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__first == __last || *__first != ')')
-                        throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    __push_end_marked_subexpression(__temp_count);
-                    --__open_count_;
-                    ++__first;
-                }
-            }
-            break;
-        default:
-            __first = __parse_pattern_character(__first, __last);
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_atom_escape(_ForwardIterator __first,
-                                                  _ForwardIterator __last)
-{
-    if (__first != __last && *__first == '\\')
-    {
-        _ForwardIterator __t1 = _VSTD::next(__first);
-        _ForwardIterator __t2 = __parse_decimal_escape(__t1, __last);
-        if (__t2 != __t1)
-            __first = __t2;
-        else
-        {
-            __t2 = __parse_character_class_escape(__t1, __last);
-            if (__t2 != __t1)
-                __first = __t2;
-            else
-            {
-                __t2 = __parse_character_escape(__t1, __last);
-                if (__t2 != __t1)
-                    __first = __t2;
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_decimal_escape(_ForwardIterator __first,
-                                                     _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        if (*__first == '0')
-        {
-            __push_char(_CharT());
-            ++__first;
-        }
-        else if ('1' <= *__first && *__first <= '9')
-        {
-            unsigned __v = *__first - '0';
-            for (++__first; '0' <= *__first && *__first <= '9'; ++__first)
-                __v = 10 * __v + *__first - '0';
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__v > mark_count())
-                throw regex_error(regex_constants::error_backref);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __push_back_ref(__v);
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_character_class_escape(_ForwardIterator __first,
-                                                             _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        __bracket_expression<_CharT, _Traits>* __ml;
-        switch (*__first)
-        {
-        case 'd':
-            __ml = __start_matching_list(false);
-            __ml->__add_class(ctype_base::digit);
-            ++__first;
-            break;
-        case 'D':
-            __ml = __start_matching_list(true);
-            __ml->__add_class(ctype_base::digit);
-            ++__first;
-            break;
-        case 's':
-            __ml = __start_matching_list(false);
-            __ml->__add_class(ctype_base::space);
-            ++__first;
-            break;
-        case 'S':
-            __ml = __start_matching_list(true);
-            __ml->__add_class(ctype_base::space);
-            ++__first;
-            break;
-        case 'w':
-            __ml = __start_matching_list(false);
-            __ml->__add_class(ctype_base::alnum);
-            __ml->__add_char('_');
-            ++__first;
-            break;
-        case 'W':
-            __ml = __start_matching_list(true);
-            __ml->__add_class(ctype_base::alnum);
-            __ml->__add_char('_');
-            ++__first;
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_character_escape(_ForwardIterator __first,
-                                                    _ForwardIterator __last,
-                                                    basic_string<_CharT>* __str)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __t;
-        unsigned __sum = 0;
-        int __hd;
-        switch (*__first)
-        {
-        case 'f':
-            if (__str)
-                *__str = _CharT(0xC);
-            else
-                __push_char(_CharT(0xC));
-            ++__first;
-            break;
-        case 'n':
-            if (__str)
-                *__str = _CharT(0xA);
-            else
-                __push_char(_CharT(0xA));
-            ++__first;
-            break;
-        case 'r':
-            if (__str)
-                *__str = _CharT(0xD);
-            else
-                __push_char(_CharT(0xD));
-            ++__first;
-            break;
-        case 't':
-            if (__str)
-                *__str = _CharT(0x9);
-            else
-                __push_char(_CharT(0x9));
-            ++__first;
-            break;
-        case 'v':
-            if (__str)
-                *__str = _CharT(0xB);
-            else
-                __push_char(_CharT(0xB));
-            ++__first;
-            break;
-        case 'c':
-            if ((__t = _VSTD::next(__first)) != __last)
-            {
-                if (('A' <= *__t && *__t <= 'Z') || 
-                    ('a' <= *__t && *__t <= 'z'))
-                {
-                    if (__str)
-                        *__str = _CharT(*__t % 32);
-                    else
-                        __push_char(_CharT(*__t % 32));
-                    __first = ++__t;
-                }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                else 
-                    throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            else
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            break;
-        case 'u':
-            ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__first == __last)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __hd = __traits_.value(*__first, 16);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__hd == -1)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __sum = 16 * __sum + static_cast<unsigned>(__hd);
-            ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__first == __last)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __hd = __traits_.value(*__first, 16);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__hd == -1)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __sum = 16 * __sum + static_cast<unsigned>(__hd);
-            // drop through
-        case 'x':
-            ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__first == __last)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __hd = __traits_.value(*__first, 16);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__hd == -1)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __sum = 16 * __sum + static_cast<unsigned>(__hd);
-            ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__first == __last)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __hd = __traits_.value(*__first, 16);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__hd == -1)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __sum = 16 * __sum + static_cast<unsigned>(__hd);
-            if (__str)
-                *__str = _CharT(__sum);
-            else
-                __push_char(_CharT(__sum));
-            ++__first;
-            break;
-        case '0':
-            if (__str)
-                *__str = _CharT(0);
-            else
-                __push_char(_CharT(0));
-            ++__first;
-            break;
-        default:
-            if (*__first != '_' && !__traits_.isctype(*__first, ctype_base::alnum))
-            {
-                if (__str)
-                    *__str = *__first;
-                else
-                    __push_char(*__first);
-                ++__first;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            else
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_pattern_character(_ForwardIterator __first,
-                                                        _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        switch (*__first)
-        {
-        case '^':
-        case '$':
-        case '\\':
-        case '.':
-        case '*':
-        case '+':
-        case '?':
-        case '(':
-        case ')':
-        case '[':
-        case ']':
-        case '{':
-        case '}':
-        case '|':
-            break;
-        default:
-            __push_char(*__first);
-            ++__first;
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_grep(_ForwardIterator __first,
-                                           _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __sa = __end_;
-    _ForwardIterator __t1 = _VSTD::find(__first, __last, _CharT('\n'));
-    if (__t1 != __first)
-        __parse_basic_reg_exp(__first, __t1);
-    else
-        __push_empty();
-    __first = __t1;
-    if (__first != __last)
-        ++__first;
-    while (__first != __last)
-    {
-        __t1 = _VSTD::find(__first, __last, _CharT('\n'));
-        __owns_one_state<_CharT>* __sb = __end_;
-        if (__t1 != __first)
-            __parse_basic_reg_exp(__first, __t1);
-        else
-            __push_empty();
-        __push_alternation(__sa, __sb);
-        __first = __t1;
-        if (__first != __last)
-            ++__first;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_egrep(_ForwardIterator __first,
-                                            _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __sa = __end_;
-    _ForwardIterator __t1 = _VSTD::find(__first, __last, _CharT('\n'));
-    if (__t1 != __first)
-        __parse_extended_reg_exp(__first, __t1);
-    else
-        __push_empty();
-    __first = __t1;
-    if (__first != __last)
-        ++__first;
-    while (__first != __last)
-    {
-        __t1 = _VSTD::find(__first, __last, _CharT('\n'));
-        __owns_one_state<_CharT>* __sb = __end_;
-        if (__t1 != __first)
-            __parse_extended_reg_exp(__first, __t1);
-        else
-            __push_empty();
-        __push_alternation(__sa, __sb);
-        __first = __t1;
-        if (__first != __last)
-            ++__first;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_loop(size_t __min, size_t __max,
-        __owns_one_state<_CharT>* __s, size_t __mexp_begin, size_t __mexp_end,
-        bool __greedy)
-{
-    unique_ptr<__empty_state<_CharT> > __e1(new __empty_state<_CharT>(__end_->first()));
-    __end_->first() = nullptr;
-    unique_ptr<__loop<_CharT> > __e2(new __loop<_CharT>(__loop_count_,
-                __s->first(), __e1.get(), __mexp_begin, __mexp_end, __greedy,
-                __min, __max));
-    __s->first() = nullptr;
-    __e1.release();
-    __end_->first() = new __repeat_one_loop<_CharT>(__e2.get());
-    __end_ = __e2->second();
-    __s->first() = __e2.release();
-    ++__loop_count_;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_char(value_type __c)
-{
-    if (flags() & icase)
-        __end_->first() = new __match_char_icase<_CharT, _Traits>
-                                              (__traits_, __c, __end_->first());
-    else if (flags() & collate)
-        __end_->first() = new __match_char_collate<_CharT, _Traits>
-                                              (__traits_, __c, __end_->first());
-    else
-        __end_->first() = new __match_char<_CharT>(__c, __end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_begin_marked_subexpression()
-{
-    if (!(__flags_ & nosubs))
-    {
-        __end_->first() =
-                new __begin_marked_subexpression<_CharT>(++__marked_count_,
-                                                         __end_->first());
-        __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-    }
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_end_marked_subexpression(unsigned __sub)
-{
-    if (!(__flags_ & nosubs))
-    {
-        __end_->first() =
-                new __end_marked_subexpression<_CharT>(__sub, __end_->first());
-        __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-    }
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_l_anchor()
-{
-    __end_->first() = new __l_anchor<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_r_anchor()
-{
-    __end_->first() = new __r_anchor<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_match_any()
-{
-    __end_->first() = new __match_any<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_match_any_but_newline()
-{
-    __end_->first() = new __match_any_but_newline<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_empty()
-{
-    __end_->first() = new __empty_state<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_word_boundary(bool __invert)
-{
-    __end_->first() = new __word_boundary<_CharT, _Traits>(__traits_, __invert,
-                                                           __end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_back_ref(int __i)
-{
-    if (flags() & icase)
-        __end_->first() = new __back_ref_icase<_CharT, _Traits>
-                                              (__traits_, __i, __end_->first());
-    else if (flags() & collate)
-        __end_->first() = new __back_ref_collate<_CharT, _Traits>
-                                              (__traits_, __i, __end_->first());
-    else
-        __end_->first() = new __back_ref<_CharT>(__i, __end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_alternation(__owns_one_state<_CharT>* __sa,
-                                                 __owns_one_state<_CharT>* __ea)
-{
-    __sa->first() = new __alternate<_CharT>(
-                         static_cast<__owns_one_state<_CharT>*>(__sa->first()),
-                         static_cast<__owns_one_state<_CharT>*>(__ea->first()));
-    __ea->first() = nullptr;
-    __ea->first() = new __empty_state<_CharT>(__end_->first());
-    __end_->first() = nullptr;
-    __end_->first() = new __empty_non_own_state<_CharT>(__ea->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__ea->first());
-}
-
-template <class _CharT, class _Traits>
-__bracket_expression<_CharT, _Traits>*
-basic_regex<_CharT, _Traits>::__start_matching_list(bool __negate)
-{
-    __bracket_expression<_CharT, _Traits>* __r =
-        new __bracket_expression<_CharT, _Traits>(__traits_, __end_->first(),
-                                                  __negate, __flags_ & icase,
-                                                  __flags_ & collate);
-    __end_->first() = __r;
-    __end_ = __r;
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_lookahead(const basic_regex& __exp,
-                                               bool __invert,
-                                               unsigned __mexp)
-{
-    __end_->first() = new __lookahead<_CharT, _Traits>(__exp, __invert,
-                                                           __end_->first(), __mexp);
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-typedef basic_regex<char>    regex;
-typedef basic_regex<wchar_t> wregex;
-
-// sub_match
-
-template <class _BidirectionalIterator>
-class _LIBCPP_TYPE_VIS_ONLY sub_match
-    : public pair<_BidirectionalIterator, _BidirectionalIterator>
-{
-public:
-    typedef _BidirectionalIterator                              iterator;
-    typedef typename iterator_traits<iterator>::value_type      value_type;
-    typedef typename iterator_traits<iterator>::difference_type difference_type;
-    typedef basic_string<value_type>                            string_type;
-
-    bool matched;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR sub_match() : matched() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    difference_type length() const
-        {return matched ? _VSTD::distance(this->first, this->second) : 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    string_type str() const
-        {return matched ? string_type(this->first, this->second) : string_type();}
-    _LIBCPP_INLINE_VISIBILITY
-    operator string_type() const
-        {return str();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const sub_match& __s) const
-        {return str().compare(__s.str());}
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const string_type& __s) const
-        {return str().compare(__s);}
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const value_type* __s) const
-        {return str().compare(__s);}
-};
-
-typedef sub_match<const char*>             csub_match;
-typedef sub_match<const wchar_t*>          wcsub_match;
-typedef sub_match<string::const_iterator>  ssub_match;
-typedef sub_match<wstring::const_iterator> wssub_match;
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return __x.compare(__y) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return __x.compare(__y) < 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return __y.compare(typename sub_match<_BiIter>::string_type(__x.data(), __x.size())) == 0;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y.compare(typename sub_match<_BiIter>::string_type(__x.data(), __x.size())) > 0;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator>=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-                const sub_match<_BiIter>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const sub_match<_BiIter>& __x,
-           const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return __x.compare(typename sub_match<_BiIter>::string_type(__y.data(), __y.size())) == 0;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const sub_match<_BiIter>& __x,
-           const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const sub_match<_BiIter>& __x,
-          const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return __x.compare(typename sub_match<_BiIter>::string_type(__y.data(), __y.size())) < 0;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator>(const sub_match<_BiIter>& __x,
-               const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const sub_match<_BiIter>& __x,
-           const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const sub_match<_BiIter>& __x,
-           const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(typename iterator_traits<_BiIter>::value_type const* __x,
-           const sub_match<_BiIter>& __y)
-{
-    return __y.compare(__x) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(typename iterator_traits<_BiIter>::value_type const* __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(typename iterator_traits<_BiIter>::value_type const* __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y.compare(__x) > 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(typename iterator_traits<_BiIter>::value_type const* __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(typename iterator_traits<_BiIter>::value_type const* __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(typename iterator_traits<_BiIter>::value_type const* __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return __x.compare(__y) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const sub_match<_BiIter>& __x,
-          typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return __x.compare(__y) < 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const sub_match<_BiIter>& __x,
-          typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(typename iterator_traits<_BiIter>::value_type const& __x,
-           const sub_match<_BiIter>& __y)
-{
-    typedef basic_string<typename iterator_traits<_BiIter>::value_type> string_type;
-    return __y.compare(string_type(1, __x)) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(typename iterator_traits<_BiIter>::value_type const& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(typename iterator_traits<_BiIter>::value_type const& __x,
-          const sub_match<_BiIter>& __y)
-{
-    typedef basic_string<typename iterator_traits<_BiIter>::value_type> string_type;
-    return __y.compare(string_type(1, __x)) > 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(typename iterator_traits<_BiIter>::value_type const& __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(typename iterator_traits<_BiIter>::value_type const& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(typename iterator_traits<_BiIter>::value_type const& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    typedef basic_string<typename iterator_traits<_BiIter>::value_type> string_type;
-    return __x.compare(string_type(1, __y)) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const sub_match<_BiIter>& __x,
-          typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    typedef basic_string<typename iterator_traits<_BiIter>::value_type> string_type;
-    return __x.compare(string_type(1, __y)) < 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const sub_match<_BiIter>& __x,
-          typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _CharT, class _ST, class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _ST>&
-operator<<(basic_ostream<_CharT, _ST>& __os, const sub_match<_BiIter>& __m)
-{
-    return __os << __m.str();
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY match_results
-{
-public:
-    typedef _Allocator                                        allocator_type;
-    typedef sub_match<_BidirectionalIterator>                 value_type;
-private:
-    typedef vector<value_type, allocator_type>                __container_type;
-
-    __container_type  __matches_;
-    value_type __unmatched_;
-    value_type __prefix_;
-    value_type __suffix_;
-    bool       __ready_;
-public:
-    _BidirectionalIterator __position_start_;
-    typedef const value_type&                                 const_reference;
-    typedef value_type&                                       reference;
-    typedef typename __container_type::const_iterator         const_iterator;
-    typedef const_iterator                                    iterator;
-    typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type;
-    typedef typename allocator_traits<allocator_type>::size_type size_type;
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type char_type;
-    typedef basic_string<char_type>                           string_type;
-
-    // construct/copy/destroy:
-    explicit match_results(const allocator_type& __a = allocator_type());
-//    match_results(const match_results&) = default;
-//    match_results& operator=(const match_results&) = default;
-//    match_results(match_results&& __m) = default;
-//    match_results& operator=(match_results&& __m) = default;
-//    ~match_results() = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool ready() const {return __ready_;}
-
-    // size:
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const {return __matches_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const {return __matches_.max_size();}
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const {return size() == 0;}
-
-    // element access:
-    _LIBCPP_INLINE_VISIBILITY
-    difference_type length(size_type __sub = 0) const
-        {return (*this)[__sub].length();}
-    _LIBCPP_INLINE_VISIBILITY
-    difference_type position(size_type __sub = 0) const
-        {return _VSTD::distance(__position_start_, (*this)[__sub].first);}
-    _LIBCPP_INLINE_VISIBILITY
-    string_type str(size_type __sub = 0) const
-        {return (*this)[__sub].str();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference operator[](size_type __n) const
-        {return __n < __matches_.size() ? __matches_[__n] : __unmatched_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference prefix() const {return __prefix_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference suffix() const {return __suffix_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const {return empty() ? __matches_.end() : __matches_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const {return __matches_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const {return empty() ? __matches_.end() : __matches_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const {return __matches_.end();}
-
-    // format:
-    template <class _OutputIter>
-        _OutputIter
-        format(_OutputIter __out, const char_type* __fmt_first,
-               const char_type* __fmt_last,
-               regex_constants::match_flag_type __flags = regex_constants::format_default) const;
-    template <class _OutputIter, class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        _OutputIter
-        format(_OutputIter __out, const basic_string<char_type, _ST, _SA>& __fmt,
-               regex_constants::match_flag_type __flags = regex_constants::format_default) const
-            {return format(__out, __fmt.data(), __fmt.data() + __fmt.size(), __flags);}
-    template <class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_string<char_type, _ST, _SA>
-        format(const basic_string<char_type, _ST, _SA>& __fmt,
-               regex_constants::match_flag_type __flags = regex_constants::format_default) const
-        {
-            basic_string<char_type, _ST, _SA> __r;
-            format(back_inserter(__r), __fmt.data(), __fmt.data() + __fmt.size(),
-                   __flags);
-            return __r;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    string_type
-        format(const char_type* __fmt,
-               regex_constants::match_flag_type __flags = regex_constants::format_default) const
-        {
-            string_type __r;
-            format(back_inserter(__r), __fmt,
-                   __fmt + char_traits<char_type>::length(__fmt), __flags);
-            return __r;
-        }
-
-    // allocator:
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const {return __matches_.get_allocator();}
-
-    // swap:
-    void swap(match_results& __m);
-
-    template <class _Bp, class _Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        void __assign(_BidirectionalIterator __f, _BidirectionalIterator __l,
-                      const match_results<_Bp, _Ap>& __m, bool __no_update_pos)
-    {
-        _Bp __mf = __m.prefix().first;
-        __matches_.resize(__m.size());
-        for (size_type __i = 0; __i < __matches_.size(); ++__i)
-        {
-            __matches_[__i].first = _VSTD::next(__f, _VSTD::distance(__mf, __m[__i].first));
-            __matches_[__i].second = _VSTD::next(__f, _VSTD::distance(__mf, __m[__i].second));
-            __matches_[__i].matched = __m[__i].matched;
-        }
-        __unmatched_.first   = __l;
-        __unmatched_.second  = __l;
-        __unmatched_.matched = false;
-        __prefix_.first = _VSTD::next(__f, _VSTD::distance(__mf, __m.prefix().first));
-        __prefix_.second = _VSTD::next(__f, _VSTD::distance(__mf, __m.prefix().second));
-        __prefix_.matched = __m.prefix().matched;
-        __suffix_.first = _VSTD::next(__f, _VSTD::distance(__mf, __m.suffix().first));
-        __suffix_.second = _VSTD::next(__f, _VSTD::distance(__mf, __m.suffix().second));
-        __suffix_.matched = __m.suffix().matched;
-        if (!__no_update_pos)
-            __position_start_ = __prefix_.first;
-        __ready_ = __m.ready();
-    }
-
-private:
-    void __init(unsigned __s,
-                _BidirectionalIterator __f, _BidirectionalIterator __l,
-                bool __no_update_pos = false);
-
-    template <class, class> friend class basic_regex;
-
-    template <class _Bp, class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_match(_Bp, _Bp, match_results<_Bp, _Ap>&, const basic_regex<_Cp, _Tp>&,
-                regex_constants::match_flag_type);
-
-    template <class _Bp, class _Ap>
-    friend
-    bool
-    operator==(const match_results<_Bp, _Ap>&, const match_results<_Bp, _Ap>&);
-
-    template <class, class> friend class __lookahead;
-};
-
-template <class _BidirectionalIterator, class _Allocator>
-match_results<_BidirectionalIterator, _Allocator>::match_results(
-        const allocator_type& __a)
-    : __matches_(__a),
-      __unmatched_(),
-      __prefix_(),
-      __suffix_(),
-      __position_start_(),
-      __ready_(false)
-{
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-void
-match_results<_BidirectionalIterator, _Allocator>::__init(unsigned __s,
-                         _BidirectionalIterator __f, _BidirectionalIterator __l,
-                         bool __no_update_pos)
-{
-    __unmatched_.first   = __l;
-    __unmatched_.second  = __l;
-    __unmatched_.matched = false;
-    __matches_.assign(__s, __unmatched_);
-    __prefix_.first      = __f;
-    __prefix_.second     = __f;
-    __prefix_.matched    = false;
-    __suffix_ = __unmatched_;
-    if (!__no_update_pos)
-        __position_start_ = __prefix_.first;
-    __ready_ = true;
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-template <class _OutputIter>
-_OutputIter
-match_results<_BidirectionalIterator, _Allocator>::format(_OutputIter __out,
-        const char_type* __fmt_first, const char_type* __fmt_last,
-        regex_constants::match_flag_type __flags) const
-{
-    if (__flags & regex_constants::format_sed)
-    {
-        for (; __fmt_first != __fmt_last; ++__fmt_first)
-        {
-            if (*__fmt_first == '&')
-                __out = _VSTD::copy(__matches_[0].first, __matches_[0].second,
-                                   __out);
-            else if (*__fmt_first == '\\' && __fmt_first + 1 != __fmt_last)
-            {
-                ++__fmt_first;
-                if ('0' <= *__fmt_first && *__fmt_first <= '9')
-                {
-                    size_t __i = *__fmt_first - '0';
-                    __out = _VSTD::copy(__matches_[__i].first,
-                                       __matches_[__i].second, __out);
-                }
-                else
-                {
-                    *__out = *__fmt_first;
-                    ++__out;
-                }
-            }
-            else
-            {
-                *__out = *__fmt_first;
-                ++__out;
-            }
-        }
-    }
-    else
-    {
-        for (; __fmt_first != __fmt_last; ++__fmt_first)
-        {
-            if (*__fmt_first == '$' && __fmt_first + 1 != __fmt_last)
-            {
-                switch (__fmt_first[1])
-                {
-                case '$':
-                    *__out = *++__fmt_first;
-                    ++__out;
-                    break;
-                case '&':
-                    ++__fmt_first;
-                    __out = _VSTD::copy(__matches_[0].first, __matches_[0].second,
-                                       __out);
-                    break;
-                case '`':
-                    ++__fmt_first;
-                    __out = _VSTD::copy(__prefix_.first, __prefix_.second, __out);
-                    break;
-                case '\'':
-                    ++__fmt_first;
-                    __out = _VSTD::copy(__suffix_.first, __suffix_.second, __out);
-                    break;
-                default:
-                    if ('0' <= __fmt_first[1] && __fmt_first[1] <= '9')
-                    {
-                        ++__fmt_first;
-                        size_t __i = *__fmt_first - '0';
-                        if (__fmt_first + 1 != __fmt_last &&
-                            '0' <= __fmt_first[1] && __fmt_first[1] <= '9')
-                        {
-                            ++__fmt_first;
-                            __i = 10 * __i + *__fmt_first - '0';
-                        }
-                        __out = _VSTD::copy(__matches_[__i].first,
-                                           __matches_[__i].second, __out);
-                    }
-                    else
-                    {
-                        *__out = *__fmt_first;
-                        ++__out;
-                    }
-                    break;
-                }
-            }
-            else
-            {
-                *__out = *__fmt_first;
-                ++__out;
-            }
-        }
-    }
-    return __out;
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-void
-match_results<_BidirectionalIterator, _Allocator>::swap(match_results& __m)
-{
-    using _VSTD::swap;
-    swap(__matches_, __m.__matches_);
-    swap(__unmatched_, __m.__unmatched_);
-    swap(__prefix_, __m.__prefix_);
-    swap(__suffix_, __m.__suffix_);
-    swap(__position_start_, __m.__position_start_);
-    swap(__ready_, __m.__ready_);
-}
-
-typedef match_results<const char*>             cmatch;
-typedef match_results<const wchar_t*>          wcmatch;
-typedef match_results<string::const_iterator>  smatch;
-typedef match_results<wstring::const_iterator> wsmatch;
-
-template <class _BidirectionalIterator, class _Allocator>
-bool
-operator==(const match_results<_BidirectionalIterator, _Allocator>& __x,
-           const match_results<_BidirectionalIterator, _Allocator>& __y)
-{
-    if (__x.__ready_ != __y.__ready_)
-        return false;
-    if (!__x.__ready_)
-        return true;
-    return __x.__matches_ == __y.__matches_ &&
-           __x.__prefix_ == __y.__prefix_ &&
-           __x.__suffix_ == __y.__suffix_;
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const match_results<_BidirectionalIterator, _Allocator>& __x,
-           const match_results<_BidirectionalIterator, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(match_results<_BidirectionalIterator, _Allocator>& __x,
-     match_results<_BidirectionalIterator, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-// regex_search
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__match_at_start_ecma(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags, bool __at_first) const
-{
-    vector<__state> __states;
-    __node* __st = __start_.get();
-    if (__st)
-    {
-        __states.push_back(__state());
-        __states.back().__do_ = 0;
-        __states.back().__first_ = __first;
-        __states.back().__current_ = __first;
-        __states.back().__last_ = __last;
-        __states.back().__sub_matches_.resize(mark_count());
-        __states.back().__loop_data_.resize(__loop_count());
-        __states.back().__node_ = __st;
-        __states.back().__flags_ = __flags;
-        __states.back().__at_first_ = __at_first;
-        do
-        {
-            __state& __s = __states.back();
-            if (__s.__node_)
-                __s.__node_->__exec(__s);
-            switch (__s.__do_)
-            {
-            case __state::__end_state:
-                __m.__matches_[0].first = __first;
-                __m.__matches_[0].second = _VSTD::next(__first, __s.__current_ - __first);
-                __m.__matches_[0].matched = true;
-                for (unsigned __i = 0; __i < __s.__sub_matches_.size(); ++__i)
-                    __m.__matches_[__i+1] = __s.__sub_matches_[__i];
-                return true;
-            case __state::__accept_and_consume:
-            case __state::__repeat:
-            case __state::__accept_but_not_consume:
-                break;
-            case __state::__split:
-                {
-                __state __snext = __s;
-                __s.__node_->__exec_split(true, __s);
-                __snext.__node_->__exec_split(false, __snext);
-                __states.push_back(_VSTD::move(__snext));
-                }
-                break;
-            case __state::__reject:
-                __states.pop_back();
-                break;
-            default:
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw regex_error(regex_constants::__re_err_unknown);
-#endif
-                break;
-
-            }
-        } while (!__states.empty());
-    }
-    return false;
-}
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__match_at_start_posix_nosubs(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags, bool __at_first) const
-{
-    deque<__state> __states;
-    ptrdiff_t __highest_j = 0;
-    ptrdiff_t _Np = _VSTD::distance(__first, __last);
-    __node* __st = __start_.get();
-    if (__st)
-    {
-        __states.push_back(__state());
-        __states.back().__do_ = 0;
-        __states.back().__first_ = __first;
-        __states.back().__current_ = __first;
-        __states.back().__last_ = __last;
-        __states.back().__loop_data_.resize(__loop_count());
-        __states.back().__node_ = __st;
-        __states.back().__flags_ = __flags;
-        __states.back().__at_first_ = __at_first;
-        bool __matched = false;
-        do
-        {
-            __state& __s = __states.back();
-            if (__s.__node_)
-                __s.__node_->__exec(__s);
-            switch (__s.__do_)
-            {
-            case __state::__end_state:
-                if (!__matched || __highest_j < __s.__current_ - __s.__first_)
-                    __highest_j = __s.__current_ - __s.__first_;
-                __matched = true;
-                if (__highest_j == _Np)
-                    __states.clear();
-                else
-                    __states.pop_back();
-                break;
-            case __state::__consume_input:
-                break;
-            case __state::__accept_and_consume:
-                __states.push_front(_VSTD::move(__s));
-                __states.pop_back();
-                break;
-            case __state::__repeat:
-            case __state::__accept_but_not_consume:
-                break;
-            case __state::__split:
-                {
-                __state __snext = __s;
-                __s.__node_->__exec_split(true, __s);
-                __snext.__node_->__exec_split(false, __snext);
-                __states.push_back(_VSTD::move(__snext));
-                }
-                break;
-            case __state::__reject:
-                __states.pop_back();
-                break;
-            default:
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw regex_error(regex_constants::__re_err_unknown);
-#endif
-                break;
-            }
-        } while (!__states.empty());
-        if (__matched)
-        {
-            __m.__matches_[0].first = __first;
-            __m.__matches_[0].second = _VSTD::next(__first, __highest_j);
-            __m.__matches_[0].matched = true;
-            return true;
-        }
-    }
-    return false;
-}
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__match_at_start_posix_subs(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags, bool __at_first) const
-{
-    vector<__state> __states;
-    __state __best_state;
-    ptrdiff_t __j = 0;
-    ptrdiff_t __highest_j = 0;
-    ptrdiff_t _Np = _VSTD::distance(__first, __last);
-    __node* __st = __start_.get();
-    if (__st)
-    {
-        __states.push_back(__state());
-        __states.back().__do_ = 0;
-        __states.back().__first_ = __first;
-        __states.back().__current_ = __first;
-        __states.back().__last_ = __last;
-        __states.back().__sub_matches_.resize(mark_count());
-        __states.back().__loop_data_.resize(__loop_count());
-        __states.back().__node_ = __st;
-        __states.back().__flags_ = __flags;
-        __states.back().__at_first_ = __at_first;
-        const _CharT* __current = __first;
-        bool __matched = false;
-        do
-        {
-            __state& __s = __states.back();
-            if (__s.__node_)
-                __s.__node_->__exec(__s);
-            switch (__s.__do_)
-            {
-            case __state::__end_state:
-                if (!__matched || __highest_j < __s.__current_ - __s.__first_)
-                {
-                    __highest_j = __s.__current_ - __s.__first_;
-                    __best_state = __s;
-                }
-                __matched = true;
-                if (__highest_j == _Np)
-                    __states.clear();
-                else
-                    __states.pop_back();
-                break;
-            case __state::__accept_and_consume:
-                __j += __s.__current_ - __current;
-                __current = __s.__current_;
-                break;
-            case __state::__repeat:
-            case __state::__accept_but_not_consume:
-                break;
-            case __state::__split:
-                {
-                __state __snext = __s;
-                __s.__node_->__exec_split(true, __s);
-                __snext.__node_->__exec_split(false, __snext);
-                __states.push_back(_VSTD::move(__snext));
-                }
-                break;
-            case __state::__reject:
-                __states.pop_back();
-                break;
-            default:
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw regex_error(regex_constants::__re_err_unknown);
-#endif
-                break;
-            }
-        } while (!__states.empty());
-        if (__matched)
-        {
-            __m.__matches_[0].first = __first;
-            __m.__matches_[0].second = _VSTD::next(__first, __highest_j);
-            __m.__matches_[0].matched = true;
-            for (unsigned __i = 0; __i < __best_state.__sub_matches_.size(); ++__i)
-                __m.__matches_[__i+1] = __best_state.__sub_matches_[__i];
-            return true;
-        }
-    }
-    return false;
-}
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__match_at_start(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags, bool __at_first) const
-{
-    if ((__flags_ & 0x1F0) == ECMAScript)
-        return __match_at_start_ecma(__first, __last, __m, __flags, __at_first);
-    if (mark_count() == 0)
-        return __match_at_start_posix_nosubs(__first, __last, __m, __flags, __at_first);
-    return __match_at_start_posix_subs(__first, __last, __m, __flags, __at_first);
-}
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__search(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags) const
-{
-    __m.__init(1 + mark_count(), __first, __last,
-                                    __flags & regex_constants::__no_update_pos);
-    if (__match_at_start(__first, __last, __m, __flags, 
-                                    !(__flags & regex_constants::__no_update_pos)))
-    {
-        __m.__prefix_.second = __m[0].first;
-        __m.__prefix_.matched = __m.__prefix_.first != __m.__prefix_.second;
-        __m.__suffix_.first = __m[0].second;
-        __m.__suffix_.matched = __m.__suffix_.first != __m.__suffix_.second;
-        return true;
-    }
-    if (__first != __last && !(__flags & regex_constants::match_continuous))
-    {
-        __flags |= regex_constants::match_prev_avail;
-        for (++__first; __first != __last; ++__first)
-        {
-            __m.__matches_.assign(__m.size(), __m.__unmatched_);
-            if (__match_at_start(__first, __last, __m, __flags, false))
-            {
-                __m.__prefix_.second = __m[0].first;
-                __m.__prefix_.matched = __m.__prefix_.first != __m.__prefix_.second;
-                __m.__suffix_.first = __m[0].second;
-                __m.__suffix_.matched = __m.__suffix_.first != __m.__suffix_.second;
-                return true;
-            }
-            __m.__matches_.assign(__m.size(), __m.__unmatched_);
-        }
-    }
-    __m.__matches_.clear();
-    return false;
-}
-
-template <class _BidirectionalIterator, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last,
-             match_results<_BidirectionalIterator, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    int __offset = (__flags & regex_constants::match_prev_avail) ? 1 : 0;
-    basic_string<_CharT> __s(_VSTD::prev(__first, __offset), __last);
-    match_results<const _CharT*> __mc;
-    bool __r = __e.__search(__s.data() + __offset, __s.data() + __s.size(), __mc, __flags);
-    __m.__assign(__first, __last, __mc, __flags & regex_constants::__no_update_pos);
-    return __r;
-}
-
-template <class _Iter, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(__wrap_iter<_Iter> __first,
-             __wrap_iter<_Iter> __last,
-             match_results<__wrap_iter<_Iter>, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __mc;
-    bool __r = __e.__search(__first.base(), __last.base(), __mc, __flags);
-    __m.__assign(__first, __last, __mc, __flags & regex_constants::__no_update_pos);
-    return __r;
-}
-
-template <class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const _CharT* __first, const _CharT* __last,
-             match_results<const _CharT*, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return __e.__search(__first, __last, __m, __flags);
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT> __s(__first, __last);
-    match_results<const _CharT*> __mc;
-    return __e.__search(__s.data(), __s.data() + __s.size(), __mc, __flags);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const _CharT* __first, const _CharT* __last,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __mc;
-    return __e.__search(__first, __last, __mc, __flags);
-}
-
-template <class _CharT, class _Allocator, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const _CharT* __str, match_results<const _CharT*, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return __e.__search(__str, __str + _Traits::length(__str), __m, __flags);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const _CharT* __str, const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __m;
-    return _VSTD::regex_search(__str, __m, __e, __flags);
-}
-
-template <class _ST, class _SA, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const basic_string<_CharT, _ST, _SA>& __s,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __mc;
-    return __e.__search(__s.data(), __s.data() + __s.size(), __mc, __flags);
-}
-
-template <class _ST, class _SA, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const basic_string<_CharT, _ST, _SA>& __s,
-             match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __mc;
-    bool __r = __e.__search(__s.data(), __s.data() + __s.size(), __mc, __flags);
-    __m.__assign(__s.begin(), __s.end(), __mc, __flags & regex_constants::__no_update_pos);
-    return __r;
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _ST, class _SA, class _Ap, class _Cp, class _Tp>
-bool
-regex_search(const basic_string<_Cp, _ST, _SA>&& __s,
-             match_results<typename basic_string<_Cp, _ST, _SA>::const_iterator, _Ap>&,
-             const basic_regex<_Cp, _Tp>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default) = delete; 
-#endif
-
-// regex_match
-
-template <class _BidirectionalIterator, class _Allocator, class _CharT, class _Traits>
-bool
-regex_match(_BidirectionalIterator __first, _BidirectionalIterator __last,
-            match_results<_BidirectionalIterator, _Allocator>& __m,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    bool __r = _VSTD::regex_search(__first, __last, __m, __e,
-                            __flags | regex_constants::match_continuous);
-    if (__r)
-    {
-        __r = !__m.suffix().matched;
-        if (!__r)
-            __m.__matches_.clear();
-    }
-    return __r;
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(_BidirectionalIterator __first, _BidirectionalIterator __last,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<_BidirectionalIterator> __m;
-    return _VSTD::regex_match(__first, __last, __m, __e, __flags);
-}
-
-template <class _CharT, class _Allocator, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const _CharT* __str, match_results<const _CharT*, _Allocator>& __m,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_match(__str, __str + _Traits::length(__str), __m, __e, __flags);
-}
-
-template <class _ST, class _SA, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const basic_string<_CharT, _ST, _SA>& __s,
-            match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_match(__s.begin(), __s.end(), __m, __e, __flags);
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _ST, class _SA, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const basic_string<_CharT, _ST, _SA>&& __s,
-            match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default) = delete; 
-#endif
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const _CharT* __str, const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_match(__str, __str + _Traits::length(__str), __e, __flags);
-}
-
-template <class _ST, class _SA, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const basic_string<_CharT, _ST, _SA>& __s,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_match(__s.begin(), __s.end(), __e, __flags);
-}
-
-// regex_iterator
-
-template <class _BidirectionalIterator,
-          class _CharT = typename iterator_traits<_BidirectionalIterator>::value_type,
-          class _Traits = regex_traits<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY regex_iterator
-{
-public:
-    typedef basic_regex<_CharT, _Traits>          regex_type;
-    typedef match_results<_BidirectionalIterator> value_type;
-    typedef ptrdiff_t                             difference_type;
-    typedef const value_type*                     pointer;
-    typedef const value_type&                     reference;
-    typedef forward_iterator_tag                  iterator_category;
-
-private:
-    _BidirectionalIterator           __begin_;
-    _BidirectionalIterator           __end_;
-    const regex_type*                __pregex_;
-    regex_constants::match_flag_type __flags_;
-    value_type                       __match_;
-
-public:
-    regex_iterator();
-    regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                   const regex_type& __re,
-                   regex_constants::match_flag_type __m
-                                              = regex_constants::match_default);
-#if _LIBCPP_STD_VER > 11
-    regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                   const regex_type&& __re,
-                   regex_constants::match_flag_type __m 
-                                     = regex_constants::match_default) = delete;
-#endif
-
-    bool operator==(const regex_iterator& __x) const;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const regex_iterator& __x) const {return !(*this == __x);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return  __match_;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const  {return &__match_;}
-
-    regex_iterator& operator++();
-    _LIBCPP_INLINE_VISIBILITY
-    regex_iterator operator++(int)
-    {
-        regex_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-};
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>::regex_iterator()
-    : __begin_(), __end_(), __pregex_(nullptr), __flags_(), __match_()
-{
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                   const regex_type& __re, regex_constants::match_flag_type __m)
-    : __begin_(__a),
-      __end_(__b),
-      __pregex_(&__re),
-      __flags_(__m)
-{
-    _VSTD::regex_search(__begin_, __end_, __match_, *__pregex_, __flags_);
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-bool
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    operator==(const regex_iterator& __x) const
-{
-    if (__match_.empty() && __x.__match_.empty())
-        return true;
-    if (__match_.empty() || __x.__match_.empty())
-        return false;
-    return __begin_ == __x.__begin_       &&
-           __end_ == __x.__end_           &&
-           __pregex_ == __x.__pregex_     &&
-           __flags_ == __x.__flags_       &&
-           __match_[0] == __x.__match_[0];
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>&
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>::operator++()
-{
-    __flags_ |= regex_constants::__no_update_pos;
-    _BidirectionalIterator __start = __match_[0].second;
-    if (__match_.empty())
-    {
-        if (__start == __end_)
-        {
-            __match_ = value_type();
-            return *this;
-        }
-        else if (_VSTD::regex_search(__start, __end_, __match_, *__pregex_,
-                                    __flags_ | regex_constants::match_not_null |
-                                    regex_constants::match_continuous))
-            return *this;
-        else
-            ++__start;
-    }
-    __flags_ |= regex_constants::match_prev_avail;
-    if (!_VSTD::regex_search(__start, __end_, __match_, *__pregex_, __flags_))
-        __match_ = value_type();
-    return *this;
-}
-
-typedef regex_iterator<const char*>             cregex_iterator;
-typedef regex_iterator<const wchar_t*>          wcregex_iterator;
-typedef regex_iterator<string::const_iterator>  sregex_iterator;
-typedef regex_iterator<wstring::const_iterator> wsregex_iterator;
-
-// regex_token_iterator
-
-template <class _BidirectionalIterator,
-          class _CharT = typename iterator_traits<_BidirectionalIterator>::value_type,
-          class _Traits = regex_traits<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY regex_token_iterator
-{
-public:
-    typedef basic_regex<_CharT, _Traits>      regex_type;
-    typedef sub_match<_BidirectionalIterator> value_type;
-    typedef ptrdiff_t                         difference_type;
-    typedef const value_type*                 pointer;
-    typedef const value_type&                 reference;
-    typedef forward_iterator_tag              iterator_category;
-
-private:
-    typedef regex_iterator<_BidirectionalIterator, _CharT, _Traits> _Position;
-
-    _Position         __position_;
-    const value_type* __result_;
-    value_type        __suffix_;
-    ptrdiff_t         _N_;
-    vector<int>       __subs_;
-
-public:
-    regex_token_iterator();
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re, int __submatch = 0,
-                         regex_constants::match_flag_type __m =
-                                                regex_constants::match_default);
-#if _LIBCPP_STD_VER > 11
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type&& __re, int __submatch = 0,
-                         regex_constants::match_flag_type __m =
-                                       regex_constants::match_default) = delete;
-#endif
-
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re, const vector<int>& __submatches,
-                         regex_constants::match_flag_type __m =
-                                                regex_constants::match_default);
-#if _LIBCPP_STD_VER > 11
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type&& __re, const vector<int>& __submatches,
-                         regex_constants::match_flag_type __m =
-                                     regex_constants::match_default) = delete;
-#endif
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re,
-                         initializer_list<int> __submatches,
-                         regex_constants::match_flag_type __m =
-                                                regex_constants::match_default);
-
-#if _LIBCPP_STD_VER > 11
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type&& __re,
-                         initializer_list<int> __submatches,
-                         regex_constants::match_flag_type __m =
-                                       regex_constants::match_default) = delete;
-#endif
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template <size_t _Np>
-        regex_token_iterator(_BidirectionalIterator __a,
-                             _BidirectionalIterator __b,
-                             const regex_type& __re,
-                             const int (&__submatches)[_Np],
-                             regex_constants::match_flag_type __m =
-                                                regex_constants::match_default);
-#if _LIBCPP_STD_VER > 11
-    template <std::size_t _Np>
-        regex_token_iterator(_BidirectionalIterator __a,
-                             _BidirectionalIterator __b,
-                             const regex_type&& __re,
-                             const int (&__submatches)[_Np],
-                             regex_constants::match_flag_type __m =
-                                      regex_constants::match_default) = delete;
-#endif
-
-    regex_token_iterator(const regex_token_iterator&);
-    regex_token_iterator& operator=(const regex_token_iterator&);
-
-    bool operator==(const regex_token_iterator& __x) const;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const regex_token_iterator& __x) const {return !(*this == __x);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type& operator*() const {return *__result_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* operator->() const {return __result_;}
-
-    regex_token_iterator& operator++();
-    _LIBCPP_INLINE_VISIBILITY
-    regex_token_iterator operator++(int)
-    {
-        regex_token_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-private:
-    void __init(_BidirectionalIterator __a, _BidirectionalIterator __b);
-    void __establish_result () {
-        if (__subs_[_N_] == -1)
-            __result_ = &__position_->prefix();
-        else
-            __result_ = &(*__position_)[__subs_[_N_]];
-        }       
-};
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator()
-    : __result_(nullptr),
-      __suffix_(),
-      _N_(0)
-{
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-void
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    __init(_BidirectionalIterator __a, _BidirectionalIterator __b)
-{
-    if (__position_ != _Position())
-        __establish_result ();
-    else if (__subs_[_N_] == -1)
-    {
-        __suffix_.matched = true;
-        __suffix_.first = __a;
-        __suffix_.second = __b;
-        __result_ = &__suffix_;
-    }
-    else
-        __result_ = nullptr;
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re, int __submatch,
-                         regex_constants::match_flag_type __m)
-    : __position_(__a, __b, __re, __m),
-      _N_(0),
-      __subs_(1, __submatch)
-{
-    __init(__a, __b);
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re, const vector<int>& __submatches,
-                         regex_constants::match_flag_type __m)
-    : __position_(__a, __b, __re, __m),
-      _N_(0),
-      __subs_(__submatches)
-{
-    __init(__a, __b);
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re,
-                         initializer_list<int> __submatches,
-                         regex_constants::match_flag_type __m)
-    : __position_(__a, __b, __re, __m),
-      _N_(0),
-      __subs_(__submatches)
-{
-    __init(__a, __b);
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-template <size_t _Np>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                             const regex_type& __re,
-                             const int (&__submatches)[_Np],
-                             regex_constants::match_flag_type __m)
-    : __position_(__a, __b, __re, __m),
-      _N_(0),
-      __subs_(__submatches, __submatches + _Np)
-{
-    __init(__a, __b);
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(const regex_token_iterator& __x)
-    : __position_(__x.__position_),
-      __result_(__x.__result_),
-      __suffix_(__x.__suffix_),
-      _N_(__x._N_),
-      __subs_(__x.__subs_)
-{
-    if (__x.__result_ == &__x.__suffix_)
-        __result_ = &__suffix_;
-    else if ( __result_ != nullptr )
-        __establish_result ();
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>&
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    operator=(const regex_token_iterator& __x)
-{
-    if (this != &__x)
-    {
-        __position_ = __x.__position_;
-        if (__x.__result_ == &__x.__suffix_)
-            __result_ = &__suffix_;
-        else
-            __result_ = __x.__result_;
-        __suffix_ = __x.__suffix_;
-        _N_ = __x._N_;
-        __subs_ = __x.__subs_;
-
-        if ( __result_ != nullptr && __result_ != &__suffix_ )
-            __establish_result();
-    }
-    return *this;
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-bool
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    operator==(const regex_token_iterator& __x) const
-{
-    if (__result_ == nullptr && __x.__result_ == nullptr)
-        return true;
-    if (__result_ == &__suffix_ && __x.__result_ == &__x.__suffix_ &&
-            __suffix_ == __x.__suffix_)
-        return true;
-    if (__result_ == nullptr || __x.__result_ == nullptr)
-        return false;
-    if (__result_ == &__suffix_ || __x.__result_ == &__x.__suffix_)
-        return false;
-    return __position_ == __x.__position_ && _N_ == __x._N_ &&
-           __subs_ == __x.__subs_;
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>&
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::operator++()
-{
-    _Position __prev = __position_;
-    if (__result_ == &__suffix_)
-        __result_ = nullptr;
-    else if (_N_ + 1 < __subs_.size())
-    {
-        ++_N_;
-        __establish_result();
-    }
-    else
-    {
-        _N_ = 0;
-        ++__position_;
-        if (__position_ != _Position())
-            __establish_result();
-        else
-        {
-            if (_VSTD::find(__subs_.begin(), __subs_.end(), -1) != __subs_.end()
-                && __prev->suffix().length() != 0)
-            {
-                __suffix_.matched = true;
-                __suffix_.first = __prev->suffix().first;
-                __suffix_.second = __prev->suffix().second;
-                __result_ = &__suffix_;
-            }
-            else
-                __result_ = nullptr;
-        }
-    }
-    return *this;
-}
-
-typedef regex_token_iterator<const char*>             cregex_token_iterator;
-typedef regex_token_iterator<const wchar_t*>          wcregex_token_iterator;
-typedef regex_token_iterator<string::const_iterator>  sregex_token_iterator;
-typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
-
-// regex_replace
-
-template <class _OutputIterator, class _BidirectionalIterator,
-          class _Traits, class _CharT>
-_OutputIterator
-regex_replace(_OutputIterator __out,
-              _BidirectionalIterator __first, _BidirectionalIterator __last,
-              const basic_regex<_CharT, _Traits>& __e, const _CharT* __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    typedef regex_iterator<_BidirectionalIterator, _CharT, _Traits> _Iter;
-    _Iter __i(__first, __last, __e, __flags);
-    _Iter __eof;
-    if (__i == __eof)
-    {
-        if (!(__flags & regex_constants::format_no_copy))
-            __out = _VSTD::copy(__first, __last, __out);
-    }
-    else
-    {
-        sub_match<_BidirectionalIterator> __lm;
-        for (size_t __len = char_traits<_CharT>::length(__fmt); __i != __eof; ++__i)
-        {
-            if (!(__flags & regex_constants::format_no_copy))
-                __out = _VSTD::copy(__i->prefix().first, __i->prefix().second, __out);
-            __out = __i->format(__out, __fmt, __fmt + __len, __flags);
-            __lm = __i->suffix();
-            if (__flags & regex_constants::format_first_only)
-                break;
-        }
-        if (!(__flags & regex_constants::format_no_copy))
-            __out = _VSTD::copy(__lm.first, __lm.second, __out);
-    }
-    return __out;
-}
-
-template <class _OutputIterator, class _BidirectionalIterator,
-          class _Traits, class _CharT, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-regex_replace(_OutputIterator __out,
-              _BidirectionalIterator __first, _BidirectionalIterator __last,
-              const basic_regex<_CharT, _Traits>& __e,
-              const basic_string<_CharT, _ST, _SA>& __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_replace(__out, __first, __last, __e, __fmt.c_str(), __flags);
-}
-
-template <class _Traits, class _CharT, class _ST, class _SA, class _FST,
-          class _FSA>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _ST, _SA>
-regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
-              const basic_regex<_CharT, _Traits>& __e,
-              const basic_string<_CharT, _FST, _FSA>& __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT, _ST, _SA> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s.begin(), __s.end(), __e,
-                        __fmt.c_str(), __flags);
-    return __r;
-}
-
-template <class _Traits, class _CharT, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _ST, _SA>
-regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
-              const basic_regex<_CharT, _Traits>& __e, const _CharT* __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT, _ST, _SA> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s.begin(), __s.end(), __e,
-                        __fmt, __flags);
-    return __r;
-}
-
-template <class _Traits, class _CharT, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT>
-regex_replace(const _CharT* __s,
-              const basic_regex<_CharT, _Traits>& __e,
-              const basic_string<_CharT, _ST, _SA>& __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s,
-                        __s + char_traits<_CharT>::length(__s), __e,
-                        __fmt.c_str(), __flags);
-    return __r;
-}
-
-template <class _Traits, class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT>
-regex_replace(const _CharT* __s,
-              const basic_regex<_CharT, _Traits>& __e,
-              const _CharT* __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s,
-                        __s + char_traits<_CharT>::length(__s), __e,
-                        __fmt, __flags);
-    return __r;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_REGEX
diff --git a/include.new/c++/v1/scoped_allocator b/include.new/c++/v1/scoped_allocator
deleted file mode 100644
index aa8bece..0000000
--- a/include.new/c++/v1/scoped_allocator
+++ /dev/null
@@ -1,578 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- scoped_allocator --------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SCOPED_ALLOCATOR
-#define _LIBCPP_SCOPED_ALLOCATOR
-
-/*
-    scoped_allocator synopsis
-
-namespace std
-{
-
-template <class OuterAlloc, class... InnerAllocs>
-class scoped_allocator_adaptor : public OuterAlloc
-{
-    typedef allocator_traits<OuterAlloc> OuterTraits; // exposition only
-    scoped_allocator_adaptor<InnerAllocs...> inner;   // exposition only
-public:
-
-    typedef OuterAlloc outer_allocator_type;
-    typedef see below inner_allocator_type;
-
-    typedef typename OuterTraits::value_type value_type;
-    typedef typename OuterTraits::size_type size_type;
-    typedef typename OuterTraits::difference_type difference_type;
-    typedef typename OuterTraits::pointer pointer;
-    typedef typename OuterTraits::const_pointer const_pointer;
-    typedef typename OuterTraits::void_pointer void_pointer;
-    typedef typename OuterTraits::const_void_pointer const_void_pointer;
-
-    typedef see below propagate_on_container_copy_assignment;
-    typedef see below propagate_on_container_move_assignment;
-    typedef see below propagate_on_container_swap;
-
-    template <class Tp>
-        struct rebind
-        {
-            typedef scoped_allocator_adaptor<
-                OuterTraits::template rebind_alloc<Tp>, InnerAllocs...> other;
-        };
-
-    scoped_allocator_adaptor();
-    template <class OuterA2>
-        scoped_allocator_adaptor(OuterA2&& outerAlloc,
-                                 const InnerAllocs&... innerAllocs) noexcept;
-    scoped_allocator_adaptor(const scoped_allocator_adaptor& other) noexcept;
-    scoped_allocator_adaptor(scoped_allocator_adaptor&& other) noexcept;
-    template <class OuterA2>
-        scoped_allocator_adaptor(const scoped_allocator_adaptor<OuterA2, InnerAllocs...>& other) noexcept;
-    template <class OuterA2>
-        scoped_allocator_adaptor(const scoped_allocator_adaptor<OuterA2, InnerAllocs...>&& other) noexcept;
-
-    ~scoped_allocator_adaptor();
-
-    inner_allocator_type& inner_allocator() noexcept;
-    const inner_allocator_type& inner_allocator() const noexcept;
-
-    outer_allocator_type& outer_allocator() noexcept;
-    const outer_allocator_type& outer_allocator() const noexcept;
-
-    pointer allocate(size_type n);
-    pointer allocate(size_type n, const_void_pointer hint);
-    void deallocate(pointer p, size_type n) noexcept;
-
-    size_type max_size() const;
-    template <class T, class... Args> void construct(T* p, Args&& args);
-    template <class T1, class T2, class... Args1, class... Args2>
-        void construct(pair<T1, T2>* p, piecewise_construct t, tuple<Args1...> x,
-                       tuple<Args2...> y);
-    template <class T1, class T2>
-        void construct(pair<T1, T2>* p);
-    template <class T1, class T2, class U, class V>
-        void construct(pair<T1, T2>* p, U&& x, V&& y);
-    template <class T1, class T2, class U, class V>
-        void construct(pair<T1, T2>* p, const pair<U, V>& x);
-    template <class T1, class T2, class U, class V>
-        void construct(pair<T1, T2>* p, pair<U, V>&& x);
-    template <class T> void destroy(T* p);
-
-    template <class T> void destroy(T* p) noexcept;
-
-    scoped_allocator_adaptor select_on_container_copy_construction() const noexcept;
-};
-
-template <class OuterA1, class OuterA2, class... InnerAllocs>
-    bool
-    operator==(const scoped_allocator_adaptor<OuterA1, InnerAllocs...>& a,
-               const scoped_allocator_adaptor<OuterA2, InnerAllocs...>& b) noexcept;
-
-template <class OuterA1, class OuterA2, class... InnerAllocs>
-    bool
-    operator!=(const scoped_allocator_adaptor<OuterA1, InnerAllocs...>& a,
-               const scoped_allocator_adaptor<OuterA2, InnerAllocs...>& b) noexcept;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <memory>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_ADVANCED_SFINAE)
-
-// scoped_allocator_adaptor
-
-template <class ..._Allocs>
-class scoped_allocator_adaptor;
-
-template <class ..._Allocs> struct __get_poc_copy_assignment;
-
-template <class _A0>
-struct __get_poc_copy_assignment<_A0>
-{
-    static const bool value = allocator_traits<_A0>::
-                              propagate_on_container_copy_assignment::value;
-};
-
-template <class _A0, class ..._Allocs>
-struct __get_poc_copy_assignment<_A0, _Allocs...>
-{
-    static const bool value =
-        allocator_traits<_A0>::propagate_on_container_copy_assignment::value ||
-        __get_poc_copy_assignment<_Allocs...>::value;
-};
-
-template <class ..._Allocs> struct __get_poc_move_assignment;
-
-template <class _A0>
-struct __get_poc_move_assignment<_A0>
-{
-    static const bool value = allocator_traits<_A0>::
-                              propagate_on_container_move_assignment::value;
-};
-
-template <class _A0, class ..._Allocs>
-struct __get_poc_move_assignment<_A0, _Allocs...>
-{
-    static const bool value =
-        allocator_traits<_A0>::propagate_on_container_move_assignment::value ||
-        __get_poc_move_assignment<_Allocs...>::value;
-};
-
-template <class ..._Allocs> struct __get_poc_swap;
-
-template <class _A0>
-struct __get_poc_swap<_A0>
-{
-    static const bool value = allocator_traits<_A0>::
-                              propagate_on_container_swap::value;
-};
-
-template <class _A0, class ..._Allocs>
-struct __get_poc_swap<_A0, _Allocs...>
-{
-    static const bool value =
-        allocator_traits<_A0>::propagate_on_container_swap::value ||
-        __get_poc_swap<_Allocs...>::value;
-};
-
-template <class ..._Allocs>
-class __scoped_allocator_storage;
-
-template <class _OuterAlloc, class... _InnerAllocs>
-class __scoped_allocator_storage<_OuterAlloc, _InnerAllocs...>
-    : public _OuterAlloc
-{
-    typedef _OuterAlloc outer_allocator_type;
-protected:
-    typedef scoped_allocator_adaptor<_InnerAllocs...> inner_allocator_type;
-
-private:
-    inner_allocator_type __inner_;
-
-protected:
-
-    _LIBCPP_INLINE_VISIBILITY
-    __scoped_allocator_storage() _NOEXCEPT {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(_OuterA2&& __outerAlloc,
-                                   const _InnerAllocs& ...__innerAllocs) _NOEXCEPT
-            : outer_allocator_type(_VSTD::forward<_OuterA2>(__outerAlloc)),
-              __inner_(__innerAllocs...) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, const _OuterA2&>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(
-            const __scoped_allocator_storage<_OuterA2, _InnerAllocs...>& __other) _NOEXCEPT
-            : outer_allocator_type(__other.outer_allocator()),
-              __inner_(__other.inner_allocator()) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(
-            __scoped_allocator_storage<_OuterA2, _InnerAllocs...>&& __other) _NOEXCEPT
-            : outer_allocator_type(_VSTD::move(__other.outer_allocator())),
-              __inner_(_VSTD::move(__other.inner_allocator())) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(_OuterA2&& __o,
-                                   const inner_allocator_type& __i) _NOEXCEPT
-            : outer_allocator_type(_VSTD::forward<_OuterA2>(__o)),
-              __inner_(__i)
-        {
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    inner_allocator_type& inner_allocator() _NOEXCEPT             {return __inner_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const inner_allocator_type& inner_allocator() const _NOEXCEPT {return __inner_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    outer_allocator_type& outer_allocator() _NOEXCEPT
-        {return static_cast<outer_allocator_type&>(*this);}
-    _LIBCPP_INLINE_VISIBILITY
-    const outer_allocator_type& outer_allocator() const _NOEXCEPT
-        {return static_cast<const outer_allocator_type&>(*this);}
-
-    scoped_allocator_adaptor<outer_allocator_type, _InnerAllocs...>
-    _LIBCPP_INLINE_VISIBILITY
-    select_on_container_copy_construction() const _NOEXCEPT
-        {
-            return scoped_allocator_adaptor<outer_allocator_type, _InnerAllocs...>
-            (
-                allocator_traits<outer_allocator_type>::
-                    select_on_container_copy_construction(outer_allocator()),
-                allocator_traits<inner_allocator_type>::
-                    select_on_container_copy_construction(inner_allocator())
-            );
-        }
-
-    template <class...> friend class __scoped_allocator_storage;
-};
-
-template <class _OuterAlloc>
-class __scoped_allocator_storage<_OuterAlloc>
-    : public _OuterAlloc
-{
-    typedef _OuterAlloc outer_allocator_type;
-protected:
-    typedef scoped_allocator_adaptor<_OuterAlloc> inner_allocator_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __scoped_allocator_storage() _NOEXCEPT {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(_OuterA2&& __outerAlloc) _NOEXCEPT
-            : outer_allocator_type(_VSTD::forward<_OuterA2>(__outerAlloc)) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, const _OuterA2&>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(
-            const __scoped_allocator_storage<_OuterA2>& __other) _NOEXCEPT
-            : outer_allocator_type(__other.outer_allocator()) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(
-            __scoped_allocator_storage<_OuterA2>&& __other) _NOEXCEPT
-            : outer_allocator_type(_VSTD::move(__other.outer_allocator())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    inner_allocator_type& inner_allocator() _NOEXCEPT
-        {return static_cast<inner_allocator_type&>(*this);}
-    _LIBCPP_INLINE_VISIBILITY
-    const inner_allocator_type& inner_allocator() const _NOEXCEPT
-        {return static_cast<const inner_allocator_type&>(*this);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    outer_allocator_type& outer_allocator() _NOEXCEPT
-        {return static_cast<outer_allocator_type&>(*this);}
-    _LIBCPP_INLINE_VISIBILITY
-    const outer_allocator_type& outer_allocator() const _NOEXCEPT
-        {return static_cast<const outer_allocator_type&>(*this);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    scoped_allocator_adaptor<outer_allocator_type>
-    select_on_container_copy_construction() const _NOEXCEPT
-        {return scoped_allocator_adaptor<outer_allocator_type>(
-            allocator_traits<outer_allocator_type>::
-                select_on_container_copy_construction(outer_allocator())
-        );}
-
-    __scoped_allocator_storage(const outer_allocator_type& __o,
-                               const inner_allocator_type& __i) _NOEXCEPT;
-
-    template <class...> friend class __scoped_allocator_storage;
-};
-
-// __outermost
-
-template <class _Alloc>
-decltype(declval<_Alloc>().outer_allocator(), true_type())
-__has_outer_allocator_test(_Alloc&& __a);
-
-template <class _Alloc>
-false_type
-__has_outer_allocator_test(const volatile _Alloc& __a);
-
-template <class _Alloc>
-struct __has_outer_allocator
-    : public common_type
-             <
-                 decltype(__has_outer_allocator_test(declval<_Alloc&>()))
-             >::type
-{
-};
-
-template <class _Alloc, bool = __has_outer_allocator<_Alloc>::value>
-struct __outermost
-{
-    typedef _Alloc type;
-    _LIBCPP_INLINE_VISIBILITY
-    type& operator()(type& __a) const _NOEXCEPT {return __a;}
-};
-
-template <class _Alloc>
-struct __outermost<_Alloc, true>
-{
-    typedef typename remove_reference
-                     <
-                        decltype(_VSTD::declval<_Alloc>().outer_allocator())
-                     >::type                                    _OuterAlloc;
-    typedef typename __outermost<_OuterAlloc>::type             type;
-    _LIBCPP_INLINE_VISIBILITY
-    type& operator()(_Alloc& __a) const _NOEXCEPT
-        {return __outermost<_OuterAlloc>()(__a.outer_allocator());}
-};
-
-template <class _OuterAlloc, class... _InnerAllocs>
-class _LIBCPP_TYPE_VIS_ONLY scoped_allocator_adaptor<_OuterAlloc, _InnerAllocs...>
-    : public __scoped_allocator_storage<_OuterAlloc, _InnerAllocs...>
-{
-    typedef __scoped_allocator_storage<_OuterAlloc, _InnerAllocs...> base;
-    typedef allocator_traits<_OuterAlloc>             _OuterTraits;
-public:
-    typedef _OuterAlloc                               outer_allocator_type;
-    typedef typename base::inner_allocator_type       inner_allocator_type;
-    typedef typename _OuterTraits::size_type          size_type;
-    typedef typename _OuterTraits::difference_type    difference_type;
-    typedef typename _OuterTraits::pointer            pointer;
-    typedef typename _OuterTraits::const_pointer      const_pointer;
-    typedef typename _OuterTraits::void_pointer       void_pointer;
-    typedef typename _OuterTraits::const_void_pointer const_void_pointer;
-
-    typedef integral_constant
-            <
-                bool,
-                __get_poc_copy_assignment<outer_allocator_type,
-                                          _InnerAllocs...>::value
-            > propagate_on_container_copy_assignment;
-    typedef integral_constant
-            <
-                bool,
-                __get_poc_move_assignment<outer_allocator_type,
-                                          _InnerAllocs...>::value
-            > propagate_on_container_move_assignment;
-    typedef integral_constant
-            <
-                bool,
-                __get_poc_swap<outer_allocator_type, _InnerAllocs...>::value
-            > propagate_on_container_swap;
-
-    template <class _Tp>
-    struct rebind
-    {
-        typedef scoped_allocator_adaptor
-        <
-            typename _OuterTraits::template rebind_alloc<_Tp>, _InnerAllocs...
-        > other;
-    };
-
-    _LIBCPP_INLINE_VISIBILITY
-    scoped_allocator_adaptor() _NOEXCEPT {}
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        scoped_allocator_adaptor(_OuterA2&& __outerAlloc,
-                                 const _InnerAllocs& ...__innerAllocs) _NOEXCEPT
-            : base(_VSTD::forward<_OuterA2>(__outerAlloc), __innerAllocs...) {}
-    // scoped_allocator_adaptor(const scoped_allocator_adaptor& __other) = default;
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, const _OuterA2&>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        scoped_allocator_adaptor(
-            const scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>& __other) _NOEXCEPT
-                : base(__other) {}
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        scoped_allocator_adaptor(
-            scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>&& __other) _NOEXCEPT
-                : base(_VSTD::move(__other)) {}
-
-    // ~scoped_allocator_adaptor() = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-    inner_allocator_type& inner_allocator() _NOEXCEPT
-        {return base::inner_allocator();}
-    _LIBCPP_INLINE_VISIBILITY
-    const inner_allocator_type& inner_allocator() const _NOEXCEPT
-        {return base::inner_allocator();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    outer_allocator_type& outer_allocator() _NOEXCEPT
-        {return base::outer_allocator();}
-    _LIBCPP_INLINE_VISIBILITY
-    const outer_allocator_type& outer_allocator() const _NOEXCEPT
-        {return base::outer_allocator();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    pointer allocate(size_type __n)
-        {return allocator_traits<outer_allocator_type>::
-            allocate(outer_allocator(), __n);}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer allocate(size_type __n, const_void_pointer __hint)
-        {return allocator_traits<outer_allocator_type>::
-            allocate(outer_allocator(), __n, __hint);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void deallocate(pointer __p, size_type __n) _NOEXCEPT
-        {allocator_traits<outer_allocator_type>::
-            deallocate(outer_allocator(), __p, __n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const
-        {return allocator_traits<outer_allocator_type>::max_size(outer_allocator());}
-
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void construct(_Tp* __p, _Args&& ...__args)
-            {__construct(__uses_alloc_ctor<_Tp, inner_allocator_type, _Args...>(),
-                         __p, _VSTD::forward<_Args>(__args)...);}
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        void destroy(_Tp* __p)
-            {
-                typedef __outermost<outer_allocator_type> _OM;
-                allocator_traits<typename _OM::type>::
-                                         destroy(_OM()(outer_allocator()), __p);
-            }
-
-    _LIBCPP_INLINE_VISIBILITY
-    scoped_allocator_adaptor select_on_container_copy_construction() const _NOEXCEPT
-        {return base::select_on_container_copy_construction();}
-
-private:
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-    _LIBCPP_INLINE_VISIBILITY
-    scoped_allocator_adaptor(_OuterA2&& __o,
-                             const inner_allocator_type& __i) _NOEXCEPT
-        : base(_VSTD::forward<_OuterA2>(__o), __i) {}
-
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void __construct(integral_constant<int, 0>, _Tp* __p, _Args&& ...__args)
-            {
-                typedef __outermost<outer_allocator_type> _OM;
-                allocator_traits<typename _OM::type>::construct
-                (
-                    _OM()(outer_allocator()),
-                    __p,
-                    _VSTD::forward<_Args>(__args)...
-                );
-            }
-
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void __construct(integral_constant<int, 1>, _Tp* __p, _Args&& ...__args)
-            {
-                typedef __outermost<outer_allocator_type> _OM;
-                allocator_traits<typename _OM::type>::construct
-                (
-                    _OM()(outer_allocator()),
-                    __p,
-                    allocator_arg,
-                    inner_allocator(),
-                    _VSTD::forward<_Args>(__args)...
-                );
-            }
-
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void __construct(integral_constant<int, 2>, _Tp* __p, _Args&& ...__args)
-            {
-                typedef __outermost<outer_allocator_type> _OM;
-                allocator_traits<typename _OM::type>::construct
-                (
-                    _OM()(outer_allocator()),
-                    __p,
-                    _VSTD::forward<_Args>(__args)...,
-                    inner_allocator()
-                );
-            }
-
-    template <class...> friend class __scoped_allocator_storage;
-};
-
-template <class _OuterA1, class _OuterA2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const scoped_allocator_adaptor<_OuterA1>& __a,
-           const scoped_allocator_adaptor<_OuterA2>& __b) _NOEXCEPT
-{
-    return __a.outer_allocator() == __b.outer_allocator();
-}
-
-template <class _OuterA1, class _OuterA2, class _InnerA0, class... _InnerAllocs>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const scoped_allocator_adaptor<_OuterA1, _InnerA0, _InnerAllocs...>& __a,
-           const scoped_allocator_adaptor<_OuterA2, _InnerA0, _InnerAllocs...>& __b) _NOEXCEPT
-{
-    return __a.outer_allocator() == __b.outer_allocator() &&
-           __a.inner_allocator() == __b.inner_allocator();
-}
-
-template <class _OuterA1, class _OuterA2, class... _InnerAllocs>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const scoped_allocator_adaptor<_OuterA1, _InnerAllocs...>& __a,
-           const scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>& __b) _NOEXCEPT
-{
-    return !(__a == __b);
-}
-
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_ADVANCED_SFINAE)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SCOPED_ALLOCATOR
diff --git a/include.new/c++/v1/set b/include.new/c++/v1/set
deleted file mode 100644
index 22d794d..0000000
--- a/include.new/c++/v1/set
+++ /dev/null
@@ -1,1217 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- set -------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SET
-#define _LIBCPP_SET
-
-/*
-
-    set synopsis
-
-namespace std
-{
-
-template <class Key, class Compare = less<Key>,
-          class Allocator = allocator<Key>>
-class set
-{
-public:
-    // types:
-    typedef Key                                      key_type;
-    typedef key_type                                 value_type;
-    typedef Compare                                  key_compare;
-    typedef key_compare                              value_compare;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    // construct/copy/destroy:
-    set()
-        noexcept(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value);
-    explicit set(const value_compare& comp);
-    set(const value_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        set(InputIterator first, InputIterator last,
-            const value_compare& comp = value_compare());
-    template <class InputIterator>
-        set(InputIterator first, InputIterator last, const value_compare& comp,
-            const allocator_type& a);
-    set(const set& s);
-    set(set&& s)
-        noexcept(
-            is_nothrow_move_constructible<allocator_type>::value &&
-            is_nothrow_move_constructible<key_compare>::value);
-    explicit set(const allocator_type& a);
-    set(const set& s, const allocator_type& a);
-    set(set&& s, const allocator_type& a);
-    set(initializer_list<value_type> il, const value_compare& comp = value_compare());
-    set(initializer_list<value_type> il, const value_compare& comp,
-        const allocator_type& a);
-    template <class InputIterator>
-        set(InputIterator first, InputIterator last, const allocator_type& a)
-            : set(first, last, Compare(), a) {}  // C++14
-    set(initializer_list<value_type> il, const allocator_type& a)
-        : set(il, Compare(), a) {}  // C++14
-    ~set();
-
-    set& operator=(const set& s);
-    set& operator=(set&& s)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<key_compare>::value);
-    set& operator=(initializer_list<value_type> il);
-
-    // iterators:
-          iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-          iterator end() noexcept;
-    const_iterator end()   const noexcept;
-
-          reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-          reverse_iterator rend() noexcept;
-    const_reverse_iterator rend()   const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    // capacity:
-    bool      empty()    const noexcept;
-    size_type size()     const noexcept;
-    size_type max_size() const noexcept;
-
-    // modifiers:
-    template <class... Args>
-        pair<iterator, bool> emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    pair<iterator,bool> insert(const value_type& v);
-    pair<iterator,bool> insert(value_type&& v);
-    iterator insert(const_iterator position, const value_type& v);
-    iterator insert(const_iterator position, value_type&& v);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type> il);
-
-    iterator  erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator  erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(set& s)
-        noexcept(
-            __is_nothrow_swappable<key_compare>::value &&
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value));
-
-    // observers:
-    allocator_type get_allocator() const noexcept;
-    key_compare    key_comp()      const;
-    value_compare  value_comp()    const;
-
-    // set operations:
-          iterator find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    template<typename K>
-        iterator find(const K& x);
-    template<typename K>
-        const_iterator find(const K& x) const;  // C++14
-    template<typename K>
-      size_type count(const K& x) const;        // C++14
-
-    size_type      count(const key_type& k) const;
-          iterator lower_bound(const key_type& k);
-    const_iterator lower_bound(const key_type& k) const;
-    template<typename K>
-        iterator lower_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator lower_bound(const K& x) const;  // C++14
-
-          iterator upper_bound(const key_type& k);
-    const_iterator upper_bound(const key_type& k) const;
-    template<typename K>
-        iterator upper_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator upper_bound(const K& x) const;  // C++14
-    pair<iterator,iterator>             equal_range(const key_type& k);
-    pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
-    template<typename K>
-        pair<iterator,iterator>             equal_range(const K& x);        // C++14
-    template<typename K>
-        pair<const_iterator,const_iterator> equal_range(const K& x) const;  // C++14
-};
-
-template <class Key, class Compare, class Allocator>
-bool
-operator==(const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator< (const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator!=(const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator> (const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator>=(const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator<=(const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-// specialized algorithms:
-template <class Key, class Compare, class Allocator>
-void
-swap(set<Key, Compare, Allocator>& x, set<Key, Compare, Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-template <class Key, class Compare = less<Key>,
-          class Allocator = allocator<Key>>
-class multiset
-{
-public:
-    // types:
-    typedef Key                                      key_type;
-    typedef key_type                                 value_type;
-    typedef Compare                                  key_compare;
-    typedef key_compare                              value_compare;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    // construct/copy/destroy:
-    multiset()
-        noexcept(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value);
-    explicit multiset(const value_compare& comp);
-    multiset(const value_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        multiset(InputIterator first, InputIterator last,
-                 const value_compare& comp = value_compare());
-    template <class InputIterator>
-        multiset(InputIterator first, InputIterator last,
-                 const value_compare& comp, const allocator_type& a);
-    multiset(const multiset& s);
-    multiset(multiset&& s)
-        noexcept(
-            is_nothrow_move_constructible<allocator_type>::value &&
-            is_nothrow_move_constructible<key_compare>::value);
-    explicit multiset(const allocator_type& a);
-    multiset(const multiset& s, const allocator_type& a);
-    multiset(multiset&& s, const allocator_type& a);
-    multiset(initializer_list<value_type> il, const value_compare& comp = value_compare());
-    multiset(initializer_list<value_type> il, const value_compare& comp,
-             const allocator_type& a);
-    template <class InputIterator>
-        multiset(InputIterator first, InputIterator last, const allocator_type& a)
-            : set(first, last, Compare(), a) {}  // C++14
-    multiset(initializer_list<value_type> il, const allocator_type& a)
-        : set(il, Compare(), a) {}  // C++14
-    ~multiset();
-
-    multiset& operator=(const multiset& s);
-    multiset& operator=(multiset&& s)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<key_compare>::value);
-    multiset& operator=(initializer_list<value_type> il);
-
-    // iterators:
-          iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-          iterator end() noexcept;
-    const_iterator end()   const noexcept;
-
-          reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-          reverse_iterator rend() noexcept;
-    const_reverse_iterator rend()   const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    // capacity:
-    bool      empty()    const noexcept;
-    size_type size()     const noexcept;
-    size_type max_size() const noexcept;
-
-    // modifiers:
-    template <class... Args>
-        iterator emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    iterator insert(const value_type& v);
-    iterator insert(value_type&& v);
-    iterator insert(const_iterator position, const value_type& v);
-    iterator insert(const_iterator position, value_type&& v);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type> il);
-
-    iterator  erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator  erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(multiset& s)
-        noexcept(
-            __is_nothrow_swappable<key_compare>::value &&
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value));
-
-    // observers:
-    allocator_type get_allocator() const noexcept;
-    key_compare    key_comp()      const;
-    value_compare  value_comp()    const;
-
-    // set operations:
-          iterator find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    template<typename K>
-        iterator find(const K& x);
-    template<typename K>
-        const_iterator find(const K& x) const;  // C++14
-
-    size_type      count(const key_type& k) const;
-          iterator lower_bound(const key_type& k);
-    const_iterator lower_bound(const key_type& k) const;
-    template<typename K>
-        iterator lower_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator lower_bound(const K& x) const;  // C++14
-
-          iterator upper_bound(const key_type& k);
-    const_iterator upper_bound(const key_type& k) const;
-    template<typename K>
-        iterator upper_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator upper_bound(const K& x) const;  // C++14
-
-    pair<iterator,iterator>             equal_range(const key_type& k);
-    pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
-    template<typename K>
-        pair<iterator,iterator>             equal_range(const K& x);        // C++14
-    template<typename K>
-        pair<const_iterator,const_iterator> equal_range(const K& x) const;  // C++14
-};
-
-template <class Key, class Compare, class Allocator>
-bool
-operator==(const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator< (const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator!=(const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator> (const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator>=(const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator<=(const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-// specialized algorithms:
-template <class Key, class Compare, class Allocator>
-void
-swap(multiset<Key, Compare, Allocator>& x, multiset<Key, Compare, Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__tree>
-#include <functional>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Key, class _Compare = less<_Key>,
-          class _Allocator = allocator<_Key> >
-class _LIBCPP_TYPE_VIS_ONLY set
-{
-public:
-    // types:
-    typedef _Key                                     key_type;
-    typedef key_type                                 value_type;
-    typedef _Compare                                 key_compare;
-    typedef key_compare                              value_compare;
-    typedef _Allocator                               allocator_type;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-
-private:
-    typedef __tree<value_type, value_compare, allocator_type> __base;
-    typedef allocator_traits<allocator_type>                  __alloc_traits;
-    typedef typename __base::__node_holder                    __node_holder;
-
-    __base __tree_;
-
-public:
-    typedef typename __base::pointer               pointer;
-    typedef typename __base::const_pointer         const_pointer;
-    typedef typename __base::size_type             size_type;
-    typedef typename __base::difference_type       difference_type;
-    typedef typename __base::const_iterator        iterator;
-    typedef typename __base::const_iterator        const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>       reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    set()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(value_compare()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit set(const value_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__comp) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit set(const value_compare& __comp, const allocator_type& __a)
-        : __tree_(__comp, __a) {}
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        set(_InputIterator __f, _InputIterator __l,
-            const value_compare& __comp = value_compare())
-        : __tree_(__comp)
-        {
-            insert(__f, __l);
-        }
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        set(_InputIterator __f, _InputIterator __l, const value_compare& __comp,
-            const allocator_type& __a)
-        : __tree_(__comp, __a)
-        {
-            insert(__f, __l);
-        }
-
-#if _LIBCPP_STD_VER > 11
-        template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY 
-        set(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
-            : set(__f, __l, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    set(const set& __s)
-        : __tree_(__s.__tree_)
-        {
-            insert(__s.begin(), __s.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    set& operator=(const set& __s)
-        {
-            __tree_ = __s.__tree_;
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    set(set&& __s)
-        _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-        : __tree_(_VSTD::move(__s.__tree_)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit set(const allocator_type& __a)
-        : __tree_(__a) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    set(const set& __s, const allocator_type& __a)
-        : __tree_(__s.__tree_.value_comp(), __a)
-        {
-            insert(__s.begin(), __s.end());
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    set(set&& __s, const allocator_type& __a);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    set(initializer_list<value_type> __il, const value_compare& __comp = value_compare())
-        : __tree_(__comp)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    set(initializer_list<value_type> __il, const value_compare& __comp,
-        const allocator_type& __a)
-        : __tree_(__comp, __a)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY 
-    set(initializer_list<value_type> __il, const allocator_type& __a)
-        : set(__il, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    set& operator=(initializer_list<value_type> __il)
-        {
-            __tree_.__assign_unique(__il.begin(), __il.end());
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    set& operator=(set&& __s)
-        _NOEXCEPT_(is_nothrow_move_assignable<__base>::value)
-        {
-            __tree_ = _VSTD::move(__s.__tree_);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT       {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT         {return __tree_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()   const _NOEXCEPT {return __tree_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT
-            {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT
-            {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin()  const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __tree_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __tree_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __tree_.max_size();}
-
-    // modifiers:
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        pair<iterator, bool> emplace(_Args&&... __args)
-            {return __tree_.__emplace_unique(_VSTD::forward<_Args>(__args)...);}
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-            {return __tree_.__emplace_hint_unique(__p, _VSTD::forward<_Args>(__args)...);}
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,bool> insert(const value_type& __v)
-        {return __tree_.__insert_unique(__v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,bool> insert(value_type&& __v)
-        {return __tree_.__insert_unique(_VSTD::move(__v));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __v)
-        {return __tree_.__insert_unique(__p, __v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, value_type&& __v)
-        {return __tree_.__insert_unique(__p, _VSTD::move(__v));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void insert(_InputIterator __f, _InputIterator __l)
-        {
-            for (const_iterator __e = cend(); __f != __l; ++__f)
-                __tree_.__insert_unique(__e, *__f);
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __p) {return __tree_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k)
-        {return __tree_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __f, const_iterator __l)
-        {return __tree_.erase(__f, __l);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__tree_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(set& __s) _NOEXCEPT_(__is_nothrow_swappable<__base>::value)
-        {__tree_.swap(__s.__tree_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __tree_.__alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_compare    key_comp()      const {return __tree_.value_comp();}
-    _LIBCPP_INLINE_VISIBILITY
-    value_compare  value_comp()    const {return __tree_.value_comp();}
-
-    // set operations:
-    _LIBCPP_INLINE_VISIBILITY
-    iterator find(const key_type& __k)             {return __tree_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __tree_.find(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    find(const _K2& __k)                           {return __tree_.find(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    find(const _K2& __k) const                     {return __tree_.find(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type      count(const key_type& __k) const
-        {return __tree_.__count_unique(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
-    count(const _K2& __k)                  {return __tree_.__count_unique(__k);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    iterator lower_bound(const key_type& __k)
-        {return __tree_.lower_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator lower_bound(const key_type& __k) const
-        {return __tree_.lower_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    lower_bound(const _K2& __k)       {return __tree_.lower_bound(__k);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator upper_bound(const key_type& __k)
-        {return __tree_.upper_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator upper_bound(const key_type& __k) const
-        {return __tree_.upper_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    upper_bound(const _K2& __k)       {return __tree_.upper_bound(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,iterator> equal_range(const key_type& __k)
-        {return __tree_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator,const_iterator> equal_range(const key_type& __k) const
-        {return __tree_.__equal_range_unique(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type
-    equal_range(const _K2& __k)       {return __tree_.__equal_range_unique(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type
-    equal_range(const _K2& __k) const {return __tree_.__equal_range_unique(__k);}
-#endif
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Compare, class _Allocator>
-set<_Key, _Compare, _Allocator>::set(set&& __s, const allocator_type& __a)
-    : __tree_(_VSTD::move(__s.__tree_), __a)
-{
-    if (__a != __s.get_allocator())
-    {
-        const_iterator __e = cend();
-        while (!__s.empty())
-            insert(__e, _VSTD::move(__s.__tree_.remove(__s.begin())->__value_));
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-// specialized algorithms:
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(set<_Key, _Compare, _Allocator>& __x,
-     set<_Key, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Compare = less<_Key>,
-          class _Allocator = allocator<_Key> >
-class _LIBCPP_TYPE_VIS_ONLY multiset
-{
-public:
-    // types:
-    typedef _Key                                      key_type;
-    typedef key_type                                 value_type;
-    typedef _Compare                                  key_compare;
-    typedef key_compare                              value_compare;
-    typedef _Allocator                                allocator_type;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-
-private:
-    typedef __tree<value_type, value_compare, allocator_type> __base;
-    typedef allocator_traits<allocator_type>                  __alloc_traits;
-    typedef typename __base::__node_holder                    __node_holder;
-
-    __base __tree_;
-
-public:
-    typedef typename __base::pointer               pointer;
-    typedef typename __base::const_pointer         const_pointer;
-    typedef typename __base::size_type             size_type;
-    typedef typename __base::difference_type       difference_type;
-    typedef typename __base::const_iterator        iterator;
-    typedef typename __base::const_iterator        const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>       reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    multiset()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(value_compare()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multiset(const value_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__comp) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multiset(const value_compare& __comp, const allocator_type& __a)
-        : __tree_(__comp, __a) {}
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        multiset(_InputIterator __f, _InputIterator __l,
-                 const value_compare& __comp = value_compare())
-        : __tree_(__comp)
-        {
-            insert(__f, __l);
-        }
-
-#if _LIBCPP_STD_VER > 11
-        template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY 
-        multiset(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
-            : multiset(__f, __l, key_compare(), __a) {}
-#endif
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        multiset(_InputIterator __f, _InputIterator __l,
-                 const value_compare& __comp, const allocator_type& __a)
-        : __tree_(__comp, __a)
-        {
-            insert(__f, __l);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(const multiset& __s)
-        : __tree_(__s.__tree_.value_comp(),
-          __alloc_traits::select_on_container_copy_construction(__s.__tree_.__alloc()))
-        {
-            insert(__s.begin(), __s.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multiset& operator=(const multiset& __s)
-        {
-            __tree_ = __s.__tree_;
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(multiset&& __s)
-        _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-        : __tree_(_VSTD::move(__s.__tree_)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multiset(const allocator_type& __a)
-        : __tree_(__a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(const multiset& __s, const allocator_type& __a)
-        : __tree_(__s.__tree_.value_comp(), __a)
-        {
-            insert(__s.begin(), __s.end());
-        }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    multiset(multiset&& __s, const allocator_type& __a);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(initializer_list<value_type> __il, const value_compare& __comp = value_compare())
-        : __tree_(__comp)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(initializer_list<value_type> __il, const value_compare& __comp,
-        const allocator_type& __a)
-        : __tree_(__comp, __a)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY 
-    multiset(initializer_list<value_type> __il, const allocator_type& __a)
-        : multiset(__il, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    multiset& operator=(initializer_list<value_type> __il)
-        {
-            __tree_.__assign_multi(__il.begin(), __il.end());
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    multiset& operator=(multiset&& __s)
-        _NOEXCEPT_(is_nothrow_move_assignable<__base>::value)
-        {
-            __tree_ = _VSTD::move(__s.__tree_);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT       {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT         {return __tree_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()   const _NOEXCEPT {return __tree_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT
-            {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT
-            {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin()  const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __tree_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __tree_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __tree_.max_size();}
-
-    // modifiers:
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace(_Args&&... __args)
-            {return __tree_.__emplace_multi(_VSTD::forward<_Args>(__args)...);}
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-            {return __tree_.__emplace_hint_multi(__p, _VSTD::forward<_Args>(__args)...);}
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __v)
-        {return __tree_.__insert_multi(__v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(value_type&& __v)
-        {return __tree_.__insert_multi(_VSTD::move(__v));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __v)
-        {return __tree_.__insert_multi(__p, __v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, value_type&& __v)
-        {return __tree_.__insert_multi(_VSTD::move(__v));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void insert(_InputIterator __f, _InputIterator __l)
-        {
-            for (const_iterator __e = cend(); __f != __l; ++__f)
-                __tree_.__insert_multi(__e, *__f);
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __p) {return __tree_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __tree_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __f, const_iterator __l)
-        {return __tree_.erase(__f, __l);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__tree_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(multiset& __s)
-        _NOEXCEPT_(__is_nothrow_swappable<__base>::value)
-        {__tree_.swap(__s.__tree_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __tree_.__alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_compare    key_comp()      const {return __tree_.value_comp();}
-    _LIBCPP_INLINE_VISIBILITY
-    value_compare  value_comp()    const {return __tree_.value_comp();}
-
-    // set operations:
-    _LIBCPP_INLINE_VISIBILITY
-    iterator find(const key_type& __k)             {return __tree_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __tree_.find(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,iterator>::type
-    find(const _K2& __k)                           {return __tree_.find(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    find(const _K2& __k) const                     {return __tree_.find(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type      count(const key_type& __k) const
-        {return __tree_.__count_multi(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
-    count(const _K2& __k)                  {return __tree_.__count_multi(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator lower_bound(const key_type& __k)
-        {return __tree_.lower_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator lower_bound(const key_type& __k) const
-            {return __tree_.lower_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,iterator>::type
-    lower_bound(const _K2& __k)       {return __tree_.lower_bound(__k);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator upper_bound(const key_type& __k)
-            {return __tree_.upper_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator upper_bound(const key_type& __k) const
-            {return __tree_.upper_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,iterator>::type
-    upper_bound(const _K2& __k)       {return __tree_.upper_bound(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,iterator>             equal_range(const key_type& __k)
-            {return __tree_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator,const_iterator> equal_range(const key_type& __k) const
-            {return __tree_.__equal_range_multi(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type
-    equal_range(const _K2& __k)       {return __tree_.__equal_range_multi(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type
-    equal_range(const _K2& __k) const {return __tree_.__equal_range_multi(__k);}
-#endif
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Compare, class _Allocator>
-multiset<_Key, _Compare, _Allocator>::multiset(multiset&& __s, const allocator_type& __a)
-    : __tree_(_VSTD::move(__s.__tree_), __a)
-{
-    if (__a != __s.get_allocator())
-    {
-        const_iterator __e = cend();
-        while (!__s.empty())
-            insert(__e, _VSTD::move(__s.__tree_.remove(__s.begin())->__value_));
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(multiset<_Key, _Compare, _Allocator>& __x,
-     multiset<_Key, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SET
diff --git a/include.new/c++/v1/shared_mutex b/include.new/c++/v1/shared_mutex
deleted file mode 100644
index 9b7f0bf..0000000
--- a/include.new/c++/v1/shared_mutex
+++ /dev/null
@@ -1,425 +0,0 @@
-// -*- C++ -*-
-//===------------------------ shared_mutex --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SHARED_MUTEX
-#define _LIBCPP_SHARED_MUTEX
-
-/*
-    shared_mutex synopsis
-
-// C++1y
-
-namespace std
-{
-
-class shared_timed_mutex
-{
-public:
-    shared_timed_mutex();
-    ~shared_timed_mutex();
-
-    shared_timed_mutex(const shared_timed_mutex&) = delete;
-    shared_timed_mutex& operator=(const shared_timed_mutex&) = delete;
-
-    // Exclusive ownership
-    void lock(); // blocking
-    bool try_lock();
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-
-    // Shared ownership
-    void lock_shared(); // blocking
-    bool try_lock_shared();
-    template <class Rep, class Period>
-        bool
-        try_lock_shared_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool
-        try_lock_shared_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock_shared();
-};
-
-template <class Mutex>
-class shared_lock
-{
-public:
-    typedef Mutex mutex_type;
-
-    // Shared locking
-    shared_lock() noexcept;
-    explicit shared_lock(mutex_type& m); // blocking
-    shared_lock(mutex_type& m, defer_lock_t) noexcept;
-    shared_lock(mutex_type& m, try_to_lock_t);
-    shared_lock(mutex_type& m, adopt_lock_t);
-    template <class Clock, class Duration>
-        shared_lock(mutex_type& m,
-                    const chrono::time_point<Clock, Duration>& abs_time);
-    template <class Rep, class Period>
-        shared_lock(mutex_type& m,
-                    const chrono::duration<Rep, Period>& rel_time);
-    ~shared_lock();
-
-    shared_lock(shared_lock const&) = delete;
-    shared_lock& operator=(shared_lock const&) = delete;
-
-    shared_lock(shared_lock&& u) noexcept;
-    shared_lock& operator=(shared_lock&& u) noexcept;
-
-    void lock(); // blocking
-    bool try_lock();
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-
-    // Setters
-    void swap(shared_lock& u) noexcept;
-    mutex_type* release() noexcept;
-
-    // Getters
-    bool owns_lock() const noexcept;
-    explicit operator bool () const noexcept;
-    mutex_type* mutex() const noexcept;
-};
-
-template <class Mutex>
-    void swap(shared_lock<Mutex>& x, shared_lock<Mutex>& y) noexcept;
-
-}  // std
-
-*/
-
-#include <__config>
-
-#if _LIBCPP_STD_VER > 11 || defined(_LIBCPP_BUILDING_SHARED_MUTEX)
-
-#include <__mutex_base>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifdef _LIBCPP_HAS_NO_THREADS
-#error <shared_mutex> is not supported on this single threaded system
-#else // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS shared_timed_mutex
-{
-    mutex               __mut_;
-    condition_variable  __gate1_;
-    condition_variable  __gate2_;
-    unsigned            __state_;
-
-    static const unsigned __write_entered_ = 1U << (sizeof(unsigned)*__CHAR_BIT__ - 1);
-    static const unsigned __n_readers_ = ~__write_entered_;
-public:
-    shared_timed_mutex();
-    _LIBCPP_INLINE_VISIBILITY ~shared_timed_mutex() = default;
-
-    shared_timed_mutex(const shared_timed_mutex&) = delete;
-    shared_timed_mutex& operator=(const shared_timed_mutex&) = delete;
-
-    // Exclusive ownership
-    void lock();
-    bool try_lock();
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        bool
-        try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time)
-        {
-            return try_lock_until(chrono::steady_clock::now() + __rel_time);
-        }
-    template <class _Clock, class _Duration>
-        bool
-        try_lock_until(const chrono::time_point<_Clock, _Duration>& __abs_time);
-    void unlock();
-
-    // Shared ownership
-    void lock_shared();
-    bool try_lock_shared();
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        bool
-        try_lock_shared_for(const chrono::duration<_Rep, _Period>& __rel_time)
-        {
-            return try_lock_shared_until(chrono::steady_clock::now() + __rel_time);
-        }
-    template <class _Clock, class _Duration>
-        bool
-        try_lock_shared_until(const chrono::time_point<_Clock, _Duration>& __abs_time);
-    void unlock_shared();
-};
-
-template <class _Clock, class _Duration>
-bool
-shared_timed_mutex::try_lock_until(
-                        const chrono::time_point<_Clock, _Duration>& __abs_time)
-{
-    unique_lock<mutex> __lk(__mut_);
-    if (__state_ & __write_entered_)
-    {
-        while (true)
-        {
-            cv_status __status = __gate1_.wait_until(__lk, __abs_time);
-            if ((__state_ & __write_entered_) == 0)
-                break;
-            if (__status == cv_status::timeout)
-                return false;
-        }
-    }
-    __state_ |= __write_entered_;
-    if (__state_ & __n_readers_)
-    {
-        while (true)
-        {
-            cv_status __status = __gate2_.wait_until(__lk, __abs_time);
-            if ((__state_ & __n_readers_) == 0)
-                break;
-            if (__status == cv_status::timeout)
-            {
-                __state_ &= ~__write_entered_;
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-template <class _Clock, class _Duration>
-bool
-shared_timed_mutex::try_lock_shared_until(
-                        const chrono::time_point<_Clock, _Duration>& __abs_time)
-{
-    unique_lock<mutex> __lk(__mut_);
-    if ((__state_ & __write_entered_) || (__state_ & __n_readers_) == __n_readers_)
-    {
-        while (true)
-        {
-            cv_status status = __gate1_.wait_until(__lk, __abs_time);
-            if ((__state_ & __write_entered_) == 0 &&
-                                       (__state_ & __n_readers_) < __n_readers_)
-                break;
-            if (status == cv_status::timeout)
-                return false;
-        }
-    }
-    unsigned __num_readers = (__state_ & __n_readers_) + 1;
-    __state_ &= ~__n_readers_;
-    __state_ |= __num_readers;
-    return true;
-}
-
-template <class _Mutex>
-class shared_lock
-{
-public:
-    typedef _Mutex mutex_type;
-
-private:
-    mutex_type* __m_;
-    bool __owns_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock() _NOEXCEPT
-        : __m_(nullptr),
-          __owns_(false)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit shared_lock(mutex_type& __m)
-        : __m_(&__m),
-          __owns_(true)
-        {__m_->lock_shared();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT
-        : __m_(&__m),
-          __owns_(false)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock(mutex_type& __m, try_to_lock_t)
-        : __m_(&__m),
-          __owns_(__m.try_lock_shared())
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock(mutex_type& __m, adopt_lock_t)
-        : __m_(&__m),
-          __owns_(true)
-        {}
-
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        shared_lock(mutex_type& __m,
-                    const chrono::time_point<_Clock, _Duration>& __abs_time)
-            : __m_(&__m),
-              __owns_(__m.try_lock_shared_until(__abs_time))
-            {}
-
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        shared_lock(mutex_type& __m,
-                    const chrono::duration<_Rep, _Period>& __rel_time)
-            : __m_(&__m),
-              __owns_(__m.try_lock_shared_for(__rel_time))
-            {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~shared_lock()
-    {
-        if (__owns_)
-            __m_->unlock_shared();
-    }
-
-    shared_lock(shared_lock const&) = delete;
-    shared_lock& operator=(shared_lock const&) = delete;
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock(shared_lock&& __u) _NOEXCEPT
-        : __m_(__u.__m_),
-          __owns_(__u.__owns_)
-        {
-            __u.__m_ = nullptr;
-            __u.__owns_ = false;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock& operator=(shared_lock&& __u) _NOEXCEPT
-    {
-        if (__owns_)
-            __m_->unlock_shared();
-        __m_ = nullptr;
-        __owns_ = false;
-        __m_ = __u.__m_;
-        __owns_ = __u.__owns_;
-        __u.__m_ = nullptr;
-        __u.__owns_ = false;
-        return *this;
-    }
-
-    void lock();
-    bool try_lock();
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-
-    // Setters
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(shared_lock& __u) _NOEXCEPT
-    {
-        _VSTD::swap(__m_, __u.__m_);
-        _VSTD::swap(__owns_, __u.__owns_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    mutex_type* release() _NOEXCEPT
-    {
-        mutex_type* __m = __m_;
-        __m_ = nullptr;
-        __owns_ = false;
-        return __m;
-    }
-
-    // Getters
-    _LIBCPP_INLINE_VISIBILITY
-    bool owns_lock() const _NOEXCEPT {return __owns_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit operator bool () const _NOEXCEPT {return __owns_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    mutex_type* mutex() const _NOEXCEPT {return __m_;}
-};
-
-template <class _Mutex>
-void
-shared_lock<_Mutex>::lock()
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "shared_lock::lock: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "shared_lock::lock: already locked");
-    __m_->lock_shared();
-    __owns_ = true;
-}
-
-template <class _Mutex>
-bool
-shared_lock<_Mutex>::try_lock()
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "shared_lock::try_lock: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "shared_lock::try_lock: already locked");
-    __owns_ = __m_->try_lock_shared();
-    return __owns_;
-}
-
-template <class _Mutex>
-template <class _Rep, class _Period>
-bool
-shared_lock<_Mutex>::try_lock_for(const chrono::duration<_Rep, _Period>& __d)
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "shared_lock::try_lock_for: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "shared_lock::try_lock_for: already locked");
-    __owns_ = __m_->try_lock_shared_for(__d);
-    return __owns_;
-}
-
-template <class _Mutex>
-template <class _Clock, class _Duration>
-bool
-shared_lock<_Mutex>::try_lock_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "shared_lock::try_lock_until: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "shared_lock::try_lock_until: already locked");
-    __owns_ = __m_->try_lock_shared_until(__t);
-    return __owns_;
-}
-
-template <class _Mutex>
-void
-shared_lock<_Mutex>::unlock()
-{
-    if (!__owns_)
-        __throw_system_error(EPERM, "shared_lock::unlock: not locked");
-    __m_->unlock_shared();
-    __owns_ = false;
-}
-
-template <class _Mutex>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(shared_lock<_Mutex>& __x, shared_lock<_Mutex>& __y) _NOEXCEPT
-    {__x.swap(__y);}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_STD_VER > 11
-
-#endif  // _LIBCPP_SHARED_MUTEX
diff --git a/include.new/c++/v1/sstream b/include.new/c++/v1/sstream
deleted file mode 100644
index 27ae78f..0000000
--- a/include.new/c++/v1/sstream
+++ /dev/null
@@ -1,977 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- sstream ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SSTREAM
-#define _LIBCPP_SSTREAM
-
-/*
-    sstream synopsis
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_stringbuf
-    : public basic_streambuf<charT, traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef Allocator                      allocator_type;
-
-    // 27.8.1.1 Constructors:
-    explicit basic_stringbuf(ios_base::openmode which = ios_base::in | ios_base::out);
-    explicit basic_stringbuf(const basic_string<char_type, traits_type, allocator_type>& str,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    basic_stringbuf(basic_stringbuf&& rhs);
-
-    // 27.8.1.2 Assign and swap:
-    basic_stringbuf& operator=(basic_stringbuf&& rhs);
-    void swap(basic_stringbuf& rhs);
-
-    // 27.8.1.3 Get and set:
-    basic_string<char_type, traits_type, allocator_type> str() const;
-    void str(const basic_string<char_type, traits_type, allocator_type>& s);
-
-protected:
-    // 27.8.1.4 Overridden virtual functions:
-    virtual int_type underflow();
-    virtual int_type pbackfail(int_type c = traits_type::eof());
-    virtual int_type overflow (int_type c = traits_type::eof());
-    virtual basic_streambuf<char_type, traits_type>* setbuf(char_type*, streamsize);
-    virtual pos_type seekoff(off_type off, ios_base::seekdir way,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type sp,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-};
-
-template <class charT, class traits, class Allocator>
-  void swap(basic_stringbuf<charT, traits, Allocator>& x,
-            basic_stringbuf<charT, traits, Allocator>& y);
-
-typedef basic_stringbuf<char>    stringbuf;
-typedef basic_stringbuf<wchar_t> wstringbuf;
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_istringstream
-    : public basic_istream<charT, traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef Allocator                      allocator_type;
-
-    // 27.8.2.1 Constructors:
-    explicit basic_istringstream(ios_base::openmode which = ios_base::in);
-    explicit basic_istringstream(const basic_string<char_type, traits_type,allocator_type>& str,
-                                 ios_base::openmode which = ios_base::in);
-    basic_istringstream(basic_istringstream&& rhs);
-
-    // 27.8.2.2 Assign and swap:
-    basic_istringstream& operator=(basic_istringstream&& rhs);
-    void swap(basic_istringstream& rhs);
-
-    // 27.8.2.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    basic_string<char_type, traits_type, allocator_type> str() const;
-    void str(const basic_string<char_type, traits_type, allocator_type>& s);
-};
-
-template <class charT, class traits, class Allocator>
-  void swap(basic_istringstream<charT, traits, Allocator>& x,
-            basic_istringstream<charT, traits, Allocator>& y);
-
-typedef basic_istringstream<char>    istringstream;
-typedef basic_istringstream<wchar_t> wistringstream;
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_ostringstream
-    : public basic_ostream<charT, traits>
-{
-public:
-    // types:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef Allocator                      allocator_type;
-
-    // 27.8.3.1 Constructors/destructor:
-    explicit basic_ostringstream(ios_base::openmode which = ios_base::out);
-    explicit basic_ostringstream(const basic_string<char_type, traits_type, allocator_type>& str,
-                                 ios_base::openmode which = ios_base::out);
-    basic_ostringstream(basic_ostringstream&& rhs);
-
-    // 27.8.3.2 Assign/swap:
-    basic_ostringstream& operator=(basic_ostringstream&& rhs);
-    void swap(basic_ostringstream& rhs);
-
-    // 27.8.3.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    basic_string<char_type, traits_type, allocator_type> str() const;
-    void str(const basic_string<char_type, traits_type, allocator_type>& s);
-};
-
-template <class charT, class traits, class Allocator>
-  void swap(basic_ostringstream<charT, traits, Allocator>& x,
-            basic_ostringstream<charT, traits, Allocator>& y);
-
-typedef basic_ostringstream<char>    ostringstream;
-typedef basic_ostringstream<wchar_t> wostringstream;
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_stringstream
-    : public basic_iostream<charT, traits>
-{
-public:
-    // types:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef Allocator                      allocator_type;
-
-    // constructors/destructor
-    explicit basic_stringstream(ios_base::openmode which = ios_base::out|ios_base::in);
-    explicit basic_stringstream(const basic_string<char_type, traits_type, allocator_type>& str,
-                                ios_base::openmode which = ios_base::out|ios_base::in);
-    basic_stringstream(basic_stringstream&& rhs);
-
-    // 27.8.5.1 Assign/swap:
-    basic_stringstream& operator=(basic_stringstream&& rhs);
-    void swap(basic_stringstream& rhs);
-
-    // Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    basic_string<char_type, traits_type, allocator_type> str() const;
-    void str(const basic_string<char_type, traits_type, allocator_type>& str);
-};
-
-template <class charT, class traits, class Allocator>
-  void swap(basic_stringstream<charT, traits, Allocator>& x,
-            basic_stringstream<charT, traits, Allocator>& y);
-
-typedef basic_stringstream<char>    stringstream;
-typedef basic_stringstream<wchar_t> wstringstream;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ostream>
-#include <istream>
-#include <string>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// basic_stringbuf
-
-template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_stringbuf
-    : public basic_streambuf<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef _Allocator                     allocator_type;
-
-    typedef basic_string<char_type, traits_type, allocator_type> string_type;
-
-private:
-
-    string_type __str_;
-    mutable char_type* __hm_;
-    ios_base::openmode __mode_;
-
-public:
-    // 27.8.1.1 Constructors:
-    explicit basic_stringbuf(ios_base::openmode __wch = ios_base::in | ios_base::out);
-    explicit basic_stringbuf(const string_type& __s,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_stringbuf(basic_stringbuf&& __rhs);
-#endif
-
-    // 27.8.1.2 Assign and swap:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_stringbuf& operator=(basic_stringbuf&& __rhs);
-#endif
-    void swap(basic_stringbuf& __rhs);
-
-    // 27.8.1.3 Get and set:
-    string_type str() const;
-    void str(const string_type& __s);
-
-protected:
-    // 27.8.1.4 Overridden virtual functions:
-    virtual int_type underflow();
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-    virtual int_type overflow (int_type __c = traits_type::eof());
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>::basic_stringbuf(ios_base::openmode __wch)
-    : __hm_(0),
-      __mode_(__wch)
-{
-    str(string_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>::basic_stringbuf(const string_type& __s,
-                             ios_base::openmode __wch)
-    : __hm_(0),
-      __mode_(__wch)
-{
-    str(__s);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_stringbuf<_CharT, _Traits, _Allocator>::basic_stringbuf(basic_stringbuf&& __rhs)
-    : __mode_(__rhs.__mode_)
-{
-    char_type* __p = const_cast<char_type*>(__rhs.__str_.data());
-    ptrdiff_t __binp = -1;
-    ptrdiff_t __ninp = -1;
-    ptrdiff_t __einp = -1;
-    if (__rhs.eback() != nullptr)
-    {
-        __binp = __rhs.eback() - __p;
-        __ninp = __rhs.gptr() - __p;
-        __einp = __rhs.egptr() - __p;
-    }
-    ptrdiff_t __bout = -1;
-    ptrdiff_t __nout = -1;
-    ptrdiff_t __eout = -1;
-    if (__rhs.pbase() != nullptr)
-    {
-        __bout = __rhs.pbase() - __p;
-        __nout = __rhs.pptr() - __p;
-        __eout = __rhs.epptr() - __p;
-    }
-    ptrdiff_t __hm = __rhs.__hm_ == nullptr ? -1 : __rhs.__hm_ - __p;
-    __str_ = _VSTD::move(__rhs.__str_);
-    __p = const_cast<char_type*>(__str_.data());
-    if (__binp != -1)
-        this->setg(__p + __binp, __p + __ninp, __p + __einp);
-    if (__bout != -1)
-    {
-        this->setp(__p + __bout, __p + __eout);
-        this->pbump(__nout);
-    }
-    __hm_ = __hm == -1 ? nullptr : __p + __hm;
-    __p = const_cast<char_type*>(__rhs.__str_.data());
-    __rhs.setg(__p, __p, __p);
-    __rhs.setp(__p, __p);
-    __rhs.__hm_ = __p;
-    this->pubimbue(__rhs.getloc());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_stringbuf<_CharT, _Traits, _Allocator>&
-basic_stringbuf<_CharT, _Traits, _Allocator>::operator=(basic_stringbuf&& __rhs)
-{
-    char_type* __p = const_cast<char_type*>(__rhs.__str_.data());
-    ptrdiff_t __binp = -1;
-    ptrdiff_t __ninp = -1;
-    ptrdiff_t __einp = -1;
-    if (__rhs.eback() != nullptr)
-    {
-        __binp = __rhs.eback() - __p;
-        __ninp = __rhs.gptr() - __p;
-        __einp = __rhs.egptr() - __p;
-    }
-    ptrdiff_t __bout = -1;
-    ptrdiff_t __nout = -1;
-    ptrdiff_t __eout = -1;
-    if (__rhs.pbase() != nullptr)
-    {
-        __bout = __rhs.pbase() - __p;
-        __nout = __rhs.pptr() - __p;
-        __eout = __rhs.epptr() - __p;
-    }
-    ptrdiff_t __hm = __rhs.__hm_ == nullptr ? -1 : __rhs.__hm_ - __p;
-    __str_ = _VSTD::move(__rhs.__str_);
-    __p = const_cast<char_type*>(__str_.data());
-    if (__binp != -1)
-        this->setg(__p + __binp, __p + __ninp, __p + __einp);
-    else
-        this->setg(nullptr, nullptr, nullptr);
-    if (__bout != -1)
-    {
-        this->setp(__p + __bout, __p + __eout);
-        this->pbump(__nout);
-    }
-    else
-        this->setp(nullptr, nullptr);
-
-    __hm_ = __hm == -1 ? nullptr : __p + __hm;
-    __mode_ = __rhs.__mode_;
-    __p = const_cast<char_type*>(__rhs.__str_.data());
-    __rhs.setg(__p, __p, __p);
-    __rhs.setp(__p, __p);
-    __rhs.__hm_ = __p;
-    this->pubimbue(__rhs.getloc());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_stringbuf<_CharT, _Traits, _Allocator>::swap(basic_stringbuf& __rhs)
-{
-    char_type* __p = const_cast<char_type*>(__rhs.__str_.data());
-    ptrdiff_t __rbinp = -1;
-    ptrdiff_t __rninp = -1;
-    ptrdiff_t __reinp = -1;
-    if (__rhs.eback() != nullptr)
-    {
-        __rbinp = __rhs.eback() - __p;
-        __rninp = __rhs.gptr() - __p;
-        __reinp = __rhs.egptr() - __p;
-    }
-    ptrdiff_t __rbout = -1;
-    ptrdiff_t __rnout = -1;
-    ptrdiff_t __reout = -1;
-    if (__rhs.pbase() != nullptr)
-    {
-        __rbout = __rhs.pbase() - __p;
-        __rnout = __rhs.pptr() - __p;
-        __reout = __rhs.epptr() - __p;
-    }
-    ptrdiff_t __rhm = __rhs.__hm_ == nullptr ? -1 : __rhs.__hm_ - __p;
-    __p = const_cast<char_type*>(__str_.data());
-    ptrdiff_t __lbinp = -1;
-    ptrdiff_t __lninp = -1;
-    ptrdiff_t __leinp = -1;
-    if (this->eback() != nullptr)
-    {
-        __lbinp = this->eback() - __p;
-        __lninp = this->gptr() - __p;
-        __leinp = this->egptr() - __p;
-    }
-    ptrdiff_t __lbout = -1;
-    ptrdiff_t __lnout = -1;
-    ptrdiff_t __leout = -1;
-    if (this->pbase() != nullptr)
-    {
-        __lbout = this->pbase() - __p;
-        __lnout = this->pptr() - __p;
-        __leout = this->epptr() - __p;
-    }
-    ptrdiff_t __lhm = __hm_ == nullptr ? -1 : __hm_ - __p;
-    _VSTD::swap(__mode_, __rhs.__mode_);
-    __str_.swap(__rhs.__str_);
-    __p = const_cast<char_type*>(__str_.data());
-    if (__rbinp != -1)
-        this->setg(__p + __rbinp, __p + __rninp, __p + __reinp);
-    else
-        this->setg(nullptr, nullptr, nullptr);
-    if (__rbout != -1)
-    {
-        this->setp(__p + __rbout, __p + __reout);
-        this->pbump(__rnout);
-    }
-    else
-        this->setp(nullptr, nullptr);
-    __hm_ = __rhm == -1 ? nullptr : __p + __rhm;
-    __p = const_cast<char_type*>(__rhs.__str_.data());
-    if (__lbinp != -1)
-        __rhs.setg(__p + __lbinp, __p + __lninp, __p + __leinp);
-    else
-        __rhs.setg(nullptr, nullptr, nullptr);
-    if (__lbout != -1)
-    {
-        __rhs.setp(__p + __lbout, __p + __leout);
-        __rhs.pbump(__lnout);
-    }
-    else
-        __rhs.setp(nullptr, nullptr);
-    __rhs.__hm_ = __lhm == -1 ? nullptr : __p + __lhm;
-    locale __tl = __rhs.getloc();
-    __rhs.pubimbue(this->getloc());
-    this->pubimbue(__tl);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_stringbuf<_CharT, _Traits, _Allocator>& __x,
-     basic_stringbuf<_CharT, _Traits, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-basic_stringbuf<_CharT, _Traits, _Allocator>::str() const
-{
-    if (__mode_ & ios_base::out)
-    {
-        if (__hm_ < this->pptr())
-            __hm_ = this->pptr();
-        return string_type(this->pbase(), __hm_, __str_.get_allocator());
-    }
-    else if (__mode_ & ios_base::in)
-        return string_type(this->eback(), this->egptr(), __str_.get_allocator());
-    return string_type(__str_.get_allocator());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_stringbuf<_CharT, _Traits, _Allocator>::str(const string_type& __s)
-{
-    __str_ = __s;
-    __hm_ = 0;
-    if (__mode_ & ios_base::in)
-    {
-        __hm_ = const_cast<char_type*>(__str_.data()) + __str_.size();
-        this->setg(const_cast<char_type*>(__str_.data()),
-                   const_cast<char_type*>(__str_.data()),
-                   __hm_);
-    }
-    if (__mode_ & ios_base::out)
-    {
-        typename string_type::size_type __sz = __str_.size();
-        __hm_ = const_cast<char_type*>(__str_.data()) + __sz;
-        __str_.resize(__str_.capacity());
-        this->setp(const_cast<char_type*>(__str_.data()),
-                   const_cast<char_type*>(__str_.data()) + __str_.size());
-        if (__mode_ & (ios_base::app | ios_base::ate))
-            this->pbump(__sz);
-    }
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::int_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::underflow()
-{
-    if (__hm_ < this->pptr())
-        __hm_ = this->pptr();
-    if (__mode_ & ios_base::in)
-    {
-        if (this->egptr() < __hm_)
-            this->setg(this->eback(), this->gptr(), __hm_);
-        if (this->gptr() < this->egptr())
-            return traits_type::to_int_type(*this->gptr());
-    }
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::int_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::pbackfail(int_type __c)
-{
-    if (__hm_ < this->pptr())
-        __hm_ = this->pptr();
-    if (this->eback() < this->gptr())
-    {
-        if (traits_type::eq_int_type(__c, traits_type::eof()))
-        {
-            this->setg(this->eback(), this->gptr()-1, __hm_);
-            return traits_type::not_eof(__c);
-        }
-        if ((__mode_ & ios_base::out) ||
-            traits_type::eq(traits_type::to_char_type(__c), this->gptr()[-1]))
-        {
-            this->setg(this->eback(), this->gptr()-1, __hm_);
-            *this->gptr() = traits_type::to_char_type(__c);
-            return __c;
-        }
-    }
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::int_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::overflow(int_type __c)
-{
-    if (!traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        ptrdiff_t __ninp = this->gptr()  - this->eback();
-        if (this->pptr() == this->epptr())
-        {
-            if (!(__mode_ & ios_base::out))
-                return traits_type::eof();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            try
-            {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                ptrdiff_t __nout = this->pptr()  - this->pbase();
-                ptrdiff_t __hm = __hm_ - this->pbase();
-                __str_.push_back(char_type());
-                __str_.resize(__str_.capacity());
-                char_type* __p = const_cast<char_type*>(__str_.data());
-                this->setp(__p, __p + __str_.size());
-                this->pbump(__nout);
-                __hm_ = this->pbase() + __hm;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            }
-            catch (...)
-            {
-                return traits_type::eof();
-            }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        }
-        __hm_ = _VSTD::max(this->pptr() + 1, __hm_);
-        if (__mode_ & ios_base::in)
-        {
-            char_type* __p = const_cast<char_type*>(__str_.data());
-            this->setg(__p, __p + __ninp, __hm_);
-        }
-        return this->sputc(__c);
-    }
-    return traits_type::not_eof(__c);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::pos_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::seekoff(off_type __off,
-                                                      ios_base::seekdir __way,
-                                                      ios_base::openmode __wch)
-{
-    if (__hm_ < this->pptr())
-        __hm_ = this->pptr();
-    if ((__wch & (ios_base::in | ios_base::out)) == 0)
-        return pos_type(-1);
-    if ((__wch & (ios_base::in | ios_base::out)) == (ios_base::in | ios_base::out)
-        && __way == ios_base::cur)
-        return pos_type(-1);
-    off_type __noff;
-    switch (__way)
-    {
-    case ios_base::beg:
-        __noff = 0;
-        break;
-    case ios_base::cur:
-        if (__wch & ios_base::in)
-            __noff = this->gptr() - this->eback();
-        else
-            __noff = this->pptr() - this->pbase();
-        break;
-    case ios_base::end:
-        __noff = __hm_ - __str_.data();
-        break;
-    default:
-        return pos_type(-1);
-    }
-    __noff += __off;
-    if (__noff < 0 || __hm_ - __str_.data() < __noff)
-        return pos_type(-1);
-    if (__noff != 0)
-    {
-        if ((__wch & ios_base::in) && this->gptr() == 0)
-            return pos_type(-1);
-        if ((__wch & ios_base::out) && this->pptr() == 0)
-            return pos_type(-1);
-    }
-    if (__wch & ios_base::in)
-        this->setg(this->eback(), this->eback() + __noff, __hm_);
-    if (__wch & ios_base::out)
-    {
-        this->setp(this->pbase(), this->epptr());
-        this->pbump(__noff);
-    }
-    return pos_type(__noff);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::pos_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::seekpos(pos_type __sp,
-                                                      ios_base::openmode __wch)
-{
-    return seekoff(__sp, ios_base::beg, __wch);
-}
-
-// basic_istringstream
-
-template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_istringstream
-    : public basic_istream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef _Allocator                     allocator_type;
-
-    typedef basic_string<char_type, traits_type, allocator_type> string_type;
-
-private:
-    basic_stringbuf<char_type, traits_type, allocator_type> __sb_;
-
-public:
-    // 27.8.2.1 Constructors:
-    explicit basic_istringstream(ios_base::openmode __wch = ios_base::in);
-    explicit basic_istringstream(const string_type& __s,
-                                 ios_base::openmode __wch = ios_base::in);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_istringstream(basic_istringstream&& __rhs);
-
-    // 27.8.2.2 Assign and swap:
-    basic_istringstream& operator=(basic_istringstream&& __rhs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void swap(basic_istringstream& __rhs);
-
-    // 27.8.2.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    string_type str() const;
-    void str(const string_type& __s);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istringstream<_CharT, _Traits, _Allocator>::basic_istringstream(ios_base::openmode __wch)
-    : basic_istream<_CharT, _Traits>(&__sb_),
-      __sb_(__wch | ios_base::in)
-{
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istringstream<_CharT, _Traits, _Allocator>::basic_istringstream(const string_type& __s,
-                                                                      ios_base::openmode __wch)
-    : basic_istream<_CharT, _Traits>(&__sb_),
-      __sb_(__s, __wch | ios_base::in)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istringstream<_CharT, _Traits, _Allocator>::basic_istringstream(basic_istringstream&& __rhs)
-    : basic_istream<_CharT, _Traits>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_istringstream<_CharT, _Traits, _Allocator>&
-basic_istringstream<_CharT, _Traits, _Allocator>::operator=(basic_istringstream&& __rhs)
-{
-    basic_istream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_istringstream<_CharT, _Traits, _Allocator>::swap(basic_istringstream& __rhs)
-{
-    basic_istream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_istringstream<_CharT, _Traits, _Allocator>& __x,
-     basic_istringstream<_CharT, _Traits, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>*
-basic_istringstream<_CharT, _Traits, _Allocator>::rdbuf() const
-{
-    return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-basic_istringstream<_CharT, _Traits, _Allocator>::str() const
-{
-    return __sb_.str();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_istringstream<_CharT, _Traits, _Allocator>::str(const string_type& __s)
-{
-    __sb_.str(__s);
-}
-
-// basic_ostringstream
-
-template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_ostringstream
-    : public basic_ostream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef _Allocator                     allocator_type;
-
-    typedef basic_string<char_type, traits_type, allocator_type> string_type;
-
-private:
-    basic_stringbuf<char_type, traits_type, allocator_type> __sb_;
-
-public:
-    // 27.8.2.1 Constructors:
-    explicit basic_ostringstream(ios_base::openmode __wch = ios_base::out);
-    explicit basic_ostringstream(const string_type& __s,
-                                 ios_base::openmode __wch = ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ostringstream(basic_ostringstream&& __rhs);
-
-    // 27.8.2.2 Assign and swap:
-    basic_ostringstream& operator=(basic_ostringstream&& __rhs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void swap(basic_ostringstream& __rhs);
-
-    // 27.8.2.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    string_type str() const;
-    void str(const string_type& __s);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostringstream<_CharT, _Traits, _Allocator>::basic_ostringstream(ios_base::openmode __wch)
-    : basic_ostream<_CharT, _Traits>(&__sb_),
-      __sb_(__wch | ios_base::out)
-{
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostringstream<_CharT, _Traits, _Allocator>::basic_ostringstream(const string_type& __s,
-                                                                      ios_base::openmode __wch)
-    : basic_ostream<_CharT, _Traits>(&__sb_),
-      __sb_(__s, __wch | ios_base::out)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostringstream<_CharT, _Traits, _Allocator>::basic_ostringstream(basic_ostringstream&& __rhs)
-    : basic_ostream<_CharT, _Traits>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    basic_ostream<_CharT, _Traits>::set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_ostringstream<_CharT, _Traits, _Allocator>&
-basic_ostringstream<_CharT, _Traits, _Allocator>::operator=(basic_ostringstream&& __rhs)
-{
-    basic_ostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ostringstream<_CharT, _Traits, _Allocator>::swap(basic_ostringstream& __rhs)
-{
-    basic_ostream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_ostringstream<_CharT, _Traits, _Allocator>& __x,
-     basic_ostringstream<_CharT, _Traits, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>*
-basic_ostringstream<_CharT, _Traits, _Allocator>::rdbuf() const
-{
-    return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-basic_ostringstream<_CharT, _Traits, _Allocator>::str() const
-{
-    return __sb_.str();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ostringstream<_CharT, _Traits, _Allocator>::str(const string_type& __s)
-{
-    __sb_.str(__s);
-}
-
-// basic_stringstream
-
-template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_stringstream
-    : public basic_iostream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef _Allocator                     allocator_type;
-
-    typedef basic_string<char_type, traits_type, allocator_type> string_type;
-
-private:
-    basic_stringbuf<char_type, traits_type, allocator_type> __sb_;
-
-public:
-    // 27.8.2.1 Constructors:
-    explicit basic_stringstream(ios_base::openmode __wch = ios_base::in | ios_base::out);
-    explicit basic_stringstream(const string_type& __s,
-                                ios_base::openmode __wch = ios_base::in | ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_stringstream(basic_stringstream&& __rhs);
-
-    // 27.8.2.2 Assign and swap:
-    basic_stringstream& operator=(basic_stringstream&& __rhs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void swap(basic_stringstream& __rhs);
-
-    // 27.8.2.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    string_type str() const;
-    void str(const string_type& __s);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringstream<_CharT, _Traits, _Allocator>::basic_stringstream(ios_base::openmode __wch)
-    : basic_iostream<_CharT, _Traits>(&__sb_),
-      __sb_(__wch)
-{
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringstream<_CharT, _Traits, _Allocator>::basic_stringstream(const string_type& __s,
-                                                                    ios_base::openmode __wch)
-    : basic_iostream<_CharT, _Traits>(&__sb_),
-      __sb_(__s, __wch)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringstream<_CharT, _Traits, _Allocator>::basic_stringstream(basic_stringstream&& __rhs)
-    : basic_iostream<_CharT, _Traits>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_stringstream<_CharT, _Traits, _Allocator>&
-basic_stringstream<_CharT, _Traits, _Allocator>::operator=(basic_stringstream&& __rhs)
-{
-    basic_iostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_stringstream<_CharT, _Traits, _Allocator>::swap(basic_stringstream& __rhs)
-{
-    basic_iostream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_stringstream<_CharT, _Traits, _Allocator>& __x,
-     basic_stringstream<_CharT, _Traits, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>*
-basic_stringstream<_CharT, _Traits, _Allocator>::rdbuf() const
-{
-    return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-basic_stringstream<_CharT, _Traits, _Allocator>::str() const
-{
-    return __sb_.str();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_stringstream<_CharT, _Traits, _Allocator>::str(const string_type& __s)
-{
-    __sb_.str(__s);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SSTREAM
diff --git a/include.new/c++/v1/stack b/include.new/c++/v1/stack
deleted file mode 100644
index 30909c1..0000000
--- a/include.new/c++/v1/stack
+++ /dev/null
@@ -1,292 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- stack -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STACK
-#define _LIBCPP_STACK
-
-/*
-    stack synopsis
-
-namespace std
-{
-
-template <class T, class Container = deque<T>>
-class stack
-{
-public:
-    typedef Container                                container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-
-public:
-    stack() = default;
-    ~stack() = default;
-
-    stack(const stack& q) = default;
-    stack(stack&& q) = default;
-
-    stack& operator=(const stack& q) = default;
-    stack& operator=(stack&& q) = default;
-
-    explicit stack(const container_type& c);
-    explicit stack(container_type&& c);
-    template <class Alloc> explicit stack(const Alloc& a);
-    template <class Alloc> stack(const container_type& c, const Alloc& a);
-    template <class Alloc> stack(container_type&& c, const Alloc& a);
-    template <class Alloc> stack(const stack& c, const Alloc& a);
-    template <class Alloc> stack(stack&& c, const Alloc& a);
-
-    bool empty() const;
-    size_type size() const;
-    reference top();
-    const_reference top() const;
-
-    void push(const value_type& x);
-    void push(value_type&& x);
-    template <class... Args> void emplace(Args&&... args);
-    void pop();
-
-    void swap(stack& c) noexcept(noexcept(swap(c, q.c)));
-};
-
-template <class T, class Container>
-  bool operator==(const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator< (const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator!=(const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator> (const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator>=(const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator<=(const stack<T, Container>& x, const stack<T, Container>& y);
-
-template <class T, class Container>
-  void swap(stack<T, Container>& x, stack<T, Container>& y)
-  noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <deque>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _Container> class _LIBCPP_TYPE_VIS_ONLY stack;
-
-template <class _Tp, class _Container>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y);
-
-template <class _Tp, class _Container>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y);
-
-template <class _Tp, class _Container = deque<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY stack
-{
-public:
-    typedef _Container                               container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    stack()
-        _NOEXCEPT_(is_nothrow_default_constructible<container_type>::value)
-        : c() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    stack(const stack& __q) : c(__q.c) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    stack(stack&& __q)
-        _NOEXCEPT_(is_nothrow_move_constructible<container_type>::value)
-        : c(_VSTD::move(__q.c)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    stack& operator=(const stack& __q) {c = __q.c; return *this;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    stack& operator=(stack&& __q)
-        _NOEXCEPT_(is_nothrow_move_assignable<container_type>::value)
-        {c = _VSTD::move(__q.c); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit stack(const container_type& __c) : c(__c) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit stack(container_type&& __c) : c(_VSTD::move(__c)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit stack(const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(__a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        stack(const container_type& __c, const _Alloc& __a,
-              typename enable_if<uses_allocator<container_type,
-                                                _Alloc>::value>::type* = 0)
-            : c(__c, __a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        stack(const stack& __s, const _Alloc& __a,
-              typename enable_if<uses_allocator<container_type,
-                                                _Alloc>::value>::type* = 0)
-            : c(__s.c, __a) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        stack(container_type&& __c, const _Alloc& __a,
-              typename enable_if<uses_allocator<container_type,
-                                                _Alloc>::value>::type* = 0)
-            : c(_VSTD::move(__c), __a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        stack(stack&& __s, const _Alloc& __a,
-              typename enable_if<uses_allocator<container_type,
-                                                _Alloc>::value>::type* = 0)
-            : c(_VSTD::move(__s.c), __a) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty()     const      {return c.empty();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const      {return c.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    reference top()             {return c.back();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference top() const {return c.back();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void push(const value_type& __v) {c.push_back(__v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void push(value_type&& __v) {c.push_back(_VSTD::move(__v));}
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void emplace(_Args&&... __args)
-        {c.emplace_back(_VSTD::forward<_Args>(__args)...);}
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void pop() {c.pop_back();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(stack& __s)
-        _NOEXCEPT_(__is_nothrow_swappable<container_type>::value)
-    {
-        using _VSTD::swap;
-        swap(c, __s.c);
-    }
-
-    template <class T1, class _C1>
-    friend
-    bool
-    operator==(const stack<T1, _C1>& __x, const stack<T1, _C1>& __y);
-
-    template <class T1, class _C1>
-    friend
-    bool
-    operator< (const stack<T1, _C1>& __x, const stack<T1, _C1>& __y);
-};
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return __x.c == __y.c;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return __x.c < __y.c;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(stack<_Tp, _Container>& __x, stack<_Tp, _Container>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Tp, class _Container, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<stack<_Tp, _Container>, _Alloc>
-    : public uses_allocator<_Container, _Alloc>
-{
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_STACK
diff --git a/include.new/c++/v1/stdexcept b/include.new/c++/v1/stdexcept
deleted file mode 100644
index f251806..0000000
--- a/include.new/c++/v1/stdexcept
+++ /dev/null
@@ -1,170 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- stdexcept --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STDEXCEPT
-#define _LIBCPP_STDEXCEPT
-
-/*
-    stdexcept synopsis
-
-namespace std
-{
-
-class logic_error;
-    class domain_error;
-    class invalid_argument;
-    class length_error;
-    class out_of_range;
-class runtime_error;
-    class range_error;
-    class overflow_error;
-    class underflow_error;
-
-for each class xxx_error:
-
-class xxx_error : public exception // at least indirectly
-{
-public:
-    explicit xxx_error(const string& what_arg);
-    explicit xxx_error(const char*   what_arg);
-
-    virtual const char* what() const noexcept // returns what_arg
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <exception>
-#include <iosfwd>  // for string forward decl
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifndef _LIBCPP___REFSTRING
-_LIBCPP_BEGIN_NAMESPACE_STD
-class _LIBCPP_HIDDEN __libcpp_refstring {
-    const char *__imp_ _LIBCPP_UNUSED;
-};
-_LIBCPP_END_NAMESPACE_STD
-#endif
-
-namespace std  // purposefully not using versioning namespace
-{
-
-class _LIBCPP_EXCEPTION_ABI logic_error
-    : public exception
-{
-private:
-    _VSTD::__libcpp_refstring __imp_;
-public:
-    explicit logic_error(const string&);
-    explicit logic_error(const char*);
-
-    logic_error(const logic_error&) _NOEXCEPT;
-    logic_error& operator=(const logic_error&) _NOEXCEPT;
-
-    virtual ~logic_error() _NOEXCEPT;
-
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI runtime_error
-    : public exception
-{
-private:
-    _VSTD::__libcpp_refstring __imp_;
-public:
-    explicit runtime_error(const string&);
-    explicit runtime_error(const char*);
-
-    runtime_error(const runtime_error&) _NOEXCEPT;
-    runtime_error& operator=(const runtime_error&) _NOEXCEPT;
-
-    virtual ~runtime_error() _NOEXCEPT;
-
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI domain_error
-    : public logic_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit domain_error(const string& __s) : logic_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit domain_error(const char* __s)   : logic_error(__s) {}
-
-    virtual ~domain_error() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI invalid_argument
-    : public logic_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit invalid_argument(const string& __s) : logic_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit invalid_argument(const char* __s)   : logic_error(__s) {}
-
-    virtual ~invalid_argument() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI length_error
-    : public logic_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit length_error(const string& __s) : logic_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit length_error(const char* __s)   : logic_error(__s) {}
-
-    virtual ~length_error() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI out_of_range
-    : public logic_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit out_of_range(const string& __s) : logic_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit out_of_range(const char* __s)   : logic_error(__s) {}
-
-    virtual ~out_of_range() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI range_error
-    : public runtime_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit range_error(const string& __s) : runtime_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit range_error(const char* __s)   : runtime_error(__s) {}
-
-    virtual ~range_error() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI overflow_error
-    : public runtime_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit overflow_error(const string& __s) : runtime_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit overflow_error(const char* __s)   : runtime_error(__s) {}
-
-    virtual ~overflow_error() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI underflow_error
-    : public runtime_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit underflow_error(const string& __s) : runtime_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit underflow_error(const char* __s)   : runtime_error(__s) {}
-
-    virtual ~underflow_error() _NOEXCEPT;
-};
-
-}  // std
-
-#endif  // _LIBCPP_STDEXCEPT
diff --git a/include.new/c++/v1/streambuf b/include.new/c++/v1/streambuf
deleted file mode 100644
index 6adfc92..0000000
--- a/include.new/c++/v1/streambuf
+++ /dev/null
@@ -1,564 +0,0 @@
-// -*- C++ -*-
-//===------------------------- streambuf ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STEAMBUF
-#define _LIBCPP_STEAMBUF
-
-/*
-    streambuf synopsis
-
-namespace std
-{
-
-template <class charT, class traits = char_traits<charT> >
-class basic_streambuf
-{
-public:
-    // types:
-    typedef charT char_type;
-    typedef traits traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    virtual ~basic_streambuf();
-
-    // 27.6.2.2.1 locales:
-    locale pubimbue(const locale& loc);
-    locale getloc() const;
-
-    // 27.6.2.2.2 buffer and positioning:
-    basic_streambuf* pubsetbuf(char_type* s, streamsize n);
-    pos_type pubseekoff(off_type off, ios_base::seekdir way,
-                        ios_base::openmode which = ios_base::in | ios_base::out);
-    pos_type pubseekpos(pos_type sp,
-                        ios_base::openmode which = ios_base::in | ios_base::out);
-    int pubsync();
-
-    // Get and put areas:
-    // 27.6.2.2.3 Get area:
-    streamsize in_avail();
-    int_type snextc();
-    int_type sbumpc();
-    int_type sgetc();
-    streamsize sgetn(char_type* s, streamsize n);
-
-    // 27.6.2.2.4 Putback:
-    int_type sputbackc(char_type c);
-    int_type sungetc();
-
-    // 27.6.2.2.5 Put area:
-    int_type sputc(char_type c);
-    streamsize sputn(const char_type* s, streamsize n);
-
-protected:
-    basic_streambuf();
-    basic_streambuf(const basic_streambuf& rhs);
-    basic_streambuf& operator=(const basic_streambuf& rhs);
-    void swap(basic_streambuf& rhs);
-
-    // 27.6.2.3.2 Get area:
-    char_type* eback() const;
-    char_type* gptr() const;
-    char_type* egptr() const;
-    void gbump(int n);
-    void setg(char_type* gbeg, char_type* gnext, char_type* gend);
-
-    // 27.6.2.3.3 Put area:
-    char_type* pbase() const;
-    char_type* pptr() const;
-    char_type* epptr() const;
-    void pbump(int n);
-    void setp(char_type* pbeg, char_type* pend);
-
-    // 27.6.2.4 virtual functions:
-    // 27.6.2.4.1 Locales:
-    virtual void imbue(const locale& loc);
-
-    // 27.6.2.4.2 Buffer management and positioning:
-    virtual basic_streambuf* setbuf(char_type* s, streamsize n);
-    virtual pos_type seekoff(off_type off, ios_base::seekdir way,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type sp,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual int sync();
-
-    // 27.6.2.4.3 Get area:
-    virtual streamsize showmanyc();
-    virtual streamsize xsgetn(char_type* s, streamsize n);
-    virtual int_type underflow();
-    virtual int_type uflow();
-
-    // 27.6.2.4.4 Putback:
-    virtual int_type pbackfail(int_type c = traits_type::eof());
-
-    // 27.6.2.4.5 Put area:
-    virtual streamsize xsputn(const char_type* s, streamsize n);
-    virtual int_type overflow (int_type c = traits_type::eof());
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iosfwd>
-#include <ios>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_streambuf
-{
-public:
-    // types:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    virtual ~basic_streambuf();
-
-    // 27.6.2.2.1 locales:
-    locale pubimbue(const locale& __loc);
-    locale getloc() const;
-
-    // 27.6.2.2.2 buffer and positioning:
-    basic_streambuf* pubsetbuf(char_type* __s, streamsize __n);
-    pos_type pubseekoff(off_type __off, ios_base::seekdir __way,
-                        ios_base::openmode __which = ios_base::in | ios_base::out);
-    pos_type pubseekpos(pos_type __sp,
-                        ios_base::openmode __which = ios_base::in | ios_base::out);
-    int pubsync();
-
-    // Get and put areas:
-    // 27.6.2.2.3 Get area:
-    streamsize in_avail();
-    int_type snextc();
-    int_type sbumpc();
-    int_type sgetc();
-    streamsize sgetn(char_type* __s, streamsize __n);
-
-    // 27.6.2.2.4 Putback:
-    int_type sputbackc(char_type __c);
-    int_type sungetc();
-
-    // 27.6.2.2.5 Put area:
-    int_type sputc(char_type __c);
-    streamsize sputn(const char_type* __s, streamsize __n);
-
-protected:
-    basic_streambuf();
-    basic_streambuf(const basic_streambuf& __rhs);
-    basic_streambuf& operator=(const basic_streambuf& __rhs);
-    void swap(basic_streambuf& __rhs);
-
-    // 27.6.2.3.2 Get area:
-    _LIBCPP_ALWAYS_INLINE char_type* eback() const {return __binp_;}
-    _LIBCPP_ALWAYS_INLINE char_type* gptr()  const {return __ninp_;}
-    _LIBCPP_ALWAYS_INLINE char_type* egptr() const {return __einp_;}
-    void gbump(int __n);
-    void setg(char_type* __gbeg, char_type* __gnext, char_type* __gend);
-
-    // 27.6.2.3.3 Put area:
-    _LIBCPP_ALWAYS_INLINE char_type* pbase() const {return __bout_;}
-    _LIBCPP_ALWAYS_INLINE char_type* pptr()  const {return __nout_;}
-    _LIBCPP_ALWAYS_INLINE char_type* epptr() const {return __eout_;}
-    void pbump(int __n);
-    void setp(char_type* __pbeg, char_type* __pend);
-
-    // 27.6.2.4 virtual functions:
-    // 27.6.2.4.1 Locales:
-    virtual void imbue(const locale& __loc);
-
-    // 27.6.2.4.2 Buffer management and positioning:
-    virtual basic_streambuf* setbuf(char_type* __s, streamsize __n);
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __which = ios_base::in | ios_base::out);
-    virtual int sync();
-
-    // 27.6.2.4.3 Get area:
-    virtual streamsize showmanyc();
-    virtual streamsize xsgetn(char_type* __s, streamsize __n);
-    virtual int_type underflow();
-    virtual int_type uflow();
-
-    // 27.6.2.4.4 Putback:
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-
-    // 27.6.2.4.5 Put area:
-    virtual streamsize xsputn(const char_type* __s, streamsize __n);
-    virtual int_type overflow(int_type __c = traits_type::eof());
-
-private:
-    locale __loc_;
-    char_type* __binp_;
-    char_type* __ninp_;
-    char_type* __einp_;
-    char_type* __bout_;
-    char_type* __nout_;
-    char_type* __eout_;
-};
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>::~basic_streambuf()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-locale
-basic_streambuf<_CharT, _Traits>::pubimbue(const locale& __loc)
-{
-    imbue(__loc);
-    locale __r = __loc_;
-    __loc_ = __loc;
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-locale
-basic_streambuf<_CharT, _Traits>::getloc() const
-{
-    return __loc_;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_streambuf<_CharT, _Traits>*
-basic_streambuf<_CharT, _Traits>::pubsetbuf(char_type* __s, streamsize __n)
-{
-    return setbuf(__s, __n);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::pubseekoff(off_type __off,
-                                             ios_base::seekdir __way,
-                                             ios_base::openmode __which)
-{
-    return seekoff(__off, __way, __which);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::pubseekpos(pos_type __sp,
-                                             ios_base::openmode __which)
-{
-    return seekpos(__sp, __which);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-int
-basic_streambuf<_CharT, _Traits>::pubsync()
-{
-    return sync();
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-basic_streambuf<_CharT, _Traits>::in_avail()
-{
-    if (__ninp_ < __einp_)
-        return static_cast<streamsize>(__einp_ - __ninp_);
-    return showmanyc();
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::snextc()
-{
-    if (sbumpc() == traits_type::eof())
-        return traits_type::eof();
-    return sgetc();
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sbumpc()
-{
-    if (__ninp_ == __einp_)
-        return uflow();
-    return traits_type::to_int_type(*__ninp_++);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sgetc()
-{
-    if (__ninp_ == __einp_)
-        return underflow();
-    return traits_type::to_int_type(*__ninp_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-basic_streambuf<_CharT, _Traits>::sgetn(char_type* __s, streamsize __n)
-{
-    return xsgetn(__s, __n);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sputbackc(char_type __c)
-{
-    if (__binp_ == __ninp_ || !traits_type::eq(__c, __ninp_[-1]))
-        return pbackfail(traits_type::to_int_type(__c));
-    return traits_type::to_int_type(*--__ninp_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sungetc()
-{
-    if (__binp_ == __ninp_)
-        return pbackfail();
-    return traits_type::to_int_type(*--__ninp_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sputc(char_type __c)
-{
-    if (__nout_ == __eout_)
-        return overflow(traits_type::to_int_type(__c));
-    *__nout_++ = __c;
-    return traits_type::to_int_type(__c);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-basic_streambuf<_CharT, _Traits>::sputn(const char_type* __s, streamsize __n)
-{
-    return xsputn(__s, __n);
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>::basic_streambuf()
-    : __binp_(0),
-      __ninp_(0),
-      __einp_(0),
-      __bout_(0),
-      __nout_(0),
-      __eout_(0)
-{
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>::basic_streambuf(const basic_streambuf& __sb)
-    : __loc_(__sb.__loc_),
-      __binp_(__sb.__binp_),
-      __ninp_(__sb.__ninp_),
-      __einp_(__sb.__einp_),
-      __bout_(__sb.__bout_),
-      __nout_(__sb.__nout_),
-      __eout_(__sb.__eout_)
-{
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>&
-basic_streambuf<_CharT, _Traits>::operator=(const basic_streambuf& __sb)
-{
-    __loc_ = __sb.__loc_;
-    __binp_ = __sb.__binp_;
-    __ninp_ = __sb.__ninp_;
-    __einp_ = __sb.__einp_;
-    __bout_ = __sb.__bout_;
-    __nout_ = __sb.__nout_;
-    __eout_ = __sb.__eout_;
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_streambuf<_CharT, _Traits>::swap(basic_streambuf& __sb)
-{
-    _VSTD::swap(__loc_, __sb.__loc_);
-    _VSTD::swap(__binp_, __sb.__binp_);
-    _VSTD::swap(__ninp_, __sb.__ninp_);
-    _VSTD::swap(__einp_, __sb.__einp_);
-    _VSTD::swap(__bout_, __sb.__bout_);
-    _VSTD::swap(__nout_, __sb.__nout_);
-    _VSTD::swap(__eout_, __sb.__eout_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_streambuf<_CharT, _Traits>::gbump(int __n)
-{
-    __ninp_ += __n;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_streambuf<_CharT, _Traits>::setg(char_type* __gbeg, char_type* __gnext,
-                                                          char_type* __gend)
-{
-    __binp_ = __gbeg;
-    __ninp_ = __gnext;
-    __einp_ = __gend;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_streambuf<_CharT, _Traits>::pbump(int __n)
-{
-    __nout_ += __n;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_streambuf<_CharT, _Traits>::setp(char_type* __pbeg, char_type* __pend)
-{
-    __bout_ = __nout_ = __pbeg;
-    __eout_ = __pend;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_streambuf<_CharT, _Traits>::imbue(const locale&)
-{
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>*
-basic_streambuf<_CharT, _Traits>::setbuf(char_type*, streamsize)
-{
-    return this;
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::seekoff(off_type, ios_base::seekdir,
-                                          ios_base::openmode)
-{
-    return pos_type(off_type(-1));
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::seekpos(pos_type, ios_base::openmode)
-{
-    return pos_type(off_type(-1));
-}
-
-template <class _CharT, class _Traits>
-int
-basic_streambuf<_CharT, _Traits>::sync()
-{
-    return 0;
-}
-
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::showmanyc()
-{
-    return 0;
-}
-
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::xsgetn(char_type* __s, streamsize __n)
-{
-    const int_type __eof = traits_type::eof();
-    int_type __c;
-    streamsize __i = 0;
-    for (;__i < __n; ++__i, ++__s)
-    {
-        if (__ninp_ < __einp_)
-            *__s = *__ninp_++;
-        else if ((__c = uflow()) != __eof)
-            *__s = traits_type::to_char_type(__c);
-        else
-            break;
-    }
-    return __i;
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::underflow()
-{
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::uflow()
-{
-    if (underflow() == traits_type::eof())
-        return traits_type::eof();
-    return traits_type::to_int_type(*__ninp_++);
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::pbackfail(int_type)
-{
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::xsputn(const char_type* __s, streamsize __n)
-{
-    streamsize __i = 0;
-    int_type __eof = traits_type::eof();
-    for (; __i < __n; ++__s, ++__i)
-    {
-        if (__nout_ < __eout_)
-            *__nout_++ = *__s;
-        else if (overflow(traits_type::to_int_type(*__s)) == __eof)
-            break;
-    }
-    return __i;
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::overflow(int_type)
-{
-    return traits_type::eof();
-}
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_streambuf<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_streambuf<wchar_t>)
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ios<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ios<wchar_t>)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_STEAMBUF
diff --git a/include.new/c++/v1/string b/include.new/c++/v1/string
deleted file mode 100644
index fe42bbf..0000000
--- a/include.new/c++/v1/string
+++ /dev/null
@@ -1,4249 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- string -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STRING
-#define _LIBCPP_STRING
-
-/*
-    string synopsis
-
-namespace std
-{
-
-template <class stateT>
-class fpos
-{
-private:
-    stateT st;
-public:
-    fpos(streamoff = streamoff());
-
-    operator streamoff() const;
-
-    stateT state() const;
-    void state(stateT);
-
-    fpos& operator+=(streamoff);
-    fpos  operator+ (streamoff) const;
-    fpos& operator-=(streamoff);
-    fpos  operator- (streamoff) const;
-};
-
-template <class stateT> streamoff operator-(const fpos<stateT>& x, const fpos<stateT>& y);
-
-template <class stateT> bool operator==(const fpos<stateT>& x, const fpos<stateT>& y);
-template <class stateT> bool operator!=(const fpos<stateT>& x, const fpos<stateT>& y);
-
-template <class charT>
-struct char_traits
-{
-    typedef charT     char_type;
-    typedef ...       int_type;
-    typedef streamoff off_type;
-    typedef streampos pos_type;
-    typedef mbstate_t state_type;
-
-    static void assign(char_type& c1, const char_type& c2) noexcept;
-    static constexpr bool eq(char_type c1, char_type c2) noexcept;
-    static constexpr bool lt(char_type c1, char_type c2) noexcept;
-
-    static int              compare(const char_type* s1, const char_type* s2, size_t n);
-    static size_t           length(const char_type* s);
-    static const char_type* find(const char_type* s, size_t n, const char_type& a);
-    static char_type*       move(char_type* s1, const char_type* s2, size_t n);
-    static char_type*       copy(char_type* s1, const char_type* s2, size_t n);
-    static char_type*       assign(char_type* s, size_t n, char_type a);
-
-    static constexpr int_type  not_eof(int_type c) noexcept;
-    static constexpr char_type to_char_type(int_type c) noexcept;
-    static constexpr int_type  to_int_type(char_type c) noexcept;
-    static constexpr bool      eq_int_type(int_type c1, int_type c2) noexcept;
-    static constexpr int_type  eof() noexcept;
-};
-
-template <> struct char_traits<char>;
-template <> struct char_traits<wchar_t>;
-
-template<class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_string
-{
-public:
-// types:
-    typedef traits traits_type;
-    typedef typename traits_type::char_type value_type;
-    typedef Allocator allocator_type;
-    typedef typename allocator_type::size_type size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::reference reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::pointer pointer;
-    typedef typename allocator_type::const_pointer const_pointer;
-    typedef implementation-defined iterator;
-    typedef implementation-defined const_iterator;
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    static const size_type npos = -1;
-
-    basic_string()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit basic_string(const allocator_type& a);
-    basic_string(const basic_string& str);
-    basic_string(basic_string&& str)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    basic_string(const basic_string& str, size_type pos, size_type n = npos,
-                 const allocator_type& a = allocator_type());
-    basic_string(const value_type* s, const allocator_type& a = allocator_type());
-    basic_string(const value_type* s, size_type n, const allocator_type& a = allocator_type());
-    basic_string(size_type n, value_type c, const allocator_type& a = allocator_type());
-    template<class InputIterator>
-        basic_string(InputIterator begin, InputIterator end,
-                     const allocator_type& a = allocator_type());
-    basic_string(initializer_list<value_type>, const Allocator& = Allocator());
-    basic_string(const basic_string&, const Allocator&);
-    basic_string(basic_string&&, const Allocator&);
-
-    ~basic_string();
-
-    basic_string& operator=(const basic_string& str);
-    basic_string& operator=(basic_string&& str)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    basic_string& operator=(const value_type* s);
-    basic_string& operator=(value_type c);
-    basic_string& operator=(initializer_list<value_type>);
-
-    iterator       begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator       end() noexcept;
-    const_iterator end() const noexcept;
-
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-
-    const_iterator         cbegin() const noexcept;
-    const_iterator         cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
-
-    size_type size() const noexcept;
-    size_type length() const noexcept;
-    size_type max_size() const noexcept;
-    size_type capacity() const noexcept;
-
-    void resize(size_type n, value_type c);
-    void resize(size_type n);
-
-    void reserve(size_type res_arg = 0);
-    void shrink_to_fit();
-    void clear() noexcept;
-    bool empty() const noexcept;
-
-    const_reference operator[](size_type pos) const;
-    reference       operator[](size_type pos);
-
-    const_reference at(size_type n) const;
-    reference       at(size_type n);
-
-    basic_string& operator+=(const basic_string& str);
-    basic_string& operator+=(const value_type* s);
-    basic_string& operator+=(value_type c);
-    basic_string& operator+=(initializer_list<value_type>);
-
-    basic_string& append(const basic_string& str);
-    basic_string& append(const basic_string& str, size_type pos, size_type n=npos); //C++14
-    basic_string& append(const value_type* s, size_type n);
-    basic_string& append(const value_type* s);
-    basic_string& append(size_type n, value_type c);
-    template<class InputIterator>
-        basic_string& append(InputIterator first, InputIterator last);
-    basic_string& append(initializer_list<value_type>);
-
-    void push_back(value_type c);
-    void pop_back();
-    reference       front();
-    const_reference front() const;
-    reference       back();
-    const_reference back() const;
-
-    basic_string& assign(const basic_string& str);
-    basic_string& assign(basic_string&& str);
-    basic_string& assign(const basic_string& str, size_type pos, size_type n=npos); // C++14
-    basic_string& assign(const value_type* s, size_type n);
-    basic_string& assign(const value_type* s);
-    basic_string& assign(size_type n, value_type c);
-    template<class InputIterator>
-        basic_string& assign(InputIterator first, InputIterator last);
-    basic_string& assign(initializer_list<value_type>);
-
-    basic_string& insert(size_type pos1, const basic_string& str);
-    basic_string& insert(size_type pos1, const basic_string& str,
-                         size_type pos2, size_type n);
-    basic_string& insert(size_type pos, const value_type* s, size_type n=npos); //C++14
-    basic_string& insert(size_type pos, const value_type* s);
-    basic_string& insert(size_type pos, size_type n, value_type c);
-    iterator      insert(const_iterator p, value_type c);
-    iterator      insert(const_iterator p, size_type n, value_type c);
-    template<class InputIterator>
-        iterator insert(const_iterator p, InputIterator first, InputIterator last);
-    iterator      insert(const_iterator p, initializer_list<value_type>);
-
-    basic_string& erase(size_type pos = 0, size_type n = npos);
-    iterator      erase(const_iterator position);
-    iterator      erase(const_iterator first, const_iterator last);
-
-    basic_string& replace(size_type pos1, size_type n1, const basic_string& str);
-    basic_string& replace(size_type pos1, size_type n1, const basic_string& str,
-                          size_type pos2, size_type n2=npos); // C++14
-    basic_string& replace(size_type pos, size_type n1, const value_type* s, size_type n2);
-    basic_string& replace(size_type pos, size_type n1, const value_type* s);
-    basic_string& replace(size_type pos, size_type n1, size_type n2, value_type c);
-    basic_string& replace(const_iterator i1, const_iterator i2, const basic_string& str);
-    basic_string& replace(const_iterator i1, const_iterator i2, const value_type* s, size_type n);
-    basic_string& replace(const_iterator i1, const_iterator i2, const value_type* s);
-    basic_string& replace(const_iterator i1, const_iterator i2, size_type n, value_type c);
-    template<class InputIterator>
-        basic_string& replace(const_iterator i1, const_iterator i2, InputIterator j1, InputIterator j2);
-    basic_string& replace(const_iterator i1, const_iterator i2, initializer_list<value_type>);
-
-    size_type copy(value_type* s, size_type n, size_type pos = 0) const;
-    basic_string substr(size_type pos = 0, size_type n = npos) const;
-
-    void swap(basic_string& str)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value)
-
-    const value_type* c_str() const noexcept;
-    const value_type* data() const noexcept;
-
-    allocator_type get_allocator() const noexcept;
-
-    size_type find(const basic_string& str, size_type pos = 0) const noexcept;
-    size_type find(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find(const value_type* s, size_type pos = 0) const noexcept;
-    size_type find(value_type c, size_type pos = 0) const noexcept;
-
-    size_type rfind(const basic_string& str, size_type pos = npos) const noexcept;
-    size_type rfind(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type rfind(const value_type* s, size_type pos = npos) const noexcept;
-    size_type rfind(value_type c, size_type pos = npos) const noexcept;
-
-    size_type find_first_of(const basic_string& str, size_type pos = 0) const noexcept;
-    size_type find_first_of(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find_first_of(const value_type* s, size_type pos = 0) const noexcept;
-    size_type find_first_of(value_type c, size_type pos = 0) const noexcept;
-
-    size_type find_last_of(const basic_string& str, size_type pos = npos) const noexcept;
-    size_type find_last_of(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find_last_of(const value_type* s, size_type pos = npos) const noexcept;
-    size_type find_last_of(value_type c, size_type pos = npos) const noexcept;
-
-    size_type find_first_not_of(const basic_string& str, size_type pos = 0) const noexcept;
-    size_type find_first_not_of(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find_first_not_of(const value_type* s, size_type pos = 0) const noexcept;
-    size_type find_first_not_of(value_type c, size_type pos = 0) const noexcept;
-
-    size_type find_last_not_of(const basic_string& str, size_type pos = npos) const noexcept;
-    size_type find_last_not_of(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find_last_not_of(const value_type* s, size_type pos = npos) const noexcept;
-    size_type find_last_not_of(value_type c, size_type pos = npos) const noexcept;
-
-    int compare(const basic_string& str) const noexcept;
-    int compare(size_type pos1, size_type n1, const basic_string& str) const;
-    int compare(size_type pos1, size_type n1, const basic_string& str,
-                size_type pos2, size_type n2=npos) const; // C++14
-    int compare(const value_type* s) const noexcept;
-    int compare(size_type pos1, size_type n1, const value_type* s) const;
-    int compare(size_type pos1, size_type n1, const value_type* s, size_type n2) const;
-
-    bool __invariants() const;
-};
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(const basic_string<charT, traits, Allocator>& lhs,
-          const basic_string<charT, traits, Allocator>& rhs);
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(const charT* lhs , const basic_string<charT,traits,Allocator>&rhs);
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(charT lhs, const basic_string<charT,traits,Allocator>& rhs);
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs);
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(const basic_string<charT, traits, Allocator>& lhs, charT rhs);
-
-template<class charT, class traits, class Allocator>
-bool operator==(const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator==(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator==(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator!=(const basic_string<charT,traits,Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator!=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator!=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator< (const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator< (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator< (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator> (const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator> (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator> (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator<=(const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator<=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator<=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator>=(const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator>=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator>=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-void swap(basic_string<charT, traits, Allocator>& lhs,
-          basic_string<charT, traits, Allocator>& rhs)
-            noexcept(noexcept(lhs.swap(rhs)));
-
-template<class charT, class traits, class Allocator>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is, basic_string<charT, traits, Allocator>& str);
-
-template<class charT, class traits, class Allocator>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os, const basic_string<charT, traits, Allocator>& str);
-
-template<class charT, class traits, class Allocator>
-basic_istream<charT, traits>&
-getline(basic_istream<charT, traits>& is, basic_string<charT, traits, Allocator>& str,
-        charT delim);
-
-template<class charT, class traits, class Allocator>
-basic_istream<charT, traits>&
-getline(basic_istream<charT, traits>& is, basic_string<charT, traits, Allocator>& str);
-
-typedef basic_string<char>    string;
-typedef basic_string<wchar_t> wstring;
-typedef basic_string<char16_t> u16string;
-typedef basic_string<char32_t> u32string;
-
-int                stoi  (const string& str, size_t* idx = 0, int base = 10);
-long               stol  (const string& str, size_t* idx = 0, int base = 10);
-unsigned long      stoul (const string& str, size_t* idx = 0, int base = 10);
-long long          stoll (const string& str, size_t* idx = 0, int base = 10);
-unsigned long long stoull(const string& str, size_t* idx = 0, int base = 10);
-
-float       stof (const string& str, size_t* idx = 0);
-double      stod (const string& str, size_t* idx = 0);
-long double stold(const string& str, size_t* idx = 0);
-
-string to_string(int val);
-string to_string(unsigned val);
-string to_string(long val);
-string to_string(unsigned long val);
-string to_string(long long val);
-string to_string(unsigned long long val);
-string to_string(float val);
-string to_string(double val);
-string to_string(long double val);
-
-int                stoi  (const wstring& str, size_t* idx = 0, int base = 10);
-long               stol  (const wstring& str, size_t* idx = 0, int base = 10);
-unsigned long      stoul (const wstring& str, size_t* idx = 0, int base = 10);
-long long          stoll (const wstring& str, size_t* idx = 0, int base = 10);
-unsigned long long stoull(const wstring& str, size_t* idx = 0, int base = 10);
-
-float       stof (const wstring& str, size_t* idx = 0);
-double      stod (const wstring& str, size_t* idx = 0);
-long double stold(const wstring& str, size_t* idx = 0);
-
-wstring to_wstring(int val);
-wstring to_wstring(unsigned val);
-wstring to_wstring(long val);
-wstring to_wstring(unsigned long val);
-wstring to_wstring(long long val);
-wstring to_wstring(unsigned long long val);
-wstring to_wstring(float val);
-wstring to_wstring(double val);
-wstring to_wstring(long double val);
-
-template <> struct hash<string>;
-template <> struct hash<u16string>;
-template <> struct hash<u32string>;
-template <> struct hash<wstring>;
-
-basic_string<char>     operator "" s( const char *str,     size_t len ); // C++14
-basic_string<wchar_t>  operator "" s( const wchar_t *str,  size_t len ); // C++14
-basic_string<char16_t> operator "" s( const char16_t *str, size_t len ); // C++14
-basic_string<char32_t> operator "" s( const char32_t *str, size_t len ); // C++14
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iosfwd>
-#include <cstring>
-#include <cstdio>  // For EOF.
-#include <cwchar>
-#include <algorithm>
-#include <iterator>
-#include <utility>
-#include <memory>
-#include <stdexcept>
-#include <type_traits>
-#include <initializer_list>
-#include <__functional_base>
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-#include <cstdint>
-#endif
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-#include <cassert>
-#endif
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// fpos
-
-template <class _StateT>
-class _LIBCPP_TYPE_VIS_ONLY fpos
-{
-private:
-    _StateT __st_;
-    streamoff __off_;
-public:
-    _LIBCPP_INLINE_VISIBILITY fpos(streamoff __off = streamoff()) : __st_(), __off_(__off) {}
-
-    _LIBCPP_INLINE_VISIBILITY operator streamoff() const {return __off_;}
-
-    _LIBCPP_INLINE_VISIBILITY _StateT state() const {return __st_;}
-    _LIBCPP_INLINE_VISIBILITY void state(_StateT __st) {__st_ = __st;}
-
-    _LIBCPP_INLINE_VISIBILITY fpos& operator+=(streamoff __off) {__off_ += __off; return *this;}
-    _LIBCPP_INLINE_VISIBILITY fpos  operator+ (streamoff __off) const {fpos __t(*this); __t += __off; return __t;}
-    _LIBCPP_INLINE_VISIBILITY fpos& operator-=(streamoff __off) {__off_ -= __off; return *this;}
-    _LIBCPP_INLINE_VISIBILITY fpos  operator- (streamoff __off) const {fpos __t(*this); __t -= __off; return __t;}
-};
-
-template <class _StateT>
-inline _LIBCPP_INLINE_VISIBILITY
-streamoff operator-(const fpos<_StateT>& __x, const fpos<_StateT>& __y)
-    {return streamoff(__x) - streamoff(__y);}
-
-template <class _StateT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator==(const fpos<_StateT>& __x, const fpos<_StateT>& __y)
-    {return streamoff(__x) == streamoff(__y);}
-
-template <class _StateT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator!=(const fpos<_StateT>& __x, const fpos<_StateT>& __y)
-    {return streamoff(__x) != streamoff(__y);}
-
-// char_traits
-
-template <class _CharT>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits
-{
-    typedef _CharT    char_type;
-    typedef int       int_type;
-    typedef streamoff off_type;
-    typedef streampos pos_type;
-    typedef mbstate_t state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 < __c2;}
-
-    static int              compare(const char_type* __s1, const char_type* __s2, size_t __n);
-    static size_t           length(const char_type* __s);
-    static const char_type* find(const char_type* __s, size_t __n, const char_type& __a);
-    static char_type*       move(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       copy(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       assign(char_type* __s, size_t __n, char_type __a);
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type  to_int_type(char_type __c) _NOEXCEPT
-        {return int_type(__c);}
-    static inline _LIBCPP_CONSTEXPR bool      eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type  eof() _NOEXCEPT
-        {return int_type(EOF);}
-};
-
-template <class _CharT>
-int
-char_traits<_CharT>::compare(const char_type* __s1, const char_type* __s2, size_t __n)
-{
-    for (; __n; --__n, ++__s1, ++__s2)
-    {
-        if (lt(*__s1, *__s2))
-            return -1;
-        if (lt(*__s2, *__s1))
-            return 1;
-    }
-    return 0;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-char_traits<_CharT>::length(const char_type* __s)
-{
-    size_t __len = 0;
-    for (; !eq(*__s, char_type(0)); ++__s)
-        ++__len;
-    return __len;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-const _CharT*
-char_traits<_CharT>::find(const char_type* __s, size_t __n, const char_type& __a)
-{
-    for (; __n; --__n)
-    {
-        if (eq(*__s, __a))
-            return __s;
-        ++__s;
-    }
-    return 0;
-}
-
-template <class _CharT>
-_CharT*
-char_traits<_CharT>::move(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    char_type* __r = __s1;
-    if (__s1 < __s2)
-    {
-        for (; __n; --__n, ++__s1, ++__s2)
-            assign(*__s1, *__s2);
-    }
-    else if (__s2 < __s1)
-    {
-        __s1 += __n;
-        __s2 += __n;
-        for (; __n; --__n)
-            assign(*--__s1, *--__s2);
-    }
-    return __r;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT*
-char_traits<_CharT>::copy(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-    char_type* __r = __s1;
-    for (; __n; --__n, ++__s1, ++__s2)
-        assign(*__s1, *__s2);
-    return __r;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT*
-char_traits<_CharT>::assign(char_type* __s, size_t __n, char_type __a)
-{
-    char_type* __r = __s;
-    for (; __n; --__n, ++__s)
-        assign(*__s, __a);
-    return __r;
-}
-
-// char_traits<char>
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits<char>
-{
-    typedef char      char_type;
-    typedef int       int_type;
-    typedef streamoff off_type;
-    typedef streampos pos_type;
-    typedef mbstate_t state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-            {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return (unsigned char)__c1 < (unsigned char)__c2;}
-
-    static inline int compare(const char_type* __s1, const char_type* __s2, size_t __n)
-        {return memcmp(__s1, __s2, __n);}
-    static inline size_t length(const char_type* __s) {return strlen(__s);}
-    static inline const char_type* find(const char_type* __s, size_t __n, const char_type& __a)
-        {return (const char_type*)memchr(__s, to_int_type(__a), __n);}
-    static inline char_type* move(char_type* __s1, const char_type* __s2, size_t __n)
-        {return (char_type*)memmove(__s1, __s2, __n);}
-    static inline char_type* copy(char_type* __s1, const char_type* __s2, size_t __n)
-        {
-            _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-            return (char_type*)memcpy(__s1, __s2, __n);
-        }
-    static inline char_type* assign(char_type* __s, size_t __n, char_type __a)
-        {return (char_type*)memset(__s, to_int_type(__a), __n);}
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type to_int_type(char_type __c) _NOEXCEPT
-        {return int_type((unsigned char)__c);}
-    static inline _LIBCPP_CONSTEXPR bool eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type  eof() _NOEXCEPT
-        {return int_type(EOF);}
-};
-
-// char_traits<wchar_t>
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits<wchar_t>
-{
-    typedef wchar_t   char_type;
-    typedef wint_t    int_type;
-    typedef streamoff off_type;
-    typedef streampos pos_type;
-    typedef mbstate_t state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 < __c2;}
-
-    static inline int compare(const char_type* __s1, const char_type* __s2, size_t __n)
-        {return wmemcmp(__s1, __s2, __n);}
-    static inline size_t length(const char_type* __s)
-        {return wcslen(__s);}
-    static inline const char_type* find(const char_type* __s, size_t __n, const char_type& __a)
-        {return (const char_type*)wmemchr(__s, __a, __n);}
-    static inline char_type* move(char_type* __s1, const char_type* __s2, size_t __n)
-        {return (char_type*)wmemmove(__s1, __s2, __n);}
-    static inline char_type* copy(char_type* __s1, const char_type* __s2, size_t __n)
-        {
-            _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-            return (char_type*)wmemcpy(__s1, __s2, __n);
-        }
-    static inline char_type* assign(char_type* __s, size_t __n, char_type __a)
-        {return (char_type*)wmemset(__s, __a, __n);}
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type to_int_type(char_type __c) _NOEXCEPT
-        {return int_type(__c);}
-    static inline _LIBCPP_CONSTEXPR bool eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type eof() _NOEXCEPT
-        {return int_type(WEOF);}
-};
-
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits<char16_t>
-{
-    typedef char16_t       char_type;
-    typedef uint_least16_t int_type;
-    typedef streamoff      off_type;
-    typedef u16streampos   pos_type;
-    typedef mbstate_t      state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 < __c2;}
-
-    static int              compare(const char_type* __s1, const char_type* __s2, size_t __n);
-    static size_t           length(const char_type* __s);
-    static const char_type* find(const char_type* __s, size_t __n, const char_type& __a);
-    static char_type*       move(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       copy(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       assign(char_type* __s, size_t __n, char_type __a);
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type to_int_type(char_type __c) _NOEXCEPT
-        {return int_type(__c);}
-    static inline _LIBCPP_CONSTEXPR bool eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type eof() _NOEXCEPT
-        {return int_type(0xDFFF);}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-int
-char_traits<char16_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n)
-{
-    for (; __n; --__n, ++__s1, ++__s2)
-    {
-        if (lt(*__s1, *__s2))
-            return -1;
-        if (lt(*__s2, *__s1))
-            return 1;
-    }
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-char_traits<char16_t>::length(const char_type* __s)
-{
-    size_t __len = 0;
-    for (; !eq(*__s, char_type(0)); ++__s)
-        ++__len;
-    return __len;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-const char16_t*
-char_traits<char16_t>::find(const char_type* __s, size_t __n, const char_type& __a)
-{
-    for (; __n; --__n)
-    {
-        if (eq(*__s, __a))
-            return __s;
-        ++__s;
-    }
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char16_t*
-char_traits<char16_t>::move(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    char_type* __r = __s1;
-    if (__s1 < __s2)
-    {
-        for (; __n; --__n, ++__s1, ++__s2)
-            assign(*__s1, *__s2);
-    }
-    else if (__s2 < __s1)
-    {
-        __s1 += __n;
-        __s2 += __n;
-        for (; __n; --__n)
-            assign(*--__s1, *--__s2);
-    }
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char16_t*
-char_traits<char16_t>::copy(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-    char_type* __r = __s1;
-    for (; __n; --__n, ++__s1, ++__s2)
-        assign(*__s1, *__s2);
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char16_t*
-char_traits<char16_t>::assign(char_type* __s, size_t __n, char_type __a)
-{
-    char_type* __r = __s;
-    for (; __n; --__n, ++__s)
-        assign(*__s, __a);
-    return __r;
-}
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits<char32_t>
-{
-    typedef char32_t       char_type;
-    typedef uint_least32_t int_type;
-    typedef streamoff      off_type;
-    typedef u32streampos   pos_type;
-    typedef mbstate_t      state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 < __c2;}
-
-    static int              compare(const char_type* __s1, const char_type* __s2, size_t __n);
-    static size_t           length(const char_type* __s);
-    static const char_type* find(const char_type* __s, size_t __n, const char_type& __a);
-    static char_type*       move(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       copy(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       assign(char_type* __s, size_t __n, char_type __a);
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type to_int_type(char_type __c) _NOEXCEPT
-        {return int_type(__c);}
-    static inline _LIBCPP_CONSTEXPR bool eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type eof() _NOEXCEPT
-        {return int_type(0xFFFFFFFF);}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-int
-char_traits<char32_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n)
-{
-    for (; __n; --__n, ++__s1, ++__s2)
-    {
-        if (lt(*__s1, *__s2))
-            return -1;
-        if (lt(*__s2, *__s1))
-            return 1;
-    }
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-char_traits<char32_t>::length(const char_type* __s)
-{
-    size_t __len = 0;
-    for (; !eq(*__s, char_type(0)); ++__s)
-        ++__len;
-    return __len;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-const char32_t*
-char_traits<char32_t>::find(const char_type* __s, size_t __n, const char_type& __a)
-{
-    for (; __n; --__n)
-    {
-        if (eq(*__s, __a))
-            return __s;
-        ++__s;
-    }
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char32_t*
-char_traits<char32_t>::move(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    char_type* __r = __s1;
-    if (__s1 < __s2)
-    {
-        for (; __n; --__n, ++__s1, ++__s2)
-            assign(*__s1, *__s2);
-    }
-    else if (__s2 < __s1)
-    {
-        __s1 += __n;
-        __s2 += __n;
-        for (; __n; --__n)
-            assign(*--__s1, *--__s2);
-    }
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char32_t*
-char_traits<char32_t>::copy(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-    char_type* __r = __s1;
-    for (; __n; --__n, ++__s1, ++__s2)
-        assign(*__s1, *__s2);
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char32_t*
-char_traits<char32_t>::assign(char_type* __s, size_t __n, char_type __a)
-{
-    char_type* __r = __s;
-    for (; __n; --__n, ++__s)
-        assign(*__s, __a);
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-// helper fns for basic_string
-
-// __str_find
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find(const _CharT *__p, _SizeT __sz, 
-             _CharT __c, _SizeT __pos) _NOEXCEPT
-{
-    if (__pos >= __sz)
-        return __npos;
-    const _CharT* __r = _Traits::find(__p + __pos, __sz - __pos, __c);
-    if (__r == 0)
-        return __npos;
-    return static_cast<_SizeT>(__r - __p);
-}
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find(const _CharT *__p, _SizeT __sz, 
-       const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    if (__pos > __sz || __sz - __pos < __n)
-        return __npos;
-    if (__n == 0)
-        return __pos;
-    const _CharT* __r = 
-        _VSTD::__search(__p + __pos, __p + __sz,
-                        __s, __s + __n, _Traits::eq,
-                        random_access_iterator_tag(), random_access_iterator_tag());
-    if (__r == __p + __sz)
-        return __npos;
-    return static_cast<_SizeT>(__r - __p);
-}
-
-
-// __str_rfind
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_rfind(const _CharT *__p, _SizeT __sz, 
-              _CharT __c, _SizeT __pos) _NOEXCEPT
-{
-    if (__sz < 1)
-        return __npos;
-    if (__pos < __sz)
-        ++__pos;
-    else
-        __pos = __sz;
-    for (const _CharT* __ps = __p + __pos; __ps != __p;)
-    {
-        if (_Traits::eq(*--__ps, __c))
-            return static_cast<_SizeT>(__ps - __p);
-    }
-    return __npos;
-}
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_rfind(const _CharT *__p, _SizeT __sz, 
-        const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    __pos = _VSTD::min(__pos, __sz);
-    if (__n < __sz - __pos)
-        __pos += __n;
-    else
-        __pos = __sz;
-    const _CharT* __r = _VSTD::__find_end(
-                  __p, __p + __pos, __s, __s + __n, _Traits::eq, 
-                        random_access_iterator_tag(), random_access_iterator_tag());
-    if (__n > 0 && __r == __p + __pos)
-        return __npos;
-    return static_cast<_SizeT>(__r - __p);
-}
-
-// __str_find_first_of
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_first_of(const _CharT *__p, _SizeT __sz,
-                const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    if (__pos >= __sz || __n == 0)
-        return __npos;
-    const _CharT* __r = _VSTD::__find_first_of_ce
-        (__p + __pos, __p + __sz, __s, __s + __n, _Traits::eq );
-    if (__r == __p + __sz)
-        return __npos;
-    return static_cast<_SizeT>(__r - __p);
-}
-
-
-// __str_find_last_of
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY 
-__str_find_last_of(const _CharT *__p, _SizeT __sz,
-               const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-    {
-    if (__n != 0)
-    {
-        if (__pos < __sz)
-            ++__pos;
-        else
-            __pos = __sz;
-        for (const _CharT* __ps = __p + __pos; __ps != __p;)
-        {
-            const _CharT* __r = _Traits::find(__s, __n, *--__ps);
-            if (__r)
-                return static_cast<_SizeT>(__ps - __p);
-        }
-    }
-    return __npos;
-}
-
-
-// __str_find_first_not_of
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_first_not_of(const _CharT *__p, _SizeT __sz,
-                    const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    if (__pos < __sz)
-    {
-        const _CharT* __pe = __p + __sz;
-        for (const _CharT* __ps = __p + __pos; __ps != __pe; ++__ps)
-            if (_Traits::find(__s, __n, *__ps) == 0)
-                return static_cast<_SizeT>(__ps - __p);
-    }
-    return __npos;
-}
-
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_first_not_of(const _CharT *__p, _SizeT __sz,
-                          _CharT __c, _SizeT __pos) _NOEXCEPT
-{
-    if (__pos < __sz)
-    {
-        const _CharT* __pe = __p + __sz;
-        for (const _CharT* __ps = __p + __pos; __ps != __pe; ++__ps)
-            if (!_Traits::eq(*__ps, __c))
-                return static_cast<_SizeT>(__ps - __p);
-    }
-    return __npos;
-}
-
-
-// __str_find_last_not_of
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_last_not_of(const _CharT *__p, _SizeT __sz,
-                   const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    if (__pos < __sz)
-        ++__pos;
-    else
-        __pos = __sz;
-    for (const _CharT* __ps = __p + __pos; __ps != __p;)
-        if (_Traits::find(__s, __n, *--__ps) == 0)
-            return static_cast<_SizeT>(__ps - __p);
-    return __npos;
-}
-
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_last_not_of(const _CharT *__p, _SizeT __sz,
-                         _CharT __c, _SizeT __pos) _NOEXCEPT
-{
-    if (__pos < __sz)
-        ++__pos;
-    else
-        __pos = __sz;
-    for (const _CharT* __ps = __p + __pos; __ps != __p;)
-        if (!_Traits::eq(*--__ps, __c))
-            return static_cast<_SizeT>(__ps - __p);
-    return __npos;
-}
-
-template<class _Ptr>
-size_t _LIBCPP_INLINE_VISIBILITY __do_string_hash(_Ptr __p, _Ptr __e)
-{
-    typedef typename iterator_traits<_Ptr>::value_type value_type;
-    return __murmur2_or_cityhash<size_t>()(__p, (__e-__p)*sizeof(value_type));
-}
-
-// basic_string
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __x,
-          const basic_string<_CharT, _Traits, _Allocator>& __y);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const _CharT* __x, const basic_string<_CharT,_Traits,_Allocator>& __y);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(_CharT __x, const basic_string<_CharT,_Traits,_Allocator>& __y);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __x, const _CharT* __y);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __x, _CharT __y);
-
-template <bool>
-class _LIBCPP_TYPE_VIS_ONLY __basic_string_common
-{
-protected:
-    void __throw_length_error() const;
-    void __throw_out_of_range() const;
-};
-
-template <bool __b>
-void
-__basic_string_common<__b>::__throw_length_error() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw length_error("basic_string");
-#else
-    assert(!"basic_string length_error");
-#endif
-}
-
-template <bool __b>
-void
-__basic_string_common<__b>::__throw_out_of_range() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw out_of_range("basic_string");
-#else
-    assert(!"basic_string out_of_range");
-#endif
-}
-
-#ifdef _LIBCPP_MSVC
-#pragma warning( push )
-#pragma warning( disable: 4231 )
-#endif // _LIBCPP_MSVC
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS __basic_string_common<true>)
-#ifdef _LIBCPP_MSVC
-#pragma warning( pop )
-#endif // _LIBCPP_MSVC
-
-#ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-template <class _CharT, size_t = sizeof(_CharT)>
-struct __padding
-{
-    unsigned char __xx[sizeof(_CharT)-1];
-};
-
-template <class _CharT>
-struct __padding<_CharT, 1>
-{
-};
-
-#endif  // _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-template<class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_string
-    : private __basic_string_common<true>
-{
-public:
-    typedef basic_string                                 __self;
-    typedef _Traits                                      traits_type;
-    typedef typename traits_type::char_type              value_type;
-    typedef _Allocator                                   allocator_type;
-    typedef allocator_traits<allocator_type>             __alloc_traits;
-    typedef typename __alloc_traits::size_type           size_type;
-    typedef typename __alloc_traits::difference_type     difference_type;
-    typedef value_type&                                  reference;
-    typedef const value_type&                            const_reference;
-    typedef typename __alloc_traits::pointer             pointer;
-    typedef typename __alloc_traits::const_pointer       const_pointer;
-
-    static_assert(is_pod<value_type>::value, "Character type of basic_string must be a POD");
-    static_assert((is_same<_CharT, value_type>::value),
-                  "traits_type::char_type must be the same type as CharT");
-    static_assert((is_same<typename allocator_type::value_type, value_type>::value),
-                  "Allocator::value_type must be same type as value_type");
-#if defined(_LIBCPP_RAW_ITERATORS)
-    typedef pointer                                      iterator;
-    typedef const_pointer                                const_iterator;
-#else  // defined(_LIBCPP_RAW_ITERATORS)
-    typedef __wrap_iter<pointer>                         iterator;
-    typedef __wrap_iter<const_pointer>                   const_iterator;
-#endif  // defined(_LIBCPP_RAW_ITERATORS)
-    typedef _VSTD::reverse_iterator<iterator>             reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>       const_reverse_iterator;
-
-private:
-
-#ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    struct __long
-    {
-        pointer   __data_;
-        size_type __size_;
-        size_type __cap_;
-    };
-
-#if _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x01};
-    enum {__long_mask  = 0x1ul};
-#else  // _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x80};
-    enum {__long_mask  = ~(size_type(~0) >> 1)};
-#endif  // _LIBCPP_BIG_ENDIAN
-
-    enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?
-                      (sizeof(__long) - 1)/sizeof(value_type) : 2};
-
-    struct __short
-    {
-        value_type __data_[__min_cap];
-        struct
-            : __padding<value_type>
-        {
-            unsigned char __size_;
-        };
-    };
-
-#else
-
-    struct __long
-    {
-        size_type __cap_;
-        size_type __size_;
-        pointer   __data_;
-    };
-
-#if _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x80};
-    enum {__long_mask  = ~(size_type(~0) >> 1)};
-#else  // _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x01};
-    enum {__long_mask  = 0x1ul};
-#endif  // _LIBCPP_BIG_ENDIAN
-
-    enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?
-                      (sizeof(__long) - 1)/sizeof(value_type) : 2};
-
-    struct __short
-    {
-        union
-        {
-            unsigned char __size_;
-            value_type __lx;
-        };
-        value_type __data_[__min_cap];
-    };
-
-#endif  // _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    union __ulx{__long __lx; __short __lxx;};
-
-    enum {__n_words = sizeof(__ulx) / sizeof(size_type)};
-
-    struct __raw
-    {
-        size_type __words[__n_words];
-    };
-
-    struct __rep
-    {
-        union
-        {
-            __long  __l;
-            __short __s;
-            __raw   __r;
-        };
-    };
-
-    __compressed_pair<__rep, allocator_type> __r_;
-
-public:
-    static const size_type npos = -1;
-
-    _LIBCPP_INLINE_VISIBILITY basic_string()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY explicit basic_string(const allocator_type& __a);
-    basic_string(const basic_string& __str);
-    basic_string(const basic_string& __str, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(basic_string&& __str)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(basic_string&& __str, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY basic_string(const value_type* __s);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(const value_type* __s, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(const value_type* __s, size_type __n);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(const value_type* __s, size_type __n, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(size_type __n, value_type __c);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(size_type __n, value_type __c, const allocator_type& __a);
-    basic_string(const basic_string& __str, size_type __pos, size_type __n = npos,
-                 const allocator_type& __a = allocator_type());
-    template<class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_string(_InputIterator __first, _InputIterator __last);
-    template<class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(initializer_list<value_type> __il);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    ~basic_string();
-
-    basic_string& operator=(const basic_string& __str);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& operator=(basic_string&& __str)
-        _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-                   is_nothrow_move_assignable<allocator_type>::value);
-#endif
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator=(const value_type* __s) {return assign(__s);}
-    basic_string& operator=(value_type __c);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& operator=(initializer_list<value_type> __il) {return assign(__il.begin(), __il.size());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT
-        {return iterator(this, __get_pointer());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT
-        {return const_iterator(this, __get_pointer());}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT
-        {return iterator(this, __get_pointer() + size());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT
-        {return const_iterator(this, __get_pointer() + size());}
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT
-        {return iterator(__get_pointer());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT
-        {return const_iterator(__get_pointer());}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT
-        {return iterator(__get_pointer() + size());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT
-        {return const_iterator(__get_pointer() + size());}
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rbegin() _NOEXCEPT
-        {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rend() _NOEXCEPT
-        {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT
-        {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT
-        {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT
-        {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY size_type size() const _NOEXCEPT
-        {return __is_long() ? __get_long_size() : __get_short_size();}
-    _LIBCPP_INLINE_VISIBILITY size_type length() const _NOEXCEPT {return size();}
-    _LIBCPP_INLINE_VISIBILITY size_type max_size() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY size_type capacity() const _NOEXCEPT
-        {return (__is_long() ? __get_long_cap() : __min_cap) - 1;}
-
-    void resize(size_type __n, value_type __c);
-    _LIBCPP_INLINE_VISIBILITY void resize(size_type __n) {resize(__n, value_type());}
-
-    void reserve(size_type res_arg = 0);
-    _LIBCPP_INLINE_VISIBILITY
-    void shrink_to_fit() _NOEXCEPT {reserve();}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY bool empty() const _NOEXCEPT {return size() == 0;}
-
-    _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __pos) const;
-    _LIBCPP_INLINE_VISIBILITY reference       operator[](size_type __pos);
-
-    const_reference at(size_type __n) const;
-    reference       at(size_type __n);
-
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator+=(const basic_string& __str) {return append(__str);}
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator+=(const value_type* __s)         {return append(__s);}
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator+=(value_type __c)            {push_back(__c); return *this;}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator+=(initializer_list<value_type> __il) {return append(__il);}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& append(const basic_string& __str);
-    basic_string& append(const basic_string& __str, size_type __pos, size_type __n=npos);
-    basic_string& append(const value_type* __s, size_type __n);
-    basic_string& append(const value_type* __s);
-    basic_string& append(size_type __n, value_type __c);
-    template<class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            basic_string&
-        >::type
-        append(_InputIterator __first, _InputIterator __last);
-    template<class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            basic_string&
-        >::type
-        append(_ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& append(initializer_list<value_type> __il) {return append(__il.begin(), __il.size());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    void push_back(value_type __c);
-    _LIBCPP_INLINE_VISIBILITY
-    void pop_back();
-    _LIBCPP_INLINE_VISIBILITY reference       front();
-    _LIBCPP_INLINE_VISIBILITY const_reference front() const;
-    _LIBCPP_INLINE_VISIBILITY reference       back();
-    _LIBCPP_INLINE_VISIBILITY const_reference back() const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& assign(const basic_string& __str);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& assign(basic_string&& str)
-        {*this = _VSTD::move(str); return *this;}
-#endif
-    basic_string& assign(const basic_string& __str, size_type __pos, size_type __n=npos);
-    basic_string& assign(const value_type* __s, size_type __n);
-    basic_string& assign(const value_type* __s);
-    basic_string& assign(size_type __n, value_type __c);
-    template<class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            basic_string&
-        >::type
-        assign(_InputIterator __first, _InputIterator __last);
-    template<class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            basic_string&
-        >::type
-        assign(_ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& assign(initializer_list<value_type> __il) {return assign(__il.begin(), __il.size());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& insert(size_type __pos1, const basic_string& __str);
-    basic_string& insert(size_type __pos1, const basic_string& __str, size_type __pos2, size_type __n=npos);
-    basic_string& insert(size_type __pos, const value_type* __s, size_type __n);
-    basic_string& insert(size_type __pos, const value_type* __s);
-    basic_string& insert(size_type __pos, size_type __n, value_type __c);
-    iterator      insert(const_iterator __pos, value_type __c);
-    _LIBCPP_INLINE_VISIBILITY
-    iterator      insert(const_iterator __pos, size_type __n, value_type __c);
-    template<class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            iterator
-        >::type
-        insert(const_iterator __pos, _InputIterator __first, _InputIterator __last);
-    template<class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            iterator
-        >::type
-        insert(const_iterator __pos, _ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __pos, initializer_list<value_type> __il)
-                    {return insert(__pos, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    basic_string& erase(size_type __pos = 0, size_type __n = npos);
-    _LIBCPP_INLINE_VISIBILITY
-    iterator      erase(const_iterator __pos);
-    _LIBCPP_INLINE_VISIBILITY
-    iterator      erase(const_iterator __first, const_iterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(size_type __pos1, size_type __n1, const basic_string& __str);
-    basic_string& replace(size_type __pos1, size_type __n1, const basic_string& __str, size_type __pos2, size_type __n2=npos);
-    basic_string& replace(size_type __pos, size_type __n1, const value_type* __s, size_type __n2);
-    basic_string& replace(size_type __pos, size_type __n1, const value_type* __s);
-    basic_string& replace(size_type __pos, size_type __n1, size_type __n2, value_type __c);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, const basic_string& __str);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, const value_type* __s, size_type __n);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, const value_type* __s);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, size_type __n, value_type __c);
-    template<class _InputIterator>
-        typename enable_if
-        <
-            __is_input_iterator<_InputIterator>::value,
-            basic_string&
-        >::type
-        replace(const_iterator __i1, const_iterator __i2, _InputIterator __j1, _InputIterator __j2);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, initializer_list<value_type> __il)
-        {return replace(__i1, __i2, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    size_type copy(value_type* __s, size_type __n, size_type __pos = 0) const;
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string substr(size_type __pos = 0, size_type __n = npos) const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(basic_string& __str)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* c_str() const _NOEXCEPT {return data();}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* data() const _NOEXCEPT  {return _VSTD::__to_raw_pointer(__get_pointer());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __alloc();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;
-    size_type find(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;
-    size_type find(value_type __c, size_type __pos = 0) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type rfind(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;
-    size_type rfind(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type rfind(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;
-    size_type rfind(value_type __c, size_type __pos = npos) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;
-    size_type find_first_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_of(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_of(value_type __c, size_type __pos = 0) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;
-    size_type find_last_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_of(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_of(value_type __c, size_type __pos = npos) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_not_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;
-    size_type find_first_not_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_not_of(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_not_of(value_type __c, size_type __pos = 0) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_not_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;
-    size_type find_last_not_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_not_of(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_not_of(value_type __c, size_type __pos = npos) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const basic_string& __str) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(size_type __pos1, size_type __n1, const basic_string& __str) const;
-    int compare(size_type __pos1, size_type __n1, const basic_string& __str, size_type __pos2, size_type __n2=npos) const;
-    int compare(const value_type* __s) const _NOEXCEPT;
-    int compare(size_type __pos1, size_type __n1, const value_type* __s) const;
-    int compare(size_type __pos1, size_type __n1, const value_type* __s, size_type __n2) const;
-
-    _LIBCPP_INLINE_VISIBILITY bool __invariants() const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __is_long() const _NOEXCEPT
-        {return bool(__r_.first().__s.__size_ & __short_mask);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const;
-    bool __decrementable(const const_iterator* __i) const;
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const;
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type& __alloc() _NOEXCEPT
-        {return __r_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const allocator_type& __alloc() const _NOEXCEPT
-        {return __r_.second();}
-
-#ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_short_size(size_type __s) _NOEXCEPT
-#   if _LIBCPP_BIG_ENDIAN
-        {__r_.first().__s.__size_ = (unsigned char)(__s << 1);}
-#   else
-        {__r_.first().__s.__size_ = (unsigned char)(__s);}
-#   endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __get_short_size() const _NOEXCEPT
-#   if _LIBCPP_BIG_ENDIAN
-        {return __r_.first().__s.__size_ >> 1;}
-#   else
-        {return __r_.first().__s.__size_;}
-#   endif
-
-#else  // _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_short_size(size_type __s) _NOEXCEPT
-#   if _LIBCPP_BIG_ENDIAN
-        {__r_.first().__s.__size_ = (unsigned char)(__s);}
-#   else
-        {__r_.first().__s.__size_ = (unsigned char)(__s << 1);}
-#   endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __get_short_size() const _NOEXCEPT
-#   if _LIBCPP_BIG_ENDIAN
-        {return __r_.first().__s.__size_;}
-#   else
-        {return __r_.first().__s.__size_ >> 1;}
-#   endif
-
-#endif  // _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_long_size(size_type __s) _NOEXCEPT
-        {__r_.first().__l.__size_ = __s;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __get_long_size() const _NOEXCEPT
-        {return __r_.first().__l.__size_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_size(size_type __s) _NOEXCEPT
-        {if (__is_long()) __set_long_size(__s); else __set_short_size(__s);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_long_cap(size_type __s) _NOEXCEPT
-        {__r_.first().__l.__cap_  = __long_mask | __s;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __get_long_cap() const _NOEXCEPT
-        {return __r_.first().__l.__cap_ & size_type(~__long_mask);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_long_pointer(pointer __p) _NOEXCEPT
-        {__r_.first().__l.__data_ = __p;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer __get_long_pointer() _NOEXCEPT
-        {return __r_.first().__l.__data_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const_pointer __get_long_pointer() const _NOEXCEPT
-        {return __r_.first().__l.__data_;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer __get_short_pointer() _NOEXCEPT
-        {return pointer_traits<pointer>::pointer_to(__r_.first().__s.__data_[0]);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_pointer __get_short_pointer() const _NOEXCEPT
-        {return pointer_traits<const_pointer>::pointer_to(__r_.first().__s.__data_[0]);}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer __get_pointer() _NOEXCEPT
-        {return __is_long() ? __get_long_pointer() : __get_short_pointer();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_pointer __get_pointer() const _NOEXCEPT
-        {return __is_long() ? __get_long_pointer() : __get_short_pointer();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __zero() _NOEXCEPT
-        {
-            size_type (&__a)[__n_words] = __r_.first().__r.__words;
-            for (unsigned __i = 0; __i < __n_words; ++__i)
-                __a[__i] = 0;
-        }
-
-    template <size_type __a> static
-        _LIBCPP_INLINE_VISIBILITY
-        size_type __align_it(size_type __s) _NOEXCEPT
-            {return __s + (__a-1) & ~(__a-1);}
-    enum {__alignment = 16};
-    static _LIBCPP_INLINE_VISIBILITY
-    size_type __recommend(size_type __s) _NOEXCEPT
-        {return (__s < __min_cap ? __min_cap :
-                 __align_it<sizeof(value_type) < __alignment ?
-                            __alignment/sizeof(value_type) : 1 > (__s+1)) - 1;}
-
-    void __init(const value_type* __s, size_type __sz, size_type __reserve);
-    void __init(const value_type* __s, size_type __sz);
-    void __init(size_type __n, value_type __c);
-
-    template <class _InputIterator>
-    typename enable_if
-    <
-         __is_input_iterator  <_InputIterator>::value &&
-        !__is_forward_iterator<_InputIterator>::value,
-        void
-    >::type
-    __init(_InputIterator __first, _InputIterator __last);
-
-    template <class _ForwardIterator>
-    typename enable_if
-    <
-        __is_forward_iterator<_ForwardIterator>::value,
-        void
-    >::type
-    __init(_ForwardIterator __first, _ForwardIterator __last);
-
-    void __grow_by(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
-                   size_type __n_copy,  size_type __n_del,     size_type __n_add = 0);
-    void __grow_by_and_replace(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
-                               size_type __n_copy,  size_type __n_del,
-                               size_type __n_add, const value_type* __p_new_stuff);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __erase_to_end(size_type __pos);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const basic_string& __str)
-        {__copy_assign_alloc(__str, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const basic_string& __str, true_type)
-        {
-            if (__alloc() != __str.__alloc())
-            {
-                clear();
-                shrink_to_fit();
-            }
-            __alloc() = __str.__alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const basic_string&, false_type) _NOEXCEPT
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign(basic_string& __str, false_type);
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign(basic_string& __str, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    void
-    __move_assign_alloc(basic_string& __str)
-        _NOEXCEPT_(
-            !__alloc_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<allocator_type>::value)
-    {__move_assign_alloc(__str, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_move_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(basic_string& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(basic_string&, false_type)
-        _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_swap::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<allocator_type>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type&, allocator_type&, false_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY void __invalidate_all_iterators();
-    _LIBCPP_INLINE_VISIBILITY void __invalidate_iterators_past(size_type);
-
-    friend basic_string operator+<>(const basic_string&, const basic_string&);
-    friend basic_string operator+<>(const value_type*, const basic_string&);
-    friend basic_string operator+<>(value_type, const basic_string&);
-    friend basic_string operator+<>(const basic_string&, const value_type*);
-    friend basic_string operator+<>(const basic_string&, value_type);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__invalidate_all_iterators()
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__invalidate_all(this);
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__invalidate_iterators_past(size_type
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                                                                        __pos
-#endif
-                                                                      )
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    if (__c)
-    {
-        const_pointer __new_last = __get_pointer() + __pos;
-        for (__i_node** __p = __c->end_; __p != __c->beg_; )
-        {
-            --__p;
-            const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-            if (__i->base() > __new_last)
-            {
-                (*__p)->__c_ = nullptr;
-                if (--__c->end_ != __p)
-                    memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __get_db()->unlock();
-    }
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string()
-    _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __zero();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a)
-    : __r_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __zero();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_type __sz, size_type __reserve)
-{
-    if (__reserve > max_size())
-        this->__throw_length_error();
-    pointer __p;
-    if (__reserve < __min_cap)
-    {
-        __set_short_size(__sz);
-        __p = __get_short_pointer();
-    }
-    else
-    {
-        size_type __cap = __recommend(__reserve);
-        __p = __alloc_traits::allocate(__alloc(), __cap+1);
-        __set_long_pointer(__p);
-        __set_long_cap(__cap+1);
-        __set_long_size(__sz);
-    }
-    traits_type::copy(_VSTD::__to_raw_pointer(__p), __s, __sz);
-    traits_type::assign(__p[__sz], value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_type __sz)
-{
-    if (__sz > max_size())
-        this->__throw_length_error();
-    pointer __p;
-    if (__sz < __min_cap)
-    {
-        __set_short_size(__sz);
-        __p = __get_short_pointer();
-    }
-    else
-    {
-        size_type __cap = __recommend(__sz);
-        __p = __alloc_traits::allocate(__alloc(), __cap+1);
-        __set_long_pointer(__p);
-        __set_long_cap(__cap+1);
-        __set_long_size(__sz);
-    }
-    traits_type::copy(_VSTD::__to_raw_pointer(__p), __s, __sz);
-    traits_type::assign(__p[__sz], value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*) detected nullptr");
-    __init(__s, traits_type::length(__s));
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const value_type* __s, const allocator_type& __a)
-    : __r_(__a)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*, allocator) detected nullptr");
-    __init(__s, traits_type::length(__s));
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const value_type* __s, size_type __n)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "basic_string(const char*, n) detected nullptr");
-    __init(__s, __n);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const value_type* __s, size_type __n, const allocator_type& __a)
-    : __r_(__a)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "basic_string(const char*, n, allocator) detected nullptr");
-    __init(__s, __n);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str)
-    : __r_(__alloc_traits::select_on_container_copy_construction(__str.__alloc()))
-{
-    if (!__str.__is_long())
-        __r_.first().__r = __str.__r_.first().__r;
-    else
-        __init(_VSTD::__to_raw_pointer(__str.__get_long_pointer()), __str.__get_long_size());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str, const allocator_type& __a)
-    : __r_(__a)
-{
-    if (!__str.__is_long())
-        __r_.first().__r = __str.__r_.first().__r;
-    else
-        __init(_VSTD::__to_raw_pointer(__str.__get_long_pointer()), __str.__get_long_size());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(basic_string&& __str)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __r_(_VSTD::move(__str.__r_))
-{
-    __str.__zero();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    if (__is_long())
-        __get_db()->swap(this, &__str);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(basic_string&& __str, const allocator_type& __a)
-    : __r_(__a)
-{
-    if (__str.__is_long() && __a != __str.__alloc()) // copy, not move
-        __init(_VSTD::__to_raw_pointer(__str.__get_long_pointer()), __str.__get_long_size());
-    else
-    {
-        __r_.first().__r = __str.__r_.first().__r;
-        __str.__zero();
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    if (__is_long())
-        __get_db()->swap(this, &__str);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__init(size_type __n, value_type __c)
-{
-    if (__n > max_size())
-        this->__throw_length_error();
-    pointer __p;
-    if (__n < __min_cap)
-    {
-        __set_short_size(__n);
-        __p = __get_short_pointer();
-    }
-    else
-    {
-        size_type __cap = __recommend(__n);
-        __p = __alloc_traits::allocate(__alloc(), __cap+1);
-        __set_long_pointer(__p);
-        __set_long_cap(__cap+1);
-        __set_long_size(__n);
-    }
-    traits_type::assign(_VSTD::__to_raw_pointer(__p), __n, __c);
-    traits_type::assign(__p[__n], value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, value_type __c)
-{
-    __init(__n, __c);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, value_type __c, const allocator_type& __a)
-    : __r_(__a)
-{
-    __init(__n, __c);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str, size_type __pos, size_type __n,
-                                                        const allocator_type& __a)
-    : __r_(__a)
-{
-    size_type __str_sz = __str.size();
-    if (__pos > __str_sz)
-        this->__throw_out_of_range();
-    __init(__str.data() + __pos, _VSTD::min(__n, __str_sz - __pos));
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    void
->::type
-basic_string<_CharT, _Traits, _Allocator>::__init(_InputIterator __first, _InputIterator __last)
-{
-    __zero();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        if (__is_long())
-            __alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap());
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    void
->::type
-basic_string<_CharT, _Traits, _Allocator>::__init(_ForwardIterator __first, _ForwardIterator __last)
-{
-    size_type __sz = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__sz > max_size())
-        this->__throw_length_error();
-    pointer __p;
-    if (__sz < __min_cap)
-    {
-        __set_short_size(__sz);
-        __p = __get_short_pointer();
-    }
-    else
-    {
-        size_type __cap = __recommend(__sz);
-        __p = __alloc_traits::allocate(__alloc(), __cap+1);
-        __set_long_pointer(__p);
-        __set_long_cap(__cap+1);
-        __set_long_size(__sz);
-    }
-    for (; __first != __last; ++__first, (void) ++__p)
-        traits_type::assign(*__p, *__first);
-    traits_type::assign(*__p, value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last)
-{
-    __init(__first, __last);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last,
-                                                        const allocator_type& __a)
-    : __r_(__a)
-{
-    __init(__first, __last);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(initializer_list<value_type> __il)
-{
-    __init(__il.begin(), __il.end());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(initializer_list<value_type> __il, const allocator_type& __a)
-    : __r_(__a)
-{
-    __init(__il.begin(), __il.end());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::~basic_string()
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__erase_c(this);
-#endif
-    if (__is_long())
-        __alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__grow_by_and_replace
-    (size_type __old_cap, size_type __delta_cap, size_type __old_sz,
-     size_type __n_copy,  size_type __n_del,     size_type __n_add, const value_type* __p_new_stuff)
-{
-    size_type __ms = max_size();
-    if (__delta_cap > __ms - __old_cap - 1)
-        this->__throw_length_error();
-    pointer __old_p = __get_pointer();
-    size_type __cap = __old_cap < __ms / 2 - __alignment ?
-                          __recommend(_VSTD::max(__old_cap + __delta_cap, 2 * __old_cap)) :
-                          __ms - 1;
-    pointer __p = __alloc_traits::allocate(__alloc(), __cap+1);
-    __invalidate_all_iterators();
-    if (__n_copy != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p),
-                          _VSTD::__to_raw_pointer(__old_p), __n_copy);
-    if (__n_add != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p) + __n_copy, __p_new_stuff, __n_add);
-    size_type __sec_cp_sz = __old_sz - __n_del - __n_copy;
-    if (__sec_cp_sz != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p) + __n_copy + __n_add,
-                          _VSTD::__to_raw_pointer(__old_p) + __n_copy + __n_del, __sec_cp_sz);
-    if (__old_cap+1 != __min_cap)
-        __alloc_traits::deallocate(__alloc(), __old_p, __old_cap+1);
-    __set_long_pointer(__p);
-    __set_long_cap(__cap+1);
-    __old_sz = __n_copy + __n_add + __sec_cp_sz;
-    __set_long_size(__old_sz);
-    traits_type::assign(__p[__old_sz], value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__grow_by(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
-                                                     size_type __n_copy,  size_type __n_del,     size_type __n_add)
-{
-    size_type __ms = max_size();
-    if (__delta_cap > __ms - __old_cap)
-        this->__throw_length_error();
-    pointer __old_p = __get_pointer();
-    size_type __cap = __old_cap < __ms / 2 - __alignment ?
-                          __recommend(_VSTD::max(__old_cap + __delta_cap, 2 * __old_cap)) :
-                          __ms - 1;
-    pointer __p = __alloc_traits::allocate(__alloc(), __cap+1);
-    __invalidate_all_iterators();
-    if (__n_copy != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p),
-                          _VSTD::__to_raw_pointer(__old_p), __n_copy);
-    size_type __sec_cp_sz = __old_sz - __n_del - __n_copy;
-    if (__sec_cp_sz != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p) + __n_copy + __n_add,
-                          _VSTD::__to_raw_pointer(__old_p) + __n_copy + __n_del,
-                          __sec_cp_sz);
-    if (__old_cap+1 != __min_cap)
-        __alloc_traits::deallocate(__alloc(), __old_p, __old_cap+1);
-    __set_long_pointer(__p);
-    __set_long_cap(__cap+1);
-}
-
-// assign
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s, size_type __n)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::assign received nullptr");
-    size_type __cap = capacity();
-    if (__cap >= __n)
-    {
-        value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-        traits_type::move(__p, __s, __n);
-        traits_type::assign(__p[__n], value_type());
-        __set_size(__n);
-        __invalidate_iterators_past(__n);
-    }
-    else
-    {
-        size_type __sz = size();
-        __grow_by_and_replace(__cap, __n - __cap, __sz, 0, __sz, __n, __s);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c)
-{
-    size_type __cap = capacity();
-    if (__cap < __n)
-    {
-        size_type __sz = size();
-        __grow_by(__cap, __n - __cap, __sz, 0, __sz);
-    }
-    else
-        __invalidate_iterators_past(__n);
-    value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-    traits_type::assign(__p, __n, __c);
-    traits_type::assign(__p[__n], value_type());
-    __set_size(__n);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::operator=(value_type __c)
-{
-    pointer __p;
-    if (__is_long())
-    {
-        __p = __get_long_pointer();
-        __set_long_size(1);
-    }
-    else
-    {
-        __p = __get_short_pointer();
-        __set_short_size(1);
-    }
-    traits_type::assign(*__p, __c);
-    traits_type::assign(*++__p, value_type());
-    __invalidate_iterators_past(1);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str)
-{
-    if (this != &__str)
-    {
-        __copy_assign_alloc(__str);
-        assign(__str);
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, false_type)
-{
-    if (__alloc() != __str.__alloc())
-        assign(__str);
-    else
-        __move_assign(__str, true_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    clear();
-    shrink_to_fit();
-    __r_.first() = __str.__r_.first();
-    __move_assign_alloc(__str);
-    __str.__zero();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::operator=(basic_string&& __str)
-    _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-               is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__str, integral_constant<bool,
-          __alloc_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-#endif
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
-{
-    clear();
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)
-{
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    size_type __cap = capacity();
-    if (__cap < __n)
-    {
-        size_type __sz = size();
-        __grow_by(__cap, __n - __cap, __sz, 0, __sz);
-    }
-    else
-        __invalidate_iterators_past(__n);
-    pointer __p = __get_pointer();
-    for (; __first != __last; ++__first, ++__p)
-        traits_type::assign(*__p, *__first);
-    traits_type::assign(*__p, value_type());
-    __set_size(__n);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(const basic_string& __str)
-{
-    return assign(__str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(const basic_string& __str, size_type __pos, size_type __n)
-{
-    size_type __sz = __str.size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    return assign(__str.data() + __pos, _VSTD::min(__n, __sz - __pos));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::assign received nullptr");
-    return assign(__s, traits_type::length(__s));
-}
-
-// append
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s, size_type __n)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::append received nullptr");
-    size_type __cap = capacity();
-    size_type __sz = size();
-    if (__cap - __sz >= __n)
-    {
-        if (__n)
-        {
-            value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-            traits_type::copy(__p + __sz, __s, __n);
-            __sz += __n;
-            __set_size(__sz);
-            traits_type::assign(__p[__sz], value_type());
-        }
-    }
-    else
-        __grow_by_and_replace(__cap, __sz + __n - __cap, __sz, __sz, 0, __n, __s);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(size_type __n, value_type __c)
-{
-    if (__n)
-    {
-        size_type __cap = capacity();
-        size_type __sz = size();
-        if (__cap - __sz < __n)
-            __grow_by(__cap, __sz + __n - __cap, __sz, __sz, 0);
-        pointer __p = __get_pointer();
-        traits_type::assign(_VSTD::__to_raw_pointer(__p) + __sz, __n, __c);
-        __sz += __n;
-        __set_size(__sz);
-        traits_type::assign(__p[__sz], value_type());
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::push_back(value_type __c)
-{
-    bool __is_short = !__is_long();
-    size_type __cap;
-    size_type __sz;
-    if (__is_short)
-    {
-        __cap = __min_cap - 1;
-        __sz = __get_short_size();
-    }
-    else
-    {
-        __cap = __get_long_cap() - 1;
-        __sz = __get_long_size();
-    }
-    if (__sz == __cap)
-    {
-        __grow_by(__cap, 1, __sz, __sz, 0);
-        __is_short = !__is_long();
-    }
-    pointer __p;
-    if (__is_short)
-    {
-        __p = __get_short_pointer() + __sz;
-        __set_short_size(__sz+1);
-    }
-    else
-    {
-        __p = __get_long_pointer() + __sz;
-        __set_long_size(__sz+1);
-    }
-    traits_type::assign(*__p, __c);
-    traits_type::assign(*++__p, value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::append(_InputIterator __first, _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::append(_ForwardIterator __first, _ForwardIterator __last)
-{
-    size_type __sz = size();
-    size_type __cap = capacity();
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n)
-    {
-        if (__cap - __sz < __n)
-            __grow_by(__cap, __sz + __n - __cap, __sz, __sz, 0);
-        pointer __p = __get_pointer() + __sz;
-        for (; __first != __last; ++__p, ++__first)
-            traits_type::assign(*__p, *__first);
-        traits_type::assign(*__p, value_type());
-        __set_size(__sz + __n);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(const basic_string& __str)
-{
-    return append(__str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(const basic_string& __str, size_type __pos, size_type __n)
-{
-    size_type __sz = __str.size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    return append(__str.data() + __pos, _VSTD::min(__n, __sz - __pos));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::append received nullptr");
-    return append(__s, traits_type::length(__s));
-}
-
-// insert
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_type* __s, size_type __n)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::insert received nullptr");
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    size_type __cap = capacity();
-    if (__cap - __sz >= __n)
-    {
-        if (__n)
-        {
-            value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-            size_type __n_move = __sz - __pos;
-            if (__n_move != 0)
-            {
-                if (__p + __pos <= __s && __s < __p + __sz)
-                    __s += __n;
-                traits_type::move(__p + __pos + __n, __p + __pos, __n_move);
-            }
-            traits_type::move(__p + __pos, __s, __n);
-            __sz += __n;
-            __set_size(__sz);
-            traits_type::assign(__p[__sz], value_type());
-        }
-    }
-    else
-        __grow_by_and_replace(__cap, __sz + __n - __cap, __sz, __pos, 0, __n, __s);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, size_type __n, value_type __c)
-{
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    if (__n)
-    {
-        size_type __cap = capacity();
-        value_type* __p;
-        if (__cap - __sz >= __n)
-        {
-            __p = _VSTD::__to_raw_pointer(__get_pointer());
-            size_type __n_move = __sz - __pos;
-            if (__n_move != 0)
-                traits_type::move(__p + __pos + __n, __p + __pos, __n_move);
-        }
-        else
-        {
-            __grow_by(__cap, __sz + __n - __cap, __sz, __pos, 0, __n);
-            __p = _VSTD::__to_raw_pointer(__get_long_pointer());
-        }
-        traits_type::assign(__p + __pos, __n, __c);
-        __sz += __n;
-        __set_size(__sz);
-        traits_type::assign(__p[__sz], value_type());
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    typename basic_string<_CharT, _Traits, _Allocator>::iterator
->::type
-basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
-        "string::insert(iterator, range) called with an iterator not"
-        " referring to this string");
-#endif
-    size_type __old_sz = size();
-    difference_type __ip = __pos - begin();
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-    pointer __p = __get_pointer();
-    _VSTD::rotate(__p + __ip, __p + __old_sz, __p + size());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(this, __p + __ip);
-#else
-    return iterator(__p + __ip);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    typename basic_string<_CharT, _Traits, _Allocator>::iterator
->::type
-basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, _ForwardIterator __first, _ForwardIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
-        "string::insert(iterator, range) called with an iterator not"
-        " referring to this string");
-#endif
-    size_type __ip = static_cast<size_type>(__pos - begin());
-    size_type __sz = size();
-    size_type __cap = capacity();
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n)
-    {
-        value_type* __p;
-        if (__cap - __sz >= __n)
-        {
-            __p = _VSTD::__to_raw_pointer(__get_pointer());
-            size_type __n_move = __sz - __ip;
-            if (__n_move != 0)
-                traits_type::move(__p + __ip + __n, __p + __ip, __n_move);
-        }
-        else
-        {
-            __grow_by(__cap, __sz + __n - __cap, __sz, __ip, 0, __n);
-            __p = _VSTD::__to_raw_pointer(__get_long_pointer());
-        }
-        __sz += __n;
-        __set_size(__sz);
-        traits_type::assign(__p[__sz], value_type());
-        for (__p += __ip; __first != __last; ++__p, ++__first)
-            traits_type::assign(*__p, *__first);
-    }
-    return begin() + __ip;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const basic_string& __str)
-{
-    return insert(__pos1, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const basic_string& __str,
-                                                  size_type __pos2, size_type __n)
-{
-    size_type __str_sz = __str.size();
-    if (__pos2 > __str_sz)
-        this->__throw_out_of_range();
-    return insert(__pos1, __str.data() + __pos2, _VSTD::min(__n, __str_sz - __pos2));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::insert received nullptr");
-    return insert(__pos, __s, traits_type::length(__s));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::iterator
-basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, value_type __c)
-{
-    size_type __ip = static_cast<size_type>(__pos - begin());
-    size_type __sz = size();
-    size_type __cap = capacity();
-    value_type* __p;
-    if (__cap == __sz)
-    {
-        __grow_by(__cap, 1, __sz, __ip, 0, 1);
-        __p = _VSTD::__to_raw_pointer(__get_long_pointer());
-    }
-    else
-    {
-        __p = _VSTD::__to_raw_pointer(__get_pointer());
-        size_type __n_move = __sz - __ip;
-        if (__n_move != 0)
-            traits_type::move(__p + __ip + 1, __p + __ip, __n_move);
-    }
-    traits_type::assign(__p[__ip], __c);
-    traits_type::assign(__p[++__sz], value_type());
-    __set_size(__sz);
-    return begin() + static_cast<difference_type>(__ip);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::iterator
-basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, size_type __n, value_type __c)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
-        "string::insert(iterator, n, value) called with an iterator not"
-        " referring to this string");
-#endif
-    difference_type __p = __pos - begin();
-    insert(static_cast<size_type>(__p), __n, __c);
-    return begin() + __p;
-}
-
-// replace
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, const value_type* __s, size_type __n2)
-{
-    _LIBCPP_ASSERT(__n2 == 0 || __s != nullptr, "string::replace received nullptr");
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    __n1 = _VSTD::min(__n1, __sz - __pos);
-    size_type __cap = capacity();
-    if (__cap - __sz + __n1 >= __n2)
-    {
-        value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-        if (__n1 != __n2)
-        {
-            size_type __n_move = __sz - __pos - __n1;
-            if (__n_move != 0)
-            {
-                if (__n1 > __n2)
-                {
-                    traits_type::move(__p + __pos, __s, __n2);
-                    traits_type::move(__p + __pos + __n2, __p + __pos + __n1, __n_move);
-                    goto __finish;
-                }
-                if (__p + __pos < __s && __s < __p + __sz)
-                {
-                    if (__p + __pos + __n1 <= __s)
-                        __s += __n2 - __n1;
-                    else // __p + __pos < __s < __p + __pos + __n1
-                    {
-                        traits_type::move(__p + __pos, __s, __n1);
-                        __pos += __n1;
-                        __s += __n2;
-                        __n2 -= __n1;
-                        __n1 = 0;
-                    }
-                }
-                traits_type::move(__p + __pos + __n2, __p + __pos + __n1, __n_move);
-            }
-        }
-        traits_type::move(__p + __pos, __s, __n2);
-__finish:
-        __sz += __n2 - __n1;
-        __set_size(__sz);
-        __invalidate_iterators_past(__sz);
-        traits_type::assign(__p[__sz], value_type());
-    }
-    else
-        __grow_by_and_replace(__cap, __sz - __n1 + __n2 - __cap, __sz, __pos, __n1, __n2, __s);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, size_type __n2, value_type __c)
-{
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    __n1 = _VSTD::min(__n1, __sz - __pos);
-    size_type __cap = capacity();
-    value_type* __p;
-    if (__cap - __sz + __n1 >= __n2)
-    {
-        __p = _VSTD::__to_raw_pointer(__get_pointer());
-        if (__n1 != __n2)
-        {
-            size_type __n_move = __sz - __pos - __n1;
-            if (__n_move != 0)
-                traits_type::move(__p + __pos + __n2, __p + __pos + __n1, __n_move);
-        }
-    }
-    else
-    {
-        __grow_by(__cap, __sz - __n1 + __n2 - __cap, __sz, __pos, __n1, __n2);
-        __p = _VSTD::__to_raw_pointer(__get_long_pointer());
-    }
-    traits_type::assign(__p + __pos, __n2, __c);
-    __sz += __n2 - __n1;
-    __set_size(__sz);
-    __invalidate_iterators_past(__sz);
-    traits_type::assign(__p[__sz], value_type());
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2,
-                                                   _InputIterator __j1, _InputIterator __j2)
-{
-    for (; true; ++__i1, ++__j1)
-    {
-        if (__i1 == __i2)
-        {
-            if (__j1 != __j2)
-                insert(__i1, __j1, __j2);
-            break;
-        }
-        if (__j1 == __j2)
-        {
-            erase(__i1, __i2);
-            break;
-        }
-        traits_type::assign(const_cast<value_type&>(*__i1), *__j1);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type __n1, const basic_string& __str)
-{
-    return replace(__pos1, __n1, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type __n1, const basic_string& __str,
-                                                   size_type __pos2, size_type __n2)
-{
-    size_type __str_sz = __str.size();
-    if (__pos2 > __str_sz)
-        this->__throw_out_of_range();
-    return replace(__pos1, __n1, __str.data() + __pos2, _VSTD::min(__n2, __str_sz - __pos2));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::replace received nullptr");
-    return replace(__pos, __n1, __s, traits_type::length(__s));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, const basic_string& __str)
-{
-    return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1),
-                   __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, const value_type* __s, size_type __n)
-{
-    return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __s, __n);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, const value_type* __s)
-{
-    return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __s);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, size_type __n, value_type __c)
-{
-    return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __n, __c);
-}
-
-// erase
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::erase(size_type __pos, size_type __n)
-{
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    if (__n)
-    {
-        value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-        __n = _VSTD::min(__n, __sz - __pos);
-        size_type __n_move = __sz - __pos - __n;
-        if (__n_move != 0)
-            traits_type::move(__p + __pos, __p + __pos + __n, __n_move);
-        __sz -= __n;
-        __set_size(__sz);
-        __invalidate_iterators_past(__sz);
-        traits_type::assign(__p[__sz], value_type());
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::iterator
-basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __pos)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
-        "string::erase(iterator) called with an iterator not"
-        " referring to this string");
-#endif
-    _LIBCPP_ASSERT(__pos != end(),
-        "string::erase(iterator) called with a non-dereferenceable iterator");
-    iterator __b = begin();
-    size_type __r = static_cast<size_type>(__pos - __b);
-    erase(__r, 1);
-    return __b + static_cast<difference_type>(__r);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::iterator
-basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __first, const_iterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__first) == this,
-        "string::erase(iterator,  iterator) called with an iterator not"
-        " referring to this string");
-#endif
-    _LIBCPP_ASSERT(__first <= __last, "string::erase(first, last) called with invalid range");
-    iterator __b = begin();
-    size_type __r = static_cast<size_type>(__first - __b);
-    erase(__r, static_cast<size_type>(__last - __first));
-    return __b + static_cast<difference_type>(__r);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::pop_back()
-{
-    _LIBCPP_ASSERT(!empty(), "string::pop_back(): string is already empty");
-    size_type __sz;
-    if (__is_long())
-    {
-        __sz = __get_long_size() - 1;
-        __set_long_size(__sz);
-        traits_type::assign(*(__get_long_pointer() + __sz), value_type());
-    }
-    else
-    {
-        __sz = __get_short_size() - 1;
-        __set_short_size(__sz);
-        traits_type::assign(*(__get_short_pointer() + __sz), value_type());
-    }
-    __invalidate_iterators_past(__sz);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::clear() _NOEXCEPT
-{
-    __invalidate_all_iterators();
-    if (__is_long())
-    {
-        traits_type::assign(*__get_long_pointer(), value_type());
-        __set_long_size(0);
-    }
-    else
-    {
-        traits_type::assign(*__get_short_pointer(), value_type());
-        __set_short_size(0);
-    }
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__erase_to_end(size_type __pos)
-{
-    if (__is_long())
-    {
-        traits_type::assign(*(__get_long_pointer() + __pos), value_type());
-        __set_long_size(__pos);
-    }
-    else
-    {
-        traits_type::assign(*(__get_short_pointer() + __pos), value_type());
-        __set_short_size(__pos);
-    }
-    __invalidate_iterators_past(__pos);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::resize(size_type __n, value_type __c)
-{
-    size_type __sz = size();
-    if (__n > __sz)
-        append(__n - __sz, __c);
-    else
-        __erase_to_end(__n);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::max_size() const _NOEXCEPT
-{
-    size_type __m = __alloc_traits::max_size(__alloc());
-#if _LIBCPP_BIG_ENDIAN
-    return (__m <= ~__long_mask ? __m : __m/2) - __alignment;
-#else
-    return __m - __alignment;
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::reserve(size_type __res_arg)
-{
-    if (__res_arg > max_size())
-        this->__throw_length_error();
-    size_type __cap = capacity();
-    size_type __sz = size();
-    __res_arg = _VSTD::max(__res_arg, __sz);
-    __res_arg = __recommend(__res_arg);
-    if (__res_arg != __cap)
-    {
-        pointer __new_data, __p;
-        bool __was_long, __now_long;
-        if (__res_arg == __min_cap - 1)
-        {
-            __was_long = true;
-            __now_long = false;
-            __new_data = __get_short_pointer();
-            __p = __get_long_pointer();
-        }
-        else
-        {
-            if (__res_arg > __cap)
-                __new_data = __alloc_traits::allocate(__alloc(), __res_arg+1);
-            else
-            {
-            #ifndef _LIBCPP_NO_EXCEPTIONS
-                try
-                {
-            #endif  // _LIBCPP_NO_EXCEPTIONS
-                    __new_data = __alloc_traits::allocate(__alloc(), __res_arg+1);
-            #ifndef _LIBCPP_NO_EXCEPTIONS
-                }
-                catch (...)
-                {
-                    return;
-                }
-            #else  // _LIBCPP_NO_EXCEPTIONS
-                if (__new_data == nullptr)
-                    return;
-            #endif  // _LIBCPP_NO_EXCEPTIONS
-            }
-            __now_long = true;
-            __was_long = __is_long();
-            __p = __get_pointer();
-        }
-        traits_type::copy(_VSTD::__to_raw_pointer(__new_data),
-                          _VSTD::__to_raw_pointer(__p), size()+1);
-        if (__was_long)
-            __alloc_traits::deallocate(__alloc(), __p, __cap+1);
-        if (__now_long)
-        {
-            __set_long_cap(__res_arg+1);
-            __set_long_size(__sz);
-            __set_long_pointer(__new_data);
-        }
-        else
-            __set_short_size(__sz);
-        __invalidate_all_iterators();
-    }
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::const_reference
-basic_string<_CharT, _Traits, _Allocator>::operator[](size_type __pos) const
-{
-    _LIBCPP_ASSERT(__pos <= size(), "string index out of bounds");
-    return *(data() + __pos);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::reference
-basic_string<_CharT, _Traits, _Allocator>::operator[](size_type __pos)
-{
-    _LIBCPP_ASSERT(__pos <= size(), "string index out of bounds");
-    return *(__get_pointer() + __pos);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::const_reference
-basic_string<_CharT, _Traits, _Allocator>::at(size_type __n) const
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return (*this)[__n];
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::reference
-basic_string<_CharT, _Traits, _Allocator>::at(size_type __n)
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return (*this)[__n];
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::reference
-basic_string<_CharT, _Traits, _Allocator>::front()
-{
-    _LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
-    return *__get_pointer();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::const_reference
-basic_string<_CharT, _Traits, _Allocator>::front() const
-{
-    _LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
-    return *data();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::reference
-basic_string<_CharT, _Traits, _Allocator>::back()
-{
-    _LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
-    return *(__get_pointer() + size() - 1);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::const_reference
-basic_string<_CharT, _Traits, _Allocator>::back() const
-{
-    _LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
-    return *(data() + size() - 1);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::copy(value_type* __s, size_type __n, size_type __pos) const
-{
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    size_type __rlen = _VSTD::min(__n, __sz - __pos);
-    traits_type::copy(__s, data() + __pos, __rlen);
-    return __rlen;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::substr(size_type __pos, size_type __n) const
-{
-    return basic_string(*this, __pos, __n, __alloc());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::swap(basic_string& __str)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    if (!__is_long())
-        __get_db()->__invalidate_all(this);
-    if (!__str.__is_long())
-        __get_db()->__invalidate_all(&__str);
-    __get_db()->swap(this, &__str);
-#endif
-    _VSTD::swap(__r_.first(), __str.__r_.first());
-    __swap_alloc(__alloc(), __str.__alloc());
-}
-
-// find
-
-template <class _Traits>
-struct _LIBCPP_HIDDEN __traits_eq
-{
-    typedef typename _Traits::char_type char_type;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const char_type& __x, const char_type& __y) _NOEXCEPT
-        {return _Traits::eq(__x, __y);}
-};
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find(const value_type* __s,
-                                                size_type __pos,
-                                                size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find(): received nullptr");
-    return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find(const basic_string& __str,
-                                                size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find(const value_type* __s,
-                                                size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find(): received nullptr");
-    return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find(value_type __c,
-                                                size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-        (data(), size(), __c, __pos);
-}
-
-// rfind
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::rfind(const value_type* __s,
-                                                 size_type __pos,
-                                                 size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::rfind(): received nullptr");
-    return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::rfind(const basic_string& __str,
-                                                 size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::rfind(const value_type* __s,
-                                                 size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::rfind(): received nullptr");
-    return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::rfind(value_type __c,
-                                                 size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-        (data(), size(), __c, __pos);
-}
-
-// find_first_of
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_of(const value_type* __s,
-                                                         size_type __pos,
-                                                         size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find_first_of(): received nullptr");
-    return _VSTD::__str_find_first_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_of(const basic_string& __str,
-                                                         size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_first_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_of(const value_type* __s,
-                                                         size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find_first_of(): received nullptr");
-    return _VSTD::__str_find_first_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_of(value_type __c,
-                                                         size_type __pos) const _NOEXCEPT
-{
-    return find(__c, __pos);
-}
-
-// find_last_of
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_of(const value_type* __s,
-                                                        size_type __pos,
-                                                        size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find_last_of(): received nullptr");
-    return _VSTD::__str_find_last_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_of(const basic_string& __str,
-                                                        size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_last_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_of(const value_type* __s,
-                                                        size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find_last_of(): received nullptr");
-    return _VSTD::__str_find_last_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_of(value_type __c,
-                                                        size_type __pos) const _NOEXCEPT
-{
-    return rfind(__c, __pos);
-}
-
-// find_first_not_of
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const value_type* __s,
-                                                             size_type __pos,
-                                                             size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find_first_not_of(): received nullptr");
-    return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const basic_string& __str,
-                                                             size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const value_type* __s,
-                                                             size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find_first_not_of(): received nullptr");
-    return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(value_type __c,
-                                                             size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __c, __pos);
-}
-
-// find_last_not_of
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const value_type* __s,
-                                                            size_type __pos,
-                                                            size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find_last_not_of(): received nullptr");
-    return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const basic_string& __str,
-                                                            size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const value_type* __s,
-                                                            size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find_last_not_of(): received nullptr");
-    return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(value_type __c,
-                                                            size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __c, __pos);
-}
-
-// compare
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(const basic_string& __str) const _NOEXCEPT
-{
-    size_t __lhs_sz = size();
-    size_t __rhs_sz = __str.size();
-    int __result = traits_type::compare(data(), __str.data(),
-                                        _VSTD::min(__lhs_sz, __rhs_sz));
-    if (__result != 0)
-        return __result;
-    if (__lhs_sz < __rhs_sz)
-        return -1;
-    if (__lhs_sz > __rhs_sz)
-        return 1;
-    return 0;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
-                                                   size_type __n1,
-                                                   const basic_string& __str) const
-{
-    return compare(__pos1, __n1, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
-                                                   size_type __n1,
-                                                   const basic_string& __str,
-                                                   size_type __pos2,
-                                                   size_type __n2) const
-{
-    size_type __sz = __str.size();
-    if (__pos2 > __sz)
-        this->__throw_out_of_range();
-    return compare(__pos1, __n1, __str.data() + __pos2, _VSTD::min(__n2,
-                                                                  __sz - __pos2));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(const value_type* __s) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::compare(): received nullptr");
-    return compare(0, npos, __s, traits_type::length(__s));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
-                                                   size_type __n1,
-                                                   const value_type* __s) const
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::compare(): received nullptr");
-    return compare(__pos1, __n1, __s, traits_type::length(__s));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
-                                                   size_type __n1,
-                                                   const value_type* __s,
-                                                   size_type __n2) const
-{
-    _LIBCPP_ASSERT(__n2 == 0 || __s != nullptr, "string::compare(): received nullptr");
-    size_type __sz = size();
-    if (__pos1 > __sz || __n2 == npos)
-        this->__throw_out_of_range();
-    size_type __rlen = _VSTD::min(__n1, __sz - __pos1);
-    int __r = traits_type::compare(data() + __pos1, __s, _VSTD::min(__rlen, __n2));
-    if (__r == 0)
-    {
-        if (__rlen < __n2)
-            __r = -1;
-        else if (__rlen > __n2)
-            __r = 1;
-    }
-    return __r;
-}
-
-// __invariants
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_string<_CharT, _Traits, _Allocator>::__invariants() const
-{
-    if (size() > capacity())
-        return false;
-    if (capacity() < __min_cap - 1)
-        return false;
-    if (data() == 0)
-        return false;
-    if (data()[size()] != value_type(0))
-        return false;
-    return true;
-}
-
-// operator==
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    size_t __lhs_sz = __lhs.size();
-    return __lhs_sz == __rhs.size() && _Traits::compare(__lhs.data(),
-                                                        __rhs.data(),
-                                                        __lhs_sz) == 0;
-}
-
-template<class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const basic_string<char, char_traits<char>, _Allocator>& __lhs,
-           const basic_string<char, char_traits<char>, _Allocator>& __rhs) _NOEXCEPT
-{
-    size_t __lhs_sz = __lhs.size();
-    if (__lhs_sz != __rhs.size())
-        return false;
-    const char* __lp = __lhs.data();
-    const char* __rp = __rhs.data();
-    if (__lhs.__is_long())
-        return char_traits<char>::compare(__lp, __rp, __lhs_sz) == 0;
-    for (; __lhs_sz != 0; --__lhs_sz, ++__lp, ++__rp)
-        if (*__lp != *__rp)
-            return false;
-    return true;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __rhs.compare(__lhs) == 0;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return __lhs.compare(__rhs) == 0;
-}
-
-// operator!=
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__lhs == __rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__lhs == __rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return !(__lhs == __rhs);
-}
-
-// operator<
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __lhs.compare(__rhs) < 0;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return __lhs.compare(__rhs) < 0;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __rhs.compare(__lhs) > 0;
-}
-
-// operator>
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __rhs < __lhs;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return __rhs < __lhs;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __rhs < __lhs;
-}
-
-// operator<=
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__rhs < __lhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return !(__rhs < __lhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__rhs < __lhs);
-}
-
-// operator>=
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__lhs < __rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return !(__lhs < __rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__lhs < __rhs);
-}
-
-// operator +
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-          const basic_string<_CharT, _Traits, _Allocator>& __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__lhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __lhs_sz = __lhs.size();
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __rhs_sz = __rhs.size();
-    __r.__init(__lhs.data(), __lhs_sz, __lhs_sz + __rhs_sz);
-    __r.append(__rhs.data(), __rhs_sz);
-    return __r;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const _CharT* __lhs , const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__rhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __lhs_sz = _Traits::length(__lhs);
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __rhs_sz = __rhs.size();
-    __r.__init(__lhs, __lhs_sz, __lhs_sz + __rhs_sz);
-    __r.append(__rhs.data(), __rhs_sz);
-    return __r;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(_CharT __lhs, const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__rhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __rhs_sz = __rhs.size();
-    __r.__init(&__lhs, 1, 1 + __rhs_sz);
-    __r.append(__rhs.data(), __rhs_sz);
-    return __r;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, const _CharT* __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__lhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __lhs_sz = __lhs.size();
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __rhs_sz = _Traits::length(__rhs);
-    __r.__init(__lhs.data(), __lhs_sz, __lhs_sz + __rhs_sz);
-    __r.append(__rhs, __rhs_sz);
-    return __r;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, _CharT __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__lhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __lhs_sz = __lhs.size();
-    __r.__init(__lhs.data(), __lhs_sz, __lhs_sz + 1);
-    __r.push_back(__rhs);
-    return __r;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const basic_string<_CharT, _Traits, _Allocator>& __rhs)
-{
-    return _VSTD::move(__lhs.append(__rhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, basic_string<_CharT, _Traits, _Allocator>&& __rhs)
-{
-    return _VSTD::move(__rhs.insert(0, __lhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, basic_string<_CharT, _Traits, _Allocator>&& __rhs)
-{
-    return _VSTD::move(__lhs.append(__rhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const _CharT* __lhs , basic_string<_CharT,_Traits,_Allocator>&& __rhs)
-{
-    return _VSTD::move(__rhs.insert(0, __lhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(_CharT __lhs, basic_string<_CharT,_Traits,_Allocator>&& __rhs)
-{
-    __rhs.insert(__rhs.begin(), __lhs);
-    return _VSTD::move(__rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const _CharT* __rhs)
-{
-    return _VSTD::move(__lhs.append(__rhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, _CharT __rhs)
-{
-    __lhs.push_back(__rhs);
-    return _VSTD::move(__lhs);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-// swap
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_string<_CharT, _Traits, _Allocator>& __lhs,
-     basic_string<_CharT, _Traits, _Allocator>& __rhs)
-     _NOEXCEPT_(_NOEXCEPT_(__lhs.swap(__rhs)))
-{
-    __lhs.swap(__rhs);
-}
-
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-
-typedef basic_string<char16_t> u16string;
-typedef basic_string<char32_t> u32string;
-
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-_LIBCPP_FUNC_VIS int                stoi  (const string& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS long               stol  (const string& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS unsigned long      stoul (const string& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS long long          stoll (const string& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS unsigned long long stoull(const string& __str, size_t* __idx = 0, int __base = 10);
-
-_LIBCPP_FUNC_VIS float       stof (const string& __str, size_t* __idx = 0);
-_LIBCPP_FUNC_VIS double      stod (const string& __str, size_t* __idx = 0);
-_LIBCPP_FUNC_VIS long double stold(const string& __str, size_t* __idx = 0);
-
-_LIBCPP_FUNC_VIS string to_string(int __val);
-_LIBCPP_FUNC_VIS string to_string(unsigned __val);
-_LIBCPP_FUNC_VIS string to_string(long __val);
-_LIBCPP_FUNC_VIS string to_string(unsigned long __val);
-_LIBCPP_FUNC_VIS string to_string(long long __val);
-_LIBCPP_FUNC_VIS string to_string(unsigned long long __val);
-_LIBCPP_FUNC_VIS string to_string(float __val);
-_LIBCPP_FUNC_VIS string to_string(double __val);
-_LIBCPP_FUNC_VIS string to_string(long double __val);
-
-_LIBCPP_FUNC_VIS int                stoi  (const wstring& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS long               stol  (const wstring& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS unsigned long      stoul (const wstring& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS long long          stoll (const wstring& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS unsigned long long stoull(const wstring& __str, size_t* __idx = 0, int __base = 10);
-
-_LIBCPP_FUNC_VIS float       stof (const wstring& __str, size_t* __idx = 0);
-_LIBCPP_FUNC_VIS double      stod (const wstring& __str, size_t* __idx = 0);
-_LIBCPP_FUNC_VIS long double stold(const wstring& __str, size_t* __idx = 0);
-
-_LIBCPP_FUNC_VIS wstring to_wstring(int __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(unsigned __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(long __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(unsigned long __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(long long __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(unsigned long long __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(float __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(double __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(long double __val);
-
-template<class _CharT, class _Traits, class _Allocator>
-    const typename basic_string<_CharT, _Traits, _Allocator>::size_type
-                   basic_string<_CharT, _Traits, _Allocator>::npos;
-
-template<class _CharT, class _Traits, class _Allocator>
-struct _LIBCPP_TYPE_VIS_ONLY hash<basic_string<_CharT, _Traits, _Allocator> >
-    : public unary_function<basic_string<_CharT, _Traits, _Allocator>, size_t>
-{
-    size_t
-        operator()(const basic_string<_CharT, _Traits, _Allocator>& __val) const _NOEXCEPT;
-};
-
-template<class _CharT, class _Traits, class _Allocator>
-size_t
-hash<basic_string<_CharT, _Traits, _Allocator> >::operator()(
-        const basic_string<_CharT, _Traits, _Allocator>& __val) const _NOEXCEPT
-{
-    return __do_string_hash(__val.data(), __val.data() + __val.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const basic_string<_CharT, _Traits, _Allocator>& __str);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           basic_string<_CharT, _Traits, _Allocator>& __str);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm);
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str);
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>&& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm);
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>&& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str);
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-template<class _CharT, class _Traits, class _Allocator>
-bool
-basic_string<_CharT, _Traits, _Allocator>::__dereferenceable(const const_iterator* __i) const
-{
-    return this->data() <= _VSTD::__to_raw_pointer(__i->base()) &&
-           _VSTD::__to_raw_pointer(__i->base()) < this->data() + this->size();
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-bool
-basic_string<_CharT, _Traits, _Allocator>::__decrementable(const const_iterator* __i) const
-{
-    return this->data() < _VSTD::__to_raw_pointer(__i->base()) &&
-           _VSTD::__to_raw_pointer(__i->base()) <= this->data() + this->size();
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-bool
-basic_string<_CharT, _Traits, _Allocator>::__addable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    const value_type* __p = _VSTD::__to_raw_pointer(__i->base()) + __n;
-    return this->data() <= __p && __p <= this->data() + this->size();
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-bool
-basic_string<_CharT, _Traits, _Allocator>::__subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    const value_type* __p = _VSTD::__to_raw_pointer(__i->base()) + __n;
-    return this->data() <= __p && __p < this->data() + this->size();
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-#if _LIBCPP_STD_VER > 11 
-// Literal suffixes for basic_string [basic.string.literals]
-inline namespace literals
-{
-  inline namespace string_literals
-  {
-    inline _LIBCPP_INLINE_VISIBILITY
-    basic_string<char> operator "" s( const char *__str, size_t __len )
-    {
-        return basic_string<char> (__str, __len);
-    }
-
-    inline _LIBCPP_INLINE_VISIBILITY
-    basic_string<wchar_t> operator "" s( const wchar_t *__str, size_t __len )
-    {
-        return basic_string<wchar_t> (__str, __len);
-    }
-
-    inline _LIBCPP_INLINE_VISIBILITY
-    basic_string<char16_t> operator "" s( const char16_t *__str, size_t __len )
-    {
-        return basic_string<char16_t> (__str, __len);
-    }
-
-    inline _LIBCPP_INLINE_VISIBILITY
-    basic_string<char32_t> operator "" s( const char32_t *__str, size_t __len )
-    {
-        return basic_string<char32_t> (__str, __len);
-    }
-  }
-}
-#endif
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_string<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_string<wchar_t>)
-_LIBCPP_EXTERN_TEMPLATE(string operator+<char, char_traits<char>, allocator<char> >(char const*, string const&))
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_STRING
diff --git a/include.new/c++/v1/strstream b/include.new/c++/v1/strstream
deleted file mode 100644
index 81eef2a..0000000
--- a/include.new/c++/v1/strstream
+++ /dev/null
@@ -1,400 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- strstream --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STRSTREAM
-#define _LIBCPP_STRSTREAM
-
-/*
-    strstream synopsis
-
-class strstreambuf
-    : public basic_streambuf<char>
-{
-public:
-    explicit strstreambuf(streamsize alsize_arg = 0);
-    strstreambuf(void* (*palloc_arg)(size_t), void (*pfree_arg)(void*));
-    strstreambuf(char* gnext_arg, streamsize n, char* pbeg_arg = 0);
-    strstreambuf(const char* gnext_arg, streamsize n);
-
-    strstreambuf(signed char* gnext_arg, streamsize n, signed char* pbeg_arg = 0);
-    strstreambuf(const signed char* gnext_arg, streamsize n);
-    strstreambuf(unsigned char* gnext_arg, streamsize n, unsigned char* pbeg_arg = 0);
-    strstreambuf(const unsigned char* gnext_arg, streamsize n);
-
-    strstreambuf(strstreambuf&& rhs);
-    strstreambuf& operator=(strstreambuf&& rhs);
-
-    virtual ~strstreambuf();
-
-    void swap(strstreambuf& rhs);
-
-    void freeze(bool freezefl = true);
-    char* str();
-    int pcount() const;
-
-protected:
-    virtual int_type overflow (int_type c = EOF);
-    virtual int_type pbackfail(int_type c = EOF);
-    virtual int_type underflow();
-    virtual pos_type seekoff(off_type off, ios_base::seekdir way,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type sp,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual streambuf* setbuf(char* s, streamsize n);
-
-private:
-    typedef T1 strstate;                // exposition only
-    static const strstate allocated;    // exposition only
-    static const strstate constant;     // exposition only
-    static const strstate dynamic;      // exposition only
-    static const strstate frozen;       // exposition only
-    strstate strmode;                   // exposition only
-    streamsize alsize;                  // exposition only
-    void* (*palloc)(size_t);            // exposition only
-    void (*pfree)(void*);               // exposition only
-};
-
-class istrstream
-    : public basic_istream<char>
-{
-public:
-    explicit istrstream(const char* s);
-    explicit istrstream(char* s);
-    istrstream(const char* s, streamsize n);
-    istrstream(char* s, streamsize n);
-
-    virtual ~istrstream();
-
-    strstreambuf* rdbuf() const;
-    char *str();
-
-private:
-    strstreambuf sb; // exposition only
-};
-
-class ostrstream
-    : public basic_ostream<char>
-{
-public:
-    ostrstream();
-    ostrstream(char* s, int n, ios_base::openmode mode = ios_base::out);
-
-    virtual ~ostrstream();
-
-    strstreambuf* rdbuf() const;
-    void freeze(bool freezefl = true);
-    char* str();
-    int pcount() const;
-
-private:
-    strstreambuf sb; // exposition only
-};
-
-class strstream
-    : public basic_iostream<char>
-{
-public:
-    // Types
-    typedef char                        char_type;
-    typedef char_traits<char>::int_type int_type;
-    typedef char_traits<char>::pos_type pos_type;
-    typedef char_traits<char>::off_type off_type;
-
-    // constructors/destructor
-    strstream();
-    strstream(char* s, int n, ios_base::openmode mode = ios_base::in | ios_base::out);
-
-    virtual ~strstream();
-
-    // Members:
-    strstreambuf* rdbuf() const;
-    void freeze(bool freezefl = true);
-    int pcount() const;
-    char* str();
-
-private:
-    strstreambuf sb; // exposition only
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ostream>
-#include <istream>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS strstreambuf
-    : public streambuf
-{
-public:
-    explicit strstreambuf(streamsize __alsize = 0);
-    strstreambuf(void* (*__palloc)(size_t), void (*__pfree)(void*));
-    strstreambuf(char* __gnext, streamsize __n, char* __pbeg = 0);
-    strstreambuf(const char* __gnext, streamsize __n);
-
-    strstreambuf(signed char* __gnext, streamsize __n, signed char* __pbeg = 0);
-    strstreambuf(const signed char* __gnext, streamsize __n);
-    strstreambuf(unsigned char* __gnext, streamsize __n, unsigned char* __pbeg = 0);
-    strstreambuf(const unsigned char* __gnext, streamsize __n);
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf(strstreambuf&& __rhs);
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf& operator=(strstreambuf&& __rhs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    virtual ~strstreambuf();
-
-    void swap(strstreambuf& __rhs);
-
-    void freeze(bool __freezefl = true);
-    char* str();
-    int pcount() const;
-
-protected:
-    virtual int_type overflow (int_type __c = EOF);
-    virtual int_type pbackfail(int_type __c = EOF);
-    virtual int_type underflow();
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __which = ios_base::in | ios_base::out);
-
-private:
-    typedef unsigned __mode_type;
-    static const __mode_type __allocated = 0x01;
-    static const __mode_type __constant  = 0x02;
-    static const __mode_type __dynamic   = 0x04;
-    static const __mode_type __frozen    = 0x08;
-    static const streamsize    __default_alsize = 4096;
-
-    __mode_type __strmode_;
-    streamsize __alsize_;
-    void* (*__palloc_)(size_t);
-    void (*__pfree_)(void*);
-
-    void __init(char* __gnext, streamsize __n, char* __pbeg);
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-inline _LIBCPP_INLINE_VISIBILITY
-strstreambuf::strstreambuf(strstreambuf&& __rhs)
-    : streambuf(__rhs),
-      __strmode_(__rhs.__strmode_),
-      __alsize_(__rhs.__alsize_),
-      __palloc_(__rhs.__palloc_),
-      __pfree_(__rhs.__pfree_)
-{
-    __rhs.setg(nullptr, nullptr, nullptr);
-    __rhs.setp(nullptr, nullptr);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-strstreambuf&
-strstreambuf::operator=(strstreambuf&& __rhs)
-{
-    if (eback() && (__strmode_ & __allocated) != 0 && (__strmode_ & __frozen) == 0)
-    {
-        if (__pfree_)
-            __pfree_(eback());
-        else
-            delete [] eback();
-    }
-    streambuf::operator=(__rhs);
-    __strmode_ = __rhs.__strmode_;
-    __alsize_ = __rhs.__alsize_;
-    __palloc_ = __rhs.__palloc_;
-    __pfree_ = __rhs.__pfree_;
-    __rhs.setg(nullptr, nullptr, nullptr);
-    __rhs.setp(nullptr, nullptr);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-class _LIBCPP_TYPE_VIS istrstream
-    : public istream
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit istrstream(const char* __s)
-        : istream(&__sb_), __sb_(__s, 0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit istrstream(char* __s)
-        : istream(&__sb_), __sb_(__s, 0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    istrstream(const char* __s, streamsize __n)
-        : istream(&__sb_), __sb_(__s, __n) {}
-    _LIBCPP_INLINE_VISIBILITY
-    istrstream(char* __s, streamsize __n)
-        : istream(&__sb_), __sb_(__s, __n) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    istrstream(istrstream&& __rhs)
-        : istream(_VSTD::move(__rhs)),
-          __sb_(_VSTD::move(__rhs.__sb_))
-    {
-        istream::set_rdbuf(&__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    istrstream& operator=(istrstream&& __rhs)
-    {
-        istream::operator=(_VSTD::move(__rhs));
-        __sb_ = _VSTD::move(__rhs.__sb_);
-        return *this;
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    virtual ~istrstream();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(istrstream& __rhs)
-    {
-        istream::swap(__rhs);
-        __sb_.swap(__rhs.__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf* rdbuf() const {return const_cast<strstreambuf*>(&__sb_);}
-    _LIBCPP_INLINE_VISIBILITY
-    char *str() {return __sb_.str();}
-
-private:
-    strstreambuf __sb_;
-};
-
-class _LIBCPP_TYPE_VIS ostrstream
-    : public ostream
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    ostrstream()
-        : ostream(&__sb_) {}
-    _LIBCPP_INLINE_VISIBILITY
-    ostrstream(char* __s, int __n, ios_base::openmode __mode = ios_base::out)
-        : ostream(&__sb_),
-          __sb_(__s, __n, __s + (__mode & ios::app ? strlen(__s) : 0))
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    ostrstream(ostrstream&& __rhs)
-        : ostream(_VSTD::move(__rhs)),
-          __sb_(_VSTD::move(__rhs.__sb_))
-    {
-        ostream::set_rdbuf(&__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ostrstream& operator=(ostrstream&& __rhs)
-    {
-        ostream::operator=(_VSTD::move(__rhs));
-        __sb_ = _VSTD::move(__rhs.__sb_);
-        return *this;
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    virtual ~ostrstream();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(ostrstream& __rhs)
-    {
-        ostream::swap(__rhs);
-        __sb_.swap(__rhs.__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf* rdbuf() const {return const_cast<strstreambuf*>(&__sb_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void freeze(bool __freezefl = true) {__sb_.freeze(__freezefl);}
-    _LIBCPP_INLINE_VISIBILITY
-    char* str()         {return __sb_.str();}
-    _LIBCPP_INLINE_VISIBILITY
-    int pcount() const  {return __sb_.pcount();}
-
-private:
-    strstreambuf __sb_; // exposition only
-};
-
-class _LIBCPP_TYPE_VIS strstream
-    : public iostream
-{
-public:
-    // Types
-    typedef char                        char_type;
-    typedef char_traits<char>::int_type int_type;
-    typedef char_traits<char>::pos_type pos_type;
-    typedef char_traits<char>::off_type off_type;
-
-    // constructors/destructor
-    _LIBCPP_INLINE_VISIBILITY
-    strstream()
-        : iostream(&__sb_) {}
-    _LIBCPP_INLINE_VISIBILITY
-    strstream(char* __s, int __n, ios_base::openmode __mode = ios_base::in | ios_base::out)
-        : iostream(&__sb_),
-          __sb_(__s, __n, __s + (__mode & ios::app ? strlen(__s) : 0))
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    strstream(strstream&& __rhs)
-        : iostream(_VSTD::move(__rhs)),
-          __sb_(_VSTD::move(__rhs.__sb_))
-    {
-        iostream::set_rdbuf(&__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    strstream& operator=(strstream&& __rhs)
-    {
-        iostream::operator=(_VSTD::move(__rhs));
-        __sb_ = _VSTD::move(__rhs.__sb_);
-        return *this;
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    virtual ~strstream();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(strstream& __rhs)
-    {
-        iostream::swap(__rhs);
-        __sb_.swap(__rhs.__sb_);
-    }
-
-    // Members:
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf* rdbuf() const {return const_cast<strstreambuf*>(&__sb_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void freeze(bool __freezefl = true) {__sb_.freeze(__freezefl);}
-    _LIBCPP_INLINE_VISIBILITY
-    int pcount() const {return __sb_.pcount();}
-    _LIBCPP_INLINE_VISIBILITY
-    char* str()        {return __sb_.str();}
-
-private:
-    strstreambuf __sb_; // exposition only
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_STRSTREAM
diff --git a/include.new/c++/v1/system_error b/include.new/c++/v1/system_error
deleted file mode 100644
index 66bf6d6..0000000
--- a/include.new/c++/v1/system_error
+++ /dev/null
@@ -1,642 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- system_error ----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SYSTEM_ERROR
-#define _LIBCPP_SYSTEM_ERROR
-
-/*
-    system_error synopsis
-
-namespace std
-{
-
-class error_category
-{
-public:
-    virtual ~error_category() noexcept;
-
-    constexpr error_category();
-    error_category(const error_category&) = delete;
-    error_category& operator=(const error_category&) = delete;
-
-    virtual const char* name() const noexcept = 0;
-    virtual error_condition default_error_condition(int ev) const noexcept;
-    virtual bool equivalent(int code, const error_condition& condition) const noexcept;
-    virtual bool equivalent(const error_code& code, int condition) const noexcept;
-    virtual string message(int ev) const = 0;
-
-    bool operator==(const error_category& rhs) const noexcept;
-    bool operator!=(const error_category& rhs) const noexcept;
-    bool operator<(const error_category& rhs) const noexcept;
-};
-
-const error_category& generic_category() noexcept;
-const error_category& system_category() noexcept;
-
-template <class T> struct is_error_code_enum
-    : public false_type {};
-
-template <class T> struct is_error_condition_enum
-    : public false_type {};
-
-class error_code
-{
-public:
-    // constructors:
-    error_code() noexcept;
-    error_code(int val, const error_category& cat) noexcept;
-    template <class ErrorCodeEnum>
-        error_code(ErrorCodeEnum e) noexcept;
-
-    // modifiers:
-    void assign(int val, const error_category& cat) noexcept;
-    template <class ErrorCodeEnum>
-        error_code& operator=(ErrorCodeEnum e) noexcept;
-    void clear() noexcept;
-
-    // observers:
-    int value() const noexcept;
-    const error_category& category() const noexcept;
-    error_condition default_error_condition() const noexcept;
-    string message() const;
-    explicit operator bool() const noexcept;
-};
-
-// non-member functions:
-bool operator<(const error_code& lhs, const error_code& rhs) noexcept;
-template <class charT, class traits>
-    basic_ostream<charT,traits>&
-    operator<<(basic_ostream<charT,traits>& os, const error_code& ec);
-
-class error_condition
-{
-public:
-    // constructors:
-    error_condition() noexcept;
-    error_condition(int val, const error_category& cat) noexcept;
-    template <class ErrorConditionEnum>
-        error_condition(ErrorConditionEnum e) noexcept;
-
-    // modifiers:
-    void assign(int val, const error_category& cat) noexcept;
-    template <class ErrorConditionEnum>
-        error_condition& operator=(ErrorConditionEnum e) noexcept;
-    void clear() noexcept;
-
-    // observers:
-    int value() const noexcept;
-    const error_category& category() const noexcept;
-    string message() const noexcept;
-    explicit operator bool() const noexcept;
-};
-
-bool operator<(const error_condition& lhs, const error_condition& rhs) noexcept;
-
-class system_error
-    : public runtime_error
-{
-public:
-    system_error(error_code ec, const string& what_arg);
-    system_error(error_code ec, const char* what_arg);
-    system_error(error_code ec);
-    system_error(int ev, const error_category& ecat, const string& what_arg);
-    system_error(int ev, const error_category& ecat, const char* what_arg);
-    system_error(int ev, const error_category& ecat);
-
-    const error_code& code() const noexcept;
-    const char* what() const noexcept;
-};
-
-enum class errc
-{
-    address_family_not_supported,       // EAFNOSUPPORT
-    address_in_use,                     // EADDRINUSE
-    address_not_available,              // EADDRNOTAVAIL
-    already_connected,                  // EISCONN
-    argument_list_too_long,             // E2BIG
-    argument_out_of_domain,             // EDOM
-    bad_address,                        // EFAULT
-    bad_file_descriptor,                // EBADF
-    bad_message,                        // EBADMSG
-    broken_pipe,                        // EPIPE
-    connection_aborted,                 // ECONNABORTED
-    connection_already_in_progress,     // EALREADY
-    connection_refused,                 // ECONNREFUSED
-    connection_reset,                   // ECONNRESET
-    cross_device_link,                  // EXDEV
-    destination_address_required,       // EDESTADDRREQ
-    device_or_resource_busy,            // EBUSY
-    directory_not_empty,                // ENOTEMPTY
-    executable_format_error,            // ENOEXEC
-    file_exists,                        // EEXIST
-    file_too_large,                     // EFBIG
-    filename_too_long,                  // ENAMETOOLONG
-    function_not_supported,             // ENOSYS
-    host_unreachable,                   // EHOSTUNREACH
-    identifier_removed,                 // EIDRM
-    illegal_byte_sequence,              // EILSEQ
-    inappropriate_io_control_operation, // ENOTTY
-    interrupted,                        // EINTR
-    invalid_argument,                   // EINVAL
-    invalid_seek,                       // ESPIPE
-    io_error,                           // EIO
-    is_a_directory,                     // EISDIR
-    message_size,                       // EMSGSIZE
-    network_down,                       // ENETDOWN
-    network_reset,                      // ENETRESET
-    network_unreachable,                // ENETUNREACH
-    no_buffer_space,                    // ENOBUFS
-    no_child_process,                   // ECHILD
-    no_link,                            // ENOLINK
-    no_lock_available,                  // ENOLCK
-    no_message_available,               // ENODATA
-    no_message,                         // ENOMSG
-    no_protocol_option,                 // ENOPROTOOPT
-    no_space_on_device,                 // ENOSPC
-    no_stream_resources,                // ENOSR
-    no_such_device_or_address,          // ENXIO
-    no_such_device,                     // ENODEV
-    no_such_file_or_directory,          // ENOENT
-    no_such_process,                    // ESRCH
-    not_a_directory,                    // ENOTDIR
-    not_a_socket,                       // ENOTSOCK
-    not_a_stream,                       // ENOSTR
-    not_connected,                      // ENOTCONN
-    not_enough_memory,                  // ENOMEM
-    not_supported,                      // ENOTSUP
-    operation_canceled,                 // ECANCELED
-    operation_in_progress,              // EINPROGRESS
-    operation_not_permitted,            // EPERM
-    operation_not_supported,            // EOPNOTSUPP
-    operation_would_block,              // EWOULDBLOCK
-    owner_dead,                         // EOWNERDEAD
-    permission_denied,                  // EACCES
-    protocol_error,                     // EPROTO
-    protocol_not_supported,             // EPROTONOSUPPORT
-    read_only_file_system,              // EROFS
-    resource_deadlock_would_occur,      // EDEADLK
-    resource_unavailable_try_again,     // EAGAIN
-    result_out_of_range,                // ERANGE
-    state_not_recoverable,              // ENOTRECOVERABLE
-    stream_timeout,                     // ETIME
-    text_file_busy,                     // ETXTBSY
-    timed_out,                          // ETIMEDOUT
-    too_many_files_open_in_system,      // ENFILE
-    too_many_files_open,                // EMFILE
-    too_many_links,                     // EMLINK
-    too_many_symbolic_link_levels,      // ELOOP
-    value_too_large,                    // EOVERFLOW
-    wrong_protocol_type                 // EPROTOTYPE
-};
-
-template <> struct is_error_condition_enum<errc>
-    : true_type { }
-
-error_code make_error_code(errc e) noexcept;
-error_condition make_error_condition(errc e) noexcept;
-
-// Comparison operators:
-bool operator==(const error_code& lhs, const error_code& rhs) noexcept;
-bool operator==(const error_code& lhs, const error_condition& rhs) noexcept;
-bool operator==(const error_condition& lhs, const error_code& rhs) noexcept;
-bool operator==(const error_condition& lhs, const error_condition& rhs) noexcept;
-bool operator!=(const error_code& lhs, const error_code& rhs) noexcept;
-bool operator!=(const error_code& lhs, const error_condition& rhs) noexcept;
-bool operator!=(const error_condition& lhs, const error_code& rhs) noexcept;
-bool operator!=(const error_condition& lhs, const error_condition& rhs) noexcept;
-
-template <> struct hash<std::error_code>;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cerrno>
-#include <type_traits>
-#include <stdexcept>
-#include <__functional_base>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// is_error_code_enum
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum
-    : public false_type {};
-
-// is_error_condition_enum
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_condition_enum
-    : public false_type {};
-
-// Some error codes are not present on all platforms, so we provide equivalents
-// for them:
-
-//enum class errc
-_LIBCPP_DECLARE_STRONG_ENUM(errc)
-{
-    address_family_not_supported        = EAFNOSUPPORT,
-    address_in_use                      = EADDRINUSE,
-    address_not_available               = EADDRNOTAVAIL,
-    already_connected                   = EISCONN,
-    argument_list_too_long              = E2BIG,
-    argument_out_of_domain              = EDOM,
-    bad_address                         = EFAULT,
-    bad_file_descriptor                 = EBADF,
-    bad_message                         = EBADMSG,
-    broken_pipe                         = EPIPE,
-    connection_aborted                  = ECONNABORTED,
-    connection_already_in_progress      = EALREADY,
-    connection_refused                  = ECONNREFUSED,
-    connection_reset                    = ECONNRESET,
-    cross_device_link                   = EXDEV,
-    destination_address_required        = EDESTADDRREQ,
-    device_or_resource_busy             = EBUSY,
-    directory_not_empty                 = ENOTEMPTY,
-    executable_format_error             = ENOEXEC,
-    file_exists                         = EEXIST,
-    file_too_large                      = EFBIG,
-    filename_too_long                   = ENAMETOOLONG,
-    function_not_supported              = ENOSYS,
-    host_unreachable                    = EHOSTUNREACH,
-    identifier_removed                  = EIDRM,
-    illegal_byte_sequence               = EILSEQ,
-    inappropriate_io_control_operation  = ENOTTY,
-    interrupted                         = EINTR,
-    invalid_argument                    = EINVAL,
-    invalid_seek                        = ESPIPE,
-    io_error                            = EIO,
-    is_a_directory                      = EISDIR,
-    message_size                        = EMSGSIZE,
-    network_down                        = ENETDOWN,
-    network_reset                       = ENETRESET,
-    network_unreachable                 = ENETUNREACH,
-    no_buffer_space                     = ENOBUFS,
-    no_child_process                    = ECHILD,
-    no_link                             = ENOLINK,
-    no_lock_available                   = ENOLCK,
-#ifdef ENODATA
-    no_message_available                = ENODATA,
-#else
-    no_message_available                = ENOMSG,
-#endif
-    no_message                          = ENOMSG,
-    no_protocol_option                  = ENOPROTOOPT,
-    no_space_on_device                  = ENOSPC,
-#ifdef ENOSR
-    no_stream_resources                 = ENOSR,
-#else
-    no_stream_resources                 = ENOMEM,
-#endif
-    no_such_device_or_address           = ENXIO,
-    no_such_device                      = ENODEV,
-    no_such_file_or_directory           = ENOENT,
-    no_such_process                     = ESRCH,
-    not_a_directory                     = ENOTDIR,
-    not_a_socket                        = ENOTSOCK,
-#ifdef ENOSTR
-    not_a_stream                        = ENOSTR,
-#else
-    not_a_stream                        = EINVAL,
-#endif
-    not_connected                       = ENOTCONN,
-    not_enough_memory                   = ENOMEM,
-    not_supported                       = ENOTSUP,
-    operation_canceled                  = ECANCELED,
-    operation_in_progress               = EINPROGRESS,
-    operation_not_permitted             = EPERM,
-    operation_not_supported             = EOPNOTSUPP,
-    operation_would_block               = EWOULDBLOCK,
-    owner_dead                          = EOWNERDEAD,
-    permission_denied                   = EACCES,
-    protocol_error                      = EPROTO,
-    protocol_not_supported              = EPROTONOSUPPORT,
-    read_only_file_system               = EROFS,
-    resource_deadlock_would_occur       = EDEADLK,
-    resource_unavailable_try_again      = EAGAIN,
-    result_out_of_range                 = ERANGE,
-    state_not_recoverable               = ENOTRECOVERABLE,
-#ifdef ETIME
-    stream_timeout                      = ETIME,
-#else
-    stream_timeout                      = ETIMEDOUT,
-#endif
-    text_file_busy                      = ETXTBSY,
-    timed_out                           = ETIMEDOUT,
-    too_many_files_open_in_system       = ENFILE,
-    too_many_files_open                 = EMFILE,
-    too_many_links                      = EMLINK,
-    too_many_symbolic_link_levels       = ELOOP,
-    value_too_large                     = EOVERFLOW,
-    wrong_protocol_type                 = EPROTOTYPE
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(errc)
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_condition_enum<errc>
-    : true_type { };
-
-#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_condition_enum<errc::__lx>
-    : true_type { };
-#endif
-
-class _LIBCPP_TYPE_VIS error_condition;
-class _LIBCPP_TYPE_VIS error_code;
-
-// class error_category
-
-class _LIBCPP_HIDDEN __do_message;
-
-class _LIBCPP_TYPE_VIS error_category
-{
-public:
-    virtual ~error_category() _NOEXCEPT;
-
-#ifdef _LIBCPP_BUILDING_SYSTEM_ERROR
-    error_category() _NOEXCEPT;
-#else
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 error_category() _NOEXCEPT _LIBCPP_DEFAULT;
-#endif
-private:
-    error_category(const error_category&);// = delete;
-    error_category& operator=(const error_category&);// = delete;
-
-public:
-    virtual const char* name() const _NOEXCEPT = 0;
-    virtual error_condition default_error_condition(int __ev) const _NOEXCEPT;
-    virtual bool equivalent(int __code, const error_condition& __condition) const _NOEXCEPT;
-    virtual bool equivalent(const error_code& __code, int __condition) const _NOEXCEPT;
-    virtual string message(int __ev) const = 0;
-
-    _LIBCPP_ALWAYS_INLINE
-    bool operator==(const error_category& __rhs) const _NOEXCEPT {return this == &__rhs;}
-
-    _LIBCPP_ALWAYS_INLINE
-    bool operator!=(const error_category& __rhs) const _NOEXCEPT {return !(*this == __rhs);}
-
-    _LIBCPP_ALWAYS_INLINE
-    bool operator< (const error_category& __rhs) const _NOEXCEPT {return this < &__rhs;}
-
-    friend class _LIBCPP_HIDDEN __do_message;
-};
-
-class _LIBCPP_HIDDEN __do_message
-    : public error_category
-{
-public:
-    virtual string message(int ev) const;
-};
-
-_LIBCPP_FUNC_VIS const error_category& generic_category() _NOEXCEPT;
-_LIBCPP_FUNC_VIS const error_category& system_category() _NOEXCEPT;
-
-class _LIBCPP_TYPE_VIS error_condition
-{
-    int __val_;
-    const error_category* __cat_;
-public:
-    _LIBCPP_ALWAYS_INLINE
-    error_condition() _NOEXCEPT : __val_(0), __cat_(&generic_category()) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    error_condition(int __val, const error_category& __cat) _NOEXCEPT
-        : __val_(__val), __cat_(&__cat) {}
-
-    template <class _Ep>
-        _LIBCPP_ALWAYS_INLINE
-        error_condition(_Ep __e,
-              typename enable_if<is_error_condition_enum<_Ep>::value>::type* = 0
-                                                                     ) _NOEXCEPT
-            {*this = make_error_condition(__e);}
-
-    _LIBCPP_ALWAYS_INLINE
-    void assign(int __val, const error_category& __cat) _NOEXCEPT
-    {
-        __val_ = __val;
-        __cat_ = &__cat;
-    }
-
-    template <class _Ep>
-        _LIBCPP_ALWAYS_INLINE
-        typename enable_if
-        <
-            is_error_condition_enum<_Ep>::value,
-            error_condition&
-        >::type
-        operator=(_Ep __e) _NOEXCEPT
-            {*this = make_error_condition(__e); return *this;}
-
-    _LIBCPP_ALWAYS_INLINE
-    void clear() _NOEXCEPT
-    {
-        __val_ = 0;
-        __cat_ = &generic_category();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int value() const _NOEXCEPT {return __val_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    const error_category& category() const _NOEXCEPT {return *__cat_;}
-    string message() const;
-
-    _LIBCPP_ALWAYS_INLINE
-        _LIBCPP_EXPLICIT
-        operator bool() const _NOEXCEPT {return __val_ != 0;}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_condition
-make_error_condition(errc __e) _NOEXCEPT
-{
-    return error_condition(static_cast<int>(__e), generic_category());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const error_condition& __x, const error_condition& __y) _NOEXCEPT
-{
-    return __x.category() < __y.category()
-        || (__x.category() == __y.category() && __x.value() < __y.value());
-}
-
-// error_code
-
-class _LIBCPP_TYPE_VIS error_code
-{
-    int __val_;
-    const error_category* __cat_;
-public:
-    _LIBCPP_ALWAYS_INLINE
-    error_code() _NOEXCEPT : __val_(0), __cat_(&system_category()) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    error_code(int __val, const error_category& __cat) _NOEXCEPT
-        : __val_(__val), __cat_(&__cat) {}
-
-    template <class _Ep>
-        _LIBCPP_ALWAYS_INLINE
-        error_code(_Ep __e,
-                   typename enable_if<is_error_code_enum<_Ep>::value>::type* = 0
-                                                                     ) _NOEXCEPT
-            {*this = make_error_code(__e);}
-
-    _LIBCPP_ALWAYS_INLINE
-    void assign(int __val, const error_category& __cat) _NOEXCEPT
-    {
-        __val_ = __val;
-        __cat_ = &__cat;
-    }
-
-    template <class _Ep>
-        _LIBCPP_ALWAYS_INLINE
-        typename enable_if
-        <
-            is_error_code_enum<_Ep>::value,
-            error_code&
-        >::type
-        operator=(_Ep __e) _NOEXCEPT
-            {*this = make_error_code(__e); return *this;}
-
-    _LIBCPP_ALWAYS_INLINE
-    void clear() _NOEXCEPT
-    {
-        __val_ = 0;
-        __cat_ = &system_category();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int value() const _NOEXCEPT {return __val_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    const error_category& category() const _NOEXCEPT {return *__cat_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    error_condition default_error_condition() const _NOEXCEPT
-        {return __cat_->default_error_condition(__val_);}
-
-    string message() const;
-
-    _LIBCPP_ALWAYS_INLINE
-        _LIBCPP_EXPLICIT
-        operator bool() const _NOEXCEPT {return __val_ != 0;}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_code
-make_error_code(errc __e) _NOEXCEPT
-{
-    return error_code(static_cast<int>(__e), generic_category());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const error_code& __x, const error_code& __y) _NOEXCEPT
-{
-    return __x.category() < __y.category()
-        || (__x.category() == __y.category() && __x.value() < __y.value());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const error_code& __x, const error_code& __y) _NOEXCEPT
-{
-    return __x.category() == __y.category() && __x.value() == __y.value();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const error_code& __x, const error_condition& __y) _NOEXCEPT
-{
-    return __x.category().equivalent(__x.value(), __y)
-        || __y.category().equivalent(__x, __y.value());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const error_condition& __x, const error_code& __y) _NOEXCEPT
-{
-    return __y == __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const error_condition& __x, const error_condition& __y) _NOEXCEPT
-{
-    return __x.category() == __y.category() && __x.value() == __y.value();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const error_code& __x, const error_code& __y) _NOEXCEPT
-{return !(__x == __y);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const error_code& __x, const error_condition& __y) _NOEXCEPT
-{return !(__x == __y);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const error_condition& __x, const error_code& __y) _NOEXCEPT
-{return !(__x == __y);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const error_condition& __x, const error_condition& __y) _NOEXCEPT
-{return !(__x == __y);}
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<error_code>
-    : public unary_function<error_code, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const error_code& __ec) const _NOEXCEPT
-    {
-        return static_cast<size_t>(__ec.value());
-    }
-};
-
-// system_error
-
-class _LIBCPP_TYPE_VIS system_error
-    : public runtime_error
-{
-    error_code __ec_;
-public:
-    system_error(error_code __ec, const string& __what_arg);
-    system_error(error_code __ec, const char* __what_arg);
-    system_error(error_code __ec);
-    system_error(int __ev, const error_category& __ecat, const string& __what_arg);
-    system_error(int __ev, const error_category& __ecat, const char* __what_arg);
-    system_error(int __ev, const error_category& __ecat);
-    ~system_error() _NOEXCEPT;
-
-    _LIBCPP_ALWAYS_INLINE
-    const error_code& code() const _NOEXCEPT {return __ec_;}
-
-private:
-    static string __init(const error_code&, string);
-};
-
-_LIBCPP_FUNC_VIS void __throw_system_error(int ev, const char* what_arg);
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SYSTEM_ERROR
diff --git a/include.new/c++/v1/tgmath.h b/include.new/c++/v1/tgmath.h
deleted file mode 100644
index fbe1e82..0000000
--- a/include.new/c++/v1/tgmath.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- tgmath.h ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_TGMATH_H
-#define _LIBCPP_TGMATH_H
-
-/*
-    tgmath.h synopsis
-
-#include <complex.h>
-#include <math.h>
-
-*/
-
-#include <complex.h>
-#include <math.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_TGMATH_H
diff --git a/include.new/c++/v1/thread b/include.new/c++/v1/thread
deleted file mode 100644
index 8a30102..0000000
--- a/include.new/c++/v1/thread
+++ /dev/null
@@ -1,465 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- thread -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_THREAD
-#define _LIBCPP_THREAD
-
-/*
-
-    thread synopsis
-
-#define __STDCPP_THREADS__ __cplusplus
-
-namespace std
-{
-
-class thread
-{
-public:
-    class id;
-    typedef pthread_t native_handle_type;
-
-    thread() noexcept;
-    template <class F, class ...Args> explicit thread(F&& f, Args&&... args);
-    ~thread();
-
-    thread(const thread&) = delete;
-    thread(thread&& t) noexcept;
-
-    thread& operator=(const thread&) = delete;
-    thread& operator=(thread&& t) noexcept;
-
-    void swap(thread& t) noexcept;
-
-    bool joinable() const noexcept;
-    void join();
-    void detach();
-    id get_id() const noexcept;
-    native_handle_type native_handle();
-
-    static unsigned hardware_concurrency() noexcept;
-};
-
-void swap(thread& x, thread& y) noexcept;
-
-class thread::id
-{
-public:
-    id() noexcept;
-};
-
-bool operator==(thread::id x, thread::id y) noexcept;
-bool operator!=(thread::id x, thread::id y) noexcept;
-bool operator< (thread::id x, thread::id y) noexcept;
-bool operator<=(thread::id x, thread::id y) noexcept;
-bool operator> (thread::id x, thread::id y) noexcept;
-bool operator>=(thread::id x, thread::id y) noexcept;
-
-template<class charT, class traits>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& out, thread::id id);
-
-namespace this_thread
-{
-
-thread::id get_id() noexcept;
-
-void yield() noexcept;
-
-template <class Clock, class Duration>
-void sleep_until(const chrono::time_point<Clock, Duration>& abs_time);
-
-template <class Rep, class Period>
-void sleep_for(const chrono::duration<Rep, Period>& rel_time);
-
-}  // this_thread
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iosfwd>
-#include <__functional_base>
-#include <type_traits>
-#include <cstddef>
-#include <functional>
-#include <memory>
-#include <system_error>
-#include <chrono>
-#include <__mutex_base>
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-#include <tuple>
-#endif
-#include <pthread.h>
-#include <sched.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#define __STDCPP_THREADS__ __cplusplus
-
-#ifdef _LIBCPP_HAS_NO_THREADS
-#error <thread> is not supported on this single threaded system
-#else // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp>
-class __thread_specific_ptr
-{
-    pthread_key_t __key_;
-
-    __thread_specific_ptr(const __thread_specific_ptr&);
-    __thread_specific_ptr& operator=(const __thread_specific_ptr&);
-
-    static void __at_thread_exit(void*);
-public:
-    typedef _Tp* pointer;
-
-    __thread_specific_ptr();
-    ~__thread_specific_ptr();
-
-    _LIBCPP_INLINE_VISIBILITY
-    pointer get() const {return static_cast<_Tp*>(pthread_getspecific(__key_));}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator*() const {return *get();}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return get();}
-    pointer release();
-    void reset(pointer __p = nullptr);
-};
-
-template <class _Tp>
-void
-__thread_specific_ptr<_Tp>::__at_thread_exit(void* __p)
-{
-    delete static_cast<pointer>(__p);
-}
-
-template <class _Tp>
-__thread_specific_ptr<_Tp>::__thread_specific_ptr()
-{
-    int __ec = pthread_key_create(&__key_, &__thread_specific_ptr::__at_thread_exit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__ec)
-        throw system_error(error_code(__ec, system_category()),
-                           "__thread_specific_ptr construction failed");
-#endif
-}
-
-template <class _Tp>
-__thread_specific_ptr<_Tp>::~__thread_specific_ptr()
-{
-    pthread_key_delete(__key_);
-}
-
-template <class _Tp>
-typename __thread_specific_ptr<_Tp>::pointer
-__thread_specific_ptr<_Tp>::release()
-{
-    pointer __p = get();
-    pthread_setspecific(__key_, 0);
-    return __p;
-}
-
-template <class _Tp>
-void
-__thread_specific_ptr<_Tp>::reset(pointer __p)
-{
-    pointer __p_old = get();
-    pthread_setspecific(__key_, __p);
-    delete __p_old;
-}
-
-class _LIBCPP_TYPE_VIS thread;
-class _LIBCPP_TYPE_VIS __thread_id;
-
-namespace this_thread
-{
-
-_LIBCPP_INLINE_VISIBILITY __thread_id get_id() _NOEXCEPT;
-
-}  // this_thread
-
-template<> struct _LIBCPP_TYPE_VIS_ONLY hash<__thread_id>;
-
-class _LIBCPP_TYPE_VIS_ONLY __thread_id
-{
-    // FIXME: pthread_t is a pointer on Darwin but a long on Linux.
-    // NULL is the no-thread value on Darwin.  Someone needs to check
-    // on other platforms.  We assume 0 works everywhere for now.
-    pthread_t __id_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __thread_id() _NOEXCEPT : __id_(0) {}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return __x.__id_ == __y.__id_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return !(__x == __y);}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator< (__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return __x.__id_ < __y.__id_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator<=(__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return !(__y < __x);}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator> (__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return   __y < __x ;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator>=(__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return !(__x < __y);}
-
-    template<class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, __thread_id __id)
-        {return __os << __id.__id_;}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    __thread_id(pthread_t __id) : __id_(__id) {}
-
-    friend __thread_id this_thread::get_id() _NOEXCEPT;
-    friend class _LIBCPP_TYPE_VIS thread;
-    friend struct _LIBCPP_TYPE_VIS_ONLY hash<__thread_id>;
-};
-
-template<>
-struct _LIBCPP_TYPE_VIS_ONLY hash<__thread_id>
-    : public unary_function<__thread_id, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(__thread_id __v) const
-    {
-        return hash<pthread_t>()(__v.__id_);
-    }
-};
-
-namespace this_thread
-{
-
-inline _LIBCPP_INLINE_VISIBILITY
-__thread_id
-get_id() _NOEXCEPT
-{
-    return pthread_self();
-}
-
-}  // this_thread
-
-class _LIBCPP_TYPE_VIS thread
-{
-    pthread_t __t_;
-
-    thread(const thread&);
-    thread& operator=(const thread&);
-public:
-    typedef __thread_id id;
-    typedef pthread_t native_handle_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    thread() _NOEXCEPT : __t_(0) {}
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _Fp, class ..._Args,
-              class = typename enable_if
-              <
-                   !is_same<typename decay<_Fp>::type, thread>::value
-              >::type
-             >
-        explicit thread(_Fp&& __f, _Args&&... __args);
-#else  // _LIBCPP_HAS_NO_VARIADICS
-    template <class _Fp> explicit thread(_Fp __f);
-#endif
-    ~thread();
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    thread(thread&& __t) _NOEXCEPT : __t_(__t.__t_) {__t.__t_ = 0;}
-    thread& operator=(thread&& __t) _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(thread& __t) _NOEXCEPT {_VSTD::swap(__t_, __t.__t_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool joinable() const _NOEXCEPT {return __t_ != 0;}
-    void join();
-    void detach();
-    _LIBCPP_INLINE_VISIBILITY
-    id get_id() const _NOEXCEPT {return __t_;}
-    _LIBCPP_INLINE_VISIBILITY
-    native_handle_type native_handle() _NOEXCEPT {return __t_;}
-
-    static unsigned hardware_concurrency() _NOEXCEPT;
-};
-
-class __assoc_sub_state;
-
-class _LIBCPP_HIDDEN __thread_struct_imp;
-
-class _LIBCPP_TYPE_VIS __thread_struct
-{
-    __thread_struct_imp* __p_;
-
-    __thread_struct(const __thread_struct&);
-    __thread_struct& operator=(const __thread_struct&);
-public:
-    __thread_struct();
-    ~__thread_struct();
-
-    void notify_all_at_thread_exit(condition_variable*, mutex*);
-    void __make_ready_at_thread_exit(__assoc_sub_state*);
-};
-
-_LIBCPP_FUNC_VIS __thread_specific_ptr<__thread_struct>& __thread_local_data();
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Fp, class ..._Args, size_t ..._Indices>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__thread_execute(tuple<_Fp, _Args...>& __t, __tuple_indices<_Indices...>)
-{
-    __invoke(_VSTD::move(_VSTD::get<0>(__t)), _VSTD::move(_VSTD::get<_Indices>(__t))...);
-}
-
-template <class _Fp>
-void*
-__thread_proxy(void* __vp)
-{
-    __thread_local_data().reset(new __thread_struct);
-    std::unique_ptr<_Fp> __p(static_cast<_Fp*>(__vp));
-    typedef typename __make_tuple_indices<tuple_size<_Fp>::value, 1>::type _Index;
-    __thread_execute(*__p, _Index());
-    return nullptr;
-}
-
-template <class _Fp, class ..._Args,
-          class
-         >
-thread::thread(_Fp&& __f, _Args&&... __args)
-{
-    typedef tuple<typename decay<_Fp>::type, typename decay<_Args>::type...> _Gp;
-    _VSTD::unique_ptr<_Gp> __p(new _Gp(__decay_copy(_VSTD::forward<_Fp>(__f)),
-                                __decay_copy(_VSTD::forward<_Args>(__args))...));
-    int __ec = pthread_create(&__t_, 0, &__thread_proxy<_Gp>, __p.get());
-    if (__ec == 0)
-        __p.release();
-    else
-        __throw_system_error(__ec, "thread constructor failed");
-}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Fp>
-void*
-__thread_proxy(void* __vp)
-{
-    __thread_local_data().reset(new __thread_struct);
-    std::unique_ptr<_Fp> __p(static_cast<_Fp*>(__vp));
-    (*__p)();
-    return nullptr;
-}
-
-template <class _Fp>
-thread::thread(_Fp __f)
-{
-    std::unique_ptr<_Fp> __p(new _Fp(__f));
-    int __ec = pthread_create(&__t_, 0, &__thread_proxy<_Fp>, __p.get());
-    if (__ec == 0)
-        __p.release();
-    else
-        __throw_system_error(__ec, "thread constructor failed");
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-inline _LIBCPP_INLINE_VISIBILITY
-thread&
-thread::operator=(thread&& __t) _NOEXCEPT
-{
-    if (__t_ != 0)
-        terminate();
-    __t_ = __t.__t_;
-    __t.__t_ = 0;
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-inline _LIBCPP_INLINE_VISIBILITY
-void swap(thread& __x, thread& __y) _NOEXCEPT {__x.swap(__y);}
-
-namespace this_thread
-{
-
-_LIBCPP_FUNC_VIS void sleep_for(const chrono::nanoseconds& ns);
-
-template <class _Rep, class _Period>
-void
-sleep_for(const chrono::duration<_Rep, _Period>& __d)
-{
-    using namespace chrono;
-    if (__d > duration<_Rep, _Period>::zero())
-    {
-        _LIBCPP_CONSTEXPR duration<long double> _Max = nanoseconds::max();
-        nanoseconds __ns;
-        if (__d < _Max)
-        {
-            __ns = duration_cast<nanoseconds>(__d);
-            if (__ns < __d)
-                ++__ns;
-        }
-        else
-            __ns = nanoseconds::max();
-        sleep_for(__ns);
-    }
-}
-
-template <class _Clock, class _Duration>
-void
-sleep_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    using namespace chrono;
-    mutex __mut;
-    condition_variable __cv;
-    unique_lock<mutex> __lk(__mut);
-    while (_Clock::now() < __t)
-        __cv.wait_until(__lk, __t);
-}
-
-template <class _Duration>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sleep_until(const chrono::time_point<chrono::steady_clock, _Duration>& __t)
-{
-    using namespace chrono;
-    sleep_for(__t - steady_clock::now());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void yield() _NOEXCEPT {sched_yield();}
-
-}  // this_thread
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_THREAD
diff --git a/include.new/c++/v1/tr1/__bit_reference b/include.new/c++/v1/tr1/__bit_reference
deleted file mode 100644
index 5659ed0..0000000
--- a/include.new/c++/v1/tr1/__bit_reference
+++ /dev/null
@@ -1,1286 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___BIT_REFERENCE
-#define _LIBCPP___BIT_REFERENCE
-
-#include <__config>
-#include <algorithm>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Cp, bool _IsConst, typename _Cp::__storage_type = 0> class __bit_iterator;
-template <class _Cp> class __bit_const_reference;
-
-template <class _Tp>
-struct __has_storage_type
-{
-    static const bool value = false;
-};
-
-template <class _Cp, bool = __has_storage_type<_Cp>::value>
-class __bit_reference
-{
-    typedef typename _Cp::__storage_type    __storage_type;
-    typedef typename _Cp::__storage_pointer __storage_pointer;
-
-    __storage_pointer __seg_;
-    __storage_type    __mask_;
-
-#if defined(__clang__) || defined(__IBMCPP__) || defined(_LIBCPP_MSVC)
-    friend typename _Cp::__self;
-#else
-    friend class _Cp::__self;
-#endif
-    friend class __bit_const_reference<_Cp>;
-    friend class __bit_iterator<_Cp, false>;
-public:
-    _LIBCPP_INLINE_VISIBILITY operator bool() const _NOEXCEPT
-        {return static_cast<bool>(*__seg_ & __mask_);}
-    _LIBCPP_INLINE_VISIBILITY bool operator ~() const _NOEXCEPT
-        {return !static_cast<bool>(*this);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_reference& operator=(bool __x) _NOEXCEPT
-    {
-        if (__x)
-            *__seg_ |= __mask_;
-        else
-            *__seg_ &= ~__mask_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_reference& operator=(const __bit_reference& __x) _NOEXCEPT
-        {return operator=(static_cast<bool>(__x));}
-
-    _LIBCPP_INLINE_VISIBILITY void flip() _NOEXCEPT {*__seg_ ^= __mask_;}
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, false> operator&() const _NOEXCEPT
-        {return __bit_iterator<_Cp, false>(__seg_, static_cast<unsigned>(__ctz(__mask_)));}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
-        : __seg_(__s), __mask_(__m) {}
-};
-
-template <class _Cp>
-class __bit_reference<_Cp, false>
-{
-};
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__bit_reference<_Cp> __x, __bit_reference<_Cp> __y) _NOEXCEPT
-{
-    bool __t = __x;
-    __x = __y;
-    __y = __t;
-}
-
-template <class _Cp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__bit_reference<_Cp> __x, __bit_reference<_Dp> __y) _NOEXCEPT
-{
-    bool __t = __x;
-    __x = __y;
-    __y = __t;
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__bit_reference<_Cp> __x, bool& __y) _NOEXCEPT
-{
-    bool __t = __x;
-    __x = __y;
-    __y = __t;
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(bool& __x, __bit_reference<_Cp> __y) _NOEXCEPT
-{
-    bool __t = __x;
-    __x = __y;
-    __y = __t;
-}
-
-template <class _Cp>
-class __bit_const_reference
-{
-    typedef typename _Cp::__storage_type          __storage_type;
-    typedef typename _Cp::__const_storage_pointer __storage_pointer;
-
-    __storage_pointer        __seg_;
-    __storage_type __mask_;
-
-#if defined(__clang__) || defined(__IBMCPP__) || defined(_LIBCPP_MSVC)
-    friend typename _Cp::__self;
-#else
-    friend class _Cp::__self;
-#endif
-    friend class __bit_iterator<_Cp, true>;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_const_reference(const __bit_reference<_Cp>& __x) _NOEXCEPT
-        : __seg_(__x.__seg_), __mask_(__x.__mask_) {}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR operator bool() const _NOEXCEPT
-        {return static_cast<bool>(*__seg_ & __mask_);}
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator<_Cp, true> operator&() const _NOEXCEPT
-        {return __bit_iterator<_Cp, true>(__seg_, static_cast<unsigned>(__ctz(__mask_)));}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR
-    __bit_const_reference(__storage_pointer __s, __storage_type __m) _NOEXCEPT
-        : __seg_(__s), __mask_(__m) {}
-
-    __bit_const_reference& operator=(const __bit_const_reference& __x);
-};
-
-// find
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, _IsConst>
-__find_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _It;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __storage_type __b = *__first.__seg_ & __m;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-        if (__n == __dn)
-            return __first + __n;
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-        if (*__first.__seg_)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(*__first.__seg_)));
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __storage_type __b = *__first.__seg_ & __m;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-    }
-    return _It(__first.__seg_, static_cast<unsigned>(__n));
-}
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, _IsConst>
-__find_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _It;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __storage_type __b = ~*__first.__seg_ & __m;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-        if (__n == __dn)
-            return __first + __n;
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-    {
-        __storage_type __b = ~*__first.__seg_;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-    }
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __storage_type __b = ~*__first.__seg_ & __m;
-        if (__b)
-            return _It(__first.__seg_, static_cast<unsigned>(_VSTD::__ctz(__b)));
-    }
-    return _It(__first.__seg_, static_cast<unsigned>(__n));
-}
-
-template <class _Cp, bool _IsConst, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, _IsConst>
-find(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, const _Tp& __value_)
-{
-    if (static_cast<bool>(__value_))
-        return __find_bool_true(__first, static_cast<typename _Cp::size_type>(__last - __first));
-    return __find_bool_false(__first, static_cast<typename _Cp::size_type>(__last - __first));
-}
-
-// count
-
-template <class _Cp, bool _IsConst>
-typename __bit_iterator<_Cp, _IsConst>::difference_type
-__count_bool_true(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _It;
-    typedef typename _It::__storage_type __storage_type;
-    typedef typename _It::difference_type difference_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    difference_type __r = 0;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __r = _VSTD::__pop_count(*__first.__seg_ & __m);
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-        __r += _VSTD::__pop_count(*__first.__seg_);
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __r += _VSTD::__pop_count(*__first.__seg_ & __m);
-    }
-    return __r;
-}
-
-template <class _Cp, bool _IsConst>
-typename __bit_iterator<_Cp, _IsConst>::difference_type
-__count_bool_false(__bit_iterator<_Cp, _IsConst> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _It;
-    typedef typename _It::__storage_type __storage_type;
-    typedef typename _It::difference_type difference_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    difference_type __r = 0;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        __r = _VSTD::__pop_count(~*__first.__seg_ & __m);
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    for (; __n >= __bits_per_word; ++__first.__seg_, __n -= __bits_per_word)
-        __r += _VSTD::__pop_count(~*__first.__seg_);
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __r += _VSTD::__pop_count(~*__first.__seg_ & __m);
-    }
-    return __r;
-}
-
-template <class _Cp, bool _IsConst, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __bit_iterator<_Cp, _IsConst>::difference_type
-count(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, const _Tp& __value_)
-{
-    if (static_cast<bool>(__value_))
-        return __count_bool_true(__first, static_cast<typename _Cp::size_type>(__last - __first));
-    return __count_bool_false(__first, static_cast<typename _Cp::size_type>(__last - __first));
-}
-
-// fill_n
-
-template <class _Cp>
-void
-__fill_n_false(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, false> _It;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        *__first.__seg_ &= ~__m;
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    __storage_type __nw = __n / __bits_per_word;
-    _VSTD::memset(_VSTD::__to_raw_pointer(__first.__seg_), 0, __nw * sizeof(__storage_type));
-    __n -= __nw * __bits_per_word;
-    // do last partial word
-    if (__n > 0)
-    {
-        __first.__seg_ += __nw;
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        *__first.__seg_ &= ~__m;
-    }
-}
-
-template <class _Cp>
-void
-__fill_n_true(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n)
-{
-    typedef __bit_iterator<_Cp, false> _It;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    // do first partial word
-    if (__first.__ctz_ != 0)
-    {
-        __storage_type __clz_f = static_cast<__storage_type>(__bits_per_word - __first.__ctz_);
-        __storage_type __dn = _VSTD::min(__clz_f, __n);
-        __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-        *__first.__seg_ |= __m;
-        __n -= __dn;
-        ++__first.__seg_;
-    }
-    // do middle whole words
-    __storage_type __nw = __n / __bits_per_word;
-    _VSTD::memset(_VSTD::__to_raw_pointer(__first.__seg_), -1, __nw * sizeof(__storage_type));
-    __n -= __nw * __bits_per_word;
-    // do last partial word
-    if (__n > 0)
-    {
-        __first.__seg_ += __nw;
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        *__first.__seg_ |= __m;
-    }
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-fill_n(__bit_iterator<_Cp, false> __first, typename _Cp::size_type __n, bool __value_)
-{
-    if (__n > 0)
-    {
-        if (__value_)
-            __fill_n_true(__first, __n);
-        else
-            __fill_n_false(__first, __n);
-    }
-}
-
-// fill
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-fill(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __last, bool __value_)
-{
-    _VSTD::fill_n(__first, static_cast<typename _Cp::size_type>(__last - __first), __value_);
-}
-
-// copy
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, false>
-__copy_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
-                                                     __bit_iterator<_Cp, false> __result)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _In;
-    typedef  typename _In::difference_type difference_type;
-    typedef typename _In::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _In::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first.__ctz_ != 0)
-        {
-            unsigned __clz = __bits_per_word - __first.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
-            __storage_type __b = *__first.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b;
-            __result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_)  % __bits_per_word);
-            ++__first.__seg_;
-            // __first.__ctz_ = 0;
-        }
-        // __first.__ctz_ == 0;
-        // do middle words
-        __storage_type __nw = __n / __bits_per_word;
-        _VSTD::memmove(_VSTD::__to_raw_pointer(__result.__seg_),
-                       _VSTD::__to_raw_pointer(__first.__seg_),
-                       __nw * sizeof(__storage_type));
-        __n -= __nw * __bits_per_word;
-        __result.__seg_ += __nw;
-        // do last word
-        if (__n > 0)
-        {
-            __first.__seg_ += __nw;
-            __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b = *__first.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b;
-            __result.__ctz_ = static_cast<unsigned>(__n);
-        }
-    }
-    return __result;
-}
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, false>
-__copy_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
-                                                       __bit_iterator<_Cp, false> __result)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _In;
-    typedef  typename _In::difference_type difference_type;
-    typedef typename _In::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _In::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first.__ctz_ != 0)
-        {
-            unsigned __clz_f = __bits_per_word - __first.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-            __storage_type __b = *__first.__seg_ & __m;
-            unsigned __clz_r = __bits_per_word - __result.__ctz_;
-            __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r);
-            __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
-            *__result.__seg_ &= ~__m;
-            if (__result.__ctz_ > __first.__ctz_)
-                *__result.__seg_ |= __b << (__result.__ctz_ - __first.__ctz_);
-            else
-                *__result.__seg_ |= __b >> (__first.__ctz_ - __result.__ctz_);
-            __result.__seg_ += (__ddn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__ddn + __result.__ctz_)  % __bits_per_word);
-            __dn -= __ddn;
-            if (__dn > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __dn);
-                *__result.__seg_ &= ~__m;
-                *__result.__seg_ |= __b >> (__first.__ctz_ + __ddn);
-                __result.__ctz_ = static_cast<unsigned>(__dn);
-            }
-            ++__first.__seg_;
-            // __first.__ctz_ = 0;
-        }
-        // __first.__ctz_ == 0;
-        // do middle words
-        unsigned __clz_r = __bits_per_word - __result.__ctz_;
-        __storage_type __m = ~__storage_type(0) << __result.__ctz_;
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_)
-        {
-            __storage_type __b = *__first.__seg_;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b << __result.__ctz_;
-            ++__result.__seg_;
-            *__result.__seg_ &= __m;
-            *__result.__seg_ |= __b >> __clz_r;
-        }
-        // do last word
-        if (__n > 0)
-        {
-            __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b = *__first.__seg_ & __m;
-            __storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__clz_r));
-            __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b << __result.__ctz_;
-            __result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_)  % __bits_per_word);
-            __n -= __dn;
-            if (__n > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __n);
-                *__result.__seg_ &= ~__m;
-                *__result.__seg_ |= __b >> __dn;
-                __result.__ctz_ = static_cast<unsigned>(__n);
-            }
-        }
-    }
-    return __result;
-}
-
-template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, false>
-copy(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
-{
-    if (__first.__ctz_ == __result.__ctz_)
-        return __copy_aligned(__first, __last, __result);
-    return __copy_unaligned(__first, __last, __result);
-}
-
-// copy_backward
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, false>
-__copy_backward_aligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
-                                                     __bit_iterator<_Cp, false> __result)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _In;
-    typedef  typename _In::difference_type difference_type;
-    typedef typename _In::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _In::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__last.__ctz_ != 0)
-        {
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__last.__ctz_), __n);
-            __n -= __dn;
-            unsigned __clz = __bits_per_word - __last.__ctz_;
-            __storage_type __m = (~__storage_type(0) << (__last.__ctz_ - __dn)) & (~__storage_type(0) >> __clz);
-            __storage_type __b = *__last.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b;
-            __result.__ctz_ = static_cast<unsigned>(((-__dn & (__bits_per_word - 1)) +
-                                                       __result.__ctz_)  % __bits_per_word);
-            // __last.__ctz_ = 0
-         }
-        // __last.__ctz_ == 0 || __n == 0
-        // __result.__ctz_ == 0 || __n == 0
-        // do middle words
-        __storage_type __nw = __n / __bits_per_word;
-        __result.__seg_ -= __nw;
-        __last.__seg_ -= __nw;
-        _VSTD::memmove(_VSTD::__to_raw_pointer(__result.__seg_),
-                       _VSTD::__to_raw_pointer(__last.__seg_),
-                       __nw * sizeof(__storage_type));
-        __n -= __nw * __bits_per_word;
-        // do last word
-        if (__n > 0)
-        {
-            __storage_type __m = ~__storage_type(0) << (__bits_per_word - __n);
-            __storage_type __b = *--__last.__seg_ & __m;
-            *--__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b;
-            __result.__ctz_ = static_cast<unsigned>(-__n & (__bits_per_word - 1));
-        }
-    }
-    return __result;
-}
-
-template <class _Cp, bool _IsConst>
-__bit_iterator<_Cp, false>
-__copy_backward_unaligned(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last,
-                                                       __bit_iterator<_Cp, false> __result)
-{
-    typedef __bit_iterator<_Cp, _IsConst> _In;
-    typedef  typename _In::difference_type difference_type;
-    typedef typename _In::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _In::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__last.__ctz_ != 0)
-        {
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__last.__ctz_), __n);
-            __n -= __dn;
-            unsigned __clz_l = __bits_per_word - __last.__ctz_;
-            __storage_type __m = (~__storage_type(0) << (__last.__ctz_ - __dn)) & (~__storage_type(0) >> __clz_l);
-            __storage_type __b = *__last.__seg_ & __m;
-            unsigned __clz_r = __bits_per_word - __result.__ctz_;
-            __storage_type __ddn = _VSTD::min(__dn, static_cast<difference_type>(__result.__ctz_));
-            if (__ddn > 0)
-            {
-                __m = (~__storage_type(0) << (__result.__ctz_ - __ddn)) & (~__storage_type(0) >> __clz_r);
-                *__result.__seg_ &= ~__m;
-                if (__result.__ctz_ > __last.__ctz_)
-                    *__result.__seg_ |= __b << (__result.__ctz_ - __last.__ctz_);
-                else
-                    *__result.__seg_ |= __b >> (__last.__ctz_ - __result.__ctz_);
-                __result.__ctz_ = static_cast<unsigned>(((-__ddn & (__bits_per_word - 1)) +
-                                                         __result.__ctz_)  % __bits_per_word);
-                __dn -= __ddn;
-            }
-            if (__dn > 0)
-            {
-                // __result.__ctz_ == 0
-                --__result.__seg_;
-                __result.__ctz_ = static_cast<unsigned>(-__dn & (__bits_per_word - 1));
-                __m = ~__storage_type(0) << __result.__ctz_;
-                *__result.__seg_ &= ~__m;
-                __last.__ctz_ -= __dn + __ddn;
-                *__result.__seg_ |= __b << (__result.__ctz_ - __last.__ctz_);
-            }
-            // __last.__ctz_ = 0
-         }
-        // __last.__ctz_ == 0 || __n == 0
-        // __result.__ctz_ != 0 || __n == 0
-        // do middle words
-        unsigned __clz_r = __bits_per_word - __result.__ctz_;
-        __storage_type __m = ~__storage_type(0) >> __clz_r;
-        for (; __n >= __bits_per_word; __n -= __bits_per_word)
-        {
-            __storage_type __b = *--__last.__seg_;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b >> __clz_r;
-            *--__result.__seg_ &= __m;
-            *__result.__seg_ |= __b << __result.__ctz_;
-        }
-        // do last word
-        if (__n > 0)
-        {
-            __m = ~__storage_type(0) << (__bits_per_word - __n);
-            __storage_type __b = *--__last.__seg_ & __m;
-            __clz_r = __bits_per_word - __result.__ctz_;
-            __storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__result.__ctz_));
-            __m = (~__storage_type(0) << (__result.__ctz_ - __dn)) & (~__storage_type(0) >> __clz_r);
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b >> (__bits_per_word - __result.__ctz_);
-            __result.__ctz_ = static_cast<unsigned>(((-__dn & (__bits_per_word - 1)) +
-                                                     __result.__ctz_)  % __bits_per_word);
-            __n -= __dn;
-            if (__n > 0)
-            {
-                // __result.__ctz_ == 0
-                --__result.__seg_;
-                __result.__ctz_ = static_cast<unsigned>(-__n & (__bits_per_word - 1));
-                __m = ~__storage_type(0) << __result.__ctz_;
-                *__result.__seg_ &= ~__m;
-                *__result.__seg_ |= __b << (__result.__ctz_ - (__bits_per_word - __n - __dn));
-            }
-        }
-    }
-    return __result;
-}
-
-template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, false>
-copy_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
-{
-    if (__last.__ctz_ == __result.__ctz_)
-        return __copy_backward_aligned(__first, __last, __result);
-    return __copy_backward_unaligned(__first, __last, __result);
-}
-
-// move
-
-template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, false>
-move(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
-{
-    return _VSTD::copy(__first, __last, __result);
-}
-
-// move_backward
-
-template <class _Cp, bool _IsConst>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<_Cp, false>
-move_backward(__bit_iterator<_Cp, _IsConst> __first, __bit_iterator<_Cp, _IsConst> __last, __bit_iterator<_Cp, false> __result)
-{
-    return _VSTD::copy_backward(__first, __last, __result);
-}
-
-// swap_ranges
-
-template <class __C1, class __C2>
-__bit_iterator<__C2, false>
-__swap_ranges_aligned(__bit_iterator<__C1, false> __first, __bit_iterator<__C1, false> __last,
-                      __bit_iterator<__C2, false> __result)
-{
-    typedef __bit_iterator<__C1, false> _I1;
-    typedef  typename _I1::difference_type difference_type;
-    typedef typename _I1::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _I1::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first.__ctz_ != 0)
-        {
-            unsigned __clz = __bits_per_word - __first.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
-            __storage_type __b1 = *__first.__seg_ & __m;
-            *__first.__seg_ &= ~__m;
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b1;
-            *__first.__seg_  |= __b2;
-            __result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_)  % __bits_per_word);
-            ++__first.__seg_;
-            // __first.__ctz_ = 0;
-        }
-        // __first.__ctz_ == 0;
-        // do middle words
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_, ++__result.__seg_)
-            swap(*__first.__seg_, *__result.__seg_);
-        // do last word
-        if (__n > 0)
-        {
-            __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b1 = *__first.__seg_ & __m;
-            *__first.__seg_ &= ~__m;
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b1;
-            *__first.__seg_  |= __b2;
-            __result.__ctz_ = static_cast<unsigned>(__n);
-        }
-    }
-    return __result;
-}
-
-template <class __C1, class __C2>
-__bit_iterator<__C2, false>
-__swap_ranges_unaligned(__bit_iterator<__C1, false> __first, __bit_iterator<__C1, false> __last,
-                        __bit_iterator<__C2, false> __result)
-{
-    typedef __bit_iterator<__C1, false> _I1;
-    typedef  typename _I1::difference_type difference_type;
-    typedef typename _I1::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _I1::__bits_per_word;
-    difference_type __n = __last - __first;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first.__ctz_ != 0)
-        {
-            unsigned __clz_f = __bits_per_word - __first.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-            __storage_type __b1 = *__first.__seg_ & __m;
-            *__first.__seg_ &= ~__m;
-            unsigned __clz_r = __bits_per_word - __result.__ctz_;
-            __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r);
-            __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            if (__result.__ctz_ > __first.__ctz_)
-            {
-                unsigned __s = __result.__ctz_ - __first.__ctz_;
-                *__result.__seg_ |= __b1 << __s;
-                *__first.__seg_  |= __b2 >> __s;
-            }
-            else
-            {
-                unsigned __s = __first.__ctz_ - __result.__ctz_;
-                *__result.__seg_ |= __b1 >> __s;
-                *__first.__seg_  |= __b2 << __s;
-            }
-            __result.__seg_ += (__ddn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__ddn + __result.__ctz_)  % __bits_per_word);
-            __dn -= __ddn;
-            if (__dn > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __dn);
-                __b2 = *__result.__seg_ & __m;
-                *__result.__seg_ &= ~__m;
-                unsigned __s = __first.__ctz_ + __ddn;
-                *__result.__seg_ |= __b1 >> __s;
-                *__first.__seg_  |= __b2 << __s;
-                __result.__ctz_ = static_cast<unsigned>(__dn);
-            }
-            ++__first.__seg_;
-            // __first.__ctz_ = 0;
-        }
-        // __first.__ctz_ == 0;
-        // do middle words
-        __storage_type __m = ~__storage_type(0) << __result.__ctz_;
-        unsigned __clz_r = __bits_per_word - __result.__ctz_;
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first.__seg_)
-        {
-            __storage_type __b1 = *__first.__seg_;
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b1 << __result.__ctz_;
-            *__first.__seg_  = __b2 >> __result.__ctz_;
-            ++__result.__seg_;
-            __b2 = *__result.__seg_ & ~__m;
-            *__result.__seg_ &= __m;
-            *__result.__seg_ |= __b1 >> __clz_r;
-            *__first.__seg_  |= __b2 << __clz_r;
-        }
-        // do last word
-        if (__n > 0)
-        {
-            __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b1 = *__first.__seg_ & __m;
-            *__first.__seg_ &= ~__m;
-            __storage_type __dn = _VSTD::min<__storage_type>(__n, __clz_r);
-            __m = (~__storage_type(0) << __result.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
-            __storage_type __b2 = *__result.__seg_ & __m;
-            *__result.__seg_ &= ~__m;
-            *__result.__seg_ |= __b1 << __result.__ctz_;
-            *__first.__seg_  |= __b2 >> __result.__ctz_;
-            __result.__seg_ += (__dn + __result.__ctz_) / __bits_per_word;
-            __result.__ctz_ = static_cast<unsigned>((__dn + __result.__ctz_)  % __bits_per_word);
-            __n -= __dn;
-            if (__n > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __n);
-                __b2 = *__result.__seg_ & __m;
-                *__result.__seg_ &= ~__m;
-                *__result.__seg_ |= __b1 >> __dn;
-                *__first.__seg_  |= __b2 << __dn;
-                __result.__ctz_ = static_cast<unsigned>(__n);
-            }
-        }
-    }
-    return __result;
-}
-
-template <class __C1, class __C2>
-inline _LIBCPP_INLINE_VISIBILITY
-__bit_iterator<__C2, false>
-swap_ranges(__bit_iterator<__C1, false> __first1, __bit_iterator<__C1, false> __last1,
-            __bit_iterator<__C2, false> __first2)
-{
-    if (__first1.__ctz_ == __first2.__ctz_)
-        return __swap_ranges_aligned(__first1, __last1, __first2);
-    return __swap_ranges_unaligned(__first1, __last1, __first2);
-}
-
-// rotate
-
-template <class _Cp>
-struct __bit_array
-{
-    typedef typename _Cp::difference_type difference_type;
-    typedef typename _Cp::__storage_type  __storage_type;
-    typedef typename _Cp::__storage_pointer __storage_pointer;
-    typedef typename _Cp::iterator        iterator;
-    static const unsigned __bits_per_word = _Cp::__bits_per_word;
-    static const unsigned _Np = 4;
-
-    difference_type __size_;
-    __storage_type __word_[_Np];
-
-    _LIBCPP_INLINE_VISIBILITY static difference_type capacity()
-        {return static_cast<difference_type>(_Np * __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY explicit __bit_array(difference_type __s) : __size_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY iterator begin()
-    {
-        return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]), 0);
-    }
-    _LIBCPP_INLINE_VISIBILITY iterator end()
-    {
-        return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]) + __size_ / __bits_per_word,
-                                                  static_cast<unsigned>(__size_ % __bits_per_word));
-    }
-};
-
-template <class _Cp>
-__bit_iterator<_Cp, false>
-rotate(__bit_iterator<_Cp, false> __first, __bit_iterator<_Cp, false> __middle, __bit_iterator<_Cp, false> __last)
-{
-    typedef __bit_iterator<_Cp, false> _I1;
-    typedef  typename _I1::difference_type difference_type;
-    difference_type __d1 = __middle - __first;
-    difference_type __d2 = __last - __middle;
-    _I1 __r = __first + __d2;
-    while (__d1 != 0 && __d2 != 0)
-    {
-        if (__d1 <= __d2)
-        {
-            if (__d1 <= __bit_array<_Cp>::capacity())
-            {
-                __bit_array<_Cp> __b(__d1);
-                _VSTD::copy(__first, __middle, __b.begin());
-                _VSTD::copy(__b.begin(), __b.end(), _VSTD::copy(__middle, __last, __first));
-                break;
-            }
-            else
-            {
-                __bit_iterator<_Cp, false> __mp = _VSTD::swap_ranges(__first, __middle, __middle);
-                __first = __middle;
-                __middle = __mp;
-                __d2 -= __d1;
-            }
-        }
-        else
-        {
-            if (__d2 <= __bit_array<_Cp>::capacity())
-            {
-                __bit_array<_Cp> __b(__d2);
-                _VSTD::copy(__middle, __last, __b.begin());
-                _VSTD::copy_backward(__b.begin(), __b.end(), _VSTD::copy_backward(__first, __middle, __last));
-                break;
-            }
-            else
-            {
-                __bit_iterator<_Cp, false> __mp = __first + __d2;
-                _VSTD::swap_ranges(__first, __mp, __middle);
-                __first = __mp;
-                __d1 -= __d2;
-            }
-        }
-    }
-    return __r;
-}
-
-// equal
-
-template <class _Cp, bool _IC1, bool _IC2>
-bool
-__equal_unaligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1,
-                  __bit_iterator<_Cp, _IC2> __first2)
-{
-    typedef __bit_iterator<_Cp, _IC1> _It;
-    typedef  typename _It::difference_type difference_type;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    difference_type __n = __last1 - __first1;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first1.__ctz_ != 0)
-        {
-            unsigned __clz_f = __bits_per_word - __first1.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz_f), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first1.__ctz_) & (~__storage_type(0) >> (__clz_f - __dn));
-            __storage_type __b = *__first1.__seg_ & __m;
-            unsigned __clz_r = __bits_per_word - __first2.__ctz_;
-            __storage_type __ddn = _VSTD::min<__storage_type>(__dn, __clz_r);
-            __m = (~__storage_type(0) << __first2.__ctz_) & (~__storage_type(0) >> (__clz_r - __ddn));
-            if (__first2.__ctz_ > __first1.__ctz_)
-            {
-                if ((*__first2.__seg_ & __m) != (__b << (__first2.__ctz_ - __first1.__ctz_)))
-                    return false;
-            }
-            else
-            {
-                if ((*__first2.__seg_ & __m) != (__b >> (__first1.__ctz_ - __first2.__ctz_)))
-                    return false;
-            }
-            __first2.__seg_ += (__ddn + __first2.__ctz_) / __bits_per_word;
-            __first2.__ctz_ = static_cast<unsigned>((__ddn + __first2.__ctz_)  % __bits_per_word);
-            __dn -= __ddn;
-            if (__dn > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __dn);
-                if ((*__first2.__seg_ & __m) != (__b >> (__first1.__ctz_ + __ddn)))
-                    return false;
-                __first2.__ctz_ = static_cast<unsigned>(__dn);
-            }
-            ++__first1.__seg_;
-            // __first1.__ctz_ = 0;
-        }
-        // __first1.__ctz_ == 0;
-        // do middle words
-        unsigned __clz_r = __bits_per_word - __first2.__ctz_;
-        __storage_type __m = ~__storage_type(0) << __first2.__ctz_;
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first1.__seg_)
-        {
-            __storage_type __b = *__first1.__seg_;
-            if ((*__first2.__seg_ & __m) != (__b << __first2.__ctz_))
-                return false;
-            ++__first2.__seg_;
-            if ((*__first2.__seg_ & ~__m) != (__b >> __clz_r))
-                return false;
-        }
-        // do last word
-        if (__n > 0)
-        {
-            __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            __storage_type __b = *__first1.__seg_ & __m;
-            __storage_type __dn = _VSTD::min(__n, static_cast<difference_type>(__clz_r));
-            __m = (~__storage_type(0) << __first2.__ctz_) & (~__storage_type(0) >> (__clz_r - __dn));
-            if ((*__first2.__seg_ & __m) != (__b << __first2.__ctz_))
-                return false;
-            __first2.__seg_ += (__dn + __first2.__ctz_) / __bits_per_word;
-            __first2.__ctz_ = static_cast<unsigned>((__dn + __first2.__ctz_)  % __bits_per_word);
-            __n -= __dn;
-            if (__n > 0)
-            {
-                __m = ~__storage_type(0) >> (__bits_per_word - __n);
-                if ((*__first2.__seg_ & __m) != (__b >> __dn))
-                    return false;
-            }
-        }
-    }
-    return true;
-}
-
-template <class _Cp, bool _IC1, bool _IC2>
-bool
-__equal_aligned(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1,
-                __bit_iterator<_Cp, _IC2> __first2)
-{
-    typedef __bit_iterator<_Cp, _IC1> _It;
-    typedef  typename _It::difference_type difference_type;
-    typedef typename _It::__storage_type __storage_type;
-    static const unsigned __bits_per_word = _It::__bits_per_word;
-    difference_type __n = __last1 - __first1;
-    if (__n > 0)
-    {
-        // do first word
-        if (__first1.__ctz_ != 0)
-        {
-            unsigned __clz = __bits_per_word - __first1.__ctz_;
-            difference_type __dn = _VSTD::min(static_cast<difference_type>(__clz), __n);
-            __n -= __dn;
-            __storage_type __m = (~__storage_type(0) << __first1.__ctz_) & (~__storage_type(0) >> (__clz - __dn));
-            if ((*__first2.__seg_ & __m) != (*__first1.__seg_ & __m))
-                return false;
-            ++__first2.__seg_;
-            ++__first1.__seg_;
-            // __first1.__ctz_ = 0;
-            // __first2.__ctz_ = 0;
-        }
-        // __first1.__ctz_ == 0;
-        // __first2.__ctz_ == 0;
-        // do middle words
-        for (; __n >= __bits_per_word; __n -= __bits_per_word, ++__first1.__seg_, ++__first2.__seg_)
-            if (*__first2.__seg_ != *__first1.__seg_)
-                return false;
-        // do last word
-        if (__n > 0)
-        {
-            __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-            if ((*__first2.__seg_ & __m) != (*__first1.__seg_ & __m))
-                return false;
-        }
-    }
-    return true;
-}
-
-template <class _Cp, bool _IC1, bool _IC2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(__bit_iterator<_Cp, _IC1> __first1, __bit_iterator<_Cp, _IC1> __last1, __bit_iterator<_Cp, _IC2> __first2)
-{
-    if (__first1.__ctz_ == __first2.__ctz_)
-        return __equal_aligned(__first1, __last1, __first2);
-    return __equal_unaligned(__first1, __last1, __first2);
-}
-
-template <class _Cp, bool _IsConst,
-          typename _Cp::__storage_type>
-class __bit_iterator
-{
-public:
-    typedef typename _Cp::difference_type                                                          difference_type;
-    typedef bool                                                                                  value_type;
-    typedef __bit_iterator                                                                        pointer;
-    typedef typename conditional<_IsConst, __bit_const_reference<_Cp>, __bit_reference<_Cp> >::type reference;
-    typedef random_access_iterator_tag                                                            iterator_category;
-
-private:
-    typedef typename _Cp::__storage_type                                           __storage_type;
-    typedef typename conditional<_IsConst, typename _Cp::__const_storage_pointer,
-                                           typename _Cp::__storage_pointer>::type  __storage_pointer;
-    static const unsigned __bits_per_word = _Cp::__bits_per_word;
-
-    __storage_pointer __seg_;
-    unsigned          __ctz_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __seg_(nullptr), __ctz_(0)
-#endif
-    {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_iterator(const __bit_iterator<_Cp, false>& __it) _NOEXCEPT
-        : __seg_(__it.__seg_), __ctz_(__it.__ctz_) {}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const _NOEXCEPT
-        {return reference(__seg_, __storage_type(1) << __ctz_);}
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator& operator++()
-    {
-        if (__ctz_ != __bits_per_word-1)
-            ++__ctz_;
-        else
-        {
-            __ctz_ = 0;
-            ++__seg_;
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator operator++(int)
-    {
-        __bit_iterator __tmp = *this;
-        ++(*this);
-        return __tmp;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator& operator--()
-    {
-        if (__ctz_ != 0)
-            --__ctz_;
-        else
-        {
-            __ctz_ = __bits_per_word - 1;
-            --__seg_;
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator operator--(int)
-    {
-        __bit_iterator __tmp = *this;
-        --(*this);
-        return __tmp;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator& operator+=(difference_type __n)
-    {
-        if (__n >= 0)
-            __seg_ += (__n + __ctz_) / __bits_per_word;
-        else
-            __seg_ += static_cast<difference_type>(__n - __bits_per_word + __ctz_ + 1)
-                    / static_cast<difference_type>(__bits_per_word);
-        __n &= (__bits_per_word - 1);
-        __ctz_ = static_cast<unsigned>((__n + __ctz_)  % __bits_per_word);
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator& operator-=(difference_type __n)
-    {
-        return *this += -__n;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator operator+(difference_type __n) const
-    {
-        __bit_iterator __t(*this);
-        __t += __n;
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __bit_iterator operator-(difference_type __n) const
-    {
-        __bit_iterator __t(*this);
-        __t -= __n;
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    friend __bit_iterator operator+(difference_type __n, const __bit_iterator& __it) {return __it + __n;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    friend difference_type operator-(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return (__x.__seg_ - __y.__seg_) * __bits_per_word + __x.__ctz_ - __y.__ctz_;}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator[](difference_type __n) const {return *(*this + __n);}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator==(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return __x.__seg_ == __y.__seg_ && __x.__ctz_ == __y.__ctz_;}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator!=(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return !(__x == __y);}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator<(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return __x.__seg_ < __y.__seg_ || (__x.__seg_ == __y.__seg_ && __x.__ctz_ < __y.__ctz_);}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator>(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return __y < __x;}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator<=(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return !(__y < __x);}
-
-    _LIBCPP_INLINE_VISIBILITY friend bool operator>=(const __bit_iterator& __x, const __bit_iterator& __y)
-        {return !(__x < __y);}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    __bit_iterator(__storage_pointer __s, unsigned __ctz) _NOEXCEPT
-        : __seg_(__s), __ctz_(__ctz) {}
-
-#if defined(__clang__) || defined(__IBMCPP__) || defined(_LIBCPP_MSVC)
-    friend typename _Cp::__self;
-#else
-    friend class _Cp::__self;
-#endif
-    friend class __bit_reference<_Cp>;
-    friend class __bit_const_reference<_Cp>;
-    friend class __bit_iterator<_Cp, true>;
-    template <class _Dp> friend struct __bit_array;
-    template <class _Dp> friend void __fill_n_false(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n);
-    template <class _Dp> friend void __fill_n_true(__bit_iterator<_Dp, false> __first, typename _Dp::size_type __n);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_aligned(__bit_iterator<_Dp, _IC> __first,
-                                                                                  __bit_iterator<_Dp, _IC> __last,
-                                                                                  __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_unaligned(__bit_iterator<_Dp, _IC> __first,
-                                                                                    __bit_iterator<_Dp, _IC> __last,
-                                                                                    __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> copy(__bit_iterator<_Dp, _IC> __first,
-                                                                        __bit_iterator<_Dp, _IC> __last,
-                                                                        __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_backward_aligned(__bit_iterator<_Dp, _IC> __first,
-                                                                                           __bit_iterator<_Dp, _IC> __last,
-                                                                                           __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> __copy_backward_unaligned(__bit_iterator<_Dp, _IC> __first,
-                                                                                             __bit_iterator<_Dp, _IC> __last,
-                                                                                             __bit_iterator<_Dp, false> __result);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, false> copy_backward(__bit_iterator<_Dp, _IC> __first,
-                                                                                 __bit_iterator<_Dp, _IC> __last,
-                                                                                 __bit_iterator<_Dp, false> __result);
-    template <class __C1, class __C2>friend __bit_iterator<__C2, false> __swap_ranges_aligned(__bit_iterator<__C1, false>,
-                                                                                           __bit_iterator<__C1, false>,
-                                                                                           __bit_iterator<__C2, false>);
-    template <class __C1, class __C2>friend __bit_iterator<__C2, false> __swap_ranges_unaligned(__bit_iterator<__C1, false>,
-                                                                                             __bit_iterator<__C1, false>,
-                                                                                             __bit_iterator<__C2, false>);
-    template <class __C1, class __C2>friend __bit_iterator<__C2, false> swap_ranges(__bit_iterator<__C1, false>,
-                                                                                 __bit_iterator<__C1, false>,
-                                                                                 __bit_iterator<__C2, false>);
-    template <class _Dp> friend __bit_iterator<_Dp, false> rotate(__bit_iterator<_Dp, false>,
-                                                                __bit_iterator<_Dp, false>,
-                                                                __bit_iterator<_Dp, false>);
-    template <class _Dp, bool _IC1, bool _IC2> friend bool __equal_aligned(__bit_iterator<_Dp, _IC1>,
-                                                    __bit_iterator<_Dp, _IC1>,
-                                                    __bit_iterator<_Dp, _IC2>);
-    template <class _Dp, bool _IC1, bool _IC2> friend bool __equal_unaligned(__bit_iterator<_Dp, _IC1>,
-                                                      __bit_iterator<_Dp, _IC1>,
-                                                      __bit_iterator<_Dp, _IC2>);
-    template <class _Dp, bool _IC1, bool _IC2> friend bool equal(__bit_iterator<_Dp, _IC1>,
-                                                                __bit_iterator<_Dp, _IC1>,
-                                                                __bit_iterator<_Dp, _IC2>);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, _IC> __find_bool_true(__bit_iterator<_Dp, _IC>,
-                                                                          typename _Dp::size_type);
-    template <class _Dp, bool _IC> friend __bit_iterator<_Dp, _IC> __find_bool_false(__bit_iterator<_Dp, _IC>,
-                                                                           typename _Dp::size_type);
-    template <class _Dp, bool _IC> friend typename __bit_iterator<_Dp, _IC>::difference_type
-                   __count_bool_true(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
-    template <class _Dp, bool _IC> friend typename __bit_iterator<_Dp, _IC>::difference_type
-                   __count_bool_false(__bit_iterator<_Dp, _IC>, typename _Dp::size_type);
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___BIT_REFERENCE
diff --git a/include.new/c++/v1/tr1/__config b/include.new/c++/v1/tr1/__config
deleted file mode 100644
index c5b9a6b..0000000
--- a/include.new/c++/v1/tr1/__config
+++ /dev/null
@@ -1,734 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- __config ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CONFIG
-#define _LIBCPP_CONFIG
-
-#if !defined(_MSC_VER) || defined(__clang__)
-#pragma GCC system_header
-#endif
-
-#ifdef __GNUC__
-#define _GNUC_VER (__GNUC__ * 100 + __GNUC_MINOR__)
-#endif
-
-#if !_WIN32
-#include <unistd.h>
-#include <errno.h>  // for ELAST on FreeBSD
-#endif
-
-#define _LIBCPP_VERSION 1101
-
-#define _LIBCPP_ABI_VERSION 1
-
-#define _LIBCPP_CONCAT1(_LIBCPP_X,_LIBCPP_Y) _LIBCPP_X##_LIBCPP_Y
-#define _LIBCPP_CONCAT(_LIBCPP_X,_LIBCPP_Y) _LIBCPP_CONCAT1(_LIBCPP_X,_LIBCPP_Y)
-
-#define _LIBCPP_NAMESPACE _LIBCPP_CONCAT(__,_LIBCPP_ABI_VERSION)
-
-#ifdef __LITTLE_ENDIAN__
-#if __LITTLE_ENDIAN__
-#define _LIBCPP_LITTLE_ENDIAN 1
-#define _LIBCPP_BIG_ENDIAN    0
-#endif  // __LITTLE_ENDIAN__
-#endif  // __LITTLE_ENDIAN__
-
-#ifdef __BIG_ENDIAN__
-#if __BIG_ENDIAN__
-#define _LIBCPP_LITTLE_ENDIAN 0
-#define _LIBCPP_BIG_ENDIAN    1
-#endif  // __BIG_ENDIAN__
-#endif  // __BIG_ENDIAN__
-
-#ifdef __FreeBSD__
-# include <sys/endian.h>
-#  if _BYTE_ORDER == _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 1
-#   define _LIBCPP_BIG_ENDIAN    0
-# else  // _BYTE_ORDER == _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 0
-#   define _LIBCPP_BIG_ENDIAN    1
-# endif  // _BYTE_ORDER == _LITTLE_ENDIAN
-# ifndef __LONG_LONG_SUPPORTED
-#  define _LIBCPP_HAS_NO_LONG_LONG
-# endif  // __LONG_LONG_SUPPORTED
-#endif  // __FreeBSD__
-
-#ifdef __NetBSD__
-# include <sys/endian.h>
-#  if _BYTE_ORDER == _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 1
-#   define _LIBCPP_BIG_ENDIAN    0
-# else  // _BYTE_ORDER == _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 0
-#   define _LIBCPP_BIG_ENDIAN    1
-# endif  // _BYTE_ORDER == _LITTLE_ENDIAN
-# define _LIBCPP_HAS_QUICK_EXIT
-#endif  // __NetBSD__
-
-#ifdef _WIN32
-#  define _LIBCPP_LITTLE_ENDIAN 1
-#  define _LIBCPP_BIG_ENDIAN    0
-// Compiler intrinsics (GCC or MSVC)
-#  if defined(__clang__) \
-   || (defined(_MSC_VER) && _MSC_VER >= 1400) \
-   || (defined(__GNUC__) && _GNUC_VER > 403)
-#    define _LIBCPP_HAS_IS_BASE_OF
-#  endif
-#  if defined(_MSC_VER) && !defined(__clang__)
-#    define _LIBCPP_MSVC // Using Microsoft Visual C++ compiler
-#    define _LIBCPP_TOSTRING2(x) #x
-#    define _LIBCPP_TOSTRING(x) _LIBCPP_TOSTRING2(x)
-#    define _LIBCPP_WARNING(x) __pragma(message(__FILE__ "(" _LIBCPP_TOSTRING(__LINE__) ") : warning note: " x))
-#  endif
-#  // If mingw not explicitly detected, assume using MS C runtime only.
-#  ifndef __MINGW32__
-#    define _LIBCPP_MSVCRT // Using Microsoft's C Runtime library
-#  endif
-#endif  // _WIN32
-
-#ifdef __linux__
-#  if defined(__GNUC__) && _GNUC_VER >= 403
-#    define _LIBCPP_HAS_IS_BASE_OF
-#  endif
-#endif
-
-#ifdef __sun__
-# include <sys/isa_defs.h>
-# ifdef _LITTLE_ENDIAN
-#   define _LIBCPP_LITTLE_ENDIAN 1
-#   define _LIBCPP_BIG_ENDIAN    0
-# else
-#   define _LIBCPP_LITTLE_ENDIAN 0
-#   define _LIBCPP_BIG_ENDIAN    1
-# endif
-#endif // __sun__
-
-#if defined(__native_client__)
-  // NaCl's sandbox (which PNaCl also runs in) doesn't allow filesystem access,
-  // including accesses to the special files under /dev. C++11's
-  // std::random_device is instead exposed through a NaCl syscall.
-# define _LIBCPP_USING_NACL_RANDOM
-#endif // defined(__native_client__)
-
-#if !defined(_LIBCPP_LITTLE_ENDIAN) || !defined(_LIBCPP_BIG_ENDIAN)
-# include <endian.h>
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-#  define _LIBCPP_LITTLE_ENDIAN 1
-#  define _LIBCPP_BIG_ENDIAN    0
-# elif __BYTE_ORDER == __BIG_ENDIAN
-#  define _LIBCPP_LITTLE_ENDIAN 0
-#  define _LIBCPP_BIG_ENDIAN    1
-# else  // __BYTE_ORDER == __BIG_ENDIAN
-#  error unable to determine endian
-# endif
-#endif  // !defined(_LIBCPP_LITTLE_ENDIAN) || !defined(_LIBCPP_BIG_ENDIAN)
-
-#ifdef _WIN32
-
-// only really useful for a DLL
-#ifdef _LIBCPP_DLL // this should be a compiler builtin define ideally...
-# ifdef cxx_EXPORTS
-#  define _LIBCPP_HIDDEN
-#  define _LIBCPP_FUNC_VIS __declspec(dllexport)
-#  define _LIBCPP_TYPE_VIS __declspec(dllexport)
-# else
-#  define _LIBCPP_HIDDEN
-#  define _LIBCPP_FUNC_VIS __declspec(dllimport)
-#  define _LIBCPP_TYPE_VIS __declspec(dllimport)
-# endif
-#else
-# define _LIBCPP_HIDDEN
-# define _LIBCPP_FUNC_VIS
-# define _LIBCPP_TYPE_VIS
-#endif
-
-#define _LIBCPP_TYPE_VIS_ONLY
-#define _LIBCPP_FUNC_VIS_ONLY
-
-#ifndef _LIBCPP_INLINE_VISIBILITY
-# ifdef _LIBCPP_MSVC
-#  define _LIBCPP_INLINE_VISIBILITY __forceinline
-# else // MinGW GCC and Clang
-#  define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__always_inline__))
-# endif
-#endif
-
-#ifndef _LIBCPP_EXCEPTION_ABI
-#define _LIBCPP_EXCEPTION_ABI _LIBCPP_TYPE_VIS
-#endif
-
-#ifndef _LIBCPP_ALWAYS_INLINE
-# ifdef _LIBCPP_MSVC
-#  define _LIBCPP_ALWAYS_INLINE __forceinline
-# endif
-#endif
-
-#endif // _WIN32
-
-#ifndef __has_attribute
-#define __has_attribute(__x) 0
-#endif
-
-#ifndef _LIBCPP_HIDDEN
-#define _LIBCPP_HIDDEN __attribute__ ((__visibility__("hidden")))
-#endif
-
-#ifndef _LIBCPP_FUNC_VIS
-#define _LIBCPP_FUNC_VIS __attribute__ ((__visibility__("default")))
-#endif
-
-#ifndef _LIBCPP_TYPE_VIS
-#  if __has_attribute(__type_visibility__)
-#    define _LIBCPP_TYPE_VIS __attribute__ ((__type_visibility__("default")))
-#  else
-#    define _LIBCPP_TYPE_VIS __attribute__ ((__visibility__("default")))
-#  endif
-#endif
-
-#ifndef _LIBCPP_TYPE_VIS_ONLY
-# define _LIBCPP_TYPE_VIS_ONLY _LIBCPP_TYPE_VIS
-#endif
-
-#ifndef _LIBCPP_FUNC_VIS_ONLY
-# define _LIBCPP_FUNC_VIS_ONLY _LIBCPP_FUNC_VIS
-#endif
-
-#ifndef _LIBCPP_INLINE_VISIBILITY
-#define _LIBCPP_INLINE_VISIBILITY __attribute__ ((__visibility__("hidden"), __always_inline__))
-#endif
-
-#ifndef _LIBCPP_EXCEPTION_ABI
-#define _LIBCPP_EXCEPTION_ABI __attribute__ ((__visibility__("default")))
-#endif
-
-#ifndef _LIBCPP_ALWAYS_INLINE
-#define _LIBCPP_ALWAYS_INLINE  __attribute__ ((__visibility__("hidden"), __always_inline__))
-#endif
-
-#if defined(__clang__)
-
-#if defined(__APPLE__) && !defined(__i386__) && !defined(__x86_64__) &&        \
-    !defined(__arm__)
-#define _LIBCPP_ALTERNATE_STRING_LAYOUT
-#endif
-
-#if __has_feature(cxx_alignas)
-#  define _ALIGNAS_TYPE(x) alignas(x)
-#  define _ALIGNAS(x) alignas(x)
-#else
-#  define _ALIGNAS_TYPE(x) __attribute__((__aligned__(__alignof(x))))
-#  define _ALIGNAS(x) __attribute__((__aligned__(x)))
-#endif
-
-#if !__has_feature(cxx_alias_templates)
-#define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-#endif
-
-#if __cplusplus < 201103L
-typedef __char16_t char16_t;
-typedef __char32_t char32_t;
-#endif
-
-#if !(__has_feature(cxx_exceptions))
-#define _LIBCPP_NO_EXCEPTIONS
-#endif
-
-#if !(__has_feature(cxx_rtti))
-#define _LIBCPP_NO_RTTI
-#endif
-
-#if !(__has_feature(cxx_strong_enums))
-#define _LIBCPP_HAS_NO_STRONG_ENUMS
-#endif
-
-#if !(__has_feature(cxx_decltype))
-#define _LIBCPP_HAS_NO_DECLTYPE
-#endif
-
-#if __has_feature(cxx_attributes)
-#  define _LIBCPP_NORETURN [[noreturn]]
-#else
-#  define _LIBCPP_NORETURN __attribute__ ((noreturn))
-#endif
-
-#define _LIBCPP_UNUSED __attribute__((__unused__))
-
-#if !(__has_feature(cxx_defaulted_functions))
-#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#endif  // !(__has_feature(cxx_defaulted_functions))
-
-#if !(__has_feature(cxx_deleted_functions))
-#define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-#endif  // !(__has_feature(cxx_deleted_functions))
-
-#if !(__has_feature(cxx_lambdas))
-#define _LIBCPP_HAS_NO_LAMBDAS
-#endif
-
-#if !(__has_feature(cxx_nullptr))
-#define _LIBCPP_HAS_NO_NULLPTR
-#endif
-
-#if !(__has_feature(cxx_rvalue_references))
-#define _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#endif
-
-#if !(__has_feature(cxx_static_assert))
-#define _LIBCPP_HAS_NO_STATIC_ASSERT
-#endif
-
-#if !(__has_feature(cxx_auto_type))
-#define _LIBCPP_HAS_NO_AUTO_TYPE
-#endif
-
-#if !(__has_feature(cxx_access_control_sfinae)) || !__has_feature(cxx_trailing_return)
-#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
-#endif
-
-#if !(__has_feature(cxx_variadic_templates))
-#define _LIBCPP_HAS_NO_VARIADICS
-#endif
-
-#if !(__has_feature(cxx_trailing_return))
-#define _LIBCPP_HAS_NO_TRAILING_RETURN
-#endif
-
-#if !(__has_feature(cxx_generalized_initializers))
-#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#endif
-
-#if __has_feature(is_base_of)
-#  define _LIBCPP_HAS_IS_BASE_OF
-#endif
-
-// Objective-C++ features (opt-in)
-#if __has_feature(objc_arc)
-#define _LIBCPP_HAS_OBJC_ARC
-#endif
-
-#if __has_feature(objc_arc_weak)
-#define _LIBCPP_HAS_OBJC_ARC_WEAK
-#define _LIBCPP_HAS_NO_STRONG_ENUMS
-#endif
-
-#if !(__has_feature(cxx_constexpr))
-#define _LIBCPP_HAS_NO_CONSTEXPR
-#endif
-
-#if !(__has_feature(cxx_relaxed_constexpr))
-#define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
-#endif
-
-#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
-#if defined(__FreeBSD__)
-#define _LIBCPP_HAS_QUICK_EXIT
-#define _LIBCPP_HAS_C11_FEATURES
-#elif defined(__ANDROID__)
-#define _LIBCPP_HAS_QUICK_EXIT
-#elif defined(__linux__)
-#include <features.h>
-#if __GLIBC_PREREQ(2, 15)
-#define _LIBCPP_HAS_QUICK_EXIT
-#endif
-#if __GLIBC_PREREQ(2, 17)
-#define _LIBCPP_HAS_C11_FEATURES
-#endif
-#endif
-#endif
-
-#if (__has_feature(cxx_noexcept))
-#  define _NOEXCEPT noexcept
-#  define _NOEXCEPT_(x) noexcept(x)
-#  define _NOEXCEPT_OR_FALSE(x) noexcept(x)
-#else
-#  define _NOEXCEPT throw()
-#  define _NOEXCEPT_(x)
-#  define _NOEXCEPT_OR_FALSE(x) false
-#endif
-
-#if __has_feature(underlying_type)
-#  define _LIBCPP_UNDERLYING_TYPE(T) __underlying_type(T)
-#endif
-
-#if __has_feature(is_literal)
-#  define _LIBCPP_IS_LITERAL(T) __is_literal(T)
-#endif
-
-// Inline namespaces are available in Clang regardless of C++ dialect.
-#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE {
-#define _LIBCPP_END_NAMESPACE_STD  } }
-#define _VSTD std::_LIBCPP_NAMESPACE
-
-namespace std {
-  inline namespace _LIBCPP_NAMESPACE {
-  }
-}
-
-#if !defined(_LIBCPP_HAS_NO_ASAN) && !__has_feature(address_sanitizer)
-#define _LIBCPP_HAS_NO_ASAN
-#endif
-
-#elif defined(__GNUC__)
-
-#define _ALIGNAS(x) __attribute__((__aligned__(x)))
-#define _ALIGNAS_TYPE(x) __attribute__((__aligned__(__alignof(x))))
-
-#define _LIBCPP_NORETURN __attribute__((noreturn))
-
-#define _LIBCPP_UNUSED __attribute__((__unused__))
-
-#if _GNUC_VER >= 407
-#define _LIBCPP_UNDERLYING_TYPE(T) __underlying_type(T)
-#define _LIBCPP_IS_LITERAL(T) __is_literal_type(T)
-#endif
-
-#if !__EXCEPTIONS
-#define _LIBCPP_NO_EXCEPTIONS
-#endif
-
-#define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-// constexpr was added to GCC in 4.6.
-#if _GNUC_VER < 406
-#define _LIBCPP_HAS_NO_CONSTEXPR
-// Can only use constexpr in c++11 mode.
-#elif !defined(__GXX_EXPERIMENTAL_CXX0X__) && __cplusplus < 201103L
-#define _LIBCPP_HAS_NO_CONSTEXPR
-#endif
-
-// No version of GCC supports relaxed constexpr rules
-#define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
-
-#define _NOEXCEPT throw()
-#define _NOEXCEPT_(x)
-#define _NOEXCEPT_OR_FALSE(x) false
-
-#ifndef __GXX_EXPERIMENTAL_CXX0X__
-
-#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
-#define _LIBCPP_HAS_NO_DECLTYPE
-#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-#define _LIBCPP_HAS_NO_NULLPTR
-#define _LIBCPP_HAS_NO_STATIC_ASSERT
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_NO_VARIADICS
-#define _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS
-#define _LIBCPP_HAS_NO_STRONG_ENUMS
-
-#else  // __GXX_EXPERIMENTAL_CXX0X__
-
-#define _LIBCPP_HAS_NO_TRAILING_RETURN
-#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS
-
-#if _GNUC_VER < 403
-#define _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#endif
-
-#if _GNUC_VER < 403
-#define _LIBCPP_HAS_NO_STATIC_ASSERT
-#endif
-
-#if _GNUC_VER < 404
-#define _LIBCPP_HAS_NO_DECLTYPE
-#define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_NO_VARIADICS
-#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#endif  // _GNUC_VER < 404
-
-#if _GNUC_VER < 406
-#define _LIBCPP_HAS_NO_NULLPTR
-#endif
-
-#if _GNUC_VER < 407
-#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
-#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#endif
-
-#endif  // __GXX_EXPERIMENTAL_CXX0X__
-
-#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std { namespace _LIBCPP_NAMESPACE {
-#define _LIBCPP_END_NAMESPACE_STD  } }
-#define _VSTD std::_LIBCPP_NAMESPACE
-
-namespace std {
-namespace _LIBCPP_NAMESPACE {
-}
-using namespace _LIBCPP_NAMESPACE __attribute__((__strong__));
-}
-
-#if !defined(_LIBCPP_HAS_NO_ASAN) && !defined(__SANITIZE_ADDRESS__)
-#define _LIBCPP_HAS_NO_ASAN
-#endif
-
-#elif defined(_LIBCPP_MSVC)
-
-#define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-#define _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-#define _LIBCPP_HAS_NO_CONSTEXPR
-#define _LIBCPP_HAS_NO_CXX14_CONSTEXPR
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-#define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#define __alignof__ __alignof
-#define _LIBCPP_NORETURN __declspec(noreturn)
-#define _LIBCPP_UNUSED
-#define _ALIGNAS(x) __declspec(align(x))
-#define _LIBCPP_HAS_NO_VARIADICS
-
-#define _NOEXCEPT throw ()
-#define _NOEXCEPT_(x)
-#define _NOEXCEPT_OR_FALSE(x) false
-
-#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {
-#define _LIBCPP_END_NAMESPACE_STD  }
-#define _VSTD std
-
-#  define _LIBCPP_WEAK
-namespace std {
-}
-
-#define _LIBCPP_HAS_NO_ASAN
-
-#elif defined(__IBMCPP__)
-
-#define _ALIGNAS(x) __attribute__((__aligned__(x)))
-#define _ALIGNAS_TYPE(x) __attribute__((__aligned__(__alignof(x))))
-#define _ATTRIBUTE(x) __attribute__((x))
-#define _LIBCPP_NORETURN __attribute__((noreturn))
-#define _LIBCPP_UNUSED
-
-#define _NOEXCEPT throw()
-#define _NOEXCEPT_(x)
-#define _NOEXCEPT_OR_FALSE(x) false
-
-#define _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-#define _LIBCPP_HAS_NO_ADVANCED_SFINAE
-#define _LIBCPP_HAS_NO_ALWAYS_INLINE_VARIADICS
-#define _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#define _LIBCPP_HAS_NO_NULLPTR
-#define _LIBCPP_HAS_NO_UNICODE_CHARS
-#define _LIBCPP_HAS_IS_BASE_OF
-
-#if defined(_AIX)
-#define __MULTILOCALE_API
-#endif
-
-#define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE {
-#define _LIBCPP_END_NAMESPACE_STD  } }
-#define _VSTD std::_LIBCPP_NAMESPACE
-
-namespace std {
-  inline namespace _LIBCPP_NAMESPACE {
-  }
-}
-
-#define _LIBCPP_HAS_NO_ASAN
-
-#endif // __clang__ || __GNUC__ || _MSC_VER || __IBMCPP__
-
-#ifdef _LIBCPP_HAS_NO_UNICODE_CHARS
-typedef unsigned short char16_t;
-typedef unsigned int   char32_t;
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-#ifndef __SIZEOF_INT128__
-#define _LIBCPP_HAS_NO_INT128
-#endif
-
-#ifdef _LIBCPP_HAS_NO_STATIC_ASSERT
-
-template <bool> struct __static_assert_test;
-template <> struct __static_assert_test<true> {};
-template <unsigned> struct __static_assert_check {};
-#define static_assert(__b, __m) \
-    typedef __static_assert_check<sizeof(__static_assert_test<(__b)>)> \
-    _LIBCPP_CONCAT(__t, __LINE__)
-
-#endif  // _LIBCPP_HAS_NO_STATIC_ASSERT
-
-#ifdef _LIBCPP_HAS_NO_DECLTYPE
-#define decltype(x) __typeof__(x)
-#endif
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-#define _LIBCPP_CONSTEXPR
-#else
-#define _LIBCPP_CONSTEXPR constexpr
-#endif
-
-#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-#define _LIBCPP_DEFAULT {}
-#else
-#define _LIBCPP_DEFAULT = default;
-#endif
-
-#ifdef __GNUC__
-#define _NOALIAS __attribute__((__malloc__))
-#else
-#define _NOALIAS
-#endif
-
-#ifndef __has_feature
-#define __has_feature(__x) 0
-#endif
-
-#ifndef __has_builtin
-#define __has_builtin(__x) 0
-#endif
-
-#if __has_feature(cxx_explicit_conversions) || defined(__IBMCPP__)
-#   define _LIBCPP_EXPLICIT explicit
-#else
-#   define _LIBCPP_EXPLICIT
-#endif
-
-#if !__has_builtin(__builtin_operator_new) || !__has_builtin(__builtin_operator_delete)
-#   define _LIBCPP_HAS_NO_BUILTIN_OPERATOR_NEW_DELETE
-#endif
-
-#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-#define _LIBCPP_DECLARE_STRONG_ENUM(x) struct _LIBCPP_TYPE_VIS x { enum __lx
-#define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x) \
-    __lx __v_; \
-    _LIBCPP_ALWAYS_INLINE x(__lx __v) : __v_(__v) {} \
-    _LIBCPP_ALWAYS_INLINE explicit x(int __v) : __v_(static_cast<__lx>(__v)) {} \
-    _LIBCPP_ALWAYS_INLINE operator int() const {return __v_;} \
-    };
-#else  // _LIBCPP_HAS_NO_STRONG_ENUMS
-#define _LIBCPP_DECLARE_STRONG_ENUM(x) enum class _LIBCPP_TYPE_VIS x
-#define _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(x)
-#endif  // _LIBCPP_HAS_NO_STRONG_ENUMS
-
-#ifdef _LIBCPP_DEBUG
-#   if _LIBCPP_DEBUG == 0
-#       define _LIBCPP_DEBUG_LEVEL 1
-#   elif _LIBCPP_DEBUG == 1
-#       define _LIBCPP_DEBUG_LEVEL 2
-#   else
-#       error Supported values for _LIBCPP_DEBUG are 0 and 1
-#   endif
-#   define _LIBCPP_EXTERN_TEMPLATE(...)
-#endif
-
-#ifndef _LIBCPP_EXTERN_TEMPLATE
-#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
-#endif
-
-#ifndef _LIBCPP_EXTERN_TEMPLATE2
-#define _LIBCPP_EXTERN_TEMPLATE2(...) extern template __VA_ARGS__;
-#endif
-
-#if defined(__APPLE__) && defined(__LP64__) && !defined(__x86_64__)
-#define _LIBCPP_NONUNIQUE_RTTI_BIT (1ULL << 63)
-#endif
-
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__) || defined(__NetBSD__)
-#define _LIBCPP_LOCALE__L_EXTENSIONS 1
-#endif
-
-#ifdef __FreeBSD__
-#define _DECLARE_C99_LDBL_MATH 1
-#endif
-
-#if defined(__APPLE__) || defined(__FreeBSD__)
-#define _LIBCPP_HAS_DEFAULTRUNELOCALE
-#endif
-
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun__)
-#define _LIBCPP_WCTYPE_IS_MASK
-#endif
-
-#if defined(ELAST)
-#define _LIBCPP_ELAST ELAST
-#elif defined(__linux__)
-#define _LIBCPP_ELAST 4095
-#elif defined(_NEWLIB_VERSION)
-#define _LIBCPP_ELAST __ELASTERROR
-#elif defined(__APPLE__)
-// Not _LIBCPP_ELAST needed on Apple
-#elif defined(__sun__)
-#define _LIBCPP_ELAST ESTALE
-#else
-// Warn here so that the person doing the libcxx port has an easier time:
-#warning This platform's ELAST hasn't been ported yet
-#endif
-
-#ifndef _LIBCPP_TRIVIAL_PAIR_COPY_CTOR
-#  if defined(__FreeBSD__)
-// Making the std::pair copy constructor trivial breaks ABI compatibility with
-// earlier versions of libc++ shipped by FreeBSD, so turn it off by default.
-// See also http://svnweb.freebsd.org/changeset/base/261801
-#    define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 0
-#  else
-#    define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 1
-#  endif
-#endif
-
-#ifndef _LIBCPP_STD_VER
-#  if  __cplusplus <= 201103L
-#    define _LIBCPP_STD_VER 11
-#  elif __cplusplus <= 201402L
-#    define _LIBCPP_STD_VER 14
-#  else
-#    define _LIBCPP_STD_VER 15  // current year, or date of c++17 ratification
-#  endif
-#endif  // _LIBCPP_STD_VER
-
-#if _LIBCPP_STD_VER > 11
-#define _LIBCPP_DEPRECATED [[deprecated]]
-#else
-#define _LIBCPP_DEPRECATED
-#endif
-
-#if _LIBCPP_STD_VER <= 11
-#define _LIBCPP_EXPLICIT_AFTER_CXX11
-#define _LIBCPP_DEPRECATED_AFTER_CXX11
-#else
-#define _LIBCPP_EXPLICIT_AFTER_CXX11 explicit
-#define _LIBCPP_DEPRECATED_AFTER_CXX11 [[deprecated]]
-#endif
-
-#if _LIBCPP_STD_VER > 11 && !defined(_LIBCPP_HAS_NO_CXX14_CONSTEXPR)
-#define _LIBCPP_CONSTEXPR_AFTER_CXX11 constexpr
-#else
-#define _LIBCPP_CONSTEXPR_AFTER_CXX11
-#endif
-
-#ifndef _LIBCPP_HAS_NO_ASAN
-extern "C" void __sanitizer_annotate_contiguous_container(
-  const void *, const void *, const void *, const void *);
-#endif
-
-// Try to find out if RTTI is disabled.
-// g++ and cl.exe have RTTI on by default and define a macro when it is.
-// g++ only defines the macro in 4.3.2 and onwards.
-#if !defined(_LIBCPP_NO_RTTI)
-#  if defined(__GNUG__) && ((__GNUC__ >= 5) || (__GNUC__ == 4 && \
-   (__GNUC_MINOR__ >= 3 || __GNUC_PATCHLEVEL__ >= 2))) && !defined(__GXX_RTTI)
-#    define _LIBCPP_NO_RTTI
-#  elif (defined(_MSC_VER) && !defined(__clang__)) && !defined(_CPPRTTI)
-#    define _LIBCPP_NO_RTTI
-#  endif
-#endif
-
-#ifndef _LIBCPP_WEAK
-#  define _LIBCPP_WEAK __attribute__((__weak__))
-#endif
-
-#if defined(_LIBCPP_HAS_NO_MONOTONIC_CLOCK) && !defined(_LIBCPP_HAS_NO_THREADS)
-#  error _LIBCPP_HAS_NO_MONOTONIC_CLOCK may only be defined when \
-         _LIBCPP_HAS_NO_THREADS is defined.
-#endif
-
-#endif  // _LIBCPP_CONFIG
diff --git a/include.new/c++/v1/tr1/__debug b/include.new/c++/v1/tr1/__debug
deleted file mode 100644
index c151224..0000000
--- a/include.new/c++/v1/tr1/__debug
+++ /dev/null
@@ -1,222 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- __debug ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_DEBUG_H
-#define _LIBCPP_DEBUG_H
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#if _LIBCPP_DEBUG_LEVEL >= 1
-#   include <cstdlib>
-#   include <cstdio>
-#   include <cstddef>
-#   ifndef _LIBCPP_ASSERT
-#      define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : (_VSTD::printf("%s\n", m), _VSTD::abort()))
-#   endif
-#endif
-
-#ifndef _LIBCPP_ASSERT
-#   define _LIBCPP_ASSERT(x, m) ((void)0)
-#endif
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-struct _LIBCPP_TYPE_VIS __c_node;
-
-struct _LIBCPP_TYPE_VIS __i_node
-{
-    void* __i_;
-    __i_node* __next_;
-    __c_node* __c_;
-
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __i_node(const __i_node&) = delete;
-    __i_node& operator=(const __i_node&) = delete;
-#else
-private:
-    __i_node(const __i_node&);
-    __i_node& operator=(const __i_node&);
-public:
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    __i_node(void* __i, __i_node* __next, __c_node* __c)
-        : __i_(__i), __next_(__next), __c_(__c) {}
-    ~__i_node();
-};
-
-struct _LIBCPP_TYPE_VIS __c_node
-{
-    void* __c_;
-    __c_node* __next_;
-    __i_node** beg_;
-    __i_node** end_;
-    __i_node** cap_;
-
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __c_node(const __c_node&) = delete;
-    __c_node& operator=(const __c_node&) = delete;
-#else
-private:
-    __c_node(const __c_node&);
-    __c_node& operator=(const __c_node&);
-public:
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    __c_node(void* __c, __c_node* __next)
-        : __c_(__c), __next_(__next), beg_(nullptr), end_(nullptr), cap_(nullptr) {}
-    virtual ~__c_node();
-
-    virtual bool __dereferenceable(const void*) const = 0;
-    virtual bool __decrementable(const void*) const = 0;
-    virtual bool __addable(const void*, ptrdiff_t) const = 0;
-    virtual bool __subscriptable(const void*, ptrdiff_t) const = 0;
-
-    void __add(__i_node* __i);
-    _LIBCPP_HIDDEN void __remove(__i_node* __i);
-};
-
-template <class _Cont>
-struct _C_node
-    : public __c_node
-{
-    _C_node(void* __c, __c_node* __n)
-        : __c_node(__c, __n) {}
-
-    virtual bool __dereferenceable(const void*) const;
-    virtual bool __decrementable(const void*) const;
-    virtual bool __addable(const void*, ptrdiff_t) const;
-    virtual bool __subscriptable(const void*, ptrdiff_t) const;
-};
-
-template <class _Cont>
-bool
-_C_node<_Cont>::__dereferenceable(const void* __i) const
-{
-    typedef typename _Cont::const_iterator iterator;
-    const iterator* __j = static_cast<const iterator*>(__i);
-    _Cont* _Cp = static_cast<_Cont*>(__c_);
-    return _Cp->__dereferenceable(__j);
-}
-
-template <class _Cont>
-bool
-_C_node<_Cont>::__decrementable(const void* __i) const
-{
-    typedef typename _Cont::const_iterator iterator;
-    const iterator* __j = static_cast<const iterator*>(__i);
-    _Cont* _Cp = static_cast<_Cont*>(__c_);
-    return _Cp->__decrementable(__j);
-}
-
-template <class _Cont>
-bool
-_C_node<_Cont>::__addable(const void* __i, ptrdiff_t __n) const
-{
-    typedef typename _Cont::const_iterator iterator;
-    const iterator* __j = static_cast<const iterator*>(__i);
-    _Cont* _Cp = static_cast<_Cont*>(__c_);
-    return _Cp->__addable(__j, __n);
-}
-
-template <class _Cont>
-bool
-_C_node<_Cont>::__subscriptable(const void* __i, ptrdiff_t __n) const
-{
-    typedef typename _Cont::const_iterator iterator;
-    const iterator* __j = static_cast<const iterator*>(__i);
-    _Cont* _Cp = static_cast<_Cont*>(__c_);
-    return _Cp->__subscriptable(__j, __n);
-}
-
-class _LIBCPP_TYPE_VIS __libcpp_db
-{
-    __c_node** __cbeg_;
-    __c_node** __cend_;
-    size_t   __csz_;
-    __i_node** __ibeg_;
-    __i_node** __iend_;
-    size_t   __isz_;
-
-    __libcpp_db();
-public:
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __libcpp_db(const __libcpp_db&) = delete;
-    __libcpp_db& operator=(const __libcpp_db&) = delete;
-#else
-private:
-    __libcpp_db(const __libcpp_db&);
-    __libcpp_db& operator=(const __libcpp_db&);
-public:
-#endif
-    ~__libcpp_db();
-
-    class __db_c_iterator;
-    class __db_c_const_iterator;
-    class __db_i_iterator;
-    class __db_i_const_iterator;
-
-    __db_c_const_iterator __c_end() const;
-    __db_i_const_iterator __i_end() const;
-
-    template <class _Cont>
-    _LIBCPP_INLINE_VISIBILITY
-    void __insert_c(_Cont* __c)
-    {
-        __c_node* __n = __insert_c(static_cast<void*>(__c));
-        ::new(__n) _C_node<_Cont>(__n->__c_, __n->__next_);
-    }
-
-    void __insert_i(void* __i);
-    __c_node* __insert_c(void* __c);
-    void __erase_c(void* __c);
-
-    void __insert_ic(void* __i, const void* __c);
-    void __iterator_copy(void* __i, const void* __i0);
-    void __erase_i(void* __i);
-
-    void* __find_c_from_i(void* __i) const;
-    void __invalidate_all(void* __c);
-    __c_node* __find_c_and_lock(void* __c) const;
-    __c_node* __find_c(void* __c) const;
-    void unlock() const;
-
-    void swap(void* __c1, void* __c2);
-
-
-    bool __dereferenceable(const void* __i) const;
-    bool __decrementable(const void* __i) const;
-    bool __addable(const void* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const void* __i, ptrdiff_t __n) const;
-    bool __less_than_comparable(const void* __i, const void* __j) const;
-private:
-    _LIBCPP_HIDDEN
-    __i_node* __insert_iterator(void* __i);
-    _LIBCPP_HIDDEN
-    __i_node* __find_iterator(const void* __i) const;
-
-    friend _LIBCPP_FUNC_VIS __libcpp_db* __get_db();
-};
-
-_LIBCPP_FUNC_VIS __libcpp_db* __get_db();
-_LIBCPP_FUNC_VIS const __libcpp_db* __get_const_db();
-
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif
-
-#endif  // _LIBCPP_DEBUG_H
-
diff --git a/include.new/c++/v1/tr1/__functional_03 b/include.new/c++/v1/tr1/__functional_03
deleted file mode 100644
index d8a9f05..0000000
--- a/include.new/c++/v1/tr1/__functional_03
+++ /dev/null
@@ -1,2135 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUNCTIONAL_03
-#define _LIBCPP_FUNCTIONAL_03
-
-// manual variadic expansion for <functional>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-template <class _Tp>
-class __mem_fn
-    : public __weak_result_type<_Tp>
-{
-public:
-    // types
-    typedef _Tp type;
-private:
-    type __f_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY __mem_fn(type __f) : __f_(__f) {}
-
-    // invoke
-
-    typename __invoke_return<type>::type
-       operator() () const
-       {
-           return __invoke(__f_);
-       }
-
-    template <class _A0>
-       typename __invoke_return0<type, _A0>::type
-          operator() (_A0& __a0) const
-          {
-              return __invoke(__f_, __a0);
-          }
-
-    template <class _A0, class _A1>
-       typename __invoke_return1<type, _A0, _A1>::type
-          operator() (_A0& __a0, _A1& __a1) const
-          {
-              return __invoke(__f_, __a0, __a1);
-          }
-
-    template <class _A0, class _A1, class _A2>
-       typename __invoke_return2<type, _A0, _A1, _A2>::type
-          operator() (_A0& __a0, _A1& __a1, _A2& __a2) const
-          {
-              return __invoke(__f_, __a0, __a1, __a2);
-          }
-};
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp _Tp::*>
-mem_fn(_Rp _Tp::* __pm)
-{
-    return __mem_fn<_Rp _Tp::*>(__pm);
-}
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)()>
-mem_fn(_Rp (_Tp::* __pm)())
-{
-    return __mem_fn<_Rp (_Tp::*)()>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0)>
-mem_fn(_Rp (_Tp::* __pm)(_A0))
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0)>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1)>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1))
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1)>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2)>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2))
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2)>(__pm);
-}
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)() const>
-mem_fn(_Rp (_Tp::* __pm)() const)
-{
-    return __mem_fn<_Rp (_Tp::*)() const>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0) const>
-mem_fn(_Rp (_Tp::* __pm)(_A0) const)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0) const>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1) const>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1) const)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1) const>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2) const)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const>(__pm);
-}
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)() volatile>
-mem_fn(_Rp (_Tp::* __pm)() volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)() volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0) volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0) volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0) volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1) volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1) volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1) volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2) volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) volatile>(__pm);
-}
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)() const volatile>
-mem_fn(_Rp (_Tp::* __pm)() const volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)() const volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0) const volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0) const volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0) const volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1) const volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1) const volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1) const volatile>(__pm);
-}
-
-template<class _Rp, class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const volatile>
-mem_fn(_Rp (_Tp::* __pm)(_A0, _A1, _A2) const volatile)
-{
-    return __mem_fn<_Rp (_Tp::*)(_A0, _A1, _A2) const volatile>(__pm);
-}
-
-// bad_function_call
-
-class _LIBCPP_EXCEPTION_ABI bad_function_call
-    : public exception
-{
-};
-
-template<class _Fp> class _LIBCPP_TYPE_VIS_ONLY function; // undefined
-
-namespace __function
-{
-
-template<class _Fp>
-struct __maybe_derive_from_unary_function
-{
-};
-
-template<class _Rp, class _A1>
-struct __maybe_derive_from_unary_function<_Rp(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template<class _Fp>
-struct __maybe_derive_from_binary_function
-{
-};
-
-template<class _Rp, class _A1, class _A2>
-struct __maybe_derive_from_binary_function<_Rp(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template<class _Fp> class __base;
-
-template<class _Rp>
-class __base<_Rp()>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    __base() {}
-    virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()() = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const = 0;
-    virtual const std::type_info& target_type() const = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0>
-class __base<_Rp(_A0)>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    __base() {}
-    virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()(_A0) = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const = 0;
-    virtual const std::type_info& target_type() const = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0, class _A1>
-class __base<_Rp(_A0, _A1)>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    __base() {}
-    virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()(_A0, _A1) = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const = 0;
-    virtual const std::type_info& target_type() const = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0, class _A1, class _A2>
-class __base<_Rp(_A0, _A1, _A2)>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    __base() {}
-    virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()(_A0, _A1, _A2) = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const = 0;
-    virtual const std::type_info& target_type() const = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _FD, class _Alloc, class _FB> class __func;
-
-template<class _Fp, class _Alloc, class _Rp>
-class __func<_Fp, _Alloc, _Rp()>
-    : public  __base<_Rp()>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    explicit __func(_Fp __f) : __f_(_VSTD::move(__f)) {}
-    explicit __func(_Fp __f, _Alloc __a) : __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
-    virtual __base<_Rp()>* __clone() const;
-    virtual void __clone(__base<_Rp()>*) const;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()();
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const;
-    virtual const std::type_info& target_type() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp>
-__base<_Rp()>*
-__func<_Fp, _Alloc, _Rp()>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-void
-__func<_Fp, _Alloc, _Rp()>::__clone(__base<_Rp()>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-void
-__func<_Fp, _Alloc, _Rp()>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-void
-__func<_Fp, _Alloc, _Rp()>::destroy_deallocate()
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-_Rp
-__func<_Fp, _Alloc, _Rp()>::operator()()
-{
-    return __invoke(__f_.first());
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp>
-const void*
-__func<_Fp, _Alloc, _Rp()>::target(const type_info& __ti) const
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp()>::target_type() const
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-class __func<_Fp, _Alloc, _Rp(_A0)>
-    : public  __base<_Rp(_A0)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f) : __f_(_VSTD::move(__f)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f, _Alloc __a)
-        : __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
-    virtual __base<_Rp(_A0)>* __clone() const;
-    virtual void __clone(__base<_Rp(_A0)>*) const;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()(_A0);
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const;
-    virtual const std::type_info& target_type() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-__base<_Rp(_A0)>*
-__func<_Fp, _Alloc, _Rp(_A0)>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-void
-__func<_Fp, _Alloc, _Rp(_A0)>::__clone(__base<_Rp(_A0)>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-void
-__func<_Fp, _Alloc, _Rp(_A0)>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-void
-__func<_Fp, _Alloc, _Rp(_A0)>::destroy_deallocate()
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-_Rp
-__func<_Fp, _Alloc, _Rp(_A0)>::operator()(_A0 __a0)
-{
-    return __invoke(__f_.first(), __a0);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-const void*
-__func<_Fp, _Alloc, _Rp(_A0)>::target(const type_info& __ti) const
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp(_A0)>::target_type() const
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-class __func<_Fp, _Alloc, _Rp(_A0, _A1)>
-    : public  __base<_Rp(_A0, _A1)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f) : __f_(_VSTD::move(__f)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f, _Alloc __a)
-        : __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
-    virtual __base<_Rp(_A0, _A1)>* __clone() const;
-    virtual void __clone(__base<_Rp(_A0, _A1)>*) const;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()(_A0, _A1);
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const;
-    virtual const std::type_info& target_type() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-__base<_Rp(_A0, _A1)>*
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::__clone(__base<_Rp(_A0, _A1)>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::destroy_deallocate()
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-_Rp
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::operator()(_A0 __a0, _A1 __a1)
-{
-    return __invoke(__f_.first(), __a0, __a1);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-const void*
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::target(const type_info& __ti) const
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp(_A0, _A1)>::target_type() const
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-class __func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>
-    : public  __base<_Rp(_A0, _A1, _A2)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f) : __f_(_VSTD::move(__f)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __func(_Fp __f, _Alloc __a)
-        : __f_(_VSTD::move(__f), _VSTD::move(__a)) {}
-    virtual __base<_Rp(_A0, _A1, _A2)>* __clone() const;
-    virtual void __clone(__base<_Rp(_A0, _A1, _A2)>*) const;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()(_A0, _A1, _A2);
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const;
-    virtual const std::type_info& target_type() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-__base<_Rp(_A0, _A1, _A2)>*
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::__clone(__base<_Rp(_A0, _A1, _A2)>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-void
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::destroy_deallocate()
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-_Rp
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::operator()(_A0 __a0, _A1 __a1, _A2 __a2)
-{
-    return __invoke(__f_.first(), __a0, __a1, __a2);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-const void*
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::target(const type_info& __ti) const
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp, class _A0, class _A1, class _A2>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)>::target_type() const
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-}  // __function
-
-template<class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp()>
-{
-    typedef __function::__base<_Rp()> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)()) {return __p;}
-    template <class _R2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2()>& __p) {return __p;}
-public:
-    typedef _Rp result_type;
-
-    // 20.7.16.2.1, construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
-    function(const function&);
-    template<class _Fp>
-      function(_Fp,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(nullptr_t);
-    template<class _Fp>
-      typename enable_if
-      <
-        !is_integral<_Fp>::value,
-        function&
-      >::type
-      operator=(_Fp);
-
-    ~function();
-
-    // 20.7.16.2.2, function modifiers:
-    void swap(function&);
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp __f, const _Alloc& __a)
-        {function(allocator_arg, __a, __f).swap(*this);}
-
-    // 20.7.16.2.3, function capacity:
-    _LIBCPP_INLINE_VISIBILITY operator bool() const {return __f_;}
-
-private:
-    // deleted overloads close possible hole in the type system
-    template<class _R2>
-      bool operator==(const function<_R2()>&) const;// = delete;
-    template<class _R2>
-      bool operator!=(const function<_R2()>&) const;// = delete;
-public:
-    // 20.7.16.2.4, function invocation:
-    _Rp operator()() const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // 20.7.16.2.5, function target access:
-    const std::type_info& target_type() const;
-    template <typename _Tp> _Tp* target();
-    template <typename _Tp> const _Tp* target() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp>
-function<_Rp()>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp>
-template<class _Alloc>
-function<_Rp()>::function(allocator_arg_t, const _Alloc&, const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp>
-template <class _Fp>
-function<_Rp()>::function(_Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp()> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp>
-template <class _Fp, class _Alloc>
-function<_Rp()>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp()> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<_FF>
-#else
-                rebind_alloc<_FF>::other
-#endif
-                                                         _Ap;
-            _Ap __a(__a0);
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp>
-function<_Rp()>&
-function<_Rp()>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp>
-function<_Rp()>&
-function<_Rp()>::operator=(nullptr_t)
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-}
-
-template<class _Rp>
-template <class _Fp>
-typename enable_if
-<
-    !is_integral<_Fp>::value,
-    function<_Rp()>&
->::type
-function<_Rp()>::operator=(_Fp __f)
-{
-    function(_VSTD::move(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp>
-function<_Rp()>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp>
-void
-function<_Rp()>::swap(function& __f)
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp>
-_Rp
-function<_Rp()>::operator()() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)();
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp>
-const std::type_info&
-function<_Rp()>::target_type() const
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp>
-template <typename _Tp>
-_Tp*
-function<_Rp()>::target()
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp>
-template <typename _Tp>
-const _Tp*
-function<_Rp()>::target() const
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp(_A0)>
-    : public unary_function<_A0, _Rp>
-{
-    typedef __function::__base<_Rp(_A0)> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2, class _B0>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)(_B0)) {return __p;}
-    template <class _R2, class _Cp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)()) {return __p;}
-    template <class _R2, class _Cp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)() const) {return __p;}
-    template <class _R2, class _Cp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)() volatile) {return __p;}
-    template <class _R2, class _Cp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)() const volatile) {return __p;}
-    template <class _R2, class _B0>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2(_B0)>& __p) {return __p;}
-public:
-    typedef _Rp result_type;
-
-    // 20.7.16.2.1, construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
-    function(const function&);
-    template<class _Fp>
-      function(_Fp,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(nullptr_t);
-    template<class _Fp>
-      typename enable_if
-      <
-        !is_integral<_Fp>::value,
-        function&
-      >::type
-      operator=(_Fp);
-
-    ~function();
-
-    // 20.7.16.2.2, function modifiers:
-    void swap(function&);
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp __f, const _Alloc& __a)
-        {function(allocator_arg, __a, __f).swap(*this);}
-
-    // 20.7.16.2.3, function capacity:
-    _LIBCPP_INLINE_VISIBILITY operator bool() const {return __f_;}
-
-private:
-    // deleted overloads close possible hole in the type system
-    template<class _R2, class _B0>
-      bool operator==(const function<_R2(_B0)>&) const;// = delete;
-    template<class _R2, class _B0>
-      bool operator!=(const function<_R2(_B0)>&) const;// = delete;
-public:
-    // 20.7.16.2.4, function invocation:
-    _Rp operator()(_A0) const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // 20.7.16.2.5, function target access:
-    const std::type_info& target_type() const;
-    template <typename _Tp> _Tp* target();
-    template <typename _Tp> const _Tp* target() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0>
-function<_Rp(_A0)>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0>
-template<class _Alloc>
-function<_Rp(_A0)>::function(allocator_arg_t, const _Alloc&, const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0>
-template <class _Fp>
-function<_Rp(_A0)>::function(_Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0>
-template <class _Fp, class _Alloc>
-function<_Rp(_A0)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp(_A0)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<_FF>
-#else
-                rebind_alloc<_FF>::other
-#endif
-                                                         _Ap;
-            _Ap __a(__a0);
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0>
-function<_Rp(_A0)>&
-function<_Rp(_A0)>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0>
-function<_Rp(_A0)>&
-function<_Rp(_A0)>::operator=(nullptr_t)
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-}
-
-template<class _Rp, class _A0>
-template <class _Fp>
-typename enable_if
-<
-    !is_integral<_Fp>::value,
-    function<_Rp(_A0)>&
->::type
-function<_Rp(_A0)>::operator=(_Fp __f)
-{
-    function(_VSTD::move(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0>
-function<_Rp(_A0)>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class _A0>
-void
-function<_Rp(_A0)>::swap(function& __f)
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class _A0>
-_Rp
-function<_Rp(_A0)>::operator()(_A0 __a0) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)(__a0);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0>
-const std::type_info&
-function<_Rp(_A0)>::target_type() const
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp, class _A0>
-template <typename _Tp>
-_Tp*
-function<_Rp(_A0)>::target()
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp, class _A0>
-template <typename _Tp>
-const _Tp*
-function<_Rp(_A0)>::target() const
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0, class _A1>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp(_A0, _A1)>
-    : public binary_function<_A0, _A1, _Rp>
-{
-    typedef __function::__base<_Rp(_A0, _A1)> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2, class _B0, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)(_B0, _B1)) {return __p;}
-    template <class _R2, class _Cp, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1)) {return __p;}
-    template <class _R2, class _Cp, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1) const) {return __p;}
-    template <class _R2, class _Cp, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1) volatile) {return __p;}
-    template <class _R2, class _Cp, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1) const volatile) {return __p;}
-    template <class _R2, class _B0, class _B1>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2(_B0, _B1)>& __p) {return __p;}
-public:
-    typedef _Rp result_type;
-
-    // 20.7.16.2.1, construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
-    function(const function&);
-    template<class _Fp>
-      function(_Fp,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(nullptr_t);
-    template<class _Fp>
-      typename enable_if
-      <
-        !is_integral<_Fp>::value,
-        function&
-      >::type
-      operator=(_Fp);
-
-    ~function();
-
-    // 20.7.16.2.2, function modifiers:
-    void swap(function&);
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp __f, const _Alloc& __a)
-        {function(allocator_arg, __a, __f).swap(*this);}
-
-    // 20.7.16.2.3, function capacity:
-    operator bool() const {return __f_;}
-
-private:
-    // deleted overloads close possible hole in the type system
-    template<class _R2, class _B0, class _B1>
-      bool operator==(const function<_R2(_B0, _B1)>&) const;// = delete;
-    template<class _R2, class _B0, class _B1>
-      bool operator!=(const function<_R2(_B0, _B1)>&) const;// = delete;
-public:
-    // 20.7.16.2.4, function invocation:
-    _Rp operator()(_A0, _A1) const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // 20.7.16.2.5, function target access:
-    const std::type_info& target_type() const;
-    template <typename _Tp> _Tp* target();
-    template <typename _Tp> const _Tp* target() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0, class _A1>
-function<_Rp(_A0, _A1)>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0, class _A1>
-template<class _Alloc>
-function<_Rp(_A0, _A1)>::function(allocator_arg_t, const _Alloc&, const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0, class _A1>
-template <class _Fp>
-function<_Rp(_A0, _A1)>::function(_Fp __f,
-                                 typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0, _A1)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0, class _A1>
-template <class _Fp, class _Alloc>
-function<_Rp(_A0, _A1)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                 typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp(_A0, _A1)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<_FF>
-#else
-                rebind_alloc<_FF>::other
-#endif
-                                                         _Ap;
-            _Ap __a(__a0);
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0, class _A1>
-function<_Rp(_A0, _A1)>&
-function<_Rp(_A0, _A1)>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0, class _A1>
-function<_Rp(_A0, _A1)>&
-function<_Rp(_A0, _A1)>::operator=(nullptr_t)
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-}
-
-template<class _Rp, class _A0, class _A1>
-template <class _Fp>
-typename enable_if
-<
-    !is_integral<_Fp>::value,
-    function<_Rp(_A0, _A1)>&
->::type
-function<_Rp(_A0, _A1)>::operator=(_Fp __f)
-{
-    function(_VSTD::move(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0, class _A1>
-function<_Rp(_A0, _A1)>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class _A0, class _A1>
-void
-function<_Rp(_A0, _A1)>::swap(function& __f)
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class _A0, class _A1>
-_Rp
-function<_Rp(_A0, _A1)>::operator()(_A0 __a0, _A1 __a1) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)(__a0, __a1);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0, class _A1>
-const std::type_info&
-function<_Rp(_A0, _A1)>::target_type() const
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp, class _A0, class _A1>
-template <typename _Tp>
-_Tp*
-function<_Rp(_A0, _A1)>::target()
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp, class _A0, class _A1>
-template <typename _Tp>
-const _Tp*
-function<_Rp(_A0, _A1)>::target() const
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0, class _A1, class _A2>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp(_A0, _A1, _A2)>
-{
-    typedef __function::__base<_Rp(_A0, _A1, _A2)> __base;
-    aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2, class _B0, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)(_B0, _B1, _B2)) {return __p;}
-    template <class _R2, class _Cp, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2)) {return __p;}
-    template <class _R2, class _Cp, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2) const) {return __p;}
-    template <class _R2, class _Cp, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2) volatile) {return __p;}
-    template <class _R2, class _Cp, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_B1, _B2) const volatile) {return __p;}
-    template <class _R2, class _B0, class _B1, class _B2>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2(_B0, _B1, _B2)>& __p) {return __p;}
-public:
-    typedef _Rp result_type;
-
-    // 20.7.16.2.1, construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY explicit function() : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY function(nullptr_t) : __f_(0) {}
-    function(const function&);
-    template<class _Fp>
-      function(_Fp,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<!is_integral<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(nullptr_t);
-    template<class _Fp>
-      typename enable_if
-      <
-        !is_integral<_Fp>::value,
-        function&
-      >::type
-      operator=(_Fp);
-
-    ~function();
-
-    // 20.7.16.2.2, function modifiers:
-    void swap(function&);
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp __f, const _Alloc& __a)
-        {function(allocator_arg, __a, __f).swap(*this);}
-
-    // 20.7.16.2.3, function capacity:
-    _LIBCPP_INLINE_VISIBILITY operator bool() const {return __f_;}
-
-private:
-    // deleted overloads close possible hole in the type system
-    template<class _R2, class _B0, class _B1, class _B2>
-      bool operator==(const function<_R2(_B0, _B1, _B2)>&) const;// = delete;
-    template<class _R2, class _B0, class _B1, class _B2>
-      bool operator!=(const function<_R2(_B0, _B1, _B2)>&) const;// = delete;
-public:
-    // 20.7.16.2.4, function invocation:
-    _Rp operator()(_A0, _A1, _A2) const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // 20.7.16.2.5, function target access:
-    const std::type_info& target_type() const;
-    template <typename _Tp> _Tp* target();
-    template <typename _Tp> const _Tp* target() const;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class _A0, class _A1, class _A2>
-function<_Rp(_A0, _A1, _A2)>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template<class _Alloc>
-function<_Rp(_A0, _A1, _A2)>::function(allocator_arg_t, const _Alloc&,
-                                      const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <class _Fp>
-function<_Rp(_A0, _A1, _A2)>::function(_Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_A0, _A1, _A2)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <class _Fp, class _Alloc>
-function<_Rp(_A0, _A1, _A2)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                     typename enable_if<!is_integral<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp(_A0, _A1, _A2)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_))
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(__f);
-        }
-        else
-        {
-            typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<_FF>
-#else
-                rebind_alloc<_FF>::other
-#endif
-                                                         _Ap;
-            _Ap __a(__a0);
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(__f, _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-function<_Rp(_A0, _A1, _A2)>&
-function<_Rp(_A0, _A1, _A2)>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-function<_Rp(_A0, _A1, _A2)>&
-function<_Rp(_A0, _A1, _A2)>::operator=(nullptr_t)
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <class _Fp>
-typename enable_if
-<
-    !is_integral<_Fp>::value,
-    function<_Rp(_A0, _A1, _A2)>&
->::type
-function<_Rp(_A0, _A1, _A2)>::operator=(_Fp __f)
-{
-    function(_VSTD::move(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-function<_Rp(_A0, _A1, _A2)>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-void
-function<_Rp(_A0, _A1, _A2)>::swap(function& __f)
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-_Rp
-function<_Rp(_A0, _A1, _A2)>::operator()(_A0 __a0, _A1 __a1, _A2 __a2) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)(__a0, __a1, __a2);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp, class _A0, class _A1, class _A2>
-const std::type_info&
-function<_Rp(_A0, _A1, _A2)>::target_type() const
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <typename _Tp>
-_Tp*
-function<_Rp(_A0, _A1, _A2)>::target()
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp, class _A0, class _A1, class _A2>
-template <typename _Tp>
-const _Tp*
-function<_Rp(_A0, _A1, _A2)>::target() const
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const function<_Fp>& __f, nullptr_t) {return !__f;}
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(nullptr_t, const function<_Fp>& __f) {return !__f;}
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const function<_Fp>& __f, nullptr_t) {return (bool)__f;}
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(nullptr_t, const function<_Fp>& __f) {return (bool)__f;}
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(function<_Fp>& __x, function<_Fp>& __y)
-{return __x.swap(__y);}
-
-template<class _Tp> struct __is_bind_expression : public false_type {};
-template<class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_bind_expression
-    : public __is_bind_expression<typename remove_cv<_Tp>::type> {};
-
-template<class _Tp> struct __is_placeholder : public integral_constant<int, 0> {};
-template<class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_placeholder
-    : public __is_placeholder<typename remove_cv<_Tp>::type> {};
-
-namespace placeholders
-{
-
-template <int _Np> struct __ph {};
-
-extern __ph<1>   _1;
-extern __ph<2>   _2;
-extern __ph<3>   _3;
-extern __ph<4>   _4;
-extern __ph<5>   _5;
-extern __ph<6>   _6;
-extern __ph<7>   _7;
-extern __ph<8>   _8;
-extern __ph<9>   _9;
-extern __ph<10> _10;
-
-}  // placeholders
-
-template<int _Np>
-struct __is_placeholder<placeholders::__ph<_Np> >
-    : public integral_constant<int, _Np> {};
-
-template <class _Tp, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp&
-__mu(reference_wrapper<_Tp> __t, _Uj&)
-{
-    return __t.get();
-}
-/*
-template <bool _IsBindExpr, class _Ti, class ..._Uj>
-struct __mu_return1 {};
-
-template <class _Ti, class ..._Uj>
-struct __mu_return1<true, _Ti, _Uj...>
-{
-    typedef typename result_of<_Ti(_Uj...)>::type type;
-};
-
-template <class _Ti, class ..._Uj, size_t ..._Indx>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __mu_return1<true, _Ti, _Uj...>::type
-__mu_expand(_Ti& __ti, tuple<_Uj...>&& __uj, __tuple_indices<_Indx...>)
-{
-    __ti(_VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(_VSTD::get<_Indx>(__uj))...);
-}
-
-template <class _Ti, class ..._Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_bind_expression<_Ti>::value,
-    typename __mu_return1<is_bind_expression<_Ti>::value, _Ti, _Uj...>::type
->::type
-__mu(_Ti& __ti, tuple<_Uj...>& __uj)
-{
-    typedef typename __make_tuple_indices<sizeof...(_Uj)>::type __indices;
-    return  __mu_expand(__ti, __uj, __indices());
-}
-
-template <bool IsPh, class _Ti, class _Uj>
-struct __mu_return2 {};
-
-template <class _Ti, class _Uj>
-struct __mu_return2<true, _Ti, _Uj>
-{
-    typedef typename tuple_element<is_placeholder<_Ti>::value - 1, _Uj>::type type;
-};
-
-template <class _Ti, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    0 < is_placeholder<_Ti>::value,
-    typename __mu_return2<0 < is_placeholder<_Ti>::value, _Ti, _Uj>::type
->::type
-__mu(_Ti&, _Uj& __uj)
-{
-    const size_t _Indx = is_placeholder<_Ti>::value - 1;
-    // compiler bug workaround
-    typename tuple_element<_Indx, _Uj>::type __t = _VSTD::get<_Indx>(__uj);
-    return __t;
-//    return _VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(_VSTD::get<_Indx>(__uj));
-}
-
-template <class _Ti, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_bind_expression<_Ti>::value &&
-    is_placeholder<_Ti>::value == 0 &&
-    !__is_reference_wrapper<_Ti>::value,
-    _Ti&
->::type
-__mu(_Ti& __ti, _Uj& __uj)
-{
-    return __ti;
-}
-
-template <class _Ti, bool IsBindEx, bool IsPh, class _TupleUj>
-struct ____mu_return;
-
-template <class _Ti, class ..._Uj>
-struct ____mu_return<_Ti, true, false, tuple<_Uj...> >
-{
-    typedef typename result_of<_Ti(_Uj...)>::type type;
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, false, true, _TupleUj>
-{
-    typedef typename tuple_element<is_placeholder<_Ti>::value - 1,
-                                   _TupleUj>::type&& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, false, false, _TupleUj>
-{
-    typedef _Ti& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct __mu_return
-    : public ____mu_return<_Ti,
-                           is_bind_expression<_Ti>::value,
-                           0 < is_placeholder<_Ti>::value,
-                           _TupleUj>
-{
-};
-
-template <class _Ti, class _TupleUj>
-struct __mu_return<reference_wrapper<_Ti>, _TupleUj>
-{
-    typedef _Ti& type;
-};
-
-template <class _Fp, class _BoundArgs, class _TupleUj>
-struct __bind_return;
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, tuple<_BoundArgs...>, _TupleUj>
-{
-    typedef typename __ref_return
-    <
-        _Fp&,
-        typename __mu_return
-        <
-            _BoundArgs,
-            _TupleUj
-        >::type...
-    >::type type;
-};
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, const tuple<_BoundArgs...>, _TupleUj>
-{
-    typedef typename __ref_return
-    <
-        _Fp&,
-        typename __mu_return
-        <
-            const _BoundArgs,
-            _TupleUj
-        >::type...
-    >::type type;
-};
-
-template <class _Fp, class _BoundArgs, size_t ..._Indx, class _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __bind_return<_Fp, _BoundArgs, _Args>::type
-__apply_functor(_Fp& __f, _BoundArgs& __bound_args, __tuple_indices<_Indx...>,
-                _Args&& __args)
-{
-    return __invoke(__f, __mu(_VSTD::get<_Indx>(__bound_args), __args)...);
-}
-
-template<class _Fp, class ..._BoundArgs>
-class __bind
-{
-    _Fp __f_;
-    tuple<_BoundArgs...> __bound_args_;
-
-    typedef typename __make_tuple_indices<sizeof...(_BoundArgs)>::type __indices;
-public:
-    template <class _Gp, class ..._BA>
-      explicit __bind(_Gp&& __f, _BA&& ...__bound_args)
-        : __f_(_VSTD::forward<_Gp>(__f)),
-          __bound_args_(_VSTD::forward<_BA>(__bound_args)...) {}
-
-    template <class ..._Args>
-        typename __bind_return<_Fp, tuple<_BoundArgs...>, tuple<_Args&&...> >::type
-        operator()(_Args&& ...__args)
-        {
-            // compiler bug workaround
-            return __apply_functor(__f_, __bound_args_, __indices(),
-                                  tuple<_Args&&...>(__args...));
-        }
-
-    template <class ..._Args>
-        typename __bind_return<_Fp, tuple<_BoundArgs...>, tuple<_Args&&...> >::type
-        operator()(_Args&& ...__args) const
-        {
-            return __apply_functor(__f_, __bound_args_, __indices(),
-                                   tuple<_Args&&...>(__args...));
-        }
-};
-
-template<class _Fp, class ..._BoundArgs>
-struct __is_bind_expression<__bind<_Fp, _BoundArgs...> > : public true_type {};
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-class __bind_r
-    : public __bind<_Fp, _BoundArgs...>
-{
-    typedef __bind<_Fp, _BoundArgs...> base;
-public:
-    typedef _Rp result_type;
-
-    template <class _Gp, class ..._BA>
-      explicit __bind_r(_Gp&& __f, _BA&& ...__bound_args)
-        : base(_VSTD::forward<_Gp>(__f),
-               _VSTD::forward<_BA>(__bound_args)...) {}
-
-    template <class ..._Args>
-        result_type
-        operator()(_Args&& ...__args)
-        {
-            return base::operator()(_VSTD::forward<_Args>(__args)...);
-        }
-
-    template <class ..._Args>
-        result_type
-        operator()(_Args&& ...__args) const
-        {
-            return base::operator()(_VSTD::forward<_Args>(__args)...);
-        }
-};
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-struct __is_bind_expression<__bind_r<_Rp, _Fp, _BoundArgs...> > : public true_type {};
-
-template<class _Fp, class ..._BoundArgs>
-inline _LIBCPP_INLINE_VISIBILITY
-__bind<typename decay<_Fp>::type, typename decay<_BoundArgs>::type...>
-bind(_Fp&& __f, _BoundArgs&&... __bound_args)
-{
-    typedef __bind<typename decay<_Fp>::type, typename decay<_BoundArgs>::type...> type;
-    return type(_VSTD::forward<_Fp>(__f), _VSTD::forward<_BoundArgs>(__bound_args)...);
-}
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-inline _LIBCPP_INLINE_VISIBILITY
-__bind_r<_Rp, typename decay<_Fp>::type, typename decay<_BoundArgs>::type...>
-bind(_Fp&& __f, _BoundArgs&&... __bound_args)
-{
-    typedef __bind_r<_Rp, typename decay<_Fp>::type, typename decay<_BoundArgs>::type...> type;
-    return type(_VSTD::forward<_Fp>(__f), _VSTD::forward<_BoundArgs>(__bound_args)...);
-}
-*/
-
-#endif  // _LIBCPP_FUNCTIONAL_03
diff --git a/include.new/c++/v1/tr1/__functional_base b/include.new/c++/v1/tr1/__functional_base
deleted file mode 100644
index 6766793..0000000
--- a/include.new/c++/v1/tr1/__functional_base
+++ /dev/null
@@ -1,615 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUNCTIONAL_BASE
-#define _LIBCPP_FUNCTIONAL_BASE
-
-#include <__config>
-#include <type_traits>
-#include <typeinfo>
-#include <exception>
-#include <new>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Arg, class _Result>
-struct _LIBCPP_TYPE_VIS_ONLY unary_function
-{
-    typedef _Arg    argument_type;
-    typedef _Result result_type;
-};
-
-template <class _Arg1, class _Arg2, class _Result>
-struct _LIBCPP_TYPE_VIS_ONLY binary_function
-{
-    typedef _Arg1   first_argument_type;
-    typedef _Arg2   second_argument_type;
-    typedef _Result result_type;
-};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY hash;
-
-template <class _Tp>
-struct __has_result_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::result_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY less : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY 
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x < __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY less<void>
-{
-    template <class _T1, class _T2> 
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) < _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-// addressof
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-addressof(_Tp& __x) _NOEXCEPT
-{
-    return (_Tp*)&reinterpret_cast<const volatile char&>(__x);
-}
-
-#if defined(_LIBCPP_HAS_OBJC_ARC) && !defined(_LIBCPP_PREDEFINED_OBJC_ARC_ADDRESSOF)
-// Objective-C++ Automatic Reference Counting uses qualified pointers
-// that require special addressof() signatures. When
-// _LIBCPP_PREDEFINED_OBJC_ARC_ADDRESSOF is defined, the compiler
-// itself is providing these definitions. Otherwise, we provide them.
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__strong _Tp*
-addressof(__strong _Tp& __x) _NOEXCEPT
-{
-  return &__x;
-}
-
-#ifdef _LIBCPP_HAS_OBJC_ARC_WEAK
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__weak _Tp*
-addressof(__weak _Tp& __x) _NOEXCEPT
-{
-  return &__x;
-}
-#endif
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__autoreleasing _Tp*
-addressof(__autoreleasing _Tp& __x) _NOEXCEPT
-{
-  return &__x;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__unsafe_unretained _Tp*
-addressof(__unsafe_unretained _Tp& __x) _NOEXCEPT
-{
-  return &__x;
-}
-#endif
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-#include <__functional_base_03>
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-// __weak_result_type
-
-template <class _Tp>
-struct __derives_from_unary_function
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    static __two __test(...);
-    template <class _Ap, class _Rp>
-        static unary_function<_Ap, _Rp>
-        __test(const volatile unary_function<_Ap, _Rp>*);
-public:
-    static const bool value = !is_same<decltype(__test((_Tp*)0)), __two>::value;
-    typedef decltype(__test((_Tp*)0)) type;
-};
-
-template <class _Tp>
-struct __derives_from_binary_function
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    static __two __test(...);
-    template <class _A1, class _A2, class _Rp>
-        static binary_function<_A1, _A2, _Rp>
-        __test(const volatile binary_function<_A1, _A2, _Rp>*);
-public:
-    static const bool value = !is_same<decltype(__test((_Tp*)0)), __two>::value;
-    typedef decltype(__test((_Tp*)0)) type;
-};
-
-template <class _Tp, bool = __derives_from_unary_function<_Tp>::value>
-struct __maybe_derive_from_unary_function  // bool is true
-    : public __derives_from_unary_function<_Tp>::type
-{
-};
-
-template <class _Tp>
-struct __maybe_derive_from_unary_function<_Tp, false>
-{
-};
-
-template <class _Tp, bool = __derives_from_binary_function<_Tp>::value>
-struct __maybe_derive_from_binary_function  // bool is true
-    : public __derives_from_binary_function<_Tp>::type
-{
-};
-
-template <class _Tp>
-struct __maybe_derive_from_binary_function<_Tp, false>
-{
-};
-
-template <class _Tp, bool = __has_result_type<_Tp>::value>
-struct __weak_result_type_imp // bool is true
-    : public __maybe_derive_from_unary_function<_Tp>,
-      public __maybe_derive_from_binary_function<_Tp>
-{
-    typedef typename _Tp::result_type result_type;
-};
-
-template <class _Tp>
-struct __weak_result_type_imp<_Tp, false>
-    : public __maybe_derive_from_unary_function<_Tp>,
-      public __maybe_derive_from_binary_function<_Tp>
-{
-};
-
-template <class _Tp>
-struct __weak_result_type
-    : public __weak_result_type_imp<_Tp>
-{
-};
-
-// 0 argument case
-
-template <class _Rp>
-struct __weak_result_type<_Rp ()>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp>
-struct __weak_result_type<_Rp (&)()>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp>
-struct __weak_result_type<_Rp (*)()>
-{
-    typedef _Rp result_type;
-};
-
-// 1 argument case
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (&)(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (*)(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)()>
-    : public unary_function<_Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() const>
-    : public unary_function<const _Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() volatile>
-    : public unary_function<volatile _Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() const volatile>
-    : public unary_function<const volatile _Cp*, _Rp>
-{
-};
-
-// 2 argument case
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (*)(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (&)(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1)>
-    : public binary_function<_Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) const>
-    : public binary_function<const _Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) volatile>
-    : public binary_function<volatile _Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) const volatile>
-    : public binary_function<const volatile _Cp*, _A1, _Rp>
-{
-};
-
-// 3 or more arguments
-
-template <class _Rp, class _A1, class _A2, class _A3, class ..._A4>
-struct __weak_result_type<_Rp (_A1, _A2, _A3, _A4...)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _A1, class _A2, class _A3, class ..._A4>
-struct __weak_result_type<_Rp (&)(_A1, _A2, _A3, _A4...)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _A1, class _A2, class _A3, class ..._A4>
-struct __weak_result_type<_Rp (*)(_A1, _A2, _A3, _A4...)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2, class ..._A3>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2, class ..._A3>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) const>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2, class ..._A3>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) volatile>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2, class ..._A3>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) const volatile>
-{
-    typedef _Rp result_type;
-};
-
-// __invoke
-
-// bullets 1 and 2
-
-template <class _Fp, class _A0, class ..._Args,
-            class>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
-    -> decltype((_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...))
-{
-    return (_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...);
-}
-
-template <class _Fp, class _A0, class ..._Args,
-            class>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
-    -> decltype(((*_VSTD::forward<_A0>(__a0)).*__f)(_VSTD::forward<_Args>(__args)...))
-{
-    return ((*_VSTD::forward<_A0>(__a0)).*__f)(_VSTD::forward<_Args>(__args)...);
-}
-
-// bullets 3 and 4
-
-template <class _Fp, class _A0,
-            class>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0)
-    -> decltype(_VSTD::forward<_A0>(__a0).*__f)
-{
-    return _VSTD::forward<_A0>(__a0).*__f;
-}
-
-template <class _Fp, class _A0,
-            class>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0)
-    -> decltype((*_VSTD::forward<_A0>(__a0)).*__f)
-{
-    return (*_VSTD::forward<_A0>(__a0)).*__f;
-}
-
-// bullet 5
-
-template <class _Fp, class ..._Args>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _Args&& ...__args)
-    -> decltype(_VSTD::forward<_Fp>(__f)(_VSTD::forward<_Args>(__args)...))
-{
-    return _VSTD::forward<_Fp>(__f)(_VSTD::forward<_Args>(__args)...);
-}
-
-template <class _Tp, class ..._Args>
-struct __invoke_return
-{
-    typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_Args>()...)) type;
-};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY reference_wrapper
-    : public __weak_result_type<_Tp>
-{
-public:
-    // types
-    typedef _Tp type;
-private:
-    type* __f_;
-
-public:
-    // construct/copy/destroy
-    _LIBCPP_INLINE_VISIBILITY reference_wrapper(type& __f) _NOEXCEPT
-        : __f_(_VSTD::addressof(__f)) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    private: reference_wrapper(type&&); public: // = delete; // do not bind to temps
-#endif
-
-    // access
-    _LIBCPP_INLINE_VISIBILITY operator type&    () const _NOEXCEPT {return *__f_;}
-    _LIBCPP_INLINE_VISIBILITY          type& get() const _NOEXCEPT {return *__f_;}
-
-    // invoke
-    template <class... _ArgTypes>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_of<type&, _ArgTypes...>::type
-          operator() (_ArgTypes&&... __args) const
-          {
-              return __invoke(get(), _VSTD::forward<_ArgTypes>(__args)...);
-          }
-};
-
-template <class _Tp> struct __is_reference_wrapper_impl : public false_type {};
-template <class _Tp> struct __is_reference_wrapper_impl<reference_wrapper<_Tp> > : public true_type {};
-template <class _Tp> struct __is_reference_wrapper
-    : public __is_reference_wrapper_impl<typename remove_cv<_Tp>::type> {};
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<_Tp>
-ref(_Tp& __t) _NOEXCEPT
-{
-    return reference_wrapper<_Tp>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<_Tp>
-ref(reference_wrapper<_Tp> __t) _NOEXCEPT
-{
-    return ref(__t.get());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<const _Tp>
-cref(const _Tp& __t) _NOEXCEPT
-{
-    return reference_wrapper<const _Tp>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<const _Tp>
-cref(reference_wrapper<_Tp> __t) _NOEXCEPT
-{
-    return cref(__t.get());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-
-template <class _Tp> void ref(const _Tp&&) = delete;
-template <class _Tp> void cref(const _Tp&&) = delete;
-
-#else  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-
-template <class _Tp> void ref(const _Tp&&);// = delete;
-template <class _Tp> void cref(const _Tp&&);// = delete;
-
-#endif  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp1, class _Tp2 = void>
-struct __is_transparent
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::is_transparent* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp1>(0)) == 1;
-};
-#endif
-
-// allocator_arg_t
-
-struct _LIBCPP_TYPE_VIS_ONLY allocator_arg_t { };
-
-#if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_MEMORY)
-extern const allocator_arg_t allocator_arg;
-#else
-constexpr allocator_arg_t allocator_arg = allocator_arg_t();
-#endif
-
-// uses_allocator
-
-template <class _Tp>
-struct __has_allocator_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::allocator_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Tp, class _Alloc, bool = __has_allocator_type<_Tp>::value>
-struct __uses_allocator
-    : public integral_constant<bool,
-        is_convertible<_Alloc, typename _Tp::allocator_type>::value>
-{
-};
-
-template <class _Tp, class _Alloc>
-struct __uses_allocator<_Tp, _Alloc, false>
-    : public false_type
-{
-};
-
-template <class _Tp, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator
-    : public __uses_allocator<_Tp, _Alloc>
-{
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// allocator construction
-
-template <class _Tp, class _Alloc, class ..._Args>
-struct __uses_alloc_ctor_imp
-{
-    static const bool __ua = uses_allocator<_Tp, _Alloc>::value;
-    static const bool __ic =
-        is_constructible<_Tp, allocator_arg_t, _Alloc, _Args...>::value;
-    static const int value = __ua ? 2 - __ic : 0;
-};
-
-template <class _Tp, class _Alloc, class ..._Args>
-struct __uses_alloc_ctor
-    : integral_constant<int, __uses_alloc_ctor_imp<_Tp, _Alloc, _Args...>::value>
-    {};
-
-template <class _Tp, class _Allocator, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void __user_alloc_construct_impl (integral_constant<int, 0>, _Tp *__storage, const _Allocator &, _Args &&... __args )
-{
-    new (__storage) _Tp (_VSTD::forward<_Args>(__args)...);
-}
-
-template <class _Tp, class _Allocator, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void __user_alloc_construct_impl (integral_constant<int, 1>, _Tp *__storage, const _Allocator &__a, _Args &&... __args )
-{
-    new (__storage) _Tp (allocator_arg, __a, _VSTD::forward<_Args>(__args)...);
-}
-
-template <class _Tp, class _Allocator, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void __user_alloc_construct_impl (integral_constant<int, 2>, _Tp *__storage, const _Allocator &__a, _Args &&... __args )
-{
-    new (__storage) _Tp (_VSTD::forward<_Args>(__args)..., __a);
-}
-
-template <class _Tp, class _Allocator, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void __user_alloc_construct (_Tp *__storage, const _Allocator &__a, _Args &&... __args)
-{ 
-    __user_alloc_construct_impl( 
-             __uses_alloc_ctor<_Tp, _Allocator>(), 
-             __storage, __a, _VSTD::forward<_Args>(__args)...
-        );
-}
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_FUNCTIONAL_BASE
diff --git a/include.new/c++/v1/tr1/__functional_base_03 b/include.new/c++/v1/tr1/__functional_base_03
deleted file mode 100644
index 22c06ad..0000000
--- a/include.new/c++/v1/tr1/__functional_base_03
+++ /dev/null
@@ -1,1087 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUNCTIONAL_BASE_03
-#define _LIBCPP_FUNCTIONAL_BASE_03
-
-// manual variadic expansion for <functional>
-
-// __weak_result_type
-
-template <class _Tp>
-struct __derives_from_unary_function
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    static __two __test(...);
-    template <class _Ap, class _Rp>
-        static unary_function<_Ap, _Rp>
-        __test(const volatile unary_function<_Ap, _Rp>*);
-public:
-    static const bool value = !is_same<decltype(__test((_Tp*)0)), __two>::value;
-    typedef decltype(__test((_Tp*)0)) type;
-};
-
-template <class _Tp>
-struct __derives_from_binary_function
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    static __two __test(...);
-    template <class _A1, class _A2, class _Rp>
-        static binary_function<_A1, _A2, _Rp>
-        __test(const volatile binary_function<_A1, _A2, _Rp>*);
-public:
-    static const bool value = !is_same<decltype(__test((_Tp*)0)), __two>::value;
-    typedef decltype(__test((_Tp*)0)) type;
-};
-
-template <class _Tp, bool = __derives_from_unary_function<_Tp>::value>
-struct __maybe_derive_from_unary_function  // bool is true
-    : public __derives_from_unary_function<_Tp>::type
-{
-};
-
-template <class _Tp>
-struct __maybe_derive_from_unary_function<_Tp, false>
-{
-};
-
-template <class _Tp, bool = __derives_from_binary_function<_Tp>::value>
-struct __maybe_derive_from_binary_function  // bool is true
-    : public __derives_from_binary_function<_Tp>::type
-{
-};
-
-template <class _Tp>
-struct __maybe_derive_from_binary_function<_Tp, false>
-{
-};
-
-template <class _Tp, bool = __has_result_type<_Tp>::value>
-struct __weak_result_type_imp // bool is true
-    : public __maybe_derive_from_unary_function<_Tp>,
-      public __maybe_derive_from_binary_function<_Tp>
-{
-    typedef typename _Tp::result_type result_type;
-};
-
-template <class _Tp>
-struct __weak_result_type_imp<_Tp, false>
-    : public __maybe_derive_from_unary_function<_Tp>,
-      public __maybe_derive_from_binary_function<_Tp>
-{
-};
-
-template <class _Tp>
-struct __weak_result_type
-    : public __weak_result_type_imp<typename remove_reference<_Tp>::type>
-{
-};
-
-// 0 argument case
-
-template <class _Rp>
-struct __weak_result_type<_Rp ()>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp>
-struct __weak_result_type<_Rp (&)()>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp>
-struct __weak_result_type<_Rp (*)()>
-{
-    typedef _Rp result_type;
-};
-
-// 1 argument case
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (&)(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _A1>
-struct __weak_result_type<_Rp (*)(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)()>
-    : public unary_function<_Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() const>
-    : public unary_function<const _Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() volatile>
-    : public unary_function<volatile _Cp*, _Rp>
-{
-};
-
-template <class _Rp, class _Cp>
-struct __weak_result_type<_Rp (_Cp::*)() const volatile>
-    : public unary_function<const volatile _Cp*, _Rp>
-{
-};
-
-// 2 argument case
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (*)(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _A1, class _A2>
-struct __weak_result_type<_Rp (&)(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1)>
-    : public binary_function<_Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) const>
-    : public binary_function<const _Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) volatile>
-    : public binary_function<volatile _Cp*, _A1, _Rp>
-{
-};
-
-template <class _Rp, class _Cp, class _A1>
-struct __weak_result_type<_Rp (_Cp::*)(_A1) const volatile>
-    : public binary_function<const volatile _Cp*, _A1, _Rp>
-{
-};
-
-// 3 or more arguments
-
-template <class _Rp, class _A1, class _A2, class _A3>
-struct __weak_result_type<_Rp (_A1, _A2, _A3)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _A1, class _A2, class _A3>
-struct __weak_result_type<_Rp (&)(_A1, _A2, _A3)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _A1, class _A2, class _A3>
-struct __weak_result_type<_Rp (*)(_A1, _A2, _A3)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2)>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2) const>
-{
-    typedef _Rp result_type;
-};
-
-template <class _Rp, class _Cp, class _A1, class _A2>
-struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2) volatile>
-{
-    typedef _Rp result_type;
-};
-
-// __invoke
-
-// __ref_return0
-//
-// template <class _Tp, bool _HasResultType>
-// struct ________ref_return0  // _HasResultType is true
-// {
-//     typedef typename _Tp::result_type type;
-// };
-//
-// template <class _Tp>
-// struct ________ref_return0<_Tp, false>
-// {
-//     typedef void type;
-// };
-//
-// template <class _Tp, bool _IsClass>
-// struct ____ref_return0  // _IsClass is true
-//     : public ________ref_return0<_Tp, __has_result_type<typename remove_cv<_Tp>::type>::value>
-// {
-// };
-//
-// template <class _Tp, bool _HasResultType>
-// struct ______ref_return0  // _HasResultType is true
-// {
-//     typedef typename __callable_type<_Tp>::result_type type;
-// };
-//
-// template <class _Tp>
-// struct ______ref_return0<_Tp, false>  // pointer to member data
-// {
-//     typedef void type;
-// };
-//
-// template <class _Tp>
-// struct ____ref_return0<_Tp, false>
-//     : public ______ref_return0<typename remove_cv<_Tp>::type,
-//                  __has_result_type<__callable_type<typename remove_cv<_Tp>::type> >::value>
-// {
-// };
-//
-// template <class _Tp>
-// struct __ref_return0
-//     : public ____ref_return0<typename remove_reference<_Tp>::type,
-//                    is_class<typename remove_reference<_Tp>::type>::value>
-// {
-// };
-//
-// __ref_return1
-//
-// template <class _Tp, bool _IsClass, class _A0>
-// struct ____ref_return1  // _IsClass is true
-// {
-//     typedef typename result_of<_Tp(_A0)>::type type;
-// };
-//
-// template <class _Tp, bool _HasResultType, class _A0>
-// struct ______ref_return1  // _HasResultType is true
-// {
-//     typedef typename __callable_type<_Tp>::result_type type;
-// };
-//
-// template <class _Tp, class _A0, bool>
-// struct __ref_return1_member_data1;
-//
-// template <class _Rp, class _Cp, class _A0>
-// struct __ref_return1_member_data1<_Rp _Cp::*, _A0, true>
-// {
-//     typedef typename __apply_cv<_A0, _Rp>::type& type;
-// };
-//
-// template <class _Rp, class _Cp, class _A0>
-// struct __ref_return1_member_data1<_Rp _Cp::*, _A0, false>
-// {
-//     static _A0 __a;
-//     typedef typename __apply_cv<decltype(*__a), _Rp>::type& type;
-// };
-//
-// template <class _Tp, class _A0>
-// struct __ref_return1_member_data;
-//
-// template <class _Rp, class _Cp, class _A0>
-// struct __ref_return1_member_data<_Rp _Cp::*, _A0>
-//     : public __ref_return1_member_data1<_Rp _Cp::*, _A0,
-//                 is_same<typename remove_cv<_Cp>::type,
-//                         typename remove_cv<typename remove_reference<_A0>::type>::type>::value>
-// {
-// };
-//
-// template <class _Tp, class _A0>
-// struct ______ref_return1<_Tp, false, _A0>  // pointer to member data
-//     : public __ref_return1_member_data<typename remove_cv<_Tp>::type, _A0>
-// {
-// };
-//
-// template <class _Tp, class _A0>
-// struct ____ref_return1<_Tp, false, _A0>
-//     : public ______ref_return1<typename remove_cv<_Tp>::type,
-//                  __has_result_type<__callable_type<typename remove_cv<_Tp>::type> >::value, _A0>
-// {
-// };
-//
-// template <class _Tp, class _A0>
-// struct __ref_return1
-//     : public ____ref_return1<typename remove_reference<_Tp>::type,
-//                    is_class<typename remove_reference<_Tp>::type>::value, _A0>
-// {
-// };
-//
-// __ref_return2
-//
-// template <class _Tp, bool _IsClass, class _A0, class _A1>
-// struct ____ref_return2  // _IsClass is true
-// {
-//     typedef typename result_of<_Tp(_A0, _A1)>::type type;
-// };
-//
-// template <class _Tp, bool _HasResultType, class _A0, class _A1>
-// struct ______ref_return2  // _HasResultType is true
-// {
-//     typedef typename __callable_type<_Tp>::result_type type;
-// };
-//
-// template <class _Tp>
-// struct ______ref_return2<_Tp, false, class _A0, class _A1>  // pointer to member data
-// {
-//     static_assert(sizeof(_Tp) == 0, "An attempt has been made to `call` a pointer"
-//                          " to member data with too many arguments.");
-// };
-//
-// template <class _Tp, class _A0, class _A1>
-// struct ____ref_return2<_Tp, false, _A0, _A1>
-//     : public ______ref_return2<typename remove_cv<_Tp>::type,
-//                  __has_result_type<__callable_type<typename remove_cv<_Tp>::type> >::value, _A0, _A1>
-// {
-// };
-//
-// template <class _Tp, class _A0, class _A1>
-// struct __ref_return2
-//     : public ____ref_return2<typename remove_reference<_Tp>::type,
-//                    is_class<typename remove_reference<_Tp>::type>::value, _A0, _A1>
-// {
-// };
-//
-// __ref_return3
-//
-// template <class _Tp, bool _IsClass, class _A0, class _A1, class _A2>
-// struct ____ref_return3  // _IsClass is true
-// {
-//     typedef typename result_of<_Tp(_A0, _A1, _A2)>::type type;
-// };
-//
-// template <class _Tp, bool _HasResultType, class _A0, class _A1, class _A2>
-// struct ______ref_return3  // _HasResultType is true
-// {
-//     typedef typename __callable_type<_Tp>::result_type type;
-// };
-//
-// template <class _Tp>
-// struct ______ref_return3<_Tp, false, class _A0, class _A1, class _A2>  // pointer to member data
-// {
-//     static_assert(sizeof(_Tp) == 0, "An attempt has been made to `call` a pointer"
-//                          " to member data with too many arguments.");
-// };
-//
-// template <class _Tp, class _A0, class _A1, class _A2>
-// struct ____ref_return3<_Tp, false, _A0, _A1, _A2>
-//     : public ______ref_return3<typename remove_cv<_Tp>::type,
-//                  __has_result_type<__callable_type<typename remove_cv<_Tp>::type> >::value, _A0, _A1, _A2>
-// {
-// };
-//
-// template <class _Tp, class _A0, class _A1, class _A2>
-// struct __ref_return3
-//     : public ____ref_return3<typename remove_reference<_Tp>::type,
-//                    is_class<typename remove_reference<_Tp>::type>::value, _A0, _A1, _A2>
-// {
-// };
-
-// first bullet
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(), _T1& __t1)
-{
-    return (__t1.*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0), _T1& __t1, _A0& __a0)
-{
-    return (__t1.*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1), _T1& __t1, _A0& __a0, _A1& __a1)
-{
-    return (__t1.*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2), _T1& __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return (__t1.*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() const, _T1& __t1)
-{
-    return (__t1.*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) const, _T1& __t1, _A0& __a0)
-{
-    return (__t1.*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) const, _T1& __t1, _A0& __a0, _A1& __a1)
-{
-    return (__t1.*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) const, _T1& __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return (__t1.*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() volatile, _T1& __t1)
-{
-    return (__t1.*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) volatile, _T1& __t1, _A0& __a0)
-{
-    return (__t1.*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) volatile, _T1& __t1, _A0& __a0, _A1& __a1)
-{
-    return (__t1.*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) volatile, _T1& __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return (__t1.*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() const volatile, _T1& __t1)
-{
-    return (__t1.*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) const volatile, _T1& __t1, _A0& __a0)
-{
-    return (__t1.*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) const volatile, _T1& __t1, _A0& __a0, _A1& __a1)
-{
-    return (__t1.*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) const volatile, _T1& __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return (__t1.*__f)(__a0, __a1, __a2);
-}
-
-// second bullet
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(), _T1 __t1)
-{
-    return ((*__t1).*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0), _T1 __t1, _A0& __a0)
-{
-    return ((*__t1).*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1), _T1 __t1, _A0& __a0, _A1& __a1)
-{
-    return ((*__t1).*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2), _T1 __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return ((*__t1).*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() const, _T1 __t1)
-{
-    return ((*__t1).*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) const, _T1 __t1, _A0& __a0)
-{
-    return ((*__t1).*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) const, _T1 __t1, _A0& __a0, _A1& __a1)
-{
-    return ((*__t1).*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) const, _T1 __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return ((*__t1).*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() volatile, _T1 __t1)
-{
-    return ((*__t1).*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) volatile, _T1 __t1, _A0& __a0)
-{
-    return ((*__t1).*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) volatile, _T1 __t1, _A0& __a0, _A1& __a1)
-{
-    return ((*__t1).*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) volatile, _T1 __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return ((*__t1).*__f)(__a0, __a1, __a2);
-}
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)() const volatile, _T1 __t1)
-{
-    return ((*__t1).*__f)();
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0) const volatile, _T1 __t1, _A0& __a0)
-{
-    return ((*__t1).*__f)(__a0);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1) const volatile, _T1 __t1, _A0& __a0, _A1& __a1)
-{
-    return ((*__t1).*__f)(__a0, __a1);
-}
-
-template <class _Rp, class _Tp, class _T1, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    _Rp
->::type
-__invoke(_Rp (_Tp::*__f)(_A0, _A1, _A2) const volatile, _T1 __t1, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return ((*__t1).*__f)(__a0, __a1, __a2);
-}
-
-// third bullet
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-    typename __apply_cv<_T1, _Rp>::type&
->::type
-__invoke(_Rp _Tp::* __f, _T1& __t1)
-{
-    return __t1.*__f;
-}
-
-template <class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__invoke(_Rp _Tp::*)
-{
-}
-
-// template <class _Dp, class _Rp, class _Tp, class _T1>
-// inline _LIBCPP_INLINE_VISIBILITY
-// typename enable_if
-// <
-//     is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-//     typename __ref_return1<_Rp _Tp::*, _T1>::type
-// >::type
-// __invoke(_Rp _Tp::* __f, _T1& __t1)
-// {
-//     return __t1.*__f;
-// }
-
-// forth bullet
-
-template <class _T1, class _Rp, bool>
-struct __4th_helper
-{
-};
-
-template <class _T1, class _Rp>
-struct __4th_helper<_T1, _Rp, true>
-{
-    typedef typename __apply_cv<decltype(*_VSTD::declval<_T1>()), _Rp>::type type;
-};
-
-template <class _Rp, class _Tp, class _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __4th_helper<_T1, _Rp,
-                      !is_base_of<_Tp,
-                                  typename remove_reference<_T1>::type
-                                 >::value
-                     >::type&
-__invoke(_Rp _Tp::* __f, _T1& __t1)
-{
-    return (*__t1).*__f;
-}
-
-// template <class _Dp, class _Rp, class _Tp, class _T1>
-// inline _LIBCPP_INLINE_VISIBILITY
-// typename enable_if
-// <
-//     !is_base_of<_Tp, typename remove_reference<_T1>::type>::value,
-//     typename __ref_return1<_Rp _Tp::*, _T1>::type
-// >::type
-// __invoke(_Rp _Tp::* __f, _T1 __t1)
-// {
-//     return (*__t1).*__f;
-// }
-
-// fifth bullet
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-decltype(declval<_Fp>()())
-__invoke(_Fp __f)
-{
-    return __f();
-}
-
-template <class _Fp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-decltype(declval<_Fp>()(declval<_A0&>()))
-__invoke(_Fp __f, _A0& __a0)
-{
-    return __f(__a0);
-}
-
-template <class _Fp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-decltype(declval<_Fp>()(declval<_A0&>(), declval<_A1&>()))
-__invoke(_Fp __f, _A0& __a0, _A1& __a1)
-{
-    return __f(__a0, __a1);
-}
-
-template <class _Fp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-decltype(declval<_Fp>()(declval<_A0&>(), declval<_A1&>(), declval<_A2&>()))
-__invoke(_Fp __f, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return __f(__a0, __a1, __a2);
-}
-
-// template <class _Rp, class _Fp>
-// inline _LIBCPP_INLINE_VISIBILITY
-// _Rp
-// __invoke(_Fp& __f)
-// {
-//     return __f();
-// }
-//
-// template <class _Rp, class _Fp, class _A0>
-// inline _LIBCPP_INLINE_VISIBILITY
-// typename enable_if
-// <
-//     !is_member_pointer<_Fp>::value,
-//     _Rp
-// >::type
-// __invoke(_Fp& __f, _A0& __a0)
-// {
-//     return __f(__a0);
-// }
-//
-// template <class _Rp, class _Fp, class _A0, class _A1>
-// inline _LIBCPP_INLINE_VISIBILITY
-// _Rp
-// __invoke(_Fp& __f, _A0& __a0, _A1& __a1)
-// {
-//     return __f(__a0, __a1);
-// }
-//
-// template <class _Rp, class _Fp, class _A0, class _A1, class _A2>
-// inline _LIBCPP_INLINE_VISIBILITY
-// _Rp
-// __invoke(_Fp& __f, _A0& __a0, _A1& __a1, _A2& __a2)
-// {
-//     return __f(__a0, __a1, __a2);
-// }
-
-template <class _Tp>
-struct __has_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Fp, bool = __has_result_type<__weak_result_type<_Fp> >::value>
-struct __invoke_return
-{
-    typedef typename __weak_result_type<_Fp>::result_type type;
-};
-
-template <class _Fp>
-struct __invoke_return<_Fp, false>
-{
-    typedef decltype(__invoke(_VSTD::declval<_Fp>())) type;
-};
-
-template <class _Tp, class _A0>
-struct __invoke_return0
-{
-    typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_A0>())) type;
-};
-
-template <class _Rp, class _Tp, class _A0>
-struct __invoke_return0<_Rp _Tp::*, _A0>
-{
-    typedef typename __apply_cv<_A0, _Rp>::type& type;
-};
-
-template <class _Rp, class _Tp, class _A0>
-struct __invoke_return0<_Rp _Tp::*, _A0*>
-{
-    typedef typename __apply_cv<_A0, _Rp>::type& type;
-};
-
-template <class _Tp, class _A0, class _A1>
-struct __invoke_return1
-{
-    typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_A0>(),
-                                                    _VSTD::declval<_A1>())) type;
-};
-
-template <class _Tp, class _A0, class _A1, class _A2>
-struct __invoke_return2
-{
-    typedef decltype(__invoke(_VSTD::declval<_Tp>(), _VSTD::declval<_A0>(),
-                                                    _VSTD::declval<_A1>(),
-                                                    _VSTD::declval<_A2>())) type;
-};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY reference_wrapper
-    : public __weak_result_type<_Tp>
-{
-public:
-    // types
-    typedef _Tp type;
-private:
-    type* __f_;
-
-public:
-    // construct/copy/destroy
-    _LIBCPP_INLINE_VISIBILITY reference_wrapper(type& __f) : __f_(&__f) {}
-
-    // access
-    _LIBCPP_INLINE_VISIBILITY operator type&    () const {return *__f_;}
-    _LIBCPP_INLINE_VISIBILITY          type& get() const {return *__f_;}
-
-    // invoke
-
-    _LIBCPP_INLINE_VISIBILITY
-    typename __invoke_return<type&>::type
-       operator() () const
-       {
-           return __invoke(get());
-       }
-
-    template <class _A0>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_return0<type&, _A0>::type
-          operator() (_A0& __a0) const
-          {
-              return __invoke<type&, _A0>(get(), __a0);
-          }
-
-    template <class _A0, class _A1>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_return1<type&, _A0, _A1>::type
-          operator() (_A0& __a0, _A1& __a1) const
-          {
-              return __invoke<type&, _A0, _A1>(get(), __a0, __a1);
-          }
-
-    template <class _A0, class _A1, class _A2>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_return2<type&, _A0, _A1, _A2>::type
-          operator() (_A0& __a0, _A1& __a1, _A2& __a2) const
-          {
-              return __invoke<type&, _A0, _A1, _A2>(get(), __a0, __a1, __a2);
-          }
-};
-
-template <class _Tp> struct __is_reference_wrapper_impl : public false_type {};
-template <class _Tp> struct __is_reference_wrapper_impl<reference_wrapper<_Tp> > : public true_type {};
-template <class _Tp> struct __is_reference_wrapper
-    : public __is_reference_wrapper_impl<typename remove_cv<_Tp>::type> {};
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<_Tp>
-ref(_Tp& __t)
-{
-    return reference_wrapper<_Tp>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<_Tp>
-ref(reference_wrapper<_Tp> __t)
-{
-    return ref(__t.get());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<const _Tp>
-cref(const _Tp& __t)
-{
-    return reference_wrapper<const _Tp>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-reference_wrapper<const _Tp>
-cref(reference_wrapper<_Tp> __t)
-{
-    return cref(__t.get());
-}
-
-#endif  // _LIBCPP_FUNCTIONAL_BASE_03
diff --git a/include.new/c++/v1/tr1/__hash_table b/include.new/c++/v1/tr1/__hash_table
deleted file mode 100644
index 7c954b6..0000000
--- a/include.new/c++/v1/tr1/__hash_table
+++ /dev/null
@@ -1,2453 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP__HASH_TABLE
-#define _LIBCPP__HASH_TABLE
-
-#include <__config>
-#include <initializer_list>
-#include <memory>
-#include <iterator>
-#include <algorithm>
-#include <cmath>
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-_LIBCPP_FUNC_VIS
-size_t __next_prime(size_t __n);
-
-template <class _NodePtr>
-struct __hash_node_base
-{
-    typedef __hash_node_base __first_node;
-
-    _NodePtr    __next_;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_node_base() _NOEXCEPT : __next_(nullptr) {}
-};
-
-template <class _Tp, class _VoidPtr>
-struct __hash_node
-    : public __hash_node_base
-             <
-                 typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                     rebind<__hash_node<_Tp, _VoidPtr> >
-#else
-                     rebind<__hash_node<_Tp, _VoidPtr> >::other
-#endif
-             >
-{
-    typedef _Tp value_type;
-
-    size_t     __hash_;
-    value_type __value_;
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__is_power2(size_t __bc)
-{
-    return __bc > 2 && !(__bc & (__bc - 1));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-__constrain_hash(size_t __h, size_t __bc)
-{
-    return !(__bc & (__bc - 1)) ? __h & (__bc - 1) : __h % __bc;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-__next_pow2(size_t __n)
-{
-    return size_t(1) << (std::numeric_limits<size_t>::digits - __clz(__n-1));
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc> class __hash_table;
-template <class _ConstNodePtr> class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-template <class _HashIterator> class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator;
-template <class _HashIterator> class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator;
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-    class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-
-template <class _NodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __hash_iterator
-{
-    typedef _NodePtr __node_pointer;
-
-    __node_pointer            __node_;
-
-public:
-    typedef forward_iterator_tag                         iterator_category;
-    typedef typename pointer_traits<__node_pointer>::element_type::value_type value_type;
-    typedef typename pointer_traits<__node_pointer>::difference_type difference_type;
-    typedef value_type&                                  reference;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                     rebind<value_type>
-#else
-                     rebind<value_type>::other
-#endif
-                                                         pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __node_(nullptr)
-#endif
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator(const __hash_iterator& __i)
-        : __node_(__i.__node_)
-    {
-        __get_db()->__iterator_copy(this, &__i);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator& operator=(const __hash_iterator& __i)
-    {
-        if (this != &__i)
-        {
-            __get_db()->__iterator_copy(this, &__i);
-            __node_ = __i.__node_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-        reference operator*() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container iterator");
-#endif
-            return __node_->__value_;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container iterator");
-#endif
-            return pointer_traits<pointer>::pointer_to(__node_->__value_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable unordered container iterator");
-#endif
-        __node_ = __node_->__next_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator operator++(int)
-    {
-        __hash_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __hash_iterator& __x, const __hash_iterator& __y)
-    {
-        return __x.__node_ == __y.__node_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __hash_iterator& __x, const __hash_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator(__node_pointer __node, const void* __c) _NOEXCEPT
-        : __node_(__node)
-        {
-            __get_db()->__insert_ic(this, __c);
-        }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_iterator(__node_pointer __node) _NOEXCEPT
-        : __node_(__node)
-        {}
-#endif
-
-    template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-};
-
-template <class _ConstNodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator
-{
-    typedef _ConstNodePtr __node_pointer;
-
-    __node_pointer         __node_;
-
-    typedef typename remove_const<
-        typename pointer_traits<__node_pointer>::element_type
-                                 >::type __node;
-
-public:
-    typedef forward_iterator_tag                       iterator_category;
-    typedef typename __node::value_type                value_type;
-    typedef typename pointer_traits<__node_pointer>::difference_type difference_type;
-    typedef const value_type&                          reference;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                       pointer;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__node>
-#else
-            rebind<__node>::other
-#endif
-                                                      __non_const_node_pointer;
-    typedef __hash_iterator<__non_const_node_pointer> __non_const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_const_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __node_(nullptr)
-#endif
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY 
-    __hash_const_iterator(const __non_const_iterator& __x) _NOEXCEPT
-        : __node_(__x.__node_)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__iterator_copy(this, &__x);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator(const __hash_const_iterator& __i)
-        : __node_(__i.__node_)
-    {
-        __get_db()->__iterator_copy(this, &__i);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_const_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator& operator=(const __hash_const_iterator& __i)
-    {
-        if (this != &__i)
-        {
-            __get_db()->__iterator_copy(this, &__i);
-            __node_ = __i.__node_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-        reference operator*() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container const_iterator");
-#endif
-            return __node_->__value_;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container const_iterator");
-#endif
-            return pointer_traits<pointer>::pointer_to(__node_->__value_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable unordered container const_iterator");
-#endif
-        __node_ = __node_->__next_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator operator++(int)
-    {
-        __hash_const_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __hash_const_iterator& __x, const __hash_const_iterator& __y)
-    {
-        return __x.__node_ == __y.__node_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __hash_const_iterator& __x, const __hash_const_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator(__node_pointer __node, const void* __c) _NOEXCEPT
-        : __node_(__node)
-        {
-            __get_db()->__insert_ic(this, __c);
-        }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_iterator(__node_pointer __node) _NOEXCEPT
-        : __node_(__node)
-        {}
-#endif
-
-    template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-};
-
-template <class _ConstNodePtr> class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-
-template <class _NodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __hash_local_iterator
-{
-    typedef _NodePtr __node_pointer;
-
-    __node_pointer         __node_;
-    size_t                 __bucket_;
-    size_t                 __bucket_count_;
-
-    typedef pointer_traits<__node_pointer>          __pointer_traits;
-public:
-    typedef forward_iterator_tag                                iterator_category;
-    typedef typename __pointer_traits::element_type::value_type value_type;
-    typedef typename __pointer_traits::difference_type          difference_type;
-    typedef value_type&                                         reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                                                pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_local_iterator() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator(const __hash_local_iterator& __i)
-        : __node_(__i.__node_),
-          __bucket_(__i.__bucket_),
-          __bucket_count_(__i.__bucket_count_)
-    {
-        __get_db()->__iterator_copy(this, &__i);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_local_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator& operator=(const __hash_local_iterator& __i)
-    {
-        if (this != &__i)
-        {
-            __get_db()->__iterator_copy(this, &__i);
-            __node_ = __i.__node_;
-            __bucket_ = __i.__bucket_;
-            __bucket_count_ = __i.__bucket_count_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-        reference operator*() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container local_iterator");
-#endif
-            return __node_->__value_;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container local_iterator");
-#endif
-            return pointer_traits<pointer>::pointer_to(__node_->__value_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable unordered container local_iterator");
-#endif
-        __node_ = __node_->__next_;
-        if (__node_ != nullptr && __constrain_hash(__node_->__hash_, __bucket_count_) != __bucket_)
-            __node_ = nullptr;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator operator++(int)
-    {
-        __hash_local_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __hash_local_iterator& __x, const __hash_local_iterator& __y)
-    {
-        return __x.__node_ == __y.__node_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __hash_local_iterator& __x, const __hash_local_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator(__node_pointer __node, size_t __bucket,
-                          size_t __bucket_count, const void* __c) _NOEXCEPT
-        : __node_(__node),
-          __bucket_(__bucket),
-          __bucket_count_(__bucket_count)
-        {
-            __get_db()->__insert_ic(this, __c);
-            if (__node_ != nullptr)
-                __node_ = __node_->__next_;
-        }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_local_iterator(__node_pointer __node, size_t __bucket,
-                          size_t __bucket_count) _NOEXCEPT
-        : __node_(__node),
-          __bucket_(__bucket),
-          __bucket_count_(__bucket_count)
-        {
-            if (__node_ != nullptr)
-                __node_ = __node_->__next_;
-        }
-#endif
-    template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator;
-};
-
-template <class _ConstNodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator
-{
-    typedef _ConstNodePtr __node_pointer;
-
-    __node_pointer         __node_;
-    size_t                 __bucket_;
-    size_t                 __bucket_count_;
-
-    typedef pointer_traits<__node_pointer>          __pointer_traits;
-    typedef typename __pointer_traits::element_type __node;
-    typedef typename remove_const<__node>::type     __non_const_node;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__non_const_node>
-#else
-            rebind<__non_const_node>::other
-#endif
-                                                    __non_const_node_pointer;
-    typedef __hash_local_iterator<__non_const_node_pointer>
-                                                    __non_const_iterator;
-public:
-    typedef forward_iterator_tag                       iterator_category;
-    typedef typename remove_const<
-                        typename __pointer_traits::element_type::value_type
-                     >::type                           value_type;
-    typedef typename __pointer_traits::difference_type difference_type;
-    typedef const value_type&                          reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                       pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __hash_const_local_iterator() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator(const __non_const_iterator& __x) _NOEXCEPT
-        : __node_(__x.__node_),
-          __bucket_(__x.__bucket_),
-          __bucket_count_(__x.__bucket_count_)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__iterator_copy(this, &__x);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator(const __hash_const_local_iterator& __i)
-        : __node_(__i.__node_),
-          __bucket_(__i.__bucket_),
-          __bucket_count_(__i.__bucket_count_)
-    {
-        __get_db()->__iterator_copy(this, &__i);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_const_local_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator& operator=(const __hash_const_local_iterator& __i)
-    {
-        if (this != &__i)
-        {
-            __get_db()->__iterator_copy(this, &__i);
-            __node_ = __i.__node_;
-            __bucket_ = __i.__bucket_;
-            __bucket_count_ = __i.__bucket_count_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-        reference operator*() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container const_local_iterator");
-#endif
-            return __node_->__value_;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                           "Attempted to dereference a non-dereferenceable unordered container const_local_iterator");
-#endif
-            return pointer_traits<pointer>::pointer_to(__node_->__value_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable unordered container const_local_iterator");
-#endif
-        __node_ = __node_->__next_;
-        if (__node_ != nullptr && __constrain_hash(__node_->__hash_, __bucket_count_) != __bucket_)
-            __node_ = nullptr;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator operator++(int)
-    {
-        __hash_const_local_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __hash_const_local_iterator& __x, const __hash_const_local_iterator& __y)
-    {
-        return __x.__node_ == __y.__node_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __hash_const_local_iterator& __x, const __hash_const_local_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator(__node_pointer __node, size_t __bucket,
-                                size_t __bucket_count, const void* __c) _NOEXCEPT
-        : __node_(__node),
-          __bucket_(__bucket),
-          __bucket_count_(__bucket_count)
-        {
-            __get_db()->__insert_ic(this, __c);
-            if (__node_ != nullptr)
-                __node_ = __node_->__next_;
-        }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_const_local_iterator(__node_pointer __node, size_t __bucket,
-                                size_t __bucket_count) _NOEXCEPT
-        : __node_(__node),
-          __bucket_(__bucket),
-          __bucket_count_(__bucket_count)
-        {
-            if (__node_ != nullptr)
-                __node_ = __node_->__next_;
-        }
-#endif
-    template <class, class, class, class> friend class __hash_table;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator;
-};
-
-template <class _Alloc>
-class __bucket_list_deallocator
-{
-    typedef _Alloc                                          allocator_type;
-    typedef allocator_traits<allocator_type>                __alloc_traits;
-    typedef typename __alloc_traits::size_type              size_type;
-
-    __compressed_pair<size_type, allocator_type> __data_;
-public:
-    typedef typename __alloc_traits::pointer pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bucket_list_deallocator()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-        : __data_(0) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bucket_list_deallocator(const allocator_type& __a, size_type __size)
-        _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value)
-        : __data_(__size, __a) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bucket_list_deallocator(__bucket_list_deallocator&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-        : __data_(_VSTD::move(__x.__data_))
-    {
-        __x.size() = 0;
-    }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type& size() _NOEXCEPT {return __data_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type  size() const _NOEXCEPT {return __data_.first();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type& __alloc() _NOEXCEPT {return __data_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const allocator_type& __alloc() const _NOEXCEPT {return __data_.second();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        __alloc_traits::deallocate(__alloc(), __p, size());
-    }
-};
-
-template <class _Alloc> class __hash_map_node_destructor;
-
-template <class _Alloc>
-class __hash_node_destructor
-{
-    typedef _Alloc                                          allocator_type;
-    typedef allocator_traits<allocator_type>                __alloc_traits;
-    typedef typename __alloc_traits::value_type::value_type value_type;
-public:
-    typedef typename __alloc_traits::pointer                pointer;
-private:
-
-    allocator_type& __na_;
-
-    __hash_node_destructor& operator=(const __hash_node_destructor&);
-
-public:
-    bool __value_constructed;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __hash_node_destructor(allocator_type& __na,
-                                    bool __constructed = false) _NOEXCEPT
-        : __na_(__na),
-          __value_constructed(__constructed)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        if (__value_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_));
-        if (__p)
-            __alloc_traits::deallocate(__na_, __p, 1);
-    }
-
-    template <class> friend class __hash_map_node_destructor;
-};
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-class __hash_table
-{
-public:
-    typedef _Tp    value_type;
-    typedef _Hash  hasher;
-    typedef _Equal key_equal;
-    typedef _Alloc allocator_type;
-
-private:
-    typedef allocator_traits<allocator_type> __alloc_traits;
-public:
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-public:
-    // Create __node
-    typedef __hash_node<value_type, typename __alloc_traits::void_pointer> __node;
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__node>
-#else
-            rebind_alloc<__node>::other
-#endif
-                                                     __node_allocator;
-    typedef allocator_traits<__node_allocator>       __node_traits;
-    typedef typename __node_traits::pointer          __node_pointer;
-    typedef typename __node_traits::pointer          __node_const_pointer;
-    typedef __hash_node_base<__node_pointer>         __first_node;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__first_node>
-#else
-            rebind<__first_node>::other
-#endif
-                                                     __node_base_pointer;
-
-private:
-
-    typedef typename __node_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__node_pointer>
-#else
-            rebind_alloc<__node_pointer>::other
-#endif
-                                                            __pointer_allocator;
-    typedef __bucket_list_deallocator<__pointer_allocator> __bucket_list_deleter;
-    typedef unique_ptr<__node_pointer[], __bucket_list_deleter> __bucket_list;
-    typedef allocator_traits<__pointer_allocator>          __pointer_alloc_traits;
-    typedef typename __bucket_list_deleter::pointer __node_pointer_pointer;
-
-    // --- Member data begin ---
-    __bucket_list                                     __bucket_list_;
-    __compressed_pair<__first_node, __node_allocator> __p1_;
-    __compressed_pair<size_type, hasher>              __p2_;
-    __compressed_pair<float, key_equal>               __p3_;
-    // --- Member data end ---
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type& size() _NOEXCEPT {return __p2_.first();}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    size_type  size() const _NOEXCEPT {return __p2_.first();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher& hash_function() _NOEXCEPT {return __p2_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const hasher& hash_function() const _NOEXCEPT {return __p2_.second();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float& max_load_factor() _NOEXCEPT {return __p3_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    float  max_load_factor() const _NOEXCEPT {return __p3_.first();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal& key_eq() _NOEXCEPT {return __p3_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const key_equal& key_eq() const _NOEXCEPT {return __p3_.second();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __node_allocator& __node_alloc() _NOEXCEPT {return __p1_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_allocator& __node_alloc() const _NOEXCEPT
-        {return __p1_.second();}
-
-public:
-    typedef __hash_iterator<__node_pointer>                   iterator;
-    typedef __hash_const_iterator<__node_pointer>             const_iterator;
-    typedef __hash_local_iterator<__node_pointer>             local_iterator;
-    typedef __hash_const_local_iterator<__node_pointer>       const_local_iterator;
-
-    __hash_table()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<__bucket_list>::value &&
-            is_nothrow_default_constructible<__first_node>::value &&
-            is_nothrow_default_constructible<__node_allocator>::value &&
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value);
-    __hash_table(const hasher& __hf, const key_equal& __eql);
-    __hash_table(const hasher& __hf, const key_equal& __eql,
-                 const allocator_type& __a);
-    explicit __hash_table(const allocator_type& __a);
-    __hash_table(const __hash_table& __u);
-    __hash_table(const __hash_table& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __hash_table(__hash_table&& __u)
-        _NOEXCEPT_(
-            is_nothrow_move_constructible<__bucket_list>::value &&
-            is_nothrow_move_constructible<__first_node>::value &&
-            is_nothrow_move_constructible<__node_allocator>::value &&
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value);
-    __hash_table(__hash_table&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~__hash_table();
-
-    __hash_table& operator=(const __hash_table& __u);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __hash_table& operator=(__hash_table&& __u)
-        _NOEXCEPT_(
-            __node_traits::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<__node_allocator>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-#endif
-    template <class _InputIterator>
-        void __assign_unique(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        void __assign_multi(_InputIterator __first, _InputIterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-    {
-        return allocator_traits<__pointer_allocator>::max_size(
-            __bucket_list_.get_deleter().__alloc());
-    }
-
-    pair<iterator, bool> __node_insert_unique(__node_pointer __nd);
-    iterator             __node_insert_multi(__node_pointer __nd);
-    iterator             __node_insert_multi(const_iterator __p,
-                                             __node_pointer __nd);
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        pair<iterator, bool> __emplace_unique(_Args&&... __args);
-    template <class... _Args>
-        iterator __emplace_multi(_Args&&... __args);
-    template <class... _Args>
-        iterator __emplace_hint_multi(const_iterator __p, _Args&&... __args);
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-    pair<iterator, bool> __insert_unique(const value_type& __x);
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp>
-        pair<iterator, bool> __insert_unique(_Pp&& __x);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp>
-        iterator __insert_multi(_Pp&& __x);
-    template <class _Pp>
-        iterator __insert_multi(const_iterator __p, _Pp&& __x);
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator __insert_multi(const value_type& __x);
-    iterator __insert_multi(const_iterator __p, const value_type& __x);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    void clear() _NOEXCEPT;
-    void rehash(size_type __n);
-    _LIBCPP_INLINE_VISIBILITY void reserve(size_type __n)
-        {rehash(static_cast<size_type>(ceil(__n / max_load_factor())));}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT
-    {
-        return __bucket_list_.get_deleter().size();
-    }
-
-    iterator       begin() _NOEXCEPT;
-    iterator       end() _NOEXCEPT;
-    const_iterator begin() const _NOEXCEPT;
-    const_iterator end() const _NOEXCEPT;
-
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        size_type bucket(const _Key& __k) const
-        {
-            _LIBCPP_ASSERT(bucket_count() > 0,
-                "unordered container::bucket(key) called when bucket_count() == 0");
-            return __constrain_hash(hash_function()(__k), bucket_count());
-        }
-
-    template <class _Key>
-        iterator       find(const _Key& __x);
-    template <class _Key>
-        const_iterator find(const _Key& __x) const;
-
-    typedef __hash_node_destructor<__node_allocator> _Dp;
-    typedef unique_ptr<__node, _Dp> __node_holder;
-
-    iterator erase(const_iterator __p);
-    iterator erase(const_iterator __first, const_iterator __last);
-    template <class _Key>
-        size_type __erase_unique(const _Key& __k);
-    template <class _Key>
-        size_type __erase_multi(const _Key& __k);
-    __node_holder remove(const_iterator __p) _NOEXCEPT;
-
-    template <class _Key>
-        size_type __count_unique(const _Key& __k) const;
-    template <class _Key>
-        size_type __count_multi(const _Key& __k) const;
-
-    template <class _Key>
-        pair<iterator, iterator>
-        __equal_range_unique(const _Key& __k);
-    template <class _Key>
-        pair<const_iterator, const_iterator>
-        __equal_range_unique(const _Key& __k) const;
-
-    template <class _Key>
-        pair<iterator, iterator>
-        __equal_range_multi(const _Key& __k);
-    template <class _Key>
-        pair<const_iterator, const_iterator>
-        __equal_range_multi(const _Key& __k) const;
-
-    void swap(__hash_table& __u)
-        _NOEXCEPT_(
-            (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<__pointer_allocator>::value) &&
-            (!__node_traits::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<__node_allocator>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT
-        {return __pointer_alloc_traits::max_size(__bucket_list_.get_deleter().__alloc());}
-    size_type bucket_size(size_type __n) const;
-    _LIBCPP_INLINE_VISIBILITY float load_factor() const _NOEXCEPT
-    {
-        size_type __bc = bucket_count();
-        return __bc != 0 ? (float)size() / __bc : 0.f;
-    }
-    _LIBCPP_INLINE_VISIBILITY void max_load_factor(float __mlf) _NOEXCEPT
-    {
-        _LIBCPP_ASSERT(__mlf > 0,
-            "unordered container::max_load_factor(lf) called with lf <= 0");
-        max_load_factor() = _VSTD::max(__mlf, load_factor());
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator
-    begin(size_type __n)
-    {
-        _LIBCPP_ASSERT(__n < bucket_count(),
-            "unordered container::begin(n) called with n >= bucket_count()");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return local_iterator(__bucket_list_[__n], __n, bucket_count(), this);
-#else
-        return local_iterator(__bucket_list_[__n], __n, bucket_count());
-#endif
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator
-    end(size_type __n)
-    {
-        _LIBCPP_ASSERT(__n < bucket_count(),
-            "unordered container::end(n) called with n >= bucket_count()");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return local_iterator(nullptr, __n, bucket_count(), this);
-#else
-        return local_iterator(nullptr, __n, bucket_count());
-#endif
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator
-    cbegin(size_type __n) const
-    {
-        _LIBCPP_ASSERT(__n < bucket_count(),
-            "unordered container::cbegin(n) called with n >= bucket_count()");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return const_local_iterator(__bucket_list_[__n], __n, bucket_count(), this);
-#else
-        return const_local_iterator(__bucket_list_[__n], __n, bucket_count());
-#endif
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator
-    cend(size_type __n) const
-    {
-        _LIBCPP_ASSERT(__n < bucket_count(),
-            "unordered container::cend(n) called with n >= bucket_count()");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return const_local_iterator(nullptr, __n, bucket_count(), this);
-#else
-        return const_local_iterator(nullptr, __n, bucket_count());
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const;
-    bool __decrementable(const const_iterator* __i) const;
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const;
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-    void __rehash(size_type __n);
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class ..._Args>
-        __node_holder __construct_node(_Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-    __node_holder __construct_node(value_type&& __v, size_t __hash);
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node(const value_type& __v);
-#endif
-    __node_holder __construct_node(const value_type& __v, size_t __hash);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __hash_table& __u)
-        {__copy_assign_alloc(__u, integral_constant<bool,
-             __node_traits::propagate_on_container_copy_assignment::value>());}
-    void __copy_assign_alloc(const __hash_table& __u, true_type);
-    _LIBCPP_INLINE_VISIBILITY
-        void __copy_assign_alloc(const __hash_table&, false_type) {}
-
-    void __move_assign(__hash_table& __u, false_type);
-    void __move_assign(__hash_table& __u, true_type)
-        _NOEXCEPT_(
-            is_nothrow_move_assignable<__node_allocator>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__hash_table& __u)
-        _NOEXCEPT_(
-            !__node_traits::propagate_on_container_move_assignment::value ||
-            (is_nothrow_move_assignable<__pointer_allocator>::value &&
-             is_nothrow_move_assignable<__node_allocator>::value))
-        {__move_assign_alloc(__u, integral_constant<bool,
-             __node_traits::propagate_on_container_move_assignment::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__hash_table& __u, true_type)
-        _NOEXCEPT_(
-            is_nothrow_move_assignable<__pointer_allocator>::value &&
-            is_nothrow_move_assignable<__node_allocator>::value)
-    {
-        __bucket_list_.get_deleter().__alloc() =
-                _VSTD::move(__u.__bucket_list_.get_deleter().__alloc());
-        __node_alloc() = _VSTD::move(__u.__node_alloc());
-    }
-    _LIBCPP_INLINE_VISIBILITY
-        void __move_assign_alloc(__hash_table&, false_type) _NOEXCEPT {}
-
-    template <class _Ap>
-    _LIBCPP_INLINE_VISIBILITY
-    static
-    void
-    __swap_alloc(_Ap& __x, _Ap& __y)
-        _NOEXCEPT_(
-            !allocator_traits<_Ap>::propagate_on_container_swap::value ||
-            __is_nothrow_swappable<_Ap>::value)
-    {
-        __swap_alloc(__x, __y,
-                     integral_constant<bool,
-                        allocator_traits<_Ap>::propagate_on_container_swap::value
-                                      >());
-    }
-
-    template <class _Ap>
-    _LIBCPP_INLINE_VISIBILITY
-    static
-    void
-    __swap_alloc(_Ap& __x, _Ap& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<_Ap>::value)
-    {
-        using _VSTD::swap;
-        swap(__x, __y);
-    }
-
-    template <class _Ap>
-    _LIBCPP_INLINE_VISIBILITY
-    static
-    void
-    __swap_alloc(_Ap&, _Ap&, false_type) _NOEXCEPT {}
-
-    void __deallocate(__node_pointer __np) _NOEXCEPT;
-    __node_pointer __detach() _NOEXCEPT;
-
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-};
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table()
-    _NOEXCEPT_(
-        is_nothrow_default_constructible<__bucket_list>::value &&
-        is_nothrow_default_constructible<__first_node>::value &&
-        is_nothrow_default_constructible<hasher>::value &&
-        is_nothrow_default_constructible<key_equal>::value)
-    : __p2_(0),
-      __p3_(1.0f)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const hasher& __hf,
-                                                       const key_equal& __eql)
-    : __bucket_list_(nullptr, __bucket_list_deleter()),
-      __p1_(),
-      __p2_(0, __hf),
-      __p3_(1.0f, __eql)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const hasher& __hf,
-                                                       const key_equal& __eql,
-                                                       const allocator_type& __a)
-    : __bucket_list_(nullptr, __bucket_list_deleter(__pointer_allocator(__a), 0)),
-      __p1_(__node_allocator(__a)),
-      __p2_(0, __hf),
-      __p3_(1.0f, __eql)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const allocator_type& __a)
-    : __bucket_list_(nullptr, __bucket_list_deleter(__pointer_allocator(__a), 0)),
-      __p1_(__node_allocator(__a)),
-      __p2_(0),
-      __p3_(1.0f)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const __hash_table& __u)
-    : __bucket_list_(nullptr,
-          __bucket_list_deleter(allocator_traits<__pointer_allocator>::
-              select_on_container_copy_construction(
-                  __u.__bucket_list_.get_deleter().__alloc()), 0)),
-      __p1_(allocator_traits<__node_allocator>::
-          select_on_container_copy_construction(__u.__node_alloc())),
-      __p2_(0, __u.hash_function()),
-      __p3_(__u.__p3_)
-{
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(const __hash_table& __u,
-                                                       const allocator_type& __a)
-    : __bucket_list_(nullptr, __bucket_list_deleter(__pointer_allocator(__a), 0)),
-      __p1_(__node_allocator(__a)),
-      __p2_(0, __u.hash_function()),
-      __p3_(__u.__p3_)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(__hash_table&& __u)
-        _NOEXCEPT_(
-            is_nothrow_move_constructible<__bucket_list>::value &&
-            is_nothrow_move_constructible<__first_node>::value &&
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value)
-    : __bucket_list_(_VSTD::move(__u.__bucket_list_)),
-      __p1_(_VSTD::move(__u.__p1_)),
-      __p2_(_VSTD::move(__u.__p2_)),
-      __p3_(_VSTD::move(__u.__p3_))
-{
-    if (size() > 0)
-    {
-        __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-        __u.__p1_.first().__next_ = nullptr;
-        __u.size() = 0;
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__hash_table(__hash_table&& __u,
-                                                       const allocator_type& __a)
-    : __bucket_list_(nullptr, __bucket_list_deleter(__pointer_allocator(__a), 0)),
-      __p1_(__node_allocator(__a)),
-      __p2_(0, _VSTD::move(__u.hash_function())),
-      __p3_(_VSTD::move(__u.__p3_))
-{
-    if (__a == allocator_type(__u.__node_alloc()))
-    {
-        __bucket_list_.reset(__u.__bucket_list_.release());
-        __bucket_list_.get_deleter().size() = __u.__bucket_list_.get_deleter().size();
-        __u.__bucket_list_.get_deleter().size() = 0;
-        if (__u.size() > 0)
-        {
-            __p1_.first().__next_ = __u.__p1_.first().__next_;
-            __u.__p1_.first().__next_ = nullptr;
-            __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-                static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-            size() = __u.size();
-            __u.size() = 0;
-        }
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::~__hash_table()
-{
-    __deallocate(__p1_.first().__next_);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__erase_c(this);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__copy_assign_alloc(
-        const __hash_table& __u, true_type)
-{
-    if (__node_alloc() != __u.__node_alloc())
-    {
-        clear();
-        __bucket_list_.reset();
-        __bucket_list_.get_deleter().size() = 0;
-    }
-    __bucket_list_.get_deleter().__alloc() = __u.__bucket_list_.get_deleter().__alloc();
-    __node_alloc() = __u.__node_alloc();
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>&
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::operator=(const __hash_table& __u)
-{
-    if (this != &__u)
-    {
-        __copy_assign_alloc(__u);
-        hash_function() = __u.hash_function();
-        key_eq() = __u.key_eq();
-        max_load_factor() = __u.max_load_factor();
-        __assign_multi(__u.begin(), __u.end());
-    }
-    return *this;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__deallocate(__node_pointer __np)
-    _NOEXCEPT
-{
-    __node_allocator& __na = __node_alloc();
-    while (__np != nullptr)
-    {
-        __node_pointer __next = __np->__next_;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __c_node* __c = __get_db()->__find_c_and_lock(this);
-        for (__i_node** __p = __c->end_; __p != __c->beg_; )
-        {
-            --__p;
-            iterator* __i = static_cast<iterator*>((*__p)->__i_);
-            if (__i->__node_ == __np)
-            {
-                (*__p)->__c_ = nullptr;
-                if (--__c->end_ != __p)
-                    memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __get_db()->unlock();
-#endif
-        __node_traits::destroy(__na, _VSTD::addressof(__np->__value_));
-        __node_traits::deallocate(__na, __np, 1);
-        __np = __next;
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_pointer
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__detach() _NOEXCEPT
-{
-    size_type __bc = bucket_count();
-    for (size_type __i = 0; __i < __bc; ++__i)
-        __bucket_list_[__i] = nullptr;
-    size() = 0;
-    __node_pointer __cache = __p1_.first().__next_;
-    __p1_.first().__next_ = nullptr;
-    return __cache;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__move_assign(
-        __hash_table& __u, true_type)
-    _NOEXCEPT_(
-        is_nothrow_move_assignable<__node_allocator>::value &&
-        is_nothrow_move_assignable<hasher>::value &&
-        is_nothrow_move_assignable<key_equal>::value)
-{
-    clear();
-    __bucket_list_.reset(__u.__bucket_list_.release());
-    __bucket_list_.get_deleter().size() = __u.__bucket_list_.get_deleter().size();
-    __u.__bucket_list_.get_deleter().size() = 0;
-    __move_assign_alloc(__u);
-    size() = __u.size();
-    hash_function() = _VSTD::move(__u.hash_function());
-    max_load_factor() = __u.max_load_factor();
-    key_eq() = _VSTD::move(__u.key_eq());
-    __p1_.first().__next_ = __u.__p1_.first().__next_;
-    if (size() > 0)
-    {
-        __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-        __u.__p1_.first().__next_ = nullptr;
-        __u.size() = 0;
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__move_assign(
-        __hash_table& __u, false_type)
-{
-    if (__node_alloc() == __u.__node_alloc())
-        __move_assign(__u, true_type());
-    else
-    {
-        hash_function() = _VSTD::move(__u.hash_function());
-        key_eq() = _VSTD::move(__u.key_eq());
-        max_load_factor() = __u.max_load_factor();
-        if (bucket_count() != 0)
-        {
-            __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            try
-            {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                const_iterator __i = __u.begin();
-                while (__cache != nullptr && __u.size() != 0)
-                {
-                    __cache->__value_ = _VSTD::move(__u.remove(__i++)->__value_);
-                    __node_pointer __next = __cache->__next_;
-                    __node_insert_multi(__cache);
-                    __cache = __next;
-                }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            }
-            catch (...)
-            {
-                __deallocate(__cache);
-                throw;
-            }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __deallocate(__cache);
-        }
-        const_iterator __i = __u.begin();
-        while (__u.size() != 0)
-        {
-            __node_holder __h =
-                    __construct_node(_VSTD::move(__u.remove(__i++)->__value_));
-            __node_insert_multi(__h.get());
-            __h.release();
-        }
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__hash_table<_Tp, _Hash, _Equal, _Alloc>&
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::operator=(__hash_table&& __u)
-    _NOEXCEPT_(
-        __node_traits::propagate_on_container_move_assignment::value &&
-        is_nothrow_move_assignable<__node_allocator>::value &&
-        is_nothrow_move_assignable<hasher>::value &&
-        is_nothrow_move_assignable<key_equal>::value)
-{
-    __move_assign(__u, integral_constant<bool,
-                  __node_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _InputIterator>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__assign_unique(_InputIterator __first,
-                                                          _InputIterator __last)
-{
-    if (bucket_count() != 0)
-    {
-        __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __cache != nullptr && __first != __last; ++__first)
-            {
-                __cache->__value_ = *__first;
-                __node_pointer __next = __cache->__next_;
-                __node_insert_unique(__cache);
-                __cache = __next;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            __deallocate(__cache);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __deallocate(__cache);
-    }
-    for (; __first != __last; ++__first)
-        __insert_unique(*__first);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _InputIterator>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__assign_multi(_InputIterator __first,
-                                                         _InputIterator __last)
-{
-    if (bucket_count() != 0)
-    {
-        __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __cache != nullptr && __first != __last; ++__first)
-            {
-                __cache->__value_ = *__first;
-                __node_pointer __next = __cache->__next_;
-                __node_insert_multi(__cache);
-                __cache = __next;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            __deallocate(__cache);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __deallocate(__cache);
-    }
-    for (; __first != __last; ++__first)
-        __insert_multi(*__first);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::begin() _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__p1_.first().__next_, this);
-#else
-    return iterator(__p1_.first().__next_);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::end() _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(nullptr, this);
-#else
-    return iterator(nullptr);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::begin() const _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return const_iterator(__p1_.first().__next_, this);
-#else
-    return const_iterator(__p1_.first().__next_);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::end() const _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return const_iterator(nullptr, this);
-#else
-    return const_iterator(nullptr);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::clear() _NOEXCEPT
-{
-    if (size() > 0)
-    {
-        __deallocate(__p1_.first().__next_);
-        __p1_.first().__next_ = nullptr;
-        size_type __bc = bucket_count();
-        for (size_type __i = 0; __i < __bc; ++__i)
-            __bucket_list_[__i] = nullptr;
-        size() = 0;
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator, bool>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_unique(__node_pointer __nd)
-{
-    __nd->__hash_ = hash_function()(__nd->__value_);
-    size_type __bc = bucket_count();
-    bool __inserted = false;
-    __node_pointer __ndptr;
-    size_t __chash;
-    if (__bc != 0)
-    {
-        __chash = __constrain_hash(__nd->__hash_, __bc);
-        __ndptr = __bucket_list_[__chash];
-        if (__ndptr != nullptr)
-        {
-            for (__ndptr = __ndptr->__next_; __ndptr != nullptr &&
-                                             __constrain_hash(__ndptr->__hash_, __bc) == __chash;
-                                                     __ndptr = __ndptr->__next_)
-            {
-                if (key_eq()(__ndptr->__value_, __nd->__value_))
-                    goto __done;
-            }
-        }
-    }
-    {
-        if (size()+1 > __bc * max_load_factor() || __bc == 0)
-        {
-            rehash(_VSTD::max<size_type>(2 * __bc + !__is_power2(__bc),
-                           size_type(ceil(float(size() + 1) / max_load_factor()))));
-            __bc = bucket_count();
-            __chash = __constrain_hash(__nd->__hash_, __bc);
-        }
-        // insert_after __bucket_list_[__chash], or __first_node if bucket is null
-        __node_pointer __pn = __bucket_list_[__chash];
-        if (__pn == nullptr)
-        {
-            __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-            __nd->__next_ = __pn->__next_;
-            __pn->__next_ = __nd;
-            // fix up __bucket_list_
-            __bucket_list_[__chash] = __pn;
-            if (__nd->__next_ != nullptr)
-                __bucket_list_[__constrain_hash(__nd->__next_->__hash_, __bc)] = __nd;
-        }
-        else
-        {
-            __nd->__next_ = __pn->__next_;
-            __pn->__next_ = __nd;
-        }
-        __ndptr = __nd;
-        // increment size
-        ++size();
-        __inserted = true;
-    }
-__done:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return pair<iterator, bool>(iterator(__ndptr, this), __inserted);
-#else
-    return pair<iterator, bool>(iterator(__ndptr), __inserted);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_multi(__node_pointer __cp)
-{
-    __cp->__hash_ = hash_function()(__cp->__value_);
-    size_type __bc = bucket_count();
-    if (size()+1 > __bc * max_load_factor() || __bc == 0)
-    {
-        rehash(_VSTD::max<size_type>(2 * __bc + !__is_power2(__bc),
-                       size_type(ceil(float(size() + 1) / max_load_factor()))));
-        __bc = bucket_count();
-    }
-    size_t __chash = __constrain_hash(__cp->__hash_, __bc);
-    __node_pointer __pn = __bucket_list_[__chash];
-    if (__pn == nullptr)
-    {
-        __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-        __cp->__next_ = __pn->__next_;
-        __pn->__next_ = __cp;
-        // fix up __bucket_list_
-        __bucket_list_[__chash] = __pn;
-        if (__cp->__next_ != nullptr)
-            __bucket_list_[__constrain_hash(__cp->__next_->__hash_, __bc)] = __cp;
-    }
-    else
-    {
-        for (bool __found = false; __pn->__next_ != nullptr &&
-                                   __constrain_hash(__pn->__next_->__hash_, __bc) == __chash;
-                                                           __pn = __pn->__next_)
-        {
-            //      __found    key_eq()     action
-            //      false       false       loop
-            //      true        true        loop
-            //      false       true        set __found to true
-            //      true        false       break
-            if (__found != (__pn->__next_->__hash_ == __cp->__hash_ &&
-                            key_eq()(__pn->__next_->__value_, __cp->__value_)))
-            {
-                if (!__found)
-                    __found = true;
-                else
-                    break;
-            }
-        }
-        __cp->__next_ = __pn->__next_;
-        __pn->__next_ = __cp;
-        if (__cp->__next_ != nullptr)
-        {
-            size_t __nhash = __constrain_hash(__cp->__next_->__hash_, __bc);
-            if (__nhash != __chash)
-                __bucket_list_[__nhash] = __cp;
-        }
-    }
-    ++size();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__cp, this);
-#else
-    return iterator(__cp);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_insert_multi(
-        const_iterator __p, __node_pointer __cp)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container::emplace_hint(const_iterator, args...) called with an iterator not"
-        " referring to this unordered container");
-#endif
-    if (__p != end() && key_eq()(*__p, __cp->__value_))
-    {
-        __node_pointer __np = __p.__node_;
-        __cp->__hash_ = __np->__hash_;
-        size_type __bc = bucket_count();
-        if (size()+1 > __bc * max_load_factor() || __bc == 0)
-        {
-            rehash(_VSTD::max<size_type>(2 * __bc + !__is_power2(__bc),
-                           size_type(ceil(float(size() + 1) / max_load_factor()))));
-            __bc = bucket_count();
-        }
-        size_t __chash = __constrain_hash(__cp->__hash_, __bc);
-        __node_pointer __pp = __bucket_list_[__chash];
-        while (__pp->__next_ != __np)
-            __pp = __pp->__next_;
-        __cp->__next_ = __np;
-        __pp->__next_ = __cp;
-        ++size();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return iterator(__cp, this);
-#else
-        return iterator(__cp);
-#endif
-    }
-    return __node_insert_multi(__cp);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator, bool>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_unique(const value_type& __x)
-{
-    size_t __hash = hash_function()(__x);
-    size_type __bc = bucket_count();
-    bool __inserted = false;
-    __node_pointer __nd;
-    size_t __chash;
-    if (__bc != 0)
-    {
-        __chash = __constrain_hash(__hash, __bc);
-        __nd = __bucket_list_[__chash];
-        if (__nd != nullptr)
-        {
-            for (__nd = __nd->__next_; __nd != nullptr &&
-                                       __constrain_hash(__nd->__hash_, __bc) == __chash;
-                                                           __nd = __nd->__next_)
-            {
-                if (key_eq()(__nd->__value_, __x))
-                    goto __done;
-            }
-        }
-    }
-    {
-        __node_holder __h = __construct_node(__x, __hash);
-        if (size()+1 > __bc * max_load_factor() || __bc == 0)
-        {
-            rehash(_VSTD::max<size_type>(2 * __bc + !__is_power2(__bc),
-                           size_type(ceil(float(size() + 1) / max_load_factor()))));
-            __bc = bucket_count();
-            __chash = __constrain_hash(__hash, __bc);
-        }
-        // insert_after __bucket_list_[__chash], or __first_node if bucket is null
-        __node_pointer __pn = __bucket_list_[__chash];
-        if (__pn == nullptr)
-        {
-            __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-            __h->__next_ = __pn->__next_;
-            __pn->__next_ = __h.get();
-            // fix up __bucket_list_
-            __bucket_list_[__chash] = __pn;
-            if (__h->__next_ != nullptr)
-                __bucket_list_[__constrain_hash(__h->__next_->__hash_, __bc)] = __h.get();
-        }
-        else
-        {
-            __h->__next_ = __pn->__next_;
-            __pn->__next_ = __h.get();
-        }
-        __nd = __h.release();
-        // increment size
-        ++size();
-        __inserted = true;
-    }
-__done:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return pair<iterator, bool>(iterator(__nd, this), __inserted);
-#else
-    return pair<iterator, bool>(iterator(__nd), __inserted);
-#endif
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class... _Args>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator, bool>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_unique(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    pair<iterator, bool> __r = __node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class... _Args>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_multi(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class... _Args>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__emplace_hint_multi(
-        const_iterator __p, _Args&&... __args)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container::emplace_hint(const_iterator, args...) called with an iterator not"
-        " referring to this unordered container");
-#endif
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __node_insert_multi(__p, __h.get());
-    __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Pp>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator, bool>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_unique(_Pp&& __x)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Pp>(__x));
-    pair<iterator, bool> __r = __node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Pp>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_multi(_Pp&& __x)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Pp>(__x));
-    iterator __r = __node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Pp>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_multi(const_iterator __p,
-                                                         _Pp&& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container::insert(const_iterator, rvalue) called with an iterator not"
-        " referring to this unordered container");
-#endif
-    __node_holder __h = __construct_node(_VSTD::forward<_Pp>(__x));
-    iterator __r = __node_insert_multi(__p, __h.get());
-    __h.release();
-    return __r;
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_multi(const value_type& __x)
-{
-    __node_holder __h = __construct_node(__x);
-    iterator __r = __node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__insert_multi(const_iterator __p,
-                                                         const value_type& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container::insert(const_iterator, lvalue) called with an iterator not"
-        " referring to this unordered container");
-#endif
-    __node_holder __h = __construct_node(__x);
-    iterator __r = __node_insert_multi(__p, __h.get());
-    __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::rehash(size_type __n)
-{
-    if (__n == 1)
-        __n = 2;
-    else if (__n & (__n - 1))
-        __n = __next_prime(__n);
-    size_type __bc = bucket_count();
-    if (__n > __bc)
-        __rehash(__n);
-    else if (__n < __bc)
-    {
-        __n = _VSTD::max<size_type>
-              (
-                  __n,
-                  __is_power2(__bc) ? __next_pow2(size_t(ceil(float(size()) / max_load_factor()))) :
-                                      __next_prime(size_t(ceil(float(size()) / max_load_factor())))
-              );
-        if (__n < __bc)
-            __rehash(__n);
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__rehash(size_type __nbc)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__invalidate_all(this);
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-    __pointer_allocator& __npa = __bucket_list_.get_deleter().__alloc();
-    __bucket_list_.reset(__nbc > 0 ?
-                      __pointer_alloc_traits::allocate(__npa, __nbc) : nullptr);
-    __bucket_list_.get_deleter().size() = __nbc;
-    if (__nbc > 0)
-    {
-        for (size_type __i = 0; __i < __nbc; ++__i)
-            __bucket_list_[__i] = nullptr;
-        __node_pointer __pp(static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())));
-        __node_pointer __cp = __pp->__next_;
-        if (__cp != nullptr)
-        {
-            size_type __chash = __constrain_hash(__cp->__hash_, __nbc);
-            __bucket_list_[__chash] = __pp;
-            size_type __phash = __chash;
-            for (__pp = __cp, __cp = __cp->__next_; __cp != nullptr;
-                                                           __cp = __pp->__next_)
-            {
-                __chash = __constrain_hash(__cp->__hash_, __nbc);
-                if (__chash == __phash)
-                    __pp = __cp;
-                else
-                {
-                    if (__bucket_list_[__chash] == nullptr)
-                    {
-                        __bucket_list_[__chash] = __pp;
-                        __pp = __cp;
-                        __phash = __chash;
-                    }
-                    else
-                    {
-                        __node_pointer __np = __cp;
-                        for (; __np->__next_ != nullptr &&
-                               key_eq()(__cp->__value_, __np->__next_->__value_);
-                                                           __np = __np->__next_)
-                            ;
-                        __pp->__next_ = __np->__next_;
-                        __np->__next_ = __bucket_list_[__chash]->__next_;
-                        __bucket_list_[__chash]->__next_ = __cp;
-
-                    }
-                }
-            }
-        }
-    }
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::find(const _Key& __k)
-{
-    size_t __hash = hash_function()(__k);
-    size_type __bc = bucket_count();
-    if (__bc != 0)
-    {
-        size_t __chash = __constrain_hash(__hash, __bc);
-        __node_pointer __nd = __bucket_list_[__chash];
-        if (__nd != nullptr)
-        {
-            for (__nd = __nd->__next_; __nd != nullptr &&
-                                       __constrain_hash(__nd->__hash_, __bc) == __chash;
-                                                           __nd = __nd->__next_)
-            {
-                if (key_eq()(__nd->__value_, __k))
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                    return iterator(__nd, this);
-#else
-                    return iterator(__nd);
-#endif
-            }
-        }
-    }
-    return end();
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::find(const _Key& __k) const
-{
-    size_t __hash = hash_function()(__k);
-    size_type __bc = bucket_count();
-    if (__bc != 0)
-    {
-        size_t __chash = __constrain_hash(__hash, __bc);
-        __node_const_pointer __nd = __bucket_list_[__chash];
-        if (__nd != nullptr)
-        {
-            for (__nd = __nd->__next_; __nd != nullptr &&
-                                           __constrain_hash(__nd->__hash_, __bc) == __chash;
-                                                           __nd = __nd->__next_)
-            {
-                if (key_eq()(__nd->__value_, __k))
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                    return const_iterator(__nd, this);
-#else
-                    return const_iterator(__nd);
-#endif
-            }
-        }
-
-    }
-    return end();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class ..._Args>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__construct_node(_Args&& ...__args)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__value_constructed = true;
-    __h->__hash_ = hash_function()(__h->__value_);
-    __h->__next_ = nullptr;
-    return __h;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__construct_node(value_type&& __v,
-                                                           size_t __hash)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::move(__v));
-    __h.get_deleter().__value_constructed = true;
-    __h->__hash_ = __hash;
-    __h->__next_ = nullptr;
-    return __h;
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__construct_node(const value_type& __v)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), __v);
-    __h.get_deleter().__value_constructed = true;
-    __h->__hash_ = hash_function()(__h->__value_);
-    __h->__next_ = nullptr;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__construct_node(const value_type& __v,
-                                                           size_t __hash)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), __v);
-    __h.get_deleter().__value_constructed = true;
-    __h->__hash_ = __hash;
-    __h->__next_ = nullptr;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::erase(const_iterator __p)
-{
-    __node_pointer __np = __p.__node_;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "unordered container erase(iterator) called with an iterator not"
-        " referring to this container");
-    _LIBCPP_ASSERT(__p != end(),
-        "unordered container erase(iterator) called with a non-dereferenceable iterator");
-    iterator __r(__np, this);
-#else
-    iterator __r(__np);
-#endif
-    ++__r;
-    remove(__p);
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::erase(const_iterator __first,
-                                                const_iterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__first) == this,
-        "unodered container::erase(iterator, iterator) called with an iterator not"
-        " referring to this unodered container");
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__last) == this,
-        "unodered container::erase(iterator, iterator) called with an iterator not"
-        " referring to this unodered container");
-#endif
-    for (const_iterator __p = __first; __first != __last; __p = __first)
-    {
-        ++__first;
-        erase(__p);
-    }
-    __node_pointer __np = __last.__node_;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator (__np, this);
-#else
-    return iterator (__np);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__erase_unique(const _Key& __k)
-{
-    iterator __i = find(__k);
-    if (__i == end())
-        return 0;
-    erase(__i);
-    return 1;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__erase_multi(const _Key& __k)
-{
-    size_type __r = 0;
-    iterator __i = find(__k);
-    if (__i != end())
-    {
-        iterator __e = end();
-        do
-        {
-            erase(__i++);
-            ++__r;
-        } while (__i != __e && key_eq()(*__i, __k));
-    }
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::__node_holder
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::remove(const_iterator __p) _NOEXCEPT
-{
-    // current node
-    __node_pointer __cn = __p.__node_;
-    size_type __bc = bucket_count();
-    size_t __chash = __constrain_hash(__cn->__hash_, __bc);
-    // find previous node
-    __node_pointer __pn = __bucket_list_[__chash];
-    for (; __pn->__next_ != __cn; __pn = __pn->__next_)
-        ;
-    // Fix up __bucket_list_
-        // if __pn is not in same bucket (before begin is not in same bucket) &&
-        //    if __cn->__next_ is not in same bucket (nullptr is not in same bucket)
-    if (__pn == static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()))
-                            || __constrain_hash(__pn->__hash_, __bc) != __chash)
-    {
-        if (__cn->__next_ == nullptr || __constrain_hash(__cn->__next_->__hash_, __bc) != __chash)
-            __bucket_list_[__chash] = nullptr;
-    }
-        // if __cn->__next_ is not in same bucket (nullptr is in same bucket)
-    if (__cn->__next_ != nullptr)
-    {
-        size_t __nhash = __constrain_hash(__cn->__next_->__hash_, __bc);
-        if (__nhash != __chash)
-            __bucket_list_[__nhash] = __pn;
-    }
-    // remove __cn
-    __pn->__next_ = __cn->__next_;
-    __cn->__next_ = nullptr;
-    --size();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    for (__i_node** __p = __c->end_; __p != __c->beg_; )
-    {
-        --__p;
-        iterator* __i = static_cast<iterator*>((*__p)->__i_);
-        if (__i->__node_ == __cn)
-        {
-            (*__p)->__c_ = nullptr;
-            if (--__c->end_ != __p)
-                memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-        }
-    }
-    __get_db()->unlock();
-#endif
-    return __node_holder(__cn, _Dp(__node_alloc(), true));
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__count_unique(const _Key& __k) const
-{
-    return static_cast<size_type>(find(__k) != end());
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__count_multi(const _Key& __k) const
-{
-    size_type __r = 0;
-    const_iterator __i = find(__k);
-    if (__i != end())
-    {
-        const_iterator __e = end();
-        do
-        {
-            ++__i;
-            ++__r;
-        } while (__i != __e && key_eq()(*__i, __k));
-    }
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator,
-     typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__equal_range_unique(
-        const _Key& __k)
-{
-    iterator __i = find(__k);
-    iterator __j = __i;
-    if (__i != end())
-        ++__j;
-    return pair<iterator, iterator>(__i, __j);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator,
-     typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__equal_range_unique(
-        const _Key& __k) const
-{
-    const_iterator __i = find(__k);
-    const_iterator __j = __i;
-    if (__i != end())
-        ++__j;
-    return pair<const_iterator, const_iterator>(__i, __j);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator,
-     typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::iterator>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__equal_range_multi(
-        const _Key& __k)
-{
-    iterator __i = find(__k);
-    iterator __j = __i;
-    if (__i != end())
-    {
-        iterator __e = end();
-        do
-        {
-            ++__j;
-        } while (__j != __e && key_eq()(*__j, __k));
-    }
-    return pair<iterator, iterator>(__i, __j);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-template <class _Key>
-pair<typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator,
-     typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::const_iterator>
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__equal_range_multi(
-        const _Key& __k) const
-{
-    const_iterator __i = find(__k);
-    const_iterator __j = __i;
-    if (__i != end())
-    {
-        const_iterator __e = end();
-        do
-        {
-            ++__j;
-        } while (__j != __e && key_eq()(*__j, __k));
-    }
-    return pair<const_iterator, const_iterator>(__i, __j);
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-void
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::swap(__hash_table& __u)
-    _NOEXCEPT_(
-        (!allocator_traits<__pointer_allocator>::propagate_on_container_swap::value ||
-         __is_nothrow_swappable<__pointer_allocator>::value) &&
-        (!__node_traits::propagate_on_container_swap::value ||
-         __is_nothrow_swappable<__node_allocator>::value) &&
-        __is_nothrow_swappable<hasher>::value &&
-        __is_nothrow_swappable<key_equal>::value)
-{
-    {
-    __node_pointer_pointer __npp = __bucket_list_.release();
-    __bucket_list_.reset(__u.__bucket_list_.release());
-    __u.__bucket_list_.reset(__npp);
-    }
-    _VSTD::swap(__bucket_list_.get_deleter().size(), __u.__bucket_list_.get_deleter().size());
-    __swap_alloc(__bucket_list_.get_deleter().__alloc(),
-             __u.__bucket_list_.get_deleter().__alloc());
-    __swap_alloc(__node_alloc(), __u.__node_alloc());
-    _VSTD::swap(__p1_.first().__next_, __u.__p1_.first().__next_);
-    __p2_.swap(__u.__p2_);
-    __p3_.swap(__u.__p3_);
-    if (size() > 0)
-        __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
-    if (__u.size() > 0)
-        __u.__bucket_list_[__constrain_hash(__u.__p1_.first().__next_->__hash_, __u.bucket_count())] =
-            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__u.__p1_.first()));
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-typename __hash_table<_Tp, _Hash, _Equal, _Alloc>::size_type
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::bucket_size(size_type __n) const
-{
-    _LIBCPP_ASSERT(__n < bucket_count(),
-        "unordered container::bucket_size(n) called with n >= bucket_count()");
-    __node_const_pointer __np = __bucket_list_[__n];
-    size_type __bc = bucket_count();
-    size_type __r = 0;
-    if (__np != nullptr)
-    {
-        for (__np = __np->__next_; __np != nullptr &&
-                                   __constrain_hash(__np->__hash_, __bc) == __n;
-                                                    __np = __np->__next_, ++__r)
-            ;
-    }
-    return __r;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__hash_table<_Tp, _Hash, _Equal, _Alloc>& __x,
-     __hash_table<_Tp, _Hash, _Equal, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-bool
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__dereferenceable(const const_iterator* __i) const
-{
-    return __i->__node_ != nullptr;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-bool
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__decrementable(const const_iterator*) const
-{
-    return false;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-bool
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__addable(const const_iterator*, ptrdiff_t) const
-{
-    return false;
-}
-
-template <class _Tp, class _Hash, class _Equal, class _Alloc>
-bool
-__hash_table<_Tp, _Hash, _Equal, _Alloc>::__subscriptable(const const_iterator*, ptrdiff_t) const
-{
-    return false;
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP__HASH_TABLE
diff --git a/include.new/c++/v1/tr1/__locale b/include.new/c++/v1/tr1/__locale
deleted file mode 100644
index 0097fc2..0000000
--- a/include.new/c++/v1/tr1/__locale
+++ /dev/null
@@ -1,1463 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___LOCALE
-#define _LIBCPP___LOCALE
-
-#include <__config>
-#include <string>
-#include <memory>
-#include <utility>
-#include <mutex>
-#include <cstdint>
-#include <cctype>
-#include <locale.h>
-#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-# include <support/win32/locale_win32.h>
-#elif defined(_AIX)
-# include <support/ibm/xlocale.h>
-#elif defined(__ANDROID__)
-// Android gained the locale aware functions in L (API level 21)
-# include <android/api-level.h>
-# if __ANDROID_API__ <= 20
-#  include <support/android/locale_bionic.h>
-# endif
-#elif defined(__sun__)
-# include <support/solaris/xlocale.h>
-#elif defined(_NEWLIB_VERSION)
-# include <support/newlib/xlocale.h>
-#elif (defined(__GLIBC__) || defined(__APPLE__)      || defined(__FreeBSD__) \
-    || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
-# include <xlocale.h>
-#endif // __GLIBC__ || __APPLE__ || __FreeBSD__ || __sun__ || __EMSCRIPTEN__ || __IBMCPP__
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS locale;
-
-template <class _Facet>
-_LIBCPP_INLINE_VISIBILITY
-bool
-has_facet(const locale&) _NOEXCEPT;
-
-template <class _Facet>
-_LIBCPP_INLINE_VISIBILITY
-const _Facet&
-use_facet(const locale&);
-
-class _LIBCPP_TYPE_VIS locale
-{
-public:
-    // types:
-    class _LIBCPP_TYPE_VIS facet;
-    class _LIBCPP_TYPE_VIS id;
-
-    typedef int category;
-    static const category // values assigned here are for exposition only
-        none     = 0,
-        collate  = LC_COLLATE_MASK,
-        ctype    = LC_CTYPE_MASK,
-        monetary = LC_MONETARY_MASK,
-        numeric  = LC_NUMERIC_MASK,
-        time     = LC_TIME_MASK,
-        messages = LC_MESSAGES_MASK,
-        all = collate | ctype | monetary | numeric | time | messages;
-
-    // construct/copy/destroy:
-    locale()  _NOEXCEPT;
-    locale(const locale&)  _NOEXCEPT;
-    explicit locale(const char*);
-    explicit locale(const string&);
-    locale(const locale&, const char*, category);
-    locale(const locale&, const string&, category);
-    template <class _Facet>
-        _LIBCPP_INLINE_VISIBILITY locale(const locale&, _Facet*);
-    locale(const locale&, const locale&, category);
-
-    ~locale();
-
-    const locale& operator=(const locale&)  _NOEXCEPT;
-
-    template <class _Facet> locale combine(const locale&) const;
-
-    // locale operations:
-    string name() const;
-    bool operator==(const locale&) const;
-    bool operator!=(const locale& __y) const {return !(*this == __y);}
-    template <class _CharT, class _Traits, class _Allocator>
-      bool operator()(const basic_string<_CharT, _Traits, _Allocator>&,
-                      const basic_string<_CharT, _Traits, _Allocator>&) const;
-
-    // global locale objects:
-    static locale global(const locale&);
-    static const locale& classic();
-
-private:
-    class __imp;
-    __imp* __locale_;
-
-    void __install_ctor(const locale&, facet*, long);
-    static locale& __global();
-    bool has_facet(id&) const;
-    const facet* use_facet(id&) const;
-
-    template <class _Facet> friend bool has_facet(const locale&)  _NOEXCEPT;
-    template <class _Facet> friend const _Facet& use_facet(const locale&);
-};
-
-class _LIBCPP_TYPE_VIS locale::facet
-    : public __shared_count
-{
-protected:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit facet(size_t __refs = 0)
-        : __shared_count(static_cast<long>(__refs)-1) {}
-
-    virtual ~facet();
-
-//    facet(const facet&) = delete;     // effectively done in __shared_count
-//    void operator=(const facet&) = delete;
-private:
-    virtual void __on_zero_shared() _NOEXCEPT;
-};
-
-class _LIBCPP_TYPE_VIS locale::id
-{
-    once_flag      __flag_;
-    int32_t        __id_;
-
-    static int32_t __next_id;
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR id() :__id_(0) {}
-private:
-    void __init();
-    void operator=(const id&); // = delete;
-    id(const id&); // = delete;
-public:  // only needed for tests
-    long __get();
-
-    friend class locale;
-    friend class locale::__imp;
-};
-
-template <class _Facet>
-inline _LIBCPP_INLINE_VISIBILITY
-locale::locale(const locale& __other, _Facet* __f)
-{
-    __install_ctor(__other, __f, __f ? __f->id.__get() : 0);
-}
-
-template <class _Facet>
-locale
-locale::combine(const locale& __other) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!_VSTD::has_facet<_Facet>(__other))
-        throw runtime_error("locale::combine: locale missing facet");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return locale(*this, &const_cast<_Facet&>(_VSTD::use_facet<_Facet>(__other)));
-}
-
-template <class _Facet>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-has_facet(const locale& __l)  _NOEXCEPT
-{
-    return __l.has_facet(_Facet::id);
-}
-
-template <class _Facet>
-inline _LIBCPP_INLINE_VISIBILITY
-const _Facet&
-use_facet(const locale& __l)
-{
-    return static_cast<const _Facet&>(*__l.use_facet(_Facet::id));
-}
-
-// template <class _CharT> class collate;
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY collate
-    : public locale::facet
-{
-public:
-    typedef _CharT char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit collate(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const char_type* __lo1, const char_type* __hi1,
-                const char_type* __lo2, const char_type* __hi2) const
-    {
-        return do_compare(__lo1, __hi1, __lo2, __hi2);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    string_type transform(const char_type* __lo, const char_type* __hi) const
-    {
-        return do_transform(__lo, __hi);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    long hash(const char_type* __lo, const char_type* __hi) const
-    {
-        return do_hash(__lo, __hi);
-    }
-
-    static locale::id id;
-
-protected:
-    ~collate();
-    virtual int do_compare(const char_type* __lo1, const char_type* __hi1,
-                           const char_type* __lo2, const char_type* __hi2) const;
-    virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const
-        {return string_type(__lo, __hi);}
-    virtual long do_hash(const char_type* __lo, const char_type* __hi) const;
-};
-
-template <class _CharT> locale::id collate<_CharT>::id;
-
-template <class _CharT>
-collate<_CharT>::~collate()
-{
-}
-
-template <class _CharT>
-int
-collate<_CharT>::do_compare(const char_type* __lo1, const char_type* __hi1,
-                            const char_type* __lo2, const char_type* __hi2) const
-{
-    for (; __lo2 != __hi2; ++__lo1, ++__lo2)
-    {
-        if (__lo1 == __hi1 || *__lo1 < *__lo2)
-            return -1;
-        if (*__lo2 < *__lo1)
-            return 1;
-    }
-    return __lo1 != __hi1;
-}
-
-template <class _CharT>
-long
-collate<_CharT>::do_hash(const char_type* __lo, const char_type* __hi) const
-{
-    size_t __h = 0;
-    const size_t __sr = __CHAR_BIT__ * sizeof(size_t) - 8;
-    const size_t __mask = size_t(0xF) << (__sr + 4);
-    for(const char_type* __p = __lo; __p != __hi; ++__p)
-    {
-        __h = (__h << 4) + static_cast<size_t>(*__p);
-        size_t __g = __h & __mask;
-        __h ^= __g | (__g >> __sr);
-    }
-    return static_cast<long>(__h);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS collate<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS collate<wchar_t>)
-
-// template <class CharT> class collate_byname;
-
-template <class _CharT> class _LIBCPP_TYPE_VIS_ONLY collate_byname;
-
-template <>
-class _LIBCPP_TYPE_VIS collate_byname<char>
-    : public collate<char>
-{
-    locale_t __l;
-public:
-    typedef char char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit collate_byname(const char* __n, size_t __refs = 0);
-    explicit collate_byname(const string& __n, size_t __refs = 0);
-
-protected:
-    ~collate_byname();
-    virtual int do_compare(const char_type* __lo1, const char_type* __hi1,
-                           const char_type* __lo2, const char_type* __hi2) const;
-    virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const;
-};
-
-template <>
-class _LIBCPP_TYPE_VIS collate_byname<wchar_t>
-    : public collate<wchar_t>
-{
-    locale_t __l;
-public:
-    typedef wchar_t char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit collate_byname(const char* __n, size_t __refs = 0);
-    explicit collate_byname(const string& __n, size_t __refs = 0);
-
-protected:
-    ~collate_byname();
-
-    virtual int do_compare(const char_type* __lo1, const char_type* __hi1,
-                           const char_type* __lo2, const char_type* __hi2) const;
-    virtual string_type do_transform(const char_type* __lo, const char_type* __hi) const;
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-bool
-locale::operator()(const basic_string<_CharT, _Traits, _Allocator>& __x,
-                   const basic_string<_CharT, _Traits, _Allocator>& __y) const
-{
-    return _VSTD::use_facet<_VSTD::collate<_CharT> >(*this).compare(
-                                       __x.data(), __x.data() + __x.size(),
-                                       __y.data(), __y.data() + __y.size()) < 0;
-}
-
-// template <class charT> class ctype
-
-class _LIBCPP_TYPE_VIS ctype_base
-{
-public:
-#ifdef __GLIBC__
-    typedef unsigned short mask;
-    static const mask space  = _ISspace;
-    static const mask print  = _ISprint;
-    static const mask cntrl  = _IScntrl;
-    static const mask upper  = _ISupper;
-    static const mask lower  = _ISlower;
-    static const mask alpha  = _ISalpha;
-    static const mask digit  = _ISdigit;
-    static const mask punct  = _ISpunct;
-    static const mask xdigit = _ISxdigit;
-    static const mask blank  = _ISblank;
-#elif defined(_WIN32)
-    typedef unsigned short mask;
-    static const mask space  = _SPACE;
-    static const mask print  = _BLANK|_PUNCT|_ALPHA|_DIGIT;
-    static const mask cntrl  = _CONTROL;
-    static const mask upper  = _UPPER;
-    static const mask lower  = _LOWER;
-    static const mask alpha  = _ALPHA;
-    static const mask digit  = _DIGIT;
-    static const mask punct  = _PUNCT;
-    static const mask xdigit = _HEX;
-    static const mask blank  = _BLANK;
-#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__) || defined(__NetBSD__) || defined(__ANDROID__)
-#ifdef __APPLE__
-    typedef __uint32_t mask;
-#elif defined(__FreeBSD__)
-    typedef unsigned long mask;
-#elif defined(__EMSCRIPTEN__) ||  defined(__NetBSD__)
-    typedef unsigned short mask;
-#elif defined(__ANDROID__)
-    typedef unsigned char mask;
-#endif
-    static const mask space  = _CTYPE_S;
-    static const mask print  = _CTYPE_R;
-    static const mask cntrl  = _CTYPE_C;
-    static const mask upper  = _CTYPE_U;
-    static const mask lower  = _CTYPE_L;
-    static const mask alpha  = _CTYPE_A;
-    static const mask digit  = _CTYPE_D;
-    static const mask punct  = _CTYPE_P;
-# if defined(__ANDROID__)
-    static const mask xdigit = _CTYPE_X | _CTYPE_D;
-# else
-    static const mask xdigit = _CTYPE_X;
-# endif
-
-# if defined(__NetBSD__)
-    static const mask blank  = _CTYPE_BL;
-# else
-    static const mask blank  = _CTYPE_B;
-# endif
-#elif defined(__sun__) || defined(_AIX)
-    typedef unsigned int mask;
-    static const mask space  = _ISSPACE;
-    static const mask print  = _ISPRINT;
-    static const mask cntrl  = _ISCNTRL;
-    static const mask upper  = _ISUPPER;
-    static const mask lower  = _ISLOWER;
-    static const mask alpha  = _ISALPHA;
-    static const mask digit  = _ISDIGIT;
-    static const mask punct  = _ISPUNCT;
-    static const mask xdigit = _ISXDIGIT;
-    static const mask blank  = _ISBLANK;
-#else  // __GLIBC__ || _WIN32 || __APPLE__ || __FreeBSD__ || __EMSCRIPTEN__ || __sun__
-    typedef unsigned long mask;
-    static const mask space  = 1<<0;
-    static const mask print  = 1<<1;
-    static const mask cntrl  = 1<<2;
-    static const mask upper  = 1<<3;
-    static const mask lower  = 1<<4;
-    static const mask alpha  = 1<<5;
-    static const mask digit  = 1<<6;
-    static const mask punct  = 1<<7;
-    static const mask xdigit = 1<<8;
-    static const mask blank  = 1<<9;
-#endif  // __GLIBC__ || _WIN32 || __APPLE__ || __FreeBSD__
-    static const mask alnum  = alpha | digit;
-    static const mask graph  = alnum | punct;
-
-    _LIBCPP_ALWAYS_INLINE ctype_base() {}
-};
-
-template <class _CharT> class _LIBCPP_TYPE_VIS_ONLY ctype;
-
-template <>
-class _LIBCPP_TYPE_VIS ctype<wchar_t>
-    : public locale::facet,
-      public ctype_base
-{
-public:
-    typedef wchar_t char_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit ctype(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    bool is(mask __m, char_type __c) const
-    {
-        return do_is(__m, __c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* is(const char_type* __low, const char_type* __high, mask* __vec) const
-    {
-        return do_is(__low, __high, __vec);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* scan_is(mask __m, const char_type* __low, const char_type* __high) const
-    {
-        return do_scan_is(__m, __low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* scan_not(mask __m, const char_type* __low, const char_type* __high) const
-    {
-        return do_scan_not(__m, __low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type toupper(char_type __c) const
-    {
-        return do_toupper(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* toupper(char_type* __low, const char_type* __high) const
-    {
-        return do_toupper(__low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type tolower(char_type __c) const
-    {
-        return do_tolower(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* tolower(char_type* __low, const char_type* __high) const
-    {
-        return do_tolower(__low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type widen(char __c) const
-    {
-        return do_widen(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char* widen(const char* __low, const char* __high, char_type* __to) const
-    {
-        return do_widen(__low, __high, __to);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char narrow(char_type __c, char __dfault) const
-    {
-        return do_narrow(__c, __dfault);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* narrow(const char_type* __low, const char_type* __high, char __dfault, char* __to) const
-    {
-        return do_narrow(__low, __high, __dfault, __to);
-    }
-
-    static locale::id id;
-
-protected:
-    ~ctype();
-    virtual bool do_is(mask __m, char_type __c) const;
-    virtual const char_type* do_is(const char_type* __low, const char_type* __high, mask* __vec) const;
-    virtual const char_type* do_scan_is(mask __m, const char_type* __low, const char_type* __high) const;
-    virtual const char_type* do_scan_not(mask __m, const char_type* __low, const char_type* __high) const;
-    virtual char_type do_toupper(char_type) const;
-    virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;
-    virtual char_type do_tolower(char_type) const;
-    virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;
-    virtual char_type do_widen(char) const;
-    virtual const char* do_widen(const char* __low, const char* __high, char_type* __dest) const;
-    virtual char do_narrow(char_type, char __dfault) const;
-    virtual const char_type* do_narrow(const char_type* __low, const char_type* __high, char __dfault, char* __dest) const;
-};
-
-template <>
-class _LIBCPP_TYPE_VIS ctype<char>
-    : public locale::facet, public ctype_base
-{
-    const mask* __tab_;
-    bool        __del_;
-public:
-    typedef char char_type;
-
-    explicit ctype(const mask* __tab = 0, bool __del = false, size_t __refs = 0);
-
-    _LIBCPP_ALWAYS_INLINE
-    bool is(mask __m, char_type __c) const
-    {
-        return isascii(__c) ? (__tab_[static_cast<int>(__c)] & __m) !=0 : false;
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* is(const char_type* __low, const char_type* __high, mask* __vec) const
-    {
-        for (; __low != __high; ++__low, ++__vec)
-            *__vec = isascii(*__low) ? __tab_[static_cast<int>(*__low)] : 0;
-        return __low;
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* scan_is (mask __m, const char_type* __low, const char_type* __high) const
-    {
-        for (; __low != __high; ++__low)
-            if (isascii(*__low) && (__tab_[static_cast<int>(*__low)] & __m))
-                break;
-        return __low;
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* scan_not(mask __m, const char_type* __low, const char_type* __high) const
-    {
-        for (; __low != __high; ++__low)
-            if (!(isascii(*__low) && (__tab_[static_cast<int>(*__low)] & __m)))
-                break;
-        return __low;
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type toupper(char_type __c) const
-    {
-        return do_toupper(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* toupper(char_type* __low, const char_type* __high) const
-    {
-        return do_toupper(__low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type tolower(char_type __c) const
-    {
-        return do_tolower(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char_type* tolower(char_type* __low, const char_type* __high) const
-    {
-        return do_tolower(__low, __high);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char_type widen(char __c) const
-    {
-        return do_widen(__c);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char* widen(const char* __low, const char* __high, char_type* __to) const
-    {
-        return do_widen(__low, __high, __to);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    char narrow(char_type __c, char __dfault) const
-    {
-        return do_narrow(__c, __dfault);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    const char* narrow(const char_type* __low, const char_type* __high, char __dfault, char* __to) const
-    {
-        return do_narrow(__low, __high, __dfault, __to);
-    }
-
-    static locale::id id;
-
-#ifdef _CACHED_RUNES
-    static const size_t table_size = _CACHED_RUNES;
-#else
-    static const size_t table_size = 256;  // FIXME: Don't hardcode this.
-#endif
-    _LIBCPP_ALWAYS_INLINE const mask* table() const  _NOEXCEPT {return __tab_;}
-    static const mask* classic_table()  _NOEXCEPT;
-#if defined(__GLIBC__) || defined(__EMSCRIPTEN__)
-    static const int* __classic_upper_table() _NOEXCEPT;
-    static const int* __classic_lower_table() _NOEXCEPT;
-#endif
-#if defined(__NetBSD__)
-    static const short* __classic_upper_table() _NOEXCEPT;
-    static const short* __classic_lower_table() _NOEXCEPT;
-#endif
-
-protected:
-    ~ctype();
-    virtual char_type do_toupper(char_type __c) const;
-    virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;
-    virtual char_type do_tolower(char_type __c) const;
-    virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;
-    virtual char_type do_widen(char __c) const;
-    virtual const char* do_widen(const char* __low, const char* __high, char_type* __to) const;
-    virtual char do_narrow(char_type __c, char __dfault) const;
-    virtual const char* do_narrow(const char_type* __low, const char_type* __high, char __dfault, char* __to) const;
-};
-
-// template <class CharT> class ctype_byname;
-
-template <class _CharT> class _LIBCPP_TYPE_VIS_ONLY ctype_byname;
-
-template <>
-class _LIBCPP_TYPE_VIS ctype_byname<char>
-    : public ctype<char>
-{
-    locale_t __l;
-
-public:
-    explicit ctype_byname(const char*, size_t = 0);
-    explicit ctype_byname(const string&, size_t = 0);
-
-protected:
-    ~ctype_byname();
-    virtual char_type do_toupper(char_type) const;
-    virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;
-    virtual char_type do_tolower(char_type) const;
-    virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;
-};
-
-template <>
-class _LIBCPP_TYPE_VIS ctype_byname<wchar_t>
-    : public ctype<wchar_t>
-{
-    locale_t __l;
-
-public:
-    explicit ctype_byname(const char*, size_t = 0);
-    explicit ctype_byname(const string&, size_t = 0);
-
-protected:
-    ~ctype_byname();
-    virtual bool do_is(mask __m, char_type __c) const;
-    virtual const char_type* do_is(const char_type* __low, const char_type* __high, mask* __vec) const;
-    virtual const char_type* do_scan_is(mask __m, const char_type* __low, const char_type* __high) const;
-    virtual const char_type* do_scan_not(mask __m, const char_type* __low, const char_type* __high) const;
-    virtual char_type do_toupper(char_type) const;
-    virtual const char_type* do_toupper(char_type* __low, const char_type* __high) const;
-    virtual char_type do_tolower(char_type) const;
-    virtual const char_type* do_tolower(char_type* __low, const char_type* __high) const;
-    virtual char_type do_widen(char) const;
-    virtual const char* do_widen(const char* __low, const char* __high, char_type* __dest) const;
-    virtual char do_narrow(char_type, char __dfault) const;
-    virtual const char_type* do_narrow(const char_type* __low, const char_type* __high, char __dfault, char* __dest) const;
-};
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isspace(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::space, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isprint(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::print, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-iscntrl(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::cntrl, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isupper(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::upper, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-islower(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::lower, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isalpha(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alpha, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isdigit(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::digit, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ispunct(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::punct, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isxdigit(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::xdigit, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isalnum(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::alnum, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-isgraph(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).is(ctype_base::graph, __c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-toupper(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).toupper(__c);
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-tolower(_CharT __c, const locale& __loc)
-{
-    return use_facet<ctype<_CharT> >(__loc).tolower(__c);
-}
-
-// codecvt_base
-
-class _LIBCPP_TYPE_VIS codecvt_base
-{
-public:
-    _LIBCPP_ALWAYS_INLINE codecvt_base() {}
-    enum result {ok, partial, error, noconv};
-};
-
-// template <class internT, class externT, class stateT> class codecvt;
-
-template <class _InternT, class _ExternT, class _StateT> class _LIBCPP_TYPE_VIS_ONLY codecvt;
-
-// template <> class codecvt<char, char, mbstate_t>
-
-template <>
-class _LIBCPP_TYPE_VIS codecvt<char, char, mbstate_t>
-    : public locale::facet,
-      public codecvt_base
-{
-public:
-    typedef char      intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    result out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_out(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_unshift(__st, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const
-    {
-        return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int encoding() const  _NOEXCEPT
-    {
-        return do_encoding();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    bool always_noconv() const  _NOEXCEPT
-    {
-        return do_always_noconv();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const
-    {
-        return do_length(__st, __frm, __end, __mx);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int max_length() const  _NOEXCEPT
-    {
-        return do_max_length();
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(const char*, size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    ~codecvt();
-
-    virtual result do_out(state_type& __st,
-                          const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-                          extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result do_in(state_type& __st,
-                         const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-                         intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result do_unshift(state_type& __st,
-                              extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const  _NOEXCEPT;
-    virtual bool do_always_noconv() const  _NOEXCEPT;
-    virtual int do_length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const;
-    virtual int do_max_length() const  _NOEXCEPT;
-};
-
-// template <> class codecvt<wchar_t, char, mbstate_t>
-
-template <>
-class _LIBCPP_TYPE_VIS codecvt<wchar_t, char, mbstate_t>
-    : public locale::facet,
-      public codecvt_base
-{
-    locale_t __l;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    explicit codecvt(size_t __refs = 0);
-
-    _LIBCPP_ALWAYS_INLINE
-    result out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_out(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_unshift(__st, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const
-    {
-        return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int encoding() const  _NOEXCEPT
-    {
-        return do_encoding();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    bool always_noconv() const  _NOEXCEPT
-    {
-        return do_always_noconv();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const
-    {
-        return do_length(__st, __frm, __end, __mx);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int max_length() const  _NOEXCEPT
-    {
-        return do_max_length();
-    }
-
-    static locale::id id;
-
-protected:
-    explicit codecvt(const char*, size_t __refs = 0);
-
-    ~codecvt();
-
-    virtual result do_out(state_type& __st,
-                          const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-                          extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result do_in(state_type& __st,
-                         const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-                         intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result do_unshift(state_type& __st,
-                              extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const  _NOEXCEPT;
-    virtual bool do_always_noconv() const  _NOEXCEPT;
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const;
-    virtual int do_max_length() const  _NOEXCEPT;
-};
-
-// template <> class codecvt<char16_t, char, mbstate_t>
-
-template <>
-class _LIBCPP_TYPE_VIS codecvt<char16_t, char, mbstate_t>
-    : public locale::facet,
-      public codecvt_base
-{
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    result out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_out(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_unshift(__st, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const
-    {
-        return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int encoding() const  _NOEXCEPT
-    {
-        return do_encoding();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    bool always_noconv() const  _NOEXCEPT
-    {
-        return do_always_noconv();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const
-    {
-        return do_length(__st, __frm, __end, __mx);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int max_length() const  _NOEXCEPT
-    {
-        return do_max_length();
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(const char*, size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    ~codecvt();
-
-    virtual result do_out(state_type& __st,
-                          const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-                          extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result do_in(state_type& __st,
-                         const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-                         intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result do_unshift(state_type& __st,
-                              extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const  _NOEXCEPT;
-    virtual bool do_always_noconv() const  _NOEXCEPT;
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const;
-    virtual int do_max_length() const  _NOEXCEPT;
-};
-
-// template <> class codecvt<char32_t, char, mbstate_t>
-
-template <>
-class _LIBCPP_TYPE_VIS codecvt<char32_t, char, mbstate_t>
-    : public locale::facet,
-      public codecvt_base
-{
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    result out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_out(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const
-    {
-        return do_unshift(__st, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    result in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const
-    {
-        return do_in(__st, __frm, __frm_end, __frm_nxt, __to, __to_end, __to_nxt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int encoding() const  _NOEXCEPT
-    {
-        return do_encoding();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    bool always_noconv() const  _NOEXCEPT
-    {
-        return do_always_noconv();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int length(state_type& __st, const extern_type* __frm, const extern_type* __end, size_t __mx) const
-    {
-        return do_length(__st, __frm, __end, __mx);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int max_length() const  _NOEXCEPT
-    {
-        return do_max_length();
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt(const char*, size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    ~codecvt();
-
-    virtual result do_out(state_type& __st,
-                          const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-                          extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result do_in(state_type& __st,
-                         const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-                         intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result do_unshift(state_type& __st,
-                              extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const  _NOEXCEPT;
-    virtual bool do_always_noconv() const  _NOEXCEPT;
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end, size_t __mx) const;
-    virtual int do_max_length() const  _NOEXCEPT;
-};
-
-// template <class _InternT, class _ExternT, class _StateT> class codecvt_byname
-
-template <class _InternT, class _ExternT, class _StateT>
-class _LIBCPP_TYPE_VIS_ONLY codecvt_byname
-    : public codecvt<_InternT, _ExternT, _StateT>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_byname(const char* __nm, size_t __refs = 0)
-        : codecvt<_InternT, _ExternT, _StateT>(__nm, __refs) {}
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_byname(const string& __nm, size_t __refs = 0)
-        : codecvt<_InternT, _ExternT, _StateT>(__nm.c_str(), __refs) {}
-protected:
-    ~codecvt_byname();
-};
-
-template <class _InternT, class _ExternT, class _StateT>
-codecvt_byname<_InternT, _ExternT, _StateT>::~codecvt_byname()
-{
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS codecvt_byname<char, char, mbstate_t>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS codecvt_byname<wchar_t, char, mbstate_t>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS codecvt_byname<char16_t, char, mbstate_t>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS codecvt_byname<char32_t, char, mbstate_t>)
-
-_LIBCPP_FUNC_VIS void __throw_runtime_error(const char*);
-
-template <size_t _Np>
-struct __narrow_to_utf8
-{
-    template <class _OutputIterator, class _CharT>
-    _OutputIterator
-    operator()(_OutputIterator __s, const _CharT* __wb, const _CharT* __we) const;
-};
-
-template <>
-struct __narrow_to_utf8<8>
-{
-    template <class _OutputIterator, class _CharT>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const _CharT* __wb, const _CharT* __we) const
-    {
-        for (; __wb < __we; ++__wb, ++__s)
-            *__s = *__wb;
-        return __s;
-    }
-};
-
-template <>
-struct __narrow_to_utf8<16>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    _LIBCPP_ALWAYS_INLINE
-    __narrow_to_utf8() : codecvt<char16_t, char, mbstate_t>(1) {}
-
-    ~__narrow_to_utf8();
-
-    template <class _OutputIterator, class _CharT>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const _CharT* __wb, const _CharT* __we) const
-    {
-        result __r = ok;
-        mbstate_t __mb;
-        while (__wb < __we && __r != error)
-        {
-            const int __sz = 32;
-            char __buf[__sz];
-            char* __bn;
-            const char16_t* __wn = (const char16_t*)__wb;
-            __r = do_out(__mb, (const char16_t*)__wb, (const char16_t*)__we, __wn,
-                         __buf, __buf+__sz, __bn);
-            if (__r == codecvt_base::error || __wn == (const char16_t*)__wb)
-                __throw_runtime_error("locale not supported");
-            for (const char* __p = __buf; __p < __bn; ++__p, ++__s)
-                *__s = *__p;
-            __wb = (const _CharT*)__wn;
-        }
-        return __s;
-    }
-};
-
-template <>
-struct __narrow_to_utf8<32>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    _LIBCPP_ALWAYS_INLINE
-    __narrow_to_utf8() : codecvt<char32_t, char, mbstate_t>(1) {}
-
-    ~__narrow_to_utf8();
-
-    template <class _OutputIterator, class _CharT>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const _CharT* __wb, const _CharT* __we) const
-    {
-        result __r = ok;
-        mbstate_t __mb;
-        while (__wb < __we && __r != error)
-        {
-            const int __sz = 32;
-            char __buf[__sz];
-            char* __bn;
-            const char32_t* __wn = (const char32_t*)__wb;
-            __r = do_out(__mb, (const char32_t*)__wb, (const char32_t*)__we, __wn,
-                         __buf, __buf+__sz, __bn);
-            if (__r == codecvt_base::error || __wn == (const char32_t*)__wb)
-                __throw_runtime_error("locale not supported");
-            for (const char* __p = __buf; __p < __bn; ++__p, ++__s)
-                *__s = *__p;
-            __wb = (const _CharT*)__wn;
-        }
-        return __s;
-    }
-};
-
-template <size_t _Np>
-struct __widen_from_utf8
-{
-    template <class _OutputIterator>
-    _OutputIterator
-    operator()(_OutputIterator __s, const char* __nb, const char* __ne) const;
-};
-
-template <>
-struct __widen_from_utf8<8>
-{
-    template <class _OutputIterator>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const char* __nb, const char* __ne) const
-    {
-        for (; __nb < __ne; ++__nb, ++__s)
-            *__s = *__nb;
-        return __s;
-    }
-};
-
-template <>
-struct __widen_from_utf8<16>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    _LIBCPP_ALWAYS_INLINE
-    __widen_from_utf8() : codecvt<char16_t, char, mbstate_t>(1) {}
-
-    ~__widen_from_utf8();
-
-    template <class _OutputIterator>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const char* __nb, const char* __ne) const
-    {
-        result __r = ok;
-        mbstate_t __mb;
-        while (__nb < __ne && __r != error)
-        {
-            const int __sz = 32;
-            char16_t __buf[__sz];
-            char16_t* __bn;
-            const char* __nn = __nb;
-            __r = do_in(__mb, __nb, __ne - __nb > __sz ? __nb+__sz : __ne, __nn,
-                        __buf, __buf+__sz, __bn);
-            if (__r == codecvt_base::error || __nn == __nb)
-                __throw_runtime_error("locale not supported");
-            for (const char16_t* __p = __buf; __p < __bn; ++__p, ++__s)
-                *__s = (wchar_t)*__p;
-            __nb = __nn;
-        }
-        return __s;
-    }
-};
-
-template <>
-struct __widen_from_utf8<32>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    _LIBCPP_ALWAYS_INLINE
-    __widen_from_utf8() : codecvt<char32_t, char, mbstate_t>(1) {}
-
-    ~__widen_from_utf8();
-
-    template <class _OutputIterator>
-    _LIBCPP_ALWAYS_INLINE
-    _OutputIterator
-    operator()(_OutputIterator __s, const char* __nb, const char* __ne) const
-    {
-        result __r = ok;
-        mbstate_t __mb;
-        while (__nb < __ne && __r != error)
-        {
-            const int __sz = 32;
-            char32_t __buf[__sz];
-            char32_t* __bn;
-            const char* __nn = __nb;
-            __r = do_in(__mb, __nb, __ne - __nb > __sz ? __nb+__sz : __ne, __nn,
-                        __buf, __buf+__sz, __bn);
-            if (__r == codecvt_base::error || __nn == __nb)
-                __throw_runtime_error("locale not supported");
-            for (const char32_t* __p = __buf; __p < __bn; ++__p, ++__s)
-                *__s = (wchar_t)*__p;
-            __nb = __nn;
-        }
-        return __s;
-    }
-};
-
-// template <class charT> class numpunct
-
-template <class _CharT> class _LIBCPP_TYPE_VIS_ONLY numpunct;
-
-template <>
-class _LIBCPP_TYPE_VIS numpunct<char>
-    : public locale::facet
-{
-public:
-    typedef char char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit numpunct(size_t __refs = 0);
-
-    _LIBCPP_ALWAYS_INLINE char_type decimal_point() const {return do_decimal_point();}
-    _LIBCPP_ALWAYS_INLINE char_type thousands_sep() const {return do_thousands_sep();}
-    _LIBCPP_ALWAYS_INLINE string grouping() const         {return do_grouping();}
-    _LIBCPP_ALWAYS_INLINE string_type truename() const    {return do_truename();}
-    _LIBCPP_ALWAYS_INLINE string_type falsename() const   {return do_falsename();}
-
-    static locale::id id;
-
-protected:
-    ~numpunct();
-    virtual char_type do_decimal_point() const;
-    virtual char_type do_thousands_sep() const;
-    virtual string do_grouping() const;
-    virtual string_type do_truename() const;
-    virtual string_type do_falsename() const;
-
-    char_type __decimal_point_;
-    char_type __thousands_sep_;
-    string __grouping_;
-};
-
-template <>
-class _LIBCPP_TYPE_VIS numpunct<wchar_t>
-    : public locale::facet
-{
-public:
-    typedef wchar_t char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit numpunct(size_t __refs = 0);
-
-    _LIBCPP_ALWAYS_INLINE char_type decimal_point() const {return do_decimal_point();}
-    _LIBCPP_ALWAYS_INLINE char_type thousands_sep() const {return do_thousands_sep();}
-    _LIBCPP_ALWAYS_INLINE string grouping() const         {return do_grouping();}
-    _LIBCPP_ALWAYS_INLINE string_type truename() const    {return do_truename();}
-    _LIBCPP_ALWAYS_INLINE string_type falsename() const   {return do_falsename();}
-
-    static locale::id id;
-
-protected:
-    ~numpunct();
-    virtual char_type do_decimal_point() const;
-    virtual char_type do_thousands_sep() const;
-    virtual string do_grouping() const;
-    virtual string_type do_truename() const;
-    virtual string_type do_falsename() const;
-
-    char_type __decimal_point_;
-    char_type __thousands_sep_;
-    string __grouping_;
-};
-
-// template <class charT> class numpunct_byname
-
-template <class charT> class _LIBCPP_TYPE_VIS_ONLY numpunct_byname;
-
-template <>
-class _LIBCPP_TYPE_VIS numpunct_byname<char>
-: public numpunct<char>
-{
-public:
-    typedef char char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit numpunct_byname(const char* __nm, size_t __refs = 0);
-    explicit numpunct_byname(const string& __nm, size_t __refs = 0);
-
-protected:
-    ~numpunct_byname();
-
-private:
-    void __init(const char*);
-};
-
-template <>
-class _LIBCPP_TYPE_VIS numpunct_byname<wchar_t>
-: public numpunct<wchar_t>
-{
-public:
-    typedef wchar_t char_type;
-    typedef basic_string<char_type> string_type;
-
-    explicit numpunct_byname(const char* __nm, size_t __refs = 0);
-    explicit numpunct_byname(const string& __nm, size_t __refs = 0);
-
-protected:
-    ~numpunct_byname();
-
-private:
-    void __init(const char*);
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___LOCALE
diff --git a/include.new/c++/v1/tr1/__mutex_base b/include.new/c++/v1/tr1/__mutex_base
deleted file mode 100644
index d5ece7c..0000000
--- a/include.new/c++/v1/tr1/__mutex_base
+++ /dev/null
@@ -1,407 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___MUTEX_BASE
-#define _LIBCPP___MUTEX_BASE
-
-#include <__config>
-#include <chrono>
-#include <system_error>
-#include <pthread.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_THREADS
-
-class _LIBCPP_TYPE_VIS mutex
-{
-    pthread_mutex_t __m_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
-     constexpr mutex() _NOEXCEPT : __m_(PTHREAD_MUTEX_INITIALIZER) {}
-#else
-     mutex() _NOEXCEPT {__m_ = (pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER;}
-#endif
-     ~mutex();
-
-private:
-    mutex(const mutex&);// = delete;
-    mutex& operator=(const mutex&);// = delete;
-
-public:
-    void lock();
-    bool try_lock() _NOEXCEPT;
-    void unlock() _NOEXCEPT;
-
-    typedef pthread_mutex_t* native_handle_type;
-    _LIBCPP_INLINE_VISIBILITY native_handle_type native_handle() {return &__m_;}
-};
-
-struct _LIBCPP_TYPE_VIS defer_lock_t {};
-struct _LIBCPP_TYPE_VIS try_to_lock_t {};
-struct _LIBCPP_TYPE_VIS adopt_lock_t {};
-
-#if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_MUTEX)
-
-extern const defer_lock_t  defer_lock;
-extern const try_to_lock_t try_to_lock;
-extern const adopt_lock_t  adopt_lock;
-
-#else
-
-constexpr defer_lock_t  defer_lock  = defer_lock_t();
-constexpr try_to_lock_t try_to_lock = try_to_lock_t();
-constexpr adopt_lock_t  adopt_lock  = adopt_lock_t();
-
-#endif
-
-template <class _Mutex>
-class _LIBCPP_TYPE_VIS_ONLY lock_guard
-{
-public:
-    typedef _Mutex mutex_type;
-
-private:
-    mutex_type& __m_;
-public:
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit lock_guard(mutex_type& __m)
-        : __m_(__m) {__m_.lock();}
-    _LIBCPP_INLINE_VISIBILITY
-    lock_guard(mutex_type& __m, adopt_lock_t)
-        : __m_(__m) {}
-    _LIBCPP_INLINE_VISIBILITY
-    ~lock_guard() {__m_.unlock();}
-
-private:
-    lock_guard(lock_guard const&);// = delete;
-    lock_guard& operator=(lock_guard const&);// = delete;
-};
-
-template <class _Mutex>
-class _LIBCPP_TYPE_VIS_ONLY unique_lock
-{
-public:
-    typedef _Mutex mutex_type;
-
-private:
-    mutex_type* __m_;
-    bool __owns_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock() _NOEXCEPT : __m_(nullptr), __owns_(false) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit unique_lock(mutex_type& __m)
-        : __m_(&__m), __owns_(true) {__m_->lock();}
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT
-        : __m_(&__m), __owns_(false) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock(mutex_type& __m, try_to_lock_t)
-        : __m_(&__m), __owns_(__m.try_lock()) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock(mutex_type& __m, adopt_lock_t)
-        : __m_(&__m), __owns_(true) {}
-    template <class _Clock, class _Duration>
-    _LIBCPP_INLINE_VISIBILITY
-        unique_lock(mutex_type& __m, const chrono::time_point<_Clock, _Duration>& __t)
-            : __m_(&__m), __owns_(__m.try_lock_until(__t)) {}
-    template <class _Rep, class _Period>
-    _LIBCPP_INLINE_VISIBILITY
-        unique_lock(mutex_type& __m, const chrono::duration<_Rep, _Period>& __d)
-            : __m_(&__m), __owns_(__m.try_lock_for(__d)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    ~unique_lock()
-    {
-        if (__owns_)
-            __m_->unlock();
-    }
-
-private:
-    unique_lock(unique_lock const&); // = delete;
-    unique_lock& operator=(unique_lock const&); // = delete;
-
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock(unique_lock&& __u) _NOEXCEPT
-        : __m_(__u.__m_), __owns_(__u.__owns_)
-        {__u.__m_ = nullptr; __u.__owns_ = false;}
-    _LIBCPP_INLINE_VISIBILITY
-    unique_lock& operator=(unique_lock&& __u) _NOEXCEPT
-        {
-            if (__owns_)
-                __m_->unlock();
-            __m_ = __u.__m_;
-            __owns_ = __u.__owns_;
-            __u.__m_ = nullptr;
-            __u.__owns_ = false;
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    void lock();
-    bool try_lock();
-
-    template <class _Rep, class _Period>
-        bool try_lock_for(const chrono::duration<_Rep, _Period>& __d);
-    template <class _Clock, class _Duration>
-        bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);
-
-    void unlock();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unique_lock& __u) _NOEXCEPT
-    {
-        _VSTD::swap(__m_, __u.__m_);
-        _VSTD::swap(__owns_, __u.__owns_);
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    mutex_type* release() _NOEXCEPT
-    {
-        mutex_type* __m = __m_;
-        __m_ = nullptr;
-        __owns_ = false;
-        return __m;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool owns_lock() const _NOEXCEPT {return __owns_;}
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_EXPLICIT
-        operator bool () const _NOEXCEPT {return __owns_;}
-    _LIBCPP_INLINE_VISIBILITY
-    mutex_type* mutex() const _NOEXCEPT {return __m_;}
-};
-
-template <class _Mutex>
-void
-unique_lock<_Mutex>::lock()
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "unique_lock::lock: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "unique_lock::lock: already locked");
-    __m_->lock();
-    __owns_ = true;
-}
-
-template <class _Mutex>
-bool
-unique_lock<_Mutex>::try_lock()
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "unique_lock::try_lock: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "unique_lock::try_lock: already locked");
-    __owns_ = __m_->try_lock();
-    return __owns_;
-}
-
-template <class _Mutex>
-template <class _Rep, class _Period>
-bool
-unique_lock<_Mutex>::try_lock_for(const chrono::duration<_Rep, _Period>& __d)
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "unique_lock::try_lock_for: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "unique_lock::try_lock_for: already locked");
-    __owns_ = __m_->try_lock_for(__d);
-    return __owns_;
-}
-
-template <class _Mutex>
-template <class _Clock, class _Duration>
-bool
-unique_lock<_Mutex>::try_lock_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "unique_lock::try_lock_until: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "unique_lock::try_lock_until: already locked");
-    __owns_ = __m_->try_lock_until(__t);
-    return __owns_;
-}
-
-template <class _Mutex>
-void
-unique_lock<_Mutex>::unlock()
-{
-    if (!__owns_)
-        __throw_system_error(EPERM, "unique_lock::unlock: not locked");
-    __m_->unlock();
-    __owns_ = false;
-}
-
-template <class _Mutex>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unique_lock<_Mutex>& __x, unique_lock<_Mutex>& __y) _NOEXCEPT
-    {__x.swap(__y);}
-
-//enum class cv_status
-_LIBCPP_DECLARE_STRONG_ENUM(cv_status)
-{
-    no_timeout,
-    timeout
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(cv_status)
-
-class _LIBCPP_TYPE_VIS condition_variable
-{
-    pthread_cond_t __cv_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
-    constexpr condition_variable() : __cv_(PTHREAD_COND_INITIALIZER) {}
-#else
-    condition_variable() {__cv_ = (pthread_cond_t)PTHREAD_COND_INITIALIZER;}
-#endif
-    ~condition_variable();
-
-private:
-    condition_variable(const condition_variable&); // = delete;
-    condition_variable& operator=(const condition_variable&); // = delete;
-
-public:
-    void notify_one() _NOEXCEPT;
-    void notify_all() _NOEXCEPT;
-
-    void wait(unique_lock<mutex>& __lk) _NOEXCEPT;
-    template <class _Predicate>
-        void wait(unique_lock<mutex>& __lk, _Predicate __pred);
-
-    template <class _Clock, class _Duration>
-        cv_status
-        wait_until(unique_lock<mutex>& __lk,
-                   const chrono::time_point<_Clock, _Duration>& __t);
-
-    template <class _Clock, class _Duration, class _Predicate>
-        bool
-        wait_until(unique_lock<mutex>& __lk,
-                   const chrono::time_point<_Clock, _Duration>& __t,
-                   _Predicate __pred);
-
-    template <class _Rep, class _Period>
-        cv_status
-        wait_for(unique_lock<mutex>& __lk,
-                 const chrono::duration<_Rep, _Period>& __d);
-
-    template <class _Rep, class _Period, class _Predicate>
-        bool
-        wait_for(unique_lock<mutex>& __lk,
-                 const chrono::duration<_Rep, _Period>& __d,
-                 _Predicate __pred);
-
-    typedef pthread_cond_t* native_handle_type;
-    _LIBCPP_INLINE_VISIBILITY native_handle_type native_handle() {return &__cv_;}
-
-private:
-    void __do_timed_wait(unique_lock<mutex>& __lk,
-       chrono::time_point<chrono::system_clock, chrono::nanoseconds>) _NOEXCEPT;
-};
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-template <class _To, class _Rep, class _Period>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    chrono::__is_duration<_To>::value,
-    _To
->::type
-__ceil(chrono::duration<_Rep, _Period> __d)
-{
-    using namespace chrono;
-    _To __r = duration_cast<_To>(__d);
-    if (__r < __d)
-        ++__r;
-    return __r;
-}
-
-#ifndef _LIBCPP_HAS_NO_THREADS
-template <class _Predicate>
-void
-condition_variable::wait(unique_lock<mutex>& __lk, _Predicate __pred)
-{
-    while (!__pred())
-        wait(__lk);
-}
-
-template <class _Clock, class _Duration>
-cv_status
-condition_variable::wait_until(unique_lock<mutex>& __lk,
-                               const chrono::time_point<_Clock, _Duration>& __t)
-{
-    using namespace chrono;
-    wait_for(__lk, __t - _Clock::now());
-    return _Clock::now() < __t ? cv_status::no_timeout : cv_status::timeout;
-}
-
-template <class _Clock, class _Duration, class _Predicate>
-bool
-condition_variable::wait_until(unique_lock<mutex>& __lk,
-                   const chrono::time_point<_Clock, _Duration>& __t,
-                   _Predicate __pred)
-{
-    while (!__pred())
-    {
-        if (wait_until(__lk, __t) == cv_status::timeout)
-            return __pred();
-    }
-    return true;
-}
-
-template <class _Rep, class _Period>
-cv_status
-condition_variable::wait_for(unique_lock<mutex>& __lk,
-                             const chrono::duration<_Rep, _Period>& __d)
-{
-    using namespace chrono;
-    if (__d <= __d.zero())
-        return cv_status::timeout;
-    typedef time_point<system_clock, duration<long double, nano> > __sys_tpf;
-    typedef time_point<system_clock, nanoseconds> __sys_tpi;
-    __sys_tpf _Max = __sys_tpi::max();
-    system_clock::time_point __s_now = system_clock::now();
-    steady_clock::time_point __c_now = steady_clock::now();
-    if (_Max - __d > __s_now)
-        __do_timed_wait(__lk, __s_now + __ceil<nanoseconds>(__d));
-    else
-        __do_timed_wait(__lk, __sys_tpi::max());
-    return steady_clock::now() - __c_now < __d ? cv_status::no_timeout :
-                                                 cv_status::timeout;
-}
-
-template <class _Rep, class _Period, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-condition_variable::wait_for(unique_lock<mutex>& __lk,
-                             const chrono::duration<_Rep, _Period>& __d,
-                             _Predicate __pred)
-{
-    return wait_until(__lk, chrono::steady_clock::now() + __d,
-                      _VSTD::move(__pred));
-}
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___MUTEX_BASE
diff --git a/include.new/c++/v1/tr1/__refstring b/include.new/c++/v1/tr1/__refstring
deleted file mode 100644
index 6866bf1..0000000
--- a/include.new/c++/v1/tr1/__refstring
+++ /dev/null
@@ -1,139 +0,0 @@
-//===------------------------ __refstring ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___REFSTRING
-#define _LIBCPP___REFSTRING
-
-#include <__config>
-#include <cstddef>
-#include <cstring>
-#if __APPLE__
-#include <dlfcn.h>
-#include <mach-o/dyld.h>
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_HIDDEN __libcpp_refstring
-{
-private:
-    const char* str_;
-
-    typedef int count_t;
-
-    struct _Rep_base
-    {
-        std::size_t len;
-        std::size_t cap;
-        count_t     count;
-    };
-
-    static
-    _Rep_base*
-    rep_from_data(const char *data_) _NOEXCEPT
-    {
-        char *data = const_cast<char *>(data_);
-        return reinterpret_cast<_Rep_base *>(data - sizeof(_Rep_base));
-    }
-    static
-    char *
-    data_from_rep(_Rep_base *rep) _NOEXCEPT
-    {
-        char *data = reinterpret_cast<char *>(rep);
-        return data + sizeof(*rep);
-    }
-
-#if __APPLE__
-    static
-    const char*
-    compute_gcc_empty_string_storage() _NOEXCEPT
-    {
-        void* handle = dlopen("/usr/lib/libstdc++.6.dylib", RTLD_NOLOAD);
-        if (handle == nullptr)
-            return nullptr;
-        void* sym = dlsym(handle, "_ZNSs4_Rep20_S_empty_rep_storageE");
-        if (sym == nullptr)
-            return nullptr;
-        return data_from_rep(reinterpret_cast<_Rep_base *>(sym));
-    }
-
-    static
-    const char*
-    get_gcc_empty_string_storage() _NOEXCEPT
-    {
-        static const char* p = compute_gcc_empty_string_storage();
-        return p;
-    }
-
-    bool
-    uses_refcount() const
-    {
-        return str_ != get_gcc_empty_string_storage();
-    }
-#else
-    bool
-    uses_refcount() const
-    {
-        return true;
-    }
-#endif
-
-public:
-    explicit __libcpp_refstring(const char* msg) {
-        std::size_t len = strlen(msg);
-        _Rep_base* rep = static_cast<_Rep_base *>(::operator new(sizeof(*rep) + len + 1));
-        rep->len = len;
-        rep->cap = len;
-        rep->count = 0;
-        char *data = data_from_rep(rep);
-        std::memcpy(data, msg, len + 1);
-        str_ = data;
-    }
-
-    __libcpp_refstring(const __libcpp_refstring& s) _NOEXCEPT : str_(s.str_)
-    {
-        if (uses_refcount())
-            __sync_add_and_fetch(&rep_from_data(str_)->count, 1);
-    }
-
-    __libcpp_refstring& operator=(const __libcpp_refstring& s) _NOEXCEPT
-    {
-        bool adjust_old_count = uses_refcount();
-        struct _Rep_base *old_rep = rep_from_data(str_);
-        str_ = s.str_;
-        if (uses_refcount())
-            __sync_add_and_fetch(&rep_from_data(str_)->count, 1);
-        if (adjust_old_count)
-        {
-            if (__sync_add_and_fetch(&old_rep->count, count_t(-1)) < 0)
-            {
-                ::operator delete(old_rep);
-            }
-        }
-        return *this;
-    }
-
-    ~__libcpp_refstring()
-    {
-        if (uses_refcount())
-        {
-            _Rep_base* rep = rep_from_data(str_);
-            if (__sync_add_and_fetch(&rep->count, count_t(-1)) < 0)
-            {
-                ::operator delete(rep);
-            }
-        }
-    }
-
-    const char* c_str() const _NOEXCEPT {return str_;}
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif //_LIBCPP___REFSTRING
diff --git a/include.new/c++/v1/tr1/__split_buffer b/include.new/c++/v1/tr1/__split_buffer
deleted file mode 100644
index 1d529cb..0000000
--- a/include.new/c++/v1/tr1/__split_buffer
+++ /dev/null
@@ -1,654 +0,0 @@
-// -*- C++ -*-
-#ifndef _LIBCPP_SPLIT_BUFFER
-#define _LIBCPP_SPLIT_BUFFER
-
-#include <__config>
-#include <type_traits>
-#include <algorithm>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <bool>
-class __split_buffer_common
-{
-protected:
-    void __throw_length_error() const;
-    void __throw_out_of_range() const;
-};
-
-template <class _Tp, class _Allocator = allocator<_Tp> >
-struct __split_buffer
-    : private __split_buffer_common<true>
-{
-private:
-    __split_buffer(const __split_buffer&);
-    __split_buffer& operator=(const __split_buffer&);
-public:
-    typedef _Tp                                             value_type;
-    typedef _Allocator                                      allocator_type;
-    typedef typename remove_reference<allocator_type>::type __alloc_rr;
-    typedef allocator_traits<__alloc_rr>                    __alloc_traits;
-    typedef value_type&                                     reference;
-    typedef const value_type&                               const_reference;
-    typedef typename __alloc_traits::size_type              size_type;
-    typedef typename __alloc_traits::difference_type        difference_type;
-    typedef typename __alloc_traits::pointer                pointer;
-    typedef typename __alloc_traits::const_pointer          const_pointer;
-    typedef pointer                                         iterator;
-    typedef const_pointer                                   const_iterator;
-
-    pointer                                         __first_;
-    pointer                                         __begin_;
-    pointer                                         __end_;
-    __compressed_pair<pointer, allocator_type> __end_cap_;
-
-    typedef typename add_lvalue_reference<allocator_type>::type __alloc_ref;
-    typedef typename add_lvalue_reference<allocator_type>::type __alloc_const_ref;
-
-    _LIBCPP_INLINE_VISIBILITY __alloc_rr&           __alloc() _NOEXCEPT         {return __end_cap_.second();}
-    _LIBCPP_INLINE_VISIBILITY const __alloc_rr&     __alloc() const _NOEXCEPT   {return __end_cap_.second();}
-    _LIBCPP_INLINE_VISIBILITY pointer&              __end_cap() _NOEXCEPT       {return __end_cap_.first();}
-    _LIBCPP_INLINE_VISIBILITY const pointer&        __end_cap() const _NOEXCEPT {return __end_cap_.first();}
-
-    __split_buffer()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    explicit __split_buffer(__alloc_rr& __a);
-    explicit __split_buffer(const __alloc_rr& __a);
-    __split_buffer(size_type __cap, size_type __start, __alloc_rr& __a);
-    ~__split_buffer();
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __split_buffer(__split_buffer&& __c)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    __split_buffer(__split_buffer&& __c, const __alloc_rr& __a);
-    __split_buffer& operator=(__split_buffer&& __c)
-        _NOEXCEPT_((__alloc_traits::propagate_on_container_move_assignment::value &&
-                is_nothrow_move_assignable<allocator_type>::value) ||
-               !__alloc_traits::propagate_on_container_move_assignment::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY       iterator begin() _NOEXCEPT       {return __begin_;}
-    _LIBCPP_INLINE_VISIBILITY const_iterator begin() const _NOEXCEPT {return __begin_;}
-    _LIBCPP_INLINE_VISIBILITY       iterator end() _NOEXCEPT         {return __end_;}
-    _LIBCPP_INLINE_VISIBILITY const_iterator end() const _NOEXCEPT   {return __end_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT
-        {__destruct_at_end(__begin_);}
-    _LIBCPP_INLINE_VISIBILITY size_type size() const {return static_cast<size_type>(__end_ - __begin_);}
-    _LIBCPP_INLINE_VISIBILITY bool empty()     const {return __end_ == __begin_;}
-    _LIBCPP_INLINE_VISIBILITY size_type capacity() const {return static_cast<size_type>(__end_cap() - __first_);}
-    _LIBCPP_INLINE_VISIBILITY size_type __front_spare() const {return static_cast<size_type>(__begin_ - __first_);}
-    _LIBCPP_INLINE_VISIBILITY size_type __back_spare() const {return static_cast<size_type>(__end_cap() - __end_);}
-
-    _LIBCPP_INLINE_VISIBILITY       reference front()       {return *__begin_;}
-    _LIBCPP_INLINE_VISIBILITY const_reference front() const {return *__begin_;}
-    _LIBCPP_INLINE_VISIBILITY       reference back()        {return *(__end_ - 1);}
-    _LIBCPP_INLINE_VISIBILITY const_reference back() const  {return *(__end_ - 1);}
-
-    void reserve(size_type __n);
-    void shrink_to_fit() _NOEXCEPT;
-    void push_front(const_reference __x);
-    _LIBCPP_INLINE_VISIBILITY void push_back(const_reference __x);
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-    void push_front(value_type&& __x);
-    void push_back(value_type&& __x);
-#if !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        void emplace_back(_Args&&... __args);
-#endif  // !defined(_LIBCPP_HAS_NO_VARIADICS)
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY void pop_front() {__destruct_at_begin(__begin_+1);}
-    _LIBCPP_INLINE_VISIBILITY void pop_back() {__destruct_at_end(__end_-1);}
-
-    void __construct_at_end(size_type __n);
-    void __construct_at_end(size_type __n, const_reference __x);
-    template <class _InputIter>
-        typename enable_if
-        <
-            __is_input_iterator<_InputIter>::value &&
-           !__is_forward_iterator<_InputIter>::value,
-            void
-        >::type
-        __construct_at_end(_InputIter __first, _InputIter __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            void
-        >::type
-        __construct_at_end(_ForwardIterator __first, _ForwardIterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY void __destruct_at_begin(pointer __new_begin)
-        {__destruct_at_begin(__new_begin, is_trivially_destructible<value_type>());}
-        void __destruct_at_begin(pointer __new_begin, false_type);
-        void __destruct_at_begin(pointer __new_begin, true_type);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __destruct_at_end(pointer __new_last) _NOEXCEPT
-        {__destruct_at_end(__new_last, false_type());}
-    _LIBCPP_INLINE_VISIBILITY
-        void __destruct_at_end(pointer __new_last, false_type) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-        void __destruct_at_end(pointer __new_last, true_type) _NOEXCEPT;
-
-    void swap(__split_buffer& __x)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
-                   __is_nothrow_swappable<__alloc_rr>::value);
-
-    bool __invariants() const;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__split_buffer& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__split_buffer&, false_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__alloc_rr& __x, __alloc_rr& __y)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
-                   __is_nothrow_swappable<__alloc_rr>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_swap::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__alloc_rr& __x, __alloc_rr& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<__alloc_rr>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__alloc_rr&, __alloc_rr&, false_type) _NOEXCEPT
-        {}
-};
-
-template <class _Tp, class _Allocator>
-bool
-__split_buffer<_Tp, _Allocator>::__invariants() const
-{
-    if (__first_ == nullptr)
-    {
-        if (__begin_ != nullptr)
-            return false;
-        if (__end_ != nullptr)
-            return false;
-        if (__end_cap() != nullptr)
-            return false;
-    }
-    else
-    {
-        if (__begin_ < __first_)
-            return false;
-        if (__end_ < __begin_)
-            return false;
-        if (__end_cap() < __end_)
-            return false;
-    }
-    return true;
-}
-
-//  Default constructs __n objects starting at __end_
-//  throws if construction throws
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == size() + __n
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n)
-{
-    __alloc_rr& __a = this->__alloc();
-    do
-    {
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_));
-        ++this->__end_;
-        --__n;
-    } while (__n > 0);
-}
-
-//  Copy constructs __n objects starting at __end_ from __x
-//  throws if construction throws
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == old size() + __n
-//  Postcondition:  [i] == __x for all i in [size() - __n, __n)
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)
-{
-    __alloc_rr& __a = this->__alloc();
-    do
-    {
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), __x);
-        ++this->__end_;
-        --__n;
-    } while (__n > 0);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-typename enable_if
-<
-     __is_input_iterator<_InputIter>::value &&
-    !__is_forward_iterator<_InputIter>::value,
-    void
->::type
-__split_buffer<_Tp, _Allocator>::__construct_at_end(_InputIter __first, _InputIter __last)
-{
-    __alloc_rr& __a = this->__alloc();
-    for (; __first != __last; ++__first)
-    {
-        if (__end_ == __end_cap())
-        {
-            size_type __old_cap = __end_cap() - __first_;
-            size_type __new_cap = _VSTD::max<size_type>(2 * __old_cap, 8);
-            __split_buffer __buf(__new_cap, 0, __a);
-            for (pointer __p = __begin_; __p != __end_; ++__p, ++__buf.__end_)
-                __alloc_traits::construct(__buf.__alloc(),
-                        _VSTD::__to_raw_pointer(__buf.__end_), _VSTD::move(*__p));
-            swap(__buf);
-        }
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), *__first);
-        ++this->__end_;
-    }
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    void
->::type
-__split_buffer<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last)
-{
-    __alloc_rr& __a = this->__alloc();
-    for (; __first != __last; ++__first)
-    {
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), *__first);
-        ++this->__end_;
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, false_type)
-{
-    while (__begin_ != __new_begin)
-        __alloc_traits::destroy(__alloc(), __to_raw_pointer(__begin_++));
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, true_type)
-{
-    __begin_ = __new_begin;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, false_type) _NOEXCEPT
-{
-    while (__new_last != __end_)
-        __alloc_traits::destroy(__alloc(), __to_raw_pointer(--__end_));
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, true_type) _NOEXCEPT
-{
-    __end_ = __new_last;
-}
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>::__split_buffer(size_type __cap, size_type __start, __alloc_rr& __a)
-    : __end_cap_(nullptr, __a)
-{
-    __first_ = __cap != 0 ? __alloc_traits::allocate(__alloc(), __cap) : nullptr;
-    __begin_ = __end_ = __first_ + __start;
-    __end_cap() = __first_ + __cap;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__split_buffer<_Tp, _Allocator>::__split_buffer()
-    _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-    : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr)
-{
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__split_buffer<_Tp, _Allocator>::__split_buffer(__alloc_rr& __a)
-    : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a)
-{
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__split_buffer<_Tp, _Allocator>::__split_buffer(const __alloc_rr& __a)
-    : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a)
-{
-}
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>::~__split_buffer()
-{
-    clear();
-    if (__first_)
-        __alloc_traits::deallocate(__alloc(), __first_, capacity());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c)
-    _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __first_(_VSTD::move(__c.__first_)),
-      __begin_(_VSTD::move(__c.__begin_)),
-      __end_(_VSTD::move(__c.__end_)),
-      __end_cap_(_VSTD::move(__c.__end_cap_))
-{
-    __c.__first_ = nullptr;
-    __c.__begin_ = nullptr;
-    __c.__end_ = nullptr;
-    __c.__end_cap() = nullptr;
-}
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>::__split_buffer(__split_buffer&& __c, const __alloc_rr& __a)
-    : __end_cap_(__a)
-{
-    if (__a == __c.__alloc())
-    {
-        __first_ = __c.__first_;
-        __begin_ = __c.__begin_;
-        __end_ = __c.__end_;
-        __end_cap() = __c.__end_cap();
-        __c.__first_ = nullptr;
-        __c.__begin_ = nullptr;
-        __c.__end_ = nullptr;
-        __c.__end_cap() = nullptr;
-    }
-    else
-    {
-        size_type __cap = __c.size();
-        __first_ = __alloc_traits::allocate(__alloc(), __cap);
-        __begin_ = __end_ = __first_;
-        __end_cap() = __first_ + __cap;
-        typedef move_iterator<iterator> _Ip;
-        __construct_at_end(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-}
-
-template <class _Tp, class _Allocator>
-__split_buffer<_Tp, _Allocator>&
-__split_buffer<_Tp, _Allocator>::operator=(__split_buffer&& __c)
-    _NOEXCEPT_((__alloc_traits::propagate_on_container_move_assignment::value &&
-                is_nothrow_move_assignable<allocator_type>::value) ||
-               !__alloc_traits::propagate_on_container_move_assignment::value)
-{
-    clear();
-    shrink_to_fit();
-    __first_ = __c.__first_;
-    __begin_ = __c.__begin_;
-    __end_ = __c.__end_;
-    __end_cap() = __c.__end_cap();
-    __move_assign_alloc(__c,
-        integral_constant<bool,
-                          __alloc_traits::propagate_on_container_move_assignment::value>());
-    __c.__first_ = __c.__begin_ = __c.__end_ = __c.__end_cap() = nullptr;
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::swap(__split_buffer& __x)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
-                   __is_nothrow_swappable<__alloc_rr>::value)
-{
-    _VSTD::swap(__first_, __x.__first_);
-    _VSTD::swap(__begin_, __x.__begin_);
-    _VSTD::swap(__end_, __x.__end_);
-    _VSTD::swap(__end_cap(), __x.__end_cap());
-    __swap_alloc(__alloc(), __x.__alloc());
-}
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::reserve(size_type __n)
-{
-    if (__n < capacity())
-    {
-        __split_buffer<value_type, __alloc_rr&> __t(__n, 0, __alloc());
-        __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                               move_iterator<pointer>(__end_));
-        _VSTD::swap(__first_, __t.__first_);
-        _VSTD::swap(__begin_, __t.__begin_);
-        _VSTD::swap(__end_, __t.__end_);
-        _VSTD::swap(__end_cap(), __t.__end_cap());
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
-{
-    if (capacity() > size())
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __split_buffer<value_type, __alloc_rr&> __t(size(), 0, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            __t.__end_ = __t.__begin_ + (__end_ - __begin_);
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::push_front(const_reference __x)
-{
-    if (__begin_ == __first_)
-    {
-        if (__end_ < __end_cap())
-        {
-            difference_type __d = __end_cap() - __end_;
-            __d = (__d + 1) / 2;
-            __begin_ = _VSTD::move_backward(__begin_, __end_, __end_ + __d);
-            __end_ += __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 3) / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__begin_-1), __x);
-    --__begin_;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::push_front(value_type&& __x)
-{
-    if (__begin_ == __first_)
-    {
-        if (__end_ < __end_cap())
-        {
-            difference_type __d = __end_cap() - __end_;
-            __d = (__d + 1) / 2;
-            __begin_ = _VSTD::move_backward(__begin_, __end_, __end_ + __d);
-            __end_ += __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, (__c + 3) / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__begin_-1),
-            _VSTD::move(__x));
-    --__begin_;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__split_buffer<_Tp, _Allocator>::push_back(const_reference __x)
-{
-    if (__end_ == __end_cap())
-    {
-        if (__begin_ > __first_)
-        {
-            difference_type __d = __begin_ - __first_;
-            __d = (__d + 1) / 2;
-            __end_ = _VSTD::move(__begin_, __end_, __begin_ - __d);
-            __begin_ -= __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, __c / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__end_), __x);
-    ++__end_;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-__split_buffer<_Tp, _Allocator>::push_back(value_type&& __x)
-{
-    if (__end_ == __end_cap())
-    {
-        if (__begin_ > __first_)
-        {
-            difference_type __d = __begin_ - __first_;
-            __d = (__d + 1) / 2;
-            __end_ = _VSTD::move(__begin_, __end_, __begin_ - __d);
-            __begin_ -= __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, __c / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__end_),
-            _VSTD::move(__x));
-    ++__end_;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-void
-__split_buffer<_Tp, _Allocator>::emplace_back(_Args&&... __args)
-{
-    if (__end_ == __end_cap())
-    {
-        if (__begin_ > __first_)
-        {
-            difference_type __d = __begin_ - __first_;
-            __d = (__d + 1) / 2;
-            __end_ = _VSTD::move(__begin_, __end_, __begin_ - __d);
-            __begin_ -= __d;
-        }
-        else
-        {
-            size_type __c = max<size_type>(2 * static_cast<size_t>(__end_cap() - __first_), 1);
-            __split_buffer<value_type, __alloc_rr&> __t(__c, __c / 4, __alloc());
-            __t.__construct_at_end(move_iterator<pointer>(__begin_),
-                                   move_iterator<pointer>(__end_));
-            _VSTD::swap(__first_, __t.__first_);
-            _VSTD::swap(__begin_, __t.__begin_);
-            _VSTD::swap(__end_, __t.__end_);
-            _VSTD::swap(__end_cap(), __t.__end_cap());
-        }
-    }
-    __alloc_traits::construct(__alloc(), _VSTD::__to_raw_pointer(__end_),
-                              _VSTD::forward<_Args>(__args)...);
-    ++__end_;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__split_buffer<_Tp, _Allocator>& __x, __split_buffer<_Tp, _Allocator>& __y)
-        _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SPLIT_BUFFER
diff --git a/include.new/c++/v1/tr1/__sso_allocator b/include.new/c++/v1/tr1/__sso_allocator
deleted file mode 100644
index 645f2ba..0000000
--- a/include.new/c++/v1/tr1/__sso_allocator
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___SSO_ALLOCATOR
-#define _LIBCPP___SSO_ALLOCATOR
-
-#include <__config>
-#include <type_traits>
-#include <new>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, size_t _Np> class _LIBCPP_HIDDEN __sso_allocator;
-
-template <size_t _Np>
-class _LIBCPP_HIDDEN __sso_allocator<void, _Np>
-{
-public:
-    typedef const void*       const_pointer;
-    typedef void              value_type;
-};
-
-template <class _Tp, size_t _Np>
-class _LIBCPP_HIDDEN __sso_allocator
-{
-    typename aligned_storage<sizeof(_Tp) * _Np>::type buf_;
-    bool __allocated_;
-public:
-    typedef size_t            size_type;
-    typedef _Tp*              pointer;
-    typedef _Tp               value_type;
-
-    _LIBCPP_INLINE_VISIBILITY __sso_allocator() throw() : __allocated_(false) {}
-    _LIBCPP_INLINE_VISIBILITY __sso_allocator(const __sso_allocator&) throw() : __allocated_(false) {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY __sso_allocator(const __sso_allocator<_Up, _Np>&) throw()
-         : __allocated_(false) {}
-private:
-    __sso_allocator& operator=(const __sso_allocator&);
-public:
-    _LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, typename __sso_allocator<void, _Np>::const_pointer = 0)
-    {
-        if (!__allocated_ && __n <= _Np)
-        {
-            __allocated_ = true;
-            return (pointer)&buf_;
-        }
-        return static_cast<pointer>(_VSTD::__allocate(__n * sizeof(_Tp)));
-    }
-    _LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type)
-    {
-        if (__p == (pointer)&buf_)
-            __allocated_ = false;
-        else
-            _VSTD::__deallocate(__p);
-    }
-    _LIBCPP_INLINE_VISIBILITY size_type max_size() const throw() {return size_type(~0) / sizeof(_Tp);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator==(__sso_allocator& __a) const {return &buf_ == &__a.buf_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(__sso_allocator& __a) const {return &buf_ != &__a.buf_;}
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___SSO_ALLOCATOR
diff --git a/include.new/c++/v1/tr1/__std_stream b/include.new/c++/v1/tr1/__std_stream
deleted file mode 100644
index 5403ada..0000000
--- a/include.new/c++/v1/tr1/__std_stream
+++ /dev/null
@@ -1,359 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___STD_STREAM
-#define _LIBCPP___STD_STREAM
-
-#include <__config>
-#include <ostream>
-#include <istream>
-#include <__locale>
-#include <cstdio>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-static const int __limit = 8;
-
-// __stdinbuf
-
-template <class _CharT>
-class _LIBCPP_HIDDEN __stdinbuf
-    : public basic_streambuf<_CharT, char_traits<_CharT> >
-{
-public:
-    typedef _CharT                           char_type;
-    typedef char_traits<char_type>           traits_type;
-    typedef typename traits_type::int_type   int_type;
-    typedef typename traits_type::pos_type   pos_type;
-    typedef typename traits_type::off_type   off_type;
-    typedef typename traits_type::state_type state_type;
-
-    __stdinbuf(FILE* __fp, state_type* __st);
-
-protected:
-    virtual int_type underflow();
-    virtual int_type uflow();
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-    virtual void imbue(const locale& __loc);
-
-private:
-
-    FILE* __file_;
-    const codecvt<char_type, char, state_type>* __cv_;
-    state_type* __st_;
-    int __encoding_;
-    int_type __last_consumed_;
-    bool __last_consumed_is_next_;
-    bool __always_noconv_;
-
-    __stdinbuf(const __stdinbuf&);
-    __stdinbuf& operator=(const __stdinbuf&);
-
-    int_type __getchar(bool __consume);
-};
-
-template <class _CharT>
-__stdinbuf<_CharT>::__stdinbuf(FILE* __fp, state_type* __st)
-    : __file_(__fp),
-      __st_(__st),
-      __last_consumed_(traits_type::eof()),
-      __last_consumed_is_next_(false)
-{
-    imbue(this->getloc());
-}
-
-template <class _CharT>
-void
-__stdinbuf<_CharT>::imbue(const locale& __loc)
-{
-    __cv_ = &use_facet<codecvt<char_type, char, state_type> >(__loc);
-    __encoding_ = __cv_->encoding();
-    __always_noconv_ = __cv_->always_noconv();
-    if (__encoding_ > __limit)
-        __throw_runtime_error("unsupported locale for standard input");
-}
-
-template <class _CharT>
-typename __stdinbuf<_CharT>::int_type
-__stdinbuf<_CharT>::underflow()
-{
-    return __getchar(false);
-}
-
-template <class _CharT>
-typename __stdinbuf<_CharT>::int_type
-__stdinbuf<_CharT>::uflow()
-{
-    return __getchar(true);
-}
-
-template <class _CharT>
-typename __stdinbuf<_CharT>::int_type
-__stdinbuf<_CharT>::__getchar(bool __consume)
-{
-    if (__last_consumed_is_next_)
-    {
-        int_type __result = __last_consumed_;
-        if (__consume)
-        {
-            __last_consumed_ = traits_type::eof();
-            __last_consumed_is_next_ = false;
-        }
-        return __result;
-    }
-    char __extbuf[__limit];
-    int __nread = _VSTD::max(1, __encoding_);
-    for (int __i = 0; __i < __nread; ++__i)
-    {
-        int __c = getc(__file_);
-        if (__c == EOF)
-            return traits_type::eof();
-        __extbuf[__i] = static_cast<char>(__c);
-    }
-    char_type __1buf;
-    if (__always_noconv_)
-        __1buf = static_cast<char_type>(__extbuf[0]);
-    else
-    {
-        const char* __enxt;
-        char_type* __inxt;
-        codecvt_base::result __r;
-        do
-        {
-            state_type __sv_st = *__st_;
-            __r = __cv_->in(*__st_, __extbuf, __extbuf + __nread, __enxt,
-                                   &__1buf, &__1buf + 1, __inxt);
-            switch (__r)
-            {
-            case _VSTD::codecvt_base::ok:
-                break;
-            case codecvt_base::partial:
-                *__st_ = __sv_st;
-                if (__nread == sizeof(__extbuf))
-                    return traits_type::eof();
-                {
-                    int __c = getc(__file_);
-                    if (__c == EOF)
-                        return traits_type::eof();
-                    __extbuf[__nread] = static_cast<char>(__c);
-                }
-                ++__nread;
-                break;
-            case codecvt_base::error:
-                return traits_type::eof();
-            case _VSTD::codecvt_base::noconv:
-                __1buf = static_cast<char_type>(__extbuf[0]);
-                break;
-            }
-        } while (__r == _VSTD::codecvt_base::partial);
-    }
-    if (!__consume)
-    {
-        for (int __i = __nread; __i > 0;)
-        {
-            if (ungetc(traits_type::to_int_type(__extbuf[--__i]), __file_) == EOF)
-                return traits_type::eof();
-        }
-    }
-    else
-        __last_consumed_ = traits_type::to_int_type(__1buf);
-    return traits_type::to_int_type(__1buf);
-}
-
-template <class _CharT>
-typename __stdinbuf<_CharT>::int_type
-__stdinbuf<_CharT>::pbackfail(int_type __c)
-{
-    if (traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        if (!__last_consumed_is_next_)
-        {
-            __c = __last_consumed_;
-            __last_consumed_is_next_ = !traits_type::eq_int_type(__last_consumed_,
-                                                                 traits_type::eof());
-        }
-        return __c;
-    }
-    if (__last_consumed_is_next_)
-    {
-        char __extbuf[__limit];
-        char* __enxt;
-        const char_type __ci = traits_type::to_char_type(__last_consumed_);
-        const char_type* __inxt;
-        switch (__cv_->out(*__st_, &__ci, &__ci + 1, __inxt,
-                                  __extbuf, __extbuf + sizeof(__extbuf), __enxt))
-        {
-        case _VSTD::codecvt_base::ok:
-            break;
-        case _VSTD::codecvt_base::noconv:
-            __extbuf[0] = static_cast<char>(__last_consumed_);
-            __enxt = __extbuf + 1;
-            break;
-        case codecvt_base::partial:
-        case codecvt_base::error:
-            return traits_type::eof();
-        }
-        while (__enxt > __extbuf)
-            if (ungetc(*--__enxt, __file_) == EOF)
-                return traits_type::eof();
-    }
-    __last_consumed_ = __c;
-    __last_consumed_is_next_ = true;
-    return __c;
-}
-
-// __stdoutbuf
-
-template <class _CharT>
-class _LIBCPP_HIDDEN __stdoutbuf
-    : public basic_streambuf<_CharT, char_traits<_CharT> >
-{
-public:
-    typedef _CharT                           char_type;
-    typedef char_traits<char_type>           traits_type;
-    typedef typename traits_type::int_type   int_type;
-    typedef typename traits_type::pos_type   pos_type;
-    typedef typename traits_type::off_type   off_type;
-    typedef typename traits_type::state_type state_type;
-
-    __stdoutbuf(FILE* __fp, state_type* __st);
-
-protected:
-    virtual int_type overflow (int_type __c = traits_type::eof());
-    virtual streamsize xsputn(const char_type* __s, streamsize __n);
-    virtual int sync();
-    virtual void imbue(const locale& __loc);
-
-private:
-    FILE* __file_;
-    const codecvt<char_type, char, state_type>* __cv_;
-    state_type* __st_;
-    bool __always_noconv_;
-
-    __stdoutbuf(const __stdoutbuf&);
-    __stdoutbuf& operator=(const __stdoutbuf&);
-};
-
-template <class _CharT>
-__stdoutbuf<_CharT>::__stdoutbuf(FILE* __fp, state_type* __st)
-    : __file_(__fp),
-      __cv_(&use_facet<codecvt<char_type, char, state_type> >(this->getloc())),
-      __st_(__st),
-      __always_noconv_(__cv_->always_noconv())
-{
-}
-
-template <class _CharT>
-typename __stdoutbuf<_CharT>::int_type
-__stdoutbuf<_CharT>::overflow(int_type __c)
-{
-    char __extbuf[__limit];
-    char_type __1buf;
-    if (!traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        __1buf = traits_type::to_char_type(__c);
-        if (__always_noconv_)
-        {
-            if (fwrite(&__1buf, sizeof(char_type), 1, __file_) != 1)
-                return traits_type::eof();
-        }
-        else
-        {
-            char* __extbe = __extbuf;
-            codecvt_base::result __r;
-            char_type* pbase = &__1buf;
-            char_type* pptr = pbase + 1;
-            char_type* epptr = pptr;
-            do
-            {
-                const char_type* __e;
-                __r = __cv_->out(*__st_, pbase, pptr, __e,
-                                        __extbuf,
-                                        __extbuf + sizeof(__extbuf),
-                                        __extbe);
-                if (__e == pbase)
-                    return traits_type::eof();
-                if (__r == codecvt_base::noconv)
-                {
-                    if (fwrite(pbase, 1, 1, __file_) != 1)
-                        return traits_type::eof();
-                }
-                else if (__r == codecvt_base::ok || __r == codecvt_base::partial)
-                {
-                    size_t __nmemb = static_cast<size_t>(__extbe - __extbuf);
-                    if (fwrite(__extbuf, 1, __nmemb, __file_) != __nmemb)
-                        return traits_type::eof();
-                    if (__r == codecvt_base::partial)
-                    {
-                        pbase = (char_type*)__e;
-                    }
-                }
-                else
-                    return traits_type::eof();
-            } while (__r == codecvt_base::partial);
-        }
-    }
-    return traits_type::not_eof(__c);
-}
-
-template <class _CharT>
-streamsize
-__stdoutbuf<_CharT>::xsputn(const char_type* __s, streamsize __n)
-{
-    if (__always_noconv_)
-        return fwrite(__s, sizeof(char_type), __n, __file_);
-    streamsize __i = 0;
-    for (; __i < __n; ++__i, ++__s)
-        if (overflow(traits_type::to_int_type(*__s)) == traits_type::eof())
-            break;
-    return __i;
-}
-
-template <class _CharT>
-int
-__stdoutbuf<_CharT>::sync()
-{
-    char __extbuf[__limit];
-    codecvt_base::result __r;
-    do
-    {
-        char* __extbe;
-        __r = __cv_->unshift(*__st_, __extbuf,
-                                    __extbuf + sizeof(__extbuf),
-                                    __extbe);
-        size_t __nmemb = static_cast<size_t>(__extbe - __extbuf);
-        if (fwrite(__extbuf, 1, __nmemb, __file_) != __nmemb)
-            return -1;
-    } while (__r == codecvt_base::partial);
-    if (__r == codecvt_base::error)
-        return -1;
-    if (fflush(__file_))
-        return -1;
-    return 0;
-}
-
-template <class _CharT>
-void
-__stdoutbuf<_CharT>::imbue(const locale& __loc)
-{
-    sync();
-    __cv_ = &use_facet<codecvt<char_type, char, state_type> >(__loc);
-    __always_noconv_ = __cv_->always_noconv();
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___STD_STREAM
diff --git a/include.new/c++/v1/tr1/__tree b/include.new/c++/v1/tr1/__tree
deleted file mode 100644
index 9007dbf..0000000
--- a/include.new/c++/v1/tr1/__tree
+++ /dev/null
@@ -1,2308 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___TREE
-#define _LIBCPP___TREE
-
-#include <__config>
-#include <iterator>
-#include <memory>
-#include <stdexcept>
-#include <algorithm>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _Compare, class _Allocator> class __tree;
-template <class _Tp, class _NodePtr, class _DiffType>
-    class _LIBCPP_TYPE_VIS_ONLY __tree_iterator;
-template <class _Tp, class _ConstNodePtr, class _DiffType>
-    class _LIBCPP_TYPE_VIS_ONLY __tree_const_iterator;
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class _LIBCPP_TYPE_VIS_ONLY map;
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class _LIBCPP_TYPE_VIS_ONLY multimap;
-template <class _Key, class _Compare, class _Allocator>
-    class _LIBCPP_TYPE_VIS_ONLY set;
-template <class _Key, class _Compare, class _Allocator>
-    class _LIBCPP_TYPE_VIS_ONLY multiset;
-
-/*
-
-_NodePtr algorithms
-
-The algorithms taking _NodePtr are red black tree algorithms.  Those
-algorithms taking a parameter named __root should assume that __root
-points to a proper red black tree (unless otherwise specified).
-
-Each algorithm herein assumes that __root->__parent_ points to a non-null
-structure which has a member __left_ which points back to __root.  No other
-member is read or written to at __root->__parent_.
-
-__root->__parent_ will be referred to below (in comments only) as end_node.
-end_node->__left_ is an externably accessible lvalue for __root, and can be
-changed by node insertion and removal (without explicit reference to end_node).
-
-All nodes (with the exception of end_node), even the node referred to as
-__root, have a non-null __parent_ field.
-
-*/
-
-// Returns:  true if __x is a left child of its parent, else false
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__tree_is_left_child(_NodePtr __x) _NOEXCEPT
-{
-    return __x == __x->__parent_->__left_;
-}
-
-// Determintes if the subtree rooted at __x is a proper red black subtree.  If
-//    __x is a proper subtree, returns the black height (null counts as 1).  If
-//    __x is an improper subtree, returns 0.
-template <class _NodePtr>
-unsigned
-__tree_sub_invariant(_NodePtr __x)
-{
-    if (__x == nullptr)
-        return 1;
-    // parent consistency checked by caller
-    // check __x->__left_ consistency
-    if (__x->__left_ != nullptr && __x->__left_->__parent_ != __x)
-        return 0;
-    // check __x->__right_ consistency
-    if (__x->__right_ != nullptr && __x->__right_->__parent_ != __x)
-        return 0;
-    // check __x->__left_ != __x->__right_ unless both are nullptr
-    if (__x->__left_ == __x->__right_ && __x->__left_ != nullptr)
-        return 0;
-    // If this is red, neither child can be red
-    if (!__x->__is_black_)
-    {
-        if (__x->__left_ && !__x->__left_->__is_black_)
-            return 0;
-        if (__x->__right_ && !__x->__right_->__is_black_)
-            return 0;
-    }
-    unsigned __h = __tree_sub_invariant(__x->__left_);
-    if (__h == 0)
-        return 0;  // invalid left subtree
-    if (__h != __tree_sub_invariant(__x->__right_))
-        return 0;  // invalid or different height right subtree
-    return __h + __x->__is_black_;  // return black height of this node
-}
-
-// Determintes if the red black tree rooted at __root is a proper red black tree.
-//    __root == nullptr is a proper tree.  Returns true is __root is a proper
-//    red black tree, else returns false.
-template <class _NodePtr>
-bool
-__tree_invariant(_NodePtr __root)
-{
-    if (__root == nullptr)
-        return true;
-    // check __x->__parent_ consistency
-    if (__root->__parent_ == nullptr)
-        return false;
-    if (!__tree_is_left_child(__root))
-        return false;
-    // root must be black
-    if (!__root->__is_black_)
-        return false;
-    // do normal node checks
-    return __tree_sub_invariant(__root) != 0;
-}
-
-// Returns:  pointer to the left-most node under __x.
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-inline _LIBCPP_INLINE_VISIBILITY
-_NodePtr
-__tree_min(_NodePtr __x) _NOEXCEPT
-{
-    while (__x->__left_ != nullptr)
-        __x = __x->__left_;
-    return __x;
-}
-
-// Returns:  pointer to the right-most node under __x.
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-inline _LIBCPP_INLINE_VISIBILITY
-_NodePtr
-__tree_max(_NodePtr __x) _NOEXCEPT
-{
-    while (__x->__right_ != nullptr)
-        __x = __x->__right_;
-    return __x;
-}
-
-// Returns:  pointer to the next in-order node after __x.
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-_NodePtr
-__tree_next(_NodePtr __x) _NOEXCEPT
-{
-    if (__x->__right_ != nullptr)
-        return __tree_min(__x->__right_);
-    while (!__tree_is_left_child(__x))
-        __x = __x->__parent_;
-    return __x->__parent_;
-}
-
-// Returns:  pointer to the previous in-order node before __x.
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-_NodePtr
-__tree_prev(_NodePtr __x) _NOEXCEPT
-{
-    if (__x->__left_ != nullptr)
-        return __tree_max(__x->__left_);
-    while (__tree_is_left_child(__x))
-        __x = __x->__parent_;
-    return __x->__parent_;
-}
-
-// Returns:  pointer to a node which has no children
-// Precondition:  __x != nullptr.
-template <class _NodePtr>
-_NodePtr
-__tree_leaf(_NodePtr __x) _NOEXCEPT
-{
-    while (true)
-    {
-        if (__x->__left_ != nullptr)
-        {
-            __x = __x->__left_;
-            continue;
-        }
-        if (__x->__right_ != nullptr)
-        {
-            __x = __x->__right_;
-            continue;
-        }
-        break;
-    }
-    return __x;
-}
-
-// Effects:  Makes __x->__right_ the subtree root with __x as its left child
-//           while preserving in-order order.
-// Precondition:  __x->__right_ != nullptr
-template <class _NodePtr>
-void
-__tree_left_rotate(_NodePtr __x) _NOEXCEPT
-{
-    _NodePtr __y = __x->__right_;
-    __x->__right_ = __y->__left_;
-    if (__x->__right_ != nullptr)
-        __x->__right_->__parent_ = __x;
-    __y->__parent_ = __x->__parent_;
-    if (__tree_is_left_child(__x))
-        __x->__parent_->__left_ = __y;
-    else
-        __x->__parent_->__right_ = __y;
-    __y->__left_ = __x;
-    __x->__parent_ = __y;
-}
-
-// Effects:  Makes __x->__left_ the subtree root with __x as its right child
-//           while preserving in-order order.
-// Precondition:  __x->__left_ != nullptr
-template <class _NodePtr>
-void
-__tree_right_rotate(_NodePtr __x) _NOEXCEPT
-{
-    _NodePtr __y = __x->__left_;
-    __x->__left_ = __y->__right_;
-    if (__x->__left_ != nullptr)
-        __x->__left_->__parent_ = __x;
-    __y->__parent_ = __x->__parent_;
-    if (__tree_is_left_child(__x))
-        __x->__parent_->__left_ = __y;
-    else
-        __x->__parent_->__right_ = __y;
-    __y->__right_ = __x;
-    __x->__parent_ = __y;
-}
-
-// Effects:  Rebalances __root after attaching __x to a leaf.
-// Precondition:  __root != nulptr && __x != nullptr.
-//                __x has no children.
-//                __x == __root or == a direct or indirect child of __root.
-//                If __x were to be unlinked from __root (setting __root to
-//                  nullptr if __root == __x), __tree_invariant(__root) == true.
-// Postcondition: __tree_invariant(end_node->__left_) == true.  end_node->__left_
-//                may be different than the value passed in as __root.
-template <class _NodePtr>
-void
-__tree_balance_after_insert(_NodePtr __root, _NodePtr __x) _NOEXCEPT
-{
-    __x->__is_black_ = __x == __root;
-    while (__x != __root && !__x->__parent_->__is_black_)
-    {
-        // __x->__parent_ != __root because __x->__parent_->__is_black == false
-        if (__tree_is_left_child(__x->__parent_))
-        {
-            _NodePtr __y = __x->__parent_->__parent_->__right_;
-            if (__y != nullptr && !__y->__is_black_)
-            {
-                __x = __x->__parent_;
-                __x->__is_black_ = true;
-                __x = __x->__parent_;
-                __x->__is_black_ = __x == __root;
-                __y->__is_black_ = true;
-            }
-            else
-            {
-                if (!__tree_is_left_child(__x))
-                {
-                    __x = __x->__parent_;
-                    __tree_left_rotate(__x);
-                }
-                __x = __x->__parent_;
-                __x->__is_black_ = true;
-                __x = __x->__parent_;
-                __x->__is_black_ = false;
-                __tree_right_rotate(__x);
-                break;
-            }
-        }
-        else
-        {
-            _NodePtr __y = __x->__parent_->__parent_->__left_;
-            if (__y != nullptr && !__y->__is_black_)
-            {
-                __x = __x->__parent_;
-                __x->__is_black_ = true;
-                __x = __x->__parent_;
-                __x->__is_black_ = __x == __root;
-                __y->__is_black_ = true;
-            }
-            else
-            {
-                if (__tree_is_left_child(__x))
-                {
-                    __x = __x->__parent_;
-                    __tree_right_rotate(__x);
-                }
-                __x = __x->__parent_;
-                __x->__is_black_ = true;
-                __x = __x->__parent_;
-                __x->__is_black_ = false;
-                __tree_left_rotate(__x);
-                break;
-            }
-        }
-    }
-}
-
-// Precondition:  __root != nullptr && __z != nullptr.
-//                __tree_invariant(__root) == true.
-//                __z == __root or == a direct or indirect child of __root.
-// Effects:  unlinks __z from the tree rooted at __root, rebalancing as needed.
-// Postcondition: __tree_invariant(end_node->__left_) == true && end_node->__left_
-//                nor any of its children refer to __z.  end_node->__left_
-//                may be different than the value passed in as __root.
-template <class _NodePtr>
-void
-__tree_remove(_NodePtr __root, _NodePtr __z) _NOEXCEPT
-{
-    // __z will be removed from the tree.  Client still needs to destruct/deallocate it
-    // __y is either __z, or if __z has two children, __tree_next(__z).
-    // __y will have at most one child.
-    // __y will be the initial hole in the tree (make the hole at a leaf)
-    _NodePtr __y = (__z->__left_ == nullptr || __z->__right_ == nullptr) ?
-                    __z : __tree_next(__z);
-    // __x is __y's possibly null single child
-    _NodePtr __x = __y->__left_ != nullptr ? __y->__left_ : __y->__right_;
-    // __w is __x's possibly null uncle (will become __x's sibling)
-    _NodePtr __w = nullptr;
-    // link __x to __y's parent, and find __w
-    if (__x != nullptr)
-        __x->__parent_ = __y->__parent_;
-    if (__tree_is_left_child(__y))
-    {
-        __y->__parent_->__left_ = __x;
-        if (__y != __root)
-            __w = __y->__parent_->__right_;
-        else
-            __root = __x;  // __w == nullptr
-    }
-    else
-    {
-        __y->__parent_->__right_ = __x;
-        // __y can't be root if it is a right child
-        __w = __y->__parent_->__left_;
-    }
-    bool __removed_black = __y->__is_black_;
-    // If we didn't remove __z, do so now by splicing in __y for __z,
-    //    but copy __z's color.  This does not impact __x or __w.
-    if (__y != __z)
-    {
-        // __z->__left_ != nulptr but __z->__right_ might == __x == nullptr
-        __y->__parent_ = __z->__parent_;
-        if (__tree_is_left_child(__z))
-            __y->__parent_->__left_ = __y;
-        else
-            __y->__parent_->__right_ = __y;
-        __y->__left_ = __z->__left_;
-        __y->__left_->__parent_ = __y;
-        __y->__right_ = __z->__right_;
-        if (__y->__right_ != nullptr)
-            __y->__right_->__parent_ = __y;
-        __y->__is_black_ = __z->__is_black_;
-        if (__root == __z)
-            __root = __y;
-    }
-    // There is no need to rebalance if we removed a red, or if we removed
-    //     the last node.
-    if (__removed_black && __root != nullptr)
-    {
-        // Rebalance:
-        // __x has an implicit black color (transferred from the removed __y)
-        //    associated with it, no matter what its color is.
-        // If __x is __root (in which case it can't be null), it is supposed
-        //    to be black anyway, and if it is doubly black, then the double
-        //    can just be ignored.
-        // If __x is red (in which case it can't be null), then it can absorb
-        //    the implicit black just by setting its color to black.
-        // Since __y was black and only had one child (which __x points to), __x
-        //   is either red with no children, else null, otherwise __y would have
-        //   different black heights under left and right pointers.
-        // if (__x == __root || __x != nullptr && !__x->__is_black_)
-        if (__x != nullptr)
-            __x->__is_black_ = true;
-        else
-        {
-            //  Else __x isn't root, and is "doubly black", even though it may
-            //     be null.  __w can not be null here, else the parent would
-            //     see a black height >= 2 on the __x side and a black height
-            //     of 1 on the __w side (__w must be a non-null black or a red
-            //     with a non-null black child).
-            while (true)
-            {
-                if (!__tree_is_left_child(__w))  // if x is left child
-                {
-                    if (!__w->__is_black_)
-                    {
-                        __w->__is_black_ = true;
-                        __w->__parent_->__is_black_ = false;
-                        __tree_left_rotate(__w->__parent_);
-                        // __x is still valid
-                        // reset __root only if necessary
-                        if (__root == __w->__left_)
-                            __root = __w;
-                        // reset sibling, and it still can't be null
-                        __w = __w->__left_->__right_;
-                    }
-                    // __w->__is_black_ is now true, __w may have null children
-                    if ((__w->__left_  == nullptr || __w->__left_->__is_black_) &&
-                        (__w->__right_ == nullptr || __w->__right_->__is_black_))
-                    {
-                        __w->__is_black_ = false;
-                        __x = __w->__parent_;
-                        // __x can no longer be null
-                        if (__x == __root || !__x->__is_black_)
-                        {
-                            __x->__is_black_ = true;
-                            break;
-                        }
-                        // reset sibling, and it still can't be null
-                        __w = __tree_is_left_child(__x) ?
-                                    __x->__parent_->__right_ :
-                                    __x->__parent_->__left_;
-                        // continue;
-                    }
-                    else  // __w has a red child
-                    {
-                        if (__w->__right_ == nullptr || __w->__right_->__is_black_)
-                        {
-                            // __w left child is non-null and red
-                            __w->__left_->__is_black_ = true;
-                            __w->__is_black_ = false;
-                            __tree_right_rotate(__w);
-                            // __w is known not to be root, so root hasn't changed
-                            // reset sibling, and it still can't be null
-                            __w = __w->__parent_;
-                        }
-                        // __w has a right red child, left child may be null
-                        __w->__is_black_ = __w->__parent_->__is_black_;
-                        __w->__parent_->__is_black_ = true;
-                        __w->__right_->__is_black_ = true;
-                        __tree_left_rotate(__w->__parent_);
-                        break;
-                    }
-                }
-                else
-                {
-                    if (!__w->__is_black_)
-                    {
-                        __w->__is_black_ = true;
-                        __w->__parent_->__is_black_ = false;
-                        __tree_right_rotate(__w->__parent_);
-                        // __x is still valid
-                        // reset __root only if necessary
-                        if (__root == __w->__right_)
-                            __root = __w;
-                        // reset sibling, and it still can't be null
-                        __w = __w->__right_->__left_;
-                    }
-                    // __w->__is_black_ is now true, __w may have null children
-                    if ((__w->__left_  == nullptr || __w->__left_->__is_black_) &&
-                        (__w->__right_ == nullptr || __w->__right_->__is_black_))
-                    {
-                        __w->__is_black_ = false;
-                        __x = __w->__parent_;
-                        // __x can no longer be null
-                        if (!__x->__is_black_ || __x == __root)
-                        {
-                            __x->__is_black_ = true;
-                            break;
-                        }
-                        // reset sibling, and it still can't be null
-                        __w = __tree_is_left_child(__x) ?
-                                    __x->__parent_->__right_ :
-                                    __x->__parent_->__left_;
-                        // continue;
-                    }
-                    else  // __w has a red child
-                    {
-                        if (__w->__left_ == nullptr || __w->__left_->__is_black_)
-                        {
-                            // __w right child is non-null and red
-                            __w->__right_->__is_black_ = true;
-                            __w->__is_black_ = false;
-                            __tree_left_rotate(__w);
-                            // __w is known not to be root, so root hasn't changed
-                            // reset sibling, and it still can't be null
-                            __w = __w->__parent_;
-                        }
-                        // __w has a left red child, right child may be null
-                        __w->__is_black_ = __w->__parent_->__is_black_;
-                        __w->__parent_->__is_black_ = true;
-                        __w->__left_->__is_black_ = true;
-                        __tree_right_rotate(__w->__parent_);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
-
-template <class _Allocator> class __map_node_destructor;
-
-template <class _Allocator>
-class __tree_node_destructor
-{
-    typedef _Allocator                                      allocator_type;
-    typedef allocator_traits<allocator_type>                __alloc_traits;
-    typedef typename __alloc_traits::value_type::value_type value_type;
-public:
-    typedef typename __alloc_traits::pointer                pointer;
-private:
-
-    allocator_type& __na_;
-
-    __tree_node_destructor& operator=(const __tree_node_destructor&);
-
-public:
-    bool __value_constructed;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __tree_node_destructor(allocator_type& __na) _NOEXCEPT
-        : __na_(__na),
-          __value_constructed(false)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        if (__value_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_));
-        if (__p)
-            __alloc_traits::deallocate(__na_, __p, 1);
-    }
-
-    template <class> friend class __map_node_destructor;
-};
-
-// node
-
-template <class _Pointer>
-class __tree_end_node
-{
-public:
-    typedef _Pointer pointer;
-    pointer __left_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_end_node() _NOEXCEPT : __left_() {}
-};
-
-template <class _VoidPtr>
-class __tree_node_base
-    : public __tree_end_node
-             <
-                typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                     rebind<__tree_node_base<_VoidPtr> >
-#else
-                     rebind<__tree_node_base<_VoidPtr> >::other
-#endif
-             >
-{
-    __tree_node_base(const __tree_node_base&);
-    __tree_node_base& operator=(const __tree_node_base&);
-public:
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__tree_node_base>
-#else
-            rebind<__tree_node_base>::other
-#endif
-                                                pointer;
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const __tree_node_base>
-#else
-            rebind<const __tree_node_base>::other
-#endif
-                                                const_pointer;
-    typedef __tree_end_node<pointer> base;
-
-    pointer __right_;
-    pointer __parent_;
-    bool __is_black_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_node_base() _NOEXCEPT
-        : __right_(), __parent_(), __is_black_(false) {}
-};
-
-template <class _Tp, class _VoidPtr>
-class __tree_node
-    : public __tree_node_base<_VoidPtr>
-{
-public:
-    typedef __tree_node_base<_VoidPtr> base;
-    typedef _Tp value_type;
-
-    value_type __value_;
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tree_node(_Args&& ...__args)
-            : __value_(_VSTD::forward<_Args>(__args)...) {}
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __tree_node(const value_type& __v)
-            : __value_(__v) {}
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-};
-
-template <class _TreeIterator> class _LIBCPP_TYPE_VIS_ONLY __map_iterator;
-template <class _TreeIterator> class _LIBCPP_TYPE_VIS_ONLY __map_const_iterator;
-
-template <class _Tp, class _NodePtr, class _DiffType>
-class _LIBCPP_TYPE_VIS_ONLY __tree_iterator
-{
-    typedef _NodePtr                                              __node_pointer;
-    typedef typename pointer_traits<__node_pointer>::element_type __node;
-    typedef typename __node::base                                 __node_base;
-    typedef typename __node_base::pointer                         __node_base_pointer;
-
-    __node_pointer __ptr_;
-
-    typedef pointer_traits<__node_pointer> __pointer_traits;
-public:
-    typedef bidirectional_iterator_tag iterator_category;
-    typedef _Tp                        value_type;
-    typedef _DiffType                  difference_type;
-    typedef value_type&                reference;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                       pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __tree_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __ptr_(nullptr)
-#endif
-    {}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const
-        {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_iterator& operator++()
-        {__ptr_ = static_cast<__node_pointer>(__tree_next(static_cast<__node_base_pointer>(__ptr_)));
-         return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_iterator operator++(int)
-        {__tree_iterator __t(*this); ++(*this); return __t;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_iterator& operator--()
-        {__ptr_ = static_cast<__node_pointer>(__tree_prev(static_cast<__node_base_pointer>(__ptr_)));
-         return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_iterator operator--(int)
-        {__tree_iterator __t(*this); --(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY 
-        bool operator==(const __tree_iterator& __x, const __tree_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const __tree_iterator& __x, const __tree_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __tree_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
-    template <class, class, class> friend class __tree;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY __tree_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __map_iterator;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY set;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multiset;
-};
-
-template <class _Tp, class _ConstNodePtr, class _DiffType>
-class _LIBCPP_TYPE_VIS_ONLY __tree_const_iterator
-{
-    typedef _ConstNodePtr                                         __node_pointer;
-    typedef typename pointer_traits<__node_pointer>::element_type __node;
-    typedef typename __node::base                                 __node_base;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__node_base>
-#else
-            rebind<__node_base>::other
-#endif
-                                                                  __node_base_pointer;
-
-    __node_pointer __ptr_;
-
-    typedef pointer_traits<__node_pointer> __pointer_traits;
-public:
-    typedef bidirectional_iterator_tag       iterator_category;
-    typedef _Tp                              value_type;
-    typedef _DiffType                        difference_type;
-    typedef const value_type&                reference;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                       pointer;
-
-    _LIBCPP_INLINE_VISIBILITY __tree_const_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-    : __ptr_(nullptr)
-#endif
-    {}
-
-private:
-    typedef typename remove_const<__node>::type  __non_const_node;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__non_const_node>
-#else
-            rebind<__non_const_node>::other
-#endif
-                                                 __non_const_node_pointer;
-    typedef __tree_iterator<value_type, __non_const_node_pointer, difference_type>
-                                                 __non_const_iterator;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator(__non_const_iterator __p) _NOEXCEPT
-        : __ptr_(__p.__ptr_) {}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const
-        {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator& operator++()
-        {__ptr_ = static_cast<__node_pointer>(__tree_next(static_cast<__node_base_pointer>(__ptr_)));
-         return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator operator++(int)
-        {__tree_const_iterator __t(*this); ++(*this); return __t;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator& operator--()
-        {__ptr_ = static_cast<__node_pointer>(__tree_prev(static_cast<__node_base_pointer>(__ptr_)));
-         return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __tree_const_iterator operator--(int)
-        {__tree_const_iterator __t(*this); --(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const __tree_const_iterator& __x, const __tree_const_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const __tree_const_iterator& __x, const __tree_const_iterator& __y)
-        {return !(__x == __y);}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __tree_const_iterator(__node_pointer __p) _NOEXCEPT
-        : __ptr_(__p) {}
-    template <class, class, class> friend class __tree;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY set;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multiset;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __map_const_iterator;
-};
-
-template <class _Tp, class _Compare, class _Allocator>
-class __tree
-{
-public:
-    typedef _Tp                                      value_type;
-    typedef _Compare                                 value_compare;
-    typedef _Allocator                               allocator_type;
-    typedef allocator_traits<allocator_type>         __alloc_traits;
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-
-    typedef typename __alloc_traits::void_pointer  __void_pointer;
-
-    typedef __tree_node<value_type, __void_pointer> __node;
-    typedef __tree_node_base<__void_pointer>        __node_base;
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__node>
-#else
-            rebind_alloc<__node>::other
-#endif
-                                                     __node_allocator;
-    typedef allocator_traits<__node_allocator>       __node_traits;
-    typedef typename __node_traits::pointer          __node_pointer;
-    typedef typename __node_traits::pointer          __node_const_pointer;
-    typedef typename __node_base::pointer            __node_base_pointer;
-    typedef typename __node_base::pointer            __node_base_const_pointer;
-private:
-    typedef typename __node_base::base __end_node_t;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__end_node_t>
-#else
-            rebind<__end_node_t>::other
-#endif
-                                                     __end_node_ptr;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__end_node_t>
-#else
-            rebind<__end_node_t>::other
-#endif
-                                                     __end_node_const_ptr;
-
-    __node_pointer                                          __begin_node_;
-    __compressed_pair<__end_node_t, __node_allocator>  __pair1_;
-    __compressed_pair<size_type, value_compare>        __pair3_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __node_pointer __end_node() _NOEXCEPT
-    {
-        return static_cast<__node_pointer>
-               (
-                   pointer_traits<__end_node_ptr>::pointer_to(__pair1_.first())
-               );
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __node_const_pointer __end_node() const _NOEXCEPT
-    {
-        return static_cast<__node_const_pointer>
-               (
-                   pointer_traits<__end_node_const_ptr>::pointer_to(const_cast<__end_node_t&>(__pair1_.first()))
-               );
-    }
-    _LIBCPP_INLINE_VISIBILITY
-          __node_allocator& __node_alloc() _NOEXCEPT {return __pair1_.second();}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_allocator& __node_alloc() const _NOEXCEPT
-        {return __pair1_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-          __node_pointer& __begin_node() _NOEXCEPT {return __begin_node_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_pointer& __begin_node() const _NOEXCEPT {return __begin_node_;}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type __alloc() const _NOEXCEPT
-        {return allocator_type(__node_alloc());}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-          size_type& size() _NOEXCEPT {return __pair3_.first();}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    const size_type& size() const _NOEXCEPT {return __pair3_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-          value_compare& value_comp() _NOEXCEPT {return __pair3_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_compare& value_comp() const _NOEXCEPT
-        {return __pair3_.second();}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __node_pointer __root() _NOEXCEPT
-        {return static_cast<__node_pointer>      (__end_node()->__left_);}
-    _LIBCPP_INLINE_VISIBILITY
-    __node_const_pointer __root() const _NOEXCEPT
-        {return static_cast<__node_const_pointer>(__end_node()->__left_);}
-
-    typedef __tree_iterator<value_type, __node_pointer, difference_type>             iterator;
-    typedef __tree_const_iterator<value_type, __node_pointer, difference_type> const_iterator;
-
-    explicit __tree(const value_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<__node_allocator>::value &&
-            is_nothrow_copy_constructible<value_compare>::value);
-    explicit __tree(const allocator_type& __a);
-    __tree(const value_compare& __comp, const allocator_type& __a);
-    __tree(const __tree& __t);
-    __tree& operator=(const __tree& __t);
-    template <class _InputIterator>
-        void __assign_unique(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        void __assign_multi(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __tree(__tree&& __t)
-        _NOEXCEPT_(
-            is_nothrow_move_constructible<__node_allocator>::value &&
-            is_nothrow_move_constructible<value_compare>::value);
-    __tree(__tree&& __t, const allocator_type& __a);
-    __tree& operator=(__tree&& __t)
-        _NOEXCEPT_(
-            __node_traits::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<value_compare>::value &&
-            is_nothrow_move_assignable<__node_allocator>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    ~__tree();
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin()  _NOEXCEPT {return       iterator(__begin_node());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return const_iterator(__begin_node());}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT {return       iterator(__end_node());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT {return const_iterator(__end_node());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-        {return __node_traits::max_size(__node_alloc());}
-
-    void clear() _NOEXCEPT;
-
-    void swap(__tree& __t)
-        _NOEXCEPT_(
-            __is_nothrow_swappable<value_compare>::value &&
-            (!__node_traits::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<__node_allocator>::value));
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        pair<iterator, bool>
-        __emplace_unique(_Args&&... __args);
-    template <class... _Args>
-        iterator
-        __emplace_multi(_Args&&... __args);
-
-    template <class... _Args>
-        iterator
-        __emplace_hint_unique(const_iterator __p, _Args&&... __args);
-    template <class... _Args>
-        iterator
-        __emplace_hint_multi(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Vp>
-        pair<iterator, bool> __insert_unique(_Vp&& __v);
-    template <class _Vp>
-        iterator __insert_unique(const_iterator __p, _Vp&& __v);
-    template <class _Vp>
-        iterator __insert_multi(_Vp&& __v);
-    template <class _Vp>
-        iterator __insert_multi(const_iterator __p, _Vp&& __v);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    pair<iterator, bool> __insert_unique(const value_type& __v);
-    iterator __insert_unique(const_iterator __p, const value_type& __v);
-    iterator __insert_multi(const value_type& __v);
-    iterator __insert_multi(const_iterator __p, const value_type& __v);
-
-    pair<iterator, bool> __node_insert_unique(__node_pointer __nd);
-    iterator             __node_insert_unique(const_iterator __p,
-                                              __node_pointer __nd);
-
-    iterator __node_insert_multi(__node_pointer __nd);
-    iterator __node_insert_multi(const_iterator __p, __node_pointer __nd);
-
-    iterator erase(const_iterator __p);
-    iterator erase(const_iterator __f, const_iterator __l);
-    template <class _Key>
-        size_type __erase_unique(const _Key& __k);
-    template <class _Key>
-        size_type __erase_multi(const _Key& __k);
-
-    void __insert_node_at(__node_base_pointer __parent,
-                          __node_base_pointer& __child,
-                          __node_base_pointer __new_node);
-
-    template <class _Key>
-        iterator find(const _Key& __v);
-    template <class _Key>
-        const_iterator find(const _Key& __v) const;
-
-    template <class _Key>
-        size_type __count_unique(const _Key& __k) const;
-    template <class _Key>
-        size_type __count_multi(const _Key& __k) const;
-
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator lower_bound(const _Key& __v)
-            {return __lower_bound(__v, __root(), __end_node());}
-    template <class _Key>
-        iterator __lower_bound(const _Key& __v,
-                               __node_pointer __root,
-                               __node_pointer __result);
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        const_iterator lower_bound(const _Key& __v) const
-            {return __lower_bound(__v, __root(), __end_node());}
-    template <class _Key>
-        const_iterator __lower_bound(const _Key& __v,
-                                     __node_const_pointer __root,
-                                     __node_const_pointer __result) const;
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator upper_bound(const _Key& __v)
-            {return __upper_bound(__v, __root(), __end_node());}
-    template <class _Key>
-        iterator __upper_bound(const _Key& __v,
-                               __node_pointer __root,
-                               __node_pointer __result);
-    template <class _Key>
-        _LIBCPP_INLINE_VISIBILITY
-        const_iterator upper_bound(const _Key& __v) const
-            {return __upper_bound(__v, __root(), __end_node());}
-    template <class _Key>
-        const_iterator __upper_bound(const _Key& __v,
-                                     __node_const_pointer __root,
-                                     __node_const_pointer __result) const;
-    template <class _Key>
-        pair<iterator, iterator>
-        __equal_range_unique(const _Key& __k);
-    template <class _Key>
-        pair<const_iterator, const_iterator>
-        __equal_range_unique(const _Key& __k) const;
-
-    template <class _Key>
-        pair<iterator, iterator>
-        __equal_range_multi(const _Key& __k);
-    template <class _Key>
-        pair<const_iterator, const_iterator>
-        __equal_range_multi(const _Key& __k) const;
-
-    typedef __tree_node_destructor<__node_allocator> _Dp;
-    typedef unique_ptr<__node, _Dp> __node_holder;
-
-    __node_holder remove(const_iterator __p) _NOEXCEPT;
-private:
-    typename __node_base::pointer&
-        __find_leaf_low(typename __node_base::pointer& __parent, const value_type& __v);
-    typename __node_base::pointer&
-        __find_leaf_high(typename __node_base::pointer& __parent, const value_type& __v);
-    typename __node_base::pointer&
-        __find_leaf(const_iterator __hint,
-                    typename __node_base::pointer& __parent, const value_type& __v);
-    template <class _Key>
-        typename __node_base::pointer&
-        __find_equal(typename __node_base::pointer& __parent, const _Key& __v);
-    template <class _Key>
-        typename __node_base::pointer&
-        __find_equal(const_iterator __hint, typename __node_base::pointer& __parent,
-                     const _Key& __v);
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class ..._Args>
-        __node_holder __construct_node(_Args&& ...__args);
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-        __node_holder __construct_node(const value_type& __v);
-#endif
-
-    void destroy(__node_pointer __nd) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __tree& __t)
-        {__copy_assign_alloc(__t, integral_constant<bool,
-             __node_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __tree& __t, true_type)
-        {__node_alloc() = __t.__node_alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __tree& __t, false_type) {}
-
-    void __move_assign(__tree& __t, false_type);
-    void __move_assign(__tree& __t, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<value_compare>::value &&
-                   is_nothrow_move_assignable<__node_allocator>::value);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__tree& __t)
-        _NOEXCEPT_(
-            !__node_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<__node_allocator>::value)
-        {__move_assign_alloc(__t, integral_constant<bool,
-             __node_traits::propagate_on_container_move_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__tree& __t, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value)
-        {__node_alloc() = _VSTD::move(__t.__node_alloc());}
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__tree& __t, false_type) _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y)
-        _NOEXCEPT_(
-            !__node_traits::propagate_on_container_swap::value ||
-            __is_nothrow_swappable<__node_allocator>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __node_traits::propagate_on_container_swap::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<__node_allocator>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y, false_type)
-        _NOEXCEPT
-        {}
-
-    __node_pointer __detach();
-    static __node_pointer __detach(__node_pointer);
-
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-};
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(const value_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<__node_allocator>::value &&
-            is_nothrow_copy_constructible<value_compare>::value)
-    : __pair3_(0, __comp)
-{
-    __begin_node() = __end_node();
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(const allocator_type& __a)
-    : __pair1_(__node_allocator(__a)),
-      __begin_node_(__node_pointer()),
-      __pair3_(0)
-{
-    __begin_node() = __end_node();
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(const value_compare& __comp,
-                                           const allocator_type& __a)
-    : __pair1_(__node_allocator(__a)),
-      __begin_node_(__node_pointer()),
-      __pair3_(0, __comp)
-{
-    __begin_node() = __end_node();
-}
-
-// Precondition:  size() != 0
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_pointer
-__tree<_Tp, _Compare, _Allocator>::__detach()
-{
-    __node_pointer __cache = __begin_node();
-    __begin_node() = __end_node();
-    __end_node()->__left_->__parent_ = nullptr;
-    __end_node()->__left_ = nullptr;
-    size() = 0;
-    // __cache->__left_ == nullptr
-    if (__cache->__right_ != nullptr)
-        __cache = static_cast<__node_pointer>(__cache->__right_);
-    // __cache->__left_ == nullptr
-    // __cache->__right_ == nullptr
-    return __cache;
-}
-
-// Precondition:  __cache != nullptr
-//    __cache->left_ == nullptr
-//    __cache->right_ == nullptr
-//    This is no longer a red-black tree
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_pointer
-__tree<_Tp, _Compare, _Allocator>::__detach(__node_pointer __cache)
-{
-    if (__cache->__parent_ == nullptr)
-        return nullptr;
-    if (__tree_is_left_child(static_cast<__node_base_pointer>(__cache)))
-    {
-        __cache->__parent_->__left_ = nullptr;
-        __cache = static_cast<__node_pointer>(__cache->__parent_);
-        if (__cache->__right_ == nullptr)
-            return __cache;
-        return static_cast<__node_pointer>(__tree_leaf(__cache->__right_));
-    }
-    // __cache is right child
-    __cache->__parent_->__right_ = nullptr;
-    __cache = static_cast<__node_pointer>(__cache->__parent_);
-    if (__cache->__left_ == nullptr)
-        return __cache;
-    return static_cast<__node_pointer>(__tree_leaf(__cache->__left_));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>&
-__tree<_Tp, _Compare, _Allocator>::operator=(const __tree& __t)
-{
-    if (this != &__t)
-    {
-        value_comp() = __t.value_comp();
-        __copy_assign_alloc(__t);
-        __assign_multi(__t.begin(), __t.end());
-    }
-    return *this;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _InputIterator>
-void
-__tree<_Tp, _Compare, _Allocator>::__assign_unique(_InputIterator __first, _InputIterator __last)
-{
-    if (size() != 0)
-    {
-        __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __cache != nullptr && __first != __last; ++__first)
-            {
-                __cache->__value_ = *__first;
-                __node_pointer __next = __detach(__cache);
-                __node_insert_unique(__cache);
-                __cache = __next;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (__cache->__parent_ != nullptr)
-                __cache = static_cast<__node_pointer>(__cache->__parent_);
-            destroy(__cache);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if (__cache != nullptr)
-        {
-            while (__cache->__parent_ != nullptr)
-                __cache = static_cast<__node_pointer>(__cache->__parent_);
-            destroy(__cache);
-        }
-    }
-    for (; __first != __last; ++__first)
-        __insert_unique(*__first);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _InputIterator>
-void
-__tree<_Tp, _Compare, _Allocator>::__assign_multi(_InputIterator __first, _InputIterator __last)
-{
-    if (size() != 0)
-    {
-        __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __cache != nullptr && __first != __last; ++__first)
-            {
-                __cache->__value_ = *__first;
-                __node_pointer __next = __detach(__cache);
-                __node_insert_multi(__cache);
-                __cache = __next;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (__cache->__parent_ != nullptr)
-                __cache = static_cast<__node_pointer>(__cache->__parent_);
-            destroy(__cache);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if (__cache != nullptr)
-        {
-            while (__cache->__parent_ != nullptr)
-                __cache = static_cast<__node_pointer>(__cache->__parent_);
-            destroy(__cache);
-        }
-    }
-    for (; __first != __last; ++__first)
-        __insert_multi(*__first);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(const __tree& __t)
-    : __begin_node_(__node_pointer()),
-      __pair1_(__node_traits::select_on_container_copy_construction(__t.__node_alloc())),
-      __pair3_(0, __t.value_comp())
-{
-    __begin_node() = __end_node();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t)
-    _NOEXCEPT_(
-        is_nothrow_move_constructible<__node_allocator>::value &&
-        is_nothrow_move_constructible<value_compare>::value)
-    : __begin_node_(_VSTD::move(__t.__begin_node_)),
-      __pair1_(_VSTD::move(__t.__pair1_)),
-      __pair3_(_VSTD::move(__t.__pair3_))
-{
-    if (size() == 0)
-        __begin_node() = __end_node();
-    else
-    {
-        __end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__end_node());
-        __t.__begin_node() = __t.__end_node();
-        __t.__end_node()->__left_ = nullptr;
-        __t.size() = 0;
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::__tree(__tree&& __t, const allocator_type& __a)
-    : __pair1_(__node_allocator(__a)),
-      __pair3_(0, _VSTD::move(__t.value_comp()))
-{
-    if (__a == __t.__alloc())
-    {
-        if (__t.size() == 0)
-            __begin_node() = __end_node();
-        else
-        {
-            __begin_node() = __t.__begin_node();
-            __end_node()->__left_ = __t.__end_node()->__left_;
-            __end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__end_node());
-            size() = __t.size();
-            __t.__begin_node() = __t.__end_node();
-            __t.__end_node()->__left_ = nullptr;
-            __t.size() = 0;
-        }
-    }
-    else
-    {
-        __begin_node() = __end_node();
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<value_compare>::value &&
-               is_nothrow_move_assignable<__node_allocator>::value)
-{
-    destroy(static_cast<__node_pointer>(__end_node()->__left_));
-    __begin_node_ = __t.__begin_node_;
-    __pair1_.first() = __t.__pair1_.first();
-    __move_assign_alloc(__t);
-    __pair3_ = _VSTD::move(__t.__pair3_);
-    if (size() == 0)
-        __begin_node() = __end_node();
-    else
-    {
-        __end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__end_node());
-        __t.__begin_node() = __t.__end_node();
-        __t.__end_node()->__left_ = nullptr;
-        __t.size() = 0;
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::__move_assign(__tree& __t, false_type)
-{
-    if (__node_alloc() == __t.__node_alloc())
-        __move_assign(__t, true_type());
-    else
-    {
-        value_comp() = _VSTD::move(__t.value_comp());
-        const_iterator __e = end();
-        if (size() != 0)
-        {
-            __node_pointer __cache = __detach();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            try
-            {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                while (__cache != nullptr && __t.size() != 0)
-                {
-                    __cache->__value_ = _VSTD::move(__t.remove(__t.begin())->__value_);
-                    __node_pointer __next = __detach(__cache);
-                    __node_insert_multi(__cache);
-                    __cache = __next;
-                }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            }
-            catch (...)
-            {
-                while (__cache->__parent_ != nullptr)
-                    __cache = static_cast<__node_pointer>(__cache->__parent_);
-                destroy(__cache);
-                throw;
-            }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            if (__cache != nullptr)
-            {
-                while (__cache->__parent_ != nullptr)
-                    __cache = static_cast<__node_pointer>(__cache->__parent_);
-                destroy(__cache);
-            }
-        }
-        while (__t.size() != 0)
-            __insert_multi(__e, _VSTD::move(__t.remove(__t.begin())->__value_));
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>&
-__tree<_Tp, _Compare, _Allocator>::operator=(__tree&& __t)
-    _NOEXCEPT_(
-        __node_traits::propagate_on_container_move_assignment::value &&
-        is_nothrow_move_assignable<value_compare>::value &&
-        is_nothrow_move_assignable<__node_allocator>::value)
-        
-{
-    __move_assign(__t, integral_constant<bool,
-                  __node_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Compare, class _Allocator>
-__tree<_Tp, _Compare, _Allocator>::~__tree()
-{
-    destroy(__root());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::destroy(__node_pointer __nd) _NOEXCEPT
-{
-    if (__nd != nullptr)
-    {
-        destroy(static_cast<__node_pointer>(__nd->__left_));
-        destroy(static_cast<__node_pointer>(__nd->__right_));
-        __node_allocator& __na = __node_alloc();
-        __node_traits::destroy(__na, _VSTD::addressof(__nd->__value_));
-        __node_traits::deallocate(__na, __nd, 1);
-    }
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::swap(__tree& __t)
-    _NOEXCEPT_(
-        __is_nothrow_swappable<value_compare>::value &&
-        (!__node_traits::propagate_on_container_swap::value ||
-         __is_nothrow_swappable<__node_allocator>::value))
-{
-    using _VSTD::swap;
-    swap(__begin_node_, __t.__begin_node_);
-    swap(__pair1_.first(), __t.__pair1_.first());
-    __swap_alloc(__node_alloc(), __t.__node_alloc());
-    __pair3_.swap(__t.__pair3_);
-    if (size() == 0)
-        __begin_node() = __end_node();
-    else
-        __end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__end_node());
-    if (__t.size() == 0)
-        __t.__begin_node() = __t.__end_node();
-    else
-        __t.__end_node()->__left_->__parent_ = static_cast<__node_base_pointer>(__t.__end_node());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::clear() _NOEXCEPT
-{
-    destroy(__root());
-    size() = 0;
-    __begin_node() = __end_node();
-    __end_node()->__left_ = nullptr;
-}
-
-// Find lower_bound place to insert
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_leaf_low(typename __node_base::pointer& __parent,
-                                                   const value_type& __v)
-{
-    __node_pointer __nd = __root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (value_comp()(__nd->__value_, __v))
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__right_;
-                }
-            }
-            else
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__left_;
-                }
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__end_node());
-    return __parent->__left_;
-}
-
-// Find upper_bound place to insert
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_leaf_high(typename __node_base::pointer& __parent,
-                                                    const value_type& __v)
-{
-    __node_pointer __nd = __root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (value_comp()(__v, __nd->__value_))
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__left_;
-                }
-            }
-            else
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__right_;
-                }
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__end_node());
-    return __parent->__left_;
-}
-
-// Find leaf place to insert closest to __hint
-// First check prior to __hint.
-// Next check after __hint.
-// Next do O(log N) search.
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_leaf(const_iterator __hint,
-                                               typename __node_base::pointer& __parent,
-                                               const value_type& __v)
-{
-    if (__hint == end() || !value_comp()(*__hint, __v))  // check before
-    {
-        // __v <= *__hint
-        const_iterator __prior = __hint;
-        if (__prior == begin() || !value_comp()(__v, *--__prior))
-        {
-            // *prev(__hint) <= __v <= *__hint
-            if (__hint.__ptr_->__left_ == nullptr)
-            {
-                __parent = static_cast<__node_base_pointer>(__hint.__ptr_);
-                return __parent->__left_;
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__prior.__ptr_);
-                return __parent->__right_;
-            }
-        }
-        // __v < *prev(__hint)
-        return __find_leaf_high(__parent, __v);
-    }
-    // else __v > *__hint
-    return __find_leaf_low(__parent, __v);
-}
-
-// Find place to insert if __v doesn't exist
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-// If __v exists, set parent to node of __v and return reference to node of __v
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_equal(typename __node_base::pointer& __parent,
-                                                const _Key& __v)
-{
-    __node_pointer __nd = __root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (value_comp()(__v, __nd->__value_))
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__left_;
-                }
-            }
-            else if (value_comp()(__nd->__value_, __v))
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__right_;
-                }
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__nd);
-                return __parent;
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__end_node());
-    return __parent->__left_;
-}
-
-// Find place to insert if __v doesn't exist
-// First check prior to __hint.
-// Next check after __hint.
-// Next do O(log N) search.
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-// If __v exists, set parent to node of __v and return reference to node of __v
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::__node_base::pointer&
-__tree<_Tp, _Compare, _Allocator>::__find_equal(const_iterator __hint,
-                                                typename __node_base::pointer& __parent,
-                                                const _Key& __v)
-{
-    if (__hint == end() || value_comp()(__v, *__hint))  // check before
-    {
-        // __v < *__hint
-        const_iterator __prior = __hint;
-        if (__prior == begin() || value_comp()(*--__prior, __v))
-        {
-            // *prev(__hint) < __v < *__hint
-            if (__hint.__ptr_->__left_ == nullptr)
-            {
-                __parent = static_cast<__node_base_pointer>(__hint.__ptr_);
-                return __parent->__left_;
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__prior.__ptr_);
-                return __parent->__right_;
-            }
-        }
-        // __v <= *prev(__hint)
-        return __find_equal(__parent, __v);
-    }
-    else if (value_comp()(*__hint, __v))  // check after
-    {
-        // *__hint < __v
-        const_iterator __next = _VSTD::next(__hint);
-        if (__next == end() || value_comp()(__v, *__next))
-        {
-            // *__hint < __v < *_VSTD::next(__hint)
-            if (__hint.__ptr_->__right_ == nullptr)
-            {
-                __parent = static_cast<__node_base_pointer>(__hint.__ptr_);
-                return __parent->__right_;
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__next.__ptr_);
-                return __parent->__left_;
-            }
-        }
-        // *next(__hint) <= __v
-        return __find_equal(__parent, __v);
-    }
-    // else __v == *__hint
-    __parent = static_cast<__node_base_pointer>(__hint.__ptr_);
-    return __parent;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-void
-__tree<_Tp, _Compare, _Allocator>::__insert_node_at(__node_base_pointer __parent,
-                                                    __node_base_pointer& __child,
-                                                    __node_base_pointer __new_node)
-{
-    __new_node->__left_   = nullptr;
-    __new_node->__right_  = nullptr;
-    __new_node->__parent_ = __parent;
-    __child = __new_node;
-    if (__begin_node()->__left_ != nullptr)
-        __begin_node() = static_cast<__node_pointer>(__begin_node()->__left_);
-    __tree_balance_after_insert(__end_node()->__left_, __child);
-    ++size();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-typename __tree<_Tp, _Compare, _Allocator>::__node_holder
-__tree<_Tp, _Compare, _Allocator>::__construct_node(_Args&& ...__args)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__value_constructed = true;
-    return __h;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class... _Args>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>
-__tree<_Tp, _Compare, _Allocator>::__emplace_unique(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__parent, __h->__value_);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    bool __inserted = false;
-    if (__child == nullptr)
-    {
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-        __inserted = true;
-    }
-    return pair<iterator, bool>(iterator(__r), __inserted);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class... _Args>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__emplace_hint_unique(const_iterator __p, _Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__p, __parent, __h->__value_);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class... _Args>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__emplace_multi(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf_high(__parent, __h->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(static_cast<__node_pointer>(__h.release()));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class... _Args>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__emplace_hint_multi(const_iterator __p,
-                                                        _Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf(__p, __parent, __h->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(static_cast<__node_pointer>(__h.release()));
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Vp>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>
-__tree<_Tp, _Compare, _Allocator>::__insert_unique(_Vp&& __v)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Vp>(__v));
-    pair<iterator, bool> __r = __node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Vp>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_unique(const_iterator __p, _Vp&& __v)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Vp>(__v));
-    iterator __r = __node_insert_unique(__p, __h.get());
-    if (__r.__ptr_ == __h.get())
-        __h.release();
-    return __r;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Vp>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_multi(_Vp&& __v)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Vp>(__v));
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf_high(__parent, __h->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(__h.release());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Vp>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_multi(const_iterator __p, _Vp&& __v)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Vp>(__v));
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf(__p, __parent, __h->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(__h.release());
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_holder
-__tree<_Tp, _Compare, _Allocator>::__construct_node(const value_type& __v)
-{
-    __node_allocator& __na = __node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), __v);
-    __h.get_deleter().__value_constructed = true;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Compare, class _Allocator>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>
-__tree<_Tp, _Compare, _Allocator>::__insert_unique(const value_type& __v)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__parent, __v);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    bool __inserted = false;
-    if (__child == nullptr)
-    {
-        __node_holder __h = __construct_node(__v);
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-        __inserted = true;
-    }
-    return pair<iterator, bool>(iterator(__r), __inserted);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_unique(const_iterator __p, const value_type& __v)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__p, __parent, __v);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __node_holder __h = __construct_node(__v);
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_multi(const value_type& __v)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf_high(__parent, __v);
-    __node_holder __h = __construct_node(__v);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(__h.release());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__insert_multi(const_iterator __p, const value_type& __v)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf(__p, __parent, __v);
-    __node_holder __h = __construct_node(__v);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-    return iterator(__h.release());
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator, bool>
-__tree<_Tp, _Compare, _Allocator>::__node_insert_unique(__node_pointer __nd)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__parent, __nd->__value_);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    bool __inserted = false;
-    if (__child == nullptr)
-    {
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
-        __r = __nd;
-        __inserted = true;
-    }
-    return pair<iterator, bool>(iterator(__r), __inserted);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__node_insert_unique(const_iterator __p,
-                                                        __node_pointer __nd)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal(__p, __parent, __nd->__value_);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
-        __r = __nd;
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__node_insert_multi(__node_pointer __nd)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf_high(__parent, __nd->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
-    return iterator(__nd);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__node_insert_multi(const_iterator __p,
-                                                       __node_pointer __nd)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_leaf(__p, __parent, __nd->__value_);
-    __insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__nd));
-    return iterator(__nd);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::erase(const_iterator __p)
-{
-    __node_pointer __np = __p.__ptr_;
-    iterator __r(__np);
-    ++__r;
-    if (__begin_node() == __np)
-        __begin_node() = __r.__ptr_;
-    --size();
-    __node_allocator& __na = __node_alloc();
-    __tree_remove(__end_node()->__left_,
-                  static_cast<__node_base_pointer>(__np));
-    __node_traits::destroy(__na, const_cast<value_type*>(_VSTD::addressof(*__p)));
-    __node_traits::deallocate(__na, __np, 1);
-    return __r;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::erase(const_iterator __f, const_iterator __l)
-{
-    while (__f != __l)
-        __f = erase(__f);
-    return iterator(__l.__ptr_);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
-__tree<_Tp, _Compare, _Allocator>::__erase_unique(const _Key& __k)
-{
-    iterator __i = find(__k);
-    if (__i == end())
-        return 0;
-    erase(__i);
-    return 1;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
-__tree<_Tp, _Compare, _Allocator>::__erase_multi(const _Key& __k)
-{
-    pair<iterator, iterator> __p = __equal_range_multi(__k);
-    size_type __r = 0;
-    for (; __p.first != __p.second; ++__r)
-        __p.first = erase(__p.first);
-    return __r;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::find(const _Key& __v)
-{
-    iterator __p = __lower_bound(__v, __root(), __end_node());
-    if (__p != end() && !value_comp()(__v, *__p))
-        return __p;
-    return end();
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::const_iterator
-__tree<_Tp, _Compare, _Allocator>::find(const _Key& __v) const
-{
-    const_iterator __p = __lower_bound(__v, __root(), __end_node());
-    if (__p != end() && !value_comp()(__v, *__p))
-        return __p;
-    return end();
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
-__tree<_Tp, _Compare, _Allocator>::__count_unique(const _Key& __k) const
-{
-    __node_const_pointer __result = __end_node();
-    __node_const_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_const_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_const_pointer>(__rt->__right_);
-        else
-            return 1;
-    }
-    return 0;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::size_type
-__tree<_Tp, _Compare, _Allocator>::__count_multi(const _Key& __k) const
-{
-    __node_const_pointer __result = __end_node();
-    __node_const_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_const_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_const_pointer>(__rt->__right_);
-        else
-            return _VSTD::distance(
-                __lower_bound(__k, static_cast<__node_const_pointer>(__rt->__left_), __rt),
-                __upper_bound(__k, static_cast<__node_const_pointer>(__rt->__right_), __result)
-            );
-    }
-    return 0;
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__lower_bound(const _Key& __v,
-                                                 __node_pointer __root,
-                                                 __node_pointer __result)
-{
-    while (__root != nullptr)
-    {
-        if (!value_comp()(__root->__value_, __v))
-        {
-            __result = __root;
-            __root = static_cast<__node_pointer>(__root->__left_);
-        }
-        else
-            __root = static_cast<__node_pointer>(__root->__right_);
-    }
-    return iterator(__result);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::const_iterator
-__tree<_Tp, _Compare, _Allocator>::__lower_bound(const _Key& __v,
-                                                 __node_const_pointer __root,
-                                                 __node_const_pointer __result) const
-{
-    while (__root != nullptr)
-    {
-        if (!value_comp()(__root->__value_, __v))
-        {
-            __result = __root;
-            __root = static_cast<__node_const_pointer>(__root->__left_);
-        }
-        else
-            __root = static_cast<__node_const_pointer>(__root->__right_);
-    }
-    return const_iterator(__result);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::iterator
-__tree<_Tp, _Compare, _Allocator>::__upper_bound(const _Key& __v,
-                                                 __node_pointer __root,
-                                                 __node_pointer __result)
-{
-    while (__root != nullptr)
-    {
-        if (value_comp()(__v, __root->__value_))
-        {
-            __result = __root;
-            __root = static_cast<__node_pointer>(__root->__left_);
-        }
-        else
-            __root = static_cast<__node_pointer>(__root->__right_);
-    }
-    return iterator(__result);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-typename __tree<_Tp, _Compare, _Allocator>::const_iterator
-__tree<_Tp, _Compare, _Allocator>::__upper_bound(const _Key& __v,
-                                                 __node_const_pointer __root,
-                                                 __node_const_pointer __result) const
-{
-    while (__root != nullptr)
-    {
-        if (value_comp()(__v, __root->__value_))
-        {
-            __result = __root;
-            __root = static_cast<__node_const_pointer>(__root->__left_);
-        }
-        else
-            __root = static_cast<__node_const_pointer>(__root->__right_);
-    }
-    return const_iterator(__result);
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::iterator>
-__tree<_Tp, _Compare, _Allocator>::__equal_range_unique(const _Key& __k)
-{
-    typedef pair<iterator, iterator> _Pp;
-    __node_pointer __result = __end_node();
-    __node_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_pointer>(__rt->__right_);
-        else
-            return _Pp(iterator(__rt),
-                      iterator(
-                          __rt->__right_ != nullptr ?
-                              static_cast<__node_pointer>(__tree_min(__rt->__right_))
-                            : __result));
-    }
-    return _Pp(iterator(__result), iterator(__result));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::const_iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::const_iterator>
-__tree<_Tp, _Compare, _Allocator>::__equal_range_unique(const _Key& __k) const
-{
-    typedef pair<const_iterator, const_iterator> _Pp;
-    __node_const_pointer __result = __end_node();
-    __node_const_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_const_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_const_pointer>(__rt->__right_);
-        else
-            return _Pp(const_iterator(__rt),
-                      const_iterator(
-                          __rt->__right_ != nullptr ?
-                              static_cast<__node_const_pointer>(__tree_min(__rt->__right_))
-                            : __result));
-    }
-    return _Pp(const_iterator(__result), const_iterator(__result));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::iterator>
-__tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k)
-{
-    typedef pair<iterator, iterator> _Pp;
-    __node_pointer __result = __end_node();
-    __node_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_pointer>(__rt->__right_);
-        else
-            return _Pp(__lower_bound(__k, static_cast<__node_pointer>(__rt->__left_), __rt),
-                      __upper_bound(__k, static_cast<__node_pointer>(__rt->__right_), __result));
-    }
-    return _Pp(iterator(__result), iterator(__result));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-template <class _Key>
-pair<typename __tree<_Tp, _Compare, _Allocator>::const_iterator,
-     typename __tree<_Tp, _Compare, _Allocator>::const_iterator>
-__tree<_Tp, _Compare, _Allocator>::__equal_range_multi(const _Key& __k) const
-{
-    typedef pair<const_iterator, const_iterator> _Pp;
-    __node_const_pointer __result = __end_node();
-    __node_const_pointer __rt = __root();
-    while (__rt != nullptr)
-    {
-        if (value_comp()(__k, __rt->__value_))
-        {
-            __result = __rt;
-            __rt = static_cast<__node_const_pointer>(__rt->__left_);
-        }
-        else if (value_comp()(__rt->__value_, __k))
-            __rt = static_cast<__node_const_pointer>(__rt->__right_);
-        else
-            return _Pp(__lower_bound(__k, static_cast<__node_const_pointer>(__rt->__left_), __rt),
-                      __upper_bound(__k, static_cast<__node_const_pointer>(__rt->__right_), __result));
-    }
-    return _Pp(const_iterator(__result), const_iterator(__result));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-typename __tree<_Tp, _Compare, _Allocator>::__node_holder
-__tree<_Tp, _Compare, _Allocator>::remove(const_iterator __p) _NOEXCEPT
-{
-    __node_pointer __np = __p.__ptr_;
-    if (__begin_node() == __np)
-    {
-        if (__np->__right_ != nullptr)
-            __begin_node() = static_cast<__node_pointer>(__np->__right_);
-        else
-            __begin_node() = static_cast<__node_pointer>(__np->__parent_);
-    }
-    --size();
-    __tree_remove(__end_node()->__left_,
-                  static_cast<__node_base_pointer>(__np));
-    return __node_holder(__np, _Dp(__node_alloc()));
-}
-
-template <class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__tree<_Tp, _Compare, _Allocator>& __x,
-     __tree<_Tp, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___TREE
diff --git a/include.new/c++/v1/tr1/__tuple b/include.new/c++/v1/tr1/__tuple
deleted file mode 100644
index bffb95c..0000000
--- a/include.new/c++/v1/tr1/__tuple
+++ /dev/null
@@ -1,361 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___TUPLE
-#define _LIBCPP___TUPLE
-
-#include <__config>
-#include <cstddef>
-#include <type_traits>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-#include <__tuple_03>
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// __lazy_and
-
-template <bool _Last, class ..._Preds>
-struct __lazy_and_impl;
-
-template <class ..._Preds>
-struct __lazy_and_impl<false, _Preds...> : false_type {};
-
-template <>
-struct __lazy_and_impl<true> : true_type {};
-
-template <class _Pred>
-struct __lazy_and_impl<true, _Pred> : integral_constant<bool, _Pred::type::value> {};
-
-template <class _Hp, class ..._Tp>
-struct __lazy_and_impl<true, _Hp, _Tp...> : __lazy_and_impl<_Hp::type::value, _Tp...> {};
-
-template <class _P1, class ..._Pr>
-struct __lazy_and : __lazy_and_impl<_P1::type::value, _Pr...> {};
-
-// __lazy_not
-
-template <class _Pred>
-struct __lazy_not : integral_constant<bool, !_Pred::type::value> {};
-
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size;
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<const _Tp>
-    : public tuple_size<_Tp> {};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<volatile _Tp>
-    : public tuple_size<_Tp> {};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<const volatile _Tp>
-    : public tuple_size<_Tp> {};
-
-template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_element;
-
-template <size_t _Ip, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, const _Tp>
-{
-public:
-    typedef typename add_const<typename tuple_element<_Ip, _Tp>::type>::type type;
-};
-
-template <size_t _Ip, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, volatile _Tp>
-{
-public:
-    typedef typename add_volatile<typename tuple_element<_Ip, _Tp>::type>::type type;
-};
-
-template <size_t _Ip, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, const volatile _Tp>
-{
-public:
-    typedef typename add_cv<typename tuple_element<_Ip, _Tp>::type>::type type;
-};
-
-template <class ..._Tp> class _LIBCPP_TYPE_VIS_ONLY tuple;
-template <class _T1, class _T2> struct _LIBCPP_TYPE_VIS_ONLY pair;
-template <class _Tp, size_t _Size> struct _LIBCPP_TYPE_VIS_ONLY array;
-
-template <class _Tp> struct __tuple_like : false_type {};
-
-template <class _Tp> struct __tuple_like<const _Tp> : public __tuple_like<_Tp> {};
-template <class _Tp> struct __tuple_like<volatile _Tp> : public __tuple_like<_Tp> {};
-template <class _Tp> struct __tuple_like<const volatile _Tp> : public __tuple_like<_Tp> {};
-
-template <class... _Tp> struct __tuple_like<tuple<_Tp...> > : true_type {};
-template <class _T1, class _T2> struct __tuple_like<pair<_T1, _T2> > : true_type {};
-template <class _Tp, size_t _Size> struct __tuple_like<array<_Tp, _Size> > : true_type {};
-
-template <size_t _Ip, class ..._Tp>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, tuple<_Tp...> >::type&
-get(tuple<_Tp...>&) _NOEXCEPT;
-
-template <size_t _Ip, class ..._Tp>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const typename tuple_element<_Ip, tuple<_Tp...> >::type&
-get(const tuple<_Tp...>&) _NOEXCEPT;
-
-template <size_t _Ip, class ..._Tp>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, tuple<_Tp...> >::type&&
-get(tuple<_Tp...>&&) _NOEXCEPT;
-
-template <size_t _Ip, class _T1, class _T2>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-get(pair<_T1, _T2>&) _NOEXCEPT;
-
-template <size_t _Ip, class _T1, class _T2>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-get(const pair<_T1, _T2>&) _NOEXCEPT;
-
-template <size_t _Ip, class _T1, class _T2>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
-get(pair<_T1, _T2>&&) _NOEXCEPT;
-
-template <size_t _Ip, class _Tp, size_t _Size>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&
-get(array<_Tp, _Size>&) _NOEXCEPT;
-
-template <size_t _Ip, class _Tp, size_t _Size>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-get(const array<_Tp, _Size>&) _NOEXCEPT;
-
-template <size_t _Ip, class _Tp, size_t _Size>
-_LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&&
-get(array<_Tp, _Size>&&) _NOEXCEPT;
-
-// __make_tuple_indices
-
-template <size_t...> struct __tuple_indices {};
-
-template <size_t _Sp, class _IntTuple, size_t _Ep>
-struct __make_indices_imp;
-
-template <size_t _Sp, size_t ..._Indices, size_t _Ep>
-struct __make_indices_imp<_Sp, __tuple_indices<_Indices...>, _Ep>
-{
-    typedef typename __make_indices_imp<_Sp+1, __tuple_indices<_Indices..., _Sp>, _Ep>::type type;
-};
-
-template <size_t _Ep, size_t ..._Indices>
-struct __make_indices_imp<_Ep, __tuple_indices<_Indices...>, _Ep>
-{
-    typedef __tuple_indices<_Indices...> type;
-};
-
-template <size_t _Ep, size_t _Sp = 0>
-struct __make_tuple_indices
-{
-    static_assert(_Sp <= _Ep, "__make_tuple_indices input error");
-    typedef typename __make_indices_imp<_Sp, __tuple_indices<>, _Ep>::type type;
-};
-
-// __tuple_types
-
-template <class ..._Tp> struct __tuple_types {};
-
-template <size_t _Ip>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, __tuple_types<> >
-{
-public:
-    static_assert(_Ip == 0, "tuple_element index out of range");
-    static_assert(_Ip != 0, "tuple_element index out of range");
-};
-
-template <class _Hp, class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<0, __tuple_types<_Hp, _Tp...> >
-{
-public:
-    typedef _Hp type;
-};
-
-template <size_t _Ip, class _Hp, class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, __tuple_types<_Hp, _Tp...> >
-{
-public:
-    typedef typename tuple_element<_Ip-1, __tuple_types<_Tp...> >::type type;
-};
-
-template <class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<__tuple_types<_Tp...> >
-    : public integral_constant<size_t, sizeof...(_Tp)>
-{
-};
-
-template <class... _Tp> struct __tuple_like<__tuple_types<_Tp...> > : true_type {};
-
-// __make_tuple_types
-
-// __make_tuple_types<_Tuple<_Types...>, _Ep, _Sp>::type is a
-// __tuple_types<_Types...> using only those _Types in the range [_Sp, _Ep).
-// _Sp defaults to 0 and _Ep defaults to tuple_size<_Tuple>.  If _Tuple is a
-// lvalue_reference type, then __tuple_types<_Types&...> is the result.
-
-template <class _TupleTypes, class _Tp, size_t _Sp, size_t _Ep>
-struct __make_tuple_types_imp;
-
-template <class ..._Types, class _Tp, size_t _Sp, size_t _Ep>
-struct __make_tuple_types_imp<__tuple_types<_Types...>, _Tp, _Sp, _Ep>
-{
-    typedef typename remove_reference<_Tp>::type _Tpr;
-    typedef typename __make_tuple_types_imp<__tuple_types<_Types...,
-                                            typename conditional<is_lvalue_reference<_Tp>::value,
-                                                typename tuple_element<_Sp, _Tpr>::type&,
-                                                typename tuple_element<_Sp, _Tpr>::type>::type>,
-                                            _Tp, _Sp+1, _Ep>::type type;
-};
-
-template <class ..._Types, class _Tp, size_t _Ep>
-struct __make_tuple_types_imp<__tuple_types<_Types...>, _Tp, _Ep, _Ep>
-{
-    typedef __tuple_types<_Types...> type;
-};
-
-template <class _Tp, size_t _Ep = tuple_size<typename remove_reference<_Tp>::type>::value, size_t _Sp = 0>
-struct __make_tuple_types
-{
-    static_assert(_Sp <= _Ep, "__make_tuple_types input error");
-    typedef typename __make_tuple_types_imp<__tuple_types<>, _Tp, _Sp, _Ep>::type type;
-};
-
-// __tuple_convertible
-
-template <class, class>
-struct __tuple_convertible_imp : public false_type {};
-
-template <class _Tp0, class ..._Tp, class _Up0, class ..._Up>
-struct __tuple_convertible_imp<__tuple_types<_Tp0, _Tp...>, __tuple_types<_Up0, _Up...> >
-    : public integral_constant<bool,
-                               is_convertible<_Tp0, _Up0>::value &&
-                               __tuple_convertible_imp<__tuple_types<_Tp...>, __tuple_types<_Up...> >::value> {};
-
-template <>
-struct __tuple_convertible_imp<__tuple_types<>, __tuple_types<> >
-    : public true_type {};
-
-template <bool, class, class>
-struct __tuple_convertible_apply : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_convertible_apply<true, _Tp, _Up>
-  : public __tuple_convertible_imp<
-      typename __make_tuple_types<_Tp>::type
-    , typename __make_tuple_types<_Up>::type
-    >
-{};
-
-template <class _Tp, class _Up, bool = __tuple_like<typename remove_reference<_Tp>::type>::value,
-                                bool = __tuple_like<_Up>::value>
-struct __tuple_convertible
-    : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_convertible<_Tp, _Up, true, true>
-    : public __tuple_convertible_apply<tuple_size<typename remove_reference<_Tp>::type>::value ==
-                                     tuple_size<_Up>::value, _Tp, _Up>
-{};
-
-// __tuple_constructible
-
-template <class, class>
-struct __tuple_constructible_imp : public false_type {};
-
-template <class _Tp0, class ..._Tp, class _Up0, class ..._Up>
-struct __tuple_constructible_imp<__tuple_types<_Tp0, _Tp...>, __tuple_types<_Up0, _Up...> >
-    : public integral_constant<bool,
-                               is_constructible<_Up0, _Tp0>::value &&
-                               __tuple_constructible_imp<__tuple_types<_Tp...>, __tuple_types<_Up...> >::value> {};
-
-template <>
-struct __tuple_constructible_imp<__tuple_types<>, __tuple_types<> >
-    : public true_type {};
-
-template <bool _SameSize, class, class>
-struct __tuple_constructible_apply : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_constructible_apply<true, _Tp, _Up>
-  : public __tuple_constructible_imp<
-      typename __make_tuple_types<_Tp>::type
-    , typename __make_tuple_types<_Up>::type
-    >
-{};
-
-template <class _Tp, class _Up, bool = __tuple_like<typename remove_reference<_Tp>::type>::value,
-                                bool = __tuple_like<_Up>::value>
-struct __tuple_constructible
-    : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_constructible<_Tp, _Up, true, true>
-    : public __tuple_constructible_apply<tuple_size<typename remove_reference<_Tp>::type>::value ==
-                                     tuple_size<_Up>::value, _Tp, _Up>
-{};
-
-// __tuple_assignable
-
-template <class, class>
-struct __tuple_assignable_imp : public false_type {};
-
-template <class _Tp0, class ..._Tp, class _Up0, class ..._Up>
-struct __tuple_assignable_imp<__tuple_types<_Tp0, _Tp...>, __tuple_types<_Up0, _Up...> >
-    : public integral_constant<bool,
-                               is_assignable<_Up0&, _Tp0>::value &&
-                               __tuple_assignable_imp<__tuple_types<_Tp...>, __tuple_types<_Up...> >::value> {};
-
-template <>
-struct __tuple_assignable_imp<__tuple_types<>, __tuple_types<> >
-    : public true_type {};
-
-template <bool, class, class>
-struct __tuple_assignable_apply : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_assignable_apply<true, _Tp, _Up>
-  : __tuple_assignable_imp<
-      typename __make_tuple_types<_Tp>::type
-    , typename __make_tuple_types<_Up>::type
-    >
-{};
-
-template <class _Tp, class _Up, bool = __tuple_like<typename remove_reference<_Tp>::type>::value,
-                                bool = __tuple_like<_Up>::value>
-struct __tuple_assignable
-    : public false_type {};
-
-template <class _Tp, class _Up>
-struct __tuple_assignable<_Tp, _Up, true, true>
-    : public __tuple_assignable_apply<tuple_size<typename remove_reference<_Tp>::type>::value ==
-                                    tuple_size<_Up>::value, _Tp, _Up>
-{};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif  // _LIBCPP___TUPLE
diff --git a/include.new/c++/v1/tr1/__tuple_03 b/include.new/c++/v1/tr1/__tuple_03
deleted file mode 100644
index b91c2cd..0000000
--- a/include.new/c++/v1/tr1/__tuple_03
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP___TUPLE_03
-#define _LIBCPP___TUPLE_03
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_size;
-template <size_t _Ip, class _Tp> class _LIBCPP_TYPE_VIS_ONLY tuple_element;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP___TUPLE_03
diff --git a/include.new/c++/v1/tr1/__undef_min_max b/include.new/c++/v1/tr1/__undef_min_max
deleted file mode 100644
index 5df9412..0000000
--- a/include.new/c++/v1/tr1/__undef_min_max
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//===----------------------------------------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifdef min
-#if defined(_MSC_VER) && ! defined(__clang__)
-_LIBCPP_WARNING("macro min is incompatible with C++.  Try #define NOMINMAX "
-                "before any Windows header. #undefing min")
-#else
-#warning: macro min is incompatible with C++.  #undefing min
-#endif
-#undef min
-#endif
-
-#ifdef max
-#if defined(_MSC_VER) && ! defined(__clang__)
-_LIBCPP_WARNING("macro max is incompatible with C++.  Try #define NOMINMAX "
-                "before any Windows header. #undefing max")
-#else
-#warning: macro max is incompatible with C++.  #undefing max
-#endif
-#undef max
-#endif
diff --git a/include.new/c++/v1/tr1/algorithm b/include.new/c++/v1/tr1/algorithm
deleted file mode 100644
index 61b0143..0000000
--- a/include.new/c++/v1/tr1/algorithm
+++ /dev/null
@@ -1,5761 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- algorithm ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ALGORITHM
-#define _LIBCPP_ALGORITHM
-
-/*
-    algorithm synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-template <class InputIterator, class Predicate>
-    bool
-    all_of(InputIterator first, InputIterator last, Predicate pred);
-
-template <class InputIterator, class Predicate>
-    bool
-    any_of(InputIterator first, InputIterator last, Predicate pred);
-
-template <class InputIterator, class Predicate>
-    bool
-    none_of(InputIterator first, InputIterator last, Predicate pred);
-
-template <class InputIterator, class Function>
-    Function
-    for_each(InputIterator first, InputIterator last, Function f);
-
-template <class InputIterator, class T>
-    InputIterator
-    find(InputIterator first, InputIterator last, const T& value);
-
-template <class InputIterator, class Predicate>
-    InputIterator
-    find_if(InputIterator first, InputIterator last, Predicate pred);
-
-template<class InputIterator, class Predicate>
-    InputIterator
-    find_if_not(InputIterator first, InputIterator last, Predicate pred);
-
-template <class ForwardIterator1, class ForwardIterator2>
-    ForwardIterator1
-    find_end(ForwardIterator1 first1, ForwardIterator1 last1,
-             ForwardIterator2 first2, ForwardIterator2 last2);
-
-template <class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    ForwardIterator1
-    find_end(ForwardIterator1 first1, ForwardIterator1 last1,
-             ForwardIterator2 first2, ForwardIterator2 last2, BinaryPredicate pred);
-
-template <class ForwardIterator1, class ForwardIterator2>
-    ForwardIterator1
-    find_first_of(ForwardIterator1 first1, ForwardIterator1 last1,
-                  ForwardIterator2 first2, ForwardIterator2 last2);
-
-template <class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    ForwardIterator1
-    find_first_of(ForwardIterator1 first1, ForwardIterator1 last1,
-                  ForwardIterator2 first2, ForwardIterator2 last2, BinaryPredicate pred);
-
-template <class ForwardIterator>
-    ForwardIterator
-    adjacent_find(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class BinaryPredicate>
-    ForwardIterator
-    adjacent_find(ForwardIterator first, ForwardIterator last, BinaryPredicate pred);
-
-template <class InputIterator, class T>
-    typename iterator_traits<InputIterator>::difference_type
-    count(InputIterator first, InputIterator last, const T& value);
-
-template <class InputIterator, class Predicate>
-    typename iterator_traits<InputIterator>::difference_type
-    count_if(InputIterator first, InputIterator last, Predicate pred);
-
-template <class InputIterator1, class InputIterator2>
-    pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
-
-template <class InputIterator1, class InputIterator2>
-    pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 first1, InputIterator1 last1, 
-             InputIterator2 first2, InputIterator2 last2); // **C++14**
-
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-    pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 first1, InputIterator1 last1,
-             InputIterator2 first2, BinaryPredicate pred);
-
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-    pair<InputIterator1, InputIterator2>
-    mismatch(InputIterator1 first1, InputIterator1 last1,
-             InputIterator2 first2, InputIterator2 last2,
-             BinaryPredicate pred); // **C++14**
-
-template <class InputIterator1, class InputIterator2>
-    bool
-    equal(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2);
-
-template <class InputIterator1, class InputIterator2>
-    bool
-    equal(InputIterator1 first1, InputIterator1 last1, 
-          InputIterator2 first2, InputIterator2 last2); // **C++14**
-
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-    bool
-    equal(InputIterator1 first1, InputIterator1 last1,
-          InputIterator2 first2, BinaryPredicate pred);
-
-template <class InputIterator1, class InputIterator2, class BinaryPredicate>
-    bool
-    equal(InputIterator1 first1, InputIterator1 last1,
-          InputIterator2 first2, InputIterator2 last2,
-          BinaryPredicate pred); // **C++14**
-
-template<class ForwardIterator1, class ForwardIterator2>
-    bool
-    is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
-                   ForwardIterator2 first2);
-
-template<class ForwardIterator1, class ForwardIterator2>
-    bool
-    is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
-                   ForwardIterator2 first2, ForwardIterator2 last2); // **C++14**
-
-template<class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    bool
-    is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
-                   ForwardIterator2 first2, BinaryPredicate pred);
-
-template<class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    bool
-    is_permutation(ForwardIterator1 first1, ForwardIterator1 last1,
-                   ForwardIterator2 first2, ForwardIterator2 last2,
-                   BinaryPredicate pred);  // **C++14**
-
-template <class ForwardIterator1, class ForwardIterator2>
-    ForwardIterator1
-    search(ForwardIterator1 first1, ForwardIterator1 last1,
-           ForwardIterator2 first2, ForwardIterator2 last2);
-
-template <class ForwardIterator1, class ForwardIterator2, class BinaryPredicate>
-    ForwardIterator1
-    search(ForwardIterator1 first1, ForwardIterator1 last1,
-           ForwardIterator2 first2, ForwardIterator2 last2, BinaryPredicate pred);
-
-template <class ForwardIterator, class Size, class T>
-    ForwardIterator
-    search_n(ForwardIterator first, ForwardIterator last, Size count, const T& value);
-
-template <class ForwardIterator, class Size, class T, class BinaryPredicate>
-    ForwardIterator
-    search_n(ForwardIterator first, ForwardIterator last,
-             Size count, const T& value, BinaryPredicate pred);
-
-template <class InputIterator, class OutputIterator>
-    OutputIterator
-    copy(InputIterator first, InputIterator last, OutputIterator result);
-
-template<class InputIterator, class OutputIterator, class Predicate>
-    OutputIterator
-    copy_if(InputIterator first, InputIterator last,
-            OutputIterator result, Predicate pred);
-
-template<class InputIterator, class Size, class OutputIterator>
-    OutputIterator
-    copy_n(InputIterator first, Size n, OutputIterator result);
-
-template <class BidirectionalIterator1, class BidirectionalIterator2>
-    BidirectionalIterator2
-    copy_backward(BidirectionalIterator1 first, BidirectionalIterator1 last,
-                  BidirectionalIterator2 result);
-
-template <class ForwardIterator1, class ForwardIterator2>
-    ForwardIterator2
-    swap_ranges(ForwardIterator1 first1, ForwardIterator1 last1, ForwardIterator2 first2);
-
-template <class ForwardIterator1, class ForwardIterator2>
-    void
-    iter_swap(ForwardIterator1 a, ForwardIterator2 b);
-
-template <class InputIterator, class OutputIterator, class UnaryOperation>
-    OutputIterator
-    transform(InputIterator first, InputIterator last, OutputIterator result, UnaryOperation op);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class BinaryOperation>
-    OutputIterator
-    transform(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2,
-              OutputIterator result, BinaryOperation binary_op);
-
-template <class ForwardIterator, class T>
-    void
-    replace(ForwardIterator first, ForwardIterator last, const T& old_value, const T& new_value);
-
-template <class ForwardIterator, class Predicate, class T>
-    void
-    replace_if(ForwardIterator first, ForwardIterator last, Predicate pred, const T& new_value);
-
-template <class InputIterator, class OutputIterator, class T>
-    OutputIterator
-    replace_copy(InputIterator first, InputIterator last, OutputIterator result,
-                 const T& old_value, const T& new_value);
-
-template <class InputIterator, class OutputIterator, class Predicate, class T>
-    OutputIterator
-    replace_copy_if(InputIterator first, InputIterator last, OutputIterator result, Predicate pred, const T& new_value);
-
-template <class ForwardIterator, class T>
-    void
-    fill(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class OutputIterator, class Size, class T>
-    OutputIterator
-    fill_n(OutputIterator first, Size n, const T& value);
-
-template <class ForwardIterator, class Generator>
-    void
-    generate(ForwardIterator first, ForwardIterator last, Generator gen);
-
-template <class OutputIterator, class Size, class Generator>
-    OutputIterator
-    generate_n(OutputIterator first, Size n, Generator gen);
-
-template <class ForwardIterator, class T>
-    ForwardIterator
-    remove(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class Predicate>
-    ForwardIterator
-    remove_if(ForwardIterator first, ForwardIterator last, Predicate pred);
-
-template <class InputIterator, class OutputIterator, class T>
-    OutputIterator
-    remove_copy(InputIterator first, InputIterator last, OutputIterator result, const T& value);
-
-template <class InputIterator, class OutputIterator, class Predicate>
-    OutputIterator
-    remove_copy_if(InputIterator first, InputIterator last, OutputIterator result, Predicate pred);
-
-template <class ForwardIterator>
-    ForwardIterator
-    unique(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class BinaryPredicate>
-    ForwardIterator
-    unique(ForwardIterator first, ForwardIterator last, BinaryPredicate pred);
-
-template <class InputIterator, class OutputIterator>
-    OutputIterator
-    unique_copy(InputIterator first, InputIterator last, OutputIterator result);
-
-template <class InputIterator, class OutputIterator, class BinaryPredicate>
-    OutputIterator
-    unique_copy(InputIterator first, InputIterator last, OutputIterator result, BinaryPredicate pred);
-
-template <class BidirectionalIterator>
-    void
-    reverse(BidirectionalIterator first, BidirectionalIterator last);
-
-template <class BidirectionalIterator, class OutputIterator>
-    OutputIterator
-    reverse_copy(BidirectionalIterator first, BidirectionalIterator last, OutputIterator result);
-
-template <class ForwardIterator>
-    ForwardIterator
-    rotate(ForwardIterator first, ForwardIterator middle, ForwardIterator last);
-
-template <class ForwardIterator, class OutputIterator>
-    OutputIterator
-    rotate_copy(ForwardIterator first, ForwardIterator middle, ForwardIterator last, OutputIterator result);
-
-template <class RandomAccessIterator>
-    void
-    random_shuffle(RandomAccessIterator first, RandomAccessIterator last); // deprecated in C++14
-
-template <class RandomAccessIterator, class RandomNumberGenerator>
-    void
-    random_shuffle(RandomAccessIterator first, RandomAccessIterator last,
-                   RandomNumberGenerator& rand);  // deprecated in C++14
-
-template<class RandomAccessIterator, class UniformRandomNumberGenerator>
-    void shuffle(RandomAccessIterator first, RandomAccessIterator last,
-                 UniformRandomNumberGenerator&& g);
-
-template <class InputIterator, class Predicate>
-    bool
-    is_partitioned(InputIterator first, InputIterator last, Predicate pred);
-
-template <class ForwardIterator, class Predicate>
-    ForwardIterator
-    partition(ForwardIterator first, ForwardIterator last, Predicate pred);
-
-template <class InputIterator, class OutputIterator1,
-          class OutputIterator2, class Predicate>
-    pair<OutputIterator1, OutputIterator2>
-    partition_copy(InputIterator first, InputIterator last,
-                   OutputIterator1 out_true, OutputIterator2 out_false,
-                   Predicate pred);
-
-template <class ForwardIterator, class Predicate>
-    ForwardIterator
-    stable_partition(ForwardIterator first, ForwardIterator last, Predicate pred);
-
-template<class ForwardIterator, class Predicate>
-    ForwardIterator
-    partition_point(ForwardIterator first, ForwardIterator last, Predicate pred);
-
-template <class ForwardIterator>
-    bool
-    is_sorted(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class Compare>
-    bool
-    is_sorted(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template<class ForwardIterator>
-    ForwardIterator
-    is_sorted_until(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class Compare>
-    ForwardIterator
-    is_sorted_until(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    sort(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    sort(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    stable_sort(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    stable_sort(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    partial_sort(RandomAccessIterator first, RandomAccessIterator middle, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    partial_sort(RandomAccessIterator first, RandomAccessIterator middle, RandomAccessIterator last, Compare comp);
-
-template <class InputIterator, class RandomAccessIterator>
-    RandomAccessIterator
-    partial_sort_copy(InputIterator first, InputIterator last,
-                      RandomAccessIterator result_first, RandomAccessIterator result_last);
-
-template <class InputIterator, class RandomAccessIterator, class Compare>
-    RandomAccessIterator
-    partial_sort_copy(InputIterator first, InputIterator last,
-                      RandomAccessIterator result_first, RandomAccessIterator result_last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    nth_element(RandomAccessIterator first, RandomAccessIterator nth, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    nth_element(RandomAccessIterator first, RandomAccessIterator nth, RandomAccessIterator last, Compare comp);
-
-template <class ForwardIterator, class T>
-    ForwardIterator
-    lower_bound(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class T, class Compare>
-    ForwardIterator
-    lower_bound(ForwardIterator first, ForwardIterator last, const T& value, Compare comp);
-
-template <class ForwardIterator, class T>
-    ForwardIterator
-    upper_bound(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class T, class Compare>
-    ForwardIterator
-    upper_bound(ForwardIterator first, ForwardIterator last, const T& value, Compare comp);
-
-template <class ForwardIterator, class T>
-    pair<ForwardIterator, ForwardIterator>
-    equal_range(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class T, class Compare>
-    pair<ForwardIterator, ForwardIterator>
-    equal_range(ForwardIterator first, ForwardIterator last, const T& value, Compare comp);
-
-template <class ForwardIterator, class T>
-    bool
-    binary_search(ForwardIterator first, ForwardIterator last, const T& value);
-
-template <class ForwardIterator, class T, class Compare>
-    bool
-    binary_search(ForwardIterator first, ForwardIterator last, const T& value, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    merge(InputIterator1 first1, InputIterator1 last1,
-          InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    merge(InputIterator1 first1, InputIterator1 last1,
-          InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class BidirectionalIterator>
-    void
-    inplace_merge(BidirectionalIterator first, BidirectionalIterator middle, BidirectionalIterator last);
-
-template <class BidirectionalIterator, class Compare>
-    void
-    inplace_merge(BidirectionalIterator first, BidirectionalIterator middle, BidirectionalIterator last, Compare comp);
-
-template <class InputIterator1, class InputIterator2>
-    bool
-    includes(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2);
-
-template <class InputIterator1, class InputIterator2, class Compare>
-    bool
-    includes(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    set_union(InputIterator1 first1, InputIterator1 last1,
-              InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    set_union(InputIterator1 first1, InputIterator1 last1,
-              InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    set_intersection(InputIterator1 first1, InputIterator1 last1,
-                     InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    set_intersection(InputIterator1 first1, InputIterator1 last1,
-                     InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    set_difference(InputIterator1 first1, InputIterator1 last1,
-                   InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    set_difference(InputIterator1 first1, InputIterator1 last1,
-                   InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator>
-    OutputIterator
-    set_symmetric_difference(InputIterator1 first1, InputIterator1 last1,
-                             InputIterator2 first2, InputIterator2 last2, OutputIterator result);
-
-template <class InputIterator1, class InputIterator2, class OutputIterator, class Compare>
-    OutputIterator
-    set_symmetric_difference(InputIterator1 first1, InputIterator1 last1,
-                             InputIterator2 first2, InputIterator2 last2, OutputIterator result, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    push_heap(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    push_heap(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    pop_heap(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    pop_heap(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    make_heap(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    make_heap(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    void
-    sort_heap(RandomAccessIterator first, RandomAccessIterator last);
-
-template <class RandomAccessIterator, class Compare>
-    void
-    sort_heap(RandomAccessIterator first, RandomAccessIterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    bool
-    is_heap(RandomAccessIterator first, RandomAccessiterator last);
-
-template <class RandomAccessIterator, class Compare>
-    bool
-    is_heap(RandomAccessIterator first, RandomAccessiterator last, Compare comp);
-
-template <class RandomAccessIterator>
-    RandomAccessIterator
-    is_heap_until(RandomAccessIterator first, RandomAccessiterator last);
-
-template <class RandomAccessIterator, class Compare>
-    RandomAccessIterator
-    is_heap_until(RandomAccessIterator first, RandomAccessiterator last, Compare comp);
-
-template <class ForwardIterator>
-    ForwardIterator
-    min_element(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class Compare>
-    ForwardIterator
-    min_element(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template <class T>
-    const T&
-    min(const T& a, const T& b);  // constexpr in C++14
-
-template <class T, class Compare>
-    const T&
-    min(const T& a, const T& b, Compare comp);  // constexpr in C++14
-
-template<class T>
-    T
-    min(initializer_list<T> t);  // constexpr in C++14
-
-template<class T, class Compare>
-    T
-    min(initializer_list<T> t, Compare comp);  // constexpr in C++14
-
-template <class ForwardIterator>
-    ForwardIterator
-    max_element(ForwardIterator first, ForwardIterator last);
-
-template <class ForwardIterator, class Compare>
-    ForwardIterator
-    max_element(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template <class T>
-    const T&
-    max(const T& a, const T& b); // constexpr in C++14
-
-template <class T, class Compare>
-    const T&
-    max(const T& a, const T& b, Compare comp);  // constexpr in C++14
-
-template<class T>
-    T
-    max(initializer_list<T> t);  // constexpr in C++14
-
-template<class T, class Compare>
-    T
-    max(initializer_list<T> t, Compare comp);  // constexpr in C++14
-
-template<class ForwardIterator>
-    pair<ForwardIterator, ForwardIterator>
-    minmax_element(ForwardIterator first, ForwardIterator last);
-
-template<class ForwardIterator, class Compare>
-    pair<ForwardIterator, ForwardIterator>
-    minmax_element(ForwardIterator first, ForwardIterator last, Compare comp);
-
-template<class T>
-    pair<const T&, const T&>
-    minmax(const T& a, const T& b);  // constexpr in C++14
-
-template<class T, class Compare>
-    pair<const T&, const T&>
-    minmax(const T& a, const T& b, Compare comp);  // constexpr in C++14
-
-template<class T>
-    pair<T, T>
-    minmax(initializer_list<T> t);  // constexpr in C++14
-
-template<class T, class Compare>
-    pair<T, T>
-    minmax(initializer_list<T> t, Compare comp);  // constexpr in C++14
-
-template <class InputIterator1, class InputIterator2>
-    bool
-    lexicographical_compare(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, InputIterator2 last2);
-
-template <class InputIterator1, class InputIterator2, class Compare>
-    bool
-    lexicographical_compare(InputIterator1 first1, InputIterator1 last1,
-                            InputIterator2 first2, InputIterator2 last2, Compare comp);
-
-template <class BidirectionalIterator>
-    bool
-    next_permutation(BidirectionalIterator first, BidirectionalIterator last);
-
-template <class BidirectionalIterator, class Compare>
-    bool
-    next_permutation(BidirectionalIterator first, BidirectionalIterator last, Compare comp);
-
-template <class BidirectionalIterator>
-    bool
-    prev_permutation(BidirectionalIterator first, BidirectionalIterator last);
-
-template <class BidirectionalIterator, class Compare>
-    bool
-    prev_permutation(BidirectionalIterator first, BidirectionalIterator last, Compare comp);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <initializer_list>
-#include <type_traits>
-#include <cstring>
-#include <utility>
-#include <memory>
-#include <iterator>
-#include <cstddef>
-
-#if defined(__IBMCPP__)
-#include "support/ibm/support.h"
-#endif
-#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-#include "support/win32/support.h"
-#endif
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// I'd like to replace these with _VSTD::equal_to<void>, but can't because:
-//   * That only works with C++14 and later, and
-//   * We haven't included <functional> here.
-template <class _T1, class _T2 = _T1>
-struct __equal_to
-{
-    _LIBCPP_INLINE_VISIBILITY bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-    _LIBCPP_INLINE_VISIBILITY bool operator()(const _T1& __x, const _T2& __y) const {return __x == __y;}
-    _LIBCPP_INLINE_VISIBILITY bool operator()(const _T2& __x, const _T1& __y) const {return __x == __y;}
-    _LIBCPP_INLINE_VISIBILITY bool operator()(const _T2& __x, const _T2& __y) const {return __x == __y;}
-};
-
-template <class _T1>
-struct __equal_to<_T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-};
-
-template <class _T1>
-struct __equal_to<const _T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-};
-
-template <class _T1>
-struct __equal_to<_T1, const _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x == __y;}
-};
-
-template <class _T1, class _T2 = _T1>
-struct __less
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T2& __y) const {return __x < __y;}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T2& __x, const _T1& __y) const {return __x < __y;}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T2& __x, const _T2& __y) const {return __x < __y;}
-};
-
-template <class _T1>
-struct __less<_T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
-};
-
-template <class _T1>
-struct __less<const _T1, _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
-};
-
-template <class _T1>
-struct __less<_T1, const _T1>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _T1& __x, const _T1& __y) const {return __x < __y;}
-};
-
-template <class _Predicate>
-class __negate
-{
-private:
-    _Predicate __p_;
-public:
-    _LIBCPP_INLINE_VISIBILITY __negate() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __negate(_Predicate __p) : __p_(__p) {}
-
-    template <class _T1>
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _T1& __x) {return !__p_(__x);}
-
-    template <class _T1, class _T2>
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _T1& __x, const _T2& __y) {return !__p_(__x, __y);}
-};
-
-#ifdef _LIBCPP_DEBUG
-
-template <class _Compare>
-struct __debug_less
-{
-    _Compare __comp_;
-    __debug_less(_Compare& __c) : __comp_(__c) {}
-    template <class _Tp, class _Up>
-    bool operator()(const _Tp& __x, const _Up& __y)
-    {
-        bool __r = __comp_(__x, __y);
-        if (__r)
-            _LIBCPP_ASSERT(!__comp_(__y, __x), "Comparator does not induce a strict weak ordering");
-        return __r;
-    }
-};
-
-#endif  // _LIBCPP_DEBUG
-
-// Precondition:  __x != 0
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned
-__ctz(unsigned __x)
-{
-    return static_cast<unsigned>(__builtin_ctz(__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-__ctz(unsigned long __x)
-{
-    return static_cast<unsigned long>(__builtin_ctzl(__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__ctz(unsigned long long __x)
-{
-    return static_cast<unsigned long long>(__builtin_ctzll(__x));
-}
-
-// Precondition:  __x != 0
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned
-__clz(unsigned __x)
-{
-    return static_cast<unsigned>(__builtin_clz(__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-__clz(unsigned long __x)
-{
-    return static_cast<unsigned long>(__builtin_clzl (__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__clz(unsigned long long __x)
-{
-    return static_cast<unsigned long long>(__builtin_clzll(__x));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY int __pop_count(unsigned           __x) {return __builtin_popcount  (__x);}
-inline _LIBCPP_INLINE_VISIBILITY int __pop_count(unsigned      long __x) {return __builtin_popcountl (__x);}
-inline _LIBCPP_INLINE_VISIBILITY int __pop_count(unsigned long long __x) {return __builtin_popcountll(__x);}
-
-// all_of
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (!__pred(*__first))
-            return false;
-    return true;
-}
-
-// any_of
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            return true;
-    return false;
-}
-
-// none_of
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            return false;
-    return true;
-}
-
-// for_each
-
-template <class _InputIterator, class _Function>
-inline _LIBCPP_INLINE_VISIBILITY
-_Function
-for_each(_InputIterator __first, _InputIterator __last, _Function __f)
-{
-    for (; __first != __last; ++__first)
-        __f(*__first);
-    return _VSTD::move(__f);  // explicitly moved for (emulated) C++03
-}
-
-// find
-
-template <class _InputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_InputIterator
-find(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
-{
-    for (; __first != __last; ++__first)
-        if (*__first == __value_)
-            break;
-    return __first;
-}
-
-// find_if
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_InputIterator
-find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            break;
-    return __first;
-}
-
-// find_if_not
-
-template<class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_InputIterator
-find_if_not(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (!__pred(*__first))
-            break;
-    return __first;
-}
-
-// find_end
-
-template <class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2>
-_ForwardIterator1
-__find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-           _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred,
-           forward_iterator_tag, forward_iterator_tag)
-{
-    // modeled after search algorithm
-    _ForwardIterator1 __r = __last1;  // __last1 is the "default" answer
-    if (__first2 == __last2)
-        return __r;
-    while (true)
-    {
-        while (true)
-        {
-            if (__first1 == __last1)         // if source exhausted return last correct answer
-                return __r;                  //    (or __last1 if never found)
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        }
-        // *__first1 matches *__first2, now match elements after here
-        _ForwardIterator1 __m1 = __first1;
-        _ForwardIterator2 __m2 = __first2;
-        while (true)
-        {
-            if (++__m2 == __last2)
-            {                         // Pattern exhaused, record answer and search for another one
-                __r = __first1;
-                ++__first1;
-                break;
-            }
-            if (++__m1 == __last1)     // Source exhausted, return last answer
-                return __r;
-            if (!__pred(*__m1, *__m2))  // mismatch, restart with a new __first
-            {
-                ++__first1;
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _BinaryPredicate, class _BidirectionalIterator1, class _BidirectionalIterator2>
-_BidirectionalIterator1
-__find_end(_BidirectionalIterator1 __first1, _BidirectionalIterator1 __last1,
-           _BidirectionalIterator2 __first2, _BidirectionalIterator2 __last2, _BinaryPredicate __pred,
-           bidirectional_iterator_tag, bidirectional_iterator_tag)
-{
-    // modeled after search algorithm (in reverse)
-    if (__first2 == __last2)
-        return __last1;  // Everything matches an empty sequence
-    _BidirectionalIterator1 __l1 = __last1;
-    _BidirectionalIterator2 __l2 = __last2;
-    --__l2;
-    while (true)
-    {
-        // Find last element in sequence 1 that matchs *(__last2-1), with a mininum of loop checks
-        while (true)
-        {
-            if (__first1 == __l1)  // return __last1 if no element matches *__first2
-                return __last1;
-            if (__pred(*--__l1, *__l2))
-                break;
-        }
-        // *__l1 matches *__l2, now match elements before here
-        _BidirectionalIterator1 __m1 = __l1;
-        _BidirectionalIterator2 __m2 = __l2;
-        while (true)
-        {
-            if (__m2 == __first2)  // If pattern exhausted, __m1 is the answer (works for 1 element pattern)
-                return __m1;
-            if (__m1 == __first1)  // Otherwise if source exhaused, pattern not found
-                return __last1;
-            if (!__pred(*--__m1, *--__m2))  // if there is a mismatch, restart with a new __l1
-            {
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _RandomAccessIterator1
-__find_end(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,
-           _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _BinaryPredicate __pred,
-           random_access_iterator_tag, random_access_iterator_tag)
-{
-    // Take advantage of knowing source and pattern lengths.  Stop short when source is smaller than pattern
-    typename iterator_traits<_RandomAccessIterator2>::difference_type __len2 = __last2 - __first2;
-    if (__len2 == 0)
-        return __last1;
-    typename iterator_traits<_RandomAccessIterator1>::difference_type __len1 = __last1 - __first1;
-    if (__len1 < __len2)
-        return __last1;
-    const _RandomAccessIterator1 __s = __first1 + (__len2 - 1);  // End of pattern match can't go before here
-    _RandomAccessIterator1 __l1 = __last1;
-    _RandomAccessIterator2 __l2 = __last2;
-    --__l2;
-    while (true)
-    {
-        while (true)
-        {
-            if (__s == __l1)
-                return __last1;
-            if (__pred(*--__l1, *__l2))
-                break;
-        }
-        _RandomAccessIterator1 __m1 = __l1;
-        _RandomAccessIterator2 __m2 = __l2;
-        while (true)
-        {
-            if (__m2 == __first2)
-                return __m1;
-                                 // no need to check range on __m1 because __s guarantees we have enough source
-            if (!__pred(*--__m1, *--__m2))
-            {
-                break;
-            }
-        }
-    }
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-         _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
-{
-    return _VSTD::__find_end<typename add_lvalue_reference<_BinaryPredicate>::type>
-                         (__first1, __last1, __first2, __last2, __pred,
-                          typename iterator_traits<_ForwardIterator1>::iterator_category(),
-                          typename iterator_traits<_ForwardIterator2>::iterator_category());
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-         _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-{
-    typedef typename iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::find_end(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
-}
-
-// find_first_of
-
-template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _ForwardIterator1
-__find_first_of_ce(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-              _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
-{
-    for (; __first1 != __last1; ++__first1)
-        for (_ForwardIterator2 __j = __first2; __j != __last2; ++__j)
-            if (__pred(*__first1, *__j))
-                return __first1;
-    return __last1;
-}
-
-
-template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-              _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
-{
-    return _VSTD::__find_first_of_ce(__first1, __last1, __first2, __last2, __pred);
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-find_first_of(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-              _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-{
-    typedef typename iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::__find_first_of_ce(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
-}
-
-// adjacent_find
-
-template <class _ForwardIterator, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-adjacent_find(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (__pred(*__first, *__i))
-                return __first;
-            __first = __i;
-        }
-    }
-    return __last;
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-adjacent_find(_ForwardIterator __first, _ForwardIterator __last)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type __v;
-    return _VSTD::adjacent_find(__first, __last, __equal_to<__v>());
-}
-
-// count
-
-template <class _InputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_InputIterator>::difference_type
-count(_InputIterator __first, _InputIterator __last, const _Tp& __value_)
-{
-    typename iterator_traits<_InputIterator>::difference_type __r(0);
-    for (; __first != __last; ++__first)
-        if (*__first == __value_)
-            ++__r;
-    return __r;
-}
-
-// count_if
-
-template <class _InputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_InputIterator>::difference_type
-count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    typename iterator_traits<_InputIterator>::difference_type __r(0);
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            ++__r;
-    return __r;
-}
-
-// mismatch
-
-template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_InputIterator1, _InputIterator2>
-mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-         _InputIterator2 __first2, _BinaryPredicate __pred)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            break;
-    return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_InputIterator1, _InputIterator2>
-mismatch(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return _VSTD::mismatch(__first1, __last1, __first2, __equal_to<__v1, __v2>());
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_InputIterator1, _InputIterator2>
-mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-         _InputIterator2 __first2, _InputIterator2 __last2,
-         _BinaryPredicate __pred)
-{
-    for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            break;
-    return pair<_InputIterator1, _InputIterator2>(__first1, __first2);
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_InputIterator1, _InputIterator2>
-mismatch(_InputIterator1 __first1, _InputIterator1 __last1,
-         _InputIterator2 __first2, _InputIterator2 __last2)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return _VSTD::mismatch(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
-}
-#endif
-
-// equal
-
-template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _BinaryPredicate __pred)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            return false;
-    return true;
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return _VSTD::equal(__first1, __last1, __first2, __equal_to<__v1, __v2>());
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _BinaryPredicate, class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__equal(_InputIterator1 __first1, _InputIterator1 __last1, 
-        _InputIterator2 __first2, _InputIterator2 __last2, _BinaryPredicate __pred,
-        input_iterator_tag, input_iterator_tag )
-{
-    for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            return false;
-    return __first1 == __last1 && __first2 == __last2;
-}
-
-template <class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__equal(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1, 
-        _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _BinaryPredicate __pred, 
-      random_access_iterator_tag, random_access_iterator_tag )
-{
-    if ( _VSTD::distance(__first1, __last1) != _VSTD::distance(__first2, __last2))
-        return false;
-    return _VSTD::equal<_RandomAccessIterator1, _RandomAccessIterator2,
-                        typename add_lvalue_reference<_BinaryPredicate>::type>
-                       (__first1, __last1, __first2, __pred );
-}
-
-template <class _InputIterator1, class _InputIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(_InputIterator1 __first1, _InputIterator1 __last1, 
-      _InputIterator2 __first2, _InputIterator2 __last2, _BinaryPredicate __pred )
-{
-    return _VSTD::__equal<typename add_lvalue_reference<_BinaryPredicate>::type>
-       (__first1, __last1, __first2, __last2, __pred, 
-        typename iterator_traits<_InputIterator1>::iterator_category(),
-        typename iterator_traits<_InputIterator2>::iterator_category());
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-equal(_InputIterator1 __first1, _InputIterator1 __last1, 
-      _InputIterator2 __first2, _InputIterator2 __last2)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return _VSTD::__equal(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>(),
-        typename iterator_traits<_InputIterator1>::iterator_category(),
-        typename iterator_traits<_InputIterator2>::iterator_category());
-}
-#endif
-
-// is_permutation
-
-template<class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-bool
-is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-               _ForwardIterator2 __first2, _BinaryPredicate __pred)
-{
-    // shorten sequences as much as possible by lopping of any equal parts
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            goto __not_done;
-    return true;
-__not_done:
-    // __first1 != __last1 && *__first1 != *__first2
-    typedef typename iterator_traits<_ForwardIterator1>::difference_type _D1;
-    _D1 __l1 = _VSTD::distance(__first1, __last1);
-    if (__l1 == _D1(1))
-        return false;
-    _ForwardIterator2 __last2 = _VSTD::next(__first2, __l1);
-    // For each element in [f1, l1) see if there are the same number of
-    //    equal elements in [f2, l2)
-    for (_ForwardIterator1 __i = __first1; __i != __last1; ++__i)
-    {
-        // Have we already counted the number of *__i in [f1, l1)?
-        for (_ForwardIterator1 __j = __first1; __j != __i; ++__j)
-            if (__pred(*__j, *__i))
-                goto __next_iter;
-        {
-            // Count number of *__i in [f2, l2)
-            _D1 __c2 = 0;
-            for (_ForwardIterator2 __j = __first2; __j != __last2; ++__j)
-                if (__pred(*__i, *__j))
-                    ++__c2;
-            if (__c2 == 0)
-                return false;
-            // Count number of *__i in [__i, l1) (we can start with 1)
-            _D1 __c1 = 1;
-            for (_ForwardIterator1 __j = _VSTD::next(__i); __j != __last1; ++__j)
-                if (__pred(*__i, *__j))
-                    ++__c1;
-            if (__c1 != __c2)
-                return false;
-        }
-__next_iter:;
-    }
-    return true;
-}
-
-template<class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-               _ForwardIterator2 __first2)
-{
-    typedef typename iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::is_permutation(__first1, __last1, __first2, __equal_to<__v1, __v2>());
-}
-
-#if _LIBCPP_STD_VER > 11
-template<class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2>
-bool
-__is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-                 _ForwardIterator2 __first2, _ForwardIterator2 __last2, 
-                 _BinaryPredicate __pred,
-                 forward_iterator_tag, forward_iterator_tag )
-{
-    // shorten sequences as much as possible by lopping of any equal parts
-    for (; __first1 != __last1 && __first2 != __last2; ++__first1, (void) ++__first2)
-        if (!__pred(*__first1, *__first2))
-            goto __not_done;
-    return __first1 == __last1 && __first2 == __last2;
-__not_done:
-    // __first1 != __last1 && __first2 != __last2 && *__first1 != *__first2
-    typedef typename iterator_traits<_ForwardIterator1>::difference_type _D1;
-    _D1 __l1 = _VSTD::distance(__first1, __last1);
-
-    typedef typename iterator_traits<_ForwardIterator2>::difference_type _D2;
-    _D2 __l2 = _VSTD::distance(__first2, __last2);
-    if (__l1 != __l2)
-        return false;
-
-    // For each element in [f1, l1) see if there are the same number of
-    //    equal elements in [f2, l2)
-    for (_ForwardIterator1 __i = __first1; __i != __last1; ++__i)
-    {
-        // Have we already counted the number of *__i in [f1, l1)?
-        for (_ForwardIterator1 __j = __first1; __j != __i; ++__j)
-            if (__pred(*__j, *__i))
-                goto __next_iter;
-        {
-            // Count number of *__i in [f2, l2)
-            _D1 __c2 = 0;
-            for (_ForwardIterator2 __j = __first2; __j != __last2; ++__j)
-                if (__pred(*__i, *__j))
-                    ++__c2;
-            if (__c2 == 0)
-                return false;
-            // Count number of *__i in [__i, l1) (we can start with 1)
-            _D1 __c1 = 1;
-            for (_ForwardIterator1 __j = _VSTD::next(__i); __j != __last1; ++__j)
-                if (__pred(*__i, *__j))
-                    ++__c1;
-            if (__c1 != __c2)
-                return false;
-        }
-__next_iter:;
-    }
-    return true;
-}
-
-template<class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-bool
-__is_permutation(_RandomAccessIterator1 __first1, _RandomAccessIterator2 __last1,
-               _RandomAccessIterator1 __first2, _RandomAccessIterator2 __last2, 
-               _BinaryPredicate __pred,
-               random_access_iterator_tag, random_access_iterator_tag )
-{
-    if ( _VSTD::distance(__first1, __last1) != _VSTD::distance(__first2, __last2))
-        return false;
-    return _VSTD::is_permutation<_RandomAccessIterator1, _RandomAccessIterator2,
-                                 typename add_lvalue_reference<_BinaryPredicate>::type>
-                                (__first1, __last1, __first2, __pred );
-}
-
-template<class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-               _ForwardIterator2 __first2, _ForwardIterator2 __last2,
-               _BinaryPredicate __pred )
-{
-    return _VSTD::__is_permutation<typename add_lvalue_reference<_BinaryPredicate>::type>
-       (__first1, __last1, __first2, __last2, __pred,
-        typename iterator_traits<_ForwardIterator1>::iterator_category(),
-        typename iterator_traits<_ForwardIterator2>::iterator_category());
-}
-
-template<class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_permutation(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-               _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-{
-    typedef typename iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::__is_permutation(__first1, __last1, __first2, __last2,
-        __equal_to<__v1, __v2>(),
-        typename iterator_traits<_ForwardIterator1>::iterator_category(),
-        typename iterator_traits<_ForwardIterator2>::iterator_category());
-}
-#endif
-
-// search
-
-template <class _BinaryPredicate, class _ForwardIterator1, class _ForwardIterator2>
-_ForwardIterator1
-__search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-         _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred,
-         forward_iterator_tag, forward_iterator_tag)
-{
-    if (__first2 == __last2)
-        return __first1;  // Everything matches an empty sequence
-    while (true)
-    {
-        // Find first element in sequence 1 that matchs *__first2, with a mininum of loop checks
-        while (true)
-        {
-            if (__first1 == __last1)  // return __last1 if no element matches *__first2
-                return __last1;
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        }
-        // *__first1 matches *__first2, now match elements after here
-        _ForwardIterator1 __m1 = __first1;
-        _ForwardIterator2 __m2 = __first2;
-        while (true)
-        {
-            if (++__m2 == __last2)  // If pattern exhausted, __first1 is the answer (works for 1 element pattern)
-                return __first1;
-            if (++__m1 == __last1)  // Otherwise if source exhaused, pattern not found
-                return __last1;
-            if (!__pred(*__m1, *__m2))  // if there is a mismatch, restart with a new __first1
-            {
-                ++__first1;
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _BinaryPredicate, class _RandomAccessIterator1, class _RandomAccessIterator2>
-_LIBCPP_CONSTEXPR_AFTER_CXX11 _RandomAccessIterator1
-__search(_RandomAccessIterator1 __first1, _RandomAccessIterator1 __last1,
-           _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _BinaryPredicate __pred,
-           random_access_iterator_tag, random_access_iterator_tag)
-{
-    typedef typename std::iterator_traits<_RandomAccessIterator1>::difference_type _D1;
-    typedef typename std::iterator_traits<_RandomAccessIterator2>::difference_type _D2;
-    // Take advantage of knowing source and pattern lengths.  Stop short when source is smaller than pattern
-    _D2 __len2 = __last2 - __first2;
-    if (__len2 == 0)
-        return __first1;
-    _D1 __len1 = __last1 - __first1;
-    if (__len1 < __len2)
-        return __last1;
-    const _RandomAccessIterator1 __s = __last1 - (__len2 - 1);  // Start of pattern match can't go beyond here
-    while (true)
-    {
-#if !_LIBCPP_UNROLL_LOOPS
-        while (true)
-        {
-            if (__first1 == __s)
-                return __last1;
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        }
-#else  // !_LIBCPP_UNROLL_LOOPS
-        for (_D1 __loop_unroll = (__s - __first1) / 4; __loop_unroll > 0; --__loop_unroll)
-        {
-            if (__pred(*__first1, *__first2))
-                goto __phase2;
-            if (__pred(*++__first1, *__first2))
-                goto __phase2;
-            if (__pred(*++__first1, *__first2))
-                goto __phase2;
-            if (__pred(*++__first1, *__first2))
-                goto __phase2;
-            ++__first1;
-        }
-        switch (__s - __first1)
-        {
-        case 3:
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        case 2:
-            if (__pred(*__first1, *__first2))
-                break;
-            ++__first1;
-        case 1:
-            if (__pred(*__first1, *__first2))
-                break;
-        case 0:
-            return __last1;
-        }
-    __phase2:
-#endif  // !_LIBCPP_UNROLL_LOOPS
-        _RandomAccessIterator1 __m1 = __first1;
-        _RandomAccessIterator2 __m2 = __first2;
-#if !_LIBCPP_UNROLL_LOOPS
-         while (true)
-         {
-             if (++__m2 == __last2)
-                 return __first1;
-             ++__m1;          // no need to check range on __m1 because __s guarantees we have enough source
-             if (!__pred(*__m1, *__m2))
-             {
-                 ++__first1;
-                 break;
-             }
-         }
-#else  // !_LIBCPP_UNROLL_LOOPS
-        ++__m2;
-        ++__m1;
-        for (_D2 __loop_unroll = (__last2 - __m2) / 4; __loop_unroll > 0; --__loop_unroll)
-        {
-            if (!__pred(*__m1, *__m2))
-                goto __continue;
-            if (!__pred(*++__m1, *++__m2))
-                goto __continue;
-            if (!__pred(*++__m1, *++__m2))
-                goto __continue;
-            if (!__pred(*++__m1, *++__m2))
-                goto __continue;
-            ++__m1;
-            ++__m2;
-        }
-        switch (__last2 - __m2)
-        {
-        case 3:
-            if (!__pred(*__m1, *__m2))
-                break;
-            ++__m1;
-            ++__m2;
-        case 2:
-            if (!__pred(*__m1, *__m2))
-                break;
-            ++__m1;
-            ++__m2;
-        case 1:
-            if (!__pred(*__m1, *__m2))
-                break;
-        case 0:
-            return __first1;
-        }
-    __continue:
-        ++__first1;
-#endif  // !_LIBCPP_UNROLL_LOOPS
-    }
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-       _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred)
-{
-    return _VSTD::__search<typename add_lvalue_reference<_BinaryPredicate>::type>
-                         (__first1, __last1, __first2, __last2, __pred,
-                          typename std::iterator_traits<_ForwardIterator1>::iterator_category(),
-                          typename std::iterator_traits<_ForwardIterator2>::iterator_category());
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator1
-search(_ForwardIterator1 __first1, _ForwardIterator1 __last1,
-       _ForwardIterator2 __first2, _ForwardIterator2 __last2)
-{
-    typedef typename std::iterator_traits<_ForwardIterator1>::value_type __v1;
-    typedef typename std::iterator_traits<_ForwardIterator2>::value_type __v2;
-    return _VSTD::search(__first1, __last1, __first2, __last2, __equal_to<__v1, __v2>());
-}
-
-// search_n
-
-template <class _BinaryPredicate, class _ForwardIterator, class _Size, class _Tp>
-_ForwardIterator
-__search_n(_ForwardIterator __first, _ForwardIterator __last,
-           _Size __count, const _Tp& __value_, _BinaryPredicate __pred, forward_iterator_tag)
-{
-    if (__count <= 0)
-        return __first;
-    while (true)
-    {
-        // Find first element in sequence that matchs __value_, with a mininum of loop checks
-        while (true)
-        {
-            if (__first == __last)  // return __last if no element matches __value_
-                return __last;
-            if (__pred(*__first, __value_))
-                break;
-            ++__first;
-        }
-        // *__first matches __value_, now match elements after here
-        _ForwardIterator __m = __first;
-        _Size __c(0);
-        while (true)
-        {
-            if (++__c == __count)  // If pattern exhausted, __first is the answer (works for 1 element pattern)
-                return __first;
-            if (++__m == __last)  // Otherwise if source exhaused, pattern not found
-                return __last;
-            if (!__pred(*__m, __value_))  // if there is a mismatch, restart with a new __first
-            {
-                __first = __m;
-                ++__first;
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _BinaryPredicate, class _RandomAccessIterator, class _Size, class _Tp>
-_RandomAccessIterator
-__search_n(_RandomAccessIterator __first, _RandomAccessIterator __last,
-           _Size __count, const _Tp& __value_, _BinaryPredicate __pred, random_access_iterator_tag)
-{
-    if (__count <= 0)
-        return __first;
-    _Size __len = static_cast<_Size>(__last - __first);
-    if (__len < __count)
-        return __last;
-    const _RandomAccessIterator __s = __last - (__count - 1);  // Start of pattern match can't go beyond here
-    while (true)
-    {
-        // Find first element in sequence that matchs __value_, with a mininum of loop checks
-        while (true)
-        {
-            if (__first >= __s)  // return __last if no element matches __value_
-                return __last;
-            if (__pred(*__first, __value_))
-                break;
-            ++__first;
-        }
-        // *__first matches __value_, now match elements after here
-        _RandomAccessIterator __m = __first;
-        _Size __c(0);
-        while (true)
-        {
-            if (++__c == __count)  // If pattern exhausted, __first is the answer (works for 1 element pattern)
-                return __first;
-             ++__m;          // no need to check range on __m because __s guarantees we have enough source
-            if (!__pred(*__m, __value_))  // if there is a mismatch, restart with a new __first
-            {
-                __first = __m;
-                ++__first;
-                break;
-            }  // else there is a match, check next elements
-        }
-    }
-}
-
-template <class _ForwardIterator, class _Size, class _Tp, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-search_n(_ForwardIterator __first, _ForwardIterator __last,
-         _Size __count, const _Tp& __value_, _BinaryPredicate __pred)
-{
-    return _VSTD::__search_n<typename add_lvalue_reference<_BinaryPredicate>::type>
-           (__first, __last, __count, __value_, __pred, typename iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-template <class _ForwardIterator, class _Size, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value_)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type __v;
-    return _VSTD::search_n(__first, __last, __count, __value_, __equal_to<__v, _Tp>());
-}
-
-// copy
-
-template <class _Iter>
-struct __libcpp_is_trivial_iterator
-{
-    static const bool value = is_pointer<_Iter>::value;
-};
-
-template <class _Iter>
-struct __libcpp_is_trivial_iterator<move_iterator<_Iter> >
-{
-    static const bool value = is_pointer<_Iter>::value;
-};
-
-template <class _Iter>
-struct __libcpp_is_trivial_iterator<__wrap_iter<_Iter> >
-{
-    static const bool value = is_pointer<_Iter>::value;
-};
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-_Iter
-__unwrap_iter(_Iter __i)
-{
-    return __i;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_trivially_copy_assignable<_Tp>::value,
-    _Tp*
->::type
-__unwrap_iter(move_iterator<_Tp*> __i)
-{
-    return __i.base();
-}
-
-#if _LIBCPP_DEBUG_LEVEL < 2
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_trivially_copy_assignable<_Tp>::value,
-    _Tp*
->::type
-__unwrap_iter(__wrap_iter<_Tp*> __i)
-{
-    return __i.base();
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL < 2
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        *__result = *__first;
-    return __result;
-}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_same<typename remove_const<_Tp>::type, _Up>::value &&
-    is_trivially_copy_assignable<_Up>::value,
-    _Up*
->::type
-__copy(_Tp* __first, _Tp* __last, _Up* __result)
-{
-    const size_t __n = static_cast<size_t>(__last - __first);
-    _VSTD::memmove(__result, __first, __n * sizeof(_Up));
-    return __result + __n;
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    return _VSTD::__copy(__unwrap_iter(__first), __unwrap_iter(__last), __unwrap_iter(__result));
-}
-
-// copy_backward
-
-template <class _BidirectionalIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__copy_backward(_BidirectionalIterator __first, _BidirectionalIterator __last, _OutputIterator __result)
-{
-    while (__first != __last)
-        *--__result = *--__last;
-    return __result;
-}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_same<typename remove_const<_Tp>::type, _Up>::value &&
-    is_trivially_copy_assignable<_Up>::value,
-    _Up*
->::type
-__copy_backward(_Tp* __first, _Tp* __last, _Up* __result)
-{
-    const size_t __n = static_cast<size_t>(__last - __first);
-    __result -= __n;
-    _VSTD::memmove(__result, __first, __n * sizeof(_Up));
-    return __result;
-}
-
-template <class _BidirectionalIterator1, class _BidirectionalIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_BidirectionalIterator2
-copy_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last,
-              _BidirectionalIterator2 __result)
-{
-    return _VSTD::__copy_backward(__unwrap_iter(__first), __unwrap_iter(__last), __unwrap_iter(__result));
-}
-
-// copy_if
-
-template<class _InputIterator, class _OutputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-copy_if(_InputIterator __first, _InputIterator __last,
-        _OutputIterator __result, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-    {
-        if (__pred(*__first))
-        {
-            *__result = *__first;
-            ++__result;
-        }
-    }
-    return __result;
-}
-
-// copy_n
-
-template<class _InputIterator, class _Size, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value &&
-   !__is_random_access_iterator<_InputIterator>::value,
-    _OutputIterator
->::type
-copy_n(_InputIterator __first, _Size __n, _OutputIterator __result)
-{
-    if (__n > 0)
-    {
-        *__result = *__first;
-        ++__result;
-        for (--__n; __n > 0; --__n)
-        {
-            ++__first;
-            *__result = *__first;
-            ++__result;
-        }
-    }
-    return __result;
-}
-
-template<class _InputIterator, class _Size, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_random_access_iterator<_InputIterator>::value,
-    _OutputIterator
->::type
-copy_n(_InputIterator __first, _Size __n, _OutputIterator __result)
-{
-    return _VSTD::copy(__first, __first + __n, __result);
-}
-
-// move
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__move(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        *__result = _VSTD::move(*__first);
-    return __result;
-}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_same<typename remove_const<_Tp>::type, _Up>::value &&
-    is_trivially_copy_assignable<_Up>::value,
-    _Up*
->::type
-__move(_Tp* __first, _Tp* __last, _Up* __result)
-{
-    const size_t __n = static_cast<size_t>(__last - __first);
-    _VSTD::memmove(__result, __first, __n * sizeof(_Up));
-    return __result + __n;
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-move(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    return _VSTD::__move(__unwrap_iter(__first), __unwrap_iter(__last), __unwrap_iter(__result));
-}
-
-// move_backward
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__move_backward(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    while (__first != __last)
-        *--__result = _VSTD::move(*--__last);
-    return __result;
-}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_same<typename remove_const<_Tp>::type, _Up>::value &&
-    is_trivially_copy_assignable<_Up>::value,
-    _Up*
->::type
-__move_backward(_Tp* __first, _Tp* __last, _Up* __result)
-{
-    const size_t __n = static_cast<size_t>(__last - __first);
-    __result -= __n;
-    _VSTD::memmove(__result, __first, __n * sizeof(_Up));
-    return __result;
-}
-
-template <class _BidirectionalIterator1, class _BidirectionalIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_BidirectionalIterator2
-move_backward(_BidirectionalIterator1 __first, _BidirectionalIterator1 __last,
-              _BidirectionalIterator2 __result)
-{
-    return _VSTD::__move_backward(__unwrap_iter(__first), __unwrap_iter(__last), __unwrap_iter(__result));
-}
-
-// iter_swap
-
-// moved to <type_traits> for better swap / noexcept support
-
-// transform
-
-template <class _InputIterator, class _OutputIterator, class _UnaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-transform(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _UnaryOperation __op)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        *__result = __op(*__first);
-    return __result;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _BinaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-transform(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2,
-          _OutputIterator __result, _BinaryOperation __binary_op)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2, ++__result)
-        *__result = __binary_op(*__first1, *__first2);
-    return __result;
-}
-
-// replace
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-replace(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __old_value, const _Tp& __new_value)
-{
-    for (; __first != __last; ++__first)
-        if (*__first == __old_value)
-            *__first = __new_value;
-}
-
-// replace_if
-
-template <class _ForwardIterator, class _Predicate, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-replace_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred, const _Tp& __new_value)
-{
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            *__first = __new_value;
-}
-
-// replace_copy
-
-template <class _InputIterator, class _OutputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-replace_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
-             const _Tp& __old_value, const _Tp& __new_value)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        if (*__first == __old_value)
-            *__result = __new_value;
-        else
-            *__result = *__first;
-    return __result;
-}
-
-// replace_copy_if
-
-template <class _InputIterator, class _OutputIterator, class _Predicate, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-replace_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
-                _Predicate __pred, const _Tp& __new_value)
-{
-    for (; __first != __last; ++__first, (void) ++__result)
-        if (__pred(*__first))
-            *__result = __new_value;
-        else
-            *__result = *__first;
-    return __result;
-}
-
-// fill_n
-
-template <class _OutputIterator, class _Size, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-__fill_n(_OutputIterator __first, _Size __n, const _Tp& __value_)
-{
-    for (; __n > 0; ++__first, (void) --__n)
-        *__first = __value_;
-    return __first;
-}
-
-template <class _Tp, class _Size, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && sizeof(_Tp) == 1 &&
-    !is_same<_Tp, bool>::value &&
-    is_integral<_Up>::value && sizeof(_Up) == 1,
-    _Tp*
->::type
-__fill_n(_Tp* __first, _Size __n,_Up __value_)
-{
-    if (__n > 0)
-        _VSTD::memset(__first, (unsigned char)__value_, (size_t)(__n));
-    return __first + __n;
-}
-
-template <class _OutputIterator, class _Size, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-fill_n(_OutputIterator __first, _Size __n, const _Tp& __value_)
-{
-   return _VSTD::__fill_n(__first, __n, __value_);
-}
-
-// fill
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, forward_iterator_tag)
-{
-    for (; __first != __last; ++__first)
-        *__first = __value_;
-}
-
-template <class _RandomAccessIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__fill(_RandomAccessIterator __first, _RandomAccessIterator __last, const _Tp& __value_, random_access_iterator_tag)
-{
-    _VSTD::fill_n(__first, __last - __first, __value_);
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    _VSTD::__fill(__first, __last, __value_, typename iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-// generate
-
-template <class _ForwardIterator, class _Generator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen)
-{
-    for (; __first != __last; ++__first)
-        *__first = __gen();
-}
-
-// generate_n
-
-template <class _OutputIterator, class _Size, class _Generator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-generate_n(_OutputIterator __first, _Size __n, _Generator __gen)
-{
-    for (; __n > 0; ++__first, (void) --__n)
-        *__first = __gen();
-    return __first;
-}
-
-// remove
-
-template <class _ForwardIterator, class _Tp>
-_ForwardIterator
-remove(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    __first = _VSTD::find(__first, __last, __value_);
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (!(*__i == __value_))
-            {
-                *__first = _VSTD::move(*__i);
-                ++__first;
-            }
-        }
-    }
-    return __first;
-}
-
-// remove_if
-
-template <class _ForwardIterator, class _Predicate>
-_ForwardIterator
-remove_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
-{
-    __first = _VSTD::find_if<_ForwardIterator, typename add_lvalue_reference<_Predicate>::type>
-                           (__first, __last, __pred);
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (!__pred(*__i))
-            {
-                *__first = _VSTD::move(*__i);
-                ++__first;
-            }
-        }
-    }
-    return __first;
-}
-
-// remove_copy
-
-template <class _InputIterator, class _OutputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-remove_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result, const _Tp& __value_)
-{
-    for (; __first != __last; ++__first)
-    {
-        if (!(*__first == __value_))
-        {
-            *__result = *__first;
-            ++__result;
-        }
-    }
-    return __result;
-}
-
-// remove_copy_if
-
-template <class _InputIterator, class _OutputIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-remove_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-    {
-        if (!__pred(*__first))
-        {
-            *__result = *__first;
-            ++__result;
-        }
-    }
-    return __result;
-}
-
-// unique
-
-template <class _ForwardIterator, class _BinaryPredicate>
-_ForwardIterator
-unique(_ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred)
-{
-    __first = _VSTD::adjacent_find<_ForwardIterator, typename add_lvalue_reference<_BinaryPredicate>::type>
-                                 (__first, __last, __pred);
-    if (__first != __last)
-    {
-        // ...  a  a  ?  ...
-        //      f     i
-        _ForwardIterator __i = __first;
-        for (++__i; ++__i != __last;)
-            if (!__pred(*__first, *__i))
-                *++__first = _VSTD::move(*__i);
-        ++__first;
-    }
-    return __first;
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-unique(_ForwardIterator __first, _ForwardIterator __last)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type __v;
-    return _VSTD::unique(__first, __last, __equal_to<__v>());
-}
-
-// unique_copy
-
-template <class _BinaryPredicate, class _InputIterator, class _OutputIterator>
-_OutputIterator
-__unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _BinaryPredicate __pred,
-              input_iterator_tag, output_iterator_tag)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t(*__first);
-        *__result = __t;
-        ++__result;
-        while (++__first != __last)
-        {
-            if (!__pred(__t, *__first))
-            {
-                __t = *__first;
-                *__result = __t;
-                ++__result;
-            }
-        }
-    }
-    return __result;
-}
-
-template <class _BinaryPredicate, class _ForwardIterator, class _OutputIterator>
-_OutputIterator
-__unique_copy(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result, _BinaryPredicate __pred,
-              forward_iterator_tag, output_iterator_tag)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        *__result = *__i;
-        ++__result;
-        while (++__first != __last)
-        {
-            if (!__pred(*__i, *__first))
-            {
-                *__result = *__first;
-                ++__result;
-                __i = __first;
-            }
-        }
-    }
-    return __result;
-}
-
-template <class _BinaryPredicate, class _InputIterator, class _ForwardIterator>
-_ForwardIterator
-__unique_copy(_InputIterator __first, _InputIterator __last, _ForwardIterator __result, _BinaryPredicate __pred,
-              input_iterator_tag, forward_iterator_tag)
-{
-    if (__first != __last)
-    {
-        *__result = *__first;
-        while (++__first != __last)
-            if (!__pred(*__result, *__first))
-                *++__result = *__first;
-        ++__result;
-    }
-    return __result;
-}
-
-template <class _InputIterator, class _OutputIterator, class _BinaryPredicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result, _BinaryPredicate __pred)
-{
-    return _VSTD::__unique_copy<typename add_lvalue_reference<_BinaryPredicate>::type>
-                              (__first, __last, __result, __pred,
-                               typename iterator_traits<_InputIterator>::iterator_category(),
-                               typename iterator_traits<_OutputIterator>::iterator_category());
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-unique_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    typedef typename iterator_traits<_InputIterator>::value_type __v;
-    return _VSTD::unique_copy(__first, __last, __result, __equal_to<__v>());
-}
-
-// reverse
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__reverse(_BidirectionalIterator __first, _BidirectionalIterator __last, bidirectional_iterator_tag)
-{
-    while (__first != __last)
-    {
-        if (__first == --__last)
-            break;
-        swap(*__first, *__last);
-        ++__first;
-    }
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__reverse(_RandomAccessIterator __first, _RandomAccessIterator __last, random_access_iterator_tag)
-{
-    if (__first != __last)
-        for (; __first < --__last; ++__first)
-            swap(*__first, *__last);
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-reverse(_BidirectionalIterator __first, _BidirectionalIterator __last)
-{
-    _VSTD::__reverse(__first, __last, typename iterator_traits<_BidirectionalIterator>::iterator_category());
-}
-
-// reverse_copy
-
-template <class _BidirectionalIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-reverse_copy(_BidirectionalIterator __first, _BidirectionalIterator __last, _OutputIterator __result)
-{
-    for (; __first != __last; ++__result)
-        *__result = *--__last;
-    return __result;
-}
-
-// rotate
-
-template <class _ForwardIterator>
-_ForwardIterator
-__rotate_left(_ForwardIterator __first, _ForwardIterator __last)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-    value_type __tmp = _VSTD::move(*__first);
-    _ForwardIterator __lm1 = _VSTD::move(_VSTD::next(__first), __last, __first);
-    *__lm1 = _VSTD::move(__tmp);
-    return __lm1;
-}
-
-template <class _BidirectionalIterator>
-_BidirectionalIterator
-__rotate_right(_BidirectionalIterator __first, _BidirectionalIterator __last)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-    _BidirectionalIterator __lm1 = _VSTD::prev(__last);
-    value_type __tmp = _VSTD::move(*__lm1);
-    _BidirectionalIterator __fp1 = _VSTD::move_backward(__first, __lm1, __last);
-    *__first = _VSTD::move(__tmp);
-    return __fp1;
-}
-
-template <class _ForwardIterator>
-_ForwardIterator
-__rotate_forward(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last)
-{
-    _ForwardIterator __i = __middle;
-    while (true)
-    {
-        swap(*__first, *__i);
-        ++__first;
-        if (++__i == __last)
-            break;
-        if (__first == __middle)
-            __middle = __i;
-    }
-    _ForwardIterator __r = __first;
-    if (__first != __middle)
-    {
-        __i = __middle;
-        while (true)
-        {
-            swap(*__first, *__i);
-            ++__first;
-            if (++__i == __last)
-            {
-                if (__first == __middle)
-                    break;
-                __i = __middle;
-            }
-            else if (__first == __middle)
-                __middle = __i;
-        }
-    }
-    return __r;
-}
-
-template<typename _Integral>
-inline _LIBCPP_INLINE_VISIBILITY
-_Integral
-__gcd(_Integral __x, _Integral __y)
-{
-    do
-    {
-        _Integral __t = __x % __y;
-        __x = __y;
-        __y = __t;
-    } while (__y);
-    return __x;
-}
-
-template<typename _RandomAccessIterator>
-_RandomAccessIterator
-__rotate_gcd(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-
-    const difference_type __m1 = __middle - __first;
-    const difference_type __m2 = __last - __middle;
-    if (__m1 == __m2)
-    {
-        _VSTD::swap_ranges(__first, __middle, __middle);
-        return __middle;
-    }
-    const difference_type __g = _VSTD::__gcd(__m1, __m2);
-    for (_RandomAccessIterator __p = __first + __g; __p != __first;)
-    {
-        value_type __t(_VSTD::move(*--__p));
-        _RandomAccessIterator __p1 = __p;
-        _RandomAccessIterator __p2 = __p1 + __m1;
-        do
-        {
-            *__p1 = _VSTD::move(*__p2);
-            __p1 = __p2;
-            const difference_type __d = __last - __p2;
-            if (__m1 < __d)
-                __p2 += __m1;
-            else
-                __p2 = __first + (__m1 - __d);
-        } while (__p2 != __p);
-        *__p1 = _VSTD::move(__t);
-    }
-    return __first + __m2;
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-__rotate(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last,
-         _VSTD::forward_iterator_tag)
-{
-    typedef typename _VSTD::iterator_traits<_ForwardIterator>::value_type value_type;
-    if (_VSTD::is_trivially_move_assignable<value_type>::value)
-    {
-        if (_VSTD::next(__first) == __middle)
-            return _VSTD::__rotate_left(__first, __last);
-    }
-    return _VSTD::__rotate_forward(__first, __middle, __last);
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_BidirectionalIterator
-__rotate(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last,
-         _VSTD::bidirectional_iterator_tag)
-{
-    typedef typename _VSTD::iterator_traits<_BidirectionalIterator>::value_type value_type;
-    if (_VSTD::is_trivially_move_assignable<value_type>::value)
-    {
-        if (_VSTD::next(__first) == __middle)
-            return _VSTD::__rotate_left(__first, __last);
-        if (_VSTD::next(__middle) == __last)
-            return _VSTD::__rotate_right(__first, __last);
-    }
-    return _VSTD::__rotate_forward(__first, __middle, __last);
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_RandomAccessIterator
-__rotate(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last,
-         _VSTD::random_access_iterator_tag)
-{
-    typedef typename _VSTD::iterator_traits<_RandomAccessIterator>::value_type value_type;
-    if (_VSTD::is_trivially_move_assignable<value_type>::value)
-    {
-        if (_VSTD::next(__first) == __middle)
-            return _VSTD::__rotate_left(__first, __last);
-        if (_VSTD::next(__middle) == __last)
-            return _VSTD::__rotate_right(__first, __last);
-        return _VSTD::__rotate_gcd(__first, __middle, __last);
-    }
-    return _VSTD::__rotate_forward(__first, __middle, __last);
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-rotate(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last)
-{
-    if (__first == __middle)
-        return __last;
-    if (__middle == __last)
-        return __first;
-    return _VSTD::__rotate(__first, __middle, __last,
-                           typename _VSTD::iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-// rotate_copy
-
-template <class _ForwardIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-rotate_copy(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last, _OutputIterator __result)
-{
-    return _VSTD::copy(__first, __middle, _VSTD::copy(__middle, __last, __result));
-}
-
-// min_element
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_ForwardIterator
-__min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-            if (__comp(*__i, *__first))
-                __first = __i;
-    }
-    return __first;
-}
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-min_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    return __min_element(__first, __last, __comp);
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-min_element(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return __min_element(__first, __last,
-              __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// min
-
-template <class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-min(const _Tp& __a, const _Tp& __b, _Compare __comp)
-{
-    return __comp(__b, __a) ? __b : __a;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-min(const _Tp& __a, const _Tp& __b)
-{
-    return _VSTD::min(__a, __b, __less<_Tp>());
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-min(initializer_list<_Tp> __t, _Compare __comp)
-{
-    return *__min_element(__t.begin(), __t.end(), __comp);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-min(initializer_list<_Tp> __t)
-{
-    return *__min_element(__t.begin(), __t.end(), __less<_Tp>());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-// max_element
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_ForwardIterator
-__max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-            if (__comp(*__first, *__i))
-                __first = __i;
-    }
-    return __first;
-}
-
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-max_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    return __max_element(__first, __last, __comp);
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-max_element(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return __max_element(__first, __last,
-              __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// max
-
-template <class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-max(const _Tp& __a, const _Tp& __b, _Compare __comp)
-{
-    return __comp(__a, __b) ? __b : __a;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-max(const _Tp& __a, const _Tp& __b)
-{
-    return _VSTD::max(__a, __b, __less<_Tp>());
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-max(initializer_list<_Tp> __t, _Compare __comp)
-{
-    return *__max_element(__t.begin(), __t.end(), __comp);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-max(initializer_list<_Tp> __t)
-{
-    return *__max_element(__t.begin(), __t.end(), __less<_Tp>());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-// minmax_element
-
-template <class _ForwardIterator, class _Compare>
-std::pair<_ForwardIterator, _ForwardIterator>
-minmax_element(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-  std::pair<_ForwardIterator, _ForwardIterator> __result(__first, __first);
-  if (__first != __last)
-  {
-      if (++__first != __last)
-      {
-          if (__comp(*__first, *__result.first))
-              __result.first = __first;
-          else
-              __result.second = __first;
-          while (++__first != __last)
-          {
-              _ForwardIterator __i = __first;
-              if (++__first == __last)
-              {
-                  if (__comp(*__i, *__result.first))
-                      __result.first = __i;
-                  else if (!__comp(*__i, *__result.second))
-                      __result.second = __i;
-                  break;
-              }
-              else
-              {
-                  if (__comp(*__first, *__i))
-                  {
-                      if (__comp(*__first, *__result.first))
-                          __result.first = __first;
-                      if (!__comp(*__i, *__result.second))
-                          __result.second = __i;
-                  }
-                  else
-                  {
-                      if (__comp(*__i, *__result.first))
-                          __result.first = __i;
-                      if (!__comp(*__first, *__result.second))
-                          __result.second = __first;
-                  }
-              }
-          }
-      }
-  }
-  return __result;
-}
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-std::pair<_ForwardIterator, _ForwardIterator>
-minmax_element(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return _VSTD::minmax_element(__first, __last,
-              __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// minmax
-
-template<class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<const _Tp&, const _Tp&>
-minmax(const _Tp& __a, const _Tp& __b, _Compare __comp)
-{
-    return __comp(__b, __a) ? pair<const _Tp&, const _Tp&>(__b, __a) :
-                              pair<const _Tp&, const _Tp&>(__a, __b);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<const _Tp&, const _Tp&>
-minmax(const _Tp& __a, const _Tp& __b)
-{
-    return _VSTD::minmax(__a, __b, __less<_Tp>());
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<_Tp, _Tp>
-minmax(initializer_list<_Tp> __t, _Compare __comp)
-{
-    typedef typename initializer_list<_Tp>::const_iterator _Iter;
-    _Iter __first = __t.begin();
-    _Iter __last  = __t.end();
-    std::pair<_Tp, _Tp> __result ( *__first, *__first );
-
-    ++__first;
-    if (__t.size() % 2 == 0)
-    {
-        if (__comp(*__first,  __result.first))
-            __result.first  = *__first;
-        else
-            __result.second = *__first;
-        ++__first;
-    }
-    
-    while (__first != __last)
-    {
-        _Tp __prev = *__first++;
-        if (__comp(__prev, *__first)) {
-            if (__comp(__prev, __result.first))    __result.first  = __prev;
-            if (__comp(__result.second, *__first)) __result.second = *__first;
-            }
-        else {
-            if (__comp(*__first, __result.first)) __result.first  = *__first;
-            if (__comp(__result.second, __prev))  __result.second = __prev;
-            }
-                
-        __first++;
-    }
-    return __result;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<_Tp, _Tp>
-minmax(initializer_list<_Tp> __t)
-{
-    return _VSTD::minmax(__t, __less<_Tp>());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-// random_shuffle
-
-// __independent_bits_engine
-
-template <unsigned long long _Xp, size_t _Rp>
-struct __log2_imp
-{
-    static const size_t value = _Xp & ((unsigned long long)(1) << _Rp) ? _Rp
-                                           : __log2_imp<_Xp, _Rp - 1>::value;
-};
-
-template <unsigned long long _Xp>
-struct __log2_imp<_Xp, 0>
-{
-    static const size_t value = 0;
-};
-
-template <size_t _Rp>
-struct __log2_imp<0, _Rp>
-{
-    static const size_t value = _Rp + 1;
-};
-
-template <class _UI, _UI _Xp>
-struct __log2
-{
-    static const size_t value = __log2_imp<_Xp,
-                                         sizeof(_UI) * __CHAR_BIT__ - 1>::value;
-};
-
-template<class _Engine, class _UIntType>
-class __independent_bits_engine
-{
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    typedef typename _Engine::result_type _Engine_result_type;
-    typedef typename conditional
-        <
-            sizeof(_Engine_result_type) <= sizeof(result_type),
-                result_type,
-                _Engine_result_type
-        >::type _Working_result_type;
-
-    _Engine& __e_;
-    size_t __w_;
-    size_t __w0_;
-    size_t __n_;
-    size_t __n0_;
-    _Working_result_type __y0_;
-    _Working_result_type __y1_;
-    _Engine_result_type __mask0_;
-    _Engine_result_type __mask1_;
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    static const _Working_result_type _Rp = _Engine::_Max - _Engine::_Min
-                                          + _Working_result_type(1);
-#else
-    static _LIBCPP_CONSTEXPR const _Working_result_type _Rp = _Engine::max() - _Engine::min()
-                                                      + _Working_result_type(1);
-#endif
-    static _LIBCPP_CONSTEXPR const size_t __m = __log2<_Working_result_type, _Rp>::value;
-    static _LIBCPP_CONSTEXPR const size_t _WDt = numeric_limits<_Working_result_type>::digits;
-    static _LIBCPP_CONSTEXPR const size_t _EDt = numeric_limits<_Engine_result_type>::digits;
-
-public:
-    // constructors and seeding functions
-    __independent_bits_engine(_Engine& __e, size_t __w);
-
-    // generating functions
-    result_type operator()() {return __eval(integral_constant<bool, _Rp != 0>());}
-
-private:
-    result_type __eval(false_type);
-    result_type __eval(true_type);
-};
-
-template<class _Engine, class _UIntType>
-__independent_bits_engine<_Engine, _UIntType>
-    ::__independent_bits_engine(_Engine& __e, size_t __w)
-        : __e_(__e),
-          __w_(__w)
-{
-    __n_ = __w_ / __m + (__w_ % __m != 0);
-    __w0_ = __w_ / __n_;
-    if (_Rp == 0)
-        __y0_ = _Rp;
-    else if (__w0_ < _WDt)
-        __y0_ = (_Rp >> __w0_) << __w0_;
-    else
-        __y0_ = 0;
-    if (_Rp - __y0_ > __y0_ / __n_)
-    {
-        ++__n_;
-        __w0_ = __w_ / __n_;
-        if (__w0_ < _WDt)
-            __y0_ = (_Rp >> __w0_) << __w0_;
-        else
-            __y0_ = 0;
-    }
-    __n0_ = __n_ - __w_ % __n_;
-    if (__w0_ < _WDt - 1)
-        __y1_ = (_Rp >> (__w0_ + 1)) << (__w0_ + 1);
-    else
-        __y1_ = 0;
-    __mask0_ = __w0_ > 0 ? _Engine_result_type(~0) >> (_EDt - __w0_) :
-                          _Engine_result_type(0);
-    __mask1_ = __w0_ < _EDt - 1 ?
-                               _Engine_result_type(~0) >> (_EDt - (__w0_ + 1)) :
-                               _Engine_result_type(~0);
-}
-
-template<class _Engine, class _UIntType>
-inline
-_UIntType
-__independent_bits_engine<_Engine, _UIntType>::__eval(false_type)
-{
-    return static_cast<result_type>(__e_() & __mask0_);
-}
-
-template<class _Engine, class _UIntType>
-_UIntType
-__independent_bits_engine<_Engine, _UIntType>::__eval(true_type)
-{
-    result_type _Sp = 0;
-    for (size_t __k = 0; __k < __n0_; ++__k)
-    {
-        _Engine_result_type __u;
-        do
-        {
-            __u = __e_() - _Engine::min();
-        } while (__u >= __y0_);
-        if (__w0_ < _WDt)
-            _Sp <<= __w0_;
-        else
-            _Sp = 0;
-        _Sp += __u & __mask0_;
-    }
-    for (size_t __k = __n0_; __k < __n_; ++__k)
-    {
-        _Engine_result_type __u;
-        do
-        {
-            __u = __e_() - _Engine::min();
-        } while (__u >= __y1_);
-        if (__w0_ < _WDt - 1)
-            _Sp <<= __w0_ + 1;
-        else
-            _Sp = 0;
-        _Sp += __u & __mask1_;
-    }
-    return _Sp;
-}
-
-// uniform_int_distribution
-
-template<class _IntType = int>
-class uniform_int_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef uniform_int_distribution distribution_type;
-
-        explicit param_type(result_type __a = 0,
-                            result_type __b = numeric_limits<result_type>::max())
-            : __a_(__a), __b_(__b) {}
-
-        result_type a() const {return __a_;}
-        result_type b() const {return __b_;}
-
-        friend bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    explicit uniform_int_distribution(result_type __a = 0,
-                                      result_type __b = numeric_limits<result_type>::max())
-        : __p_(param_type(__a, __b)) {}
-    explicit uniform_int_distribution(const param_type& __p) : __p_(__p) {}
-    void reset() {}
-
-    // generating functions
-    template<class _URNG> result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    result_type a() const {return __p_.a();}
-    result_type b() const {return __p_.b();}
-
-    param_type param() const {return __p_;}
-    void param(const param_type& __p) {__p_ = __p;}
-
-    result_type min() const {return a();}
-    result_type max() const {return b();}
-
-    friend bool operator==(const uniform_int_distribution& __x,
-                           const uniform_int_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend bool operator!=(const uniform_int_distribution& __x,
-                           const uniform_int_distribution& __y)
-            {return !(__x == __y);}
-};
-
-template<class _IntType>
-template<class _URNG>
-typename uniform_int_distribution<_IntType>::result_type
-uniform_int_distribution<_IntType>::operator()(_URNG& __g, const param_type& __p)
-{
-    typedef typename conditional<sizeof(result_type) <= sizeof(uint32_t),
-                                            uint32_t, uint64_t>::type _UIntType;
-    const _UIntType _Rp = __p.b() - __p.a() + _UIntType(1);
-    if (_Rp == 1)
-        return __p.a();
-    const size_t _Dt = numeric_limits<_UIntType>::digits;
-    typedef __independent_bits_engine<_URNG, _UIntType> _Eng;
-    if (_Rp == 0)
-        return static_cast<result_type>(_Eng(__g, _Dt)());
-    size_t __w = _Dt - __clz(_Rp) - 1;
-    if ((_Rp & (_UIntType(~0) >> (_Dt - __w))) != 0)
-        ++__w;
-    _Eng __e(__g, __w);
-    _UIntType __u;
-    do
-    {
-        __u = __e();
-    } while (__u >= _Rp);
-    return static_cast<result_type>(__u + __p.a());
-}
-
-class _LIBCPP_TYPE_VIS __rs_default;
-
-_LIBCPP_FUNC_VIS __rs_default __rs_get();
-
-class _LIBCPP_TYPE_VIS __rs_default
-{
-    static unsigned __c_;
-
-    __rs_default();
-public:
-    typedef uint_fast32_t result_type;
-
-    static const result_type _Min = 0;
-    static const result_type _Max = 0xFFFFFFFF;
-
-    __rs_default(const __rs_default&);
-    ~__rs_default();
-
-    result_type operator()();
-
-    static _LIBCPP_CONSTEXPR result_type min() {return _Min;}
-    static _LIBCPP_CONSTEXPR result_type max() {return _Max;}
-
-    friend _LIBCPP_FUNC_VIS __rs_default __rs_get();
-};
-
-_LIBCPP_FUNC_VIS __rs_default __rs_get();
-
-template <class _RandomAccessIterator>
-void
-random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef uniform_int_distribution<ptrdiff_t> _Dp;
-    typedef typename _Dp::param_type _Pp;
-    difference_type __d = __last - __first;
-    if (__d > 1)
-    {
-        _Dp __uid;
-        __rs_default __g = __rs_get();
-        for (--__last, --__d; __first < __last; ++__first, --__d)
-        {
-            difference_type __i = __uid(__g, _Pp(0, __d));
-            if (__i != difference_type(0))
-                swap(*__first, *(__first + __i));
-        }
-    }
-}
-
-template <class _RandomAccessIterator, class _RandomNumberGenerator>
-void
-random_shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-               _RandomNumberGenerator&& __rand)
-#else
-               _RandomNumberGenerator& __rand)
-#endif
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    difference_type __d = __last - __first;
-    if (__d > 1)
-    {
-        for (--__last; __first < __last; ++__first, --__d)
-        {
-            difference_type __i = __rand(__d);
-            swap(*__first, *(__first + __i));
-        }
-    }
-}
-
-template<class _RandomAccessIterator, class _UniformRandomNumberGenerator>
-    void shuffle(_RandomAccessIterator __first, _RandomAccessIterator __last,
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-                 _UniformRandomNumberGenerator&& __g)
-#else
-                 _UniformRandomNumberGenerator& __g)
-#endif
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef uniform_int_distribution<ptrdiff_t> _Dp;
-    typedef typename _Dp::param_type _Pp;
-    difference_type __d = __last - __first;
-    if (__d > 1)
-    {
-        _Dp __uid;
-        for (--__last, --__d; __first < __last; ++__first, --__d)
-        {
-            difference_type __i = __uid(__g, _Pp(0, __d));
-            if (__i != difference_type(0))
-                swap(*__first, *(__first + __i));
-        }
-    }
-}
-
-template <class _InputIterator, class _Predicate>
-bool
-is_partitioned(_InputIterator __first, _InputIterator __last, _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-        if (!__pred(*__first))
-            break;
-    for (; __first != __last; ++__first)
-        if (__pred(*__first))
-            return false;
-    return true;
-}
-
-// partition
-
-template <class _Predicate, class _ForwardIterator>
-_ForwardIterator
-__partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred, forward_iterator_tag)
-{
-    while (true)
-    {
-        if (__first == __last)
-            return __first;
-        if (!__pred(*__first))
-            break;
-        ++__first;
-    }
-    for (_ForwardIterator __p = __first; ++__p != __last;)
-    {
-        if (__pred(*__p))
-        {
-            swap(*__first, *__p);
-            ++__first;
-        }
-    }
-    return __first;
-}
-
-template <class _Predicate, class _BidirectionalIterator>
-_BidirectionalIterator
-__partition(_BidirectionalIterator __first, _BidirectionalIterator __last, _Predicate __pred,
-            bidirectional_iterator_tag)
-{
-    while (true)
-    {
-        while (true)
-        {
-            if (__first == __last)
-                return __first;
-            if (!__pred(*__first))
-                break;
-            ++__first;
-        }
-        do
-        {
-            if (__first == --__last)
-                return __first;
-        } while (!__pred(*__last));
-        swap(*__first, *__last);
-        ++__first;
-    }
-}
-
-template <class _ForwardIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
-{
-    return _VSTD::__partition<typename add_lvalue_reference<_Predicate>::type>
-                            (__first, __last, __pred, typename iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-// partition_copy
-
-template <class _InputIterator, class _OutputIterator1,
-          class _OutputIterator2, class _Predicate>
-pair<_OutputIterator1, _OutputIterator2>
-partition_copy(_InputIterator __first, _InputIterator __last,
-               _OutputIterator1 __out_true, _OutputIterator2 __out_false,
-               _Predicate __pred)
-{
-    for (; __first != __last; ++__first)
-    {
-        if (__pred(*__first))
-        {
-            *__out_true = *__first;
-            ++__out_true;
-        }
-        else
-        {
-            *__out_false = *__first;
-            ++__out_false;
-        }
-    }
-    return pair<_OutputIterator1, _OutputIterator2>(__out_true, __out_false);
-}
-
-// partition_point
-
-template<class _ForwardIterator, class _Predicate>
-_ForwardIterator
-partition_point(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
-{
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    while (__len != 0)
-    {
-        difference_type __l2 = __len / 2;
-        _ForwardIterator __m = __first;
-        _VSTD::advance(__m, __l2);
-        if (__pred(*__m))
-        {
-            __first = ++__m;
-            __len -= __l2 + 1;
-        }
-        else
-            __len = __l2;
-    }
-    return __first;
-}
-
-// stable_partition
-
-template <class _Predicate, class _ForwardIterator, class _Distance, class _Pair>
-_ForwardIterator
-__stable_partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,
-                   _Distance __len, _Pair __p, forward_iterator_tag __fit)
-{
-    // *__first is known to be false
-    // __len >= 1
-    if (__len == 1)
-        return __first;
-    if (__len == 2)
-    {
-        _ForwardIterator __m = __first;
-        if (__pred(*++__m))
-        {
-            swap(*__first, *__m);
-            return __m;
-        }
-        return __first;
-    }
-    if (__len <= __p.second)
-    {   // The buffer is big enough to use
-        typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-        __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h(__p.first, __d);
-        // Move the falses into the temporary buffer, and the trues to the front of the line
-        // Update __first to always point to the end of the trues
-        value_type* __t = __p.first;
-        ::new(__t) value_type(_VSTD::move(*__first));
-        __d.__incr((value_type*)0);
-        ++__t;
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (__pred(*__i))
-            {
-                *__first = _VSTD::move(*__i);
-                ++__first;
-            }
-            else
-            {
-                ::new(__t) value_type(_VSTD::move(*__i));
-                __d.__incr((value_type*)0);
-                ++__t;
-            }
-        }
-        // All trues now at start of range, all falses in buffer
-        // Move falses back into range, but don't mess up __first which points to first false
-        __i = __first;
-        for (value_type* __t2 = __p.first; __t2 < __t; ++__t2, ++__i)
-            *__i = _VSTD::move(*__t2);
-        // __h destructs moved-from values out of the temp buffer, but doesn't deallocate buffer
-        return __first;
-    }
-    // Else not enough buffer, do in place
-    // __len >= 3
-    _ForwardIterator __m = __first;
-    _Distance __len2 = __len / 2;  // __len2 >= 2
-    _VSTD::advance(__m, __len2);
-    // recurse on [__first, __m), *__first know to be false
-    // F?????????????????
-    // f       m         l
-    typedef typename add_lvalue_reference<_Predicate>::type _PredRef;
-    _ForwardIterator __first_false = __stable_partition<_PredRef>(__first, __m, __pred, __len2, __p, __fit);
-    // TTTFFFFF??????????
-    // f  ff   m         l
-    // recurse on [__m, __last], except increase __m until *(__m) is false, *__last know to be true
-    _ForwardIterator __m1 = __m;
-    _ForwardIterator __second_false = __last;
-    _Distance __len_half = __len - __len2;
-    while (__pred(*__m1))
-    {
-        if (++__m1 == __last)
-            goto __second_half_done;
-        --__len_half;
-    }
-    // TTTFFFFFTTTF??????
-    // f  ff   m  m1     l
-    __second_false = __stable_partition<_PredRef>(__m1, __last, __pred, __len_half, __p, __fit);
-__second_half_done:
-    // TTTFFFFFTTTTTFFFFF
-    // f  ff   m    sf   l
-    return _VSTD::rotate(__first_false, __m, __second_false);
-    // TTTTTTTTFFFFFFFFFF
-    //         |
-}
-
-struct __return_temporary_buffer
-{
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void operator()(_Tp* __p) const {_VSTD::return_temporary_buffer(__p);}
-};
-
-template <class _Predicate, class _ForwardIterator>
-_ForwardIterator
-__stable_partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,
-                   forward_iterator_tag)
-{
-    const unsigned __alloc_limit = 3;  // might want to make this a function of trivial assignment
-    // Either prove all true and return __first or point to first false
-    while (true)
-    {
-        if (__first == __last)
-            return __first;
-        if (!__pred(*__first))
-            break;
-        ++__first;
-    }
-    // We now have a reduced range [__first, __last)
-    // *__first is known to be false
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    pair<value_type*, ptrdiff_t> __p(0, 0);
-    unique_ptr<value_type, __return_temporary_buffer> __h;
-    if (__len >= __alloc_limit)
-    {
-        __p = _VSTD::get_temporary_buffer<value_type>(__len);
-        __h.reset(__p.first);
-    }
-    return __stable_partition<typename add_lvalue_reference<_Predicate>::type>
-                             (__first, __last, __pred, __len, __p, forward_iterator_tag());
-}
-
-template <class _Predicate, class _BidirectionalIterator, class _Distance, class _Pair>
-_BidirectionalIterator
-__stable_partition(_BidirectionalIterator __first, _BidirectionalIterator __last, _Predicate __pred,
-                   _Distance __len, _Pair __p, bidirectional_iterator_tag __bit)
-{
-    // *__first is known to be false
-    // *__last is known to be true
-    // __len >= 2
-    if (__len == 2)
-    {
-        swap(*__first, *__last);
-        return __last;
-    }
-    if (__len == 3)
-    {
-        _BidirectionalIterator __m = __first;
-        if (__pred(*++__m))
-        {
-            swap(*__first, *__m);
-            swap(*__m, *__last);
-            return __last;
-        }
-        swap(*__m, *__last);
-        swap(*__first, *__m);
-        return __m;
-    }
-    if (__len <= __p.second)
-    {   // The buffer is big enough to use
-        typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-        __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h(__p.first, __d);
-        // Move the falses into the temporary buffer, and the trues to the front of the line
-        // Update __first to always point to the end of the trues
-        value_type* __t = __p.first;
-        ::new(__t) value_type(_VSTD::move(*__first));
-        __d.__incr((value_type*)0);
-        ++__t;
-        _BidirectionalIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (__pred(*__i))
-            {
-                *__first = _VSTD::move(*__i);
-                ++__first;
-            }
-            else
-            {
-                ::new(__t) value_type(_VSTD::move(*__i));
-                __d.__incr((value_type*)0);
-                ++__t;
-            }
-        }
-        // move *__last, known to be true
-        *__first = _VSTD::move(*__i);
-        __i = ++__first;
-        // All trues now at start of range, all falses in buffer
-        // Move falses back into range, but don't mess up __first which points to first false
-        for (value_type* __t2 = __p.first; __t2 < __t; ++__t2, ++__i)
-            *__i = _VSTD::move(*__t2);
-        // __h destructs moved-from values out of the temp buffer, but doesn't deallocate buffer
-        return __first;
-    }
-    // Else not enough buffer, do in place
-    // __len >= 4
-    _BidirectionalIterator __m = __first;
-    _Distance __len2 = __len / 2;  // __len2 >= 2
-    _VSTD::advance(__m, __len2);
-    // recurse on [__first, __m-1], except reduce __m-1 until *(__m-1) is true, *__first know to be false
-    // F????????????????T
-    // f       m        l
-    _BidirectionalIterator __m1 = __m;
-    _BidirectionalIterator __first_false = __first;
-    _Distance __len_half = __len2;
-    while (!__pred(*--__m1))
-    {
-        if (__m1 == __first)
-            goto __first_half_done;
-        --__len_half;
-    }
-    // F???TFFF?????????T
-    // f   m1  m        l
-    typedef typename add_lvalue_reference<_Predicate>::type _PredRef;
-    __first_false = __stable_partition<_PredRef>(__first, __m1, __pred, __len_half, __p, __bit);
-__first_half_done:
-    // TTTFFFFF?????????T
-    // f  ff   m        l
-    // recurse on [__m, __last], except increase __m until *(__m) is false, *__last know to be true
-    __m1 = __m;
-    _BidirectionalIterator __second_false = __last;
-    ++__second_false;
-    __len_half = __len - __len2;
-    while (__pred(*__m1))
-    {
-        if (++__m1 == __last)
-            goto __second_half_done;
-        --__len_half;
-    }
-    // TTTFFFFFTTTF?????T
-    // f  ff   m  m1    l
-    __second_false = __stable_partition<_PredRef>(__m1, __last, __pred, __len_half, __p, __bit);
-__second_half_done:
-    // TTTFFFFFTTTTTFFFFF
-    // f  ff   m    sf  l
-    return _VSTD::rotate(__first_false, __m, __second_false);
-    // TTTTTTTTFFFFFFFFFF
-    //         |
-}
-
-template <class _Predicate, class _BidirectionalIterator>
-_BidirectionalIterator
-__stable_partition(_BidirectionalIterator __first, _BidirectionalIterator __last, _Predicate __pred,
-                   bidirectional_iterator_tag)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-    const difference_type __alloc_limit = 4;  // might want to make this a function of trivial assignment
-    // Either prove all true and return __first or point to first false
-    while (true)
-    {
-        if (__first == __last)
-            return __first;
-        if (!__pred(*__first))
-            break;
-        ++__first;
-    }
-    // __first points to first false, everything prior to __first is already set.
-    // Either prove [__first, __last) is all false and return __first, or point __last to last true
-    do
-    {
-        if (__first == --__last)
-            return __first;
-    } while (!__pred(*__last));
-    // We now have a reduced range [__first, __last]
-    // *__first is known to be false
-    // *__last is known to be true
-    // __len >= 2
-    difference_type __len = _VSTD::distance(__first, __last) + 1;
-    pair<value_type*, ptrdiff_t> __p(0, 0);
-    unique_ptr<value_type, __return_temporary_buffer> __h;
-    if (__len >= __alloc_limit)
-    {
-        __p = _VSTD::get_temporary_buffer<value_type>(__len);
-        __h.reset(__p.first);
-    }
-    return __stable_partition<typename add_lvalue_reference<_Predicate>::type>
-                             (__first, __last, __pred, __len, __p, bidirectional_iterator_tag());
-}
-
-template <class _ForwardIterator, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-stable_partition(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)
-{
-    return __stable_partition<typename add_lvalue_reference<_Predicate>::type>
-                             (__first, __last, __pred, typename iterator_traits<_ForwardIterator>::iterator_category());
-}
-
-// is_sorted_until
-
-template <class _ForwardIterator, class _Compare>
-_ForwardIterator
-is_sorted_until(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __i = __first;
-        while (++__i != __last)
-        {
-            if (__comp(*__i, *__first))
-                return __i;
-            __first = __i;
-        }
-    }
-    return __last;
-}
-
-template<class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-is_sorted_until(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return _VSTD::is_sorted_until(__first, __last, __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// is_sorted
-
-template <class _ForwardIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_sorted(_ForwardIterator __first, _ForwardIterator __last, _Compare __comp)
-{
-    return _VSTD::is_sorted_until(__first, __last, __comp) == __last;
-}
-
-template<class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_sorted(_ForwardIterator __first, _ForwardIterator __last)
-{
-    return _VSTD::is_sorted(__first, __last, __less<typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// sort
-
-// stable, 2-3 compares, 0-2 swaps
-
-template <class _Compare, class _ForwardIterator>
-unsigned
-__sort3(_ForwardIterator __x, _ForwardIterator __y, _ForwardIterator __z, _Compare __c)
-{
-    unsigned __r = 0;
-    if (!__c(*__y, *__x))          // if x <= y
-    {
-        if (!__c(*__z, *__y))      // if y <= z
-            return __r;            // x <= y && y <= z
-                                   // x <= y && y > z
-        swap(*__y, *__z);          // x <= z && y < z
-        __r = 1;
-        if (__c(*__y, *__x))       // if x > y
-        {
-            swap(*__x, *__y);      // x < y && y <= z
-            __r = 2;
-        }
-        return __r;                // x <= y && y < z
-    }
-    if (__c(*__z, *__y))           // x > y, if y > z
-    {
-        swap(*__x, *__z);          // x < y && y < z
-        __r = 1;
-        return __r;
-    }
-    swap(*__x, *__y);              // x > y && y <= z
-    __r = 1;                       // x < y && x <= z
-    if (__c(*__z, *__y))           // if y > z
-    {
-        swap(*__y, *__z);          // x <= y && y < z
-        __r = 2;
-    }
-    return __r;
-}                                  // x <= y && y <= z
-
-// stable, 3-6 compares, 0-5 swaps
-
-template <class _Compare, class _ForwardIterator>
-unsigned
-__sort4(_ForwardIterator __x1, _ForwardIterator __x2, _ForwardIterator __x3,
-            _ForwardIterator __x4, _Compare __c)
-{
-    unsigned __r = __sort3<_Compare>(__x1, __x2, __x3, __c);
-    if (__c(*__x4, *__x3))
-    {
-        swap(*__x3, *__x4);
-        ++__r;
-        if (__c(*__x3, *__x2))
-        {
-            swap(*__x2, *__x3);
-            ++__r;
-            if (__c(*__x2, *__x1))
-            {
-                swap(*__x1, *__x2);
-                ++__r;
-            }
-        }
-    }
-    return __r;
-}
-
-// stable, 4-10 compares, 0-9 swaps
-
-template <class _Compare, class _ForwardIterator>
-unsigned
-__sort5(_ForwardIterator __x1, _ForwardIterator __x2, _ForwardIterator __x3,
-            _ForwardIterator __x4, _ForwardIterator __x5, _Compare __c)
-{
-    unsigned __r = __sort4<_Compare>(__x1, __x2, __x3, __x4, __c);
-    if (__c(*__x5, *__x4))
-    {
-        swap(*__x4, *__x5);
-        ++__r;
-        if (__c(*__x4, *__x3))
-        {
-            swap(*__x3, *__x4);
-            ++__r;
-            if (__c(*__x3, *__x2))
-            {
-                swap(*__x2, *__x3);
-                ++__r;
-                if (__c(*__x2, *__x1))
-                {
-                    swap(*__x1, *__x2);
-                    ++__r;
-                }
-            }
-        }
-    }
-    return __r;
-}
-
-// Assumes size > 0
-template <class _Compare, class _BirdirectionalIterator>
-void
-__selection_sort(_BirdirectionalIterator __first, _BirdirectionalIterator __last, _Compare __comp)
-{
-    _BirdirectionalIterator __lm1 = __last;
-    for (--__lm1; __first != __lm1; ++__first)
-    {
-        _BirdirectionalIterator __i = _VSTD::min_element<_BirdirectionalIterator,
-                                                        typename add_lvalue_reference<_Compare>::type>
-                                                       (__first, __last, __comp);
-        if (__i != __first)
-            swap(*__first, *__i);
-    }
-}
-
-template <class _Compare, class _BirdirectionalIterator>
-void
-__insertion_sort(_BirdirectionalIterator __first, _BirdirectionalIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_BirdirectionalIterator>::value_type value_type;
-    if (__first != __last)
-    {
-        _BirdirectionalIterator __i = __first;
-        for (++__i; __i != __last; ++__i)
-        {
-            _BirdirectionalIterator __j = __i;
-            value_type __t(_VSTD::move(*__j));
-            for (_BirdirectionalIterator __k = __i; __k != __first && __comp(__t,  *--__k); --__j)
-                *__j = _VSTD::move(*__k);
-            *__j = _VSTD::move(__t);
-        }
-    }
-}
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__insertion_sort_3(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    _RandomAccessIterator __j = __first+2;
-    __sort3<_Compare>(__first, __first+1, __j, __comp);
-    for (_RandomAccessIterator __i = __j+1; __i != __last; ++__i)
-    {
-        if (__comp(*__i, *__j))
-        {
-            value_type __t(_VSTD::move(*__i));
-            _RandomAccessIterator __k = __j;
-            __j = __i;
-            do
-            {
-                *__j = _VSTD::move(*__k);
-                __j = __k;
-            } while (__j != __first && __comp(__t, *--__k));
-            *__j = _VSTD::move(__t);
-        }
-        __j = __i;
-    }
-}
-
-template <class _Compare, class _RandomAccessIterator>
-bool
-__insertion_sort_incomplete(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    switch (__last - __first)
-    {
-    case 0:
-    case 1:
-        return true;
-    case 2:
-        if (__comp(*--__last, *__first))
-            swap(*__first, *__last);
-        return true;
-    case 3:
-        _VSTD::__sort3<_Compare>(__first, __first+1, --__last, __comp);
-        return true;
-    case 4:
-        _VSTD::__sort4<_Compare>(__first, __first+1, __first+2, --__last, __comp);
-        return true;
-    case 5:
-        _VSTD::__sort5<_Compare>(__first, __first+1, __first+2, __first+3, --__last, __comp);
-        return true;
-    }
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    _RandomAccessIterator __j = __first+2;
-    __sort3<_Compare>(__first, __first+1, __j, __comp);
-    const unsigned __limit = 8;
-    unsigned __count = 0;
-    for (_RandomAccessIterator __i = __j+1; __i != __last; ++__i)
-    {
-        if (__comp(*__i, *__j))
-        {
-            value_type __t(_VSTD::move(*__i));
-            _RandomAccessIterator __k = __j;
-            __j = __i;
-            do
-            {
-                *__j = _VSTD::move(*__k);
-                __j = __k;
-            } while (__j != __first && __comp(__t, *--__k));
-            *__j = _VSTD::move(__t);
-            if (++__count == __limit)
-                return ++__i == __last;
-        }
-        __j = __i;
-    }
-    return true;
-}
-
-template <class _Compare, class _BirdirectionalIterator>
-void
-__insertion_sort_move(_BirdirectionalIterator __first1, _BirdirectionalIterator __last1,
-                      typename iterator_traits<_BirdirectionalIterator>::value_type* __first2, _Compare __comp)
-{
-    typedef typename iterator_traits<_BirdirectionalIterator>::value_type value_type;
-    if (__first1 != __last1)
-    {
-        __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h(__first2, __d);
-        value_type* __last2 = __first2;
-        ::new(__last2) value_type(_VSTD::move(*__first1));
-        __d.__incr((value_type*)0);
-        for (++__last2; ++__first1 != __last1; ++__last2)
-        {
-            value_type* __j2 = __last2;
-            value_type* __i2 = __j2;
-            if (__comp(*__first1, *--__i2))
-            {
-                ::new(__j2) value_type(_VSTD::move(*__i2));
-                __d.__incr((value_type*)0);
-                for (--__j2; __i2 != __first2 && __comp(*__first1,  *--__i2); --__j2)
-                    *__j2 = _VSTD::move(*__i2);
-                *__j2 = _VSTD::move(*__first1);
-            }
-            else
-            {
-                ::new(__j2) value_type(_VSTD::move(*__first1));
-                __d.__incr((value_type*)0);
-            }
-        }
-        __h.release();
-    }
-}
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    // _Compare is known to be a reference type
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    const difference_type __limit = is_trivially_copy_constructible<value_type>::value &&
-                                    is_trivially_copy_assignable<value_type>::value ? 30 : 6;
-    while (true)
-    {
-    __restart:
-        difference_type __len = __last - __first;
-        switch (__len)
-        {
-        case 0:
-        case 1:
-            return;
-        case 2:
-            if (__comp(*--__last, *__first))
-                swap(*__first, *__last);
-            return;
-        case 3:
-            _VSTD::__sort3<_Compare>(__first, __first+1, --__last, __comp);
-            return;
-        case 4:
-            _VSTD::__sort4<_Compare>(__first, __first+1, __first+2, --__last, __comp);
-            return;
-        case 5:
-            _VSTD::__sort5<_Compare>(__first, __first+1, __first+2, __first+3, --__last, __comp);
-            return;
-        }
-        if (__len <= __limit)
-        {
-            _VSTD::__insertion_sort_3<_Compare>(__first, __last, __comp);
-            return;
-        }
-        // __len > 5
-        _RandomAccessIterator __m = __first;
-        _RandomAccessIterator __lm1 = __last;
-        --__lm1;
-        unsigned __n_swaps;
-        {
-        difference_type __delta;
-        if (__len >= 1000)
-        {
-            __delta = __len/2;
-            __m += __delta;
-            __delta /= 2;
-            __n_swaps = _VSTD::__sort5<_Compare>(__first, __first + __delta, __m, __m+__delta, __lm1, __comp);
-        }
-        else
-        {
-            __delta = __len/2;
-            __m += __delta;
-            __n_swaps = _VSTD::__sort3<_Compare>(__first, __m, __lm1, __comp);
-        }
-        }
-        // *__m is median
-        // partition [__first, __m) < *__m and *__m <= [__m, __last)
-        // (this inhibits tossing elements equivalent to __m around unnecessarily)
-        _RandomAccessIterator __i = __first;
-        _RandomAccessIterator __j = __lm1;
-        // j points beyond range to be tested, *__m is known to be <= *__lm1
-        // The search going up is known to be guarded but the search coming down isn't.
-        // Prime the downward search with a guard.
-        if (!__comp(*__i, *__m))  // if *__first == *__m
-        {
-            // *__first == *__m, *__first doesn't go in first part
-            // manually guard downward moving __j against __i
-            while (true)
-            {
-                if (__i == --__j)
-                {
-                    // *__first == *__m, *__m <= all other elements
-                    // Parition instead into [__first, __i) == *__first and *__first < [__i, __last)
-                    ++__i;  // __first + 1
-                    __j = __last;
-                    if (!__comp(*__first, *--__j))  // we need a guard if *__first == *(__last-1)
-                    {
-                        while (true)
-                        {
-                            if (__i == __j)
-                                return;  // [__first, __last) all equivalent elements
-                            if (__comp(*__first, *__i))
-                            {
-                                swap(*__i, *__j);
-                                ++__n_swaps;
-                                ++__i;
-                                break;
-                            }
-                            ++__i;
-                        }
-                    }
-                    // [__first, __i) == *__first and *__first < [__j, __last) and __j == __last - 1
-                    if (__i == __j)
-                        return;
-                    while (true)
-                    {
-                        while (!__comp(*__first, *__i))
-                            ++__i;
-                        while (__comp(*__first, *--__j))
-                            ;
-                        if (__i >= __j)
-                            break;
-                        swap(*__i, *__j);
-                        ++__n_swaps;
-                        ++__i;
-                    }
-                    // [__first, __i) == *__first and *__first < [__i, __last)
-                    // The first part is sorted, sort the secod part
-                    // _VSTD::__sort<_Compare>(__i, __last, __comp);
-                    __first = __i;
-                    goto __restart;
-                }
-                if (__comp(*__j, *__m))
-                {
-                    swap(*__i, *__j);
-                    ++__n_swaps;
-                    break;  // found guard for downward moving __j, now use unguarded partition
-                }
-            }
-        }
-        // It is known that *__i < *__m
-        ++__i;
-        // j points beyond range to be tested, *__m is known to be <= *__lm1
-        // if not yet partitioned...
-        if (__i < __j)
-        {
-            // known that *(__i - 1) < *__m
-            // known that __i <= __m
-            while (true)
-            {
-                // __m still guards upward moving __i
-                while (__comp(*__i, *__m))
-                    ++__i;
-                // It is now known that a guard exists for downward moving __j
-                while (!__comp(*--__j, *__m))
-                    ;
-                if (__i > __j)
-                    break;
-                swap(*__i, *__j);
-                ++__n_swaps;
-                // It is known that __m != __j
-                // If __m just moved, follow it
-                if (__m == __i)
-                    __m = __j;
-                ++__i;
-            }
-        }
-        // [__first, __i) < *__m and *__m <= [__i, __last)
-        if (__i != __m && __comp(*__m, *__i))
-        {
-            swap(*__i, *__m);
-            ++__n_swaps;
-        }
-        // [__first, __i) < *__i and *__i <= [__i+1, __last)
-        // If we were given a perfect partition, see if insertion sort is quick...
-        if (__n_swaps == 0)
-        {
-            bool __fs = _VSTD::__insertion_sort_incomplete<_Compare>(__first, __i, __comp);
-            if (_VSTD::__insertion_sort_incomplete<_Compare>(__i+1, __last, __comp))
-            {
-                if (__fs)
-                    return;
-                __last = __i;
-                continue;
-            }
-            else
-            {
-                if (__fs)
-                {
-                    __first = ++__i;
-                    continue;
-                }
-            }
-        }
-        // sort smaller range with recursive call and larger with tail recursion elimination
-        if (__i - __first < __last - __i)
-        {
-            _VSTD::__sort<_Compare>(__first, __i, __comp);
-            // _VSTD::__sort<_Compare>(__i+1, __last, __comp);
-            __first = ++__i;
-        }
-        else
-        {
-            _VSTD::__sort<_Compare>(__i+1, __last, __comp);
-            // _VSTD::__sort<_Compare>(__first, __i, __comp);
-            __last = __i;
-        }
-    }
-}
-
-// This forwarder keeps the top call and the recursive calls using the same instantiation, forcing a reference _Compare
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __sort<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __sort<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::sort(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(_Tp** __first, _Tp** __last)
-{
-    _VSTD::sort((size_t*)__first, (size_t*)__last, __less<size_t>());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(__wrap_iter<_Tp*> __first, __wrap_iter<_Tp*> __last)
-{
-    _VSTD::sort(__first.base(), __last.base());
-}
-
-template <class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort(__wrap_iter<_Tp*> __first, __wrap_iter<_Tp*> __last, _Compare __comp)
-{
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    _VSTD::sort<_Tp*, _Comp_ref>(__first.base(), __last.base(), __comp);
-}
-
-#ifdef _LIBCPP_MSVC
-#pragma warning( push )
-#pragma warning( disable: 4231)
-#endif // _LIBCPP_MSVC
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<char>&, char*>(char*, char*, __less<char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<wchar_t>&, wchar_t*>(wchar_t*, wchar_t*, __less<wchar_t>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<signed char>&, signed char*>(signed char*, signed char*, __less<signed char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned char>&, unsigned char*>(unsigned char*, unsigned char*, __less<unsigned char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<short>&, short*>(short*, short*, __less<short>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned short>&, unsigned short*>(unsigned short*, unsigned short*, __less<unsigned short>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<int>&, int*>(int*, int*, __less<int>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned>&, unsigned*>(unsigned*, unsigned*, __less<unsigned>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<long>&, long*>(long*, long*, __less<long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned long>&, unsigned long*>(unsigned long*, unsigned long*, __less<unsigned long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<long long>&, long long*>(long long*, long long*, __less<long long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<unsigned long long>&, unsigned long long*>(unsigned long long*, unsigned long long*, __less<unsigned long long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<float>&, float*>(float*, float*, __less<float>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<double>&, double*>(double*, double*, __less<double>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void __sort<__less<long double>&, long double*>(long double*, long double*, __less<long double>&))
-
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<char>&, char*>(char*, char*, __less<char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<wchar_t>&, wchar_t*>(wchar_t*, wchar_t*, __less<wchar_t>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<signed char>&, signed char*>(signed char*, signed char*, __less<signed char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned char>&, unsigned char*>(unsigned char*, unsigned char*, __less<unsigned char>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<short>&, short*>(short*, short*, __less<short>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned short>&, unsigned short*>(unsigned short*, unsigned short*, __less<unsigned short>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<int>&, int*>(int*, int*, __less<int>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned>&, unsigned*>(unsigned*, unsigned*, __less<unsigned>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<long>&, long*>(long*, long*, __less<long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned long>&, unsigned long*>(unsigned long*, unsigned long*, __less<unsigned long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<long long>&, long long*>(long long*, long long*, __less<long long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<unsigned long long>&, unsigned long long*>(unsigned long long*, unsigned long long*, __less<unsigned long long>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<float>&, float*>(float*, float*, __less<float>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<double>&, double*>(double*, double*, __less<double>&))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS bool __insertion_sort_incomplete<__less<long double>&, long double*>(long double*, long double*, __less<long double>&))
-
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS unsigned __sort5<__less<long double>&, long double*>(long double*, long double*, long double*, long double*, long double*, __less<long double>&))
-#ifdef _LIBCPP_MSVC
-#pragma warning( pop )
-#endif  // _LIBCPP_MSVC
-
-// lower_bound
-
-template <class _Compare, class _ForwardIterator, class _Tp>
-_ForwardIterator
-__lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    while (__len != 0)
-    {
-        difference_type __l2 = __len / 2;
-        _ForwardIterator __m = __first;
-        _VSTD::advance(__m, __l2);
-        if (__comp(*__m, __value_))
-        {
-            __first = ++__m;
-            __len -= __l2 + 1;
-        }
-        else
-            __len = __l2;
-    }
-    return __first;
-}
-
-template <class _ForwardIterator, class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __lower_bound<_Comp_ref>(__first, __last, __value_, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __lower_bound<_Comp_ref>(__first, __last, __value_, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    return _VSTD::lower_bound(__first, __last, __value_,
-                             __less<typename iterator_traits<_ForwardIterator>::value_type, _Tp>());
-}
-
-// upper_bound
-
-template <class _Compare, class _ForwardIterator, class _Tp>
-_ForwardIterator
-__upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    while (__len != 0)
-    {
-        difference_type __l2 = __len / 2;
-        _ForwardIterator __m = __first;
-        _VSTD::advance(__m, __l2);
-        if (__comp(__value_, *__m))
-            __len = __l2;
-        else
-        {
-            __first = ++__m;
-            __len -= __l2 + 1;
-        }
-    }
-    return __first;
-}
-
-template <class _ForwardIterator, class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __upper_bound<_Comp_ref>(__first, __last, __value_, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __upper_bound<_Comp_ref>(__first, __last, __value_, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator
-upper_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    return _VSTD::upper_bound(__first, __last, __value_,
-                             __less<_Tp, typename iterator_traits<_ForwardIterator>::value_type>());
-}
-
-// equal_range
-
-template <class _Compare, class _ForwardIterator, class _Tp>
-pair<_ForwardIterator, _ForwardIterator>
-__equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-    typedef typename iterator_traits<_ForwardIterator>::difference_type difference_type;
-    difference_type __len = _VSTD::distance(__first, __last);
-    while (__len != 0)
-    {
-        difference_type __l2 = __len / 2;
-        _ForwardIterator __m = __first;
-        _VSTD::advance(__m, __l2);
-        if (__comp(*__m, __value_))
-        {
-            __first = ++__m;
-            __len -= __l2 + 1;
-        }
-        else if (__comp(__value_, *__m))
-        {
-            __last = __m;
-            __len = __l2;
-        }
-        else
-        {
-            _ForwardIterator __mp1 = __m;
-            return pair<_ForwardIterator, _ForwardIterator>
-                   (
-                      __lower_bound<_Compare>(__first, __m, __value_, __comp),
-                      __upper_bound<_Compare>(++__mp1, __last, __value_, __comp)
-                   );
-        }
-    }
-    return pair<_ForwardIterator, _ForwardIterator>(__first, __first);
-}
-
-template <class _ForwardIterator, class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_ForwardIterator, _ForwardIterator>
-equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __equal_range<_Comp_ref>(__first, __last, __value_, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __equal_range<_Comp_ref>(__first, __last, __value_, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_ForwardIterator, _ForwardIterator>
-equal_range(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    return _VSTD::equal_range(__first, __last, __value_,
-                             __less<typename iterator_traits<_ForwardIterator>::value_type, _Tp>());
-}
-
-// binary_search
-
-template <class _Compare, class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-    __first = __lower_bound<_Compare>(__first, __last, __value_, __comp);
-    return __first != __last && !__comp(__value_, *__first);
-}
-
-template <class _ForwardIterator, class _Tp, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __binary_search<_Comp_ref>(__first, __last, __value_, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __binary_search<_Comp_ref>(__first, __last, __value_, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value_)
-{
-    return _VSTD::binary_search(__first, __last, __value_,
-                             __less<typename iterator_traits<_ForwardIterator>::value_type, _Tp>());
-}
-
-// merge
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__merge(_InputIterator1 __first1, _InputIterator1 __last1,
-        _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    for (; __first1 != __last1; ++__result)
-    {
-        if (__first2 == __last2)
-            return _VSTD::copy(__first1, __last1, __result);
-        if (__comp(*__first2, *__first1))
-        {
-            *__result = *__first2;
-            ++__first2;
-        }
-        else
-        {
-            *__result = *__first1;
-            ++__first1;
-        }
-    }
-    return _VSTD::copy(__first2, __last2, __result);
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-merge(_InputIterator1 __first1, _InputIterator1 __last1,
-      _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return _VSTD::__merge<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-merge(_InputIterator1 __first1, _InputIterator1 __last1,
-      _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type __v1;
-    typedef typename iterator_traits<_InputIterator2>::value_type __v2;
-    return merge(__first1, __last1, __first2, __last2, __result, __less<__v1, __v2>());
-}
-
-// inplace_merge
-
-template <class _Compare, class _BidirectionalIterator>
-void
-__buffered_inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last,
-                _Compare __comp, typename iterator_traits<_BidirectionalIterator>::difference_type __len1,
-                                 typename iterator_traits<_BidirectionalIterator>::difference_type __len2,
-                typename iterator_traits<_BidirectionalIterator>::value_type* __buff)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-    __destruct_n __d(0);
-    unique_ptr<value_type, __destruct_n&> __h2(__buff, __d);
-    if (__len1 <= __len2)
-    {
-        value_type* __p = __buff;
-        for (_BidirectionalIterator __i = __first; __i != __middle; __d.__incr((value_type*)0), (void) ++__i, ++__p)
-            ::new(__p) value_type(_VSTD::move(*__i));
-        __merge<_Compare>(move_iterator<value_type*>(__buff),
-                          move_iterator<value_type*>(__p),
-                          move_iterator<_BidirectionalIterator>(__middle),
-                          move_iterator<_BidirectionalIterator>(__last),
-                          __first, __comp);
-    }
-    else
-    {
-        value_type* __p = __buff;
-        for (_BidirectionalIterator __i = __middle; __i != __last; __d.__incr((value_type*)0), (void) ++__i, ++__p)
-            ::new(__p) value_type(_VSTD::move(*__i));
-        typedef reverse_iterator<_BidirectionalIterator> _RBi;
-        typedef reverse_iterator<value_type*> _Rv;
-        __merge(move_iterator<_RBi>(_RBi(__middle)), move_iterator<_RBi>(_RBi(__first)),
-                move_iterator<_Rv>(_Rv(__p)), move_iterator<_Rv>(_Rv(__buff)),
-                _RBi(__last), __negate<_Compare>(__comp));
-    }
-}
-
-template <class _Compare, class _BidirectionalIterator>
-void
-__inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last,
-                _Compare __comp, typename iterator_traits<_BidirectionalIterator>::difference_type __len1,
-                                 typename iterator_traits<_BidirectionalIterator>::difference_type __len2,
-                typename iterator_traits<_BidirectionalIterator>::value_type* __buff, ptrdiff_t __buff_size)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type;
-    while (true)
-    {
-        // if __middle == __last, we're done
-        if (__len2 == 0)
-            return;
-        // shrink [__first, __middle) as much as possible (with no moves), returning if it shrinks to 0
-        for (; true; ++__first, (void) --__len1)
-        {
-            if (__len1 == 0)
-                return;
-            if (__comp(*__middle, *__first))
-                break;
-        }
-        if (__len1 <= __buff_size || __len2 <= __buff_size)
-        {
-            __buffered_inplace_merge<_Compare>(__first, __middle, __last, __comp, __len1, __len2, __buff);
-            return;
-        }
-        // __first < __middle < __last
-        // *__first > *__middle
-        // partition [__first, __m1) [__m1, __middle) [__middle, __m2) [__m2, __last) such that
-        //     all elements in:
-        //         [__first, __m1)  <= [__middle, __m2)
-        //         [__middle, __m2) <  [__m1, __middle)
-        //         [__m1, __middle) <= [__m2, __last)
-        //     and __m1 or __m2 is in the middle of its range
-        _BidirectionalIterator __m1;  // "median" of [__first, __middle)
-        _BidirectionalIterator __m2;  // "median" of [__middle, __last)
-        difference_type __len11;      // distance(__first, __m1)
-        difference_type __len21;      // distance(__middle, __m2)
-        // binary search smaller range
-        if (__len1 < __len2)
-        {   // __len >= 1, __len2 >= 2
-            __len21 = __len2 / 2;
-            __m2 = __middle;
-            _VSTD::advance(__m2, __len21);
-            __m1 = __upper_bound<_Compare>(__first, __middle, *__m2, __comp);
-            __len11 = _VSTD::distance(__first, __m1);
-        }
-        else
-        {
-            if (__len1 == 1)
-            {   // __len1 >= __len2 && __len2 > 0, therefore __len2 == 1
-                // It is known *__first > *__middle
-                swap(*__first, *__middle);
-                return;
-            }
-            // __len1 >= 2, __len2 >= 1
-            __len11 = __len1 / 2;
-            __m1 = __first;
-            _VSTD::advance(__m1, __len11);
-            __m2 = __lower_bound<_Compare>(__middle, __last, *__m1, __comp);
-            __len21 = _VSTD::distance(__middle, __m2);
-        }
-        difference_type __len12 = __len1 - __len11;  // distance(__m1, __middle)
-        difference_type __len22 = __len2 - __len21;  // distance(__m2, __last)
-        // [__first, __m1) [__m1, __middle) [__middle, __m2) [__m2, __last)
-        // swap middle two partitions
-        __middle = _VSTD::rotate(__m1, __middle, __m2);
-        // __len12 and __len21 now have swapped meanings
-        // merge smaller range with recurisve call and larger with tail recursion elimination
-        if (__len11 + __len21 < __len12 + __len22)
-        {
-            __inplace_merge<_Compare>(__first, __m1, __middle, __comp, __len11, __len21, __buff, __buff_size);
-//          __inplace_merge<_Compare>(__middle, __m2, __last, __comp, __len12, __len22, __buff, __buff_size);
-            __first = __middle;
-            __middle = __m2;
-            __len1 = __len12;
-            __len2 = __len22;
-        }
-        else
-        {
-            __inplace_merge<_Compare>(__middle, __m2, __last, __comp, __len12, __len22, __buff, __buff_size);
-//          __inplace_merge<_Compare>(__first, __m1, __middle, __comp, __len11, __len21, __buff, __buff_size);
-            __last = __middle;
-            __middle = __m1;
-            __len1 = __len11;
-            __len2 = __len21;
-        }
-    }
-}
-
-template <class _Tp>
-struct __inplace_merge_switch
-{
-    static const unsigned value = is_trivially_copy_assignable<_Tp>::value;
-};
-
-template <class _BidirectionalIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last,
-              _Compare __comp)
-{
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type;
-    typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type;
-    difference_type __len1 = _VSTD::distance(__first, __middle);
-    difference_type __len2 = _VSTD::distance(__middle, __last);
-    difference_type __buf_size = _VSTD::min(__len1, __len2);
-    pair<value_type*, ptrdiff_t> __buf(0, 0);
-    unique_ptr<value_type, __return_temporary_buffer> __h;
-    if (__inplace_merge_switch<value_type>::value && __buf_size > 8)
-    {
-        __buf = _VSTD::get_temporary_buffer<value_type>(__buf_size);
-        __h.reset(__buf.first);
-    }
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return _VSTD::__inplace_merge<_Comp_ref>(__first, __middle, __last, __c, __len1, __len2,
-                                            __buf.first, __buf.second);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return _VSTD::__inplace_merge<_Comp_ref>(__first, __middle, __last, __comp, __len1, __len2,
-                                            __buf.first, __buf.second);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-inplace_merge(_BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last)
-{
-    _VSTD::inplace_merge(__first, __middle, __last,
-                        __less<typename iterator_traits<_BidirectionalIterator>::value_type>());
-}
-
-// stable_sort
-
-template <class _Compare, class _InputIterator1, class _InputIterator2>
-void
-__merge_move_construct(_InputIterator1 __first1, _InputIterator1 __last1,
-        _InputIterator2 __first2, _InputIterator2 __last2,
-        typename iterator_traits<_InputIterator1>::value_type* __result, _Compare __comp)
-{
-    typedef typename iterator_traits<_InputIterator1>::value_type value_type;
-    __destruct_n __d(0);
-    unique_ptr<value_type, __destruct_n&> __h(__result, __d);
-    for (; true; ++__result)
-    {
-        if (__first1 == __last1)
-        {
-            for (; __first2 != __last2; ++__first2, ++__result, __d.__incr((value_type*)0))
-                ::new (__result) value_type(_VSTD::move(*__first2));
-            __h.release();
-            return;
-        }
-        if (__first2 == __last2)
-        {
-            for (; __first1 != __last1; ++__first1, ++__result, __d.__incr((value_type*)0))
-                ::new (__result) value_type(_VSTD::move(*__first1));
-            __h.release();
-            return;
-        }
-        if (__comp(*__first2, *__first1))
-        {
-            ::new (__result) value_type(_VSTD::move(*__first2));
-            __d.__incr((value_type*)0);
-            ++__first2;
-        }
-        else
-        {
-            ::new (__result) value_type(_VSTD::move(*__first1));
-            __d.__incr((value_type*)0);
-            ++__first1;
-        }
-    }
-}
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-void
-__merge_move_assign(_InputIterator1 __first1, _InputIterator1 __last1,
-        _InputIterator2 __first2, _InputIterator2 __last2,
-        _OutputIterator __result, _Compare __comp)
-{
-    for (; __first1 != __last1; ++__result)
-    {
-        if (__first2 == __last2)
-        {
-            for (; __first1 != __last1; ++__first1, ++__result)
-                *__result = _VSTD::move(*__first1);
-            return;
-        }
-        if (__comp(*__first2, *__first1))
-        {
-            *__result = _VSTD::move(*__first2);
-            ++__first2;
-        }
-        else
-        {
-            *__result = _VSTD::move(*__first1);
-            ++__first1;
-        }
-    }
-    for (; __first2 != __last2; ++__first2, ++__result)
-        *__result = _VSTD::move(*__first2);
-}
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-              typename iterator_traits<_RandomAccessIterator>::difference_type __len,
-              typename iterator_traits<_RandomAccessIterator>::value_type* __buff, ptrdiff_t __buff_size);
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__stable_sort_move(_RandomAccessIterator __first1, _RandomAccessIterator __last1, _Compare __comp,
-                   typename iterator_traits<_RandomAccessIterator>::difference_type __len,
-                   typename iterator_traits<_RandomAccessIterator>::value_type* __first2)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    switch (__len)
-    {
-    case 0:
-        return;
-    case 1:
-        ::new(__first2) value_type(_VSTD::move(*__first1));
-        return;
-    case 2:
-       __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h2(__first2, __d);
-         if (__comp(*--__last1, *__first1))
-        {
-            ::new(__first2) value_type(_VSTD::move(*__last1));
-            __d.__incr((value_type*)0);
-            ++__first2;
-            ::new(__first2) value_type(_VSTD::move(*__first1));
-        }
-        else
-        {
-            ::new(__first2) value_type(_VSTD::move(*__first1));
-            __d.__incr((value_type*)0);
-            ++__first2;
-            ::new(__first2) value_type(_VSTD::move(*__last1));
-        }
-        __h2.release();
-        return;
-    }
-    if (__len <= 8)
-    {
-        __insertion_sort_move<_Compare>(__first1, __last1, __first2, __comp);
-        return;
-    }
-    typename iterator_traits<_RandomAccessIterator>::difference_type __l2 = __len / 2;
-    _RandomAccessIterator __m = __first1 + __l2;
-    __stable_sort<_Compare>(__first1, __m, __comp, __l2, __first2, __l2);
-    __stable_sort<_Compare>(__m, __last1, __comp, __len - __l2, __first2 + __l2, __len - __l2);
-    __merge_move_construct<_Compare>(__first1, __m, __m, __last1, __first2, __comp);
-}
-
-template <class _Tp>
-struct __stable_sort_switch
-{
-    static const unsigned value = 128*is_trivially_copy_assignable<_Tp>::value;
-};
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-              typename iterator_traits<_RandomAccessIterator>::difference_type __len,
-              typename iterator_traits<_RandomAccessIterator>::value_type* __buff, ptrdiff_t __buff_size)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    switch (__len)
-    {
-    case 0:
-    case 1:
-        return;
-    case 2:
-        if (__comp(*--__last, *__first))
-            swap(*__first, *__last);
-        return;
-    }
-    if (__len <= static_cast<difference_type>(__stable_sort_switch<value_type>::value))
-    {
-        __insertion_sort<_Compare>(__first, __last, __comp);
-        return;
-    }
-    typename iterator_traits<_RandomAccessIterator>::difference_type __l2 = __len / 2;
-    _RandomAccessIterator __m = __first + __l2;
-    if (__len <= __buff_size)
-    {
-        __destruct_n __d(0);
-        unique_ptr<value_type, __destruct_n&> __h2(__buff, __d);
-        __stable_sort_move<_Compare>(__first, __m, __comp, __l2, __buff);
-        __d.__set(__l2, (value_type*)0);
-        __stable_sort_move<_Compare>(__m, __last, __comp, __len - __l2, __buff + __l2);
-        __d.__set(__len, (value_type*)0);
-        __merge_move_assign<_Compare>(__buff, __buff + __l2, __buff + __l2, __buff + __len, __first, __comp);
-//         __merge<_Compare>(move_iterator<value_type*>(__buff),
-//                           move_iterator<value_type*>(__buff + __l2),
-//                           move_iterator<_RandomAccessIterator>(__buff + __l2),
-//                           move_iterator<_RandomAccessIterator>(__buff + __len),
-//                           __first, __comp);
-        return;
-    }
-    __stable_sort<_Compare>(__first, __m, __comp, __l2, __buff, __buff_size);
-    __stable_sort<_Compare>(__m, __last, __comp, __len - __l2, __buff, __buff_size);
-    __inplace_merge<_Compare>(__first, __m, __last, __comp, __l2, __len - __l2, __buff, __buff_size);
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    difference_type __len = __last - __first;
-    pair<value_type*, ptrdiff_t> __buf(0, 0);
-    unique_ptr<value_type, __return_temporary_buffer> __h;
-    if (__len > static_cast<difference_type>(__stable_sort_switch<value_type>::value))
-    {
-        __buf = _VSTD::get_temporary_buffer<value_type>(__len);
-        __h.reset(__buf.first);
-    }
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __stable_sort<_Comp_ref>(__first, __last, __c, __len, __buf.first, __buf.second);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __stable_sort<_Comp_ref>(__first, __last, __comp, __len, __buf.first, __buf.second);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::stable_sort(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// is_heap_until
-
-template <class _RandomAccessIterator, class _Compare>
-_RandomAccessIterator
-is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename _VSTD::iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    difference_type __len = __last - __first;
-    difference_type __p = 0;
-    difference_type __c = 1;
-    _RandomAccessIterator __pp = __first;
-    while (__c < __len)
-    {
-        _RandomAccessIterator __cp = __first + __c;
-        if (__comp(*__pp, *__cp))
-            return __cp;
-        ++__c;
-        ++__cp;
-        if (__c == __len)
-            return __last;
-        if (__comp(*__pp, *__cp))
-            return __cp;
-        ++__p;
-        ++__pp;
-        __c = 2 * __p + 1;
-    }
-    return __last;
-}
-
-template<class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_RandomAccessIterator
-is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    return _VSTD::is_heap_until(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// is_heap
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    return _VSTD::is_heap_until(__first, __last, __comp) == __last;
-}
-
-template<class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    return _VSTD::is_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// push_heap
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__sift_up(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-          typename iterator_traits<_RandomAccessIterator>::difference_type __len)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    if (__len > 1)
-    {
-        __len = (__len - 2) / 2;
-        _RandomAccessIterator __ptr = __first + __len;
-        if (__comp(*__ptr, *--__last))
-        {
-            value_type __t(_VSTD::move(*__last));
-            do
-            {
-                *__last = _VSTD::move(*__ptr);
-                __last = __ptr;
-                if (__len == 0)
-                    break;
-                __len = (__len - 1) / 2;
-                __ptr = __first + __len;
-            } while (__comp(*__ptr, __t));
-            *__last = _VSTD::move(__t);
-        }
-    }
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __sift_up<_Comp_ref>(__first, __last, __c, __last - __first);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __sift_up<_Comp_ref>(__first, __last, __comp, __last - __first);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-push_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::push_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// pop_heap
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__sift_down(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-            typename iterator_traits<_RandomAccessIterator>::difference_type __len,
-            _RandomAccessIterator __start)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type;
-    // left-child of __start is at 2 * __start + 1
-    // right-child of __start is at 2 * __start + 2
-    difference_type __child = __start - __first;
-
-    if (__len < 2 || (__len - 2) / 2 < __child)
-        return;
-
-    __child = 2 * __child + 1;
-    _RandomAccessIterator __child_i = __first + __child;
-
-    if ((__child + 1) < __len && __comp(*__child_i, *(__child_i + 1))) {
-        // right-child exists and is greater than left-child
-        ++__child_i;
-        ++__child;
-    }
-
-    // check if we are in heap-order
-    if (__comp(*__child_i, *__start))
-        // we are, __start is larger than it's largest child
-        return;
-
-    value_type __top(_VSTD::move(*__start));
-    do
-    {
-        // we are not in heap-order, swap the parent with it's largest child
-        *__start = _VSTD::move(*__child_i);
-        __start = __child_i;
-
-        if ((__len - 2) / 2 < __child)
-            break;
-
-        // recompute the child based off of the updated parent
-        __child = 2 * __child + 1;
-        __child_i = __first + __child;
-
-        if ((__child + 1) < __len && __comp(*__child_i, *(__child_i + 1))) {
-            // right-child exists and is greater than left-child
-            ++__child_i;
-            ++__child;
-        }
-
-        // check if we are in heap-order
-    } while (!__comp(*__child_i, __top));
-    *__start = _VSTD::move(__top);
-}
-
-template <class _Compare, class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp,
-           typename iterator_traits<_RandomAccessIterator>::difference_type __len)
-{
-    if (__len > 1)
-    {
-        swap(*__first, *--__last);
-        __sift_down<_Compare>(__first, __last, __comp, __len - 1, __first);
-    }
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __pop_heap<_Comp_ref>(__first, __last, __c, __last - __first);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __pop_heap<_Comp_ref>(__first, __last, __comp, __last - __first);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-pop_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::pop_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// make_heap
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    difference_type __n = __last - __first;
-    if (__n > 1)
-    {
-        // start from the first parent, there is no need to consider children
-        for (difference_type __start = (__n - 2) / 2; __start >= 0; --__start)
-        {
-            __sift_down<_Compare>(__first, __last, __comp, __n, __first + __start);
-        }
-    }
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __make_heap<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __make_heap<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-make_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::make_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// sort_heap
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    for (difference_type __n = __last - __first; __n > 1; --__last, --__n)
-        __pop_heap<_Compare>(__first, __last, __comp, __n);
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __sort_heap<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __sort_heap<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sort_heap(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    _VSTD::sort_heap(__first, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// partial_sort
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last,
-             _Compare __comp)
-{
-    __make_heap<_Compare>(__first, __middle, __comp);
-    typename iterator_traits<_RandomAccessIterator>::difference_type __len = __middle - __first;
-    for (_RandomAccessIterator __i = __middle; __i != __last; ++__i)
-    {
-        if (__comp(*__i, *__first))
-        {
-            swap(*__i, *__first);
-            __sift_down<_Compare>(__first, __middle, __comp, __len, __first);
-        }
-    }
-    __sort_heap<_Compare>(__first, __middle, __comp);
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last,
-             _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __partial_sort<_Comp_ref>(__first, __middle, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __partial_sort<_Comp_ref>(__first, __middle, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-partial_sort(_RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last)
-{
-    _VSTD::partial_sort(__first, __middle, __last,
-                       __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// partial_sort_copy
-
-template <class _Compare, class _InputIterator, class _RandomAccessIterator>
-_RandomAccessIterator
-__partial_sort_copy(_InputIterator __first, _InputIterator __last,
-                    _RandomAccessIterator __result_first, _RandomAccessIterator __result_last, _Compare __comp)
-{
-    _RandomAccessIterator __r = __result_first;
-    if (__r != __result_last)
-    {
-        for (; __first != __last && __r != __result_last; (void) ++__first, ++__r)
-            *__r = *__first;
-        __make_heap<_Compare>(__result_first, __r, __comp);
-        typename iterator_traits<_RandomAccessIterator>::difference_type __len = __r - __result_first;
-        for (; __first != __last; ++__first)
-            if (__comp(*__first, *__result_first))
-            {
-                *__result_first = *__first;
-                __sift_down<_Compare>(__result_first, __r, __comp, __len, __result_first);
-            }
-        __sort_heap<_Compare>(__result_first, __r, __comp);
-    }
-    return __r;
-}
-
-template <class _InputIterator, class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_RandomAccessIterator
-partial_sort_copy(_InputIterator __first, _InputIterator __last,
-                  _RandomAccessIterator __result_first, _RandomAccessIterator __result_last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __partial_sort_copy<_Comp_ref>(__first, __last, __result_first, __result_last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __partial_sort_copy<_Comp_ref>(__first, __last, __result_first, __result_last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator, class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_RandomAccessIterator
-partial_sort_copy(_InputIterator __first, _InputIterator __last,
-                  _RandomAccessIterator __result_first, _RandomAccessIterator __result_last)
-{
-    return _VSTD::partial_sort_copy(__first, __last, __result_first, __result_last,
-                                   __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// nth_element
-
-template <class _Compare, class _RandomAccessIterator>
-void
-__nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last, _Compare __comp)
-{
-    // _Compare is known to be a reference type
-    typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type;
-    const difference_type __limit = 7;
-    while (true)
-    {
-    __restart:
-        if (__nth == __last)
-            return;
-        difference_type __len = __last - __first;
-        switch (__len)
-        {
-        case 0:
-        case 1:
-            return;
-        case 2:
-            if (__comp(*--__last, *__first))
-                swap(*__first, *__last);
-            return;
-        case 3:
-            {
-            _RandomAccessIterator __m = __first;
-            _VSTD::__sort3<_Compare>(__first, ++__m, --__last, __comp);
-            return;
-            }
-        }
-        if (__len <= __limit)
-        {
-            __selection_sort<_Compare>(__first, __last, __comp);
-            return;
-        }
-        // __len > __limit >= 3
-        _RandomAccessIterator __m = __first + __len/2;
-        _RandomAccessIterator __lm1 = __last;
-        unsigned __n_swaps = _VSTD::__sort3<_Compare>(__first, __m, --__lm1, __comp);
-        // *__m is median
-        // partition [__first, __m) < *__m and *__m <= [__m, __last)
-        // (this inhibits tossing elements equivalent to __m around unnecessarily)
-        _RandomAccessIterator __i = __first;
-        _RandomAccessIterator __j = __lm1;
-        // j points beyond range to be tested, *__lm1 is known to be <= *__m
-        // The search going up is known to be guarded but the search coming down isn't.
-        // Prime the downward search with a guard.
-        if (!__comp(*__i, *__m))  // if *__first == *__m
-        {
-            // *__first == *__m, *__first doesn't go in first part
-            // manually guard downward moving __j against __i
-            while (true)
-            {
-                if (__i == --__j)
-                {
-                    // *__first == *__m, *__m <= all other elements
-                    // Parition instead into [__first, __i) == *__first and *__first < [__i, __last)
-                    ++__i;  // __first + 1
-                    __j = __last;
-                    if (!__comp(*__first, *--__j))  // we need a guard if *__first == *(__last-1)
-                    {
-                        while (true)
-                        {
-                            if (__i == __j)
-                                return;  // [__first, __last) all equivalent elements
-                            if (__comp(*__first, *__i))
-                            {
-                                swap(*__i, *__j);
-                                ++__n_swaps;
-                                ++__i;
-                                break;
-                            }
-                            ++__i;
-                        }
-                    }
-                    // [__first, __i) == *__first and *__first < [__j, __last) and __j == __last - 1
-                    if (__i == __j)
-                        return;
-                    while (true)
-                    {
-                        while (!__comp(*__first, *__i))
-                            ++__i;
-                        while (__comp(*__first, *--__j))
-                            ;
-                        if (__i >= __j)
-                            break;
-                        swap(*__i, *__j);
-                        ++__n_swaps;
-                        ++__i;
-                    }
-                    // [__first, __i) == *__first and *__first < [__i, __last)
-                    // The first part is sorted,
-                    if (__nth < __i)
-                        return;
-                    // __nth_element the secod part
-                    // __nth_element<_Compare>(__i, __nth, __last, __comp);
-                    __first = __i;
-                    goto __restart;
-                }
-                if (__comp(*__j, *__m))
-                {
-                    swap(*__i, *__j);
-                    ++__n_swaps;
-                    break;  // found guard for downward moving __j, now use unguarded partition
-                }
-            }
-        }
-        ++__i;
-        // j points beyond range to be tested, *__lm1 is known to be <= *__m
-        // if not yet partitioned...
-        if (__i < __j)
-        {
-            // known that *(__i - 1) < *__m
-            while (true)
-            {
-                // __m still guards upward moving __i
-                while (__comp(*__i, *__m))
-                    ++__i;
-                // It is now known that a guard exists for downward moving __j
-                while (!__comp(*--__j, *__m))
-                    ;
-                if (__i >= __j)
-                    break;
-                swap(*__i, *__j);
-                ++__n_swaps;
-                // It is known that __m != __j
-                // If __m just moved, follow it
-                if (__m == __i)
-                    __m = __j;
-                ++__i;
-            }
-        }
-        // [__first, __i) < *__m and *__m <= [__i, __last)
-        if (__i != __m && __comp(*__m, *__i))
-        {
-            swap(*__i, *__m);
-            ++__n_swaps;
-        }
-        // [__first, __i) < *__i and *__i <= [__i+1, __last)
-        if (__nth == __i)
-            return;
-        if (__n_swaps == 0)
-        {
-            // We were given a perfectly partitioned sequence.  Coincidence?
-            if (__nth < __i)
-            {
-                // Check for [__first, __i) already sorted
-                __j = __m = __first;
-                while (++__j != __i)
-                {
-                    if (__comp(*__j, *__m))
-                        // not yet sorted, so sort
-                        goto not_sorted;
-                    __m = __j;
-                }
-                // [__first, __i) sorted
-                return;
-            }
-            else
-            {
-                // Check for [__i, __last) already sorted
-                __j = __m = __i;
-                while (++__j != __last)
-                {
-                    if (__comp(*__j, *__m))
-                        // not yet sorted, so sort
-                        goto not_sorted;
-                    __m = __j;
-                }
-                // [__i, __last) sorted
-                return;
-            }
-        }
-not_sorted:
-        // __nth_element on range containing __nth
-        if (__nth < __i)
-        {
-            // __nth_element<_Compare>(__first, __nth, __i, __comp);
-            __last = __i;
-        }
-        else
-        {
-            // __nth_element<_Compare>(__i+1, __nth, __last, __comp);
-            __first = ++__i;
-        }
-    }
-}
-
-template <class _RandomAccessIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    __nth_element<_Comp_ref>(__first, __nth, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    __nth_element<_Comp_ref>(__first, __nth, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _RandomAccessIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-nth_element(_RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last)
-{
-    _VSTD::nth_element(__first, __nth, __last, __less<typename iterator_traits<_RandomAccessIterator>::value_type>());
-}
-
-// includes
-
-template <class _Compare, class _InputIterator1, class _InputIterator2>
-bool
-__includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,
-           _Compare __comp)
-{
-    for (; __first2 != __last2; ++__first1)
-    {
-        if (__first1 == __last1 || __comp(*__first2, *__first1))
-            return false;
-        if (!__comp(*__first1, *__first2))
-            ++__first2;
-    }
-    return true;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2,
-         _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __includes<_Comp_ref>(__first1, __last1, __first2, __last2, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __includes<_Comp_ref>(__first1, __last1, __first2, __last2, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-includes(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _InputIterator2 __last2)
-{
-    return _VSTD::includes(__first1, __last1, __first2, __last2,
-                          __less<typename iterator_traits<_InputIterator1>::value_type,
-                                 typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// set_union
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-            _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    for (; __first1 != __last1; ++__result)
-    {
-        if (__first2 == __last2)
-            return _VSTD::copy(__first1, __last1, __result);
-        if (__comp(*__first2, *__first1))
-        {
-            *__result = *__first2;
-            ++__first2;
-        }
-        else
-        {
-            *__result = *__first1;
-            if (!__comp(*__first1, *__first2))
-                ++__first2;
-            ++__first1;
-        }
-    }
-    return _VSTD::copy(__first2, __last2, __result);
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-          _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __set_union<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __set_union<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_union(_InputIterator1 __first1, _InputIterator1 __last1,
-          _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    return _VSTD::set_union(__first1, __last1, __first2, __last2, __result,
-                          __less<typename iterator_traits<_InputIterator1>::value_type,
-                                 typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// set_intersection
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-                   _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    while (__first1 != __last1 && __first2 != __last2)
-    {
-        if (__comp(*__first1, *__first2))
-            ++__first1;
-        else
-        {
-            if (!__comp(*__first2, *__first1))
-            {
-                *__result = *__first1;
-                ++__result;
-                ++__first1;
-            }
-            ++__first2;
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-                 _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __set_intersection<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __set_intersection<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_intersection(_InputIterator1 __first1, _InputIterator1 __last1,
-                 _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    return _VSTD::set_intersection(__first1, __last1, __first2, __last2, __result,
-                                  __less<typename iterator_traits<_InputIterator1>::value_type,
-                                         typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// set_difference
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-                 _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    while (__first1 != __last1)
-    {
-        if (__first2 == __last2)
-            return _VSTD::copy(__first1, __last1, __result);
-        if (__comp(*__first1, *__first2))
-        {
-            *__result = *__first1;
-            ++__result;
-            ++__first1;
-        }
-        else
-        {
-            if (!__comp(*__first2, *__first1))
-                ++__first1;
-            ++__first2;
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-               _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __set_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-               _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    return _VSTD::set_difference(__first1, __last1, __first2, __last2, __result,
-                                __less<typename iterator_traits<_InputIterator1>::value_type,
-                                       typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// set_symmetric_difference
-
-template <class _Compare, class _InputIterator1, class _InputIterator2, class _OutputIterator>
-_OutputIterator
-__set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-                           _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-    while (__first1 != __last1)
-    {
-        if (__first2 == __last2)
-            return _VSTD::copy(__first1, __last1, __result);
-        if (__comp(*__first1, *__first2))
-        {
-            *__result = *__first1;
-            ++__result;
-            ++__first1;
-        }
-        else
-        {
-            if (__comp(*__first2, *__first1))
-            {
-                *__result = *__first2;
-                ++__result;
-            }
-            else
-                ++__first1;
-            ++__first2;
-        }
-    }
-    return _VSTD::copy(__first2, __last2, __result);
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-                         _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __set_symmetric_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __set_symmetric_difference<_Comp_ref>(__first1, __last1, __first2, __last2, __result, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-set_symmetric_difference(_InputIterator1 __first1, _InputIterator1 __last1,
-                         _InputIterator2 __first2, _InputIterator2 __last2, _OutputIterator __result)
-{
-    return _VSTD::set_symmetric_difference(__first1, __last1, __first2, __last2, __result,
-                                          __less<typename iterator_traits<_InputIterator1>::value_type,
-                                                 typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// lexicographical_compare
-
-template <class _Compare, class _InputIterator1, class _InputIterator2>
-bool
-__lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
-                          _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
-{
-    for (; __first2 != __last2; ++__first1, (void) ++__first2)
-    {
-        if (__first1 == __last1 || __comp(*__first1, *__first2))
-            return true;
-        if (__comp(*__first2, *__first1))
-            return false;
-    }
-    return false;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
-                        _InputIterator2 __first2, _InputIterator2 __last2, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __lexicographical_compare<_Comp_ref>(__first1, __last1, __first2, __last2, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _InputIterator1, class _InputIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-lexicographical_compare(_InputIterator1 __first1, _InputIterator1 __last1,
-                        _InputIterator2 __first2, _InputIterator2 __last2)
-{
-    return _VSTD::lexicographical_compare(__first1, __last1, __first2, __last2,
-                                         __less<typename iterator_traits<_InputIterator1>::value_type,
-                                                typename iterator_traits<_InputIterator2>::value_type>());
-}
-
-// next_permutation
-
-template <class _Compare, class _BidirectionalIterator>
-bool
-__next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
-{
-    _BidirectionalIterator __i = __last;
-    if (__first == __last || __first == --__i)
-        return false;
-    while (true)
-    {
-        _BidirectionalIterator __ip1 = __i;
-        if (__comp(*--__i, *__ip1))
-        {
-            _BidirectionalIterator __j = __last;
-            while (!__comp(*__i, *--__j))
-                ;
-            swap(*__i, *__j);
-            _VSTD::reverse(__ip1, __last);
-            return true;
-        }
-        if (__i == __first)
-        {
-            _VSTD::reverse(__first, __last);
-            return false;
-        }
-    }
-}
-
-template <class _BidirectionalIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __next_permutation<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __next_permutation<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-next_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
-{
-    return _VSTD::next_permutation(__first, __last,
-                                  __less<typename iterator_traits<_BidirectionalIterator>::value_type>());
-}
-
-// prev_permutation
-
-template <class _Compare, class _BidirectionalIterator>
-bool
-__prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
-{
-    _BidirectionalIterator __i = __last;
-    if (__first == __last || __first == --__i)
-        return false;
-    while (true)
-    {
-        _BidirectionalIterator __ip1 = __i;
-        if (__comp(*__ip1, *--__i))
-        {
-            _BidirectionalIterator __j = __last;
-            while (!__comp(*--__j, *__i))
-                ;
-            swap(*__i, *__j);
-            _VSTD::reverse(__ip1, __last);
-            return true;
-        }
-        if (__i == __first)
-        {
-            _VSTD::reverse(__first, __last);
-            return false;
-        }
-    }
-}
-
-template <class _BidirectionalIterator, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last, _Compare __comp)
-{
-#ifdef _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<__debug_less<_Compare> >::type _Comp_ref;
-    __debug_less<_Compare> __c(__comp);
-    return __prev_permutation<_Comp_ref>(__first, __last, __c);
-#else  // _LIBCPP_DEBUG
-    typedef typename add_lvalue_reference<_Compare>::type _Comp_ref;
-    return __prev_permutation<_Comp_ref>(__first, __last, __comp);
-#endif  // _LIBCPP_DEBUG
-}
-
-template <class _BidirectionalIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-prev_permutation(_BidirectionalIterator __first, _BidirectionalIterator __last)
-{
-    return _VSTD::prev_permutation(__first, __last,
-                                  __less<typename iterator_traits<_BidirectionalIterator>::value_type>());
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    _Tp
->::type
-__rotate_left(_Tp __t, _Tp __n = 1)
-{
-    const unsigned __bits = static_cast<unsigned>(sizeof(_Tp) * __CHAR_BIT__ - 1);
-    __n &= __bits;
-    return static_cast<_Tp>((__t << __n) | (static_cast<typename make_unsigned<_Tp>::type>(__t) >> (__bits - __n)));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    _Tp
->::type
-__rotate_right(_Tp __t, _Tp __n = 1)
-{
-    const unsigned __bits = static_cast<unsigned>(sizeof(_Tp) * __CHAR_BIT__ - 1);
-    __n &= __bits;
-    return static_cast<_Tp>((__t << (__bits - __n)) | (static_cast<typename make_unsigned<_Tp>::type>(__t) >> __n));
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_ALGORITHM
diff --git a/include.new/c++/v1/tr1/array b/include.new/c++/v1/tr1/array
deleted file mode 100644
index d37075d..0000000
--- a/include.new/c++/v1/tr1/array
+++ /dev/null
@@ -1,342 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- array -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ARRAY
-#define _LIBCPP_ARRAY
-
-/*
-    array synopsis
-
-namespace std
-{
-template <class T, size_t N >
-struct array
-{
-    // types:
-    typedef T & reference;
-    typedef const T & const_reference;
-    typedef implementation defined iterator;
-    typedef implementation defined const_iterator;
-    typedef size_t size_type;
-    typedef ptrdiff_t difference_type;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef const T* const_pointer;
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    // No explicit construct/copy/destroy for aggregate type
-    void fill(const T& u);
-    void swap(array& a) noexcept(noexcept(swap(declval<T&>(), declval<T&>())));
-
-    // iterators:
-    iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator end() noexcept;
-    const_iterator end() const noexcept;
-
-    reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-
-    const_iterator cbegin() const noexcept;
-    const_iterator cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
-
-    // capacity:
-    constexpr size_type size() const noexcept;
-    constexpr size_type max_size() const noexcept;
-    constexpr bool empty() const noexcept;
-
-    // element access:
-    reference operator[](size_type n);
-    const_reference operator[](size_type n) const; // constexpr in C++14
-    const_reference at(size_type n) const; // constexpr in C++14
-    reference at(size_type n);
-
-    reference front();
-    const_reference front() const; // constexpr in C++14
-    reference back();
-    const_reference back() const; // constexpr in C++14
-
-    T* data() noexcept;
-    const T* data() const noexcept;
-};
-
-template <class T, size_t N>
-  bool operator==(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator!=(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator<(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator>(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator<=(const array<T,N>& x, const array<T,N>& y);
-template <class T, size_t N>
-  bool operator>=(const array<T,N>& x, const array<T,N>& y);
-
-template <class T, size_t N >
-  void swap(array<T,N>& x, array<T,N>& y) noexcept(noexcept(x.swap(y)));
-
-template <class T> class tuple_size;
-template <int I, class T> class tuple_element;
-template <class T, size_t N> struct tuple_size<array<T, N>>;
-template <int I, class T, size_t N> struct tuple_element<I, array<T, N>>;
-template <int I, class T, size_t N> T& get(array<T, N>&) noexcept; // constexpr in C++14
-template <int I, class T, size_t N> const T& get(const array<T, N>&) noexcept; // constexpr in C++14
-template <int I, class T, size_t N> T&& get(array<T, N>&&) noexcept; // constexpr in C++14
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__tuple>
-#include <type_traits>
-#include <utility>
-#include <iterator>
-#include <algorithm>
-#include <stdexcept>
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-    #include <cassert>
-#endif
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, size_t _Size>
-struct _LIBCPP_TYPE_VIS_ONLY array
-{
-    // types:
-    typedef array __self;
-    typedef _Tp                                   value_type;
-    typedef value_type&                           reference;
-    typedef const value_type&                     const_reference;
-    typedef value_type*                           iterator;
-    typedef const value_type*                     const_iterator;
-    typedef value_type*                           pointer;
-    typedef const value_type*                     const_pointer;
-    typedef size_t                                size_type;
-    typedef ptrdiff_t                             difference_type;
-    typedef std::reverse_iterator<iterator>       reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    value_type __elems_[_Size > 0 ? _Size : 1];
-
-    // No explicit construct/copy/destroy for aggregate type
-    _LIBCPP_INLINE_VISIBILITY void fill(const value_type& __u)
-        {_VSTD::fill_n(__elems_, _Size, __u);}
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(array& __a) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value)
-        {_VSTD::swap_ranges(__elems_, __elems_ + _Size, __a.__elems_);}
-
-    // iterators:
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT {return iterator(__elems_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return const_iterator(__elems_);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT {return iterator(__elems_ + _Size);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT {return const_iterator(__elems_ + _Size);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rbegin() _NOEXCEPT {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rend() _NOEXCEPT {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    // capacity:
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR size_type size() const _NOEXCEPT {return _Size;}
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR size_type max_size() const _NOEXCEPT {return _Size;}
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR bool empty() const _NOEXCEPT {return _Size == 0;}
-
-    // element access:
-    _LIBCPP_INLINE_VISIBILITY reference operator[](size_type __n)             {return __elems_[__n];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference operator[](size_type __n) const {return __elems_[__n];}
-    reference at(size_type __n);
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference at(size_type __n) const;
-
-    _LIBCPP_INLINE_VISIBILITY reference front()             {return __elems_[0];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference front() const {return __elems_[0];}
-    _LIBCPP_INLINE_VISIBILITY reference back()              {return __elems_[_Size > 0 ? _Size-1 : 0];}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const_reference back() const  {return __elems_[_Size > 0 ? _Size-1 : 0];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type* data() _NOEXCEPT {return __elems_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* data() const _NOEXCEPT {return __elems_;}
-};
-
-template <class _Tp, size_t _Size>
-typename array<_Tp, _Size>::reference
-array<_Tp, _Size>::at(size_type __n)
-{
-    if (__n >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("array::at");
-#else
-        assert(!"array::at out_of_range");
-#endif
-    return __elems_[__n];
-}
-
-template <class _Tp, size_t _Size>
-_LIBCPP_CONSTEXPR_AFTER_CXX11
-typename array<_Tp, _Size>::const_reference
-array<_Tp, _Size>::at(size_type __n) const
-{
-    if (__n >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("array::at");
-#else
-        assert(!"array::at out_of_range");
-#endif
-    return __elems_[__n];
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return _VSTD::equal(__x.__elems_, __x.__elems_ + _Size, __y.__elems_);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.__elems_, __x.__elems_ + _Size, __y.__elems_, __y.__elems_ + _Size);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_swappable<_Tp>::value,
-    void
->::type
-swap(const array<_Tp, _Size>& __x, const array<_Tp, _Size>& __y)
-                                  _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value)
-{
-    __x.swap(__y);
-}
-
-template <class _Tp, size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<array<_Tp, _Size> >
-    : public integral_constant<size_t, _Size> {};
-
-template <class _Tp, size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<const array<_Tp, _Size> >
-    : public integral_constant<size_t, _Size> {};
-
-template <size_t _Ip, class _Tp, size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, array<_Tp, _Size> >
-{
-public:
-    typedef _Tp type;
-};
-
-template <size_t _Ip, class _Tp, size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, const array<_Tp, _Size> >
-{
-public:
-    typedef const _Tp type;
-};
-
-template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&
-get(array<_Tp, _Size>& __a) _NOEXCEPT
-{
-    static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::array)");
-    return __a.__elems_[_Ip];
-}
-
-template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Tp&
-get(const array<_Tp, _Size>& __a) _NOEXCEPT
-{
-    static_assert(_Ip < _Size, "Index out of bounds in std::get<> (const std::array)");
-    return __a.__elems_[_Ip];
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <size_t _Ip, class _Tp, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&&
-get(array<_Tp, _Size>&& __a) _NOEXCEPT
-{
-    static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::array &&)");
-    return _VSTD::move(__a.__elems_[_Ip]);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_ARRAY
diff --git a/include.new/c++/v1/tr1/atomic b/include.new/c++/v1/tr1/atomic
deleted file mode 100644
index b01a59f..0000000
--- a/include.new/c++/v1/tr1/atomic
+++ /dev/null
@@ -1,1788 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- atomic -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ATOMIC
-#define _LIBCPP_ATOMIC
-
-/*
-    atomic synopsis
-
-namespace std
-{
-
-// order and consistency
-
-typedef enum memory_order
-{
-    memory_order_relaxed,
-    memory_order_consume,  // load-consume
-    memory_order_acquire,  // load-acquire
-    memory_order_release,  // store-release
-    memory_order_acq_rel,  // store-release load-acquire
-    memory_order_seq_cst   // store-release load-acquire
-} memory_order;
-
-template <class T> T kill_dependency(T y) noexcept;
-
-// lock-free property
-
-#define ATOMIC_BOOL_LOCK_FREE unspecified
-#define ATOMIC_CHAR_LOCK_FREE unspecified
-#define ATOMIC_CHAR16_T_LOCK_FREE unspecified
-#define ATOMIC_CHAR32_T_LOCK_FREE unspecified
-#define ATOMIC_WCHAR_T_LOCK_FREE unspecified
-#define ATOMIC_SHORT_LOCK_FREE unspecified
-#define ATOMIC_INT_LOCK_FREE unspecified
-#define ATOMIC_LONG_LOCK_FREE unspecified
-#define ATOMIC_LLONG_LOCK_FREE unspecified
-#define ATOMIC_POINTER_LOCK_FREE unspecified
-
-// flag type and operations
-
-typedef struct atomic_flag
-{
-    bool test_and_set(memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool test_and_set(memory_order m = memory_order_seq_cst) noexcept;
-    void clear(memory_order m = memory_order_seq_cst) volatile noexcept;
-    void clear(memory_order m = memory_order_seq_cst) noexcept;
-    atomic_flag()  noexcept = default;
-    atomic_flag(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) volatile = delete;
-} atomic_flag;
-
-bool
-    atomic_flag_test_and_set(volatile atomic_flag* obj) noexcept;
-
-bool
-    atomic_flag_test_and_set(atomic_flag* obj) noexcept;
-
-bool
-    atomic_flag_test_and_set_explicit(volatile atomic_flag* obj,
-                                      memory_order m) noexcept;
-
-bool
-    atomic_flag_test_and_set_explicit(atomic_flag* obj, memory_order m) noexcept;
-
-void
-    atomic_flag_clear(volatile atomic_flag* obj) noexcept;
-
-void
-    atomic_flag_clear(atomic_flag* obj) noexcept;
-
-void
-    atomic_flag_clear_explicit(volatile atomic_flag* obj, memory_order m) noexcept;
-
-void
-    atomic_flag_clear_explicit(atomic_flag* obj, memory_order m) noexcept;
-
-#define ATOMIC_FLAG_INIT see below
-#define ATOMIC_VAR_INIT(value) see below
-
-template <class T>
-struct atomic
-{
-    bool is_lock_free() const volatile noexcept;
-    bool is_lock_free() const noexcept;
-    void store(T desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    void store(T desr, memory_order m = memory_order_seq_cst) noexcept;
-    T load(memory_order m = memory_order_seq_cst) const volatile noexcept;
-    T load(memory_order m = memory_order_seq_cst) const noexcept;
-    operator T() const volatile noexcept;
-    operator T() const noexcept;
-    T exchange(T desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    T exchange(T desr, memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_weak(T& expc, T desr,
-                               memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_weak(T& expc, T desr, memory_order s, memory_order f) noexcept;
-    bool compare_exchange_strong(T& expc, T desr,
-                                 memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_strong(T& expc, T desr,
-                                 memory_order s, memory_order f) noexcept;
-    bool compare_exchange_weak(T& expc, T desr,
-                               memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_weak(T& expc, T desr,
-                               memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_strong(T& expc, T desr,
-                                memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_strong(T& expc, T desr,
-                                 memory_order m = memory_order_seq_cst) noexcept;
-
-    atomic() noexcept = default;
-    constexpr atomic(T desr) noexcept;
-    atomic(const atomic&) = delete;
-    atomic& operator=(const atomic&) = delete;
-    atomic& operator=(const atomic&) volatile = delete;
-    T operator=(T) volatile noexcept;
-    T operator=(T) noexcept;
-};
-
-template <>
-struct atomic<integral>
-{
-    bool is_lock_free() const volatile noexcept;
-    bool is_lock_free() const noexcept;
-    void store(integral desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    void store(integral desr, memory_order m = memory_order_seq_cst) noexcept;
-    integral load(memory_order m = memory_order_seq_cst) const volatile noexcept;
-    integral load(memory_order m = memory_order_seq_cst) const noexcept;
-    operator integral() const volatile noexcept;
-    operator integral() const noexcept;
-    integral exchange(integral desr,
-                      memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral exchange(integral desr, memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_weak(integral& expc, integral desr,
-                               memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_weak(integral& expc, integral desr,
-                               memory_order s, memory_order f) noexcept;
-    bool compare_exchange_strong(integral& expc, integral desr,
-                                 memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_strong(integral& expc, integral desr,
-                                 memory_order s, memory_order f) noexcept;
-    bool compare_exchange_weak(integral& expc, integral desr,
-                               memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_weak(integral& expc, integral desr,
-                               memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_strong(integral& expc, integral desr,
-                                memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_strong(integral& expc, integral desr,
-                                 memory_order m = memory_order_seq_cst) noexcept;
-
-    integral
-        fetch_add(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_add(integral op, memory_order m = memory_order_seq_cst) noexcept;
-    integral
-        fetch_sub(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_sub(integral op, memory_order m = memory_order_seq_cst) noexcept;
-    integral
-        fetch_and(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_and(integral op, memory_order m = memory_order_seq_cst) noexcept;
-    integral
-        fetch_or(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_or(integral op, memory_order m = memory_order_seq_cst) noexcept;
-    integral
-        fetch_xor(integral op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    integral fetch_xor(integral op, memory_order m = memory_order_seq_cst) noexcept;
-
-    atomic() noexcept = default;
-    constexpr atomic(integral desr) noexcept;
-    atomic(const atomic&) = delete;
-    atomic& operator=(const atomic&) = delete;
-    atomic& operator=(const atomic&) volatile = delete;
-    integral operator=(integral desr) volatile noexcept;
-    integral operator=(integral desr) noexcept;
-
-    integral operator++(int) volatile noexcept;
-    integral operator++(int) noexcept;
-    integral operator--(int) volatile noexcept;
-    integral operator--(int) noexcept;
-    integral operator++() volatile noexcept;
-    integral operator++() noexcept;
-    integral operator--() volatile noexcept;
-    integral operator--() noexcept;
-    integral operator+=(integral op) volatile noexcept;
-    integral operator+=(integral op) noexcept;
-    integral operator-=(integral op) volatile noexcept;
-    integral operator-=(integral op) noexcept;
-    integral operator&=(integral op) volatile noexcept;
-    integral operator&=(integral op) noexcept;
-    integral operator|=(integral op) volatile noexcept;
-    integral operator|=(integral op) noexcept;
-    integral operator^=(integral op) volatile noexcept;
-    integral operator^=(integral op) noexcept;
-};
-
-template <class T>
-struct atomic<T*>
-{
-    bool is_lock_free() const volatile noexcept;
-    bool is_lock_free() const noexcept;
-    void store(T* desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    void store(T* desr, memory_order m = memory_order_seq_cst) noexcept;
-    T* load(memory_order m = memory_order_seq_cst) const volatile noexcept;
-    T* load(memory_order m = memory_order_seq_cst) const noexcept;
-    operator T*() const volatile noexcept;
-    operator T*() const noexcept;
-    T* exchange(T* desr, memory_order m = memory_order_seq_cst) volatile noexcept;
-    T* exchange(T* desr, memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_weak(T*& expc, T* desr,
-                               memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_weak(T*& expc, T* desr,
-                               memory_order s, memory_order f) noexcept;
-    bool compare_exchange_strong(T*& expc, T* desr,
-                                 memory_order s, memory_order f) volatile noexcept;
-    bool compare_exchange_strong(T*& expc, T* desr,
-                                 memory_order s, memory_order f) noexcept;
-    bool compare_exchange_weak(T*& expc, T* desr,
-                               memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_weak(T*& expc, T* desr,
-                               memory_order m = memory_order_seq_cst) noexcept;
-    bool compare_exchange_strong(T*& expc, T* desr,
-                                memory_order m = memory_order_seq_cst) volatile noexcept;
-    bool compare_exchange_strong(T*& expc, T* desr,
-                                 memory_order m = memory_order_seq_cst) noexcept;
-    T* fetch_add(ptrdiff_t op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    T* fetch_add(ptrdiff_t op, memory_order m = memory_order_seq_cst) noexcept;
-    T* fetch_sub(ptrdiff_t op, memory_order m = memory_order_seq_cst) volatile noexcept;
-    T* fetch_sub(ptrdiff_t op, memory_order m = memory_order_seq_cst) noexcept;
-
-    atomic() noexcept = default;
-    constexpr atomic(T* desr) noexcept;
-    atomic(const atomic&) = delete;
-    atomic& operator=(const atomic&) = delete;
-    atomic& operator=(const atomic&) volatile = delete;
-
-    T* operator=(T*) volatile noexcept;
-    T* operator=(T*) noexcept;
-    T* operator++(int) volatile noexcept;
-    T* operator++(int) noexcept;
-    T* operator--(int) volatile noexcept;
-    T* operator--(int) noexcept;
-    T* operator++() volatile noexcept;
-    T* operator++() noexcept;
-    T* operator--() volatile noexcept;
-    T* operator--() noexcept;
-    T* operator+=(ptrdiff_t op) volatile noexcept;
-    T* operator+=(ptrdiff_t op) noexcept;
-    T* operator-=(ptrdiff_t op) volatile noexcept;
-    T* operator-=(ptrdiff_t op) noexcept;
-};
-
-
-template <class T>
-    bool
-    atomic_is_lock_free(const volatile atomic<T>* obj) noexcept;
-
-template <class T>
-    bool
-    atomic_is_lock_free(const atomic<T>* obj) noexcept;
-
-template <class T>
-    void
-    atomic_init(volatile atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    void
-    atomic_init(atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    void
-    atomic_store(volatile atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    void
-    atomic_store(atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    void
-    atomic_store_explicit(volatile atomic<T>* obj, T desr, memory_order m) noexcept;
-
-template <class T>
-    void
-    atomic_store_explicit(atomic<T>* obj, T desr, memory_order m) noexcept;
-
-template <class T>
-    T
-    atomic_load(const volatile atomic<T>* obj) noexcept;
-
-template <class T>
-    T
-    atomic_load(const atomic<T>* obj) noexcept;
-
-template <class T>
-    T
-    atomic_load_explicit(const volatile atomic<T>* obj, memory_order m) noexcept;
-
-template <class T>
-    T
-    atomic_load_explicit(const atomic<T>* obj, memory_order m) noexcept;
-
-template <class T>
-    T
-    atomic_exchange(volatile atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    T
-    atomic_exchange(atomic<T>* obj, T desr) noexcept;
-
-template <class T>
-    T
-    atomic_exchange_explicit(volatile atomic<T>* obj, T desr, memory_order m) noexcept;
-
-template <class T>
-    T
-    atomic_exchange_explicit(atomic<T>* obj, T desr, memory_order m) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_weak(volatile atomic<T>* obj, T* expc, T desr) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_weak(atomic<T>* obj, T* expc, T desr) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_strong(volatile atomic<T>* obj, T* expc, T desr) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_strong(atomic<T>* obj, T* expc, T desr) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_weak_explicit(volatile atomic<T>* obj, T* expc,
-                                          T desr,
-                                          memory_order s, memory_order f) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_weak_explicit(atomic<T>* obj, T* expc, T desr,
-                                          memory_order s, memory_order f) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_strong_explicit(volatile atomic<T>* obj,
-                                            T* expc, T desr,
-                                            memory_order s, memory_order f) noexcept;
-
-template <class T>
-    bool
-    atomic_compare_exchange_strong_explicit(atomic<T>* obj, T* expc,
-                                            T desr,
-                                            memory_order s, memory_order f) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_add(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_add(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_add_explicit(volatile atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_add_explicit(atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_sub(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_sub(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_sub_explicit(volatile atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_sub_explicit(atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_and(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_and(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_and_explicit(volatile atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_and_explicit(atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_or(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_or(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_or_explicit(volatile atomic<Integral>* obj, Integral op,
-                             memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_or_explicit(atomic<Integral>* obj, Integral op,
-                             memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_xor(volatile atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_xor(atomic<Integral>* obj, Integral op) noexcept;
-
-template <class Integral>
-    Integral
-    atomic_fetch_xor_explicit(volatile atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-template <class Integral>
-    Integral
-    atomic_fetch_xor_explicit(atomic<Integral>* obj, Integral op,
-                              memory_order m) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_add(volatile atomic<T*>* obj, ptrdiff_t op) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_add(atomic<T*>* obj, ptrdiff_t op) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_add_explicit(volatile atomic<T*>* obj, ptrdiff_t op,
-                              memory_order m) noexcept;
-template <class T>
-    T*
-    atomic_fetch_add_explicit(atomic<T*>* obj, ptrdiff_t op, memory_order m) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_sub(volatile atomic<T*>* obj, ptrdiff_t op) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_sub(atomic<T*>* obj, ptrdiff_t op) noexcept;
-
-template <class T>
-    T*
-    atomic_fetch_sub_explicit(volatile atomic<T*>* obj, ptrdiff_t op,
-                              memory_order m) noexcept;
-template <class T>
-    T*
-    atomic_fetch_sub_explicit(atomic<T*>* obj, ptrdiff_t op, memory_order m) noexcept;
-
-// Atomics for standard typedef types
-
-typedef atomic<bool>               atomic_bool;
-typedef atomic<char>               atomic_char;
-typedef atomic<signed char>        atomic_schar;
-typedef atomic<unsigned char>      atomic_uchar;
-typedef atomic<short>              atomic_short;
-typedef atomic<unsigned short>     atomic_ushort;
-typedef atomic<int>                atomic_int;
-typedef atomic<unsigned int>       atomic_uint;
-typedef atomic<long>               atomic_long;
-typedef atomic<unsigned long>      atomic_ulong;
-typedef atomic<long long>          atomic_llong;
-typedef atomic<unsigned long long> atomic_ullong;
-typedef atomic<char16_t>           atomic_char16_t;
-typedef atomic<char32_t>           atomic_char32_t;
-typedef atomic<wchar_t>            atomic_wchar_t;
-
-typedef atomic<int_least8_t>   atomic_int_least8_t;
-typedef atomic<uint_least8_t>  atomic_uint_least8_t;
-typedef atomic<int_least16_t>  atomic_int_least16_t;
-typedef atomic<uint_least16_t> atomic_uint_least16_t;
-typedef atomic<int_least32_t>  atomic_int_least32_t;
-typedef atomic<uint_least32_t> atomic_uint_least32_t;
-typedef atomic<int_least64_t>  atomic_int_least64_t;
-typedef atomic<uint_least64_t> atomic_uint_least64_t;
-
-typedef atomic<int_fast8_t>   atomic_int_fast8_t;
-typedef atomic<uint_fast8_t>  atomic_uint_fast8_t;
-typedef atomic<int_fast16_t>  atomic_int_fast16_t;
-typedef atomic<uint_fast16_t> atomic_uint_fast16_t;
-typedef atomic<int_fast32_t>  atomic_int_fast32_t;
-typedef atomic<uint_fast32_t> atomic_uint_fast32_t;
-typedef atomic<int_fast64_t>  atomic_int_fast64_t;
-typedef atomic<uint_fast64_t> atomic_uint_fast64_t;
-
-typedef atomic<intptr_t>  atomic_intptr_t;
-typedef atomic<uintptr_t> atomic_uintptr_t;
-typedef atomic<size_t>    atomic_size_t;
-typedef atomic<ptrdiff_t> atomic_ptrdiff_t;
-typedef atomic<intmax_t>  atomic_intmax_t;
-typedef atomic<uintmax_t> atomic_uintmax_t;
-
-// fences
-
-void atomic_thread_fence(memory_order m) noexcept;
-void atomic_signal_fence(memory_order m) noexcept;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cstddef>
-#include <cstdint>
-#include <type_traits>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifdef _LIBCPP_HAS_NO_THREADS
-#error <atomic> is not supported on this single threaded system
-#else // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#if !__has_feature(cxx_atomic) && _GNUC_VER < 407
-#error <atomic> is not implemented
-#else
-
-typedef enum memory_order
-{
-    memory_order_relaxed, memory_order_consume, memory_order_acquire,
-    memory_order_release, memory_order_acq_rel, memory_order_seq_cst
-} memory_order;
-
-#if _GNUC_VER >= 407
-namespace __gcc_atomic {
-template <typename T>
-struct __gcc_atomic_t {
-  __gcc_atomic_t() _NOEXCEPT {}
-  explicit __gcc_atomic_t(T value) _NOEXCEPT : __a_value(value) {}
-  T __a_value;
-};
-#define _Atomic(x) __gcc_atomic::__gcc_atomic_t<x>
-
-template <typename T> T __create();
-
-template <typename __Tp, typename __Td>
-typename enable_if<sizeof(__Tp()->__a_value = __create<__Td>()), char>::type
-    __test_atomic_assignable(int);
-template <typename T, typename U>
-__two __test_atomic_assignable(...);
-
-template <typename __Tp, typename __Td>
-struct __can_assign {
-  static const bool value =
-      sizeof(__test_atomic_assignable<__Tp, __Td>(1)) == sizeof(char);
-};
-
-static inline constexpr int __to_gcc_order(memory_order __order) {
-  // Avoid switch statement to make this a constexpr.
-  return __order == memory_order_relaxed ? __ATOMIC_RELAXED:
-         (__order == memory_order_acquire ? __ATOMIC_ACQUIRE:
-          (__order == memory_order_release ? __ATOMIC_RELEASE:
-           (__order == memory_order_seq_cst ? __ATOMIC_SEQ_CST:
-            (__order == memory_order_acq_rel ? __ATOMIC_ACQ_REL:
-              __ATOMIC_CONSUME))));
-}
-
-} // namespace __gcc_atomic
-
-template <typename _Tp>
-static inline
-typename enable_if<
-    __gcc_atomic::__can_assign<volatile _Atomic(_Tp)*, _Tp>::value>::type
-__c11_atomic_init(volatile _Atomic(_Tp)* __a,  _Tp __val) {
-  __a->__a_value = __val;
-}
-
-template <typename _Tp>
-static inline
-typename enable_if<
-    !__gcc_atomic::__can_assign<volatile _Atomic(_Tp)*, _Tp>::value &&
-     __gcc_atomic::__can_assign<         _Atomic(_Tp)*, _Tp>::value>::type
-__c11_atomic_init(volatile _Atomic(_Tp)* __a,  _Tp __val) {
-  // [atomics.types.generic]p1 guarantees _Tp is trivially copyable. Because
-  // the default operator= in an object is not volatile, a byte-by-byte copy
-  // is required.
-  volatile char* to = reinterpret_cast<volatile char*>(&__a->__a_value);
-  volatile char* end = to + sizeof(_Tp);
-  char* from = reinterpret_cast<char*>(&__val);
-  while (to != end) {
-    *to++ = *from++;
-  }
-}
-
-template <typename _Tp>
-static inline void __c11_atomic_init(_Atomic(_Tp)* __a,  _Tp __val) {
-  __a->__a_value = __val;
-}
-
-static inline void __c11_atomic_thread_fence(memory_order __order) {
-  __atomic_thread_fence(__gcc_atomic::__to_gcc_order(__order));
-}
-
-static inline void __c11_atomic_signal_fence(memory_order __order) {
-  __atomic_signal_fence(__gcc_atomic::__to_gcc_order(__order));
-}
-
-static inline bool __c11_atomic_is_lock_free(size_t __size) {
-  return __atomic_is_lock_free(__size, 0);
-}
-
-template <typename _Tp>
-static inline void __c11_atomic_store(volatile _Atomic(_Tp)* __a,  _Tp __val,
-                                      memory_order __order) {
-  return __atomic_store(&__a->__a_value, &__val,
-                        __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline void __c11_atomic_store(_Atomic(_Tp)* __a,  _Tp __val,
-                                      memory_order __order) {
-  return __atomic_store(&__a->__a_value, &__val,
-                        __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_load(volatile _Atomic(_Tp)* __a,
-                                    memory_order __order) {
-  _Tp __ret;
-  __atomic_load(&__a->__a_value, &__ret,
-                __gcc_atomic::__to_gcc_order(__order));
-  return __ret;
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_load(_Atomic(_Tp)* __a, memory_order __order) {
-  _Tp __ret;
-  __atomic_load(&__a->__a_value, &__ret,
-                __gcc_atomic::__to_gcc_order(__order));
-  return __ret;
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_exchange(volatile _Atomic(_Tp)* __a,
-                                        _Tp __value, memory_order __order) {
-  _Tp __ret;
-  __atomic_exchange(&__a->__a_value, &__value, &__ret,
-                    __gcc_atomic::__to_gcc_order(__order));
-  return __ret;
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_exchange(_Atomic(_Tp)* __a, _Tp __value,
-                                        memory_order __order) {
-  _Tp __ret;
-  __atomic_exchange(&__a->__a_value, &__value, &__ret,
-                    __gcc_atomic::__to_gcc_order(__order));
-  return __ret;
-}
-
-template <typename _Tp>
-static inline bool __c11_atomic_compare_exchange_strong(
-    volatile _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value,
-    memory_order __success, memory_order __failure) {
-  return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
-                                   false,
-                                   __gcc_atomic::__to_gcc_order(__success),
-                                   __gcc_atomic::__to_gcc_order(__failure));
-}
-
-template <typename _Tp>
-static inline bool __c11_atomic_compare_exchange_strong(
-    _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value, memory_order __success,
-    memory_order __failure) {
-  return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
-                                   false,
-                                   __gcc_atomic::__to_gcc_order(__success),
-                                   __gcc_atomic::__to_gcc_order(__failure));
-}
-
-template <typename _Tp>
-static inline bool __c11_atomic_compare_exchange_weak(
-    volatile _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value,
-    memory_order __success, memory_order __failure) {
-  return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
-                                   true,
-                                   __gcc_atomic::__to_gcc_order(__success),
-                                   __gcc_atomic::__to_gcc_order(__failure));
-}
-
-template <typename _Tp>
-static inline bool __c11_atomic_compare_exchange_weak(
-    _Atomic(_Tp)* __a, _Tp* __expected, _Tp __value, memory_order __success,
-    memory_order __failure) {
-  return __atomic_compare_exchange(&__a->__a_value, __expected, &__value,
-                                   true,
-                                   __gcc_atomic::__to_gcc_order(__success),
-                                   __gcc_atomic::__to_gcc_order(__failure));
-}
-
-template <typename _Tp>
-struct __skip_amt { enum {value = 1}; };
-
-template <typename _Tp>
-struct __skip_amt<_Tp*> { enum {value = sizeof(_Tp)}; };
-
-// FIXME: Haven't figured out what the spec says about using arrays with
-// atomic_fetch_add. Force a failure rather than creating bad behavior.
-template <typename _Tp>
-struct __skip_amt<_Tp[]> { };
-template <typename _Tp, int n>
-struct __skip_amt<_Tp[n]> { };
-
-template <typename _Tp, typename _Td>
-static inline _Tp __c11_atomic_fetch_add(volatile _Atomic(_Tp)* __a,
-                                         _Td __delta, memory_order __order) {
-  return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp, typename _Td>
-static inline _Tp __c11_atomic_fetch_add(_Atomic(_Tp)* __a, _Td __delta,
-                                         memory_order __order) {
-  return __atomic_fetch_add(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp, typename _Td>
-static inline _Tp __c11_atomic_fetch_sub(volatile _Atomic(_Tp)* __a,
-                                         _Td __delta, memory_order __order) {
-  return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp, typename _Td>
-static inline _Tp __c11_atomic_fetch_sub(_Atomic(_Tp)* __a, _Td __delta,
-                                         memory_order __order) {
-  return __atomic_fetch_sub(&__a->__a_value, __delta * __skip_amt<_Tp>::value,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_and(volatile _Atomic(_Tp)* __a,
-                                         _Tp __pattern, memory_order __order) {
-  return __atomic_fetch_and(&__a->__a_value, __pattern,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_and(_Atomic(_Tp)* __a,
-                                         _Tp __pattern, memory_order __order) {
-  return __atomic_fetch_and(&__a->__a_value, __pattern,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_or(volatile _Atomic(_Tp)* __a,
-                                        _Tp __pattern, memory_order __order) {
-  return __atomic_fetch_or(&__a->__a_value, __pattern,
-                           __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_or(_Atomic(_Tp)* __a, _Tp __pattern,
-                                        memory_order __order) {
-  return __atomic_fetch_or(&__a->__a_value, __pattern,
-                           __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_xor(volatile _Atomic(_Tp)* __a,
-                                         _Tp __pattern, memory_order __order) {
-  return __atomic_fetch_xor(&__a->__a_value, __pattern,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-
-template <typename _Tp>
-static inline _Tp __c11_atomic_fetch_xor(_Atomic(_Tp)* __a, _Tp __pattern,
-                                         memory_order __order) {
-  return __atomic_fetch_xor(&__a->__a_value, __pattern,
-                            __gcc_atomic::__to_gcc_order(__order));
-}
-#endif // _GNUC_VER >= 407
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-kill_dependency(_Tp __y) _NOEXCEPT
-{
-    return __y;
-}
-
-// general atomic<T>
-
-template <class _Tp, bool = is_integral<_Tp>::value && !is_same<_Tp, bool>::value>
-struct __atomic_base  // false
-{
-    mutable _Atomic(_Tp) __a_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool is_lock_free() const volatile _NOEXCEPT
-        {return __c11_atomic_is_lock_free(sizeof(_Tp));}
-    _LIBCPP_INLINE_VISIBILITY
-    bool is_lock_free() const _NOEXCEPT
-        {return __c11_atomic_is_lock_free(sizeof(_Tp));}
-    _LIBCPP_INLINE_VISIBILITY
-    void store(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {__c11_atomic_store(&__a_, __d, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    void store(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {__c11_atomic_store(&__a_, __d, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp load(memory_order __m = memory_order_seq_cst) const volatile _NOEXCEPT
-        {return __c11_atomic_load(&__a_, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp load(memory_order __m = memory_order_seq_cst) const _NOEXCEPT
-        {return __c11_atomic_load(&__a_, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    operator _Tp() const volatile _NOEXCEPT {return load();}
-    _LIBCPP_INLINE_VISIBILITY
-    operator _Tp() const _NOEXCEPT          {return load();}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_exchange(&__a_, __d, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp exchange(_Tp __d, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_exchange(&__a_, __d, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_weak(_Tp& __e, _Tp __d,
-                               memory_order __s, memory_order __f) volatile _NOEXCEPT
-        {return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_weak(_Tp& __e, _Tp __d,
-                               memory_order __s, memory_order __f) _NOEXCEPT
-        {return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __s, __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_strong(_Tp& __e, _Tp __d,
-                                 memory_order __s, memory_order __f) volatile _NOEXCEPT
-        {return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_strong(_Tp& __e, _Tp __d,
-                                 memory_order __s, memory_order __f) _NOEXCEPT
-        {return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __s, __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_weak(_Tp& __e, _Tp __d,
-                              memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_weak(_Tp& __e, _Tp __d,
-                               memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_compare_exchange_weak(&__a_, &__e, __d, __m, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_strong(_Tp& __e, _Tp __d,
-                              memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool compare_exchange_strong(_Tp& __e, _Tp __d,
-                                 memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_compare_exchange_strong(&__a_, &__e, __d, __m, __m);}
-
-    _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    __atomic_base() _NOEXCEPT = default;
-#else
-    __atomic_base() _NOEXCEPT : __a_() {}
-#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR __atomic_base(_Tp __d) _NOEXCEPT : __a_(__d) {}
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __atomic_base(const __atomic_base&) = delete;
-    __atomic_base& operator=(const __atomic_base&) = delete;
-    __atomic_base& operator=(const __atomic_base&) volatile = delete;
-#else  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-private:
-    __atomic_base(const __atomic_base&);
-    __atomic_base& operator=(const __atomic_base&);
-    __atomic_base& operator=(const __atomic_base&) volatile;
-#endif  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-};
-
-// atomic<Integral>
-
-template <class _Tp>
-struct __atomic_base<_Tp, true>
-    : public __atomic_base<_Tp, false>
-{
-    typedef __atomic_base<_Tp, false> __base;
-    _LIBCPP_INLINE_VISIBILITY
-    __atomic_base() _NOEXCEPT _LIBCPP_DEFAULT
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR __atomic_base(_Tp __d) _NOEXCEPT : __base(__d) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_add(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_add(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_add(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_sub(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_and(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_and(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_and(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_or(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_or(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_or(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_fetch_xor(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp fetch_xor(_Tp __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_xor(&this->__a_, __op, __m);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator++(int) volatile _NOEXCEPT      {return fetch_add(_Tp(1));}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator++(int) _NOEXCEPT               {return fetch_add(_Tp(1));}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator--(int) volatile _NOEXCEPT      {return fetch_sub(_Tp(1));}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator--(int) _NOEXCEPT               {return fetch_sub(_Tp(1));}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator++() volatile _NOEXCEPT         {return fetch_add(_Tp(1)) + _Tp(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator++() _NOEXCEPT                  {return fetch_add(_Tp(1)) + _Tp(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator--() volatile _NOEXCEPT         {return fetch_sub(_Tp(1)) - _Tp(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator--() _NOEXCEPT                  {return fetch_sub(_Tp(1)) - _Tp(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator+=(_Tp __op) volatile _NOEXCEPT {return fetch_add(__op) + __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator+=(_Tp __op) _NOEXCEPT          {return fetch_add(__op) + __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator-=(_Tp __op) volatile _NOEXCEPT {return fetch_sub(__op) - __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator-=(_Tp __op) _NOEXCEPT          {return fetch_sub(__op) - __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator&=(_Tp __op) volatile _NOEXCEPT {return fetch_and(__op) & __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator&=(_Tp __op) _NOEXCEPT          {return fetch_and(__op) & __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator|=(_Tp __op) volatile _NOEXCEPT {return fetch_or(__op) | __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator|=(_Tp __op) _NOEXCEPT          {return fetch_or(__op) | __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator^=(_Tp __op) volatile _NOEXCEPT {return fetch_xor(__op) ^ __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator^=(_Tp __op) _NOEXCEPT          {return fetch_xor(__op) ^ __op;}
-};
-
-// atomic<T>
-
-template <class _Tp>
-struct atomic
-    : public __atomic_base<_Tp>
-{
-    typedef __atomic_base<_Tp> __base;
-    _LIBCPP_INLINE_VISIBILITY
-    atomic() _NOEXCEPT _LIBCPP_DEFAULT
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR atomic(_Tp __d) _NOEXCEPT : __base(__d) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator=(_Tp __d) volatile _NOEXCEPT
-        {__base::store(__d); return __d;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator=(_Tp __d) _NOEXCEPT
-        {__base::store(__d); return __d;}
-};
-
-// atomic<T*>
-
-template <class _Tp>
-struct atomic<_Tp*>
-    : public __atomic_base<_Tp*>
-{
-    typedef __atomic_base<_Tp*> __base;
-    _LIBCPP_INLINE_VISIBILITY
-    atomic() _NOEXCEPT _LIBCPP_DEFAULT
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR atomic(_Tp* __d) _NOEXCEPT : __base(__d) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator=(_Tp* __d) volatile _NOEXCEPT
-        {__base::store(__d); return __d;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator=(_Tp* __d) _NOEXCEPT
-        {__base::store(__d); return __d;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst)
-                                                                        volatile _NOEXCEPT
-        {return __c11_atomic_fetch_add(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* fetch_add(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_add(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst)
-                                                                        volatile _NOEXCEPT
-        {return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* fetch_sub(ptrdiff_t __op, memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_fetch_sub(&this->__a_, __op, __m);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator++(int) volatile _NOEXCEPT            {return fetch_add(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator++(int) _NOEXCEPT                     {return fetch_add(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator--(int) volatile _NOEXCEPT            {return fetch_sub(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator--(int) _NOEXCEPT                     {return fetch_sub(1);}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator++() volatile _NOEXCEPT               {return fetch_add(1) + 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator++() _NOEXCEPT                        {return fetch_add(1) + 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator--() volatile _NOEXCEPT               {return fetch_sub(1) - 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator--() _NOEXCEPT                        {return fetch_sub(1) - 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator+=(ptrdiff_t __op) volatile _NOEXCEPT {return fetch_add(__op) + __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator+=(ptrdiff_t __op) _NOEXCEPT          {return fetch_add(__op) + __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator-=(ptrdiff_t __op) volatile _NOEXCEPT {return fetch_sub(__op) - __op;}
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* operator-=(ptrdiff_t __op) _NOEXCEPT          {return fetch_sub(__op) - __op;}
-};
-
-// atomic_is_lock_free
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_is_lock_free(const volatile atomic<_Tp>* __o) _NOEXCEPT
-{
-    return __o->is_lock_free();
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_is_lock_free(const atomic<_Tp>* __o) _NOEXCEPT
-{
-    return __o->is_lock_free();
-}
-
-// atomic_init
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_init(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    __c11_atomic_init(&__o->__a_, __d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_init(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    __c11_atomic_init(&__o->__a_, __d);
-}
-
-// atomic_store
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    __o->store(__d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    __o->store(__d);
-}
-
-// atomic_store_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
-{
-    __o->store(__d, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
-{
-    __o->store(__d, __m);
-}
-
-// atomic_load
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_load(const volatile atomic<_Tp>* __o) _NOEXCEPT
-{
-    return __o->load();
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_load(const atomic<_Tp>* __o) _NOEXCEPT
-{
-    return __o->load();
-}
-
-// atomic_load_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_load_explicit(const volatile atomic<_Tp>* __o, memory_order __m) _NOEXCEPT
-{
-    return __o->load(__m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_load_explicit(const atomic<_Tp>* __o, memory_order __m) _NOEXCEPT
-{
-    return __o->load(__m);
-}
-
-// atomic_exchange
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_exchange(volatile atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    return __o->exchange(__d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_exchange(atomic<_Tp>* __o, _Tp __d) _NOEXCEPT
-{
-    return __o->exchange(__d);
-}
-
-// atomic_exchange_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_exchange_explicit(volatile atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
-{
-    return __o->exchange(__d, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-atomic_exchange_explicit(atomic<_Tp>* __o, _Tp __d, memory_order __m) _NOEXCEPT
-{
-    return __o->exchange(__d, __m);
-}
-
-// atomic_compare_exchange_weak
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
-{
-    return __o->compare_exchange_weak(*__e, __d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
-{
-    return __o->compare_exchange_weak(*__e, __d);
-}
-
-// atomic_compare_exchange_strong
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong(volatile atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
-{
-    return __o->compare_exchange_strong(*__e, __d);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong(atomic<_Tp>* __o, _Tp* __e, _Tp __d) _NOEXCEPT
-{
-    return __o->compare_exchange_strong(*__e, __d);
-}
-
-// atomic_compare_exchange_weak_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak_explicit(volatile atomic<_Tp>* __o, _Tp* __e,
-                                      _Tp __d,
-                                      memory_order __s, memory_order __f) _NOEXCEPT
-{
-    return __o->compare_exchange_weak(*__e, __d, __s, __f);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak_explicit(atomic<_Tp>* __o, _Tp* __e, _Tp __d,
-                                      memory_order __s, memory_order __f) _NOEXCEPT
-{
-    return __o->compare_exchange_weak(*__e, __d, __s, __f);
-}
-
-// atomic_compare_exchange_strong_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong_explicit(volatile atomic<_Tp>* __o,
-                                        _Tp* __e, _Tp __d,
-                                        memory_order __s, memory_order __f) _NOEXCEPT
-{
-    return __o->compare_exchange_strong(*__e, __d, __s, __f);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong_explicit(atomic<_Tp>* __o, _Tp* __e,
-                                        _Tp __d,
-                                        memory_order __s, memory_order __f) _NOEXCEPT
-{
-    return __o->compare_exchange_strong(*__e, __d, __s, __f);
-}
-
-// atomic_fetch_add
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_add(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_add(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_add(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_add(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_add(volatile atomic<_Tp*>* __o, ptrdiff_t __op) _NOEXCEPT
-{
-    return __o->fetch_add(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_add(atomic<_Tp*>* __o, ptrdiff_t __op) _NOEXCEPT
-{
-    return __o->fetch_add(__op);
-}
-
-// atomic_fetch_add_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_add_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_add(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_add_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_add(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_add_explicit(volatile atomic<_Tp*>* __o, ptrdiff_t __op,
-                          memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_add(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_add_explicit(atomic<_Tp*>* __o, ptrdiff_t __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_add(__op, __m);
-}
-
-// atomic_fetch_sub
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_sub(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_sub(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_sub(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_sub(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_sub(volatile atomic<_Tp*>* __o, ptrdiff_t __op) _NOEXCEPT
-{
-    return __o->fetch_sub(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_sub(atomic<_Tp*>* __o, ptrdiff_t __op) _NOEXCEPT
-{
-    return __o->fetch_sub(__op);
-}
-
-// atomic_fetch_sub_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_sub_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_sub(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_sub_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_sub(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_sub_explicit(volatile atomic<_Tp*>* __o, ptrdiff_t __op,
-                          memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_sub(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-atomic_fetch_sub_explicit(atomic<_Tp*>* __o, ptrdiff_t __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_sub(__op, __m);
-}
-
-// atomic_fetch_and
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_and(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_and(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_and(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_and(__op);
-}
-
-// atomic_fetch_and_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_and_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_and(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_and_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_and(__op, __m);
-}
-
-// atomic_fetch_or
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_or(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_or(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_or(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_or(__op);
-}
-
-// atomic_fetch_or_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_or_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_or(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_or_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_or(__op, __m);
-}
-
-// atomic_fetch_xor
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_xor(volatile atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_xor(__op);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_xor(atomic<_Tp>* __o, _Tp __op) _NOEXCEPT
-{
-    return __o->fetch_xor(__op);
-}
-
-// atomic_fetch_xor_explicit
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_xor_explicit(volatile atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_xor(__op, __m);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value && !is_same<_Tp, bool>::value,
-    _Tp
->::type
-atomic_fetch_xor_explicit(atomic<_Tp>* __o, _Tp __op, memory_order __m) _NOEXCEPT
-{
-    return __o->fetch_xor(__op, __m);
-}
-
-// flag type and operations
-
-typedef struct atomic_flag
-{
-    _Atomic(bool) __a_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool test_and_set(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {return __c11_atomic_exchange(&__a_, true, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool test_and_set(memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {return __c11_atomic_exchange(&__a_, true, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear(memory_order __m = memory_order_seq_cst) volatile _NOEXCEPT
-        {__c11_atomic_store(&__a_, false, __m);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear(memory_order __m = memory_order_seq_cst) _NOEXCEPT
-        {__c11_atomic_store(&__a_, false, __m);}
-
-    _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    atomic_flag() _NOEXCEPT = default;
-#else
-    atomic_flag() _NOEXCEPT : __a_() {}
-#endif // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    _LIBCPP_INLINE_VISIBILITY
-    atomic_flag(bool __b) _NOEXCEPT : __a_(__b) {}
-
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    atomic_flag(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) = delete;
-    atomic_flag& operator=(const atomic_flag&) volatile = delete;
-#else  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-private:
-    atomic_flag(const atomic_flag&);
-    atomic_flag& operator=(const atomic_flag&);
-    atomic_flag& operator=(const atomic_flag&) volatile;
-#endif  // _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-} atomic_flag;
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_flag_test_and_set(volatile atomic_flag* __o) _NOEXCEPT
-{
-    return __o->test_and_set();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_flag_test_and_set(atomic_flag* __o) _NOEXCEPT
-{
-    return __o->test_and_set();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_flag_test_and_set_explicit(volatile atomic_flag* __o, memory_order __m) _NOEXCEPT
-{
-    return __o->test_and_set(__m);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_flag_test_and_set_explicit(atomic_flag* __o, memory_order __m) _NOEXCEPT
-{
-    return __o->test_and_set(__m);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_flag_clear(volatile atomic_flag* __o) _NOEXCEPT
-{
-    __o->clear();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_flag_clear(atomic_flag* __o) _NOEXCEPT
-{
-    __o->clear();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_flag_clear_explicit(volatile atomic_flag* __o, memory_order __m) _NOEXCEPT
-{
-    __o->clear(__m);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_flag_clear_explicit(atomic_flag* __o, memory_order __m) _NOEXCEPT
-{
-    __o->clear(__m);
-}
-
-// fences
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_thread_fence(memory_order __m) _NOEXCEPT
-{
-    __c11_atomic_thread_fence(__m);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_signal_fence(memory_order __m) _NOEXCEPT
-{
-    __c11_atomic_signal_fence(__m);
-}
-
-// Atomics for standard typedef types
-
-typedef atomic<bool>               atomic_bool;
-typedef atomic<char>               atomic_char;
-typedef atomic<signed char>        atomic_schar;
-typedef atomic<unsigned char>      atomic_uchar;
-typedef atomic<short>              atomic_short;
-typedef atomic<unsigned short>     atomic_ushort;
-typedef atomic<int>                atomic_int;
-typedef atomic<unsigned int>       atomic_uint;
-typedef atomic<long>               atomic_long;
-typedef atomic<unsigned long>      atomic_ulong;
-typedef atomic<long long>          atomic_llong;
-typedef atomic<unsigned long long> atomic_ullong;
-typedef atomic<char16_t>           atomic_char16_t;
-typedef atomic<char32_t>           atomic_char32_t;
-typedef atomic<wchar_t>            atomic_wchar_t;
-
-typedef atomic<int_least8_t>   atomic_int_least8_t;
-typedef atomic<uint_least8_t>  atomic_uint_least8_t;
-typedef atomic<int_least16_t>  atomic_int_least16_t;
-typedef atomic<uint_least16_t> atomic_uint_least16_t;
-typedef atomic<int_least32_t>  atomic_int_least32_t;
-typedef atomic<uint_least32_t> atomic_uint_least32_t;
-typedef atomic<int_least64_t>  atomic_int_least64_t;
-typedef atomic<uint_least64_t> atomic_uint_least64_t;
-
-typedef atomic<int_fast8_t>   atomic_int_fast8_t;
-typedef atomic<uint_fast8_t>  atomic_uint_fast8_t;
-typedef atomic<int_fast16_t>  atomic_int_fast16_t;
-typedef atomic<uint_fast16_t> atomic_uint_fast16_t;
-typedef atomic<int_fast32_t>  atomic_int_fast32_t;
-typedef atomic<uint_fast32_t> atomic_uint_fast32_t;
-typedef atomic<int_fast64_t>  atomic_int_fast64_t;
-typedef atomic<uint_fast64_t> atomic_uint_fast64_t;
-
-typedef atomic<intptr_t>  atomic_intptr_t;
-typedef atomic<uintptr_t> atomic_uintptr_t;
-typedef atomic<size_t>    atomic_size_t;
-typedef atomic<ptrdiff_t> atomic_ptrdiff_t;
-typedef atomic<intmax_t>  atomic_intmax_t;
-typedef atomic<uintmax_t> atomic_uintmax_t;
-
-#define ATOMIC_FLAG_INIT {false}
-#define ATOMIC_VAR_INIT(__v) {__v}
-
-// lock-free property
-
-#define ATOMIC_BOOL_LOCK_FREE      __GCC_ATOMIC_BOOL_LOCK_FREE
-#define ATOMIC_CHAR_LOCK_FREE      __GCC_ATOMIC_CHAR_LOCK_FREE
-#define ATOMIC_CHAR16_T_LOCK_FREE  __GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#define ATOMIC_CHAR32_T_LOCK_FREE  __GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#define ATOMIC_WCHAR_T_LOCK_FREE   __GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#define ATOMIC_SHORT_LOCK_FREE     __GCC_ATOMIC_SHORT_LOCK_FREE
-#define ATOMIC_INT_LOCK_FREE       __GCC_ATOMIC_INT_LOCK_FREE
-#define ATOMIC_LONG_LOCK_FREE      __GCC_ATOMIC_LONG_LOCK_FREE
-#define ATOMIC_LLONG_LOCK_FREE     __GCC_ATOMIC_LLONG_LOCK_FREE
-#define ATOMIC_POINTER_LOCK_FREE   __GCC_ATOMIC_POINTER_LOCK_FREE
-
-#endif  //  !__has_feature(cxx_atomic)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_ATOMIC
diff --git a/include.new/c++/v1/tr1/bitset b/include.new/c++/v1/tr1/bitset
deleted file mode 100644
index 8c278cc..0000000
--- a/include.new/c++/v1/tr1/bitset
+++ /dev/null
@@ -1,1081 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- bitset ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_BITSET
-#define _LIBCPP_BITSET
-
-/*
-    bitset synopsis
-
-namespace std
-{
-
-namespace std {
-
-template <size_t N>
-class bitset
-{
-public:
-    // bit reference:
-    class reference
-    {
-        friend class bitset;
-        reference() noexcept;
-    public:
-        ~reference() noexcept;
-        reference& operator=(bool x) noexcept;           // for b[i] = x;
-        reference& operator=(const reference&) noexcept; // for b[i] = b[j];
-        bool operator~() const noexcept;                 // flips the bit
-        operator bool() const noexcept;                  // for x = b[i];
-        reference& flip() noexcept;                      // for b[i].flip();
-    };
-
-    // 23.3.5.1 constructors:
-    constexpr bitset() noexcept;
-    constexpr bitset(unsigned long long val) noexcept;
-    template <class charT>
-        explicit bitset(const charT* str,
-                        typename basic_string<charT>::size_type n = basic_string<charT>::npos,
-                        charT zero = charT('0'), charT one = charT('1'));
-    template<class charT, class traits, class Allocator>
-        explicit bitset(const basic_string<charT,traits,Allocator>& str,
-                        typename basic_string<charT,traits,Allocator>::size_type pos = 0,
-                        typename basic_string<charT,traits,Allocator>::size_type n =
-                                 basic_string<charT,traits,Allocator>::npos,
-                        charT zero = charT('0'), charT one = charT('1'));
-
-    // 23.3.5.2 bitset operations:
-    bitset& operator&=(const bitset& rhs) noexcept;
-    bitset& operator|=(const bitset& rhs) noexcept;
-    bitset& operator^=(const bitset& rhs) noexcept;
-    bitset& operator<<=(size_t pos) noexcept;
-    bitset& operator>>=(size_t pos) noexcept;
-    bitset& set() noexcept;
-    bitset& set(size_t pos, bool val = true);
-    bitset& reset() noexcept;
-    bitset& reset(size_t pos);
-    bitset operator~() const noexcept;
-    bitset& flip() noexcept;
-    bitset& flip(size_t pos);
-
-    // element access:
-    constexpr bool operator[](size_t pos) const; // for b[i];
-    reference operator[](size_t pos);            // for b[i];
-    unsigned long to_ulong() const;
-    unsigned long long to_ullong() const;
-    template <class charT, class traits, class Allocator>
-        basic_string<charT, traits, Allocator> to_string(charT zero = charT('0'), charT one = charT('1')) const;
-    template <class charT, class traits>
-        basic_string<charT, traits, allocator<charT> > to_string(charT zero = charT('0'), charT one = charT('1')) const;
-    template <class charT>
-        basic_string<charT, char_traits<charT>, allocator<charT> > to_string(charT zero = charT('0'), charT one = charT('1')) const;
-    basic_string<char, char_traits<char>, allocator<char> > to_string(char zero = '0', char one = '1') const;
-    size_t count() const noexcept;
-    constexpr size_t size() const noexcept;
-    bool operator==(const bitset& rhs) const noexcept;
-    bool operator!=(const bitset& rhs) const noexcept;
-    bool test(size_t pos) const;
-    bool all() const noexcept;
-    bool any() const noexcept;
-    bool none() const noexcept;
-    bitset operator<<(size_t pos) const noexcept;
-    bitset operator>>(size_t pos) const noexcept;
-};
-
-// 23.3.5.3 bitset operators:
-template <size_t N>
-bitset<N> operator&(const bitset<N>&, const bitset<N>&) noexcept;
-
-template <size_t N>
-bitset<N> operator|(const bitset<N>&, const bitset<N>&) noexcept;
-
-template <size_t N>
-bitset<N> operator^(const bitset<N>&, const bitset<N>&) noexcept;
-
-template <class charT, class traits, size_t N>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is, bitset<N>& x);
-
-template <class charT, class traits, size_t N>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os, const bitset<N>& x);
-
-template <size_t N> struct hash<std::bitset<N>>;
-
-}  // std
-
-*/
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#include <__config>
-#include <__bit_reference>
-#include <cstddef>
-#include <climits>
-#include <string>
-#include <stdexcept>
-#include <iosfwd>
-#include <__functional_base>
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-    #include <cassert>
-#endif
-
-#include <__undef_min_max>
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <size_t _N_words, size_t _Size>
-class __bitset;
-
-template <size_t _N_words, size_t _Size>
-struct __has_storage_type<__bitset<_N_words, _Size> >
-{
-    static const bool value = true;
-};
-
-template <size_t _N_words, size_t _Size>
-class __bitset
-{
-public:
-    typedef ptrdiff_t              difference_type;
-    typedef size_t                 size_type;
-    typedef size_type              __storage_type;
-protected:
-    typedef __bitset __self;
-    typedef       __storage_type*  __storage_pointer;
-    typedef const __storage_type*  __const_storage_pointer;
-    static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);
-
-    friend class __bit_reference<__bitset>;
-    friend class __bit_const_reference<__bitset>;
-    friend class __bit_iterator<__bitset, false>;
-    friend class __bit_iterator<__bitset, true>;
-    friend struct __bit_array<__bitset>;
-
-    __storage_type __first_[_N_words];
-
-    typedef __bit_reference<__bitset>                  reference;
-    typedef __bit_const_reference<__bitset>            const_reference;
-    typedef __bit_iterator<__bitset, false>            iterator;
-    typedef __bit_iterator<__bitset, true>             const_iterator;
-
-    _LIBCPP_CONSTEXPR __bitset() _NOEXCEPT;
-    explicit _LIBCPP_CONSTEXPR __bitset(unsigned long long __v) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_t __pos) _NOEXCEPT
-        {return reference(__first_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR const_reference __make_ref(size_t __pos) const _NOEXCEPT
-        {return const_reference(__first_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_t __pos) _NOEXCEPT
-        {return iterator(__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_t __pos) const _NOEXCEPT
-        {return const_iterator(__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-
-    void operator&=(const __bitset& __v) _NOEXCEPT;
-    void operator|=(const __bitset& __v) _NOEXCEPT;
-    void operator^=(const __bitset& __v) _NOEXCEPT;
-
-    void flip() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY unsigned long to_ulong() const
-        {return to_ulong(integral_constant<bool, _Size < sizeof(unsigned long) * CHAR_BIT>());}
-    _LIBCPP_INLINE_VISIBILITY unsigned long long to_ullong() const
-        {return to_ullong(integral_constant<bool, _Size < sizeof(unsigned long long) * CHAR_BIT>());}
-
-    bool all() const _NOEXCEPT;
-    bool any() const _NOEXCEPT;
-    size_t __hash_code() const _NOEXCEPT;
-private:
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    void __init(unsigned long long __v, false_type) _NOEXCEPT;
-    void __init(unsigned long long __v, true_type) _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_CONSTEXPR
-    unsigned long to_ulong(false_type) const;
-    unsigned long to_ulong(true_type) const;
-    unsigned long long to_ullong(false_type) const;
-    unsigned long long to_ullong(true_type) const;
-    unsigned long long to_ullong(true_type, false_type) const;
-    unsigned long long to_ullong(true_type, true_type) const;
-};
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<_N_words, _Size>::__bitset() _NOEXCEPT
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
-    : __first_{0}
-#endif
-{
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    _VSTD::fill_n(__first_, _N_words, __storage_type(0));
-#endif
-}
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-
-template <size_t _N_words, size_t _Size>
-void
-__bitset<_N_words, _Size>::__init(unsigned long long __v, false_type) _NOEXCEPT
-{
-    __storage_type __t[sizeof(unsigned long long) / sizeof(__storage_type)];
-    for (size_t __i = 0; __i < sizeof(__t)/sizeof(__t[0]); ++__i, __v >>= __bits_per_word)
-        __t[__i] = static_cast<__storage_type>(__v);
-    _VSTD::copy(__t, __t + sizeof(__t)/sizeof(__t[0]), __first_);
-    _VSTD::fill(__first_ + sizeof(__t)/sizeof(__t[0]), __first_ + sizeof(__first_)/sizeof(__first_[0]),
-               __storage_type(0));
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<_N_words, _Size>::__init(unsigned long long __v, true_type) _NOEXCEPT
-{
-    __first_[0] = __v;
-    _VSTD::fill(__first_ + 1, __first_ + sizeof(__first_)/sizeof(__first_[0]), __storage_type(0));
-}
-
-#endif  // _LIBCPP_HAS_NO_CONSTEXPR
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<_N_words, _Size>::__bitset(unsigned long long __v) _NOEXCEPT
-#ifndef _LIBCPP_HAS_NO_CONSTEXPR
-#if __SIZEOF_SIZE_T__ == 8
-    : __first_{__v}
-#elif __SIZEOF_SIZE_T__ == 4
-    : __first_{__v, __v >> __bits_per_word}
-#else
-#error This constructor has not been ported to this platform
-#endif
-#endif
-{
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    __init(__v, integral_constant<bool, sizeof(unsigned long long) == sizeof(__storage_type)>());
-#endif
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<_N_words, _Size>::operator&=(const __bitset& __v) _NOEXCEPT
-{
-    for (size_type __i = 0; __i < _N_words; ++__i)
-        __first_[__i] &= __v.__first_[__i];
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<_N_words, _Size>::operator|=(const __bitset& __v) _NOEXCEPT
-{
-    for (size_type __i = 0; __i < _N_words; ++__i)
-        __first_[__i] |= __v.__first_[__i];
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<_N_words, _Size>::operator^=(const __bitset& __v) _NOEXCEPT
-{
-    for (size_type __i = 0; __i < _N_words; ++__i)
-        __first_[__i] ^= __v.__first_[__i];
-}
-
-template <size_t _N_words, size_t _Size>
-void
-__bitset<_N_words, _Size>::flip() _NOEXCEPT
-{
-    // do middle whole words
-    size_type __n = _Size;
-    __storage_pointer __p = __first_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        *__p = ~*__p;
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __storage_type __b = *__p & __m;
-        *__p &= ~__m;
-        *__p |= ~__b & __m;
-    }
-}
-
-template <size_t _N_words, size_t _Size>
-unsigned long
-__bitset<_N_words, _Size>::to_ulong(false_type) const
-{
-    const_iterator __e = __make_iter(_Size);
-    const_iterator __i = _VSTD::find(__make_iter(sizeof(unsigned long) * CHAR_BIT), __e, true);
-    if (__i != __e)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw overflow_error("bitset to_ulong overflow error");
-#else
-        assert(!"bitset to_ulong overflow error");
-#endif
-    return __first_[0];
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-__bitset<_N_words, _Size>::to_ulong(true_type) const
-{
-    return __first_[0];
-}
-
-template <size_t _N_words, size_t _Size>
-unsigned long long
-__bitset<_N_words, _Size>::to_ullong(false_type) const
-{
-    const_iterator __e = __make_iter(_Size);
-    const_iterator __i = _VSTD::find(__make_iter(sizeof(unsigned long long) * CHAR_BIT), __e, true);
-    if (__i != __e)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw overflow_error("bitset to_ullong overflow error");
-#else
-        assert(!"bitset to_ullong overflow error");
-#endif
-    return to_ullong(true_type());
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__bitset<_N_words, _Size>::to_ullong(true_type) const
-{
-    return to_ullong(true_type(), integral_constant<bool, sizeof(__storage_type) < sizeof(unsigned long long)>());
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__bitset<_N_words, _Size>::to_ullong(true_type, false_type) const
-{
-    return __first_[0];
-}
-
-template <size_t _N_words, size_t _Size>
-unsigned long long
-__bitset<_N_words, _Size>::to_ullong(true_type, true_type) const
-{
-    unsigned long long __r = __first_[0];
-    for (std::size_t __i = 1; __i < sizeof(unsigned long long) / sizeof(__storage_type); ++__i)
-        __r |= static_cast<unsigned long long>(__first_[__i]) << (sizeof(__storage_type) * CHAR_BIT);
-    return __r;
-}
-
-template <size_t _N_words, size_t _Size>
-bool
-__bitset<_N_words, _Size>::all() const _NOEXCEPT
-{
-    // do middle whole words
-    size_type __n = _Size;
-    __const_storage_pointer __p = __first_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        if (~*__p)
-            return false;
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        if (~*__p & __m)
-            return false;
-    }
-    return true;
-}
-
-template <size_t _N_words, size_t _Size>
-bool
-__bitset<_N_words, _Size>::any() const _NOEXCEPT
-{
-    // do middle whole words
-    size_type __n = _Size;
-    __const_storage_pointer __p = __first_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        if (*__p)
-            return true;
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        if (*__p & __m)
-            return true;
-    }
-    return false;
-}
-
-template <size_t _N_words, size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-__bitset<_N_words, _Size>::__hash_code() const _NOEXCEPT
-{
-    size_t __h = 0;
-    for (size_type __i = 0; __i < _N_words; ++__i)
-        __h ^= __first_[__i];
-    return __h;
-}
-
-template <size_t _Size>
-class __bitset<1, _Size>
-{
-public:
-    typedef ptrdiff_t              difference_type;
-    typedef size_t                 size_type;
-    typedef size_type              __storage_type;
-protected:
-    typedef __bitset __self;
-    typedef       __storage_type*  __storage_pointer;
-    typedef const __storage_type*  __const_storage_pointer;
-    static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);
-
-    friend class __bit_reference<__bitset>;
-    friend class __bit_const_reference<__bitset>;
-    friend class __bit_iterator<__bitset, false>;
-    friend class __bit_iterator<__bitset, true>;
-    friend struct __bit_array<__bitset>;
-
-    __storage_type __first_;
-
-    typedef __bit_reference<__bitset>                  reference;
-    typedef __bit_const_reference<__bitset>            const_reference;
-    typedef __bit_iterator<__bitset, false>            iterator;
-    typedef __bit_iterator<__bitset, true>             const_iterator;
-
-    _LIBCPP_CONSTEXPR __bitset() _NOEXCEPT;
-    explicit _LIBCPP_CONSTEXPR __bitset(unsigned long long __v) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_t __pos) _NOEXCEPT
-        {return reference(&__first_, __storage_type(1) << __pos);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR const_reference __make_ref(size_t __pos) const _NOEXCEPT
-        {return const_reference(&__first_, __storage_type(1) << __pos);}
-    _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_t __pos) _NOEXCEPT
-        {return iterator(&__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_t __pos) const _NOEXCEPT
-        {return const_iterator(&__first_ + __pos / __bits_per_word, __pos % __bits_per_word);}
-
-    void operator&=(const __bitset& __v) _NOEXCEPT;
-    void operator|=(const __bitset& __v) _NOEXCEPT;
-    void operator^=(const __bitset& __v) _NOEXCEPT;
-
-    void flip() _NOEXCEPT;
-
-    unsigned long to_ulong() const;
-    unsigned long long to_ullong() const;
-
-    bool all() const _NOEXCEPT;
-    bool any() const _NOEXCEPT;
-
-    size_t __hash_code() const _NOEXCEPT;
-};
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<1, _Size>::__bitset() _NOEXCEPT
-    : __first_(0)
-{
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<1, _Size>::__bitset(unsigned long long __v) _NOEXCEPT
-    : __first_(static_cast<__storage_type>(__v))
-{
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<1, _Size>::operator&=(const __bitset& __v) _NOEXCEPT
-{
-    __first_ &= __v.__first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<1, _Size>::operator|=(const __bitset& __v) _NOEXCEPT
-{
-    __first_ |= __v.__first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<1, _Size>::operator^=(const __bitset& __v) _NOEXCEPT
-{
-    __first_ ^= __v.__first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__bitset<1, _Size>::flip() _NOEXCEPT
-{
-    __storage_type __m = ~__storage_type(0) >> (__bits_per_word - _Size);
-    __first_ = ~__first_;
-    __first_ &= __m;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-__bitset<1, _Size>::to_ulong() const
-{
-    return __first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-__bitset<1, _Size>::to_ullong() const
-{
-    return __first_;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__bitset<1, _Size>::all() const _NOEXCEPT
-{
-    __storage_type __m = ~__storage_type(0) >> (__bits_per_word - _Size);
-    return !(~__first_ & __m);
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-__bitset<1, _Size>::any() const _NOEXCEPT
-{
-    __storage_type __m = ~__storage_type(0) >> (__bits_per_word - _Size);
-    return __first_ & __m;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-__bitset<1, _Size>::__hash_code() const _NOEXCEPT
-{
-    return __first_;
-}
-
-template <>
-class __bitset<0, 0>
-{
-public:
-    typedef ptrdiff_t              difference_type;
-    typedef size_t                 size_type;
-    typedef size_type              __storage_type;
-protected:
-    typedef __bitset __self;
-    typedef       __storage_type*  __storage_pointer;
-    typedef const __storage_type*  __const_storage_pointer;
-    static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);
-
-    friend class __bit_reference<__bitset>;
-    friend class __bit_const_reference<__bitset>;
-    friend class __bit_iterator<__bitset, false>;
-    friend class __bit_iterator<__bitset, true>;
-    friend struct __bit_array<__bitset>;
-
-    typedef __bit_reference<__bitset>                  reference;
-    typedef __bit_const_reference<__bitset>            const_reference;
-    typedef __bit_iterator<__bitset, false>            iterator;
-    typedef __bit_iterator<__bitset, true>             const_iterator;
-
-    _LIBCPP_CONSTEXPR __bitset() _NOEXCEPT;
-    explicit _LIBCPP_CONSTEXPR __bitset(unsigned long long) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY reference __make_ref(size_t) _NOEXCEPT
-        {return reference(0, 1);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR const_reference __make_ref(size_t) const _NOEXCEPT
-        {return const_reference(0, 1);}
-    _LIBCPP_INLINE_VISIBILITY iterator __make_iter(size_t) _NOEXCEPT
-        {return iterator(0, 0);}
-    _LIBCPP_INLINE_VISIBILITY const_iterator __make_iter(size_t) const _NOEXCEPT
-        {return const_iterator(0, 0);}
-
-    _LIBCPP_INLINE_VISIBILITY void operator&=(const __bitset&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY void operator|=(const __bitset&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY void operator^=(const __bitset&) _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY void flip() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY unsigned long to_ulong() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY unsigned long long to_ullong() const {return 0;}
-
-    _LIBCPP_INLINE_VISIBILITY bool all() const _NOEXCEPT {return true;}
-    _LIBCPP_INLINE_VISIBILITY bool any() const _NOEXCEPT {return false;}
-
-    _LIBCPP_INLINE_VISIBILITY size_t __hash_code() const _NOEXCEPT {return 0;}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<0, 0>::__bitset() _NOEXCEPT
-{
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-__bitset<0, 0>::__bitset(unsigned long long) _NOEXCEPT
-{
-}
-
-template <size_t _Size> class _LIBCPP_TYPE_VIS_ONLY bitset;
-template <size_t _Size> struct _LIBCPP_TYPE_VIS_ONLY hash<bitset<_Size> >;
-
-template <size_t _Size>
-class _LIBCPP_TYPE_VIS_ONLY bitset
-    : private __bitset<_Size == 0 ? 0 : (_Size - 1) / (sizeof(size_t) * CHAR_BIT) + 1, _Size>
-{
-public:
-    static const unsigned __n_words = _Size == 0 ? 0 : (_Size - 1) / (sizeof(size_t) * CHAR_BIT) + 1;
-    typedef __bitset<__n_words, _Size> base;
-
-public:
-    typedef typename base::reference       reference;
-    typedef typename base::const_reference const_reference;
-
-    // 23.3.5.1 constructors:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR bitset() _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-        bitset(unsigned long long __v) _NOEXCEPT : base(__v) {}
-    template<class _CharT>
-        explicit bitset(const _CharT* __str,
-                        typename basic_string<_CharT>::size_type __n = basic_string<_CharT>::npos,
-                        _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'));
-    template<class _CharT, class _Traits, class _Allocator>
-        explicit bitset(const basic_string<_CharT,_Traits,_Allocator>& __str,
-                        typename basic_string<_CharT,_Traits,_Allocator>::size_type __pos = 0,
-                        typename basic_string<_CharT,_Traits,_Allocator>::size_type __n =
-                                (basic_string<_CharT,_Traits,_Allocator>::npos),
-                        _CharT __zero = _CharT('0'), _CharT __one = _CharT('1'));
-
-    // 23.3.5.2 bitset operations:
-    bitset& operator&=(const bitset& __rhs) _NOEXCEPT;
-    bitset& operator|=(const bitset& __rhs) _NOEXCEPT;
-    bitset& operator^=(const bitset& __rhs) _NOEXCEPT;
-    bitset& operator<<=(size_t __pos) _NOEXCEPT;
-    bitset& operator>>=(size_t __pos) _NOEXCEPT;
-    bitset& set() _NOEXCEPT;
-    bitset& set(size_t __pos, bool __val = true);
-    bitset& reset() _NOEXCEPT;
-    bitset& reset(size_t __pos);
-    bitset  operator~() const _NOEXCEPT;
-    bitset& flip() _NOEXCEPT;
-    bitset& flip(size_t __pos);
-
-    // element access:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-                              const_reference operator[](size_t __p) const {return base::__make_ref(__p);}
-    _LIBCPP_INLINE_VISIBILITY       reference operator[](size_t __p)       {return base::__make_ref(__p);}
-    unsigned long to_ulong() const;
-    unsigned long long to_ullong() const;
-    template <class _CharT, class _Traits, class _Allocator>
-        basic_string<_CharT, _Traits, _Allocator> to_string(_CharT __zero = _CharT('0'),
-                                                            _CharT __one = _CharT('1')) const;
-    template <class _CharT, class _Traits>
-        basic_string<_CharT, _Traits, allocator<_CharT> > to_string(_CharT __zero = _CharT('0'),
-                                                                    _CharT __one = _CharT('1')) const;
-    template <class _CharT>
-        basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> > to_string(_CharT __zero = _CharT('0'),
-                                                                                _CharT __one = _CharT('1')) const;
-    basic_string<char, char_traits<char>, allocator<char> > to_string(char __zero = '0',
-                                                                      char __one = '1') const;
-    size_t count() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR size_t size() const _NOEXCEPT {return _Size;}
-    bool operator==(const bitset& __rhs) const _NOEXCEPT;
-    bool operator!=(const bitset& __rhs) const _NOEXCEPT;
-    bool test(size_t __pos) const;
-    bool all() const _NOEXCEPT;
-    bool any() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY bool none() const _NOEXCEPT {return !any();}
-    bitset operator<<(size_t __pos) const _NOEXCEPT;
-    bitset operator>>(size_t __pos) const _NOEXCEPT;
-
-private:
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t __hash_code() const _NOEXCEPT {return base::__hash_code();}
-
-    friend struct hash<bitset>;
-};
-
-template <size_t _Size>
-template<class _CharT>
-bitset<_Size>::bitset(const _CharT* __str,
-                      typename basic_string<_CharT>::size_type __n,
-                      _CharT __zero, _CharT __one)
-{
-    size_t __rlen = _VSTD::min(__n, char_traits<_CharT>::length(__str));
-    for (size_t __i = 0; __i < __rlen; ++__i)
-        if (__str[__i] != __zero && __str[__i] != __one)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            throw invalid_argument("bitset string ctor has invalid argument");
-#else
-            assert(!"bitset string ctor has invalid argument");
-#endif
-    size_t _Mp = _VSTD::min(__rlen, _Size);
-    size_t __i = 0;
-    for (; __i < _Mp; ++__i)
-    {
-        _CharT __c = __str[_Mp - 1 - __i];
-        if (__c == __zero)
-            (*this)[__i] = false;
-        else
-            (*this)[__i] = true;
-    }
-    _VSTD::fill(base::__make_iter(__i), base::__make_iter(_Size), false);
-}
-
-template <size_t _Size>
-template<class _CharT, class _Traits, class _Allocator>
-bitset<_Size>::bitset(const basic_string<_CharT,_Traits,_Allocator>& __str,
-       typename basic_string<_CharT,_Traits,_Allocator>::size_type __pos,
-       typename basic_string<_CharT,_Traits,_Allocator>::size_type __n,
-       _CharT __zero, _CharT __one)
-{
-    if (__pos > __str.size())
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset string pos out of range");
-#else
-        assert(!"bitset string pos out of range");
-#endif
-    size_t __rlen = _VSTD::min(__n, __str.size() - __pos);
-    for (size_t __i = __pos; __i < __pos + __rlen; ++__i)
-        if (!_Traits::eq(__str[__i], __zero) && !_Traits::eq(__str[__i], __one))
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            throw invalid_argument("bitset string ctor has invalid argument");
-#else
-            assert(!"bitset string ctor has invalid argument");
-#endif
-    size_t _Mp = _VSTD::min(__rlen, _Size);
-    size_t __i = 0;
-    for (; __i < _Mp; ++__i)
-    {
-        _CharT __c = __str[__pos + _Mp - 1 - __i];
-        if (_Traits::eq(__c, __zero))
-            (*this)[__i] = false;
-        else
-            (*this)[__i] = true;
-    }
-    _VSTD::fill(base::__make_iter(__i), base::__make_iter(_Size), false);
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::operator&=(const bitset& __rhs) _NOEXCEPT
-{
-    base::operator&=(__rhs);
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::operator|=(const bitset& __rhs) _NOEXCEPT
-{
-    base::operator|=(__rhs);
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::operator^=(const bitset& __rhs) _NOEXCEPT
-{
-    base::operator^=(__rhs);
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::operator<<=(size_t __pos) _NOEXCEPT
-{
-    __pos = _VSTD::min(__pos, _Size);
-    _VSTD::copy_backward(base::__make_iter(0), base::__make_iter(_Size - __pos), base::__make_iter(_Size));
-    _VSTD::fill_n(base::__make_iter(0), __pos, false);
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::operator>>=(size_t __pos) _NOEXCEPT
-{
-    __pos = _VSTD::min(__pos, _Size);
-    _VSTD::copy(base::__make_iter(__pos), base::__make_iter(_Size), base::__make_iter(0));
-    _VSTD::fill_n(base::__make_iter(_Size - __pos), __pos, false);
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::set() _NOEXCEPT
-{
-    _VSTD::fill_n(base::__make_iter(0), _Size, true);
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::set(size_t __pos, bool __val)
-{
-    if (__pos >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset set argument out of range");
-#else
-        assert(!"bitset set argument out of range");
-#endif
-    (*this)[__pos] = __val;
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::reset() _NOEXCEPT
-{
-    _VSTD::fill_n(base::__make_iter(0), _Size, false);
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::reset(size_t __pos)
-{
-    if (__pos >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset reset argument out of range");
-#else
-        assert(!"bitset reset argument out of range");
-#endif
-    (*this)[__pos] = false;
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-bitset<_Size>::operator~() const _NOEXCEPT
-{
-    bitset __x(*this);
-    __x.flip();
-    return __x;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>&
-bitset<_Size>::flip() _NOEXCEPT
-{
-    base::flip();
-    return *this;
-}
-
-template <size_t _Size>
-bitset<_Size>&
-bitset<_Size>::flip(size_t __pos)
-{
-    if (__pos >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset flip argument out of range");
-#else
-        assert(!"bitset flip argument out of range");
-#endif
-    reference r = base::__make_ref(__pos);
-    r = ~r;
-    return *this;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long
-bitset<_Size>::to_ulong() const
-{
-    return base::to_ulong();
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-unsigned long long
-bitset<_Size>::to_ullong() const
-{
-    return base::to_ullong();
-}
-
-template <size_t _Size>
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(_Size, __zero);
-    for (size_t __i = 0; __i < _Size; ++__i)
-    {
-        if ((*this)[__i])
-            __r[_Size - 1 - __i] = __one;
-    }
-    return __r;
-}
-
-template <size_t _Size>
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, allocator<_CharT> >
-bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
-{
-    return to_string<_CharT, _Traits, allocator<_CharT> >(__zero, __one);
-}
-
-template <size_t _Size>
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, char_traits<_CharT>, allocator<_CharT> >
-bitset<_Size>::to_string(_CharT __zero, _CharT __one) const
-{
-    return to_string<_CharT, char_traits<_CharT>, allocator<_CharT> >(__zero, __one);
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<char, char_traits<char>, allocator<char> >
-bitset<_Size>::to_string(char __zero, char __one) const
-{
-    return to_string<char, char_traits<char>, allocator<char> >(__zero, __one);
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-bitset<_Size>::count() const _NOEXCEPT
-{
-    return static_cast<size_t>(_VSTD::count(base::__make_iter(0), base::__make_iter(_Size), true));
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-bitset<_Size>::operator==(const bitset& __rhs) const _NOEXCEPT
-{
-    return _VSTD::equal(base::__make_iter(0), base::__make_iter(_Size), __rhs.__make_iter(0));
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-bitset<_Size>::operator!=(const bitset& __rhs) const _NOEXCEPT
-{
-    return !(*this == __rhs);
-}
-
-template <size_t _Size>
-bool
-bitset<_Size>::test(size_t __pos) const
-{
-    if (__pos >= _Size)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw out_of_range("bitset test argument out of range");
-#else
-        assert(!"bitset test argument out of range");
-#endif
-    return (*this)[__pos];
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-bitset<_Size>::all() const _NOEXCEPT
-{
-    return base::all();
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-bitset<_Size>::any() const _NOEXCEPT
-{
-    return base::any();
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-bitset<_Size>::operator<<(size_t __pos) const _NOEXCEPT
-{
-    bitset __r = *this;
-    __r <<= __pos;
-    return __r;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-bitset<_Size>::operator>>(size_t __pos) const _NOEXCEPT
-{
-    bitset __r = *this;
-    __r >>= __pos;
-    return __r;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-operator&(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
-{
-    bitset<_Size> __r = __x;
-    __r &= __y;
-    return __r;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-operator|(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
-{
-    bitset<_Size> __r = __x;
-    __r |= __y;
-    return __r;
-}
-
-template <size_t _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-bitset<_Size>
-operator^(const bitset<_Size>& __x, const bitset<_Size>& __y) _NOEXCEPT
-{
-    bitset<_Size> __r = __x;
-    __r ^= __y;
-    return __r;
-}
-
-template <size_t _Size>
-struct _LIBCPP_TYPE_VIS_ONLY hash<bitset<_Size> >
-    : public unary_function<bitset<_Size>, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const bitset<_Size>& __bs) const _NOEXCEPT
-        {return __bs.__hash_code();}
-};
-
-template <class _CharT, class _Traits, size_t _Size>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x);
-
-template <class _CharT, class _Traits, size_t _Size>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Size>& __x);
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_BITSET
diff --git a/include.new/c++/v1/tr1/cassert b/include.new/c++/v1/tr1/cassert
deleted file mode 100644
index 3775990..0000000
--- a/include.new/c++/v1/tr1/cassert
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- cassert -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-/*
-    cassert synopsis
-
-Macros:
-
-    assert
-
-*/
-
-#include <__config>
-#include <assert.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
diff --git a/include.new/c++/v1/tr1/ccomplex b/include.new/c++/v1/tr1/ccomplex
deleted file mode 100644
index 6ed1164..0000000
--- a/include.new/c++/v1/tr1/ccomplex
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- ccomplex ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CCOMPLEX
-#define _LIBCPP_CCOMPLEX
-
-/*
-    ccomplex synopsis
-
-#include <complex>
-
-*/
-
-#include <complex>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-// hh 080623 Created
-
-#endif  // _LIBCPP_CCOMPLEX
diff --git a/include.new/c++/v1/tr1/cctype b/include.new/c++/v1/tr1/cctype
deleted file mode 100644
index b647903..0000000
--- a/include.new/c++/v1/tr1/cctype
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- cctype ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CCTYPE
-#define _LIBCPP_CCTYPE
-
-/*
-    cctype synopsis
-
-namespace std
-{
-
-int isalnum(int c);
-int isalpha(int c);
-int isblank(int c);  // C99
-int iscntrl(int c);
-int isdigit(int c);
-int isgraph(int c);
-int islower(int c);
-int isprint(int c);
-int ispunct(int c);
-int isspace(int c);
-int isupper(int c);
-int isxdigit(int c);
-int tolower(int c);
-int toupper(int c);
-
-}  // std
-*/
-
-#include <__config>
-#include <ctype.h>
-#if defined(_LIBCPP_MSVCRT)
-#include "support/win32/support.h"
-#endif // _LIBCPP_MSVCRT
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifdef isalnum
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isalnum(int __c) {return isalnum(__c);}
-#undef isalnum
-inline _LIBCPP_INLINE_VISIBILITY int isalnum(int __c) {return __libcpp_isalnum(__c);}
-#else  // isalnum
-using ::isalnum;
-#endif  // isalnum
-
-#ifdef isalpha
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isalpha(int __c) {return isalpha(__c);}
-#undef isalpha
-inline _LIBCPP_INLINE_VISIBILITY int isalpha(int __c) {return __libcpp_isalpha(__c);}
-#else  // isalpha
-using ::isalpha;
-#endif  // isalpha
-
-#ifdef isblank
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isblank(int __c) {return isblank(__c);}
-#undef isblank
-inline _LIBCPP_INLINE_VISIBILITY int isblank(int __c) {return __libcpp_isblank(__c);}
-#else  // isblank
-using ::isblank;
-#endif  // isblank
-
-#ifdef iscntrl
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iscntrl(int __c) {return iscntrl(__c);}
-#undef iscntrl
-inline _LIBCPP_INLINE_VISIBILITY int iscntrl(int __c) {return __libcpp_iscntrl(__c);}
-#else  // iscntrl
-using ::iscntrl;
-#endif  // iscntrl
-
-#ifdef isdigit
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isdigit(int __c) {return isdigit(__c);}
-#undef isdigit
-inline _LIBCPP_INLINE_VISIBILITY int isdigit(int __c) {return __libcpp_isdigit(__c);}
-#else  // isdigit
-using ::isdigit;
-#endif  // isdigit
-
-#ifdef isgraph
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isgraph(int __c) {return isgraph(__c);}
-#undef isgraph
-inline _LIBCPP_INLINE_VISIBILITY int isgraph(int __c) {return __libcpp_isgraph(__c);}
-#else  // isgraph
-using ::isgraph;
-#endif  // isgraph
-
-#ifdef islower
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_islower(int __c) {return islower(__c);}
-#undef islower
-inline _LIBCPP_INLINE_VISIBILITY int islower(int __c) {return __libcpp_islower(__c);}
-#else  // islower
-using ::islower;
-#endif  // islower
-
-#ifdef isprint
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isprint(int __c) {return isprint(__c);}
-#undef isprint
-inline _LIBCPP_INLINE_VISIBILITY int isprint(int __c) {return __libcpp_isprint(__c);}
-#else  // isprint
-using ::isprint;
-#endif  // isprint
-
-#ifdef ispunct
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_ispunct(int __c) {return ispunct(__c);}
-#undef ispunct
-inline _LIBCPP_INLINE_VISIBILITY int ispunct(int __c) {return __libcpp_ispunct(__c);}
-#else  // ispunct
-using ::ispunct;
-#endif  // ispunct
-
-#ifdef isspace
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isspace(int __c) {return isspace(__c);}
-#undef isspace
-inline _LIBCPP_INLINE_VISIBILITY int isspace(int __c) {return __libcpp_isspace(__c);}
-#else  // isspace
-using ::isspace;
-#endif  // isspace
-
-#ifdef isupper
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isupper(int __c) {return isupper(__c);}
-#undef isupper
-inline _LIBCPP_INLINE_VISIBILITY int isupper(int __c) {return __libcpp_isupper(__c);}
-#else  // isupper
-using ::isupper;
-#endif  // isupper
-
-#ifdef isxdigit
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_isxdigit(int __c) {return isxdigit(__c);}
-#undef isxdigit
-inline _LIBCPP_INLINE_VISIBILITY int isxdigit(int __c) {return __libcpp_isxdigit(__c);}
-#else  // isxdigit
-using ::isxdigit;
-#endif  // isxdigit
-
-#ifdef tolower
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_tolower(int __c) {return tolower(__c);}
-#undef tolower
-inline _LIBCPP_INLINE_VISIBILITY int tolower(int __c) {return __libcpp_tolower(__c);}
-#else  // tolower
-using ::tolower;
-#endif  // tolower
-
-#ifdef toupper
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_toupper(int __c) {return toupper(__c);}
-#undef toupper
-inline _LIBCPP_INLINE_VISIBILITY int toupper(int __c) {return __libcpp_toupper(__c);}
-#else  // toupper
-using ::toupper;
-#endif  // toupper
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CCTYPE
diff --git a/include.new/c++/v1/tr1/cerrno b/include.new/c++/v1/tr1/cerrno
deleted file mode 100644
index 9804e4e..0000000
--- a/include.new/c++/v1/tr1/cerrno
+++ /dev/null
@@ -1,393 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- cerrno ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CERRNO
-#define _LIBCPP_CERRNO
-
-/*
-    cerrno synopsis
-
-Macros:
-
-    EDOM
-    EILSEQ  // C99
-    ERANGE
-    errno
-
-*/
-
-#include <__config>
-#include <errno.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#if !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE)
-
-#ifdef ELAST
-
-const int __elast1 = ELAST+1;
-const int __elast2 = ELAST+2;
-
-#else
-
-const int __elast1 = 104;
-const int __elast2 = 105;
-
-#endif
-
-#ifdef ENOTRECOVERABLE
-
-#define EOWNERDEAD __elast1
-
-#ifdef ELAST
-#undef ELAST
-#define ELAST EOWNERDEAD
-#endif
-
-#elif defined(EOWNERDEAD)
-
-#define ENOTRECOVERABLE __elast1
-#ifdef ELAST
-#undef ELAST
-#define ELAST ENOTRECOVERABLE
-#endif
-
-#else  // defined(EOWNERDEAD)
-
-#define EOWNERDEAD __elast1
-#define ENOTRECOVERABLE __elast2
-#ifdef ELAST
-#undef ELAST
-#define ELAST ENOTRECOVERABLE
-#endif
-
-#endif  // defined(EOWNERDEAD)
-
-#endif  // !defined(EOWNERDEAD) || !defined(ENOTRECOVERABLE)
-
-//  supply errno values likely to be missing, particularly on Windows
-
-#ifndef EAFNOSUPPORT
-#define EAFNOSUPPORT 9901
-#endif
-
-#ifndef EADDRINUSE
-#define EADDRINUSE 9902
-#endif
-
-#ifndef EADDRNOTAVAIL
-#define EADDRNOTAVAIL 9903
-#endif
-
-#ifndef EISCONN
-#define EISCONN 9904
-#endif
-
-#ifndef EBADMSG
-#define EBADMSG 9905
-#endif
-
-#ifndef ECONNABORTED
-#define ECONNABORTED 9906
-#endif
-
-#ifndef EALREADY
-#define EALREADY 9907
-#endif
-
-#ifndef ECONNREFUSED
-#define ECONNREFUSED 9908
-#endif
-
-#ifndef ECONNRESET
-#define ECONNRESET 9909
-#endif
-
-#ifndef EDESTADDRREQ
-#define EDESTADDRREQ 9910
-#endif
-
-#ifndef EHOSTUNREACH
-#define EHOSTUNREACH 9911
-#endif
-
-#ifndef EIDRM
-#define EIDRM 9912
-#endif
-
-#ifndef EMSGSIZE
-#define EMSGSIZE 9913
-#endif
-
-#ifndef ENETDOWN
-#define ENETDOWN 9914
-#endif
-
-#ifndef ENETRESET
-#define ENETRESET 9915
-#endif
-
-#ifndef ENETUNREACH
-#define ENETUNREACH 9916
-#endif
-
-#ifndef ENOBUFS
-#define ENOBUFS 9917
-#endif
-
-#ifndef ENOLINK
-#define ENOLINK 9918
-#endif
-
-#ifndef ENODATA
-#define ENODATA 9919
-#endif
-
-#ifndef ENOMSG
-#define ENOMSG 9920
-#endif
-
-#ifndef ENOPROTOOPT
-#define ENOPROTOOPT 9921
-#endif
-
-#ifndef ENOSR
-#define ENOSR 9922
-#endif
-
-#ifndef ENOTSOCK
-#define ENOTSOCK 9923
-#endif
-
-#ifndef ENOSTR
-#define ENOSTR 9924
-#endif
-
-#ifndef ENOTCONN
-#define ENOTCONN 9925
-#endif
-
-#ifndef ENOTSUP
-#define ENOTSUP 9926
-#endif
-
-#ifndef ECANCELED
-#define ECANCELED 9927
-#endif
-
-#ifndef EINPROGRESS
-#define EINPROGRESS 9928
-#endif
-
-#ifndef EOPNOTSUPP
-#define EOPNOTSUPP 9929
-#endif
-
-#ifndef EWOULDBLOCK
-#define EWOULDBLOCK 9930
-#endif
-
-#ifndef EOWNERDEAD
-#define EOWNERDEAD  9931
-#endif
-
-#ifndef EPROTO
-#define EPROTO 9932
-#endif
-
-#ifndef EPROTONOSUPPORT
-#define EPROTONOSUPPORT 9933
-#endif
-
-#ifndef ENOTRECOVERABLE
-#define ENOTRECOVERABLE 9934
-#endif
-
-#ifndef ETIME
-#define ETIME 9935
-#endif
-
-#ifndef ETXTBSY
-#define ETXTBSY 9936
-#endif
-
-#ifndef ETIMEDOUT
-#define ETIMEDOUT 9938
-#endif
-
-#ifndef ELOOP
-#define ELOOP 9939
-#endif
-
-#ifndef EOVERFLOW
-#define EOVERFLOW 9940
-#endif
-
-#ifndef EPROTOTYPE
-#define EPROTOTYPE 9941
-#endif
-
-#ifndef ENOSYS
-#define ENOSYS 9942
-#endif
-
-#ifndef EINVAL
-#define EINVAL 9943
-#endif
-
-#ifndef ERANGE
-#define ERANGE 9944
-#endif
-
-#ifndef EILSEQ
-#define EILSEQ 9945
-#endif
-
-//  Windows Mobile doesn't appear to define these:
-
-#ifndef E2BIG
-#define E2BIG 9946
-#endif
-
-#ifndef EDOM
-#define EDOM 9947
-#endif
-
-#ifndef EFAULT
-#define EFAULT 9948
-#endif
-
-#ifndef EBADF
-#define EBADF 9949
-#endif
-
-#ifndef EPIPE
-#define EPIPE 9950
-#endif
-
-#ifndef EXDEV
-#define EXDEV 9951
-#endif
-
-#ifndef EBUSY
-#define EBUSY 9952
-#endif
-
-#ifndef ENOTEMPTY
-#define ENOTEMPTY 9953
-#endif
-
-#ifndef ENOEXEC
-#define ENOEXEC 9954
-#endif
-
-#ifndef EEXIST
-#define EEXIST 9955
-#endif
-
-#ifndef EFBIG
-#define EFBIG 9956
-#endif
-
-#ifndef ENAMETOOLONG
-#define ENAMETOOLONG 9957
-#endif
-
-#ifndef ENOTTY
-#define ENOTTY 9958
-#endif
-
-#ifndef EINTR
-#define EINTR 9959
-#endif
-
-#ifndef ESPIPE
-#define ESPIPE 9960
-#endif
-
-#ifndef EIO
-#define EIO 9961
-#endif
-
-#ifndef EISDIR
-#define EISDIR 9962
-#endif
-
-#ifndef ECHILD
-#define ECHILD 9963
-#endif
-
-#ifndef ENOLCK
-#define ENOLCK 9964
-#endif
-
-#ifndef ENOSPC
-#define ENOSPC 9965
-#endif
-
-#ifndef ENXIO
-#define ENXIO 9966
-#endif
-
-#ifndef ENODEV
-#define ENODEV 9967
-#endif
-
-#ifndef ENOENT
-#define ENOENT 9968
-#endif
-
-#ifndef ESRCH
-#define ESRCH 9969
-#endif
-
-#ifndef ENOTDIR
-#define ENOTDIR 9970
-#endif
-
-#ifndef ENOMEM
-#define ENOMEM 9971
-#endif
-
-#ifndef EPERM
-#define EPERM 9972
-#endif
-
-#ifndef EACCES
-#define EACCES 9973
-#endif
-
-#ifndef EROFS
-#define EROFS 9974
-#endif
-
-#ifndef EDEADLK
-#define EDEADLK 9975
-#endif
-
-#ifndef EAGAIN
-#define EAGAIN 9976
-#endif
-
-#ifndef ENFILE
-#define ENFILE 9977
-#endif
-
-#ifndef EMFILE
-#define EMFILE 9978
-#endif
-
-#ifndef EMLINK
-#define EMLINK 9979
-#endif
-
-#endif  // _LIBCPP_CERRNO
diff --git a/include.new/c++/v1/tr1/cfenv b/include.new/c++/v1/tr1/cfenv
deleted file mode 100644
index dd7db37..0000000
--- a/include.new/c++/v1/tr1/cfenv
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- cctype ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CFENV
-#define _LIBCPP_CFENV
-
-/*
-    cfenv synopsis
-
-This entire header is C99 / C++0X
-
-Macros:
-
-    FE_DIVBYZERO
-    FE_INEXACT
-    FE_INVALID
-    FE_OVERFLOW
-    FE_UNDERFLOW
-    FE_ALL_EXCEPT
-    FE_DOWNWARD
-    FE_TONEAREST
-    FE_TOWARDZERO
-    FE_UPWARD
-    FE_DFL_ENV
-
-namespace std
-{
-
-Types:
-
-    fenv_t
-    fexcept_t
-
-int feclearexcept(int excepts);
-int fegetexceptflag(fexcept_t* flagp, int excepts);
-int feraiseexcept(int excepts);
-int fesetexceptflag(const fexcept_t* flagp, int excepts);
-int fetestexcept(int excepts);
-int fegetround();
-int fesetround(int round);
-int fegetenv(fenv_t* envp);
-int feholdexcept(fenv_t* envp);
-int fesetenv(const fenv_t* envp);
-int feupdateenv(const fenv_t* envp);
-
-}  // std
-*/
-
-#include <__config>
-#include <fenv.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::fenv_t;
-using ::fexcept_t;
-
-using ::feclearexcept;
-using ::fegetexceptflag;
-using ::feraiseexcept;
-using ::fesetexceptflag;
-using ::fetestexcept;
-using ::fegetround;
-using ::fesetround;
-using ::fegetenv;
-using ::feholdexcept;
-using ::fesetenv;
-using ::feupdateenv;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CFENV
diff --git a/include.new/c++/v1/tr1/cfloat b/include.new/c++/v1/tr1/cfloat
deleted file mode 100644
index 5fa5655..0000000
--- a/include.new/c++/v1/tr1/cfloat
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cfloat -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CFLOAT
-#define _LIBCPP_CFLOAT
-
-/*
-    cfloat synopsis
-
-Macros:
-
-    FLT_ROUNDS
-    FLT_EVAL_METHOD     // C99
-    FLT_RADIX
-
-    FLT_MANT_DIG
-    DBL_MANT_DIG
-    LDBL_MANT_DIG
-
-    DECIMAL_DIG         // C99
-
-    FLT_DIG
-    DBL_DIG
-    LDBL_DIG
-
-    FLT_MIN_EXP
-    DBL_MIN_EXP
-    LDBL_MIN_EXP
-
-    FLT_MIN_10_EXP
-    DBL_MIN_10_EXP
-    LDBL_MIN_10_EXP
-
-    FLT_MAX_EXP
-    DBL_MAX_EXP
-    LDBL_MAX_EXP
-
-    FLT_MAX_10_EXP
-    DBL_MAX_10_EXP
-    LDBL_MAX_10_EXP
-
-    FLT_MAX
-    DBL_MAX
-    LDBL_MAX
-
-    FLT_EPSILON
-    DBL_EPSILON
-    LDBL_EPSILON
-
-    FLT_MIN
-    DBL_MIN
-    LDBL_MIN
-
-*/
-
-#include <__config>
-#include <float.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifndef FLT_EVAL_METHOD
-#define FLT_EVAL_METHOD __FLT_EVAL_METHOD__
-#endif
-
-#ifndef DECIMAL_DIG
-#define DECIMAL_DIG __DECIMAL_DIG__
-#endif
-
-#endif  // _LIBCPP_CFLOAT
diff --git a/include.new/c++/v1/tr1/chrono b/include.new/c++/v1/tr1/chrono
deleted file mode 100644
index 9229234..0000000
--- a/include.new/c++/v1/tr1/chrono
+++ /dev/null
@@ -1,1031 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- chrono ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CHRONO
-#define _LIBCPP_CHRONO
-
-/*
-    chrono synopsis
-
-namespace std
-{
-namespace chrono
-{
-
-template <class ToDuration, class Rep, class Period>
-constexpr
-ToDuration
-duration_cast(const duration<Rep, Period>& fd);
-
-template <class Rep> struct treat_as_floating_point : is_floating_point<Rep> {};
-
-template <class Rep>
-struct duration_values
-{
-public:
-    static constexpr Rep zero();
-    static constexpr Rep max();
-    static constexpr Rep min();
-};
-
-// duration
-
-template <class Rep, class Period = ratio<1>>
-class duration
-{
-    static_assert(!__is_duration<Rep>::value, "A duration representation can not be a duration");
-    static_assert(__is_ratio<Period>::value, "Second template parameter of duration must be a std::ratio");
-    static_assert(Period::num > 0, "duration period must be positive");
-public:
-    typedef Rep rep;
-    typedef Period period;
-
-    constexpr duration() = default;
-    template <class Rep2>
-        constexpr explicit duration(const Rep2& r,
-            typename enable_if
-            <
-               is_convertible<Rep2, rep>::value &&
-               (treat_as_floating_point<rep>::value ||
-               !treat_as_floating_point<rep>::value && !treat_as_floating_point<Rep2>::value)
-            >::type* = 0);
-
-    // conversions
-    template <class Rep2, class Period2>
-        constexpr duration(const duration<Rep2, Period2>& d,
-            typename enable_if
-            <
-                treat_as_floating_point<rep>::value ||
-                ratio_divide<Period2, period>::type::den == 1
-            >::type* = 0);
-
-    // observer
-
-    constexpr rep count() const;
-
-    // arithmetic
-
-    constexpr duration  operator+() const;
-    constexpr duration  operator-() const;
-    duration& operator++();
-    duration  operator++(int);
-    duration& operator--();
-    duration  operator--(int);
-
-    duration& operator+=(const duration& d);
-    duration& operator-=(const duration& d);
-
-    duration& operator*=(const rep& rhs);
-    duration& operator/=(const rep& rhs);
-
-    // special values
-
-    static constexpr duration zero();
-    static constexpr duration min();
-    static constexpr duration max();
-};
-
-typedef duration<long long,         nano> nanoseconds;
-typedef duration<long long,        micro> microseconds;
-typedef duration<long long,        milli> milliseconds;
-typedef duration<long long              > seconds;
-typedef duration<     long, ratio<  60> > minutes;
-typedef duration<     long, ratio<3600> > hours;
-
-template <class Clock, class Duration = typename Clock::duration>
-class time_point
-{
-public:
-    typedef Clock                     clock;
-    typedef Duration                  duration;
-    typedef typename duration::rep    rep;
-    typedef typename duration::period period;
-private:
-    duration d_;  // exposition only
-
-public:
-    time_point();  // has value "epoch" // constexpr in C++14
-    explicit time_point(const duration& d);  // same as time_point() + d // constexpr in C++14
-
-    // conversions
-    template <class Duration2>
-       time_point(const time_point<clock, Duration2>& t); // constexpr in C++14
-
-    // observer
-
-    duration time_since_epoch() const; // constexpr in C++14
-
-    // arithmetic
-
-    time_point& operator+=(const duration& d);
-    time_point& operator-=(const duration& d);
-
-    // special values
-
-    static constexpr time_point min();
-    static constexpr time_point max();
-};
-
-} // chrono
-
-// common_type traits
-template <class Rep1, class Period1, class Rep2, class Period2>
-  struct common_type<chrono::duration<Rep1, Period1>, chrono::duration<Rep2, Period2>>;
-
-template <class Clock, class Duration1, class Duration2>
-  struct common_type<chrono::time_point<Clock, Duration1>, chrono::time_point<Clock, Duration2>>;
-
-namespace chrono {
-
-// duration arithmetic
-template <class Rep1, class Period1, class Rep2, class Period2>
-  constexpr
-  typename common_type<duration<Rep1, Period1>, duration<Rep2, Period2>>::type
-  operator+(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-  constexpr
-  typename common_type<duration<Rep1, Period1>, duration<Rep2, Period2>>::type
-  operator-(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period, class Rep2>
-  constexpr
-  duration<typename common_type<Rep1, Rep2>::type, Period>
-  operator*(const duration<Rep1, Period>& d, const Rep2& s);
-template <class Rep1, class Period, class Rep2>
-  constexpr
-  duration<typename common_type<Rep1, Rep2>::type, Period>
-  operator*(const Rep1& s, const duration<Rep2, Period>& d);
-template <class Rep1, class Period, class Rep2>
-  constexpr
-  duration<typename common_type<Rep1, Rep2>::type, Period>
-  operator/(const duration<Rep1, Period>& d, const Rep2& s);
-template <class Rep1, class Period1, class Rep2, class Period2>
-  constexpr
-  typename common_type<Rep1, Rep2>::type
-  operator/(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-
-// duration comparisons
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator==(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator!=(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator< (const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator<=(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator> (const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Rep2, class Period2>
-   constexpr
-   bool operator>=(const duration<Rep1, Period1>& lhs, const duration<Rep2, Period2>& rhs);
-
-// duration_cast
-template <class ToDuration, class Rep, class Period>
-  ToDuration duration_cast(const duration<Rep, Period>& d);
-
-// time_point arithmetic (all constexpr in C++14)
-template <class Clock, class Duration1, class Rep2, class Period2>
-  time_point<Clock, typename common_type<Duration1, duration<Rep2, Period2>>::type>
-  operator+(const time_point<Clock, Duration1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Rep1, class Period1, class Clock, class Duration2>
-  time_point<Clock, typename common_type<duration<Rep1, Period1>, Duration2>::type>
-  operator+(const duration<Rep1, Period1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Rep2, class Period2>
-  time_point<Clock, typename common_type<Duration1, duration<Rep2, Period2>>::type>
-  operator-(const time_point<Clock, Duration1>& lhs, const duration<Rep2, Period2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-  typename common_type<Duration1, Duration2>::type
-  operator-(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-
-// time_point comparisons (all constexpr in C++14)
-template <class Clock, class Duration1, class Duration2>
-   bool operator==(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator!=(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator< (const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator<=(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator> (const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-template <class Clock, class Duration1, class Duration2>
-   bool operator>=(const time_point<Clock, Duration1>& lhs, const time_point<Clock, Duration2>& rhs);
-
-// time_point_cast (constexpr in C++14)
-
-template <class ToDuration, class Clock, class Duration>
-  time_point<Clock, ToDuration> time_point_cast(const time_point<Clock, Duration>& t);
-
-// Clocks
-
-class system_clock
-{
-public:
-    typedef microseconds                     duration;
-    typedef duration::rep                    rep;
-    typedef duration::period                 period;
-    typedef chrono::time_point<system_clock> time_point;
-    static const bool is_steady =            false; // constexpr in C++14
-
-    static time_point now() noexcept;
-    static time_t     to_time_t  (const time_point& __t) noexcept;
-    static time_point from_time_t(time_t __t) noexcept;
-};
-
-class steady_clock
-{
-public:
-    typedef nanoseconds                                   duration;
-    typedef duration::rep                                 rep;
-    typedef duration::period                              period;
-    typedef chrono::time_point<steady_clock, duration>    time_point;
-    static const bool is_steady =                         true; // constexpr in C++14
-
-    static time_point now() noexcept;
-};
-
-typedef steady_clock high_resolution_clock;
-
-}  // chrono
-
-constexpr chrono::hours                                 operator "" h(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , ratio<3600,1>> operator "" h(long double); // C++14
-constexpr chrono::minutes                               operator "" min(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , ratio<60,1>>   operator "" min(long double); // C++14
-constexpr chrono::seconds                               operator "" s(unsigned long long); // C++14
-constexpr chrono::duration<unspecified >                operator "" s(long double); // C++14
-constexpr chrono::milliseconds                          operator "" ms(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , milli>         operator "" ms(long double); // C++14
-constexpr chrono::microseconds                          operator "" us(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , micro>         operator "" us(long double); // C++14
-constexpr chrono::nanoseconds                           operator "" ns(unsigned long long); // C++14
-constexpr chrono::duration<unspecified , nano>          operator "" ns(long double); // C++14
-
-}  // std
-*/
-
-#include <__config>
-#include <ctime>
-#include <type_traits>
-#include <ratio>
-#include <limits>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-namespace chrono
-{
-
-template <class _Rep, class _Period = ratio<1> > class _LIBCPP_TYPE_VIS_ONLY duration;
-
-template <class _Tp>
-struct __is_duration : false_type {};
-
-template <class _Rep, class _Period>
-struct __is_duration<duration<_Rep, _Period> > : true_type  {};
-
-template <class _Rep, class _Period>
-struct __is_duration<const duration<_Rep, _Period> > : true_type  {};
-
-template <class _Rep, class _Period>
-struct __is_duration<volatile duration<_Rep, _Period> > : true_type  {};
-
-template <class _Rep, class _Period>
-struct __is_duration<const volatile duration<_Rep, _Period> > : true_type  {};
-
-} // chrono
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<chrono::duration<_Rep1, _Period1>,
-                                         chrono::duration<_Rep2, _Period2> >
-{
-    typedef chrono::duration<typename common_type<_Rep1, _Rep2>::type,
-                             typename __ratio_gcd<_Period1, _Period2>::type> type;
-};
-
-namespace chrono {
-
-// duration_cast
-
-template <class _FromDuration, class _ToDuration,
-          class _Period = typename ratio_divide<typename _FromDuration::period, typename _ToDuration::period>::type,
-          bool = _Period::num == 1,
-          bool = _Period::den == 1>
-struct __duration_cast;
-
-template <class _FromDuration, class _ToDuration, class _Period>
-struct __duration_cast<_FromDuration, _ToDuration, _Period, true, true>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    _ToDuration operator()(const _FromDuration& __fd) const
-    {
-        return _ToDuration(static_cast<typename _ToDuration::rep>(__fd.count()));
-    }
-};
-
-template <class _FromDuration, class _ToDuration, class _Period>
-struct __duration_cast<_FromDuration, _ToDuration, _Period, true, false>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    _ToDuration operator()(const _FromDuration& __fd) const
-    {
-        typedef typename common_type<typename _ToDuration::rep, typename _FromDuration::rep, intmax_t>::type _Ct;
-        return _ToDuration(static_cast<typename _ToDuration::rep>(
-                           static_cast<_Ct>(__fd.count()) / static_cast<_Ct>(_Period::den)));
-    }
-};
-
-template <class _FromDuration, class _ToDuration, class _Period>
-struct __duration_cast<_FromDuration, _ToDuration, _Period, false, true>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    _ToDuration operator()(const _FromDuration& __fd) const
-    {
-        typedef typename common_type<typename _ToDuration::rep, typename _FromDuration::rep, intmax_t>::type _Ct;
-        return _ToDuration(static_cast<typename _ToDuration::rep>(
-                           static_cast<_Ct>(__fd.count()) * static_cast<_Ct>(_Period::num)));
-    }
-};
-
-template <class _FromDuration, class _ToDuration, class _Period>
-struct __duration_cast<_FromDuration, _ToDuration, _Period, false, false>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    _ToDuration operator()(const _FromDuration& __fd) const
-    {
-        typedef typename common_type<typename _ToDuration::rep, typename _FromDuration::rep, intmax_t>::type _Ct;
-        return _ToDuration(static_cast<typename _ToDuration::rep>(
-                           static_cast<_Ct>(__fd.count()) * static_cast<_Ct>(_Period::num)
-                                                          / static_cast<_Ct>(_Period::den)));
-    }
-};
-
-template <class _ToDuration, class _Rep, class _Period>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename enable_if
-<
-    __is_duration<_ToDuration>::value,
-    _ToDuration
->::type
-duration_cast(const duration<_Rep, _Period>& __fd)
-{
-    return __duration_cast<duration<_Rep, _Period>, _ToDuration>()(__fd);
-}
-
-template <class _Rep>
-struct _LIBCPP_TYPE_VIS_ONLY treat_as_floating_point : is_floating_point<_Rep> {};
-
-template <class _Rep>
-struct _LIBCPP_TYPE_VIS_ONLY duration_values
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR _Rep zero() {return _Rep(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR _Rep max()  {return numeric_limits<_Rep>::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR _Rep min()  {return numeric_limits<_Rep>::lowest();}
-};
-
-// duration
-
-template <class _Rep, class _Period>
-class _LIBCPP_TYPE_VIS_ONLY duration
-{
-    static_assert(!__is_duration<_Rep>::value, "A duration representation can not be a duration");
-    static_assert(__is_ratio<_Period>::value, "Second template parameter of duration must be a std::ratio");
-    static_assert(_Period::num > 0, "duration period must be positive");
-
-    template <class _R1, class _R2>
-    struct __no_overflow
-    {
-    private:
-        static const intmax_t __gcd_n1_n2 = __static_gcd<_R1::num, _R2::num>::value;
-        static const intmax_t __gcd_d1_d2 = __static_gcd<_R1::den, _R2::den>::value;
-        static const intmax_t __n1 = _R1::num / __gcd_n1_n2;
-        static const intmax_t __d1 = _R1::den / __gcd_d1_d2;
-        static const intmax_t __n2 = _R2::num / __gcd_n1_n2;
-        static const intmax_t __d2 = _R2::den / __gcd_d1_d2;
-        static const intmax_t max = -((intmax_t(1) << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1);
-
-        template <intmax_t _Xp, intmax_t _Yp, bool __overflow>
-        struct __mul    // __overflow == false
-        {
-            static const intmax_t value = _Xp * _Yp;
-        };
-
-        template <intmax_t _Xp, intmax_t _Yp>
-        struct __mul<_Xp, _Yp, true>
-        {
-            static const intmax_t value = 1;
-        };
-
-    public:
-        static const bool value = (__n1 <= max / __d2) && (__n2 <= max / __d1);
-        typedef ratio<__mul<__n1, __d2, !value>::value,
-                      __mul<__n2, __d1, !value>::value> type;
-    };
-    
-public:
-    typedef _Rep rep;
-    typedef _Period period;
-private:
-    rep __rep_;
-public:
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-        duration() = default;
-#else
-        duration() {}
-#endif
-
-    template <class _Rep2>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-        explicit duration(const _Rep2& __r,
-            typename enable_if
-            <
-               is_convertible<_Rep2, rep>::value &&
-               (treat_as_floating_point<rep>::value ||
-               !treat_as_floating_point<_Rep2>::value)
-            >::type* = 0)
-                : __rep_(__r) {}
-
-    // conversions
-    template <class _Rep2, class _Period2>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-        duration(const duration<_Rep2, _Period2>& __d,
-            typename enable_if
-            <
-                __no_overflow<_Period2, period>::value && (
-                treat_as_floating_point<rep>::value ||
-                (__no_overflow<_Period2, period>::type::den == 1 &&
-                 !treat_as_floating_point<_Rep2>::value))
-            >::type* = 0)
-                : __rep_(_VSTD::chrono::duration_cast<duration>(__d).count()) {}
-
-    // observer
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR rep count() const {return __rep_;}
-
-    // arithmetic
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR duration  operator+() const {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR duration  operator-() const {return duration(-__rep_);}
-    _LIBCPP_INLINE_VISIBILITY duration& operator++()      {++__rep_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration  operator++(int)   {return duration(__rep_++);}
-    _LIBCPP_INLINE_VISIBILITY duration& operator--()      {--__rep_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration  operator--(int)   {return duration(__rep_--);}
-
-    _LIBCPP_INLINE_VISIBILITY duration& operator+=(const duration& __d) {__rep_ += __d.count(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration& operator-=(const duration& __d) {__rep_ -= __d.count(); return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY duration& operator*=(const rep& rhs) {__rep_ *= rhs; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration& operator/=(const rep& rhs) {__rep_ /= rhs; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration& operator%=(const rep& rhs) {__rep_ %= rhs; return *this;}
-    _LIBCPP_INLINE_VISIBILITY duration& operator%=(const duration& rhs) {__rep_ %= rhs.count(); return *this;}
-
-    // special values
-
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR duration zero() {return duration(duration_values<rep>::zero());}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR duration min()  {return duration(duration_values<rep>::min());}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR duration max()  {return duration(duration_values<rep>::max());}
-};
-
-typedef duration<long long,         nano> nanoseconds;
-typedef duration<long long,        micro> microseconds;
-typedef duration<long long,        milli> milliseconds;
-typedef duration<long long              > seconds;
-typedef duration<     long, ratio<  60> > minutes;
-typedef duration<     long, ratio<3600> > hours;
-
-// Duration ==
-
-template <class _LhsDuration, class _RhsDuration>
-struct __duration_eq
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs) const
-        {
-            typedef typename common_type<_LhsDuration, _RhsDuration>::type _Ct;
-            return _Ct(__lhs).count() == _Ct(__rhs).count();
-        }
-};
-
-template <class _LhsDuration>
-struct __duration_eq<_LhsDuration, _LhsDuration>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs) const
-        {return __lhs.count() == __rhs.count();}
-};
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator==(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return __duration_eq<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >()(__lhs, __rhs);
-}
-
-// Duration !=
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator!=(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return !(__lhs == __rhs);
-}
-
-// Duration <
-
-template <class _LhsDuration, class _RhsDuration>
-struct __duration_lt
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    bool operator()(const _LhsDuration& __lhs, const _RhsDuration& __rhs) const
-        {
-            typedef typename common_type<_LhsDuration, _RhsDuration>::type _Ct;
-            return _Ct(__lhs).count() < _Ct(__rhs).count();
-        }
-};
-
-template <class _LhsDuration>
-struct __duration_lt<_LhsDuration, _LhsDuration>
-{
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    bool operator()(const _LhsDuration& __lhs, const _LhsDuration& __rhs) const
-        {return __lhs.count() < __rhs.count();}
-};
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator< (const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return __duration_lt<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >()(__lhs, __rhs);
-}
-
-// Duration >
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator> (const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return __rhs < __lhs;
-}
-
-// Duration <=
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator<=(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return !(__rhs < __lhs);
-}
-
-// Duration >=
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-bool
-operator>=(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return !(__lhs < __rhs);
-}
-
-// Duration +
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
-operator+(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Cd;
-    return _Cd(_Cd(__lhs).count() + _Cd(__rhs).count());
-}
-
-// Duration -
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
-operator-(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Cd;
-    return _Cd(_Cd(__lhs).count() - _Cd(__rhs).count());
-}
-
-// Duration *
-
-template <class _Rep1, class _Period, class _Rep2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename enable_if
-<
-    is_convertible<_Rep2, typename common_type<_Rep1, _Rep2>::type>::value,
-    duration<typename common_type<_Rep1, _Rep2>::type, _Period>
->::type
-operator*(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
-{
-    typedef typename common_type<_Rep1, _Rep2>::type _Cr;
-    typedef duration<_Cr, _Period> _Cd;
-    return _Cd(_Cd(__d).count() * static_cast<_Cr>(__s));
-}
-
-template <class _Rep1, class _Period, class _Rep2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename enable_if
-<
-    is_convertible<_Rep1, typename common_type<_Rep1, _Rep2>::type>::value,
-    duration<typename common_type<_Rep1, _Rep2>::type, _Period>
->::type
-operator*(const _Rep1& __s, const duration<_Rep2, _Period>& __d)
-{
-    return __d * __s;
-}
-
-// Duration /
-
-template <class _Duration, class _Rep, bool = __is_duration<_Rep>::value>
-struct __duration_divide_result
-{
-};
-
-template <class _Duration, class _Rep2,
-    bool = is_convertible<_Rep2,
-                          typename common_type<typename _Duration::rep, _Rep2>::type>::value>
-struct __duration_divide_imp
-{
-};
-
-template <class _Rep1, class _Period, class _Rep2>
-struct __duration_divide_imp<duration<_Rep1, _Period>, _Rep2, true>
-{
-    typedef duration<typename common_type<_Rep1, _Rep2>::type, _Period> type;
-};
-
-template <class _Rep1, class _Period, class _Rep2>
-struct __duration_divide_result<duration<_Rep1, _Period>, _Rep2, false>
-    : __duration_divide_imp<duration<_Rep1, _Period>, _Rep2>
-{
-};
-
-template <class _Rep1, class _Period, class _Rep2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename __duration_divide_result<duration<_Rep1, _Period>, _Rep2>::type
-operator/(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
-{
-    typedef typename common_type<_Rep1, _Rep2>::type _Cr;
-    typedef duration<_Cr, _Period> _Cd;
-    return _Cd(_Cd(__d).count() / static_cast<_Cr>(__s));
-}
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename common_type<_Rep1, _Rep2>::type
-operator/(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Ct;
-    return _Ct(__lhs).count() / _Ct(__rhs).count();
-}
-
-// Duration %
-
-template <class _Rep1, class _Period, class _Rep2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename __duration_divide_result<duration<_Rep1, _Period>, _Rep2>::type
-operator%(const duration<_Rep1, _Period>& __d, const _Rep2& __s)
-{
-    typedef typename common_type<_Rep1, _Rep2>::type _Cr;
-    typedef duration<_Cr, _Period> _Cd;
-    return _Cd(_Cd(__d).count() % static_cast<_Cr>(__s));
-}
-
-template <class _Rep1, class _Period1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type
-operator%(const duration<_Rep1, _Period1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef typename common_type<_Rep1, _Rep2>::type _Cr;
-    typedef typename common_type<duration<_Rep1, _Period1>, duration<_Rep2, _Period2> >::type _Cd;
-    return _Cd(static_cast<_Cr>(_Cd(__lhs).count()) % static_cast<_Cr>(_Cd(__rhs).count()));
-}
-
-//////////////////////////////////////////////////////////
-///////////////////// time_point /////////////////////////
-//////////////////////////////////////////////////////////
-
-template <class _Clock, class _Duration = typename _Clock::duration>
-class _LIBCPP_TYPE_VIS_ONLY time_point
-{
-    static_assert(__is_duration<_Duration>::value,
-                  "Second template parameter of time_point must be a std::chrono::duration");
-public:
-    typedef _Clock                    clock;
-    typedef _Duration                 duration;
-    typedef typename duration::rep    rep;
-    typedef typename duration::period period;
-private:
-    duration __d_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 time_point() : __d_(duration::zero()) {}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 explicit time_point(const duration& __d) : __d_(__d) {}
-
-    // conversions
-    template <class _Duration2>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    time_point(const time_point<clock, _Duration2>& t,
-        typename enable_if
-        <
-            is_convertible<_Duration2, duration>::value
-        >::type* = 0)
-            : __d_(t.time_since_epoch()) {}
-
-    // observer
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 duration time_since_epoch() const {return __d_;}
-
-    // arithmetic
-
-    _LIBCPP_INLINE_VISIBILITY time_point& operator+=(const duration& __d) {__d_ += __d; return *this;}
-    _LIBCPP_INLINE_VISIBILITY time_point& operator-=(const duration& __d) {__d_ -= __d; return *this;}
-
-    // special values
-
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR time_point min() {return time_point(duration::min());}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR time_point max() {return time_point(duration::max());}
-};
-
-} // chrono
-
-template <class _Clock, class _Duration1, class _Duration2>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<chrono::time_point<_Clock, _Duration1>,
-                                         chrono::time_point<_Clock, _Duration2> >
-{
-    typedef chrono::time_point<_Clock, typename common_type<_Duration1, _Duration2>::type> type;
-};
-
-namespace chrono {
-
-template <class _ToDuration, class _Clock, class _Duration>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-time_point<_Clock, _ToDuration>
-time_point_cast(const time_point<_Clock, _Duration>& __t)
-{
-    return time_point<_Clock, _ToDuration>(_VSTD::chrono::duration_cast<_ToDuration>(__t.time_since_epoch()));
-}
-
-// time_point ==
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __lhs.time_since_epoch() == __rhs.time_since_epoch();
-}
-
-// time_point !=
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return !(__lhs == __rhs);
-}
-
-// time_point <
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __lhs.time_since_epoch() < __rhs.time_since_epoch();
-}
-
-// time_point >
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __rhs < __lhs;
-}
-
-// time_point <=
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return !(__rhs < __lhs);
-}
-
-// time_point >=
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>=(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return !(__lhs < __rhs);
-}
-
-// time_point operator+(time_point x, duration y);
-
-template <class _Clock, class _Duration1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
-operator+(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    typedef time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type> _Tr;
-    return _Tr (__lhs.time_since_epoch() + __rhs);
-}
-
-// time_point operator+(duration x, time_point y);
-
-template <class _Rep1, class _Period1, class _Clock, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-time_point<_Clock, typename common_type<duration<_Rep1, _Period1>, _Duration2>::type>
-operator+(const duration<_Rep1, _Period1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __rhs + __lhs;
-}
-
-// time_point operator-(time_point x, duration y);
-
-template <class _Clock, class _Duration1, class _Rep2, class _Period2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-time_point<_Clock, typename common_type<_Duration1, duration<_Rep2, _Period2> >::type>
-operator-(const time_point<_Clock, _Duration1>& __lhs, const duration<_Rep2, _Period2>& __rhs)
-{
-    return __lhs + (-__rhs);
-}
-
-// duration operator-(time_point x, time_point y);
-
-template <class _Clock, class _Duration1, class _Duration2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename common_type<_Duration1, _Duration2>::type
-operator-(const time_point<_Clock, _Duration1>& __lhs, const time_point<_Clock, _Duration2>& __rhs)
-{
-    return __lhs.time_since_epoch() - __rhs.time_since_epoch();
-}
-
-//////////////////////////////////////////////////////////
-/////////////////////// clocks ///////////////////////////
-//////////////////////////////////////////////////////////
-
-class _LIBCPP_TYPE_VIS system_clock
-{
-public:
-    typedef microseconds                     duration;
-    typedef duration::rep                    rep;
-    typedef duration::period                 period;
-    typedef chrono::time_point<system_clock> time_point;
-    static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = false;
-
-    static time_point now() _NOEXCEPT;
-    static time_t     to_time_t  (const time_point& __t) _NOEXCEPT;
-    static time_point from_time_t(time_t __t) _NOEXCEPT;
-};
-
-#ifndef _LIBCPP_HAS_NO_MONOTONIC_CLOCK
-class _LIBCPP_TYPE_VIS steady_clock
-{
-public:
-    typedef nanoseconds                                   duration;
-    typedef duration::rep                                 rep;
-    typedef duration::period                              period;
-    typedef chrono::time_point<steady_clock, duration>    time_point;
-    static _LIBCPP_CONSTEXPR_AFTER_CXX11 const bool is_steady = true;
-
-    static time_point now() _NOEXCEPT;
-};
-
-typedef steady_clock high_resolution_clock;
-#else
-typedef system_clock high_resolution_clock;
-#endif
-
-} // chrono
-
-#if _LIBCPP_STD_VER > 11
-// Suffixes for duration literals [time.duration.literals]
-inline namespace literals
-{ 
-  inline namespace chrono_literals
-  {
-
-    constexpr chrono::hours operator"" h(unsigned long long __h)
-    {
-        return chrono::hours(static_cast<chrono::hours::rep>(__h));
-    }
-
-    constexpr chrono::duration<long double, ratio<3600,1>> operator"" h(long double __h)
-    {
-        return chrono::duration<long double, ratio<3600,1>>(__h);
-    }
-
-
-    constexpr chrono::minutes operator"" min(unsigned long long __m)
-    {
-        return chrono::minutes(static_cast<chrono::minutes::rep>(__m));
-    }
-
-    constexpr chrono::duration<long double, ratio<60,1>> operator"" min(long double __m)
-    {
-        return chrono::duration<long double, ratio<60,1>> (__m);
-    }
-
-
-    constexpr chrono::seconds operator"" s(unsigned long long __s)
-    {
-        return chrono::seconds(static_cast<chrono::seconds::rep>(__s));
-    }
-
-    constexpr chrono::duration<long double> operator"" s(long double __s)
-    {
-        return chrono::duration<long double> (__s);
-    }
-
-
-    constexpr chrono::milliseconds operator"" ms(unsigned long long __ms)
-    {
-        return chrono::milliseconds(static_cast<chrono::milliseconds::rep>(__ms));
-    }
-
-    constexpr chrono::duration<long double, milli> operator"" ms(long double __ms)
-    {
-        return chrono::duration<long double, milli>(__ms);
-    }
-
-
-    constexpr chrono::microseconds operator"" us(unsigned long long __us)
-    {
-        return chrono::microseconds(static_cast<chrono::microseconds::rep>(__us));
-    }
-
-    constexpr chrono::duration<long double, micro> operator"" us(long double __us)
-    {
-        return chrono::duration<long double, micro> (__us);
-    }
-    
-
-    constexpr chrono::nanoseconds operator"" ns(unsigned long long __ns)
-    {
-        return chrono::nanoseconds(static_cast<chrono::nanoseconds::rep>(__ns));
-    }
-
-    constexpr chrono::duration<long double, nano> operator"" ns(long double __ns)
-    {
-        return chrono::duration<long double, nano> (__ns);
-    }
-
-}}
-
-namespace chrono { // hoist the literals into namespace std::chrono
-   using namespace literals::chrono_literals;
-}
-
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CHRONO
diff --git a/include.new/c++/v1/tr1/cinttypes b/include.new/c++/v1/tr1/cinttypes
deleted file mode 100644
index 786692b..0000000
--- a/include.new/c++/v1/tr1/cinttypes
+++ /dev/null
@@ -1,259 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cinttypes --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CINTTYPES
-#define _LIBCPP_CINTTYPES
-
-/*
-    cinttypes synopsis
-
-This entire header is C99 / C++0X
-
-#include <cstdint>  // <cinttypes> includes <cstdint>
-
-Macros:
-
-    PRId8
-    PRId16
-    PRId32
-    PRId64
-
-    PRIdLEAST8
-    PRIdLEAST16
-    PRIdLEAST32
-    PRIdLEAST64
-
-    PRIdFAST8
-    PRIdFAST16
-    PRIdFAST32
-    PRIdFAST64
-
-    PRIdMAX
-    PRIdPTR
-
-    PRIi8
-    PRIi16
-    PRIi32
-    PRIi64
-
-    PRIiLEAST8
-    PRIiLEAST16
-    PRIiLEAST32
-    PRIiLEAST64
-
-    PRIiFAST8
-    PRIiFAST16
-    PRIiFAST32
-    PRIiFAST64
-
-    PRIiMAX
-    PRIiPTR
-
-    PRIo8
-    PRIo16
-    PRIo32
-    PRIo64
-
-    PRIoLEAST8
-    PRIoLEAST16
-    PRIoLEAST32
-    PRIoLEAST64
-
-    PRIoFAST8
-    PRIoFAST16
-    PRIoFAST32
-    PRIoFAST64
-
-    PRIoMAX
-    PRIoPTR
-
-    PRIu8
-    PRIu16
-    PRIu32
-    PRIu64
-
-    PRIuLEAST8
-    PRIuLEAST16
-    PRIuLEAST32
-    PRIuLEAST64
-
-    PRIuFAST8
-    PRIuFAST16
-    PRIuFAST32
-    PRIuFAST64
-
-    PRIuMAX
-    PRIuPTR
-
-    PRIx8
-    PRIx16
-    PRIx32
-    PRIx64
-
-    PRIxLEAST8
-    PRIxLEAST16
-    PRIxLEAST32
-    PRIxLEAST64
-
-    PRIxFAST8
-    PRIxFAST16
-    PRIxFAST32
-    PRIxFAST64
-
-    PRIxMAX
-    PRIxPTR
-
-    PRIX8
-    PRIX16
-    PRIX32
-    PRIX64
-
-    PRIXLEAST8
-    PRIXLEAST16
-    PRIXLEAST32
-    PRIXLEAST64
-
-    PRIXFAST8
-    PRIXFAST16
-    PRIXFAST32
-    PRIXFAST64
-
-    PRIXMAX
-    PRIXPTR
-
-    SCNd8
-    SCNd16
-    SCNd32
-    SCNd64
-
-    SCNdLEAST8
-    SCNdLEAST16
-    SCNdLEAST32
-    SCNdLEAST64
-
-    SCNdFAST8
-    SCNdFAST16
-    SCNdFAST32
-    SCNdFAST64
-
-    SCNdMAX
-    SCNdPTR
-
-    SCNi8
-    SCNi16
-    SCNi32
-    SCNi64
-
-    SCNiLEAST8
-    SCNiLEAST16
-    SCNiLEAST32
-    SCNiLEAST64
-
-    SCNiFAST8
-    SCNiFAST16
-    SCNiFAST32
-    SCNiFAST64
-
-    SCNiMAX
-    SCNiPTR
-
-    SCNo8
-    SCNo16
-    SCNo32
-    SCNo64
-
-    SCNoLEAST8
-    SCNoLEAST16
-    SCNoLEAST32
-    SCNoLEAST64
-
-    SCNoFAST8
-    SCNoFAST16
-    SCNoFAST32
-    SCNoFAST64
-
-    SCNoMAX
-    SCNoPTR
-
-    SCNu8
-    SCNu16
-    SCNu32
-    SCNu64
-
-    SCNuLEAST8
-    SCNuLEAST16
-    SCNuLEAST32
-    SCNuLEAST64
-
-    SCNuFAST8
-    SCNuFAST16
-    SCNuFAST32
-    SCNuFAST64
-
-    SCNuMAX
-    SCNuPTR
-
-    SCNx8
-    SCNx16
-    SCNx32
-    SCNx64
-
-    SCNxLEAST8
-    SCNxLEAST16
-    SCNxLEAST32
-    SCNxLEAST64
-
-    SCNxFAST8
-    SCNxFAST16
-    SCNxFAST32
-    SCNxFAST64
-
-    SCNxMAX
-    SCNxPTR
-
-namespace std
-{
-
-Types:
-
-    imaxdiv_t
-
-intmax_t  imaxabs(intmax_t j);
-imaxdiv_t imaxdiv(intmax_t numer, intmax_t denom);
-intmax_t  strtoimax(const char* restrict nptr, char** restrict endptr, int base);
-uintmax_t strtoumax(const char* restrict nptr, char** restrict endptr, int base);
-intmax_t  wcstoimax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
-uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
-
-}  // std
-*/
-
-#include <__config>
-#include <cstdint>
-#include <inttypes.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using::imaxdiv_t;
-
-using::imaxabs;
-using::imaxdiv;
-using::strtoimax;
-using::strtoumax;
-using::wcstoimax;
-using::wcstoumax;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CINTTYPES
diff --git a/include.new/c++/v1/tr1/ciso646 b/include.new/c++/v1/tr1/ciso646
deleted file mode 100644
index b2efc72..0000000
--- a/include.new/c++/v1/tr1/ciso646
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- ciso646 ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CISO646
-#define _LIBCPP_CISO646
-
-/*
-    ciso646 synopsis
-
-*/
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_CISO646
diff --git a/include.new/c++/v1/tr1/climits b/include.new/c++/v1/tr1/climits
deleted file mode 100644
index 81ffecd..0000000
--- a/include.new/c++/v1/tr1/climits
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- climits ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CLIMITS
-#define _LIBCPP_CLIMITS
-
-/*
-    climits synopsis
-
-Macros:
-
-    CHAR_BIT
-    SCHAR_MIN
-    SCHAR_MAX
-    UCHAR_MAX
-    CHAR_MIN
-    CHAR_MAX
-    MB_LEN_MAX
-    SHRT_MIN
-    SHRT_MAX
-    USHRT_MAX
-    INT_MIN
-    INT_MAX
-    UINT_MAX
-    LONG_MIN
-    LONG_MAX
-    ULONG_MAX
-    LLONG_MIN   // C99
-    LLONG_MAX   // C99
-    ULLONG_MAX  // C99
-
-*/
-
-#include <__config>
-#include <limits.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_CLIMITS
diff --git a/include.new/c++/v1/tr1/clocale b/include.new/c++/v1/tr1/clocale
deleted file mode 100644
index f8b8f0d..0000000
--- a/include.new/c++/v1/tr1/clocale
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- clocale ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CLOCALE
-#define _LIBCPP_CLOCALE
-
-/*
-    clocale synopsis
-
-Macros:
-
-    LC_ALL
-    LC_COLLATE
-    LC_CTYPE
-    LC_MONETARY
-    LC_NUMERIC
-    LC_TIME
-    NULL
-
-namespace std
-{
-
-struct lconv;
-char* setlocale(int category, const char* locale);
-lconv* localeconv();
-
-}  // std
-
-*/
-
-#include <__config>
-#include <locale.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::lconv;
-using ::setlocale;
-using ::localeconv;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CLOCALE
diff --git a/include.new/c++/v1/tr1/cmath b/include.new/c++/v1/tr1/cmath
deleted file mode 100644
index d3aa4be..0000000
--- a/include.new/c++/v1/tr1/cmath
+++ /dev/null
@@ -1,1685 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- cmath -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CMATH
-#define _LIBCPP_CMATH
-
-/*
-    cmath synopsis
-
-Macros:
-
-    HUGE_VAL
-    HUGE_VALF               // C99
-    HUGE_VALL               // C99
-    INFINITY                // C99
-    NAN                     // C99
-    FP_INFINITE             // C99
-    FP_NAN                  // C99
-    FP_NORMAL               // C99
-    FP_SUBNORMAL            // C99
-    FP_ZERO                 // C99
-    FP_FAST_FMA             // C99
-    FP_FAST_FMAF            // C99
-    FP_FAST_FMAL            // C99
-    FP_ILOGB0               // C99
-    FP_ILOGBNAN             // C99
-    MATH_ERRNO              // C99
-    MATH_ERREXCEPT          // C99
-    math_errhandling        // C99
-
-namespace std
-{
-
-Types:
-
-    float_t                 // C99
-    double_t                // C99
-
-// C90
-
-floating_point abs(floating_point x);
-
-floating_point acos (arithmetic x);
-float          acosf(float x);
-long double    acosl(long double x);
-
-floating_point asin (arithmetic x);
-float          asinf(float x);
-long double    asinl(long double x);
-
-floating_point atan (arithmetic x);
-float          atanf(float x);
-long double    atanl(long double x);
-
-floating_point atan2 (arithmetic y, arithmetic x);
-float          atan2f(float y, float x);
-long double    atan2l(long double y, long double x);
-
-floating_point ceil (arithmetic x);
-float          ceilf(float x);
-long double    ceill(long double x);
-
-floating_point cos (arithmetic x);
-float          cosf(float x);
-long double    cosl(long double x);
-
-floating_point cosh (arithmetic x);
-float          coshf(float x);
-long double    coshl(long double x);
-
-floating_point exp (arithmetic x);
-float          expf(float x);
-long double    expl(long double x);
-
-floating_point fabs (arithmetic x);
-float          fabsf(float x);
-long double    fabsl(long double x);
-
-floating_point floor (arithmetic x);
-float          floorf(float x);
-long double    floorl(long double x);
-
-floating_point fmod (arithmetic x, arithmetic y);
-float          fmodf(float x, float y);
-long double    fmodl(long double x, long double y);
-
-floating_point frexp (arithmetic value, int* exp);
-float          frexpf(float value, int* exp);
-long double    frexpl(long double value, int* exp);
-
-floating_point ldexp (arithmetic value, int exp);
-float          ldexpf(float value, int exp);
-long double    ldexpl(long double value, int exp);
-
-floating_point log (arithmetic x);
-float          logf(float x);
-long double    logl(long double x);
-
-floating_point log10 (arithmetic x);
-float          log10f(float x);
-long double    log10l(long double x);
-
-floating_point modf (floating_point value, floating_point* iptr);
-float          modff(float value, float* iptr);
-long double    modfl(long double value, long double* iptr);
-
-floating_point pow (arithmetic x, arithmetic y);
-float          powf(float x, float y);
-long double    powl(long double x, long double y);
-
-floating_point sin (arithmetic x);
-float          sinf(float x);
-long double    sinl(long double x);
-
-floating_point sinh (arithmetic x);
-float          sinhf(float x);
-long double    sinhl(long double x);
-
-floating_point sqrt (arithmetic x);
-float          sqrtf(float x);
-long double    sqrtl(long double x);
-
-floating_point tan (arithmetic x);
-float          tanf(float x);
-long double    tanl(long double x);
-
-floating_point tanh (arithmetic x);
-float          tanhf(float x);
-long double    tanhl(long double x);
-
-//  C99
-
-bool signbit(arithmetic x);
-
-int fpclassify(arithmetic x);
-
-bool isfinite(arithmetic x);
-bool isinf(arithmetic x);
-bool isnan(arithmetic x);
-bool isnormal(arithmetic x);
-
-bool isgreater(arithmetic x, arithmetic y);
-bool isgreaterequal(arithmetic x, arithmetic y);
-bool isless(arithmetic x, arithmetic y);
-bool islessequal(arithmetic x, arithmetic y);
-bool islessgreater(arithmetic x, arithmetic y);
-bool isunordered(arithmetic x, arithmetic y);
-
-floating_point acosh (arithmetic x);
-float          acoshf(float x);
-long double    acoshl(long double x);
-
-floating_point asinh (arithmetic x);
-float          asinhf(float x);
-long double    asinhl(long double x);
-
-floating_point atanh (arithmetic x);
-float          atanhf(float x);
-long double    atanhl(long double x);
-
-floating_point cbrt (arithmetic x);
-float          cbrtf(float x);
-long double    cbrtl(long double x);
-
-floating_point copysign (arithmetic x, arithmetic y);
-float          copysignf(float x, float y);
-long double    copysignl(long double x, long double y);
-
-floating_point erf (arithmetic x);
-float          erff(float x);
-long double    erfl(long double x);
-
-floating_point erfc (arithmetic x);
-float          erfcf(float x);
-long double    erfcl(long double x);
-
-floating_point exp2 (arithmetic x);
-float          exp2f(float x);
-long double    exp2l(long double x);
-
-floating_point expm1 (arithmetic x);
-float          expm1f(float x);
-long double    expm1l(long double x);
-
-floating_point fdim (arithmetic x, arithmetic y);
-float          fdimf(float x, float y);
-long double    fdiml(long double x, long double y);
-
-floating_point fma (arithmetic x, arithmetic y, arithmetic z);
-float          fmaf(float x, float y, float z);
-long double    fmal(long double x, long double y, long double z);
-
-floating_point fmax (arithmetic x, arithmetic y);
-float          fmaxf(float x, float y);
-long double    fmaxl(long double x, long double y);
-
-floating_point fmin (arithmetic x, arithmetic y);
-float          fminf(float x, float y);
-long double    fminl(long double x, long double y);
-
-floating_point hypot (arithmetic x, arithmetic y);
-float          hypotf(float x, float y);
-long double    hypotl(long double x, long double y);
-
-int ilogb (arithmetic x);
-int ilogbf(float x);
-int ilogbl(long double x);
-
-floating_point lgamma (arithmetic x);
-float          lgammaf(float x);
-long double    lgammal(long double x);
-
-long long llrint (arithmetic x);
-long long llrintf(float x);
-long long llrintl(long double x);
-
-long long llround (arithmetic x);
-long long llroundf(float x);
-long long llroundl(long double x);
-
-floating_point log1p (arithmetic x);
-float          log1pf(float x);
-long double    log1pl(long double x);
-
-floating_point log2 (arithmetic x);
-float          log2f(float x);
-long double    log2l(long double x);
-
-floating_point logb (arithmetic x);
-float          logbf(float x);
-long double    logbl(long double x);
-
-long lrint (arithmetic x);
-long lrintf(float x);
-long lrintl(long double x);
-
-long lround (arithmetic x);
-long lroundf(float x);
-long lroundl(long double x);
-
-double      nan (const char* str);
-float       nanf(const char* str);
-long double nanl(const char* str);
-
-floating_point nearbyint (arithmetic x);
-float          nearbyintf(float x);
-long double    nearbyintl(long double x);
-
-floating_point nextafter (arithmetic x, arithmetic y);
-float          nextafterf(float x, float y);
-long double    nextafterl(long double x, long double y);
-
-floating_point nexttoward (arithmetic x, long double y);
-float          nexttowardf(float x, long double y);
-long double    nexttowardl(long double x, long double y);
-
-floating_point remainder (arithmetic x, arithmetic y);
-float          remainderf(float x, float y);
-long double    remainderl(long double x, long double y);
-
-floating_point remquo (arithmetic x, arithmetic y, int* pquo);
-float          remquof(float x, float y, int* pquo);
-long double    remquol(long double x, long double y, int* pquo);
-
-floating_point rint (arithmetic x);
-float          rintf(float x);
-long double    rintl(long double x);
-
-floating_point round (arithmetic x);
-float          roundf(float x);
-long double    roundl(long double x);
-
-floating_point scalbln (arithmetic x, long ex);
-float          scalblnf(float x, long ex);
-long double    scalblnl(long double x, long ex);
-
-floating_point scalbn (arithmetic x, int ex);
-float          scalbnf(float x, int ex);
-long double    scalbnl(long double x, int ex);
-
-floating_point tgamma (arithmetic x);
-float          tgammaf(float x);
-long double    tgammal(long double x);
-
-floating_point trunc (arithmetic x);
-float          truncf(float x);
-long double    truncl(long double x);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <math.h>
-#include <type_traits>
-
-#ifdef _LIBCPP_MSVCRT
-#include "support/win32/math_win32.h"
-#endif
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-// signbit
-
-#ifdef signbit
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_signbit(_A1 __lcpp_x) _NOEXCEPT
-{
-    return signbit(__lcpp_x);
-}
-
-#undef signbit
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-signbit(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_signbit((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // signbit
-
-// fpclassify
-
-#ifdef fpclassify
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-int
-__libcpp_fpclassify(_A1 __lcpp_x) _NOEXCEPT
-{
-    return fpclassify(__lcpp_x);
-}
-
-#undef fpclassify
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, int>::type
-fpclassify(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_fpclassify((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // fpclassify
-
-// isfinite
-
-#ifdef isfinite
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isfinite(_A1 __lcpp_x) _NOEXCEPT
-{
-    return isfinite(__lcpp_x);
-}
-
-#undef isfinite
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-isfinite(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_isfinite((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // isfinite
-
-// isinf
-
-#ifdef isinf
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isinf(_A1 __lcpp_x) _NOEXCEPT
-{
-    return isinf(__lcpp_x);
-}
-
-#undef isinf
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-isinf(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_isinf((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // isinf
-
-// isnan
-
-#ifdef isnan
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isnan(_A1 __lcpp_x) _NOEXCEPT
-{
-    return isnan(__lcpp_x);
-}
-
-#undef isnan
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-isnan(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_isnan((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // isnan
-
-// isnormal
-
-#ifdef isnormal
-
-template <class _A1>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isnormal(_A1 __lcpp_x) _NOEXCEPT
-{
-    return isnormal(__lcpp_x);
-}
-
-#undef isnormal
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if<std::is_arithmetic<_A1>::value, bool>::type
-isnormal(_A1 __lcpp_x) _NOEXCEPT
-{
-    return __libcpp_isnormal((typename std::__promote<_A1>::type)__lcpp_x);
-}
-
-#endif  // isnormal
-
-// isgreater
-
-#ifdef isgreater
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return isgreater(__lcpp_x, __lcpp_y);
-}
-
-#undef isgreater
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-isgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_isgreater((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // isgreater
-
-// isgreaterequal
-
-#ifdef isgreaterequal
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isgreaterequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return isgreaterequal(__lcpp_x, __lcpp_y);
-}
-
-#undef isgreaterequal
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-isgreaterequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_isgreaterequal((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // isgreaterequal
-
-// isless
-
-#ifdef isless
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isless(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return isless(__lcpp_x, __lcpp_y);
-}
-
-#undef isless
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-isless(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_isless((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // isless
-
-// islessequal
-
-#ifdef islessequal
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_islessequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return islessequal(__lcpp_x, __lcpp_y);
-}
-
-#undef islessequal
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-islessequal(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_islessequal((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // islessequal
-
-// islessgreater
-
-#ifdef islessgreater
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_islessgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return islessgreater(__lcpp_x, __lcpp_y);
-}
-
-#undef islessgreater
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-islessgreater(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_islessgreater((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // islessgreater
-
-// isunordered
-
-#ifdef isunordered
-
-template <class _A1, class _A2>
-_LIBCPP_ALWAYS_INLINE
-bool
-__libcpp_isunordered(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    return isunordered(__lcpp_x, __lcpp_y);
-}
-
-#undef isunordered
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename std::enable_if
-<
-    std::is_arithmetic<_A1>::value &&
-    std::is_arithmetic<_A2>::value,
-    bool
->::type
-isunordered(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename std::__promote<_A1, _A2>::type type;
-    return __libcpp_isunordered((type)__lcpp_x, (type)__lcpp_y);
-}
-
-#endif  // isunordered
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::signbit;
-using ::fpclassify;
-using ::isfinite;
-using ::isinf;
-using ::isnan;
-using ::isnormal;
-using ::isgreater;
-using ::isgreaterequal;
-using ::isless;
-using ::islessequal;
-using ::islessgreater;
-using ::isunordered;
-using ::isunordered;
-
-using ::float_t;
-using ::double_t;
-
-// abs
-
-#if !defined(_AIX)
-inline _LIBCPP_INLINE_VISIBILITY
-float
-abs(float __lcpp_x) _NOEXCEPT {return fabsf(__lcpp_x);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-double
-abs(double __lcpp_x) _NOEXCEPT {return fabs(__lcpp_x);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-long double
-abs(long double __lcpp_x) _NOEXCEPT {return fabsl(__lcpp_x);}
-#endif // !defined(_AIX)
-
-#ifndef __sun__
-
-// acos
-
-using ::acos;
-using ::acosf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       acos(float __lcpp_x) _NOEXCEPT       {return acosf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double acos(long double __lcpp_x) _NOEXCEPT {return acosl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-acos(_A1 __lcpp_x) _NOEXCEPT {return acos((double)__lcpp_x);}
-
-// asin
-
-using ::asin;
-using ::asinf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       asin(float __lcpp_x) _NOEXCEPT       {return asinf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double asin(long double __lcpp_x) _NOEXCEPT {return asinl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-asin(_A1 __lcpp_x) _NOEXCEPT {return asin((double)__lcpp_x);}
-
-// atan
-
-using ::atan;
-using ::atanf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       atan(float __lcpp_x) _NOEXCEPT       {return atanf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double atan(long double __lcpp_x) _NOEXCEPT {return atanl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-atan(_A1 __lcpp_x) _NOEXCEPT {return atan((double)__lcpp_x);}
-
-// atan2
-
-using ::atan2;
-using ::atan2f;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       atan2(float __lcpp_y, float __lcpp_x) _NOEXCEPT             {return atan2f(__lcpp_y, __lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double atan2(long double __lcpp_y, long double __lcpp_x) _NOEXCEPT {return atan2l(__lcpp_y, __lcpp_x);}
-#endif
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-atan2(_A1 __lcpp_y, _A2 __lcpp_x) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return atan2((__result_type)__lcpp_y, (__result_type)__lcpp_x);
-}
-
-// ceil
-
-using ::ceil;
-using ::ceilf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       ceil(float __lcpp_x) _NOEXCEPT       {return ceilf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double ceil(long double __lcpp_x) _NOEXCEPT {return ceill(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-ceil(_A1 __lcpp_x) _NOEXCEPT {return ceil((double)__lcpp_x);}
-
-// cos
-
-using ::cos;
-using ::cosf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       cos(float __lcpp_x) _NOEXCEPT       {return cosf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double cos(long double __lcpp_x) _NOEXCEPT {return cosl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-cos(_A1 __lcpp_x) _NOEXCEPT {return cos((double)__lcpp_x);}
-
-// cosh
-
-using ::cosh;
-using ::coshf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       cosh(float __lcpp_x) _NOEXCEPT       {return coshf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double cosh(long double __lcpp_x) _NOEXCEPT {return coshl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-cosh(_A1 __lcpp_x) _NOEXCEPT {return cosh((double)__lcpp_x);}
-
-#endif // __sun__
-// exp
-
-using ::exp;
-using ::expf;
-
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       exp(float __lcpp_x) _NOEXCEPT       {return expf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double exp(long double __lcpp_x) _NOEXCEPT {return expl(__lcpp_x);}
-#endif
-
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-exp(_A1 __lcpp_x) _NOEXCEPT {return exp((double)__lcpp_x);}
-
-// fabs
-
-using ::fabs;
-using ::fabsf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       fabs(float __lcpp_x) _NOEXCEPT       {return fabsf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double fabs(long double __lcpp_x) _NOEXCEPT {return fabsl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-fabs(_A1 __lcpp_x) _NOEXCEPT {return fabs((double)__lcpp_x);}
-
-// floor
-
-using ::floor;
-using ::floorf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       floor(float __lcpp_x) _NOEXCEPT       {return floorf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double floor(long double __lcpp_x) _NOEXCEPT {return floorl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-floor(_A1 __lcpp_x) _NOEXCEPT {return floor((double)__lcpp_x);}
-
-// fmod
-
-#endif //__sun__
-using ::fmod;
-using ::fmodf;
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       fmod(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return fmodf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double fmod(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return fmodl(__lcpp_x, __lcpp_y);}
-#endif
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-fmod(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return fmod((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-
-// frexp
-
-using ::frexp;
-using ::frexpf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       frexp(float __lcpp_x, int* __lcpp_e) _NOEXCEPT       {return frexpf(__lcpp_x, __lcpp_e);}
-inline _LIBCPP_INLINE_VISIBILITY long double frexp(long double __lcpp_x, int* __lcpp_e) _NOEXCEPT {return frexpl(__lcpp_x, __lcpp_e);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-frexp(_A1 __lcpp_x, int* __lcpp_e) _NOEXCEPT {return frexp((double)__lcpp_x, __lcpp_e);}
-
-// ldexp
-
-using ::ldexp;
-using ::ldexpf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       ldexp(float __lcpp_x, int __lcpp_e) _NOEXCEPT       {return ldexpf(__lcpp_x, __lcpp_e);}
-inline _LIBCPP_INLINE_VISIBILITY long double ldexp(long double __lcpp_x, int __lcpp_e) _NOEXCEPT {return ldexpl(__lcpp_x, __lcpp_e);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-ldexp(_A1 __lcpp_x, int __lcpp_e) _NOEXCEPT {return ldexp((double)__lcpp_x, __lcpp_e);}
-
-// log
-
-#endif // __sun__
-using ::log;
-using ::logf;
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       log(float __lcpp_x) _NOEXCEPT       {return logf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double log(long double __lcpp_x) _NOEXCEPT {return logl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-log(_A1 __lcpp_x) _NOEXCEPT {return log((double)__lcpp_x);}
-
-
-// log10
-
-using ::log10;
-using ::log10f;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       log10(float __lcpp_x) _NOEXCEPT       {return log10f(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double log10(long double __lcpp_x) _NOEXCEPT {return log10l(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-log10(_A1 __lcpp_x) _NOEXCEPT {return log10((double)__lcpp_x);}
-
-// modf
-
-using ::modf;
-using ::modff;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       modf(float __lcpp_x, float* __lcpp_y) _NOEXCEPT             {return modff(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double modf(long double __lcpp_x, long double* __lcpp_y) _NOEXCEPT {return modfl(__lcpp_x, __lcpp_y);}
-#endif
-
-// pow
-
-#endif // __sun__ 
-using ::pow;
-using ::powf;
-
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       pow(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return powf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double pow(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return powl(__lcpp_x, __lcpp_y);}
-#endif
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-pow(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return pow((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// sin
-
-using ::sin;
-using ::sinf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       sin(float __lcpp_x) _NOEXCEPT       {return sinf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double sin(long double __lcpp_x) _NOEXCEPT {return sinl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-sin(_A1 __lcpp_x) _NOEXCEPT {return sin((double)__lcpp_x);}
-
-// sinh
-
-using ::sinh;
-using ::sinhf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       sinh(float __lcpp_x) _NOEXCEPT       {return sinhf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double sinh(long double __lcpp_x) _NOEXCEPT {return sinhl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-sinh(_A1 __lcpp_x) _NOEXCEPT {return sinh((double)__lcpp_x);}
-
-// sqrt
-
-#endif // __sun__
-using ::sqrt;
-using ::sqrtf;
-
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(__sun__) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       sqrt(float __lcpp_x) _NOEXCEPT       {return sqrtf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double sqrt(long double __lcpp_x) _NOEXCEPT {return sqrtl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-sqrt(_A1 __lcpp_x) _NOEXCEPT {return sqrt((double)__lcpp_x);}
-
-// tan
-
-using ::tan;
-using ::tanf;
-#ifndef __sun__
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       tan(float __lcpp_x) _NOEXCEPT       {return tanf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double tan(long double __lcpp_x) _NOEXCEPT {return tanl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-tan(_A1 __lcpp_x) _NOEXCEPT {return tan((double)__lcpp_x);}
-
-// tanh
-
-using ::tanh;
-using ::tanhf;
-
-#if !(defined(_LIBCPP_MSVCRT) || defined(_AIX))
-inline _LIBCPP_INLINE_VISIBILITY float       tanh(float __lcpp_x) _NOEXCEPT       {return tanhf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double tanh(long double __lcpp_x) _NOEXCEPT {return tanhl(__lcpp_x);}
-#endif
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-tanh(_A1 __lcpp_x) _NOEXCEPT {return tanh((double)__lcpp_x);}
-
-// acosh
-
-#ifndef _LIBCPP_MSVCRT
-using ::acosh;
-using ::acoshf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       acosh(float __lcpp_x) _NOEXCEPT       {return acoshf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double acosh(long double __lcpp_x) _NOEXCEPT {return acoshl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-acosh(_A1 __lcpp_x) _NOEXCEPT {return acosh((double)__lcpp_x);}
-#endif
-
-// asinh
-
-#ifndef _LIBCPP_MSVCRT
-using ::asinh;
-using ::asinhf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       asinh(float __lcpp_x) _NOEXCEPT       {return asinhf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double asinh(long double __lcpp_x) _NOEXCEPT {return asinhl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-asinh(_A1 __lcpp_x) _NOEXCEPT {return asinh((double)__lcpp_x);}
-#endif
-
-// atanh
-
-#ifndef _LIBCPP_MSVCRT
-using ::atanh;
-using ::atanhf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       atanh(float __lcpp_x) _NOEXCEPT       {return atanhf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double atanh(long double __lcpp_x) _NOEXCEPT {return atanhl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-atanh(_A1 __lcpp_x) _NOEXCEPT {return atanh((double)__lcpp_x);}
-#endif
-
-// cbrt
-
-#ifndef _LIBCPP_MSVCRT
-using ::cbrt;
-using ::cbrtf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       cbrt(float __lcpp_x) _NOEXCEPT       {return cbrtf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double cbrt(long double __lcpp_x) _NOEXCEPT {return cbrtl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-cbrt(_A1 __lcpp_x) _NOEXCEPT {return cbrt((double)__lcpp_x);}
-#endif
-
-// copysign
-
-using ::copysign;
-using ::copysignf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       copysign(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return copysignf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double copysign(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return copysignl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-copysign(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return copysign((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-#ifndef _LIBCPP_MSVCRT
-
-// erf
-
-using ::erf;
-using ::erff;
-
-inline _LIBCPP_INLINE_VISIBILITY float       erf(float __lcpp_x) _NOEXCEPT       {return erff(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double erf(long double __lcpp_x) _NOEXCEPT {return erfl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-erf(_A1 __lcpp_x) _NOEXCEPT {return erf((double)__lcpp_x);}
-
-// erfc
-
-using ::erfc;
-using ::erfcf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       erfc(float __lcpp_x) _NOEXCEPT       {return erfcf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double erfc(long double __lcpp_x) _NOEXCEPT {return erfcl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-erfc(_A1 __lcpp_x) _NOEXCEPT {return erfc((double)__lcpp_x);}
-
-// exp2
-
-using ::exp2;
-using ::exp2f;
-
-inline _LIBCPP_INLINE_VISIBILITY float       exp2(float __lcpp_x) _NOEXCEPT       {return exp2f(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double exp2(long double __lcpp_x) _NOEXCEPT {return exp2l(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-exp2(_A1 __lcpp_x) _NOEXCEPT {return exp2((double)__lcpp_x);}
-
-// expm1
-
-using ::expm1;
-using ::expm1f;
-
-inline _LIBCPP_INLINE_VISIBILITY float       expm1(float __lcpp_x) _NOEXCEPT       {return expm1f(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double expm1(long double __lcpp_x) _NOEXCEPT {return expm1l(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-expm1(_A1 __lcpp_x) _NOEXCEPT {return expm1((double)__lcpp_x);}
-
-// fdim
-
-using ::fdim;
-using ::fdimf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       fdim(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return fdimf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double fdim(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return fdiml(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-fdim(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return fdim((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// fma
-
-using ::fmaf;
-using ::fma;
-
-inline _LIBCPP_INLINE_VISIBILITY float       fma(float __lcpp_x, float __lcpp_y, float __lcpp_z) _NOEXCEPT                   {return fmaf(__lcpp_x, __lcpp_y, __lcpp_z);}
-inline _LIBCPP_INLINE_VISIBILITY long double fma(long double __lcpp_x, long double __lcpp_y, long double __lcpp_z) _NOEXCEPT {return fmal(__lcpp_x, __lcpp_y, __lcpp_z);}
-
-template <class _A1, class _A2, class _A3>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value &&
-    is_arithmetic<_A3>::value,
-    __promote<_A1, _A2, _A3>
->::type
-fma(_A1 __lcpp_x, _A2 __lcpp_y, _A3 __lcpp_z) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2, _A3>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value &&
-                      is_same<_A3, __result_type>::value)), "");
-    return fma((__result_type)__lcpp_x, (__result_type)__lcpp_y, (__result_type)__lcpp_z);
-}
-
-// fmax
-
-using ::fmax;
-using ::fmaxf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       fmax(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return fmaxf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double fmax(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return fmaxl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-fmax(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return fmax((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// fmin
-
-using ::fmin;
-using ::fminf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       fmin(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return fminf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double fmin(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return fminl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-fmin(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return fmin((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// hypot
-
-using ::hypot;
-using ::hypotf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       hypot(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return hypotf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double hypot(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return hypotl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-hypot(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return hypot((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// ilogb
-
-using ::ilogb;
-using ::ilogbf;
-
-inline _LIBCPP_INLINE_VISIBILITY int ilogb(float __lcpp_x) _NOEXCEPT       {return ilogbf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY int ilogb(long double __lcpp_x) _NOEXCEPT {return ilogbl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, int>::type
-ilogb(_A1 __lcpp_x) _NOEXCEPT {return ilogb((double)__lcpp_x);}
-
-// lgamma
-
-using ::lgamma;
-using ::lgammaf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       lgamma(float __lcpp_x) _NOEXCEPT       {return lgammaf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double lgamma(long double __lcpp_x) _NOEXCEPT {return lgammal(__lcpp_x);}
-
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-lgamma(_A1 __lcpp_x) _NOEXCEPT {return lgamma((double)__lcpp_x);}
-
-
-// llrint
-
-using ::llrint;
-using ::llrintf;
-
-inline _LIBCPP_INLINE_VISIBILITY long long llrint(float __lcpp_x) _NOEXCEPT       {return llrintf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long long llrint(long double __lcpp_x) _NOEXCEPT {return llrintl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, long long>::type
-llrint(_A1 __lcpp_x) _NOEXCEPT {return llrint((double)__lcpp_x);}
-
-// llround
-
-using ::llround;
-using ::llroundf;
-
-inline _LIBCPP_INLINE_VISIBILITY long long llround(float __lcpp_x) _NOEXCEPT       {return llroundf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long long llround(long double __lcpp_x) _NOEXCEPT {return llroundl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, long long>::type
-llround(_A1 __lcpp_x) _NOEXCEPT {return llround((double)__lcpp_x);}
-
-// log1p
-
-using ::log1p;
-using ::log1pf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       log1p(float __lcpp_x) _NOEXCEPT       {return log1pf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double log1p(long double __lcpp_x) _NOEXCEPT {return log1pl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-log1p(_A1 __lcpp_x) _NOEXCEPT {return log1p((double)__lcpp_x);}
-
-// log2
-
-using ::log2;
-using ::log2f;
-
-inline _LIBCPP_INLINE_VISIBILITY float       log2(float __lcpp_x) _NOEXCEPT       {return log2f(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double log2(long double __lcpp_x) _NOEXCEPT {return log2l(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-log2(_A1 __lcpp_x) _NOEXCEPT {return log2((double)__lcpp_x);}
-
-// logb
-
-using ::logb;
-using ::logbf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       logb(float __lcpp_x) _NOEXCEPT       {return logbf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double logb(long double __lcpp_x) _NOEXCEPT {return logbl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-logb(_A1 __lcpp_x) _NOEXCEPT {return logb((double)__lcpp_x);}
-
-// lrint
-
-using ::lrint;
-using ::lrintf;
-
-inline _LIBCPP_INLINE_VISIBILITY long lrint(float __lcpp_x) _NOEXCEPT       {return lrintf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long lrint(long double __lcpp_x) _NOEXCEPT {return lrintl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, long>::type
-lrint(_A1 __lcpp_x) _NOEXCEPT {return lrint((double)__lcpp_x);}
-
-// lround
-
-using ::lround;
-using ::lroundf;
-
-inline _LIBCPP_INLINE_VISIBILITY long lround(float __lcpp_x) _NOEXCEPT       {return lroundf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long lround(long double __lcpp_x) _NOEXCEPT {return lroundl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, long>::type
-lround(_A1 __lcpp_x) _NOEXCEPT {return lround((double)__lcpp_x);}
-
-#endif // _LIBCPP_MSVCRT
-#endif // __sun__
-
-// nan
-
-#ifndef _LIBCPP_MSVCRT
-using ::nan;
-using ::nanf;
-#endif // _LIBCPP_MSVCRT
-
-#ifndef __sun__
-#ifndef _LIBCPP_MSVCRT
-
-// nearbyint
-
-using ::nearbyint;
-using ::nearbyintf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       nearbyint(float __lcpp_x) _NOEXCEPT       {return nearbyintf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double nearbyint(long double __lcpp_x) _NOEXCEPT {return nearbyintl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-nearbyint(_A1 __lcpp_x) _NOEXCEPT {return nearbyint((double)__lcpp_x);}
-
-// nextafter
-
-using ::nextafter;
-using ::nextafterf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       nextafter(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return nextafterf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double nextafter(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return nextafterl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-nextafter(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return nextafter((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// nexttoward
-
-using ::nexttoward;
-using ::nexttowardf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       nexttoward(float __lcpp_x, long double __lcpp_y) _NOEXCEPT       {return nexttowardf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double nexttoward(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return nexttowardl(__lcpp_x, __lcpp_y);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-nexttoward(_A1 __lcpp_x, long double __lcpp_y) _NOEXCEPT {return nexttoward((double)__lcpp_x, __lcpp_y);}
-
-// remainder
-
-using ::remainder;
-using ::remainderf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       remainder(float __lcpp_x, float __lcpp_y) _NOEXCEPT             {return remainderf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double remainder(long double __lcpp_x, long double __lcpp_y) _NOEXCEPT {return remainderl(__lcpp_x, __lcpp_y);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-remainder(_A1 __lcpp_x, _A2 __lcpp_y) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return remainder((__result_type)__lcpp_x, (__result_type)__lcpp_y);
-}
-
-// remquo
-
-using ::remquo;
-using ::remquof;
-
-inline _LIBCPP_INLINE_VISIBILITY float       remquo(float __lcpp_x, float __lcpp_y, int* __lcpp_z) _NOEXCEPT             {return remquof(__lcpp_x, __lcpp_y, __lcpp_z);}
-inline _LIBCPP_INLINE_VISIBILITY long double remquo(long double __lcpp_x, long double __lcpp_y, int* __lcpp_z) _NOEXCEPT {return remquol(__lcpp_x, __lcpp_y, __lcpp_z);}
-
-template <class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_arithmetic<_A1>::value &&
-    is_arithmetic<_A2>::value,
-    __promote<_A1, _A2>
->::type
-remquo(_A1 __lcpp_x, _A2 __lcpp_y, int* __lcpp_z) _NOEXCEPT
-{
-    typedef typename __promote<_A1, _A2>::type __result_type;
-    static_assert((!(is_same<_A1, __result_type>::value &&
-                      is_same<_A2, __result_type>::value)), "");
-    return remquo((__result_type)__lcpp_x, (__result_type)__lcpp_y, __lcpp_z);
-}
-
-// rint
-
-using ::rint;
-using ::rintf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       rint(float __lcpp_x) _NOEXCEPT       {return rintf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double rint(long double __lcpp_x) _NOEXCEPT {return rintl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-rint(_A1 __lcpp_x) _NOEXCEPT {return rint((double)__lcpp_x);}
-
-// round
-
-using ::round;
-using ::roundf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       round(float __lcpp_x) _NOEXCEPT       {return roundf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double round(long double __lcpp_x) _NOEXCEPT {return roundl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-round(_A1 __lcpp_x) _NOEXCEPT {return round((double)__lcpp_x);}
-
-// scalbln
-
-using ::scalbln;
-using ::scalblnf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       scalbln(float __lcpp_x, long __lcpp_y) _NOEXCEPT       {return scalblnf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double scalbln(long double __lcpp_x, long __lcpp_y) _NOEXCEPT {return scalblnl(__lcpp_x, __lcpp_y);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-scalbln(_A1 __lcpp_x, long __lcpp_y) _NOEXCEPT {return scalbln((double)__lcpp_x, __lcpp_y);}
-
-// scalbn
-
-using ::scalbn;
-using ::scalbnf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       scalbn(float __lcpp_x, int __lcpp_y) _NOEXCEPT       {return scalbnf(__lcpp_x, __lcpp_y);}
-inline _LIBCPP_INLINE_VISIBILITY long double scalbn(long double __lcpp_x, int __lcpp_y) _NOEXCEPT {return scalbnl(__lcpp_x, __lcpp_y);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-scalbn(_A1 __lcpp_x, int __lcpp_y) _NOEXCEPT {return scalbn((double)__lcpp_x, __lcpp_y);}
-
-// tgamma
-
-using ::tgamma;
-using ::tgammaf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       tgamma(float __lcpp_x) _NOEXCEPT       {return tgammaf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double tgamma(long double __lcpp_x) _NOEXCEPT {return tgammal(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-tgamma(_A1 __lcpp_x) _NOEXCEPT {return tgamma((double)__lcpp_x);}
-
-// trunc
-
-using ::trunc;
-using ::truncf;
-
-inline _LIBCPP_INLINE_VISIBILITY float       trunc(float __lcpp_x) _NOEXCEPT       {return truncf(__lcpp_x);}
-inline _LIBCPP_INLINE_VISIBILITY long double trunc(long double __lcpp_x) _NOEXCEPT {return truncl(__lcpp_x);}
-
-template <class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if<is_integral<_A1>::value, double>::type
-trunc(_A1 __lcpp_x) _NOEXCEPT {return trunc((double)__lcpp_x);}
-
-#endif // !_LIBCPP_MSVCRT
-
-using ::acosl;
-using ::asinl;
-using ::atanl;
-using ::atan2l;
-using ::ceill;
-using ::cosl;
-using ::coshl;
-using ::expl;
-using ::fabsl;
-using ::floorl;
-using ::fmodl;
-using ::frexpl;
-using ::ldexpl;
-using ::logl;
-using ::log10l;
-using ::modfl;
-using ::powl;
-using ::sinl;
-using ::sinhl;
-using ::sqrtl;
-using ::tanl;
-#ifndef _LIBCPP_MSVCRT
-using ::tanhl;
-using ::acoshl;
-using ::asinhl;
-using ::atanhl;
-using ::cbrtl;
-#endif  // !_LIBCPP_MSVCRT
-using ::copysignl;
-#ifndef _LIBCPP_MSVCRT
-using ::erfl;
-using ::erfcl;
-using ::exp2l;
-using ::expm1l;
-using ::fdiml;
-using ::fmal;
-using ::fmaxl;
-using ::fminl;
-using ::hypotl;
-using ::ilogbl;
-using ::lgammal;
-using ::llrintl;
-using ::llroundl;
-using ::log1pl;
-using ::log2l;
-using ::logbl;
-using ::lrintl;
-using ::lroundl;
-using ::nanl;
-using ::nearbyintl;
-using ::nextafterl;
-using ::nexttowardl;
-using ::remainderl;
-using ::remquol;
-using ::rintl;
-using ::roundl;
-using ::scalblnl;
-using ::scalbnl;
-using ::tgammal;
-using ::truncl;
-#endif // !_LIBCPP_MSVCRT
-
-#else 
-using ::lgamma;
-using ::lgammaf;
-#endif // __sun__
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CMATH
diff --git a/include.new/c++/v1/tr1/codecvt b/include.new/c++/v1/tr1/codecvt
deleted file mode 100644
index 6eff107..0000000
--- a/include.new/c++/v1/tr1/codecvt
+++ /dev/null
@@ -1,550 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- codecvt -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CODECVT
-#define _LIBCPP_CODECVT
-
-/*
-    codecvt synopsis
-
-namespace std
-{
-
-enum codecvt_mode
-{
-    consume_header = 4,
-    generate_header = 2,
-    little_endian = 1
-};
-
-template <class Elem, unsigned long Maxcode = 0x10ffff,
-          codecvt_mode Mode = (codecvt_mode)0>
-class codecvt_utf8
-    : public codecvt<Elem, char, mbstate_t>
-{
-    explicit codecvt_utf8(size_t refs = 0);
-    ~codecvt_utf8();
-};
-
-template <class Elem, unsigned long Maxcode = 0x10ffff,
-          codecvt_mode Mode = (codecvt_mode)0>
-class codecvt_utf16
-    : public codecvt<Elem, char, mbstate_t>
-{
-    explicit codecvt_utf16(size_t refs = 0);
-    ~codecvt_utf16();
-};
-
-template <class Elem, unsigned long Maxcode = 0x10ffff,
-          codecvt_mode Mode = (codecvt_mode)0>
-class codecvt_utf8_utf16
-    : public codecvt<Elem, char, mbstate_t>
-{
-    explicit codecvt_utf8_utf16(size_t refs = 0);
-    ~codecvt_utf8_utf16();
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__locale>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-enum codecvt_mode
-{
-    consume_header = 4,
-    generate_header = 2,
-    little_endian = 1
-};
-
-// codecvt_utf8
-
-template <class _Elem> class __codecvt_utf8;
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8<wchar_t>
-    : public codecvt<wchar_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8<char16_t>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8<char32_t>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <class _Elem, unsigned long _Maxcode = 0x10ffff,
-          codecvt_mode _Mode = (codecvt_mode)0>
-class _LIBCPP_TYPE_VIS_ONLY codecvt_utf8
-    : public __codecvt_utf8<_Elem>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_utf8(size_t __refs = 0)
-        : __codecvt_utf8<_Elem>(__refs, _Maxcode, _Mode) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    ~codecvt_utf8() {}
-};
-
-// codecvt_utf16
-
-template <class _Elem, bool _LittleEndian> class __codecvt_utf16;
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<wchar_t, false>
-    : public codecvt<wchar_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<wchar_t, true>
-    : public codecvt<wchar_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<char16_t, false>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<char16_t, true>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<char32_t, false>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf16<char32_t, true>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <class _Elem, unsigned long _Maxcode = 0x10ffff,
-          codecvt_mode _Mode = (codecvt_mode)0>
-class _LIBCPP_TYPE_VIS_ONLY codecvt_utf16
-    : public __codecvt_utf16<_Elem, _Mode & little_endian>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_utf16(size_t __refs = 0)
-        : __codecvt_utf16<_Elem, _Mode & little_endian>(__refs, _Maxcode, _Mode) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    ~codecvt_utf16() {}
-};
-
-// codecvt_utf8_utf16
-
-template <class _Elem> class __codecvt_utf8_utf16;
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<wchar_t>
-    : public codecvt<wchar_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef wchar_t   intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<wchar_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<char32_t>
-    : public codecvt<char32_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char32_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char32_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <>
-class _LIBCPP_TYPE_VIS __codecvt_utf8_utf16<char16_t>
-    : public codecvt<char16_t, char, mbstate_t>
-{
-    unsigned long _Maxcode_;
-    codecvt_mode _Mode_;
-public:
-    typedef char16_t  intern_type;
-    typedef char      extern_type;
-    typedef mbstate_t state_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit __codecvt_utf8_utf16(size_t __refs, unsigned long _Maxcode,
-                            codecvt_mode _Mode)
-        : codecvt<char16_t, char, mbstate_t>(__refs), _Maxcode_(_Maxcode),
-          _Mode_(_Mode) {}
-protected:
-    virtual result
-        do_out(state_type& __st,
-               const intern_type* __frm, const intern_type* __frm_end, const intern_type*& __frm_nxt,
-               extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual result
-        do_in(state_type& __st,
-              const extern_type* __frm, const extern_type* __frm_end, const extern_type*& __frm_nxt,
-              intern_type* __to, intern_type* __to_end, intern_type*& __to_nxt) const;
-    virtual result
-        do_unshift(state_type& __st,
-                   extern_type* __to, extern_type* __to_end, extern_type*& __to_nxt) const;
-    virtual int do_encoding() const throw();
-    virtual bool do_always_noconv() const throw();
-    virtual int do_length(state_type&, const extern_type* __frm, const extern_type* __end,
-                          size_t __mx) const;
-    virtual int do_max_length() const throw();
-};
-
-template <class _Elem, unsigned long _Maxcode = 0x10ffff,
-          codecvt_mode _Mode = (codecvt_mode)0>
-class _LIBCPP_TYPE_VIS_ONLY codecvt_utf8_utf16
-    : public __codecvt_utf8_utf16<_Elem>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit codecvt_utf8_utf16(size_t __refs = 0)
-        : __codecvt_utf8_utf16<_Elem>(__refs, _Maxcode, _Mode) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    ~codecvt_utf8_utf16() {}
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CODECVT
diff --git a/include.new/c++/v1/tr1/complex b/include.new/c++/v1/tr1/complex
deleted file mode 100644
index 2943da1..0000000
--- a/include.new/c++/v1/tr1/complex
+++ /dev/null
@@ -1,1567 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- complex ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_COMPLEX
-#define _LIBCPP_COMPLEX
-
-/*
-    complex synopsis
-
-namespace std
-{
-
-template<class T>
-class complex
-{
-public:
-    typedef T value_type;
-
-    complex(const T& re = T(), const T& im = T()); // constexpr in C++14
-    complex(const complex&);  // constexpr in C++14
-    template<class X> complex(const complex<X>&);  // constexpr in C++14
-
-    T real() const; // constexpr in C++14
-    T imag() const; // constexpr in C++14
-
-    void real(T);
-    void imag(T);
-
-    complex<T>& operator= (const T&);
-    complex<T>& operator+=(const T&);
-    complex<T>& operator-=(const T&);
-    complex<T>& operator*=(const T&);
-    complex<T>& operator/=(const T&);
-
-    complex& operator=(const complex&);
-    template<class X> complex<T>& operator= (const complex<X>&);
-    template<class X> complex<T>& operator+=(const complex<X>&);
-    template<class X> complex<T>& operator-=(const complex<X>&);
-    template<class X> complex<T>& operator*=(const complex<X>&);
-    template<class X> complex<T>& operator/=(const complex<X>&);
-};
-
-template<>
-class complex<float>
-{
-public:
-    typedef float value_type;
-
-    constexpr complex(float re = 0.0f, float im = 0.0f);
-    explicit constexpr complex(const complex<double>&);
-    explicit constexpr complex(const complex<long double>&);
-
-    constexpr float real() const;
-    void real(float);
-    constexpr float imag() const;
-    void imag(float);
-
-    complex<float>& operator= (float);
-    complex<float>& operator+=(float);
-    complex<float>& operator-=(float);
-    complex<float>& operator*=(float);
-    complex<float>& operator/=(float);
-
-    complex<float>& operator=(const complex<float>&);
-    template<class X> complex<float>& operator= (const complex<X>&);
-    template<class X> complex<float>& operator+=(const complex<X>&);
-    template<class X> complex<float>& operator-=(const complex<X>&);
-    template<class X> complex<float>& operator*=(const complex<X>&);
-    template<class X> complex<float>& operator/=(const complex<X>&);
-};
-
-template<>
-class complex<double>
-{
-public:
-    typedef double value_type;
-
-    constexpr complex(double re = 0.0, double im = 0.0);
-    constexpr complex(const complex<float>&);
-    explicit constexpr complex(const complex<long double>&);
-
-    constexpr double real() const;
-    void real(double);
-    constexpr double imag() const;
-    void imag(double);
-
-    complex<double>& operator= (double);
-    complex<double>& operator+=(double);
-    complex<double>& operator-=(double);
-    complex<double>& operator*=(double);
-    complex<double>& operator/=(double);
-    complex<double>& operator=(const complex<double>&);
-
-    template<class X> complex<double>& operator= (const complex<X>&);
-    template<class X> complex<double>& operator+=(const complex<X>&);
-    template<class X> complex<double>& operator-=(const complex<X>&);
-    template<class X> complex<double>& operator*=(const complex<X>&);
-    template<class X> complex<double>& operator/=(const complex<X>&);
-};
-
-template<>
-class complex<long double>
-{
-public:
-    typedef long double value_type;
-
-    constexpr complex(long double re = 0.0L, long double im = 0.0L);
-    constexpr complex(const complex<float>&);
-    constexpr complex(const complex<double>&);
-
-    constexpr long double real() const;
-    void real(long double);
-    constexpr long double imag() const;
-    void imag(long double);
-
-    complex<long double>& operator=(const complex<long double>&);
-    complex<long double>& operator= (long double);
-    complex<long double>& operator+=(long double);
-    complex<long double>& operator-=(long double);
-    complex<long double>& operator*=(long double);
-    complex<long double>& operator/=(long double);
-
-    template<class X> complex<long double>& operator= (const complex<X>&);
-    template<class X> complex<long double>& operator+=(const complex<X>&);
-    template<class X> complex<long double>& operator-=(const complex<X>&);
-    template<class X> complex<long double>& operator*=(const complex<X>&);
-    template<class X> complex<long double>& operator/=(const complex<X>&);
-};
-
-// 26.3.6 operators:
-template<class T> complex<T> operator+(const complex<T>&, const complex<T>&);
-template<class T> complex<T> operator+(const complex<T>&, const T&);
-template<class T> complex<T> operator+(const T&, const complex<T>&);
-template<class T> complex<T> operator-(const complex<T>&, const complex<T>&);
-template<class T> complex<T> operator-(const complex<T>&, const T&);
-template<class T> complex<T> operator-(const T&, const complex<T>&);
-template<class T> complex<T> operator*(const complex<T>&, const complex<T>&);
-template<class T> complex<T> operator*(const complex<T>&, const T&);
-template<class T> complex<T> operator*(const T&, const complex<T>&);
-template<class T> complex<T> operator/(const complex<T>&, const complex<T>&);
-template<class T> complex<T> operator/(const complex<T>&, const T&);
-template<class T> complex<T> operator/(const T&, const complex<T>&);
-template<class T> complex<T> operator+(const complex<T>&);
-template<class T> complex<T> operator-(const complex<T>&);
-template<class T> bool operator==(const complex<T>&, const complex<T>&); // constexpr in C++14
-template<class T> bool operator==(const complex<T>&, const T&); // constexpr in C++14
-template<class T> bool operator==(const T&, const complex<T>&); // constexpr in C++14
-template<class T> bool operator!=(const complex<T>&, const complex<T>&); // constexpr in C++14
-template<class T> bool operator!=(const complex<T>&, const T&); // constexpr in C++14
-template<class T> bool operator!=(const T&, const complex<T>&); // constexpr in C++14
-
-template<class T, class charT, class traits>
-  basic_istream<charT, traits>&
-  operator>>(basic_istream<charT, traits>&, complex<T>&);
-template<class T, class charT, class traits>
-  basic_ostream<charT, traits>&
-  operator<<(basic_ostream<charT, traits>&, const complex<T>&);
-
-// 26.3.7 values:
-
-template<class T>              T real(const complex<T>&); // constexpr in C++14
-                     long double real(long double);       // constexpr in C++14
-                          double real(double);            // constexpr in C++14
-template<Integral T>      double real(T);                 // constexpr in C++14
-                          float  real(float);             // constexpr in C++14
-
-template<class T>              T imag(const complex<T>&); // constexpr in C++14
-                     long double imag(long double);       // constexpr in C++14
-                          double imag(double);            // constexpr in C++14
-template<Integral T>      double imag(T);                 // constexpr in C++14
-                          float  imag(float);             // constexpr in C++14
-
-template<class T> T abs(const complex<T>&);
-
-template<class T>              T arg(const complex<T>&);
-                     long double arg(long double);
-                          double arg(double);
-template<Integral T>      double arg(T);
-                          float  arg(float);
-
-template<class T>              T norm(const complex<T>&);
-                     long double norm(long double);
-                          double norm(double);
-template<Integral T>      double norm(T);
-                          float  norm(float);
-
-template<class T>      complex<T>           conj(const complex<T>&);
-                       complex<long double> conj(long double);
-                       complex<double>      conj(double);
-template<Integral T>   complex<double>      conj(T);
-                       complex<float>       conj(float);
-
-template<class T>    complex<T>           proj(const complex<T>&);
-                     complex<long double> proj(long double);
-                     complex<double>      proj(double);
-template<Integral T> complex<double>      proj(T);
-                     complex<float>       proj(float);
-
-template<class T> complex<T> polar(const T&, const T& = 0);
-
-// 26.3.8 transcendentals:
-template<class T> complex<T> acos(const complex<T>&);
-template<class T> complex<T> asin(const complex<T>&);
-template<class T> complex<T> atan(const complex<T>&);
-template<class T> complex<T> acosh(const complex<T>&);
-template<class T> complex<T> asinh(const complex<T>&);
-template<class T> complex<T> atanh(const complex<T>&);
-template<class T> complex<T> cos (const complex<T>&);
-template<class T> complex<T> cosh (const complex<T>&);
-template<class T> complex<T> exp (const complex<T>&);
-template<class T> complex<T> log (const complex<T>&);
-template<class T> complex<T> log10(const complex<T>&);
-
-template<class T> complex<T> pow(const complex<T>&, const T&);
-template<class T> complex<T> pow(const complex<T>&, const complex<T>&);
-template<class T> complex<T> pow(const T&, const complex<T>&);
-
-template<class T> complex<T> sin (const complex<T>&);
-template<class T> complex<T> sinh (const complex<T>&);
-template<class T> complex<T> sqrt (const complex<T>&);
-template<class T> complex<T> tan (const complex<T>&);
-template<class T> complex<T> tanh (const complex<T>&);
-
-template<class T, class charT, class traits>
-  basic_istream<charT, traits>&
-  operator>>(basic_istream<charT, traits>& is, complex<T>& x);
-
-template<class T, class charT, class traits>
-  basic_ostream<charT, traits>&
-  operator<<(basic_ostream<charT, traits>& o, const complex<T>& x);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <type_traits>
-#include <stdexcept>
-#include <cmath>
-#include <sstream>
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-    #include <cassert>
-#endif
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template<class _Tp> class _LIBCPP_TYPE_VIS_ONLY complex;
-
-template<class _Tp> complex<_Tp> operator*(const complex<_Tp>& __z, const complex<_Tp>& __w);
-template<class _Tp> complex<_Tp> operator/(const complex<_Tp>& __x, const complex<_Tp>& __y);
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY complex
-{
-public:
-    typedef _Tp value_type;
-private:
-    value_type __re_;
-    value_type __im_;
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    complex(const value_type& __re = value_type(), const value_type& __im = value_type())
-        : __re_(__re), __im_(__im) {}
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    complex(const complex<_Xp>& __c)
-        : __re_(__c.real()), __im_(__c.imag()) {}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 value_type real() const {return __re_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 value_type imag() const {return __im_;}
-
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
-
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (const value_type& __re)
-        {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(const value_type& __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(const value_type& __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(const value_type& __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(const value_type& __re) {__re_ /= __re; __im_ /= __re; return *this;}
-
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
-        {
-            __re_ = __c.real();
-            __im_ = __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
-        {
-            __re_ += __c.real();
-            __im_ += __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
-        {
-            __re_ -= __c.real();
-            __im_ -= __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
-        {
-            *this = *this * complex(__c.real(), __c.imag());
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
-        {
-            *this = *this / complex(__c.real(), __c.imag());
-            return *this;
-        }
-};
-
-template<> class _LIBCPP_TYPE_VIS_ONLY complex<double>;
-template<> class _LIBCPP_TYPE_VIS_ONLY complex<long double>;
-
-template<>
-class _LIBCPP_TYPE_VIS_ONLY complex<float>
-{
-    float __re_;
-    float __im_;
-public:
-    typedef float value_type;
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR complex(float __re = 0.0f, float __im = 0.0f)
-        : __re_(__re), __im_(__im) {}
-    explicit _LIBCPP_CONSTEXPR complex(const complex<double>& __c);
-    explicit _LIBCPP_CONSTEXPR complex(const complex<long double>& __c);
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR float real() const {return __re_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR float imag() const {return __im_;}
-
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
-
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (float __re)
-        {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(float __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(float __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(float __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(float __re) {__re_ /= __re; __im_ /= __re; return *this;}
-
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
-        {
-            __re_ = __c.real();
-            __im_ = __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
-        {
-            __re_ += __c.real();
-            __im_ += __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
-        {
-            __re_ -= __c.real();
-            __im_ -= __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
-        {
-            *this = *this * complex(__c.real(), __c.imag());
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
-        {
-            *this = *this / complex(__c.real(), __c.imag());
-            return *this;
-        }
-};
-
-template<>
-class _LIBCPP_TYPE_VIS_ONLY complex<double>
-{
-    double __re_;
-    double __im_;
-public:
-    typedef double value_type;
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR complex(double __re = 0.0, double __im = 0.0)
-        : __re_(__re), __im_(__im) {}
-    _LIBCPP_CONSTEXPR complex(const complex<float>& __c);
-    explicit _LIBCPP_CONSTEXPR complex(const complex<long double>& __c);
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR double real() const {return __re_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR double imag() const {return __im_;}
-
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
-
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (double __re)
-        {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(double __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(double __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(double __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(double __re) {__re_ /= __re; __im_ /= __re; return *this;}
-
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
-        {
-            __re_ = __c.real();
-            __im_ = __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
-        {
-            __re_ += __c.real();
-            __im_ += __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
-        {
-            __re_ -= __c.real();
-            __im_ -= __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
-        {
-            *this = *this * complex(__c.real(), __c.imag());
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
-        {
-            *this = *this / complex(__c.real(), __c.imag());
-            return *this;
-        }
-};
-
-template<>
-class _LIBCPP_TYPE_VIS_ONLY complex<long double>
-{
-    long double __re_;
-    long double __im_;
-public:
-    typedef long double value_type;
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR complex(long double __re = 0.0L, long double __im = 0.0L)
-        : __re_(__re), __im_(__im) {}
-    _LIBCPP_CONSTEXPR complex(const complex<float>& __c);
-    _LIBCPP_CONSTEXPR complex(const complex<double>& __c);
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR long double real() const {return __re_;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR long double imag() const {return __im_;}
-
-    _LIBCPP_INLINE_VISIBILITY void real(value_type __re) {__re_ = __re;}
-    _LIBCPP_INLINE_VISIBILITY void imag(value_type __im) {__im_ = __im;}
-
-    _LIBCPP_INLINE_VISIBILITY complex& operator= (long double __re)
-        {__re_ = __re; __im_ = value_type(); return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator+=(long double __re) {__re_ += __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator-=(long double __re) {__re_ -= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator*=(long double __re) {__re_ *= __re; __im_ *= __re; return *this;}
-    _LIBCPP_INLINE_VISIBILITY complex& operator/=(long double __re) {__re_ /= __re; __im_ /= __re; return *this;}
-
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator= (const complex<_Xp>& __c)
-        {
-            __re_ = __c.real();
-            __im_ = __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator+=(const complex<_Xp>& __c)
-        {
-            __re_ += __c.real();
-            __im_ += __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator-=(const complex<_Xp>& __c)
-        {
-            __re_ -= __c.real();
-            __im_ -= __c.imag();
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator*=(const complex<_Xp>& __c)
-        {
-            *this = *this * complex(__c.real(), __c.imag());
-            return *this;
-        }
-    template<class _Xp> _LIBCPP_INLINE_VISIBILITY complex& operator/=(const complex<_Xp>& __c)
-        {
-            *this = *this / complex(__c.real(), __c.imag());
-            return *this;
-        }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<float>::complex(const complex<double>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<float>::complex(const complex<long double>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<double>::complex(const complex<float>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<double>::complex(const complex<long double>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<long double>::complex(const complex<float>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-complex<long double>::complex(const complex<double>& __c)
-    : __re_(__c.real()), __im_(__c.imag()) {}
-
-// 26.3.6 operators:
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator+(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__x);
-    __t += __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator+(const complex<_Tp>& __x, const _Tp& __y)
-{
-    complex<_Tp> __t(__x);
-    __t += __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator+(const _Tp& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__y);
-    __t += __x;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator-(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__x);
-    __t -= __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator-(const complex<_Tp>& __x, const _Tp& __y)
-{
-    complex<_Tp> __t(__x);
-    __t -= __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator-(const _Tp& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(-__y);
-    __t += __x;
-    return __t;
-}
-
-template<class _Tp>
-complex<_Tp>
-operator*(const complex<_Tp>& __z, const complex<_Tp>& __w)
-{
-    _Tp __a = __z.real();
-    _Tp __b = __z.imag();
-    _Tp __c = __w.real();
-    _Tp __d = __w.imag();
-    _Tp __ac = __a * __c;
-    _Tp __bd = __b * __d;
-    _Tp __ad = __a * __d;
-    _Tp __bc = __b * __c;
-    _Tp __x = __ac - __bd;
-    _Tp __y = __ad + __bc;
-    if (isnan(__x) && isnan(__y))
-    {
-        bool __recalc = false;
-        if (isinf(__a) || isinf(__b))
-        {
-            __a = copysign(isinf(__a) ? _Tp(1) : _Tp(0), __a);
-            __b = copysign(isinf(__b) ? _Tp(1) : _Tp(0), __b);
-            if (isnan(__c))
-                __c = copysign(_Tp(0), __c);
-            if (isnan(__d))
-                __d = copysign(_Tp(0), __d);
-            __recalc = true;
-        }
-        if (isinf(__c) || isinf(__d))
-        {
-            __c = copysign(isinf(__c) ? _Tp(1) : _Tp(0), __c);
-            __d = copysign(isinf(__d) ? _Tp(1) : _Tp(0), __d);
-            if (isnan(__a))
-                __a = copysign(_Tp(0), __a);
-            if (isnan(__b))
-                __b = copysign(_Tp(0), __b);
-            __recalc = true;
-        }
-        if (!__recalc && (isinf(__ac) || isinf(__bd) ||
-                          isinf(__ad) || isinf(__bc)))
-        {
-            if (isnan(__a))
-                __a = copysign(_Tp(0), __a);
-            if (isnan(__b))
-                __b = copysign(_Tp(0), __b);
-            if (isnan(__c))
-                __c = copysign(_Tp(0), __c);
-            if (isnan(__d))
-                __d = copysign(_Tp(0), __d);
-            __recalc = true;
-        }
-        if (__recalc)
-        {
-            __x = _Tp(INFINITY) * (__a * __c - __b * __d);
-            __y = _Tp(INFINITY) * (__a * __d + __b * __c);
-        }
-    }
-    return complex<_Tp>(__x, __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator*(const complex<_Tp>& __x, const _Tp& __y)
-{
-    complex<_Tp> __t(__x);
-    __t *= __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator*(const _Tp& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__y);
-    __t *= __x;
-    return __t;
-}
-
-template<class _Tp>
-complex<_Tp>
-operator/(const complex<_Tp>& __z, const complex<_Tp>& __w)
-{
-    int __ilogbw = 0;
-    _Tp __a = __z.real();
-    _Tp __b = __z.imag();
-    _Tp __c = __w.real();
-    _Tp __d = __w.imag();
-    _Tp __logbw = logb(fmax(fabs(__c), fabs(__d)));
-    if (isfinite(__logbw))
-    {
-        __ilogbw = static_cast<int>(__logbw);
-        __c = scalbn(__c, -__ilogbw);
-        __d = scalbn(__d, -__ilogbw);
-    }
-    _Tp __denom = __c * __c + __d * __d;
-    _Tp __x = scalbn((__a * __c + __b * __d) / __denom, -__ilogbw);
-    _Tp __y = scalbn((__b * __c - __a * __d) / __denom, -__ilogbw);
-    if (isnan(__x) && isnan(__y))
-    {
-        if ((__denom == _Tp(0)) && (!isnan(__a) || !isnan(__b)))
-        {
-            __x = copysign(_Tp(INFINITY), __c) * __a;
-            __y = copysign(_Tp(INFINITY), __c) * __b;
-        }
-        else if ((isinf(__a) || isinf(__b)) && isfinite(__c) && isfinite(__d))
-        {
-            __a = copysign(isinf(__a) ? _Tp(1) : _Tp(0), __a);
-            __b = copysign(isinf(__b) ? _Tp(1) : _Tp(0), __b);
-            __x = _Tp(INFINITY) * (__a * __c + __b * __d);
-            __y = _Tp(INFINITY) * (__b * __c - __a * __d);
-        }
-        else if (isinf(__logbw) && __logbw > _Tp(0) && isfinite(__a) && isfinite(__b))
-        {
-            __c = copysign(isinf(__c) ? _Tp(1) : _Tp(0), __c);
-            __d = copysign(isinf(__d) ? _Tp(1) : _Tp(0), __d);
-            __x = _Tp(0) * (__a * __c + __b * __d);
-            __y = _Tp(0) * (__b * __c - __a * __d);
-        }
-    }
-    return complex<_Tp>(__x, __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator/(const complex<_Tp>& __x, const _Tp& __y)
-{
-    return complex<_Tp>(__x.real() / __y, __x.imag() / __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator/(const _Tp& __x, const complex<_Tp>& __y)
-{
-    complex<_Tp> __t(__x);
-    __t /= __y;
-    return __t;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator+(const complex<_Tp>& __x)
-{
-    return __x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-operator-(const complex<_Tp>& __x)
-{
-    return complex<_Tp>(-__x.real(), -__x.imag());
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    return __x.real() == __y.real() && __x.imag() == __y.imag();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const complex<_Tp>& __x, const _Tp& __y)
-{
-    return __x.real() == __y && __x.imag() == 0;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const _Tp& __x, const complex<_Tp>& __y)
-{
-    return __x == __y.real() && 0 == __y.imag();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    return !(__x == __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const complex<_Tp>& __x, const _Tp& __y)
-{
-    return !(__x == __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const _Tp& __x, const complex<_Tp>& __y)
-{
-    return !(__x == __y);
-}
-
-// 26.3.7 values:
-
-// real
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-real(const complex<_Tp>& __c)
-{
-    return __c.real();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-long double
-real(long double __re)
-{
-    return __re;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-double
-real(double __re)
-{
-    return __re;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    double
->::type
-real(_Tp  __re)
-{
-    return __re;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-float
-real(float  __re)
-{
-    return __re;
-}
-
-// imag
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp
-imag(const complex<_Tp>& __c)
-{
-    return __c.imag();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-long double
-imag(long double __re)
-{
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-double
-imag(double __re)
-{
-    return 0;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    double
->::type
-imag(_Tp  __re)
-{
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-float
-imag(float  __re)
-{
-    return 0;
-}
-
-// abs
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-abs(const complex<_Tp>& __c)
-{
-    return hypot(__c.real(), __c.imag());
-}
-
-// arg
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-arg(const complex<_Tp>& __c)
-{
-    return atan2(__c.imag(), __c.real());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-long double
-arg(long double __re)
-{
-    return atan2l(0.L, __re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-double
-arg(double __re)
-{
-    return atan2(0., __re);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    double
->::type
-arg(_Tp __re)
-{
-    return atan2(0., __re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-float
-arg(float __re)
-{
-    return atan2f(0.F, __re);
-}
-
-// norm
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-norm(const complex<_Tp>& __c)
-{
-    if (isinf(__c.real()))
-        return abs(__c.real());
-    if (isinf(__c.imag()))
-        return abs(__c.imag());
-    return __c.real() * __c.real() + __c.imag() * __c.imag();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-long double
-norm(long double __re)
-{
-    return __re * __re;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-double
-norm(double __re)
-{
-    return __re * __re;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    double
->::type
-norm(_Tp __re)
-{
-    return (double)__re * __re;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-float
-norm(float __re)
-{
-    return __re * __re;
-}
-
-// conj
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-conj(const complex<_Tp>& __c)
-{
-    return complex<_Tp>(__c.real(), -__c.imag());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<long double>
-conj(long double __re)
-{
-    return complex<long double>(__re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<double>
-conj(double __re)
-{
-    return complex<double>(__re);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    complex<double>
->::type
-conj(_Tp __re)
-{
-    return complex<double>(__re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<float>
-conj(float __re)
-{
-    return complex<float>(__re);
-}
-
-// proj
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-proj(const complex<_Tp>& __c)
-{
-    std::complex<_Tp> __r = __c;
-    if (isinf(__c.real()) || isinf(__c.imag()))
-        __r = complex<_Tp>(INFINITY, copysign(_Tp(0), __c.imag()));
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<long double>
-proj(long double __re)
-{
-    if (isinf(__re))
-        __re = abs(__re);
-    return complex<long double>(__re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<double>
-proj(double __re)
-{
-    if (isinf(__re))
-        __re = abs(__re);
-    return complex<double>(__re);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_integral<_Tp>::value,
-    complex<double>
->::type
-proj(_Tp __re)
-{
-    return complex<double>(__re);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-complex<float>
-proj(float __re)
-{
-    if (isinf(__re))
-        __re = abs(__re);
-    return complex<float>(__re);
-}
-
-// polar
-
-template<class _Tp>
-complex<_Tp>
-polar(const _Tp& __rho, const _Tp& __theta = _Tp(0))
-{
-    if (isnan(__rho) || signbit(__rho))
-        return complex<_Tp>(_Tp(NAN), _Tp(NAN));
-    if (isnan(__theta))
-    {
-        if (isinf(__rho))
-            return complex<_Tp>(__rho, __theta);
-        return complex<_Tp>(__theta, __theta);
-    }
-    if (isinf(__theta))
-    {
-        if (isinf(__rho))
-            return complex<_Tp>(__rho, _Tp(NAN));
-        return complex<_Tp>(_Tp(NAN), _Tp(NAN));
-    }
-    _Tp __x = __rho * cos(__theta);
-    if (isnan(__x))
-        __x = 0;
-    _Tp __y = __rho * sin(__theta);
-    if (isnan(__y))
-        __y = 0;
-    return complex<_Tp>(__x, __y);
-}
-
-// log
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-log(const complex<_Tp>& __x)
-{
-    return complex<_Tp>(log(abs(__x)), arg(__x));
-}
-
-// log10
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-log10(const complex<_Tp>& __x)
-{
-    return log(__x) / log(_Tp(10));
-}
-
-// sqrt
-
-template<class _Tp>
-complex<_Tp>
-sqrt(const complex<_Tp>& __x)
-{
-    if (isinf(__x.imag()))
-        return complex<_Tp>(_Tp(INFINITY), __x.imag());
-    if (isinf(__x.real()))
-    {
-        if (__x.real() > _Tp(0))
-            return complex<_Tp>(__x.real(), isnan(__x.imag()) ? __x.imag() : copysign(_Tp(0), __x.imag()));
-        return complex<_Tp>(isnan(__x.imag()) ? __x.imag() : _Tp(0), copysign(__x.real(), __x.imag()));
-    }
-    return polar(sqrt(abs(__x)), arg(__x) / _Tp(2));
-}
-
-// exp
-
-template<class _Tp>
-complex<_Tp>
-exp(const complex<_Tp>& __x)
-{
-    _Tp __i = __x.imag();
-    if (isinf(__x.real()))
-    {
-        if (__x.real() < _Tp(0))
-        {
-            if (!isfinite(__i))
-                __i = _Tp(1);
-        }
-        else if (__i == 0 || !isfinite(__i))
-        {
-            if (isinf(__i))
-                __i = _Tp(NAN);
-            return complex<_Tp>(__x.real(), __i);
-        }
-    }
-    else if (isnan(__x.real()) && __x.imag() == 0)
-        return __x;
-    _Tp __e = exp(__x.real());
-    return complex<_Tp>(__e * cos(__i), __e * sin(__i));
-}
-
-// pow
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-pow(const complex<_Tp>& __x, const complex<_Tp>& __y)
-{
-    return exp(__y * log(__x));
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<typename __promote<_Tp, _Up>::type>
-pow(const complex<_Tp>& __x, const complex<_Up>& __y)
-{
-    typedef complex<typename __promote<_Tp, _Up>::type> result_type;
-    return _VSTD::pow(result_type(__x), result_type(__y));
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_arithmetic<_Up>::value,
-    complex<typename __promote<_Tp, _Up>::type>
->::type
-pow(const complex<_Tp>& __x, const _Up& __y)
-{
-    typedef complex<typename __promote<_Tp, _Up>::type> result_type;
-    return _VSTD::pow(result_type(__x), result_type(__y));
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_arithmetic<_Tp>::value,
-    complex<typename __promote<_Tp, _Up>::type>
->::type
-pow(const _Tp& __x, const complex<_Up>& __y)
-{
-    typedef complex<typename __promote<_Tp, _Up>::type> result_type;
-    return _VSTD::pow(result_type(__x), result_type(__y));
-}
-
-// asinh
-
-template<class _Tp>
-complex<_Tp>
-asinh(const complex<_Tp>& __x)
-{
-    const _Tp __pi(atan2(+0., -0.));
-    if (isinf(__x.real()))
-    {
-        if (isnan(__x.imag()))
-            return __x;
-        if (isinf(__x.imag()))
-            return complex<_Tp>(__x.real(), copysign(__pi * _Tp(0.25), __x.imag()));
-        return complex<_Tp>(__x.real(), copysign(_Tp(0), __x.imag()));
-    }
-    if (isnan(__x.real()))
-    {
-        if (isinf(__x.imag()))
-            return complex<_Tp>(__x.imag(), __x.real());
-        if (__x.imag() == 0)
-            return __x;
-        return complex<_Tp>(__x.real(), __x.real());
-    }
-    if (isinf(__x.imag()))
-        return complex<_Tp>(copysign(__x.imag(), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
-    complex<_Tp> __z = log(__x + sqrt(pow(__x, _Tp(2)) + _Tp(1)));
-    return complex<_Tp>(copysign(__z.real(), __x.real()), copysign(__z.imag(), __x.imag()));
-}
-
-// acosh
-
-template<class _Tp>
-complex<_Tp>
-acosh(const complex<_Tp>& __x)
-{
-    const _Tp __pi(atan2(+0., -0.));
-    if (isinf(__x.real()))
-    {
-        if (isnan(__x.imag()))
-            return complex<_Tp>(abs(__x.real()), __x.imag());
-        if (isinf(__x.imag()))
-        {
-            if (__x.real() > 0)
-                return complex<_Tp>(__x.real(), copysign(__pi * _Tp(0.25), __x.imag()));
-            else
-                return complex<_Tp>(-__x.real(), copysign(__pi * _Tp(0.75), __x.imag()));
-        }
-        if (__x.real() < 0)
-            return complex<_Tp>(-__x.real(), copysign(__pi, __x.imag()));
-        return complex<_Tp>(__x.real(), copysign(_Tp(0), __x.imag()));
-    }
-    if (isnan(__x.real()))
-    {
-        if (isinf(__x.imag()))
-            return complex<_Tp>(abs(__x.imag()), __x.real());
-        return complex<_Tp>(__x.real(), __x.real());
-    }
-    if (isinf(__x.imag()))
-        return complex<_Tp>(abs(__x.imag()), copysign(__pi/_Tp(2), __x.imag()));
-    complex<_Tp> __z = log(__x + sqrt(pow(__x, _Tp(2)) - _Tp(1)));
-    return complex<_Tp>(copysign(__z.real(), _Tp(0)), copysign(__z.imag(), __x.imag()));
-}
-
-// atanh
-
-template<class _Tp>
-complex<_Tp>
-atanh(const complex<_Tp>& __x)
-{
-    const _Tp __pi(atan2(+0., -0.));
-    if (isinf(__x.imag()))
-    {
-        return complex<_Tp>(copysign(_Tp(0), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
-    }
-    if (isnan(__x.imag()))
-    {
-        if (isinf(__x.real()) || __x.real() == 0)
-            return complex<_Tp>(copysign(_Tp(0), __x.real()), __x.imag());
-        return complex<_Tp>(__x.imag(), __x.imag());
-    }
-    if (isnan(__x.real()))
-    {
-        return complex<_Tp>(__x.real(), __x.real());
-    }
-    if (isinf(__x.real()))
-    {
-        return complex<_Tp>(copysign(_Tp(0), __x.real()), copysign(__pi/_Tp(2), __x.imag()));
-    }
-    if (abs(__x.real()) == _Tp(1) && __x.imag() == _Tp(0))
-    {
-        return complex<_Tp>(copysign(_Tp(INFINITY), __x.real()), copysign(_Tp(0), __x.imag()));
-    }
-    complex<_Tp> __z = log((_Tp(1) + __x) / (_Tp(1) - __x)) / _Tp(2);
-    return complex<_Tp>(copysign(__z.real(), __x.real()), copysign(__z.imag(), __x.imag()));
-}
-
-// sinh
-
-template<class _Tp>
-complex<_Tp>
-sinh(const complex<_Tp>& __x)
-{
-    if (isinf(__x.real()) && !isfinite(__x.imag()))
-        return complex<_Tp>(__x.real(), _Tp(NAN));
-    if (__x.real() == 0 && !isfinite(__x.imag()))
-        return complex<_Tp>(__x.real(), _Tp(NAN));
-    if (__x.imag() == 0 && !isfinite(__x.real()))
-        return __x;
-    return complex<_Tp>(sinh(__x.real()) * cos(__x.imag()), cosh(__x.real()) * sin(__x.imag()));
-}
-
-// cosh
-
-template<class _Tp>
-complex<_Tp>
-cosh(const complex<_Tp>& __x)
-{
-    if (isinf(__x.real()) && !isfinite(__x.imag()))
-        return complex<_Tp>(abs(__x.real()), _Tp(NAN));
-    if (__x.real() == 0 && !isfinite(__x.imag()))
-        return complex<_Tp>(_Tp(NAN), __x.real());
-    if (__x.real() == 0 && __x.imag() == 0)
-        return complex<_Tp>(_Tp(1), __x.imag());
-    if (__x.imag() == 0 && !isfinite(__x.real()))
-        return complex<_Tp>(abs(__x.real()), __x.imag());
-    return complex<_Tp>(cosh(__x.real()) * cos(__x.imag()), sinh(__x.real()) * sin(__x.imag()));
-}
-
-// tanh
-
-template<class _Tp>
-complex<_Tp>
-tanh(const complex<_Tp>& __x)
-{
-    if (isinf(__x.real()))
-    {
-        if (!isfinite(__x.imag()))
-            return complex<_Tp>(_Tp(1), _Tp(0));
-        return complex<_Tp>(_Tp(1), copysign(_Tp(0), sin(_Tp(2) * __x.imag())));
-    }
-    if (isnan(__x.real()) && __x.imag() == 0)
-        return __x;
-    _Tp __2r(_Tp(2) * __x.real());
-    _Tp __2i(_Tp(2) * __x.imag());
-    _Tp __d(cosh(__2r) + cos(__2i));
-    _Tp __2rsh(sinh(__2r));
-    if (isinf(__2rsh) && isinf(__d))
-        return complex<_Tp>(__2rsh > _Tp(0) ? _Tp(1) : _Tp(-1),
-                            __2i > _Tp(0) ? _Tp(0) : _Tp(-0.));
-    return  complex<_Tp>(__2rsh/__d, sin(__2i)/__d);
-}
-
-// asin
-
-template<class _Tp>
-complex<_Tp>
-asin(const complex<_Tp>& __x)
-{
-    complex<_Tp> __z = asinh(complex<_Tp>(-__x.imag(), __x.real()));
-    return complex<_Tp>(__z.imag(), -__z.real());
-}
-
-// acos
-
-template<class _Tp>
-complex<_Tp>
-acos(const complex<_Tp>& __x)
-{
-    const _Tp __pi(atan2(+0., -0.));
-    if (isinf(__x.real()))
-    {
-        if (isnan(__x.imag()))
-            return complex<_Tp>(__x.imag(), __x.real());
-        if (isinf(__x.imag()))
-        {
-            if (__x.real() < _Tp(0))
-                return complex<_Tp>(_Tp(0.75) * __pi, -__x.imag());
-            return complex<_Tp>(_Tp(0.25) * __pi, -__x.imag());
-        }
-        if (__x.real() < _Tp(0))
-            return complex<_Tp>(__pi, signbit(__x.imag()) ? -__x.real() : __x.real());
-        return complex<_Tp>(_Tp(0), signbit(__x.imag()) ? __x.real() : -__x.real());
-    }
-    if (isnan(__x.real()))
-    {
-        if (isinf(__x.imag()))
-            return complex<_Tp>(__x.real(), -__x.imag());
-        return complex<_Tp>(__x.real(), __x.real());
-    }
-    if (isinf(__x.imag()))
-        return complex<_Tp>(__pi/_Tp(2), -__x.imag());
-    if (__x.real() == 0)
-        return complex<_Tp>(__pi/_Tp(2), -__x.imag());
-    complex<_Tp> __z = log(__x + sqrt(pow(__x, _Tp(2)) - _Tp(1)));
-    if (signbit(__x.imag()))
-        return complex<_Tp>(abs(__z.imag()), abs(__z.real()));
-    return complex<_Tp>(abs(__z.imag()), -abs(__z.real()));
-}
-
-// atan
-
-template<class _Tp>
-complex<_Tp>
-atan(const complex<_Tp>& __x)
-{
-    complex<_Tp> __z = atanh(complex<_Tp>(-__x.imag(), __x.real()));
-    return complex<_Tp>(__z.imag(), -__z.real());
-}
-
-// sin
-
-template<class _Tp>
-complex<_Tp>
-sin(const complex<_Tp>& __x)
-{
-    complex<_Tp> __z = sinh(complex<_Tp>(-__x.imag(), __x.real()));
-    return complex<_Tp>(__z.imag(), -__z.real());
-}
-
-// cos
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-complex<_Tp>
-cos(const complex<_Tp>& __x)
-{
-    return cosh(complex<_Tp>(-__x.imag(), __x.real()));
-}
-
-// tan
-
-template<class _Tp>
-complex<_Tp>
-tan(const complex<_Tp>& __x)
-{
-    complex<_Tp> __z = tanh(complex<_Tp>(-__x.imag(), __x.real()));
-    return complex<_Tp>(__z.imag(), -__z.real());
-}
-
-template<class _Tp, class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, complex<_Tp>& __x)
-{
-    if (__is.good())
-    {
-        ws(__is);
-        if (__is.peek() == _CharT('('))
-        {
-            __is.get();
-            _Tp __r;
-            __is >> __r;
-            if (!__is.fail())
-            {
-                ws(__is);
-                _CharT __c = __is.peek();
-                if (__c == _CharT(','))
-                {
-                    __is.get();
-                    _Tp __i;
-                    __is >> __i;
-                    if (!__is.fail())
-                    {
-                        ws(__is);
-                        __c = __is.peek();
-                        if (__c == _CharT(')'))
-                        {
-                            __is.get();
-                            __x = complex<_Tp>(__r, __i);
-                        }
-                        else
-                            __is.setstate(ios_base::failbit);
-                    }
-                    else
-                        __is.setstate(ios_base::failbit);
-                }
-                else if (__c == _CharT(')'))
-                {
-                    __is.get();
-                    __x = complex<_Tp>(__r, _Tp(0));
-                }
-                else
-                    __is.setstate(ios_base::failbit);
-            }
-            else
-                __is.setstate(ios_base::failbit);
-        }
-        else
-        {
-            _Tp __r;
-            __is >> __r;
-            if (!__is.fail())
-                __x = complex<_Tp>(__r, _Tp(0));
-            else
-                __is.setstate(ios_base::failbit);
-        }
-    }
-    else
-        __is.setstate(ios_base::failbit);
-    return __is;
-}
-
-template<class _Tp, class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const complex<_Tp>& __x)
-{
-    basic_ostringstream<_CharT, _Traits> __s;
-    __s.flags(__os.flags());
-    __s.imbue(__os.getloc());
-    __s.precision(__os.precision());
-    __s << '(' << __x.real() << ',' << __x.imag() << ')';
-    return __os << __s.str();
-}
-
-#if _LIBCPP_STD_VER > 11 
-// Literal suffix for complex number literals [complex.literals]
-inline namespace literals
-{ 
-  inline namespace complex_literals
-  {
-    constexpr complex<long double> operator""il(long double __im)
-    {
-        return { 0.0l, __im };
-    }
-
-    constexpr complex<long double> operator""il(unsigned long long __im)
-    {
-        return { 0.0l, static_cast<long double>(__im) };
-    }
-
-
-    constexpr complex<double> operator""i(long double __im)
-    {
-        return { 0.0, static_cast<double>(__im) };
-    }
-
-    constexpr complex<double> operator""i(unsigned long long __im)
-    {
-        return { 0.0, static_cast<double>(__im) };
-    }
-
-
-    constexpr complex<float> operator""if(long double __im)
-    {
-        return { 0.0f, static_cast<float>(__im) };
-    }
-
-    constexpr complex<float> operator""if(unsigned long long __im)
-    {
-        return { 0.0f, static_cast<float>(__im) };
-    }
-  }
-}
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_COMPLEX
diff --git a/include.new/c++/v1/tr1/complex.h b/include.new/c++/v1/tr1/complex.h
deleted file mode 100644
index 7003d31..0000000
--- a/include.new/c++/v1/tr1/complex.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- complex.h --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_COMPLEX_H
-#define _LIBCPP_COMPLEX_H
-
-/*
-    complex.h synopsis
-
-#include <ccomplex>
-
-*/
-
-#ifdef __cplusplus
-
-#include <ccomplex>
-
-#else  // __cplusplus
-
-#include_next <complex.h>
-
-#endif  // __cplusplus
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_COMPLEX_H
diff --git a/include.new/c++/v1/tr1/condition_variable b/include.new/c++/v1/tr1/condition_variable
deleted file mode 100644
index 1af2484..0000000
--- a/include.new/c++/v1/tr1/condition_variable
+++ /dev/null
@@ -1,260 +0,0 @@
-// -*- C++ -*-
-//===---------------------- condition_variable ----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CONDITION_VARIABLE
-#define _LIBCPP_CONDITION_VARIABLE
-
-/*
-    condition_variable synopsis
-
-namespace std
-{
-
-enum class cv_status { no_timeout, timeout };
-
-class condition_variable
-{
-public:
-    condition_variable();
-    ~condition_variable();
-
-    condition_variable(const condition_variable&) = delete;
-    condition_variable& operator=(const condition_variable&) = delete;
-
-    void notify_one() noexcept;
-    void notify_all() noexcept;
-
-    void wait(unique_lock<mutex>& lock);
-    template <class Predicate>
-        void wait(unique_lock<mutex>& lock, Predicate pred);
-
-    template <class Clock, class Duration>
-        cv_status
-        wait_until(unique_lock<mutex>& lock,
-                   const chrono::time_point<Clock, Duration>& abs_time);
-
-    template <class Clock, class Duration, class Predicate>
-        bool
-        wait_until(unique_lock<mutex>& lock,
-                   const chrono::time_point<Clock, Duration>& abs_time,
-                   Predicate pred);
-
-    template <class Rep, class Period>
-        cv_status
-        wait_for(unique_lock<mutex>& lock,
-                 const chrono::duration<Rep, Period>& rel_time);
-
-    template <class Rep, class Period, class Predicate>
-        bool
-        wait_for(unique_lock<mutex>& lock,
-                 const chrono::duration<Rep, Period>& rel_time,
-                 Predicate pred);
-
-    typedef pthread_cond_t* native_handle_type;
-    native_handle_type native_handle();
-};
-
-void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk);
-
-class condition_variable_any
-{
-public:
-    condition_variable_any();
-    ~condition_variable_any();
-
-    condition_variable_any(const condition_variable_any&) = delete;
-    condition_variable_any& operator=(const condition_variable_any&) = delete;
-
-    void notify_one() noexcept;
-    void notify_all() noexcept;
-
-    template <class Lock>
-        void wait(Lock& lock);
-    template <class Lock, class Predicate>
-        void wait(Lock& lock, Predicate pred);
-
-    template <class Lock, class Clock, class Duration>
-        cv_status
-        wait_until(Lock& lock,
-                   const chrono::time_point<Clock, Duration>& abs_time);
-
-    template <class Lock, class Clock, class Duration, class Predicate>
-        bool
-        wait_until(Lock& lock,
-                   const chrono::time_point<Clock, Duration>& abs_time,
-                   Predicate pred);
-
-    template <class Lock, class Rep, class Period>
-        cv_status
-        wait_for(Lock& lock,
-                 const chrono::duration<Rep, Period>& rel_time);
-
-    template <class Lock, class Rep, class Period, class Predicate>
-        bool
-        wait_for(Lock& lock,
-                 const chrono::duration<Rep, Period>& rel_time,
-                 Predicate pred);
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__mutex_base>
-#include <memory>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifndef _LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS condition_variable_any
-{
-    condition_variable __cv_;
-    shared_ptr<mutex>  __mut_;
-public:
-    condition_variable_any();
-
-    void notify_one() _NOEXCEPT;
-    void notify_all() _NOEXCEPT;
-
-    template <class _Lock>
-        void wait(_Lock& __lock);
-    template <class _Lock, class _Predicate>
-        void wait(_Lock& __lock, _Predicate __pred);
-
-    template <class _Lock, class _Clock, class _Duration>
-        cv_status
-        wait_until(_Lock& __lock,
-                   const chrono::time_point<_Clock, _Duration>& __t);
-
-    template <class _Lock, class _Clock, class _Duration, class _Predicate>
-        bool
-        wait_until(_Lock& __lock,
-                   const chrono::time_point<_Clock, _Duration>& __t,
-                   _Predicate __pred);
-
-    template <class _Lock, class _Rep, class _Period>
-        cv_status
-        wait_for(_Lock& __lock,
-                 const chrono::duration<_Rep, _Period>& __d);
-
-    template <class _Lock, class _Rep, class _Period, class _Predicate>
-        bool
-        wait_for(_Lock& __lock,
-                 const chrono::duration<_Rep, _Period>& __d,
-                 _Predicate __pred);
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-condition_variable_any::condition_variable_any()
-    : __mut_(make_shared<mutex>()) {}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-condition_variable_any::notify_one() _NOEXCEPT
-{
-    {lock_guard<mutex> __lx(*__mut_);}
-    __cv_.notify_one();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-condition_variable_any::notify_all() _NOEXCEPT
-{
-    {lock_guard<mutex> __lx(*__mut_);}
-    __cv_.notify_all();
-}
-
-struct __lock_external
-{
-    template <class _Lock>
-    void operator()(_Lock* __m) {__m->lock();}
-};
-
-template <class _Lock>
-void
-condition_variable_any::wait(_Lock& __lock)
-{
-    shared_ptr<mutex> __mut = __mut_;
-    unique_lock<mutex> __lk(*__mut);
-    __lock.unlock();
-    unique_ptr<_Lock, __lock_external> __lxx(&__lock);
-    lock_guard<unique_lock<mutex> > __lx(__lk, adopt_lock);
-    __cv_.wait(__lk);
-}  // __mut_.unlock(), __lock.lock()
-
-template <class _Lock, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-condition_variable_any::wait(_Lock& __lock, _Predicate __pred)
-{
-    while (!__pred())
-        wait(__lock);
-}
-
-template <class _Lock, class _Clock, class _Duration>
-cv_status
-condition_variable_any::wait_until(_Lock& __lock,
-                                   const chrono::time_point<_Clock, _Duration>& __t)
-{
-    shared_ptr<mutex> __mut = __mut_;
-    unique_lock<mutex> __lk(*__mut);
-    __lock.unlock();
-    unique_ptr<_Lock, __lock_external> __lxx(&__lock);
-    lock_guard<unique_lock<mutex> > __lx(__lk, adopt_lock);
-    return __cv_.wait_until(__lk, __t);
-}  // __mut_.unlock(), __lock.lock()
-
-template <class _Lock, class _Clock, class _Duration, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-condition_variable_any::wait_until(_Lock& __lock,
-                                   const chrono::time_point<_Clock, _Duration>& __t,
-                                   _Predicate __pred)
-{
-    while (!__pred())
-        if (wait_until(__lock, __t) == cv_status::timeout)
-            return __pred();
-    return true;
-}
-
-template <class _Lock, class _Rep, class _Period>
-inline _LIBCPP_INLINE_VISIBILITY
-cv_status
-condition_variable_any::wait_for(_Lock& __lock,
-                                 const chrono::duration<_Rep, _Period>& __d)
-{
-    return wait_until(__lock, chrono::steady_clock::now() + __d);
-}
-
-template <class _Lock, class _Rep, class _Period, class _Predicate>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-condition_variable_any::wait_for(_Lock& __lock,
-                                 const chrono::duration<_Rep, _Period>& __d,
-                                 _Predicate __pred)
-{
-    return wait_until(__lock, chrono::steady_clock::now() + __d,
-                      _VSTD::move(__pred));
-}
-
-_LIBCPP_FUNC_VIS
-void notify_all_at_thread_exit(condition_variable& cond, unique_lock<mutex> lk);
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_CONDITION_VARIABLE
diff --git a/include.new/c++/v1/tr1/csetjmp b/include.new/c++/v1/tr1/csetjmp
deleted file mode 100644
index d0b2c07..0000000
--- a/include.new/c++/v1/tr1/csetjmp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- csetjmp ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSETJMP
-#define _LIBCPP_CSETJMP
-
-/*
-    csetjmp synopsis
-
-Macros:
-
-    setjmp
-
-namespace std
-{
-
-Types:
-
-    jmp_buf
-
-void longjmp(jmp_buf env, int val);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <setjmp.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifndef setjmp
-#define setjmp(env) setjmp(env)
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::jmp_buf;
-using ::longjmp;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSETJMP
diff --git a/include.new/c++/v1/tr1/csignal b/include.new/c++/v1/tr1/csignal
deleted file mode 100644
index 9728266..0000000
--- a/include.new/c++/v1/tr1/csignal
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- csignal ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSIGNAL
-#define _LIBCPP_CSIGNAL
-
-/*
-    csignal synopsis
-
-Macros:
-
-    SIG_DFL
-    SIG_ERR
-    SIG_IGN
-    SIGABRT
-    SIGFPE
-    SIGILL
-    SIGINT
-    SIGSEGV
-    SIGTERM
-
-namespace std
-{
-
-Types:
-
-    sig_atomic_t
-
-void (*signal(int sig, void (*func)(int)))(int);
-int raise(int sig);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <signal.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::sig_atomic_t;
-using ::signal;
-using ::raise;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSIGNAL
diff --git a/include.new/c++/v1/tr1/cstdarg b/include.new/c++/v1/tr1/cstdarg
deleted file mode 100644
index c8b6999..0000000
--- a/include.new/c++/v1/tr1/cstdarg
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstdarg ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDARG
-#define _LIBCPP_CSTDARG
-
-/*
-    cstdarg synopsis
-
-Macros:
-
-    type va_arg(va_list ap, type);
-    void va_copy(va_list dest, va_list src);  // C99
-    void va_end(va_list ap);
-    void va_start(va_list ap, parmN);
-
-namespace std
-{
-
-Types:
-
-    va_list
-
-}  // std
-
-*/
-
-#include <__config>
-#include <stdarg.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::va_list;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTDARG
diff --git a/include.new/c++/v1/tr1/cstdbool b/include.new/c++/v1/tr1/cstdbool
deleted file mode 100644
index 2c764a6..0000000
--- a/include.new/c++/v1/tr1/cstdbool
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstdbool ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDBOOL
-#define _LIBCPP_CSTDBOOL
-
-/*
-    cstdbool synopsis
-
-Macros:
-
-    __bool_true_false_are_defined
-
-*/
-
-#include <__config>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#undef __bool_true_false_are_defined
-#define __bool_true_false_are_defined 1
-
-#endif  // _LIBCPP_CSTDBOOL
diff --git a/include.new/c++/v1/tr1/cstddef b/include.new/c++/v1/tr1/cstddef
deleted file mode 100644
index c3ca64a..0000000
--- a/include.new/c++/v1/tr1/cstddef
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstddef ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDDEF
-#define _LIBCPP_CSTDDEF
-
-/*
-    cstddef synopsis
-
-Macros:
-
-    offsetof(type,member-designator)
-    NULL
-
-namespace std
-{
-
-Types:
-
-    ptrdiff_t
-    size_t
-    max_align_t
-    nullptr_t
-
-}  // std
-
-*/
-
-#include <__config>
-
-#include <stddef.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::ptrdiff_t;
-using ::size_t;
-
-#if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T)
-// Re-use the compiler's <stddef.h> max_align_t where possible.
-using ::max_align_t;
-#else
-typedef long double max_align_t;
-#endif
-
-#ifdef _LIBCPP_HAS_NO_NULLPTR
-
-struct _LIBCPP_TYPE_VIS_ONLY nullptr_t
-{
-    void* __lx;
-
-    struct __nat {int __for_bool_;};
-
-    _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t() : __lx(0) {}
-    _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t(int __nat::*) : __lx(0) {}
-
-    _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR operator int __nat::*() const {return 0;}
-
-    template <class _Tp>
-        _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR
-        operator _Tp* () const {return 0;}
-
-    template <class _Tp, class _Up>
-        _LIBCPP_ALWAYS_INLINE
-        operator _Tp _Up::* () const {return 0;}
-
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator==(nullptr_t, nullptr_t) {return true;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator!=(nullptr_t, nullptr_t) {return false;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator<(nullptr_t, nullptr_t) {return false;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator<=(nullptr_t, nullptr_t) {return true;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator>(nullptr_t, nullptr_t) {return false;}
-    friend _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR bool operator>=(nullptr_t, nullptr_t) {return true;}
-};
-
-inline _LIBCPP_ALWAYS_INLINE _LIBCPP_CONSTEXPR nullptr_t __get_nullptr_t() {return nullptr_t(0);}
-
-#define nullptr _VSTD::__get_nullptr_t()
-
-#endif  // _LIBCPP_HAS_NO_NULLPTR
-
-_LIBCPP_END_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_NULLPTR
-
-namespace std
-{
-    typedef decltype(nullptr) nullptr_t;
-}
-
-#endif  // _LIBCPP_HAS_NO_NULLPTR
-
-#endif  // _LIBCPP_CSTDDEF
diff --git a/include.new/c++/v1/tr1/cstdint b/include.new/c++/v1/tr1/cstdint
deleted file mode 100644
index 7a187d3..0000000
--- a/include.new/c++/v1/tr1/cstdint
+++ /dev/null
@@ -1,191 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstdint ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDINT
-#define _LIBCPP_CSTDINT
-
-/*
-    cstdint synopsis
-
-Macros:
-
-    INT8_MIN
-    INT16_MIN
-    INT32_MIN
-    INT64_MIN
-
-    INT8_MAX
-    INT16_MAX
-    INT32_MAX
-    INT64_MAX
-
-    UINT8_MAX
-    UINT16_MAX
-    UINT32_MAX
-    UINT64_MAX
-
-    INT_LEAST8_MIN
-    INT_LEAST16_MIN
-    INT_LEAST32_MIN
-    INT_LEAST64_MIN
-
-    INT_LEAST8_MAX
-    INT_LEAST16_MAX
-    INT_LEAST32_MAX
-    INT_LEAST64_MAX
-
-    UINT_LEAST8_MAX
-    UINT_LEAST16_MAX
-    UINT_LEAST32_MAX
-    UINT_LEAST64_MAX
-
-    INT_FAST8_MIN
-    INT_FAST16_MIN
-    INT_FAST32_MIN
-    INT_FAST64_MIN
-
-    INT_FAST8_MAX
-    INT_FAST16_MAX
-    INT_FAST32_MAX
-    INT_FAST64_MAX
-
-    UINT_FAST8_MAX
-    UINT_FAST16_MAX
-    UINT_FAST32_MAX
-    UINT_FAST64_MAX
-
-    INTPTR_MIN
-    INTPTR_MAX
-    UINTPTR_MAX
-
-    INTMAX_MIN
-    INTMAX_MAX
-
-    UINTMAX_MAX
-
-    PTRDIFF_MIN
-    PTRDIFF_MAX
-
-    SIG_ATOMIC_MIN
-    SIG_ATOMIC_MAX
-
-    SIZE_MAX
-
-    WCHAR_MIN
-    WCHAR_MAX
-
-    WINT_MIN
-    WINT_MAX
-
-    INT8_C(value)
-    INT16_C(value)
-    INT32_C(value)
-    INT64_C(value)
-
-    UINT8_C(value)
-    UINT16_C(value)
-    UINT32_C(value)
-    UINT64_C(value)
-
-    INTMAX_C(value)
-    UINTMAX_C(value)
-
-namespace std
-{
-
-Types:
-
-    int8_t
-    int16_t
-    int32_t
-    int64_t
-
-    uint8_t
-    uint16_t
-    uint32_t
-    uint64_t
-
-    int_least8_t
-    int_least16_t
-    int_least32_t
-    int_least64_t
-
-    uint_least8_t
-    uint_least16_t
-    uint_least32_t
-    uint_least64_t
-
-    int_fast8_t
-    int_fast16_t
-    int_fast32_t
-    int_fast64_t
-
-    uint_fast8_t
-    uint_fast16_t
-    uint_fast32_t
-    uint_fast64_t
-
-    intptr_t
-    uintptr_t
-
-    intmax_t
-    uintmax_t
-
-}  // std
-*/
-
-#include <__config>
-#include <stdint.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using::int8_t;
-using::int16_t;
-using::int32_t;
-using::int64_t;
-
-using::uint8_t;
-using::uint16_t;
-using::uint32_t;
-using::uint64_t;
-
-using::int_least8_t;
-using::int_least16_t;
-using::int_least32_t;
-using::int_least64_t;
-
-using::uint_least8_t;
-using::uint_least16_t;
-using::uint_least32_t;
-using::uint_least64_t;
-
-using::int_fast8_t;
-using::int_fast16_t;
-using::int_fast32_t;
-using::int_fast64_t;
-
-using::uint_fast8_t;
-using::uint_fast16_t;
-using::uint_fast32_t;
-using::uint_fast64_t;
-
-using::intptr_t;
-using::uintptr_t;
-
-using::intmax_t;
-using::uintmax_t;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTDINT
diff --git a/include.new/c++/v1/tr1/cstdio b/include.new/c++/v1/tr1/cstdio
deleted file mode 100644
index ce3af4d..0000000
--- a/include.new/c++/v1/tr1/cstdio
+++ /dev/null
@@ -1,182 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- cstdio ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDIO
-#define _LIBCPP_CSTDIO
-
-/*
-    cstdio synopsis
-
-Macros:
-
-    BUFSIZ
-    EOF
-    FILENAME_MAX
-    FOPEN_MAX
-    L_tmpnam
-    NULL
-    SEEK_CUR
-    SEEK_END
-    SEEK_SET
-    TMP_MAX
-    _IOFBF
-    _IOLBF
-    _IONBF
-    stderr
-    stdin
-    stdout
-
-namespace std
-{
-
-Types:
-
-FILE
-fpos_t
-size_t
-
-int remove(const char* filename);
-int rename(const char* old, const char* new);
-FILE* tmpfile(void);
-char* tmpnam(char* s);
-int fclose(FILE* stream);
-int fflush(FILE* stream);
-FILE* fopen(const char* restrict filename, const char* restrict mode);
-FILE* freopen(const char* restrict filename, const char * restrict mode,
-              FILE * restrict stream);
-void setbuf(FILE* restrict stream, char* restrict buf);
-int setvbuf(FILE* restrict stream, char* restrict buf, int mode, size_t size);
-int fprintf(FILE* restrict stream, const char* restrict format, ...);
-int fscanf(FILE* restrict stream, const char * restrict format, ...);
-int printf(const char* restrict format, ...);
-int scanf(const char* restrict format, ...);
-int snprintf(char* restrict s, size_t n, const char* restrict format, ...);    // C99
-int sprintf(char* restrict s, const char* restrict format, ...);
-int sscanf(const char* restrict s, const char* restrict format, ...);
-int vfprintf(FILE* restrict stream, const char* restrict format, va_list arg);
-int vfscanf(FILE* restrict stream, const char* restrict format, va_list arg);  // C99
-int vprintf(const char* restrict format, va_list arg);
-int vscanf(const char* restrict format, va_list arg);                          // C99
-int vsnprintf(char* restrict s, size_t n, const char* restrict format,         // C99
-              va_list arg);
-int vsprintf(char* restrict s, const char* restrict format, va_list arg);
-int vsscanf(const char* restrict s, const char* restrict format, va_list arg); // C99
-int fgetc(FILE* stream);
-char* fgets(char* restrict s, int n, FILE* restrict stream);
-int fputc(int c, FILE* stream);
-int fputs(const char* restrict s, FILE* restrict stream);
-int getc(FILE* stream);
-int getchar(void);
-char* gets(char* s);  // removed in C++14
-int putc(int c, FILE* stream);
-int putchar(int c);
-int puts(const char* s);
-int ungetc(int c, FILE* stream);
-size_t fread(void* restrict ptr, size_t size, size_t nmemb,
-             FILE* restrict stream);
-size_t fwrite(const void* restrict ptr, size_t size, size_t nmemb,
-              FILE* restrict stream);
-int fgetpos(FILE* restrict stream, fpos_t* restrict pos);
-int fseek(FILE* stream, long offset, int whence);
-int fsetpos(FILE*stream, const fpos_t* pos);
-long ftell(FILE* stream);
-void rewind(FILE* stream);
-void clearerr(FILE* stream);
-int feof(FILE* stream);
-int ferror(FILE* stream);
-void perror(const char* s);
-
-}  // std
-*/
-
-#include <__config>
-#include <stdio.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-// snprintf
-#if defined(_LIBCPP_MSVCRT)
-#include "support/win32/support.h"
-#endif
-
-#ifdef getc
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_getc(FILE* __stream) {return getc(__stream);}
-#undef getc
-inline _LIBCPP_INLINE_VISIBILITY int getc(FILE* __stream) {return __libcpp_getc(__stream);}
-#endif  // getc
-
-#ifdef putc
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_putc(int __c, FILE* __stream) {return putc(__c, __stream);}
-#undef putc
-inline _LIBCPP_INLINE_VISIBILITY int putc(int __c, FILE* __stream) {return __libcpp_putc(__c, __stream);}
-#endif  // putc
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::FILE;
-using ::fpos_t;
-using ::size_t;
-
-using ::remove;
-using ::rename;
-using ::tmpfile;
-using ::tmpnam;
-using ::fclose;
-using ::fflush;
-using ::fopen;
-using ::freopen;
-using ::setbuf;
-using ::setvbuf;
-using ::fprintf;
-using ::fscanf;
-using ::printf;
-using ::scanf;
-using ::snprintf;
-using ::sprintf;
-using ::sscanf;
-#ifndef _LIBCPP_MSVCRT
-using ::vfprintf;
-using ::vfscanf;
-using ::vscanf;
-using ::vsscanf;
-#endif // _LIBCPP_MSVCRT
-using ::vprintf;
-using ::vsnprintf;
-using ::vsprintf;
-using ::fgetc;
-using ::fgets;
-using ::fputc;
-using ::fputs;
-using ::getc;
-using ::getchar;
-#if _LIBCPP_STD_VER <= 11
-using ::gets;
-#endif
-using ::putc;
-using ::putchar;
-using ::puts;
-using ::ungetc;
-using ::fread;
-using ::fwrite;
-using ::fgetpos;
-using ::fseek;
-using ::fsetpos;
-using ::ftell;
-using ::rewind;
-using ::clearerr;
-using ::feof;
-using ::ferror;
-using ::perror;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTDIO
diff --git a/include.new/c++/v1/tr1/cstdlib b/include.new/c++/v1/tr1/cstdlib
deleted file mode 100644
index 152b891..0000000
--- a/include.new/c++/v1/tr1/cstdlib
+++ /dev/null
@@ -1,172 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstdlib ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTDLIB
-#define _LIBCPP_CSTDLIB
-
-/*
-    cstdlib synopsis
-
-Macros:
-
-    EXIT_FAILURE
-    EXIT_SUCCESS
-    MB_CUR_MAX
-    NULL
-    RAND_MAX
-
-namespace std
-{
-
-Types:
-
-    size_t
-    div_t
-    ldiv_t
-    lldiv_t                                                               // C99
-
-double    atof (const char* nptr);
-int       atoi (const char* nptr);
-long      atol (const char* nptr);
-long long atoll(const char* nptr);                                        // C99
-double             strtod  (const char* restrict nptr, char** restrict endptr);
-float              strtof  (const char* restrict nptr, char** restrict endptr); // C99
-long double        strtold (const char* restrict nptr, char** restrict endptr); // C99
-long               strtol  (const char* restrict nptr, char** restrict endptr, int base);
-long long          strtoll (const char* restrict nptr, char** restrict endptr, int base); // C99
-unsigned long      strtoul (const char* restrict nptr, char** restrict endptr, int base);
-unsigned long long strtoull(const char* restrict nptr, char** restrict endptr, int base); // C99
-int rand(void);
-void srand(unsigned int seed);
-void* calloc(size_t nmemb, size_t size);
-void free(void* ptr);
-void* malloc(size_t size);
-void* realloc(void* ptr, size_t size);
-void abort(void);
-int atexit(void (*func)(void));
-void exit(int status);
-void _Exit(int status);
-char* getenv(const char* name);
-int system(const char* string);
-void* bsearch(const void* key, const void* base, size_t nmemb, size_t size,
-              int (*compar)(const void *, const void *));
-void qsort(void* base, size_t nmemb, size_t size,
-           int (*compar)(const void *, const void *));
-int         abs(      int j);
-long        abs(     long j);
-long long   abs(long long j);                                             // C++0X
-long       labs(     long j);
-long long llabs(long long j);                                             // C99
-div_t     div(      int numer,       int denom);
-ldiv_t    div(     long numer,      long denom);
-lldiv_t   div(long long numer, long long denom);                          // C++0X
-ldiv_t   ldiv(     long numer,      long denom);
-lldiv_t lldiv(long long numer, long long denom);                          // C99
-int mblen(const char* s, size_t n);
-int mbtowc(wchar_t* restrict pwc, const char* restrict s, size_t n);
-int wctomb(char* s, wchar_t wchar);
-size_t mbstowcs(wchar_t* restrict pwcs, const char* restrict s, size_t n);
-size_t wcstombs(char* restrict s, const wchar_t* restrict pwcs, size_t n);
-int at_quick_exit(void (*func)(void))                                     // C++11
-void quick_exit(int status);                                              // C++11
-void *aligned_alloc(size_t alignment, size_t size);                       // C11
-
-}  // std
-
-*/
-
-#include <__config>
-#include <stdlib.h>
-#ifdef _LIBCPP_MSVCRT
-#include "support/win32/locale_win32.h"
-#endif // _LIBCPP_MSVCRT
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::size_t;
-using ::div_t;
-using ::ldiv_t;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::lldiv_t;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::atof;
-using ::atoi;
-using ::atol;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::atoll;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::strtod;
-using ::strtof;
-using ::strtold;
-using ::strtol;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::strtoll;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::strtoul;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::strtoull;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::rand;
-using ::srand;
-using ::calloc;
-using ::free;
-using ::malloc;
-using ::realloc;
-using ::abort;
-using ::atexit;
-using ::exit;
-using ::_Exit;
-using ::getenv;
-using ::system;
-using ::bsearch;
-using ::qsort;
-using ::abs;
-using ::labs;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::llabs;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::div;
-using ::ldiv;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::lldiv;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::mblen;
-using ::mbtowc;
-using ::wctomb;
-using ::mbstowcs;
-using ::wcstombs;
-#ifdef _LIBCPP_HAS_QUICK_EXIT
-using ::at_quick_exit;
-using ::quick_exit;
-#endif
-#ifdef _LIBCPP_HAS_C11_FEATURES
-using ::aligned_alloc;
-#endif
-
-// MSVCRT already has the correct prototype in <stdlib.h> #ifdef __cplusplus
-#if !defined(_LIBCPP_MSVCRT) && !defined(__sun__) && !defined(_AIX)
-inline _LIBCPP_INLINE_VISIBILITY long      abs(     long __x) _NOEXCEPT {return  labs(__x);}
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-inline _LIBCPP_INLINE_VISIBILITY long long abs(long long __x) _NOEXCEPT {return llabs(__x);}
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-
-inline _LIBCPP_INLINE_VISIBILITY  ldiv_t div(     long __x,      long __y) _NOEXCEPT {return  ldiv(__x, __y);}
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-inline _LIBCPP_INLINE_VISIBILITY lldiv_t div(long long __x, long long __y) _NOEXCEPT {return lldiv(__x, __y);}
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-#endif // _LIBCPP_MSVCRT
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTDLIB
diff --git a/include.new/c++/v1/tr1/cstring b/include.new/c++/v1/tr1/cstring
deleted file mode 100644
index 21c9155..0000000
--- a/include.new/c++/v1/tr1/cstring
+++ /dev/null
@@ -1,112 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cstring ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CSTRING
-#define _LIBCPP_CSTRING
-
-/*
-    cstring synopsis
-
-Macros:
-
-    NULL
-
-namespace std
-{
-
-Types:
-
-    size_t
-
-void* memcpy(void* restrict s1, const void* restrict s2, size_t n);
-void* memmove(void* s1, const void* s2, size_t n);
-char* strcpy (char* restrict s1, const char* restrict s2);
-char* strncpy(char* restrict s1, const char* restrict s2, size_t n);
-char* strcat (char* restrict s1, const char* restrict s2);
-char* strncat(char* restrict s1, const char* restrict s2, size_t n);
-int memcmp(const void* s1, const void* s2, size_t n);
-int strcmp (const char* s1, const char* s2);
-int strncmp(const char* s1, const char* s2, size_t n);
-int strcoll(const char* s1, const char* s2);
-size_t strxfrm(char* restrict s1, const char* restrict s2, size_t n);
-const void* memchr(const void* s, int c, size_t n);
-      void* memchr(      void* s, int c, size_t n);
-const char* strchr(const char* s, int c);
-      char* strchr(      char* s, int c);
-size_t strcspn(const char* s1, const char* s2);
-const char* strpbrk(const char* s1, const char* s2);
-      char* strpbrk(      char* s1, const char* s2);
-const char* strrchr(const char* s, int c);
-      char* strrchr(      char* s, int c);
-size_t strspn(const char* s1, const char* s2);
-const char* strstr(const char* s1, const char* s2);
-      char* strstr(      char* s1, const char* s2);
-char* strtok(char* restrict s1, const char* restrict s2);
-void* memset(void* s, int c, size_t n);
-char* strerror(int errnum);
-size_t strlen(const char* s);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <string.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::size_t;
-using ::memcpy;
-using ::memmove;
-using ::strcpy;
-using ::strncpy;
-using ::strcat;
-using ::strncat;
-using ::memcmp;
-using ::strcmp;
-using ::strncmp;
-using ::strcoll;
-using ::strxfrm;
-
-using ::memchr;
-
-using ::strchr;
-
-using ::strcspn;
-
-using ::strpbrk;
-
-using ::strrchr;
-
-using ::strspn;
-
-using ::strstr;
-
-// MSVCRT, GNU libc and its derivates already have the correct prototype in <string.h> #ifdef __cplusplus
-#if !defined(__GLIBC__) && !defined(_LIBCPP_MSVCRT) && !defined(__sun__) && !defined(_STRING_H_CPLUSPLUS_98_CONFORMANCE_)
-inline _LIBCPP_INLINE_VISIBILITY       char* strchr(      char* __s, int __c) {return ::strchr(__s, __c);}
-inline _LIBCPP_INLINE_VISIBILITY       char* strpbrk(      char* __s1, const char* __s2) {return ::strpbrk(__s1, __s2);}
-inline _LIBCPP_INLINE_VISIBILITY       char* strrchr(      char* __s, int __c) {return ::strrchr(__s, __c);}
-inline _LIBCPP_INLINE_VISIBILITY       void* memchr(      void* __s, int __c, size_t __n) {return ::memchr(__s, __c, __n);}
-inline _LIBCPP_INLINE_VISIBILITY       char* strstr(      char* __s1, const char* __s2) {return ::strstr(__s1, __s2);}
-#endif
-
-using ::strtok;
-using ::memset;
-using ::strerror;
-using ::strlen;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CSTRING
diff --git a/include.new/c++/v1/tr1/ctgmath b/include.new/c++/v1/tr1/ctgmath
deleted file mode 100644
index 535eb7d..0000000
--- a/include.new/c++/v1/tr1/ctgmath
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- ctgmath -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CTGMATH
-#define _LIBCPP_CTGMATH
-
-/*
-    ctgmath synopsis
-
-#include <ccomplex>
-#include <cmath>
-
-*/
-
-#include <ccomplex>
-#include <cmath>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_CTGMATH
diff --git a/include.new/c++/v1/tr1/ctime b/include.new/c++/v1/tr1/ctime
deleted file mode 100644
index fc4eb26..0000000
--- a/include.new/c++/v1/tr1/ctime
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- ctime -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CTIME
-#define _LIBCPP_CTIME
-
-/*
-    ctime synopsis
-
-Macros:
-
-    NULL
-    CLOCKS_PER_SEC
-
-namespace std
-{
-
-Types:
-
-    clock_t
-    size_t
-    time_t
-    tm
-
-clock_t clock();
-double difftime(time_t time1, time_t time0);
-time_t mktime(tm* timeptr);
-time_t time(time_t* timer);
-char* asctime(const tm* timeptr);
-char* ctime(const time_t* timer);
-tm*    gmtime(const time_t* timer);
-tm* localtime(const time_t* timer);
-size_t strftime(char* restrict s, size_t maxsize, const char* restrict format,
-                const tm* restrict timeptr);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <time.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::clock_t;
-using ::size_t;
-using ::time_t;
-using ::tm;
-using ::clock;
-using ::difftime;
-using ::mktime;
-using ::time;
-using ::asctime;
-using ::ctime;
-using ::gmtime;
-using ::localtime;
-using ::strftime;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CTIME
diff --git a/include.new/c++/v1/tr1/cwchar b/include.new/c++/v1/tr1/cwchar
deleted file mode 100644
index 9f51587..0000000
--- a/include.new/c++/v1/tr1/cwchar
+++ /dev/null
@@ -1,217 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cwchar -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CWCHAR
-#define _LIBCPP_CWCHAR
-
-/*
-    cwchar synopsis
-
-Macros:
-
-    NULL
-    WCHAR_MAX
-    WCHAR_MIN
-    WEOF
-
-namespace std
-{
-
-Types:
-
-    mbstate_t
-    size_t
-    tm
-    wint_t
-
-int fwprintf(FILE* restrict stream, const wchar_t* restrict format, ...);
-int fwscanf(FILE* restrict stream, const wchar_t* restrict format, ...);
-int swprintf(wchar_t* restrict s, size_t n, const wchar_t* restrict format, ...);
-int swscanf(const wchar_t* restrict s, const wchar_t* restrict format, ...);
-int vfwprintf(FILE* restrict stream, const wchar_t* restrict format, va_list arg);
-int vfwscanf(FILE* restrict stream, const wchar_t* restrict format, va_list arg);  // C99
-int vswprintf(wchar_t* restrict s, size_t n, const wchar_t* restrict format, va_list arg);
-int vswscanf(const wchar_t* restrict s, const wchar_t* restrict format, va_list arg);  // C99
-int vwprintf(const wchar_t* restrict format, va_list arg);
-int vwscanf(const wchar_t* restrict format, va_list arg);  // C99
-int wprintf(const wchar_t* restrict format, ...);
-int wscanf(const wchar_t* restrict format, ...);
-wint_t fgetwc(FILE* stream);
-wchar_t* fgetws(wchar_t* restrict s, int n, FILE* restrict stream);
-wint_t fputwc(wchar_t c, FILE* stream);
-int fputws(const wchar_t* restrict s, FILE* restrict stream);
-int fwide(FILE* stream, int mode);
-wint_t getwc(FILE* stream);
-wint_t getwchar();
-wint_t putwc(wchar_t c, FILE* stream);
-wint_t putwchar(wchar_t c);
-wint_t ungetwc(wint_t c, FILE* stream);
-double wcstod(const wchar_t* restrict nptr, wchar_t** restrict endptr);
-float wcstof(const wchar_t* restrict nptr, wchar_t** restrict endptr);         // C99
-long double wcstold(const wchar_t* restrict nptr, wchar_t** restrict endptr);  // C99
-long wcstol(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
-long long wcstoll(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);  // C99
-unsigned long wcstoul(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);
-unsigned long long wcstoull(const wchar_t* restrict nptr, wchar_t** restrict endptr, int base);  // C99
-wchar_t* wcscpy(wchar_t* restrict s1, const wchar_t* restrict s2);
-wchar_t* wcsncpy(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-wchar_t* wcscat(wchar_t* restrict s1, const wchar_t* restrict s2);
-wchar_t* wcsncat(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-int wcscmp(const wchar_t* s1, const wchar_t* s2);
-int wcscoll(const wchar_t* s1, const wchar_t* s2);
-int wcsncmp(const wchar_t* s1, const wchar_t* s2, size_t n);
-size_t wcsxfrm(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-const wchar_t* wcschr(const wchar_t* s, wchar_t c);
-      wchar_t* wcschr(      wchar_t* s, wchar_t c);
-size_t wcscspn(const wchar_t* s1, const wchar_t* s2);
-size_t wcslen(const wchar_t* s);
-const wchar_t* wcspbrk(const wchar_t* s1, const wchar_t* s2);
-      wchar_t* wcspbrk(      wchar_t* s1, const wchar_t* s2);
-const wchar_t* wcsrchr(const wchar_t* s, wchar_t c);
-      wchar_t* wcsrchr(      wchar_t* s, wchar_t c);
-size_t wcsspn(const wchar_t* s1, const wchar_t* s2);
-const wchar_t* wcsstr(const wchar_t* s1, const wchar_t* s2);
-      wchar_t* wcsstr(      wchar_t* s1, const wchar_t* s2);
-wchar_t* wcstok(wchar_t* restrict s1, const wchar_t* restrict s2, wchar_t** restrict ptr);
-const wchar_t* wmemchr(const wchar_t* s, wchar_t c, size_t n);
-      wchar_t* wmemchr(      wchar_t* s, wchar_t c, size_t n);
-int wmemcmp(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-wchar_t* wmemcpy(wchar_t* restrict s1, const wchar_t* restrict s2, size_t n);
-wchar_t* wmemmove(wchar_t* s1, const wchar_t* s2, size_t n);
-wchar_t* wmemset(wchar_t* s, wchar_t c, size_t n);
-size_t wcsftime(wchar_t* restrict s, size_t maxsize, const wchar_t* restrict format,
-                const tm* restrict timeptr);
-wint_t btowc(int c);
-int wctob(wint_t c);
-int mbsinit(const mbstate_t* ps);
-size_t mbrlen(const char* restrict s, size_t n, mbstate_t* restrict ps);
-size_t mbrtowc(wchar_t* restrict pwc, const char* restrict s, size_t n, mbstate_t* restrict ps);
-size_t wcrtomb(char* restrict s, wchar_t wc, mbstate_t* restrict ps);
-size_t mbsrtowcs(wchar_t* restrict dst, const char** restrict src, size_t len,
-                 mbstate_t* restrict ps);
-size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
-                 mbstate_t* restrict ps);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cwctype>
-#include <wchar.h>
-#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-#include <support/win32/support.h> // pull in *swprintf defines
-#endif // _LIBCPP_MSVCRT
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::mbstate_t;
-using ::size_t;
-using ::tm;
-using ::wint_t;
-using ::FILE;
-using ::fwprintf;
-using ::fwscanf;
-using ::swprintf;
-using ::vfwprintf;
-using ::vswprintf;
-using ::vwprintf;
-#ifndef _LIBCPP_MSVCRT
-using ::swscanf;
-using ::vfwscanf;
-using ::vswscanf;
-using ::vwscanf;
-#endif // _LIBCPP_MSVCRT
-using ::wprintf;
-using ::wscanf;
-using ::fgetwc;
-using ::fgetws;
-using ::fputwc;
-using ::fputws;
-using ::fwide;
-using ::getwc;
-using ::getwchar;
-using ::putwc;
-using ::putwchar;
-using ::ungetwc;
-using ::wcstod;
-#ifndef _LIBCPP_MSVCRT
-using ::wcstof;
-using ::wcstold;
-#endif // _LIBCPP_MSVCRT
-using ::wcstol;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::wcstoll;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::wcstoul;
-#ifndef _LIBCPP_HAS_NO_LONG_LONG
-using ::wcstoull;
-#endif // _LIBCPP_HAS_NO_LONG_LONG
-using ::wcscpy;
-using ::wcsncpy;
-using ::wcscat;
-using ::wcsncat;
-using ::wcscmp;
-using ::wcscoll;
-using ::wcsncmp;
-using ::wcsxfrm;
-
-#if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)
-
-using ::wcschr;
-using ::wcspbrk;
-using ::wcsrchr;
-using ::wcsstr;
-using ::wmemchr;
-
-#else
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcschr(const wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcschr(      wchar_t* __s, wchar_t __c) {return ::wcschr(__s, __c);}
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcspbrk(const wchar_t* __s1, const wchar_t* __s2) {return ::wcspbrk(__s1, __s2);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcspbrk(      wchar_t* __s1, const wchar_t* __s2) {return ::wcspbrk(__s1, __s2);}
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcsrchr(const wchar_t* __s, wchar_t __c) {return ::wcsrchr(__s, __c);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcsrchr(      wchar_t* __s, wchar_t __c) {return ::wcsrchr(__s, __c);}
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wcsstr(const wchar_t* __s1, const wchar_t* __s2) {return ::wcsstr(__s1, __s2);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wcsstr(      wchar_t* __s1, const wchar_t* __s2) {return ::wcsstr(__s1, __s2);}
-
-inline _LIBCPP_INLINE_VISIBILITY const wchar_t* wmemchr(const wchar_t* __s, wchar_t __c, size_t __n) {return ::wmemchr(__s, __c, __n);}
-inline _LIBCPP_INLINE_VISIBILITY       wchar_t* wmemchr(      wchar_t* __s, wchar_t __c, size_t __n) {return ::wmemchr(__s, __c, __n);}
-
-#endif
-
-using ::wcscspn;
-using ::wcslen;
-using ::wcsspn;
-using ::wcstok;
-using ::wmemcmp;
-using ::wmemcpy;
-using ::wmemmove;
-using ::wmemset;
-using ::wcsftime;
-using ::btowc;
-using ::wctob;
-using ::mbsinit;
-using ::mbrlen;
-using ::mbrtowc;
-using ::wcrtomb;
-using ::mbsrtowcs;
-using ::wcsrtombs;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CWCHAR
diff --git a/include.new/c++/v1/tr1/cwctype b/include.new/c++/v1/tr1/cwctype
deleted file mode 100644
index 4f89b52..0000000
--- a/include.new/c++/v1/tr1/cwctype
+++ /dev/null
@@ -1,213 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- cwctype ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_CWCTYPE
-#define _LIBCPP_CWCTYPE
-
-/*
-    cwctype synopsis
-
-Macros:
-
-    WEOF
-
-namespace std
-{
-
-Types:
-
-    wint_t
-    wctrans_t
-    wctype_t
-
-int iswalnum(wint_t wc);
-int iswalpha(wint_t wc);
-int iswblank(wint_t wc);  // C99
-int iswcntrl(wint_t wc);
-int iswdigit(wint_t wc);
-int iswgraph(wint_t wc);
-int iswlower(wint_t wc);
-int iswprint(wint_t wc);
-int iswpunct(wint_t wc);
-int iswspace(wint_t wc);
-int iswupper(wint_t wc);
-int iswxdigit(wint_t wc);
-int iswctype(wint_t wc, wctype_t desc);
-wctype_t wctype(const char* property);
-wint_t towlower(wint_t wc);
-wint_t towupper(wint_t wc);
-wint_t towctrans(wint_t wc, wctrans_t desc);
-wctrans_t wctrans(const char* property);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cctype>
-#include <wctype.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-using ::wint_t;
-using ::wctrans_t;
-using ::wctype_t;
-
-#ifdef iswalnum
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswalnum(wint_t __wc) {return iswalnum(__wc);}
-#undef iswalnum
-inline _LIBCPP_INLINE_VISIBILITY int iswalnum(wint_t __wc) {return __libcpp_iswalnum(__wc);}
-#else  // iswalnum
-using ::iswalnum;
-#endif
-
-#ifdef iswalpha
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswalpha(wint_t __wc) {return iswalpha(__wc);}
-#undef iswalpha
-inline _LIBCPP_INLINE_VISIBILITY int iswalpha(wint_t __wc) {return __libcpp_iswalpha(__wc);}
-#else  // iswalpha
-using ::iswalpha;
-#endif
-
-#ifdef iswblank
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswblank(wint_t __wc) {return iswblank(__wc);}
-#undef iswblank
-inline _LIBCPP_INLINE_VISIBILITY int iswblank(wint_t __wc) {return __libcpp_iswblank(__wc);}
-#else  // iswblank
-using ::iswblank;
-#endif
-
-#ifdef iswcntrl
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswcntrl(wint_t __wc) {return iswcntrl(__wc);}
-#undef iswcntrl
-inline _LIBCPP_INLINE_VISIBILITY int iswcntrl(wint_t __wc) {return __libcpp_iswcntrl(__wc);}
-#else  // iswcntrl
-using ::iswcntrl;
-#endif
-
-#ifdef iswdigit
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswdigit(wint_t __wc) {return iswdigit(__wc);}
-#undef iswdigit
-inline _LIBCPP_INLINE_VISIBILITY int iswdigit(wint_t __wc) {return __libcpp_iswdigit(__wc);}
-#else  // iswdigit
-using ::iswdigit;
-#endif
-
-#ifdef iswgraph
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswgraph(wint_t __wc) {return iswgraph(__wc);}
-#undef iswgraph
-inline _LIBCPP_INLINE_VISIBILITY int iswgraph(wint_t __wc) {return __libcpp_iswgraph(__wc);}
-#else  // iswgraph
-using ::iswgraph;
-#endif
-
-#ifdef iswlower
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswlower(wint_t __wc) {return iswlower(__wc);}
-#undef iswlower
-inline _LIBCPP_INLINE_VISIBILITY int iswlower(wint_t __wc) {return __libcpp_iswlower(__wc);}
-#else  // iswlower
-using ::iswlower;
-#endif
-
-#ifdef iswprint
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswprint(wint_t __wc) {return iswprint(__wc);}
-#undef iswprint
-inline _LIBCPP_INLINE_VISIBILITY int iswprint(wint_t __wc) {return __libcpp_iswprint(__wc);}
-#else  // iswprint
-using ::iswprint;
-#endif
-
-#ifdef iswpunct
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswpunct(wint_t __wc) {return iswpunct(__wc);}
-#undef iswpunct
-inline _LIBCPP_INLINE_VISIBILITY int iswpunct(wint_t __wc) {return __libcpp_iswpunct(__wc);}
-#else  // iswpunct
-using ::iswpunct;
-#endif
-
-#ifdef iswspace
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswspace(wint_t __wc) {return iswspace(__wc);}
-#undef iswspace
-inline _LIBCPP_INLINE_VISIBILITY int iswspace(wint_t __wc) {return __libcpp_iswspace(__wc);}
-#else  // iswspace
-using ::iswspace;
-#endif
-
-#ifdef iswupper
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswupper(wint_t __wc) {return iswupper(__wc);}
-#undef iswupper
-inline _LIBCPP_INLINE_VISIBILITY int iswupper(wint_t __wc) {return __libcpp_iswupper(__wc);}
-#else  // iswupper
-using ::iswupper;
-#endif
-
-#ifdef iswxdigit
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswxdigit(wint_t __wc) {return iswxdigit(__wc);}
-#undef iswxdigit
-inline _LIBCPP_INLINE_VISIBILITY int iswxdigit(wint_t __wc) {return __libcpp_iswxdigit(__wc);}
-#else  // iswxdigit
-using ::iswxdigit;
-#endif
-
-#ifdef iswctype
-inline _LIBCPP_INLINE_VISIBILITY int __libcpp_iswctype(wint_t __w, wctype_t __d) {return iswctype(__w, __d);}
-#undef iswctype
-inline _LIBCPP_INLINE_VISIBILITY int iswctype(wint_t __w, wctype_t __d) {return __libcpp_iswctype(__w, __d);}
-#else  // iswctype
-using ::iswctype;
-#endif
-
-#ifdef wctype
-inline _LIBCPP_INLINE_VISIBILITY wctype_t __libcpp_wctype(const char* __p) {return wctype(__p);}
-#undef wctype
-inline _LIBCPP_INLINE_VISIBILITY wctype_t wctype(const char* __p) {return __libcpp_wctype(__p);}
-#else  // wctype
-using ::wctype;
-#endif
-
-#ifdef towlower
-inline _LIBCPP_INLINE_VISIBILITY wint_t __libcpp_towlower(wint_t __wc) {return towlower(__wc);}
-#undef towlower
-inline _LIBCPP_INLINE_VISIBILITY wint_t towlower(wint_t __wc) {return __libcpp_towlower(__wc);}
-#else  // towlower
-using ::towlower;
-#endif
-
-#ifdef towupper
-inline _LIBCPP_INLINE_VISIBILITY wint_t __libcpp_towupper(wint_t __wc) {return towupper(__wc);}
-#undef towupper
-inline _LIBCPP_INLINE_VISIBILITY wint_t towupper(wint_t __wc) {return __libcpp_towupper(__wc);}
-#else  // towupper
-using ::towupper;
-#endif
-
-#ifdef towctrans
-inline _LIBCPP_INLINE_VISIBILITY wint_t __libcpp_towctrans(wint_t __wc, wctype_t __d) {return towctrans(__wc, __d);}
-#undef towctrans
-inline _LIBCPP_INLINE_VISIBILITY wint_t towctrans(wint_t __wc, wctype_t __d) {return __libcpp_towctrans(__wc, __d);}
-#else  // towctrans
-using ::towctrans;
-#endif
-
-#ifdef wctrans
-inline _LIBCPP_INLINE_VISIBILITY wctrans_t __libcpp_wctrans(const char* __p) {return wctrans(__p);}
-#undef wctrans
-inline _LIBCPP_INLINE_VISIBILITY wctrans_t wctrans(const char* __p) {return __libcpp_wctrans(__p);}
-#else  // wctrans
-using ::wctrans;
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_CWCTYPE
diff --git a/include.new/c++/v1/tr1/deque b/include.new/c++/v1/tr1/deque
deleted file mode 100644
index 5602d4a..0000000
--- a/include.new/c++/v1/tr1/deque
+++ /dev/null
@@ -1,2873 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- deque -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_DEQUE
-#define _LIBCPP_DEQUE
-
-/*
-    deque synopsis
-
-namespace std
-{
-
-template <class T, class Allocator = allocator<T> >
-class deque
-{
-public:
-    // types:
-    typedef T value_type;
-    typedef Allocator allocator_type;
-
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    // construct/copy/destroy:
-    deque() noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit deque(const allocator_type& a);
-    explicit deque(size_type n);
-    explicit deque(size_type n, const allocator_type& a); // C++14
-    deque(size_type n, const value_type& v);
-    deque(size_type n, const value_type& v, const allocator_type& a);
-    template <class InputIterator>
-        deque(InputIterator f, InputIterator l);
-    template <class InputIterator>
-        deque(InputIterator f, InputIterator l, const allocator_type& a);
-    deque(const deque& c);
-    deque(deque&& c)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    deque(initializer_list<value_type> il, const Allocator& a = allocator_type());
-    deque(const deque& c, const allocator_type& a);
-    deque(deque&& c, const allocator_type& a);
-    ~deque();
-
-    deque& operator=(const deque& c);
-    deque& operator=(deque&& c)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    deque& operator=(initializer_list<value_type> il);
-
-    template <class InputIterator>
-        void assign(InputIterator f, InputIterator l);
-    void assign(size_type n, const value_type& v);
-    void assign(initializer_list<value_type> il);
-
-    allocator_type get_allocator() const noexcept;
-
-    // iterators:
-
-    iterator       begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator       end() noexcept;
-    const_iterator end() const noexcept;
-
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-
-    const_iterator         cbegin() const noexcept;
-    const_iterator         cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
-
-    // capacity:
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    void resize(size_type n);
-    void resize(size_type n, const value_type& v);
-    void shrink_to_fit();
-    bool empty() const noexcept;
-
-    // element access:
-    reference operator[](size_type i);
-    const_reference operator[](size_type i) const;
-    reference at(size_type i);
-    const_reference at(size_type i) const;
-    reference front();
-    const_reference front() const;
-    reference back();
-    const_reference back() const;
-
-    // modifiers:
-    void push_front(const value_type& v);
-    void push_front(value_type&& v);
-    void push_back(const value_type& v);
-    void push_back(value_type&& v);
-    template <class... Args> void emplace_front(Args&&... args);
-    template <class... Args> void emplace_back(Args&&... args);
-    template <class... Args> iterator emplace(const_iterator p, Args&&... args);
-    iterator insert(const_iterator p, const value_type& v);
-    iterator insert(const_iterator p, value_type&& v);
-    iterator insert(const_iterator p, size_type n, const value_type& v);
-    template <class InputIterator>
-        iterator insert (const_iterator p, InputIterator f, InputIterator l);
-    iterator insert(const_iterator p, initializer_list<value_type> il);
-    void pop_front();
-    void pop_back();
-    iterator erase(const_iterator p);
-    iterator erase(const_iterator f, const_iterator l);
-    void swap(deque& c)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-    void clear() noexcept;
-};
-
-template <class T, class Allocator>
-    bool operator==(const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator< (const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator!=(const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator> (const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator>=(const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-template <class T, class Allocator>
-    bool operator<=(const deque<T,Allocator>& x, const deque<T,Allocator>& y);
-
-// specialized algorithms:
-template <class T, class Allocator>
-    void swap(deque<T,Allocator>& x, deque<T,Allocator>& y)
-         noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#include <__config>
-#include <__split_buffer>
-#include <type_traits>
-#include <initializer_list>
-#include <iterator>
-#include <algorithm>
-#include <stdexcept>
-
-#include <__undef_min_max>
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _Allocator> class __deque_base;
-
-template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,
-          class _DiffType, _DiffType _BlockSize>
-class _LIBCPP_TYPE_VIS_ONLY __deque_iterator;
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy(_RAIter __f,
-     _RAIter __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-     typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     _OutputIterator __r);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy_backward(_RAIter __f,
-              _RAIter __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-              typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              _OutputIterator __r);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move(_RAIter __f,
-     _RAIter __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-     typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     _OutputIterator __r);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move_backward(_RAIter __f,
-              _RAIter __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-              typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              _OutputIterator __r);
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-template <class _ValueType, class _Pointer, class _Reference, class _MapPointer,
-          class _DiffType, _DiffType _BlockSize>
-class _LIBCPP_TYPE_VIS_ONLY __deque_iterator
-{
-    typedef _MapPointer __map_iterator;
-public:
-    typedef _Pointer  pointer;
-    typedef _DiffType difference_type;
-private:
-    __map_iterator __m_iter_;
-    pointer        __ptr_;
-
-    static const difference_type __block_size = _BlockSize;
-public:
-    typedef _ValueType                  value_type;
-    typedef random_access_iterator_tag  iterator_category;
-    typedef _Reference                  reference;
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-     : __m_iter_(nullptr), __ptr_(nullptr)
-#endif
-     {}
-
-    template <class _Pp, class _Rp, class _MP>
-    _LIBCPP_INLINE_VISIBILITY
-    __deque_iterator(const __deque_iterator<value_type, _Pp, _Rp, _MP, difference_type, __block_size>& __it,
-                typename enable_if<is_convertible<_Pp, pointer>::value>::type* = 0) _NOEXCEPT
-        : __m_iter_(__it.__m_iter_), __ptr_(__it.__ptr_) {}
-
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {return *__ptr_;}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const {return __ptr_;}
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator& operator++()
-    {
-        if (++__ptr_ - *__m_iter_ == __block_size)
-        {
-            ++__m_iter_;
-            __ptr_ = *__m_iter_;
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator operator++(int)
-    {
-        __deque_iterator __tmp = *this;
-        ++(*this);
-        return __tmp;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator& operator--()
-    {
-        if (__ptr_ == *__m_iter_)
-        {
-            --__m_iter_;
-            __ptr_ = *__m_iter_ + __block_size;
-        }
-        --__ptr_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator operator--(int)
-    {
-        __deque_iterator __tmp = *this;
-        --(*this);
-        return __tmp;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator& operator+=(difference_type __n)
-    {
-        if (__n != 0)
-        {
-            __n += __ptr_ - *__m_iter_;
-            if (__n > 0)
-            {
-                __m_iter_ += __n / __block_size;
-                __ptr_ = *__m_iter_ + __n % __block_size;
-            }
-            else // (__n < 0)
-            {
-                difference_type __z = __block_size - 1 - __n;
-                __m_iter_ -= __z / __block_size;
-                __ptr_ = *__m_iter_ + (__block_size - 1 - __z % __block_size);
-            }
-        }
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator& operator-=(difference_type __n)
-    {
-        return *this += -__n;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator operator+(difference_type __n) const
-    {
-        __deque_iterator __t(*this);
-        __t += __n;
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator operator-(difference_type __n) const
-    {
-        __deque_iterator __t(*this);
-        __t -= __n;
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    friend __deque_iterator operator+(difference_type __n, const __deque_iterator& __it)
-        {return __it + __n;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    friend difference_type operator-(const __deque_iterator& __x, const __deque_iterator& __y)
-    {
-        if (__x != __y)
-            return (__x.__m_iter_ - __y.__m_iter_) * __block_size
-                 + (__x.__ptr_ - *__x.__m_iter_)
-                 - (__y.__ptr_ - *__y.__m_iter_);
-        return 0;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY reference operator[](difference_type __n) const
-        {return *(*this + __n);}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator==(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator!=(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return !(__x == __y);}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator<(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return __x.__m_iter_ < __y.__m_iter_ ||
-               (__x.__m_iter_ == __y.__m_iter_ && __x.__ptr_ < __y.__ptr_);}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator>(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return __y < __x;}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator<=(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return !(__y < __x);}
-
-    _LIBCPP_INLINE_VISIBILITY friend
-        bool operator>=(const __deque_iterator& __x, const __deque_iterator& __y)
-        {return !(__x < __y);}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY __deque_iterator(__map_iterator __m, pointer __p) _NOEXCEPT
-        : __m_iter_(__m), __ptr_(__p) {}
-
-    template <class _Tp, class _Ap> friend class __deque_base;
-    template <class _Tp, class _Ap> friend class _LIBCPP_TYPE_VIS_ONLY deque;
-    template <class _Vp, class _Pp, class _Rp, class _MP, class _Dp, _Dp>
-        friend class _LIBCPP_TYPE_VIS_ONLY __deque_iterator;
-
-    template <class _RAIter,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    copy(_RAIter __f,
-         _RAIter __l,
-         __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-         typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _OutputIterator>
-    friend
-    _OutputIterator
-    copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-         __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-         _OutputIterator __r);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-         __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-         __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-    template <class _RAIter,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    copy_backward(_RAIter __f,
-                  _RAIter __l,
-                  __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-                  typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _OutputIterator>
-    friend
-    _OutputIterator
-    copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-                  __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-                  _OutputIterator __r);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-                  __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-                  __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-    template <class _RAIter,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    move(_RAIter __f,
-         _RAIter __l,
-         __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-         typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _OutputIterator>
-    friend
-    _OutputIterator
-    move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-         __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-         _OutputIterator __r);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-         __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-         __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-
-    template <class _RAIter,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    move_backward(_RAIter __f,
-                  _RAIter __l,
-                  __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-                  typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _OutputIterator>
-    friend
-    _OutputIterator
-    move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-                  __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-                  _OutputIterator __r);
-
-    template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-              class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-    friend
-    __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-    move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-                  __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-                  __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r);
-};
-
-// copy
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy(_RAIter __f,
-     _RAIter __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-     typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
-    while (__f != __l)
-    {
-        pointer __rb = __r.__ptr_;
-        pointer __re = *__r.__m_iter_ + _B2;
-        difference_type __bs = __re - __rb;
-        difference_type __n = __l - __f;
-        _RAIter __m = __l;
-        if (__n > __bs)
-        {
-            __n = __bs;
-            __m = __f + __n;
-        }
-        _VSTD::copy(__f, __m, __rb);
-        __f = __m;
-        __r += __n;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     _OutputIterator __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + _B1;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        __r = _VSTD::copy(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + _B1;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        __r = _VSTD::copy(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-// copy_backward
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy_backward(_RAIter __f,
-              _RAIter __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-              typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
-    while (__f != __l)
-    {
-        __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = _VSTD::prev(__r);
-        pointer __rb = *__rp.__m_iter_;
-        pointer __re = __rp.__ptr_ + 1;
-        difference_type __bs = __re - __rb;
-        difference_type __n = __l - __f;
-        _RAIter __m = __f;
-        if (__n > __bs)
-        {
-            __n = __bs;
-            __m = __l - __n;
-        }
-        _VSTD::copy_backward(__m, __l, __re);
-        __l = __m;
-        __r -= __n;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              _OutputIterator __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        __r = _VSTD::copy_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-copy_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        __r = _VSTD::copy_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-// move
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move(_RAIter __f,
-     _RAIter __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-     typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
-    while (__f != __l)
-    {
-        pointer __rb = __r.__ptr_;
-        pointer __re = *__r.__m_iter_ + _B2;
-        difference_type __bs = __re - __rb;
-        difference_type __n = __l - __f;
-        _RAIter __m = __l;
-        if (__n > __bs)
-        {
-            __n = __bs;
-            __m = __f + __n;
-        }
-        _VSTD::move(__f, __m, __rb);
-        __f = __m;
-        __r += __n;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     _OutputIterator __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + _B1;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        __r = _VSTD::move(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-     __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-     __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + _B1;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        __r = _VSTD::move(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-// move_backward
-
-template <class _RAIter,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move_backward(_RAIter __f,
-              _RAIter __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r,
-              typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::difference_type difference_type;
-    typedef typename __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>::pointer pointer;
-    while (__f != __l)
-    {
-        __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __rp = _VSTD::prev(__r);
-        pointer __rb = *__rp.__m_iter_;
-        pointer __re = __rp.__ptr_ + 1;
-        difference_type __bs = __re - __rb;
-        difference_type __n = __l - __f;
-        _RAIter __m = __f;
-        if (__n > __bs)
-        {
-            __n = __bs;
-            __m = __l - __n;
-        }
-        _VSTD::move_backward(__m, __l, __re);
-        __l = __m;
-        __r -= __n;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _OutputIterator>
-_OutputIterator
-move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              _OutputIterator __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        __r = _VSTD::move_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-template <class _V1, class _P1, class _R1, class _M1, class _D1, _D1 _B1,
-          class _V2, class _P2, class _R2, class _M2, class _D2, _D2 _B2>
-__deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2>
-move_backward(__deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __f,
-              __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1> __l,
-              __deque_iterator<_V2, _P2, _R2, _M2, _D2, _B2> __r)
-{
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::difference_type difference_type;
-    typedef typename __deque_iterator<_V1, _P1, _R1, _M1, _D1, _B1>::pointer pointer;
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        __r = _VSTD::move_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-template <bool>
-class __deque_base_common
-{
-protected:
-    void __throw_length_error() const;
-    void __throw_out_of_range() const;
-};
-
-template <bool __b>
-void
-__deque_base_common<__b>::__throw_length_error() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw length_error("deque");
-#endif
-}
-
-template <bool __b>
-void
-__deque_base_common<__b>::__throw_out_of_range() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw out_of_range("deque");
-#endif
-}
-
-template <class _Tp, class _Allocator>
-class __deque_base
-    : protected __deque_base_common<true>
-{
-    __deque_base(const __deque_base& __c);
-    __deque_base& operator=(const __deque_base& __c);
-protected:
-    typedef _Tp                                      value_type;
-    typedef _Allocator                               allocator_type;
-    typedef allocator_traits<allocator_type>         __alloc_traits;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-
-    static const difference_type __block_size = sizeof(value_type) < 256 ? 4096 / sizeof(value_type) : 16;
-
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<pointer>
-#else
-                rebind_alloc<pointer>::other
-#endif
-                                                         __pointer_allocator;
-    typedef allocator_traits<__pointer_allocator>        __map_traits;
-    typedef typename __map_traits::pointer               __map_pointer;
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<const_pointer>
-#else
-                rebind_alloc<const_pointer>::other
-#endif
-                                                         __const_pointer_allocator;
-    typedef typename allocator_traits<__const_pointer_allocator>::const_pointer __map_const_pointer;
-    typedef __split_buffer<pointer, __pointer_allocator> __map;
-
-    typedef __deque_iterator<value_type, pointer, reference, __map_pointer,
-                             difference_type, __block_size>    iterator;
-    typedef __deque_iterator<value_type, const_pointer, const_reference, __map_const_pointer,
-                             difference_type, __block_size>    const_iterator;
-
-    __map __map_;
-    size_type __start_;
-    __compressed_pair<size_type, allocator_type> __size_;
-
-    iterator       begin() _NOEXCEPT;
-    const_iterator begin() const _NOEXCEPT;
-    iterator       end() _NOEXCEPT;
-    const_iterator end() const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY size_type&            size()          {return __size_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    const size_type& size() const _NOEXCEPT {return __size_.first();}
-    _LIBCPP_INLINE_VISIBILITY allocator_type&       __alloc()       {return __size_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const allocator_type& __alloc() const _NOEXCEPT {return __size_.second();}
-
-    __deque_base()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    explicit __deque_base(const allocator_type& __a);
-public:
-    ~__deque_base();
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    __deque_base(__deque_base&& __c)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    __deque_base(__deque_base&& __c, const allocator_type& __a);
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void swap(__deque_base& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-protected:
-    void clear() _NOEXCEPT;
-
-    bool __invariants() const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign(__deque_base& __c)
-        _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-                   is_nothrow_move_assignable<allocator_type>::value)
-    {
-        __map_ = _VSTD::move(__c.__map_);
-        __start_ = __c.__start_;
-        size() = __c.size();
-        __move_assign_alloc(__c);
-        __c.__start_ = __c.size() = 0;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__deque_base& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_move_assignment::value ||
-                   is_nothrow_move_assignable<allocator_type>::value)
-        {__move_assign_alloc(__c, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_move_assignment::value>());}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__deque_base& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__deque_base&, false_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_swap::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<allocator_type>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type&, allocator_type&, false_type)
-        _NOEXCEPT
-        {}
-};
-
-template <class _Tp, class _Allocator>
-bool
-__deque_base<_Tp, _Allocator>::__invariants() const
-{
-    if (!__map_.__invariants())
-        return false;
-    if (__map_.size() >= size_type(-1) / __block_size)
-        return false;
-    for (typename __map::const_iterator __i = __map_.begin(), __e = __map_.end();
-         __i != __e; ++__i)
-        if (*__i == nullptr)
-            return false;
-    if (__map_.size() != 0)
-    {
-        if (size() >= __map_.size() * __block_size)
-            return false;
-        if (__start_ >= __map_.size() * __block_size - size())
-            return false;
-    }
-    else
-    {
-        if (size() != 0)
-            return false;
-        if (__start_ != 0)
-            return false;
-    }
-    return true;
-}
-
-template <class _Tp, class _Allocator>
-typename __deque_base<_Tp, _Allocator>::iterator
-__deque_base<_Tp, _Allocator>::begin() _NOEXCEPT
-{
-    __map_pointer __mp = __map_.begin() + __start_ / __block_size;
-    return iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
-}
-
-template <class _Tp, class _Allocator>
-typename __deque_base<_Tp, _Allocator>::const_iterator
-__deque_base<_Tp, _Allocator>::begin() const _NOEXCEPT
-{
-    __map_const_pointer __mp = static_cast<__map_const_pointer>(__map_.begin() + __start_ / __block_size);
-    return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __start_ % __block_size);
-}
-
-template <class _Tp, class _Allocator>
-typename __deque_base<_Tp, _Allocator>::iterator
-__deque_base<_Tp, _Allocator>::end() _NOEXCEPT
-{
-    size_type __p = size() + __start_;
-    __map_pointer __mp = __map_.begin() + __p / __block_size;
-    return iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
-}
-
-template <class _Tp, class _Allocator>
-typename __deque_base<_Tp, _Allocator>::const_iterator
-__deque_base<_Tp, _Allocator>::end() const _NOEXCEPT
-{
-    size_type __p = size() + __start_;
-    __map_const_pointer __mp = static_cast<__map_const_pointer>(__map_.begin() + __p / __block_size);
-    return const_iterator(__mp, __map_.empty() ? 0 : *__mp + __p % __block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__deque_base<_Tp, _Allocator>::__deque_base()
-    _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-    : __start_(0), __size_(0) {}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__deque_base<_Tp, _Allocator>::__deque_base(const allocator_type& __a)
-    : __map_(__pointer_allocator(__a)), __start_(0), __size_(0, __a) {}
-
-template <class _Tp, class _Allocator>
-__deque_base<_Tp, _Allocator>::~__deque_base()
-{
-    clear();
-    typename __map::iterator __i = __map_.begin();
-    typename __map::iterator __e = __map_.end();
-    for (; __i != __e; ++__i)
-        __alloc_traits::deallocate(__alloc(), *__i, __block_size);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-__deque_base<_Tp, _Allocator>::__deque_base(__deque_base&& __c)
-    _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __map_(_VSTD::move(__c.__map_)),
-      __start_(_VSTD::move(__c.__start_)),
-      __size_(_VSTD::move(__c.__size_))
-{
-    __c.__start_ = 0;
-    __c.size() = 0;
-}
-
-template <class _Tp, class _Allocator>
-__deque_base<_Tp, _Allocator>::__deque_base(__deque_base&& __c, const allocator_type& __a)
-    : __map_(_VSTD::move(__c.__map_), __pointer_allocator(__a)),
-      __start_(_VSTD::move(__c.__start_)),
-      __size_(_VSTD::move(__c.size()), __a)
-{
-    if (__a == __c.__alloc())
-    {
-        __c.__start_ = 0;
-        __c.size() = 0;
-    }
-    else
-    {
-        __map_.clear();
-        __start_ = 0;
-        size() = 0;
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-__deque_base<_Tp, _Allocator>::swap(__deque_base& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-    __map_.swap(__c.__map_);
-    _VSTD::swap(__start_, __c.__start_);
-    _VSTD::swap(size(), __c.size());
-    __swap_alloc(__alloc(), __c.__alloc());
-}
-
-template <class _Tp, class _Allocator>
-void
-__deque_base<_Tp, _Allocator>::clear() _NOEXCEPT
-{
-    allocator_type& __a = __alloc();
-    for (iterator __i = begin(), __e = end(); __i != __e; ++__i)
-        __alloc_traits::destroy(__a, _VSTD::addressof(*__i));
-    size() = 0;
-    while (__map_.size() > 2)
-    {
-        __alloc_traits::deallocate(__a, __map_.front(), __block_size);
-        __map_.pop_front();
-    }
-    switch (__map_.size())
-    {
-    case 1:
-        __start_ = __block_size / 2;
-        break;
-    case 2:
-        __start_ = __block_size;
-        break;
-    }
-}
-
-template <class _Tp, class _Allocator = allocator<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY deque
-    : private __deque_base<_Tp, _Allocator>
-{
-public:
-    // types:
-
-    typedef _Tp value_type;
-    typedef _Allocator allocator_type;
-
-    typedef __deque_base<value_type, allocator_type> __base;
-
-    typedef typename __base::__alloc_traits        __alloc_traits;
-    typedef typename __base::reference             reference;
-    typedef typename __base::const_reference       const_reference;
-    typedef typename __base::iterator              iterator;
-    typedef typename __base::const_iterator        const_iterator;
-    typedef typename __base::size_type             size_type;
-    typedef typename __base::difference_type       difference_type;
-
-    typedef typename __base::pointer               pointer;
-    typedef typename __base::const_pointer         const_pointer;
-    typedef _VSTD::reverse_iterator<iterator>       reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    deque()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-        {}
-    _LIBCPP_INLINE_VISIBILITY explicit deque(const allocator_type& __a) : __base(__a) {}
-    explicit deque(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit deque(size_type __n, const _Allocator& __a);
-#endif
-    deque(size_type __n, const value_type& __v);
-    deque(size_type __n, const value_type& __v, const allocator_type& __a);
-    template <class _InputIter>
-        deque(_InputIter __f, _InputIter __l,
-              typename enable_if<__is_input_iterator<_InputIter>::value>::type* = 0);
-    template <class _InputIter>
-        deque(_InputIter __f, _InputIter __l, const allocator_type& __a,
-              typename enable_if<__is_input_iterator<_InputIter>::value>::type* = 0);
-    deque(const deque& __c);
-    deque(const deque& __c, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    deque(initializer_list<value_type> __il);
-    deque(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    deque& operator=(const deque& __c);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    deque& operator=(initializer_list<value_type> __il) {assign(__il); return *this;}
-#endif   // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    deque(deque&& __c) _NOEXCEPT_(is_nothrow_move_constructible<__base>::value);
-    deque(deque&& __c, const allocator_type& __a);
-    deque& operator=(deque&& __c)
-        _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-                   is_nothrow_move_assignable<allocator_type>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _InputIter>
-        void assign(_InputIter __f, _InputIter __l,
-                    typename enable_if<__is_input_iterator<_InputIter>::value &&
-                                      !__is_random_access_iterator<_InputIter>::value>::type* = 0);
-    template <class _RAIter>
-        void assign(_RAIter __f, _RAIter __l,
-                    typename enable_if<__is_random_access_iterator<_RAIter>::value>::type* = 0);
-    void assign(size_type __n, const value_type& __v);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void assign(initializer_list<value_type> __il) {assign(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    allocator_type get_allocator() const _NOEXCEPT;
-
-    // iterators:
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT       {return __base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT         {return __base::end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()   const _NOEXCEPT {return __base::end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator       rbegin() _NOEXCEPT
-        {return       reverse_iterator(__base::end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(__base::end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator       rend() _NOEXCEPT
-        {return       reverse_iterator(__base::begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend()   const _NOEXCEPT
-        {return const_reverse_iterator(__base::begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cbegin()  const _NOEXCEPT
-        {return __base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cend()    const _NOEXCEPT
-        {return __base::end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return const_reverse_iterator(__base::end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend()   const _NOEXCEPT
-        {return const_reverse_iterator(__base::begin());}
-
-    // capacity:
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __base::size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-        {return __alloc_traits::max_size(__base::__alloc());}
-    void resize(size_type __n);
-    void resize(size_type __n, const value_type& __v);
-    void shrink_to_fit() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __base::size() == 0;}
-
-    // element access:
-    reference operator[](size_type __i);
-    const_reference operator[](size_type __i) const;
-    reference at(size_type __i);
-    const_reference at(size_type __i) const;
-    reference front();
-    const_reference front() const;
-    reference back();
-    const_reference back() const;
-
-    // 23.2.2.3 modifiers:
-    void push_front(const value_type& __v);
-    void push_back(const value_type& __v);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args> void emplace_front(_Args&&... __args);
-    template <class... _Args> void emplace_back(_Args&&... __args);
-    template <class... _Args> iterator emplace(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-    void push_front(value_type&& __v);
-    void push_back(value_type&& __v);
-    iterator insert(const_iterator __p, value_type&& __v);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator insert(const_iterator __p, const value_type& __v);
-    iterator insert(const_iterator __p, size_type __n, const value_type& __v);
-    template <class _InputIter>
-        iterator insert (const_iterator __p, _InputIter __f, _InputIter __l,
-                         typename enable_if<__is_input_iterator<_InputIter>::value
-                                         &&!__is_bidirectional_iterator<_InputIter>::value>::type* = 0);
-    template <class _BiIter>
-        iterator insert (const_iterator __p, _BiIter __f, _BiIter __l,
-                         typename enable_if<__is_bidirectional_iterator<_BiIter>::value>::type* = 0);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, initializer_list<value_type> __il)
-        {return insert(__p, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    void pop_front();
-    void pop_back();
-    iterator erase(const_iterator __p);
-    iterator erase(const_iterator __f, const_iterator __l);
-
-    void swap(deque& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-    void clear() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __invariants() const {return __base::__invariants();}
-private:
-    typedef typename __base::__map_const_pointer __map_const_pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __recommend_blocks(size_type __n)
-    {
-        return __n / __base::__block_size + (__n % __base::__block_size != 0);
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __capacity() const
-    {
-        return __base::__map_.size() == 0 ? 0 : __base::__map_.size() * __base::__block_size - 1;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __front_spare() const
-    {
-        return __base::__start_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __back_spare() const
-    {
-        return __capacity() - (__base::__start_ + __base::size());
-    }
-
-    template <class _InpIter>
-        void __append(_InpIter __f, _InpIter __l,
-                 typename enable_if<__is_input_iterator<_InpIter>::value &&
-                                   !__is_forward_iterator<_InpIter>::value>::type* = 0);
-    template <class _ForIter>
-        void __append(_ForIter __f, _ForIter __l,
-                      typename enable_if<__is_forward_iterator<_ForIter>::value>::type* = 0);
-    void __append(size_type __n);
-    void __append(size_type __n, const value_type& __v);
-    void __erase_to_end(const_iterator __f);
-    void __add_front_capacity();
-    void __add_front_capacity(size_type __n);
-    void __add_back_capacity();
-    void __add_back_capacity(size_type __n);
-    iterator __move_and_check(iterator __f, iterator __l, iterator __r,
-                              const_pointer& __vt);
-    iterator __move_backward_and_check(iterator __f, iterator __l, iterator __r,
-                                       const_pointer& __vt);
-    void __move_construct_and_check(iterator __f, iterator __l,
-                                    iterator __r, const_pointer& __vt);
-    void __move_construct_backward_and_check(iterator __f, iterator __l,
-                                             iterator __r, const_pointer& __vt);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const deque& __c)
-        {__copy_assign_alloc(__c, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const deque& __c, true_type)
-        {
-            if (__base::__alloc() != __c.__alloc())
-            {
-                clear();
-                shrink_to_fit();
-            }
-            __base::__alloc() = __c.__alloc();
-            __base::__map_.__alloc() = __c.__map_.__alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const deque&, false_type)
-        {}
-
-    void __move_assign(deque& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-    void __move_assign(deque& __c, false_type);
-};
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(size_type __n)
-{
-    if (__n > 0)
-        __append(__n);
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(size_type __n, const _Allocator& __a)
-    : __base(__a)
-{
-    if (__n > 0)
-        __append(__n);
-}
-#endif
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(size_type __n, const value_type& __v)
-{
-    if (__n > 0)
-        __append(__n, __v);
-}
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(size_type __n, const value_type& __v, const allocator_type& __a)
-    : __base(__a)
-{
-    if (__n > 0)
-        __append(__n, __v);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-deque<_Tp, _Allocator>::deque(_InputIter __f, _InputIter __l,
-              typename enable_if<__is_input_iterator<_InputIter>::value>::type*)
-{
-    __append(__f, __l);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-deque<_Tp, _Allocator>::deque(_InputIter __f, _InputIter __l, const allocator_type& __a,
-              typename enable_if<__is_input_iterator<_InputIter>::value>::type*)
-    : __base(__a)
-{
-    __append(__f, __l);
-}
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(const deque& __c)
-    : __base(__alloc_traits::select_on_container_copy_construction(__c.__alloc()))
-{
-    __append(__c.begin(), __c.end());
-}
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(const deque& __c, const allocator_type& __a)
-    : __base(__a)
-{
-    __append(__c.begin(), __c.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il)
-{
-    __append(__il.begin(), __il.end());
-}
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>::deque(initializer_list<value_type> __il, const allocator_type& __a)
-    : __base(__a)
-{
-    __append(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Allocator>
-deque<_Tp, _Allocator>&
-deque<_Tp, _Allocator>::operator=(const deque& __c)
-{
-    if (this != &__c)
-    {
-        __copy_assign_alloc(__c);
-        assign(__c.begin(), __c.end());
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-deque<_Tp, _Allocator>::deque(deque&& __c)
-    _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-    : __base(_VSTD::move(__c))
-{
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-deque<_Tp, _Allocator>::deque(deque&& __c, const allocator_type& __a)
-    : __base(_VSTD::move(__c), __a)
-{
-    if (__a != __c.__alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-deque<_Tp, _Allocator>&
-deque<_Tp, _Allocator>::operator=(deque&& __c)
-        _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-                   is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__c, integral_constant<bool,
-          __alloc_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__move_assign(deque& __c, false_type)
-{
-    if (__base::__alloc() != __c.__alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-    else
-        __move_assign(__c, true_type());
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__move_assign(deque& __c, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    clear();
-    shrink_to_fit();
-    __base::__move_assign(__c);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-void
-deque<_Tp, _Allocator>::assign(_InputIter __f, _InputIter __l,
-                               typename enable_if<__is_input_iterator<_InputIter>::value &&
-                                                 !__is_random_access_iterator<_InputIter>::value>::type*)
-{
-    iterator __i = __base::begin();
-    iterator __e = __base::end();
-    for (; __f != __l && __i != __e; ++__f, (void) ++__i)
-        *__i = *__f;
-    if (__f != __l)
-        __append(__f, __l);
-    else
-        __erase_to_end(__i);
-}
-
-template <class _Tp, class _Allocator>
-template <class _RAIter>
-void
-deque<_Tp, _Allocator>::assign(_RAIter __f, _RAIter __l,
-                               typename enable_if<__is_random_access_iterator<_RAIter>::value>::type*)
-{
-    if (static_cast<size_type>(__l - __f) > __base::size())
-    {
-        _RAIter __m = __f + __base::size();
-        _VSTD::copy(__f, __m, __base::begin());
-        __append(__m, __l);
-    }
-    else
-        __erase_to_end(_VSTD::copy(__f, __l, __base::begin()));
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::assign(size_type __n, const value_type& __v)
-{
-    if (__n > __base::size())
-    {
-        _VSTD::fill_n(__base::begin(), __base::size(), __v);
-        __n -= __base::size();
-        __append(__n, __v);
-    }
-    else
-        __erase_to_end(_VSTD::fill_n(__base::begin(), __n, __v));
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-_Allocator
-deque<_Tp, _Allocator>::get_allocator() const _NOEXCEPT
-{
-    return __base::__alloc();
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::resize(size_type __n)
-{
-    if (__n > __base::size())
-        __append(__n - __base::size());
-    else if (__n < __base::size())
-        __erase_to_end(__base::begin() + __n);
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::resize(size_type __n, const value_type& __v)
-{
-    if (__n > __base::size())
-        __append(__n - __base::size(), __v);
-    else if (__n < __base::size())
-        __erase_to_end(__base::begin() + __n);
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
-{
-    allocator_type& __a = __base::__alloc();
-    if (empty())
-    {
-        while (__base::__map_.size() > 0)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-            __base::__map_.pop_back();
-        }
-        __base::__start_ = 0;
-    }
-    else
-    {
-        if (__front_spare() >= __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.front(), __base::__block_size);
-            __base::__map_.pop_front();
-            __base::__start_ -= __base::__block_size;
-        }
-        if (__back_spare() >= __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-            __base::__map_.pop_back();
-        }
-    }
-    __base::__map_.shrink_to_fit();
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::operator[](size_type __i)
-{
-    size_type __p = __base::__start_ + __i;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::operator[](size_type __i) const
-{
-    size_type __p = __base::__start_ + __i;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::at(size_type __i)
-{
-    if (__i >= __base::size())
-        __base::__throw_out_of_range();
-    size_type __p = __base::__start_ + __i;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::at(size_type __i) const
-{
-    if (__i >= __base::size())
-        __base::__throw_out_of_range();
-    size_type __p = __base::__start_ + __i;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::front()
-{
-    return *(*(__base::__map_.begin() + __base::__start_ / __base::__block_size)
-                                      + __base::__start_ % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::front() const
-{
-    return *(*(__base::__map_.begin() + __base::__start_ / __base::__block_size)
-                                      + __base::__start_ % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::reference
-deque<_Tp, _Allocator>::back()
-{
-    size_type __p = __base::size() + __base::__start_ - 1;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename deque<_Tp, _Allocator>::const_reference
-deque<_Tp, _Allocator>::back() const
-{
-    size_type __p = __base::size() + __base::__start_ - 1;
-    return *(*(__base::__map_.begin() + __p / __base::__block_size) + __p % __base::__block_size);
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::push_back(const value_type& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__back_spare() == 0)
-        __add_back_capacity();
-    // __back_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), __v);
-    ++__base::size();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::push_back(value_type&& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__back_spare() == 0)
-        __add_back_capacity();
-    // __back_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::move(__v));
-    ++__base::size();
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-void
-deque<_Tp, _Allocator>::emplace_back(_Args&&... __args)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__back_spare() == 0)
-        __add_back_capacity();
-    // __back_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::forward<_Args>(__args)...);
-    ++__base::size();
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::push_front(const value_type& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__front_spare() == 0)
-        __add_front_capacity();
-    // __front_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), __v);
-    --__base::__start_;
-    ++__base::size();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::push_front(value_type&& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__front_spare() == 0)
-        __add_front_capacity();
-    // __front_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::move(__v));
-    --__base::__start_;
-    ++__base::size();
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-void
-deque<_Tp, _Allocator>::emplace_front(_Args&&... __args)
-{
-    allocator_type& __a = __base::__alloc();
-    if (__front_spare() == 0)
-        __add_front_capacity();
-    // __front_spare() >= 1
-    __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::forward<_Args>(__args)...);
-    --__base::__start_;
-    ++__base::size();
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, const value_type& __v)
-{
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__front_spare() == 0)
-            __add_front_capacity();
-        // __front_spare() >= 1
-        if (__pos == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), __v);
-            --__base::__start_;
-            ++__base::size();
-        }
-        else
-        {
-            const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
-            iterator __b = __base::begin();
-            iterator __bm1 = _VSTD::prev(__b);
-            if (__vt == pointer_traits<const_pointer>::pointer_to(*__b))
-                __vt = pointer_traits<const_pointer>::pointer_to(*__bm1);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__bm1), _VSTD::move(*__b));
-            --__base::__start_;
-            ++__base::size();
-            if (__pos > 1)
-                __b = __move_and_check(_VSTD::next(__b), __b + __pos, __b, __vt);
-            *__b = *__vt;
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        if (__back_spare() == 0)
-            __add_back_capacity();
-        // __back_capacity >= 1
-        size_type __de = __base::size() - __pos;
-        if (__de == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), __v);
-            ++__base::size();
-        }
-        else
-        {
-            const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
-            iterator __e = __base::end();
-            iterator __em1 = _VSTD::prev(__e);
-            if (__vt == pointer_traits<const_pointer>::pointer_to(*__em1))
-                __vt = pointer_traits<const_pointer>::pointer_to(*__e);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__e), _VSTD::move(*__em1));
-            ++__base::size();
-            if (__de > 1)
-                __e = __move_backward_and_check(__e - __de, __em1, __e, __vt);
-            *--__e = *__vt;
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, value_type&& __v)
-{
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__front_spare() == 0)
-            __add_front_capacity();
-        // __front_spare() >= 1
-        if (__pos == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::move(__v));
-            --__base::__start_;
-            ++__base::size();
-        }
-        else
-        {
-            iterator __b = __base::begin();
-            iterator __bm1 = _VSTD::prev(__b);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__bm1), _VSTD::move(*__b));
-            --__base::__start_;
-            ++__base::size();
-            if (__pos > 1)
-                __b = _VSTD::move(_VSTD::next(__b), __b + __pos, __b);
-            *__b = _VSTD::move(__v);
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        if (__back_spare() == 0)
-            __add_back_capacity();
-        // __back_capacity >= 1
-        size_type __de = __base::size() - __pos;
-        if (__de == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::move(__v));
-            ++__base::size();
-        }
-        else
-        {
-            iterator __e = __base::end();
-            iterator __em1 = _VSTD::prev(__e);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__e), _VSTD::move(*__em1));
-            ++__base::size();
-            if (__de > 1)
-                __e = _VSTD::move_backward(__e - __de, __em1, __e);
-            *--__e = _VSTD::move(__v);
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::emplace(const_iterator __p, _Args&&... __args)
-{
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__front_spare() == 0)
-            __add_front_capacity();
-        // __front_spare() >= 1
-        if (__pos == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*--__base::begin()), _VSTD::forward<_Args>(__args)...);
-            --__base::__start_;
-            ++__base::size();
-        }
-        else
-        {
-            value_type __tmp(_VSTD::forward<_Args>(__args)...);
-            iterator __b = __base::begin();
-            iterator __bm1 = _VSTD::prev(__b);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__bm1), _VSTD::move(*__b));
-            --__base::__start_;
-            ++__base::size();
-            if (__pos > 1)
-                __b = _VSTD::move(_VSTD::next(__b), __b + __pos, __b);
-            *__b = _VSTD::move(__tmp);
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        if (__back_spare() == 0)
-            __add_back_capacity();
-        // __back_capacity >= 1
-        size_type __de = __base::size() - __pos;
-        if (__de == 0)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*__base::end()), _VSTD::forward<_Args>(__args)...);
-            ++__base::size();
-        }
-        else
-        {
-            value_type __tmp(_VSTD::forward<_Args>(__args)...);
-            iterator __e = __base::end();
-            iterator __em1 = _VSTD::prev(__e);
-            __alloc_traits::construct(__a, _VSTD::addressof(*__e), _VSTD::move(*__em1));
-            ++__base::size();
-            if (__de > 1)
-                __e = _VSTD::move_backward(__e - __de, __em1, __e);
-            *--__e = _VSTD::move(__tmp);
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, size_type __n, const value_type& __v)
-{
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__n > __front_spare())
-            __add_front_capacity(__n - __front_spare());
-        // __n <= __front_spare()
-        size_type __old_n = __n;
-        iterator __old_begin = __base::begin();
-        iterator __i = __old_begin;
-        if (__n > __pos)
-        {
-            for (size_type __m = __n - __pos; __m; --__m, --__base::__start_, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*--__i), __v);
-            __n = __pos;
-        }
-        if (__n > 0)
-        {
-            const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
-            iterator __obn = __old_begin + __n;
-            __move_construct_backward_and_check(__old_begin, __obn, __i, __vt);
-            if (__n < __pos)
-                __old_begin = __move_and_check(__obn, __old_begin + __pos, __old_begin, __vt);
-            _VSTD::fill_n(__old_begin, __n, *__vt);
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        size_type __back_capacity = __back_spare();
-        if (__n > __back_capacity)
-            __add_back_capacity(__n - __back_capacity);
-        // __n <= __back_capacity
-        size_type __old_n = __n;
-        iterator __old_end = __base::end();
-        iterator __i = __old_end;
-        size_type __de = __base::size() - __pos;
-        if (__n > __de)
-        {
-            for (size_type __m = __n - __de; __m; --__m, ++__i, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*__i), __v);
-            __n = __de;
-        }
-        if (__n > 0)
-        {
-            const_pointer __vt = pointer_traits<const_pointer>::pointer_to(__v);
-            iterator __oen = __old_end - __n;
-            __move_construct_and_check(__oen, __old_end, __i, __vt);
-            if (__n < __de)
-                __old_end = __move_backward_and_check(__old_end - __de, __oen, __old_end, __vt);
-            _VSTD::fill_n(__old_end - __n, __n, *__vt);
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIter>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, _InputIter __f, _InputIter __l,
-                               typename enable_if<__is_input_iterator<_InputIter>::value
-                                               &&!__is_bidirectional_iterator<_InputIter>::value>::type*)
-{
-    __split_buffer<value_type, allocator_type&> __buf(__base::__alloc());
-    __buf.__construct_at_end(__f, __l);
-    typedef typename __split_buffer<value_type, allocator_type&>::iterator __bi;
-    return insert(__p, move_iterator<__bi>(__buf.begin()), move_iterator<__bi>(__buf.end()));
-}
-
-template <class _Tp, class _Allocator>
-template <class _BiIter>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::insert(const_iterator __p, _BiIter __f, _BiIter __l,
-                               typename enable_if<__is_bidirectional_iterator<_BiIter>::value>::type*)
-{
-    size_type __n = _VSTD::distance(__f, __l);
-    size_type __pos = __p - __base::begin();
-    size_type __to_end = __base::size() - __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < __to_end)
-    {   // insert by shifting things backward
-        if (__n > __front_spare())
-            __add_front_capacity(__n - __front_spare());
-        // __n <= __front_spare()
-        size_type __old_n = __n;
-        iterator __old_begin = __base::begin();
-        iterator __i = __old_begin;
-        _BiIter __m = __f;
-        if (__n > __pos)
-        {
-            __m = __pos < __n / 2 ? _VSTD::prev(__l, __pos) : _VSTD::next(__f, __n - __pos);
-            for (_BiIter __j = __m; __j != __f; --__base::__start_, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*--__i), *--__j);
-            __n = __pos;
-        }
-        if (__n > 0)
-        {
-            iterator __obn = __old_begin + __n;
-            for (iterator __j = __obn; __j != __old_begin;)
-            {
-                __alloc_traits::construct(__a, _VSTD::addressof(*--__i), _VSTD::move(*--__j));
-                --__base::__start_;
-                ++__base::size();
-            }
-            if (__n < __pos)
-                __old_begin = _VSTD::move(__obn, __old_begin + __pos, __old_begin);
-            _VSTD::copy(__m, __l, __old_begin);
-        }
-    }
-    else
-    {   // insert by shifting things forward
-        size_type __back_capacity = __back_spare();
-        if (__n > __back_capacity)
-            __add_back_capacity(__n - __back_capacity);
-        // __n <= __back_capacity
-        size_type __old_n = __n;
-        iterator __old_end = __base::end();
-        iterator __i = __old_end;
-        _BiIter __m = __l;
-        size_type __de = __base::size() - __pos;
-        if (__n > __de)
-        {
-            __m = __de < __n / 2 ? _VSTD::next(__f, __de) : _VSTD::prev(__l, __n - __de);
-            for (_BiIter __j = __m; __j != __l; ++__i, (void) ++__j, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*__i), *__j);
-            __n = __de;
-        }
-        if (__n > 0)
-        {
-            iterator __oen = __old_end - __n;
-            for (iterator __j = __oen; __j != __old_end; ++__i, ++__j, ++__base::size())
-                __alloc_traits::construct(__a, _VSTD::addressof(*__i), _VSTD::move(*__j));
-            if (__n < __de)
-                __old_end = _VSTD::move_backward(__old_end - __de, __oen, __old_end);
-            _VSTD::copy_backward(__f, __m, __old_end);
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-template <class _Tp, class _Allocator>
-template <class _InpIter>
-void
-deque<_Tp, _Allocator>::__append(_InpIter __f, _InpIter __l,
-                                 typename enable_if<__is_input_iterator<_InpIter>::value &&
-                                                   !__is_forward_iterator<_InpIter>::value>::type*)
-{
-    for (; __f != __l; ++__f)
-        push_back(*__f);
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForIter>
-void
-deque<_Tp, _Allocator>::__append(_ForIter __f, _ForIter __l,
-                                 typename enable_if<__is_forward_iterator<_ForIter>::value>::type*)
-{
-    size_type __n = _VSTD::distance(__f, __l);
-    allocator_type& __a = __base::__alloc();
-    size_type __back_capacity = __back_spare();
-    if (__n > __back_capacity)
-        __add_back_capacity(__n - __back_capacity);
-    // __n <= __back_capacity
-    for (iterator __i = __base::end(); __f != __l; ++__i, (void) ++__f, ++__base::size())
-        __alloc_traits::construct(__a, _VSTD::addressof(*__i), *__f);
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__append(size_type __n)
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __back_capacity = __back_spare();
-    if (__n > __back_capacity)
-        __add_back_capacity(__n - __back_capacity);
-    // __n <= __back_capacity
-    for (iterator __i = __base::end(); __n; --__n, ++__i, ++__base::size())
-        __alloc_traits::construct(__a, _VSTD::addressof(*__i));
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__append(size_type __n, const value_type& __v)
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __back_capacity = __back_spare();
-    if (__n > __back_capacity)
-        __add_back_capacity(__n - __back_capacity);
-    // __n <= __back_capacity
-    for (iterator __i = __base::end(); __n; --__n, ++__i, ++__base::size())
-        __alloc_traits::construct(__a, _VSTD::addressof(*__i), __v);
-}
-
-// Create front capacity for one block of elements.
-// Strong guarantee.  Either do it or don't touch anything.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__add_front_capacity()
-{
-    allocator_type& __a = __base::__alloc();
-    if (__back_spare() >= __base::__block_size)
-    {
-        __base::__start_ += __base::__block_size;
-        pointer __pt = __base::__map_.back();
-        __base::__map_.pop_back();
-        __base::__map_.push_front(__pt);
-    }
-    // Else if __base::__map_.size() < __base::__map_.capacity() then we need to allocate 1 buffer
-    else if (__base::__map_.size() < __base::__map_.capacity())
-    {   // we can put the new buffer into the map, but don't shift things around
-        // until all buffers are allocated.  If we throw, we don't need to fix
-        // anything up (any added buffers are undetectible)
-        if (__base::__map_.__front_spare() > 0)
-            __base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));
-        else
-        {
-            __base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-            // Done allocating, reorder capacity
-            pointer __pt = __base::__map_.back();
-            __base::__map_.pop_back();
-            __base::__map_.push_front(__pt);
-        }
-        __base::__start_ = __base::__map_.size() == 1 ?
-                               __base::__block_size / 2 :
-                               __base::__start_ + __base::__block_size;
-    }
-    // Else need to allocate 1 buffer, *and* we need to reallocate __map_.
-    else
-    {
-        __split_buffer<pointer, typename __base::__pointer_allocator&>
-            __buf(max<size_type>(2 * __base::__map_.capacity(), 1),
-                  0, __base::__map_.__alloc());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            __alloc_traits::deallocate(__a, __buf.front(), __base::__block_size);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (typename __base::__map_pointer __i = __base::__map_.begin();
-                __i != __base::__map_.end(); ++__i)
-            __buf.push_back(*__i);
-        _VSTD::swap(__base::__map_.__first_, __buf.__first_);
-        _VSTD::swap(__base::__map_.__begin_, __buf.__begin_);
-        _VSTD::swap(__base::__map_.__end_, __buf.__end_);
-        _VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());
-        __base::__start_ = __base::__map_.size() == 1 ?
-                               __base::__block_size / 2 :
-                               __base::__start_ + __base::__block_size;
-    }
-}
-
-// Create front capacity for __n elements.
-// Strong guarantee.  Either do it or don't touch anything.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__add_front_capacity(size_type __n)
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __nb = __recommend_blocks(__n + __base::__map_.empty());
-    // Number of unused blocks at back:
-    size_type __back_capacity = __back_spare() / __base::__block_size;
-    __back_capacity = _VSTD::min(__back_capacity, __nb);  // don't take more than you need
-    __nb -= __back_capacity;  // number of blocks need to allocate
-    // If __nb == 0, then we have sufficient capacity.
-    if (__nb == 0)
-    {
-        __base::__start_ += __base::__block_size * __back_capacity;
-        for (; __back_capacity > 0; --__back_capacity)
-        {
-            pointer __pt = __base::__map_.back();
-            __base::__map_.pop_back();
-            __base::__map_.push_front(__pt);
-        }
-    }
-    // Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers
-    else if (__nb <= __base::__map_.capacity() - __base::__map_.size())
-    {   // we can put the new buffers into the map, but don't shift things around
-        // until all buffers are allocated.  If we throw, we don't need to fix
-        // anything up (any added buffers are undetectible)
-        for (; __nb > 0; --__nb, __base::__start_ += __base::__block_size - (__base::__map_.size() == 1))
-        {
-            if (__base::__map_.__front_spare() == 0)
-                break;
-            __base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));
-        }
-        for (; __nb > 0; --__nb, ++__back_capacity)
-            __base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-        // Done allocating, reorder capacity
-        __base::__start_ += __back_capacity * __base::__block_size;
-        for (; __back_capacity > 0; --__back_capacity)
-        {
-            pointer __pt = __base::__map_.back();
-            __base::__map_.pop_back();
-            __base::__map_.push_front(__pt);
-        }
-    }
-    // Else need to allocate __nb buffers, *and* we need to reallocate __map_.
-    else
-    {
-        size_type __ds = (__nb + __back_capacity) * __base::__block_size - __base::__map_.empty();
-        __split_buffer<pointer, typename __base::__pointer_allocator&>
-            __buf(max<size_type>(2* __base::__map_.capacity(),
-                                 __nb + __base::__map_.size()),
-                  0, __base::__map_.__alloc());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __nb > 0; --__nb)
-                __buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            for (typename __base::__map_pointer __i = __buf.begin();
-                    __i != __buf.end(); ++__i)
-                __alloc_traits::deallocate(__a, *__i, __base::__block_size);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (; __back_capacity > 0; --__back_capacity)
-        {
-            __buf.push_back(__base::__map_.back());
-            __base::__map_.pop_back();
-        }
-        for (typename __base::__map_pointer __i = __base::__map_.begin();
-                __i != __base::__map_.end(); ++__i)
-            __buf.push_back(*__i);
-        _VSTD::swap(__base::__map_.__first_, __buf.__first_);
-        _VSTD::swap(__base::__map_.__begin_, __buf.__begin_);
-        _VSTD::swap(__base::__map_.__end_, __buf.__end_);
-        _VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());
-        __base::__start_ += __ds;
-    }
-}
-
-// Create back capacity for one block of elements.
-// Strong guarantee.  Either do it or don't touch anything.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__add_back_capacity()
-{
-    allocator_type& __a = __base::__alloc();
-    if (__front_spare() >= __base::__block_size)
-    {
-        __base::__start_ -= __base::__block_size;
-        pointer __pt = __base::__map_.front();
-        __base::__map_.pop_front();
-        __base::__map_.push_back(__pt);
-    }
-    // Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers
-    else if (__base::__map_.size() < __base::__map_.capacity())
-    {   // we can put the new buffer into the map, but don't shift things around
-        // until it is allocated.  If we throw, we don't need to fix
-        // anything up (any added buffers are undetectible)
-        if (__base::__map_.__back_spare() != 0)
-            __base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-        else
-        {
-            __base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));
-            // Done allocating, reorder capacity
-            pointer __pt = __base::__map_.front();
-            __base::__map_.pop_front();
-            __base::__map_.push_back(__pt);
-        }
-    }
-    // Else need to allocate 1 buffer, *and* we need to reallocate __map_.
-    else
-    {
-        __split_buffer<pointer, typename __base::__pointer_allocator&>
-            __buf(max<size_type>(2* __base::__map_.capacity(), 1),
-                  __base::__map_.size(),
-                  __base::__map_.__alloc());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            __alloc_traits::deallocate(__a, __buf.back(), __base::__block_size);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (typename __base::__map_pointer __i = __base::__map_.end();
-                __i != __base::__map_.begin();)
-            __buf.push_front(*--__i);
-        _VSTD::swap(__base::__map_.__first_, __buf.__first_);
-        _VSTD::swap(__base::__map_.__begin_, __buf.__begin_);
-        _VSTD::swap(__base::__map_.__end_, __buf.__end_);
-        _VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());
-    }
-}
-
-// Create back capacity for __n elements.
-// Strong guarantee.  Either do it or don't touch anything.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__add_back_capacity(size_type __n)
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __nb = __recommend_blocks(__n + __base::__map_.empty());
-    // Number of unused blocks at front:
-    size_type __front_capacity = __front_spare() / __base::__block_size;
-    __front_capacity = _VSTD::min(__front_capacity, __nb);  // don't take more than you need
-    __nb -= __front_capacity;  // number of blocks need to allocate
-    // If __nb == 0, then we have sufficient capacity.
-    if (__nb == 0)
-    {
-        __base::__start_ -= __base::__block_size * __front_capacity;
-        for (; __front_capacity > 0; --__front_capacity)
-        {
-            pointer __pt = __base::__map_.front();
-            __base::__map_.pop_front();
-            __base::__map_.push_back(__pt);
-        }
-    }
-    // Else if __nb <= __map_.capacity() - __map_.size() then we need to allocate __nb buffers
-    else if (__nb <= __base::__map_.capacity() - __base::__map_.size())
-    {   // we can put the new buffers into the map, but don't shift things around
-        // until all buffers are allocated.  If we throw, we don't need to fix
-        // anything up (any added buffers are undetectible)
-        for (; __nb > 0; --__nb)
-        {
-            if (__base::__map_.__back_spare() == 0)
-                break;
-            __base::__map_.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-        }
-        for (; __nb > 0; --__nb, ++__front_capacity, __base::__start_ +=
-                                 __base::__block_size - (__base::__map_.size() == 1))
-            __base::__map_.push_front(__alloc_traits::allocate(__a, __base::__block_size));
-        // Done allocating, reorder capacity
-        __base::__start_ -= __base::__block_size * __front_capacity;
-        for (; __front_capacity > 0; --__front_capacity)
-        {
-            pointer __pt = __base::__map_.front();
-            __base::__map_.pop_front();
-            __base::__map_.push_back(__pt);
-        }
-    }
-    // Else need to allocate __nb buffers, *and* we need to reallocate __map_.
-    else
-    {
-        size_type __ds = __front_capacity * __base::__block_size;
-        __split_buffer<pointer, typename __base::__pointer_allocator&>
-            __buf(max<size_type>(2* __base::__map_.capacity(),
-                                 __nb + __base::__map_.size()),
-                  __base::__map_.size() - __front_capacity,
-                  __base::__map_.__alloc());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __nb > 0; --__nb)
-                __buf.push_back(__alloc_traits::allocate(__a, __base::__block_size));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            for (typename __base::__map_pointer __i = __buf.begin();
-                    __i != __buf.end(); ++__i)
-                __alloc_traits::deallocate(__a, *__i, __base::__block_size);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (; __front_capacity > 0; --__front_capacity)
-        {
-            __buf.push_back(__base::__map_.front());
-            __base::__map_.pop_front();
-        }
-        for (typename __base::__map_pointer __i = __base::__map_.end();
-                __i != __base::__map_.begin();)
-            __buf.push_front(*--__i);
-        _VSTD::swap(__base::__map_.__first_, __buf.__first_);
-        _VSTD::swap(__base::__map_.__begin_, __buf.__begin_);
-        _VSTD::swap(__base::__map_.__end_, __buf.__end_);
-        _VSTD::swap(__base::__map_.__end_cap(), __buf.__end_cap());
-        __base::__start_ -= __ds;
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::pop_front()
-{
-    allocator_type& __a = __base::__alloc();
-    __alloc_traits::destroy(__a, __to_raw_pointer(*(__base::__map_.begin() +
-                                                    __base::__start_ / __base::__block_size) +
-                                                    __base::__start_ % __base::__block_size));
-    --__base::size();
-    if (++__base::__start_ >= 2 * __base::__block_size)
-    {
-        __alloc_traits::deallocate(__a, __base::__map_.front(), __base::__block_size);
-        __base::__map_.pop_front();
-        __base::__start_ -= __base::__block_size;
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::pop_back()
-{
-    allocator_type& __a = __base::__alloc();
-    size_type __p = __base::size() + __base::__start_ - 1;
-    __alloc_traits::destroy(__a, __to_raw_pointer(*(__base::__map_.begin() +
-                                                    __p / __base::__block_size) +
-                                                    __p % __base::__block_size));
-    --__base::size();
-    if (__back_spare() >= 2 * __base::__block_size)
-    {
-        __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-        __base::__map_.pop_back();
-    }
-}
-
-// move assign [__f, __l) to [__r, __r + (__l-__f)).
-// If __vt points into [__f, __l), then subtract (__f - __r) from __vt.
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::__move_and_check(iterator __f, iterator __l, iterator __r,
-                                         const_pointer& __vt)
-{
-    // as if
-    //   for (; __f != __l; ++__f, ++__r)
-    //       *__r = _VSTD::move(*__f);
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + __base::__block_size;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        if (__fb <= __vt && __vt < __fe)
-            __vt = (const_iterator(static_cast<__map_const_pointer>(__f.__m_iter_), __vt) -= __f - __r).__ptr_;
-        __r = _VSTD::move(__fb, __fe, __r);
-        __n -= __bs;
-        __f += __bs;
-    }
-    return __r;
-}
-
-// move assign [__f, __l) to [__r - (__l-__f), __r) backwards.
-// If __vt points into [__f, __l), then add (__r - __l) to __vt.
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::__move_backward_and_check(iterator __f, iterator __l, iterator __r,
-                                                  const_pointer& __vt)
-{
-    // as if
-    //   while (__f != __l)
-    //       *--__r = _VSTD::move(*--__l);
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        if (__lb <= __vt && __vt < __le)
-            __vt = (const_iterator(static_cast<__map_const_pointer>(__l.__m_iter_), __vt) += __r - __l - 1).__ptr_;
-        __r = _VSTD::move_backward(__lb, __le, __r);
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-    return __r;
-}
-
-// move construct [__f, __l) to [__r, __r + (__l-__f)).
-// If __vt points into [__f, __l), then add (__r - __f) to __vt.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__move_construct_and_check(iterator __f, iterator __l,
-                                                   iterator __r, const_pointer& __vt)
-{
-    allocator_type& __a = __base::__alloc();
-    // as if
-    //   for (; __f != __l; ++__r, ++__f, ++__base::size())
-    //       __alloc_traits::construct(__a, _VSTD::addressof(*__r), _VSTD::move(*__f));
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        pointer __fb = __f.__ptr_;
-        pointer __fe = *__f.__m_iter_ + __base::__block_size;
-        difference_type __bs = __fe - __fb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __fe = __fb + __bs;
-        }
-        if (__fb <= __vt && __vt < __fe)
-            __vt = (const_iterator(static_cast<__map_const_pointer>(__f.__m_iter_), __vt) += __r - __f).__ptr_;
-        for (; __fb != __fe; ++__fb, ++__r, ++__base::size())
-            __alloc_traits::construct(__a, _VSTD::addressof(*__r), _VSTD::move(*__fb));
-        __n -= __bs;
-        __f += __bs;
-    }
-}
-
-// move construct [__f, __l) to [__r - (__l-__f), __r) backwards.
-// If __vt points into [__f, __l), then subtract (__l - __r) from __vt.
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__move_construct_backward_and_check(iterator __f, iterator __l,
-                                                            iterator __r, const_pointer& __vt)
-{
-    allocator_type& __a = __base::__alloc();
-    // as if
-    //   for (iterator __j = __l; __j != __f;)
-    //   {
-    //       __alloc_traitsconstruct(__a, _VSTD::addressof(*--__r), _VSTD::move(*--__j));
-    //       --__base::__start_;
-    //       ++__base::size();
-    //   }
-    difference_type __n = __l - __f;
-    while (__n > 0)
-    {
-        --__l;
-        pointer __lb = *__l.__m_iter_;
-        pointer __le = __l.__ptr_ + 1;
-        difference_type __bs = __le - __lb;
-        if (__bs > __n)
-        {
-            __bs = __n;
-            __lb = __le - __bs;
-        }
-        if (__lb <= __vt && __vt < __le)
-            __vt = (const_iterator(static_cast<__map_const_pointer>(__l.__m_iter_), __vt) -= __l - __r + 1).__ptr_;
-        while (__le != __lb)
-        {
-            __alloc_traits::construct(__a, _VSTD::addressof(*--__r), _VSTD::move(*--__le));
-            --__base::__start_;
-            ++__base::size();
-        }
-        __n -= __bs;
-        __l -= __bs - 1;
-    }
-}
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::erase(const_iterator __f)
-{
-    difference_type __n = 1;
-    iterator __b = __base::begin();
-    difference_type __pos = __f - __b;
-    iterator __p = __b + __pos;
-    allocator_type& __a = __base::__alloc();
-    if (__pos < (__base::size() - 1) / 2)
-    {   // erase from front
-        _VSTD::move_backward(__b, __p, _VSTD::next(__p));
-        __alloc_traits::destroy(__a, _VSTD::addressof(*__b));
-        --__base::size();
-        ++__base::__start_;
-        if (__front_spare() >= 2 * __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.front(), __base::__block_size);
-            __base::__map_.pop_front();
-            __base::__start_ -= __base::__block_size;
-        }
-    }
-    else
-    {   // erase from back
-        iterator __i = _VSTD::move(_VSTD::next(__p), __base::end(), __p);
-        __alloc_traits::destroy(__a, _VSTD::addressof(*__i));
-        --__base::size();
-        if (__back_spare() >= 2 * __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-            __base::__map_.pop_back();
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-template <class _Tp, class _Allocator>
-typename deque<_Tp, _Allocator>::iterator
-deque<_Tp, _Allocator>::erase(const_iterator __f, const_iterator __l)
-{
-    difference_type __n = __l - __f;
-    iterator __b = __base::begin();
-    difference_type __pos = __f - __b;
-    iterator __p = __b + __pos;
-    if (__n > 0)
-    {
-        allocator_type& __a = __base::__alloc();
-        if (__pos < (__base::size() - __n) / 2)
-        {   // erase from front
-            iterator __i = _VSTD::move_backward(__b, __p, __p + __n);
-            for (; __b != __i; ++__b)
-                __alloc_traits::destroy(__a, _VSTD::addressof(*__b));
-            __base::size() -= __n;
-            __base::__start_ += __n;
-            while (__front_spare() >= 2 * __base::__block_size)
-            {
-                __alloc_traits::deallocate(__a, __base::__map_.front(), __base::__block_size);
-                __base::__map_.pop_front();
-                __base::__start_ -= __base::__block_size;
-            }
-        }
-        else
-        {   // erase from back
-            iterator __i = _VSTD::move(__p + __n, __base::end(), __p);
-            for (iterator __e = __base::end(); __i != __e; ++__i)
-                __alloc_traits::destroy(__a, _VSTD::addressof(*__i));
-            __base::size() -= __n;
-            while (__back_spare() >= 2 * __base::__block_size)
-            {
-                __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-                __base::__map_.pop_back();
-            }
-        }
-    }
-    return __base::begin() + __pos;
-}
-
-template <class _Tp, class _Allocator>
-void
-deque<_Tp, _Allocator>::__erase_to_end(const_iterator __f)
-{
-    iterator __e = __base::end();
-    difference_type __n = __e - __f;
-    if (__n > 0)
-    {
-        allocator_type& __a = __base::__alloc();
-        iterator __b = __base::begin();
-        difference_type __pos = __f - __b;
-        for (iterator __p = __b + __pos; __p != __e; ++__p)
-            __alloc_traits::destroy(__a, _VSTD::addressof(*__p));
-        __base::size() -= __n;
-        while (__back_spare() >= 2 * __base::__block_size)
-        {
-            __alloc_traits::deallocate(__a, __base::__map_.back(), __base::__block_size);
-            __base::__map_.pop_back();
-        }
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-deque<_Tp, _Allocator>::swap(deque& __c)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-    __base::swap(__c);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-deque<_Tp, _Allocator>::clear() _NOEXCEPT
-{
-    __base::clear();
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    const typename deque<_Tp, _Allocator>::size_type __sz = __x.size();
-    return __sz == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const deque<_Tp, _Allocator>& __x, const deque<_Tp, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(deque<_Tp, _Allocator>& __x, deque<_Tp, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_DEQUE
diff --git a/include.new/c++/v1/tr1/exception b/include.new/c++/v1/tr1/exception
deleted file mode 100644
index cad802e..0000000
--- a/include.new/c++/v1/tr1/exception
+++ /dev/null
@@ -1,250 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- exception ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_EXCEPTION
-#define _LIBCPP_EXCEPTION
-
-/*
-    exception synopsis
-
-namespace std
-{
-
-class exception
-{
-public:
-    exception() noexcept;
-    exception(const exception&) noexcept;
-    exception& operator=(const exception&) noexcept;
-    virtual ~exception() noexcept;
-    virtual const char* what() const noexcept;
-};
-
-class bad_exception
-    : public exception
-{
-public:
-    bad_exception() noexcept;
-    bad_exception(const bad_exception&) noexcept;
-    bad_exception& operator=(const bad_exception&) noexcept;
-    virtual ~bad_exception() noexcept;
-    virtual const char* what() const noexcept;
-};
-
-typedef void (*unexpected_handler)();
-unexpected_handler set_unexpected(unexpected_handler  f ) noexcept;
-unexpected_handler get_unexpected() noexcept;
-[[noreturn]] void unexpected();
-
-typedef void (*terminate_handler)();
-terminate_handler set_terminate(terminate_handler  f ) noexcept;
-terminate_handler get_terminate() noexcept;
-[[noreturn]] void terminate() noexcept;
-
-bool uncaught_exception() noexcept;
-
-typedef unspecified exception_ptr;
-
-exception_ptr current_exception() noexcept;
-void rethrow_exception [[noreturn]] (exception_ptr p);
-template<class E> exception_ptr make_exception_ptr(E e) noexcept;
-
-class nested_exception
-{
-public:
-    nested_exception() noexcept;
-    nested_exception(const nested_exception&) noexcept = default;
-    nested_exception& operator=(const nested_exception&) noexcept = default;
-    virtual ~nested_exception() = default;
-
-    // access functions
-    [[noreturn]] void rethrow_nested() const;
-    exception_ptr nested_ptr() const noexcept;
-};
-
-template <class T> [[noreturn]] void throw_with_nested(T&& t);
-template <class E> void rethrow_if_nested(const E& e);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cstddef>
-#include <type_traits>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-namespace std  // purposefully not using versioning namespace
-{
-
-class _LIBCPP_EXCEPTION_ABI exception
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY exception() _NOEXCEPT {}
-    virtual ~exception() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI bad_exception
-    : public exception
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY bad_exception() _NOEXCEPT {}
-    virtual ~bad_exception() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-typedef void (*unexpected_handler)();
-_LIBCPP_FUNC_VIS unexpected_handler set_unexpected(unexpected_handler) _NOEXCEPT;
-_LIBCPP_FUNC_VIS unexpected_handler get_unexpected() _NOEXCEPT;
-_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void unexpected();
-
-typedef void (*terminate_handler)();
-_LIBCPP_FUNC_VIS terminate_handler set_terminate(terminate_handler) _NOEXCEPT;
-_LIBCPP_FUNC_VIS terminate_handler get_terminate() _NOEXCEPT;
-_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void terminate() _NOEXCEPT;
-
-_LIBCPP_FUNC_VIS bool uncaught_exception() _NOEXCEPT;
-
-class _LIBCPP_TYPE_VIS exception_ptr;
-
-_LIBCPP_FUNC_VIS exception_ptr current_exception() _NOEXCEPT;
-_LIBCPP_NORETURN _LIBCPP_FUNC_VIS void rethrow_exception(exception_ptr);
-
-class _LIBCPP_TYPE_VIS exception_ptr
-{
-    void* __ptr_;
-public:
-    _LIBCPP_INLINE_VISIBILITY exception_ptr() _NOEXCEPT : __ptr_() {}
-    _LIBCPP_INLINE_VISIBILITY exception_ptr(nullptr_t) _NOEXCEPT : __ptr_() {}
-    exception_ptr(const exception_ptr&) _NOEXCEPT;
-    exception_ptr& operator=(const exception_ptr&) _NOEXCEPT;
-    ~exception_ptr() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_EXPLICIT
-        operator bool() const _NOEXCEPT {return __ptr_ != nullptr;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const exception_ptr& __x, const exception_ptr& __y) _NOEXCEPT
-        {return !(__x == __y);}
-
-    friend _LIBCPP_FUNC_VIS exception_ptr current_exception() _NOEXCEPT;
-    friend _LIBCPP_FUNC_VIS void rethrow_exception(exception_ptr);
-};
-
-template<class _Ep>
-exception_ptr
-make_exception_ptr(_Ep __e) _NOEXCEPT
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-        throw __e;
-    }
-    catch (...)
-    {
-        return current_exception();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-// nested_exception
-
-class _LIBCPP_EXCEPTION_ABI nested_exception
-{
-    exception_ptr __ptr_;
-public:
-    nested_exception() _NOEXCEPT;
-//     nested_exception(const nested_exception&) noexcept = default;
-//     nested_exception& operator=(const nested_exception&) noexcept = default;
-    virtual ~nested_exception() _NOEXCEPT;
-
-    // access functions
-    _LIBCPP_NORETURN void rethrow_nested() const;
-    _LIBCPP_INLINE_VISIBILITY exception_ptr nested_ptr() const _NOEXCEPT {return __ptr_;}
-};
-
-template <class _Tp>
-struct __nested
-    : public _Tp,
-      public nested_exception
-{
-    _LIBCPP_INLINE_VISIBILITY explicit __nested(const _Tp& __t) : _Tp(__t) {}
-};
-
-template <class _Tp>
-_LIBCPP_NORETURN
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-throw_with_nested(_Tp&& __t, typename enable_if<
-                  is_class<typename remove_reference<_Tp>::type>::value &&
-                  !is_base_of<nested_exception, typename remove_reference<_Tp>::type>::value
-                                    >::type* = 0)
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-throw_with_nested (_Tp& __t, typename enable_if<
-                  is_class<_Tp>::value && !is_base_of<nested_exception, _Tp>::value
-                                    >::type* = 0)
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw __nested<typename remove_reference<_Tp>::type>(_VSTD::forward<_Tp>(__t));
-#endif
-}
-
-template <class _Tp>
-_LIBCPP_NORETURN
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-throw_with_nested(_Tp&& __t, typename enable_if<
-                  !is_class<typename remove_reference<_Tp>::type>::value ||
-                  is_base_of<nested_exception, typename remove_reference<_Tp>::type>::value
-                                    >::type* = 0)
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-throw_with_nested (_Tp& __t, typename enable_if<
-                  !is_class<_Tp>::value || is_base_of<nested_exception, _Tp>::value
-                                    >::type* = 0)
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw _VSTD::forward<_Tp>(__t);
-#endif
-}
-
-template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-rethrow_if_nested(const _Ep& __e, typename enable_if<
-                                   is_polymorphic<_Ep>::value
-                                                   >::type* = 0)
-{
-    const nested_exception* __nep = dynamic_cast<const nested_exception*>(&__e);
-    if (__nep)
-        __nep->rethrow_nested();
-}
-
-template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-rethrow_if_nested(const _Ep&, typename enable_if<
-                                   !is_polymorphic<_Ep>::value
-                                                   >::type* = 0)
-{
-}
-
-}  // std
-
-#endif  // _LIBCPP_EXCEPTION
diff --git a/include.new/c++/v1/tr1/forward_list b/include.new/c++/v1/tr1/forward_list
deleted file mode 100644
index 651452f..0000000
--- a/include.new/c++/v1/tr1/forward_list
+++ /dev/null
@@ -1,1669 +0,0 @@
-// -*- C++ -*-
-//===----------------------- forward_list ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FORWARD_LIST
-#define _LIBCPP_FORWARD_LIST
-
-/*
-    forward_list synopsis
-
-namespace std
-{
-
-template <class T, class Allocator = allocator<T>>
-class forward_list
-{
-public:
-    typedef T         value_type;
-    typedef Allocator allocator_type;
-
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef <details> iterator;
-    typedef <details> const_iterator;
-
-    forward_list()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit forward_list(const allocator_type& a);
-    explicit forward_list(size_type n);
-    explicit forward_list(size_type n, const allocator_type& a); // C++14
-    forward_list(size_type n, const value_type& v);
-    forward_list(size_type n, const value_type& v, const allocator_type& a);
-    template <class InputIterator>
-        forward_list(InputIterator first, InputIterator last);
-    template <class InputIterator>
-        forward_list(InputIterator first, InputIterator last, const allocator_type& a);
-    forward_list(const forward_list& x);
-    forward_list(const forward_list& x, const allocator_type& a);
-    forward_list(forward_list&& x)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    forward_list(forward_list&& x, const allocator_type& a);
-    forward_list(initializer_list<value_type> il);
-    forward_list(initializer_list<value_type> il, const allocator_type& a);
-
-    ~forward_list();
-
-    forward_list& operator=(const forward_list& x);
-    forward_list& operator=(forward_list&& x)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    forward_list& operator=(initializer_list<value_type> il);
-
-    template <class InputIterator>
-        void assign(InputIterator first, InputIterator last);
-    void assign(size_type n, const value_type& v);
-    void assign(initializer_list<value_type> il);
-
-    allocator_type get_allocator() const noexcept;
-
-    iterator       begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator       end() noexcept;
-    const_iterator end() const noexcept;
-
-    const_iterator cbegin() const noexcept;
-    const_iterator cend() const noexcept;
-
-    iterator       before_begin() noexcept;
-    const_iterator before_begin() const noexcept;
-    const_iterator cbefore_begin() const noexcept;
-
-    bool empty() const noexcept;
-    size_type max_size() const noexcept;
-
-    reference       front();
-    const_reference front() const;
-
-    template <class... Args> void emplace_front(Args&&... args);
-    void push_front(const value_type& v);
-    void push_front(value_type&& v);
-
-    void pop_front();
-
-    template <class... Args>
-        iterator emplace_after(const_iterator p, Args&&... args);
-    iterator insert_after(const_iterator p, const value_type& v);
-    iterator insert_after(const_iterator p, value_type&& v);
-    iterator insert_after(const_iterator p, size_type n, const value_type& v);
-    template <class InputIterator>
-        iterator insert_after(const_iterator p,
-                              InputIterator first, InputIterator last);
-    iterator insert_after(const_iterator p, initializer_list<value_type> il);
-
-    iterator erase_after(const_iterator p);
-    iterator erase_after(const_iterator first, const_iterator last);
-
-    void swap(forward_list& x)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-
-    void resize(size_type n);
-    void resize(size_type n, const value_type& v);
-    void clear() noexcept;
-
-    void splice_after(const_iterator p, forward_list& x);
-    void splice_after(const_iterator p, forward_list&& x);
-    void splice_after(const_iterator p, forward_list& x, const_iterator i);
-    void splice_after(const_iterator p, forward_list&& x, const_iterator i);
-    void splice_after(const_iterator p, forward_list& x,
-                      const_iterator first, const_iterator last);
-    void splice_after(const_iterator p, forward_list&& x,
-                      const_iterator first, const_iterator last);
-    void remove(const value_type& v);
-    template <class Predicate> void remove_if(Predicate pred);
-    void unique();
-    template <class BinaryPredicate> void unique(BinaryPredicate binary_pred);
-    void merge(forward_list& x);
-    void merge(forward_list&& x);
-    template <class Compare> void merge(forward_list& x, Compare comp);
-    template <class Compare> void merge(forward_list&& x, Compare comp);
-    void sort();
-    template <class Compare> void sort(Compare comp);
-    void reverse() noexcept;
-};
-
-template <class T, class Allocator>
-    bool operator==(const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator< (const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator!=(const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator> (const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator>=(const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    bool operator<=(const forward_list<T, Allocator>& x,
-                    const forward_list<T, Allocator>& y);
-
-template <class T, class Allocator>
-    void swap(forward_list<T, Allocator>& x, forward_list<T, Allocator>& y)
-         noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-
-#include <initializer_list>
-#include <memory>
-#include <limits>
-#include <iterator>
-#include <algorithm>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _VoidPtr> struct __forward_list_node;
-
-template <class _NodePtr>
-struct __forward_begin_node
-{
-    typedef _NodePtr pointer;
-
-    pointer __next_;
-
-     _LIBCPP_INLINE_VISIBILITY __forward_begin_node() : __next_(nullptr) {}
-};
-
-template <class _Tp, class _VoidPtr>
-struct _LIBCPP_HIDDEN __begin_node_of
-{
-    typedef __forward_begin_node
-        <
-             typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                 rebind<__forward_list_node<_Tp, _VoidPtr> >
-#else
-                 rebind<__forward_list_node<_Tp, _VoidPtr> >::other
-#endif
-         > type;
-};
-
-template <class _Tp, class _VoidPtr>
-struct __forward_list_node
-    : public __begin_node_of<_Tp, _VoidPtr>::type
-{
-    typedef _Tp value_type;
-
-    value_type __value_;
-};
-
-template<class _Tp, class _Alloc> class _LIBCPP_TYPE_VIS_ONLY forward_list;
-template<class _NodeConstPtr> class _LIBCPP_TYPE_VIS_ONLY __forward_list_const_iterator;
-
-template <class _NodePtr>
-class _LIBCPP_TYPE_VIS_ONLY __forward_list_iterator
-{
-    typedef _NodePtr __node_pointer;
-
-    __node_pointer __ptr_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __forward_list_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
-
-    template<class, class> friend class _LIBCPP_TYPE_VIS_ONLY forward_list;
-    template<class> friend class _LIBCPP_TYPE_VIS_ONLY __forward_list_const_iterator;
-
-public:
-    typedef forward_iterator_tag                              iterator_category;
-    typedef typename pointer_traits<__node_pointer>::element_type::value_type
-                                                              value_type;
-    typedef value_type&                                       reference;
-    typedef typename pointer_traits<__node_pointer>::difference_type
-                                                              difference_type;
-    typedef typename pointer_traits<__node_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                                              pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_iterator() _NOEXCEPT : __ptr_(nullptr) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_iterator& operator++()
-    {
-        __ptr_ = __ptr_->__next_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_iterator operator++(int)
-    {
-        __forward_list_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __forward_list_iterator& __x,
-                    const __forward_list_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __forward_list_iterator& __x,
-                    const __forward_list_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _NodeConstPtr>
-class _LIBCPP_TYPE_VIS_ONLY __forward_list_const_iterator
-{
-    typedef _NodeConstPtr __node_const_pointer;
-
-    __node_const_pointer __ptr_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __forward_list_const_iterator(__node_const_pointer __p) _NOEXCEPT
-        : __ptr_(__p) {}
-
-    typedef typename remove_const
-        <
-            typename pointer_traits<__node_const_pointer>::element_type
-        >::type                                               __node;
-    typedef typename pointer_traits<__node_const_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<__node>
-#else
-            rebind<__node>::other
-#endif
-                                                              __node_pointer;
-
-    template<class, class> friend class forward_list;
-
-public:
-    typedef forward_iterator_tag                              iterator_category;
-    typedef typename __node::value_type                       value_type;
-    typedef const value_type&                                 reference;
-    typedef typename pointer_traits<__node_const_pointer>::difference_type
-                                                              difference_type;
-    typedef typename pointer_traits<__node_const_pointer>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                              pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_const_iterator() _NOEXCEPT : __ptr_(nullptr) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_const_iterator(__forward_list_iterator<__node_pointer> __p) _NOEXCEPT
-        : __ptr_(__p.__ptr_) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__ptr_->__value_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_const_iterator& operator++()
-    {
-        __ptr_ = __ptr_->__next_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_const_iterator operator++(int)
-    {
-        __forward_list_const_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __forward_list_const_iterator& __x,
-                    const __forward_list_const_iterator& __y)
-        {return __x.__ptr_ == __y.__ptr_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __forward_list_const_iterator& __x,
-                           const __forward_list_const_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _Tp, class _Alloc>
-class __forward_list_base
-{
-protected:
-    typedef _Tp    value_type;
-    typedef _Alloc allocator_type;
-
-    typedef typename allocator_traits<allocator_type>::void_pointer  void_pointer;
-    typedef __forward_list_node<value_type, void_pointer>            __node;
-    typedef typename __begin_node_of<value_type, void_pointer>::type __begin_node;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__node>
-#else
-                rebind_alloc<__node>::other
-#endif
-                                                      __node_allocator;
-    typedef allocator_traits<__node_allocator>        __node_traits;
-    typedef typename __node_traits::pointer           __node_pointer;
-    typedef typename __node_traits::pointer           __node_const_pointer;
-
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__begin_node>
-#else
-                rebind_alloc<__begin_node>::other
-#endif
-                                                      __begin_node_allocator;
-    typedef typename allocator_traits<__begin_node_allocator>::pointer __begin_node_pointer;
-
-    __compressed_pair<__begin_node, __node_allocator> __before_begin_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __node_pointer        __before_begin() _NOEXCEPT
-        {return static_cast<__node_pointer>(pointer_traits<__begin_node_pointer>::
-                                        pointer_to(__before_begin_.first()));}
-    _LIBCPP_INLINE_VISIBILITY
-    __node_const_pointer  __before_begin() const _NOEXCEPT
-        {return static_cast<__node_const_pointer>(pointer_traits<__begin_node_pointer>::
-                                        pointer_to(const_cast<__begin_node&>(__before_begin_.first())));}
-
-    _LIBCPP_INLINE_VISIBILITY
-          __node_allocator& __alloc() _NOEXCEPT
-            {return __before_begin_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_allocator& __alloc() const _NOEXCEPT
-        {return __before_begin_.second();}
-
-    typedef __forward_list_iterator<__node_pointer>             iterator;
-    typedef __forward_list_const_iterator<__node_pointer>       const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_base()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value)
-        : __before_begin_(__begin_node()) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __forward_list_base(const allocator_type& __a)
-        : __before_begin_(__begin_node(), __node_allocator(__a)) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-public:
-    __forward_list_base(__forward_list_base&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<__node_allocator>::value);
-    __forward_list_base(__forward_list_base&& __x, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-private:
-    __forward_list_base(const __forward_list_base&);
-    __forward_list_base& operator=(const __forward_list_base&);
-
-public:
-    ~__forward_list_base();
-
-protected:
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __forward_list_base& __x)
-        {__copy_assign_alloc(__x, integral_constant<bool,
-              __node_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__forward_list_base& __x)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_move_assignment::value ||
-                   is_nothrow_move_assignable<__node_allocator>::value)
-        {__move_assign_alloc(__x, integral_constant<bool,
-              __node_traits::propagate_on_container_move_assignment::value>());}
-
-public:
-    void swap(__forward_list_base& __x)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value);
-protected:
-    void clear() _NOEXCEPT;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __forward_list_base&, false_type) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __forward_list_base& __x, true_type)
-    {
-        if (__alloc() != __x.__alloc())
-            clear();
-        __alloc() = __x.__alloc();
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__forward_list_base& __x, false_type) _NOEXCEPT
-        {}
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__forward_list_base& __x, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value)
-        {__alloc() = _VSTD::move(__x.__alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                         __node_traits::propagate_on_container_swap::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y,
-                                                                     false_type)
-        _NOEXCEPT
-        {}
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y,
-                                                                      true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<__node_allocator>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__forward_list_base<_Tp, _Alloc>::__forward_list_base(__forward_list_base&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<__node_allocator>::value)
-    : __before_begin_(_VSTD::move(__x.__before_begin_))
-{
-    __x.__before_begin()->__next_ = nullptr;
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__forward_list_base<_Tp, _Alloc>::__forward_list_base(__forward_list_base&& __x,
-                                                      const allocator_type& __a)
-    : __before_begin_(__begin_node(), __node_allocator(__a))
-{
-    if (__alloc() == __x.__alloc())
-    {
-        __before_begin()->__next_ = __x.__before_begin()->__next_;
-        __x.__before_begin()->__next_ = nullptr;
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-__forward_list_base<_Tp, _Alloc>::~__forward_list_base()
-{
-    clear();
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__forward_list_base<_Tp, _Alloc>::swap(__forward_list_base& __x)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-{
-    __swap_alloc(__alloc(), __x.__alloc());
-    using _VSTD::swap;
-    swap(__before_begin()->__next_, __x.__before_begin()->__next_);
-}
-
-template <class _Tp, class _Alloc>
-void
-__forward_list_base<_Tp, _Alloc>::clear() _NOEXCEPT
-{
-    __node_allocator& __a = __alloc();
-    for (__node_pointer __p = __before_begin()->__next_; __p != nullptr;)
-    {
-        __node_pointer __next = __p->__next_;
-        __node_traits::destroy(__a, _VSTD::addressof(__p->__value_));
-        __node_traits::deallocate(__a, __p, 1);
-        __p = __next;
-    }
-    __before_begin()->__next_ = nullptr;
-}
-
-template <class _Tp, class _Alloc = allocator<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY forward_list
-    : private __forward_list_base<_Tp, _Alloc>
-{
-    typedef __forward_list_base<_Tp, _Alloc> base;
-    typedef typename base::__node_allocator  __node_allocator;
-    typedef typename base::__node            __node;
-    typedef typename base::__node_traits     __node_traits;
-    typedef typename base::__node_pointer    __node_pointer;
-
-public:
-    typedef _Tp    value_type;
-    typedef _Alloc allocator_type;
-
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef typename base::iterator       iterator;
-    typedef typename base::const_iterator const_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    forward_list()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value)
-        {} // = default;
-    explicit forward_list(const allocator_type& __a);
-    explicit forward_list(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit forward_list(size_type __n, const allocator_type& __a);
-#endif
-    forward_list(size_type __n, const value_type& __v);
-    forward_list(size_type __n, const value_type& __v, const allocator_type& __a);
-    template <class _InputIterator>
-        forward_list(_InputIterator __f, _InputIterator __l,
-                     typename enable_if<
-                       __is_input_iterator<_InputIterator>::value
-                     >::type* = nullptr);
-    template <class _InputIterator>
-        forward_list(_InputIterator __f, _InputIterator __l,
-                     const allocator_type& __a,
-                     typename enable_if<
-                       __is_input_iterator<_InputIterator>::value
-                     >::type* = nullptr);
-    forward_list(const forward_list& __x);
-    forward_list(const forward_list& __x, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    forward_list(forward_list&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<base>::value)
-        : base(_VSTD::move(__x)) {}
-    forward_list(forward_list&& __x, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    forward_list(initializer_list<value_type> __il);
-    forward_list(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    // ~forward_list() = default;
-
-    forward_list& operator=(const forward_list& __x);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    forward_list& operator=(forward_list&& __x)
-        _NOEXCEPT_(
-             __node_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-#endif
-#ifndef  _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    forward_list& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template <class _InputIterator>
-        typename enable_if
-        <
-            __is_input_iterator<_InputIterator>::value,
-            void
-        >::type
-        assign(_InputIterator __f, _InputIterator __l);
-    void assign(size_type __n, const value_type& __v);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    void assign(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(base::__alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT
-        {return       iterator(base::__before_begin()->__next_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT
-        {return const_iterator(base::__before_begin()->__next_);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT
-        {return       iterator(nullptr);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT
-        {return const_iterator(nullptr);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT
-        {return const_iterator(base::__before_begin()->__next_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT
-        {return const_iterator(nullptr);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       before_begin() _NOEXCEPT
-        {return       iterator(base::__before_begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator before_begin() const _NOEXCEPT
-        {return const_iterator(base::__before_begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbefore_begin() const _NOEXCEPT
-        {return const_iterator(base::__before_begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT
-        {return base::__before_begin()->__next_ == nullptr;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-        {return numeric_limits<size_type>::max();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference       front()       {return base::__before_begin()->__next_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference front() const {return base::__before_begin()->__next_->__value_;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args> void emplace_front(_Args&&... __args);
-#endif
-    void push_front(value_type&& __v);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void push_front(const value_type& __v);
-
-    void pop_front();
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        iterator emplace_after(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-    iterator insert_after(const_iterator __p, value_type&& __v);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator insert_after(const_iterator __p, const value_type& __v);
-    iterator insert_after(const_iterator __p, size_type __n, const value_type& __v);
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_input_iterator<_InputIterator>::value,
-            iterator
-        >::type
-        insert_after(const_iterator __p, _InputIterator __f, _InputIterator __l);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    iterator insert_after(const_iterator __p, initializer_list<value_type> __il)
-        {return insert_after(__p, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    iterator erase_after(const_iterator __p);
-    iterator erase_after(const_iterator __f, const_iterator __l);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(forward_list& __x)
-        _NOEXCEPT_(!__node_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-        {base::swap(__x);}
-
-    void resize(size_type __n);
-    void resize(size_type __n, const value_type& __v);
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {base::clear();}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void splice_after(const_iterator __p, forward_list&& __x);
-    _LIBCPP_INLINE_VISIBILITY
-    void splice_after(const_iterator __p, forward_list&& __x, const_iterator __i);
-    _LIBCPP_INLINE_VISIBILITY
-    void splice_after(const_iterator __p, forward_list&& __x,
-                      const_iterator __f, const_iterator __l);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void splice_after(const_iterator __p, forward_list& __x);
-    void splice_after(const_iterator __p, forward_list& __x, const_iterator __i);
-    void splice_after(const_iterator __p, forward_list& __x,
-                      const_iterator __f, const_iterator __l);
-    void remove(const value_type& __v);
-    template <class _Predicate> void remove_if(_Predicate __pred);
-    _LIBCPP_INLINE_VISIBILITY
-    void unique() {unique(__equal_to<value_type>());}
-    template <class _BinaryPredicate> void unique(_BinaryPredicate __binary_pred);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void merge(forward_list&& __x) {merge(__x, __less<value_type>());}
-    template <class _Compare>
-        _LIBCPP_INLINE_VISIBILITY
-        void merge(forward_list&& __x, _Compare __comp)
-        {merge(__x, _VSTD::move(__comp));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void merge(forward_list& __x) {merge(__x, __less<value_type>());}
-    template <class _Compare> void merge(forward_list& __x, _Compare __comp);
-    _LIBCPP_INLINE_VISIBILITY
-    void sort() {sort(__less<value_type>());}
-    template <class _Compare> void sort(_Compare __comp);
-    void reverse() _NOEXCEPT;
-
-private:
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void __move_assign(forward_list& __x, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-    void __move_assign(forward_list& __x, false_type);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _Compare>
-        static
-        __node_pointer
-        __merge(__node_pointer __f1, __node_pointer __f2, _Compare& __comp);
-
-    template <class _Compare>
-        static
-        __node_pointer
-        __sort(__node_pointer __f, difference_type __sz, _Compare& __comp);
-};
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-forward_list<_Tp, _Alloc>::forward_list(const allocator_type& __a)
-    : base(__a)
-{
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(size_type __n)
-{
-    if (__n > 0)
-    {
-        __node_allocator& __a = base::__alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __h(nullptr, _Dp(__a, 1));
-        for (__node_pointer __p = base::__before_begin(); __n > 0; --__n,
-                                                             __p = __p->__next_)
-        {
-            __h.reset(__node_traits::allocate(__a, 1));
-            __node_traits::construct(__a, _VSTD::addressof(__h->__value_));
-            __h->__next_ = nullptr;
-            __p->__next_ = __h.release();
-        }
-    }
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(size_type __n, const allocator_type& __a)
-    : base ( __a )
-{
-    if (__n > 0)
-    {
-        __node_allocator& __a = base::__alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __h(nullptr, _Dp(__a, 1));
-        for (__node_pointer __p = base::__before_begin(); __n > 0; --__n,
-                                                             __p = __p->__next_)
-        {
-            __h.reset(__node_traits::allocate(__a, 1));
-            __node_traits::construct(__a, _VSTD::addressof(__h->__value_));
-            __h->__next_ = nullptr;
-            __p->__next_ = __h.release();
-        }
-    }
-}
-#endif
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(size_type __n, const value_type& __v)
-{
-    insert_after(cbefore_begin(), __n, __v);
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(size_type __n, const value_type& __v,
-                                        const allocator_type& __a)
-    : base(__a)
-{
-    insert_after(cbefore_begin(), __n, __v);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InputIterator>
-forward_list<_Tp, _Alloc>::forward_list(_InputIterator __f, _InputIterator __l,
-                                        typename enable_if<
-                                          __is_input_iterator<_InputIterator>::value
-                                        >::type*)
-{
-    insert_after(cbefore_begin(), __f, __l);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InputIterator>
-forward_list<_Tp, _Alloc>::forward_list(_InputIterator __f, _InputIterator __l,
-                                        const allocator_type& __a,
-                                        typename enable_if<
-                                          __is_input_iterator<_InputIterator>::value
-                                        >::type*)
-    : base(__a)
-{
-    insert_after(cbefore_begin(), __f, __l);
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(const forward_list& __x)
-    : base(allocator_type(
-             __node_traits::select_on_container_copy_construction(__x.__alloc())
-                         )
-          )
-{
-    insert_after(cbefore_begin(), __x.begin(), __x.end());
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(const forward_list& __x,
-                                        const allocator_type& __a)
-    : base(__a)
-{
-    insert_after(cbefore_begin(), __x.begin(), __x.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(forward_list&& __x,
-                                        const allocator_type& __a)
-    : base(_VSTD::move(__x), __a)
-{
-    if (base::__alloc() != __x.__alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        insert_after(cbefore_begin(), _Ip(__x.begin()), _Ip(__x.end()));
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(initializer_list<value_type> __il)
-{
-    insert_after(cbefore_begin(), __il.begin(), __il.end());
-}
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>::forward_list(initializer_list<value_type> __il,
-                                        const allocator_type& __a)
-    : base(__a)
-{
-    insert_after(cbefore_begin(), __il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-forward_list<_Tp, _Alloc>&
-forward_list<_Tp, _Alloc>::operator=(const forward_list& __x)
-{
-    if (this != &__x)
-    {
-        base::__copy_assign_alloc(__x);
-        assign(__x.begin(), __x.end());
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::__move_assign(forward_list& __x, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    clear();
-    base::__move_assign_alloc(__x);
-    base::__before_begin()->__next_ = __x.__before_begin()->__next_;
-    __x.__before_begin()->__next_ = nullptr;
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::__move_assign(forward_list& __x, false_type)
-{
-    if (base::__alloc() == __x.__alloc())
-        __move_assign(__x, true_type());
-    else
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__x.begin()), _Ip(__x.end()));
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-forward_list<_Tp, _Alloc>&
-forward_list<_Tp, _Alloc>::operator=(forward_list&& __x)
-    _NOEXCEPT_(
-             __node_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__x, integral_constant<bool,
-          __node_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-forward_list<_Tp, _Alloc>&
-forward_list<_Tp, _Alloc>::operator=(initializer_list<value_type> __il)
-{
-    assign(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-template <class _InputIterator>
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value,
-    void
->::type
-forward_list<_Tp, _Alloc>::assign(_InputIterator __f, _InputIterator __l)
-{
-    iterator __i = before_begin();
-    iterator __j = _VSTD::next(__i);
-    iterator __e = end();
-    for (; __j != __e && __f != __l; ++__i, (void) ++__j, ++__f)
-        *__j = *__f;
-    if (__j == __e)
-        insert_after(__i, __f, __l);
-    else
-        erase_after(__i, __e);
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::assign(size_type __n, const value_type& __v)
-{
-    iterator __i = before_begin();
-    iterator __j = _VSTD::next(__i);
-    iterator __e = end();
-    for (; __j != __e && __n > 0; --__n, ++__i, ++__j)
-        *__j = __v;
-    if (__j == __e)
-        insert_after(__i, __n, __v);
-    else
-        erase_after(__i, __e);
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::assign(initializer_list<value_type> __il)
-{
-    assign(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-void
-forward_list<_Tp, _Alloc>::emplace_front(_Args&&... __args)
-{
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_),
-                                  _VSTD::forward<_Args>(__args)...);
-    __h->__next_ = base::__before_begin()->__next_;
-    base::__before_begin()->__next_ = __h.release();
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::push_front(value_type&& __v)
-{
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_), _VSTD::move(__v));
-    __h->__next_ = base::__before_begin()->__next_;
-    base::__before_begin()->__next_ = __h.release();
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::push_front(const value_type& __v)
-{
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-    __h->__next_ = base::__before_begin()->__next_;
-    base::__before_begin()->__next_ = __h.release();
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::pop_front()
-{
-    __node_allocator& __a = base::__alloc();
-    __node_pointer __p = base::__before_begin()->__next_;
-    base::__before_begin()->__next_ = __p->__next_;
-    __node_traits::destroy(__a, _VSTD::addressof(__p->__value_));
-    __node_traits::deallocate(__a, __p, 1);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::emplace_after(const_iterator __p, _Args&&... __args)
-{
-    __node_pointer const __r = __p.__ptr_;
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_),
-                                  _VSTD::forward<_Args>(__args)...);
-    __h->__next_ = __r->__next_;
-    __r->__next_ = __h.release();
-    return iterator(__r->__next_);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, value_type&& __v)
-{
-    __node_pointer const __r = __p.__ptr_;
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_), _VSTD::move(__v));
-    __h->__next_ = __r->__next_;
-    __r->__next_ = __h.release();
-    return iterator(__r->__next_);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, const value_type& __v)
-{
-    __node_pointer const __r = __p.__ptr_;
-    __node_allocator& __a = base::__alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-    __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-    __h->__next_ = __r->__next_;
-    __r->__next_ = __h.release();
-    return iterator(__r->__next_);
-}
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::insert_after(const_iterator __p, size_type __n,
-                                        const value_type& __v)
-{
-    __node_pointer __r = __p.__ptr_;
-    if (__n > 0)
-    {
-        __node_allocator& __a = base::__alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-        __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-        __node_pointer __first = __h.release();
-        __node_pointer __last = __first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (--__n; __n != 0; --__n, __last = __last->__next_)
-            {
-                __h.reset(__node_traits::allocate(__a, 1));
-                __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-                __last->__next_ = __h.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (__first != nullptr)
-            {
-                __node_pointer __next = __first->__next_;
-                __node_traits::destroy(__a, _VSTD::addressof(__first->__value_));
-                __node_traits::deallocate(__a, __first, 1);
-                __first = __next;
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __last->__next_ = __r->__next_;
-        __r->__next_ = __first;
-        __r = __last;
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InputIterator>
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value,
-    typename forward_list<_Tp, _Alloc>::iterator
->::type
-forward_list<_Tp, _Alloc>::insert_after(const_iterator __p,
-                                        _InputIterator __f, _InputIterator __l)
-{
-    __node_pointer __r = __p.__ptr_;
-    if (__f != __l)
-    {
-        __node_allocator& __a = base::__alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __h(__node_traits::allocate(__a, 1), _Dp(__a, 1));
-        __node_traits::construct(__a, _VSTD::addressof(__h->__value_), *__f);
-        __node_pointer __first = __h.release();
-        __node_pointer __last = __first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (++__f; __f != __l; ++__f, ((void)(__last = __last->__next_)))
-            {
-                __h.reset(__node_traits::allocate(__a, 1));
-                __node_traits::construct(__a, _VSTD::addressof(__h->__value_), *__f);
-                __last->__next_ = __h.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (__first != nullptr)
-            {
-                __node_pointer __next = __first->__next_;
-                __node_traits::destroy(__a, _VSTD::addressof(__first->__value_));
-                __node_traits::deallocate(__a, __first, 1);
-                __first = __next;
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __last->__next_ = __r->__next_;
-        __r->__next_ = __first;
-        __r = __last;
-    }
-    return iterator(__r);
-}
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::erase_after(const_iterator __f)
-{
-    __node_pointer __p = __f.__ptr_;
-    __node_pointer __n = __p->__next_;
-    __p->__next_ = __n->__next_;
-    __node_allocator& __a = base::__alloc();
-    __node_traits::destroy(__a, _VSTD::addressof(__n->__value_));
-    __node_traits::deallocate(__a, __n, 1);
-    return iterator(__p->__next_);
-}
-
-template <class _Tp, class _Alloc>
-typename forward_list<_Tp, _Alloc>::iterator
-forward_list<_Tp, _Alloc>::erase_after(const_iterator __f, const_iterator __l)
-{
-    __node_pointer __e = __l.__ptr_;
-    if (__f != __l)
-    {
-        __node_pointer __p = __f.__ptr_;
-        __node_pointer __n = __p->__next_;
-        if (__n != __e)
-        {
-            __p->__next_ = __e;
-            __node_allocator& __a = base::__alloc();
-            do
-            {
-                __p = __n->__next_;
-                __node_traits::destroy(__a, _VSTD::addressof(__n->__value_));
-                __node_traits::deallocate(__a, __n, 1);
-                __n = __p;
-            } while (__n != __e);
-        }
-    }
-    return iterator(__e);
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::resize(size_type __n)
-{
-    size_type __sz = 0;
-    iterator __p = before_begin();
-    iterator __i = begin();
-    iterator __e = end();
-    for (; __i != __e && __sz < __n; ++__p, ++__i, ++__sz)
-        ;
-    if (__i != __e)
-        erase_after(__p, __e);
-    else
-    {
-        __n -= __sz;
-        if (__n > 0)
-        {
-            __node_allocator& __a = base::__alloc();
-            typedef __allocator_destructor<__node_allocator> _Dp;
-            unique_ptr<__node, _Dp> __h(nullptr, _Dp(__a, 1));
-            for (__node_pointer __ptr = __p.__ptr_; __n > 0; --__n,
-                                                         __ptr = __ptr->__next_)
-            {
-                __h.reset(__node_traits::allocate(__a, 1));
-                __node_traits::construct(__a, _VSTD::addressof(__h->__value_));
-                __h->__next_ = nullptr;
-                __ptr->__next_ = __h.release();
-            }
-        }
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::resize(size_type __n, const value_type& __v)
-{
-    size_type __sz = 0;
-    iterator __p = before_begin();
-    iterator __i = begin();
-    iterator __e = end();
-    for (; __i != __e && __sz < __n; ++__p, ++__i, ++__sz)
-        ;
-    if (__i != __e)
-        erase_after(__p, __e);
-    else
-    {
-        __n -= __sz;
-        if (__n > 0)
-        {
-            __node_allocator& __a = base::__alloc();
-            typedef __allocator_destructor<__node_allocator> _Dp;
-            unique_ptr<__node, _Dp> __h(nullptr, _Dp(__a, 1));
-            for (__node_pointer __ptr = __p.__ptr_; __n > 0; --__n,
-                                                         __ptr = __ptr->__next_)
-            {
-                __h.reset(__node_traits::allocate(__a, 1));
-                __node_traits::construct(__a, _VSTD::addressof(__h->__value_), __v);
-                __h->__next_ = nullptr;
-                __ptr->__next_ = __h.release();
-            }
-        }
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list& __x)
-{
-    if (!__x.empty())
-    {
-        if (__p.__ptr_->__next_ != nullptr)
-        {
-            const_iterator __lm1 = __x.before_begin();
-            while (__lm1.__ptr_->__next_ != nullptr)
-                ++__lm1;
-            __lm1.__ptr_->__next_ = __p.__ptr_->__next_;
-        }
-        __p.__ptr_->__next_ = __x.__before_begin()->__next_;
-        __x.__before_begin()->__next_ = nullptr;
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list& __x,
-                                        const_iterator __i)
-{
-    const_iterator __lm1 = _VSTD::next(__i);
-    if (__p != __i && __p != __lm1)
-    {
-        __i.__ptr_->__next_ = __lm1.__ptr_->__next_;
-        __lm1.__ptr_->__next_ = __p.__ptr_->__next_;
-        __p.__ptr_->__next_ = __lm1.__ptr_;
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list& __x,
-                                        const_iterator __f, const_iterator __l)
-{
-    if (__f != __l && __p != __f)
-    {
-        const_iterator __lm1 = __f;
-        while (__lm1.__ptr_->__next_ != __l.__ptr_)
-            ++__lm1;
-        if (__f != __lm1)
-        {
-            __lm1.__ptr_->__next_ = __p.__ptr_->__next_;
-            __p.__ptr_->__next_ = __f.__ptr_->__next_;
-            __f.__ptr_->__next_ = __l.__ptr_;
-        }
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list&& __x)
-{
-    splice_after(__p, __x);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list&& __x,
-                                        const_iterator __i)
-{
-    splice_after(__p, __x, __i);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::splice_after(const_iterator __p,
-                                        forward_list&& __x,
-                                        const_iterator __f, const_iterator __l)
-{
-    splice_after(__p, __x, __f, __l);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::remove(const value_type& __v)
-{
-    forward_list<_Tp, _Alloc> __deleted_nodes; // collect the nodes we're removing
-    iterator __e = end();
-    for (iterator __i = before_begin(); __i.__ptr_->__next_ != nullptr;)
-    {
-        if (__i.__ptr_->__next_->__value_ == __v)
-        {
-            iterator __j = _VSTD::next(__i, 2);
-            for (; __j != __e && *__j == __v; ++__j)
-                ;
-            __deleted_nodes.splice_after(__deleted_nodes.before_begin(), *this, __i, __j);
-            if (__j == __e)
-                break;
-            __i = __j;
-        }
-        else
-            ++__i;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _Predicate>
-void
-forward_list<_Tp, _Alloc>::remove_if(_Predicate __pred)
-{
-    iterator __e = end();
-    for (iterator __i = before_begin(); __i.__ptr_->__next_ != nullptr;)
-    {
-        if (__pred(__i.__ptr_->__next_->__value_))
-        {
-            iterator __j = _VSTD::next(__i, 2);
-            for (; __j != __e && __pred(*__j); ++__j)
-                ;
-            erase_after(__i, __j);
-            if (__j == __e)
-                break;
-            __i = __j;
-        }
-        else
-            ++__i;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _BinaryPredicate>
-void
-forward_list<_Tp, _Alloc>::unique(_BinaryPredicate __binary_pred)
-{
-    for (iterator __i = begin(), __e = end(); __i != __e;)
-    {
-        iterator __j = _VSTD::next(__i);
-        for (; __j != __e && __binary_pred(*__i, *__j); ++__j)
-            ;
-        if (__i.__ptr_->__next_ != __j.__ptr_)
-            erase_after(__i, __j);
-        __i = __j;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _Compare>
-void
-forward_list<_Tp, _Alloc>::merge(forward_list& __x, _Compare __comp)
-{
-    if (this != &__x)
-    {
-        base::__before_begin()->__next_ = __merge(base::__before_begin()->__next_,
-                                                    __x.__before_begin()->__next_,
-                                                    __comp);
-        __x.__before_begin()->__next_ = nullptr;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _Compare>
-typename forward_list<_Tp, _Alloc>::__node_pointer
-forward_list<_Tp, _Alloc>::__merge(__node_pointer __f1, __node_pointer __f2,
-                                   _Compare& __comp)
-{
-    if (__f1 == nullptr)
-        return __f2;
-    if (__f2 == nullptr)
-        return __f1;
-    __node_pointer __r;
-    if (__comp(__f2->__value_, __f1->__value_))
-    {
-        __node_pointer __t = __f2;
-        while (__t->__next_ != nullptr &&
-                             __comp(__t->__next_->__value_, __f1->__value_))
-            __t = __t->__next_;
-        __r = __f2;
-        __f2 = __t->__next_;
-        __t->__next_ = __f1;
-    }
-    else
-        __r = __f1;
-    __node_pointer __p = __f1;
-    __f1 = __f1->__next_;
-    while (__f1 != nullptr && __f2 != nullptr)
-    {
-        if (__comp(__f2->__value_, __f1->__value_))
-        {
-            __node_pointer __t = __f2;
-            while (__t->__next_ != nullptr &&
-                                 __comp(__t->__next_->__value_, __f1->__value_))
-                __t = __t->__next_;
-            __p->__next_ = __f2;
-            __f2 = __t->__next_;
-            __t->__next_ = __f1;
-        }
-        __p = __f1;
-        __f1 = __f1->__next_;
-    }
-    if (__f2 != nullptr)
-        __p->__next_ = __f2;
-    return __r;
-}
-
-template <class _Tp, class _Alloc>
-template <class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-forward_list<_Tp, _Alloc>::sort(_Compare __comp)
-{
-    base::__before_begin()->__next_ = __sort(base::__before_begin()->__next_,
-                                       _VSTD::distance(begin(), end()), __comp);
-}
-
-template <class _Tp, class _Alloc>
-template <class _Compare>
-typename forward_list<_Tp, _Alloc>::__node_pointer
-forward_list<_Tp, _Alloc>::__sort(__node_pointer __f1, difference_type __sz,
-                                  _Compare& __comp)
-{
-    switch (__sz)
-    {
-    case 0:
-    case 1:
-        return __f1;
-    case 2:
-        if (__comp(__f1->__next_->__value_, __f1->__value_))
-        {
-            __node_pointer __t = __f1->__next_;
-            __t->__next_ = __f1;
-            __f1->__next_ = nullptr;
-            __f1 = __t;
-        }
-        return __f1;
-    }
-    difference_type __sz1 = __sz / 2;
-    difference_type __sz2 = __sz - __sz1;
-    __node_pointer __t = _VSTD::next(iterator(__f1), __sz1 - 1).__ptr_;
-    __node_pointer __f2 = __t->__next_;
-    __t->__next_ = nullptr;
-    return __merge(__sort(__f1, __sz1, __comp),
-                   __sort(__f2, __sz2, __comp), __comp);
-}
-
-template <class _Tp, class _Alloc>
-void
-forward_list<_Tp, _Alloc>::reverse() _NOEXCEPT
-{
-    __node_pointer __p = base::__before_begin()->__next_;
-    if (__p != nullptr)
-    {
-        __node_pointer __f = __p->__next_;
-        __p->__next_ = nullptr;
-        while (__f != nullptr)
-        {
-            __node_pointer __t = __f->__next_;
-            __f->__next_ = __p;
-            __p = __f;
-            __f = __t;
-        }
-        base::__before_begin()->__next_ = __p;
-    }
-}
-
-template <class _Tp, class _Alloc>
-bool operator==(const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    typedef forward_list<_Tp, _Alloc> _Cp;
-    typedef typename _Cp::const_iterator _Ip;
-    _Ip __ix = __x.begin();
-    _Ip __ex = __x.end();
-    _Ip __iy = __y.begin();
-    _Ip __ey = __y.end();
-    for (; __ix != __ex && __iy != __ey; ++__ix, ++__iy)
-        if (!(*__ix == *__iy))
-            return false;
-    return (__ix == __ex) == (__iy == __ey);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator!=(const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator< (const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(),
-                                         __y.begin(), __y.end());
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator> (const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator>=(const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator<=(const forward_list<_Tp, _Alloc>& __x,
-                const forward_list<_Tp, _Alloc>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(forward_list<_Tp, _Alloc>& __x, forward_list<_Tp, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_FORWARD_LIST
diff --git a/include.new/c++/v1/tr1/fstream b/include.new/c++/v1/tr1/fstream
deleted file mode 100644
index 38778c6..0000000
--- a/include.new/c++/v1/tr1/fstream
+++ /dev/null
@@ -1,1431 +0,0 @@
-// -*- C++ -*-
-//===------------------------- fstream ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FSTREAM
-#define _LIBCPP_FSTREAM
-
-/*
-    fstream synopsis
-
-template <class charT, class traits = char_traits<charT> >
-class basic_filebuf
-    : public basic_streambuf<charT, traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.9.1.2 Constructors/destructor:
-    basic_filebuf();
-    basic_filebuf(basic_filebuf&& rhs);
-    virtual ~basic_filebuf();
-
-    // 27.9.1.3 Assign/swap:
-    basic_filebuf& operator=(basic_filebuf&& rhs);
-    void swap(basic_filebuf& rhs);
-
-    // 27.9.1.4 Members:
-    bool is_open() const;
-    basic_filebuf* open(const char* s, ios_base::openmode mode);
-    basic_filebuf* open(const string& s, ios_base::openmode mode);
-    basic_filebuf* close();
-
-protected:
-    // 27.9.1.5 Overridden virtual functions:
-    virtual streamsize showmanyc();
-    virtual int_type underflow();
-    virtual int_type uflow();
-    virtual int_type pbackfail(int_type c = traits_type::eof());
-    virtual int_type overflow (int_type c = traits_type::eof());
-    virtual basic_streambuf<char_type, traits_type>* setbuf(char_type* s, streamsize n);
-    virtual pos_type seekoff(off_type off, ios_base::seekdir way,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type sp,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual int sync();
-    virtual void imbue(const locale& loc);
-};
-
-template <class charT, class traits>
-  void
-  swap(basic_filebuf<charT, traits>& x, basic_filebuf<charT, traits>& y);
-
-typedef basic_filebuf<char>    filebuf;
-typedef basic_filebuf<wchar_t> wfilebuf;
-
-template <class charT, class traits = char_traits<charT> >
-class basic_ifstream
-    : public basic_istream<charT,traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_ifstream();
-    explicit basic_ifstream(const char* s, ios_base::openmode mode = ios_base::in);
-    explicit basic_ifstream(const string& s, ios_base::openmode mode = ios_base::in);
-    basic_ifstream(basic_ifstream&& rhs);
-
-    basic_ifstream& operator=(basic_ifstream&& rhs);
-    void swap(basic_ifstream& rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* s, ios_base::openmode mode = ios_base::in);
-    void open(const string& s, ios_base::openmode mode = ios_base::in);
-    void close();
-};
-
-template <class charT, class traits>
-  void
-  swap(basic_ifstream<charT, traits>& x, basic_ifstream<charT, traits>& y);
-
-typedef basic_ifstream<char>    ifstream;
-typedef basic_ifstream<wchar_t> wifstream;
-
-template <class charT, class traits = char_traits<charT> >
-class basic_ofstream
-    : public basic_ostream<charT,traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_ofstream();
-    explicit basic_ofstream(const char* s, ios_base::openmode mode = ios_base::out);
-    explicit basic_ofstream(const string& s, ios_base::openmode mode = ios_base::out);
-    basic_ofstream(basic_ofstream&& rhs);
-
-    basic_ofstream& operator=(basic_ofstream&& rhs);
-    void swap(basic_ofstream& rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* s, ios_base::openmode mode = ios_base::out);
-    void open(const string& s, ios_base::openmode mode = ios_base::out);
-    void close();
-};
-
-template <class charT, class traits>
-  void
-  swap(basic_ofstream<charT, traits>& x, basic_ofstream<charT, traits>& y);
-
-typedef basic_ofstream<char>    ofstream;
-typedef basic_ofstream<wchar_t> wofstream;
-
-template <class charT, class traits=char_traits<charT> >
-class basic_fstream
-    : public basic_iostream<charT,traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_fstream();
-    explicit basic_fstream(const char* s, ios_base::openmode mode = ios_base::in|ios_base::out);
-    explicit basic_fstream(const string& s, ios_base::openmode mode = ios_base::in|ios_base::out);
-    basic_fstream(basic_fstream&& rhs);
-
-    basic_fstream& operator=(basic_fstream&& rhs);
-    void swap(basic_fstream& rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* s, ios_base::openmode mode = ios_base::in|ios_base::out);
-    void open(const string& s, ios_base::openmode mode = ios_base::in|ios_base::out);
-    void close();
-};
-
-template <class charT, class traits>
-  void swap(basic_fstream<charT, traits>& x, basic_fstream<charT, traits>& y);
-
-typedef basic_fstream<char>    fstream;
-typedef basic_fstream<wchar_t> wfstream;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ostream>
-#include <istream>
-#include <__locale>
-#include <cstdio>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_filebuf
-    : public basic_streambuf<_CharT, _Traits>
-{
-public:
-    typedef _CharT                           char_type;
-    typedef _Traits                          traits_type;
-    typedef typename traits_type::int_type   int_type;
-    typedef typename traits_type::pos_type   pos_type;
-    typedef typename traits_type::off_type   off_type;
-    typedef typename traits_type::state_type state_type;
-
-    // 27.9.1.2 Constructors/destructor:
-    basic_filebuf();
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_filebuf(basic_filebuf&& __rhs);
-#endif
-    virtual ~basic_filebuf();
-
-    // 27.9.1.3 Assign/swap:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_filebuf& operator=(basic_filebuf&& __rhs);
-#endif
-    void swap(basic_filebuf& __rhs);
-
-    // 27.9.1.4 Members:
-    bool is_open() const;
-    basic_filebuf* open(const char* __s, ios_base::openmode __mode);
-    basic_filebuf* open(const string& __s, ios_base::openmode __mode);
-    basic_filebuf* close();
-
-protected:
-    // 27.9.1.5 Overridden virtual functions:
-    virtual int_type underflow();
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-    virtual int_type overflow (int_type __c = traits_type::eof());
-    virtual basic_streambuf<char_type, traits_type>* setbuf(char_type* __s, streamsize __n);
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual int sync();
-    virtual void imbue(const locale& __loc);
-
-private:
-    char*       __extbuf_;
-    const char* __extbufnext_;
-    const char* __extbufend_;
-    char __extbuf_min_[8];
-    size_t __ebs_;
-    char_type* __intbuf_;
-    size_t __ibs_;
-    FILE* __file_;
-    const codecvt<char_type, char, state_type>* __cv_;
-    state_type __st_;
-    state_type __st_last_;
-    ios_base::openmode __om_;
-    ios_base::openmode __cm_;
-    bool __owns_eb_;
-    bool __owns_ib_;
-    bool __always_noconv_;
-
-    bool __read_mode();
-    void __write_mode();
-};
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>::basic_filebuf()
-    : __extbuf_(0),
-      __extbufnext_(0),
-      __extbufend_(0),
-      __ebs_(0),
-      __intbuf_(0),
-      __ibs_(0),
-      __file_(0),
-      __cv_(nullptr),
-      __st_(),
-      __st_last_(),
-      __om_(0),
-      __cm_(0),
-      __owns_eb_(false),
-      __owns_ib_(false),
-      __always_noconv_(false)
-{
-    if (has_facet<codecvt<char_type, char, state_type> >(this->getloc()))
-    {
-        __cv_ = &use_facet<codecvt<char_type, char, state_type> >(this->getloc());
-        __always_noconv_ = __cv_->always_noconv();
-    }
-    setbuf(0, 4096);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>::basic_filebuf(basic_filebuf&& __rhs)
-    : basic_streambuf<_CharT, _Traits>(__rhs)
-{
-    if (__rhs.__extbuf_ == __rhs.__extbuf_min_)
-    {
-        __extbuf_ = __extbuf_min_;
-        __extbufnext_ = __extbuf_ + (__rhs.__extbufnext_ - __rhs.__extbuf_);
-        __extbufend_ = __extbuf_ + (__rhs.__extbufend_ - __rhs.__extbuf_);
-    }
-    else
-    {
-        __extbuf_ = __rhs.__extbuf_;
-        __extbufnext_ = __rhs.__extbufnext_;
-        __extbufend_ = __rhs.__extbufend_;
-    }
-    __ebs_ = __rhs.__ebs_;
-    __intbuf_ = __rhs.__intbuf_;
-    __ibs_ = __rhs.__ibs_;
-    __file_ = __rhs.__file_;
-    __cv_ = __rhs.__cv_;
-    __st_ = __rhs.__st_;
-    __st_last_ = __rhs.__st_last_;
-    __om_ = __rhs.__om_;
-    __cm_ = __rhs.__cm_;
-    __owns_eb_ = __rhs.__owns_eb_;
-    __owns_ib_ = __rhs.__owns_ib_;
-    __always_noconv_ = __rhs.__always_noconv_;
-    if (__rhs.pbase())
-    {
-        if (__rhs.pbase() == __rhs.__intbuf_)
-            this->setp(__intbuf_, __intbuf_ + (__rhs. epptr() - __rhs.pbase()));
-        else
-            this->setp((char_type*)__extbuf_,
-                       (char_type*)__extbuf_ + (__rhs. epptr() - __rhs.pbase()));
-        this->pbump(__rhs. pptr() - __rhs.pbase());
-    }
-    else if (__rhs.eback())
-    {
-        if (__rhs.eback() == __rhs.__intbuf_)
-            this->setg(__intbuf_, __intbuf_ + (__rhs.gptr() - __rhs.eback()),
-                                  __intbuf_ + (__rhs.egptr() - __rhs.eback()));
-        else
-            this->setg((char_type*)__extbuf_,
-                       (char_type*)__extbuf_ + (__rhs.gptr() - __rhs.eback()),
-                       (char_type*)__extbuf_ + (__rhs.egptr() - __rhs.eback()));
-    }
-    __rhs.__extbuf_ = 0;
-    __rhs.__extbufnext_ = 0;
-    __rhs.__extbufend_ = 0;
-    __rhs.__ebs_ = 0;
-    __rhs.__intbuf_ = 0;
-    __rhs.__ibs_ = 0;
-    __rhs.__file_ = 0;
-    __rhs.__st_ = state_type();
-    __rhs.__st_last_ = state_type();
-    __rhs.__om_ = 0;
-    __rhs.__cm_ = 0;
-    __rhs.__owns_eb_ = false;
-    __rhs.__owns_ib_ = false;
-    __rhs.setg(0, 0, 0);
-    __rhs.setp(0, 0);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>&
-basic_filebuf<_CharT, _Traits>::operator=(basic_filebuf&& __rhs)
-{
-    close();
-    swap(__rhs);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>::~basic_filebuf()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        close();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    if (__owns_eb_)
-        delete [] __extbuf_;
-    if (__owns_ib_)
-        delete [] __intbuf_;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_filebuf<_CharT, _Traits>::swap(basic_filebuf& __rhs)
-{
-    basic_streambuf<char_type, traits_type>::swap(__rhs);
-    if (__extbuf_ != __extbuf_min_ && __rhs.__extbuf_ != __rhs.__extbuf_min_)
-    {
-        _VSTD::swap(__extbuf_, __rhs.__extbuf_);
-        _VSTD::swap(__extbufnext_, __rhs.__extbufnext_);
-        _VSTD::swap(__extbufend_, __rhs.__extbufend_);
-    }
-    else
-    {
-        ptrdiff_t __ln = __extbufnext_ - __extbuf_;
-        ptrdiff_t __le = __extbufend_ - __extbuf_;
-        ptrdiff_t __rn = __rhs.__extbufnext_ - __rhs.__extbuf_;
-        ptrdiff_t __re = __rhs.__extbufend_ - __rhs.__extbuf_;
-        if (__extbuf_ == __extbuf_min_ && __rhs.__extbuf_ != __rhs.__extbuf_min_)
-        {
-            __extbuf_ = __rhs.__extbuf_;
-            __rhs.__extbuf_ = __rhs.__extbuf_min_;
-        }
-        else if (__extbuf_ != __extbuf_min_ && __rhs.__extbuf_ == __rhs.__extbuf_min_)
-        {
-            __rhs.__extbuf_ = __extbuf_;
-            __extbuf_ = __extbuf_min_;
-        }
-        __extbufnext_ = __extbuf_ + __rn;
-        __extbufend_ = __extbuf_ + __re;
-        __rhs.__extbufnext_ = __rhs.__extbuf_ + __ln;
-        __rhs.__extbufend_ = __rhs.__extbuf_ + __le;
-    }
-    _VSTD::swap(__ebs_, __rhs.__ebs_);
-    _VSTD::swap(__intbuf_, __rhs.__intbuf_);
-    _VSTD::swap(__ibs_, __rhs.__ibs_);
-    _VSTD::swap(__file_, __rhs.__file_);
-    _VSTD::swap(__cv_, __rhs.__cv_);
-    _VSTD::swap(__st_, __rhs.__st_);
-    _VSTD::swap(__st_last_, __rhs.__st_last_);
-    _VSTD::swap(__om_, __rhs.__om_);
-    _VSTD::swap(__cm_, __rhs.__cm_);
-    _VSTD::swap(__owns_eb_, __rhs.__owns_eb_);
-    _VSTD::swap(__owns_ib_, __rhs.__owns_ib_);
-    _VSTD::swap(__always_noconv_, __rhs.__always_noconv_);
-    if (this->eback() == (char_type*)__rhs.__extbuf_min_)
-    {
-        ptrdiff_t __n = this->gptr() - this->eback();
-        ptrdiff_t __e = this->egptr() - this->eback();
-        this->setg((char_type*)__extbuf_min_,
-                   (char_type*)__extbuf_min_ + __n,
-                   (char_type*)__extbuf_min_ + __e);
-    }
-    else if (this->pbase() == (char_type*)__rhs.__extbuf_min_)
-    {
-        ptrdiff_t __n = this->pptr() - this->pbase();
-        ptrdiff_t __e = this->epptr() - this->pbase();
-        this->setp((char_type*)__extbuf_min_,
-                   (char_type*)__extbuf_min_ + __e);
-        this->pbump(__n);
-    }
-    if (__rhs.eback() == (char_type*)__extbuf_min_)
-    {
-        ptrdiff_t __n = __rhs.gptr() - __rhs.eback();
-        ptrdiff_t __e = __rhs.egptr() - __rhs.eback();
-        __rhs.setg((char_type*)__rhs.__extbuf_min_,
-                   (char_type*)__rhs.__extbuf_min_ + __n,
-                   (char_type*)__rhs.__extbuf_min_ + __e);
-    }
-    else if (__rhs.pbase() == (char_type*)__extbuf_min_)
-    {
-        ptrdiff_t __n = __rhs.pptr() - __rhs.pbase();
-        ptrdiff_t __e = __rhs.epptr() - __rhs.pbase();
-        __rhs.setp((char_type*)__rhs.__extbuf_min_,
-                   (char_type*)__rhs.__extbuf_min_ + __e);
-        __rhs.pbump(__n);
-    }
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_filebuf<_CharT, _Traits>& __x, basic_filebuf<_CharT, _Traits>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_filebuf<_CharT, _Traits>::is_open() const
-{
-    return __file_ != 0;
-}
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>*
-basic_filebuf<_CharT, _Traits>::open(const char* __s, ios_base::openmode __mode)
-{
-    basic_filebuf<_CharT, _Traits>* __rt = 0;
-    if (__file_ == 0)
-    {
-        __rt = this;
-        const char* __mdstr;
-        switch (__mode & ~ios_base::ate)
-        {
-        case ios_base::out:
-        case ios_base::out | ios_base::trunc:
-            __mdstr = "w";
-            break;
-        case ios_base::out | ios_base::app:
-        case ios_base::app:
-            __mdstr = "a";
-            break;
-        case ios_base::in:
-            __mdstr = "r";
-            break;
-        case ios_base::in | ios_base::out:
-            __mdstr = "r+";
-            break;
-        case ios_base::in | ios_base::out | ios_base::trunc:
-            __mdstr = "w+";
-            break;
-        case ios_base::in | ios_base::out | ios_base::app:
-        case ios_base::in | ios_base::app:
-            __mdstr = "a+";
-            break;
-        case ios_base::out | ios_base::binary:
-        case ios_base::out | ios_base::trunc | ios_base::binary:
-            __mdstr = "wb";
-            break;
-        case ios_base::out | ios_base::app | ios_base::binary:
-        case ios_base::app | ios_base::binary:
-            __mdstr = "ab";
-            break;
-        case ios_base::in | ios_base::binary:
-            __mdstr = "rb";
-            break;
-        case ios_base::in | ios_base::out | ios_base::binary:
-            __mdstr = "r+b";
-            break;
-        case ios_base::in | ios_base::out | ios_base::trunc | ios_base::binary:
-            __mdstr = "w+b";
-            break;
-        case ios_base::in | ios_base::out | ios_base::app | ios_base::binary:
-        case ios_base::in | ios_base::app | ios_base::binary:
-            __mdstr = "a+b";
-            break;
-        default:
-            __rt = 0;
-            break;
-        }
-        if (__rt)
-        {
-            __file_ = fopen(__s, __mdstr);
-            if (__file_)
-            {
-                __om_ = __mode;
-                if (__mode & ios_base::ate)
-                {
-                    if (fseek(__file_, 0, SEEK_END))
-                    {
-                        fclose(__file_);
-                        __file_ = 0;
-                        __rt = 0;
-                    }
-                }
-            }
-            else
-                __rt = 0;
-        }
-    }
-    return __rt;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>*
-basic_filebuf<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mode)
-{
-    return open(__s.c_str(), __mode);
-}
-
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>*
-basic_filebuf<_CharT, _Traits>::close()
-{
-    basic_filebuf<_CharT, _Traits>* __rt = 0;
-    if (__file_)
-    {
-        __rt = this;
-        unique_ptr<FILE, int(*)(FILE*)> __h(__file_, fclose);
-        if (sync())
-            __rt = 0;
-        if (fclose(__h.release()) == 0)
-            __file_ = 0;
-        else
-            __rt = 0;
-    }
-    return __rt;
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::int_type
-basic_filebuf<_CharT, _Traits>::underflow()
-{
-    if (__file_ == 0)
-        return traits_type::eof();
-    bool __initial = __read_mode();
-    char_type __1buf;
-    if (this->gptr() == 0)
-        this->setg(&__1buf, &__1buf+1, &__1buf+1);
-    const size_t __unget_sz = __initial ? 0 : min<size_t>((this->egptr() - this->eback()) / 2, 4);
-    int_type __c = traits_type::eof();
-    if (this->gptr() == this->egptr())
-    {
-        memmove(this->eback(), this->egptr() - __unget_sz, __unget_sz * sizeof(char_type));
-        if (__always_noconv_)
-        {
-            size_t __nmemb = static_cast<size_t>(this->egptr() - this->eback() - __unget_sz);
-            __nmemb = fread(this->eback() + __unget_sz, 1, __nmemb, __file_);
-            if (__nmemb != 0)
-            {
-                this->setg(this->eback(),
-                           this->eback() + __unget_sz,
-                           this->eback() + __unget_sz + __nmemb);
-                __c = traits_type::to_int_type(*this->gptr());
-            }
-        }
-        else
-        {
-            memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
-            __extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
-            __extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
-            size_t __nmemb = _VSTD::min(static_cast<size_t>(__ibs_ - __unget_sz),
-                                 static_cast<size_t>(__extbufend_ - __extbufnext_));
-            codecvt_base::result __r;
-            __st_last_ = __st_;
-            size_t __nr = fread((void*)__extbufnext_, 1, __nmemb, __file_);
-            if (__nr != 0)
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (!__cv_)
-                    throw bad_cast();
-#endif
-                __extbufend_ = __extbufnext_ + __nr;
-                char_type*  __inext;
-                __r = __cv_->in(__st_, __extbuf_, __extbufend_, __extbufnext_,
-                                       this->eback() + __unget_sz,
-                                       this->eback() + __ibs_, __inext);
-                if (__r == codecvt_base::noconv)
-                {
-                    this->setg((char_type*)__extbuf_, (char_type*)__extbuf_, (char_type*)__extbufend_);
-                    __c = traits_type::to_int_type(*this->gptr());
-                }
-                else if (__inext != this->eback() + __unget_sz)
-                {
-                    this->setg(this->eback(), this->eback() + __unget_sz, __inext);
-                    __c = traits_type::to_int_type(*this->gptr());
-                }
-            }
-        }
-    }
-    else
-        __c = traits_type::to_int_type(*this->gptr());
-    if (this->eback() == &__1buf)
-        this->setg(0, 0, 0);
-    return __c;
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::int_type
-basic_filebuf<_CharT, _Traits>::pbackfail(int_type __c)
-{
-    if (__file_ && this->eback() < this->gptr())
-    {
-        if (traits_type::eq_int_type(__c, traits_type::eof()))
-        {
-            this->gbump(-1);
-            return traits_type::not_eof(__c);
-        }
-        if ((__om_ & ios_base::out) ||
-            traits_type::eq(traits_type::to_char_type(__c), this->gptr()[-1]))
-        {
-            this->gbump(-1);
-            *this->gptr() = traits_type::to_char_type(__c);
-            return __c;
-        }
-    }
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::int_type
-basic_filebuf<_CharT, _Traits>::overflow(int_type __c)
-{
-    if (__file_ == 0)
-        return traits_type::eof();
-    __write_mode();
-    char_type __1buf;
-    char_type* __pb_save = this->pbase();
-    char_type* __epb_save = this->epptr();
-    if (!traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        if (this->pptr() == 0)
-            this->setp(&__1buf, &__1buf+1);
-        *this->pptr() = traits_type::to_char_type(__c);
-        this->pbump(1);
-    }
-    if (this->pptr() != this->pbase())
-    {
-        if (__always_noconv_)
-        {
-            size_t __nmemb = static_cast<size_t>(this->pptr() - this->pbase());
-            if (fwrite(this->pbase(), sizeof(char_type), __nmemb, __file_) != __nmemb)
-                return traits_type::eof();
-        }
-        else
-        {
-            char* __extbe = __extbuf_;
-            codecvt_base::result __r;
-            do
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (!__cv_)
-                    throw bad_cast();
-#endif
-                const char_type* __e;
-                __r = __cv_->out(__st_, this->pbase(), this->pptr(), __e,
-                                        __extbuf_, __extbuf_ + __ebs_, __extbe);
-                if (__e == this->pbase())
-                    return traits_type::eof();
-                if (__r == codecvt_base::noconv)
-                {
-                    size_t __nmemb = static_cast<size_t>(this->pptr() - this->pbase());
-                    if (fwrite(this->pbase(), 1, __nmemb, __file_) != __nmemb)
-                        return traits_type::eof();
-                }
-                else if (__r == codecvt_base::ok || __r == codecvt_base::partial)
-                {
-                    size_t __nmemb = static_cast<size_t>(__extbe - __extbuf_);
-                    if (fwrite(__extbuf_, 1, __nmemb, __file_) != __nmemb)
-                        return traits_type::eof();
-                    if (__r == codecvt_base::partial)
-                    {
-                        this->setp((char_type*)__e, this->pptr());
-                        this->pbump(this->epptr() - this->pbase());
-                    }
-                }
-                else
-                    return traits_type::eof();
-            } while (__r == codecvt_base::partial);
-        }
-        this->setp(__pb_save, __epb_save);
-    }
-    return traits_type::not_eof(__c);
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>*
-basic_filebuf<_CharT, _Traits>::setbuf(char_type* __s, streamsize __n)
-{
-    this->setg(0, 0, 0);
-    this->setp(0, 0);
-    if (__owns_eb_)
-        delete [] __extbuf_;
-    if (__owns_ib_)
-        delete [] __intbuf_;
-    __ebs_ = __n;
-    if (__ebs_ > sizeof(__extbuf_min_))
-    {
-        if (__always_noconv_ && __s)
-        {
-            __extbuf_ = (char*)__s;
-            __owns_eb_ = false;
-        }
-        else
-        {
-            __extbuf_ = new char[__ebs_];
-            __owns_eb_ = true;
-        }
-    }
-    else
-    {
-        __extbuf_ = __extbuf_min_;
-        __ebs_ = sizeof(__extbuf_min_);
-        __owns_eb_ = false;
-    }
-    if (!__always_noconv_)
-    {
-        __ibs_ = max<streamsize>(__n, sizeof(__extbuf_min_));
-        if (__s && __ibs_ >= sizeof(__extbuf_min_))
-        {
-            __intbuf_ = __s;
-            __owns_ib_ = false;
-        }
-        else
-        {
-            __intbuf_ = new char_type[__ibs_];
-            __owns_ib_ = true;
-        }
-    }
-    else
-    {
-        __ibs_ = 0;
-        __intbuf_ = 0;
-        __owns_ib_ = false;
-    }
-    return this;
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::pos_type
-basic_filebuf<_CharT, _Traits>::seekoff(off_type __off, ios_base::seekdir __way,
-                                        ios_base::openmode)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!__cv_)
-        throw bad_cast();
-#endif
-    int __width = __cv_->encoding();
-    if (__file_ == 0 || (__width <= 0 && __off != 0) || sync())
-        return pos_type(off_type(-1));
-    // __width > 0 || __off == 0
-    int __whence;
-    switch (__way)
-    {
-    case ios_base::beg:
-        __whence = SEEK_SET;
-        break;
-    case ios_base::cur:
-        __whence = SEEK_CUR;
-        break;
-    case ios_base::end:
-        __whence = SEEK_END;
-        break;
-    default:
-        return pos_type(off_type(-1));
-    }
-#if _WIN32
-    if (fseek(__file_, __width > 0 ? __width * __off : 0, __whence))
-        return pos_type(off_type(-1));
-    pos_type __r = ftell(__file_);
-#else
-    if (fseeko(__file_, __width > 0 ? __width * __off : 0, __whence))
-        return pos_type(off_type(-1));
-    pos_type __r = ftello(__file_);
-#endif
-    __r.state(__st_);
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-typename basic_filebuf<_CharT, _Traits>::pos_type
-basic_filebuf<_CharT, _Traits>::seekpos(pos_type __sp, ios_base::openmode)
-{
-    if (__file_ == 0 || sync())
-        return pos_type(off_type(-1));
-#if _WIN32
-    if (fseek(__file_, __sp, SEEK_SET))
-        return pos_type(off_type(-1));
-#else
-    if (fseeko(__file_, __sp, SEEK_SET))
-        return pos_type(off_type(-1));
-#endif
-    __st_ = __sp.state();
-    return __sp;
-}
-
-template <class _CharT, class _Traits>
-int
-basic_filebuf<_CharT, _Traits>::sync()
-{
-    if (__file_ == 0)
-        return 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!__cv_)
-        throw bad_cast();
-#endif
-    if (__cm_ & ios_base::out)
-    {
-        if (this->pptr() != this->pbase())
-            if (overflow() == traits_type::eof())
-                return -1;
-        codecvt_base::result __r;
-        do
-        {
-            char* __extbe;
-            __r = __cv_->unshift(__st_, __extbuf_, __extbuf_ + __ebs_, __extbe);
-            size_t __nmemb = static_cast<size_t>(__extbe - __extbuf_);
-            if (fwrite(__extbuf_, 1, __nmemb, __file_) != __nmemb)
-                return -1;
-        } while (__r == codecvt_base::partial);
-        if (__r == codecvt_base::error)
-            return -1;
-        if (fflush(__file_))
-            return -1;
-    }
-    else if (__cm_ & ios_base::in)
-    {
-        off_type __c;
-        state_type __state = __st_last_;
-        bool __update_st = false;
-        if (__always_noconv_)
-            __c = this->egptr() - this->gptr();
-        else
-        {
-            int __width = __cv_->encoding();
-            __c = __extbufend_ - __extbufnext_;
-            if (__width > 0)
-                __c += __width * (this->egptr() - this->gptr());
-            else
-            {
-                if (this->gptr() != this->egptr())
-                {
-                    const int __off =  __cv_->length(__state, __extbuf_,
-                                                     __extbufnext_,
-                                                     this->gptr() - this->eback());
-                    __c += __extbufnext_ - __extbuf_ - __off;
-                    __update_st = true;
-                }
-            }
-        }
-#if _WIN32
-        if (fseek(__file_, -__c, SEEK_CUR))
-            return -1;
-#else
-        if (fseeko(__file_, -__c, SEEK_CUR))
-            return -1;
-#endif
-        if (__update_st)
-            __st_ = __state;
-        __extbufnext_ = __extbufend_ = __extbuf_;
-        this->setg(0, 0, 0);
-        __cm_ = 0;
-    }
-    return 0;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_filebuf<_CharT, _Traits>::imbue(const locale& __loc)
-{
-    sync();
-    __cv_ = &use_facet<codecvt<char_type, char, state_type> >(__loc);
-    bool __old_anc = __always_noconv_;
-    __always_noconv_ = __cv_->always_noconv();
-    if (__old_anc != __always_noconv_)
-    {
-        this->setg(0, 0, 0);
-        this->setp(0, 0);
-        // invariant, char_type is char, else we couldn't get here
-        if (__always_noconv_)  // need to dump __intbuf_
-        {
-            if (__owns_eb_)
-                delete [] __extbuf_;
-            __owns_eb_ = __owns_ib_;
-            __ebs_ = __ibs_;
-            __extbuf_ = (char*)__intbuf_;
-            __ibs_ = 0;
-            __intbuf_ = 0;
-            __owns_ib_ = false;
-        }
-        else  // need to obtain an __intbuf_.
-        {     // If __extbuf_ is user-supplied, use it, else new __intbuf_
-            if (!__owns_eb_ && __extbuf_ != __extbuf_min_)
-            {
-                __ibs_ = __ebs_;
-                __intbuf_ = (char_type*)__extbuf_;
-                __owns_ib_ = false;
-                __extbuf_ = new char[__ebs_];
-                __owns_eb_ = true;
-            }
-            else
-            {
-                __ibs_ = __ebs_;
-                __intbuf_ = new char_type[__ibs_];
-                __owns_ib_ = true;
-            }
-        }
-    }
-}
-
-template <class _CharT, class _Traits>
-bool
-basic_filebuf<_CharT, _Traits>::__read_mode()
-{
-    if (!(__cm_ & ios_base::in))
-    {
-        this->setp(0, 0);
-        if (__always_noconv_)
-            this->setg((char_type*)__extbuf_,
-                       (char_type*)__extbuf_ + __ebs_,
-                       (char_type*)__extbuf_ + __ebs_);
-        else
-            this->setg(__intbuf_, __intbuf_ + __ibs_, __intbuf_ + __ibs_);
-        __cm_ = ios_base::in;
-        return true;
-    }
-    return false;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_filebuf<_CharT, _Traits>::__write_mode()
-{
-    if (!(__cm_ & ios_base::out))
-    {
-        this->setg(0, 0, 0);
-        if (__ebs_ > sizeof(__extbuf_min_))
-        {
-            if (__always_noconv_)
-                this->setp((char_type*)__extbuf_,
-                           (char_type*)__extbuf_ + (__ebs_ - 1));
-            else
-                this->setp(__intbuf_, __intbuf_ + (__ibs_ - 1));
-        }
-        else
-            this->setp(0, 0);
-        __cm_ = ios_base::out;
-    }
-}
-
-// basic_ifstream
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ifstream
-    : public basic_istream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_ifstream();
-    explicit basic_ifstream(const char* __s, ios_base::openmode __mode = ios_base::in);
-    explicit basic_ifstream(const string& __s, ios_base::openmode __mode = ios_base::in);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ifstream(basic_ifstream&& __rhs);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ifstream& operator=(basic_ifstream&& __rhs);
-#endif
-    void swap(basic_ifstream& __rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* __s, ios_base::openmode __mode = ios_base::in);
-    void open(const string& __s, ios_base::openmode __mode = ios_base::in);
-    void close();
-
-private:
-    basic_filebuf<char_type, traits_type> __sb_;
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>::basic_ifstream()
-    : basic_istream<char_type, traits_type>(&__sb_)
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>::basic_ifstream(const char* __s, ios_base::openmode __mode)
-    : basic_istream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode | ios_base::in) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>::basic_ifstream(const string& __s, ios_base::openmode __mode)
-    : basic_istream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode | ios_base::in) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>::basic_ifstream(basic_ifstream&& __rhs)
-    : basic_istream<char_type, traits_type>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    this->set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ifstream<_CharT, _Traits>&
-basic_ifstream<_CharT, _Traits>::operator=(basic_ifstream&& __rhs)
-{
-    basic_istream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ifstream<_CharT, _Traits>::swap(basic_ifstream& __rhs)
-{
-    basic_istream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_ifstream<_CharT, _Traits>& __x, basic_ifstream<_CharT, _Traits>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>*
-basic_ifstream<_CharT, _Traits>::rdbuf() const
-{
-    return const_cast<basic_filebuf<char_type, traits_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_ifstream<_CharT, _Traits>::is_open() const
-{
-    return __sb_.is_open();
-}
-
-template <class _CharT, class _Traits>
-void
-basic_ifstream<_CharT, _Traits>::open(const char* __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode | ios_base::in))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-void
-basic_ifstream<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode | ios_base::in))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ifstream<_CharT, _Traits>::close()
-{
-    if (__sb_.close() == 0)
-        this->setstate(ios_base::failbit);
-}
-
-// basic_ofstream
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ofstream
-    : public basic_ostream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_ofstream();
-    explicit basic_ofstream(const char* __s, ios_base::openmode __mode = ios_base::out);
-    explicit basic_ofstream(const string& __s, ios_base::openmode __mode = ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ofstream(basic_ofstream&& __rhs);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ofstream& operator=(basic_ofstream&& __rhs);
-#endif
-    void swap(basic_ofstream& __rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* __s, ios_base::openmode __mode = ios_base::out);
-    void open(const string& __s, ios_base::openmode __mode = ios_base::out);
-    void close();
-
-private:
-    basic_filebuf<char_type, traits_type> __sb_;
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>::basic_ofstream()
-    : basic_ostream<char_type, traits_type>(&__sb_)
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>::basic_ofstream(const char* __s, ios_base::openmode __mode)
-    : basic_ostream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode | ios_base::out) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>::basic_ofstream(const string& __s, ios_base::openmode __mode)
-    : basic_ostream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode | ios_base::out) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>::basic_ofstream(basic_ofstream&& __rhs)
-    : basic_ostream<char_type, traits_type>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    this->set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ofstream<_CharT, _Traits>&
-basic_ofstream<_CharT, _Traits>::operator=(basic_ofstream&& __rhs)
-{
-    basic_ostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ofstream<_CharT, _Traits>::swap(basic_ofstream& __rhs)
-{
-    basic_ostream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_ofstream<_CharT, _Traits>& __x, basic_ofstream<_CharT, _Traits>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>*
-basic_ofstream<_CharT, _Traits>::rdbuf() const
-{
-    return const_cast<basic_filebuf<char_type, traits_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_ofstream<_CharT, _Traits>::is_open() const
-{
-    return __sb_.is_open();
-}
-
-template <class _CharT, class _Traits>
-void
-basic_ofstream<_CharT, _Traits>::open(const char* __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode | ios_base::out))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-void
-basic_ofstream<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode | ios_base::out))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ofstream<_CharT, _Traits>::close()
-{
-    if (__sb_.close() == 0)
-        this->setstate(ios_base::failbit);
-}
-
-// basic_fstream
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_fstream
-    : public basic_iostream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    basic_fstream();
-    explicit basic_fstream(const char* __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
-    explicit basic_fstream(const string& __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_fstream(basic_fstream&& __rhs);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_fstream& operator=(basic_fstream&& __rhs);
-#endif
-    void swap(basic_fstream& __rhs);
-
-    basic_filebuf<char_type, traits_type>* rdbuf() const;
-    bool is_open() const;
-    void open(const char* __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
-    void open(const string& __s, ios_base::openmode __mode = ios_base::in | ios_base::out);
-    void close();
-
-private:
-    basic_filebuf<char_type, traits_type> __sb_;
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>::basic_fstream()
-    : basic_iostream<char_type, traits_type>(&__sb_)
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>::basic_fstream(const char* __s, ios_base::openmode __mode)
-    : basic_iostream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>::basic_fstream(const string& __s, ios_base::openmode __mode)
-    : basic_iostream<char_type, traits_type>(&__sb_)
-{
-    if (__sb_.open(__s, __mode) == 0)
-        this->setstate(ios_base::failbit);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>::basic_fstream(basic_fstream&& __rhs)
-    : basic_iostream<char_type, traits_type>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    this->set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_fstream<_CharT, _Traits>&
-basic_fstream<_CharT, _Traits>::operator=(basic_fstream&& __rhs)
-{
-    basic_iostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_fstream<_CharT, _Traits>::swap(basic_fstream& __rhs)
-{
-    basic_iostream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_fstream<_CharT, _Traits>& __x, basic_fstream<_CharT, _Traits>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_filebuf<_CharT, _Traits>*
-basic_fstream<_CharT, _Traits>::rdbuf() const
-{
-    return const_cast<basic_filebuf<char_type, traits_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_fstream<_CharT, _Traits>::is_open() const
-{
-    return __sb_.is_open();
-}
-
-template <class _CharT, class _Traits>
-void
-basic_fstream<_CharT, _Traits>::open(const char* __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-void
-basic_fstream<_CharT, _Traits>::open(const string& __s, ios_base::openmode __mode)
-{
-    if (__sb_.open(__s, __mode))
-        this->clear();
-    else
-        this->setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_fstream<_CharT, _Traits>::close()
-{
-    if (__sb_.close() == 0)
-        this->setstate(ios_base::failbit);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_FSTREAM
diff --git a/include.new/c++/v1/tr1/functional b/include.new/c++/v1/tr1/functional
deleted file mode 100644
index d14b46b..0000000
--- a/include.new/c++/v1/tr1/functional
+++ /dev/null
@@ -1,2419 +0,0 @@
-// -*- C++ -*-
-//===------------------------ functional ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUNCTIONAL
-#define _LIBCPP_FUNCTIONAL
-
-/*
-    functional synopsis
-
-namespace std
-{
-
-template <class Arg, class Result>
-struct unary_function
-{
-    typedef Arg    argument_type;
-    typedef Result result_type;
-};
-
-template <class Arg1, class Arg2, class Result>
-struct binary_function
-{
-    typedef Arg1   first_argument_type;
-    typedef Arg2   second_argument_type;
-    typedef Result result_type;
-};
-
-template <class T>
-class reference_wrapper
-    : public unary_function<T1, R> // if wrapping a unary functor
-    : public binary_function<T1, T2, R> // if wraping a binary functor
-{
-public:
-    // types
-    typedef T type;
-    typedef see below result_type; // Not always defined
-
-    // construct/copy/destroy
-    reference_wrapper(T&) noexcept;
-    reference_wrapper(T&&) = delete; // do not bind to temps
-    reference_wrapper(const reference_wrapper<T>& x) noexcept;
-
-    // assignment
-    reference_wrapper& operator=(const reference_wrapper<T>& x) noexcept;
-
-    // access
-    operator T& () const noexcept;
-    T& get() const noexcept;
-
-    // invoke
-    template <class... ArgTypes>
-      typename result_of<T&(ArgTypes&&...)>::type
-          operator() (ArgTypes&&...) const;
-};
-
-template <class T> reference_wrapper<T> ref(T& t) noexcept;
-template <class T> void ref(const T&& t) = delete;
-template <class T> reference_wrapper<T> ref(reference_wrapper<T>t) noexcept;
-
-template <class T> reference_wrapper<const T> cref(const T& t) noexcept;
-template <class T> void cref(const T&& t) = delete;
-template <class T> reference_wrapper<const T> cref(reference_wrapper<T> t) noexcept;
-
-template <class T> // <class T=void> in C++14
-struct plus : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct minus : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct multiplies : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct divides : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct modulus : binary_function<T, T, T>
-{
-    T operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct negate : unary_function<T, T>
-{
-    T operator()(const T& x) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct equal_to : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct not_equal_to : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct greater : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct less : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct greater_equal : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct less_equal : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct logical_and : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct logical_or : binary_function<T, T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct logical_not : unary_function<T, bool>
-{
-    bool operator()(const T& x) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct bit_and : unary_function<T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct bit_or : unary_function<T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T> // <class T=void> in C++14
-struct bit_xor : unary_function<T, bool>
-{
-    bool operator()(const T& x, const T& y) const;
-};
-
-template <class T=void> // C++14
-struct bit_xor : unary_function<T, bool>
-{
-    bool operator()(const T& x) const;
-};
-
-template <class Predicate>
-class unary_negate
-    : public unary_function<typename Predicate::argument_type, bool>
-{
-public:
-    explicit unary_negate(const Predicate& pred);
-    bool operator()(const typename Predicate::argument_type& x) const;
-};
-
-template <class Predicate> unary_negate<Predicate> not1(const Predicate& pred);
-
-template <class Predicate>
-class binary_negate
-    : public binary_function<typename Predicate::first_argument_type,
-                             typename Predicate::second_argument_type,
-                             bool>
-{
-public:
-    explicit binary_negate(const Predicate& pred);
-    bool operator()(const typename Predicate::first_argument_type& x,
-                    const typename Predicate::second_argument_type& y) const;
-};
-
-template <class Predicate> binary_negate<Predicate> not2(const Predicate& pred);
-
-template<class T> struct is_bind_expression;
-template<class T> struct is_placeholder;
-
-template<class Fn, class... BoundArgs>
-  unspecified bind(Fn&&, BoundArgs&&...);
-template<class R, class Fn, class... BoundArgs>
-  unspecified bind(Fn&&, BoundArgs&&...);
-
-namespace placeholders {
-  // M is the implementation-defined number of placeholders
-  extern unspecified _1;
-  extern unspecified _2;
-  .
-  .
-  .
-  extern unspecified _Mp;
-}
-
-template <class Operation>
-class binder1st
-    : public unary_function<typename Operation::second_argument_type,
-                            typename Operation::result_type>
-{
-protected:
-    Operation                               op;
-    typename Operation::first_argument_type value;
-public:
-    binder1st(const Operation& x, const typename Operation::first_argument_type y);
-    typename Operation::result_type operator()(      typename Operation::second_argument_type& x) const;
-    typename Operation::result_type operator()(const typename Operation::second_argument_type& x) const;
-};
-
-template <class Operation, class T>
-binder1st<Operation> bind1st(const Operation& op, const T& x);
-
-template <class Operation>
-class binder2nd
-    : public unary_function<typename Operation::first_argument_type,
-                            typename Operation::result_type>
-{
-protected:
-    Operation                                op;
-    typename Operation::second_argument_type value;
-public:
-    binder2nd(const Operation& x, const typename Operation::second_argument_type y);
-    typename Operation::result_type operator()(      typename Operation::first_argument_type& x) const;
-    typename Operation::result_type operator()(const typename Operation::first_argument_type& x) const;
-};
-
-template <class Operation, class T>
-binder2nd<Operation> bind2nd(const Operation& op, const T& x);
-
-template <class Arg, class Result>
-class pointer_to_unary_function : public unary_function<Arg, Result>
-{
-public:
-    explicit pointer_to_unary_function(Result (*f)(Arg));
-    Result operator()(Arg x) const;
-};
-
-template <class Arg, class Result>
-pointer_to_unary_function<Arg,Result> ptr_fun(Result (*f)(Arg));
-
-template <class Arg1, class Arg2, class Result>
-class pointer_to_binary_function : public binary_function<Arg1, Arg2, Result>
-{
-public:
-    explicit pointer_to_binary_function(Result (*f)(Arg1, Arg2));
-    Result operator()(Arg1 x, Arg2 y) const;
-};
-
-template <class Arg1, class Arg2, class Result>
-pointer_to_binary_function<Arg1,Arg2,Result> ptr_fun(Result (*f)(Arg1,Arg2));
-
-template<class S, class T>
-class mem_fun_t : public unary_function<T*, S>
-{
-public:
-    explicit mem_fun_t(S (T::*p)());
-    S operator()(T* p) const;
-};
-
-template<class S, class T, class A>
-class mem_fun1_t : public binary_function<T*, A, S>
-{
-public:
-    explicit mem_fun1_t(S (T::*p)(A));
-    S operator()(T* p, A x) const;
-};
-
-template<class S, class T>          mem_fun_t<S,T>    mem_fun(S (T::*f)());
-template<class S, class T, class A> mem_fun1_t<S,T,A> mem_fun(S (T::*f)(A));
-
-template<class S, class T>
-class mem_fun_ref_t : public unary_function<T, S>
-{
-public:
-    explicit mem_fun_ref_t(S (T::*p)());
-    S operator()(T& p) const;
-};
-
-template<class S, class T, class A>
-class mem_fun1_ref_t : public binary_function<T, A, S>
-{
-public:
-    explicit mem_fun1_ref_t(S (T::*p)(A));
-    S operator()(T& p, A x) const;
-};
-
-template<class S, class T>          mem_fun_ref_t<S,T>    mem_fun_ref(S (T::*f)());
-template<class S, class T, class A> mem_fun1_ref_t<S,T,A> mem_fun_ref(S (T::*f)(A));
-
-template <class S, class T>
-class const_mem_fun_t : public unary_function<const T*, S>
-{
-public:
-    explicit const_mem_fun_t(S (T::*p)() const);
-    S operator()(const T* p) const;
-};
-
-template <class S, class T, class A>
-class const_mem_fun1_t : public binary_function<const T*, A, S>
-{
-public:
-    explicit const_mem_fun1_t(S (T::*p)(A) const);
-    S operator()(const T* p, A x) const;
-};
-
-template <class S, class T>          const_mem_fun_t<S,T>    mem_fun(S (T::*f)() const);
-template <class S, class T, class A> const_mem_fun1_t<S,T,A> mem_fun(S (T::*f)(A) const);
-
-template <class S, class T>
-class const_mem_fun_ref_t : public unary_function<T, S>
-{
-public:
-    explicit const_mem_fun_ref_t(S (T::*p)() const);
-    S operator()(const T& p) const;
-};
-
-template <class S, class T, class A>
-class const_mem_fun1_ref_t : public binary_function<T, A, S>
-{
-public:
-    explicit const_mem_fun1_ref_t(S (T::*p)(A) const);
-    S operator()(const T& p, A x) const;
-};
-
-template <class S, class T>          const_mem_fun_ref_t<S,T>    mem_fun_ref(S (T::*f)() const);
-template <class S, class T, class A> const_mem_fun1_ref_t<S,T,A> mem_fun_ref(S (T::*f)(A) const);
-
-template<class R, class T> unspecified mem_fn(R T::*);
-
-class bad_function_call
-    : public exception
-{
-};
-
-template<class> class function; // undefined
-
-template<class R, class... ArgTypes>
-class function<R(ArgTypes...)>
-  : public unary_function<T1, R>      // iff sizeof...(ArgTypes) == 1 and
-                                      // ArgTypes contains T1
-  : public binary_function<T1, T2, R> // iff sizeof...(ArgTypes) == 2 and
-                                      // ArgTypes contains T1 and T2
-{
-public:
-    typedef R result_type;
-
-    // construct/copy/destroy:
-    function() noexcept;
-    function(nullptr_t) noexcept;
-    function(const function&);
-    function(function&&) noexcept;
-    template<class F>
-      function(F);
-    template<Allocator Alloc>
-      function(allocator_arg_t, const Alloc&) noexcept;
-    template<Allocator Alloc>
-      function(allocator_arg_t, const Alloc&, nullptr_t) noexcept;
-    template<Allocator Alloc>
-      function(allocator_arg_t, const Alloc&, const function&);
-    template<Allocator Alloc>
-      function(allocator_arg_t, const Alloc&, function&&);
-    template<class F, Allocator Alloc>
-      function(allocator_arg_t, const Alloc&, F);
-
-    function& operator=(const function&);
-    function& operator=(function&&) noexcept;
-    function& operator=(nullptr_t) noexcept;
-    template<class F>
-      function& operator=(F&&);
-    template<class F>
-      function& operator=(reference_wrapper<F>) noexcept;
-
-    ~function();
-
-    // function modifiers:
-    void swap(function&) noexcept;
-    template<class F, class Alloc>
-      void assign(F&&, const Alloc&);
-
-    // function capacity:
-    explicit operator bool() const noexcept;
-
-    // function invocation:
-    R operator()(ArgTypes...) const;
-
-    // function target access:
-    const std::type_info& target_type() const noexcept;
-    template <typename T>       T* target() noexcept;
-    template <typename T> const T* target() const noexcept;
-};
-
-// Null pointer comparisons:
-template <class R, class ... ArgTypes>
-  bool operator==(const function<R(ArgTypes...)>&, nullptr_t) noexcept;
-
-template <class R, class ... ArgTypes>
-  bool operator==(nullptr_t, const function<R(ArgTypes...)>&) noexcept;
-
-template <class R, class ... ArgTypes>
-  bool operator!=(const function<R(ArgTypes...)>&, nullptr_t) noexcept;
-
-template <class  R, class ... ArgTypes>
-  bool operator!=(nullptr_t, const function<R(ArgTypes...)>&) noexcept;
-
-// specialized algorithms:
-template <class  R, class ... ArgTypes>
-  void swap(function<R(ArgTypes...)>&, function<R(ArgTypes...)>&) noexcept;
-
-template <class T> struct hash;
-
-template <> struct hash<bool>;
-template <> struct hash<char>;
-template <> struct hash<signed char>;
-template <> struct hash<unsigned char>;
-template <> struct hash<char16_t>;
-template <> struct hash<char32_t>;
-template <> struct hash<wchar_t>;
-template <> struct hash<short>;
-template <> struct hash<unsigned short>;
-template <> struct hash<int>;
-template <> struct hash<unsigned int>;
-template <> struct hash<long>;
-template <> struct hash<long long>;
-template <> struct hash<unsigned long>;
-template <> struct hash<unsigned long long>;
-
-template <> struct hash<float>;
-template <> struct hash<double>;
-template <> struct hash<long double>;
-
-template<class T> struct hash<T*>;
-
-}  // std
-
-POLICY:  For non-variadic implementations, the number of arguments is limited
-         to 3.  It is hoped that the need for non-variadic implementations
-         will be minimal.
-
-*/
-
-#include <__config>
-#include <type_traits>
-#include <typeinfo>
-#include <exception>
-#include <memory>
-#include <tuple>
-
-#include <__functional_base>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY plus : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x + __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY plus<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) + _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY minus : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x - __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY minus<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) - _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY multiplies : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x * __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY multiplies<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) * _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY divides : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x / __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY divides<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) / _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY modulus : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x % __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY modulus<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) % _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY negate : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return -__x;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY negate<void>
-{
-    template <class _Tp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_Tp&& __x) const
-        { return -_VSTD::forward<_Tp>(__x); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY equal_to : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x == __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY equal_to<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) == _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY not_equal_to : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x != __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY not_equal_to<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) != _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY greater : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x > __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY greater<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) > _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-// less in <__functional_base>
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY greater_equal : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x >= __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY greater_equal<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) >= _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY less_equal : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x <= __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY less_equal<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) <= _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY logical_and : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x && __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY logical_and<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) && _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY logical_or : binary_function<_Tp, _Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x || __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY logical_or<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) || _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY logical_not : unary_function<_Tp, bool>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Tp& __x) const
-        {return !__x;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY logical_not<void>
-{
-    template <class _Tp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_Tp&& __x) const
-        { return !_VSTD::forward<_Tp>(__x); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY bit_and : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x & __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY bit_and<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) & _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY bit_or : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x | __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY bit_or<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) | _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
-struct _LIBCPP_TYPE_VIS_ONLY bit_xor : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x ^ __y;}
-};
-
-#if _LIBCPP_STD_VER > 11
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY bit_xor<void>
-{
-    template <class _T1, class _T2>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_T1&& __t, _T2&& __u) const
-        { return _VSTD::forward<_T1>(__t) ^ _VSTD::forward<_T2>(__u); }
-    typedef void is_transparent;
-};
-#endif
-
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp = void>
-struct _LIBCPP_TYPE_VIS_ONLY bit_not : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return ~__x;}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY bit_not<void>
-{
-    template <class _Tp>
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    auto operator()(_Tp&& __x) const
-        { return ~_VSTD::forward<_Tp>(__x); }
-    typedef void is_transparent;
-};
-#endif
-
-template <class _Predicate>
-class _LIBCPP_TYPE_VIS_ONLY unary_negate
-    : public unary_function<typename _Predicate::argument_type, bool>
-{
-    _Predicate __pred_;
-public:
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    explicit unary_negate(const _Predicate& __pred)
-        : __pred_(__pred) {}
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const typename _Predicate::argument_type& __x) const
-        {return !__pred_(__x);}
-};
-
-template <class _Predicate>
-inline _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-unary_negate<_Predicate>
-not1(const _Predicate& __pred) {return unary_negate<_Predicate>(__pred);}
-
-template <class _Predicate>
-class _LIBCPP_TYPE_VIS_ONLY binary_negate
-    : public binary_function<typename _Predicate::first_argument_type,
-                             typename _Predicate::second_argument_type,
-                             bool>
-{
-    _Predicate __pred_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit _LIBCPP_CONSTEXPR_AFTER_CXX11 
-    binary_negate(const _Predicate& __pred) : __pred_(__pred) {}
-
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const typename _Predicate::first_argument_type& __x,
-                    const typename _Predicate::second_argument_type& __y) const
-        {return !__pred_(__x, __y);}
-};
-
-template <class _Predicate>
-inline _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-binary_negate<_Predicate>
-not2(const _Predicate& __pred) {return binary_negate<_Predicate>(__pred);}
-
-template <class __Operation>
-class _LIBCPP_TYPE_VIS_ONLY binder1st
-    : public unary_function<typename __Operation::second_argument_type,
-                            typename __Operation::result_type>
-{
-protected:
-    __Operation                               op;
-    typename __Operation::first_argument_type value;
-public:
-    _LIBCPP_INLINE_VISIBILITY binder1st(const __Operation& __x,
-                               const typename __Operation::first_argument_type __y)
-        : op(__x), value(__y) {}
-    _LIBCPP_INLINE_VISIBILITY typename __Operation::result_type operator()
-        (typename __Operation::second_argument_type& __x) const
-            {return op(value, __x);}
-    _LIBCPP_INLINE_VISIBILITY typename __Operation::result_type operator()
-        (const typename __Operation::second_argument_type& __x) const
-            {return op(value, __x);}
-};
-
-template <class __Operation, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-binder1st<__Operation>
-bind1st(const __Operation& __op, const _Tp& __x)
-    {return binder1st<__Operation>(__op, __x);}
-
-template <class __Operation>
-class _LIBCPP_TYPE_VIS_ONLY binder2nd
-    : public unary_function<typename __Operation::first_argument_type,
-                            typename __Operation::result_type>
-{
-protected:
-    __Operation                                op;
-    typename __Operation::second_argument_type value;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    binder2nd(const __Operation& __x, const typename __Operation::second_argument_type __y)
-        : op(__x), value(__y) {}
-    _LIBCPP_INLINE_VISIBILITY typename __Operation::result_type operator()
-        (      typename __Operation::first_argument_type& __x) const
-            {return op(__x, value);}
-    _LIBCPP_INLINE_VISIBILITY typename __Operation::result_type operator()
-        (const typename __Operation::first_argument_type& __x) const
-            {return op(__x, value);}
-};
-
-template <class __Operation, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-binder2nd<__Operation>
-bind2nd(const __Operation& __op, const _Tp& __x)
-    {return binder2nd<__Operation>(__op, __x);}
-
-template <class _Arg, class _Result>
-class _LIBCPP_TYPE_VIS_ONLY pointer_to_unary_function
-    : public unary_function<_Arg, _Result>
-{
-    _Result (*__f_)(_Arg);
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit pointer_to_unary_function(_Result (*__f)(_Arg))
-        : __f_(__f) {}
-    _LIBCPP_INLINE_VISIBILITY _Result operator()(_Arg __x) const
-        {return __f_(__x);}
-};
-
-template <class _Arg, class _Result>
-inline _LIBCPP_INLINE_VISIBILITY
-pointer_to_unary_function<_Arg,_Result>
-ptr_fun(_Result (*__f)(_Arg))
-    {return pointer_to_unary_function<_Arg,_Result>(__f);}
-
-template <class _Arg1, class _Arg2, class _Result>
-class _LIBCPP_TYPE_VIS_ONLY pointer_to_binary_function
-    : public binary_function<_Arg1, _Arg2, _Result>
-{
-    _Result (*__f_)(_Arg1, _Arg2);
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit pointer_to_binary_function(_Result (*__f)(_Arg1, _Arg2))
-        : __f_(__f) {}
-    _LIBCPP_INLINE_VISIBILITY _Result operator()(_Arg1 __x, _Arg2 __y) const
-        {return __f_(__x, __y);}
-};
-
-template <class _Arg1, class _Arg2, class _Result>
-inline _LIBCPP_INLINE_VISIBILITY
-pointer_to_binary_function<_Arg1,_Arg2,_Result>
-ptr_fun(_Result (*__f)(_Arg1,_Arg2))
-    {return pointer_to_binary_function<_Arg1,_Arg2,_Result>(__f);}
-
-template<class _Sp, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY mem_fun_t : public unary_function<_Tp*, _Sp>
-{
-    _Sp (_Tp::*__p_)();
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit mem_fun_t(_Sp (_Tp::*__p)())
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(_Tp* __p) const
-        {return (__p->*__p_)();}
-};
-
-template<class _Sp, class _Tp, class _Ap>
-class _LIBCPP_TYPE_VIS_ONLY mem_fun1_t : public binary_function<_Tp*, _Ap, _Sp>
-{
-    _Sp (_Tp::*__p_)(_Ap);
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit mem_fun1_t(_Sp (_Tp::*__p)(_Ap))
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(_Tp* __p, _Ap __x) const
-        {return (__p->*__p_)(__x);}
-};
-
-template<class _Sp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-mem_fun_t<_Sp,_Tp>
-mem_fun(_Sp (_Tp::*__f)())
-    {return mem_fun_t<_Sp,_Tp>(__f);}
-
-template<class _Sp, class _Tp, class _Ap>
-inline _LIBCPP_INLINE_VISIBILITY
-mem_fun1_t<_Sp,_Tp,_Ap>
-mem_fun(_Sp (_Tp::*__f)(_Ap))
-    {return mem_fun1_t<_Sp,_Tp,_Ap>(__f);}
-
-template<class _Sp, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY mem_fun_ref_t : public unary_function<_Tp, _Sp>
-{
-    _Sp (_Tp::*__p_)();
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit mem_fun_ref_t(_Sp (_Tp::*__p)())
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(_Tp& __p) const
-        {return (__p.*__p_)();}
-};
-
-template<class _Sp, class _Tp, class _Ap>
-class _LIBCPP_TYPE_VIS_ONLY mem_fun1_ref_t : public binary_function<_Tp, _Ap, _Sp>
-{
-    _Sp (_Tp::*__p_)(_Ap);
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit mem_fun1_ref_t(_Sp (_Tp::*__p)(_Ap))
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(_Tp& __p, _Ap __x) const
-        {return (__p.*__p_)(__x);}
-};
-
-template<class _Sp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-mem_fun_ref_t<_Sp,_Tp>
-mem_fun_ref(_Sp (_Tp::*__f)())
-    {return mem_fun_ref_t<_Sp,_Tp>(__f);}
-
-template<class _Sp, class _Tp, class _Ap>
-inline _LIBCPP_INLINE_VISIBILITY
-mem_fun1_ref_t<_Sp,_Tp,_Ap>
-mem_fun_ref(_Sp (_Tp::*__f)(_Ap))
-    {return mem_fun1_ref_t<_Sp,_Tp,_Ap>(__f);}
-
-template <class _Sp, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY const_mem_fun_t : public unary_function<const _Tp*, _Sp>
-{
-    _Sp (_Tp::*__p_)() const;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit const_mem_fun_t(_Sp (_Tp::*__p)() const)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(const _Tp* __p) const
-        {return (__p->*__p_)();}
-};
-
-template <class _Sp, class _Tp, class _Ap>
-class _LIBCPP_TYPE_VIS_ONLY const_mem_fun1_t : public binary_function<const _Tp*, _Ap, _Sp>
-{
-    _Sp (_Tp::*__p_)(_Ap) const;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit const_mem_fun1_t(_Sp (_Tp::*__p)(_Ap) const)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(const _Tp* __p, _Ap __x) const
-        {return (__p->*__p_)(__x);}
-};
-
-template <class _Sp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const_mem_fun_t<_Sp,_Tp>
-mem_fun(_Sp (_Tp::*__f)() const)
-    {return const_mem_fun_t<_Sp,_Tp>(__f);}
-
-template <class _Sp, class _Tp, class _Ap>
-inline _LIBCPP_INLINE_VISIBILITY
-const_mem_fun1_t<_Sp,_Tp,_Ap>
-mem_fun(_Sp (_Tp::*__f)(_Ap) const)
-    {return const_mem_fun1_t<_Sp,_Tp,_Ap>(__f);}
-
-template <class _Sp, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY const_mem_fun_ref_t : public unary_function<_Tp, _Sp>
-{
-    _Sp (_Tp::*__p_)() const;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit const_mem_fun_ref_t(_Sp (_Tp::*__p)() const)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(const _Tp& __p) const
-        {return (__p.*__p_)();}
-};
-
-template <class _Sp, class _Tp, class _Ap>
-class _LIBCPP_TYPE_VIS_ONLY const_mem_fun1_ref_t
-    : public binary_function<_Tp, _Ap, _Sp>
-{
-    _Sp (_Tp::*__p_)(_Ap) const;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit const_mem_fun1_ref_t(_Sp (_Tp::*__p)(_Ap) const)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY _Sp operator()(const _Tp& __p, _Ap __x) const
-        {return (__p.*__p_)(__x);}
-};
-
-template <class _Sp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const_mem_fun_ref_t<_Sp,_Tp>
-mem_fun_ref(_Sp (_Tp::*__f)() const)
-    {return const_mem_fun_ref_t<_Sp,_Tp>(__f);}
-
-template <class _Sp, class _Tp, class _Ap>
-inline _LIBCPP_INLINE_VISIBILITY
-const_mem_fun1_ref_t<_Sp,_Tp,_Ap>
-mem_fun_ref(_Sp (_Tp::*__f)(_Ap) const)
-    {return const_mem_fun1_ref_t<_Sp,_Tp,_Ap>(__f);}
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-#include <__functional_03>
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp>
-class __mem_fn
-    : public __weak_result_type<_Tp>
-{
-public:
-    // types
-    typedef _Tp type;
-private:
-    type __f_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY __mem_fn(type __f) : __f_(__f) {}
-
-    // invoke
-    template <class... _ArgTypes>
-       _LIBCPP_INLINE_VISIBILITY
-       typename __invoke_return<type, _ArgTypes...>::type
-          operator() (_ArgTypes&&... __args) const
-          {
-              return __invoke(__f_, _VSTD::forward<_ArgTypes>(__args)...);
-          }
-};
-
-template<class _Rp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__mem_fn<_Rp _Tp::*>
-mem_fn(_Rp _Tp::* __pm)
-{
-    return __mem_fn<_Rp _Tp::*>(__pm);
-}
-
-// bad_function_call
-
-class _LIBCPP_EXCEPTION_ABI bad_function_call
-    : public exception
-{
-};
-
-template<class _Fp> class _LIBCPP_TYPE_VIS_ONLY function; // undefined
-
-namespace __function
-{
-
-template<class _Rp, class ..._ArgTypes>
-struct __maybe_derive_from_unary_function
-{
-};
-
-template<class _Rp, class _A1>
-struct __maybe_derive_from_unary_function<_Rp(_A1)>
-    : public unary_function<_A1, _Rp>
-{
-};
-
-template<class _Rp, class ..._ArgTypes>
-struct __maybe_derive_from_binary_function
-{
-};
-
-template<class _Rp, class _A1, class _A2>
-struct __maybe_derive_from_binary_function<_Rp(_A1, _A2)>
-    : public binary_function<_A1, _A2, _Rp>
-{
-};
-
-template<class _Fp> class __base;
-
-template<class _Rp, class ..._ArgTypes>
-class __base<_Rp(_ArgTypes...)>
-{
-    __base(const __base&);
-    __base& operator=(const __base&);
-public:
-    _LIBCPP_INLINE_VISIBILITY __base() {}
-    _LIBCPP_INLINE_VISIBILITY virtual ~__base() {}
-    virtual __base* __clone() const = 0;
-    virtual void __clone(__base*) const = 0;
-    virtual void destroy() _NOEXCEPT = 0;
-    virtual void destroy_deallocate() _NOEXCEPT = 0;
-    virtual _Rp operator()(_ArgTypes&& ...) = 0;
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const _NOEXCEPT = 0;
-    virtual const std::type_info& target_type() const _NOEXCEPT = 0;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _FD, class _Alloc, class _FB> class __func;
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-class __func<_Fp, _Alloc, _Rp(_ArgTypes...)>
-    : public  __base<_Rp(_ArgTypes...)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __func(_Fp&& __f)
-        : __f_(piecewise_construct, _VSTD::forward_as_tuple(_VSTD::move(__f)),
-                                    _VSTD::forward_as_tuple()) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __func(const _Fp& __f, const _Alloc& __a)
-        : __f_(piecewise_construct, _VSTD::forward_as_tuple(__f),
-                                    _VSTD::forward_as_tuple(__a)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __func(const _Fp& __f, _Alloc&& __a)
-        : __f_(piecewise_construct, _VSTD::forward_as_tuple(__f),
-                                    _VSTD::forward_as_tuple(_VSTD::move(__a))) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __func(_Fp&& __f, _Alloc&& __a)
-        : __f_(piecewise_construct, _VSTD::forward_as_tuple(_VSTD::move(__f)),
-                                    _VSTD::forward_as_tuple(_VSTD::move(__a))) {}
-    virtual __base<_Rp(_ArgTypes...)>* __clone() const;
-    virtual void __clone(__base<_Rp(_ArgTypes...)>*) const;
-    virtual void destroy() _NOEXCEPT;
-    virtual void destroy_deallocate() _NOEXCEPT;
-    virtual _Rp operator()(_ArgTypes&& ... __arg);
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* target(const type_info&) const _NOEXCEPT;
-    virtual const std::type_info& target_type() const _NOEXCEPT;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-__base<_Rp(_ArgTypes...)>*
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__clone() const
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    typedef __allocator_destructor<_Ap> _Dp;
-    unique_ptr<__func, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-    ::new (__hold.get()) __func(__f_.first(), _Alloc(__a));
-    return __hold.release();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__clone(__base<_Rp(_ArgTypes...)>* __p) const
-{
-    ::new (__p) __func(__f_.first(), __f_.second());
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy() _NOEXCEPT
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy_deallocate() _NOEXCEPT
-{
-    typedef typename _Alloc::template rebind<__func>::other _Ap;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(this, 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-_Rp
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::operator()(_ArgTypes&& ... __arg)
-{
-    return __invoke(__f_.first(), _VSTD::forward<_ArgTypes>(__arg)...);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-const void*
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::target(const type_info& __ti) const _NOEXCEPT
-{
-    if (__ti == typeid(_Fp))
-        return &__f_.first();
-    return (const void*)0;
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-const std::type_info&
-__func<_Fp, _Alloc, _Rp(_ArgTypes...)>::target_type() const _NOEXCEPT
-{
-    return typeid(_Fp);
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-}  // __function
-
-template<class _Rp, class ..._ArgTypes>
-class _LIBCPP_TYPE_VIS_ONLY function<_Rp(_ArgTypes...)>
-    : public __function::__maybe_derive_from_unary_function<_Rp(_ArgTypes...)>,
-      public __function::__maybe_derive_from_binary_function<_Rp(_ArgTypes...)>
-{
-    typedef __function::__base<_Rp(_ArgTypes...)> __base;
-    typename aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-    template <class _Fp>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const _Fp&) {return true;}
-    template <class _R2, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (*__p)(_Ap...)) {return __p;}
-    template <class _R2, class _Cp, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_Ap...)) {return __p;}
-    template <class _R2, class _Cp, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_Ap...) const) {return __p;}
-    template <class _R2, class _Cp, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_Ap...) volatile) {return __p;}
-    template <class _R2, class _Cp, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(_R2 (_Cp::*__p)(_Ap...) const volatile) {return __p;}
-    template <class _R2, class ..._Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        static bool __not_null(const function<_R2(_Ap...)>& __p) {return !!__p;}
-
-    template <class _Fp, bool = !is_same<_Fp, function>::value &&
-                                __invokable<_Fp&, _ArgTypes...>::value>
-        struct __callable;
-    template <class _Fp>
-        struct __callable<_Fp, true>
-        {
-            static const bool value =
-                is_convertible<typename __invoke_of<_Fp&, _ArgTypes...>::type,
-                               _Rp>::value;
-        };
-    template <class _Fp>
-        struct __callable<_Fp, false>
-        {
-            static const bool value = false;
-        };
-public:
-    typedef _Rp result_type;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    function() _NOEXCEPT : __f_(0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    function(nullptr_t) _NOEXCEPT : __f_(0) {}
-    function(const function&);
-    function(function&&) _NOEXCEPT;
-    template<class _Fp>
-      function(_Fp, typename enable_if
-                                     <
-                                        __callable<_Fp>::value &&
-                                        !is_same<_Fp, function>::value
-                                      >::type* = 0);
-
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&) _NOEXCEPT : __f_(0) {}
-    template<class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      function(allocator_arg_t, const _Alloc&, nullptr_t) _NOEXCEPT : __f_(0) {}
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, const function&);
-    template<class _Alloc>
-      function(allocator_arg_t, const _Alloc&, function&&);
-    template<class _Fp, class _Alloc>
-      function(allocator_arg_t, const _Alloc& __a, _Fp __f,
-               typename enable_if<__callable<_Fp>::value>::type* = 0);
-
-    function& operator=(const function&);
-    function& operator=(function&&) _NOEXCEPT;
-    function& operator=(nullptr_t) _NOEXCEPT;
-    template<class _Fp>
-      typename enable_if
-      <
-        __callable<typename decay<_Fp>::type>::value &&
-        !is_same<typename remove_reference<_Fp>::type, function>::value,
-        function&
-      >::type
-      operator=(_Fp&&);
-
-    ~function();
-
-    // function modifiers:
-    void swap(function&) _NOEXCEPT;
-    template<class _Fp, class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      void assign(_Fp&& __f, const _Alloc& __a)
-        {function(allocator_arg, __a, _VSTD::forward<_Fp>(__f)).swap(*this);}
-
-    // function capacity:
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT {return __f_;}
-
-    // deleted overloads close possible hole in the type system
-    template<class _R2, class... _ArgTypes2>
-      bool operator==(const function<_R2(_ArgTypes2...)>&) const = delete;
-    template<class _R2, class... _ArgTypes2>
-      bool operator!=(const function<_R2(_ArgTypes2...)>&) const = delete;
-public:
-    // function invocation:
-    _Rp operator()(_ArgTypes...) const;
-
-#ifndef _LIBCPP_NO_RTTI
-    // function target access:
-    const std::type_info& target_type() const _NOEXCEPT;
-    template <typename _Tp> _Tp* target() _NOEXCEPT;
-    template <typename _Tp> const _Tp* target() const _NOEXCEPT;
-#endif  // _LIBCPP_NO_RTTI
-};
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>::function(const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Alloc>
-function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc&,
-                                     const function& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (const __base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-        __f_ = __f.__f_->__clone();
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>::function(function&& __f) _NOEXCEPT
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = 0;
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Alloc>
-function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc&,
-                                     function&& __f)
-{
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = 0;
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp>
-function<_Rp(_ArgTypes...)>::function(_Fp __f,
-                                     typename enable_if
-                                     <
-                                        __callable<_Fp>::value &&
-                                        !is_same<_Fp, function>::value
-                                     >::type*)
-    : __f_(0)
-{
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, allocator<_Fp>, _Rp(_ArgTypes...)> _FF;
-        if (sizeof(_FF) <= sizeof(__buf_) && is_nothrow_copy_constructible<_Fp>::value)
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(_VSTD::move(__f));
-        }
-        else
-        {
-            typedef allocator<_FF> _Ap;
-            _Ap __a;
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(_VSTD::move(__f), allocator<_Fp>(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp, class _Alloc>
-function<_Rp(_ArgTypes...)>::function(allocator_arg_t, const _Alloc& __a0, _Fp __f,
-                                     typename enable_if<__callable<_Fp>::value>::type*)
-    : __f_(0)
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-    if (__not_null(__f))
-    {
-        typedef __function::__func<_Fp, _Alloc, _Rp(_ArgTypes...)> _FF;
-        typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<_FF>
-#else
-            rebind_alloc<_FF>::other
-#endif
-            _Ap;
-        _Ap __a(__a0);
-        if (sizeof(_FF) <= sizeof(__buf_) && 
-            is_nothrow_copy_constructible<_Fp>::value && is_nothrow_copy_constructible<_Ap>::value)
-        {
-            __f_ = (__base*)&__buf_;
-            ::new (__f_) _FF(_VSTD::move(__f), _Alloc(__a));
-        }
-        else
-        {
-            typedef __allocator_destructor<_Ap> _Dp;
-            unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-            ::new (__hold.get()) _FF(_VSTD::move(__f), _Alloc(__a));
-            __f_ = __hold.release();
-        }
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>&
-function<_Rp(_ArgTypes...)>::operator=(const function& __f)
-{
-    function(__f).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>&
-function<_Rp(_ArgTypes...)>::operator=(function&& __f) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-    if (__f.__f_ == 0)
-        __f_ = 0;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__clone(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = 0;
-    }
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>&
-function<_Rp(_ArgTypes...)>::operator=(nullptr_t) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = 0;
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp>
-typename enable_if
-<
-    function<_Rp(_ArgTypes...)>::template __callable<typename decay<_Fp>::type>::value &&
-    !is_same<typename remove_reference<_Fp>::type, function<_Rp(_ArgTypes...)>>::value,
-    function<_Rp(_ArgTypes...)>&
->::type
-function<_Rp(_ArgTypes...)>::operator=(_Fp&& __f)
-{
-    function(_VSTD::forward<_Fp>(__f)).swap(*this);
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-function<_Rp(_ArgTypes...)>::~function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class ..._ArgTypes>
-void
-function<_Rp(_ArgTypes...)>::swap(function& __f) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__clone(__t);
-        __f_->destroy();
-        __f_ = 0;
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = 0;
-        __f_ = (__base*)&__buf_;
-        __t->__clone((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__clone((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__clone((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class ..._ArgTypes>
-_Rp
-function<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __arg) const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__f_ == 0)
-        throw bad_function_call();
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return (*__f_)(_VSTD::forward<_ArgTypes>(__arg)...);
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Rp, class ..._ArgTypes>
-const std::type_info&
-function<_Rp(_ArgTypes...)>::target_type() const _NOEXCEPT
-{
-    if (__f_ == 0)
-        return typeid(void);
-    return __f_->target_type();
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <typename _Tp>
-_Tp*
-function<_Rp(_ArgTypes...)>::target() _NOEXCEPT
-{
-    if (__f_ == 0)
-        return (_Tp*)0;
-    return (_Tp*)__f_->target(typeid(_Tp));
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <typename _Tp>
-const _Tp*
-function<_Rp(_ArgTypes...)>::target() const _NOEXCEPT
-{
-    if (__f_ == 0)
-        return (const _Tp*)0;
-    return (const _Tp*)__f_->target(typeid(_Tp));
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const function<_Rp(_ArgTypes...)>& __f, nullptr_t) _NOEXCEPT {return !__f;}
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(nullptr_t, const function<_Rp(_ArgTypes...)>& __f) _NOEXCEPT {return !__f;}
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const function<_Rp(_ArgTypes...)>& __f, nullptr_t) _NOEXCEPT {return (bool)__f;}
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(nullptr_t, const function<_Rp(_ArgTypes...)>& __f) _NOEXCEPT {return (bool)__f;}
-
-template <class _Rp, class... _ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(function<_Rp(_ArgTypes...)>& __x, function<_Rp(_ArgTypes...)>& __y) _NOEXCEPT
-{return __x.swap(__y);}
-
-template<class _Tp> struct __is_bind_expression : public false_type {};
-template<class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_bind_expression
-    : public __is_bind_expression<typename remove_cv<_Tp>::type> {};
-
-template<class _Tp> struct __is_placeholder : public integral_constant<int, 0> {};
-template<class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_placeholder
-    : public __is_placeholder<typename remove_cv<_Tp>::type> {};
-
-namespace placeholders
-{
-
-template <int _Np> struct __ph {};
-
-_LIBCPP_FUNC_VIS extern __ph<1>   _1;
-_LIBCPP_FUNC_VIS extern __ph<2>   _2;
-_LIBCPP_FUNC_VIS extern __ph<3>   _3;
-_LIBCPP_FUNC_VIS extern __ph<4>   _4;
-_LIBCPP_FUNC_VIS extern __ph<5>   _5;
-_LIBCPP_FUNC_VIS extern __ph<6>   _6;
-_LIBCPP_FUNC_VIS extern __ph<7>   _7;
-_LIBCPP_FUNC_VIS extern __ph<8>   _8;
-_LIBCPP_FUNC_VIS extern __ph<9>   _9;
-_LIBCPP_FUNC_VIS extern __ph<10> _10;
-
-}  // placeholders
-
-template<int _Np>
-struct __is_placeholder<placeholders::__ph<_Np> >
-    : public integral_constant<int, _Np> {};
-
-template <class _Tp, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp&
-__mu(reference_wrapper<_Tp> __t, _Uj&)
-{
-    return __t.get();
-}
-
-template <class _Ti, class ..._Uj, size_t ..._Indx>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __invoke_of<_Ti&, _Uj...>::type
-__mu_expand(_Ti& __ti, tuple<_Uj...>& __uj, __tuple_indices<_Indx...>)
-{
-    return __ti(_VSTD::forward<_Uj>(_VSTD::get<_Indx>(__uj))...);
-}
-
-template <class _Ti, class ..._Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __lazy_enable_if
-<
-    is_bind_expression<_Ti>::value,
-    __invoke_of<_Ti&, _Uj...>
->::type
-__mu(_Ti& __ti, tuple<_Uj...>& __uj)
-{
-    typedef typename __make_tuple_indices<sizeof...(_Uj)>::type __indices;
-    return  __mu_expand(__ti, __uj, __indices());
-}
-
-template <bool IsPh, class _Ti, class _Uj>
-struct __mu_return2 {};
-
-template <class _Ti, class _Uj>
-struct __mu_return2<true, _Ti, _Uj>
-{
-    typedef typename tuple_element<is_placeholder<_Ti>::value - 1, _Uj>::type type;
-};
-
-template <class _Ti, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    0 < is_placeholder<_Ti>::value,
-    typename __mu_return2<0 < is_placeholder<_Ti>::value, _Ti, _Uj>::type
->::type
-__mu(_Ti&, _Uj& __uj)
-{
-    const size_t _Indx = is_placeholder<_Ti>::value - 1;
-    return _VSTD::forward<typename tuple_element<_Indx, _Uj>::type>(_VSTD::get<_Indx>(__uj));
-}
-
-template <class _Ti, class _Uj>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_bind_expression<_Ti>::value &&
-    is_placeholder<_Ti>::value == 0 &&
-    !__is_reference_wrapper<_Ti>::value,
-    _Ti&
->::type
-__mu(_Ti& __ti, _Uj&)
-{
-    return __ti;
-}
-
-template <class _Ti, bool IsReferenceWrapper, bool IsBindEx, bool IsPh,
-          class _TupleUj>
-struct ____mu_return;
-
-template <bool _Invokable, class _Ti, class ..._Uj>
-struct ____mu_return_invokable  // false
-{
-    typedef __nat type;
-};
-
-template <class _Ti, class ..._Uj>
-struct ____mu_return_invokable<true, _Ti, _Uj...>
-{
-    typedef typename __invoke_of<_Ti&, _Uj...>::type type;
-};
-
-template <class _Ti, class ..._Uj>
-struct ____mu_return<_Ti, false, true, false, tuple<_Uj...> >
-    : public ____mu_return_invokable<__invokable<_Ti&, _Uj...>::value, _Ti, _Uj...>
-{
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, false, false, true, _TupleUj>
-{
-    typedef typename tuple_element<is_placeholder<_Ti>::value - 1,
-                                   _TupleUj>::type&& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, true, false, false, _TupleUj>
-{
-    typedef typename _Ti::type& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct ____mu_return<_Ti, false, false, false, _TupleUj>
-{
-    typedef _Ti& type;
-};
-
-template <class _Ti, class _TupleUj>
-struct __mu_return
-    : public ____mu_return<_Ti,
-                           __is_reference_wrapper<_Ti>::value,
-                           is_bind_expression<_Ti>::value,
-                           0 < is_placeholder<_Ti>::value &&
-                           is_placeholder<_Ti>::value <= tuple_size<_TupleUj>::value,
-                           _TupleUj>
-{
-};
-
-template <class _Fp, class _BoundArgs, class _TupleUj>
-struct _is_valid_bind_return
-{
-    static const bool value = false;
-};
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct _is_valid_bind_return<_Fp, tuple<_BoundArgs...>, _TupleUj>
-{
-    static const bool value = __invokable<_Fp,
-                    typename __mu_return<_BoundArgs, _TupleUj>::type...>::value;
-};
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct _is_valid_bind_return<_Fp, const tuple<_BoundArgs...>, _TupleUj>
-{
-    static const bool value = __invokable<_Fp,
-                    typename __mu_return<const _BoundArgs, _TupleUj>::type...>::value;
-};
-
-template <class _Fp, class _BoundArgs, class _TupleUj,
-          bool = _is_valid_bind_return<_Fp, _BoundArgs, _TupleUj>::value>
-struct __bind_return;
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, tuple<_BoundArgs...>, _TupleUj, true>
-{
-    typedef typename __invoke_of
-    <
-        _Fp&,
-        typename __mu_return
-        <
-            _BoundArgs,
-            _TupleUj
-        >::type...
-    >::type type;
-};
-
-template <class _Fp, class ..._BoundArgs, class _TupleUj>
-struct __bind_return<_Fp, const tuple<_BoundArgs...>, _TupleUj, true>
-{
-    typedef typename __invoke_of
-    <
-        _Fp&,
-        typename __mu_return
-        <
-            const _BoundArgs,
-            _TupleUj
-        >::type...
-    >::type type;
-};
-
-template <class _Fp, class _BoundArgs, size_t ..._Indx, class _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __bind_return<_Fp, _BoundArgs, _Args>::type
-__apply_functor(_Fp& __f, _BoundArgs& __bound_args, __tuple_indices<_Indx...>,
-                _Args&& __args)
-{
-    return __invoke(__f, __mu(_VSTD::get<_Indx>(__bound_args), __args)...);
-}
-
-template<class _Fp, class ..._BoundArgs>
-class __bind
-    : public __weak_result_type<typename decay<_Fp>::type>
-{
-protected:
-    typedef typename decay<_Fp>::type _Fd;
-    typedef tuple<typename decay<_BoundArgs>::type...> _Td;
-private:
-    _Fd __f_;
-    _Td __bound_args_;
-
-    typedef typename __make_tuple_indices<sizeof...(_BoundArgs)>::type __indices;
-public:
-#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind(const __bind& __b)
-        : __f_(__b.__f_),
-          __bound_args_(__b.__bound_args_) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind& operator=(const __bind& __b)
-    {
-        __f_ = __b.__f_;
-        __bound_args_ = __b.__bound_args_;
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind(__bind&& __b)
-        : __f_(_VSTD::move(__b.__f_)),
-          __bound_args_(_VSTD::move(__b.__bound_args_)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind& operator=(__bind&& __b)
-    {
-        __f_ = _VSTD::move(__b.__f_);
-        __bound_args_ = _VSTD::move(__b.__bound_args_);
-        return *this;
-    }
-
-#endif  // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    template <class _Gp, class ..._BA,
-              class = typename enable_if
-                               <
-                                  is_constructible<_Fd, _Gp>::value &&
-                                  !is_same<typename remove_reference<_Gp>::type,
-                                           __bind>::value
-                               >::type>
-      _LIBCPP_INLINE_VISIBILITY
-      explicit __bind(_Gp&& __f, _BA&& ...__bound_args)
-        : __f_(_VSTD::forward<_Gp>(__f)),
-          __bound_args_(_VSTD::forward<_BA>(__bound_args)...) {}
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type
-        operator()(_Args&& ...__args)
-        {
-            return __apply_functor(__f_, __bound_args_, __indices(),
-                                  tuple<_Args&&...>(_VSTD::forward<_Args>(__args)...));
-        }
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type
-        operator()(_Args&& ...__args) const
-        {
-            return __apply_functor(__f_, __bound_args_, __indices(),
-                                   tuple<_Args&&...>(_VSTD::forward<_Args>(__args)...));
-        }
-};
-
-template<class _Fp, class ..._BoundArgs>
-struct __is_bind_expression<__bind<_Fp, _BoundArgs...> > : public true_type {};
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-class __bind_r
-    : public __bind<_Fp, _BoundArgs...>
-{
-    typedef __bind<_Fp, _BoundArgs...> base;
-    typedef typename base::_Fd _Fd;
-    typedef typename base::_Td _Td;
-public:
-    typedef _Rp result_type;
-
-#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind_r(const __bind_r& __b)
-        : base(_VSTD::forward<const base&>(__b)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind_r& operator=(const __bind_r& __b)
-    {
-        base::operator=(_VSTD::forward<const base&>(__b));
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind_r(__bind_r&& __b)
-        : base(_VSTD::forward<base>(__b)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bind_r& operator=(__bind_r&& __b)
-    {
-        base::operator=(_VSTD::forward<base>(__b));
-        return *this;
-    }
-
-#endif  // _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-
-    template <class _Gp, class ..._BA,
-              class = typename enable_if
-                               <
-                                  is_constructible<_Fd, _Gp>::value &&
-                                  !is_same<typename remove_reference<_Gp>::type,
-                                           __bind_r>::value
-                               >::type>
-      _LIBCPP_INLINE_VISIBILITY
-      explicit __bind_r(_Gp&& __f, _BA&& ...__bound_args)
-        : base(_VSTD::forward<_Gp>(__f),
-               _VSTD::forward<_BA>(__bound_args)...) {}
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            is_convertible<typename __bind_return<_Fd, _Td, tuple<_Args&&...> >::type,
-                           result_type>::value,
-            result_type
-        >::type
-        operator()(_Args&& ...__args)
-        {
-            return base::operator()(_VSTD::forward<_Args>(__args)...);
-        }
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            is_convertible<typename __bind_return<const _Fd, const _Td, tuple<_Args&&...> >::type,
-                           result_type>::value,
-            result_type
-        >::type
-        operator()(_Args&& ...__args) const
-        {
-            return base::operator()(_VSTD::forward<_Args>(__args)...);
-        }
-};
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-struct __is_bind_expression<__bind_r<_Rp, _Fp, _BoundArgs...> > : public true_type {};
-
-template<class _Fp, class ..._BoundArgs>
-inline _LIBCPP_INLINE_VISIBILITY
-__bind<_Fp, _BoundArgs...>
-bind(_Fp&& __f, _BoundArgs&&... __bound_args)
-{
-    typedef __bind<_Fp, _BoundArgs...> type;
-    return type(_VSTD::forward<_Fp>(__f), _VSTD::forward<_BoundArgs>(__bound_args)...);
-}
-
-template<class _Rp, class _Fp, class ..._BoundArgs>
-inline _LIBCPP_INLINE_VISIBILITY
-__bind_r<_Rp, _Fp, _BoundArgs...>
-bind(_Fp&& __f, _BoundArgs&&... __bound_args)
-{
-    typedef __bind_r<_Rp, _Fp, _BoundArgs...> type;
-    return type(_VSTD::forward<_Fp>(__f), _VSTD::forward<_BoundArgs>(__bound_args)...);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<bool>
-    : public unary_function<bool, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(bool __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<char>
-    : public unary_function<char, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(char __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<signed char>
-    : public unary_function<signed char, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(signed char __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned char>
-    : public unary_function<unsigned char, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned char __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<char16_t>
-    : public unary_function<char16_t, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(char16_t __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<char32_t>
-    : public unary_function<char32_t, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(char32_t __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<wchar_t>
-    : public unary_function<wchar_t, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(wchar_t __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<short>
-    : public unary_function<short, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(short __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned short>
-    : public unary_function<unsigned short, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned short __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<int>
-    : public unary_function<int, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(int __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned int>
-    : public unary_function<unsigned int, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned int __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<long>
-    : public unary_function<long, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(long __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned long>
-    : public unary_function<unsigned long, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(unsigned long __v) const _NOEXCEPT {return static_cast<size_t>(__v);}
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<long long>
-    : public __scalar_hash<long long>
-{
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unsigned long long>
-    : public __scalar_hash<unsigned long long>
-{
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<float>
-    : public __scalar_hash<float>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(float __v) const _NOEXCEPT
-    {
-        // -0.0 and 0.0 should return same hash
-       if (__v == 0)
-           return 0;
-        return __scalar_hash<float>::operator()(__v);
-    }
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<double>
-    : public __scalar_hash<double>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(double __v) const _NOEXCEPT
-    {
-        // -0.0 and 0.0 should return same hash
-       if (__v == 0)
-           return 0;
-        return __scalar_hash<double>::operator()(__v);
-    }
-};
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<long double>
-    : public __scalar_hash<long double>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(long double __v) const _NOEXCEPT
-    {
-        // -0.0 and 0.0 should return same hash
-        if (__v == 0)
-            return 0;
-#if defined(__i386__)
-        // Zero out padding bits
-        union
-        {
-            long double __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-                size_t __c;
-                size_t __d;
-            };
-        } __u;
-        __u.__a = 0;
-        __u.__b = 0;
-        __u.__c = 0;
-        __u.__d = 0;
-        __u.__t = __v;
-        return __u.__a ^ __u.__b ^ __u.__c ^ __u.__d;
-#elif defined(__x86_64__)
-        // Zero out padding bits
-        union
-        {
-            long double __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-            };
-        } __u;
-        __u.__a = 0;
-        __u.__b = 0;
-        __u.__t = __v;
-        return __u.__a ^ __u.__b;
-#else
-        return __scalar_hash<long double>::operator()(__v);
-#endif
-    }
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY hash
-    : public unary_function<_Tp, size_t>
-{
-    static_assert(is_enum<_Tp>::value, "This hash only works for enumeration types");
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        typedef typename underlying_type<_Tp>::type type;
-        return hash<type>{}(static_cast<type>(__v));
-    }
-};
-#endif
-
-// struct hash<T*> in <memory>
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_FUNCTIONAL
diff --git a/include.new/c++/v1/tr1/future b/include.new/c++/v1/tr1/future
deleted file mode 100644
index 6fe6f8d..0000000
--- a/include.new/c++/v1/tr1/future
+++ /dev/null
@@ -1,2629 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- future -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_FUTURE
-#define _LIBCPP_FUTURE
-
-/*
-    future synopsis
-
-namespace std
-{
-
-enum class future_errc
-{
-    future_already_retrieved = 1,
-    promise_already_satisfied,
-    no_state,
-    broken_promise
-};
-
-enum class launch
-{
-    async = 1,
-    deferred = 2,
-    any = async | deferred
-};
-
-enum class future_status
-{
-    ready,
-    timeout,
-    deferred
-};
-
-template <> struct is_error_code_enum<future_errc> : public true_type { };
-error_code make_error_code(future_errc e) noexcept;
-error_condition make_error_condition(future_errc e) noexcept;
-
-const error_category& future_category() noexcept;
-
-class future_error
-    : public logic_error
-{
-public:
-    future_error(error_code ec);  // exposition only
-
-    const error_code& code() const noexcept;
-    const char*       what() const noexcept;
-};
-
-template <class R>
-class promise
-{
-public:
-    promise();
-    template <class Allocator>
-        promise(allocator_arg_t, const Allocator& a);
-    promise(promise&& rhs) noexcept;
-    promise(const promise& rhs) = delete;
-    ~promise();
-
-    // assignment
-    promise& operator=(promise&& rhs) noexcept;
-    promise& operator=(const promise& rhs) = delete;
-    void swap(promise& other) noexcept;
-
-    // retrieving the result
-    future<R> get_future();
-
-    // setting the result
-    void set_value(const R& r);
-    void set_value(R&& r);
-    void set_exception(exception_ptr p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit(const R& r);
-    void set_value_at_thread_exit(R&& r);
-    void set_exception_at_thread_exit(exception_ptr p);
-};
-
-template <class R>
-class promise<R&>
-{
-public:
-    promise();
-    template <class Allocator>
-        promise(allocator_arg_t, const Allocator& a);
-    promise(promise&& rhs) noexcept;
-    promise(const promise& rhs) = delete;
-    ~promise();
-
-    // assignment
-    promise& operator=(promise&& rhs) noexcept;
-    promise& operator=(const promise& rhs) = delete;
-    void swap(promise& other) noexcept;
-
-    // retrieving the result
-    future<R&> get_future();
-
-    // setting the result
-    void set_value(R& r);
-    void set_exception(exception_ptr p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit(R&);
-    void set_exception_at_thread_exit(exception_ptr p);
-};
-
-template <>
-class promise<void>
-{
-public:
-    promise();
-    template <class Allocator>
-        promise(allocator_arg_t, const Allocator& a);
-    promise(promise&& rhs) noexcept;
-    promise(const promise& rhs) = delete;
-    ~promise();
-
-    // assignment
-    promise& operator=(promise&& rhs) noexcept;
-    promise& operator=(const promise& rhs) = delete;
-    void swap(promise& other) noexcept;
-
-    // retrieving the result
-    future<void> get_future();
-
-    // setting the result
-    void set_value();
-    void set_exception(exception_ptr p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit();
-    void set_exception_at_thread_exit(exception_ptr p);
-};
-
-template <class R> void swap(promise<R>& x, promise<R>& y) noexcept;
-
-template <class R, class Alloc>
-    struct uses_allocator<promise<R>, Alloc> : public true_type {};
-
-template <class R>
-class future
-{
-public:
-    future() noexcept;
-    future(future&&) noexcept;
-    future(const future& rhs) = delete;
-    ~future();
-    future& operator=(const future& rhs) = delete;
-    future& operator=(future&&) noexcept;
-    shared_future<R> share();
-
-    // retrieving the value
-    R get();
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <class R>
-class future<R&>
-{
-public:
-    future() noexcept;
-    future(future&&) noexcept;
-    future(const future& rhs) = delete;
-    ~future();
-    future& operator=(const future& rhs) = delete;
-    future& operator=(future&&) noexcept;
-    shared_future<R&> share();
-
-    // retrieving the value
-    R& get();
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <>
-class future<void>
-{
-public:
-    future() noexcept;
-    future(future&&) noexcept;
-    future(const future& rhs) = delete;
-    ~future();
-    future& operator=(const future& rhs) = delete;
-    future& operator=(future&&) noexcept;
-    shared_future<void> share();
-
-    // retrieving the value
-    void get();
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <class R>
-class shared_future
-{
-public:
-    shared_future() noexcept;
-    shared_future(const shared_future& rhs);
-    shared_future(future<R>&&) noexcept;
-    shared_future(shared_future&& rhs) noexcept;
-    ~shared_future();
-    shared_future& operator=(const shared_future& rhs);
-    shared_future& operator=(shared_future&& rhs) noexcept;
-
-    // retrieving the value
-    const R& get() const;
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <class R>
-class shared_future<R&>
-{
-public:
-    shared_future() noexcept;
-    shared_future(const shared_future& rhs);
-    shared_future(future<R&>&&) noexcept;
-    shared_future(shared_future&& rhs) noexcept;
-    ~shared_future();
-    shared_future& operator=(const shared_future& rhs);
-    shared_future& operator=(shared_future&& rhs) noexcept;
-
-    // retrieving the value
-    R& get() const;
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <>
-class shared_future<void>
-{
-public:
-    shared_future() noexcept;
-    shared_future(const shared_future& rhs);
-    shared_future(future<void>&&) noexcept;
-    shared_future(shared_future&& rhs) noexcept;
-    ~shared_future();
-    shared_future& operator=(const shared_future& rhs);
-    shared_future& operator=(shared_future&& rhs) noexcept;
-
-    // retrieving the value
-    void get() const;
-
-    // functions to check state
-    bool valid() const noexcept;
-
-    void wait() const;
-    template <class Rep, class Period>
-        future_status
-        wait_for(const chrono::duration<Rep, Period>& rel_time) const;
-    template <class Clock, class Duration>
-        future_status
-        wait_until(const chrono::time_point<Clock, Duration>& abs_time) const;
-};
-
-template <class F, class... Args>
-  future<typename result_of<typename decay<F>::type(typename decay<Args>::type...)>::type>
-  async(F&& f, Args&&... args);
-
-template <class F, class... Args>
-  future<typename result_of<typename decay<F>::type(typename decay<Args>::type...)>::type>
-  async(launch policy, F&& f, Args&&... args);
-
-template <class> class packaged_task; // undefined
-
-template <class R, class... ArgTypes>
-class packaged_task<R(ArgTypes...)>
-{
-public:
-    typedef R result_type;
-
-    // construction and destruction
-    packaged_task() noexcept;
-    template <class F>
-        explicit packaged_task(F&& f);
-    template <class F, class Allocator>
-        explicit packaged_task(allocator_arg_t, const Allocator& a, F&& f);
-    ~packaged_task();
-
-    // no copy
-    packaged_task(const packaged_task&) = delete;
-    packaged_task& operator=(const packaged_task&) = delete;
-
-    // move support
-    packaged_task(packaged_task&& other) noexcept;
-    packaged_task& operator=(packaged_task&& other) noexcept;
-    void swap(packaged_task& other) noexcept;
-
-    bool valid() const noexcept;
-
-    // result retrieval
-    future<R> get_future();
-
-    // execution
-    void operator()(ArgTypes... );
-    void make_ready_at_thread_exit(ArgTypes...);
-
-    void reset();
-};
-
-template <class R>
-  void swap(packaged_task<R(ArgTypes...)&, packaged_task<R(ArgTypes...)>&) noexcept;
-
-template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <system_error>
-#include <memory>
-#include <chrono>
-#include <exception>
-#include <mutex>
-#include <thread>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifdef _LIBCPP_HAS_NO_THREADS
-#error <future> is not supported on this single threaded system
-#else // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-//enum class future_errc
-_LIBCPP_DECLARE_STRONG_ENUM(future_errc)
-{
-    future_already_retrieved = 1,
-    promise_already_satisfied,
-    no_state,
-    broken_promise
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(future_errc)
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum<future_errc> : public true_type {};
-
-#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum<future_errc::__lx> : public true_type { };
-#endif
-
-//enum class launch
-_LIBCPP_DECLARE_STRONG_ENUM(launch)
-{
-    async = 1,
-    deferred = 2,
-    any = async | deferred
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(launch)
-
-#ifndef _LIBCPP_HAS_NO_STRONG_ENUMS
-
-#ifdef _LIBCXX_UNDERLYING_TYPE
-typedef underlying_type<launch>::type __launch_underlying_type;
-#else
-typedef int __launch_underlying_type;
-#endif
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-launch
-operator&(launch __x, launch __y)
-{
-    return static_cast<launch>(static_cast<__launch_underlying_type>(__x) &
-                               static_cast<__launch_underlying_type>(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-launch
-operator|(launch __x, launch __y)
-{
-    return static_cast<launch>(static_cast<__launch_underlying_type>(__x) |
-                               static_cast<__launch_underlying_type>(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-launch
-operator^(launch __x, launch __y)
-{
-    return static_cast<launch>(static_cast<__launch_underlying_type>(__x) ^
-                               static_cast<__launch_underlying_type>(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-launch
-operator~(launch __x)
-{
-    return static_cast<launch>(~static_cast<__launch_underlying_type>(__x) & 3);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-launch&
-operator&=(launch& __x, launch __y)
-{
-    __x = __x & __y; return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-launch&
-operator|=(launch& __x, launch __y)
-{
-    __x = __x | __y; return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-launch&
-operator^=(launch& __x, launch __y)
-{
-    __x = __x ^ __y; return __x;
-}
-
-#endif  // !_LIBCPP_HAS_NO_STRONG_ENUMS
-
-//enum class future_status
-_LIBCPP_DECLARE_STRONG_ENUM(future_status)
-{
-    ready,
-    timeout,
-    deferred
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(future_status)
-
-_LIBCPP_FUNC_VIS
-const error_category& future_category() _NOEXCEPT;
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_code
-make_error_code(future_errc __e) _NOEXCEPT
-{
-    return error_code(static_cast<int>(__e), future_category());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_condition
-make_error_condition(future_errc __e) _NOEXCEPT
-{
-    return error_condition(static_cast<int>(__e), future_category());
-}
-
-class _LIBCPP_EXCEPTION_ABI future_error
-    : public logic_error
-{
-    error_code __ec_;
-public:
-    future_error(error_code __ec);
-
-    _LIBCPP_INLINE_VISIBILITY
-    const error_code& code() const _NOEXCEPT {return __ec_;}
-
-    virtual ~future_error() _NOEXCEPT;
-};
-
-class _LIBCPP_TYPE_VIS __assoc_sub_state
-    : public __shared_count
-{
-protected:
-    exception_ptr __exception_;
-    mutable mutex __mut_;
-    mutable condition_variable __cv_;
-    unsigned __state_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-    void __sub_wait(unique_lock<mutex>& __lk);
-public:
-    enum
-    {
-        __constructed = 1,
-        __future_attached = 2,
-        ready = 4,
-        deferred = 8
-    };
-
-    _LIBCPP_INLINE_VISIBILITY
-    __assoc_sub_state() : __state_(0) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __has_value() const
-        {return (__state_ & __constructed) || (__exception_ != nullptr);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_future_attached()
-    {
-        lock_guard<mutex> __lk(__mut_);
-        __state_ |= __future_attached;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    bool __has_future_attached() const {return (__state_ & __future_attached) != 0;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_deferred() {__state_ |= deferred;}
-
-    void __make_ready();
-    _LIBCPP_INLINE_VISIBILITY
-    bool __is_ready() const {return (__state_ & ready) != 0;}
-
-    void set_value();
-    void set_value_at_thread_exit();
-
-    void set_exception(exception_ptr __p);
-    void set_exception_at_thread_exit(exception_ptr __p);
-
-    void copy();
-
-    void wait();
-    template <class _Rep, class _Period>
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const;
-    template <class _Clock, class _Duration>
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const;
-
-    virtual void __execute();
-};
-
-template <class _Clock, class _Duration>
-future_status
-__assoc_sub_state::wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-{
-    unique_lock<mutex> __lk(__mut_);
-    if (__state_ & deferred)
-        return future_status::deferred;
-    while (!(__state_ & ready) && _Clock::now() < __abs_time)
-        __cv_.wait_until(__lk, __abs_time);
-    if (__state_ & ready)
-        return future_status::ready;
-    return future_status::timeout;
-}
-
-template <class _Rep, class _Period>
-inline _LIBCPP_INLINE_VISIBILITY
-future_status
-__assoc_sub_state::wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-{
-    return wait_until(chrono::steady_clock::now() + __rel_time);
-}
-
-template <class _Rp>
-class __assoc_state
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-    typedef typename aligned_storage<sizeof(_Rp), alignment_of<_Rp>::value>::type _Up;
-protected:
-    _Up __value_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-
-    template <class _Arg>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        void set_value(_Arg&& __arg);
-#else
-        void set_value(_Arg& __arg);
-#endif
-
-    template <class _Arg>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        void set_value_at_thread_exit(_Arg&& __arg);
-#else
-        void set_value_at_thread_exit(_Arg& __arg);
-#endif
-
-    _Rp move();
-    typename add_lvalue_reference<_Rp>::type copy();
-};
-
-template <class _Rp>
-void
-__assoc_state<_Rp>::__on_zero_shared() _NOEXCEPT
-{
-    if (this->__state_ & base::__constructed)
-        reinterpret_cast<_Rp*>(&__value_)->~_Rp();
-    delete this;
-}
-
-template <class _Rp>
-template <class _Arg>
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__assoc_state<_Rp>::set_value(_Arg&& __arg)
-#else
-__assoc_state<_Rp>::set_value(_Arg& __arg)
-#endif
-{
-    unique_lock<mutex> __lk(this->__mut_);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (this->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-#endif
-    ::new(&__value_) _Rp(_VSTD::forward<_Arg>(__arg));
-    this->__state_ |= base::__constructed | base::ready;
-    __lk.unlock();
-    __cv_.notify_all();
-}
-
-template <class _Rp>
-template <class _Arg>
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__assoc_state<_Rp>::set_value_at_thread_exit(_Arg&& __arg)
-#else
-__assoc_state<_Rp>::set_value_at_thread_exit(_Arg& __arg)
-#endif
-{
-    unique_lock<mutex> __lk(this->__mut_);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (this->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-#endif
-    ::new(&__value_) _Rp(_VSTD::forward<_Arg>(__arg));
-    this->__state_ |= base::__constructed;
-    __thread_local_data()->__make_ready_at_thread_exit(this);
-    __lk.unlock();
-}
-
-template <class _Rp>
-_Rp
-__assoc_state<_Rp>::move()
-{
-    unique_lock<mutex> __lk(this->__mut_);
-    this->__sub_wait(__lk);
-    if (this->__exception_ != nullptr)
-        rethrow_exception(this->__exception_);
-    return _VSTD::move(*reinterpret_cast<_Rp*>(&__value_));
-}
-
-template <class _Rp>
-typename add_lvalue_reference<_Rp>::type
-__assoc_state<_Rp>::copy()
-{
-    unique_lock<mutex> __lk(this->__mut_);
-    this->__sub_wait(__lk);
-    if (this->__exception_ != nullptr)
-        rethrow_exception(this->__exception_);
-    return *reinterpret_cast<_Rp*>(&__value_);
-}
-
-template <class _Rp>
-class __assoc_state<_Rp&>
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-    typedef _Rp* _Up;
-protected:
-    _Up __value_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-
-    void set_value(_Rp& __arg);
-    void set_value_at_thread_exit(_Rp& __arg);
-
-    _Rp& copy();
-};
-
-template <class _Rp>
-void
-__assoc_state<_Rp&>::__on_zero_shared() _NOEXCEPT
-{
-    delete this;
-}
-
-template <class _Rp>
-void
-__assoc_state<_Rp&>::set_value(_Rp& __arg)
-{
-    unique_lock<mutex> __lk(this->__mut_);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (this->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-#endif
-    __value_ = _VSTD::addressof(__arg);
-    this->__state_ |= base::__constructed | base::ready;
-    __lk.unlock();
-    __cv_.notify_all();
-}
-
-template <class _Rp>
-void
-__assoc_state<_Rp&>::set_value_at_thread_exit(_Rp& __arg)
-{
-    unique_lock<mutex> __lk(this->__mut_);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (this->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-#endif
-    __value_ = _VSTD::addressof(__arg);
-    this->__state_ |= base::__constructed;
-    __thread_local_data()->__make_ready_at_thread_exit(this);
-    __lk.unlock();
-}
-
-template <class _Rp>
-_Rp&
-__assoc_state<_Rp&>::copy()
-{
-    unique_lock<mutex> __lk(this->__mut_);
-    this->__sub_wait(__lk);
-    if (this->__exception_ != nullptr)
-        rethrow_exception(this->__exception_);
-    return *__value_;
-}
-
-template <class _Rp, class _Alloc>
-class __assoc_state_alloc
-    : public __assoc_state<_Rp>
-{
-    typedef __assoc_state<_Rp> base;
-    _Alloc __alloc_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __assoc_state_alloc(const _Alloc& __a)
-        : __alloc_(__a) {}
-};
-
-template <class _Rp, class _Alloc>
-void
-__assoc_state_alloc<_Rp, _Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    if (this->__state_ & base::__constructed)
-        reinterpret_cast<_Rp*>(_VSTD::addressof(this->__value_))->~_Rp();
-    typedef typename __allocator_traits_rebind<_Alloc, __assoc_state_alloc>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _A __a(__alloc_);
-    this->~__assoc_state_alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template <class _Rp, class _Alloc>
-class __assoc_state_alloc<_Rp&, _Alloc>
-    : public __assoc_state<_Rp&>
-{
-    typedef __assoc_state<_Rp&> base;
-    _Alloc __alloc_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __assoc_state_alloc(const _Alloc& __a)
-        : __alloc_(__a) {}
-};
-
-template <class _Rp, class _Alloc>
-void
-__assoc_state_alloc<_Rp&, _Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __assoc_state_alloc>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _A __a(__alloc_);
-    this->~__assoc_state_alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template <class _Alloc>
-class __assoc_sub_state_alloc
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-    _Alloc __alloc_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __assoc_sub_state_alloc(const _Alloc& __a)
-        : __alloc_(__a) {}
-};
-
-template <class _Alloc>
-void
-__assoc_sub_state_alloc<_Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __assoc_sub_state_alloc>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _A __a(__alloc_);
-    this->~__assoc_sub_state_alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template <class _Rp, class _Fp>
-class __deferred_assoc_state
-    : public __assoc_state<_Rp>
-{
-    typedef __assoc_state<_Rp> base;
-
-    _Fp __func_;
-
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit __deferred_assoc_state(_Fp&& __f);
-#endif
-
-    virtual void __execute();
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp, class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-__deferred_assoc_state<_Rp, _Fp>::__deferred_assoc_state(_Fp&& __f)
-    : __func_(_VSTD::forward<_Fp>(__f))
-{
-    this->__set_deferred();
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp, class _Fp>
-void
-__deferred_assoc_state<_Rp, _Fp>::__execute()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->set_value(__func_());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Fp>
-class __deferred_assoc_state<void, _Fp>
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-
-    _Fp __func_;
-
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit __deferred_assoc_state(_Fp&& __f);
-#endif
-
-    virtual void __execute();
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-__deferred_assoc_state<void, _Fp>::__deferred_assoc_state(_Fp&& __f)
-    : __func_(_VSTD::forward<_Fp>(__f))
-{
-    this->__set_deferred();
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Fp>
-void
-__deferred_assoc_state<void, _Fp>::__execute()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __func_();
-        this->set_value();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Rp, class _Fp>
-class __async_assoc_state
-    : public __assoc_state<_Rp>
-{
-    typedef __assoc_state<_Rp> base;
-
-    _Fp __func_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit __async_assoc_state(_Fp&& __f);
-#endif
-
-    virtual void __execute();
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp, class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-__async_assoc_state<_Rp, _Fp>::__async_assoc_state(_Fp&& __f)
-    : __func_(_VSTD::forward<_Fp>(__f))
-{
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp, class _Fp>
-void
-__async_assoc_state<_Rp, _Fp>::__execute()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->set_value(__func_());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Rp, class _Fp>
-void
-__async_assoc_state<_Rp, _Fp>::__on_zero_shared() _NOEXCEPT
-{
-    this->wait();
-    base::__on_zero_shared();
-}
-
-template <class _Fp>
-class __async_assoc_state<void, _Fp>
-    : public __assoc_sub_state
-{
-    typedef __assoc_sub_state base;
-
-    _Fp __func_;
-
-    virtual void __on_zero_shared() _NOEXCEPT;
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit __async_assoc_state(_Fp&& __f);
-#endif
-
-    virtual void __execute();
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-__async_assoc_state<void, _Fp>::__async_assoc_state(_Fp&& __f)
-    : __func_(_VSTD::forward<_Fp>(__f))
-{
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Fp>
-void
-__async_assoc_state<void, _Fp>::__execute()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __func_();
-        this->set_value();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Fp>
-void
-__async_assoc_state<void, _Fp>::__on_zero_shared() _NOEXCEPT
-{
-    this->wait();
-    base::__on_zero_shared();
-}
-
-template <class _Rp> class _LIBCPP_TYPE_VIS_ONLY promise;
-template <class _Rp> class _LIBCPP_TYPE_VIS_ONLY shared_future;
-
-// future
-
-template <class _Rp> class _LIBCPP_TYPE_VIS_ONLY future;
-
-template <class _Rp, class _Fp>
-future<_Rp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__make_deferred_assoc_state(_Fp&& __f);
-#else
-__make_deferred_assoc_state(_Fp __f);
-#endif
-
-template <class _Rp, class _Fp>
-future<_Rp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__make_async_assoc_state(_Fp&& __f);
-#else
-__make_async_assoc_state(_Fp __f);
-#endif
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY future
-{
-    __assoc_state<_Rp>* __state_;
-
-    explicit future(__assoc_state<_Rp>* __state);
-
-    template <class> friend class promise;
-    template <class> friend class shared_future;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp&& __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp&& __f);
-#else
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp __f);
-#endif
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    future() _NOEXCEPT : __state_(nullptr) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    future(future&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    future(const future&) = delete;
-    future& operator=(const future&) = delete;
-    _LIBCPP_INLINE_VISIBILITY
-    future& operator=(future&& __rhs) _NOEXCEPT
-        {
-            future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    future(const future&);
-    future& operator=(const future&);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~future();
-    shared_future<_Rp> share();
-
-    // retrieving the value
-    _Rp get();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-future<_Rp>::future(__assoc_state<_Rp>* __state)
-    : __state_(__state)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_->__has_future_attached())
-        throw future_error(make_error_code(future_errc::future_already_retrieved));
-#endif
-    __state_->__add_shared();
-    __state_->__set_future_attached();
-}
-
-struct __release_shared_count
-{
-    void operator()(__shared_count* p) {p->__release_shared();}
-};
-
-template <class _Rp>
-future<_Rp>::~future()
-{
-    if (__state_)
-        __state_->__release_shared();
-}
-
-template <class _Rp>
-_Rp
-future<_Rp>::get()
-{
-    unique_ptr<__shared_count, __release_shared_count> __(__state_);
-    __assoc_state<_Rp>* __s = __state_;
-    __state_ = nullptr;
-    return __s->move();
-}
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY future<_Rp&>
-{
-    __assoc_state<_Rp&>* __state_;
-
-    explicit future(__assoc_state<_Rp&>* __state);
-
-    template <class> friend class promise;
-    template <class> friend class shared_future;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp&& __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp&& __f);
-#else
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp __f);
-#endif
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    future() _NOEXCEPT : __state_(nullptr) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    future(future&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    future(const future&) = delete;
-    future& operator=(const future&) = delete;
-    _LIBCPP_INLINE_VISIBILITY
-    future& operator=(future&& __rhs) _NOEXCEPT
-        {
-            future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    future(const future&);
-    future& operator=(const future&);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~future();
-    shared_future<_Rp&> share();
-
-    // retrieving the value
-    _Rp& get();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-future<_Rp&>::future(__assoc_state<_Rp&>* __state)
-    : __state_(__state)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_->__has_future_attached())
-        throw future_error(make_error_code(future_errc::future_already_retrieved));
-#endif
-    __state_->__add_shared();
-    __state_->__set_future_attached();
-}
-
-template <class _Rp>
-future<_Rp&>::~future()
-{
-    if (__state_)
-        __state_->__release_shared();
-}
-
-template <class _Rp>
-_Rp&
-future<_Rp&>::get()
-{
-    unique_ptr<__shared_count, __release_shared_count> __(__state_);
-    __assoc_state<_Rp&>* __s = __state_;
-    __state_ = nullptr;
-    return __s->copy();
-}
-
-template <>
-class _LIBCPP_TYPE_VIS future<void>
-{
-    __assoc_sub_state* __state_;
-
-    explicit future(__assoc_sub_state* __state);
-
-    template <class> friend class promise;
-    template <class> friend class shared_future;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp&& __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp&& __f);
-#else
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_deferred_assoc_state(_Fp __f);
-    template <class _R1, class _Fp>
-        friend future<_R1> __make_async_assoc_state(_Fp __f);
-#endif
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    future() _NOEXCEPT : __state_(nullptr) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    future(future&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    future(const future&) = delete;
-    future& operator=(const future&) = delete;
-    _LIBCPP_INLINE_VISIBILITY
-    future& operator=(future&& __rhs) _NOEXCEPT
-        {
-            future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    future(const future&);
-    future& operator=(const future&);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~future();
-    shared_future<void> share();
-
-    // retrieving the value
-    void get();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(future<_Rp>& __x, future<_Rp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-// promise<R>
-
-template <class _Callable> class packaged_task;
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY promise
-{
-    __assoc_state<_Rp>* __state_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit promise(nullptr_t) _NOEXCEPT : __state_(nullptr) {}
-
-    template <class> friend class packaged_task;
-public:
-    promise();
-    template <class _Alloc>
-        promise(allocator_arg_t, const _Alloc& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise(promise&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    promise(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~promise();
-
-    // assignment
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise& operator=(promise&& __rhs) _NOEXCEPT
-        {
-            promise(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-    promise& operator=(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise& operator=(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(promise& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // retrieving the result
-    future<_Rp> get_future();
-
-    // setting the result
-    void set_value(const _Rp& __r);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void set_value(_Rp&& __r);
-#endif
-    void set_exception(exception_ptr __p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit(const _Rp& __r);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void set_value_at_thread_exit(_Rp&& __r);
-#endif
-    void set_exception_at_thread_exit(exception_ptr __p);
-};
-
-template <class _Rp>
-promise<_Rp>::promise()
-    : __state_(new __assoc_state<_Rp>)
-{
-}
-
-template <class _Rp>
-template <class _Alloc>
-promise<_Rp>::promise(allocator_arg_t, const _Alloc& __a0)
-{
-    typedef __assoc_state_alloc<_Rp, _Alloc> _State;
-    typedef typename __allocator_traits_rebind<_Alloc, _State>::type _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a(__a0);
-    unique_ptr<_State, _D2> __hold(__a.allocate(1), _D2(__a, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold.get()))) _State(__a0);
-    __state_ = _VSTD::addressof(*__hold.release());
-}
-
-template <class _Rp>
-promise<_Rp>::~promise()
-{
-    if (__state_)
-    {
-        if (!__state_->__has_value() && __state_->use_count() > 1)
-            __state_->set_exception(make_exception_ptr(
-                      future_error(make_error_code(future_errc::broken_promise))
-                                                      ));
-        __state_->__release_shared();
-    }
-}
-
-template <class _Rp>
-future<_Rp>
-promise<_Rp>::get_future()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    return future<_Rp>(__state_);
-}
-
-template <class _Rp>
-void
-promise<_Rp>::set_value(const _Rp& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value(__r);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp>
-void
-promise<_Rp>::set_value(_Rp&& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value(_VSTD::move(__r));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp>
-void
-promise<_Rp>::set_exception(exception_ptr __p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_exception(__p);
-}
-
-template <class _Rp>
-void
-promise<_Rp>::set_value_at_thread_exit(const _Rp& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value_at_thread_exit(__r);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp>
-void
-promise<_Rp>::set_value_at_thread_exit(_Rp&& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value_at_thread_exit(_VSTD::move(__r));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Rp>
-void
-promise<_Rp>::set_exception_at_thread_exit(exception_ptr __p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_exception_at_thread_exit(__p);
-}
-
-// promise<R&>
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY promise<_Rp&>
-{
-    __assoc_state<_Rp&>* __state_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit promise(nullptr_t) _NOEXCEPT : __state_(nullptr) {}
-
-    template <class> friend class packaged_task;
-
-public:
-    promise();
-    template <class _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise(promise&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    promise(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~promise();
-
-    // assignment
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise& operator=(promise&& __rhs) _NOEXCEPT
-        {
-            promise(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-    promise& operator=(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise& operator=(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(promise& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // retrieving the result
-    future<_Rp&> get_future();
-
-    // setting the result
-    void set_value(_Rp& __r);
-    void set_exception(exception_ptr __p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit(_Rp&);
-    void set_exception_at_thread_exit(exception_ptr __p);
-};
-
-template <class _Rp>
-promise<_Rp&>::promise()
-    : __state_(new __assoc_state<_Rp&>)
-{
-}
-
-template <class _Rp>
-template <class _Alloc>
-promise<_Rp&>::promise(allocator_arg_t, const _Alloc& __a0)
-{
-    typedef __assoc_state_alloc<_Rp&, _Alloc> _State;
-    typedef typename __allocator_traits_rebind<_Alloc, _State>::type _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a(__a0);
-    unique_ptr<_State, _D2> __hold(__a.allocate(1), _D2(__a, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold.get()))) _State(__a0);
-    __state_ = _VSTD::addressof(*__hold.release());
-}
-
-template <class _Rp>
-promise<_Rp&>::~promise()
-{
-    if (__state_)
-    {
-        if (!__state_->__has_value() && __state_->use_count() > 1)
-            __state_->set_exception(make_exception_ptr(
-                      future_error(make_error_code(future_errc::broken_promise))
-                                                      ));
-        __state_->__release_shared();
-    }
-}
-
-template <class _Rp>
-future<_Rp&>
-promise<_Rp&>::get_future()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    return future<_Rp&>(__state_);
-}
-
-template <class _Rp>
-void
-promise<_Rp&>::set_value(_Rp& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value(__r);
-}
-
-template <class _Rp>
-void
-promise<_Rp&>::set_exception(exception_ptr __p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_exception(__p);
-}
-
-template <class _Rp>
-void
-promise<_Rp&>::set_value_at_thread_exit(_Rp& __r)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_value_at_thread_exit(__r);
-}
-
-template <class _Rp>
-void
-promise<_Rp&>::set_exception_at_thread_exit(exception_ptr __p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-#endif
-    __state_->set_exception_at_thread_exit(__p);
-}
-
-// promise<void>
-
-template <>
-class _LIBCPP_TYPE_VIS promise<void>
-{
-    __assoc_sub_state* __state_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit promise(nullptr_t) _NOEXCEPT : __state_(nullptr) {}
-
-    template <class> friend class packaged_task;
-
-public:
-    promise();
-    template <class _Allocator>
-        promise(allocator_arg_t, const _Allocator& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise(promise&& __rhs) _NOEXCEPT
-        : __state_(__rhs.__state_) {__rhs.__state_ = nullptr;}
-    promise(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~promise();
-
-    // assignment
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    promise& operator=(promise&& __rhs) _NOEXCEPT
-        {
-            promise(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-    promise& operator=(const promise& __rhs) = delete;
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-private:
-    promise& operator=(const promise& __rhs);
-public:
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(promise& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // retrieving the result
-    future<void> get_future();
-
-    // setting the result
-    void set_value();
-    void set_exception(exception_ptr __p);
-
-    // setting the result with deferred notification
-    void set_value_at_thread_exit();
-    void set_exception_at_thread_exit(exception_ptr __p);
-};
-
-template <class _Alloc>
-promise<void>::promise(allocator_arg_t, const _Alloc& __a0)
-{
-    typedef __assoc_sub_state_alloc<_Alloc> _State;
-    typedef typename __allocator_traits_rebind<_Alloc, _State>::type _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a(__a0);
-    unique_ptr<_State, _D2> __hold(__a.allocate(1), _D2(__a, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold.get()))) _State(__a0);
-    __state_ = _VSTD::addressof(*__hold.release());
-}
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(promise<_Rp>& __x, promise<_Rp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template <class _Rp, class _Alloc>
-    struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<promise<_Rp>, _Alloc>
-        : public true_type {};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// packaged_task
-
-template<class _Fp> class __packaged_task_base;
-
-template<class _Rp, class ..._ArgTypes>
-class __packaged_task_base<_Rp(_ArgTypes...)>
-{
-    __packaged_task_base(const __packaged_task_base&);
-    __packaged_task_base& operator=(const __packaged_task_base&);
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __packaged_task_base() {}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual ~__packaged_task_base() {}
-    virtual void __move_to(__packaged_task_base*) _NOEXCEPT = 0;
-    virtual void destroy() = 0;
-    virtual void destroy_deallocate() = 0;
-    virtual _Rp operator()(_ArgTypes&& ...) = 0;
-};
-
-template<class _FD, class _Alloc, class _FB> class __packaged_task_func;
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-class __packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>
-    : public  __packaged_task_base<_Rp(_ArgTypes...)>
-{
-    __compressed_pair<_Fp, _Alloc> __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __packaged_task_func(const _Fp& __f) : __f_(__f) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __packaged_task_func(_Fp&& __f) : __f_(_VSTD::move(__f)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __packaged_task_func(const _Fp& __f, const _Alloc& __a)
-        : __f_(__f, __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __packaged_task_func(_Fp&& __f, const _Alloc& __a)
-        : __f_(_VSTD::move(__f), __a) {}
-    virtual void __move_to(__packaged_task_base<_Rp(_ArgTypes...)>*) _NOEXCEPT;
-    virtual void destroy();
-    virtual void destroy_deallocate();
-    virtual _Rp operator()(_ArgTypes&& ... __args);
-};
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::__move_to(
-                              __packaged_task_base<_Rp(_ArgTypes...)>* __p) _NOEXCEPT
-{
-    ::new (__p) __packaged_task_func(_VSTD::move(__f_.first()), _VSTD::move(__f_.second()));
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy()
-{
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-void
-__packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::destroy_deallocate()
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __packaged_task_func>::type _Ap;
-    typedef allocator_traits<_Ap> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _Ap __a(__f_.second());
-    __f_.~__compressed_pair<_Fp, _Alloc>();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template<class _Fp, class _Alloc, class _Rp, class ..._ArgTypes>
-_Rp
-__packaged_task_func<_Fp, _Alloc, _Rp(_ArgTypes...)>::operator()(_ArgTypes&& ... __arg)
-{
-    return __invoke(__f_.first(), _VSTD::forward<_ArgTypes>(__arg)...);
-}
-
-template <class _Callable> class __packaged_task_function;
-
-template<class _Rp, class ..._ArgTypes>
-class __packaged_task_function<_Rp(_ArgTypes...)>
-{
-    typedef __packaged_task_base<_Rp(_ArgTypes...)> __base;
-    typename aligned_storage<3*sizeof(void*)>::type __buf_;
-    __base* __f_;
-
-public:
-    typedef _Rp result_type;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    __packaged_task_function() _NOEXCEPT : __f_(nullptr) {}
-    template<class _Fp>
-      __packaged_task_function(_Fp&& __f);
-    template<class _Fp, class _Alloc>
-      __packaged_task_function(allocator_arg_t, const _Alloc& __a, _Fp&& __f);
-
-    __packaged_task_function(__packaged_task_function&&) _NOEXCEPT;
-    __packaged_task_function& operator=(__packaged_task_function&&) _NOEXCEPT;
-
-    __packaged_task_function(const __packaged_task_function&) =  delete;
-    __packaged_task_function& operator=(const __packaged_task_function&) =  delete;
-
-    ~__packaged_task_function();
-
-    void swap(__packaged_task_function&) _NOEXCEPT;
-
-    _Rp operator()(_ArgTypes...) const;
-};
-
-template<class _Rp, class ..._ArgTypes>
-__packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function(__packaged_task_function&& __f) _NOEXCEPT
-{
-    if (__f.__f_ == nullptr)
-        __f_ = nullptr;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__move_to(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = nullptr;
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp>
-__packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function(_Fp&& __f)
-    : __f_(nullptr)
-{
-    typedef typename remove_reference<typename decay<_Fp>::type>::type _FR;
-    typedef __packaged_task_func<_FR, allocator<_FR>, _Rp(_ArgTypes...)> _FF;
-    if (sizeof(_FF) <= sizeof(__buf_))
-    {
-        __f_ = (__base*)&__buf_;
-        ::new (__f_) _FF(_VSTD::forward<_Fp>(__f));
-    }
-    else
-    {
-        typedef allocator<_FF> _Ap;
-        _Ap __a;
-        typedef __allocator_destructor<_Ap> _Dp;
-        unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-        ::new (__hold.get()) _FF(_VSTD::forward<_Fp>(__f), allocator<_FR>(__a));
-        __f_ = __hold.release();
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-template <class _Fp, class _Alloc>
-__packaged_task_function<_Rp(_ArgTypes...)>::__packaged_task_function(
-                                  allocator_arg_t, const _Alloc& __a0, _Fp&& __f)
-    : __f_(nullptr)
-{
-    typedef typename remove_reference<typename decay<_Fp>::type>::type _FR;
-    typedef __packaged_task_func<_FR, _Alloc, _Rp(_ArgTypes...)> _FF;
-    if (sizeof(_FF) <= sizeof(__buf_))
-    {
-        __f_ = (__base*)&__buf_;
-        ::new (__f_) _FF(_VSTD::forward<_Fp>(__f));
-    }
-    else
-    {
-        typedef typename __allocator_traits_rebind<_Alloc, _FF>::type _Ap;
-        _Ap __a(__a0);
-        typedef __allocator_destructor<_Ap> _Dp;
-        unique_ptr<__base, _Dp> __hold(__a.allocate(1), _Dp(__a, 1));
-        ::new (static_cast<void*>(_VSTD::addressof(*__hold.get())))
-            _FF(_VSTD::forward<_Fp>(__f), _Alloc(__a));
-        __f_ = _VSTD::addressof(*__hold.release());
-    }
-}
-
-template<class _Rp, class ..._ArgTypes>
-__packaged_task_function<_Rp(_ArgTypes...)>&
-__packaged_task_function<_Rp(_ArgTypes...)>::operator=(__packaged_task_function&& __f) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-    __f_ = nullptr;
-    if (__f.__f_ == nullptr)
-        __f_ = nullptr;
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f_ = (__base*)&__buf_;
-        __f.__f_->__move_to(__f_);
-    }
-    else
-    {
-        __f_ = __f.__f_;
-        __f.__f_ = nullptr;
-    }
-    return *this;
-}
-
-template<class _Rp, class ..._ArgTypes>
-__packaged_task_function<_Rp(_ArgTypes...)>::~__packaged_task_function()
-{
-    if (__f_ == (__base*)&__buf_)
-        __f_->destroy();
-    else if (__f_)
-        __f_->destroy_deallocate();
-}
-
-template<class _Rp, class ..._ArgTypes>
-void
-__packaged_task_function<_Rp(_ArgTypes...)>::swap(__packaged_task_function& __f) _NOEXCEPT
-{
-    if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
-    {
-        typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
-        __base* __t = (__base*)&__tempbuf;
-        __f_->__move_to(__t);
-        __f_->destroy();
-        __f_ = nullptr;
-        __f.__f_->__move_to((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = nullptr;
-        __f_ = (__base*)&__buf_;
-        __t->__move_to((__base*)&__f.__buf_);
-        __t->destroy();
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f_ == (__base*)&__buf_)
-    {
-        __f_->__move_to((__base*)&__f.__buf_);
-        __f_->destroy();
-        __f_ = __f.__f_;
-        __f.__f_ = (__base*)&__f.__buf_;
-    }
-    else if (__f.__f_ == (__base*)&__f.__buf_)
-    {
-        __f.__f_->__move_to((__base*)&__buf_);
-        __f.__f_->destroy();
-        __f.__f_ = __f_;
-        __f_ = (__base*)&__buf_;
-    }
-    else
-        _VSTD::swap(__f_, __f.__f_);
-}
-
-template<class _Rp, class ..._ArgTypes>
-inline _LIBCPP_INLINE_VISIBILITY
-_Rp
-__packaged_task_function<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __arg) const
-{
-    return (*__f_)(_VSTD::forward<_ArgTypes>(__arg)...);
-}
-
-template<class _Rp, class ..._ArgTypes>
-class _LIBCPP_TYPE_VIS_ONLY packaged_task<_Rp(_ArgTypes...)>
-{
-public:
-    typedef _Rp result_type;
-
-private:
-    __packaged_task_function<result_type(_ArgTypes...)> __f_;
-    promise<result_type>                                __p_;
-
-public:
-    // construction and destruction
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task() _NOEXCEPT : __p_(nullptr) {}
-    template <class _Fp,
-              class = typename enable_if
-              <
-                  !is_same<
-                      typename decay<_Fp>::type, 
-                      packaged_task
-                      >::value
-                  >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        explicit packaged_task(_Fp&& __f) : __f_(_VSTD::forward<_Fp>(__f)) {}
-    template <class _Fp, class _Allocator,
-              class = typename enable_if
-              <
-                  !is_same<
-                      typename decay<_Fp>::type, 
-                      packaged_task
-                      >::value
-                  >::type
-              >
-        _LIBCPP_INLINE_VISIBILITY
-        explicit packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f)
-             : __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)),
-               __p_(allocator_arg, __a) {}
-    // ~packaged_task() = default;
-
-    // no copy
-    packaged_task(const packaged_task&) = delete;
-    packaged_task& operator=(const packaged_task&) = delete;
-
-    // move support
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task(packaged_task&& __other) _NOEXCEPT
-        : __f_(_VSTD::move(__other.__f_)), __p_(_VSTD::move(__other.__p_)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task& operator=(packaged_task&& __other) _NOEXCEPT
-    {
-        __f_ = _VSTD::move(__other.__f_);
-        __p_ = _VSTD::move(__other.__p_);
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(packaged_task& __other) _NOEXCEPT
-    {
-        __f_.swap(__other.__f_);
-        __p_.swap(__other.__p_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __p_.__state_ != nullptr;}
-
-    // result retrieval
-    _LIBCPP_INLINE_VISIBILITY
-    future<result_type> get_future() {return __p_.get_future();}
-
-    // execution
-    void operator()(_ArgTypes... __args);
-    void make_ready_at_thread_exit(_ArgTypes... __args);
-
-    void reset();
-};
-
-template<class _Rp, class ..._ArgTypes>
-void
-packaged_task<_Rp(_ArgTypes...)>::operator()(_ArgTypes... __args)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__p_.__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-    if (__p_.__state_->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __p_.set_value(__f_(_VSTD::forward<_ArgTypes>(__args)...));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __p_.set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Rp, class ..._ArgTypes>
-void
-packaged_task<_Rp(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... __args)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__p_.__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-    if (__p_.__state_->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __p_.set_value_at_thread_exit(__f_(_VSTD::forward<_ArgTypes>(__args)...));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __p_.set_exception_at_thread_exit(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Rp, class ..._ArgTypes>
-void
-packaged_task<_Rp(_ArgTypes...)>::reset()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!valid())
-        throw future_error(make_error_code(future_errc::no_state));
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    __p_ = promise<result_type>();
-}
-
-template<class ..._ArgTypes>
-class _LIBCPP_TYPE_VIS_ONLY packaged_task<void(_ArgTypes...)>
-{
-public:
-    typedef void result_type;
-
-private:
-    __packaged_task_function<result_type(_ArgTypes...)> __f_;
-    promise<result_type>                                __p_;
-
-public:
-    // construction and destruction
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task() _NOEXCEPT : __p_(nullptr) {}
-    template <class _Fp,
-              class = typename enable_if
-              <
-                  !is_same<
-                      typename decay<_Fp>::type, 
-                      packaged_task
-                      >::value
-                  >::type
-              >
-        _LIBCPP_INLINE_VISIBILITY
-        explicit packaged_task(_Fp&& __f) : __f_(_VSTD::forward<_Fp>(__f)) {}
-    template <class _Fp, class _Allocator,
-              class = typename enable_if
-              <
-                  !is_same<
-                      typename decay<_Fp>::type, 
-                      packaged_task
-                      >::value
-                  >::type
-              >    
-        _LIBCPP_INLINE_VISIBILITY
-        explicit packaged_task(allocator_arg_t, const _Allocator& __a, _Fp&& __f)
-             : __f_(allocator_arg, __a, _VSTD::forward<_Fp>(__f)),
-               __p_(allocator_arg, __a) {}
-    // ~packaged_task() = default;
-
-    // no copy
-    packaged_task(const packaged_task&) = delete;
-    packaged_task& operator=(const packaged_task&) = delete;
-
-    // move support
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task(packaged_task&& __other) _NOEXCEPT
-        : __f_(_VSTD::move(__other.__f_)), __p_(_VSTD::move(__other.__p_)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    packaged_task& operator=(packaged_task&& __other) _NOEXCEPT
-    {
-        __f_ = _VSTD::move(__other.__f_);
-        __p_ = _VSTD::move(__other.__p_);
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(packaged_task& __other) _NOEXCEPT
-    {
-        __f_.swap(__other.__f_);
-        __p_.swap(__other.__p_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __p_.__state_ != nullptr;}
-
-    // result retrieval
-    _LIBCPP_INLINE_VISIBILITY
-    future<result_type> get_future() {return __p_.get_future();}
-
-    // execution
-    void operator()(_ArgTypes... __args);
-    void make_ready_at_thread_exit(_ArgTypes... __args);
-
-    void reset();
-};
-
-template<class ..._ArgTypes>
-void
-packaged_task<void(_ArgTypes...)>::operator()(_ArgTypes... __args)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__p_.__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-    if (__p_.__state_->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __f_(_VSTD::forward<_ArgTypes>(__args)...);
-        __p_.set_value();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __p_.set_exception(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class ..._ArgTypes>
-void
-packaged_task<void(_ArgTypes...)>::make_ready_at_thread_exit(_ArgTypes... __args)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__p_.__state_ == nullptr)
-        throw future_error(make_error_code(future_errc::no_state));
-    if (__p_.__state_->__has_value())
-        throw future_error(make_error_code(future_errc::promise_already_satisfied));
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __f_(_VSTD::forward<_ArgTypes>(__args)...);
-        __p_.set_value_at_thread_exit();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __p_.set_exception_at_thread_exit(current_exception());
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class ..._ArgTypes>
-void
-packaged_task<void(_ArgTypes...)>::reset()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (!valid())
-        throw future_error(make_error_code(future_errc::no_state));
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    __p_ = promise<result_type>();
-}
-
-template <class _Callable>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(packaged_task<_Callable>& __x, packaged_task<_Callable>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template <class _Callable, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<packaged_task<_Callable>, _Alloc>
-    : public true_type {};
-
-template <class _Rp, class _Fp>
-future<_Rp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__make_deferred_assoc_state(_Fp&& __f)
-#else
-__make_deferred_assoc_state(_Fp __f)
-#endif
-{
-    unique_ptr<__deferred_assoc_state<_Rp, _Fp>, __release_shared_count>
-        __h(new __deferred_assoc_state<_Rp, _Fp>(_VSTD::forward<_Fp>(__f)));
-    return future<_Rp>(__h.get());
-}
-
-template <class _Rp, class _Fp>
-future<_Rp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__make_async_assoc_state(_Fp&& __f)
-#else
-__make_async_assoc_state(_Fp __f)
-#endif
-{
-    unique_ptr<__async_assoc_state<_Rp, _Fp>, __release_shared_count>
-        __h(new __async_assoc_state<_Rp, _Fp>(_VSTD::forward<_Fp>(__f)));
-    _VSTD::thread(&__async_assoc_state<_Rp, _Fp>::__execute, __h.get()).detach();
-    return future<_Rp>(__h.get());
-}
-
-template <class _Fp, class... _Args>
-class __async_func
-{
-    tuple<_Fp, _Args...> __f_;
-
-public:
-    typedef typename __invoke_of<_Fp, _Args...>::type _Rp;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __async_func(_Fp&& __f, _Args&&... __args)
-        : __f_(_VSTD::move(__f), _VSTD::move(__args)...) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __async_func(__async_func&& __f) : __f_(_VSTD::move(__f.__f_)) {}
-
-    _Rp operator()()
-    {
-        typedef typename __make_tuple_indices<1+sizeof...(_Args), 1>::type _Index;
-        return __execute(_Index());
-    }
-private:
-    template <size_t ..._Indices>
-    _Rp
-    __execute(__tuple_indices<_Indices...>)
-    {
-        return __invoke(_VSTD::move(_VSTD::get<0>(__f_)), _VSTD::move(_VSTD::get<_Indices>(__f_))...);
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY bool __does_policy_contain(launch __policy, launch __value )
-{ return (int(__policy) & int(__value)) != 0; }
-
-template <class _Fp, class... _Args>
-future<typename __invoke_of<typename decay<_Fp>::type, typename decay<_Args>::type...>::type>
-async(launch __policy, _Fp&& __f, _Args&&... __args)
-{
-    typedef __async_func<typename decay<_Fp>::type, typename decay<_Args>::type...> _BF;
-    typedef typename _BF::_Rp _Rp;
-
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif
-        if (__does_policy_contain(__policy, launch::async))
-        return _VSTD::__make_async_assoc_state<_Rp>(_BF(__decay_copy(_VSTD::forward<_Fp>(__f)),
-                                                     __decay_copy(_VSTD::forward<_Args>(__args))...));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch ( ... ) { if (__policy == launch::async) throw ; }
-#endif
-
-    if (__does_policy_contain(__policy, launch::deferred))
-        return _VSTD::__make_deferred_assoc_state<_Rp>(_BF(__decay_copy(_VSTD::forward<_Fp>(__f)),
-                                                        __decay_copy(_VSTD::forward<_Args>(__args))...));
-    return future<_Rp>{};
-}
-
-template <class _Fp, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-future<typename __invoke_of<typename decay<_Fp>::type, typename decay<_Args>::type...>::type>
-async(_Fp&& __f, _Args&&... __args)
-{
-    return _VSTD::async(launch::any, _VSTD::forward<_Fp>(__f),
-                                    _VSTD::forward<_Args>(__args)...);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-// shared_future
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY shared_future
-{
-    __assoc_state<_Rp>* __state_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future() _NOEXCEPT : __state_(nullptr) {}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(const shared_future& __rhs) : __state_(__rhs.__state_)
-        {if (__state_) __state_->__add_shared();}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(future<_Rp>&& __f) _NOEXCEPT : __state_(__f.__state_)
-        {__f.__state_ = nullptr;}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(shared_future&& __rhs) _NOEXCEPT : __state_(__rhs.__state_)
-        {__rhs.__state_ = nullptr;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~shared_future();
-    shared_future& operator=(const shared_future& __rhs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future& operator=(shared_future&& __rhs) _NOEXCEPT
-        {
-            shared_future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    // retrieving the value
-    _LIBCPP_INLINE_VISIBILITY
-    const _Rp& get() const {return __state_->copy();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(shared_future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-shared_future<_Rp>::~shared_future()
-{
-    if (__state_)
-        __state_->__release_shared();
-}
-
-template <class _Rp>
-shared_future<_Rp>&
-shared_future<_Rp>::operator=(const shared_future& __rhs)
-{
-    if (__rhs.__state_)
-        __rhs.__state_->__add_shared();
-    if (__state_)
-        __state_->__release_shared();
-    __state_ = __rhs.__state_;
-    return *this;
-}
-
-template <class _Rp>
-class _LIBCPP_TYPE_VIS_ONLY shared_future<_Rp&>
-{
-    __assoc_state<_Rp&>* __state_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future() _NOEXCEPT : __state_(nullptr) {}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(const shared_future& __rhs) : __state_(__rhs.__state_)
-        {if (__state_) __state_->__add_shared();}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(future<_Rp&>&& __f) _NOEXCEPT : __state_(__f.__state_)
-        {__f.__state_ = nullptr;}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(shared_future&& __rhs) _NOEXCEPT : __state_(__rhs.__state_)
-        {__rhs.__state_ = nullptr;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~shared_future();
-    shared_future& operator=(const shared_future& __rhs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future& operator=(shared_future&& __rhs) _NOEXCEPT
-        {
-            shared_future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    // retrieving the value
-    _LIBCPP_INLINE_VISIBILITY
-    _Rp& get() const {return __state_->copy();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(shared_future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-shared_future<_Rp&>::~shared_future()
-{
-    if (__state_)
-        __state_->__release_shared();
-}
-
-template <class _Rp>
-shared_future<_Rp&>&
-shared_future<_Rp&>::operator=(const shared_future& __rhs)
-{
-    if (__rhs.__state_)
-        __rhs.__state_->__add_shared();
-    if (__state_)
-        __state_->__release_shared();
-    __state_ = __rhs.__state_;
-    return *this;
-}
-
-template <>
-class _LIBCPP_TYPE_VIS shared_future<void>
-{
-    __assoc_sub_state* __state_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future() _NOEXCEPT : __state_(nullptr) {}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(const shared_future& __rhs) : __state_(__rhs.__state_)
-        {if (__state_) __state_->__add_shared();}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(future<void>&& __f) _NOEXCEPT : __state_(__f.__state_)
-        {__f.__state_ = nullptr;}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future(shared_future&& __rhs) _NOEXCEPT : __state_(__rhs.__state_)
-        {__rhs.__state_ = nullptr;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~shared_future();
-    shared_future& operator=(const shared_future& __rhs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    shared_future& operator=(shared_future&& __rhs) _NOEXCEPT
-        {
-            shared_future(std::move(__rhs)).swap(*this);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    // retrieving the value
-    _LIBCPP_INLINE_VISIBILITY
-    void get() const {__state_->copy();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(shared_future& __rhs) _NOEXCEPT {_VSTD::swap(__state_, __rhs.__state_);}
-
-    // functions to check state
-    _LIBCPP_INLINE_VISIBILITY
-    bool valid() const _NOEXCEPT {return __state_ != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void wait() const {__state_->wait();}
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_for(const chrono::duration<_Rep, _Period>& __rel_time) const
-            {return __state_->wait_for(__rel_time);}
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        future_status
-        wait_until(const chrono::time_point<_Clock, _Duration>& __abs_time) const
-            {return __state_->wait_until(__abs_time);}
-};
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(shared_future<_Rp>& __x, shared_future<_Rp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_future<_Rp>
-future<_Rp>::share()
-{
-    return shared_future<_Rp>(_VSTD::move(*this));
-}
-
-template <class _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_future<_Rp&>
-future<_Rp&>::share()
-{
-    return shared_future<_Rp&>(_VSTD::move(*this));
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-inline _LIBCPP_INLINE_VISIBILITY
-shared_future<void>
-future<void>::share()
-{
-    return shared_future<void>(_VSTD::move(*this));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_FUTURE
diff --git a/include.new/c++/v1/tr1/initializer_list b/include.new/c++/v1/tr1/initializer_list
deleted file mode 100644
index 663e49b..0000000
--- a/include.new/c++/v1/tr1/initializer_list
+++ /dev/null
@@ -1,118 +0,0 @@
-// -*- C++ -*-
-//===----------------------- initializer_list -----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_INITIALIZER_LIST
-#define _LIBCPP_INITIALIZER_LIST
-
-/*
-    initializer_list synopsis
-
-namespace std
-{
-
-template<class E>
-class initializer_list
-{
-public:
-    typedef E        value_type;
-    typedef const E& reference;
-    typedef const E& const_reference;
-    typedef size_t   size_type;
-
-    typedef const E* iterator;
-    typedef const E* const_iterator;
-
-    initializer_list() noexcept; // constexpr in C++14
-
-    size_t   size()  const noexcept; // constexpr in C++14
-    const E* begin() const noexcept; // constexpr in C++14
-    const E* end()   const noexcept; // constexpr in C++14
-};
-
-template<class E> const E* begin(initializer_list<E> il) noexcept; // constexpr in C++14
-template<class E> const E* end(initializer_list<E> il) noexcept; // constexpr in C++14
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cstddef>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-namespace std  // purposefully not versioned
-{
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _Ep>
-class _LIBCPP_TYPE_VIS_ONLY initializer_list
-{
-    const _Ep* __begin_;
-    size_t    __size_;
-
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    initializer_list(const _Ep* __b, size_t __s) _NOEXCEPT
-        : __begin_(__b),
-          __size_(__s)
-        {}
-public:
-    typedef _Ep        value_type;
-    typedef const _Ep& reference;
-    typedef const _Ep& const_reference;
-    typedef size_t    size_type;
-
-    typedef const _Ep* iterator;
-    typedef const _Ep* const_iterator;
-
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    initializer_list() _NOEXCEPT : __begin_(nullptr), __size_(0) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    size_t    size()  const _NOEXCEPT {return __size_;}
-    
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const _Ep* begin() const _NOEXCEPT {return __begin_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const _Ep* end()   const _NOEXCEPT {return __begin_ + __size_;}
-};
-
-template<class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Ep*
-begin(initializer_list<_Ep> __il) _NOEXCEPT
-{
-    return __il.begin();
-}
-
-template<class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR_AFTER_CXX11
-const _Ep*
-end(initializer_list<_Ep> __il) _NOEXCEPT
-{
-    return __il.end();
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-}  // std
-
-#endif  // _LIBCPP_INITIALIZER_LIST
diff --git a/include.new/c++/v1/tr1/iomanip b/include.new/c++/v1/tr1/iomanip
deleted file mode 100644
index a5042c7..0000000
--- a/include.new/c++/v1/tr1/iomanip
+++ /dev/null
@@ -1,654 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- iomanip ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_IOMANIP
-#define _LIBCPP_IOMANIP
-
-/*
-    iomanip synopsis
-
-namespace std {
-
-// types T1, T2, ... are unspecified implementation types
-T1 resetiosflags(ios_base::fmtflags mask);
-T2 setiosflags (ios_base::fmtflags mask);
-T3 setbase(int base);
-template<charT> T4 setfill(charT c);
-T5 setprecision(int n);
-T6 setw(int n);
-template <class moneyT> T7 get_money(moneyT& mon, bool intl = false);
-template <class charT, class moneyT> T8 put_money(const moneyT& mon, bool intl = false);
-template <class charT> T9 get_time(struct tm* tmb, const charT* fmt);
-template <class charT> T10 put_time(const struct tm* tmb, const charT* fmt);
-
-template <class charT>
-  T11 quoted(const charT* s, charT delim=charT('"'), charT escape=charT('\\')); // C++14
-
-template <class charT, class traits, class Allocator>
-  T12 quoted(const basic_string<charT, traits, Allocator>& s,
-             charT delim=charT('"'), charT escape=charT('\\')); // C++14
-
-template <class charT, class traits, class Allocator>
-  T13 quoted(basic_string<charT, traits, Allocator>& s,
-             charT delim=charT('"'), charT escape=charT('\\')); // C++14
-
-}  // std
-
-*/
-
-#include <__config>
-#include <istream>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// resetiosflags
-
-class __iom_t1
-{
-    ios_base::fmtflags __mask_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t1(ios_base::fmtflags __m) : __mask_(__m) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t1& __x)
-    {
-        __is.unsetf(__x.__mask_);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t1& __x)
-    {
-        __os.unsetf(__x.__mask_);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t1
-resetiosflags(ios_base::fmtflags __mask)
-{
-    return __iom_t1(__mask);
-}
-
-// setiosflags
-
-class __iom_t2
-{
-    ios_base::fmtflags __mask_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t2(ios_base::fmtflags __m) : __mask_(__m) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t2& __x)
-    {
-        __is.setf(__x.__mask_);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t2& __x)
-    {
-        __os.setf(__x.__mask_);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t2
-setiosflags(ios_base::fmtflags __mask)
-{
-    return __iom_t2(__mask);
-}
-
-// setbase
-
-class __iom_t3
-{
-    int __base_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t3(int __b) : __base_(__b) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t3& __x)
-    {
-        __is.setf(__x.__base_ == 8  ? ios_base::oct :
-                  __x.__base_ == 10 ? ios_base::dec :
-                  __x.__base_ == 16 ? ios_base::hex :
-                  ios_base::fmtflags(0), ios_base::basefield);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t3& __x)
-    {
-        __os.setf(__x.__base_ == 8  ? ios_base::oct :
-                  __x.__base_ == 10 ? ios_base::dec :
-                  __x.__base_ == 16 ? ios_base::hex :
-                  ios_base::fmtflags(0), ios_base::basefield);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t3
-setbase(int __base)
-{
-    return __iom_t3(__base);
-}
-
-// setfill
-
-template<class _CharT>
-class __iom_t4
-{
-    _CharT __fill_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t4(_CharT __c) : __fill_(__c) {}
-
-    template <class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t4& __x)
-    {
-        __os.fill(__x.__fill_);
-        return __os;
-    }
-};
-
-template<class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t4<_CharT>
-setfill(_CharT __c)
-{
-    return __iom_t4<_CharT>(__c);
-}
-
-// setprecision
-
-class __iom_t5
-{
-    int __n_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t5(int __n) : __n_(__n) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t5& __x)
-    {
-        __is.precision(__x.__n_);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t5& __x)
-    {
-        __os.precision(__x.__n_);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t5
-setprecision(int __n)
-{
-    return __iom_t5(__n);
-}
-
-// setw
-
-class __iom_t6
-{
-    int __n_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __iom_t6(int __n) : __n_(__n) {}
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t6& __x)
-    {
-        __is.width(__x.__n_);
-        return __is;
-    }
-
-    template <class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t6& __x)
-    {
-        __os.width(__x.__n_);
-        return __os;
-    }
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t6
-setw(int __n)
-{
-    return __iom_t6(__n);
-}
-
-// get_money
-
-template <class _MoneyT> class __iom_t7;
-
-template <class _CharT, class _Traits, class _MoneyT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x);
-
-template <class _MoneyT>
-class __iom_t7
-{
-    _MoneyT& __mon_;
-    bool __intl_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __iom_t7(_MoneyT& __mon, bool __intl)
-        : __mon_(__mon), __intl_(__intl) {}
-
-    template <class _CharT, class _Traits, class _Mp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_Mp>& __x);
-};
-
-template <class _CharT, class _Traits, class _MoneyT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t7<_MoneyT>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __s(__is);
-        if (__s)
-        {
-            typedef istreambuf_iterator<_CharT, _Traits> _Ip;
-            typedef money_get<_CharT, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            const _Fp& __mf = use_facet<_Fp>(__is.getloc());
-            __mf.get(_Ip(__is), _Ip(), __x.__intl_, __is, __err, __x.__mon_);
-            __is.setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template <class _MoneyT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t7<_MoneyT>
-get_money(_MoneyT& __mon, bool __intl = false)
-{
-    return __iom_t7<_MoneyT>(__mon, __intl);
-}
-
-// put_money
-
-template <class _MoneyT> class __iom_t8;
-
-template <class _CharT, class _Traits, class _MoneyT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x);
-
-template <class _MoneyT>
-class __iom_t8
-{
-    const _MoneyT& __mon_;
-    bool __intl_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __iom_t8(const _MoneyT& __mon, bool __intl)
-        : __mon_(__mon), __intl_(__intl) {}
-
-    template <class _CharT, class _Traits, class _Mp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_Mp>& __x);
-};
-
-template <class _CharT, class _Traits, class _MoneyT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t8<_MoneyT>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Op;
-            typedef money_put<_CharT, _Op> _Fp;
-            const _Fp& __mf = use_facet<_Fp>(__os.getloc());
-            if (__mf.put(_Op(__os), __x.__intl_, __os, __os.fill(), __x.__mon_).failed())
-                __os.setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-template <class _MoneyT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t8<_MoneyT>
-put_money(const _MoneyT& __mon, bool __intl = false)
-{
-    return __iom_t8<_MoneyT>(__mon, __intl);
-}
-
-// get_time
-
-template <class _CharT> class __iom_t9;
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x);
-
-template <class _CharT>
-class __iom_t9
-{
-    tm* __tm_;
-    const _CharT* __fmt_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __iom_t9(tm* __tm, const _CharT* __fmt)
-        : __tm_(__tm), __fmt_(__fmt) {}
-
-    template <class _Cp, class _Traits>
-    friend
-    basic_istream<_Cp, _Traits>&
-    operator>>(basic_istream<_Cp, _Traits>& __is, const __iom_t9<_Cp>& __x);
-};
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, const __iom_t9<_CharT>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __s(__is);
-        if (__s)
-        {
-            typedef istreambuf_iterator<_CharT, _Traits> _Ip;
-            typedef time_get<_CharT, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            const _Fp& __tf = use_facet<_Fp>(__is.getloc());
-            __tf.get(_Ip(__is), _Ip(), __is, __err, __x.__tm_,
-                     __x.__fmt_, __x.__fmt_ + _Traits::length(__x.__fmt_));
-            __is.setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t9<_CharT>
-get_time(tm* __tm, const _CharT* __fmt)
-{
-    return __iom_t9<_CharT>(__tm, __fmt);
-}
-
-// put_time
-
-template <class _CharT> class __iom_t10;
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x);
-
-template <class _CharT>
-class __iom_t10
-{
-    const tm* __tm_;
-    const _CharT* __fmt_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __iom_t10(const tm* __tm, const _CharT* __fmt)
-        : __tm_(__tm), __fmt_(__fmt) {}
-
-    template <class _Cp, class _Traits>
-    friend
-    basic_ostream<_Cp, _Traits>&
-    operator<<(basic_ostream<_Cp, _Traits>& __os, const __iom_t10<_Cp>& __x);
-};
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const __iom_t10<_CharT>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Op;
-            typedef time_put<_CharT, _Op> _Fp;
-            const _Fp& __tf = use_facet<_Fp>(__os.getloc());
-            if (__tf.put(_Op(__os), __os, __os.fill(), __x.__tm_,
-                         __x.__fmt_, __x.__fmt_ + _Traits::length(__x.__fmt_)).failed())
-                __os.setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-__iom_t10<_CharT>
-put_time(const tm* __tm, const _CharT* __fmt)
-{
-    return __iom_t10<_CharT>(__tm, __fmt);
-}
-
-#if _LIBCPP_STD_VER > 11
-
-template <class _CharT, class _Traits, class _ForwardIterator>
-std::basic_ostream<_CharT, _Traits> &
-__quoted_output ( basic_ostream<_CharT, _Traits> &__os, 
-        _ForwardIterator __first, _ForwardIterator __last, _CharT __delim, _CharT __escape )
-{
-    _VSTD::basic_string<_CharT, _Traits> __str;
-    __str.push_back(__delim);
-    for ( ; __first != __last; ++ __first )
-    {
-        if (_Traits::eq (*__first, __escape) || _Traits::eq (*__first, __delim))
-            __str.push_back(__escape);
-        __str.push_back(*__first);
-    }
-    __str.push_back(__delim);
-    return __put_character_sequence(__os, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _String>
-basic_istream<_CharT, _Traits> &
-__quoted_input ( basic_istream<_CharT, _Traits> &__is, _String & __string, _CharT __delim, _CharT __escape )
-{
-    __string.clear ();
-    _CharT __c;
-    __is >> __c;
-    if ( __is.fail ())
-        return __is;
-
-    if (!_Traits::eq (__c, __delim))    // no delimiter, read the whole string
-    {
-        __is.unget ();
-        __is >> __string;
-        return __is;
-    }
-
-    __save_flags<_CharT, _Traits> sf(__is);
-    noskipws (__is);
-    while (true)
-        {
-        __is >> __c;
-        if ( __is.fail ())
-            break;
-        if (_Traits::eq (__c, __escape))
-        {
-            __is >> __c;
-            if ( __is.fail ())
-                break;
-        }
-        else if (_Traits::eq (__c, __delim))
-            break;
-        __string.push_back ( __c );
-        }
-    return __is;
-}
-
-
-template <class _CharT, class _Iter, class _Traits=char_traits<_CharT>>
-struct __quoted_output_proxy
-{
-    _Iter  __first;
-    _Iter  __last;
-    _CharT  __delim;
-    _CharT  __escape;
-
-    __quoted_output_proxy(_Iter __f, _Iter __l, _CharT __d, _CharT __e)
-    : __first(__f), __last(__l), __delim(__d), __escape(__e) {}
-    //  This would be a nice place for a string_ref 
-};
-
-template <class _CharT, class _Traits, class _Iter>
-basic_ostream<_CharT, _Traits>& operator<<(
-         basic_ostream<_CharT, _Traits>& __os, 
-         const __quoted_output_proxy<_CharT, _Iter, _Traits> & __proxy)
-{
-    return __quoted_output (__os, __proxy.__first, __proxy.__last, __proxy.__delim, __proxy.__escape);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-struct __quoted_proxy
-{
-    basic_string<_CharT, _Traits, _Allocator> &__string;
-    _CharT  __delim;
-    _CharT  __escape;
-
-    __quoted_proxy(basic_string<_CharT, _Traits, _Allocator> &__s, _CharT __d, _CharT __e)
-    : __string(__s), __delim(__d), __escape(__e) {}
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-_LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>& operator<<(
-        basic_ostream<_CharT, _Traits>& __os, 
-        const __quoted_proxy<_CharT, _Traits, _Allocator> & __proxy)
-{
-    return __quoted_output (__os, __proxy.__string.cbegin (), __proxy.__string.cend (), __proxy.__delim, __proxy.__escape);
-}
-
-//  extractor for non-const basic_string& proxies
-template <class _CharT, class _Traits, class _Allocator>
-_LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>& operator>>(
-        basic_istream<_CharT, _Traits>& __is, 
-        const __quoted_proxy<_CharT, _Traits, _Allocator> & __proxy)
-{
-    return __quoted_input ( __is, __proxy.__string, __proxy.__delim, __proxy.__escape );
-}
-
-
-template <class _CharT>
-_LIBCPP_INLINE_VISIBILITY
-__quoted_output_proxy<_CharT, const _CharT *>
-quoted ( const _CharT *__s, _CharT __delim = _CharT('"'), _CharT __escape =_CharT('\\'))
-{
-    const _CharT *__end = __s;
-    while ( *__end ) ++__end;
-    return __quoted_output_proxy<_CharT, const _CharT *> ( __s, __end, __delim, __escape );
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-_LIBCPP_INLINE_VISIBILITY
-__quoted_output_proxy<_CharT, typename basic_string <_CharT, _Traits, _Allocator>::const_iterator>
-quoted ( const basic_string <_CharT, _Traits, _Allocator> &__s, _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
-{
-    return __quoted_output_proxy<_CharT, 
-            typename basic_string <_CharT, _Traits, _Allocator>::const_iterator> 
-                    ( __s.cbegin(), __s.cend (), __delim, __escape );
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-__quoted_proxy<_CharT, _Traits, _Allocator>
-quoted ( basic_string <_CharT, _Traits, _Allocator> &__s, _CharT __delim = _CharT('"'), _CharT __escape=_CharT('\\'))
-{
-    return __quoted_proxy<_CharT, _Traits, _Allocator>( __s, __delim, __escape );
-}
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_IOMANIP
diff --git a/include.new/c++/v1/tr1/ios b/include.new/c++/v1/tr1/ios
deleted file mode 100644
index ff79998..0000000
--- a/include.new/c++/v1/tr1/ios
+++ /dev/null
@@ -1,1023 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- ios -------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_IOS
-#define _LIBCPP_IOS
-
-/*
-    ios synopsis
-
-#include <iosfwd>
-
-namespace std
-{
-
-typedef OFF_T streamoff;
-typedef SZ_T streamsize;
-template <class stateT> class fpos;
-
-class ios_base
-{
-public:
-    class failure;
-
-    typedef T1 fmtflags;
-    static constexpr fmtflags boolalpha;
-    static constexpr fmtflags dec;
-    static constexpr fmtflags fixed;
-    static constexpr fmtflags hex;
-    static constexpr fmtflags internal;
-    static constexpr fmtflags left;
-    static constexpr fmtflags oct;
-    static constexpr fmtflags right;
-    static constexpr fmtflags scientific;
-    static constexpr fmtflags showbase;
-    static constexpr fmtflags showpoint;
-    static constexpr fmtflags showpos;
-    static constexpr fmtflags skipws;
-    static constexpr fmtflags unitbuf;
-    static constexpr fmtflags uppercase;
-    static constexpr fmtflags adjustfield;
-    static constexpr fmtflags basefield;
-    static constexpr fmtflags floatfield;
-
-    typedef T2 iostate;
-    static constexpr iostate badbit;
-    static constexpr iostate eofbit;
-    static constexpr iostate failbit;
-    static constexpr iostate goodbit;
-
-    typedef T3 openmode;
-    static constexpr openmode app;
-    static constexpr openmode ate;
-    static constexpr openmode binary;
-    static constexpr openmode in;
-    static constexpr openmode out;
-    static constexpr openmode trunc;
-
-    typedef T4 seekdir;
-    static constexpr seekdir beg;
-    static constexpr seekdir cur;
-    static constexpr seekdir end;
-
-    class Init;
-
-    // 27.5.2.2 fmtflags state:
-    fmtflags flags() const;
-    fmtflags flags(fmtflags fmtfl);
-    fmtflags setf(fmtflags fmtfl);
-    fmtflags setf(fmtflags fmtfl, fmtflags mask);
-    void unsetf(fmtflags mask);
-
-    streamsize precision() const;
-    streamsize precision(streamsize prec);
-    streamsize width() const;
-    streamsize width(streamsize wide);
-
-    // 27.5.2.3 locales:
-    locale imbue(const locale& loc);
-    locale getloc() const;
-
-    // 27.5.2.5 storage:
-    static int xalloc();
-    long& iword(int index);
-    void*& pword(int index);
-
-    // destructor
-    virtual ~ios_base();
-
-    // 27.5.2.6 callbacks;
-    enum event { erase_event, imbue_event, copyfmt_event };
-    typedef void (*event_callback)(event, ios_base&, int index);
-    void register_callback(event_callback fn, int index);
-
-    ios_base(const ios_base&) = delete;
-    ios_base& operator=(const ios_base&) = delete;
-
-    static bool sync_with_stdio(bool sync = true);
-
-protected:
-    ios_base();
-};
-
-template <class charT, class traits = char_traits<charT> >
-class basic_ios
-    : public ios_base
-{
-public:
-    // types:
-    typedef charT char_type;
-    typedef typename traits::int_type int_type;
-    typedef typename traits::pos_type pos_type;
-    typedef typename traits::off_type off_type;
-    typedef traits traits_type;
-
-    operator unspecified-bool-type() const;
-    bool operator!() const;
-    iostate rdstate() const;
-    void clear(iostate state = goodbit);
-    void setstate(iostate state);
-    bool good() const;
-    bool eof() const;
-    bool fail() const;
-    bool bad() const;
-
-    iostate exceptions() const;
-    void exceptions(iostate except);
-
-    // 27.5.4.1 Constructor/destructor:
-    explicit basic_ios(basic_streambuf<charT,traits>* sb);
-    virtual ~basic_ios();
-
-    // 27.5.4.2 Members:
-    basic_ostream<charT,traits>* tie() const;
-    basic_ostream<charT,traits>* tie(basic_ostream<charT,traits>* tiestr);
-
-    basic_streambuf<charT,traits>* rdbuf() const;
-    basic_streambuf<charT,traits>* rdbuf(basic_streambuf<charT,traits>* sb);
-
-    basic_ios& copyfmt(const basic_ios& rhs);
-
-    char_type fill() const;
-    char_type fill(char_type ch);
-
-    locale imbue(const locale& loc);
-
-    char narrow(char_type c, char dfault) const;
-    char_type widen(char c) const;
-
-    basic_ios(const basic_ios& ) = delete;
-    basic_ios& operator=(const basic_ios&) = delete;
-
-protected:
-    basic_ios();
-    void init(basic_streambuf<charT,traits>* sb);
-    void move(basic_ios& rhs);
-    void swap(basic_ios& rhs) noexcept;
-    void set_rdbuf(basic_streambuf<charT, traits>* sb);
-};
-
-// 27.5.5, manipulators:
-ios_base& boolalpha (ios_base& str);
-ios_base& noboolalpha(ios_base& str);
-ios_base& showbase (ios_base& str);
-ios_base& noshowbase (ios_base& str);
-ios_base& showpoint (ios_base& str);
-ios_base& noshowpoint(ios_base& str);
-ios_base& showpos (ios_base& str);
-ios_base& noshowpos (ios_base& str);
-ios_base& skipws (ios_base& str);
-ios_base& noskipws (ios_base& str);
-ios_base& uppercase (ios_base& str);
-ios_base& nouppercase(ios_base& str);
-ios_base& unitbuf (ios_base& str);
-ios_base& nounitbuf (ios_base& str);
-
-// 27.5.5.2 adjustfield:
-ios_base& internal (ios_base& str);
-ios_base& left (ios_base& str);
-ios_base& right (ios_base& str);
-
-// 27.5.5.3 basefield:
-ios_base& dec (ios_base& str);
-ios_base& hex (ios_base& str);
-ios_base& oct (ios_base& str);
-
-// 27.5.5.4 floatfield:
-ios_base& fixed (ios_base& str);
-ios_base& scientific (ios_base& str);
-ios_base& hexfloat (ios_base& str);
-ios_base& defaultfloat(ios_base& str);
-
-// 27.5.5.5 error reporting:
-enum class io_errc
-{
-    stream = 1
-};
-
-concept_map ErrorCodeEnum<io_errc> { };
-error_code make_error_code(io_errc e) noexcept; 
-error_condition make_error_condition(io_errc e) noexcept; 
-storage-class-specifier const error_category& iostream_category() noexcept;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iosfwd>
-#include <__locale>
-#include <system_error>
-
-#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-#include <atomic>     // for __xindex_
-#endif
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-typedef ptrdiff_t streamsize;
-
-class _LIBCPP_TYPE_VIS ios_base
-{
-public:
-    class _LIBCPP_TYPE_VIS failure;
-
-    typedef unsigned int fmtflags;
-    static const fmtflags boolalpha   = 0x0001;
-    static const fmtflags dec         = 0x0002;
-    static const fmtflags fixed       = 0x0004;
-    static const fmtflags hex         = 0x0008;
-    static const fmtflags internal    = 0x0010;
-    static const fmtflags left        = 0x0020;
-    static const fmtflags oct         = 0x0040;
-    static const fmtflags right       = 0x0080;
-    static const fmtflags scientific  = 0x0100;
-    static const fmtflags showbase    = 0x0200;
-    static const fmtflags showpoint   = 0x0400;
-    static const fmtflags showpos     = 0x0800;
-    static const fmtflags skipws      = 0x1000;
-    static const fmtflags unitbuf     = 0x2000;
-    static const fmtflags uppercase   = 0x4000;
-    static const fmtflags adjustfield = left | right | internal;
-    static const fmtflags basefield   = dec | oct | hex;
-    static const fmtflags floatfield  = scientific | fixed;
-
-    typedef unsigned int iostate;
-    typedef iostate      io_state;
-    static const iostate badbit  = 0x1;
-    static const iostate eofbit  = 0x2;
-    static const iostate failbit = 0x4;
-    static const iostate goodbit = 0x0;
-
-    typedef unsigned int openmode;
-    typedef openmode     open_mode;
-    static const openmode app    = 0x01;
-    static const openmode ate    = 0x02;
-    static const openmode binary = 0x04;
-    static const openmode in     = 0x08;
-    static const openmode out    = 0x10;
-    static const openmode trunc  = 0x20;
-
-    enum seekdir {beg, cur, end};
-    typedef seekdir seek_dir;
-
-    typedef _VSTD::streamoff streamoff;
-    typedef _VSTD::streampos streampos;
-
-    class _LIBCPP_TYPE_VIS Init;
-
-    // 27.5.2.2 fmtflags state:
-    _LIBCPP_INLINE_VISIBILITY fmtflags flags() const;
-    _LIBCPP_INLINE_VISIBILITY fmtflags flags(fmtflags __fmtfl);
-    _LIBCPP_INLINE_VISIBILITY fmtflags setf(fmtflags __fmtfl);
-    _LIBCPP_INLINE_VISIBILITY fmtflags setf(fmtflags __fmtfl, fmtflags __mask);
-    _LIBCPP_INLINE_VISIBILITY void unsetf(fmtflags __mask);
-
-    _LIBCPP_INLINE_VISIBILITY streamsize precision() const;
-    _LIBCPP_INLINE_VISIBILITY streamsize precision(streamsize __prec);
-    _LIBCPP_INLINE_VISIBILITY streamsize width() const;
-    _LIBCPP_INLINE_VISIBILITY streamsize width(streamsize __wide);
-
-    // 27.5.2.3 locales:
-    locale imbue(const locale& __loc);
-    locale getloc() const;
-
-    // 27.5.2.5 storage:
-    static int xalloc();
-    long& iword(int __index);
-    void*& pword(int __index);
-
-    // destructor
-    virtual ~ios_base();
-
-    // 27.5.2.6 callbacks;
-    enum event { erase_event, imbue_event, copyfmt_event };
-    typedef void (*event_callback)(event, ios_base&, int __index);
-    void register_callback(event_callback __fn, int __index);
-
-private:
-    ios_base(const ios_base&); // = delete;
-    ios_base& operator=(const ios_base&); // = delete;
-
-public:
-    static bool sync_with_stdio(bool __sync = true);
-
-    _LIBCPP_INLINE_VISIBILITY iostate rdstate() const;
-    void clear(iostate __state = goodbit);
-    _LIBCPP_INLINE_VISIBILITY void setstate(iostate __state);
-
-    _LIBCPP_INLINE_VISIBILITY bool good() const;
-    _LIBCPP_INLINE_VISIBILITY bool eof() const;
-    _LIBCPP_INLINE_VISIBILITY bool fail() const;
-    _LIBCPP_INLINE_VISIBILITY bool bad() const;
-
-    _LIBCPP_INLINE_VISIBILITY iostate exceptions() const;
-    _LIBCPP_INLINE_VISIBILITY void exceptions(iostate __iostate);
-
-    void __set_badbit_and_consider_rethrow();
-    void __set_failbit_and_consider_rethrow();
-
-protected:
-    _LIBCPP_INLINE_VISIBILITY
-    ios_base() {// purposefully does no initialization
-               }
-
-    void init(void* __sb);
-    _LIBCPP_ALWAYS_INLINE void* rdbuf() const {return __rdbuf_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    void rdbuf(void* __sb)
-    {
-        __rdbuf_ = __sb;
-        clear();
-    }
-
-    void __call_callbacks(event);
-    void copyfmt(const ios_base&);
-    void move(ios_base&);
-    void swap(ios_base&) _NOEXCEPT;
-
-    _LIBCPP_ALWAYS_INLINE
-    void set_rdbuf(void* __sb)
-    {
-        __rdbuf_ = __sb;
-    }
-
-private:
-    // All data members must be scalars
-    fmtflags        __fmtflags_;
-    streamsize      __precision_;
-    streamsize      __width_;
-    iostate         __rdstate_;
-    iostate         __exceptions_;
-    void*           __rdbuf_;
-    void*           __loc_;
-    event_callback* __fn_;
-    int*            __index_;
-    size_t          __event_size_;
-    size_t          __event_cap_;
-#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-    static atomic<int> __xindex_;
-#else
-    static int      __xindex_;
-#endif
-    long*           __iarray_;
-    size_t          __iarray_size_;
-    size_t          __iarray_cap_;
-    void**          __parray_;
-    size_t          __parray_size_;
-    size_t          __parray_cap_;
-};
-
-//enum class io_errc
-_LIBCPP_DECLARE_STRONG_ENUM(io_errc)
-{
-    stream = 1
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(io_errc)
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum<io_errc> : public true_type { };
-
-#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum<io_errc::__lx> : public true_type { };
-#endif
-
-_LIBCPP_FUNC_VIS
-const error_category& iostream_category() _NOEXCEPT;
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_code
-make_error_code(io_errc __e) _NOEXCEPT
-{
-    return error_code(static_cast<int>(__e), iostream_category());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_condition
-make_error_condition(io_errc __e) _NOEXCEPT
-{
-    return error_condition(static_cast<int>(__e), iostream_category());
-}
-
-class _LIBCPP_EXCEPTION_ABI ios_base::failure
-    : public system_error
-{
-public:
-    explicit failure(const string& __msg, const error_code& __ec = io_errc::stream);
-    explicit failure(const char* __msg, const error_code& __ec = io_errc::stream);
-    virtual ~failure() throw();
-};
-
-class _LIBCPP_TYPE_VIS ios_base::Init
-{
-public:
-    Init();
-    ~Init();
-};
-
-// fmtflags
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::fmtflags
-ios_base::flags() const
-{
-    return __fmtflags_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::fmtflags
-ios_base::flags(fmtflags __fmtfl)
-{
-    fmtflags __r = __fmtflags_;
-    __fmtflags_ = __fmtfl;
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::fmtflags
-ios_base::setf(fmtflags __fmtfl)
-{
-    fmtflags __r = __fmtflags_;
-    __fmtflags_ |= __fmtfl;
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-ios_base::unsetf(fmtflags __mask)
-{
-    __fmtflags_ &= ~__mask;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::fmtflags
-ios_base::setf(fmtflags __fmtfl, fmtflags __mask)
-{
-    fmtflags __r = __fmtflags_;
-    unsetf(__mask);
-    __fmtflags_ |= __fmtfl & __mask;
-    return __r;
-}
-
-// precision
-
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-ios_base::precision() const
-{
-    return __precision_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-ios_base::precision(streamsize __prec)
-{
-    streamsize __r = __precision_;
-    __precision_ = __prec;
-    return __r;
-}
-
-// width
-
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-ios_base::width() const
-{
-    return __width_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-ios_base::width(streamsize __wide)
-{
-    streamsize __r = __width_;
-    __width_ = __wide;
-    return __r;
-}
-
-// iostate
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::iostate
-ios_base::rdstate() const
-{
-    return __rdstate_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-ios_base::setstate(iostate __state)
-{
-    clear(__rdstate_ | __state);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ios_base::good() const
-{
-    return __rdstate_ == 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ios_base::eof() const
-{
-    return (__rdstate_ & eofbit) != 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ios_base::fail() const
-{
-    return (__rdstate_ & (failbit | badbit)) != 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-ios_base::bad() const
-{
-    return (__rdstate_ & badbit) != 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base::iostate
-ios_base::exceptions() const
-{
-    return __exceptions_;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void
-ios_base::exceptions(iostate __iostate)
-{
-    __exceptions_ = __iostate;
-    clear(__rdstate_);
-}
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ios
-    : public ios_base
-{
-public:
-    // types:
-    typedef _CharT char_type;
-    typedef _Traits traits_type;
-
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    _LIBCPP_ALWAYS_INLINE
-        _LIBCPP_EXPLICIT
-        operator bool() const {return !fail();}
-    _LIBCPP_ALWAYS_INLINE bool operator!() const    {return  fail();}
-    _LIBCPP_ALWAYS_INLINE iostate rdstate() const   {return ios_base::rdstate();}
-    _LIBCPP_ALWAYS_INLINE void clear(iostate __state = goodbit) {ios_base::clear(__state);}
-    _LIBCPP_ALWAYS_INLINE void setstate(iostate __state) {ios_base::setstate(__state);}
-    _LIBCPP_ALWAYS_INLINE bool good() const {return ios_base::good();}
-    _LIBCPP_ALWAYS_INLINE bool eof() const  {return ios_base::eof();}
-    _LIBCPP_ALWAYS_INLINE bool fail() const {return ios_base::fail();}
-    _LIBCPP_ALWAYS_INLINE bool bad() const  {return ios_base::bad();}
-
-    _LIBCPP_ALWAYS_INLINE iostate exceptions() const {return ios_base::exceptions();}
-    _LIBCPP_ALWAYS_INLINE void exceptions(iostate __iostate) {ios_base::exceptions(__iostate);}
-
-    // 27.5.4.1 Constructor/destructor:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit basic_ios(basic_streambuf<char_type,traits_type>* __sb);
-    virtual ~basic_ios();
-
-    // 27.5.4.2 Members:
-    _LIBCPP_INLINE_VISIBILITY 
-    basic_ostream<char_type, traits_type>* tie() const;
-    _LIBCPP_INLINE_VISIBILITY 
-    basic_ostream<char_type, traits_type>* tie(basic_ostream<char_type, traits_type>* __tiestr);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    basic_streambuf<char_type, traits_type>* rdbuf() const;
-    _LIBCPP_INLINE_VISIBILITY 
-    basic_streambuf<char_type, traits_type>* rdbuf(basic_streambuf<char_type, traits_type>* __sb);
-
-    basic_ios& copyfmt(const basic_ios& __rhs);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    char_type fill() const;
-    _LIBCPP_INLINE_VISIBILITY 
-    char_type fill(char_type __ch);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    locale imbue(const locale& __loc);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    char narrow(char_type __c, char __dfault) const;
-    _LIBCPP_INLINE_VISIBILITY 
-    char_type widen(char __c) const;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    basic_ios() {// purposefully does no initialization
-                }
-    _LIBCPP_INLINE_VISIBILITY 
-    void init(basic_streambuf<char_type, traits_type>* __sb);
-
-    _LIBCPP_INLINE_VISIBILITY 
-    void move(basic_ios& __rhs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_ALWAYS_INLINE
-    void move(basic_ios&& __rhs) {move(__rhs);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY 
-    void swap(basic_ios& __rhs) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY 
-    void set_rdbuf(basic_streambuf<char_type, traits_type>* __sb);
-private:
-    basic_ostream<char_type, traits_type>* __tie_;
-     mutable int_type __fill_;
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ios<_CharT, _Traits>::basic_ios(basic_streambuf<char_type,traits_type>* __sb)
-{
-    init(__sb);
-}
-
-template <class _CharT, class _Traits>
-basic_ios<_CharT, _Traits>::~basic_ios()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ios<_CharT, _Traits>::init(basic_streambuf<char_type, traits_type>* __sb)
-{
-    ios_base::init(__sb);
-    __tie_ = 0;
-    __fill_ = traits_type::eof();
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>*
-basic_ios<_CharT, _Traits>::tie() const
-{
-    return __tie_;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>*
-basic_ios<_CharT, _Traits>::tie(basic_ostream<char_type, traits_type>* __tiestr)
-{
-    basic_ostream<char_type, traits_type>* __r = __tie_;
-    __tie_ = __tiestr;
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_streambuf<_CharT, _Traits>*
-basic_ios<_CharT, _Traits>::rdbuf() const
-{
-    return static_cast<basic_streambuf<char_type, traits_type>*>(ios_base::rdbuf());
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_streambuf<_CharT, _Traits>*
-basic_ios<_CharT, _Traits>::rdbuf(basic_streambuf<char_type, traits_type>* __sb)
-{
-    basic_streambuf<char_type, traits_type>* __r = rdbuf();
-    ios_base::rdbuf(__sb);
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-locale
-basic_ios<_CharT, _Traits>::imbue(const locale& __loc)
-{
-    locale __r = getloc();
-    ios_base::imbue(__loc);
-    if (rdbuf())
-        rdbuf()->pubimbue(__loc);
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-char
-basic_ios<_CharT, _Traits>::narrow(char_type __c, char __dfault) const
-{
-    return use_facet<ctype<char_type> >(getloc()).narrow(__c, __dfault);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-basic_ios<_CharT, _Traits>::widen(char __c) const
-{
-    return use_facet<ctype<char_type> >(getloc()).widen(__c);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-basic_ios<_CharT, _Traits>::fill() const
-{
-    if (traits_type::eq_int_type(traits_type::eof(), __fill_))
-        __fill_ = widen(' ');
-    return __fill_;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT
-basic_ios<_CharT, _Traits>::fill(char_type __ch)
-{
-    char_type __r = __fill_;
-    __fill_ = __ch;
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-basic_ios<_CharT, _Traits>&
-basic_ios<_CharT, _Traits>::copyfmt(const basic_ios& __rhs)
-{
-    if (this != &__rhs)
-    {
-        __call_callbacks(erase_event);
-        ios_base::copyfmt(__rhs);
-        __tie_ = __rhs.__tie_;
-        __fill_ = __rhs.__fill_;
-        __call_callbacks(copyfmt_event);
-        exceptions(__rhs.exceptions());
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ios<_CharT, _Traits>::move(basic_ios& __rhs)
-{
-    ios_base::move(__rhs);
-    __tie_ = __rhs.__tie_;
-    __rhs.__tie_ = 0;
-    __fill_ = __rhs.__fill_;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ios<_CharT, _Traits>::swap(basic_ios& __rhs) _NOEXCEPT
-{
-    ios_base::swap(__rhs);
-    _VSTD::swap(__tie_, __rhs.__tie_);
-    _VSTD::swap(__fill_, __rhs.__fill_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ios<_CharT, _Traits>::set_rdbuf(basic_streambuf<char_type, traits_type>* __sb)
-{
-    ios_base::set_rdbuf(__sb);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-boolalpha(ios_base& __str)
-{
-    __str.setf(ios_base::boolalpha);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noboolalpha(ios_base& __str)
-{
-    __str.unsetf(ios_base::boolalpha);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-showbase(ios_base& __str)
-{
-    __str.setf(ios_base::showbase);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noshowbase(ios_base& __str)
-{
-    __str.unsetf(ios_base::showbase);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-showpoint(ios_base& __str)
-{
-    __str.setf(ios_base::showpoint);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noshowpoint(ios_base& __str)
-{
-    __str.unsetf(ios_base::showpoint);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-showpos(ios_base& __str)
-{
-    __str.setf(ios_base::showpos);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noshowpos(ios_base& __str)
-{
-    __str.unsetf(ios_base::showpos);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-skipws(ios_base& __str)
-{
-    __str.setf(ios_base::skipws);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-noskipws(ios_base& __str)
-{
-    __str.unsetf(ios_base::skipws);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-uppercase(ios_base& __str)
-{
-    __str.setf(ios_base::uppercase);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-nouppercase(ios_base& __str)
-{
-    __str.unsetf(ios_base::uppercase);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-unitbuf(ios_base& __str)
-{
-    __str.setf(ios_base::unitbuf);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-nounitbuf(ios_base& __str)
-{
-    __str.unsetf(ios_base::unitbuf);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-internal(ios_base& __str)
-{
-    __str.setf(ios_base::internal, ios_base::adjustfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-left(ios_base& __str)
-{
-    __str.setf(ios_base::left, ios_base::adjustfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-right(ios_base& __str)
-{
-    __str.setf(ios_base::right, ios_base::adjustfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-dec(ios_base& __str)
-{
-    __str.setf(ios_base::dec, ios_base::basefield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-hex(ios_base& __str)
-{
-    __str.setf(ios_base::hex, ios_base::basefield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-oct(ios_base& __str)
-{
-    __str.setf(ios_base::oct, ios_base::basefield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-fixed(ios_base& __str)
-{
-    __str.setf(ios_base::fixed, ios_base::floatfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-scientific(ios_base& __str)
-{
-    __str.setf(ios_base::scientific, ios_base::floatfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-hexfloat(ios_base& __str)
-{
-    __str.setf(ios_base::fixed | ios_base::scientific, ios_base::floatfield);
-    return __str;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-ios_base&
-defaultfloat(ios_base& __str)
-{
-    __str.unsetf(ios_base::floatfield);
-    return __str;
-}
-
-template <class _CharT, class _Traits>
-class __save_flags
-{
-    typedef basic_ios<_CharT, _Traits> __stream_type;
-    typedef typename __stream_type::fmtflags fmtflags;
-
-    __stream_type& __stream_;
-    fmtflags       __fmtflags_;
-    _CharT         __fill_;
-
-    __save_flags(const __save_flags&);
-    __save_flags& operator=(const __save_flags&);
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __save_flags(__stream_type& __stream)
-        : __stream_(__stream),
-          __fmtflags_(__stream.flags()),
-          __fill_(__stream.fill())
-        {}
-    _LIBCPP_INLINE_VISIBILITY
-    ~__save_flags()
-    {
-        __stream_.flags(__fmtflags_);
-        __stream_.fill(__fill_);
-    }
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_IOS
diff --git a/include.new/c++/v1/tr1/iosfwd b/include.new/c++/v1/tr1/iosfwd
deleted file mode 100644
index d24c227..0000000
--- a/include.new/c++/v1/tr1/iosfwd
+++ /dev/null
@@ -1,194 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- iosfwd -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_IOSFWD
-#define _LIBCPP_IOSFWD
-
-/*
-    iosfwd synopsis
-
-namespace std
-{
-
-template<class charT> struct char_traits;
-template<class T>     class allocator;
-
-class ios_base;
-template <class charT, class traits = char_traits<charT> > class basic_ios;
-
-template <class charT, class traits = char_traits<charT> > class basic_streambuf;
-template <class charT, class traits = char_traits<charT> > class basic_istream;
-template <class charT, class traits = char_traits<charT> > class basic_ostream;
-template <class charT, class traits = char_traits<charT> > class basic_iostream;
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-    class basic_stringbuf;
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-    class basic_istringstream;
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-    class basic_ostringstream;
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-    class basic_stringstream;
-
-template <class charT, class traits = char_traits<charT> > class basic_filebuf;
-template <class charT, class traits = char_traits<charT> > class basic_ifstream;
-template <class charT, class traits = char_traits<charT> > class basic_ofstream;
-template <class charT, class traits = char_traits<charT> > class basic_fstream;
-
-template <class charT, class traits = char_traits<charT> > class istreambuf_iterator;
-template <class charT, class traits = char_traits<charT> > class ostreambuf_iterator;
-
-typedef basic_ios<char>              ios;
-typedef basic_ios<wchar_t>           wios;
-
-typedef basic_streambuf<char>        streambuf;
-typedef basic_istream<char>          istream;
-typedef basic_ostream<char>          ostream;
-typedef basic_iostream<char>         iostream;
-
-typedef basic_stringbuf<char>        stringbuf;
-typedef basic_istringstream<char>    istringstream;
-typedef basic_ostringstream<char>    ostringstream;
-typedef basic_stringstream<char>     stringstream;
-
-typedef basic_filebuf<char>          filebuf;
-typedef basic_ifstream<char>         ifstream;
-typedef basic_ofstream<char>         ofstream;
-typedef basic_fstream<char>          fstream;
-
-typedef basic_streambuf<wchar_t>     wstreambuf;
-typedef basic_istream<wchar_t>       wistream;
-typedef basic_ostream<wchar_t>       wostream;
-typedef basic_iostream<wchar_t>      wiostream;
-
-typedef basic_stringbuf<wchar_t>     wstringbuf;
-typedef basic_istringstream<wchar_t> wistringstream;
-typedef basic_ostringstream<wchar_t> wostringstream;
-typedef basic_stringstream<wchar_t>  wstringstream;
-
-typedef basic_filebuf<wchar_t>       wfilebuf;
-typedef basic_ifstream<wchar_t>      wifstream;
-typedef basic_ofstream<wchar_t>      wofstream;
-typedef basic_fstream<wchar_t>       wfstream;
-
-template <class state> class fpos;
-typedef fpos<char_traits<char>::state_type>    streampos;
-typedef fpos<char_traits<wchar_t>::state_type> wstreampos;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <wchar.h>  // for mbstate_t
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS ios_base;
-
-template<class _CharT>  struct _LIBCPP_TYPE_VIS_ONLY char_traits;
-template<class _Tp>     class _LIBCPP_TYPE_VIS_ONLY allocator;
-
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ios;
-
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_streambuf;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_istream;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ostream;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_iostream;
-
-template <class _CharT, class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_stringbuf;
-template <class _CharT, class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_istringstream;
-template <class _CharT, class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ostringstream;
-template <class _CharT, class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_stringstream;
-
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_filebuf;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ifstream;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_ofstream;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_fstream;
-
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY istreambuf_iterator;
-template <class _CharT, class _Traits = char_traits<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY ostreambuf_iterator;
-
-typedef basic_ios<char>              ios;
-typedef basic_ios<wchar_t>           wios;
-
-typedef basic_streambuf<char>        streambuf;
-typedef basic_istream<char>          istream;
-typedef basic_ostream<char>          ostream;
-typedef basic_iostream<char>         iostream;
-
-typedef basic_stringbuf<char>        stringbuf;
-typedef basic_istringstream<char>    istringstream;
-typedef basic_ostringstream<char>    ostringstream;
-typedef basic_stringstream<char>     stringstream;
-
-typedef basic_filebuf<char>          filebuf;
-typedef basic_ifstream<char>         ifstream;
-typedef basic_ofstream<char>         ofstream;
-typedef basic_fstream<char>          fstream;
-
-typedef basic_streambuf<wchar_t>     wstreambuf;
-typedef basic_istream<wchar_t>       wistream;
-typedef basic_ostream<wchar_t>       wostream;
-typedef basic_iostream<wchar_t>      wiostream;
-
-typedef basic_stringbuf<wchar_t>     wstringbuf;
-typedef basic_istringstream<wchar_t> wistringstream;
-typedef basic_ostringstream<wchar_t> wostringstream;
-typedef basic_stringstream<wchar_t>  wstringstream;
-
-typedef basic_filebuf<wchar_t>       wfilebuf;
-typedef basic_ifstream<wchar_t>      wifstream;
-typedef basic_ofstream<wchar_t>      wofstream;
-typedef basic_fstream<wchar_t>       wfstream;
-
-template <class _State>             class _LIBCPP_TYPE_VIS_ONLY fpos;
-typedef fpos<mbstate_t>    streampos;
-typedef fpos<mbstate_t>    wstreampos;
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-typedef fpos<mbstate_t>    u16streampos;
-typedef fpos<mbstate_t>    u32streampos;
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-typedef long long streamoff;        // for char_traits in <string>
-
-template <class _CharT,             // for <stdexcept>
-          class _Traits = char_traits<_CharT>,
-          class _Allocator = allocator<_CharT> >
-    class _LIBCPP_TYPE_VIS_ONLY basic_string;
-typedef basic_string<char, char_traits<char>, allocator<char> > string;
-typedef basic_string<wchar_t, char_traits<wchar_t>, allocator<wchar_t> > wstring;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_IOSFWD
diff --git a/include.new/c++/v1/tr1/iostream b/include.new/c++/v1/tr1/iostream
deleted file mode 100644
index ddf2484..0000000
--- a/include.new/c++/v1/tr1/iostream
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- iostream ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_IOSTREAM
-#define _LIBCPP_IOSTREAM
-
-/*
-    iostream synopsis
-
-#include <ios>
-#include <streambuf>
-#include <istream>
-#include <ostream>
-
-namespace std {
-
-extern istream cin;
-extern ostream cout;
-extern ostream cerr;
-extern ostream clog;
-extern wistream wcin;
-extern wostream wcout;
-extern wostream wcerr;
-extern wostream wclog;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ios>
-#include <streambuf>
-#include <istream>
-#include <ostream>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-extern _LIBCPP_FUNC_VIS istream cin;
-extern _LIBCPP_FUNC_VIS ostream cout;
-extern _LIBCPP_FUNC_VIS ostream cerr;
-extern _LIBCPP_FUNC_VIS ostream clog;
-extern _LIBCPP_FUNC_VIS wistream wcin;
-extern _LIBCPP_FUNC_VIS wostream wcout;
-extern _LIBCPP_FUNC_VIS wostream wcerr;
-extern _LIBCPP_FUNC_VIS wostream wclog;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_IOSTREAM
diff --git a/include.new/c++/v1/tr1/istream b/include.new/c++/v1/tr1/istream
deleted file mode 100644
index 168a4d0..0000000
--- a/include.new/c++/v1/tr1/istream
+++ /dev/null
@@ -1,1732 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- istream ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ISTREAM
-#define _LIBCPP_ISTREAM
-
-/*
-    istream synopsis
-
-template <class charT, class traits = char_traits<charT> >
-class basic_istream
-    : virtual public basic_ios<charT,traits>
-{
-public:
-    // types (inherited from basic_ios (27.5.4)):
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.7.1.1.1 Constructor/destructor:
-    explicit basic_istream(basic_streambuf<char_type, traits_type>* sb);
-    basic_istream(basic_istream&& rhs);
-    virtual ~basic_istream();
-
-    // 27.7.1.1.2 Assign/swap:
-    basic_istream& operator=(basic_istream&& rhs);
-    void swap(basic_istream& rhs);
-
-    // 27.7.1.1.3 Prefix/suffix:
-    class sentry;
-
-    // 27.7.1.2 Formatted input:
-    basic_istream& operator>>(basic_istream& (*pf)(basic_istream&));
-    basic_istream& operator>>(basic_ios<char_type, traits_type>&
-                              (*pf)(basic_ios<char_type, traits_type>&));
-    basic_istream& operator>>(ios_base& (*pf)(ios_base&));
-    basic_istream& operator>>(basic_streambuf<char_type, traits_type>* sb);
-    basic_istream& operator>>(bool& n);
-    basic_istream& operator>>(short& n);
-    basic_istream& operator>>(unsigned short& n);
-    basic_istream& operator>>(int& n);
-    basic_istream& operator>>(unsigned int& n);
-    basic_istream& operator>>(long& n);
-    basic_istream& operator>>(unsigned long& n);
-    basic_istream& operator>>(long long& n);
-    basic_istream& operator>>(unsigned long long& n);
-    basic_istream& operator>>(float& f);
-    basic_istream& operator>>(double& f);
-    basic_istream& operator>>(long double& f);
-    basic_istream& operator>>(void*& p);
-
-    // 27.7.1.3 Unformatted input:
-    streamsize gcount() const;
-    int_type get();
-    basic_istream& get(char_type& c);
-    basic_istream& get(char_type* s, streamsize n);
-    basic_istream& get(char_type* s, streamsize n, char_type delim);
-    basic_istream& get(basic_streambuf<char_type,traits_type>& sb);
-    basic_istream& get(basic_streambuf<char_type,traits_type>& sb, char_type delim);
-
-    basic_istream& getline(char_type* s, streamsize n);
-    basic_istream& getline(char_type* s, streamsize n, char_type delim);
-
-    basic_istream& ignore(streamsize n = 1, int_type delim = traits_type::eof());
-    int_type peek();
-    basic_istream& read (char_type* s, streamsize n);
-    streamsize readsome(char_type* s, streamsize n);
-
-    basic_istream& putback(char_type c);
-    basic_istream& unget();
-    int sync();
-
-    pos_type tellg();
-    basic_istream& seekg(pos_type);
-    basic_istream& seekg(off_type, ios_base::seekdir);
-protected:
-    basic_istream(const basic_istream& rhs) = delete;
-    basic_istream(basic_istream&& rhs);
-    // 27.7.2.1.2 Assign/swap:
-    basic_istream& operator=(const basic_istream& rhs) = delete;
-    basic_istream& operator=(basic_istream&& rhs);
-    void swap(basic_istream& rhs);
-};
-
-// 27.7.1.2.3 character extraction templates:
-template<class charT, class traits>
-  basic_istream<charT,traits>& operator>>(basic_istream<charT,traits>&, charT&);
-
-template<class traits>
-  basic_istream<char,traits>& operator>>(basic_istream<char,traits>&, unsigned char&);
-
-template<class traits>
-  basic_istream<char,traits>& operator>>(basic_istream<char,traits>&, signed char&);
-
-template<class charT, class traits>
-  basic_istream<charT,traits>& operator>>(basic_istream<charT,traits>&, charT*);
-
-template<class traits>
-  basic_istream<char,traits>& operator>>(basic_istream<char,traits>&, unsigned char*);
-
-template<class traits>
-  basic_istream<char,traits>& operator>>(basic_istream<char,traits>&, signed char*);
-
-template <class charT, class traits>
-  void
-  swap(basic_istream<charT, traits>& x, basic_istream<charT, traits>& y);
-
-typedef basic_istream<char> istream;
-typedef basic_istream<wchar_t> wistream;
-
-template <class charT, class traits = char_traits<charT> >
-class basic_iostream :
-    public basic_istream<charT,traits>,
-    public basic_ostream<charT,traits>
-{
-public:
-    // types:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // constructor/destructor
-    explicit basic_iostream(basic_streambuf<char_type, traits_type>* sb);
-    basic_iostream(basic_iostream&& rhs);
-    virtual ~basic_iostream();
-
-    // assign/swap
-    basic_iostream& operator=(basic_iostream&& rhs);
-    void swap(basic_iostream& rhs);
-};
-
-template <class charT, class traits>
-  void
-  swap(basic_iostream<charT, traits>& x, basic_iostream<charT, traits>& y);
-
-typedef basic_iostream<char> iostream;
-typedef basic_iostream<wchar_t> wiostream;
-
-template <class charT, class traits>
-  basic_istream<charT,traits>&
-  ws(basic_istream<charT,traits>& is);
-
-template <class charT, class traits, class T>
-  basic_istream<charT, traits>&
-  operator>>(basic_istream<charT, traits>&& is, T& x);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ostream>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_istream
-    : virtual public basic_ios<_CharT, _Traits>
-{
-    streamsize __gc_;
-public:
-    // types (inherited from basic_ios (27.5.4)):
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.7.1.1.1 Constructor/destructor:
-    explicit basic_istream(basic_streambuf<char_type, traits_type>* __sb);
-    virtual ~basic_istream();
-protected:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream(basic_istream&& __rhs);
-#endif
-    // 27.7.1.1.2 Assign/swap:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_istream& operator=(basic_istream&& __rhs);
-#endif
-    void swap(basic_istream& __rhs);
-
-#if _LIBCPP_STD_VER > 11
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    basic_istream           (const basic_istream& __rhs) = delete;
-    basic_istream& operator=(const basic_istream& __rhs) = delete;
-#else
-    basic_istream           (const basic_istream& __rhs); // not defined
-    basic_istream& operator=(const basic_istream& __rhs); // not defined
-#endif
-#endif
-public:
-
-    // 27.7.1.1.3 Prefix/suffix:
-    class _LIBCPP_TYPE_VIS_ONLY sentry;
-
-    // 27.7.1.2 Formatted input:
-    basic_istream& operator>>(basic_istream& (*__pf)(basic_istream&));
-    basic_istream& operator>>(basic_ios<char_type, traits_type>&
-                              (*__pf)(basic_ios<char_type, traits_type>&));
-    basic_istream& operator>>(ios_base& (*__pf)(ios_base&));
-    basic_istream& operator>>(basic_streambuf<char_type, traits_type>* __sb);
-    basic_istream& operator>>(bool& __n);
-    basic_istream& operator>>(short& __n);
-    basic_istream& operator>>(unsigned short& __n);
-    basic_istream& operator>>(int& __n);
-    basic_istream& operator>>(unsigned int& __n);
-    basic_istream& operator>>(long& __n);
-    basic_istream& operator>>(unsigned long& __n);
-    basic_istream& operator>>(long long& __n);
-    basic_istream& operator>>(unsigned long long& __n);
-    basic_istream& operator>>(float& __f);
-    basic_istream& operator>>(double& __f);
-    basic_istream& operator>>(long double& __f);
-    basic_istream& operator>>(void*& __p);
-
-    // 27.7.1.3 Unformatted input:
-    _LIBCPP_INLINE_VISIBILITY
-    streamsize gcount() const {return __gc_;}
-    int_type get();
-    basic_istream& get(char_type& __c);
-    basic_istream& get(char_type* __s, streamsize __n);
-    basic_istream& get(char_type* __s, streamsize __n, char_type __dlm);
-    basic_istream& get(basic_streambuf<char_type, traits_type>& __sb);
-    basic_istream& get(basic_streambuf<char_type, traits_type>& __sb, char_type __dlm);
-
-    basic_istream& getline(char_type* __s, streamsize __n);
-    basic_istream& getline(char_type* __s, streamsize __n, char_type __dlm);
-
-    basic_istream& ignore(streamsize __n = 1, int_type __dlm = traits_type::eof());
-    int_type peek();
-    basic_istream& read (char_type* __s, streamsize __n);
-    streamsize readsome(char_type* __s, streamsize __n);
-
-    basic_istream& putback(char_type __c);
-    basic_istream& unget();
-    int sync();
-
-    pos_type tellg();
-    basic_istream& seekg(pos_type __pos);
-    basic_istream& seekg(off_type __off, ios_base::seekdir __dir);
-};
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_istream<_CharT, _Traits>::sentry
-{
-    bool __ok_;
-
-    sentry(const sentry&); // = delete;
-    sentry& operator=(const sentry&); // = delete;
-
-public:
-    explicit sentry(basic_istream<_CharT, _Traits>& __is, bool __noskipws = false);
-//    ~sentry() = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_EXPLICIT
-        operator bool() const {return __ok_;}
-};
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>::sentry::sentry(basic_istream<_CharT, _Traits>& __is,
-                                               bool __noskipws)
-    : __ok_(false)
-{
-    if (__is.good())
-    {
-        if (__is.tie())
-            __is.tie()->flush();
-        if (!__noskipws && (__is.flags() & ios_base::skipws))
-        {
-            typedef istreambuf_iterator<_CharT, _Traits> _Ip;
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            _Ip __i(__is);
-            _Ip __eof;
-            for (; __i != __eof; ++__i)
-                if (!__ct.is(__ct.space, *__i))
-                    break;
-            if (__i == __eof)
-                __is.setstate(ios_base::failbit | ios_base::eofbit);
-        }
-        __ok_ = __is.good();
-    }
-    else
-        __is.setstate(ios_base::failbit);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>::basic_istream(basic_streambuf<char_type, traits_type>* __sb)
-    : __gc_(0)
-{
-    this->init(__sb);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>::basic_istream(basic_istream&& __rhs)
-    : __gc_(__rhs.__gc_)
-{
-    __rhs.__gc_ = 0;
-    this->move(__rhs);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator=(basic_istream&& __rhs)
-{
-    swap(__rhs);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>::~basic_istream()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_istream<_CharT, _Traits>::swap(basic_istream& __rhs)
-{
-    _VSTD::swap(__gc_, __rhs.__gc_);
-    basic_ios<char_type, traits_type>::swap(__rhs);
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(unsigned short& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(unsigned int& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(long& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(unsigned long& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(long long& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(unsigned long long& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(float& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(double& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(long double& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(bool& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(void*& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __n);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(short& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            long __temp;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __temp);
-            if (__temp < numeric_limits<short>::min())
-            {
-                __err |= ios_base::failbit;
-                __n = numeric_limits<short>::min();
-            }
-            else if (__temp > numeric_limits<short>::max())
-            {
-                __err |= ios_base::failbit;
-                __n = numeric_limits<short>::max();
-            }
-            else
-                __n = static_cast<short>(__temp);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(int& __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef istreambuf_iterator<char_type, traits_type> _Ip;
-            typedef num_get<char_type, _Ip> _Fp;
-            ios_base::iostate __err = ios_base::goodbit;
-            long __temp;
-            use_facet<_Fp>(this->getloc()).get(_Ip(*this), _Ip(), *this, __err, __temp);
-            if (__temp < numeric_limits<int>::min())
-            {
-                __err |= ios_base::failbit;
-                __n = numeric_limits<int>::min();
-            }
-            else if (__temp > numeric_limits<int>::max())
-            {
-                __err |= ios_base::failbit;
-                __n = numeric_limits<int>::max();
-            }
-            else
-                __n = static_cast<int>(__temp);
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(basic_istream& (*__pf)(basic_istream&))
-{
-    return __pf(*this);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(basic_ios<char_type, traits_type>&
-                                           (*__pf)(basic_ios<char_type, traits_type>&))
-{
-    __pf(*this);
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(ios_base& (*__pf)(ios_base&))
-{
-    __pf(*this);
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, _CharT* __s)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
-        if (__sen)
-        {
-            streamsize __n = __is.width();
-            if (__n <= 0)
-                __n = numeric_limits<streamsize>::max() / sizeof(_CharT) - 1;
-            streamsize __c = 0;
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            ios_base::iostate __err = ios_base::goodbit;
-            while (__c < __n-1)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sgetc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                _CharT __ch = _Traits::to_char_type(__i);
-                if (__ct.is(__ct.space, __ch))
-                    break;
-                *__s++ = __ch;
-                ++__c;
-                 __is.rdbuf()->sbumpc();
-            }
-            *__s = _CharT();
-            __is.width(0);
-            if (__c == 0)
-               __err |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template<class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<char, _Traits>&
-operator>>(basic_istream<char, _Traits>& __is, unsigned char* __s)
-{
-    return __is >> (char*)__s;
-}
-
-template<class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<char, _Traits>&
-operator>>(basic_istream<char, _Traits>& __is, signed char* __s)
-{
-    return __is >> (char*)__s;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, _CharT& __c)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
-        if (__sen)
-        {
-            typename _Traits::int_type __i = __is.rdbuf()->sbumpc();
-            if (_Traits::eq_int_type(__i, _Traits::eof()))
-                __is.setstate(ios_base::eofbit | ios_base::failbit);
-            else
-                __c = _Traits::to_char_type(__i);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template<class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<char, _Traits>&
-operator>>(basic_istream<char, _Traits>& __is, unsigned char& __c)
-{
-    return __is >> (char&)__c;
-}
-
-template<class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<char, _Traits>&
-operator>>(basic_istream<char, _Traits>& __is, signed char& __c)
-{
-    return __is >> (char&)__c;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::operator>>(basic_streambuf<char_type, traits_type>* __sb)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this, true);
-        if (__s)
-        {
-            if (__sb)
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                try
-                {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    ios_base::iostate __err = ios_base::goodbit;
-                    while (true)
-                    {
-                        typename traits_type::int_type __i = this->rdbuf()->sgetc();
-                        if (traits_type::eq_int_type(__i, _Traits::eof()))
-                        {
-                           __err |= ios_base::eofbit;
-                           break;
-                        }
-                        if (traits_type::eq_int_type(
-                                __sb->sputc(traits_type::to_char_type(__i)),
-                                traits_type::eof()))
-                            break;
-                        ++__gc_;
-                        this->rdbuf()->sbumpc();
-                    }
-                    if (__gc_ == 0)
-                       __err |= ios_base::failbit;
-                    this->setstate(__err);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                }
-                catch (...)
-                {
-                    if (__gc_ == 0)
-                        this->__set_failbit_and_consider_rethrow();
-                }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            }
-            else
-                this->setstate(ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-typename basic_istream<_CharT, _Traits>::int_type
-basic_istream<_CharT, _Traits>::get()
-{
-    __gc_ = 0;
-    int_type __r = traits_type::eof();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this, true);
-        if (__s)
-        {
-            __r = this->rdbuf()->sbumpc();
-            if (traits_type::eq_int_type(__r, traits_type::eof()))
-               this->setstate(ios_base::failbit | ios_base::eofbit);
-            else
-                __gc_ = 1;
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __r;
-}
-
-template<class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(char_type& __c)
-{
-    int_type __ch = get();
-    if (__ch != traits_type::eof())
-        __c = traits_type::to_char_type(__ch);
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(char_type* __s, streamsize __n, char_type __dlm)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (__n > 0)
-            {
-                ios_base::iostate __err = ios_base::goodbit;
-                while (__gc_ < __n-1)
-                {
-                    int_type __i = this->rdbuf()->sgetc();
-                    if (traits_type::eq_int_type(__i, traits_type::eof()))
-                    {
-                       __err |= ios_base::eofbit;
-                       break;
-                    }
-                    char_type __ch = traits_type::to_char_type(__i);
-                    if (traits_type::eq(__ch, __dlm))
-                        break;
-                    *__s++ = __ch;
-                    ++__gc_;
-                     this->rdbuf()->sbumpc();
-                }
-                *__s = char_type();
-                if (__gc_ == 0)
-                   __err |= ios_base::failbit;
-                this->setstate(__err);
-            }
-            else
-                this->setstate(ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(char_type* __s, streamsize __n)
-{
-    return get(__s, __n, this->widen('\n'));
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(basic_streambuf<char_type, traits_type>& __sb,
-                                    char_type __dlm)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            ios_base::iostate __err = ios_base::goodbit;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            try
-            {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                while (true)
-                {
-                    typename traits_type::int_type __i = this->rdbuf()->sgetc();
-                    if (traits_type::eq_int_type(__i, traits_type::eof()))
-                    {
-                       __err |= ios_base::eofbit;
-                       break;
-                    }
-                    char_type __ch = traits_type::to_char_type(__i);
-                    if (traits_type::eq(__ch, __dlm))
-                        break;
-                    if (traits_type::eq_int_type(__sb.sputc(__ch), traits_type::eof()))
-                        break;
-                    ++__gc_;
-                    this->rdbuf()->sbumpc();
-                }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            }
-            catch (...)
-            {
-            }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            if (__gc_ == 0)
-               __err |= ios_base::failbit;
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::get(basic_streambuf<char_type, traits_type>& __sb)
-{
-    return get(__sb, this->widen('\n'));
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n, char_type __dlm)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            ios_base::iostate __err = ios_base::goodbit;
-            while (true)
-            {
-                typename traits_type::int_type __i = this->rdbuf()->sgetc();
-                if (traits_type::eq_int_type(__i, traits_type::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                char_type __ch = traits_type::to_char_type(__i);
-                if (traits_type::eq(__ch, __dlm))
-                {
-                    this->rdbuf()->sbumpc();
-                    ++__gc_;
-                    break;
-                }
-                if (__gc_ >= __n-1)
-                {
-                    __err |= ios_base::failbit;
-                    break;
-                }
-                *__s++ = __ch;
-                this->rdbuf()->sbumpc();
-                ++__gc_;
-            }
-            if (__n > 0)
-                *__s = char_type();
-            if (__gc_ == 0)
-               __err |= ios_base::failbit;
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::getline(char_type* __s, streamsize __n)
-{
-    return getline(__s, __n, this->widen('\n'));
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            ios_base::iostate __err = ios_base::goodbit;
-            if (__n == numeric_limits<streamsize>::max())
-            {
-                while (true)
-                {
-                    typename traits_type::int_type __i = this->rdbuf()->sbumpc();
-                    if (traits_type::eq_int_type(__i, traits_type::eof()))
-                    {
-                       __err |= ios_base::eofbit;
-                       break;
-                    }
-                    ++__gc_;
-                    if (traits_type::eq_int_type(__i, __dlm))
-                        break;
-                }
-            }
-            else
-            {
-                while (__gc_ < __n)
-                {
-                    typename traits_type::int_type __i = this->rdbuf()->sbumpc();
-                    if (traits_type::eq_int_type(__i, traits_type::eof()))
-                    {
-                       __err |= ios_base::eofbit;
-                       break;
-                    }
-                    ++__gc_;
-                    if (traits_type::eq_int_type(__i, __dlm))
-                        break;
-                }
-            }
-            this->setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-typename basic_istream<_CharT, _Traits>::int_type
-basic_istream<_CharT, _Traits>::peek()
-{
-    __gc_ = 0;
-    int_type __r = traits_type::eof();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            __r = this->rdbuf()->sgetc();
-            if (traits_type::eq_int_type(__r, traits_type::eof()))
-                this->setstate(ios_base::eofbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __r;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::read(char_type* __s, streamsize __n)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            __gc_ = this->rdbuf()->sgetn(__s, __n);
-            if (__gc_ != __n)
-                this->setstate(ios_base::failbit | ios_base::eofbit);
-        }
-        else
-            this->setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-streamsize
-basic_istream<_CharT, _Traits>::readsome(char_type* __s, streamsize __n)
-{
-    __gc_ = 0;
-    streamsize __c = this->rdbuf()->in_avail();
-    switch (__c)
-    {
-    case -1:
-        this->setstate(ios_base::eofbit);
-        break;
-    case 0:
-        break;
-    default:
-        read(__s, _VSTD::min(__c, __n));
-        break;
-    }
-    return __gc_;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::putback(char_type __c)
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf() == 0 || this->rdbuf()->sputbackc(__c) == traits_type::eof())
-                this->setstate(ios_base::badbit);
-        }
-        else
-            this->setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::unget()
-{
-    __gc_ = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf() == 0 || this->rdbuf()->sungetc() == traits_type::eof())
-                this->setstate(ios_base::badbit);
-        }
-        else
-            this->setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-int
-basic_istream<_CharT, _Traits>::sync()
-{
-    int __r = 0;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf() == 0)
-                return -1;
-            if (this->rdbuf()->pubsync() == -1)
-            {
-                this->setstate(ios_base::badbit);
-                return -1;
-            }
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __r;
-}
-
-template<class _CharT, class _Traits>
-typename basic_istream<_CharT, _Traits>::pos_type
-basic_istream<_CharT, _Traits>::tellg()
-{
-    pos_type __r(-1);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-            __r = this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::in);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __r;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::seekg(pos_type __pos)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        this->clear(this->rdstate() & ~ios_base::eofbit);
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf()->pubseekpos(__pos, ios_base::in) == pos_type(-1))
-                this->setstate(ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-basic_istream<_CharT, _Traits>::seekg(off_type __off, ios_base::seekdir __dir)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this, true);
-        if (__sen)
-        {
-            if (this->rdbuf()->pubseekoff(__off, __dir, ios_base::in) == pos_type(-1))
-                this->setstate(ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-ws(basic_istream<_CharT, _Traits>& __is)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
-        if (__sen)
-        {
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            while (true)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sgetc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __is.setstate(ios_base::eofbit);
-                   break;
-                }
-                if (!__ct.is(__ct.space, _Traits::to_char_type(__i)))
-                    break;
-                __is.rdbuf()->sbumpc();
-            }
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>&& __is, _Tp& __x)
-{
-    __is >> __x;
-    return __is;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_iostream
-    : public basic_istream<_CharT, _Traits>,
-      public basic_ostream<_CharT, _Traits>
-{
-public:
-    // types:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // constructor/destructor
-    explicit basic_iostream(basic_streambuf<char_type, traits_type>* __sb);
-    virtual ~basic_iostream();
-protected:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_iostream(basic_iostream&& __rhs);
-#endif
-
-    // assign/swap
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_iostream& operator=(basic_iostream&& __rhs);
-#endif
-    void swap(basic_iostream& __rhs);
-public:
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_iostream<_CharT, _Traits>::basic_iostream(basic_streambuf<char_type, traits_type>* __sb)
-    : basic_istream<_CharT, _Traits>(__sb)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_iostream<_CharT, _Traits>::basic_iostream(basic_iostream&& __rhs)
-    : basic_istream<_CharT, _Traits>(_VSTD::move(__rhs))
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_iostream<_CharT, _Traits>&
-basic_iostream<_CharT, _Traits>::operator=(basic_iostream&& __rhs)
-{
-    swap(__rhs);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_iostream<_CharT, _Traits>::~basic_iostream()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_iostream<_CharT, _Traits>::swap(basic_iostream& __rhs)
-{
-    basic_istream<char_type, traits_type>::swap(__rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           basic_string<_CharT, _Traits, _Allocator>& __str)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
-        if (__sen)
-        {
-            __str.clear();
-            streamsize __n = __is.width();
-            if (__n <= 0)
-                __n = __str.max_size();
-            if (__n <= 0)
-                __n = numeric_limits<streamsize>::max();
-            streamsize __c = 0;
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            ios_base::iostate __err = ios_base::goodbit;
-            while (__c < __n)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sgetc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                _CharT __ch = _Traits::to_char_type(__i);
-                if (__ct.is(__ct.space, __ch))
-                    break;
-                __str.push_back(__ch);
-                ++__c;
-                 __is.rdbuf()->sbumpc();
-            }
-            __is.width(0);
-            if (__c == 0)
-               __err |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-        else
-            __is.setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is, true);
-        if (__sen)
-        {
-            __str.clear();
-            ios_base::iostate __err = ios_base::goodbit;
-            streamsize __extr = 0;
-            while (true)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sbumpc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                ++__extr;
-                _CharT __ch = _Traits::to_char_type(__i);
-                if (_Traits::eq(__ch, __dlm))
-                    break;
-                __str.push_back(__ch);
-                if (__str.size() == __str.max_size())
-                {
-                    __err |= ios_base::failbit;
-                    break;
-                }
-            }
-            if (__extr == 0)
-               __err |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str)
-{
-    return getline(__is, __str, __is.widen('\n'));
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>&& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm)
-{
-    return getline(__is, __str, __dlm);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>&& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str)
-{
-    return getline(__is, __str, __is.widen('\n'));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, size_t _Size>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, bitset<_Size>& __x)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_istream<_CharT, _Traits>::sentry __sen(__is);
-        if (__sen)
-        {
-            basic_string<_CharT, _Traits> __str;
-            const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__is.getloc());
-            streamsize __c = 0;
-            ios_base::iostate __err = ios_base::goodbit;
-            _CharT __zero = __ct.widen('0');
-            _CharT __one = __ct.widen('1');
-            while (__c < _Size)
-            {
-                typename _Traits::int_type __i = __is.rdbuf()->sgetc();
-                if (_Traits::eq_int_type(__i, _Traits::eof()))
-                {
-                   __err |= ios_base::eofbit;
-                   break;
-                }
-                _CharT __ch = _Traits::to_char_type(__i);
-                if (!_Traits::eq(__ch, __zero) && !_Traits::eq(__ch, __one))
-                    break;
-                __str.push_back(__ch);
-                ++__c;
-                 __is.rdbuf()->sbumpc();
-            }
-            __x = bitset<_Size>(__str);
-            if (__c == 0)
-               __err |= ios_base::failbit;
-            __is.setstate(__err);
-        }
-        else
-            __is.setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __is.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __is;
-}
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_istream<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_istream<wchar_t>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_iostream<char>)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_ISTREAM
diff --git a/include.new/c++/v1/tr1/iterator b/include.new/c++/v1/tr1/iterator
deleted file mode 100644
index bcf142a..0000000
--- a/include.new/c++/v1/tr1/iterator
+++ /dev/null
@@ -1,1614 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- iterator ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_ITERATOR
-#define _LIBCPP_ITERATOR
-
-/*
-    iterator synopsis
-
-namespace std
-{
-
-template<class Iterator>
-struct iterator_traits
-{
-    typedef typename Iterator::difference_type difference_type;
-    typedef typename Iterator::value_type value_type;
-    typedef typename Iterator::pointer pointer;
-    typedef typename Iterator::reference reference;
-    typedef typename Iterator::iterator_category iterator_category;
-};
-
-template<class T>
-struct iterator_traits<T*>
-{
-    typedef ptrdiff_t difference_type;
-    typedef T value_type;
-    typedef T* pointer;
-    typedef T& reference;
-    typedef random_access_iterator_tag iterator_category;
-};
-
-template<class T>
-struct iterator_traits<const T*>
-{
-    typedef ptrdiff_t difference_type;
-    typedef T value_type;
-    typedef const T* pointer;
-    typedef const T& reference;
-    typedef random_access_iterator_tag iterator_category;
-};
-
-template<class Category, class T, class Distance = ptrdiff_t,
-         class Pointer = T*, class Reference = T&>
-struct iterator
-{
-    typedef T         value_type;
-    typedef Distance  difference_type;
-    typedef Pointer   pointer;
-    typedef Reference reference;
-    typedef Category  iterator_category;
-};
-
-struct input_iterator_tag  {};
-struct output_iterator_tag {};
-struct forward_iterator_tag       : public input_iterator_tag         {};
-struct bidirectional_iterator_tag : public forward_iterator_tag       {};
-struct random_access_iterator_tag : public bidirectional_iterator_tag {};
-
-// extension: second argument not conforming to C++03
-template <class InputIterator>
-void advance(InputIterator& i,
-             typename iterator_traits<InputIterator>::difference_type n);
-
-template <class InputIterator>
-typename iterator_traits<InputIterator>::difference_type
-distance(InputIterator first, InputIterator last);
-
-template <class Iterator>
-class reverse_iterator
-    : public iterator<typename iterator_traits<Iterator>::iterator_category,
-                      typename iterator_traits<Iterator>::value_type,
-                      typename iterator_traits<Iterator>::difference_type,
-                      typename iterator_traits<Iterator>::pointer,
-                      typename iterator_traits<Iterator>::reference>
-{
-protected:
-    Iterator current;
-public:
-    typedef Iterator                                            iterator_type;
-    typedef typename iterator_traits<Iterator>::difference_type difference_type;
-    typedef typename iterator_traits<Iterator>::reference       reference;
-    typedef typename iterator_traits<Iterator>::pointer         pointer;
-
-    reverse_iterator();
-    explicit reverse_iterator(Iterator x);
-    template <class U> reverse_iterator(const reverse_iterator<U>& u);
-    Iterator base() const;
-    reference operator*() const;
-    pointer   operator->() const;
-    reverse_iterator& operator++();
-    reverse_iterator  operator++(int);
-    reverse_iterator& operator--();
-    reverse_iterator  operator--(int);
-    reverse_iterator  operator+ (difference_type n) const;
-    reverse_iterator& operator+=(difference_type n);
-    reverse_iterator  operator- (difference_type n) const;
-    reverse_iterator& operator-=(difference_type n);
-    reference         operator[](difference_type n) const;
-};
-
-template <class Iterator1, class Iterator2>
-bool
-operator==(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator<(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator!=(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator>(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator>=(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-bool
-operator<=(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator1, class Iterator2>
-typename reverse_iterator<Iterator1>::difference_type
-operator-(const reverse_iterator<Iterator1>& x, const reverse_iterator<Iterator2>& y);
-
-template <class Iterator>
-reverse_iterator<Iterator>
-operator+(typename reverse_iterator<Iterator>::difference_type n, const reverse_iterator<Iterator>& x);
-
-template <class Iterator> reverse_iterator<Iterator> make_reverse_iterator(Iterator i); // C++14
-
-template <class Container>
-class back_insert_iterator
-{
-protected:
-    Container* container;
-public:
-    typedef Container                   container_type;
-    typedef void                        value_type;
-    typedef void                        difference_type;
-    typedef back_insert_iterator<Cont>& reference;
-    typedef void                        pointer;
-
-    explicit back_insert_iterator(Container& x);
-    back_insert_iterator& operator=(const typename Container::value_type& value);
-    back_insert_iterator& operator*();
-    back_insert_iterator& operator++();
-    back_insert_iterator  operator++(int);
-};
-
-template <class Container> back_insert_iterator<Container> back_inserter(Container& x);
-
-template <class Container>
-class front_insert_iterator
-{
-protected:
-    Container* container;
-public:
-    typedef Container                    container_type;
-    typedef void                         value_type;
-    typedef void                         difference_type;
-    typedef front_insert_iterator<Cont>& reference;
-    typedef void                         pointer;
-
-    explicit front_insert_iterator(Container& x);
-    front_insert_iterator& operator=(const typename Container::value_type& value);
-    front_insert_iterator& operator*();
-    front_insert_iterator& operator++();
-    front_insert_iterator  operator++(int);
-};
-
-template <class Container> front_insert_iterator<Container> front_inserter(Container& x);
-
-template <class Container>
-class insert_iterator
-{
-protected:
-    Container* container;
-    typename Container::iterator iter;
-public:
-    typedef Container              container_type;
-    typedef void                   value_type;
-    typedef void                   difference_type;
-    typedef insert_iterator<Cont>& reference;
-    typedef void                   pointer;
-
-    insert_iterator(Container& x, typename Container::iterator i);
-    insert_iterator& operator=(const typename Container::value_type& value);
-    insert_iterator& operator*();
-    insert_iterator& operator++();
-    insert_iterator& operator++(int);
-};
-
-template <class Container, class Iterator>
-insert_iterator<Container> inserter(Container& x, Iterator i);
-
-template <class T, class charT = char, class traits = char_traits<charT>, class Distance = ptrdiff_t>
-class istream_iterator
-    : public iterator<input_iterator_tag, T, Distance, const T*, const T&>
-{
-public:
-    typedef charT char_type;
-    typedef traits traits_type;
-    typedef basic_istream<charT,traits> istream_type;
-
-    istream_iterator();
-    istream_iterator(istream_type& s);
-    istream_iterator(const istream_iterator& x);
-    ~istream_iterator();
-
-    const T& operator*() const;
-    const T* operator->() const;
-    istream_iterator& operator++();
-    istream_iterator  operator++(int);
-};
-
-template <class T, class charT, class traits, class Distance>
-bool operator==(const istream_iterator<T,charT,traits,Distance>& x,
-                const istream_iterator<T,charT,traits,Distance>& y);
-template <class T, class charT, class traits, class Distance>
-bool operator!=(const istream_iterator<T,charT,traits,Distance>& x,
-                const istream_iterator<T,charT,traits,Distance>& y);
-
-template <class T, class charT = char, class traits = char_traits<charT> >
-class ostream_iterator
-    : public iterator<output_iterator_tag, void, void, void ,void>
-{
-public:
-    typedef charT char_type;
-    typedef traits traits_type;
-    typedef basic_ostream<charT,traits> ostream_type;
-
-    ostream_iterator(ostream_type& s);
-    ostream_iterator(ostream_type& s, const charT* delimiter);
-    ostream_iterator(const ostream_iterator& x);
-    ~ostream_iterator();
-    ostream_iterator& operator=(const T& value);
-
-    ostream_iterator& operator*();
-    ostream_iterator& operator++();
-    ostream_iterator& operator++(int);
-};
-
-template<class charT, class traits = char_traits<charT> >
-class istreambuf_iterator
-    : public iterator<input_iterator_tag, charT,
-                      typename traits::off_type, unspecified,
-                      charT>
-{
-public:
-    typedef charT                         char_type;
-    typedef traits                        traits_type;
-    typedef typename traits::int_type     int_type;
-    typedef basic_streambuf<charT,traits> streambuf_type;
-    typedef basic_istream<charT,traits>   istream_type;
-
-    istreambuf_iterator() noexcept;
-    istreambuf_iterator(istream_type& s) noexcept;
-    istreambuf_iterator(streambuf_type* s) noexcept;
-    istreambuf_iterator(a-private-type) noexcept;
-
-    charT                operator*() const;
-    pointer operator->() const;
-    istreambuf_iterator& operator++();
-    a-private-type       operator++(int);
-
-    bool equal(const istreambuf_iterator& b) const;
-};
-
-template <class charT, class traits>
-bool operator==(const istreambuf_iterator<charT,traits>& a,
-                const istreambuf_iterator<charT,traits>& b);
-template <class charT, class traits>
-bool operator!=(const istreambuf_iterator<charT,traits>& a,
-                const istreambuf_iterator<charT,traits>& b);
-
-template <class charT, class traits = char_traits<charT> >
-class ostreambuf_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-{
-public:
-    typedef charT                         char_type;
-    typedef traits                        traits_type;
-    typedef basic_streambuf<charT,traits> streambuf_type;
-    typedef basic_ostream<charT,traits>   ostream_type;
-
-    ostreambuf_iterator(ostream_type& s) noexcept;
-    ostreambuf_iterator(streambuf_type* s) noexcept;
-    ostreambuf_iterator& operator=(charT c);
-    ostreambuf_iterator& operator*();
-    ostreambuf_iterator& operator++();
-    ostreambuf_iterator& operator++(int);
-    bool failed() const noexcept;
-};
-
-template <class C> auto begin(C& c) -> decltype(c.begin());
-template <class C> auto begin(const C& c) -> decltype(c.begin());
-template <class C> auto end(C& c) -> decltype(c.end());
-template <class C> auto end(const C& c) -> decltype(c.end());
-template <class T, size_t N> T* begin(T (&array)[N]);
-template <class T, size_t N> T* end(T (&array)[N]);
-
-template <class C> auto cbegin(const C& c) -> decltype(std::begin(c));        // C++14
-template <class C> auto cend(const C& c) -> decltype(std::end(c));            // C++14
-template <class C> auto rbegin(C& c) -> decltype(c.rbegin());                 // C++14
-template <class C> auto rbegin(const C& c) -> decltype(c.rbegin());           // C++14
-template <class C> auto rend(C& c) -> decltype(c.rend());                     // C++14
-template <class C> auto rend(const C& c) -> decltype(c.rend());               // C++14
-template <class E> reverse_iterator<const E*> rbegin(initializer_list<E> il); // C++14
-template <class E> reverse_iterator<const E*> rend(initializer_list<E> il);   // C++14
-template <class T, size_t N> reverse_iterator<T*> rbegin(T (&array)[N]);      // C++14
-template <class T, size_t N> reverse_iterator<T*> rend(T (&array)[N]);        // C++14
-template <class C> auto crbegin(const C& c) -> decltype(std::rbegin(c));      // C++14
-template <class C> auto crend(const C& c) -> decltype(std::rend(c));          // C++14
-
-// 24.8, container access:
-template <class C> constexpr auto size(const C& c) -> decltype(c.size());         // C++17
-template <class T, size_t N> constexpr size_t size(const T (&array)[N]) noexcept; // C++17
-template <class C> constexpr auto empty(const C& c) -> decltype(c.empty());       // C++17
-template <class T, size_t N> constexpr bool empty(const T (&array)[N]) noexcept;  // C++17
-template <class E> constexpr bool empty(initializer_list<E> il) noexcept;         // C++17
-template <class C> constexpr auto data(C& c) -> decltype(c.data());               // C++17
-template <class C> constexpr auto data(const C& c) -> decltype(c.data());         // C++17
-template <class T, size_t N> constexpr T* data(T (&array)[N]) noexcept;           // C++17
-template <class E> constexpr const E* data(initializer_list<E> il) noexcept;      // C++17
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__functional_base>
-#include <type_traits>
-#include <cstddef>
-#include <iosfwd>
-#include <initializer_list>
-#ifdef __APPLE__
-#include <Availability.h>
-#endif
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-struct _LIBCPP_TYPE_VIS_ONLY input_iterator_tag {};
-struct _LIBCPP_TYPE_VIS_ONLY output_iterator_tag {};
-struct _LIBCPP_TYPE_VIS_ONLY forward_iterator_tag       : public input_iterator_tag {};
-struct _LIBCPP_TYPE_VIS_ONLY bidirectional_iterator_tag : public forward_iterator_tag {};
-struct _LIBCPP_TYPE_VIS_ONLY random_access_iterator_tag : public bidirectional_iterator_tag {};
-
-template <class _Tp>
-struct __has_iterator_category
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::iterator_category* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Iter, bool> struct __iterator_traits_impl {};
-
-template <class _Iter>
-struct __iterator_traits_impl<_Iter, true>
-{
-    typedef typename _Iter::difference_type   difference_type;
-    typedef typename _Iter::value_type        value_type;
-    typedef typename _Iter::pointer           pointer;
-    typedef typename _Iter::reference         reference;
-    typedef typename _Iter::iterator_category iterator_category;
-};
-
-template <class _Iter, bool> struct __iterator_traits {};
-
-template <class _Iter>
-struct __iterator_traits<_Iter, true>
-    :  __iterator_traits_impl
-      <
-        _Iter,
-        is_convertible<typename _Iter::iterator_category, input_iterator_tag>::value ||
-        is_convertible<typename _Iter::iterator_category, output_iterator_tag>::value
-      >
-{};
-
-// iterator_traits<Iterator> will only have the nested types if Iterator::iterator_category
-//    exists.  Else iterator_traits<Iterator> will be an empty class.  This is a
-//    conforming extension which allows some programs to compile and behave as
-//    the client expects instead of failing at compile time.
-
-template <class _Iter>
-struct _LIBCPP_TYPE_VIS_ONLY iterator_traits
-    : __iterator_traits<_Iter, __has_iterator_category<_Iter>::value> {};
-
-template<class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY iterator_traits<_Tp*>
-{
-    typedef ptrdiff_t difference_type;
-    typedef typename remove_const<_Tp>::type value_type;
-    typedef _Tp* pointer;
-    typedef _Tp& reference;
-    typedef random_access_iterator_tag iterator_category;
-};
-
-template <class _Tp, class _Up, bool = __has_iterator_category<iterator_traits<_Tp> >::value>
-struct __has_iterator_category_convertible_to
-    : public integral_constant<bool, is_convertible<typename iterator_traits<_Tp>::iterator_category, _Up>::value>
-{};
-
-template <class _Tp, class _Up>
-struct __has_iterator_category_convertible_to<_Tp, _Up, false> : public false_type {};
-
-template <class _Tp>
-struct __is_input_iterator : public __has_iterator_category_convertible_to<_Tp, input_iterator_tag> {};
-
-template <class _Tp>
-struct __is_forward_iterator : public __has_iterator_category_convertible_to<_Tp, forward_iterator_tag> {};
-
-template <class _Tp>
-struct __is_bidirectional_iterator : public __has_iterator_category_convertible_to<_Tp, bidirectional_iterator_tag> {};
-
-template <class _Tp>
-struct __is_random_access_iterator : public __has_iterator_category_convertible_to<_Tp, random_access_iterator_tag> {};
-
-template<class _Category, class _Tp, class _Distance = ptrdiff_t,
-         class _Pointer = _Tp*, class _Reference = _Tp&>
-struct _LIBCPP_TYPE_VIS_ONLY iterator
-{
-    typedef _Tp        value_type;
-    typedef _Distance  difference_type;
-    typedef _Pointer   pointer;
-    typedef _Reference reference;
-    typedef _Category  iterator_category;
-};
-
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-void __advance(_InputIter& __i,
-             typename iterator_traits<_InputIter>::difference_type __n, input_iterator_tag)
-{
-    for (; __n > 0; --__n)
-        ++__i;
-}
-
-template <class _BiDirIter>
-inline _LIBCPP_INLINE_VISIBILITY
-void __advance(_BiDirIter& __i,
-             typename iterator_traits<_BiDirIter>::difference_type __n, bidirectional_iterator_tag)
-{
-    if (__n >= 0)
-        for (; __n > 0; --__n)
-            ++__i;
-    else
-        for (; __n < 0; ++__n)
-            --__i;
-}
-
-template <class _RandIter>
-inline _LIBCPP_INLINE_VISIBILITY
-void __advance(_RandIter& __i,
-             typename iterator_traits<_RandIter>::difference_type __n, random_access_iterator_tag)
-{
-   __i += __n;
-}
-
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-void advance(_InputIter& __i,
-             typename iterator_traits<_InputIter>::difference_type __n)
-{
-    __advance(__i, __n, typename iterator_traits<_InputIter>::iterator_category());
-}
-
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_InputIter>::difference_type
-__distance(_InputIter __first, _InputIter __last, input_iterator_tag)
-{
-    typename iterator_traits<_InputIter>::difference_type __r(0);
-    for (; __first != __last; ++__first)
-        ++__r;
-    return __r;
-}
-
-template <class _RandIter>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_RandIter>::difference_type
-__distance(_RandIter __first, _RandIter __last, random_access_iterator_tag)
-{
-    return __last - __first;
-}
-
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-typename iterator_traits<_InputIter>::difference_type
-distance(_InputIter __first, _InputIter __last)
-{
-    return __distance(__first, __last, typename iterator_traits<_InputIter>::iterator_category());
-}
-
-template <class _ForwardIter>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIter
-next(_ForwardIter __x,
-     typename iterator_traits<_ForwardIter>::difference_type __n = 1,
-     typename enable_if<__is_forward_iterator<_ForwardIter>::value>::type* = 0)
-{
-    _VSTD::advance(__x, __n);
-    return __x;
-}
-
-template <class _BidiretionalIter>
-inline _LIBCPP_INLINE_VISIBILITY
-_BidiretionalIter
-prev(_BidiretionalIter __x,
-     typename iterator_traits<_BidiretionalIter>::difference_type __n = 1,
-     typename enable_if<__is_bidirectional_iterator<_BidiretionalIter>::value>::type* = 0)
-{
-    _VSTD::advance(__x, -__n);
-    return __x;
-}
-
-template <class _Iter>
-class _LIBCPP_TYPE_VIS_ONLY reverse_iterator
-    : public iterator<typename iterator_traits<_Iter>::iterator_category,
-                      typename iterator_traits<_Iter>::value_type,
-                      typename iterator_traits<_Iter>::difference_type,
-                      typename iterator_traits<_Iter>::pointer,
-                      typename iterator_traits<_Iter>::reference>
-{
-private:
-    mutable _Iter __t;  // no longer used as of LWG #2360, not removed due to ABI break
-protected:
-    _Iter current;
-public:
-    typedef _Iter                                            iterator_type;
-    typedef typename iterator_traits<_Iter>::difference_type difference_type;
-    typedef typename iterator_traits<_Iter>::reference       reference;
-    typedef typename iterator_traits<_Iter>::pointer         pointer;
-
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator() : current() {}
-    _LIBCPP_INLINE_VISIBILITY explicit reverse_iterator(_Iter __x) : __t(__x), current(__x) {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY reverse_iterator(const reverse_iterator<_Up>& __u)
-        : __t(__u.base()), current(__u.base()) {}
-    _LIBCPP_INLINE_VISIBILITY _Iter base() const {return current;}
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {_Iter __tmp = current; return *--__tmp;}
-    _LIBCPP_INLINE_VISIBILITY pointer  operator->() const {return _VSTD::addressof(operator*());}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator& operator++() {--current; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator  operator++(int)
-        {reverse_iterator __tmp(*this); --current; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator& operator--() {++current; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator  operator--(int)
-        {reverse_iterator __tmp(*this); ++current; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator  operator+ (difference_type __n) const
-        {return reverse_iterator(current - __n);}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator& operator+=(difference_type __n)
-        {current -= __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator  operator- (difference_type __n) const
-        {return reverse_iterator(current + __n);}
-    _LIBCPP_INLINE_VISIBILITY reverse_iterator& operator-=(difference_type __n)
-        {current += __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reference         operator[](difference_type __n) const
-        {return current[-__n-1];}
-};
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() == __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() > __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() != __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() < __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() <= __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __x.base() >= __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename reverse_iterator<_Iter1>::difference_type
-operator-(const reverse_iterator<_Iter1>& __x, const reverse_iterator<_Iter2>& __y)
-{
-    return __y.base() - __x.base();
-}
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<_Iter>
-operator+(typename reverse_iterator<_Iter>::difference_type __n, const reverse_iterator<_Iter>& __x)
-{
-    return reverse_iterator<_Iter>(__x.base() - __n);
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<_Iter> make_reverse_iterator(_Iter __i)
-{
-    return reverse_iterator<_Iter>(__i);
-}
-#endif
-
-template <class _Container>
-class _LIBCPP_TYPE_VIS_ONLY back_insert_iterator
-    : public iterator<output_iterator_tag,
-                      void,
-                      void,
-                      void,
-                      back_insert_iterator<_Container>&>
-{
-protected:
-    _Container* container;
-public:
-    typedef _Container container_type;
-
-    _LIBCPP_INLINE_VISIBILITY explicit back_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {}
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator=(const typename _Container::value_type& __value_)
-        {container->push_back(__value_); return *this;}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator=(typename _Container::value_type&& __value_)
-        {container->push_back(_VSTD::move(__value_)); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator*()     {return *this;}
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator++()    {return *this;}
-    _LIBCPP_INLINE_VISIBILITY back_insert_iterator  operator++(int) {return *this;}
-};
-
-template <class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-back_insert_iterator<_Container>
-back_inserter(_Container& __x)
-{
-    return back_insert_iterator<_Container>(__x);
-}
-
-template <class _Container>
-class _LIBCPP_TYPE_VIS_ONLY front_insert_iterator
-    : public iterator<output_iterator_tag,
-                      void,
-                      void,
-                      void,
-                      front_insert_iterator<_Container>&>
-{
-protected:
-    _Container* container;
-public:
-    typedef _Container container_type;
-
-    _LIBCPP_INLINE_VISIBILITY explicit front_insert_iterator(_Container& __x) : container(_VSTD::addressof(__x)) {}
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator=(const typename _Container::value_type& __value_)
-        {container->push_front(__value_); return *this;}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator=(typename _Container::value_type&& __value_)
-        {container->push_front(_VSTD::move(__value_)); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator*()     {return *this;}
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator& operator++()    {return *this;}
-    _LIBCPP_INLINE_VISIBILITY front_insert_iterator  operator++(int) {return *this;}
-};
-
-template <class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-front_insert_iterator<_Container>
-front_inserter(_Container& __x)
-{
-    return front_insert_iterator<_Container>(__x);
-}
-
-template <class _Container>
-class _LIBCPP_TYPE_VIS_ONLY insert_iterator
-    : public iterator<output_iterator_tag,
-                      void,
-                      void,
-                      void,
-                      insert_iterator<_Container>&>
-{
-protected:
-    _Container* container;
-    typename _Container::iterator iter;
-public:
-    typedef _Container container_type;
-
-    _LIBCPP_INLINE_VISIBILITY insert_iterator(_Container& __x, typename _Container::iterator __i)
-        : container(_VSTD::addressof(__x)), iter(__i) {}
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator=(const typename _Container::value_type& __value_)
-        {iter = container->insert(iter, __value_); ++iter; return *this;}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator=(typename _Container::value_type&& __value_)
-        {iter = container->insert(iter, _VSTD::move(__value_)); ++iter; return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator*()        {return *this;}
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator++()       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY insert_iterator& operator++(int)    {return *this;}
-};
-
-template <class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-insert_iterator<_Container>
-inserter(_Container& __x, typename _Container::iterator __i)
-{
-    return insert_iterator<_Container>(__x, __i);
-}
-
-template <class _Tp, class _CharT = char,
-          class _Traits = char_traits<_CharT>, class _Distance = ptrdiff_t>
-class _LIBCPP_TYPE_VIS_ONLY istream_iterator
-    : public iterator<input_iterator_tag, _Tp, _Distance, const _Tp*, const _Tp&>
-{
-public:
-    typedef _CharT char_type;
-    typedef _Traits traits_type;
-    typedef basic_istream<_CharT,_Traits> istream_type;
-private:
-    istream_type* __in_stream_;
-    _Tp __value_;
-public:
-    _LIBCPP_INLINE_VISIBILITY istream_iterator() : __in_stream_(0) {}
-    _LIBCPP_INLINE_VISIBILITY istream_iterator(istream_type& __s) : __in_stream_(&__s)
-        {
-            if (!(*__in_stream_ >> __value_))
-                __in_stream_ = 0;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY const _Tp& operator*() const {return __value_;}
-    _LIBCPP_INLINE_VISIBILITY const _Tp* operator->() const {return &(operator*());}
-    _LIBCPP_INLINE_VISIBILITY istream_iterator& operator++()
-        {
-            if (!(*__in_stream_ >> __value_))
-                __in_stream_ = 0;
-            return *this;
-        }
-    _LIBCPP_INLINE_VISIBILITY istream_iterator  operator++(int)
-        {istream_iterator __t(*this); ++(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const istream_iterator& __x, const istream_iterator& __y)
-        {return __x.__in_stream_ == __y.__in_stream_;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const istream_iterator& __x, const istream_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _Tp, class _CharT = char, class _Traits = char_traits<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY ostream_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-{
-public:
-    typedef _CharT char_type;
-    typedef _Traits traits_type;
-    typedef basic_ostream<_CharT,_Traits> ostream_type;
-private:
-    ostream_type* __out_stream_;
-    const char_type* __delim_;
-public:
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator(ostream_type& __s)
-        : __out_stream_(&__s), __delim_(0) {}
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator(ostream_type& __s, const _CharT* __delimiter)
-        : __out_stream_(&__s), __delim_(__delimiter) {}
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator& operator=(const _Tp& __value_)
-        {
-            *__out_stream_ << __value_;
-            if (__delim_)
-                *__out_stream_ << __delim_;
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator& operator*()     {return *this;}
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator& operator++()    {return *this;}
-    _LIBCPP_INLINE_VISIBILITY ostream_iterator& operator++(int) {return *this;}
-};
-
-template<class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY istreambuf_iterator
-    : public iterator<input_iterator_tag, _CharT,
-                      typename _Traits::off_type, _CharT*,
-                      _CharT>
-{
-public:
-    typedef _CharT                          char_type;
-    typedef _Traits                         traits_type;
-    typedef typename _Traits::int_type      int_type;
-    typedef basic_streambuf<_CharT,_Traits> streambuf_type;
-    typedef basic_istream<_CharT,_Traits>   istream_type;
-private:
-    mutable streambuf_type* __sbuf_;
-
-    class __proxy
-    {
-        char_type __keep_;
-        streambuf_type* __sbuf_;
-        _LIBCPP_INLINE_VISIBILITY __proxy(char_type __c, streambuf_type* __s)
-            : __keep_(__c), __sbuf_(__s) {}
-        friend class istreambuf_iterator;
-    public:
-        _LIBCPP_INLINE_VISIBILITY char_type operator*() const {return __keep_;}
-    };
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __test_for_eof() const
-    {
-        if (__sbuf_ && traits_type::eq_int_type(__sbuf_->sgetc(), traits_type::eof()))
-            __sbuf_ = 0;
-        return __sbuf_ == 0;
-    }
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR istreambuf_iterator() _NOEXCEPT : __sbuf_(0) {}
-    _LIBCPP_INLINE_VISIBILITY istreambuf_iterator(istream_type& __s) _NOEXCEPT
-        : __sbuf_(__s.rdbuf()) {}
-    _LIBCPP_INLINE_VISIBILITY istreambuf_iterator(streambuf_type* __s) _NOEXCEPT
-        : __sbuf_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY istreambuf_iterator(const __proxy& __p) _NOEXCEPT
-        : __sbuf_(__p.__sbuf_) {}
-
-    _LIBCPP_INLINE_VISIBILITY char_type  operator*() const
-        {return static_cast<char_type>(__sbuf_->sgetc());}
-    _LIBCPP_INLINE_VISIBILITY char_type* operator->() const {return nullptr;}
-    _LIBCPP_INLINE_VISIBILITY istreambuf_iterator& operator++()
-        {
-            __sbuf_->sbumpc();
-            return *this;
-        }
-    _LIBCPP_INLINE_VISIBILITY __proxy              operator++(int)
-        {
-            return __proxy(__sbuf_->sbumpc(), __sbuf_);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY bool equal(const istreambuf_iterator& __b) const
-        {return __test_for_eof() == __b.__test_for_eof();}
-};
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator==(const istreambuf_iterator<_CharT,_Traits>& __a,
-                const istreambuf_iterator<_CharT,_Traits>& __b)
-                {return __a.equal(__b);}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator!=(const istreambuf_iterator<_CharT,_Traits>& __a,
-                const istreambuf_iterator<_CharT,_Traits>& __b)
-                {return !__a.equal(__b);}
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY ostreambuf_iterator
-    : public iterator<output_iterator_tag, void, void, void, void>
-{
-public:
-    typedef _CharT                          char_type;
-    typedef _Traits                         traits_type;
-    typedef basic_streambuf<_CharT,_Traits> streambuf_type;
-    typedef basic_ostream<_CharT,_Traits>   ostream_type;
-private:
-    streambuf_type* __sbuf_;
-public:
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator(ostream_type& __s) _NOEXCEPT
-        : __sbuf_(__s.rdbuf()) {}
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator(streambuf_type* __s) _NOEXCEPT
-        : __sbuf_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator=(_CharT __c)
-        {
-            if (__sbuf_ && traits_type::eq_int_type(__sbuf_->sputc(__c), traits_type::eof()))
-                __sbuf_ = 0;
-            return *this;
-        }
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator*()     {return *this;}
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator++()    {return *this;}
-    _LIBCPP_INLINE_VISIBILITY ostreambuf_iterator& operator++(int) {return *this;}
-    _LIBCPP_INLINE_VISIBILITY bool failed() const _NOEXCEPT {return __sbuf_ == 0;}
-
-#if !defined(__APPLE__) || \
-    (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
-    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-
-    template <class _Ch, class _Tr>
-    friend
-    _LIBCPP_HIDDEN
-    ostreambuf_iterator<_Ch, _Tr>
-    __pad_and_output(ostreambuf_iterator<_Ch, _Tr> __s,
-                     const _Ch* __ob, const _Ch* __op, const _Ch* __oe,
-                     ios_base& __iob, _Ch __fl);
-#endif
-};
-
-template <class _Iter>
-class _LIBCPP_TYPE_VIS_ONLY move_iterator
-{
-private:
-    _Iter __i;
-public:
-    typedef _Iter                                            iterator_type;
-    typedef typename iterator_traits<iterator_type>::iterator_category iterator_category;
-    typedef typename iterator_traits<iterator_type>::value_type value_type;
-    typedef typename iterator_traits<iterator_type>::difference_type difference_type;
-    typedef typename iterator_traits<iterator_type>::pointer pointer;
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    typedef value_type&& reference;
-#else
-    typedef typename iterator_traits<iterator_type>::reference reference;
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY move_iterator() : __i() {}
-    _LIBCPP_INLINE_VISIBILITY explicit move_iterator(_Iter __x) : __i(__x) {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY move_iterator(const move_iterator<_Up>& __u)
-        : __i(__u.base()) {}
-    _LIBCPP_INLINE_VISIBILITY _Iter base() const {return __i;}
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const {
-      return static_cast<reference>(*__i);
-    }
-    _LIBCPP_INLINE_VISIBILITY pointer  operator->() const {
-      typename iterator_traits<iterator_type>::reference __ref = *__i;
-      return &__ref;
-    }
-    _LIBCPP_INLINE_VISIBILITY move_iterator& operator++() {++__i; return *this;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator  operator++(int)
-        {move_iterator __tmp(*this); ++__i; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator& operator--() {--__i; return *this;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator  operator--(int)
-        {move_iterator __tmp(*this); --__i; return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator  operator+ (difference_type __n) const
-        {return move_iterator(__i + __n);}
-    _LIBCPP_INLINE_VISIBILITY move_iterator& operator+=(difference_type __n)
-        {__i += __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY move_iterator  operator- (difference_type __n) const
-        {return move_iterator(__i - __n);}
-    _LIBCPP_INLINE_VISIBILITY move_iterator& operator-=(difference_type __n)
-        {__i -= __n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reference         operator[](difference_type __n) const
-    {
-      return static_cast<reference>(__i[__n]);
-    }
-};
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() == __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() < __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() != __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() > __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() >= __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() <= __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename move_iterator<_Iter1>::difference_type
-operator-(const move_iterator<_Iter1>& __x, const move_iterator<_Iter2>& __y)
-{
-    return __x.base() - __y.base();
-}
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-move_iterator<_Iter>
-operator+(typename move_iterator<_Iter>::difference_type __n, const move_iterator<_Iter>& __x)
-{
-    return move_iterator<_Iter>(__x.base() + __n);
-}
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-move_iterator<_Iter>
-make_move_iterator(_Iter __i)
-{
-    return move_iterator<_Iter>(__i);
-}
-
-// __wrap_iter
-
-template <class _Iter> class __wrap_iter;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter1, class _Iter2>
-_LIBCPP_INLINE_VISIBILITY
-typename __wrap_iter<_Iter1>::difference_type
-operator-(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-template <class _Iter>
-_LIBCPP_INLINE_VISIBILITY
-__wrap_iter<_Iter>
-operator+(typename __wrap_iter<_Iter>::difference_type, __wrap_iter<_Iter>) _NOEXCEPT;
-
-template <class _Ip, class _Op> _Op _LIBCPP_INLINE_VISIBILITY copy(_Ip, _Ip, _Op);
-template <class _B1, class _B2> _B2 _LIBCPP_INLINE_VISIBILITY copy_backward(_B1, _B1, _B2);
-template <class _Ip, class _Op> _Op _LIBCPP_INLINE_VISIBILITY move(_Ip, _Ip, _Op);
-template <class _B1, class _B2> _B2 _LIBCPP_INLINE_VISIBILITY move_backward(_B1, _B1, _B2);
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_trivially_copy_assignable<_Tp>::value,
-    _Tp*
->::type
-__unwrap_iter(__wrap_iter<_Tp*>);
-
-template <class _Iter>
-class __wrap_iter
-{
-public:
-    typedef _Iter                                                      iterator_type;
-    typedef typename iterator_traits<iterator_type>::iterator_category iterator_category;
-    typedef typename iterator_traits<iterator_type>::value_type        value_type;
-    typedef typename iterator_traits<iterator_type>::difference_type   difference_type;
-    typedef typename iterator_traits<iterator_type>::pointer           pointer;
-    typedef typename iterator_traits<iterator_type>::reference         reference;
-private:
-    iterator_type __i;
-public:
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter() _NOEXCEPT
-#if _LIBCPP_STD_VER > 11
-                : __i{}
-#endif
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY __wrap_iter(const __wrap_iter<_Up>& __u,
-        typename enable_if<is_convertible<_Up, iterator_type>::value>::type* = 0) _NOEXCEPT
-        : __i(__u.base())
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__iterator_copy(this, &__u);
-#endif
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    __wrap_iter(const __wrap_iter& __x)
-        : __i(__x.base())
-    {
-        __get_db()->__iterator_copy(this, &__x);
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __wrap_iter& operator=(const __wrap_iter& __x)
-    {
-        if (this != &__x)
-        {
-            __get_db()->__iterator_copy(this, &__x);
-            __i = __x.__i;
-        }
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    ~__wrap_iter()
-    {
-        __get_db()->__erase_i(this);
-    }
-#endif
-    _LIBCPP_INLINE_VISIBILITY reference operator*() const _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable iterator");
-#endif
-        return *__i;
-    }
-    _LIBCPP_INLINE_VISIBILITY pointer  operator->() const _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable iterator");
-#endif
-        return (pointer)&reinterpret_cast<const volatile char&>(*__i);
-    }
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter& operator++() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable iterator");
-#endif
-        ++__i;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter  operator++(int) _NOEXCEPT
-        {__wrap_iter __tmp(*this); ++(*this); return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter& operator--() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__decrementable(this),
-                       "Attempted to decrement non-decrementable iterator");
-#endif
-        --__i;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter  operator--(int) _NOEXCEPT
-        {__wrap_iter __tmp(*this); --(*this); return __tmp;}
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter  operator+ (difference_type __n) const _NOEXCEPT
-        {__wrap_iter __w(*this); __w += __n; return __w;}
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter& operator+=(difference_type __n) _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__addable(this, __n),
-                   "Attempted to add/subtract iterator outside of valid range");
-#endif
-        __i += __n;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter  operator- (difference_type __n) const _NOEXCEPT
-        {return *this + (-__n);}
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter& operator-=(difference_type __n) _NOEXCEPT
-        {*this += -__n; return *this;}
-    _LIBCPP_INLINE_VISIBILITY reference        operator[](difference_type __n) const _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__subscriptable(this, __n),
-                   "Attempted to subscript iterator outside of valid range");
-#endif
-        return __i[__n];
-    }
-
-    _LIBCPP_INLINE_VISIBILITY iterator_type base() const _NOEXCEPT {return __i;}
-
-private:
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter(const void* __p, iterator_type __x) : __i(__x)
-    {
-        __get_db()->__insert_ic(this, __p);
-    }
-#else
-    _LIBCPP_INLINE_VISIBILITY __wrap_iter(iterator_type __x) _NOEXCEPT : __i(__x) {}
-#endif
-
-    template <class _Up> friend class __wrap_iter;
-    template <class _CharT, class _Traits, class _Alloc> friend class basic_string;
-    template <class _Tp, class _Alloc> friend class vector;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator==(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator<(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator!=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator>(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator>=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    bool
-    operator<=(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1, class _Iter2>
-    friend
-    typename __wrap_iter<_Iter1>::difference_type
-    operator-(const __wrap_iter<_Iter1>&, const __wrap_iter<_Iter2>&) _NOEXCEPT;
-
-    template <class _Iter1>
-    friend
-    __wrap_iter<_Iter1>
-    operator+(typename __wrap_iter<_Iter1>::difference_type, __wrap_iter<_Iter1>) _NOEXCEPT;
-
-    template <class _Ip, class _Op> friend _Op copy(_Ip, _Ip, _Op);
-    template <class _B1, class _B2> friend _B2 copy_backward(_B1, _B1, _B2);
-    template <class _Ip, class _Op> friend _Op move(_Ip, _Ip, _Op);
-    template <class _B1, class _B2> friend _B2 move_backward(_B1, _B1, _B2);
-
-    template <class _Tp>
-    friend
-    typename enable_if
-    <
-        is_trivially_copy_assignable<_Tp>::value,
-        _Tp*
-    >::type
-    __unwrap_iter(__wrap_iter<_Tp*>);
-};
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return __x.base() == __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__less_than_comparable(&__x, &__y),
-                   "Attempted to compare incomparable iterators");
-#endif
-    return __x.base() < __y.base();
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return !(__x == __y);
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return __y < __x;
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return !(__x < __y);
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-    return !(__y < __x);
-}
-
-template <class _Iter1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
-{
-    return !(__x == __y);
-}
-
-template <class _Iter1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
-{
-    return __y < __x;
-}
-
-template <class _Iter1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
-{
-    return !(__x < __y);
-}
-
-template <class _Iter1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter1>& __y) _NOEXCEPT
-{
-    return !(__y < __x);
-}
-
-template <class _Iter1, class _Iter2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __wrap_iter<_Iter1>::difference_type
-operator-(const __wrap_iter<_Iter1>& __x, const __wrap_iter<_Iter2>& __y) _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__less_than_comparable(&__x, &__y),
-                   "Attempted to subtract incompatible iterators");
-#endif
-    return __x.base() - __y.base();
-}
-
-template <class _Iter>
-inline _LIBCPP_INLINE_VISIBILITY
-__wrap_iter<_Iter>
-operator+(typename __wrap_iter<_Iter>::difference_type __n,
-          __wrap_iter<_Iter> __x) _NOEXCEPT
-{
-    __x += __n;
-    return __x;
-}
-
-template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp*
-begin(_Tp (&__array)[_Np])
-{
-    return __array;
-}
-
-template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp*
-end(_Tp (&__array)[_Np])
-{
-    return __array + _Np;
-}
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN)
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-begin(_Cp& __c) -> decltype(__c.begin())
-{
-    return __c.begin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-begin(const _Cp& __c) -> decltype(__c.begin())
-{
-    return __c.begin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-end(_Cp& __c) -> decltype(__c.end())
-{
-    return __c.end();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto
-end(const _Cp& __c) -> decltype(__c.end())
-{
-    return __c.end();
-}
-
-#if _LIBCPP_STD_VER > 11
-
-template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<_Tp*> rbegin(_Tp (&__array)[_Np])
-{
-    return reverse_iterator<_Tp*>(__array + _Np);
-}
-
-template <class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<_Tp*> rend(_Tp (&__array)[_Np])
-{
-    return reverse_iterator<_Tp*>(__array);
-}
-
-template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<const _Ep*> rbegin(initializer_list<_Ep> __il)
-{
-    return reverse_iterator<const _Ep*>(__il.end());
-}
-
-template <class _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-reverse_iterator<const _Ep*> rend(initializer_list<_Ep> __il)
-{
-    return reverse_iterator<const _Ep*>(__il.begin());
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-auto cbegin(const _Cp& __c) -> decltype(begin(__c))
-{
-    return begin(__c);
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-auto cend(const _Cp& __c) -> decltype(end(__c))
-{
-    return end(__c);
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto rbegin(_Cp& __c) -> decltype(__c.rbegin())
-{
-    return __c.rbegin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto rbegin(const _Cp& __c) -> decltype(__c.rbegin())
-{
-    return __c.rbegin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto rend(_Cp& __c) -> decltype(__c.rend())
-{
-    return __c.rend();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto rend(const _Cp& __c) -> decltype(__c.rend())
-{
-    return __c.rend();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto crbegin(const _Cp& __c) -> decltype(rbegin(__c))
-{
-    return rbegin(__c);
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-auto crend(const _Cp& __c) -> decltype(rend(__c))
-{
-    return rend(__c);
-}
-
-#endif
-
-
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN)
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename _Cp::iterator
-begin(_Cp& __c)
-{
-    return __c.begin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename _Cp::const_iterator
-begin(const _Cp& __c)
-{
-    return __c.begin();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename _Cp::iterator
-end(_Cp& __c)
-{
-    return __c.end();
-}
-
-template <class _Cp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename _Cp::const_iterator
-end(const _Cp& __c)
-{
-    return __c.end();
-}
-
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_TRAILING_RETURN)
-
-#if _LIBCPP_STD_VER > 14
-template <class _C>
-constexpr auto size(const _C& __c) -> decltype(__c.size()) { return __c.size(); }
-
-template <class _Tp, size_t _N>
-constexpr size_t size(const _Tp (&__array)[_N]) noexcept { return _N; }
-
-template <class _C>
-constexpr auto empty(const _C& __c) -> decltype(__c.empty()) { return __c.empty(); }
-
-template <class _Tp, size_t _N>
-constexpr bool empty(const _Tp (&__array)[_N]) noexcept { return false; }
-
-template <class _Ep>
-constexpr bool empty(initializer_list<_Ep> __il) noexcept { return __il.size() == 0; }
-
-template <class _C> constexpr
-auto data(_C& __c) -> decltype(__c.data()) { return __c.data(); }
-
-template <class _C> constexpr
-auto data(const _C& __c) -> decltype(__c.data()) { return __c.data(); }
-
-template <class _Tp, size_t _N>
-constexpr _Tp* data(_Tp (&__array)[_N]) noexcept { return __array; }
-
-template <class _Ep>
-constexpr const _Ep* data(initializer_list<_Ep> __il) noexcept { return __il.begin(); }
-#endif
-
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_ITERATOR
diff --git a/include.new/c++/v1/tr1/limits b/include.new/c++/v1/tr1/limits
deleted file mode 100644
index ce967ea..0000000
--- a/include.new/c++/v1/tr1/limits
+++ /dev/null
@@ -1,813 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- limits ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_LIMITS
-#define _LIBCPP_LIMITS
-
-/*
-    limits synopsis
-
-namespace std
-{
-
-template<class T>
-class numeric_limits
-{
-public:
-    static constexpr bool is_specialized = false;
-    static constexpr T min() noexcept;
-    static constexpr T max() noexcept;
-    static constexpr T lowest() noexcept;
-
-    static constexpr int  digits = 0;
-    static constexpr int  digits10 = 0;
-    static constexpr int  max_digits10 = 0;
-    static constexpr bool is_signed = false;
-    static constexpr bool is_integer = false;
-    static constexpr bool is_exact = false;
-    static constexpr int  radix = 0;
-    static constexpr T epsilon() noexcept;
-    static constexpr T round_error() noexcept;
-
-    static constexpr int  min_exponent = 0;
-    static constexpr int  min_exponent10 = 0;
-    static constexpr int  max_exponent = 0;
-    static constexpr int  max_exponent10 = 0;
-
-    static constexpr bool has_infinity = false;
-    static constexpr bool has_quiet_NaN = false;
-    static constexpr bool has_signaling_NaN = false;
-    static constexpr float_denorm_style has_denorm = denorm_absent;
-    static constexpr bool has_denorm_loss = false;
-    static constexpr T infinity() noexcept;
-    static constexpr T quiet_NaN() noexcept;
-    static constexpr T signaling_NaN() noexcept;
-    static constexpr T denorm_min() noexcept;
-
-    static constexpr bool is_iec559 = false;
-    static constexpr bool is_bounded = false;
-    static constexpr bool is_modulo = false;
-
-    static constexpr bool traps = false;
-    static constexpr bool tinyness_before = false;
-    static constexpr float_round_style round_style = round_toward_zero;
-};
-
-enum float_round_style
-{
-    round_indeterminate       = -1,
-    round_toward_zero         =  0,
-    round_to_nearest          =  1,
-    round_toward_infinity     =  2,
-    round_toward_neg_infinity =  3
-};
-
-enum float_denorm_style
-{
-    denorm_indeterminate = -1,
-    denorm_absent = 0,
-    denorm_present = 1
-};
-
-template<> class numeric_limits<cv bool>;
-
-template<> class numeric_limits<cv char>;
-template<> class numeric_limits<cv signed char>;
-template<> class numeric_limits<cv unsigned char>;
-template<> class numeric_limits<cv wchar_t>;
-template<> class numeric_limits<cv char16_t>;
-template<> class numeric_limits<cv char32_t>;
-
-template<> class numeric_limits<cv short>;
-template<> class numeric_limits<cv int>;
-template<> class numeric_limits<cv long>;
-template<> class numeric_limits<cv long long>;
-template<> class numeric_limits<cv unsigned short>;
-template<> class numeric_limits<cv unsigned int>;
-template<> class numeric_limits<cv unsigned long>;
-template<> class numeric_limits<cv unsigned long long>;
-
-template<> class numeric_limits<cv float>;
-template<> class numeric_limits<cv double>;
-template<> class numeric_limits<cv long double>;
-
-}  // std
-
-*/
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#include <__config>
-#include <type_traits>
-
-#include <__undef_min_max>
-
-#if defined(_LIBCPP_MSVCRT)
-#include "support/win32/limits_win32.h"
-#endif // _LIBCPP_MSVCRT
-
-#if defined(__IBMCPP__)
-#include "support/ibm/limits.h"
-#endif // __IBMCPP__
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-enum float_round_style
-{
-    round_indeterminate       = -1,
-    round_toward_zero         =  0,
-    round_to_nearest          =  1,
-    round_toward_infinity     =  2,
-    round_toward_neg_infinity =  3
-};
-
-enum float_denorm_style
-{
-    denorm_indeterminate = -1,
-    denorm_absent = 0,
-    denorm_present = 1
-};
-
-template <class _Tp, bool = is_arithmetic<_Tp>::value>
-class __libcpp_numeric_limits
-{
-protected:
-    typedef _Tp type;
-
-    static _LIBCPP_CONSTEXPR const  bool is_specialized = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return type();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = 0;
-    static _LIBCPP_CONSTEXPR const int  digits10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 0;
-    static _LIBCPP_CONSTEXPR const bool is_signed = false;
-    static _LIBCPP_CONSTEXPR const bool is_integer = false;
-    static _LIBCPP_CONSTEXPR const bool is_exact = false;
-    static _LIBCPP_CONSTEXPR const int  radix = 0;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return type();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = 0;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = false;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = false;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = false;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_absent;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return type();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return type();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = false;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_toward_zero;
-};
-
-template <class _Tp, int digits, bool is_signed>
-struct __libcpp_compute_min
-{
-    static _LIBCPP_CONSTEXPR const _Tp value = _Tp(_Tp(1) << digits);
-};
-
-template <class _Tp, int digits>
-struct __libcpp_compute_min<_Tp, digits, false>
-{
-    static _LIBCPP_CONSTEXPR const _Tp value = _Tp(0);
-};
-
-template <class _Tp>
-class __libcpp_numeric_limits<_Tp, true>
-{
-protected:
-    typedef _Tp type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = type(-1) < type(0);
-    static _LIBCPP_CONSTEXPR const int  digits = static_cast<int>(sizeof(type) * __CHAR_BIT__ - is_signed);
-    static _LIBCPP_CONSTEXPR const int  digits10 = digits * 3 / 10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 0;
-    static _LIBCPP_CONSTEXPR const type __min = __libcpp_compute_min<type, digits, is_signed>::value;
-    static _LIBCPP_CONSTEXPR const type __max = is_signed ? type(type(~0) ^ __min) : type(~0);
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __min;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __max;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = true;
-    static _LIBCPP_CONSTEXPR const bool is_exact = true;
-    static _LIBCPP_CONSTEXPR const int  radix = 2;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return type(0);}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = 0;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = false;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = false;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = false;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_absent;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return type(0);}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = !_VSTD::is_signed<_Tp>::value;
-
-#if defined(__i386__) || defined(__x86_64__) || defined(__pnacl__)
-    static _LIBCPP_CONSTEXPR const bool traps = true;
-#else
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-#endif
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_toward_zero;
-};
-
-template <>
-class __libcpp_numeric_limits<bool, true>
-{
-protected:
-    typedef bool type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = false;
-    static _LIBCPP_CONSTEXPR const int  digits = 1;
-    static _LIBCPP_CONSTEXPR const int  digits10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 0;
-    static _LIBCPP_CONSTEXPR const type __min = false;
-    static _LIBCPP_CONSTEXPR const type __max = true;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __min;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __max;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = true;
-    static _LIBCPP_CONSTEXPR const bool is_exact = true;
-    static _LIBCPP_CONSTEXPR const int  radix = 2;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return type(0);}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = 0;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = 0;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = false;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = false;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = false;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_absent;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return type(0);}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return type(0);}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_toward_zero;
-};
-
-template <>
-class __libcpp_numeric_limits<float, true>
-{
-protected:
-    typedef float type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = true;
-    static _LIBCPP_CONSTEXPR const int  digits = __FLT_MANT_DIG__;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __FLT_DIG__;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 2+(digits * 30103)/100000;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __FLT_MIN__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __FLT_MAX__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return -max();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = false;
-    static _LIBCPP_CONSTEXPR const bool is_exact = false;
-    static _LIBCPP_CONSTEXPR const int  radix = __FLT_RADIX__;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __FLT_EPSILON__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return 0.5F;}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __FLT_MIN_EXP__;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __FLT_MIN_10_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __FLT_MAX_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __FLT_MAX_10_EXP__;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = true;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = true;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = true;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_present;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __builtin_huge_valf();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __builtin_nanf("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansf("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __FLT_DENORM_MIN__;}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_to_nearest;
-};
-
-template <>
-class __libcpp_numeric_limits<double, true>
-{
-protected:
-    typedef double type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = true;
-    static _LIBCPP_CONSTEXPR const int  digits = __DBL_MANT_DIG__;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __DBL_DIG__;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 2+(digits * 30103)/100000;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __DBL_MIN__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __DBL_MAX__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return -max();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = false;
-    static _LIBCPP_CONSTEXPR const bool is_exact = false;
-    static _LIBCPP_CONSTEXPR const int  radix = __FLT_RADIX__;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __DBL_EPSILON__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return 0.5;}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __DBL_MIN_EXP__;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __DBL_MIN_10_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __DBL_MAX_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __DBL_MAX_10_EXP__;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = true;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = true;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = true;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_present;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __builtin_huge_val();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __builtin_nan("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nans("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __DBL_DENORM_MIN__;}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_to_nearest;
-};
-
-template <>
-class __libcpp_numeric_limits<long double, true>
-{
-protected:
-    typedef long double type;
-
-    static _LIBCPP_CONSTEXPR const bool is_specialized = true;
-
-    static _LIBCPP_CONSTEXPR const bool is_signed = true;
-    static _LIBCPP_CONSTEXPR const int  digits = __LDBL_MANT_DIG__;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __LDBL_DIG__;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = 2+(digits * 30103)/100000;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __LDBL_MIN__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __LDBL_MAX__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return -max();}
-
-    static _LIBCPP_CONSTEXPR const bool is_integer = false;
-    static _LIBCPP_CONSTEXPR const bool is_exact = false;
-    static _LIBCPP_CONSTEXPR const int  radix = __FLT_RADIX__;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __LDBL_EPSILON__;}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return 0.5;}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __LDBL_MIN_EXP__;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __LDBL_MIN_10_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __LDBL_MAX_EXP__;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __LDBL_MAX_10_EXP__;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = true;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = true;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = true;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = denorm_present;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = false;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __builtin_huge_vall();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __builtin_nanl("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;}
-
-#if (defined(__ppc__) || defined(__ppc64__))
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
-#else
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
-#endif
-    static _LIBCPP_CONSTEXPR const bool is_bounded = true;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = false;
-
-    static _LIBCPP_CONSTEXPR const bool traps = false;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = false;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = round_to_nearest;
-};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY numeric_limits
-    : private __libcpp_numeric_limits<typename remove_cv<_Tp>::type>
-{
-    typedef __libcpp_numeric_limits<typename remove_cv<_Tp>::type> __base;
-    typedef typename __base::type type;
-public:
-    static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __base::min();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __base::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return __base::lowest();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = __base::digits;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __base::digits10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = __base::max_digits10;
-    static _LIBCPP_CONSTEXPR const bool is_signed = __base::is_signed;
-    static _LIBCPP_CONSTEXPR const bool is_integer = __base::is_integer;
-    static _LIBCPP_CONSTEXPR const bool is_exact = __base::is_exact;
-    static _LIBCPP_CONSTEXPR const int  radix = __base::radix;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __base::epsilon();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return __base::round_error();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __base::min_exponent;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __base::min_exponent10;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __base::max_exponent;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __base::max_exponent10;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = __base::has_infinity;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = __base::has_quiet_NaN;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = __base::has_signaling_NaN;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = __base::has_denorm;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = __base::has_denorm_loss;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __base::infinity();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __base::quiet_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __base::signaling_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __base::denorm_min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = __base::is_iec559;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = __base::is_bounded;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = __base::is_modulo;
-
-    static _LIBCPP_CONSTEXPR const bool traps = __base::traps;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = __base::tinyness_before;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = __base::round_style;
-};
-
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_specialized;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::digits;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::max_digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_signed;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_integer;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_exact;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::radix;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::min_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::min_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::max_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<_Tp>::max_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::has_infinity;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::has_quiet_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::has_signaling_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_denorm_style numeric_limits<_Tp>::has_denorm;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::has_denorm_loss;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_iec559;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_bounded;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::is_modulo;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::traps;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<_Tp>::tinyness_before;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_round_style numeric_limits<_Tp>::round_style;
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY numeric_limits<const _Tp>
-    : private numeric_limits<_Tp>
-{
-    typedef numeric_limits<_Tp> __base;
-    typedef _Tp type;
-public:
-    static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __base::min();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __base::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return __base::lowest();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = __base::digits;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __base::digits10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = __base::max_digits10;
-    static _LIBCPP_CONSTEXPR const bool is_signed = __base::is_signed;
-    static _LIBCPP_CONSTEXPR const bool is_integer = __base::is_integer;
-    static _LIBCPP_CONSTEXPR const bool is_exact = __base::is_exact;
-    static _LIBCPP_CONSTEXPR const int  radix = __base::radix;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __base::epsilon();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return __base::round_error();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __base::min_exponent;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __base::min_exponent10;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __base::max_exponent;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __base::max_exponent10;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = __base::has_infinity;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = __base::has_quiet_NaN;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = __base::has_signaling_NaN;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = __base::has_denorm;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = __base::has_denorm_loss;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __base::infinity();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __base::quiet_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __base::signaling_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __base::denorm_min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = __base::is_iec559;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = __base::is_bounded;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = __base::is_modulo;
-
-    static _LIBCPP_CONSTEXPR const bool traps = __base::traps;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = __base::tinyness_before;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = __base::round_style;
-};
-
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_specialized;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::digits;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::max_digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_signed;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_integer;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_exact;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::radix;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::min_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::min_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::max_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const _Tp>::max_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::has_infinity;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::has_quiet_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::has_signaling_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_denorm_style numeric_limits<const _Tp>::has_denorm;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::has_denorm_loss;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_iec559;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_bounded;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::is_modulo;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::traps;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const _Tp>::tinyness_before;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_round_style numeric_limits<const _Tp>::round_style;
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY numeric_limits<volatile _Tp>
-    : private numeric_limits<_Tp>
-{
-    typedef numeric_limits<_Tp> __base;
-    typedef _Tp type;
-public:
-    static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __base::min();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __base::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return __base::lowest();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = __base::digits;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __base::digits10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = __base::max_digits10;
-    static _LIBCPP_CONSTEXPR const bool is_signed = __base::is_signed;
-    static _LIBCPP_CONSTEXPR const bool is_integer = __base::is_integer;
-    static _LIBCPP_CONSTEXPR const bool is_exact = __base::is_exact;
-    static _LIBCPP_CONSTEXPR const int  radix = __base::radix;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __base::epsilon();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return __base::round_error();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __base::min_exponent;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __base::min_exponent10;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __base::max_exponent;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __base::max_exponent10;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = __base::has_infinity;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = __base::has_quiet_NaN;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = __base::has_signaling_NaN;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = __base::has_denorm;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = __base::has_denorm_loss;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __base::infinity();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __base::quiet_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __base::signaling_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __base::denorm_min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = __base::is_iec559;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = __base::is_bounded;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = __base::is_modulo;
-
-    static _LIBCPP_CONSTEXPR const bool traps = __base::traps;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = __base::tinyness_before;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = __base::round_style;
-};
-
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_specialized;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::digits;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::max_digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_signed;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_integer;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_exact;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::radix;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::min_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::min_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::max_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<volatile _Tp>::max_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::has_infinity;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::has_quiet_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::has_signaling_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_denorm_style numeric_limits<volatile _Tp>::has_denorm;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::has_denorm_loss;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_iec559;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_bounded;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::is_modulo;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::traps;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<volatile _Tp>::tinyness_before;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_round_style numeric_limits<volatile _Tp>::round_style;
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY numeric_limits<const volatile _Tp>
-    : private numeric_limits<_Tp>
-{
-    typedef numeric_limits<_Tp> __base;
-    typedef _Tp type;
-public:
-    static _LIBCPP_CONSTEXPR const bool is_specialized = __base::is_specialized;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return __base::min();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type max() _NOEXCEPT {return __base::max();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type lowest() _NOEXCEPT {return __base::lowest();}
-
-    static _LIBCPP_CONSTEXPR const int  digits = __base::digits;
-    static _LIBCPP_CONSTEXPR const int  digits10 = __base::digits10;
-    static _LIBCPP_CONSTEXPR const int  max_digits10 = __base::max_digits10;
-    static _LIBCPP_CONSTEXPR const bool is_signed = __base::is_signed;
-    static _LIBCPP_CONSTEXPR const bool is_integer = __base::is_integer;
-    static _LIBCPP_CONSTEXPR const bool is_exact = __base::is_exact;
-    static _LIBCPP_CONSTEXPR const int  radix = __base::radix;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type epsilon() _NOEXCEPT {return __base::epsilon();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type round_error() _NOEXCEPT {return __base::round_error();}
-
-    static _LIBCPP_CONSTEXPR const int  min_exponent = __base::min_exponent;
-    static _LIBCPP_CONSTEXPR const int  min_exponent10 = __base::min_exponent10;
-    static _LIBCPP_CONSTEXPR const int  max_exponent = __base::max_exponent;
-    static _LIBCPP_CONSTEXPR const int  max_exponent10 = __base::max_exponent10;
-
-    static _LIBCPP_CONSTEXPR const bool has_infinity = __base::has_infinity;
-    static _LIBCPP_CONSTEXPR const bool has_quiet_NaN = __base::has_quiet_NaN;
-    static _LIBCPP_CONSTEXPR const bool has_signaling_NaN = __base::has_signaling_NaN;
-    static _LIBCPP_CONSTEXPR const float_denorm_style has_denorm = __base::has_denorm;
-    static _LIBCPP_CONSTEXPR const bool has_denorm_loss = __base::has_denorm_loss;
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type infinity() _NOEXCEPT {return __base::infinity();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return __base::quiet_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __base::signaling_NaN();}
-    _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __base::denorm_min();}
-
-    static _LIBCPP_CONSTEXPR const bool is_iec559 = __base::is_iec559;
-    static _LIBCPP_CONSTEXPR const bool is_bounded = __base::is_bounded;
-    static _LIBCPP_CONSTEXPR const bool is_modulo = __base::is_modulo;
-
-    static _LIBCPP_CONSTEXPR const bool traps = __base::traps;
-    static _LIBCPP_CONSTEXPR const bool tinyness_before = __base::tinyness_before;
-    static _LIBCPP_CONSTEXPR const float_round_style round_style = __base::round_style;
-};
-
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_specialized;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::digits;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::max_digits10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_signed;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_integer;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_exact;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::radix;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::min_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::min_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::max_exponent;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const int numeric_limits<const volatile _Tp>::max_exponent10;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::has_infinity;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::has_quiet_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::has_signaling_NaN;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_denorm_style numeric_limits<const volatile _Tp>::has_denorm;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::has_denorm_loss;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_iec559;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_bounded;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::is_modulo;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::traps;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const bool numeric_limits<const volatile _Tp>::tinyness_before;
-template <class _Tp>
-    _LIBCPP_CONSTEXPR const float_round_style numeric_limits<const volatile _Tp>::round_style;
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_LIMITS
diff --git a/include.new/c++/v1/tr1/list b/include.new/c++/v1/tr1/list
deleted file mode 100644
index 13f8a53..0000000
--- a/include.new/c++/v1/tr1/list
+++ /dev/null
@@ -1,2377 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- list ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_LIST
-#define _LIBCPP_LIST
-
-/*
-    list synopsis
-
-namespace std
-{
-
-template <class T, class Alloc = allocator<T> >
-class list
-{
-public:
-
-    // types:
-    typedef T value_type;
-    typedef Alloc allocator_type;
-    typedef typename allocator_type::reference reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::pointer pointer;
-    typedef typename allocator_type::const_pointer const_pointer;
-    typedef implementation-defined iterator;
-    typedef implementation-defined const_iterator;
-    typedef implementation-defined size_type;
-    typedef implementation-defined difference_type;
-    typedef reverse_iterator<iterator> reverse_iterator;
-    typedef reverse_iterator<const_iterator> const_reverse_iterator;
-
-    list()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit list(const allocator_type& a);
-    explicit list(size_type n);
-    explicit list(size_type n, const allocator_type& a); // C++14
-    list(size_type n, const value_type& value);
-    list(size_type n, const value_type& value, const allocator_type& a);
-    template <class Iter>
-        list(Iter first, Iter last);
-    template <class Iter>
-        list(Iter first, Iter last, const allocator_type& a);
-    list(const list& x);
-    list(const list&, const allocator_type& a);
-    list(list&& x)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    list(list&&, const allocator_type& a);
-    list(initializer_list<value_type>);
-    list(initializer_list<value_type>, const allocator_type& a);
-
-    ~list();
-
-    list& operator=(const list& x);
-    list& operator=(list&& x)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    list& operator=(initializer_list<value_type>);
-    template <class Iter>
-        void assign(Iter first, Iter last);
-    void assign(size_type n, const value_type& t);
-    void assign(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator end() noexcept;
-    const_iterator end() const noexcept;
-    reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
-
-    reference front();
-    const_reference front() const;
-    reference back();
-    const_reference back() const;
-
-    bool empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    template <class... Args>
-        void emplace_front(Args&&... args);
-    void pop_front();
-    template <class... Args>
-        void emplace_back(Args&&... args);
-    void pop_back();
-    void push_front(const value_type& x);
-    void push_front(value_type&& x);
-    void push_back(const value_type& x);
-    void push_back(value_type&& x);
-    template <class... Args>
-        iterator emplace(const_iterator position, Args&&... args);
-    iterator insert(const_iterator position, const value_type& x);
-    iterator insert(const_iterator position, value_type&& x);
-    iterator insert(const_iterator position, size_type n, const value_type& x);
-    template <class Iter>
-        iterator insert(const_iterator position, Iter first, Iter last);
-    iterator insert(const_iterator position, initializer_list<value_type> il);
-
-    iterator erase(const_iterator position);
-    iterator erase(const_iterator position, const_iterator last);
-
-    void resize(size_type sz);
-    void resize(size_type sz, const value_type& c);
-
-    void swap(list&)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-    void clear() noexcept;
-
-    void splice(const_iterator position, list& x);
-    void splice(const_iterator position, list&& x);
-    void splice(const_iterator position, list& x, const_iterator i);
-    void splice(const_iterator position, list&& x, const_iterator i);
-    void splice(const_iterator position, list& x, const_iterator first,
-                                                  const_iterator last);
-    void splice(const_iterator position, list&& x, const_iterator first,
-                                                  const_iterator last);
-
-    void remove(const value_type& value);
-    template <class Pred> void remove_if(Pred pred);
-    void unique();
-    template <class BinaryPredicate>
-        void unique(BinaryPredicate binary_pred);
-    void merge(list& x);
-    void merge(list&& x);
-    template <class Compare>
-        void merge(list& x, Compare comp);
-    template <class Compare>
-        void merge(list&& x, Compare comp);
-    void sort();
-    template <class Compare>
-        void sort(Compare comp);
-    void reverse() noexcept;
-};
-
-template <class T, class Alloc>
-    bool operator==(const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator< (const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator!=(const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator> (const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator>=(const list<T,Alloc>& x, const list<T,Alloc>& y);
-template <class T, class Alloc>
-    bool operator<=(const list<T,Alloc>& x, const list<T,Alloc>& y);
-
-template <class T, class Alloc>
-    void swap(list<T,Alloc>& x, list<T,Alloc>& y)
-         noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-
-#include <memory>
-#include <limits>
-#include <initializer_list>
-#include <iterator>
-#include <algorithm>
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _VoidPtr> struct __list_node;
-
-template <class _Tp, class _VoidPtr>
-struct __list_node_base
-{
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-        rebind<__list_node<_Tp, _VoidPtr> > pointer;
-#else
-        rebind<__list_node<_Tp, _VoidPtr> >::other pointer;
-#endif
-
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-        rebind<__list_node_base> __base_pointer;
-#else
-        rebind<__list_node_base>::other __base_pointer;
-#endif
-
-    pointer __prev_;
-    pointer __next_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_node_base() : __prev_(__self()), __next_(__self()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    pointer __self()
-    {
-        return static_cast<pointer>(pointer_traits<__base_pointer>::pointer_to(*this));
-    }
-};
-
-template <class _Tp, class _VoidPtr>
-struct __list_node
-    : public __list_node_base<_Tp, _VoidPtr>
-{
-    _Tp __value_;
-};
-
-template <class _Tp, class _Alloc> class _LIBCPP_TYPE_VIS_ONLY list;
-template <class _Tp, class _Alloc> class __list_imp;
-template <class _Tp, class _VoidPtr> class _LIBCPP_TYPE_VIS_ONLY __list_const_iterator;
-
-template <class _Tp, class _VoidPtr>
-class _LIBCPP_TYPE_VIS_ONLY __list_iterator
-{
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-        rebind<__list_node<_Tp, _VoidPtr> > __node_pointer;
-#else
-        rebind<__list_node<_Tp, _VoidPtr> >::other __node_pointer;
-#endif
-
-    __node_pointer __ptr_;
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __list_iterator(__node_pointer __p, const void* __c) _NOEXCEPT
-        : __ptr_(__p)
-    {
-        __get_db()->__insert_ic(this, __c);
-    }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __list_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
-#endif
-
-
-
-    template<class, class> friend class list;
-    template<class, class> friend class __list_imp;
-    template<class, class> friend class __list_const_iterator;
-public:
-    typedef bidirectional_iterator_tag       iterator_category;
-    typedef _Tp                              value_type;
-    typedef value_type&                      reference;
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                             pointer;
-    typedef typename pointer_traits<pointer>::difference_type difference_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator() _NOEXCEPT : __ptr_(nullptr)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator(const __list_iterator& __p)
-        : __ptr_(__p.__ptr_)
-    {
-        __get_db()->__iterator_copy(this, &__p);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__list_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator& operator=(const __list_iterator& __p)
-    {
-        if (this != &__p)
-        {
-            __get_db()->__iterator_copy(this, &__p);
-            __ptr_ = __p.__ptr_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable list::iterator");
-#endif
-        return __ptr_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable list::iterator");
-#endif
-        return pointer_traits<pointer>::pointer_to(__ptr_->__value_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable list::iterator");
-#endif
-        __ptr_ = __ptr_->__next_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator operator++(int) {__list_iterator __t(*this); ++(*this); return __t;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator& operator--()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__decrementable(this),
-                       "Attempted to decrement non-decrementable list::iterator");
-#endif
-        __ptr_ = __ptr_->__prev_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_iterator operator--(int) {__list_iterator __t(*this); --(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __list_iterator& __x, const __list_iterator& __y)
-    {
-        return __x.__ptr_ == __y.__ptr_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-     bool operator!=(const __list_iterator& __x, const __list_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _Tp, class _VoidPtr>
-class _LIBCPP_TYPE_VIS_ONLY __list_const_iterator
-{
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-        rebind<__list_node<_Tp, _VoidPtr> > __node_pointer;
-#else
-        rebind<__list_node<_Tp, _VoidPtr> >::other __node_pointer;
-#endif
-
-    __node_pointer __ptr_;
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __list_const_iterator(__node_pointer __p, const void* __c) _NOEXCEPT
-        : __ptr_(__p)
-    {
-        __get_db()->__insert_ic(this, __c);
-    }
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __list_const_iterator(__node_pointer __p) _NOEXCEPT : __ptr_(__p) {}
-#endif
-
-    template<class, class> friend class list;
-    template<class, class> friend class __list_imp;
-public:
-    typedef bidirectional_iterator_tag       iterator_category;
-    typedef _Tp                              value_type;
-    typedef const value_type&                reference;
-    typedef typename pointer_traits<_VoidPtr>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                             pointer;
-    typedef typename pointer_traits<pointer>::difference_type difference_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator() _NOEXCEPT : __ptr_(nullptr)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_i(this);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator(const __list_iterator<_Tp, _VoidPtr>& __p) _NOEXCEPT
-        : __ptr_(__p.__ptr_)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__iterator_copy(this, &__p);
-#endif
-    }
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator(const __list_const_iterator& __p)
-        : __ptr_(__p.__ptr_)
-    {
-        __get_db()->__iterator_copy(this, &__p);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__list_const_iterator()
-    {
-        __get_db()->__erase_i(this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator& operator=(const __list_const_iterator& __p)
-    {
-        if (this != &__p)
-        {
-            __get_db()->__iterator_copy(this, &__p);
-            __ptr_ = __p.__ptr_;
-        }
-        return *this;
-    }
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable list::const_iterator");
-#endif
-        return __ptr_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to dereference a non-dereferenceable list::iterator");
-#endif
-        return pointer_traits<pointer>::pointer_to(__ptr_->__value_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator& operator++()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(this),
-                       "Attempted to increment non-incrementable list::const_iterator");
-#endif
-        __ptr_ = __ptr_->__next_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator operator++(int) {__list_const_iterator __t(*this); ++(*this); return __t;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator& operator--()
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        _LIBCPP_ASSERT(__get_const_db()->__decrementable(this),
-                       "Attempted to decrement non-decrementable list::const_iterator");
-#endif
-        __ptr_ = __ptr_->__prev_;
-        return *this;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    __list_const_iterator operator--(int) {__list_const_iterator __t(*this); --(*this); return __t;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __list_const_iterator& __x, const __list_const_iterator& __y)
-    {
-        return __x.__ptr_ == __y.__ptr_;
-    }
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __list_const_iterator& __x, const __list_const_iterator& __y)
-        {return !(__x == __y);}
-};
-
-template <class _Tp, class _Alloc>
-class __list_imp
-{
-    __list_imp(const __list_imp&);
-    __list_imp& operator=(const __list_imp&);
-protected:
-    typedef _Tp                                                     value_type;
-    typedef _Alloc                                                  allocator_type;
-    typedef allocator_traits<allocator_type>                        __alloc_traits;
-    typedef typename __alloc_traits::size_type                      size_type;
-    typedef typename __alloc_traits::void_pointer                   __void_pointer;
-    typedef __list_iterator<value_type, __void_pointer>             iterator;
-    typedef __list_const_iterator<value_type, __void_pointer>       const_iterator;
-    typedef __list_node_base<value_type, __void_pointer>            __node_base;
-    typedef __list_node<value_type, __void_pointer>                 __node;
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__node>
-#else
-                rebind_alloc<__node>::other
-#endif
-                                                                     __node_allocator;
-    typedef allocator_traits<__node_allocator>                       __node_alloc_traits;
-    typedef typename __node_alloc_traits::pointer                    __node_pointer;
-    typedef typename __node_alloc_traits::pointer                    __node_const_pointer;
-    typedef typename __alloc_traits::pointer                         pointer;
-    typedef typename __alloc_traits::const_pointer                   const_pointer;
-    typedef typename __alloc_traits::difference_type                 difference_type;
-
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__node_base>
-#else
-                rebind_alloc<__node_base>::other
-#endif
-                                                                     __node_base_allocator;
-    typedef typename allocator_traits<__node_base_allocator>::pointer __node_base_pointer;
-
-    __node_base __end_;
-    __compressed_pair<size_type, __node_allocator> __size_alloc_;
-
-    _LIBCPP_INLINE_VISIBILITY
-          size_type& __sz() _NOEXCEPT {return __size_alloc_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    const size_type& __sz() const _NOEXCEPT
-        {return __size_alloc_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-          __node_allocator& __node_alloc() _NOEXCEPT
-          {return __size_alloc_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const __node_allocator& __node_alloc() const _NOEXCEPT
-        {return __size_alloc_.second();}
-
-    static void __unlink_nodes(__node_pointer __f, __node_pointer __l) _NOEXCEPT;
-
-    __list_imp()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value);
-    __list_imp(const allocator_type& __a);
-    ~__list_imp();
-    void clear() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __sz() == 0;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return iterator(__end_.__next_, this);
-#else
-        return iterator(__end_.__next_);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const  _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return const_iterator(__end_.__next_, this);
-#else
-        return const_iterator(__end_.__next_);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return iterator(static_cast<__node_pointer>(
-                pointer_traits<__node_base_pointer>::pointer_to(__end_)), this);
-#else
-        return iterator(static_cast<__node_pointer>(
-                      pointer_traits<__node_base_pointer>::pointer_to(__end_)));
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        return const_iterator(static_cast<__node_const_pointer>(
-        pointer_traits<__node_base_pointer>::pointer_to(const_cast<__node_base&>(__end_))), this);
-#else
-        return const_iterator(static_cast<__node_const_pointer>(
-        pointer_traits<__node_base_pointer>::pointer_to(const_cast<__node_base&>(__end_))));
-#endif
-    }
-
-    void swap(__list_imp& __c)
-        _NOEXCEPT_(!__node_alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __list_imp& __c)
-        {__copy_assign_alloc(__c, integral_constant<bool,
-                      __node_alloc_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__list_imp& __c)
-        _NOEXCEPT_(
-            !__node_alloc_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<__node_allocator>::value)
-        {__move_assign_alloc(__c, integral_constant<bool,
-                      __node_alloc_traits::propagate_on_container_move_assignment::value>());}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y)
-        _NOEXCEPT_(!__node_alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __node_alloc_traits::propagate_on_container_swap::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<__node_allocator>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__node_allocator& __x, __node_allocator& __y, false_type)
-        _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __list_imp& __c, true_type)
-        {
-            if (__node_alloc() != __c.__node_alloc())
-                clear();
-            __node_alloc() = __c.__node_alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __list_imp& __c, false_type)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__list_imp& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value)
-        {
-            __node_alloc() = _VSTD::move(__c.__node_alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__list_imp& __c, false_type)
-        _NOEXCEPT
-        {}
-};
-
-// Unlink nodes [__f, __l]
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__list_imp<_Tp, _Alloc>::__unlink_nodes(__node_pointer __f, __node_pointer __l)
-    _NOEXCEPT
-{
-    __f->__prev_->__next_ = __l->__next_;
-    __l->__next_->__prev_ = __f->__prev_;
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__list_imp<_Tp, _Alloc>::__list_imp()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value)
-    : __size_alloc_(0)
-{
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-__list_imp<_Tp, _Alloc>::__list_imp(const allocator_type& __a)
-    : __size_alloc_(0, __node_allocator(__a))
-{
-}
-
-template <class _Tp, class _Alloc>
-__list_imp<_Tp, _Alloc>::~__list_imp()
-{
-    clear();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__erase_c(this);
-#endif
-}
-
-template <class _Tp, class _Alloc>
-void
-__list_imp<_Tp, _Alloc>::clear() _NOEXCEPT
-{
-    if (!empty())
-    {
-        __node_allocator& __na = __node_alloc();
-        __node_pointer __f = __end_.__next_;
-        __node_pointer __l = static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__end_));
-        __unlink_nodes(__f, __l->__prev_);
-        __sz() = 0;
-        while (__f != __l)
-        {
-            __node_pointer __n = __f;
-            __f = __f->__next_;
-            __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-            __node_alloc_traits::deallocate(__na, __n, 1);
-        }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __c_node* __c = __get_db()->__find_c_and_lock(this);
-        for (__i_node** __p = __c->end_; __p != __c->beg_; )
-        {
-            --__p;
-            const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-            if (__i->__ptr_ != __l)
-            {
-                (*__p)->__c_ = nullptr;
-                if (--__c->end_ != __p)
-                    memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __get_db()->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-__list_imp<_Tp, _Alloc>::swap(__list_imp& __c)
-        _NOEXCEPT_(!__node_alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-{
-    _LIBCPP_ASSERT(__alloc_traits::propagate_on_container_swap::value ||
-                   this->__node_alloc() == __c.__node_alloc(),
-                   "list::swap: Either propagate_on_container_swap must be true"
-                   " or the allocators must compare equal");
-    using _VSTD::swap;
-    __swap_alloc(__node_alloc(), __c.__node_alloc());
-    swap(__sz(), __c.__sz());
-    swap(__end_, __c.__end_);
-    if (__sz() == 0)
-        __end_.__next_ = __end_.__prev_ = __end_.__self();
-    else
-        __end_.__prev_->__next_ = __end_.__next_->__prev_ = __end_.__self();
-    if (__c.__sz() == 0)
-        __c.__end_.__next_ = __c.__end_.__prev_ = __c.__end_.__self();
-    else
-        __c.__end_.__prev_->__next_ = __c.__end_.__next_->__prev_ = __c.__end_.__self();
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __libcpp_db* __db = __get_db();
-    __c_node* __cn1 = __db->__find_c_and_lock(this);
-    __c_node* __cn2 = __db->__find_c(&__c);
-    std::swap(__cn1->beg_, __cn2->beg_);
-    std::swap(__cn1->end_, __cn2->end_);
-    std::swap(__cn1->cap_, __cn2->cap_);
-    for (__i_node** __p = __cn1->end_; __p != __cn1->beg_;)
-    {
-        --__p;
-        const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__c.__end_)))
-        {
-            __cn2->__add(*__p);
-            if (--__cn1->end_ != __p)
-                memmove(__p, __p+1, (__cn1->end_ - __p)*sizeof(__i_node*));
-        }
-        else
-            (*__p)->__c_ = __cn1;
-    }
-    for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-    {
-        --__p;
-        const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__end_)))
-        {
-            __cn1->__add(*__p);
-            if (--__cn2->end_ != __p)
-                memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-        }
-        else
-            (*__p)->__c_ = __cn2;
-    }
-    __db->unlock();
-#endif
-}
-
-template <class _Tp, class _Alloc = allocator<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY list
-    : private __list_imp<_Tp, _Alloc>
-{
-    typedef __list_imp<_Tp, _Alloc> base;
-    typedef typename base::__node              __node;
-    typedef typename base::__node_allocator    __node_allocator;
-    typedef typename base::__node_pointer      __node_pointer;
-    typedef typename base::__node_alloc_traits __node_alloc_traits;
-    typedef typename base::__node_base         __node_base;
-    typedef typename base::__node_base_pointer __node_base_pointer;
-
-public:
-    typedef _Tp                                      value_type;
-    typedef _Alloc                                   allocator_type;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-    typedef typename base::pointer                   pointer;
-    typedef typename base::const_pointer             const_pointer;
-    typedef typename base::size_type                 size_type;
-    typedef typename base::difference_type           difference_type;
-    typedef typename base::iterator                  iterator;
-    typedef typename base::const_iterator            const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>         reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    list()
-        _NOEXCEPT_(is_nothrow_default_constructible<__node_allocator>::value)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_c(this);
-#endif
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    explicit list(const allocator_type& __a) : base(__a)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_c(this);
-#endif
-    }
-    explicit list(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit list(size_type __n, const allocator_type& __a);
-#endif
-    list(size_type __n, const value_type& __x);
-    list(size_type __n, const value_type& __x, const allocator_type& __a);
-    template <class _InpIter>
-        list(_InpIter __f, _InpIter __l,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type* = 0);
-    template <class _InpIter>
-        list(_InpIter __f, _InpIter __l, const allocator_type& __a,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type* = 0);
-
-    list(const list& __c);
-    list(const list& __c, const allocator_type& __a);
-    list& operator=(const list& __c);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    list(initializer_list<value_type> __il);
-    list(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    list(list&& __c)
-        _NOEXCEPT_(is_nothrow_move_constructible<__node_allocator>::value);
-    list(list&& __c, const allocator_type& __a);
-    list& operator=(list&& __c)
-        _NOEXCEPT_(
-            __node_alloc_traits::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<__node_allocator>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    list& operator=(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end()); return *this;}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template <class _InpIter>
-        void assign(_InpIter __f, _InpIter __l,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type* = 0);
-    void assign(size_type __n, const value_type& __x);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void assign(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    allocator_type get_allocator() const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT     {return base::__sz();}
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT         {return base::empty();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT
-        {return numeric_limits<difference_type>::max();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT        {return base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT          {return base::end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return base::end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return base::begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return base::end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT
-            {return       reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin()  const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT
-            {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend()    const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend()   const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference front()
-    {
-        _LIBCPP_ASSERT(!empty(), "list::front called on empty list");
-        return base::__end_.__next_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference front() const
-    {
-        _LIBCPP_ASSERT(!empty(), "list::front called on empty list");
-        return base::__end_.__next_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    reference back()
-    {
-        _LIBCPP_ASSERT(!empty(), "list::back called on empty list");
-        return base::__end_.__prev_->__value_;
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference back() const
-    {
-        _LIBCPP_ASSERT(!empty(), "list::back called on empty list");
-        return base::__end_.__prev_->__value_;
-    }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void push_front(value_type&& __x);
-    void push_back(value_type&& __x);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-       void emplace_front(_Args&&... __args);
-    template <class... _Args>
-        void emplace_back(_Args&&... __args);
-    template <class... _Args>
-        iterator emplace(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-    iterator insert(const_iterator __p, value_type&& __x);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    void push_front(const value_type& __x);
-    void push_back(const value_type& __x);
-
-    iterator insert(const_iterator __p, const value_type& __x);
-    iterator insert(const_iterator __p, size_type __n, const value_type& __x);
-    template <class _InpIter>
-        iterator insert(const_iterator __p, _InpIter __f, _InpIter __l,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type* = 0);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, initializer_list<value_type> __il)
-        {return insert(__p, __il.begin(), __il.end());}
-#endif   // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(list& __c)
-        _NOEXCEPT_(!__node_alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<__node_allocator>::value)
-        {base::swap(__c);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {base::clear();}
-
-    void pop_front();
-    void pop_back();
-
-    iterator erase(const_iterator __p);
-    iterator erase(const_iterator __f, const_iterator __l);
-
-    void resize(size_type __n);
-    void resize(size_type __n, const value_type& __x);
-
-    void splice(const_iterator __p, list& __c);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void splice(const_iterator __p, list&& __c) {splice(__p, __c);}
-#endif
-    void splice(const_iterator __p, list& __c, const_iterator __i);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void splice(const_iterator __p, list&& __c, const_iterator __i)
-        {splice(__p, __c, __i);}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void splice(const_iterator __p, list& __c, const_iterator __f, const_iterator __l);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void splice(const_iterator __p, list&& __c, const_iterator __f, const_iterator __l)
-        {splice(__p, __c, __f, __l);}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    void remove(const value_type& __x);
-    template <class _Pred> void remove_if(_Pred __pred);
-    void unique();
-    template <class _BinaryPred>
-        void unique(_BinaryPred __binary_pred);
-    void merge(list& __c);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void merge(list&& __c) {merge(__c);}
-#endif
-    template <class _Comp>
-        void merge(list& __c, _Comp __comp);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Comp>
-    _LIBCPP_INLINE_VISIBILITY
-        void merge(list&& __c, _Comp __comp) {merge(__c, __comp);}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void sort();
-    template <class _Comp>
-        void sort(_Comp __comp);
-
-    void reverse() _NOEXCEPT;
-
-    bool __invariants() const;
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const;
-    bool __decrementable(const const_iterator* __i) const;
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const;
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-    static void __link_nodes  (__node_pointer __p, __node_pointer __f, __node_pointer __l);
-    void __link_nodes_at_front(__node_pointer __f, __node_pointer __l);
-    void __link_nodes_at_back (__node_pointer __f, __node_pointer __l);
-    iterator __iterator(size_type __n);
-    template <class _Comp>
-        static iterator __sort(iterator __f1, iterator __e2, size_type __n, _Comp& __comp);
-
-    void __move_assign(list& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value);
-    void __move_assign(list& __c, false_type);
-};
-
-// Link in nodes [__f, __l] just prior to __p
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::__link_nodes(__node_pointer __p, __node_pointer __f, __node_pointer __l)
-{
-    __p->__prev_->__next_ = __f;
-    __f->__prev_ = __p->__prev_;
-    __p->__prev_ = __l;
-    __l->__next_ = __p;
-}
-
-// Link in nodes [__f, __l] at the front of the list
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::__link_nodes_at_front(__node_pointer __f, __node_pointer __l)
-{
-    __f->__prev_ = base::__end_.__self();
-    __l->__next_ = base::__end_.__next_;
-    __l->__next_->__prev_ = __l;
-    base::__end_.__next_ = __f;
-}
-
-// Link in nodes [__f, __l] at the front of the list
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::__link_nodes_at_back(__node_pointer __f, __node_pointer __l)
-{
-    __l->__next_ = base::__end_.__self();
-    __f->__prev_ = base::__end_.__prev_;
-    __f->__prev_->__next_ = __f;
-    base::__end_.__prev_ = __l;
-}
-
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::__iterator(size_type __n)
-{
-    return __n <= base::__sz() / 2 ? _VSTD::next(begin(), __n)
-                                   : _VSTD::prev(end(), base::__sz() - __n);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(size_type __n)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __n > 0; --__n)
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        emplace_back();
-#else
-        push_back(value_type());
-#endif
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(size_type __n, const allocator_type& __a) : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __n > 0; --__n)
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        emplace_back();
-#else
-        push_back(value_type());
-#endif
-}
-#endif
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(size_type __n, const value_type& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __n > 0; --__n)
-        push_back(__x);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(size_type __n, const value_type& __x, const allocator_type& __a)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __n > 0; --__n)
-        push_back(__x);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InpIter>
-list<_Tp, _Alloc>::list(_InpIter __f, _InpIter __l,
-                        typename enable_if<__is_input_iterator<_InpIter>::value>::type*)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __f != __l; ++__f)
-        push_back(*__f);
-}
-
-template <class _Tp, class _Alloc>
-template <class _InpIter>
-list<_Tp, _Alloc>::list(_InpIter __f, _InpIter __l, const allocator_type& __a,
-                        typename enable_if<__is_input_iterator<_InpIter>::value>::type*)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __f != __l; ++__f)
-        push_back(*__f);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(const list& __c)
-    : base(allocator_type(
-           __node_alloc_traits::select_on_container_copy_construction(
-                __c.__node_alloc())))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (const_iterator __i = __c.begin(), __e = __c.end(); __i != __e; ++__i)
-        push_back(*__i);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(const list& __c, const allocator_type& __a)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (const_iterator __i = __c.begin(), __e = __c.end(); __i != __e; ++__i)
-        push_back(*__i);
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(initializer_list<value_type> __il, const allocator_type& __a)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (typename initializer_list<value_type>::const_iterator __i = __il.begin(),
-            __e = __il.end(); __i != __e; ++__i)
-        push_back(*__i);
-}
-
-template <class _Tp, class _Alloc>
-list<_Tp, _Alloc>::list(initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (typename initializer_list<value_type>::const_iterator __i = __il.begin(),
-            __e = __il.end(); __i != __e; ++__i)
-        push_back(*__i);
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-list<_Tp, _Alloc>&
-list<_Tp, _Alloc>::operator=(const list& __c)
-{
-    if (this != &__c)
-    {
-        base::__copy_assign_alloc(__c);
-        assign(__c.begin(), __c.end());
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-list<_Tp, _Alloc>::list(list&& __c)
-    _NOEXCEPT_(is_nothrow_move_constructible<__node_allocator>::value)
-    : base(allocator_type(_VSTD::move(__c.__node_alloc())))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    splice(end(), __c);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-list<_Tp, _Alloc>::list(list&& __c, const allocator_type& __a)
-    : base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a == __c.get_allocator())
-        splice(end(), __c);
-    else
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-list<_Tp, _Alloc>&
-list<_Tp, _Alloc>::operator=(list&& __c)
-        _NOEXCEPT_(
-            __node_alloc_traits::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<__node_allocator>::value)
-{
-    __move_assign(__c, integral_constant<bool,
-          __node_alloc_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::__move_assign(list& __c, false_type)
-{
-    if (base::__node_alloc() != __c.__node_alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-    else
-        __move_assign(__c, true_type());
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::__move_assign(list& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<__node_allocator>::value)
-{
-    clear();
-    base::__move_assign_alloc(__c);
-    splice(end(), __c);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-template <class _InpIter>
-void
-list<_Tp, _Alloc>::assign(_InpIter __f, _InpIter __l,
-                          typename enable_if<__is_input_iterator<_InpIter>::value>::type*)
-{
-    iterator __i = begin();
-    iterator __e = end();
-    for (; __f != __l && __i != __e; ++__f, ++__i)
-        *__i = *__f;
-    if (__i == __e)
-        insert(__e, __f, __l);
-    else
-        erase(__i, __e);
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::assign(size_type __n, const value_type& __x)
-{
-    iterator __i = begin();
-    iterator __e = end();
-    for (; __n > 0 && __i != __e; --__n, ++__i)
-        *__i = __x;
-    if (__i == __e)
-        insert(__e, __n, __x);
-    else
-        erase(__i, __e);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-_Alloc
-list<_Tp, _Alloc>::get_allocator() const _NOEXCEPT
-{
-    return allocator_type(base::__node_alloc());
-}
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::insert(const_iterator __p, const value_type& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::insert(iterator, x) called with an iterator not"
-        " referring to this list");
-#endif
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __hold->__prev_ = 0;
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-    __link_nodes(__p.__ptr_, __hold.get(), __hold.get());
-    ++base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__hold.release(), this);
-#else
-    return iterator(__hold.release());
-#endif
-}
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::insert(const_iterator __p, size_type __n, const value_type& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::insert(iterator, n, x) called with an iterator not"
-        " referring to this list");
-    iterator __r(__p.__ptr_, this);
-#else
-    iterator __r(__p.__ptr_);
-#endif
-    if (__n > 0)
-    {
-        size_type __ds = 0;
-        __node_allocator& __na = base::__node_alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-        __hold->__prev_ = 0;
-        __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-        ++__ds;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __r = iterator(__hold.get(), this);
-#else
-        __r = iterator(__hold.get());
-#endif
-        __hold.release();
-        iterator __e = __r;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (--__n; __n != 0; --__n, ++__e, ++__ds)
-            {
-                __hold.reset(__node_alloc_traits::allocate(__na, 1));
-                __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-                __e.__ptr_->__next_ = __hold.get();
-                __hold->__prev_ = __e.__ptr_;
-                __hold.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (true)
-            {
-                __node_alloc_traits::destroy(__na, _VSTD::addressof(*__e));
-                __node_pointer __prev = __e.__ptr_->__prev_;
-                __node_alloc_traits::deallocate(__na, __e.__ptr_, 1);
-                if (__prev == 0)
-                    break;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                __e = iterator(__prev, this);
-#else
-                __e = iterator(__prev);
-#endif
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __link_nodes(__p.__ptr_, __r.__ptr_, __e.__ptr_);
-        base::__sz() += __ds;
-    }
-    return __r;
-}
-
-template <class _Tp, class _Alloc>
-template <class _InpIter>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::insert(const_iterator __p, _InpIter __f, _InpIter __l,
-             typename enable_if<__is_input_iterator<_InpIter>::value>::type*)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::insert(iterator, range) called with an iterator not"
-        " referring to this list");
-    iterator __r(__p.__ptr_, this);
-#else
-    iterator __r(__p.__ptr_);
-#endif
-    if (__f != __l)
-    {
-        size_type __ds = 0;
-        __node_allocator& __na = base::__node_alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-        __hold->__prev_ = 0;
-        __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), *__f);
-        ++__ds;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __r = iterator(__hold.get(), this);
-#else
-        __r = iterator(__hold.get());
-#endif
-        __hold.release();
-        iterator __e = __r;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (++__f; __f != __l; ++__f, ++__e, ++__ds)
-            {
-                __hold.reset(__node_alloc_traits::allocate(__na, 1));
-                __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), *__f);
-                __e.__ptr_->__next_ = __hold.get();
-                __hold->__prev_ = __e.__ptr_;
-                __hold.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (true)
-            {
-                __node_alloc_traits::destroy(__na, _VSTD::addressof(*__e));
-                __node_pointer __prev = __e.__ptr_->__prev_;
-                __node_alloc_traits::deallocate(__na, __e.__ptr_, 1);
-                if (__prev == 0)
-                    break;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                __e = iterator(__prev, this);
-#else
-                __e = iterator(__prev);
-#endif
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __link_nodes(__p.__ptr_, __r.__ptr_, __e.__ptr_);
-        base::__sz() += __ds;
-    }
-    return __r;
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::push_front(const value_type& __x)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-    __link_nodes_at_front(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::push_back(const value_type& __x)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-    __link_nodes_at_back(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::push_front(value_type&& __x)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::move(__x));
-    __link_nodes_at_front(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::push_back(value_type&& __x)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::move(__x));
-    __link_nodes_at_back(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-void
-list<_Tp, _Alloc>::emplace_front(_Args&&... __args)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::forward<_Args>(__args)...);
-    __link_nodes_at_front(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-void
-list<_Tp, _Alloc>::emplace_back(_Args&&... __args)
-{
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::forward<_Args>(__args)...);
-    __link_nodes_at_back(__hold.get(), __hold.get());
-    ++base::__sz();
-    __hold.release();
-}
-
-template <class _Tp, class _Alloc>
-template <class... _Args>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::emplace(const_iterator __p, _Args&&... __args)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::emplace(iterator, args...) called with an iterator not"
-        " referring to this list");
-#endif
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __hold->__prev_ = 0;
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::forward<_Args>(__args)...);
-    __link_nodes(__p.__ptr_, __hold.get(), __hold.get());
-    ++base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__hold.release(), this);
-#else
-    return iterator(__hold.release());
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::insert(const_iterator __p, value_type&& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::insert(iterator, x) called with an iterator not"
-        " referring to this list");
-#endif
-    __node_allocator& __na = base::__node_alloc();
-    typedef __allocator_destructor<__node_allocator> _Dp;
-    unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-    __hold->__prev_ = 0;
-    __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), _VSTD::move(__x));
-    __link_nodes(__p.__ptr_, __hold.get(), __hold.get());
-    ++base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__hold.release(), this);
-#else
-    return iterator(__hold.release());
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::pop_front()
-{
-    _LIBCPP_ASSERT(!empty(), "list::pop_front() called with empty list");
-    __node_allocator& __na = base::__node_alloc();
-    __node_pointer __n = base::__end_.__next_;
-    base::__unlink_nodes(__n, __n);
-    --base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    for (__i_node** __p = __c->end_; __p != __c->beg_; )
-    {
-        --__p;
-        iterator* __i = static_cast<iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == __n)
-        {
-            (*__p)->__c_ = nullptr;
-            if (--__c->end_ != __p)
-                memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-        }
-    }
-    __get_db()->unlock();
-#endif
-    __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-    __node_alloc_traits::deallocate(__na, __n, 1);
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::pop_back()
-{
-    _LIBCPP_ASSERT(!empty(), "list::pop_back() called with empty list");
-    __node_allocator& __na = base::__node_alloc();
-    __node_pointer __n = base::__end_.__prev_;
-    base::__unlink_nodes(__n, __n);
-    --base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    for (__i_node** __p = __c->end_; __p != __c->beg_; )
-    {
-        --__p;
-        iterator* __i = static_cast<iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == __n)
-        {
-            (*__p)->__c_ = nullptr;
-            if (--__c->end_ != __p)
-                memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-        }
-    }
-    __get_db()->unlock();
-#endif
-    __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-    __node_alloc_traits::deallocate(__na, __n, 1);
-}
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::erase(const_iterator __p)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::erase(iterator) called with an iterator not"
-        " referring to this list");
-#endif
-    _LIBCPP_ASSERT(__p != end(),
-        "list::erase(iterator) called with a non-dereferenceable iterator");
-    __node_allocator& __na = base::__node_alloc();
-    __node_pointer __n = __p.__ptr_;
-    __node_pointer __r = __n->__next_;
-    base::__unlink_nodes(__n, __n);
-    --base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    for (__i_node** __p = __c->end_; __p != __c->beg_; )
-    {
-        --__p;
-        iterator* __i = static_cast<iterator*>((*__p)->__i_);
-        if (__i->__ptr_ == __n)
-        {
-            (*__p)->__c_ = nullptr;
-            if (--__c->end_ != __p)
-                memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-        }
-    }
-    __get_db()->unlock();
-#endif
-    __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-    __node_alloc_traits::deallocate(__na, __n, 1);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__r, this);
-#else
-    return iterator(__r);
-#endif
-}
-
-template <class _Tp, class _Alloc>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::erase(const_iterator __f, const_iterator __l)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__f) == this,
-        "list::erase(iterator, iterator) called with an iterator not"
-        " referring to this list");
-#endif
-    if (__f != __l)
-    {
-        __node_allocator& __na = base::__node_alloc();
-        base::__unlink_nodes(__f.__ptr_, __l.__ptr_->__prev_);
-        while (__f != __l)
-        {
-            __node_pointer __n = __f.__ptr_;
-            ++__f;
-            --base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __c_node* __c = __get_db()->__find_c_and_lock(this);
-            for (__i_node** __p = __c->end_; __p != __c->beg_; )
-            {
-                --__p;
-                iterator* __i = static_cast<iterator*>((*__p)->__i_);
-                if (__i->__ptr_ == __n)
-                {
-                    (*__p)->__c_ = nullptr;
-                    if (--__c->end_ != __p)
-                        memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-                }
-            }
-            __get_db()->unlock();
-#endif
-            __node_alloc_traits::destroy(__na, _VSTD::addressof(__n->__value_));
-            __node_alloc_traits::deallocate(__na, __n, 1);
-        }
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(__l.__ptr_, this);
-#else
-    return iterator(__l.__ptr_);
-#endif
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::resize(size_type __n)
-{
-    if (__n < base::__sz())
-        erase(__iterator(__n), end());
-    else if (__n > base::__sz())
-    {
-        __n -= base::__sz();
-        size_type __ds = 0;
-        __node_allocator& __na = base::__node_alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-        __hold->__prev_ = 0;
-        __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_));
-        ++__ds;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator __r = iterator(__hold.release(), this);
-#else
-        iterator __r = iterator(__hold.release());
-#endif
-        iterator __e = __r;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (--__n; __n != 0; --__n, ++__e, ++__ds)
-            {
-                __hold.reset(__node_alloc_traits::allocate(__na, 1));
-                __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_));
-                __e.__ptr_->__next_ = __hold.get();
-                __hold->__prev_ = __e.__ptr_;
-                __hold.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (true)
-            {
-                __node_alloc_traits::destroy(__na, _VSTD::addressof(*__e));
-                __node_pointer __prev = __e.__ptr_->__prev_;
-                __node_alloc_traits::deallocate(__na, __e.__ptr_, 1);
-                if (__prev == 0)
-                    break;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                __e = iterator(__prev, this);
-#else
-                __e = iterator(__prev);
-#endif
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __link_nodes_at_back(__r.__ptr_, __e.__ptr_);
-        base::__sz() += __ds;
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::resize(size_type __n, const value_type& __x)
-{
-    if (__n < base::__sz())
-        erase(__iterator(__n), end());
-    else if (__n > base::__sz())
-    {
-        __n -= base::__sz();
-        size_type __ds = 0;
-        __node_allocator& __na = base::__node_alloc();
-        typedef __allocator_destructor<__node_allocator> _Dp;
-        unique_ptr<__node, _Dp> __hold(__node_alloc_traits::allocate(__na, 1), _Dp(__na, 1));
-        __hold->__prev_ = 0;
-        __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-        ++__ds;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator __r = iterator(__hold.release(), this);
-#else
-        iterator __r = iterator(__hold.release());
-#endif
-        iterator __e = __r;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (--__n; __n != 0; --__n, ++__e, ++__ds)
-            {
-                __hold.reset(__node_alloc_traits::allocate(__na, 1));
-                __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), __x);
-                __e.__ptr_->__next_ = __hold.get();
-                __hold->__prev_ = __e.__ptr_;
-                __hold.release();
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            while (true)
-            {
-                __node_alloc_traits::destroy(__na, _VSTD::addressof(*__e));
-                __node_pointer __prev = __e.__ptr_->__prev_;
-                __node_alloc_traits::deallocate(__na, __e.__ptr_, 1);
-                if (__prev == 0)
-                    break;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                __e = iterator(__prev, this);
-#else
-                __e = iterator(__prev);
-#endif
-            }
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __link_nodes(static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::
-                         pointer_to(base::__end_)), __r.__ptr_, __e.__ptr_);
-        base::__sz() += __ds;
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::splice(const_iterator __p, list& __c)
-{
-    _LIBCPP_ASSERT(this != &__c,
-                   "list::splice(iterator, list) called with this == &list");
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::splice(iterator, list) called with an iterator not"
-        " referring to this list");
-#endif
-    if (!__c.empty())
-    {
-        __node_pointer __f = __c.__end_.__next_;
-        __node_pointer __l = __c.__end_.__prev_;
-        base::__unlink_nodes(__f, __l);
-        __link_nodes(__p.__ptr_, __f, __l);
-        base::__sz() += __c.__sz();
-        __c.__sz() = 0;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
-        __c_node* __cn2 = __db->__find_c(&__c);
-        for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-        {
-            --__p;
-            iterator* __i = static_cast<iterator*>((*__p)->__i_);
-            if (__i->__ptr_ != static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__c.__end_)))
-            {
-                __cn1->__add(*__p);
-                (*__p)->__c_ = __cn1;
-                if (--__cn2->end_ != __p)
-                    memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __db->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::splice(const_iterator __p, list& __c, const_iterator __i)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::splice(iterator, list, iterator) called with first iterator not"
-        " referring to this list");
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__i) == &__c,
-        "list::splice(iterator, list, iterator) called with second iterator not"
-        " referring to list argument");
-    _LIBCPP_ASSERT(__get_const_db()->__dereferenceable(&__i),
-        "list::splice(iterator, list, iterator) called with second iterator not"
-        " derefereceable");
-#endif
-    if (__p.__ptr_ != __i.__ptr_ && __p.__ptr_ != __i.__ptr_->__next_)
-    {
-        __node_pointer __f = __i.__ptr_;
-        base::__unlink_nodes(__f, __f);
-        __link_nodes(__p.__ptr_, __f, __f);
-        --__c.__sz();
-        ++base::__sz();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
-        __c_node* __cn2 = __db->__find_c(&__c);
-        for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-        {
-            --__p;
-            iterator* __j = static_cast<iterator*>((*__p)->__i_);
-            if (__j->__ptr_ == __f)
-            {
-                __cn1->__add(*__p);
-                (*__p)->__c_ = __cn1;
-                if (--__cn2->end_ != __p)
-                    memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __db->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::splice(const_iterator __p, list& __c, const_iterator __f, const_iterator __l)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-        "list::splice(iterator, list, iterator, iterator) called with first iterator not"
-        " referring to this list");
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__f) == &__c,
-        "list::splice(iterator, list, iterator, iterator) called with second iterator not"
-        " referring to list argument");
-    if (this == &__c)
-    {
-        for (const_iterator __i = __f; __i != __l; ++__i)
-            _LIBCPP_ASSERT(__i != __p,
-                           "list::splice(iterator, list, iterator, iterator)"
-                           " called with the first iterator within the range"
-                           " of the second and third iterators");
-    }
-#endif
-    if (__f != __l)
-    {
-        if (this != &__c)
-        {
-            size_type __s = _VSTD::distance(__f, __l);
-            __c.__sz() -= __s;
-            base::__sz() += __s;
-        }
-        __node_pointer __first = __f.__ptr_;
-        --__l;
-        __node_pointer __last = __l.__ptr_;
-        base::__unlink_nodes(__first, __last);
-        __link_nodes(__p.__ptr_, __first, __last);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
-        __c_node* __cn2 = __db->__find_c(&__c);
-        for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-        {
-            --__p;
-            iterator* __j = static_cast<iterator*>((*__p)->__i_);
-            for (__node_pointer __k = __f.__ptr_;
-                                          __k != __l.__ptr_; __k = __k->__next_)
-            {
-                if (__j->__ptr_ == __k)
-                {
-                    __cn1->__add(*__p);
-                    (*__p)->__c_ = __cn1;
-                    if (--__cn2->end_ != __p)
-                        memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-                }
-            }
-        }
-        __db->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::remove(const value_type& __x)
-{
-    list<_Tp, _Alloc> __deleted_nodes; // collect the nodes we're removing
-    for (const_iterator __i = begin(), __e = end(); __i != __e;)
-    {
-        if (*__i == __x)
-        {
-            const_iterator __j = _VSTD::next(__i);
-            for (; __j != __e && *__j == __x; ++__j)
-                ;
-            __deleted_nodes.splice(__deleted_nodes.end(), *this, __i, __j);
-            __i = __j;
-            if (__i != __e)
-                ++__i;
-        }
-        else
-            ++__i;
-    }
-}
-
-template <class _Tp, class _Alloc>
-template <class _Pred>
-void
-list<_Tp, _Alloc>::remove_if(_Pred __pred)
-{
-    for (iterator __i = begin(), __e = end(); __i != __e;)
-    {
-        if (__pred(*__i))
-        {
-            iterator __j = _VSTD::next(__i);
-            for (; __j != __e && __pred(*__j); ++__j)
-                ;
-            __i = erase(__i, __j);
-            if (__i != __e)
-                ++__i;
-        }
-        else
-            ++__i;
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::unique()
-{
-    unique(__equal_to<value_type>());
-}
-
-template <class _Tp, class _Alloc>
-template <class _BinaryPred>
-void
-list<_Tp, _Alloc>::unique(_BinaryPred __binary_pred)
-{
-    for (iterator __i = begin(), __e = end(); __i != __e;)
-    {
-        iterator __j = _VSTD::next(__i);
-        for (; __j != __e && __binary_pred(*__i, *__j); ++__j)
-            ;
-        if (++__i != __j)
-            __i = erase(__i, __j);
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::merge(list& __c)
-{
-    merge(__c, __less<value_type>());
-}
-
-template <class _Tp, class _Alloc>
-template <class _Comp>
-void
-list<_Tp, _Alloc>::merge(list& __c, _Comp __comp)
-{
-    if (this != &__c)
-    {
-        iterator __f1 = begin();
-        iterator __e1 = end();
-        iterator __f2 = __c.begin();
-        iterator __e2 = __c.end();
-        while (__f1 != __e1 && __f2 != __e2)
-        {
-            if (__comp(*__f2, *__f1))
-            {
-                size_type __ds = 1;
-                iterator __m2 = _VSTD::next(__f2);
-                for (; __m2 != __e2 && __comp(*__m2, *__f1); ++__m2, ++__ds)
-                    ;
-                base::__sz() += __ds;
-                __c.__sz() -= __ds;
-                __node_pointer __f = __f2.__ptr_;
-                __node_pointer __l = __m2.__ptr_->__prev_;
-                __f2 = __m2;
-                base::__unlink_nodes(__f, __l);
-                __m2 = _VSTD::next(__f1);
-                __link_nodes(__f1.__ptr_, __f, __l);
-                __f1 = __m2;
-            }
-            else
-                ++__f1;
-        }
-        splice(__e1, __c);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __libcpp_db* __db = __get_db();
-        __c_node* __cn1 = __db->__find_c_and_lock(this);
-        __c_node* __cn2 = __db->__find_c(&__c);
-        for (__i_node** __p = __cn2->end_; __p != __cn2->beg_;)
-        {
-            --__p;
-            iterator* __i = static_cast<iterator*>((*__p)->__i_);
-            if (__i->__ptr_ != static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(__c.__end_)))
-            {
-                __cn1->__add(*__p);
-                (*__p)->__c_ = __cn1;
-                if (--__cn2->end_ != __p)
-                    memmove(__p, __p+1, (__cn2->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __db->unlock();
-#endif
-    }
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::sort()
-{
-    sort(__less<value_type>());
-}
-
-template <class _Tp, class _Alloc>
-template <class _Comp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-list<_Tp, _Alloc>::sort(_Comp __comp)
-{
-    __sort(begin(), end(), base::__sz(), __comp);
-}
-
-template <class _Tp, class _Alloc>
-template <class _Comp>
-typename list<_Tp, _Alloc>::iterator
-list<_Tp, _Alloc>::__sort(iterator __f1, iterator __e2, size_type __n, _Comp& __comp)
-{
-    switch (__n)
-    {
-    case 0:
-    case 1:
-        return __f1;
-    case 2:
-        if (__comp(*--__e2, *__f1))
-        {
-            __node_pointer __f = __e2.__ptr_;
-            base::__unlink_nodes(__f, __f);
-            __link_nodes(__f1.__ptr_, __f, __f);
-            return __e2;
-        }
-        return __f1;
-    }
-    size_type __n2 = __n / 2;
-    iterator __e1 = _VSTD::next(__f1, __n2);
-    iterator  __r = __f1 = __sort(__f1, __e1, __n2, __comp);
-    iterator __f2 = __e1 = __sort(__e1, __e2, __n - __n2, __comp);
-    if (__comp(*__f2, *__f1))
-    {
-        iterator __m2 = _VSTD::next(__f2);
-        for (; __m2 != __e2 && __comp(*__m2, *__f1); ++__m2)
-            ;
-        __node_pointer __f = __f2.__ptr_;
-        __node_pointer __l = __m2.__ptr_->__prev_;
-        __r = __f2;
-        __e1 = __f2 = __m2;
-        base::__unlink_nodes(__f, __l);
-        __m2 = _VSTD::next(__f1);
-        __link_nodes(__f1.__ptr_, __f, __l);
-        __f1 = __m2;
-    }
-    else
-        ++__f1;
-    while (__f1 != __e1 && __f2 != __e2)
-    {
-        if (__comp(*__f2, *__f1))
-        {
-            iterator __m2 = _VSTD::next(__f2);
-            for (; __m2 != __e2 && __comp(*__m2, *__f1); ++__m2)
-                ;
-            __node_pointer __f = __f2.__ptr_;
-            __node_pointer __l = __m2.__ptr_->__prev_;
-            if (__e1 == __f2)
-                __e1 = __m2;
-            __f2 = __m2;
-            base::__unlink_nodes(__f, __l);
-            __m2 = _VSTD::next(__f1);
-            __link_nodes(__f1.__ptr_, __f, __l);
-            __f1 = __m2;
-        }
-        else
-            ++__f1;
-    }
-    return __r;
-}
-
-template <class _Tp, class _Alloc>
-void
-list<_Tp, _Alloc>::reverse() _NOEXCEPT
-{
-    if (base::__sz() > 1)
-    {
-        iterator __e = end();
-        for (iterator __i = begin(); __i.__ptr_ != __e.__ptr_;)
-        {
-            _VSTD::swap(__i.__ptr_->__prev_, __i.__ptr_->__next_);
-            __i.__ptr_ = __i.__ptr_->__prev_;
-        }
-        _VSTD::swap(__e.__ptr_->__prev_, __e.__ptr_->__next_);
-    }
-}
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__invariants() const
-{
-    return size() == _VSTD::distance(begin(), end());
-}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__dereferenceable(const const_iterator* __i) const
-{
-    return __i->__ptr_ != static_cast<__node_pointer>(
-                       pointer_traits<__node_base_pointer>::pointer_to(const_cast<__node_base&>(this->__end_)));
-}
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__decrementable(const const_iterator* __i) const
-{
-    return !empty() &&  __i->__ptr_ != base::__end_.__next_;
-}
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__addable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    return false;
-}
-
-template <class _Tp, class _Alloc>
-bool
-list<_Tp, _Alloc>::__subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    return false;
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const list<_Tp, _Alloc>& __x, const list<_Tp, _Alloc>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(list<_Tp, _Alloc>& __x, list<_Tp, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_LIST
diff --git a/include.new/c++/v1/tr1/locale b/include.new/c++/v1/tr1/locale
deleted file mode 100644
index 0d01002..0000000
--- a/include.new/c++/v1/tr1/locale
+++ /dev/null
@@ -1,4473 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- locale ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_LOCALE
-#define _LIBCPP_LOCALE
-
-/*
-    locale synopsis
-
-namespace std
-{
-
-class locale
-{
-public:
-    // types:
-    class facet;
-    class id;
-
-    typedef int category;
-    static const category // values assigned here are for exposition only
-        none     = 0x000,
-        collate  = 0x010,
-        ctype    = 0x020,
-        monetary = 0x040,
-        numeric  = 0x080,
-        time     = 0x100,
-        messages = 0x200,
-        all = collate | ctype | monetary | numeric | time | messages;
-
-    // construct/copy/destroy:
-    locale() noexcept;
-    locale(const locale& other) noexcept;
-    explicit locale(const char* std_name);
-    explicit locale(const string& std_name);
-    locale(const locale& other, const char* std_name, category);
-    locale(const locale& other, const string& std_name, category);
-    template <class Facet> locale(const locale& other, Facet* f);
-    locale(const locale& other, const locale& one, category);
-
-    ~locale(); // not virtual
-
-    const locale& operator=(const locale& other) noexcept;
-
-    template <class Facet> locale combine(const locale& other) const;
-
-    // locale operations:
-    basic_string<char> name() const;
-    bool operator==(const locale& other) const;
-    bool operator!=(const locale& other) const;
-    template <class charT, class Traits, class Allocator>
-      bool operator()(const basic_string<charT,Traits,Allocator>& s1,
-                      const basic_string<charT,Traits,Allocator>& s2) const;
-
-    // global locale objects:
-    static locale global(const locale&);
-    static const locale& classic();
-};
-
-template <class Facet> const Facet& use_facet(const locale&);
-template <class Facet> bool has_facet(const locale&) noexcept;
-
-// 22.3.3, convenience interfaces:
-template <class charT> bool isspace (charT c, const locale& loc);
-template <class charT> bool isprint (charT c, const locale& loc);
-template <class charT> bool iscntrl (charT c, const locale& loc);
-template <class charT> bool isupper (charT c, const locale& loc);
-template <class charT> bool islower (charT c, const locale& loc);
-template <class charT> bool isalpha (charT c, const locale& loc);
-template <class charT> bool isdigit (charT c, const locale& loc);
-template <class charT> bool ispunct (charT c, const locale& loc);
-template <class charT> bool isxdigit(charT c, const locale& loc);
-template <class charT> bool isalnum (charT c, const locale& loc);
-template <class charT> bool isgraph (charT c, const locale& loc);
-template <class charT> charT toupper(charT c, const locale& loc);
-template <class charT> charT tolower(charT c, const locale& loc);
-
-template<class Codecvt, class Elem = wchar_t,
-         class Wide_alloc = allocator<Elem>,
-         class Byte_alloc = allocator<char>>
-class wstring_convert
-{
-public:
-    typedef basic_string<char, char_traits<char>, Byte_alloc> byte_string;
-    typedef basic_string<Elem, char_traits<Elem>, Wide_alloc> wide_string;
-    typedef typename Codecvt::state_type                      state_type;
-    typedef typename wide_string::traits_type::int_type       int_type;
-
-    explicit wstring_convert(Codecvt* pcvt = new Codecvt);          // explicit in C++14
-    wstring_convert(Codecvt* pcvt, state_type state);
-    explicit wstring_convert(const byte_string& byte_err,           // explicit in C++14
-                    const wide_string& wide_err = wide_string());
-    wstring_convert(const wstring_convert&) = delete;               // C++14
-    wstring_convert & operator=(const wstring_convert &) = delete;  // C++14
-    ~wstring_convert();
-
-    wide_string from_bytes(char byte);
-    wide_string from_bytes(const char* ptr);
-    wide_string from_bytes(const byte_string& str);
-    wide_string from_bytes(const char* first, const char* last);
-
-    byte_string to_bytes(Elem wchar);
-    byte_string to_bytes(const Elem* wptr);
-    byte_string to_bytes(const wide_string& wstr);
-    byte_string to_bytes(const Elem* first, const Elem* last);
-
-    size_t converted() const; // noexcept in C++14
-    state_type state() const;
-};
-
-template <class Codecvt, class Elem = wchar_t, class Tr = char_traits<Elem>>
-class wbuffer_convert
-    : public basic_streambuf<Elem, Tr>
-{
-public:
-    typedef typename Tr::state_type state_type;
-
-    explicit wbuffer_convert(streambuf* bytebuf = 0, Codecvt* pcvt = new Codecvt,
-                    state_type state = state_type());       // explicit in C++14
-    wbuffer_convert(const wbuffer_convert&) = delete;               // C++14
-    wbuffer_convert & operator=(const wbuffer_convert &) = delete;  // C++14
-    ~wbuffer_convert();                                             // C++14
-    
-    streambuf* rdbuf() const;
-    streambuf* rdbuf(streambuf* bytebuf);
-
-    state_type state() const;
-};
-
-// 22.4.1 and 22.4.1.3, ctype:
-class ctype_base;
-template <class charT> class ctype;
-template <> class ctype<char>; // specialization
-template <class charT> class ctype_byname;
-template <> class ctype_byname<char>; // specialization
-
-class codecvt_base;
-template <class internT, class externT, class stateT> class codecvt;
-template <class internT, class externT, class stateT> class codecvt_byname;
-
-// 22.4.2 and 22.4.3, numeric:
-template <class charT, class InputIterator> class num_get;
-template <class charT, class OutputIterator> class num_put;
-template <class charT> class numpunct;
-template <class charT> class numpunct_byname;
-
-// 22.4.4, col lation:
-template <class charT> class collate;
-template <class charT> class collate_byname;
-
-// 22.4.5, date and time:
-class time_base;
-template <class charT, class InputIterator> class time_get;
-template <class charT, class InputIterator> class time_get_byname;
-template <class charT, class OutputIterator> class time_put;
-template <class charT, class OutputIterator> class time_put_byname;
-
-// 22.4.6, money:
-class money_base;
-template <class charT, class InputIterator> class money_get;
-template <class charT, class OutputIterator> class money_put;
-template <class charT, bool Intl> class moneypunct;
-template <class charT, bool Intl> class moneypunct_byname;
-
-// 22.4.7, message retrieval:
-class messages_base;
-template <class charT> class messages;
-template <class charT> class messages_byname;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__locale>
-#include <algorithm>
-#include <memory>
-#include <ios>
-#include <streambuf>
-#include <iterator>
-#include <limits>
-#ifndef __APPLE__
-#include <cstdarg>
-#endif
-#include <cstdlib>
-#include <ctime>
-#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
-#include <support/win32/locale_win32.h>
-#elif defined(_NEWLIB_VERSION)
-// FIXME: replace all the uses of _NEWLIB_VERSION with __NEWLIB__ preceded by an
-// include of <sys/cdefs.h> once https://sourceware.org/ml/newlib-cvs/2014-q3/msg00038.html
-// has had a chance to bake for a bit
-#include <support/newlib/xlocale.h>
-#elif !defined(__ANDROID__)
-#include <nl_types.h>
-#endif
-
-#ifdef __APPLE__
-#include <Availability.h>
-#endif
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#if defined(__APPLE__) || defined(__FreeBSD__)
-#  define _LIBCPP_GET_C_LOCALE 0
-#elif defined(__NetBSD__)
-#  define _LIBCPP_GET_C_LOCALE LC_C_LOCALE
-#else
-#  define _LIBCPP_GET_C_LOCALE __cloc()
-   // Get the C locale object
-   _LIBCPP_FUNC_VIS locale_t __cloc();
-#define __cloc_defined
-#endif
-
-typedef _VSTD::remove_pointer<locale_t>::type __locale_struct;
-typedef _VSTD::unique_ptr<__locale_struct, decltype(&freelocale)> __locale_unique_ptr;
-#ifndef _LIBCPP_LOCALE__L_EXTENSIONS
-typedef _VSTD::unique_ptr<__locale_struct, decltype(&uselocale)> __locale_raii;
-#endif
-
-// OSX has nice foo_l() functions that let you turn off use of the global
-// locale.  Linux, not so much.  The following functions avoid the locale when
-// that's possible and otherwise do the wrong thing.  FIXME.
-#if defined(__linux__) || defined(__EMSCRIPTEN__) || defined(_AIX) || \
-    defined(_NEWLIB_VERSION)
-
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-decltype(MB_CUR_MAX_L(_VSTD::declval<locale_t>()))
-inline _LIBCPP_INLINE_VISIBILITY
-__mb_cur_max_l(locale_t __l)
-{
-  return MB_CUR_MAX_L(__l);
-}
-#else  // _LIBCPP_LOCALE__L_EXTENSIONS
-inline _LIBCPP_ALWAYS_INLINE
-decltype(MB_CUR_MAX) __mb_cur_max_l(locale_t __l)
-{
-  __locale_raii __current(uselocale(__l), uselocale);
-  return MB_CUR_MAX;
-}
-#endif // _LIBCPP_LOCALE__L_EXTENSIONS
-
-inline _LIBCPP_ALWAYS_INLINE
-wint_t __btowc_l(int __c, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return btowc_l(__c, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return btowc(__c);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-int __wctob_l(wint_t __c, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return wctob_l(__c, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return wctob(__c);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __wcsnrtombs_l(char *__dest, const wchar_t **__src, size_t __nwc,
-                      size_t __len, mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return wcsnrtombs_l(__dest, __src, __nwc, __len, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return wcsnrtombs(__dest, __src, __nwc, __len, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __wcrtomb_l(char *__s, wchar_t __wc, mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return wcrtomb_l(__s, __wc, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return wcrtomb(__s, __wc, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __mbsnrtowcs_l(wchar_t * __dest, const char **__src, size_t __nms,
-                      size_t __len, mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbsnrtowcs_l(__dest, __src, __nms, __len, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbsnrtowcs(__dest, __src, __nms, __len, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __mbrtowc_l(wchar_t *__pwc, const char *__s, size_t __n,
-                   mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbrtowc_l(__pwc, __s, __n, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbrtowc(__pwc, __s, __n, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-int __mbtowc_l(wchar_t *__pwc, const char *__pmb, size_t __max, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbtowc_l(__pwc, __pmb, __max, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbtowc(__pwc, __pmb, __max);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __mbrlen_l(const char *__s, size_t __n, mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbrlen_l(__s, __n, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbrlen(__s, __n, __ps);
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-lconv *__localeconv_l(locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return localeconv_l(__l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return localeconv();
-#endif
-}
-
-inline _LIBCPP_ALWAYS_INLINE
-size_t __mbsrtowcs_l(wchar_t *__dest, const char **__src, size_t __len,
-                     mbstate_t *__ps, locale_t __l)
-{
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  return mbsrtowcs_l(__dest, __src, __len, __ps, __l);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  return mbsrtowcs(__dest, __src, __len, __ps);
-#endif
-}
-
-inline
-int __snprintf_l(char *__s, size_t __n, locale_t __l, const char *__format, ...) {
-  va_list __va;
-  va_start(__va, __format);
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  int __res = vsnprintf_l(__s, __n, __l, __format, __va);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  int __res = vsnprintf(__s, __n, __format, __va);
-#endif
-  va_end(__va);
-  return __res;
-}
-
-inline
-int __asprintf_l(char **__s, locale_t __l, const char *__format, ...) {
-  va_list __va;
-  va_start(__va, __format);
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  int __res = vasprintf_l(__s, __l, __format, __va);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  int __res = vasprintf(__s, __format, __va);
-#endif
-  va_end(__va);
-  return __res;
-}
-
-inline
-int __sscanf_l(const char *__s, locale_t __l, const char *__format, ...) {
-  va_list __va;
-  va_start(__va, __format);
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-  int __res = vsscanf_l(__s, __l, __format, __va);
-#else
-  __locale_raii __current(uselocale(__l), uselocale);
-  int __res = vsscanf(__s, __format, __va);
-#endif
-  va_end(__va);
-  return __res;
-}
-
-#endif  // __linux__
-
-// __scan_keyword
-// Scans [__b, __e) until a match is found in the basic_strings range
-//  [__kb, __ke) or until it can be shown that there is no match in [__kb, __ke).
-//  __b will be incremented (visibly), consuming CharT until a match is found
-//  or proved to not exist.  A keyword may be "", in which will match anything.
-//  If one keyword is a prefix of another, and the next CharT in the input
-//  might match another keyword, the algorithm will attempt to find the longest
-//  matching keyword.  If the longer matching keyword ends up not matching, then
-//  no keyword match is found.  If no keyword match is found, __ke is returned
-//  and failbit is set in __err.
-//  Else an iterator pointing to the matching keyword is found.  If more than
-//  one keyword matches, an iterator to the first matching keyword is returned.
-//  If on exit __b == __e, eofbit is set in __err.  If __case_sensitive is false,
-//  __ct is used to force to lower case before comparing characters.
-//  Examples:
-//  Keywords:  "a", "abb"
-//  If the input is "a", the first keyword matches and eofbit is set.
-//  If the input is "abc", no match is found and "ab" are consumed.
-template <class _InputIterator, class _ForwardIterator, class _Ctype>
-_LIBCPP_HIDDEN
-_ForwardIterator
-__scan_keyword(_InputIterator& __b, _InputIterator __e,
-               _ForwardIterator __kb, _ForwardIterator __ke,
-               const _Ctype& __ct, ios_base::iostate& __err,
-               bool __case_sensitive = true)
-{
-    typedef typename iterator_traits<_InputIterator>::value_type _CharT;
-    size_t __nkw = static_cast<size_t>(_VSTD::distance(__kb, __ke));
-    const unsigned char __doesnt_match = '\0';
-    const unsigned char __might_match = '\1';
-    const unsigned char __does_match = '\2';
-    unsigned char __statbuf[100];
-    unsigned char* __status = __statbuf;
-    unique_ptr<unsigned char, void(*)(void*)> __stat_hold(0, free);
-    if (__nkw > sizeof(__statbuf))
-    {
-        __status = (unsigned char*)malloc(__nkw);
-        if (__status == 0)
-            __throw_bad_alloc();
-        __stat_hold.reset(__status);
-    }
-    size_t __n_might_match = __nkw;  // At this point, any keyword might match
-    size_t __n_does_match = 0;       // but none of them definitely do
-    // Initialize all statuses to __might_match, except for "" keywords are __does_match
-    unsigned char* __st = __status;
-    for (_ForwardIterator __ky = __kb; __ky != __ke; ++__ky, (void) ++__st)
-    {
-        if (!__ky->empty())
-            *__st = __might_match;
-        else
-        {
-            *__st = __does_match;
-            --__n_might_match;
-            ++__n_does_match;
-        }
-    }
-    // While there might be a match, test keywords against the next CharT
-    for (size_t __indx = 0; __b != __e && __n_might_match > 0; ++__indx)
-    {
-        // Peek at the next CharT but don't consume it
-        _CharT __c = *__b;
-        if (!__case_sensitive)
-            __c = __ct.toupper(__c);
-        bool __consume = false;
-        // For each keyword which might match, see if the __indx character is __c
-        // If a match if found, consume __c
-        // If a match is found, and that is the last character in the keyword,
-        //    then that keyword matches.
-        // If the keyword doesn't match this character, then change the keyword
-        //    to doesn't match
-        __st = __status;
-        for (_ForwardIterator __ky = __kb; __ky != __ke; ++__ky, (void) ++__st)
-        {
-            if (*__st == __might_match)
-            {
-                _CharT __kc = (*__ky)[__indx];
-                if (!__case_sensitive)
-                    __kc = __ct.toupper(__kc);
-                if (__c == __kc)
-                {
-                    __consume = true;
-                    if (__ky->size() == __indx+1)
-                    {
-                        *__st = __does_match;
-                        --__n_might_match;
-                        ++__n_does_match;
-                    }
-                }
-                else
-                {
-                    *__st = __doesnt_match;
-                    --__n_might_match;
-                }
-            }
-        }
-        // consume if we matched a character
-        if (__consume)
-        {
-            ++__b;
-            // If we consumed a character and there might be a matched keyword that
-            //   was marked matched on a previous iteration, then such keywords
-            //   which are now marked as not matching.
-            if (__n_might_match + __n_does_match > 1)
-            {
-                __st = __status;
-                for (_ForwardIterator __ky = __kb; __ky != __ke; ++__ky, (void) ++__st)
-                {
-                    if (*__st == __does_match && __ky->size() != __indx+1)
-                    {
-                        *__st = __doesnt_match;
-                        --__n_does_match;
-                    }
-                }
-            }
-        }
-    }
-    // We've exited the loop because we hit eof and/or we have no more "might matches".
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    // Return the first matching result
-    for (__st = __status; __kb != __ke; ++__kb, (void) ++__st)
-        if (*__st == __does_match)
-            break;
-    if (__kb == __ke)
-        __err |= ios_base::failbit;
-    return __kb;
-}
-
-struct _LIBCPP_TYPE_VIS __num_get_base
-{
-    static const int __num_get_buf_sz = 40;
-
-    static int __get_base(ios_base&);
-    static const char __src[33];
-};
-
-_LIBCPP_FUNC_VIS
-void __check_grouping(const string& __grouping, unsigned* __g, unsigned* __g_end,
-                      ios_base::iostate& __err);
-
-template <class _CharT>
-struct __num_get
-    : protected __num_get_base
-{
-    static string __stage2_int_prep(ios_base& __iob, _CharT* __atoms, _CharT& __thousands_sep);
-    static string __stage2_float_prep(ios_base& __iob, _CharT* __atoms, _CharT& __decimal_point,
-                                      _CharT& __thousands_sep);
-    static int __stage2_int_loop(_CharT __ct, int __base, char* __a, char*& __a_end,
-                  unsigned& __dc, _CharT __thousands_sep, const string& __grouping,
-                  unsigned* __g, unsigned*& __g_end, _CharT* __atoms);
-    static int __stage2_float_loop(_CharT __ct, bool& __in_units, char& __exp,
-                                   char* __a, char*& __a_end,
-                                   _CharT __decimal_point, _CharT __thousands_sep,
-                                   const string& __grouping, unsigned* __g,
-                                   unsigned*& __g_end, unsigned& __dc, _CharT* __atoms);
-};
-
-template <class _CharT>
-string
-__num_get<_CharT>::__stage2_int_prep(ios_base& __iob, _CharT* __atoms, _CharT& __thousands_sep)
-{
-    locale __loc = __iob.getloc();
-    use_facet<ctype<_CharT> >(__loc).widen(__src, __src + 26, __atoms);
-    const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc);
-    __thousands_sep = __np.thousands_sep();
-    return __np.grouping();
-}
-
-template <class _CharT>
-string
-__num_get<_CharT>::__stage2_float_prep(ios_base& __iob, _CharT* __atoms, _CharT& __decimal_point,
-                    _CharT& __thousands_sep)
-{
-    locale __loc = __iob.getloc();
-    use_facet<ctype<_CharT> >(__loc).widen(__src, __src + 32, __atoms);
-    const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__loc);
-    __decimal_point = __np.decimal_point();
-    __thousands_sep = __np.thousands_sep();
-    return __np.grouping();
-}
-
-template <class _CharT>
-int
-__num_get<_CharT>::__stage2_int_loop(_CharT __ct, int __base, char* __a, char*& __a_end,
-                  unsigned& __dc, _CharT __thousands_sep, const string& __grouping,
-                  unsigned* __g, unsigned*& __g_end, _CharT* __atoms)
-{
-    if (__a_end == __a && (__ct == __atoms[24] || __ct == __atoms[25]))
-    {
-        *__a_end++ = __ct == __atoms[24] ? '+' : '-';
-        __dc = 0;
-        return 0;
-    }
-    if (__grouping.size() != 0 && __ct == __thousands_sep)
-    {
-        if (__g_end-__g < __num_get_buf_sz)
-        {
-            *__g_end++ = __dc;
-            __dc = 0;
-        }
-        return 0;
-    }
-    ptrdiff_t __f = find(__atoms, __atoms + 26, __ct) - __atoms;
-    if (__f >= 24)
-        return -1;
-    switch (__base)
-    {
-    case 8:
-    case 10:
-        if (__f >= __base)
-            return -1;
-        break;
-    case 16:
-        if (__f < 22)
-            break;
-        if (__a_end != __a && __a_end - __a <= 2 && __a_end[-1] == '0')
-        {
-            __dc = 0;
-            *__a_end++ = __src[__f];
-            return 0;
-        }
-        return -1;
-    }
-    *__a_end++ = __src[__f];
-    ++__dc;
-    return 0;
-}
-
-template <class _CharT>
-int
-__num_get<_CharT>::__stage2_float_loop(_CharT __ct, bool& __in_units, char& __exp, char* __a, char*& __a_end,
-                    _CharT __decimal_point, _CharT __thousands_sep, const string& __grouping,
-                    unsigned* __g, unsigned*& __g_end, unsigned& __dc, _CharT* __atoms)
-{
-    if (__ct == __decimal_point)
-    {
-        if (!__in_units)
-            return -1;
-        __in_units = false;
-        *__a_end++ = '.';
-        if (__grouping.size() != 0 && __g_end-__g < __num_get_buf_sz)
-            *__g_end++ = __dc;
-        return 0;
-    }
-    if (__ct == __thousands_sep && __grouping.size() != 0)
-    {
-        if (!__in_units)
-            return -1;
-        if (__g_end-__g < __num_get_buf_sz)
-        {
-            *__g_end++ = __dc;
-            __dc = 0;
-        }
-        return 0;
-    }
-    ptrdiff_t __f = find(__atoms, __atoms + 32, __ct) - __atoms;
-    if (__f >= 32)
-        return -1;
-    char __x = __src[__f];
-    if (__x == '-' || __x == '+')
-    {
-        if (__a_end == __a || (__a_end[-1] & 0x5F) == (__exp & 0x7F))
-        {
-            *__a_end++ = __x;
-            return 0;
-        }
-        return -1;
-    }
-    if (__x == 'x' || __x == 'X')
-        __exp = 'P';
-    else if ((__x & 0x5F) == __exp)
-    {
-        __exp |= 0x80;
-        if (__in_units)
-        {
-            __in_units = false;
-            if (__grouping.size() != 0 && __g_end-__g < __num_get_buf_sz)
-                *__g_end++ = __dc;
-        }
-    }
-    *__a_end++ = __x;
-    if (__f >= 22)
-        return 0;
-    ++__dc;
-    return 0;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(struct _LIBCPP_TYPE_VIS __num_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(struct _LIBCPP_TYPE_VIS __num_get<wchar_t>)
-
-template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY num_get
-    : public locale::facet,
-      private __num_get<_CharT>
-{
-public:
-    typedef _CharT char_type;
-    typedef _InputIterator iter_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit num_get(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, bool& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, long& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, long long& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, unsigned short& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, unsigned int& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, unsigned long& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, unsigned long long& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, float& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, double& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, long double& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, void*& __v) const
-    {
-        return do_get(__b, __e, __iob, __err, __v);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~num_get() {}
-
-    template <class _Fp>
-    iter_type __do_get_floating_point
-                            (iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, _Fp& __v) const;
-
-    template <class _Signed>
-    iter_type __do_get_signed
-                            (iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, _Signed& __v) const;
-
-    template <class _Unsigned>
-    iter_type __do_get_unsigned
-                            (iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, _Unsigned& __v) const;
-
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, bool& __v) const;
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, long& __v) const
-    { return this->__do_get_signed ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, long long& __v) const
-    { return this->__do_get_signed ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, unsigned short& __v) const
-    { return this->__do_get_unsigned ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, unsigned int& __v) const
-    { return this->__do_get_unsigned ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, unsigned long& __v) const
-    { return this->__do_get_unsigned ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, unsigned long long& __v) const
-    { return this->__do_get_unsigned ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, float& __v) const
-    { return this->__do_get_floating_point ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, double& __v) const
-    { return this->__do_get_floating_point ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, long double& __v) const
-    { return this->__do_get_floating_point ( __b, __e, __iob, __err, __v ); }
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, void*& __v) const;
-};
-
-template <class _CharT, class _InputIterator>
-locale::id
-num_get<_CharT, _InputIterator>::id;
-
-template <class _Tp>
-_Tp
-__num_get_signed_integral(const char* __a, const char* __a_end,
-                          ios_base::iostate& __err, int __base)
-{
-    if (__a != __a_end)
-    {
-        typename remove_reference<decltype(errno)>::type __save_errno = errno;
-        errno = 0;
-        char *__p2;
-        long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-        typename remove_reference<decltype(errno)>::type __current_errno = errno;
-        if (__current_errno == 0)
-            errno = __save_errno;
-        if (__p2 != __a_end)
-        {
-            __err = ios_base::failbit;
-            return 0;
-        }
-        else if (__current_errno == ERANGE         ||
-                 __ll < numeric_limits<_Tp>::min() ||
-                 numeric_limits<_Tp>::max() < __ll)
-        {
-            __err = ios_base::failbit;
-            if (__ll > 0)
-                return numeric_limits<_Tp>::max();
-            else
-                return numeric_limits<_Tp>::min();
-        }
-        return static_cast<_Tp>(__ll);
-    }
-    __err = ios_base::failbit;
-    return 0;
-}
-
-template <class _Tp>
-_Tp
-__num_get_unsigned_integral(const char* __a, const char* __a_end,
-                            ios_base::iostate& __err, int __base)
-{
-    if (__a != __a_end)
-    {
-        if (*__a == '-')
-        {
-            __err = ios_base::failbit;
-            return 0;
-        }
-        typename remove_reference<decltype(errno)>::type __save_errno = errno;
-        errno = 0;
-        char *__p2;
-        unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE);
-        typename remove_reference<decltype(errno)>::type __current_errno = errno;
-        if (__current_errno == 0)
-            errno = __save_errno;
-        if (__p2 != __a_end)
-        {
-            __err = ios_base::failbit;
-            return 0;
-        }
-        else if (__current_errno == ERANGE ||
-                 numeric_limits<_Tp>::max() < __ll)
-        {
-            __err = ios_base::failbit;
-            return numeric_limits<_Tp>::max();
-        }
-        return static_cast<_Tp>(__ll);
-    }
-    __err = ios_base::failbit;
-    return 0;
-}
-
-template <class _Tp>
-_Tp
-__num_get_float(const char* __a, const char* __a_end, ios_base::iostate& __err)
-{
-    if (__a != __a_end)
-    {
-        typename remove_reference<decltype(errno)>::type __save_errno = errno;
-        errno = 0;
-        char *__p2;
-        long double __ld = strtold_l(__a, &__p2, _LIBCPP_GET_C_LOCALE);
-        typename remove_reference<decltype(errno)>::type __current_errno = errno;
-        if (__current_errno == 0)
-            errno = __save_errno;
-        if (__p2 != __a_end)
-        {
-            __err = ios_base::failbit;
-            return 0;
-        }
-        else if (__current_errno == ERANGE)
-            __err = ios_base::failbit;
-        return static_cast<_Tp>(__ld);
-    }
-    __err = ios_base::failbit;
-    return 0;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        bool& __v) const
-{
-    if ((__iob.flags() & ios_base::boolalpha) == 0)
-    {
-        long __lv = -1;
-        __b = do_get(__b, __e, __iob, __err, __lv);
-        switch (__lv)
-        {
-        case 0:
-            __v = false;
-            break;
-        case 1:
-            __v = true;
-            break;
-        default:
-            __v = true;
-            __err = ios_base::failbit;
-            break;
-        }
-        return __b;
-    }
-    const ctype<_CharT>& __ct = use_facet<ctype<_CharT> >(__iob.getloc());
-    const numpunct<_CharT>& __np = use_facet<numpunct<_CharT> >(__iob.getloc());
-    typedef typename numpunct<_CharT>::string_type string_type;
-    const string_type __names[2] = {__np.truename(), __np.falsename()};
-    const string_type* __i = __scan_keyword(__b, __e, __names, __names+2,
-                                            __ct, __err);
-    __v = __i == __names;
-    return __b;
-}
-
-// signed
-
-template <class _CharT, class _InputIterator>
-template <class _Signed>
-_InputIterator
-num_get<_CharT, _InputIterator>::__do_get_signed(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        _Signed& __v) const
-{
-    // Stage 1
-    int __base = this->__get_base(__iob);
-    // Stage 2
-    char_type __atoms[26];
-    char_type __thousands_sep;
-    string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    string __buf;
-    __buf.resize(__buf.capacity());
-    char* __a = &__buf[0];
-    char* __a_end = __a;
-    unsigned __g[__num_get_base::__num_get_buf_sz];
-    unsigned* __g_end = __g;
-    unsigned __dc = 0;
-    for (; __b != __e; ++__b)
-    {
-        if (__a_end == __a + __buf.size())
-        {
-            size_t __tmp = __buf.size();
-            __buf.resize(2*__buf.size());
-            __buf.resize(__buf.capacity());
-            __a = &__buf[0];
-            __a_end = __a + __tmp;
-        }
-        if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
-                                    __thousands_sep, __grouping, __g, __g_end,
-                                    __atoms))
-            break;
-    }
-    if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
-        *__g_end++ = __dc;
-    // Stage 3
-    __v = __num_get_signed_integral<_Signed>(__a, __a_end, __err, __base);
-    // Digit grouping checked
-    __check_grouping(__grouping, __g, __g_end, __err);
-    // EOF checked
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-// unsigned
-
-template <class _CharT, class _InputIterator>
-template <class _Unsigned>
-_InputIterator
-num_get<_CharT, _InputIterator>::__do_get_unsigned(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        _Unsigned& __v) const
-{
-    // Stage 1
-    int __base = this->__get_base(__iob);
-    // Stage 2
-    char_type __atoms[26];
-    char_type __thousands_sep;
-    string __grouping = this->__stage2_int_prep(__iob, __atoms, __thousands_sep);
-    string __buf;
-    __buf.resize(__buf.capacity());
-    char* __a = &__buf[0];
-    char* __a_end = __a;
-    unsigned __g[__num_get_base::__num_get_buf_sz];
-    unsigned* __g_end = __g;
-    unsigned __dc = 0;
-    for (; __b != __e; ++__b)
-    {
-        if (__a_end == __a + __buf.size())
-        {
-            size_t __tmp = __buf.size();
-            __buf.resize(2*__buf.size());
-            __buf.resize(__buf.capacity());
-            __a = &__buf[0];
-            __a_end = __a + __tmp;
-        }
-        if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
-                                    __thousands_sep, __grouping, __g, __g_end,
-                                    __atoms))
-            break;
-    }
-    if (__grouping.size() != 0 && __g_end-__g < __num_get_base::__num_get_buf_sz)
-        *__g_end++ = __dc;
-    // Stage 3
-    __v = __num_get_unsigned_integral<_Unsigned>(__a, __a_end, __err, __base);
-    // Digit grouping checked
-    __check_grouping(__grouping, __g, __g_end, __err);
-    // EOF checked
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-// floating point
-
-template <class _CharT, class _InputIterator>
-template <class _Fp>
-_InputIterator
-num_get<_CharT, _InputIterator>::__do_get_floating_point(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        _Fp& __v) const
-{
-    // Stage 1, nothing to do
-    // Stage 2
-    char_type __atoms[32];
-    char_type __decimal_point;
-    char_type __thousands_sep;
-    string __grouping = this->__stage2_float_prep(__iob, __atoms,
-                                                  __decimal_point,
-                                                  __thousands_sep);
-    string __buf;
-    __buf.resize(__buf.capacity());
-    char* __a = &__buf[0];
-    char* __a_end = __a;
-    unsigned __g[__num_get_base::__num_get_buf_sz];
-    unsigned* __g_end = __g;
-    unsigned __dc = 0;
-    bool __in_units = true;
-    char __exp = 'E';
-    for (; __b != __e; ++__b)
-    {
-        if (__a_end == __a + __buf.size())
-        {
-            size_t __tmp = __buf.size();
-            __buf.resize(2*__buf.size());
-            __buf.resize(__buf.capacity());
-            __a = &__buf[0];
-            __a_end = __a + __tmp;
-        }
-        if (this->__stage2_float_loop(*__b, __in_units, __exp, __a, __a_end,
-                                      __decimal_point, __thousands_sep,
-                                      __grouping, __g, __g_end,
-                                      __dc, __atoms))
-            break;
-    }
-    if (__grouping.size() != 0 && __in_units && __g_end-__g < __num_get_base::__num_get_buf_sz)
-        *__g_end++ = __dc;
-    // Stage 3
-    __v = __num_get_float<_Fp>(__a, __a_end, __err);
-    // Digit grouping checked
-    __check_grouping(__grouping, __g, __g_end, __err);
-    // EOF checked
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                        ios_base& __iob,
-                                        ios_base::iostate& __err,
-                                        void*& __v) const
-{
-    // Stage 1
-    int __base = 16;
-    // Stage 2
-    char_type __atoms[26];
-    char_type __thousands_sep = 0;
-    string __grouping;
-    use_facet<ctype<_CharT> >(__iob.getloc()).widen(__num_get_base::__src,
-                                                    __num_get_base::__src + 26, __atoms);
-    string __buf;
-    __buf.resize(__buf.capacity());
-    char* __a = &__buf[0];
-    char* __a_end = __a;
-    unsigned __g[__num_get_base::__num_get_buf_sz];
-    unsigned* __g_end = __g;
-    unsigned __dc = 0;
-    for (; __b != __e; ++__b)
-    {
-        if (__a_end == __a + __buf.size())
-        {
-            size_t __tmp = __buf.size();
-            __buf.resize(2*__buf.size());
-            __buf.resize(__buf.capacity());
-            __a = &__buf[0];
-            __a_end = __a + __tmp;
-        }
-        if (this->__stage2_int_loop(*__b, __base, __a, __a_end, __dc,
-                                    __thousands_sep, __grouping,
-                                    __g, __g_end, __atoms))
-            break;
-    }
-    // Stage 3
-    __buf.resize(__a_end - __a);
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    if (sscanf_l(__buf.c_str(), _LIBCPP_GET_C_LOCALE, "%p", &__v) != 1)
-#else
-    if (__sscanf_l(__buf.c_str(), __cloc(), "%p", &__v) != 1)
-#endif
-        __err = ios_base::failbit;
-    // EOF checked
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS num_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS num_get<wchar_t>)
-
-struct _LIBCPP_TYPE_VIS __num_put_base
-{
-protected:
-    static void __format_int(char* __fmt, const char* __len, bool __signd,
-                             ios_base::fmtflags __flags);
-    static bool __format_float(char* __fmt, const char* __len,
-                               ios_base::fmtflags __flags);
-    static char* __identify_padding(char* __nb, char* __ne,
-                                    const ios_base& __iob);
-};
-
-template <class _CharT>
-struct __num_put
-    : protected __num_put_base
-{
-    static void __widen_and_group_int(char* __nb, char* __np, char* __ne,
-                                      _CharT* __ob, _CharT*& __op, _CharT*& __oe,
-                                      const locale& __loc);
-    static void __widen_and_group_float(char* __nb, char* __np, char* __ne,
-                                        _CharT* __ob, _CharT*& __op, _CharT*& __oe,
-                                        const locale& __loc);
-};
-
-template <class _CharT>
-void
-__num_put<_CharT>::__widen_and_group_int(char* __nb, char* __np, char* __ne,
-                                         _CharT* __ob, _CharT*& __op, _CharT*& __oe,
-                                         const locale& __loc)
-{
-    const ctype<_CharT>&    __ct = use_facet<ctype<_CharT> >   (__loc);
-    const numpunct<_CharT>& __npt = use_facet<numpunct<_CharT> >(__loc);
-    string __grouping = __npt.grouping();
-    if (__grouping.empty())
-    {
-        __ct.widen(__nb, __ne, __ob);
-        __oe = __ob + (__ne - __nb);
-    }
-    else
-    {
-        __oe = __ob;
-        char* __nf = __nb;
-        if (*__nf == '-' || *__nf == '+')
-            *__oe++ = __ct.widen(*__nf++);
-        if (__ne - __nf >= 2 && __nf[0] == '0' && (__nf[1] == 'x' ||
-                                                   __nf[1] == 'X'))
-        {
-            *__oe++ = __ct.widen(*__nf++);
-            *__oe++ = __ct.widen(*__nf++);
-        }
-        reverse(__nf, __ne);
-        _CharT __thousands_sep = __npt.thousands_sep();
-        unsigned __dc = 0;
-        unsigned __dg = 0;
-        for (char* __p = __nf; __p < __ne; ++__p)
-        {
-            if (static_cast<unsigned>(__grouping[__dg]) > 0 &&
-                __dc == static_cast<unsigned>(__grouping[__dg]))
-            {
-                *__oe++ = __thousands_sep;
-                __dc = 0;
-                if (__dg < __grouping.size()-1)
-                    ++__dg;
-            }
-            *__oe++ = __ct.widen(*__p);
-            ++__dc;
-        }
-        reverse(__ob + (__nf - __nb), __oe);
-    }
-    if (__np == __ne)
-        __op = __oe;
-    else
-        __op = __ob + (__np - __nb);
-}
-
-template <class _CharT>
-void
-__num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne,
-                                           _CharT* __ob, _CharT*& __op, _CharT*& __oe,
-                                           const locale& __loc)
-{
-    const ctype<_CharT>&    __ct = use_facet<ctype<_CharT> >   (__loc);
-    const numpunct<_CharT>& __npt = use_facet<numpunct<_CharT> >(__loc);
-    string __grouping = __npt.grouping();
-    __oe = __ob;
-    char* __nf = __nb;
-    if (*__nf == '-' || *__nf == '+')
-        *__oe++ = __ct.widen(*__nf++);
-    char* __ns;
-    if (__ne - __nf >= 2 && __nf[0] == '0' && (__nf[1] == 'x' ||
-                                               __nf[1] == 'X'))
-    {
-        *__oe++ = __ct.widen(*__nf++);
-        *__oe++ = __ct.widen(*__nf++);
-        for (__ns = __nf; __ns < __ne; ++__ns)
-            if (!isxdigit_l(*__ns, _LIBCPP_GET_C_LOCALE))
-                break;
-    }
-    else
-    {
-        for (__ns = __nf; __ns < __ne; ++__ns)
-            if (!isdigit_l(*__ns, _LIBCPP_GET_C_LOCALE))
-                break;
-    }
-    if (__grouping.empty())
-    {
-        __ct.widen(__nf, __ns, __oe);
-        __oe += __ns - __nf;
-    }
-    else
-    {
-        reverse(__nf, __ns);
-        _CharT __thousands_sep = __npt.thousands_sep();
-        unsigned __dc = 0;
-        unsigned __dg = 0;
-        for (char* __p = __nf; __p < __ns; ++__p)
-        {
-            if (__grouping[__dg] > 0 && __dc == static_cast<unsigned>(__grouping[__dg]))
-            {
-                *__oe++ = __thousands_sep;
-                __dc = 0;
-                if (__dg < __grouping.size()-1)
-                    ++__dg;
-            }
-            *__oe++ = __ct.widen(*__p);
-            ++__dc;
-        }
-        reverse(__ob + (__nf - __nb), __oe);
-    }
-    for (__nf = __ns; __nf < __ne; ++__nf)
-    {
-        if (*__nf == '.')
-        {
-            *__oe++ = __npt.decimal_point();
-            ++__nf;
-            break;
-        }
-        else
-            *__oe++ = __ct.widen(*__nf);
-    }
-    __ct.widen(__nf, __ne, __oe);
-    __oe += __ne - __nf;
-    if (__np == __ne)
-        __op = __oe;
-    else
-        __op = __ob + (__np - __nb);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(struct _LIBCPP_TYPE_VIS __num_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(struct _LIBCPP_TYPE_VIS __num_put<wchar_t>)
-
-template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY num_put
-    : public locale::facet,
-      private __num_put<_CharT>
-{
-public:
-    typedef _CharT char_type;
-    typedef _OutputIterator iter_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit num_put(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  bool __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  long __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  long long __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  unsigned long __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  unsigned long long __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  double __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  long double __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  const void* __v) const
-    {
-        return do_put(__s, __iob, __fl, __v);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~num_put() {}
-
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             bool __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             long __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             long long __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             unsigned long) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             unsigned long long) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             double __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             long double __v) const;
-    virtual iter_type do_put(iter_type __s, ios_base& __iob, char_type __fl,
-                             const void* __v) const;
-};
-
-template <class _CharT, class _OutputIterator>
-locale::id
-num_put<_CharT, _OutputIterator>::id;
-
-template <class _CharT, class _OutputIterator>
-_LIBCPP_HIDDEN
-_OutputIterator
-__pad_and_output(_OutputIterator __s,
-                 const _CharT* __ob, const _CharT* __op, const _CharT* __oe,
-                 ios_base& __iob, _CharT __fl)
-{
-    streamsize __sz = __oe - __ob;
-    streamsize __ns = __iob.width();
-    if (__ns > __sz)
-        __ns -= __sz;
-    else
-        __ns = 0;
-    for (;__ob < __op; ++__ob, ++__s)
-        *__s = *__ob;
-    for (; __ns; --__ns, ++__s)
-        *__s = __fl;
-    for (; __ob < __oe; ++__ob, ++__s)
-        *__s = *__ob;
-    __iob.width(0);
-    return __s;
-}
-
-#if !defined(__APPLE__) || \
-    (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED > __MAC_10_8) || \
-    (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0)
-
-template <class _CharT, class _Traits>
-_LIBCPP_HIDDEN
-ostreambuf_iterator<_CharT, _Traits>
-__pad_and_output(ostreambuf_iterator<_CharT, _Traits> __s,
-                 const _CharT* __ob, const _CharT* __op, const _CharT* __oe,
-                 ios_base& __iob, _CharT __fl)
-{
-    if (__s.__sbuf_ == nullptr)
-        return __s;
-    streamsize __sz = __oe - __ob;
-    streamsize __ns = __iob.width();
-    if (__ns > __sz)
-        __ns -= __sz;
-    else
-        __ns = 0;
-    streamsize __np = __op - __ob;
-    if (__np > 0)
-    {
-        if (__s.__sbuf_->sputn(__ob, __np) != __np)
-        {
-            __s.__sbuf_ = nullptr;
-            return __s;
-        }
-    }
-    if (__ns > 0)
-    {
-        basic_string<_CharT, _Traits> __sp(__ns, __fl);
-        if (__s.__sbuf_->sputn(__sp.data(), __ns) != __ns)
-        {
-            __s.__sbuf_ = nullptr;
-            return __s;
-        }
-    }
-    __np = __oe - __op;
-    if (__np > 0)
-    {
-        if (__s.__sbuf_->sputn(__op, __np) != __np)
-        {
-            __s.__sbuf_ = nullptr;
-            return __s;
-        }
-    }
-    __iob.width(0);
-    return __s;
-}
-
-#endif
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, bool __v) const
-{
-    if ((__iob.flags() & ios_base::boolalpha) == 0)
-        return do_put(__s, __iob, __fl, (unsigned long)__v);
-    const numpunct<char_type>& __np = use_facet<numpunct<char_type> >(__iob.getloc());
-    typedef typename numpunct<char_type>::string_type string_type;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    string_type __tmp(__v ? __np.truename() : __np.falsename());
-    string_type __nm = _VSTD::move(__tmp);
-#else
-    string_type __nm = __v ? __np.truename() : __np.falsename();
-#endif
-    for (typename string_type::iterator __i = __nm.begin(); __i != __nm.end(); ++__i, ++__s)
-        *__s = *__i;
-    return __s;
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, long __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[6] = {'%', 0};
-    const char* __len = "l";
-    this->__format_int(__fmt+1, __len, true, __iob.flags());
-    const unsigned __nbuf = (numeric_limits<long>::digits / 3)
-                          + ((numeric_limits<long>::digits % 3) != 0)
-                          + 1;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, long long __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[8] = {'%', 0};
-    const char* __len = "ll";
-    this->__format_int(__fmt+1, __len, true, __iob.flags());
-    const unsigned __nbuf = (numeric_limits<long long>::digits / 3)
-                          + ((numeric_limits<long long>::digits % 3) != 0)
-                          + 1;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, unsigned long __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[6] = {'%', 0};
-    const char* __len = "l";
-    this->__format_int(__fmt+1, __len, false, __iob.flags());
-    const unsigned __nbuf = (numeric_limits<unsigned long>::digits / 3)
-                          + ((numeric_limits<unsigned long>::digits % 3) != 0)
-                          + 1;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, unsigned long long __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[8] = {'%', 0};
-    const char* __len = "ll";
-    this->__format_int(__fmt+1, __len, false, __iob.flags());
-    const unsigned __nbuf = (numeric_limits<unsigned long long>::digits / 3)
-                          + ((numeric_limits<unsigned long long>::digits % 3) != 0)
-                          + 1;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_int(__nar, __np, __ne, __o, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, double __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[8] = {'%', 0};
-    const char* __len = "";
-    bool __specify_precision = this->__format_float(__fmt+1, __len, __iob.flags());
-    const unsigned __nbuf = 30;
-    char __nar[__nbuf];
-    char* __nb = __nar;
-    int __nc;
-    if (__specify_precision)
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __nc = snprintf_l(__nb, __nbuf, _LIBCPP_GET_C_LOCALE, __fmt,
-                                   (int)__iob.precision(), __v);
-#else
-        __nc = __snprintf_l(__nb, __nbuf, __cloc(), __fmt,
-                            (int)__iob.precision(), __v);
-#endif
-    else
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __nc = snprintf_l(__nb, __nbuf, _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-        __nc = __snprintf_l(__nb, __nbuf, __cloc(), __fmt, __v);
-#endif
-    unique_ptr<char, void(*)(void*)> __nbh(0, free);
-    if (__nc > static_cast<int>(__nbuf-1))
-    {
-        if (__specify_precision)
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-            __nc = asprintf_l(&__nb, _LIBCPP_GET_C_LOCALE, __fmt, (int)__iob.precision(), __v);
-#else
-            __nc = __asprintf_l(&__nb, __cloc(), __fmt,
-                              (int)__iob.precision(), __v);
-#endif
-        else
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-            __nc = asprintf_l(&__nb, _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-            __nc = __asprintf_l(&__nb, __cloc(), __fmt, (int)__iob.precision(), __v);
-#endif
-        if (__nb == 0)
-            __throw_bad_alloc();
-        __nbh.reset(__nb);
-    }
-    char* __ne = __nb + __nc;
-    char* __np = this->__identify_padding(__nb, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __ob = __o;
-    unique_ptr<char_type, void(*)(void*)> __obh(0, free);
-    if (__nb != __nar)
-    {
-        __ob = (char_type*)malloc(2*static_cast<size_t>(__nc)*sizeof(char_type));
-        if (__ob == 0)
-            __throw_bad_alloc();
-        __obh.reset(__ob);
-    }
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_float(__nb, __np, __ne, __ob, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    __s = __pad_and_output(__s, __ob, __op, __oe, __iob, __fl);
-    return __s;
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, long double __v) const
-{
-    // Stage 1 - Get number in narrow char
-    char __fmt[8] = {'%', 0};
-    const char* __len = "L";
-    bool __specify_precision = this->__format_float(__fmt+1, __len, __iob.flags());
-    const unsigned __nbuf = 30;
-    char __nar[__nbuf];
-    char* __nb = __nar;
-    int __nc;
-    if (__specify_precision)
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __nc = snprintf_l(__nb, __nbuf, _LIBCPP_GET_C_LOCALE, __fmt,
-                                   (int)__iob.precision(), __v);
-#else
-        __nc = __snprintf_l(__nb, __nbuf, __cloc(), __fmt,
-                            (int)__iob.precision(), __v);
-#endif
-    else
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __nc = snprintf_l(__nb, __nbuf, _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-        __nc = __snprintf_l(__nb, __nbuf, __cloc(), __fmt, __v);
-#endif
-    unique_ptr<char, void(*)(void*)> __nbh(0, free);
-    if (__nc > static_cast<int>(__nbuf-1))
-    {
-        if (__specify_precision)
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-            __nc = asprintf_l(&__nb, _LIBCPP_GET_C_LOCALE, __fmt, (int)__iob.precision(), __v);
-#else
-            __nc = __asprintf_l(&__nb, __cloc(), __fmt,
-                              (int)__iob.precision(), __v);
-#endif
-        else
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-            __nc = asprintf_l(&__nb, _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-            __nc = __asprintf_l(&__nb, __cloc(), __fmt, __v);
-#endif
-        if (__nb == 0)
-            __throw_bad_alloc();
-        __nbh.reset(__nb);
-    }
-    char* __ne = __nb + __nc;
-    char* __np = this->__identify_padding(__nb, __ne, __iob);
-    // Stage 2 - Widen __nar while adding thousands separators
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __ob = __o;
-    unique_ptr<char_type, void(*)(void*)> __obh(0, free);
-    if (__nb != __nar)
-    {
-        __ob = (char_type*)malloc(2*static_cast<size_t>(__nc)*sizeof(char_type));
-        if (__ob == 0)
-            __throw_bad_alloc();
-        __obh.reset(__ob);
-    }
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    this->__widen_and_group_float(__nb, __np, __ne, __ob, __op, __oe, __iob.getloc());
-    // [__o, __oe) contains thousands_sep'd wide number
-    // Stage 3 & 4
-    __s = __pad_and_output(__s, __ob, __op, __oe, __iob, __fl);
-    return __s;
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-num_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base& __iob,
-                                         char_type __fl, const void* __v) const
-{
-    // Stage 1 - Get pointer in narrow char
-    char __fmt[6] = "%p";
-    const unsigned __nbuf = 20;
-    char __nar[__nbuf];
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-    int __nc = snprintf_l(__nar, sizeof(__nar), _LIBCPP_GET_C_LOCALE, __fmt, __v);
-#else
-    int __nc = __snprintf_l(__nar, sizeof(__nar), __cloc(), __fmt, __v);
-#endif
-    char* __ne = __nar + __nc;
-    char* __np = this->__identify_padding(__nar, __ne, __iob);
-    // Stage 2 - Widen __nar
-    char_type __o[2*(__nbuf-1) - 1];
-    char_type* __op;  // pad here
-    char_type* __oe;  // end of output
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __ct.widen(__nar, __ne, __o);
-    __oe = __o + (__ne - __nar);
-    if (__np == __ne)
-        __op = __oe;
-    else
-        __op = __o + (__np - __nar);
-    // [__o, __oe) contains wide number
-    // Stage 3 & 4
-    return __pad_and_output(__s, __o, __op, __oe, __iob, __fl);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS num_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS num_put<wchar_t>)
-
-template <class _CharT, class _InputIterator>
-_LIBCPP_HIDDEN
-int
-__get_up_to_n_digits(_InputIterator& __b, _InputIterator __e,
-                     ios_base::iostate& __err, const ctype<_CharT>& __ct, int __n)
-{
-    // Precondition:  __n >= 1
-    if (__b == __e)
-    {
-        __err |= ios_base::eofbit | ios_base::failbit;
-        return 0;
-    }
-    // get first digit
-    _CharT __c = *__b;
-    if (!__ct.is(ctype_base::digit, __c))
-    {
-        __err |= ios_base::failbit;
-        return 0;
-    }
-    int __r = __ct.narrow(__c, 0) - '0';
-    for (++__b, (void) --__n; __b != __e && __n > 0; ++__b, (void) --__n)
-    {
-        // get next digit
-        __c = *__b;
-        if (!__ct.is(ctype_base::digit, __c))
-            return __r;
-        __r = __r * 10 + __ct.narrow(__c, 0) - '0';
-    }
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __r;
-}
-
-class _LIBCPP_TYPE_VIS time_base
-{
-public:
-    enum dateorder {no_order, dmy, mdy, ymd, ydm};
-};
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY __time_get_c_storage
-{
-protected:
-    typedef basic_string<_CharT> string_type;
-
-    virtual const string_type* __weeks() const;
-    virtual const string_type* __months() const;
-    virtual const string_type* __am_pm() const;
-    virtual const string_type& __c() const;
-    virtual const string_type& __r() const;
-    virtual const string_type& __x() const;
-    virtual const string_type& __X() const;
-};
-
-template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY time_get
-    : public locale::facet,
-      public time_base,
-      private __time_get_c_storage<_CharT>
-{
-public:
-    typedef _CharT                  char_type;
-    typedef _InputIterator          iter_type;
-    typedef time_base::dateorder    dateorder;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_get(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    dateorder date_order() const
-    {
-        return this->do_date_order();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_time(iter_type __b, iter_type __e, ios_base& __iob,
-                       ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_time(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_date(iter_type __b, iter_type __e, ios_base& __iob,
-                       ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_date(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_weekday(iter_type __b, iter_type __e, ios_base& __iob,
-                          ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_weekday(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_monthname(iter_type __b, iter_type __e, ios_base& __iob,
-                            ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_monthname(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get_year(iter_type __b, iter_type __e, ios_base& __iob,
-                       ios_base::iostate& __err, tm* __tm) const
-    {
-        return do_get_year(__b, __e, __iob, __err, __tm);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, tm *__tm,
-                  char __fmt, char __mod = 0) const
-    {
-        return do_get(__b, __e, __iob, __err, __tm, __fmt, __mod);
-    }
-
-    iter_type get(iter_type __b, iter_type __e, ios_base& __iob,
-                  ios_base::iostate& __err, tm* __tm,
-                  const char_type* __fmtb, const char_type* __fmte) const;
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~time_get() {}
-
-    virtual dateorder do_date_order() const;
-    virtual iter_type do_get_time(iter_type __b, iter_type __e, ios_base& __iob,
-                                  ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get_date(iter_type __b, iter_type __e, ios_base& __iob,
-                                  ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get_weekday(iter_type __b, iter_type __e, ios_base& __iob,
-                                     ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get_monthname(iter_type __b, iter_type __e, ios_base& __iob,
-                                       ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get_year(iter_type __b, iter_type __e, ios_base& __iob,
-                                  ios_base::iostate& __err, tm* __tm) const;
-    virtual iter_type do_get(iter_type __b, iter_type __e, ios_base& __iob,
-                             ios_base::iostate& __err, tm* __tm,
-                             char __fmt, char __mod) const;
-private:
-    void __get_white_space(iter_type& __b, iter_type __e,
-                           ios_base::iostate& __err, const ctype<char_type>& __ct) const;
-    void __get_percent(iter_type& __b, iter_type __e, ios_base::iostate& __err,
-                       const ctype<char_type>& __ct) const;
-
-    void __get_weekdayname(int& __m,
-                           iter_type& __b, iter_type __e,
-                           ios_base::iostate& __err,
-                           const ctype<char_type>& __ct) const;
-    void __get_monthname(int& __m,
-                         iter_type& __b, iter_type __e,
-                         ios_base::iostate& __err,
-                         const ctype<char_type>& __ct) const;
-    void __get_day(int& __d,
-                   iter_type& __b, iter_type __e,
-                   ios_base::iostate& __err,
-                   const ctype<char_type>& __ct) const;
-    void __get_month(int& __m,
-                     iter_type& __b, iter_type __e,
-                     ios_base::iostate& __err,
-                     const ctype<char_type>& __ct) const;
-    void __get_year(int& __y,
-                   iter_type& __b, iter_type __e,
-                   ios_base::iostate& __err,
-                   const ctype<char_type>& __ct) const;
-    void __get_year4(int& __y,
-                    iter_type& __b, iter_type __e,
-                    ios_base::iostate& __err,
-                    const ctype<char_type>& __ct) const;
-    void __get_hour(int& __d,
-                    iter_type& __b, iter_type __e,
-                    ios_base::iostate& __err,
-                    const ctype<char_type>& __ct) const;
-    void __get_12_hour(int& __h,
-                       iter_type& __b, iter_type __e,
-                       ios_base::iostate& __err,
-                       const ctype<char_type>& __ct) const;
-    void __get_am_pm(int& __h,
-                     iter_type& __b, iter_type __e,
-                     ios_base::iostate& __err,
-                     const ctype<char_type>& __ct) const;
-    void __get_minute(int& __m,
-                      iter_type& __b, iter_type __e,
-                      ios_base::iostate& __err,
-                      const ctype<char_type>& __ct) const;
-    void __get_second(int& __s,
-                      iter_type& __b, iter_type __e,
-                      ios_base::iostate& __err,
-                      const ctype<char_type>& __ct) const;
-    void __get_weekday(int& __w,
-                       iter_type& __b, iter_type __e,
-                       ios_base::iostate& __err,
-                       const ctype<char_type>& __ct) const;
-    void __get_day_year_num(int& __w,
-                            iter_type& __b, iter_type __e,
-                            ios_base::iostate& __err,
-                            const ctype<char_type>& __ct) const;
-};
-
-template <class _CharT, class _InputIterator>
-locale::id
-time_get<_CharT, _InputIterator>::id;
-
-// time_get primitives
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_weekdayname(int& __w,
-                                                    iter_type& __b, iter_type __e,
-                                                    ios_base::iostate& __err,
-                                                    const ctype<char_type>& __ct) const
-{
-    // Note:  ignoring case comes from the POSIX strptime spec
-    const string_type* __wk = this->__weeks();
-    ptrdiff_t __i = __scan_keyword(__b, __e, __wk, __wk+14, __ct, __err, false) - __wk;
-    if (__i < 14)
-        __w = __i % 7;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_monthname(int& __m,
-                                                  iter_type& __b, iter_type __e,
-                                                  ios_base::iostate& __err,
-                                                  const ctype<char_type>& __ct) const
-{
-    // Note:  ignoring case comes from the POSIX strptime spec
-    const string_type* __month = this->__months();
-    ptrdiff_t __i = __scan_keyword(__b, __e, __month, __month+24, __ct, __err, false) - __month;
-    if (__i < 24)
-        __m = __i % 12;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_day(int& __d,
-                                            iter_type& __b, iter_type __e,
-                                            ios_base::iostate& __err,
-                                            const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && 1 <= __t && __t <= 31)
-        __d = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_month(int& __m,
-                                              iter_type& __b, iter_type __e,
-                                              ios_base::iostate& __err,
-                                              const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2) - 1;
-    if (!(__err & ios_base::failbit) && __t <= 11)
-        __m = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_year(int& __y,
-                                             iter_type& __b, iter_type __e,
-                                             ios_base::iostate& __err,
-                                             const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 4);
-    if (!(__err & ios_base::failbit))
-    {
-        if (__t < 69)
-            __t += 2000;
-        else if (69 <= __t && __t <= 99)
-            __t += 1900;
-        __y = __t - 1900;
-    }
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_year4(int& __y,
-                                              iter_type& __b, iter_type __e,
-                                              ios_base::iostate& __err,
-                                              const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 4);
-    if (!(__err & ios_base::failbit))
-        __y = __t - 1900;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_hour(int& __h,
-                                             iter_type& __b, iter_type __e,
-                                             ios_base::iostate& __err,
-                                             const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && __t <= 23)
-        __h = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_12_hour(int& __h,
-                                                iter_type& __b, iter_type __e,
-                                                ios_base::iostate& __err,
-                                                const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && 1 <= __t && __t <= 12)
-        __h = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_minute(int& __m,
-                                               iter_type& __b, iter_type __e,
-                                               ios_base::iostate& __err,
-                                               const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && __t <= 59)
-        __m = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_second(int& __s,
-                                               iter_type& __b, iter_type __e,
-                                               ios_base::iostate& __err,
-                                               const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 2);
-    if (!(__err & ios_base::failbit) && __t <= 60)
-        __s = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_weekday(int& __w,
-                                                iter_type& __b, iter_type __e,
-                                                ios_base::iostate& __err,
-                                                const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 1);
-    if (!(__err & ios_base::failbit) && __t <= 6)
-        __w = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_day_year_num(int& __d,
-                                                     iter_type& __b, iter_type __e,
-                                                     ios_base::iostate& __err,
-                                                     const ctype<char_type>& __ct) const
-{
-    int __t = __get_up_to_n_digits(__b, __e, __err, __ct, 3);
-    if (!(__err & ios_base::failbit) && __t <= 365)
-        __d = __t;
-    else
-        __err |= ios_base::failbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_white_space(iter_type& __b, iter_type __e,
-                                                    ios_base::iostate& __err,
-                                                    const ctype<char_type>& __ct) const
-{
-    for (; __b != __e && __ct.is(ctype_base::space, *__b); ++__b)
-        ;
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_am_pm(int& __h,
-                                              iter_type& __b, iter_type __e,
-                                              ios_base::iostate& __err,
-                                              const ctype<char_type>& __ct) const
-{
-    const string_type* __ap = this->__am_pm();
-    if (__ap[0].size() + __ap[1].size() == 0)
-    {
-        __err |= ios_base::failbit;
-        return;
-    }
-    ptrdiff_t __i = __scan_keyword(__b, __e, __ap, __ap+2, __ct, __err, false) - __ap;
-    if (__i == 0 && __h == 12)
-        __h = 0;
-    else if (__i == 1 && __h < 12)
-        __h += 12;
-}
-
-template <class _CharT, class _InputIterator>
-void
-time_get<_CharT, _InputIterator>::__get_percent(iter_type& __b, iter_type __e,
-                                                ios_base::iostate& __err,
-                                                const ctype<char_type>& __ct) const
-{
-    if (__b == __e)
-    {
-        __err |= ios_base::eofbit | ios_base::failbit;
-        return;
-    }
-    if (__ct.narrow(*__b, 0) != '%')
-        __err |= ios_base::failbit;
-    else if(++__b == __e)
-        __err |= ios_base::eofbit;
-}
-
-// time_get end primitives
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::get(iter_type __b, iter_type __e,
-                                      ios_base& __iob,
-                                      ios_base::iostate& __err, tm* __tm,
-                                      const char_type* __fmtb, const char_type* __fmte) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __err = ios_base::goodbit;
-    while (__fmtb != __fmte && __err == ios_base::goodbit)
-    {
-        if (__b == __e)
-        {
-            __err = ios_base::failbit;
-            break;
-        }
-        if (__ct.narrow(*__fmtb, 0) == '%')
-        {
-            if (++__fmtb == __fmte)
-            {
-                __err = ios_base::failbit;
-                break;
-            }
-            char __cmd = __ct.narrow(*__fmtb, 0);
-            char __opt = '\0';
-            if (__cmd == 'E' || __cmd == '0')
-            {
-                if (++__fmtb == __fmte)
-                {
-                    __err = ios_base::failbit;
-                    break;
-                }
-                __opt = __cmd;
-                __cmd = __ct.narrow(*__fmtb, 0);
-            }
-            __b = do_get(__b, __e, __iob, __err, __tm, __cmd, __opt);
-            ++__fmtb;
-        }
-        else if (__ct.is(ctype_base::space, *__fmtb))
-        {
-            for (++__fmtb; __fmtb != __fmte && __ct.is(ctype_base::space, *__fmtb); ++__fmtb)
-                ;
-            for (        ;    __b != __e    && __ct.is(ctype_base::space, *__b);    ++__b)
-                ;
-        }
-        else if (__ct.toupper(*__b) == __ct.toupper(*__fmtb))
-        {
-            ++__b;
-            ++__fmtb;
-        }
-        else
-            __err = ios_base::failbit;
-    }
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-typename time_get<_CharT, _InputIterator>::dateorder
-time_get<_CharT, _InputIterator>::do_date_order() const
-{
-    return mdy;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_time(iter_type __b, iter_type __e,
-                                              ios_base& __iob,
-                                              ios_base::iostate& __err,
-                                              tm* __tm) const
-{
-    const char_type __fmt[] = {'%', 'H', ':', '%', 'M', ':', '%', 'S'};
-    return get(__b, __e, __iob, __err, __tm, __fmt, __fmt + sizeof(__fmt)/sizeof(__fmt[0]));
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_date(iter_type __b, iter_type __e,
-                                              ios_base& __iob,
-                                              ios_base::iostate& __err,
-                                              tm* __tm) const
-{
-    const string_type& __fmt = this->__x();
-    return get(__b, __e, __iob, __err, __tm, __fmt.data(), __fmt.data() + __fmt.size());
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_weekday(iter_type __b, iter_type __e,
-                                                 ios_base& __iob,
-                                                 ios_base::iostate& __err,
-                                                 tm* __tm) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __get_weekdayname(__tm->tm_wday, __b, __e, __err, __ct);
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_monthname(iter_type __b, iter_type __e,
-                                                   ios_base& __iob,
-                                                   ios_base::iostate& __err,
-                                                   tm* __tm) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __get_monthname(__tm->tm_mon, __b, __e, __err, __ct);
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get_year(iter_type __b, iter_type __e,
-                                              ios_base& __iob,
-                                              ios_base::iostate& __err,
-                                              tm* __tm) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    __get_year(__tm->tm_year, __b, __e, __err, __ct);
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-time_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                         ios_base& __iob,
-                                         ios_base::iostate& __err, tm* __tm,
-                                         char __fmt, char) const
-{
-    __err = ios_base::goodbit;
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    switch (__fmt)
-    {
-    case 'a':
-    case 'A':
-        __get_weekdayname(__tm->tm_wday, __b, __e, __err, __ct);
-        break;
-    case 'b':
-    case 'B':
-    case 'h':
-        __get_monthname(__tm->tm_mon, __b, __e, __err, __ct);
-        break;
-    case 'c':
-        {
-        const string_type& __fm = this->__c();
-        __b = get(__b, __e, __iob, __err, __tm, __fm.data(), __fm.data() + __fm.size());
-        }
-        break;
-    case 'd':
-    case 'e':
-        __get_day(__tm->tm_mday, __b, __e, __err, __ct);
-        break;
-    case 'D':
-        {
-        const char_type __fm[] = {'%', 'm', '/', '%', 'd', '/', '%', 'y'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'F':
-        {
-        const char_type __fm[] = {'%', 'Y', '-', '%', 'm', '-', '%', 'd'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'H':
-        __get_hour(__tm->tm_hour, __b, __e, __err, __ct);
-        break;
-    case 'I':
-        __get_12_hour(__tm->tm_hour, __b, __e, __err, __ct);
-        break;
-    case 'j':
-        __get_day_year_num(__tm->tm_yday, __b, __e, __err, __ct);
-        break;
-    case 'm':
-        __get_month(__tm->tm_mon, __b, __e, __err, __ct);
-        break;
-    case 'M':
-        __get_minute(__tm->tm_min, __b, __e, __err, __ct);
-        break;
-    case 'n':
-    case 't':
-        __get_white_space(__b, __e, __err, __ct);
-        break;
-    case 'p':
-        __get_am_pm(__tm->tm_hour, __b, __e, __err, __ct);
-        break;
-    case 'r':
-        {
-        const char_type __fm[] = {'%', 'I', ':', '%', 'M', ':', '%', 'S', ' ', '%', 'p'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'R':
-        {
-        const char_type __fm[] = {'%', 'H', ':', '%', 'M'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'S':
-        __get_second(__tm->tm_sec, __b, __e, __err, __ct);
-        break;
-    case 'T':
-        {
-        const char_type __fm[] = {'%', 'H', ':', '%', 'M', ':', '%', 'S'};
-        __b = get(__b, __e, __iob, __err, __tm, __fm, __fm + sizeof(__fm)/sizeof(__fm[0]));
-        }
-        break;
-    case 'w':
-        __get_weekday(__tm->tm_wday, __b, __e, __err, __ct);
-        break;
-    case 'x':
-        return do_get_date(__b, __e, __iob, __err, __tm);
-    case 'X':
-        {
-        const string_type& __fm = this->__X();
-        __b = get(__b, __e, __iob, __err, __tm, __fm.data(), __fm.data() + __fm.size());
-        }
-        break;
-    case 'y':
-        __get_year(__tm->tm_year, __b, __e, __err, __ct);
-        break;
-    case 'Y':
-        __get_year4(__tm->tm_year, __b, __e, __err, __ct);
-        break;
-    case '%':
-        __get_percent(__b, __e, __err, __ct);
-        break;
-    default:
-        __err |= ios_base::failbit;
-    }
-    return __b;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_get<wchar_t>)
-
-class _LIBCPP_TYPE_VIS __time_get
-{
-protected:
-    locale_t __loc_;
-
-    __time_get(const char* __nm);
-    __time_get(const string& __nm);
-    ~__time_get();
-};
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY __time_get_storage
-    : public __time_get
-{
-protected:
-    typedef basic_string<_CharT> string_type;
-
-    string_type __weeks_[14];
-    string_type __months_[24];
-    string_type __am_pm_[2];
-    string_type __c_;
-    string_type __r_;
-    string_type __x_;
-    string_type __X_;
-
-    explicit __time_get_storage(const char* __nm);
-    explicit __time_get_storage(const string& __nm);
-
-    _LIBCPP_ALWAYS_INLINE ~__time_get_storage() {}
-
-    time_base::dateorder __do_date_order() const;
-
-private:
-    void init(const ctype<_CharT>&);
-    string_type __analyze(char __fmt, const ctype<_CharT>&);
-};
-
-template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY time_get_byname
-    : public time_get<_CharT, _InputIterator>,
-      private __time_get_storage<_CharT>
-{
-public:
-    typedef time_base::dateorder    dateorder;
-    typedef _InputIterator          iter_type;
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit time_get_byname(const char* __nm, size_t __refs = 0)
-        : time_get<_CharT, _InputIterator>(__refs),
-          __time_get_storage<_CharT>(__nm) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit time_get_byname(const string& __nm, size_t __refs = 0)
-        : time_get<_CharT, _InputIterator>(__refs),
-          __time_get_storage<_CharT>(__nm) {}
-
-protected:
-    _LIBCPP_INLINE_VISIBILITY
-    ~time_get_byname() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    virtual dateorder do_date_order() const {return this->__do_date_order();}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type* __weeks() const  {return this->__weeks_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type* __months() const {return this->__months_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type* __am_pm() const  {return this->__am_pm_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type& __c() const      {return this->__c_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type& __r() const      {return this->__r_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type& __x() const      {return this->__x_;}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual const string_type& __X() const      {return this->__X_;}
-};
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_get_byname<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_get_byname<wchar_t>)
-
-class _LIBCPP_TYPE_VIS __time_put
-{
-    locale_t __loc_;
-protected:
-    _LIBCPP_ALWAYS_INLINE __time_put() : __loc_(_LIBCPP_GET_C_LOCALE) {}
-    __time_put(const char* __nm);
-    __time_put(const string& __nm);
-    ~__time_put();
-    void __do_put(char* __nb, char*& __ne, const tm* __tm,
-                  char __fmt, char __mod) const;
-    void __do_put(wchar_t* __wb, wchar_t*& __we, const tm* __tm,
-                  char __fmt, char __mod) const;
-};
-
-template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY time_put
-    : public locale::facet,
-      private __time_put
-{
-public:
-    typedef _CharT char_type;
-    typedef _OutputIterator iter_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl, const tm* __tm,
-                  const char_type* __pb, const char_type* __pe) const;
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, ios_base& __iob, char_type __fl,
-                  const tm* __tm, char __fmt, char __mod = 0) const
-    {
-        return do_put(__s, __iob, __fl, __tm, __fmt, __mod);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~time_put() {}
-    virtual iter_type do_put(iter_type __s, ios_base&, char_type, const tm* __tm,
-                             char __fmt, char __mod) const;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put(const char* __nm, size_t __refs)
-        : locale::facet(__refs),
-          __time_put(__nm) {}
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put(const string& __nm, size_t __refs)
-        : locale::facet(__refs),
-          __time_put(__nm) {}
-};
-
-template <class _CharT, class _OutputIterator>
-locale::id
-time_put<_CharT, _OutputIterator>::id;
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-time_put<_CharT, _OutputIterator>::put(iter_type __s, ios_base& __iob,
-                                       char_type __fl, const tm* __tm,
-                                       const char_type* __pb,
-                                       const char_type* __pe) const
-{
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__iob.getloc());
-    for (; __pb != __pe; ++__pb)
-    {
-        if (__ct.narrow(*__pb, 0) == '%')
-        {
-            if (++__pb == __pe)
-            {
-                *__s++ = __pb[-1];
-                break;
-            }
-            char __mod = 0;
-            char __fmt = __ct.narrow(*__pb, 0);
-            if (__fmt == 'E' || __fmt == 'O')
-            {
-                if (++__pb == __pe)
-                {
-                    *__s++ = __pb[-2];
-                    *__s++ = __pb[-1];
-                    break;
-                }
-                __mod = __fmt;
-                __fmt = __ct.narrow(*__pb, 0);
-            }
-            __s = do_put(__s, __iob, __fl, __tm, __fmt, __mod);
-        }
-        else
-            *__s++ = *__pb;
-    }
-    return __s;
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-time_put<_CharT, _OutputIterator>::do_put(iter_type __s, ios_base&,
-                                          char_type, const tm* __tm,
-                                          char __fmt, char __mod) const
-{
-    char_type __nar[100];
-    char_type* __nb = __nar;
-    char_type* __ne = __nb + 100;
-    __do_put(__nb, __ne, __tm, __fmt, __mod);
-    return _VSTD::copy(__nb, __ne, __s);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_put<wchar_t>)
-
-template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY time_put_byname
-    : public time_put<_CharT, _OutputIterator>
-{
-public:
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put_byname(const char* __nm, size_t __refs = 0)
-        : time_put<_CharT, _OutputIterator>(__nm, __refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit time_put_byname(const string& __nm, size_t __refs = 0)
-        : time_put<_CharT, _OutputIterator>(__nm, __refs) {}
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~time_put_byname() {}
-};
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_put_byname<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS time_put_byname<wchar_t>)
-
-// money_base
-
-class _LIBCPP_TYPE_VIS money_base
-{
-public:
-    enum part {none, space, symbol, sign, value};
-    struct pattern {char field[4];};
-
-    _LIBCPP_ALWAYS_INLINE money_base() {}
-};
-
-// moneypunct
-
-template <class _CharT, bool _International = false>
-class _LIBCPP_TYPE_VIS_ONLY moneypunct
-    : public locale::facet,
-      public money_base
-{
-public:
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit moneypunct(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE char_type   decimal_point() const {return do_decimal_point();}
-    _LIBCPP_ALWAYS_INLINE char_type   thousands_sep() const {return do_thousands_sep();}
-    _LIBCPP_ALWAYS_INLINE string      grouping()      const {return do_grouping();}
-    _LIBCPP_ALWAYS_INLINE string_type curr_symbol()   const {return do_curr_symbol();}
-    _LIBCPP_ALWAYS_INLINE string_type positive_sign() const {return do_positive_sign();}
-    _LIBCPP_ALWAYS_INLINE string_type negative_sign() const {return do_negative_sign();}
-    _LIBCPP_ALWAYS_INLINE int         frac_digits()   const {return do_frac_digits();}
-    _LIBCPP_ALWAYS_INLINE pattern     pos_format()    const {return do_pos_format();}
-    _LIBCPP_ALWAYS_INLINE pattern     neg_format()    const {return do_neg_format();}
-
-    static locale::id id;
-    static const bool intl = _International;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~moneypunct() {}
-
-    virtual char_type   do_decimal_point() const {return numeric_limits<char_type>::max();}
-    virtual char_type   do_thousands_sep() const {return numeric_limits<char_type>::max();}
-    virtual string      do_grouping()      const {return string();}
-    virtual string_type do_curr_symbol()   const {return string_type();}
-    virtual string_type do_positive_sign() const {return string_type();}
-    virtual string_type do_negative_sign() const {return string_type(1, '-');}
-    virtual int         do_frac_digits()   const {return 0;}
-    virtual pattern     do_pos_format()    const
-        {pattern __p = {{symbol, sign, none, value}}; return __p;}
-    virtual pattern     do_neg_format()    const
-        {pattern __p = {{symbol, sign, none, value}}; return __p;}
-};
-
-template <class _CharT, bool _International>
-locale::id
-moneypunct<_CharT, _International>::id;
-
-template <class _CharT, bool _International>
-const bool
-moneypunct<_CharT, _International>::intl;
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct<char, false>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct<char, true>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct<wchar_t, false>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct<wchar_t, true>)
-
-// moneypunct_byname
-
-template <class _CharT, bool _International = false>
-class _LIBCPP_TYPE_VIS_ONLY moneypunct_byname
-    : public moneypunct<_CharT, _International>
-{
-public:
-    typedef money_base::pattern  pattern;
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit moneypunct_byname(const char* __nm, size_t __refs = 0)
-        : moneypunct<_CharT, _International>(__refs) {init(__nm);}
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit moneypunct_byname(const string& __nm, size_t __refs = 0)
-        : moneypunct<_CharT, _International>(__refs) {init(__nm.c_str());}
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~moneypunct_byname() {}
-
-    virtual char_type   do_decimal_point() const {return __decimal_point_;}
-    virtual char_type   do_thousands_sep() const {return __thousands_sep_;}
-    virtual string      do_grouping()      const {return __grouping_;}
-    virtual string_type do_curr_symbol()   const {return __curr_symbol_;}
-    virtual string_type do_positive_sign() const {return __positive_sign_;}
-    virtual string_type do_negative_sign() const {return __negative_sign_;}
-    virtual int         do_frac_digits()   const {return __frac_digits_;}
-    virtual pattern     do_pos_format()    const {return __pos_format_;}
-    virtual pattern     do_neg_format()    const {return __neg_format_;}
-
-private:
-    char_type   __decimal_point_;
-    char_type   __thousands_sep_;
-    string      __grouping_;
-    string_type __curr_symbol_;
-    string_type __positive_sign_;
-    string_type __negative_sign_;
-    int         __frac_digits_;
-    pattern     __pos_format_;
-    pattern     __neg_format_;
-
-    void init(const char*);
-};
-
-template<> void moneypunct_byname<char, false>::init(const char*);
-template<> void moneypunct_byname<char, true>::init(const char*);
-template<> void moneypunct_byname<wchar_t, false>::init(const char*);
-template<> void moneypunct_byname<wchar_t, true>::init(const char*);
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct_byname<char, false>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct_byname<char, true>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct_byname<wchar_t, false>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS moneypunct_byname<wchar_t, true>)
-
-// money_get
-
-template <class _CharT>
-class __money_get
-{
-protected:
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE __money_get() {}
-
-    static void __gather_info(bool __intl, const locale& __loc,
-                              money_base::pattern& __pat, char_type& __dp,
-                              char_type& __ts, string& __grp,
-                              string_type& __sym, string_type& __psn,
-                              string_type& __nsn, int& __fd);
-};
-
-template <class _CharT>
-void
-__money_get<_CharT>::__gather_info(bool __intl, const locale& __loc,
-                                   money_base::pattern& __pat, char_type& __dp,
-                                   char_type& __ts, string& __grp,
-                                   string_type& __sym, string_type& __psn,
-                                   string_type& __nsn, int& __fd)
-{
-    if (__intl)
-    {
-        const moneypunct<char_type, true>& __mp =
-            use_facet<moneypunct<char_type, true> >(__loc);
-        __pat = __mp.neg_format();
-        __nsn = __mp.negative_sign();
-        __psn = __mp.positive_sign();
-        __dp = __mp.decimal_point();
-        __ts = __mp.thousands_sep();
-        __grp = __mp.grouping();
-        __sym = __mp.curr_symbol();
-        __fd = __mp.frac_digits();
-    }
-    else
-    {
-        const moneypunct<char_type, false>& __mp =
-            use_facet<moneypunct<char_type, false> >(__loc);
-        __pat = __mp.neg_format();
-        __nsn = __mp.negative_sign();
-        __psn = __mp.positive_sign();
-        __dp = __mp.decimal_point();
-        __ts = __mp.thousands_sep();
-        __grp = __mp.grouping();
-        __sym = __mp.curr_symbol();
-        __fd = __mp.frac_digits();
-    }
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS __money_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS __money_get<wchar_t>)
-
-template <class _CharT, class _InputIterator = istreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY money_get
-    : public locale::facet,
-      private __money_get<_CharT>
-{
-public:
-    typedef _CharT                  char_type;
-    typedef _InputIterator          iter_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit money_get(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, bool __intl, ios_base& __iob,
-                  ios_base::iostate& __err, long double& __v) const
-    {
-        return do_get(__b, __e, __intl, __iob, __err, __v);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type get(iter_type __b, iter_type __e, bool __intl, ios_base& __iob,
-                  ios_base::iostate& __err, string_type& __v) const
-    {
-        return do_get(__b, __e, __intl, __iob, __err, __v);
-    }
-
-    static locale::id id;
-
-protected:
-
-    _LIBCPP_ALWAYS_INLINE
-    ~money_get() {}
-
-    virtual iter_type do_get(iter_type __b, iter_type __e, bool __intl,
-                             ios_base& __iob, ios_base::iostate& __err,
-                             long double& __v) const;
-    virtual iter_type do_get(iter_type __b, iter_type __e, bool __intl,
-                             ios_base& __iob, ios_base::iostate& __err,
-                             string_type& __v) const;
-
-private:
-    static bool __do_get(iter_type& __b, iter_type __e,
-                         bool __intl, const locale& __loc,
-                         ios_base::fmtflags __flags, ios_base::iostate& __err,
-                         bool& __neg, const ctype<char_type>& __ct,
-                         unique_ptr<char_type, void(*)(void*)>& __wb,
-                         char_type*& __wn, char_type* __we);
-};
-
-template <class _CharT, class _InputIterator>
-locale::id
-money_get<_CharT, _InputIterator>::id;
-
-_LIBCPP_FUNC_VIS void __do_nothing(void*);
-
-template <class _Tp>
-_LIBCPP_HIDDEN
-void
-__double_or_nothing(unique_ptr<_Tp, void(*)(void*)>& __b, _Tp*& __n, _Tp*& __e)
-{
-    bool __owns = __b.get_deleter() != __do_nothing;
-    size_t __cur_cap = static_cast<size_t>(__e-__b.get()) * sizeof(_Tp);
-    size_t __new_cap = __cur_cap < numeric_limits<size_t>::max() / 2 ?
-                       2 * __cur_cap : numeric_limits<size_t>::max();
-    if (__new_cap == 0)
-        __new_cap = sizeof(_Tp);
-    size_t __n_off = static_cast<size_t>(__n - __b.get());
-    _Tp* __t = (_Tp*)realloc(__owns ? __b.get() : 0, __new_cap);
-    if (__t == 0)
-        __throw_bad_alloc();
-    if (__owns)
-        __b.release();
-    __b = unique_ptr<_Tp, void(*)(void*)>(__t, free);
-    __new_cap /= sizeof(_Tp);
-    __n = __b.get() + __n_off;
-    __e = __b.get() + __new_cap;
-}
-
-// true == success
-template <class _CharT, class _InputIterator>
-bool
-money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,
-                                            bool __intl, const locale& __loc,
-                                            ios_base::fmtflags __flags,
-                                            ios_base::iostate& __err,
-                                            bool& __neg,
-                                            const ctype<char_type>& __ct,
-                                            unique_ptr<char_type, void(*)(void*)>& __wb,
-                                            char_type*& __wn, char_type* __we)
-{
-    const unsigned __bz = 100;
-    unsigned __gbuf[__bz];
-    unique_ptr<unsigned, void(*)(void*)> __gb(__gbuf, __do_nothing);
-    unsigned* __gn = __gb.get();
-    unsigned* __ge = __gn + __bz;
-    money_base::pattern __pat;
-    char_type __dp;
-    char_type __ts;
-    string __grp;
-    string_type __sym;
-    string_type __psn;
-    string_type __nsn;
-    // Capture the spaces read into money_base::{space,none} so they
-    // can be compared to initial spaces in __sym.
-    string_type __spaces;
-    int __fd;
-    __money_get<_CharT>::__gather_info(__intl, __loc, __pat, __dp, __ts, __grp,
-                                       __sym, __psn, __nsn, __fd);
-    const string_type* __trailing_sign = 0;
-    __wn = __wb.get();
-    for (unsigned __p = 0; __p < 4 && __b != __e; ++__p)
-    {
-        switch (__pat.field[__p])
-        {
-        case money_base::space:
-            if (__p != 3)
-            {
-                if (__ct.is(ctype_base::space, *__b))
-                    __spaces.push_back(*__b++);
-                else
-                {
-                    __err |= ios_base::failbit;
-                    return false;
-                }
-            }
-            // drop through
-        case money_base::none:
-            if (__p != 3)
-            {
-                while (__b != __e && __ct.is(ctype_base::space, *__b))
-                    __spaces.push_back(*__b++);
-            }
-            break;
-        case money_base::sign:
-            if (__psn.size() + __nsn.size() > 0)
-            {
-                if (__psn.size() == 0 || __nsn.size() == 0)
-                {   // sign is optional
-                    if (__psn.size() > 0)
-                    {   // __nsn.size() == 0
-                        if (*__b == __psn[0])
-                        {
-                            ++__b;
-                            if (__psn.size() > 1)
-                                __trailing_sign = &__psn;
-                        }
-                        else
-                            __neg = true;
-                    }
-                    else if (*__b == __nsn[0])  // __nsn.size() > 0 &&  __psn.size() == 0
-                    {
-                        ++__b;
-                        __neg = true;
-                        if (__nsn.size() > 1)
-                            __trailing_sign = &__nsn;
-                    }
-                }
-                else  // sign is required
-                {
-                    if (*__b == __psn[0])
-                    {
-                        ++__b;
-                        if (__psn.size() > 1)
-                            __trailing_sign = &__psn;
-                    }
-                    else if (*__b == __nsn[0])
-                    {
-                        ++__b;
-                        __neg = true;
-                        if (__nsn.size() > 1)
-                            __trailing_sign = &__nsn;
-                    }
-                    else
-                    {
-                        __err |= ios_base::failbit;
-                        return false;
-                    }
-                }
-            }
-            break;
-        case money_base::symbol:
-            {
-            bool __more_needed = __trailing_sign ||
-                                 (__p < 2)       ||
-                                 (__p == 2 && __pat.field[3] != static_cast<char>(money_base::none));
-            bool __sb = (__flags & ios_base::showbase) != 0;
-            if (__sb || __more_needed)
-            {
-                typename string_type::const_iterator __sym_space_end = __sym.begin();
-                if (__p > 0 && (__pat.field[__p - 1] == money_base::none ||
-                                __pat.field[__p - 1] == money_base::space)) {
-                    // Match spaces we've already read against spaces at
-                    // the beginning of __sym.
-                    while (__sym_space_end != __sym.end() &&
-                           __ct.is(ctype_base::space, *__sym_space_end))
-                        ++__sym_space_end;
-                    const size_t __num_spaces = __sym_space_end - __sym.begin();
-                    if (__num_spaces > __spaces.size() ||
-                        !equal(__spaces.end() - __num_spaces, __spaces.end(),
-                               __sym.begin())) {
-                        // No match. Put __sym_space_end back at the
-                        // beginning of __sym, which will prevent a
-                        // match in the next loop.
-                        __sym_space_end = __sym.begin();
-                    }
-                }
-                typename string_type::const_iterator __sym_curr_char = __sym_space_end;
-                while (__sym_curr_char != __sym.end() && __b != __e &&
-                       *__b == *__sym_curr_char) {
-                    ++__b;
-                    ++__sym_curr_char;
-                }
-                if (__sb && __sym_curr_char != __sym.end())
-                {
-                    __err |= ios_base::failbit;
-                    return false;
-                }
-            }
-            }
-            break;
-        case money_base::value:
-            {
-            unsigned __ng = 0;
-            for (; __b != __e; ++__b)
-            {
-                char_type __c = *__b;
-                if (__ct.is(ctype_base::digit, __c))
-                {
-                    if (__wn == __we)
-                        __double_or_nothing(__wb, __wn, __we);
-                    *__wn++ = __c;
-                    ++__ng;
-                }
-                else if (__grp.size() > 0 && __ng > 0 && __c == __ts)
-                {
-                    if (__gn == __ge)
-                        __double_or_nothing(__gb, __gn, __ge);
-                    *__gn++ = __ng;
-                    __ng = 0;
-                }
-                else
-                    break;
-            }
-            if (__gb.get() != __gn && __ng > 0)
-            {
-                if (__gn == __ge)
-                    __double_or_nothing(__gb, __gn, __ge);
-                *__gn++ = __ng;
-            }
-            if (__fd > 0)
-            {
-                if (__b == __e || *__b != __dp)
-                {
-                    __err |= ios_base::failbit;
-                    return false;
-                }
-                for (++__b; __fd > 0; --__fd, ++__b)
-                {
-                    if (__b == __e || !__ct.is(ctype_base::digit, *__b))
-                    {
-                        __err |= ios_base::failbit;
-                        return false;
-                    }
-                    if (__wn == __we)
-                        __double_or_nothing(__wb, __wn, __we);
-                    *__wn++ = *__b;
-                }
-            }
-            if (__wn == __wb.get())
-            {
-                __err |= ios_base::failbit;
-                return false;
-            }
-            }
-            break;
-        }
-    }
-    if (__trailing_sign)
-    {
-        for (unsigned __i = 1; __i < __trailing_sign->size(); ++__i, ++__b)
-        {
-            if (__b == __e || *__b != (*__trailing_sign)[__i])
-            {
-                __err |= ios_base::failbit;
-                return false;
-            }
-        }
-    }
-    if (__gb.get() != __gn)
-    {
-        ios_base::iostate __et = ios_base::goodbit;
-        __check_grouping(__grp, __gb.get(), __gn, __et);
-        if (__et)
-        {
-            __err |= ios_base::failbit;
-            return false;
-        }
-    }
-    return true;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                          bool __intl, ios_base& __iob,
-                                          ios_base::iostate& __err,
-                                          long double& __v) const
-{
-    const int __bz = 100;
-    char_type __wbuf[__bz];
-    unique_ptr<char_type, void(*)(void*)> __wb(__wbuf, __do_nothing);
-    char_type* __wn;
-    char_type* __we = __wbuf + __bz;
-    locale __loc = __iob.getloc();
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);
-    bool __neg = false;
-    if (__do_get(__b, __e, __intl, __loc, __iob.flags(), __err, __neg, __ct,
-                 __wb, __wn, __we))
-    {
-        const char __src[] = "0123456789";
-        char_type __atoms[sizeof(__src)-1];
-        __ct.widen(__src, __src + (sizeof(__src)-1), __atoms);
-        char __nbuf[__bz];
-        char* __nc = __nbuf;
-        unique_ptr<char, void(*)(void*)> __h(0, free);
-        if (__wn - __wb.get() > __bz-2)
-        {
-            __h.reset((char*)malloc(static_cast<size_t>(__wn - __wb.get() + 2)));
-            if (__h.get() == 0)
-                __throw_bad_alloc();
-            __nc = __h.get();
-        }
-        if (__neg)
-            *__nc++ = '-';
-        for (const char_type* __w = __wb.get(); __w < __wn; ++__w, ++__nc)
-            *__nc = __src[find(__atoms, _VSTD::end(__atoms), *__w) - __atoms];
-        *__nc = char();
-        if (sscanf(__nbuf, "%Lf", &__v) != 1)
-            __throw_runtime_error("money_get error");
-    }
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-template <class _CharT, class _InputIterator>
-_InputIterator
-money_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e,
-                                          bool __intl, ios_base& __iob,
-                                          ios_base::iostate& __err,
-                                          string_type& __v) const
-{
-    const int __bz = 100;
-    char_type __wbuf[__bz];
-    unique_ptr<char_type, void(*)(void*)> __wb(__wbuf, __do_nothing);
-    char_type* __wn;
-    char_type* __we = __wbuf + __bz;
-    locale __loc = __iob.getloc();
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);
-    bool __neg = false;
-    if (__do_get(__b, __e, __intl, __loc, __iob.flags(), __err, __neg, __ct,
-                 __wb, __wn, __we))
-    {
-        __v.clear();
-        if (__neg)
-            __v.push_back(__ct.widen('-'));
-        char_type __z = __ct.widen('0');
-        char_type* __w;
-        for (__w = __wb.get(); __w < __wn-1; ++__w)
-            if (*__w != __z)
-                break;
-        __v.append(__w, __wn);
-    }
-    if (__b == __e)
-        __err |= ios_base::eofbit;
-    return __b;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS money_get<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS money_get<wchar_t>)
-
-// money_put
-
-template <class _CharT>
-class __money_put
-{
-protected:
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE __money_put() {}
-
-    static void __gather_info(bool __intl, bool __neg, const locale& __loc,
-                              money_base::pattern& __pat, char_type& __dp,
-                              char_type& __ts, string& __grp,
-                              string_type& __sym, string_type& __sn,
-                              int& __fd);
-    static void __format(char_type* __mb, char_type*& __mi, char_type*& __me,
-                         ios_base::fmtflags __flags,
-                         const char_type* __db, const char_type* __de,
-                         const ctype<char_type>& __ct, bool __neg,
-                         const money_base::pattern& __pat, char_type __dp,
-                         char_type __ts, const string& __grp,
-                         const string_type& __sym, const string_type& __sn,
-                         int __fd);
-};
-
-template <class _CharT>
-void
-__money_put<_CharT>::__gather_info(bool __intl, bool __neg, const locale& __loc,
-                                   money_base::pattern& __pat, char_type& __dp,
-                                   char_type& __ts, string& __grp,
-                                   string_type& __sym, string_type& __sn,
-                                   int& __fd)
-{
-    if (__intl)
-    {
-        const moneypunct<char_type, true>& __mp =
-            use_facet<moneypunct<char_type, true> >(__loc);
-        if (__neg)
-        {
-            __pat = __mp.neg_format();
-            __sn = __mp.negative_sign();
-        }
-        else
-        {
-            __pat = __mp.pos_format();
-            __sn = __mp.positive_sign();
-        }
-        __dp = __mp.decimal_point();
-        __ts = __mp.thousands_sep();
-        __grp = __mp.grouping();
-        __sym = __mp.curr_symbol();
-        __fd = __mp.frac_digits();
-    }
-    else
-    {
-        const moneypunct<char_type, false>& __mp =
-            use_facet<moneypunct<char_type, false> >(__loc);
-        if (__neg)
-        {
-            __pat = __mp.neg_format();
-            __sn = __mp.negative_sign();
-        }
-        else
-        {
-            __pat = __mp.pos_format();
-            __sn = __mp.positive_sign();
-        }
-        __dp = __mp.decimal_point();
-        __ts = __mp.thousands_sep();
-        __grp = __mp.grouping();
-        __sym = __mp.curr_symbol();
-        __fd = __mp.frac_digits();
-    }
-}
-
-template <class _CharT>
-void
-__money_put<_CharT>::__format(char_type* __mb, char_type*& __mi, char_type*& __me,
-                              ios_base::fmtflags __flags,
-                              const char_type* __db, const char_type* __de,
-                              const ctype<char_type>& __ct, bool __neg,
-                              const money_base::pattern& __pat, char_type __dp,
-                              char_type __ts, const string& __grp,
-                              const string_type& __sym, const string_type& __sn,
-                              int __fd)
-{
-    __me = __mb;
-    for (unsigned __p = 0; __p < 4; ++__p)
-    {
-        switch (__pat.field[__p])
-        {
-        case money_base::none:
-            __mi = __me;
-            break;
-        case money_base::space:
-            __mi = __me;
-            *__me++ = __ct.widen(' ');
-            break;
-        case money_base::sign:
-            if (!__sn.empty())
-                *__me++ = __sn[0];
-            break;
-        case money_base::symbol:
-            if (!__sym.empty() && (__flags & ios_base::showbase))
-                __me = _VSTD::copy(__sym.begin(), __sym.end(), __me);
-            break;
-        case money_base::value:
-            {
-            // remember start of value so we can reverse it
-            char_type* __t = __me;
-            // find beginning of digits
-            if (__neg)
-                ++__db;
-            // find end of digits
-            const char_type* __d;
-            for (__d = __db; __d < __de; ++__d)
-                if (!__ct.is(ctype_base::digit, *__d))
-                    break;
-            // print fractional part
-            if (__fd > 0)
-            {
-                int __f;
-                for (__f = __fd; __d > __db && __f > 0; --__f)
-                    *__me++ = *--__d;
-                char_type __z = __f > 0 ? __ct.widen('0') : char_type();
-                for (; __f > 0; --__f)
-                    *__me++ = __z;
-                *__me++ = __dp;
-            }
-            // print units part
-            if (__d == __db)
-            {
-                *__me++ = __ct.widen('0');
-            }
-            else
-            {
-                unsigned __ng = 0;
-                unsigned __ig = 0;
-                unsigned __gl = __grp.empty() ? numeric_limits<unsigned>::max()
-                                              : static_cast<unsigned>(__grp[__ig]);
-                while (__d != __db)
-                {
-                    if (__ng == __gl)
-                    {
-                        *__me++ = __ts;
-                        __ng = 0;
-                        if (++__ig < __grp.size())
-                            __gl = __grp[__ig] == numeric_limits<char>::max() ?
-                                        numeric_limits<unsigned>::max() :
-                                        static_cast<unsigned>(__grp[__ig]);
-                    }
-                    *__me++ = *--__d;
-                    ++__ng;
-                }
-            }
-            // reverse it
-            reverse(__t, __me);
-            }
-            break;
-        }
-    }
-    // print rest of sign, if any
-    if (__sn.size() > 1)
-        __me = _VSTD::copy(__sn.begin()+1, __sn.end(), __me);
-    // set alignment
-    if ((__flags & ios_base::adjustfield) == ios_base::left)
-        __mi = __me;
-    else if ((__flags & ios_base::adjustfield) != ios_base::internal)
-        __mi = __mb;
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS __money_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS __money_put<wchar_t>)
-
-template <class _CharT, class _OutputIterator = ostreambuf_iterator<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY money_put
-    : public locale::facet,
-      private __money_put<_CharT>
-{
-public:
-    typedef _CharT                  char_type;
-    typedef _OutputIterator         iter_type;
-    typedef basic_string<char_type> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit money_put(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, bool __intl, ios_base& __iob, char_type __fl,
-                  long double __units) const
-    {
-        return do_put(__s, __intl, __iob, __fl, __units);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    iter_type put(iter_type __s, bool __intl, ios_base& __iob, char_type __fl,
-                  const string_type& __digits) const
-    {
-        return do_put(__s, __intl, __iob, __fl, __digits);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~money_put() {}
-
-    virtual iter_type do_put(iter_type __s, bool __intl, ios_base& __iob,
-                             char_type __fl, long double __units) const;
-    virtual iter_type do_put(iter_type __s, bool __intl, ios_base& __iob,
-                             char_type __fl, const string_type& __digits) const;
-};
-
-template <class _CharT, class _OutputIterator>
-locale::id
-money_put<_CharT, _OutputIterator>::id;
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,
-                                           ios_base& __iob, char_type __fl,
-                                           long double __units) const
-{
-    // convert to char
-    const size_t __bs = 100;
-    char __buf[__bs];
-    char* __bb = __buf;
-    char_type __digits[__bs];
-    char_type* __db = __digits;
-    size_t __n = static_cast<size_t>(snprintf(__bb, __bs, "%.0Lf", __units));
-    unique_ptr<char, void(*)(void*)> __hn(0, free);
-    unique_ptr<char_type, void(*)(void*)> __hd(0, free);
-    // secure memory for digit storage
-    if (__n > __bs-1)
-    {
-#ifdef _LIBCPP_LOCALE__L_EXTENSIONS
-        __n = static_cast<size_t>(asprintf_l(&__bb, _LIBCPP_GET_C_LOCALE, "%.0Lf", __units));
-#else
-        __n = __asprintf_l(&__bb, __cloc(), "%.0Lf", __units);
-#endif
-        if (__bb == 0)
-            __throw_bad_alloc();
-        __hn.reset(__bb);
-        __hd.reset((char_type*)malloc(__n * sizeof(char_type)));
-        if (__hd == nullptr)
-            __throw_bad_alloc();
-        __db = __hd.get();
-    }
-    // gather info
-    locale __loc = __iob.getloc();
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);
-    __ct.widen(__bb, __bb + __n, __db);
-    bool __neg = __n > 0 && __bb[0] == '-';
-    money_base::pattern __pat;
-    char_type __dp;
-    char_type __ts;
-    string __grp;
-    string_type __sym;
-    string_type __sn;
-    int __fd;
-    this->__gather_info(__intl, __neg, __loc, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
-    // secure memory for formatting
-    char_type __mbuf[__bs];
-    char_type* __mb = __mbuf;
-    unique_ptr<char_type, void(*)(void*)> __hw(0, free);
-    size_t __exn = static_cast<int>(__n) > __fd ?
-                   (__n - static_cast<size_t>(__fd)) * 2 + __sn.size() +
-                    __sym.size() + static_cast<size_t>(__fd) + 1
-                 : __sn.size() + __sym.size() + static_cast<size_t>(__fd) + 2;
-    if (__exn > __bs)
-    {
-        __hw.reset((char_type*)malloc(__exn * sizeof(char_type)));
-        __mb = __hw.get();
-        if (__mb == 0)
-            __throw_bad_alloc();
-    }
-    // format
-    char_type* __mi;
-    char_type* __me;
-    this->__format(__mb, __mi, __me, __iob.flags(),
-                   __db, __db + __n, __ct,
-                   __neg, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
-    return __pad_and_output(__s, __mb, __mi, __me, __iob, __fl);
-}
-
-template <class _CharT, class _OutputIterator>
-_OutputIterator
-money_put<_CharT, _OutputIterator>::do_put(iter_type __s, bool __intl,
-                                           ios_base& __iob, char_type __fl,
-                                           const string_type& __digits) const
-{
-    // gather info
-    locale __loc = __iob.getloc();
-    const ctype<char_type>& __ct = use_facet<ctype<char_type> >(__loc);
-    bool __neg = __digits.size() > 0 && __digits[0] == __ct.widen('-');
-    money_base::pattern __pat;
-    char_type __dp;
-    char_type __ts;
-    string __grp;
-    string_type __sym;
-    string_type __sn;
-    int __fd;
-    this->__gather_info(__intl, __neg, __loc, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
-    // secure memory for formatting
-    char_type __mbuf[100];
-    char_type* __mb = __mbuf;
-    unique_ptr<char_type, void(*)(void*)> __h(0, free);
-    size_t __exn = static_cast<int>(__digits.size()) > __fd ?
-                   (__digits.size() - static_cast<size_t>(__fd)) * 2 +
-                    __sn.size() + __sym.size() + static_cast<size_t>(__fd) + 1
-                 : __sn.size() + __sym.size() + static_cast<size_t>(__fd) + 2;
-    if (__exn > 100)
-    {
-        __h.reset((char_type*)malloc(__exn * sizeof(char_type)));
-        __mb = __h.get();
-        if (__mb == 0)
-            __throw_bad_alloc();
-    }
-    // format
-    char_type* __mi;
-    char_type* __me;
-    this->__format(__mb, __mi, __me, __iob.flags(),
-                   __digits.data(), __digits.data() + __digits.size(), __ct,
-                   __neg, __pat, __dp, __ts, __grp, __sym, __sn, __fd);
-    return __pad_and_output(__s, __mb, __mi, __me, __iob, __fl);
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS money_put<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS money_put<wchar_t>)
-
-// messages
-
-class _LIBCPP_TYPE_VIS messages_base
-{
-public:
-    typedef ptrdiff_t catalog;
-
-    _LIBCPP_ALWAYS_INLINE messages_base() {}
-};
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY messages
-    : public locale::facet,
-      public messages_base
-{
-public:
-    typedef _CharT               char_type;
-    typedef basic_string<_CharT> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit messages(size_t __refs = 0)
-        : locale::facet(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    catalog open(const basic_string<char>& __nm, const locale& __loc) const
-    {
-        return do_open(__nm, __loc);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    string_type get(catalog __c, int __set, int __msgid,
-                    const string_type& __dflt) const
-    {
-        return do_get(__c, __set, __msgid, __dflt);
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    void close(catalog __c) const
-    {
-        do_close(__c);
-    }
-
-    static locale::id id;
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~messages() {}
-
-    virtual catalog do_open(const basic_string<char>&, const locale&) const;
-    virtual string_type do_get(catalog, int __set, int __msgid,
-                               const string_type& __dflt) const;
-    virtual void do_close(catalog) const;
-};
-
-template <class _CharT>
-locale::id
-messages<_CharT>::id;
-
-template <class _CharT>
-typename messages<_CharT>::catalog
-messages<_CharT>::do_open(const basic_string<char>& __nm, const locale&) const
-{
-#if defined(_WIN32) || defined(__ANDROID__) || defined(_NEWLIB_VERSION)
-    return -1;
-#else // _WIN32 || __ANDROID__
-    catalog __cat = (catalog)catopen(__nm.c_str(), NL_CAT_LOCALE);
-    if (__cat != -1)
-        __cat = static_cast<catalog>((static_cast<size_t>(__cat) >> 1));
-    return __cat;
-#endif // _WIN32 || __ANDROID__
-}
-
-template <class _CharT>
-typename messages<_CharT>::string_type
-messages<_CharT>::do_get(catalog __c, int __set, int __msgid,
-                         const string_type& __dflt) const
-{
-#if defined(_WIN32) || defined(__ANDROID__) || defined(_NEWLIB_VERSION)
-    return __dflt;
-#else // _WIN32
-    string __ndflt;
-    __narrow_to_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__ndflt),
-                                                       __dflt.c_str(),
-                                                       __dflt.c_str() + __dflt.size());
-    if (__c != -1)
-        __c <<= 1;
-    nl_catd __cat = (nl_catd)__c;
-    char* __n = catgets(__cat, __set, __msgid, __ndflt.c_str());
-    string_type __w;
-    __widen_from_utf8<sizeof(char_type)*__CHAR_BIT__>()(back_inserter(__w),
-                                                        __n, __n + strlen(__n));
-    return __w;
-#endif // _WIN32
-}
-
-template <class _CharT>
-void
-messages<_CharT>::do_close(catalog __c) const
-{
-#if !defined(_WIN32) && !defined(__ANDROID__) && !defined(_NEWLIB_VERSION)
-    if (__c != -1)
-        __c <<= 1;
-    nl_catd __cat = (nl_catd)__c;
-    catclose(__cat);
-#endif // !_WIN32
-}
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS messages<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS messages<wchar_t>)
-
-template <class _CharT>
-class _LIBCPP_TYPE_VIS_ONLY messages_byname
-    : public messages<_CharT>
-{
-public:
-    typedef messages_base::catalog catalog;
-    typedef basic_string<_CharT> string_type;
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit messages_byname(const char*, size_t __refs = 0)
-        : messages<_CharT>(__refs) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    explicit messages_byname(const string&, size_t __refs = 0)
-        : messages<_CharT>(__refs) {}
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    ~messages_byname() {}
-};
-
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS messages_byname<char>)
-_LIBCPP_EXTERN_TEMPLATE2(class _LIBCPP_TYPE_VIS messages_byname<wchar_t>)
-
-template<class _Codecvt, class _Elem = wchar_t,
-         class _Wide_alloc = allocator<_Elem>,
-         class _Byte_alloc = allocator<char> >
-class _LIBCPP_TYPE_VIS_ONLY wstring_convert
-{
-public:
-    typedef basic_string<char, char_traits<char>, _Byte_alloc>   byte_string;
-    typedef basic_string<_Elem, char_traits<_Elem>, _Wide_alloc> wide_string;
-    typedef typename _Codecvt::state_type                        state_type;
-    typedef typename wide_string::traits_type::int_type          int_type;
-
-private:
-    byte_string __byte_err_string_;
-    wide_string __wide_err_string_;
-    _Codecvt* __cvtptr_;
-    state_type __cvtstate_;
-    size_t __cvtcount_;
-
-    wstring_convert(const wstring_convert& __wc);
-    wstring_convert& operator=(const wstring_convert& __wc);
-public:
-    _LIBCPP_EXPLICIT_AFTER_CXX11 wstring_convert(_Codecvt* __pcvt = new _Codecvt);
-    wstring_convert(_Codecvt* __pcvt, state_type __state);
-    _LIBCPP_EXPLICIT_AFTER_CXX11 wstring_convert(const byte_string& __byte_err,
-                    const wide_string& __wide_err = wide_string());
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    wstring_convert(wstring_convert&& __wc);
-#endif
-    ~wstring_convert();
-
-    _LIBCPP_ALWAYS_INLINE
-    wide_string from_bytes(char __byte)
-        {return from_bytes(&__byte, &__byte+1);}
-    _LIBCPP_ALWAYS_INLINE
-    wide_string from_bytes(const char* __ptr)
-        {return from_bytes(__ptr, __ptr + char_traits<char>::length(__ptr));}
-    _LIBCPP_ALWAYS_INLINE
-    wide_string from_bytes(const byte_string& __str)
-        {return from_bytes(__str.data(), __str.data() + __str.size());}
-    wide_string from_bytes(const char* __first, const char* __last);
-
-    _LIBCPP_ALWAYS_INLINE
-    byte_string to_bytes(_Elem __wchar)
-        {return to_bytes(&__wchar, &__wchar+1);}
-    _LIBCPP_ALWAYS_INLINE
-    byte_string to_bytes(const _Elem* __wptr)
-        {return to_bytes(__wptr, __wptr + char_traits<_Elem>::length(__wptr));}
-    _LIBCPP_ALWAYS_INLINE
-    byte_string to_bytes(const wide_string& __wstr)
-        {return to_bytes(__wstr.data(), __wstr.data() + __wstr.size());}
-    byte_string to_bytes(const _Elem* __first, const _Elem* __last);
-
-    _LIBCPP_ALWAYS_INLINE
-    size_t converted() const _NOEXCEPT {return __cvtcount_;}
-    _LIBCPP_ALWAYS_INLINE
-    state_type state() const {return __cvtstate_;}
-};
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-inline _LIBCPP_ALWAYS_INLINE
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    wstring_convert(_Codecvt* __pcvt)
-        : __cvtptr_(__pcvt), __cvtstate_(), __cvtcount_(0)
-{
-}
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-inline _LIBCPP_ALWAYS_INLINE
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    wstring_convert(_Codecvt* __pcvt, state_type __state)
-        : __cvtptr_(__pcvt), __cvtstate_(__state), __cvtcount_(0)
-{
-}
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    wstring_convert(const byte_string& __byte_err, const wide_string& __wide_err)
-        : __byte_err_string_(__byte_err), __wide_err_string_(__wide_err),
-          __cvtstate_(), __cvtcount_(0)
-{
-    __cvtptr_ = new _Codecvt;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-inline _LIBCPP_ALWAYS_INLINE
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    wstring_convert(wstring_convert&& __wc)
-        : __byte_err_string_(_VSTD::move(__wc.__byte_err_string_)),
-          __wide_err_string_(_VSTD::move(__wc.__wide_err_string_)),
-          __cvtptr_(__wc.__cvtptr_),
-          __cvtstate_(__wc.__cvtstate_), __cvtcount_(__wc.__cvtstate_)
-{
-    __wc.__cvtptr_ = nullptr;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::~wstring_convert()
-{
-    delete __cvtptr_;
-}
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-typename wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::wide_string
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    from_bytes(const char* __frm, const char* __frm_end)
-{
-    __cvtcount_ = 0;
-    if (__cvtptr_ != nullptr)
-    {
-        wide_string __ws(2*(__frm_end - __frm), _Elem());
-        if (__frm != __frm_end)
-            __ws.resize(__ws.capacity());
-        codecvt_base::result __r = codecvt_base::ok;
-        state_type __st = __cvtstate_;
-        if (__frm != __frm_end)
-        {
-            _Elem* __to = &__ws[0];
-            _Elem* __to_end = __to + __ws.size();
-            const char* __frm_nxt;
-            do
-            {
-                _Elem* __to_nxt;
-                __r = __cvtptr_->in(__st, __frm, __frm_end, __frm_nxt,
-                                          __to, __to_end, __to_nxt);
-                __cvtcount_ += __frm_nxt - __frm;
-                if (__frm_nxt == __frm)
-                {
-                    __r = codecvt_base::error;
-                }
-                else if (__r == codecvt_base::noconv)
-                {
-                    __ws.resize(__to - &__ws[0]);
-                    // This only gets executed if _Elem is char
-                    __ws.append((const _Elem*)__frm, (const _Elem*)__frm_end);
-                    __frm = __frm_nxt;
-                    __r = codecvt_base::ok;
-                }
-                else if (__r == codecvt_base::ok)
-                {
-                    __ws.resize(__to_nxt - &__ws[0]);
-                    __frm = __frm_nxt;
-                }
-                else if (__r == codecvt_base::partial)
-                {
-                    ptrdiff_t __s = __to_nxt - &__ws[0];
-                    __ws.resize(2 * __s);
-                    __to = &__ws[0] + __s;
-                    __to_end = &__ws[0] + __ws.size();
-                    __frm = __frm_nxt;
-                }
-            } while (__r == codecvt_base::partial && __frm_nxt < __frm_end);
-        }
-        if (__r == codecvt_base::ok)
-            return __ws;
-    }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__wide_err_string_.empty())
-        throw range_error("wstring_convert: from_bytes error");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __wide_err_string_;
-}
-
-template<class _Codecvt, class _Elem, class _Wide_alloc, class _Byte_alloc>
-typename wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::byte_string
-wstring_convert<_Codecvt, _Elem, _Wide_alloc, _Byte_alloc>::
-    to_bytes(const _Elem* __frm, const _Elem* __frm_end)
-{
-    __cvtcount_ = 0;
-    if (__cvtptr_ != nullptr)
-    {
-        byte_string __bs(2*(__frm_end - __frm), char());
-        if (__frm != __frm_end)
-            __bs.resize(__bs.capacity());
-        codecvt_base::result __r = codecvt_base::ok;
-        state_type __st = __cvtstate_;
-        if (__frm != __frm_end)
-        {
-            char* __to = &__bs[0];
-            char* __to_end = __to + __bs.size();
-            const _Elem* __frm_nxt;
-            do
-            {
-                char* __to_nxt;
-                __r = __cvtptr_->out(__st, __frm, __frm_end, __frm_nxt,
-                                           __to, __to_end, __to_nxt);
-                __cvtcount_ += __frm_nxt - __frm;
-                if (__frm_nxt == __frm)
-                {
-                    __r = codecvt_base::error;
-                }
-                else if (__r == codecvt_base::noconv)
-                {
-                    __bs.resize(__to - &__bs[0]);
-                    // This only gets executed if _Elem is char
-                    __bs.append((const char*)__frm, (const char*)__frm_end);
-                    __frm = __frm_nxt;
-                    __r = codecvt_base::ok;
-                }
-                else if (__r == codecvt_base::ok)
-                {
-                    __bs.resize(__to_nxt - &__bs[0]);
-                    __frm = __frm_nxt;
-                }
-                else if (__r == codecvt_base::partial)
-                {
-                    ptrdiff_t __s = __to_nxt - &__bs[0];
-                    __bs.resize(2 * __s);
-                    __to = &__bs[0] + __s;
-                    __to_end = &__bs[0] + __bs.size();
-                    __frm = __frm_nxt;
-                }
-            } while (__r == codecvt_base::partial && __frm_nxt < __frm_end);
-        }
-        if (__r == codecvt_base::ok)
-        {
-            size_t __s = __bs.size();
-            __bs.resize(__bs.capacity());
-            char* __to = &__bs[0] + __s;
-            char* __to_end = __to + __bs.size();
-            do
-            {
-                char* __to_nxt;
-                __r = __cvtptr_->unshift(__st, __to, __to_end, __to_nxt);
-                if (__r == codecvt_base::noconv)
-                {
-                    __bs.resize(__to - &__bs[0]);
-                    __r = codecvt_base::ok;
-                }
-                else if (__r == codecvt_base::ok)
-                {
-                    __bs.resize(__to_nxt - &__bs[0]);
-                }
-                else if (__r == codecvt_base::partial)
-                {
-                    ptrdiff_t __sp = __to_nxt - &__bs[0];
-                    __bs.resize(2 * __sp);
-                    __to = &__bs[0] + __sp;
-                    __to_end = &__bs[0] + __bs.size();
-                }
-            } while (__r == codecvt_base::partial);
-            if (__r == codecvt_base::ok)
-                return __bs;
-        }
-    }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__byte_err_string_.empty())
-        throw range_error("wstring_convert: to_bytes error");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __byte_err_string_;
-}
-
-template <class _Codecvt, class _Elem = wchar_t, class _Tr = char_traits<_Elem> >
-class _LIBCPP_TYPE_VIS_ONLY wbuffer_convert
-    : public basic_streambuf<_Elem, _Tr>
-{
-public:
-    // types:
-    typedef _Elem                          char_type;
-    typedef _Tr                            traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef typename _Codecvt::state_type  state_type;
-
-private:
-    char*       __extbuf_;
-    const char* __extbufnext_;
-    const char* __extbufend_;
-    char __extbuf_min_[8];
-    size_t __ebs_;
-    char_type* __intbuf_;
-    size_t __ibs_;
-    streambuf* __bufptr_;
-    _Codecvt* __cv_;
-    state_type __st_;
-    ios_base::openmode __cm_;
-    bool __owns_eb_;
-    bool __owns_ib_;
-    bool __always_noconv_;
-
-    wbuffer_convert(const wbuffer_convert&);
-    wbuffer_convert& operator=(const wbuffer_convert&);
-public:
-    _LIBCPP_EXPLICIT_AFTER_CXX11 wbuffer_convert(streambuf* __bytebuf = 0, 
-            _Codecvt* __pcvt = new _Codecvt, state_type __state = state_type());
-    ~wbuffer_convert();
-
-    _LIBCPP_INLINE_VISIBILITY
-    streambuf* rdbuf() const {return __bufptr_;}
-    _LIBCPP_INLINE_VISIBILITY
-    streambuf* rdbuf(streambuf* __bytebuf)
-    {
-        streambuf* __r = __bufptr_;
-        __bufptr_ = __bytebuf;
-        return __r;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    state_type state() const {return __st_;}
-
-protected:
-    virtual int_type underflow();
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-    virtual int_type overflow (int_type __c = traits_type::eof());
-    virtual basic_streambuf<char_type, traits_type>* setbuf(char_type* __s,
-                                                            streamsize __n);
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual int sync();
-
-private:
-    bool __read_mode();
-    void __write_mode();
-    wbuffer_convert* __close();
-};
-
-template <class _Codecvt, class _Elem, class _Tr>
-wbuffer_convert<_Codecvt, _Elem, _Tr>::
-    wbuffer_convert(streambuf* __bytebuf, _Codecvt* __pcvt, state_type __state)
-    : __extbuf_(0),
-      __extbufnext_(0),
-      __extbufend_(0),
-      __ebs_(0),
-      __intbuf_(0),
-      __ibs_(0),
-      __bufptr_(__bytebuf),
-      __cv_(__pcvt),
-      __st_(__state),
-      __cm_(0),
-      __owns_eb_(false),
-      __owns_ib_(false),
-      __always_noconv_(__cv_ ? __cv_->always_noconv() : false)
-{
-    setbuf(0, 4096);
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-wbuffer_convert<_Codecvt, _Elem, _Tr>::~wbuffer_convert()
-{
-    __close();
-    delete __cv_;
-    if (__owns_eb_)
-        delete [] __extbuf_;
-    if (__owns_ib_)
-        delete [] __intbuf_;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::int_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::underflow()
-{
-    if (__cv_ == 0 || __bufptr_ == 0)
-        return traits_type::eof();
-    bool __initial = __read_mode();
-    char_type __1buf;
-    if (this->gptr() == 0)
-        this->setg(&__1buf, &__1buf+1, &__1buf+1);
-    const size_t __unget_sz = __initial ? 0 : min<size_t>((this->egptr() - this->eback()) / 2, 4);
-    int_type __c = traits_type::eof();
-    if (this->gptr() == this->egptr())
-    {
-        memmove(this->eback(), this->egptr() - __unget_sz, __unget_sz * sizeof(char_type));
-        if (__always_noconv_)
-        {
-            streamsize __nmemb = static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz);
-            __nmemb = __bufptr_->sgetn((char*)this->eback() + __unget_sz, __nmemb);
-            if (__nmemb != 0)
-            {
-                this->setg(this->eback(),
-                           this->eback() + __unget_sz,
-                           this->eback() + __unget_sz + __nmemb);
-                __c = *this->gptr();
-            }
-        }
-        else
-        {
-            memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
-            __extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
-            __extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
-            streamsize __nmemb = _VSTD::min(static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz),
-                                 static_cast<streamsize>(__extbufend_ - __extbufnext_));
-            codecvt_base::result __r;
-            state_type __svs = __st_;
-            streamsize __nr = __bufptr_->sgetn(const_cast<char*>(__extbufnext_), __nmemb);
-            if (__nr != 0)
-            {
-                __extbufend_ = __extbufnext_ + __nr;
-                char_type*  __inext;
-                __r = __cv_->in(__st_, __extbuf_, __extbufend_, __extbufnext_,
-                                       this->eback() + __unget_sz,
-                                       this->egptr(), __inext);
-                if (__r == codecvt_base::noconv)
-                {
-                    this->setg((char_type*)__extbuf_, (char_type*)__extbuf_, (char_type*)__extbufend_);
-                    __c = *this->gptr();
-                }
-                else if (__inext != this->eback() + __unget_sz)
-                {
-                    this->setg(this->eback(), this->eback() + __unget_sz, __inext);
-                    __c = *this->gptr();
-                }
-            }
-        }
-    }
-    else
-        __c = *this->gptr();
-    if (this->eback() == &__1buf)
-        this->setg(0, 0, 0);
-    return __c;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::int_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::pbackfail(int_type __c)
-{
-    if (__cv_ != 0 && __bufptr_ != 0 && this->eback() < this->gptr())
-    {
-        if (traits_type::eq_int_type(__c, traits_type::eof()))
-        {
-            this->gbump(-1);
-            return traits_type::not_eof(__c);
-        }
-        if (traits_type::eq(traits_type::to_char_type(__c), this->gptr()[-1]))
-        {
-            this->gbump(-1);
-            *this->gptr() = traits_type::to_char_type(__c);
-            return __c;
-        }
-    }
-    return traits_type::eof();
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::int_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::overflow(int_type __c)
-{
-    if (__cv_ == 0 || __bufptr_ == 0)
-        return traits_type::eof();
-    __write_mode();
-    char_type __1buf;
-    char_type* __pb_save = this->pbase();
-    char_type* __epb_save = this->epptr();
-    if (!traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        if (this->pptr() == 0)
-            this->setp(&__1buf, &__1buf+1);
-        *this->pptr() = traits_type::to_char_type(__c);
-        this->pbump(1);
-    }
-    if (this->pptr() != this->pbase())
-    {
-        if (__always_noconv_)
-        {
-            streamsize __nmemb = static_cast<streamsize>(this->pptr() - this->pbase());
-            if (__bufptr_->sputn((const char*)this->pbase(), __nmemb) != __nmemb)
-                return traits_type::eof();
-        }
-        else
-        {
-            char* __extbe = __extbuf_;
-            codecvt_base::result __r;
-            do
-            {
-                const char_type* __e;
-                __r = __cv_->out(__st_, this->pbase(), this->pptr(), __e,
-                                        __extbuf_, __extbuf_ + __ebs_, __extbe);
-                if (__e == this->pbase())
-                    return traits_type::eof();
-                if (__r == codecvt_base::noconv)
-                {
-                    streamsize __nmemb = static_cast<size_t>(this->pptr() - this->pbase());
-                    if (__bufptr_->sputn((const char*)this->pbase(), __nmemb) != __nmemb)
-                        return traits_type::eof();
-                }
-                else if (__r == codecvt_base::ok || __r == codecvt_base::partial)
-                {
-                    streamsize __nmemb = static_cast<size_t>(__extbe - __extbuf_);
-                    if (__bufptr_->sputn(__extbuf_, __nmemb) != __nmemb)
-                        return traits_type::eof();
-                    if (__r == codecvt_base::partial)
-                    {
-                        this->setp((char_type*)__e, this->pptr());
-                        this->pbump(this->epptr() - this->pbase());
-                    }
-                }
-                else
-                    return traits_type::eof();
-            } while (__r == codecvt_base::partial);
-        }
-        this->setp(__pb_save, __epb_save);
-    }
-    return traits_type::not_eof(__c);
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-basic_streambuf<_Elem, _Tr>*
-wbuffer_convert<_Codecvt, _Elem, _Tr>::setbuf(char_type* __s, streamsize __n)
-{
-    this->setg(0, 0, 0);
-    this->setp(0, 0);
-    if (__owns_eb_)
-        delete [] __extbuf_;
-    if (__owns_ib_)
-        delete [] __intbuf_;
-    __ebs_ = __n;
-    if (__ebs_ > sizeof(__extbuf_min_))
-    {
-        if (__always_noconv_ && __s)
-        {
-            __extbuf_ = (char*)__s;
-            __owns_eb_ = false;
-        }
-        else
-        {
-            __extbuf_ = new char[__ebs_];
-            __owns_eb_ = true;
-        }
-    }
-    else
-    {
-        __extbuf_ = __extbuf_min_;
-        __ebs_ = sizeof(__extbuf_min_);
-        __owns_eb_ = false;
-    }
-    if (!__always_noconv_)
-    {
-        __ibs_ = max<streamsize>(__n, sizeof(__extbuf_min_));
-        if (__s && __ibs_ >= sizeof(__extbuf_min_))
-        {
-            __intbuf_ = __s;
-            __owns_ib_ = false;
-        }
-        else
-        {
-            __intbuf_ = new char_type[__ibs_];
-            __owns_ib_ = true;
-        }
-    }
-    else
-    {
-        __ibs_ = 0;
-        __intbuf_ = 0;
-        __owns_ib_ = false;
-    }
-    return this;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::pos_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::seekoff(off_type __off, ios_base::seekdir __way,
-                                        ios_base::openmode __om)
-{
-    int __width = __cv_->encoding();
-    if (__cv_ == 0 || __bufptr_ == 0 || (__width <= 0 && __off != 0) || sync())
-        return pos_type(off_type(-1));
-    // __width > 0 || __off == 0
-    switch (__way)
-    {
-    case ios_base::beg:
-        break;
-    case ios_base::cur:
-        break;
-    case ios_base::end:
-        break;
-    default:
-        return pos_type(off_type(-1));
-    }
-    pos_type __r = __bufptr_->pubseekoff(__width * __off, __way, __om);
-    __r.state(__st_);
-    return __r;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-typename wbuffer_convert<_Codecvt, _Elem, _Tr>::pos_type
-wbuffer_convert<_Codecvt, _Elem, _Tr>::seekpos(pos_type __sp, ios_base::openmode __wch)
-{
-    if (__cv_ == 0 || __bufptr_ == 0 || sync())
-        return pos_type(off_type(-1));
-    if (__bufptr_->pubseekpos(__sp, __wch) == pos_type(off_type(-1)))
-        return pos_type(off_type(-1));
-    return __sp;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-int
-wbuffer_convert<_Codecvt, _Elem, _Tr>::sync()
-{
-    if (__cv_ == 0 || __bufptr_ == 0)
-        return 0;
-    if (__cm_ & ios_base::out)
-    {
-        if (this->pptr() != this->pbase())
-            if (overflow() == traits_type::eof())
-                return -1;
-        codecvt_base::result __r;
-        do
-        {
-            char* __extbe;
-            __r = __cv_->unshift(__st_, __extbuf_, __extbuf_ + __ebs_, __extbe);
-            streamsize __nmemb = static_cast<streamsize>(__extbe - __extbuf_);
-            if (__bufptr_->sputn(__extbuf_, __nmemb) != __nmemb)
-                return -1;
-        } while (__r == codecvt_base::partial);
-        if (__r == codecvt_base::error)
-            return -1;
-        if (__bufptr_->pubsync())
-            return -1;
-    }
-    else if (__cm_ & ios_base::in)
-    {
-        off_type __c;
-        if (__always_noconv_)
-            __c = this->egptr() - this->gptr();
-        else
-        {
-            int __width = __cv_->encoding();
-            __c = __extbufend_ - __extbufnext_;
-            if (__width > 0)
-                __c += __width * (this->egptr() - this->gptr());
-            else
-            {
-                if (this->gptr() != this->egptr())
-                {
-                    reverse(this->gptr(), this->egptr());
-                    codecvt_base::result __r;
-                    const char_type* __e = this->gptr();
-                    char* __extbe;
-                    do
-                    {
-                        __r = __cv_->out(__st_, __e, this->egptr(), __e,
-                                         __extbuf_, __extbuf_ + __ebs_, __extbe);
-                        switch (__r)
-                        {
-                        case codecvt_base::noconv:
-                            __c += this->egptr() - this->gptr();
-                            break;
-                        case codecvt_base::ok:
-                        case codecvt_base::partial:
-                            __c += __extbe - __extbuf_;
-                            break;
-                        default:
-                            return -1;
-                        }
-                    } while (__r == codecvt_base::partial);
-                }
-            }
-        }
-        if (__bufptr_->pubseekoff(-__c, ios_base::cur, __cm_) == pos_type(off_type(-1)))
-            return -1;
-        this->setg(0, 0, 0);
-        __cm_ = 0;
-    }
-    return 0;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-bool
-wbuffer_convert<_Codecvt, _Elem, _Tr>::__read_mode()
-{
-    if (!(__cm_ & ios_base::in))
-    {
-        this->setp(0, 0);
-        if (__always_noconv_)
-            this->setg((char_type*)__extbuf_,
-                       (char_type*)__extbuf_ + __ebs_,
-                       (char_type*)__extbuf_ + __ebs_);
-        else
-            this->setg(__intbuf_, __intbuf_ + __ibs_, __intbuf_ + __ibs_);
-        __cm_ = ios_base::in;
-        return true;
-    }
-    return false;
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-void
-wbuffer_convert<_Codecvt, _Elem, _Tr>::__write_mode()
-{
-    if (!(__cm_ & ios_base::out))
-    {
-        this->setg(0, 0, 0);
-        if (__ebs_ > sizeof(__extbuf_min_))
-        {
-            if (__always_noconv_)
-                this->setp((char_type*)__extbuf_,
-                           (char_type*)__extbuf_ + (__ebs_ - 1));
-            else
-                this->setp(__intbuf_, __intbuf_ + (__ibs_ - 1));
-        }
-        else
-            this->setp(0, 0);
-        __cm_ = ios_base::out;
-    }
-}
-
-template <class _Codecvt, class _Elem, class _Tr>
-wbuffer_convert<_Codecvt, _Elem, _Tr>*
-wbuffer_convert<_Codecvt, _Elem, _Tr>::__close()
-{
-    wbuffer_convert* __rt = 0;
-    if (__cv_ != 0 && __bufptr_ != 0)
-    {
-        __rt = this;
-        if ((__cm_ & ios_base::out) && sync())
-            __rt = 0;
-    }
-    return __rt;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_LOCALE
diff --git a/include.new/c++/v1/tr1/map b/include.new/c++/v1/tr1/map
deleted file mode 100644
index 5c3969a..0000000
--- a/include.new/c++/v1/tr1/map
+++ /dev/null
@@ -1,2075 +0,0 @@
-// -*- C++ -*-
-//===----------------------------- map ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_MAP
-#define _LIBCPP_MAP
-
-/*
-
-    map synopsis
-
-namespace std
-{
-
-template <class Key, class T, class Compare = less<Key>,
-          class Allocator = allocator<pair<const Key, T>>>
-class map
-{
-public:
-    // types:
-    typedef Key                                      key_type;
-    typedef T                                        mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef Compare                                  key_compare;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    class value_compare
-        : public binary_function<value_type, value_type, bool>
-    {
-        friend class map;
-    protected:
-        key_compare comp;
-
-        value_compare(key_compare c);
-    public:
-        bool operator()(const value_type& x, const value_type& y) const;
-    };
-
-    // construct/copy/destroy:
-    map()
-        noexcept(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value);
-    explicit map(const key_compare& comp);
-    map(const key_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        map(InputIterator first, InputIterator last,
-            const key_compare& comp = key_compare());
-    template <class InputIterator>
-        map(InputIterator first, InputIterator last,
-            const key_compare& comp, const allocator_type& a);
-    map(const map& m);
-    map(map&& m)
-        noexcept(
-            is_nothrow_move_constructible<allocator_type>::value &&
-            is_nothrow_move_constructible<key_compare>::value);
-    explicit map(const allocator_type& a);
-    map(const map& m, const allocator_type& a);
-    map(map&& m, const allocator_type& a);
-    map(initializer_list<value_type> il, const key_compare& comp = key_compare());
-    map(initializer_list<value_type> il, const key_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        map(InputIterator first, InputIterator last, const allocator_type& a)
-            : map(first, last, Compare(), a) {}  // C++14
-    map(initializer_list<value_type> il, const allocator_type& a)
-        : map(il, Compare(), a) {}  // C++14
-   ~map();
-
-    map& operator=(const map& m);
-    map& operator=(map&& m)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<key_compare>::value);
-    map& operator=(initializer_list<value_type> il);
-
-    // iterators:
-          iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-          iterator end() noexcept;
-    const_iterator end()   const noexcept;
-
-          reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-          reverse_iterator rend() noexcept;
-    const_reverse_iterator rend()   const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    // capacity:
-    bool      empty()    const noexcept;
-    size_type size()     const noexcept;
-    size_type max_size() const noexcept;
-
-    // element access:
-    mapped_type& operator[](const key_type& k);
-    mapped_type& operator[](key_type&& k);
-
-          mapped_type& at(const key_type& k);
-    const mapped_type& at(const key_type& k) const;
-
-    // modifiers:
-    template <class... Args>
-        pair<iterator, bool> emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    pair<iterator, bool> insert(const value_type& v);
-    template <class P>
-        pair<iterator, bool> insert(P&& p);
-    iterator insert(const_iterator position, const value_type& v);
-    template <class P>
-        iterator insert(const_iterator position, P&& p);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type> il);
-
-    iterator  erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator  erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(map& m)
-        noexcept(
-            __is_nothrow_swappable<key_compare>::value &&
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value));
-
-    // observers:
-    allocator_type get_allocator() const noexcept;
-    key_compare    key_comp()      const;
-    value_compare  value_comp()    const;
-
-    // map operations:
-          iterator find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    template<typename K>
-        iterator find(const K& x);              // C++14
-    template<typename K>
-        const_iterator find(const K& x) const;  // C++14
-    template<typename K>
-      size_type count(const K& x) const;        // C++14
-
-    size_type      count(const key_type& k) const;
-          iterator lower_bound(const key_type& k);
-    const_iterator lower_bound(const key_type& k) const;
-    template<typename K>
-        iterator lower_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator lower_bound(const K& x) const;  // C++14
-
-          iterator upper_bound(const key_type& k);
-    const_iterator upper_bound(const key_type& k) const;
-    template<typename K>
-        iterator upper_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator upper_bound(const K& x) const;  // C++14
-
-    pair<iterator,iterator>             equal_range(const key_type& k);
-    pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
-    template<typename K>
-        pair<iterator,iterator>             equal_range(const K& x);        // C++14
-    template<typename K>
-        pair<const_iterator,const_iterator> equal_range(const K& x) const;  // C++14
-};
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator==(const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator< (const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator!=(const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator> (const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator>=(const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator<=(const map<Key, T, Compare, Allocator>& x,
-           const map<Key, T, Compare, Allocator>& y);
-
-// specialized algorithms:
-template <class Key, class T, class Compare, class Allocator>
-void
-swap(map<Key, T, Compare, Allocator>& x, map<Key, T, Compare, Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-template <class Key, class T, class Compare = less<Key>,
-          class Allocator = allocator<pair<const Key, T>>>
-class multimap
-{
-public:
-    // types:
-    typedef Key                                      key_type;
-    typedef T                                        mapped_type;
-    typedef pair<const key_type,mapped_type>         value_type;
-    typedef Compare                                  key_compare;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    class value_compare
-        : public binary_function<value_type,value_type,bool>
-    {
-        friend class multimap;
-    protected:
-        key_compare comp;
-        value_compare(key_compare c);
-    public:
-        bool operator()(const value_type& x, const value_type& y) const;
-    };
-
-    // construct/copy/destroy:
-    multimap()
-        noexcept(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value);
-    explicit multimap(const key_compare& comp);
-    multimap(const key_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        multimap(InputIterator first, InputIterator last, const key_compare& comp);
-    template <class InputIterator>
-        multimap(InputIterator first, InputIterator last, const key_compare& comp,
-                 const allocator_type& a);
-    multimap(const multimap& m);
-    multimap(multimap&& m)
-        noexcept(
-            is_nothrow_move_constructible<allocator_type>::value &&
-            is_nothrow_move_constructible<key_compare>::value);
-    explicit multimap(const allocator_type& a);
-    multimap(const multimap& m, const allocator_type& a);
-    multimap(multimap&& m, const allocator_type& a);
-    multimap(initializer_list<value_type> il, const key_compare& comp = key_compare());
-    multimap(initializer_list<value_type> il, const key_compare& comp,
-             const allocator_type& a);
-    template <class InputIterator>
-        multimap(InputIterator first, InputIterator last, const allocator_type& a)
-            : multimap(first, last, Compare(), a) {} // C++14
-    multimap(initializer_list<value_type> il, const allocator_type& a)
-        : multimap(il, Compare(), a) {} // C++14
-    ~multimap();
-
-    multimap& operator=(const multimap& m);
-    multimap& operator=(multimap&& m)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<key_compare>::value);
-    multimap& operator=(initializer_list<value_type> il);
-
-    // iterators:
-          iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-          iterator end() noexcept;
-    const_iterator end()   const noexcept;
-
-          reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-          reverse_iterator rend() noexcept;
-    const_reverse_iterator rend()   const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    // capacity:
-    bool      empty()    const noexcept;
-    size_type size()     const noexcept;
-    size_type max_size() const noexcept;
-
-    // modifiers:
-    template <class... Args>
-        iterator emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    iterator insert(const value_type& v);
-    template <class P>
-        iterator insert(P&& p);
-    iterator insert(const_iterator position, const value_type& v);
-    template <class P>
-        iterator insert(const_iterator position, P&& p);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type> il);
-
-    iterator  erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator  erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(multimap& m)
-        noexcept(
-            __is_nothrow_swappable<key_compare>::value &&
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value));
-
-    // observers:
-    allocator_type get_allocator() const noexcept;
-    key_compare    key_comp()      const;
-    value_compare  value_comp()    const;
-
-    // map operations:
-          iterator find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    template<typename K>
-        iterator find(const K& x);              // C++14
-    template<typename K>
-        const_iterator find(const K& x) const;  // C++14
-    template<typename K>
-      size_type count(const K& x) const;        // C++14
-
-    size_type      count(const key_type& k) const;
-          iterator lower_bound(const key_type& k);
-    const_iterator lower_bound(const key_type& k) const;
-    template<typename K>
-        iterator lower_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator lower_bound(const K& x) const;  // C++14
-
-          iterator upper_bound(const key_type& k);
-    const_iterator upper_bound(const key_type& k) const;
-    template<typename K>
-        iterator upper_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator upper_bound(const K& x) const;  // C++14
-
-    pair<iterator,iterator>             equal_range(const key_type& k);
-    pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
-    template<typename K>
-        pair<iterator,iterator>             equal_range(const K& x);        // C++14
-    template<typename K>
-        pair<const_iterator,const_iterator> equal_range(const K& x) const;  // C++14
-};
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator==(const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator< (const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator!=(const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator> (const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator>=(const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-template <class Key, class T, class Compare, class Allocator>
-bool
-operator<=(const multimap<Key, T, Compare, Allocator>& x,
-           const multimap<Key, T, Compare, Allocator>& y);
-
-// specialized algorithms:
-template <class Key, class T, class Compare, class Allocator>
-void
-swap(multimap<Key, T, Compare, Allocator>& x,
-     multimap<Key, T, Compare, Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__tree>
-#include <iterator>
-#include <memory>
-#include <utility>
-#include <functional>
-#include <initializer_list>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Key, class _CP, class _Compare, bool = is_empty<_Compare>::value
-#if __has_feature(is_final)
-                                                        && !__is_final(_Compare)
-#endif
-         >
-class __map_value_compare
-    : private _Compare
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __map_value_compare()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Compare>::value)
-        : _Compare() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_value_compare(_Compare c)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Compare>::value)
-        : _Compare(c) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Compare& key_comp() const _NOEXCEPT {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _CP& __x, const _CP& __y) const
-        {return static_cast<const _Compare&>(*this)(__x.__cc.first, __y.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _CP& __x, const _Key& __y) const
-        {return static_cast<const _Compare&>(*this)(__x.__cc.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Key& __x, const _CP& __y) const
-        {return static_cast<const _Compare&>(*this)(__x, __y.__cc.first);}
-
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type
-    operator () ( const _K2& __x, const _CP& __y ) const
-        {return static_cast<const _Compare&>(*this) (__x, __y.__cc.first);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type
-    operator () (const _CP& __x, const _K2& __y) const
-        {return static_cast<const _Compare&>(*this) (__x.__cc.first, __y);}
-#endif
-};
-
-template <class _Key, class _CP, class _Compare>
-class __map_value_compare<_Key, _CP, _Compare, false>
-{
-    _Compare comp;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __map_value_compare()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Compare>::value)
-        : comp() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_value_compare(_Compare c)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Compare>::value)
-        : comp(c) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Compare& key_comp() const _NOEXCEPT {return comp;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _CP& __x, const _CP& __y) const
-        {return comp(__x.__cc.first, __y.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _CP& __x, const _Key& __y) const
-        {return comp(__x.__cc.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Key& __x, const _CP& __y) const
-        {return comp(__x, __y.__cc.first);}
-
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type
-    operator () ( const _K2& __x, const _CP& __y ) const
-        {return comp (__x, __y.__cc.first);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value, bool>::type
-    operator () (const _CP& __x, const _K2& __y) const
-        {return comp (__x.__cc.first, __y);}
-#endif
-};
-
-template <class _Allocator>
-class __map_node_destructor
-{
-    typedef _Allocator                          allocator_type;
-    typedef allocator_traits<allocator_type>    __alloc_traits;
-    typedef typename __alloc_traits::value_type::value_type value_type;
-public:
-    typedef typename __alloc_traits::pointer    pointer;
-private:
-    typedef typename value_type::value_type::first_type     first_type;
-    typedef typename value_type::value_type::second_type    second_type;
-
-    allocator_type& __na_;
-
-    __map_node_destructor& operator=(const __map_node_destructor&);
-
-public:
-    bool __first_constructed;
-    bool __second_constructed;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __map_node_destructor(allocator_type& __na) _NOEXCEPT
-        : __na_(__na),
-          __first_constructed(false),
-          __second_constructed(false)
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    __map_node_destructor(__tree_node_destructor<allocator_type>&& __x) _NOEXCEPT
-        : __na_(__x.__na_),
-          __first_constructed(__x.__value_constructed),
-          __second_constructed(__x.__value_constructed)
-        {
-            __x.__value_constructed = false;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        if (__second_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.__cc.second));
-        if (__first_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.__cc.first));
-        if (__p)
-            __alloc_traits::deallocate(__na_, __p, 1);
-    }
-};
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class map;
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-    class multimap;
-template <class _TreeIterator> class __map_const_iterator;
-
-#if __cplusplus >= 201103L
-
-template <class _Key, class _Tp>
-union __value_type
-{
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef pair<key_type, mapped_type>              __nc_value_type;
-
-    value_type __cc;
-    __nc_value_type __nc;
-
-    template <class ..._Args>
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(_Args&& ...__args)
-        : __cc(std::forward<_Args>(__args)...) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(const __value_type& __v)
-        : __cc(__v.__cc) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(__value_type& __v)
-        : __cc(__v.__cc) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(__value_type&& __v)
-        : __nc(std::move(__v.__nc)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type& operator=(const __value_type& __v)
-        {__nc = __v.__cc; return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type& operator=(__value_type&& __v)
-        {__nc = std::move(__v.__nc); return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__value_type() {__cc.~value_type();}
-};
-
-#else
-
-template <class _Key, class _Tp>
-struct __value_type
-{
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-
-    value_type __cc;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type() {}
-
-    template <class _A0>
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(const _A0& __a0)
-        : __cc(__a0) {}
-
-    template <class _A0, class _A1>
-    _LIBCPP_INLINE_VISIBILITY
-    __value_type(const _A0& __a0, const _A1& __a1)
-        : __cc(__a0, __a1) {}
-};
-
-#endif
-
-template <class _TreeIterator>
-class _LIBCPP_TYPE_VIS_ONLY __map_iterator
-{
-    _TreeIterator __i_;
-
-    typedef typename _TreeIterator::__pointer_traits             __pointer_traits;
-    typedef const typename _TreeIterator::value_type::value_type::first_type __key_type;
-    typedef typename _TreeIterator::value_type::value_type::second_type      __mapped_type;
-public:
-    typedef bidirectional_iterator_tag                           iterator_category;
-    typedef pair<__key_type, __mapped_type>                      value_type;
-    typedef typename _TreeIterator::difference_type              difference_type;
-    typedef value_type&                                          reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator(_TreeIterator __i) _NOEXCEPT : __i_(__i) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __i_->__cc;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__i_->__cc);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator operator++(int)
-    {
-        __map_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator& operator--() {--__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_iterator operator--(int)
-    {
-        __map_iterator __t(*this);
-        --(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __map_iterator& __x, const __map_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend 
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __map_iterator& __x, const __map_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __map_const_iterator;
-};
-
-template <class _TreeIterator>
-class _LIBCPP_TYPE_VIS_ONLY __map_const_iterator
-{
-    _TreeIterator __i_;
-
-    typedef typename _TreeIterator::__pointer_traits             __pointer_traits;
-    typedef const typename _TreeIterator::value_type::value_type::first_type __key_type;
-    typedef typename _TreeIterator::value_type::value_type::second_type      __mapped_type;
-public:
-    typedef bidirectional_iterator_tag                           iterator_category;
-    typedef pair<__key_type, __mapped_type>                      value_type;
-    typedef typename _TreeIterator::difference_type              difference_type;
-    typedef const value_type&                                    reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator(_TreeIterator __i) _NOEXCEPT : __i_(__i) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator(
-            __map_iterator<typename _TreeIterator::__non_const_iterator> __i)
-                _NOEXCEPT
-                : __i_(__i.__i_) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __i_->__cc;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__i_->__cc);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator operator++(int)
-    {
-        __map_const_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator& operator--() {--__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __map_const_iterator operator--(int)
-    {
-        __map_const_iterator __t(*this);
-        --(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const __map_const_iterator& __x, const __map_const_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const __map_const_iterator& __x, const __map_const_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY map;
-    template <class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY multimap;
-    template <class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY __tree_const_iterator;
-};
-
-template <class _Key, class _Tp, class _Compare = less<_Key>,
-          class _Allocator = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY map
-{
-public:
-    // types:
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef pair<key_type, mapped_type>              __nc_value_type;
-    typedef _Compare                                 key_compare;
-    typedef _Allocator                               allocator_type;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-
-    class _LIBCPP_TYPE_VIS_ONLY value_compare
-        : public binary_function<value_type, value_type, bool>
-    {
-        friend class map;
-    protected:
-        key_compare comp;
-
-        _LIBCPP_INLINE_VISIBILITY value_compare(key_compare c) : comp(c) {}
-    public:
-        _LIBCPP_INLINE_VISIBILITY
-        bool operator()(const value_type& __x, const value_type& __y) const
-            {return comp(__x.first, __y.first);}
-    };
-
-private:
-
-    typedef _VSTD::__value_type<key_type, mapped_type>             __value_type;
-    typedef __map_value_compare<key_type, __value_type, key_compare> __vc;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                           __allocator_type;
-    typedef __tree<__value_type, __vc, __allocator_type>   __base;
-    typedef typename __base::__node_traits                 __node_traits;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
-
-    __base __tree_;
-
-public:
-    typedef typename __alloc_traits::pointer               pointer;
-    typedef typename __alloc_traits::const_pointer         const_pointer;
-    typedef typename __alloc_traits::size_type             size_type;
-    typedef typename __alloc_traits::difference_type       difference_type;
-    typedef __map_iterator<typename __base::iterator>      iterator;
-    typedef __map_const_iterator<typename __base::const_iterator> const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>               reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>         const_reverse_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    map()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__vc(key_compare())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit map(const key_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__vc(__comp)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit map(const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a) {}
-
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-        map(_InputIterator __f, _InputIterator __l,
-            const key_compare& __comp = key_compare())
-        : __tree_(__vc(__comp))
-        {
-            insert(__f, __l);
-        }
-
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-        map(_InputIterator __f, _InputIterator __l,
-            const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a)
-        {
-            insert(__f, __l);
-        }
-
-#if _LIBCPP_STD_VER > 11
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY 
-    map(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
-        : map(__f, __l, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(const map& __m)
-        : __tree_(__m.__tree_)
-        {
-            insert(__m.begin(), __m.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    map& operator=(const map& __m)
-        {
-#if __cplusplus >= 201103L
-            __tree_ = __m.__tree_;
-#else
-            if (this != &__m) {
-                __tree_.clear();
-                __tree_.value_comp() = __m.__tree_.value_comp();
-                __tree_.__copy_assign_alloc(__m.__tree_);
-                insert(__m.begin(), __m.end());
-            }
-#endif
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(map&& __m)
-        _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-        : __tree_(_VSTD::move(__m.__tree_))
-        {
-        }
-
-    map(map&& __m, const allocator_type& __a);
-
-    _LIBCPP_INLINE_VISIBILITY
-    map& operator=(map&& __m)
-        _NOEXCEPT_(is_nothrow_move_assignable<__base>::value)
-        {
-            __tree_ = _VSTD::move(__m.__tree_);
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(initializer_list<value_type> __il, const key_compare& __comp = key_compare())
-        : __tree_(__vc(__comp))
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(initializer_list<value_type> __il, const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY 
-    map(initializer_list<value_type> __il, const allocator_type& __a)
-        : map(__il, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    map& operator=(initializer_list<value_type> __il)
-        {
-            __tree_.__assign_unique(__il.begin(), __il.end());
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit map(const allocator_type& __a)
-        : __tree_(__a)
-        {
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    map(const map& __m, const allocator_type& __a)
-        : __tree_(__m.__tree_.value_comp(), __a)
-        {
-            insert(__m.begin(), __m.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT {return __tree_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT {return __tree_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT
-            {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __tree_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __tree_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __tree_.max_size();}
-
-    mapped_type& operator[](const key_type& __k);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    mapped_type& operator[](key_type&& __k);
-#endif
-
-          mapped_type& at(const key_type& __k);
-    const mapped_type& at(const key_type& __k) const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __tree_.__alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_compare    key_comp()      const {return __tree_.value_comp().key_comp();}
-    _LIBCPP_INLINE_VISIBILITY
-    value_compare  value_comp()    const {return value_compare(__tree_.value_comp().key_comp());}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class ..._Args>
-        pair<iterator, bool>
-        emplace(_Args&& ...__args);
-
-    template <class ..._Args>
-        iterator
-        emplace_hint(const_iterator __p, _Args&& ...__args);
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        pair<iterator, bool> insert(_Pp&& __p)
-            {return __tree_.__insert_unique(_VSTD::forward<_Pp>(__p));}
-
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(const_iterator __pos, _Pp&& __p)
-            {return __tree_.__insert_unique(__pos.__i_, _VSTD::forward<_Pp>(__p));}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool>
-        insert(const value_type& __v) {return __tree_.__insert_unique(__v);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator
-        insert(const_iterator __p, const value_type& __v)
-            {return __tree_.__insert_unique(__p.__i_, __v);}
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void insert(_InputIterator __f, _InputIterator __l)
-        {
-            for (const_iterator __e = cend(); __f != __l; ++__f)
-                insert(__e.__i_, *__f);
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __tree_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k)
-        {return __tree_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __f, const_iterator __l)
-        {return __tree_.erase(__f.__i_, __l.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__tree_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(map& __m)
-        _NOEXCEPT_(__is_nothrow_swappable<__base>::value)
-        {__tree_.swap(__m.__tree_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator find(const key_type& __k)             {return __tree_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __tree_.find(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    find(const _K2& __k)                           {return __tree_.find(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    find(const _K2& __k) const                     {return __tree_.find(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type      count(const key_type& __k) const
-        {return __tree_.__count_unique(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
-    count(const _K2& __k)                  {return __tree_.__count_unique(__k);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    iterator lower_bound(const key_type& __k)
-        {return __tree_.lower_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator lower_bound(const key_type& __k) const
-        {return __tree_.lower_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    lower_bound(const _K2& __k)       {return __tree_.lower_bound(__k);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator upper_bound(const key_type& __k)
-        {return __tree_.upper_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator upper_bound(const key_type& __k) const
-        {return __tree_.upper_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    upper_bound(const _K2& __k)       {return __tree_.upper_bound(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,iterator> equal_range(const key_type& __k)
-        {return __tree_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator,const_iterator> equal_range(const key_type& __k) const
-        {return __tree_.__equal_range_unique(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type
-    equal_range(const _K2& __k)       {return __tree_.__equal_range_unique(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type
-    equal_range(const _K2& __k) const {return __tree_.__equal_range_unique(__k);}
-#endif
-
-private:
-    typedef typename __base::__node                    __node;
-    typedef typename __base::__node_allocator          __node_allocator;
-    typedef typename __base::__node_pointer            __node_pointer;
-    typedef typename __base::__node_const_pointer      __node_const_pointer;
-    typedef typename __base::__node_base_pointer       __node_base_pointer;
-    typedef typename __base::__node_base_const_pointer __node_base_const_pointer;
-    typedef __map_node_destructor<__node_allocator> _Dp;
-    typedef unique_ptr<__node, _Dp> __node_holder;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node();
-    template <class _A0>
-        __node_holder __construct_node(_A0&& __a0);
-    __node_holder __construct_node_with_key(key_type&& __k);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _A0, class _A1, class ..._Args>
-        __node_holder __construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif
-    __node_holder __construct_node_with_key(const key_type& __k);
-
-    __node_base_pointer&
-        __find_equal_key(__node_base_pointer& __parent, const key_type& __k);
-    __node_base_const_pointer
-        __find_equal_key(__node_base_const_pointer& __parent, const key_type& __k) const;
-};
-
-// Find place to insert if __k doesn't exist
-// Set __parent to parent of null leaf
-// Return reference to null leaf
-// If __k exists, set parent to node of __k and return reference to node of __k
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_base_pointer&
-map<_Key, _Tp, _Compare, _Allocator>::__find_equal_key(__node_base_pointer& __parent,
-                                                       const key_type& __k)
-{
-    __node_pointer __nd = __tree_.__root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (__tree_.value_comp().key_comp()(__k, __nd->__value_.__cc.first))
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__left_;
-                }
-            }
-            else if (__tree_.value_comp().key_comp()(__nd->__value_.__cc.first, __k))
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return __parent->__right_;
-                }
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__nd);
-                return __parent;
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__tree_.__end_node());
-    return __parent->__left_;
-}
-
-// Find __k
-// Set __parent to parent of null leaf and
-//    return reference to null leaf iv __k does not exist.
-// If __k exists, set parent to node of __k and return reference to node of __k
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_base_const_pointer
-map<_Key, _Tp, _Compare, _Allocator>::__find_equal_key(__node_base_const_pointer& __parent,
-                                                       const key_type& __k) const
-{
-    __node_const_pointer __nd = __tree_.__root();
-    if (__nd != nullptr)
-    {
-        while (true)
-        {
-            if (__tree_.value_comp().key_comp()(__k, __nd->__value_.__cc.first))
-            {
-                if (__nd->__left_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__left_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return const_cast<const __node_base_const_pointer&>(__parent->__left_);
-                }
-            }
-            else if (__tree_.value_comp().key_comp()(__nd->__value_.__cc.first, __k))
-            {
-                if (__nd->__right_ != nullptr)
-                    __nd = static_cast<__node_pointer>(__nd->__right_);
-                else
-                {
-                    __parent = static_cast<__node_base_pointer>(__nd);
-                    return const_cast<const __node_base_const_pointer&>(__parent->__right_);
-                }
-            }
-            else
-            {
-                __parent = static_cast<__node_base_pointer>(__nd);
-                return __parent;
-            }
-        }
-    }
-    __parent = static_cast<__node_base_pointer>(__tree_.__end_node());
-    return const_cast<const __node_base_const_pointer&>(__parent->__left_);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-map<_Key, _Tp, _Compare, _Allocator>::map(map&& __m, const allocator_type& __a)
-    : __tree_(_VSTD::move(__m.__tree_), __a)
-{
-    if (__a != __m.get_allocator())
-    {
-        const_iterator __e = cend();
-        while (!__m.empty())
-            __tree_.__insert_unique(__e.__i_,
-                    _VSTD::move(__m.__tree_.remove(__m.begin().__i_)->__value_));
-    }
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node()
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first));
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class _A0>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::forward<_A0>(__a0));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node_with_key(key_type&& __k)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first), _VSTD::move(__k));
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class _A0, class _A1, class ..._Args>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0), _VSTD::forward<_A1>(__a1),
-                             _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename map<_Key, _Tp, _Compare, _Allocator>::__node_holder
-map<_Key, _Tp, _Compare, _Allocator>::__construct_node_with_key(const key_type& __k)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first), __k);
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-_Tp&
-map<_Key, _Tp, _Compare, _Allocator>::operator[](const key_type& __k)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal_key(__parent, __k);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __node_holder __h = __construct_node_with_key(__k);
-        __tree_.__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-    }
-    return __r->__value_.__cc.second;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-_Tp&
-map<_Key, _Tp, _Compare, _Allocator>::operator[](key_type&& __k)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal_key(__parent, __k);
-    __node_pointer __r = static_cast<__node_pointer>(__child);
-    if (__child == nullptr)
-    {
-        __node_holder __h = __construct_node_with_key(_VSTD::move(__k));
-        __tree_.__insert_node_at(__parent, __child, static_cast<__node_base_pointer>(__h.get()));
-        __r = __h.release();
-    }
-    return __r->__value_.__cc.second;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-_Tp&
-map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k)
-{
-    __node_base_pointer __parent;
-    __node_base_pointer& __child = __find_equal_key(__parent, __k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__child == nullptr)
-        throw out_of_range("map::at:  key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return static_cast<__node_pointer>(__child)->__value_.__cc.second;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-const _Tp&
-map<_Key, _Tp, _Compare, _Allocator>::at(const key_type& __k) const
-{
-    __node_base_const_pointer __parent;
-    __node_base_const_pointer __child = __find_equal_key(__parent, __k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__child == nullptr)
-        throw out_of_range("map::at:  key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return static_cast<__node_const_pointer>(__child)->__value_.__cc.second;
-}
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-pair<typename map<_Key, _Tp, _Compare, _Allocator>::iterator, bool>
-map<_Key, _Tp, _Compare, _Allocator>::emplace(_Args&& ...__args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    pair<iterator, bool> __r = __tree_.__node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-typename map<_Key, _Tp, _Compare, _Allocator>::iterator
-map<_Key, _Tp, _Compare, _Allocator>::emplace_hint(const_iterator __p,
-                                                   _Args&& ...__args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __tree_.__node_insert_unique(__p.__i_, __h.get());
-    if (__r.__i_.__ptr_ == __h.get())
-        __h.release();
-    return __r;
-}
-
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const map<_Key, _Tp, _Compare, _Allocator>& __x,
-           const map<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(map<_Key, _Tp, _Compare, _Allocator>& __x,
-     map<_Key, _Tp, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Tp, class _Compare = less<_Key>,
-          class _Allocator = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY multimap
-{
-public:
-    // types:
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef pair<key_type, mapped_type>              __nc_value_type;
-    typedef _Compare                                 key_compare;
-    typedef _Allocator                               allocator_type;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-
-    class _LIBCPP_TYPE_VIS_ONLY value_compare
-        : public binary_function<value_type, value_type, bool>
-    {
-        friend class multimap;
-    protected:
-        key_compare comp;
-
-        _LIBCPP_INLINE_VISIBILITY
-        value_compare(key_compare c) : comp(c) {}
-    public:
-        _LIBCPP_INLINE_VISIBILITY
-        bool operator()(const value_type& __x, const value_type& __y) const
-            {return comp(__x.first, __y.first);}
-    };
-
-private:
-
-    typedef _VSTD::__value_type<key_type, mapped_type>             __value_type;
-    typedef __map_value_compare<key_type, __value_type, key_compare> __vc;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                                    __allocator_type;
-    typedef __tree<__value_type, __vc, __allocator_type>            __base;
-    typedef typename __base::__node_traits                          __node_traits;
-    typedef allocator_traits<allocator_type>                        __alloc_traits;
-
-    __base __tree_;
-
-public:
-    typedef typename __alloc_traits::pointer               pointer;
-    typedef typename __alloc_traits::const_pointer         const_pointer;
-    typedef typename __alloc_traits::size_type             size_type;
-    typedef typename __alloc_traits::difference_type       difference_type;
-    typedef __map_iterator<typename __base::iterator>      iterator;
-    typedef __map_const_iterator<typename __base::const_iterator> const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>               reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>         const_reverse_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__vc(key_compare())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multimap(const key_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__vc(__comp)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multimap(const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a) {}
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        multimap(_InputIterator __f, _InputIterator __l,
-            const key_compare& __comp = key_compare())
-        : __tree_(__vc(__comp))
-        {
-            insert(__f, __l);
-        }
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        multimap(_InputIterator __f, _InputIterator __l,
-            const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a)
-        {
-            insert(__f, __l);
-        }
-
-#if _LIBCPP_STD_VER > 11
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY 
-    multimap(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
-        : multimap(__f, __l, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(const multimap& __m)
-        : __tree_(__m.__tree_.value_comp(),
-          __alloc_traits::select_on_container_copy_construction(__m.__tree_.__alloc()))
-        {
-            insert(__m.begin(), __m.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap& operator=(const multimap& __m)
-        {
-#if __cplusplus >= 201103L
-            __tree_ = __m.__tree_;
-#else
-            if (this != &__m) {
-                __tree_.clear();
-                __tree_.value_comp() = __m.__tree_.value_comp();
-                __tree_.__copy_assign_alloc(__m.__tree_);
-                insert(__m.begin(), __m.end());
-            }
-#endif
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(multimap&& __m)
-        _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-        : __tree_(_VSTD::move(__m.__tree_))
-        {
-        }
-
-    multimap(multimap&& __m, const allocator_type& __a);
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap& operator=(multimap&& __m)
-        _NOEXCEPT_(is_nothrow_move_assignable<__base>::value)
-        {
-            __tree_ = _VSTD::move(__m.__tree_);
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(initializer_list<value_type> __il, const key_compare& __comp = key_compare())
-        : __tree_(__vc(__comp))
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(initializer_list<value_type> __il, const key_compare& __comp, const allocator_type& __a)
-        : __tree_(__vc(__comp), __a)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY 
-    multimap(initializer_list<value_type> __il, const allocator_type& __a)
-        : multimap(__il, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap& operator=(initializer_list<value_type> __il)
-        {
-            __tree_.__assign_multi(__il.begin(), __il.end());
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multimap(const allocator_type& __a)
-        : __tree_(__a)
-        {
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multimap(const multimap& __m, const allocator_type& __a)
-        : __tree_(__m.__tree_.value_comp(), __a)
-        {
-            insert(__m.begin(), __m.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT {return __tree_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT {return __tree_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin()  const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __tree_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __tree_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __tree_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __tree_.__alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_compare    key_comp() const {return __tree_.value_comp().key_comp();}
-    _LIBCPP_INLINE_VISIBILITY
-    value_compare  value_comp() const
-        {return value_compare(__tree_.value_comp().key_comp());}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class ..._Args>
-        iterator
-        emplace(_Args&& ...__args);
-
-    template <class ..._Args>
-        iterator
-        emplace_hint(const_iterator __p, _Args&& ...__args);
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(_Pp&& __p)
-            {return __tree_.__insert_multi(_VSTD::forward<_Pp>(__p));}
-
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(const_iterator __pos, _Pp&& __p)
-            {return __tree_.__insert_multi(__pos.__i_, _VSTD::forward<_Pp>(__p));}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __v) {return __tree_.__insert_multi(__v);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __v)
-            {return __tree_.__insert_multi(__p.__i_, __v);}
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void insert(_InputIterator __f, _InputIterator __l)
-        {
-            for (const_iterator __e = cend(); __f != __l; ++__f)
-                __tree_.__insert_multi(__e.__i_, *__f);
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __tree_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __tree_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __f, const_iterator __l)
-        {return __tree_.erase(__f.__i_, __l.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() {__tree_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(multimap& __m)
-        _NOEXCEPT_(__is_nothrow_swappable<__base>::value)
-        {__tree_.swap(__m.__tree_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator find(const key_type& __k)             {return __tree_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __tree_.find(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    find(const _K2& __k)                           {return __tree_.find(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    find(const _K2& __k) const                     {return __tree_.find(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type      count(const key_type& __k) const
-        {return __tree_.__count_multi(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
-    count(const _K2& __k)                   {return __tree_.__count_multi(__k);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    iterator lower_bound(const key_type& __k)
-        {return __tree_.lower_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator lower_bound(const key_type& __k) const
-            {return __tree_.lower_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    lower_bound(const _K2& __k)       {return __tree_.lower_bound(__k);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator upper_bound(const key_type& __k)
-            {return __tree_.upper_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator upper_bound(const key_type& __k) const
-            {return __tree_.upper_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    upper_bound(const _K2& __k)       {return __tree_.upper_bound(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,iterator>             equal_range(const key_type& __k)
-            {return __tree_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator,const_iterator> equal_range(const key_type& __k) const
-            {return __tree_.__equal_range_multi(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type
-    equal_range(const _K2& __k)       {return __tree_.__equal_range_multi(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type
-    equal_range(const _K2& __k) const {return __tree_.__equal_range_multi(__k);}
-#endif
-
-private:
-    typedef typename __base::__node                    __node;
-    typedef typename __base::__node_allocator          __node_allocator;
-    typedef typename __base::__node_pointer            __node_pointer;
-    typedef typename __base::__node_const_pointer      __node_const_pointer;
-    typedef __map_node_destructor<__node_allocator> _Dp;
-    typedef unique_ptr<__node, _Dp> __node_holder;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node();
-    template <class _A0>
-        __node_holder
-         __construct_node(_A0&& __a0);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _A0, class _A1, class ..._Args>
-        __node_holder __construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-multimap<_Key, _Tp, _Compare, _Allocator>::multimap(multimap&& __m, const allocator_type& __a)
-    : __tree_(_VSTD::move(__m.__tree_), __a)
-{
-    if (__a != __m.get_allocator())
-    {
-        const_iterator __e = cend();
-        while (!__m.empty())
-            __tree_.__insert_multi(__e.__i_,
-                    _VSTD::move(__m.__tree_.remove(__m.begin().__i_)->__value_));
-    }
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::__node_holder
-multimap<_Key, _Tp, _Compare, _Allocator>::__construct_node()
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first));
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class _A0>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::__node_holder
-multimap<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_), _VSTD::forward<_A0>(__a0));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class _A0, class _A1, class ..._Args>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::__node_holder
-multimap<_Key, _Tp, _Compare, _Allocator>::__construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args)
-{
-    __node_allocator& __na = __tree_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0), _VSTD::forward<_A1>(__a1),
-                             _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::iterator
-multimap<_Key, _Tp, _Compare, _Allocator>::emplace(_Args&& ...__args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __tree_.__node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-template <class ..._Args>
-typename multimap<_Key, _Tp, _Compare, _Allocator>::iterator
-multimap<_Key, _Tp, _Compare, _Allocator>::emplace_hint(const_iterator __p,
-                                                        _Args&& ...__args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __tree_.__node_insert_multi(__p.__i_, __h.get());
-    __h.release();
-    return __r;
-}
-
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-           const multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Key, class _Tp, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(multimap<_Key, _Tp, _Compare, _Allocator>& __x,
-     multimap<_Key, _Tp, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_MAP
diff --git a/include.new/c++/v1/tr1/memory b/include.new/c++/v1/tr1/memory
deleted file mode 100644
index 662faa0..0000000
--- a/include.new/c++/v1/tr1/memory
+++ /dev/null
@@ -1,5443 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- memory ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_MEMORY
-#define _LIBCPP_MEMORY
-
-/*
-    memory synopsis
-
-namespace std
-{
-
-struct allocator_arg_t { };
-constexpr allocator_arg_t allocator_arg = allocator_arg_t();
-
-template <class T, class Alloc> struct uses_allocator;
-
-template <class Ptr>
-struct pointer_traits
-{
-    typedef Ptr pointer;
-    typedef <details> element_type;
-    typedef <details> difference_type;
-
-    template <class U> using rebind = <details>;
-
-    static pointer pointer_to(<details>);
-};
-
-template <class T>
-struct pointer_traits<T*>
-{
-    typedef T* pointer;
-    typedef T element_type;
-    typedef ptrdiff_t difference_type;
-
-    template <class U> using rebind = U*;
-
-    static pointer pointer_to(<details>) noexcept;
-};
-
-template <class Alloc>
-struct allocator_traits
-{
-    typedef Alloc                        allocator_type;
-    typedef typename allocator_type::value_type
-                                         value_type;
-
-    typedef Alloc::pointer | value_type* pointer;
-    typedef Alloc::const_pointer
-          | pointer_traits<pointer>::rebind<const value_type>
-                                         const_pointer;
-    typedef Alloc::void_pointer
-          | pointer_traits<pointer>::rebind<void>
-                                         void_pointer;
-    typedef Alloc::const_void_pointer
-          | pointer_traits<pointer>::rebind<const void>
-                                         const_void_pointer;
-    typedef Alloc::difference_type
-          | pointer_traits<pointer>::difference_type
-                                         difference_type;
-    typedef Alloc::size_type
-          | make_unsigned<difference_type>::type
-                                         size_type;
-    typedef Alloc::propagate_on_container_copy_assignment
-          | false_type                   propagate_on_container_copy_assignment;
-    typedef Alloc::propagate_on_container_move_assignment
-          | false_type                   propagate_on_container_move_assignment;
-    typedef Alloc::propagate_on_container_swap
-          | false_type                   propagate_on_container_swap;
-
-    template <class T> using rebind_alloc  = Alloc::rebind<U>::other | Alloc<T, Args...>;
-    template <class T> using rebind_traits = allocator_traits<rebind_alloc<T>>;
-
-    static pointer allocate(allocator_type& a, size_type n);
-    static pointer allocate(allocator_type& a, size_type n, const_void_pointer hint);
-
-    static void deallocate(allocator_type& a, pointer p, size_type n) noexcept;
-
-    template <class T, class... Args>
-        static void construct(allocator_type& a, T* p, Args&&... args);
-
-    template <class T>
-        static void destroy(allocator_type& a, T* p);
-
-    static size_type max_size(const allocator_type& a); // noexcept in C++14
-
-    static allocator_type
-        select_on_container_copy_construction(const allocator_type& a);
-};
-
-template <>
-class allocator<void>
-{
-public:
-    typedef void*                                 pointer;
-    typedef const void*                           const_pointer;
-    typedef void                                  value_type;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-};
-
-template <class T>
-class allocator
-{
-public:
-    typedef size_t                                size_type;
-    typedef ptrdiff_t                             difference_type;
-    typedef T*                                    pointer;
-    typedef const T*                              const_pointer;
-    typedef typename add_lvalue_reference<T>::type       reference;
-    typedef typename add_lvalue_reference<const T>::type const_reference;
-    typedef T                                     value_type;
-
-    template <class U> struct rebind {typedef allocator<U> other;};
-
-    allocator() noexcept;
-    allocator(const allocator&) noexcept;
-    template <class U> allocator(const allocator<U>&) noexcept;
-    ~allocator();
-    pointer address(reference x) const noexcept;
-    const_pointer address(const_reference x) const noexcept;
-    pointer allocate(size_type, allocator<void>::const_pointer hint = 0);
-    void deallocate(pointer p, size_type n) noexcept;
-    size_type max_size() const noexcept;
-    template<class U, class... Args>
-        void construct(U* p, Args&&... args);
-    template <class U>
-        void destroy(U* p);
-};
-
-template <class T, class U>
-bool operator==(const allocator<T>&, const allocator<U>&) noexcept;
-
-template <class T, class U>
-bool operator!=(const allocator<T>&, const allocator<U>&) noexcept;
-
-template <class OutputIterator, class T>
-class raw_storage_iterator
-    : public iterator<output_iterator_tag,
-                      T,                               // purposefully not C++03
-                      ptrdiff_t,                       // purposefully not C++03
-                      T*,                              // purposefully not C++03
-                      raw_storage_iterator&>           // purposefully not C++03
-{
-public:
-    explicit raw_storage_iterator(OutputIterator x);
-    raw_storage_iterator& operator*();
-    raw_storage_iterator& operator=(const T& element);
-    raw_storage_iterator& operator++();
-    raw_storage_iterator  operator++(int);
-};
-
-template <class T> pair<T*,ptrdiff_t> get_temporary_buffer(ptrdiff_t n) noexcept;
-template <class T> void               return_temporary_buffer(T* p) noexcept;
-
-template <class T> T* addressof(T& r) noexcept;
-
-template <class InputIterator, class ForwardIterator>
-ForwardIterator
-uninitialized_copy(InputIterator first, InputIterator last, ForwardIterator result);
-
-template <class InputIterator, class Size, class ForwardIterator>
-ForwardIterator
-uninitialized_copy_n(InputIterator first, Size n, ForwardIterator result);
-
-template <class ForwardIterator, class T>
-void uninitialized_fill(ForwardIterator first, ForwardIterator last, const T& x);
-
-template <class ForwardIterator, class Size, class T>
-ForwardIterator
-uninitialized_fill_n(ForwardIterator first, Size n, const T& x);
-
-template <class Y> struct auto_ptr_ref {};
-
-template<class X>
-class auto_ptr
-{
-public:
-    typedef X element_type;
-
-    explicit auto_ptr(X* p =0) throw();
-    auto_ptr(auto_ptr&) throw();
-    template<class Y> auto_ptr(auto_ptr<Y>&) throw();
-    auto_ptr& operator=(auto_ptr&) throw();
-    template<class Y> auto_ptr& operator=(auto_ptr<Y>&) throw();
-    auto_ptr& operator=(auto_ptr_ref<X> r) throw();
-    ~auto_ptr() throw();
-
-    typename add_lvalue_reference<X>::type operator*() const throw();
-    X* operator->() const throw();
-    X* get() const throw();
-    X* release() throw();
-    void reset(X* p =0) throw();
-
-    auto_ptr(auto_ptr_ref<X>) throw();
-    template<class Y> operator auto_ptr_ref<Y>() throw();
-    template<class Y> operator auto_ptr<Y>() throw();
-};
-
-template <class T>
-struct default_delete
-{
-    constexpr default_delete() noexcept = default;
-    template <class U> default_delete(const default_delete<U>&) noexcept;
-
-    void operator()(T*) const noexcept;
-};
-
-template <class T>
-struct default_delete<T[]>
-{
-    constexpr default_delete() noexcept = default;
-    void operator()(T*) const noexcept;
-    template <class U> void operator()(U*) const = delete;
-};
-
-template <class T, class D = default_delete<T>>
-class unique_ptr
-{
-public:
-    typedef see below pointer;
-    typedef T element_type;
-    typedef D deleter_type;
-
-    // constructors
-    constexpr unique_ptr() noexcept;
-    explicit unique_ptr(pointer p) noexcept;
-    unique_ptr(pointer p, see below d1) noexcept;
-    unique_ptr(pointer p, see below d2) noexcept;
-    unique_ptr(unique_ptr&& u) noexcept;
-    unique_ptr(nullptr_t) noexcept : unique_ptr() { }
-    template <class U, class E>
-        unique_ptr(unique_ptr<U, E>&& u) noexcept;
-    template <class U>
-        unique_ptr(auto_ptr<U>&& u) noexcept;
-
-    // destructor
-    ~unique_ptr();
-
-    // assignment
-    unique_ptr& operator=(unique_ptr&& u) noexcept;
-    template <class U, class E> unique_ptr& operator=(unique_ptr<U, E>&& u) noexcept;
-    unique_ptr& operator=(nullptr_t) noexcept;
-
-    // observers
-    typename add_lvalue_reference<T>::type operator*() const;
-    pointer operator->() const noexcept;
-    pointer get() const noexcept;
-    deleter_type& get_deleter() noexcept;
-    const deleter_type& get_deleter() const noexcept;
-    explicit operator bool() const noexcept;
-
-    // modifiers
-    pointer release() noexcept;
-    void reset(pointer p = pointer()) noexcept;
-    void swap(unique_ptr& u) noexcept;
-};
-
-template <class T, class D>
-class unique_ptr<T[], D>
-{
-public:
-    typedef implementation-defined pointer;
-    typedef T element_type;
-    typedef D deleter_type;
-
-    // constructors
-    constexpr unique_ptr() noexcept;
-    explicit unique_ptr(pointer p) noexcept;
-    unique_ptr(pointer p, see below d) noexcept;
-    unique_ptr(pointer p, see below d) noexcept;
-    unique_ptr(unique_ptr&& u) noexcept;
-    unique_ptr(nullptr_t) noexcept : unique_ptr() { }
-
-    // destructor
-    ~unique_ptr();
-
-    // assignment
-    unique_ptr& operator=(unique_ptr&& u) noexcept;
-    unique_ptr& operator=(nullptr_t) noexcept;
-
-    // observers
-    T& operator[](size_t i) const;
-    pointer get() const noexcept;
-    deleter_type& get_deleter() noexcept;
-    const deleter_type& get_deleter() const noexcept;
-    explicit operator bool() const noexcept;
-
-    // modifiers
-    pointer release() noexcept;
-    void reset(pointer p = pointer()) noexcept;
-    void reset(nullptr_t) noexcept;
-    template <class U> void reset(U) = delete;
-    void swap(unique_ptr& u) noexcept;
-};
-
-template <class T, class D>
-    void swap(unique_ptr<T, D>& x, unique_ptr<T, D>& y) noexcept;
-
-template <class T1, class D1, class T2, class D2>
-    bool operator==(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator!=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator<(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator<=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator>(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-template <class T1, class D1, class T2, class D2>
-    bool operator>=(const unique_ptr<T1, D1>& x, const unique_ptr<T2, D2>& y);
-
-template <class T, class D>
-    bool operator==(const unique_ptr<T, D>& x, nullptr_t) noexcept;
-template <class T, class D>
-    bool operator==(nullptr_t, const unique_ptr<T, D>& y) noexcept;
-template <class T, class D>
-    bool operator!=(const unique_ptr<T, D>& x, nullptr_t) noexcept;
-template <class T, class D>
-    bool operator!=(nullptr_t, const unique_ptr<T, D>& y) noexcept;
-
-template <class T, class D>
-    bool operator<(const unique_ptr<T, D>& x, nullptr_t);
-template <class T, class D>
-    bool operator<(nullptr_t, const unique_ptr<T, D>& y);
-template <class T, class D>
-    bool operator<=(const unique_ptr<T, D>& x, nullptr_t);
-template <class T, class D>
-    bool operator<=(nullptr_t, const unique_ptr<T, D>& y);
-template <class T, class D>
-    bool operator>(const unique_ptr<T, D>& x, nullptr_t);
-template <class T, class D>
-    bool operator>(nullptr_t, const unique_ptr<T, D>& y);
-template <class T, class D>
-    bool operator>=(const unique_ptr<T, D>& x, nullptr_t);
-template <class T, class D>
-    bool operator>=(nullptr_t, const unique_ptr<T, D>& y);
-
-class bad_weak_ptr
-    : public std::exception
-{
-    bad_weak_ptr() noexcept;
-};
-
-template<class T, class... Args> unique_ptr<T> make_unique(Args&&... args);     // C++14
-template<class T>                unique_ptr<T> make_unique(size_t n);           // C++14
-template<class T, class... Args> unspecified   make_unique(Args&&...) = delete; // C++14, T == U[N]
-
-template<class T>
-class shared_ptr
-{
-public:
-    typedef T element_type;
-
-    // constructors:
-    constexpr shared_ptr() noexcept;
-    template<class Y> explicit shared_ptr(Y* p);
-    template<class Y, class D> shared_ptr(Y* p, D d);
-    template<class Y, class D, class A> shared_ptr(Y* p, D d, A a);
-    template <class D> shared_ptr(nullptr_t p, D d);
-    template <class D, class A> shared_ptr(nullptr_t p, D d, A a);
-    template<class Y> shared_ptr(const shared_ptr<Y>& r, T *p) noexcept;
-    shared_ptr(const shared_ptr& r) noexcept;
-    template<class Y> shared_ptr(const shared_ptr<Y>& r) noexcept;
-    shared_ptr(shared_ptr&& r) noexcept;
-    template<class Y> shared_ptr(shared_ptr<Y>&& r) noexcept;
-    template<class Y> explicit shared_ptr(const weak_ptr<Y>& r);
-    template<class Y> shared_ptr(auto_ptr<Y>&& r);
-    template <class Y, class D> shared_ptr(unique_ptr<Y, D>&& r);
-    shared_ptr(nullptr_t) : shared_ptr() { }
-
-    // destructor:
-    ~shared_ptr();
-
-    // assignment:
-    shared_ptr& operator=(const shared_ptr& r) noexcept;
-    template<class Y> shared_ptr& operator=(const shared_ptr<Y>& r) noexcept;
-    shared_ptr& operator=(shared_ptr&& r) noexcept;
-    template<class Y> shared_ptr& operator=(shared_ptr<Y>&& r);
-    template<class Y> shared_ptr& operator=(auto_ptr<Y>&& r);
-    template <class Y, class D> shared_ptr& operator=(unique_ptr<Y, D>&& r);
-
-    // modifiers:
-    void swap(shared_ptr& r) noexcept;
-    void reset() noexcept;
-    template<class Y> void reset(Y* p);
-    template<class Y, class D> void reset(Y* p, D d);
-    template<class Y, class D, class A> void reset(Y* p, D d, A a);
-
-    // observers:
-    T* get() const noexcept;
-    T& operator*() const noexcept;
-    T* operator->() const noexcept;
-    long use_count() const noexcept;
-    bool unique() const noexcept;
-    explicit operator bool() const noexcept;
-    template<class U> bool owner_before(shared_ptr<U> const& b) const;
-    template<class U> bool owner_before(weak_ptr<U> const& b) const;
-};
-
-// shared_ptr comparisons:
-template<class T, class U>
-    bool operator==(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator!=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator<(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator>(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator<=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-template<class T, class U>
-    bool operator>=(shared_ptr<T> const& a, shared_ptr<U> const& b) noexcept;
-
-template <class T>
-    bool operator==(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator==(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator!=(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator!=(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator<(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-bool operator<(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator<=(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator<=(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator>(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator>(nullptr_t, const shared_ptr<T>& y) noexcept;
-template <class T>
-    bool operator>=(const shared_ptr<T>& x, nullptr_t) noexcept;
-template <class T>
-    bool operator>=(nullptr_t, const shared_ptr<T>& y) noexcept;
-
-// shared_ptr specialized algorithms:
-template<class T> void swap(shared_ptr<T>& a, shared_ptr<T>& b) noexcept;
-
-// shared_ptr casts:
-template<class T, class U>
-    shared_ptr<T> static_pointer_cast(shared_ptr<U> const& r) noexcept;
-template<class T, class U>
-    shared_ptr<T> dynamic_pointer_cast(shared_ptr<U> const& r) noexcept;
-template<class T, class U>
-    shared_ptr<T> const_pointer_cast(shared_ptr<U> const& r) noexcept;
-
-// shared_ptr I/O:
-template<class E, class T, class Y>
-    basic_ostream<E, T>& operator<< (basic_ostream<E, T>& os, shared_ptr<Y> const& p);
-
-// shared_ptr get_deleter:
-template<class D, class T> D* get_deleter(shared_ptr<T> const& p) noexcept;
-
-template<class T, class... Args>
-    shared_ptr<T> make_shared(Args&&... args);
-template<class T, class A, class... Args>
-    shared_ptr<T> allocate_shared(const A& a, Args&&... args);
-
-template<class T>
-class weak_ptr
-{
-public:
-    typedef T element_type;
-
-    // constructors
-    constexpr weak_ptr() noexcept;
-    template<class Y> weak_ptr(shared_ptr<Y> const& r) noexcept;
-    weak_ptr(weak_ptr const& r) noexcept;
-    template<class Y> weak_ptr(weak_ptr<Y> const& r) noexcept;
-    weak_ptr(weak_ptr&& r) noexcept;                      // C++14
-    template<class Y> weak_ptr(weak_ptr<Y>&& r) noexcept; // C++14
-
-    // destructor
-    ~weak_ptr();
-
-    // assignment
-    weak_ptr& operator=(weak_ptr const& r) noexcept;
-    template<class Y> weak_ptr& operator=(weak_ptr<Y> const& r) noexcept;
-    template<class Y> weak_ptr& operator=(shared_ptr<Y> const& r) noexcept;
-    weak_ptr& operator=(weak_ptr&& r) noexcept;                      // C++14
-    template<class Y> weak_ptr& operator=(weak_ptr<Y>&& r) noexcept; // C++14
-
-    // modifiers
-    void swap(weak_ptr& r) noexcept;
-    void reset() noexcept;
-
-    // observers
-    long use_count() const noexcept;
-    bool expired() const noexcept;
-    shared_ptr<T> lock() const noexcept;
-    template<class U> bool owner_before(shared_ptr<U> const& b) const;
-    template<class U> bool owner_before(weak_ptr<U> const& b) const;
-};
-
-// weak_ptr specialized algorithms:
-template<class T> void swap(weak_ptr<T>& a, weak_ptr<T>& b) noexcept;
-
-// class owner_less:
-template<class T> struct owner_less;
-
-template<class T>
-struct owner_less<shared_ptr<T>>
-    : binary_function<shared_ptr<T>, shared_ptr<T>, bool>
-{
-    typedef bool result_type;
-    bool operator()(shared_ptr<T> const&, shared_ptr<T> const&) const;
-    bool operator()(shared_ptr<T> const&, weak_ptr<T> const&) const;
-    bool operator()(weak_ptr<T> const&, shared_ptr<T> const&) const;
-};
-
-template<class T>
-struct owner_less<weak_ptr<T>>
-    : binary_function<weak_ptr<T>, weak_ptr<T>, bool>
-{
-    typedef bool result_type;
-    bool operator()(weak_ptr<T> const&, weak_ptr<T> const&) const;
-    bool operator()(shared_ptr<T> const&, weak_ptr<T> const&) const;
-    bool operator()(weak_ptr<T> const&, shared_ptr<T> const&) const;
-};
-
-template<class T>
-class enable_shared_from_this
-{
-protected:
-    constexpr enable_shared_from_this() noexcept;
-    enable_shared_from_this(enable_shared_from_this const&) noexcept;
-    enable_shared_from_this& operator=(enable_shared_from_this const&) noexcept;
-    ~enable_shared_from_this();
-public:
-    shared_ptr<T> shared_from_this();
-    shared_ptr<T const> shared_from_this() const;
-};
-
-template<class T>
-    bool atomic_is_lock_free(const shared_ptr<T>* p);
-template<class T>
-    shared_ptr<T> atomic_load(const shared_ptr<T>* p);
-template<class T>
-    shared_ptr<T> atomic_load_explicit(const shared_ptr<T>* p, memory_order mo);
-template<class T>
-    void atomic_store(shared_ptr<T>* p, shared_ptr<T> r);
-template<class T>
-    void atomic_store_explicit(shared_ptr<T>* p, shared_ptr<T> r, memory_order mo);
-template<class T>
-    shared_ptr<T> atomic_exchange(shared_ptr<T>* p, shared_ptr<T> r);
-template<class T>
-    shared_ptr<T>
-    atomic_exchange_explicit(shared_ptr<T>* p, shared_ptr<T> r, memory_order mo);
-template<class T>
-    bool
-    atomic_compare_exchange_weak(shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w);
-template<class T>
-    bool
-    atomic_compare_exchange_strong( shared_ptr<T>* p, shared_ptr<T>* v, shared_ptr<T> w);
-template<class T>
-    bool
-    atomic_compare_exchange_weak_explicit(shared_ptr<T>* p, shared_ptr<T>* v,
-                                          shared_ptr<T> w, memory_order success,
-                                          memory_order failure);
-template<class T>
-    bool
-    atomic_compare_exchange_strong_explicit(shared_ptr<T>* p, shared_ptr<T>* v,
-                                            shared_ptr<T> w, memory_order success,
-                                            memory_order failure);
-// Hash support
-template <class T> struct hash;
-template <class T, class D> struct hash<unique_ptr<T, D> >;
-template <class T> struct hash<shared_ptr<T> >;
-
-// Pointer safety
-enum class pointer_safety { relaxed, preferred, strict };
-void declare_reachable(void *p);
-template <class T> T *undeclare_reachable(T *p);
-void declare_no_pointers(char *p, size_t n);
-void undeclare_no_pointers(char *p, size_t n);
-pointer_safety get_pointer_safety() noexcept;
-
-void* align(size_t alignment, size_t size, void*& ptr, size_t& space);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <type_traits>
-#include <typeinfo>
-#include <cstddef>
-#include <cstdint>
-#include <new>
-#include <utility>
-#include <limits>
-#include <iterator>
-#include <__functional_base>
-#include <iosfwd>
-#include <tuple>
-#include <cstring>
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-    #include <cassert>
-#endif
-
-#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-#  include <atomic>
-#endif
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// addressof moved to <__functional_base>
-
-template <class _Tp> class allocator;
-
-template <>
-class _LIBCPP_TYPE_VIS_ONLY allocator<void>
-{
-public:
-    typedef void*             pointer;
-    typedef const void*       const_pointer;
-    typedef void              value_type;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-};
-
-template <>
-class _LIBCPP_TYPE_VIS_ONLY allocator<const void>
-{
-public:
-    typedef const void*       pointer;
-    typedef const void*       const_pointer;
-    typedef const void        value_type;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-};
-
-// pointer_traits
-
-template <class _Tp>
-struct __has_element_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::element_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Ptr, bool = __has_element_type<_Ptr>::value>
-struct __pointer_traits_element_type;
-
-template <class _Ptr>
-struct __pointer_traits_element_type<_Ptr, true>
-{
-    typedef typename _Ptr::element_type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class, class...> class _Sp, class _Tp, class ..._Args>
-struct __pointer_traits_element_type<_Sp<_Tp, _Args...>, true>
-{
-    typedef typename _Sp<_Tp, _Args...>::element_type type;
-};
-
-template <template <class, class...> class _Sp, class _Tp, class ..._Args>
-struct __pointer_traits_element_type<_Sp<_Tp, _Args...>, false>
-{
-    typedef _Tp type;
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class> class _Sp, class _Tp>
-struct __pointer_traits_element_type<_Sp<_Tp>, true>
-{
-    typedef typename _Sp<_Tp>::element_type type;
-};
-
-template <template <class> class _Sp, class _Tp>
-struct __pointer_traits_element_type<_Sp<_Tp>, false>
-{
-    typedef _Tp type;
-};
-
-template <template <class, class> class _Sp, class _Tp, class _A0>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0>, true>
-{
-    typedef typename _Sp<_Tp, _A0>::element_type type;
-};
-
-template <template <class, class> class _Sp, class _Tp, class _A0>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0>, false>
-{
-    typedef _Tp type;
-};
-
-template <template <class, class, class> class _Sp, class _Tp, class _A0, class _A1>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0, _A1>, true>
-{
-    typedef typename _Sp<_Tp, _A0, _A1>::element_type type;
-};
-
-template <template <class, class, class> class _Sp, class _Tp, class _A0, class _A1>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0, _A1>, false>
-{
-    typedef _Tp type;
-};
-
-template <template <class, class, class, class> class _Sp, class _Tp, class _A0,
-                                                           class _A1, class _A2>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0, _A1, _A2>, true>
-{
-    typedef typename _Sp<_Tp, _A0, _A1, _A2>::element_type type;
-};
-
-template <template <class, class, class, class> class _Sp, class _Tp, class _A0,
-                                                           class _A1, class _A2>
-struct __pointer_traits_element_type<_Sp<_Tp, _A0, _A1, _A2>, false>
-{
-    typedef _Tp type;
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp>
-struct __has_difference_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::difference_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Ptr, bool = __has_difference_type<_Ptr>::value>
-struct __pointer_traits_difference_type
-{
-    typedef ptrdiff_t type;
-};
-
-template <class _Ptr>
-struct __pointer_traits_difference_type<_Ptr, true>
-{
-    typedef typename _Ptr::difference_type type;
-};
-
-template <class _Tp, class _Up>
-struct __has_rebind
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Xp> static __two __test(...);
-    template <class _Xp> static char __test(typename _Xp::template rebind<_Up>* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Tp, class _Up, bool = __has_rebind<_Tp, _Up>::value>
-struct __pointer_traits_rebind
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Tp::template rebind<_Up> type;
-#else
-    typedef typename _Tp::template rebind<_Up>::other type;
-#endif
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class, class...> class _Sp, class _Tp, class ..._Args, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _Args...>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp, _Args...>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp, _Args...>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class, class...> class _Sp, class _Tp, class ..._Args, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _Args...>, _Up, false>
-{
-    typedef _Sp<_Up, _Args...> type;
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class> class _Sp, class _Tp, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class> class _Sp, class _Tp, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp>, _Up, false>
-{
-    typedef _Sp<_Up> type;
-};
-
-template <template <class, class> class _Sp, class _Tp, class _A0, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp, _A0>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp, _A0>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class, class> class _Sp, class _Tp, class _A0, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0>, _Up, false>
-{
-    typedef _Sp<_Up, _A0> type;
-};
-
-template <template <class, class, class> class _Sp, class _Tp, class _A0,
-                                         class _A1, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0, _A1>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp, _A0, _A1>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp, _A0, _A1>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class, class, class> class _Sp, class _Tp, class _A0,
-                                         class _A1, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0, _A1>, _Up, false>
-{
-    typedef _Sp<_Up, _A0, _A1> type;
-};
-
-template <template <class, class, class, class> class _Sp, class _Tp, class _A0,
-                                                class _A1, class _A2, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0, _A1, _A2>, _Up, true>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename _Sp<_Tp, _A0, _A1, _A2>::template rebind<_Up> type;
-#else
-    typedef typename _Sp<_Tp, _A0, _A1, _A2>::template rebind<_Up>::other type;
-#endif
-};
-
-template <template <class, class, class, class> class _Sp, class _Tp, class _A0,
-                                                class _A1, class _A2, class _Up>
-struct __pointer_traits_rebind<_Sp<_Tp, _A0, _A1, _A2>, _Up, false>
-{
-    typedef _Sp<_Up, _A0, _A1, _A2> type;
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Ptr>
-struct _LIBCPP_TYPE_VIS_ONLY pointer_traits
-{
-    typedef _Ptr                                                     pointer;
-    typedef typename __pointer_traits_element_type<pointer>::type    element_type;
-    typedef typename __pointer_traits_difference_type<pointer>::type difference_type;
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    template <class _Up> using rebind = typename __pointer_traits_rebind<pointer, _Up>::type;
-#else
-    template <class _Up> struct rebind
-        {typedef typename __pointer_traits_rebind<pointer, _Up>::type other;};
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-private:
-    struct __nat {};
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer pointer_to(typename conditional<is_void<element_type>::value,
-                                           __nat, element_type>::type& __r)
-        {return pointer::pointer_to(__r);}
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY pointer_traits<_Tp*>
-{
-    typedef _Tp*      pointer;
-    typedef _Tp       element_type;
-    typedef ptrdiff_t difference_type;
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    template <class _Up> using rebind = _Up*;
-#else
-    template <class _Up> struct rebind {typedef _Up* other;};
-#endif
-
-private:
-    struct __nat {};
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer pointer_to(typename conditional<is_void<element_type>::value,
-                                      __nat, element_type>::type& __r) _NOEXCEPT
-        {return _VSTD::addressof(__r);}
-};
-
-// allocator_traits
-
-namespace __has_pointer_type_imp
-{
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::pointer* = 0);
-}
-
-template <class _Tp>
-struct __has_pointer_type
-    : public integral_constant<bool, sizeof(__has_pointer_type_imp::__test<_Tp>(0)) == 1>
-{
-};
-
-namespace __pointer_type_imp
-{
-
-template <class _Tp, class _Dp, bool = __has_pointer_type<_Dp>::value>
-struct __pointer_type
-{
-    typedef typename _Dp::pointer type;
-};
-
-template <class _Tp, class _Dp>
-struct __pointer_type<_Tp, _Dp, false>
-{
-    typedef _Tp* type;
-};
-
-}  // __pointer_type_imp
-
-template <class _Tp, class _Dp>
-struct __pointer_type
-{
-    typedef typename __pointer_type_imp::__pointer_type<_Tp, typename remove_reference<_Dp>::type>::type type;
-};
-
-template <class _Tp>
-struct __has_const_pointer
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::const_pointer* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Tp, class _Ptr, class _Alloc, bool = __has_const_pointer<_Alloc>::value>
-struct __const_pointer
-{
-    typedef typename _Alloc::const_pointer type;
-};
-
-template <class _Tp, class _Ptr, class _Alloc>
-struct __const_pointer<_Tp, _Ptr, _Alloc, false>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename pointer_traits<_Ptr>::template rebind<const _Tp> type;
-#else
-    typedef typename pointer_traits<_Ptr>::template rebind<const _Tp>::other type;
-#endif
-};
-
-template <class _Tp>
-struct __has_void_pointer
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::void_pointer* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Ptr, class _Alloc, bool = __has_void_pointer<_Alloc>::value>
-struct __void_pointer
-{
-    typedef typename _Alloc::void_pointer type;
-};
-
-template <class _Ptr, class _Alloc>
-struct __void_pointer<_Ptr, _Alloc, false>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename pointer_traits<_Ptr>::template rebind<void> type;
-#else
-    typedef typename pointer_traits<_Ptr>::template rebind<void>::other type;
-#endif
-};
-
-template <class _Tp>
-struct __has_const_void_pointer
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::const_void_pointer* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Ptr, class _Alloc, bool = __has_const_void_pointer<_Alloc>::value>
-struct __const_void_pointer
-{
-    typedef typename _Alloc::const_void_pointer type;
-};
-
-template <class _Ptr, class _Alloc>
-struct __const_void_pointer<_Ptr, _Alloc, false>
-{
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    typedef typename pointer_traits<_Ptr>::template rebind<const void> type;
-#else
-    typedef typename pointer_traits<_Ptr>::template rebind<const void>::other type;
-#endif
-};
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-__to_raw_pointer(_Tp* __p) _NOEXCEPT
-{
-    return __p;
-}
-
-template <class _Pointer>
-inline _LIBCPP_INLINE_VISIBILITY
-typename pointer_traits<_Pointer>::element_type*
-__to_raw_pointer(_Pointer __p) _NOEXCEPT
-{
-    return _VSTD::__to_raw_pointer(__p.operator->());
-}
-
-template <class _Tp>
-struct __has_size_type
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::size_type* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Alloc, class _DiffType, bool = __has_size_type<_Alloc>::value>
-struct __size_type
-{
-    typedef typename make_unsigned<_DiffType>::type type;
-};
-
-template <class _Alloc, class _DiffType>
-struct __size_type<_Alloc, _DiffType, true>
-{
-    typedef typename _Alloc::size_type type;
-};
-
-template <class _Tp>
-struct __has_propagate_on_container_copy_assignment
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::propagate_on_container_copy_assignment* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Alloc, bool = __has_propagate_on_container_copy_assignment<_Alloc>::value>
-struct __propagate_on_container_copy_assignment
-{
-    typedef false_type type;
-};
-
-template <class _Alloc>
-struct __propagate_on_container_copy_assignment<_Alloc, true>
-{
-    typedef typename _Alloc::propagate_on_container_copy_assignment type;
-};
-
-template <class _Tp>
-struct __has_propagate_on_container_move_assignment
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::propagate_on_container_move_assignment* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Alloc, bool = __has_propagate_on_container_move_assignment<_Alloc>::value>
-struct __propagate_on_container_move_assignment
-{
-    typedef false_type type;
-};
-
-template <class _Alloc>
-struct __propagate_on_container_move_assignment<_Alloc, true>
-{
-    typedef typename _Alloc::propagate_on_container_move_assignment type;
-};
-
-template <class _Tp>
-struct __has_propagate_on_container_swap
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Up> static __two __test(...);
-    template <class _Up> static char __test(typename _Up::propagate_on_container_swap* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Alloc, bool = __has_propagate_on_container_swap<_Alloc>::value>
-struct __propagate_on_container_swap
-{
-    typedef false_type type;
-};
-
-template <class _Alloc>
-struct __propagate_on_container_swap<_Alloc, true>
-{
-    typedef typename _Alloc::propagate_on_container_swap type;
-};
-
-template <class _Tp, class _Up, bool = __has_rebind<_Tp, _Up>::value>
-struct __has_rebind_other
-{
-private:
-    struct __two {char __lx; char __lxx;};
-    template <class _Xp> static __two __test(...);
-    template <class _Xp> static char __test(typename _Xp::template rebind<_Up>::other* = 0);
-public:
-    static const bool value = sizeof(__test<_Tp>(0)) == 1;
-};
-
-template <class _Tp, class _Up>
-struct __has_rebind_other<_Tp, _Up, false>
-{
-    static const bool value = false;
-};
-
-template <class _Tp, class _Up, bool = __has_rebind_other<_Tp, _Up>::value>
-struct __allocator_traits_rebind
-{
-    typedef typename _Tp::template rebind<_Up>::other type;
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class, class...> class _Alloc, class _Tp, class ..._Args, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, true>
-{
-    typedef typename _Alloc<_Tp, _Args...>::template rebind<_Up>::other type;
-};
-
-template <template <class, class...> class _Alloc, class _Tp, class ..._Args, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _Args...>, _Up, false>
-{
-    typedef _Alloc<_Up, _Args...> type;
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <template <class> class _Alloc, class _Tp, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp>, _Up, true>
-{
-    typedef typename _Alloc<_Tp>::template rebind<_Up>::other type;
-};
-
-template <template <class> class _Alloc, class _Tp, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp>, _Up, false>
-{
-    typedef _Alloc<_Up> type;
-};
-
-template <template <class, class> class _Alloc, class _Tp, class _A0, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0>, _Up, true>
-{
-    typedef typename _Alloc<_Tp, _A0>::template rebind<_Up>::other type;
-};
-
-template <template <class, class> class _Alloc, class _Tp, class _A0, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0>, _Up, false>
-{
-    typedef _Alloc<_Up, _A0> type;
-};
-
-template <template <class, class, class> class _Alloc, class _Tp, class _A0,
-                                         class _A1, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0, _A1>, _Up, true>
-{
-    typedef typename _Alloc<_Tp, _A0, _A1>::template rebind<_Up>::other type;
-};
-
-template <template <class, class, class> class _Alloc, class _Tp, class _A0,
-                                         class _A1, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0, _A1>, _Up, false>
-{
-    typedef _Alloc<_Up, _A0, _A1> type;
-};
-
-template <template <class, class, class, class> class _Alloc, class _Tp, class _A0,
-                                                class _A1, class _A2, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0, _A1, _A2>, _Up, true>
-{
-    typedef typename _Alloc<_Tp, _A0, _A1, _A2>::template rebind<_Up>::other type;
-};
-
-template <template <class, class, class, class> class _Alloc, class _Tp, class _A0,
-                                                class _A1, class _A2, class _Up>
-struct __allocator_traits_rebind<_Alloc<_Tp, _A0, _A1, _A2>, _Up, false>
-{
-    typedef _Alloc<_Up, _A0, _A1, _A2> type;
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-template <class _Alloc, class _SizeType, class _ConstVoidPtr>
-auto
-__has_allocate_hint_test(_Alloc&& __a, _SizeType&& __sz, _ConstVoidPtr&& __p)
-    -> decltype(__a.allocate(__sz, __p), true_type());
-
-template <class _Alloc, class _SizeType, class _ConstVoidPtr>
-auto
-__has_allocate_hint_test(const _Alloc& __a, _SizeType&& __sz, _ConstVoidPtr&& __p)
-    -> false_type;
-
-template <class _Alloc, class _SizeType, class _ConstVoidPtr>
-struct __has_allocate_hint
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_allocate_hint_test(declval<_Alloc>(),
-                                          declval<_SizeType>(),
-                                          declval<_ConstVoidPtr>())),
-            true_type>::value>
-{
-};
-
-#else  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-template <class _Alloc, class _SizeType, class _ConstVoidPtr>
-struct __has_allocate_hint
-    : true_type
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-#if !defined(_LIBCPP_HAS_NO_ADVANCED_SFINAE) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-
-template <class _Alloc, class _Tp, class ..._Args>
-decltype(_VSTD::declval<_Alloc>().construct(_VSTD::declval<_Tp*>(),
-                                           _VSTD::declval<_Args>()...),
-                                           true_type())
-__has_construct_test(_Alloc&& __a, _Tp* __p, _Args&& ...__args);
-
-template <class _Alloc, class _Pointer, class ..._Args>
-false_type
-__has_construct_test(const _Alloc& __a, _Pointer&& __p, _Args&& ...__args);
-
-template <class _Alloc, class _Pointer, class ..._Args>
-struct __has_construct
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_construct_test(declval<_Alloc>(),
-                                          declval<_Pointer>(),
-                                          declval<_Args>()...)),
-            true_type>::value>
-{
-};
-
-template <class _Alloc, class _Pointer>
-auto
-__has_destroy_test(_Alloc&& __a, _Pointer&& __p)
-    -> decltype(__a.destroy(__p), true_type());
-
-template <class _Alloc, class _Pointer>
-auto
-__has_destroy_test(const _Alloc& __a, _Pointer&& __p)
-    -> false_type;
-
-template <class _Alloc, class _Pointer>
-struct __has_destroy
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_destroy_test(declval<_Alloc>(),
-                                        declval<_Pointer>())),
-            true_type>::value>
-{
-};
-
-template <class _Alloc>
-auto
-__has_max_size_test(_Alloc&& __a)
-    -> decltype(__a.max_size(), true_type());
-
-template <class _Alloc>
-auto
-__has_max_size_test(const volatile _Alloc& __a)
-    -> false_type;
-
-template <class _Alloc>
-struct __has_max_size
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_max_size_test(declval<_Alloc&>())),
-            true_type>::value>
-{
-};
-
-template <class _Alloc>
-auto
-__has_select_on_container_copy_construction_test(_Alloc&& __a)
-    -> decltype(__a.select_on_container_copy_construction(), true_type());
-
-template <class _Alloc>
-auto
-__has_select_on_container_copy_construction_test(const volatile _Alloc& __a)
-    -> false_type;
-
-template <class _Alloc>
-struct __has_select_on_container_copy_construction
-    : integral_constant<bool,
-        is_same<
-            decltype(__has_select_on_container_copy_construction_test(declval<_Alloc&>())),
-            true_type>::value>
-{
-};
-
-#else  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Alloc, class _Pointer, class ..._Args>
-struct __has_construct
-    : false_type
-{
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Alloc, class _Pointer, class _Args>
-struct __has_construct
-    : false_type
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Alloc, class _Pointer>
-struct __has_destroy
-    : false_type
-{
-};
-
-template <class _Alloc>
-struct __has_max_size
-    : true_type
-{
-};
-
-template <class _Alloc>
-struct __has_select_on_container_copy_construction
-    : false_type
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-template <class _Alloc, class _Ptr, bool = __has_difference_type<_Alloc>::value>
-struct __alloc_traits_difference_type
-{
-    typedef typename pointer_traits<_Ptr>::difference_type type;
-};
-
-template <class _Alloc, class _Ptr>
-struct __alloc_traits_difference_type<_Alloc, _Ptr, true>
-{
-    typedef typename _Alloc::difference_type type;
-};
-
-template <class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY allocator_traits
-{
-    typedef _Alloc                              allocator_type;
-    typedef typename allocator_type::value_type value_type;
-
-    typedef typename __pointer_type<value_type, allocator_type>::type pointer;
-    typedef typename __const_pointer<value_type, pointer, allocator_type>::type const_pointer;
-    typedef typename __void_pointer<pointer, allocator_type>::type void_pointer;
-    typedef typename __const_void_pointer<pointer, allocator_type>::type const_void_pointer;
-
-    typedef typename __alloc_traits_difference_type<allocator_type, pointer>::type difference_type;
-    typedef typename __size_type<allocator_type, difference_type>::type size_type;
-
-    typedef typename __propagate_on_container_copy_assignment<allocator_type>::type
-                     propagate_on_container_copy_assignment;
-    typedef typename __propagate_on_container_move_assignment<allocator_type>::type
-                     propagate_on_container_move_assignment;
-    typedef typename __propagate_on_container_swap<allocator_type>::type
-                     propagate_on_container_swap;
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    template <class _Tp> using rebind_alloc =
-                  typename __allocator_traits_rebind<allocator_type, _Tp>::type;
-    template <class _Tp> using rebind_traits = allocator_traits<rebind_alloc<_Tp>>;
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-    template <class _Tp> struct rebind_alloc
-        {typedef typename __allocator_traits_rebind<allocator_type, _Tp>::type other;};
-    template <class _Tp> struct rebind_traits
-        {typedef allocator_traits<typename rebind_alloc<_Tp>::other> other;};
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer allocate(allocator_type& __a, size_type __n)
-        {return __a.allocate(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer allocate(allocator_type& __a, size_type __n, const_void_pointer __hint)
-        {return allocate(__a, __n, __hint,
-            __has_allocate_hint<allocator_type, size_type, const_void_pointer>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void deallocate(allocator_type& __a, pointer __p, size_type __n) _NOEXCEPT
-        {__a.deallocate(__p, __n);}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p, _Args&&... __args)
-            {__construct(__has_construct<allocator_type, _Tp*, _Args...>(),
-                         __a, __p, _VSTD::forward<_Args>(__args)...);}
-#else  // _LIBCPP_HAS_NO_VARIADICS
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p)
-            {
-                ::new ((void*)__p) _Tp();
-            }
-    template <class _Tp, class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0)
-            {
-                ::new ((void*)__p) _Tp(__a0);
-            }
-    template <class _Tp, class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0,
-                              const _A1& __a1)
-            {
-                ::new ((void*)__p) _Tp(__a0, __a1);
-            }
-    template <class _Tp, class _A0, class _A1, class _A2>
-        _LIBCPP_INLINE_VISIBILITY
-        static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0,
-                              const _A1& __a1, const _A2& __a2)
-            {
-                ::new ((void*)__p) _Tp(__a0, __a1, __a2);
-            }
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static void destroy(allocator_type& __a, _Tp* __p)
-            {__destroy(__has_destroy<allocator_type, _Tp*>(), __a, __p);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type max_size(const allocator_type& __a) _NOEXCEPT
-        {return __max_size(__has_max_size<const allocator_type>(), __a);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static allocator_type
-        select_on_container_copy_construction(const allocator_type& __a)
-            {return select_on_container_copy_construction(
-                __has_select_on_container_copy_construction<const allocator_type>(),
-                __a);}
-
-    template <class _Ptr>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        void
-        __construct_forward(allocator_type& __a, _Ptr __begin1, _Ptr __end1, _Ptr& __begin2)
-        {
-            for (; __begin1 != __end1; ++__begin1, ++__begin2)
-                construct(__a, _VSTD::__to_raw_pointer(__begin2), _VSTD::move_if_noexcept(*__begin1));
-        }
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (is_same<allocator_type, allocator<_Tp> >::value
-                || !__has_construct<allocator_type, _Tp*, _Tp>::value) &&
-             is_trivially_move_constructible<_Tp>::value,
-            void
-        >::type
-        __construct_forward(allocator_type& __a, _Tp* __begin1, _Tp* __end1, _Tp*& __begin2)
-        {
-            ptrdiff_t _Np = __end1 - __begin1;
-            _VSTD::memcpy(__begin2, __begin1, _Np * sizeof(_Tp));
-            __begin2 += _Np;
-        }
-
-    template <class _Ptr>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        void
-        __construct_backward(allocator_type& __a, _Ptr __begin1, _Ptr __end1, _Ptr& __end2)
-        {
-            while (__end1 != __begin1)
-            {
-                construct(__a, _VSTD::__to_raw_pointer(__end2-1), _VSTD::move_if_noexcept(*--__end1));
-                --__end2;
-            }
-        }
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (is_same<allocator_type, allocator<_Tp> >::value
-                || !__has_construct<allocator_type, _Tp*, _Tp>::value) &&
-             is_trivially_move_constructible<_Tp>::value,
-            void
-        >::type
-        __construct_backward(allocator_type& __a, _Tp* __begin1, _Tp* __end1, _Tp*& __end2)
-        {
-            ptrdiff_t _Np = __end1 - __begin1;
-            __end2 -= _Np;
-            _VSTD::memcpy(__end2, __begin1, _Np * sizeof(_Tp));
-        }
-
-private:
-
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer allocate(allocator_type& __a, size_type __n,
-        const_void_pointer __hint, true_type)
-        {return __a.allocate(__n, __hint);}
-    _LIBCPP_INLINE_VISIBILITY
-    static pointer allocate(allocator_type& __a, size_type __n,
-        const_void_pointer, false_type)
-        {return __a.allocate(__n);}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        static void __construct(true_type, allocator_type& __a, _Tp* __p, _Args&&... __args)
-            {__a.construct(__p, _VSTD::forward<_Args>(__args)...);}
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        static void __construct(false_type, allocator_type&, _Tp* __p, _Args&&... __args)
-            {
-                ::new ((void*)__p) _Tp(_VSTD::forward<_Args>(__args)...);
-            }
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static void __destroy(true_type, allocator_type& __a, _Tp* __p)
-            {__a.destroy(__p);}
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        static void __destroy(false_type, allocator_type&, _Tp* __p)
-            {
-                __p->~_Tp();
-            }
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __max_size(true_type, const allocator_type& __a)
-            {return __a.max_size();}
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __max_size(false_type, const allocator_type&)
-            {return numeric_limits<size_type>::max();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static allocator_type
-        select_on_container_copy_construction(true_type, const allocator_type& __a)
-            {return __a.select_on_container_copy_construction();}
-    _LIBCPP_INLINE_VISIBILITY
-    static allocator_type
-        select_on_container_copy_construction(false_type, const allocator_type& __a)
-            {return __a;}
-};
-
-// allocator
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY allocator
-{
-public:
-    typedef size_t            size_type;
-    typedef ptrdiff_t         difference_type;
-    typedef _Tp*              pointer;
-    typedef const _Tp*        const_pointer;
-    typedef _Tp&              reference;
-    typedef const _Tp&        const_reference;
-    typedef _Tp               value_type;
-
-    typedef true_type propagate_on_container_move_assignment;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-
-    _LIBCPP_INLINE_VISIBILITY allocator() _NOEXCEPT {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY allocator(const allocator<_Up>&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY pointer address(reference __x) const _NOEXCEPT
-        {return _VSTD::addressof(__x);}
-    _LIBCPP_INLINE_VISIBILITY const_pointer address(const_reference __x) const _NOEXCEPT
-        {return _VSTD::addressof(__x);}
-    _LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, allocator<void>::const_pointer = 0)
-        {return static_cast<pointer>(_VSTD::__allocate(__n * sizeof(_Tp)));}
-    _LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type) _NOEXCEPT
-        {_VSTD::__deallocate((void*)__p);}
-    _LIBCPP_INLINE_VISIBILITY size_type max_size() const _NOEXCEPT
-        {return size_type(~0) / sizeof(_Tp);}
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class _Up, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(_Up* __p, _Args&&... __args)
-        {
-            ::new((void*)__p) _Up(_VSTD::forward<_Args>(__args)...);
-        }
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p)
-        {
-            ::new((void*)__p) _Tp();
-        }
-# if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0)
-        {
-            ::new((void*)__p) _Tp(__a0);
-        }
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0)
-        {
-            ::new((void*)__p) _Tp(__a0);
-        }
-# endif  // defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0, _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0, _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0, const _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0, const _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY void destroy(pointer __p) {__p->~_Tp();}
-};
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY allocator<const _Tp>
-{
-public:
-    typedef size_t            size_type;
-    typedef ptrdiff_t         difference_type;
-    typedef const _Tp*        pointer;
-    typedef const _Tp*        const_pointer;
-    typedef const _Tp&        reference;
-    typedef const _Tp&        const_reference;
-    typedef const _Tp         value_type;
-
-    typedef true_type propagate_on_container_move_assignment;
-
-    template <class _Up> struct rebind {typedef allocator<_Up> other;};
-
-    _LIBCPP_INLINE_VISIBILITY allocator() _NOEXCEPT {}
-    template <class _Up> _LIBCPP_INLINE_VISIBILITY allocator(const allocator<_Up>&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY const_pointer address(const_reference __x) const _NOEXCEPT
-        {return _VSTD::addressof(__x);}
-    _LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, allocator<void>::const_pointer = 0)
-        {return static_cast<pointer>(_VSTD::__allocate(__n * sizeof(_Tp)));}
-    _LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type) _NOEXCEPT
-        {_VSTD::__deallocate((void*)__p);}
-    _LIBCPP_INLINE_VISIBILITY size_type max_size() const _NOEXCEPT
-        {return size_type(~0) / sizeof(_Tp);}
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class _Up, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(_Up* __p, _Args&&... __args)
-        {
-            ::new((void*)__p) _Up(_VSTD::forward<_Args>(__args)...);
-        }
-#else  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p)
-        {
-            ::new((void*)__p) _Tp();
-        }
-# if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0)
-        {
-            ::new((void*)__p) _Tp(__a0);
-        }
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0)
-        {
-            ::new((void*)__p) _Tp(__a0);
-        }
-# endif  // defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0, _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0, _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, _A0& __a0, const _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        construct(pointer __p, const _A0& __a0, const _A1& __a1)
-        {
-            ::new((void*)__p) _Tp(__a0, __a1);
-        }
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY void destroy(pointer __p) {__p->~_Tp();}
-};
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator==(const allocator<_Tp>&, const allocator<_Up>&) _NOEXCEPT {return true;}
-
-template <class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator!=(const allocator<_Tp>&, const allocator<_Up>&) _NOEXCEPT {return false;}
-
-template <class _OutputIterator, class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY raw_storage_iterator
-    : public iterator<output_iterator_tag,
-                      _Tp,                                         // purposefully not C++03
-                      ptrdiff_t,                                   // purposefully not C++03
-                      _Tp*,                                        // purposefully not C++03
-                      raw_storage_iterator<_OutputIterator, _Tp>&> // purposefully not C++03
-{
-private:
-    _OutputIterator __x_;
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit raw_storage_iterator(_OutputIterator __x) : __x_(__x) {}
-    _LIBCPP_INLINE_VISIBILITY raw_storage_iterator& operator*() {return *this;}
-    _LIBCPP_INLINE_VISIBILITY raw_storage_iterator& operator=(const _Tp& __element)
-        {::new(&*__x_) _Tp(__element); return *this;}
-    _LIBCPP_INLINE_VISIBILITY raw_storage_iterator& operator++() {++__x_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY raw_storage_iterator  operator++(int)
-        {raw_storage_iterator __t(*this); ++__x_; return __t;}
-};
-
-template <class _Tp>
-pair<_Tp*, ptrdiff_t>
-get_temporary_buffer(ptrdiff_t __n) _NOEXCEPT
-{
-    pair<_Tp*, ptrdiff_t> __r(0, 0);
-    const ptrdiff_t __m = (~ptrdiff_t(0) ^
-                           ptrdiff_t(ptrdiff_t(1) << (sizeof(ptrdiff_t) * __CHAR_BIT__ - 1)))
-                           / sizeof(_Tp);
-    if (__n > __m)
-        __n = __m;
-    while (__n > 0)
-    {
-        __r.first = static_cast<_Tp*>(::operator new(__n * sizeof(_Tp), nothrow));
-        if (__r.first)
-        {
-            __r.second = __n;
-            break;
-        }
-        __n /= 2;
-    }
-    return __r;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void return_temporary_buffer(_Tp* __p) _NOEXCEPT {::operator delete(__p);}
-
-template <class _Tp>
-struct auto_ptr_ref
-{
-    _Tp* __ptr_;
-};
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY auto_ptr
-{
-private:
-    _Tp* __ptr_;
-public:
-    typedef _Tp element_type;
-
-    _LIBCPP_INLINE_VISIBILITY explicit auto_ptr(_Tp* __p = 0) throw() : __ptr_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY auto_ptr(auto_ptr& __p) throw() : __ptr_(__p.release()) {}
-    template<class _Up> _LIBCPP_INLINE_VISIBILITY auto_ptr(auto_ptr<_Up>& __p) throw()
-        : __ptr_(__p.release()) {}
-    _LIBCPP_INLINE_VISIBILITY auto_ptr& operator=(auto_ptr& __p) throw()
-        {reset(__p.release()); return *this;}
-    template<class _Up> _LIBCPP_INLINE_VISIBILITY auto_ptr& operator=(auto_ptr<_Up>& __p) throw()
-        {reset(__p.release()); return *this;}
-    _LIBCPP_INLINE_VISIBILITY auto_ptr& operator=(auto_ptr_ref<_Tp> __p) throw()
-        {reset(__p.__ptr_); return *this;}
-    _LIBCPP_INLINE_VISIBILITY ~auto_ptr() throw() {delete __ptr_;}
-
-    _LIBCPP_INLINE_VISIBILITY _Tp& operator*() const throw()
-        {return *__ptr_;}
-    _LIBCPP_INLINE_VISIBILITY _Tp* operator->() const throw() {return __ptr_;}
-    _LIBCPP_INLINE_VISIBILITY _Tp* get() const throw() {return __ptr_;}
-    _LIBCPP_INLINE_VISIBILITY _Tp* release() throw()
-    {
-        _Tp* __t = __ptr_;
-        __ptr_ = 0;
-        return __t;
-    }
-    _LIBCPP_INLINE_VISIBILITY void reset(_Tp* __p = 0) throw()
-    {
-        if (__ptr_ != __p)
-            delete __ptr_;
-        __ptr_ = __p;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY auto_ptr(auto_ptr_ref<_Tp> __p) throw() : __ptr_(__p.__ptr_) {}
-    template<class _Up> _LIBCPP_INLINE_VISIBILITY operator auto_ptr_ref<_Up>() throw()
-        {auto_ptr_ref<_Up> __t; __t.__ptr_ = release(); return __t;}
-    template<class _Up> _LIBCPP_INLINE_VISIBILITY operator auto_ptr<_Up>() throw()
-        {return auto_ptr<_Up>(release());}
-};
-
-template <>
-class _LIBCPP_TYPE_VIS_ONLY auto_ptr<void>
-{
-public:
-    typedef void element_type;
-};
-
-template <class _T1, class _T2, bool = is_same<typename remove_cv<_T1>::type,
-                                                     typename remove_cv<_T2>::type>::value,
-                                bool = is_empty<_T1>::value
-#if __has_feature(is_final)
-                                       && !__is_final(_T1)
-#endif
-                                ,
-                                bool = is_empty<_T2>::value
-#if __has_feature(is_final)
-                                       && !__is_final(_T2)
-#endif
-         >
-struct __libcpp_compressed_pair_switch;
-
-template <class _T1, class _T2, bool IsSame>
-struct __libcpp_compressed_pair_switch<_T1, _T2, IsSame, false, false> {enum {value = 0};};
-
-template <class _T1, class _T2, bool IsSame>
-struct __libcpp_compressed_pair_switch<_T1, _T2, IsSame, true, false>  {enum {value = 1};};
-
-template <class _T1, class _T2, bool IsSame>
-struct __libcpp_compressed_pair_switch<_T1, _T2, IsSame, false, true>  {enum {value = 2};};
-
-template <class _T1, class _T2>
-struct __libcpp_compressed_pair_switch<_T1, _T2, false, true, true>    {enum {value = 3};};
-
-template <class _T1, class _T2>
-struct __libcpp_compressed_pair_switch<_T1, _T2, true, true, true>     {enum {value = 1};};
-
-template <class _T1, class _T2, unsigned = __libcpp_compressed_pair_switch<_T1, _T2>::value>
-class __libcpp_compressed_pair_imp;
-
-template <class _T1, class _T2>
-class __libcpp_compressed_pair_imp<_T1, _T2, 0>
-{
-private:
-    _T1 __first_;
-    _T2 __second_;
-public:
-    typedef _T1 _T1_param;
-    typedef _T2 _T2_param;
-
-    typedef typename remove_reference<_T1>::type& _T1_reference;
-    typedef typename remove_reference<_T2>::type& _T2_reference;
-
-    typedef const typename remove_reference<_T1>::type& _T1_const_reference;
-    typedef const typename remove_reference<_T2>::type& _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T1_param __t1)
-        : __first_(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T2_param __t2)
-        : __second_(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp(_T1_param __t1, _T2_param __t2)
-        : __first_(_VSTD::forward<_T1_param>(__t1)), __second_(_VSTD::forward<_T2_param>(__t2)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : __first_(__p.first()),
-          __second_(__p.second()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            __first_ = __p.first();
-            __second_ = __p.second();
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : __first_(_VSTD::forward<_T1>(__p.first())),
-          __second_(_VSTD::forward<_T2>(__p.second())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            __first_ = _VSTD::forward<_T1>(__p.first());
-            __second_ = _VSTD::forward<_T2>(__p.second());
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        __libcpp_compressed_pair_imp(piecewise_construct_t __pc,
-                                     tuple<_Args1...> __first_args,
-                                     tuple<_Args2...> __second_args,
-                                     __tuple_indices<_I1...>,
-                                     __tuple_indices<_I2...>)
-            : __first_(_VSTD::forward<_Args1>(_VSTD::get<_I1>(__first_args))...),
-              __second_(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...)
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return __first_;}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return __first_;}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return __second_;}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return __second_;}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {
-        using _VSTD::swap;
-        swap(__first_, __x.__first_);
-        swap(__second_, __x.__second_);
-    }
-};
-
-template <class _T1, class _T2>
-class __libcpp_compressed_pair_imp<_T1, _T2, 1>
-    : private _T1
-{
-private:
-    _T2 __second_;
-public:
-    typedef _T1 _T1_param;
-    typedef _T2 _T2_param;
-
-    typedef _T1&                                        _T1_reference;
-    typedef typename remove_reference<_T2>::type& _T2_reference;
-
-    typedef const _T1&                                        _T1_const_reference;
-    typedef const typename remove_reference<_T2>::type& _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T1_param __t1)
-        : _T1(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T2_param __t2)
-        : __second_(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp(_T1_param __t1, _T2_param __t2)
-        : _T1(_VSTD::forward<_T1_param>(__t1)), __second_(_VSTD::forward<_T2_param>(__t2)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : _T1(__p.first()), __second_(__p.second()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            _T1::operator=(__p.first());
-            __second_ = __p.second();
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : _T1(_VSTD::move(__p.first())), __second_(_VSTD::forward<_T2>(__p.second())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            _T1::operator=(_VSTD::move(__p.first()));
-            __second_ = _VSTD::forward<_T2>(__p.second());
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        __libcpp_compressed_pair_imp(piecewise_construct_t __pc,
-                                     tuple<_Args1...> __first_args,
-                                     tuple<_Args2...> __second_args,
-                                     __tuple_indices<_I1...>,
-                                     __tuple_indices<_I2...>)
-            : _T1(_VSTD::forward<_Args1>(_VSTD::get<_I1>(__first_args))...),
-              __second_(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...)
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return __second_;}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return __second_;}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {
-        using _VSTD::swap;
-        swap(__second_, __x.__second_);
-    }
-};
-
-template <class _T1, class _T2>
-class __libcpp_compressed_pair_imp<_T1, _T2, 2>
-    : private _T2
-{
-private:
-    _T1 __first_;
-public:
-    typedef _T1 _T1_param;
-    typedef _T2 _T2_param;
-
-    typedef typename remove_reference<_T1>::type& _T1_reference;
-    typedef _T2&                                        _T2_reference;
-
-    typedef const typename remove_reference<_T1>::type& _T1_const_reference;
-    typedef const _T2&                                        _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T1_param __t1)
-        : __first_(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T2_param __t2)
-        : _T2(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp(_T1_param __t1, _T2_param __t2)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : _T2(_VSTD::forward<_T2_param>(__t2)), __first_(_VSTD::forward<_T1_param>(__t1)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : _T2(__p.second()), __first_(__p.first()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            _T2::operator=(__p.second());
-            __first_ = __p.first();
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : _T2(_VSTD::forward<_T2>(__p.second())), __first_(_VSTD::move(__p.first())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            _T2::operator=(_VSTD::forward<_T2>(__p.second()));
-            __first_ = _VSTD::move(__p.first());
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        __libcpp_compressed_pair_imp(piecewise_construct_t __pc,
-                                     tuple<_Args1...> __first_args,
-                                     tuple<_Args2...> __second_args,
-                                     __tuple_indices<_I1...>,
-                                     __tuple_indices<_I2...>)
-            : _T2(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...),
-              __first_(_VSTD::forward<_Args1>(_VSTD::get<_I1>(__first_args))...)
-              
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return __first_;}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return __first_;}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp& __x)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {
-        using _VSTD::swap;
-        swap(__first_, __x.__first_);
-    }
-};
-
-template <class _T1, class _T2>
-class __libcpp_compressed_pair_imp<_T1, _T2, 3>
-    : private _T1,
-      private _T2
-{
-public:
-    typedef _T1 _T1_param;
-    typedef _T2 _T2_param;
-
-    typedef _T1& _T1_reference;
-    typedef _T2& _T2_reference;
-
-    typedef const _T1& _T1_const_reference;
-    typedef const _T2& _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T1_param __t1)
-        : _T1(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __libcpp_compressed_pair_imp(_T2_param __t2)
-        : _T2(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __libcpp_compressed_pair_imp(_T1_param __t1, _T2_param __t2)
-        : _T1(_VSTD::forward<_T1_param>(__t1)), _T2(_VSTD::forward<_T2_param>(__t2)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : _T1(__p.first()), _T2(__p.second()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(const __libcpp_compressed_pair_imp& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            _T1::operator=(__p.first());
-            _T2::operator=(__p.second());
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : _T1(_VSTD::move(__p.first())), _T2(_VSTD::move(__p.second())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __libcpp_compressed_pair_imp& operator=(__libcpp_compressed_pair_imp&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            _T1::operator=(_VSTD::move(__p.first()));
-            _T2::operator=(_VSTD::move(__p.second()));
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        __libcpp_compressed_pair_imp(piecewise_construct_t __pc,
-                                     tuple<_Args1...> __first_args,
-                                     tuple<_Args2...> __second_args,
-                                     __tuple_indices<_I1...>,
-                                     __tuple_indices<_I2...>)
-            : _T1(_VSTD::forward<_Args1>(_VSTD::get<_I1>(__first_args))...),
-              _T2(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...)
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return *this;}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__libcpp_compressed_pair_imp&)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {
-    }
-};
-
-template <class _T1, class _T2>
-class __compressed_pair
-    : private __libcpp_compressed_pair_imp<_T1, _T2>
-{
-    typedef __libcpp_compressed_pair_imp<_T1, _T2> base;
-public:
-    typedef typename base::_T1_param _T1_param;
-    typedef typename base::_T2_param _T2_param;
-
-    typedef typename base::_T1_reference _T1_reference;
-    typedef typename base::_T2_reference _T2_reference;
-
-    typedef typename base::_T1_const_reference _T1_const_reference;
-    typedef typename base::_T2_const_reference _T2_const_reference;
-
-    _LIBCPP_INLINE_VISIBILITY __compressed_pair() {}
-    _LIBCPP_INLINE_VISIBILITY explicit __compressed_pair(_T1_param __t1)
-        : base(_VSTD::forward<_T1_param>(__t1)) {}
-    _LIBCPP_INLINE_VISIBILITY explicit __compressed_pair(_T2_param __t2)
-        : base(_VSTD::forward<_T2_param>(__t2)) {}
-    _LIBCPP_INLINE_VISIBILITY __compressed_pair(_T1_param __t1, _T2_param __t2)
-        : base(_VSTD::forward<_T1_param>(__t1), _VSTD::forward<_T2_param>(__t2)) {}
-
-#if defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-    _LIBCPP_INLINE_VISIBILITY
-    __compressed_pair(const __compressed_pair& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_T1>::value &&
-                   is_nothrow_copy_constructible<_T2>::value)
-        : base(__p) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __compressed_pair& operator=(const __compressed_pair& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<_T1>::value &&
-                   is_nothrow_copy_assignable<_T2>::value)
-        {
-            base::operator=(__p);
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __compressed_pair(__compressed_pair&& __p)
-        _NOEXCEPT_(is_nothrow_move_constructible<_T1>::value &&
-                   is_nothrow_move_constructible<_T2>::value)
-        : base(_VSTD::move(__p)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __compressed_pair& operator=(__compressed_pair&& __p)
-        _NOEXCEPT_(is_nothrow_move_assignable<_T1>::value &&
-                   is_nothrow_move_assignable<_T2>::value)
-        {
-            base::operator=(_VSTD::move(__p));
-            return *this;
-        }
-
-#endif  // defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args1, class... _Args2>
-        _LIBCPP_INLINE_VISIBILITY
-        __compressed_pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args,
-                                                      tuple<_Args2...> __second_args)
-            : base(__pc, _VSTD::move(__first_args), _VSTD::move(__second_args),
-                   typename __make_tuple_indices<sizeof...(_Args1)>::type(),
-                   typename __make_tuple_indices<sizeof...(_Args2) >::type())
-            {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY _T1_reference       first() _NOEXCEPT       {return base::first();}
-    _LIBCPP_INLINE_VISIBILITY _T1_const_reference first() const _NOEXCEPT {return base::first();}
-
-    _LIBCPP_INLINE_VISIBILITY _T2_reference       second() _NOEXCEPT       {return base::second();}
-    _LIBCPP_INLINE_VISIBILITY _T2_const_reference second() const _NOEXCEPT {return base::second();}
-
-    _LIBCPP_INLINE_VISIBILITY void swap(__compressed_pair& __x)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-        {base::swap(__x);}
-};
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(__compressed_pair<_T1, _T2>& __x, __compressed_pair<_T1, _T2>& __y)
-        _NOEXCEPT_(__is_nothrow_swappable<_T1>::value &&
-                   __is_nothrow_swappable<_T2>::value)
-    {__x.swap(__y);}
-
-// __same_or_less_cv_qualified
-
-template <class _Ptr1, class _Ptr2,
-          bool = is_same<typename remove_cv<typename pointer_traits<_Ptr1>::element_type>::type,
-                         typename remove_cv<typename pointer_traits<_Ptr2>::element_type>::type
-                        >::value
-         >
-struct __same_or_less_cv_qualified_imp
-    : is_convertible<_Ptr1, _Ptr2> {};
-
-template <class _Ptr1, class _Ptr2>
-struct __same_or_less_cv_qualified_imp<_Ptr1, _Ptr2, false>
-    : false_type {};
-
-template <class _Ptr1, class _Ptr2, bool = is_pointer<_Ptr1>::value ||
-                                           is_same<_Ptr1, _Ptr2>::value ||
-                                           __has_element_type<_Ptr1>::value>
-struct __same_or_less_cv_qualified
-    : __same_or_less_cv_qualified_imp<_Ptr1, _Ptr2> {};
-
-template <class _Ptr1, class _Ptr2>
-struct __same_or_less_cv_qualified<_Ptr1, _Ptr2, false>
-    : false_type {};
-
-// default_delete
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY default_delete
-{
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT = default;
-#else
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT {}
-#endif
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY default_delete(const default_delete<_Up>&,
-             typename enable_if<is_convertible<_Up*, _Tp*>::value>::type* = 0) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY void operator() (_Tp* __ptr) const _NOEXCEPT
-        {
-            static_assert(sizeof(_Tp) > 0, "default_delete can not delete incomplete type");
-            static_assert(!is_void<_Tp>::value, "default_delete can not delete incomplete type");
-            delete __ptr;
-        }
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY default_delete<_Tp[]>
-{
-public:
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT = default;
-#else
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR default_delete() _NOEXCEPT {}
-#endif
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY default_delete(const default_delete<_Up[]>&,
-             typename enable_if<__same_or_less_cv_qualified<_Up*, _Tp*>::value>::type* = 0) _NOEXCEPT {}
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        void operator() (_Up* __ptr,
-                         typename enable_if<__same_or_less_cv_qualified<_Up*, _Tp*>::value>::type* = 0) const _NOEXCEPT
-        {
-            static_assert(sizeof(_Tp) > 0, "default_delete can not delete incomplete type");
-            static_assert(!is_void<_Tp>::value, "default_delete can not delete incomplete type");
-            delete [] __ptr;
-        }
-};
-
-template <class _Tp, class _Dp = default_delete<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY unique_ptr
-{
-public:
-    typedef _Tp element_type;
-    typedef _Dp deleter_type;
-    typedef typename __pointer_type<_Tp, deleter_type>::type pointer;
-private:
-    __compressed_pair<pointer, deleter_type> __ptr_;
-
-#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unique_ptr(unique_ptr&);
-    template <class _Up, class _Ep>
-        unique_ptr(unique_ptr<_Up, _Ep>&);
-    unique_ptr& operator=(unique_ptr&);
-    template <class _Up, class _Ep>
-        unique_ptr& operator=(unique_ptr<_Up, _Ep>&);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    struct __nat {int __for_bool_;};
-
-    typedef       typename remove_reference<deleter_type>::type& _Dp_reference;
-    typedef const typename remove_reference<deleter_type>::type& _Dp_const_reference;
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT
-        : __ptr_(pointer())
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT
-        : __ptr_(pointer())
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-    _LIBCPP_INLINE_VISIBILITY explicit unique_ptr(pointer __p) _NOEXCEPT
-        : __ptr_(_VSTD::move(__p))
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(pointer __p, typename conditional<
-                                        is_reference<deleter_type>::value,
-                                        deleter_type,
-                                        typename add_lvalue_reference<const deleter_type>::type>::type __d)
-             _NOEXCEPT
-        : __ptr_(__p, __d) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(pointer __p, typename remove_reference<deleter_type>::type&& __d)
-             _NOEXCEPT
-        : __ptr_(__p, _VSTD::move(__d))
-        {
-            static_assert(!is_reference<deleter_type>::value, "rvalue deleter bound to reference");
-        }
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(unique_ptr&& __u) _NOEXCEPT
-        : __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {}
-    template <class _Up, class _Ep>
-        _LIBCPP_INLINE_VISIBILITY
-        unique_ptr(unique_ptr<_Up, _Ep>&& __u,
-                   typename enable_if
-                      <
-                        !is_array<_Up>::value &&
-                         is_convertible<typename unique_ptr<_Up, _Ep>::pointer, pointer>::value &&
-                         is_convertible<_Ep, deleter_type>::value &&
-                         (
-                            !is_reference<deleter_type>::value ||
-                            is_same<deleter_type, _Ep>::value
-                         ),
-                         __nat
-                      >::type = __nat()) _NOEXCEPT
-            : __ptr_(__u.release(), _VSTD::forward<_Ep>(__u.get_deleter())) {}
-
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY unique_ptr(auto_ptr<_Up>&& __p,
-                typename enable_if<
-                                      is_convertible<_Up*, _Tp*>::value &&
-                                      is_same<_Dp, default_delete<_Tp> >::value,
-                                      __nat
-                                  >::type = __nat()) _NOEXCEPT
-            : __ptr_(__p.release())
-            {
-            }
-
-        _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT
-            {
-                reset(__u.release());
-                __ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());
-                return *this;
-            }
-
-        template <class _Up, class _Ep>
-            _LIBCPP_INLINE_VISIBILITY
-            typename enable_if
-            <
-                !is_array<_Up>::value &&
-                is_convertible<typename unique_ptr<_Up, _Ep>::pointer, pointer>::value &&
-                is_assignable<deleter_type&, _Ep&&>::value,
-                unique_ptr&
-            >::type
-            operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT
-            {
-                reset(__u.release());
-                __ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());
-                return *this;
-            }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY operator __rv<unique_ptr>()
-    {
-        return __rv<unique_ptr>(*this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(__rv<unique_ptr> __u)
-        : __ptr_(__u->release(), _VSTD::forward<deleter_type>(__u->get_deleter())) {}
-
-    template <class _Up, class _Ep>
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(unique_ptr<_Up, _Ep> __u)
-    {
-        reset(__u.release());
-        __ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(pointer __p, deleter_type __d)
-        : __ptr_(_VSTD::move(__p), _VSTD::move(__d)) {}
-
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-                typename enable_if<
-                                      is_convertible<_Up*, _Tp*>::value &&
-                                      is_same<_Dp, default_delete<_Tp> >::value,
-                                      unique_ptr&
-                                  >::type
-        operator=(auto_ptr<_Up> __p)
-            {reset(__p.release()); return *this;}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY ~unique_ptr() {reset();}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(nullptr_t) _NOEXCEPT
-    {
-        reset();
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY typename add_lvalue_reference<_Tp>::type operator*() const
-        {return *__ptr_.first();}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const _NOEXCEPT {return __ptr_.first();}
-    _LIBCPP_INLINE_VISIBILITY pointer get() const _NOEXCEPT {return __ptr_.first();}
-    _LIBCPP_INLINE_VISIBILITY       _Dp_reference get_deleter() _NOEXCEPT
-        {return __ptr_.second();}
-    _LIBCPP_INLINE_VISIBILITY _Dp_const_reference get_deleter() const _NOEXCEPT
-        {return __ptr_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT
-        {return __ptr_.first() != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY pointer release() _NOEXCEPT
-    {
-        pointer __t = __ptr_.first();
-        __ptr_.first() = pointer();
-        return __t;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY void reset(pointer __p = pointer()) _NOEXCEPT
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = __p;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY void swap(unique_ptr& __u) _NOEXCEPT
-        {__ptr_.swap(__u.__ptr_);}
-};
-
-template <class _Tp, class _Dp>
-class _LIBCPP_TYPE_VIS_ONLY unique_ptr<_Tp[], _Dp>
-{
-public:
-    typedef _Tp element_type;
-    typedef _Dp deleter_type;
-    typedef typename __pointer_type<_Tp, deleter_type>::type pointer;
-private:
-    __compressed_pair<pointer, deleter_type> __ptr_;
-
-#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unique_ptr(unique_ptr&);
-    template <class _Up>
-        unique_ptr(unique_ptr<_Up>&);
-    unique_ptr& operator=(unique_ptr&);
-    template <class _Up>
-        unique_ptr& operator=(unique_ptr<_Up>&);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    struct __nat {int __for_bool_;};
-
-    typedef       typename remove_reference<deleter_type>::type& _Dp_reference;
-    typedef const typename remove_reference<deleter_type>::type& _Dp_const_reference;
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr() _NOEXCEPT
-        : __ptr_(pointer())
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR unique_ptr(nullptr_t) _NOEXCEPT
-        : __ptr_(pointer())
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp>
-    _LIBCPP_INLINE_VISIBILITY explicit unique_ptr(_Pp __p,
-            typename enable_if<__same_or_less_cv_qualified<_Pp, pointer>::value, __nat>::type = __nat()) _NOEXCEPT
-        : __ptr_(__p)
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-
-    template <class _Pp>
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(_Pp __p, typename conditional<
-                                       is_reference<deleter_type>::value,
-                                       deleter_type,
-                                       typename add_lvalue_reference<const deleter_type>::type>::type __d,
-                                       typename enable_if<__same_or_less_cv_qualified<_Pp, pointer>::value, __nat>::type = __nat())
-             _NOEXCEPT
-        : __ptr_(__p, __d) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(nullptr_t, typename conditional<
-                                       is_reference<deleter_type>::value,
-                                       deleter_type,
-                                       typename add_lvalue_reference<const deleter_type>::type>::type __d)
-             _NOEXCEPT
-        : __ptr_(pointer(), __d) {}
-
-    template <class _Pp>
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(_Pp __p,
-                                         typename remove_reference<deleter_type>::type&& __d,
-                                         typename enable_if<__same_or_less_cv_qualified<_Pp, pointer>::value, __nat>::type = __nat())
-             _NOEXCEPT
-        : __ptr_(__p, _VSTD::move(__d))
-        {
-            static_assert(!is_reference<deleter_type>::value, "rvalue deleter bound to reference");
-        }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(nullptr_t, typename remove_reference<deleter_type>::type&& __d)
-             _NOEXCEPT
-        : __ptr_(pointer(), _VSTD::move(__d))
-        {
-            static_assert(!is_reference<deleter_type>::value, "rvalue deleter bound to reference");
-        }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(unique_ptr&& __u) _NOEXCEPT
-        : __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(unique_ptr&& __u) _NOEXCEPT
-        {
-            reset(__u.release());
-            __ptr_.second() = _VSTD::forward<deleter_type>(__u.get_deleter());
-            return *this;
-        }
-
-    template <class _Up, class _Ep>
-        _LIBCPP_INLINE_VISIBILITY
-        unique_ptr(unique_ptr<_Up, _Ep>&& __u,
-                   typename enable_if
-                            <
-                                is_array<_Up>::value &&
-                                __same_or_less_cv_qualified<typename unique_ptr<_Up, _Ep>::pointer, pointer>::value
-                                && is_convertible<_Ep, deleter_type>::value &&
-                                (
-                                    !is_reference<deleter_type>::value ||
-                                    is_same<deleter_type, _Ep>::value
-                                ),
-                                __nat
-                            >::type = __nat()
-                  ) _NOEXCEPT
-        : __ptr_(__u.release(), _VSTD::forward<deleter_type>(__u.get_deleter())) {}
-
-
-        template <class _Up, class _Ep>
-            _LIBCPP_INLINE_VISIBILITY
-            typename enable_if
-            <
-                is_array<_Up>::value &&
-                __same_or_less_cv_qualified<typename unique_ptr<_Up, _Ep>::pointer, pointer>::value &&
-                is_assignable<deleter_type&, _Ep&&>::value,
-                unique_ptr&
-            >::type
-            operator=(unique_ptr<_Up, _Ep>&& __u) _NOEXCEPT
-            {
-                reset(__u.release());
-                __ptr_.second() = _VSTD::forward<_Ep>(__u.get_deleter());
-                return *this;
-            }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY explicit unique_ptr(pointer __p)
-        : __ptr_(__p)
-        {
-            static_assert(!is_pointer<deleter_type>::value,
-                "unique_ptr constructed with null function pointer deleter");
-        }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(pointer __p, deleter_type __d)
-        : __ptr_(__p, _VSTD::forward<deleter_type>(__d)) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(nullptr_t, deleter_type __d)
-        : __ptr_(pointer(), _VSTD::forward<deleter_type>(__d)) {}
-
-    _LIBCPP_INLINE_VISIBILITY operator __rv<unique_ptr>()
-    {
-        return __rv<unique_ptr>(*this);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr(__rv<unique_ptr> __u)
-        : __ptr_(__u->release(), _VSTD::forward<deleter_type>(__u->get_deleter())) {}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(__rv<unique_ptr> __u)
-    {
-        reset(__u->release());
-        __ptr_.second() = _VSTD::forward<deleter_type>(__u->get_deleter());
-        return *this;
-    }
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY ~unique_ptr() {reset();}
-
-    _LIBCPP_INLINE_VISIBILITY unique_ptr& operator=(nullptr_t) _NOEXCEPT
-    {
-        reset();
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY typename add_lvalue_reference<_Tp>::type operator[](size_t __i) const
-        {return __ptr_.first()[__i];}
-    _LIBCPP_INLINE_VISIBILITY pointer get() const _NOEXCEPT {return __ptr_.first();}
-    _LIBCPP_INLINE_VISIBILITY       _Dp_reference get_deleter() _NOEXCEPT
-        {return __ptr_.second();}
-    _LIBCPP_INLINE_VISIBILITY _Dp_const_reference get_deleter() const _NOEXCEPT
-        {return __ptr_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT
-        {return __ptr_.first() != nullptr;}
-
-    _LIBCPP_INLINE_VISIBILITY pointer release() _NOEXCEPT
-    {
-        pointer __t = __ptr_.first();
-        __ptr_.first() = pointer();
-        return __t;
-    }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__same_or_less_cv_qualified<_Pp, pointer>::value, void>::type
-    reset(_Pp __p) _NOEXCEPT
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = __p;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-    _LIBCPP_INLINE_VISIBILITY void reset(nullptr_t) _NOEXCEPT
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = nullptr;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-    _LIBCPP_INLINE_VISIBILITY void reset() _NOEXCEPT
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = nullptr;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY void reset(pointer __p = pointer())
-    {
-        pointer __tmp = __ptr_.first();
-        __ptr_.first() = __p;
-        if (__tmp)
-            __ptr_.second()(__tmp);
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY void swap(unique_ptr& __u) {__ptr_.swap(__u.__ptr_);}
-private:
-
-#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Up>
-        explicit unique_ptr(_Up);
-    template <class _Up>
-        unique_ptr(_Up __u,
-                   typename conditional<
-                                       is_reference<deleter_type>::value,
-                                       deleter_type,
-                                       typename add_lvalue_reference<const deleter_type>::type>::type,
-                   typename enable_if
-                      <
-                         is_convertible<_Up, pointer>::value,
-                         __nat
-                      >::type = __nat());
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-template <class _Tp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unique_ptr<_Tp, _Dp>& __x, unique_ptr<_Tp, _Dp>& __y) _NOEXCEPT {__x.swap(__y);}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return __x.get() == __y.get();}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__x == __y);}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y)
-{
-    typedef typename unique_ptr<_T1, _D1>::pointer _P1;
-    typedef typename unique_ptr<_T2, _D2>::pointer _P2;
-    typedef typename common_type<_P1, _P2>::type _V;
-    return less<_V>()(__x.get(), __y.get());
-}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return __y < __x;}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__y < __x);}
-
-template <class _T1, class _D1, class _T2, class _D2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const unique_ptr<_T1, _D1>& __x, const unique_ptr<_T2, _D2>& __y) {return !(__x < __y);}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const unique_ptr<_T1, _D1>& __x, nullptr_t) _NOEXCEPT
-{
-    return !__x;
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(nullptr_t, const unique_ptr<_T1, _D1>& __x) _NOEXCEPT
-{
-    return !__x;
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unique_ptr<_T1, _D1>& __x, nullptr_t) _NOEXCEPT
-{
-    return static_cast<bool>(__x);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(nullptr_t, const unique_ptr<_T1, _D1>& __x) _NOEXCEPT
-{
-    return static_cast<bool>(__x);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const unique_ptr<_T1, _D1>& __x, nullptr_t)
-{
-    typedef typename unique_ptr<_T1, _D1>::pointer _P1;
-    return less<_P1>()(__x.get(), nullptr);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(nullptr_t, const unique_ptr<_T1, _D1>& __x)
-{
-    typedef typename unique_ptr<_T1, _D1>::pointer _P1;
-    return less<_P1>()(nullptr, __x.get());
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const unique_ptr<_T1, _D1>& __x, nullptr_t)
-{
-    return nullptr < __x;
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(nullptr_t, const unique_ptr<_T1, _D1>& __x)
-{
-    return __x < nullptr;
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const unique_ptr<_T1, _D1>& __x, nullptr_t)
-{
-    return !(nullptr < __x);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(nullptr_t, const unique_ptr<_T1, _D1>& __x)
-{
-    return !(__x < nullptr);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const unique_ptr<_T1, _D1>& __x, nullptr_t)
-{
-    return !(__x < nullptr);
-}
-
-template <class _T1, class _D1>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(nullptr_t, const unique_ptr<_T1, _D1>& __x)
-{
-    return !(nullptr < __x);
-}
-
-#ifdef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-unique_ptr<_Tp, _Dp>
-move(unique_ptr<_Tp, _Dp>& __t)
-{
-    return unique_ptr<_Tp, _Dp>(__rv<unique_ptr<_Tp, _Dp> >(__t));
-}
-
-#endif
-
-#if _LIBCPP_STD_VER > 11
-
-template<class _Tp>
-struct __unique_if
-{
-    typedef unique_ptr<_Tp> __unique_single;
-};
-
-template<class _Tp>
-struct __unique_if<_Tp[]>
-{
-    typedef unique_ptr<_Tp[]> __unique_array_unknown_bound;
-};
-
-template<class _Tp, size_t _Np>
-struct __unique_if<_Tp[_Np]>
-{
-    typedef void __unique_array_known_bound;
-};
-
-template<class _Tp, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __unique_if<_Tp>::__unique_single
-make_unique(_Args&&... __args)
-{
-    return unique_ptr<_Tp>(new _Tp(_VSTD::forward<_Args>(__args)...));
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename __unique_if<_Tp>::__unique_array_unknown_bound
-make_unique(size_t __n)
-{
-    typedef typename remove_extent<_Tp>::type _Up;
-    return unique_ptr<_Tp>(new _Up[__n]());
-}
-
-template<class _Tp, class... _Args>
-    typename __unique_if<_Tp>::__unique_array_known_bound
-    make_unique(_Args&&...) = delete;
-
-#endif  // _LIBCPP_STD_VER > 11
-
-template <class _Tp> struct hash;
-
-template <class _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_Size
-__loadword(const void* __p)
-{
-    _Size __r;
-    std::memcpy(&__r, __p, sizeof(__r));
-    return __r;
-}
-
-// We use murmur2 when size_t is 32 bits, and cityhash64 when size_t
-// is 64 bits.  This is because cityhash64 uses 64bit x 64bit
-// multiplication, which can be very slow on 32-bit systems.
-template <class _Size, size_t = sizeof(_Size)*__CHAR_BIT__>
-struct __murmur2_or_cityhash;
-
-template <class _Size>
-struct __murmur2_or_cityhash<_Size, 32>
-{
-    _Size operator()(const void* __key, _Size __len);
-};
-
-// murmur2
-template <class _Size>
-_Size
-__murmur2_or_cityhash<_Size, 32>::operator()(const void* __key, _Size __len)
-{
-    const _Size __m = 0x5bd1e995;
-    const _Size __r = 24;
-    _Size __h = __len;
-    const unsigned char* __data = static_cast<const unsigned char*>(__key);
-    for (; __len >= 4; __data += 4, __len -= 4)
-    {
-        _Size __k = __loadword<_Size>(__data);
-        __k *= __m;
-        __k ^= __k >> __r;
-        __k *= __m;
-        __h *= __m;
-        __h ^= __k;
-    }
-    switch (__len)
-    {
-    case 3:
-        __h ^= __data[2] << 16;
-    case 2:
-        __h ^= __data[1] << 8;
-    case 1:
-        __h ^= __data[0];
-        __h *= __m;
-    }
-    __h ^= __h >> 13;
-    __h *= __m;
-    __h ^= __h >> 15;
-    return __h;
-}
-
-template <class _Size>
-struct __murmur2_or_cityhash<_Size, 64>
-{
-    _Size operator()(const void* __key, _Size __len);
-
- private:
-  // Some primes between 2^63 and 2^64.
-  static const _Size __k0 = 0xc3a5c85c97cb3127ULL;
-  static const _Size __k1 = 0xb492b66fbe98f273ULL;
-  static const _Size __k2 = 0x9ae16a3b2f90404fULL;
-  static const _Size __k3 = 0xc949d7c7509e6557ULL;
-
-  static _Size __rotate(_Size __val, int __shift) {
-    return __shift == 0 ? __val : ((__val >> __shift) | (__val << (64 - __shift)));
-  }
-
-  static _Size __rotate_by_at_least_1(_Size __val, int __shift) {
-    return (__val >> __shift) | (__val << (64 - __shift));
-  }
-
-  static _Size __shift_mix(_Size __val) {
-    return __val ^ (__val >> 47);
-  }
-
-  static _Size __hash_len_16(_Size __u, _Size __v) {
-    const _Size __mul = 0x9ddfea08eb382d69ULL;
-    _Size __a = (__u ^ __v) * __mul;
-    __a ^= (__a >> 47);
-    _Size __b = (__v ^ __a) * __mul;
-    __b ^= (__b >> 47);
-    __b *= __mul;
-    return __b;
-  }
-
-  static _Size __hash_len_0_to_16(const char* __s, _Size __len) {
-    if (__len > 8) {
-      const _Size __a = __loadword<_Size>(__s);
-      const _Size __b = __loadword<_Size>(__s + __len - 8);
-      return __hash_len_16(__a, __rotate_by_at_least_1(__b + __len, __len)) ^ __b;
-    }
-    if (__len >= 4) {
-      const uint32_t __a = __loadword<uint32_t>(__s);
-      const uint32_t __b = __loadword<uint32_t>(__s + __len - 4);
-      return __hash_len_16(__len + (__a << 3), __b);
-    }
-    if (__len > 0) {
-      const unsigned char __a = __s[0];
-      const unsigned char __b = __s[__len >> 1];
-      const unsigned char __c = __s[__len - 1];
-      const uint32_t __y = static_cast<uint32_t>(__a) +
-                           (static_cast<uint32_t>(__b) << 8);
-      const uint32_t __z = __len + (static_cast<uint32_t>(__c) << 2);
-      return __shift_mix(__y * __k2 ^ __z * __k3) * __k2;
-    }
-    return __k2;
-  }
-
-  static _Size __hash_len_17_to_32(const char *__s, _Size __len) {
-    const _Size __a = __loadword<_Size>(__s) * __k1;
-    const _Size __b = __loadword<_Size>(__s + 8);
-    const _Size __c = __loadword<_Size>(__s + __len - 8) * __k2;
-    const _Size __d = __loadword<_Size>(__s + __len - 16) * __k0;
-    return __hash_len_16(__rotate(__a - __b, 43) + __rotate(__c, 30) + __d,
-                         __a + __rotate(__b ^ __k3, 20) - __c + __len);
-  }
-
-  // Return a 16-byte hash for 48 bytes.  Quick and dirty.
-  // Callers do best to use "random-looking" values for a and b.
-  static pair<_Size, _Size> __weak_hash_len_32_with_seeds(
-      _Size __w, _Size __x, _Size __y, _Size __z, _Size __a, _Size __b) {
-    __a += __w;
-    __b = __rotate(__b + __a + __z, 21);
-    const _Size __c = __a;
-    __a += __x;
-    __a += __y;
-    __b += __rotate(__a, 44);
-    return pair<_Size, _Size>(__a + __z, __b + __c);
-  }
-
-  // Return a 16-byte hash for s[0] ... s[31], a, and b.  Quick and dirty.
-  static pair<_Size, _Size> __weak_hash_len_32_with_seeds(
-      const char* __s, _Size __a, _Size __b) {
-    return __weak_hash_len_32_with_seeds(__loadword<_Size>(__s),
-                                         __loadword<_Size>(__s + 8),
-                                         __loadword<_Size>(__s + 16),
-                                         __loadword<_Size>(__s + 24),
-                                         __a,
-                                         __b);
-  }
-
-  // Return an 8-byte hash for 33 to 64 bytes.
-  static _Size __hash_len_33_to_64(const char *__s, size_t __len) {
-    _Size __z = __loadword<_Size>(__s + 24);
-    _Size __a = __loadword<_Size>(__s) +
-                (__len + __loadword<_Size>(__s + __len - 16)) * __k0;
-    _Size __b = __rotate(__a + __z, 52);
-    _Size __c = __rotate(__a, 37);
-    __a += __loadword<_Size>(__s + 8);
-    __c += __rotate(__a, 7);
-    __a += __loadword<_Size>(__s + 16);
-    _Size __vf = __a + __z;
-    _Size __vs = __b + __rotate(__a, 31) + __c;
-    __a = __loadword<_Size>(__s + 16) + __loadword<_Size>(__s + __len - 32);
-    __z += __loadword<_Size>(__s + __len - 8);
-    __b = __rotate(__a + __z, 52);
-    __c = __rotate(__a, 37);
-    __a += __loadword<_Size>(__s + __len - 24);
-    __c += __rotate(__a, 7);
-    __a += __loadword<_Size>(__s + __len - 16);
-    _Size __wf = __a + __z;
-    _Size __ws = __b + __rotate(__a, 31) + __c;
-    _Size __r = __shift_mix((__vf + __ws) * __k2 + (__wf + __vs) * __k0);
-    return __shift_mix(__r * __k0 + __vs) * __k2;
-  }
-};
-
-// cityhash64
-template <class _Size>
-_Size
-__murmur2_or_cityhash<_Size, 64>::operator()(const void* __key, _Size __len)
-{
-  const char* __s = static_cast<const char*>(__key);
-  if (__len <= 32) {
-    if (__len <= 16) {
-      return __hash_len_0_to_16(__s, __len);
-    } else {
-      return __hash_len_17_to_32(__s, __len);
-    }
-  } else if (__len <= 64) {
-    return __hash_len_33_to_64(__s, __len);
-  }
-
-  // For strings over 64 bytes we hash the end first, and then as we
-  // loop we keep 56 bytes of state: v, w, x, y, and z.
-  _Size __x = __loadword<_Size>(__s + __len - 40);
-  _Size __y = __loadword<_Size>(__s + __len - 16) +
-              __loadword<_Size>(__s + __len - 56);
-  _Size __z = __hash_len_16(__loadword<_Size>(__s + __len - 48) + __len,
-                          __loadword<_Size>(__s + __len - 24));
-  pair<_Size, _Size> __v = __weak_hash_len_32_with_seeds(__s + __len - 64, __len, __z);
-  pair<_Size, _Size> __w = __weak_hash_len_32_with_seeds(__s + __len - 32, __y + __k1, __x);
-  __x = __x * __k1 + __loadword<_Size>(__s);
-
-  // Decrease len to the nearest multiple of 64, and operate on 64-byte chunks.
-  __len = (__len - 1) & ~static_cast<_Size>(63);
-  do {
-    __x = __rotate(__x + __y + __v.first + __loadword<_Size>(__s + 8), 37) * __k1;
-    __y = __rotate(__y + __v.second + __loadword<_Size>(__s + 48), 42) * __k1;
-    __x ^= __w.second;
-    __y += __v.first + __loadword<_Size>(__s + 40);
-    __z = __rotate(__z + __w.first, 33) * __k1;
-    __v = __weak_hash_len_32_with_seeds(__s, __v.second * __k1, __x + __w.first);
-    __w = __weak_hash_len_32_with_seeds(__s + 32, __z + __w.second,
-                                        __y + __loadword<_Size>(__s + 16));
-    std::swap(__z, __x);
-    __s += 64;
-    __len -= 64;
-  } while (__len != 0);
-  return __hash_len_16(
-      __hash_len_16(__v.first, __w.first) + __shift_mix(__y) * __k1 + __z,
-      __hash_len_16(__v.second, __w.second) + __x);
-}
-
-template <class _Tp, size_t = sizeof(_Tp) / sizeof(size_t)>
-struct __scalar_hash;
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 0>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp    __t;
-            size_t __a;
-        } __u;
-        __u.__a = 0;
-        __u.__t = __v;
-        return __u.__a;
-    }
-};
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 1>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp    __t;
-            size_t __a;
-        } __u;
-        __u.__t = __v;
-        return __u.__a;
-    }
-};
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 2>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-            };
-        } __u;
-        __u.__t = __v;
-        return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u));
-    }
-};
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 3>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-                size_t __c;
-            };
-        } __u;
-        __u.__t = __v;
-        return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u));
-    }
-};
-
-template <class _Tp>
-struct __scalar_hash<_Tp, 4>
-    : public unary_function<_Tp, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp __t;
-            struct
-            {
-                size_t __a;
-                size_t __b;
-                size_t __c;
-                size_t __d;
-            };
-        } __u;
-        __u.__t = __v;
-        return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u));
-    }
-};
-
-template<class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY hash<_Tp*>
-    : public unary_function<_Tp*, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(_Tp* __v) const _NOEXCEPT
-    {
-        union
-        {
-            _Tp* __t;
-            size_t __a;
-        } __u;
-        __u.__t = __v;
-        return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u));
-    }
-};
-
-template <class _Tp, class _Dp>
-struct _LIBCPP_TYPE_VIS_ONLY hash<unique_ptr<_Tp, _Dp> >
-{
-    typedef unique_ptr<_Tp, _Dp> argument_type;
-    typedef size_t               result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()(const argument_type& __ptr) const _NOEXCEPT
-    {
-        typedef typename argument_type::pointer pointer;
-        return hash<pointer>()(__ptr.get());
-    }
-};
-
-struct __destruct_n
-{
-private:
-    size_t size;
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __process(_Tp* __p, false_type) _NOEXCEPT
-        {for (size_t __i = 0; __i < size; ++__i, ++__p) __p->~_Tp();}
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __process(_Tp*, true_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY void __incr(false_type) _NOEXCEPT
-        {++size;}
-    _LIBCPP_INLINE_VISIBILITY void __incr(true_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY void __set(size_t __s, false_type) _NOEXCEPT
-        {size = __s;}
-    _LIBCPP_INLINE_VISIBILITY void __set(size_t, true_type) _NOEXCEPT
-        {}
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit __destruct_n(size_t __s) _NOEXCEPT
-        : size(__s) {}
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __incr(_Tp*) _NOEXCEPT
-        {__incr(integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void __set(size_t __s, _Tp*) _NOEXCEPT
-        {__set(__s, integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
-
-    template <class _Tp>
-    _LIBCPP_INLINE_VISIBILITY void operator()(_Tp* __p) _NOEXCEPT
-        {__process(__p, integral_constant<bool, is_trivially_destructible<_Tp>::value>());}
-};
-
-template <class _Alloc>
-class __allocator_destructor
-{
-    typedef allocator_traits<_Alloc> __alloc_traits;
-public:
-    typedef typename __alloc_traits::pointer pointer;
-    typedef typename __alloc_traits::size_type size_type;
-private:
-    _Alloc& __alloc_;
-    size_type __s_;
-public:
-    _LIBCPP_INLINE_VISIBILITY __allocator_destructor(_Alloc& __a, size_type __s)
-             _NOEXCEPT
-        : __alloc_(__a), __s_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-        {__alloc_traits::deallocate(__alloc_, __p, __s_);}
-};
-
-template <class _InputIterator, class _ForwardIterator>
-_ForwardIterator
-uninitialized_copy(_InputIterator __f, _InputIterator __l, _ForwardIterator __r)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    _ForwardIterator __s = __r;
-    try
-    {
-#endif
-        for (; __f != __l; ++__f, ++__r)
-            ::new(&*__r) value_type(*__f);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        for (; __s != __r; ++__s)
-            __s->~value_type();
-        throw;
-    }
-#endif
-    return __r;
-}
-
-template <class _InputIterator, class _Size, class _ForwardIterator>
-_ForwardIterator
-uninitialized_copy_n(_InputIterator __f, _Size __n, _ForwardIterator __r)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    _ForwardIterator __s = __r;
-    try
-    {
-#endif
-        for (; __n > 0; ++__f, ++__r, --__n)
-            ::new(&*__r) value_type(*__f);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        for (; __s != __r; ++__s)
-            __s->~value_type();
-        throw;
-    }
-#endif
-    return __r;
-}
-
-template <class _ForwardIterator, class _Tp>
-void
-uninitialized_fill(_ForwardIterator __f, _ForwardIterator __l, const _Tp& __x)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    _ForwardIterator __s = __f;
-    try
-    {
-#endif
-        for (; __f != __l; ++__f)
-            ::new(&*__f) value_type(__x);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        for (; __s != __f; ++__s)
-            __s->~value_type();
-        throw;
-    }
-#endif
-}
-
-template <class _ForwardIterator, class _Size, class _Tp>
-_ForwardIterator
-uninitialized_fill_n(_ForwardIterator __f, _Size __n, const _Tp& __x)
-{
-    typedef typename iterator_traits<_ForwardIterator>::value_type value_type;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    _ForwardIterator __s = __f;
-    try
-    {
-#endif
-        for (; __n > 0; ++__f, --__n)
-            ::new(&*__f) value_type(__x);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        for (; __s != __f; ++__s)
-            __s->~value_type();
-        throw;
-    }
-#endif
-    return __f;
-}
-
-class _LIBCPP_EXCEPTION_ABI bad_weak_ptr
-    : public std::exception
-{
-public:
-    virtual ~bad_weak_ptr() _NOEXCEPT;
-    virtual const char* what() const  _NOEXCEPT;
-};
-
-template<class _Tp> class _LIBCPP_TYPE_VIS_ONLY weak_ptr;
-
-class _LIBCPP_TYPE_VIS __shared_count
-{
-    __shared_count(const __shared_count&);
-    __shared_count& operator=(const __shared_count&);
-
-protected:
-    long __shared_owners_;
-    virtual ~__shared_count();
-private:
-    virtual void __on_zero_shared() _NOEXCEPT = 0;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __shared_count(long __refs = 0) _NOEXCEPT
-        : __shared_owners_(__refs) {}
-
-    void __add_shared() _NOEXCEPT;
-    bool __release_shared() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    long use_count() const _NOEXCEPT {return __shared_owners_ + 1;}
-};
-
-class _LIBCPP_TYPE_VIS __shared_weak_count
-    : private __shared_count
-{
-    long __shared_weak_owners_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __shared_weak_count(long __refs = 0) _NOEXCEPT
-        : __shared_count(__refs),
-          __shared_weak_owners_(__refs) {}
-protected:
-    virtual ~__shared_weak_count();
-
-public:
-    void __add_shared() _NOEXCEPT;
-    void __add_weak() _NOEXCEPT;
-    void __release_shared() _NOEXCEPT;
-    void __release_weak() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    long use_count() const _NOEXCEPT {return __shared_count::use_count();}
-    __shared_weak_count* lock() _NOEXCEPT;
-
-    // Define the function out only if we build static libc++ without RTTI.
-    // Otherwise we may break clients who need to compile their projects with
-    // -fno-rtti and yet link against a libc++.dylib compiled
-    // without -fno-rtti.
-#if !defined(_LIBCPP_NO_RTTI) || !defined(_LIBCPP_BUILD_STATIC)
-    virtual const void* __get_deleter(const type_info&) const _NOEXCEPT;
-#endif
-private:
-    virtual void __on_zero_shared_weak() _NOEXCEPT = 0;
-};
-
-template <class _Tp, class _Dp, class _Alloc>
-class __shared_ptr_pointer
-    : public __shared_weak_count
-{
-    __compressed_pair<__compressed_pair<_Tp, _Dp>, _Alloc> __data_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __shared_ptr_pointer(_Tp __p, _Dp __d, _Alloc __a)
-        :  __data_(__compressed_pair<_Tp, _Dp>(__p, _VSTD::move(__d)), _VSTD::move(__a)) {}
-
-#ifndef _LIBCPP_NO_RTTI
-    virtual const void* __get_deleter(const type_info&) const _NOEXCEPT;
-#endif
-
-private:
-    virtual void __on_zero_shared() _NOEXCEPT;
-    virtual void __on_zero_shared_weak() _NOEXCEPT;
-};
-
-#ifndef _LIBCPP_NO_RTTI
-
-template <class _Tp, class _Dp, class _Alloc>
-const void*
-__shared_ptr_pointer<_Tp, _Dp, _Alloc>::__get_deleter(const type_info& __t) const _NOEXCEPT
-{
-    return __t == typeid(_Dp) ? _VSTD::addressof(__data_.first().second()) : 0;
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template <class _Tp, class _Dp, class _Alloc>
-void
-__shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    __data_.first().second()(__data_.first().first());
-    __data_.first().second().~_Dp();
-}
-
-template <class _Tp, class _Dp, class _Alloc>
-void
-__shared_ptr_pointer<_Tp, _Dp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __shared_ptr_pointer>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-
-    _A __a(__data_.second());
-    __data_.second().~_Alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template <class _Tp, class _Alloc>
-class __shared_ptr_emplace
-    : public __shared_weak_count
-{
-    __compressed_pair<_Alloc, _Tp> __data_;
-public:
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY
-    __shared_ptr_emplace(_Alloc __a)
-        :  __data_(_VSTD::move(__a)) {}
-
-    template <class ..._Args>
-        _LIBCPP_INLINE_VISIBILITY
-        __shared_ptr_emplace(_Alloc __a, _Args&& ...__args)
-            :  __data_(piecewise_construct, _VSTD::forward_as_tuple(__a),
-                   _VSTD::forward_as_tuple(_VSTD::forward<_Args>(__args)...)) {}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-    _LIBCPP_INLINE_VISIBILITY
-    __shared_ptr_emplace(_Alloc __a)
-        :  __data_(__a) {}
-
-    template <class _A0>
-        _LIBCPP_INLINE_VISIBILITY
-        __shared_ptr_emplace(_Alloc __a, _A0& __a0)
-            :  __data_(__a, _Tp(__a0)) {}
-
-    template <class _A0, class _A1>
-        _LIBCPP_INLINE_VISIBILITY
-        __shared_ptr_emplace(_Alloc __a, _A0& __a0, _A1& __a1)
-            :  __data_(__a, _Tp(__a0, __a1)) {}
-
-    template <class _A0, class _A1, class _A2>
-        _LIBCPP_INLINE_VISIBILITY
-        __shared_ptr_emplace(_Alloc __a, _A0& __a0, _A1& __a1, _A2& __a2)
-            :  __data_(__a, _Tp(__a0, __a1, __a2)) {}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-private:
-    virtual void __on_zero_shared() _NOEXCEPT;
-    virtual void __on_zero_shared_weak() _NOEXCEPT;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp* get() _NOEXCEPT {return &__data_.second();}
-};
-
-template <class _Tp, class _Alloc>
-void
-__shared_ptr_emplace<_Tp, _Alloc>::__on_zero_shared() _NOEXCEPT
-{
-    __data_.second().~_Tp();
-}
-
-template <class _Tp, class _Alloc>
-void
-__shared_ptr_emplace<_Tp, _Alloc>::__on_zero_shared_weak() _NOEXCEPT
-{
-    typedef typename __allocator_traits_rebind<_Alloc, __shared_ptr_emplace>::type _A;
-    typedef allocator_traits<_A> _ATraits;
-    typedef pointer_traits<typename _ATraits::pointer> _PTraits;
-    _A __a(__data_.first());
-    __data_.first().~_Alloc();
-    __a.deallocate(_PTraits::pointer_to(*this), 1);
-}
-
-template<class _Tp> class _LIBCPP_TYPE_VIS_ONLY enable_shared_from_this;
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY shared_ptr
-{
-public:
-    typedef _Tp element_type;
-private:
-    element_type*      __ptr_;
-    __shared_weak_count* __cntrl_;
-
-    struct __nat {int __for_bool_;};
-public:
-    _LIBCPP_CONSTEXPR shared_ptr() _NOEXCEPT;
-    _LIBCPP_CONSTEXPR shared_ptr(nullptr_t) _NOEXCEPT;
-    template<class _Yp>
-        explicit shared_ptr(_Yp* __p,
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-    template<class _Yp, class _Dp>
-        shared_ptr(_Yp* __p, _Dp __d,
-                   typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-    template<class _Yp, class _Dp, class _Alloc>
-        shared_ptr(_Yp* __p, _Dp __d, _Alloc __a,
-                   typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-    template <class _Dp> shared_ptr(nullptr_t __p, _Dp __d);
-    template <class _Dp, class _Alloc> shared_ptr(nullptr_t __p, _Dp __d, _Alloc __a);
-    template<class _Yp> shared_ptr(const shared_ptr<_Yp>& __r, element_type* __p) _NOEXCEPT;
-    shared_ptr(const shared_ptr& __r) _NOEXCEPT;
-    template<class _Yp>
-        shared_ptr(const shared_ptr<_Yp>& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type = __nat())
-                       _NOEXCEPT;
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    shared_ptr(shared_ptr&& __r) _NOEXCEPT;
-    template<class _Yp> shared_ptr(shared_ptr<_Yp>&& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type = __nat())
-                       _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template<class _Yp> explicit shared_ptr(const weak_ptr<_Yp>& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type= __nat());
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template<class _Yp>
-        shared_ptr(auto_ptr<_Yp>&& __r,
-                   typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-#else
-    template<class _Yp>
-        shared_ptr(auto_ptr<_Yp> __r,
-                   typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type = __nat());
-#endif
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Yp, class _Dp>
-        shared_ptr(unique_ptr<_Yp, _Dp>&&,
-                   typename enable_if
-                   <
-                       !is_lvalue_reference<_Dp>::value &&
-                       !is_array<_Yp>::value &&
-                       is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                       __nat
-                   >::type = __nat());
-    template <class _Yp, class _Dp>
-        shared_ptr(unique_ptr<_Yp, _Dp>&&,
-                   typename enable_if
-                   <
-                       is_lvalue_reference<_Dp>::value &&
-                       !is_array<_Yp>::value &&
-                       is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                       __nat
-                   >::type = __nat());
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Yp, class _Dp>
-        shared_ptr(unique_ptr<_Yp, _Dp>,
-                   typename enable_if
-                   <
-                       !is_lvalue_reference<_Dp>::value &&
-                       !is_array<_Yp>::value &&
-                       is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                       __nat
-                   >::type = __nat());
-    template <class _Yp, class _Dp>
-        shared_ptr(unique_ptr<_Yp, _Dp>,
-                   typename enable_if
-                   <
-                       is_lvalue_reference<_Dp>::value &&
-                       !is_array<_Yp>::value &&
-                       is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                       __nat
-                   >::type = __nat());
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    ~shared_ptr();
-
-    shared_ptr& operator=(const shared_ptr& __r) _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            shared_ptr&
-        >::type
-        operator=(const shared_ptr<_Yp>& __r) _NOEXCEPT;
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    shared_ptr& operator=(shared_ptr&& __r) _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            shared_ptr<_Tp>&
-        >::type
-        operator=(shared_ptr<_Yp>&& __r);
-    template<class _Yp>
-        typename enable_if
-        <
-            !is_array<_Yp>::value &&
-            is_convertible<_Yp*, element_type*>::value,
-            shared_ptr
-        >::type&
-        operator=(auto_ptr<_Yp>&& __r);
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template<class _Yp>
-        typename enable_if
-        <
-            !is_array<_Yp>::value &&
-            is_convertible<_Yp*, element_type*>::value,
-            shared_ptr&
-        >::type
-        operator=(auto_ptr<_Yp> __r);
-#endif
-    template <class _Yp, class _Dp>
-        typename enable_if
-        <
-            !is_array<_Yp>::value &&
-            is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-            shared_ptr&
-        >::type
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        operator=(unique_ptr<_Yp, _Dp>&& __r);
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        operator=(unique_ptr<_Yp, _Dp> __r);
-#endif
-
-    void swap(shared_ptr& __r) _NOEXCEPT;
-    void reset() _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            void
-        >::type
-        reset(_Yp* __p);
-    template<class _Yp, class _Dp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            void
-        >::type
-        reset(_Yp* __p, _Dp __d);
-    template<class _Yp, class _Dp, class _Alloc>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            void
-        >::type
-        reset(_Yp* __p, _Dp __d, _Alloc __a);
-
-    _LIBCPP_INLINE_VISIBILITY
-    element_type* get() const _NOEXCEPT {return __ptr_;}
-    _LIBCPP_INLINE_VISIBILITY
-    typename add_lvalue_reference<element_type>::type operator*() const _NOEXCEPT
-        {return *__ptr_;}
-    _LIBCPP_INLINE_VISIBILITY
-    element_type* operator->() const _NOEXCEPT {return __ptr_;}
-    _LIBCPP_INLINE_VISIBILITY
-    long use_count() const _NOEXCEPT {return __cntrl_ ? __cntrl_->use_count() : 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool unique() const _NOEXCEPT {return use_count() == 1;}
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_EXPLICIT operator bool() const _NOEXCEPT {return get() != 0;}
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        bool owner_before(shared_ptr<_Up> const& __p) const
-        {return __cntrl_ < __p.__cntrl_;}
-    template <class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        bool owner_before(weak_ptr<_Up> const& __p) const
-        {return __cntrl_ < __p.__cntrl_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool
-    __owner_equivalent(const shared_ptr& __p) const
-        {return __cntrl_ == __p.__cntrl_;}
-
-#ifndef _LIBCPP_NO_RTTI
-    template <class _Dp>
-        _LIBCPP_INLINE_VISIBILITY
-        _Dp* __get_deleter() const _NOEXCEPT
-            {return (_Dp*)(__cntrl_ ? __cntrl_->__get_deleter(typeid(_Dp)) : 0);}
-#endif  // _LIBCPP_NO_RTTI
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template<class ..._Args>
-        static
-        shared_ptr<_Tp>
-        make_shared(_Args&& ...__args);
-
-    template<class _Alloc, class ..._Args>
-        static
-        shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a, _Args&& ...__args);
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-    static shared_ptr<_Tp> make_shared();
-
-    template<class _A0>
-        static shared_ptr<_Tp> make_shared(_A0&);
-
-    template<class _A0, class _A1>
-        static shared_ptr<_Tp> make_shared(_A0&, _A1&);
-
-    template<class _A0, class _A1, class _A2>
-        static shared_ptr<_Tp> make_shared(_A0&, _A1&, _A2&);
-
-    template<class _Alloc>
-        static shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a);
-
-    template<class _Alloc, class _A0>
-        static shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a, _A0& __a0);
-
-    template<class _Alloc, class _A0, class _A1>
-        static shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1);
-
-    template<class _Alloc, class _A0, class _A1, class _A2>
-        static shared_ptr<_Tp>
-        allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1, _A2& __a2);
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-private:
-
-    template <class _Yp>
-        _LIBCPP_INLINE_VISIBILITY
-        void
-        __enable_weak_this(const enable_shared_from_this<_Yp>* __e) _NOEXCEPT
-        {
-            if (__e)
-                __e->__weak_this_ = *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __enable_weak_this(const void*) _NOEXCEPT {}
-
-    template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY shared_ptr;
-    template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY weak_ptr;
-};
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-shared_ptr<_Tp>::shared_ptr() _NOEXCEPT
-    : __ptr_(0),
-      __cntrl_(0)
-{
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-shared_ptr<_Tp>::shared_ptr(nullptr_t) _NOEXCEPT
-    : __ptr_(0),
-      __cntrl_(0)
-{
-}
-
-template<class _Tp>
-template<class _Yp>
-shared_ptr<_Tp>::shared_ptr(_Yp* __p,
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type)
-    : __ptr_(__p)
-{
-    unique_ptr<_Yp> __hold(__p);
-    typedef __shared_ptr_pointer<_Yp*, default_delete<_Yp>, allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__p, default_delete<_Yp>(), allocator<_Yp>());
-    __hold.release();
-    __enable_weak_this(__p);
-}
-
-template<class _Tp>
-template<class _Yp, class _Dp>
-shared_ptr<_Tp>::shared_ptr(_Yp* __p, _Dp __d,
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type)
-    : __ptr_(__p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typedef __shared_ptr_pointer<_Yp*, _Dp, allocator<_Yp> > _CntrlBlk;
-        __cntrl_ = new _CntrlBlk(__p, __d, allocator<_Yp>());
-        __enable_weak_this(__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __d(__p);
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Tp>
-template<class _Dp>
-shared_ptr<_Tp>::shared_ptr(nullptr_t __p, _Dp __d)
-    : __ptr_(0)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typedef __shared_ptr_pointer<nullptr_t, _Dp, allocator<_Tp> > _CntrlBlk;
-        __cntrl_ = new _CntrlBlk(__p, __d, allocator<_Tp>());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __d(__p);
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Tp>
-template<class _Yp, class _Dp, class _Alloc>
-shared_ptr<_Tp>::shared_ptr(_Yp* __p, _Dp __d, _Alloc __a,
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type)
-    : __ptr_(__p)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typedef __shared_ptr_pointer<_Yp*, _Dp, _Alloc> _CntrlBlk;
-        typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _A2;
-        typedef __allocator_destructor<_A2> _D2;
-        _A2 __a2(__a);
-        unique_ptr<_CntrlBlk, _D2> __hold2(__a2.allocate(1), _D2(__a2, 1));
-        ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-            _CntrlBlk(__p, __d, __a);
-        __cntrl_ = _VSTD::addressof(*__hold2.release());
-        __enable_weak_this(__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __d(__p);
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Tp>
-template<class _Dp, class _Alloc>
-shared_ptr<_Tp>::shared_ptr(nullptr_t __p, _Dp __d, _Alloc __a)
-    : __ptr_(0)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typedef __shared_ptr_pointer<nullptr_t, _Dp, _Alloc> _CntrlBlk;
-        typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _A2;
-        typedef __allocator_destructor<_A2> _D2;
-        _A2 __a2(__a);
-        unique_ptr<_CntrlBlk, _D2> __hold2(__a2.allocate(1), _D2(__a2, 1));
-        ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-            _CntrlBlk(__p, __d, __a);
-        __cntrl_ = _VSTD::addressof(*__hold2.release());
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __d(__p);
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(const shared_ptr<_Yp>& __r, element_type *__p) _NOEXCEPT
-    : __ptr_(__p),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_shared();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(const shared_ptr& __r) _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_shared();
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(const shared_ptr<_Yp>& __r,
-                            typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type)
-         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_shared();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(shared_ptr&& __r) _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    __r.__ptr_ = 0;
-    __r.__cntrl_ = 0;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>::shared_ptr(shared_ptr<_Yp>&& __r,
-                            typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type)
-         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    __r.__ptr_ = 0;
-    __r.__cntrl_ = 0;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-template<class _Yp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-shared_ptr<_Tp>::shared_ptr(auto_ptr<_Yp>&& __r,
-#else
-shared_ptr<_Tp>::shared_ptr(auto_ptr<_Yp> __r,
-#endif
-                            typename enable_if<is_convertible<_Yp*, element_type*>::value, __nat>::type)
-    : __ptr_(__r.get())
-{
-    typedef __shared_ptr_pointer<_Yp*, default_delete<_Yp>, allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__r.get(), default_delete<_Yp>(), allocator<_Yp>());
-    __enable_weak_this(__r.get());
-    __r.release();
-}
-
-template<class _Tp>
-template <class _Yp, class _Dp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-shared_ptr<_Tp>::shared_ptr(unique_ptr<_Yp, _Dp>&& __r,
-#else
-shared_ptr<_Tp>::shared_ptr(unique_ptr<_Yp, _Dp> __r,
-#endif
-                            typename enable_if
-                            <
-                                !is_lvalue_reference<_Dp>::value &&
-                                !is_array<_Yp>::value &&
-                                is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                                __nat
-                            >::type)
-    : __ptr_(__r.get())
-{
-    typedef __shared_ptr_pointer<_Yp*, _Dp, allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__r.get(), __r.get_deleter(), allocator<_Yp>());
-    __enable_weak_this(__r.get());
-    __r.release();
-}
-
-template<class _Tp>
-template <class _Yp, class _Dp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-shared_ptr<_Tp>::shared_ptr(unique_ptr<_Yp, _Dp>&& __r,
-#else
-shared_ptr<_Tp>::shared_ptr(unique_ptr<_Yp, _Dp> __r,
-#endif
-                            typename enable_if
-                            <
-                                is_lvalue_reference<_Dp>::value &&
-                                !is_array<_Yp>::value &&
-                                is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, element_type*>::value,
-                                __nat
-                            >::type)
-    : __ptr_(__r.get())
-{
-    typedef __shared_ptr_pointer<_Yp*,
-                                 reference_wrapper<typename remove_reference<_Dp>::type>,
-                                 allocator<_Yp> > _CntrlBlk;
-    __cntrl_ = new _CntrlBlk(__r.get(), ref(__r.get_deleter()), allocator<_Yp>());
-    __enable_weak_this(__r.get());
-    __r.release();
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp>
-template<class ..._Args>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared(_Args&& ...__args)
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__a2.allocate(1), _D2(__a2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__a2, _VSTD::forward<_Args>(__args)...);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc, class ..._Args>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a, _Args&& ...__args)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _A2;
-    typedef __allocator_destructor<_A2> _D2;
-    _A2 __a2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__a2.allocate(1), _D2(__a2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a, _VSTD::forward<_Args>(__args)...);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared()
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__alloc2);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _A0>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared(_A0& __a0)
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__alloc2, __a0);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _A0, class _A1>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared(_A0& __a0, _A1& __a1)
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__alloc2, __a0, __a1);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _A0, class _A1, class _A2>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::make_shared(_A0& __a0, _A1& __a1, _A2& __a2)
-{
-    typedef __shared_ptr_emplace<_Tp, allocator<_Tp> > _CntrlBlk;
-    typedef allocator<_CntrlBlk> _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2;
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(__hold2.get()) _CntrlBlk(__alloc2, __a0, __a1, __a2);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = __hold2.release();
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc, class _A0>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a, _A0& __a0)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a, __a0);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc, class _A0, class _A1>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a, __a0, __a1);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-template<class _Tp>
-template<class _Alloc, class _A0, class _A1, class _A2>
-shared_ptr<_Tp>
-shared_ptr<_Tp>::allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    typedef __shared_ptr_emplace<_Tp, _Alloc> _CntrlBlk;
-    typedef typename __allocator_traits_rebind<_Alloc, _CntrlBlk>::type _Alloc2;
-    typedef __allocator_destructor<_Alloc2> _D2;
-    _Alloc2 __alloc2(__a);
-    unique_ptr<_CntrlBlk, _D2> __hold2(__alloc2.allocate(1), _D2(__alloc2, 1));
-    ::new(static_cast<void*>(_VSTD::addressof(*__hold2.get())))
-        _CntrlBlk(__a, __a0, __a1, __a2);
-    shared_ptr<_Tp> __r;
-    __r.__ptr_ = __hold2.get()->get();
-    __r.__cntrl_ = _VSTD::addressof(*__hold2.release());
-    __r.__enable_weak_this(__r.__ptr_);
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp>
-shared_ptr<_Tp>::~shared_ptr()
-{
-    if (__cntrl_)
-        __cntrl_->__release_shared();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>&
-shared_ptr<_Tp>::operator=(const shared_ptr& __r) _NOEXCEPT
-{
-    shared_ptr(__r).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(const shared_ptr<_Yp>& __r) _NOEXCEPT
-{
-    shared_ptr(__r).swap(*this);
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>&
-shared_ptr<_Tp>::operator=(shared_ptr&& __r) _NOEXCEPT
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(shared_ptr<_Yp>&& __r)
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Yp>::value &&
-    is_convertible<_Yp*, _Tp*>::value,
-    shared_ptr<_Tp>
->::type&
-shared_ptr<_Tp>::operator=(auto_ptr<_Yp>&& __r)
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template <class _Yp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Yp>::value &&
-    is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(unique_ptr<_Yp, _Dp>&& __r)
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Yp>::value &&
-    is_convertible<_Yp*, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(auto_ptr<_Yp> __r)
-{
-    shared_ptr(__r).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template <class _Yp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Yp>::value &&
-    is_convertible<typename unique_ptr<_Yp, _Dp>::pointer, _Tp*>::value,
-    shared_ptr<_Tp>&
->::type
-shared_ptr<_Tp>::operator=(unique_ptr<_Yp, _Dp> __r)
-{
-    shared_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-shared_ptr<_Tp>::swap(shared_ptr& __r) _NOEXCEPT
-{
-    _VSTD::swap(__ptr_, __r.__ptr_);
-    _VSTD::swap(__cntrl_, __r.__cntrl_);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-shared_ptr<_Tp>::reset() _NOEXCEPT
-{
-    shared_ptr().swap(*this);
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    void
->::type
-shared_ptr<_Tp>::reset(_Yp* __p)
-{
-    shared_ptr(__p).swap(*this);
-}
-
-template<class _Tp>
-template<class _Yp, class _Dp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    void
->::type
-shared_ptr<_Tp>::reset(_Yp* __p, _Dp __d)
-{
-    shared_ptr(__p, __d).swap(*this);
-}
-
-template<class _Tp>
-template<class _Yp, class _Dp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    void
->::type
-shared_ptr<_Tp>::reset(_Yp* __p, _Dp __d, _Alloc __a)
-{
-    shared_ptr(__p, __d, __a).swap(*this);
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp, class ..._Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Tp>::value,
-    shared_ptr<_Tp>
->::type
-make_shared(_Args&& ...__args)
-{
-    return shared_ptr<_Tp>::make_shared(_VSTD::forward<_Args>(__args)...);
-}
-
-template<class _Tp, class _Alloc, class ..._Args>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Tp>::value,
-    shared_ptr<_Tp>
->::type
-allocate_shared(const _Alloc& __a, _Args&& ...__args)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a, _VSTD::forward<_Args>(__args)...);
-}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-make_shared()
-{
-    return shared_ptr<_Tp>::make_shared();
-}
-
-template<class _Tp, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-make_shared(_A0& __a0)
-{
-    return shared_ptr<_Tp>::make_shared(__a0);
-}
-
-template<class _Tp, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-make_shared(_A0& __a0, _A1& __a1)
-{
-    return shared_ptr<_Tp>::make_shared(__a0, __a1);
-}
-
-template<class _Tp, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-make_shared(_A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return shared_ptr<_Tp>::make_shared(__a0, __a1, __a2);
-}
-
-template<class _Tp, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-allocate_shared(const _Alloc& __a)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a);
-}
-
-template<class _Tp, class _Alloc, class _A0>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-allocate_shared(const _Alloc& __a, _A0& __a0)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a, __a0);
-}
-
-template<class _Tp, class _Alloc, class _A0, class _A1>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a, __a0, __a1);
-}
-
-template<class _Tp, class _Alloc, class _A0, class _A1, class _A2>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-allocate_shared(const _Alloc& __a, _A0& __a0, _A1& __a1, _A2& __a2)
-{
-    return shared_ptr<_Tp>::allocate_shared(__a, __a0, __a1, __a2);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return __x.get() == __y.get();
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return !(__x == __y);
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    typedef typename common_type<_Tp*, _Up*>::type _V;
-    return less<_V>()(__x.get(), __y.get());
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return __y < __x;
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return !(__y < __x);
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const shared_ptr<_Tp>& __x, const shared_ptr<_Up>& __y) _NOEXCEPT
-{
-    return !(__x < __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return !__x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return !__x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return static_cast<bool>(__x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return static_cast<bool>(__x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return less<_Tp*>()(__x.get(), nullptr);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return less<_Tp*>()(nullptr, __x.get());
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return nullptr < __x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return __x < nullptr;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return !(nullptr < __x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return !(__x < nullptr);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const shared_ptr<_Tp>& __x, nullptr_t) _NOEXCEPT
-{
-    return !(__x < nullptr);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(nullptr_t, const shared_ptr<_Tp>& __x) _NOEXCEPT
-{
-    return !(nullptr < __x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(shared_ptr<_Tp>& __x, shared_ptr<_Tp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Tp>::value && !is_array<_Up>::value,
-    shared_ptr<_Tp>
->::type
-static_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
-{
-    return shared_ptr<_Tp>(__r, static_cast<_Tp*>(__r.get()));
-}
-
-template<class _Tp, class _Up>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_array<_Tp>::value && !is_array<_Up>::value,
-    shared_ptr<_Tp>
->::type
-dynamic_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
-{
-    _Tp* __p = dynamic_cast<_Tp*>(__r.get());
-    return __p ? shared_ptr<_Tp>(__r, __p) : shared_ptr<_Tp>();
-}
-
-template<class _Tp, class _Up>
-typename enable_if
-<
-    is_array<_Tp>::value == is_array<_Up>::value,
-    shared_ptr<_Tp>
->::type
-const_pointer_cast(const shared_ptr<_Up>& __r) _NOEXCEPT
-{
-    typedef typename remove_extent<_Tp>::type _RTp;
-    return shared_ptr<_Tp>(__r, const_cast<_RTp*>(__r.get()));
-}
-
-#ifndef _LIBCPP_NO_RTTI
-
-template<class _Dp, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Dp*
-get_deleter(const shared_ptr<_Tp>& __p) _NOEXCEPT
-{
-    return __p.template __get_deleter<_Dp>();
-}
-
-#endif  // _LIBCPP_NO_RTTI
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY weak_ptr
-{
-public:
-    typedef _Tp element_type;
-private:
-    element_type*        __ptr_;
-    __shared_weak_count* __cntrl_;
-
-public:
-    _LIBCPP_CONSTEXPR weak_ptr() _NOEXCEPT;
-    template<class _Yp> weak_ptr(shared_ptr<_Yp> const& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type = 0)
-                        _NOEXCEPT;
-    weak_ptr(weak_ptr const& __r) _NOEXCEPT;
-    template<class _Yp> weak_ptr(weak_ptr<_Yp> const& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type = 0)
-                         _NOEXCEPT;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    weak_ptr(weak_ptr&& __r) _NOEXCEPT;
-    template<class _Yp> weak_ptr(weak_ptr<_Yp>&& __r,
-                   typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type = 0)
-                         _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    ~weak_ptr();
-
-    weak_ptr& operator=(weak_ptr const& __r) _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            weak_ptr&
-        >::type
-        operator=(weak_ptr<_Yp> const& __r) _NOEXCEPT;
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    weak_ptr& operator=(weak_ptr&& __r) _NOEXCEPT;
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            weak_ptr&
-        >::type
-        operator=(weak_ptr<_Yp>&& __r) _NOEXCEPT;
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template<class _Yp>
-        typename enable_if
-        <
-            is_convertible<_Yp*, element_type*>::value,
-            weak_ptr&
-        >::type
-        operator=(shared_ptr<_Yp> const& __r) _NOEXCEPT;
-
-    void swap(weak_ptr& __r) _NOEXCEPT;
-    void reset() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    long use_count() const _NOEXCEPT
-        {return __cntrl_ ? __cntrl_->use_count() : 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool expired() const _NOEXCEPT
-        {return __cntrl_ == 0 || __cntrl_->use_count() == 0;}
-    shared_ptr<_Tp> lock() const _NOEXCEPT;
-    template<class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        bool owner_before(const shared_ptr<_Up>& __r) const
-        {return __cntrl_ < __r.__cntrl_;}
-    template<class _Up>
-        _LIBCPP_INLINE_VISIBILITY
-        bool owner_before(const weak_ptr<_Up>& __r) const
-        {return __cntrl_ < __r.__cntrl_;}
-
-    template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY weak_ptr;
-    template <class _Up> friend class _LIBCPP_TYPE_VIS_ONLY shared_ptr;
-};
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-weak_ptr<_Tp>::weak_ptr() _NOEXCEPT
-    : __ptr_(0),
-      __cntrl_(0)
-{
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(weak_ptr const& __r) _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_weak();
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(shared_ptr<_Yp> const& __r,
-                        typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type)
-                         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_weak();
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(weak_ptr<_Yp> const& __r,
-                        typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type)
-         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    if (__cntrl_)
-        __cntrl_->__add_weak();
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(weak_ptr&& __r) _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    __r.__ptr_ = 0;
-    __r.__cntrl_ = 0;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>::weak_ptr(weak_ptr<_Yp>&& __r,
-                        typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat*>::type)
-         _NOEXCEPT
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_)
-{
-    __r.__ptr_ = 0;
-    __r.__cntrl_ = 0;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-weak_ptr<_Tp>::~weak_ptr()
-{
-    if (__cntrl_)
-        __cntrl_->__release_weak();
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>&
-weak_ptr<_Tp>::operator=(weak_ptr const& __r) _NOEXCEPT
-{
-    weak_ptr(__r).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    weak_ptr<_Tp>&
->::type
-weak_ptr<_Tp>::operator=(weak_ptr<_Yp> const& __r) _NOEXCEPT
-{
-    weak_ptr(__r).swap(*this);
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-weak_ptr<_Tp>&
-weak_ptr<_Tp>::operator=(weak_ptr&& __r) _NOEXCEPT
-{
-    weak_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    weak_ptr<_Tp>&
->::type
-weak_ptr<_Tp>::operator=(weak_ptr<_Yp>&& __r) _NOEXCEPT
-{
-    weak_ptr(_VSTD::move(__r)).swap(*this);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _Tp>
-template<class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    is_convertible<_Yp*, _Tp*>::value,
-    weak_ptr<_Tp>&
->::type
-weak_ptr<_Tp>::operator=(shared_ptr<_Yp> const& __r) _NOEXCEPT
-{
-    weak_ptr(__r).swap(*this);
-    return *this;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-weak_ptr<_Tp>::swap(weak_ptr& __r) _NOEXCEPT
-{
-    _VSTD::swap(__ptr_, __r.__ptr_);
-    _VSTD::swap(__cntrl_, __r.__cntrl_);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(weak_ptr<_Tp>& __x, weak_ptr<_Tp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-weak_ptr<_Tp>::reset() _NOEXCEPT
-{
-    weak_ptr().swap(*this);
-}
-
-template<class _Tp>
-template<class _Yp>
-shared_ptr<_Tp>::shared_ptr(const weak_ptr<_Yp>& __r,
-                            typename enable_if<is_convertible<_Yp*, _Tp*>::value, __nat>::type)
-    : __ptr_(__r.__ptr_),
-      __cntrl_(__r.__cntrl_ ? __r.__cntrl_->lock() : __r.__cntrl_)
-{
-    if (__cntrl_ == 0)
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        throw bad_weak_ptr();
-#else
-        assert(!"bad_weak_ptr");
-#endif
-}
-
-template<class _Tp>
-shared_ptr<_Tp>
-weak_ptr<_Tp>::lock() const _NOEXCEPT
-{
-    shared_ptr<_Tp> __r;
-    __r.__cntrl_ = __cntrl_ ? __cntrl_->lock() : __cntrl_;
-    if (__r.__cntrl_)
-        __r.__ptr_ = __ptr_;
-    return __r;
-}
-
-template <class _Tp> struct owner_less;
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY owner_less<shared_ptr<_Tp> >
-    : binary_function<shared_ptr<_Tp>, shared_ptr<_Tp>, bool>
-{
-    typedef bool result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(shared_ptr<_Tp> const& __x, shared_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(shared_ptr<_Tp> const& __x,   weak_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(  weak_ptr<_Tp> const& __x, shared_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY owner_less<weak_ptr<_Tp> >
-    : binary_function<weak_ptr<_Tp>, weak_ptr<_Tp>, bool>
-{
-    typedef bool result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(  weak_ptr<_Tp> const& __x,   weak_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(shared_ptr<_Tp> const& __x,   weak_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(  weak_ptr<_Tp> const& __x, shared_ptr<_Tp> const& __y) const
-        {return __x.owner_before(__y);}
-};
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY enable_shared_from_this
-{
-    mutable weak_ptr<_Tp> __weak_this_;
-protected:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
-    enable_shared_from_this() _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY
-    enable_shared_from_this(enable_shared_from_this const&) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY
-    enable_shared_from_this& operator=(enable_shared_from_this const&) _NOEXCEPT
-        {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    ~enable_shared_from_this() {}
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_ptr<_Tp> shared_from_this()
-        {return shared_ptr<_Tp>(__weak_this_);}
-    _LIBCPP_INLINE_VISIBILITY
-    shared_ptr<_Tp const> shared_from_this() const
-        {return shared_ptr<const _Tp>(__weak_this_);}
-
-    template <class _Up> friend class shared_ptr;
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY hash<shared_ptr<_Tp> >
-{
-    typedef shared_ptr<_Tp>      argument_type;
-    typedef size_t               result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()(const argument_type& __ptr) const _NOEXCEPT
-    {
-        return hash<_Tp*>()(__ptr.get());
-    }
-};
-
-template<class _CharT, class _Traits, class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, shared_ptr<_Yp> const& __p);
-
-#if __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-
-class _LIBCPP_TYPE_VIS __sp_mut
-{
-    void* __lx;
-public:
-    void lock() _NOEXCEPT;
-    void unlock() _NOEXCEPT;
-
-private:
-    _LIBCPP_CONSTEXPR __sp_mut(void*) _NOEXCEPT;
-    __sp_mut(const __sp_mut&);
-    __sp_mut& operator=(const __sp_mut&);
-
-    friend _LIBCPP_FUNC_VIS __sp_mut& __get_sp_mut(const void*);
-};
-
-_LIBCPP_FUNC_VIS __sp_mut& __get_sp_mut(const void*);
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_is_lock_free(const shared_ptr<_Tp>*)
-{
-    return false;
-}
-
-template <class _Tp>
-shared_ptr<_Tp>
-atomic_load(const shared_ptr<_Tp>* __p)
-{
-    __sp_mut& __m = __get_sp_mut(__p);
-    __m.lock();
-    shared_ptr<_Tp> __q = *__p;
-    __m.unlock();
-    return __q;
-}
-  
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-atomic_load_explicit(const shared_ptr<_Tp>* __p, memory_order)
-{
-    return atomic_load(__p);
-}
-
-template <class _Tp>
-void
-atomic_store(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r)
-{
-    __sp_mut& __m = __get_sp_mut(__p);
-    __m.lock();
-    __p->swap(__r);
-    __m.unlock();
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-atomic_store_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r, memory_order)
-{
-    atomic_store(__p, __r);
-}
-
-template <class _Tp>
-shared_ptr<_Tp>
-atomic_exchange(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r)
-{
-    __sp_mut& __m = __get_sp_mut(__p);
-    __m.lock();
-    __p->swap(__r);
-    __m.unlock();
-    return __r;
-}
-  
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-shared_ptr<_Tp>
-atomic_exchange_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp> __r, memory_order)
-{
-    return atomic_exchange(__p, __r);
-}
-
-template <class _Tp>
-bool
-atomic_compare_exchange_strong(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v, shared_ptr<_Tp> __w)
-{
-    __sp_mut& __m = __get_sp_mut(__p);
-    __m.lock();
-    if (__p->__owner_equivalent(*__v))
-    {
-        *__p = __w;
-        __m.unlock();
-        return true;
-    }
-    *__v = *__p;
-    __m.unlock();
-    return false;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v, shared_ptr<_Tp> __w)
-{
-    return atomic_compare_exchange_strong(__p, __v, __w);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_strong_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v,
-                                        shared_ptr<_Tp> __w, memory_order, memory_order)
-{
-    return atomic_compare_exchange_strong(__p, __v, __w);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-atomic_compare_exchange_weak_explicit(shared_ptr<_Tp>* __p, shared_ptr<_Tp>* __v,
-                                      shared_ptr<_Tp> __w, memory_order, memory_order)
-{
-    return atomic_compare_exchange_weak(__p, __v, __w);
-}
-
-#endif  // __has_feature(cxx_atomic) && !defined(_LIBCPP_HAS_NO_THREADS)
-
-//enum class
-struct _LIBCPP_TYPE_VIS pointer_safety
-{
-    enum __lx
-    {
-        relaxed,
-        preferred,
-        strict
-    };
-
-    __lx __v_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    pointer_safety(__lx __v) : __v_(__v) {}
-    _LIBCPP_INLINE_VISIBILITY
-    operator int() const {return __v_;}
-};
-
-_LIBCPP_FUNC_VIS void declare_reachable(void* __p);
-_LIBCPP_FUNC_VIS void declare_no_pointers(char* __p, size_t __n);
-_LIBCPP_FUNC_VIS void undeclare_no_pointers(char* __p, size_t __n);
-_LIBCPP_FUNC_VIS pointer_safety get_pointer_safety() _NOEXCEPT;
-_LIBCPP_FUNC_VIS void* __undeclare_reachable(void* __p);
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-undeclare_reachable(_Tp* __p)
-{
-    return static_cast<_Tp*>(__undeclare_reachable(__p));
-}
-
-_LIBCPP_FUNC_VIS void* align(size_t __align, size_t __sz, void*& __ptr, size_t& __space);
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_MEMORY
diff --git a/include.new/c++/v1/tr1/mutex b/include.new/c++/v1/tr1/mutex
deleted file mode 100644
index e2a0daa..0000000
--- a/include.new/c++/v1/tr1/mutex
+++ /dev/null
@@ -1,571 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- mutex ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_MUTEX
-#define _LIBCPP_MUTEX
-
-/*
-    mutex synopsis
-
-namespace std
-{
-
-class mutex
-{
-public:
-     constexpr mutex() noexcept;
-     ~mutex();
-
-    mutex(const mutex&) = delete;
-    mutex& operator=(const mutex&) = delete;
-
-    void lock();
-    bool try_lock();
-    void unlock();
-
-    typedef pthread_mutex_t* native_handle_type;
-    native_handle_type native_handle();
-};
-
-class recursive_mutex
-{
-public:
-     recursive_mutex();
-     ~recursive_mutex();
-
-    recursive_mutex(const recursive_mutex&) = delete;
-    recursive_mutex& operator=(const recursive_mutex&) = delete;
-
-    void lock();
-    bool try_lock() noexcept;
-    void unlock();
-
-    typedef pthread_mutex_t* native_handle_type;
-    native_handle_type native_handle();
-};
-
-class timed_mutex
-{
-public:
-     timed_mutex();
-     ~timed_mutex();
-
-    timed_mutex(const timed_mutex&) = delete;
-    timed_mutex& operator=(const timed_mutex&) = delete;
-
-    void lock();
-    bool try_lock();
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-};
-
-class recursive_timed_mutex
-{
-public:
-     recursive_timed_mutex();
-     ~recursive_timed_mutex();
-
-    recursive_timed_mutex(const recursive_timed_mutex&) = delete;
-    recursive_timed_mutex& operator=(const recursive_timed_mutex&) = delete;
-
-    void lock();
-    bool try_lock() noexcept;
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-};
-
-struct defer_lock_t {};
-struct try_to_lock_t {};
-struct adopt_lock_t {};
-
-constexpr defer_lock_t  defer_lock{};
-constexpr try_to_lock_t try_to_lock{};
-constexpr adopt_lock_t  adopt_lock{};
-
-template <class Mutex>
-class lock_guard
-{
-public:
-    typedef Mutex mutex_type;
-
-    explicit lock_guard(mutex_type& m);
-    lock_guard(mutex_type& m, adopt_lock_t);
-    ~lock_guard();
-
-    lock_guard(lock_guard const&) = delete;
-    lock_guard& operator=(lock_guard const&) = delete;
-};
-
-template <class Mutex>
-class unique_lock
-{
-public:
-    typedef Mutex mutex_type;
-    unique_lock() noexcept;
-    explicit unique_lock(mutex_type& m);
-    unique_lock(mutex_type& m, defer_lock_t) noexcept;
-    unique_lock(mutex_type& m, try_to_lock_t);
-    unique_lock(mutex_type& m, adopt_lock_t);
-    template <class Clock, class Duration>
-        unique_lock(mutex_type& m, const chrono::time_point<Clock, Duration>& abs_time);
-    template <class Rep, class Period>
-        unique_lock(mutex_type& m, const chrono::duration<Rep, Period>& rel_time);
-    ~unique_lock();
-
-    unique_lock(unique_lock const&) = delete;
-    unique_lock& operator=(unique_lock const&) = delete;
-
-    unique_lock(unique_lock&& u) noexcept;
-    unique_lock& operator=(unique_lock&& u) noexcept;
-
-    void lock();
-    bool try_lock();
-
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-
-    void unlock();
-
-    void swap(unique_lock& u) noexcept;
-    mutex_type* release() noexcept;
-
-    bool owns_lock() const noexcept;
-    explicit operator bool () const noexcept;
-    mutex_type* mutex() const noexcept;
-};
-
-template <class Mutex>
-  void swap(unique_lock<Mutex>& x, unique_lock<Mutex>& y) noexcept;
-
-template <class L1, class L2, class... L3>
-  int try_lock(L1&, L2&, L3&...);
-template <class L1, class L2, class... L3>
-  void lock(L1&, L2&, L3&...);
-
-struct once_flag
-{
-    constexpr once_flag() noexcept;
-
-    once_flag(const once_flag&) = delete;
-    once_flag& operator=(const once_flag&) = delete;
-};
-
-template<class Callable, class ...Args>
-  void call_once(once_flag& flag, Callable&& func, Args&&... args);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__mutex_base>
-#include <functional>
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-#include <tuple>
-#endif
-#include <sched.h>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_THREADS
-
-class _LIBCPP_TYPE_VIS recursive_mutex
-{
-    pthread_mutex_t __m_;
-
-public:
-     recursive_mutex();
-     ~recursive_mutex();
-
-private:
-    recursive_mutex(const recursive_mutex&); // = delete;
-    recursive_mutex& operator=(const recursive_mutex&); // = delete;
-
-public:
-    void lock();
-    bool try_lock() _NOEXCEPT;
-    void unlock()  _NOEXCEPT;
-
-    typedef pthread_mutex_t* native_handle_type;
-    _LIBCPP_INLINE_VISIBILITY
-    native_handle_type native_handle() {return &__m_;}
-};
-
-class _LIBCPP_TYPE_VIS timed_mutex
-{
-    mutex              __m_;
-    condition_variable __cv_;
-    bool               __locked_;
-public:
-     timed_mutex();
-     ~timed_mutex();
-
-private:
-    timed_mutex(const timed_mutex&); // = delete;
-    timed_mutex& operator=(const timed_mutex&); // = delete;
-
-public:
-    void lock();
-    bool try_lock() _NOEXCEPT;
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        bool try_lock_for(const chrono::duration<_Rep, _Period>& __d)
-            {return try_lock_until(chrono::steady_clock::now() + __d);}
-    template <class _Clock, class _Duration>
-        bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);
-    void unlock() _NOEXCEPT;
-};
-
-template <class _Clock, class _Duration>
-bool
-timed_mutex::try_lock_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    using namespace chrono;
-    unique_lock<mutex> __lk(__m_);
-    bool no_timeout = _Clock::now() < __t;
-    while (no_timeout && __locked_)
-        no_timeout = __cv_.wait_until(__lk, __t) == cv_status::no_timeout;
-    if (!__locked_)
-    {
-        __locked_ = true;
-        return true;
-    }
-    return false;
-}
-
-class _LIBCPP_TYPE_VIS recursive_timed_mutex
-{
-    mutex              __m_;
-    condition_variable __cv_;
-    size_t             __count_;
-    pthread_t          __id_;
-public:
-     recursive_timed_mutex();
-     ~recursive_timed_mutex();
-
-private:
-    recursive_timed_mutex(const recursive_timed_mutex&); // = delete;
-    recursive_timed_mutex& operator=(const recursive_timed_mutex&); // = delete;
-
-public:
-    void lock();
-    bool try_lock() _NOEXCEPT;
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        bool try_lock_for(const chrono::duration<_Rep, _Period>& __d)
-            {return try_lock_until(chrono::steady_clock::now() + __d);}
-    template <class _Clock, class _Duration>
-        bool try_lock_until(const chrono::time_point<_Clock, _Duration>& __t);
-    void unlock() _NOEXCEPT;
-};
-
-template <class _Clock, class _Duration>
-bool
-recursive_timed_mutex::try_lock_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    using namespace chrono;
-    pthread_t __id = pthread_self();
-    unique_lock<mutex> lk(__m_);
-    if (pthread_equal(__id, __id_))
-    {
-        if (__count_ == numeric_limits<size_t>::max())
-            return false;
-        ++__count_;
-        return true;
-    }
-    bool no_timeout = _Clock::now() < __t;
-    while (no_timeout && __count_ != 0)
-        no_timeout = __cv_.wait_until(lk, __t) == cv_status::no_timeout;
-    if (__count_ == 0)
-    {
-        __count_ = 1;
-        __id_ = __id;
-        return true;
-    }
-    return false;
-}
-
-template <class _L0, class _L1>
-int
-try_lock(_L0& __l0, _L1& __l1)
-{
-    unique_lock<_L0> __u0(__l0, try_to_lock);
-    if (__u0.owns_lock())
-    {
-        if (__l1.try_lock())
-        {
-            __u0.release();
-            return -1;
-        }
-        else
-            return 1;
-    }
-    return 0;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _L0, class _L1, class _L2, class... _L3>
-int
-try_lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3&... __l3)
-{
-    int __r = 0;
-    unique_lock<_L0> __u0(__l0, try_to_lock);
-    if (__u0.owns_lock())
-    {
-        __r = try_lock(__l1, __l2, __l3...);
-        if (__r == -1)
-            __u0.release();
-        else
-            ++__r;
-    }
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _L0, class _L1>
-void
-lock(_L0& __l0, _L1& __l1)
-{
-    while (true)
-    {
-        {
-            unique_lock<_L0> __u0(__l0);
-            if (__l1.try_lock())
-            {
-                __u0.release();
-                break;
-            }
-        }
-        sched_yield();
-        {
-            unique_lock<_L1> __u1(__l1);
-            if (__l0.try_lock())
-            {
-                __u1.release();
-                break;
-            }
-        }
-        sched_yield();
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _L0, class _L1, class _L2, class ..._L3>
-void
-__lock_first(int __i, _L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)
-{
-    while (true)
-    {
-        switch (__i)
-        {
-        case 0:
-            {
-                unique_lock<_L0> __u0(__l0);
-                __i = try_lock(__l1, __l2, __l3...);
-                if (__i == -1)
-                {
-                    __u0.release();
-                    return;
-                }
-            }
-            ++__i;
-            sched_yield();
-            break;
-        case 1:
-            {
-                unique_lock<_L1> __u1(__l1);
-                __i = try_lock(__l2, __l3..., __l0);
-                if (__i == -1)
-                {
-                    __u1.release();
-                    return;
-                }
-            }
-            if (__i == sizeof...(_L3) + 1)
-                __i = 0;
-            else
-                __i += 2;
-            sched_yield();
-            break;
-        default:
-            __lock_first(__i - 2, __l2, __l3..., __l0, __l1);
-            return;
-        }
-    }
-}
-
-template <class _L0, class _L1, class _L2, class ..._L3>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-lock(_L0& __l0, _L1& __l1, _L2& __l2, _L3& ...__l3)
-{
-    __lock_first(0, __l0, __l1, __l2, __l3...);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-struct _LIBCPP_TYPE_VIS_ONLY once_flag;
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Callable, class... _Args>
-_LIBCPP_INLINE_VISIBILITY
-void call_once(once_flag&, _Callable&&, _Args&&...);
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Callable>
-_LIBCPP_INLINE_VISIBILITY
-void call_once(once_flag&, _Callable);
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-struct _LIBCPP_TYPE_VIS_ONLY once_flag
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR
-        once_flag() _NOEXCEPT : __state_(0) {}
-
-private:
-    once_flag(const once_flag&); // = delete;
-    once_flag& operator=(const once_flag&); // = delete;
-
-    unsigned long __state_;
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template<class _Callable, class... _Args>
-    friend
-    void call_once(once_flag&, _Callable&&, _Args&&...);
-#else  // _LIBCPP_HAS_NO_VARIADICS
-    template<class _Callable>
-    friend
-    void call_once(once_flag&, _Callable);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Fp>
-class __call_once_param
-{
-    _Fp __f_;
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __call_once_param(_Fp&& __f) : __f_(_VSTD::move(__f)) {}
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __call_once_param(const _Fp& __f) : __f_(__f) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()()
-    {
-        typedef typename __make_tuple_indices<tuple_size<_Fp>::value, 1>::type _Index;
-        __execute(_Index());
-    }
-
-private:
-    template <size_t ..._Indices>
-    _LIBCPP_INLINE_VISIBILITY
-    void __execute(__tuple_indices<_Indices...>)
-    {
-        __invoke(_VSTD::move(_VSTD::get<0>(__f_)), _VSTD::move(_VSTD::get<_Indices>(__f_))...);
-    }
-};
-
-#else
-
-template <class _Fp>
-class __call_once_param
-{
-    _Fp __f_;
-public:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __call_once_param(_Fp&& __f) : __f_(_VSTD::move(__f)) {}
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __call_once_param(const _Fp& __f) : __f_(__f) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()()
-    {
-        __f_();
-    }
-};
-
-#endif
-
-template <class _Fp>
-void
-__call_once_proxy(void* __vp)
-{
-    __call_once_param<_Fp>* __p = static_cast<__call_once_param<_Fp>*>(__vp);
-    (*__p)();
-}
-
-_LIBCPP_FUNC_VIS void __call_once(volatile unsigned long&, void*, void(*)(void*));
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Callable, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-call_once(once_flag& __flag, _Callable&& __func, _Args&&... __args)
-{
-    if (__flag.__state_ != ~0ul)
-    {
-        typedef tuple<typename decay<_Callable>::type, typename decay<_Args>::type...> _Gp;
-        __call_once_param<_Gp> __p(_Gp(__decay_copy(_VSTD::forward<_Callable>(__func)),
-                                __decay_copy(_VSTD::forward<_Args>(__args))...));
-        __call_once(__flag.__state_, &__p, &__call_once_proxy<_Gp>);
-    }
-}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template<class _Callable>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-call_once(once_flag& __flag, _Callable __func)
-{
-    if (__flag.__state_ != ~0ul)
-    {
-        __call_once_param<_Callable> __p(__func);
-        __call_once(__flag.__state_, &__p, &__call_once_proxy<_Callable>);
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_MUTEX
diff --git a/include.new/c++/v1/tr1/new b/include.new/c++/v1/tr1/new
deleted file mode 100644
index a710ed9..0000000
--- a/include.new/c++/v1/tr1/new
+++ /dev/null
@@ -1,170 +0,0 @@
-// -*- C++ -*-
-//===----------------------------- new ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_NEW
-#define _LIBCPP_NEW
-
-/*
-    new synopsis
-
-namespace std
-{
-
-class bad_alloc
-    : public exception
-{
-public:
-    bad_alloc() noexcept;
-    bad_alloc(const bad_alloc&) noexcept;
-    bad_alloc& operator=(const bad_alloc&) noexcept;
-    virtual const char* what() const noexcept;
-};
-
-class bad_array_length : public bad_alloc // C++14
-{
-public:
-    bad_array_length() noexcept;
-};
-
-class bad_array_new_length : public bad_alloc
-{
-public:
-    bad_array_new_length() noexcept;
-};
-
-struct nothrow_t {};
-extern const nothrow_t nothrow;
-typedef void (*new_handler)();
-new_handler set_new_handler(new_handler new_p) noexcept;
-new_handler get_new_handler() noexcept;
-
-}  // std
-
-void* operator new(std::size_t size);                                   // replaceable
-void* operator new(std::size_t size, const std::nothrow_t&) noexcept;   // replaceable
-void  operator delete(void* ptr) noexcept;                              // replaceable
-void  operator delete(void* ptr, const std::nothrow_t&) noexcept;       // replaceable
-
-void* operator new[](std::size_t size);                                 // replaceable
-void* operator new[](std::size_t size, const std::nothrow_t&) noexcept; // replaceable
-void  operator delete[](void* ptr) noexcept;                            // replaceable
-void  operator delete[](void* ptr, const std::nothrow_t&) noexcept;     // replaceable
-
-void* operator new  (std::size_t size, void* ptr) noexcept;
-void* operator new[](std::size_t size, void* ptr) noexcept;
-void  operator delete  (void* ptr, void*) noexcept;
-void  operator delete[](void* ptr, void*) noexcept;
-
-*/
-
-#include <__config>
-#include <exception>
-#include <cstddef>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-namespace std  // purposefully not using versioning namespace
-{
-
-class _LIBCPP_EXCEPTION_ABI bad_alloc
-    : public exception
-{
-public:
-    bad_alloc() _NOEXCEPT;
-    virtual ~bad_alloc() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI bad_array_new_length
-    : public bad_alloc
-{
-public:
-    bad_array_new_length() _NOEXCEPT;
-    virtual ~bad_array_new_length() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-#if defined(_LIBCPP_BUILDING_NEW) || (_LIBCPP_STD_VER > 11)
-
-class _LIBCPP_EXCEPTION_ABI bad_array_length
-    : public bad_alloc
-{
-public:
-    bad_array_length() _NOEXCEPT;
-    virtual ~bad_array_length() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-#define _LIBCPP_BAD_ARRAY_LENGTH_DEFINED
-
-#endif  // defined(_LIBCPP_BUILDING_NEW) || (_LIBCPP_STD_VER > 11)
-
-_LIBCPP_FUNC_VIS void __throw_bad_alloc();  // not in C++ spec
-
-struct _LIBCPP_TYPE_VIS nothrow_t {};
-extern _LIBCPP_FUNC_VIS const nothrow_t nothrow;
-typedef void (*new_handler)();
-_LIBCPP_FUNC_VIS new_handler set_new_handler(new_handler) _NOEXCEPT;
-_LIBCPP_FUNC_VIS new_handler get_new_handler() _NOEXCEPT;
-
-}  // std
-
-#if defined(_WIN32) && !defined(cxx_EXPORTS)
-# define _LIBCPP_NEW_DELETE_VIS _LIBCPP_FUNC_VIS_ONLY
-#else
-# define _LIBCPP_NEW_DELETE_VIS _LIBCPP_FUNC_VIS
-#endif
-
-_LIBCPP_NEW_DELETE_VIS void* operator new(std::size_t __sz)
-#if !__has_feature(cxx_noexcept)
-    throw(std::bad_alloc)
-#endif
-;
-_LIBCPP_NEW_DELETE_VIS void* operator new(std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
-_LIBCPP_NEW_DELETE_VIS void  operator delete(void* __p) _NOEXCEPT;
-_LIBCPP_NEW_DELETE_VIS void  operator delete(void* __p, const std::nothrow_t&) _NOEXCEPT;
-
-_LIBCPP_NEW_DELETE_VIS void* operator new[](std::size_t __sz)
-#if !__has_feature(cxx_noexcept)
-    throw(std::bad_alloc)
-#endif
-;
-_LIBCPP_NEW_DELETE_VIS void* operator new[](std::size_t __sz, const std::nothrow_t&) _NOEXCEPT _NOALIAS;
-_LIBCPP_NEW_DELETE_VIS void  operator delete[](void* __p) _NOEXCEPT;
-_LIBCPP_NEW_DELETE_VIS void  operator delete[](void* __p, const std::nothrow_t&) _NOEXCEPT;
-
-inline _LIBCPP_INLINE_VISIBILITY void* operator new  (std::size_t, void* __p) _NOEXCEPT {return __p;}
-inline _LIBCPP_INLINE_VISIBILITY void* operator new[](std::size_t, void* __p) _NOEXCEPT {return __p;}
-inline _LIBCPP_INLINE_VISIBILITY void  operator delete  (void*, void*) _NOEXCEPT {}
-inline _LIBCPP_INLINE_VISIBILITY void  operator delete[](void*, void*) _NOEXCEPT {}
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-inline _LIBCPP_INLINE_VISIBILITY void *__allocate(size_t __size) {
-#ifdef _LIBCPP_HAS_NO_BUILTIN_OPERATOR_NEW_DELETE
-  return ::operator new(__size);
-#else
-  return __builtin_operator_new(__size);
-#endif
-}
-
-inline _LIBCPP_INLINE_VISIBILITY void __deallocate(void *__ptr) {
-#ifdef _LIBCPP_HAS_NO_BUILTIN_OPERATOR_NEW_DELETE
-  ::operator delete(__ptr);
-#else
-  __builtin_operator_delete(__ptr);
-#endif
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_NEW
diff --git a/include.new/c++/v1/tr1/numeric b/include.new/c++/v1/tr1/numeric
deleted file mode 100644
index 21c3781..0000000
--- a/include.new/c++/v1/tr1/numeric
+++ /dev/null
@@ -1,197 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- numeric ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_NUMERIC
-#define _LIBCPP_NUMERIC
-
-/*
-    numeric synopsis
-
-namespace std
-{
-
-template <class InputIterator, class T>
-    T
-    accumulate(InputIterator first, InputIterator last, T init);
-
-template <class InputIterator, class T, class BinaryOperation>
-    T
-    accumulate(InputIterator first, InputIterator last, T init, BinaryOperation binary_op);
-
-template <class InputIterator1, class InputIterator2, class T>
-    T
-    inner_product(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2, T init);
-
-template <class InputIterator1, class InputIterator2, class T, class BinaryOperation1, class BinaryOperation2>
-    T
-    inner_product(InputIterator1 first1, InputIterator1 last1, InputIterator2 first2,
-                  T init, BinaryOperation1 binary_op1, BinaryOperation2 binary_op2);
-
-template <class InputIterator, class OutputIterator>
-    OutputIterator
-    partial_sum(InputIterator first, InputIterator last, OutputIterator result);
-
-template <class InputIterator, class OutputIterator, class BinaryOperation>
-    OutputIterator
-    partial_sum(InputIterator first, InputIterator last, OutputIterator result, BinaryOperation binary_op);
-
-template <class InputIterator, class OutputIterator>
-    OutputIterator
-    adjacent_difference(InputIterator first, InputIterator last, OutputIterator result);
-
-template <class InputIterator, class OutputIterator, class BinaryOperation>
-    OutputIterator
-    adjacent_difference(InputIterator first, InputIterator last, OutputIterator result, BinaryOperation binary_op);
-
-template <class ForwardIterator, class T>
-    void iota(ForwardIterator first, ForwardIterator last, T value);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iterator>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _InputIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-accumulate(_InputIterator __first, _InputIterator __last, _Tp __init)
-{
-    for (; __first != __last; ++__first)
-        __init = __init + *__first;
-    return __init;
-}
-
-template <class _InputIterator, class _Tp, class _BinaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-accumulate(_InputIterator __first, _InputIterator __last, _Tp __init, _BinaryOperation __binary_op)
-{
-    for (; __first != __last; ++__first)
-        __init = __binary_op(__init, *__first);
-    return __init;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2, _Tp __init)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        __init = __init + *__first1 * *__first2;
-    return __init;
-}
-
-template <class _InputIterator1, class _InputIterator2, class _Tp, class _BinaryOperation1, class _BinaryOperation2>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-inner_product(_InputIterator1 __first1, _InputIterator1 __last1, _InputIterator2 __first2,
-              _Tp __init, _BinaryOperation1 __binary_op1, _BinaryOperation2 __binary_op2)
-{
-    for (; __first1 != __last1; ++__first1, (void) ++__first2)
-        __init = __binary_op1(__init, __binary_op2(*__first1, *__first2));
-    return __init;
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t(*__first);
-        *__result = __t;
-        for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result)
-        {
-            __t = __t + *__first;
-            *__result = __t;
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-partial_sum(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
-              _BinaryOperation __binary_op)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t(*__first);
-        *__result = __t;
-        for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result)
-        {
-            __t = __binary_op(__t, *__first);
-            *__result = __t;
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator, class _OutputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterator __result)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t1(*__first);
-        *__result = __t1;
-        for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result)
-        {
-            typename iterator_traits<_InputIterator>::value_type __t2(*__first);
-            *__result = __t2 - __t1;
-            __t1 = _VSTD::move(__t2);
-        }
-    }
-    return __result;
-}
-
-template <class _InputIterator, class _OutputIterator, class _BinaryOperation>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-adjacent_difference(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
-                      _BinaryOperation __binary_op)
-{
-    if (__first != __last)
-    {
-        typename iterator_traits<_InputIterator>::value_type __t1(*__first);
-        *__result = __t1;
-        for (++__first, (void) ++__result; __first != __last; ++__first, (void) ++__result)
-        {
-            typename iterator_traits<_InputIterator>::value_type __t2(*__first);
-            *__result = __binary_op(__t2, __t1);
-            __t1 = _VSTD::move(__t2);
-        }
-    }
-    return __result;
-}
-
-template <class _ForwardIterator, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value_)
-{
-    for (; __first != __last; ++__first, (void) ++__value_)
-        *__first = __value_;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_NUMERIC
diff --git a/include.new/c++/v1/tr1/ostream b/include.new/c++/v1/tr1/ostream
deleted file mode 100644
index a7af299..0000000
--- a/include.new/c++/v1/tr1/ostream
+++ /dev/null
@@ -1,1113 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- ostream -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_OSTREAM
-#define _LIBCPP_OSTREAM
-
-/*
-    ostream synopsis
-
-template <class charT, class traits = char_traits<charT> >
-class basic_ostream
-    : virtual public basic_ios<charT,traits>
-{
-public:
-    // types (inherited from basic_ios (27.5.4)):
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.7.2.2 Constructor/destructor:
-    explicit basic_ostream(basic_streambuf<char_type,traits>* sb);
-    basic_ostream(basic_ostream&& rhs);
-    virtual ~basic_ostream();
-
-    // 27.7.2.3 Assign/swap
-    basic_ostream& operator=(const basic_ostream& rhs) = delete; // C++14
-    basic_ostream& operator=(basic_ostream&& rhs);
-    void swap(basic_ostream& rhs);
-
-    // 27.7.2.4 Prefix/suffix:
-    class sentry;
-
-    // 27.7.2.6 Formatted output:
-    basic_ostream& operator<<(basic_ostream& (*pf)(basic_ostream&));
-    basic_ostream& operator<<(basic_ios<charT, traits>& (*pf)(basic_ios<charT,traits>&));
-    basic_ostream& operator<<(ios_base& (*pf)(ios_base&));
-    basic_ostream& operator<<(bool n);
-    basic_ostream& operator<<(short n);
-    basic_ostream& operator<<(unsigned short n);
-    basic_ostream& operator<<(int n);
-    basic_ostream& operator<<(unsigned int n);
-    basic_ostream& operator<<(long n);
-    basic_ostream& operator<<(unsigned long n);
-    basic_ostream& operator<<(long long n);
-    basic_ostream& operator<<(unsigned long long n);
-    basic_ostream& operator<<(float f);
-    basic_ostream& operator<<(double f);
-    basic_ostream& operator<<(long double f);
-    basic_ostream& operator<<(const void* p);
-    basic_ostream& operator<<(basic_streambuf<char_type,traits>* sb);
-
-    // 27.7.2.7 Unformatted output:
-    basic_ostream& put(char_type c);
-    basic_ostream& write(const char_type* s, streamsize n);
-    basic_ostream& flush();
-
-    // 27.7.2.5 seeks:
-    pos_type tellp();
-    basic_ostream& seekp(pos_type);
-    basic_ostream& seekp(off_type, ios_base::seekdir);
-protected:
-    basic_ostream(const basic_ostream& rhs) = delete;
-    basic_ostream(basic_ostream&& rhs);
-    // 27.7.3.3 Assign/swap
-    basic_ostream& operator=(basic_ostream& rhs) = delete;
-    basic_ostream& operator=(const basic_ostream&& rhs);
-    void swap(basic_ostream& rhs);
-};
-
-// 27.7.2.6.4 character inserters
-
-template<class charT, class traits>
-  basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>&, charT);
-
-template<class charT, class traits>
-  basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>&, char);
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, char);
-
-// signed and unsigned
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, signed char);
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, unsigned char);
-
-// NTBS
-template<class charT, class traits>
-  basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>&, const charT*);
-
-template<class charT, class traits>
-  basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>&, const char*);
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, const char*);
-
-// signed and unsigned
-template<class traits>
-basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, const signed char*);
-
-template<class traits>
-  basic_ostream<char,traits>& operator<<(basic_ostream<char,traits>&, const unsigned char*);
-
-// swap:
-template <class charT, class traits>
-  void swap(basic_ostream<charT, traits>& x, basic_ostream<charT, traits>& y);
-
-template <class charT, class traits>
-  basic_ostream<charT,traits>& endl(basic_ostream<charT,traits>& os);
-
-template <class charT, class traits>
-  basic_ostream<charT,traits>& ends(basic_ostream<charT,traits>& os);
-
-template <class charT, class traits>
-  basic_ostream<charT,traits>& flush(basic_ostream<charT,traits>& os);
-
-// rvalue stream insertion
-template <class charT, class traits, class T>
-  basic_ostream<charT, traits>&
-  operator<<(basic_ostream<charT, traits>&& os, const T& x);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ios>
-#include <streambuf>
-#include <locale>
-#include <iterator>
-#include <bitset>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ostream
-    : virtual public basic_ios<_CharT, _Traits>
-{
-public:
-    // types (inherited from basic_ios (27.5.4)):
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    // 27.7.2.2 Constructor/destructor:
-    explicit basic_ostream(basic_streambuf<char_type, traits_type>* __sb);
-    virtual ~basic_ostream();
-protected:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream(basic_ostream&& __rhs);
-#endif
-
-    // 27.7.2.3 Assign/swap
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream& operator=(basic_ostream&& __rhs);
-#endif
-    void swap(basic_ostream& __rhs);
-
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    basic_ostream           (const basic_ostream& __rhs) = delete;
-    basic_ostream& operator=(const basic_ostream& __rhs) = delete;
-#else
-    basic_ostream           (const basic_ostream& __rhs); // not defined
-    basic_ostream& operator=(const basic_ostream& __rhs); // not defined
-#endif
-public:
-
-    // 27.7.2.4 Prefix/suffix:
-    class _LIBCPP_TYPE_VIS_ONLY sentry;
-
-    // 27.7.2.6 Formatted output:
-    basic_ostream& operator<<(basic_ostream& (*__pf)(basic_ostream&));
-    basic_ostream& operator<<(basic_ios<char_type, traits_type>&
-                              (*__pf)(basic_ios<char_type,traits_type>&));
-    basic_ostream& operator<<(ios_base& (*__pf)(ios_base&));
-    basic_ostream& operator<<(bool __n);
-    basic_ostream& operator<<(short __n);
-    basic_ostream& operator<<(unsigned short __n);
-    basic_ostream& operator<<(int __n);
-    basic_ostream& operator<<(unsigned int __n);
-    basic_ostream& operator<<(long __n);
-    basic_ostream& operator<<(unsigned long __n);
-    basic_ostream& operator<<(long long __n);
-    basic_ostream& operator<<(unsigned long long __n);
-    basic_ostream& operator<<(float __f);
-    basic_ostream& operator<<(double __f);
-    basic_ostream& operator<<(long double __f);
-    basic_ostream& operator<<(const void* __p);
-    basic_ostream& operator<<(basic_streambuf<char_type, traits_type>* __sb);
-
-    // 27.7.2.7 Unformatted output:
-    basic_ostream& put(char_type __c);
-    basic_ostream& write(const char_type* __s, streamsize __n);
-    basic_ostream& flush();
-
-    // 27.7.2.5 seeks:
-    pos_type tellp();
-    basic_ostream& seekp(pos_type __pos);
-    basic_ostream& seekp(off_type __off, ios_base::seekdir __dir);
-
-protected:
-    _LIBCPP_ALWAYS_INLINE
-    basic_ostream() {}  // extension, intentially does not initialize
-};
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_ostream<_CharT, _Traits>::sentry
-{
-    bool __ok_;
-    basic_ostream<_CharT, _Traits>& __os_;
-
-    sentry(const sentry&); // = delete;
-    sentry& operator=(const sentry&); // = delete;
-
-public:
-    explicit sentry(basic_ostream<_CharT, _Traits>& __os);
-    ~sentry();
-
-    _LIBCPP_ALWAYS_INLINE
-        _LIBCPP_EXPLICIT
-        operator bool() const {return __ok_;}
-};
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>::sentry::sentry(basic_ostream<_CharT, _Traits>& __os)
-    : __ok_(false),
-      __os_(__os)
-{
-    if (__os.good())
-    {
-        if (__os.tie())
-            __os.tie()->flush();
-        __ok_ = true;
-    }
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>::sentry::~sentry()
-{
-    if (__os_.rdbuf() && __os_.good() && (__os_.flags() & ios_base::unitbuf)
-                      && !uncaught_exception())
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            if (__os_.rdbuf()->pubsync() == -1)
-                __os_.setstate(ios_base::badbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>::basic_ostream(basic_streambuf<char_type, traits_type>* __sb)
-{
-    this->init(__sb);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>::basic_ostream(basic_ostream&& __rhs)
-{
-    this->move(__rhs);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator=(basic_ostream&& __rhs)
-{
-    swap(__rhs);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>::~basic_ostream()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ostream<_CharT, _Traits>::swap(basic_ostream& __rhs)
-{
-    basic_ios<char_type, traits_type>::swap(__rhs);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(basic_ostream& (*__pf)(basic_ostream&))
-{
-    return __pf(*this);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(basic_ios<char_type, traits_type>&
-                                           (*__pf)(basic_ios<char_type,traits_type>&))
-{
-    __pf(*this);
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(ios_base& (*__pf)(ios_base&))
-{
-    __pf(*this);
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(basic_streambuf<char_type, traits_type>* __sb)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            if (__sb)
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                try
-                {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    typedef istreambuf_iterator<_CharT, _Traits> _Ip;
-                    typedef ostreambuf_iterator<_CharT, _Traits> _Op;
-                    _Ip __i(__sb);
-                    _Ip __eof;
-                    _Op __o(*this);
-                    size_t __c = 0;
-                    for (; __i != __eof; ++__i, ++__o, ++__c)
-                    {
-                        *__o = *__i;
-                        if (__o.failed())
-                            break;
-                    }
-                    if (__c == 0)
-                        this->setstate(ios_base::failbit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                }
-                catch (...)
-                {
-                    this->__set_failbit_and_consider_rethrow();
-                }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            }
-            else
-                this->setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(bool __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(short __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            ios_base::fmtflags __flags = ios_base::flags() & ios_base::basefield;
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(),
-                        __flags == ios_base::oct || __flags == ios_base::hex ?
-                        static_cast<long>(static_cast<unsigned short>(__n))  :
-                        static_cast<long>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(unsigned short __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), static_cast<unsigned long>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(int __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            ios_base::fmtflags __flags = ios_base::flags() & ios_base::basefield;
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(),
-                        __flags == ios_base::oct || __flags == ios_base::hex ?
-                        static_cast<long>(static_cast<unsigned int>(__n))  :
-                        static_cast<long>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(unsigned int __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), static_cast<unsigned long>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(long __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(unsigned long __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(long long __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(unsigned long long __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(float __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), static_cast<double>(__n)).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(double __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(long double __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::operator<<(const void* __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef num_put<char_type, ostreambuf_iterator<char_type, traits_type> > _Fp;
-            const _Fp& __f = use_facet<_Fp>(this->getloc());
-            if (__f.put(*this, *this, this->fill(), __n).failed())
-                this->setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-__put_character_sequence(basic_ostream<_CharT, _Traits>& __os,
-                          const _CharT* __str, size_t __len)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
-            if (__pad_and_output(_Ip(__os),
-                                 __str,
-                                 (__os.flags() & ios_base::adjustfield) == ios_base::left ?
-                                     __str + __len :
-                                     __str,
-                                 __str + __len,
-                                 __os,
-                                 __os.fill()).failed())
-                __os.setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, _CharT __c)
-{
-    return _VSTD::__put_character_sequence(__os, &__c, 1);
-}
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, char __cn)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            _CharT __c = __os.widen(__cn);
-            typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
-            if (__pad_and_output(_Ip(__os),
-                                 &__c,
-                                 (__os.flags() & ios_base::adjustfield) == ios_base::left ?
-                                     &__c + 1 :
-                                     &__c,
-                                 &__c + 1,
-                                 __os,
-                                 __os.fill()).failed())
-                __os.setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, char __c)
-{
-    return _VSTD::__put_character_sequence(__os, &__c, 1);
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, signed char __c)
-{
-    return _VSTD::__put_character_sequence(__os, (char *) &__c, 1);
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, unsigned char __c)
-{
-    return _VSTD::__put_character_sequence(__os, (char *) &__c, 1);
-}
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const _CharT* __str)
-{
-    return _VSTD::__put_character_sequence(__os, __str, _Traits::length(__str));
-}
-
-template<class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const char* __strn)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        typename basic_ostream<_CharT, _Traits>::sentry __s(__os);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Ip;
-            size_t __len = char_traits<char>::length(__strn);
-            const int __bs = 100;
-            _CharT __wbb[__bs];
-            _CharT* __wb = __wbb;
-            unique_ptr<_CharT, void(*)(void*)> __h(0, free);
-            if (__len > __bs)
-            {
-                __wb = (_CharT*)malloc(__len*sizeof(_CharT));
-                if (__wb == 0)
-                    __throw_bad_alloc();
-                __h.reset(__wb);
-            }
-            for (_CharT* __p = __wb; *__strn != '\0'; ++__strn, ++__p)
-                *__p = __os.widen(*__strn);
-            if (__pad_and_output(_Ip(__os),
-                                 __wb,
-                                 (__os.flags() & ios_base::adjustfield) == ios_base::left ?
-                                     __wb + __len :
-                                     __wb,
-                                 __wb + __len,
-                                 __os,
-                                 __os.fill()).failed())
-                __os.setstate(ios_base::badbit | ios_base::failbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        __os.__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __os;
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, const char* __str)
-{
-    return _VSTD::__put_character_sequence(__os, __str, _Traits::length(__str));
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, const signed char* __str)
-{
-    const char *__s = (const char *) __str;
-    return _VSTD::__put_character_sequence(__os, __s, _Traits::length(__s));
-}
-
-template<class _Traits>
-basic_ostream<char, _Traits>&
-operator<<(basic_ostream<char, _Traits>& __os, const unsigned char* __str)
-{
-    const char *__s = (const char *) __str;
-    return _VSTD::__put_character_sequence(__os, __s, _Traits::length(__s));
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::put(char_type __c)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __s(*this);
-        if (__s)
-        {
-            typedef ostreambuf_iterator<_CharT, _Traits> _Op;
-            _Op __o(*this);
-            *__o = __c;
-            if (__o.failed())
-                this->setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::write(const char_type* __s, streamsize __n)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        sentry __sen(*this);
-        if (__sen && __n)
-        {
-            if (this->rdbuf()->sputn(__s, __n) != __n)
-                this->setstate(ios_base::badbit);
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::flush()
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if (this->rdbuf())
-        {
-            sentry __s(*this);
-            if (__s)
-            {
-                if (this->rdbuf()->pubsync() == -1)
-                    this->setstate(ios_base::badbit);
-            }
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        this->__set_badbit_and_consider_rethrow();
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_ostream<_CharT, _Traits>::pos_type
-basic_ostream<_CharT, _Traits>::tellp()
-{
-    if (this->fail())
-        return pos_type(-1);
-    return this->rdbuf()->pubseekoff(0, ios_base::cur, ios_base::out);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::seekp(pos_type __pos)
-{
-    sentry __s(*this);
-    if (__s)
-    {
-        if (this->rdbuf()->pubseekpos(__pos, ios_base::out) == pos_type(-1))
-            this->setstate(ios_base::failbit);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-basic_ostream<_CharT, _Traits>::seekp(off_type __off, ios_base::seekdir __dir)
-{
-    sentry __s(*this);
-    if (__s)
-    {
-        if (this->rdbuf()->pubseekoff(__off, __dir, ios_base::out) == pos_type(-1))
-            this->setstate(ios_base::failbit);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-endl(basic_ostream<_CharT, _Traits>& __os)
-{
-    __os.put(__os.widen('\n'));
-    __os.flush();
-    return __os;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-ends(basic_ostream<_CharT, _Traits>& __os)
-{
-    __os.put(_CharT());
-    return __os;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-flush(basic_ostream<_CharT, _Traits>& __os)
-{
-    __os.flush();
-    return __os;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Stream, class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    !is_lvalue_reference<_Stream>::value &&
-    is_base_of<ios_base, _Stream>::value,
-    _Stream&&
->::type
-operator<<(_Stream&& __os, const _Tp& __x)
-{
-    __os << __x;
-    return _VSTD::move(__os);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const basic_string<_CharT, _Traits, _Allocator>& __str)
-{
-    return _VSTD::__put_character_sequence(__os, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const error_code& __ec)
-{
-    return __os << __ec.category().name() << ':' << __ec.value();
-}
-
-template<class _CharT, class _Traits, class _Yp>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, shared_ptr<_Yp> const& __p)
-{
-    return __os << __p.get();
-}
-
-template <class _CharT, class _Traits, size_t _Size>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const bitset<_Size>& __x)
-{
-    return __os << __x.template to_string<_CharT, _Traits>
-                        (use_facet<ctype<_CharT> >(__os.getloc()).widen('0'),
-                         use_facet<ctype<_CharT> >(__os.getloc()).widen('1'));
-}
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ostream<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ostream<wchar_t>)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_OSTREAM
diff --git a/include.new/c++/v1/tr1/queue b/include.new/c++/v1/tr1/queue
deleted file mode 100644
index bdfd706..0000000
--- a/include.new/c++/v1/tr1/queue
+++ /dev/null
@@ -1,717 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- queue ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_QUEUE
-#define _LIBCPP_QUEUE
-
-/*
-    queue synopsis
-
-namespace std
-{
-
-template <class T, class Container = deque<T>>
-class queue
-{
-public:
-    typedef Container                                container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-
-public:
-    queue() = default;
-    ~queue() = default;
-
-    queue(const queue& q) = default;
-    queue(queue&& q) = default;
-
-    queue& operator=(const queue& q) = default;
-    queue& operator=(queue&& q) = default;
-
-    explicit queue(const container_type& c);
-    explicit queue(container_type&& c)
-    template <class Alloc>
-        explicit queue(const Alloc& a);
-    template <class Alloc>
-        queue(const container_type& c, const Alloc& a);
-    template <class Alloc>
-        queue(container_type&& c, const Alloc& a);
-    template <class Alloc>
-        queue(const queue& q, const Alloc& a);
-    template <class Alloc>
-        queue(queue&& q, const Alloc& a);
-
-    bool      empty() const;
-    size_type size() const;
-
-    reference       front();
-    const_reference front() const;
-    reference       back();
-    const_reference back() const;
-
-    void push(const value_type& v);
-    void push(value_type&& v);
-    template <class... Args> void emplace(Args&&... args);
-    void pop();
-
-    void swap(queue& q) noexcept(noexcept(swap(c, q.c)));
-};
-
-template <class T, class Container>
-  bool operator==(const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator< (const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator!=(const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator> (const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator>=(const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  bool operator<=(const queue<T, Container>& x,const queue<T, Container>& y);
-
-template <class T, class Container>
-  void swap(queue<T, Container>& x, queue<T, Container>& y)
-  noexcept(noexcept(x.swap(y)));
-
-template <class T, class Container = vector<T>,
-          class Compare = less<typename Container::value_type>>
-class priority_queue
-{
-public:
-    typedef Container                                container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-    Compare comp;
-
-public:
-    priority_queue() = default;
-    ~priority_queue() = default;
-
-    priority_queue(const priority_queue& q) = default;
-    priority_queue(priority_queue&& q) = default;
-
-    priority_queue& operator=(const priority_queue& q) = default;
-    priority_queue& operator=(priority_queue&& q) = default;
-
-    explicit priority_queue(const Compare& comp);
-    priority_queue(const Compare& comp, const container_type& c);
-    explicit priority_queue(const Compare& comp, container_type&& c);
-    template <class InputIterator>
-        priority_queue(InputIterator first, InputIterator last,
-                       const Compare& comp = Compare());
-    template <class InputIterator>
-        priority_queue(InputIterator first, InputIterator last,
-                       const Compare& comp, const container_type& c);
-    template <class InputIterator>
-        priority_queue(InputIterator first, InputIterator last,
-                       const Compare& comp, container_type&& c);
-    template <class Alloc>
-        explicit priority_queue(const Alloc& a);
-    template <class Alloc>
-        priority_queue(const Compare& comp, const Alloc& a);
-    template <class Alloc>
-        priority_queue(const Compare& comp, const container_type& c,
-                       const Alloc& a);
-    template <class Alloc>
-        priority_queue(const Compare& comp, container_type&& c,
-                       const Alloc& a);
-    template <class Alloc>
-        priority_queue(const priority_queue& q, const Alloc& a);
-    template <class Alloc>
-        priority_queue(priority_queue&& q, const Alloc& a);
-
-    bool            empty() const;
-    size_type       size() const;
-    const_reference top() const;
-
-    void push(const value_type& v);
-    void push(value_type&& v);
-    template <class... Args> void emplace(Args&&... args);
-    void pop();
-
-    void swap(priority_queue& q)
-        noexcept(noexcept(swap(c, q.c)) && noexcept(swap(comp.q.comp)));
-};
-
-template <class T, class Container, class Compare>
-  void swap(priority_queue<T, Container, Compare>& x,
-            priority_queue<T, Container, Compare>& y)
-            noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <deque>
-#include <vector>
-#include <functional>
-#include <algorithm>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _Container> class _LIBCPP_TYPE_VIS_ONLY queue;
-
-template <class _Tp, class _Container>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y);
-
-template <class _Tp, class _Container>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y);
-
-template <class _Tp, class _Container = deque<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY queue
-{
-public:
-    typedef _Container                               container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    queue()
-        _NOEXCEPT_(is_nothrow_default_constructible<container_type>::value)
-        : c() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    queue(const queue& __q) : c(__q.c) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    queue(queue&& __q)
-        _NOEXCEPT_(is_nothrow_move_constructible<container_type>::value)
-        : c(_VSTD::move(__q.c)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    queue& operator=(const queue& __q) {c = __q.c; return *this;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    queue& operator=(queue&& __q)
-        _NOEXCEPT_(is_nothrow_move_assignable<container_type>::value)
-        {c = _VSTD::move(__q.c); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit queue(const container_type& __c)  : c(__c) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit queue(container_type&& __c) : c(_VSTD::move(__c)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit queue(const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(__a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        queue(const queue& __q, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(__q.c, __a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        queue(const container_type& __c, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(__c, __a) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        queue(container_type&& __c, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(_VSTD::move(__c), __a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        queue(queue&& __q, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(_VSTD::move(__q.c), __a) {}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const {return c.empty();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const  {return c.size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference       front()       {return c.front();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference front() const {return c.front();}
-    _LIBCPP_INLINE_VISIBILITY
-    reference       back()        {return c.back();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference back() const  {return c.back();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void push(const value_type& __v) {c.push_back(__v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void push(value_type&& __v)      {c.push_back(_VSTD::move(__v));}
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void emplace(_Args&&... __args)
-            {c.emplace_back(_VSTD::forward<_Args>(__args)...);}
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void pop() {c.pop_front();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(queue& __q)
-        _NOEXCEPT_(__is_nothrow_swappable<container_type>::value)
-    {
-        using _VSTD::swap;
-        swap(c, __q.c);
-    }
-
-    template <class _T1, class _C1>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    bool
-    operator==(const queue<_T1, _C1>& __x,const queue<_T1, _C1>& __y);
-
-    template <class _T1, class _C1>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    bool
-    operator< (const queue<_T1, _C1>& __x,const queue<_T1, _C1>& __y);
-};
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return __x.c == __y.c;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return __x.c < __y.c;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const queue<_Tp, _Container>& __x,const queue<_Tp, _Container>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(queue<_Tp, _Container>& __x, queue<_Tp, _Container>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Tp, class _Container, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<queue<_Tp, _Container>, _Alloc>
-    : public uses_allocator<_Container, _Alloc>
-{
-};
-
-template <class _Tp, class _Container = vector<_Tp>,
-          class _Compare = less<typename _Container::value_type> >
-class _LIBCPP_TYPE_VIS_ONLY priority_queue
-{
-public:
-    typedef _Container                               container_type;
-    typedef _Compare                                 value_compare;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-    value_compare comp;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue()
-        _NOEXCEPT_(is_nothrow_default_constructible<container_type>::value &&
-                   is_nothrow_default_constructible<value_compare>::value)
-        : c(), comp() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue(const priority_queue& __q) : c(__q.c), comp(__q.comp) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue(priority_queue&& __q)
-        _NOEXCEPT_(is_nothrow_move_constructible<container_type>::value &&
-                   is_nothrow_move_constructible<value_compare>::value)
-        : c(_VSTD::move(__q.c)), comp(_VSTD::move(__q.comp)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue& operator=(const priority_queue& __q)
-        {c = __q.c; comp = __q.comp; return *this;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    priority_queue& operator=(priority_queue&& __q)
-        _NOEXCEPT_(is_nothrow_move_assignable<container_type>::value &&
-                   is_nothrow_move_assignable<value_compare>::value)
-        {c = _VSTD::move(__q.c); comp = _VSTD::move(__q.comp); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit priority_queue(const value_compare& __comp)
-        : c(), comp(__comp) {}
-    priority_queue(const value_compare& __comp, const container_type& __c);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    explicit priority_queue(const value_compare& __comp, container_type&& __c);
-#endif
-    template <class _InputIter>
-        priority_queue(_InputIter __f, _InputIter __l,
-                       const value_compare& __comp = value_compare());
-    template <class _InputIter>
-        priority_queue(_InputIter __f, _InputIter __l,
-                       const value_compare& __comp, const container_type& __c);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIter>
-        priority_queue(_InputIter __f, _InputIter __l,
-                       const value_compare& __comp, container_type&& __c);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        explicit priority_queue(const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-    template <class _Alloc>
-        priority_queue(const value_compare& __comp, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-    template <class _Alloc>
-        priority_queue(const value_compare& __comp, const container_type& __c,
-                       const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-    template <class _Alloc>
-        priority_queue(const priority_queue& __q, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        priority_queue(const value_compare& __comp, container_type&& __c,
-                       const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-    template <class _Alloc>
-        priority_queue(priority_queue&& __q, const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool            empty() const {return c.empty();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type       size() const  {return c.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference top() const   {return c.front();}
-
-    void push(const value_type& __v);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void push(value_type&& __v);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args> void emplace(_Args&&... __args);
-#endif
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void pop();
-
-    void swap(priority_queue& __q)
-        _NOEXCEPT_(__is_nothrow_swappable<container_type>::value &&
-                   __is_nothrow_swappable<value_compare>::value);
-};
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const _Compare& __comp,
-                                                          const container_type& __c)
-    : c(__c),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const value_compare& __comp,
-                                                          container_type&& __c)
-    : c(_VSTD::move(__c)),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(_InputIter __f, _InputIter __l,
-                                                          const value_compare& __comp)
-    : c(__f, __l),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(_InputIter __f, _InputIter __l,
-                                                          const value_compare& __comp,
-                                                          const container_type& __c)
-    : c(__c),
-      comp(__comp)
-{
-    c.insert(c.end(), __f, __l);
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-template <class _InputIter>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(_InputIter __f, _InputIter __l,
-                                                          const value_compare& __comp,
-                                                          container_type&& __c)
-    : c(_VSTD::move(__c)),
-      comp(__comp)
-{
-    c.insert(c.end(), __f, __l);
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(__a)
-{
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const value_compare& __comp,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(__a),
-      comp(__comp)
-{
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const value_compare& __comp,
-                                                          const container_type& __c,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(__c, __a),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const priority_queue& __q,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(__q.c, __a),
-      comp(__q.comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(const value_compare& __comp,
-                                                          container_type&& __c,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(_VSTD::move(__c), __a),
-      comp(__comp)
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-template <class _Tp, class _Container, class _Compare>
-template <class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-priority_queue<_Tp, _Container, _Compare>::priority_queue(priority_queue&& __q,
-                                                          const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type*)
-    : c(_VSTD::move(__q.c), __a),
-      comp(_VSTD::move(__q.comp))
-{
-    _VSTD::make_heap(c.begin(), c.end(), comp);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::push(const value_type& __v)
-{
-    c.push_back(__v);
-    _VSTD::push_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::push(value_type&& __v)
-{
-    c.push_back(_VSTD::move(__v));
-    _VSTD::push_heap(c.begin(), c.end(), comp);
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Container, class _Compare>
-template <class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::emplace(_Args&&... __args)
-{
-    c.emplace_back(_VSTD::forward<_Args>(__args)...);
-    _VSTD::push_heap(c.begin(), c.end(), comp);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::pop()
-{
-    _VSTD::pop_heap(c.begin(), c.end(), comp);
-    c.pop_back();
-}
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-priority_queue<_Tp, _Container, _Compare>::swap(priority_queue& __q)
-        _NOEXCEPT_(__is_nothrow_swappable<container_type>::value &&
-                   __is_nothrow_swappable<value_compare>::value)
-{
-    using _VSTD::swap;
-    swap(c, __q.c);
-    swap(comp, __q.comp);
-}
-
-template <class _Tp, class _Container, class _Compare>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(priority_queue<_Tp, _Container, _Compare>& __x,
-     priority_queue<_Tp, _Container, _Compare>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Tp, class _Container, class _Compare, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<priority_queue<_Tp, _Container, _Compare>, _Alloc>
-    : public uses_allocator<_Container, _Alloc>
-{
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_QUEUE
diff --git a/include.new/c++/v1/tr1/random b/include.new/c++/v1/tr1/random
deleted file mode 100644
index a8d21a2..0000000
--- a/include.new/c++/v1/tr1/random
+++ /dev/null
@@ -1,6728 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- random -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_RANDOM
-#define _LIBCPP_RANDOM
-
-/*
-    random synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-// Engines
-
-template <class UIntType, UIntType a, UIntType c, UIntType m>
-class linear_congruential_engine
-{
-public:
-    // types
-    typedef UIntType result_type;
-
-    // engine characteristics
-    static constexpr result_type multiplier = a;
-    static constexpr result_type increment = c;
-    static constexpr result_type modulus = m;
-    static constexpr result_type min() { return c == 0u ? 1u: 0u;}
-    static constexpr result_type max() { return m - 1u;}
-    static constexpr result_type default_seed = 1u;
-
-    // constructors and seeding functions
-    explicit linear_congruential_engine(result_type s = default_seed);
-    template<class Sseq> explicit linear_congruential_engine(Sseq& q);
-    void seed(result_type s = default_seed);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-};
-
-template <class UIntType, UIntType a, UIntType c, UIntType m>
-bool
-operator==(const linear_congruential_engine<UIntType, a, c, m>& x,
-           const linear_congruential_engine<UIntType, a, c, m>& y);
-
-template <class UIntType, UIntType a, UIntType c, UIntType m>
-bool
-operator!=(const linear_congruential_engine<UIntType, a, c, m>& x,
-           const linear_congruential_engine<UIntType, a, c, m>& y);
-
-template <class charT, class traits,
-          class UIntType, UIntType a, UIntType c, UIntType m>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const linear_congruential_engine<UIntType, a, c, m>& x);
-
-template <class charT, class traits,
-          class UIntType, UIntType a, UIntType c, UIntType m>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           linear_congruential_engine<UIntType, a, c, m>& x);
-
-template <class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-class mersenne_twister_engine
-{
-public:
-    // types
-    typedef UIntType result_type;
-
-    // engine characteristics
-    static constexpr size_t word_size = w;
-    static constexpr size_t state_size = n;
-    static constexpr size_t shift_size = m;
-    static constexpr size_t mask_bits = r;
-    static constexpr result_type xor_mask = a;
-    static constexpr size_t tempering_u = u;
-    static constexpr result_type tempering_d = d;
-    static constexpr size_t tempering_s = s;
-    static constexpr result_type tempering_b = b;
-    static constexpr size_t tempering_t = t;
-    static constexpr result_type tempering_c = c;
-    static constexpr size_t tempering_l = l;
-    static constexpr result_type initialization_multiplier = f;
-    static constexpr result_type min () { return 0; }
-    static constexpr result_type max() { return 2^w - 1; }
-    static constexpr result_type default_seed = 5489u;
-
-    // constructors and seeding functions
-    explicit mersenne_twister_engine(result_type value = default_seed);
-    template<class Sseq> explicit mersenne_twister_engine(Sseq& q);
-    void seed(result_type value = default_seed);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-};
-
-template <class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-bool
-operator==(
-    const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& x,
-    const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& y);
-
-template <class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-bool
-operator!=(
-    const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& x,
-    const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& y);
-
-template <class charT, class traits,
-          class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& x);
-
-template <class charT, class traits,
-          class UIntType, size_t w, size_t n, size_t m, size_t r,
-          UIntType a, size_t u, UIntType d, size_t s,
-          UIntType b, size_t t, UIntType c, size_t l, UIntType f>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           mersenne_twister_engine<UIntType, w, n, m, r, a, u, d, s, b, t, c, l, f>& x);
-
-template<class UIntType, size_t w, size_t s, size_t r>
-class subtract_with_carry_engine
-{
-public:
-    // types
-    typedef UIntType result_type;
-
-    // engine characteristics
-    static constexpr size_t word_size = w;
-    static constexpr size_t short_lag = s;
-    static constexpr size_t long_lag = r;
-    static constexpr result_type min() { return 0; }
-    static constexpr result_type max() { return m-1; }
-    static constexpr result_type default_seed = 19780503u;
-
-    // constructors and seeding functions
-    explicit subtract_with_carry_engine(result_type value = default_seed);
-    template<class Sseq> explicit subtract_with_carry_engine(Sseq& q);
-    void seed(result_type value = default_seed);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-};
-
-template<class UIntType, size_t w, size_t s, size_t r>
-bool
-operator==(
-    const subtract_with_carry_engine<UIntType, w, s, r>& x,
-    const subtract_with_carry_engine<UIntType, w, s, r>& y);
-
-template<class UIntType, size_t w, size_t s, size_t r>
-bool
-operator!=(
-    const subtract_with_carry_engine<UIntType, w, s, r>& x,
-    const subtract_with_carry_engine<UIntType, w, s, r>& y);
-
-template <class charT, class traits,
-          class UIntType, size_t w, size_t s, size_t r>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const subtract_with_carry_engine<UIntType, w, s, r>& x);
-
-template <class charT, class traits,
-          class UIntType, size_t w, size_t s, size_t r>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           subtract_with_carry_engine<UIntType, w, s, r>& x);
-
-template<class Engine, size_t p, size_t r>
-class discard_block_engine
-{
-public:
-    // types
-    typedef typename Engine::result_type result_type;
-
-    // engine characteristics
-    static constexpr size_t block_size = p;
-    static constexpr size_t used_block = r;
-    static constexpr result_type min() { return Engine::min(); }
-    static constexpr result_type max() { return Engine::max(); }
-
-    // constructors and seeding functions
-    discard_block_engine();
-    explicit discard_block_engine(const Engine& e);
-    explicit discard_block_engine(Engine&& e);
-    explicit discard_block_engine(result_type s);
-    template<class Sseq> explicit discard_block_engine(Sseq& q);
-    void seed();
-    void seed(result_type s);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-
-    // property functions
-    const Engine& base() const noexcept;
-};
-
-template<class Engine, size_t p, size_t r>
-bool
-operator==(
-    const discard_block_engine<Engine, p, r>& x,
-    const discard_block_engine<Engine, p, r>& y);
-
-template<class Engine, size_t p, size_t r>
-bool
-operator!=(
-    const discard_block_engine<Engine, p, r>& x,
-    const discard_block_engine<Engine, p, r>& y);
-
-template <class charT, class traits,
-          class Engine, size_t p, size_t r>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const discard_block_engine<Engine, p, r>& x);
-
-template <class charT, class traits,
-          class Engine, size_t p, size_t r>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           discard_block_engine<Engine, p, r>& x);
-
-template<class Engine, size_t w, class UIntType>
-class independent_bits_engine
-{
-public:
-    // types
-    typedef UIntType result_type;
-
-    // engine characteristics
-    static constexpr result_type min() { return 0; }
-    static constexpr result_type max() { return 2^w - 1; }
-
-    // constructors and seeding functions
-    independent_bits_engine();
-    explicit independent_bits_engine(const Engine& e);
-    explicit independent_bits_engine(Engine&& e);
-    explicit independent_bits_engine(result_type s);
-    template<class Sseq> explicit independent_bits_engine(Sseq& q);
-    void seed();
-    void seed(result_type s);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()(); void discard(unsigned long long z);
-
-    // property functions
-    const Engine& base() const noexcept;
-};
-
-template<class Engine, size_t w, class UIntType>
-bool
-operator==(
-    const independent_bits_engine<Engine, w, UIntType>& x,
-    const independent_bits_engine<Engine, w, UIntType>& y);
-
-template<class Engine, size_t w, class UIntType>
-bool
-operator!=(
-    const independent_bits_engine<Engine, w, UIntType>& x,
-    const independent_bits_engine<Engine, w, UIntType>& y);
-
-template <class charT, class traits,
-          class Engine, size_t w, class UIntType>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const independent_bits_engine<Engine, w, UIntType>& x);
-
-template <class charT, class traits,
-          class Engine, size_t w, class UIntType>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           independent_bits_engine<Engine, w, UIntType>& x);
-
-template<class Engine, size_t k>
-class shuffle_order_engine
-{
-public:
-    // types
-    typedef typename Engine::result_type result_type;
-
-    // engine characteristics
-    static constexpr size_t table_size = k;
-    static constexpr result_type min() { return Engine::min; }
-    static constexpr result_type max() { return Engine::max; }
-
-    // constructors and seeding functions
-    shuffle_order_engine();
-    explicit shuffle_order_engine(const Engine& e);
-    explicit shuffle_order_engine(Engine&& e);
-    explicit shuffle_order_engine(result_type s);
-    template<class Sseq> explicit shuffle_order_engine(Sseq& q);
-    void seed();
-    void seed(result_type s);
-    template<class Sseq> void seed(Sseq& q);
-
-    // generating functions
-    result_type operator()();
-    void discard(unsigned long long z);
-
-    // property functions
-    const Engine& base() const noexcept;
-};
-
-template<class Engine, size_t k>
-bool
-operator==(
-    const shuffle_order_engine<Engine, k>& x,
-    const shuffle_order_engine<Engine, k>& y);
-
-template<class Engine, size_t k>
-bool
-operator!=(
-    const shuffle_order_engine<Engine, k>& x,
-    const shuffle_order_engine<Engine, k>& y);
-
-template <class charT, class traits,
-          class Engine, size_t k>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os,
-           const shuffle_order_engine<Engine, k>& x);
-
-template <class charT, class traits,
-          class Engine, size_t k>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is,
-           shuffle_order_engine<Engine, k>& x);
-
-typedef linear_congruential_engine<uint_fast32_t, 16807, 0, 2147483647>
-                                                                   minstd_rand0;
-typedef linear_congruential_engine<uint_fast32_t, 48271, 0, 2147483647>
-                                                                    minstd_rand;
-typedef mersenne_twister_engine<uint_fast32_t, 32, 624, 397, 31,
-                                0x9908b0df,
-                                11, 0xffffffff,
-                                7,  0x9d2c5680,
-                                15, 0xefc60000,
-                                18, 1812433253>                         mt19937;
-typedef mersenne_twister_engine<uint_fast64_t, 64, 312, 156, 31,
-                                0xb5026f5aa96619e9,
-                                29, 0x5555555555555555,
-                                17, 0x71d67fffeda60000,
-                                37, 0xfff7eee000000000,
-                                43, 6364136223846793005>             mt19937_64;
-typedef subtract_with_carry_engine<uint_fast32_t, 24, 10, 24>     ranlux24_base;
-typedef subtract_with_carry_engine<uint_fast64_t, 48,  5, 12>     ranlux48_base;
-typedef discard_block_engine<ranlux24_base, 223, 23>                   ranlux24;
-typedef discard_block_engine<ranlux48_base, 389, 11>                   ranlux48;
-typedef shuffle_order_engine<minstd_rand0, 256>                         knuth_b;
-typedef minstd_rand                                       default_random_engine;
-
-// Generators
-
-class random_device
-{
-public:
-    // types
-    typedef unsigned int result_type;
-
-    // generator characteristics
-    static constexpr result_type min() { return numeric_limits<result_type>::min(); }
-    static constexpr result_type max() { return numeric_limits<result_type>::max(); }
-
-    // constructors
-    explicit random_device(const string& token = "/dev/urandom");
-
-    // generating functions
-    result_type operator()();
-
-    // property functions
-    double entropy() const noexcept;
-
-    // no copy functions
-    random_device(const random_device& ) = delete;
-    void operator=(const random_device& ) = delete;
-};
-
-// Utilities
-
-class seed_seq
-{
-public:
-    // types
-    typedef uint_least32_t result_type;
-
-    // constructors
-    seed_seq();
-    template<class T>
-        seed_seq(initializer_list<T> il);
-    template<class InputIterator>
-        seed_seq(InputIterator begin, InputIterator end);
-
-    // generating functions
-    template<class RandomAccessIterator>
-        void generate(RandomAccessIterator begin, RandomAccessIterator end);
-
-    // property functions
-    size_t size() const;
-    template<class OutputIterator>
-        void param(OutputIterator dest) const;
-
-    // no copy functions
-    seed_seq(const seed_seq&) = delete;
-    void operator=(const seed_seq& ) = delete;
-};
-
-template<class RealType, size_t bits, class URNG>
-    RealType generate_canonical(URNG& g);
-
-// Distributions
-
-template<class IntType = int>
-class uniform_int_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef uniform_int_distribution distribution_type;
-
-        explicit param_type(IntType a = 0,
-                                    IntType b = numeric_limits<IntType>::max());
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit uniform_int_distribution(IntType a = 0,
-                                    IntType b = numeric_limits<IntType>::max());
-    explicit uniform_int_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const uniform_int_distribution& x,
-                           const uniform_int_distribution& y);
-    friend bool operator!=(const uniform_int_distribution& x,
-                           const uniform_int_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const uniform_int_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               uniform_int_distribution& x);
-};
-
-template<class RealType = double>
-class uniform_real_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef uniform_real_distribution distribution_type;
-
-        explicit param_type(RealType a = 0,
-                            RealType b = 1);
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit uniform_real_distribution(RealType a = 0.0, RealType b = 1.0);
-    explicit uniform_real_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const uniform_real_distribution& x,
-                           const uniform_real_distribution& y);
-    friend bool operator!=(const uniform_real_distribution& x,
-                           const uniform_real_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const uniform_real_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               uniform_real_distribution& x);
-};
-
-class bernoulli_distribution
-{
-public:
-    // types
-    typedef bool result_type;
-
-    class param_type
-    {
-    public:
-        typedef bernoulli_distribution distribution_type;
-
-        explicit param_type(double p = 0.5);
-
-        double p() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit bernoulli_distribution(double p = 0.5);
-    explicit bernoulli_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    double p() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const bernoulli_distribution& x,
-                           const bernoulli_distribution& y);
-    friend bool operator!=(const bernoulli_distribution& x,
-                           const bernoulli_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const bernoulli_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               bernoulli_distribution& x);
-};
-
-template<class IntType = int>
-class binomial_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef binomial_distribution distribution_type;
-
-        explicit param_type(IntType t = 1, double p = 0.5);
-
-        IntType t() const;
-        double p() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit binomial_distribution(IntType t = 1, double p = 0.5);
-    explicit binomial_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    IntType t() const;
-    double p() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const binomial_distribution& x,
-                           const binomial_distribution& y);
-    friend bool operator!=(const binomial_distribution& x,
-                           const binomial_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const binomial_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               binomial_distribution& x);
-};
-
-template<class IntType = int>
-class geometric_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef geometric_distribution distribution_type;
-
-        explicit param_type(double p = 0.5);
-
-        double p() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit geometric_distribution(double p = 0.5);
-    explicit geometric_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    double p() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const geometric_distribution& x,
-                           const geometric_distribution& y);
-    friend bool operator!=(const geometric_distribution& x,
-                           const geometric_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const geometric_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               geometric_distribution& x);
-};
-
-template<class IntType = int>
-class negative_binomial_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef negative_binomial_distribution distribution_type;
-
-        explicit param_type(result_type k = 1, double p = 0.5);
-
-        result_type k() const;
-        double p() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit negative_binomial_distribution(result_type k = 1, double p = 0.5);
-    explicit negative_binomial_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type k() const;
-    double p() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const negative_binomial_distribution& x,
-                           const negative_binomial_distribution& y);
-    friend bool operator!=(const negative_binomial_distribution& x,
-                           const negative_binomial_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const negative_binomial_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               negative_binomial_distribution& x);
-};
-
-template<class IntType = int>
-class poisson_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef poisson_distribution distribution_type;
-
-        explicit param_type(double mean = 1.0);
-
-        double mean() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit poisson_distribution(double mean = 1.0);
-    explicit poisson_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    double mean() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const poisson_distribution& x,
-                           const poisson_distribution& y);
-    friend bool operator!=(const poisson_distribution& x,
-                           const poisson_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const poisson_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               poisson_distribution& x);
-};
-
-template<class RealType = double>
-class exponential_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef exponential_distribution distribution_type;
-
-        explicit param_type(result_type lambda = 1.0);
-
-        result_type lambda() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit exponential_distribution(result_type lambda = 1.0);
-    explicit exponential_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type lambda() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const exponential_distribution& x,
-                           const exponential_distribution& y);
-    friend bool operator!=(const exponential_distribution& x,
-                           const exponential_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const exponential_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               exponential_distribution& x);
-};
-
-template<class RealType = double>
-class gamma_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef gamma_distribution distribution_type;
-
-        explicit param_type(result_type alpha = 1, result_type beta = 1);
-
-        result_type alpha() const;
-        result_type beta() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit gamma_distribution(result_type alpha = 1, result_type beta = 1);
-    explicit gamma_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type alpha() const;
-    result_type beta() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const gamma_distribution& x,
-                           const gamma_distribution& y);
-    friend bool operator!=(const gamma_distribution& x,
-                           const gamma_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const gamma_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               gamma_distribution& x);
-};
-
-template<class RealType = double>
-class weibull_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef weibull_distribution distribution_type;
-
-        explicit param_type(result_type alpha = 1, result_type beta = 1);
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit weibull_distribution(result_type a = 1, result_type b = 1);
-    explicit weibull_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const weibull_distribution& x,
-                           const weibull_distribution& y);
-    friend bool operator!=(const weibull_distribution& x,
-                           const weibull_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const weibull_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               weibull_distribution& x);
-};
-
-template<class RealType = double>
-class extreme_value_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef extreme_value_distribution distribution_type;
-
-        explicit param_type(result_type a = 0, result_type b = 1);
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit extreme_value_distribution(result_type a = 0, result_type b = 1);
-    explicit extreme_value_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const extreme_value_distribution& x,
-                           const extreme_value_distribution& y);
-    friend bool operator!=(const extreme_value_distribution& x,
-                           const extreme_value_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const extreme_value_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               extreme_value_distribution& x);
-};
-
-template<class RealType = double>
-class normal_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef normal_distribution distribution_type;
-
-        explicit param_type(result_type mean = 0, result_type stddev = 1);
-
-        result_type mean() const;
-        result_type stddev() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructors and reset functions
-    explicit normal_distribution(result_type mean = 0, result_type stddev = 1);
-    explicit normal_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type mean() const;
-    result_type stddev() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const normal_distribution& x,
-                           const normal_distribution& y);
-    friend bool operator!=(const normal_distribution& x,
-                           const normal_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const normal_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               normal_distribution& x);
-};
-
-template<class RealType = double>
-class lognormal_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef lognormal_distribution distribution_type;
-
-        explicit param_type(result_type m = 0, result_type s = 1);
-
-        result_type m() const;
-        result_type s() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit lognormal_distribution(result_type m = 0, result_type s = 1);
-    explicit lognormal_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type m() const;
-    result_type s() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const lognormal_distribution& x,
-                           const lognormal_distribution& y);
-    friend bool operator!=(const lognormal_distribution& x,
-                           const lognormal_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const lognormal_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               lognormal_distribution& x);
-};
-
-template<class RealType = double>
-class chi_squared_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef chi_squared_distribution distribution_type;
-
-        explicit param_type(result_type n = 1);
-
-        result_type n() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit chi_squared_distribution(result_type n = 1);
-    explicit chi_squared_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type n() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const chi_squared_distribution& x,
-                           const chi_squared_distribution& y);
-    friend bool operator!=(const chi_squared_distribution& x,
-                           const chi_squared_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const chi_squared_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               chi_squared_distribution& x);
-};
-
-template<class RealType = double>
-class cauchy_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef cauchy_distribution distribution_type;
-
-        explicit param_type(result_type a = 0, result_type b = 1);
-
-        result_type a() const;
-        result_type b() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit cauchy_distribution(result_type a = 0, result_type b = 1);
-    explicit cauchy_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type a() const;
-    result_type b() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const cauchy_distribution& x,
-                           const cauchy_distribution& y);
-    friend bool operator!=(const cauchy_distribution& x,
-                           const cauchy_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const cauchy_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               cauchy_distribution& x);
-};
-
-template<class RealType = double>
-class fisher_f_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef fisher_f_distribution distribution_type;
-
-        explicit param_type(result_type m = 1, result_type n = 1);
-
-        result_type m() const;
-        result_type n() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit fisher_f_distribution(result_type m = 1, result_type n = 1);
-    explicit fisher_f_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type m() const;
-    result_type n() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const fisher_f_distribution& x,
-                           const fisher_f_distribution& y);
-    friend bool operator!=(const fisher_f_distribution& x,
-                           const fisher_f_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const fisher_f_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               fisher_f_distribution& x);
-};
-
-template<class RealType = double>
-class student_t_distribution
-{
-public:
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef student_t_distribution distribution_type;
-
-        explicit param_type(result_type n = 1);
-
-        result_type n() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    explicit student_t_distribution(result_type n = 1);
-    explicit student_t_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    result_type n() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const student_t_distribution& x,
-                           const student_t_distribution& y);
-    friend bool operator!=(const student_t_distribution& x,
-                           const student_t_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const student_t_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               student_t_distribution& x);
-};
-
-template<class IntType = int>
-class discrete_distribution
-{
-public:
-    // types
-    typedef IntType result_type;
-
-    class param_type
-    {
-    public:
-        typedef discrete_distribution distribution_type;
-
-        param_type();
-        template<class InputIterator>
-            param_type(InputIterator firstW, InputIterator lastW);
-        param_type(initializer_list<double> wl);
-        template<class UnaryOperation>
-            param_type(size_t nw, double xmin, double xmax, UnaryOperation fw);
-
-        vector<double> probabilities() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    discrete_distribution();
-    template<class InputIterator>
-        discrete_distribution(InputIterator firstW, InputIterator lastW);
-    discrete_distribution(initializer_list<double> wl);
-    template<class UnaryOperation>
-        discrete_distribution(size_t nw, double xmin, double xmax,
-                              UnaryOperation fw);
-    explicit discrete_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    vector<double> probabilities() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const discrete_distribution& x,
-                           const discrete_distribution& y);
-    friend bool operator!=(const discrete_distribution& x,
-                           const discrete_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const discrete_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               discrete_distribution& x);
-};
-
-template<class RealType = double>
-class piecewise_constant_distribution
-{
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef piecewise_constant_distribution distribution_type;
-
-        param_type();
-        template<class InputIteratorB, class InputIteratorW>
-            param_type(InputIteratorB firstB, InputIteratorB lastB,
-                       InputIteratorW firstW);
-        template<class UnaryOperation>
-            param_type(initializer_list<result_type> bl, UnaryOperation fw);
-        template<class UnaryOperation>
-            param_type(size_t nw, result_type xmin, result_type xmax,
-                       UnaryOperation fw);
-
-        vector<result_type> intervals() const;
-        vector<result_type> densities() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    piecewise_constant_distribution();
-    template<class InputIteratorB, class InputIteratorW>
-        piecewise_constant_distribution(InputIteratorB firstB,
-                                        InputIteratorB lastB,
-                                        InputIteratorW firstW);
-    template<class UnaryOperation>
-        piecewise_constant_distribution(initializer_list<result_type> bl,
-                                        UnaryOperation fw);
-    template<class UnaryOperation>
-        piecewise_constant_distribution(size_t nw, result_type xmin,
-                                        result_type xmax, UnaryOperation fw);
-    explicit piecewise_constant_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    vector<result_type> intervals() const;
-    vector<result_type> densities() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const piecewise_constant_distribution& x,
-                           const piecewise_constant_distribution& y);
-    friend bool operator!=(const piecewise_constant_distribution& x,
-                           const piecewise_constant_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const piecewise_constant_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               piecewise_constant_distribution& x);
-};
-
-template<class RealType = double>
-class piecewise_linear_distribution
-{
-    // types
-    typedef RealType result_type;
-
-    class param_type
-    {
-    public:
-        typedef piecewise_linear_distribution distribution_type;
-
-        param_type();
-        template<class InputIteratorB, class InputIteratorW>
-            param_type(InputIteratorB firstB, InputIteratorB lastB,
-                       InputIteratorW firstW);
-        template<class UnaryOperation>
-            param_type(initializer_list<result_type> bl, UnaryOperation fw);
-        template<class UnaryOperation>
-            param_type(size_t nw, result_type xmin, result_type xmax,
-                       UnaryOperation fw);
-
-        vector<result_type> intervals() const;
-        vector<result_type> densities() const;
-
-        friend bool operator==(const param_type& x, const param_type& y);
-        friend bool operator!=(const param_type& x, const param_type& y);
-    };
-
-    // constructor and reset functions
-    piecewise_linear_distribution();
-    template<class InputIteratorB, class InputIteratorW>
-        piecewise_linear_distribution(InputIteratorB firstB,
-                                      InputIteratorB lastB,
-                                      InputIteratorW firstW);
-
-    template<class UnaryOperation>
-        piecewise_linear_distribution(initializer_list<result_type> bl,
-                                      UnaryOperation fw);
-
-    template<class UnaryOperation>
-        piecewise_linear_distribution(size_t nw, result_type xmin,
-                                      result_type xmax, UnaryOperation fw);
-
-    explicit piecewise_linear_distribution(const param_type& parm);
-    void reset();
-
-    // generating functions
-    template<class URNG> result_type operator()(URNG& g);
-    template<class URNG> result_type operator()(URNG& g, const param_type& parm);
-
-    // property functions
-    vector<result_type> intervals() const;
-    vector<result_type> densities() const;
-
-    param_type param() const;
-    void param(const param_type& parm);
-
-    result_type min() const;
-    result_type max() const;
-
-    friend bool operator==(const piecewise_linear_distribution& x,
-                           const piecewise_linear_distribution& y);
-    friend bool operator!=(const piecewise_linear_distribution& x,
-                           const piecewise_linear_distribution& y);
-
-    template <class charT, class traits>
-    friend
-    basic_ostream<charT, traits>&
-    operator<<(basic_ostream<charT, traits>& os,
-               const piecewise_linear_distribution& x);
-
-    template <class charT, class traits>
-    friend
-    basic_istream<charT, traits>&
-    operator>>(basic_istream<charT, traits>& is,
-               piecewise_linear_distribution& x);
-};
-
-} // std
-*/
-
-#include <__config>
-#include <cstddef>
-#include <type_traits>
-#include <initializer_list>
-#include <cstdint>
-#include <limits>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <string>
-#include <istream>
-#include <ostream>
-#include <cmath>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// __is_seed_sequence
-
-template <class _Sseq, class _Engine>
-struct __is_seed_sequence
-{
-    static _LIBCPP_CONSTEXPR const bool value =
-              !is_convertible<_Sseq, typename _Engine::result_type>::value &&
-              !is_same<typename remove_cv<_Sseq>::type, _Engine>::value;
-};
-
-// linear_congruential_engine
-
-template <unsigned long long __a, unsigned long long __c,
-          unsigned long long __m, unsigned long long _Mp,
-          bool _MightOverflow = (__a != 0 && __m != 0 && __m-1 > (_Mp-__c)/__a)>
-struct __lce_ta;
-
-// 64
-
-template <unsigned long long __a, unsigned long long __c, unsigned long long __m>
-struct __lce_ta<__a, __c, __m, (unsigned long long)(~0), true>
-{
-    typedef unsigned long long result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        // Schrage's algorithm
-        const result_type __q = __m / __a;
-        const result_type __r = __m % __a;
-        const result_type __t0 = __a * (__x % __q);
-        const result_type __t1 = __r * (__x / __q);
-        __x = __t0 + (__t0 < __t1) * __m - __t1;
-        __x += __c - (__x >= __m - __c) * __m;
-        return __x;
-    }
-};
-
-template <unsigned long long __a, unsigned long long __m>
-struct __lce_ta<__a, 0, __m, (unsigned long long)(~0), true>
-{
-    typedef unsigned long long result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        // Schrage's algorithm
-        const result_type __q = __m / __a;
-        const result_type __r = __m % __a;
-        const result_type __t0 = __a * (__x % __q);
-        const result_type __t1 = __r * (__x / __q);
-        __x = __t0 + (__t0 < __t1) * __m - __t1;
-        return __x;
-    }
-};
-
-template <unsigned long long __a, unsigned long long __c, unsigned long long __m>
-struct __lce_ta<__a, __c, __m, (unsigned long long)(~0), false>
-{
-    typedef unsigned long long result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        return (__a * __x + __c) % __m;
-    }
-};
-
-template <unsigned long long __a, unsigned long long __c>
-struct __lce_ta<__a, __c, 0, (unsigned long long)(~0), false>
-{
-    typedef unsigned long long result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        return __a * __x + __c;
-    }
-};
-
-// 32
-
-template <unsigned long long _Ap, unsigned long long _Cp, unsigned long long _Mp>
-struct __lce_ta<_Ap, _Cp, _Mp, unsigned(~0), true>
-{
-    typedef unsigned result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        const result_type __a = static_cast<result_type>(_Ap);
-        const result_type __c = static_cast<result_type>(_Cp);
-        const result_type __m = static_cast<result_type>(_Mp);
-        // Schrage's algorithm
-        const result_type __q = __m / __a;
-        const result_type __r = __m % __a;
-        const result_type __t0 = __a * (__x % __q);
-        const result_type __t1 = __r * (__x / __q);
-        __x = __t0 + (__t0 < __t1) * __m - __t1;
-        __x += __c - (__x >= __m - __c) * __m;
-        return __x;
-    }
-};
-
-template <unsigned long long _Ap, unsigned long long _Mp>
-struct __lce_ta<_Ap, 0, _Mp, unsigned(~0), true>
-{
-    typedef unsigned result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        const result_type __a = static_cast<result_type>(_Ap);
-        const result_type __m = static_cast<result_type>(_Mp);
-        // Schrage's algorithm
-        const result_type __q = __m / __a;
-        const result_type __r = __m % __a;
-        const result_type __t0 = __a * (__x % __q);
-        const result_type __t1 = __r * (__x / __q);
-        __x = __t0 + (__t0 < __t1) * __m - __t1;
-        return __x;
-    }
-};
-
-template <unsigned long long _Ap, unsigned long long _Cp, unsigned long long _Mp>
-struct __lce_ta<_Ap, _Cp, _Mp, unsigned(~0), false>
-{
-    typedef unsigned result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        const result_type __a = static_cast<result_type>(_Ap);
-        const result_type __c = static_cast<result_type>(_Cp);
-        const result_type __m = static_cast<result_type>(_Mp);
-        return (__a * __x + __c) % __m;
-    }
-};
-
-template <unsigned long long _Ap, unsigned long long _Cp>
-struct __lce_ta<_Ap, _Cp, 0, unsigned(~0), false>
-{
-    typedef unsigned result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        const result_type __a = static_cast<result_type>(_Ap);
-        const result_type __c = static_cast<result_type>(_Cp);
-        return __a * __x + __c;
-    }
-};
-
-// 16
-
-template <unsigned long long __a, unsigned long long __c, unsigned long long __m, bool __b>
-struct __lce_ta<__a, __c, __m, (unsigned short)(~0), __b>
-{
-    typedef unsigned short result_type;
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type next(result_type __x)
-    {
-        return static_cast<result_type>(__lce_ta<__a, __c, __m, unsigned(~0)>::next(__x));
-    }
-};
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-class _LIBCPP_TYPE_VIS_ONLY linear_congruential_engine;
-
-template <class _CharT, class _Traits,
-          class _Up, _Up _Ap, _Up _Cp, _Up _Np>
-_LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const linear_congruential_engine<_Up, _Ap, _Cp, _Np>&);
-
-template <class _CharT, class _Traits,
-          class _Up, _Up _Ap, _Up _Cp, _Up _Np>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           linear_congruential_engine<_Up, _Ap, _Cp, _Np>& __x);
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-class _LIBCPP_TYPE_VIS_ONLY linear_congruential_engine
-{
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    result_type __x_;
-
-    static _LIBCPP_CONSTEXPR const result_type _Mp = result_type(~0);
-
-    static_assert(__m == 0 || __a < __m, "linear_congruential_engine invalid parameters");
-    static_assert(__m == 0 || __c < __m, "linear_congruential_engine invalid parameters");
-public:
-    static _LIBCPP_CONSTEXPR const result_type _Min = __c == 0u ? 1u: 0u;
-    static _LIBCPP_CONSTEXPR const result_type _Max = __m - 1u;
-    static_assert(_Min < _Max,           "linear_congruential_engine invalid parameters");
-
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const result_type multiplier = __a;
-    static _LIBCPP_CONSTEXPR const result_type increment = __c;
-    static _LIBCPP_CONSTEXPR const result_type modulus = __m;
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() {return _Min;}
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() {return _Max;}
-    static _LIBCPP_CONSTEXPR const result_type default_seed = 1u;
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit linear_congruential_engine(result_type __s = default_seed)
-        {seed(__s);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit linear_congruential_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, linear_congruential_engine>::value>::type* = 0)
-        {seed(__q);}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __s = default_seed)
-        {seed(integral_constant<bool, __m == 0>(),
-              integral_constant<bool, __c == 0>(), __s);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, linear_congruential_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q)
-            {__seed(__q, integral_constant<unsigned,
-                1 + (__m == 0 ? (sizeof(result_type) * __CHAR_BIT__ - 1)/32
-                             :  (__m > 0x100000000ull))>());}
-
-    // generating functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()()
-        {return __x_ = static_cast<result_type>(__lce_ta<__a, __c, __m, _Mp>::next(__x_));}
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const linear_congruential_engine& __x,
-                    const linear_congruential_engine& __y)
-        {return __x.__x_ == __y.__x_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const linear_congruential_engine& __x,
-                    const linear_congruential_engine& __y)
-        {return !(__x == __y);}
-
-private:
-
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(true_type, true_type, result_type __s) {__x_ = __s == 0 ? 1 : __s;}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(true_type, false_type, result_type __s) {__x_ = __s;}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(false_type, true_type, result_type __s) {__x_ = __s % __m == 0 ?
-                                                                 1 : __s % __m;}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(false_type, false_type, result_type __s) {__x_ = __s % __m;}
-
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 1>);
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 2>);
-
-    template <class _CharT, class _Traits,
-              class _Up, _Up _Ap, _Up _Cp, _Up _Np>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const linear_congruential_engine<_Up, _Ap, _Cp, _Np>&);
-
-    template <class _CharT, class _Traits,
-              class _Up, _Up _Ap, _Up _Cp, _Up _Np>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               linear_congruential_engine<_Up, _Ap, _Cp, _Np>& __x);
-};
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    _LIBCPP_CONSTEXPR const typename linear_congruential_engine<_UIntType, __a, __c, __m>::result_type
-    linear_congruential_engine<_UIntType, __a, __c, __m>::multiplier;
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    _LIBCPP_CONSTEXPR const typename linear_congruential_engine<_UIntType, __a, __c, __m>::result_type
-    linear_congruential_engine<_UIntType, __a, __c, __m>::increment;
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    _LIBCPP_CONSTEXPR const typename linear_congruential_engine<_UIntType, __a, __c, __m>::result_type
-    linear_congruential_engine<_UIntType, __a, __c, __m>::modulus;
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-    _LIBCPP_CONSTEXPR const typename linear_congruential_engine<_UIntType, __a, __c, __m>::result_type
-    linear_congruential_engine<_UIntType, __a, __c, __m>::default_seed;
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-template<class _Sseq>
-void
-linear_congruential_engine<_UIntType, __a, __c, __m>::__seed(_Sseq& __q,
-                                                 integral_constant<unsigned, 1>)
-{
-    const unsigned __k = 1;
-    uint32_t __ar[__k+3];
-    __q.generate(__ar, __ar + __k + 3);
-    result_type __s = static_cast<result_type>(__ar[3] % __m);
-    __x_ = __c == 0 && __s == 0 ? result_type(1) : __s;
-}
-
-template <class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-template<class _Sseq>
-void
-linear_congruential_engine<_UIntType, __a, __c, __m>::__seed(_Sseq& __q,
-                                                 integral_constant<unsigned, 2>)
-{
-    const unsigned __k = 2;
-    uint32_t __ar[__k+3];
-    __q.generate(__ar, __ar + __k + 3);
-    result_type __s = static_cast<result_type>((__ar[3] +
-                                              ((uint64_t)__ar[4] << 32)) % __m);
-    __x_ = __c == 0 && __s == 0 ? result_type(1) : __s;
-}
-
-template <class _CharT, class _Traits,
-          class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const linear_congruential_engine<_UIntType, __a, __c, __m>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    __os.fill(__os.widen(' '));
-    return __os << __x.__x_;
-}
-
-template <class _CharT, class _Traits,
-          class _UIntType, _UIntType __a, _UIntType __c, _UIntType __m>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           linear_congruential_engine<_UIntType, __a, __c, __m>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _UIntType __t;
-    __is >> __t;
-    if (!__is.fail())
-        __x.__x_ = __t;
-    return __is;
-}
-
-typedef linear_congruential_engine<uint_fast32_t, 16807, 0, 2147483647>
-                                                                   minstd_rand0;
-typedef linear_congruential_engine<uint_fast32_t, 48271, 0, 2147483647>
-                                                                    minstd_rand;
-typedef minstd_rand                                       default_random_engine;
-// mersenne_twister_engine
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-class _LIBCPP_TYPE_VIS_ONLY mersenne_twister_engine;
-
-template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-bool
-operator==(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __y);
-
-template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __y);
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x);
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                   _Bp, _Tp, _Cp, _Lp, _Fp>& __x);
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-class _LIBCPP_TYPE_VIS_ONLY mersenne_twister_engine
-{
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    result_type __x_[__n];
-    size_t      __i_;
-
-    static_assert(  0 <  __m, "mersenne_twister_engine invalid parameters");
-    static_assert(__m <= __n, "mersenne_twister_engine invalid parameters");
-    static _LIBCPP_CONSTEXPR const result_type _Dt = numeric_limits<result_type>::digits;
-    static_assert(__w <= _Dt, "mersenne_twister_engine invalid parameters");
-    static_assert(  2 <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__r <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__u <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__s <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__t <= __w, "mersenne_twister_engine invalid parameters");
-    static_assert(__l <= __w, "mersenne_twister_engine invalid parameters");
-public:
-    static _LIBCPP_CONSTEXPR const result_type _Min = 0;
-    static _LIBCPP_CONSTEXPR const result_type _Max = __w == _Dt ? result_type(~0) :
-                                                      (result_type(1) << __w) - result_type(1);
-    static_assert(_Min < _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__a <= _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__b <= _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__c <= _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__d <= _Max, "mersenne_twister_engine invalid parameters");
-    static_assert(__f <= _Max, "mersenne_twister_engine invalid parameters");
-
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const size_t word_size = __w;
-    static _LIBCPP_CONSTEXPR const size_t state_size = __n;
-    static _LIBCPP_CONSTEXPR const size_t shift_size = __m;
-    static _LIBCPP_CONSTEXPR const size_t mask_bits = __r;
-    static _LIBCPP_CONSTEXPR const result_type xor_mask = __a;
-    static _LIBCPP_CONSTEXPR const size_t tempering_u = __u;
-    static _LIBCPP_CONSTEXPR const result_type tempering_d = __d;
-    static _LIBCPP_CONSTEXPR const size_t tempering_s = __s;
-    static _LIBCPP_CONSTEXPR const result_type tempering_b = __b;
-    static _LIBCPP_CONSTEXPR const size_t tempering_t = __t;
-    static _LIBCPP_CONSTEXPR const result_type tempering_c = __c;
-    static _LIBCPP_CONSTEXPR const size_t tempering_l = __l;
-    static _LIBCPP_CONSTEXPR const result_type initialization_multiplier = __f;
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
-    static _LIBCPP_CONSTEXPR const result_type default_seed = 5489u;
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit mersenne_twister_engine(result_type __sd = default_seed)
-        {seed(__sd);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit mersenne_twister_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, mersenne_twister_engine>::value>::type* = 0)
-        {seed(__q);}
-    void seed(result_type __sd = default_seed);
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, mersenne_twister_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q)
-            {__seed(__q, integral_constant<unsigned, 1 + (__w - 1) / 32>());}
-
-    // generating functions
-    result_type operator()();
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-              _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-              _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-    friend
-    bool
-    operator==(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-               const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __y);
-
-    template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-              _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-              _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-    friend
-    bool
-    operator!=(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-               const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __y);
-
-    template <class _CharT, class _Traits,
-              class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-              _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-              _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                             _Bp, _Tp, _Cp, _Lp, _Fp>& __x);
-
-    template <class _CharT, class _Traits,
-              class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-              _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-              _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                       _Bp, _Tp, _Cp, _Lp, _Fp>& __x);
-private:
-
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 1>);
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 2>);
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            __count < __w,
-            result_type
-        >::type
-        __lshift(result_type __x) {return (__x << __count) & _Max;}
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (__count >= __w),
-            result_type
-        >::type
-        __lshift(result_type) {return result_type(0);}
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            __count < _Dt,
-            result_type
-        >::type
-        __rshift(result_type __x) {return __x >> __count;}
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (__count >= _Dt),
-            result_type
-        >::type
-        __rshift(result_type) {return result_type(0);}
-};
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::word_size;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::state_size;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::shift_size;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::mask_bits;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::xor_mask;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_u;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_d;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_s;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_b;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_t;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_c;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const size_t 
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::tempering_l;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::initialization_multiplier;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-    _LIBCPP_CONSTEXPR const typename mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::result_type
-    mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b, __t, __c, __l, __f>::default_seed;
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-void
-mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,
-    __t, __c, __l, __f>::seed(result_type __sd)
-{   // __w >= 2
-    __x_[0] = __sd & _Max;
-    for (size_t __i = 1; __i < __n; ++__i)
-        __x_[__i] = (__f * (__x_[__i-1] ^ __rshift<__w - 2>(__x_[__i-1])) + __i) & _Max;
-    __i_ = 0;
-}
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-template<class _Sseq>
-void
-mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,
-    __t, __c, __l, __f>::__seed(_Sseq& __q, integral_constant<unsigned, 1>)
-{
-    const unsigned __k = 1;
-    uint32_t __ar[__n * __k];
-    __q.generate(__ar, __ar + __n * __k);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __x_[__i] = static_cast<result_type>(__ar[__i] & _Max);
-    const result_type __mask = __r == _Dt ? result_type(~0) :
-                                       (result_type(1) << __r) - result_type(1);
-    __i_ = 0;
-    if ((__x_[0] & ~__mask) == 0)
-    {
-        for (size_t __i = 1; __i < __n; ++__i)
-            if (__x_[__i] != 0)
-                return;
-        __x_[0] = _Max;
-    }
-}
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-template<class _Sseq>
-void
-mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,
-    __t, __c, __l, __f>::__seed(_Sseq& __q, integral_constant<unsigned, 2>)
-{
-    const unsigned __k = 2;
-    uint32_t __ar[__n * __k];
-    __q.generate(__ar, __ar + __n * __k);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __x_[__i] = static_cast<result_type>(
-            (__ar[2 * __i] + ((uint64_t)__ar[2 * __i + 1] << 32)) & _Max);
-    const result_type __mask = __r == _Dt ? result_type(~0) :
-                                       (result_type(1) << __r) - result_type(1);
-    __i_ = 0;
-    if ((__x_[0] & ~__mask) == 0)
-    {
-        for (size_t __i = 1; __i < __n; ++__i)
-            if (__x_[__i] != 0)
-                return;
-        __x_[0] = _Max;
-    }
-}
-
-template <class _UIntType, size_t __w, size_t __n, size_t __m, size_t __r,
-          _UIntType __a, size_t __u, _UIntType __d, size_t __s,
-          _UIntType __b, size_t __t, _UIntType __c, size_t __l, _UIntType __f>
-_UIntType
-mersenne_twister_engine<_UIntType, __w, __n, __m, __r, __a, __u, __d, __s, __b,
-    __t, __c, __l, __f>::operator()()
-{
-    const size_t __j = (__i_ + 1) % __n;
-    const result_type __mask = __r == _Dt ? result_type(~0) :
-                                       (result_type(1) << __r) - result_type(1);
-    const result_type _Yp = (__x_[__i_] & ~__mask) | (__x_[__j] & __mask);
-    const size_t __k = (__i_ + __m) % __n;
-    __x_[__i_] = __x_[__k] ^ __rshift<1>(_Yp) ^ (__a * (_Yp & 1));
-    result_type __z = __x_[__i_] ^ (__rshift<__u>(__x_[__i_]) & __d);
-    __i_ = __j;
-    __z ^= __lshift<__s>(__z) & __b;
-    __z ^= __lshift<__t>(__z) & __c;
-    return __z ^ __rshift<__l>(__z);
-}
-
-template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-bool
-operator==(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __y)
-{
-    if (__x.__i_ == __y.__i_)
-        return _VSTD::equal(__x.__x_, __x.__x_ + _Np, __y.__x_);
-    if (__x.__i_ == 0 || __y.__i_ == 0)
-    {
-        size_t __j = _VSTD::min(_Np - __x.__i_, _Np - __y.__i_);
-        if (!_VSTD::equal(__x.__x_ + __x.__i_, __x.__x_ + __x.__i_ + __j,
-                         __y.__x_ + __y.__i_))
-            return false;
-        if (__x.__i_ == 0)
-            return _VSTD::equal(__x.__x_ + __j, __x.__x_ + _Np, __y.__x_);
-        return _VSTD::equal(__x.__x_, __x.__x_ + (_Np - __j), __y.__x_ + __j);
-    }
-    if (__x.__i_ < __y.__i_)
-    {
-        size_t __j = _Np - __y.__i_;
-        if (!_VSTD::equal(__x.__x_ + __x.__i_, __x.__x_ + (__x.__i_ + __j),
-                         __y.__x_ + __y.__i_))
-            return false;
-        if (!_VSTD::equal(__x.__x_ + (__x.__i_ + __j), __x.__x_ + _Np,
-                         __y.__x_))
-            return false;
-        return _VSTD::equal(__x.__x_, __x.__x_ + __x.__i_,
-                           __y.__x_ + (_Np - (__x.__i_ + __j)));
-    }
-    size_t __j = _Np - __x.__i_;
-    if (!_VSTD::equal(__y.__x_ + __y.__i_, __y.__x_ + (__y.__i_ + __j),
-                     __x.__x_ + __x.__i_))
-        return false;
-    if (!_VSTD::equal(__y.__x_ + (__y.__i_ + __j), __y.__x_ + _Np,
-                     __x.__x_))
-        return false;
-    return _VSTD::equal(__y.__x_, __y.__x_ + __y.__i_,
-                       __x.__x_ + (_Np - (__y.__i_ + __j)));
-}
-
-template <class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                         _Bp, _Tp, _Cp, _Lp, _Fp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.__x_[__x.__i_];
-    for (size_t __j = __x.__i_ + 1; __j < _Np; ++__j)
-        __os << __sp << __x.__x_[__j];
-    for (size_t __j = 0; __j < __x.__i_; ++__j)
-        __os << __sp << __x.__x_[__j];
-    return __os;
-}
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Np, size_t _Mp, size_t _Rp,
-          _UI _Ap, size_t _Up, _UI _Dp, size_t _Sp,
-          _UI _Bp, size_t _Tp, _UI _Cp, size_t _Lp, _UI _Fp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           mersenne_twister_engine<_UI, _Wp, _Np, _Mp, _Rp, _Ap, _Up, _Dp, _Sp,
-                                   _Bp, _Tp, _Cp, _Lp, _Fp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _UI __t[_Np];
-    for (size_t __i = 0; __i < _Np; ++__i)
-        __is >> __t[__i];
-    if (!__is.fail())
-    {
-        for (size_t __i = 0; __i < _Np; ++__i)
-            __x.__x_[__i] = __t[__i];
-        __x.__i_ = 0;
-    }
-    return __is;
-}
-
-typedef mersenne_twister_engine<uint_fast32_t, 32, 624, 397, 31,
-                                0x9908b0df, 11, 0xffffffff,
-                                7,  0x9d2c5680,
-                                15, 0xefc60000,
-                                18, 1812433253>                         mt19937;
-typedef mersenne_twister_engine<uint_fast64_t, 64, 312, 156, 31,
-                                0xb5026f5aa96619e9ULL, 29, 0x5555555555555555ULL,
-                                17, 0x71d67fffeda60000ULL,
-                                37, 0xfff7eee000000000ULL,
-                                43, 6364136223846793005ULL>          mt19937_64;
-
-// subtract_with_carry_engine
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-class _LIBCPP_TYPE_VIS_ONLY subtract_with_carry_engine;
-
-template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-bool
-operator==(
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y);
-
-template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y);
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x);
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x);
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-class _LIBCPP_TYPE_VIS_ONLY subtract_with_carry_engine
-{
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    result_type __x_[__r];
-    result_type  __c_;
-    size_t      __i_;
-
-    static _LIBCPP_CONSTEXPR const result_type _Dt = numeric_limits<result_type>::digits;
-    static_assert(  0 <  __w, "subtract_with_carry_engine invalid parameters");
-    static_assert(__w <= _Dt, "subtract_with_carry_engine invalid parameters");
-    static_assert(  0 <  __s, "subtract_with_carry_engine invalid parameters");
-    static_assert(__s <  __r, "subtract_with_carry_engine invalid parameters");
-public:
-    static _LIBCPP_CONSTEXPR const result_type _Min = 0;
-    static _LIBCPP_CONSTEXPR const result_type _Max = __w == _Dt ? result_type(~0) :
-                                                      (result_type(1) << __w) - result_type(1);
-    static_assert(_Min < _Max, "subtract_with_carry_engine invalid parameters");
-
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const size_t word_size = __w;
-    static _LIBCPP_CONSTEXPR const size_t short_lag = __s;
-    static _LIBCPP_CONSTEXPR const size_t long_lag = __r;
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
-    static _LIBCPP_CONSTEXPR const result_type default_seed = 19780503u;
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit subtract_with_carry_engine(result_type __sd = default_seed)
-        {seed(__sd);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit subtract_with_carry_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, subtract_with_carry_engine>::value>::type* = 0)
-        {seed(__q);}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __sd = default_seed)
-        {seed(__sd, integral_constant<unsigned, 1 + (__w - 1) / 32>());}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, subtract_with_carry_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q)
-            {__seed(__q, integral_constant<unsigned, 1 + (__w - 1) / 32>());}
-
-    // generating functions
-    result_type operator()();
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-    friend
-    bool
-    operator==(
-        const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-        const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y);
-
-    template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-    friend
-    bool
-    operator!=(
-        const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-        const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y);
-
-    template <class _CharT, class _Traits,
-              class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x);
-
-    template <class _CharT, class _Traits,
-              class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x);
-
-private:
-
-    void seed(result_type __sd, integral_constant<unsigned, 1>);
-    void seed(result_type __sd, integral_constant<unsigned, 2>);
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 1>);
-    template<class _Sseq>
-        void __seed(_Sseq& __q, integral_constant<unsigned, 2>);
-};
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t subtract_with_carry_engine<_UIntType, __w, __s, __r>::word_size;
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t subtract_with_carry_engine<_UIntType, __w, __s, __r>::short_lag;
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t subtract_with_carry_engine<_UIntType, __w, __s, __r>::long_lag;
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-    _LIBCPP_CONSTEXPR const typename subtract_with_carry_engine<_UIntType, __w, __s, __r>::result_type
-    subtract_with_carry_engine<_UIntType, __w, __s, __r>::default_seed;
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-void
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::seed(result_type __sd,
-        integral_constant<unsigned, 1>)
-{
-    linear_congruential_engine<result_type, 40014u, 0u, 2147483563u>
-        __e(__sd == 0u ? default_seed : __sd);
-    for (size_t __i = 0; __i < __r; ++__i)
-        __x_[__i] = static_cast<result_type>(__e() & _Max);
-    __c_ = __x_[__r-1] == 0;
-    __i_ = 0;
-}
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-void
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::seed(result_type __sd,
-        integral_constant<unsigned, 2>)
-{
-    linear_congruential_engine<result_type, 40014u, 0u, 2147483563u>
-        __e(__sd == 0u ? default_seed : __sd);
-    for (size_t __i = 0; __i < __r; ++__i)
-    {
-        result_type __e0 = __e();
-        __x_[__i] = static_cast<result_type>(
-                                    (__e0 + ((uint64_t)__e() << 32)) & _Max);
-    }
-    __c_ = __x_[__r-1] == 0;
-    __i_ = 0;
-}
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-template<class _Sseq>
-void
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::__seed(_Sseq& __q,
-        integral_constant<unsigned, 1>)
-{
-    const unsigned __k = 1;
-    uint32_t __ar[__r * __k];
-    __q.generate(__ar, __ar + __r * __k);
-    for (size_t __i = 0; __i < __r; ++__i)
-        __x_[__i] = static_cast<result_type>(__ar[__i] & _Max);
-    __c_ = __x_[__r-1] == 0;
-    __i_ = 0;
-}
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-template<class _Sseq>
-void
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::__seed(_Sseq& __q,
-        integral_constant<unsigned, 2>)
-{
-    const unsigned __k = 2;
-    uint32_t __ar[__r * __k];
-    __q.generate(__ar, __ar + __r * __k);
-    for (size_t __i = 0; __i < __r; ++__i)
-        __x_[__i] = static_cast<result_type>(
-                  (__ar[2 * __i] + ((uint64_t)__ar[2 * __i + 1] << 32)) & _Max);
-    __c_ = __x_[__r-1] == 0;
-    __i_ = 0;
-}
-
-template<class _UIntType, size_t __w, size_t __s, size_t __r>
-_UIntType
-subtract_with_carry_engine<_UIntType, __w, __s, __r>::operator()()
-{
-    const result_type& __xs = __x_[(__i_ + (__r - __s)) % __r];
-    result_type& __xr = __x_[__i_];
-    result_type __new_c = __c_ == 0 ? __xs < __xr : __xs != 0 ? __xs <= __xr : 1;
-    __xr = (__xs - __xr - __c_) & _Max;
-    __c_ = __new_c;
-    __i_ = (__i_ + 1) % __r;
-    return __xr;
-}
-
-template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-bool
-operator==(
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y)
-{
-    if (__x.__c_ != __y.__c_)
-        return false;
-    if (__x.__i_ == __y.__i_)
-        return _VSTD::equal(__x.__x_, __x.__x_ + _Rp, __y.__x_);
-    if (__x.__i_ == 0 || __y.__i_ == 0)
-    {
-        size_t __j = _VSTD::min(_Rp - __x.__i_, _Rp - __y.__i_);
-        if (!_VSTD::equal(__x.__x_ + __x.__i_, __x.__x_ + __x.__i_ + __j,
-                         __y.__x_ + __y.__i_))
-            return false;
-        if (__x.__i_ == 0)
-            return _VSTD::equal(__x.__x_ + __j, __x.__x_ + _Rp, __y.__x_);
-        return _VSTD::equal(__x.__x_, __x.__x_ + (_Rp - __j), __y.__x_ + __j);
-    }
-    if (__x.__i_ < __y.__i_)
-    {
-        size_t __j = _Rp - __y.__i_;
-        if (!_VSTD::equal(__x.__x_ + __x.__i_, __x.__x_ + (__x.__i_ + __j),
-                         __y.__x_ + __y.__i_))
-            return false;
-        if (!_VSTD::equal(__x.__x_ + (__x.__i_ + __j), __x.__x_ + _Rp,
-                         __y.__x_))
-            return false;
-        return _VSTD::equal(__x.__x_, __x.__x_ + __x.__i_,
-                           __y.__x_ + (_Rp - (__x.__i_ + __j)));
-    }
-    size_t __j = _Rp - __x.__i_;
-    if (!_VSTD::equal(__y.__x_ + __y.__i_, __y.__x_ + (__y.__i_ + __j),
-                     __x.__x_ + __x.__i_))
-        return false;
-    if (!_VSTD::equal(__y.__x_ + (__y.__i_ + __j), __y.__x_ + _Rp,
-                     __x.__x_))
-        return false;
-    return _VSTD::equal(__y.__x_, __y.__x_ + __y.__i_,
-                       __x.__x_ + (_Rp - (__y.__i_ + __j)));
-}
-
-template<class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x,
-    const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.__x_[__x.__i_];
-    for (size_t __j = __x.__i_ + 1; __j < _Rp; ++__j)
-        __os << __sp << __x.__x_[__j];
-    for (size_t __j = 0; __j < __x.__i_; ++__j)
-        __os << __sp << __x.__x_[__j];
-    __os << __sp << __x.__c_;
-    return __os;
-}
-
-template <class _CharT, class _Traits,
-          class _UI, size_t _Wp, size_t _Sp, size_t _Rp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           subtract_with_carry_engine<_UI, _Wp, _Sp, _Rp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _UI __t[_Rp+1];
-    for (size_t __i = 0; __i < _Rp+1; ++__i)
-        __is >> __t[__i];
-    if (!__is.fail())
-    {
-        for (size_t __i = 0; __i < _Rp; ++__i)
-            __x.__x_[__i] = __t[__i];
-        __x.__c_ = __t[_Rp];
-        __x.__i_ = 0;
-    }
-    return __is;
-}
-
-typedef subtract_with_carry_engine<uint_fast32_t, 24, 10, 24>     ranlux24_base;
-typedef subtract_with_carry_engine<uint_fast64_t, 48,  5, 12>     ranlux48_base;
-
-// discard_block_engine
-
-template<class _Engine, size_t __p, size_t __r>
-class _LIBCPP_TYPE_VIS_ONLY discard_block_engine
-{
-    _Engine __e_;
-    int     __n_;
-
-    static_assert(  0 <  __r, "discard_block_engine invalid parameters");
-    static_assert(__r <= __p, "discard_block_engine invalid parameters");
-public:
-    // types
-    typedef typename _Engine::result_type result_type;
-
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const size_t block_size = __p;
-    static _LIBCPP_CONSTEXPR const size_t used_block = __r;
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    static const result_type _Min = _Engine::_Min;
-    static const result_type _Max = _Engine::_Max;
-#else
-    static _LIBCPP_CONSTEXPR const result_type _Min = _Engine::min();
-    static _LIBCPP_CONSTEXPR const result_type _Max = _Engine::max();
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Engine::min(); }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Engine::max(); }
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    discard_block_engine() : __n_(0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit discard_block_engine(const _Engine& __e)
-        : __e_(__e), __n_(0) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit discard_block_engine(_Engine&& __e)
-        : __e_(_VSTD::move(__e)), __n_(0) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit discard_block_engine(result_type __sd) : __e_(__sd), __n_(0) {}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit discard_block_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, discard_block_engine>::value &&
-                           !is_convertible<_Sseq, _Engine>::value>::type* = 0)
-        : __e_(__q), __n_(0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed() {__e_.seed(); __n_ = 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __sd) {__e_.seed(__sd); __n_ = 0;}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, discard_block_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q) {__e_.seed(__q); __n_ = 0;}
-
-    // generating functions
-    result_type operator()();
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    const _Engine& base() const _NOEXCEPT {return __e_;}
-
-    template<class _Eng, size_t _Pp, size_t _Rp>
-    friend
-    bool
-    operator==(
-        const discard_block_engine<_Eng, _Pp, _Rp>& __x,
-        const discard_block_engine<_Eng, _Pp, _Rp>& __y);
-
-    template<class _Eng, size_t _Pp, size_t _Rp>
-    friend
-    bool
-    operator!=(
-        const discard_block_engine<_Eng, _Pp, _Rp>& __x,
-        const discard_block_engine<_Eng, _Pp, _Rp>& __y);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Pp, size_t _Rp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const discard_block_engine<_Eng, _Pp, _Rp>& __x);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Pp, size_t _Rp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               discard_block_engine<_Eng, _Pp, _Rp>& __x);
-};
-
-template<class _Engine, size_t __p, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t discard_block_engine<_Engine, __p, __r>::block_size;
-
-template<class _Engine, size_t __p, size_t __r>
-    _LIBCPP_CONSTEXPR const size_t discard_block_engine<_Engine, __p, __r>::used_block;
-
-template<class _Engine, size_t __p, size_t __r>
-typename discard_block_engine<_Engine, __p, __r>::result_type
-discard_block_engine<_Engine, __p, __r>::operator()()
-{
-    if (__n_ >= __r)
-    {
-        __e_.discard(__p - __r);
-        __n_ = 0;
-    }
-    ++__n_;
-    return __e_();
-}
-
-template<class _Eng, size_t _Pp, size_t _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const discard_block_engine<_Eng, _Pp, _Rp>& __x,
-           const discard_block_engine<_Eng, _Pp, _Rp>& __y)
-{
-    return __x.__n_ == __y.__n_ && __x.__e_ == __y.__e_;
-}
-
-template<class _Eng, size_t _Pp, size_t _Rp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const discard_block_engine<_Eng, _Pp, _Rp>& __x,
-           const discard_block_engine<_Eng, _Pp, _Rp>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Pp, size_t _Rp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const discard_block_engine<_Eng, _Pp, _Rp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.__e_ << __sp << __x.__n_;
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Pp, size_t _Rp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           discard_block_engine<_Eng, _Pp, _Rp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _Eng __e;
-    int __n;
-    __is >> __e >> __n;
-    if (!__is.fail())
-    {
-        __x.__e_ = __e;
-        __x.__n_ = __n;
-    }
-    return __is;
-}
-
-typedef discard_block_engine<ranlux24_base, 223, 23> ranlux24;
-typedef discard_block_engine<ranlux48_base, 389, 11> ranlux48;
-
-// independent_bits_engine
-
-template<class _Engine, size_t __w, class _UIntType>
-class _LIBCPP_TYPE_VIS_ONLY independent_bits_engine
-{
-    template <class _UI, _UI _R0, size_t _Wp, size_t _Mp>
-    class __get_n
-    {
-        static _LIBCPP_CONSTEXPR const size_t _Dt = numeric_limits<_UI>::digits;
-        static _LIBCPP_CONSTEXPR const size_t _Np = _Wp / _Mp + (_Wp % _Mp != 0);
-        static _LIBCPP_CONSTEXPR const size_t _W0 = _Wp / _Np;
-        static _LIBCPP_CONSTEXPR const _UI _Y0 = _W0 >= _Dt ? 0 : (_R0 >> _W0) << _W0;
-    public:
-        static _LIBCPP_CONSTEXPR const size_t value = _R0 - _Y0 > _Y0 / _Np ? _Np + 1 : _Np;
-    };
-public:
-    // types
-    typedef _UIntType result_type;
-
-private:
-    _Engine __e_;
-
-    static _LIBCPP_CONSTEXPR const result_type _Dt = numeric_limits<result_type>::digits;
-    static_assert(  0 <  __w, "independent_bits_engine invalid parameters");
-    static_assert(__w <= _Dt, "independent_bits_engine invalid parameters");
-
-    typedef typename _Engine::result_type _Engine_result_type;
-    typedef typename conditional
-        <
-            sizeof(_Engine_result_type) <= sizeof(result_type),
-                result_type,
-                _Engine_result_type
-        >::type _Working_result_type;
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    static const _Working_result_type _Rp = _Engine::_Max - _Engine::_Min
-                                          + _Working_result_type(1);
-#else
-    static _LIBCPP_CONSTEXPR const _Working_result_type _Rp = _Engine::max() - _Engine::min()
-                                                            + _Working_result_type(1);
-#endif
-    static _LIBCPP_CONSTEXPR const size_t __m = __log2<_Working_result_type, _Rp>::value;
-    static _LIBCPP_CONSTEXPR const size_t __n = __get_n<_Working_result_type, _Rp, __w, __m>::value;
-    static _LIBCPP_CONSTEXPR const size_t __w0 = __w / __n;
-    static _LIBCPP_CONSTEXPR const size_t __n0 = __n - __w % __n;
-    static _LIBCPP_CONSTEXPR const size_t _WDt = numeric_limits<_Working_result_type>::digits;
-    static _LIBCPP_CONSTEXPR const size_t _EDt = numeric_limits<_Engine_result_type>::digits;
-    static _LIBCPP_CONSTEXPR const _Working_result_type __y0 = __w0 >= _WDt ? 0 :
-                                                               (_Rp >> __w0) << __w0;
-    static _LIBCPP_CONSTEXPR const _Working_result_type __y1 = __w0 >= _WDt - 1 ? 0 :
-                                                               (_Rp >> (__w0+1)) << (__w0+1);
-    static _LIBCPP_CONSTEXPR const _Engine_result_type __mask0 = __w0 > 0 ?
-                                _Engine_result_type(~0) >> (_EDt - __w0) :
-                                _Engine_result_type(0);
-    static _LIBCPP_CONSTEXPR const _Engine_result_type __mask1 = __w0 < _EDt - 1 ?
-                                _Engine_result_type(~0) >> (_EDt - (__w0 + 1)) :
-                                _Engine_result_type(~0);
-public:
-    static _LIBCPP_CONSTEXPR const result_type _Min = 0;
-    static _LIBCPP_CONSTEXPR const result_type _Max = __w == _Dt ? result_type(~0) :
-                                                      (result_type(1) << __w) - result_type(1);
-    static_assert(_Min < _Max, "independent_bits_engine invalid parameters");
-
-    // engine characteristics
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    independent_bits_engine() {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit independent_bits_engine(const _Engine& __e)
-        : __e_(__e) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit independent_bits_engine(_Engine&& __e)
-        : __e_(_VSTD::move(__e)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit independent_bits_engine(result_type __sd) : __e_(__sd) {}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit independent_bits_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, independent_bits_engine>::value &&
-                           !is_convertible<_Sseq, _Engine>::value>::type* = 0)
-         : __e_(__q) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed() {__e_.seed();}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __sd) {__e_.seed(__sd);}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, independent_bits_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q) {__e_.seed(__q);}
-
-    // generating functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()() {return __eval(integral_constant<bool, _Rp != 0>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    const _Engine& base() const _NOEXCEPT {return __e_;}
-
-    template<class _Eng, size_t _Wp, class _UI>
-    friend
-    bool
-    operator==(
-        const independent_bits_engine<_Eng, _Wp, _UI>& __x,
-        const independent_bits_engine<_Eng, _Wp, _UI>& __y);
-
-    template<class _Eng, size_t _Wp, class _UI>
-    friend
-    bool
-    operator!=(
-        const independent_bits_engine<_Eng, _Wp, _UI>& __x,
-        const independent_bits_engine<_Eng, _Wp, _UI>& __y);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Wp, class _UI>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const independent_bits_engine<_Eng, _Wp, _UI>& __x);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Wp, class _UI>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               independent_bits_engine<_Eng, _Wp, _UI>& __x);
-
-private:
-    result_type __eval(false_type);
-    result_type __eval(true_type);
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            __count < _Dt,
-            result_type
-        >::type
-        __lshift(result_type __x) {return __x << __count;}
-
-    template <size_t __count>
-        _LIBCPP_INLINE_VISIBILITY
-        static
-        typename enable_if
-        <
-            (__count >= _Dt),
-            result_type
-        >::type
-        __lshift(result_type) {return result_type(0);}
-};
-
-template<class _Engine, size_t __w, class _UIntType>
-inline _LIBCPP_INLINE_VISIBILITY
-_UIntType
-independent_bits_engine<_Engine, __w, _UIntType>::__eval(false_type)
-{
-    return static_cast<result_type>(__e_() & __mask0);
-}
-
-template<class _Engine, size_t __w, class _UIntType>
-_UIntType
-independent_bits_engine<_Engine, __w, _UIntType>::__eval(true_type)
-{
-    result_type _Sp = 0;
-    for (size_t __k = 0; __k < __n0; ++__k)
-    {
-        _Engine_result_type __u;
-        do
-        {
-            __u = __e_() - _Engine::min();
-        } while (__u >= __y0);
-        _Sp = static_cast<result_type>(__lshift<__w0>(_Sp) + (__u & __mask0));
-    }
-    for (size_t __k = __n0; __k < __n; ++__k)
-    {
-        _Engine_result_type __u;
-        do
-        {
-            __u = __e_() - _Engine::min();
-        } while (__u >= __y1);
-        _Sp = static_cast<result_type>(__lshift<__w0+1>(_Sp) + (__u & __mask1));
-    }
-    return _Sp;
-}
-
-template<class _Eng, size_t _Wp, class _UI>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(
-    const independent_bits_engine<_Eng, _Wp, _UI>& __x,
-    const independent_bits_engine<_Eng, _Wp, _UI>& __y)
-{
-    return __x.base() == __y.base();
-}
-
-template<class _Eng, size_t _Wp, class _UI>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(
-    const independent_bits_engine<_Eng, _Wp, _UI>& __x,
-    const independent_bits_engine<_Eng, _Wp, _UI>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Wp, class _UI>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const independent_bits_engine<_Eng, _Wp, _UI>& __x)
-{
-    return __os << __x.base();
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Wp, class _UI>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           independent_bits_engine<_Eng, _Wp, _UI>& __x)
-{
-    _Eng __e;
-    __is >> __e;
-    if (!__is.fail())
-        __x.__e_ = __e;
-    return __is;
-}
-
-// shuffle_order_engine
-
-template <uint64_t _Xp, uint64_t _Yp>
-struct __ugcd
-{
-    static _LIBCPP_CONSTEXPR const uint64_t value = __ugcd<_Yp, _Xp % _Yp>::value;
-};
-
-template <uint64_t _Xp>
-struct __ugcd<_Xp, 0>
-{
-    static _LIBCPP_CONSTEXPR const uint64_t value = _Xp;
-};
-
-template <uint64_t _Np, uint64_t _Dp>
-class __uratio
-{
-    static_assert(_Dp != 0, "__uratio divide by 0");
-    static _LIBCPP_CONSTEXPR const uint64_t __gcd = __ugcd<_Np, _Dp>::value;
-public:
-    static _LIBCPP_CONSTEXPR const uint64_t num = _Np / __gcd;
-    static _LIBCPP_CONSTEXPR const uint64_t den = _Dp / __gcd;
-
-    typedef __uratio<num, den> type;
-};
-
-template<class _Engine, size_t __k>
-class _LIBCPP_TYPE_VIS_ONLY shuffle_order_engine
-{
-    static_assert(0 < __k, "shuffle_order_engine invalid parameters");
-public:
-    // types
-    typedef typename _Engine::result_type result_type;
-
-private:
-    _Engine __e_;
-    result_type _V_[__k];
-    result_type _Y_;
-
-public:
-    // engine characteristics
-    static _LIBCPP_CONSTEXPR const size_t table_size = __k;
-
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    static const result_type _Min = _Engine::_Min;
-    static const result_type _Max = _Engine::_Max;
-#else
-    static _LIBCPP_CONSTEXPR const result_type _Min = _Engine::min();
-    static _LIBCPP_CONSTEXPR const result_type _Max = _Engine::max();
-#endif
-    static_assert(_Min < _Max, "shuffle_order_engine invalid parameters");
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min; }
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max; }
-
-    static _LIBCPP_CONSTEXPR const unsigned long long _Rp = _Max - _Min + 1ull;
-
-    // constructors and seeding functions
-    _LIBCPP_INLINE_VISIBILITY
-    shuffle_order_engine() {__init();}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit shuffle_order_engine(const _Engine& __e)
-        : __e_(__e) {__init();}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit shuffle_order_engine(_Engine&& __e)
-        : __e_(_VSTD::move(__e)) {__init();}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit shuffle_order_engine(result_type __sd) : __e_(__sd) {__init();}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit shuffle_order_engine(_Sseq& __q,
-        typename enable_if<__is_seed_sequence<_Sseq, shuffle_order_engine>::value &&
-                           !is_convertible<_Sseq, _Engine>::value>::type* = 0)
-         : __e_(__q) {__init();}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed() {__e_.seed(); __init();}
-    _LIBCPP_INLINE_VISIBILITY
-    void seed(result_type __sd) {__e_.seed(__sd); __init();}
-    template<class _Sseq>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_seed_sequence<_Sseq, shuffle_order_engine>::value,
-            void
-        >::type
-        seed(_Sseq& __q) {__e_.seed(__q); __init();}
-
-    // generating functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator()() {return __eval(integral_constant<bool, _Rp != 0>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void discard(unsigned long long __z) {for (; __z; --__z) operator()();}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    const _Engine& base() const _NOEXCEPT {return __e_;}
-
-private:
-    template<class _Eng, size_t _Kp>
-    friend
-    bool
-    operator==(
-        const shuffle_order_engine<_Eng, _Kp>& __x,
-        const shuffle_order_engine<_Eng, _Kp>& __y);
-
-    template<class _Eng, size_t _Kp>
-    friend
-    bool
-    operator!=(
-        const shuffle_order_engine<_Eng, _Kp>& __x,
-        const shuffle_order_engine<_Eng, _Kp>& __y);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Kp>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const shuffle_order_engine<_Eng, _Kp>& __x);
-
-    template <class _CharT, class _Traits,
-              class _Eng, size_t _Kp>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               shuffle_order_engine<_Eng, _Kp>& __x);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __init()
-    {
-        for (size_t __i = 0; __i < __k; ++__i)
-            _V_[__i] = __e_();
-        _Y_ = __e_();
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type __eval(false_type) {return __eval2(integral_constant<bool, __k & 1>());}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type __eval(true_type) {return __eval(__uratio<__k, _Rp>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type __eval2(false_type) {return __eval(__uratio<__k/2, 0x8000000000000000ull>());}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type __eval2(true_type) {return __evalf<__k, 0>();}
-
-    template <uint64_t _Np, uint64_t _Dp>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            (__uratio<_Np, _Dp>::num > 0xFFFFFFFFFFFFFFFFull / (_Max - _Min)),
-            result_type
-        >::type
-        __eval(__uratio<_Np, _Dp>)
-            {return __evalf<__uratio<_Np, _Dp>::num, __uratio<_Np, _Dp>::den>();}
-
-    template <uint64_t _Np, uint64_t _Dp>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __uratio<_Np, _Dp>::num <= 0xFFFFFFFFFFFFFFFFull / (_Max - _Min),
-            result_type
-        >::type
-        __eval(__uratio<_Np, _Dp>)
-        {
-            const size_t __j = static_cast<size_t>(__uratio<_Np, _Dp>::num * (_Y_ - _Min)
-                                                   / __uratio<_Np, _Dp>::den);
-            _Y_ = _V_[__j];
-            _V_[__j] = __e_();
-            return _Y_;
-        }
-
-    template <uint64_t __n, uint64_t __d>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type __evalf()
-        {
-            const double _Fp = __d == 0 ?
-                __n / (2. * 0x8000000000000000ull) :
-                __n / (double)__d;
-            const size_t __j = static_cast<size_t>(_Fp * (_Y_ - _Min));
-            _Y_ = _V_[__j];
-            _V_[__j] = __e_();
-            return _Y_;
-        }
-};
-
-template<class _Engine, size_t __k>
-    _LIBCPP_CONSTEXPR const size_t shuffle_order_engine<_Engine, __k>::table_size;
-
-template<class _Eng, size_t _Kp>
-bool
-operator==(
-    const shuffle_order_engine<_Eng, _Kp>& __x,
-    const shuffle_order_engine<_Eng, _Kp>& __y)
-{
-    return __x._Y_ == __y._Y_ && _VSTD::equal(__x._V_, __x._V_ + _Kp, __y._V_) &&
-           __x.__e_ == __y.__e_;
-}
-
-template<class _Eng, size_t _Kp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(
-    const shuffle_order_engine<_Eng, _Kp>& __x,
-    const shuffle_order_engine<_Eng, _Kp>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Kp>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const shuffle_order_engine<_Eng, _Kp>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.__e_ << __sp << __x._V_[0];
-    for (size_t __i = 1; __i < _Kp; ++__i)
-        __os << __sp << __x._V_[__i];
-    return __os << __sp << __x._Y_;
-}
-
-template <class _CharT, class _Traits,
-          class _Eng, size_t _Kp>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           shuffle_order_engine<_Eng, _Kp>& __x)
-{
-    typedef typename shuffle_order_engine<_Eng, _Kp>::result_type result_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    _Eng __e;
-    result_type _Vp[_Kp+1];
-    __is >> __e;
-    for (size_t __i = 0; __i < _Kp+1; ++__i)
-        __is >> _Vp[__i];
-    if (!__is.fail())
-    {
-        __x.__e_ = __e;
-        for (size_t __i = 0; __i < _Kp; ++__i)
-            __x._V_[__i] = _Vp[__i];
-        __x._Y_ = _Vp[_Kp];
-    }
-    return __is;
-}
-
-typedef shuffle_order_engine<minstd_rand0, 256>                         knuth_b;
-
-// random_device
-
-class _LIBCPP_TYPE_VIS random_device
-{
-#if !(defined(_WIN32) || defined(_LIBCPP_USING_NACL_RANDOM))
-    int __f_;
-#endif // !(defined(_WIN32) || defined(_LIBCPP_USING_NACL_RANDOM))
-public:
-    // types
-    typedef unsigned result_type;
-
-    // generator characteristics
-    static _LIBCPP_CONSTEXPR const result_type _Min = 0;
-    static _LIBCPP_CONSTEXPR const result_type _Max = 0xFFFFFFFFu;
-
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type min() { return _Min;}
-    _LIBCPP_INLINE_VISIBILITY
-    static _LIBCPP_CONSTEXPR result_type max() { return _Max;}
-
-    // constructors
-    explicit random_device(const string& __token = "/dev/urandom");
-    ~random_device();
-
-    // generating functions
-    result_type operator()();
-
-    // property functions
-    double entropy() const _NOEXCEPT;
-
-private:
-    // no copy functions
-    random_device(const random_device&); // = delete;
-    random_device& operator=(const random_device&); // = delete;
-};
-
-// seed_seq
-
-class _LIBCPP_TYPE_VIS_ONLY seed_seq
-{
-public:
-    // types
-    typedef uint32_t result_type;
-
-private:
-    vector<result_type> __v_;
-
-    template<class _InputIterator>
-        void init(_InputIterator __first, _InputIterator __last);
-public:
-    // constructors
-    _LIBCPP_INLINE_VISIBILITY
-    seed_seq() _NOEXCEPT {}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template<class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        seed_seq(initializer_list<_Tp> __il) {init(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template<class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        seed_seq(_InputIterator __first, _InputIterator __last)
-             {init(__first, __last);}
-
-    // generating functions
-    template<class _RandomAccessIterator>
-        void generate(_RandomAccessIterator __first, _RandomAccessIterator __last);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const _NOEXCEPT {return __v_.size();}
-    template<class _OutputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void param(_OutputIterator __dest) const
-            {_VSTD::copy(__v_.begin(), __v_.end(), __dest);}
-
-private:
-    // no copy functions
-    seed_seq(const seed_seq&); // = delete;
-    void operator=(const seed_seq&); // = delete;
-
-    _LIBCPP_INLINE_VISIBILITY
-    static result_type _Tp(result_type __x) {return __x ^ (__x >> 27);}
-};
-
-template<class _InputIterator>
-void
-seed_seq::init(_InputIterator __first, _InputIterator __last)
-{
-    for (_InputIterator __s = __first; __s != __last; ++__s)
-        __v_.push_back(*__s & 0xFFFFFFFF);
-}
-
-template<class _RandomAccessIterator>
-void
-seed_seq::generate(_RandomAccessIterator __first, _RandomAccessIterator __last)
-{
-    if (__first != __last)
-    {
-        _VSTD::fill(__first, __last, 0x8b8b8b8b);
-        const size_t __n = static_cast<size_t>(__last - __first);
-        const size_t __s = __v_.size();
-        const size_t __t = (__n >= 623) ? 11
-                         : (__n >= 68) ? 7
-                         : (__n >= 39) ? 5
-                         : (__n >= 7)  ? 3
-                         : (__n - 1) / 2;
-        const size_t __p = (__n - __t) / 2;
-        const size_t __q = __p + __t;
-        const size_t __m = _VSTD::max(__s + 1, __n);
-        // __k = 0;
-        {
-            result_type __r = 1664525 * _Tp(__first[0] ^ __first[__p]
-                                                      ^  __first[__n - 1]);
-            __first[__p] += __r;
-            __r += __s;
-            __first[__q] += __r;
-            __first[0] = __r;
-        }
-        for (size_t __k = 1; __k <= __s; ++__k)
-        {
-            const size_t __kmodn = __k % __n;
-            const size_t __kpmodn = (__k + __p) % __n;
-            result_type __r = 1664525 * _Tp(__first[__kmodn] ^ __first[__kpmodn]
-                                           ^ __first[(__k - 1) % __n]);
-            __first[__kpmodn] += __r;
-            __r +=  __kmodn + __v_[__k-1];
-            __first[(__k + __q) % __n] += __r;
-            __first[__kmodn] = __r;
-        }
-        for (size_t __k = __s + 1; __k < __m; ++__k)
-        {
-            const size_t __kmodn = __k % __n;
-            const size_t __kpmodn = (__k + __p) % __n;
-            result_type __r = 1664525 * _Tp(__first[__kmodn] ^ __first[__kpmodn]
-                                           ^ __first[(__k - 1) % __n]);
-            __first[__kpmodn] += __r;
-            __r +=  __kmodn;
-            __first[(__k + __q) % __n] += __r;
-            __first[__kmodn] = __r;
-        }
-        for (size_t __k = __m; __k < __m + __n; ++__k)
-        {
-            const size_t __kmodn = __k % __n;
-            const size_t __kpmodn = (__k + __p) % __n;
-            result_type __r = 1566083941 * _Tp(__first[__kmodn] +
-                                              __first[__kpmodn] +
-                                              __first[(__k - 1) % __n]);
-            __first[__kpmodn] ^= __r;
-            __r -= __kmodn;
-            __first[(__k + __q) % __n] ^= __r;
-            __first[__kmodn] = __r;
-        }
-    }
-}
-
-// generate_canonical
-
-template<class _RealType, size_t __bits, class _URNG>
-_RealType
-generate_canonical(_URNG& __g)
-{
-    const size_t _Dt = numeric_limits<_RealType>::digits;
-    const size_t __b = _Dt < __bits ? _Dt : __bits;
-#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-    const size_t __logR = __log2<uint64_t, _URNG::_Max - _URNG::_Min + uint64_t(1)>::value;
-#else
-    const size_t __logR = __log2<uint64_t, _URNG::max() - _URNG::min() + uint64_t(1)>::value;
-#endif
-    const size_t __k = __b / __logR + (__b % __logR != 0) + (__b == 0);
-    const _RealType _Rp = _URNG::max() - _URNG::min() + _RealType(1);
-    _RealType __base = _Rp;
-    _RealType _Sp = __g() - _URNG::min();
-    for (size_t __i = 1; __i < __k; ++__i, __base *= _Rp)
-        _Sp += (__g() - _URNG::min()) * __base;
-    return _Sp / __base;
-}
-
-// uniform_int_distribution
-
-// in <algorithm>
-
-template <class _CharT, class _Traits, class _IT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const uniform_int_distribution<_IT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.a() << __sp << __x.b();
-}
-
-template <class _CharT, class _Traits, class _IT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           uniform_int_distribution<_IT>& __x)
-{
-    typedef uniform_int_distribution<_IT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-// uniform_real_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY uniform_real_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef uniform_real_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __a = 0,
-                            result_type __b = 1)
-            : __a_(__a), __b_(__b) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type a() const {return __a_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type b() const {return __b_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit uniform_real_distribution(result_type __a = 0, result_type __b = 1)
-        : __p_(param_type(__a, __b)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit uniform_real_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type a() const {return __p_.a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type b() const {return __p_.b();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return b();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const uniform_real_distribution& __x,
-                        const uniform_real_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const uniform_real_distribution& __x,
-                        const uniform_real_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _RealType>
-template<class _URNG>
-inline _LIBCPP_INLINE_VISIBILITY
-typename uniform_real_distribution<_RealType>::result_type
-uniform_real_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    return (__p.b() - __p.a())
-        * _VSTD::generate_canonical<_RealType, numeric_limits<_RealType>::digits>(__g)
-        + __p.a();
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const uniform_real_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.a() << __sp << __x.b();
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           uniform_real_distribution<_RT>& __x)
-{
-    typedef uniform_real_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-// bernoulli_distribution
-
-class _LIBCPP_TYPE_VIS_ONLY bernoulli_distribution
-{
-public:
-    // types
-    typedef bool result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        double __p_;
-    public:
-        typedef bernoulli_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(double __p = 0.5) : __p_(__p) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        double p() const {return __p_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit bernoulli_distribution(double __p = 0.5)
-        : __p_(param_type(__p)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit bernoulli_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    double p() const {return __p_.p();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return false;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return true;}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const bernoulli_distribution& __x,
-                        const bernoulli_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const bernoulli_distribution& __x,
-                        const bernoulli_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _URNG>
-inline _LIBCPP_INLINE_VISIBILITY
-bernoulli_distribution::result_type
-bernoulli_distribution::operator()(_URNG& __g, const param_type& __p)
-{
-    uniform_real_distribution<double> __gen;
-    return __gen(__g) < __p.p();
-}
-
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os, const bernoulli_distribution& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.p();
-}
-
-template <class _CharT, class _Traits>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is, bernoulli_distribution& __x)
-{
-    typedef bernoulli_distribution _Eng;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    double __p;
-    __is >> __p;
-    if (!__is.fail())
-        __x.param(param_type(__p));
-    return __is;
-}
-
-// binomial_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY binomial_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __t_;
-        double __p_;
-        double __pr_;
-        double __odds_ratio_;
-        result_type __r0_;
-    public:
-        typedef binomial_distribution distribution_type;
-
-        explicit param_type(result_type __t = 1, double __p = 0.5);
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type t() const {return __t_;}
-        _LIBCPP_INLINE_VISIBILITY
-        double p() const {return __p_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__t_ == __y.__t_ && __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-        friend class binomial_distribution;
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit binomial_distribution(result_type __t = 1, double __p = 0.5)
-        : __p_(param_type(__t, __p)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit binomial_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type t() const {return __p_.t();}
-    _LIBCPP_INLINE_VISIBILITY
-    double p() const {return __p_.p();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return t();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const binomial_distribution& __x,
-                        const binomial_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const binomial_distribution& __x,
-                        const binomial_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _IntType>
-binomial_distribution<_IntType>::param_type::param_type(result_type __t, double __p)
-    : __t_(__t), __p_(__p)
-{
-    if (0 < __p_ && __p_ < 1)
-    {
-        __r0_ = static_cast<result_type>((__t_ + 1) * __p_);
-        __pr_ = _VSTD::exp(_VSTD::lgamma(__t_ + 1.) - _VSTD::lgamma(__r0_ + 1.) -
-                          _VSTD::lgamma(__t_ - __r0_ + 1.) + __r0_ * _VSTD::log(__p_) +
-                          (__t_ - __r0_) * _VSTD::log(1 - __p_));
-        __odds_ratio_ = __p_ / (1 - __p_);
-    }
-}
-
-// Reference: Kemp, C.D. (1986). `A modal method for generating binomial
-//           variables', Commun. Statist. - Theor. Meth. 15(3), 805-813.
-template<class _IntType>
-template<class _URNG>
-_IntType
-binomial_distribution<_IntType>::operator()(_URNG& __g, const param_type& __pr)
-{
-    if (__pr.__t_ == 0 || __pr.__p_ == 0)
-        return 0;
-    if (__pr.__p_ == 1)
-        return __pr.__t_;
-    uniform_real_distribution<double> __gen;
-    double __u = __gen(__g) - __pr.__pr_;
-    if (__u < 0)
-        return __pr.__r0_;
-    double __pu = __pr.__pr_;
-    double __pd = __pu;
-    result_type __ru = __pr.__r0_;
-    result_type __rd = __ru;
-    while (true)
-    {
-        if (__rd >= 1)
-        {
-            __pd *= __rd / (__pr.__odds_ratio_ * (__pr.__t_ - __rd + 1));
-            __u -= __pd;
-            if (__u < 0)
-                return __rd - 1;
-        }
-        if ( __rd != 0 )
-            --__rd;
-        ++__ru;
-        if (__ru <= __pr.__t_)
-        {
-            __pu *= (__pr.__t_ - __ru + 1) * __pr.__odds_ratio_ / __ru;
-            __u -= __pu;
-            if (__u < 0)
-                return __ru;
-        }
-    }
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const binomial_distribution<_IntType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.t() << __sp << __x.p();
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           binomial_distribution<_IntType>& __x)
-{
-    typedef binomial_distribution<_IntType> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __t;
-    double __p;
-    __is >> __t >> __p;
-    if (!__is.fail())
-        __x.param(param_type(__t, __p));
-    return __is;
-}
-
-// exponential_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY exponential_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __lambda_;
-    public:
-        typedef exponential_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __lambda = 1) : __lambda_(__lambda) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type lambda() const {return __lambda_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__lambda_ == __y.__lambda_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit exponential_distribution(result_type __lambda = 1)
-        : __p_(param_type(__lambda)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit exponential_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type lambda() const {return __p_.lambda();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const exponential_distribution& __x,
-                        const exponential_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const exponential_distribution& __x,
-                        const exponential_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-exponential_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    return -_VSTD::log
-                  (
-                      result_type(1) -
-                      _VSTD::generate_canonical<result_type,
-                                       numeric_limits<result_type>::digits>(__g)
-                  )
-                  / __p.lambda();
-}
-
-template <class _CharT, class _Traits, class _RealType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const exponential_distribution<_RealType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    return __os << __x.lambda();
-}
-
-template <class _CharT, class _Traits, class _RealType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           exponential_distribution<_RealType>& __x)
-{
-    typedef exponential_distribution<_RealType> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __lambda;
-    __is >> __lambda;
-    if (!__is.fail())
-        __x.param(param_type(__lambda));
-    return __is;
-}
-
-// normal_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY normal_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __mean_;
-        result_type __stddev_;
-    public:
-        typedef normal_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __mean = 0, result_type __stddev = 1)
-            : __mean_(__mean), __stddev_(__stddev) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type mean() const {return __mean_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type stddev() const {return __stddev_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__mean_ == __y.__mean_ && __x.__stddev_ == __y.__stddev_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-    result_type _V_;
-    bool _V_hot_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit normal_distribution(result_type __mean = 0, result_type __stddev = 1)
-        : __p_(param_type(__mean, __stddev)), _V_hot_(false) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit normal_distribution(const param_type& __p)
-        : __p_(__p), _V_hot_(false) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {_V_hot_ = false;}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type mean() const {return __p_.mean();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type stddev() const {return __p_.stddev();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return -numeric_limits<result_type>::infinity();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const normal_distribution& __x,
-                        const normal_distribution& __y)
-        {return __x.__p_ == __y.__p_ && __x._V_hot_ == __y._V_hot_ &&
-                (!__x._V_hot_ || __x._V_ == __y._V_);}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const normal_distribution& __x,
-                        const normal_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const normal_distribution<_RT>& __x);
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               normal_distribution<_RT>& __x);
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-normal_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    result_type _Up;
-    if (_V_hot_)
-    {
-        _V_hot_ = false;
-        _Up = _V_;
-    }
-    else
-    {
-        uniform_real_distribution<result_type> _Uni(-1, 1);
-        result_type __u;
-        result_type __v;
-        result_type __s;
-        do
-        {
-            __u = _Uni(__g);
-            __v = _Uni(__g);
-            __s = __u * __u + __v * __v;
-        } while (__s > 1 || __s == 0);
-        result_type _Fp = _VSTD::sqrt(-2 * _VSTD::log(__s) / __s);
-        _V_ = __v * _Fp;
-        _V_hot_ = true;
-        _Up = __u * _Fp;
-    }
-    return _Up * __p.stddev() + __p.mean();
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const normal_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.mean() << __sp << __x.stddev() << __sp << __x._V_hot_;
-    if (__x._V_hot_)
-        __os << __sp << __x._V_;
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           normal_distribution<_RT>& __x)
-{
-    typedef normal_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __mean;
-    result_type __stddev;
-    result_type _Vp = 0;
-    bool _V_hot = false;
-    __is >> __mean >> __stddev >> _V_hot;
-    if (_V_hot)
-        __is >> _Vp;
-    if (!__is.fail())
-    {
-        __x.param(param_type(__mean, __stddev));
-        __x._V_hot_ = _V_hot;
-        __x._V_ = _Vp;
-    }
-    return __is;
-}
-
-// lognormal_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY lognormal_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        normal_distribution<result_type> __nd_;
-    public:
-        typedef lognormal_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __m = 0, result_type __s = 1)
-            : __nd_(__m, __s) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type m() const {return __nd_.mean();}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type s() const {return __nd_.stddev();}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__nd_ == __y.__nd_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-        friend class lognormal_distribution;
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_ostream<_CharT, _Traits>&
-        operator<<(basic_ostream<_CharT, _Traits>& __os,
-                   const lognormal_distribution<_RT>& __x);
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_istream<_CharT, _Traits>&
-        operator>>(basic_istream<_CharT, _Traits>& __is,
-                   lognormal_distribution<_RT>& __x);
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit lognormal_distribution(result_type __m = 0, result_type __s = 1)
-        : __p_(param_type(__m, __s)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit lognormal_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {__p_.__nd_.reset();}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g, const param_type& __p)
-        {return _VSTD::exp(const_cast<normal_distribution<result_type>&>(__p.__nd_)(__g));}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type m() const {return __p_.m();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type s() const {return __p_.s();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const lognormal_distribution& __x,
-                        const lognormal_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const lognormal_distribution& __x,
-                        const lognormal_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const lognormal_distribution<_RT>& __x);
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               lognormal_distribution<_RT>& __x);
-};
-
-template <class _CharT, class _Traits, class _RT>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const lognormal_distribution<_RT>& __x)
-{
-    return __os << __x.__p_.__nd_;
-}
-
-template <class _CharT, class _Traits, class _RT>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           lognormal_distribution<_RT>& __x)
-{
-    return __is >> __x.__p_.__nd_;
-}
-
-// poisson_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY poisson_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        double __mean_;
-        double __s_;
-        double __d_;
-        double __l_;
-        double __omega_;
-        double __c0_;
-        double __c1_;
-        double __c2_;
-        double __c3_;
-        double __c_;
-
-    public:
-        typedef poisson_distribution distribution_type;
-
-        explicit param_type(double __mean = 1.0);
-
-        _LIBCPP_INLINE_VISIBILITY
-        double mean() const {return __mean_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__mean_ == __y.__mean_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-        friend class poisson_distribution;
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit poisson_distribution(double __mean = 1.0) : __p_(__mean) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit poisson_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    double mean() const {return __p_.mean();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::max();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const poisson_distribution& __x,
-                        const poisson_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const poisson_distribution& __x,
-                        const poisson_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _IntType>
-poisson_distribution<_IntType>::param_type::param_type(double __mean)
-    : __mean_(__mean)
-{
-    if (__mean_ < 10)
-    {
-        __s_ = 0;
-        __d_ = 0;
-        __l_ = _VSTD::exp(-__mean_);
-        __omega_ = 0;
-        __c3_ = 0;
-        __c2_ = 0;
-        __c1_ = 0;
-        __c0_ = 0;
-        __c_ = 0;
-    }
-    else
-    {
-        __s_ = _VSTD::sqrt(__mean_);
-        __d_ = 6 * __mean_ * __mean_;
-        __l_ = static_cast<result_type>(__mean_ - 1.1484);
-        __omega_ = .3989423 / __s_;
-        double __b1_ = .4166667E-1 / __mean_;
-        double __b2_ = .3 * __b1_ * __b1_;
-        __c3_ = .1428571 * __b1_ * __b2_;
-        __c2_ = __b2_ - 15. * __c3_;
-        __c1_ = __b1_ - 6. * __b2_ + 45. * __c3_;
-        __c0_ = 1. - __b1_ + 3. * __b2_ - 15. * __c3_;
-        __c_ = .1069 / __mean_;
-    }
-}
-
-template <class _IntType>
-template<class _URNG>
-_IntType
-poisson_distribution<_IntType>::operator()(_URNG& __urng, const param_type& __pr)
-{
-    result_type __x;
-    uniform_real_distribution<double> __urd;
-    if (__pr.__mean_ < 10)
-    {
-         __x = 0;
-        for (double __p = __urd(__urng); __p > __pr.__l_; ++__x)
-            __p *= __urd(__urng);
-    }
-    else
-    {
-        double __difmuk;
-        double __g = __pr.__mean_ + __pr.__s_ * normal_distribution<double>()(__urng);
-        double __u;
-        if (__g > 0)
-        {
-            __x = static_cast<result_type>(__g);
-            if (__x >= __pr.__l_)
-                return __x;
-            __difmuk = __pr.__mean_ - __x;
-            __u = __urd(__urng);
-            if (__pr.__d_ * __u >= __difmuk * __difmuk * __difmuk)
-                return __x;
-        }
-        exponential_distribution<double> __edist;
-        for (bool __using_exp_dist = false; true; __using_exp_dist = true)
-        {
-            double __e;
-            if (__using_exp_dist || __g < 0)
-            {
-                double __t;
-                do
-                {
-                    __e = __edist(__urng);
-                    __u = __urd(__urng);
-                    __u += __u - 1;
-                    __t = 1.8 + (__u < 0 ? -__e : __e);
-                } while (__t <= -.6744);
-                __x = __pr.__mean_ + __pr.__s_ * __t;
-                __difmuk = __pr.__mean_ - __x;
-                __using_exp_dist = true;
-            }
-            double __px;
-            double __py;
-            if (__x < 10)
-            {
-                const result_type __fac[] = {1, 1, 2, 6, 24, 120, 720, 5040,
-                                             40320, 362880};
-                __px = -__pr.__mean_;
-                __py = _VSTD::pow(__pr.__mean_, (double)__x) / __fac[__x];
-            }
-            else
-            {
-                double __del = .8333333E-1 / __x;
-                __del -= 4.8 * __del * __del * __del;
-                double __v = __difmuk / __x;
-                if (_VSTD::abs(__v) > 0.25)
-                    __px = __x * _VSTD::log(1 + __v) - __difmuk - __del;
-                else
-                    __px = __x * __v * __v * (((((((.1250060 * __v + -.1384794) *
-                           __v + .1421878) * __v + -.1661269) * __v + .2000118) *
-                           __v + -.2500068) * __v + .3333333) * __v + -.5) - __del;
-                __py = .3989423 / _VSTD::sqrt(__x);
-            }
-            double __r = (0.5 - __difmuk) / __pr.__s_;
-            double __r2 = __r * __r;
-            double __fx = -0.5 * __r2;
-            double __fy = __pr.__omega_ * (((__pr.__c3_ * __r2 + __pr.__c2_) *
-                                        __r2 + __pr.__c1_) * __r2 + __pr.__c0_);
-            if (__using_exp_dist)
-            {
-                if (__pr.__c_ * _VSTD::abs(__u) <= __py * _VSTD::exp(__px + __e) -
-                                                   __fy * _VSTD::exp(__fx + __e))
-                    break;
-            }
-            else
-            {
-                if (__fy - __u * __fy <= __py * _VSTD::exp(__px - __fx))
-                    break;
-            }
-        }
-    }
-    return __x;
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const poisson_distribution<_IntType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    return __os << __x.mean();
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           poisson_distribution<_IntType>& __x)
-{
-    typedef poisson_distribution<_IntType> _Eng;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    double __mean;
-    __is >> __mean;
-    if (!__is.fail())
-        __x.param(param_type(__mean));
-    return __is;
-}
-
-// weibull_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY weibull_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef weibull_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __a = 1, result_type __b = 1)
-            : __a_(__a), __b_(__b) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type a() const {return __a_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type b() const {return __b_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit weibull_distribution(result_type __a = 1, result_type __b = 1)
-        : __p_(param_type(__a, __b)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit weibull_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g, const param_type& __p)
-        {return __p.b() *
-            _VSTD::pow(exponential_distribution<result_type>()(__g), 1/__p.a());}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type a() const {return __p_.a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type b() const {return __p_.b();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const weibull_distribution& __x,
-                        const weibull_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const weibull_distribution& __x,
-                        const weibull_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const weibull_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.a() << __sp << __x.b();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           weibull_distribution<_RT>& __x)
-{
-    typedef weibull_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY extreme_value_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef extreme_value_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __a = 0, result_type __b = 1)
-            : __a_(__a), __b_(__b) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type a() const {return __a_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type b() const {return __b_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit extreme_value_distribution(result_type __a = 0, result_type __b = 1)
-        : __p_(param_type(__a, __b)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit extreme_value_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type a() const {return __p_.a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type b() const {return __p_.b();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return -numeric_limits<result_type>::infinity();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const extreme_value_distribution& __x,
-                        const extreme_value_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const extreme_value_distribution& __x,
-                        const extreme_value_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template<class _RealType>
-template<class _URNG>
-_RealType
-extreme_value_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    return __p.a() - __p.b() *
-         _VSTD::log(-_VSTD::log(1-uniform_real_distribution<result_type>()(__g)));
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const extreme_value_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.a() << __sp << __x.b();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           extreme_value_distribution<_RT>& __x)
-{
-    typedef extreme_value_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-// gamma_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY gamma_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __alpha_;
-        result_type __beta_;
-    public:
-        typedef gamma_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __alpha = 1, result_type __beta = 1)
-            : __alpha_(__alpha), __beta_(__beta) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type alpha() const {return __alpha_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type beta() const {return __beta_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__alpha_ == __y.__alpha_ && __x.__beta_ == __y.__beta_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit gamma_distribution(result_type __alpha = 1, result_type __beta = 1)
-        : __p_(param_type(__alpha, __beta)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit gamma_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type alpha() const {return __p_.alpha();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type beta() const {return __p_.beta();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const gamma_distribution& __x,
-                        const gamma_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const gamma_distribution& __x,
-                        const gamma_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-gamma_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    result_type __a = __p.alpha();
-    uniform_real_distribution<result_type> __gen(0, 1);
-    exponential_distribution<result_type> __egen;
-    result_type __x;
-    if (__a == 1)
-        __x = __egen(__g);
-    else if (__a > 1)
-    {
-        const result_type __b = __a - 1;
-        const result_type __c = 3 * __a - result_type(0.75);
-        while (true)
-        {
-            const result_type __u = __gen(__g);
-            const result_type __v = __gen(__g);
-            const result_type __w = __u * (1 - __u);
-            if (__w != 0)
-            {
-                const result_type __y = _VSTD::sqrt(__c / __w) *
-                                        (__u - result_type(0.5));
-                __x = __b + __y;
-                if (__x >= 0)
-                {
-                    const result_type __z = 64 * __w * __w * __w * __v * __v;
-                    if (__z <= 1 - 2 * __y * __y / __x)
-                        break;
-                    if (_VSTD::log(__z) <= 2 * (__b * _VSTD::log(__x / __b) - __y))
-                        break;
-                }
-            }
-        }
-    }
-    else  // __a < 1
-    {
-        while (true)
-        {
-            const result_type __u = __gen(__g);
-            const result_type __es = __egen(__g);
-            if (__u <= 1 - __a)
-            {
-                __x = _VSTD::pow(__u, 1 / __a);
-                if (__x <= __es)
-                    break;
-            }
-            else
-            {
-                const result_type __e = -_VSTD::log((1-__u)/__a);
-                __x = _VSTD::pow(1 - __a + __a * __e, 1 / __a);
-                if (__x <= __e + __es)
-                    break;
-            }
-        }
-    }
-    return __x * __p.beta();
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const gamma_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.alpha() << __sp << __x.beta();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           gamma_distribution<_RT>& __x)
-{
-    typedef gamma_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __alpha;
-    result_type __beta;
-    __is >> __alpha >> __beta;
-    if (!__is.fail())
-        __x.param(param_type(__alpha, __beta));
-    return __is;
-}
-
-// negative_binomial_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY negative_binomial_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __k_;
-        double __p_;
-    public:
-        typedef negative_binomial_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __k = 1, double __p = 0.5)
-            : __k_(__k), __p_(__p) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type k() const {return __k_;}
-        _LIBCPP_INLINE_VISIBILITY
-        double p() const {return __p_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__k_ == __y.__k_ && __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit negative_binomial_distribution(result_type __k = 1, double __p = 0.5)
-        : __p_(__k, __p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit negative_binomial_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type k() const {return __p_.k();}
-    _LIBCPP_INLINE_VISIBILITY
-    double p() const {return __p_.p();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::max();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const negative_binomial_distribution& __x,
-                        const negative_binomial_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const negative_binomial_distribution& __x,
-                        const negative_binomial_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _IntType>
-template<class _URNG>
-_IntType
-negative_binomial_distribution<_IntType>::operator()(_URNG& __urng, const param_type& __pr)
-{
-    result_type __k = __pr.k();
-    double __p = __pr.p();
-    if (__k <= 21 * __p)
-    {
-        bernoulli_distribution __gen(__p);
-        result_type __f = 0;
-        result_type __s = 0;
-        while (__s < __k)
-        {
-            if (__gen(__urng))
-                ++__s;
-            else
-                ++__f;
-        }
-        return __f;
-    }
-    return poisson_distribution<result_type>(gamma_distribution<double>
-                                            (__k, (1-__p)/__p)(__urng))(__urng);
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const negative_binomial_distribution<_IntType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    return __os << __x.k() << __sp << __x.p();
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           negative_binomial_distribution<_IntType>& __x)
-{
-    typedef negative_binomial_distribution<_IntType> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __k;
-    double __p;
-    __is >> __k >> __p;
-    if (!__is.fail())
-        __x.param(param_type(__k, __p));
-    return __is;
-}
-
-// geometric_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY geometric_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        double __p_;
-    public:
-        typedef geometric_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(double __p = 0.5) : __p_(__p) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        double p() const {return __p_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructors and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit geometric_distribution(double __p = 0.5) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit geometric_distribution(const param_type& __p) : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g, const param_type& __p)
-        {return negative_binomial_distribution<result_type>(1, __p.p())(__g);}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    double p() const {return __p_.p();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::max();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const geometric_distribution& __x,
-                        const geometric_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const geometric_distribution& __x,
-                        const geometric_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _CharT, class _Traits, class _IntType>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const geometric_distribution<_IntType>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    return __os << __x.p();
-}
-
-template <class _CharT, class _Traits, class _IntType>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           geometric_distribution<_IntType>& __x)
-{
-    typedef geometric_distribution<_IntType> _Eng;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    double __p;
-    __is >> __p;
-    if (!__is.fail())
-        __x.param(param_type(__p));
-    return __is;
-}
-
-// chi_squared_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY chi_squared_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __n_;
-    public:
-        typedef chi_squared_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __n = 1) : __n_(__n) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type n() const {return __n_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__n_ == __y.__n_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit chi_squared_distribution(result_type __n = 1)
-        : __p_(param_type(__n)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit chi_squared_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g, const param_type& __p)
-        {return gamma_distribution<result_type>(__p.n() / 2, 2)(__g);}
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type n() const {return __p_.n();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const chi_squared_distribution& __x,
-                        const chi_squared_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const chi_squared_distribution& __x,
-                        const chi_squared_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const chi_squared_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    __os << __x.n();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           chi_squared_distribution<_RT>& __x)
-{
-    typedef chi_squared_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __n;
-    __is >> __n;
-    if (!__is.fail())
-        __x.param(param_type(__n));
-    return __is;
-}
-
-// cauchy_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY cauchy_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __a_;
-        result_type __b_;
-    public:
-        typedef cauchy_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __a = 0, result_type __b = 1)
-            : __a_(__a), __b_(__b) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type a() const {return __a_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type b() const {return __b_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__a_ == __y.__a_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit cauchy_distribution(result_type __a = 0, result_type __b = 1)
-        : __p_(param_type(__a, __b)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit cauchy_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type a() const {return __p_.a();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type b() const {return __p_.b();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return -numeric_limits<result_type>::infinity();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const cauchy_distribution& __x,
-                        const cauchy_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const cauchy_distribution& __x,
-                        const cauchy_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-inline _LIBCPP_INLINE_VISIBILITY
-_RealType
-cauchy_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    uniform_real_distribution<result_type> __gen;
-    // purposefully let tan arg get as close to pi/2 as it wants, tan will return a finite
-    return __p.a() + __p.b() * _VSTD::tan(3.1415926535897932384626433832795 * __gen(__g));
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const cauchy_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.a() << __sp << __x.b();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           cauchy_distribution<_RT>& __x)
-{
-    typedef cauchy_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __a;
-    result_type __b;
-    __is >> __a >> __b;
-    if (!__is.fail())
-        __x.param(param_type(__a, __b));
-    return __is;
-}
-
-// fisher_f_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY fisher_f_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __m_;
-        result_type __n_;
-    public:
-        typedef fisher_f_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __m = 1, result_type __n = 1)
-            : __m_(__m), __n_(__n) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type m() const {return __m_;}
-        _LIBCPP_INLINE_VISIBILITY
-        result_type n() const {return __n_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__m_ == __y.__m_ && __x.__n_ == __y.__n_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit fisher_f_distribution(result_type __m = 1, result_type __n = 1)
-        : __p_(param_type(__m, __n)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit fisher_f_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type m() const {return __p_.m();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type n() const {return __p_.n();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const fisher_f_distribution& __x,
-                        const fisher_f_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const fisher_f_distribution& __x,
-                        const fisher_f_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-fisher_f_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    gamma_distribution<result_type> __gdm(__p.m() * result_type(.5));
-    gamma_distribution<result_type> __gdn(__p.n() * result_type(.5));
-    return __p.n() * __gdm(__g) / (__p.m() * __gdn(__g));
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const fisher_f_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    __os << __x.m() << __sp << __x.n();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           fisher_f_distribution<_RT>& __x)
-{
-    typedef fisher_f_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __m;
-    result_type __n;
-    __is >> __m >> __n;
-    if (!__is.fail())
-        __x.param(param_type(__m, __n));
-    return __is;
-}
-
-// student_t_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY student_t_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        result_type __n_;
-    public:
-        typedef student_t_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        explicit param_type(result_type __n = 1) : __n_(__n) {}
-
-        _LIBCPP_INLINE_VISIBILITY
-        result_type n() const {return __n_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__n_ == __y.__n_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-    };
-
-private:
-    param_type __p_;
-    normal_distribution<result_type> __nd_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    explicit student_t_distribution(result_type __n = 1)
-        : __p_(param_type(__n)) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit student_t_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {__nd_.reset();}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    result_type n() const {return __p_.n();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return -numeric_limits<result_type>::infinity();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return numeric_limits<result_type>::infinity();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const student_t_distribution& __x,
-                        const student_t_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const student_t_distribution& __x,
-                        const student_t_distribution& __y)
-        {return !(__x == __y);}
-};
-
-template <class _RealType>
-template<class _URNG>
-_RealType
-student_t_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    gamma_distribution<result_type> __gd(__p.n() * .5, 2);
-    return __nd_(__g) * _VSTD::sqrt(__p.n()/__gd(__g));
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const student_t_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    __os << __x.n();
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           student_t_distribution<_RT>& __x)
-{
-    typedef student_t_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    result_type __n;
-    __is >> __n;
-    if (!__is.fail())
-        __x.param(param_type(__n));
-    return __is;
-}
-
-// discrete_distribution
-
-template<class _IntType = int>
-class _LIBCPP_TYPE_VIS_ONLY discrete_distribution
-{
-public:
-    // types
-    typedef _IntType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        vector<double> __p_;
-    public:
-        typedef discrete_distribution distribution_type;
-
-        _LIBCPP_INLINE_VISIBILITY
-        param_type() {}
-        template<class _InputIterator>
-            _LIBCPP_INLINE_VISIBILITY
-            param_type(_InputIterator __f, _InputIterator __l)
-            : __p_(__f, __l) {__init();}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        _LIBCPP_INLINE_VISIBILITY
-        param_type(initializer_list<double> __wl)
-            : __p_(__wl.begin(), __wl.end()) {__init();}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(size_t __nw, double __xmin, double __xmax,
-                       _UnaryOperation __fw);
-
-        vector<double> probabilities() const;
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__p_ == __y.__p_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-    private:
-        void __init();
-
-        friend class discrete_distribution;
-
-        template <class _CharT, class _Traits, class _IT>
-        friend
-        basic_ostream<_CharT, _Traits>&
-        operator<<(basic_ostream<_CharT, _Traits>& __os,
-                   const discrete_distribution<_IT>& __x);
-
-        template <class _CharT, class _Traits, class _IT>
-        friend
-        basic_istream<_CharT, _Traits>&
-        operator>>(basic_istream<_CharT, _Traits>& __is,
-                   discrete_distribution<_IT>& __x);
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    discrete_distribution() {}
-    template<class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        discrete_distribution(_InputIterator __f, _InputIterator __l)
-            : __p_(__f, __l) {}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    discrete_distribution(initializer_list<double> __wl)
-        : __p_(__wl) {}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        discrete_distribution(size_t __nw, double __xmin, double __xmax,
-                              _UnaryOperation __fw)
-        : __p_(__nw, __xmin, __xmax, __fw) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit discrete_distribution(const param_type& __p)
-        : __p_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    vector<double> probabilities() const {return __p_.probabilities();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return __p_.__p_.size();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const discrete_distribution& __x,
-                        const discrete_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const discrete_distribution& __x,
-                        const discrete_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _IT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const discrete_distribution<_IT>& __x);
-
-    template <class _CharT, class _Traits, class _IT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               discrete_distribution<_IT>& __x);
-};
-
-template<class _IntType>
-template<class _UnaryOperation>
-discrete_distribution<_IntType>::param_type::param_type(size_t __nw,
-                                                        double __xmin,
-                                                        double __xmax,
-                                                        _UnaryOperation __fw)
-{
-    if (__nw > 1)
-    {
-        __p_.reserve(__nw - 1);
-        double __d = (__xmax - __xmin) / __nw;
-        double __d2 = __d / 2;
-        for (size_t __k = 0; __k < __nw; ++__k)
-            __p_.push_back(__fw(__xmin + __k * __d + __d2));
-        __init();
-    }
-}
-
-template<class _IntType>
-void
-discrete_distribution<_IntType>::param_type::__init()
-{
-    if (!__p_.empty())
-    {
-        if (__p_.size() > 1)
-        {
-            double __s = _VSTD::accumulate(__p_.begin(), __p_.end(), 0.0);
-            for (_VSTD::vector<double>::iterator __i = __p_.begin(), __e = __p_.end();
-                                                                       __i < __e; ++__i)
-                *__i /= __s;
-            vector<double> __t(__p_.size() - 1);
-            _VSTD::partial_sum(__p_.begin(), __p_.end() - 1, __t.begin());
-            swap(__p_, __t);
-        }
-        else
-        {
-            __p_.clear();
-            __p_.shrink_to_fit();
-        }
-    }
-}
-
-template<class _IntType>
-vector<double>
-discrete_distribution<_IntType>::param_type::probabilities() const
-{
-    size_t __n = __p_.size();
-    _VSTD::vector<double> __p(__n+1);
-    _VSTD::adjacent_difference(__p_.begin(), __p_.end(), __p.begin());
-    if (__n > 0)
-        __p[__n] = 1 - __p_[__n-1];
-    else
-        __p[0] = 1;
-    return __p;
-}
-
-template<class _IntType>
-template<class _URNG>
-_IntType
-discrete_distribution<_IntType>::operator()(_URNG& __g, const param_type& __p)
-{
-    uniform_real_distribution<double> __gen;
-    return static_cast<_IntType>(
-           _VSTD::upper_bound(__p.__p_.begin(), __p.__p_.end(), __gen(__g)) -
-                                                              __p.__p_.begin());
-}
-
-template <class _CharT, class _Traits, class _IT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const discrete_distribution<_IT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    size_t __n = __x.__p_.__p_.size();
-    __os << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__p_[__i];
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _IT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           discrete_distribution<_IT>& __x)
-{
-    typedef discrete_distribution<_IT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    size_t __n;
-    __is >> __n;
-    vector<double> __p(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __p[__i];
-    if (!__is.fail())
-        swap(__x.__p_.__p_, __p);
-    return __is;
-}
-
-// piecewise_constant_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY piecewise_constant_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        vector<result_type> __b_;
-        vector<result_type> __densities_;
-        vector<result_type> __areas_;
-    public:
-        typedef piecewise_constant_distribution distribution_type;
-
-        param_type();
-        template<class _InputIteratorB, class _InputIteratorW>
-            param_type(_InputIteratorB __fB, _InputIteratorB __lB,
-                       _InputIteratorW __fW);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(initializer_list<result_type> __bl, _UnaryOperation __fw);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(size_t __nw, result_type __xmin, result_type __xmax,
-                       _UnaryOperation __fw);
-        param_type & operator=(const param_type& __rhs);
-
-        _LIBCPP_INLINE_VISIBILITY
-        vector<result_type> intervals() const {return __b_;}
-        _LIBCPP_INLINE_VISIBILITY
-        vector<result_type> densities() const {return __densities_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__densities_ == __y.__densities_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-    private:
-        void __init();
-
-        friend class piecewise_constant_distribution;
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_ostream<_CharT, _Traits>&
-        operator<<(basic_ostream<_CharT, _Traits>& __os,
-                   const piecewise_constant_distribution<_RT>& __x);
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_istream<_CharT, _Traits>&
-        operator>>(basic_istream<_CharT, _Traits>& __is,
-                   piecewise_constant_distribution<_RT>& __x);
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    piecewise_constant_distribution() {}
-    template<class _InputIteratorB, class _InputIteratorW>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_constant_distribution(_InputIteratorB __fB,
-                                        _InputIteratorB __lB,
-                                        _InputIteratorW __fW)
-        : __p_(__fB, __lB, __fW) {}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_constant_distribution(initializer_list<result_type> __bl,
-                                        _UnaryOperation __fw)
-        : __p_(__bl, __fw) {}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_constant_distribution(size_t __nw, result_type __xmin,
-                                        result_type __xmax, _UnaryOperation __fw)
-        : __p_(__nw, __xmin, __xmax, __fw) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit piecewise_constant_distribution(const param_type& __p)
-        : __p_(__p) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    vector<result_type> intervals() const {return __p_.intervals();}
-    _LIBCPP_INLINE_VISIBILITY
-    vector<result_type> densities() const {return __p_.densities();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return __p_.__b_.front();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return __p_.__b_.back();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const piecewise_constant_distribution& __x,
-                        const piecewise_constant_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const piecewise_constant_distribution& __x,
-                           const piecewise_constant_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const piecewise_constant_distribution<_RT>& __x);
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               piecewise_constant_distribution<_RT>& __x);
-};
-
-template<class _RealType>
-typename piecewise_constant_distribution<_RealType>::param_type &
-piecewise_constant_distribution<_RealType>::param_type::operator=
-                                                       (const param_type& __rhs)
-{
-//  These can throw
-    __b_.reserve        (__rhs.__b_.size ());
-    __densities_.reserve(__rhs.__densities_.size());
-    __areas_.reserve    (__rhs.__areas_.size());
-
-//  These can not throw
-    __b_         = __rhs.__b_;
-    __densities_ = __rhs.__densities_;
-    __areas_     =  __rhs.__areas_;
-    return *this;
-}
-
-template<class _RealType>
-void
-piecewise_constant_distribution<_RealType>::param_type::__init()
-{
-    // __densities_ contains non-normalized areas
-    result_type __total_area = _VSTD::accumulate(__densities_.begin(),
-                                                __densities_.end(),
-                                                result_type());
-    for (size_t __i = 0; __i < __densities_.size(); ++__i)
-        __densities_[__i] /= __total_area;
-    // __densities_ contains normalized areas
-    __areas_.assign(__densities_.size(), result_type());
-    _VSTD::partial_sum(__densities_.begin(), __densities_.end() - 1,
-                                                          __areas_.begin() + 1);
-    // __areas_ contains partial sums of normalized areas: [0, __densities_ - 1]
-    __densities_.back() = 1 - __areas_.back();  // correct round off error
-    for (size_t __i = 0; __i < __densities_.size(); ++__i)
-        __densities_[__i] /= (__b_[__i+1] - __b_[__i]);
-    // __densities_ now contains __densities_
-}
-
-template<class _RealType>
-piecewise_constant_distribution<_RealType>::param_type::param_type()
-    : __b_(2),
-      __densities_(1, 1.0),
-      __areas_(1, 0.0)
-{
-    __b_[1] = 1;
-}
-
-template<class _RealType>
-template<class _InputIteratorB, class _InputIteratorW>
-piecewise_constant_distribution<_RealType>::param_type::param_type(
-        _InputIteratorB __fB, _InputIteratorB __lB, _InputIteratorW __fW)
-    : __b_(__fB, __lB)
-{
-    if (__b_.size() < 2)
-    {
-        __b_.resize(2);
-        __b_[0] = 0;
-        __b_[1] = 1;
-        __densities_.assign(1, 1.0);
-        __areas_.assign(1, 0.0);
-    }
-    else
-    {
-        __densities_.reserve(__b_.size() - 1);
-        for (size_t __i = 0; __i < __b_.size() - 1; ++__i, ++__fW)
-            __densities_.push_back(*__fW);
-        __init();
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _RealType>
-template<class _UnaryOperation>
-piecewise_constant_distribution<_RealType>::param_type::param_type(
-        initializer_list<result_type> __bl, _UnaryOperation __fw)
-    : __b_(__bl.begin(), __bl.end())
-{
-    if (__b_.size() < 2)
-    {
-        __b_.resize(2);
-        __b_[0] = 0;
-        __b_[1] = 1;
-        __densities_.assign(1, 1.0);
-        __areas_.assign(1, 0.0);
-    }
-    else
-    {
-        __densities_.reserve(__b_.size() - 1);
-        for (size_t __i = 0; __i < __b_.size() - 1; ++__i)
-            __densities_.push_back(__fw((__b_[__i+1] + __b_[__i])*.5));
-        __init();
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _RealType>
-template<class _UnaryOperation>
-piecewise_constant_distribution<_RealType>::param_type::param_type(
-        size_t __nw, result_type __xmin, result_type __xmax, _UnaryOperation __fw)
-    : __b_(__nw == 0 ? 2 : __nw + 1)
-{
-    size_t __n = __b_.size() - 1;
-    result_type __d = (__xmax - __xmin) / __n;
-    __densities_.reserve(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-    {
-        __b_[__i] = __xmin + __i * __d;
-        __densities_.push_back(__fw(__b_[__i] + __d*.5));
-    }
-    __b_[__n] = __xmax;
-    __init();
-}
-
-template<class _RealType>
-template<class _URNG>
-_RealType
-piecewise_constant_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    typedef uniform_real_distribution<result_type> _Gen;
-    result_type __u = _Gen()(__g);
-    ptrdiff_t __k = _VSTD::upper_bound(__p.__areas_.begin(), __p.__areas_.end(),
-                                      __u) - __p.__areas_.begin() - 1;
-    return (__u - __p.__areas_[__k]) / __p.__densities_[__k] + __p.__b_[__k];
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const piecewise_constant_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    size_t __n = __x.__p_.__b_.size();
-    __os << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__b_[__i];
-    __n = __x.__p_.__densities_.size();
-    __os << __sp << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__densities_[__i];
-    __n = __x.__p_.__areas_.size();
-    __os << __sp << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__areas_[__i];
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           piecewise_constant_distribution<_RT>& __x)
-{
-    typedef piecewise_constant_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    size_t __n;
-    __is >> __n;
-    vector<result_type> __b(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __b[__i];
-    __is >> __n;
-    vector<result_type> __densities(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __densities[__i];
-    __is >> __n;
-    vector<result_type> __areas(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __areas[__i];
-    if (!__is.fail())
-    {
-        swap(__x.__p_.__b_, __b);
-        swap(__x.__p_.__densities_, __densities);
-        swap(__x.__p_.__areas_, __areas);
-    }
-    return __is;
-}
-
-// piecewise_linear_distribution
-
-template<class _RealType = double>
-class _LIBCPP_TYPE_VIS_ONLY piecewise_linear_distribution
-{
-public:
-    // types
-    typedef _RealType result_type;
-
-    class _LIBCPP_TYPE_VIS_ONLY param_type
-    {
-        vector<result_type> __b_;
-        vector<result_type> __densities_;
-        vector<result_type> __areas_;
-    public:
-        typedef piecewise_linear_distribution distribution_type;
-
-        param_type();
-        template<class _InputIteratorB, class _InputIteratorW>
-            param_type(_InputIteratorB __fB, _InputIteratorB __lB,
-                       _InputIteratorW __fW);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(initializer_list<result_type> __bl, _UnaryOperation __fw);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-        template<class _UnaryOperation>
-            param_type(size_t __nw, result_type __xmin, result_type __xmax,
-                       _UnaryOperation __fw);
-        param_type & operator=(const param_type& __rhs);
-        
-        _LIBCPP_INLINE_VISIBILITY
-        vector<result_type> intervals() const {return __b_;}
-        _LIBCPP_INLINE_VISIBILITY
-        vector<result_type> densities() const {return __densities_;}
-
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator==(const param_type& __x, const param_type& __y)
-            {return __x.__densities_ == __y.__densities_ && __x.__b_ == __y.__b_;}
-        friend _LIBCPP_INLINE_VISIBILITY
-            bool operator!=(const param_type& __x, const param_type& __y)
-            {return !(__x == __y);}
-
-    private:
-        void __init();
-
-        friend class piecewise_linear_distribution;
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_ostream<_CharT, _Traits>&
-        operator<<(basic_ostream<_CharT, _Traits>& __os,
-                   const piecewise_linear_distribution<_RT>& __x);
-
-        template <class _CharT, class _Traits, class _RT>
-        friend
-        basic_istream<_CharT, _Traits>&
-        operator>>(basic_istream<_CharT, _Traits>& __is,
-                   piecewise_linear_distribution<_RT>& __x);
-    };
-
-private:
-    param_type __p_;
-
-public:
-    // constructor and reset functions
-    _LIBCPP_INLINE_VISIBILITY
-    piecewise_linear_distribution() {}
-    template<class _InputIteratorB, class _InputIteratorW>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_linear_distribution(_InputIteratorB __fB,
-                                      _InputIteratorB __lB,
-                                      _InputIteratorW __fW)
-        : __p_(__fB, __lB, __fW) {}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_linear_distribution(initializer_list<result_type> __bl,
-                                      _UnaryOperation __fw)
-        : __p_(__bl, __fw) {}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template<class _UnaryOperation>
-        _LIBCPP_INLINE_VISIBILITY
-        piecewise_linear_distribution(size_t __nw, result_type __xmin,
-                                      result_type __xmax, _UnaryOperation __fw)
-        : __p_(__nw, __xmin, __xmax, __fw) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit piecewise_linear_distribution(const param_type& __p)
-        : __p_(__p) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void reset() {}
-
-    // generating functions
-    template<class _URNG>
-        _LIBCPP_INLINE_VISIBILITY
-        result_type operator()(_URNG& __g)
-        {return (*this)(__g, __p_);}
-    template<class _URNG> result_type operator()(_URNG& __g, const param_type& __p);
-
-    // property functions
-    _LIBCPP_INLINE_VISIBILITY
-    vector<result_type> intervals() const {return __p_.intervals();}
-    _LIBCPP_INLINE_VISIBILITY
-    vector<result_type> densities() const {return __p_.densities();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    param_type param() const {return __p_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void param(const param_type& __p) {__p_ = __p;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const {return __p_.__b_.front();}
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const {return __p_.__b_.back();}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const piecewise_linear_distribution& __x,
-                        const piecewise_linear_distribution& __y)
-        {return __x.__p_ == __y.__p_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const piecewise_linear_distribution& __x,
-                        const piecewise_linear_distribution& __y)
-        {return !(__x == __y);}
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os,
-               const piecewise_linear_distribution<_RT>& __x);
-
-    template <class _CharT, class _Traits, class _RT>
-    friend
-    basic_istream<_CharT, _Traits>&
-    operator>>(basic_istream<_CharT, _Traits>& __is,
-               piecewise_linear_distribution<_RT>& __x);
-};
-
-template<class _RealType>
-typename piecewise_linear_distribution<_RealType>::param_type &
-piecewise_linear_distribution<_RealType>::param_type::operator=
-                                                       (const param_type& __rhs)
-{
-//  These can throw
-    __b_.reserve        (__rhs.__b_.size ());
-    __densities_.reserve(__rhs.__densities_.size());
-    __areas_.reserve    (__rhs.__areas_.size());
-
-//  These can not throw
-    __b_         = __rhs.__b_;
-    __densities_ = __rhs.__densities_;
-    __areas_     =  __rhs.__areas_;
-    return *this;
-}
-
-
-template<class _RealType>
-void
-piecewise_linear_distribution<_RealType>::param_type::__init()
-{
-    __areas_.assign(__densities_.size() - 1, result_type());
-    result_type _Sp = 0;
-    for (size_t __i = 0; __i < __areas_.size(); ++__i)
-    {
-        __areas_[__i] = (__densities_[__i+1] + __densities_[__i]) *
-                        (__b_[__i+1] - __b_[__i]) * .5;
-        _Sp += __areas_[__i];
-    }
-    for (size_t __i = __areas_.size(); __i > 1;)
-    {
-        --__i;
-        __areas_[__i] = __areas_[__i-1] / _Sp;
-    }
-    __areas_[0] = 0;
-    for (size_t __i = 1; __i < __areas_.size(); ++__i)
-        __areas_[__i] += __areas_[__i-1];
-    for (size_t __i = 0; __i < __densities_.size(); ++__i)
-        __densities_[__i] /= _Sp;
-}
-
-template<class _RealType>
-piecewise_linear_distribution<_RealType>::param_type::param_type()
-    : __b_(2),
-      __densities_(2, 1.0),
-      __areas_(1, 0.0)
-{
-    __b_[1] = 1;
-}
-
-template<class _RealType>
-template<class _InputIteratorB, class _InputIteratorW>
-piecewise_linear_distribution<_RealType>::param_type::param_type(
-        _InputIteratorB __fB, _InputIteratorB __lB, _InputIteratorW __fW)
-    : __b_(__fB, __lB)
-{
-    if (__b_.size() < 2)
-    {
-        __b_.resize(2);
-        __b_[0] = 0;
-        __b_[1] = 1;
-        __densities_.assign(2, 1.0);
-        __areas_.assign(1, 0.0);
-    }
-    else
-    {
-        __densities_.reserve(__b_.size());
-        for (size_t __i = 0; __i < __b_.size(); ++__i, ++__fW)
-            __densities_.push_back(*__fW);
-        __init();
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _RealType>
-template<class _UnaryOperation>
-piecewise_linear_distribution<_RealType>::param_type::param_type(
-        initializer_list<result_type> __bl, _UnaryOperation __fw)
-    : __b_(__bl.begin(), __bl.end())
-{
-    if (__b_.size() < 2)
-    {
-        __b_.resize(2);
-        __b_[0] = 0;
-        __b_[1] = 1;
-        __densities_.assign(2, 1.0);
-        __areas_.assign(1, 0.0);
-    }
-    else
-    {
-        __densities_.reserve(__b_.size());
-        for (size_t __i = 0; __i < __b_.size(); ++__i)
-            __densities_.push_back(__fw(__b_[__i]));
-        __init();
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template<class _RealType>
-template<class _UnaryOperation>
-piecewise_linear_distribution<_RealType>::param_type::param_type(
-        size_t __nw, result_type __xmin, result_type __xmax, _UnaryOperation __fw)
-    : __b_(__nw == 0 ? 2 : __nw + 1)
-{
-    size_t __n = __b_.size() - 1;
-    result_type __d = (__xmax - __xmin) / __n;
-    __densities_.reserve(__b_.size());
-    for (size_t __i = 0; __i < __n; ++__i)
-    {
-        __b_[__i] = __xmin + __i * __d;
-        __densities_.push_back(__fw(__b_[__i]));
-    }
-    __b_[__n] = __xmax;
-    __densities_.push_back(__fw(__b_[__n]));
-    __init();
-}
-
-template<class _RealType>
-template<class _URNG>
-_RealType
-piecewise_linear_distribution<_RealType>::operator()(_URNG& __g, const param_type& __p)
-{
-    typedef uniform_real_distribution<result_type> _Gen;
-    result_type __u = _Gen()(__g);
-    ptrdiff_t __k = _VSTD::upper_bound(__p.__areas_.begin(), __p.__areas_.end(),
-                                      __u) - __p.__areas_.begin() - 1;
-    __u -= __p.__areas_[__k];
-    const result_type __dk = __p.__densities_[__k];
-    const result_type __dk1 = __p.__densities_[__k+1];
-    const result_type __deltad = __dk1 - __dk;
-    const result_type __bk = __p.__b_[__k];
-    if (__deltad == 0)
-        return __u / __dk + __bk;
-    const result_type __bk1 = __p.__b_[__k+1];
-    const result_type __deltab = __bk1 - __bk;
-    return (__bk * __dk1 - __bk1 * __dk +
-        _VSTD::sqrt(__deltab * (__deltab * __dk * __dk + 2 * __deltad * __u))) /
-        __deltad;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const piecewise_linear_distribution<_RT>& __x)
-{
-    __save_flags<_CharT, _Traits> __lx(__os);
-    __os.flags(ios_base::dec | ios_base::left | ios_base::fixed |
-               ios_base::scientific);
-    _CharT __sp = __os.widen(' ');
-    __os.fill(__sp);
-    size_t __n = __x.__p_.__b_.size();
-    __os << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__b_[__i];
-    __n = __x.__p_.__densities_.size();
-    __os << __sp << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__densities_[__i];
-    __n = __x.__p_.__areas_.size();
-    __os << __sp << __n;
-    for (size_t __i = 0; __i < __n; ++__i)
-        __os << __sp << __x.__p_.__areas_[__i];
-    return __os;
-}
-
-template <class _CharT, class _Traits, class _RT>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           piecewise_linear_distribution<_RT>& __x)
-{
-    typedef piecewise_linear_distribution<_RT> _Eng;
-    typedef typename _Eng::result_type result_type;
-    typedef typename _Eng::param_type param_type;
-    __save_flags<_CharT, _Traits> __lx(__is);
-    __is.flags(ios_base::dec | ios_base::skipws);
-    size_t __n;
-    __is >> __n;
-    vector<result_type> __b(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __b[__i];
-    __is >> __n;
-    vector<result_type> __densities(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __densities[__i];
-    __is >> __n;
-    vector<result_type> __areas(__n);
-    for (size_t __i = 0; __i < __n; ++__i)
-        __is >> __areas[__i];
-    if (!__is.fail())
-    {
-        swap(__x.__p_.__b_, __b);
-        swap(__x.__p_.__densities_, __densities);
-        swap(__x.__p_.__areas_, __areas);
-    }
-    return __is;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_RANDOM
diff --git a/include.new/c++/v1/tr1/ratio b/include.new/c++/v1/tr1/ratio
deleted file mode 100644
index 48dcd81..0000000
--- a/include.new/c++/v1/tr1/ratio
+++ /dev/null
@@ -1,487 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- ratio -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_RATIO
-#define _LIBCPP_RATIO
-
-/*
-    ratio synopsis
-
-namespace std
-{
-
-template <intmax_t N, intmax_t D = 1>
-class ratio
-{
-public:
-    static const intmax_t num;
-    static const intmax_t den;
-    typedef ratio<num, den> type;
-};
-
-// ratio arithmetic
-template <class R1, class R2> using ratio_add = ...;
-template <class R1, class R2> using ratio_subtract = ...;
-template <class R1, class R2> using ratio_multiply = ...;
-template <class R1, class R2> using ratio_divide = ...;
-
-// ratio comparison
-template <class R1, class R2> struct ratio_equal;
-template <class R1, class R2> struct ratio_not_equal;
-template <class R1, class R2> struct ratio_less;
-template <class R1, class R2> struct ratio_less_equal;
-template <class R1, class R2> struct ratio_greater;
-template <class R1, class R2> struct ratio_greater_equal;
-
-// convenience SI typedefs
-typedef ratio<1, 1000000000000000000000000> yocto;  // not supported
-typedef ratio<1,    1000000000000000000000> zepto;  // not supported
-typedef ratio<1,       1000000000000000000> atto;
-typedef ratio<1,          1000000000000000> femto;
-typedef ratio<1,             1000000000000> pico;
-typedef ratio<1,                1000000000> nano;
-typedef ratio<1,                   1000000> micro;
-typedef ratio<1,                      1000> milli;
-typedef ratio<1,                       100> centi;
-typedef ratio<1,                        10> deci;
-typedef ratio<                       10, 1> deca;
-typedef ratio<                      100, 1> hecto;
-typedef ratio<                     1000, 1> kilo;
-typedef ratio<                  1000000, 1> mega;
-typedef ratio<               1000000000, 1> giga;
-typedef ratio<            1000000000000, 1> tera;
-typedef ratio<         1000000000000000, 1> peta;
-typedef ratio<      1000000000000000000, 1> exa;
-typedef ratio<   1000000000000000000000, 1> zetta;  // not supported
-typedef ratio<1000000000000000000000000, 1> yotta;  // not supported
-
-}
-*/
-
-#include <__config>
-#include <cstdint>
-#include <climits>
-#include <type_traits>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// __static_gcd
-
-template <intmax_t _Xp, intmax_t _Yp>
-struct __static_gcd
-{
-    static const intmax_t value = __static_gcd<_Yp, _Xp % _Yp>::value;
-};
-
-template <intmax_t _Xp>
-struct __static_gcd<_Xp, 0>
-{
-    static const intmax_t value = _Xp;
-};
-
-template <>
-struct __static_gcd<0, 0>
-{
-    static const intmax_t value = 1;
-};
-
-// __static_lcm
-
-template <intmax_t _Xp, intmax_t _Yp>
-struct __static_lcm
-{
-    static const intmax_t value = _Xp / __static_gcd<_Xp, _Yp>::value * _Yp;
-};
-
-template <intmax_t _Xp>
-struct __static_abs
-{
-    static const intmax_t value = _Xp < 0 ? -_Xp : _Xp;
-};
-
-template <intmax_t _Xp>
-struct __static_sign
-{
-    static const intmax_t value = _Xp == 0 ? 0 : (_Xp < 0 ? -1 : 1);
-};
-
-template <intmax_t _Xp, intmax_t _Yp, intmax_t = __static_sign<_Yp>::value>
-class __ll_add;
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_add<_Xp, _Yp, 1>
-{
-    static const intmax_t min = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1;
-    static const intmax_t max = -min;
-
-    static_assert(_Xp <= max - _Yp, "overflow in __ll_add");
-public:
-    static const intmax_t value = _Xp + _Yp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_add<_Xp, _Yp, 0>
-{
-public:
-    static const intmax_t value = _Xp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_add<_Xp, _Yp, -1>
-{
-    static const intmax_t min = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1;
-    static const intmax_t max = -min;
-
-    static_assert(min - _Yp <= _Xp, "overflow in __ll_add");
-public:
-    static const intmax_t value = _Xp + _Yp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp, intmax_t = __static_sign<_Yp>::value>
-class __ll_sub;
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_sub<_Xp, _Yp, 1>
-{
-    static const intmax_t min = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1;
-    static const intmax_t max = -min;
-
-    static_assert(min + _Yp <= _Xp, "overflow in __ll_sub");
-public:
-    static const intmax_t value = _Xp - _Yp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_sub<_Xp, _Yp, 0>
-{
-public:
-    static const intmax_t value = _Xp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_sub<_Xp, _Yp, -1>
-{
-    static const intmax_t min = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1)) + 1;
-    static const intmax_t max = -min;
-
-    static_assert(_Xp <= max + _Yp, "overflow in __ll_sub");
-public:
-    static const intmax_t value = _Xp - _Yp;
-};
-
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_mul
-{
-    static const intmax_t nan = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1));
-    static const intmax_t min = nan + 1;
-    static const intmax_t max = -min;
-    static const intmax_t __a_x = __static_abs<_Xp>::value;
-    static const intmax_t __a_y = __static_abs<_Yp>::value;
-
-    static_assert(_Xp != nan && _Yp != nan && __a_x <= max / __a_y, "overflow in __ll_mul");
-public:
-    static const intmax_t value = _Xp * _Yp;
-};
-
-template <intmax_t _Yp>
-class __ll_mul<0, _Yp>
-{
-public:
-    static const intmax_t value = 0;
-};
-
-template <intmax_t _Xp>
-class __ll_mul<_Xp, 0>
-{
-public:
-    static const intmax_t value = 0;
-};
-
-template <>
-class __ll_mul<0, 0>
-{
-public:
-    static const intmax_t value = 0;
-};
-
-// Not actually used but left here in case needed in future maintenance
-template <intmax_t _Xp, intmax_t _Yp>
-class __ll_div
-{
-    static const intmax_t nan = (1LL << (sizeof(intmax_t) * CHAR_BIT - 1));
-    static const intmax_t min = nan + 1;
-    static const intmax_t max = -min;
-
-    static_assert(_Xp != nan && _Yp != nan && _Yp != 0, "overflow in __ll_div");
-public:
-    static const intmax_t value = _Xp / _Yp;
-};
-
-template <intmax_t _Num, intmax_t _Den = 1>
-class _LIBCPP_TYPE_VIS_ONLY ratio
-{
-    static_assert(__static_abs<_Num>::value >= 0, "ratio numerator is out of range");
-    static_assert(_Den != 0, "ratio divide by 0");
-    static_assert(__static_abs<_Den>::value >  0, "ratio denominator is out of range");
-    static const intmax_t __na = __static_abs<_Num>::value;
-    static const intmax_t __da = __static_abs<_Den>::value;
-    static const intmax_t __s = __static_sign<_Num>::value * __static_sign<_Den>::value;
-    static const intmax_t __gcd = __static_gcd<__na, __da>::value;
-public:
-    static const intmax_t num = __s * __na / __gcd;
-    static const intmax_t den = __da / __gcd;
-
-    typedef ratio<num, den> type;
-};
-
-template <intmax_t _Num, intmax_t _Den> const intmax_t ratio<_Num, _Den>::num;
-template <intmax_t _Num, intmax_t _Den> const intmax_t ratio<_Num, _Den>::den;
-
-template <class _Tp>                    struct __is_ratio                     : false_type {};
-template <intmax_t _Num, intmax_t _Den> struct __is_ratio<ratio<_Num, _Den> > : true_type  {};
-
-typedef ratio<1LL, 1000000000000000000LL> atto;
-typedef ratio<1LL,    1000000000000000LL> femto;
-typedef ratio<1LL,       1000000000000LL> pico;
-typedef ratio<1LL,          1000000000LL> nano;
-typedef ratio<1LL,             1000000LL> micro;
-typedef ratio<1LL,                1000LL> milli;
-typedef ratio<1LL,                 100LL> centi;
-typedef ratio<1LL,                  10LL> deci;
-typedef ratio<                 10LL, 1LL> deca;
-typedef ratio<                100LL, 1LL> hecto;
-typedef ratio<               1000LL, 1LL> kilo;
-typedef ratio<            1000000LL, 1LL> mega;
-typedef ratio<         1000000000LL, 1LL> giga;
-typedef ratio<      1000000000000LL, 1LL> tera;
-typedef ratio<   1000000000000000LL, 1LL> peta;
-typedef ratio<1000000000000000000LL, 1LL> exa;
-
-template <class _R1, class _R2>
-struct __ratio_multiply
-{
-private:
-    static const intmax_t __gcd_n1_d2 = __static_gcd<_R1::num, _R2::den>::value;
-    static const intmax_t __gcd_d1_n2 = __static_gcd<_R1::den, _R2::num>::value;
-public:
-    typedef typename ratio
-        <
-            __ll_mul<_R1::num / __gcd_n1_d2, _R2::num / __gcd_d1_n2>::value,
-            __ll_mul<_R2::den / __gcd_n1_d2, _R1::den / __gcd_d1_n2>::value
-        >::type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2> using ratio_multiply
-                                    = typename __ratio_multiply<_R1, _R2>::type;
-
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_multiply
-    : public __ratio_multiply<_R1, _R2>::type {};
-
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct __ratio_divide
-{
-private:
-    static const intmax_t __gcd_n1_n2 = __static_gcd<_R1::num, _R2::num>::value;
-    static const intmax_t __gcd_d1_d2 = __static_gcd<_R1::den, _R2::den>::value;
-public:
-    typedef typename ratio
-        <
-            __ll_mul<_R1::num / __gcd_n1_n2, _R2::den / __gcd_d1_d2>::value,
-            __ll_mul<_R2::num / __gcd_n1_n2, _R1::den / __gcd_d1_d2>::value
-        >::type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2> using ratio_divide
-                                      = typename __ratio_divide<_R1, _R2>::type;
-
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_divide
-    : public __ratio_divide<_R1, _R2>::type {};
-
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct __ratio_add
-{
-private:
-    static const intmax_t __gcd_n1_n2 = __static_gcd<_R1::num, _R2::num>::value;
-    static const intmax_t __gcd_d1_d2 = __static_gcd<_R1::den, _R2::den>::value;
-public:
-    typedef typename ratio_multiply
-        <
-            ratio<__gcd_n1_n2, _R1::den / __gcd_d1_d2>,
-            ratio
-            <
-                __ll_add
-                <
-                    __ll_mul<_R1::num / __gcd_n1_n2, _R2::den / __gcd_d1_d2>::value,
-                    __ll_mul<_R2::num / __gcd_n1_n2, _R1::den / __gcd_d1_d2>::value
-                >::value,
-                _R2::den
-            >
-        >::type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2> using ratio_add
-                                         = typename __ratio_add<_R1, _R2>::type;
-
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_add
-    : public __ratio_add<_R1, _R2>::type {};
-
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct __ratio_subtract
-{
-private:
-    static const intmax_t __gcd_n1_n2 = __static_gcd<_R1::num, _R2::num>::value;
-    static const intmax_t __gcd_d1_d2 = __static_gcd<_R1::den, _R2::den>::value;
-public:
-    typedef typename ratio_multiply
-        <
-            ratio<__gcd_n1_n2, _R1::den / __gcd_d1_d2>,
-            ratio
-            <
-                __ll_sub
-                <
-                    __ll_mul<_R1::num / __gcd_n1_n2, _R2::den / __gcd_d1_d2>::value,
-                    __ll_mul<_R2::num / __gcd_n1_n2, _R1::den / __gcd_d1_d2>::value
-                >::value,
-                _R2::den
-            >
-        >::type type;
-};
-
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2> using ratio_subtract
-                                    = typename __ratio_subtract<_R1, _R2>::type;
-
-#else  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_subtract
-    : public __ratio_subtract<_R1, _R2>::type {};
-
-#endif  // _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-
-// ratio_equal
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_equal
-    : public integral_constant<bool, _R1::num == _R2::num && _R1::den == _R2::den> {};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_not_equal
-    : public integral_constant<bool, !ratio_equal<_R1, _R2>::value> {};
-
-// ratio_less
-
-template <class _R1, class _R2, bool _Odd = false,
-          intmax_t _Q1 = _R1::num / _R1::den, intmax_t _M1 = _R1::num % _R1::den,
-          intmax_t _Q2 = _R2::num / _R2::den, intmax_t _M2 = _R2::num % _R2::den>
-struct __ratio_less1
-{
-    static const bool value = _Odd ? _Q2 < _Q1 : _Q1 < _Q2;
-};
-
-template <class _R1, class _R2, bool _Odd, intmax_t _Qp>
-struct __ratio_less1<_R1, _R2, _Odd, _Qp, 0, _Qp, 0>
-{
-    static const bool value = false;
-};
-
-template <class _R1, class _R2, bool _Odd, intmax_t _Qp, intmax_t _M2>
-struct __ratio_less1<_R1, _R2, _Odd, _Qp, 0, _Qp, _M2>
-{
-    static const bool value = !_Odd;
-};
-
-template <class _R1, class _R2, bool _Odd, intmax_t _Qp, intmax_t _M1>
-struct __ratio_less1<_R1, _R2, _Odd, _Qp, _M1, _Qp, 0>
-{
-    static const bool value = _Odd;
-};
-
-template <class _R1, class _R2, bool _Odd, intmax_t _Qp, intmax_t _M1,
-                                                        intmax_t _M2>
-struct __ratio_less1<_R1, _R2, _Odd, _Qp, _M1, _Qp, _M2>
-{
-    static const bool value = __ratio_less1<ratio<_R1::den, _M1>,
-                                            ratio<_R2::den, _M2>, !_Odd>::value;
-};
-
-template <class _R1, class _R2, intmax_t _S1 = __static_sign<_R1::num>::value,
-                                intmax_t _S2 = __static_sign<_R2::num>::value>
-struct __ratio_less
-{
-    static const bool value = _S1 < _S2;
-};
-
-template <class _R1, class _R2>
-struct __ratio_less<_R1, _R2, 1LL, 1LL>
-{
-    static const bool value = __ratio_less1<_R1, _R2>::value;
-};
-
-template <class _R1, class _R2>
-struct __ratio_less<_R1, _R2, -1LL, -1LL>
-{
-    static const bool value = __ratio_less1<ratio<-_R2::num, _R2::den>, ratio<-_R1::num, _R1::den> >::value;
-};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_less
-    : public integral_constant<bool, __ratio_less<_R1, _R2>::value> {};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_less_equal
-    : public integral_constant<bool, !ratio_less<_R2, _R1>::value> {};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_greater
-    : public integral_constant<bool, ratio_less<_R2, _R1>::value> {};
-
-template <class _R1, class _R2>
-struct _LIBCPP_TYPE_VIS_ONLY ratio_greater_equal
-    : public integral_constant<bool, !ratio_less<_R1, _R2>::value> {};
-
-template <class _R1, class _R2>
-struct __ratio_gcd
-{
-    typedef ratio<__static_gcd<_R1::num, _R2::num>::value,
-                  __static_lcm<_R1::den, _R2::den>::value> type;
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_RATIO
diff --git a/include.new/c++/v1/tr1/regex b/include.new/c++/v1/tr1/regex
deleted file mode 100644
index 690213a..0000000
--- a/include.new/c++/v1/tr1/regex
+++ /dev/null
@@ -1,6591 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- regex ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_REGEX
-#define _LIBCPP_REGEX
-
-/*
-    regex synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-namespace regex_constants
-{
-
-emum syntax_option_type
-{
-    icase      = unspecified,
-    nosubs     = unspecified,
-    optimize   = unspecified,
-    collate    = unspecified,
-    ECMAScript = unspecified,
-    basic      = unspecified,
-    extended   = unspecified,
-    awk        = unspecified,
-    grep       = unspecified,
-    egrep      = unspecified
-};
-
-constexpr syntax_option_type operator~(syntax_option_type f);
-constexpr syntax_option_type operator&(syntax_option_type lhs, syntax_option_type rhs);
-constexpr syntax_option_type operator|(syntax_option_type lhs, syntax_option_type rhs);
-
-enum match_flag_type
-{
-    match_default     = 0,
-    match_not_bol     = unspecified,
-    match_not_eol     = unspecified,
-    match_not_bow     = unspecified,
-    match_not_eow     = unspecified,
-    match_any         = unspecified,
-    match_not_null    = unspecified,
-    match_continuous  = unspecified,
-    match_prev_avail  = unspecified,
-    format_default    = 0,
-    format_sed        = unspecified,
-    format_no_copy    = unspecified,
-    format_first_only = unspecified
-};
-
-constexpr match_flag_type operator~(match_flag_type f);
-constexpr match_flag_type operator&(match_flag_type lhs, match_flag_type rhs);
-constexpr match_flag_type operator|(match_flag_type lhs, match_flag_type rhs);
-
-enum error_type
-{
-    error_collate    = unspecified,
-    error_ctype      = unspecified,
-    error_escape     = unspecified,
-    error_backref    = unspecified,
-    error_brack      = unspecified,
-    error_paren      = unspecified,
-    error_brace      = unspecified,
-    error_badbrace   = unspecified,
-    error_range      = unspecified,
-    error_space      = unspecified,
-    error_badrepeat  = unspecified,
-    error_complexity = unspecified,
-    error_stack      = unspecified
-};
-
-}  // regex_constants
-
-class regex_error
-    : public runtime_error
-{
-public:
-    explicit regex_error(regex_constants::error_type ecode);
-    regex_constants::error_type code() const;
-};
-
-template <class charT>
-struct regex_traits
-{
-public:
-    typedef charT                   char_type;
-    typedef basic_string<char_type> string_type;
-    typedef locale                  locale_type;
-    typedef /bitmask_type/          char_class_type;
-
-    regex_traits();
-
-    static size_t length(const char_type* p);
-    charT translate(charT c) const;
-    charT translate_nocase(charT c) const;
-    template <class ForwardIterator>
-        string_type
-        transform(ForwardIterator first, ForwardIterator last) const;
-    template <class ForwardIterator>
-        string_type
-        transform_primary( ForwardIterator first, ForwardIterator last) const;
-    template <class ForwardIterator>
-        string_type
-        lookup_collatename(ForwardIterator first, ForwardIterator last) const;
-    template <class ForwardIterator>
-        char_class_type
-        lookup_classname(ForwardIterator first, ForwardIterator last,
-                         bool icase = false) const;
-    bool isctype(charT c, char_class_type f) const;
-    int value(charT ch, int radix) const;
-    locale_type imbue(locale_type l);
-    locale_type getloc()const;
-};
-
-template <class charT, class traits = regex_traits<charT>>
-class basic_regex
-{
-public:
-    // types:
-    typedef charT                               value_type;
-    typedef regex_constants::syntax_option_type flag_type;
-    typedef typename traits::locale_type        locale_type;
-
-    // constants:
-    static constexpr regex_constants::syntax_option_type icase = regex_constants::icase;
-    static constexpr regex_constants::syntax_option_type nosubs = regex_constants::nosubs;
-    static constexpr regex_constants::syntax_option_type optimize = regex_constants::optimize;
-    static constexpr regex_constants::syntax_option_type collate = regex_constants::collate;
-    static constexpr regex_constants::syntax_option_type ECMAScript = regex_constants::ECMAScript;
-    static constexpr regex_constants::syntax_option_type basic = regex_constants::basic;
-    static constexpr regex_constants::syntax_option_type extended = regex_constants::extended;
-    static constexpr regex_constants::syntax_option_type awk = regex_constants::awk;
-    static constexpr regex_constants::syntax_option_type grep = regex_constants::grep;
-    static constexpr regex_constants::syntax_option_type egrep = regex_constants::egrep;
-
-    // construct/copy/destroy:
-    basic_regex();
-    explicit basic_regex(const charT* p, flag_type f = regex_constants::ECMAScript);
-    basic_regex(const charT* p, size_t len, flag_type f);
-    basic_regex(const basic_regex&);
-    basic_regex(basic_regex&&) noexcept;
-    template <class ST, class SA>
-        explicit basic_regex(const basic_string<charT, ST, SA>& p,
-                             flag_type f = regex_constants::ECMAScript);
-    template <class ForwardIterator>
-        basic_regex(ForwardIterator first, ForwardIterator last,
-                    flag_type f = regex_constants::ECMAScript);
-    basic_regex(initializer_list<charT>, flag_type = regex_constants::ECMAScript);
-
-    ~basic_regex();
-
-    basic_regex& operator=(const basic_regex&);
-    basic_regex& operator=(basic_regex&&) noexcept;
-    basic_regex& operator=(const charT* ptr);
-    basic_regex& operator=(initializer_list<charT> il);
-    template <class ST, class SA>
-        basic_regex& operator=(const basic_string<charT, ST, SA>& p);
-
-    // assign:
-    basic_regex& assign(const basic_regex& that);
-    basic_regex& assign(basic_regex&& that) noexcept;
-    basic_regex& assign(const charT* ptr, flag_type f = regex_constants::ECMAScript);
-    basic_regex& assign(const charT* p, size_t len, flag_type f);
-    template <class string_traits, class A>
-        basic_regex& assign(const basic_string<charT, string_traits, A>& s,
-                            flag_type f = regex_constants::ECMAScript);
-    template <class InputIterator>
-        basic_regex& assign(InputIterator first, InputIterator last,
-                            flag_type f = regex_constants::ECMAScript);
-    basic_regex& assign(initializer_list<charT>, flag_type = regex_constants::ECMAScript);
-
-    // const operations:
-    unsigned mark_count() const;
-    flag_type flags() const;
-
-    // locale:
-    locale_type imbue(locale_type loc);
-    locale_type getloc() const;
-
-    // swap:
-    void swap(basic_regex&);
-};
-
-typedef basic_regex<char>    regex;
-typedef basic_regex<wchar_t> wregex;
-
-template <class charT, class traits>
-    void swap(basic_regex<charT, traits>& e1, basic_regex<charT, traits>& e2);
-
-template <class BidirectionalIterator>
-class sub_match
-    : public pair<BidirectionalIterator, BidirectionalIterator>
-{
-public:
-    typedef typename iterator_traits<BidirectionalIterator>::value_type value_type;
-    typedef typename iterator_traits<BidirectionalIterator>::difference_type difference_type;
-    typedef BidirectionalIterator                                      iterator;
-    typedef basic_string<value_type>                                string_type;
-
-    bool matched;
-
-    constexpr sub_match();
-
-    difference_type length() const;
-    operator string_type() const;
-    string_type str() const;
-
-    int compare(const sub_match& s) const;
-    int compare(const string_type& s) const;
-    int compare(const value_type* s) const;
-};
-
-typedef sub_match<const char*>             csub_match;
-typedef sub_match<const wchar_t*>          wcsub_match;
-typedef sub_match<string::const_iterator>  ssub_match;
-typedef sub_match<wstring::const_iterator> wssub_match;
-
-template <class BiIter>
-    bool
-    operator==(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator!=(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<=(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>=(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>(const sub_match<BiIter>& lhs, const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator==(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator!=(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator<(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator>(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool operator>=(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-                    const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator<=(const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator==(const sub_match<BiIter>& lhs,
-               const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator!=(const sub_match<BiIter>& lhs,
-               const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator<(const sub_match<BiIter>& lhs,
-              const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool operator>(const sub_match<BiIter>& lhs,
-                   const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator>=(const sub_match<BiIter>& lhs,
-               const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter, class ST, class SA>
-    bool
-    operator<=(const sub_match<BiIter>& lhs,
-               const basic_string<typename iterator_traits<BiIter>::value_type, ST, SA>& rhs);
-
-template <class BiIter>
-    bool
-    operator==(typename iterator_traits<BiIter>::value_type const* lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator!=(typename iterator_traits<BiIter>::value_type const* lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<(typename iterator_traits<BiIter>::value_type const* lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>(typename iterator_traits<BiIter>::value_type const* lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>=(typename iterator_traits<BiIter>::value_type const* lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<=(typename iterator_traits<BiIter>::value_type const* lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator==(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator!=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator<(const sub_match<BiIter>& lhs,
-              typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator>(const sub_match<BiIter>& lhs,
-              typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator>=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator<=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const* rhs);
-
-template <class BiIter>
-    bool
-    operator==(typename iterator_traits<BiIter>::value_type const& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator!=(typename iterator_traits<BiIter>::value_type const& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<(typename iterator_traits<BiIter>::value_type const& lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>(typename iterator_traits<BiIter>::value_type const& lhs,
-              const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator>=(typename iterator_traits<BiIter>::value_type const& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator<=(typename iterator_traits<BiIter>::value_type const& lhs,
-               const sub_match<BiIter>& rhs);
-
-template <class BiIter>
-    bool
-    operator==(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator!=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator<(const sub_match<BiIter>& lhs,
-              typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator>(const sub_match<BiIter>& lhs,
-              typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator>=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class BiIter>
-    bool
-    operator<=(const sub_match<BiIter>& lhs,
-               typename iterator_traits<BiIter>::value_type const& rhs);
-
-template <class charT, class ST, class BiIter>
-    basic_ostream<charT, ST>&
-    operator<<(basic_ostream<charT, ST>& os, const sub_match<BiIter>& m);
-
-template <class BidirectionalIterator,
-          class Allocator = allocator<sub_match<BidirectionalIterator>>>
-class match_results
-{
-public:
-    typedef sub_match<BidirectionalIterator>                  value_type;
-    typedef const value_type&                                 const_reference;
-    typedef value_type&                                       reference;
-    typedef /implementation-defined/                          const_iterator;
-    typedef const_iterator                                    iterator;
-    typedef typename iterator_traits<BidirectionalIterator>::difference_type difference_type;
-    typedef typename allocator_traits<Allocator>::size_type   size_type;
-    typedef Allocator                                         allocator_type;
-    typedef typename iterator_traits<BidirectionalIterator>::value_type char_type;
-    typedef basic_string<char_type>                           string_type;
-
-    // construct/copy/destroy:
-    explicit match_results(const Allocator& a = Allocator());
-    match_results(const match_results& m);
-    match_results(match_results&& m) noexcept;
-    match_results& operator=(const match_results& m);
-    match_results& operator=(match_results&& m);
-    ~match_results();
-
-    bool ready() const;
-
-    // size:
-    size_type size() const;
-    size_type max_size() const;
-    bool empty() const;
-
-    // element access:
-    difference_type length(size_type sub = 0) const;
-    difference_type position(size_type sub = 0) const;
-    string_type str(size_type sub = 0) const;
-    const_reference operator[](size_type n) const;
-
-    const_reference prefix() const;
-    const_reference suffix() const;
-
-    const_iterator begin() const;
-    const_iterator end() const;
-    const_iterator cbegin() const;
-    const_iterator cend() const;
-
-    // format:
-    template <class OutputIter>
-        OutputIter
-        format(OutputIter out, const char_type* fmt_first,
-               const char_type* fmt_last,
-               regex_constants::match_flag_type flags = regex_constants::format_default) const;
-    template <class OutputIter, class ST, class SA>
-        OutputIter
-        format(OutputIter out, const basic_string<char_type, ST, SA>& fmt,
-               regex_constants::match_flag_type flags = regex_constants::format_default) const;
-    template <class ST, class SA>
-        basic_string<char_type, ST, SA>
-        format(const basic_string<char_type, ST, SA>& fmt,
-               regex_constants::match_flag_type flags = regex_constants::format_default) const;
-    string_type
-        format(const char_type* fmt,
-               regex_constants::match_flag_type flags = regex_constants::format_default) const;
-
-    // allocator:
-    allocator_type get_allocator() const;
-
-    // swap:
-    void swap(match_results& that);
-};
-
-typedef match_results<const char*>             cmatch;
-typedef match_results<const wchar_t*>          wcmatch;
-typedef match_results<string::const_iterator>  smatch;
-typedef match_results<wstring::const_iterator> wsmatch;
-
-template <class BidirectionalIterator, class Allocator>
-    bool
-    operator==(const match_results<BidirectionalIterator, Allocator>& m1,
-               const match_results<BidirectionalIterator, Allocator>& m2);
-
-template <class BidirectionalIterator, class Allocator>
-    bool
-    operator!=(const match_results<BidirectionalIterator, Allocator>& m1,
-               const match_results<BidirectionalIterator, Allocator>& m2);
-
-template <class BidirectionalIterator, class Allocator>
-    void
-    swap(match_results<BidirectionalIterator, Allocator>& m1,
-         match_results<BidirectionalIterator, Allocator>& m2);
-
-template <class BidirectionalIterator, class Allocator, class charT, class traits>
-    bool
-    regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                match_results<BidirectionalIterator, Allocator>& m,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class BidirectionalIterator, class charT, class traits>
-    bool
-    regex_match(BidirectionalIterator first, BidirectionalIterator last,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class charT, class Allocator, class traits>
-    bool
-    regex_match(const charT* str, match_results<const charT*, Allocator>& m,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class Allocator, class charT, class traits>
-    bool
-    regex_match(const basic_string<charT, ST, SA>& s,
-                match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class Allocator, class charT, class traits>
-    bool
-    regex_match(const basic_string<charT, ST, SA>&& s,
-                match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default) = delete; // C++14
-
-template <class charT, class traits>
-    bool
-    regex_match(const charT* str, const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class charT, class traits>
-    bool
-    regex_match(const basic_string<charT, ST, SA>& s,
-                const basic_regex<charT, traits>& e,
-                regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class BidirectionalIterator, class Allocator, class charT, class traits>
-    bool
-    regex_search(BidirectionalIterator first, BidirectionalIterator last,
-                 match_results<BidirectionalIterator, Allocator>& m,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class BidirectionalIterator, class charT, class traits>
-    bool
-    regex_search(BidirectionalIterator first, BidirectionalIterator last,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class charT, class Allocator, class traits>
-    bool
-    regex_search(const charT* str, match_results<const charT*, Allocator>& m,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class charT, class traits>
-    bool
-    regex_search(const charT* str, const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class charT, class traits>
-    bool
-    regex_search(const basic_string<charT, ST, SA>& s,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class Allocator, class charT, class traits>
-    bool
-    regex_search(const basic_string<charT, ST, SA>& s,
-                 match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class ST, class SA, class Allocator, class charT, class traits>
-    bool
-    regex_search(const basic_string<charT, ST, SA>&& s,
-                 match_results<typename basic_string<charT, ST, SA>::const_iterator, Allocator>& m,
-                 const basic_regex<charT, traits>& e,
-                 regex_constants::match_flag_type flags = regex_constants::match_default) = delete; // C++14
-
-template <class OutputIterator, class BidirectionalIterator,
-          class traits, class charT, class ST, class SA>
-    OutputIterator
-    regex_replace(OutputIterator out,
-                  BidirectionalIterator first, BidirectionalIterator last,
-                  const basic_regex<charT, traits>& e,
-                  const basic_string<charT, ST, SA>& fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class OutputIterator, class BidirectionalIterator,
-          class traits, class charT>
-    OutputIterator
-    regex_replace(OutputIterator out,
-                  BidirectionalIterator first, BidirectionalIterator last,
-                  const basic_regex<charT, traits>& e, const charT* fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class traits, class charT, class ST, class SA, class FST, class FSA>>
-    basic_string<charT, ST, SA>
-    regex_replace(const basic_string<charT, ST, SA>& s,
-                  const basic_regex<charT, traits>& e,
-                  const basic_string<charT, FST, FSA>& fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class traits, class charT, class ST, class SA>
-    basic_string<charT, ST, SA>
-    regex_replace(const basic_string<charT, ST, SA>& s,
-                  const basic_regex<charT, traits>& e, const charT* fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class traits, class charT, class ST, class SA>
-    basic_string<charT>
-    regex_replace(const charT* s,
-                  const basic_regex<charT, traits>& e,
-                  const basic_string<charT, ST, SA>& fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class traits, class charT>
-    basic_string<charT>
-    regex_replace(const charT* s,
-                  const basic_regex<charT, traits>& e,
-                  const charT* fmt,
-                  regex_constants::match_flag_type flags = regex_constants::match_default);
-
-template <class BidirectionalIterator,
-          class charT = typename iterator_traits< BidirectionalIterator>::value_type,
-          class traits = regex_traits<charT>>
-class regex_iterator
-{
-public:
-    typedef basic_regex<charT, traits>           regex_type;
-    typedef match_results<BidirectionalIterator> value_type;
-    typedef ptrdiff_t                            difference_type;
-    typedef const value_type*                    pointer;
-    typedef const value_type&                    reference;
-    typedef forward_iterator_tag                 iterator_category;
-
-    regex_iterator();
-    regex_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                   const regex_type& re,
-                   regex_constants::match_flag_type m = regex_constants::match_default);
-    regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                   const regex_type&& __re,
-                   regex_constants::match_flag_type __m 
-                                     = regex_constants::match_default) = delete; // C++14
-    regex_iterator(const regex_iterator&);
-    regex_iterator& operator=(const regex_iterator&);
-
-    bool operator==(const regex_iterator&) const;
-    bool operator!=(const regex_iterator&) const;
-
-    const value_type& operator*() const;
-    const value_type* operator->() const;
-
-    regex_iterator& operator++();
-    regex_iterator operator++(int);
-};
-
-typedef regex_iterator<const char*>             cregex_iterator;
-typedef regex_iterator<const wchar_t*>          wcregex_iterator;
-typedef regex_iterator<string::const_iterator>  sregex_iterator;
-typedef regex_iterator<wstring::const_iterator> wsregex_iterator;
-
-template <class BidirectionalIterator,
-          class charT = typename iterator_traits< BidirectionalIterator>::value_type,
-          class traits = regex_traits<charT>>
-class regex_token_iterator
-{
-public:
-    typedef basic_regex<charT, traits>       regex_type;
-    typedef sub_match<BidirectionalIterator> value_type;
-    typedef ptrdiff_t                        difference_type;
-    typedef const value_type*                pointer;
-    typedef const value_type&                reference;
-    typedef forward_iterator_tag             iterator_category;
-
-    regex_token_iterator();
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type& re, int submatch = 0,
-                         regex_constants::match_flag_type m = regex_constants::match_default);
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type&& re, int submatch = 0,
-                         regex_constants::match_flag_type m = regex_constants::match_default) = delete; // C++14
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type& re, const vector<int>& submatches,
-                         regex_constants::match_flag_type m = regex_constants::match_default);
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type&& re, const vector<int>& submatches,
-                         regex_constants::match_flag_type m = regex_constants::match_default) = delete; // C++14
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type& re, initializer_list<int> submatches,
-                         regex_constants::match_flag_type m = regex_constants::match_default);
-    regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                         const regex_type&& re, initializer_list<int> submatches,
-                         regex_constants::match_flag_type m = regex_constants::match_default) = delete; // C++14
-    template <size_t N>
-        regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                             const regex_type& re, const int (&submatches)[N],
-                             regex_constants::match_flag_type m = regex_constants::match_default);
-    template <size_t N>
-        regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b,
-                             const regex_type& re, const int (&submatches)[N],
-                             regex_constants::match_flag_type m = regex_constants::match_default) = delete // C++14;
-    regex_token_iterator(const regex_token_iterator&);
-    regex_token_iterator& operator=(const regex_token_iterator&);
-
-    bool operator==(const regex_token_iterator&) const;
-    bool operator!=(const regex_token_iterator&) const;
-
-    const value_type& operator*() const;
-    const value_type* operator->() const;
-
-    regex_token_iterator& operator++();
-    regex_token_iterator operator++(int);
-};
-
-typedef regex_token_iterator<const char*>             cregex_token_iterator;
-typedef regex_token_iterator<const wchar_t*>          wcregex_token_iterator;
-typedef regex_token_iterator<string::const_iterator>  sregex_token_iterator;
-typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
-
-} // std
-*/
-
-#include <__config>
-#include <stdexcept>
-#include <__locale>
-#include <initializer_list>
-#include <utility>
-#include <iterator>
-#include <string>
-#include <memory>
-#include <vector>
-#include <deque>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-namespace regex_constants
-{
-
-// syntax_option_type
-
-enum syntax_option_type
-{
-    icase      = 1 << 0,
-    nosubs     = 1 << 1,
-    optimize   = 1 << 2,
-    collate    = 1 << 3,
-    ECMAScript = 0,
-    basic      = 1 << 4,
-    extended   = 1 << 5,
-    awk        = 1 << 6,
-    grep       = 1 << 7,
-    egrep      = 1 << 8
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-syntax_option_type
-operator~(syntax_option_type __x)
-{
-    return syntax_option_type(~int(__x) & 0x1FF);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-syntax_option_type
-operator&(syntax_option_type __x, syntax_option_type __y)
-{
-    return syntax_option_type(int(__x) & int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-syntax_option_type
-operator|(syntax_option_type __x, syntax_option_type __y)
-{
-    return syntax_option_type(int(__x) | int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-syntax_option_type
-operator^(syntax_option_type __x, syntax_option_type __y)
-{
-    return syntax_option_type(int(__x) ^ int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-syntax_option_type&
-operator&=(syntax_option_type& __x, syntax_option_type __y)
-{
-    __x = __x & __y;
-    return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-syntax_option_type&
-operator|=(syntax_option_type& __x, syntax_option_type __y)
-{
-    __x = __x | __y;
-    return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-syntax_option_type&
-operator^=(syntax_option_type& __x, syntax_option_type __y)
-{
-    __x = __x ^ __y;
-    return __x;
-}
-
-// match_flag_type
-
-enum match_flag_type
-{
-    match_default     = 0,
-    match_not_bol     = 1 << 0,
-    match_not_eol     = 1 << 1,
-    match_not_bow     = 1 << 2,
-    match_not_eow     = 1 << 3,
-    match_any         = 1 << 4,
-    match_not_null    = 1 << 5,
-    match_continuous  = 1 << 6,
-    match_prev_avail  = 1 << 7,
-    format_default    = 0,
-    format_sed        = 1 << 8,
-    format_no_copy    = 1 << 9,
-    format_first_only = 1 << 10,
-    __no_update_pos   = 1 << 11
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-match_flag_type
-operator~(match_flag_type __x)
-{
-    return match_flag_type(~int(__x) & 0x0FFF);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-match_flag_type
-operator&(match_flag_type __x, match_flag_type __y)
-{
-    return match_flag_type(int(__x) & int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-match_flag_type
-operator|(match_flag_type __x, match_flag_type __y)
-{
-    return match_flag_type(int(__x) | int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-_LIBCPP_CONSTEXPR
-match_flag_type
-operator^(match_flag_type __x, match_flag_type __y)
-{
-    return match_flag_type(int(__x) ^ int(__y));
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-match_flag_type&
-operator&=(match_flag_type& __x, match_flag_type __y)
-{
-    __x = __x & __y;
-    return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-match_flag_type&
-operator|=(match_flag_type& __x, match_flag_type __y)
-{
-    __x = __x | __y;
-    return __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-match_flag_type&
-operator^=(match_flag_type& __x, match_flag_type __y)
-{
-    __x = __x ^ __y;
-    return __x;
-}
-
-enum error_type
-{
-    error_collate = 1,
-    error_ctype,
-    error_escape,
-    error_backref,
-    error_brack,
-    error_paren,
-    error_brace,
-    error_badbrace,
-    error_range,
-    error_space,
-    error_badrepeat,
-    error_complexity,
-    error_stack,
-    __re_err_grammar,
-    __re_err_empty,
-    __re_err_unknown
-};
-
-}  // regex_constants
-
-class _LIBCPP_EXCEPTION_ABI regex_error
-    : public runtime_error
-{
-    regex_constants::error_type __code_;
-public:
-    explicit regex_error(regex_constants::error_type __ecode);
-    virtual ~regex_error() throw();
-     _LIBCPP_INLINE_VISIBILITY
-    regex_constants::error_type code() const {return __code_;}
-};
-
-template <class _CharT>
-struct _LIBCPP_TYPE_VIS_ONLY regex_traits
-{
-public:
-    typedef _CharT                  char_type;
-    typedef basic_string<char_type> string_type;
-    typedef locale                  locale_type;
-    typedef ctype_base::mask        char_class_type;
-
-    static const char_class_type __regex_word = 0x80;
-private:
-    locale __loc_;
-    const ctype<char_type>* __ct_;
-    const collate<char_type>* __col_;
-
-public:
-    regex_traits();
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_t length(const char_type* __p)
-        {return char_traits<char_type>::length(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    char_type translate(char_type __c) const {return __c;}
-    char_type translate_nocase(char_type __c) const;
-    template <class _ForwardIterator>
-        string_type
-        transform(_ForwardIterator __f, _ForwardIterator __l) const;
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        string_type
-        transform_primary( _ForwardIterator __f, _ForwardIterator __l) const
-            {return __transform_primary(__f, __l, char_type());}
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        string_type
-        lookup_collatename(_ForwardIterator __f, _ForwardIterator __l) const
-            {return __lookup_collatename(__f, __l, char_type());}
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        char_class_type
-        lookup_classname(_ForwardIterator __f, _ForwardIterator __l,
-                         bool __icase = false) const
-            {return __lookup_classname(__f, __l, __icase, char_type());}
-    bool isctype(char_type __c, char_class_type __m) const;
-    _LIBCPP_INLINE_VISIBILITY
-    int value(char_type __ch, int __radix) const
-        {return __regex_traits_value(__ch, __radix);}
-    locale_type imbue(locale_type __l);
-    _LIBCPP_INLINE_VISIBILITY
-    locale_type getloc()const {return __loc_;}
-
-private:
-    void __init();
-
-    template <class _ForwardIterator>
-        string_type
-        __transform_primary(_ForwardIterator __f, _ForwardIterator __l, char) const;
-    template <class _ForwardIterator>
-        string_type
-        __transform_primary(_ForwardIterator __f, _ForwardIterator __l, wchar_t) const;
-
-    template <class _ForwardIterator>
-        string_type
-        __lookup_collatename(_ForwardIterator __f, _ForwardIterator __l, char) const;
-    template <class _ForwardIterator>
-        string_type
-        __lookup_collatename(_ForwardIterator __f, _ForwardIterator __l, wchar_t) const;
-
-    template <class _ForwardIterator>
-        char_class_type
-        __lookup_classname(_ForwardIterator __f, _ForwardIterator __l,
-                           bool __icase, char) const;
-    template <class _ForwardIterator>
-        char_class_type
-        __lookup_classname(_ForwardIterator __f, _ForwardIterator __l,
-                           bool __icase, wchar_t) const;
-
-    static int __regex_traits_value(unsigned char __ch, int __radix);
-    _LIBCPP_INLINE_VISIBILITY
-    int __regex_traits_value(char __ch, int __radix) const
-        {return __regex_traits_value(static_cast<unsigned char>(__ch), __radix);}
-    int __regex_traits_value(wchar_t __ch, int __radix) const;
-};
-
-template <class _CharT>
-const typename regex_traits<_CharT>::char_class_type
-regex_traits<_CharT>::__regex_word;
-
-template <class _CharT>
-regex_traits<_CharT>::regex_traits()
-{
-    __init();
-}
-
-template <class _CharT>
-typename regex_traits<_CharT>::char_type
-regex_traits<_CharT>::translate_nocase(char_type __c) const
-{
-    return __ct_->tolower(__c);
-}
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::transform(_ForwardIterator __f, _ForwardIterator __l) const
-{
-    string_type __s(__f, __l);
-    return __col_->transform(__s.data(), __s.data() + __s.size());
-}
-
-template <class _CharT>
-void
-regex_traits<_CharT>::__init()
-{
-    __ct_ = &use_facet<ctype<char_type> >(__loc_);
-    __col_ = &use_facet<collate<char_type> >(__loc_);
-}
-
-template <class _CharT>
-typename regex_traits<_CharT>::locale_type
-regex_traits<_CharT>::imbue(locale_type __l)
-{
-    locale __r = __loc_;
-    __loc_ = __l;
-    __init();
-    return __r;
-}
-
-// transform_primary is very FreeBSD-specific
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::__transform_primary(_ForwardIterator __f,
-                                          _ForwardIterator __l, char) const
-{
-    const string_type __s(__f, __l);
-    string_type __d = __col_->transform(__s.data(), __s.data() + __s.size());
-    switch (__d.size())
-    {
-    case 1:
-        break;
-    case 12:
-        __d[11] = __d[3];
-        break;
-    default:
-        __d.clear();
-        break;
-    }
-    return __d;
-}
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::__transform_primary(_ForwardIterator __f,
-                                          _ForwardIterator __l, wchar_t) const
-{
-    const string_type __s(__f, __l);
-    string_type __d = __col_->transform(__s.data(), __s.data() + __s.size());
-    switch (__d.size())
-    {
-    case 1:
-        break;
-    case 3:
-        __d[2] = __d[0];
-        break;
-    default:
-        __d.clear();
-        break;
-    }
-    return __d;
-}
-
-// lookup_collatename is very FreeBSD-specific
-
-_LIBCPP_FUNC_VIS string __get_collation_name(const char* __s);
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::__lookup_collatename(_ForwardIterator __f,
-                                           _ForwardIterator __l, char) const
-{
-    string_type __s(__f, __l);
-    string_type __r;
-    if (!__s.empty())
-    {
-        __r = __get_collation_name(__s.c_str());
-        if (__r.empty() && __s.size() <= 2)
-        {
-            __r = __col_->transform(__s.data(), __s.data() + __s.size());
-            if (__r.size() == 1 || __r.size() == 12)
-                __r = __s;
-            else
-                __r.clear();
-        }
-    }
-    return __r;
-}
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::string_type
-regex_traits<_CharT>::__lookup_collatename(_ForwardIterator __f,
-                                           _ForwardIterator __l, wchar_t) const
-{
-    string_type __s(__f, __l);
-    string __n;
-    __n.reserve(__s.size());
-    for (typename string_type::const_iterator __i = __s.begin(), __e = __s.end();
-                                                              __i != __e; ++__i)
-    {
-        if (static_cast<unsigned>(*__i) >= 127)
-            return string_type();
-        __n.push_back(char(*__i));
-    }
-    string_type __r;
-    if (!__s.empty())
-    {
-        __n = __get_collation_name(__n.c_str());
-        if (!__n.empty())
-            __r.assign(__n.begin(), __n.end());
-        else if (__s.size() <= 2)
-        {
-            __r = __col_->transform(__s.data(), __s.data() + __s.size());
-            if (__r.size() == 1 || __r.size() == 3)
-                __r = __s;
-            else
-                __r.clear();
-        }
-    }
-    return __r;
-}
-
-// lookup_classname
-
-regex_traits<char>::char_class_type _LIBCPP_FUNC_VIS
-__get_classname(const char* __s, bool __icase);
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::char_class_type
-regex_traits<_CharT>::__lookup_classname(_ForwardIterator __f,
-                                         _ForwardIterator __l,
-                                         bool __icase, char) const
-{
-    string_type __s(__f, __l);
-    __ct_->tolower(&__s[0], &__s[0] + __s.size());
-    return __get_classname(__s.c_str(), __icase);
-}
-
-template <class _CharT>
-template <class _ForwardIterator>
-typename regex_traits<_CharT>::char_class_type
-regex_traits<_CharT>::__lookup_classname(_ForwardIterator __f,
-                                         _ForwardIterator __l,
-                                         bool __icase, wchar_t) const
-{
-    string_type __s(__f, __l);
-    __ct_->tolower(&__s[0], &__s[0] + __s.size());
-    string __n;
-    __n.reserve(__s.size());
-    for (typename string_type::const_iterator __i = __s.begin(), __e = __s.end();
-                                                              __i != __e; ++__i)
-    {
-        if (static_cast<unsigned>(*__i) >= 127)
-            return char_class_type();
-        __n.push_back(char(*__i));
-    }
-    return __get_classname(__n.c_str(), __icase);
-}
-
-template <class _CharT>
-bool
-regex_traits<_CharT>::isctype(char_type __c, char_class_type __m) const
-{
-    if (__ct_->is(__m, __c))
-        return true;
-    return (__c == '_' && (__m & __regex_word));
-}
-
-template <class _CharT>
-int
-regex_traits<_CharT>::__regex_traits_value(unsigned char __ch, int __radix)
-{
-    if ((__ch & 0xF8u) == 0x30)  // '0' <= __ch && __ch <= '7'
-        return __ch - '0';
-    if (__radix != 8)
-    {
-        if ((__ch & 0xFEu) == 0x38)  // '8' <= __ch && __ch <= '9'
-            return __ch - '0';
-        if (__radix == 16)
-        {
-            __ch |= 0x20;  // tolower
-            if ('a' <= __ch && __ch <= 'f')
-                return __ch - ('a' - 10);
-        }
-    }
-    return -1;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-int
-regex_traits<_CharT>::__regex_traits_value(wchar_t __ch, int __radix) const
-{
-    return __regex_traits_value(static_cast<unsigned char>(__ct_->narrow(__ch, char_type())), __radix);
-}
-
-template <class _CharT> class __node;
-
-template <class _BidirectionalIterator> class _LIBCPP_TYPE_VIS_ONLY sub_match;
-
-template <class _BidirectionalIterator,
-          class _Allocator = allocator<sub_match<_BidirectionalIterator> > >
-class _LIBCPP_TYPE_VIS_ONLY match_results;
-
-template <class _CharT>
-struct __state
-{
-    enum
-    {
-        __end_state = -1000,
-        __consume_input,  // -999
-        __begin_marked_expr, // -998
-        __end_marked_expr,   // -997
-        __pop_state,           // -996
-        __accept_and_consume,  // -995
-        __accept_but_not_consume,  // -994
-        __reject,                  // -993
-        __split,
-        __repeat
-    };
-
-    int __do_;
-    const _CharT* __first_;
-    const _CharT* __current_;
-    const _CharT* __last_;
-    vector<sub_match<const _CharT*> > __sub_matches_;
-    vector<pair<size_t, const _CharT*> > __loop_data_;
-    const __node<_CharT>* __node_;
-    regex_constants::match_flag_type __flags_;
-    bool __at_first_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __state()
-        : __do_(0), __first_(nullptr), __current_(nullptr), __last_(nullptr),
-          __node_(nullptr), __flags_() {}
-};
-
-// __node
-
-template <class _CharT>
-class __node
-{
-    __node(const __node&);
-    __node& operator=(const __node&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __node() {}
-    _LIBCPP_INLINE_VISIBILITY
-    virtual ~__node() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    virtual void __exec(__state&) const {};
-    _LIBCPP_INLINE_VISIBILITY
-    virtual void __exec_split(bool, __state&) const {};
-};
-
-// __end_state
-
-template <class _CharT>
-class __end_state
-    : public __node<_CharT>
-{
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __end_state() {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__end_state<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__end_state;
-}
-
-// __has_one_state
-
-template <class _CharT>
-class __has_one_state
-    : public __node<_CharT>
-{
-    __node<_CharT>* __first_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __has_one_state(__node<_CharT>* __s)
-        : __first_(__s) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __node<_CharT>*  first() const {return __first_;}
-    _LIBCPP_INLINE_VISIBILITY
-    __node<_CharT>*& first()       {return __first_;}
-};
-
-// __owns_one_state
-
-template <class _CharT>
-class __owns_one_state
-    : public __has_one_state<_CharT>
-{
-    typedef __has_one_state<_CharT> base;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __owns_one_state(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual ~__owns_one_state();
-};
-
-template <class _CharT>
-__owns_one_state<_CharT>::~__owns_one_state()
-{
-    delete this->first();
-}
-
-// __empty_state
-
-template <class _CharT>
-class __empty_state
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __empty_state(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__empty_state<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    __s.__node_ = this->first();
-}
-
-// __empty_non_own_state
-
-template <class _CharT>
-class __empty_non_own_state
-    : public __has_one_state<_CharT>
-{
-    typedef __has_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __empty_non_own_state(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__empty_non_own_state<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    __s.__node_ = this->first();
-}
-
-// __repeat_one_loop
-
-template <class _CharT>
-class __repeat_one_loop
-    : public __has_one_state<_CharT>
-{
-    typedef __has_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __repeat_one_loop(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__repeat_one_loop<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__repeat;
-    __s.__node_ = this->first();
-}
-
-// __owns_two_states
-
-template <class _CharT>
-class __owns_two_states
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    base* __second_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __owns_two_states(__node<_CharT>* __s1, base* __s2)
-        : base(__s1), __second_(__s2) {}
-
-    virtual ~__owns_two_states();
-
-    _LIBCPP_INLINE_VISIBILITY
-    base*  second() const {return __second_;}
-    _LIBCPP_INLINE_VISIBILITY
-    base*& second()       {return __second_;}
-};
-
-template <class _CharT>
-__owns_two_states<_CharT>::~__owns_two_states()
-{
-    delete __second_;
-}
-
-// __loop
-
-template <class _CharT>
-class __loop
-    : public __owns_two_states<_CharT>
-{
-    typedef __owns_two_states<_CharT> base;
-
-    size_t __min_;
-    size_t __max_;
-    unsigned __loop_id_;
-    unsigned __mexp_begin_;
-    unsigned __mexp_end_;
-    bool __greedy_;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __loop(unsigned __loop_id,
-                          __node<_CharT>* __s1, __owns_one_state<_CharT>* __s2,
-                          unsigned __mexp_begin, unsigned __mexp_end,
-                          bool __greedy = true,
-                          size_t __min = 0,
-                          size_t __max = numeric_limits<size_t>::max())
-        : base(__s1, __s2), __min_(__min), __max_(__max), __loop_id_(__loop_id),
-          __mexp_begin_(__mexp_begin), __mexp_end_(__mexp_end),
-          __greedy_(__greedy) {}
-
-    virtual void __exec(__state& __s) const;
-    virtual void __exec_split(bool __second, __state& __s) const;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __init_repeat(__state& __s) const
-    {
-        __s.__loop_data_[__loop_id_].second = __s.__current_;
-        for (size_t __i = __mexp_begin_-1; __i != __mexp_end_-1; ++__i)
-        {
-            __s.__sub_matches_[__i].first = __s.__last_;
-            __s.__sub_matches_[__i].second = __s.__last_;
-            __s.__sub_matches_[__i].matched = false;
-        }
-    }
-};
-
-template <class _CharT>
-void
-__loop<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__do_ == __state::__repeat)
-    {
-        bool __do_repeat = ++__s.__loop_data_[__loop_id_].first < __max_;
-        bool __do_alt = __s.__loop_data_[__loop_id_].first >= __min_;
-        if (__do_repeat && __do_alt &&
-                               __s.__loop_data_[__loop_id_].second == __s.__current_)
-            __do_repeat = false;
-        if (__do_repeat && __do_alt)
-            __s.__do_ = __state::__split;
-        else if (__do_repeat)
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__node_ = this->first();
-            __init_repeat(__s);
-        }
-        else
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__node_ = this->second();
-        }
-    }
-    else
-    {
-        __s.__loop_data_[__loop_id_].first = 0;
-        bool __do_repeat = 0 < __max_;
-        bool __do_alt = 0 >= __min_;
-        if (__do_repeat && __do_alt)
-            __s.__do_ = __state::__split;
-        else if (__do_repeat)
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__node_ = this->first();
-            __init_repeat(__s);
-        }
-        else
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__node_ = this->second();
-        }
-    }
-}
-
-template <class _CharT>
-void
-__loop<_CharT>::__exec_split(bool __second, __state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    if (__greedy_ != __second)
-    {
-        __s.__node_ = this->first();
-        __init_repeat(__s);
-    }
-    else
-        __s.__node_ = this->second();
-}
-
-// __alternate
-
-template <class _CharT>
-class __alternate
-    : public __owns_two_states<_CharT>
-{
-    typedef __owns_two_states<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __alternate(__owns_one_state<_CharT>* __s1,
-                         __owns_one_state<_CharT>* __s2)
-        : base(__s1, __s2) {}
-
-    virtual void __exec(__state& __s) const;
-    virtual void __exec_split(bool __second, __state& __s) const;
-};
-
-template <class _CharT>
-void
-__alternate<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__split;
-}
-
-template <class _CharT>
-void
-__alternate<_CharT>::__exec_split(bool __second, __state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    if (__second)
-        __s.__node_ = this->second();
-    else
-        __s.__node_ = this->first();
-}
-
-// __begin_marked_subexpression
-
-template <class _CharT>
-class __begin_marked_subexpression
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __begin_marked_subexpression(unsigned __mexp, __node<_CharT>* __s)
-        : base(__s), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__begin_marked_subexpression<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    __s.__sub_matches_[__mexp_-1].first = __s.__current_;
-    __s.__node_ = this->first();
-}
-
-// __end_marked_subexpression
-
-template <class _CharT>
-class __end_marked_subexpression
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __end_marked_subexpression(unsigned __mexp, __node<_CharT>* __s)
-        : base(__s), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__end_marked_subexpression<_CharT>::__exec(__state& __s) const
-{
-    __s.__do_ = __state::__accept_but_not_consume;
-    __s.__sub_matches_[__mexp_-1].second = __s.__current_;
-    __s.__sub_matches_[__mexp_-1].matched = true;
-    __s.__node_ = this->first();
-}
-
-// __back_ref
-
-template <class _CharT>
-class __back_ref
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __back_ref(unsigned __mexp, __node<_CharT>* __s)
-        : base(__s), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__back_ref<_CharT>::__exec(__state& __s) const
-{
-    sub_match<const _CharT*>& __sm = __s.__sub_matches_[__mexp_-1];
-    if (__sm.matched)
-    {
-        ptrdiff_t __len = __sm.second - __sm.first;
-        if (__s.__last_ - __s.__current_ >= __len &&
-            _VSTD::equal(__sm.first, __sm.second, __s.__current_))
-        {
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__current_ += __len;
-            __s.__node_ = this->first();
-        }
-        else
-        {
-            __s.__do_ = __state::__reject;
-            __s.__node_ = nullptr;
-        }
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __back_ref_icase
-
-template <class _CharT, class _Traits>
-class __back_ref_icase
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __back_ref_icase(const _Traits& __traits, unsigned __mexp,
-                              __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__back_ref_icase<_CharT, _Traits>::__exec(__state& __s) const
-{
-    sub_match<const _CharT*>& __sm = __s.__sub_matches_[__mexp_-1];
-    if (__sm.matched)
-    {
-        ptrdiff_t __len = __sm.second - __sm.first;
-        if (__s.__last_ - __s.__current_ >= __len)
-        {
-            for (ptrdiff_t __i = 0; __i < __len; ++__i)
-            {
-                if (__traits_.translate_nocase(__sm.first[__i]) !=
-                                __traits_.translate_nocase(__s.__current_[__i]))
-                    goto __not_equal;
-            }
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__current_ += __len;
-            __s.__node_ = this->first();
-        }
-        else
-        {
-            __s.__do_ = __state::__reject;
-            __s.__node_ = nullptr;
-        }
-    }
-    else
-    {
-__not_equal:
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __back_ref_collate
-
-template <class _CharT, class _Traits>
-class __back_ref_collate
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    unsigned __mexp_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __back_ref_collate(const _Traits& __traits, unsigned __mexp,
-                              __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__back_ref_collate<_CharT, _Traits>::__exec(__state& __s) const
-{
-    sub_match<const _CharT*>& __sm = __s.__sub_matches_[__mexp_-1];
-    if (__sm.matched)
-    {
-        ptrdiff_t __len = __sm.second - __sm.first;
-        if (__s.__last_ - __s.__current_ >= __len)
-        {
-            for (ptrdiff_t __i = 0; __i < __len; ++__i)
-            {
-                if (__traits_.translate(__sm.first[__i]) !=
-                                       __traits_.translate(__s.__current_[__i]))
-                    goto __not_equal;
-            }
-            __s.__do_ = __state::__accept_but_not_consume;
-            __s.__current_ += __len;
-            __s.__node_ = this->first();
-        }
-        else
-        {
-            __s.__do_ = __state::__reject;
-            __s.__node_ = nullptr;
-        }
-    }
-    else
-    {
-__not_equal:
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __word_boundary
-
-template <class _CharT, class _Traits>
-class __word_boundary
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    bool __invert_;
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __word_boundary(const _Traits& __traits, bool __invert,
-                             __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __invert_(__invert) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__word_boundary<_CharT, _Traits>::__exec(__state& __s) const
-{
-    bool __is_word_b = false;
-    if (__s.__first_ != __s.__last_)
-    {
-        if (__s.__current_ == __s.__last_)
-        {
-            if (!(__s.__flags_ & regex_constants::match_not_eow))
-            {
-                _CharT __c = __s.__current_[-1];
-                __is_word_b = __c == '_' ||
-                              __traits_.isctype(__c, ctype_base::alnum);
-            }
-        }
-        else if (__s.__current_ == __s.__first_ &&
-                !(__s.__flags_ & regex_constants::match_prev_avail))
-        {
-            if (!(__s.__flags_ & regex_constants::match_not_bow))
-            {
-                _CharT __c = *__s.__current_;
-                __is_word_b = __c == '_' ||
-                              __traits_.isctype(__c, ctype_base::alnum);
-            }
-        }
-        else
-        {
-            _CharT __c1 = __s.__current_[-1];
-            _CharT __c2 = *__s.__current_;
-            bool __is_c1_b = __c1 == '_' ||
-                             __traits_.isctype(__c1, ctype_base::alnum);
-            bool __is_c2_b = __c2 == '_' ||
-                             __traits_.isctype(__c2, ctype_base::alnum);
-            __is_word_b = __is_c1_b != __is_c2_b;
-        }
-    }
-    if (__is_word_b != __invert_)
-    {
-        __s.__do_ = __state::__accept_but_not_consume;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __l_anchor
-
-template <class _CharT>
-class __l_anchor
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __l_anchor(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__l_anchor<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__at_first_ && __s.__current_ == __s.__first_)
-    {
-        __s.__do_ = __state::__accept_but_not_consume;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __r_anchor
-
-template <class _CharT>
-class __r_anchor
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __r_anchor(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__r_anchor<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__current_ == __s.__last_)
-    {
-        __s.__do_ = __state::__accept_but_not_consume;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __match_any
-
-template <class _CharT>
-class __match_any
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_any(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__match_any<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__current_ != __s.__last_ && *__s.__current_ != 0)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        ++__s.__current_;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __match_any_but_newline
-
-template <class _CharT>
-class __match_any_but_newline
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_any_but_newline(__node<_CharT>* __s)
-        : base(__s) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <> _LIBCPP_FUNC_VIS void __match_any_but_newline<char>::__exec(__state&) const;
-template <> _LIBCPP_FUNC_VIS void __match_any_but_newline<wchar_t>::__exec(__state&) const;
-
-// __match_char
-
-template <class _CharT>
-class __match_char
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _CharT __c_;
-
-    __match_char(const __match_char&);
-    __match_char& operator=(const __match_char&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_char(_CharT __c, __node<_CharT>* __s)
-        : base(__s), __c_(__c) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT>
-void
-__match_char<_CharT>::__exec(__state& __s) const
-{
-    if (__s.__current_ != __s.__last_ && *__s.__current_ == __c_)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        ++__s.__current_;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __match_char_icase
-
-template <class _CharT, class _Traits>
-class __match_char_icase
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    _CharT __c_;
-
-    __match_char_icase(const __match_char_icase&);
-    __match_char_icase& operator=(const __match_char_icase&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_char_icase(const _Traits& __traits, _CharT __c, __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __c_(__traits.translate_nocase(__c)) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__match_char_icase<_CharT, _Traits>::__exec(__state& __s) const
-{
-    if (__s.__current_ != __s.__last_ &&
-        __traits_.translate_nocase(*__s.__current_) == __c_)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        ++__s.__current_;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __match_char_collate
-
-template <class _CharT, class _Traits>
-class __match_char_collate
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    _Traits __traits_;
-    _CharT __c_;
-
-    __match_char_collate(const __match_char_collate&);
-    __match_char_collate& operator=(const __match_char_collate&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __match_char_collate(const _Traits& __traits, _CharT __c, __node<_CharT>* __s)
-        : base(__s), __traits_(__traits), __c_(__traits.translate(__c)) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__match_char_collate<_CharT, _Traits>::__exec(__state& __s) const
-{
-    if (__s.__current_ != __s.__last_ &&
-        __traits_.translate(*__s.__current_) == __c_)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        ++__s.__current_;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-// __bracket_expression
-
-template <class _CharT, class _Traits>
-class __bracket_expression
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-    typedef typename _Traits::string_type string_type;
-
-    _Traits __traits_;
-    vector<_CharT> __chars_;
-    vector<_CharT> __neg_chars_;
-    vector<pair<string_type, string_type> > __ranges_;
-    vector<pair<_CharT, _CharT> > __digraphs_;
-    vector<string_type> __equivalences_;
-    typename regex_traits<_CharT>::char_class_type __mask_;
-    typename regex_traits<_CharT>::char_class_type __neg_mask_;
-    bool __negate_;
-    bool __icase_;
-    bool __collate_;
-    bool __might_have_digraph_;
-
-    __bracket_expression(const __bracket_expression&);
-    __bracket_expression& operator=(const __bracket_expression&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __bracket_expression(const _Traits& __traits, __node<_CharT>* __s,
-                                 bool __negate, bool __icase, bool __collate)
-        : base(__s), __traits_(__traits), __mask_(), __neg_mask_(),
-          __negate_(__negate), __icase_(__icase), __collate_(__collate),
-          __might_have_digraph_(__traits_.getloc().name() != "C") {}
-
-    virtual void __exec(__state&) const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __negated() const {return __negate_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_char(_CharT __c)
-        {
-            if (__icase_)
-                __chars_.push_back(__traits_.translate_nocase(__c));
-            else if (__collate_)
-                __chars_.push_back(__traits_.translate(__c));
-            else
-                __chars_.push_back(__c);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_neg_char(_CharT __c)
-        {
-            if (__icase_)
-                __neg_chars_.push_back(__traits_.translate_nocase(__c));
-            else if (__collate_)
-                __neg_chars_.push_back(__traits_.translate(__c));
-            else
-                __neg_chars_.push_back(__c);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_range(string_type __b, string_type __e)
-        {
-            if (__collate_)
-            {
-                if (__icase_)
-                {
-                    for (size_t __i = 0; __i < __b.size(); ++__i)
-                        __b[__i] = __traits_.translate_nocase(__b[__i]);
-                    for (size_t __i = 0; __i < __e.size(); ++__i)
-                        __e[__i] = __traits_.translate_nocase(__e[__i]);
-                }
-                else
-                {
-                    for (size_t __i = 0; __i < __b.size(); ++__i)
-                        __b[__i] = __traits_.translate(__b[__i]);
-                    for (size_t __i = 0; __i < __e.size(); ++__i)
-                        __e[__i] = __traits_.translate(__e[__i]);
-                }
-                __ranges_.push_back(make_pair(
-                                  __traits_.transform(__b.begin(), __b.end()),
-                                  __traits_.transform(__e.begin(), __e.end())));
-            }
-            else
-            {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__b.size() != 1 || __e.size() != 1)
-                    throw regex_error(regex_constants::error_collate);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                if (__icase_)
-                {
-                    __b[0] = __traits_.translate_nocase(__b[0]);
-                    __e[0] = __traits_.translate_nocase(__e[0]);
-                }
-                __ranges_.push_back(make_pair(_VSTD::move(__b), _VSTD::move(__e)));
-            }
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_digraph(_CharT __c1, _CharT __c2)
-        {
-            if (__icase_)
-                __digraphs_.push_back(make_pair(__traits_.translate_nocase(__c1),
-                                                __traits_.translate_nocase(__c2)));
-            else if (__collate_)
-                __digraphs_.push_back(make_pair(__traits_.translate(__c1),
-                                                __traits_.translate(__c2)));
-            else
-                __digraphs_.push_back(make_pair(__c1, __c2));
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_equivalence(const string_type& __s)
-        {__equivalences_.push_back(__s);}
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_class(typename regex_traits<_CharT>::char_class_type __mask)
-        {__mask_ |= __mask;}
-    _LIBCPP_INLINE_VISIBILITY
-    void __add_neg_class(typename regex_traits<_CharT>::char_class_type __mask)
-        {__neg_mask_ |= __mask;}
-};
-
-template <class _CharT, class _Traits>
-void
-__bracket_expression<_CharT, _Traits>::__exec(__state& __s) const
-{
-    bool __found = false;
-    unsigned __consumed = 0;
-    if (__s.__current_ != __s.__last_)
-    {
-        ++__consumed;
-        if (__might_have_digraph_)
-        {
-            const _CharT* __next = _VSTD::next(__s.__current_);
-            if (__next != __s.__last_)
-            {
-                pair<_CharT, _CharT> __ch2(*__s.__current_, *__next);
-                if (__icase_)
-                {
-                    __ch2.first = __traits_.translate_nocase(__ch2.first);
-                    __ch2.second = __traits_.translate_nocase(__ch2.second);
-                }
-                else if (__collate_)
-                {
-                    __ch2.first = __traits_.translate(__ch2.first);
-                    __ch2.second = __traits_.translate(__ch2.second);
-                }
-                if (!__traits_.lookup_collatename(&__ch2.first, &__ch2.first+2).empty())
-                {
-                    // __ch2 is a digraph in this locale
-                    ++__consumed;
-                    for (size_t __i = 0; __i < __digraphs_.size(); ++__i)
-                    {
-                        if (__ch2 == __digraphs_[__i])
-                        {
-                            __found = true;
-                            goto __exit;
-                        }
-                    }
-                    if (__collate_ && !__ranges_.empty())
-                    {
-                        string_type __s2 = __traits_.transform(&__ch2.first,
-                                                               &__ch2.first + 2);
-                        for (size_t __i = 0; __i < __ranges_.size(); ++__i)
-                        {
-                            if (__ranges_[__i].first <= __s2 &&
-                                __s2 <= __ranges_[__i].second)
-                            {
-                                __found = true;
-                                goto __exit;
-                            }
-                        }
-                    }
-                    if (!__equivalences_.empty())
-                    {
-                        string_type __s2 = __traits_.transform_primary(&__ch2.first,
-                                                                       &__ch2.first + 2);
-                        for (size_t __i = 0; __i < __equivalences_.size(); ++__i)
-                        {
-                            if (__s2 == __equivalences_[__i])
-                            {
-                                __found = true;
-                                goto __exit;
-                            }
-                        }
-                    }
-                    if (__traits_.isctype(__ch2.first, __mask_) &&
-                        __traits_.isctype(__ch2.second, __mask_))
-                    {
-                        __found = true;
-                        goto __exit;
-                    }
-                    if (!__traits_.isctype(__ch2.first, __neg_mask_) &&
-                        !__traits_.isctype(__ch2.second, __neg_mask_))
-                    {
-                        __found = true;
-                        goto __exit;
-                    }
-                    goto __exit;
-                }
-            }
-        }
-        // test *__s.__current_ as not a digraph
-        _CharT __ch = *__s.__current_;
-        if (__icase_)
-            __ch = __traits_.translate_nocase(__ch);
-        else if (__collate_)
-            __ch = __traits_.translate(__ch);
-        for (size_t __i = 0; __i < __chars_.size(); ++__i)
-        {
-            if (__ch == __chars_[__i])
-            {
-                __found = true;
-                goto __exit;
-            }
-        }
-        if (!__neg_chars_.empty())
-        {
-            for (size_t __i = 0; __i < __neg_chars_.size(); ++__i)
-            {
-                if (__ch == __neg_chars_[__i])
-                    goto __is_neg_char;
-            }
-            __found = true;
-            goto __exit;
-        }
-__is_neg_char:
-        if (!__ranges_.empty())
-        {
-            string_type __s2 = __collate_ ?
-                                   __traits_.transform(&__ch, &__ch + 1) :
-                                   string_type(1, __ch);
-            for (size_t __i = 0; __i < __ranges_.size(); ++__i)
-            {
-                if (__ranges_[__i].first <= __s2 && __s2 <= __ranges_[__i].second)
-                {
-                    __found = true;
-                    goto __exit;
-                }
-            }
-        }
-        if (!__equivalences_.empty())
-        {
-            string_type __s2 = __traits_.transform_primary(&__ch, &__ch + 1);
-            for (size_t __i = 0; __i < __equivalences_.size(); ++__i)
-            {
-                if (__s2 == __equivalences_[__i])
-                {
-                    __found = true;
-                    goto __exit;
-                }
-            }
-        }
-        if (__traits_.isctype(__ch, __mask_))
-        {
-            __found = true;
-            goto __exit;
-        }
-        if (__neg_mask_ && !__traits_.isctype(__ch, __neg_mask_))
-        {
-            __found = true;
-            goto __exit;
-        }
-    }
-    else
-        __found = __negate_;  // force reject
-__exit:
-    if (__found != __negate_)
-    {
-        __s.__do_ = __state::__accept_and_consume;
-        __s.__current_ += __consumed;
-        __s.__node_ = this->first();
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-template <class _CharT, class _Traits> class __lookahead;
-
-template <class _CharT, class _Traits = regex_traits<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY basic_regex
-{
-public:
-    // types:
-    typedef _CharT                              value_type;
-    typedef regex_constants::syntax_option_type flag_type;
-    typedef typename _Traits::locale_type       locale_type;
-
-private:
-    _Traits   __traits_;
-    flag_type __flags_;
-    unsigned __marked_count_;
-    unsigned __loop_count_;
-    int __open_count_;
-    shared_ptr<__empty_state<_CharT> > __start_;
-    __owns_one_state<_CharT>* __end_;
-
-    typedef _VSTD::__state<_CharT> __state;
-    typedef _VSTD::__node<_CharT> __node;
-
-public:
-    // constants:
-    static const regex_constants::syntax_option_type icase = regex_constants::icase;
-    static const regex_constants::syntax_option_type nosubs = regex_constants::nosubs;
-    static const regex_constants::syntax_option_type optimize = regex_constants::optimize;
-    static const regex_constants::syntax_option_type collate = regex_constants::collate;
-    static const regex_constants::syntax_option_type ECMAScript = regex_constants::ECMAScript;
-    static const regex_constants::syntax_option_type basic = regex_constants::basic;
-    static const regex_constants::syntax_option_type extended = regex_constants::extended;
-    static const regex_constants::syntax_option_type awk = regex_constants::awk;
-    static const regex_constants::syntax_option_type grep = regex_constants::grep;
-    static const regex_constants::syntax_option_type egrep = regex_constants::egrep;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex()
-        : __flags_(), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit basic_regex(const value_type* __p, flag_type __f = regex_constants::ECMAScript)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__p, __p + __traits_.length(__p));}
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex(const value_type* __p, size_t __len, flag_type __f)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__p, __p + __len);}
-//     basic_regex(const basic_regex&) = default;
-//     basic_regex(basic_regex&&) = default;
-    template <class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit basic_regex(const basic_string<value_type, _ST, _SA>& __p,
-                             flag_type __f = regex_constants::ECMAScript)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__p.begin(), __p.end());}
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_regex(_ForwardIterator __first, _ForwardIterator __last,
-                    flag_type __f = regex_constants::ECMAScript)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__first, __last);}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex(initializer_list<value_type> __il,
-                flag_type __f = regex_constants::ECMAScript)
-        : __flags_(__f), __marked_count_(0), __loop_count_(0), __open_count_(0),
-          __end_(0)
-        {__parse(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-//    ~basic_regex() = default;
-
-//     basic_regex& operator=(const basic_regex&) = default;
-//     basic_regex& operator=(basic_regex&&) = default;
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& operator=(const value_type* __p)
-        {return assign(__p);}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& operator=(initializer_list<value_type> __il)
-        {return assign(__il);}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template <class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_regex& operator=(const basic_string<value_type, _ST, _SA>& __p)
-        {return assign(__p);}
-
-    // assign:
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(const basic_regex& __that)
-        {return *this = __that;}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(basic_regex&& __that) _NOEXCEPT
-        {return *this = _VSTD::move(__that);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(const value_type* __p, flag_type __f = regex_constants::ECMAScript)
-        {return assign(__p, __p + __traits_.length(__p), __f);}
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(const value_type* __p, size_t __len, flag_type __f)
-        {return assign(__p, __p + __len, __f);}
-    template <class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_regex& assign(const basic_string<value_type, _ST, _SA>& __s,
-                            flag_type __f = regex_constants::ECMAScript)
-            {return assign(__s.begin(), __s.end(), __f);}
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            basic_regex&
-        >::type
-        assign(_InputIterator __first, _InputIterator __last,
-                            flag_type __f = regex_constants::ECMAScript)
-        {
-            basic_string<_CharT> __t(__first, __last);
-            return assign(__t.begin(), __t.end(), __f);
-        }
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __member_init(flag_type __f)
-    {
-        __flags_ = __f;
-        __marked_count_ = 0;
-        __loop_count_ = 0;
-        __open_count_ = 0;
-        __end_ = nullptr;
-    }
-public:
-
-    template <class _ForwardIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            basic_regex&
-        >::type
-        assign(_ForwardIterator __first, _ForwardIterator __last,
-                            flag_type __f = regex_constants::ECMAScript)
-        {
-            __member_init(__f);
-            __parse(__first, __last);
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_regex& assign(initializer_list<value_type> __il,
-                        flag_type __f = regex_constants::ECMAScript)
-        {return assign(__il.begin(), __il.end(), __f);}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    // const operations:
-    _LIBCPP_INLINE_VISIBILITY
-    unsigned mark_count() const {return __marked_count_;}
-    _LIBCPP_INLINE_VISIBILITY
-    flag_type flags() const {return __flags_;}
-
-    // locale:
-    _LIBCPP_INLINE_VISIBILITY
-    locale_type imbue(locale_type __loc)
-    {
-        __member_init(ECMAScript);
-        __start_.reset();
-        return __traits_.imbue(__loc);
-    }
-    _LIBCPP_INLINE_VISIBILITY
-    locale_type getloc() const {return __traits_.getloc();}
-
-    // swap:
-    void swap(basic_regex& __r);
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    unsigned __loop_count() const {return __loop_count_;}
-
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_basic_reg_exp(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_RE_expression(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_simple_RE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_nondupl_RE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_one_char_or_coll_elem_RE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_Back_open_paren(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_Back_close_paren(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_Back_open_brace(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_Back_close_brace(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_BACKREF(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ORD_CHAR(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_QUOTED_CHAR(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_RE_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last,
-                               __owns_one_state<_CharT>* __s,
-                               unsigned __mexp_begin, unsigned __mexp_end);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ERE_dupl_symbol(_ForwardIterator __first, _ForwardIterator __last,
-                                __owns_one_state<_CharT>* __s,
-                                unsigned __mexp_begin, unsigned __mexp_end);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_bracket_expression(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_follow_list(_ForwardIterator __first, _ForwardIterator __last,
-                            __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_expression_term(_ForwardIterator __first, _ForwardIterator __last,
-                                __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_equivalence_class(_ForwardIterator __first, _ForwardIterator __last,
-                                  __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_character_class(_ForwardIterator __first, _ForwardIterator __last,
-                                __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_collating_symbol(_ForwardIterator __first, _ForwardIterator __last,
-                                 basic_string<_CharT>& __col_sym);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_DUP_COUNT(_ForwardIterator __first, _ForwardIterator __last, int& __c);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_extended_reg_exp(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ERE_branch(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ERE_expression(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_one_char_or_coll_elem_ERE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ORD_CHAR_ERE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_QUOTED_CHAR_ERE(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_ecma_exp(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_alternative(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_term(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_assertion(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_atom(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_atom_escape(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_decimal_escape(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_character_class_escape(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_character_escape(_ForwardIterator __first, _ForwardIterator __last,
-                                 basic_string<_CharT>* __str = nullptr);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_pattern_character(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_grep(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_egrep(_ForwardIterator __first, _ForwardIterator __last);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_class_escape(_ForwardIterator __first, _ForwardIterator __last,
-                          basic_string<_CharT>& __str,
-                          __bracket_expression<_CharT, _Traits>* __ml);
-    template <class _ForwardIterator>
-        _ForwardIterator
-        __parse_awk_escape(_ForwardIterator __first, _ForwardIterator __last,
-                          basic_string<_CharT>* __str = nullptr);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __push_l_anchor();
-    void __push_r_anchor();
-    void __push_match_any();
-    void __push_match_any_but_newline();
-    _LIBCPP_INLINE_VISIBILITY
-    void __push_greedy_inf_repeat(size_t __min, __owns_one_state<_CharT>* __s,
-                                  unsigned __mexp_begin = 0, unsigned __mexp_end = 0)
-        {__push_loop(__min, numeric_limits<size_t>::max(), __s,
-                     __mexp_begin, __mexp_end);}
-    _LIBCPP_INLINE_VISIBILITY
-    void __push_nongreedy_inf_repeat(size_t __min, __owns_one_state<_CharT>* __s,
-                                  unsigned __mexp_begin = 0, unsigned __mexp_end = 0)
-        {__push_loop(__min, numeric_limits<size_t>::max(), __s,
-                     __mexp_begin, __mexp_end, false);}
-    void __push_loop(size_t __min, size_t __max, __owns_one_state<_CharT>* __s,
-                     size_t __mexp_begin = 0, size_t __mexp_end = 0,
-                     bool __greedy = true);
-    __bracket_expression<_CharT, _Traits>* __start_matching_list(bool __negate);
-    void __push_char(value_type __c);
-    void __push_back_ref(int __i);
-    void __push_alternation(__owns_one_state<_CharT>* __sa,
-                            __owns_one_state<_CharT>* __sb);
-    void __push_begin_marked_subexpression();
-    void __push_end_marked_subexpression(unsigned);
-    void __push_empty();
-    void __push_word_boundary(bool);
-    void __push_lookahead(const basic_regex&, bool, unsigned);
-
-    template <class _Allocator>
-        bool
-        __search(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags) const;
-
-    template <class _Allocator>
-        bool
-        __match_at_start(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags, bool) const;
-    template <class _Allocator>
-        bool
-        __match_at_start_ecma(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags, bool) const;
-    template <class _Allocator>
-        bool
-        __match_at_start_posix_nosubs(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags, bool) const;
-    template <class _Allocator>
-        bool
-        __match_at_start_posix_subs(const _CharT* __first, const _CharT* __last,
-                 match_results<const _CharT*, _Allocator>& __m,
-                 regex_constants::match_flag_type __flags, bool) const;
-
-    template <class _Bp, class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(_Bp, _Bp, match_results<_Bp, _Ap>&, const basic_regex<_Cp, _Tp>&,
-                 regex_constants::match_flag_type);
-
-    template <class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(const _Cp*, const _Cp*, match_results<const _Cp*, _Ap>&,
-                 const basic_regex<_Cp, _Tp>&, regex_constants::match_flag_type);
-
-    template <class _Bp, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(_Bp, _Bp, const basic_regex<_Cp, _Tp>&,
-                 regex_constants::match_flag_type);
-
-    template <class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(const _Cp*, const _Cp*,
-                 const basic_regex<_Cp, _Tp>&, regex_constants::match_flag_type);
-
-    template <class _Cp, class _Ap, class _Tp>
-    friend
-    bool
-    regex_search(const _Cp*, match_results<const _Cp*, _Ap>&, const basic_regex<_Cp, _Tp>&,
-                 regex_constants::match_flag_type);
-
-    template <class _ST, class _SA, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(const basic_string<_Cp, _ST, _SA>& __s,
-                 const basic_regex<_Cp, _Tp>& __e,
-                 regex_constants::match_flag_type __flags);
-
-    template <class _ST, class _SA, class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(const basic_string<_Cp, _ST, _SA>& __s,
-                 match_results<typename basic_string<_Cp, _ST, _SA>::const_iterator, _Ap>&,
-                 const basic_regex<_Cp, _Tp>& __e,
-                 regex_constants::match_flag_type __flags);
-
-    template <class _Iter, class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_search(__wrap_iter<_Iter> __first,
-                 __wrap_iter<_Iter> __last,
-                 match_results<__wrap_iter<_Iter>, _Ap>& __m,
-                 const basic_regex<_Cp, _Tp>& __e,
-                 regex_constants::match_flag_type __flags);
-
-    template <class, class> friend class __lookahead;
-};
-
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::icase;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::nosubs;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::optimize;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::collate;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::ECMAScript;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::basic;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::extended;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::awk;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::grep;
-template <class _CharT, class _Traits>
-    const regex_constants::syntax_option_type basic_regex<_CharT, _Traits>::egrep;
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::swap(basic_regex& __r)
-{
-    using _VSTD::swap;
-    swap(__traits_, __r.__traits_);
-    swap(__flags_, __r.__flags_);
-    swap(__marked_count_, __r.__marked_count_);
-    swap(__loop_count_, __r.__loop_count_);
-    swap(__open_count_, __r.__open_count_);
-    swap(__start_, __r.__start_);
-    swap(__end_, __r.__end_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_regex<_CharT, _Traits>& __x, basic_regex<_CharT, _Traits>& __y)
-{
-    return __x.swap(__y);
-}
-
-// __lookahead
-
-template <class _CharT, class _Traits>
-class __lookahead
-    : public __owns_one_state<_CharT>
-{
-    typedef __owns_one_state<_CharT> base;
-
-    basic_regex<_CharT, _Traits> __exp_;
-    unsigned __mexp_;
-    bool __invert_;
-
-    __lookahead(const __lookahead&);
-    __lookahead& operator=(const __lookahead&);
-public:
-    typedef _VSTD::__state<_CharT> __state;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __lookahead(const basic_regex<_CharT, _Traits>& __exp, bool __invert, __node<_CharT>* __s, unsigned __mexp)
-        : base(__s), __exp_(__exp), __invert_(__invert), __mexp_(__mexp) {}
-
-    virtual void __exec(__state&) const;
-};
-
-template <class _CharT, class _Traits>
-void
-__lookahead<_CharT, _Traits>::__exec(__state& __s) const
-{
-    match_results<const _CharT*> __m;
-    __m.__init(1 + __exp_.mark_count(), __s.__current_, __s.__last_);
-    bool __matched = __exp_.__match_at_start_ecma(__s.__current_, __s.__last_,
-                                                  __m,
-                                                  __s.__flags_ | regex_constants::match_continuous,
-                                                  __s.__at_first_ && __s.__current_ == __s.__first_);
-    if (__matched != __invert_)
-    {
-        __s.__do_ = __state::__accept_but_not_consume;
-        __s.__node_ = this->first();
-        for (unsigned __i = 1; __i < __m.size(); ++__i) {
-            __s.__sub_matches_[__mexp_ + __i - 1] = __m.__matches_[__i];
-        }
-    }
-    else
-    {
-        __s.__do_ = __state::__reject;
-        __s.__node_ = nullptr;
-    }
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse(_ForwardIterator __first,
-                                      _ForwardIterator __last)
-{
-    {
-        unique_ptr<__node> __h(new __end_state<_CharT>);
-        __start_.reset(new __empty_state<_CharT>(__h.get()));
-        __h.release();
-        __end_ = __start_.get();
-    }
-    switch (__flags_ & 0x1F0)
-    {
-    case ECMAScript:
-        __first = __parse_ecma_exp(__first, __last);
-        break;
-    case basic:
-        __first = __parse_basic_reg_exp(__first, __last);
-        break;
-    case extended:
-    case awk:
-        __first = __parse_extended_reg_exp(__first, __last);
-        break;
-    case grep:
-        __first = __parse_grep(__first, __last);
-        break;
-    case egrep:
-        __first = __parse_egrep(__first, __last);
-        break;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    default:
-        throw regex_error(regex_constants::__re_err_grammar);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_basic_reg_exp(_ForwardIterator __first,
-                                                    _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        if (*__first == '^')
-        {
-            __push_l_anchor();
-            ++__first;
-        }
-        if (__first != __last)
-        {
-            __first = __parse_RE_expression(__first, __last);
-            if (__first != __last)
-            {
-                _ForwardIterator __temp = _VSTD::next(__first);
-                if (__temp == __last && *__first == '$')
-                {
-                    __push_r_anchor();
-                    ++__first;
-                }
-            }
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first != __last)
-            throw regex_error(regex_constants::__re_err_empty);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_extended_reg_exp(_ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __sa = __end_;
-    _ForwardIterator __temp = __parse_ERE_branch(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __first)
-        throw regex_error(regex_constants::__re_err_empty);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    __first = __temp;
-    while (__first != __last && *__first == '|')
-    {
-        __owns_one_state<_CharT>* __sb = __end_;
-        __temp = __parse_ERE_branch(++__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__temp == __first)
-            throw regex_error(regex_constants::__re_err_empty);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        __push_alternation(__sa, __sb);
-        __first = __temp;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ERE_branch(_ForwardIterator __first,
-                                                 _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __parse_ERE_expression(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __first)
-        throw regex_error(regex_constants::__re_err_empty);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    do
-    {
-        __first = __temp;
-        __temp = __parse_ERE_expression(__first, __last);
-    } while (__temp != __first);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ERE_expression(_ForwardIterator __first,
-                                                     _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __e = __end_;
-    unsigned __mexp_begin = __marked_count_;
-    _ForwardIterator __temp = __parse_one_char_or_coll_elem_ERE(__first, __last);
-    if (__temp == __first && __temp != __last)
-    {
-        switch (*__temp)
-        {
-        case '^':
-            __push_l_anchor();
-            ++__temp;
-            break;
-        case '$':
-            __push_r_anchor();
-            ++__temp;
-            break;
-        case '(':
-            __push_begin_marked_subexpression();
-            unsigned __temp_count = __marked_count_;
-            ++__open_count_;
-            __temp = __parse_extended_reg_exp(++__temp, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__temp == __last || *__temp != ')')
-                throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __push_end_marked_subexpression(__temp_count);
-            --__open_count_;
-            ++__temp;
-            break;
-        }
-    }
-    if (__temp != __first)
-        __temp = __parse_ERE_dupl_symbol(__temp, __last, __e, __mexp_begin+1,
-                                         __marked_count_+1);
-    __first = __temp;
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_RE_expression(_ForwardIterator __first,
-                                                    _ForwardIterator __last)
-{
-    while (true)
-    {
-        _ForwardIterator __temp = __parse_simple_RE(__first, __last);
-        if (__temp == __first)
-            break;
-        __first = __temp;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_simple_RE(_ForwardIterator __first,
-                                                _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        __owns_one_state<_CharT>* __e = __end_;
-        unsigned __mexp_begin = __marked_count_;
-        _ForwardIterator __temp = __parse_nondupl_RE(__first, __last);
-        if (__temp != __first)
-            __first = __parse_RE_dupl_symbol(__temp, __last, __e,
-                                             __mexp_begin+1, __marked_count_+1);
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_nondupl_RE(_ForwardIterator __first,
-                                                 _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __first;
-    __first = __parse_one_char_or_coll_elem_RE(__first, __last);
-    if (__temp == __first)
-    {
-        __temp = __parse_Back_open_paren(__first, __last);
-        if (__temp != __first)
-        {
-            __push_begin_marked_subexpression();
-            unsigned __temp_count = __marked_count_;
-            __first = __parse_RE_expression(__temp, __last);
-            __temp = __parse_Back_close_paren(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__temp == __first)
-                throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __push_end_marked_subexpression(__temp_count);
-            __first = __temp;
-        }
-        else
-            __first = __parse_BACKREF(__first, __last);
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_one_char_or_coll_elem_RE(
-                                                       _ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __parse_ORD_CHAR(__first, __last);
-    if (__temp == __first)
-    {
-        __temp = __parse_QUOTED_CHAR(__first, __last);
-        if (__temp == __first)
-        {
-            if (__temp != __last && *__temp == '.')
-            {
-                __push_match_any();
-                ++__temp;
-            }
-            else
-                __temp = __parse_bracket_expression(__first, __last);
-        }
-    }
-    __first = __temp;
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_one_char_or_coll_elem_ERE(
-                                                       _ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __parse_ORD_CHAR_ERE(__first, __last);
-    if (__temp == __first)
-    {
-        __temp = __parse_QUOTED_CHAR_ERE(__first, __last);
-        if (__temp == __first)
-        {
-            if (__temp != __last && *__temp == '.')
-            {
-                __push_match_any();
-                ++__temp;
-            }
-            else
-                __temp = __parse_bracket_expression(__first, __last);
-        }
-    }
-    __first = __temp;
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_Back_open_paren(_ForwardIterator __first,
-                                                      _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\' && *__temp == '(')
-                __first = ++__temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_Back_close_paren(_ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\' && *__temp == ')')
-                __first = ++__temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_Back_open_brace(_ForwardIterator __first,
-                                                      _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\' && *__temp == '{')
-                __first = ++__temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_Back_close_brace(_ForwardIterator __first,
-                                                       _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\' && *__temp == '}')
-                __first = ++__temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_BACKREF(_ForwardIterator __first,
-                                              _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\')
-            { 
-                int __val = __traits_.value(*__temp, 10);
-                if (__val >= 1 && __val <= 9)
-                {
-                    __push_back_ref(__val);
-                    __first = ++__temp;
-                }
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ORD_CHAR(_ForwardIterator __first,
-                                               _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp == __last && *__first == '$')
-            return __first;
-        // Not called inside a bracket
-        if (*__first == '.' || *__first == '\\' || *__first == '[')
-            return __first;
-        __push_char(*__first);
-        ++__first;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ORD_CHAR_ERE(_ForwardIterator __first,
-                                                   _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        switch (*__first)
-        {
-        case '^':
-        case '.':
-        case '[':
-        case '$':
-        case '(':
-        case '|':
-        case '*':
-        case '+':
-        case '?':
-        case '{':
-        case '\\':
-            break;
-        case ')':
-            if (__open_count_ == 0)
-            {
-                __push_char(*__first);
-                ++__first;
-            }
-            break;
-        default:
-            __push_char(*__first);
-            ++__first;
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR(_ForwardIterator __first,
-                                                  _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\')
-            {
-                switch (*__temp)
-                {
-                case '^':
-                case '.':
-                case '*':
-                case '[':
-                case '$':
-                case '\\':
-                    __push_char(*__temp);
-                    __first = ++__temp;
-                    break;
-                }
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_QUOTED_CHAR_ERE(_ForwardIterator __first,
-                                                      _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        if (__temp != __last)
-        {
-            if (*__first == '\\')
-            {
-                switch (*__temp)
-                {
-                case '^':
-                case '.':
-                case '*':
-                case '[':
-                case '$':
-                case '\\':
-                case '(':
-                case ')':
-                case '|':
-                case '+':
-                case '?':
-                case '{':
-                case '}':
-                    __push_char(*__temp);
-                    __first = ++__temp;
-                    break;
-                default:
-                    if ((__flags_ & 0x1F0) == awk)
-                        __first = __parse_awk_escape(++__first, __last);
-                    break;
-                }
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_RE_dupl_symbol(_ForwardIterator __first,
-                                                     _ForwardIterator __last,
-                                                     __owns_one_state<_CharT>* __s,
-                                                     unsigned __mexp_begin,
-                                                     unsigned __mexp_end)
-{
-    if (__first != __last)
-    {
-        if (*__first == '*')
-        {
-            __push_greedy_inf_repeat(0, __s, __mexp_begin, __mexp_end);
-            ++__first;
-        }
-        else
-        {
-            _ForwardIterator __temp = __parse_Back_open_brace(__first, __last);
-            if (__temp != __first)
-            {
-                int __min = 0;
-                __first = __temp;
-                __temp = __parse_DUP_COUNT(__first, __last, __min);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__temp == __first)
-                    throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                __first = __temp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__first == __last)
-                    throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                if (*__first != ',')
-                {
-                    __temp = __parse_Back_close_brace(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__temp == __first)
-                        throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    __push_loop(__min, __min, __s, __mexp_begin, __mexp_end,
-                                    true);
-                    __first = __temp;
-                }
-                else
-                {
-                    ++__first;  // consume ','
-                    int __max = -1;
-                    __first = __parse_DUP_COUNT(__first, __last, __max);
-                    __temp = __parse_Back_close_brace(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__temp == __first)
-                        throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    if (__max == -1)
-                        __push_greedy_inf_repeat(__min, __s, __mexp_begin, __mexp_end);
-                    else
-                    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                        if (__max < __min)
-                            throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                        __push_loop(__min, __max, __s, __mexp_begin, __mexp_end,
-                                    true);
-                    }
-                    __first = __temp;
-                }
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ERE_dupl_symbol(_ForwardIterator __first,
-                                                      _ForwardIterator __last,
-                                                      __owns_one_state<_CharT>* __s,
-                                                      unsigned __mexp_begin,
-                                                      unsigned __mexp_end)
-{
-    if (__first != __last)
-    {
-        unsigned __grammar = __flags_ & 0x1F0;
-        switch (*__first)
-        {
-        case '*':
-            ++__first;
-            if (__grammar == ECMAScript && __first != __last && *__first == '?')
-            {
-                ++__first;
-                __push_nongreedy_inf_repeat(0, __s, __mexp_begin, __mexp_end);
-            }
-            else
-                __push_greedy_inf_repeat(0, __s, __mexp_begin, __mexp_end);
-            break;
-        case '+':
-            ++__first;
-            if (__grammar == ECMAScript && __first != __last && *__first == '?')
-            {
-                ++__first;
-                __push_nongreedy_inf_repeat(1, __s, __mexp_begin, __mexp_end);
-            }
-            else
-                __push_greedy_inf_repeat(1, __s, __mexp_begin, __mexp_end);
-            break;
-        case '?':
-            ++__first;
-            if (__grammar == ECMAScript && __first != __last && *__first == '?')
-            {
-                ++__first;
-                __push_loop(0, 1, __s, __mexp_begin, __mexp_end, false);
-            }
-            else
-                __push_loop(0, 1, __s, __mexp_begin, __mexp_end);
-            break;
-        case '{':
-            {
-                int __min;
-                _ForwardIterator __temp = __parse_DUP_COUNT(++__first, __last, __min);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__temp == __first)
-                    throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                __first = __temp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__first == __last)
-                    throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                switch (*__first)
-                {
-                case '}':
-                    ++__first;
-                    if (__grammar == ECMAScript && __first != __last && *__first == '?')
-                    {
-                        ++__first;
-                        __push_loop(__min, __min, __s, __mexp_begin, __mexp_end, false);
-                    }
-                    else
-                        __push_loop(__min, __min, __s, __mexp_begin, __mexp_end);
-                    break;
-                case ',':
-                    ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__first == __last)
-                        throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    if (*__first == '}')
-                    {
-                        ++__first;
-                        if (__grammar == ECMAScript && __first != __last && *__first == '?')
-                        {
-                            ++__first;
-                            __push_nongreedy_inf_repeat(__min, __s, __mexp_begin, __mexp_end);
-                        }
-                        else
-                            __push_greedy_inf_repeat(__min, __s, __mexp_begin, __mexp_end);
-                    }
-                    else
-                    {
-                        int __max = -1;
-                        __temp = __parse_DUP_COUNT(__first, __last, __max);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                        if (__temp == __first)
-                            throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                        __first = __temp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                        if (__first == __last || *__first != '}')
-                            throw regex_error(regex_constants::error_brace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                        ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                        if (__max < __min)
-                            throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                        if (__grammar == ECMAScript && __first != __last && *__first == '?')
-                        {
-                            ++__first;
-                            __push_loop(__min, __max, __s, __mexp_begin, __mexp_end, false);
-                        }
-                        else
-                            __push_loop(__min, __max, __s, __mexp_begin, __mexp_end);
-                    }
-                    break;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                default:
-                    throw regex_error(regex_constants::error_badbrace);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                }
-            }
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_bracket_expression(_ForwardIterator __first,
-                                                         _ForwardIterator __last)
-{
-    if (__first != __last && *__first == '[')
-    {
-        ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first == __last)
-            throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        bool __negate = false;
-        if (*__first == '^')
-        {
-            ++__first;
-            __negate = true;
-        }
-        __bracket_expression<_CharT, _Traits>* __ml = __start_matching_list(__negate);
-        // __ml owned by *this
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first == __last)
-            throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if ((__flags_ & 0x1F0) != ECMAScript && *__first == ']')
-        {
-            __ml->__add_char(']');
-            ++__first;
-        }
-        __first = __parse_follow_list(__first, __last, __ml);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first == __last)
-            throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        if (*__first == '-')
-        {
-            __ml->__add_char('-');
-            ++__first;
-        }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        if (__first == __last || *__first != ']')
-            throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        ++__first;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_follow_list(_ForwardIterator __first,
-                                    _ForwardIterator __last,
-                                    __bracket_expression<_CharT, _Traits>* __ml)
-{
-    if (__first != __last)
-    {
-        while (true)
-        {
-            _ForwardIterator __temp = __parse_expression_term(__first, __last,
-                                                              __ml);
-            if (__temp == __first)
-                break;
-            __first = __temp;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_expression_term(_ForwardIterator __first,
-                                    _ForwardIterator __last,
-                                    __bracket_expression<_CharT, _Traits>* __ml)
-{
-    if (__first != __last && *__first != ']')
-    {
-        _ForwardIterator __temp = _VSTD::next(__first);
-        basic_string<_CharT> __start_range;
-        if (__temp != __last && *__first == '[')
-        {
-            if (*__temp == '=')
-                return __parse_equivalence_class(++__temp, __last, __ml);
-            else if (*__temp == ':')
-                return __parse_character_class(++__temp, __last, __ml);
-            else if (*__temp == '.')
-                __first = __parse_collating_symbol(++__temp, __last, __start_range);
-        }
-        unsigned __grammar = __flags_ & 0x1F0;
-        if (__start_range.empty())
-        {
-            if ((__grammar == ECMAScript || __grammar == awk) && *__first == '\\')
-            {
-                if (__grammar == ECMAScript)
-                    __first = __parse_class_escape(++__first, __last, __start_range, __ml);
-                else
-                    __first = __parse_awk_escape(++__first, __last, &__start_range);
-            }
-            else
-            {
-                __start_range = *__first;
-                ++__first;
-            }
-        }
-        if (__first != __last && *__first != ']')
-        {
-            __temp = _VSTD::next(__first);
-            if (__temp != __last && *__first == '-' && *__temp != ']')
-            {
-                // parse a range
-                basic_string<_CharT> __end_range;
-                __first = __temp;
-                ++__temp;
-                if (__temp != __last && *__first == '[' && *__temp == '.')
-                    __first = __parse_collating_symbol(++__temp, __last, __end_range);
-                else
-                {
-                    if ((__grammar == ECMAScript || __grammar == awk) && *__first == '\\')
-                    {
-                        if (__grammar == ECMAScript)
-                            __first = __parse_class_escape(++__first, __last,
-                                                           __end_range, __ml);
-                        else
-                            __first = __parse_awk_escape(++__first, __last,
-                                                         &__end_range);
-                    }
-                    else
-                    {
-                        __end_range = *__first;
-                        ++__first;
-                    }
-                }
-                __ml->__add_range(_VSTD::move(__start_range), _VSTD::move(__end_range));
-            }
-            else if (!__start_range.empty())
-            {
-                if (__start_range.size() == 1)
-                    __ml->__add_char(__start_range[0]);
-                else
-                    __ml->__add_digraph(__start_range[0], __start_range[1]);
-            }
-        }
-        else if (!__start_range.empty())
-        {
-            if (__start_range.size() == 1)
-                __ml->__add_char(__start_range[0]);
-            else
-                __ml->__add_digraph(__start_range[0], __start_range[1]);
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_class_escape(_ForwardIterator __first,
-                          _ForwardIterator __last,
-                          basic_string<_CharT>& __str,
-                          __bracket_expression<_CharT, _Traits>* __ml)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__first == __last)
-        throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    switch (*__first)
-    {
-    case 0:
-        __str = *__first;
-        return ++__first;
-    case 'b':
-        __str = _CharT(8);
-        return ++__first;
-    case 'd':
-        __ml->__add_class(ctype_base::digit);
-        return ++__first;
-    case 'D':
-        __ml->__add_neg_class(ctype_base::digit);
-        return ++__first;
-    case 's':
-        __ml->__add_class(ctype_base::space);
-        return ++__first;
-    case 'S':
-        __ml->__add_neg_class(ctype_base::space);
-        return ++__first;
-    case 'w':
-        __ml->__add_class(ctype_base::alnum);
-        __ml->__add_char('_');
-        return ++__first;
-    case 'W':
-        __ml->__add_neg_class(ctype_base::alnum);
-        __ml->__add_neg_char('_');
-        return ++__first;
-    }
-    __first = __parse_character_escape(__first, __last, &__str);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_awk_escape(_ForwardIterator __first,
-                          _ForwardIterator __last,
-                          basic_string<_CharT>* __str)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__first == __last)
-        throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    switch (*__first)
-    {
-    case '\\':
-    case '"':
-    case '/':
-        if (__str)
-            *__str = *__first;
-        else
-            __push_char(*__first);
-        return ++__first;
-    case 'a':
-        if (__str)
-            *__str = _CharT(7);
-        else
-            __push_char(_CharT(7));
-        return ++__first;
-    case 'b':
-        if (__str)
-            *__str = _CharT(8);
-        else
-            __push_char(_CharT(8));
-        return ++__first;
-    case 'f':
-        if (__str)
-            *__str = _CharT(0xC);
-        else
-            __push_char(_CharT(0xC));
-        return ++__first;
-    case 'n':
-        if (__str)
-            *__str = _CharT(0xA);
-        else
-            __push_char(_CharT(0xA));
-        return ++__first;
-    case 'r':
-        if (__str)
-            *__str = _CharT(0xD);
-        else
-            __push_char(_CharT(0xD));
-        return ++__first;
-    case 't':
-        if (__str)
-            *__str = _CharT(0x9);
-        else
-            __push_char(_CharT(0x9));
-        return ++__first;
-    case 'v':
-        if (__str)
-            *__str = _CharT(0xB);
-        else
-            __push_char(_CharT(0xB));
-        return ++__first;
-    }
-    if ('0' <= *__first && *__first <= '7')
-    {
-        unsigned __val = *__first - '0';
-        if (++__first != __last && ('0' <= *__first && *__first <= '7'))
-        {
-            __val = 8 * __val + *__first - '0';
-            if (++__first != __last && ('0' <= *__first && *__first <= '7'))
-                __val = 8 * __val + *__first++ - '0';
-        }
-        if (__str)
-            *__str = _CharT(__val);
-        else
-            __push_char(_CharT(__val));
-    }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    else
-        throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_equivalence_class(_ForwardIterator __first,
-                                    _ForwardIterator __last,
-                                    __bracket_expression<_CharT, _Traits>* __ml)
-{
-    // Found [=
-    //   This means =] must exist
-    value_type _Equal_close[2] = {'=', ']'};
-    _ForwardIterator __temp = _VSTD::search(__first, __last, _Equal_close,
-                                                            _Equal_close+2);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __last)
-        throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    // [__first, __temp) contains all text in [= ... =]
-    typedef typename _Traits::string_type string_type;
-    string_type __collate_name =
-        __traits_.lookup_collatename(__first, __temp);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__collate_name.empty())
-        throw regex_error(regex_constants::error_collate);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    string_type __equiv_name =
-        __traits_.transform_primary(__collate_name.begin(),
-                                    __collate_name.end());
-    if (!__equiv_name.empty())
-        __ml->__add_equivalence(__equiv_name);
-    else
-    {
-        switch (__collate_name.size())
-        {
-        case 1:
-            __ml->__add_char(__collate_name[0]);
-            break;
-        case 2:
-            __ml->__add_digraph(__collate_name[0], __collate_name[1]);
-            break;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        default:
-            throw regex_error(regex_constants::error_collate);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        }
-    }
-    __first = _VSTD::next(__temp, 2);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_character_class(_ForwardIterator __first,
-                                    _ForwardIterator __last,
-                                    __bracket_expression<_CharT, _Traits>* __ml)
-{
-    // Found [:
-    //   This means :] must exist
-    value_type _Colon_close[2] = {':', ']'};
-    _ForwardIterator __temp = _VSTD::search(__first, __last, _Colon_close,
-                                                            _Colon_close+2);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __last)
-        throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    // [__first, __temp) contains all text in [: ... :]
-    typedef typename _Traits::char_class_type char_class_type;
-    char_class_type __class_type =
-        __traits_.lookup_classname(__first, __temp, __flags_ & icase);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__class_type == 0)
-        throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    __ml->__add_class(__class_type);
-    __first = _VSTD::next(__temp, 2);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_collating_symbol(_ForwardIterator __first,
-                                                _ForwardIterator __last,
-                                                basic_string<_CharT>& __col_sym)
-{
-    // Found [.
-    //   This means .] must exist
-    value_type _Dot_close[2] = {'.', ']'};
-    _ForwardIterator __temp = _VSTD::search(__first, __last, _Dot_close,
-                                                            _Dot_close+2);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__temp == __last)
-        throw regex_error(regex_constants::error_brack);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    // [__first, __temp) contains all text in [. ... .]
-    typedef typename _Traits::string_type string_type;
-    __col_sym = __traits_.lookup_collatename(__first, __temp);
-    switch (__col_sym.size())
-    {
-    case 1:
-    case 2:
-        break;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    default:
-        throw regex_error(regex_constants::error_collate);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    __first = _VSTD::next(__temp, 2);
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_DUP_COUNT(_ForwardIterator __first,
-                                                _ForwardIterator __last,
-                                                int& __c)
-{
-    if (__first != __last )
-    {
-        int __val = __traits_.value(*__first, 10);
-        if ( __val != -1 )
-        {
-            __c = __val;
-            for (++__first; 
-                 __first != __last && ( __val = __traits_.value(*__first, 10)) != -1;
-                 ++__first)
-            {
-                __c *= 10;
-                __c += __val;
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_ecma_exp(_ForwardIterator __first,
-                                               _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __sa = __end_;
-    _ForwardIterator __temp = __parse_alternative(__first, __last);
-    if (__temp == __first)
-        __push_empty();
-    __first = __temp;
-    while (__first != __last && *__first == '|')
-    {
-        __owns_one_state<_CharT>* __sb = __end_;
-        __temp = __parse_alternative(++__first, __last);
-        if (__temp == __first)
-            __push_empty();
-        __push_alternation(__sa, __sb);
-        __first = __temp;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_alternative(_ForwardIterator __first,
-                                                  _ForwardIterator __last)
-{
-    while (true)
-    {
-        _ForwardIterator __temp = __parse_term(__first, __last);
-        if (__temp == __first)
-            break;
-        __first = __temp;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_term(_ForwardIterator __first,
-                                           _ForwardIterator __last)
-{
-    _ForwardIterator __temp = __parse_assertion(__first, __last);
-    if (__temp == __first)
-    {
-        __owns_one_state<_CharT>* __e = __end_;
-        unsigned __mexp_begin = __marked_count_;
-        __temp = __parse_atom(__first, __last);
-        if (__temp != __first)
-            __first = __parse_ERE_dupl_symbol(__temp, __last, __e,
-                                              __mexp_begin+1, __marked_count_+1);
-    }
-    else
-        __first = __temp;
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_assertion(_ForwardIterator __first,
-                                                _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        switch (*__first)
-        {
-        case '^':
-            __push_l_anchor();
-            ++__first;
-            break;
-        case '$':
-            __push_r_anchor();
-            ++__first;
-            break;
-        case '\\':
-            {
-                _ForwardIterator __temp = _VSTD::next(__first);
-                if (__temp != __last)
-                {
-                    if (*__temp == 'b')
-                    {
-                        __push_word_boundary(false);
-                        __first = ++__temp;
-                    }
-                    else if (*__temp == 'B')
-                    {
-                        __push_word_boundary(true);
-                        __first = ++__temp;
-                    }
-                }
-            }
-            break;
-        case '(':
-            {
-                _ForwardIterator __temp = _VSTD::next(__first);
-                if (__temp != __last && *__temp == '?')
-                {
-                    if (++__temp != __last)
-                    {
-                        switch (*__temp)
-                        {
-                        case '=':
-                            {
-                                basic_regex __exp;
-                                __exp.__flags_ = __flags_;
-                                __temp = __exp.__parse(++__temp, __last);
-                                unsigned __mexp = __exp.__marked_count_;
-                                __push_lookahead(_VSTD::move(__exp), false, __marked_count_);
-                                __marked_count_ += __mexp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                                if (__temp == __last || *__temp != ')')
-                                    throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                                __first = ++__temp;
-                            }
-                            break;
-                        case '!':
-                            {
-                                basic_regex __exp;
-                                __exp.__flags_ = __flags_;
-                                __temp = __exp.__parse(++__temp, __last);
-                                unsigned __mexp = __exp.__marked_count_;
-                                __push_lookahead(_VSTD::move(__exp), true, __marked_count_);
-                                __marked_count_ += __mexp;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                                if (__temp == __last || *__temp != ')')
-                                    throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                                __first = ++__temp;
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_atom(_ForwardIterator __first,
-                                           _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        switch (*__first)
-        {
-        case '.':
-            __push_match_any_but_newline();
-            ++__first;
-            break;
-        case '\\':
-            __first = __parse_atom_escape(__first, __last);
-            break;
-        case '[':
-            __first = __parse_bracket_expression(__first, __last);
-            break;
-        case '(':
-            {
-                ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                if (__first == __last)
-                    throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                _ForwardIterator __temp = _VSTD::next(__first);
-                if (__temp != __last && *__first == '?' && *__temp == ':')
-                {
-                    ++__open_count_;
-                    __first = __parse_ecma_exp(++__temp, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__first == __last || *__first != ')')
-                        throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    --__open_count_;
-                    ++__first;
-                }
-                else
-                {
-                    __push_begin_marked_subexpression();
-                    unsigned __temp_count = __marked_count_;
-                    ++__open_count_;
-                    __first = __parse_ecma_exp(__first, __last);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                    if (__first == __last || *__first != ')')
-                        throw regex_error(regex_constants::error_paren);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                    __push_end_marked_subexpression(__temp_count);
-                    --__open_count_;
-                    ++__first;
-                }
-            }
-            break;
-        default:
-            __first = __parse_pattern_character(__first, __last);
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_atom_escape(_ForwardIterator __first,
-                                                  _ForwardIterator __last)
-{
-    if (__first != __last && *__first == '\\')
-    {
-        _ForwardIterator __t1 = _VSTD::next(__first);
-        _ForwardIterator __t2 = __parse_decimal_escape(__t1, __last);
-        if (__t2 != __t1)
-            __first = __t2;
-        else
-        {
-            __t2 = __parse_character_class_escape(__t1, __last);
-            if (__t2 != __t1)
-                __first = __t2;
-            else
-            {
-                __t2 = __parse_character_escape(__t1, __last);
-                if (__t2 != __t1)
-                    __first = __t2;
-            }
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_decimal_escape(_ForwardIterator __first,
-                                                     _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        if (*__first == '0')
-        {
-            __push_char(_CharT());
-            ++__first;
-        }
-        else if ('1' <= *__first && *__first <= '9')
-        {
-            unsigned __v = *__first - '0';
-            for (++__first; '0' <= *__first && *__first <= '9'; ++__first)
-                __v = 10 * __v + *__first - '0';
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__v > mark_count())
-                throw regex_error(regex_constants::error_backref);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __push_back_ref(__v);
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_character_class_escape(_ForwardIterator __first,
-                                                             _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        __bracket_expression<_CharT, _Traits>* __ml;
-        switch (*__first)
-        {
-        case 'd':
-            __ml = __start_matching_list(false);
-            __ml->__add_class(ctype_base::digit);
-            ++__first;
-            break;
-        case 'D':
-            __ml = __start_matching_list(true);
-            __ml->__add_class(ctype_base::digit);
-            ++__first;
-            break;
-        case 's':
-            __ml = __start_matching_list(false);
-            __ml->__add_class(ctype_base::space);
-            ++__first;
-            break;
-        case 'S':
-            __ml = __start_matching_list(true);
-            __ml->__add_class(ctype_base::space);
-            ++__first;
-            break;
-        case 'w':
-            __ml = __start_matching_list(false);
-            __ml->__add_class(ctype_base::alnum);
-            __ml->__add_char('_');
-            ++__first;
-            break;
-        case 'W':
-            __ml = __start_matching_list(true);
-            __ml->__add_class(ctype_base::alnum);
-            __ml->__add_char('_');
-            ++__first;
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_character_escape(_ForwardIterator __first,
-                                                    _ForwardIterator __last,
-                                                    basic_string<_CharT>* __str)
-{
-    if (__first != __last)
-    {
-        _ForwardIterator __t;
-        unsigned __sum = 0;
-        int __hd;
-        switch (*__first)
-        {
-        case 'f':
-            if (__str)
-                *__str = _CharT(0xC);
-            else
-                __push_char(_CharT(0xC));
-            ++__first;
-            break;
-        case 'n':
-            if (__str)
-                *__str = _CharT(0xA);
-            else
-                __push_char(_CharT(0xA));
-            ++__first;
-            break;
-        case 'r':
-            if (__str)
-                *__str = _CharT(0xD);
-            else
-                __push_char(_CharT(0xD));
-            ++__first;
-            break;
-        case 't':
-            if (__str)
-                *__str = _CharT(0x9);
-            else
-                __push_char(_CharT(0x9));
-            ++__first;
-            break;
-        case 'v':
-            if (__str)
-                *__str = _CharT(0xB);
-            else
-                __push_char(_CharT(0xB));
-            ++__first;
-            break;
-        case 'c':
-            if ((__t = _VSTD::next(__first)) != __last)
-            {
-                if (('A' <= *__t && *__t <= 'Z') || 
-                    ('a' <= *__t && *__t <= 'z'))
-                {
-                    if (__str)
-                        *__str = _CharT(*__t % 32);
-                    else
-                        __push_char(_CharT(*__t % 32));
-                    __first = ++__t;
-                }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                else 
-                    throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            else
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            break;
-        case 'u':
-            ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__first == __last)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __hd = __traits_.value(*__first, 16);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__hd == -1)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __sum = 16 * __sum + static_cast<unsigned>(__hd);
-            ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__first == __last)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __hd = __traits_.value(*__first, 16);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__hd == -1)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __sum = 16 * __sum + static_cast<unsigned>(__hd);
-            // drop through
-        case 'x':
-            ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__first == __last)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __hd = __traits_.value(*__first, 16);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__hd == -1)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __sum = 16 * __sum + static_cast<unsigned>(__hd);
-            ++__first;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__first == __last)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __hd = __traits_.value(*__first, 16);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            if (__hd == -1)
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __sum = 16 * __sum + static_cast<unsigned>(__hd);
-            if (__str)
-                *__str = _CharT(__sum);
-            else
-                __push_char(_CharT(__sum));
-            ++__first;
-            break;
-        case '0':
-            if (__str)
-                *__str = _CharT(0);
-            else
-                __push_char(_CharT(0));
-            ++__first;
-            break;
-        default:
-            if (*__first != '_' && !__traits_.isctype(*__first, ctype_base::alnum))
-            {
-                if (__str)
-                    *__str = *__first;
-                else
-                    __push_char(*__first);
-                ++__first;
-            }
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            else
-                throw regex_error(regex_constants::error_escape);
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_pattern_character(_ForwardIterator __first,
-                                                        _ForwardIterator __last)
-{
-    if (__first != __last)
-    {
-        switch (*__first)
-        {
-        case '^':
-        case '$':
-        case '\\':
-        case '.':
-        case '*':
-        case '+':
-        case '?':
-        case '(':
-        case ')':
-        case '[':
-        case ']':
-        case '{':
-        case '}':
-        case '|':
-            break;
-        default:
-            __push_char(*__first);
-            ++__first;
-            break;
-        }
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_grep(_ForwardIterator __first,
-                                           _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __sa = __end_;
-    _ForwardIterator __t1 = _VSTD::find(__first, __last, _CharT('\n'));
-    if (__t1 != __first)
-        __parse_basic_reg_exp(__first, __t1);
-    else
-        __push_empty();
-    __first = __t1;
-    if (__first != __last)
-        ++__first;
-    while (__first != __last)
-    {
-        __t1 = _VSTD::find(__first, __last, _CharT('\n'));
-        __owns_one_state<_CharT>* __sb = __end_;
-        if (__t1 != __first)
-            __parse_basic_reg_exp(__first, __t1);
-        else
-            __push_empty();
-        __push_alternation(__sa, __sb);
-        __first = __t1;
-        if (__first != __last)
-            ++__first;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-template <class _ForwardIterator>
-_ForwardIterator
-basic_regex<_CharT, _Traits>::__parse_egrep(_ForwardIterator __first,
-                                            _ForwardIterator __last)
-{
-    __owns_one_state<_CharT>* __sa = __end_;
-    _ForwardIterator __t1 = _VSTD::find(__first, __last, _CharT('\n'));
-    if (__t1 != __first)
-        __parse_extended_reg_exp(__first, __t1);
-    else
-        __push_empty();
-    __first = __t1;
-    if (__first != __last)
-        ++__first;
-    while (__first != __last)
-    {
-        __t1 = _VSTD::find(__first, __last, _CharT('\n'));
-        __owns_one_state<_CharT>* __sb = __end_;
-        if (__t1 != __first)
-            __parse_extended_reg_exp(__first, __t1);
-        else
-            __push_empty();
-        __push_alternation(__sa, __sb);
-        __first = __t1;
-        if (__first != __last)
-            ++__first;
-    }
-    return __first;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_loop(size_t __min, size_t __max,
-        __owns_one_state<_CharT>* __s, size_t __mexp_begin, size_t __mexp_end,
-        bool __greedy)
-{
-    unique_ptr<__empty_state<_CharT> > __e1(new __empty_state<_CharT>(__end_->first()));
-    __end_->first() = nullptr;
-    unique_ptr<__loop<_CharT> > __e2(new __loop<_CharT>(__loop_count_,
-                __s->first(), __e1.get(), __mexp_begin, __mexp_end, __greedy,
-                __min, __max));
-    __s->first() = nullptr;
-    __e1.release();
-    __end_->first() = new __repeat_one_loop<_CharT>(__e2.get());
-    __end_ = __e2->second();
-    __s->first() = __e2.release();
-    ++__loop_count_;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_char(value_type __c)
-{
-    if (flags() & icase)
-        __end_->first() = new __match_char_icase<_CharT, _Traits>
-                                              (__traits_, __c, __end_->first());
-    else if (flags() & collate)
-        __end_->first() = new __match_char_collate<_CharT, _Traits>
-                                              (__traits_, __c, __end_->first());
-    else
-        __end_->first() = new __match_char<_CharT>(__c, __end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_begin_marked_subexpression()
-{
-    if (!(__flags_ & nosubs))
-    {
-        __end_->first() =
-                new __begin_marked_subexpression<_CharT>(++__marked_count_,
-                                                         __end_->first());
-        __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-    }
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_end_marked_subexpression(unsigned __sub)
-{
-    if (!(__flags_ & nosubs))
-    {
-        __end_->first() =
-                new __end_marked_subexpression<_CharT>(__sub, __end_->first());
-        __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-    }
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_l_anchor()
-{
-    __end_->first() = new __l_anchor<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_r_anchor()
-{
-    __end_->first() = new __r_anchor<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_match_any()
-{
-    __end_->first() = new __match_any<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_match_any_but_newline()
-{
-    __end_->first() = new __match_any_but_newline<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_empty()
-{
-    __end_->first() = new __empty_state<_CharT>(__end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_word_boundary(bool __invert)
-{
-    __end_->first() = new __word_boundary<_CharT, _Traits>(__traits_, __invert,
-                                                           __end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_back_ref(int __i)
-{
-    if (flags() & icase)
-        __end_->first() = new __back_ref_icase<_CharT, _Traits>
-                                              (__traits_, __i, __end_->first());
-    else if (flags() & collate)
-        __end_->first() = new __back_ref_collate<_CharT, _Traits>
-                                              (__traits_, __i, __end_->first());
-    else
-        __end_->first() = new __back_ref<_CharT>(__i, __end_->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_alternation(__owns_one_state<_CharT>* __sa,
-                                                 __owns_one_state<_CharT>* __ea)
-{
-    __sa->first() = new __alternate<_CharT>(
-                         static_cast<__owns_one_state<_CharT>*>(__sa->first()),
-                         static_cast<__owns_one_state<_CharT>*>(__ea->first()));
-    __ea->first() = nullptr;
-    __ea->first() = new __empty_state<_CharT>(__end_->first());
-    __end_->first() = nullptr;
-    __end_->first() = new __empty_non_own_state<_CharT>(__ea->first());
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__ea->first());
-}
-
-template <class _CharT, class _Traits>
-__bracket_expression<_CharT, _Traits>*
-basic_regex<_CharT, _Traits>::__start_matching_list(bool __negate)
-{
-    __bracket_expression<_CharT, _Traits>* __r =
-        new __bracket_expression<_CharT, _Traits>(__traits_, __end_->first(),
-                                                  __negate, __flags_ & icase,
-                                                  __flags_ & collate);
-    __end_->first() = __r;
-    __end_ = __r;
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_regex<_CharT, _Traits>::__push_lookahead(const basic_regex& __exp,
-                                               bool __invert,
-                                               unsigned __mexp)
-{
-    __end_->first() = new __lookahead<_CharT, _Traits>(__exp, __invert,
-                                                           __end_->first(), __mexp);
-    __end_ = static_cast<__owns_one_state<_CharT>*>(__end_->first());
-}
-
-typedef basic_regex<char>    regex;
-typedef basic_regex<wchar_t> wregex;
-
-// sub_match
-
-template <class _BidirectionalIterator>
-class _LIBCPP_TYPE_VIS_ONLY sub_match
-    : public pair<_BidirectionalIterator, _BidirectionalIterator>
-{
-public:
-    typedef _BidirectionalIterator                              iterator;
-    typedef typename iterator_traits<iterator>::value_type      value_type;
-    typedef typename iterator_traits<iterator>::difference_type difference_type;
-    typedef basic_string<value_type>                            string_type;
-
-    bool matched;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR sub_match() : matched() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    difference_type length() const
-        {return matched ? _VSTD::distance(this->first, this->second) : 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    string_type str() const
-        {return matched ? string_type(this->first, this->second) : string_type();}
-    _LIBCPP_INLINE_VISIBILITY
-    operator string_type() const
-        {return str();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const sub_match& __s) const
-        {return str().compare(__s.str());}
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const string_type& __s) const
-        {return str().compare(__s);}
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const value_type* __s) const
-        {return str().compare(__s);}
-};
-
-typedef sub_match<const char*>             csub_match;
-typedef sub_match<const wchar_t*>          wcsub_match;
-typedef sub_match<string::const_iterator>  ssub_match;
-typedef sub_match<wstring::const_iterator> wssub_match;
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return __x.compare(__y) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return __x.compare(__y) < 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const sub_match<_BiIter>& __x, const sub_match<_BiIter>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return __y.compare(typename sub_match<_BiIter>::string_type(__x.data(), __x.size())) == 0;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y.compare(typename sub_match<_BiIter>::string_type(__x.data(), __x.size())) > 0;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator>=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-                const sub_match<_BiIter>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const sub_match<_BiIter>& __x,
-           const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return __x.compare(typename sub_match<_BiIter>::string_type(__y.data(), __y.size())) == 0;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const sub_match<_BiIter>& __x,
-           const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const sub_match<_BiIter>& __x,
-          const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return __x.compare(typename sub_match<_BiIter>::string_type(__y.data(), __y.size())) < 0;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator>(const sub_match<_BiIter>& __x,
-               const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const sub_match<_BiIter>& __x,
-           const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const sub_match<_BiIter>& __x,
-           const basic_string<typename iterator_traits<_BiIter>::value_type, _ST, _SA>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(typename iterator_traits<_BiIter>::value_type const* __x,
-           const sub_match<_BiIter>& __y)
-{
-    return __y.compare(__x) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(typename iterator_traits<_BiIter>::value_type const* __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(typename iterator_traits<_BiIter>::value_type const* __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y.compare(__x) > 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(typename iterator_traits<_BiIter>::value_type const* __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(typename iterator_traits<_BiIter>::value_type const* __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(typename iterator_traits<_BiIter>::value_type const* __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return __x.compare(__y) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const sub_match<_BiIter>& __x,
-          typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return __x.compare(__y) < 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const sub_match<_BiIter>& __x,
-          typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const* __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(typename iterator_traits<_BiIter>::value_type const& __x,
-           const sub_match<_BiIter>& __y)
-{
-    typedef basic_string<typename iterator_traits<_BiIter>::value_type> string_type;
-    return __y.compare(string_type(1, __x)) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(typename iterator_traits<_BiIter>::value_type const& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(typename iterator_traits<_BiIter>::value_type const& __x,
-          const sub_match<_BiIter>& __y)
-{
-    typedef basic_string<typename iterator_traits<_BiIter>::value_type> string_type;
-    return __y.compare(string_type(1, __x)) > 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(typename iterator_traits<_BiIter>::value_type const& __x,
-          const sub_match<_BiIter>& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(typename iterator_traits<_BiIter>::value_type const& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(typename iterator_traits<_BiIter>::value_type const& __x,
-           const sub_match<_BiIter>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    typedef basic_string<typename iterator_traits<_BiIter>::value_type> string_type;
-    return __x.compare(string_type(1, __y)) == 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const sub_match<_BiIter>& __x,
-          typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    typedef basic_string<typename iterator_traits<_BiIter>::value_type> string_type;
-    return __x.compare(string_type(1, __y)) < 0;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>(const sub_match<_BiIter>& __x,
-          typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    return __y < __x;
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const sub_match<_BiIter>& __x,
-           typename iterator_traits<_BiIter>::value_type const& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _CharT, class _ST, class _BiIter>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostream<_CharT, _ST>&
-operator<<(basic_ostream<_CharT, _ST>& __os, const sub_match<_BiIter>& __m)
-{
-    return __os << __m.str();
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY match_results
-{
-public:
-    typedef _Allocator                                        allocator_type;
-    typedef sub_match<_BidirectionalIterator>                 value_type;
-private:
-    typedef vector<value_type, allocator_type>                __container_type;
-
-    __container_type  __matches_;
-    value_type __unmatched_;
-    value_type __prefix_;
-    value_type __suffix_;
-    bool       __ready_;
-public:
-    _BidirectionalIterator __position_start_;
-    typedef const value_type&                                 const_reference;
-    typedef value_type&                                       reference;
-    typedef typename __container_type::const_iterator         const_iterator;
-    typedef const_iterator                                    iterator;
-    typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type;
-    typedef typename allocator_traits<allocator_type>::size_type size_type;
-    typedef typename iterator_traits<_BidirectionalIterator>::value_type char_type;
-    typedef basic_string<char_type>                           string_type;
-
-    // construct/copy/destroy:
-    explicit match_results(const allocator_type& __a = allocator_type());
-//    match_results(const match_results&) = default;
-//    match_results& operator=(const match_results&) = default;
-//    match_results(match_results&& __m) = default;
-//    match_results& operator=(match_results&& __m) = default;
-//    ~match_results() = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool ready() const {return __ready_;}
-
-    // size:
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const {return __matches_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const {return __matches_.max_size();}
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const {return size() == 0;}
-
-    // element access:
-    _LIBCPP_INLINE_VISIBILITY
-    difference_type length(size_type __sub = 0) const
-        {return (*this)[__sub].length();}
-    _LIBCPP_INLINE_VISIBILITY
-    difference_type position(size_type __sub = 0) const
-        {return _VSTD::distance(__position_start_, (*this)[__sub].first);}
-    _LIBCPP_INLINE_VISIBILITY
-    string_type str(size_type __sub = 0) const
-        {return (*this)[__sub].str();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference operator[](size_type __n) const
-        {return __n < __matches_.size() ? __matches_[__n] : __unmatched_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference prefix() const {return __prefix_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference suffix() const {return __suffix_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const {return empty() ? __matches_.end() : __matches_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const {return __matches_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const {return empty() ? __matches_.end() : __matches_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const {return __matches_.end();}
-
-    // format:
-    template <class _OutputIter>
-        _OutputIter
-        format(_OutputIter __out, const char_type* __fmt_first,
-               const char_type* __fmt_last,
-               regex_constants::match_flag_type __flags = regex_constants::format_default) const;
-    template <class _OutputIter, class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        _OutputIter
-        format(_OutputIter __out, const basic_string<char_type, _ST, _SA>& __fmt,
-               regex_constants::match_flag_type __flags = regex_constants::format_default) const
-            {return format(__out, __fmt.data(), __fmt.data() + __fmt.size(), __flags);}
-    template <class _ST, class _SA>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_string<char_type, _ST, _SA>
-        format(const basic_string<char_type, _ST, _SA>& __fmt,
-               regex_constants::match_flag_type __flags = regex_constants::format_default) const
-        {
-            basic_string<char_type, _ST, _SA> __r;
-            format(back_inserter(__r), __fmt.data(), __fmt.data() + __fmt.size(),
-                   __flags);
-            return __r;
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    string_type
-        format(const char_type* __fmt,
-               regex_constants::match_flag_type __flags = regex_constants::format_default) const
-        {
-            string_type __r;
-            format(back_inserter(__r), __fmt,
-                   __fmt + char_traits<char_type>::length(__fmt), __flags);
-            return __r;
-        }
-
-    // allocator:
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const {return __matches_.get_allocator();}
-
-    // swap:
-    void swap(match_results& __m);
-
-    template <class _Bp, class _Ap>
-        _LIBCPP_INLINE_VISIBILITY
-        void __assign(_BidirectionalIterator __f, _BidirectionalIterator __l,
-                      const match_results<_Bp, _Ap>& __m, bool __no_update_pos)
-    {
-        _Bp __mf = __m.prefix().first;
-        __matches_.resize(__m.size());
-        for (size_type __i = 0; __i < __matches_.size(); ++__i)
-        {
-            __matches_[__i].first = _VSTD::next(__f, _VSTD::distance(__mf, __m[__i].first));
-            __matches_[__i].second = _VSTD::next(__f, _VSTD::distance(__mf, __m[__i].second));
-            __matches_[__i].matched = __m[__i].matched;
-        }
-        __unmatched_.first   = __l;
-        __unmatched_.second  = __l;
-        __unmatched_.matched = false;
-        __prefix_.first = _VSTD::next(__f, _VSTD::distance(__mf, __m.prefix().first));
-        __prefix_.second = _VSTD::next(__f, _VSTD::distance(__mf, __m.prefix().second));
-        __prefix_.matched = __m.prefix().matched;
-        __suffix_.first = _VSTD::next(__f, _VSTD::distance(__mf, __m.suffix().first));
-        __suffix_.second = _VSTD::next(__f, _VSTD::distance(__mf, __m.suffix().second));
-        __suffix_.matched = __m.suffix().matched;
-        if (!__no_update_pos)
-            __position_start_ = __prefix_.first;
-        __ready_ = __m.ready();
-    }
-
-private:
-    void __init(unsigned __s,
-                _BidirectionalIterator __f, _BidirectionalIterator __l,
-                bool __no_update_pos = false);
-
-    template <class, class> friend class basic_regex;
-
-    template <class _Bp, class _Ap, class _Cp, class _Tp>
-    friend
-    bool
-    regex_match(_Bp, _Bp, match_results<_Bp, _Ap>&, const basic_regex<_Cp, _Tp>&,
-                regex_constants::match_flag_type);
-
-    template <class _Bp, class _Ap>
-    friend
-    bool
-    operator==(const match_results<_Bp, _Ap>&, const match_results<_Bp, _Ap>&);
-
-    template <class, class> friend class __lookahead;
-};
-
-template <class _BidirectionalIterator, class _Allocator>
-match_results<_BidirectionalIterator, _Allocator>::match_results(
-        const allocator_type& __a)
-    : __matches_(__a),
-      __unmatched_(),
-      __prefix_(),
-      __suffix_(),
-      __position_start_(),
-      __ready_(false)
-{
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-void
-match_results<_BidirectionalIterator, _Allocator>::__init(unsigned __s,
-                         _BidirectionalIterator __f, _BidirectionalIterator __l,
-                         bool __no_update_pos)
-{
-    __unmatched_.first   = __l;
-    __unmatched_.second  = __l;
-    __unmatched_.matched = false;
-    __matches_.assign(__s, __unmatched_);
-    __prefix_.first      = __f;
-    __prefix_.second     = __f;
-    __prefix_.matched    = false;
-    __suffix_ = __unmatched_;
-    if (!__no_update_pos)
-        __position_start_ = __prefix_.first;
-    __ready_ = true;
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-template <class _OutputIter>
-_OutputIter
-match_results<_BidirectionalIterator, _Allocator>::format(_OutputIter __out,
-        const char_type* __fmt_first, const char_type* __fmt_last,
-        regex_constants::match_flag_type __flags) const
-{
-    if (__flags & regex_constants::format_sed)
-    {
-        for (; __fmt_first != __fmt_last; ++__fmt_first)
-        {
-            if (*__fmt_first == '&')
-                __out = _VSTD::copy(__matches_[0].first, __matches_[0].second,
-                                   __out);
-            else if (*__fmt_first == '\\' && __fmt_first + 1 != __fmt_last)
-            {
-                ++__fmt_first;
-                if ('0' <= *__fmt_first && *__fmt_first <= '9')
-                {
-                    size_t __i = *__fmt_first - '0';
-                    __out = _VSTD::copy(__matches_[__i].first,
-                                       __matches_[__i].second, __out);
-                }
-                else
-                {
-                    *__out = *__fmt_first;
-                    ++__out;
-                }
-            }
-            else
-            {
-                *__out = *__fmt_first;
-                ++__out;
-            }
-        }
-    }
-    else
-    {
-        for (; __fmt_first != __fmt_last; ++__fmt_first)
-        {
-            if (*__fmt_first == '$' && __fmt_first + 1 != __fmt_last)
-            {
-                switch (__fmt_first[1])
-                {
-                case '$':
-                    *__out = *++__fmt_first;
-                    ++__out;
-                    break;
-                case '&':
-                    ++__fmt_first;
-                    __out = _VSTD::copy(__matches_[0].first, __matches_[0].second,
-                                       __out);
-                    break;
-                case '`':
-                    ++__fmt_first;
-                    __out = _VSTD::copy(__prefix_.first, __prefix_.second, __out);
-                    break;
-                case '\'':
-                    ++__fmt_first;
-                    __out = _VSTD::copy(__suffix_.first, __suffix_.second, __out);
-                    break;
-                default:
-                    if ('0' <= __fmt_first[1] && __fmt_first[1] <= '9')
-                    {
-                        ++__fmt_first;
-                        size_t __i = *__fmt_first - '0';
-                        if (__fmt_first + 1 != __fmt_last &&
-                            '0' <= __fmt_first[1] && __fmt_first[1] <= '9')
-                        {
-                            ++__fmt_first;
-                            __i = 10 * __i + *__fmt_first - '0';
-                        }
-                        __out = _VSTD::copy(__matches_[__i].first,
-                                           __matches_[__i].second, __out);
-                    }
-                    else
-                    {
-                        *__out = *__fmt_first;
-                        ++__out;
-                    }
-                    break;
-                }
-            }
-            else
-            {
-                *__out = *__fmt_first;
-                ++__out;
-            }
-        }
-    }
-    return __out;
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-void
-match_results<_BidirectionalIterator, _Allocator>::swap(match_results& __m)
-{
-    using _VSTD::swap;
-    swap(__matches_, __m.__matches_);
-    swap(__unmatched_, __m.__unmatched_);
-    swap(__prefix_, __m.__prefix_);
-    swap(__suffix_, __m.__suffix_);
-    swap(__position_start_, __m.__position_start_);
-    swap(__ready_, __m.__ready_);
-}
-
-typedef match_results<const char*>             cmatch;
-typedef match_results<const wchar_t*>          wcmatch;
-typedef match_results<string::const_iterator>  smatch;
-typedef match_results<wstring::const_iterator> wsmatch;
-
-template <class _BidirectionalIterator, class _Allocator>
-bool
-operator==(const match_results<_BidirectionalIterator, _Allocator>& __x,
-           const match_results<_BidirectionalIterator, _Allocator>& __y)
-{
-    if (__x.__ready_ != __y.__ready_)
-        return false;
-    if (!__x.__ready_)
-        return true;
-    return __x.__matches_ == __y.__matches_ &&
-           __x.__prefix_ == __y.__prefix_ &&
-           __x.__suffix_ == __y.__suffix_;
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const match_results<_BidirectionalIterator, _Allocator>& __x,
-           const match_results<_BidirectionalIterator, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _BidirectionalIterator, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(match_results<_BidirectionalIterator, _Allocator>& __x,
-     match_results<_BidirectionalIterator, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-// regex_search
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__match_at_start_ecma(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags, bool __at_first) const
-{
-    vector<__state> __states;
-    __node* __st = __start_.get();
-    if (__st)
-    {
-        __states.push_back(__state());
-        __states.back().__do_ = 0;
-        __states.back().__first_ = __first;
-        __states.back().__current_ = __first;
-        __states.back().__last_ = __last;
-        __states.back().__sub_matches_.resize(mark_count());
-        __states.back().__loop_data_.resize(__loop_count());
-        __states.back().__node_ = __st;
-        __states.back().__flags_ = __flags;
-        __states.back().__at_first_ = __at_first;
-        do
-        {
-            __state& __s = __states.back();
-            if (__s.__node_)
-                __s.__node_->__exec(__s);
-            switch (__s.__do_)
-            {
-            case __state::__end_state:
-                __m.__matches_[0].first = __first;
-                __m.__matches_[0].second = _VSTD::next(__first, __s.__current_ - __first);
-                __m.__matches_[0].matched = true;
-                for (unsigned __i = 0; __i < __s.__sub_matches_.size(); ++__i)
-                    __m.__matches_[__i+1] = __s.__sub_matches_[__i];
-                return true;
-            case __state::__accept_and_consume:
-            case __state::__repeat:
-            case __state::__accept_but_not_consume:
-                break;
-            case __state::__split:
-                {
-                __state __snext = __s;
-                __s.__node_->__exec_split(true, __s);
-                __snext.__node_->__exec_split(false, __snext);
-                __states.push_back(_VSTD::move(__snext));
-                }
-                break;
-            case __state::__reject:
-                __states.pop_back();
-                break;
-            default:
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw regex_error(regex_constants::__re_err_unknown);
-#endif
-                break;
-
-            }
-        } while (!__states.empty());
-    }
-    return false;
-}
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__match_at_start_posix_nosubs(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags, bool __at_first) const
-{
-    deque<__state> __states;
-    ptrdiff_t __highest_j = 0;
-    ptrdiff_t _Np = _VSTD::distance(__first, __last);
-    __node* __st = __start_.get();
-    if (__st)
-    {
-        __states.push_back(__state());
-        __states.back().__do_ = 0;
-        __states.back().__first_ = __first;
-        __states.back().__current_ = __first;
-        __states.back().__last_ = __last;
-        __states.back().__loop_data_.resize(__loop_count());
-        __states.back().__node_ = __st;
-        __states.back().__flags_ = __flags;
-        __states.back().__at_first_ = __at_first;
-        bool __matched = false;
-        do
-        {
-            __state& __s = __states.back();
-            if (__s.__node_)
-                __s.__node_->__exec(__s);
-            switch (__s.__do_)
-            {
-            case __state::__end_state:
-                if (!__matched || __highest_j < __s.__current_ - __s.__first_)
-                    __highest_j = __s.__current_ - __s.__first_;
-                __matched = true;
-                if (__highest_j == _Np)
-                    __states.clear();
-                else
-                    __states.pop_back();
-                break;
-            case __state::__consume_input:
-                break;
-            case __state::__accept_and_consume:
-                __states.push_front(_VSTD::move(__s));
-                __states.pop_back();
-                break;
-            case __state::__repeat:
-            case __state::__accept_but_not_consume:
-                break;
-            case __state::__split:
-                {
-                __state __snext = __s;
-                __s.__node_->__exec_split(true, __s);
-                __snext.__node_->__exec_split(false, __snext);
-                __states.push_back(_VSTD::move(__snext));
-                }
-                break;
-            case __state::__reject:
-                __states.pop_back();
-                break;
-            default:
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw regex_error(regex_constants::__re_err_unknown);
-#endif
-                break;
-            }
-        } while (!__states.empty());
-        if (__matched)
-        {
-            __m.__matches_[0].first = __first;
-            __m.__matches_[0].second = _VSTD::next(__first, __highest_j);
-            __m.__matches_[0].matched = true;
-            return true;
-        }
-    }
-    return false;
-}
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__match_at_start_posix_subs(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags, bool __at_first) const
-{
-    vector<__state> __states;
-    __state __best_state;
-    ptrdiff_t __j = 0;
-    ptrdiff_t __highest_j = 0;
-    ptrdiff_t _Np = _VSTD::distance(__first, __last);
-    __node* __st = __start_.get();
-    if (__st)
-    {
-        __states.push_back(__state());
-        __states.back().__do_ = 0;
-        __states.back().__first_ = __first;
-        __states.back().__current_ = __first;
-        __states.back().__last_ = __last;
-        __states.back().__sub_matches_.resize(mark_count());
-        __states.back().__loop_data_.resize(__loop_count());
-        __states.back().__node_ = __st;
-        __states.back().__flags_ = __flags;
-        __states.back().__at_first_ = __at_first;
-        const _CharT* __current = __first;
-        bool __matched = false;
-        do
-        {
-            __state& __s = __states.back();
-            if (__s.__node_)
-                __s.__node_->__exec(__s);
-            switch (__s.__do_)
-            {
-            case __state::__end_state:
-                if (!__matched || __highest_j < __s.__current_ - __s.__first_)
-                {
-                    __highest_j = __s.__current_ - __s.__first_;
-                    __best_state = __s;
-                }
-                __matched = true;
-                if (__highest_j == _Np)
-                    __states.clear();
-                else
-                    __states.pop_back();
-                break;
-            case __state::__accept_and_consume:
-                __j += __s.__current_ - __current;
-                __current = __s.__current_;
-                break;
-            case __state::__repeat:
-            case __state::__accept_but_not_consume:
-                break;
-            case __state::__split:
-                {
-                __state __snext = __s;
-                __s.__node_->__exec_split(true, __s);
-                __snext.__node_->__exec_split(false, __snext);
-                __states.push_back(_VSTD::move(__snext));
-                }
-                break;
-            case __state::__reject:
-                __states.pop_back();
-                break;
-            default:
-#ifndef _LIBCPP_NO_EXCEPTIONS
-                throw regex_error(regex_constants::__re_err_unknown);
-#endif
-                break;
-            }
-        } while (!__states.empty());
-        if (__matched)
-        {
-            __m.__matches_[0].first = __first;
-            __m.__matches_[0].second = _VSTD::next(__first, __highest_j);
-            __m.__matches_[0].matched = true;
-            for (unsigned __i = 0; __i < __best_state.__sub_matches_.size(); ++__i)
-                __m.__matches_[__i+1] = __best_state.__sub_matches_[__i];
-            return true;
-        }
-    }
-    return false;
-}
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__match_at_start(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags, bool __at_first) const
-{
-    if ((__flags_ & 0x1F0) == ECMAScript)
-        return __match_at_start_ecma(__first, __last, __m, __flags, __at_first);
-    if (mark_count() == 0)
-        return __match_at_start_posix_nosubs(__first, __last, __m, __flags, __at_first);
-    return __match_at_start_posix_subs(__first, __last, __m, __flags, __at_first);
-}
-
-template <class _CharT, class _Traits>
-template <class _Allocator>
-bool
-basic_regex<_CharT, _Traits>::__search(
-        const _CharT* __first, const _CharT* __last,
-        match_results<const _CharT*, _Allocator>& __m,
-        regex_constants::match_flag_type __flags) const
-{
-    __m.__init(1 + mark_count(), __first, __last,
-                                    __flags & regex_constants::__no_update_pos);
-    if (__match_at_start(__first, __last, __m, __flags, 
-                                    !(__flags & regex_constants::__no_update_pos)))
-    {
-        __m.__prefix_.second = __m[0].first;
-        __m.__prefix_.matched = __m.__prefix_.first != __m.__prefix_.second;
-        __m.__suffix_.first = __m[0].second;
-        __m.__suffix_.matched = __m.__suffix_.first != __m.__suffix_.second;
-        return true;
-    }
-    if (__first != __last && !(__flags & regex_constants::match_continuous))
-    {
-        __flags |= regex_constants::match_prev_avail;
-        for (++__first; __first != __last; ++__first)
-        {
-            __m.__matches_.assign(__m.size(), __m.__unmatched_);
-            if (__match_at_start(__first, __last, __m, __flags, false))
-            {
-                __m.__prefix_.second = __m[0].first;
-                __m.__prefix_.matched = __m.__prefix_.first != __m.__prefix_.second;
-                __m.__suffix_.first = __m[0].second;
-                __m.__suffix_.matched = __m.__suffix_.first != __m.__suffix_.second;
-                return true;
-            }
-            __m.__matches_.assign(__m.size(), __m.__unmatched_);
-        }
-    }
-    __m.__matches_.clear();
-    return false;
-}
-
-template <class _BidirectionalIterator, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last,
-             match_results<_BidirectionalIterator, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    int __offset = (__flags & regex_constants::match_prev_avail) ? 1 : 0;
-    basic_string<_CharT> __s(_VSTD::prev(__first, __offset), __last);
-    match_results<const _CharT*> __mc;
-    bool __r = __e.__search(__s.data() + __offset, __s.data() + __s.size(), __mc, __flags);
-    __m.__assign(__first, __last, __mc, __flags & regex_constants::__no_update_pos);
-    return __r;
-}
-
-template <class _Iter, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(__wrap_iter<_Iter> __first,
-             __wrap_iter<_Iter> __last,
-             match_results<__wrap_iter<_Iter>, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __mc;
-    bool __r = __e.__search(__first.base(), __last.base(), __mc, __flags);
-    __m.__assign(__first, __last, __mc, __flags & regex_constants::__no_update_pos);
-    return __r;
-}
-
-template <class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const _CharT* __first, const _CharT* __last,
-             match_results<const _CharT*, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return __e.__search(__first, __last, __m, __flags);
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(_BidirectionalIterator __first, _BidirectionalIterator __last,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT> __s(__first, __last);
-    match_results<const _CharT*> __mc;
-    return __e.__search(__s.data(), __s.data() + __s.size(), __mc, __flags);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const _CharT* __first, const _CharT* __last,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __mc;
-    return __e.__search(__first, __last, __mc, __flags);
-}
-
-template <class _CharT, class _Allocator, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const _CharT* __str, match_results<const _CharT*, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return __e.__search(__str, __str + _Traits::length(__str), __m, __flags);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const _CharT* __str, const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __m;
-    return _VSTD::regex_search(__str, __m, __e, __flags);
-}
-
-template <class _ST, class _SA, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const basic_string<_CharT, _ST, _SA>& __s,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __mc;
-    return __e.__search(__s.data(), __s.data() + __s.size(), __mc, __flags);
-}
-
-template <class _ST, class _SA, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_search(const basic_string<_CharT, _ST, _SA>& __s,
-             match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
-             const basic_regex<_CharT, _Traits>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<const _CharT*> __mc;
-    bool __r = __e.__search(__s.data(), __s.data() + __s.size(), __mc, __flags);
-    __m.__assign(__s.begin(), __s.end(), __mc, __flags & regex_constants::__no_update_pos);
-    return __r;
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _ST, class _SA, class _Ap, class _Cp, class _Tp>
-bool
-regex_search(const basic_string<_Cp, _ST, _SA>&& __s,
-             match_results<typename basic_string<_Cp, _ST, _SA>::const_iterator, _Ap>&,
-             const basic_regex<_Cp, _Tp>& __e,
-             regex_constants::match_flag_type __flags = regex_constants::match_default) = delete; 
-#endif
-
-// regex_match
-
-template <class _BidirectionalIterator, class _Allocator, class _CharT, class _Traits>
-bool
-regex_match(_BidirectionalIterator __first, _BidirectionalIterator __last,
-            match_results<_BidirectionalIterator, _Allocator>& __m,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    bool __r = _VSTD::regex_search(__first, __last, __m, __e,
-                            __flags | regex_constants::match_continuous);
-    if (__r)
-    {
-        __r = !__m.suffix().matched;
-        if (!__r)
-            __m.__matches_.clear();
-    }
-    return __r;
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(_BidirectionalIterator __first, _BidirectionalIterator __last,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    match_results<_BidirectionalIterator> __m;
-    return _VSTD::regex_match(__first, __last, __m, __e, __flags);
-}
-
-template <class _CharT, class _Allocator, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const _CharT* __str, match_results<const _CharT*, _Allocator>& __m,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_match(__str, __str + _Traits::length(__str), __m, __e, __flags);
-}
-
-template <class _ST, class _SA, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const basic_string<_CharT, _ST, _SA>& __s,
-            match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_match(__s.begin(), __s.end(), __m, __e, __flags);
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _ST, class _SA, class _Allocator, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const basic_string<_CharT, _ST, _SA>&& __s,
-            match_results<typename basic_string<_CharT, _ST, _SA>::const_iterator, _Allocator>& __m,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default) = delete; 
-#endif
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const _CharT* __str, const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_match(__str, __str + _Traits::length(__str), __e, __flags);
-}
-
-template <class _ST, class _SA, class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-regex_match(const basic_string<_CharT, _ST, _SA>& __s,
-            const basic_regex<_CharT, _Traits>& __e,
-            regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_match(__s.begin(), __s.end(), __e, __flags);
-}
-
-// regex_iterator
-
-template <class _BidirectionalIterator,
-          class _CharT = typename iterator_traits<_BidirectionalIterator>::value_type,
-          class _Traits = regex_traits<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY regex_iterator
-{
-public:
-    typedef basic_regex<_CharT, _Traits>          regex_type;
-    typedef match_results<_BidirectionalIterator> value_type;
-    typedef ptrdiff_t                             difference_type;
-    typedef const value_type*                     pointer;
-    typedef const value_type&                     reference;
-    typedef forward_iterator_tag                  iterator_category;
-
-private:
-    _BidirectionalIterator           __begin_;
-    _BidirectionalIterator           __end_;
-    const regex_type*                __pregex_;
-    regex_constants::match_flag_type __flags_;
-    value_type                       __match_;
-
-public:
-    regex_iterator();
-    regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                   const regex_type& __re,
-                   regex_constants::match_flag_type __m
-                                              = regex_constants::match_default);
-#if _LIBCPP_STD_VER > 11
-    regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                   const regex_type&& __re,
-                   regex_constants::match_flag_type __m 
-                                     = regex_constants::match_default) = delete;
-#endif
-
-    bool operator==(const regex_iterator& __x) const;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const regex_iterator& __x) const {return !(*this == __x);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return  __match_;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const  {return &__match_;}
-
-    regex_iterator& operator++();
-    _LIBCPP_INLINE_VISIBILITY
-    regex_iterator operator++(int)
-    {
-        regex_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-};
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>::regex_iterator()
-    : __begin_(), __end_(), __pregex_(nullptr), __flags_(), __match_()
-{
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                   const regex_type& __re, regex_constants::match_flag_type __m)
-    : __begin_(__a),
-      __end_(__b),
-      __pregex_(&__re),
-      __flags_(__m)
-{
-    _VSTD::regex_search(__begin_, __end_, __match_, *__pregex_, __flags_);
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-bool
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    operator==(const regex_iterator& __x) const
-{
-    if (__match_.empty() && __x.__match_.empty())
-        return true;
-    if (__match_.empty() || __x.__match_.empty())
-        return false;
-    return __begin_ == __x.__begin_       &&
-           __end_ == __x.__end_           &&
-           __pregex_ == __x.__pregex_     &&
-           __flags_ == __x.__flags_       &&
-           __match_[0] == __x.__match_[0];
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>&
-regex_iterator<_BidirectionalIterator, _CharT, _Traits>::operator++()
-{
-    __flags_ |= regex_constants::__no_update_pos;
-    _BidirectionalIterator __start = __match_[0].second;
-    if (__match_.empty())
-    {
-        if (__start == __end_)
-        {
-            __match_ = value_type();
-            return *this;
-        }
-        else if (_VSTD::regex_search(__start, __end_, __match_, *__pregex_,
-                                    __flags_ | regex_constants::match_not_null |
-                                    regex_constants::match_continuous))
-            return *this;
-        else
-            ++__start;
-    }
-    __flags_ |= regex_constants::match_prev_avail;
-    if (!_VSTD::regex_search(__start, __end_, __match_, *__pregex_, __flags_))
-        __match_ = value_type();
-    return *this;
-}
-
-typedef regex_iterator<const char*>             cregex_iterator;
-typedef regex_iterator<const wchar_t*>          wcregex_iterator;
-typedef regex_iterator<string::const_iterator>  sregex_iterator;
-typedef regex_iterator<wstring::const_iterator> wsregex_iterator;
-
-// regex_token_iterator
-
-template <class _BidirectionalIterator,
-          class _CharT = typename iterator_traits<_BidirectionalIterator>::value_type,
-          class _Traits = regex_traits<_CharT> >
-class _LIBCPP_TYPE_VIS_ONLY regex_token_iterator
-{
-public:
-    typedef basic_regex<_CharT, _Traits>      regex_type;
-    typedef sub_match<_BidirectionalIterator> value_type;
-    typedef ptrdiff_t                         difference_type;
-    typedef const value_type*                 pointer;
-    typedef const value_type&                 reference;
-    typedef forward_iterator_tag              iterator_category;
-
-private:
-    typedef regex_iterator<_BidirectionalIterator, _CharT, _Traits> _Position;
-
-    _Position         __position_;
-    const value_type* __result_;
-    value_type        __suffix_;
-    ptrdiff_t         _N_;
-    vector<int>       __subs_;
-
-public:
-    regex_token_iterator();
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re, int __submatch = 0,
-                         regex_constants::match_flag_type __m =
-                                                regex_constants::match_default);
-#if _LIBCPP_STD_VER > 11
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type&& __re, int __submatch = 0,
-                         regex_constants::match_flag_type __m =
-                                       regex_constants::match_default) = delete;
-#endif
-
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re, const vector<int>& __submatches,
-                         regex_constants::match_flag_type __m =
-                                                regex_constants::match_default);
-#if _LIBCPP_STD_VER > 11
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type&& __re, const vector<int>& __submatches,
-                         regex_constants::match_flag_type __m =
-                                     regex_constants::match_default) = delete;
-#endif
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re,
-                         initializer_list<int> __submatches,
-                         regex_constants::match_flag_type __m =
-                                                regex_constants::match_default);
-
-#if _LIBCPP_STD_VER > 11
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type&& __re,
-                         initializer_list<int> __submatches,
-                         regex_constants::match_flag_type __m =
-                                       regex_constants::match_default) = delete;
-#endif
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    template <size_t _Np>
-        regex_token_iterator(_BidirectionalIterator __a,
-                             _BidirectionalIterator __b,
-                             const regex_type& __re,
-                             const int (&__submatches)[_Np],
-                             regex_constants::match_flag_type __m =
-                                                regex_constants::match_default);
-#if _LIBCPP_STD_VER > 11
-    template <std::size_t _Np>
-        regex_token_iterator(_BidirectionalIterator __a,
-                             _BidirectionalIterator __b,
-                             const regex_type&& __re,
-                             const int (&__submatches)[_Np],
-                             regex_constants::match_flag_type __m =
-                                      regex_constants::match_default) = delete;
-#endif
-
-    regex_token_iterator(const regex_token_iterator&);
-    regex_token_iterator& operator=(const regex_token_iterator&);
-
-    bool operator==(const regex_token_iterator& __x) const;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const regex_token_iterator& __x) const {return !(*this == __x);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type& operator*() const {return *__result_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* operator->() const {return __result_;}
-
-    regex_token_iterator& operator++();
-    _LIBCPP_INLINE_VISIBILITY
-    regex_token_iterator operator++(int)
-    {
-        regex_token_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-private:
-    void __init(_BidirectionalIterator __a, _BidirectionalIterator __b);
-    void __establish_result () {
-        if (__subs_[_N_] == -1)
-            __result_ = &__position_->prefix();
-        else
-            __result_ = &(*__position_)[__subs_[_N_]];
-        }       
-};
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator()
-    : __result_(nullptr),
-      __suffix_(),
-      _N_(0)
-{
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-void
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    __init(_BidirectionalIterator __a, _BidirectionalIterator __b)
-{
-    if (__position_ != _Position())
-        __establish_result ();
-    else if (__subs_[_N_] == -1)
-    {
-        __suffix_.matched = true;
-        __suffix_.first = __a;
-        __suffix_.second = __b;
-        __result_ = &__suffix_;
-    }
-    else
-        __result_ = nullptr;
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re, int __submatch,
-                         regex_constants::match_flag_type __m)
-    : __position_(__a, __b, __re, __m),
-      _N_(0),
-      __subs_(1, __submatch)
-{
-    __init(__a, __b);
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re, const vector<int>& __submatches,
-                         regex_constants::match_flag_type __m)
-    : __position_(__a, __b, __re, __m),
-      _N_(0),
-      __subs_(__submatches)
-{
-    __init(__a, __b);
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                         const regex_type& __re,
-                         initializer_list<int> __submatches,
-                         regex_constants::match_flag_type __m)
-    : __position_(__a, __b, __re, __m),
-      _N_(0),
-      __subs_(__submatches)
-{
-    __init(__a, __b);
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-template <size_t _Np>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(_BidirectionalIterator __a, _BidirectionalIterator __b,
-                             const regex_type& __re,
-                             const int (&__submatches)[_Np],
-                             regex_constants::match_flag_type __m)
-    : __position_(__a, __b, __re, __m),
-      _N_(0),
-      __subs_(__submatches, __submatches + _Np)
-{
-    __init(__a, __b);
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    regex_token_iterator(const regex_token_iterator& __x)
-    : __position_(__x.__position_),
-      __result_(__x.__result_),
-      __suffix_(__x.__suffix_),
-      _N_(__x._N_),
-      __subs_(__x.__subs_)
-{
-    if (__x.__result_ == &__x.__suffix_)
-        __result_ = &__suffix_;
-    else if ( __result_ != nullptr )
-        __establish_result ();
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>&
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    operator=(const regex_token_iterator& __x)
-{
-    if (this != &__x)
-    {
-        __position_ = __x.__position_;
-        if (__x.__result_ == &__x.__suffix_)
-            __result_ = &__suffix_;
-        else
-            __result_ = __x.__result_;
-        __suffix_ = __x.__suffix_;
-        _N_ = __x._N_;
-        __subs_ = __x.__subs_;
-
-        if ( __result_ != nullptr && __result_ != &__suffix_ )
-            __establish_result();
-    }
-    return *this;
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-bool
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
-    operator==(const regex_token_iterator& __x) const
-{
-    if (__result_ == nullptr && __x.__result_ == nullptr)
-        return true;
-    if (__result_ == &__suffix_ && __x.__result_ == &__x.__suffix_ &&
-            __suffix_ == __x.__suffix_)
-        return true;
-    if (__result_ == nullptr || __x.__result_ == nullptr)
-        return false;
-    if (__result_ == &__suffix_ || __x.__result_ == &__x.__suffix_)
-        return false;
-    return __position_ == __x.__position_ && _N_ == __x._N_ &&
-           __subs_ == __x.__subs_;
-}
-
-template <class _BidirectionalIterator, class _CharT, class _Traits>
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>&
-regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::operator++()
-{
-    _Position __prev = __position_;
-    if (__result_ == &__suffix_)
-        __result_ = nullptr;
-    else if (_N_ + 1 < __subs_.size())
-    {
-        ++_N_;
-        __establish_result();
-    }
-    else
-    {
-        _N_ = 0;
-        ++__position_;
-        if (__position_ != _Position())
-            __establish_result();
-        else
-        {
-            if (_VSTD::find(__subs_.begin(), __subs_.end(), -1) != __subs_.end()
-                && __prev->suffix().length() != 0)
-            {
-                __suffix_.matched = true;
-                __suffix_.first = __prev->suffix().first;
-                __suffix_.second = __prev->suffix().second;
-                __result_ = &__suffix_;
-            }
-            else
-                __result_ = nullptr;
-        }
-    }
-    return *this;
-}
-
-typedef regex_token_iterator<const char*>             cregex_token_iterator;
-typedef regex_token_iterator<const wchar_t*>          wcregex_token_iterator;
-typedef regex_token_iterator<string::const_iterator>  sregex_token_iterator;
-typedef regex_token_iterator<wstring::const_iterator> wsregex_token_iterator;
-
-// regex_replace
-
-template <class _OutputIterator, class _BidirectionalIterator,
-          class _Traits, class _CharT>
-_OutputIterator
-regex_replace(_OutputIterator __out,
-              _BidirectionalIterator __first, _BidirectionalIterator __last,
-              const basic_regex<_CharT, _Traits>& __e, const _CharT* __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    typedef regex_iterator<_BidirectionalIterator, _CharT, _Traits> _Iter;
-    _Iter __i(__first, __last, __e, __flags);
-    _Iter __eof;
-    if (__i == __eof)
-    {
-        if (!(__flags & regex_constants::format_no_copy))
-            __out = _VSTD::copy(__first, __last, __out);
-    }
-    else
-    {
-        sub_match<_BidirectionalIterator> __lm;
-        for (size_t __len = char_traits<_CharT>::length(__fmt); __i != __eof; ++__i)
-        {
-            if (!(__flags & regex_constants::format_no_copy))
-                __out = _VSTD::copy(__i->prefix().first, __i->prefix().second, __out);
-            __out = __i->format(__out, __fmt, __fmt + __len, __flags);
-            __lm = __i->suffix();
-            if (__flags & regex_constants::format_first_only)
-                break;
-        }
-        if (!(__flags & regex_constants::format_no_copy))
-            __out = _VSTD::copy(__lm.first, __lm.second, __out);
-    }
-    return __out;
-}
-
-template <class _OutputIterator, class _BidirectionalIterator,
-          class _Traits, class _CharT, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-_OutputIterator
-regex_replace(_OutputIterator __out,
-              _BidirectionalIterator __first, _BidirectionalIterator __last,
-              const basic_regex<_CharT, _Traits>& __e,
-              const basic_string<_CharT, _ST, _SA>& __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    return _VSTD::regex_replace(__out, __first, __last, __e, __fmt.c_str(), __flags);
-}
-
-template <class _Traits, class _CharT, class _ST, class _SA, class _FST,
-          class _FSA>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _ST, _SA>
-regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
-              const basic_regex<_CharT, _Traits>& __e,
-              const basic_string<_CharT, _FST, _FSA>& __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT, _ST, _SA> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s.begin(), __s.end(), __e,
-                        __fmt.c_str(), __flags);
-    return __r;
-}
-
-template <class _Traits, class _CharT, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _ST, _SA>
-regex_replace(const basic_string<_CharT, _ST, _SA>& __s,
-              const basic_regex<_CharT, _Traits>& __e, const _CharT* __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT, _ST, _SA> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s.begin(), __s.end(), __e,
-                        __fmt, __flags);
-    return __r;
-}
-
-template <class _Traits, class _CharT, class _ST, class _SA>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT>
-regex_replace(const _CharT* __s,
-              const basic_regex<_CharT, _Traits>& __e,
-              const basic_string<_CharT, _ST, _SA>& __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s,
-                        __s + char_traits<_CharT>::length(__s), __e,
-                        __fmt.c_str(), __flags);
-    return __r;
-}
-
-template <class _Traits, class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT>
-regex_replace(const _CharT* __s,
-              const basic_regex<_CharT, _Traits>& __e,
-              const _CharT* __fmt,
-              regex_constants::match_flag_type __flags = regex_constants::match_default)
-{
-    basic_string<_CharT> __r;
-    _VSTD::regex_replace(back_inserter(__r), __s,
-                        __s + char_traits<_CharT>::length(__s), __e,
-                        __fmt, __flags);
-    return __r;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_REGEX
diff --git a/include.new/c++/v1/tr1/scoped_allocator b/include.new/c++/v1/tr1/scoped_allocator
deleted file mode 100644
index aa8bece..0000000
--- a/include.new/c++/v1/tr1/scoped_allocator
+++ /dev/null
@@ -1,578 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- scoped_allocator --------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SCOPED_ALLOCATOR
-#define _LIBCPP_SCOPED_ALLOCATOR
-
-/*
-    scoped_allocator synopsis
-
-namespace std
-{
-
-template <class OuterAlloc, class... InnerAllocs>
-class scoped_allocator_adaptor : public OuterAlloc
-{
-    typedef allocator_traits<OuterAlloc> OuterTraits; // exposition only
-    scoped_allocator_adaptor<InnerAllocs...> inner;   // exposition only
-public:
-
-    typedef OuterAlloc outer_allocator_type;
-    typedef see below inner_allocator_type;
-
-    typedef typename OuterTraits::value_type value_type;
-    typedef typename OuterTraits::size_type size_type;
-    typedef typename OuterTraits::difference_type difference_type;
-    typedef typename OuterTraits::pointer pointer;
-    typedef typename OuterTraits::const_pointer const_pointer;
-    typedef typename OuterTraits::void_pointer void_pointer;
-    typedef typename OuterTraits::const_void_pointer const_void_pointer;
-
-    typedef see below propagate_on_container_copy_assignment;
-    typedef see below propagate_on_container_move_assignment;
-    typedef see below propagate_on_container_swap;
-
-    template <class Tp>
-        struct rebind
-        {
-            typedef scoped_allocator_adaptor<
-                OuterTraits::template rebind_alloc<Tp>, InnerAllocs...> other;
-        };
-
-    scoped_allocator_adaptor();
-    template <class OuterA2>
-        scoped_allocator_adaptor(OuterA2&& outerAlloc,
-                                 const InnerAllocs&... innerAllocs) noexcept;
-    scoped_allocator_adaptor(const scoped_allocator_adaptor& other) noexcept;
-    scoped_allocator_adaptor(scoped_allocator_adaptor&& other) noexcept;
-    template <class OuterA2>
-        scoped_allocator_adaptor(const scoped_allocator_adaptor<OuterA2, InnerAllocs...>& other) noexcept;
-    template <class OuterA2>
-        scoped_allocator_adaptor(const scoped_allocator_adaptor<OuterA2, InnerAllocs...>&& other) noexcept;
-
-    ~scoped_allocator_adaptor();
-
-    inner_allocator_type& inner_allocator() noexcept;
-    const inner_allocator_type& inner_allocator() const noexcept;
-
-    outer_allocator_type& outer_allocator() noexcept;
-    const outer_allocator_type& outer_allocator() const noexcept;
-
-    pointer allocate(size_type n);
-    pointer allocate(size_type n, const_void_pointer hint);
-    void deallocate(pointer p, size_type n) noexcept;
-
-    size_type max_size() const;
-    template <class T, class... Args> void construct(T* p, Args&& args);
-    template <class T1, class T2, class... Args1, class... Args2>
-        void construct(pair<T1, T2>* p, piecewise_construct t, tuple<Args1...> x,
-                       tuple<Args2...> y);
-    template <class T1, class T2>
-        void construct(pair<T1, T2>* p);
-    template <class T1, class T2, class U, class V>
-        void construct(pair<T1, T2>* p, U&& x, V&& y);
-    template <class T1, class T2, class U, class V>
-        void construct(pair<T1, T2>* p, const pair<U, V>& x);
-    template <class T1, class T2, class U, class V>
-        void construct(pair<T1, T2>* p, pair<U, V>&& x);
-    template <class T> void destroy(T* p);
-
-    template <class T> void destroy(T* p) noexcept;
-
-    scoped_allocator_adaptor select_on_container_copy_construction() const noexcept;
-};
-
-template <class OuterA1, class OuterA2, class... InnerAllocs>
-    bool
-    operator==(const scoped_allocator_adaptor<OuterA1, InnerAllocs...>& a,
-               const scoped_allocator_adaptor<OuterA2, InnerAllocs...>& b) noexcept;
-
-template <class OuterA1, class OuterA2, class... InnerAllocs>
-    bool
-    operator!=(const scoped_allocator_adaptor<OuterA1, InnerAllocs...>& a,
-               const scoped_allocator_adaptor<OuterA2, InnerAllocs...>& b) noexcept;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <memory>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_ADVANCED_SFINAE)
-
-// scoped_allocator_adaptor
-
-template <class ..._Allocs>
-class scoped_allocator_adaptor;
-
-template <class ..._Allocs> struct __get_poc_copy_assignment;
-
-template <class _A0>
-struct __get_poc_copy_assignment<_A0>
-{
-    static const bool value = allocator_traits<_A0>::
-                              propagate_on_container_copy_assignment::value;
-};
-
-template <class _A0, class ..._Allocs>
-struct __get_poc_copy_assignment<_A0, _Allocs...>
-{
-    static const bool value =
-        allocator_traits<_A0>::propagate_on_container_copy_assignment::value ||
-        __get_poc_copy_assignment<_Allocs...>::value;
-};
-
-template <class ..._Allocs> struct __get_poc_move_assignment;
-
-template <class _A0>
-struct __get_poc_move_assignment<_A0>
-{
-    static const bool value = allocator_traits<_A0>::
-                              propagate_on_container_move_assignment::value;
-};
-
-template <class _A0, class ..._Allocs>
-struct __get_poc_move_assignment<_A0, _Allocs...>
-{
-    static const bool value =
-        allocator_traits<_A0>::propagate_on_container_move_assignment::value ||
-        __get_poc_move_assignment<_Allocs...>::value;
-};
-
-template <class ..._Allocs> struct __get_poc_swap;
-
-template <class _A0>
-struct __get_poc_swap<_A0>
-{
-    static const bool value = allocator_traits<_A0>::
-                              propagate_on_container_swap::value;
-};
-
-template <class _A0, class ..._Allocs>
-struct __get_poc_swap<_A0, _Allocs...>
-{
-    static const bool value =
-        allocator_traits<_A0>::propagate_on_container_swap::value ||
-        __get_poc_swap<_Allocs...>::value;
-};
-
-template <class ..._Allocs>
-class __scoped_allocator_storage;
-
-template <class _OuterAlloc, class... _InnerAllocs>
-class __scoped_allocator_storage<_OuterAlloc, _InnerAllocs...>
-    : public _OuterAlloc
-{
-    typedef _OuterAlloc outer_allocator_type;
-protected:
-    typedef scoped_allocator_adaptor<_InnerAllocs...> inner_allocator_type;
-
-private:
-    inner_allocator_type __inner_;
-
-protected:
-
-    _LIBCPP_INLINE_VISIBILITY
-    __scoped_allocator_storage() _NOEXCEPT {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(_OuterA2&& __outerAlloc,
-                                   const _InnerAllocs& ...__innerAllocs) _NOEXCEPT
-            : outer_allocator_type(_VSTD::forward<_OuterA2>(__outerAlloc)),
-              __inner_(__innerAllocs...) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, const _OuterA2&>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(
-            const __scoped_allocator_storage<_OuterA2, _InnerAllocs...>& __other) _NOEXCEPT
-            : outer_allocator_type(__other.outer_allocator()),
-              __inner_(__other.inner_allocator()) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(
-            __scoped_allocator_storage<_OuterA2, _InnerAllocs...>&& __other) _NOEXCEPT
-            : outer_allocator_type(_VSTD::move(__other.outer_allocator())),
-              __inner_(_VSTD::move(__other.inner_allocator())) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(_OuterA2&& __o,
-                                   const inner_allocator_type& __i) _NOEXCEPT
-            : outer_allocator_type(_VSTD::forward<_OuterA2>(__o)),
-              __inner_(__i)
-        {
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    inner_allocator_type& inner_allocator() _NOEXCEPT             {return __inner_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const inner_allocator_type& inner_allocator() const _NOEXCEPT {return __inner_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    outer_allocator_type& outer_allocator() _NOEXCEPT
-        {return static_cast<outer_allocator_type&>(*this);}
-    _LIBCPP_INLINE_VISIBILITY
-    const outer_allocator_type& outer_allocator() const _NOEXCEPT
-        {return static_cast<const outer_allocator_type&>(*this);}
-
-    scoped_allocator_adaptor<outer_allocator_type, _InnerAllocs...>
-    _LIBCPP_INLINE_VISIBILITY
-    select_on_container_copy_construction() const _NOEXCEPT
-        {
-            return scoped_allocator_adaptor<outer_allocator_type, _InnerAllocs...>
-            (
-                allocator_traits<outer_allocator_type>::
-                    select_on_container_copy_construction(outer_allocator()),
-                allocator_traits<inner_allocator_type>::
-                    select_on_container_copy_construction(inner_allocator())
-            );
-        }
-
-    template <class...> friend class __scoped_allocator_storage;
-};
-
-template <class _OuterAlloc>
-class __scoped_allocator_storage<_OuterAlloc>
-    : public _OuterAlloc
-{
-    typedef _OuterAlloc outer_allocator_type;
-protected:
-    typedef scoped_allocator_adaptor<_OuterAlloc> inner_allocator_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __scoped_allocator_storage() _NOEXCEPT {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(_OuterA2&& __outerAlloc) _NOEXCEPT
-            : outer_allocator_type(_VSTD::forward<_OuterA2>(__outerAlloc)) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, const _OuterA2&>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(
-            const __scoped_allocator_storage<_OuterA2>& __other) _NOEXCEPT
-            : outer_allocator_type(__other.outer_allocator()) {}
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        __scoped_allocator_storage(
-            __scoped_allocator_storage<_OuterA2>&& __other) _NOEXCEPT
-            : outer_allocator_type(_VSTD::move(__other.outer_allocator())) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    inner_allocator_type& inner_allocator() _NOEXCEPT
-        {return static_cast<inner_allocator_type&>(*this);}
-    _LIBCPP_INLINE_VISIBILITY
-    const inner_allocator_type& inner_allocator() const _NOEXCEPT
-        {return static_cast<const inner_allocator_type&>(*this);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    outer_allocator_type& outer_allocator() _NOEXCEPT
-        {return static_cast<outer_allocator_type&>(*this);}
-    _LIBCPP_INLINE_VISIBILITY
-    const outer_allocator_type& outer_allocator() const _NOEXCEPT
-        {return static_cast<const outer_allocator_type&>(*this);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    scoped_allocator_adaptor<outer_allocator_type>
-    select_on_container_copy_construction() const _NOEXCEPT
-        {return scoped_allocator_adaptor<outer_allocator_type>(
-            allocator_traits<outer_allocator_type>::
-                select_on_container_copy_construction(outer_allocator())
-        );}
-
-    __scoped_allocator_storage(const outer_allocator_type& __o,
-                               const inner_allocator_type& __i) _NOEXCEPT;
-
-    template <class...> friend class __scoped_allocator_storage;
-};
-
-// __outermost
-
-template <class _Alloc>
-decltype(declval<_Alloc>().outer_allocator(), true_type())
-__has_outer_allocator_test(_Alloc&& __a);
-
-template <class _Alloc>
-false_type
-__has_outer_allocator_test(const volatile _Alloc& __a);
-
-template <class _Alloc>
-struct __has_outer_allocator
-    : public common_type
-             <
-                 decltype(__has_outer_allocator_test(declval<_Alloc&>()))
-             >::type
-{
-};
-
-template <class _Alloc, bool = __has_outer_allocator<_Alloc>::value>
-struct __outermost
-{
-    typedef _Alloc type;
-    _LIBCPP_INLINE_VISIBILITY
-    type& operator()(type& __a) const _NOEXCEPT {return __a;}
-};
-
-template <class _Alloc>
-struct __outermost<_Alloc, true>
-{
-    typedef typename remove_reference
-                     <
-                        decltype(_VSTD::declval<_Alloc>().outer_allocator())
-                     >::type                                    _OuterAlloc;
-    typedef typename __outermost<_OuterAlloc>::type             type;
-    _LIBCPP_INLINE_VISIBILITY
-    type& operator()(_Alloc& __a) const _NOEXCEPT
-        {return __outermost<_OuterAlloc>()(__a.outer_allocator());}
-};
-
-template <class _OuterAlloc, class... _InnerAllocs>
-class _LIBCPP_TYPE_VIS_ONLY scoped_allocator_adaptor<_OuterAlloc, _InnerAllocs...>
-    : public __scoped_allocator_storage<_OuterAlloc, _InnerAllocs...>
-{
-    typedef __scoped_allocator_storage<_OuterAlloc, _InnerAllocs...> base;
-    typedef allocator_traits<_OuterAlloc>             _OuterTraits;
-public:
-    typedef _OuterAlloc                               outer_allocator_type;
-    typedef typename base::inner_allocator_type       inner_allocator_type;
-    typedef typename _OuterTraits::size_type          size_type;
-    typedef typename _OuterTraits::difference_type    difference_type;
-    typedef typename _OuterTraits::pointer            pointer;
-    typedef typename _OuterTraits::const_pointer      const_pointer;
-    typedef typename _OuterTraits::void_pointer       void_pointer;
-    typedef typename _OuterTraits::const_void_pointer const_void_pointer;
-
-    typedef integral_constant
-            <
-                bool,
-                __get_poc_copy_assignment<outer_allocator_type,
-                                          _InnerAllocs...>::value
-            > propagate_on_container_copy_assignment;
-    typedef integral_constant
-            <
-                bool,
-                __get_poc_move_assignment<outer_allocator_type,
-                                          _InnerAllocs...>::value
-            > propagate_on_container_move_assignment;
-    typedef integral_constant
-            <
-                bool,
-                __get_poc_swap<outer_allocator_type, _InnerAllocs...>::value
-            > propagate_on_container_swap;
-
-    template <class _Tp>
-    struct rebind
-    {
-        typedef scoped_allocator_adaptor
-        <
-            typename _OuterTraits::template rebind_alloc<_Tp>, _InnerAllocs...
-        > other;
-    };
-
-    _LIBCPP_INLINE_VISIBILITY
-    scoped_allocator_adaptor() _NOEXCEPT {}
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        scoped_allocator_adaptor(_OuterA2&& __outerAlloc,
-                                 const _InnerAllocs& ...__innerAllocs) _NOEXCEPT
-            : base(_VSTD::forward<_OuterA2>(__outerAlloc), __innerAllocs...) {}
-    // scoped_allocator_adaptor(const scoped_allocator_adaptor& __other) = default;
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, const _OuterA2&>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        scoped_allocator_adaptor(
-            const scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>& __other) _NOEXCEPT
-                : base(__other) {}
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-        _LIBCPP_INLINE_VISIBILITY
-        scoped_allocator_adaptor(
-            scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>&& __other) _NOEXCEPT
-                : base(_VSTD::move(__other)) {}
-
-    // ~scoped_allocator_adaptor() = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-    inner_allocator_type& inner_allocator() _NOEXCEPT
-        {return base::inner_allocator();}
-    _LIBCPP_INLINE_VISIBILITY
-    const inner_allocator_type& inner_allocator() const _NOEXCEPT
-        {return base::inner_allocator();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    outer_allocator_type& outer_allocator() _NOEXCEPT
-        {return base::outer_allocator();}
-    _LIBCPP_INLINE_VISIBILITY
-    const outer_allocator_type& outer_allocator() const _NOEXCEPT
-        {return base::outer_allocator();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    pointer allocate(size_type __n)
-        {return allocator_traits<outer_allocator_type>::
-            allocate(outer_allocator(), __n);}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer allocate(size_type __n, const_void_pointer __hint)
-        {return allocator_traits<outer_allocator_type>::
-            allocate(outer_allocator(), __n, __hint);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void deallocate(pointer __p, size_type __n) _NOEXCEPT
-        {allocator_traits<outer_allocator_type>::
-            deallocate(outer_allocator(), __p, __n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const
-        {return allocator_traits<outer_allocator_type>::max_size(outer_allocator());}
-
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void construct(_Tp* __p, _Args&& ...__args)
-            {__construct(__uses_alloc_ctor<_Tp, inner_allocator_type, _Args...>(),
-                         __p, _VSTD::forward<_Args>(__args)...);}
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        void destroy(_Tp* __p)
-            {
-                typedef __outermost<outer_allocator_type> _OM;
-                allocator_traits<typename _OM::type>::
-                                         destroy(_OM()(outer_allocator()), __p);
-            }
-
-    _LIBCPP_INLINE_VISIBILITY
-    scoped_allocator_adaptor select_on_container_copy_construction() const _NOEXCEPT
-        {return base::select_on_container_copy_construction();}
-
-private:
-
-    template <class _OuterA2,
-              class = typename enable_if<
-                        is_constructible<outer_allocator_type, _OuterA2>::value
-                      >::type>
-    _LIBCPP_INLINE_VISIBILITY
-    scoped_allocator_adaptor(_OuterA2&& __o,
-                             const inner_allocator_type& __i) _NOEXCEPT
-        : base(_VSTD::forward<_OuterA2>(__o), __i) {}
-
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void __construct(integral_constant<int, 0>, _Tp* __p, _Args&& ...__args)
-            {
-                typedef __outermost<outer_allocator_type> _OM;
-                allocator_traits<typename _OM::type>::construct
-                (
-                    _OM()(outer_allocator()),
-                    __p,
-                    _VSTD::forward<_Args>(__args)...
-                );
-            }
-
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void __construct(integral_constant<int, 1>, _Tp* __p, _Args&& ...__args)
-            {
-                typedef __outermost<outer_allocator_type> _OM;
-                allocator_traits<typename _OM::type>::construct
-                (
-                    _OM()(outer_allocator()),
-                    __p,
-                    allocator_arg,
-                    inner_allocator(),
-                    _VSTD::forward<_Args>(__args)...
-                );
-            }
-
-    template <class _Tp, class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void __construct(integral_constant<int, 2>, _Tp* __p, _Args&& ...__args)
-            {
-                typedef __outermost<outer_allocator_type> _OM;
-                allocator_traits<typename _OM::type>::construct
-                (
-                    _OM()(outer_allocator()),
-                    __p,
-                    _VSTD::forward<_Args>(__args)...,
-                    inner_allocator()
-                );
-            }
-
-    template <class...> friend class __scoped_allocator_storage;
-};
-
-template <class _OuterA1, class _OuterA2>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const scoped_allocator_adaptor<_OuterA1>& __a,
-           const scoped_allocator_adaptor<_OuterA2>& __b) _NOEXCEPT
-{
-    return __a.outer_allocator() == __b.outer_allocator();
-}
-
-template <class _OuterA1, class _OuterA2, class _InnerA0, class... _InnerAllocs>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const scoped_allocator_adaptor<_OuterA1, _InnerA0, _InnerAllocs...>& __a,
-           const scoped_allocator_adaptor<_OuterA2, _InnerA0, _InnerAllocs...>& __b) _NOEXCEPT
-{
-    return __a.outer_allocator() == __b.outer_allocator() &&
-           __a.inner_allocator() == __b.inner_allocator();
-}
-
-template <class _OuterA1, class _OuterA2, class... _InnerAllocs>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const scoped_allocator_adaptor<_OuterA1, _InnerAllocs...>& __a,
-           const scoped_allocator_adaptor<_OuterA2, _InnerAllocs...>& __b) _NOEXCEPT
-{
-    return !(__a == __b);
-}
-
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_ADVANCED_SFINAE)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SCOPED_ALLOCATOR
diff --git a/include.new/c++/v1/tr1/set b/include.new/c++/v1/tr1/set
deleted file mode 100644
index 22d794d..0000000
--- a/include.new/c++/v1/tr1/set
+++ /dev/null
@@ -1,1217 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- set -------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SET
-#define _LIBCPP_SET
-
-/*
-
-    set synopsis
-
-namespace std
-{
-
-template <class Key, class Compare = less<Key>,
-          class Allocator = allocator<Key>>
-class set
-{
-public:
-    // types:
-    typedef Key                                      key_type;
-    typedef key_type                                 value_type;
-    typedef Compare                                  key_compare;
-    typedef key_compare                              value_compare;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    // construct/copy/destroy:
-    set()
-        noexcept(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value);
-    explicit set(const value_compare& comp);
-    set(const value_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        set(InputIterator first, InputIterator last,
-            const value_compare& comp = value_compare());
-    template <class InputIterator>
-        set(InputIterator first, InputIterator last, const value_compare& comp,
-            const allocator_type& a);
-    set(const set& s);
-    set(set&& s)
-        noexcept(
-            is_nothrow_move_constructible<allocator_type>::value &&
-            is_nothrow_move_constructible<key_compare>::value);
-    explicit set(const allocator_type& a);
-    set(const set& s, const allocator_type& a);
-    set(set&& s, const allocator_type& a);
-    set(initializer_list<value_type> il, const value_compare& comp = value_compare());
-    set(initializer_list<value_type> il, const value_compare& comp,
-        const allocator_type& a);
-    template <class InputIterator>
-        set(InputIterator first, InputIterator last, const allocator_type& a)
-            : set(first, last, Compare(), a) {}  // C++14
-    set(initializer_list<value_type> il, const allocator_type& a)
-        : set(il, Compare(), a) {}  // C++14
-    ~set();
-
-    set& operator=(const set& s);
-    set& operator=(set&& s)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<key_compare>::value);
-    set& operator=(initializer_list<value_type> il);
-
-    // iterators:
-          iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-          iterator end() noexcept;
-    const_iterator end()   const noexcept;
-
-          reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-          reverse_iterator rend() noexcept;
-    const_reverse_iterator rend()   const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    // capacity:
-    bool      empty()    const noexcept;
-    size_type size()     const noexcept;
-    size_type max_size() const noexcept;
-
-    // modifiers:
-    template <class... Args>
-        pair<iterator, bool> emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    pair<iterator,bool> insert(const value_type& v);
-    pair<iterator,bool> insert(value_type&& v);
-    iterator insert(const_iterator position, const value_type& v);
-    iterator insert(const_iterator position, value_type&& v);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type> il);
-
-    iterator  erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator  erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(set& s)
-        noexcept(
-            __is_nothrow_swappable<key_compare>::value &&
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value));
-
-    // observers:
-    allocator_type get_allocator() const noexcept;
-    key_compare    key_comp()      const;
-    value_compare  value_comp()    const;
-
-    // set operations:
-          iterator find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    template<typename K>
-        iterator find(const K& x);
-    template<typename K>
-        const_iterator find(const K& x) const;  // C++14
-    template<typename K>
-      size_type count(const K& x) const;        // C++14
-
-    size_type      count(const key_type& k) const;
-          iterator lower_bound(const key_type& k);
-    const_iterator lower_bound(const key_type& k) const;
-    template<typename K>
-        iterator lower_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator lower_bound(const K& x) const;  // C++14
-
-          iterator upper_bound(const key_type& k);
-    const_iterator upper_bound(const key_type& k) const;
-    template<typename K>
-        iterator upper_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator upper_bound(const K& x) const;  // C++14
-    pair<iterator,iterator>             equal_range(const key_type& k);
-    pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
-    template<typename K>
-        pair<iterator,iterator>             equal_range(const K& x);        // C++14
-    template<typename K>
-        pair<const_iterator,const_iterator> equal_range(const K& x) const;  // C++14
-};
-
-template <class Key, class Compare, class Allocator>
-bool
-operator==(const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator< (const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator!=(const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator> (const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator>=(const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator<=(const set<Key, Compare, Allocator>& x,
-           const set<Key, Compare, Allocator>& y);
-
-// specialized algorithms:
-template <class Key, class Compare, class Allocator>
-void
-swap(set<Key, Compare, Allocator>& x, set<Key, Compare, Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-template <class Key, class Compare = less<Key>,
-          class Allocator = allocator<Key>>
-class multiset
-{
-public:
-    // types:
-    typedef Key                                      key_type;
-    typedef key_type                                 value_type;
-    typedef Compare                                  key_compare;
-    typedef key_compare                              value_compare;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    // construct/copy/destroy:
-    multiset()
-        noexcept(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value);
-    explicit multiset(const value_compare& comp);
-    multiset(const value_compare& comp, const allocator_type& a);
-    template <class InputIterator>
-        multiset(InputIterator first, InputIterator last,
-                 const value_compare& comp = value_compare());
-    template <class InputIterator>
-        multiset(InputIterator first, InputIterator last,
-                 const value_compare& comp, const allocator_type& a);
-    multiset(const multiset& s);
-    multiset(multiset&& s)
-        noexcept(
-            is_nothrow_move_constructible<allocator_type>::value &&
-            is_nothrow_move_constructible<key_compare>::value);
-    explicit multiset(const allocator_type& a);
-    multiset(const multiset& s, const allocator_type& a);
-    multiset(multiset&& s, const allocator_type& a);
-    multiset(initializer_list<value_type> il, const value_compare& comp = value_compare());
-    multiset(initializer_list<value_type> il, const value_compare& comp,
-             const allocator_type& a);
-    template <class InputIterator>
-        multiset(InputIterator first, InputIterator last, const allocator_type& a)
-            : set(first, last, Compare(), a) {}  // C++14
-    multiset(initializer_list<value_type> il, const allocator_type& a)
-        : set(il, Compare(), a) {}  // C++14
-    ~multiset();
-
-    multiset& operator=(const multiset& s);
-    multiset& operator=(multiset&& s)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<key_compare>::value);
-    multiset& operator=(initializer_list<value_type> il);
-
-    // iterators:
-          iterator begin() noexcept;
-    const_iterator begin() const noexcept;
-          iterator end() noexcept;
-    const_iterator end()   const noexcept;
-
-          reverse_iterator rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-          reverse_iterator rend() noexcept;
-    const_reverse_iterator rend()   const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    // capacity:
-    bool      empty()    const noexcept;
-    size_type size()     const noexcept;
-    size_type max_size() const noexcept;
-
-    // modifiers:
-    template <class... Args>
-        iterator emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    iterator insert(const value_type& v);
-    iterator insert(value_type&& v);
-    iterator insert(const_iterator position, const value_type& v);
-    iterator insert(const_iterator position, value_type&& v);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type> il);
-
-    iterator  erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator  erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(multiset& s)
-        noexcept(
-            __is_nothrow_swappable<key_compare>::value &&
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value));
-
-    // observers:
-    allocator_type get_allocator() const noexcept;
-    key_compare    key_comp()      const;
-    value_compare  value_comp()    const;
-
-    // set operations:
-          iterator find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    template<typename K>
-        iterator find(const K& x);
-    template<typename K>
-        const_iterator find(const K& x) const;  // C++14
-
-    size_type      count(const key_type& k) const;
-          iterator lower_bound(const key_type& k);
-    const_iterator lower_bound(const key_type& k) const;
-    template<typename K>
-        iterator lower_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator lower_bound(const K& x) const;  // C++14
-
-          iterator upper_bound(const key_type& k);
-    const_iterator upper_bound(const key_type& k) const;
-    template<typename K>
-        iterator upper_bound(const K& x);              // C++14
-    template<typename K>
-        const_iterator upper_bound(const K& x) const;  // C++14
-
-    pair<iterator,iterator>             equal_range(const key_type& k);
-    pair<const_iterator,const_iterator> equal_range(const key_type& k) const;
-    template<typename K>
-        pair<iterator,iterator>             equal_range(const K& x);        // C++14
-    template<typename K>
-        pair<const_iterator,const_iterator> equal_range(const K& x) const;  // C++14
-};
-
-template <class Key, class Compare, class Allocator>
-bool
-operator==(const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator< (const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator!=(const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator> (const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator>=(const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-template <class Key, class Compare, class Allocator>
-bool
-operator<=(const multiset<Key, Compare, Allocator>& x,
-           const multiset<Key, Compare, Allocator>& y);
-
-// specialized algorithms:
-template <class Key, class Compare, class Allocator>
-void
-swap(multiset<Key, Compare, Allocator>& x, multiset<Key, Compare, Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__tree>
-#include <functional>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Key, class _Compare = less<_Key>,
-          class _Allocator = allocator<_Key> >
-class _LIBCPP_TYPE_VIS_ONLY set
-{
-public:
-    // types:
-    typedef _Key                                     key_type;
-    typedef key_type                                 value_type;
-    typedef _Compare                                 key_compare;
-    typedef key_compare                              value_compare;
-    typedef _Allocator                               allocator_type;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-
-private:
-    typedef __tree<value_type, value_compare, allocator_type> __base;
-    typedef allocator_traits<allocator_type>                  __alloc_traits;
-    typedef typename __base::__node_holder                    __node_holder;
-
-    __base __tree_;
-
-public:
-    typedef typename __base::pointer               pointer;
-    typedef typename __base::const_pointer         const_pointer;
-    typedef typename __base::size_type             size_type;
-    typedef typename __base::difference_type       difference_type;
-    typedef typename __base::const_iterator        iterator;
-    typedef typename __base::const_iterator        const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>       reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    set()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(value_compare()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit set(const value_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__comp) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit set(const value_compare& __comp, const allocator_type& __a)
-        : __tree_(__comp, __a) {}
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        set(_InputIterator __f, _InputIterator __l,
-            const value_compare& __comp = value_compare())
-        : __tree_(__comp)
-        {
-            insert(__f, __l);
-        }
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        set(_InputIterator __f, _InputIterator __l, const value_compare& __comp,
-            const allocator_type& __a)
-        : __tree_(__comp, __a)
-        {
-            insert(__f, __l);
-        }
-
-#if _LIBCPP_STD_VER > 11
-        template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY 
-        set(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
-            : set(__f, __l, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    set(const set& __s)
-        : __tree_(__s.__tree_)
-        {
-            insert(__s.begin(), __s.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    set& operator=(const set& __s)
-        {
-            __tree_ = __s.__tree_;
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    set(set&& __s)
-        _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-        : __tree_(_VSTD::move(__s.__tree_)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit set(const allocator_type& __a)
-        : __tree_(__a) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    set(const set& __s, const allocator_type& __a)
-        : __tree_(__s.__tree_.value_comp(), __a)
-        {
-            insert(__s.begin(), __s.end());
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    set(set&& __s, const allocator_type& __a);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    set(initializer_list<value_type> __il, const value_compare& __comp = value_compare())
-        : __tree_(__comp)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    set(initializer_list<value_type> __il, const value_compare& __comp,
-        const allocator_type& __a)
-        : __tree_(__comp, __a)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY 
-    set(initializer_list<value_type> __il, const allocator_type& __a)
-        : set(__il, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    set& operator=(initializer_list<value_type> __il)
-        {
-            __tree_.__assign_unique(__il.begin(), __il.end());
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    set& operator=(set&& __s)
-        _NOEXCEPT_(is_nothrow_move_assignable<__base>::value)
-        {
-            __tree_ = _VSTD::move(__s.__tree_);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT       {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT         {return __tree_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()   const _NOEXCEPT {return __tree_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT
-            {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT
-            {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin()  const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __tree_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __tree_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __tree_.max_size();}
-
-    // modifiers:
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        pair<iterator, bool> emplace(_Args&&... __args)
-            {return __tree_.__emplace_unique(_VSTD::forward<_Args>(__args)...);}
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-            {return __tree_.__emplace_hint_unique(__p, _VSTD::forward<_Args>(__args)...);}
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,bool> insert(const value_type& __v)
-        {return __tree_.__insert_unique(__v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,bool> insert(value_type&& __v)
-        {return __tree_.__insert_unique(_VSTD::move(__v));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __v)
-        {return __tree_.__insert_unique(__p, __v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, value_type&& __v)
-        {return __tree_.__insert_unique(__p, _VSTD::move(__v));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void insert(_InputIterator __f, _InputIterator __l)
-        {
-            for (const_iterator __e = cend(); __f != __l; ++__f)
-                __tree_.__insert_unique(__e, *__f);
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __p) {return __tree_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k)
-        {return __tree_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __f, const_iterator __l)
-        {return __tree_.erase(__f, __l);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__tree_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(set& __s) _NOEXCEPT_(__is_nothrow_swappable<__base>::value)
-        {__tree_.swap(__s.__tree_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __tree_.__alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_compare    key_comp()      const {return __tree_.value_comp();}
-    _LIBCPP_INLINE_VISIBILITY
-    value_compare  value_comp()    const {return __tree_.value_comp();}
-
-    // set operations:
-    _LIBCPP_INLINE_VISIBILITY
-    iterator find(const key_type& __k)             {return __tree_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __tree_.find(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    find(const _K2& __k)                           {return __tree_.find(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    find(const _K2& __k) const                     {return __tree_.find(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type      count(const key_type& __k) const
-        {return __tree_.__count_unique(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
-    count(const _K2& __k)                  {return __tree_.__count_unique(__k);}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    iterator lower_bound(const key_type& __k)
-        {return __tree_.lower_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator lower_bound(const key_type& __k) const
-        {return __tree_.lower_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    lower_bound(const _K2& __k)       {return __tree_.lower_bound(__k);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator upper_bound(const key_type& __k)
-        {return __tree_.upper_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator upper_bound(const key_type& __k) const
-        {return __tree_.upper_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,iterator>::type
-    upper_bound(const _K2& __k)       {return __tree_.upper_bound(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,iterator> equal_range(const key_type& __k)
-        {return __tree_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator,const_iterator> equal_range(const key_type& __k) const
-        {return __tree_.__equal_range_unique(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type
-    equal_range(const _K2& __k)       {return __tree_.__equal_range_unique(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type
-    equal_range(const _K2& __k) const {return __tree_.__equal_range_unique(__k);}
-#endif
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Compare, class _Allocator>
-set<_Key, _Compare, _Allocator>::set(set&& __s, const allocator_type& __a)
-    : __tree_(_VSTD::move(__s.__tree_), __a)
-{
-    if (__a != __s.get_allocator())
-    {
-        const_iterator __e = cend();
-        while (!__s.empty())
-            insert(__e, _VSTD::move(__s.__tree_.remove(__s.begin())->__value_));
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const set<_Key, _Compare, _Allocator>& __x,
-           const set<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-// specialized algorithms:
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(set<_Key, _Compare, _Allocator>& __x,
-     set<_Key, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Compare = less<_Key>,
-          class _Allocator = allocator<_Key> >
-class _LIBCPP_TYPE_VIS_ONLY multiset
-{
-public:
-    // types:
-    typedef _Key                                      key_type;
-    typedef key_type                                 value_type;
-    typedef _Compare                                  key_compare;
-    typedef key_compare                              value_compare;
-    typedef _Allocator                                allocator_type;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-
-private:
-    typedef __tree<value_type, value_compare, allocator_type> __base;
-    typedef allocator_traits<allocator_type>                  __alloc_traits;
-    typedef typename __base::__node_holder                    __node_holder;
-
-    __base __tree_;
-
-public:
-    typedef typename __base::pointer               pointer;
-    typedef typename __base::const_pointer         const_pointer;
-    typedef typename __base::size_type             size_type;
-    typedef typename __base::difference_type       difference_type;
-    typedef typename __base::const_iterator        iterator;
-    typedef typename __base::const_iterator        const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>       reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    // construct/copy/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    multiset()
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_default_constructible<key_compare>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(value_compare()) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multiset(const value_compare& __comp)
-        _NOEXCEPT_(
-            is_nothrow_default_constructible<allocator_type>::value &&
-            is_nothrow_copy_constructible<key_compare>::value)
-        : __tree_(__comp) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multiset(const value_compare& __comp, const allocator_type& __a)
-        : __tree_(__comp, __a) {}
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        multiset(_InputIterator __f, _InputIterator __l,
-                 const value_compare& __comp = value_compare())
-        : __tree_(__comp)
-        {
-            insert(__f, __l);
-        }
-
-#if _LIBCPP_STD_VER > 11
-        template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY 
-        multiset(_InputIterator __f, _InputIterator __l, const allocator_type& __a)
-            : multiset(__f, __l, key_compare(), __a) {}
-#endif
-
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        multiset(_InputIterator __f, _InputIterator __l,
-                 const value_compare& __comp, const allocator_type& __a)
-        : __tree_(__comp, __a)
-        {
-            insert(__f, __l);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(const multiset& __s)
-        : __tree_(__s.__tree_.value_comp(),
-          __alloc_traits::select_on_container_copy_construction(__s.__tree_.__alloc()))
-        {
-            insert(__s.begin(), __s.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multiset& operator=(const multiset& __s)
-        {
-            __tree_ = __s.__tree_;
-            return *this;
-        }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(multiset&& __s)
-        _NOEXCEPT_(is_nothrow_move_constructible<__base>::value)
-        : __tree_(_VSTD::move(__s.__tree_)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit multiset(const allocator_type& __a)
-        : __tree_(__a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(const multiset& __s, const allocator_type& __a)
-        : __tree_(__s.__tree_.value_comp(), __a)
-        {
-            insert(__s.begin(), __s.end());
-        }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    multiset(multiset&& __s, const allocator_type& __a);
-#endif
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(initializer_list<value_type> __il, const value_compare& __comp = value_compare())
-        : __tree_(__comp)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    multiset(initializer_list<value_type> __il, const value_compare& __comp,
-        const allocator_type& __a)
-        : __tree_(__comp, __a)
-        {
-            insert(__il.begin(), __il.end());
-        }
-
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY 
-    multiset(initializer_list<value_type> __il, const allocator_type& __a)
-        : multiset(__il, key_compare(), __a) {}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    multiset& operator=(initializer_list<value_type> __il)
-        {
-            __tree_.__assign_multi(__il.begin(), __il.end());
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    multiset& operator=(multiset&& __s)
-        _NOEXCEPT_(is_nothrow_move_assignable<__base>::value)
-        {
-            __tree_ = _VSTD::move(__s.__tree_);
-            return *this;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-          iterator begin() _NOEXCEPT       {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT {return __tree_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-          iterator end() _NOEXCEPT         {return __tree_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()   const _NOEXCEPT {return __tree_.end();}
-
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rbegin() _NOEXCEPT
-            {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-          reverse_iterator rend() _NOEXCEPT
-            {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin()  const _NOEXCEPT {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT {return __tree_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT {return __tree_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __tree_.max_size();}
-
-    // modifiers:
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace(_Args&&... __args)
-            {return __tree_.__emplace_multi(_VSTD::forward<_Args>(__args)...);}
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-            {return __tree_.__emplace_hint_multi(__p, _VSTD::forward<_Args>(__args)...);}
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __v)
-        {return __tree_.__insert_multi(__v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(value_type&& __v)
-        {return __tree_.__insert_multi(_VSTD::move(__v));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __v)
-        {return __tree_.__insert_multi(__p, __v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, value_type&& __v)
-        {return __tree_.__insert_multi(_VSTD::move(__v));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        void insert(_InputIterator __f, _InputIterator __l)
-        {
-            for (const_iterator __e = cend(); __f != __l; ++__f)
-                __tree_.__insert_multi(__e, *__f);
-        }
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __p) {return __tree_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __tree_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator  erase(const_iterator __f, const_iterator __l)
-        {return __tree_.erase(__f, __l);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__tree_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(multiset& __s)
-        _NOEXCEPT_(__is_nothrow_swappable<__base>::value)
-        {__tree_.swap(__s.__tree_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __tree_.__alloc();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_compare    key_comp()      const {return __tree_.value_comp();}
-    _LIBCPP_INLINE_VISIBILITY
-    value_compare  value_comp()    const {return __tree_.value_comp();}
-
-    // set operations:
-    _LIBCPP_INLINE_VISIBILITY
-    iterator find(const key_type& __k)             {return __tree_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __tree_.find(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,iterator>::type
-    find(const _K2& __k)                           {return __tree_.find(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    find(const _K2& __k) const                     {return __tree_.find(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type      count(const key_type& __k) const
-        {return __tree_.__count_multi(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
-    count(const _K2& __k)                  {return __tree_.__count_multi(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator lower_bound(const key_type& __k)
-        {return __tree_.lower_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator lower_bound(const key_type& __k) const
-            {return __tree_.lower_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,iterator>::type
-    lower_bound(const _K2& __k)       {return __tree_.lower_bound(__k);}
-
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    lower_bound(const _K2& __k) const {return __tree_.lower_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator upper_bound(const key_type& __k)
-            {return __tree_.upper_bound(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator upper_bound(const key_type& __k) const
-            {return __tree_.upper_bound(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,iterator>::type
-    upper_bound(const _K2& __k)       {return __tree_.upper_bound(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,const_iterator>::type
-    upper_bound(const _K2& __k) const {return __tree_.upper_bound(__k);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator,iterator>             equal_range(const key_type& __k)
-            {return __tree_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator,const_iterator> equal_range(const key_type& __k) const
-            {return __tree_.__equal_range_multi(__k);}
-#if _LIBCPP_STD_VER > 11
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,pair<iterator,iterator>>::type
-    equal_range(const _K2& __k)       {return __tree_.__equal_range_multi(__k);}
-    template <typename _K2>
-    _LIBCPP_INLINE_VISIBILITY
-    typename _VSTD::enable_if<_VSTD::__is_transparent<_Compare, _K2>::value,pair<const_iterator,const_iterator>>::type
-    equal_range(const _K2& __k) const {return __tree_.__equal_range_multi(__k);}
-#endif
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Compare, class _Allocator>
-multiset<_Key, _Compare, _Allocator>::multiset(multiset&& __s, const allocator_type& __a)
-    : __tree_(_VSTD::move(__s.__tree_), __a)
-{
-    if (__a != __s.get_allocator())
-    {
-        const_iterator __e = cend();
-        while (!__s.empty())
-            insert(__e, _VSTD::move(__s.__tree_.remove(__s.begin())->__value_));
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return __x.size() == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const multiset<_Key, _Compare, _Allocator>& __x,
-           const multiset<_Key, _Compare, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Key, class _Compare, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(multiset<_Key, _Compare, _Allocator>& __x,
-     multiset<_Key, _Compare, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SET
diff --git a/include.new/c++/v1/tr1/shared_mutex b/include.new/c++/v1/tr1/shared_mutex
deleted file mode 100644
index 9b7f0bf..0000000
--- a/include.new/c++/v1/tr1/shared_mutex
+++ /dev/null
@@ -1,425 +0,0 @@
-// -*- C++ -*-
-//===------------------------ shared_mutex --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SHARED_MUTEX
-#define _LIBCPP_SHARED_MUTEX
-
-/*
-    shared_mutex synopsis
-
-// C++1y
-
-namespace std
-{
-
-class shared_timed_mutex
-{
-public:
-    shared_timed_mutex();
-    ~shared_timed_mutex();
-
-    shared_timed_mutex(const shared_timed_mutex&) = delete;
-    shared_timed_mutex& operator=(const shared_timed_mutex&) = delete;
-
-    // Exclusive ownership
-    void lock(); // blocking
-    bool try_lock();
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-
-    // Shared ownership
-    void lock_shared(); // blocking
-    bool try_lock_shared();
-    template <class Rep, class Period>
-        bool
-        try_lock_shared_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool
-        try_lock_shared_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock_shared();
-};
-
-template <class Mutex>
-class shared_lock
-{
-public:
-    typedef Mutex mutex_type;
-
-    // Shared locking
-    shared_lock() noexcept;
-    explicit shared_lock(mutex_type& m); // blocking
-    shared_lock(mutex_type& m, defer_lock_t) noexcept;
-    shared_lock(mutex_type& m, try_to_lock_t);
-    shared_lock(mutex_type& m, adopt_lock_t);
-    template <class Clock, class Duration>
-        shared_lock(mutex_type& m,
-                    const chrono::time_point<Clock, Duration>& abs_time);
-    template <class Rep, class Period>
-        shared_lock(mutex_type& m,
-                    const chrono::duration<Rep, Period>& rel_time);
-    ~shared_lock();
-
-    shared_lock(shared_lock const&) = delete;
-    shared_lock& operator=(shared_lock const&) = delete;
-
-    shared_lock(shared_lock&& u) noexcept;
-    shared_lock& operator=(shared_lock&& u) noexcept;
-
-    void lock(); // blocking
-    bool try_lock();
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-
-    // Setters
-    void swap(shared_lock& u) noexcept;
-    mutex_type* release() noexcept;
-
-    // Getters
-    bool owns_lock() const noexcept;
-    explicit operator bool () const noexcept;
-    mutex_type* mutex() const noexcept;
-};
-
-template <class Mutex>
-    void swap(shared_lock<Mutex>& x, shared_lock<Mutex>& y) noexcept;
-
-}  // std
-
-*/
-
-#include <__config>
-
-#if _LIBCPP_STD_VER > 11 || defined(_LIBCPP_BUILDING_SHARED_MUTEX)
-
-#include <__mutex_base>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifdef _LIBCPP_HAS_NO_THREADS
-#error <shared_mutex> is not supported on this single threaded system
-#else // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS shared_timed_mutex
-{
-    mutex               __mut_;
-    condition_variable  __gate1_;
-    condition_variable  __gate2_;
-    unsigned            __state_;
-
-    static const unsigned __write_entered_ = 1U << (sizeof(unsigned)*__CHAR_BIT__ - 1);
-    static const unsigned __n_readers_ = ~__write_entered_;
-public:
-    shared_timed_mutex();
-    _LIBCPP_INLINE_VISIBILITY ~shared_timed_mutex() = default;
-
-    shared_timed_mutex(const shared_timed_mutex&) = delete;
-    shared_timed_mutex& operator=(const shared_timed_mutex&) = delete;
-
-    // Exclusive ownership
-    void lock();
-    bool try_lock();
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        bool
-        try_lock_for(const chrono::duration<_Rep, _Period>& __rel_time)
-        {
-            return try_lock_until(chrono::steady_clock::now() + __rel_time);
-        }
-    template <class _Clock, class _Duration>
-        bool
-        try_lock_until(const chrono::time_point<_Clock, _Duration>& __abs_time);
-    void unlock();
-
-    // Shared ownership
-    void lock_shared();
-    bool try_lock_shared();
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        bool
-        try_lock_shared_for(const chrono::duration<_Rep, _Period>& __rel_time)
-        {
-            return try_lock_shared_until(chrono::steady_clock::now() + __rel_time);
-        }
-    template <class _Clock, class _Duration>
-        bool
-        try_lock_shared_until(const chrono::time_point<_Clock, _Duration>& __abs_time);
-    void unlock_shared();
-};
-
-template <class _Clock, class _Duration>
-bool
-shared_timed_mutex::try_lock_until(
-                        const chrono::time_point<_Clock, _Duration>& __abs_time)
-{
-    unique_lock<mutex> __lk(__mut_);
-    if (__state_ & __write_entered_)
-    {
-        while (true)
-        {
-            cv_status __status = __gate1_.wait_until(__lk, __abs_time);
-            if ((__state_ & __write_entered_) == 0)
-                break;
-            if (__status == cv_status::timeout)
-                return false;
-        }
-    }
-    __state_ |= __write_entered_;
-    if (__state_ & __n_readers_)
-    {
-        while (true)
-        {
-            cv_status __status = __gate2_.wait_until(__lk, __abs_time);
-            if ((__state_ & __n_readers_) == 0)
-                break;
-            if (__status == cv_status::timeout)
-            {
-                __state_ &= ~__write_entered_;
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-template <class _Clock, class _Duration>
-bool
-shared_timed_mutex::try_lock_shared_until(
-                        const chrono::time_point<_Clock, _Duration>& __abs_time)
-{
-    unique_lock<mutex> __lk(__mut_);
-    if ((__state_ & __write_entered_) || (__state_ & __n_readers_) == __n_readers_)
-    {
-        while (true)
-        {
-            cv_status status = __gate1_.wait_until(__lk, __abs_time);
-            if ((__state_ & __write_entered_) == 0 &&
-                                       (__state_ & __n_readers_) < __n_readers_)
-                break;
-            if (status == cv_status::timeout)
-                return false;
-        }
-    }
-    unsigned __num_readers = (__state_ & __n_readers_) + 1;
-    __state_ &= ~__n_readers_;
-    __state_ |= __num_readers;
-    return true;
-}
-
-template <class _Mutex>
-class shared_lock
-{
-public:
-    typedef _Mutex mutex_type;
-
-private:
-    mutex_type* __m_;
-    bool __owns_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock() _NOEXCEPT
-        : __m_(nullptr),
-          __owns_(false)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit shared_lock(mutex_type& __m)
-        : __m_(&__m),
-          __owns_(true)
-        {__m_->lock_shared();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock(mutex_type& __m, defer_lock_t) _NOEXCEPT
-        : __m_(&__m),
-          __owns_(false)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock(mutex_type& __m, try_to_lock_t)
-        : __m_(&__m),
-          __owns_(__m.try_lock_shared())
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock(mutex_type& __m, adopt_lock_t)
-        : __m_(&__m),
-          __owns_(true)
-        {}
-
-    template <class _Clock, class _Duration>
-        _LIBCPP_INLINE_VISIBILITY
-        shared_lock(mutex_type& __m,
-                    const chrono::time_point<_Clock, _Duration>& __abs_time)
-            : __m_(&__m),
-              __owns_(__m.try_lock_shared_until(__abs_time))
-            {}
-
-    template <class _Rep, class _Period>
-        _LIBCPP_INLINE_VISIBILITY
-        shared_lock(mutex_type& __m,
-                    const chrono::duration<_Rep, _Period>& __rel_time)
-            : __m_(&__m),
-              __owns_(__m.try_lock_shared_for(__rel_time))
-            {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~shared_lock()
-    {
-        if (__owns_)
-            __m_->unlock_shared();
-    }
-
-    shared_lock(shared_lock const&) = delete;
-    shared_lock& operator=(shared_lock const&) = delete;
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock(shared_lock&& __u) _NOEXCEPT
-        : __m_(__u.__m_),
-          __owns_(__u.__owns_)
-        {
-            __u.__m_ = nullptr;
-            __u.__owns_ = false;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    shared_lock& operator=(shared_lock&& __u) _NOEXCEPT
-    {
-        if (__owns_)
-            __m_->unlock_shared();
-        __m_ = nullptr;
-        __owns_ = false;
-        __m_ = __u.__m_;
-        __owns_ = __u.__owns_;
-        __u.__m_ = nullptr;
-        __u.__owns_ = false;
-        return *this;
-    }
-
-    void lock();
-    bool try_lock();
-    template <class Rep, class Period>
-        bool try_lock_for(const chrono::duration<Rep, Period>& rel_time);
-    template <class Clock, class Duration>
-        bool try_lock_until(const chrono::time_point<Clock, Duration>& abs_time);
-    void unlock();
-
-    // Setters
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(shared_lock& __u) _NOEXCEPT
-    {
-        _VSTD::swap(__m_, __u.__m_);
-        _VSTD::swap(__owns_, __u.__owns_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    mutex_type* release() _NOEXCEPT
-    {
-        mutex_type* __m = __m_;
-        __m_ = nullptr;
-        __owns_ = false;
-        return __m;
-    }
-
-    // Getters
-    _LIBCPP_INLINE_VISIBILITY
-    bool owns_lock() const _NOEXCEPT {return __owns_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit operator bool () const _NOEXCEPT {return __owns_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    mutex_type* mutex() const _NOEXCEPT {return __m_;}
-};
-
-template <class _Mutex>
-void
-shared_lock<_Mutex>::lock()
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "shared_lock::lock: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "shared_lock::lock: already locked");
-    __m_->lock_shared();
-    __owns_ = true;
-}
-
-template <class _Mutex>
-bool
-shared_lock<_Mutex>::try_lock()
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "shared_lock::try_lock: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "shared_lock::try_lock: already locked");
-    __owns_ = __m_->try_lock_shared();
-    return __owns_;
-}
-
-template <class _Mutex>
-template <class _Rep, class _Period>
-bool
-shared_lock<_Mutex>::try_lock_for(const chrono::duration<_Rep, _Period>& __d)
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "shared_lock::try_lock_for: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "shared_lock::try_lock_for: already locked");
-    __owns_ = __m_->try_lock_shared_for(__d);
-    return __owns_;
-}
-
-template <class _Mutex>
-template <class _Clock, class _Duration>
-bool
-shared_lock<_Mutex>::try_lock_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    if (__m_ == nullptr)
-        __throw_system_error(EPERM, "shared_lock::try_lock_until: references null mutex");
-    if (__owns_)
-        __throw_system_error(EDEADLK, "shared_lock::try_lock_until: already locked");
-    __owns_ = __m_->try_lock_shared_until(__t);
-    return __owns_;
-}
-
-template <class _Mutex>
-void
-shared_lock<_Mutex>::unlock()
-{
-    if (!__owns_)
-        __throw_system_error(EPERM, "shared_lock::unlock: not locked");
-    __m_->unlock_shared();
-    __owns_ = false;
-}
-
-template <class _Mutex>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(shared_lock<_Mutex>& __x, shared_lock<_Mutex>& __y) _NOEXCEPT
-    {__x.swap(__y);}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_STD_VER > 11
-
-#endif  // _LIBCPP_SHARED_MUTEX
diff --git a/include.new/c++/v1/tr1/sstream b/include.new/c++/v1/tr1/sstream
deleted file mode 100644
index 27ae78f..0000000
--- a/include.new/c++/v1/tr1/sstream
+++ /dev/null
@@ -1,977 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- sstream ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SSTREAM
-#define _LIBCPP_SSTREAM
-
-/*
-    sstream synopsis
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_stringbuf
-    : public basic_streambuf<charT, traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef Allocator                      allocator_type;
-
-    // 27.8.1.1 Constructors:
-    explicit basic_stringbuf(ios_base::openmode which = ios_base::in | ios_base::out);
-    explicit basic_stringbuf(const basic_string<char_type, traits_type, allocator_type>& str,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    basic_stringbuf(basic_stringbuf&& rhs);
-
-    // 27.8.1.2 Assign and swap:
-    basic_stringbuf& operator=(basic_stringbuf&& rhs);
-    void swap(basic_stringbuf& rhs);
-
-    // 27.8.1.3 Get and set:
-    basic_string<char_type, traits_type, allocator_type> str() const;
-    void str(const basic_string<char_type, traits_type, allocator_type>& s);
-
-protected:
-    // 27.8.1.4 Overridden virtual functions:
-    virtual int_type underflow();
-    virtual int_type pbackfail(int_type c = traits_type::eof());
-    virtual int_type overflow (int_type c = traits_type::eof());
-    virtual basic_streambuf<char_type, traits_type>* setbuf(char_type*, streamsize);
-    virtual pos_type seekoff(off_type off, ios_base::seekdir way,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type sp,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-};
-
-template <class charT, class traits, class Allocator>
-  void swap(basic_stringbuf<charT, traits, Allocator>& x,
-            basic_stringbuf<charT, traits, Allocator>& y);
-
-typedef basic_stringbuf<char>    stringbuf;
-typedef basic_stringbuf<wchar_t> wstringbuf;
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_istringstream
-    : public basic_istream<charT, traits>
-{
-public:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef Allocator                      allocator_type;
-
-    // 27.8.2.1 Constructors:
-    explicit basic_istringstream(ios_base::openmode which = ios_base::in);
-    explicit basic_istringstream(const basic_string<char_type, traits_type,allocator_type>& str,
-                                 ios_base::openmode which = ios_base::in);
-    basic_istringstream(basic_istringstream&& rhs);
-
-    // 27.8.2.2 Assign and swap:
-    basic_istringstream& operator=(basic_istringstream&& rhs);
-    void swap(basic_istringstream& rhs);
-
-    // 27.8.2.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    basic_string<char_type, traits_type, allocator_type> str() const;
-    void str(const basic_string<char_type, traits_type, allocator_type>& s);
-};
-
-template <class charT, class traits, class Allocator>
-  void swap(basic_istringstream<charT, traits, Allocator>& x,
-            basic_istringstream<charT, traits, Allocator>& y);
-
-typedef basic_istringstream<char>    istringstream;
-typedef basic_istringstream<wchar_t> wistringstream;
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_ostringstream
-    : public basic_ostream<charT, traits>
-{
-public:
-    // types:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef Allocator                      allocator_type;
-
-    // 27.8.3.1 Constructors/destructor:
-    explicit basic_ostringstream(ios_base::openmode which = ios_base::out);
-    explicit basic_ostringstream(const basic_string<char_type, traits_type, allocator_type>& str,
-                                 ios_base::openmode which = ios_base::out);
-    basic_ostringstream(basic_ostringstream&& rhs);
-
-    // 27.8.3.2 Assign/swap:
-    basic_ostringstream& operator=(basic_ostringstream&& rhs);
-    void swap(basic_ostringstream& rhs);
-
-    // 27.8.3.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    basic_string<char_type, traits_type, allocator_type> str() const;
-    void str(const basic_string<char_type, traits_type, allocator_type>& s);
-};
-
-template <class charT, class traits, class Allocator>
-  void swap(basic_ostringstream<charT, traits, Allocator>& x,
-            basic_ostringstream<charT, traits, Allocator>& y);
-
-typedef basic_ostringstream<char>    ostringstream;
-typedef basic_ostringstream<wchar_t> wostringstream;
-
-template <class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_stringstream
-    : public basic_iostream<charT, traits>
-{
-public:
-    // types:
-    typedef charT                          char_type;
-    typedef traits                         traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef Allocator                      allocator_type;
-
-    // constructors/destructor
-    explicit basic_stringstream(ios_base::openmode which = ios_base::out|ios_base::in);
-    explicit basic_stringstream(const basic_string<char_type, traits_type, allocator_type>& str,
-                                ios_base::openmode which = ios_base::out|ios_base::in);
-    basic_stringstream(basic_stringstream&& rhs);
-
-    // 27.8.5.1 Assign/swap:
-    basic_stringstream& operator=(basic_stringstream&& rhs);
-    void swap(basic_stringstream& rhs);
-
-    // Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    basic_string<char_type, traits_type, allocator_type> str() const;
-    void str(const basic_string<char_type, traits_type, allocator_type>& str);
-};
-
-template <class charT, class traits, class Allocator>
-  void swap(basic_stringstream<charT, traits, Allocator>& x,
-            basic_stringstream<charT, traits, Allocator>& y);
-
-typedef basic_stringstream<char>    stringstream;
-typedef basic_stringstream<wchar_t> wstringstream;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ostream>
-#include <istream>
-#include <string>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// basic_stringbuf
-
-template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_stringbuf
-    : public basic_streambuf<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef _Allocator                     allocator_type;
-
-    typedef basic_string<char_type, traits_type, allocator_type> string_type;
-
-private:
-
-    string_type __str_;
-    mutable char_type* __hm_;
-    ios_base::openmode __mode_;
-
-public:
-    // 27.8.1.1 Constructors:
-    explicit basic_stringbuf(ios_base::openmode __wch = ios_base::in | ios_base::out);
-    explicit basic_stringbuf(const string_type& __s,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_stringbuf(basic_stringbuf&& __rhs);
-#endif
-
-    // 27.8.1.2 Assign and swap:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_stringbuf& operator=(basic_stringbuf&& __rhs);
-#endif
-    void swap(basic_stringbuf& __rhs);
-
-    // 27.8.1.3 Get and set:
-    string_type str() const;
-    void str(const string_type& __s);
-
-protected:
-    // 27.8.1.4 Overridden virtual functions:
-    virtual int_type underflow();
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-    virtual int_type overflow (int_type __c = traits_type::eof());
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __wch = ios_base::in | ios_base::out);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>::basic_stringbuf(ios_base::openmode __wch)
-    : __hm_(0),
-      __mode_(__wch)
-{
-    str(string_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>::basic_stringbuf(const string_type& __s,
-                             ios_base::openmode __wch)
-    : __hm_(0),
-      __mode_(__wch)
-{
-    str(__s);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_stringbuf<_CharT, _Traits, _Allocator>::basic_stringbuf(basic_stringbuf&& __rhs)
-    : __mode_(__rhs.__mode_)
-{
-    char_type* __p = const_cast<char_type*>(__rhs.__str_.data());
-    ptrdiff_t __binp = -1;
-    ptrdiff_t __ninp = -1;
-    ptrdiff_t __einp = -1;
-    if (__rhs.eback() != nullptr)
-    {
-        __binp = __rhs.eback() - __p;
-        __ninp = __rhs.gptr() - __p;
-        __einp = __rhs.egptr() - __p;
-    }
-    ptrdiff_t __bout = -1;
-    ptrdiff_t __nout = -1;
-    ptrdiff_t __eout = -1;
-    if (__rhs.pbase() != nullptr)
-    {
-        __bout = __rhs.pbase() - __p;
-        __nout = __rhs.pptr() - __p;
-        __eout = __rhs.epptr() - __p;
-    }
-    ptrdiff_t __hm = __rhs.__hm_ == nullptr ? -1 : __rhs.__hm_ - __p;
-    __str_ = _VSTD::move(__rhs.__str_);
-    __p = const_cast<char_type*>(__str_.data());
-    if (__binp != -1)
-        this->setg(__p + __binp, __p + __ninp, __p + __einp);
-    if (__bout != -1)
-    {
-        this->setp(__p + __bout, __p + __eout);
-        this->pbump(__nout);
-    }
-    __hm_ = __hm == -1 ? nullptr : __p + __hm;
-    __p = const_cast<char_type*>(__rhs.__str_.data());
-    __rhs.setg(__p, __p, __p);
-    __rhs.setp(__p, __p);
-    __rhs.__hm_ = __p;
-    this->pubimbue(__rhs.getloc());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_stringbuf<_CharT, _Traits, _Allocator>&
-basic_stringbuf<_CharT, _Traits, _Allocator>::operator=(basic_stringbuf&& __rhs)
-{
-    char_type* __p = const_cast<char_type*>(__rhs.__str_.data());
-    ptrdiff_t __binp = -1;
-    ptrdiff_t __ninp = -1;
-    ptrdiff_t __einp = -1;
-    if (__rhs.eback() != nullptr)
-    {
-        __binp = __rhs.eback() - __p;
-        __ninp = __rhs.gptr() - __p;
-        __einp = __rhs.egptr() - __p;
-    }
-    ptrdiff_t __bout = -1;
-    ptrdiff_t __nout = -1;
-    ptrdiff_t __eout = -1;
-    if (__rhs.pbase() != nullptr)
-    {
-        __bout = __rhs.pbase() - __p;
-        __nout = __rhs.pptr() - __p;
-        __eout = __rhs.epptr() - __p;
-    }
-    ptrdiff_t __hm = __rhs.__hm_ == nullptr ? -1 : __rhs.__hm_ - __p;
-    __str_ = _VSTD::move(__rhs.__str_);
-    __p = const_cast<char_type*>(__str_.data());
-    if (__binp != -1)
-        this->setg(__p + __binp, __p + __ninp, __p + __einp);
-    else
-        this->setg(nullptr, nullptr, nullptr);
-    if (__bout != -1)
-    {
-        this->setp(__p + __bout, __p + __eout);
-        this->pbump(__nout);
-    }
-    else
-        this->setp(nullptr, nullptr);
-
-    __hm_ = __hm == -1 ? nullptr : __p + __hm;
-    __mode_ = __rhs.__mode_;
-    __p = const_cast<char_type*>(__rhs.__str_.data());
-    __rhs.setg(__p, __p, __p);
-    __rhs.setp(__p, __p);
-    __rhs.__hm_ = __p;
-    this->pubimbue(__rhs.getloc());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_stringbuf<_CharT, _Traits, _Allocator>::swap(basic_stringbuf& __rhs)
-{
-    char_type* __p = const_cast<char_type*>(__rhs.__str_.data());
-    ptrdiff_t __rbinp = -1;
-    ptrdiff_t __rninp = -1;
-    ptrdiff_t __reinp = -1;
-    if (__rhs.eback() != nullptr)
-    {
-        __rbinp = __rhs.eback() - __p;
-        __rninp = __rhs.gptr() - __p;
-        __reinp = __rhs.egptr() - __p;
-    }
-    ptrdiff_t __rbout = -1;
-    ptrdiff_t __rnout = -1;
-    ptrdiff_t __reout = -1;
-    if (__rhs.pbase() != nullptr)
-    {
-        __rbout = __rhs.pbase() - __p;
-        __rnout = __rhs.pptr() - __p;
-        __reout = __rhs.epptr() - __p;
-    }
-    ptrdiff_t __rhm = __rhs.__hm_ == nullptr ? -1 : __rhs.__hm_ - __p;
-    __p = const_cast<char_type*>(__str_.data());
-    ptrdiff_t __lbinp = -1;
-    ptrdiff_t __lninp = -1;
-    ptrdiff_t __leinp = -1;
-    if (this->eback() != nullptr)
-    {
-        __lbinp = this->eback() - __p;
-        __lninp = this->gptr() - __p;
-        __leinp = this->egptr() - __p;
-    }
-    ptrdiff_t __lbout = -1;
-    ptrdiff_t __lnout = -1;
-    ptrdiff_t __leout = -1;
-    if (this->pbase() != nullptr)
-    {
-        __lbout = this->pbase() - __p;
-        __lnout = this->pptr() - __p;
-        __leout = this->epptr() - __p;
-    }
-    ptrdiff_t __lhm = __hm_ == nullptr ? -1 : __hm_ - __p;
-    _VSTD::swap(__mode_, __rhs.__mode_);
-    __str_.swap(__rhs.__str_);
-    __p = const_cast<char_type*>(__str_.data());
-    if (__rbinp != -1)
-        this->setg(__p + __rbinp, __p + __rninp, __p + __reinp);
-    else
-        this->setg(nullptr, nullptr, nullptr);
-    if (__rbout != -1)
-    {
-        this->setp(__p + __rbout, __p + __reout);
-        this->pbump(__rnout);
-    }
-    else
-        this->setp(nullptr, nullptr);
-    __hm_ = __rhm == -1 ? nullptr : __p + __rhm;
-    __p = const_cast<char_type*>(__rhs.__str_.data());
-    if (__lbinp != -1)
-        __rhs.setg(__p + __lbinp, __p + __lninp, __p + __leinp);
-    else
-        __rhs.setg(nullptr, nullptr, nullptr);
-    if (__lbout != -1)
-    {
-        __rhs.setp(__p + __lbout, __p + __leout);
-        __rhs.pbump(__lnout);
-    }
-    else
-        __rhs.setp(nullptr, nullptr);
-    __rhs.__hm_ = __lhm == -1 ? nullptr : __p + __lhm;
-    locale __tl = __rhs.getloc();
-    __rhs.pubimbue(this->getloc());
-    this->pubimbue(__tl);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_stringbuf<_CharT, _Traits, _Allocator>& __x,
-     basic_stringbuf<_CharT, _Traits, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-basic_stringbuf<_CharT, _Traits, _Allocator>::str() const
-{
-    if (__mode_ & ios_base::out)
-    {
-        if (__hm_ < this->pptr())
-            __hm_ = this->pptr();
-        return string_type(this->pbase(), __hm_, __str_.get_allocator());
-    }
-    else if (__mode_ & ios_base::in)
-        return string_type(this->eback(), this->egptr(), __str_.get_allocator());
-    return string_type(__str_.get_allocator());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_stringbuf<_CharT, _Traits, _Allocator>::str(const string_type& __s)
-{
-    __str_ = __s;
-    __hm_ = 0;
-    if (__mode_ & ios_base::in)
-    {
-        __hm_ = const_cast<char_type*>(__str_.data()) + __str_.size();
-        this->setg(const_cast<char_type*>(__str_.data()),
-                   const_cast<char_type*>(__str_.data()),
-                   __hm_);
-    }
-    if (__mode_ & ios_base::out)
-    {
-        typename string_type::size_type __sz = __str_.size();
-        __hm_ = const_cast<char_type*>(__str_.data()) + __sz;
-        __str_.resize(__str_.capacity());
-        this->setp(const_cast<char_type*>(__str_.data()),
-                   const_cast<char_type*>(__str_.data()) + __str_.size());
-        if (__mode_ & (ios_base::app | ios_base::ate))
-            this->pbump(__sz);
-    }
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::int_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::underflow()
-{
-    if (__hm_ < this->pptr())
-        __hm_ = this->pptr();
-    if (__mode_ & ios_base::in)
-    {
-        if (this->egptr() < __hm_)
-            this->setg(this->eback(), this->gptr(), __hm_);
-        if (this->gptr() < this->egptr())
-            return traits_type::to_int_type(*this->gptr());
-    }
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::int_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::pbackfail(int_type __c)
-{
-    if (__hm_ < this->pptr())
-        __hm_ = this->pptr();
-    if (this->eback() < this->gptr())
-    {
-        if (traits_type::eq_int_type(__c, traits_type::eof()))
-        {
-            this->setg(this->eback(), this->gptr()-1, __hm_);
-            return traits_type::not_eof(__c);
-        }
-        if ((__mode_ & ios_base::out) ||
-            traits_type::eq(traits_type::to_char_type(__c), this->gptr()[-1]))
-        {
-            this->setg(this->eback(), this->gptr()-1, __hm_);
-            *this->gptr() = traits_type::to_char_type(__c);
-            return __c;
-        }
-    }
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::int_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::overflow(int_type __c)
-{
-    if (!traits_type::eq_int_type(__c, traits_type::eof()))
-    {
-        ptrdiff_t __ninp = this->gptr()  - this->eback();
-        if (this->pptr() == this->epptr())
-        {
-            if (!(__mode_ & ios_base::out))
-                return traits_type::eof();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            try
-            {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-                ptrdiff_t __nout = this->pptr()  - this->pbase();
-                ptrdiff_t __hm = __hm_ - this->pbase();
-                __str_.push_back(char_type());
-                __str_.resize(__str_.capacity());
-                char_type* __p = const_cast<char_type*>(__str_.data());
-                this->setp(__p, __p + __str_.size());
-                this->pbump(__nout);
-                __hm_ = this->pbase() + __hm;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-            }
-            catch (...)
-            {
-                return traits_type::eof();
-            }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        }
-        __hm_ = _VSTD::max(this->pptr() + 1, __hm_);
-        if (__mode_ & ios_base::in)
-        {
-            char_type* __p = const_cast<char_type*>(__str_.data());
-            this->setg(__p, __p + __ninp, __hm_);
-        }
-        return this->sputc(__c);
-    }
-    return traits_type::not_eof(__c);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::pos_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::seekoff(off_type __off,
-                                                      ios_base::seekdir __way,
-                                                      ios_base::openmode __wch)
-{
-    if (__hm_ < this->pptr())
-        __hm_ = this->pptr();
-    if ((__wch & (ios_base::in | ios_base::out)) == 0)
-        return pos_type(-1);
-    if ((__wch & (ios_base::in | ios_base::out)) == (ios_base::in | ios_base::out)
-        && __way == ios_base::cur)
-        return pos_type(-1);
-    off_type __noff;
-    switch (__way)
-    {
-    case ios_base::beg:
-        __noff = 0;
-        break;
-    case ios_base::cur:
-        if (__wch & ios_base::in)
-            __noff = this->gptr() - this->eback();
-        else
-            __noff = this->pptr() - this->pbase();
-        break;
-    case ios_base::end:
-        __noff = __hm_ - __str_.data();
-        break;
-    default:
-        return pos_type(-1);
-    }
-    __noff += __off;
-    if (__noff < 0 || __hm_ - __str_.data() < __noff)
-        return pos_type(-1);
-    if (__noff != 0)
-    {
-        if ((__wch & ios_base::in) && this->gptr() == 0)
-            return pos_type(-1);
-        if ((__wch & ios_base::out) && this->pptr() == 0)
-            return pos_type(-1);
-    }
-    if (__wch & ios_base::in)
-        this->setg(this->eback(), this->eback() + __noff, __hm_);
-    if (__wch & ios_base::out)
-    {
-        this->setp(this->pbase(), this->epptr());
-        this->pbump(__noff);
-    }
-    return pos_type(__noff);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_stringbuf<_CharT, _Traits, _Allocator>::pos_type
-basic_stringbuf<_CharT, _Traits, _Allocator>::seekpos(pos_type __sp,
-                                                      ios_base::openmode __wch)
-{
-    return seekoff(__sp, ios_base::beg, __wch);
-}
-
-// basic_istringstream
-
-template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_istringstream
-    : public basic_istream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef _Allocator                     allocator_type;
-
-    typedef basic_string<char_type, traits_type, allocator_type> string_type;
-
-private:
-    basic_stringbuf<char_type, traits_type, allocator_type> __sb_;
-
-public:
-    // 27.8.2.1 Constructors:
-    explicit basic_istringstream(ios_base::openmode __wch = ios_base::in);
-    explicit basic_istringstream(const string_type& __s,
-                                 ios_base::openmode __wch = ios_base::in);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_istringstream(basic_istringstream&& __rhs);
-
-    // 27.8.2.2 Assign and swap:
-    basic_istringstream& operator=(basic_istringstream&& __rhs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void swap(basic_istringstream& __rhs);
-
-    // 27.8.2.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    string_type str() const;
-    void str(const string_type& __s);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istringstream<_CharT, _Traits, _Allocator>::basic_istringstream(ios_base::openmode __wch)
-    : basic_istream<_CharT, _Traits>(&__sb_),
-      __sb_(__wch | ios_base::in)
-{
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istringstream<_CharT, _Traits, _Allocator>::basic_istringstream(const string_type& __s,
-                                                                      ios_base::openmode __wch)
-    : basic_istream<_CharT, _Traits>(&__sb_),
-      __sb_(__s, __wch | ios_base::in)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istringstream<_CharT, _Traits, _Allocator>::basic_istringstream(basic_istringstream&& __rhs)
-    : basic_istream<_CharT, _Traits>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_istringstream<_CharT, _Traits, _Allocator>&
-basic_istringstream<_CharT, _Traits, _Allocator>::operator=(basic_istringstream&& __rhs)
-{
-    basic_istream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_istringstream<_CharT, _Traits, _Allocator>::swap(basic_istringstream& __rhs)
-{
-    basic_istream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_istringstream<_CharT, _Traits, _Allocator>& __x,
-     basic_istringstream<_CharT, _Traits, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>*
-basic_istringstream<_CharT, _Traits, _Allocator>::rdbuf() const
-{
-    return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-basic_istringstream<_CharT, _Traits, _Allocator>::str() const
-{
-    return __sb_.str();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_istringstream<_CharT, _Traits, _Allocator>::str(const string_type& __s)
-{
-    __sb_.str(__s);
-}
-
-// basic_ostringstream
-
-template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_ostringstream
-    : public basic_ostream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef _Allocator                     allocator_type;
-
-    typedef basic_string<char_type, traits_type, allocator_type> string_type;
-
-private:
-    basic_stringbuf<char_type, traits_type, allocator_type> __sb_;
-
-public:
-    // 27.8.2.1 Constructors:
-    explicit basic_ostringstream(ios_base::openmode __wch = ios_base::out);
-    explicit basic_ostringstream(const string_type& __s,
-                                 ios_base::openmode __wch = ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_ostringstream(basic_ostringstream&& __rhs);
-
-    // 27.8.2.2 Assign and swap:
-    basic_ostringstream& operator=(basic_ostringstream&& __rhs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void swap(basic_ostringstream& __rhs);
-
-    // 27.8.2.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    string_type str() const;
-    void str(const string_type& __s);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostringstream<_CharT, _Traits, _Allocator>::basic_ostringstream(ios_base::openmode __wch)
-    : basic_ostream<_CharT, _Traits>(&__sb_),
-      __sb_(__wch | ios_base::out)
-{
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostringstream<_CharT, _Traits, _Allocator>::basic_ostringstream(const string_type& __s,
-                                                                      ios_base::openmode __wch)
-    : basic_ostream<_CharT, _Traits>(&__sb_),
-      __sb_(__s, __wch | ios_base::out)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_ostringstream<_CharT, _Traits, _Allocator>::basic_ostringstream(basic_ostringstream&& __rhs)
-    : basic_ostream<_CharT, _Traits>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    basic_ostream<_CharT, _Traits>::set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_ostringstream<_CharT, _Traits, _Allocator>&
-basic_ostringstream<_CharT, _Traits, _Allocator>::operator=(basic_ostringstream&& __rhs)
-{
-    basic_ostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ostringstream<_CharT, _Traits, _Allocator>::swap(basic_ostringstream& __rhs)
-{
-    basic_ostream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_ostringstream<_CharT, _Traits, _Allocator>& __x,
-     basic_ostringstream<_CharT, _Traits, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>*
-basic_ostringstream<_CharT, _Traits, _Allocator>::rdbuf() const
-{
-    return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-basic_ostringstream<_CharT, _Traits, _Allocator>::str() const
-{
-    return __sb_.str();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_ostringstream<_CharT, _Traits, _Allocator>::str(const string_type& __s)
-{
-    __sb_.str(__s);
-}
-
-// basic_stringstream
-
-template <class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_stringstream
-    : public basic_iostream<_CharT, _Traits>
-{
-public:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-    typedef _Allocator                     allocator_type;
-
-    typedef basic_string<char_type, traits_type, allocator_type> string_type;
-
-private:
-    basic_stringbuf<char_type, traits_type, allocator_type> __sb_;
-
-public:
-    // 27.8.2.1 Constructors:
-    explicit basic_stringstream(ios_base::openmode __wch = ios_base::in | ios_base::out);
-    explicit basic_stringstream(const string_type& __s,
-                                ios_base::openmode __wch = ios_base::in | ios_base::out);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    basic_stringstream(basic_stringstream&& __rhs);
-
-    // 27.8.2.2 Assign and swap:
-    basic_stringstream& operator=(basic_stringstream&& __rhs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void swap(basic_stringstream& __rhs);
-
-    // 27.8.2.3 Members:
-    basic_stringbuf<char_type, traits_type, allocator_type>* rdbuf() const;
-    string_type str() const;
-    void str(const string_type& __s);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringstream<_CharT, _Traits, _Allocator>::basic_stringstream(ios_base::openmode __wch)
-    : basic_iostream<_CharT, _Traits>(&__sb_),
-      __sb_(__wch)
-{
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringstream<_CharT, _Traits, _Allocator>::basic_stringstream(const string_type& __s,
-                                                                    ios_base::openmode __wch)
-    : basic_iostream<_CharT, _Traits>(&__sb_),
-      __sb_(__s, __wch)
-{
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringstream<_CharT, _Traits, _Allocator>::basic_stringstream(basic_stringstream&& __rhs)
-    : basic_iostream<_CharT, _Traits>(_VSTD::move(__rhs)),
-      __sb_(_VSTD::move(__rhs.__sb_))
-{
-    basic_istream<_CharT, _Traits>::set_rdbuf(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_stringstream<_CharT, _Traits, _Allocator>&
-basic_stringstream<_CharT, _Traits, _Allocator>::operator=(basic_stringstream&& __rhs)
-{
-    basic_iostream<char_type, traits_type>::operator=(_VSTD::move(__rhs));
-    __sb_ = _VSTD::move(__rhs.__sb_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_stringstream<_CharT, _Traits, _Allocator>::swap(basic_stringstream& __rhs)
-{
-    basic_iostream<char_type, traits_type>::swap(__rhs);
-    __sb_.swap(__rhs.__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_stringstream<_CharT, _Traits, _Allocator>& __x,
-     basic_stringstream<_CharT, _Traits, _Allocator>& __y)
-{
-    __x.swap(__y);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_stringbuf<_CharT, _Traits, _Allocator>*
-basic_stringstream<_CharT, _Traits, _Allocator>::rdbuf() const
-{
-    return const_cast<basic_stringbuf<char_type, traits_type, allocator_type>*>(&__sb_);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-basic_stringstream<_CharT, _Traits, _Allocator>::str() const
-{
-    return __sb_.str();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_stringstream<_CharT, _Traits, _Allocator>::str(const string_type& __s)
-{
-    __sb_.str(__s);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SSTREAM
diff --git a/include.new/c++/v1/tr1/stack b/include.new/c++/v1/tr1/stack
deleted file mode 100644
index 30909c1..0000000
--- a/include.new/c++/v1/tr1/stack
+++ /dev/null
@@ -1,292 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- stack -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STACK
-#define _LIBCPP_STACK
-
-/*
-    stack synopsis
-
-namespace std
-{
-
-template <class T, class Container = deque<T>>
-class stack
-{
-public:
-    typedef Container                                container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-
-public:
-    stack() = default;
-    ~stack() = default;
-
-    stack(const stack& q) = default;
-    stack(stack&& q) = default;
-
-    stack& operator=(const stack& q) = default;
-    stack& operator=(stack&& q) = default;
-
-    explicit stack(const container_type& c);
-    explicit stack(container_type&& c);
-    template <class Alloc> explicit stack(const Alloc& a);
-    template <class Alloc> stack(const container_type& c, const Alloc& a);
-    template <class Alloc> stack(container_type&& c, const Alloc& a);
-    template <class Alloc> stack(const stack& c, const Alloc& a);
-    template <class Alloc> stack(stack&& c, const Alloc& a);
-
-    bool empty() const;
-    size_type size() const;
-    reference top();
-    const_reference top() const;
-
-    void push(const value_type& x);
-    void push(value_type&& x);
-    template <class... Args> void emplace(Args&&... args);
-    void pop();
-
-    void swap(stack& c) noexcept(noexcept(swap(c, q.c)));
-};
-
-template <class T, class Container>
-  bool operator==(const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator< (const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator!=(const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator> (const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator>=(const stack<T, Container>& x, const stack<T, Container>& y);
-template <class T, class Container>
-  bool operator<=(const stack<T, Container>& x, const stack<T, Container>& y);
-
-template <class T, class Container>
-  void swap(stack<T, Container>& x, stack<T, Container>& y)
-  noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <deque>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp, class _Container> class _LIBCPP_TYPE_VIS_ONLY stack;
-
-template <class _Tp, class _Container>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y);
-
-template <class _Tp, class _Container>
-_LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y);
-
-template <class _Tp, class _Container = deque<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY stack
-{
-public:
-    typedef _Container                               container_type;
-    typedef typename container_type::value_type      value_type;
-    typedef typename container_type::reference       reference;
-    typedef typename container_type::const_reference const_reference;
-    typedef typename container_type::size_type       size_type;
-
-protected:
-    container_type c;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    stack()
-        _NOEXCEPT_(is_nothrow_default_constructible<container_type>::value)
-        : c() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    stack(const stack& __q) : c(__q.c) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    stack(stack&& __q)
-        _NOEXCEPT_(is_nothrow_move_constructible<container_type>::value)
-        : c(_VSTD::move(__q.c)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    stack& operator=(const stack& __q) {c = __q.c; return *this;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    stack& operator=(stack&& __q)
-        _NOEXCEPT_(is_nothrow_move_assignable<container_type>::value)
-        {c = _VSTD::move(__q.c); return *this;}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit stack(const container_type& __c) : c(__c) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    explicit stack(container_type&& __c) : c(_VSTD::move(__c)) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit stack(const _Alloc& __a,
-                       typename enable_if<uses_allocator<container_type,
-                                                         _Alloc>::value>::type* = 0)
-            : c(__a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        stack(const container_type& __c, const _Alloc& __a,
-              typename enable_if<uses_allocator<container_type,
-                                                _Alloc>::value>::type* = 0)
-            : c(__c, __a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        stack(const stack& __s, const _Alloc& __a,
-              typename enable_if<uses_allocator<container_type,
-                                                _Alloc>::value>::type* = 0)
-            : c(__s.c, __a) {}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        stack(container_type&& __c, const _Alloc& __a,
-              typename enable_if<uses_allocator<container_type,
-                                                _Alloc>::value>::type* = 0)
-            : c(_VSTD::move(__c), __a) {}
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        stack(stack&& __s, const _Alloc& __a,
-              typename enable_if<uses_allocator<container_type,
-                                                _Alloc>::value>::type* = 0)
-            : c(_VSTD::move(__s.c), __a) {}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty()     const      {return c.empty();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const      {return c.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    reference top()             {return c.back();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference top() const {return c.back();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void push(const value_type& __v) {c.push_back(__v);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void push(value_type&& __v) {c.push_back(_VSTD::move(__v));}
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        void emplace(_Args&&... __args)
-        {c.emplace_back(_VSTD::forward<_Args>(__args)...);}
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void pop() {c.pop_back();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(stack& __s)
-        _NOEXCEPT_(__is_nothrow_swappable<container_type>::value)
-    {
-        using _VSTD::swap;
-        swap(c, __s.c);
-    }
-
-    template <class T1, class _C1>
-    friend
-    bool
-    operator==(const stack<T1, _C1>& __x, const stack<T1, _C1>& __y);
-
-    template <class T1, class _C1>
-    friend
-    bool
-    operator< (const stack<T1, _C1>& __x, const stack<T1, _C1>& __y);
-};
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return __x.c == __y.c;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return __x.c < __y.c;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const stack<_Tp, _Container>& __x, const stack<_Tp, _Container>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Container>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(stack<_Tp, _Container>& __x, stack<_Tp, _Container>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Tp, class _Container, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<stack<_Tp, _Container>, _Alloc>
-    : public uses_allocator<_Container, _Alloc>
-{
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_STACK
diff --git a/include.new/c++/v1/tr1/stdexcept b/include.new/c++/v1/tr1/stdexcept
deleted file mode 100644
index f251806..0000000
--- a/include.new/c++/v1/tr1/stdexcept
+++ /dev/null
@@ -1,170 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- stdexcept --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STDEXCEPT
-#define _LIBCPP_STDEXCEPT
-
-/*
-    stdexcept synopsis
-
-namespace std
-{
-
-class logic_error;
-    class domain_error;
-    class invalid_argument;
-    class length_error;
-    class out_of_range;
-class runtime_error;
-    class range_error;
-    class overflow_error;
-    class underflow_error;
-
-for each class xxx_error:
-
-class xxx_error : public exception // at least indirectly
-{
-public:
-    explicit xxx_error(const string& what_arg);
-    explicit xxx_error(const char*   what_arg);
-
-    virtual const char* what() const noexcept // returns what_arg
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <exception>
-#include <iosfwd>  // for string forward decl
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#ifndef _LIBCPP___REFSTRING
-_LIBCPP_BEGIN_NAMESPACE_STD
-class _LIBCPP_HIDDEN __libcpp_refstring {
-    const char *__imp_ _LIBCPP_UNUSED;
-};
-_LIBCPP_END_NAMESPACE_STD
-#endif
-
-namespace std  // purposefully not using versioning namespace
-{
-
-class _LIBCPP_EXCEPTION_ABI logic_error
-    : public exception
-{
-private:
-    _VSTD::__libcpp_refstring __imp_;
-public:
-    explicit logic_error(const string&);
-    explicit logic_error(const char*);
-
-    logic_error(const logic_error&) _NOEXCEPT;
-    logic_error& operator=(const logic_error&) _NOEXCEPT;
-
-    virtual ~logic_error() _NOEXCEPT;
-
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI runtime_error
-    : public exception
-{
-private:
-    _VSTD::__libcpp_refstring __imp_;
-public:
-    explicit runtime_error(const string&);
-    explicit runtime_error(const char*);
-
-    runtime_error(const runtime_error&) _NOEXCEPT;
-    runtime_error& operator=(const runtime_error&) _NOEXCEPT;
-
-    virtual ~runtime_error() _NOEXCEPT;
-
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI domain_error
-    : public logic_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit domain_error(const string& __s) : logic_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit domain_error(const char* __s)   : logic_error(__s) {}
-
-    virtual ~domain_error() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI invalid_argument
-    : public logic_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit invalid_argument(const string& __s) : logic_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit invalid_argument(const char* __s)   : logic_error(__s) {}
-
-    virtual ~invalid_argument() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI length_error
-    : public logic_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit length_error(const string& __s) : logic_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit length_error(const char* __s)   : logic_error(__s) {}
-
-    virtual ~length_error() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI out_of_range
-    : public logic_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit out_of_range(const string& __s) : logic_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit out_of_range(const char* __s)   : logic_error(__s) {}
-
-    virtual ~out_of_range() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI range_error
-    : public runtime_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit range_error(const string& __s) : runtime_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit range_error(const char* __s)   : runtime_error(__s) {}
-
-    virtual ~range_error() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI overflow_error
-    : public runtime_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit overflow_error(const string& __s) : runtime_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit overflow_error(const char* __s)   : runtime_error(__s) {}
-
-    virtual ~overflow_error() _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI underflow_error
-    : public runtime_error
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY explicit underflow_error(const string& __s) : runtime_error(__s) {}
-    _LIBCPP_INLINE_VISIBILITY explicit underflow_error(const char* __s)   : runtime_error(__s) {}
-
-    virtual ~underflow_error() _NOEXCEPT;
-};
-
-}  // std
-
-#endif  // _LIBCPP_STDEXCEPT
diff --git a/include.new/c++/v1/tr1/streambuf b/include.new/c++/v1/tr1/streambuf
deleted file mode 100644
index 6adfc92..0000000
--- a/include.new/c++/v1/tr1/streambuf
+++ /dev/null
@@ -1,564 +0,0 @@
-// -*- C++ -*-
-//===------------------------- streambuf ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STEAMBUF
-#define _LIBCPP_STEAMBUF
-
-/*
-    streambuf synopsis
-
-namespace std
-{
-
-template <class charT, class traits = char_traits<charT> >
-class basic_streambuf
-{
-public:
-    // types:
-    typedef charT char_type;
-    typedef traits traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    virtual ~basic_streambuf();
-
-    // 27.6.2.2.1 locales:
-    locale pubimbue(const locale& loc);
-    locale getloc() const;
-
-    // 27.6.2.2.2 buffer and positioning:
-    basic_streambuf* pubsetbuf(char_type* s, streamsize n);
-    pos_type pubseekoff(off_type off, ios_base::seekdir way,
-                        ios_base::openmode which = ios_base::in | ios_base::out);
-    pos_type pubseekpos(pos_type sp,
-                        ios_base::openmode which = ios_base::in | ios_base::out);
-    int pubsync();
-
-    // Get and put areas:
-    // 27.6.2.2.3 Get area:
-    streamsize in_avail();
-    int_type snextc();
-    int_type sbumpc();
-    int_type sgetc();
-    streamsize sgetn(char_type* s, streamsize n);
-
-    // 27.6.2.2.4 Putback:
-    int_type sputbackc(char_type c);
-    int_type sungetc();
-
-    // 27.6.2.2.5 Put area:
-    int_type sputc(char_type c);
-    streamsize sputn(const char_type* s, streamsize n);
-
-protected:
-    basic_streambuf();
-    basic_streambuf(const basic_streambuf& rhs);
-    basic_streambuf& operator=(const basic_streambuf& rhs);
-    void swap(basic_streambuf& rhs);
-
-    // 27.6.2.3.2 Get area:
-    char_type* eback() const;
-    char_type* gptr() const;
-    char_type* egptr() const;
-    void gbump(int n);
-    void setg(char_type* gbeg, char_type* gnext, char_type* gend);
-
-    // 27.6.2.3.3 Put area:
-    char_type* pbase() const;
-    char_type* pptr() const;
-    char_type* epptr() const;
-    void pbump(int n);
-    void setp(char_type* pbeg, char_type* pend);
-
-    // 27.6.2.4 virtual functions:
-    // 27.6.2.4.1 Locales:
-    virtual void imbue(const locale& loc);
-
-    // 27.6.2.4.2 Buffer management and positioning:
-    virtual basic_streambuf* setbuf(char_type* s, streamsize n);
-    virtual pos_type seekoff(off_type off, ios_base::seekdir way,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type sp,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual int sync();
-
-    // 27.6.2.4.3 Get area:
-    virtual streamsize showmanyc();
-    virtual streamsize xsgetn(char_type* s, streamsize n);
-    virtual int_type underflow();
-    virtual int_type uflow();
-
-    // 27.6.2.4.4 Putback:
-    virtual int_type pbackfail(int_type c = traits_type::eof());
-
-    // 27.6.2.4.5 Put area:
-    virtual streamsize xsputn(const char_type* s, streamsize n);
-    virtual int_type overflow (int_type c = traits_type::eof());
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iosfwd>
-#include <ios>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _CharT, class _Traits>
-class _LIBCPP_TYPE_VIS_ONLY basic_streambuf
-{
-public:
-    // types:
-    typedef _CharT                         char_type;
-    typedef _Traits                        traits_type;
-    typedef typename traits_type::int_type int_type;
-    typedef typename traits_type::pos_type pos_type;
-    typedef typename traits_type::off_type off_type;
-
-    virtual ~basic_streambuf();
-
-    // 27.6.2.2.1 locales:
-    locale pubimbue(const locale& __loc);
-    locale getloc() const;
-
-    // 27.6.2.2.2 buffer and positioning:
-    basic_streambuf* pubsetbuf(char_type* __s, streamsize __n);
-    pos_type pubseekoff(off_type __off, ios_base::seekdir __way,
-                        ios_base::openmode __which = ios_base::in | ios_base::out);
-    pos_type pubseekpos(pos_type __sp,
-                        ios_base::openmode __which = ios_base::in | ios_base::out);
-    int pubsync();
-
-    // Get and put areas:
-    // 27.6.2.2.3 Get area:
-    streamsize in_avail();
-    int_type snextc();
-    int_type sbumpc();
-    int_type sgetc();
-    streamsize sgetn(char_type* __s, streamsize __n);
-
-    // 27.6.2.2.4 Putback:
-    int_type sputbackc(char_type __c);
-    int_type sungetc();
-
-    // 27.6.2.2.5 Put area:
-    int_type sputc(char_type __c);
-    streamsize sputn(const char_type* __s, streamsize __n);
-
-protected:
-    basic_streambuf();
-    basic_streambuf(const basic_streambuf& __rhs);
-    basic_streambuf& operator=(const basic_streambuf& __rhs);
-    void swap(basic_streambuf& __rhs);
-
-    // 27.6.2.3.2 Get area:
-    _LIBCPP_ALWAYS_INLINE char_type* eback() const {return __binp_;}
-    _LIBCPP_ALWAYS_INLINE char_type* gptr()  const {return __ninp_;}
-    _LIBCPP_ALWAYS_INLINE char_type* egptr() const {return __einp_;}
-    void gbump(int __n);
-    void setg(char_type* __gbeg, char_type* __gnext, char_type* __gend);
-
-    // 27.6.2.3.3 Put area:
-    _LIBCPP_ALWAYS_INLINE char_type* pbase() const {return __bout_;}
-    _LIBCPP_ALWAYS_INLINE char_type* pptr()  const {return __nout_;}
-    _LIBCPP_ALWAYS_INLINE char_type* epptr() const {return __eout_;}
-    void pbump(int __n);
-    void setp(char_type* __pbeg, char_type* __pend);
-
-    // 27.6.2.4 virtual functions:
-    // 27.6.2.4.1 Locales:
-    virtual void imbue(const locale& __loc);
-
-    // 27.6.2.4.2 Buffer management and positioning:
-    virtual basic_streambuf* setbuf(char_type* __s, streamsize __n);
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __which = ios_base::in | ios_base::out);
-    virtual int sync();
-
-    // 27.6.2.4.3 Get area:
-    virtual streamsize showmanyc();
-    virtual streamsize xsgetn(char_type* __s, streamsize __n);
-    virtual int_type underflow();
-    virtual int_type uflow();
-
-    // 27.6.2.4.4 Putback:
-    virtual int_type pbackfail(int_type __c = traits_type::eof());
-
-    // 27.6.2.4.5 Put area:
-    virtual streamsize xsputn(const char_type* __s, streamsize __n);
-    virtual int_type overflow(int_type __c = traits_type::eof());
-
-private:
-    locale __loc_;
-    char_type* __binp_;
-    char_type* __ninp_;
-    char_type* __einp_;
-    char_type* __bout_;
-    char_type* __nout_;
-    char_type* __eout_;
-};
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>::~basic_streambuf()
-{
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-locale
-basic_streambuf<_CharT, _Traits>::pubimbue(const locale& __loc)
-{
-    imbue(__loc);
-    locale __r = __loc_;
-    __loc_ = __loc;
-    return __r;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-locale
-basic_streambuf<_CharT, _Traits>::getloc() const
-{
-    return __loc_;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_streambuf<_CharT, _Traits>*
-basic_streambuf<_CharT, _Traits>::pubsetbuf(char_type* __s, streamsize __n)
-{
-    return setbuf(__s, __n);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::pubseekoff(off_type __off,
-                                             ios_base::seekdir __way,
-                                             ios_base::openmode __which)
-{
-    return seekoff(__off, __way, __which);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::pubseekpos(pos_type __sp,
-                                             ios_base::openmode __which)
-{
-    return seekpos(__sp, __which);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-int
-basic_streambuf<_CharT, _Traits>::pubsync()
-{
-    return sync();
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-basic_streambuf<_CharT, _Traits>::in_avail()
-{
-    if (__ninp_ < __einp_)
-        return static_cast<streamsize>(__einp_ - __ninp_);
-    return showmanyc();
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::snextc()
-{
-    if (sbumpc() == traits_type::eof())
-        return traits_type::eof();
-    return sgetc();
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sbumpc()
-{
-    if (__ninp_ == __einp_)
-        return uflow();
-    return traits_type::to_int_type(*__ninp_++);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sgetc()
-{
-    if (__ninp_ == __einp_)
-        return underflow();
-    return traits_type::to_int_type(*__ninp_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-basic_streambuf<_CharT, _Traits>::sgetn(char_type* __s, streamsize __n)
-{
-    return xsgetn(__s, __n);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sputbackc(char_type __c)
-{
-    if (__binp_ == __ninp_ || !traits_type::eq(__c, __ninp_[-1]))
-        return pbackfail(traits_type::to_int_type(__c));
-    return traits_type::to_int_type(*--__ninp_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sungetc()
-{
-    if (__binp_ == __ninp_)
-        return pbackfail();
-    return traits_type::to_int_type(*--__ninp_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::sputc(char_type __c)
-{
-    if (__nout_ == __eout_)
-        return overflow(traits_type::to_int_type(__c));
-    *__nout_++ = __c;
-    return traits_type::to_int_type(__c);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-streamsize
-basic_streambuf<_CharT, _Traits>::sputn(const char_type* __s, streamsize __n)
-{
-    return xsputn(__s, __n);
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>::basic_streambuf()
-    : __binp_(0),
-      __ninp_(0),
-      __einp_(0),
-      __bout_(0),
-      __nout_(0),
-      __eout_(0)
-{
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>::basic_streambuf(const basic_streambuf& __sb)
-    : __loc_(__sb.__loc_),
-      __binp_(__sb.__binp_),
-      __ninp_(__sb.__ninp_),
-      __einp_(__sb.__einp_),
-      __bout_(__sb.__bout_),
-      __nout_(__sb.__nout_),
-      __eout_(__sb.__eout_)
-{
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>&
-basic_streambuf<_CharT, _Traits>::operator=(const basic_streambuf& __sb)
-{
-    __loc_ = __sb.__loc_;
-    __binp_ = __sb.__binp_;
-    __ninp_ = __sb.__ninp_;
-    __einp_ = __sb.__einp_;
-    __bout_ = __sb.__bout_;
-    __nout_ = __sb.__nout_;
-    __eout_ = __sb.__eout_;
-    return *this;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_streambuf<_CharT, _Traits>::swap(basic_streambuf& __sb)
-{
-    _VSTD::swap(__loc_, __sb.__loc_);
-    _VSTD::swap(__binp_, __sb.__binp_);
-    _VSTD::swap(__ninp_, __sb.__ninp_);
-    _VSTD::swap(__einp_, __sb.__einp_);
-    _VSTD::swap(__bout_, __sb.__bout_);
-    _VSTD::swap(__nout_, __sb.__nout_);
-    _VSTD::swap(__eout_, __sb.__eout_);
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_streambuf<_CharT, _Traits>::gbump(int __n)
-{
-    __ninp_ += __n;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_streambuf<_CharT, _Traits>::setg(char_type* __gbeg, char_type* __gnext,
-                                                          char_type* __gend)
-{
-    __binp_ = __gbeg;
-    __ninp_ = __gnext;
-    __einp_ = __gend;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_streambuf<_CharT, _Traits>::pbump(int __n)
-{
-    __nout_ += __n;
-}
-
-template <class _CharT, class _Traits>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_streambuf<_CharT, _Traits>::setp(char_type* __pbeg, char_type* __pend)
-{
-    __bout_ = __nout_ = __pbeg;
-    __eout_ = __pend;
-}
-
-template <class _CharT, class _Traits>
-void
-basic_streambuf<_CharT, _Traits>::imbue(const locale&)
-{
-}
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>*
-basic_streambuf<_CharT, _Traits>::setbuf(char_type*, streamsize)
-{
-    return this;
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::seekoff(off_type, ios_base::seekdir,
-                                          ios_base::openmode)
-{
-    return pos_type(off_type(-1));
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::seekpos(pos_type, ios_base::openmode)
-{
-    return pos_type(off_type(-1));
-}
-
-template <class _CharT, class _Traits>
-int
-basic_streambuf<_CharT, _Traits>::sync()
-{
-    return 0;
-}
-
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::showmanyc()
-{
-    return 0;
-}
-
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::xsgetn(char_type* __s, streamsize __n)
-{
-    const int_type __eof = traits_type::eof();
-    int_type __c;
-    streamsize __i = 0;
-    for (;__i < __n; ++__i, ++__s)
-    {
-        if (__ninp_ < __einp_)
-            *__s = *__ninp_++;
-        else if ((__c = uflow()) != __eof)
-            *__s = traits_type::to_char_type(__c);
-        else
-            break;
-    }
-    return __i;
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::underflow()
-{
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::uflow()
-{
-    if (underflow() == traits_type::eof())
-        return traits_type::eof();
-    return traits_type::to_int_type(*__ninp_++);
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::pbackfail(int_type)
-{
-    return traits_type::eof();
-}
-
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::xsputn(const char_type* __s, streamsize __n)
-{
-    streamsize __i = 0;
-    int_type __eof = traits_type::eof();
-    for (; __i < __n; ++__s, ++__i)
-    {
-        if (__nout_ < __eout_)
-            *__nout_++ = *__s;
-        else if (overflow(traits_type::to_int_type(*__s)) == __eof)
-            break;
-    }
-    return __i;
-}
-
-template <class _CharT, class _Traits>
-typename basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::overflow(int_type)
-{
-    return traits_type::eof();
-}
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_streambuf<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_streambuf<wchar_t>)
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ios<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_ios<wchar_t>)
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_STEAMBUF
diff --git a/include.new/c++/v1/tr1/string b/include.new/c++/v1/tr1/string
deleted file mode 100644
index fe42bbf..0000000
--- a/include.new/c++/v1/tr1/string
+++ /dev/null
@@ -1,4249 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- string -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STRING
-#define _LIBCPP_STRING
-
-/*
-    string synopsis
-
-namespace std
-{
-
-template <class stateT>
-class fpos
-{
-private:
-    stateT st;
-public:
-    fpos(streamoff = streamoff());
-
-    operator streamoff() const;
-
-    stateT state() const;
-    void state(stateT);
-
-    fpos& operator+=(streamoff);
-    fpos  operator+ (streamoff) const;
-    fpos& operator-=(streamoff);
-    fpos  operator- (streamoff) const;
-};
-
-template <class stateT> streamoff operator-(const fpos<stateT>& x, const fpos<stateT>& y);
-
-template <class stateT> bool operator==(const fpos<stateT>& x, const fpos<stateT>& y);
-template <class stateT> bool operator!=(const fpos<stateT>& x, const fpos<stateT>& y);
-
-template <class charT>
-struct char_traits
-{
-    typedef charT     char_type;
-    typedef ...       int_type;
-    typedef streamoff off_type;
-    typedef streampos pos_type;
-    typedef mbstate_t state_type;
-
-    static void assign(char_type& c1, const char_type& c2) noexcept;
-    static constexpr bool eq(char_type c1, char_type c2) noexcept;
-    static constexpr bool lt(char_type c1, char_type c2) noexcept;
-
-    static int              compare(const char_type* s1, const char_type* s2, size_t n);
-    static size_t           length(const char_type* s);
-    static const char_type* find(const char_type* s, size_t n, const char_type& a);
-    static char_type*       move(char_type* s1, const char_type* s2, size_t n);
-    static char_type*       copy(char_type* s1, const char_type* s2, size_t n);
-    static char_type*       assign(char_type* s, size_t n, char_type a);
-
-    static constexpr int_type  not_eof(int_type c) noexcept;
-    static constexpr char_type to_char_type(int_type c) noexcept;
-    static constexpr int_type  to_int_type(char_type c) noexcept;
-    static constexpr bool      eq_int_type(int_type c1, int_type c2) noexcept;
-    static constexpr int_type  eof() noexcept;
-};
-
-template <> struct char_traits<char>;
-template <> struct char_traits<wchar_t>;
-
-template<class charT, class traits = char_traits<charT>, class Allocator = allocator<charT> >
-class basic_string
-{
-public:
-// types:
-    typedef traits traits_type;
-    typedef typename traits_type::char_type value_type;
-    typedef Allocator allocator_type;
-    typedef typename allocator_type::size_type size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::reference reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef typename allocator_type::pointer pointer;
-    typedef typename allocator_type::const_pointer const_pointer;
-    typedef implementation-defined iterator;
-    typedef implementation-defined const_iterator;
-    typedef std::reverse_iterator<iterator> reverse_iterator;
-    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-    static const size_type npos = -1;
-
-    basic_string()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit basic_string(const allocator_type& a);
-    basic_string(const basic_string& str);
-    basic_string(basic_string&& str)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    basic_string(const basic_string& str, size_type pos, size_type n = npos,
-                 const allocator_type& a = allocator_type());
-    basic_string(const value_type* s, const allocator_type& a = allocator_type());
-    basic_string(const value_type* s, size_type n, const allocator_type& a = allocator_type());
-    basic_string(size_type n, value_type c, const allocator_type& a = allocator_type());
-    template<class InputIterator>
-        basic_string(InputIterator begin, InputIterator end,
-                     const allocator_type& a = allocator_type());
-    basic_string(initializer_list<value_type>, const Allocator& = Allocator());
-    basic_string(const basic_string&, const Allocator&);
-    basic_string(basic_string&&, const Allocator&);
-
-    ~basic_string();
-
-    basic_string& operator=(const basic_string& str);
-    basic_string& operator=(basic_string&& str)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    basic_string& operator=(const value_type* s);
-    basic_string& operator=(value_type c);
-    basic_string& operator=(initializer_list<value_type>);
-
-    iterator       begin() noexcept;
-    const_iterator begin() const noexcept;
-    iterator       end() noexcept;
-    const_iterator end() const noexcept;
-
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin() const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend() const noexcept;
-
-    const_iterator         cbegin() const noexcept;
-    const_iterator         cend() const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend() const noexcept;
-
-    size_type size() const noexcept;
-    size_type length() const noexcept;
-    size_type max_size() const noexcept;
-    size_type capacity() const noexcept;
-
-    void resize(size_type n, value_type c);
-    void resize(size_type n);
-
-    void reserve(size_type res_arg = 0);
-    void shrink_to_fit();
-    void clear() noexcept;
-    bool empty() const noexcept;
-
-    const_reference operator[](size_type pos) const;
-    reference       operator[](size_type pos);
-
-    const_reference at(size_type n) const;
-    reference       at(size_type n);
-
-    basic_string& operator+=(const basic_string& str);
-    basic_string& operator+=(const value_type* s);
-    basic_string& operator+=(value_type c);
-    basic_string& operator+=(initializer_list<value_type>);
-
-    basic_string& append(const basic_string& str);
-    basic_string& append(const basic_string& str, size_type pos, size_type n=npos); //C++14
-    basic_string& append(const value_type* s, size_type n);
-    basic_string& append(const value_type* s);
-    basic_string& append(size_type n, value_type c);
-    template<class InputIterator>
-        basic_string& append(InputIterator first, InputIterator last);
-    basic_string& append(initializer_list<value_type>);
-
-    void push_back(value_type c);
-    void pop_back();
-    reference       front();
-    const_reference front() const;
-    reference       back();
-    const_reference back() const;
-
-    basic_string& assign(const basic_string& str);
-    basic_string& assign(basic_string&& str);
-    basic_string& assign(const basic_string& str, size_type pos, size_type n=npos); // C++14
-    basic_string& assign(const value_type* s, size_type n);
-    basic_string& assign(const value_type* s);
-    basic_string& assign(size_type n, value_type c);
-    template<class InputIterator>
-        basic_string& assign(InputIterator first, InputIterator last);
-    basic_string& assign(initializer_list<value_type>);
-
-    basic_string& insert(size_type pos1, const basic_string& str);
-    basic_string& insert(size_type pos1, const basic_string& str,
-                         size_type pos2, size_type n);
-    basic_string& insert(size_type pos, const value_type* s, size_type n=npos); //C++14
-    basic_string& insert(size_type pos, const value_type* s);
-    basic_string& insert(size_type pos, size_type n, value_type c);
-    iterator      insert(const_iterator p, value_type c);
-    iterator      insert(const_iterator p, size_type n, value_type c);
-    template<class InputIterator>
-        iterator insert(const_iterator p, InputIterator first, InputIterator last);
-    iterator      insert(const_iterator p, initializer_list<value_type>);
-
-    basic_string& erase(size_type pos = 0, size_type n = npos);
-    iterator      erase(const_iterator position);
-    iterator      erase(const_iterator first, const_iterator last);
-
-    basic_string& replace(size_type pos1, size_type n1, const basic_string& str);
-    basic_string& replace(size_type pos1, size_type n1, const basic_string& str,
-                          size_type pos2, size_type n2=npos); // C++14
-    basic_string& replace(size_type pos, size_type n1, const value_type* s, size_type n2);
-    basic_string& replace(size_type pos, size_type n1, const value_type* s);
-    basic_string& replace(size_type pos, size_type n1, size_type n2, value_type c);
-    basic_string& replace(const_iterator i1, const_iterator i2, const basic_string& str);
-    basic_string& replace(const_iterator i1, const_iterator i2, const value_type* s, size_type n);
-    basic_string& replace(const_iterator i1, const_iterator i2, const value_type* s);
-    basic_string& replace(const_iterator i1, const_iterator i2, size_type n, value_type c);
-    template<class InputIterator>
-        basic_string& replace(const_iterator i1, const_iterator i2, InputIterator j1, InputIterator j2);
-    basic_string& replace(const_iterator i1, const_iterator i2, initializer_list<value_type>);
-
-    size_type copy(value_type* s, size_type n, size_type pos = 0) const;
-    basic_string substr(size_type pos = 0, size_type n = npos) const;
-
-    void swap(basic_string& str)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value)
-
-    const value_type* c_str() const noexcept;
-    const value_type* data() const noexcept;
-
-    allocator_type get_allocator() const noexcept;
-
-    size_type find(const basic_string& str, size_type pos = 0) const noexcept;
-    size_type find(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find(const value_type* s, size_type pos = 0) const noexcept;
-    size_type find(value_type c, size_type pos = 0) const noexcept;
-
-    size_type rfind(const basic_string& str, size_type pos = npos) const noexcept;
-    size_type rfind(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type rfind(const value_type* s, size_type pos = npos) const noexcept;
-    size_type rfind(value_type c, size_type pos = npos) const noexcept;
-
-    size_type find_first_of(const basic_string& str, size_type pos = 0) const noexcept;
-    size_type find_first_of(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find_first_of(const value_type* s, size_type pos = 0) const noexcept;
-    size_type find_first_of(value_type c, size_type pos = 0) const noexcept;
-
-    size_type find_last_of(const basic_string& str, size_type pos = npos) const noexcept;
-    size_type find_last_of(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find_last_of(const value_type* s, size_type pos = npos) const noexcept;
-    size_type find_last_of(value_type c, size_type pos = npos) const noexcept;
-
-    size_type find_first_not_of(const basic_string& str, size_type pos = 0) const noexcept;
-    size_type find_first_not_of(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find_first_not_of(const value_type* s, size_type pos = 0) const noexcept;
-    size_type find_first_not_of(value_type c, size_type pos = 0) const noexcept;
-
-    size_type find_last_not_of(const basic_string& str, size_type pos = npos) const noexcept;
-    size_type find_last_not_of(const value_type* s, size_type pos, size_type n) const noexcept;
-    size_type find_last_not_of(const value_type* s, size_type pos = npos) const noexcept;
-    size_type find_last_not_of(value_type c, size_type pos = npos) const noexcept;
-
-    int compare(const basic_string& str) const noexcept;
-    int compare(size_type pos1, size_type n1, const basic_string& str) const;
-    int compare(size_type pos1, size_type n1, const basic_string& str,
-                size_type pos2, size_type n2=npos) const; // C++14
-    int compare(const value_type* s) const noexcept;
-    int compare(size_type pos1, size_type n1, const value_type* s) const;
-    int compare(size_type pos1, size_type n1, const value_type* s, size_type n2) const;
-
-    bool __invariants() const;
-};
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(const basic_string<charT, traits, Allocator>& lhs,
-          const basic_string<charT, traits, Allocator>& rhs);
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(const charT* lhs , const basic_string<charT,traits,Allocator>&rhs);
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(charT lhs, const basic_string<charT,traits,Allocator>& rhs);
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs);
-
-template<class charT, class traits, class Allocator>
-basic_string<charT, traits, Allocator>
-operator+(const basic_string<charT, traits, Allocator>& lhs, charT rhs);
-
-template<class charT, class traits, class Allocator>
-bool operator==(const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator==(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator==(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator!=(const basic_string<charT,traits,Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator!=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator!=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator< (const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator< (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator< (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator> (const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator> (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator> (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator<=(const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator<=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator<=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator>=(const basic_string<charT, traits, Allocator>& lhs,
-                const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator>=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-bool operator>=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept;
-
-template<class charT, class traits, class Allocator>
-void swap(basic_string<charT, traits, Allocator>& lhs,
-          basic_string<charT, traits, Allocator>& rhs)
-            noexcept(noexcept(lhs.swap(rhs)));
-
-template<class charT, class traits, class Allocator>
-basic_istream<charT, traits>&
-operator>>(basic_istream<charT, traits>& is, basic_string<charT, traits, Allocator>& str);
-
-template<class charT, class traits, class Allocator>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& os, const basic_string<charT, traits, Allocator>& str);
-
-template<class charT, class traits, class Allocator>
-basic_istream<charT, traits>&
-getline(basic_istream<charT, traits>& is, basic_string<charT, traits, Allocator>& str,
-        charT delim);
-
-template<class charT, class traits, class Allocator>
-basic_istream<charT, traits>&
-getline(basic_istream<charT, traits>& is, basic_string<charT, traits, Allocator>& str);
-
-typedef basic_string<char>    string;
-typedef basic_string<wchar_t> wstring;
-typedef basic_string<char16_t> u16string;
-typedef basic_string<char32_t> u32string;
-
-int                stoi  (const string& str, size_t* idx = 0, int base = 10);
-long               stol  (const string& str, size_t* idx = 0, int base = 10);
-unsigned long      stoul (const string& str, size_t* idx = 0, int base = 10);
-long long          stoll (const string& str, size_t* idx = 0, int base = 10);
-unsigned long long stoull(const string& str, size_t* idx = 0, int base = 10);
-
-float       stof (const string& str, size_t* idx = 0);
-double      stod (const string& str, size_t* idx = 0);
-long double stold(const string& str, size_t* idx = 0);
-
-string to_string(int val);
-string to_string(unsigned val);
-string to_string(long val);
-string to_string(unsigned long val);
-string to_string(long long val);
-string to_string(unsigned long long val);
-string to_string(float val);
-string to_string(double val);
-string to_string(long double val);
-
-int                stoi  (const wstring& str, size_t* idx = 0, int base = 10);
-long               stol  (const wstring& str, size_t* idx = 0, int base = 10);
-unsigned long      stoul (const wstring& str, size_t* idx = 0, int base = 10);
-long long          stoll (const wstring& str, size_t* idx = 0, int base = 10);
-unsigned long long stoull(const wstring& str, size_t* idx = 0, int base = 10);
-
-float       stof (const wstring& str, size_t* idx = 0);
-double      stod (const wstring& str, size_t* idx = 0);
-long double stold(const wstring& str, size_t* idx = 0);
-
-wstring to_wstring(int val);
-wstring to_wstring(unsigned val);
-wstring to_wstring(long val);
-wstring to_wstring(unsigned long val);
-wstring to_wstring(long long val);
-wstring to_wstring(unsigned long long val);
-wstring to_wstring(float val);
-wstring to_wstring(double val);
-wstring to_wstring(long double val);
-
-template <> struct hash<string>;
-template <> struct hash<u16string>;
-template <> struct hash<u32string>;
-template <> struct hash<wstring>;
-
-basic_string<char>     operator "" s( const char *str,     size_t len ); // C++14
-basic_string<wchar_t>  operator "" s( const wchar_t *str,  size_t len ); // C++14
-basic_string<char16_t> operator "" s( const char16_t *str, size_t len ); // C++14
-basic_string<char32_t> operator "" s( const char32_t *str, size_t len ); // C++14
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iosfwd>
-#include <cstring>
-#include <cstdio>  // For EOF.
-#include <cwchar>
-#include <algorithm>
-#include <iterator>
-#include <utility>
-#include <memory>
-#include <stdexcept>
-#include <type_traits>
-#include <initializer_list>
-#include <__functional_base>
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-#include <cstdint>
-#endif
-#if defined(_LIBCPP_NO_EXCEPTIONS)
-#include <cassert>
-#endif
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// fpos
-
-template <class _StateT>
-class _LIBCPP_TYPE_VIS_ONLY fpos
-{
-private:
-    _StateT __st_;
-    streamoff __off_;
-public:
-    _LIBCPP_INLINE_VISIBILITY fpos(streamoff __off = streamoff()) : __st_(), __off_(__off) {}
-
-    _LIBCPP_INLINE_VISIBILITY operator streamoff() const {return __off_;}
-
-    _LIBCPP_INLINE_VISIBILITY _StateT state() const {return __st_;}
-    _LIBCPP_INLINE_VISIBILITY void state(_StateT __st) {__st_ = __st;}
-
-    _LIBCPP_INLINE_VISIBILITY fpos& operator+=(streamoff __off) {__off_ += __off; return *this;}
-    _LIBCPP_INLINE_VISIBILITY fpos  operator+ (streamoff __off) const {fpos __t(*this); __t += __off; return __t;}
-    _LIBCPP_INLINE_VISIBILITY fpos& operator-=(streamoff __off) {__off_ -= __off; return *this;}
-    _LIBCPP_INLINE_VISIBILITY fpos  operator- (streamoff __off) const {fpos __t(*this); __t -= __off; return __t;}
-};
-
-template <class _StateT>
-inline _LIBCPP_INLINE_VISIBILITY
-streamoff operator-(const fpos<_StateT>& __x, const fpos<_StateT>& __y)
-    {return streamoff(__x) - streamoff(__y);}
-
-template <class _StateT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator==(const fpos<_StateT>& __x, const fpos<_StateT>& __y)
-    {return streamoff(__x) == streamoff(__y);}
-
-template <class _StateT>
-inline _LIBCPP_INLINE_VISIBILITY
-bool operator!=(const fpos<_StateT>& __x, const fpos<_StateT>& __y)
-    {return streamoff(__x) != streamoff(__y);}
-
-// char_traits
-
-template <class _CharT>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits
-{
-    typedef _CharT    char_type;
-    typedef int       int_type;
-    typedef streamoff off_type;
-    typedef streampos pos_type;
-    typedef mbstate_t state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 < __c2;}
-
-    static int              compare(const char_type* __s1, const char_type* __s2, size_t __n);
-    static size_t           length(const char_type* __s);
-    static const char_type* find(const char_type* __s, size_t __n, const char_type& __a);
-    static char_type*       move(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       copy(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       assign(char_type* __s, size_t __n, char_type __a);
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type  to_int_type(char_type __c) _NOEXCEPT
-        {return int_type(__c);}
-    static inline _LIBCPP_CONSTEXPR bool      eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type  eof() _NOEXCEPT
-        {return int_type(EOF);}
-};
-
-template <class _CharT>
-int
-char_traits<_CharT>::compare(const char_type* __s1, const char_type* __s2, size_t __n)
-{
-    for (; __n; --__n, ++__s1, ++__s2)
-    {
-        if (lt(*__s1, *__s2))
-            return -1;
-        if (lt(*__s2, *__s1))
-            return 1;
-    }
-    return 0;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-char_traits<_CharT>::length(const char_type* __s)
-{
-    size_t __len = 0;
-    for (; !eq(*__s, char_type(0)); ++__s)
-        ++__len;
-    return __len;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-const _CharT*
-char_traits<_CharT>::find(const char_type* __s, size_t __n, const char_type& __a)
-{
-    for (; __n; --__n)
-    {
-        if (eq(*__s, __a))
-            return __s;
-        ++__s;
-    }
-    return 0;
-}
-
-template <class _CharT>
-_CharT*
-char_traits<_CharT>::move(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    char_type* __r = __s1;
-    if (__s1 < __s2)
-    {
-        for (; __n; --__n, ++__s1, ++__s2)
-            assign(*__s1, *__s2);
-    }
-    else if (__s2 < __s1)
-    {
-        __s1 += __n;
-        __s2 += __n;
-        for (; __n; --__n)
-            assign(*--__s1, *--__s2);
-    }
-    return __r;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT*
-char_traits<_CharT>::copy(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-    char_type* __r = __s1;
-    for (; __n; --__n, ++__s1, ++__s2)
-        assign(*__s1, *__s2);
-    return __r;
-}
-
-template <class _CharT>
-inline _LIBCPP_INLINE_VISIBILITY
-_CharT*
-char_traits<_CharT>::assign(char_type* __s, size_t __n, char_type __a)
-{
-    char_type* __r = __s;
-    for (; __n; --__n, ++__s)
-        assign(*__s, __a);
-    return __r;
-}
-
-// char_traits<char>
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits<char>
-{
-    typedef char      char_type;
-    typedef int       int_type;
-    typedef streamoff off_type;
-    typedef streampos pos_type;
-    typedef mbstate_t state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-            {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return (unsigned char)__c1 < (unsigned char)__c2;}
-
-    static inline int compare(const char_type* __s1, const char_type* __s2, size_t __n)
-        {return memcmp(__s1, __s2, __n);}
-    static inline size_t length(const char_type* __s) {return strlen(__s);}
-    static inline const char_type* find(const char_type* __s, size_t __n, const char_type& __a)
-        {return (const char_type*)memchr(__s, to_int_type(__a), __n);}
-    static inline char_type* move(char_type* __s1, const char_type* __s2, size_t __n)
-        {return (char_type*)memmove(__s1, __s2, __n);}
-    static inline char_type* copy(char_type* __s1, const char_type* __s2, size_t __n)
-        {
-            _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-            return (char_type*)memcpy(__s1, __s2, __n);
-        }
-    static inline char_type* assign(char_type* __s, size_t __n, char_type __a)
-        {return (char_type*)memset(__s, to_int_type(__a), __n);}
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type to_int_type(char_type __c) _NOEXCEPT
-        {return int_type((unsigned char)__c);}
-    static inline _LIBCPP_CONSTEXPR bool eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type  eof() _NOEXCEPT
-        {return int_type(EOF);}
-};
-
-// char_traits<wchar_t>
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits<wchar_t>
-{
-    typedef wchar_t   char_type;
-    typedef wint_t    int_type;
-    typedef streamoff off_type;
-    typedef streampos pos_type;
-    typedef mbstate_t state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 < __c2;}
-
-    static inline int compare(const char_type* __s1, const char_type* __s2, size_t __n)
-        {return wmemcmp(__s1, __s2, __n);}
-    static inline size_t length(const char_type* __s)
-        {return wcslen(__s);}
-    static inline const char_type* find(const char_type* __s, size_t __n, const char_type& __a)
-        {return (const char_type*)wmemchr(__s, __a, __n);}
-    static inline char_type* move(char_type* __s1, const char_type* __s2, size_t __n)
-        {return (char_type*)wmemmove(__s1, __s2, __n);}
-    static inline char_type* copy(char_type* __s1, const char_type* __s2, size_t __n)
-        {
-            _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-            return (char_type*)wmemcpy(__s1, __s2, __n);
-        }
-    static inline char_type* assign(char_type* __s, size_t __n, char_type __a)
-        {return (char_type*)wmemset(__s, __a, __n);}
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type to_int_type(char_type __c) _NOEXCEPT
-        {return int_type(__c);}
-    static inline _LIBCPP_CONSTEXPR bool eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type eof() _NOEXCEPT
-        {return int_type(WEOF);}
-};
-
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits<char16_t>
-{
-    typedef char16_t       char_type;
-    typedef uint_least16_t int_type;
-    typedef streamoff      off_type;
-    typedef u16streampos   pos_type;
-    typedef mbstate_t      state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 < __c2;}
-
-    static int              compare(const char_type* __s1, const char_type* __s2, size_t __n);
-    static size_t           length(const char_type* __s);
-    static const char_type* find(const char_type* __s, size_t __n, const char_type& __a);
-    static char_type*       move(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       copy(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       assign(char_type* __s, size_t __n, char_type __a);
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type to_int_type(char_type __c) _NOEXCEPT
-        {return int_type(__c);}
-    static inline _LIBCPP_CONSTEXPR bool eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type eof() _NOEXCEPT
-        {return int_type(0xDFFF);}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-int
-char_traits<char16_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n)
-{
-    for (; __n; --__n, ++__s1, ++__s2)
-    {
-        if (lt(*__s1, *__s2))
-            return -1;
-        if (lt(*__s2, *__s1))
-            return 1;
-    }
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-char_traits<char16_t>::length(const char_type* __s)
-{
-    size_t __len = 0;
-    for (; !eq(*__s, char_type(0)); ++__s)
-        ++__len;
-    return __len;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-const char16_t*
-char_traits<char16_t>::find(const char_type* __s, size_t __n, const char_type& __a)
-{
-    for (; __n; --__n)
-    {
-        if (eq(*__s, __a))
-            return __s;
-        ++__s;
-    }
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char16_t*
-char_traits<char16_t>::move(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    char_type* __r = __s1;
-    if (__s1 < __s2)
-    {
-        for (; __n; --__n, ++__s1, ++__s2)
-            assign(*__s1, *__s2);
-    }
-    else if (__s2 < __s1)
-    {
-        __s1 += __n;
-        __s2 += __n;
-        for (; __n; --__n)
-            assign(*--__s1, *--__s2);
-    }
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char16_t*
-char_traits<char16_t>::copy(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-    char_type* __r = __s1;
-    for (; __n; --__n, ++__s1, ++__s2)
-        assign(*__s1, *__s2);
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char16_t*
-char_traits<char16_t>::assign(char_type* __s, size_t __n, char_type __a)
-{
-    char_type* __r = __s;
-    for (; __n; --__n, ++__s)
-        assign(*__s, __a);
-    return __r;
-}
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY char_traits<char32_t>
-{
-    typedef char32_t       char_type;
-    typedef uint_least32_t int_type;
-    typedef streamoff      off_type;
-    typedef u32streampos   pos_type;
-    typedef mbstate_t      state_type;
-
-    static inline void assign(char_type& __c1, const char_type& __c2) _NOEXCEPT
-        {__c1 = __c2;}
-    static inline _LIBCPP_CONSTEXPR bool eq(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR bool lt(char_type __c1, char_type __c2) _NOEXCEPT
-        {return __c1 < __c2;}
-
-    static int              compare(const char_type* __s1, const char_type* __s2, size_t __n);
-    static size_t           length(const char_type* __s);
-    static const char_type* find(const char_type* __s, size_t __n, const char_type& __a);
-    static char_type*       move(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       copy(char_type* __s1, const char_type* __s2, size_t __n);
-    static char_type*       assign(char_type* __s, size_t __n, char_type __a);
-
-    static inline _LIBCPP_CONSTEXPR int_type  not_eof(int_type __c) _NOEXCEPT
-        {return eq_int_type(__c, eof()) ? ~eof() : __c;}
-    static inline _LIBCPP_CONSTEXPR char_type to_char_type(int_type __c) _NOEXCEPT
-        {return char_type(__c);}
-    static inline _LIBCPP_CONSTEXPR int_type to_int_type(char_type __c) _NOEXCEPT
-        {return int_type(__c);}
-    static inline _LIBCPP_CONSTEXPR bool eq_int_type(int_type __c1, int_type __c2) _NOEXCEPT
-        {return __c1 == __c2;}
-    static inline _LIBCPP_CONSTEXPR int_type eof() _NOEXCEPT
-        {return int_type(0xFFFFFFFF);}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-int
-char_traits<char32_t>::compare(const char_type* __s1, const char_type* __s2, size_t __n)
-{
-    for (; __n; --__n, ++__s1, ++__s2)
-    {
-        if (lt(*__s1, *__s2))
-            return -1;
-        if (lt(*__s2, *__s1))
-            return 1;
-    }
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-size_t
-char_traits<char32_t>::length(const char_type* __s)
-{
-    size_t __len = 0;
-    for (; !eq(*__s, char_type(0)); ++__s)
-        ++__len;
-    return __len;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-const char32_t*
-char_traits<char32_t>::find(const char_type* __s, size_t __n, const char_type& __a)
-{
-    for (; __n; --__n)
-    {
-        if (eq(*__s, __a))
-            return __s;
-        ++__s;
-    }
-    return 0;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char32_t*
-char_traits<char32_t>::move(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    char_type* __r = __s1;
-    if (__s1 < __s2)
-    {
-        for (; __n; --__n, ++__s1, ++__s2)
-            assign(*__s1, *__s2);
-    }
-    else if (__s2 < __s1)
-    {
-        __s1 += __n;
-        __s2 += __n;
-        for (; __n; --__n)
-            assign(*--__s1, *--__s2);
-    }
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char32_t*
-char_traits<char32_t>::copy(char_type* __s1, const char_type* __s2, size_t __n)
-{
-    _LIBCPP_ASSERT(__s2 < __s1 || __s2 >= __s1+__n, "char_traits::copy overlapped range");
-    char_type* __r = __s1;
-    for (; __n; --__n, ++__s1, ++__s2)
-        assign(*__s1, *__s2);
-    return __r;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-char32_t*
-char_traits<char32_t>::assign(char_type* __s, size_t __n, char_type __a)
-{
-    char_type* __r = __s;
-    for (; __n; --__n, ++__s)
-        assign(*__s, __a);
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-// helper fns for basic_string
-
-// __str_find
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find(const _CharT *__p, _SizeT __sz, 
-             _CharT __c, _SizeT __pos) _NOEXCEPT
-{
-    if (__pos >= __sz)
-        return __npos;
-    const _CharT* __r = _Traits::find(__p + __pos, __sz - __pos, __c);
-    if (__r == 0)
-        return __npos;
-    return static_cast<_SizeT>(__r - __p);
-}
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find(const _CharT *__p, _SizeT __sz, 
-       const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    if (__pos > __sz || __sz - __pos < __n)
-        return __npos;
-    if (__n == 0)
-        return __pos;
-    const _CharT* __r = 
-        _VSTD::__search(__p + __pos, __p + __sz,
-                        __s, __s + __n, _Traits::eq,
-                        random_access_iterator_tag(), random_access_iterator_tag());
-    if (__r == __p + __sz)
-        return __npos;
-    return static_cast<_SizeT>(__r - __p);
-}
-
-
-// __str_rfind
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_rfind(const _CharT *__p, _SizeT __sz, 
-              _CharT __c, _SizeT __pos) _NOEXCEPT
-{
-    if (__sz < 1)
-        return __npos;
-    if (__pos < __sz)
-        ++__pos;
-    else
-        __pos = __sz;
-    for (const _CharT* __ps = __p + __pos; __ps != __p;)
-    {
-        if (_Traits::eq(*--__ps, __c))
-            return static_cast<_SizeT>(__ps - __p);
-    }
-    return __npos;
-}
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_rfind(const _CharT *__p, _SizeT __sz, 
-        const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    __pos = _VSTD::min(__pos, __sz);
-    if (__n < __sz - __pos)
-        __pos += __n;
-    else
-        __pos = __sz;
-    const _CharT* __r = _VSTD::__find_end(
-                  __p, __p + __pos, __s, __s + __n, _Traits::eq, 
-                        random_access_iterator_tag(), random_access_iterator_tag());
-    if (__n > 0 && __r == __p + __pos)
-        return __npos;
-    return static_cast<_SizeT>(__r - __p);
-}
-
-// __str_find_first_of
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_first_of(const _CharT *__p, _SizeT __sz,
-                const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    if (__pos >= __sz || __n == 0)
-        return __npos;
-    const _CharT* __r = _VSTD::__find_first_of_ce
-        (__p + __pos, __p + __sz, __s, __s + __n, _Traits::eq );
-    if (__r == __p + __sz)
-        return __npos;
-    return static_cast<_SizeT>(__r - __p);
-}
-
-
-// __str_find_last_of
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY 
-__str_find_last_of(const _CharT *__p, _SizeT __sz,
-               const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-    {
-    if (__n != 0)
-    {
-        if (__pos < __sz)
-            ++__pos;
-        else
-            __pos = __sz;
-        for (const _CharT* __ps = __p + __pos; __ps != __p;)
-        {
-            const _CharT* __r = _Traits::find(__s, __n, *--__ps);
-            if (__r)
-                return static_cast<_SizeT>(__ps - __p);
-        }
-    }
-    return __npos;
-}
-
-
-// __str_find_first_not_of
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_first_not_of(const _CharT *__p, _SizeT __sz,
-                    const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    if (__pos < __sz)
-    {
-        const _CharT* __pe = __p + __sz;
-        for (const _CharT* __ps = __p + __pos; __ps != __pe; ++__ps)
-            if (_Traits::find(__s, __n, *__ps) == 0)
-                return static_cast<_SizeT>(__ps - __p);
-    }
-    return __npos;
-}
-
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_first_not_of(const _CharT *__p, _SizeT __sz,
-                          _CharT __c, _SizeT __pos) _NOEXCEPT
-{
-    if (__pos < __sz)
-    {
-        const _CharT* __pe = __p + __sz;
-        for (const _CharT* __ps = __p + __pos; __ps != __pe; ++__ps)
-            if (!_Traits::eq(*__ps, __c))
-                return static_cast<_SizeT>(__ps - __p);
-    }
-    return __npos;
-}
-
-
-// __str_find_last_not_of
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_last_not_of(const _CharT *__p, _SizeT __sz,
-                   const _CharT* __s, _SizeT __pos, _SizeT __n) _NOEXCEPT
-{
-    if (__pos < __sz)
-        ++__pos;
-    else
-        __pos = __sz;
-    for (const _CharT* __ps = __p + __pos; __ps != __p;)
-        if (_Traits::find(__s, __n, *--__ps) == 0)
-            return static_cast<_SizeT>(__ps - __p);
-    return __npos;
-}
-
-
-template<class _CharT, class _SizeT, class _Traits, _SizeT __npos>
-_SizeT _LIBCPP_CONSTEXPR_AFTER_CXX11 _LIBCPP_INLINE_VISIBILITY
-__str_find_last_not_of(const _CharT *__p, _SizeT __sz,
-                         _CharT __c, _SizeT __pos) _NOEXCEPT
-{
-    if (__pos < __sz)
-        ++__pos;
-    else
-        __pos = __sz;
-    for (const _CharT* __ps = __p + __pos; __ps != __p;)
-        if (!_Traits::eq(*--__ps, __c))
-            return static_cast<_SizeT>(__ps - __p);
-    return __npos;
-}
-
-template<class _Ptr>
-size_t _LIBCPP_INLINE_VISIBILITY __do_string_hash(_Ptr __p, _Ptr __e)
-{
-    typedef typename iterator_traits<_Ptr>::value_type value_type;
-    return __murmur2_or_cityhash<size_t>()(__p, (__e-__p)*sizeof(value_type));
-}
-
-// basic_string
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __x,
-          const basic_string<_CharT, _Traits, _Allocator>& __y);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const _CharT* __x, const basic_string<_CharT,_Traits,_Allocator>& __y);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(_CharT __x, const basic_string<_CharT,_Traits,_Allocator>& __y);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __x, const _CharT* __y);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __x, _CharT __y);
-
-template <bool>
-class _LIBCPP_TYPE_VIS_ONLY __basic_string_common
-{
-protected:
-    void __throw_length_error() const;
-    void __throw_out_of_range() const;
-};
-
-template <bool __b>
-void
-__basic_string_common<__b>::__throw_length_error() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw length_error("basic_string");
-#else
-    assert(!"basic_string length_error");
-#endif
-}
-
-template <bool __b>
-void
-__basic_string_common<__b>::__throw_out_of_range() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw out_of_range("basic_string");
-#else
-    assert(!"basic_string out_of_range");
-#endif
-}
-
-#ifdef _LIBCPP_MSVC
-#pragma warning( push )
-#pragma warning( disable: 4231 )
-#endif // _LIBCPP_MSVC
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS __basic_string_common<true>)
-#ifdef _LIBCPP_MSVC
-#pragma warning( pop )
-#endif // _LIBCPP_MSVC
-
-#ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-template <class _CharT, size_t = sizeof(_CharT)>
-struct __padding
-{
-    unsigned char __xx[sizeof(_CharT)-1];
-};
-
-template <class _CharT>
-struct __padding<_CharT, 1>
-{
-};
-
-#endif  // _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-template<class _CharT, class _Traits, class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY basic_string
-    : private __basic_string_common<true>
-{
-public:
-    typedef basic_string                                 __self;
-    typedef _Traits                                      traits_type;
-    typedef typename traits_type::char_type              value_type;
-    typedef _Allocator                                   allocator_type;
-    typedef allocator_traits<allocator_type>             __alloc_traits;
-    typedef typename __alloc_traits::size_type           size_type;
-    typedef typename __alloc_traits::difference_type     difference_type;
-    typedef value_type&                                  reference;
-    typedef const value_type&                            const_reference;
-    typedef typename __alloc_traits::pointer             pointer;
-    typedef typename __alloc_traits::const_pointer       const_pointer;
-
-    static_assert(is_pod<value_type>::value, "Character type of basic_string must be a POD");
-    static_assert((is_same<_CharT, value_type>::value),
-                  "traits_type::char_type must be the same type as CharT");
-    static_assert((is_same<typename allocator_type::value_type, value_type>::value),
-                  "Allocator::value_type must be same type as value_type");
-#if defined(_LIBCPP_RAW_ITERATORS)
-    typedef pointer                                      iterator;
-    typedef const_pointer                                const_iterator;
-#else  // defined(_LIBCPP_RAW_ITERATORS)
-    typedef __wrap_iter<pointer>                         iterator;
-    typedef __wrap_iter<const_pointer>                   const_iterator;
-#endif  // defined(_LIBCPP_RAW_ITERATORS)
-    typedef _VSTD::reverse_iterator<iterator>             reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>       const_reverse_iterator;
-
-private:
-
-#ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    struct __long
-    {
-        pointer   __data_;
-        size_type __size_;
-        size_type __cap_;
-    };
-
-#if _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x01};
-    enum {__long_mask  = 0x1ul};
-#else  // _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x80};
-    enum {__long_mask  = ~(size_type(~0) >> 1)};
-#endif  // _LIBCPP_BIG_ENDIAN
-
-    enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?
-                      (sizeof(__long) - 1)/sizeof(value_type) : 2};
-
-    struct __short
-    {
-        value_type __data_[__min_cap];
-        struct
-            : __padding<value_type>
-        {
-            unsigned char __size_;
-        };
-    };
-
-#else
-
-    struct __long
-    {
-        size_type __cap_;
-        size_type __size_;
-        pointer   __data_;
-    };
-
-#if _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x80};
-    enum {__long_mask  = ~(size_type(~0) >> 1)};
-#else  // _LIBCPP_BIG_ENDIAN
-    enum {__short_mask = 0x01};
-    enum {__long_mask  = 0x1ul};
-#endif  // _LIBCPP_BIG_ENDIAN
-
-    enum {__min_cap = (sizeof(__long) - 1)/sizeof(value_type) > 2 ?
-                      (sizeof(__long) - 1)/sizeof(value_type) : 2};
-
-    struct __short
-    {
-        union
-        {
-            unsigned char __size_;
-            value_type __lx;
-        };
-        value_type __data_[__min_cap];
-    };
-
-#endif  // _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    union __ulx{__long __lx; __short __lxx;};
-
-    enum {__n_words = sizeof(__ulx) / sizeof(size_type)};
-
-    struct __raw
-    {
-        size_type __words[__n_words];
-    };
-
-    struct __rep
-    {
-        union
-        {
-            __long  __l;
-            __short __s;
-            __raw   __r;
-        };
-    };
-
-    __compressed_pair<__rep, allocator_type> __r_;
-
-public:
-    static const size_type npos = -1;
-
-    _LIBCPP_INLINE_VISIBILITY basic_string()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY explicit basic_string(const allocator_type& __a);
-    basic_string(const basic_string& __str);
-    basic_string(const basic_string& __str, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(basic_string&& __str)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(basic_string&& __str, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY basic_string(const value_type* __s);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(const value_type* __s, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(const value_type* __s, size_type __n);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(const value_type* __s, size_type __n, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(size_type __n, value_type __c);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(size_type __n, value_type __c, const allocator_type& __a);
-    basic_string(const basic_string& __str, size_type __pos, size_type __n = npos,
-                 const allocator_type& __a = allocator_type());
-    template<class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_string(_InputIterator __first, _InputIterator __last);
-    template<class _InputIterator>
-        _LIBCPP_INLINE_VISIBILITY
-        basic_string(_InputIterator __first, _InputIterator __last, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(initializer_list<value_type> __il);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    ~basic_string();
-
-    basic_string& operator=(const basic_string& __str);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& operator=(basic_string&& __str)
-        _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-                   is_nothrow_move_assignable<allocator_type>::value);
-#endif
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator=(const value_type* __s) {return assign(__s);}
-    basic_string& operator=(value_type __c);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& operator=(initializer_list<value_type> __il) {return assign(__il.begin(), __il.size());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT
-        {return iterator(this, __get_pointer());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT
-        {return const_iterator(this, __get_pointer());}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT
-        {return iterator(this, __get_pointer() + size());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT
-        {return const_iterator(this, __get_pointer() + size());}
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT
-        {return iterator(__get_pointer());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT
-        {return const_iterator(__get_pointer());}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT
-        {return iterator(__get_pointer() + size());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end() const _NOEXCEPT
-        {return const_iterator(__get_pointer() + size());}
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rbegin() _NOEXCEPT
-        {return reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rend() _NOEXCEPT
-        {return reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend() const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT
-        {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend() const _NOEXCEPT
-        {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend() const _NOEXCEPT
-        {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY size_type size() const _NOEXCEPT
-        {return __is_long() ? __get_long_size() : __get_short_size();}
-    _LIBCPP_INLINE_VISIBILITY size_type length() const _NOEXCEPT {return size();}
-    _LIBCPP_INLINE_VISIBILITY size_type max_size() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY size_type capacity() const _NOEXCEPT
-        {return (__is_long() ? __get_long_cap() : __min_cap) - 1;}
-
-    void resize(size_type __n, value_type __c);
-    _LIBCPP_INLINE_VISIBILITY void resize(size_type __n) {resize(__n, value_type());}
-
-    void reserve(size_type res_arg = 0);
-    _LIBCPP_INLINE_VISIBILITY
-    void shrink_to_fit() _NOEXCEPT {reserve();}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY bool empty() const _NOEXCEPT {return size() == 0;}
-
-    _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __pos) const;
-    _LIBCPP_INLINE_VISIBILITY reference       operator[](size_type __pos);
-
-    const_reference at(size_type __n) const;
-    reference       at(size_type __n);
-
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator+=(const basic_string& __str) {return append(__str);}
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator+=(const value_type* __s)         {return append(__s);}
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator+=(value_type __c)            {push_back(__c); return *this;}
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY basic_string& operator+=(initializer_list<value_type> __il) {return append(__il);}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& append(const basic_string& __str);
-    basic_string& append(const basic_string& __str, size_type __pos, size_type __n=npos);
-    basic_string& append(const value_type* __s, size_type __n);
-    basic_string& append(const value_type* __s);
-    basic_string& append(size_type __n, value_type __c);
-    template<class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            basic_string&
-        >::type
-        append(_InputIterator __first, _InputIterator __last);
-    template<class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            basic_string&
-        >::type
-        append(_ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& append(initializer_list<value_type> __il) {return append(__il.begin(), __il.size());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    void push_back(value_type __c);
-    _LIBCPP_INLINE_VISIBILITY
-    void pop_back();
-    _LIBCPP_INLINE_VISIBILITY reference       front();
-    _LIBCPP_INLINE_VISIBILITY const_reference front() const;
-    _LIBCPP_INLINE_VISIBILITY reference       back();
-    _LIBCPP_INLINE_VISIBILITY const_reference back() const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& assign(const basic_string& __str);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& assign(basic_string&& str)
-        {*this = _VSTD::move(str); return *this;}
-#endif
-    basic_string& assign(const basic_string& __str, size_type __pos, size_type __n=npos);
-    basic_string& assign(const value_type* __s, size_type __n);
-    basic_string& assign(const value_type* __s);
-    basic_string& assign(size_type __n, value_type __c);
-    template<class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            basic_string&
-        >::type
-        assign(_InputIterator __first, _InputIterator __last);
-    template<class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            basic_string&
-        >::type
-        assign(_ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& assign(initializer_list<value_type> __il) {return assign(__il.begin(), __il.size());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& insert(size_type __pos1, const basic_string& __str);
-    basic_string& insert(size_type __pos1, const basic_string& __str, size_type __pos2, size_type __n=npos);
-    basic_string& insert(size_type __pos, const value_type* __s, size_type __n);
-    basic_string& insert(size_type __pos, const value_type* __s);
-    basic_string& insert(size_type __pos, size_type __n, value_type __c);
-    iterator      insert(const_iterator __pos, value_type __c);
-    _LIBCPP_INLINE_VISIBILITY
-    iterator      insert(const_iterator __pos, size_type __n, value_type __c);
-    template<class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            iterator
-        >::type
-        insert(const_iterator __pos, _InputIterator __first, _InputIterator __last);
-    template<class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            iterator
-        >::type
-        insert(const_iterator __pos, _ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __pos, initializer_list<value_type> __il)
-                    {return insert(__pos, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    basic_string& erase(size_type __pos = 0, size_type __n = npos);
-    _LIBCPP_INLINE_VISIBILITY
-    iterator      erase(const_iterator __pos);
-    _LIBCPP_INLINE_VISIBILITY
-    iterator      erase(const_iterator __first, const_iterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(size_type __pos1, size_type __n1, const basic_string& __str);
-    basic_string& replace(size_type __pos1, size_type __n1, const basic_string& __str, size_type __pos2, size_type __n2=npos);
-    basic_string& replace(size_type __pos, size_type __n1, const value_type* __s, size_type __n2);
-    basic_string& replace(size_type __pos, size_type __n1, const value_type* __s);
-    basic_string& replace(size_type __pos, size_type __n1, size_type __n2, value_type __c);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, const basic_string& __str);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, const value_type* __s, size_type __n);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, const value_type* __s);
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, size_type __n, value_type __c);
-    template<class _InputIterator>
-        typename enable_if
-        <
-            __is_input_iterator<_InputIterator>::value,
-            basic_string&
-        >::type
-        replace(const_iterator __i1, const_iterator __i2, _InputIterator __j1, _InputIterator __j2);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string& replace(const_iterator __i1, const_iterator __i2, initializer_list<value_type> __il)
-        {return replace(__i1, __i2, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    size_type copy(value_type* __s, size_type __n, size_type __pos = 0) const;
-    _LIBCPP_INLINE_VISIBILITY
-    basic_string substr(size_type __pos = 0, size_type __n = npos) const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(basic_string& __str)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* c_str() const _NOEXCEPT {return data();}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* data() const _NOEXCEPT  {return _VSTD::__to_raw_pointer(__get_pointer());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT {return __alloc();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;
-    size_type find(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;
-    size_type find(value_type __c, size_type __pos = 0) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type rfind(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;
-    size_type rfind(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type rfind(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;
-    size_type rfind(value_type __c, size_type __pos = npos) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;
-    size_type find_first_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_of(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_of(value_type __c, size_type __pos = 0) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;
-    size_type find_last_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_of(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_of(value_type __c, size_type __pos = npos) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_not_of(const basic_string& __str, size_type __pos = 0) const _NOEXCEPT;
-    size_type find_first_not_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_not_of(const value_type* __s, size_type __pos = 0) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_first_not_of(value_type __c, size_type __pos = 0) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_not_of(const basic_string& __str, size_type __pos = npos) const _NOEXCEPT;
-    size_type find_last_not_of(const value_type* __s, size_type __pos, size_type __n) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_not_of(const value_type* __s, size_type __pos = npos) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type find_last_not_of(value_type __c, size_type __pos = npos) const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(const basic_string& __str) const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    int compare(size_type __pos1, size_type __n1, const basic_string& __str) const;
-    int compare(size_type __pos1, size_type __n1, const basic_string& __str, size_type __pos2, size_type __n2=npos) const;
-    int compare(const value_type* __s) const _NOEXCEPT;
-    int compare(size_type __pos1, size_type __n1, const value_type* __s) const;
-    int compare(size_type __pos1, size_type __n1, const value_type* __s, size_type __n2) const;
-
-    _LIBCPP_INLINE_VISIBILITY bool __invariants() const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool __is_long() const _NOEXCEPT
-        {return bool(__r_.first().__s.__size_ & __short_mask);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const;
-    bool __decrementable(const const_iterator* __i) const;
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const;
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type& __alloc() _NOEXCEPT
-        {return __r_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const allocator_type& __alloc() const _NOEXCEPT
-        {return __r_.second();}
-
-#ifdef _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_short_size(size_type __s) _NOEXCEPT
-#   if _LIBCPP_BIG_ENDIAN
-        {__r_.first().__s.__size_ = (unsigned char)(__s << 1);}
-#   else
-        {__r_.first().__s.__size_ = (unsigned char)(__s);}
-#   endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __get_short_size() const _NOEXCEPT
-#   if _LIBCPP_BIG_ENDIAN
-        {return __r_.first().__s.__size_ >> 1;}
-#   else
-        {return __r_.first().__s.__size_;}
-#   endif
-
-#else  // _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_short_size(size_type __s) _NOEXCEPT
-#   if _LIBCPP_BIG_ENDIAN
-        {__r_.first().__s.__size_ = (unsigned char)(__s);}
-#   else
-        {__r_.first().__s.__size_ = (unsigned char)(__s << 1);}
-#   endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __get_short_size() const _NOEXCEPT
-#   if _LIBCPP_BIG_ENDIAN
-        {return __r_.first().__s.__size_;}
-#   else
-        {return __r_.first().__s.__size_ >> 1;}
-#   endif
-
-#endif  // _LIBCPP_ALTERNATE_STRING_LAYOUT
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_long_size(size_type __s) _NOEXCEPT
-        {__r_.first().__l.__size_ = __s;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __get_long_size() const _NOEXCEPT
-        {return __r_.first().__l.__size_;}
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_size(size_type __s) _NOEXCEPT
-        {if (__is_long()) __set_long_size(__s); else __set_short_size(__s);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_long_cap(size_type __s) _NOEXCEPT
-        {__r_.first().__l.__cap_  = __long_mask | __s;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type __get_long_cap() const _NOEXCEPT
-        {return __r_.first().__l.__cap_ & size_type(~__long_mask);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __set_long_pointer(pointer __p) _NOEXCEPT
-        {__r_.first().__l.__data_ = __p;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer __get_long_pointer() _NOEXCEPT
-        {return __r_.first().__l.__data_;}
-    _LIBCPP_INLINE_VISIBILITY
-    const_pointer __get_long_pointer() const _NOEXCEPT
-        {return __r_.first().__l.__data_;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer __get_short_pointer() _NOEXCEPT
-        {return pointer_traits<pointer>::pointer_to(__r_.first().__s.__data_[0]);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_pointer __get_short_pointer() const _NOEXCEPT
-        {return pointer_traits<const_pointer>::pointer_to(__r_.first().__s.__data_[0]);}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer __get_pointer() _NOEXCEPT
-        {return __is_long() ? __get_long_pointer() : __get_short_pointer();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_pointer __get_pointer() const _NOEXCEPT
-        {return __is_long() ? __get_long_pointer() : __get_short_pointer();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __zero() _NOEXCEPT
-        {
-            size_type (&__a)[__n_words] = __r_.first().__r.__words;
-            for (unsigned __i = 0; __i < __n_words; ++__i)
-                __a[__i] = 0;
-        }
-
-    template <size_type __a> static
-        _LIBCPP_INLINE_VISIBILITY
-        size_type __align_it(size_type __s) _NOEXCEPT
-            {return __s + (__a-1) & ~(__a-1);}
-    enum {__alignment = 16};
-    static _LIBCPP_INLINE_VISIBILITY
-    size_type __recommend(size_type __s) _NOEXCEPT
-        {return (__s < __min_cap ? __min_cap :
-                 __align_it<sizeof(value_type) < __alignment ?
-                            __alignment/sizeof(value_type) : 1 > (__s+1)) - 1;}
-
-    void __init(const value_type* __s, size_type __sz, size_type __reserve);
-    void __init(const value_type* __s, size_type __sz);
-    void __init(size_type __n, value_type __c);
-
-    template <class _InputIterator>
-    typename enable_if
-    <
-         __is_input_iterator  <_InputIterator>::value &&
-        !__is_forward_iterator<_InputIterator>::value,
-        void
-    >::type
-    __init(_InputIterator __first, _InputIterator __last);
-
-    template <class _ForwardIterator>
-    typename enable_if
-    <
-        __is_forward_iterator<_ForwardIterator>::value,
-        void
-    >::type
-    __init(_ForwardIterator __first, _ForwardIterator __last);
-
-    void __grow_by(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
-                   size_type __n_copy,  size_type __n_del,     size_type __n_add = 0);
-    void __grow_by_and_replace(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
-                               size_type __n_copy,  size_type __n_del,
-                               size_type __n_add, const value_type* __p_new_stuff);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __erase_to_end(size_type __pos);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const basic_string& __str)
-        {__copy_assign_alloc(__str, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const basic_string& __str, true_type)
-        {
-            if (__alloc() != __str.__alloc())
-            {
-                clear();
-                shrink_to_fit();
-            }
-            __alloc() = __str.__alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const basic_string&, false_type) _NOEXCEPT
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign(basic_string& __str, false_type);
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign(basic_string& __str, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    void
-    __move_assign_alloc(basic_string& __str)
-        _NOEXCEPT_(
-            !__alloc_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<allocator_type>::value)
-    {__move_assign_alloc(__str, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_move_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(basic_string& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(basic_string&, false_type)
-        _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_swap::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<allocator_type>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type&, allocator_type&, false_type) _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY void __invalidate_all_iterators();
-    _LIBCPP_INLINE_VISIBILITY void __invalidate_iterators_past(size_type);
-
-    friend basic_string operator+<>(const basic_string&, const basic_string&);
-    friend basic_string operator+<>(const value_type*, const basic_string&);
-    friend basic_string operator+<>(value_type, const basic_string&);
-    friend basic_string operator+<>(const basic_string&, const value_type*);
-    friend basic_string operator+<>(const basic_string&, value_type);
-};
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__invalidate_all_iterators()
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__invalidate_all(this);
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__invalidate_iterators_past(size_type
-#if _LIBCPP_DEBUG_LEVEL >= 2
-                                                                        __pos
-#endif
-                                                                      )
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __c_node* __c = __get_db()->__find_c_and_lock(this);
-    if (__c)
-    {
-        const_pointer __new_last = __get_pointer() + __pos;
-        for (__i_node** __p = __c->end_; __p != __c->beg_; )
-        {
-            --__p;
-            const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-            if (__i->base() > __new_last)
-            {
-                (*__p)->__c_ = nullptr;
-                if (--__c->end_ != __p)
-                    memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __get_db()->unlock();
-    }
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string()
-    _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __zero();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a)
-    : __r_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __zero();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_type __sz, size_type __reserve)
-{
-    if (__reserve > max_size())
-        this->__throw_length_error();
-    pointer __p;
-    if (__reserve < __min_cap)
-    {
-        __set_short_size(__sz);
-        __p = __get_short_pointer();
-    }
-    else
-    {
-        size_type __cap = __recommend(__reserve);
-        __p = __alloc_traits::allocate(__alloc(), __cap+1);
-        __set_long_pointer(__p);
-        __set_long_cap(__cap+1);
-        __set_long_size(__sz);
-    }
-    traits_type::copy(_VSTD::__to_raw_pointer(__p), __s, __sz);
-    traits_type::assign(__p[__sz], value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__init(const value_type* __s, size_type __sz)
-{
-    if (__sz > max_size())
-        this->__throw_length_error();
-    pointer __p;
-    if (__sz < __min_cap)
-    {
-        __set_short_size(__sz);
-        __p = __get_short_pointer();
-    }
-    else
-    {
-        size_type __cap = __recommend(__sz);
-        __p = __alloc_traits::allocate(__alloc(), __cap+1);
-        __set_long_pointer(__p);
-        __set_long_cap(__cap+1);
-        __set_long_size(__sz);
-    }
-    traits_type::copy(_VSTD::__to_raw_pointer(__p), __s, __sz);
-    traits_type::assign(__p[__sz], value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*) detected nullptr");
-    __init(__s, traits_type::length(__s));
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const value_type* __s, const allocator_type& __a)
-    : __r_(__a)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "basic_string(const char*, allocator) detected nullptr");
-    __init(__s, traits_type::length(__s));
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const value_type* __s, size_type __n)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "basic_string(const char*, n) detected nullptr");
-    __init(__s, __n);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const value_type* __s, size_type __n, const allocator_type& __a)
-    : __r_(__a)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "basic_string(const char*, n, allocator) detected nullptr");
-    __init(__s, __n);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str)
-    : __r_(__alloc_traits::select_on_container_copy_construction(__str.__alloc()))
-{
-    if (!__str.__is_long())
-        __r_.first().__r = __str.__r_.first().__r;
-    else
-        __init(_VSTD::__to_raw_pointer(__str.__get_long_pointer()), __str.__get_long_size());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str, const allocator_type& __a)
-    : __r_(__a)
-{
-    if (!__str.__is_long())
-        __r_.first().__r = __str.__r_.first().__r;
-    else
-        __init(_VSTD::__to_raw_pointer(__str.__get_long_pointer()), __str.__get_long_size());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(basic_string&& __str)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __r_(_VSTD::move(__str.__r_))
-{
-    __str.__zero();
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    if (__is_long())
-        __get_db()->swap(this, &__str);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(basic_string&& __str, const allocator_type& __a)
-    : __r_(__a)
-{
-    if (__str.__is_long() && __a != __str.__alloc()) // copy, not move
-        __init(_VSTD::__to_raw_pointer(__str.__get_long_pointer()), __str.__get_long_size());
-    else
-    {
-        __r_.first().__r = __str.__r_.first().__r;
-        __str.__zero();
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    if (__is_long())
-        __get_db()->swap(this, &__str);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__init(size_type __n, value_type __c)
-{
-    if (__n > max_size())
-        this->__throw_length_error();
-    pointer __p;
-    if (__n < __min_cap)
-    {
-        __set_short_size(__n);
-        __p = __get_short_pointer();
-    }
-    else
-    {
-        size_type __cap = __recommend(__n);
-        __p = __alloc_traits::allocate(__alloc(), __cap+1);
-        __set_long_pointer(__p);
-        __set_long_cap(__cap+1);
-        __set_long_size(__n);
-    }
-    traits_type::assign(_VSTD::__to_raw_pointer(__p), __n, __c);
-    traits_type::assign(__p[__n], value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, value_type __c)
-{
-    __init(__n, __c);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(size_type __n, value_type __c, const allocator_type& __a)
-    : __r_(__a)
-{
-    __init(__n, __c);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __str, size_type __pos, size_type __n,
-                                                        const allocator_type& __a)
-    : __r_(__a)
-{
-    size_type __str_sz = __str.size();
-    if (__pos > __str_sz)
-        this->__throw_out_of_range();
-    __init(__str.data() + __pos, _VSTD::min(__n, __str_sz - __pos));
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    void
->::type
-basic_string<_CharT, _Traits, _Allocator>::__init(_InputIterator __first, _InputIterator __last)
-{
-    __zero();
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        if (__is_long())
-            __alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap());
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    void
->::type
-basic_string<_CharT, _Traits, _Allocator>::__init(_ForwardIterator __first, _ForwardIterator __last)
-{
-    size_type __sz = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__sz > max_size())
-        this->__throw_length_error();
-    pointer __p;
-    if (__sz < __min_cap)
-    {
-        __set_short_size(__sz);
-        __p = __get_short_pointer();
-    }
-    else
-    {
-        size_type __cap = __recommend(__sz);
-        __p = __alloc_traits::allocate(__alloc(), __cap+1);
-        __set_long_pointer(__p);
-        __set_long_cap(__cap+1);
-        __set_long_size(__sz);
-    }
-    for (; __first != __last; ++__first, (void) ++__p)
-        traits_type::assign(*__p, *__first);
-    traits_type::assign(*__p, value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last)
-{
-    __init(__first, __last);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(_InputIterator __first, _InputIterator __last,
-                                                        const allocator_type& __a)
-    : __r_(__a)
-{
-    __init(__first, __last);
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(initializer_list<value_type> __il)
-{
-    __init(__il.begin(), __il.end());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>::basic_string(initializer_list<value_type> __il, const allocator_type& __a)
-    : __r_(__a)
-{
-    __init(__il.begin(), __il.end());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::~basic_string()
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__erase_c(this);
-#endif
-    if (__is_long())
-        __alloc_traits::deallocate(__alloc(), __get_long_pointer(), __get_long_cap());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__grow_by_and_replace
-    (size_type __old_cap, size_type __delta_cap, size_type __old_sz,
-     size_type __n_copy,  size_type __n_del,     size_type __n_add, const value_type* __p_new_stuff)
-{
-    size_type __ms = max_size();
-    if (__delta_cap > __ms - __old_cap - 1)
-        this->__throw_length_error();
-    pointer __old_p = __get_pointer();
-    size_type __cap = __old_cap < __ms / 2 - __alignment ?
-                          __recommend(_VSTD::max(__old_cap + __delta_cap, 2 * __old_cap)) :
-                          __ms - 1;
-    pointer __p = __alloc_traits::allocate(__alloc(), __cap+1);
-    __invalidate_all_iterators();
-    if (__n_copy != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p),
-                          _VSTD::__to_raw_pointer(__old_p), __n_copy);
-    if (__n_add != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p) + __n_copy, __p_new_stuff, __n_add);
-    size_type __sec_cp_sz = __old_sz - __n_del - __n_copy;
-    if (__sec_cp_sz != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p) + __n_copy + __n_add,
-                          _VSTD::__to_raw_pointer(__old_p) + __n_copy + __n_del, __sec_cp_sz);
-    if (__old_cap+1 != __min_cap)
-        __alloc_traits::deallocate(__alloc(), __old_p, __old_cap+1);
-    __set_long_pointer(__p);
-    __set_long_cap(__cap+1);
-    __old_sz = __n_copy + __n_add + __sec_cp_sz;
-    __set_long_size(__old_sz);
-    traits_type::assign(__p[__old_sz], value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::__grow_by(size_type __old_cap, size_type __delta_cap, size_type __old_sz,
-                                                     size_type __n_copy,  size_type __n_del,     size_type __n_add)
-{
-    size_type __ms = max_size();
-    if (__delta_cap > __ms - __old_cap)
-        this->__throw_length_error();
-    pointer __old_p = __get_pointer();
-    size_type __cap = __old_cap < __ms / 2 - __alignment ?
-                          __recommend(_VSTD::max(__old_cap + __delta_cap, 2 * __old_cap)) :
-                          __ms - 1;
-    pointer __p = __alloc_traits::allocate(__alloc(), __cap+1);
-    __invalidate_all_iterators();
-    if (__n_copy != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p),
-                          _VSTD::__to_raw_pointer(__old_p), __n_copy);
-    size_type __sec_cp_sz = __old_sz - __n_del - __n_copy;
-    if (__sec_cp_sz != 0)
-        traits_type::copy(_VSTD::__to_raw_pointer(__p) + __n_copy + __n_add,
-                          _VSTD::__to_raw_pointer(__old_p) + __n_copy + __n_del,
-                          __sec_cp_sz);
-    if (__old_cap+1 != __min_cap)
-        __alloc_traits::deallocate(__alloc(), __old_p, __old_cap+1);
-    __set_long_pointer(__p);
-    __set_long_cap(__cap+1);
-}
-
-// assign
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s, size_type __n)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::assign received nullptr");
-    size_type __cap = capacity();
-    if (__cap >= __n)
-    {
-        value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-        traits_type::move(__p, __s, __n);
-        traits_type::assign(__p[__n], value_type());
-        __set_size(__n);
-        __invalidate_iterators_past(__n);
-    }
-    else
-    {
-        size_type __sz = size();
-        __grow_by_and_replace(__cap, __n - __cap, __sz, 0, __sz, __n, __s);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(size_type __n, value_type __c)
-{
-    size_type __cap = capacity();
-    if (__cap < __n)
-    {
-        size_type __sz = size();
-        __grow_by(__cap, __n - __cap, __sz, 0, __sz);
-    }
-    else
-        __invalidate_iterators_past(__n);
-    value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-    traits_type::assign(__p, __n, __c);
-    traits_type::assign(__p[__n], value_type());
-    __set_size(__n);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::operator=(value_type __c)
-{
-    pointer __p;
-    if (__is_long())
-    {
-        __p = __get_long_pointer();
-        __set_long_size(1);
-    }
-    else
-    {
-        __p = __get_short_pointer();
-        __set_short_size(1);
-    }
-    traits_type::assign(*__p, __c);
-    traits_type::assign(*++__p, value_type());
-    __invalidate_iterators_past(1);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::operator=(const basic_string& __str)
-{
-    if (this != &__str)
-    {
-        __copy_assign_alloc(__str);
-        assign(__str);
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, false_type)
-{
-    if (__alloc() != __str.__alloc())
-        assign(__str);
-    else
-        __move_assign(__str, true_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    clear();
-    shrink_to_fit();
-    __r_.first() = __str.__r_.first();
-    __move_assign_alloc(__str);
-    __str.__zero();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::operator=(basic_string&& __str)
-    _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value &&
-               is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__str, integral_constant<bool,
-          __alloc_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-#endif
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
-{
-    clear();
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)
-{
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    size_type __cap = capacity();
-    if (__cap < __n)
-    {
-        size_type __sz = size();
-        __grow_by(__cap, __n - __cap, __sz, 0, __sz);
-    }
-    else
-        __invalidate_iterators_past(__n);
-    pointer __p = __get_pointer();
-    for (; __first != __last; ++__first, ++__p)
-        traits_type::assign(*__p, *__first);
-    traits_type::assign(*__p, value_type());
-    __set_size(__n);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(const basic_string& __str)
-{
-    return assign(__str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(const basic_string& __str, size_type __pos, size_type __n)
-{
-    size_type __sz = __str.size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    return assign(__str.data() + __pos, _VSTD::min(__n, __sz - __pos));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::assign(const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::assign received nullptr");
-    return assign(__s, traits_type::length(__s));
-}
-
-// append
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s, size_type __n)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::append received nullptr");
-    size_type __cap = capacity();
-    size_type __sz = size();
-    if (__cap - __sz >= __n)
-    {
-        if (__n)
-        {
-            value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-            traits_type::copy(__p + __sz, __s, __n);
-            __sz += __n;
-            __set_size(__sz);
-            traits_type::assign(__p[__sz], value_type());
-        }
-    }
-    else
-        __grow_by_and_replace(__cap, __sz + __n - __cap, __sz, __sz, 0, __n, __s);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(size_type __n, value_type __c)
-{
-    if (__n)
-    {
-        size_type __cap = capacity();
-        size_type __sz = size();
-        if (__cap - __sz < __n)
-            __grow_by(__cap, __sz + __n - __cap, __sz, __sz, 0);
-        pointer __p = __get_pointer();
-        traits_type::assign(_VSTD::__to_raw_pointer(__p) + __sz, __n, __c);
-        __sz += __n;
-        __set_size(__sz);
-        traits_type::assign(__p[__sz], value_type());
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::push_back(value_type __c)
-{
-    bool __is_short = !__is_long();
-    size_type __cap;
-    size_type __sz;
-    if (__is_short)
-    {
-        __cap = __min_cap - 1;
-        __sz = __get_short_size();
-    }
-    else
-    {
-        __cap = __get_long_cap() - 1;
-        __sz = __get_long_size();
-    }
-    if (__sz == __cap)
-    {
-        __grow_by(__cap, 1, __sz, __sz, 0);
-        __is_short = !__is_long();
-    }
-    pointer __p;
-    if (__is_short)
-    {
-        __p = __get_short_pointer() + __sz;
-        __set_short_size(__sz+1);
-    }
-    else
-    {
-        __p = __get_long_pointer() + __sz;
-        __set_long_size(__sz+1);
-    }
-    traits_type::assign(*__p, __c);
-    traits_type::assign(*++__p, value_type());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::append(_InputIterator __first, _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::append(_ForwardIterator __first, _ForwardIterator __last)
-{
-    size_type __sz = size();
-    size_type __cap = capacity();
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n)
-    {
-        if (__cap - __sz < __n)
-            __grow_by(__cap, __sz + __n - __cap, __sz, __sz, 0);
-        pointer __p = __get_pointer() + __sz;
-        for (; __first != __last; ++__p, ++__first)
-            traits_type::assign(*__p, *__first);
-        traits_type::assign(*__p, value_type());
-        __set_size(__sz + __n);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(const basic_string& __str)
-{
-    return append(__str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(const basic_string& __str, size_type __pos, size_type __n)
-{
-    size_type __sz = __str.size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    return append(__str.data() + __pos, _VSTD::min(__n, __sz - __pos));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::append(const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::append received nullptr");
-    return append(__s, traits_type::length(__s));
-}
-
-// insert
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_type* __s, size_type __n)
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::insert received nullptr");
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    size_type __cap = capacity();
-    if (__cap - __sz >= __n)
-    {
-        if (__n)
-        {
-            value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-            size_type __n_move = __sz - __pos;
-            if (__n_move != 0)
-            {
-                if (__p + __pos <= __s && __s < __p + __sz)
-                    __s += __n;
-                traits_type::move(__p + __pos + __n, __p + __pos, __n_move);
-            }
-            traits_type::move(__p + __pos, __s, __n);
-            __sz += __n;
-            __set_size(__sz);
-            traits_type::assign(__p[__sz], value_type());
-        }
-    }
-    else
-        __grow_by_and_replace(__cap, __sz + __n - __cap, __sz, __pos, 0, __n, __s);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, size_type __n, value_type __c)
-{
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    if (__n)
-    {
-        size_type __cap = capacity();
-        value_type* __p;
-        if (__cap - __sz >= __n)
-        {
-            __p = _VSTD::__to_raw_pointer(__get_pointer());
-            size_type __n_move = __sz - __pos;
-            if (__n_move != 0)
-                traits_type::move(__p + __pos + __n, __p + __pos, __n_move);
-        }
-        else
-        {
-            __grow_by(__cap, __sz + __n - __cap, __sz, __pos, 0, __n);
-            __p = _VSTD::__to_raw_pointer(__get_long_pointer());
-        }
-        traits_type::assign(__p + __pos, __n, __c);
-        __sz += __n;
-        __set_size(__sz);
-        traits_type::assign(__p[__sz], value_type());
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    typename basic_string<_CharT, _Traits, _Allocator>::iterator
->::type
-basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
-        "string::insert(iterator, range) called with an iterator not"
-        " referring to this string");
-#endif
-    size_type __old_sz = size();
-    difference_type __ip = __pos - begin();
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-    pointer __p = __get_pointer();
-    _VSTD::rotate(__p + __ip, __p + __old_sz, __p + size());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(this, __p + __ip);
-#else
-    return iterator(__p + __ip);
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    typename basic_string<_CharT, _Traits, _Allocator>::iterator
->::type
-basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, _ForwardIterator __first, _ForwardIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
-        "string::insert(iterator, range) called with an iterator not"
-        " referring to this string");
-#endif
-    size_type __ip = static_cast<size_type>(__pos - begin());
-    size_type __sz = size();
-    size_type __cap = capacity();
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n)
-    {
-        value_type* __p;
-        if (__cap - __sz >= __n)
-        {
-            __p = _VSTD::__to_raw_pointer(__get_pointer());
-            size_type __n_move = __sz - __ip;
-            if (__n_move != 0)
-                traits_type::move(__p + __ip + __n, __p + __ip, __n_move);
-        }
-        else
-        {
-            __grow_by(__cap, __sz + __n - __cap, __sz, __ip, 0, __n);
-            __p = _VSTD::__to_raw_pointer(__get_long_pointer());
-        }
-        __sz += __n;
-        __set_size(__sz);
-        traits_type::assign(__p[__sz], value_type());
-        for (__p += __ip; __first != __last; ++__p, ++__first)
-            traits_type::assign(*__p, *__first);
-    }
-    return begin() + __ip;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const basic_string& __str)
-{
-    return insert(__pos1, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos1, const basic_string& __str,
-                                                  size_type __pos2, size_type __n)
-{
-    size_type __str_sz = __str.size();
-    if (__pos2 > __str_sz)
-        this->__throw_out_of_range();
-    return insert(__pos1, __str.data() + __pos2, _VSTD::min(__n, __str_sz - __pos2));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::insert(size_type __pos, const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::insert received nullptr");
-    return insert(__pos, __s, traits_type::length(__s));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::iterator
-basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, value_type __c)
-{
-    size_type __ip = static_cast<size_type>(__pos - begin());
-    size_type __sz = size();
-    size_type __cap = capacity();
-    value_type* __p;
-    if (__cap == __sz)
-    {
-        __grow_by(__cap, 1, __sz, __ip, 0, 1);
-        __p = _VSTD::__to_raw_pointer(__get_long_pointer());
-    }
-    else
-    {
-        __p = _VSTD::__to_raw_pointer(__get_pointer());
-        size_type __n_move = __sz - __ip;
-        if (__n_move != 0)
-            traits_type::move(__p + __ip + 1, __p + __ip, __n_move);
-    }
-    traits_type::assign(__p[__ip], __c);
-    traits_type::assign(__p[++__sz], value_type());
-    __set_size(__sz);
-    return begin() + static_cast<difference_type>(__ip);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::iterator
-basic_string<_CharT, _Traits, _Allocator>::insert(const_iterator __pos, size_type __n, value_type __c)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
-        "string::insert(iterator, n, value) called with an iterator not"
-        " referring to this string");
-#endif
-    difference_type __p = __pos - begin();
-    insert(static_cast<size_type>(__p), __n, __c);
-    return begin() + __p;
-}
-
-// replace
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, const value_type* __s, size_type __n2)
-{
-    _LIBCPP_ASSERT(__n2 == 0 || __s != nullptr, "string::replace received nullptr");
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    __n1 = _VSTD::min(__n1, __sz - __pos);
-    size_type __cap = capacity();
-    if (__cap - __sz + __n1 >= __n2)
-    {
-        value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-        if (__n1 != __n2)
-        {
-            size_type __n_move = __sz - __pos - __n1;
-            if (__n_move != 0)
-            {
-                if (__n1 > __n2)
-                {
-                    traits_type::move(__p + __pos, __s, __n2);
-                    traits_type::move(__p + __pos + __n2, __p + __pos + __n1, __n_move);
-                    goto __finish;
-                }
-                if (__p + __pos < __s && __s < __p + __sz)
-                {
-                    if (__p + __pos + __n1 <= __s)
-                        __s += __n2 - __n1;
-                    else // __p + __pos < __s < __p + __pos + __n1
-                    {
-                        traits_type::move(__p + __pos, __s, __n1);
-                        __pos += __n1;
-                        __s += __n2;
-                        __n2 -= __n1;
-                        __n1 = 0;
-                    }
-                }
-                traits_type::move(__p + __pos + __n2, __p + __pos + __n1, __n_move);
-            }
-        }
-        traits_type::move(__p + __pos, __s, __n2);
-__finish:
-        __sz += __n2 - __n1;
-        __set_size(__sz);
-        __invalidate_iterators_past(__sz);
-        traits_type::assign(__p[__sz], value_type());
-    }
-    else
-        __grow_by_and_replace(__cap, __sz - __n1 + __n2 - __cap, __sz, __pos, __n1, __n2, __s);
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, size_type __n2, value_type __c)
-{
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    __n1 = _VSTD::min(__n1, __sz - __pos);
-    size_type __cap = capacity();
-    value_type* __p;
-    if (__cap - __sz + __n1 >= __n2)
-    {
-        __p = _VSTD::__to_raw_pointer(__get_pointer());
-        if (__n1 != __n2)
-        {
-            size_type __n_move = __sz - __pos - __n1;
-            if (__n_move != 0)
-                traits_type::move(__p + __pos + __n2, __p + __pos + __n1, __n_move);
-        }
-    }
-    else
-    {
-        __grow_by(__cap, __sz - __n1 + __n2 - __cap, __sz, __pos, __n1, __n2);
-        __p = _VSTD::__to_raw_pointer(__get_long_pointer());
-    }
-    traits_type::assign(__p + __pos, __n2, __c);
-    __sz += __n2 - __n1;
-    __set_size(__sz);
-    __invalidate_iterators_past(__sz);
-    traits_type::assign(__p[__sz], value_type());
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-template<class _InputIterator>
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value,
-    basic_string<_CharT, _Traits, _Allocator>&
->::type
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2,
-                                                   _InputIterator __j1, _InputIterator __j2)
-{
-    for (; true; ++__i1, ++__j1)
-    {
-        if (__i1 == __i2)
-        {
-            if (__j1 != __j2)
-                insert(__i1, __j1, __j2);
-            break;
-        }
-        if (__j1 == __j2)
-        {
-            erase(__i1, __i2);
-            break;
-        }
-        traits_type::assign(const_cast<value_type&>(*__i1), *__j1);
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type __n1, const basic_string& __str)
-{
-    return replace(__pos1, __n1, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos1, size_type __n1, const basic_string& __str,
-                                                   size_type __pos2, size_type __n2)
-{
-    size_type __str_sz = __str.size();
-    if (__pos2 > __str_sz)
-        this->__throw_out_of_range();
-    return replace(__pos1, __n1, __str.data() + __pos2, _VSTD::min(__n2, __str_sz - __pos2));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(size_type __pos, size_type __n1, const value_type* __s)
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::replace received nullptr");
-    return replace(__pos, __n1, __s, traits_type::length(__s));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, const basic_string& __str)
-{
-    return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1),
-                   __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, const value_type* __s, size_type __n)
-{
-    return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __s, __n);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, const value_type* __s)
-{
-    return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __s);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::replace(const_iterator __i1, const_iterator __i2, size_type __n, value_type __c)
-{
-    return replace(static_cast<size_type>(__i1 - begin()), static_cast<size_type>(__i2 - __i1), __n, __c);
-}
-
-// erase
-
-template <class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>&
-basic_string<_CharT, _Traits, _Allocator>::erase(size_type __pos, size_type __n)
-{
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    if (__n)
-    {
-        value_type* __p = _VSTD::__to_raw_pointer(__get_pointer());
-        __n = _VSTD::min(__n, __sz - __pos);
-        size_type __n_move = __sz - __pos - __n;
-        if (__n_move != 0)
-            traits_type::move(__p + __pos, __p + __pos + __n, __n_move);
-        __sz -= __n;
-        __set_size(__sz);
-        __invalidate_iterators_past(__sz);
-        traits_type::assign(__p[__sz], value_type());
-    }
-    return *this;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::iterator
-basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __pos)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__pos) == this,
-        "string::erase(iterator) called with an iterator not"
-        " referring to this string");
-#endif
-    _LIBCPP_ASSERT(__pos != end(),
-        "string::erase(iterator) called with a non-dereferenceable iterator");
-    iterator __b = begin();
-    size_type __r = static_cast<size_type>(__pos - __b);
-    erase(__r, 1);
-    return __b + static_cast<difference_type>(__r);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::iterator
-basic_string<_CharT, _Traits, _Allocator>::erase(const_iterator __first, const_iterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__first) == this,
-        "string::erase(iterator,  iterator) called with an iterator not"
-        " referring to this string");
-#endif
-    _LIBCPP_ASSERT(__first <= __last, "string::erase(first, last) called with invalid range");
-    iterator __b = begin();
-    size_type __r = static_cast<size_type>(__first - __b);
-    erase(__r, static_cast<size_type>(__last - __first));
-    return __b + static_cast<difference_type>(__r);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::pop_back()
-{
-    _LIBCPP_ASSERT(!empty(), "string::pop_back(): string is already empty");
-    size_type __sz;
-    if (__is_long())
-    {
-        __sz = __get_long_size() - 1;
-        __set_long_size(__sz);
-        traits_type::assign(*(__get_long_pointer() + __sz), value_type());
-    }
-    else
-    {
-        __sz = __get_short_size() - 1;
-        __set_short_size(__sz);
-        traits_type::assign(*(__get_short_pointer() + __sz), value_type());
-    }
-    __invalidate_iterators_past(__sz);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::clear() _NOEXCEPT
-{
-    __invalidate_all_iterators();
-    if (__is_long())
-    {
-        traits_type::assign(*__get_long_pointer(), value_type());
-        __set_long_size(0);
-    }
-    else
-    {
-        traits_type::assign(*__get_short_pointer(), value_type());
-        __set_short_size(0);
-    }
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::__erase_to_end(size_type __pos)
-{
-    if (__is_long())
-    {
-        traits_type::assign(*(__get_long_pointer() + __pos), value_type());
-        __set_long_size(__pos);
-    }
-    else
-    {
-        traits_type::assign(*(__get_short_pointer() + __pos), value_type());
-        __set_short_size(__pos);
-    }
-    __invalidate_iterators_past(__pos);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::resize(size_type __n, value_type __c)
-{
-    size_type __sz = size();
-    if (__n > __sz)
-        append(__n - __sz, __c);
-    else
-        __erase_to_end(__n);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::max_size() const _NOEXCEPT
-{
-    size_type __m = __alloc_traits::max_size(__alloc());
-#if _LIBCPP_BIG_ENDIAN
-    return (__m <= ~__long_mask ? __m : __m/2) - __alignment;
-#else
-    return __m - __alignment;
-#endif
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-void
-basic_string<_CharT, _Traits, _Allocator>::reserve(size_type __res_arg)
-{
-    if (__res_arg > max_size())
-        this->__throw_length_error();
-    size_type __cap = capacity();
-    size_type __sz = size();
-    __res_arg = _VSTD::max(__res_arg, __sz);
-    __res_arg = __recommend(__res_arg);
-    if (__res_arg != __cap)
-    {
-        pointer __new_data, __p;
-        bool __was_long, __now_long;
-        if (__res_arg == __min_cap - 1)
-        {
-            __was_long = true;
-            __now_long = false;
-            __new_data = __get_short_pointer();
-            __p = __get_long_pointer();
-        }
-        else
-        {
-            if (__res_arg > __cap)
-                __new_data = __alloc_traits::allocate(__alloc(), __res_arg+1);
-            else
-            {
-            #ifndef _LIBCPP_NO_EXCEPTIONS
-                try
-                {
-            #endif  // _LIBCPP_NO_EXCEPTIONS
-                    __new_data = __alloc_traits::allocate(__alloc(), __res_arg+1);
-            #ifndef _LIBCPP_NO_EXCEPTIONS
-                }
-                catch (...)
-                {
-                    return;
-                }
-            #else  // _LIBCPP_NO_EXCEPTIONS
-                if (__new_data == nullptr)
-                    return;
-            #endif  // _LIBCPP_NO_EXCEPTIONS
-            }
-            __now_long = true;
-            __was_long = __is_long();
-            __p = __get_pointer();
-        }
-        traits_type::copy(_VSTD::__to_raw_pointer(__new_data),
-                          _VSTD::__to_raw_pointer(__p), size()+1);
-        if (__was_long)
-            __alloc_traits::deallocate(__alloc(), __p, __cap+1);
-        if (__now_long)
-        {
-            __set_long_cap(__res_arg+1);
-            __set_long_size(__sz);
-            __set_long_pointer(__new_data);
-        }
-        else
-            __set_short_size(__sz);
-        __invalidate_all_iterators();
-    }
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::const_reference
-basic_string<_CharT, _Traits, _Allocator>::operator[](size_type __pos) const
-{
-    _LIBCPP_ASSERT(__pos <= size(), "string index out of bounds");
-    return *(data() + __pos);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::reference
-basic_string<_CharT, _Traits, _Allocator>::operator[](size_type __pos)
-{
-    _LIBCPP_ASSERT(__pos <= size(), "string index out of bounds");
-    return *(__get_pointer() + __pos);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::const_reference
-basic_string<_CharT, _Traits, _Allocator>::at(size_type __n) const
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return (*this)[__n];
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::reference
-basic_string<_CharT, _Traits, _Allocator>::at(size_type __n)
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return (*this)[__n];
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::reference
-basic_string<_CharT, _Traits, _Allocator>::front()
-{
-    _LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
-    return *__get_pointer();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::const_reference
-basic_string<_CharT, _Traits, _Allocator>::front() const
-{
-    _LIBCPP_ASSERT(!empty(), "string::front(): string is empty");
-    return *data();
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::reference
-basic_string<_CharT, _Traits, _Allocator>::back()
-{
-    _LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
-    return *(__get_pointer() + size() - 1);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::const_reference
-basic_string<_CharT, _Traits, _Allocator>::back() const
-{
-    _LIBCPP_ASSERT(!empty(), "string::back(): string is empty");
-    return *(data() + size() - 1);
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::copy(value_type* __s, size_type __n, size_type __pos) const
-{
-    size_type __sz = size();
-    if (__pos > __sz)
-        this->__throw_out_of_range();
-    size_type __rlen = _VSTD::min(__n, __sz - __pos);
-    traits_type::copy(__s, data() + __pos, __rlen);
-    return __rlen;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-basic_string<_CharT, _Traits, _Allocator>::substr(size_type __pos, size_type __n) const
-{
-    return basic_string(*this, __pos, __n, __alloc());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-basic_string<_CharT, _Traits, _Allocator>::swap(basic_string& __str)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    if (!__is_long())
-        __get_db()->__invalidate_all(this);
-    if (!__str.__is_long())
-        __get_db()->__invalidate_all(&__str);
-    __get_db()->swap(this, &__str);
-#endif
-    _VSTD::swap(__r_.first(), __str.__r_.first());
-    __swap_alloc(__alloc(), __str.__alloc());
-}
-
-// find
-
-template <class _Traits>
-struct _LIBCPP_HIDDEN __traits_eq
-{
-    typedef typename _Traits::char_type char_type;
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const char_type& __x, const char_type& __y) _NOEXCEPT
-        {return _Traits::eq(__x, __y);}
-};
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find(const value_type* __s,
-                                                size_type __pos,
-                                                size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find(): received nullptr");
-    return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find(const basic_string& __str,
-                                                size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find(const value_type* __s,
-                                                size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find(): received nullptr");
-    return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find(value_type __c,
-                                                size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find<value_type, size_type, traits_type, npos>
-        (data(), size(), __c, __pos);
-}
-
-// rfind
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::rfind(const value_type* __s,
-                                                 size_type __pos,
-                                                 size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::rfind(): received nullptr");
-    return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::rfind(const basic_string& __str,
-                                                 size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::rfind(const value_type* __s,
-                                                 size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::rfind(): received nullptr");
-    return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::rfind(value_type __c,
-                                                 size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_rfind<value_type, size_type, traits_type, npos>
-        (data(), size(), __c, __pos);
-}
-
-// find_first_of
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_of(const value_type* __s,
-                                                         size_type __pos,
-                                                         size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find_first_of(): received nullptr");
-    return _VSTD::__str_find_first_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_of(const basic_string& __str,
-                                                         size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_first_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_of(const value_type* __s,
-                                                         size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find_first_of(): received nullptr");
-    return _VSTD::__str_find_first_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_of(value_type __c,
-                                                         size_type __pos) const _NOEXCEPT
-{
-    return find(__c, __pos);
-}
-
-// find_last_of
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_of(const value_type* __s,
-                                                        size_type __pos,
-                                                        size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find_last_of(): received nullptr");
-    return _VSTD::__str_find_last_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_of(const basic_string& __str,
-                                                        size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_last_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_of(const value_type* __s,
-                                                        size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find_last_of(): received nullptr");
-    return _VSTD::__str_find_last_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_of(value_type __c,
-                                                        size_type __pos) const _NOEXCEPT
-{
-    return rfind(__c, __pos);
-}
-
-// find_first_not_of
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const value_type* __s,
-                                                             size_type __pos,
-                                                             size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find_first_not_of(): received nullptr");
-    return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const basic_string& __str,
-                                                             size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(const value_type* __s,
-                                                             size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find_first_not_of(): received nullptr");
-    return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_first_not_of(value_type __c,
-                                                             size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_first_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __c, __pos);
-}
-
-// find_last_not_of
-
-template<class _CharT, class _Traits, class _Allocator>
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const value_type* __s,
-                                                            size_type __pos,
-                                                            size_type __n) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__n == 0 || __s != nullptr, "string::find_last_not_of(): received nullptr");
-    return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, __n);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const basic_string& __str,
-                                                            size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __str.data(), __pos, __str.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(const value_type* __s,
-                                                            size_type __pos) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::find_last_not_of(): received nullptr");
-    return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __s, __pos, traits_type::length(__s));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename basic_string<_CharT, _Traits, _Allocator>::size_type
-basic_string<_CharT, _Traits, _Allocator>::find_last_not_of(value_type __c,
-                                                            size_type __pos) const _NOEXCEPT
-{
-    return _VSTD::__str_find_last_not_of<value_type, size_type, traits_type, npos>
-        (data(), size(), __c, __pos);
-}
-
-// compare
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(const basic_string& __str) const _NOEXCEPT
-{
-    size_t __lhs_sz = size();
-    size_t __rhs_sz = __str.size();
-    int __result = traits_type::compare(data(), __str.data(),
-                                        _VSTD::min(__lhs_sz, __rhs_sz));
-    if (__result != 0)
-        return __result;
-    if (__lhs_sz < __rhs_sz)
-        return -1;
-    if (__lhs_sz > __rhs_sz)
-        return 1;
-    return 0;
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
-                                                   size_type __n1,
-                                                   const basic_string& __str) const
-{
-    return compare(__pos1, __n1, __str.data(), __str.size());
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
-                                                   size_type __n1,
-                                                   const basic_string& __str,
-                                                   size_type __pos2,
-                                                   size_type __n2) const
-{
-    size_type __sz = __str.size();
-    if (__pos2 > __sz)
-        this->__throw_out_of_range();
-    return compare(__pos1, __n1, __str.data() + __pos2, _VSTD::min(__n2,
-                                                                  __sz - __pos2));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(const value_type* __s) const _NOEXCEPT
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::compare(): received nullptr");
-    return compare(0, npos, __s, traits_type::length(__s));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
-                                                   size_type __n1,
-                                                   const value_type* __s) const
-{
-    _LIBCPP_ASSERT(__s != nullptr, "string::compare(): received nullptr");
-    return compare(__pos1, __n1, __s, traits_type::length(__s));
-}
-
-template <class _CharT, class _Traits, class _Allocator>
-int
-basic_string<_CharT, _Traits, _Allocator>::compare(size_type __pos1,
-                                                   size_type __n1,
-                                                   const value_type* __s,
-                                                   size_type __n2) const
-{
-    _LIBCPP_ASSERT(__n2 == 0 || __s != nullptr, "string::compare(): received nullptr");
-    size_type __sz = size();
-    if (__pos1 > __sz || __n2 == npos)
-        this->__throw_out_of_range();
-    size_type __rlen = _VSTD::min(__n1, __sz - __pos1);
-    int __r = traits_type::compare(data() + __pos1, __s, _VSTD::min(__rlen, __n2));
-    if (__r == 0)
-    {
-        if (__rlen < __n2)
-            __r = -1;
-        else if (__rlen > __n2)
-            __r = 1;
-    }
-    return __r;
-}
-
-// __invariants
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-basic_string<_CharT, _Traits, _Allocator>::__invariants() const
-{
-    if (size() > capacity())
-        return false;
-    if (capacity() < __min_cap - 1)
-        return false;
-    if (data() == 0)
-        return false;
-    if (data()[size()] != value_type(0))
-        return false;
-    return true;
-}
-
-// operator==
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    size_t __lhs_sz = __lhs.size();
-    return __lhs_sz == __rhs.size() && _Traits::compare(__lhs.data(),
-                                                        __rhs.data(),
-                                                        __lhs_sz) == 0;
-}
-
-template<class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const basic_string<char, char_traits<char>, _Allocator>& __lhs,
-           const basic_string<char, char_traits<char>, _Allocator>& __rhs) _NOEXCEPT
-{
-    size_t __lhs_sz = __lhs.size();
-    if (__lhs_sz != __rhs.size())
-        return false;
-    const char* __lp = __lhs.data();
-    const char* __rp = __rhs.data();
-    if (__lhs.__is_long())
-        return char_traits<char>::compare(__lp, __rp, __lhs_sz) == 0;
-    for (; __lhs_sz != 0; --__lhs_sz, ++__lp, ++__rp)
-        if (*__lp != *__rp)
-            return false;
-    return true;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __rhs.compare(__lhs) == 0;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return __lhs.compare(__rhs) == 0;
-}
-
-// operator!=
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__lhs == __rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__lhs == __rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return !(__lhs == __rhs);
-}
-
-// operator<
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __lhs.compare(__rhs) < 0;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return __lhs.compare(__rhs) < 0;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __rhs.compare(__lhs) > 0;
-}
-
-// operator>
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __rhs < __lhs;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return __rhs < __lhs;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return __rhs < __lhs;
-}
-
-// operator<=
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__rhs < __lhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return !(__rhs < __lhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__rhs < __lhs);
-}
-
-// operator>=
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__lhs < __rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-           const _CharT* __rhs) _NOEXCEPT
-{
-    return !(__lhs < __rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const _CharT* __lhs,
-           const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
-{
-    return !(__lhs < __rhs);
-}
-
-// operator +
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
-          const basic_string<_CharT, _Traits, _Allocator>& __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__lhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __lhs_sz = __lhs.size();
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __rhs_sz = __rhs.size();
-    __r.__init(__lhs.data(), __lhs_sz, __lhs_sz + __rhs_sz);
-    __r.append(__rhs.data(), __rhs_sz);
-    return __r;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const _CharT* __lhs , const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__rhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __lhs_sz = _Traits::length(__lhs);
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __rhs_sz = __rhs.size();
-    __r.__init(__lhs, __lhs_sz, __lhs_sz + __rhs_sz);
-    __r.append(__rhs.data(), __rhs_sz);
-    return __r;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(_CharT __lhs, const basic_string<_CharT,_Traits,_Allocator>& __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__rhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __rhs_sz = __rhs.size();
-    __r.__init(&__lhs, 1, 1 + __rhs_sz);
-    __r.append(__rhs.data(), __rhs_sz);
-    return __r;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, const _CharT* __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__lhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __lhs_sz = __lhs.size();
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __rhs_sz = _Traits::length(__rhs);
-    __r.__init(__lhs.data(), __lhs_sz, __lhs_sz + __rhs_sz);
-    __r.append(__rhs, __rhs_sz);
-    return __r;
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, _CharT __rhs)
-{
-    basic_string<_CharT, _Traits, _Allocator> __r(__lhs.get_allocator());
-    typename basic_string<_CharT, _Traits, _Allocator>::size_type __lhs_sz = __lhs.size();
-    __r.__init(__lhs.data(), __lhs_sz, __lhs_sz + 1);
-    __r.push_back(__rhs);
-    return __r;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const basic_string<_CharT, _Traits, _Allocator>& __rhs)
-{
-    return _VSTD::move(__lhs.append(__rhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const basic_string<_CharT, _Traits, _Allocator>& __lhs, basic_string<_CharT, _Traits, _Allocator>&& __rhs)
-{
-    return _VSTD::move(__rhs.insert(0, __lhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, basic_string<_CharT, _Traits, _Allocator>&& __rhs)
-{
-    return _VSTD::move(__lhs.append(__rhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(const _CharT* __lhs , basic_string<_CharT,_Traits,_Allocator>&& __rhs)
-{
-    return _VSTD::move(__rhs.insert(0, __lhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(_CharT __lhs, basic_string<_CharT,_Traits,_Allocator>&& __rhs)
-{
-    __rhs.insert(__rhs.begin(), __lhs);
-    return _VSTD::move(__rhs);
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, const _CharT* __rhs)
-{
-    return _VSTD::move(__lhs.append(__rhs));
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_string<_CharT, _Traits, _Allocator>
-operator+(basic_string<_CharT, _Traits, _Allocator>&& __lhs, _CharT __rhs)
-{
-    __lhs.push_back(__rhs);
-    return _VSTD::move(__lhs);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-// swap
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(basic_string<_CharT, _Traits, _Allocator>& __lhs,
-     basic_string<_CharT, _Traits, _Allocator>& __rhs)
-     _NOEXCEPT_(_NOEXCEPT_(__lhs.swap(__rhs)))
-{
-    __lhs.swap(__rhs);
-}
-
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-
-typedef basic_string<char16_t> u16string;
-typedef basic_string<char32_t> u32string;
-
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-
-_LIBCPP_FUNC_VIS int                stoi  (const string& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS long               stol  (const string& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS unsigned long      stoul (const string& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS long long          stoll (const string& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS unsigned long long stoull(const string& __str, size_t* __idx = 0, int __base = 10);
-
-_LIBCPP_FUNC_VIS float       stof (const string& __str, size_t* __idx = 0);
-_LIBCPP_FUNC_VIS double      stod (const string& __str, size_t* __idx = 0);
-_LIBCPP_FUNC_VIS long double stold(const string& __str, size_t* __idx = 0);
-
-_LIBCPP_FUNC_VIS string to_string(int __val);
-_LIBCPP_FUNC_VIS string to_string(unsigned __val);
-_LIBCPP_FUNC_VIS string to_string(long __val);
-_LIBCPP_FUNC_VIS string to_string(unsigned long __val);
-_LIBCPP_FUNC_VIS string to_string(long long __val);
-_LIBCPP_FUNC_VIS string to_string(unsigned long long __val);
-_LIBCPP_FUNC_VIS string to_string(float __val);
-_LIBCPP_FUNC_VIS string to_string(double __val);
-_LIBCPP_FUNC_VIS string to_string(long double __val);
-
-_LIBCPP_FUNC_VIS int                stoi  (const wstring& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS long               stol  (const wstring& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS unsigned long      stoul (const wstring& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS long long          stoll (const wstring& __str, size_t* __idx = 0, int __base = 10);
-_LIBCPP_FUNC_VIS unsigned long long stoull(const wstring& __str, size_t* __idx = 0, int __base = 10);
-
-_LIBCPP_FUNC_VIS float       stof (const wstring& __str, size_t* __idx = 0);
-_LIBCPP_FUNC_VIS double      stod (const wstring& __str, size_t* __idx = 0);
-_LIBCPP_FUNC_VIS long double stold(const wstring& __str, size_t* __idx = 0);
-
-_LIBCPP_FUNC_VIS wstring to_wstring(int __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(unsigned __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(long __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(unsigned long __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(long long __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(unsigned long long __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(float __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(double __val);
-_LIBCPP_FUNC_VIS wstring to_wstring(long double __val);
-
-template<class _CharT, class _Traits, class _Allocator>
-    const typename basic_string<_CharT, _Traits, _Allocator>::size_type
-                   basic_string<_CharT, _Traits, _Allocator>::npos;
-
-template<class _CharT, class _Traits, class _Allocator>
-struct _LIBCPP_TYPE_VIS_ONLY hash<basic_string<_CharT, _Traits, _Allocator> >
-    : public unary_function<basic_string<_CharT, _Traits, _Allocator>, size_t>
-{
-    size_t
-        operator()(const basic_string<_CharT, _Traits, _Allocator>& __val) const _NOEXCEPT;
-};
-
-template<class _CharT, class _Traits, class _Allocator>
-size_t
-hash<basic_string<_CharT, _Traits, _Allocator> >::operator()(
-        const basic_string<_CharT, _Traits, _Allocator>& __val) const _NOEXCEPT
-{
-    return __do_string_hash(__val.data(), __val.data() + __val.size());
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_ostream<_CharT, _Traits>&
-operator<<(basic_ostream<_CharT, _Traits>& __os,
-           const basic_string<_CharT, _Traits, _Allocator>& __str);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-operator>>(basic_istream<_CharT, _Traits>& __is,
-           basic_string<_CharT, _Traits, _Allocator>& __str);
-
-template<class _CharT, class _Traits, class _Allocator>
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm);
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str);
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>&& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str, _CharT __dlm);
-
-template<class _CharT, class _Traits, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-basic_istream<_CharT, _Traits>&
-getline(basic_istream<_CharT, _Traits>&& __is,
-        basic_string<_CharT, _Traits, _Allocator>& __str);
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-template<class _CharT, class _Traits, class _Allocator>
-bool
-basic_string<_CharT, _Traits, _Allocator>::__dereferenceable(const const_iterator* __i) const
-{
-    return this->data() <= _VSTD::__to_raw_pointer(__i->base()) &&
-           _VSTD::__to_raw_pointer(__i->base()) < this->data() + this->size();
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-bool
-basic_string<_CharT, _Traits, _Allocator>::__decrementable(const const_iterator* __i) const
-{
-    return this->data() < _VSTD::__to_raw_pointer(__i->base()) &&
-           _VSTD::__to_raw_pointer(__i->base()) <= this->data() + this->size();
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-bool
-basic_string<_CharT, _Traits, _Allocator>::__addable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    const value_type* __p = _VSTD::__to_raw_pointer(__i->base()) + __n;
-    return this->data() <= __p && __p <= this->data() + this->size();
-}
-
-template<class _CharT, class _Traits, class _Allocator>
-bool
-basic_string<_CharT, _Traits, _Allocator>::__subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    const value_type* __p = _VSTD::__to_raw_pointer(__i->base()) + __n;
-    return this->data() <= __p && __p < this->data() + this->size();
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-#if _LIBCPP_STD_VER > 11 
-// Literal suffixes for basic_string [basic.string.literals]
-inline namespace literals
-{
-  inline namespace string_literals
-  {
-    inline _LIBCPP_INLINE_VISIBILITY
-    basic_string<char> operator "" s( const char *__str, size_t __len )
-    {
-        return basic_string<char> (__str, __len);
-    }
-
-    inline _LIBCPP_INLINE_VISIBILITY
-    basic_string<wchar_t> operator "" s( const wchar_t *__str, size_t __len )
-    {
-        return basic_string<wchar_t> (__str, __len);
-    }
-
-    inline _LIBCPP_INLINE_VISIBILITY
-    basic_string<char16_t> operator "" s( const char16_t *__str, size_t __len )
-    {
-        return basic_string<char16_t> (__str, __len);
-    }
-
-    inline _LIBCPP_INLINE_VISIBILITY
-    basic_string<char32_t> operator "" s( const char32_t *__str, size_t __len )
-    {
-        return basic_string<char32_t> (__str, __len);
-    }
-  }
-}
-#endif
-
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_string<char>)
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS basic_string<wchar_t>)
-_LIBCPP_EXTERN_TEMPLATE(string operator+<char, char_traits<char>, allocator<char> >(char const*, string const&))
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_STRING
diff --git a/include.new/c++/v1/tr1/strstream b/include.new/c++/v1/tr1/strstream
deleted file mode 100644
index 81eef2a..0000000
--- a/include.new/c++/v1/tr1/strstream
+++ /dev/null
@@ -1,400 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- strstream --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_STRSTREAM
-#define _LIBCPP_STRSTREAM
-
-/*
-    strstream synopsis
-
-class strstreambuf
-    : public basic_streambuf<char>
-{
-public:
-    explicit strstreambuf(streamsize alsize_arg = 0);
-    strstreambuf(void* (*palloc_arg)(size_t), void (*pfree_arg)(void*));
-    strstreambuf(char* gnext_arg, streamsize n, char* pbeg_arg = 0);
-    strstreambuf(const char* gnext_arg, streamsize n);
-
-    strstreambuf(signed char* gnext_arg, streamsize n, signed char* pbeg_arg = 0);
-    strstreambuf(const signed char* gnext_arg, streamsize n);
-    strstreambuf(unsigned char* gnext_arg, streamsize n, unsigned char* pbeg_arg = 0);
-    strstreambuf(const unsigned char* gnext_arg, streamsize n);
-
-    strstreambuf(strstreambuf&& rhs);
-    strstreambuf& operator=(strstreambuf&& rhs);
-
-    virtual ~strstreambuf();
-
-    void swap(strstreambuf& rhs);
-
-    void freeze(bool freezefl = true);
-    char* str();
-    int pcount() const;
-
-protected:
-    virtual int_type overflow (int_type c = EOF);
-    virtual int_type pbackfail(int_type c = EOF);
-    virtual int_type underflow();
-    virtual pos_type seekoff(off_type off, ios_base::seekdir way,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type sp,
-                             ios_base::openmode which = ios_base::in | ios_base::out);
-    virtual streambuf* setbuf(char* s, streamsize n);
-
-private:
-    typedef T1 strstate;                // exposition only
-    static const strstate allocated;    // exposition only
-    static const strstate constant;     // exposition only
-    static const strstate dynamic;      // exposition only
-    static const strstate frozen;       // exposition only
-    strstate strmode;                   // exposition only
-    streamsize alsize;                  // exposition only
-    void* (*palloc)(size_t);            // exposition only
-    void (*pfree)(void*);               // exposition only
-};
-
-class istrstream
-    : public basic_istream<char>
-{
-public:
-    explicit istrstream(const char* s);
-    explicit istrstream(char* s);
-    istrstream(const char* s, streamsize n);
-    istrstream(char* s, streamsize n);
-
-    virtual ~istrstream();
-
-    strstreambuf* rdbuf() const;
-    char *str();
-
-private:
-    strstreambuf sb; // exposition only
-};
-
-class ostrstream
-    : public basic_ostream<char>
-{
-public:
-    ostrstream();
-    ostrstream(char* s, int n, ios_base::openmode mode = ios_base::out);
-
-    virtual ~ostrstream();
-
-    strstreambuf* rdbuf() const;
-    void freeze(bool freezefl = true);
-    char* str();
-    int pcount() const;
-
-private:
-    strstreambuf sb; // exposition only
-};
-
-class strstream
-    : public basic_iostream<char>
-{
-public:
-    // Types
-    typedef char                        char_type;
-    typedef char_traits<char>::int_type int_type;
-    typedef char_traits<char>::pos_type pos_type;
-    typedef char_traits<char>::off_type off_type;
-
-    // constructors/destructor
-    strstream();
-    strstream(char* s, int n, ios_base::openmode mode = ios_base::in | ios_base::out);
-
-    virtual ~strstream();
-
-    // Members:
-    strstreambuf* rdbuf() const;
-    void freeze(bool freezefl = true);
-    int pcount() const;
-    char* str();
-
-private:
-    strstreambuf sb; // exposition only
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <ostream>
-#include <istream>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS strstreambuf
-    : public streambuf
-{
-public:
-    explicit strstreambuf(streamsize __alsize = 0);
-    strstreambuf(void* (*__palloc)(size_t), void (*__pfree)(void*));
-    strstreambuf(char* __gnext, streamsize __n, char* __pbeg = 0);
-    strstreambuf(const char* __gnext, streamsize __n);
-
-    strstreambuf(signed char* __gnext, streamsize __n, signed char* __pbeg = 0);
-    strstreambuf(const signed char* __gnext, streamsize __n);
-    strstreambuf(unsigned char* __gnext, streamsize __n, unsigned char* __pbeg = 0);
-    strstreambuf(const unsigned char* __gnext, streamsize __n);
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf(strstreambuf&& __rhs);
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf& operator=(strstreambuf&& __rhs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    virtual ~strstreambuf();
-
-    void swap(strstreambuf& __rhs);
-
-    void freeze(bool __freezefl = true);
-    char* str();
-    int pcount() const;
-
-protected:
-    virtual int_type overflow (int_type __c = EOF);
-    virtual int_type pbackfail(int_type __c = EOF);
-    virtual int_type underflow();
-    virtual pos_type seekoff(off_type __off, ios_base::seekdir __way,
-                             ios_base::openmode __which = ios_base::in | ios_base::out);
-    virtual pos_type seekpos(pos_type __sp,
-                             ios_base::openmode __which = ios_base::in | ios_base::out);
-
-private:
-    typedef unsigned __mode_type;
-    static const __mode_type __allocated = 0x01;
-    static const __mode_type __constant  = 0x02;
-    static const __mode_type __dynamic   = 0x04;
-    static const __mode_type __frozen    = 0x08;
-    static const streamsize    __default_alsize = 4096;
-
-    __mode_type __strmode_;
-    streamsize __alsize_;
-    void* (*__palloc_)(size_t);
-    void (*__pfree_)(void*);
-
-    void __init(char* __gnext, streamsize __n, char* __pbeg);
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-inline _LIBCPP_INLINE_VISIBILITY
-strstreambuf::strstreambuf(strstreambuf&& __rhs)
-    : streambuf(__rhs),
-      __strmode_(__rhs.__strmode_),
-      __alsize_(__rhs.__alsize_),
-      __palloc_(__rhs.__palloc_),
-      __pfree_(__rhs.__pfree_)
-{
-    __rhs.setg(nullptr, nullptr, nullptr);
-    __rhs.setp(nullptr, nullptr);
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-strstreambuf&
-strstreambuf::operator=(strstreambuf&& __rhs)
-{
-    if (eback() && (__strmode_ & __allocated) != 0 && (__strmode_ & __frozen) == 0)
-    {
-        if (__pfree_)
-            __pfree_(eback());
-        else
-            delete [] eback();
-    }
-    streambuf::operator=(__rhs);
-    __strmode_ = __rhs.__strmode_;
-    __alsize_ = __rhs.__alsize_;
-    __palloc_ = __rhs.__palloc_;
-    __pfree_ = __rhs.__pfree_;
-    __rhs.setg(nullptr, nullptr, nullptr);
-    __rhs.setp(nullptr, nullptr);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-class _LIBCPP_TYPE_VIS istrstream
-    : public istream
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit istrstream(const char* __s)
-        : istream(&__sb_), __sb_(__s, 0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit istrstream(char* __s)
-        : istream(&__sb_), __sb_(__s, 0) {}
-    _LIBCPP_INLINE_VISIBILITY
-    istrstream(const char* __s, streamsize __n)
-        : istream(&__sb_), __sb_(__s, __n) {}
-    _LIBCPP_INLINE_VISIBILITY
-    istrstream(char* __s, streamsize __n)
-        : istream(&__sb_), __sb_(__s, __n) {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    istrstream(istrstream&& __rhs)
-        : istream(_VSTD::move(__rhs)),
-          __sb_(_VSTD::move(__rhs.__sb_))
-    {
-        istream::set_rdbuf(&__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    istrstream& operator=(istrstream&& __rhs)
-    {
-        istream::operator=(_VSTD::move(__rhs));
-        __sb_ = _VSTD::move(__rhs.__sb_);
-        return *this;
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    virtual ~istrstream();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(istrstream& __rhs)
-    {
-        istream::swap(__rhs);
-        __sb_.swap(__rhs.__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf* rdbuf() const {return const_cast<strstreambuf*>(&__sb_);}
-    _LIBCPP_INLINE_VISIBILITY
-    char *str() {return __sb_.str();}
-
-private:
-    strstreambuf __sb_;
-};
-
-class _LIBCPP_TYPE_VIS ostrstream
-    : public ostream
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    ostrstream()
-        : ostream(&__sb_) {}
-    _LIBCPP_INLINE_VISIBILITY
-    ostrstream(char* __s, int __n, ios_base::openmode __mode = ios_base::out)
-        : ostream(&__sb_),
-          __sb_(__s, __n, __s + (__mode & ios::app ? strlen(__s) : 0))
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    ostrstream(ostrstream&& __rhs)
-        : ostream(_VSTD::move(__rhs)),
-          __sb_(_VSTD::move(__rhs.__sb_))
-    {
-        ostream::set_rdbuf(&__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    ostrstream& operator=(ostrstream&& __rhs)
-    {
-        ostream::operator=(_VSTD::move(__rhs));
-        __sb_ = _VSTD::move(__rhs.__sb_);
-        return *this;
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    virtual ~ostrstream();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(ostrstream& __rhs)
-    {
-        ostream::swap(__rhs);
-        __sb_.swap(__rhs.__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf* rdbuf() const {return const_cast<strstreambuf*>(&__sb_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void freeze(bool __freezefl = true) {__sb_.freeze(__freezefl);}
-    _LIBCPP_INLINE_VISIBILITY
-    char* str()         {return __sb_.str();}
-    _LIBCPP_INLINE_VISIBILITY
-    int pcount() const  {return __sb_.pcount();}
-
-private:
-    strstreambuf __sb_; // exposition only
-};
-
-class _LIBCPP_TYPE_VIS strstream
-    : public iostream
-{
-public:
-    // Types
-    typedef char                        char_type;
-    typedef char_traits<char>::int_type int_type;
-    typedef char_traits<char>::pos_type pos_type;
-    typedef char_traits<char>::off_type off_type;
-
-    // constructors/destructor
-    _LIBCPP_INLINE_VISIBILITY
-    strstream()
-        : iostream(&__sb_) {}
-    _LIBCPP_INLINE_VISIBILITY
-    strstream(char* __s, int __n, ios_base::openmode __mode = ios_base::in | ios_base::out)
-        : iostream(&__sb_),
-          __sb_(__s, __n, __s + (__mode & ios::app ? strlen(__s) : 0))
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    strstream(strstream&& __rhs)
-        : iostream(_VSTD::move(__rhs)),
-          __sb_(_VSTD::move(__rhs.__sb_))
-    {
-        iostream::set_rdbuf(&__sb_);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    strstream& operator=(strstream&& __rhs)
-    {
-        iostream::operator=(_VSTD::move(__rhs));
-        __sb_ = _VSTD::move(__rhs.__sb_);
-        return *this;
-    }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    virtual ~strstream();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(strstream& __rhs)
-    {
-        iostream::swap(__rhs);
-        __sb_.swap(__rhs.__sb_);
-    }
-
-    // Members:
-    _LIBCPP_INLINE_VISIBILITY
-    strstreambuf* rdbuf() const {return const_cast<strstreambuf*>(&__sb_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void freeze(bool __freezefl = true) {__sb_.freeze(__freezefl);}
-    _LIBCPP_INLINE_VISIBILITY
-    int pcount() const {return __sb_.pcount();}
-    _LIBCPP_INLINE_VISIBILITY
-    char* str()        {return __sb_.str();}
-
-private:
-    strstreambuf __sb_; // exposition only
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_STRSTREAM
diff --git a/include.new/c++/v1/tr1/system_error b/include.new/c++/v1/tr1/system_error
deleted file mode 100644
index 66bf6d6..0000000
--- a/include.new/c++/v1/tr1/system_error
+++ /dev/null
@@ -1,642 +0,0 @@
-// -*- C++ -*-
-//===---------------------------- system_error ----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_SYSTEM_ERROR
-#define _LIBCPP_SYSTEM_ERROR
-
-/*
-    system_error synopsis
-
-namespace std
-{
-
-class error_category
-{
-public:
-    virtual ~error_category() noexcept;
-
-    constexpr error_category();
-    error_category(const error_category&) = delete;
-    error_category& operator=(const error_category&) = delete;
-
-    virtual const char* name() const noexcept = 0;
-    virtual error_condition default_error_condition(int ev) const noexcept;
-    virtual bool equivalent(int code, const error_condition& condition) const noexcept;
-    virtual bool equivalent(const error_code& code, int condition) const noexcept;
-    virtual string message(int ev) const = 0;
-
-    bool operator==(const error_category& rhs) const noexcept;
-    bool operator!=(const error_category& rhs) const noexcept;
-    bool operator<(const error_category& rhs) const noexcept;
-};
-
-const error_category& generic_category() noexcept;
-const error_category& system_category() noexcept;
-
-template <class T> struct is_error_code_enum
-    : public false_type {};
-
-template <class T> struct is_error_condition_enum
-    : public false_type {};
-
-class error_code
-{
-public:
-    // constructors:
-    error_code() noexcept;
-    error_code(int val, const error_category& cat) noexcept;
-    template <class ErrorCodeEnum>
-        error_code(ErrorCodeEnum e) noexcept;
-
-    // modifiers:
-    void assign(int val, const error_category& cat) noexcept;
-    template <class ErrorCodeEnum>
-        error_code& operator=(ErrorCodeEnum e) noexcept;
-    void clear() noexcept;
-
-    // observers:
-    int value() const noexcept;
-    const error_category& category() const noexcept;
-    error_condition default_error_condition() const noexcept;
-    string message() const;
-    explicit operator bool() const noexcept;
-};
-
-// non-member functions:
-bool operator<(const error_code& lhs, const error_code& rhs) noexcept;
-template <class charT, class traits>
-    basic_ostream<charT,traits>&
-    operator<<(basic_ostream<charT,traits>& os, const error_code& ec);
-
-class error_condition
-{
-public:
-    // constructors:
-    error_condition() noexcept;
-    error_condition(int val, const error_category& cat) noexcept;
-    template <class ErrorConditionEnum>
-        error_condition(ErrorConditionEnum e) noexcept;
-
-    // modifiers:
-    void assign(int val, const error_category& cat) noexcept;
-    template <class ErrorConditionEnum>
-        error_condition& operator=(ErrorConditionEnum e) noexcept;
-    void clear() noexcept;
-
-    // observers:
-    int value() const noexcept;
-    const error_category& category() const noexcept;
-    string message() const noexcept;
-    explicit operator bool() const noexcept;
-};
-
-bool operator<(const error_condition& lhs, const error_condition& rhs) noexcept;
-
-class system_error
-    : public runtime_error
-{
-public:
-    system_error(error_code ec, const string& what_arg);
-    system_error(error_code ec, const char* what_arg);
-    system_error(error_code ec);
-    system_error(int ev, const error_category& ecat, const string& what_arg);
-    system_error(int ev, const error_category& ecat, const char* what_arg);
-    system_error(int ev, const error_category& ecat);
-
-    const error_code& code() const noexcept;
-    const char* what() const noexcept;
-};
-
-enum class errc
-{
-    address_family_not_supported,       // EAFNOSUPPORT
-    address_in_use,                     // EADDRINUSE
-    address_not_available,              // EADDRNOTAVAIL
-    already_connected,                  // EISCONN
-    argument_list_too_long,             // E2BIG
-    argument_out_of_domain,             // EDOM
-    bad_address,                        // EFAULT
-    bad_file_descriptor,                // EBADF
-    bad_message,                        // EBADMSG
-    broken_pipe,                        // EPIPE
-    connection_aborted,                 // ECONNABORTED
-    connection_already_in_progress,     // EALREADY
-    connection_refused,                 // ECONNREFUSED
-    connection_reset,                   // ECONNRESET
-    cross_device_link,                  // EXDEV
-    destination_address_required,       // EDESTADDRREQ
-    device_or_resource_busy,            // EBUSY
-    directory_not_empty,                // ENOTEMPTY
-    executable_format_error,            // ENOEXEC
-    file_exists,                        // EEXIST
-    file_too_large,                     // EFBIG
-    filename_too_long,                  // ENAMETOOLONG
-    function_not_supported,             // ENOSYS
-    host_unreachable,                   // EHOSTUNREACH
-    identifier_removed,                 // EIDRM
-    illegal_byte_sequence,              // EILSEQ
-    inappropriate_io_control_operation, // ENOTTY
-    interrupted,                        // EINTR
-    invalid_argument,                   // EINVAL
-    invalid_seek,                       // ESPIPE
-    io_error,                           // EIO
-    is_a_directory,                     // EISDIR
-    message_size,                       // EMSGSIZE
-    network_down,                       // ENETDOWN
-    network_reset,                      // ENETRESET
-    network_unreachable,                // ENETUNREACH
-    no_buffer_space,                    // ENOBUFS
-    no_child_process,                   // ECHILD
-    no_link,                            // ENOLINK
-    no_lock_available,                  // ENOLCK
-    no_message_available,               // ENODATA
-    no_message,                         // ENOMSG
-    no_protocol_option,                 // ENOPROTOOPT
-    no_space_on_device,                 // ENOSPC
-    no_stream_resources,                // ENOSR
-    no_such_device_or_address,          // ENXIO
-    no_such_device,                     // ENODEV
-    no_such_file_or_directory,          // ENOENT
-    no_such_process,                    // ESRCH
-    not_a_directory,                    // ENOTDIR
-    not_a_socket,                       // ENOTSOCK
-    not_a_stream,                       // ENOSTR
-    not_connected,                      // ENOTCONN
-    not_enough_memory,                  // ENOMEM
-    not_supported,                      // ENOTSUP
-    operation_canceled,                 // ECANCELED
-    operation_in_progress,              // EINPROGRESS
-    operation_not_permitted,            // EPERM
-    operation_not_supported,            // EOPNOTSUPP
-    operation_would_block,              // EWOULDBLOCK
-    owner_dead,                         // EOWNERDEAD
-    permission_denied,                  // EACCES
-    protocol_error,                     // EPROTO
-    protocol_not_supported,             // EPROTONOSUPPORT
-    read_only_file_system,              // EROFS
-    resource_deadlock_would_occur,      // EDEADLK
-    resource_unavailable_try_again,     // EAGAIN
-    result_out_of_range,                // ERANGE
-    state_not_recoverable,              // ENOTRECOVERABLE
-    stream_timeout,                     // ETIME
-    text_file_busy,                     // ETXTBSY
-    timed_out,                          // ETIMEDOUT
-    too_many_files_open_in_system,      // ENFILE
-    too_many_files_open,                // EMFILE
-    too_many_links,                     // EMLINK
-    too_many_symbolic_link_levels,      // ELOOP
-    value_too_large,                    // EOVERFLOW
-    wrong_protocol_type                 // EPROTOTYPE
-};
-
-template <> struct is_error_condition_enum<errc>
-    : true_type { }
-
-error_code make_error_code(errc e) noexcept;
-error_condition make_error_condition(errc e) noexcept;
-
-// Comparison operators:
-bool operator==(const error_code& lhs, const error_code& rhs) noexcept;
-bool operator==(const error_code& lhs, const error_condition& rhs) noexcept;
-bool operator==(const error_condition& lhs, const error_code& rhs) noexcept;
-bool operator==(const error_condition& lhs, const error_condition& rhs) noexcept;
-bool operator!=(const error_code& lhs, const error_code& rhs) noexcept;
-bool operator!=(const error_code& lhs, const error_condition& rhs) noexcept;
-bool operator!=(const error_condition& lhs, const error_code& rhs) noexcept;
-bool operator!=(const error_condition& lhs, const error_condition& rhs) noexcept;
-
-template <> struct hash<std::error_code>;
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cerrno>
-#include <type_traits>
-#include <stdexcept>
-#include <__functional_base>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-// is_error_code_enum
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_code_enum
-    : public false_type {};
-
-// is_error_condition_enum
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_condition_enum
-    : public false_type {};
-
-// Some error codes are not present on all platforms, so we provide equivalents
-// for them:
-
-//enum class errc
-_LIBCPP_DECLARE_STRONG_ENUM(errc)
-{
-    address_family_not_supported        = EAFNOSUPPORT,
-    address_in_use                      = EADDRINUSE,
-    address_not_available               = EADDRNOTAVAIL,
-    already_connected                   = EISCONN,
-    argument_list_too_long              = E2BIG,
-    argument_out_of_domain              = EDOM,
-    bad_address                         = EFAULT,
-    bad_file_descriptor                 = EBADF,
-    bad_message                         = EBADMSG,
-    broken_pipe                         = EPIPE,
-    connection_aborted                  = ECONNABORTED,
-    connection_already_in_progress      = EALREADY,
-    connection_refused                  = ECONNREFUSED,
-    connection_reset                    = ECONNRESET,
-    cross_device_link                   = EXDEV,
-    destination_address_required        = EDESTADDRREQ,
-    device_or_resource_busy             = EBUSY,
-    directory_not_empty                 = ENOTEMPTY,
-    executable_format_error             = ENOEXEC,
-    file_exists                         = EEXIST,
-    file_too_large                      = EFBIG,
-    filename_too_long                   = ENAMETOOLONG,
-    function_not_supported              = ENOSYS,
-    host_unreachable                    = EHOSTUNREACH,
-    identifier_removed                  = EIDRM,
-    illegal_byte_sequence               = EILSEQ,
-    inappropriate_io_control_operation  = ENOTTY,
-    interrupted                         = EINTR,
-    invalid_argument                    = EINVAL,
-    invalid_seek                        = ESPIPE,
-    io_error                            = EIO,
-    is_a_directory                      = EISDIR,
-    message_size                        = EMSGSIZE,
-    network_down                        = ENETDOWN,
-    network_reset                       = ENETRESET,
-    network_unreachable                 = ENETUNREACH,
-    no_buffer_space                     = ENOBUFS,
-    no_child_process                    = ECHILD,
-    no_link                             = ENOLINK,
-    no_lock_available                   = ENOLCK,
-#ifdef ENODATA
-    no_message_available                = ENODATA,
-#else
-    no_message_available                = ENOMSG,
-#endif
-    no_message                          = ENOMSG,
-    no_protocol_option                  = ENOPROTOOPT,
-    no_space_on_device                  = ENOSPC,
-#ifdef ENOSR
-    no_stream_resources                 = ENOSR,
-#else
-    no_stream_resources                 = ENOMEM,
-#endif
-    no_such_device_or_address           = ENXIO,
-    no_such_device                      = ENODEV,
-    no_such_file_or_directory           = ENOENT,
-    no_such_process                     = ESRCH,
-    not_a_directory                     = ENOTDIR,
-    not_a_socket                        = ENOTSOCK,
-#ifdef ENOSTR
-    not_a_stream                        = ENOSTR,
-#else
-    not_a_stream                        = EINVAL,
-#endif
-    not_connected                       = ENOTCONN,
-    not_enough_memory                   = ENOMEM,
-    not_supported                       = ENOTSUP,
-    operation_canceled                  = ECANCELED,
-    operation_in_progress               = EINPROGRESS,
-    operation_not_permitted             = EPERM,
-    operation_not_supported             = EOPNOTSUPP,
-    operation_would_block               = EWOULDBLOCK,
-    owner_dead                          = EOWNERDEAD,
-    permission_denied                   = EACCES,
-    protocol_error                      = EPROTO,
-    protocol_not_supported              = EPROTONOSUPPORT,
-    read_only_file_system               = EROFS,
-    resource_deadlock_would_occur       = EDEADLK,
-    resource_unavailable_try_again      = EAGAIN,
-    result_out_of_range                 = ERANGE,
-    state_not_recoverable               = ENOTRECOVERABLE,
-#ifdef ETIME
-    stream_timeout                      = ETIME,
-#else
-    stream_timeout                      = ETIMEDOUT,
-#endif
-    text_file_busy                      = ETXTBSY,
-    timed_out                           = ETIMEDOUT,
-    too_many_files_open_in_system       = ENFILE,
-    too_many_files_open                 = EMFILE,
-    too_many_links                      = EMLINK,
-    too_many_symbolic_link_levels       = ELOOP,
-    value_too_large                     = EOVERFLOW,
-    wrong_protocol_type                 = EPROTOTYPE
-};
-_LIBCPP_DECLARE_STRONG_ENUM_EPILOG(errc)
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_condition_enum<errc>
-    : true_type { };
-
-#ifdef _LIBCPP_HAS_NO_STRONG_ENUMS
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY is_error_condition_enum<errc::__lx>
-    : true_type { };
-#endif
-
-class _LIBCPP_TYPE_VIS error_condition;
-class _LIBCPP_TYPE_VIS error_code;
-
-// class error_category
-
-class _LIBCPP_HIDDEN __do_message;
-
-class _LIBCPP_TYPE_VIS error_category
-{
-public:
-    virtual ~error_category() _NOEXCEPT;
-
-#ifdef _LIBCPP_BUILDING_SYSTEM_ERROR
-    error_category() _NOEXCEPT;
-#else
-    _LIBCPP_ALWAYS_INLINE
-    _LIBCPP_CONSTEXPR_AFTER_CXX11 error_category() _NOEXCEPT _LIBCPP_DEFAULT;
-#endif
-private:
-    error_category(const error_category&);// = delete;
-    error_category& operator=(const error_category&);// = delete;
-
-public:
-    virtual const char* name() const _NOEXCEPT = 0;
-    virtual error_condition default_error_condition(int __ev) const _NOEXCEPT;
-    virtual bool equivalent(int __code, const error_condition& __condition) const _NOEXCEPT;
-    virtual bool equivalent(const error_code& __code, int __condition) const _NOEXCEPT;
-    virtual string message(int __ev) const = 0;
-
-    _LIBCPP_ALWAYS_INLINE
-    bool operator==(const error_category& __rhs) const _NOEXCEPT {return this == &__rhs;}
-
-    _LIBCPP_ALWAYS_INLINE
-    bool operator!=(const error_category& __rhs) const _NOEXCEPT {return !(*this == __rhs);}
-
-    _LIBCPP_ALWAYS_INLINE
-    bool operator< (const error_category& __rhs) const _NOEXCEPT {return this < &__rhs;}
-
-    friend class _LIBCPP_HIDDEN __do_message;
-};
-
-class _LIBCPP_HIDDEN __do_message
-    : public error_category
-{
-public:
-    virtual string message(int ev) const;
-};
-
-_LIBCPP_FUNC_VIS const error_category& generic_category() _NOEXCEPT;
-_LIBCPP_FUNC_VIS const error_category& system_category() _NOEXCEPT;
-
-class _LIBCPP_TYPE_VIS error_condition
-{
-    int __val_;
-    const error_category* __cat_;
-public:
-    _LIBCPP_ALWAYS_INLINE
-    error_condition() _NOEXCEPT : __val_(0), __cat_(&generic_category()) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    error_condition(int __val, const error_category& __cat) _NOEXCEPT
-        : __val_(__val), __cat_(&__cat) {}
-
-    template <class _Ep>
-        _LIBCPP_ALWAYS_INLINE
-        error_condition(_Ep __e,
-              typename enable_if<is_error_condition_enum<_Ep>::value>::type* = 0
-                                                                     ) _NOEXCEPT
-            {*this = make_error_condition(__e);}
-
-    _LIBCPP_ALWAYS_INLINE
-    void assign(int __val, const error_category& __cat) _NOEXCEPT
-    {
-        __val_ = __val;
-        __cat_ = &__cat;
-    }
-
-    template <class _Ep>
-        _LIBCPP_ALWAYS_INLINE
-        typename enable_if
-        <
-            is_error_condition_enum<_Ep>::value,
-            error_condition&
-        >::type
-        operator=(_Ep __e) _NOEXCEPT
-            {*this = make_error_condition(__e); return *this;}
-
-    _LIBCPP_ALWAYS_INLINE
-    void clear() _NOEXCEPT
-    {
-        __val_ = 0;
-        __cat_ = &generic_category();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int value() const _NOEXCEPT {return __val_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    const error_category& category() const _NOEXCEPT {return *__cat_;}
-    string message() const;
-
-    _LIBCPP_ALWAYS_INLINE
-        _LIBCPP_EXPLICIT
-        operator bool() const _NOEXCEPT {return __val_ != 0;}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_condition
-make_error_condition(errc __e) _NOEXCEPT
-{
-    return error_condition(static_cast<int>(__e), generic_category());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const error_condition& __x, const error_condition& __y) _NOEXCEPT
-{
-    return __x.category() < __y.category()
-        || (__x.category() == __y.category() && __x.value() < __y.value());
-}
-
-// error_code
-
-class _LIBCPP_TYPE_VIS error_code
-{
-    int __val_;
-    const error_category* __cat_;
-public:
-    _LIBCPP_ALWAYS_INLINE
-    error_code() _NOEXCEPT : __val_(0), __cat_(&system_category()) {}
-
-    _LIBCPP_ALWAYS_INLINE
-    error_code(int __val, const error_category& __cat) _NOEXCEPT
-        : __val_(__val), __cat_(&__cat) {}
-
-    template <class _Ep>
-        _LIBCPP_ALWAYS_INLINE
-        error_code(_Ep __e,
-                   typename enable_if<is_error_code_enum<_Ep>::value>::type* = 0
-                                                                     ) _NOEXCEPT
-            {*this = make_error_code(__e);}
-
-    _LIBCPP_ALWAYS_INLINE
-    void assign(int __val, const error_category& __cat) _NOEXCEPT
-    {
-        __val_ = __val;
-        __cat_ = &__cat;
-    }
-
-    template <class _Ep>
-        _LIBCPP_ALWAYS_INLINE
-        typename enable_if
-        <
-            is_error_code_enum<_Ep>::value,
-            error_code&
-        >::type
-        operator=(_Ep __e) _NOEXCEPT
-            {*this = make_error_code(__e); return *this;}
-
-    _LIBCPP_ALWAYS_INLINE
-    void clear() _NOEXCEPT
-    {
-        __val_ = 0;
-        __cat_ = &system_category();
-    }
-
-    _LIBCPP_ALWAYS_INLINE
-    int value() const _NOEXCEPT {return __val_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    const error_category& category() const _NOEXCEPT {return *__cat_;}
-
-    _LIBCPP_ALWAYS_INLINE
-    error_condition default_error_condition() const _NOEXCEPT
-        {return __cat_->default_error_condition(__val_);}
-
-    string message() const;
-
-    _LIBCPP_ALWAYS_INLINE
-        _LIBCPP_EXPLICIT
-        operator bool() const _NOEXCEPT {return __val_ != 0;}
-};
-
-inline _LIBCPP_INLINE_VISIBILITY
-error_code
-make_error_code(errc __e) _NOEXCEPT
-{
-    return error_code(static_cast<int>(__e), generic_category());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<(const error_code& __x, const error_code& __y) _NOEXCEPT
-{
-    return __x.category() < __y.category()
-        || (__x.category() == __y.category() && __x.value() < __y.value());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const error_code& __x, const error_code& __y) _NOEXCEPT
-{
-    return __x.category() == __y.category() && __x.value() == __y.value();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const error_code& __x, const error_condition& __y) _NOEXCEPT
-{
-    return __x.category().equivalent(__x.value(), __y)
-        || __y.category().equivalent(__x, __y.value());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const error_condition& __x, const error_code& __y) _NOEXCEPT
-{
-    return __y == __x;
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const error_condition& __x, const error_condition& __y) _NOEXCEPT
-{
-    return __x.category() == __y.category() && __x.value() == __y.value();
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const error_code& __x, const error_code& __y) _NOEXCEPT
-{return !(__x == __y);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const error_code& __x, const error_condition& __y) _NOEXCEPT
-{return !(__x == __y);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const error_condition& __x, const error_code& __y) _NOEXCEPT
-{return !(__x == __y);}
-
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const error_condition& __x, const error_condition& __y) _NOEXCEPT
-{return !(__x == __y);}
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<error_code>
-    : public unary_function<error_code, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const error_code& __ec) const _NOEXCEPT
-    {
-        return static_cast<size_t>(__ec.value());
-    }
-};
-
-// system_error
-
-class _LIBCPP_TYPE_VIS system_error
-    : public runtime_error
-{
-    error_code __ec_;
-public:
-    system_error(error_code __ec, const string& __what_arg);
-    system_error(error_code __ec, const char* __what_arg);
-    system_error(error_code __ec);
-    system_error(int __ev, const error_category& __ecat, const string& __what_arg);
-    system_error(int __ev, const error_category& __ecat, const char* __what_arg);
-    system_error(int __ev, const error_category& __ecat);
-    ~system_error() _NOEXCEPT;
-
-    _LIBCPP_ALWAYS_INLINE
-    const error_code& code() const _NOEXCEPT {return __ec_;}
-
-private:
-    static string __init(const error_code&, string);
-};
-
-_LIBCPP_FUNC_VIS void __throw_system_error(int ev, const char* what_arg);
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_SYSTEM_ERROR
diff --git a/include.new/c++/v1/tr1/tgmath.h b/include.new/c++/v1/tr1/tgmath.h
deleted file mode 100644
index fbe1e82..0000000
--- a/include.new/c++/v1/tr1/tgmath.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- tgmath.h ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_TGMATH_H
-#define _LIBCPP_TGMATH_H
-
-/*
-    tgmath.h synopsis
-
-#include <complex.h>
-#include <math.h>
-
-*/
-
-#include <complex.h>
-#include <math.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#endif  // _LIBCPP_TGMATH_H
diff --git a/include.new/c++/v1/tr1/thread b/include.new/c++/v1/tr1/thread
deleted file mode 100644
index 8a30102..0000000
--- a/include.new/c++/v1/tr1/thread
+++ /dev/null
@@ -1,465 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- thread -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_THREAD
-#define _LIBCPP_THREAD
-
-/*
-
-    thread synopsis
-
-#define __STDCPP_THREADS__ __cplusplus
-
-namespace std
-{
-
-class thread
-{
-public:
-    class id;
-    typedef pthread_t native_handle_type;
-
-    thread() noexcept;
-    template <class F, class ...Args> explicit thread(F&& f, Args&&... args);
-    ~thread();
-
-    thread(const thread&) = delete;
-    thread(thread&& t) noexcept;
-
-    thread& operator=(const thread&) = delete;
-    thread& operator=(thread&& t) noexcept;
-
-    void swap(thread& t) noexcept;
-
-    bool joinable() const noexcept;
-    void join();
-    void detach();
-    id get_id() const noexcept;
-    native_handle_type native_handle();
-
-    static unsigned hardware_concurrency() noexcept;
-};
-
-void swap(thread& x, thread& y) noexcept;
-
-class thread::id
-{
-public:
-    id() noexcept;
-};
-
-bool operator==(thread::id x, thread::id y) noexcept;
-bool operator!=(thread::id x, thread::id y) noexcept;
-bool operator< (thread::id x, thread::id y) noexcept;
-bool operator<=(thread::id x, thread::id y) noexcept;
-bool operator> (thread::id x, thread::id y) noexcept;
-bool operator>=(thread::id x, thread::id y) noexcept;
-
-template<class charT, class traits>
-basic_ostream<charT, traits>&
-operator<<(basic_ostream<charT, traits>& out, thread::id id);
-
-namespace this_thread
-{
-
-thread::id get_id() noexcept;
-
-void yield() noexcept;
-
-template <class Clock, class Duration>
-void sleep_until(const chrono::time_point<Clock, Duration>& abs_time);
-
-template <class Rep, class Period>
-void sleep_for(const chrono::duration<Rep, Period>& rel_time);
-
-}  // this_thread
-
-}  // std
-
-*/
-
-#include <__config>
-#include <iosfwd>
-#include <__functional_base>
-#include <type_traits>
-#include <cstddef>
-#include <functional>
-#include <memory>
-#include <system_error>
-#include <chrono>
-#include <__mutex_base>
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-#include <tuple>
-#endif
-#include <pthread.h>
-#include <sched.h>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-#define __STDCPP_THREADS__ __cplusplus
-
-#ifdef _LIBCPP_HAS_NO_THREADS
-#error <thread> is not supported on this single threaded system
-#else // !_LIBCPP_HAS_NO_THREADS
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Tp>
-class __thread_specific_ptr
-{
-    pthread_key_t __key_;
-
-    __thread_specific_ptr(const __thread_specific_ptr&);
-    __thread_specific_ptr& operator=(const __thread_specific_ptr&);
-
-    static void __at_thread_exit(void*);
-public:
-    typedef _Tp* pointer;
-
-    __thread_specific_ptr();
-    ~__thread_specific_ptr();
-
-    _LIBCPP_INLINE_VISIBILITY
-    pointer get() const {return static_cast<_Tp*>(pthread_getspecific(__key_));}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator*() const {return *get();}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return get();}
-    pointer release();
-    void reset(pointer __p = nullptr);
-};
-
-template <class _Tp>
-void
-__thread_specific_ptr<_Tp>::__at_thread_exit(void* __p)
-{
-    delete static_cast<pointer>(__p);
-}
-
-template <class _Tp>
-__thread_specific_ptr<_Tp>::__thread_specific_ptr()
-{
-    int __ec = pthread_key_create(&__key_, &__thread_specific_ptr::__at_thread_exit);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__ec)
-        throw system_error(error_code(__ec, system_category()),
-                           "__thread_specific_ptr construction failed");
-#endif
-}
-
-template <class _Tp>
-__thread_specific_ptr<_Tp>::~__thread_specific_ptr()
-{
-    pthread_key_delete(__key_);
-}
-
-template <class _Tp>
-typename __thread_specific_ptr<_Tp>::pointer
-__thread_specific_ptr<_Tp>::release()
-{
-    pointer __p = get();
-    pthread_setspecific(__key_, 0);
-    return __p;
-}
-
-template <class _Tp>
-void
-__thread_specific_ptr<_Tp>::reset(pointer __p)
-{
-    pointer __p_old = get();
-    pthread_setspecific(__key_, __p);
-    delete __p_old;
-}
-
-class _LIBCPP_TYPE_VIS thread;
-class _LIBCPP_TYPE_VIS __thread_id;
-
-namespace this_thread
-{
-
-_LIBCPP_INLINE_VISIBILITY __thread_id get_id() _NOEXCEPT;
-
-}  // this_thread
-
-template<> struct _LIBCPP_TYPE_VIS_ONLY hash<__thread_id>;
-
-class _LIBCPP_TYPE_VIS_ONLY __thread_id
-{
-    // FIXME: pthread_t is a pointer on Darwin but a long on Linux.
-    // NULL is the no-thread value on Darwin.  Someone needs to check
-    // on other platforms.  We assume 0 works everywhere for now.
-    pthread_t __id_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __thread_id() _NOEXCEPT : __id_(0) {}
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return __x.__id_ == __y.__id_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return !(__x == __y);}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator< (__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return __x.__id_ < __y.__id_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator<=(__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return !(__y < __x);}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator> (__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return   __y < __x ;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator>=(__thread_id __x, __thread_id __y) _NOEXCEPT
-        {return !(__x < __y);}
-
-    template<class _CharT, class _Traits>
-    friend
-    _LIBCPP_INLINE_VISIBILITY
-    basic_ostream<_CharT, _Traits>&
-    operator<<(basic_ostream<_CharT, _Traits>& __os, __thread_id __id)
-        {return __os << __id.__id_;}
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    __thread_id(pthread_t __id) : __id_(__id) {}
-
-    friend __thread_id this_thread::get_id() _NOEXCEPT;
-    friend class _LIBCPP_TYPE_VIS thread;
-    friend struct _LIBCPP_TYPE_VIS_ONLY hash<__thread_id>;
-};
-
-template<>
-struct _LIBCPP_TYPE_VIS_ONLY hash<__thread_id>
-    : public unary_function<__thread_id, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(__thread_id __v) const
-    {
-        return hash<pthread_t>()(__v.__id_);
-    }
-};
-
-namespace this_thread
-{
-
-inline _LIBCPP_INLINE_VISIBILITY
-__thread_id
-get_id() _NOEXCEPT
-{
-    return pthread_self();
-}
-
-}  // this_thread
-
-class _LIBCPP_TYPE_VIS thread
-{
-    pthread_t __t_;
-
-    thread(const thread&);
-    thread& operator=(const thread&);
-public:
-    typedef __thread_id id;
-    typedef pthread_t native_handle_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    thread() _NOEXCEPT : __t_(0) {}
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _Fp, class ..._Args,
-              class = typename enable_if
-              <
-                   !is_same<typename decay<_Fp>::type, thread>::value
-              >::type
-             >
-        explicit thread(_Fp&& __f, _Args&&... __args);
-#else  // _LIBCPP_HAS_NO_VARIADICS
-    template <class _Fp> explicit thread(_Fp __f);
-#endif
-    ~thread();
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    thread(thread&& __t) _NOEXCEPT : __t_(__t.__t_) {__t.__t_ = 0;}
-    thread& operator=(thread&& __t) _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(thread& __t) _NOEXCEPT {_VSTD::swap(__t_, __t.__t_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool joinable() const _NOEXCEPT {return __t_ != 0;}
-    void join();
-    void detach();
-    _LIBCPP_INLINE_VISIBILITY
-    id get_id() const _NOEXCEPT {return __t_;}
-    _LIBCPP_INLINE_VISIBILITY
-    native_handle_type native_handle() _NOEXCEPT {return __t_;}
-
-    static unsigned hardware_concurrency() _NOEXCEPT;
-};
-
-class __assoc_sub_state;
-
-class _LIBCPP_HIDDEN __thread_struct_imp;
-
-class _LIBCPP_TYPE_VIS __thread_struct
-{
-    __thread_struct_imp* __p_;
-
-    __thread_struct(const __thread_struct&);
-    __thread_struct& operator=(const __thread_struct&);
-public:
-    __thread_struct();
-    ~__thread_struct();
-
-    void notify_all_at_thread_exit(condition_variable*, mutex*);
-    void __make_ready_at_thread_exit(__assoc_sub_state*);
-};
-
-_LIBCPP_FUNC_VIS __thread_specific_ptr<__thread_struct>& __thread_local_data();
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Fp, class ..._Args, size_t ..._Indices>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__thread_execute(tuple<_Fp, _Args...>& __t, __tuple_indices<_Indices...>)
-{
-    __invoke(_VSTD::move(_VSTD::get<0>(__t)), _VSTD::move(_VSTD::get<_Indices>(__t))...);
-}
-
-template <class _Fp>
-void*
-__thread_proxy(void* __vp)
-{
-    __thread_local_data().reset(new __thread_struct);
-    std::unique_ptr<_Fp> __p(static_cast<_Fp*>(__vp));
-    typedef typename __make_tuple_indices<tuple_size<_Fp>::value, 1>::type _Index;
-    __thread_execute(*__p, _Index());
-    return nullptr;
-}
-
-template <class _Fp, class ..._Args,
-          class
-         >
-thread::thread(_Fp&& __f, _Args&&... __args)
-{
-    typedef tuple<typename decay<_Fp>::type, typename decay<_Args>::type...> _Gp;
-    _VSTD::unique_ptr<_Gp> __p(new _Gp(__decay_copy(_VSTD::forward<_Fp>(__f)),
-                                __decay_copy(_VSTD::forward<_Args>(__args))...));
-    int __ec = pthread_create(&__t_, 0, &__thread_proxy<_Gp>, __p.get());
-    if (__ec == 0)
-        __p.release();
-    else
-        __throw_system_error(__ec, "thread constructor failed");
-}
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Fp>
-void*
-__thread_proxy(void* __vp)
-{
-    __thread_local_data().reset(new __thread_struct);
-    std::unique_ptr<_Fp> __p(static_cast<_Fp*>(__vp));
-    (*__p)();
-    return nullptr;
-}
-
-template <class _Fp>
-thread::thread(_Fp __f)
-{
-    std::unique_ptr<_Fp> __p(new _Fp(__f));
-    int __ec = pthread_create(&__t_, 0, &__thread_proxy<_Fp>, __p.get());
-    if (__ec == 0)
-        __p.release();
-    else
-        __throw_system_error(__ec, "thread constructor failed");
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-inline _LIBCPP_INLINE_VISIBILITY
-thread&
-thread::operator=(thread&& __t) _NOEXCEPT
-{
-    if (__t_ != 0)
-        terminate();
-    __t_ = __t.__t_;
-    __t.__t_ = 0;
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-inline _LIBCPP_INLINE_VISIBILITY
-void swap(thread& __x, thread& __y) _NOEXCEPT {__x.swap(__y);}
-
-namespace this_thread
-{
-
-_LIBCPP_FUNC_VIS void sleep_for(const chrono::nanoseconds& ns);
-
-template <class _Rep, class _Period>
-void
-sleep_for(const chrono::duration<_Rep, _Period>& __d)
-{
-    using namespace chrono;
-    if (__d > duration<_Rep, _Period>::zero())
-    {
-        _LIBCPP_CONSTEXPR duration<long double> _Max = nanoseconds::max();
-        nanoseconds __ns;
-        if (__d < _Max)
-        {
-            __ns = duration_cast<nanoseconds>(__d);
-            if (__ns < __d)
-                ++__ns;
-        }
-        else
-            __ns = nanoseconds::max();
-        sleep_for(__ns);
-    }
-}
-
-template <class _Clock, class _Duration>
-void
-sleep_until(const chrono::time_point<_Clock, _Duration>& __t)
-{
-    using namespace chrono;
-    mutex __mut;
-    condition_variable __cv;
-    unique_lock<mutex> __lk(__mut);
-    while (_Clock::now() < __t)
-        __cv.wait_until(__lk, __t);
-}
-
-template <class _Duration>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-sleep_until(const chrono::time_point<chrono::steady_clock, _Duration>& __t)
-{
-    using namespace chrono;
-    sleep_for(__t - steady_clock::now());
-}
-
-inline _LIBCPP_INLINE_VISIBILITY
-void yield() _NOEXCEPT {sched_yield();}
-
-}  // this_thread
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif // !_LIBCPP_HAS_NO_THREADS
-
-#endif  // _LIBCPP_THREAD
diff --git a/include.new/c++/v1/tr1/tuple b/include.new/c++/v1/tr1/tuple
deleted file mode 100644
index 5fc27f9..0000000
--- a/include.new/c++/v1/tr1/tuple
+++ /dev/null
@@ -1,1135 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- tuple ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_TUPLE
-#define _LIBCPP_TUPLE
-
-/*
-    tuple synopsis
-
-namespace std
-{
-
-template <class... T>
-class tuple {
-public:
-    constexpr tuple();
-    explicit tuple(const T&...);  // constexpr in C++14
-    template <class... U>
-        explicit tuple(U&&...);  // constexpr in C++14
-    tuple(const tuple&) = default;
-    tuple(tuple&&) = default;
-    template <class... U>
-        tuple(const tuple<U...>&);  // constexpr in C++14
-    template <class... U>
-        tuple(tuple<U...>&&);  // constexpr in C++14
-    template <class U1, class U2>
-        tuple(const pair<U1, U2>&); // iff sizeof...(T) == 2 // constexpr in C++14
-    template <class U1, class U2>
-        tuple(pair<U1, U2>&&); // iff sizeof...(T) == 2  // constexpr in C++14
-
-    // allocator-extended constructors
-    template <class Alloc>
-        tuple(allocator_arg_t, const Alloc& a);
-    template <class Alloc>
-        tuple(allocator_arg_t, const Alloc& a, const T&...);
-    template <class Alloc, class... U>
-        tuple(allocator_arg_t, const Alloc& a, U&&...);
-    template <class Alloc>
-        tuple(allocator_arg_t, const Alloc& a, const tuple&);
-    template <class Alloc>
-        tuple(allocator_arg_t, const Alloc& a, tuple&&);
-    template <class Alloc, class... U>
-        tuple(allocator_arg_t, const Alloc& a, const tuple<U...>&);
-    template <class Alloc, class... U>
-        tuple(allocator_arg_t, const Alloc& a, tuple<U...>&&);
-    template <class Alloc, class U1, class U2>
-        tuple(allocator_arg_t, const Alloc& a, const pair<U1, U2>&);
-    template <class Alloc, class U1, class U2>
-        tuple(allocator_arg_t, const Alloc& a, pair<U1, U2>&&);
-
-    tuple& operator=(const tuple&);
-    tuple&
-        operator=(tuple&&) noexcept(AND(is_nothrow_move_assignable<T>::value ...));
-    template <class... U>
-        tuple& operator=(const tuple<U...>&);
-    template <class... U>
-        tuple& operator=(tuple<U...>&&);
-    template <class U1, class U2>
-        tuple& operator=(const pair<U1, U2>&); // iff sizeof...(T) == 2
-    template <class U1, class U2>
-        tuple& operator=(pair<U1, U2>&&); //iffsizeof...(T) == 2
-
-    void swap(tuple&) noexcept(AND(swap(declval<T&>(), declval<T&>())...));
-};
-
-const unspecified ignore;
-
-template <class... T> tuple<V...>  make_tuple(T&&...); // constexpr in C++14
-template <class... T> tuple<ATypes...> forward_as_tuple(T&&...) noexcept; // constexpr in C++14
-template <class... T> tuple<T&...> tie(T&...) noexcept; // constexpr in C++14
-template <class... Tuples> tuple<CTypes...> tuple_cat(Tuples&&... tpls); // constexpr in C++14
-  
-// 20.4.1.4, tuple helper classes:
-template <class T> class tuple_size; // undefined
-template <class... T> class tuple_size<tuple<T...>>;
-template <intsize_t I, class T> class tuple_element; // undefined
-template <intsize_t I, class... T> class tuple_element<I, tuple<T...>>;
-template <size_t _Ip, class ..._Tp>
-  using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type; // C++14
-
-// 20.4.1.5, element access:
-template <intsize_t I, class... T>
-    typename tuple_element<I, tuple<T...>>::type&
-    get(tuple<T...>&) noexcept; // constexpr in C++14
-template <intsize_t I, class... T>
-    typename const tuple_element<I, tuple<T...>>::type &
-    get(const tuple<T...>&) noexcept; // constexpr in C++14
-template <intsize_t I, class... T>
-    typename tuple_element<I, tuple<T...>>::type&&
-    get(tuple<T...>&&) noexcept; // constexpr in C++14
-
-template <class T1, class... T>
-    constexpr T1& get(tuple<T...>&) noexcept;  // C++14
-template <class T1, class... T>
-    constexpr T1 const& get(const tuple<T...>&) noexcept;   // C++14
-template <class T1, class... T>
-    constexpr T1&& get(tuple<T...>&&) noexcept;   // C++14
-
-// 20.4.1.6, relational operators:
-template<class... T, class... U> bool operator==(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14
-template<class... T, class... U> bool operator<(const tuple<T...>&, const tuple<U...>&);  // constexpr in C++14
-template<class... T, class... U> bool operator!=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14
-template<class... T, class... U> bool operator>(const tuple<T...>&, const tuple<U...>&);  // constexpr in C++14
-template<class... T, class... U> bool operator<=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14
-template<class... T, class... U> bool operator>=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14
-
-template <class... Types, class Alloc>
-  struct uses_allocator<tuple<Types...>, Alloc>;
-
-template <class... Types>
-  void
-  swap(tuple<Types...>& x, tuple<Types...>& y) noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__tuple>
-#include <cstddef>
-#include <type_traits>
-#include <__functional_base>
-#include <utility>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// tuple_size
-
-template <class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<tuple<_Tp...> >
-    : public integral_constant<size_t, sizeof...(_Tp)>
-{
-};
-
-// tuple_element
-
-template <size_t _Ip, class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, tuple<_Tp...> >
-{
-public:
-    typedef typename tuple_element<_Ip, __tuple_types<_Tp...> >::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <size_t _Ip, class ..._Tp>
-using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type;
-#endif
-
-// __tuple_leaf
-
-template <size_t _Ip, class _Hp, bool=is_empty<_Hp>::value
-#if __has_feature(is_final)
-                                 && !__is_final(_Hp)
-#endif
-         >
-class __tuple_leaf;
-
-template <size_t _Ip, class _Hp, bool _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-void swap(__tuple_leaf<_Ip, _Hp, _Ep>& __x, __tuple_leaf<_Ip, _Hp, _Ep>& __y)
-    _NOEXCEPT_(__is_nothrow_swappable<_Hp>::value)
-{
-    swap(__x.get(), __y.get());
-}
-
-template <size_t _Ip, class _Hp, bool>
-class __tuple_leaf
-{
-    _Hp value;
-
-    __tuple_leaf& operator=(const __tuple_leaf&);
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR __tuple_leaf()
-             _NOEXCEPT_(is_nothrow_default_constructible<_Hp>::value) : value()
-       {static_assert(!is_reference<_Hp>::value,
-              "Attempted to default construct a reference element in a tuple");}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 0>, const _Alloc&)
-            : value()
-        {static_assert(!is_reference<_Hp>::value,
-              "Attempted to default construct a reference element in a tuple");}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 1>, const _Alloc& __a)
-            : value(allocator_arg_t(), __a)
-        {static_assert(!is_reference<_Hp>::value,
-              "Attempted to default construct a reference element in a tuple");}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 2>, const _Alloc& __a)
-            : value(__a)
-        {static_assert(!is_reference<_Hp>::value,
-              "Attempted to default construct a reference element in a tuple");}
-
-    template <class _Tp,
-              class = typename enable_if<
-                  __lazy_and<
-                      __lazy_not<is_same<typename decay<_Tp>::type, __tuple_leaf>>
-                    , is_constructible<_Hp, _Tp>
-                    >::value
-                >::type
-            >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit __tuple_leaf(_Tp&& __t) _NOEXCEPT_((is_nothrow_constructible<_Hp, _Tp>::value))
-            : value(_VSTD::forward<_Tp>(__t))
-        {static_assert(!is_reference<_Hp>::value ||
-                       (is_lvalue_reference<_Hp>::value &&
-                        (is_lvalue_reference<_Tp>::value ||
-                         is_same<typename remove_reference<_Tp>::type,
-                                 reference_wrapper<
-                                    typename remove_reference<_Hp>::type
-                                 >
-                                >::value)) ||
-                        (is_rvalue_reference<_Hp>::value &&
-                         !is_lvalue_reference<_Tp>::value),
-       "Attempted to construct a reference element in a tuple with an rvalue");}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 0>, const _Alloc&, _Tp&& __t)
-            : value(_VSTD::forward<_Tp>(__t))
-        {static_assert(!is_lvalue_reference<_Hp>::value ||
-                       (is_lvalue_reference<_Hp>::value &&
-                        (is_lvalue_reference<_Tp>::value ||
-                         is_same<typename remove_reference<_Tp>::type,
-                                 reference_wrapper<
-                                    typename remove_reference<_Hp>::type
-                                 >
-                                >::value)),
-       "Attempted to construct a reference element in a tuple with an rvalue");}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 1>, const _Alloc& __a, _Tp&& __t)
-            : value(allocator_arg_t(), __a, _VSTD::forward<_Tp>(__t))
-        {static_assert(!is_lvalue_reference<_Hp>::value ||
-                       (is_lvalue_reference<_Hp>::value &&
-                        (is_lvalue_reference<_Tp>::value ||
-                         is_same<typename remove_reference<_Tp>::type,
-                                 reference_wrapper<
-                                    typename remove_reference<_Hp>::type
-                                 >
-                                >::value)),
-       "Attempted to construct a reference element in a tuple with an rvalue");}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 2>, const _Alloc& __a, _Tp&& __t)
-            : value(_VSTD::forward<_Tp>(__t), __a)
-        {static_assert(!is_lvalue_reference<_Hp>::value ||
-                       (is_lvalue_reference<_Hp>::value &&
-                        (is_lvalue_reference<_Tp>::value ||
-                         is_same<typename remove_reference<_Tp>::type,
-                                 reference_wrapper<
-                                    typename remove_reference<_Hp>::type
-                                 >
-                                >::value)),
-       "Attempted to construct a reference element in a tuple with an rvalue");}
-
-    __tuple_leaf(const __tuple_leaf& __t) = default;
-    __tuple_leaf(__tuple_leaf&& __t) = default;
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf&
-        operator=(_Tp&& __t) _NOEXCEPT_((is_nothrow_assignable<_Hp&, _Tp>::value))
-        {
-            value = _VSTD::forward<_Tp>(__t);
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    int swap(__tuple_leaf& __t) _NOEXCEPT_(__is_nothrow_swappable<__tuple_leaf>::value)
-    {
-        _VSTD::swap(*this, __t);
-        return 0;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11       _Hp& get()       _NOEXCEPT {return value;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const _Hp& get() const _NOEXCEPT {return value;}
-};
-
-template <size_t _Ip, class _Hp>
-class __tuple_leaf<_Ip, _Hp, true>
-    : private _Hp
-{
-
-    __tuple_leaf& operator=(const __tuple_leaf&);
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR __tuple_leaf()
-             _NOEXCEPT_(is_nothrow_default_constructible<_Hp>::value) {}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 0>, const _Alloc&) {}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 1>, const _Alloc& __a)
-            : _Hp(allocator_arg_t(), __a) {}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 2>, const _Alloc& __a)
-            : _Hp(__a) {}
-
-    template <class _Tp,
-              class = typename enable_if<
-                  __lazy_and<
-                        __lazy_not<is_same<typename decay<_Tp>::type, __tuple_leaf>>
-                      , is_constructible<_Hp, _Tp>
-                    >::value
-                >::type
-            >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit __tuple_leaf(_Tp&& __t) _NOEXCEPT_((is_nothrow_constructible<_Hp, _Tp>::value))
-            : _Hp(_VSTD::forward<_Tp>(__t)) {}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 0>, const _Alloc&, _Tp&& __t)
-            : _Hp(_VSTD::forward<_Tp>(__t)) {}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 1>, const _Alloc& __a, _Tp&& __t)
-            : _Hp(allocator_arg_t(), __a, _VSTD::forward<_Tp>(__t)) {}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 2>, const _Alloc& __a, _Tp&& __t)
-            : _Hp(_VSTD::forward<_Tp>(__t), __a) {}
-
-    __tuple_leaf(__tuple_leaf const &) = default;
-    __tuple_leaf(__tuple_leaf &&) = default;
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf&
-        operator=(_Tp&& __t) _NOEXCEPT_((is_nothrow_assignable<_Hp&, _Tp>::value))
-        {
-            _Hp::operator=(_VSTD::forward<_Tp>(__t));
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    int
-    swap(__tuple_leaf& __t) _NOEXCEPT_(__is_nothrow_swappable<__tuple_leaf>::value)
-    {
-        _VSTD::swap(*this, __t);
-        return 0;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11       _Hp& get()       _NOEXCEPT {return static_cast<_Hp&>(*this);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const _Hp& get() const _NOEXCEPT {return static_cast<const _Hp&>(*this);}
-};
-
-template <class ..._Tp>
-_LIBCPP_INLINE_VISIBILITY
-void __swallow(_Tp&&...) _NOEXCEPT {}
-
-template <bool ..._Pred>
-struct __all
-    : is_same<__all<_Pred...>, __all<(_Pred, true)...>>
-{ };
-
-template <class _Tp>
-struct __all_default_constructible;
-
-template <class ..._Tp>
-struct __all_default_constructible<__tuple_types<_Tp...>>
-    : __all<is_default_constructible<_Tp>::value...>
-{ };
-
-// __tuple_impl
-
-template<class _Indx, class ..._Tp> struct __tuple_impl;
-
-template<size_t ..._Indx, class ..._Tp>
-struct __tuple_impl<__tuple_indices<_Indx...>, _Tp...>
-    : public __tuple_leaf<_Indx, _Tp>...
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR __tuple_impl()
-        _NOEXCEPT_(__all<is_nothrow_default_constructible<_Tp>::value...>::value) {}
-
-    template <size_t ..._Uf, class ..._Tf,
-              size_t ..._Ul, class ..._Tl, class ..._Up>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit
-        __tuple_impl(__tuple_indices<_Uf...>, __tuple_types<_Tf...>,
-                     __tuple_indices<_Ul...>, __tuple_types<_Tl...>,
-                     _Up&&... __u)
-                     _NOEXCEPT_((__all<is_nothrow_constructible<_Tf, _Up>::value...>::value &&
-                                 __all<is_nothrow_default_constructible<_Tl>::value...>::value)) :
-            __tuple_leaf<_Uf, _Tf>(_VSTD::forward<_Up>(__u))...,
-            __tuple_leaf<_Ul, _Tl>()...
-            {}
-
-    template <class _Alloc, size_t ..._Uf, class ..._Tf,
-              size_t ..._Ul, class ..._Tl, class ..._Up>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit
-        __tuple_impl(allocator_arg_t, const _Alloc& __a,
-                     __tuple_indices<_Uf...>, __tuple_types<_Tf...>,
-                     __tuple_indices<_Ul...>, __tuple_types<_Tl...>,
-                     _Up&&... __u) :
-            __tuple_leaf<_Uf, _Tf>(__uses_alloc_ctor<_Tf, _Alloc, _Up>(), __a,
-            _VSTD::forward<_Up>(__u))...,
-            __tuple_leaf<_Ul, _Tl>(__uses_alloc_ctor<_Tl, _Alloc>(), __a)...
-            {}
-
-    template <class _Tuple,
-              class = typename enable_if
-                      <
-                         __tuple_constructible<_Tuple, tuple<_Tp...> >::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        __tuple_impl(_Tuple&& __t) _NOEXCEPT_((__all<is_nothrow_constructible<_Tp, typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>::value...>::value))
-            : __tuple_leaf<_Indx, _Tp>(_VSTD::forward<typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<_Indx>(__t)))...
-            {}
-
-    template <class _Alloc, class _Tuple,
-              class = typename enable_if
-                      <
-                         __tuple_convertible<_Tuple, tuple<_Tp...> >::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_impl(allocator_arg_t, const _Alloc& __a, _Tuple&& __t)
-            : __tuple_leaf<_Indx, _Tp>(__uses_alloc_ctor<_Tp, _Alloc, typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>(), __a,
-                                       _VSTD::forward<typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<_Indx>(__t)))...
-            {}
-
-    template <class _Tuple>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __tuple_assignable<_Tuple, tuple<_Tp...> >::value,
-            __tuple_impl&
-        >::type
-        operator=(_Tuple&& __t) _NOEXCEPT_((__all<is_nothrow_assignable<_Tp&, typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>::value...>::value))
-        {
-            __swallow(__tuple_leaf<_Indx, _Tp>::operator=(_VSTD::forward<typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<_Indx>(__t)))...);
-            return *this;
-        }
-
-    __tuple_impl(const __tuple_impl&) = default;
-    __tuple_impl(__tuple_impl&&) = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tuple_impl&
-    operator=(const __tuple_impl& __t) _NOEXCEPT_((__all<is_nothrow_copy_assignable<_Tp>::value...>::value))
-    {
-        __swallow(__tuple_leaf<_Indx, _Tp>::operator=(static_cast<const __tuple_leaf<_Indx, _Tp>&>(__t).get())...);
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tuple_impl&
-    operator=(__tuple_impl&& __t) _NOEXCEPT_((__all<is_nothrow_move_assignable<_Tp>::value...>::value))
-    {
-        __swallow(__tuple_leaf<_Indx, _Tp>::operator=(_VSTD::forward<_Tp>(static_cast<__tuple_leaf<_Indx, _Tp>&>(__t).get()))...);
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(__tuple_impl& __t)
-        _NOEXCEPT_(__all<__is_nothrow_swappable<_Tp>::value...>::value)
-    {
-        __swallow(__tuple_leaf<_Indx, _Tp>::swap(static_cast<__tuple_leaf<_Indx, _Tp>&>(__t))...);
-    }
-};
-
-template <class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple
-{
-    typedef __tuple_impl<typename __make_tuple_indices<sizeof...(_Tp)>::type, _Tp...> base;
-
-    base base_;
-
-    template <size_t _Jp, class ..._Up> friend _LIBCPP_CONSTEXPR_AFTER_CXX11
-        typename tuple_element<_Jp, tuple<_Up...> >::type& get(tuple<_Up...>&) _NOEXCEPT;
-    template <size_t _Jp, class ..._Up> friend _LIBCPP_CONSTEXPR_AFTER_CXX11
-        const typename tuple_element<_Jp, tuple<_Up...> >::type& get(const tuple<_Up...>&) _NOEXCEPT;
-    template <size_t _Jp, class ..._Up> friend _LIBCPP_CONSTEXPR_AFTER_CXX11
-        typename tuple_element<_Jp, tuple<_Up...> >::type&& get(tuple<_Up...>&&) _NOEXCEPT;
-public:
-
-    template <bool _Dummy = true, class _Up = typename enable_if<
-        __all<(_Dummy && is_default_constructible<_Tp>::value)...>::value
-    >::type>
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR tuple()
-        _NOEXCEPT_(__all<is_nothrow_default_constructible<_Tp>::value...>::value) {}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    explicit tuple(const _Tp& ... __t) _NOEXCEPT_((__all<is_nothrow_copy_constructible<_Tp>::value...>::value)) 
-        : base_(typename __make_tuple_indices<sizeof...(_Tp)>::type(),
-                typename __make_tuple_types<tuple, sizeof...(_Tp)>::type(),
-                typename __make_tuple_indices<0>::type(),
-                typename __make_tuple_types<tuple, 0>::type(),
-                __t...
-               ) {}
-
-    template <class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      tuple(allocator_arg_t, const _Alloc& __a, const _Tp& ... __t)
-        : base_(allocator_arg_t(), __a,
-                typename __make_tuple_indices<sizeof...(_Tp)>::type(),
-                typename __make_tuple_types<tuple, sizeof...(_Tp)>::type(),
-                typename __make_tuple_indices<0>::type(),
-                typename __make_tuple_types<tuple, 0>::type(),
-                __t...
-               ) {}
-
-    template <class ..._Up,
-              typename enable_if
-                      <
-                         sizeof...(_Up) <= sizeof...(_Tp) &&
-                         __tuple_convertible
-                         <
-                            tuple<_Up...>,
-                            typename __make_tuple_types<tuple,
-                                     sizeof...(_Up) < sizeof...(_Tp) ?
-                                        sizeof...(_Up) :
-                                        sizeof...(_Tp)>::type
-                         >::value &&
-                         __all_default_constructible<
-                            typename __make_tuple_types<tuple, sizeof...(_Tp),
-                                sizeof...(_Up) < sizeof...(_Tp) ?
-                                    sizeof...(_Up) :
-                                    sizeof...(_Tp)>::type
-                         >::value,
-                         bool
-                      >::type = false
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        tuple(_Up&&... __u)
-            _NOEXCEPT_((
-                is_nothrow_constructible<base,
-                    typename __make_tuple_indices<sizeof...(_Up)>::type,
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type,
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type,
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type,
-                    _Up...
-                >::value
-            ))
-            : base_(typename __make_tuple_indices<sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type(),
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    _VSTD::forward<_Up>(__u)...) {}
-
-    template <class ..._Up,
-              typename enable_if
-                      <
-                         sizeof...(_Up) <= sizeof...(_Tp) &&
-                         __tuple_constructible
-                         <
-                            tuple<_Up...>,
-                            typename __make_tuple_types<tuple,
-                                     sizeof...(_Up) < sizeof...(_Tp) ?
-                                        sizeof...(_Up) :
-                                        sizeof...(_Tp)>::type
-                         >::value &&
-                         !__tuple_convertible
-                         <
-                            tuple<_Up...>,
-                            typename __make_tuple_types<tuple,
-                                     sizeof...(_Up) < sizeof...(_Tp) ?
-                                        sizeof...(_Up) :
-                                        sizeof...(_Tp)>::type
-                         >::value &&
-                         __all_default_constructible<
-                            typename __make_tuple_types<tuple, sizeof...(_Tp),
-                                sizeof...(_Up) < sizeof...(_Tp) ?
-                                    sizeof...(_Up) :
-                                    sizeof...(_Tp)>::type
-                         >::value,
-                         bool
-                      >::type =false
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit
-        tuple(_Up&&... __u)
-            _NOEXCEPT_((
-                is_nothrow_constructible<base,
-                    typename __make_tuple_indices<sizeof...(_Up)>::type,
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type,
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type,
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type,
-                    _Up...
-                >::value
-            ))
-            : base_(typename __make_tuple_indices<sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type(),
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    _VSTD::forward<_Up>(__u)...) {}
-
-    template <class _Alloc, class ..._Up,
-              class = typename enable_if
-                      <
-                         sizeof...(_Up) <= sizeof...(_Tp) &&
-                         __tuple_convertible
-                         <
-                            tuple<_Up...>,
-                            typename __make_tuple_types<tuple,
-                                     sizeof...(_Up) < sizeof...(_Tp) ?
-                                        sizeof...(_Up) :
-                                        sizeof...(_Tp)>::type
-                         >::value &&
-                         __all_default_constructible<
-                            typename __make_tuple_types<tuple, sizeof...(_Tp),
-                                sizeof...(_Up) < sizeof...(_Tp) ?
-                                    sizeof...(_Up) :
-                                    sizeof...(_Tp)>::type
-                         >::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc& __a, _Up&&... __u)
-            : base_(allocator_arg_t(), __a,
-                    typename __make_tuple_indices<sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type(),
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    _VSTD::forward<_Up>(__u)...) {}
-
-    template <class _Tuple,
-              typename enable_if
-                      <
-                         __tuple_convertible<_Tuple, tuple>::value,
-                         bool
-                      >::type = false
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<base, _Tuple>::value))
-            : base_(_VSTD::forward<_Tuple>(__t)) {}
-
-    template <class _Tuple,
-              typename enable_if
-                      <
-                         __tuple_constructible<_Tuple, tuple>::value &&
-                         !__tuple_convertible<_Tuple, tuple>::value,
-                         bool
-                      >::type = false
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit
-        tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<base, _Tuple>::value))
-            : base_(_VSTD::forward<_Tuple>(__t)) {}
-
-    template <class _Alloc, class _Tuple,
-              class = typename enable_if
-                      <
-                         __tuple_convertible<_Tuple, tuple>::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc& __a, _Tuple&& __t)
-            : base_(allocator_arg_t(), __a, _VSTD::forward<_Tuple>(__t)) {}
-
-    template <class _Tuple,
-              class = typename enable_if
-                      <
-                         __tuple_assignable<_Tuple, tuple>::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        tuple&
-        operator=(_Tuple&& __t) _NOEXCEPT_((is_nothrow_assignable<base&, _Tuple>::value))
-        {
-            base_.operator=(_VSTD::forward<_Tuple>(__t));
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(tuple& __t) _NOEXCEPT_(__all<__is_nothrow_swappable<_Tp>::value...>::value)
-        {base_.swap(__t.base_);}
-};
-
-template <>
-class _LIBCPP_TYPE_VIS_ONLY tuple<>
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR tuple() _NOEXCEPT {}
-    template <class _Alloc>
-    _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc&) _NOEXCEPT {}
-    template <class _Alloc>
-    _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc&, const tuple&) _NOEXCEPT {}
-    template <class _Up>
-    _LIBCPP_INLINE_VISIBILITY
-        tuple(array<_Up, 0>) _NOEXCEPT {}
-    template <class _Alloc, class _Up>
-    _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc&, array<_Up, 0>) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(tuple&) _NOEXCEPT {}
-};
-
-template <class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __all<__is_swappable<_Tp>::value...>::value,
-    void
->::type
-swap(tuple<_Tp...>& __t, tuple<_Tp...>& __u)
-                 _NOEXCEPT_(__all<__is_nothrow_swappable<_Tp>::value...>::value)
-    {__t.swap(__u);}
-
-// get
-
-template <size_t _Ip, class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, tuple<_Tp...> >::type&
-get(tuple<_Tp...>& __t) _NOEXCEPT
-{
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
-    return static_cast<__tuple_leaf<_Ip, type>&>(__t.base_).get();
-}
-
-template <size_t _Ip, class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const typename tuple_element<_Ip, tuple<_Tp...> >::type&
-get(const tuple<_Tp...>& __t) _NOEXCEPT
-{
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
-    return static_cast<const __tuple_leaf<_Ip, type>&>(__t.base_).get();
-}
-
-template <size_t _Ip, class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, tuple<_Tp...> >::type&&
-get(tuple<_Tp...>&& __t) _NOEXCEPT
-{
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
-    return static_cast<type&&>(
-             static_cast<__tuple_leaf<_Ip, type>&&>(__t.base_).get());
-}
-
-#if _LIBCPP_STD_VER > 11
-// get by type
-template <typename _T1, size_t _Idx, typename... _Args>
-struct __find_exactly_one_t_helper;
-
-// -- find exactly one
-template <typename _T1, size_t _Idx, typename... _Args>
-struct __find_exactly_one_t_checker {
-    static constexpr size_t value = _Idx;
-//  Check the rest of the list to make sure there's only one
-    static_assert ( __find_exactly_one_t_helper<_T1, 0, _Args...>::value == -1, "type can only occur once in type list" );
-    };
-
-
-template <typename _T1, size_t _Idx>
-struct __find_exactly_one_t_helper <_T1, _Idx> {
-    static constexpr size_t value = -1;
-    };
-
-template <typename _T1, size_t _Idx, typename _Head, typename... _Args>
-struct __find_exactly_one_t_helper <_T1, _Idx, _Head, _Args...> {
-    static constexpr size_t value =
-        std::conditional<
-            std::is_same<_T1, _Head>::value,
-            __find_exactly_one_t_checker<_T1, _Idx,   _Args...>,
-            __find_exactly_one_t_helper <_T1, _Idx+1, _Args...>
-        >::type::value;
-    };
-
-template <typename _T1, typename... _Args>
-struct __find_exactly_one_t {
-    static constexpr size_t value = __find_exactly_one_t_helper<_T1, 0, _Args...>::value;
-    static_assert ( value != -1, "type not found in type list" );
-    };
-
-template <class _T1, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1& get(tuple<_Args...>& __tup) noexcept
-{
-    return _VSTD::get<__find_exactly_one_t<_T1, _Args...>::value>(__tup);
-}
-
-template <class _T1, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 const& get(tuple<_Args...> const& __tup) noexcept
-{
-    return _VSTD::get<__find_exactly_one_t<_T1, _Args...>::value>(__tup);
-}
-
-template <class _T1, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1&& get(tuple<_Args...>&& __tup) noexcept
-{
-    return _VSTD::get<__find_exactly_one_t<_T1, _Args...>::value>(_VSTD::move(__tup));
-}
-
-#endif
-
-// tie
-
-template <class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-tuple<_Tp&...>
-tie(_Tp&... __t) _NOEXCEPT
-{
-    return tuple<_Tp&...>(__t...);
-}
-
-template <class _Up>
-struct __ignore_t
-{
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        const __ignore_t& operator=(_Tp&&) const {return *this;}
-};
-
-namespace { const __ignore_t<unsigned char> ignore = __ignore_t<unsigned char>(); }
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY reference_wrapper;
-
-template <class _Tp>
-struct __make_tuple_return_impl
-{
-    typedef _Tp type;
-};
-
-template <class _Tp>
-struct __make_tuple_return_impl<reference_wrapper<_Tp> >
-{
-    typedef _Tp& type;
-};
-
-template <class _Tp>
-struct __make_tuple_return
-{
-    typedef typename __make_tuple_return_impl<typename decay<_Tp>::type>::type type;
-};
-
-template <class... _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-tuple<typename __make_tuple_return<_Tp>::type...>
-make_tuple(_Tp&&... __t)
-{
-    return tuple<typename __make_tuple_return<_Tp>::type...>(_VSTD::forward<_Tp>(__t)...);
-}
-
-template <class... _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-tuple<_Tp&&...>
-forward_as_tuple(_Tp&&... __t) _NOEXCEPT
-{
-    return tuple<_Tp&&...>(_VSTD::forward<_Tp>(__t)...);
-}
-
-template <size_t _Ip>
-struct __tuple_equal
-{
-    template <class _Tp, class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _Tp& __x, const _Up& __y)
-    {
-        return __tuple_equal<_Ip - 1>()(__x, __y) && _VSTD::get<_Ip-1>(__x) == _VSTD::get<_Ip-1>(__y);
-    }
-};
-
-template <>
-struct __tuple_equal<0>
-{
-    template <class _Tp, class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _Tp&, const _Up&)
-    {
-        return true;
-    }
-};
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return __tuple_equal<sizeof...(_Tp)>()(__x, __y);
-}
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return !(__x == __y);
-}
-
-template <size_t _Ip>
-struct __tuple_less
-{
-    template <class _Tp, class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _Tp& __x, const _Up& __y)
-    {
-        return __tuple_less<_Ip-1>()(__x, __y) ||
-             (!__tuple_less<_Ip-1>()(__y, __x) && _VSTD::get<_Ip-1>(__x) < _VSTD::get<_Ip-1>(__y));
-    }
-};
-
-template <>
-struct __tuple_less<0>
-{
-    template <class _Tp, class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _Tp&, const _Up&)
-    {
-        return false;
-    }
-};
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return __tuple_less<sizeof...(_Tp)>()(__x, __y);
-}
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return __y < __x;
-}
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>=(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<=(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return !(__y < __x);
-}
-
-// tuple_cat
-
-template <class _Tp, class _Up> struct __tuple_cat_type;
-
-template <class ..._Ttypes, class ..._Utypes>
-struct __tuple_cat_type<tuple<_Ttypes...>, __tuple_types<_Utypes...> >
-{
-    typedef tuple<_Ttypes..., _Utypes...> type;
-};
-
-template <class _ResultTuple, bool _Is_Tuple0TupleLike, class ..._Tuples>
-struct __tuple_cat_return_1
-{
-};
-
-template <class ..._Types, class _Tuple0>
-struct __tuple_cat_return_1<tuple<_Types...>, true, _Tuple0>
-{
-    typedef typename __tuple_cat_type<tuple<_Types...>,
-            typename __make_tuple_types<typename remove_reference<_Tuple0>::type>::type>::type
-                                                                           type;
-};
-
-template <class ..._Types, class _Tuple0, class _Tuple1, class ..._Tuples>
-struct __tuple_cat_return_1<tuple<_Types...>, true, _Tuple0, _Tuple1, _Tuples...>
-    : public __tuple_cat_return_1<
-                 typename __tuple_cat_type<
-                     tuple<_Types...>,
-                     typename __make_tuple_types<typename remove_reference<_Tuple0>::type>::type
-                 >::type,
-                 __tuple_like<typename remove_reference<_Tuple1>::type>::value,
-                 _Tuple1, _Tuples...>
-{
-};
-
-template <class ..._Tuples> struct __tuple_cat_return;
-
-template <class _Tuple0, class ..._Tuples>
-struct __tuple_cat_return<_Tuple0, _Tuples...>
-    : public __tuple_cat_return_1<tuple<>,
-         __tuple_like<typename remove_reference<_Tuple0>::type>::value, _Tuple0,
-                                                                     _Tuples...>
-{
-};
-
-template <>
-struct __tuple_cat_return<>
-{
-    typedef tuple<> type;
-};
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-tuple<>
-tuple_cat()
-{
-    return tuple<>();
-}
-
-template <class _Rp, class _Indices, class _Tuple0, class ..._Tuples>
-struct __tuple_cat_return_ref_imp;
-
-template <class ..._Types, size_t ..._I0, class _Tuple0>
-struct __tuple_cat_return_ref_imp<tuple<_Types...>, __tuple_indices<_I0...>, _Tuple0>
-{
-    typedef typename remove_reference<_Tuple0>::type _T0;
-    typedef tuple<_Types..., typename __apply_cv<_Tuple0,
-                          typename tuple_element<_I0, _T0>::type>::type&&...> type;
-};
-
-template <class ..._Types, size_t ..._I0, class _Tuple0, class _Tuple1, class ..._Tuples>
-struct __tuple_cat_return_ref_imp<tuple<_Types...>, __tuple_indices<_I0...>,
-                                  _Tuple0, _Tuple1, _Tuples...>
-    : public __tuple_cat_return_ref_imp<
-         tuple<_Types..., typename __apply_cv<_Tuple0,
-               typename tuple_element<_I0,
-                  typename remove_reference<_Tuple0>::type>::type>::type&&...>,
-         typename __make_tuple_indices<tuple_size<typename
-                                 remove_reference<_Tuple1>::type>::value>::type,
-         _Tuple1, _Tuples...>
-{
-};
-
-template <class _Tuple0, class ..._Tuples>
-struct __tuple_cat_return_ref
-    : public __tuple_cat_return_ref_imp<tuple<>,
-               typename __make_tuple_indices<
-                        tuple_size<typename remove_reference<_Tuple0>::type>::value
-               >::type, _Tuple0, _Tuples...>
-{
-};
-
-template <class _Types, class _I0, class _J0>
-struct __tuple_cat;
-
-template <class ..._Types, size_t ..._I0, size_t ..._J0>
-struct __tuple_cat<tuple<_Types...>, __tuple_indices<_I0...>, __tuple_indices<_J0...> >
-{
-    template <class _Tuple0>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    typename __tuple_cat_return_ref<tuple<_Types...>&&, _Tuple0&&>::type
-    operator()(tuple<_Types...> __t, _Tuple0&& __t0)
-    {
-        return forward_as_tuple(_VSTD::forward<_Types>(_VSTD::get<_I0>(__t))...,
-                                      _VSTD::get<_J0>(_VSTD::forward<_Tuple0>(__t0))...);
-    }
-
-    template <class _Tuple0, class _Tuple1, class ..._Tuples>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    typename __tuple_cat_return_ref<tuple<_Types...>&&, _Tuple0&&, _Tuple1&&, _Tuples&&...>::type
-    operator()(tuple<_Types...> __t, _Tuple0&& __t0, _Tuple1&& __t1, _Tuples&& ...__tpls)
-    {
-        typedef typename remove_reference<_Tuple0>::type _T0;
-        typedef typename remove_reference<_Tuple1>::type _T1;
-        return __tuple_cat<
-           tuple<_Types..., typename __apply_cv<_Tuple0, typename tuple_element<_J0, _T0>::type>::type&&...>,
-           typename __make_tuple_indices<sizeof ...(_Types) + tuple_size<_T0>::value>::type,
-           typename __make_tuple_indices<tuple_size<_T1>::value>::type>()
-                           (forward_as_tuple(
-                              _VSTD::forward<_Types>(_VSTD::get<_I0>(__t))...,
-                              _VSTD::get<_J0>(_VSTD::forward<_Tuple0>(__t0))...
-                            ),
-                            _VSTD::forward<_Tuple1>(__t1),
-                            _VSTD::forward<_Tuples>(__tpls)...);
-    }
-};
-
-template <class _Tuple0, class... _Tuples>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename __tuple_cat_return<_Tuple0, _Tuples...>::type
-tuple_cat(_Tuple0&& __t0, _Tuples&&... __tpls)
-{
-    typedef typename remove_reference<_Tuple0>::type _T0;
-    return __tuple_cat<tuple<>, __tuple_indices<>,
-                  typename __make_tuple_indices<tuple_size<_T0>::value>::type>()
-                  (tuple<>(), _VSTD::forward<_Tuple0>(__t0),
-                                            _VSTD::forward<_Tuples>(__tpls)...);
-}
-
-template <class ..._Tp, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<tuple<_Tp...>, _Alloc>
-    : true_type {};
-
-template <class _T1, class _T2>
-template <class... _Args1, class... _Args2, size_t ..._I1, size_t ..._I2>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_T1, _T2>::pair(piecewise_construct_t,
-                     tuple<_Args1...>& __first_args, tuple<_Args2...>& __second_args,
-                     __tuple_indices<_I1...>, __tuple_indices<_I2...>)
-    :  first(_VSTD::forward<_Args1>(_VSTD::get<_I1>( __first_args))...),
-      second(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...)
-{
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_TUPLE
diff --git a/include.new/c++/v1/tr1/type_traits b/include.new/c++/v1/tr1/type_traits
deleted file mode 100644
index 8612e57..0000000
--- a/include.new/c++/v1/tr1/type_traits
+++ /dev/null
@@ -1,3696 +0,0 @@
-// -*- C++ -*-
-//===------------------------ type_traits ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_TYPE_TRAITS
-#define _LIBCPP_TYPE_TRAITS
-
-/*
-    type_traits synopsis
-
-namespace std
-{
-
-    // helper class:
-    template <class T, T v> struct integral_constant;
-    typedef integral_constant<bool, true>  true_type;
-    typedef integral_constant<bool, false> false_type;
-
-    // helper traits
-    template <bool, class T = void> struct enable_if;
-    template <bool, class T, class F> struct conditional;
-
-    // Primary classification traits:
-    template <class T> struct is_void;
-    template <class T> struct is_null_pointer;  // C++14
-    template <class T> struct is_integral;
-    template <class T> struct is_floating_point;
-    template <class T> struct is_array;
-    template <class T> struct is_pointer;
-    template <class T> struct is_lvalue_reference;
-    template <class T> struct is_rvalue_reference;
-    template <class T> struct is_member_object_pointer;
-    template <class T> struct is_member_function_pointer;
-    template <class T> struct is_enum;
-    template <class T> struct is_union;
-    template <class T> struct is_class;
-    template <class T> struct is_function;
-
-    // Secondary classification traits:
-    template <class T> struct is_reference;
-    template <class T> struct is_arithmetic;
-    template <class T> struct is_fundamental;
-    template <class T> struct is_member_pointer;
-    template <class T> struct is_scalar;
-    template <class T> struct is_object;
-    template <class T> struct is_compound;
-
-    // Const-volatile properties and transformations:
-    template <class T> struct is_const;
-    template <class T> struct is_volatile;
-    template <class T> struct remove_const;
-    template <class T> struct remove_volatile;
-    template <class T> struct remove_cv;
-    template <class T> struct add_const;
-    template <class T> struct add_volatile;
-    template <class T> struct add_cv;
-
-    // Reference transformations:
-    template <class T> struct remove_reference;
-    template <class T> struct add_lvalue_reference;
-    template <class T> struct add_rvalue_reference;
-
-    // Pointer transformations:
-    template <class T> struct remove_pointer;
-    template <class T> struct add_pointer;
-
-    // Integral properties:
-    template <class T> struct is_signed;
-    template <class T> struct is_unsigned;
-    template <class T> struct make_signed;
-    template <class T> struct make_unsigned;
-
-    // Array properties and transformations:
-    template <class T> struct rank;
-    template <class T, unsigned I = 0> struct extent;
-    template <class T> struct remove_extent;
-    template <class T> struct remove_all_extents;
-
-    // Member introspection:
-    template <class T> struct is_pod;
-    template <class T> struct is_trivial;
-    template <class T> struct is_trivially_copyable;
-    template <class T> struct is_standard_layout;
-    template <class T> struct is_literal_type;
-    template <class T> struct is_empty;
-    template <class T> struct is_polymorphic;
-    template <class T> struct is_abstract;
-    template <class T> struct is_final; // C++14
-
-    template <class T, class... Args> struct is_constructible;
-    template <class T>                struct is_default_constructible;
-    template <class T>                struct is_copy_constructible;
-    template <class T>                struct is_move_constructible;
-    template <class T, class U>       struct is_assignable;
-    template <class T>                struct is_copy_assignable;
-    template <class T>                struct is_move_assignable;
-    template <class T>                struct is_destructible;
-
-    template <class T, class... Args> struct is_trivially_constructible;
-    template <class T>                struct is_trivially_default_constructible;
-    template <class T>                struct is_trivially_copy_constructible;
-    template <class T>                struct is_trivially_move_constructible;
-    template <class T, class U>       struct is_trivially_assignable;
-    template <class T>                struct is_trivially_copy_assignable;
-    template <class T>                struct is_trivially_move_assignable;
-    template <class T>                struct is_trivially_destructible;
-
-    template <class T, class... Args> struct is_nothrow_constructible;
-    template <class T>                struct is_nothrow_default_constructible;
-    template <class T>                struct is_nothrow_copy_constructible;
-    template <class T>                struct is_nothrow_move_constructible;
-    template <class T, class U>       struct is_nothrow_assignable;
-    template <class T>                struct is_nothrow_copy_assignable;
-    template <class T>                struct is_nothrow_move_assignable;
-    template <class T>                struct is_nothrow_destructible;
-
-    template <class T> struct has_virtual_destructor;
-
-    // Relationships between types:
-    template <class T, class U> struct is_same;
-    template <class Base, class Derived> struct is_base_of;
-    template <class From, class To> struct is_convertible;
-
-    // Alignment properties and transformations:
-    template <class T> struct alignment_of;
-    template <size_t Len, size_t Align = most_stringent_alignment_requirement>
-        struct aligned_storage;
-    template <size_t Len, class... Types> struct aligned_union;
-
-    template <class T> struct decay;
-    template <class... T> struct common_type;
-    template <class T> struct underlying_type;
-    template <class> class result_of; // undefined
-    template <class Fn, class... ArgTypes> class result_of<Fn(ArgTypes...)>;
-
-    // const-volatile modifications:
-    template <class T>
-      using remove_const_t    = typename remove_const<T>::type;  // C++14
-    template <class T>
-      using remove_volatile_t = typename remove_volatile<T>::type;  // C++14
-    template <class T>
-      using remove_cv_t       = typename remove_cv<T>::type;  // C++14
-    template <class T>
-      using add_const_t       = typename add_const<T>::type;  // C++14
-    template <class T>
-      using add_volatile_t    = typename add_volatile<T>::type;  // C++14
-    template <class T>
-      using add_cv_t          = typename add_cv<T>::type;  // C++14
-  
-    // reference modifications:
-    template <class T>
-      using remove_reference_t     = typename remove_reference<T>::type;  // C++14
-    template <class T>
-      using add_lvalue_reference_t = typename add_lvalue_reference<T>::type;  // C++14
-    template <class T>
-      using add_rvalue_reference_t = typename add_rvalue_reference<T>::type;  // C++14
-  
-    // sign modifications:
-    template <class T>
-      using make_signed_t   = typename make_signed<T>::type;  // C++14
-    template <class T>
-      using make_unsigned_t = typename make_unsigned<T>::type;  // C++14
-  
-    // array modifications:
-    template <class T>
-      using remove_extent_t      = typename remove_extent<T>::type;  // C++14
-    template <class T>
-      using remove_all_extents_t = typename remove_all_extents<T>::type;  // C++14
-
-    // pointer modifications:
-    template <class T>
-      using remove_pointer_t = typename remove_pointer<T>::type;  // C++14
-    template <class T>
-      using add_pointer_t    = typename add_pointer<T>::type;  // C++14
-
-    // other transformations:
-    template <size_t Len, std::size_t Align=default-alignment>
-      using aligned_storage_t = typename aligned_storage<Len,Align>::type;  // C++14
-    template <std::size_t Len, class... Types>
-      using aligned_union_t   = typename aligned_union<Len,Types...>::type;  // C++14
-    template <class T>
-      using decay_t           = typename decay<T>::type;  // C++14
-    template <bool b, class T=void>
-      using enable_if_t       = typename enable_if<b,T>::type;  // C++14
-    template <bool b, class T, class F>
-      using conditional_t     = typename conditional<b,T,F>::type;  // C++14
-    template <class... T>
-      using common_type_t     = typename common_type<T...>::type;  // C++14
-    template <class T>
-      using underlying_type_t = typename underlying_type<T>::type;  // C++14
-    template <class F, class... ArgTypes>
-      using result_of_t       = typename result_of<F(ArgTypes...)>::type;  // C++14
-
-    template <class...>
-      using void_t = void;
-}  // C++17
-
-*/
-#include <__config>
-#include <cstddef>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-template <class...> 
-struct __void_t { typedef void type; };
-#endif
-
-template <bool _Bp, class _If, class _Then>
-    struct _LIBCPP_TYPE_VIS_ONLY conditional {typedef _If type;};
-template <class _If, class _Then>
-    struct _LIBCPP_TYPE_VIS_ONLY conditional<false, _If, _Then> {typedef _Then type;};
-
-#if _LIBCPP_STD_VER > 11
-template <bool _Bp, class _If, class _Then> using conditional_t = typename conditional<_Bp, _If, _Then>::type;
-#endif
-
-template <bool, class _Tp> struct _LIBCPP_TYPE_VIS_ONLY __lazy_enable_if {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY __lazy_enable_if<true, _Tp> {typedef typename _Tp::type type;};
-
-template <bool, class _Tp = void> struct _LIBCPP_TYPE_VIS_ONLY enable_if {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY enable_if<true, _Tp> {typedef _Tp type;};
-
-#if _LIBCPP_STD_VER > 11
-template <bool _Bp, class _Tp = void> using enable_if_t = typename enable_if<_Bp, _Tp>::type;
-#endif
-
-
-struct __two {char __lx[2];};
-
-// helper class:
-
-template <class _Tp, _Tp __v>
-struct _LIBCPP_TYPE_VIS_ONLY integral_constant
-{
-    static _LIBCPP_CONSTEXPR const _Tp      value = __v;
-    typedef _Tp               value_type;
-    typedef integral_constant type;
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_CONSTEXPR operator value_type() const _NOEXCEPT {return value;}
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY
-         constexpr value_type operator ()() const _NOEXCEPT {return value;}
-#endif
-};
-
-template <class _Tp, _Tp __v>
-_LIBCPP_CONSTEXPR const _Tp integral_constant<_Tp, __v>::value;
-
-typedef integral_constant<bool, true>  true_type;
-typedef integral_constant<bool, false> false_type;
-
-// is_const
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_const            : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_const<_Tp const> : public true_type {};
-
-// is_volatile
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_volatile               : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_volatile<_Tp volatile> : public true_type {};
-
-// remove_const
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_const            {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_const<const _Tp> {typedef _Tp type;};
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_const_t = typename remove_const<_Tp>::type;
-#endif
-
-// remove_volatile
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_volatile               {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_volatile<volatile _Tp> {typedef _Tp type;};
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_volatile_t = typename remove_volatile<_Tp>::type;
-#endif
-
-// remove_cv
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_cv
-{typedef typename remove_volatile<typename remove_const<_Tp>::type>::type type;};
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_cv_t = typename remove_cv<_Tp>::type;
-#endif
-
-// is_void
-
-template <class _Tp> struct __libcpp_is_void       : public false_type {};
-template <>          struct __libcpp_is_void<void> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_void
-    : public __libcpp_is_void<typename remove_cv<_Tp>::type> {};
-
-// __is_nullptr_t
-
-template <class _Tp> struct __is_nullptr_t_impl       : public false_type {};
-template <>          struct __is_nullptr_t_impl<nullptr_t> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY __is_nullptr_t
-    : public __is_nullptr_t_impl<typename remove_cv<_Tp>::type> {};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_null_pointer
-    : public __is_nullptr_t_impl<typename remove_cv<_Tp>::type> {};
-#endif
-
-// is_integral
-
-template <class _Tp> struct __libcpp_is_integral                     : public false_type {};
-template <>          struct __libcpp_is_integral<bool>               : public true_type {};
-template <>          struct __libcpp_is_integral<char>               : public true_type {};
-template <>          struct __libcpp_is_integral<signed char>        : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned char>      : public true_type {};
-template <>          struct __libcpp_is_integral<wchar_t>            : public true_type {};
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-template <>          struct __libcpp_is_integral<char16_t>           : public true_type {};
-template <>          struct __libcpp_is_integral<char32_t>           : public true_type {};
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-template <>          struct __libcpp_is_integral<short>              : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned short>     : public true_type {};
-template <>          struct __libcpp_is_integral<int>                : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned int>       : public true_type {};
-template <>          struct __libcpp_is_integral<long>               : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned long>      : public true_type {};
-template <>          struct __libcpp_is_integral<long long>          : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned long long> : public true_type {};
-#ifndef _LIBCPP_HAS_NO_INT128
-template <>          struct __libcpp_is_integral<__int128_t>         : public true_type {};
-template <>          struct __libcpp_is_integral<__uint128_t>        : public true_type {};
-#endif
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_integral
-    : public __libcpp_is_integral<typename remove_cv<_Tp>::type> {};
-
-// is_floating_point
-
-template <class _Tp> struct __libcpp_is_floating_point              : public false_type {};
-template <>          struct __libcpp_is_floating_point<float>       : public true_type {};
-template <>          struct __libcpp_is_floating_point<double>      : public true_type {};
-template <>          struct __libcpp_is_floating_point<long double> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_floating_point
-    : public __libcpp_is_floating_point<typename remove_cv<_Tp>::type> {};
-
-// is_array
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_array
-    : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_array<_Tp[]>
-    : public true_type {};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY is_array<_Tp[_Np]>
-    : public true_type {};
-
-// is_pointer
-
-template <class _Tp> struct __libcpp_is_pointer       : public false_type {};
-template <class _Tp> struct __libcpp_is_pointer<_Tp*> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_pointer
-    : public __libcpp_is_pointer<typename remove_cv<_Tp>::type> {};
-
-// is_reference
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_lvalue_reference       : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_lvalue_reference<_Tp&> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_rvalue_reference        : public false_type {};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_rvalue_reference<_Tp&&> : public true_type {};
-#endif
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_reference        : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_reference<_Tp&>  : public true_type {};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_reference<_Tp&&> : public true_type {};
-#endif
-
-// is_union
-
-#if __has_feature(is_union) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_union
-    : public integral_constant<bool, __is_union(_Tp)> {};
-
-#else
-
-template <class _Tp> struct __libcpp_union : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_union
-    : public __libcpp_union<typename remove_cv<_Tp>::type> {};
-
-#endif
-
-// is_class
-
-#if __has_feature(is_class) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_class
-    : public integral_constant<bool, __is_class(_Tp)> {};
-
-#else
-
-namespace __is_class_imp
-{
-template <class _Tp> char  __test(int _Tp::*);
-template <class _Tp> __two __test(...);
-}
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_class
-    : public integral_constant<bool, sizeof(__is_class_imp::__test<_Tp>(0)) == 1 && !is_union<_Tp>::value> {};
-
-#endif
-
-// is_same
-
-template <class _Tp, class _Up> struct _LIBCPP_TYPE_VIS_ONLY is_same           : public false_type {};
-template <class _Tp>            struct _LIBCPP_TYPE_VIS_ONLY is_same<_Tp, _Tp> : public true_type {};
-
-// is_function
-
-namespace __libcpp_is_function_imp
-{
-template <class _Tp> char  __test(_Tp*);
-template <class _Tp> __two __test(...);
-template <class _Tp> _Tp&  __source();
-}
-
-template <class _Tp, bool = is_class<_Tp>::value ||
-                            is_union<_Tp>::value ||
-                            is_void<_Tp>::value  ||
-                            is_reference<_Tp>::value ||
-                            __is_nullptr_t<_Tp>::value >
-struct __libcpp_is_function
-    : public integral_constant<bool, sizeof(__libcpp_is_function_imp::__test<_Tp>(__libcpp_is_function_imp::__source<_Tp>())) == 1>
-    {};
-template <class _Tp> struct __libcpp_is_function<_Tp, true> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_function
-    : public __libcpp_is_function<_Tp> {};
-
-// is_member_function_pointer
-
-// template <class _Tp> struct            __libcpp_is_member_function_pointer             : public false_type {};
-// template <class _Tp, class _Up> struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {};
-// 
-
-template <class _MP, bool _IsMemberFuctionPtr, bool _IsMemberObjectPtr>
-struct __member_pointer_traits_imp
-{  // forward declaration; specializations later
-};
-
-
-namespace __libcpp_is_member_function_pointer_imp {
-    template <typename _Tp>
-    char __test(typename std::__member_pointer_traits_imp<_Tp, true, false>::_FnType *);
-
-    template <typename>
-    std::__two __test(...);
-};
-    
-template <class _Tp> struct __libcpp_is_member_function_pointer
-    : public integral_constant<bool, sizeof(__libcpp_is_member_function_pointer_imp::__test<_Tp>(nullptr)) == 1> {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_member_function_pointer
-    : public __libcpp_is_member_function_pointer<typename remove_cv<_Tp>::type> {};
-
-// is_member_pointer
-
-template <class _Tp>            struct __libcpp_is_member_pointer             : public false_type {};
-template <class _Tp, class _Up> struct __libcpp_is_member_pointer<_Tp _Up::*> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_member_pointer
-    : public __libcpp_is_member_pointer<typename remove_cv<_Tp>::type> {};
-
-// is_member_object_pointer
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_member_object_pointer
-    : public integral_constant<bool, is_member_pointer<_Tp>::value &&
-                                    !is_member_function_pointer<_Tp>::value> {};
-
-// is_enum
-
-#if __has_feature(is_enum) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_enum
-    : public integral_constant<bool, __is_enum(_Tp)> {};
-
-#else
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_enum
-    : public integral_constant<bool, !is_void<_Tp>::value             &&
-                                     !is_integral<_Tp>::value         &&
-                                     !is_floating_point<_Tp>::value   &&
-                                     !is_array<_Tp>::value            &&
-                                     !is_pointer<_Tp>::value          &&
-                                     !is_reference<_Tp>::value        &&
-                                     !is_member_pointer<_Tp>::value   &&
-                                     !is_union<_Tp>::value            &&
-                                     !is_class<_Tp>::value            &&
-                                     !is_function<_Tp>::value         > {};
-
-#endif
-
-// is_arithmetic
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_arithmetic
-    : public integral_constant<bool, is_integral<_Tp>::value      ||
-                                     is_floating_point<_Tp>::value> {};
-
-// is_fundamental
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_fundamental
-    : public integral_constant<bool, is_void<_Tp>::value        ||
-                                     __is_nullptr_t<_Tp>::value ||
-                                     is_arithmetic<_Tp>::value> {};
-
-// is_scalar
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_scalar
-    : public integral_constant<bool, is_arithmetic<_Tp>::value     ||
-                                     is_member_pointer<_Tp>::value ||
-                                     is_pointer<_Tp>::value        ||
-                                     __is_nullptr_t<_Tp>::value    ||
-                                     is_enum<_Tp>::value           > {};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY is_scalar<nullptr_t> : public true_type {};
-
-// is_object
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_object
-    : public integral_constant<bool, is_scalar<_Tp>::value ||
-                                     is_array<_Tp>::value  ||
-                                     is_union<_Tp>::value  ||
-                                     is_class<_Tp>::value  > {};
-
-// is_compound
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_compound
-    : public integral_constant<bool, !is_fundamental<_Tp>::value> {};
-
-// add_const
-
-template <class _Tp, bool = is_reference<_Tp>::value ||
-                            is_function<_Tp>::value  ||
-                            is_const<_Tp>::value     >
-struct __add_const             {typedef _Tp type;};
-
-template <class _Tp>
-struct __add_const<_Tp, false> {typedef const _Tp type;};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_const
-    {typedef typename __add_const<_Tp>::type type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_const_t = typename add_const<_Tp>::type;
-#endif
-
-// add_volatile
-
-template <class _Tp, bool = is_reference<_Tp>::value ||
-                            is_function<_Tp>::value  ||
-                            is_volatile<_Tp>::value  >
-struct __add_volatile             {typedef _Tp type;};
-
-template <class _Tp>
-struct __add_volatile<_Tp, false> {typedef volatile _Tp type;};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_volatile
-    {typedef typename __add_volatile<_Tp>::type type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_volatile_t = typename add_volatile<_Tp>::type;
-#endif
-
-// add_cv
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_cv
-    {typedef typename add_const<typename add_volatile<_Tp>::type>::type type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_cv_t = typename add_cv<_Tp>::type;
-#endif
-
-// remove_reference
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_reference        {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_reference<_Tp&>  {typedef _Tp type;};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_reference<_Tp&&> {typedef _Tp type;};
-#endif
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_reference_t = typename remove_reference<_Tp>::type;
-#endif
-
-// add_lvalue_reference
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference                      {typedef _Tp& type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<_Tp&>                {typedef _Tp& type;};  // for older compiler
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<void>                {typedef void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<const void>          {typedef const void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<volatile void>       {typedef volatile void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<const volatile void> {typedef const volatile void type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_lvalue_reference_t = typename add_lvalue_reference<_Tp>::type;
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY  add_rvalue_reference                     {typedef _Tp&& type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_rvalue_reference<void>                {typedef void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_rvalue_reference<const void>          {typedef const void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_rvalue_reference<volatile void>       {typedef volatile void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_rvalue_reference<const volatile void> {typedef const volatile void type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_rvalue_reference_t = typename add_rvalue_reference<_Tp>::type;
-#endif
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-typename add_rvalue_reference<_Tp>::type
-declval() _NOEXCEPT;
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-typename add_lvalue_reference<_Tp>::type
-declval();
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-struct __any
-{
-    __any(...);
-};
-
-// remove_pointer
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer                      {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer<_Tp*>                {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer<_Tp* const>          {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer<_Tp* volatile>       {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer<_Tp* const volatile> {typedef _Tp type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_pointer_t = typename remove_pointer<_Tp>::type;
-#endif
-
-// add_pointer
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_pointer
-    {typedef typename remove_reference<_Tp>::type* type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_pointer_t = typename add_pointer<_Tp>::type;
-#endif
-
-// is_signed
-
-template <class _Tp, bool = is_integral<_Tp>::value>
-struct __libcpp_is_signed_impl : public integral_constant<bool, _Tp(-1) < _Tp(0)> {};
-
-template <class _Tp>
-struct __libcpp_is_signed_impl<_Tp, false> : public true_type {};  // floating point
-
-template <class _Tp, bool = is_arithmetic<_Tp>::value>
-struct __libcpp_is_signed : public __libcpp_is_signed_impl<_Tp> {};
-
-template <class _Tp> struct __libcpp_is_signed<_Tp, false> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_signed : public __libcpp_is_signed<_Tp> {};
-
-// is_unsigned
-
-template <class _Tp, bool = is_integral<_Tp>::value>
-struct __libcpp_is_unsigned_impl : public integral_constant<bool, _Tp(0) < _Tp(-1)> {};
-
-template <class _Tp>
-struct __libcpp_is_unsigned_impl<_Tp, false> : public false_type {};  // floating point
-
-template <class _Tp, bool = is_arithmetic<_Tp>::value>
-struct __libcpp_is_unsigned : public __libcpp_is_unsigned_impl<_Tp> {};
-
-template <class _Tp> struct __libcpp_is_unsigned<_Tp, false> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_unsigned : public __libcpp_is_unsigned<_Tp> {};
-
-// rank
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY rank
-    : public integral_constant<size_t, 0> {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY rank<_Tp[]>
-    : public integral_constant<size_t, rank<_Tp>::value + 1> {};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY rank<_Tp[_Np]>
-    : public integral_constant<size_t, rank<_Tp>::value + 1> {};
-
-// extent
-
-template <class _Tp, unsigned _Ip = 0> struct _LIBCPP_TYPE_VIS_ONLY extent
-    : public integral_constant<size_t, 0> {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY extent<_Tp[], 0>
-    : public integral_constant<size_t, 0> {};
-template <class _Tp, unsigned _Ip> struct _LIBCPP_TYPE_VIS_ONLY extent<_Tp[], _Ip>
-    : public integral_constant<size_t, extent<_Tp, _Ip-1>::value> {};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY extent<_Tp[_Np], 0>
-    : public integral_constant<size_t, _Np> {};
-template <class _Tp, size_t _Np, unsigned _Ip> struct _LIBCPP_TYPE_VIS_ONLY extent<_Tp[_Np], _Ip>
-    : public integral_constant<size_t, extent<_Tp, _Ip-1>::value> {};
-
-// remove_extent
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_extent
-    {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_extent<_Tp[]>
-    {typedef _Tp type;};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY remove_extent<_Tp[_Np]>
-    {typedef _Tp type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_extent_t = typename remove_extent<_Tp>::type;
-#endif
-
-// remove_all_extents
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_all_extents
-    {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_all_extents<_Tp[]>
-    {typedef typename remove_all_extents<_Tp>::type type;};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY remove_all_extents<_Tp[_Np]>
-    {typedef typename remove_all_extents<_Tp>::type type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_all_extents_t = typename remove_all_extents<_Tp>::type;
-#endif
-
-// decay
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY decay
-{
-private:
-    typedef typename remove_reference<_Tp>::type _Up;
-public:
-    typedef typename conditional
-                     <
-                         is_array<_Up>::value,
-                         typename remove_extent<_Up>::type*,
-                         typename conditional
-                         <
-                              is_function<_Up>::value,
-                              typename add_pointer<_Up>::type,
-                              typename remove_cv<_Up>::type
-                         >::type
-                     >::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using decay_t = typename decay<_Tp>::type;
-#endif
-
-// is_abstract
-
-namespace __is_abstract_imp
-{
-template <class _Tp> char  __test(_Tp (*)[1]);
-template <class _Tp> __two __test(...);
-}
-
-template <class _Tp, bool = is_class<_Tp>::value>
-struct __libcpp_abstract : public integral_constant<bool, sizeof(__is_abstract_imp::__test<_Tp>(0)) != 1> {};
-
-template <class _Tp> struct __libcpp_abstract<_Tp, false> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_abstract : public __libcpp_abstract<_Tp> {};
-
-// is_final
-
-#if _LIBCPP_STD_VER > 11 && __has_feature(is_final)
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY 
-is_final : public integral_constant<bool, __is_final(_Tp)> {};
-#endif
-
-// is_base_of
-
-#ifdef _LIBCPP_HAS_IS_BASE_OF
-
-template <class _Bp, class _Dp>
-struct _LIBCPP_TYPE_VIS_ONLY is_base_of
-    : public integral_constant<bool, __is_base_of(_Bp, _Dp)> {};
-
-#else  // _LIBCPP_HAS_IS_BASE_OF
-
-namespace __is_base_of_imp
-{
-template <class _Tp>
-struct _Dst
-{
-    _Dst(const volatile _Tp &);
-};
-template <class _Tp>
-struct _Src
-{
-    operator const volatile _Tp &();
-    template <class _Up> operator const _Dst<_Up> &();
-};
-template <size_t> struct __one { typedef char type; };
-template <class _Bp, class _Dp> typename __one<sizeof(_Dst<_Bp>(declval<_Src<_Dp> >()))>::type __test(int);
-template <class _Bp, class _Dp> __two __test(...);
-}
-
-template <class _Bp, class _Dp>
-struct _LIBCPP_TYPE_VIS_ONLY is_base_of
-    : public integral_constant<bool, is_class<_Bp>::value &&
-                                     sizeof(__is_base_of_imp::__test<_Bp, _Dp>(0)) == 2> {};
-
-#endif  // _LIBCPP_HAS_IS_BASE_OF
-
-// is_convertible
-
-#if __has_feature(is_convertible_to)
-
-template <class _T1, class _T2> struct _LIBCPP_TYPE_VIS_ONLY is_convertible
-    : public integral_constant<bool, __is_convertible_to(_T1, _T2) &&
-                                     !is_abstract<_T2>::value> {};
-
-#else  // __has_feature(is_convertible_to)
-
-namespace __is_convertible_imp
-{
-template <class _Tp> void  __test_convert(_Tp);
-
-template <class _From, class _To, class = void>
-struct __is_convertible_test : public false_type {};
-
-template <class _From, class _To>
-struct __is_convertible_test<_From, _To,
-    decltype(__test_convert<_To>(_VSTD::declval<_From>()))> : public true_type
-{};
-
-template <class _Tp> __two __test(...);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> _Tp&& __source();
-#else
-template <class _Tp> typename remove_reference<_Tp>::type& __source();
-#endif
-
-template <class _Tp, bool _IsArray =    is_array<_Tp>::value,
-                     bool _IsFunction = is_function<_Tp>::value,
-                     bool _IsVoid =     is_void<_Tp>::value>
-                     struct __is_array_function_or_void                          {enum {value = 0};};
-template <class _Tp> struct __is_array_function_or_void<_Tp, true, false, false> {enum {value = 1};};
-template <class _Tp> struct __is_array_function_or_void<_Tp, false, true, false> {enum {value = 2};};
-template <class _Tp> struct __is_array_function_or_void<_Tp, false, false, true> {enum {value = 3};};
-}
-
-template <class _Tp,
-    unsigned = __is_convertible_imp::__is_array_function_or_void<typename remove_reference<_Tp>::type>::value>
-struct __is_convertible_check
-{
-    static const size_t __v = 0;
-};
-
-template <class _Tp>
-struct __is_convertible_check<_Tp, 0>
-{
-    static const size_t __v = sizeof(_Tp);
-};
-
-template <class _T1, class _T2,
-    unsigned _T1_is_array_function_or_void = __is_convertible_imp::__is_array_function_or_void<_T1>::value,
-    unsigned _T2_is_array_function_or_void = __is_convertible_imp::__is_array_function_or_void<_T2>::value>
-struct __is_convertible
-    : public integral_constant<bool,
-        __is_convertible_imp::__is_convertible_test<_T1, _T2>::value
-#if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-         && !(!is_function<_T1>::value && !is_reference<_T1>::value && is_reference<_T2>::value
-              && (!is_const<typename remove_reference<_T2>::type>::value
-                  || is_volatile<typename remove_reference<_T2>::type>::value)
-                  && (is_same<typename remove_cv<_T1>::type,
-                              typename remove_cv<typename remove_reference<_T2>::type>::type>::value
-                      || is_base_of<typename remove_reference<_T2>::type, _T1>::value))
-#endif
-    >
-{};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 1, 0> : false_type {};
-
-template <class _T1> struct __is_convertible<_T1, const _T1&, 1, 0> : true_type {};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _T1> struct __is_convertible<_T1, _T1&&, 1, 0> : true_type {};
-template <class _T1> struct __is_convertible<_T1, const _T1&&, 1, 0> : true_type {};
-template <class _T1> struct __is_convertible<_T1, volatile _T1&&, 1, 0> : true_type {};
-template <class _T1> struct __is_convertible<_T1, const volatile _T1&&, 1, 0> : true_type {};
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2*, 1, 0>
-    : public integral_constant<bool, __is_convertible<typename remove_all_extents<_T1>::type*, _T2*>::value> {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2* const, 1, 0>
-    : public integral_constant<bool, __is_convertible<typename remove_all_extents<_T1>::type*, _T2*const>::value> {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2* volatile, 1, 0>
-    : public integral_constant<bool, __is_convertible<typename remove_all_extents<_T1>::type*, _T2*volatile>::value> {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2* const volatile, 1, 0>
-    : public integral_constant<bool, __is_convertible<typename remove_all_extents<_T1>::type*, _T2*const volatile>::value> {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 2, 0>                : public false_type {};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _T1>            struct __is_convertible<_T1, _T1&&, 2, 0>               : public true_type {};
-#endif
-template <class _T1>            struct __is_convertible<_T1, _T1&, 2, 0>               : public true_type {};
-template <class _T1>            struct __is_convertible<_T1, _T1*, 2, 0>               : public true_type {};
-template <class _T1>            struct __is_convertible<_T1, _T1*const, 2, 0>          : public true_type {};
-template <class _T1>            struct __is_convertible<_T1, _T1*volatile, 2, 0>       : public true_type {};
-template <class _T1>            struct __is_convertible<_T1, _T1*const volatile, 2, 0> : public true_type {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 3, 0> : public false_type {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 0, 1> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 1, 1> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 2, 1> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 3, 1> : public false_type {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 0, 2> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 1, 2> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 2, 2> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 3, 2> : public false_type {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 0, 3> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 1, 3> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 2, 3> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 3, 3> : public true_type {};
-
-template <class _T1, class _T2> struct _LIBCPP_TYPE_VIS_ONLY is_convertible
-    : public __is_convertible<_T1, _T2>
-{
-    static const size_t __complete_check1 = __is_convertible_check<_T1>::__v;
-    static const size_t __complete_check2 = __is_convertible_check<_T2>::__v;
-};
-
-#endif  // __has_feature(is_convertible_to)
-
-// is_empty
-
-#if __has_feature(is_empty) || (_GNUC_VER >= 407)
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_empty
-    : public integral_constant<bool, __is_empty(_Tp)> {};
-
-#else  // __has_feature(is_empty)
-
-template <class _Tp>
-struct __is_empty1
-    : public _Tp
-{
-    double __lx;
-};
-
-struct __is_empty2
-{
-    double __lx;
-};
-
-template <class _Tp, bool = is_class<_Tp>::value>
-struct __libcpp_empty : public integral_constant<bool, sizeof(__is_empty1<_Tp>) == sizeof(__is_empty2)> {};
-
-template <class _Tp> struct __libcpp_empty<_Tp, false> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_empty : public __libcpp_empty<_Tp> {};
-
-#endif  // __has_feature(is_empty)
-
-// is_polymorphic
-
-#if __has_feature(is_polymorphic) || defined(_LIBCPP_MSVC)
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_polymorphic
-    : public integral_constant<bool, __is_polymorphic(_Tp)> {};
-
-#else
-
-template<typename _Tp> char &__is_polymorphic_impl(
-    typename enable_if<sizeof((_Tp*)dynamic_cast<const volatile void*>(declval<_Tp*>())) != 0,
-                       int>::type);
-template<typename _Tp> __two &__is_polymorphic_impl(...);
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_polymorphic
-    : public integral_constant<bool, sizeof(__is_polymorphic_impl<_Tp>(0)) == 1> {};
-
-#endif // __has_feature(is_polymorphic)
-
-// has_virtual_destructor
-
-#if __has_feature(has_virtual_destructor) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY has_virtual_destructor
-    : public integral_constant<bool, __has_virtual_destructor(_Tp)> {};
-
-#else
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY has_virtual_destructor
-    : public false_type {};
-
-#endif
-
-// alignment_of
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY alignment_of
-    : public integral_constant<size_t, __alignof__(_Tp)> {};
-
-// aligned_storage
-
-template <class _Hp, class _Tp>
-struct __type_list
-{
-    typedef _Hp _Head;
-    typedef _Tp _Tail;
-};
-
-struct __nat
-{
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __nat() = delete;
-    __nat(const __nat&) = delete;
-    __nat& operator=(const __nat&) = delete;
-    ~__nat() = delete;
-#endif
-};
-
-template <class _Tp>
-struct __align_type
-{
-    static const size_t value = alignment_of<_Tp>::value;
-    typedef _Tp type;
-};
-
-struct __struct_double {long double __lx;};
-struct __struct_double4 {double __lx[4];};
-
-typedef
-    __type_list<__align_type<unsigned char>,
-    __type_list<__align_type<unsigned short>,
-    __type_list<__align_type<unsigned int>,
-    __type_list<__align_type<unsigned long>,
-    __type_list<__align_type<unsigned long long>,
-    __type_list<__align_type<double>,
-    __type_list<__align_type<long double>,
-    __type_list<__align_type<__struct_double>,
-    __type_list<__align_type<__struct_double4>,
-    __type_list<__align_type<int*>,
-    __nat
-    > > > > > > > > > > __all_types;
-
-template <class _TL, size_t _Align> struct __find_pod;
-
-template <class _Hp, size_t _Align>
-struct __find_pod<__type_list<_Hp, __nat>, _Align>
-{
-    typedef typename conditional<
-                             _Align == _Hp::value,
-                             typename _Hp::type,
-                             void
-                         >::type type;
-};
-
-template <class _Hp, class _Tp, size_t _Align>
-struct __find_pod<__type_list<_Hp, _Tp>, _Align>
-{
-    typedef typename conditional<
-                             _Align == _Hp::value,
-                             typename _Hp::type,
-                             typename __find_pod<_Tp, _Align>::type
-                         >::type type;
-};
-
-template <class _TL, size_t _Len> struct __find_max_align;
-
-template <class _Hp, size_t _Len>
-struct __find_max_align<__type_list<_Hp, __nat>, _Len> : public integral_constant<size_t, _Hp::value> {};
-
-template <size_t _Len, size_t _A1, size_t _A2>
-struct __select_align
-{
-private:
-    static const size_t __min = _A2 < _A1 ? _A2 : _A1;
-    static const size_t __max = _A1 < _A2 ? _A2 : _A1;
-public:
-    static const size_t value = _Len < __max ? __min : __max;
-};
-
-template <class _Hp, class _Tp, size_t _Len>
-struct __find_max_align<__type_list<_Hp, _Tp>, _Len>
-    : public integral_constant<size_t, __select_align<_Len, _Hp::value, __find_max_align<_Tp, _Len>::value>::value> {};
-
-template <size_t _Len, size_t _Align = __find_max_align<__all_types, _Len>::value>
-struct _LIBCPP_TYPE_VIS_ONLY aligned_storage
-{
-    typedef typename __find_pod<__all_types, _Align>::type _Aligner;
-    static_assert(!is_void<_Aligner>::value, "");
-    union type
-    {
-        _Aligner __align;
-        unsigned char __data[_Len];
-    };
-};
-
-#if _LIBCPP_STD_VER > 11
-template <size_t _Len, size_t _Align = __find_max_align<__all_types, _Len>::value>
-    using aligned_storage_t = typename aligned_storage<_Len, _Align>::type;
-#endif
-
-#define _CREATE_ALIGNED_STORAGE_SPECIALIZATION(n) \
-template <size_t _Len>\
-struct _LIBCPP_TYPE_VIS_ONLY aligned_storage<_Len, n>\
-{\
-    struct _ALIGNAS(n) type\
-    {\
-        unsigned char __lx[_Len];\
-    };\
-}
-
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x1);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x2);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x4);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x8);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x10);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x20);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x40);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x80);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x100);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x200);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x400);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x800);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x1000);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x2000);
-// MSDN says that MSVC does not support alignment beyond 8192 (=0x2000)
-#if !defined(_LIBCPP_MSVC)
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x4000);
-#endif // !_LIBCPP_MSVC
-
-#undef _CREATE_ALIGNED_STORAGE_SPECIALIZATION
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// aligned_union
-
-template <size_t _I0, size_t ..._In>
-struct __static_max;
-
-template <size_t _I0>
-struct __static_max<_I0>
-{
-    static const size_t value = _I0;
-};
-
-template <size_t _I0, size_t _I1, size_t ..._In>
-struct __static_max<_I0, _I1, _In...>
-{
-    static const size_t value = _I0 >= _I1 ? __static_max<_I0, _In...>::value :
-                                             __static_max<_I1, _In...>::value;
-};
-
-template <size_t _Len, class _Type0, class ..._Types>
-struct aligned_union
-{
-    static const size_t alignment_value = __static_max<__alignof__(_Type0),
-                                                       __alignof__(_Types)...>::value;
-    static const size_t __len = __static_max<_Len, sizeof(_Type0),
-                                             sizeof(_Types)...>::value;
-    typedef typename aligned_storage<__len, alignment_value>::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <size_t _Len, class ..._Types> using aligned_union_t = typename aligned_union<_Len, _Types...>::type;
-#endif
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp>
-struct __numeric_type
-{
-   static void __test(...);
-   static float __test(float);
-   static double __test(char);
-   static double __test(int);
-   static double __test(unsigned);
-   static double __test(long);
-   static double __test(unsigned long);
-   static double __test(long long);
-   static double __test(unsigned long long);
-   static double __test(double);
-   static long double __test(long double);
-
-   typedef decltype(__test(declval<_Tp>())) type;
-   static const bool value = !is_same<type, void>::value;
-};
-
-template <>
-struct __numeric_type<void>
-{
-   static const bool value = true;
-};
-
-// __promote
-
-template <class _A1, class _A2 = void, class _A3 = void,
-          bool = __numeric_type<_A1>::value &&
-                 __numeric_type<_A2>::value &&
-                 __numeric_type<_A3>::value>
-class __promote_imp
-{
-public:
-    static const bool value = false;
-};
-
-template <class _A1, class _A2, class _A3>
-class __promote_imp<_A1, _A2, _A3, true>
-{
-private:
-    typedef typename __promote_imp<_A1>::type __type1;
-    typedef typename __promote_imp<_A2>::type __type2;
-    typedef typename __promote_imp<_A3>::type __type3;
-public:
-    typedef decltype(__type1() + __type2() + __type3()) type;
-    static const bool value = true;
-};
-
-template <class _A1, class _A2>
-class __promote_imp<_A1, _A2, void, true>
-{
-private:
-    typedef typename __promote_imp<_A1>::type __type1;
-    typedef typename __promote_imp<_A2>::type __type2;
-public:
-    typedef decltype(__type1() + __type2()) type;
-    static const bool value = true;
-};
-
-template <class _A1>
-class __promote_imp<_A1, void, void, true>
-{
-public:
-    typedef typename __numeric_type<_A1>::type type;
-    static const bool value = true;
-};
-
-template <class _A1, class _A2 = void, class _A3 = void>
-class __promote : public __promote_imp<_A1, _A2, _A3> {};
-
-#ifdef _LIBCPP_STORE_AS_OPTIMIZATION
-
-// __transform
-
-template <class _Tp, size_t = sizeof(_Tp), bool = is_scalar<_Tp>::value> struct __transform {typedef _Tp type;};
-template <class _Tp> struct __transform<_Tp, 1, true> {typedef unsigned char      type;};
-template <class _Tp> struct __transform<_Tp, 2, true> {typedef unsigned short     type;};
-template <class _Tp> struct __transform<_Tp, 4, true> {typedef unsigned int       type;};
-template <class _Tp> struct __transform<_Tp, 8, true> {typedef unsigned long long type;};
-
-#endif  // _LIBCPP_STORE_AS_OPTIMIZATION
-
-// make_signed / make_unsigned
-
-typedef
-    __type_list<signed char,
-    __type_list<signed short,
-    __type_list<signed int,
-    __type_list<signed long,
-    __type_list<signed long long,
-#ifndef _LIBCPP_HAS_NO_INT128
-    __type_list<__int128_t,
-#endif
-    __nat
-#ifndef _LIBCPP_HAS_NO_INT128
-    >
-#endif
-    > > > > > __signed_types;
-
-typedef
-    __type_list<unsigned char,
-    __type_list<unsigned short,
-    __type_list<unsigned int,
-    __type_list<unsigned long,
-    __type_list<unsigned long long,
-#ifndef _LIBCPP_HAS_NO_INT128
-    __type_list<__uint128_t,
-#endif
-    __nat
-#ifndef _LIBCPP_HAS_NO_INT128
-    >
-#endif
-    > > > > > __unsigned_types;
-
-template <class _TypeList, size_t _Size, bool = _Size <= sizeof(typename _TypeList::_Head)> struct __find_first;
-
-template <class _Hp, class _Tp, size_t _Size>
-struct __find_first<__type_list<_Hp, _Tp>, _Size, true>
-{
-    typedef _Hp type;
-};
-
-template <class _Hp, class _Tp, size_t _Size>
-struct __find_first<__type_list<_Hp, _Tp>, _Size, false>
-{
-    typedef typename __find_first<_Tp, _Size>::type type;
-};
-
-template <class _Tp, class _Up, bool = is_const<typename remove_reference<_Tp>::type>::value,
-                             bool = is_volatile<typename remove_reference<_Tp>::type>::value>
-struct __apply_cv
-{
-    typedef _Up type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp, _Up, true, false>
-{
-    typedef const _Up type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp, _Up, false, true>
-{
-    typedef volatile _Up type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp, _Up, true, true>
-{
-    typedef const volatile _Up type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp&, _Up, false, false>
-{
-    typedef _Up& type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp&, _Up, true, false>
-{
-    typedef const _Up& type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp&, _Up, false, true>
-{
-    typedef volatile _Up& type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp&, _Up, true, true>
-{
-    typedef const volatile _Up& type;
-};
-
-template <class _Tp, bool = is_integral<_Tp>::value || is_enum<_Tp>::value>
-struct __make_signed {};
-
-template <class _Tp>
-struct __make_signed<_Tp, true>
-{
-    typedef typename __find_first<__signed_types, sizeof(_Tp)>::type type;
-};
-
-template <> struct __make_signed<bool,               true> {};
-template <> struct __make_signed<  signed short,     true> {typedef short     type;};
-template <> struct __make_signed<unsigned short,     true> {typedef short     type;};
-template <> struct __make_signed<  signed int,       true> {typedef int       type;};
-template <> struct __make_signed<unsigned int,       true> {typedef int       type;};
-template <> struct __make_signed<  signed long,      true> {typedef long      type;};
-template <> struct __make_signed<unsigned long,      true> {typedef long      type;};
-template <> struct __make_signed<  signed long long, true> {typedef long long type;};
-template <> struct __make_signed<unsigned long long, true> {typedef long long type;};
-#ifndef _LIBCPP_HAS_NO_INT128
-template <> struct __make_signed<__int128_t,         true> {typedef __int128_t type;};
-template <> struct __make_signed<__uint128_t,        true> {typedef __int128_t type;};
-#endif
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY make_signed
-{
-    typedef typename __apply_cv<_Tp, typename __make_signed<typename remove_cv<_Tp>::type>::type>::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using make_signed_t = typename make_signed<_Tp>::type;
-#endif
-
-template <class _Tp, bool = is_integral<_Tp>::value || is_enum<_Tp>::value>
-struct __make_unsigned {};
-
-template <class _Tp>
-struct __make_unsigned<_Tp, true>
-{
-    typedef typename __find_first<__unsigned_types, sizeof(_Tp)>::type type;
-};
-
-template <> struct __make_unsigned<bool,               true> {};
-template <> struct __make_unsigned<  signed short,     true> {typedef unsigned short     type;};
-template <> struct __make_unsigned<unsigned short,     true> {typedef unsigned short     type;};
-template <> struct __make_unsigned<  signed int,       true> {typedef unsigned int       type;};
-template <> struct __make_unsigned<unsigned int,       true> {typedef unsigned int       type;};
-template <> struct __make_unsigned<  signed long,      true> {typedef unsigned long      type;};
-template <> struct __make_unsigned<unsigned long,      true> {typedef unsigned long      type;};
-template <> struct __make_unsigned<  signed long long, true> {typedef unsigned long long type;};
-template <> struct __make_unsigned<unsigned long long, true> {typedef unsigned long long type;};
-#ifndef _LIBCPP_HAS_NO_INT128
-template <> struct __make_unsigned<__int128_t,         true> {typedef __uint128_t        type;};
-template <> struct __make_unsigned<__uint128_t,        true> {typedef __uint128_t        type;};
-#endif
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY make_unsigned
-{
-    typedef typename __apply_cv<_Tp, typename __make_unsigned<typename remove_cv<_Tp>::type>::type>::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using make_unsigned_t = typename make_unsigned<_Tp>::type;
-#endif
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Up = void, class V = void>
-struct _LIBCPP_TYPE_VIS_ONLY common_type
-{
-public:
-    typedef typename common_type<typename common_type<_Tp, _Up>::type, V>::type type;
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp, void, void>
-{
-public:
-    typedef typename decay<_Tp>::type type;
-};
-
-template <class _Tp, class _Up>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp, _Up, void>
-{
-private:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    static _Tp&& __t();
-    static _Up&& __u();
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    static _Tp __t();
-    static _Up __u();
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-public:
-    typedef typename remove_reference<decltype(true ? __t() : __u())>::type type;
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class ..._Tp> struct common_type;
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp>
-{
-    typedef typename decay<_Tp>::type type;
-};
-
-template <class _Tp, class _Up>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp, _Up>
-{
-private:
-    static _Tp&& __t();
-    static _Up&& __u();
-    static bool __f();
-public:
-    typedef typename decay<decltype(__f() ? __t() : __u())>::type type;
-};
-
-template <class _Tp, class _Up, class ..._Vp>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp, _Up, _Vp...>
-{
-    typedef typename common_type<typename common_type<_Tp, _Up>::type, _Vp...>::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class ..._Tp> using common_type_t = typename common_type<_Tp...>::type;
-#endif
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-// is_assignable
-
-template<typename, typename _Tp> struct __select_2nd { typedef _Tp type; };
-
-template <class _Tp, class _Arg>
-typename __select_2nd<decltype((_VSTD::declval<_Tp>() = _VSTD::declval<_Arg>())), true_type>::type
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__is_assignable_test(_Tp&&, _Arg&&);
-#else
-__is_assignable_test(_Tp, _Arg&);
-#endif
-
-template <class _Arg>
-false_type
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__is_assignable_test(__any, _Arg&&);
-#else
-__is_assignable_test(__any, _Arg&);
-#endif
-
-template <class _Tp, class _Arg, bool = is_void<_Tp>::value || is_void<_Arg>::value>
-struct __is_assignable_imp
-    : public common_type
-        <
-            decltype(__is_assignable_test(declval<_Tp>(), declval<_Arg>()))
-        >::type {};
-
-template <class _Tp, class _Arg>
-struct __is_assignable_imp<_Tp, _Arg, true>
-    : public false_type
-{
-};
-
-template <class _Tp, class _Arg>
-struct is_assignable
-    : public __is_assignable_imp<_Tp, _Arg> {};
-
-// is_copy_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_copy_assignable
-    : public is_assignable<typename add_lvalue_reference<_Tp>::type,
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_move_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_move_assignable
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    : public is_assignable<typename add_lvalue_reference<_Tp>::type,
-                     const typename add_rvalue_reference<_Tp>::type> {};
-#else
-    : public is_copy_assignable<_Tp> {};
-#endif
-
-// is_destructible
-
-//  if it's a reference, return true
-//  if it's a function, return false
-//  if it's   void,     return false
-//  if it's an array of unknown bound, return false
-//  Otherwise, return "std::declval<_Up&>().~_Up()" is well-formed
-//    where _Up is remove_all_extents<_Tp>::type
-
-template <class>
-struct __is_destructible_apply { typedef int type; };
-
-template <typename _Tp>
-struct __is_destructor_wellformed {
-    template <typename _Tp1>
-    static char  __test (
-        typename __is_destructible_apply<decltype(_VSTD::declval<_Tp1&>().~_Tp1())>::type
-    );
-
-    template <typename _Tp1>
-    static __two __test (...);
-    
-    static const bool value = sizeof(__test<_Tp>(12)) == sizeof(char);
-};
-
-template <class _Tp, bool>
-struct __destructible_imp;
-
-template <class _Tp>
-struct __destructible_imp<_Tp, false> 
-   : public _VSTD::integral_constant<bool, 
-        __is_destructor_wellformed<typename _VSTD::remove_all_extents<_Tp>::type>::value> {};
-
-template <class _Tp>
-struct __destructible_imp<_Tp, true>
-    : public _VSTD::true_type {};
-
-template <class _Tp, bool>
-struct __destructible_false;
-
-template <class _Tp>
-struct __destructible_false<_Tp, false> : public __destructible_imp<_Tp, _VSTD::is_reference<_Tp>::value> {};
-
-template <class _Tp>
-struct __destructible_false<_Tp, true> : public _VSTD::false_type {};
-
-template <class _Tp>
-struct is_destructible
-    : public __destructible_false<_Tp, _VSTD::is_function<_Tp>::value> {};
-
-template <class _Tp>
-struct is_destructible<_Tp[]>
-    : public _VSTD::false_type {};
-
-template <>
-struct is_destructible<void>
-    : public _VSTD::false_type {};
-
-// move
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename remove_reference<_Tp>::type&&
-move(_Tp&& __t) _NOEXCEPT
-{
-    typedef typename remove_reference<_Tp>::type _Up;
-    return static_cast<_Up&&>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&&
-forward(typename std::remove_reference<_Tp>::type& __t) _NOEXCEPT
-{
-    return static_cast<_Tp&&>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&&
-forward(typename std::remove_reference<_Tp>::type&& __t) _NOEXCEPT
-{
-    static_assert(!std::is_lvalue_reference<_Tp>::value,
-                  "Can not forward an rvalue as an lvalue.");
-    return static_cast<_Tp&&>(__t);
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp&
-move(_Tp& __t)
-{
-    return __t;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const _Tp&
-move(const _Tp& __t)
-{
-    return __t;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp&
-forward(typename std::remove_reference<_Tp>::type& __t) _NOEXCEPT
-{
-    return __t;
-}
-
-
-template <class _Tp>
-class __rv
-{
-    typedef typename remove_reference<_Tp>::type _Trr;
-    _Trr& t_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    _Trr* operator->() {return &t_;}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __rv(_Trr& __t) : t_(__t) {}
-};
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename decay<_Tp>::type
-__decay_copy(_Tp&& __t)
-{
-    return _VSTD::forward<_Tp>(__t);
-}
-
-#else
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename decay<_Tp>::type
-__decay_copy(const _Tp& __t)
-{
-    return _VSTD::forward<_Tp>(__t);
-}
-
-#endif
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-#if __has_feature(cxx_reference_qualified_functions)
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) &, true, false>
-{
-    typedef _Class& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) &, true, false>
-{
-    typedef _Class& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const&, true, false>
-{
-    typedef _Class const& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const&, true, false>
-{
-    typedef _Class const& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) volatile&, true, false>
-{
-    typedef _Class volatile& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) volatile&, true, false>
-{
-    typedef _Class volatile& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const volatile&, true, false>
-{
-    typedef _Class const volatile& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatile&, true, false>
-{
-    typedef _Class const volatile& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) &&, true, false>
-{
-    typedef _Class&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) &&, true, false>
-{
-    typedef _Class&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const&&, true, false>
-{
-    typedef _Class const&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const&&, true, false>
-{
-    typedef _Class const&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) volatile&&, true, false>
-{
-    typedef _Class volatile&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) volatile&&, true, false>
-{
-    typedef _Class volatile&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const volatile&&, true, false>
-{
-    typedef _Class const volatile&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatile&&, true, false>
-{
-    typedef _Class const volatile&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-#endif  // __has_feature(cxx_reference_qualified_functions)
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) ();
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (...);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)() const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) ();
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (...);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)() volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) ();
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (...);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)() const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) ();
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (...);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp _Class::*, false, true>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-};
-
-template <class _MP>
-struct __member_pointer_traits
-    : public __member_pointer_traits_imp<typename remove_cv<_MP>::type,
-                    is_member_function_pointer<_MP>::value,
-                    is_member_object_pointer<_MP>::value>
-{
-//     typedef ... _ClassType;
-//     typedef ... _ReturnType;
-//     typedef ... _FnType;
-};
-
-// result_of
-
-template <class _Callable> class result_of;
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Fn, bool, bool>
-class __result_of
-{
-};
-
-template <class _Fn>
-class __result_of<_Fn(), true, false>
-{
-public:
-    typedef decltype(declval<_Fn>()()) type;
-};
-
-template <class _Fn, class _A0>
-class __result_of<_Fn(_A0), true, false>
-{
-public:
-    typedef decltype(declval<_Fn>()(declval<_A0>())) type;
-};
-
-template <class _Fn, class _A0, class _A1>
-class __result_of<_Fn(_A0, _A1), true, false>
-{
-public:
-    typedef decltype(declval<_Fn>()(declval<_A0>(), declval<_A1>())) type;
-};
-
-template <class _Fn, class _A0, class _A1, class _A2>
-class __result_of<_Fn(_A0, _A1, _A2), true, false>
-{
-public:
-    typedef decltype(declval<_Fn>()(declval<_A0>(), declval<_A1>(), declval<_A2>())) type;
-};
-
-template <class _MP, class _Tp, bool _IsMemberFunctionPtr>
-struct __result_of_mp;
-
-// member function pointer
-
-template <class _MP, class _Tp>
-struct __result_of_mp<_MP, _Tp, true>
-    : public common_type<typename __member_pointer_traits<_MP>::_ReturnType>
-{
-};
-
-// member data pointer
-
-template <class _MP, class _Tp, bool>
-struct __result_of_mdp;
-
-template <class _Rp, class _Class, class _Tp>
-struct __result_of_mdp<_Rp _Class::*, _Tp, false>
-{
-    typedef typename __apply_cv<decltype(*_VSTD::declval<_Tp>()), _Rp>::type& type;
-};
-
-template <class _Rp, class _Class, class _Tp>
-struct __result_of_mdp<_Rp _Class::*, _Tp, true>
-{
-    typedef typename __apply_cv<_Tp, _Rp>::type& type;
-};
-
-template <class _Rp, class _Class, class _Tp>
-struct __result_of_mp<_Rp _Class::*, _Tp, false>
-    : public __result_of_mdp<_Rp _Class::*, _Tp,
-            is_base_of<_Class, typename remove_reference<_Tp>::type>::value>
-{
-};
-
-
-
-template <class _Fn, class _Tp>
-class __result_of<_Fn(_Tp), false, true>  // _Fn must be member pointer
-    : public __result_of_mp<typename remove_reference<_Fn>::type,
-                            _Tp,
-                            is_member_function_pointer<typename remove_reference<_Fn>::type>::value>
-{
-};
-
-template <class _Fn, class _Tp, class _A0>
-class __result_of<_Fn(_Tp, _A0), false, true>  // _Fn must be member pointer
-    : public __result_of_mp<typename remove_reference<_Fn>::type,
-                            _Tp,
-                            is_member_function_pointer<typename remove_reference<_Fn>::type>::value>
-{
-};
-
-template <class _Fn, class _Tp, class _A0, class _A1>
-class __result_of<_Fn(_Tp, _A0, _A1), false, true>  // _Fn must be member pointer
-    : public __result_of_mp<typename remove_reference<_Fn>::type,
-                            _Tp,
-                            is_member_function_pointer<typename remove_reference<_Fn>::type>::value>
-{
-};
-
-template <class _Fn, class _Tp, class _A0, class _A1, class _A2>
-class __result_of<_Fn(_Tp, _A0, _A1, _A2), false, true>  // _Fn must be member pointer
-    : public __result_of_mp<typename remove_reference<_Fn>::type,
-                            _Tp,
-                            is_member_function_pointer<typename remove_reference<_Fn>::type>::value>
-{
-};
-
-// result_of
-
-template <class _Fn>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fn()>
-    : public __result_of<_Fn(),
-                         is_class<typename remove_reference<_Fn>::type>::value ||
-                         is_function<typename remove_reference<_Fn>::type>::value,
-                         is_member_pointer<typename remove_reference<_Fn>::type>::value
-                        >
-{
-};
-
-template <class _Fn, class _A0>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fn(_A0)>
-    : public __result_of<_Fn(_A0),
-                         is_class<typename remove_reference<_Fn>::type>::value ||
-                         is_function<typename remove_reference<_Fn>::type>::value,
-                         is_member_pointer<typename remove_reference<_Fn>::type>::value
-                        >
-{
-};
-
-template <class _Fn, class _A0, class _A1>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fn(_A0, _A1)>
-    : public __result_of<_Fn(_A0, _A1),
-                         is_class<typename remove_reference<_Fn>::type>::value ||
-                         is_function<typename remove_reference<_Fn>::type>::value,
-                         is_member_pointer<typename remove_reference<_Fn>::type>::value
-                        >
-{
-};
-
-template <class _Fn, class _A0, class _A1, class _A2>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fn(_A0, _A1, _A2)>
-    : public __result_of<_Fn(_A0, _A1, _A2),
-                         is_class<typename remove_reference<_Fn>::type>::value ||
-                         is_function<typename remove_reference<_Fn>::type>::value,
-                         is_member_pointer<typename remove_reference<_Fn>::type>::value
-                        >
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-// template <class T, class... Args> struct is_constructible;
-
-namespace __is_construct
-{
-struct __nat {};
-}
-
-#if __has_feature(is_constructible)
-
-template <class _Tp, class ..._Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible
-    : public integral_constant<bool, __is_constructible(_Tp, _Args...)>
-    {};
-
-#else
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-//      main is_constructible test
-
-template <class _Tp, class ..._Args>
-typename __select_2nd<decltype(_VSTD::move(_Tp(_VSTD::declval<_Args>()...))), true_type>::type
-__is_constructible_test(_Tp&&, _Args&& ...);
-
-template <class ..._Args>
-false_type
-__is_constructible_test(__any, _Args&& ...);
-
-template <bool, class _Tp, class... _Args>
-struct __libcpp_is_constructible // false, _Tp is not a scalar
-    : public common_type
-             <
-                 decltype(__is_constructible_test(declval<_Tp>(), declval<_Args>()...))
-             >::type
-    {};
-
-//      function types are not constructible
-
-template <class _Rp, class... _A1, class... _A2>
-struct __libcpp_is_constructible<false, _Rp(_A1...), _A2...>
-    : public false_type
-    {};
-
-//      handle scalars and reference types
-
-//      Scalars are default constructible, references are not
-
-template <class _Tp>
-struct __libcpp_is_constructible<true, _Tp>
-    : public is_scalar<_Tp>
-    {};
-
-//      Scalars and references are constructible from one arg if that arg is
-//          implicitly convertible to the scalar or reference.
-
-template <class _Tp>
-struct __is_constructible_ref
-{
-    true_type static __lxx(_Tp);
-    false_type static __lxx(...);
-};
-
-template <class _Tp, class _A0>
-struct __libcpp_is_constructible<true, _Tp, _A0>
-    : public common_type
-             <
-                 decltype(__is_constructible_ref<_Tp>::__lxx(declval<_A0>()))
-             >::type
-    {};
-
-//      Scalars and references are not constructible from multiple args.
-
-template <class _Tp, class _A0, class ..._Args>
-struct __libcpp_is_constructible<true, _Tp, _A0, _Args...>
-    : public false_type
-    {};
-
-//      Treat scalars and reference types separately
-
-template <bool, class _Tp, class... _Args>
-struct __is_constructible_void_check
-    : public __libcpp_is_constructible<is_scalar<_Tp>::value || is_reference<_Tp>::value,
-                                _Tp, _Args...>
-    {};
-
-//      If any of T or Args is void, is_constructible should be false
-
-template <class _Tp, class... _Args>
-struct __is_constructible_void_check<true, _Tp, _Args...>
-    : public false_type
-    {};
-
-template <class ..._Args> struct __contains_void;
-
-template <> struct __contains_void<> : false_type {};
-
-template <class _A0, class ..._Args>
-struct __contains_void<_A0, _Args...>
-{
-    static const bool value = is_void<_A0>::value ||
-                              __contains_void<_Args...>::value;
-};
-
-//      is_constructible entry point
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible
-    : public __is_constructible_void_check<__contains_void<_Tp, _Args...>::value
-                                        || is_abstract<_Tp>::value,
-                                           _Tp, _Args...>
-    {};
-
-//      Array types are default constructible if their element type
-//      is default constructible
-
-template <class _Ap, size_t _Np>
-struct __libcpp_is_constructible<false, _Ap[_Np]>
-    : public is_constructible<typename remove_all_extents<_Ap>::type>
-    {};
-
-//      Otherwise array types are not constructible by this syntax
-
-template <class _Ap, size_t _Np, class ..._Args>
-struct __libcpp_is_constructible<false, _Ap[_Np], _Args...>
-    : public false_type
-    {};
-
-//      Incomplete array types are not constructible
-
-template <class _Ap, class ..._Args>
-struct __libcpp_is_constructible<false, _Ap[], _Args...>
-    : public false_type
-    {};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-// template <class T> struct is_constructible0;
-
-//      main is_constructible0 test
-
-template <class _Tp>
-decltype((_Tp(), true_type()))
-__is_constructible0_test(_Tp&);
-
-false_type
-__is_constructible0_test(__any);
-
-template <class _Tp, class _A0>
-decltype((_Tp(_VSTD::declval<_A0>()), true_type()))
-__is_constructible1_test(_Tp&, _A0&);
-
-template <class _A0>
-false_type
-__is_constructible1_test(__any, _A0&);
-
-template <class _Tp, class _A0, class _A1>
-decltype((_Tp(_VSTD::declval<_A0>(), _VSTD::declval<_A1>()), true_type()))
-__is_constructible2_test(_Tp&, _A0&, _A1&);
-
-template <class _A0, class _A1>
-false_type
-__is_constructible2_test(__any, _A0&, _A1&);
-
-template <bool, class _Tp>
-struct __is_constructible0_imp // false, _Tp is not a scalar
-    : public common_type
-             <
-                 decltype(__is_constructible0_test(declval<_Tp&>()))
-             >::type
-    {};
-
-template <bool, class _Tp, class _A0>
-struct __is_constructible1_imp // false, _Tp is not a scalar
-    : public common_type
-             <
-                 decltype(__is_constructible1_test(declval<_Tp&>(), declval<_A0&>()))
-             >::type
-    {};
-
-template <bool, class _Tp, class _A0, class _A1>
-struct __is_constructible2_imp // false, _Tp is not a scalar
-    : public common_type
-             <
-                 decltype(__is_constructible2_test(declval<_Tp&>(), declval<_A0>(), declval<_A1>()))
-             >::type
-    {};
-
-//      handle scalars and reference types
-
-//      Scalars are default constructible, references are not
-
-template <class _Tp>
-struct __is_constructible0_imp<true, _Tp>
-    : public is_scalar<_Tp>
-    {};
-
-template <class _Tp, class _A0>
-struct __is_constructible1_imp<true, _Tp, _A0>
-    : public is_convertible<_A0, _Tp>
-    {};
-
-template <class _Tp, class _A0, class _A1>
-struct __is_constructible2_imp<true, _Tp, _A0, _A1>
-    : public false_type
-    {};
-
-//      Treat scalars and reference types separately
-
-template <bool, class _Tp>
-struct __is_constructible0_void_check
-    : public __is_constructible0_imp<is_scalar<_Tp>::value || is_reference<_Tp>::value,
-                                _Tp>
-    {};
-
-template <bool, class _Tp, class _A0>
-struct __is_constructible1_void_check
-    : public __is_constructible1_imp<is_scalar<_Tp>::value || is_reference<_Tp>::value,
-                                _Tp, _A0>
-    {};
-
-template <bool, class _Tp, class _A0, class _A1>
-struct __is_constructible2_void_check
-    : public __is_constructible2_imp<is_scalar<_Tp>::value || is_reference<_Tp>::value,
-                                _Tp, _A0, _A1>
-    {};
-
-//      If any of T or Args is void, is_constructible should be false
-
-template <class _Tp>
-struct __is_constructible0_void_check<true, _Tp>
-    : public false_type
-    {};
-
-template <class _Tp, class _A0>
-struct __is_constructible1_void_check<true, _Tp, _A0>
-    : public false_type
-    {};
-
-template <class _Tp, class _A0, class _A1>
-struct __is_constructible2_void_check<true, _Tp, _A0, _A1>
-    : public false_type
-    {};
-
-//      is_constructible entry point
-
-template <class _Tp, class _A0 = __is_construct::__nat,
-                     class _A1 = __is_construct::__nat>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible
-    : public __is_constructible2_void_check<is_void<_Tp>::value
-                                        || is_abstract<_Tp>::value
-                                        || is_function<_Tp>::value
-                                        || is_void<_A0>::value
-                                        || is_void<_A1>::value,
-                                           _Tp, _A0, _A1>
-    {};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible<_Tp, __is_construct::__nat, __is_construct::__nat>
-    : public __is_constructible0_void_check<is_void<_Tp>::value
-                                        || is_abstract<_Tp>::value
-                                        || is_function<_Tp>::value,
-                                           _Tp>
-    {};
-
-template <class _Tp, class _A0>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible<_Tp, _A0, __is_construct::__nat>
-    : public __is_constructible1_void_check<is_void<_Tp>::value
-                                        || is_abstract<_Tp>::value
-                                        || is_function<_Tp>::value
-                                        || is_void<_A0>::value,
-                                           _Tp, _A0>
-    {};
-
-//      Array types are default constructible if their element type
-//      is default constructible
-
-template <class _Ap, size_t _Np>
-struct __is_constructible0_imp<false, _Ap[_Np]>
-    : public is_constructible<typename remove_all_extents<_Ap>::type>
-    {};
-
-template <class _Ap, size_t _Np, class _A0>
-struct __is_constructible1_imp<false, _Ap[_Np], _A0>
-    : public false_type
-    {};
-
-template <class _Ap, size_t _Np, class _A0, class _A1>
-struct __is_constructible2_imp<false, _Ap[_Np], _A0, _A1>
-    : public false_type
-    {};
-
-//      Incomplete array types are not constructible
-
-template <class _Ap>
-struct __is_constructible0_imp<false, _Ap[]>
-    : public false_type
-    {};
-
-template <class _Ap, class _A0>
-struct __is_constructible1_imp<false, _Ap[], _A0>
-    : public false_type
-    {};
-
-template <class _Ap, class _A0, class _A1>
-struct __is_constructible2_imp<false, _Ap[], _A0, _A1>
-    : public false_type
-    {};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // __has_feature(is_constructible)
-
-// is_default_constructible
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_default_constructible
-    : public is_constructible<_Tp>
-    {};
-
-// is_copy_constructible
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_copy_constructible
-    : public is_constructible<_Tp, 
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_move_constructible
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_move_constructible
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    : public is_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
-#else
-    : public is_copy_constructible<_Tp>
-#endif
-    {};
-
-// is_trivially_constructible
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-#if __has_feature(is_trivially_constructible)
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible
-    : integral_constant<bool, __is_trivially_constructible(_Tp, _Args...)>
-{
-};
-
-#else  // !__has_feature(is_trivially_constructible)
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible
-    : false_type
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp>
-#if __has_feature(has_trivial_constructor) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_trivial_constructor(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp&&>
-#else
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp>
-#endif
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, const _Tp&>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp&>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-#endif  // !__has_feature(is_trivially_constructible)
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _A0 = __is_construct::__nat,
-                     class _A1 = __is_construct::__nat>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible
-    : false_type
-{
-};
-
-#if __has_feature(is_trivially_constructible)
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, __is_construct::__nat,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, __is_trivially_constructible(_Tp)>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, __is_trivially_constructible(_Tp, _Tp)>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, const _Tp&,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, __is_trivially_constructible(_Tp, const _Tp&)>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp&,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, __is_trivially_constructible(_Tp, _Tp&)>
-{
-};
-
-#else  // !__has_feature(is_trivially_constructible)
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, __is_construct::__nat,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, const _Tp&,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp&,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-#endif  // !__has_feature(is_trivially_constructible)
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-// is_trivially_default_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_default_constructible
-    : public is_trivially_constructible<_Tp>
-    {};
-
-// is_trivially_copy_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_copy_constructible
-    : public is_trivially_constructible<_Tp, typename add_lvalue_reference<const _Tp>::type>
-    {};
-
-// is_trivially_move_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_move_constructible
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    : public is_trivially_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
-#else
-    : public is_trivially_copy_constructible<_Tp>
-#endif
-    {};
-
-// is_trivially_assignable
-
-#if __has_feature(is_trivially_assignable)
-
-template <class _Tp, class _Arg>
-struct is_trivially_assignable
-    : integral_constant<bool, __is_trivially_assignable(_Tp, _Arg)>
-{
-};
-
-#else  // !__has_feature(is_trivially_assignable)
-
-template <class _Tp, class _Arg>
-struct is_trivially_assignable
-    : public false_type {};
-
-template <class _Tp>
-struct is_trivially_assignable<_Tp&, _Tp>
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-
-template <class _Tp>
-struct is_trivially_assignable<_Tp&, _Tp&>
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-
-template <class _Tp>
-struct is_trivially_assignable<_Tp&, const _Tp&>
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-struct is_trivially_assignable<_Tp&, _Tp&&>
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#endif  // !__has_feature(is_trivially_assignable)
-
-// is_trivially_copy_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_copy_assignable
-    : public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_trivially_move_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_move_assignable
-    : public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-                                     typename add_rvalue_reference<_Tp>::type>
-#else
-                                     typename add_lvalue_reference<_Tp>::type>
-#endif
-    {};
-
-// is_trivially_destructible
-
-#if __has_feature(has_trivial_destructor) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_destructible
-    : public integral_constant<bool, is_destructible<_Tp>::value && __has_trivial_destructor(_Tp)> {};
-
-#else
-
-template <class _Tp> struct __libcpp_trivial_destructor
-    : public integral_constant<bool, is_scalar<_Tp>::value ||
-                                     is_reference<_Tp>::value> {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_destructible
-    : public __libcpp_trivial_destructor<typename remove_all_extents<_Tp>::type> {};
-
-#endif
-
-// is_nothrow_constructible
-
-#if 0
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible
-    : public integral_constant<bool, __is_nothrow_constructible(_Tp(_Args...))>
-{
-};
-
-#else
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-#if __has_feature(cxx_noexcept) || (_GNUC_VER >= 407 && __cplusplus >= 201103L)
-
-template <bool, bool, class _Tp, class... _Args> struct __libcpp_is_nothrow_constructible;
-
-template <class _Tp, class... _Args>
-struct __libcpp_is_nothrow_constructible</*is constructible*/true, /*is reference*/false, _Tp, _Args...>
-    : public integral_constant<bool, noexcept(_Tp(declval<_Args>()...))>
-{
-};
-
-template <class _Tp>
-void __implicit_conversion_to(_Tp) noexcept { }
-
-template <class _Tp, class _Arg>
-struct __libcpp_is_nothrow_constructible</*is constructible*/true, /*is reference*/true, _Tp, _Arg>
-    : public integral_constant<bool, noexcept(__implicit_conversion_to<_Tp>(declval<_Arg>()))>
-{
-};
-
-template <class _Tp, bool _IsReference, class... _Args>
-struct __libcpp_is_nothrow_constructible</*is constructible*/false, _IsReference, _Tp, _Args...>
-    : public false_type
-{
-};
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible
-    : __libcpp_is_nothrow_constructible<is_constructible<_Tp, _Args...>::value, is_reference<_Tp>::value, _Tp, _Args...>
-{
-};
-
-template <class _Tp, size_t _Ns>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp[_Ns]>
-    : __libcpp_is_nothrow_constructible<is_constructible<_Tp>::value, is_reference<_Tp>::value, _Tp>
-{
-};
-
-#else  // __has_feature(cxx_noexcept)
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible
-    : false_type
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp>
-#if __has_feature(has_nothrow_constructor) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_constructor(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp&&>
-#else
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp>
-#endif
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, const _Tp&>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp&>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-#endif  // __has_feature(cxx_noexcept)
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _A0 = __is_construct::__nat,
-                     class _A1 = __is_construct::__nat>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible
-    : false_type
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, __is_construct::__nat,
-                                                       __is_construct::__nat>
-#if __has_feature(has_nothrow_constructor) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_constructor(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp,
-                                                       __is_construct::__nat>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, const _Tp&,
-                                                       __is_construct::__nat>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp&,
-                                                       __is_construct::__nat>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // __has_feature(is_nothrow_constructible)
-
-// is_nothrow_default_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_default_constructible
-    : public is_nothrow_constructible<_Tp>
-    {};
-
-// is_nothrow_copy_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_copy_constructible
-    : public is_nothrow_constructible<_Tp,
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_nothrow_move_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_move_constructible
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    : public is_nothrow_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
-#else
-    : public is_nothrow_copy_constructible<_Tp>
-#endif
-    {};
-
-// is_nothrow_assignable
-
-#if __has_feature(cxx_noexcept) || (_GNUC_VER >= 407 && __cplusplus >= 201103L)
-
-template <bool, class _Tp, class _Arg> struct __libcpp_is_nothrow_assignable;
-
-template <class _Tp, class _Arg>
-struct __libcpp_is_nothrow_assignable<false, _Tp, _Arg>
-    : public false_type
-{
-};
-
-template <class _Tp, class _Arg>
-struct __libcpp_is_nothrow_assignable<true, _Tp, _Arg>
-    : public integral_constant<bool, noexcept(_VSTD::declval<_Tp>() = _VSTD::declval<_Arg>()) >
-{
-};
-
-template <class _Tp, class _Arg>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable
-    : public __libcpp_is_nothrow_assignable<is_assignable<_Tp, _Arg>::value, _Tp, _Arg>
-{
-};
-
-#else  // __has_feature(cxx_noexcept)
-
-template <class _Tp, class _Arg>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable
-    : public false_type {};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable<_Tp&, _Tp>
-#if __has_feature(has_nothrow_assign) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-#endif
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable<_Tp&, _Tp&>
-#if __has_feature(has_nothrow_assign) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-#endif
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable<_Tp&, const _Tp&>
-#if __has_feature(has_nothrow_assign) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-struct is_nothrow_assignable<_Tp&, _Tp&&>
-#if __has_feature(has_nothrow_assign) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-#endif
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#endif  // __has_feature(cxx_noexcept)
-
-// is_nothrow_copy_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_copy_assignable
-    : public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_nothrow_move_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_move_assignable
-    : public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-                                     typename add_rvalue_reference<_Tp>::type>
-#else
-                                     typename add_lvalue_reference<_Tp>::type>
-#endif
-    {};
-
-// is_nothrow_destructible
-
-#if __has_feature(cxx_noexcept) || (_GNUC_VER >= 407 && __cplusplus >= 201103L)
-
-template <bool, class _Tp> struct __libcpp_is_nothrow_destructible;
-
-template <class _Tp>
-struct __libcpp_is_nothrow_destructible<false, _Tp>
-    : public false_type
-{
-};
-
-template <class _Tp>
-struct __libcpp_is_nothrow_destructible<true, _Tp>
-    : public integral_constant<bool, noexcept(_VSTD::declval<_Tp>().~_Tp()) >
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible
-    : public __libcpp_is_nothrow_destructible<is_destructible<_Tp>::value, _Tp>
-{
-};
-
-template <class _Tp, size_t _Ns>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible<_Tp[_Ns]>
-    : public is_nothrow_destructible<_Tp>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible<_Tp&>
-    : public true_type
-{
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible<_Tp&&>
-    : public true_type
-{
-};
-
-#endif
-
-#else
-
-template <class _Tp> struct __libcpp_nothrow_destructor
-    : public integral_constant<bool, is_scalar<_Tp>::value ||
-                                     is_reference<_Tp>::value> {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible
-    : public __libcpp_nothrow_destructor<typename remove_all_extents<_Tp>::type> {};
-
-#endif
-
-// is_pod
-
-#if __has_feature(is_pod) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_pod
-    : public integral_constant<bool, __is_pod(_Tp)> {};
-
-#else
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_pod
-    : public integral_constant<bool, is_trivially_default_constructible<_Tp>::value   &&
-                                     is_trivially_copy_constructible<_Tp>::value      &&
-                                     is_trivially_copy_assignable<_Tp>::value    &&
-                                     is_trivially_destructible<_Tp>::value> {};
-
-#endif
-
-// is_literal_type;
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_literal_type
-#ifdef _LIBCPP_IS_LITERAL
-    : public integral_constant<bool, _LIBCPP_IS_LITERAL(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value ||
-                              is_reference<typename remove_all_extents<_Tp>::type>::value>
-#endif
-    {};
-    
-// is_standard_layout;
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_standard_layout
-#if __has_feature(is_standard_layout) || (_GNUC_VER >= 407)
-    : public integral_constant<bool, __is_standard_layout(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value>
-#endif
-    {};
-    
-// is_trivially_copyable;
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_copyable
-#if __has_feature(is_trivially_copyable)
-    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value>
-#endif
-    {};
-    
-// is_trivial;
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivial
-#if __has_feature(is_trivial) || (_GNUC_VER >= 407)
-    : public integral_constant<bool, __is_trivial(_Tp)>
-#else
-    : integral_constant<bool, is_trivially_copyable<_Tp>::value &&
-                                 is_trivially_default_constructible<_Tp>::value>
-#endif
-    {};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// Check for complete types
-
-template <class ..._Tp> struct __check_complete;
-
-template <>
-struct __check_complete<>
-{
-};
-
-template <class _Hp, class _T0, class ..._Tp>
-struct __check_complete<_Hp, _T0, _Tp...>
-    : private __check_complete<_Hp>,
-      private __check_complete<_T0, _Tp...>
-{
-};
-
-template <class _Hp>
-struct __check_complete<_Hp, _Hp>
-    : private __check_complete<_Hp>
-{
-};
-
-template <class _Tp>
-struct __check_complete<_Tp>
-{
-    static_assert(sizeof(_Tp) > 0, "Type must be complete.");
-};
-
-template <class _Tp>
-struct __check_complete<_Tp&>
-    : private __check_complete<_Tp>
-{
-};
-
-template <class _Tp>
-struct __check_complete<_Tp&&>
-    : private __check_complete<_Tp>
-{
-};
-
-template <class _Rp, class ..._Param>
-struct __check_complete<_Rp (*)(_Param...)>
-    : private __check_complete<_Rp>
-{
-};
-
-template <class ..._Param>
-struct __check_complete<void (*)(_Param...)>
-{
-};
-
-template <class _Rp, class ..._Param>
-struct __check_complete<_Rp (_Param...)>
-    : private __check_complete<_Rp>
-{
-};
-
-template <class ..._Param>
-struct __check_complete<void (_Param...)>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...)>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) volatile>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const volatile>
-    : private __check_complete<_Class>
-{
-};
-
-#if __has_feature(cxx_reference_qualified_functions)
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) &>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) volatile&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const volatile&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) &&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const&&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) volatile&&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const volatile&&>
-    : private __check_complete<_Class>
-{
-};
-
-#endif
-
-template <class _Rp, class _Class>
-struct __check_complete<_Rp _Class::*>
-    : private __check_complete<_Class>
-{
-};
-
-// __invoke forward declarations
-
-// fall back - none of the bullets
-
-template <class ..._Args>
-auto
-__invoke(__any, _Args&& ...__args)
-    -> __nat;
-
-// bullets 1 and 2
-
-template <class _Fp, class _A0, class ..._Args,
-            class = typename enable_if
-            <
-                is_member_function_pointer<typename remove_reference<_Fp>::type>::value &&
-                is_base_of<typename remove_reference<typename __member_pointer_traits<typename remove_reference<_Fp>::type>::_ClassType>::type,
-                           typename remove_reference<_A0>::type>::value
-            >::type
-         >
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
-    -> decltype((_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...));
-
-template <class _Fp, class _A0, class ..._Args,
-            class = typename enable_if
-            <
-                is_member_function_pointer<typename remove_reference<_Fp>::type>::value &&
-                !is_base_of<typename remove_reference<typename __member_pointer_traits<typename remove_reference<_Fp>::type>::_ClassType>::type,
-                           typename remove_reference<_A0>::type>::value
-            >::type
-         >
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
-    -> decltype(((*_VSTD::forward<_A0>(__a0)).*__f)(_VSTD::forward<_Args>(__args)...));
-
-// bullets 3 and 4
-
-template <class _Fp, class _A0,
-            class = typename enable_if
-            <
-                is_member_object_pointer<typename remove_reference<_Fp>::type>::value &&
-                is_base_of<typename __member_pointer_traits<typename remove_reference<_Fp>::type>::_ClassType,
-                           typename remove_reference<_A0>::type>::value
-            >::type
-         >
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0)
-    -> decltype(_VSTD::forward<_A0>(__a0).*__f);
-
-template <class _Fp, class _A0,
-            class = typename enable_if
-            <
-                is_member_object_pointer<typename remove_reference<_Fp>::type>::value &&
-                !is_base_of<typename __member_pointer_traits<typename remove_reference<_Fp>::type>::_ClassType,
-                           typename remove_reference<_A0>::type>::value
-            >::type
-         >
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0)
-    -> decltype((*_VSTD::forward<_A0>(__a0)).*__f);
-
-// bullet 5
-
-template <class _Fp, class ..._Args>
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _Args&& ...__args)
-    -> decltype(_VSTD::forward<_Fp>(__f)(_VSTD::forward<_Args>(__args)...));
-
-// __invokable
-
-template <class _Fp, class ..._Args>
-struct __invokable_imp
-    : private __check_complete<_Fp>
-{
-    typedef decltype(
-            __invoke(_VSTD::declval<_Fp>(), _VSTD::declval<_Args>()...)
-                    ) type;
-    static const bool value = !is_same<type, __nat>::value;
-};
-
-template <class _Fp, class ..._Args>
-struct __invokable
-    : public integral_constant<bool,
-          __invokable_imp<_Fp, _Args...>::value>
-{
-};
-
-// __invoke_of
-
-template <bool _Invokable, class _Fp, class ..._Args>
-struct __invoke_of_imp  // false
-{
-};
-
-template <class _Fp, class ..._Args>
-struct __invoke_of_imp<true, _Fp, _Args...>
-{
-    typedef typename __invokable_imp<_Fp, _Args...>::type type;
-};
-
-template <class _Fp, class ..._Args>
-struct __invoke_of
-    : public __invoke_of_imp<__invokable<_Fp, _Args...>::value, _Fp, _Args...>
-{
-};
-
-template <class _Fp, class ..._Args>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fp(_Args...)>
-    : public __invoke_of<_Fp, _Args...>
-{
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using result_of_t = typename result_of<_Tp>::type;
-#endif
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-typename enable_if
-<
-    is_move_constructible<_Tp>::value &&
-    is_move_assignable<_Tp>::value
->::type
-#else
-void
-#endif
-swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value &&
-                                    is_nothrow_move_assignable<_Tp>::value)
-{
-    _Tp __t(_VSTD::move(__x));
-    __x = _VSTD::move(__y);
-    __y = _VSTD::move(__t);
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
-    //                                  _NOEXCEPT_(_NOEXCEPT_(swap(*__a, *__b)))
-               _NOEXCEPT_(_NOEXCEPT_(swap(*_VSTD::declval<_ForwardIterator1>(),
-                                          *_VSTD::declval<_ForwardIterator2>())))
-{
-    swap(*__a, *__b);
-}
-
-// __swappable
-
-namespace __detail
-{
-
-using _VSTD::swap;
-__nat swap(__any, __any);
-
-template <class _Tp>
-struct __swappable
-{
-    typedef decltype(swap(_VSTD::declval<_Tp&>(), _VSTD::declval<_Tp&>())) type;
-    static const bool value = !is_same<type, __nat>::value;
-};
-
-}  // __detail
-
-template <class _Tp>
-struct __is_swappable
-    : public integral_constant<bool, __detail::__swappable<_Tp>::value>
-{
-};
-
-#if __has_feature(cxx_noexcept) || (_GNUC_VER >= 407 && __cplusplus >= 201103L)
-
-template <bool, class _Tp>
-struct __is_nothrow_swappable_imp
-    : public integral_constant<bool, noexcept(swap(_VSTD::declval<_Tp&>(),
-                                                   _VSTD::declval<_Tp&>()))>
-{
-};
-
-template <class _Tp>
-struct __is_nothrow_swappable_imp<false, _Tp>
-    : public false_type
-{
-};
-
-template <class _Tp>
-struct __is_nothrow_swappable
-    : public __is_nothrow_swappable_imp<__is_swappable<_Tp>::value, _Tp>
-{
-};
-
-#else  // __has_feature(cxx_noexcept)
-
-template <class _Tp>
-struct __is_nothrow_swappable
-    : public false_type
-{
-};
-
-#endif  // __has_feature(cxx_noexcept)
-
-#ifdef _LIBCPP_UNDERLYING_TYPE
-
-template <class _Tp>
-struct underlying_type
-{
-    typedef _LIBCPP_UNDERLYING_TYPE(_Tp) type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using underlying_type_t = typename underlying_type<_Tp>::type;
-#endif
-
-#else  // _LIBCPP_UNDERLYING_TYPE
-
-template <class _Tp, bool _Support = false>
-struct underlying_type
-{
-    static_assert(_Support, "The underyling_type trait requires compiler "
-                            "support. Either no such support exists or "
-                            "libc++ does not know how to use it.");
-};
-
-#endif // _LIBCPP_UNDERLYING_TYPE
-
-#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-template <class _Tp>
-struct __has_operator_addressof_member_imp
-{
-    template <class _Up>
-        static auto __test(int)
-            -> typename __select_2nd<decltype(_VSTD::declval<_Up>().operator&()), true_type>::type;
-    template <class>
-        static auto __test(long) -> false_type;
-
-    static const bool value = decltype(__test<_Tp>(0))::value;
-};
-
-template <class _Tp>
-struct __has_operator_addressof_free_imp
-{
-    template <class _Up>
-        static auto __test(int)
-            -> typename __select_2nd<decltype(operator&(_VSTD::declval<_Up>())), true_type>::type;
-    template <class>
-        static auto __test(long) -> false_type;
-
-    static const bool value = decltype(__test<_Tp>(0))::value;
-};
-
-template <class _Tp>
-struct __has_operator_addressof
-    : public integral_constant<bool, __has_operator_addressof_member_imp<_Tp>::value
-                                  || __has_operator_addressof_free_imp<_Tp>::value>
-{};
-
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-#if _LIBCPP_STD_VER > 14
-template <class...> using void_t = void;
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_TYPE_TRAITS
diff --git a/include.new/c++/v1/tr1/typeindex b/include.new/c++/v1/tr1/typeindex
deleted file mode 100644
index d4d6ca9..0000000
--- a/include.new/c++/v1/tr1/typeindex
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- typeindex ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_TYPEINDEX
-#define _LIBCPP_TYPEINDEX
-
-/*
-
-    typeindex synopsis
-
-namespace std
-{
-
-class type_index
-{
-public:
-    type_index(const type_info& rhs) noexcept;
-
-    bool operator==(const type_index& rhs) const noexcept;
-    bool operator!=(const type_index& rhs) const noexcept;
-    bool operator< (const type_index& rhs) const noexcept;
-    bool operator<=(const type_index& rhs) const noexcept;
-    bool operator> (const type_index& rhs) const noexcept;
-    bool operator>=(const type_index& rhs) const noexcept;
-
-    size_t hash_code() const noexcept;
-    const char* name() const noexcept;
-};
-
-template <>
-struct hash<type_index>
-    : public unary_function<type_index, size_t>
-{
-    size_t operator()(type_index index) const noexcept;
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <typeinfo>
-#include <__functional_base>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS_ONLY type_index
-{
-    const type_info* __t_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    type_index(const type_info& __y) _NOEXCEPT : __t_(&__y) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const type_index& __y) const _NOEXCEPT
-        {return *__t_ == *__y.__t_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const type_index& __y) const _NOEXCEPT
-        {return *__t_ != *__y.__t_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator< (const type_index& __y) const _NOEXCEPT
-        {return  __t_->before(*__y.__t_);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator<=(const type_index& __y) const _NOEXCEPT
-        {return !__y.__t_->before(*__t_);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator> (const type_index& __y) const _NOEXCEPT
-        {return  __y.__t_->before(*__t_);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator>=(const type_index& __y) const _NOEXCEPT
-        {return !__t_->before(*__y.__t_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t hash_code() const _NOEXCEPT {return __t_->hash_code();}
-    _LIBCPP_INLINE_VISIBILITY
-    const char* name() const _NOEXCEPT {return __t_->name();}
-};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY hash;
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<type_index>
-    : public unary_function<type_index, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(type_index __index) const _NOEXCEPT
-        {return __index.hash_code();}
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_TYPEINDEX
diff --git a/include.new/c++/v1/tr1/typeinfo b/include.new/c++/v1/tr1/typeinfo
deleted file mode 100644
index 14ef77b..0000000
--- a/include.new/c++/v1/tr1/typeinfo
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- typeinfo ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef __LIBCPP_TYPEINFO
-#define __LIBCPP_TYPEINFO
-
-/*
-
-    typeinfo synopsis
-
-namespace std {
-
-class type_info
-{
-public:
-    virtual ~type_info();
-
-    bool operator==(const type_info& rhs) const noexcept;
-    bool operator!=(const type_info& rhs) const noexcept;
-
-    bool before(const type_info& rhs) const noexcept;
-    size_t hash_code() const noexcept;
-    const char* name() const noexcept;
-
-    type_info(const type_info& rhs) = delete;
-    type_info& operator=(const type_info& rhs) = delete;
-};
-
-class bad_cast
-    : public exception
-{
-public:
-    bad_cast() noexcept;
-    bad_cast(const bad_cast&) noexcept;
-    bad_cast& operator=(const bad_cast&) noexcept;
-    virtual const char* what() const noexcept;
-};
-
-class bad_typeid
-    : public exception
-{
-public:
-    bad_typeid() noexcept;
-    bad_typeid(const bad_typeid&) noexcept;
-    bad_typeid& operator=(const bad_typeid&) noexcept;
-    virtual const char* what() const noexcept;
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <exception>
-#include <cstddef>
-#include <cstdint>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-namespace std  // purposefully not using versioning namespace
-{
-
-class _LIBCPP_EXCEPTION_ABI type_info
-{
-    type_info& operator=(const type_info&);
-    type_info(const type_info&);
-protected:
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-    const char* __type_name;
-#else
-    // A const char* with the non-unique RTTI bit possibly set.
-    uintptr_t __type_name;
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit type_info(const char* __n)
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        : __type_name(__n) {}
-#else
-        : __type_name(reinterpret_cast<uintptr_t>(__n)) {}
-#endif
-
-public:
-    virtual ~type_info();
-
-    _LIBCPP_INLINE_VISIBILITY
-    const char* name() const _NOEXCEPT
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        {return __type_name;}
-#else
-        {return reinterpret_cast<const char*>(__type_name & ~_LIBCPP_NONUNIQUE_RTTI_BIT);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool before(const type_info& __arg) const _NOEXCEPT
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        {return __type_name < __arg.__type_name;}
-#else
-        {if (!((__type_name & __arg.__type_name) & _LIBCPP_NONUNIQUE_RTTI_BIT))
-           return __type_name < __arg.__type_name;
-         return __compare_nonunique_names(__arg) < 0;}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t hash_code() const _NOEXCEPT
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        {return *reinterpret_cast<const size_t*>(&__type_name);}
-#else
-        {if (!(__type_name & _LIBCPP_NONUNIQUE_RTTI_BIT)) return __type_name;
-         const char *__ptr = name();
-         size_t __hash = 5381;
-         while (unsigned char __c = static_cast<unsigned char>(*__ptr++))
-           __hash = (__hash * 33) ^ __c;
-         return __hash;}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const type_info& __arg) const _NOEXCEPT
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        {return __type_name == __arg.__type_name;}
-#else
-        {if (__type_name == __arg.__type_name) return true;
-         if (!((__type_name & __arg.__type_name) & _LIBCPP_NONUNIQUE_RTTI_BIT))
-           return false;
-         return __compare_nonunique_names(__arg) == 0;}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const type_info& __arg) const _NOEXCEPT
-        {return !operator==(__arg);}
-
-#ifdef _LIBCPP_NONUNIQUE_RTTI_BIT
-  private:
-    _LIBCPP_INLINE_VISIBILITY
-    int __compare_nonunique_names(const type_info &__arg) const _NOEXCEPT
-        {return __builtin_strcmp(name(), __arg.name());}
-#endif
-};
-
-class _LIBCPP_EXCEPTION_ABI bad_cast
-    : public exception
-{
-public:
-    bad_cast() _NOEXCEPT;
-    virtual ~bad_cast() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI bad_typeid
-    : public exception
-{
-public:
-    bad_typeid() _NOEXCEPT;
-    virtual ~bad_typeid() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-}  // std
-
-#endif  // __LIBCPP_TYPEINFO
diff --git a/include.new/c++/v1/tr1/unordered_map b/include.new/c++/v1/tr1/unordered_map
deleted file mode 100644
index 0fa87d1..0000000
--- a/include.new/c++/v1/tr1/unordered_map
+++ /dev/null
@@ -1,2084 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- unordered_map -----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_UNORDERED_MAP
-#define _LIBCPP_UNORDERED_MAP
-
-/*
-
-    unordered_map synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-template <class Key, class T, class Hash = hash<Key>, class Pred = equal_to<Key>,
-          class Alloc = allocator<pair<const Key, T>>>
-class unordered_map
-{
-public:
-    // types
-    typedef Key                                                        key_type;
-    typedef T                                                          mapped_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef pair<const key_type, mapped_type>                          value_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-    typedef /unspecified/ local_iterator;
-    typedef /unspecified/ const_local_iterator;
-
-    unordered_map()
-        noexcept(
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value &&
-            is_nothrow_default_constructible<allocator_type>::value);
-    explicit unordered_map(size_type n, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        unordered_map(InputIterator f, InputIterator l,
-                      size_type n = 0, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    explicit unordered_map(const allocator_type&);
-    unordered_map(const unordered_map&);
-    unordered_map(const unordered_map&, const Allocator&);
-    unordered_map(unordered_map&&)
-        noexcept(
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value &&
-            is_nothrow_move_constructible<allocator_type>::value);
-    unordered_map(unordered_map&&, const Allocator&);
-    unordered_map(initializer_list<value_type>, size_type n = 0,
-                  const hasher& hf = hasher(), const key_equal& eql = key_equal(),
-                  const allocator_type& a = allocator_type());
-    unordered_map(size_type n, const allocator_type& a)
-      : unordered_map(n, hasher(), key_equal(), a) {}  // C++14
-    unordered_map(size_type n, const hasher& hf, const allocator_type& a)
-      : unordered_map(n, hf, key_equal(), a) {}  // C++14
-    template <class InputIterator>
-      unordered_map(InputIterator f, InputIterator l, size_type n, const allocator_type& a)
-      : unordered_map(f, l, n, hasher(), key_equal(), a) {}  // C++14
-    template <class InputIterator>
-      unordered_map(InputIterator f, InputIterator l, size_type n, const hasher& hf, 
-        const allocator_type& a)
-      : unordered_map(f, l, n, hf, key_equal(), a) {}  // C++14
-    unordered_map(initializer_list<value_type> il, size_type n, const allocator_type& a)
-      : unordered_map(il, n, hasher(), key_equal(), a) {}  // C++14
-    unordered_map(initializer_list<value_type> il, size_type n, const hasher& hf, 
-      const allocator_type& a)
-      : unordered_map(il, n, hf, key_equal(), a) {}  // C++14
-    ~unordered_map();
-    unordered_map& operator=(const unordered_map&);
-    unordered_map& operator=(unordered_map&&)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    unordered_map& operator=(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    bool      empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    iterator       begin() noexcept;
-    iterator       end() noexcept;
-    const_iterator begin()  const noexcept;
-    const_iterator end()    const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend()   const noexcept;
-
-    template <class... Args>
-        pair<iterator, bool> emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    pair<iterator, bool> insert(const value_type& obj);
-    template <class P>
-        pair<iterator, bool> insert(P&& obj);
-    iterator insert(const_iterator hint, const value_type& obj);
-    template <class P>
-        iterator insert(const_iterator hint, P&& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type>);
-
-    iterator erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(unordered_map&)
-        noexcept(
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    hasher hash_function() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    mapped_type& operator[](const key_type& k);
-    mapped_type& operator[](key_type&& k);
-
-    mapped_type&       at(const key_type& k);
-    const mapped_type& at(const key_type& k) const;
-
-    size_type bucket_count() const noexcept;
-    size_type max_bucket_count() const noexcept;
-
-    size_type bucket_size(size_type n) const;
-    size_type bucket(const key_type& k) const;
-
-    local_iterator       begin(size_type n);
-    local_iterator       end(size_type n);
-    const_local_iterator begin(size_type n) const;
-    const_local_iterator end(size_type n) const;
-    const_local_iterator cbegin(size_type n) const;
-    const_local_iterator cend(size_type n) const;
-
-    float load_factor() const noexcept;
-    float max_load_factor() const noexcept;
-    void max_load_factor(float z);
-    void rehash(size_type n);
-    void reserve(size_type n);
-};
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    void swap(unordered_map<Key, T, Hash, Pred, Alloc>& x,
-              unordered_map<Key, T, Hash, Pred, Alloc>& y)
-              noexcept(noexcept(x.swap(y)));
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const unordered_map<Key, T, Hash, Pred, Alloc>& x,
-               const unordered_map<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const unordered_map<Key, T, Hash, Pred, Alloc>& x,
-               const unordered_map<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash = hash<Key>, class Pred = equal_to<Key>,
-          class Alloc = allocator<pair<const Key, T>>>
-class unordered_multimap
-{
-public:
-    // types
-    typedef Key                                                        key_type;
-    typedef T                                                          mapped_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef pair<const key_type, mapped_type>                          value_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-    typedef /unspecified/ local_iterator;
-    typedef /unspecified/ const_local_iterator;
-
-    unordered_multimap()
-        noexcept(
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value &&
-            is_nothrow_default_constructible<allocator_type>::value);
-    explicit unordered_multimap(size_type n, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        unordered_multimap(InputIterator f, InputIterator l,
-                      size_type n = 0, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    explicit unordered_multimap(const allocator_type&);
-    unordered_multimap(const unordered_multimap&);
-    unordered_multimap(const unordered_multimap&, const Allocator&);
-    unordered_multimap(unordered_multimap&&)
-        noexcept(
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value &&
-            is_nothrow_move_constructible<allocator_type>::value);
-    unordered_multimap(unordered_multimap&&, const Allocator&);
-    unordered_multimap(initializer_list<value_type>, size_type n = 0,
-                  const hasher& hf = hasher(), const key_equal& eql = key_equal(),
-                  const allocator_type& a = allocator_type());
-    unordered_multimap(size_type n, const allocator_type& a)
-      : unordered_multimap(n, hasher(), key_equal(), a) {}  // C++14
-    unordered_multimap(size_type n, const hasher& hf, const allocator_type& a)
-      : unordered_multimap(n, hf, key_equal(), a) {}  // C++14
-    template <class InputIterator>
-      unordered_multimap(InputIterator f, InputIterator l, size_type n, const allocator_type& a)
-      : unordered_multimap(f, l, n, hasher(), key_equal(), a) {}  // C++14
-    template <class InputIterator>
-      unordered_multimap(InputIterator f, InputIterator l, size_type n, const hasher& hf, 
-        const allocator_type& a)
-      : unordered_multimap(f, l, n, hf, key_equal(), a) {}  // C++14
-    unordered_multimap(initializer_list<value_type> il, size_type n, const allocator_type& a)
-      : unordered_multimap(il, n, hasher(), key_equal(), a) {}  // C++14
-    unordered_multimap(initializer_list<value_type> il, size_type n, const hasher& hf, 
-      const allocator_type& a)
-      : unordered_multimap(il, n, hf, key_equal(), a) {}  // C++14
-    ~unordered_multimap();
-    unordered_multimap& operator=(const unordered_multimap&);
-    unordered_multimap& operator=(unordered_multimap&&)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    unordered_multimap& operator=(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    bool      empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    iterator       begin() noexcept;
-    iterator       end() noexcept;
-    const_iterator begin()  const noexcept;
-    const_iterator end()    const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend()   const noexcept;
-
-    template <class... Args>
-        iterator emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    iterator insert(const value_type& obj);
-    template <class P>
-        iterator insert(P&& obj);
-    iterator insert(const_iterator hint, const value_type& obj);
-    template <class P>
-        iterator insert(const_iterator hint, P&& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type>);
-
-    iterator erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(unordered_multimap&)
-        noexcept(
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    hasher hash_function() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    size_type bucket_count() const noexcept;
-    size_type max_bucket_count() const noexcept;
-
-    size_type bucket_size(size_type n) const;
-    size_type bucket(const key_type& k) const;
-
-    local_iterator       begin(size_type n);
-    local_iterator       end(size_type n);
-    const_local_iterator begin(size_type n) const;
-    const_local_iterator end(size_type n) const;
-    const_local_iterator cbegin(size_type n) const;
-    const_local_iterator cend(size_type n) const;
-
-    float load_factor() const noexcept;
-    float max_load_factor() const noexcept;
-    void max_load_factor(float z);
-    void rehash(size_type n);
-    void reserve(size_type n);
-};
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    void swap(unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
-              unordered_multimap<Key, T, Hash, Pred, Alloc>& y)
-              noexcept(noexcept(x.swap(y)));
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
-               const unordered_multimap<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
-               const unordered_multimap<Key, T, Hash, Pred, Alloc>& y);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__hash_table>
-#include <functional>
-#include <stdexcept>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Key, class _Cp, class _Hash, bool = is_empty<_Hash>::value
-#if __has_feature(is_final)
-                                         && !__is_final(_Hash)
-#endif
-         >
-class __unordered_map_hasher
-    : private _Hash
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_hasher()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Hash>::value)
-        : _Hash() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_hasher(const _Hash& __h)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Hash>::value)
-        : _Hash(__h) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Hash& hash_function() const _NOEXCEPT {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Cp& __x) const
-        {return static_cast<const _Hash&>(*this)(__x.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Key& __x) const
-        {return static_cast<const _Hash&>(*this)(__x);}
-};
-
-template <class _Key, class _Cp, class _Hash>
-class __unordered_map_hasher<_Key, _Cp, _Hash, false>
-{
-    _Hash __hash_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_hasher()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Hash>::value)
-        : __hash_() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_hasher(const _Hash& __h)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Hash>::value)
-        : __hash_(__h) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Hash& hash_function() const _NOEXCEPT {return __hash_;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Cp& __x) const
-        {return __hash_(__x.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Key& __x) const
-        {return __hash_(__x);}
-};
-
-template <class _Key, class _Cp, class _Pred, bool = is_empty<_Pred>::value
-#if __has_feature(is_final)
-                                         && !__is_final(_Pred)
-#endif
-         >
-class __unordered_map_equal
-    : private _Pred
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_equal()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Pred>::value)
-        : _Pred() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_equal(const _Pred& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Pred>::value)
-        : _Pred(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Pred& key_eq() const _NOEXCEPT {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Cp& __x, const _Cp& __y) const
-        {return static_cast<const _Pred&>(*this)(__x.__cc.first, __y.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Cp& __x, const _Key& __y) const
-        {return static_cast<const _Pred&>(*this)(__x.__cc.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Key& __x, const _Cp& __y) const
-        {return static_cast<const _Pred&>(*this)(__x, __y.__cc.first);}
-};
-
-template <class _Key, class _Cp, class _Pred>
-class __unordered_map_equal<_Key, _Cp, _Pred, false>
-{
-    _Pred __pred_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_equal()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Pred>::value)
-        : __pred_() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_equal(const _Pred& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Pred>::value)
-        : __pred_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Pred& key_eq() const _NOEXCEPT {return __pred_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Cp& __x, const _Cp& __y) const
-        {return __pred_(__x.__cc.first, __y.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Cp& __x, const _Key& __y) const
-        {return __pred_(__x.__cc.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Key& __x, const _Cp& __y) const
-        {return __pred_(__x, __y.__cc.first);}
-};
-
-template <class _Alloc>
-class __hash_map_node_destructor
-{
-    typedef _Alloc                              allocator_type;
-    typedef allocator_traits<allocator_type>    __alloc_traits;
-    typedef typename __alloc_traits::value_type::value_type value_type;
-public:
-    typedef typename __alloc_traits::pointer    pointer;
-private:
-    typedef typename value_type::value_type::first_type     first_type;
-    typedef typename value_type::value_type::second_type    second_type;
-
-    allocator_type& __na_;
-
-    __hash_map_node_destructor& operator=(const __hash_map_node_destructor&);
-
-public:
-    bool __first_constructed;
-    bool __second_constructed;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __hash_map_node_destructor(allocator_type& __na) _NOEXCEPT
-        : __na_(__na),
-          __first_constructed(false),
-          __second_constructed(false)
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_node_destructor(__hash_node_destructor<allocator_type>&& __x)
-        _NOEXCEPT
-        : __na_(__x.__na_),
-          __first_constructed(__x.__value_constructed),
-          __second_constructed(__x.__value_constructed)
-        {
-            __x.__value_constructed = false;
-        }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_node_destructor(const __hash_node_destructor<allocator_type>& __x)
-        : __na_(__x.__na_),
-          __first_constructed(__x.__value_constructed),
-          __second_constructed(__x.__value_constructed)
-        {
-            const_cast<bool&>(__x.__value_constructed) = false;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        if (__second_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.__cc.second));
-        if (__first_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.__cc.first));
-        if (__p)
-            __alloc_traits::deallocate(__na_, __p, 1);
-    }
-};
-
-#if __cplusplus >= 201103L
-
-template <class _Key, class _Tp>
-union __hash_value_type
-{
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef pair<key_type, mapped_type>              __nc_value_type;
-
-    value_type __cc;
-    __nc_value_type __nc;
-
-    template <class ..._Args>
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(_Args&& ...__args)
-        : __cc(std::forward<_Args>(__args)...) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(const __hash_value_type& __v)
-        : __cc(__v.__cc) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(__hash_value_type&& __v)
-        : __nc(std::move(__v.__nc)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type& operator=(const __hash_value_type& __v)
-        {__nc = __v.__cc; return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type& operator=(__hash_value_type&& __v)
-        {__nc = std::move(__v.__nc); return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_value_type() {__cc.~value_type();}
-};
-
-#else
-
-template <class _Key, class _Tp>
-struct __hash_value_type
-{
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-
-    value_type __cc;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type() {}
-
-    template <class _A0>
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(const _A0& __a0)
-        : __cc(__a0) {}
-
-    template <class _A0, class _A1>
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(const _A0& __a0, const _A1& __a1)
-        : __cc(__a0, __a1) {}
-};
-
-#endif
-
-template <class _HashIterator>
-class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator
-{
-    _HashIterator __i_;
-
-    typedef pointer_traits<typename _HashIterator::pointer>      __pointer_traits;
-    typedef const typename _HashIterator::value_type::value_type::first_type key_type;
-    typedef typename _HashIterator::value_type::value_type::second_type      mapped_type;
-public:
-    typedef forward_iterator_tag                                 iterator_category;
-    typedef pair<key_type, mapped_type>                          value_type;
-    typedef typename _HashIterator::difference_type              difference_type;
-    typedef value_type&                                          reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_iterator() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_iterator(_HashIterator __i) _NOEXCEPT : __i_(__i) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __i_->__cc;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__i_->__cc);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_iterator operator++(int)
-    {
-        __hash_map_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator;
-};
-
-template <class _HashIterator>
-class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator
-{
-    _HashIterator __i_;
-
-    typedef pointer_traits<typename _HashIterator::pointer>      __pointer_traits;
-    typedef const typename _HashIterator::value_type::value_type::first_type key_type;
-    typedef typename _HashIterator::value_type::value_type::second_type      mapped_type;
-public:
-    typedef forward_iterator_tag                                 iterator_category;
-    typedef pair<key_type, mapped_type>                          value_type;
-    typedef typename _HashIterator::difference_type              difference_type;
-    typedef const value_type&                                    reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator(_HashIterator __i) _NOEXCEPT : __i_(__i) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator(
-            __hash_map_iterator<typename _HashIterator::__non_const_iterator> __i)
-                 _NOEXCEPT
-                : __i_(__i.__i_) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __i_->__cc;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__i_->__cc);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator operator++(int)
-    {
-        __hash_map_const_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const __hash_map_const_iterator& __x, const __hash_map_const_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const __hash_map_const_iterator& __x, const __hash_map_const_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-};
-
-template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
-          class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY unordered_map
-{
-public:
-    // types
-    typedef _Key                                           key_type;
-    typedef _Tp                                            mapped_type;
-    typedef _Hash                                          hasher;
-    typedef _Pred                                          key_equal;
-    typedef _Alloc                                         allocator_type;
-    typedef pair<const key_type, mapped_type>              value_type;
-    typedef pair<key_type, mapped_type>                    __nc_value_type;
-    typedef value_type&                                    reference;
-    typedef const value_type&                              const_reference;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-
-private:
-    typedef __hash_value_type<key_type, mapped_type>                 __value_type;
-    typedef __unordered_map_hasher<key_type, __value_type, hasher>   __hasher;
-    typedef __unordered_map_equal<key_type, __value_type, key_equal> __key_equal;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                           __allocator_type;
-
-    typedef __hash_table<__value_type, __hasher,
-                         __key_equal,  __allocator_type>   __table;
-
-    __table __table_;
-
-    typedef typename __table::__node_pointer               __node_pointer;
-    typedef typename __table::__node_const_pointer         __node_const_pointer;
-    typedef typename __table::__node_traits                __node_traits;
-    typedef typename __table::__node_allocator             __node_allocator;
-    typedef typename __table::__node                       __node;
-    typedef __hash_map_node_destructor<__node_allocator>   _Dp;
-    typedef unique_ptr<__node, _Dp>                         __node_holder;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
-public:
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-
-    typedef __hash_map_iterator<typename __table::iterator>       iterator;
-    typedef __hash_map_const_iterator<typename __table::const_iterator> const_iterator;
-    typedef __hash_map_iterator<typename __table::local_iterator> local_iterator;
-    typedef __hash_map_const_iterator<typename __table::const_local_iterator> const_local_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map()
-        _NOEXCEPT_(is_nothrow_default_constructible<__table>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    explicit unordered_map(size_type __n, const hasher& __hf = hasher(),
-                           const key_equal& __eql = key_equal());
-    unordered_map(size_type __n, const hasher& __hf,
-                  const key_equal& __eql,
-                  const allocator_type& __a);
-    template <class _InputIterator>
-        unordered_map(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        unordered_map(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        unordered_map(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf,
-                      const key_equal& __eql,
-                      const allocator_type& __a);
-    explicit unordered_map(const allocator_type& __a);
-    unordered_map(const unordered_map& __u);
-    unordered_map(const unordered_map& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_map(unordered_map&& __u)
-        _NOEXCEPT_(is_nothrow_move_constructible<__table>::value);
-    unordered_map(unordered_map&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_map(initializer_list<value_type> __il);
-    unordered_map(initializer_list<value_type> __il, size_type __n,
-                  const hasher& __hf = hasher(), const key_equal& __eql = key_equal());
-    unordered_map(initializer_list<value_type> __il, size_type __n,
-                  const hasher& __hf, const key_equal& __eql,
-                  const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map(size_type __n, const allocator_type& __a)
-      : unordered_map(__n, hasher(), key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map(size_type __n, const hasher& __hf, const allocator_type& __a)
-      : unordered_map(__n, __hf, key_equal(), __a) {}
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-      unordered_map(_InputIterator __first, _InputIterator __last, size_type __n, const allocator_type& __a)
-      : unordered_map(__first, __last, __n, hasher(), key_equal(), __a) {}
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-      unordered_map(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, 
-        const allocator_type& __a)
-      : unordered_map(__first, __last, __n, __hf, key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
-      : unordered_map(__il, __n, hasher(), key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map(initializer_list<value_type> __il, size_type __n, const hasher& __hf, 
-      const allocator_type& __a)
-      : unordered_map(__il, __n, __hf, key_equal(), __a) {}
-#endif
-    // ~unordered_map() = default;
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map& operator=(const unordered_map& __u)
-    {
-#if __cplusplus >= 201103L
-        __table_ = __u.__table_;
-#else
-        if (this != &__u) {
-            __table_.clear();
-            __table_.hash_function() = __u.__table_.hash_function();
-            __table_.key_eq() = __u.__table_.key_eq();
-            __table_.max_load_factor() = __u.__table_.max_load_factor();
-            __table_.__copy_assign_alloc(__u.__table_);
-            insert(__u.begin(), __u.end());
-        }
-#endif
-        return *this;
-    }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_map& operator=(unordered_map&& __u)
-        _NOEXCEPT_(is_nothrow_move_assignable<__table>::value);
-#endif
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_map& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return __table_.end();}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args>
-        pair<iterator, bool> emplace(_Args&&... __args);
-
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_map::emplace_hint(const_iterator, args...) called with an iterator not"
-                " referring to this unordered_map");
-            return __table_.__emplace_unique(_VSTD::forward<_Args>(__args)...).first;
-        }
-#else
-        iterator emplace_hint(const_iterator, _Args&&... __args)
-            {return emplace(_VSTD::forward<_Args>(__args)...).first;}
-#endif
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool> insert(const value_type& __x)
-        {return __table_.__insert_unique(__x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        pair<iterator, bool> insert(_Pp&& __x)
-            {return __table_.__insert_unique(_VSTD::forward<_Pp>(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    iterator insert(const_iterator __p, const value_type& __x)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_map::insert(const_iterator, const value_type&) called with an iterator not"
-                " referring to this unordered_map");
-            return insert(__x).first;
-        }
-#else
-    iterator insert(const_iterator, const value_type& __x)
-        {return insert(__x).first;}
-#endif
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator insert(const_iterator __p, _Pp&& __x)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_map::insert(const_iterator, value_type&&) called with an iterator not"
-                " referring to this unordered_map");
-            return insert(_VSTD::forward<_Pp>(__x)).first;
-        }
-#else
-        iterator insert(const_iterator, _Pp&& __x)
-            {return insert(_VSTD::forward<_Pp>(__x)).first;}
-#endif
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __table_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __first, const_iterator __last)
-        {return __table_.erase(__first.__i_, __last.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unordered_map& __u)
-        _NOEXCEPT_(__is_nothrow_swappable<__table>::value)
-        {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_function() const
-        {return __table_.hash_function().hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const
-        {return __table_.key_eq().key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_unique(__k);}
-
-    mapped_type& operator[](const key_type& __k);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    mapped_type& operator[](key_type&& __k);
-#endif
-
-    mapped_type&       at(const key_type& __k);
-    const mapped_type& at(const key_type& __k) const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_size(size_type __n) const
-        {return __table_.bucket_size(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket(const key_type& __k) const {return __table_.bucket(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       begin(size_type __n)        {return __table_.begin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       end(size_type __n)          {return __table_.end(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator begin(size_type __n) const  {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator end(size_type __n) const    {return __table_.cend(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cbegin(size_type __n) const {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cend(size_type __n) const   {return __table_.cend(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float load_factor() const _NOEXCEPT {return __table_.load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    float max_load_factor() const _NOEXCEPT {return __table_.max_load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    void max_load_factor(float __mlf) {__table_.max_load_factor(__mlf);}
-    _LIBCPP_INLINE_VISIBILITY
-    void rehash(size_type __n) {__table_.rehash(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    void reserve(size_type __n) {__table_.reserve(__n);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const
-        {return __table_.__dereferenceable(&__i->__i_);}
-    bool __decrementable(const const_iterator* __i) const
-        {return __table_.__decrementable(&__i->__i_);}
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(&__i->__i_, __n);}
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(&__i->__i_, __n);}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node();
-    template <class _A0>
-        __node_holder
-         __construct_node(_A0&& __a0);
-    __node_holder __construct_node_with_key(key_type&& __k);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _A0, class _A1, class ..._Args>
-        __node_holder __construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node_with_key(const key_type& __k);
-};
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        size_type __n, const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        size_type __n, const hasher& __hf, const key_equal& __eql,
-        const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        const allocator_type& __a)
-    : __table_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        const unordered_map& __u)
-    : __table_(__u.__table_)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        const unordered_map& __u, const allocator_type& __a)
-    : __table_(__u.__table_, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        unordered_map&& __u)
-    _NOEXCEPT_(is_nothrow_move_constructible<__table>::value)
-    : __table_(_VSTD::move(__u.__table_))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        unordered_map&& __u, const allocator_type& __a)
-    : __table_(_VSTD::move(__u.__table_), __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a != __u.get_allocator())
-    {
-        iterator __i = __u.begin();
-        while (__u.size() != 0)
-            __table_.__insert_unique(
-                _VSTD::move(__u.__table_.remove((__i++).__i_)->__value_)
-                                    );
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    else
-        __get_db()->swap(this, &__u);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator=(unordered_map&& __u)
-    _NOEXCEPT_(is_nothrow_move_assignable<__table>::value)
-{
-    __table_ = _VSTD::move(__u.__table_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator=(
-        initializer_list<value_type> __il)
-{
-    __table_.__assign_unique(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node()
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _A0>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(_A0&& __a0)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node_with_key(key_type&& __k)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first), _VSTD::move(__k));
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _A0, class _A1, class ..._Args>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(_A0&& __a0,
-                                                                 _A1&& __a1,
-                                                                 _Args&&... __args)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0), _VSTD::forward<_A1>(__a1),
-                             _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class... _Args>
-pair<typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::iterator, bool>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::emplace(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node_with_key(const key_type& __k)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first), __k);
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                       _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_unique(*__first);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-_Tp&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator[](const key_type& __k)
-{
-    iterator __i = find(__k);
-    if (__i != end())
-        return __i->second;
-    __node_holder __h = __construct_node_with_key(__k);
-    pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
-    __h.release();
-    return __r.first->second;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-_Tp&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator[](key_type&& __k)
-{
-    iterator __i = find(__k);
-    if (__i != end())
-        return __i->second;
-    __node_holder __h = __construct_node_with_key(_VSTD::move(__k));
-    pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
-    __h.release();
-    return __r.first->second;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-_Tp&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::at(const key_type& __k)
-{
-    iterator __i = find(__k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__i == end())
-        throw out_of_range("unordered_map::at: key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __i->second;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-const _Tp&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::at(const key_type& __k) const
-{
-    const_iterator __i = find(__k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__i == end())
-        throw out_of_range("unordered_map::at: key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __i->second;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-     unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(), __ey = __y.end();
-            __i != __ex; ++__i)
-    {
-        const_iterator __j = __y.find(__i->first);
-        if (__j == __ey || !(*__i == *__j))
-            return false;
-    }
-    return true;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
-          class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY unordered_multimap
-{
-public:
-    // types
-    typedef _Key                                           key_type;
-    typedef _Tp                                            mapped_type;
-    typedef _Hash                                          hasher;
-    typedef _Pred                                          key_equal;
-    typedef _Alloc                                         allocator_type;
-    typedef pair<const key_type, mapped_type>              value_type;
-    typedef pair<key_type, mapped_type>                    __nc_value_type;
-    typedef value_type&                                    reference;
-    typedef const value_type&                              const_reference;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-
-private:
-    typedef __hash_value_type<key_type, mapped_type>                 __value_type;
-    typedef __unordered_map_hasher<key_type, __value_type, hasher>   __hasher;
-    typedef __unordered_map_equal<key_type, __value_type, key_equal> __key_equal;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                           __allocator_type;
-
-    typedef __hash_table<__value_type, __hasher,
-                         __key_equal,  __allocator_type>   __table;
-
-    __table __table_;
-
-    typedef typename __table::__node_traits                __node_traits;
-    typedef typename __table::__node_allocator             __node_allocator;
-    typedef typename __table::__node                       __node;
-    typedef __hash_map_node_destructor<__node_allocator>   _Dp;
-    typedef unique_ptr<__node, _Dp>                         __node_holder;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
-public:
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-
-    typedef __hash_map_iterator<typename __table::iterator>       iterator;
-    typedef __hash_map_const_iterator<typename __table::const_iterator> const_iterator;
-    typedef __hash_map_iterator<typename __table::local_iterator> local_iterator;
-    typedef __hash_map_const_iterator<typename __table::const_local_iterator> const_local_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap()
-        _NOEXCEPT_(is_nothrow_default_constructible<__table>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    explicit unordered_multimap(size_type __n, const hasher& __hf = hasher(),
-                                const key_equal& __eql = key_equal());
-    unordered_multimap(size_type __n, const hasher& __hf,
-                                const key_equal& __eql,
-                                const allocator_type& __a);
-    template <class _InputIterator>
-        unordered_multimap(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        unordered_multimap(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        unordered_multimap(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf,
-                      const key_equal& __eql,
-                      const allocator_type& __a);
-    explicit unordered_multimap(const allocator_type& __a);
-    unordered_multimap(const unordered_multimap& __u);
-    unordered_multimap(const unordered_multimap& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_multimap(unordered_multimap&& __u)
-        _NOEXCEPT_(is_nothrow_move_constructible<__table>::value);
-    unordered_multimap(unordered_multimap&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_multimap(initializer_list<value_type> __il);
-    unordered_multimap(initializer_list<value_type> __il, size_type __n,
-                       const hasher& __hf = hasher(),
-                       const key_equal& __eql = key_equal());
-    unordered_multimap(initializer_list<value_type> __il, size_type __n,
-                       const hasher& __hf, const key_equal& __eql,
-                       const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap(size_type __n, const allocator_type& __a)
-      : unordered_multimap(__n, hasher(), key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap(size_type __n, const hasher& __hf, const allocator_type& __a)
-      : unordered_multimap(__n, __hf, key_equal(), __a) {}
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-      unordered_multimap(_InputIterator __first, _InputIterator __last, size_type __n, const allocator_type& __a)
-      : unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a) {}
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-      unordered_multimap(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, 
-        const allocator_type& __a)
-      : unordered_multimap(__first, __last, __n, __hf, key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
-      : unordered_multimap(__il, __n, hasher(), key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap(initializer_list<value_type> __il, size_type __n, const hasher& __hf, 
-      const allocator_type& __a)
-      : unordered_multimap(__il, __n, __hf, key_equal(), __a) {}
-#endif
-    // ~unordered_multimap() = default;
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap& operator=(const unordered_multimap& __u)
-    {
-#if __cplusplus >= 201103L
-        __table_ = __u.__table_;
-#else
-        if (this != &__u) {
-            __table_.clear();
-            __table_.hash_function() = __u.__table_.hash_function();
-            __table_.key_eq() = __u.__table_.key_eq();
-            __table_.max_load_factor() = __u.__table_.max_load_factor();
-            __table_.__copy_assign_alloc(__u.__table_);
-            insert(__u.begin(), __u.end());
-        }
-#endif
-        return *this;
-    }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_multimap& operator=(unordered_multimap&& __u)
-        _NOEXCEPT_(is_nothrow_move_assignable<__table>::value);
-#endif
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_multimap& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return __table_.end();}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args>
-        iterator emplace(_Args&&... __args);
-
-    template <class... _Args>
-        iterator emplace_hint(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __x) {return __table_.__insert_multi(__x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(_Pp&& __x)
-            {return __table_.__insert_multi(_VSTD::forward<_Pp>(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __x)
-        {return __table_.__insert_multi(__p.__i_, __x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(const_iterator __p, _Pp&& __x)
-            {return __table_.__insert_multi(__p.__i_, _VSTD::forward<_Pp>(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __table_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __first, const_iterator __last)
-        {return __table_.erase(__first.__i_, __last.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unordered_multimap& __u)
-        _NOEXCEPT_(__is_nothrow_swappable<__table>::value)
-        {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_function() const
-        {return __table_.hash_function().hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const
-        {return __table_.key_eq().key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_multi(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT
-        {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_size(size_type __n) const
-        {return __table_.bucket_size(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket(const key_type& __k) const {return __table_.bucket(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       begin(size_type __n)        {return __table_.begin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       end(size_type __n)          {return __table_.end(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator begin(size_type __n) const  {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator end(size_type __n) const    {return __table_.cend(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cbegin(size_type __n) const {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cend(size_type __n) const   {return __table_.cend(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float load_factor() const _NOEXCEPT {return __table_.load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    float max_load_factor() const _NOEXCEPT {return __table_.max_load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    void max_load_factor(float __mlf) {__table_.max_load_factor(__mlf);}
-    _LIBCPP_INLINE_VISIBILITY
-    void rehash(size_type __n) {__table_.rehash(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    void reserve(size_type __n) {__table_.reserve(__n);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const
-        {return __table_.__dereferenceable(&__i->__i_);}
-    bool __decrementable(const const_iterator* __i) const
-        {return __table_.__decrementable(&__i->__i_);}
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(&__i->__i_, __n);}
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(&__i->__i_, __n);}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node();
-    template <class _A0>
-        __node_holder
-         __construct_node(_A0&& __a0);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _A0, class _A1, class ..._Args>
-        __node_holder __construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        size_type __n, const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        size_type __n, const hasher& __hf, const key_equal& __eql,
-        const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        const allocator_type& __a)
-    : __table_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        const unordered_multimap& __u)
-    : __table_(__u.__table_)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        const unordered_multimap& __u, const allocator_type& __a)
-    : __table_(__u.__table_, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        unordered_multimap&& __u)
-    _NOEXCEPT_(is_nothrow_move_constructible<__table>::value)
-    : __table_(_VSTD::move(__u.__table_))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        unordered_multimap&& __u, const allocator_type& __a)
-    : __table_(_VSTD::move(__u.__table_), __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a != __u.get_allocator())
-    {
-        iterator __i = __u.begin();
-        while (__u.size() != 0)
-        {
-            __table_.__insert_multi(
-                _VSTD::move(__u.__table_.remove((__i++).__i_)->__value_)
-                                   );
-        }
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    else
-        __get_db()->swap(this, &__u);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>&
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::operator=(unordered_multimap&& __u)
-    _NOEXCEPT_(is_nothrow_move_assignable<__table>::value)
-{
-    __table_ = _VSTD::move(__u.__table_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>&
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::operator=(
-        initializer_list<value_type> __il)
-{
-    __table_.__assign_multi(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node()
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _A0>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(_A0&& __a0)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _A0, class _A1, class ..._Args>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(
-        _A0&& __a0, _A1&& __a1, _Args&&... __args)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0), _VSTD::forward<_A1>(__a1),
-                             _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class... _Args>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::iterator
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::emplace(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __table_.__node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class... _Args>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::iterator
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::emplace_hint(
-        const_iterator __p, _Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __table_.__node_insert_multi(__p.__i_, __h.get());
-    __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                            _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_multi(*__first);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-     unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    typedef pair<const_iterator, const_iterator> _EqRng;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(); __i != __ex;)
-    {
-        _EqRng __xeq = __x.equal_range(__i->first);
-        _EqRng __yeq = __y.equal_range(__i->first);
-        if (_VSTD::distance(__xeq.first, __xeq.second) !=
-            _VSTD::distance(__yeq.first, __yeq.second) ||
-                  !_VSTD::is_permutation(__xeq.first, __xeq.second, __yeq.first))
-            return false;
-        __i = __xeq.second;
-    }
-    return true;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_UNORDERED_MAP
diff --git a/include.new/c++/v1/tr1/unordered_set b/include.new/c++/v1/tr1/unordered_set
deleted file mode 100644
index d06629f..0000000
--- a/include.new/c++/v1/tr1/unordered_set
+++ /dev/null
@@ -1,1381 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- unordered_set -----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_UNORDERED_SET
-#define _LIBCPP_UNORDERED_SET
-
-/*
-
-    unordered_set synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
-          class Alloc = allocator<Value>>
-class unordered_set
-{
-public:
-    // types
-    typedef Value                                                      key_type;
-    typedef key_type                                                   value_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-    typedef /unspecified/ local_iterator;
-    typedef /unspecified/ const_local_iterator;
-
-    unordered_set()
-        noexcept(
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value &&
-            is_nothrow_default_constructible<allocator_type>::value);
-    explicit unordered_set(size_type n, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        unordered_set(InputIterator f, InputIterator l,
-                      size_type n = 0, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    explicit unordered_set(const allocator_type&);
-    unordered_set(const unordered_set&);
-    unordered_set(const unordered_set&, const Allocator&);
-    unordered_set(unordered_set&&)
-        noexcept(
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value &&
-            is_nothrow_move_constructible<allocator_type>::value);
-    unordered_set(unordered_set&&, const Allocator&);
-    unordered_set(initializer_list<value_type>, size_type n = 0,
-                  const hasher& hf = hasher(), const key_equal& eql = key_equal(),
-                  const allocator_type& a = allocator_type());
-    unordered_set(size_type n, const allocator_type& a); // C++14
-    unordered_set(size_type n, const hasher& hf, const allocator_type& a); // C++14
-    template <class InputIterator>
-      unordered_set(InputIterator f, InputIterator l, size_type n, const allocator_type& a); // C++14
-    template <class InputIterator>
-      unordered_set(InputIterator f, InputIterator l, size_type n, 
-                    const hasher& hf,  const allocator_type& a); // C++14
-    unordered_set(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14
-    unordered_set(initializer_list<value_type> il, size_type n,
-                  const hasher& hf,  const allocator_type& a); // C++14
-    ~unordered_set();
-    unordered_set& operator=(const unordered_set&);
-    unordered_set& operator=(unordered_set&&)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    unordered_set& operator=(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    bool      empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    iterator       begin() noexcept;
-    iterator       end() noexcept;
-    const_iterator begin()  const noexcept;
-    const_iterator end()    const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend()   const noexcept;
-
-    template <class... Args>
-        pair<iterator, bool> emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    pair<iterator, bool> insert(const value_type& obj);
-    pair<iterator, bool> insert(value_type&& obj);
-    iterator insert(const_iterator hint, const value_type& obj);
-    iterator insert(const_iterator hint, value_type&& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type>);
-
-    iterator erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(unordered_set&)
-        noexcept(
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    hasher hash_function() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    size_type bucket_count() const noexcept;
-    size_type max_bucket_count() const noexcept;
-
-    size_type bucket_size(size_type n) const;
-    size_type bucket(const key_type& k) const;
-
-    local_iterator       begin(size_type n);
-    local_iterator       end(size_type n);
-    const_local_iterator begin(size_type n) const;
-    const_local_iterator end(size_type n) const;
-    const_local_iterator cbegin(size_type n) const;
-    const_local_iterator cend(size_type n) const;
-
-    float load_factor() const noexcept;
-    float max_load_factor() const noexcept;
-    void max_load_factor(float z);
-    void rehash(size_type n);
-    void reserve(size_type n);
-};
-
-template <class Value, class Hash, class Pred, class Alloc>
-    void swap(unordered_set<Value, Hash, Pred, Alloc>& x,
-              unordered_set<Value, Hash, Pred, Alloc>& y)
-              noexcept(noexcept(x.swap(y)));
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const unordered_set<Value, Hash, Pred, Alloc>& x,
-               const unordered_set<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const unordered_set<Value, Hash, Pred, Alloc>& x,
-               const unordered_set<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
-          class Alloc = allocator<Value>>
-class unordered_multiset
-{
-public:
-    // types
-    typedef Value                                                      key_type;
-    typedef key_type                                                   value_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-    typedef /unspecified/ local_iterator;
-    typedef /unspecified/ const_local_iterator;
-
-    unordered_multiset()
-        noexcept(
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value &&
-            is_nothrow_default_constructible<allocator_type>::value);
-    explicit unordered_multiset(size_type n, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        unordered_multiset(InputIterator f, InputIterator l,
-                      size_type n = 0, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    explicit unordered_multiset(const allocator_type&);
-    unordered_multiset(const unordered_multiset&);
-    unordered_multiset(const unordered_multiset&, const Allocator&);
-    unordered_multiset(unordered_multiset&&)
-        noexcept(
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value &&
-            is_nothrow_move_constructible<allocator_type>::value);
-    unordered_multiset(unordered_multiset&&, const Allocator&);
-    unordered_multiset(initializer_list<value_type>, size_type n = /see below/,
-                  const hasher& hf = hasher(), const key_equal& eql = key_equal(),
-                  const allocator_type& a = allocator_type());
-    unordered_multiset(size_type n, const allocator_type& a); // C++14
-    unordered_multiset(size_type n, const hasher& hf, const allocator_type& a); // C++14
-    template <class InputIterator>
-      unordered_multiset(InputIterator f, InputIterator l, size_type n, const allocator_type& a); // C++14
-    template <class InputIterator>
-      unordered_multiset(InputIterator f, InputIterator l, size_type n,
-                         const hasher& hf, const allocator_type& a); // C++14
-    unordered_multiset(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14
-    unordered_multiset(initializer_list<value_type> il, size_type n, 
-                       const hasher& hf,  const allocator_type& a); // C++14
-    ~unordered_multiset();
-    unordered_multiset& operator=(const unordered_multiset&);
-    unordered_multiset& operator=(unordered_multiset&&)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    unordered_multiset& operator=(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    bool      empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    iterator       begin() noexcept;
-    iterator       end() noexcept;
-    const_iterator begin()  const noexcept;
-    const_iterator end()    const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend()   const noexcept;
-
-    template <class... Args>
-        iterator emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    iterator insert(const value_type& obj);
-    iterator insert(value_type&& obj);
-    iterator insert(const_iterator hint, const value_type& obj);
-    iterator insert(const_iterator hint, value_type&& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type>);
-
-    iterator erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(unordered_multiset&)
-        noexcept(
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    hasher hash_function() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    size_type bucket_count() const noexcept;
-    size_type max_bucket_count() const noexcept;
-
-    size_type bucket_size(size_type n) const;
-    size_type bucket(const key_type& k) const;
-
-    local_iterator       begin(size_type n);
-    local_iterator       end(size_type n);
-    const_local_iterator begin(size_type n) const;
-    const_local_iterator end(size_type n) const;
-    const_local_iterator cbegin(size_type n) const;
-    const_local_iterator cend(size_type n) const;
-
-    float load_factor() const noexcept;
-    float max_load_factor() const noexcept;
-    void max_load_factor(float z);
-    void rehash(size_type n);
-    void reserve(size_type n);
-};
-
-template <class Value, class Hash, class Pred, class Alloc>
-    void swap(unordered_multiset<Value, Hash, Pred, Alloc>& x,
-              unordered_multiset<Value, Hash, Pred, Alloc>& y)
-              noexcept(noexcept(x.swap(y)));
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const unordered_multiset<Value, Hash, Pred, Alloc>& x,
-               const unordered_multiset<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const unordered_multiset<Value, Hash, Pred, Alloc>& x,
-               const unordered_multiset<Value, Hash, Pred, Alloc>& y);
-}  // std
-
-*/
-
-#include <__config>
-#include <__hash_table>
-#include <functional>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
-          class _Alloc = allocator<_Value> >
-class _LIBCPP_TYPE_VIS_ONLY unordered_set
-{
-public:
-    // types
-    typedef _Value                                                     key_type;
-    typedef key_type                                                   value_type;
-    typedef _Hash                                                      hasher;
-    typedef _Pred                                                      key_equal;
-    typedef _Alloc                                                     allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-
-private:
-    typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;
-
-    __table __table_;
-
-public:
-    typedef typename __table::pointer         pointer;
-    typedef typename __table::const_pointer   const_pointer;
-    typedef typename __table::size_type       size_type;
-    typedef typename __table::difference_type difference_type;
-
-    typedef typename __table::const_iterator       iterator;
-    typedef typename __table::const_iterator       const_iterator;
-    typedef typename __table::const_local_iterator local_iterator;
-    typedef typename __table::const_local_iterator const_local_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_set()
-        _NOEXCEPT_(is_nothrow_default_constructible<__table>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    explicit unordered_set(size_type __n, const hasher& __hf = hasher(),
-                           const key_equal& __eql = key_equal());
-#if _LIBCPP_STD_VER > 11
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_set(size_type __n, const allocator_type& __a)
-        : unordered_set(__n, hasher(), key_equal(), __a) {}
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_set(size_type __n, const hasher& __hf, const allocator_type& __a)
-        : unordered_set(__n, __hf, key_equal(), __a) {}
-#endif
-    unordered_set(size_type __n, const hasher& __hf, const key_equal& __eql,
-                  const allocator_type& __a);
-    template <class _InputIterator>
-        unordered_set(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        unordered_set(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        unordered_set(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf, const key_equal& __eql,
-                      const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    template <class _InputIterator>
-    inline _LIBCPP_INLINE_VISIBILITY
-        unordered_set(_InputIterator __first, _InputIterator __last, 
-                    size_type __n, const allocator_type& __a)
-            : unordered_set(__first, __last, __n, hasher(), key_equal(), __a) {}
-    template <class _InputIterator>
-        unordered_set(_InputIterator __first, _InputIterator __last, 
-                      size_type __n, const hasher& __hf, const allocator_type& __a)
-            : unordered_set(__first, __last, __n, __hf, key_equal(), __a) {}
-#endif
-    explicit unordered_set(const allocator_type& __a);
-    unordered_set(const unordered_set& __u);
-    unordered_set(const unordered_set& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_set(unordered_set&& __u)
-        _NOEXCEPT_(is_nothrow_move_constructible<__table>::value);
-    unordered_set(unordered_set&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_set(initializer_list<value_type> __il);
-    unordered_set(initializer_list<value_type> __il, size_type __n,
-                  const hasher& __hf = hasher(),
-                  const key_equal& __eql = key_equal());
-    unordered_set(initializer_list<value_type> __il, size_type __n,
-                  const hasher& __hf, const key_equal& __eql,
-                  const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_set(initializer_list<value_type> __il, size_type __n,
-                                                      const allocator_type& __a)
-        : unordered_set(__il, __n, hasher(), key_equal(), __a) {}
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_set(initializer_list<value_type> __il, size_type __n, 
-                                  const hasher& __hf, const allocator_type& __a)
-        : unordered_set(__il, __n, __hf, key_equal(), __a) {}
-#endif
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    // ~unordered_set() = default;
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_set& operator=(const unordered_set& __u)
-    {
-        __table_ = __u.__table_;
-        return *this;
-    }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_set& operator=(unordered_set&& __u)
-        _NOEXCEPT_(is_nothrow_move_assignable<__table>::value);
-#endif
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_set& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return __table_.end();}
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        pair<iterator, bool> emplace(_Args&&... __args)
-            {return __table_.__emplace_unique(_VSTD::forward<_Args>(__args)...);}
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_set::emplace_hint(const_iterator, args...) called with an iterator not"
-                " referring to this unordered_set");
-            return __table_.__emplace_unique(_VSTD::forward<_Args>(__args)...).first;
-        }
-#else
-        iterator emplace_hint(const_iterator, _Args&&... __args)
-            {return __table_.__emplace_unique(_VSTD::forward<_Args>(__args)...).first;}
-#endif
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool> insert(const value_type& __x)
-        {return __table_.__insert_unique(__x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool> insert(value_type&& __x)
-        {return __table_.__insert_unique(_VSTD::move(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    iterator insert(const_iterator __p, const value_type& __x)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_set::insert(const_iterator, const value_type&) called with an iterator not"
-                " referring to this unordered_set");
-            return insert(__x).first;
-        }
-#else
-    iterator insert(const_iterator, const value_type& __x)
-        {return insert(__x).first;}
-#endif
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    iterator insert(const_iterator __p, value_type&& __x)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_set::insert(const_iterator, value_type&&) called with an iterator not"
-                " referring to this unordered_set");
-            return insert(_VSTD::move(__x)).first;
-        }
-#else
-    iterator insert(const_iterator, value_type&& __x)
-        {return insert(_VSTD::move(__x)).first;}
-#endif
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __table_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __first, const_iterator __last)
-        {return __table_.erase(__first, __last);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unordered_set& __u)
-        _NOEXCEPT_(__is_nothrow_swappable<__table>::value)
-        {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_function() const {return __table_.hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const {return __table_.key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_unique(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_size(size_type __n) const {return __table_.bucket_size(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket(const key_type& __k) const {return __table_.bucket(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       begin(size_type __n)        {return __table_.begin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       end(size_type __n)          {return __table_.end(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator begin(size_type __n) const  {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator end(size_type __n) const    {return __table_.cend(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cbegin(size_type __n) const {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cend(size_type __n) const   {return __table_.cend(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float load_factor() const _NOEXCEPT {return __table_.load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    float max_load_factor() const _NOEXCEPT {return __table_.max_load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    void max_load_factor(float __mlf) {__table_.max_load_factor(__mlf);}
-    _LIBCPP_INLINE_VISIBILITY
-    void rehash(size_type __n) {__table_.rehash(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    void reserve(size_type __n) {__table_.reserve(__n);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const
-        {return __table_.__dereferenceable(__i);}
-    bool __decrementable(const const_iterator* __i) const
-        {return __table_.__decrementable(__i);}
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(__i, __n);}
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(__i, __n);}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-};
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        const allocator_type& __a)
-    : __table_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        const unordered_set& __u)
-    : __table_(__u.__table_)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        const unordered_set& __u, const allocator_type& __a)
-    : __table_(__u.__table_, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        unordered_set&& __u)
-    _NOEXCEPT_(is_nothrow_move_constructible<__table>::value)
-    : __table_(_VSTD::move(__u.__table_))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        unordered_set&& __u, const allocator_type& __a)
-    : __table_(_VSTD::move(__u.__table_), __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a != __u.get_allocator())
-    {
-        iterator __i = __u.begin();
-        while (__u.size() != 0)
-            __table_.__insert_unique(_VSTD::move(__u.__table_.remove(__i++)->__value_));
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    else
-        __get_db()->swap(this, &__u);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_set<_Value, _Hash, _Pred, _Alloc>&
-unordered_set<_Value, _Hash, _Pred, _Alloc>::operator=(unordered_set&& __u)
-    _NOEXCEPT_(is_nothrow_move_assignable<__table>::value)
-{
-    __table_ = _VSTD::move(__u.__table_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_set<_Value, _Hash, _Pred, _Alloc>&
-unordered_set<_Value, _Hash, _Pred, _Alloc>::operator=(
-        initializer_list<value_type> __il)
-{
-    __table_.__assign_unique(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-unordered_set<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                    _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_unique(*__first);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-     unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-           const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename unordered_set<_Value, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(), __ey = __y.end();
-            __i != __ex; ++__i)
-    {
-        const_iterator __j = __y.find(*__i);
-        if (__j == __ey || !(*__i == *__j))
-            return false;
-    }
-    return true;
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-           const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
-          class _Alloc = allocator<_Value> >
-class _LIBCPP_TYPE_VIS_ONLY unordered_multiset
-{
-public:
-    // types
-    typedef _Value                                                     key_type;
-    typedef key_type                                                   value_type;
-    typedef _Hash                                                      hasher;
-    typedef _Pred                                                      key_equal;
-    typedef _Alloc                                                     allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-
-private:
-    typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;
-
-    __table __table_;
-
-public:
-    typedef typename __table::pointer         pointer;
-    typedef typename __table::const_pointer   const_pointer;
-    typedef typename __table::size_type       size_type;
-    typedef typename __table::difference_type difference_type;
-
-    typedef typename __table::const_iterator       iterator;
-    typedef typename __table::const_iterator       const_iterator;
-    typedef typename __table::const_local_iterator local_iterator;
-    typedef typename __table::const_local_iterator const_local_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset()
-        _NOEXCEPT_(is_nothrow_default_constructible<__table>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    explicit unordered_multiset(size_type __n, const hasher& __hf = hasher(),
-                                const key_equal& __eql = key_equal());
-    unordered_multiset(size_type __n, const hasher& __hf,
-                       const key_equal& __eql, const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(size_type __n, const allocator_type& __a)
-        : unordered_multiset(__n, hasher(), key_equal(), __a) {}
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(size_type __n, const hasher& __hf, const allocator_type& __a)
-        : unordered_multiset(__n, __hf, key_equal(), __a) {}
-#endif
-    template <class _InputIterator>
-        unordered_multiset(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        unordered_multiset(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        unordered_multiset(_InputIterator __first, _InputIterator __last,
-                      size_type __n , const hasher& __hf,
-                      const key_equal& __eql, const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    template <class _InputIterator>
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(_InputIterator __first, _InputIterator __last, 
-                       size_type __n, const allocator_type& __a)
-        : unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a) {}
-    template <class _InputIterator>
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(_InputIterator __first, _InputIterator __last,
-                       size_type __n, const hasher& __hf, const allocator_type& __a)
-        : unordered_multiset(__first, __last, __n, __hf, key_equal(), __a) {}
-#endif
-    explicit unordered_multiset(const allocator_type& __a);
-    unordered_multiset(const unordered_multiset& __u);
-    unordered_multiset(const unordered_multiset& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_multiset(unordered_multiset&& __u)
-        _NOEXCEPT_(is_nothrow_move_constructible<__table>::value);
-    unordered_multiset(unordered_multiset&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_multiset(initializer_list<value_type> __il);
-    unordered_multiset(initializer_list<value_type> __il, size_type __n,
-                       const hasher& __hf = hasher(),
-                       const key_equal& __eql = key_equal());
-    unordered_multiset(initializer_list<value_type> __il, size_type __n,
-                       const hasher& __hf, const key_equal& __eql,
-                       const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
-      : unordered_multiset(__il, __n, hasher(), key_equal(), __a) {}
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(initializer_list<value_type> __il, size_type __n, const hasher& __hf, const allocator_type& __a)
-      : unordered_multiset(__il, __n, __hf, key_equal(), __a) {}
-#endif
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    // ~unordered_multiset() = default;
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset& operator=(const unordered_multiset& __u)
-    {
-        __table_ = __u.__table_;
-        return *this;
-    }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_multiset& operator=(unordered_multiset&& __u)
-        _NOEXCEPT_(is_nothrow_move_assignable<__table>::value);
-#endif
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_multiset& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return __table_.end();}
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace(_Args&&... __args)
-            {return __table_.__emplace_multi(_VSTD::forward<_Args>(__args)...);}
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-            {return __table_.__emplace_hint_multi(__p, _VSTD::forward<_Args>(__args)...);}
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __x) {return __table_.__insert_multi(__x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(value_type&& __x) {return __table_.__insert_multi(_VSTD::move(__x));}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __x)
-        {return __table_.__insert_multi(__p, __x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, value_type&& __x)
-        {return __table_.__insert_multi(__p, _VSTD::move(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __table_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __first, const_iterator __last)
-        {return __table_.erase(__first, __last);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unordered_multiset& __u)
-        _NOEXCEPT_(__is_nothrow_swappable<__table>::value)
-        {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_function() const {return __table_.hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const {return __table_.key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_multi(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_size(size_type __n) const {return __table_.bucket_size(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket(const key_type& __k) const {return __table_.bucket(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       begin(size_type __n)        {return __table_.begin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       end(size_type __n)          {return __table_.end(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator begin(size_type __n) const  {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator end(size_type __n) const    {return __table_.cend(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cbegin(size_type __n) const {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cend(size_type __n) const   {return __table_.cend(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float load_factor() const _NOEXCEPT {return __table_.load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    float max_load_factor() const _NOEXCEPT {return __table_.max_load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    void max_load_factor(float __mlf) {__table_.max_load_factor(__mlf);}
-    _LIBCPP_INLINE_VISIBILITY
-    void rehash(size_type __n) {__table_.rehash(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    void reserve(size_type __n) {__table_.reserve(__n);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const
-        {return __table_.__dereferenceable(__i);}
-    bool __decrementable(const const_iterator* __i) const
-        {return __table_.__decrementable(__i);}
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(__i, __n);}
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(__i, __n);}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-};
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        size_type __n, const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        size_type __n, const hasher& __hf, const key_equal& __eql,
-        const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        const allocator_type& __a)
-    : __table_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        const unordered_multiset& __u)
-    : __table_(__u.__table_)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        const unordered_multiset& __u, const allocator_type& __a)
-    : __table_(__u.__table_, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        unordered_multiset&& __u)
-    _NOEXCEPT_(is_nothrow_move_constructible<__table>::value)
-    : __table_(_VSTD::move(__u.__table_))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        unordered_multiset&& __u, const allocator_type& __a)
-    : __table_(_VSTD::move(__u.__table_), __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a != __u.get_allocator())
-    {
-        iterator __i = __u.begin();
-        while (__u.size() != 0)
-            __table_.__insert_multi(_VSTD::move(__u.__table_.remove(__i++)->__value_));
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    else
-        __get_db()->swap(this, &__u);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>&
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::operator=(
-        unordered_multiset&& __u)
-    _NOEXCEPT_(is_nothrow_move_assignable<__table>::value)
-{
-    __table_ = _VSTD::move(__u.__table_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>&
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::operator=(
-        initializer_list<value_type> __il)
-{
-    __table_.__assign_multi(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                         _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_multi(*__first);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-     unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-           const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename unordered_multiset<_Value, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    typedef pair<const_iterator, const_iterator> _EqRng;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(); __i != __ex;)
-    {
-        _EqRng __xeq = __x.equal_range(*__i);
-        _EqRng __yeq = __y.equal_range(*__i);
-        if (_VSTD::distance(__xeq.first, __xeq.second) !=
-            _VSTD::distance(__yeq.first, __yeq.second) ||
-                  !_VSTD::is_permutation(__xeq.first, __xeq.second, __yeq.first))
-            return false;
-        __i = __xeq.second;
-    }
-    return true;
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-           const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_UNORDERED_SET
diff --git a/include.new/c++/v1/tr1/utility b/include.new/c++/v1/tr1/utility
deleted file mode 100644
index 6f324db..0000000
--- a/include.new/c++/v1/tr1/utility
+++ /dev/null
@@ -1,768 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- utility -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_UTILITY
-#define _LIBCPP_UTILITY
-
-/*
-    utility synopsis
-
-namespace std
-{
-
-template <class T>
-    void
-    swap(T& a, T& b);
-
-namespace rel_ops
-{
-    template<class T> bool operator!=(const T&, const T&);
-    template<class T> bool operator> (const T&, const T&);
-    template<class T> bool operator<=(const T&, const T&);
-    template<class T> bool operator>=(const T&, const T&);
-}
-
-template<class T>
-void
-swap(T& a, T& b) noexcept(is_nothrow_move_constructible<T>::value &&
-                          is_nothrow_move_assignable<T>::value);
-
-template <class T, size_t N>
-void
-swap(T (&a)[N], T (&b)[N]) noexcept(noexcept(swap(*a, *b)));
-
-template <class T> T&& forward(typename remove_reference<T>::type& t) noexcept;  // constexpr in C++14
-template <class T> T&& forward(typename remove_reference<T>::type&& t) noexcept; // constexpr in C++14
-
-template <class T> typename remove_reference<T>::type&& move(T&&) noexcept;      // constexpr in C++14
-
-template <class T>
-    typename conditional
-    <
-        !is_nothrow_move_constructible<T>::value && is_copy_constructible<T>::value,
-        const T&,
-        T&&
-    >::type
-    move_if_noexcept(T& x) noexcept; // constexpr in C++14
-
-template <class T> typename add_rvalue_reference<T>::type declval() noexcept;
-
-template <class T1, class T2>
-struct pair
-{
-    typedef T1 first_type;
-    typedef T2 second_type;
-
-    T1 first;
-    T2 second;
-
-    pair(const pair&) = default;
-    pair(pair&&) = default;
-    constexpr pair();
-    pair(const T1& x, const T2& y);                          // constexpr in C++14
-    template <class U, class V> pair(U&& x, V&& y);          // constexpr in C++14
-    template <class U, class V> pair(const pair<U, V>& p);   // constexpr in C++14
-    template <class U, class V> pair(pair<U, V>&& p);        // constexpr in C++14
-    template <class... Args1, class... Args2>
-        pair(piecewise_construct_t, tuple<Args1...> first_args,
-             tuple<Args2...> second_args);
-
-    template <class U, class V> pair& operator=(const pair<U, V>& p);
-    pair& operator=(pair&& p) noexcept(is_nothrow_move_assignable<T1>::value &&
-                                       is_nothrow_move_assignable<T2>::value);
-    template <class U, class V> pair& operator=(pair<U, V>&& p);
-
-    void swap(pair& p) noexcept(noexcept(swap(first, p.first)) &&
-                                noexcept(swap(second, p.second)));
-};
-
-template <class T1, class T2> bool operator==(const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator!=(const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator< (const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator> (const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator>=(const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator<=(const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-
-template <class T1, class T2> pair<V1, V2> make_pair(T1&&, T2&&);   // constexpr in C++14
-template <class T1, class T2>
-void
-swap(pair<T1, T2>& x, pair<T1, T2>& y) noexcept(noexcept(x.swap(y)));
-
-struct piecewise_construct_t { };
-constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t();
-
-template <class T> class tuple_size;
-template <size_t I, class T> class tuple_element;
-
-template <class T1, class T2> struct tuple_size<pair<T1, T2> >;
-template <class T1, class T2> struct tuple_element<0, pair<T1, T2> >;
-template <class T1, class T2> struct tuple_element<1, pair<T1, T2> >;
-
-template<size_t I, class T1, class T2>
-    typename tuple_element<I, pair<T1, T2> >::type&
-    get(pair<T1, T2>&) noexcept; // constexpr in C++14
-
-template<size_t I, class T1, class T2>
-    const typename const tuple_element<I, pair<T1, T2> >::type&
-    get(const pair<T1, T2>&) noexcept; // constexpr in C++14
-
-template<size_t I, class T1, class T2>
-    typename tuple_element<I, pair<T1, T2> >::type&&
-    get(pair<T1, T2>&&) noexcept; // constexpr in C++14
-
-template<class T1, class T2>
-    constexpr T1& get(pair<T1, T2>&) noexcept; // C++14
-
-template<size_t I, class T1, class T2>
-    constexpr T1 const& get(pair<T1, T2> const &) noexcept; // C++14
-
-template<size_t I, class T1, class T2>
-    constexpr T1&& get(pair<T1, T2>&&) noexcept; // C++14
-
-// C++14
-
-template<class T, T... I>
-struct integer_sequence
-{
-    typedef T value_type;
-
-    static constexpr size_t size() noexcept;
-};
-
-template<size_t... I>
-  using index_sequence = integer_sequence<size_t, I...>;
-
-template<class T, T N>
-  using make_integer_sequence = integer_sequence<T, 0, 1, ..., N-1>;
-template<size_t N>
-  using make_index_sequence = make_integer_sequence<size_t, N>;
-
-template<class... T>
-  using index_sequence_for = make_index_sequence<sizeof...(T)>;
-
-template<class T, class U=T> 
-    T exchange(T& obj, U&& new_value);
-}  // std
-
-*/
-
-#include <__config>
-#include <__tuple>
-#include <type_traits>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-namespace rel_ops
-{
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const _Tp& __x, const _Tp& __y)
-{
-    return !(__x == __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const _Tp& __x, const _Tp& __y)
-{
-    return __y < __x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const _Tp& __x, const _Tp& __y)
-{
-    return !(__y < __x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const _Tp& __x, const _Tp& __y)
-{
-    return !(__x < __y);
-}
-
-}  // rel_ops
-
-// swap_ranges
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator2
-swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2)
-{
-    for(; __first1 != __last1; ++__first1, (void) ++__first2)
-        swap(*__first1, *__first2);
-    return __first2;
-}
-
-template<class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(_Tp (&__a)[_Np], _Tp (&__b)[_Np]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value)
-{
-    _VSTD::swap_ranges(__a, __a + _Np, __b);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-typename conditional
-<
-    !is_nothrow_move_constructible<_Tp>::value && is_copy_constructible<_Tp>::value,
-    const _Tp&,
-    _Tp&&
->::type
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-const _Tp&
-#endif
-move_if_noexcept(_Tp& __x) _NOEXCEPT
-{
-    return _VSTD::move(__x);
-}
-
-struct _LIBCPP_TYPE_VIS_ONLY piecewise_construct_t { };
-#if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_UTILITY)
-extern const piecewise_construct_t piecewise_construct;// = piecewise_construct_t();
-#else
-constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t();
-#endif
-
-template <class _T1, class _T2>
-struct _LIBCPP_TYPE_VIS_ONLY pair
-{
-    typedef _T1 first_type;
-    typedef _T2 second_type;
-
-    _T1 first;
-    _T2 second;
-
-    // pair(const pair&) = default;
-    // pair(pair&&) = default;
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR pair() : first(), second() {}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    pair(const _T1& __x, const _T2& __y)
-        : first(__x), second(__y) {}
-
-    template<class _U1, class _U2>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        pair(const pair<_U1, _U2>& __p
-#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-                 ,typename enable_if<is_convertible<const _U1&, _T1>::value &&
-                                    is_convertible<const _U2&, _T2>::value>::type* = 0
-#endif
-                                      )
-            : first(__p.first), second(__p.second) {}
-
-#if !defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && _LIBCPP_TRIVIAL_PAIR_COPY_CTOR
-    _LIBCPP_INLINE_VISIBILITY
-    pair(const pair& __p) = default;
-#elif !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) || !_LIBCPP_TRIVIAL_PAIR_COPY_CTOR
-    _LIBCPP_INLINE_VISIBILITY
-    pair(const pair& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<first_type>::value &&
-                   is_nothrow_copy_constructible<second_type>::value)
-        : first(__p.first),
-          second(__p.second)
-    {
-    }
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair& operator=(const pair& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<first_type>::value &&
-                   is_nothrow_copy_assignable<second_type>::value)
-    {
-        first = __p.first;
-        second = __p.second;
-        return *this;
-    }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _U1, class _U2,
-              class = typename enable_if<is_convertible<_U1, first_type>::value &&
-                                         is_convertible<_U2, second_type>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        pair(_U1&& __u1, _U2&& __u2)
-            : first(_VSTD::forward<_U1>(__u1)),
-              second(_VSTD::forward<_U2>(__u2))
-            {}
-
-    template<class _U1, class _U2>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        pair(pair<_U1, _U2>&& __p,
-                 typename enable_if<is_convertible<_U1, _T1>::value &&
-                                    is_convertible<_U2, _T2>::value>::type* = 0)
-            : first(_VSTD::forward<_U1>(__p.first)),
-              second(_VSTD::forward<_U2>(__p.second)) {}
-
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    _LIBCPP_INLINE_VISIBILITY
-    pair(pair&& __p) = default;
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    pair(pair&& __p) _NOEXCEPT_(is_nothrow_move_constructible<first_type>::value &&
-                                is_nothrow_move_constructible<second_type>::value)
-        : first(_VSTD::forward<first_type>(__p.first)),
-          second(_VSTD::forward<second_type>(__p.second))
-    {
-    }
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair&
-    operator=(pair&& __p) _NOEXCEPT_(is_nothrow_move_assignable<first_type>::value &&
-                                     is_nothrow_move_assignable<second_type>::value)
-    {
-        first = _VSTD::forward<first_type>(__p.first);
-        second = _VSTD::forward<second_type>(__p.second);
-        return *this;
-    }
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template<class _Tuple,
-             class = typename enable_if<__tuple_convertible<_Tuple, pair>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        pair(_Tuple&& __p)
-            : first(_VSTD::forward<typename tuple_element<0,
-                                  typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<0>(__p))),
-              second(_VSTD::forward<typename tuple_element<1,
-                                   typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<1>(__p)))
-            {}
-
-
-
-    template <class... _Args1, class... _Args2>
-        _LIBCPP_INLINE_VISIBILITY
-        pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args,
-                                    tuple<_Args2...> __second_args)
-            : pair(__pc, __first_args, __second_args,
-                   typename __make_tuple_indices<sizeof...(_Args1)>::type(),
-                   typename __make_tuple_indices<sizeof...(_Args2) >::type())
-            {}
-
-    template <class _Tuple,
-              class = typename enable_if<__tuple_assignable<_Tuple, pair>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        pair&
-        operator=(_Tuple&& __p)
-        {
-            typedef typename __make_tuple_types<_Tuple>::type _TupleRef;
-            typedef typename tuple_element<0, _TupleRef>::type _U0;
-            typedef typename tuple_element<1, _TupleRef>::type _U1;
-            first  = _VSTD::forward<_U0>(_VSTD::get<0>(__p));
-            second = _VSTD::forward<_U1>(_VSTD::get<1>(__p));
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void
-    swap(pair& __p) _NOEXCEPT_(__is_nothrow_swappable<first_type>::value &&
-                               __is_nothrow_swappable<second_type>::value)
-    {
-        _VSTD::iter_swap(&first, &__p.first);
-        _VSTD::iter_swap(&second, &__p.second);
-    }
-private:
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        pair(piecewise_construct_t,
-             tuple<_Args1...>& __first_args, tuple<_Args2...>& __second_args,
-             __tuple_indices<_I1...>, __tuple_indices<_I2...>);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-};
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return __x.first == __y.first && __x.second == __y.second;
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator< (const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return __x.first < __y.first || (!(__y.first < __x.first) && __x.second < __y.second);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator> (const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return __y < __x;
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_swappable<_T1>::value &&
-    __is_swappable<_T2>::value,
-    void
->::type
-swap(pair<_T1, _T2>& __x, pair<_T1, _T2>& __y)
-                     _NOEXCEPT_((__is_nothrow_swappable<_T1>::value &&
-                                 __is_nothrow_swappable<_T2>::value))
-{
-    __x.swap(__y);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY reference_wrapper;
-
-template <class _Tp>
-struct __make_pair_return_impl
-{
-    typedef _Tp type;
-};
-
-template <class _Tp>
-struct __make_pair_return_impl<reference_wrapper<_Tp>>
-{
-    typedef _Tp& type;
-};
-
-template <class _Tp>
-struct __make_pair_return
-{
-    typedef typename __make_pair_return_impl<typename decay<_Tp>::type>::type type;
-};
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<typename __make_pair_return<_T1>::type, typename __make_pair_return<_T2>::type>
-make_pair(_T1&& __t1, _T2&& __t2)
-{
-    return pair<typename __make_pair_return<_T1>::type, typename __make_pair_return<_T2>::type>
-               (_VSTD::forward<_T1>(__t1), _VSTD::forward<_T2>(__t2));
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_T1,_T2>
-make_pair(_T1 __x, _T2 __y)
-{
-    return pair<_T1, _T2>(__x, __y);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _T1, class _T2>
-  class _LIBCPP_TYPE_VIS_ONLY tuple_size<pair<_T1, _T2> >
-    : public integral_constant<size_t, 2> {};
-
-template <class _T1, class _T2>
-  class _LIBCPP_TYPE_VIS_ONLY tuple_size<const pair<_T1, _T2> >
-    : public integral_constant<size_t, 2> {};
-
-template <class _T1, class _T2>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<0, pair<_T1, _T2> >
-{
-public:
-    typedef _T1 type;
-};
-
-template <class _T1, class _T2>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<1, pair<_T1, _T2> >
-{
-public:
-    typedef _T2 type;
-};
-
-template <class _T1, class _T2>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<0, const pair<_T1, _T2> >
-{
-public:
-    typedef const _T1 type;
-};
-
-template <class _T1, class _T2>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<1, const pair<_T1, _T2> >
-{
-public:
-    typedef const _T2 type;
-};
-
-template <size_t _Ip> struct __get_pair;
-
-template <>
-struct __get_pair<0>
-{
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    _T1&
-    get(pair<_T1, _T2>& __p) _NOEXCEPT {return __p.first;}
-
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const _T1&
-    get(const pair<_T1, _T2>& __p) _NOEXCEPT {return __p.first;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    _T1&&
-    get(pair<_T1, _T2>&& __p) _NOEXCEPT {return _VSTD::forward<_T1>(__p.first);}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-template <>
-struct __get_pair<1>
-{
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    _T2&
-    get(pair<_T1, _T2>& __p) _NOEXCEPT {return __p.second;}
-
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const _T2&
-    get(const pair<_T1, _T2>& __p) _NOEXCEPT {return __p.second;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    _T2&&
-    get(pair<_T1, _T2>&& __p) _NOEXCEPT {return _VSTD::forward<_T2>(__p.second);}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-get(pair<_T1, _T2>& __p) _NOEXCEPT
-{
-    return __get_pair<_Ip>::get(__p);
-}
-
-template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-get(const pair<_T1, _T2>& __p) _NOEXCEPT
-{
-    return __get_pair<_Ip>::get(__p);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
-get(pair<_T1, _T2>&& __p) _NOEXCEPT
-{
-    return __get_pair<_Ip>::get(_VSTD::move(__p));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#if _LIBCPP_STD_VER > 11
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 & get(pair<_T1, _T2>& __p) _NOEXCEPT
-{
-    return __get_pair<0>::get(__p);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 const & get(pair<_T1, _T2> const& __p) _NOEXCEPT
-{
-    return __get_pair<0>::get(__p);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 && get(pair<_T1, _T2>&& __p) _NOEXCEPT
-{
-    return __get_pair<0>::get(_VSTD::move(__p));
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 & get(pair<_T2, _T1>& __p) _NOEXCEPT
-{
-    return __get_pair<1>::get(__p);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 const & get(pair<_T2, _T1> const& __p) _NOEXCEPT
-{
-    return __get_pair<1>::get(__p);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 && get(pair<_T2, _T1>&& __p) _NOEXCEPT
-{
-    return __get_pair<1>::get(_VSTD::move(__p));
-}
-
-#endif
-
-#if _LIBCPP_STD_VER > 11
-
-template<class _Tp, _Tp... _Ip>
-struct _LIBCPP_TYPE_VIS_ONLY integer_sequence
-{
-    typedef _Tp value_type;
-    static_assert( is_integral<_Tp>::value,
-                  "std::integer_sequence can only be instantiated with an integral type" );
-    static
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr
-    size_t
-    size() noexcept { return sizeof...(_Ip); }
-};
-
-template<size_t... _Ip>
-    using index_sequence = integer_sequence<size_t, _Ip...>;
-
-namespace __detail {
-
-template<typename _Tp, size_t ..._Extra> struct __repeat;
-template<typename _Tp, _Tp ..._Np, size_t ..._Extra> struct __repeat<integer_sequence<_Tp, _Np...>, _Extra...> {
-  typedef integer_sequence<_Tp,
-                           _Np...,
-                           sizeof...(_Np) + _Np...,
-                           2 * sizeof...(_Np) + _Np...,
-                           3 * sizeof...(_Np) + _Np...,
-                           4 * sizeof...(_Np) + _Np...,
-                           5 * sizeof...(_Np) + _Np...,
-                           6 * sizeof...(_Np) + _Np...,
-                           7 * sizeof...(_Np) + _Np...,
-                           _Extra...> type;
-};
-
-template<size_t _Np> struct __parity;
-template<size_t _Np> struct __make : __parity<_Np % 8>::template __pmake<_Np> {};
-
-template<> struct __make<0> { typedef integer_sequence<size_t> type; };
-template<> struct __make<1> { typedef integer_sequence<size_t, 0> type; };
-template<> struct __make<2> { typedef integer_sequence<size_t, 0, 1> type; };
-template<> struct __make<3> { typedef integer_sequence<size_t, 0, 1, 2> type; };
-template<> struct __make<4> { typedef integer_sequence<size_t, 0, 1, 2, 3> type; };
-template<> struct __make<5> { typedef integer_sequence<size_t, 0, 1, 2, 3, 4> type; };
-template<> struct __make<6> { typedef integer_sequence<size_t, 0, 1, 2, 3, 4, 5> type; };
-template<> struct __make<7> { typedef integer_sequence<size_t, 0, 1, 2, 3, 4, 5, 6> type; };
-
-template<> struct __parity<0> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type> {}; };
-template<> struct __parity<1> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 1> {}; };
-template<> struct __parity<2> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<3> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<4> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<5> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<6> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<7> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 7, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-
-template<typename _Tp, typename _Up> struct __convert {
-  template<typename> struct __result;
-  template<_Tp ..._Np> struct __result<integer_sequence<_Tp, _Np...> > { typedef integer_sequence<_Up, _Np...> type; };
-};
-template<typename _Tp> struct __convert<_Tp, _Tp> { template<typename _Up> struct __result { typedef _Up type; }; };
-
-}
-
-template<typename _Tp, _Tp _Np> using __make_integer_sequence_unchecked =
-  typename __detail::__convert<size_t, _Tp>::template __result<typename __detail::__make<_Np>::type>::type;
-
-template <class _Tp, _Tp _Ep>
-struct __make_integer_sequence
-{
-    static_assert(is_integral<_Tp>::value,
-                  "std::make_integer_sequence can only be instantiated with an integral type" );
-    static_assert(0 <= _Ep, "std::make_integer_sequence input shall not be negative");
-    typedef __make_integer_sequence_unchecked<_Tp, _Ep> type;
-};
-
-template<class _Tp, _Tp _Np>
-    using make_integer_sequence = typename __make_integer_sequence<_Tp, _Np>::type;
-
-template<size_t _Np>
-    using make_index_sequence = make_integer_sequence<size_t, _Np>;
-
-template<class... _Tp>
-    using index_sequence_for = make_index_sequence<sizeof...(_Tp)>;
-  
-#endif  // _LIBCPP_STD_VER > 11
-
-#if _LIBCPP_STD_VER > 11
-template<class _T1, class _T2 = _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-_T1 exchange(_T1& __obj, _T2 && __new_value)
-{
-    _T1 __old_value = _VSTD::move(__obj);
-    __obj = _VSTD::forward<_T2>(__new_value);
-    return __old_value;
-}    
-#endif  // _LIBCPP_STD_VER > 11
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_UTILITY
diff --git a/include.new/c++/v1/tr1/valarray b/include.new/c++/v1/tr1/valarray
deleted file mode 100644
index 2b94204..0000000
--- a/include.new/c++/v1/tr1/valarray
+++ /dev/null
@@ -1,4782 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- valarray ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_VALARRAY
-#define _LIBCPP_VALARRAY
-
-/*
-    valarray synopsis
-
-namespace std
-{
-
-template<class T>
-class valarray
-{
-public:
-    typedef T value_type;
-
-    // construct/destroy:
-    valarray();
-    explicit valarray(size_t n);
-    valarray(const value_type& x, size_t n);
-    valarray(const value_type* px, size_t n);
-    valarray(const valarray& v);
-    valarray(valarray&& v) noexcept;
-    valarray(const slice_array<value_type>& sa);
-    valarray(const gslice_array<value_type>& ga);
-    valarray(const mask_array<value_type>& ma);
-    valarray(const indirect_array<value_type>& ia);
-    valarray(initializer_list<value_type> il);
-    ~valarray();
-
-    // assignment:
-    valarray& operator=(const valarray& v);
-    valarray& operator=(valarray&& v) noexcept;
-    valarray& operator=(initializer_list<value_type> il);
-    valarray& operator=(const value_type& x);
-    valarray& operator=(const slice_array<value_type>& sa);
-    valarray& operator=(const gslice_array<value_type>& ga);
-    valarray& operator=(const mask_array<value_type>& ma);
-    valarray& operator=(const indirect_array<value_type>& ia);
-
-    // element access:
-    const value_type& operator[](size_t i) const;
-    value_type&       operator[](size_t i);
-
-    // subset operations:
-    valarray                   operator[](slice s) const;
-    slice_array<value_type>    operator[](slice s);
-    valarray                   operator[](const gslice& gs) const;
-    gslice_array<value_type>   operator[](const gslice& gs);
-    valarray                   operator[](const valarray<bool>& vb) const;
-    mask_array<value_type>     operator[](const valarray<bool>& vb);
-    valarray                   operator[](const valarray<size_t>& vs) const;
-    indirect_array<value_type> operator[](const valarray<size_t>& vs);
-
-    // unary operators:
-    valarray       operator+() const;
-    valarray       operator-() const;
-    valarray       operator~() const;
-    valarray<bool> operator!() const;
-
-    // computed assignment:
-    valarray& operator*= (const value_type& x);
-    valarray& operator/= (const value_type& x);
-    valarray& operator%= (const value_type& x);
-    valarray& operator+= (const value_type& x);
-    valarray& operator-= (const value_type& x);
-    valarray& operator^= (const value_type& x);
-    valarray& operator&= (const value_type& x);
-    valarray& operator|= (const value_type& x);
-    valarray& operator<<=(const value_type& x);
-    valarray& operator>>=(const value_type& x);
-
-    valarray& operator*= (const valarray& v);
-    valarray& operator/= (const valarray& v);
-    valarray& operator%= (const valarray& v);
-    valarray& operator+= (const valarray& v);
-    valarray& operator-= (const valarray& v);
-    valarray& operator^= (const valarray& v);
-    valarray& operator|= (const valarray& v);
-    valarray& operator&= (const valarray& v);
-    valarray& operator<<=(const valarray& v);
-    valarray& operator>>=(const valarray& v);
-
-    // member functions:
-    void swap(valarray& v) noexcept;
-
-    size_t size() const;
-
-    value_type sum() const;
-    value_type min() const;
-    value_type max() const;
-
-    valarray shift (int i) const;
-    valarray cshift(int i) const;
-    valarray apply(value_type f(value_type)) const;
-    valarray apply(value_type f(const value_type&)) const;
-    void resize(size_t n, value_type x = value_type());
-};
-
-class slice
-{
-public:
-    slice();
-    slice(size_t start, size_t size, size_t stride);
-
-    size_t start()  const;
-    size_t size()   const;
-    size_t stride() const;
-};
-
-template <class T>
-class slice_array
-{
-public:
-    typedef T value_type;
-
-    const slice_array& operator=(const slice_array& sa) const;
-    void operator=  (const valarray<value_type>& v) const;
-    void operator*= (const valarray<value_type>& v) const;
-    void operator/= (const valarray<value_type>& v) const;
-    void operator%= (const valarray<value_type>& v) const;
-    void operator+= (const valarray<value_type>& v) const;
-    void operator-= (const valarray<value_type>& v) const;
-    void operator^= (const valarray<value_type>& v) const;
-    void operator&= (const valarray<value_type>& v) const;
-    void operator|= (const valarray<value_type>& v) const;
-    void operator<<=(const valarray<value_type>& v) const;
-    void operator>>=(const valarray<value_type>& v) const;
-
-    void operator=(const value_type& x) const;
-
-    slice_array() = delete;
-};
-
-class gslice
-{
-public:
-    gslice();
-    gslice(size_t start, const valarray<size_t>& size,
-                         const valarray<size_t>& stride);
-
-    size_t           start()  const;
-    valarray<size_t> size()   const;
-    valarray<size_t> stride() const;
-};
-
-template <class T>
-class gslice_array
-{
-public:
-    typedef T value_type;
-
-    void operator=  (const valarray<value_type>& v) const;
-    void operator*= (const valarray<value_type>& v) const;
-    void operator/= (const valarray<value_type>& v) const;
-    void operator%= (const valarray<value_type>& v) const;
-    void operator+= (const valarray<value_type>& v) const;
-    void operator-= (const valarray<value_type>& v) const;
-    void operator^= (const valarray<value_type>& v) const;
-    void operator&= (const valarray<value_type>& v) const;
-    void operator|= (const valarray<value_type>& v) const;
-    void operator<<=(const valarray<value_type>& v) const;
-    void operator>>=(const valarray<value_type>& v) const;
-
-    gslice_array(const gslice_array& ga);
-    ~gslice_array();
-    const gslice_array& operator=(const gslice_array& ga) const;
-    void operator=(const value_type& x) const;
-
-    gslice_array() = delete;
-};
-
-template <class T>
-class mask_array
-{
-public:
-    typedef T value_type;
-
-    void operator=  (const valarray<value_type>& v) const;
-    void operator*= (const valarray<value_type>& v) const;
-    void operator/= (const valarray<value_type>& v) const;
-    void operator%= (const valarray<value_type>& v) const;
-    void operator+= (const valarray<value_type>& v) const;
-    void operator-= (const valarray<value_type>& v) const;
-    void operator^= (const valarray<value_type>& v) const;
-    void operator&= (const valarray<value_type>& v) const;
-    void operator|= (const valarray<value_type>& v) const;
-    void operator<<=(const valarray<value_type>& v) const;
-    void operator>>=(const valarray<value_type>& v) const;
-
-    mask_array(const mask_array& ma);
-    ~mask_array();
-    const mask_array& operator=(const mask_array& ma) const;
-    void operator=(const value_type& x) const;
-
-    mask_array() = delete;
-};
-
-template <class T>
-class indirect_array
-{
-public:
-    typedef T value_type;
-
-    void operator=  (const valarray<value_type>& v) const;
-    void operator*= (const valarray<value_type>& v) const;
-    void operator/= (const valarray<value_type>& v) const;
-    void operator%= (const valarray<value_type>& v) const;
-    void operator+= (const valarray<value_type>& v) const;
-    void operator-= (const valarray<value_type>& v) const;
-    void operator^= (const valarray<value_type>& v) const;
-    void operator&= (const valarray<value_type>& v) const;
-    void operator|= (const valarray<value_type>& v) const;
-    void operator<<=(const valarray<value_type>& v) const;
-    void operator>>=(const valarray<value_type>& v) const;
-
-    indirect_array(const indirect_array& ia);
-    ~indirect_array();
-    const indirect_array& operator=(const indirect_array& ia) const;
-    void operator=(const value_type& x) const;
-
-    indirect_array() = delete;
-};
-
-template<class T> void swap(valarray<T>& x, valarray<T>& y) noexcept;
-
-template<class T> valarray<T> operator* (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator* (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator* (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator/ (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator/ (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator/ (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator% (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator% (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator% (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator+ (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator+ (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator+ (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator- (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator- (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator- (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator^ (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator^ (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator^ (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator& (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator& (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator& (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator| (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator| (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator| (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator<<(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator<<(const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator<<(const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator>>(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator>>(const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator>>(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator&&(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator&&(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator&&(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator||(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator||(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator||(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator==(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator==(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator==(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator!=(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator!=(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator!=(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator< (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator< (const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator< (const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator> (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator> (const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator> (const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator<=(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator<=(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator<=(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator>=(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator>=(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator>=(const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> abs (const valarray<T>& x);
-template<class T> valarray<T> acos (const valarray<T>& x);
-template<class T> valarray<T> asin (const valarray<T>& x);
-template<class T> valarray<T> atan (const valarray<T>& x);
-
-template<class T> valarray<T> atan2(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> atan2(const valarray<T>& x, const T& y);
-template<class T> valarray<T> atan2(const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> cos (const valarray<T>& x);
-template<class T> valarray<T> cosh (const valarray<T>& x);
-template<class T> valarray<T> exp (const valarray<T>& x);
-template<class T> valarray<T> log (const valarray<T>& x);
-template<class T> valarray<T> log10(const valarray<T>& x);
-
-template<class T> valarray<T> pow(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> pow(const valarray<T>& x, const T& y);
-template<class T> valarray<T> pow(const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> sin (const valarray<T>& x);
-template<class T> valarray<T> sinh (const valarray<T>& x);
-template<class T> valarray<T> sqrt (const valarray<T>& x);
-template<class T> valarray<T> tan (const valarray<T>& x);
-template<class T> valarray<T> tanh (const valarray<T>& x);
-
-template <class T> unspecified1 begin(valarray<T>& v);
-template <class T> unspecified2 begin(const valarray<T>& v);
-template <class T> unspecified1 end(valarray<T>& v);
-template <class T> unspecified2 end(const valarray<T>& v);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cstddef>
-#include <cmath>
-#include <initializer_list>
-#include <algorithm>
-#include <functional>
-#include <new>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template<class _Tp> class _LIBCPP_TYPE_VIS_ONLY valarray;
-
-class _LIBCPP_TYPE_VIS_ONLY slice
-{
-    size_t __start_;
-    size_t __size_;
-    size_t __stride_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    slice()
-        : __start_(0),
-          __size_(0),
-          __stride_(0)
-          {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    slice(size_t __start, size_t __size, size_t __stride)
-        : __start_(__start),
-          __size_(__size),
-          __stride_(__stride)
-          {}
-
-    _LIBCPP_INLINE_VISIBILITY size_t start()  const {return __start_;}
-    _LIBCPP_INLINE_VISIBILITY size_t size()   const {return __size_;}
-    _LIBCPP_INLINE_VISIBILITY size_t stride() const {return __stride_;}
-};
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY slice_array;
-class _LIBCPP_TYPE_VIS gslice;
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY gslice_array;
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY mask_array;
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY indirect_array;
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-_Tp*
-begin(valarray<_Tp>& __v);
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-const _Tp*
-begin(const valarray<_Tp>& __v);
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-_Tp*
-end(valarray<_Tp>& __v);
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-const _Tp*
-end(const valarray<_Tp>& __v);
-
-template <class _Op, class _A0>
-struct _UnaryOp
-{
-    typedef typename _Op::result_type result_type;
-    typedef typename _A0::value_type value_type;
-
-    _Op __op_;
-    _A0 __a0_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _UnaryOp(const _Op& __op, const _A0& __a0) : __op_(__op), __a0_(__a0) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const {return __op_(__a0_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Op, class _A0, class _A1>
-struct _BinaryOp
-{
-    typedef typename _Op::result_type result_type;
-    typedef typename _A0::value_type value_type;
-
-    _Op __op_;
-    _A0 __a0_;
-    _A1 __a1_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _BinaryOp(const _Op& __op, const _A0& __a0, const _A1& __a1)
-        : __op_(__op), __a0_(__a0), __a1_(__a1) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type operator[](size_t __i) const {return __op_(__a0_[__i], __a1_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Tp>
-class __scalar_expr
-{
-public:
-    typedef _Tp        value_type;
-    typedef const _Tp& result_type;
-private:
-    const value_type& __t_;
-    size_t __s_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __scalar_expr(const value_type& __t, size_t __s) : __t_(__t), __s_(__s) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t) const {return __t_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __s_;}
-};
-
-template <class _Tp>
-struct __unary_plus : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return +__x;}
-};
-
-template <class _Tp>
-struct __bit_not  : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return ~__x;}
-};
-
-template <class _Tp>
-struct __bit_shift_left : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x << __y;}
-};
-
-template <class _Tp>
-struct __bit_shift_right : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x >> __y;}
-};
-
-template <class _Tp, class _Fp>
-struct __apply_expr   : unary_function<_Tp, _Tp>
-{
-private:
-    _Fp __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __apply_expr(_Fp __f) : __f_(__f) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return __f_(__x);}
-};
-
-template <class _Tp>
-struct __abs_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return abs(__x);}
-};
-
-template <class _Tp>
-struct __acos_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return acos(__x);}
-};
-
-template <class _Tp>
-struct __asin_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return asin(__x);}
-};
-
-template <class _Tp>
-struct __atan_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return atan(__x);}
-};
-
-template <class _Tp>
-struct __atan2_expr : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return atan2(__x, __y);}
-};
-
-template <class _Tp>
-struct __cos_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return cos(__x);}
-};
-
-template <class _Tp>
-struct __cosh_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return cosh(__x);}
-};
-
-template <class _Tp>
-struct __exp_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return exp(__x);}
-};
-
-template <class _Tp>
-struct __log_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return log(__x);}
-};
-
-template <class _Tp>
-struct __log10_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return log10(__x);}
-};
-
-template <class _Tp>
-struct __pow_expr : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return pow(__x, __y);}
-};
-
-template <class _Tp>
-struct __sin_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return sin(__x);}
-};
-
-template <class _Tp>
-struct __sinh_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return sinh(__x);}
-};
-
-template <class _Tp>
-struct __sqrt_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return sqrt(__x);}
-};
-
-template <class _Tp>
-struct __tan_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return tan(__x);}
-};
-
-template <class _Tp>
-struct __tanh_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return tanh(__x);}
-};
-
-template <class _ValExpr>
-class __slice_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    size_t __start_;
-    size_t __size_;
-    size_t __stride_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __slice_expr(const slice& __sl, const _RmExpr& __e)
-        : __expr_(__e),
-          __start_(__sl.start()),
-          __size_(__sl.size()),
-          __stride_(__sl.stride())
-        {}
-public:
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {return __expr_[__start_ + __i * __stride_];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __size_;}
-
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY valarray;
-};
-
-template <class _ValExpr>
-class __mask_expr;
-
-template <class _ValExpr>
-class __indirect_expr;
-
-template <class _ValExpr>
-class __shift_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    size_t __size_;
-    ptrdiff_t __ul_;
-    ptrdiff_t __sn_;
-    ptrdiff_t __n_;
-    static const ptrdiff_t _Np = static_cast<ptrdiff_t>(
-                                    sizeof(ptrdiff_t) * __CHAR_BIT__ - 1);
-
-    _LIBCPP_INLINE_VISIBILITY
-    __shift_expr(int __n, const _RmExpr& __e)
-        : __expr_(__e),
-          __size_(__e.size()),
-          __n_(__n)
-        {
-            ptrdiff_t __neg_n = static_cast<ptrdiff_t>(__n_ >> _Np);
-            __sn_ = __neg_n | static_cast<ptrdiff_t>(static_cast<size_t>(-__n_) >> _Np);
-            __ul_ = ((__size_ - __n_) & ~__neg_n) | ((__n_ + 1) & __neg_n);
-        }
-public:
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __j) const
-        {
-            ptrdiff_t __i = static_cast<ptrdiff_t>(__j);
-            ptrdiff_t __m = (__sn_ * __i - __ul_) >> _Np;
-            return (__expr_[(__i + __n_) & __m] & __m) | (value_type() & ~__m);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __size_;}
-
-    template <class> friend class __val_expr;
-};
-
-template <class _ValExpr>
-class __cshift_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    size_t __size_;
-    size_t __m_;
-    size_t __o1_;
-    size_t __o2_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __cshift_expr(int __n, const _RmExpr& __e)
-        : __expr_(__e),
-          __size_(__e.size())
-        {
-            __n %= static_cast<int>(__size_);
-            if (__n >= 0)
-            {
-                __m_ = __size_ - __n;
-                __o1_ = __n;
-                __o2_ = __n - __size_;
-            }
-            else
-            {
-                __m_ = -__n;
-                __o1_ = __n + __size_;
-                __o2_ = __n;
-            }
-        }
-public:
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {
-            if (__i < __m_)
-                return __expr_[__i + __o1_];
-            return __expr_[__i + __o2_];
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __size_;}
-
-    template <class> friend class __val_expr;
-};
-
-template<class _ValExpr>
-class __val_expr;
-
-template<class _ValExpr>
-struct __is_val_expr : false_type {};
-
-template<class _ValExpr>
-struct __is_val_expr<__val_expr<_ValExpr> > : true_type {};
-
-template<class _Tp>
-struct __is_val_expr<valarray<_Tp> > : true_type {};
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY valarray
-{
-public:
-    typedef _Tp value_type;
-    typedef _Tp result_type;
-
-private:
-    value_type* __begin_;
-    value_type* __end_;
-
-public:
-    // construct/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    valarray() : __begin_(0), __end_(0) {}
-    explicit valarray(size_t __n);
-    valarray(const value_type& __x, size_t __n);
-    valarray(const value_type* __p, size_t __n);
-    valarray(const valarray& __v);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    valarray(valarray&& __v) _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    valarray(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    valarray(const slice_array<value_type>& __sa);
-    valarray(const gslice_array<value_type>& __ga);
-    valarray(const mask_array<value_type>& __ma);
-    valarray(const indirect_array<value_type>& __ia);
-    ~valarray();
-
-    // assignment:
-    valarray& operator=(const valarray& __v);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    valarray& operator=(valarray&& __v) _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    valarray& operator=(initializer_list<value_type>);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    valarray& operator=(const value_type& __x);
-    valarray& operator=(const slice_array<value_type>& __sa);
-    valarray& operator=(const gslice_array<value_type>& __ga);
-    valarray& operator=(const mask_array<value_type>& __ma);
-    valarray& operator=(const indirect_array<value_type>& __ia);
-    template <class _ValExpr>
-        valarray& operator=(const __val_expr<_ValExpr>& __v);
-
-    // element access:
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type& operator[](size_t __i) const {return __begin_[__i];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type&       operator[](size_t __i)       {return __begin_[__i];}
-
-    // subset operations:
-    __val_expr<__slice_expr<const valarray&> >    operator[](slice __s) const;
-    slice_array<value_type>                       operator[](slice __s);
-    __val_expr<__indirect_expr<const valarray&> > operator[](const gslice& __gs) const;
-    gslice_array<value_type>   operator[](const gslice& __gs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__indirect_expr<const valarray&> > operator[](gslice&& __gs) const;
-    gslice_array<value_type>                      operator[](gslice&& __gs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__mask_expr<const valarray&> >     operator[](const valarray<bool>& __vb) const;
-    mask_array<value_type>                        operator[](const valarray<bool>& __vb);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__mask_expr<const valarray&> >     operator[](valarray<bool>&& __vb) const;
-    mask_array<value_type>                        operator[](valarray<bool>&& __vb);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__indirect_expr<const valarray&> > operator[](const valarray<size_t>& __vs) const;
-    indirect_array<value_type>                    operator[](const valarray<size_t>& __vs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__indirect_expr<const valarray&> > operator[](valarray<size_t>&& __vs) const;
-    indirect_array<value_type>                    operator[](valarray<size_t>&& __vs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    // unary operators:
-    valarray       operator+() const;
-    valarray       operator-() const;
-    valarray       operator~() const;
-    valarray<bool> operator!() const;
-
-    // computed assignment:
-    valarray& operator*= (const value_type& __x);
-    valarray& operator/= (const value_type& __x);
-    valarray& operator%= (const value_type& __x);
-    valarray& operator+= (const value_type& __x);
-    valarray& operator-= (const value_type& __x);
-    valarray& operator^= (const value_type& __x);
-    valarray& operator&= (const value_type& __x);
-    valarray& operator|= (const value_type& __x);
-    valarray& operator<<=(const value_type& __x);
-    valarray& operator>>=(const value_type& __x);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator*= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator/= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator%= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator+= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator-= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator^= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator|= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator&= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator<<= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator>>= (const _Expr& __v);
-
-    // member functions:
-    void swap(valarray& __v) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return static_cast<size_t>(__end_ - __begin_);}
-
-    value_type sum() const;
-    value_type min() const;
-    value_type max() const;
-
-    valarray shift (int __i) const;
-    valarray cshift(int __i) const;
-    valarray apply(value_type __f(value_type)) const;
-    valarray apply(value_type __f(const value_type&)) const;
-    void     resize(size_t __n, value_type __x = value_type());
-
-private:
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY valarray;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY slice_array;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY gslice_array;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY mask_array;
-    template <class> friend class __mask_expr;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY indirect_array;
-    template <class> friend class __indirect_expr;
-    template <class> friend class __val_expr;
-
-    template <class _Up>
-    friend
-    _Up*
-    begin(valarray<_Up>& __v);
-
-    template <class _Up>
-    friend
-    const _Up*
-    begin(const valarray<_Up>& __v);
-
-    template <class _Up>
-    friend
-    _Up*
-    end(valarray<_Up>& __v);
-
-    template <class _Up>
-    friend
-    const _Up*
-    end(const valarray<_Up>& __v);
-};
-
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS valarray<size_t>::valarray(size_t))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS valarray<size_t>::~valarray())
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void valarray<size_t>::resize(size_t, size_t))
-
-template <class _Op, class _Tp>
-struct _UnaryOp<_Op, valarray<_Tp> >
-{
-    typedef typename _Op::result_type result_type;
-    typedef _Tp value_type;
-
-    _Op __op_;
-    const valarray<_Tp>& __a0_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _UnaryOp(const _Op& __op, const valarray<_Tp>& __a0) : __op_(__op), __a0_(__a0) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const {return __op_(__a0_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Op, class _Tp, class _A1>
-struct _BinaryOp<_Op, valarray<_Tp>, _A1>
-{
-    typedef typename _Op::result_type result_type;
-    typedef _Tp value_type;
-
-    _Op __op_;
-    const valarray<_Tp>& __a0_;
-    _A1 __a1_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _BinaryOp(const _Op& __op, const valarray<_Tp>& __a0, const _A1& __a1)
-        : __op_(__op), __a0_(__a0), __a1_(__a1) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type operator[](size_t __i) const {return __op_(__a0_[__i], __a1_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Op, class _A0, class _Tp>
-struct _BinaryOp<_Op, _A0, valarray<_Tp> >
-{
-    typedef typename _Op::result_type result_type;
-    typedef _Tp value_type;
-
-    _Op __op_;
-    _A0 __a0_;
-    const valarray<_Tp>& __a1_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _BinaryOp(const _Op& __op, const _A0& __a0, const valarray<_Tp>& __a1)
-        : __op_(__op), __a0_(__a0), __a1_(__a1) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type operator[](size_t __i) const {return __op_(__a0_[__i], __a1_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Op, class _Tp>
-struct _BinaryOp<_Op, valarray<_Tp>, valarray<_Tp> >
-{
-    typedef typename _Op::result_type result_type;
-    typedef _Tp value_type;
-
-    _Op __op_;
-    const valarray<_Tp>& __a0_;
-    const valarray<_Tp>& __a1_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _BinaryOp(const _Op& __op, const valarray<_Tp>& __a0, const valarray<_Tp>& __a1)
-        : __op_(__op), __a0_(__a0), __a1_(__a1) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type operator[](size_t __i) const {return __op_(__a0_[__i], __a1_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-// slice_array
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY slice_array
-{
-public:
-    typedef _Tp value_type;
-
-private:
-    value_type* __vp_;
-    size_t __size_;
-    size_t __stride_;
-
-public:
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator*=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator/=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator%=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator+=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator-=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator^=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator&=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator|=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator<<=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator>>=(const _Expr& __v) const;
-
-    const slice_array& operator=(const slice_array& __sa) const;
-
-    void operator=(const value_type& __x) const;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    slice_array(const slice& __sl, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_ + __sl.start())),
-          __size_(__sl.size()),
-          __stride_(__sl.stride())
-        {}
-
-    template <class> friend class valarray;
-    template <class> friend class sliceExpr;
-};
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const slice_array<_Tp>&
-slice_array<_Tp>::operator=(const slice_array& __sa) const
-{
-    value_type* __t = __vp_;
-    const value_type* __s = __sa.__vp_;
-    for (size_t __n = __size_; __n; --__n, __t += __stride_, __s += __sa.__stride_)
-        *__t = *__s;
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t = __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator*=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t *= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator/=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t /= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator%=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t %= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator+=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t += __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator-=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t -= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator^=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t ^= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator&=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t &= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator|=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t |= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator<<=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t <<= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator>>=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t >>= __v[__i];
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-slice_array<_Tp>::operator=(const value_type& __x) const
-{
-    value_type* __t = __vp_;
-    for (size_t __n = __size_; __n; --__n, __t += __stride_)
-        *__t = __x;
-}
-
-// gslice
-
-class _LIBCPP_TYPE_VIS gslice
-{
-    valarray<size_t> __size_;
-    valarray<size_t> __stride_;
-    valarray<size_t> __1d_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    gslice() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice(size_t __start, const valarray<size_t>& __size,
-                           const valarray<size_t>& __stride)
-        : __size_(__size),
-          __stride_(__stride)
-        {__init(__start);}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice(size_t __start, const valarray<size_t>&  __size,
-                                 valarray<size_t>&& __stride)
-        : __size_(__size),
-          __stride_(move(__stride))
-        {__init(__start);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice(size_t __start,       valarray<size_t>&& __size,
-                           const valarray<size_t>&  __stride)
-        : __size_(move(__size)),
-          __stride_(__stride)
-        {__init(__start);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice(size_t __start,       valarray<size_t>&& __size,
-                                 valarray<size_t>&& __stride)
-        : __size_(move(__size)),
-          __stride_(move(__stride))
-        {__init(__start);}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-//  gslice(const gslice&)            = default;
-//  gslice(gslice&&)                 = default;
-//  gslice& operator=(const gslice&) = default;
-//  gslice& operator=(gslice&&)      = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t           start()  const {return __1d_.size() ? __1d_[0] : 0;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    valarray<size_t> size()   const {return __size_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    valarray<size_t> stride() const {return __stride_;}
-
-private:
-    void __init(size_t __start);
-
-    template <class> friend class gslice_array;
-    template <class> friend class valarray;
-    template <class> friend class __val_expr;
-};
-
-// gslice_array
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY gslice_array
-{
-public:
-    typedef _Tp value_type;
-
-private:
-    value_type*      __vp_;
-    valarray<size_t> __1d_;
-
-public:
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator*=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator/=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator%=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator+=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator-=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator^=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator&=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator|=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator<<=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator>>=(const _Expr& __v) const;
-
-    const gslice_array& operator=(const gslice_array& __ga) const;
-
-    void operator=(const value_type& __x) const;
-
-//  gslice_array(const gslice_array&)            = default;
-//  gslice_array(gslice_array&&)                 = default;
-//  gslice_array& operator=(const gslice_array&) = default;
-//  gslice_array& operator=(gslice_array&&)      = default;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    gslice_array(const gslice& __gs, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(__gs.__1d_)
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice_array(gslice&& __gs, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(move(__gs.__1d_))
-        {}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class> friend class valarray;
-};
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] = __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator*=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] *= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator/=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] /= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator%=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] %= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator+=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] += __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator-=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] -= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator^=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] ^= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator&=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] &= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator|=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] |= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator<<=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] <<= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator>>=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] >>= __v[__j];
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const gslice_array<_Tp>&
-gslice_array<_Tp>::operator=(const gslice_array& __ga) const
-{
-    typedef const size_t* _Ip;
-    const value_type* __s = __ga.__vp_;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_, __j = __ga.__1d_.__begin_;
-            __i != __e; ++__i, ++__j)
-        __vp_[*__i] = __s[*__j];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-gslice_array<_Tp>::operator=(const value_type& __x) const
-{
-    typedef const size_t* _Ip;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i)
-        __vp_[*__i] = __x;
-}
-
-// mask_array
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY mask_array
-{
-public:
-    typedef _Tp value_type;
-
-private:
-    value_type*      __vp_;
-    valarray<size_t> __1d_;
-
-public:
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator*=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator/=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator%=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator+=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator-=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator^=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator&=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator|=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator<<=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator>>=(const _Expr& __v) const;
-
-    const mask_array& operator=(const mask_array& __ma) const;
-
-    void operator=(const value_type& __x) const;
-
-//  mask_array(const mask_array&)            = default;
-//  mask_array(mask_array&&)                 = default;
-//  mask_array& operator=(const mask_array&) = default;
-//  mask_array& operator=(mask_array&&)      = default;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    mask_array(const valarray<bool>& __vb, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(static_cast<size_t>(count(__vb.__begin_, __vb.__end_, true)))
-          {
-              size_t __j = 0;
-              for (size_t __i = 0; __i < __vb.size(); ++__i)
-                  if (__vb[__i])
-                      __1d_[__j++] = __i;
-          }
-
-    template <class> friend class valarray;
-};
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] = __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator*=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] *= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator/=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] /= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator%=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] %= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator+=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] += __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator-=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] -= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator^=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] ^= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator&=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] &= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator|=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] |= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator<<=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] <<= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator>>=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] >>= __v[__i];
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const mask_array<_Tp>&
-mask_array<_Tp>::operator=(const mask_array& __ma) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] = __ma.__vp_[__1d_[__i]];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-mask_array<_Tp>::operator=(const value_type& __x) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] = __x;
-}
-
-template <class _ValExpr>
-class __mask_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    valarray<size_t> __1d_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __mask_expr(const valarray<bool>& __vb, const _RmExpr& __e)
-        : __expr_(__e),
-          __1d_(static_cast<size_t>(count(__vb.__begin_, __vb.__end_, true)))
-          {
-              size_t __j = 0;
-              for (size_t __i = 0; __i < __vb.size(); ++__i)
-                  if (__vb[__i])
-                      __1d_[__j++] = __i;
-          }
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {return __expr_[__1d_[__i]];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __1d_.size();}
-
-    template <class> friend class valarray;
-};
-
-// indirect_array
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY indirect_array
-{
-public:
-    typedef _Tp value_type;
-
-private:
-    value_type*      __vp_;
-    valarray<size_t> __1d_;
-
-public:
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator*=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator/=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator%=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator+=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator-=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator^=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator&=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator|=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator<<=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator>>=(const _Expr& __v) const;
-
-    const indirect_array& operator=(const indirect_array& __ia) const;
-
-    void operator=(const value_type& __x) const;
-
-//  indirect_array(const indirect_array&)            = default;
-//  indirect_array(indirect_array&&)                 = default;
-//  indirect_array& operator=(const indirect_array&) = default;
-//  indirect_array& operator=(indirect_array&&)      = default;
-
-private:
-     _LIBCPP_INLINE_VISIBILITY
-   indirect_array(const valarray<size_t>& __ia, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(__ia)
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    indirect_array(valarray<size_t>&& __ia, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(move(__ia))
-        {}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class> friend class valarray;
-};
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] = __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator*=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] *= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator/=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] /= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator%=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] %= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator+=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] += __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator-=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] -= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator^=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] ^= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator&=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] &= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator|=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] |= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator<<=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] <<= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator>>=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] >>= __v[__i];
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const indirect_array<_Tp>&
-indirect_array<_Tp>::operator=(const indirect_array& __ia) const
-{
-    typedef const size_t* _Ip;
-    const value_type* __s = __ia.__vp_;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_, __j = __ia.__1d_.__begin_;
-            __i != __e; ++__i, ++__j)
-        __vp_[*__i] = __s[*__j];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-indirect_array<_Tp>::operator=(const value_type& __x) const
-{
-    typedef const size_t* _Ip;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i)
-        __vp_[*__i] = __x;
-}
-
-template <class _ValExpr>
-class __indirect_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    valarray<size_t> __1d_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __indirect_expr(const valarray<size_t>& __ia, const _RmExpr& __e)
-        : __expr_(__e),
-          __1d_(__ia)
-          {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    __indirect_expr(valarray<size_t>&& __ia, const _RmExpr& __e)
-        : __expr_(__e),
-          __1d_(move(__ia))
-          {}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {return __expr_[__1d_[__i]];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __1d_.size();}
-
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY valarray;
-};
-
-template<class _ValExpr>
-class __val_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-
-    _ValExpr __expr_;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef typename _RmExpr::result_type result_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __val_expr(const _RmExpr& __e) : __expr_(__e) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {return __expr_[__i];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__slice_expr<_ValExpr> > operator[](slice __s) const
-        {return __val_expr<__slice_expr<_ValExpr> >(__expr_, __s);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__indirect_expr<_ValExpr> > operator[](const gslice& __gs) const
-        {return __val_expr<__indirect_expr<_ValExpr> >(__expr_, __gs.__1d_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__mask_expr<_ValExpr> > operator[](const valarray<bool>& __vb) const
-        {return __val_expr<__mask_expr<_ValExpr> >(__expr_, __vb);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__indirect_expr<_ValExpr> > operator[](const valarray<size_t>& __vs) const
-        {return __val_expr<__indirect_expr<_ValExpr> >(__expr_, __vs);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<__unary_plus<value_type>, _ValExpr> >
-    operator+() const
-    {
-        typedef _UnaryOp<__unary_plus<value_type>, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(__unary_plus<value_type>(), __expr_));
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<negate<value_type>, _ValExpr> >
-    operator-() const
-    {
-        typedef _UnaryOp<negate<value_type>, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(negate<value_type>(), __expr_));
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<__bit_not<value_type>, _ValExpr> >
-    operator~() const
-    {
-        typedef _UnaryOp<__bit_not<value_type>, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(__bit_not<value_type>(), __expr_));
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<logical_not<value_type>, _ValExpr> >
-    operator!() const
-    {
-        typedef _UnaryOp<logical_not<value_type>, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(logical_not<value_type>(), __expr_));
-    }
-
-    operator valarray<result_type>() const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __expr_.size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type sum() const
-    {
-        size_t __n = __expr_.size();
-        result_type __r = __n ? __expr_[0] : result_type();
-        for (size_t __i = 1; __i < __n; ++__i)
-            __r += __expr_[__i];
-        return __r;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const
-    {
-        size_t __n = size();
-        result_type __r = __n ? (*this)[0] : result_type();
-        for (size_t __i = 1; __i < __n; ++__i)
-        {
-            result_type __x = __expr_[__i];
-            if (__x < __r)
-                __r = __x;
-        }
-        return __r;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const
-    {
-        size_t __n = size();
-        result_type __r = __n ? (*this)[0] : result_type();
-        for (size_t __i = 1; __i < __n; ++__i)
-        {
-            result_type __x = __expr_[__i];
-            if (__r < __x)
-                __r = __x;
-        }
-        return __r;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__shift_expr<_ValExpr> > shift (int __i) const
-        {return __val_expr<__shift_expr<_ValExpr> >(__shift_expr<_ValExpr>(__i, __expr_));}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__cshift_expr<_ValExpr> > cshift(int __i) const
-        {return __val_expr<__cshift_expr<_ValExpr> >(__cshift_expr<_ValExpr>(__i, __expr_));}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<__apply_expr<value_type, value_type(*)(value_type)>, _ValExpr> >
-    apply(value_type __f(value_type)) const
-    {
-        typedef __apply_expr<value_type, value_type(*)(value_type)> _Op;
-        typedef _UnaryOp<_Op, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(_Op(__f), __expr_));
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<__apply_expr<value_type, value_type(*)(const value_type&)>, _ValExpr> >
-    apply(value_type __f(const value_type&)) const
-    {
-        typedef __apply_expr<value_type, value_type(*)(const value_type&)> _Op;
-        typedef _UnaryOp<_Op, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(_Op(__f), __expr_));
-    }
-};
-
-template<class _ValExpr>
-__val_expr<_ValExpr>::operator valarray<__val_expr::result_type>() const
-{
-    valarray<result_type> __r;
-    size_t __n = __expr_.size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<result_type*>(_VSTD::__allocate(__n * sizeof(result_type)));
-        for (size_t __i = 0; __i != __n; ++__r.__end_, ++__i)
-            ::new (__r.__end_) result_type(__expr_[__i]);
-    }
-    return __r;
-}
-
-// valarray
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>::valarray(size_t __n)
-    : __begin_(0),
-      __end_(0)
-{
-    resize(__n);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>::valarray(const value_type& __x, size_t __n)
-    : __begin_(0),
-      __end_(0)
-{
-    resize(__n, __x);
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const value_type* __p, size_t __n)
-    : __begin_(0),
-      __end_(0)
-{
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __n; ++__end_, ++__p, --__n)
-                ::new (__end_) value_type(*__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const valarray& __v)
-    : __begin_(0),
-      __end_(0)
-{
-    if (__v.size())
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__v.size() * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (value_type* __p = __v.__begin_; __p != __v.__end_; ++__end_, ++__p)
-                ::new (__end_) value_type(*__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>::valarray(valarray&& __v) _NOEXCEPT
-    : __begin_(__v.__begin_),
-      __end_(__v.__end_)
-{
-    __v.__begin_ = __v.__end_ = nullptr;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp>
-valarray<_Tp>::valarray(initializer_list<value_type> __il)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __il.size();
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (const value_type* __p = __il.begin(); __n; ++__end_, ++__p, --__n)
-                ::new (__end_) value_type(*__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp>
-valarray<_Tp>::valarray(const slice_array<value_type>& __sa)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __sa.__size_;
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (const value_type* __p = __sa.__vp_; __n; ++__end_, __p += __sa.__stride_, --__n)
-                ::new (__end_) value_type(*__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const gslice_array<value_type>& __ga)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __ga.__1d_.size();
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            typedef const size_t* _Ip;
-            const value_type* __s = __ga.__vp_;
-            for (_Ip __i = __ga.__1d_.__begin_, __e = __ga.__1d_.__end_;
-                    __i != __e; ++__i, ++__end_)
-                ::new (__end_) value_type(__s[*__i]);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const mask_array<value_type>& __ma)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __ma.__1d_.size();
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            typedef const size_t* _Ip;
-            const value_type* __s = __ma.__vp_;
-            for (_Ip __i = __ma.__1d_.__begin_, __e = __ma.__1d_.__end_;
-                    __i != __e; ++__i, ++__end_)
-                ::new (__end_) value_type(__s[*__i]);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const indirect_array<value_type>& __ia)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __ia.__1d_.size();
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            typedef const size_t* _Ip;
-            const value_type* __s = __ia.__vp_;
-            for (_Ip __i = __ia.__1d_.__begin_, __e = __ia.__1d_.__end_;
-                    __i != __e; ++__i, ++__end_)
-                ::new (__end_) value_type(__s[*__i]);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>::~valarray()
-{
-    resize(0);
-}
-
-template <class _Tp>
-valarray<_Tp>&
-valarray<_Tp>::operator=(const valarray& __v)
-{
-    if (this != &__v)
-    {
-        if (size() != __v.size())
-            resize(__v.size());
-        _VSTD::copy(__v.__begin_, __v.__end_, __begin_);
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(valarray&& __v) _NOEXCEPT
-{
-    resize(0);
-    __begin_ = __v.__begin_;
-    __end_ = __v.__end_;
-    __v.__begin_ = nullptr;
-    __v.__end_ = nullptr;
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(initializer_list<value_type> __il)
-{
-    if (size() != __il.size())
-        resize(__il.size());
-    _VSTD::copy(__il.begin(), __il.end(), __begin_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const value_type& __x)
-{
-    _VSTD::fill(__begin_, __end_, __x);
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const slice_array<value_type>& __sa)
-{
-    value_type* __t = __begin_;
-    const value_type* __s = __sa.__vp_;
-    for (size_t __n = __sa.__size_; __n; --__n, __s += __sa.__stride_, ++__t)
-        *__t = *__s;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const gslice_array<value_type>& __ga)
-{
-    typedef const size_t* _Ip;
-    value_type* __t = __begin_;
-    const value_type* __s = __ga.__vp_;
-    for (_Ip __i = __ga.__1d_.__begin_, __e = __ga.__1d_.__end_;
-                    __i != __e; ++__i, ++__t)
-        *__t = __s[*__i];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const mask_array<value_type>& __ma)
-{
-    typedef const size_t* _Ip;
-    value_type* __t = __begin_;
-    const value_type* __s = __ma.__vp_;
-    for (_Ip __i = __ma.__1d_.__begin_, __e = __ma.__1d_.__end_;
-                    __i != __e; ++__i, ++__t)
-        *__t = __s[*__i];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const indirect_array<value_type>& __ia)
-{
-    typedef const size_t* _Ip;
-    value_type* __t = __begin_;
-    const value_type* __s = __ia.__vp_;
-    for (_Ip __i = __ia.__1d_.__begin_, __e = __ia.__1d_.__end_;
-                    __i != __e; ++__i, ++__t)
-        *__t = __s[*__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _ValExpr>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const __val_expr<_ValExpr>& __v)
-{
-    size_t __n = __v.size();
-    if (size() != __n)
-        resize(__n);
-    value_type* __t = __begin_;
-    for (size_t __i = 0; __i != __n; ++__t, ++__i)
-        *__t = result_type(__v[__i]);
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__slice_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](slice __s) const
-{
-    return __val_expr<__slice_expr<const valarray&> >(__slice_expr<const valarray&>(__s, *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-slice_array<_Tp>
-valarray<_Tp>::operator[](slice __s)
-{
-    return slice_array<value_type>(__s, *this);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__indirect_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](const gslice& __gs) const
-{
-    return __val_expr<__indirect_expr<const valarray&> >(__indirect_expr<const valarray&>(__gs.__1d_, *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-gslice_array<_Tp>
-valarray<_Tp>::operator[](const gslice& __gs)
-{
-    return gslice_array<value_type>(__gs, *this);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__indirect_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](gslice&& __gs) const
-{
-    return __val_expr<__indirect_expr<const valarray&> >(__indirect_expr<const valarray&>(move(__gs.__1d_), *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-gslice_array<_Tp>
-valarray<_Tp>::operator[](gslice&& __gs)
-{
-    return gslice_array<value_type>(move(__gs), *this);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__mask_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](const valarray<bool>& __vb) const
-{
-    return __val_expr<__mask_expr<const valarray&> >(__mask_expr<const valarray&>(__vb, *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-mask_array<_Tp>
-valarray<_Tp>::operator[](const valarray<bool>& __vb)
-{
-    return mask_array<value_type>(__vb, *this);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__mask_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](valarray<bool>&& __vb) const
-{
-    return __val_expr<__mask_expr<const valarray&> >(__mask_expr<const valarray&>(move(__vb), *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-mask_array<_Tp>
-valarray<_Tp>::operator[](valarray<bool>&& __vb)
-{
-    return mask_array<value_type>(move(__vb), *this);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__indirect_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](const valarray<size_t>& __vs) const
-{
-    return __val_expr<__indirect_expr<const valarray&> >(__indirect_expr<const valarray&>(__vs, *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-indirect_array<_Tp>
-valarray<_Tp>::operator[](const valarray<size_t>& __vs)
-{
-    return indirect_array<value_type>(__vs, *this);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__indirect_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](valarray<size_t>&& __vs) const
-{
-    return __val_expr<__indirect_expr<const valarray&> >(__indirect_expr<const valarray&>(move(__vs), *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-indirect_array<_Tp>
-valarray<_Tp>::operator[](valarray<size_t>&& __vs)
-{
-    return indirect_array<value_type>(move(__vs), *this);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::operator+() const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(+*__p);
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::operator-() const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(-*__p);
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::operator~() const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(~*__p);
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<bool>
-valarray<_Tp>::operator!() const
-{
-    valarray<bool> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<bool*>(_VSTD::__allocate(__n * sizeof(bool)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) bool(!*__p);
-    }
-    return __r;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator*=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p *= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator/=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p /= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator%=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p %= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator+=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p += __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator-=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p -= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator^=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p ^= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator&=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p &= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator|=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p |= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator<<=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p <<= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator>>=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p >>= __x;
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator*=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t *= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator/=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t /= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator%=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t %= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator+=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t += __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator-=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t -= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator^=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t ^= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator|=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t |= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator&=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t &= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator<<=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t <<= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator>>=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t >>= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-valarray<_Tp>::swap(valarray& __v) _NOEXCEPT
-{
-    _VSTD::swap(__begin_, __v.__begin_);
-    _VSTD::swap(__end_, __v.__end_);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-valarray<_Tp>::sum() const
-{
-    if (__begin_ == __end_)
-        return value_type();
-    const value_type* __p = __begin_;
-    _Tp __r = *__p;
-    for (++__p; __p != __end_; ++__p)
-        __r += *__p;
-    return __r;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-valarray<_Tp>::min() const
-{
-    if (__begin_ == __end_)
-        return value_type();
-    return *_VSTD::min_element(__begin_, __end_);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-valarray<_Tp>::max() const
-{
-    if (__begin_ == __end_)
-        return value_type();
-    return *_VSTD::max_element(__begin_, __end_);
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::shift(int __i) const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        const value_type* __sb;
-        value_type* __tb;
-        value_type* __te;
-        if (__i >= 0)
-        {
-            __i = _VSTD::min(__i, static_cast<int>(__n));
-            __sb = __begin_ + __i;
-            __tb = __r.__begin_;
-            __te = __r.__begin_ + (__n - __i);
-        }
-        else
-        {
-            __i = _VSTD::min(-__i, static_cast<int>(__n));
-            __sb = __begin_;
-            __tb = __r.__begin_ + __i;
-            __te = __r.__begin_ + __n;
-        }
-        for (; __r.__end_ != __tb; ++__r.__end_)
-            ::new (__r.__end_) value_type();
-        for (; __r.__end_ != __te; ++__r.__end_, ++__sb)
-            ::new (__r.__end_) value_type(*__sb);
-        for (__te = __r.__begin_ + __n; __r.__end_ != __te; ++__r.__end_)
-            ::new (__r.__end_) value_type();
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::cshift(int __i) const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        __i %= static_cast<int>(__n);
-        const value_type* __m = __i >= 0 ? __begin_ + __i : __end_ + __i;
-        for (const value_type* __s = __m; __s != __end_; ++__r.__end_, ++__s)
-            ::new (__r.__end_) value_type(*__s);
-        for (const value_type* __s = __begin_; __s != __m; ++__r.__end_, ++__s)
-            ::new (__r.__end_) value_type(*__s);
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::apply(value_type __f(value_type)) const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(__f(*__p));
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::apply(value_type __f(const value_type&)) const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(__f(*__p));
-    }
-    return __r;
-}
-
-template <class _Tp>
-void
-valarray<_Tp>::resize(size_t __n, value_type __x)
-{
-    if (__begin_ != nullptr)
-    {
-        while (__end_ != __begin_)
-            (--__end_)->~value_type();
-        _VSTD::__deallocate(__begin_);
-        __begin_ = __end_ = nullptr;
-    }
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __n; --__n, ++__end_)
-                ::new (__end_) value_type(__x);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(valarray<_Tp>& __x, valarray<_Tp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<multiplies<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator*(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<multiplies<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(multiplies<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<multiplies<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator*(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<multiplies<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(multiplies<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<multiplies<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator*(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<multiplies<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(multiplies<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<divides<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator/(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<divides<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(divides<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<divides<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator/(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<divides<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(divides<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<divides<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator/(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<divides<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(divides<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<modulus<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator%(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<modulus<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(modulus<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<modulus<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator%(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<modulus<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(modulus<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<modulus<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator%(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<modulus<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(modulus<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<plus<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator+(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<plus<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(plus<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<plus<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator+(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<plus<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(plus<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<plus<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator+(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<plus<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(plus<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<minus<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator-(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<minus<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(minus<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<minus<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator-(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<minus<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(minus<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<minus<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator-(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<minus<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(minus<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<bit_xor<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator^(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<bit_xor<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(bit_xor<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_xor<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator^(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_xor<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(bit_xor<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_xor<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator^(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_xor<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(bit_xor<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<bit_and<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator&(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<bit_and<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(bit_and<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_and<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator&(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_and<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(bit_and<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_and<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator&(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_and<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(bit_and<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<bit_or<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator|(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<bit_or<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(bit_or<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_or<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator|(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_or<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(bit_or<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_or<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator|(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_or<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(bit_or<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<__bit_shift_left<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator<<(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<__bit_shift_left<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_left<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__bit_shift_left<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator<<(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__bit_shift_left<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_left<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__bit_shift_left<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator<<(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__bit_shift_left<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_left<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<__bit_shift_right<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator>>(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<__bit_shift_right<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_right<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__bit_shift_right<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator>>(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__bit_shift_right<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_right<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__bit_shift_right<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator>>(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__bit_shift_right<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_right<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<logical_and<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator&&(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<logical_and<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(logical_and<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<logical_and<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator&&(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<logical_and<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(logical_and<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<logical_and<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator&&(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<logical_and<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(logical_and<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<logical_or<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator||(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<logical_or<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(logical_or<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<logical_or<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator||(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<logical_or<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(logical_or<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<logical_or<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator||(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<logical_or<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(logical_or<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<equal_to<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator==(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<equal_to<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(equal_to<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<equal_to<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator==(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<equal_to<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(equal_to<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<equal_to<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator==(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<equal_to<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(equal_to<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<not_equal_to<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator!=(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<not_equal_to<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(not_equal_to<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<not_equal_to<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator!=(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<not_equal_to<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(not_equal_to<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<not_equal_to<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator!=(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<not_equal_to<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(not_equal_to<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<less<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator<(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<less<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(less<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<less<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator<(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<less<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(less<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<less<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator<(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<less<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(less<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<greater<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator>(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<greater<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(greater<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<greater<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator>(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<greater<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(greater<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<greater<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator>(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<greater<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(greater<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<less_equal<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator<=(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<less_equal<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(less_equal<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<less_equal<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator<=(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<less_equal<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(less_equal<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<less_equal<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator<=(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<less_equal<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(less_equal<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<greater_equal<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator>=(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<greater_equal<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(greater_equal<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<greater_equal<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator>=(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<greater_equal<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(greater_equal<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<greater_equal<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator>=(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<greater_equal<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(greater_equal<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__abs_expr<typename _Expr::value_type>, _Expr> >
->::type
-abs(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__abs_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__abs_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__acos_expr<typename _Expr::value_type>, _Expr> >
->::type
-acos(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__acos_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__acos_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__asin_expr<typename _Expr::value_type>, _Expr> >
->::type
-asin(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__asin_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__asin_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__atan_expr<typename _Expr::value_type>, _Expr> >
->::type
-atan(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__atan_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__atan_expr<value_type>(), __x));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<__atan2_expr<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-atan2(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<__atan2_expr<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(__atan2_expr<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__atan2_expr<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-atan2(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__atan2_expr<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(__atan2_expr<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__atan2_expr<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-atan2(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__atan2_expr<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__atan2_expr<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__cos_expr<typename _Expr::value_type>, _Expr> >
->::type
-cos(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__cos_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__cos_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__cosh_expr<typename _Expr::value_type>, _Expr> >
->::type
-cosh(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__cosh_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__cosh_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__exp_expr<typename _Expr::value_type>, _Expr> >
->::type
-exp(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__exp_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__exp_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__log_expr<typename _Expr::value_type>, _Expr> >
->::type
-log(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__log_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__log_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__log10_expr<typename _Expr::value_type>, _Expr> >
->::type
-log10(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__log10_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__log10_expr<value_type>(), __x));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<__pow_expr<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-pow(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<__pow_expr<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(__pow_expr<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__pow_expr<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-pow(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__pow_expr<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(__pow_expr<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__pow_expr<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-pow(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__pow_expr<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__pow_expr<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__sin_expr<typename _Expr::value_type>, _Expr> >
->::type
-sin(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__sin_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__sin_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__sinh_expr<typename _Expr::value_type>, _Expr> >
->::type
-sinh(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__sinh_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__sinh_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__sqrt_expr<typename _Expr::value_type>, _Expr> >
->::type
-sqrt(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__sqrt_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__sqrt_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__tan_expr<typename _Expr::value_type>, _Expr> >
->::type
-tan(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__tan_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__tan_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__tanh_expr<typename _Expr::value_type>, _Expr> >
->::type
-tanh(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__tanh_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__tanh_expr<value_type>(), __x));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-begin(valarray<_Tp>& __v)
-{
-    return __v.__begin_;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const _Tp*
-begin(const valarray<_Tp>& __v)
-{
-    return __v.__begin_;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-end(valarray<_Tp>& __v)
-{
-    return __v.__end_;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const _Tp*
-end(const valarray<_Tp>& __v)
-{
-    return __v.__end_;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_VALARRAY
diff --git a/include.new/c++/v1/tr1/vector b/include.new/c++/v1/tr1/vector
deleted file mode 100644
index 22a6343..0000000
--- a/include.new/c++/v1/tr1/vector
+++ /dev/null
@@ -1,3317 +0,0 @@
-// -*- C++ -*-
-//===------------------------------ vector --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_VECTOR
-#define _LIBCPP_VECTOR
-
-/*
-    vector synopsis
-
-namespace std
-{
-
-template <class T, class Allocator = allocator<T> >
-class vector
-{
-public:
-    typedef T                                        value_type;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    vector()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit vector(const allocator_type&);
-    explicit vector(size_type n);
-    explicit vector(size_type n, const allocator_type&); // C++14
-    vector(size_type n, const value_type& value, const allocator_type& = allocator_type());
-    template <class InputIterator>
-        vector(InputIterator first, InputIterator last, const allocator_type& = allocator_type());
-    vector(const vector& x);
-    vector(vector&& x)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    vector(initializer_list<value_type> il);
-    vector(initializer_list<value_type> il, const allocator_type& a);
-    ~vector();
-    vector& operator=(const vector& x);
-    vector& operator=(vector&& x)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    vector& operator=(initializer_list<value_type> il);
-    template <class InputIterator>
-        void assign(InputIterator first, InputIterator last);
-    void assign(size_type n, const value_type& u);
-    void assign(initializer_list<value_type> il);
-
-    allocator_type get_allocator() const noexcept;
-
-    iterator               begin() noexcept;
-    const_iterator         begin()   const noexcept;
-    iterator               end() noexcept;
-    const_iterator         end()     const noexcept;
-
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin()  const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend()    const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    size_type capacity() const noexcept;
-    bool empty() const noexcept;
-    void reserve(size_type n);
-    void shrink_to_fit() noexcept;
-
-    reference       operator[](size_type n);
-    const_reference operator[](size_type n) const;
-    reference       at(size_type n);
-    const_reference at(size_type n) const;
-
-    reference       front();
-    const_reference front() const;
-    reference       back();
-    const_reference back() const;
-
-    value_type*       data() noexcept;
-    const value_type* data() const noexcept;
-
-    void push_back(const value_type& x);
-    void push_back(value_type&& x);
-    template <class... Args>
-        void emplace_back(Args&&... args);
-    void pop_back();
-
-    template <class... Args> iterator emplace(const_iterator position, Args&&... args);
-    iterator insert(const_iterator position, const value_type& x);
-    iterator insert(const_iterator position, value_type&& x);
-    iterator insert(const_iterator position, size_type n, const value_type& x);
-    template <class InputIterator>
-        iterator insert(const_iterator position, InputIterator first, InputIterator last);
-    iterator insert(const_iterator position, initializer_list<value_type> il);
-
-    iterator erase(const_iterator position);
-    iterator erase(const_iterator first, const_iterator last);
-
-    void clear() noexcept;
-
-    void resize(size_type sz);
-    void resize(size_type sz, const value_type& c);
-
-    void swap(vector&)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-
-    bool __invariants() const;
-};
-
-template <class Allocator = allocator<T> >
-class vector<bool, Allocator>
-{
-public:
-    typedef bool                                     value_type;
-    typedef Allocator                                allocator_type;
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef iterator                                 pointer;
-    typedef const_iterator                           const_pointer;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    class reference
-    {
-    public:
-        reference(const reference&) noexcept;
-        operator bool() const noexcept;
-        reference& operator=(const bool x) noexcept;
-        reference& operator=(const reference& x) noexcept;
-        iterator operator&() const noexcept;
-        void flip() noexcept;
-    };
-
-    class const_reference
-    {
-    public:
-        const_reference(const reference&) noexcept;
-        operator bool() const noexcept;
-        const_iterator operator&() const noexcept;
-    };
-
-    vector()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit vector(const allocator_type&);
-    explicit vector(size_type n, const allocator_type& a = allocator_type()); // C++14
-    vector(size_type n, const value_type& value, const allocator_type& = allocator_type());
-    template <class InputIterator>
-        vector(InputIterator first, InputIterator last, const allocator_type& = allocator_type());
-    vector(const vector& x);
-    vector(vector&& x)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    vector(initializer_list<value_type> il);
-    vector(initializer_list<value_type> il, const allocator_type& a);
-    ~vector();
-    vector& operator=(const vector& x);
-    vector& operator=(vector&& x)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    vector& operator=(initializer_list<value_type> il);
-    template <class InputIterator>
-        void assign(InputIterator first, InputIterator last);
-    void assign(size_type n, const value_type& u);
-    void assign(initializer_list<value_type> il);
-
-    allocator_type get_allocator() const noexcept;
-
-    iterator               begin() noexcept;
-    const_iterator         begin()   const noexcept;
-    iterator               end() noexcept;
-    const_iterator         end()     const noexcept;
-
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin()  const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend()    const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    size_type capacity() const noexcept;
-    bool empty() const noexcept;
-    void reserve(size_type n);
-    void shrink_to_fit() noexcept;
-
-    reference       operator[](size_type n);
-    const_reference operator[](size_type n) const;
-    reference       at(size_type n);
-    const_reference at(size_type n) const;
-
-    reference       front();
-    const_reference front() const;
-    reference       back();
-    const_reference back() const;
-
-    void push_back(const value_type& x);
-    template <class... Args> void emplace_back(Args&&... args);  // C++14
-    void pop_back();
-
-    template <class... Args> iterator emplace(const_iterator position, Args&&... args);  // C++14
-    iterator insert(const_iterator position, const value_type& x);
-    iterator insert(const_iterator position, size_type n, const value_type& x);
-    template <class InputIterator>
-        iterator insert(const_iterator position, InputIterator first, InputIterator last);
-    iterator insert(const_iterator position, initializer_list<value_type> il);
-
-    iterator erase(const_iterator position);
-    iterator erase(const_iterator first, const_iterator last);
-
-    void clear() noexcept;
-
-    void resize(size_type sz);
-    void resize(size_type sz, value_type x);
-
-    void swap(vector&)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-    void flip() noexcept;
-
-    bool __invariants() const;
-};
-
-template <class Allocator> struct hash<std::vector<bool, Allocator>>;
-
-template <class T, class Allocator> bool operator==(const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator< (const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator!=(const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator> (const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator>=(const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator<=(const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-
-template <class T, class Allocator>
-void swap(vector<T,Allocator>& x, vector<T,Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__bit_reference>
-#include <type_traits>
-#include <climits>
-#include <limits>
-#include <initializer_list>
-#include <memory>
-#include <stdexcept>
-#include <algorithm>
-#include <cstring>
-#include <__split_buffer>
-#include <__functional_base>
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <bool>
-class __vector_base_common
-{
-protected:
-    _LIBCPP_ALWAYS_INLINE __vector_base_common() {}
-    void __throw_length_error() const;
-    void __throw_out_of_range() const;
-};
-
-template <bool __b>
-void
-__vector_base_common<__b>::__throw_length_error() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw length_error("vector");
-#else
-    assert(!"vector length_error");
-#endif
-}
-
-template <bool __b>
-void
-__vector_base_common<__b>::__throw_out_of_range() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw out_of_range("vector");
-#else
-    assert(!"vector out_of_range");
-#endif
-}
-
-#ifdef _LIBCPP_MSVC
-#pragma warning( push )
-#pragma warning( disable: 4231 )
-#endif // _LIBCPP_MSVC
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS __vector_base_common<true>)
-#ifdef _LIBCPP_MSVC
-#pragma warning( pop )
-#endif // _LIBCPP_MSVC
-
-template <class _Tp, class _Allocator>
-class __vector_base
-    : protected __vector_base_common<true>
-{
-protected:
-    typedef _Tp                                      value_type;
-    typedef _Allocator                               allocator_type;
-    typedef allocator_traits<allocator_type>         __alloc_traits;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef pointer                                  iterator;
-    typedef const_pointer                            const_iterator;
-
-    pointer                                         __begin_;
-    pointer                                         __end_;
-    __compressed_pair<pointer, allocator_type> __end_cap_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type& __alloc() _NOEXCEPT
-        {return __end_cap_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const allocator_type& __alloc() const _NOEXCEPT
-        {return __end_cap_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer& __end_cap() _NOEXCEPT
-        {return __end_cap_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    const pointer& __end_cap() const _NOEXCEPT
-        {return __end_cap_.first();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __vector_base()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY __vector_base(const allocator_type& __a);
-    ~__vector_base();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__destruct_at_end(__begin_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type capacity() const _NOEXCEPT
-        {return static_cast<size_type>(__end_cap() - __begin_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __destruct_at_end(pointer __new_last) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __vector_base& __c)
-        {__copy_assign_alloc(__c, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__vector_base& __c)
-        _NOEXCEPT_(
-            !__alloc_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<allocator_type>::value)
-        {__move_assign_alloc(__c, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_move_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y)
-        _NOEXCEPT_(
-            !__alloc_traits::propagate_on_container_swap::value ||
-            __is_nothrow_swappable<allocator_type>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_swap::value>());}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __vector_base& __c, true_type)
-        {
-            if (__alloc() != __c.__alloc())
-            {
-                clear();
-                __alloc_traits::deallocate(__alloc(), __begin_, capacity());
-                __begin_ = __end_ = __end_cap() = nullptr;
-            }
-            __alloc() = __c.__alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __vector_base&, false_type)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__vector_base& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__vector_base&, false_type)
-        _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type&, allocator_type&, false_type)
-        _NOEXCEPT
-        {}
-};
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__vector_base<_Tp, _Allocator>::__destruct_at_end(pointer __new_last) _NOEXCEPT
-{
-    while (__new_last != __end_)
-        __alloc_traits::destroy(__alloc(), _VSTD::__to_raw_pointer(--__end_));
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__vector_base<_Tp, _Allocator>::__vector_base()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-    : __begin_(nullptr),
-      __end_(nullptr),
-      __end_cap_(nullptr)
-{
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__vector_base<_Tp, _Allocator>::__vector_base(const allocator_type& __a)
-    : __begin_(nullptr),
-      __end_(nullptr),
-      __end_cap_(nullptr, __a)
-{
-}
-
-template <class _Tp, class _Allocator>
-__vector_base<_Tp, _Allocator>::~__vector_base()
-{
-    if (__begin_ != nullptr)
-    {
-        clear();
-        __alloc_traits::deallocate(__alloc(), __begin_, capacity());
-    }
-}
-
-template <class _Tp, class _Allocator = allocator<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY vector
-    : private __vector_base<_Tp, _Allocator>
-{
-private:
-    typedef __vector_base<_Tp, _Allocator>           __base;
-    typedef allocator<_Tp>                           __default_allocator_type;
-public:
-    typedef vector                                   __self;
-    typedef _Tp                                      value_type;
-    typedef _Allocator                               allocator_type;
-    typedef typename __base::__alloc_traits          __alloc_traits;
-    typedef typename __base::reference               reference;
-    typedef typename __base::const_reference         const_reference;
-    typedef typename __base::size_type               size_type;
-    typedef typename __base::difference_type         difference_type;
-    typedef typename __base::pointer                 pointer;
-    typedef typename __base::const_pointer           const_pointer;
-    typedef __wrap_iter<pointer>                     iterator;
-    typedef __wrap_iter<const_pointer>               const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>         reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-    static_assert((is_same<typename allocator_type::value_type, value_type>::value),
-                  "Allocator::value_type must be same type as value_type");
-
-    _LIBCPP_INLINE_VISIBILITY
-    vector()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a)
-        : __base(__a)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_c(this);
-#endif
-    }
-    explicit vector(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit vector(size_type __n, const allocator_type& __a);
-#endif
-    vector(size_type __n, const_reference __x);
-    vector(size_type __n, const_reference __x, const allocator_type& __a);
-    template <class _InputIterator>
-        vector(_InputIterator __first,
-               typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value &&
-                                 is_constructible<
-                                    value_type,
-                                    typename iterator_traits<_InputIterator>::reference>::value,
-                                 _InputIterator>::type __last);
-    template <class _InputIterator>
-        vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
-               typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value &&
-                                 is_constructible<
-                                    value_type,
-                                    typename iterator_traits<_InputIterator>::reference>::value>::type* = 0);
-    template <class _ForwardIterator>
-        vector(_ForwardIterator __first,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
-                                 is_constructible<
-                                    value_type,
-                                    typename iterator_traits<_ForwardIterator>::reference>::value,
-                                 _ForwardIterator>::type __last);
-    template <class _ForwardIterator>
-        vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
-                                 is_constructible<
-                                    value_type,
-                                    typename iterator_traits<_ForwardIterator>::reference>::value>::type* = 0);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    vector(initializer_list<value_type> __il);
-    _LIBCPP_INLINE_VISIBILITY
-    vector(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    ~vector()
-    {
-        __get_db()->__erase_c(this);
-    }
-#endif
-
-    vector(const vector& __x);
-    vector(const vector& __x, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(const vector& __x);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    vector(vector&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY
-    vector(vector&& __x, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(vector&& __x)
-        _NOEXCEPT_(
-             __alloc_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end()); return *this;}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template <class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value &&
-            is_constructible<
-                 value_type,
-                 typename iterator_traits<_InputIterator>::reference>::value,
-            void
-        >::type
-        assign(_InputIterator __first, _InputIterator __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value &&
-            is_constructible<
-                 value_type,
-                 typename iterator_traits<_ForwardIterator>::reference>::value,
-            void
-        >::type
-        assign(_ForwardIterator __first, _ForwardIterator __last);
-
-    void assign(size_type __n, const_reference __u);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void assign(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return this->__alloc();}
-
-    _LIBCPP_INLINE_VISIBILITY iterator               begin() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY const_iterator         begin()   const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY iterator               end() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY const_iterator         end()     const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator       rbegin() _NOEXCEPT
-        {return       reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin()  const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator       rend() _NOEXCEPT
-        {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend()    const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cbegin()  const _NOEXCEPT
-        {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cend()    const _NOEXCEPT
-        {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend()   const _NOEXCEPT
-        {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT
-        {return static_cast<size_type>(this->__end_ - this->__begin_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type capacity() const _NOEXCEPT
-        {return __base::capacity();}
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT
-        {return this->__begin_ == this->__end_;}
-    size_type max_size() const _NOEXCEPT;
-    void reserve(size_type __n);
-    void shrink_to_fit() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY reference       operator[](size_type __n);
-    _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const;
-    reference       at(size_type __n);
-    const_reference at(size_type __n) const;
-
-    _LIBCPP_INLINE_VISIBILITY reference       front()
-    {
-        _LIBCPP_ASSERT(!empty(), "front() called for empty vector");
-        return *this->__begin_;
-    }
-    _LIBCPP_INLINE_VISIBILITY const_reference front() const
-    {
-        _LIBCPP_ASSERT(!empty(), "front() called for empty vector");
-        return *this->__begin_;
-    }
-    _LIBCPP_INLINE_VISIBILITY reference       back()
-    {
-        _LIBCPP_ASSERT(!empty(), "back() called for empty vector");
-        return *(this->__end_ - 1);
-    }
-    _LIBCPP_INLINE_VISIBILITY const_reference back()  const
-    {
-        _LIBCPP_ASSERT(!empty(), "back() called for empty vector");
-        return *(this->__end_ - 1);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type*       data() _NOEXCEPT
-        {return _VSTD::__to_raw_pointer(this->__begin_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* data() const _NOEXCEPT
-        {return _VSTD::__to_raw_pointer(this->__begin_);}
-
-    _LIBCPP_INLINE_VISIBILITY void push_back(const_reference __x);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY void push_back(value_type&& __x);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        void emplace_back(_Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void pop_back();
-
-    iterator insert(const_iterator __position, const_reference __x);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator insert(const_iterator __position, value_type&& __x);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        iterator emplace(const_iterator __position, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator insert(const_iterator __position, size_type __n, const_reference __x);
-    template <class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value &&
-            is_constructible<
-                 value_type,
-                 typename iterator_traits<_InputIterator>::reference>::value,
-            iterator
-        >::type
-        insert(const_iterator __position, _InputIterator __first, _InputIterator __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value &&
-            is_constructible<
-                 value_type,
-                 typename iterator_traits<_ForwardIterator>::reference>::value,
-            iterator
-        >::type
-        insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __position, initializer_list<value_type> __il)
-        {return insert(__position, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __position);
-    iterator erase(const_iterator __first, const_iterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT
-    {
-        size_type __old_size = size();
-        __base::clear();
-        __annotate_shrink(__old_size);
-        __invalidate_all_iterators();
-    }
-
-    void resize(size_type __sz);
-    void resize(size_type __sz, const_reference __x);
-
-    void swap(vector&)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-
-    bool __invariants() const;
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const;
-    bool __decrementable(const const_iterator* __i) const;
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const;
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-    _LIBCPP_INLINE_VISIBILITY void __invalidate_all_iterators();
-    void allocate(size_type __n);
-    void deallocate() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY size_type __recommend(size_type __new_size) const;
-    void __construct_at_end(size_type __n);
-    void __construct_at_end(size_type __n, const_reference __x);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            void
-        >::type
-        __construct_at_end(_ForwardIterator __first, _ForwardIterator __last);
-    void __append(size_type __n);
-    void __append(size_type __n, const_reference __x);
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       __make_iter(pointer __p) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator __make_iter(const_pointer __p) const _NOEXCEPT;
-    void __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v);
-    pointer __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v, pointer __p);
-    void __move_range(pointer __from_s, pointer __from_e, pointer __to);
-    void __move_assign(vector& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-    void __move_assign(vector& __c, false_type);
-    _LIBCPP_INLINE_VISIBILITY
-    void __destruct_at_end(pointer __new_last) _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __c_node* __c = __get_db()->__find_c_and_lock(this);
-        for (__i_node** __p = __c->end_; __p != __c->beg_; )
-        {
-            --__p;
-            const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-            if (__i->base() > __new_last)
-            {
-                (*__p)->__c_ = nullptr;
-                if (--__c->end_ != __p)
-                    memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __get_db()->unlock();
-#endif
-        size_type __old_size = size();
-        __base::__destruct_at_end(__new_last);
-        __annotate_shrink(__old_size);
-    }
-    template <class _Up>
-        void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        __push_back_slow_path(_Up&& __x);
-#else
-        __push_back_slow_path(_Up& __x);
-#endif
-#if !defined(_LIBCPP_HAS_NO_VARIADICS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-    template <class... _Args>
-        void
-        __emplace_back_slow_path(_Args&&... __args);
-#endif
-    // The following functions are no-ops outside of AddressSanitizer mode.
-    // We call annotatations only for the default Allocator because other allocators
-    // may not meet the AddressSanitizer alignment constraints.
-    // See the documentation for __sanitizer_annotate_contiguous_container for more details.
-    void __annotate_contiguous_container
-    (const void *__beg, const void *__end, const void *__old_mid, const void *__new_mid) const
-    {
-#ifndef _LIBCPP_HAS_NO_ASAN
-      if (__beg && is_same<allocator_type, __default_allocator_type>::value)
-        __sanitizer_annotate_contiguous_container(__beg, __end, __old_mid, __new_mid);
-#endif
-    }
-
-    void __annotate_new(size_type __current_size) const
-    {
-      __annotate_contiguous_container(data(), data() + capacity(),
-                                      data() + capacity(), data() + __current_size);
-    }
-    void __annotate_delete() const
-    {
-      __annotate_contiguous_container(data(), data() + capacity(),
-                                      data() + size(), data() + capacity());
-    }
-    void __annotate_increase(size_type __n) const
-    {
-      __annotate_contiguous_container(data(), data() + capacity(),
-                                      data() + size(), data() + size() + __n);
-    }
-    void __annotate_shrink(size_type __old_size) const
-    {
-      __annotate_contiguous_container(data(), data() + capacity(),
-                                      data() + __old_size, data() + size());
-    }
-#ifndef _LIBCPP_HAS_NO_ASAN
-    // The annotation for size increase should happen before the actual increase,
-    // but if an exception is thrown after that the annotation has to be undone.
-    struct __RAII_IncreaseAnnotator {
-      __RAII_IncreaseAnnotator(const vector &__v, size_type __n = 1)
-        : __commit(false), __v(__v), __n(__n) {
-        __v.__annotate_increase(__n);
-      }
-      void __done() { __commit = true; }
-      ~__RAII_IncreaseAnnotator() {
-        if (__commit) return;
-        __v.__annotate_shrink(__v.size() + __n);
-      }
-      bool __commit;
-      size_type __n;
-      const vector &__v;
-    };
-#else
-    struct __RAII_IncreaseAnnotator {
-      inline __RAII_IncreaseAnnotator(const vector &, size_type __n = 1) {}
-      inline void __done() {}
-    };
-#endif
-
-};
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v)
-{
-    __annotate_delete();
-    __alloc_traits::__construct_backward(this->__alloc(), this->__begin_, this->__end_, __v.__begin_);
-    _VSTD::swap(this->__begin_, __v.__begin_);
-    _VSTD::swap(this->__end_, __v.__end_);
-    _VSTD::swap(this->__end_cap(), __v.__end_cap());
-    __v.__first_ = __v.__begin_;
-    __annotate_new(size());
-    __invalidate_all_iterators();
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::pointer
-vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v, pointer __p)
-{
-    __annotate_delete();
-    pointer __r = __v.__begin_;
-    __alloc_traits::__construct_backward(this->__alloc(), this->__begin_, __p, __v.__begin_);
-    __alloc_traits::__construct_forward(this->__alloc(), __p, this->__end_, __v.__end_);
-    _VSTD::swap(this->__begin_, __v.__begin_);
-    _VSTD::swap(this->__end_, __v.__end_);
-    _VSTD::swap(this->__end_cap(), __v.__end_cap());
-    __v.__first_ = __v.__begin_;
-    __annotate_new(size());
-    __invalidate_all_iterators();
-    return __r;
-}
-
-//  Allocate space for __n objects
-//  throws length_error if __n > max_size()
-//  throws (probably bad_alloc) if memory run out
-//  Precondition:  __begin_ == __end_ == __end_cap() == 0
-//  Precondition:  __n > 0
-//  Postcondition:  capacity() == __n
-//  Postcondition:  size() == 0
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::allocate(size_type __n)
-{
-    if (__n > max_size())
-        this->__throw_length_error();
-    this->__begin_ = this->__end_ = __alloc_traits::allocate(this->__alloc(), __n);
-    this->__end_cap() = this->__begin_ + __n;
-    __annotate_new(0);
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::deallocate() _NOEXCEPT
-{
-    if (this->__begin_ != nullptr)
-    {
-        clear();
-        __alloc_traits::deallocate(this->__alloc(), this->__begin_, capacity());
-        this->__begin_ = this->__end_ = this->__end_cap() = nullptr;
-    }
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::size_type
-vector<_Tp, _Allocator>::max_size() const _NOEXCEPT
-{
-    return _VSTD::min<size_type>(__alloc_traits::max_size(this->__alloc()), numeric_limits<size_type>::max() / 2);  // end() >= begin(), always
-}
-
-//  Precondition:  __new_size > capacity()
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::size_type
-vector<_Tp, _Allocator>::__recommend(size_type __new_size) const
-{
-    const size_type __ms = max_size();
-    if (__new_size > __ms)
-        this->__throw_length_error();
-    const size_type __cap = capacity();
-    if (__cap >= __ms / 2)
-        return __ms;
-    return _VSTD::max<size_type>(2*__cap, __new_size);
-}
-
-//  Default constructs __n objects starting at __end_
-//  throws if construction throws
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == size() + __n
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__construct_at_end(size_type __n)
-{
-    allocator_type& __a = this->__alloc();
-    do
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_));
-        ++this->__end_;
-        --__n;
-        __annotator.__done();
-    } while (__n > 0);
-}
-
-//  Copy constructs __n objects starting at __end_ from __x
-//  throws if construction throws
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == old size() + __n
-//  Postcondition:  [i] == __x for all i in [size() - __n, __n)
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)
-{
-    allocator_type& __a = this->__alloc();
-    do
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), __x);
-        ++this->__end_;
-        --__n;
-        __annotator.__done();
-    } while (__n > 0);
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    void
->::type
-vector<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last)
-{
-    allocator_type& __a = this->__alloc();
-    for (; __first != __last; ++__first)
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), *__first);
-        __annotator.__done();
-        ++this->__end_;
-    }
-}
-
-//  Default constructs __n objects starting at __end_
-//  throws if construction throws
-//  Postcondition:  size() == size() + __n
-//  Exception safety: strong.
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__append(size_type __n)
-{
-    if (static_cast<size_type>(this->__end_cap() - this->__end_) >= __n)
-        this->__construct_at_end(__n);
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + __n), size(), __a);
-        __v.__construct_at_end(__n);
-        __swap_out_circular_buffer(__v);
-    }
-}
-
-//  Default constructs __n objects starting at __end_
-//  throws if construction throws
-//  Postcondition:  size() == size() + __n
-//  Exception safety: strong.
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__append(size_type __n, const_reference __x)
-{
-    if (static_cast<size_type>(this->__end_cap() - this->__end_) >= __n)
-        this->__construct_at_end(__n, __x);
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + __n), size(), __a);
-        __v.__construct_at_end(__n, __x);
-        __swap_out_circular_buffer(__v);
-    }
-}
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(size_type __n)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n);
-    }
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(size_type __n, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n);
-    }
-}
-#endif
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(size_type __n, const_reference __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, __x);
-    }
-}
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(size_type __n, const_reference __x, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, __x);
-    }
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIterator>
-vector<_Tp, _Allocator>::vector(_InputIterator __first,
-       typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value &&
-                         is_constructible<
-                            value_type,
-                            typename iterator_traits<_InputIterator>::reference>::value,
-                          _InputIterator>::type __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIterator>
-vector<_Tp, _Allocator>::vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
-       typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value &&
-                         is_constructible<
-                            value_type,
-                            typename iterator_traits<_InputIterator>::reference>::value>::type*)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-vector<_Tp, _Allocator>::vector(_ForwardIterator __first,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
-                                is_constructible<
-                                   value_type,
-                                   typename iterator_traits<_ForwardIterator>::reference>::value,
-                                                   _ForwardIterator>::type __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-vector<_Tp, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
-                                is_constructible<
-                                   value_type,
-                                   typename iterator_traits<_ForwardIterator>::reference>::value>::type*)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(const vector& __x)
-    : __base(__alloc_traits::select_on_container_copy_construction(__x.__alloc()))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    size_type __n = __x.size();
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__x.__begin_, __x.__end_);
-    }
-}
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(const vector& __x, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    size_type __n = __x.size();
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__x.__begin_, __x.__end_);
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>::vector(vector&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __base(_VSTD::move(__x.__alloc()))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__x);
-#endif
-    this->__begin_ = __x.__begin_;
-    this->__end_ = __x.__end_;
-    this->__end_cap() = __x.__end_cap();
-    __x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>::vector(vector&& __x, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a == __x.__alloc())
-    {
-        this->__begin_ = __x.__begin_;
-        this->__end_ = __x.__end_;
-        this->__end_cap() = __x.__end_cap();
-        __x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->swap(this, &__x);
-#endif
-    }
-    else
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__x.begin()), _Ip(__x.end()));
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>::vector(initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__il.size() > 0)
-    {
-        allocate(__il.size());
-        __construct_at_end(__il.begin(), __il.end());
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>::vector(initializer_list<value_type> __il, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__il.size() > 0)
-    {
-        allocate(__il.size());
-        __construct_at_end(__il.begin(), __il.end());
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>&
-vector<_Tp, _Allocator>::operator=(vector&& __x)
-        _NOEXCEPT_(
-             __alloc_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__x, integral_constant<bool,
-          __alloc_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__move_assign(vector& __c, false_type)
-{
-    if (__base::__alloc() != __c.__alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-    else
-        __move_assign(__c, true_type());
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__move_assign(vector& __c, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    deallocate();
-    __base::__move_assign_alloc(__c); // this can throw
-    this->__begin_ = __c.__begin_;
-    this->__end_ = __c.__end_;
-    this->__end_cap() = __c.__end_cap();
-    __c.__begin_ = __c.__end_ = __c.__end_cap() = nullptr;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->swap(this, &__c);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>&
-vector<_Tp, _Allocator>::operator=(const vector& __x)
-{
-    if (this != &__x)
-    {
-        __base::__copy_assign_alloc(__x);
-        assign(__x.__begin_, __x.__end_);
-    }
-    return *this;
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value &&
-    is_constructible<
-       _Tp,
-       typename iterator_traits<_InputIterator>::reference>::value,
-    void
->::type
-vector<_Tp, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
-{
-    clear();
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value &&
-    is_constructible<
-       _Tp,
-       typename iterator_traits<_ForwardIterator>::reference>::value,
-    void
->::type
-vector<_Tp, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)
-{
-    typename iterator_traits<_ForwardIterator>::difference_type __new_size = _VSTD::distance(__first, __last);
-    if (static_cast<size_type>(__new_size) <= capacity())
-    {
-        _ForwardIterator __mid = __last;
-        bool __growing = false;
-        if (static_cast<size_type>(__new_size) > size())
-        {
-            __growing = true;
-            __mid =  __first;
-            _VSTD::advance(__mid, size());
-        }
-        pointer __m = _VSTD::copy(__first, __mid, this->__begin_);
-        if (__growing)
-            __construct_at_end(__mid, __last);
-        else
-            this->__destruct_at_end(__m);
-    }
-    else
-    {
-        deallocate();
-        allocate(__recommend(static_cast<size_type>(__new_size)));
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::assign(size_type __n, const_reference __u)
-{
-    if (__n <= capacity())
-    {
-        size_type __s = size();
-        _VSTD::fill_n(this->__begin_, _VSTD::min(__n, __s), __u);
-        if (__n > __s)
-            __construct_at_end(__n - __s, __u);
-        else
-            this->__destruct_at_end(this->__begin_ + __n);
-    }
-    else
-    {
-        deallocate();
-        allocate(__recommend(static_cast<size_type>(__n)));
-        __construct_at_end(__n, __u);
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::__make_iter(pointer __p) _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(this, __p);
-#else
-    return iterator(__p);
-#endif
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::const_iterator
-vector<_Tp, _Allocator>::__make_iter(const_pointer __p) const _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return const_iterator(this, __p);
-#else
-    return const_iterator(__p);
-#endif
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::begin() _NOEXCEPT
-{
-    return __make_iter(this->__begin_);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::const_iterator
-vector<_Tp, _Allocator>::begin() const _NOEXCEPT
-{
-    return __make_iter(this->__begin_);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::end() _NOEXCEPT
-{
-    return __make_iter(this->__end_);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::const_iterator
-vector<_Tp, _Allocator>::end() const _NOEXCEPT
-{
-    return __make_iter(this->__end_);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::reference
-vector<_Tp, _Allocator>::operator[](size_type __n)
-{
-    _LIBCPP_ASSERT(__n < size(), "vector[] index out of bounds");
-    return this->__begin_[__n];
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::const_reference
-vector<_Tp, _Allocator>::operator[](size_type __n) const
-{
-    _LIBCPP_ASSERT(__n < size(), "vector[] index out of bounds");
-    return this->__begin_[__n];
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::reference
-vector<_Tp, _Allocator>::at(size_type __n)
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return this->__begin_[__n];
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::const_reference
-vector<_Tp, _Allocator>::at(size_type __n) const
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return this->__begin_[__n];
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::reserve(size_type __n)
-{
-    if (__n > capacity())
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__n, size(), __a);
-        __swap_out_circular_buffer(__v);
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
-{
-    if (capacity() > size())
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            allocator_type& __a = this->__alloc();
-            __split_buffer<value_type, allocator_type&> __v(size(), size(), __a);
-            __swap_out_circular_buffer(__v);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp, class _Allocator>
-template <class _Up>
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-vector<_Tp, _Allocator>::__push_back_slow_path(_Up&& __x)
-#else
-vector<_Tp, _Allocator>::__push_back_slow_path(_Up& __x)
-#endif
-{
-    allocator_type& __a = this->__alloc();
-    __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a);
-    // __v.push_back(_VSTD::forward<_Up>(__x));
-    __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(__v.__end_), _VSTD::forward<_Up>(__x));
-    __v.__end_++;
-    __swap_out_circular_buffer(__v);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::push_back(const_reference __x)
-{
-    if (this->__end_ != this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(this->__alloc(),
-                                  _VSTD::__to_raw_pointer(this->__end_), __x);
-        __annotator.__done();
-        ++this->__end_;
-    }
-    else
-        __push_back_slow_path(__x);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::push_back(value_type&& __x)
-{
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(this->__alloc(),
-                                  _VSTD::__to_raw_pointer(this->__end_),
-                                  _VSTD::move(__x));
-        __annotator.__done();
-        ++this->__end_;
-    }
-    else
-        __push_back_slow_path(_VSTD::move(__x));
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-void
-vector<_Tp, _Allocator>::__emplace_back_slow_path(_Args&&... __args)
-{
-    allocator_type& __a = this->__alloc();
-    __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a);
-//    __v.emplace_back(_VSTD::forward<_Args>(__args)...);
-    __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(__v.__end_), _VSTD::forward<_Args>(__args)...);
-    __v.__end_++;
-    __swap_out_circular_buffer(__v);
-}
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::emplace_back(_Args&&... __args)
-{
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(this->__alloc(),
-                                  _VSTD::__to_raw_pointer(this->__end_),
-                                  _VSTD::forward<_Args>(__args)...);
-        __annotator.__done();
-        ++this->__end_;
-    }
-    else
-        __emplace_back_slow_path(_VSTD::forward<_Args>(__args)...);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::pop_back()
-{
-    _LIBCPP_ASSERT(!empty(), "vector::pop_back called for empty vector");
-    this->__destruct_at_end(this->__end_ - 1);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::erase(const_iterator __position)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::erase(iterator) called with an iterator not"
-        " referring to this vector");
-#endif
-    _LIBCPP_ASSERT(__position != end(),
-        "vector::erase(iterator) called with a non-dereferenceable iterator");
-    difference_type __ps = __position - cbegin();
-    pointer __p = this->__begin_ + __ps;
-    iterator __r = __make_iter(__p);
-    this->__destruct_at_end(_VSTD::move(__p + 1, this->__end_, __p));
-    return __r;
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::erase(const_iterator __first, const_iterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__first) == this,
-        "vector::erase(iterator,  iterator) called with an iterator not"
-        " referring to this vector");
-#endif
-    _LIBCPP_ASSERT(__first <= __last, "vector::erase(first, last) called with invalid range");
-    pointer __p = this->__begin_ + (__first - begin());
-    iterator __r = __make_iter(__p);
-    if (__first != __last)
-        this->__destruct_at_end(_VSTD::move(__p + (__last - __first), this->__end_, __p));
-    return __r;
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointer __to)
-{
-    pointer __old_last = this->__end_;
-    difference_type __n = __old_last - __to;
-    for (pointer __i = __from_s + __n; __i < __from_e; ++__i, ++this->__end_)
-        __alloc_traits::construct(this->__alloc(),
-                                  _VSTD::__to_raw_pointer(this->__end_),
-                                  _VSTD::move(*__i));
-    _VSTD::move_backward(__from_s, __from_s + __n, __old_last);
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, x) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        if (__p == this->__end_)
-        {
-            __alloc_traits::construct(this->__alloc(),
-                                      _VSTD::__to_raw_pointer(this->__end_), __x);
-            ++this->__end_;
-        }
-        else
-        {
-            __move_range(__p, this->__end_, __p + 1);
-            const_pointer __xr = pointer_traits<const_pointer>::pointer_to(__x);
-            if (__p <= __xr && __xr < this->__end_)
-                ++__xr;
-            *__p = *__xr;
-        }
-        __annotator.__done();
-    }
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);
-        __v.push_back(__x);
-        __p = __swap_out_circular_buffer(__v, __p);
-    }
-    return __make_iter(__p);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, x) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        if (__p == this->__end_)
-        {
-            __alloc_traits::construct(this->__alloc(),
-                                      _VSTD::__to_raw_pointer(this->__end_),
-                                      _VSTD::move(__x));
-            ++this->__end_;
-        }
-        else
-        {
-            __move_range(__p, this->__end_, __p + 1);
-            *__p = _VSTD::move(__x);
-        }
-        __annotator.__done();
-    }
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);
-        __v.push_back(_VSTD::move(__x));
-        __p = __swap_out_circular_buffer(__v, __p);
-    }
-    return __make_iter(__p);
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::emplace(iterator, x) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        if (__p == this->__end_)
-        {
-            __alloc_traits::construct(this->__alloc(),
-                                      _VSTD::__to_raw_pointer(this->__end_),
-                                      _VSTD::forward<_Args>(__args)...);
-            ++this->__end_;
-        }
-        else
-        {
-            value_type __tmp(_VSTD::forward<_Args>(__args)...);
-            __move_range(__p, this->__end_, __p + 1);
-            *__p = _VSTD::move(__tmp);
-        }
-        __annotator.__done();
-    }
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);
-        __v.emplace_back(_VSTD::forward<_Args>(__args)...);
-        __p = __swap_out_circular_buffer(__v, __p);
-    }
-    return __make_iter(__p);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_reference __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, n, x) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    if (__n > 0)
-    {
-        if (__n <= static_cast<size_type>(this->__end_cap() - this->__end_))
-        {
-            size_type __old_n = __n;
-            pointer __old_last = this->__end_;
-            if (__n > static_cast<size_type>(this->__end_ - __p))
-            {
-                size_type __cx = __n - (this->__end_ - __p);
-                __construct_at_end(__cx, __x);
-                __n -= __cx;
-            }
-            if (__n > 0)
-            {
-                __RAII_IncreaseAnnotator __annotator(*this, __n);
-                __move_range(__p, __old_last, __p + __old_n);
-                __annotator.__done();
-                const_pointer __xr = pointer_traits<const_pointer>::pointer_to(__x);
-                if (__p <= __xr && __xr < this->__end_)
-                    __xr += __old_n;
-                _VSTD::fill_n(__p, __n, *__xr);
-            }
-        }
-        else
-        {
-            allocator_type& __a = this->__alloc();
-            __split_buffer<value_type, allocator_type&> __v(__recommend(size() + __n), __p - this->__begin_, __a);
-            __v.__construct_at_end(__n, __x);
-            __p = __swap_out_circular_buffer(__v, __p);
-        }
-    }
-    return __make_iter(__p);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value &&
-    is_constructible<
-       _Tp,
-       typename iterator_traits<_InputIterator>::reference>::value,
-    typename vector<_Tp, _Allocator>::iterator
->::type
-vector<_Tp, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, range) called with an iterator not"
-        " referring to this vector");
-#endif
-    difference_type __off = __position - begin();
-    pointer __p = this->__begin_ + __off;
-    allocator_type& __a = this->__alloc();
-    pointer __old_last = this->__end_;
-    for (; this->__end_ != this->__end_cap() && __first != __last; ++__first)
-    {
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_),
-                                  *__first);
-        ++this->__end_;
-    }
-    __split_buffer<value_type, allocator_type&> __v(__a);
-    if (__first != __last)
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __v.__construct_at_end(__first, __last);
-            difference_type __old_size = __old_last - this->__begin_;
-            difference_type __old_p = __p - this->__begin_;
-            reserve(__recommend(size() + __v.size()));
-            __p = this->__begin_ + __old_p;
-            __old_last = this->__begin_ + __old_size;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            erase(__make_iter(__old_last), end());
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    __p = _VSTD::rotate(__p, __old_last, this->__end_);
-    insert(__make_iter(__p), make_move_iterator(__v.begin()),
-                                    make_move_iterator(__v.end()));
-    return begin() + __off;
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value &&
-    is_constructible<
-       _Tp,
-       typename iterator_traits<_ForwardIterator>::reference>::value,
-    typename vector<_Tp, _Allocator>::iterator
->::type
-vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, range) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    difference_type __n = _VSTD::distance(__first, __last);
-    if (__n > 0)
-    {
-        if (__n <= this->__end_cap() - this->__end_)
-        {
-            size_type __old_n = __n;
-            pointer __old_last = this->__end_;
-            _ForwardIterator __m = __last;
-            difference_type __dx = this->__end_ - __p;
-            if (__n > __dx)
-            {
-                __m = __first;
-                _VSTD::advance(__m, this->__end_ - __p);
-                __construct_at_end(__m, __last);
-                __n = __dx;
-            }
-            if (__n > 0)
-            {
-                __RAII_IncreaseAnnotator __annotator(*this, __n);
-                __move_range(__p, __old_last, __p + __old_n);
-                __annotator.__done();
-                _VSTD::copy(__first, __m, __p);
-            }
-        }
-        else
-        {
-            allocator_type& __a = this->__alloc();
-            __split_buffer<value_type, allocator_type&> __v(__recommend(size() + __n), __p - this->__begin_, __a);
-            __v.__construct_at_end(__first, __last);
-            __p = __swap_out_circular_buffer(__v, __p);
-        }
-    }
-    return __make_iter(__p);
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::resize(size_type __sz)
-{
-    size_type __cs = size();
-    if (__cs < __sz)
-        this->__append(__sz - __cs);
-    else if (__cs > __sz)
-        this->__destruct_at_end(this->__begin_ + __sz);
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::resize(size_type __sz, const_reference __x)
-{
-    size_type __cs = size();
-    if (__cs < __sz)
-        this->__append(__sz - __cs, __x);
-    else if (__cs > __sz)
-        this->__destruct_at_end(this->__begin_ + __sz);
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::swap(vector& __x)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-    _LIBCPP_ASSERT(__alloc_traits::propagate_on_container_swap::value ||
-                   this->__alloc() == __x.__alloc(),
-                   "vector::swap: Either propagate_on_container_swap must be true"
-                   " or the allocators must compare equal");
-    _VSTD::swap(this->__begin_, __x.__begin_);
-    _VSTD::swap(this->__end_, __x.__end_);
-    _VSTD::swap(this->__end_cap(), __x.__end_cap());
-    __base::__swap_alloc(this->__alloc(), __x.__alloc());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->swap(this, &__x);
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-}
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__invariants() const
-{
-    if (this->__begin_ == nullptr)
-    {
-        if (this->__end_ != nullptr || this->__end_cap() != nullptr)
-            return false;
-    }
-    else
-    {
-        if (this->__begin_ > this->__end_)
-            return false;
-        if (this->__begin_ == this->__end_cap())
-            return false;
-        if (this->__end_ > this->__end_cap())
-            return false;
-    }
-    return true;
-}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__dereferenceable(const const_iterator* __i) const
-{
-    return this->__begin_ <= __i->base() && __i->base() < this->__end_;
-}
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__decrementable(const const_iterator* __i) const
-{
-    return this->__begin_ < __i->base() && __i->base() <= this->__end_;
-}
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__addable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    const_pointer __p = __i->base() + __n;
-    return this->__begin_ <= __p && __p <= this->__end_;
-}
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    const_pointer __p = __i->base() + __n;
-    return this->__begin_ <= __p && __p < this->__end_;
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::__invalidate_all_iterators()
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__invalidate_all(this);
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-}
-
-// vector<bool>
-
-template <class _Allocator> class vector<bool, _Allocator>;
-
-template <class _Allocator> struct hash<vector<bool, _Allocator> >;
-
-template <class _Allocator>
-struct __has_storage_type<vector<bool, _Allocator> >
-{
-    static const bool value = true;
-};
-
-template <class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY vector<bool, _Allocator>
-    : private __vector_base_common<true>
-{
-public:
-    typedef vector                                   __self;
-    typedef bool                                     value_type;
-    typedef _Allocator                               allocator_type;
-    typedef allocator_traits<allocator_type>         __alloc_traits;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-    typedef size_type __storage_type;
-    typedef __bit_iterator<vector, false>            pointer;
-    typedef __bit_iterator<vector, true>             const_pointer;
-    typedef pointer                                  iterator;
-    typedef const_pointer                            const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>         reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-private:
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__storage_type>
-#else
-                rebind_alloc<__storage_type>::other
-#endif
-                                                     __storage_allocator;
-    typedef allocator_traits<__storage_allocator>    __storage_traits;
-    typedef typename __storage_traits::pointer       __storage_pointer;
-    typedef typename __storage_traits::const_pointer __const_storage_pointer;
-
-    __storage_pointer                                      __begin_;
-    size_type                                              __size_;
-    __compressed_pair<size_type, __storage_allocator> __cap_alloc_;
-public:
-    typedef __bit_reference<vector>                  reference;
-    typedef __bit_const_reference<vector>            const_reference;
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    size_type& __cap() _NOEXCEPT
-        {return __cap_alloc_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    const size_type& __cap() const _NOEXCEPT
-        {return __cap_alloc_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    __storage_allocator& __alloc() _NOEXCEPT
-        {return __cap_alloc_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const __storage_allocator& __alloc() const _NOEXCEPT
-        {return __cap_alloc_.second();}
-
-    static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __internal_cap_to_external(size_type __n) _NOEXCEPT
-        {return __n * __bits_per_word;}
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __external_cap_to_internal(size_type __n) _NOEXCEPT
-        {return (__n - 1) / __bits_per_word + 1;}
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    vector()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a);
-    ~vector();
-    explicit vector(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit vector(size_type __n, const allocator_type& __a);
-#endif
-    vector(size_type __n, const value_type& __v);
-    vector(size_type __n, const value_type& __v, const allocator_type& __a);
-    template <class _InputIterator>
-        vector(_InputIterator __first, _InputIterator __last,
-               typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value>::type* = 0);
-    template <class _InputIterator>
-        vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
-               typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value>::type* = 0);
-    template <class _ForwardIterator>
-        vector(_ForwardIterator __first, _ForwardIterator __last,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type* = 0);
-    template <class _ForwardIterator>
-        vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type* = 0);
-
-    vector(const vector& __v);
-    vector(const vector& __v, const allocator_type& __a);
-    vector& operator=(const vector& __v);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    vector(initializer_list<value_type> __il);
-    vector(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    vector(vector&& __v)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    vector(vector&& __v, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(vector&& __v)
-        _NOEXCEPT_(
-             __alloc_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end()); return *this;}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template <class _InputIterator>
-        typename enable_if
-        <
-            __is_input_iterator<_InputIterator>::value &&
-           !__is_forward_iterator<_InputIterator>::value,
-           void
-        >::type
-        assign(_InputIterator __first, _InputIterator __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-           void
-        >::type
-        assign(_ForwardIterator __first, _ForwardIterator __last);
-
-    void assign(size_type __n, const value_type& __x);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void assign(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(this->__alloc());}
-
-    size_type max_size() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type capacity() const _NOEXCEPT
-        {return __internal_cap_to_external(__cap());}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT
-        {return __size_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT
-        {return __size_ == 0;}
-    void reserve(size_type __n);
-    void shrink_to_fit() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT
-        {return __make_iter(0);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT
-        {return __make_iter(0);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT
-        {return __make_iter(__size_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()   const _NOEXCEPT
-        {return __make_iter(__size_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rbegin() _NOEXCEPT
-        {return       reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rend() _NOEXCEPT
-        {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend()   const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cbegin()  const _NOEXCEPT
-        {return __make_iter(0);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cend()    const _NOEXCEPT
-        {return __make_iter(__size_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend()   const _NOEXCEPT
-        {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY reference       operator[](size_type __n)       {return __make_ref(__n);}
-    _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const {return __make_ref(__n);}
-    reference       at(size_type __n);
-    const_reference at(size_type __n) const;
-
-    _LIBCPP_INLINE_VISIBILITY reference       front()       {return __make_ref(0);}
-    _LIBCPP_INLINE_VISIBILITY const_reference front() const {return __make_ref(0);}
-    _LIBCPP_INLINE_VISIBILITY reference       back()        {return __make_ref(__size_ - 1);}
-    _LIBCPP_INLINE_VISIBILITY const_reference back()  const {return __make_ref(__size_ - 1);}
-
-    void push_back(const value_type& __x);
-#if _LIBCPP_STD_VER > 11
-    template <class... _Args>
-    _LIBCPP_INLINE_VISIBILITY void emplace_back(_Args&&... __args)
-        { push_back ( value_type ( _VSTD::forward<_Args>(__args)... )); }
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY void pop_back() {--__size_;}
-
-#if _LIBCPP_STD_VER > 11
-    template <class... _Args>
-   _LIBCPP_INLINE_VISIBILITY iterator emplace(const_iterator position, _Args&&... __args)
-        { return insert ( position, value_type ( _VSTD::forward<_Args>(__args)... )); }
-#endif
-
-    iterator insert(const_iterator __position, const value_type& __x);
-    iterator insert(const_iterator __position, size_type __n, const value_type& __x);
-    iterator insert(const_iterator __position, size_type __n, const_reference __x);
-    template <class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            iterator
-        >::type
-        insert(const_iterator __position, _InputIterator __first, _InputIterator __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            iterator
-        >::type
-        insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __position, initializer_list<value_type> __il)
-        {return insert(__position, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __position);
-    iterator erase(const_iterator __first, const_iterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__size_ = 0;}
-
-    void swap(vector&)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-
-    void resize(size_type __sz, value_type __x = false);
-    void flip() _NOEXCEPT;
-
-    bool __invariants() const;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY void __invalidate_all_iterators();
-    void allocate(size_type __n);
-    void deallocate() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __align_it(size_type __new_size) _NOEXCEPT
-        {return __new_size + (__bits_per_word-1) & ~((size_type)__bits_per_word-1);};
-    _LIBCPP_INLINE_VISIBILITY  size_type __recommend(size_type __new_size) const;
-    _LIBCPP_INLINE_VISIBILITY void __construct_at_end(size_type __n, bool __x);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            void
-        >::type
-        __construct_at_end(_ForwardIterator __first, _ForwardIterator __last);
-    void __append(size_type __n, const_reference __x);
-    _LIBCPP_INLINE_VISIBILITY
-    reference __make_ref(size_type __pos) _NOEXCEPT
-        {return reference(__begin_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference __make_ref(size_type __pos) const _NOEXCEPT
-        {return const_reference(__begin_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator __make_iter(size_type __pos) _NOEXCEPT
-        {return iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator __make_iter(size_type __pos) const _NOEXCEPT
-        {return const_iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator __const_iterator_cast(const_iterator __p) _NOEXCEPT
-        {return begin() + (__p - cbegin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const vector& __v)
-        {__copy_assign_alloc(__v, integral_constant<bool,
-                      __storage_traits::propagate_on_container_copy_assignment::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const vector& __c, true_type)
-        {
-            if (__alloc() != __c.__alloc())
-                deallocate();
-            __alloc() = __c.__alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const vector&, false_type)
-        {}
-
-    void __move_assign(vector& __c, false_type);
-    void __move_assign(vector& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(vector& __c)
-        _NOEXCEPT_(
-            !__storage_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<allocator_type>::value)
-        {__move_assign_alloc(__c, integral_constant<bool,
-                      __storage_traits::propagate_on_container_move_assignment::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(vector& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(vector&, false_type)
-        _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__storage_allocator& __x, __storage_allocator& __y)
-        _NOEXCEPT_(
-            !__storage_traits::propagate_on_container_swap::value ||
-            __is_nothrow_swappable<allocator_type>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __storage_traits::propagate_on_container_swap::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__storage_allocator& __x, __storage_allocator& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<allocator_type>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__storage_allocator&, __storage_allocator&, false_type)
-        _NOEXCEPT
-        {}
-
-    size_t __hash_code() const _NOEXCEPT;
-
-    friend class __bit_reference<vector>;
-    friend class __bit_const_reference<vector>;
-    friend class __bit_iterator<vector, false>;
-    friend class __bit_iterator<vector, true>;
-    friend struct __bit_array<vector>;
-    friend struct _LIBCPP_TYPE_VIS_ONLY hash<vector>;
-};
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<bool, _Allocator>::__invalidate_all_iterators()
-{
-}
-
-//  Allocate space for __n objects
-//  throws length_error if __n > max_size()
-//  throws (probably bad_alloc) if memory run out
-//  Precondition:  __begin_ == __end_ == __cap() == 0
-//  Precondition:  __n > 0
-//  Postcondition:  capacity() == __n
-//  Postcondition:  size() == 0
-template <class _Allocator>
-void
-vector<bool, _Allocator>::allocate(size_type __n)
-{
-    if (__n > max_size())
-        this->__throw_length_error();
-    __n = __external_cap_to_internal(__n);
-    this->__begin_ = __storage_traits::allocate(this->__alloc(), __n);
-    this->__size_ = 0;
-    this->__cap() = __n;
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::deallocate() _NOEXCEPT
-{
-    if (this->__begin_ != nullptr)
-    {
-        __storage_traits::deallocate(this->__alloc(), this->__begin_, __cap());
-        __invalidate_all_iterators();
-        this->__begin_ = nullptr;
-        this->__size_ = this->__cap() = 0;
-    }
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::size_type
-vector<bool, _Allocator>::max_size() const _NOEXCEPT
-{
-    size_type __amax = __storage_traits::max_size(__alloc());
-    size_type __nmax = numeric_limits<size_type>::max() / 2;  // end() >= begin(), always
-    if (__nmax / __bits_per_word <= __amax)
-        return __nmax;
-    return __internal_cap_to_external(__amax);
-}
-
-//  Precondition:  __new_size > capacity()
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<bool, _Allocator>::size_type
-vector<bool, _Allocator>::__recommend(size_type __new_size) const
-{
-    const size_type __ms = max_size();
-    if (__new_size > __ms)
-        this->__throw_length_error();
-    const size_type __cap = capacity();
-    if (__cap >= __ms / 2)
-        return __ms;
-    return _VSTD::max(2*__cap, __align_it(__new_size));
-}
-
-//  Default constructs __n objects starting at __end_
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == size() + __n
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<bool, _Allocator>::__construct_at_end(size_type __n, bool __x)
-{
-    size_type __old_size = this->__size_;
-    this->__size_ += __n;
-    _VSTD::fill_n(__make_iter(__old_size), __n, __x);
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    void
->::type
-vector<bool, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last)
-{
-    size_type __old_size = this->__size_;
-    this->__size_ += _VSTD::distance(__first, __last);
-    _VSTD::copy(__first, __last, __make_iter(__old_size));
-}
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<bool, _Allocator>::vector()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-}
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<bool, _Allocator>::vector(const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(size_type __n)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, false);
-    }
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Allocator>
-vector<bool, _Allocator>::vector(size_type __n, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, false);
-    }
-}
-#endif
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(size_type __n, const value_type& __x)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, __x);
-    }
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(size_type __n, const value_type& __x, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, __x);
-    }
-}
-
-template <class _Allocator>
-template <class _InputIterator>
-vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last,
-       typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value>::type*)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (; __first != __last; ++__first)
-            push_back(*__first);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        if (__begin_ != nullptr)
-            __storage_traits::deallocate(__alloc(), __begin_, __cap());
-        __invalidate_all_iterators();
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Allocator>
-template <class _InputIterator>
-vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
-       typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value>::type*)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (; __first != __last; ++__first)
-            push_back(*__first);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        if (__begin_ != nullptr)
-            __storage_traits::deallocate(__alloc(), __begin_, __cap());
-        __invalidate_all_iterators();
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-vector<bool, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type*)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-vector<bool, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type*)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__first, __last);
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(initializer_list<value_type> __il)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-    size_type __n = static_cast<size_type>(__il.size());
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__il.begin(), __il.end());
-    }
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(initializer_list<value_type> __il, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-    size_type __n = static_cast<size_type>(__il.size());
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__il.begin(), __il.end());
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Allocator>
-vector<bool, _Allocator>::~vector()
-{
-    if (__begin_ != nullptr)
-        __storage_traits::deallocate(__alloc(), __begin_, __cap());
-    __invalidate_all_iterators();
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(const vector& __v)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, __storage_traits::select_on_container_copy_construction(__v.__alloc()))
-{
-    if (__v.size() > 0)
-    {
-        allocate(__v.size());
-        __construct_at_end(__v.begin(), __v.end());
-    }
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(const vector& __v, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, __a)
-{
-    if (__v.size() > 0)
-    {
-        allocate(__v.size());
-        __construct_at_end(__v.begin(), __v.end());
-    }
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>&
-vector<bool, _Allocator>::operator=(const vector& __v)
-{
-    if (this != &__v)
-    {
-        __copy_assign_alloc(__v);
-        if (__v.__size_)
-        {
-            if (__v.__size_ > capacity())
-            {
-                deallocate();
-                allocate(__v.__size_);
-            }
-            _VSTD::copy(__v.__begin_, __v.__begin_ + __external_cap_to_internal(__v.__size_), __begin_);
-        }
-        __size_ = __v.__size_;
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<bool, _Allocator>::vector(vector&& __v)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __begin_(__v.__begin_),
-      __size_(__v.__size_),
-      __cap_alloc_(__v.__cap_alloc_)
-{
-    __v.__begin_ = nullptr;
-    __v.__size_ = 0;
-    __v.__cap() = 0;
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(vector&& __v, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, __a)
-{
-    if (__a == allocator_type(__v.__alloc()))
-    {
-        this->__begin_ = __v.__begin_;
-        this->__size_ = __v.__size_;
-        this->__cap() = __v.__cap();
-        __v.__begin_ = nullptr;
-        __v.__cap() = __v.__size_ = 0;
-    }
-    else if (__v.size() > 0)
-    {
-        allocate(__v.size());
-        __construct_at_end(__v.begin(), __v.end());
-    }
-}
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<bool, _Allocator>&
-vector<bool, _Allocator>::operator=(vector&& __v)
-        _NOEXCEPT_(
-             __alloc_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__v, integral_constant<bool,
-          __storage_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::__move_assign(vector& __c, false_type)
-{
-    if (__alloc() != __c.__alloc())
-        assign(__c.begin(), __c.end());
-    else
-        __move_assign(__c, true_type());
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::__move_assign(vector& __c, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    deallocate();
-    __move_assign_alloc(__c);
-    this->__begin_ = __c.__begin_;
-    this->__size_ = __c.__size_;
-    this->__cap() = __c.__cap();
-    __c.__begin_ = nullptr;
-    __c.__cap() = __c.__size_ = 0;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::assign(size_type __n, const value_type& __x)
-{
-    __size_ = 0;
-    if (__n > 0)
-    {
-        size_type __c = capacity();
-        if (__n <= __c)
-            __size_ = __n;
-        else
-        {
-            vector __v(__alloc());
-            __v.reserve(__recommend(__n));
-            __v.__size_ = __n;
-            swap(__v);
-        }
-        _VSTD::fill_n(begin(), __n, __x);
-    }
-}
-
-template <class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value &&
-   !__is_forward_iterator<_InputIterator>::value,
-   void
->::type
-vector<bool, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
-{
-    clear();
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-   void
->::type
-vector<bool, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)
-{
-    clear();
-    difference_type __n = _VSTD::distance(__first, __last);
-    if (__n)
-    {
-        if (__n > capacity())
-        {
-            deallocate();
-            allocate(__n);
-        }
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::reserve(size_type __n)
-{
-    if (__n > capacity())
-    {
-        vector __v(this->__alloc());
-        __v.allocate(__n);
-        __v.__construct_at_end(this->begin(), this->end());
-        swap(__v);
-        __invalidate_all_iterators();
-    }
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::shrink_to_fit() _NOEXCEPT
-{
-    if (__external_cap_to_internal(size()) > __cap())
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            vector(*this, allocator_type(__alloc())).swap(*this);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::reference
-vector<bool, _Allocator>::at(size_type __n)
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return (*this)[__n];
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::const_reference
-vector<bool, _Allocator>::at(size_type __n) const
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return (*this)[__n];
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::push_back(const value_type& __x)
-{
-    if (this->__size_ == this->capacity())
-        reserve(__recommend(this->__size_ + 1));
-    ++this->__size_;
-    back() = __x;
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::iterator
-vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __x)
-{
-    iterator __r;
-    if (size() < capacity())
-    {
-        const_iterator __old_end = end();
-        ++__size_;
-        _VSTD::copy_backward(__position, __old_end, end());
-        __r = __const_iterator_cast(__position);
-    }
-    else
-    {
-        vector __v(__alloc());
-        __v.reserve(__recommend(__size_ + 1));
-        __v.__size_ = __size_ + 1;
-        __r = _VSTD::copy(cbegin(), __position, __v.begin());
-        _VSTD::copy_backward(__position, cend(), __v.end());
-        swap(__v);
-    }
-    *__r = __x;
-    return __r;
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::iterator
-vector<bool, _Allocator>::insert(const_iterator __position, size_type __n, const value_type& __x)
-{
-    iterator __r;
-    size_type __c = capacity();
-    if (__n <= __c && size() <= __c - __n)
-    {
-        const_iterator __old_end = end();
-        __size_ += __n;
-        _VSTD::copy_backward(__position, __old_end, end());
-        __r = __const_iterator_cast(__position);
-    }
-    else
-    {
-        vector __v(__alloc());
-        __v.reserve(__recommend(__size_ + __n));
-        __v.__size_ = __size_ + __n;
-        __r = _VSTD::copy(cbegin(), __position, __v.begin());
-        _VSTD::copy_backward(__position, cend(), __v.end());
-        swap(__v);
-    }
-    _VSTD::fill_n(__r, __n, __x);
-    return __r;
-}
-
-template <class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    typename vector<bool, _Allocator>::iterator
->::type
-vector<bool, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)
-{
-    difference_type __off = __position - begin();
-    iterator __p = __const_iterator_cast(__position);
-    iterator __old_end = end();
-    for (; size() != capacity() && __first != __last; ++__first)
-    {
-        ++this->__size_;
-        back() = *__first;
-    }
-    vector __v(__alloc());
-    if (__first != __last)
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __v.assign(__first, __last);
-            difference_type __old_size = static_cast<difference_type>(__old_end - begin());
-            difference_type __old_p = __p - begin();
-            reserve(__recommend(size() + __v.size()));
-            __p = begin() + __old_p;
-            __old_end = begin() + __old_size;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            erase(__old_end, end());
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    __p = _VSTD::rotate(__p, __old_end, end());
-    insert(__p, __v.begin(), __v.end());
-    return begin() + __off;
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    typename vector<bool, _Allocator>::iterator
->::type
-vector<bool, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)
-{
-    difference_type __n = _VSTD::distance(__first, __last);
-    iterator __r;
-    size_type __c = capacity();
-    if (__n <= __c && size() <= __c - __n)
-    {
-        const_iterator __old_end = end();
-        __size_ += __n;
-        _VSTD::copy_backward(__position, __old_end, end());
-        __r = __const_iterator_cast(__position);
-    }
-    else
-    {
-        vector __v(__alloc());
-        __v.reserve(__recommend(__size_ + __n));
-        __v.__size_ = __size_ + __n;
-        __r = _VSTD::copy(cbegin(), __position, __v.begin());
-        _VSTD::copy_backward(__position, cend(), __v.end());
-        swap(__v);
-    }
-    _VSTD::copy(__first, __last, __r);
-    return __r;
-}
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<bool, _Allocator>::iterator
-vector<bool, _Allocator>::erase(const_iterator __position)
-{
-    iterator __r = __const_iterator_cast(__position);
-    _VSTD::copy(__position + 1, this->cend(), __r);
-    --__size_;
-    return __r;
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::iterator
-vector<bool, _Allocator>::erase(const_iterator __first, const_iterator __last)
-{
-    iterator __r = __const_iterator_cast(__first);
-    difference_type __d = __last - __first;
-    _VSTD::copy(__last, this->cend(), __r);
-    __size_ -= __d;
-    return __r;
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::swap(vector& __x)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-    _VSTD::swap(this->__begin_, __x.__begin_);
-    _VSTD::swap(this->__size_, __x.__size_);
-    _VSTD::swap(this->__cap(), __x.__cap());
-    __swap_alloc(this->__alloc(), __x.__alloc());
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::resize(size_type __sz, value_type __x)
-{
-    size_type __cs = size();
-    if (__cs < __sz)
-    {
-        iterator __r;
-        size_type __c = capacity();
-        size_type __n = __sz - __cs;
-        if (__n <= __c && __cs <= __c - __n)
-        {
-            __r = end();
-            __size_ += __n;
-        }
-        else
-        {
-            vector __v(__alloc());
-            __v.reserve(__recommend(__size_ + __n));
-            __v.__size_ = __size_ + __n;
-            __r = _VSTD::copy(cbegin(), cend(), __v.begin());
-            swap(__v);
-        }
-        _VSTD::fill_n(__r, __n, __x);
-    }
-    else
-        __size_ = __sz;
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::flip() _NOEXCEPT
-{
-    // do middle whole words
-    size_type __n = __size_;
-    __storage_pointer __p = __begin_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        *__p = ~*__p;
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __storage_type __b = *__p & __m;
-        *__p &= ~__m;
-        *__p |= ~__b & __m;
-    }
-}
-
-template <class _Allocator>
-bool
-vector<bool, _Allocator>::__invariants() const
-{
-    if (this->__begin_ == nullptr)
-    {
-        if (this->__size_ != 0 || this->__cap() != 0)
-            return false;
-    }
-    else
-    {
-        if (this->__cap() == 0)
-            return false;
-        if (this->__size_ > this->capacity())
-            return false;
-    }
-    return true;
-}
-
-template <class _Allocator>
-size_t
-vector<bool, _Allocator>::__hash_code() const _NOEXCEPT
-{
-    size_t __h = 0;
-    // do middle whole words
-    size_type __n = __size_;
-    __storage_pointer __p = __begin_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        __h ^= *__p;
-    // do last partial word
-    if (__n > 0)
-    {
-        const __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __h ^= *__p & __m;
-    }
-    return __h;
-}
-
-template <class _Allocator>
-struct _LIBCPP_TYPE_VIS_ONLY hash<vector<bool, _Allocator> >
-    : public unary_function<vector<bool, _Allocator>, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const vector<bool, _Allocator>& __vec) const _NOEXCEPT
-        {return __vec.__hash_code();}
-};
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    const typename vector<_Tp, _Allocator>::size_type __sz = __x.size();
-    return __sz == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(vector<_Tp, _Allocator>& __x, vector<_Tp, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_VECTOR
diff --git a/include.new/c++/v1/tuple b/include.new/c++/v1/tuple
deleted file mode 100644
index 5fc27f9..0000000
--- a/include.new/c++/v1/tuple
+++ /dev/null
@@ -1,1135 +0,0 @@
-// -*- C++ -*-
-//===--------------------------- tuple ------------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_TUPLE
-#define _LIBCPP_TUPLE
-
-/*
-    tuple synopsis
-
-namespace std
-{
-
-template <class... T>
-class tuple {
-public:
-    constexpr tuple();
-    explicit tuple(const T&...);  // constexpr in C++14
-    template <class... U>
-        explicit tuple(U&&...);  // constexpr in C++14
-    tuple(const tuple&) = default;
-    tuple(tuple&&) = default;
-    template <class... U>
-        tuple(const tuple<U...>&);  // constexpr in C++14
-    template <class... U>
-        tuple(tuple<U...>&&);  // constexpr in C++14
-    template <class U1, class U2>
-        tuple(const pair<U1, U2>&); // iff sizeof...(T) == 2 // constexpr in C++14
-    template <class U1, class U2>
-        tuple(pair<U1, U2>&&); // iff sizeof...(T) == 2  // constexpr in C++14
-
-    // allocator-extended constructors
-    template <class Alloc>
-        tuple(allocator_arg_t, const Alloc& a);
-    template <class Alloc>
-        tuple(allocator_arg_t, const Alloc& a, const T&...);
-    template <class Alloc, class... U>
-        tuple(allocator_arg_t, const Alloc& a, U&&...);
-    template <class Alloc>
-        tuple(allocator_arg_t, const Alloc& a, const tuple&);
-    template <class Alloc>
-        tuple(allocator_arg_t, const Alloc& a, tuple&&);
-    template <class Alloc, class... U>
-        tuple(allocator_arg_t, const Alloc& a, const tuple<U...>&);
-    template <class Alloc, class... U>
-        tuple(allocator_arg_t, const Alloc& a, tuple<U...>&&);
-    template <class Alloc, class U1, class U2>
-        tuple(allocator_arg_t, const Alloc& a, const pair<U1, U2>&);
-    template <class Alloc, class U1, class U2>
-        tuple(allocator_arg_t, const Alloc& a, pair<U1, U2>&&);
-
-    tuple& operator=(const tuple&);
-    tuple&
-        operator=(tuple&&) noexcept(AND(is_nothrow_move_assignable<T>::value ...));
-    template <class... U>
-        tuple& operator=(const tuple<U...>&);
-    template <class... U>
-        tuple& operator=(tuple<U...>&&);
-    template <class U1, class U2>
-        tuple& operator=(const pair<U1, U2>&); // iff sizeof...(T) == 2
-    template <class U1, class U2>
-        tuple& operator=(pair<U1, U2>&&); //iffsizeof...(T) == 2
-
-    void swap(tuple&) noexcept(AND(swap(declval<T&>(), declval<T&>())...));
-};
-
-const unspecified ignore;
-
-template <class... T> tuple<V...>  make_tuple(T&&...); // constexpr in C++14
-template <class... T> tuple<ATypes...> forward_as_tuple(T&&...) noexcept; // constexpr in C++14
-template <class... T> tuple<T&...> tie(T&...) noexcept; // constexpr in C++14
-template <class... Tuples> tuple<CTypes...> tuple_cat(Tuples&&... tpls); // constexpr in C++14
-  
-// 20.4.1.4, tuple helper classes:
-template <class T> class tuple_size; // undefined
-template <class... T> class tuple_size<tuple<T...>>;
-template <intsize_t I, class T> class tuple_element; // undefined
-template <intsize_t I, class... T> class tuple_element<I, tuple<T...>>;
-template <size_t _Ip, class ..._Tp>
-  using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type; // C++14
-
-// 20.4.1.5, element access:
-template <intsize_t I, class... T>
-    typename tuple_element<I, tuple<T...>>::type&
-    get(tuple<T...>&) noexcept; // constexpr in C++14
-template <intsize_t I, class... T>
-    typename const tuple_element<I, tuple<T...>>::type &
-    get(const tuple<T...>&) noexcept; // constexpr in C++14
-template <intsize_t I, class... T>
-    typename tuple_element<I, tuple<T...>>::type&&
-    get(tuple<T...>&&) noexcept; // constexpr in C++14
-
-template <class T1, class... T>
-    constexpr T1& get(tuple<T...>&) noexcept;  // C++14
-template <class T1, class... T>
-    constexpr T1 const& get(const tuple<T...>&) noexcept;   // C++14
-template <class T1, class... T>
-    constexpr T1&& get(tuple<T...>&&) noexcept;   // C++14
-
-// 20.4.1.6, relational operators:
-template<class... T, class... U> bool operator==(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14
-template<class... T, class... U> bool operator<(const tuple<T...>&, const tuple<U...>&);  // constexpr in C++14
-template<class... T, class... U> bool operator!=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14
-template<class... T, class... U> bool operator>(const tuple<T...>&, const tuple<U...>&);  // constexpr in C++14
-template<class... T, class... U> bool operator<=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14
-template<class... T, class... U> bool operator>=(const tuple<T...>&, const tuple<U...>&); // constexpr in C++14
-
-template <class... Types, class Alloc>
-  struct uses_allocator<tuple<Types...>, Alloc>;
-
-template <class... Types>
-  void
-  swap(tuple<Types...>& x, tuple<Types...>& y) noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__tuple>
-#include <cstddef>
-#include <type_traits>
-#include <__functional_base>
-#include <utility>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// tuple_size
-
-template <class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_size<tuple<_Tp...> >
-    : public integral_constant<size_t, sizeof...(_Tp)>
-{
-};
-
-// tuple_element
-
-template <size_t _Ip, class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<_Ip, tuple<_Tp...> >
-{
-public:
-    typedef typename tuple_element<_Ip, __tuple_types<_Tp...> >::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <size_t _Ip, class ..._Tp>
-using tuple_element_t = typename tuple_element <_Ip, _Tp...>::type;
-#endif
-
-// __tuple_leaf
-
-template <size_t _Ip, class _Hp, bool=is_empty<_Hp>::value
-#if __has_feature(is_final)
-                                 && !__is_final(_Hp)
-#endif
-         >
-class __tuple_leaf;
-
-template <size_t _Ip, class _Hp, bool _Ep>
-inline _LIBCPP_INLINE_VISIBILITY
-void swap(__tuple_leaf<_Ip, _Hp, _Ep>& __x, __tuple_leaf<_Ip, _Hp, _Ep>& __y)
-    _NOEXCEPT_(__is_nothrow_swappable<_Hp>::value)
-{
-    swap(__x.get(), __y.get());
-}
-
-template <size_t _Ip, class _Hp, bool>
-class __tuple_leaf
-{
-    _Hp value;
-
-    __tuple_leaf& operator=(const __tuple_leaf&);
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR __tuple_leaf()
-             _NOEXCEPT_(is_nothrow_default_constructible<_Hp>::value) : value()
-       {static_assert(!is_reference<_Hp>::value,
-              "Attempted to default construct a reference element in a tuple");}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 0>, const _Alloc&)
-            : value()
-        {static_assert(!is_reference<_Hp>::value,
-              "Attempted to default construct a reference element in a tuple");}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 1>, const _Alloc& __a)
-            : value(allocator_arg_t(), __a)
-        {static_assert(!is_reference<_Hp>::value,
-              "Attempted to default construct a reference element in a tuple");}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 2>, const _Alloc& __a)
-            : value(__a)
-        {static_assert(!is_reference<_Hp>::value,
-              "Attempted to default construct a reference element in a tuple");}
-
-    template <class _Tp,
-              class = typename enable_if<
-                  __lazy_and<
-                      __lazy_not<is_same<typename decay<_Tp>::type, __tuple_leaf>>
-                    , is_constructible<_Hp, _Tp>
-                    >::value
-                >::type
-            >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit __tuple_leaf(_Tp&& __t) _NOEXCEPT_((is_nothrow_constructible<_Hp, _Tp>::value))
-            : value(_VSTD::forward<_Tp>(__t))
-        {static_assert(!is_reference<_Hp>::value ||
-                       (is_lvalue_reference<_Hp>::value &&
-                        (is_lvalue_reference<_Tp>::value ||
-                         is_same<typename remove_reference<_Tp>::type,
-                                 reference_wrapper<
-                                    typename remove_reference<_Hp>::type
-                                 >
-                                >::value)) ||
-                        (is_rvalue_reference<_Hp>::value &&
-                         !is_lvalue_reference<_Tp>::value),
-       "Attempted to construct a reference element in a tuple with an rvalue");}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 0>, const _Alloc&, _Tp&& __t)
-            : value(_VSTD::forward<_Tp>(__t))
-        {static_assert(!is_lvalue_reference<_Hp>::value ||
-                       (is_lvalue_reference<_Hp>::value &&
-                        (is_lvalue_reference<_Tp>::value ||
-                         is_same<typename remove_reference<_Tp>::type,
-                                 reference_wrapper<
-                                    typename remove_reference<_Hp>::type
-                                 >
-                                >::value)),
-       "Attempted to construct a reference element in a tuple with an rvalue");}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 1>, const _Alloc& __a, _Tp&& __t)
-            : value(allocator_arg_t(), __a, _VSTD::forward<_Tp>(__t))
-        {static_assert(!is_lvalue_reference<_Hp>::value ||
-                       (is_lvalue_reference<_Hp>::value &&
-                        (is_lvalue_reference<_Tp>::value ||
-                         is_same<typename remove_reference<_Tp>::type,
-                                 reference_wrapper<
-                                    typename remove_reference<_Hp>::type
-                                 >
-                                >::value)),
-       "Attempted to construct a reference element in a tuple with an rvalue");}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 2>, const _Alloc& __a, _Tp&& __t)
-            : value(_VSTD::forward<_Tp>(__t), __a)
-        {static_assert(!is_lvalue_reference<_Hp>::value ||
-                       (is_lvalue_reference<_Hp>::value &&
-                        (is_lvalue_reference<_Tp>::value ||
-                         is_same<typename remove_reference<_Tp>::type,
-                                 reference_wrapper<
-                                    typename remove_reference<_Hp>::type
-                                 >
-                                >::value)),
-       "Attempted to construct a reference element in a tuple with an rvalue");}
-
-    __tuple_leaf(const __tuple_leaf& __t) = default;
-    __tuple_leaf(__tuple_leaf&& __t) = default;
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf&
-        operator=(_Tp&& __t) _NOEXCEPT_((is_nothrow_assignable<_Hp&, _Tp>::value))
-        {
-            value = _VSTD::forward<_Tp>(__t);
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    int swap(__tuple_leaf& __t) _NOEXCEPT_(__is_nothrow_swappable<__tuple_leaf>::value)
-    {
-        _VSTD::swap(*this, __t);
-        return 0;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11       _Hp& get()       _NOEXCEPT {return value;}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const _Hp& get() const _NOEXCEPT {return value;}
-};
-
-template <size_t _Ip, class _Hp>
-class __tuple_leaf<_Ip, _Hp, true>
-    : private _Hp
-{
-
-    __tuple_leaf& operator=(const __tuple_leaf&);
-public:
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR __tuple_leaf()
-             _NOEXCEPT_(is_nothrow_default_constructible<_Hp>::value) {}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 0>, const _Alloc&) {}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 1>, const _Alloc& __a)
-            : _Hp(allocator_arg_t(), __a) {}
-
-    template <class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf(integral_constant<int, 2>, const _Alloc& __a)
-            : _Hp(__a) {}
-
-    template <class _Tp,
-              class = typename enable_if<
-                  __lazy_and<
-                        __lazy_not<is_same<typename decay<_Tp>::type, __tuple_leaf>>
-                      , is_constructible<_Hp, _Tp>
-                    >::value
-                >::type
-            >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit __tuple_leaf(_Tp&& __t) _NOEXCEPT_((is_nothrow_constructible<_Hp, _Tp>::value))
-            : _Hp(_VSTD::forward<_Tp>(__t)) {}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 0>, const _Alloc&, _Tp&& __t)
-            : _Hp(_VSTD::forward<_Tp>(__t)) {}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 1>, const _Alloc& __a, _Tp&& __t)
-            : _Hp(allocator_arg_t(), __a, _VSTD::forward<_Tp>(__t)) {}
-
-    template <class _Tp, class _Alloc>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit __tuple_leaf(integral_constant<int, 2>, const _Alloc& __a, _Tp&& __t)
-            : _Hp(_VSTD::forward<_Tp>(__t), __a) {}
-
-    __tuple_leaf(__tuple_leaf const &) = default;
-    __tuple_leaf(__tuple_leaf &&) = default;
-
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_leaf&
-        operator=(_Tp&& __t) _NOEXCEPT_((is_nothrow_assignable<_Hp&, _Tp>::value))
-        {
-            _Hp::operator=(_VSTD::forward<_Tp>(__t));
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    int
-    swap(__tuple_leaf& __t) _NOEXCEPT_(__is_nothrow_swappable<__tuple_leaf>::value)
-    {
-        _VSTD::swap(*this, __t);
-        return 0;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11       _Hp& get()       _NOEXCEPT {return static_cast<_Hp&>(*this);}
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11 const _Hp& get() const _NOEXCEPT {return static_cast<const _Hp&>(*this);}
-};
-
-template <class ..._Tp>
-_LIBCPP_INLINE_VISIBILITY
-void __swallow(_Tp&&...) _NOEXCEPT {}
-
-template <bool ..._Pred>
-struct __all
-    : is_same<__all<_Pred...>, __all<(_Pred, true)...>>
-{ };
-
-template <class _Tp>
-struct __all_default_constructible;
-
-template <class ..._Tp>
-struct __all_default_constructible<__tuple_types<_Tp...>>
-    : __all<is_default_constructible<_Tp>::value...>
-{ };
-
-// __tuple_impl
-
-template<class _Indx, class ..._Tp> struct __tuple_impl;
-
-template<size_t ..._Indx, class ..._Tp>
-struct __tuple_impl<__tuple_indices<_Indx...>, _Tp...>
-    : public __tuple_leaf<_Indx, _Tp>...
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR __tuple_impl()
-        _NOEXCEPT_(__all<is_nothrow_default_constructible<_Tp>::value...>::value) {}
-
-    template <size_t ..._Uf, class ..._Tf,
-              size_t ..._Ul, class ..._Tl, class ..._Up>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit
-        __tuple_impl(__tuple_indices<_Uf...>, __tuple_types<_Tf...>,
-                     __tuple_indices<_Ul...>, __tuple_types<_Tl...>,
-                     _Up&&... __u)
-                     _NOEXCEPT_((__all<is_nothrow_constructible<_Tf, _Up>::value...>::value &&
-                                 __all<is_nothrow_default_constructible<_Tl>::value...>::value)) :
-            __tuple_leaf<_Uf, _Tf>(_VSTD::forward<_Up>(__u))...,
-            __tuple_leaf<_Ul, _Tl>()...
-            {}
-
-    template <class _Alloc, size_t ..._Uf, class ..._Tf,
-              size_t ..._Ul, class ..._Tl, class ..._Up>
-        _LIBCPP_INLINE_VISIBILITY
-        explicit
-        __tuple_impl(allocator_arg_t, const _Alloc& __a,
-                     __tuple_indices<_Uf...>, __tuple_types<_Tf...>,
-                     __tuple_indices<_Ul...>, __tuple_types<_Tl...>,
-                     _Up&&... __u) :
-            __tuple_leaf<_Uf, _Tf>(__uses_alloc_ctor<_Tf, _Alloc, _Up>(), __a,
-            _VSTD::forward<_Up>(__u))...,
-            __tuple_leaf<_Ul, _Tl>(__uses_alloc_ctor<_Tl, _Alloc>(), __a)...
-            {}
-
-    template <class _Tuple,
-              class = typename enable_if
-                      <
-                         __tuple_constructible<_Tuple, tuple<_Tp...> >::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        __tuple_impl(_Tuple&& __t) _NOEXCEPT_((__all<is_nothrow_constructible<_Tp, typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>::value...>::value))
-            : __tuple_leaf<_Indx, _Tp>(_VSTD::forward<typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<_Indx>(__t)))...
-            {}
-
-    template <class _Alloc, class _Tuple,
-              class = typename enable_if
-                      <
-                         __tuple_convertible<_Tuple, tuple<_Tp...> >::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        __tuple_impl(allocator_arg_t, const _Alloc& __a, _Tuple&& __t)
-            : __tuple_leaf<_Indx, _Tp>(__uses_alloc_ctor<_Tp, _Alloc, typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>(), __a,
-                                       _VSTD::forward<typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<_Indx>(__t)))...
-            {}
-
-    template <class _Tuple>
-        _LIBCPP_INLINE_VISIBILITY
-        typename enable_if
-        <
-            __tuple_assignable<_Tuple, tuple<_Tp...> >::value,
-            __tuple_impl&
-        >::type
-        operator=(_Tuple&& __t) _NOEXCEPT_((__all<is_nothrow_assignable<_Tp&, typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>::value...>::value))
-        {
-            __swallow(__tuple_leaf<_Indx, _Tp>::operator=(_VSTD::forward<typename tuple_element<_Indx,
-                                       typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<_Indx>(__t)))...);
-            return *this;
-        }
-
-    __tuple_impl(const __tuple_impl&) = default;
-    __tuple_impl(__tuple_impl&&) = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tuple_impl&
-    operator=(const __tuple_impl& __t) _NOEXCEPT_((__all<is_nothrow_copy_assignable<_Tp>::value...>::value))
-    {
-        __swallow(__tuple_leaf<_Indx, _Tp>::operator=(static_cast<const __tuple_leaf<_Indx, _Tp>&>(__t).get())...);
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __tuple_impl&
-    operator=(__tuple_impl&& __t) _NOEXCEPT_((__all<is_nothrow_move_assignable<_Tp>::value...>::value))
-    {
-        __swallow(__tuple_leaf<_Indx, _Tp>::operator=(_VSTD::forward<_Tp>(static_cast<__tuple_leaf<_Indx, _Tp>&>(__t).get()))...);
-        return *this;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(__tuple_impl& __t)
-        _NOEXCEPT_(__all<__is_nothrow_swappable<_Tp>::value...>::value)
-    {
-        __swallow(__tuple_leaf<_Indx, _Tp>::swap(static_cast<__tuple_leaf<_Indx, _Tp>&>(__t))...);
-    }
-};
-
-template <class ..._Tp>
-class _LIBCPP_TYPE_VIS_ONLY tuple
-{
-    typedef __tuple_impl<typename __make_tuple_indices<sizeof...(_Tp)>::type, _Tp...> base;
-
-    base base_;
-
-    template <size_t _Jp, class ..._Up> friend _LIBCPP_CONSTEXPR_AFTER_CXX11
-        typename tuple_element<_Jp, tuple<_Up...> >::type& get(tuple<_Up...>&) _NOEXCEPT;
-    template <size_t _Jp, class ..._Up> friend _LIBCPP_CONSTEXPR_AFTER_CXX11
-        const typename tuple_element<_Jp, tuple<_Up...> >::type& get(const tuple<_Up...>&) _NOEXCEPT;
-    template <size_t _Jp, class ..._Up> friend _LIBCPP_CONSTEXPR_AFTER_CXX11
-        typename tuple_element<_Jp, tuple<_Up...> >::type&& get(tuple<_Up...>&&) _NOEXCEPT;
-public:
-
-    template <bool _Dummy = true, class _Up = typename enable_if<
-        __all<(_Dummy && is_default_constructible<_Tp>::value)...>::value
-    >::type>
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR tuple()
-        _NOEXCEPT_(__all<is_nothrow_default_constructible<_Tp>::value...>::value) {}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    explicit tuple(const _Tp& ... __t) _NOEXCEPT_((__all<is_nothrow_copy_constructible<_Tp>::value...>::value)) 
-        : base_(typename __make_tuple_indices<sizeof...(_Tp)>::type(),
-                typename __make_tuple_types<tuple, sizeof...(_Tp)>::type(),
-                typename __make_tuple_indices<0>::type(),
-                typename __make_tuple_types<tuple, 0>::type(),
-                __t...
-               ) {}
-
-    template <class _Alloc>
-      _LIBCPP_INLINE_VISIBILITY
-      tuple(allocator_arg_t, const _Alloc& __a, const _Tp& ... __t)
-        : base_(allocator_arg_t(), __a,
-                typename __make_tuple_indices<sizeof...(_Tp)>::type(),
-                typename __make_tuple_types<tuple, sizeof...(_Tp)>::type(),
-                typename __make_tuple_indices<0>::type(),
-                typename __make_tuple_types<tuple, 0>::type(),
-                __t...
-               ) {}
-
-    template <class ..._Up,
-              typename enable_if
-                      <
-                         sizeof...(_Up) <= sizeof...(_Tp) &&
-                         __tuple_convertible
-                         <
-                            tuple<_Up...>,
-                            typename __make_tuple_types<tuple,
-                                     sizeof...(_Up) < sizeof...(_Tp) ?
-                                        sizeof...(_Up) :
-                                        sizeof...(_Tp)>::type
-                         >::value &&
-                         __all_default_constructible<
-                            typename __make_tuple_types<tuple, sizeof...(_Tp),
-                                sizeof...(_Up) < sizeof...(_Tp) ?
-                                    sizeof...(_Up) :
-                                    sizeof...(_Tp)>::type
-                         >::value,
-                         bool
-                      >::type = false
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        tuple(_Up&&... __u)
-            _NOEXCEPT_((
-                is_nothrow_constructible<base,
-                    typename __make_tuple_indices<sizeof...(_Up)>::type,
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type,
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type,
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type,
-                    _Up...
-                >::value
-            ))
-            : base_(typename __make_tuple_indices<sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type(),
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    _VSTD::forward<_Up>(__u)...) {}
-
-    template <class ..._Up,
-              typename enable_if
-                      <
-                         sizeof...(_Up) <= sizeof...(_Tp) &&
-                         __tuple_constructible
-                         <
-                            tuple<_Up...>,
-                            typename __make_tuple_types<tuple,
-                                     sizeof...(_Up) < sizeof...(_Tp) ?
-                                        sizeof...(_Up) :
-                                        sizeof...(_Tp)>::type
-                         >::value &&
-                         !__tuple_convertible
-                         <
-                            tuple<_Up...>,
-                            typename __make_tuple_types<tuple,
-                                     sizeof...(_Up) < sizeof...(_Tp) ?
-                                        sizeof...(_Up) :
-                                        sizeof...(_Tp)>::type
-                         >::value &&
-                         __all_default_constructible<
-                            typename __make_tuple_types<tuple, sizeof...(_Tp),
-                                sizeof...(_Up) < sizeof...(_Tp) ?
-                                    sizeof...(_Up) :
-                                    sizeof...(_Tp)>::type
-                         >::value,
-                         bool
-                      >::type =false
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit
-        tuple(_Up&&... __u)
-            _NOEXCEPT_((
-                is_nothrow_constructible<base,
-                    typename __make_tuple_indices<sizeof...(_Up)>::type,
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type,
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type,
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type,
-                    _Up...
-                >::value
-            ))
-            : base_(typename __make_tuple_indices<sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type(),
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    _VSTD::forward<_Up>(__u)...) {}
-
-    template <class _Alloc, class ..._Up,
-              class = typename enable_if
-                      <
-                         sizeof...(_Up) <= sizeof...(_Tp) &&
-                         __tuple_convertible
-                         <
-                            tuple<_Up...>,
-                            typename __make_tuple_types<tuple,
-                                     sizeof...(_Up) < sizeof...(_Tp) ?
-                                        sizeof...(_Up) :
-                                        sizeof...(_Tp)>::type
-                         >::value &&
-                         __all_default_constructible<
-                            typename __make_tuple_types<tuple, sizeof...(_Tp),
-                                sizeof...(_Up) < sizeof...(_Tp) ?
-                                    sizeof...(_Up) :
-                                    sizeof...(_Tp)>::type
-                         >::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc& __a, _Up&&... __u)
-            : base_(allocator_arg_t(), __a,
-                    typename __make_tuple_indices<sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Up)>::type(),
-                    typename __make_tuple_indices<sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    typename __make_tuple_types<tuple, sizeof...(_Tp), sizeof...(_Up)>::type(),
-                    _VSTD::forward<_Up>(__u)...) {}
-
-    template <class _Tuple,
-              typename enable_if
-                      <
-                         __tuple_convertible<_Tuple, tuple>::value,
-                         bool
-                      >::type = false
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<base, _Tuple>::value))
-            : base_(_VSTD::forward<_Tuple>(__t)) {}
-
-    template <class _Tuple,
-              typename enable_if
-                      <
-                         __tuple_constructible<_Tuple, tuple>::value &&
-                         !__tuple_convertible<_Tuple, tuple>::value,
-                         bool
-                      >::type = false
-             >
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        explicit
-        tuple(_Tuple&& __t) _NOEXCEPT_((is_nothrow_constructible<base, _Tuple>::value))
-            : base_(_VSTD::forward<_Tuple>(__t)) {}
-
-    template <class _Alloc, class _Tuple,
-              class = typename enable_if
-                      <
-                         __tuple_convertible<_Tuple, tuple>::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc& __a, _Tuple&& __t)
-            : base_(allocator_arg_t(), __a, _VSTD::forward<_Tuple>(__t)) {}
-
-    template <class _Tuple,
-              class = typename enable_if
-                      <
-                         __tuple_assignable<_Tuple, tuple>::value
-                      >::type
-             >
-        _LIBCPP_INLINE_VISIBILITY
-        tuple&
-        operator=(_Tuple&& __t) _NOEXCEPT_((is_nothrow_assignable<base&, _Tuple>::value))
-        {
-            base_.operator=(_VSTD::forward<_Tuple>(__t));
-            return *this;
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(tuple& __t) _NOEXCEPT_(__all<__is_nothrow_swappable<_Tp>::value...>::value)
-        {base_.swap(__t.base_);}
-};
-
-template <>
-class _LIBCPP_TYPE_VIS_ONLY tuple<>
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR tuple() _NOEXCEPT {}
-    template <class _Alloc>
-    _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc&) _NOEXCEPT {}
-    template <class _Alloc>
-    _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc&, const tuple&) _NOEXCEPT {}
-    template <class _Up>
-    _LIBCPP_INLINE_VISIBILITY
-        tuple(array<_Up, 0>) _NOEXCEPT {}
-    template <class _Alloc, class _Up>
-    _LIBCPP_INLINE_VISIBILITY
-        tuple(allocator_arg_t, const _Alloc&, array<_Up, 0>) _NOEXCEPT {}
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(tuple&) _NOEXCEPT {}
-};
-
-template <class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __all<__is_swappable<_Tp>::value...>::value,
-    void
->::type
-swap(tuple<_Tp...>& __t, tuple<_Tp...>& __u)
-                 _NOEXCEPT_(__all<__is_nothrow_swappable<_Tp>::value...>::value)
-    {__t.swap(__u);}
-
-// get
-
-template <size_t _Ip, class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, tuple<_Tp...> >::type&
-get(tuple<_Tp...>& __t) _NOEXCEPT
-{
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
-    return static_cast<__tuple_leaf<_Ip, type>&>(__t.base_).get();
-}
-
-template <size_t _Ip, class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const typename tuple_element<_Ip, tuple<_Tp...> >::type&
-get(const tuple<_Tp...>& __t) _NOEXCEPT
-{
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
-    return static_cast<const __tuple_leaf<_Ip, type>&>(__t.base_).get();
-}
-
-template <size_t _Ip, class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, tuple<_Tp...> >::type&&
-get(tuple<_Tp...>&& __t) _NOEXCEPT
-{
-    typedef typename tuple_element<_Ip, tuple<_Tp...> >::type type;
-    return static_cast<type&&>(
-             static_cast<__tuple_leaf<_Ip, type>&&>(__t.base_).get());
-}
-
-#if _LIBCPP_STD_VER > 11
-// get by type
-template <typename _T1, size_t _Idx, typename... _Args>
-struct __find_exactly_one_t_helper;
-
-// -- find exactly one
-template <typename _T1, size_t _Idx, typename... _Args>
-struct __find_exactly_one_t_checker {
-    static constexpr size_t value = _Idx;
-//  Check the rest of the list to make sure there's only one
-    static_assert ( __find_exactly_one_t_helper<_T1, 0, _Args...>::value == -1, "type can only occur once in type list" );
-    };
-
-
-template <typename _T1, size_t _Idx>
-struct __find_exactly_one_t_helper <_T1, _Idx> {
-    static constexpr size_t value = -1;
-    };
-
-template <typename _T1, size_t _Idx, typename _Head, typename... _Args>
-struct __find_exactly_one_t_helper <_T1, _Idx, _Head, _Args...> {
-    static constexpr size_t value =
-        std::conditional<
-            std::is_same<_T1, _Head>::value,
-            __find_exactly_one_t_checker<_T1, _Idx,   _Args...>,
-            __find_exactly_one_t_helper <_T1, _Idx+1, _Args...>
-        >::type::value;
-    };
-
-template <typename _T1, typename... _Args>
-struct __find_exactly_one_t {
-    static constexpr size_t value = __find_exactly_one_t_helper<_T1, 0, _Args...>::value;
-    static_assert ( value != -1, "type not found in type list" );
-    };
-
-template <class _T1, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1& get(tuple<_Args...>& __tup) noexcept
-{
-    return _VSTD::get<__find_exactly_one_t<_T1, _Args...>::value>(__tup);
-}
-
-template <class _T1, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 const& get(tuple<_Args...> const& __tup) noexcept
-{
-    return _VSTD::get<__find_exactly_one_t<_T1, _Args...>::value>(__tup);
-}
-
-template <class _T1, class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1&& get(tuple<_Args...>&& __tup) noexcept
-{
-    return _VSTD::get<__find_exactly_one_t<_T1, _Args...>::value>(_VSTD::move(__tup));
-}
-
-#endif
-
-// tie
-
-template <class ..._Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-tuple<_Tp&...>
-tie(_Tp&... __t) _NOEXCEPT
-{
-    return tuple<_Tp&...>(__t...);
-}
-
-template <class _Up>
-struct __ignore_t
-{
-    template <class _Tp>
-        _LIBCPP_INLINE_VISIBILITY
-        const __ignore_t& operator=(_Tp&&) const {return *this;}
-};
-
-namespace { const __ignore_t<unsigned char> ignore = __ignore_t<unsigned char>(); }
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY reference_wrapper;
-
-template <class _Tp>
-struct __make_tuple_return_impl
-{
-    typedef _Tp type;
-};
-
-template <class _Tp>
-struct __make_tuple_return_impl<reference_wrapper<_Tp> >
-{
-    typedef _Tp& type;
-};
-
-template <class _Tp>
-struct __make_tuple_return
-{
-    typedef typename __make_tuple_return_impl<typename decay<_Tp>::type>::type type;
-};
-
-template <class... _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-tuple<typename __make_tuple_return<_Tp>::type...>
-make_tuple(_Tp&&... __t)
-{
-    return tuple<typename __make_tuple_return<_Tp>::type...>(_VSTD::forward<_Tp>(__t)...);
-}
-
-template <class... _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-tuple<_Tp&&...>
-forward_as_tuple(_Tp&&... __t) _NOEXCEPT
-{
-    return tuple<_Tp&&...>(_VSTD::forward<_Tp>(__t)...);
-}
-
-template <size_t _Ip>
-struct __tuple_equal
-{
-    template <class _Tp, class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _Tp& __x, const _Up& __y)
-    {
-        return __tuple_equal<_Ip - 1>()(__x, __y) && _VSTD::get<_Ip-1>(__x) == _VSTD::get<_Ip-1>(__y);
-    }
-};
-
-template <>
-struct __tuple_equal<0>
-{
-    template <class _Tp, class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _Tp&, const _Up&)
-    {
-        return true;
-    }
-};
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return __tuple_equal<sizeof...(_Tp)>()(__x, __y);
-}
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return !(__x == __y);
-}
-
-template <size_t _Ip>
-struct __tuple_less
-{
-    template <class _Tp, class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _Tp& __x, const _Up& __y)
-    {
-        return __tuple_less<_Ip-1>()(__x, __y) ||
-             (!__tuple_less<_Ip-1>()(__y, __x) && _VSTD::get<_Ip-1>(__x) < _VSTD::get<_Ip-1>(__y));
-    }
-};
-
-template <>
-struct __tuple_less<0>
-{
-    template <class _Tp, class _Up>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    bool operator()(const _Tp&, const _Up&)
-    {
-        return false;
-    }
-};
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return __tuple_less<sizeof...(_Tp)>()(__x, __y);
-}
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return __y < __x;
-}
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>=(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class ..._Tp, class ..._Up>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<=(const tuple<_Tp...>& __x, const tuple<_Up...>& __y)
-{
-    return !(__y < __x);
-}
-
-// tuple_cat
-
-template <class _Tp, class _Up> struct __tuple_cat_type;
-
-template <class ..._Ttypes, class ..._Utypes>
-struct __tuple_cat_type<tuple<_Ttypes...>, __tuple_types<_Utypes...> >
-{
-    typedef tuple<_Ttypes..., _Utypes...> type;
-};
-
-template <class _ResultTuple, bool _Is_Tuple0TupleLike, class ..._Tuples>
-struct __tuple_cat_return_1
-{
-};
-
-template <class ..._Types, class _Tuple0>
-struct __tuple_cat_return_1<tuple<_Types...>, true, _Tuple0>
-{
-    typedef typename __tuple_cat_type<tuple<_Types...>,
-            typename __make_tuple_types<typename remove_reference<_Tuple0>::type>::type>::type
-                                                                           type;
-};
-
-template <class ..._Types, class _Tuple0, class _Tuple1, class ..._Tuples>
-struct __tuple_cat_return_1<tuple<_Types...>, true, _Tuple0, _Tuple1, _Tuples...>
-    : public __tuple_cat_return_1<
-                 typename __tuple_cat_type<
-                     tuple<_Types...>,
-                     typename __make_tuple_types<typename remove_reference<_Tuple0>::type>::type
-                 >::type,
-                 __tuple_like<typename remove_reference<_Tuple1>::type>::value,
-                 _Tuple1, _Tuples...>
-{
-};
-
-template <class ..._Tuples> struct __tuple_cat_return;
-
-template <class _Tuple0, class ..._Tuples>
-struct __tuple_cat_return<_Tuple0, _Tuples...>
-    : public __tuple_cat_return_1<tuple<>,
-         __tuple_like<typename remove_reference<_Tuple0>::type>::value, _Tuple0,
-                                                                     _Tuples...>
-{
-};
-
-template <>
-struct __tuple_cat_return<>
-{
-    typedef tuple<> type;
-};
-
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-tuple<>
-tuple_cat()
-{
-    return tuple<>();
-}
-
-template <class _Rp, class _Indices, class _Tuple0, class ..._Tuples>
-struct __tuple_cat_return_ref_imp;
-
-template <class ..._Types, size_t ..._I0, class _Tuple0>
-struct __tuple_cat_return_ref_imp<tuple<_Types...>, __tuple_indices<_I0...>, _Tuple0>
-{
-    typedef typename remove_reference<_Tuple0>::type _T0;
-    typedef tuple<_Types..., typename __apply_cv<_Tuple0,
-                          typename tuple_element<_I0, _T0>::type>::type&&...> type;
-};
-
-template <class ..._Types, size_t ..._I0, class _Tuple0, class _Tuple1, class ..._Tuples>
-struct __tuple_cat_return_ref_imp<tuple<_Types...>, __tuple_indices<_I0...>,
-                                  _Tuple0, _Tuple1, _Tuples...>
-    : public __tuple_cat_return_ref_imp<
-         tuple<_Types..., typename __apply_cv<_Tuple0,
-               typename tuple_element<_I0,
-                  typename remove_reference<_Tuple0>::type>::type>::type&&...>,
-         typename __make_tuple_indices<tuple_size<typename
-                                 remove_reference<_Tuple1>::type>::value>::type,
-         _Tuple1, _Tuples...>
-{
-};
-
-template <class _Tuple0, class ..._Tuples>
-struct __tuple_cat_return_ref
-    : public __tuple_cat_return_ref_imp<tuple<>,
-               typename __make_tuple_indices<
-                        tuple_size<typename remove_reference<_Tuple0>::type>::value
-               >::type, _Tuple0, _Tuples...>
-{
-};
-
-template <class _Types, class _I0, class _J0>
-struct __tuple_cat;
-
-template <class ..._Types, size_t ..._I0, size_t ..._J0>
-struct __tuple_cat<tuple<_Types...>, __tuple_indices<_I0...>, __tuple_indices<_J0...> >
-{
-    template <class _Tuple0>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    typename __tuple_cat_return_ref<tuple<_Types...>&&, _Tuple0&&>::type
-    operator()(tuple<_Types...> __t, _Tuple0&& __t0)
-    {
-        return forward_as_tuple(_VSTD::forward<_Types>(_VSTD::get<_I0>(__t))...,
-                                      _VSTD::get<_J0>(_VSTD::forward<_Tuple0>(__t0))...);
-    }
-
-    template <class _Tuple0, class _Tuple1, class ..._Tuples>
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    typename __tuple_cat_return_ref<tuple<_Types...>&&, _Tuple0&&, _Tuple1&&, _Tuples&&...>::type
-    operator()(tuple<_Types...> __t, _Tuple0&& __t0, _Tuple1&& __t1, _Tuples&& ...__tpls)
-    {
-        typedef typename remove_reference<_Tuple0>::type _T0;
-        typedef typename remove_reference<_Tuple1>::type _T1;
-        return __tuple_cat<
-           tuple<_Types..., typename __apply_cv<_Tuple0, typename tuple_element<_J0, _T0>::type>::type&&...>,
-           typename __make_tuple_indices<sizeof ...(_Types) + tuple_size<_T0>::value>::type,
-           typename __make_tuple_indices<tuple_size<_T1>::value>::type>()
-                           (forward_as_tuple(
-                              _VSTD::forward<_Types>(_VSTD::get<_I0>(__t))...,
-                              _VSTD::get<_J0>(_VSTD::forward<_Tuple0>(__t0))...
-                            ),
-                            _VSTD::forward<_Tuple1>(__t1),
-                            _VSTD::forward<_Tuples>(__tpls)...);
-    }
-};
-
-template <class _Tuple0, class... _Tuples>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename __tuple_cat_return<_Tuple0, _Tuples...>::type
-tuple_cat(_Tuple0&& __t0, _Tuples&&... __tpls)
-{
-    typedef typename remove_reference<_Tuple0>::type _T0;
-    return __tuple_cat<tuple<>, __tuple_indices<>,
-                  typename __make_tuple_indices<tuple_size<_T0>::value>::type>()
-                  (tuple<>(), _VSTD::forward<_Tuple0>(__t0),
-                                            _VSTD::forward<_Tuples>(__tpls)...);
-}
-
-template <class ..._Tp, class _Alloc>
-struct _LIBCPP_TYPE_VIS_ONLY uses_allocator<tuple<_Tp...>, _Alloc>
-    : true_type {};
-
-template <class _T1, class _T2>
-template <class... _Args1, class... _Args2, size_t ..._I1, size_t ..._I2>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_T1, _T2>::pair(piecewise_construct_t,
-                     tuple<_Args1...>& __first_args, tuple<_Args2...>& __second_args,
-                     __tuple_indices<_I1...>, __tuple_indices<_I2...>)
-    :  first(_VSTD::forward<_Args1>(_VSTD::get<_I1>( __first_args))...),
-      second(_VSTD::forward<_Args2>(_VSTD::get<_I2>(__second_args))...)
-{
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_TUPLE
diff --git a/include.new/c++/v1/type_traits b/include.new/c++/v1/type_traits
deleted file mode 100644
index 8612e57..0000000
--- a/include.new/c++/v1/type_traits
+++ /dev/null
@@ -1,3696 +0,0 @@
-// -*- C++ -*-
-//===------------------------ type_traits ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_TYPE_TRAITS
-#define _LIBCPP_TYPE_TRAITS
-
-/*
-    type_traits synopsis
-
-namespace std
-{
-
-    // helper class:
-    template <class T, T v> struct integral_constant;
-    typedef integral_constant<bool, true>  true_type;
-    typedef integral_constant<bool, false> false_type;
-
-    // helper traits
-    template <bool, class T = void> struct enable_if;
-    template <bool, class T, class F> struct conditional;
-
-    // Primary classification traits:
-    template <class T> struct is_void;
-    template <class T> struct is_null_pointer;  // C++14
-    template <class T> struct is_integral;
-    template <class T> struct is_floating_point;
-    template <class T> struct is_array;
-    template <class T> struct is_pointer;
-    template <class T> struct is_lvalue_reference;
-    template <class T> struct is_rvalue_reference;
-    template <class T> struct is_member_object_pointer;
-    template <class T> struct is_member_function_pointer;
-    template <class T> struct is_enum;
-    template <class T> struct is_union;
-    template <class T> struct is_class;
-    template <class T> struct is_function;
-
-    // Secondary classification traits:
-    template <class T> struct is_reference;
-    template <class T> struct is_arithmetic;
-    template <class T> struct is_fundamental;
-    template <class T> struct is_member_pointer;
-    template <class T> struct is_scalar;
-    template <class T> struct is_object;
-    template <class T> struct is_compound;
-
-    // Const-volatile properties and transformations:
-    template <class T> struct is_const;
-    template <class T> struct is_volatile;
-    template <class T> struct remove_const;
-    template <class T> struct remove_volatile;
-    template <class T> struct remove_cv;
-    template <class T> struct add_const;
-    template <class T> struct add_volatile;
-    template <class T> struct add_cv;
-
-    // Reference transformations:
-    template <class T> struct remove_reference;
-    template <class T> struct add_lvalue_reference;
-    template <class T> struct add_rvalue_reference;
-
-    // Pointer transformations:
-    template <class T> struct remove_pointer;
-    template <class T> struct add_pointer;
-
-    // Integral properties:
-    template <class T> struct is_signed;
-    template <class T> struct is_unsigned;
-    template <class T> struct make_signed;
-    template <class T> struct make_unsigned;
-
-    // Array properties and transformations:
-    template <class T> struct rank;
-    template <class T, unsigned I = 0> struct extent;
-    template <class T> struct remove_extent;
-    template <class T> struct remove_all_extents;
-
-    // Member introspection:
-    template <class T> struct is_pod;
-    template <class T> struct is_trivial;
-    template <class T> struct is_trivially_copyable;
-    template <class T> struct is_standard_layout;
-    template <class T> struct is_literal_type;
-    template <class T> struct is_empty;
-    template <class T> struct is_polymorphic;
-    template <class T> struct is_abstract;
-    template <class T> struct is_final; // C++14
-
-    template <class T, class... Args> struct is_constructible;
-    template <class T>                struct is_default_constructible;
-    template <class T>                struct is_copy_constructible;
-    template <class T>                struct is_move_constructible;
-    template <class T, class U>       struct is_assignable;
-    template <class T>                struct is_copy_assignable;
-    template <class T>                struct is_move_assignable;
-    template <class T>                struct is_destructible;
-
-    template <class T, class... Args> struct is_trivially_constructible;
-    template <class T>                struct is_trivially_default_constructible;
-    template <class T>                struct is_trivially_copy_constructible;
-    template <class T>                struct is_trivially_move_constructible;
-    template <class T, class U>       struct is_trivially_assignable;
-    template <class T>                struct is_trivially_copy_assignable;
-    template <class T>                struct is_trivially_move_assignable;
-    template <class T>                struct is_trivially_destructible;
-
-    template <class T, class... Args> struct is_nothrow_constructible;
-    template <class T>                struct is_nothrow_default_constructible;
-    template <class T>                struct is_nothrow_copy_constructible;
-    template <class T>                struct is_nothrow_move_constructible;
-    template <class T, class U>       struct is_nothrow_assignable;
-    template <class T>                struct is_nothrow_copy_assignable;
-    template <class T>                struct is_nothrow_move_assignable;
-    template <class T>                struct is_nothrow_destructible;
-
-    template <class T> struct has_virtual_destructor;
-
-    // Relationships between types:
-    template <class T, class U> struct is_same;
-    template <class Base, class Derived> struct is_base_of;
-    template <class From, class To> struct is_convertible;
-
-    // Alignment properties and transformations:
-    template <class T> struct alignment_of;
-    template <size_t Len, size_t Align = most_stringent_alignment_requirement>
-        struct aligned_storage;
-    template <size_t Len, class... Types> struct aligned_union;
-
-    template <class T> struct decay;
-    template <class... T> struct common_type;
-    template <class T> struct underlying_type;
-    template <class> class result_of; // undefined
-    template <class Fn, class... ArgTypes> class result_of<Fn(ArgTypes...)>;
-
-    // const-volatile modifications:
-    template <class T>
-      using remove_const_t    = typename remove_const<T>::type;  // C++14
-    template <class T>
-      using remove_volatile_t = typename remove_volatile<T>::type;  // C++14
-    template <class T>
-      using remove_cv_t       = typename remove_cv<T>::type;  // C++14
-    template <class T>
-      using add_const_t       = typename add_const<T>::type;  // C++14
-    template <class T>
-      using add_volatile_t    = typename add_volatile<T>::type;  // C++14
-    template <class T>
-      using add_cv_t          = typename add_cv<T>::type;  // C++14
-  
-    // reference modifications:
-    template <class T>
-      using remove_reference_t     = typename remove_reference<T>::type;  // C++14
-    template <class T>
-      using add_lvalue_reference_t = typename add_lvalue_reference<T>::type;  // C++14
-    template <class T>
-      using add_rvalue_reference_t = typename add_rvalue_reference<T>::type;  // C++14
-  
-    // sign modifications:
-    template <class T>
-      using make_signed_t   = typename make_signed<T>::type;  // C++14
-    template <class T>
-      using make_unsigned_t = typename make_unsigned<T>::type;  // C++14
-  
-    // array modifications:
-    template <class T>
-      using remove_extent_t      = typename remove_extent<T>::type;  // C++14
-    template <class T>
-      using remove_all_extents_t = typename remove_all_extents<T>::type;  // C++14
-
-    // pointer modifications:
-    template <class T>
-      using remove_pointer_t = typename remove_pointer<T>::type;  // C++14
-    template <class T>
-      using add_pointer_t    = typename add_pointer<T>::type;  // C++14
-
-    // other transformations:
-    template <size_t Len, std::size_t Align=default-alignment>
-      using aligned_storage_t = typename aligned_storage<Len,Align>::type;  // C++14
-    template <std::size_t Len, class... Types>
-      using aligned_union_t   = typename aligned_union<Len,Types...>::type;  // C++14
-    template <class T>
-      using decay_t           = typename decay<T>::type;  // C++14
-    template <bool b, class T=void>
-      using enable_if_t       = typename enable_if<b,T>::type;  // C++14
-    template <bool b, class T, class F>
-      using conditional_t     = typename conditional<b,T,F>::type;  // C++14
-    template <class... T>
-      using common_type_t     = typename common_type<T...>::type;  // C++14
-    template <class T>
-      using underlying_type_t = typename underlying_type<T>::type;  // C++14
-    template <class F, class... ArgTypes>
-      using result_of_t       = typename result_of<F(ArgTypes...)>::type;  // C++14
-
-    template <class...>
-      using void_t = void;
-}  // C++17
-
-*/
-#include <__config>
-#include <cstddef>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-template <class...> 
-struct __void_t { typedef void type; };
-#endif
-
-template <bool _Bp, class _If, class _Then>
-    struct _LIBCPP_TYPE_VIS_ONLY conditional {typedef _If type;};
-template <class _If, class _Then>
-    struct _LIBCPP_TYPE_VIS_ONLY conditional<false, _If, _Then> {typedef _Then type;};
-
-#if _LIBCPP_STD_VER > 11
-template <bool _Bp, class _If, class _Then> using conditional_t = typename conditional<_Bp, _If, _Then>::type;
-#endif
-
-template <bool, class _Tp> struct _LIBCPP_TYPE_VIS_ONLY __lazy_enable_if {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY __lazy_enable_if<true, _Tp> {typedef typename _Tp::type type;};
-
-template <bool, class _Tp = void> struct _LIBCPP_TYPE_VIS_ONLY enable_if {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY enable_if<true, _Tp> {typedef _Tp type;};
-
-#if _LIBCPP_STD_VER > 11
-template <bool _Bp, class _Tp = void> using enable_if_t = typename enable_if<_Bp, _Tp>::type;
-#endif
-
-
-struct __two {char __lx[2];};
-
-// helper class:
-
-template <class _Tp, _Tp __v>
-struct _LIBCPP_TYPE_VIS_ONLY integral_constant
-{
-    static _LIBCPP_CONSTEXPR const _Tp      value = __v;
-    typedef _Tp               value_type;
-    typedef integral_constant type;
-    _LIBCPP_INLINE_VISIBILITY
-        _LIBCPP_CONSTEXPR operator value_type() const _NOEXCEPT {return value;}
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY
-         constexpr value_type operator ()() const _NOEXCEPT {return value;}
-#endif
-};
-
-template <class _Tp, _Tp __v>
-_LIBCPP_CONSTEXPR const _Tp integral_constant<_Tp, __v>::value;
-
-typedef integral_constant<bool, true>  true_type;
-typedef integral_constant<bool, false> false_type;
-
-// is_const
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_const            : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_const<_Tp const> : public true_type {};
-
-// is_volatile
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_volatile               : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_volatile<_Tp volatile> : public true_type {};
-
-// remove_const
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_const            {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_const<const _Tp> {typedef _Tp type;};
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_const_t = typename remove_const<_Tp>::type;
-#endif
-
-// remove_volatile
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_volatile               {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_volatile<volatile _Tp> {typedef _Tp type;};
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_volatile_t = typename remove_volatile<_Tp>::type;
-#endif
-
-// remove_cv
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_cv
-{typedef typename remove_volatile<typename remove_const<_Tp>::type>::type type;};
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_cv_t = typename remove_cv<_Tp>::type;
-#endif
-
-// is_void
-
-template <class _Tp> struct __libcpp_is_void       : public false_type {};
-template <>          struct __libcpp_is_void<void> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_void
-    : public __libcpp_is_void<typename remove_cv<_Tp>::type> {};
-
-// __is_nullptr_t
-
-template <class _Tp> struct __is_nullptr_t_impl       : public false_type {};
-template <>          struct __is_nullptr_t_impl<nullptr_t> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY __is_nullptr_t
-    : public __is_nullptr_t_impl<typename remove_cv<_Tp>::type> {};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_null_pointer
-    : public __is_nullptr_t_impl<typename remove_cv<_Tp>::type> {};
-#endif
-
-// is_integral
-
-template <class _Tp> struct __libcpp_is_integral                     : public false_type {};
-template <>          struct __libcpp_is_integral<bool>               : public true_type {};
-template <>          struct __libcpp_is_integral<char>               : public true_type {};
-template <>          struct __libcpp_is_integral<signed char>        : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned char>      : public true_type {};
-template <>          struct __libcpp_is_integral<wchar_t>            : public true_type {};
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-template <>          struct __libcpp_is_integral<char16_t>           : public true_type {};
-template <>          struct __libcpp_is_integral<char32_t>           : public true_type {};
-#endif  // _LIBCPP_HAS_NO_UNICODE_CHARS
-template <>          struct __libcpp_is_integral<short>              : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned short>     : public true_type {};
-template <>          struct __libcpp_is_integral<int>                : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned int>       : public true_type {};
-template <>          struct __libcpp_is_integral<long>               : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned long>      : public true_type {};
-template <>          struct __libcpp_is_integral<long long>          : public true_type {};
-template <>          struct __libcpp_is_integral<unsigned long long> : public true_type {};
-#ifndef _LIBCPP_HAS_NO_INT128
-template <>          struct __libcpp_is_integral<__int128_t>         : public true_type {};
-template <>          struct __libcpp_is_integral<__uint128_t>        : public true_type {};
-#endif
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_integral
-    : public __libcpp_is_integral<typename remove_cv<_Tp>::type> {};
-
-// is_floating_point
-
-template <class _Tp> struct __libcpp_is_floating_point              : public false_type {};
-template <>          struct __libcpp_is_floating_point<float>       : public true_type {};
-template <>          struct __libcpp_is_floating_point<double>      : public true_type {};
-template <>          struct __libcpp_is_floating_point<long double> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_floating_point
-    : public __libcpp_is_floating_point<typename remove_cv<_Tp>::type> {};
-
-// is_array
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_array
-    : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_array<_Tp[]>
-    : public true_type {};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY is_array<_Tp[_Np]>
-    : public true_type {};
-
-// is_pointer
-
-template <class _Tp> struct __libcpp_is_pointer       : public false_type {};
-template <class _Tp> struct __libcpp_is_pointer<_Tp*> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_pointer
-    : public __libcpp_is_pointer<typename remove_cv<_Tp>::type> {};
-
-// is_reference
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_lvalue_reference       : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_lvalue_reference<_Tp&> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_rvalue_reference        : public false_type {};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_rvalue_reference<_Tp&&> : public true_type {};
-#endif
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_reference        : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_reference<_Tp&>  : public true_type {};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_reference<_Tp&&> : public true_type {};
-#endif
-
-// is_union
-
-#if __has_feature(is_union) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_union
-    : public integral_constant<bool, __is_union(_Tp)> {};
-
-#else
-
-template <class _Tp> struct __libcpp_union : public false_type {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_union
-    : public __libcpp_union<typename remove_cv<_Tp>::type> {};
-
-#endif
-
-// is_class
-
-#if __has_feature(is_class) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_class
-    : public integral_constant<bool, __is_class(_Tp)> {};
-
-#else
-
-namespace __is_class_imp
-{
-template <class _Tp> char  __test(int _Tp::*);
-template <class _Tp> __two __test(...);
-}
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_class
-    : public integral_constant<bool, sizeof(__is_class_imp::__test<_Tp>(0)) == 1 && !is_union<_Tp>::value> {};
-
-#endif
-
-// is_same
-
-template <class _Tp, class _Up> struct _LIBCPP_TYPE_VIS_ONLY is_same           : public false_type {};
-template <class _Tp>            struct _LIBCPP_TYPE_VIS_ONLY is_same<_Tp, _Tp> : public true_type {};
-
-// is_function
-
-namespace __libcpp_is_function_imp
-{
-template <class _Tp> char  __test(_Tp*);
-template <class _Tp> __two __test(...);
-template <class _Tp> _Tp&  __source();
-}
-
-template <class _Tp, bool = is_class<_Tp>::value ||
-                            is_union<_Tp>::value ||
-                            is_void<_Tp>::value  ||
-                            is_reference<_Tp>::value ||
-                            __is_nullptr_t<_Tp>::value >
-struct __libcpp_is_function
-    : public integral_constant<bool, sizeof(__libcpp_is_function_imp::__test<_Tp>(__libcpp_is_function_imp::__source<_Tp>())) == 1>
-    {};
-template <class _Tp> struct __libcpp_is_function<_Tp, true> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_function
-    : public __libcpp_is_function<_Tp> {};
-
-// is_member_function_pointer
-
-// template <class _Tp> struct            __libcpp_is_member_function_pointer             : public false_type {};
-// template <class _Tp, class _Up> struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {};
-// 
-
-template <class _MP, bool _IsMemberFuctionPtr, bool _IsMemberObjectPtr>
-struct __member_pointer_traits_imp
-{  // forward declaration; specializations later
-};
-
-
-namespace __libcpp_is_member_function_pointer_imp {
-    template <typename _Tp>
-    char __test(typename std::__member_pointer_traits_imp<_Tp, true, false>::_FnType *);
-
-    template <typename>
-    std::__two __test(...);
-};
-    
-template <class _Tp> struct __libcpp_is_member_function_pointer
-    : public integral_constant<bool, sizeof(__libcpp_is_member_function_pointer_imp::__test<_Tp>(nullptr)) == 1> {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_member_function_pointer
-    : public __libcpp_is_member_function_pointer<typename remove_cv<_Tp>::type> {};
-
-// is_member_pointer
-
-template <class _Tp>            struct __libcpp_is_member_pointer             : public false_type {};
-template <class _Tp, class _Up> struct __libcpp_is_member_pointer<_Tp _Up::*> : public true_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_member_pointer
-    : public __libcpp_is_member_pointer<typename remove_cv<_Tp>::type> {};
-
-// is_member_object_pointer
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_member_object_pointer
-    : public integral_constant<bool, is_member_pointer<_Tp>::value &&
-                                    !is_member_function_pointer<_Tp>::value> {};
-
-// is_enum
-
-#if __has_feature(is_enum) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_enum
-    : public integral_constant<bool, __is_enum(_Tp)> {};
-
-#else
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_enum
-    : public integral_constant<bool, !is_void<_Tp>::value             &&
-                                     !is_integral<_Tp>::value         &&
-                                     !is_floating_point<_Tp>::value   &&
-                                     !is_array<_Tp>::value            &&
-                                     !is_pointer<_Tp>::value          &&
-                                     !is_reference<_Tp>::value        &&
-                                     !is_member_pointer<_Tp>::value   &&
-                                     !is_union<_Tp>::value            &&
-                                     !is_class<_Tp>::value            &&
-                                     !is_function<_Tp>::value         > {};
-
-#endif
-
-// is_arithmetic
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_arithmetic
-    : public integral_constant<bool, is_integral<_Tp>::value      ||
-                                     is_floating_point<_Tp>::value> {};
-
-// is_fundamental
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_fundamental
-    : public integral_constant<bool, is_void<_Tp>::value        ||
-                                     __is_nullptr_t<_Tp>::value ||
-                                     is_arithmetic<_Tp>::value> {};
-
-// is_scalar
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_scalar
-    : public integral_constant<bool, is_arithmetic<_Tp>::value     ||
-                                     is_member_pointer<_Tp>::value ||
-                                     is_pointer<_Tp>::value        ||
-                                     __is_nullptr_t<_Tp>::value    ||
-                                     is_enum<_Tp>::value           > {};
-
-template <> struct _LIBCPP_TYPE_VIS_ONLY is_scalar<nullptr_t> : public true_type {};
-
-// is_object
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_object
-    : public integral_constant<bool, is_scalar<_Tp>::value ||
-                                     is_array<_Tp>::value  ||
-                                     is_union<_Tp>::value  ||
-                                     is_class<_Tp>::value  > {};
-
-// is_compound
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_compound
-    : public integral_constant<bool, !is_fundamental<_Tp>::value> {};
-
-// add_const
-
-template <class _Tp, bool = is_reference<_Tp>::value ||
-                            is_function<_Tp>::value  ||
-                            is_const<_Tp>::value     >
-struct __add_const             {typedef _Tp type;};
-
-template <class _Tp>
-struct __add_const<_Tp, false> {typedef const _Tp type;};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_const
-    {typedef typename __add_const<_Tp>::type type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_const_t = typename add_const<_Tp>::type;
-#endif
-
-// add_volatile
-
-template <class _Tp, bool = is_reference<_Tp>::value ||
-                            is_function<_Tp>::value  ||
-                            is_volatile<_Tp>::value  >
-struct __add_volatile             {typedef _Tp type;};
-
-template <class _Tp>
-struct __add_volatile<_Tp, false> {typedef volatile _Tp type;};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_volatile
-    {typedef typename __add_volatile<_Tp>::type type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_volatile_t = typename add_volatile<_Tp>::type;
-#endif
-
-// add_cv
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_cv
-    {typedef typename add_const<typename add_volatile<_Tp>::type>::type type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_cv_t = typename add_cv<_Tp>::type;
-#endif
-
-// remove_reference
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_reference        {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_reference<_Tp&>  {typedef _Tp type;};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_reference<_Tp&&> {typedef _Tp type;};
-#endif
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_reference_t = typename remove_reference<_Tp>::type;
-#endif
-
-// add_lvalue_reference
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference                      {typedef _Tp& type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<_Tp&>                {typedef _Tp& type;};  // for older compiler
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<void>                {typedef void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<const void>          {typedef const void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<volatile void>       {typedef volatile void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_lvalue_reference<const volatile void> {typedef const volatile void type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_lvalue_reference_t = typename add_lvalue_reference<_Tp>::type;
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY  add_rvalue_reference                     {typedef _Tp&& type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_rvalue_reference<void>                {typedef void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_rvalue_reference<const void>          {typedef const void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_rvalue_reference<volatile void>       {typedef volatile void type;};
-template <>          struct _LIBCPP_TYPE_VIS_ONLY add_rvalue_reference<const volatile void> {typedef const volatile void type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_rvalue_reference_t = typename add_rvalue_reference<_Tp>::type;
-#endif
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-typename add_rvalue_reference<_Tp>::type
-declval() _NOEXCEPT;
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-typename add_lvalue_reference<_Tp>::type
-declval();
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-struct __any
-{
-    __any(...);
-};
-
-// remove_pointer
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer                      {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer<_Tp*>                {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer<_Tp* const>          {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer<_Tp* volatile>       {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_pointer<_Tp* const volatile> {typedef _Tp type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_pointer_t = typename remove_pointer<_Tp>::type;
-#endif
-
-// add_pointer
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY add_pointer
-    {typedef typename remove_reference<_Tp>::type* type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using add_pointer_t = typename add_pointer<_Tp>::type;
-#endif
-
-// is_signed
-
-template <class _Tp, bool = is_integral<_Tp>::value>
-struct __libcpp_is_signed_impl : public integral_constant<bool, _Tp(-1) < _Tp(0)> {};
-
-template <class _Tp>
-struct __libcpp_is_signed_impl<_Tp, false> : public true_type {};  // floating point
-
-template <class _Tp, bool = is_arithmetic<_Tp>::value>
-struct __libcpp_is_signed : public __libcpp_is_signed_impl<_Tp> {};
-
-template <class _Tp> struct __libcpp_is_signed<_Tp, false> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_signed : public __libcpp_is_signed<_Tp> {};
-
-// is_unsigned
-
-template <class _Tp, bool = is_integral<_Tp>::value>
-struct __libcpp_is_unsigned_impl : public integral_constant<bool, _Tp(0) < _Tp(-1)> {};
-
-template <class _Tp>
-struct __libcpp_is_unsigned_impl<_Tp, false> : public false_type {};  // floating point
-
-template <class _Tp, bool = is_arithmetic<_Tp>::value>
-struct __libcpp_is_unsigned : public __libcpp_is_unsigned_impl<_Tp> {};
-
-template <class _Tp> struct __libcpp_is_unsigned<_Tp, false> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_unsigned : public __libcpp_is_unsigned<_Tp> {};
-
-// rank
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY rank
-    : public integral_constant<size_t, 0> {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY rank<_Tp[]>
-    : public integral_constant<size_t, rank<_Tp>::value + 1> {};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY rank<_Tp[_Np]>
-    : public integral_constant<size_t, rank<_Tp>::value + 1> {};
-
-// extent
-
-template <class _Tp, unsigned _Ip = 0> struct _LIBCPP_TYPE_VIS_ONLY extent
-    : public integral_constant<size_t, 0> {};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY extent<_Tp[], 0>
-    : public integral_constant<size_t, 0> {};
-template <class _Tp, unsigned _Ip> struct _LIBCPP_TYPE_VIS_ONLY extent<_Tp[], _Ip>
-    : public integral_constant<size_t, extent<_Tp, _Ip-1>::value> {};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY extent<_Tp[_Np], 0>
-    : public integral_constant<size_t, _Np> {};
-template <class _Tp, size_t _Np, unsigned _Ip> struct _LIBCPP_TYPE_VIS_ONLY extent<_Tp[_Np], _Ip>
-    : public integral_constant<size_t, extent<_Tp, _Ip-1>::value> {};
-
-// remove_extent
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_extent
-    {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_extent<_Tp[]>
-    {typedef _Tp type;};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY remove_extent<_Tp[_Np]>
-    {typedef _Tp type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_extent_t = typename remove_extent<_Tp>::type;
-#endif
-
-// remove_all_extents
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_all_extents
-    {typedef _Tp type;};
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY remove_all_extents<_Tp[]>
-    {typedef typename remove_all_extents<_Tp>::type type;};
-template <class _Tp, size_t _Np> struct _LIBCPP_TYPE_VIS_ONLY remove_all_extents<_Tp[_Np]>
-    {typedef typename remove_all_extents<_Tp>::type type;};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using remove_all_extents_t = typename remove_all_extents<_Tp>::type;
-#endif
-
-// decay
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY decay
-{
-private:
-    typedef typename remove_reference<_Tp>::type _Up;
-public:
-    typedef typename conditional
-                     <
-                         is_array<_Up>::value,
-                         typename remove_extent<_Up>::type*,
-                         typename conditional
-                         <
-                              is_function<_Up>::value,
-                              typename add_pointer<_Up>::type,
-                              typename remove_cv<_Up>::type
-                         >::type
-                     >::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using decay_t = typename decay<_Tp>::type;
-#endif
-
-// is_abstract
-
-namespace __is_abstract_imp
-{
-template <class _Tp> char  __test(_Tp (*)[1]);
-template <class _Tp> __two __test(...);
-}
-
-template <class _Tp, bool = is_class<_Tp>::value>
-struct __libcpp_abstract : public integral_constant<bool, sizeof(__is_abstract_imp::__test<_Tp>(0)) != 1> {};
-
-template <class _Tp> struct __libcpp_abstract<_Tp, false> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_abstract : public __libcpp_abstract<_Tp> {};
-
-// is_final
-
-#if _LIBCPP_STD_VER > 11 && __has_feature(is_final)
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY 
-is_final : public integral_constant<bool, __is_final(_Tp)> {};
-#endif
-
-// is_base_of
-
-#ifdef _LIBCPP_HAS_IS_BASE_OF
-
-template <class _Bp, class _Dp>
-struct _LIBCPP_TYPE_VIS_ONLY is_base_of
-    : public integral_constant<bool, __is_base_of(_Bp, _Dp)> {};
-
-#else  // _LIBCPP_HAS_IS_BASE_OF
-
-namespace __is_base_of_imp
-{
-template <class _Tp>
-struct _Dst
-{
-    _Dst(const volatile _Tp &);
-};
-template <class _Tp>
-struct _Src
-{
-    operator const volatile _Tp &();
-    template <class _Up> operator const _Dst<_Up> &();
-};
-template <size_t> struct __one { typedef char type; };
-template <class _Bp, class _Dp> typename __one<sizeof(_Dst<_Bp>(declval<_Src<_Dp> >()))>::type __test(int);
-template <class _Bp, class _Dp> __two __test(...);
-}
-
-template <class _Bp, class _Dp>
-struct _LIBCPP_TYPE_VIS_ONLY is_base_of
-    : public integral_constant<bool, is_class<_Bp>::value &&
-                                     sizeof(__is_base_of_imp::__test<_Bp, _Dp>(0)) == 2> {};
-
-#endif  // _LIBCPP_HAS_IS_BASE_OF
-
-// is_convertible
-
-#if __has_feature(is_convertible_to)
-
-template <class _T1, class _T2> struct _LIBCPP_TYPE_VIS_ONLY is_convertible
-    : public integral_constant<bool, __is_convertible_to(_T1, _T2) &&
-                                     !is_abstract<_T2>::value> {};
-
-#else  // __has_feature(is_convertible_to)
-
-namespace __is_convertible_imp
-{
-template <class _Tp> void  __test_convert(_Tp);
-
-template <class _From, class _To, class = void>
-struct __is_convertible_test : public false_type {};
-
-template <class _From, class _To>
-struct __is_convertible_test<_From, _To,
-    decltype(__test_convert<_To>(_VSTD::declval<_From>()))> : public true_type
-{};
-
-template <class _Tp> __two __test(...);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _Tp> _Tp&& __source();
-#else
-template <class _Tp> typename remove_reference<_Tp>::type& __source();
-#endif
-
-template <class _Tp, bool _IsArray =    is_array<_Tp>::value,
-                     bool _IsFunction = is_function<_Tp>::value,
-                     bool _IsVoid =     is_void<_Tp>::value>
-                     struct __is_array_function_or_void                          {enum {value = 0};};
-template <class _Tp> struct __is_array_function_or_void<_Tp, true, false, false> {enum {value = 1};};
-template <class _Tp> struct __is_array_function_or_void<_Tp, false, true, false> {enum {value = 2};};
-template <class _Tp> struct __is_array_function_or_void<_Tp, false, false, true> {enum {value = 3};};
-}
-
-template <class _Tp,
-    unsigned = __is_convertible_imp::__is_array_function_or_void<typename remove_reference<_Tp>::type>::value>
-struct __is_convertible_check
-{
-    static const size_t __v = 0;
-};
-
-template <class _Tp>
-struct __is_convertible_check<_Tp, 0>
-{
-    static const size_t __v = sizeof(_Tp);
-};
-
-template <class _T1, class _T2,
-    unsigned _T1_is_array_function_or_void = __is_convertible_imp::__is_array_function_or_void<_T1>::value,
-    unsigned _T2_is_array_function_or_void = __is_convertible_imp::__is_array_function_or_void<_T2>::value>
-struct __is_convertible
-    : public integral_constant<bool,
-        __is_convertible_imp::__is_convertible_test<_T1, _T2>::value
-#if defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-         && !(!is_function<_T1>::value && !is_reference<_T1>::value && is_reference<_T2>::value
-              && (!is_const<typename remove_reference<_T2>::type>::value
-                  || is_volatile<typename remove_reference<_T2>::type>::value)
-                  && (is_same<typename remove_cv<_T1>::type,
-                              typename remove_cv<typename remove_reference<_T2>::type>::type>::value
-                      || is_base_of<typename remove_reference<_T2>::type, _T1>::value))
-#endif
-    >
-{};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 1, 0> : false_type {};
-
-template <class _T1> struct __is_convertible<_T1, const _T1&, 1, 0> : true_type {};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _T1> struct __is_convertible<_T1, _T1&&, 1, 0> : true_type {};
-template <class _T1> struct __is_convertible<_T1, const _T1&&, 1, 0> : true_type {};
-template <class _T1> struct __is_convertible<_T1, volatile _T1&&, 1, 0> : true_type {};
-template <class _T1> struct __is_convertible<_T1, const volatile _T1&&, 1, 0> : true_type {};
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2*, 1, 0>
-    : public integral_constant<bool, __is_convertible<typename remove_all_extents<_T1>::type*, _T2*>::value> {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2* const, 1, 0>
-    : public integral_constant<bool, __is_convertible<typename remove_all_extents<_T1>::type*, _T2*const>::value> {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2* volatile, 1, 0>
-    : public integral_constant<bool, __is_convertible<typename remove_all_extents<_T1>::type*, _T2*volatile>::value> {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2* const volatile, 1, 0>
-    : public integral_constant<bool, __is_convertible<typename remove_all_extents<_T1>::type*, _T2*const volatile>::value> {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 2, 0>                : public false_type {};
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-template <class _T1>            struct __is_convertible<_T1, _T1&&, 2, 0>               : public true_type {};
-#endif
-template <class _T1>            struct __is_convertible<_T1, _T1&, 2, 0>               : public true_type {};
-template <class _T1>            struct __is_convertible<_T1, _T1*, 2, 0>               : public true_type {};
-template <class _T1>            struct __is_convertible<_T1, _T1*const, 2, 0>          : public true_type {};
-template <class _T1>            struct __is_convertible<_T1, _T1*volatile, 2, 0>       : public true_type {};
-template <class _T1>            struct __is_convertible<_T1, _T1*const volatile, 2, 0> : public true_type {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 3, 0> : public false_type {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 0, 1> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 1, 1> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 2, 1> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 3, 1> : public false_type {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 0, 2> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 1, 2> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 2, 2> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 3, 2> : public false_type {};
-
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 0, 3> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 1, 3> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 2, 3> : public false_type {};
-template <class _T1, class _T2> struct __is_convertible<_T1, _T2, 3, 3> : public true_type {};
-
-template <class _T1, class _T2> struct _LIBCPP_TYPE_VIS_ONLY is_convertible
-    : public __is_convertible<_T1, _T2>
-{
-    static const size_t __complete_check1 = __is_convertible_check<_T1>::__v;
-    static const size_t __complete_check2 = __is_convertible_check<_T2>::__v;
-};
-
-#endif  // __has_feature(is_convertible_to)
-
-// is_empty
-
-#if __has_feature(is_empty) || (_GNUC_VER >= 407)
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_empty
-    : public integral_constant<bool, __is_empty(_Tp)> {};
-
-#else  // __has_feature(is_empty)
-
-template <class _Tp>
-struct __is_empty1
-    : public _Tp
-{
-    double __lx;
-};
-
-struct __is_empty2
-{
-    double __lx;
-};
-
-template <class _Tp, bool = is_class<_Tp>::value>
-struct __libcpp_empty : public integral_constant<bool, sizeof(__is_empty1<_Tp>) == sizeof(__is_empty2)> {};
-
-template <class _Tp> struct __libcpp_empty<_Tp, false> : public false_type {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_empty : public __libcpp_empty<_Tp> {};
-
-#endif  // __has_feature(is_empty)
-
-// is_polymorphic
-
-#if __has_feature(is_polymorphic) || defined(_LIBCPP_MSVC)
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_polymorphic
-    : public integral_constant<bool, __is_polymorphic(_Tp)> {};
-
-#else
-
-template<typename _Tp> char &__is_polymorphic_impl(
-    typename enable_if<sizeof((_Tp*)dynamic_cast<const volatile void*>(declval<_Tp*>())) != 0,
-                       int>::type);
-template<typename _Tp> __two &__is_polymorphic_impl(...);
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_polymorphic
-    : public integral_constant<bool, sizeof(__is_polymorphic_impl<_Tp>(0)) == 1> {};
-
-#endif // __has_feature(is_polymorphic)
-
-// has_virtual_destructor
-
-#if __has_feature(has_virtual_destructor) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY has_virtual_destructor
-    : public integral_constant<bool, __has_virtual_destructor(_Tp)> {};
-
-#else
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY has_virtual_destructor
-    : public false_type {};
-
-#endif
-
-// alignment_of
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY alignment_of
-    : public integral_constant<size_t, __alignof__(_Tp)> {};
-
-// aligned_storage
-
-template <class _Hp, class _Tp>
-struct __type_list
-{
-    typedef _Hp _Head;
-    typedef _Tp _Tail;
-};
-
-struct __nat
-{
-#ifndef _LIBCPP_HAS_NO_DELETED_FUNCTIONS
-    __nat() = delete;
-    __nat(const __nat&) = delete;
-    __nat& operator=(const __nat&) = delete;
-    ~__nat() = delete;
-#endif
-};
-
-template <class _Tp>
-struct __align_type
-{
-    static const size_t value = alignment_of<_Tp>::value;
-    typedef _Tp type;
-};
-
-struct __struct_double {long double __lx;};
-struct __struct_double4 {double __lx[4];};
-
-typedef
-    __type_list<__align_type<unsigned char>,
-    __type_list<__align_type<unsigned short>,
-    __type_list<__align_type<unsigned int>,
-    __type_list<__align_type<unsigned long>,
-    __type_list<__align_type<unsigned long long>,
-    __type_list<__align_type<double>,
-    __type_list<__align_type<long double>,
-    __type_list<__align_type<__struct_double>,
-    __type_list<__align_type<__struct_double4>,
-    __type_list<__align_type<int*>,
-    __nat
-    > > > > > > > > > > __all_types;
-
-template <class _TL, size_t _Align> struct __find_pod;
-
-template <class _Hp, size_t _Align>
-struct __find_pod<__type_list<_Hp, __nat>, _Align>
-{
-    typedef typename conditional<
-                             _Align == _Hp::value,
-                             typename _Hp::type,
-                             void
-                         >::type type;
-};
-
-template <class _Hp, class _Tp, size_t _Align>
-struct __find_pod<__type_list<_Hp, _Tp>, _Align>
-{
-    typedef typename conditional<
-                             _Align == _Hp::value,
-                             typename _Hp::type,
-                             typename __find_pod<_Tp, _Align>::type
-                         >::type type;
-};
-
-template <class _TL, size_t _Len> struct __find_max_align;
-
-template <class _Hp, size_t _Len>
-struct __find_max_align<__type_list<_Hp, __nat>, _Len> : public integral_constant<size_t, _Hp::value> {};
-
-template <size_t _Len, size_t _A1, size_t _A2>
-struct __select_align
-{
-private:
-    static const size_t __min = _A2 < _A1 ? _A2 : _A1;
-    static const size_t __max = _A1 < _A2 ? _A2 : _A1;
-public:
-    static const size_t value = _Len < __max ? __min : __max;
-};
-
-template <class _Hp, class _Tp, size_t _Len>
-struct __find_max_align<__type_list<_Hp, _Tp>, _Len>
-    : public integral_constant<size_t, __select_align<_Len, _Hp::value, __find_max_align<_Tp, _Len>::value>::value> {};
-
-template <size_t _Len, size_t _Align = __find_max_align<__all_types, _Len>::value>
-struct _LIBCPP_TYPE_VIS_ONLY aligned_storage
-{
-    typedef typename __find_pod<__all_types, _Align>::type _Aligner;
-    static_assert(!is_void<_Aligner>::value, "");
-    union type
-    {
-        _Aligner __align;
-        unsigned char __data[_Len];
-    };
-};
-
-#if _LIBCPP_STD_VER > 11
-template <size_t _Len, size_t _Align = __find_max_align<__all_types, _Len>::value>
-    using aligned_storage_t = typename aligned_storage<_Len, _Align>::type;
-#endif
-
-#define _CREATE_ALIGNED_STORAGE_SPECIALIZATION(n) \
-template <size_t _Len>\
-struct _LIBCPP_TYPE_VIS_ONLY aligned_storage<_Len, n>\
-{\
-    struct _ALIGNAS(n) type\
-    {\
-        unsigned char __lx[_Len];\
-    };\
-}
-
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x1);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x2);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x4);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x8);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x10);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x20);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x40);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x80);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x100);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x200);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x400);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x800);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x1000);
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x2000);
-// MSDN says that MSVC does not support alignment beyond 8192 (=0x2000)
-#if !defined(_LIBCPP_MSVC)
-_CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x4000);
-#endif // !_LIBCPP_MSVC
-
-#undef _CREATE_ALIGNED_STORAGE_SPECIALIZATION
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// aligned_union
-
-template <size_t _I0, size_t ..._In>
-struct __static_max;
-
-template <size_t _I0>
-struct __static_max<_I0>
-{
-    static const size_t value = _I0;
-};
-
-template <size_t _I0, size_t _I1, size_t ..._In>
-struct __static_max<_I0, _I1, _In...>
-{
-    static const size_t value = _I0 >= _I1 ? __static_max<_I0, _In...>::value :
-                                             __static_max<_I1, _In...>::value;
-};
-
-template <size_t _Len, class _Type0, class ..._Types>
-struct aligned_union
-{
-    static const size_t alignment_value = __static_max<__alignof__(_Type0),
-                                                       __alignof__(_Types)...>::value;
-    static const size_t __len = __static_max<_Len, sizeof(_Type0),
-                                             sizeof(_Types)...>::value;
-    typedef typename aligned_storage<__len, alignment_value>::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <size_t _Len, class ..._Types> using aligned_union_t = typename aligned_union<_Len, _Types...>::type;
-#endif
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp>
-struct __numeric_type
-{
-   static void __test(...);
-   static float __test(float);
-   static double __test(char);
-   static double __test(int);
-   static double __test(unsigned);
-   static double __test(long);
-   static double __test(unsigned long);
-   static double __test(long long);
-   static double __test(unsigned long long);
-   static double __test(double);
-   static long double __test(long double);
-
-   typedef decltype(__test(declval<_Tp>())) type;
-   static const bool value = !is_same<type, void>::value;
-};
-
-template <>
-struct __numeric_type<void>
-{
-   static const bool value = true;
-};
-
-// __promote
-
-template <class _A1, class _A2 = void, class _A3 = void,
-          bool = __numeric_type<_A1>::value &&
-                 __numeric_type<_A2>::value &&
-                 __numeric_type<_A3>::value>
-class __promote_imp
-{
-public:
-    static const bool value = false;
-};
-
-template <class _A1, class _A2, class _A3>
-class __promote_imp<_A1, _A2, _A3, true>
-{
-private:
-    typedef typename __promote_imp<_A1>::type __type1;
-    typedef typename __promote_imp<_A2>::type __type2;
-    typedef typename __promote_imp<_A3>::type __type3;
-public:
-    typedef decltype(__type1() + __type2() + __type3()) type;
-    static const bool value = true;
-};
-
-template <class _A1, class _A2>
-class __promote_imp<_A1, _A2, void, true>
-{
-private:
-    typedef typename __promote_imp<_A1>::type __type1;
-    typedef typename __promote_imp<_A2>::type __type2;
-public:
-    typedef decltype(__type1() + __type2()) type;
-    static const bool value = true;
-};
-
-template <class _A1>
-class __promote_imp<_A1, void, void, true>
-{
-public:
-    typedef typename __numeric_type<_A1>::type type;
-    static const bool value = true;
-};
-
-template <class _A1, class _A2 = void, class _A3 = void>
-class __promote : public __promote_imp<_A1, _A2, _A3> {};
-
-#ifdef _LIBCPP_STORE_AS_OPTIMIZATION
-
-// __transform
-
-template <class _Tp, size_t = sizeof(_Tp), bool = is_scalar<_Tp>::value> struct __transform {typedef _Tp type;};
-template <class _Tp> struct __transform<_Tp, 1, true> {typedef unsigned char      type;};
-template <class _Tp> struct __transform<_Tp, 2, true> {typedef unsigned short     type;};
-template <class _Tp> struct __transform<_Tp, 4, true> {typedef unsigned int       type;};
-template <class _Tp> struct __transform<_Tp, 8, true> {typedef unsigned long long type;};
-
-#endif  // _LIBCPP_STORE_AS_OPTIMIZATION
-
-// make_signed / make_unsigned
-
-typedef
-    __type_list<signed char,
-    __type_list<signed short,
-    __type_list<signed int,
-    __type_list<signed long,
-    __type_list<signed long long,
-#ifndef _LIBCPP_HAS_NO_INT128
-    __type_list<__int128_t,
-#endif
-    __nat
-#ifndef _LIBCPP_HAS_NO_INT128
-    >
-#endif
-    > > > > > __signed_types;
-
-typedef
-    __type_list<unsigned char,
-    __type_list<unsigned short,
-    __type_list<unsigned int,
-    __type_list<unsigned long,
-    __type_list<unsigned long long,
-#ifndef _LIBCPP_HAS_NO_INT128
-    __type_list<__uint128_t,
-#endif
-    __nat
-#ifndef _LIBCPP_HAS_NO_INT128
-    >
-#endif
-    > > > > > __unsigned_types;
-
-template <class _TypeList, size_t _Size, bool = _Size <= sizeof(typename _TypeList::_Head)> struct __find_first;
-
-template <class _Hp, class _Tp, size_t _Size>
-struct __find_first<__type_list<_Hp, _Tp>, _Size, true>
-{
-    typedef _Hp type;
-};
-
-template <class _Hp, class _Tp, size_t _Size>
-struct __find_first<__type_list<_Hp, _Tp>, _Size, false>
-{
-    typedef typename __find_first<_Tp, _Size>::type type;
-};
-
-template <class _Tp, class _Up, bool = is_const<typename remove_reference<_Tp>::type>::value,
-                             bool = is_volatile<typename remove_reference<_Tp>::type>::value>
-struct __apply_cv
-{
-    typedef _Up type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp, _Up, true, false>
-{
-    typedef const _Up type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp, _Up, false, true>
-{
-    typedef volatile _Up type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp, _Up, true, true>
-{
-    typedef const volatile _Up type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp&, _Up, false, false>
-{
-    typedef _Up& type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp&, _Up, true, false>
-{
-    typedef const _Up& type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp&, _Up, false, true>
-{
-    typedef volatile _Up& type;
-};
-
-template <class _Tp, class _Up>
-struct __apply_cv<_Tp&, _Up, true, true>
-{
-    typedef const volatile _Up& type;
-};
-
-template <class _Tp, bool = is_integral<_Tp>::value || is_enum<_Tp>::value>
-struct __make_signed {};
-
-template <class _Tp>
-struct __make_signed<_Tp, true>
-{
-    typedef typename __find_first<__signed_types, sizeof(_Tp)>::type type;
-};
-
-template <> struct __make_signed<bool,               true> {};
-template <> struct __make_signed<  signed short,     true> {typedef short     type;};
-template <> struct __make_signed<unsigned short,     true> {typedef short     type;};
-template <> struct __make_signed<  signed int,       true> {typedef int       type;};
-template <> struct __make_signed<unsigned int,       true> {typedef int       type;};
-template <> struct __make_signed<  signed long,      true> {typedef long      type;};
-template <> struct __make_signed<unsigned long,      true> {typedef long      type;};
-template <> struct __make_signed<  signed long long, true> {typedef long long type;};
-template <> struct __make_signed<unsigned long long, true> {typedef long long type;};
-#ifndef _LIBCPP_HAS_NO_INT128
-template <> struct __make_signed<__int128_t,         true> {typedef __int128_t type;};
-template <> struct __make_signed<__uint128_t,        true> {typedef __int128_t type;};
-#endif
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY make_signed
-{
-    typedef typename __apply_cv<_Tp, typename __make_signed<typename remove_cv<_Tp>::type>::type>::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using make_signed_t = typename make_signed<_Tp>::type;
-#endif
-
-template <class _Tp, bool = is_integral<_Tp>::value || is_enum<_Tp>::value>
-struct __make_unsigned {};
-
-template <class _Tp>
-struct __make_unsigned<_Tp, true>
-{
-    typedef typename __find_first<__unsigned_types, sizeof(_Tp)>::type type;
-};
-
-template <> struct __make_unsigned<bool,               true> {};
-template <> struct __make_unsigned<  signed short,     true> {typedef unsigned short     type;};
-template <> struct __make_unsigned<unsigned short,     true> {typedef unsigned short     type;};
-template <> struct __make_unsigned<  signed int,       true> {typedef unsigned int       type;};
-template <> struct __make_unsigned<unsigned int,       true> {typedef unsigned int       type;};
-template <> struct __make_unsigned<  signed long,      true> {typedef unsigned long      type;};
-template <> struct __make_unsigned<unsigned long,      true> {typedef unsigned long      type;};
-template <> struct __make_unsigned<  signed long long, true> {typedef unsigned long long type;};
-template <> struct __make_unsigned<unsigned long long, true> {typedef unsigned long long type;};
-#ifndef _LIBCPP_HAS_NO_INT128
-template <> struct __make_unsigned<__int128_t,         true> {typedef __uint128_t        type;};
-template <> struct __make_unsigned<__uint128_t,        true> {typedef __uint128_t        type;};
-#endif
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY make_unsigned
-{
-    typedef typename __apply_cv<_Tp, typename __make_unsigned<typename remove_cv<_Tp>::type>::type>::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using make_unsigned_t = typename make_unsigned<_Tp>::type;
-#endif
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Up = void, class V = void>
-struct _LIBCPP_TYPE_VIS_ONLY common_type
-{
-public:
-    typedef typename common_type<typename common_type<_Tp, _Up>::type, V>::type type;
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp, void, void>
-{
-public:
-    typedef typename decay<_Tp>::type type;
-};
-
-template <class _Tp, class _Up>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp, _Up, void>
-{
-private:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    static _Tp&& __t();
-    static _Up&& __u();
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    static _Tp __t();
-    static _Up __u();
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-public:
-    typedef typename remove_reference<decltype(true ? __t() : __u())>::type type;
-};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class ..._Tp> struct common_type;
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp>
-{
-    typedef typename decay<_Tp>::type type;
-};
-
-template <class _Tp, class _Up>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp, _Up>
-{
-private:
-    static _Tp&& __t();
-    static _Up&& __u();
-    static bool __f();
-public:
-    typedef typename decay<decltype(__f() ? __t() : __u())>::type type;
-};
-
-template <class _Tp, class _Up, class ..._Vp>
-struct _LIBCPP_TYPE_VIS_ONLY common_type<_Tp, _Up, _Vp...>
-{
-    typedef typename common_type<typename common_type<_Tp, _Up>::type, _Vp...>::type type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class ..._Tp> using common_type_t = typename common_type<_Tp...>::type;
-#endif
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-// is_assignable
-
-template<typename, typename _Tp> struct __select_2nd { typedef _Tp type; };
-
-template <class _Tp, class _Arg>
-typename __select_2nd<decltype((_VSTD::declval<_Tp>() = _VSTD::declval<_Arg>())), true_type>::type
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__is_assignable_test(_Tp&&, _Arg&&);
-#else
-__is_assignable_test(_Tp, _Arg&);
-#endif
-
-template <class _Arg>
-false_type
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-__is_assignable_test(__any, _Arg&&);
-#else
-__is_assignable_test(__any, _Arg&);
-#endif
-
-template <class _Tp, class _Arg, bool = is_void<_Tp>::value || is_void<_Arg>::value>
-struct __is_assignable_imp
-    : public common_type
-        <
-            decltype(__is_assignable_test(declval<_Tp>(), declval<_Arg>()))
-        >::type {};
-
-template <class _Tp, class _Arg>
-struct __is_assignable_imp<_Tp, _Arg, true>
-    : public false_type
-{
-};
-
-template <class _Tp, class _Arg>
-struct is_assignable
-    : public __is_assignable_imp<_Tp, _Arg> {};
-
-// is_copy_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_copy_assignable
-    : public is_assignable<typename add_lvalue_reference<_Tp>::type,
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_move_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_move_assignable
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    : public is_assignable<typename add_lvalue_reference<_Tp>::type,
-                     const typename add_rvalue_reference<_Tp>::type> {};
-#else
-    : public is_copy_assignable<_Tp> {};
-#endif
-
-// is_destructible
-
-//  if it's a reference, return true
-//  if it's a function, return false
-//  if it's   void,     return false
-//  if it's an array of unknown bound, return false
-//  Otherwise, return "std::declval<_Up&>().~_Up()" is well-formed
-//    where _Up is remove_all_extents<_Tp>::type
-
-template <class>
-struct __is_destructible_apply { typedef int type; };
-
-template <typename _Tp>
-struct __is_destructor_wellformed {
-    template <typename _Tp1>
-    static char  __test (
-        typename __is_destructible_apply<decltype(_VSTD::declval<_Tp1&>().~_Tp1())>::type
-    );
-
-    template <typename _Tp1>
-    static __two __test (...);
-    
-    static const bool value = sizeof(__test<_Tp>(12)) == sizeof(char);
-};
-
-template <class _Tp, bool>
-struct __destructible_imp;
-
-template <class _Tp>
-struct __destructible_imp<_Tp, false> 
-   : public _VSTD::integral_constant<bool, 
-        __is_destructor_wellformed<typename _VSTD::remove_all_extents<_Tp>::type>::value> {};
-
-template <class _Tp>
-struct __destructible_imp<_Tp, true>
-    : public _VSTD::true_type {};
-
-template <class _Tp, bool>
-struct __destructible_false;
-
-template <class _Tp>
-struct __destructible_false<_Tp, false> : public __destructible_imp<_Tp, _VSTD::is_reference<_Tp>::value> {};
-
-template <class _Tp>
-struct __destructible_false<_Tp, true> : public _VSTD::false_type {};
-
-template <class _Tp>
-struct is_destructible
-    : public __destructible_false<_Tp, _VSTD::is_function<_Tp>::value> {};
-
-template <class _Tp>
-struct is_destructible<_Tp[]>
-    : public _VSTD::false_type {};
-
-template <>
-struct is_destructible<void>
-    : public _VSTD::false_type {};
-
-// move
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename remove_reference<_Tp>::type&&
-move(_Tp&& __t) _NOEXCEPT
-{
-    typedef typename remove_reference<_Tp>::type _Up;
-    return static_cast<_Up&&>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&&
-forward(typename std::remove_reference<_Tp>::type& __t) _NOEXCEPT
-{
-    return static_cast<_Tp&&>(__t);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-_Tp&&
-forward(typename std::remove_reference<_Tp>::type&& __t) _NOEXCEPT
-{
-    static_assert(!std::is_lvalue_reference<_Tp>::value,
-                  "Can not forward an rvalue as an lvalue.");
-    return static_cast<_Tp&&>(__t);
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp&
-move(_Tp& __t)
-{
-    return __t;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const _Tp&
-move(const _Tp& __t)
-{
-    return __t;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp&
-forward(typename std::remove_reference<_Tp>::type& __t) _NOEXCEPT
-{
-    return __t;
-}
-
-
-template <class _Tp>
-class __rv
-{
-    typedef typename remove_reference<_Tp>::type _Trr;
-    _Trr& t_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    _Trr* operator->() {return &t_;}
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __rv(_Trr& __t) : t_(__t) {}
-};
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename decay<_Tp>::type
-__decay_copy(_Tp&& __t)
-{
-    return _VSTD::forward<_Tp>(__t);
-}
-
-#else
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-typename decay<_Tp>::type
-__decay_copy(const _Tp& __t)
-{
-    return _VSTD::forward<_Tp>(__t);
-}
-
-#endif
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-#if __has_feature(cxx_reference_qualified_functions)
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) &, true, false>
-{
-    typedef _Class& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) &, true, false>
-{
-    typedef _Class& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const&, true, false>
-{
-    typedef _Class const& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const&, true, false>
-{
-    typedef _Class const& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) volatile&, true, false>
-{
-    typedef _Class volatile& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) volatile&, true, false>
-{
-    typedef _Class volatile& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const volatile&, true, false>
-{
-    typedef _Class const volatile& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatile&, true, false>
-{
-    typedef _Class const volatile& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) &&, true, false>
-{
-    typedef _Class&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) &&, true, false>
-{
-    typedef _Class&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const&&, true, false>
-{
-    typedef _Class const&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const&&, true, false>
-{
-    typedef _Class const&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) volatile&&, true, false>
-{
-    typedef _Class volatile&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) volatile&&, true, false>
-{
-    typedef _Class volatile&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param...) const volatile&&, true, false>
-{
-    typedef _Class const volatile&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param...);
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_Param..., ...) const volatile&&, true, false>
-{
-    typedef _Class const volatile&& _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_Param..., ...);
-};
-
-#endif  // __has_feature(cxx_reference_qualified_functions)
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) ();
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (...);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...), true, false>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)() const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) ();
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (...);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...) const, true, false>
-{
-    typedef _Class const _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)() volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) ();
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (...);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...) volatile, true, false>
-{
-    typedef _Class volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)() const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) ();
-};
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (...);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0);
-};
-
-template <class _Rp, class _Class, class _P0>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, ...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, ...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, ...);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2);
-};
-
-template <class _Rp, class _Class, class _P0, class _P1, class _P2>
-struct __member_pointer_traits_imp<_Rp (_Class::*)(_P0, _P1, _P2, ...) const volatile, true, false>
-{
-    typedef _Class const volatile _ClassType;
-    typedef _Rp _ReturnType;
-    typedef _Rp (_FnType) (_P0, _P1, _P2, ...);
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Rp, class _Class>
-struct __member_pointer_traits_imp<_Rp _Class::*, false, true>
-{
-    typedef _Class _ClassType;
-    typedef _Rp _ReturnType;
-};
-
-template <class _MP>
-struct __member_pointer_traits
-    : public __member_pointer_traits_imp<typename remove_cv<_MP>::type,
-                    is_member_function_pointer<_MP>::value,
-                    is_member_object_pointer<_MP>::value>
-{
-//     typedef ... _ClassType;
-//     typedef ... _ReturnType;
-//     typedef ... _FnType;
-};
-
-// result_of
-
-template <class _Callable> class result_of;
-
-#ifdef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Fn, bool, bool>
-class __result_of
-{
-};
-
-template <class _Fn>
-class __result_of<_Fn(), true, false>
-{
-public:
-    typedef decltype(declval<_Fn>()()) type;
-};
-
-template <class _Fn, class _A0>
-class __result_of<_Fn(_A0), true, false>
-{
-public:
-    typedef decltype(declval<_Fn>()(declval<_A0>())) type;
-};
-
-template <class _Fn, class _A0, class _A1>
-class __result_of<_Fn(_A0, _A1), true, false>
-{
-public:
-    typedef decltype(declval<_Fn>()(declval<_A0>(), declval<_A1>())) type;
-};
-
-template <class _Fn, class _A0, class _A1, class _A2>
-class __result_of<_Fn(_A0, _A1, _A2), true, false>
-{
-public:
-    typedef decltype(declval<_Fn>()(declval<_A0>(), declval<_A1>(), declval<_A2>())) type;
-};
-
-template <class _MP, class _Tp, bool _IsMemberFunctionPtr>
-struct __result_of_mp;
-
-// member function pointer
-
-template <class _MP, class _Tp>
-struct __result_of_mp<_MP, _Tp, true>
-    : public common_type<typename __member_pointer_traits<_MP>::_ReturnType>
-{
-};
-
-// member data pointer
-
-template <class _MP, class _Tp, bool>
-struct __result_of_mdp;
-
-template <class _Rp, class _Class, class _Tp>
-struct __result_of_mdp<_Rp _Class::*, _Tp, false>
-{
-    typedef typename __apply_cv<decltype(*_VSTD::declval<_Tp>()), _Rp>::type& type;
-};
-
-template <class _Rp, class _Class, class _Tp>
-struct __result_of_mdp<_Rp _Class::*, _Tp, true>
-{
-    typedef typename __apply_cv<_Tp, _Rp>::type& type;
-};
-
-template <class _Rp, class _Class, class _Tp>
-struct __result_of_mp<_Rp _Class::*, _Tp, false>
-    : public __result_of_mdp<_Rp _Class::*, _Tp,
-            is_base_of<_Class, typename remove_reference<_Tp>::type>::value>
-{
-};
-
-
-
-template <class _Fn, class _Tp>
-class __result_of<_Fn(_Tp), false, true>  // _Fn must be member pointer
-    : public __result_of_mp<typename remove_reference<_Fn>::type,
-                            _Tp,
-                            is_member_function_pointer<typename remove_reference<_Fn>::type>::value>
-{
-};
-
-template <class _Fn, class _Tp, class _A0>
-class __result_of<_Fn(_Tp, _A0), false, true>  // _Fn must be member pointer
-    : public __result_of_mp<typename remove_reference<_Fn>::type,
-                            _Tp,
-                            is_member_function_pointer<typename remove_reference<_Fn>::type>::value>
-{
-};
-
-template <class _Fn, class _Tp, class _A0, class _A1>
-class __result_of<_Fn(_Tp, _A0, _A1), false, true>  // _Fn must be member pointer
-    : public __result_of_mp<typename remove_reference<_Fn>::type,
-                            _Tp,
-                            is_member_function_pointer<typename remove_reference<_Fn>::type>::value>
-{
-};
-
-template <class _Fn, class _Tp, class _A0, class _A1, class _A2>
-class __result_of<_Fn(_Tp, _A0, _A1, _A2), false, true>  // _Fn must be member pointer
-    : public __result_of_mp<typename remove_reference<_Fn>::type,
-                            _Tp,
-                            is_member_function_pointer<typename remove_reference<_Fn>::type>::value>
-{
-};
-
-// result_of
-
-template <class _Fn>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fn()>
-    : public __result_of<_Fn(),
-                         is_class<typename remove_reference<_Fn>::type>::value ||
-                         is_function<typename remove_reference<_Fn>::type>::value,
-                         is_member_pointer<typename remove_reference<_Fn>::type>::value
-                        >
-{
-};
-
-template <class _Fn, class _A0>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fn(_A0)>
-    : public __result_of<_Fn(_A0),
-                         is_class<typename remove_reference<_Fn>::type>::value ||
-                         is_function<typename remove_reference<_Fn>::type>::value,
-                         is_member_pointer<typename remove_reference<_Fn>::type>::value
-                        >
-{
-};
-
-template <class _Fn, class _A0, class _A1>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fn(_A0, _A1)>
-    : public __result_of<_Fn(_A0, _A1),
-                         is_class<typename remove_reference<_Fn>::type>::value ||
-                         is_function<typename remove_reference<_Fn>::type>::value,
-                         is_member_pointer<typename remove_reference<_Fn>::type>::value
-                        >
-{
-};
-
-template <class _Fn, class _A0, class _A1, class _A2>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fn(_A0, _A1, _A2)>
-    : public __result_of<_Fn(_A0, _A1, _A2),
-                         is_class<typename remove_reference<_Fn>::type>::value ||
-                         is_function<typename remove_reference<_Fn>::type>::value,
-                         is_member_pointer<typename remove_reference<_Fn>::type>::value
-                        >
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-// template <class T, class... Args> struct is_constructible;
-
-namespace __is_construct
-{
-struct __nat {};
-}
-
-#if __has_feature(is_constructible)
-
-template <class _Tp, class ..._Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible
-    : public integral_constant<bool, __is_constructible(_Tp, _Args...)>
-    {};
-
-#else
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-//      main is_constructible test
-
-template <class _Tp, class ..._Args>
-typename __select_2nd<decltype(_VSTD::move(_Tp(_VSTD::declval<_Args>()...))), true_type>::type
-__is_constructible_test(_Tp&&, _Args&& ...);
-
-template <class ..._Args>
-false_type
-__is_constructible_test(__any, _Args&& ...);
-
-template <bool, class _Tp, class... _Args>
-struct __libcpp_is_constructible // false, _Tp is not a scalar
-    : public common_type
-             <
-                 decltype(__is_constructible_test(declval<_Tp>(), declval<_Args>()...))
-             >::type
-    {};
-
-//      function types are not constructible
-
-template <class _Rp, class... _A1, class... _A2>
-struct __libcpp_is_constructible<false, _Rp(_A1...), _A2...>
-    : public false_type
-    {};
-
-//      handle scalars and reference types
-
-//      Scalars are default constructible, references are not
-
-template <class _Tp>
-struct __libcpp_is_constructible<true, _Tp>
-    : public is_scalar<_Tp>
-    {};
-
-//      Scalars and references are constructible from one arg if that arg is
-//          implicitly convertible to the scalar or reference.
-
-template <class _Tp>
-struct __is_constructible_ref
-{
-    true_type static __lxx(_Tp);
-    false_type static __lxx(...);
-};
-
-template <class _Tp, class _A0>
-struct __libcpp_is_constructible<true, _Tp, _A0>
-    : public common_type
-             <
-                 decltype(__is_constructible_ref<_Tp>::__lxx(declval<_A0>()))
-             >::type
-    {};
-
-//      Scalars and references are not constructible from multiple args.
-
-template <class _Tp, class _A0, class ..._Args>
-struct __libcpp_is_constructible<true, _Tp, _A0, _Args...>
-    : public false_type
-    {};
-
-//      Treat scalars and reference types separately
-
-template <bool, class _Tp, class... _Args>
-struct __is_constructible_void_check
-    : public __libcpp_is_constructible<is_scalar<_Tp>::value || is_reference<_Tp>::value,
-                                _Tp, _Args...>
-    {};
-
-//      If any of T or Args is void, is_constructible should be false
-
-template <class _Tp, class... _Args>
-struct __is_constructible_void_check<true, _Tp, _Args...>
-    : public false_type
-    {};
-
-template <class ..._Args> struct __contains_void;
-
-template <> struct __contains_void<> : false_type {};
-
-template <class _A0, class ..._Args>
-struct __contains_void<_A0, _Args...>
-{
-    static const bool value = is_void<_A0>::value ||
-                              __contains_void<_Args...>::value;
-};
-
-//      is_constructible entry point
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible
-    : public __is_constructible_void_check<__contains_void<_Tp, _Args...>::value
-                                        || is_abstract<_Tp>::value,
-                                           _Tp, _Args...>
-    {};
-
-//      Array types are default constructible if their element type
-//      is default constructible
-
-template <class _Ap, size_t _Np>
-struct __libcpp_is_constructible<false, _Ap[_Np]>
-    : public is_constructible<typename remove_all_extents<_Ap>::type>
-    {};
-
-//      Otherwise array types are not constructible by this syntax
-
-template <class _Ap, size_t _Np, class ..._Args>
-struct __libcpp_is_constructible<false, _Ap[_Np], _Args...>
-    : public false_type
-    {};
-
-//      Incomplete array types are not constructible
-
-template <class _Ap, class ..._Args>
-struct __libcpp_is_constructible<false, _Ap[], _Args...>
-    : public false_type
-    {};
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-// template <class T> struct is_constructible0;
-
-//      main is_constructible0 test
-
-template <class _Tp>
-decltype((_Tp(), true_type()))
-__is_constructible0_test(_Tp&);
-
-false_type
-__is_constructible0_test(__any);
-
-template <class _Tp, class _A0>
-decltype((_Tp(_VSTD::declval<_A0>()), true_type()))
-__is_constructible1_test(_Tp&, _A0&);
-
-template <class _A0>
-false_type
-__is_constructible1_test(__any, _A0&);
-
-template <class _Tp, class _A0, class _A1>
-decltype((_Tp(_VSTD::declval<_A0>(), _VSTD::declval<_A1>()), true_type()))
-__is_constructible2_test(_Tp&, _A0&, _A1&);
-
-template <class _A0, class _A1>
-false_type
-__is_constructible2_test(__any, _A0&, _A1&);
-
-template <bool, class _Tp>
-struct __is_constructible0_imp // false, _Tp is not a scalar
-    : public common_type
-             <
-                 decltype(__is_constructible0_test(declval<_Tp&>()))
-             >::type
-    {};
-
-template <bool, class _Tp, class _A0>
-struct __is_constructible1_imp // false, _Tp is not a scalar
-    : public common_type
-             <
-                 decltype(__is_constructible1_test(declval<_Tp&>(), declval<_A0&>()))
-             >::type
-    {};
-
-template <bool, class _Tp, class _A0, class _A1>
-struct __is_constructible2_imp // false, _Tp is not a scalar
-    : public common_type
-             <
-                 decltype(__is_constructible2_test(declval<_Tp&>(), declval<_A0>(), declval<_A1>()))
-             >::type
-    {};
-
-//      handle scalars and reference types
-
-//      Scalars are default constructible, references are not
-
-template <class _Tp>
-struct __is_constructible0_imp<true, _Tp>
-    : public is_scalar<_Tp>
-    {};
-
-template <class _Tp, class _A0>
-struct __is_constructible1_imp<true, _Tp, _A0>
-    : public is_convertible<_A0, _Tp>
-    {};
-
-template <class _Tp, class _A0, class _A1>
-struct __is_constructible2_imp<true, _Tp, _A0, _A1>
-    : public false_type
-    {};
-
-//      Treat scalars and reference types separately
-
-template <bool, class _Tp>
-struct __is_constructible0_void_check
-    : public __is_constructible0_imp<is_scalar<_Tp>::value || is_reference<_Tp>::value,
-                                _Tp>
-    {};
-
-template <bool, class _Tp, class _A0>
-struct __is_constructible1_void_check
-    : public __is_constructible1_imp<is_scalar<_Tp>::value || is_reference<_Tp>::value,
-                                _Tp, _A0>
-    {};
-
-template <bool, class _Tp, class _A0, class _A1>
-struct __is_constructible2_void_check
-    : public __is_constructible2_imp<is_scalar<_Tp>::value || is_reference<_Tp>::value,
-                                _Tp, _A0, _A1>
-    {};
-
-//      If any of T or Args is void, is_constructible should be false
-
-template <class _Tp>
-struct __is_constructible0_void_check<true, _Tp>
-    : public false_type
-    {};
-
-template <class _Tp, class _A0>
-struct __is_constructible1_void_check<true, _Tp, _A0>
-    : public false_type
-    {};
-
-template <class _Tp, class _A0, class _A1>
-struct __is_constructible2_void_check<true, _Tp, _A0, _A1>
-    : public false_type
-    {};
-
-//      is_constructible entry point
-
-template <class _Tp, class _A0 = __is_construct::__nat,
-                     class _A1 = __is_construct::__nat>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible
-    : public __is_constructible2_void_check<is_void<_Tp>::value
-                                        || is_abstract<_Tp>::value
-                                        || is_function<_Tp>::value
-                                        || is_void<_A0>::value
-                                        || is_void<_A1>::value,
-                                           _Tp, _A0, _A1>
-    {};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible<_Tp, __is_construct::__nat, __is_construct::__nat>
-    : public __is_constructible0_void_check<is_void<_Tp>::value
-                                        || is_abstract<_Tp>::value
-                                        || is_function<_Tp>::value,
-                                           _Tp>
-    {};
-
-template <class _Tp, class _A0>
-struct _LIBCPP_TYPE_VIS_ONLY is_constructible<_Tp, _A0, __is_construct::__nat>
-    : public __is_constructible1_void_check<is_void<_Tp>::value
-                                        || is_abstract<_Tp>::value
-                                        || is_function<_Tp>::value
-                                        || is_void<_A0>::value,
-                                           _Tp, _A0>
-    {};
-
-//      Array types are default constructible if their element type
-//      is default constructible
-
-template <class _Ap, size_t _Np>
-struct __is_constructible0_imp<false, _Ap[_Np]>
-    : public is_constructible<typename remove_all_extents<_Ap>::type>
-    {};
-
-template <class _Ap, size_t _Np, class _A0>
-struct __is_constructible1_imp<false, _Ap[_Np], _A0>
-    : public false_type
-    {};
-
-template <class _Ap, size_t _Np, class _A0, class _A1>
-struct __is_constructible2_imp<false, _Ap[_Np], _A0, _A1>
-    : public false_type
-    {};
-
-//      Incomplete array types are not constructible
-
-template <class _Ap>
-struct __is_constructible0_imp<false, _Ap[]>
-    : public false_type
-    {};
-
-template <class _Ap, class _A0>
-struct __is_constructible1_imp<false, _Ap[], _A0>
-    : public false_type
-    {};
-
-template <class _Ap, class _A0, class _A1>
-struct __is_constructible2_imp<false, _Ap[], _A0, _A1>
-    : public false_type
-    {};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // __has_feature(is_constructible)
-
-// is_default_constructible
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_default_constructible
-    : public is_constructible<_Tp>
-    {};
-
-// is_copy_constructible
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_copy_constructible
-    : public is_constructible<_Tp, 
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_move_constructible
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_move_constructible
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    : public is_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
-#else
-    : public is_copy_constructible<_Tp>
-#endif
-    {};
-
-// is_trivially_constructible
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-#if __has_feature(is_trivially_constructible)
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible
-    : integral_constant<bool, __is_trivially_constructible(_Tp, _Args...)>
-{
-};
-
-#else  // !__has_feature(is_trivially_constructible)
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible
-    : false_type
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp>
-#if __has_feature(has_trivial_constructor) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_trivial_constructor(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp&&>
-#else
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp>
-#endif
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, const _Tp&>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp&>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-#endif  // !__has_feature(is_trivially_constructible)
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _A0 = __is_construct::__nat,
-                     class _A1 = __is_construct::__nat>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible
-    : false_type
-{
-};
-
-#if __has_feature(is_trivially_constructible)
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, __is_construct::__nat,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, __is_trivially_constructible(_Tp)>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, __is_trivially_constructible(_Tp, _Tp)>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, const _Tp&,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, __is_trivially_constructible(_Tp, const _Tp&)>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp&,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, __is_trivially_constructible(_Tp, _Tp&)>
-{
-};
-
-#else  // !__has_feature(is_trivially_constructible)
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, __is_construct::__nat,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, const _Tp&,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_trivially_constructible<_Tp, _Tp&,
-                                                       __is_construct::__nat>
-    : integral_constant<bool, is_scalar<_Tp>::value>
-{
-};
-
-#endif  // !__has_feature(is_trivially_constructible)
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-// is_trivially_default_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_default_constructible
-    : public is_trivially_constructible<_Tp>
-    {};
-
-// is_trivially_copy_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_copy_constructible
-    : public is_trivially_constructible<_Tp, typename add_lvalue_reference<const _Tp>::type>
-    {};
-
-// is_trivially_move_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_move_constructible
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    : public is_trivially_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
-#else
-    : public is_trivially_copy_constructible<_Tp>
-#endif
-    {};
-
-// is_trivially_assignable
-
-#if __has_feature(is_trivially_assignable)
-
-template <class _Tp, class _Arg>
-struct is_trivially_assignable
-    : integral_constant<bool, __is_trivially_assignable(_Tp, _Arg)>
-{
-};
-
-#else  // !__has_feature(is_trivially_assignable)
-
-template <class _Tp, class _Arg>
-struct is_trivially_assignable
-    : public false_type {};
-
-template <class _Tp>
-struct is_trivially_assignable<_Tp&, _Tp>
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-
-template <class _Tp>
-struct is_trivially_assignable<_Tp&, _Tp&>
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-
-template <class _Tp>
-struct is_trivially_assignable<_Tp&, const _Tp&>
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-struct is_trivially_assignable<_Tp&, _Tp&&>
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#endif  // !__has_feature(is_trivially_assignable)
-
-// is_trivially_copy_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_copy_assignable
-    : public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_trivially_move_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_move_assignable
-    : public is_trivially_assignable<typename add_lvalue_reference<_Tp>::type,
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-                                     typename add_rvalue_reference<_Tp>::type>
-#else
-                                     typename add_lvalue_reference<_Tp>::type>
-#endif
-    {};
-
-// is_trivially_destructible
-
-#if __has_feature(has_trivial_destructor) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_destructible
-    : public integral_constant<bool, is_destructible<_Tp>::value && __has_trivial_destructor(_Tp)> {};
-
-#else
-
-template <class _Tp> struct __libcpp_trivial_destructor
-    : public integral_constant<bool, is_scalar<_Tp>::value ||
-                                     is_reference<_Tp>::value> {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_destructible
-    : public __libcpp_trivial_destructor<typename remove_all_extents<_Tp>::type> {};
-
-#endif
-
-// is_nothrow_constructible
-
-#if 0
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible
-    : public integral_constant<bool, __is_nothrow_constructible(_Tp(_Args...))>
-{
-};
-
-#else
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-#if __has_feature(cxx_noexcept) || (_GNUC_VER >= 407 && __cplusplus >= 201103L)
-
-template <bool, bool, class _Tp, class... _Args> struct __libcpp_is_nothrow_constructible;
-
-template <class _Tp, class... _Args>
-struct __libcpp_is_nothrow_constructible</*is constructible*/true, /*is reference*/false, _Tp, _Args...>
-    : public integral_constant<bool, noexcept(_Tp(declval<_Args>()...))>
-{
-};
-
-template <class _Tp>
-void __implicit_conversion_to(_Tp) noexcept { }
-
-template <class _Tp, class _Arg>
-struct __libcpp_is_nothrow_constructible</*is constructible*/true, /*is reference*/true, _Tp, _Arg>
-    : public integral_constant<bool, noexcept(__implicit_conversion_to<_Tp>(declval<_Arg>()))>
-{
-};
-
-template <class _Tp, bool _IsReference, class... _Args>
-struct __libcpp_is_nothrow_constructible</*is constructible*/false, _IsReference, _Tp, _Args...>
-    : public false_type
-{
-};
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible
-    : __libcpp_is_nothrow_constructible<is_constructible<_Tp, _Args...>::value, is_reference<_Tp>::value, _Tp, _Args...>
-{
-};
-
-template <class _Tp, size_t _Ns>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp[_Ns]>
-    : __libcpp_is_nothrow_constructible<is_constructible<_Tp>::value, is_reference<_Tp>::value, _Tp>
-{
-};
-
-#else  // __has_feature(cxx_noexcept)
-
-template <class _Tp, class... _Args>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible
-    : false_type
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp>
-#if __has_feature(has_nothrow_constructor) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_constructor(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp&&>
-#else
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp>
-#endif
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, const _Tp&>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp&>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-#endif  // __has_feature(cxx_noexcept)
-
-#else  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _A0 = __is_construct::__nat,
-                     class _A1 = __is_construct::__nat>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible
-    : false_type
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, __is_construct::__nat,
-                                                       __is_construct::__nat>
-#if __has_feature(has_nothrow_constructor) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_constructor(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp,
-                                                       __is_construct::__nat>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, const _Tp&,
-                                                       __is_construct::__nat>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_constructible<_Tp, _Tp&,
-                                                       __is_construct::__nat>
-#if __has_feature(has_nothrow_copy) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_copy(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value>
-#endif
-{
-};
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // __has_feature(is_nothrow_constructible)
-
-// is_nothrow_default_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_default_constructible
-    : public is_nothrow_constructible<_Tp>
-    {};
-
-// is_nothrow_copy_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_copy_constructible
-    : public is_nothrow_constructible<_Tp,
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_nothrow_move_constructible
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_move_constructible
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    : public is_nothrow_constructible<_Tp, typename add_rvalue_reference<_Tp>::type>
-#else
-    : public is_nothrow_copy_constructible<_Tp>
-#endif
-    {};
-
-// is_nothrow_assignable
-
-#if __has_feature(cxx_noexcept) || (_GNUC_VER >= 407 && __cplusplus >= 201103L)
-
-template <bool, class _Tp, class _Arg> struct __libcpp_is_nothrow_assignable;
-
-template <class _Tp, class _Arg>
-struct __libcpp_is_nothrow_assignable<false, _Tp, _Arg>
-    : public false_type
-{
-};
-
-template <class _Tp, class _Arg>
-struct __libcpp_is_nothrow_assignable<true, _Tp, _Arg>
-    : public integral_constant<bool, noexcept(_VSTD::declval<_Tp>() = _VSTD::declval<_Arg>()) >
-{
-};
-
-template <class _Tp, class _Arg>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable
-    : public __libcpp_is_nothrow_assignable<is_assignable<_Tp, _Arg>::value, _Tp, _Arg>
-{
-};
-
-#else  // __has_feature(cxx_noexcept)
-
-template <class _Tp, class _Arg>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable
-    : public false_type {};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable<_Tp&, _Tp>
-#if __has_feature(has_nothrow_assign) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-#endif
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable<_Tp&, _Tp&>
-#if __has_feature(has_nothrow_assign) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-#endif
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_assignable<_Tp&, const _Tp&>
-#if __has_feature(has_nothrow_assign) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-#endif
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-struct is_nothrow_assignable<_Tp&, _Tp&&>
-#if __has_feature(has_nothrow_assign) || (_GNUC_VER >= 403)
-    : integral_constant<bool, __has_nothrow_assign(_Tp)> {};
-#else
-    : integral_constant<bool, is_scalar<_Tp>::value> {};
-#endif
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#endif  // __has_feature(cxx_noexcept)
-
-// is_nothrow_copy_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_copy_assignable
-    : public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,
-                  typename add_lvalue_reference<typename add_const<_Tp>::type>::type> {};
-
-// is_nothrow_move_assignable
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_move_assignable
-    : public is_nothrow_assignable<typename add_lvalue_reference<_Tp>::type,
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-                                     typename add_rvalue_reference<_Tp>::type>
-#else
-                                     typename add_lvalue_reference<_Tp>::type>
-#endif
-    {};
-
-// is_nothrow_destructible
-
-#if __has_feature(cxx_noexcept) || (_GNUC_VER >= 407 && __cplusplus >= 201103L)
-
-template <bool, class _Tp> struct __libcpp_is_nothrow_destructible;
-
-template <class _Tp>
-struct __libcpp_is_nothrow_destructible<false, _Tp>
-    : public false_type
-{
-};
-
-template <class _Tp>
-struct __libcpp_is_nothrow_destructible<true, _Tp>
-    : public integral_constant<bool, noexcept(_VSTD::declval<_Tp>().~_Tp()) >
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible
-    : public __libcpp_is_nothrow_destructible<is_destructible<_Tp>::value, _Tp>
-{
-};
-
-template <class _Tp, size_t _Ns>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible<_Tp[_Ns]>
-    : public is_nothrow_destructible<_Tp>
-{
-};
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible<_Tp&>
-    : public true_type
-{
-};
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible<_Tp&&>
-    : public true_type
-{
-};
-
-#endif
-
-#else
-
-template <class _Tp> struct __libcpp_nothrow_destructor
-    : public integral_constant<bool, is_scalar<_Tp>::value ||
-                                     is_reference<_Tp>::value> {};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_nothrow_destructible
-    : public __libcpp_nothrow_destructor<typename remove_all_extents<_Tp>::type> {};
-
-#endif
-
-// is_pod
-
-#if __has_feature(is_pod) || (_GNUC_VER >= 403)
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_pod
-    : public integral_constant<bool, __is_pod(_Tp)> {};
-
-#else
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_pod
-    : public integral_constant<bool, is_trivially_default_constructible<_Tp>::value   &&
-                                     is_trivially_copy_constructible<_Tp>::value      &&
-                                     is_trivially_copy_assignable<_Tp>::value    &&
-                                     is_trivially_destructible<_Tp>::value> {};
-
-#endif
-
-// is_literal_type;
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_literal_type
-#ifdef _LIBCPP_IS_LITERAL
-    : public integral_constant<bool, _LIBCPP_IS_LITERAL(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value ||
-                              is_reference<typename remove_all_extents<_Tp>::type>::value>
-#endif
-    {};
-    
-// is_standard_layout;
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_standard_layout
-#if __has_feature(is_standard_layout) || (_GNUC_VER >= 407)
-    : public integral_constant<bool, __is_standard_layout(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value>
-#endif
-    {};
-    
-// is_trivially_copyable;
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivially_copyable
-#if __has_feature(is_trivially_copyable)
-    : public integral_constant<bool, __is_trivially_copyable(_Tp)>
-#else
-    : integral_constant<bool, is_scalar<typename remove_all_extents<_Tp>::type>::value>
-#endif
-    {};
-    
-// is_trivial;
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY is_trivial
-#if __has_feature(is_trivial) || (_GNUC_VER >= 407)
-    : public integral_constant<bool, __is_trivial(_Tp)>
-#else
-    : integral_constant<bool, is_trivially_copyable<_Tp>::value &&
-                                 is_trivially_default_constructible<_Tp>::value>
-#endif
-    {};
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-// Check for complete types
-
-template <class ..._Tp> struct __check_complete;
-
-template <>
-struct __check_complete<>
-{
-};
-
-template <class _Hp, class _T0, class ..._Tp>
-struct __check_complete<_Hp, _T0, _Tp...>
-    : private __check_complete<_Hp>,
-      private __check_complete<_T0, _Tp...>
-{
-};
-
-template <class _Hp>
-struct __check_complete<_Hp, _Hp>
-    : private __check_complete<_Hp>
-{
-};
-
-template <class _Tp>
-struct __check_complete<_Tp>
-{
-    static_assert(sizeof(_Tp) > 0, "Type must be complete.");
-};
-
-template <class _Tp>
-struct __check_complete<_Tp&>
-    : private __check_complete<_Tp>
-{
-};
-
-template <class _Tp>
-struct __check_complete<_Tp&&>
-    : private __check_complete<_Tp>
-{
-};
-
-template <class _Rp, class ..._Param>
-struct __check_complete<_Rp (*)(_Param...)>
-    : private __check_complete<_Rp>
-{
-};
-
-template <class ..._Param>
-struct __check_complete<void (*)(_Param...)>
-{
-};
-
-template <class _Rp, class ..._Param>
-struct __check_complete<_Rp (_Param...)>
-    : private __check_complete<_Rp>
-{
-};
-
-template <class ..._Param>
-struct __check_complete<void (_Param...)>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...)>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) volatile>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const volatile>
-    : private __check_complete<_Class>
-{
-};
-
-#if __has_feature(cxx_reference_qualified_functions)
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) &>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) volatile&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const volatile&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) &&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const&&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) volatile&&>
-    : private __check_complete<_Class>
-{
-};
-
-template <class _Rp, class _Class, class ..._Param>
-struct __check_complete<_Rp (_Class::*)(_Param...) const volatile&&>
-    : private __check_complete<_Class>
-{
-};
-
-#endif
-
-template <class _Rp, class _Class>
-struct __check_complete<_Rp _Class::*>
-    : private __check_complete<_Class>
-{
-};
-
-// __invoke forward declarations
-
-// fall back - none of the bullets
-
-template <class ..._Args>
-auto
-__invoke(__any, _Args&& ...__args)
-    -> __nat;
-
-// bullets 1 and 2
-
-template <class _Fp, class _A0, class ..._Args,
-            class = typename enable_if
-            <
-                is_member_function_pointer<typename remove_reference<_Fp>::type>::value &&
-                is_base_of<typename remove_reference<typename __member_pointer_traits<typename remove_reference<_Fp>::type>::_ClassType>::type,
-                           typename remove_reference<_A0>::type>::value
-            >::type
-         >
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
-    -> decltype((_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...));
-
-template <class _Fp, class _A0, class ..._Args,
-            class = typename enable_if
-            <
-                is_member_function_pointer<typename remove_reference<_Fp>::type>::value &&
-                !is_base_of<typename remove_reference<typename __member_pointer_traits<typename remove_reference<_Fp>::type>::_ClassType>::type,
-                           typename remove_reference<_A0>::type>::value
-            >::type
-         >
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
-    -> decltype(((*_VSTD::forward<_A0>(__a0)).*__f)(_VSTD::forward<_Args>(__args)...));
-
-// bullets 3 and 4
-
-template <class _Fp, class _A0,
-            class = typename enable_if
-            <
-                is_member_object_pointer<typename remove_reference<_Fp>::type>::value &&
-                is_base_of<typename __member_pointer_traits<typename remove_reference<_Fp>::type>::_ClassType,
-                           typename remove_reference<_A0>::type>::value
-            >::type
-         >
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0)
-    -> decltype(_VSTD::forward<_A0>(__a0).*__f);
-
-template <class _Fp, class _A0,
-            class = typename enable_if
-            <
-                is_member_object_pointer<typename remove_reference<_Fp>::type>::value &&
-                !is_base_of<typename __member_pointer_traits<typename remove_reference<_Fp>::type>::_ClassType,
-                           typename remove_reference<_A0>::type>::value
-            >::type
-         >
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _A0&& __a0)
-    -> decltype((*_VSTD::forward<_A0>(__a0)).*__f);
-
-// bullet 5
-
-template <class _Fp, class ..._Args>
-_LIBCPP_INLINE_VISIBILITY
-auto
-__invoke(_Fp&& __f, _Args&& ...__args)
-    -> decltype(_VSTD::forward<_Fp>(__f)(_VSTD::forward<_Args>(__args)...));
-
-// __invokable
-
-template <class _Fp, class ..._Args>
-struct __invokable_imp
-    : private __check_complete<_Fp>
-{
-    typedef decltype(
-            __invoke(_VSTD::declval<_Fp>(), _VSTD::declval<_Args>()...)
-                    ) type;
-    static const bool value = !is_same<type, __nat>::value;
-};
-
-template <class _Fp, class ..._Args>
-struct __invokable
-    : public integral_constant<bool,
-          __invokable_imp<_Fp, _Args...>::value>
-{
-};
-
-// __invoke_of
-
-template <bool _Invokable, class _Fp, class ..._Args>
-struct __invoke_of_imp  // false
-{
-};
-
-template <class _Fp, class ..._Args>
-struct __invoke_of_imp<true, _Fp, _Args...>
-{
-    typedef typename __invokable_imp<_Fp, _Args...>::type type;
-};
-
-template <class _Fp, class ..._Args>
-struct __invoke_of
-    : public __invoke_of_imp<__invokable<_Fp, _Args...>::value, _Fp, _Args...>
-{
-};
-
-template <class _Fp, class ..._Args>
-class _LIBCPP_TYPE_VIS_ONLY result_of<_Fp(_Args...)>
-    : public __invoke_of<_Fp, _Args...>
-{
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using result_of_t = typename result_of<_Tp>::type;
-#endif
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-typename enable_if
-<
-    is_move_constructible<_Tp>::value &&
-    is_move_assignable<_Tp>::value
->::type
-#else
-void
-#endif
-swap(_Tp& __x, _Tp& __y) _NOEXCEPT_(is_nothrow_move_constructible<_Tp>::value &&
-                                    is_nothrow_move_assignable<_Tp>::value)
-{
-    _Tp __t(_VSTD::move(__x));
-    __x = _VSTD::move(__y);
-    __y = _VSTD::move(__t);
-}
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-iter_swap(_ForwardIterator1 __a, _ForwardIterator2 __b)
-    //                                  _NOEXCEPT_(_NOEXCEPT_(swap(*__a, *__b)))
-               _NOEXCEPT_(_NOEXCEPT_(swap(*_VSTD::declval<_ForwardIterator1>(),
-                                          *_VSTD::declval<_ForwardIterator2>())))
-{
-    swap(*__a, *__b);
-}
-
-// __swappable
-
-namespace __detail
-{
-
-using _VSTD::swap;
-__nat swap(__any, __any);
-
-template <class _Tp>
-struct __swappable
-{
-    typedef decltype(swap(_VSTD::declval<_Tp&>(), _VSTD::declval<_Tp&>())) type;
-    static const bool value = !is_same<type, __nat>::value;
-};
-
-}  // __detail
-
-template <class _Tp>
-struct __is_swappable
-    : public integral_constant<bool, __detail::__swappable<_Tp>::value>
-{
-};
-
-#if __has_feature(cxx_noexcept) || (_GNUC_VER >= 407 && __cplusplus >= 201103L)
-
-template <bool, class _Tp>
-struct __is_nothrow_swappable_imp
-    : public integral_constant<bool, noexcept(swap(_VSTD::declval<_Tp&>(),
-                                                   _VSTD::declval<_Tp&>()))>
-{
-};
-
-template <class _Tp>
-struct __is_nothrow_swappable_imp<false, _Tp>
-    : public false_type
-{
-};
-
-template <class _Tp>
-struct __is_nothrow_swappable
-    : public __is_nothrow_swappable_imp<__is_swappable<_Tp>::value, _Tp>
-{
-};
-
-#else  // __has_feature(cxx_noexcept)
-
-template <class _Tp>
-struct __is_nothrow_swappable
-    : public false_type
-{
-};
-
-#endif  // __has_feature(cxx_noexcept)
-
-#ifdef _LIBCPP_UNDERLYING_TYPE
-
-template <class _Tp>
-struct underlying_type
-{
-    typedef _LIBCPP_UNDERLYING_TYPE(_Tp) type;
-};
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp> using underlying_type_t = typename underlying_type<_Tp>::type;
-#endif
-
-#else  // _LIBCPP_UNDERLYING_TYPE
-
-template <class _Tp, bool _Support = false>
-struct underlying_type
-{
-    static_assert(_Support, "The underyling_type trait requires compiler "
-                            "support. Either no such support exists or "
-                            "libc++ does not know how to use it.");
-};
-
-#endif // _LIBCPP_UNDERLYING_TYPE
-
-#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-template <class _Tp>
-struct __has_operator_addressof_member_imp
-{
-    template <class _Up>
-        static auto __test(int)
-            -> typename __select_2nd<decltype(_VSTD::declval<_Up>().operator&()), true_type>::type;
-    template <class>
-        static auto __test(long) -> false_type;
-
-    static const bool value = decltype(__test<_Tp>(0))::value;
-};
-
-template <class _Tp>
-struct __has_operator_addressof_free_imp
-{
-    template <class _Up>
-        static auto __test(int)
-            -> typename __select_2nd<decltype(operator&(_VSTD::declval<_Up>())), true_type>::type;
-    template <class>
-        static auto __test(long) -> false_type;
-
-    static const bool value = decltype(__test<_Tp>(0))::value;
-};
-
-template <class _Tp>
-struct __has_operator_addressof
-    : public integral_constant<bool, __has_operator_addressof_member_imp<_Tp>::value
-                                  || __has_operator_addressof_free_imp<_Tp>::value>
-{};
-
-#endif  // _LIBCPP_HAS_NO_ADVANCED_SFINAE
-
-#if _LIBCPP_STD_VER > 14
-template <class...> using void_t = void;
-#endif
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_TYPE_TRAITS
diff --git a/include.new/c++/v1/typeindex b/include.new/c++/v1/typeindex
deleted file mode 100644
index d4d6ca9..0000000
--- a/include.new/c++/v1/typeindex
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- typeindex ---------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_TYPEINDEX
-#define _LIBCPP_TYPEINDEX
-
-/*
-
-    typeindex synopsis
-
-namespace std
-{
-
-class type_index
-{
-public:
-    type_index(const type_info& rhs) noexcept;
-
-    bool operator==(const type_index& rhs) const noexcept;
-    bool operator!=(const type_index& rhs) const noexcept;
-    bool operator< (const type_index& rhs) const noexcept;
-    bool operator<=(const type_index& rhs) const noexcept;
-    bool operator> (const type_index& rhs) const noexcept;
-    bool operator>=(const type_index& rhs) const noexcept;
-
-    size_t hash_code() const noexcept;
-    const char* name() const noexcept;
-};
-
-template <>
-struct hash<type_index>
-    : public unary_function<type_index, size_t>
-{
-    size_t operator()(type_index index) const noexcept;
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <typeinfo>
-#include <__functional_base>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-class _LIBCPP_TYPE_VIS_ONLY type_index
-{
-    const type_info* __t_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    type_index(const type_info& __y) _NOEXCEPT : __t_(&__y) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const type_index& __y) const _NOEXCEPT
-        {return *__t_ == *__y.__t_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const type_index& __y) const _NOEXCEPT
-        {return *__t_ != *__y.__t_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator< (const type_index& __y) const _NOEXCEPT
-        {return  __t_->before(*__y.__t_);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator<=(const type_index& __y) const _NOEXCEPT
-        {return !__y.__t_->before(*__t_);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator> (const type_index& __y) const _NOEXCEPT
-        {return  __y.__t_->before(*__t_);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator>=(const type_index& __y) const _NOEXCEPT
-        {return !__t_->before(*__y.__t_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t hash_code() const _NOEXCEPT {return __t_->hash_code();}
-    _LIBCPP_INLINE_VISIBILITY
-    const char* name() const _NOEXCEPT {return __t_->name();}
-};
-
-template <class _Tp> struct _LIBCPP_TYPE_VIS_ONLY hash;
-
-template <>
-struct _LIBCPP_TYPE_VIS_ONLY hash<type_index>
-    : public unary_function<type_index, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(type_index __index) const _NOEXCEPT
-        {return __index.hash_code();}
-};
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_TYPEINDEX
diff --git a/include.new/c++/v1/typeinfo b/include.new/c++/v1/typeinfo
deleted file mode 100644
index 14ef77b..0000000
--- a/include.new/c++/v1/typeinfo
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- typeinfo ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef __LIBCPP_TYPEINFO
-#define __LIBCPP_TYPEINFO
-
-/*
-
-    typeinfo synopsis
-
-namespace std {
-
-class type_info
-{
-public:
-    virtual ~type_info();
-
-    bool operator==(const type_info& rhs) const noexcept;
-    bool operator!=(const type_info& rhs) const noexcept;
-
-    bool before(const type_info& rhs) const noexcept;
-    size_t hash_code() const noexcept;
-    const char* name() const noexcept;
-
-    type_info(const type_info& rhs) = delete;
-    type_info& operator=(const type_info& rhs) = delete;
-};
-
-class bad_cast
-    : public exception
-{
-public:
-    bad_cast() noexcept;
-    bad_cast(const bad_cast&) noexcept;
-    bad_cast& operator=(const bad_cast&) noexcept;
-    virtual const char* what() const noexcept;
-};
-
-class bad_typeid
-    : public exception
-{
-public:
-    bad_typeid() noexcept;
-    bad_typeid(const bad_typeid&) noexcept;
-    bad_typeid& operator=(const bad_typeid&) noexcept;
-    virtual const char* what() const noexcept;
-};
-
-}  // std
-
-*/
-
-#include <__config>
-#include <exception>
-#include <cstddef>
-#include <cstdint>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-namespace std  // purposefully not using versioning namespace
-{
-
-class _LIBCPP_EXCEPTION_ABI type_info
-{
-    type_info& operator=(const type_info&);
-    type_info(const type_info&);
-protected:
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-    const char* __type_name;
-#else
-    // A const char* with the non-unique RTTI bit possibly set.
-    uintptr_t __type_name;
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit type_info(const char* __n)
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        : __type_name(__n) {}
-#else
-        : __type_name(reinterpret_cast<uintptr_t>(__n)) {}
-#endif
-
-public:
-    virtual ~type_info();
-
-    _LIBCPP_INLINE_VISIBILITY
-    const char* name() const _NOEXCEPT
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        {return __type_name;}
-#else
-        {return reinterpret_cast<const char*>(__type_name & ~_LIBCPP_NONUNIQUE_RTTI_BIT);}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool before(const type_info& __arg) const _NOEXCEPT
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        {return __type_name < __arg.__type_name;}
-#else
-        {if (!((__type_name & __arg.__type_name) & _LIBCPP_NONUNIQUE_RTTI_BIT))
-           return __type_name < __arg.__type_name;
-         return __compare_nonunique_names(__arg) < 0;}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t hash_code() const _NOEXCEPT
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        {return *reinterpret_cast<const size_t*>(&__type_name);}
-#else
-        {if (!(__type_name & _LIBCPP_NONUNIQUE_RTTI_BIT)) return __type_name;
-         const char *__ptr = name();
-         size_t __hash = 5381;
-         while (unsigned char __c = static_cast<unsigned char>(*__ptr++))
-           __hash = (__hash * 33) ^ __c;
-         return __hash;}
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator==(const type_info& __arg) const _NOEXCEPT
-#ifndef _LIBCPP_NONUNIQUE_RTTI_BIT
-        {return __type_name == __arg.__type_name;}
-#else
-        {if (__type_name == __arg.__type_name) return true;
-         if (!((__type_name & __arg.__type_name) & _LIBCPP_NONUNIQUE_RTTI_BIT))
-           return false;
-         return __compare_nonunique_names(__arg) == 0;}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator!=(const type_info& __arg) const _NOEXCEPT
-        {return !operator==(__arg);}
-
-#ifdef _LIBCPP_NONUNIQUE_RTTI_BIT
-  private:
-    _LIBCPP_INLINE_VISIBILITY
-    int __compare_nonunique_names(const type_info &__arg) const _NOEXCEPT
-        {return __builtin_strcmp(name(), __arg.name());}
-#endif
-};
-
-class _LIBCPP_EXCEPTION_ABI bad_cast
-    : public exception
-{
-public:
-    bad_cast() _NOEXCEPT;
-    virtual ~bad_cast() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-class _LIBCPP_EXCEPTION_ABI bad_typeid
-    : public exception
-{
-public:
-    bad_typeid() _NOEXCEPT;
-    virtual ~bad_typeid() _NOEXCEPT;
-    virtual const char* what() const _NOEXCEPT;
-};
-
-}  // std
-
-#endif  // __LIBCPP_TYPEINFO
diff --git a/include.new/c++/v1/unordered_map b/include.new/c++/v1/unordered_map
deleted file mode 100644
index 0fa87d1..0000000
--- a/include.new/c++/v1/unordered_map
+++ /dev/null
@@ -1,2084 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- unordered_map -----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_UNORDERED_MAP
-#define _LIBCPP_UNORDERED_MAP
-
-/*
-
-    unordered_map synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-template <class Key, class T, class Hash = hash<Key>, class Pred = equal_to<Key>,
-          class Alloc = allocator<pair<const Key, T>>>
-class unordered_map
-{
-public:
-    // types
-    typedef Key                                                        key_type;
-    typedef T                                                          mapped_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef pair<const key_type, mapped_type>                          value_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-    typedef /unspecified/ local_iterator;
-    typedef /unspecified/ const_local_iterator;
-
-    unordered_map()
-        noexcept(
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value &&
-            is_nothrow_default_constructible<allocator_type>::value);
-    explicit unordered_map(size_type n, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        unordered_map(InputIterator f, InputIterator l,
-                      size_type n = 0, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    explicit unordered_map(const allocator_type&);
-    unordered_map(const unordered_map&);
-    unordered_map(const unordered_map&, const Allocator&);
-    unordered_map(unordered_map&&)
-        noexcept(
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value &&
-            is_nothrow_move_constructible<allocator_type>::value);
-    unordered_map(unordered_map&&, const Allocator&);
-    unordered_map(initializer_list<value_type>, size_type n = 0,
-                  const hasher& hf = hasher(), const key_equal& eql = key_equal(),
-                  const allocator_type& a = allocator_type());
-    unordered_map(size_type n, const allocator_type& a)
-      : unordered_map(n, hasher(), key_equal(), a) {}  // C++14
-    unordered_map(size_type n, const hasher& hf, const allocator_type& a)
-      : unordered_map(n, hf, key_equal(), a) {}  // C++14
-    template <class InputIterator>
-      unordered_map(InputIterator f, InputIterator l, size_type n, const allocator_type& a)
-      : unordered_map(f, l, n, hasher(), key_equal(), a) {}  // C++14
-    template <class InputIterator>
-      unordered_map(InputIterator f, InputIterator l, size_type n, const hasher& hf, 
-        const allocator_type& a)
-      : unordered_map(f, l, n, hf, key_equal(), a) {}  // C++14
-    unordered_map(initializer_list<value_type> il, size_type n, const allocator_type& a)
-      : unordered_map(il, n, hasher(), key_equal(), a) {}  // C++14
-    unordered_map(initializer_list<value_type> il, size_type n, const hasher& hf, 
-      const allocator_type& a)
-      : unordered_map(il, n, hf, key_equal(), a) {}  // C++14
-    ~unordered_map();
-    unordered_map& operator=(const unordered_map&);
-    unordered_map& operator=(unordered_map&&)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    unordered_map& operator=(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    bool      empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    iterator       begin() noexcept;
-    iterator       end() noexcept;
-    const_iterator begin()  const noexcept;
-    const_iterator end()    const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend()   const noexcept;
-
-    template <class... Args>
-        pair<iterator, bool> emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    pair<iterator, bool> insert(const value_type& obj);
-    template <class P>
-        pair<iterator, bool> insert(P&& obj);
-    iterator insert(const_iterator hint, const value_type& obj);
-    template <class P>
-        iterator insert(const_iterator hint, P&& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type>);
-
-    iterator erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(unordered_map&)
-        noexcept(
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    hasher hash_function() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    mapped_type& operator[](const key_type& k);
-    mapped_type& operator[](key_type&& k);
-
-    mapped_type&       at(const key_type& k);
-    const mapped_type& at(const key_type& k) const;
-
-    size_type bucket_count() const noexcept;
-    size_type max_bucket_count() const noexcept;
-
-    size_type bucket_size(size_type n) const;
-    size_type bucket(const key_type& k) const;
-
-    local_iterator       begin(size_type n);
-    local_iterator       end(size_type n);
-    const_local_iterator begin(size_type n) const;
-    const_local_iterator end(size_type n) const;
-    const_local_iterator cbegin(size_type n) const;
-    const_local_iterator cend(size_type n) const;
-
-    float load_factor() const noexcept;
-    float max_load_factor() const noexcept;
-    void max_load_factor(float z);
-    void rehash(size_type n);
-    void reserve(size_type n);
-};
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    void swap(unordered_map<Key, T, Hash, Pred, Alloc>& x,
-              unordered_map<Key, T, Hash, Pred, Alloc>& y)
-              noexcept(noexcept(x.swap(y)));
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const unordered_map<Key, T, Hash, Pred, Alloc>& x,
-               const unordered_map<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const unordered_map<Key, T, Hash, Pred, Alloc>& x,
-               const unordered_map<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash = hash<Key>, class Pred = equal_to<Key>,
-          class Alloc = allocator<pair<const Key, T>>>
-class unordered_multimap
-{
-public:
-    // types
-    typedef Key                                                        key_type;
-    typedef T                                                          mapped_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef pair<const key_type, mapped_type>                          value_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-    typedef /unspecified/ local_iterator;
-    typedef /unspecified/ const_local_iterator;
-
-    unordered_multimap()
-        noexcept(
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value &&
-            is_nothrow_default_constructible<allocator_type>::value);
-    explicit unordered_multimap(size_type n, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        unordered_multimap(InputIterator f, InputIterator l,
-                      size_type n = 0, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    explicit unordered_multimap(const allocator_type&);
-    unordered_multimap(const unordered_multimap&);
-    unordered_multimap(const unordered_multimap&, const Allocator&);
-    unordered_multimap(unordered_multimap&&)
-        noexcept(
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value &&
-            is_nothrow_move_constructible<allocator_type>::value);
-    unordered_multimap(unordered_multimap&&, const Allocator&);
-    unordered_multimap(initializer_list<value_type>, size_type n = 0,
-                  const hasher& hf = hasher(), const key_equal& eql = key_equal(),
-                  const allocator_type& a = allocator_type());
-    unordered_multimap(size_type n, const allocator_type& a)
-      : unordered_multimap(n, hasher(), key_equal(), a) {}  // C++14
-    unordered_multimap(size_type n, const hasher& hf, const allocator_type& a)
-      : unordered_multimap(n, hf, key_equal(), a) {}  // C++14
-    template <class InputIterator>
-      unordered_multimap(InputIterator f, InputIterator l, size_type n, const allocator_type& a)
-      : unordered_multimap(f, l, n, hasher(), key_equal(), a) {}  // C++14
-    template <class InputIterator>
-      unordered_multimap(InputIterator f, InputIterator l, size_type n, const hasher& hf, 
-        const allocator_type& a)
-      : unordered_multimap(f, l, n, hf, key_equal(), a) {}  // C++14
-    unordered_multimap(initializer_list<value_type> il, size_type n, const allocator_type& a)
-      : unordered_multimap(il, n, hasher(), key_equal(), a) {}  // C++14
-    unordered_multimap(initializer_list<value_type> il, size_type n, const hasher& hf, 
-      const allocator_type& a)
-      : unordered_multimap(il, n, hf, key_equal(), a) {}  // C++14
-    ~unordered_multimap();
-    unordered_multimap& operator=(const unordered_multimap&);
-    unordered_multimap& operator=(unordered_multimap&&)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    unordered_multimap& operator=(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    bool      empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    iterator       begin() noexcept;
-    iterator       end() noexcept;
-    const_iterator begin()  const noexcept;
-    const_iterator end()    const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend()   const noexcept;
-
-    template <class... Args>
-        iterator emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    iterator insert(const value_type& obj);
-    template <class P>
-        iterator insert(P&& obj);
-    iterator insert(const_iterator hint, const value_type& obj);
-    template <class P>
-        iterator insert(const_iterator hint, P&& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type>);
-
-    iterator erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(unordered_multimap&)
-        noexcept(
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    hasher hash_function() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    size_type bucket_count() const noexcept;
-    size_type max_bucket_count() const noexcept;
-
-    size_type bucket_size(size_type n) const;
-    size_type bucket(const key_type& k) const;
-
-    local_iterator       begin(size_type n);
-    local_iterator       end(size_type n);
-    const_local_iterator begin(size_type n) const;
-    const_local_iterator end(size_type n) const;
-    const_local_iterator cbegin(size_type n) const;
-    const_local_iterator cend(size_type n) const;
-
-    float load_factor() const noexcept;
-    float max_load_factor() const noexcept;
-    void max_load_factor(float z);
-    void rehash(size_type n);
-    void reserve(size_type n);
-};
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    void swap(unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
-              unordered_multimap<Key, T, Hash, Pred, Alloc>& y)
-              noexcept(noexcept(x.swap(y)));
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
-               const unordered_multimap<Key, T, Hash, Pred, Alloc>& y);
-
-template <class Key, class T, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const unordered_multimap<Key, T, Hash, Pred, Alloc>& x,
-               const unordered_multimap<Key, T, Hash, Pred, Alloc>& y);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__hash_table>
-#include <functional>
-#include <stdexcept>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Key, class _Cp, class _Hash, bool = is_empty<_Hash>::value
-#if __has_feature(is_final)
-                                         && !__is_final(_Hash)
-#endif
-         >
-class __unordered_map_hasher
-    : private _Hash
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_hasher()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Hash>::value)
-        : _Hash() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_hasher(const _Hash& __h)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Hash>::value)
-        : _Hash(__h) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Hash& hash_function() const _NOEXCEPT {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Cp& __x) const
-        {return static_cast<const _Hash&>(*this)(__x.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Key& __x) const
-        {return static_cast<const _Hash&>(*this)(__x);}
-};
-
-template <class _Key, class _Cp, class _Hash>
-class __unordered_map_hasher<_Key, _Cp, _Hash, false>
-{
-    _Hash __hash_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_hasher()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Hash>::value)
-        : __hash_() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_hasher(const _Hash& __h)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Hash>::value)
-        : __hash_(__h) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Hash& hash_function() const _NOEXCEPT {return __hash_;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Cp& __x) const
-        {return __hash_(__x.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const _Key& __x) const
-        {return __hash_(__x);}
-};
-
-template <class _Key, class _Cp, class _Pred, bool = is_empty<_Pred>::value
-#if __has_feature(is_final)
-                                         && !__is_final(_Pred)
-#endif
-         >
-class __unordered_map_equal
-    : private _Pred
-{
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_equal()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Pred>::value)
-        : _Pred() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_equal(const _Pred& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Pred>::value)
-        : _Pred(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Pred& key_eq() const _NOEXCEPT {return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Cp& __x, const _Cp& __y) const
-        {return static_cast<const _Pred&>(*this)(__x.__cc.first, __y.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Cp& __x, const _Key& __y) const
-        {return static_cast<const _Pred&>(*this)(__x.__cc.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Key& __x, const _Cp& __y) const
-        {return static_cast<const _Pred&>(*this)(__x, __y.__cc.first);}
-};
-
-template <class _Key, class _Cp, class _Pred>
-class __unordered_map_equal<_Key, _Cp, _Pred, false>
-{
-    _Pred __pred_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_equal()
-        _NOEXCEPT_(is_nothrow_default_constructible<_Pred>::value)
-        : __pred_() {}
-    _LIBCPP_INLINE_VISIBILITY
-    __unordered_map_equal(const _Pred& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<_Pred>::value)
-        : __pred_(__p) {}
-    _LIBCPP_INLINE_VISIBILITY
-    const _Pred& key_eq() const _NOEXCEPT {return __pred_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Cp& __x, const _Cp& __y) const
-        {return __pred_(__x.__cc.first, __y.__cc.first);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Cp& __x, const _Key& __y) const
-        {return __pred_(__x.__cc.first, __y);}
-    _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Key& __x, const _Cp& __y) const
-        {return __pred_(__x, __y.__cc.first);}
-};
-
-template <class _Alloc>
-class __hash_map_node_destructor
-{
-    typedef _Alloc                              allocator_type;
-    typedef allocator_traits<allocator_type>    __alloc_traits;
-    typedef typename __alloc_traits::value_type::value_type value_type;
-public:
-    typedef typename __alloc_traits::pointer    pointer;
-private:
-    typedef typename value_type::value_type::first_type     first_type;
-    typedef typename value_type::value_type::second_type    second_type;
-
-    allocator_type& __na_;
-
-    __hash_map_node_destructor& operator=(const __hash_map_node_destructor&);
-
-public:
-    bool __first_constructed;
-    bool __second_constructed;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __hash_map_node_destructor(allocator_type& __na) _NOEXCEPT
-        : __na_(__na),
-          __first_constructed(false),
-          __second_constructed(false)
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_node_destructor(__hash_node_destructor<allocator_type>&& __x)
-        _NOEXCEPT
-        : __na_(__x.__na_),
-          __first_constructed(__x.__value_constructed),
-          __second_constructed(__x.__value_constructed)
-        {
-            __x.__value_constructed = false;
-        }
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_node_destructor(const __hash_node_destructor<allocator_type>& __x)
-        : __na_(__x.__na_),
-          __first_constructed(__x.__value_constructed),
-          __second_constructed(__x.__value_constructed)
-        {
-            const_cast<bool&>(__x.__value_constructed) = false;
-        }
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    void operator()(pointer __p) _NOEXCEPT
-    {
-        if (__second_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.__cc.second));
-        if (__first_constructed)
-            __alloc_traits::destroy(__na_, _VSTD::addressof(__p->__value_.__cc.first));
-        if (__p)
-            __alloc_traits::deallocate(__na_, __p, 1);
-    }
-};
-
-#if __cplusplus >= 201103L
-
-template <class _Key, class _Tp>
-union __hash_value_type
-{
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-    typedef pair<key_type, mapped_type>              __nc_value_type;
-
-    value_type __cc;
-    __nc_value_type __nc;
-
-    template <class ..._Args>
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(_Args&& ...__args)
-        : __cc(std::forward<_Args>(__args)...) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(const __hash_value_type& __v)
-        : __cc(__v.__cc) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(__hash_value_type&& __v)
-        : __nc(std::move(__v.__nc)) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type& operator=(const __hash_value_type& __v)
-        {__nc = __v.__cc; return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type& operator=(__hash_value_type&& __v)
-        {__nc = std::move(__v.__nc); return *this;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    ~__hash_value_type() {__cc.~value_type();}
-};
-
-#else
-
-template <class _Key, class _Tp>
-struct __hash_value_type
-{
-    typedef _Key                                     key_type;
-    typedef _Tp                                      mapped_type;
-    typedef pair<const key_type, mapped_type>        value_type;
-
-    value_type __cc;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type() {}
-
-    template <class _A0>
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(const _A0& __a0)
-        : __cc(__a0) {}
-
-    template <class _A0, class _A1>
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_value_type(const _A0& __a0, const _A1& __a1)
-        : __cc(__a0, __a1) {}
-};
-
-#endif
-
-template <class _HashIterator>
-class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator
-{
-    _HashIterator __i_;
-
-    typedef pointer_traits<typename _HashIterator::pointer>      __pointer_traits;
-    typedef const typename _HashIterator::value_type::value_type::first_type key_type;
-    typedef typename _HashIterator::value_type::value_type::second_type      mapped_type;
-public:
-    typedef forward_iterator_tag                                 iterator_category;
-    typedef pair<key_type, mapped_type>                          value_type;
-    typedef typename _HashIterator::difference_type              difference_type;
-    typedef value_type&                                          reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<value_type>
-#else
-            rebind<value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_iterator() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_iterator(_HashIterator __i) _NOEXCEPT : __i_(__i) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __i_->__cc;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__i_->__cc);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_iterator operator++(int)
-    {
-        __hash_map_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const __hash_map_iterator& __x, const __hash_map_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator;
-};
-
-template <class _HashIterator>
-class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator
-{
-    _HashIterator __i_;
-
-    typedef pointer_traits<typename _HashIterator::pointer>      __pointer_traits;
-    typedef const typename _HashIterator::value_type::value_type::first_type key_type;
-    typedef typename _HashIterator::value_type::value_type::second_type      mapped_type;
-public:
-    typedef forward_iterator_tag                                 iterator_category;
-    typedef pair<key_type, mapped_type>                          value_type;
-    typedef typename _HashIterator::difference_type              difference_type;
-    typedef const value_type&                                    reference;
-    typedef typename __pointer_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                                 pointer;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator() _NOEXCEPT {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator(_HashIterator __i) _NOEXCEPT : __i_(__i) {}
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator(
-            __hash_map_iterator<typename _HashIterator::__non_const_iterator> __i)
-                 _NOEXCEPT
-                : __i_(__i.__i_) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reference operator*() const {return __i_->__cc;}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer operator->() const {return pointer_traits<pointer>::pointer_to(__i_->__cc);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator& operator++() {++__i_; return *this;}
-    _LIBCPP_INLINE_VISIBILITY
-    __hash_map_const_iterator operator++(int)
-    {
-        __hash_map_const_iterator __t(*this);
-        ++(*this);
-        return __t;
-    }
-
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator==(const __hash_map_const_iterator& __x, const __hash_map_const_iterator& __y)
-        {return __x.__i_ == __y.__i_;}
-    friend _LIBCPP_INLINE_VISIBILITY
-        bool operator!=(const __hash_map_const_iterator& __x, const __hash_map_const_iterator& __y)
-        {return __x.__i_ != __y.__i_;}
-
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_map;
-    template <class, class, class, class, class> friend class _LIBCPP_TYPE_VIS_ONLY unordered_multimap;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_iterator;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY __hash_const_local_iterator;
-};
-
-template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
-          class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY unordered_map
-{
-public:
-    // types
-    typedef _Key                                           key_type;
-    typedef _Tp                                            mapped_type;
-    typedef _Hash                                          hasher;
-    typedef _Pred                                          key_equal;
-    typedef _Alloc                                         allocator_type;
-    typedef pair<const key_type, mapped_type>              value_type;
-    typedef pair<key_type, mapped_type>                    __nc_value_type;
-    typedef value_type&                                    reference;
-    typedef const value_type&                              const_reference;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-
-private:
-    typedef __hash_value_type<key_type, mapped_type>                 __value_type;
-    typedef __unordered_map_hasher<key_type, __value_type, hasher>   __hasher;
-    typedef __unordered_map_equal<key_type, __value_type, key_equal> __key_equal;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                           __allocator_type;
-
-    typedef __hash_table<__value_type, __hasher,
-                         __key_equal,  __allocator_type>   __table;
-
-    __table __table_;
-
-    typedef typename __table::__node_pointer               __node_pointer;
-    typedef typename __table::__node_const_pointer         __node_const_pointer;
-    typedef typename __table::__node_traits                __node_traits;
-    typedef typename __table::__node_allocator             __node_allocator;
-    typedef typename __table::__node                       __node;
-    typedef __hash_map_node_destructor<__node_allocator>   _Dp;
-    typedef unique_ptr<__node, _Dp>                         __node_holder;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
-public:
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-
-    typedef __hash_map_iterator<typename __table::iterator>       iterator;
-    typedef __hash_map_const_iterator<typename __table::const_iterator> const_iterator;
-    typedef __hash_map_iterator<typename __table::local_iterator> local_iterator;
-    typedef __hash_map_const_iterator<typename __table::const_local_iterator> const_local_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map()
-        _NOEXCEPT_(is_nothrow_default_constructible<__table>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    explicit unordered_map(size_type __n, const hasher& __hf = hasher(),
-                           const key_equal& __eql = key_equal());
-    unordered_map(size_type __n, const hasher& __hf,
-                  const key_equal& __eql,
-                  const allocator_type& __a);
-    template <class _InputIterator>
-        unordered_map(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        unordered_map(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        unordered_map(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf,
-                      const key_equal& __eql,
-                      const allocator_type& __a);
-    explicit unordered_map(const allocator_type& __a);
-    unordered_map(const unordered_map& __u);
-    unordered_map(const unordered_map& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_map(unordered_map&& __u)
-        _NOEXCEPT_(is_nothrow_move_constructible<__table>::value);
-    unordered_map(unordered_map&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_map(initializer_list<value_type> __il);
-    unordered_map(initializer_list<value_type> __il, size_type __n,
-                  const hasher& __hf = hasher(), const key_equal& __eql = key_equal());
-    unordered_map(initializer_list<value_type> __il, size_type __n,
-                  const hasher& __hf, const key_equal& __eql,
-                  const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map(size_type __n, const allocator_type& __a)
-      : unordered_map(__n, hasher(), key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map(size_type __n, const hasher& __hf, const allocator_type& __a)
-      : unordered_map(__n, __hf, key_equal(), __a) {}
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-      unordered_map(_InputIterator __first, _InputIterator __last, size_type __n, const allocator_type& __a)
-      : unordered_map(__first, __last, __n, hasher(), key_equal(), __a) {}
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-      unordered_map(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, 
-        const allocator_type& __a)
-      : unordered_map(__first, __last, __n, __hf, key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
-      : unordered_map(__il, __n, hasher(), key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map(initializer_list<value_type> __il, size_type __n, const hasher& __hf, 
-      const allocator_type& __a)
-      : unordered_map(__il, __n, __hf, key_equal(), __a) {}
-#endif
-    // ~unordered_map() = default;
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_map& operator=(const unordered_map& __u)
-    {
-#if __cplusplus >= 201103L
-        __table_ = __u.__table_;
-#else
-        if (this != &__u) {
-            __table_.clear();
-            __table_.hash_function() = __u.__table_.hash_function();
-            __table_.key_eq() = __u.__table_.key_eq();
-            __table_.max_load_factor() = __u.__table_.max_load_factor();
-            __table_.__copy_assign_alloc(__u.__table_);
-            insert(__u.begin(), __u.end());
-        }
-#endif
-        return *this;
-    }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_map& operator=(unordered_map&& __u)
-        _NOEXCEPT_(is_nothrow_move_assignable<__table>::value);
-#endif
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_map& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return __table_.end();}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args>
-        pair<iterator, bool> emplace(_Args&&... __args);
-
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_map::emplace_hint(const_iterator, args...) called with an iterator not"
-                " referring to this unordered_map");
-            return __table_.__emplace_unique(_VSTD::forward<_Args>(__args)...).first;
-        }
-#else
-        iterator emplace_hint(const_iterator, _Args&&... __args)
-            {return emplace(_VSTD::forward<_Args>(__args)...).first;}
-#endif
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool> insert(const value_type& __x)
-        {return __table_.__insert_unique(__x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        pair<iterator, bool> insert(_Pp&& __x)
-            {return __table_.__insert_unique(_VSTD::forward<_Pp>(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    iterator insert(const_iterator __p, const value_type& __x)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_map::insert(const_iterator, const value_type&) called with an iterator not"
-                " referring to this unordered_map");
-            return insert(__x).first;
-        }
-#else
-    iterator insert(const_iterator, const value_type& __x)
-        {return insert(__x).first;}
-#endif
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator insert(const_iterator __p, _Pp&& __x)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_map::insert(const_iterator, value_type&&) called with an iterator not"
-                " referring to this unordered_map");
-            return insert(_VSTD::forward<_Pp>(__x)).first;
-        }
-#else
-        iterator insert(const_iterator, _Pp&& __x)
-            {return insert(_VSTD::forward<_Pp>(__x)).first;}
-#endif
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __table_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __first, const_iterator __last)
-        {return __table_.erase(__first.__i_, __last.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unordered_map& __u)
-        _NOEXCEPT_(__is_nothrow_swappable<__table>::value)
-        {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_function() const
-        {return __table_.hash_function().hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const
-        {return __table_.key_eq().key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_unique(__k);}
-
-    mapped_type& operator[](const key_type& __k);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    mapped_type& operator[](key_type&& __k);
-#endif
-
-    mapped_type&       at(const key_type& __k);
-    const mapped_type& at(const key_type& __k) const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_size(size_type __n) const
-        {return __table_.bucket_size(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket(const key_type& __k) const {return __table_.bucket(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       begin(size_type __n)        {return __table_.begin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       end(size_type __n)          {return __table_.end(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator begin(size_type __n) const  {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator end(size_type __n) const    {return __table_.cend(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cbegin(size_type __n) const {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cend(size_type __n) const   {return __table_.cend(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float load_factor() const _NOEXCEPT {return __table_.load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    float max_load_factor() const _NOEXCEPT {return __table_.max_load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    void max_load_factor(float __mlf) {__table_.max_load_factor(__mlf);}
-    _LIBCPP_INLINE_VISIBILITY
-    void rehash(size_type __n) {__table_.rehash(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    void reserve(size_type __n) {__table_.reserve(__n);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const
-        {return __table_.__dereferenceable(&__i->__i_);}
-    bool __decrementable(const const_iterator* __i) const
-        {return __table_.__decrementable(&__i->__i_);}
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(&__i->__i_, __n);}
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(&__i->__i_, __n);}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node();
-    template <class _A0>
-        __node_holder
-         __construct_node(_A0&& __a0);
-    __node_holder __construct_node_with_key(key_type&& __k);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _A0, class _A1, class ..._Args>
-        __node_holder __construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node_with_key(const key_type& __k);
-};
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        size_type __n, const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        size_type __n, const hasher& __hf, const key_equal& __eql,
-        const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        const allocator_type& __a)
-    : __table_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        const unordered_map& __u)
-    : __table_(__u.__table_)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        const unordered_map& __u, const allocator_type& __a)
-    : __table_(__u.__table_, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        unordered_map&& __u)
-    _NOEXCEPT_(is_nothrow_move_constructible<__table>::value)
-    : __table_(_VSTD::move(__u.__table_))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        unordered_map&& __u, const allocator_type& __a)
-    : __table_(_VSTD::move(__u.__table_), __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a != __u.get_allocator())
-    {
-        iterator __i = __u.begin();
-        while (__u.size() != 0)
-            __table_.__insert_unique(
-                _VSTD::move(__u.__table_.remove((__i++).__i_)->__value_)
-                                    );
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    else
-        __get_db()->swap(this, &__u);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_map(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator=(unordered_map&& __u)
-    _NOEXCEPT_(is_nothrow_move_assignable<__table>::value)
-{
-    __table_ = _VSTD::move(__u.__table_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator=(
-        initializer_list<value_type> __il)
-{
-    __table_.__assign_unique(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node()
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _A0>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(_A0&& __a0)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node_with_key(key_type&& __k)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first), _VSTD::move(__k));
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _A0, class _A1, class ..._Args>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(_A0&& __a0,
-                                                                 _A1&& __a1,
-                                                                 _Args&&... __args)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0), _VSTD::forward<_A1>(__a1),
-                             _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class... _Args>
-pair<typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::iterator, bool>
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::emplace(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
-    if (__r.second)
-        __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node_with_key(const key_type& __k)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.first), __k);
-    __h.get_deleter().__first_constructed = true;
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_.__cc.second));
-    __h.get_deleter().__second_constructed = true;
-    return _VSTD::move(__h);  // explicitly moved for C++03
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                       _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_unique(*__first);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-_Tp&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator[](const key_type& __k)
-{
-    iterator __i = find(__k);
-    if (__i != end())
-        return __i->second;
-    __node_holder __h = __construct_node_with_key(__k);
-    pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
-    __h.release();
-    return __r.first->second;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-_Tp&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::operator[](key_type&& __k)
-{
-    iterator __i = find(__k);
-    if (__i != end())
-        return __i->second;
-    __node_holder __h = __construct_node_with_key(_VSTD::move(__k));
-    pair<iterator, bool> __r = __table_.__node_insert_unique(__h.get());
-    __h.release();
-    return __r.first->second;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-_Tp&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::at(const key_type& __k)
-{
-    iterator __i = find(__k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__i == end())
-        throw out_of_range("unordered_map::at: key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __i->second;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-const _Tp&
-unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::at(const key_type& __k) const
-{
-    const_iterator __i = find(__k);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    if (__i == end())
-        throw out_of_range("unordered_map::at: key not found");
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    return __i->second;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-     unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(), __ey = __y.end();
-            __i != __ex; ++__i)
-    {
-        const_iterator __j = __y.find(__i->first);
-        if (__j == __ey || !(*__i == *__j))
-            return false;
-    }
-    return true;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const unordered_map<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Key, class _Tp, class _Hash = hash<_Key>, class _Pred = equal_to<_Key>,
-          class _Alloc = allocator<pair<const _Key, _Tp> > >
-class _LIBCPP_TYPE_VIS_ONLY unordered_multimap
-{
-public:
-    // types
-    typedef _Key                                           key_type;
-    typedef _Tp                                            mapped_type;
-    typedef _Hash                                          hasher;
-    typedef _Pred                                          key_equal;
-    typedef _Alloc                                         allocator_type;
-    typedef pair<const key_type, mapped_type>              value_type;
-    typedef pair<key_type, mapped_type>                    __nc_value_type;
-    typedef value_type&                                    reference;
-    typedef const value_type&                              const_reference;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-
-private:
-    typedef __hash_value_type<key_type, mapped_type>                 __value_type;
-    typedef __unordered_map_hasher<key_type, __value_type, hasher>   __hasher;
-    typedef __unordered_map_equal<key_type, __value_type, key_equal> __key_equal;
-    typedef typename allocator_traits<allocator_type>::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind_alloc<__value_type>
-#else
-            rebind_alloc<__value_type>::other
-#endif
-                                                           __allocator_type;
-
-    typedef __hash_table<__value_type, __hasher,
-                         __key_equal,  __allocator_type>   __table;
-
-    __table __table_;
-
-    typedef typename __table::__node_traits                __node_traits;
-    typedef typename __table::__node_allocator             __node_allocator;
-    typedef typename __table::__node                       __node;
-    typedef __hash_map_node_destructor<__node_allocator>   _Dp;
-    typedef unique_ptr<__node, _Dp>                         __node_holder;
-    typedef allocator_traits<allocator_type>               __alloc_traits;
-public:
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-
-    typedef __hash_map_iterator<typename __table::iterator>       iterator;
-    typedef __hash_map_const_iterator<typename __table::const_iterator> const_iterator;
-    typedef __hash_map_iterator<typename __table::local_iterator> local_iterator;
-    typedef __hash_map_const_iterator<typename __table::const_local_iterator> const_local_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap()
-        _NOEXCEPT_(is_nothrow_default_constructible<__table>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    explicit unordered_multimap(size_type __n, const hasher& __hf = hasher(),
-                                const key_equal& __eql = key_equal());
-    unordered_multimap(size_type __n, const hasher& __hf,
-                                const key_equal& __eql,
-                                const allocator_type& __a);
-    template <class _InputIterator>
-        unordered_multimap(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        unordered_multimap(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        unordered_multimap(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf,
-                      const key_equal& __eql,
-                      const allocator_type& __a);
-    explicit unordered_multimap(const allocator_type& __a);
-    unordered_multimap(const unordered_multimap& __u);
-    unordered_multimap(const unordered_multimap& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_multimap(unordered_multimap&& __u)
-        _NOEXCEPT_(is_nothrow_move_constructible<__table>::value);
-    unordered_multimap(unordered_multimap&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_multimap(initializer_list<value_type> __il);
-    unordered_multimap(initializer_list<value_type> __il, size_type __n,
-                       const hasher& __hf = hasher(),
-                       const key_equal& __eql = key_equal());
-    unordered_multimap(initializer_list<value_type> __il, size_type __n,
-                       const hasher& __hf, const key_equal& __eql,
-                       const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#if _LIBCPP_STD_VER > 11
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap(size_type __n, const allocator_type& __a)
-      : unordered_multimap(__n, hasher(), key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap(size_type __n, const hasher& __hf, const allocator_type& __a)
-      : unordered_multimap(__n, __hf, key_equal(), __a) {}
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-      unordered_multimap(_InputIterator __first, _InputIterator __last, size_type __n, const allocator_type& __a)
-      : unordered_multimap(__first, __last, __n, hasher(), key_equal(), __a) {}
-    template <class _InputIterator>
-    _LIBCPP_INLINE_VISIBILITY
-      unordered_multimap(_InputIterator __first, _InputIterator __last, size_type __n, const hasher& __hf, 
-        const allocator_type& __a)
-      : unordered_multimap(__first, __last, __n, __hf, key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
-      : unordered_multimap(__il, __n, hasher(), key_equal(), __a) {}
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap(initializer_list<value_type> __il, size_type __n, const hasher& __hf, 
-      const allocator_type& __a)
-      : unordered_multimap(__il, __n, __hf, key_equal(), __a) {}
-#endif
-    // ~unordered_multimap() = default;
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multimap& operator=(const unordered_multimap& __u)
-    {
-#if __cplusplus >= 201103L
-        __table_ = __u.__table_;
-#else
-        if (this != &__u) {
-            __table_.clear();
-            __table_.hash_function() = __u.__table_.hash_function();
-            __table_.key_eq() = __u.__table_.key_eq();
-            __table_.max_load_factor() = __u.__table_.max_load_factor();
-            __table_.__copy_assign_alloc(__u.__table_);
-            insert(__u.begin(), __u.end());
-        }
-#endif
-        return *this;
-    }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_multimap& operator=(unordered_multimap&& __u)
-        _NOEXCEPT_(is_nothrow_move_assignable<__table>::value);
-#endif
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_multimap& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return __table_.end();}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template <class... _Args>
-        iterator emplace(_Args&&... __args);
-
-    template <class... _Args>
-        iterator emplace_hint(const_iterator __p, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __x) {return __table_.__insert_multi(__x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(_Pp&& __x)
-            {return __table_.__insert_multi(_VSTD::forward<_Pp>(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __x)
-        {return __table_.__insert_multi(__p.__i_, __x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _Pp,
-              class = typename enable_if<is_constructible<value_type, _Pp>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator insert(const_iterator __p, _Pp&& __x)
-            {return __table_.__insert_multi(__p.__i_, _VSTD::forward<_Pp>(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __table_.erase(__p.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __first, const_iterator __last)
-        {return __table_.erase(__first.__i_, __last.__i_);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unordered_multimap& __u)
-        _NOEXCEPT_(__is_nothrow_swappable<__table>::value)
-        {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_function() const
-        {return __table_.hash_function().hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const
-        {return __table_.key_eq().key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_multi(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT
-        {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_size(size_type __n) const
-        {return __table_.bucket_size(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket(const key_type& __k) const {return __table_.bucket(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       begin(size_type __n)        {return __table_.begin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       end(size_type __n)          {return __table_.end(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator begin(size_type __n) const  {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator end(size_type __n) const    {return __table_.cend(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cbegin(size_type __n) const {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cend(size_type __n) const   {return __table_.cend(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float load_factor() const _NOEXCEPT {return __table_.load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    float max_load_factor() const _NOEXCEPT {return __table_.max_load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    void max_load_factor(float __mlf) {__table_.max_load_factor(__mlf);}
-    _LIBCPP_INLINE_VISIBILITY
-    void rehash(size_type __n) {__table_.rehash(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    void reserve(size_type __n) {__table_.reserve(__n);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const
-        {return __table_.__dereferenceable(&__i->__i_);}
-    bool __decrementable(const const_iterator* __i) const
-        {return __table_.__decrementable(&__i->__i_);}
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(&__i->__i_, __n);}
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(&__i->__i_, __n);}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __node_holder __construct_node();
-    template <class _A0>
-        __node_holder
-         __construct_node(_A0&& __a0);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class _A0, class _A1, class ..._Args>
-        __node_holder __construct_node(_A0&& __a0, _A1&& __a1, _Args&& ...__args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        size_type __n, const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        size_type __n, const hasher& __hf, const key_equal& __eql,
-        const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        const allocator_type& __a)
-    : __table_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        const unordered_multimap& __u)
-    : __table_(__u.__table_)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        const unordered_multimap& __u, const allocator_type& __a)
-    : __table_(__u.__table_, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        unordered_multimap&& __u)
-    _NOEXCEPT_(is_nothrow_move_constructible<__table>::value)
-    : __table_(_VSTD::move(__u.__table_))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        unordered_multimap&& __u, const allocator_type& __a)
-    : __table_(_VSTD::move(__u.__table_), __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a != __u.get_allocator())
-    {
-        iterator __i = __u.begin();
-        while (__u.size() != 0)
-        {
-            __table_.__insert_multi(
-                _VSTD::move(__u.__table_.remove((__i++).__i_)->__value_)
-                                   );
-        }
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    else
-        __get_db()->swap(this, &__u);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::unordered_multimap(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>&
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::operator=(unordered_multimap&& __u)
-    _NOEXCEPT_(is_nothrow_move_assignable<__table>::value)
-{
-    __table_ = _VSTD::move(__u.__table_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>&
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::operator=(
-        initializer_list<value_type> __il)
-{
-    __table_.__assign_multi(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node()
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _A0>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(_A0&& __a0)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0));
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _A0, class _A1, class ..._Args>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__node_holder
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::__construct_node(
-        _A0&& __a0, _A1&& __a1, _Args&&... __args)
-{
-    __node_allocator& __na = __table_.__node_alloc();
-    __node_holder __h(__node_traits::allocate(__na, 1), _Dp(__na));
-    __node_traits::construct(__na, _VSTD::addressof(__h->__value_),
-                             _VSTD::forward<_A0>(__a0), _VSTD::forward<_A1>(__a1),
-                             _VSTD::forward<_Args>(__args)...);
-    __h.get_deleter().__first_constructed = true;
-    __h.get_deleter().__second_constructed = true;
-    return __h;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class... _Args>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::iterator
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::emplace(_Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __table_.__node_insert_multi(__h.get());
-    __h.release();
-    return __r;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class... _Args>
-typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::iterator
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::emplace_hint(
-        const_iterator __p, _Args&&... __args)
-{
-    __node_holder __h = __construct_node(_VSTD::forward<_Args>(__args)...);
-    iterator __r = __table_.__node_insert_multi(__p.__i_, __h.get());
-    __h.release();
-    return __r;
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                            _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_multi(*__first);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-     unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    typedef pair<const_iterator, const_iterator> _EqRng;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(); __i != __ex;)
-    {
-        _EqRng __xeq = __x.equal_range(__i->first);
-        _EqRng __yeq = __y.equal_range(__i->first);
-        if (_VSTD::distance(__xeq.first, __xeq.second) !=
-            _VSTD::distance(__yeq.first, __yeq.second) ||
-                  !_VSTD::is_permutation(__xeq.first, __xeq.second, __yeq.first))
-            return false;
-        __i = __xeq.second;
-    }
-    return true;
-}
-
-template <class _Key, class _Tp, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __x,
-           const unordered_multimap<_Key, _Tp, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_UNORDERED_MAP
diff --git a/include.new/c++/v1/unordered_set b/include.new/c++/v1/unordered_set
deleted file mode 100644
index d06629f..0000000
--- a/include.new/c++/v1/unordered_set
+++ /dev/null
@@ -1,1381 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- unordered_set -----------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_UNORDERED_SET
-#define _LIBCPP_UNORDERED_SET
-
-/*
-
-    unordered_set synopsis
-
-#include <initializer_list>
-
-namespace std
-{
-
-template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
-          class Alloc = allocator<Value>>
-class unordered_set
-{
-public:
-    // types
-    typedef Value                                                      key_type;
-    typedef key_type                                                   value_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-    typedef /unspecified/ local_iterator;
-    typedef /unspecified/ const_local_iterator;
-
-    unordered_set()
-        noexcept(
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value &&
-            is_nothrow_default_constructible<allocator_type>::value);
-    explicit unordered_set(size_type n, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        unordered_set(InputIterator f, InputIterator l,
-                      size_type n = 0, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    explicit unordered_set(const allocator_type&);
-    unordered_set(const unordered_set&);
-    unordered_set(const unordered_set&, const Allocator&);
-    unordered_set(unordered_set&&)
-        noexcept(
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value &&
-            is_nothrow_move_constructible<allocator_type>::value);
-    unordered_set(unordered_set&&, const Allocator&);
-    unordered_set(initializer_list<value_type>, size_type n = 0,
-                  const hasher& hf = hasher(), const key_equal& eql = key_equal(),
-                  const allocator_type& a = allocator_type());
-    unordered_set(size_type n, const allocator_type& a); // C++14
-    unordered_set(size_type n, const hasher& hf, const allocator_type& a); // C++14
-    template <class InputIterator>
-      unordered_set(InputIterator f, InputIterator l, size_type n, const allocator_type& a); // C++14
-    template <class InputIterator>
-      unordered_set(InputIterator f, InputIterator l, size_type n, 
-                    const hasher& hf,  const allocator_type& a); // C++14
-    unordered_set(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14
-    unordered_set(initializer_list<value_type> il, size_type n,
-                  const hasher& hf,  const allocator_type& a); // C++14
-    ~unordered_set();
-    unordered_set& operator=(const unordered_set&);
-    unordered_set& operator=(unordered_set&&)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    unordered_set& operator=(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    bool      empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    iterator       begin() noexcept;
-    iterator       end() noexcept;
-    const_iterator begin()  const noexcept;
-    const_iterator end()    const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend()   const noexcept;
-
-    template <class... Args>
-        pair<iterator, bool> emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    pair<iterator, bool> insert(const value_type& obj);
-    pair<iterator, bool> insert(value_type&& obj);
-    iterator insert(const_iterator hint, const value_type& obj);
-    iterator insert(const_iterator hint, value_type&& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type>);
-
-    iterator erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(unordered_set&)
-        noexcept(
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    hasher hash_function() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    size_type bucket_count() const noexcept;
-    size_type max_bucket_count() const noexcept;
-
-    size_type bucket_size(size_type n) const;
-    size_type bucket(const key_type& k) const;
-
-    local_iterator       begin(size_type n);
-    local_iterator       end(size_type n);
-    const_local_iterator begin(size_type n) const;
-    const_local_iterator end(size_type n) const;
-    const_local_iterator cbegin(size_type n) const;
-    const_local_iterator cend(size_type n) const;
-
-    float load_factor() const noexcept;
-    float max_load_factor() const noexcept;
-    void max_load_factor(float z);
-    void rehash(size_type n);
-    void reserve(size_type n);
-};
-
-template <class Value, class Hash, class Pred, class Alloc>
-    void swap(unordered_set<Value, Hash, Pred, Alloc>& x,
-              unordered_set<Value, Hash, Pred, Alloc>& y)
-              noexcept(noexcept(x.swap(y)));
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const unordered_set<Value, Hash, Pred, Alloc>& x,
-               const unordered_set<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const unordered_set<Value, Hash, Pred, Alloc>& x,
-               const unordered_set<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash = hash<Value>, class Pred = equal_to<Value>,
-          class Alloc = allocator<Value>>
-class unordered_multiset
-{
-public:
-    // types
-    typedef Value                                                      key_type;
-    typedef key_type                                                   value_type;
-    typedef Hash                                                       hasher;
-    typedef Pred                                                       key_equal;
-    typedef Alloc                                                      allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    typedef typename allocator_traits<allocator_type>::pointer         pointer;
-    typedef typename allocator_traits<allocator_type>::const_pointer   const_pointer;
-    typedef typename allocator_traits<allocator_type>::size_type       size_type;
-    typedef typename allocator_traits<allocator_type>::difference_type difference_type;
-
-    typedef /unspecified/ iterator;
-    typedef /unspecified/ const_iterator;
-    typedef /unspecified/ local_iterator;
-    typedef /unspecified/ const_local_iterator;
-
-    unordered_multiset()
-        noexcept(
-            is_nothrow_default_constructible<hasher>::value &&
-            is_nothrow_default_constructible<key_equal>::value &&
-            is_nothrow_default_constructible<allocator_type>::value);
-    explicit unordered_multiset(size_type n, const hasher& hf = hasher(),
-                           const key_equal& eql = key_equal(),
-                           const allocator_type& a = allocator_type());
-    template <class InputIterator>
-        unordered_multiset(InputIterator f, InputIterator l,
-                      size_type n = 0, const hasher& hf = hasher(),
-                      const key_equal& eql = key_equal(),
-                      const allocator_type& a = allocator_type());
-    explicit unordered_multiset(const allocator_type&);
-    unordered_multiset(const unordered_multiset&);
-    unordered_multiset(const unordered_multiset&, const Allocator&);
-    unordered_multiset(unordered_multiset&&)
-        noexcept(
-            is_nothrow_move_constructible<hasher>::value &&
-            is_nothrow_move_constructible<key_equal>::value &&
-            is_nothrow_move_constructible<allocator_type>::value);
-    unordered_multiset(unordered_multiset&&, const Allocator&);
-    unordered_multiset(initializer_list<value_type>, size_type n = /see below/,
-                  const hasher& hf = hasher(), const key_equal& eql = key_equal(),
-                  const allocator_type& a = allocator_type());
-    unordered_multiset(size_type n, const allocator_type& a); // C++14
-    unordered_multiset(size_type n, const hasher& hf, const allocator_type& a); // C++14
-    template <class InputIterator>
-      unordered_multiset(InputIterator f, InputIterator l, size_type n, const allocator_type& a); // C++14
-    template <class InputIterator>
-      unordered_multiset(InputIterator f, InputIterator l, size_type n,
-                         const hasher& hf, const allocator_type& a); // C++14
-    unordered_multiset(initializer_list<value_type> il, size_type n, const allocator_type& a); // C++14
-    unordered_multiset(initializer_list<value_type> il, size_type n, 
-                       const hasher& hf,  const allocator_type& a); // C++14
-    ~unordered_multiset();
-    unordered_multiset& operator=(const unordered_multiset&);
-    unordered_multiset& operator=(unordered_multiset&&)
-        noexcept(
-            allocator_type::propagate_on_container_move_assignment::value &&
-            is_nothrow_move_assignable<allocator_type>::value &&
-            is_nothrow_move_assignable<hasher>::value &&
-            is_nothrow_move_assignable<key_equal>::value);
-    unordered_multiset& operator=(initializer_list<value_type>);
-
-    allocator_type get_allocator() const noexcept;
-
-    bool      empty() const noexcept;
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-
-    iterator       begin() noexcept;
-    iterator       end() noexcept;
-    const_iterator begin()  const noexcept;
-    const_iterator end()    const noexcept;
-    const_iterator cbegin() const noexcept;
-    const_iterator cend()   const noexcept;
-
-    template <class... Args>
-        iterator emplace(Args&&... args);
-    template <class... Args>
-        iterator emplace_hint(const_iterator position, Args&&... args);
-    iterator insert(const value_type& obj);
-    iterator insert(value_type&& obj);
-    iterator insert(const_iterator hint, const value_type& obj);
-    iterator insert(const_iterator hint, value_type&& obj);
-    template <class InputIterator>
-        void insert(InputIterator first, InputIterator last);
-    void insert(initializer_list<value_type>);
-
-    iterator erase(const_iterator position);
-    size_type erase(const key_type& k);
-    iterator erase(const_iterator first, const_iterator last);
-    void clear() noexcept;
-
-    void swap(unordered_multiset&)
-        noexcept(
-            (!allocator_type::propagate_on_container_swap::value ||
-             __is_nothrow_swappable<allocator_type>::value) &&
-            __is_nothrow_swappable<hasher>::value &&
-            __is_nothrow_swappable<key_equal>::value);
-
-    hasher hash_function() const;
-    key_equal key_eq() const;
-
-    iterator       find(const key_type& k);
-    const_iterator find(const key_type& k) const;
-    size_type count(const key_type& k) const;
-    pair<iterator, iterator>             equal_range(const key_type& k);
-    pair<const_iterator, const_iterator> equal_range(const key_type& k) const;
-
-    size_type bucket_count() const noexcept;
-    size_type max_bucket_count() const noexcept;
-
-    size_type bucket_size(size_type n) const;
-    size_type bucket(const key_type& k) const;
-
-    local_iterator       begin(size_type n);
-    local_iterator       end(size_type n);
-    const_local_iterator begin(size_type n) const;
-    const_local_iterator end(size_type n) const;
-    const_local_iterator cbegin(size_type n) const;
-    const_local_iterator cend(size_type n) const;
-
-    float load_factor() const noexcept;
-    float max_load_factor() const noexcept;
-    void max_load_factor(float z);
-    void rehash(size_type n);
-    void reserve(size_type n);
-};
-
-template <class Value, class Hash, class Pred, class Alloc>
-    void swap(unordered_multiset<Value, Hash, Pred, Alloc>& x,
-              unordered_multiset<Value, Hash, Pred, Alloc>& y)
-              noexcept(noexcept(x.swap(y)));
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator==(const unordered_multiset<Value, Hash, Pred, Alloc>& x,
-               const unordered_multiset<Value, Hash, Pred, Alloc>& y);
-
-template <class Value, class Hash, class Pred, class Alloc>
-    bool
-    operator!=(const unordered_multiset<Value, Hash, Pred, Alloc>& x,
-               const unordered_multiset<Value, Hash, Pred, Alloc>& y);
-}  // std
-
-*/
-
-#include <__config>
-#include <__hash_table>
-#include <functional>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
-          class _Alloc = allocator<_Value> >
-class _LIBCPP_TYPE_VIS_ONLY unordered_set
-{
-public:
-    // types
-    typedef _Value                                                     key_type;
-    typedef key_type                                                   value_type;
-    typedef _Hash                                                      hasher;
-    typedef _Pred                                                      key_equal;
-    typedef _Alloc                                                     allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-
-private:
-    typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;
-
-    __table __table_;
-
-public:
-    typedef typename __table::pointer         pointer;
-    typedef typename __table::const_pointer   const_pointer;
-    typedef typename __table::size_type       size_type;
-    typedef typename __table::difference_type difference_type;
-
-    typedef typename __table::const_iterator       iterator;
-    typedef typename __table::const_iterator       const_iterator;
-    typedef typename __table::const_local_iterator local_iterator;
-    typedef typename __table::const_local_iterator const_local_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_set()
-        _NOEXCEPT_(is_nothrow_default_constructible<__table>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    explicit unordered_set(size_type __n, const hasher& __hf = hasher(),
-                           const key_equal& __eql = key_equal());
-#if _LIBCPP_STD_VER > 11
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_set(size_type __n, const allocator_type& __a)
-        : unordered_set(__n, hasher(), key_equal(), __a) {}
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_set(size_type __n, const hasher& __hf, const allocator_type& __a)
-        : unordered_set(__n, __hf, key_equal(), __a) {}
-#endif
-    unordered_set(size_type __n, const hasher& __hf, const key_equal& __eql,
-                  const allocator_type& __a);
-    template <class _InputIterator>
-        unordered_set(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        unordered_set(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        unordered_set(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf, const key_equal& __eql,
-                      const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    template <class _InputIterator>
-    inline _LIBCPP_INLINE_VISIBILITY
-        unordered_set(_InputIterator __first, _InputIterator __last, 
-                    size_type __n, const allocator_type& __a)
-            : unordered_set(__first, __last, __n, hasher(), key_equal(), __a) {}
-    template <class _InputIterator>
-        unordered_set(_InputIterator __first, _InputIterator __last, 
-                      size_type __n, const hasher& __hf, const allocator_type& __a)
-            : unordered_set(__first, __last, __n, __hf, key_equal(), __a) {}
-#endif
-    explicit unordered_set(const allocator_type& __a);
-    unordered_set(const unordered_set& __u);
-    unordered_set(const unordered_set& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_set(unordered_set&& __u)
-        _NOEXCEPT_(is_nothrow_move_constructible<__table>::value);
-    unordered_set(unordered_set&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_set(initializer_list<value_type> __il);
-    unordered_set(initializer_list<value_type> __il, size_type __n,
-                  const hasher& __hf = hasher(),
-                  const key_equal& __eql = key_equal());
-    unordered_set(initializer_list<value_type> __il, size_type __n,
-                  const hasher& __hf, const key_equal& __eql,
-                  const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_set(initializer_list<value_type> __il, size_type __n,
-                                                      const allocator_type& __a)
-        : unordered_set(__il, __n, hasher(), key_equal(), __a) {}
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_set(initializer_list<value_type> __il, size_type __n, 
-                                  const hasher& __hf, const allocator_type& __a)
-        : unordered_set(__il, __n, __hf, key_equal(), __a) {}
-#endif
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    // ~unordered_set() = default;
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_set& operator=(const unordered_set& __u)
-    {
-        __table_ = __u.__table_;
-        return *this;
-    }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_set& operator=(unordered_set&& __u)
-        _NOEXCEPT_(is_nothrow_move_assignable<__table>::value);
-#endif
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_set& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return __table_.end();}
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        pair<iterator, bool> emplace(_Args&&... __args)
-            {return __table_.__emplace_unique(_VSTD::forward<_Args>(__args)...);}
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_set::emplace_hint(const_iterator, args...) called with an iterator not"
-                " referring to this unordered_set");
-            return __table_.__emplace_unique(_VSTD::forward<_Args>(__args)...).first;
-        }
-#else
-        iterator emplace_hint(const_iterator, _Args&&... __args)
-            {return __table_.__emplace_unique(_VSTD::forward<_Args>(__args)...).first;}
-#endif
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool> insert(const value_type& __x)
-        {return __table_.__insert_unique(__x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, bool> insert(value_type&& __x)
-        {return __table_.__insert_unique(_VSTD::move(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    iterator insert(const_iterator __p, const value_type& __x)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_set::insert(const_iterator, const value_type&) called with an iterator not"
-                " referring to this unordered_set");
-            return insert(__x).first;
-        }
-#else
-    iterator insert(const_iterator, const value_type& __x)
-        {return insert(__x).first;}
-#endif
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    iterator insert(const_iterator __p, value_type&& __x)
-        {
-            _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__p) == this,
-                "unordered_set::insert(const_iterator, value_type&&) called with an iterator not"
-                " referring to this unordered_set");
-            return insert(_VSTD::move(__x)).first;
-        }
-#else
-    iterator insert(const_iterator, value_type&& __x)
-        {return insert(_VSTD::move(__x)).first;}
-#endif
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __table_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __first, const_iterator __last)
-        {return __table_.erase(__first, __last);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unordered_set& __u)
-        _NOEXCEPT_(__is_nothrow_swappable<__table>::value)
-        {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_function() const {return __table_.hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const {return __table_.key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_unique(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_unique(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_size(size_type __n) const {return __table_.bucket_size(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket(const key_type& __k) const {return __table_.bucket(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       begin(size_type __n)        {return __table_.begin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       end(size_type __n)          {return __table_.end(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator begin(size_type __n) const  {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator end(size_type __n) const    {return __table_.cend(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cbegin(size_type __n) const {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cend(size_type __n) const   {return __table_.cend(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float load_factor() const _NOEXCEPT {return __table_.load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    float max_load_factor() const _NOEXCEPT {return __table_.max_load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    void max_load_factor(float __mlf) {__table_.max_load_factor(__mlf);}
-    _LIBCPP_INLINE_VISIBILITY
-    void rehash(size_type __n) {__table_.rehash(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    void reserve(size_type __n) {__table_.reserve(__n);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const
-        {return __table_.__dereferenceable(__i);}
-    bool __decrementable(const const_iterator* __i) const
-        {return __table_.__decrementable(__i);}
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(__i, __n);}
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(__i, __n);}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-};
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        const allocator_type& __a)
-    : __table_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        const unordered_set& __u)
-    : __table_(__u.__table_)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        const unordered_set& __u, const allocator_type& __a)
-    : __table_(__u.__table_, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        unordered_set&& __u)
-    _NOEXCEPT_(is_nothrow_move_constructible<__table>::value)
-    : __table_(_VSTD::move(__u.__table_))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        unordered_set&& __u, const allocator_type& __a)
-    : __table_(_VSTD::move(__u.__table_), __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a != __u.get_allocator())
-    {
-        iterator __i = __u.begin();
-        while (__u.size() != 0)
-            __table_.__insert_unique(_VSTD::move(__u.__table_.remove(__i++)->__value_));
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    else
-        __get_db()->swap(this, &__u);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_set<_Value, _Hash, _Pred, _Alloc>::unordered_set(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_set<_Value, _Hash, _Pred, _Alloc>&
-unordered_set<_Value, _Hash, _Pred, _Alloc>::operator=(unordered_set&& __u)
-    _NOEXCEPT_(is_nothrow_move_assignable<__table>::value)
-{
-    __table_ = _VSTD::move(__u.__table_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_set<_Value, _Hash, _Pred, _Alloc>&
-unordered_set<_Value, _Hash, _Pred, _Alloc>::operator=(
-        initializer_list<value_type> __il)
-{
-    __table_.__assign_unique(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-unordered_set<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                    _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_unique(*__first);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-     unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-           const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename unordered_set<_Value, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(), __ey = __y.end();
-            __i != __ex; ++__i)
-    {
-        const_iterator __j = __y.find(*__i);
-        if (__j == __ey || !(*__i == *__j))
-            return false;
-    }
-    return true;
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unordered_set<_Value, _Hash, _Pred, _Alloc>& __x,
-           const unordered_set<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Value, class _Hash = hash<_Value>, class _Pred = equal_to<_Value>,
-          class _Alloc = allocator<_Value> >
-class _LIBCPP_TYPE_VIS_ONLY unordered_multiset
-{
-public:
-    // types
-    typedef _Value                                                     key_type;
-    typedef key_type                                                   value_type;
-    typedef _Hash                                                      hasher;
-    typedef _Pred                                                      key_equal;
-    typedef _Alloc                                                     allocator_type;
-    typedef value_type&                                                reference;
-    typedef const value_type&                                          const_reference;
-    static_assert((is_same<value_type, typename allocator_type::value_type>::value),
-                  "Invalid allocator::value_type");
-
-private:
-    typedef __hash_table<value_type, hasher, key_equal, allocator_type> __table;
-
-    __table __table_;
-
-public:
-    typedef typename __table::pointer         pointer;
-    typedef typename __table::const_pointer   const_pointer;
-    typedef typename __table::size_type       size_type;
-    typedef typename __table::difference_type difference_type;
-
-    typedef typename __table::const_iterator       iterator;
-    typedef typename __table::const_iterator       const_iterator;
-    typedef typename __table::const_local_iterator local_iterator;
-    typedef typename __table::const_local_iterator const_local_iterator;
-
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset()
-        _NOEXCEPT_(is_nothrow_default_constructible<__table>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    explicit unordered_multiset(size_type __n, const hasher& __hf = hasher(),
-                                const key_equal& __eql = key_equal());
-    unordered_multiset(size_type __n, const hasher& __hf,
-                       const key_equal& __eql, const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(size_type __n, const allocator_type& __a)
-        : unordered_multiset(__n, hasher(), key_equal(), __a) {}
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(size_type __n, const hasher& __hf, const allocator_type& __a)
-        : unordered_multiset(__n, __hf, key_equal(), __a) {}
-#endif
-    template <class _InputIterator>
-        unordered_multiset(_InputIterator __first, _InputIterator __last);
-    template <class _InputIterator>
-        unordered_multiset(_InputIterator __first, _InputIterator __last,
-                      size_type __n, const hasher& __hf = hasher(),
-                      const key_equal& __eql = key_equal());
-    template <class _InputIterator>
-        unordered_multiset(_InputIterator __first, _InputIterator __last,
-                      size_type __n , const hasher& __hf,
-                      const key_equal& __eql, const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    template <class _InputIterator>
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(_InputIterator __first, _InputIterator __last, 
-                       size_type __n, const allocator_type& __a)
-        : unordered_multiset(__first, __last, __n, hasher(), key_equal(), __a) {}
-    template <class _InputIterator>
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(_InputIterator __first, _InputIterator __last,
-                       size_type __n, const hasher& __hf, const allocator_type& __a)
-        : unordered_multiset(__first, __last, __n, __hf, key_equal(), __a) {}
-#endif
-    explicit unordered_multiset(const allocator_type& __a);
-    unordered_multiset(const unordered_multiset& __u);
-    unordered_multiset(const unordered_multiset& __u, const allocator_type& __a);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_multiset(unordered_multiset&& __u)
-        _NOEXCEPT_(is_nothrow_move_constructible<__table>::value);
-    unordered_multiset(unordered_multiset&& __u, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_multiset(initializer_list<value_type> __il);
-    unordered_multiset(initializer_list<value_type> __il, size_type __n,
-                       const hasher& __hf = hasher(),
-                       const key_equal& __eql = key_equal());
-    unordered_multiset(initializer_list<value_type> __il, size_type __n,
-                       const hasher& __hf, const key_equal& __eql,
-                       const allocator_type& __a);
-#if _LIBCPP_STD_VER > 11
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(initializer_list<value_type> __il, size_type __n, const allocator_type& __a)
-      : unordered_multiset(__il, __n, hasher(), key_equal(), __a) {}
-    inline _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset(initializer_list<value_type> __il, size_type __n, const hasher& __hf, const allocator_type& __a)
-      : unordered_multiset(__il, __n, __hf, key_equal(), __a) {}
-#endif
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    // ~unordered_multiset() = default;
-    _LIBCPP_INLINE_VISIBILITY
-    unordered_multiset& operator=(const unordered_multiset& __u)
-    {
-        __table_ = __u.__table_;
-        return *this;
-    }
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    unordered_multiset& operator=(unordered_multiset&& __u)
-        _NOEXCEPT_(is_nothrow_move_assignable<__table>::value);
-#endif
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    unordered_multiset& operator=(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(__table_.__node_alloc());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    bool      empty() const _NOEXCEPT {return __table_.size() == 0;}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT  {return __table_.size();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_size() const _NOEXCEPT {return __table_.max_size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       begin() _NOEXCEPT        {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       end() _NOEXCEPT          {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin()  const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()    const _NOEXCEPT {return __table_.end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cbegin() const _NOEXCEPT {return __table_.begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator cend()   const _NOEXCEPT {return __table_.end();}
-
-#if !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace(_Args&&... __args)
-            {return __table_.__emplace_multi(_VSTD::forward<_Args>(__args)...);}
-    template <class... _Args>
-        _LIBCPP_INLINE_VISIBILITY
-        iterator emplace_hint(const_iterator __p, _Args&&... __args)
-            {return __table_.__emplace_hint_multi(__p, _VSTD::forward<_Args>(__args)...);}
-#endif  // !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) && !defined(_LIBCPP_HAS_NO_VARIADICS)
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const value_type& __x) {return __table_.__insert_multi(__x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(value_type&& __x) {return __table_.__insert_multi(_VSTD::move(__x));}
-#endif
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, const value_type& __x)
-        {return __table_.__insert_multi(__p, __x);}
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __p, value_type&& __x)
-        {return __table_.__insert_multi(__p, _VSTD::move(__x));}
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    template <class _InputIterator>
-        void insert(_InputIterator __first, _InputIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void insert(initializer_list<value_type> __il)
-        {insert(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __p) {return __table_.erase(__p);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type erase(const key_type& __k) {return __table_.__erase_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator erase(const_iterator __first, const_iterator __last)
-        {return __table_.erase(__first, __last);}
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__table_.clear();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void swap(unordered_multiset& __u)
-        _NOEXCEPT_(__is_nothrow_swappable<__table>::value)
-        {__table_.swap(__u.__table_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    hasher hash_function() const {return __table_.hash_function();}
-    _LIBCPP_INLINE_VISIBILITY
-    key_equal key_eq() const {return __table_.key_eq();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       find(const key_type& __k)       {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator find(const key_type& __k) const {return __table_.find(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type count(const key_type& __k) const {return __table_.__count_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<iterator, iterator>             equal_range(const key_type& __k)
-        {return __table_.__equal_range_multi(__k);}
-    _LIBCPP_INLINE_VISIBILITY
-    pair<const_iterator, const_iterator> equal_range(const key_type& __k) const
-        {return __table_.__equal_range_multi(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_count() const _NOEXCEPT {return __table_.bucket_count();}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type max_bucket_count() const _NOEXCEPT {return __table_.max_bucket_count();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket_size(size_type __n) const {return __table_.bucket_size(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type bucket(const key_type& __k) const {return __table_.bucket(__k);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       begin(size_type __n)        {return __table_.begin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    local_iterator       end(size_type __n)          {return __table_.end(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator begin(size_type __n) const  {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator end(size_type __n) const    {return __table_.cend(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cbegin(size_type __n) const {return __table_.cbegin(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_local_iterator cend(size_type __n) const   {return __table_.cend(__n);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    float load_factor() const _NOEXCEPT {return __table_.load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    float max_load_factor() const _NOEXCEPT {return __table_.max_load_factor();}
-    _LIBCPP_INLINE_VISIBILITY
-    void max_load_factor(float __mlf) {__table_.max_load_factor(__mlf);}
-    _LIBCPP_INLINE_VISIBILITY
-    void rehash(size_type __n) {__table_.rehash(__n);}
-    _LIBCPP_INLINE_VISIBILITY
-    void reserve(size_type __n) {__table_.reserve(__n);}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const
-        {return __table_.__dereferenceable(__i);}
-    bool __decrementable(const const_iterator* __i) const
-        {return __table_.__decrementable(__i);}
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(__i, __n);}
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-        {return __table_.__addable(__i, __n);}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-};
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        size_type __n, const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        size_type __n, const hasher& __hf, const key_equal& __eql,
-        const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        _InputIterator __first, _InputIterator __last, size_type __n,
-        const hasher& __hf, const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__first, __last);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        const allocator_type& __a)
-    : __table_(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        const unordered_multiset& __u)
-    : __table_(__u.__table_)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        const unordered_multiset& __u, const allocator_type& __a)
-    : __table_(__u.__table_, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__u.bucket_count());
-    insert(__u.begin(), __u.end());
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        unordered_multiset&& __u)
-    _NOEXCEPT_(is_nothrow_move_constructible<__table>::value)
-    : __table_(_VSTD::move(__u.__table_))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__u);
-#endif
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        unordered_multiset&& __u, const allocator_type& __a)
-    : __table_(_VSTD::move(__u.__table_), __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a != __u.get_allocator())
-    {
-        iterator __i = __u.begin();
-        while (__u.size() != 0)
-            __table_.__insert_multi(_VSTD::move(__u.__table_.remove(__i++)->__value_));
-    }
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    else
-        __get_db()->swap(this, &__u);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql)
-    : __table_(__hf, __eql)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::unordered_multiset(
-        initializer_list<value_type> __il, size_type __n, const hasher& __hf,
-        const key_equal& __eql, const allocator_type& __a)
-    : __table_(__hf, __eql, __a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    __table_.rehash(__n);
-    insert(__il.begin(), __il.end());
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>&
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::operator=(
-        unordered_multiset&& __u)
-    _NOEXCEPT_(is_nothrow_move_assignable<__table>::value)
-{
-    __table_ = _VSTD::move(__u.__table_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>&
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::operator=(
-        initializer_list<value_type> __il)
-{
-    __table_.__assign_multi(__il.begin(), __il.end());
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-template <class _InputIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-unordered_multiset<_Value, _Hash, _Pred, _Alloc>::insert(_InputIterator __first,
-                                                         _InputIterator __last)
-{
-    for (; __first != __last; ++__first)
-        __table_.__insert_multi(*__first);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-     unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-bool
-operator==(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-           const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    if (__x.size() != __y.size())
-        return false;
-    typedef typename unordered_multiset<_Value, _Hash, _Pred, _Alloc>::const_iterator
-                                                                 const_iterator;
-    typedef pair<const_iterator, const_iterator> _EqRng;
-    for (const_iterator __i = __x.begin(), __ex = __x.end(); __i != __ex;)
-    {
-        _EqRng __xeq = __x.equal_range(*__i);
-        _EqRng __yeq = __y.equal_range(*__i);
-        if (_VSTD::distance(__xeq.first, __xeq.second) !=
-            _VSTD::distance(__yeq.first, __yeq.second) ||
-                  !_VSTD::is_permutation(__xeq.first, __xeq.second, __yeq.first))
-            return false;
-        __i = __xeq.second;
-    }
-    return true;
-}
-
-template <class _Value, class _Hash, class _Pred, class _Alloc>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __x,
-           const unordered_multiset<_Value, _Hash, _Pred, _Alloc>& __y)
-{
-    return !(__x == __y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_UNORDERED_SET
diff --git a/include.new/c++/v1/unwind-arm.h b/include.new/c++/v1/unwind-arm.h
deleted file mode 100644
index 23f2b79..0000000
--- a/include.new/c++/v1/unwind-arm.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/* 
- * Copyright 2012 David Chisnall. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */ 
-
-/**
- * ARM-specific unwind definitions.  These are taken from the ARM EHABI
- * specification.
- */
- typedef enum
-{
-	_URC_OK = 0,                /* operation completed successfully */
-	_URC_FOREIGN_EXCEPTION_CAUGHT = 1,
-    _URC_END_OF_STACK = 5,
-	_URC_HANDLER_FOUND = 6,
-	_URC_INSTALL_CONTEXT = 7,
-	_URC_CONTINUE_UNWIND = 8,
-	_URC_FAILURE = 9,            /* unspecified failure of some kind */
-	_URC_FATAL_PHASE1_ERROR = _URC_FAILURE
-} _Unwind_Reason_Code;
-
-typedef int _Unwind_Action;
-
-typedef uint32_t _Unwind_State;
-#ifdef __clang__
-static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME  = 0;
-static const _Unwind_State _US_UNWIND_FRAME_STARTING = 1;
-static const _Unwind_State _US_UNWIND_FRAME_RESUME   = 2;
-#else // GCC fails at knowing what a constant expression is
-#	define _US_VIRTUAL_UNWIND_FRAME  0
-#	define _US_UNWIND_FRAME_STARTING 1
-#	define _US_UNWIND_FRAME_RESUME 2
-#endif
-
-typedef struct _Unwind_Context _Unwind_Context;
-
-typedef uint32_t _Unwind_EHT_Header;
-
-struct _Unwind_Exception
-{
-	uint64_t exception_class;
-	void (*exception_cleanup)(_Unwind_Reason_Code, struct _Unwind_Exception *);
-	/* Unwinder cache, private fields for the unwinder's use */
-	struct
-	{
-		uint32_t reserved1;
-		uint32_t reserved2;
-		uint32_t reserved3;
-		uint32_t reserved4;
-		uint32_t reserved5;
-	/* init reserved1 to 0, then don't touch */
-	} unwinder_cache;
-	/* Propagation barrier cache (valid after phase 1): */
-	struct
-	{
-		uint32_t sp;
-		uint32_t bitpattern[5];
-	} barrier_cache;
-	/* Cleanup cache (preserved over cleanup): */
-	struct
-	{
-		uint32_t bitpattern[4];
-	} cleanup_cache;
-	/* Pr cache (for pr's benefit): */
-	struct
-	{
-		/** function start address */
-		uint32_t fnstart;
-		/** pointer to EHT entry header word */
-		_Unwind_EHT_Header *ehtp;
-		/** additional data */
-		uint32_t additional;
-		uint32_t reserved1;
-	} pr_cache;
-	/** Force alignment of next item to 8-byte boundary */
-	long long int :0;
-};
-
-/* Unwinding functions */
-_Unwind_Reason_Code _Unwind_RaiseException(struct _Unwind_Exception *ucbp);
-void _Unwind_Resume(struct _Unwind_Exception *ucbp);
-void _Unwind_Complete(struct _Unwind_Exception *ucbp);
-void _Unwind_DeleteException(struct _Unwind_Exception *ucbp);
-void *_Unwind_GetLanguageSpecificData(struct _Unwind_Context*);
-
-typedef enum
-{
-	_UVRSR_OK = 0,
-	_UVRSR_NOT_IMPLEMENTED = 1,
-	_UVRSR_FAILED = 2
-} _Unwind_VRS_Result;
-typedef enum
-{
-	_UVRSC_CORE = 0,
-	_UVRSC_VFP = 1,
-	_UVRSC_WMMXD = 3,
-	_UVRSC_WMMXC = 4
-} _Unwind_VRS_RegClass;
-typedef enum
-{
-	_UVRSD_UINT32 = 0,
-	_UVRSD_VFPX = 1,
-	_UVRSD_UINT64 = 3,
-	_UVRSD_FLOAT = 4,
-	_UVRSD_DOUBLE = 5
-} _Unwind_VRS_DataRepresentation;
-
-_Unwind_VRS_Result _Unwind_VRS_Get(_Unwind_Context *context,
-                                   _Unwind_VRS_RegClass regclass,
-                                   uint32_t regno,
-                                   _Unwind_VRS_DataRepresentation representation,
-                                   void *valuep);
-_Unwind_VRS_Result _Unwind_VRS_Set(_Unwind_Context *context,
-                                   _Unwind_VRS_RegClass regclass,
-                                   uint32_t regno,
-                                   _Unwind_VRS_DataRepresentation representation,
-                                   void *valuep);
-
-/* Return the base-address for data references.  */
-extern unsigned long _Unwind_GetDataRelBase(struct _Unwind_Context *);
-
-/* Return the base-address for text references.  */
-extern unsigned long _Unwind_GetTextRelBase(struct _Unwind_Context *);
-extern unsigned long _Unwind_GetRegionStart(struct _Unwind_Context *);
-
-typedef _Unwind_Reason_Code (*_Unwind_Trace_Fn) (struct _Unwind_Context *,
-						 void *);
-extern _Unwind_Reason_Code _Unwind_Backtrace (_Unwind_Trace_Fn, void *);
-extern _Unwind_Reason_Code
-	  _Unwind_Resume_or_Rethrow (struct _Unwind_Exception *);
-
-/**
- * The next set of functions are compatibility extensions, implementing Itanium
- * ABI functions on top of ARM ones.
- */
-
-#define _UA_SEARCH_PHASE	1
-#define _UA_CLEANUP_PHASE	2
-#define _UA_HANDLER_FRAME	4
-#define _UA_FORCE_UNWIND	8
-
-static inline unsigned long _Unwind_GetGR(struct _Unwind_Context *context, int reg)
-{
-	unsigned long val;
-	_Unwind_VRS_Get(context, _UVRSC_CORE, reg, _UVRSD_UINT32, &val);
-	return val;
-}
-static inline  void _Unwind_SetGR(struct _Unwind_Context *context, int reg, unsigned long val)
-{
-	_Unwind_VRS_Set(context, _UVRSC_CORE, reg, _UVRSD_UINT32, &val);
-}
-static inline unsigned long _Unwind_GetIP(_Unwind_Context *context)
-{
-	// Low bit store the thumb state - discard it
-	return _Unwind_GetGR(context, 15) & ~1;
-}
-static inline void _Unwind_SetIP(_Unwind_Context *context, unsigned long val)
-{
-	// The lowest bit of the instruction pointer indicates whether we're in
-	// thumb or ARM mode.  This is assumed to be fixed throughout a function,
-	// so must be propagated when setting the program counter.
-	unsigned long thumbState = _Unwind_GetGR(context, 15) & 1;
-   _Unwind_SetGR(context, 15, (val | thumbState));
-}
-
-/** GNU API function that unwinds the frame */
-_Unwind_Reason_Code __gnu_unwind_frame(struct _Unwind_Exception*, struct _Unwind_Context*);
-
-
-#define DECLARE_PERSONALITY_FUNCTION(name) \
-_Unwind_Reason_Code name(_Unwind_State state,\
-                         struct _Unwind_Exception *exceptionObject,\
-                         struct _Unwind_Context *context);
-
-#define BEGIN_PERSONALITY_FUNCTION(name) \
-_Unwind_Reason_Code name(_Unwind_State state,\
-                         struct _Unwind_Exception *exceptionObject,\
-                         struct _Unwind_Context *context)\
-{\
-	int version = 1;\
-	uint64_t exceptionClass = exceptionObject->exception_class;\
-	int actions;\
-	switch (state)\
-	{\
-		default: return _URC_FAILURE;\
-		case _US_VIRTUAL_UNWIND_FRAME:\
-		{\
-			actions = _UA_SEARCH_PHASE;\
-			break;\
-		}\
-		case _US_UNWIND_FRAME_STARTING:\
-		{\
-			actions = _UA_CLEANUP_PHASE;\
-			if (exceptionObject->barrier_cache.sp == _Unwind_GetGR(context, 13))\
-			{\
-				actions |= _UA_HANDLER_FRAME;\
-			}\
-			break;\
-		}\
-		case _US_UNWIND_FRAME_RESUME:\
-		{\
-			return continueUnwinding(exceptionObject, context);\
-			break;\
-		}\
-	}\
-	_Unwind_SetGR (context, 12, reinterpret_cast<unsigned long>(exceptionObject));\
-
-#define CALL_PERSONALITY_FUNCTION(name) name(state,exceptionObject,context)
diff --git a/include.new/c++/v1/unwind-itanium.h b/include.new/c++/v1/unwind-itanium.h
deleted file mode 100644
index 0ca9488..0000000
--- a/include.new/c++/v1/unwind-itanium.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/* libunwind - a platform-independent unwind library
-   Copyright (C) 2003 Hewlett-Packard Co
-	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
-
-This file is part of libunwind.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-
-#ifndef _UNWIND_H
-#define _UNWIND_H
-
-/* For uint64_t */
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Minimal interface as per C++ ABI draft standard:
-
-	http://www.codesourcery.com/cxx-abi/abi-eh.html */
-
-typedef enum
-  {
-    _URC_NO_REASON = 0,
-    _URC_FOREIGN_EXCEPTION_CAUGHT = 1,
-    _URC_FATAL_PHASE2_ERROR = 2,
-    _URC_FATAL_PHASE1_ERROR = 3,
-    _URC_NORMAL_STOP = 4,
-    _URC_END_OF_STACK = 5,
-    _URC_HANDLER_FOUND = 6,
-    _URC_INSTALL_CONTEXT = 7,
-    _URC_CONTINUE_UNWIND = 8
-  }
-_Unwind_Reason_Code;
-
-typedef int _Unwind_Action;
-
-#define _UA_SEARCH_PHASE	1
-#define _UA_CLEANUP_PHASE	2
-#define _UA_HANDLER_FRAME	4
-#define _UA_FORCE_UNWIND	8
-
-struct _Unwind_Context;		/* opaque data-structure */
-struct _Unwind_Exception;	/* forward-declaration */
-
-typedef void (*_Unwind_Exception_Cleanup_Fn) (_Unwind_Reason_Code,
-					      struct _Unwind_Exception *);
-
-typedef _Unwind_Reason_Code (*_Unwind_Stop_Fn) (int, _Unwind_Action,
-						uint64_t,
-						struct _Unwind_Exception *,
-						struct _Unwind_Context *,
-						void *);
-
-/* The C++ ABI requires exception_class, private_1, and private_2 to
-   be of type uint64 and the entire structure to be
-   double-word-aligned. Please note that exception_class stays 64-bit 
-   even on 32-bit machines for gcc compatibility.  */
-struct _Unwind_Exception
-  {
-    uint64_t exception_class;
-    _Unwind_Exception_Cleanup_Fn exception_cleanup;
-    unsigned long private_1;
-    unsigned long private_2;
-  } ;
-
-extern _Unwind_Reason_Code _Unwind_RaiseException (struct _Unwind_Exception *);
-extern _Unwind_Reason_Code _Unwind_ForcedUnwind (struct _Unwind_Exception *,
-						 _Unwind_Stop_Fn, void *);
-extern void _Unwind_Resume (struct _Unwind_Exception *);
-extern void _Unwind_DeleteException (struct _Unwind_Exception *);
-extern unsigned long _Unwind_GetGR (struct _Unwind_Context *, int);
-extern void _Unwind_SetGR (struct _Unwind_Context *, int, unsigned long);
-extern unsigned long _Unwind_GetIP (struct _Unwind_Context *);
-extern unsigned long _Unwind_GetIPInfo (struct _Unwind_Context *, int *);
-extern void _Unwind_SetIP (struct _Unwind_Context *, unsigned long);
-extern unsigned long _Unwind_GetLanguageSpecificData (struct _Unwind_Context*);
-extern unsigned long _Unwind_GetRegionStart (struct _Unwind_Context *);
-
-#ifdef _GNU_SOURCE
-
-/* Callback for _Unwind_Backtrace().  The backtrace stops immediately
-   if the callback returns any value other than _URC_NO_REASON. */
-typedef _Unwind_Reason_Code (*_Unwind_Trace_Fn) (struct _Unwind_Context *,
-						 void *);
-
-/* See http://gcc.gnu.org/ml/gcc-patches/2001-09/msg00082.html for why
-   _UA_END_OF_STACK exists.  */
-# define _UA_END_OF_STACK	16
-
-/* If the unwind was initiated due to a forced unwind, resume that
-   operation, else re-raise the exception.  This is used by
-   __cxa_rethrow().  */
-extern _Unwind_Reason_Code
-	  _Unwind_Resume_or_Rethrow (struct _Unwind_Exception *);
-
-/* See http://gcc.gnu.org/ml/gcc-patches/2003-09/msg00154.html for why
-   _Unwind_GetBSP() exists.  */
-extern unsigned long _Unwind_GetBSP (struct _Unwind_Context *);
-
-/* Return the "canonical frame address" for the given context.
-   This is used by NPTL... */
-extern unsigned long _Unwind_GetCFA (struct _Unwind_Context *);
-
-/* Return the base-address for data references.  */
-extern unsigned long _Unwind_GetDataRelBase (struct _Unwind_Context *);
-
-/* Return the base-address for text references.  */
-extern unsigned long _Unwind_GetTextRelBase (struct _Unwind_Context *);
-
-/* Call _Unwind_Trace_Fn once for each stack-frame, without doing any
-   cleanup.  The first frame for which the callback is invoked is the
-   one for the caller of _Unwind_Backtrace().  _Unwind_Backtrace()
-   returns _URC_END_OF_STACK when the backtrace stopped due to
-   reaching the end of the call-chain or _URC_FATAL_PHASE1_ERROR if it
-   stops for any other reason.  */
-extern _Unwind_Reason_Code _Unwind_Backtrace (_Unwind_Trace_Fn, void *);
-
-/* Find the start-address of the procedure containing the specified IP
-   or NULL if it cannot be found (e.g., because the function has no
-   unwind info).  Note: there is not necessarily a one-to-one
-   correspondence between source-level functions and procedures: some
-   functions don't have unwind-info and others are split into multiple
-   procedures.  */
-extern void *_Unwind_FindEnclosingFunction (void *);
-
-/* See also Linux Standard Base Spec:
-    http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/libgcc-s.html */
-
-#endif /* _GNU_SOURCE */
-
-#define DECLARE_PERSONALITY_FUNCTION(name) \
-_Unwind_Reason_Code name(int version,\
-                         _Unwind_Action actions,\
-                         uint64_t exceptionClass,\
-                         struct _Unwind_Exception *exceptionObject,\
-                         struct _Unwind_Context *context);
-#define BEGIN_PERSONALITY_FUNCTION(name) \
-_Unwind_Reason_Code name(int version,\
-                         _Unwind_Action actions,\
-                         uint64_t exceptionClass,\
-                         struct _Unwind_Exception *exceptionObject,\
-                         struct _Unwind_Context *context)\
-{
-
-#define CALL_PERSONALITY_FUNCTION(name) name(version, actions, exceptionClass, exceptionObject, context)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _UNWIND_H */
diff --git a/include.new/c++/v1/unwind.h b/include.new/c++/v1/unwind.h
deleted file mode 100644
index 130dd6d..0000000
--- a/include.new/c++/v1/unwind.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
- * Copyright 2012 David Chisnall. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */ 
-
-#ifndef UNWIND_H_INCLUDED
-#define UNWIND_H_INCLUDED
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__arm__) && !defined(__ARM_DWARF_EH__)
-#include "unwind-arm.h"
-#else
-#include "unwind-itanium.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/c++/v1/utility b/include.new/c++/v1/utility
deleted file mode 100644
index 6f324db..0000000
--- a/include.new/c++/v1/utility
+++ /dev/null
@@ -1,768 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- utility -----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_UTILITY
-#define _LIBCPP_UTILITY
-
-/*
-    utility synopsis
-
-namespace std
-{
-
-template <class T>
-    void
-    swap(T& a, T& b);
-
-namespace rel_ops
-{
-    template<class T> bool operator!=(const T&, const T&);
-    template<class T> bool operator> (const T&, const T&);
-    template<class T> bool operator<=(const T&, const T&);
-    template<class T> bool operator>=(const T&, const T&);
-}
-
-template<class T>
-void
-swap(T& a, T& b) noexcept(is_nothrow_move_constructible<T>::value &&
-                          is_nothrow_move_assignable<T>::value);
-
-template <class T, size_t N>
-void
-swap(T (&a)[N], T (&b)[N]) noexcept(noexcept(swap(*a, *b)));
-
-template <class T> T&& forward(typename remove_reference<T>::type& t) noexcept;  // constexpr in C++14
-template <class T> T&& forward(typename remove_reference<T>::type&& t) noexcept; // constexpr in C++14
-
-template <class T> typename remove_reference<T>::type&& move(T&&) noexcept;      // constexpr in C++14
-
-template <class T>
-    typename conditional
-    <
-        !is_nothrow_move_constructible<T>::value && is_copy_constructible<T>::value,
-        const T&,
-        T&&
-    >::type
-    move_if_noexcept(T& x) noexcept; // constexpr in C++14
-
-template <class T> typename add_rvalue_reference<T>::type declval() noexcept;
-
-template <class T1, class T2>
-struct pair
-{
-    typedef T1 first_type;
-    typedef T2 second_type;
-
-    T1 first;
-    T2 second;
-
-    pair(const pair&) = default;
-    pair(pair&&) = default;
-    constexpr pair();
-    pair(const T1& x, const T2& y);                          // constexpr in C++14
-    template <class U, class V> pair(U&& x, V&& y);          // constexpr in C++14
-    template <class U, class V> pair(const pair<U, V>& p);   // constexpr in C++14
-    template <class U, class V> pair(pair<U, V>&& p);        // constexpr in C++14
-    template <class... Args1, class... Args2>
-        pair(piecewise_construct_t, tuple<Args1...> first_args,
-             tuple<Args2...> second_args);
-
-    template <class U, class V> pair& operator=(const pair<U, V>& p);
-    pair& operator=(pair&& p) noexcept(is_nothrow_move_assignable<T1>::value &&
-                                       is_nothrow_move_assignable<T2>::value);
-    template <class U, class V> pair& operator=(pair<U, V>&& p);
-
-    void swap(pair& p) noexcept(noexcept(swap(first, p.first)) &&
-                                noexcept(swap(second, p.second)));
-};
-
-template <class T1, class T2> bool operator==(const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator!=(const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator< (const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator> (const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator>=(const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-template <class T1, class T2> bool operator<=(const pair<T1,T2>&, const pair<T1,T2>&); // constexpr in C++14
-
-template <class T1, class T2> pair<V1, V2> make_pair(T1&&, T2&&);   // constexpr in C++14
-template <class T1, class T2>
-void
-swap(pair<T1, T2>& x, pair<T1, T2>& y) noexcept(noexcept(x.swap(y)));
-
-struct piecewise_construct_t { };
-constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t();
-
-template <class T> class tuple_size;
-template <size_t I, class T> class tuple_element;
-
-template <class T1, class T2> struct tuple_size<pair<T1, T2> >;
-template <class T1, class T2> struct tuple_element<0, pair<T1, T2> >;
-template <class T1, class T2> struct tuple_element<1, pair<T1, T2> >;
-
-template<size_t I, class T1, class T2>
-    typename tuple_element<I, pair<T1, T2> >::type&
-    get(pair<T1, T2>&) noexcept; // constexpr in C++14
-
-template<size_t I, class T1, class T2>
-    const typename const tuple_element<I, pair<T1, T2> >::type&
-    get(const pair<T1, T2>&) noexcept; // constexpr in C++14
-
-template<size_t I, class T1, class T2>
-    typename tuple_element<I, pair<T1, T2> >::type&&
-    get(pair<T1, T2>&&) noexcept; // constexpr in C++14
-
-template<class T1, class T2>
-    constexpr T1& get(pair<T1, T2>&) noexcept; // C++14
-
-template<size_t I, class T1, class T2>
-    constexpr T1 const& get(pair<T1, T2> const &) noexcept; // C++14
-
-template<size_t I, class T1, class T2>
-    constexpr T1&& get(pair<T1, T2>&&) noexcept; // C++14
-
-// C++14
-
-template<class T, T... I>
-struct integer_sequence
-{
-    typedef T value_type;
-
-    static constexpr size_t size() noexcept;
-};
-
-template<size_t... I>
-  using index_sequence = integer_sequence<size_t, I...>;
-
-template<class T, T N>
-  using make_integer_sequence = integer_sequence<T, 0, 1, ..., N-1>;
-template<size_t N>
-  using make_index_sequence = make_integer_sequence<size_t, N>;
-
-template<class... T>
-  using index_sequence_for = make_index_sequence<sizeof...(T)>;
-
-template<class T, class U=T> 
-    T exchange(T& obj, U&& new_value);
-}  // std
-
-*/
-
-#include <__config>
-#include <__tuple>
-#include <type_traits>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-namespace rel_ops
-{
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const _Tp& __x, const _Tp& __y)
-{
-    return !(__x == __y);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const _Tp& __x, const _Tp& __y)
-{
-    return __y < __x;
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const _Tp& __x, const _Tp& __y)
-{
-    return !(__y < __x);
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const _Tp& __x, const _Tp& __y)
-{
-    return !(__x < __y);
-}
-
-}  // rel_ops
-
-// swap_ranges
-
-template <class _ForwardIterator1, class _ForwardIterator2>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator2
-swap_ranges(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2)
-{
-    for(; __first1 != __last1; ++__first1, (void) ++__first2)
-        swap(*__first1, *__first2);
-    return __first2;
-}
-
-template<class _Tp, size_t _Np>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(_Tp (&__a)[_Np], _Tp (&__b)[_Np]) _NOEXCEPT_(__is_nothrow_swappable<_Tp>::value)
-{
-    _VSTD::swap_ranges(__a, __a + _Np, __b);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-typename conditional
-<
-    !is_nothrow_move_constructible<_Tp>::value && is_copy_constructible<_Tp>::value,
-    const _Tp&,
-    _Tp&&
->::type
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-const _Tp&
-#endif
-move_if_noexcept(_Tp& __x) _NOEXCEPT
-{
-    return _VSTD::move(__x);
-}
-
-struct _LIBCPP_TYPE_VIS_ONLY piecewise_construct_t { };
-#if defined(_LIBCPP_HAS_NO_CONSTEXPR) || defined(_LIBCPP_BUILDING_UTILITY)
-extern const piecewise_construct_t piecewise_construct;// = piecewise_construct_t();
-#else
-constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t();
-#endif
-
-template <class _T1, class _T2>
-struct _LIBCPP_TYPE_VIS_ONLY pair
-{
-    typedef _T1 first_type;
-    typedef _T2 second_type;
-
-    _T1 first;
-    _T2 second;
-
-    // pair(const pair&) = default;
-    // pair(pair&&) = default;
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR pair() : first(), second() {}
-
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    pair(const _T1& __x, const _T2& __y)
-        : first(__x), second(__y) {}
-
-    template<class _U1, class _U2>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        pair(const pair<_U1, _U2>& __p
-#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
-                 ,typename enable_if<is_convertible<const _U1&, _T1>::value &&
-                                    is_convertible<const _U2&, _T2>::value>::type* = 0
-#endif
-                                      )
-            : first(__p.first), second(__p.second) {}
-
-#if !defined(_LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS) && _LIBCPP_TRIVIAL_PAIR_COPY_CTOR
-    _LIBCPP_INLINE_VISIBILITY
-    pair(const pair& __p) = default;
-#elif !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES) || !_LIBCPP_TRIVIAL_PAIR_COPY_CTOR
-    _LIBCPP_INLINE_VISIBILITY
-    pair(const pair& __p)
-        _NOEXCEPT_(is_nothrow_copy_constructible<first_type>::value &&
-                   is_nothrow_copy_constructible<second_type>::value)
-        : first(__p.first),
-          second(__p.second)
-    {
-    }
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair& operator=(const pair& __p)
-        _NOEXCEPT_(is_nothrow_copy_assignable<first_type>::value &&
-                   is_nothrow_copy_assignable<second_type>::value)
-    {
-        first = __p.first;
-        second = __p.second;
-        return *this;
-    }
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _U1, class _U2,
-              class = typename enable_if<is_convertible<_U1, first_type>::value &&
-                                         is_convertible<_U2, second_type>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        pair(_U1&& __u1, _U2&& __u2)
-            : first(_VSTD::forward<_U1>(__u1)),
-              second(_VSTD::forward<_U2>(__u2))
-            {}
-
-    template<class _U1, class _U2>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        pair(pair<_U1, _U2>&& __p,
-                 typename enable_if<is_convertible<_U1, _T1>::value &&
-                                    is_convertible<_U2, _T2>::value>::type* = 0)
-            : first(_VSTD::forward<_U1>(__p.first)),
-              second(_VSTD::forward<_U2>(__p.second)) {}
-
-#ifndef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
-    _LIBCPP_INLINE_VISIBILITY
-    pair(pair&& __p) = default;
-#else
-    _LIBCPP_INLINE_VISIBILITY
-    pair(pair&& __p) _NOEXCEPT_(is_nothrow_move_constructible<first_type>::value &&
-                                is_nothrow_move_constructible<second_type>::value)
-        : first(_VSTD::forward<first_type>(__p.first)),
-          second(_VSTD::forward<second_type>(__p.second))
-    {
-    }
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY
-    pair&
-    operator=(pair&& __p) _NOEXCEPT_(is_nothrow_move_assignable<first_type>::value &&
-                                     is_nothrow_move_assignable<second_type>::value)
-    {
-        first = _VSTD::forward<first_type>(__p.first);
-        second = _VSTD::forward<second_type>(__p.second);
-        return *this;
-    }
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-    template<class _Tuple,
-             class = typename enable_if<__tuple_convertible<_Tuple, pair>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-        pair(_Tuple&& __p)
-            : first(_VSTD::forward<typename tuple_element<0,
-                                  typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<0>(__p))),
-              second(_VSTD::forward<typename tuple_element<1,
-                                   typename __make_tuple_types<_Tuple>::type>::type>(_VSTD::get<1>(__p)))
-            {}
-
-
-
-    template <class... _Args1, class... _Args2>
-        _LIBCPP_INLINE_VISIBILITY
-        pair(piecewise_construct_t __pc, tuple<_Args1...> __first_args,
-                                    tuple<_Args2...> __second_args)
-            : pair(__pc, __first_args, __second_args,
-                   typename __make_tuple_indices<sizeof...(_Args1)>::type(),
-                   typename __make_tuple_indices<sizeof...(_Args2) >::type())
-            {}
-
-    template <class _Tuple,
-              class = typename enable_if<__tuple_assignable<_Tuple, pair>::value>::type>
-        _LIBCPP_INLINE_VISIBILITY
-        pair&
-        operator=(_Tuple&& __p)
-        {
-            typedef typename __make_tuple_types<_Tuple>::type _TupleRef;
-            typedef typename tuple_element<0, _TupleRef>::type _U0;
-            typedef typename tuple_element<1, _TupleRef>::type _U1;
-            first  = _VSTD::forward<_U0>(_VSTD::get<0>(__p));
-            second = _VSTD::forward<_U1>(_VSTD::get<1>(__p));
-            return *this;
-        }
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    void
-    swap(pair& __p) _NOEXCEPT_(__is_nothrow_swappable<first_type>::value &&
-                               __is_nothrow_swappable<second_type>::value)
-    {
-        _VSTD::iter_swap(&first, &__p.first);
-        _VSTD::iter_swap(&second, &__p.second);
-    }
-private:
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args1, class... _Args2, size_t... _I1, size_t... _I2>
-        _LIBCPP_INLINE_VISIBILITY
-        pair(piecewise_construct_t,
-             tuple<_Args1...>& __first_args, tuple<_Args2...>& __second_args,
-             __tuple_indices<_I1...>, __tuple_indices<_I2...>);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-};
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator==(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return __x.first == __y.first && __x.second == __y.second;
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator!=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator< (const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return __x.first < __y.first || (!(__y.first < __x.first) && __x.second < __y.second);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator> (const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return __y < __x;
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator>=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-bool
-operator<=(const pair<_T1,_T2>& __x, const pair<_T1,_T2>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_swappable<_T1>::value &&
-    __is_swappable<_T2>::value,
-    void
->::type
-swap(pair<_T1, _T2>& __x, pair<_T1, _T2>& __y)
-                     _NOEXCEPT_((__is_nothrow_swappable<_T1>::value &&
-                                 __is_nothrow_swappable<_T2>::value))
-{
-    __x.swap(__y);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY reference_wrapper;
-
-template <class _Tp>
-struct __make_pair_return_impl
-{
-    typedef _Tp type;
-};
-
-template <class _Tp>
-struct __make_pair_return_impl<reference_wrapper<_Tp>>
-{
-    typedef _Tp& type;
-};
-
-template <class _Tp>
-struct __make_pair_return
-{
-    typedef typename __make_pair_return_impl<typename decay<_Tp>::type>::type type;
-};
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-pair<typename __make_pair_return<_T1>::type, typename __make_pair_return<_T2>::type>
-make_pair(_T1&& __t1, _T2&& __t2)
-{
-    return pair<typename __make_pair_return<_T1>::type, typename __make_pair_return<_T2>::type>
-               (_VSTD::forward<_T1>(__t1), _VSTD::forward<_T2>(__t2));
-}
-
-#else  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_T1,_T2>
-make_pair(_T1 __x, _T2 __y)
-{
-    return pair<_T1, _T2>(__x, __y);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _T1, class _T2>
-  class _LIBCPP_TYPE_VIS_ONLY tuple_size<pair<_T1, _T2> >
-    : public integral_constant<size_t, 2> {};
-
-template <class _T1, class _T2>
-  class _LIBCPP_TYPE_VIS_ONLY tuple_size<const pair<_T1, _T2> >
-    : public integral_constant<size_t, 2> {};
-
-template <class _T1, class _T2>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<0, pair<_T1, _T2> >
-{
-public:
-    typedef _T1 type;
-};
-
-template <class _T1, class _T2>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<1, pair<_T1, _T2> >
-{
-public:
-    typedef _T2 type;
-};
-
-template <class _T1, class _T2>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<0, const pair<_T1, _T2> >
-{
-public:
-    typedef const _T1 type;
-};
-
-template <class _T1, class _T2>
-class _LIBCPP_TYPE_VIS_ONLY tuple_element<1, const pair<_T1, _T2> >
-{
-public:
-    typedef const _T2 type;
-};
-
-template <size_t _Ip> struct __get_pair;
-
-template <>
-struct __get_pair<0>
-{
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    _T1&
-    get(pair<_T1, _T2>& __p) _NOEXCEPT {return __p.first;}
-
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const _T1&
-    get(const pair<_T1, _T2>& __p) _NOEXCEPT {return __p.first;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    _T1&&
-    get(pair<_T1, _T2>&& __p) _NOEXCEPT {return _VSTD::forward<_T1>(__p.first);}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-template <>
-struct __get_pair<1>
-{
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    _T2&
-    get(pair<_T1, _T2>& __p) _NOEXCEPT {return __p.second;}
-
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    const _T2&
-    get(const pair<_T1, _T2>& __p) _NOEXCEPT {return __p.second;}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class _T1, class _T2>
-    static
-    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-    _T2&&
-    get(pair<_T1, _T2>&& __p) _NOEXCEPT {return _VSTD::forward<_T2>(__p.second);}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-};
-
-template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-get(pair<_T1, _T2>& __p) _NOEXCEPT
-{
-    return __get_pair<_Ip>::get(__p);
-}
-
-template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
-get(const pair<_T1, _T2>& __p) _NOEXCEPT
-{
-    return __get_pair<_Ip>::get(__p);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <size_t _Ip, class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR_AFTER_CXX11
-typename tuple_element<_Ip, pair<_T1, _T2> >::type&&
-get(pair<_T1, _T2>&& __p) _NOEXCEPT
-{
-    return __get_pair<_Ip>::get(_VSTD::move(__p));
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#if _LIBCPP_STD_VER > 11
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 & get(pair<_T1, _T2>& __p) _NOEXCEPT
-{
-    return __get_pair<0>::get(__p);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 const & get(pair<_T1, _T2> const& __p) _NOEXCEPT
-{
-    return __get_pair<0>::get(__p);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 && get(pair<_T1, _T2>&& __p) _NOEXCEPT
-{
-    return __get_pair<0>::get(_VSTD::move(__p));
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 & get(pair<_T2, _T1>& __p) _NOEXCEPT
-{
-    return __get_pair<1>::get(__p);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 const & get(pair<_T2, _T1> const& __p) _NOEXCEPT
-{
-    return __get_pair<1>::get(__p);
-}
-
-template <class _T1, class _T2>
-inline _LIBCPP_INLINE_VISIBILITY
-constexpr _T1 && get(pair<_T2, _T1>&& __p) _NOEXCEPT
-{
-    return __get_pair<1>::get(_VSTD::move(__p));
-}
-
-#endif
-
-#if _LIBCPP_STD_VER > 11
-
-template<class _Tp, _Tp... _Ip>
-struct _LIBCPP_TYPE_VIS_ONLY integer_sequence
-{
-    typedef _Tp value_type;
-    static_assert( is_integral<_Tp>::value,
-                  "std::integer_sequence can only be instantiated with an integral type" );
-    static
-    _LIBCPP_INLINE_VISIBILITY
-    constexpr
-    size_t
-    size() noexcept { return sizeof...(_Ip); }
-};
-
-template<size_t... _Ip>
-    using index_sequence = integer_sequence<size_t, _Ip...>;
-
-namespace __detail {
-
-template<typename _Tp, size_t ..._Extra> struct __repeat;
-template<typename _Tp, _Tp ..._Np, size_t ..._Extra> struct __repeat<integer_sequence<_Tp, _Np...>, _Extra...> {
-  typedef integer_sequence<_Tp,
-                           _Np...,
-                           sizeof...(_Np) + _Np...,
-                           2 * sizeof...(_Np) + _Np...,
-                           3 * sizeof...(_Np) + _Np...,
-                           4 * sizeof...(_Np) + _Np...,
-                           5 * sizeof...(_Np) + _Np...,
-                           6 * sizeof...(_Np) + _Np...,
-                           7 * sizeof...(_Np) + _Np...,
-                           _Extra...> type;
-};
-
-template<size_t _Np> struct __parity;
-template<size_t _Np> struct __make : __parity<_Np % 8>::template __pmake<_Np> {};
-
-template<> struct __make<0> { typedef integer_sequence<size_t> type; };
-template<> struct __make<1> { typedef integer_sequence<size_t, 0> type; };
-template<> struct __make<2> { typedef integer_sequence<size_t, 0, 1> type; };
-template<> struct __make<3> { typedef integer_sequence<size_t, 0, 1, 2> type; };
-template<> struct __make<4> { typedef integer_sequence<size_t, 0, 1, 2, 3> type; };
-template<> struct __make<5> { typedef integer_sequence<size_t, 0, 1, 2, 3, 4> type; };
-template<> struct __make<6> { typedef integer_sequence<size_t, 0, 1, 2, 3, 4, 5> type; };
-template<> struct __make<7> { typedef integer_sequence<size_t, 0, 1, 2, 3, 4, 5, 6> type; };
-
-template<> struct __parity<0> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type> {}; };
-template<> struct __parity<1> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 1> {}; };
-template<> struct __parity<2> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<3> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<4> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<5> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<6> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-template<> struct __parity<7> { template<size_t _Np> struct __pmake : __repeat<typename __make<_Np / 8>::type, _Np - 7, _Np - 6, _Np - 5, _Np - 4, _Np - 3, _Np - 2, _Np - 1> {}; };
-
-template<typename _Tp, typename _Up> struct __convert {
-  template<typename> struct __result;
-  template<_Tp ..._Np> struct __result<integer_sequence<_Tp, _Np...> > { typedef integer_sequence<_Up, _Np...> type; };
-};
-template<typename _Tp> struct __convert<_Tp, _Tp> { template<typename _Up> struct __result { typedef _Up type; }; };
-
-}
-
-template<typename _Tp, _Tp _Np> using __make_integer_sequence_unchecked =
-  typename __detail::__convert<size_t, _Tp>::template __result<typename __detail::__make<_Np>::type>::type;
-
-template <class _Tp, _Tp _Ep>
-struct __make_integer_sequence
-{
-    static_assert(is_integral<_Tp>::value,
-                  "std::make_integer_sequence can only be instantiated with an integral type" );
-    static_assert(0 <= _Ep, "std::make_integer_sequence input shall not be negative");
-    typedef __make_integer_sequence_unchecked<_Tp, _Ep> type;
-};
-
-template<class _Tp, _Tp _Np>
-    using make_integer_sequence = typename __make_integer_sequence<_Tp, _Np>::type;
-
-template<size_t _Np>
-    using make_index_sequence = make_integer_sequence<size_t, _Np>;
-
-template<class... _Tp>
-    using index_sequence_for = make_index_sequence<sizeof...(_Tp)>;
-  
-#endif  // _LIBCPP_STD_VER > 11
-
-#if _LIBCPP_STD_VER > 11
-template<class _T1, class _T2 = _T1>
-inline _LIBCPP_INLINE_VISIBILITY
-_T1 exchange(_T1& __obj, _T2 && __new_value)
-{
-    _T1 __old_value = _VSTD::move(__obj);
-    __obj = _VSTD::forward<_T2>(__new_value);
-    return __old_value;
-}    
-#endif  // _LIBCPP_STD_VER > 11
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_UTILITY
diff --git a/include.new/c++/v1/valarray b/include.new/c++/v1/valarray
deleted file mode 100644
index 2b94204..0000000
--- a/include.new/c++/v1/valarray
+++ /dev/null
@@ -1,4782 +0,0 @@
-// -*- C++ -*-
-//===-------------------------- valarray ----------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_VALARRAY
-#define _LIBCPP_VALARRAY
-
-/*
-    valarray synopsis
-
-namespace std
-{
-
-template<class T>
-class valarray
-{
-public:
-    typedef T value_type;
-
-    // construct/destroy:
-    valarray();
-    explicit valarray(size_t n);
-    valarray(const value_type& x, size_t n);
-    valarray(const value_type* px, size_t n);
-    valarray(const valarray& v);
-    valarray(valarray&& v) noexcept;
-    valarray(const slice_array<value_type>& sa);
-    valarray(const gslice_array<value_type>& ga);
-    valarray(const mask_array<value_type>& ma);
-    valarray(const indirect_array<value_type>& ia);
-    valarray(initializer_list<value_type> il);
-    ~valarray();
-
-    // assignment:
-    valarray& operator=(const valarray& v);
-    valarray& operator=(valarray&& v) noexcept;
-    valarray& operator=(initializer_list<value_type> il);
-    valarray& operator=(const value_type& x);
-    valarray& operator=(const slice_array<value_type>& sa);
-    valarray& operator=(const gslice_array<value_type>& ga);
-    valarray& operator=(const mask_array<value_type>& ma);
-    valarray& operator=(const indirect_array<value_type>& ia);
-
-    // element access:
-    const value_type& operator[](size_t i) const;
-    value_type&       operator[](size_t i);
-
-    // subset operations:
-    valarray                   operator[](slice s) const;
-    slice_array<value_type>    operator[](slice s);
-    valarray                   operator[](const gslice& gs) const;
-    gslice_array<value_type>   operator[](const gslice& gs);
-    valarray                   operator[](const valarray<bool>& vb) const;
-    mask_array<value_type>     operator[](const valarray<bool>& vb);
-    valarray                   operator[](const valarray<size_t>& vs) const;
-    indirect_array<value_type> operator[](const valarray<size_t>& vs);
-
-    // unary operators:
-    valarray       operator+() const;
-    valarray       operator-() const;
-    valarray       operator~() const;
-    valarray<bool> operator!() const;
-
-    // computed assignment:
-    valarray& operator*= (const value_type& x);
-    valarray& operator/= (const value_type& x);
-    valarray& operator%= (const value_type& x);
-    valarray& operator+= (const value_type& x);
-    valarray& operator-= (const value_type& x);
-    valarray& operator^= (const value_type& x);
-    valarray& operator&= (const value_type& x);
-    valarray& operator|= (const value_type& x);
-    valarray& operator<<=(const value_type& x);
-    valarray& operator>>=(const value_type& x);
-
-    valarray& operator*= (const valarray& v);
-    valarray& operator/= (const valarray& v);
-    valarray& operator%= (const valarray& v);
-    valarray& operator+= (const valarray& v);
-    valarray& operator-= (const valarray& v);
-    valarray& operator^= (const valarray& v);
-    valarray& operator|= (const valarray& v);
-    valarray& operator&= (const valarray& v);
-    valarray& operator<<=(const valarray& v);
-    valarray& operator>>=(const valarray& v);
-
-    // member functions:
-    void swap(valarray& v) noexcept;
-
-    size_t size() const;
-
-    value_type sum() const;
-    value_type min() const;
-    value_type max() const;
-
-    valarray shift (int i) const;
-    valarray cshift(int i) const;
-    valarray apply(value_type f(value_type)) const;
-    valarray apply(value_type f(const value_type&)) const;
-    void resize(size_t n, value_type x = value_type());
-};
-
-class slice
-{
-public:
-    slice();
-    slice(size_t start, size_t size, size_t stride);
-
-    size_t start()  const;
-    size_t size()   const;
-    size_t stride() const;
-};
-
-template <class T>
-class slice_array
-{
-public:
-    typedef T value_type;
-
-    const slice_array& operator=(const slice_array& sa) const;
-    void operator=  (const valarray<value_type>& v) const;
-    void operator*= (const valarray<value_type>& v) const;
-    void operator/= (const valarray<value_type>& v) const;
-    void operator%= (const valarray<value_type>& v) const;
-    void operator+= (const valarray<value_type>& v) const;
-    void operator-= (const valarray<value_type>& v) const;
-    void operator^= (const valarray<value_type>& v) const;
-    void operator&= (const valarray<value_type>& v) const;
-    void operator|= (const valarray<value_type>& v) const;
-    void operator<<=(const valarray<value_type>& v) const;
-    void operator>>=(const valarray<value_type>& v) const;
-
-    void operator=(const value_type& x) const;
-
-    slice_array() = delete;
-};
-
-class gslice
-{
-public:
-    gslice();
-    gslice(size_t start, const valarray<size_t>& size,
-                         const valarray<size_t>& stride);
-
-    size_t           start()  const;
-    valarray<size_t> size()   const;
-    valarray<size_t> stride() const;
-};
-
-template <class T>
-class gslice_array
-{
-public:
-    typedef T value_type;
-
-    void operator=  (const valarray<value_type>& v) const;
-    void operator*= (const valarray<value_type>& v) const;
-    void operator/= (const valarray<value_type>& v) const;
-    void operator%= (const valarray<value_type>& v) const;
-    void operator+= (const valarray<value_type>& v) const;
-    void operator-= (const valarray<value_type>& v) const;
-    void operator^= (const valarray<value_type>& v) const;
-    void operator&= (const valarray<value_type>& v) const;
-    void operator|= (const valarray<value_type>& v) const;
-    void operator<<=(const valarray<value_type>& v) const;
-    void operator>>=(const valarray<value_type>& v) const;
-
-    gslice_array(const gslice_array& ga);
-    ~gslice_array();
-    const gslice_array& operator=(const gslice_array& ga) const;
-    void operator=(const value_type& x) const;
-
-    gslice_array() = delete;
-};
-
-template <class T>
-class mask_array
-{
-public:
-    typedef T value_type;
-
-    void operator=  (const valarray<value_type>& v) const;
-    void operator*= (const valarray<value_type>& v) const;
-    void operator/= (const valarray<value_type>& v) const;
-    void operator%= (const valarray<value_type>& v) const;
-    void operator+= (const valarray<value_type>& v) const;
-    void operator-= (const valarray<value_type>& v) const;
-    void operator^= (const valarray<value_type>& v) const;
-    void operator&= (const valarray<value_type>& v) const;
-    void operator|= (const valarray<value_type>& v) const;
-    void operator<<=(const valarray<value_type>& v) const;
-    void operator>>=(const valarray<value_type>& v) const;
-
-    mask_array(const mask_array& ma);
-    ~mask_array();
-    const mask_array& operator=(const mask_array& ma) const;
-    void operator=(const value_type& x) const;
-
-    mask_array() = delete;
-};
-
-template <class T>
-class indirect_array
-{
-public:
-    typedef T value_type;
-
-    void operator=  (const valarray<value_type>& v) const;
-    void operator*= (const valarray<value_type>& v) const;
-    void operator/= (const valarray<value_type>& v) const;
-    void operator%= (const valarray<value_type>& v) const;
-    void operator+= (const valarray<value_type>& v) const;
-    void operator-= (const valarray<value_type>& v) const;
-    void operator^= (const valarray<value_type>& v) const;
-    void operator&= (const valarray<value_type>& v) const;
-    void operator|= (const valarray<value_type>& v) const;
-    void operator<<=(const valarray<value_type>& v) const;
-    void operator>>=(const valarray<value_type>& v) const;
-
-    indirect_array(const indirect_array& ia);
-    ~indirect_array();
-    const indirect_array& operator=(const indirect_array& ia) const;
-    void operator=(const value_type& x) const;
-
-    indirect_array() = delete;
-};
-
-template<class T> void swap(valarray<T>& x, valarray<T>& y) noexcept;
-
-template<class T> valarray<T> operator* (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator* (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator* (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator/ (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator/ (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator/ (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator% (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator% (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator% (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator+ (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator+ (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator+ (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator- (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator- (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator- (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator^ (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator^ (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator^ (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator& (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator& (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator& (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator| (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator| (const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator| (const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator<<(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator<<(const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator<<(const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> operator>>(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> operator>>(const valarray<T>& x, const T& y);
-template<class T> valarray<T> operator>>(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator&&(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator&&(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator&&(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator||(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator||(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator||(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator==(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator==(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator==(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator!=(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator!=(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator!=(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator< (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator< (const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator< (const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator> (const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator> (const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator> (const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator<=(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator<=(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator<=(const T& x, const valarray<T>& y);
-
-template<class T> valarray<bool> operator>=(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<bool> operator>=(const valarray<T>& x, const T& y);
-template<class T> valarray<bool> operator>=(const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> abs (const valarray<T>& x);
-template<class T> valarray<T> acos (const valarray<T>& x);
-template<class T> valarray<T> asin (const valarray<T>& x);
-template<class T> valarray<T> atan (const valarray<T>& x);
-
-template<class T> valarray<T> atan2(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> atan2(const valarray<T>& x, const T& y);
-template<class T> valarray<T> atan2(const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> cos (const valarray<T>& x);
-template<class T> valarray<T> cosh (const valarray<T>& x);
-template<class T> valarray<T> exp (const valarray<T>& x);
-template<class T> valarray<T> log (const valarray<T>& x);
-template<class T> valarray<T> log10(const valarray<T>& x);
-
-template<class T> valarray<T> pow(const valarray<T>& x, const valarray<T>& y);
-template<class T> valarray<T> pow(const valarray<T>& x, const T& y);
-template<class T> valarray<T> pow(const T& x, const valarray<T>& y);
-
-template<class T> valarray<T> sin (const valarray<T>& x);
-template<class T> valarray<T> sinh (const valarray<T>& x);
-template<class T> valarray<T> sqrt (const valarray<T>& x);
-template<class T> valarray<T> tan (const valarray<T>& x);
-template<class T> valarray<T> tanh (const valarray<T>& x);
-
-template <class T> unspecified1 begin(valarray<T>& v);
-template <class T> unspecified2 begin(const valarray<T>& v);
-template <class T> unspecified1 end(valarray<T>& v);
-template <class T> unspecified2 end(const valarray<T>& v);
-
-}  // std
-
-*/
-
-#include <__config>
-#include <cstddef>
-#include <cmath>
-#include <initializer_list>
-#include <algorithm>
-#include <functional>
-#include <new>
-
-#include <__undef_min_max>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template<class _Tp> class _LIBCPP_TYPE_VIS_ONLY valarray;
-
-class _LIBCPP_TYPE_VIS_ONLY slice
-{
-    size_t __start_;
-    size_t __size_;
-    size_t __stride_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    slice()
-        : __start_(0),
-          __size_(0),
-          __stride_(0)
-          {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    slice(size_t __start, size_t __size, size_t __stride)
-        : __start_(__start),
-          __size_(__size),
-          __stride_(__stride)
-          {}
-
-    _LIBCPP_INLINE_VISIBILITY size_t start()  const {return __start_;}
-    _LIBCPP_INLINE_VISIBILITY size_t size()   const {return __size_;}
-    _LIBCPP_INLINE_VISIBILITY size_t stride() const {return __stride_;}
-};
-
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY slice_array;
-class _LIBCPP_TYPE_VIS gslice;
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY gslice_array;
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY mask_array;
-template <class _Tp> class _LIBCPP_TYPE_VIS_ONLY indirect_array;
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-_Tp*
-begin(valarray<_Tp>& __v);
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-const _Tp*
-begin(const valarray<_Tp>& __v);
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-_Tp*
-end(valarray<_Tp>& __v);
-
-template <class _Tp>
-_LIBCPP_INLINE_VISIBILITY
-const _Tp*
-end(const valarray<_Tp>& __v);
-
-template <class _Op, class _A0>
-struct _UnaryOp
-{
-    typedef typename _Op::result_type result_type;
-    typedef typename _A0::value_type value_type;
-
-    _Op __op_;
-    _A0 __a0_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _UnaryOp(const _Op& __op, const _A0& __a0) : __op_(__op), __a0_(__a0) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const {return __op_(__a0_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Op, class _A0, class _A1>
-struct _BinaryOp
-{
-    typedef typename _Op::result_type result_type;
-    typedef typename _A0::value_type value_type;
-
-    _Op __op_;
-    _A0 __a0_;
-    _A1 __a1_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _BinaryOp(const _Op& __op, const _A0& __a0, const _A1& __a1)
-        : __op_(__op), __a0_(__a0), __a1_(__a1) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type operator[](size_t __i) const {return __op_(__a0_[__i], __a1_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Tp>
-class __scalar_expr
-{
-public:
-    typedef _Tp        value_type;
-    typedef const _Tp& result_type;
-private:
-    const value_type& __t_;
-    size_t __s_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __scalar_expr(const value_type& __t, size_t __s) : __t_(__t), __s_(__s) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t) const {return __t_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __s_;}
-};
-
-template <class _Tp>
-struct __unary_plus : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return +__x;}
-};
-
-template <class _Tp>
-struct __bit_not  : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return ~__x;}
-};
-
-template <class _Tp>
-struct __bit_shift_left : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x << __y;}
-};
-
-template <class _Tp>
-struct __bit_shift_right : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return __x >> __y;}
-};
-
-template <class _Tp, class _Fp>
-struct __apply_expr   : unary_function<_Tp, _Tp>
-{
-private:
-    _Fp __f_;
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __apply_expr(_Fp __f) : __f_(__f) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return __f_(__x);}
-};
-
-template <class _Tp>
-struct __abs_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return abs(__x);}
-};
-
-template <class _Tp>
-struct __acos_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return acos(__x);}
-};
-
-template <class _Tp>
-struct __asin_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return asin(__x);}
-};
-
-template <class _Tp>
-struct __atan_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return atan(__x);}
-};
-
-template <class _Tp>
-struct __atan2_expr : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return atan2(__x, __y);}
-};
-
-template <class _Tp>
-struct __cos_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return cos(__x);}
-};
-
-template <class _Tp>
-struct __cosh_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return cosh(__x);}
-};
-
-template <class _Tp>
-struct __exp_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return exp(__x);}
-};
-
-template <class _Tp>
-struct __log_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return log(__x);}
-};
-
-template <class _Tp>
-struct __log10_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return log10(__x);}
-};
-
-template <class _Tp>
-struct __pow_expr : binary_function<_Tp, _Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x, const _Tp& __y) const
-        {return pow(__x, __y);}
-};
-
-template <class _Tp>
-struct __sin_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return sin(__x);}
-};
-
-template <class _Tp>
-struct __sinh_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return sinh(__x);}
-};
-
-template <class _Tp>
-struct __sqrt_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return sqrt(__x);}
-};
-
-template <class _Tp>
-struct __tan_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return tan(__x);}
-};
-
-template <class _Tp>
-struct __tanh_expr : unary_function<_Tp, _Tp>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    _Tp operator()(const _Tp& __x) const
-        {return tanh(__x);}
-};
-
-template <class _ValExpr>
-class __slice_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    size_t __start_;
-    size_t __size_;
-    size_t __stride_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __slice_expr(const slice& __sl, const _RmExpr& __e)
-        : __expr_(__e),
-          __start_(__sl.start()),
-          __size_(__sl.size()),
-          __stride_(__sl.stride())
-        {}
-public:
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {return __expr_[__start_ + __i * __stride_];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __size_;}
-
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY valarray;
-};
-
-template <class _ValExpr>
-class __mask_expr;
-
-template <class _ValExpr>
-class __indirect_expr;
-
-template <class _ValExpr>
-class __shift_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    size_t __size_;
-    ptrdiff_t __ul_;
-    ptrdiff_t __sn_;
-    ptrdiff_t __n_;
-    static const ptrdiff_t _Np = static_cast<ptrdiff_t>(
-                                    sizeof(ptrdiff_t) * __CHAR_BIT__ - 1);
-
-    _LIBCPP_INLINE_VISIBILITY
-    __shift_expr(int __n, const _RmExpr& __e)
-        : __expr_(__e),
-          __size_(__e.size()),
-          __n_(__n)
-        {
-            ptrdiff_t __neg_n = static_cast<ptrdiff_t>(__n_ >> _Np);
-            __sn_ = __neg_n | static_cast<ptrdiff_t>(static_cast<size_t>(-__n_) >> _Np);
-            __ul_ = ((__size_ - __n_) & ~__neg_n) | ((__n_ + 1) & __neg_n);
-        }
-public:
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __j) const
-        {
-            ptrdiff_t __i = static_cast<ptrdiff_t>(__j);
-            ptrdiff_t __m = (__sn_ * __i - __ul_) >> _Np;
-            return (__expr_[(__i + __n_) & __m] & __m) | (value_type() & ~__m);
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __size_;}
-
-    template <class> friend class __val_expr;
-};
-
-template <class _ValExpr>
-class __cshift_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    size_t __size_;
-    size_t __m_;
-    size_t __o1_;
-    size_t __o2_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __cshift_expr(int __n, const _RmExpr& __e)
-        : __expr_(__e),
-          __size_(__e.size())
-        {
-            __n %= static_cast<int>(__size_);
-            if (__n >= 0)
-            {
-                __m_ = __size_ - __n;
-                __o1_ = __n;
-                __o2_ = __n - __size_;
-            }
-            else
-            {
-                __m_ = -__n;
-                __o1_ = __n + __size_;
-                __o2_ = __n;
-            }
-        }
-public:
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {
-            if (__i < __m_)
-                return __expr_[__i + __o1_];
-            return __expr_[__i + __o2_];
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __size_;}
-
-    template <class> friend class __val_expr;
-};
-
-template<class _ValExpr>
-class __val_expr;
-
-template<class _ValExpr>
-struct __is_val_expr : false_type {};
-
-template<class _ValExpr>
-struct __is_val_expr<__val_expr<_ValExpr> > : true_type {};
-
-template<class _Tp>
-struct __is_val_expr<valarray<_Tp> > : true_type {};
-
-template<class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY valarray
-{
-public:
-    typedef _Tp value_type;
-    typedef _Tp result_type;
-
-private:
-    value_type* __begin_;
-    value_type* __end_;
-
-public:
-    // construct/destroy:
-    _LIBCPP_INLINE_VISIBILITY
-    valarray() : __begin_(0), __end_(0) {}
-    explicit valarray(size_t __n);
-    valarray(const value_type& __x, size_t __n);
-    valarray(const value_type* __p, size_t __n);
-    valarray(const valarray& __v);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    valarray(valarray&& __v) _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    valarray(initializer_list<value_type> __il);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    valarray(const slice_array<value_type>& __sa);
-    valarray(const gslice_array<value_type>& __ga);
-    valarray(const mask_array<value_type>& __ma);
-    valarray(const indirect_array<value_type>& __ia);
-    ~valarray();
-
-    // assignment:
-    valarray& operator=(const valarray& __v);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    valarray& operator=(valarray&& __v) _NOEXCEPT;
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    valarray& operator=(initializer_list<value_type>);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    valarray& operator=(const value_type& __x);
-    valarray& operator=(const slice_array<value_type>& __sa);
-    valarray& operator=(const gslice_array<value_type>& __ga);
-    valarray& operator=(const mask_array<value_type>& __ma);
-    valarray& operator=(const indirect_array<value_type>& __ia);
-    template <class _ValExpr>
-        valarray& operator=(const __val_expr<_ValExpr>& __v);
-
-    // element access:
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type& operator[](size_t __i) const {return __begin_[__i];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type&       operator[](size_t __i)       {return __begin_[__i];}
-
-    // subset operations:
-    __val_expr<__slice_expr<const valarray&> >    operator[](slice __s) const;
-    slice_array<value_type>                       operator[](slice __s);
-    __val_expr<__indirect_expr<const valarray&> > operator[](const gslice& __gs) const;
-    gslice_array<value_type>   operator[](const gslice& __gs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__indirect_expr<const valarray&> > operator[](gslice&& __gs) const;
-    gslice_array<value_type>                      operator[](gslice&& __gs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__mask_expr<const valarray&> >     operator[](const valarray<bool>& __vb) const;
-    mask_array<value_type>                        operator[](const valarray<bool>& __vb);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__mask_expr<const valarray&> >     operator[](valarray<bool>&& __vb) const;
-    mask_array<value_type>                        operator[](valarray<bool>&& __vb);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__indirect_expr<const valarray&> > operator[](const valarray<size_t>& __vs) const;
-    indirect_array<value_type>                    operator[](const valarray<size_t>& __vs);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    __val_expr<__indirect_expr<const valarray&> > operator[](valarray<size_t>&& __vs) const;
-    indirect_array<value_type>                    operator[](valarray<size_t>&& __vs);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    // unary operators:
-    valarray       operator+() const;
-    valarray       operator-() const;
-    valarray       operator~() const;
-    valarray<bool> operator!() const;
-
-    // computed assignment:
-    valarray& operator*= (const value_type& __x);
-    valarray& operator/= (const value_type& __x);
-    valarray& operator%= (const value_type& __x);
-    valarray& operator+= (const value_type& __x);
-    valarray& operator-= (const value_type& __x);
-    valarray& operator^= (const value_type& __x);
-    valarray& operator&= (const value_type& __x);
-    valarray& operator|= (const value_type& __x);
-    valarray& operator<<=(const value_type& __x);
-    valarray& operator>>=(const value_type& __x);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator*= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator/= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator%= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator+= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator-= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator^= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator|= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator&= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator<<= (const _Expr& __v);
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        valarray&
-    >::type
-    operator>>= (const _Expr& __v);
-
-    // member functions:
-    void swap(valarray& __v) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return static_cast<size_t>(__end_ - __begin_);}
-
-    value_type sum() const;
-    value_type min() const;
-    value_type max() const;
-
-    valarray shift (int __i) const;
-    valarray cshift(int __i) const;
-    valarray apply(value_type __f(value_type)) const;
-    valarray apply(value_type __f(const value_type&)) const;
-    void     resize(size_t __n, value_type __x = value_type());
-
-private:
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY valarray;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY slice_array;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY gslice_array;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY mask_array;
-    template <class> friend class __mask_expr;
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY indirect_array;
-    template <class> friend class __indirect_expr;
-    template <class> friend class __val_expr;
-
-    template <class _Up>
-    friend
-    _Up*
-    begin(valarray<_Up>& __v);
-
-    template <class _Up>
-    friend
-    const _Up*
-    begin(const valarray<_Up>& __v);
-
-    template <class _Up>
-    friend
-    _Up*
-    end(valarray<_Up>& __v);
-
-    template <class _Up>
-    friend
-    const _Up*
-    end(const valarray<_Up>& __v);
-};
-
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS valarray<size_t>::valarray(size_t))
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS valarray<size_t>::~valarray())
-_LIBCPP_EXTERN_TEMPLATE(_LIBCPP_FUNC_VIS void valarray<size_t>::resize(size_t, size_t))
-
-template <class _Op, class _Tp>
-struct _UnaryOp<_Op, valarray<_Tp> >
-{
-    typedef typename _Op::result_type result_type;
-    typedef _Tp value_type;
-
-    _Op __op_;
-    const valarray<_Tp>& __a0_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _UnaryOp(const _Op& __op, const valarray<_Tp>& __a0) : __op_(__op), __a0_(__a0) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const {return __op_(__a0_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Op, class _Tp, class _A1>
-struct _BinaryOp<_Op, valarray<_Tp>, _A1>
-{
-    typedef typename _Op::result_type result_type;
-    typedef _Tp value_type;
-
-    _Op __op_;
-    const valarray<_Tp>& __a0_;
-    _A1 __a1_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _BinaryOp(const _Op& __op, const valarray<_Tp>& __a0, const _A1& __a1)
-        : __op_(__op), __a0_(__a0), __a1_(__a1) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type operator[](size_t __i) const {return __op_(__a0_[__i], __a1_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Op, class _A0, class _Tp>
-struct _BinaryOp<_Op, _A0, valarray<_Tp> >
-{
-    typedef typename _Op::result_type result_type;
-    typedef _Tp value_type;
-
-    _Op __op_;
-    _A0 __a0_;
-    const valarray<_Tp>& __a1_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _BinaryOp(const _Op& __op, const _A0& __a0, const valarray<_Tp>& __a1)
-        : __op_(__op), __a0_(__a0), __a1_(__a1) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type operator[](size_t __i) const {return __op_(__a0_[__i], __a1_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-template <class _Op, class _Tp>
-struct _BinaryOp<_Op, valarray<_Tp>, valarray<_Tp> >
-{
-    typedef typename _Op::result_type result_type;
-    typedef _Tp value_type;
-
-    _Op __op_;
-    const valarray<_Tp>& __a0_;
-    const valarray<_Tp>& __a1_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    _BinaryOp(const _Op& __op, const valarray<_Tp>& __a0, const valarray<_Tp>& __a1)
-        : __op_(__op), __a0_(__a0), __a1_(__a1) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type operator[](size_t __i) const {return __op_(__a0_[__i], __a1_[__i]);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __a0_.size();}
-};
-
-// slice_array
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY slice_array
-{
-public:
-    typedef _Tp value_type;
-
-private:
-    value_type* __vp_;
-    size_t __size_;
-    size_t __stride_;
-
-public:
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator*=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator/=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator%=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator+=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator-=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator^=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator&=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator|=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator<<=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator>>=(const _Expr& __v) const;
-
-    const slice_array& operator=(const slice_array& __sa) const;
-
-    void operator=(const value_type& __x) const;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    slice_array(const slice& __sl, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_ + __sl.start())),
-          __size_(__sl.size()),
-          __stride_(__sl.stride())
-        {}
-
-    template <class> friend class valarray;
-    template <class> friend class sliceExpr;
-};
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const slice_array<_Tp>&
-slice_array<_Tp>::operator=(const slice_array& __sa) const
-{
-    value_type* __t = __vp_;
-    const value_type* __s = __sa.__vp_;
-    for (size_t __n = __size_; __n; --__n, __t += __stride_, __s += __sa.__stride_)
-        *__t = *__s;
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t = __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator*=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t *= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator/=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t /= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator%=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t %= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator+=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t += __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator-=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t -= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator^=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t ^= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator&=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t &= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator|=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t |= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator<<=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t <<= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-slice_array<_Tp>::operator>>=(const _Expr& __v) const
-{
-    value_type* __t = __vp_;
-    for (size_t __i = 0; __i < __size_; ++__i, __t += __stride_)
-        *__t >>= __v[__i];
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-slice_array<_Tp>::operator=(const value_type& __x) const
-{
-    value_type* __t = __vp_;
-    for (size_t __n = __size_; __n; --__n, __t += __stride_)
-        *__t = __x;
-}
-
-// gslice
-
-class _LIBCPP_TYPE_VIS gslice
-{
-    valarray<size_t> __size_;
-    valarray<size_t> __stride_;
-    valarray<size_t> __1d_;
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    gslice() {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice(size_t __start, const valarray<size_t>& __size,
-                           const valarray<size_t>& __stride)
-        : __size_(__size),
-          __stride_(__stride)
-        {__init(__start);}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice(size_t __start, const valarray<size_t>&  __size,
-                                 valarray<size_t>&& __stride)
-        : __size_(__size),
-          __stride_(move(__stride))
-        {__init(__start);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice(size_t __start,       valarray<size_t>&& __size,
-                           const valarray<size_t>&  __stride)
-        : __size_(move(__size)),
-          __stride_(__stride)
-        {__init(__start);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice(size_t __start,       valarray<size_t>&& __size,
-                                 valarray<size_t>&& __stride)
-        : __size_(move(__size)),
-          __stride_(move(__stride))
-        {__init(__start);}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-//  gslice(const gslice&)            = default;
-//  gslice(gslice&&)                 = default;
-//  gslice& operator=(const gslice&) = default;
-//  gslice& operator=(gslice&&)      = default;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t           start()  const {return __1d_.size() ? __1d_[0] : 0;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    valarray<size_t> size()   const {return __size_;}
-
-    _LIBCPP_INLINE_VISIBILITY
-    valarray<size_t> stride() const {return __stride_;}
-
-private:
-    void __init(size_t __start);
-
-    template <class> friend class gslice_array;
-    template <class> friend class valarray;
-    template <class> friend class __val_expr;
-};
-
-// gslice_array
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY gslice_array
-{
-public:
-    typedef _Tp value_type;
-
-private:
-    value_type*      __vp_;
-    valarray<size_t> __1d_;
-
-public:
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator*=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator/=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator%=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator+=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator-=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator^=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator&=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator|=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator<<=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator>>=(const _Expr& __v) const;
-
-    const gslice_array& operator=(const gslice_array& __ga) const;
-
-    void operator=(const value_type& __x) const;
-
-//  gslice_array(const gslice_array&)            = default;
-//  gslice_array(gslice_array&&)                 = default;
-//  gslice_array& operator=(const gslice_array&) = default;
-//  gslice_array& operator=(gslice_array&&)      = default;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    gslice_array(const gslice& __gs, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(__gs.__1d_)
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    gslice_array(gslice&& __gs, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(move(__gs.__1d_))
-        {}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class> friend class valarray;
-};
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] = __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator*=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] *= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator/=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] /= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator%=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] %= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator+=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] += __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator-=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] -= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator^=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] ^= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator&=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] &= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator|=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] |= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator<<=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] <<= __v[__j];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-gslice_array<_Tp>::operator>>=(const _Expr& __v) const
-{
-    typedef const size_t* _Ip;
-    size_t __j = 0;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i, ++__j)
-        __vp_[*__i] >>= __v[__j];
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const gslice_array<_Tp>&
-gslice_array<_Tp>::operator=(const gslice_array& __ga) const
-{
-    typedef const size_t* _Ip;
-    const value_type* __s = __ga.__vp_;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_, __j = __ga.__1d_.__begin_;
-            __i != __e; ++__i, ++__j)
-        __vp_[*__i] = __s[*__j];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-gslice_array<_Tp>::operator=(const value_type& __x) const
-{
-    typedef const size_t* _Ip;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i)
-        __vp_[*__i] = __x;
-}
-
-// mask_array
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY mask_array
-{
-public:
-    typedef _Tp value_type;
-
-private:
-    value_type*      __vp_;
-    valarray<size_t> __1d_;
-
-public:
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator*=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator/=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator%=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator+=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator-=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator^=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator&=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator|=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator<<=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator>>=(const _Expr& __v) const;
-
-    const mask_array& operator=(const mask_array& __ma) const;
-
-    void operator=(const value_type& __x) const;
-
-//  mask_array(const mask_array&)            = default;
-//  mask_array(mask_array&&)                 = default;
-//  mask_array& operator=(const mask_array&) = default;
-//  mask_array& operator=(mask_array&&)      = default;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    mask_array(const valarray<bool>& __vb, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(static_cast<size_t>(count(__vb.__begin_, __vb.__end_, true)))
-          {
-              size_t __j = 0;
-              for (size_t __i = 0; __i < __vb.size(); ++__i)
-                  if (__vb[__i])
-                      __1d_[__j++] = __i;
-          }
-
-    template <class> friend class valarray;
-};
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] = __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator*=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] *= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator/=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] /= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator%=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] %= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator+=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] += __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator-=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] -= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator^=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] ^= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator&=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] &= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator|=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] |= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator<<=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] <<= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-mask_array<_Tp>::operator>>=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] >>= __v[__i];
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const mask_array<_Tp>&
-mask_array<_Tp>::operator=(const mask_array& __ma) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] = __ma.__vp_[__1d_[__i]];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-mask_array<_Tp>::operator=(const value_type& __x) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] = __x;
-}
-
-template <class _ValExpr>
-class __mask_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    valarray<size_t> __1d_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __mask_expr(const valarray<bool>& __vb, const _RmExpr& __e)
-        : __expr_(__e),
-          __1d_(static_cast<size_t>(count(__vb.__begin_, __vb.__end_, true)))
-          {
-              size_t __j = 0;
-              for (size_t __i = 0; __i < __vb.size(); ++__i)
-                  if (__vb[__i])
-                      __1d_[__j++] = __i;
-          }
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {return __expr_[__1d_[__i]];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __1d_.size();}
-
-    template <class> friend class valarray;
-};
-
-// indirect_array
-
-template <class _Tp>
-class _LIBCPP_TYPE_VIS_ONLY indirect_array
-{
-public:
-    typedef _Tp value_type;
-
-private:
-    value_type*      __vp_;
-    valarray<size_t> __1d_;
-
-public:
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator*=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator/=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator%=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator+=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator-=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator^=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator&=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator|=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator<<=(const _Expr& __v) const;
-
-    template <class _Expr>
-    typename enable_if
-    <
-        __is_val_expr<_Expr>::value,
-        void
-    >::type
-    operator>>=(const _Expr& __v) const;
-
-    const indirect_array& operator=(const indirect_array& __ia) const;
-
-    void operator=(const value_type& __x) const;
-
-//  indirect_array(const indirect_array&)            = default;
-//  indirect_array(indirect_array&&)                 = default;
-//  indirect_array& operator=(const indirect_array&) = default;
-//  indirect_array& operator=(indirect_array&&)      = default;
-
-private:
-     _LIBCPP_INLINE_VISIBILITY
-   indirect_array(const valarray<size_t>& __ia, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(__ia)
-        {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    indirect_array(valarray<size_t>&& __ia, const valarray<value_type>& __v)
-        : __vp_(const_cast<value_type*>(__v.__begin_)),
-          __1d_(move(__ia))
-        {}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    template <class> friend class valarray;
-};
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] = __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator*=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] *= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator/=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] /= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator%=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] %= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator+=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] += __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator-=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] -= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator^=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] ^= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator&=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] &= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator|=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] |= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator<<=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] <<= __v[__i];
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    void
->::type
-indirect_array<_Tp>::operator>>=(const _Expr& __v) const
-{
-    size_t __n = __1d_.size();
-    for (size_t __i = 0; __i < __n; ++__i)
-        __vp_[__1d_[__i]] >>= __v[__i];
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const indirect_array<_Tp>&
-indirect_array<_Tp>::operator=(const indirect_array& __ia) const
-{
-    typedef const size_t* _Ip;
-    const value_type* __s = __ia.__vp_;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_, __j = __ia.__1d_.__begin_;
-            __i != __e; ++__i, ++__j)
-        __vp_[*__i] = __s[*__j];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-indirect_array<_Tp>::operator=(const value_type& __x) const
-{
-    typedef const size_t* _Ip;
-    for (_Ip __i = __1d_.__begin_, __e = __1d_.__end_; __i != __e; ++__i)
-        __vp_[*__i] = __x;
-}
-
-template <class _ValExpr>
-class __indirect_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef value_type result_type;
-
-private:
-    _ValExpr __expr_;
-    valarray<size_t> __1d_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    __indirect_expr(const valarray<size_t>& __ia, const _RmExpr& __e)
-        : __expr_(__e),
-          __1d_(__ia)
-          {}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-    _LIBCPP_INLINE_VISIBILITY
-    __indirect_expr(valarray<size_t>&& __ia, const _RmExpr& __e)
-        : __expr_(__e),
-          __1d_(move(__ia))
-          {}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {return __expr_[__1d_[__i]];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __1d_.size();}
-
-    template <class> friend class _LIBCPP_TYPE_VIS_ONLY valarray;
-};
-
-template<class _ValExpr>
-class __val_expr
-{
-    typedef typename remove_reference<_ValExpr>::type  _RmExpr;
-
-    _ValExpr __expr_;
-public:
-    typedef typename _RmExpr::value_type value_type;
-    typedef typename _RmExpr::result_type result_type;
-
-    _LIBCPP_INLINE_VISIBILITY
-    explicit __val_expr(const _RmExpr& __e) : __expr_(__e) {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type operator[](size_t __i) const
-        {return __expr_[__i];}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__slice_expr<_ValExpr> > operator[](slice __s) const
-        {return __val_expr<__slice_expr<_ValExpr> >(__expr_, __s);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__indirect_expr<_ValExpr> > operator[](const gslice& __gs) const
-        {return __val_expr<__indirect_expr<_ValExpr> >(__expr_, __gs.__1d_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__mask_expr<_ValExpr> > operator[](const valarray<bool>& __vb) const
-        {return __val_expr<__mask_expr<_ValExpr> >(__expr_, __vb);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__indirect_expr<_ValExpr> > operator[](const valarray<size_t>& __vs) const
-        {return __val_expr<__indirect_expr<_ValExpr> >(__expr_, __vs);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<__unary_plus<value_type>, _ValExpr> >
-    operator+() const
-    {
-        typedef _UnaryOp<__unary_plus<value_type>, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(__unary_plus<value_type>(), __expr_));
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<negate<value_type>, _ValExpr> >
-    operator-() const
-    {
-        typedef _UnaryOp<negate<value_type>, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(negate<value_type>(), __expr_));
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<__bit_not<value_type>, _ValExpr> >
-    operator~() const
-    {
-        typedef _UnaryOp<__bit_not<value_type>, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(__bit_not<value_type>(), __expr_));
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<logical_not<value_type>, _ValExpr> >
-    operator!() const
-    {
-        typedef _UnaryOp<logical_not<value_type>, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(logical_not<value_type>(), __expr_));
-    }
-
-    operator valarray<result_type>() const;
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_t size() const {return __expr_.size();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type sum() const
-    {
-        size_t __n = __expr_.size();
-        result_type __r = __n ? __expr_[0] : result_type();
-        for (size_t __i = 1; __i < __n; ++__i)
-            __r += __expr_[__i];
-        return __r;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type min() const
-    {
-        size_t __n = size();
-        result_type __r = __n ? (*this)[0] : result_type();
-        for (size_t __i = 1; __i < __n; ++__i)
-        {
-            result_type __x = __expr_[__i];
-            if (__x < __r)
-                __r = __x;
-        }
-        return __r;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    result_type max() const
-    {
-        size_t __n = size();
-        result_type __r = __n ? (*this)[0] : result_type();
-        for (size_t __i = 1; __i < __n; ++__i)
-        {
-            result_type __x = __expr_[__i];
-            if (__r < __x)
-                __r = __x;
-        }
-        return __r;
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__shift_expr<_ValExpr> > shift (int __i) const
-        {return __val_expr<__shift_expr<_ValExpr> >(__shift_expr<_ValExpr>(__i, __expr_));}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<__cshift_expr<_ValExpr> > cshift(int __i) const
-        {return __val_expr<__cshift_expr<_ValExpr> >(__cshift_expr<_ValExpr>(__i, __expr_));}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<__apply_expr<value_type, value_type(*)(value_type)>, _ValExpr> >
-    apply(value_type __f(value_type)) const
-    {
-        typedef __apply_expr<value_type, value_type(*)(value_type)> _Op;
-        typedef _UnaryOp<_Op, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(_Op(__f), __expr_));
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    __val_expr<_UnaryOp<__apply_expr<value_type, value_type(*)(const value_type&)>, _ValExpr> >
-    apply(value_type __f(const value_type&)) const
-    {
-        typedef __apply_expr<value_type, value_type(*)(const value_type&)> _Op;
-        typedef _UnaryOp<_Op, _ValExpr> _NewExpr;
-        return __val_expr<_NewExpr>(_NewExpr(_Op(__f), __expr_));
-    }
-};
-
-template<class _ValExpr>
-__val_expr<_ValExpr>::operator valarray<__val_expr::result_type>() const
-{
-    valarray<result_type> __r;
-    size_t __n = __expr_.size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<result_type*>(_VSTD::__allocate(__n * sizeof(result_type)));
-        for (size_t __i = 0; __i != __n; ++__r.__end_, ++__i)
-            ::new (__r.__end_) result_type(__expr_[__i]);
-    }
-    return __r;
-}
-
-// valarray
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>::valarray(size_t __n)
-    : __begin_(0),
-      __end_(0)
-{
-    resize(__n);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>::valarray(const value_type& __x, size_t __n)
-    : __begin_(0),
-      __end_(0)
-{
-    resize(__n, __x);
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const value_type* __p, size_t __n)
-    : __begin_(0),
-      __end_(0)
-{
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __n; ++__end_, ++__p, --__n)
-                ::new (__end_) value_type(*__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const valarray& __v)
-    : __begin_(0),
-      __end_(0)
-{
-    if (__v.size())
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__v.size() * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (value_type* __p = __v.__begin_; __p != __v.__end_; ++__end_, ++__p)
-                ::new (__end_) value_type(*__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>::valarray(valarray&& __v) _NOEXCEPT
-    : __begin_(__v.__begin_),
-      __end_(__v.__end_)
-{
-    __v.__begin_ = __v.__end_ = nullptr;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp>
-valarray<_Tp>::valarray(initializer_list<value_type> __il)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __il.size();
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (const value_type* __p = __il.begin(); __n; ++__end_, ++__p, --__n)
-                ::new (__end_) value_type(*__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp>
-valarray<_Tp>::valarray(const slice_array<value_type>& __sa)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __sa.__size_;
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (const value_type* __p = __sa.__vp_; __n; ++__end_, __p += __sa.__stride_, --__n)
-                ::new (__end_) value_type(*__p);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const gslice_array<value_type>& __ga)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __ga.__1d_.size();
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            typedef const size_t* _Ip;
-            const value_type* __s = __ga.__vp_;
-            for (_Ip __i = __ga.__1d_.__begin_, __e = __ga.__1d_.__end_;
-                    __i != __e; ++__i, ++__end_)
-                ::new (__end_) value_type(__s[*__i]);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const mask_array<value_type>& __ma)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __ma.__1d_.size();
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            typedef const size_t* _Ip;
-            const value_type* __s = __ma.__vp_;
-            for (_Ip __i = __ma.__1d_.__begin_, __e = __ma.__1d_.__end_;
-                    __i != __e; ++__i, ++__end_)
-                ::new (__end_) value_type(__s[*__i]);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-valarray<_Tp>::valarray(const indirect_array<value_type>& __ia)
-    : __begin_(0),
-      __end_(0)
-{
-    size_t __n = __ia.__1d_.size();
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            typedef const size_t* _Ip;
-            const value_type* __s = __ia.__vp_;
-            for (_Ip __i = __ia.__1d_.__begin_, __e = __ia.__1d_.__end_;
-                    __i != __e; ++__i, ++__end_)
-                ::new (__end_) value_type(__s[*__i]);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>::~valarray()
-{
-    resize(0);
-}
-
-template <class _Tp>
-valarray<_Tp>&
-valarray<_Tp>::operator=(const valarray& __v)
-{
-    if (this != &__v)
-    {
-        if (size() != __v.size())
-            resize(__v.size());
-        _VSTD::copy(__v.__begin_, __v.__end_, __begin_);
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(valarray&& __v) _NOEXCEPT
-{
-    resize(0);
-    __begin_ = __v.__begin_;
-    __end_ = __v.__end_;
-    __v.__begin_ = nullptr;
-    __v.__end_ = nullptr;
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(initializer_list<value_type> __il)
-{
-    if (size() != __il.size())
-        resize(__il.size());
-    _VSTD::copy(__il.begin(), __il.end(), __begin_);
-    return *this;
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const value_type& __x)
-{
-    _VSTD::fill(__begin_, __end_, __x);
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const slice_array<value_type>& __sa)
-{
-    value_type* __t = __begin_;
-    const value_type* __s = __sa.__vp_;
-    for (size_t __n = __sa.__size_; __n; --__n, __s += __sa.__stride_, ++__t)
-        *__t = *__s;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const gslice_array<value_type>& __ga)
-{
-    typedef const size_t* _Ip;
-    value_type* __t = __begin_;
-    const value_type* __s = __ga.__vp_;
-    for (_Ip __i = __ga.__1d_.__begin_, __e = __ga.__1d_.__end_;
-                    __i != __e; ++__i, ++__t)
-        *__t = __s[*__i];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const mask_array<value_type>& __ma)
-{
-    typedef const size_t* _Ip;
-    value_type* __t = __begin_;
-    const value_type* __s = __ma.__vp_;
-    for (_Ip __i = __ma.__1d_.__begin_, __e = __ma.__1d_.__end_;
-                    __i != __e; ++__i, ++__t)
-        *__t = __s[*__i];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const indirect_array<value_type>& __ia)
-{
-    typedef const size_t* _Ip;
-    value_type* __t = __begin_;
-    const value_type* __s = __ia.__vp_;
-    for (_Ip __i = __ia.__1d_.__begin_, __e = __ia.__1d_.__end_;
-                    __i != __e; ++__i, ++__t)
-        *__t = __s[*__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _ValExpr>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator=(const __val_expr<_ValExpr>& __v)
-{
-    size_t __n = __v.size();
-    if (size() != __n)
-        resize(__n);
-    value_type* __t = __begin_;
-    for (size_t __i = 0; __i != __n; ++__t, ++__i)
-        *__t = result_type(__v[__i]);
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__slice_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](slice __s) const
-{
-    return __val_expr<__slice_expr<const valarray&> >(__slice_expr<const valarray&>(__s, *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-slice_array<_Tp>
-valarray<_Tp>::operator[](slice __s)
-{
-    return slice_array<value_type>(__s, *this);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__indirect_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](const gslice& __gs) const
-{
-    return __val_expr<__indirect_expr<const valarray&> >(__indirect_expr<const valarray&>(__gs.__1d_, *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-gslice_array<_Tp>
-valarray<_Tp>::operator[](const gslice& __gs)
-{
-    return gslice_array<value_type>(__gs, *this);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__indirect_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](gslice&& __gs) const
-{
-    return __val_expr<__indirect_expr<const valarray&> >(__indirect_expr<const valarray&>(move(__gs.__1d_), *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-gslice_array<_Tp>
-valarray<_Tp>::operator[](gslice&& __gs)
-{
-    return gslice_array<value_type>(move(__gs), *this);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__mask_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](const valarray<bool>& __vb) const
-{
-    return __val_expr<__mask_expr<const valarray&> >(__mask_expr<const valarray&>(__vb, *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-mask_array<_Tp>
-valarray<_Tp>::operator[](const valarray<bool>& __vb)
-{
-    return mask_array<value_type>(__vb, *this);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__mask_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](valarray<bool>&& __vb) const
-{
-    return __val_expr<__mask_expr<const valarray&> >(__mask_expr<const valarray&>(move(__vb), *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-mask_array<_Tp>
-valarray<_Tp>::operator[](valarray<bool>&& __vb)
-{
-    return mask_array<value_type>(move(__vb), *this);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__indirect_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](const valarray<size_t>& __vs) const
-{
-    return __val_expr<__indirect_expr<const valarray&> >(__indirect_expr<const valarray&>(__vs, *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-indirect_array<_Tp>
-valarray<_Tp>::operator[](const valarray<size_t>& __vs)
-{
-    return indirect_array<value_type>(__vs, *this);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-__val_expr<__indirect_expr<const valarray<_Tp>&> >
-valarray<_Tp>::operator[](valarray<size_t>&& __vs) const
-{
-    return __val_expr<__indirect_expr<const valarray&> >(__indirect_expr<const valarray&>(move(__vs), *this));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-indirect_array<_Tp>
-valarray<_Tp>::operator[](valarray<size_t>&& __vs)
-{
-    return indirect_array<value_type>(move(__vs), *this);
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::operator+() const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(+*__p);
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::operator-() const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(-*__p);
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::operator~() const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(~*__p);
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<bool>
-valarray<_Tp>::operator!() const
-{
-    valarray<bool> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<bool*>(_VSTD::__allocate(__n * sizeof(bool)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) bool(!*__p);
-    }
-    return __r;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator*=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p *= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator/=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p /= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator%=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p %= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator+=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p += __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator-=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p -= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator^=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p ^= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator&=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p &= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator|=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p |= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator<<=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p <<= __x;
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-valarray<_Tp>&
-valarray<_Tp>::operator>>=(const value_type& __x)
-{
-    for (value_type* __p = __begin_; __p != __end_; ++__p)
-        *__p >>= __x;
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator*=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t *= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator/=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t /= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator%=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t %= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator+=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t += __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator-=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t -= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator^=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t ^= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator|=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t |= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator&=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t &= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator<<=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t <<= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-template <class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    valarray<_Tp>&
->::type
-valarray<_Tp>::operator>>=(const _Expr& __v)
-{
-    size_t __i = 0;
-    for (value_type* __t = __begin_; __t != __end_ ; ++__t, ++__i)
-        *__t >>= __v[__i];
-    return *this;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-valarray<_Tp>::swap(valarray& __v) _NOEXCEPT
-{
-    _VSTD::swap(__begin_, __v.__begin_);
-    _VSTD::swap(__end_, __v.__end_);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-valarray<_Tp>::sum() const
-{
-    if (__begin_ == __end_)
-        return value_type();
-    const value_type* __p = __begin_;
-    _Tp __r = *__p;
-    for (++__p; __p != __end_; ++__p)
-        __r += *__p;
-    return __r;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-valarray<_Tp>::min() const
-{
-    if (__begin_ == __end_)
-        return value_type();
-    return *_VSTD::min_element(__begin_, __end_);
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp
-valarray<_Tp>::max() const
-{
-    if (__begin_ == __end_)
-        return value_type();
-    return *_VSTD::max_element(__begin_, __end_);
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::shift(int __i) const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        const value_type* __sb;
-        value_type* __tb;
-        value_type* __te;
-        if (__i >= 0)
-        {
-            __i = _VSTD::min(__i, static_cast<int>(__n));
-            __sb = __begin_ + __i;
-            __tb = __r.__begin_;
-            __te = __r.__begin_ + (__n - __i);
-        }
-        else
-        {
-            __i = _VSTD::min(-__i, static_cast<int>(__n));
-            __sb = __begin_;
-            __tb = __r.__begin_ + __i;
-            __te = __r.__begin_ + __n;
-        }
-        for (; __r.__end_ != __tb; ++__r.__end_)
-            ::new (__r.__end_) value_type();
-        for (; __r.__end_ != __te; ++__r.__end_, ++__sb)
-            ::new (__r.__end_) value_type(*__sb);
-        for (__te = __r.__begin_ + __n; __r.__end_ != __te; ++__r.__end_)
-            ::new (__r.__end_) value_type();
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::cshift(int __i) const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        __i %= static_cast<int>(__n);
-        const value_type* __m = __i >= 0 ? __begin_ + __i : __end_ + __i;
-        for (const value_type* __s = __m; __s != __end_; ++__r.__end_, ++__s)
-            ::new (__r.__end_) value_type(*__s);
-        for (const value_type* __s = __begin_; __s != __m; ++__r.__end_, ++__s)
-            ::new (__r.__end_) value_type(*__s);
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::apply(value_type __f(value_type)) const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(__f(*__p));
-    }
-    return __r;
-}
-
-template <class _Tp>
-valarray<_Tp>
-valarray<_Tp>::apply(value_type __f(const value_type&)) const
-{
-    valarray<value_type> __r;
-    size_t __n = size();
-    if (__n)
-    {
-        __r.__begin_ =
-            __r.__end_ =
-                static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-        for (const value_type* __p = __begin_; __n; ++__r.__end_, ++__p, --__n)
-            ::new (__r.__end_) value_type(__f(*__p));
-    }
-    return __r;
-}
-
-template <class _Tp>
-void
-valarray<_Tp>::resize(size_t __n, value_type __x)
-{
-    if (__begin_ != nullptr)
-    {
-        while (__end_ != __begin_)
-            (--__end_)->~value_type();
-        _VSTD::__deallocate(__begin_);
-        __begin_ = __end_ = nullptr;
-    }
-    if (__n)
-    {
-        __begin_ = __end_ = static_cast<value_type*>(_VSTD::__allocate(__n * sizeof(value_type)));
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            for (; __n; --__n, ++__end_)
-                ::new (__end_) value_type(__x);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            resize(0);
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template<class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(valarray<_Tp>& __x, valarray<_Tp>& __y) _NOEXCEPT
-{
-    __x.swap(__y);
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<multiplies<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator*(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<multiplies<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(multiplies<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<multiplies<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator*(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<multiplies<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(multiplies<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<multiplies<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator*(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<multiplies<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(multiplies<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<divides<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator/(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<divides<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(divides<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<divides<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator/(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<divides<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(divides<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<divides<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator/(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<divides<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(divides<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<modulus<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator%(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<modulus<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(modulus<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<modulus<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator%(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<modulus<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(modulus<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<modulus<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator%(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<modulus<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(modulus<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<plus<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator+(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<plus<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(plus<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<plus<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator+(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<plus<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(plus<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<plus<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator+(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<plus<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(plus<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<minus<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator-(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<minus<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(minus<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<minus<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator-(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<minus<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(minus<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<minus<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator-(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<minus<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(minus<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<bit_xor<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator^(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<bit_xor<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(bit_xor<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_xor<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator^(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_xor<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(bit_xor<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_xor<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator^(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_xor<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(bit_xor<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<bit_and<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator&(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<bit_and<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(bit_and<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_and<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator&(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_and<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(bit_and<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_and<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator&(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_and<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(bit_and<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<bit_or<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator|(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<bit_or<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(bit_or<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_or<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator|(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_or<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(bit_or<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<bit_or<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator|(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<bit_or<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(bit_or<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<__bit_shift_left<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator<<(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<__bit_shift_left<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_left<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__bit_shift_left<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator<<(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__bit_shift_left<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_left<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__bit_shift_left<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator<<(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__bit_shift_left<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_left<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<__bit_shift_right<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator>>(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<__bit_shift_right<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_right<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__bit_shift_right<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator>>(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__bit_shift_right<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_right<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__bit_shift_right<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator>>(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__bit_shift_right<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__bit_shift_right<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<logical_and<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator&&(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<logical_and<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(logical_and<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<logical_and<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator&&(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<logical_and<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(logical_and<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<logical_and<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator&&(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<logical_and<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(logical_and<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<logical_or<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator||(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<logical_or<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(logical_or<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<logical_or<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator||(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<logical_or<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(logical_or<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<logical_or<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator||(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<logical_or<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(logical_or<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<equal_to<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator==(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<equal_to<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(equal_to<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<equal_to<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator==(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<equal_to<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(equal_to<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<equal_to<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator==(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<equal_to<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(equal_to<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<not_equal_to<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator!=(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<not_equal_to<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(not_equal_to<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<not_equal_to<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator!=(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<not_equal_to<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(not_equal_to<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<not_equal_to<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator!=(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<not_equal_to<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(not_equal_to<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<less<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator<(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<less<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(less<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<less<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator<(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<less<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(less<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<less<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator<(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<less<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(less<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<greater<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator>(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<greater<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(greater<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<greater<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator>(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<greater<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(greater<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<greater<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator>(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<greater<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(greater<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<less_equal<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator<=(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<less_equal<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(less_equal<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<less_equal<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator<=(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<less_equal<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(less_equal<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<less_equal<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator<=(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<less_equal<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(less_equal<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<greater_equal<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-operator>=(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<greater_equal<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(greater_equal<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<greater_equal<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-operator>=(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<greater_equal<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(greater_equal<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<greater_equal<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-operator>=(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<greater_equal<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(greater_equal<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__abs_expr<typename _Expr::value_type>, _Expr> >
->::type
-abs(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__abs_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__abs_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__acos_expr<typename _Expr::value_type>, _Expr> >
->::type
-acos(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__acos_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__acos_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__asin_expr<typename _Expr::value_type>, _Expr> >
->::type
-asin(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__asin_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__asin_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__atan_expr<typename _Expr::value_type>, _Expr> >
->::type
-atan(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__atan_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__atan_expr<value_type>(), __x));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<__atan2_expr<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-atan2(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<__atan2_expr<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(__atan2_expr<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__atan2_expr<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-atan2(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__atan2_expr<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(__atan2_expr<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__atan2_expr<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-atan2(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__atan2_expr<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__atan2_expr<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__cos_expr<typename _Expr::value_type>, _Expr> >
->::type
-cos(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__cos_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__cos_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__cosh_expr<typename _Expr::value_type>, _Expr> >
->::type
-cosh(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__cosh_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__cosh_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__exp_expr<typename _Expr::value_type>, _Expr> >
->::type
-exp(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__exp_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__exp_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__log_expr<typename _Expr::value_type>, _Expr> >
->::type
-log(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__log_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__log_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__log10_expr<typename _Expr::value_type>, _Expr> >
->::type
-log10(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__log10_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__log10_expr<value_type>(), __x));
-}
-
-template<class _Expr1, class _Expr2>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr1>::value && __is_val_expr<_Expr2>::value,
-    __val_expr<_BinaryOp<__pow_expr<typename _Expr1::value_type>, _Expr1, _Expr2> >
->::type
-pow(const _Expr1& __x, const _Expr2& __y)
-{
-    typedef typename _Expr1::value_type value_type;
-    typedef _BinaryOp<__pow_expr<value_type>, _Expr1, _Expr2> _Op;
-    return __val_expr<_Op>(_Op(__pow_expr<value_type>(), __x, __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__pow_expr<typename _Expr::value_type>,
-               _Expr, __scalar_expr<typename _Expr::value_type> > >
->::type
-pow(const _Expr& __x, const typename _Expr::value_type& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__pow_expr<value_type>, _Expr, __scalar_expr<value_type> > _Op;
-    return __val_expr<_Op>(_Op(__pow_expr<value_type>(),
-                           __x, __scalar_expr<value_type>(__y, __x.size())));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_BinaryOp<__pow_expr<typename _Expr::value_type>,
-               __scalar_expr<typename _Expr::value_type>, _Expr> >
->::type
-pow(const typename _Expr::value_type& __x, const _Expr& __y)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _BinaryOp<__pow_expr<value_type>, __scalar_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__pow_expr<value_type>(),
-                           __scalar_expr<value_type>(__x, __y.size()), __y));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__sin_expr<typename _Expr::value_type>, _Expr> >
->::type
-sin(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__sin_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__sin_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__sinh_expr<typename _Expr::value_type>, _Expr> >
->::type
-sinh(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__sinh_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__sinh_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__sqrt_expr<typename _Expr::value_type>, _Expr> >
->::type
-sqrt(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__sqrt_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__sqrt_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__tan_expr<typename _Expr::value_type>, _Expr> >
->::type
-tan(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__tan_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__tan_expr<value_type>(), __x));
-}
-
-template<class _Expr>
-inline _LIBCPP_INLINE_VISIBILITY
-typename enable_if
-<
-    __is_val_expr<_Expr>::value,
-    __val_expr<_UnaryOp<__tanh_expr<typename _Expr::value_type>, _Expr> >
->::type
-tanh(const _Expr& __x)
-{
-    typedef typename _Expr::value_type value_type;
-    typedef _UnaryOp<__tanh_expr<value_type>, _Expr> _Op;
-    return __val_expr<_Op>(_Op(__tanh_expr<value_type>(), __x));
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-begin(valarray<_Tp>& __v)
-{
-    return __v.__begin_;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const _Tp*
-begin(const valarray<_Tp>& __v)
-{
-    return __v.__begin_;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-_Tp*
-end(valarray<_Tp>& __v)
-{
-    return __v.__end_;
-}
-
-template <class _Tp>
-inline _LIBCPP_INLINE_VISIBILITY
-const _Tp*
-end(const valarray<_Tp>& __v)
-{
-    return __v.__end_;
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_VALARRAY
diff --git a/include.new/c++/v1/vector b/include.new/c++/v1/vector
deleted file mode 100644
index 22a6343..0000000
--- a/include.new/c++/v1/vector
+++ /dev/null
@@ -1,3317 +0,0 @@
-// -*- C++ -*-
-//===------------------------------ vector --------------------------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef _LIBCPP_VECTOR
-#define _LIBCPP_VECTOR
-
-/*
-    vector synopsis
-
-namespace std
-{
-
-template <class T, class Allocator = allocator<T> >
-class vector
-{
-public:
-    typedef T                                        value_type;
-    typedef Allocator                                allocator_type;
-    typedef typename allocator_type::reference       reference;
-    typedef typename allocator_type::const_reference const_reference;
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef typename allocator_type::pointer         pointer;
-    typedef typename allocator_type::const_pointer   const_pointer;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    vector()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit vector(const allocator_type&);
-    explicit vector(size_type n);
-    explicit vector(size_type n, const allocator_type&); // C++14
-    vector(size_type n, const value_type& value, const allocator_type& = allocator_type());
-    template <class InputIterator>
-        vector(InputIterator first, InputIterator last, const allocator_type& = allocator_type());
-    vector(const vector& x);
-    vector(vector&& x)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    vector(initializer_list<value_type> il);
-    vector(initializer_list<value_type> il, const allocator_type& a);
-    ~vector();
-    vector& operator=(const vector& x);
-    vector& operator=(vector&& x)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    vector& operator=(initializer_list<value_type> il);
-    template <class InputIterator>
-        void assign(InputIterator first, InputIterator last);
-    void assign(size_type n, const value_type& u);
-    void assign(initializer_list<value_type> il);
-
-    allocator_type get_allocator() const noexcept;
-
-    iterator               begin() noexcept;
-    const_iterator         begin()   const noexcept;
-    iterator               end() noexcept;
-    const_iterator         end()     const noexcept;
-
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin()  const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend()    const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    size_type capacity() const noexcept;
-    bool empty() const noexcept;
-    void reserve(size_type n);
-    void shrink_to_fit() noexcept;
-
-    reference       operator[](size_type n);
-    const_reference operator[](size_type n) const;
-    reference       at(size_type n);
-    const_reference at(size_type n) const;
-
-    reference       front();
-    const_reference front() const;
-    reference       back();
-    const_reference back() const;
-
-    value_type*       data() noexcept;
-    const value_type* data() const noexcept;
-
-    void push_back(const value_type& x);
-    void push_back(value_type&& x);
-    template <class... Args>
-        void emplace_back(Args&&... args);
-    void pop_back();
-
-    template <class... Args> iterator emplace(const_iterator position, Args&&... args);
-    iterator insert(const_iterator position, const value_type& x);
-    iterator insert(const_iterator position, value_type&& x);
-    iterator insert(const_iterator position, size_type n, const value_type& x);
-    template <class InputIterator>
-        iterator insert(const_iterator position, InputIterator first, InputIterator last);
-    iterator insert(const_iterator position, initializer_list<value_type> il);
-
-    iterator erase(const_iterator position);
-    iterator erase(const_iterator first, const_iterator last);
-
-    void clear() noexcept;
-
-    void resize(size_type sz);
-    void resize(size_type sz, const value_type& c);
-
-    void swap(vector&)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-
-    bool __invariants() const;
-};
-
-template <class Allocator = allocator<T> >
-class vector<bool, Allocator>
-{
-public:
-    typedef bool                                     value_type;
-    typedef Allocator                                allocator_type;
-    typedef implementation-defined                   iterator;
-    typedef implementation-defined                   const_iterator;
-    typedef typename allocator_type::size_type       size_type;
-    typedef typename allocator_type::difference_type difference_type;
-    typedef iterator                                 pointer;
-    typedef const_iterator                           const_pointer;
-    typedef std::reverse_iterator<iterator>          reverse_iterator;
-    typedef std::reverse_iterator<const_iterator>    const_reverse_iterator;
-
-    class reference
-    {
-    public:
-        reference(const reference&) noexcept;
-        operator bool() const noexcept;
-        reference& operator=(const bool x) noexcept;
-        reference& operator=(const reference& x) noexcept;
-        iterator operator&() const noexcept;
-        void flip() noexcept;
-    };
-
-    class const_reference
-    {
-    public:
-        const_reference(const reference&) noexcept;
-        operator bool() const noexcept;
-        const_iterator operator&() const noexcept;
-    };
-
-    vector()
-        noexcept(is_nothrow_default_constructible<allocator_type>::value);
-    explicit vector(const allocator_type&);
-    explicit vector(size_type n, const allocator_type& a = allocator_type()); // C++14
-    vector(size_type n, const value_type& value, const allocator_type& = allocator_type());
-    template <class InputIterator>
-        vector(InputIterator first, InputIterator last, const allocator_type& = allocator_type());
-    vector(const vector& x);
-    vector(vector&& x)
-        noexcept(is_nothrow_move_constructible<allocator_type>::value);
-    vector(initializer_list<value_type> il);
-    vector(initializer_list<value_type> il, const allocator_type& a);
-    ~vector();
-    vector& operator=(const vector& x);
-    vector& operator=(vector&& x)
-        noexcept(
-             allocator_type::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-    vector& operator=(initializer_list<value_type> il);
-    template <class InputIterator>
-        void assign(InputIterator first, InputIterator last);
-    void assign(size_type n, const value_type& u);
-    void assign(initializer_list<value_type> il);
-
-    allocator_type get_allocator() const noexcept;
-
-    iterator               begin() noexcept;
-    const_iterator         begin()   const noexcept;
-    iterator               end() noexcept;
-    const_iterator         end()     const noexcept;
-
-    reverse_iterator       rbegin() noexcept;
-    const_reverse_iterator rbegin()  const noexcept;
-    reverse_iterator       rend() noexcept;
-    const_reverse_iterator rend()    const noexcept;
-
-    const_iterator         cbegin()  const noexcept;
-    const_iterator         cend()    const noexcept;
-    const_reverse_iterator crbegin() const noexcept;
-    const_reverse_iterator crend()   const noexcept;
-
-    size_type size() const noexcept;
-    size_type max_size() const noexcept;
-    size_type capacity() const noexcept;
-    bool empty() const noexcept;
-    void reserve(size_type n);
-    void shrink_to_fit() noexcept;
-
-    reference       operator[](size_type n);
-    const_reference operator[](size_type n) const;
-    reference       at(size_type n);
-    const_reference at(size_type n) const;
-
-    reference       front();
-    const_reference front() const;
-    reference       back();
-    const_reference back() const;
-
-    void push_back(const value_type& x);
-    template <class... Args> void emplace_back(Args&&... args);  // C++14
-    void pop_back();
-
-    template <class... Args> iterator emplace(const_iterator position, Args&&... args);  // C++14
-    iterator insert(const_iterator position, const value_type& x);
-    iterator insert(const_iterator position, size_type n, const value_type& x);
-    template <class InputIterator>
-        iterator insert(const_iterator position, InputIterator first, InputIterator last);
-    iterator insert(const_iterator position, initializer_list<value_type> il);
-
-    iterator erase(const_iterator position);
-    iterator erase(const_iterator first, const_iterator last);
-
-    void clear() noexcept;
-
-    void resize(size_type sz);
-    void resize(size_type sz, value_type x);
-
-    void swap(vector&)
-        noexcept(!allocator_type::propagate_on_container_swap::value ||
-                 __is_nothrow_swappable<allocator_type>::value);
-    void flip() noexcept;
-
-    bool __invariants() const;
-};
-
-template <class Allocator> struct hash<std::vector<bool, Allocator>>;
-
-template <class T, class Allocator> bool operator==(const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator< (const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator!=(const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator> (const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator>=(const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-template <class T, class Allocator> bool operator<=(const vector<T,Allocator>& x, const vector<T,Allocator>& y);
-
-template <class T, class Allocator>
-void swap(vector<T,Allocator>& x, vector<T,Allocator>& y)
-    noexcept(noexcept(x.swap(y)));
-
-}  // std
-
-*/
-
-#include <__config>
-#include <__bit_reference>
-#include <type_traits>
-#include <climits>
-#include <limits>
-#include <initializer_list>
-#include <memory>
-#include <stdexcept>
-#include <algorithm>
-#include <cstring>
-#include <__split_buffer>
-#include <__functional_base>
-
-#include <__undef_min_max>
-
-#include <__debug>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#pragma GCC system_header
-#endif
-
-_LIBCPP_BEGIN_NAMESPACE_STD
-
-template <bool>
-class __vector_base_common
-{
-protected:
-    _LIBCPP_ALWAYS_INLINE __vector_base_common() {}
-    void __throw_length_error() const;
-    void __throw_out_of_range() const;
-};
-
-template <bool __b>
-void
-__vector_base_common<__b>::__throw_length_error() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw length_error("vector");
-#else
-    assert(!"vector length_error");
-#endif
-}
-
-template <bool __b>
-void
-__vector_base_common<__b>::__throw_out_of_range() const
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    throw out_of_range("vector");
-#else
-    assert(!"vector out_of_range");
-#endif
-}
-
-#ifdef _LIBCPP_MSVC
-#pragma warning( push )
-#pragma warning( disable: 4231 )
-#endif // _LIBCPP_MSVC
-_LIBCPP_EXTERN_TEMPLATE(class _LIBCPP_TYPE_VIS __vector_base_common<true>)
-#ifdef _LIBCPP_MSVC
-#pragma warning( pop )
-#endif // _LIBCPP_MSVC
-
-template <class _Tp, class _Allocator>
-class __vector_base
-    : protected __vector_base_common<true>
-{
-protected:
-    typedef _Tp                                      value_type;
-    typedef _Allocator                               allocator_type;
-    typedef allocator_traits<allocator_type>         __alloc_traits;
-    typedef value_type&                              reference;
-    typedef const value_type&                        const_reference;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-    typedef typename __alloc_traits::pointer         pointer;
-    typedef typename __alloc_traits::const_pointer   const_pointer;
-    typedef pointer                                  iterator;
-    typedef const_pointer                            const_iterator;
-
-    pointer                                         __begin_;
-    pointer                                         __end_;
-    __compressed_pair<pointer, allocator_type> __end_cap_;
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type& __alloc() _NOEXCEPT
-        {return __end_cap_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const allocator_type& __alloc() const _NOEXCEPT
-        {return __end_cap_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    pointer& __end_cap() _NOEXCEPT
-        {return __end_cap_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    const pointer& __end_cap() const _NOEXCEPT
-        {return __end_cap_.first();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    __vector_base()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY __vector_base(const allocator_type& __a);
-    ~__vector_base();
-
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__destruct_at_end(__begin_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type capacity() const _NOEXCEPT
-        {return static_cast<size_type>(__end_cap() - __begin_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __destruct_at_end(pointer __new_last) _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __vector_base& __c)
-        {__copy_assign_alloc(__c, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_copy_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__vector_base& __c)
-        _NOEXCEPT_(
-            !__alloc_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<allocator_type>::value)
-        {__move_assign_alloc(__c, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_move_assignment::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y)
-        _NOEXCEPT_(
-            !__alloc_traits::propagate_on_container_swap::value ||
-            __is_nothrow_swappable<allocator_type>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __alloc_traits::propagate_on_container_swap::value>());}
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __vector_base& __c, true_type)
-        {
-            if (__alloc() != __c.__alloc())
-            {
-                clear();
-                __alloc_traits::deallocate(__alloc(), __begin_, capacity());
-                __begin_ = __end_ = __end_cap() = nullptr;
-            }
-            __alloc() = __c.__alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const __vector_base&, false_type)
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__vector_base& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(__vector_base&, false_type)
-        _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type& __x, allocator_type& __y, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(allocator_type&, allocator_type&, false_type)
-        _NOEXCEPT
-        {}
-};
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-__vector_base<_Tp, _Allocator>::__destruct_at_end(pointer __new_last) _NOEXCEPT
-{
-    while (__new_last != __end_)
-        __alloc_traits::destroy(__alloc(), _VSTD::__to_raw_pointer(--__end_));
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__vector_base<_Tp, _Allocator>::__vector_base()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-    : __begin_(nullptr),
-      __end_(nullptr),
-      __end_cap_(nullptr)
-{
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-__vector_base<_Tp, _Allocator>::__vector_base(const allocator_type& __a)
-    : __begin_(nullptr),
-      __end_(nullptr),
-      __end_cap_(nullptr, __a)
-{
-}
-
-template <class _Tp, class _Allocator>
-__vector_base<_Tp, _Allocator>::~__vector_base()
-{
-    if (__begin_ != nullptr)
-    {
-        clear();
-        __alloc_traits::deallocate(__alloc(), __begin_, capacity());
-    }
-}
-
-template <class _Tp, class _Allocator = allocator<_Tp> >
-class _LIBCPP_TYPE_VIS_ONLY vector
-    : private __vector_base<_Tp, _Allocator>
-{
-private:
-    typedef __vector_base<_Tp, _Allocator>           __base;
-    typedef allocator<_Tp>                           __default_allocator_type;
-public:
-    typedef vector                                   __self;
-    typedef _Tp                                      value_type;
-    typedef _Allocator                               allocator_type;
-    typedef typename __base::__alloc_traits          __alloc_traits;
-    typedef typename __base::reference               reference;
-    typedef typename __base::const_reference         const_reference;
-    typedef typename __base::size_type               size_type;
-    typedef typename __base::difference_type         difference_type;
-    typedef typename __base::pointer                 pointer;
-    typedef typename __base::const_pointer           const_pointer;
-    typedef __wrap_iter<pointer>                     iterator;
-    typedef __wrap_iter<const_pointer>               const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>         reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-    static_assert((is_same<typename allocator_type::value_type, value_type>::value),
-                  "Allocator::value_type must be same type as value_type");
-
-    _LIBCPP_INLINE_VISIBILITY
-    vector()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-        {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-            __get_db()->__insert_c(this);
-#endif
-        }
-    _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a)
-        : __base(__a)
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->__insert_c(this);
-#endif
-    }
-    explicit vector(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit vector(size_type __n, const allocator_type& __a);
-#endif
-    vector(size_type __n, const_reference __x);
-    vector(size_type __n, const_reference __x, const allocator_type& __a);
-    template <class _InputIterator>
-        vector(_InputIterator __first,
-               typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value &&
-                                 is_constructible<
-                                    value_type,
-                                    typename iterator_traits<_InputIterator>::reference>::value,
-                                 _InputIterator>::type __last);
-    template <class _InputIterator>
-        vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
-               typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value &&
-                                 is_constructible<
-                                    value_type,
-                                    typename iterator_traits<_InputIterator>::reference>::value>::type* = 0);
-    template <class _ForwardIterator>
-        vector(_ForwardIterator __first,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
-                                 is_constructible<
-                                    value_type,
-                                    typename iterator_traits<_ForwardIterator>::reference>::value,
-                                 _ForwardIterator>::type __last);
-    template <class _ForwardIterator>
-        vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
-                                 is_constructible<
-                                    value_type,
-                                    typename iterator_traits<_ForwardIterator>::reference>::value>::type* = 0);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    vector(initializer_list<value_type> __il);
-    _LIBCPP_INLINE_VISIBILITY
-    vector(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_INLINE_VISIBILITY
-    ~vector()
-    {
-        __get_db()->__erase_c(this);
-    }
-#endif
-
-    vector(const vector& __x);
-    vector(const vector& __x, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(const vector& __x);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    vector(vector&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY
-    vector(vector&& __x, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(vector&& __x)
-        _NOEXCEPT_(
-             __alloc_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end()); return *this;}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template <class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value &&
-            is_constructible<
-                 value_type,
-                 typename iterator_traits<_InputIterator>::reference>::value,
-            void
-        >::type
-        assign(_InputIterator __first, _InputIterator __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value &&
-            is_constructible<
-                 value_type,
-                 typename iterator_traits<_ForwardIterator>::reference>::value,
-            void
-        >::type
-        assign(_ForwardIterator __first, _ForwardIterator __last);
-
-    void assign(size_type __n, const_reference __u);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void assign(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY
-    allocator_type get_allocator() const _NOEXCEPT
-        {return this->__alloc();}
-
-    _LIBCPP_INLINE_VISIBILITY iterator               begin() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY const_iterator         begin()   const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY iterator               end() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY const_iterator         end()     const _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator       rbegin() _NOEXCEPT
-        {return       reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin()  const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator       rend() _NOEXCEPT
-        {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend()    const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cbegin()  const _NOEXCEPT
-        {return begin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cend()    const _NOEXCEPT
-        {return end();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend()   const _NOEXCEPT
-        {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT
-        {return static_cast<size_type>(this->__end_ - this->__begin_);}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type capacity() const _NOEXCEPT
-        {return __base::capacity();}
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT
-        {return this->__begin_ == this->__end_;}
-    size_type max_size() const _NOEXCEPT;
-    void reserve(size_type __n);
-    void shrink_to_fit() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY reference       operator[](size_type __n);
-    _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const;
-    reference       at(size_type __n);
-    const_reference at(size_type __n) const;
-
-    _LIBCPP_INLINE_VISIBILITY reference       front()
-    {
-        _LIBCPP_ASSERT(!empty(), "front() called for empty vector");
-        return *this->__begin_;
-    }
-    _LIBCPP_INLINE_VISIBILITY const_reference front() const
-    {
-        _LIBCPP_ASSERT(!empty(), "front() called for empty vector");
-        return *this->__begin_;
-    }
-    _LIBCPP_INLINE_VISIBILITY reference       back()
-    {
-        _LIBCPP_ASSERT(!empty(), "back() called for empty vector");
-        return *(this->__end_ - 1);
-    }
-    _LIBCPP_INLINE_VISIBILITY const_reference back()  const
-    {
-        _LIBCPP_ASSERT(!empty(), "back() called for empty vector");
-        return *(this->__end_ - 1);
-    }
-
-    _LIBCPP_INLINE_VISIBILITY
-    value_type*       data() _NOEXCEPT
-        {return _VSTD::__to_raw_pointer(this->__begin_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const value_type* data() const _NOEXCEPT
-        {return _VSTD::__to_raw_pointer(this->__begin_);}
-
-    _LIBCPP_INLINE_VISIBILITY void push_back(const_reference __x);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY void push_back(value_type&& __x);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        void emplace_back(_Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    void pop_back();
-
-    iterator insert(const_iterator __position, const_reference __x);
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator insert(const_iterator __position, value_type&& __x);
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-    template <class... _Args>
-        iterator emplace(const_iterator __position, _Args&&... __args);
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    iterator insert(const_iterator __position, size_type __n, const_reference __x);
-    template <class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value &&
-            is_constructible<
-                 value_type,
-                 typename iterator_traits<_InputIterator>::reference>::value,
-            iterator
-        >::type
-        insert(const_iterator __position, _InputIterator __first, _InputIterator __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value &&
-            is_constructible<
-                 value_type,
-                 typename iterator_traits<_ForwardIterator>::reference>::value,
-            iterator
-        >::type
-        insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __position, initializer_list<value_type> __il)
-        {return insert(__position, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __position);
-    iterator erase(const_iterator __first, const_iterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT
-    {
-        size_type __old_size = size();
-        __base::clear();
-        __annotate_shrink(__old_size);
-        __invalidate_all_iterators();
-    }
-
-    void resize(size_type __sz);
-    void resize(size_type __sz, const_reference __x);
-
-    void swap(vector&)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-
-    bool __invariants() const;
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-    bool __dereferenceable(const const_iterator* __i) const;
-    bool __decrementable(const const_iterator* __i) const;
-    bool __addable(const const_iterator* __i, ptrdiff_t __n) const;
-    bool __subscriptable(const const_iterator* __i, ptrdiff_t __n) const;
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-private:
-    _LIBCPP_INLINE_VISIBILITY void __invalidate_all_iterators();
-    void allocate(size_type __n);
-    void deallocate() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY size_type __recommend(size_type __new_size) const;
-    void __construct_at_end(size_type __n);
-    void __construct_at_end(size_type __n, const_reference __x);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            void
-        >::type
-        __construct_at_end(_ForwardIterator __first, _ForwardIterator __last);
-    void __append(size_type __n);
-    void __append(size_type __n, const_reference __x);
-    _LIBCPP_INLINE_VISIBILITY
-    iterator       __make_iter(pointer __p) _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator __make_iter(const_pointer __p) const _NOEXCEPT;
-    void __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v);
-    pointer __swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v, pointer __p);
-    void __move_range(pointer __from_s, pointer __from_e, pointer __to);
-    void __move_assign(vector& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-    void __move_assign(vector& __c, false_type);
-    _LIBCPP_INLINE_VISIBILITY
-    void __destruct_at_end(pointer __new_last) _NOEXCEPT
-    {
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __c_node* __c = __get_db()->__find_c_and_lock(this);
-        for (__i_node** __p = __c->end_; __p != __c->beg_; )
-        {
-            --__p;
-            const_iterator* __i = static_cast<const_iterator*>((*__p)->__i_);
-            if (__i->base() > __new_last)
-            {
-                (*__p)->__c_ = nullptr;
-                if (--__c->end_ != __p)
-                    memmove(__p, __p+1, (__c->end_ - __p)*sizeof(__i_node*));
-            }
-        }
-        __get_db()->unlock();
-#endif
-        size_type __old_size = size();
-        __base::__destruct_at_end(__new_last);
-        __annotate_shrink(__old_size);
-    }
-    template <class _Up>
-        void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-        __push_back_slow_path(_Up&& __x);
-#else
-        __push_back_slow_path(_Up& __x);
-#endif
-#if !defined(_LIBCPP_HAS_NO_VARIADICS) && !defined(_LIBCPP_HAS_NO_RVALUE_REFERENCES)
-    template <class... _Args>
-        void
-        __emplace_back_slow_path(_Args&&... __args);
-#endif
-    // The following functions are no-ops outside of AddressSanitizer mode.
-    // We call annotatations only for the default Allocator because other allocators
-    // may not meet the AddressSanitizer alignment constraints.
-    // See the documentation for __sanitizer_annotate_contiguous_container for more details.
-    void __annotate_contiguous_container
-    (const void *__beg, const void *__end, const void *__old_mid, const void *__new_mid) const
-    {
-#ifndef _LIBCPP_HAS_NO_ASAN
-      if (__beg && is_same<allocator_type, __default_allocator_type>::value)
-        __sanitizer_annotate_contiguous_container(__beg, __end, __old_mid, __new_mid);
-#endif
-    }
-
-    void __annotate_new(size_type __current_size) const
-    {
-      __annotate_contiguous_container(data(), data() + capacity(),
-                                      data() + capacity(), data() + __current_size);
-    }
-    void __annotate_delete() const
-    {
-      __annotate_contiguous_container(data(), data() + capacity(),
-                                      data() + size(), data() + capacity());
-    }
-    void __annotate_increase(size_type __n) const
-    {
-      __annotate_contiguous_container(data(), data() + capacity(),
-                                      data() + size(), data() + size() + __n);
-    }
-    void __annotate_shrink(size_type __old_size) const
-    {
-      __annotate_contiguous_container(data(), data() + capacity(),
-                                      data() + __old_size, data() + size());
-    }
-#ifndef _LIBCPP_HAS_NO_ASAN
-    // The annotation for size increase should happen before the actual increase,
-    // but if an exception is thrown after that the annotation has to be undone.
-    struct __RAII_IncreaseAnnotator {
-      __RAII_IncreaseAnnotator(const vector &__v, size_type __n = 1)
-        : __commit(false), __v(__v), __n(__n) {
-        __v.__annotate_increase(__n);
-      }
-      void __done() { __commit = true; }
-      ~__RAII_IncreaseAnnotator() {
-        if (__commit) return;
-        __v.__annotate_shrink(__v.size() + __n);
-      }
-      bool __commit;
-      size_type __n;
-      const vector &__v;
-    };
-#else
-    struct __RAII_IncreaseAnnotator {
-      inline __RAII_IncreaseAnnotator(const vector &, size_type __n = 1) {}
-      inline void __done() {}
-    };
-#endif
-
-};
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v)
-{
-    __annotate_delete();
-    __alloc_traits::__construct_backward(this->__alloc(), this->__begin_, this->__end_, __v.__begin_);
-    _VSTD::swap(this->__begin_, __v.__begin_);
-    _VSTD::swap(this->__end_, __v.__end_);
-    _VSTD::swap(this->__end_cap(), __v.__end_cap());
-    __v.__first_ = __v.__begin_;
-    __annotate_new(size());
-    __invalidate_all_iterators();
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::pointer
-vector<_Tp, _Allocator>::__swap_out_circular_buffer(__split_buffer<value_type, allocator_type&>& __v, pointer __p)
-{
-    __annotate_delete();
-    pointer __r = __v.__begin_;
-    __alloc_traits::__construct_backward(this->__alloc(), this->__begin_, __p, __v.__begin_);
-    __alloc_traits::__construct_forward(this->__alloc(), __p, this->__end_, __v.__end_);
-    _VSTD::swap(this->__begin_, __v.__begin_);
-    _VSTD::swap(this->__end_, __v.__end_);
-    _VSTD::swap(this->__end_cap(), __v.__end_cap());
-    __v.__first_ = __v.__begin_;
-    __annotate_new(size());
-    __invalidate_all_iterators();
-    return __r;
-}
-
-//  Allocate space for __n objects
-//  throws length_error if __n > max_size()
-//  throws (probably bad_alloc) if memory run out
-//  Precondition:  __begin_ == __end_ == __end_cap() == 0
-//  Precondition:  __n > 0
-//  Postcondition:  capacity() == __n
-//  Postcondition:  size() == 0
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::allocate(size_type __n)
-{
-    if (__n > max_size())
-        this->__throw_length_error();
-    this->__begin_ = this->__end_ = __alloc_traits::allocate(this->__alloc(), __n);
-    this->__end_cap() = this->__begin_ + __n;
-    __annotate_new(0);
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::deallocate() _NOEXCEPT
-{
-    if (this->__begin_ != nullptr)
-    {
-        clear();
-        __alloc_traits::deallocate(this->__alloc(), this->__begin_, capacity());
-        this->__begin_ = this->__end_ = this->__end_cap() = nullptr;
-    }
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::size_type
-vector<_Tp, _Allocator>::max_size() const _NOEXCEPT
-{
-    return _VSTD::min<size_type>(__alloc_traits::max_size(this->__alloc()), numeric_limits<size_type>::max() / 2);  // end() >= begin(), always
-}
-
-//  Precondition:  __new_size > capacity()
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::size_type
-vector<_Tp, _Allocator>::__recommend(size_type __new_size) const
-{
-    const size_type __ms = max_size();
-    if (__new_size > __ms)
-        this->__throw_length_error();
-    const size_type __cap = capacity();
-    if (__cap >= __ms / 2)
-        return __ms;
-    return _VSTD::max<size_type>(2*__cap, __new_size);
-}
-
-//  Default constructs __n objects starting at __end_
-//  throws if construction throws
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == size() + __n
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__construct_at_end(size_type __n)
-{
-    allocator_type& __a = this->__alloc();
-    do
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_));
-        ++this->__end_;
-        --__n;
-        __annotator.__done();
-    } while (__n > 0);
-}
-
-//  Copy constructs __n objects starting at __end_ from __x
-//  throws if construction throws
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == old size() + __n
-//  Postcondition:  [i] == __x for all i in [size() - __n, __n)
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x)
-{
-    allocator_type& __a = this->__alloc();
-    do
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), __x);
-        ++this->__end_;
-        --__n;
-        __annotator.__done();
-    } while (__n > 0);
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    void
->::type
-vector<_Tp, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last)
-{
-    allocator_type& __a = this->__alloc();
-    for (; __first != __last; ++__first)
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_), *__first);
-        __annotator.__done();
-        ++this->__end_;
-    }
-}
-
-//  Default constructs __n objects starting at __end_
-//  throws if construction throws
-//  Postcondition:  size() == size() + __n
-//  Exception safety: strong.
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__append(size_type __n)
-{
-    if (static_cast<size_type>(this->__end_cap() - this->__end_) >= __n)
-        this->__construct_at_end(__n);
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + __n), size(), __a);
-        __v.__construct_at_end(__n);
-        __swap_out_circular_buffer(__v);
-    }
-}
-
-//  Default constructs __n objects starting at __end_
-//  throws if construction throws
-//  Postcondition:  size() == size() + __n
-//  Exception safety: strong.
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__append(size_type __n, const_reference __x)
-{
-    if (static_cast<size_type>(this->__end_cap() - this->__end_) >= __n)
-        this->__construct_at_end(__n, __x);
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + __n), size(), __a);
-        __v.__construct_at_end(__n, __x);
-        __swap_out_circular_buffer(__v);
-    }
-}
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(size_type __n)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n);
-    }
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(size_type __n, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n);
-    }
-}
-#endif
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(size_type __n, const_reference __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, __x);
-    }
-}
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(size_type __n, const_reference __x, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, __x);
-    }
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIterator>
-vector<_Tp, _Allocator>::vector(_InputIterator __first,
-       typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value &&
-                         is_constructible<
-                            value_type,
-                            typename iterator_traits<_InputIterator>::reference>::value,
-                          _InputIterator>::type __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIterator>
-vector<_Tp, _Allocator>::vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
-       typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value &&
-                         is_constructible<
-                            value_type,
-                            typename iterator_traits<_InputIterator>::reference>::value>::type*)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-vector<_Tp, _Allocator>::vector(_ForwardIterator __first,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
-                                is_constructible<
-                                   value_type,
-                                   typename iterator_traits<_ForwardIterator>::reference>::value,
-                                                   _ForwardIterator>::type __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-vector<_Tp, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value &&
-                                is_constructible<
-                                   value_type,
-                                   typename iterator_traits<_ForwardIterator>::reference>::value>::type*)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(const vector& __x)
-    : __base(__alloc_traits::select_on_container_copy_construction(__x.__alloc()))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    size_type __n = __x.size();
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__x.__begin_, __x.__end_);
-    }
-}
-
-template <class _Tp, class _Allocator>
-vector<_Tp, _Allocator>::vector(const vector& __x, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    size_type __n = __x.size();
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__x.__begin_, __x.__end_);
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>::vector(vector&& __x)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __base(_VSTD::move(__x.__alloc()))
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-    __get_db()->swap(this, &__x);
-#endif
-    this->__begin_ = __x.__begin_;
-    this->__end_ = __x.__end_;
-    this->__end_cap() = __x.__end_cap();
-    __x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>::vector(vector&& __x, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__a == __x.__alloc())
-    {
-        this->__begin_ = __x.__begin_;
-        this->__end_ = __x.__end_;
-        this->__end_cap() = __x.__end_cap();
-        __x.__begin_ = __x.__end_ = __x.__end_cap() = nullptr;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-        __get_db()->swap(this, &__x);
-#endif
-    }
-    else
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__x.begin()), _Ip(__x.end()));
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>::vector(initializer_list<value_type> __il)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__il.size() > 0)
-    {
-        allocate(__il.size());
-        __construct_at_end(__il.begin(), __il.end());
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>::vector(initializer_list<value_type> __il, const allocator_type& __a)
-    : __base(__a)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__insert_c(this);
-#endif
-    if (__il.size() > 0)
-    {
-        allocate(__il.size());
-        __construct_at_end(__il.begin(), __il.end());
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>&
-vector<_Tp, _Allocator>::operator=(vector&& __x)
-        _NOEXCEPT_(
-             __alloc_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__x, integral_constant<bool,
-          __alloc_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__move_assign(vector& __c, false_type)
-{
-    if (__base::__alloc() != __c.__alloc())
-    {
-        typedef move_iterator<iterator> _Ip;
-        assign(_Ip(__c.begin()), _Ip(__c.end()));
-    }
-    else
-        __move_assign(__c, true_type());
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__move_assign(vector& __c, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    deallocate();
-    __base::__move_assign_alloc(__c); // this can throw
-    this->__begin_ = __c.__begin_;
-    this->__end_ = __c.__end_;
-    this->__end_cap() = __c.__end_cap();
-    __c.__begin_ = __c.__end_ = __c.__end_cap() = nullptr;
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->swap(this, &__c);
-#endif
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<_Tp, _Allocator>&
-vector<_Tp, _Allocator>::operator=(const vector& __x)
-{
-    if (this != &__x)
-    {
-        __base::__copy_assign_alloc(__x);
-        assign(__x.__begin_, __x.__end_);
-    }
-    return *this;
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value &&
-    is_constructible<
-       _Tp,
-       typename iterator_traits<_InputIterator>::reference>::value,
-    void
->::type
-vector<_Tp, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
-{
-    clear();
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value &&
-    is_constructible<
-       _Tp,
-       typename iterator_traits<_ForwardIterator>::reference>::value,
-    void
->::type
-vector<_Tp, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)
-{
-    typename iterator_traits<_ForwardIterator>::difference_type __new_size = _VSTD::distance(__first, __last);
-    if (static_cast<size_type>(__new_size) <= capacity())
-    {
-        _ForwardIterator __mid = __last;
-        bool __growing = false;
-        if (static_cast<size_type>(__new_size) > size())
-        {
-            __growing = true;
-            __mid =  __first;
-            _VSTD::advance(__mid, size());
-        }
-        pointer __m = _VSTD::copy(__first, __mid, this->__begin_);
-        if (__growing)
-            __construct_at_end(__mid, __last);
-        else
-            this->__destruct_at_end(__m);
-    }
-    else
-    {
-        deallocate();
-        allocate(__recommend(static_cast<size_type>(__new_size)));
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::assign(size_type __n, const_reference __u)
-{
-    if (__n <= capacity())
-    {
-        size_type __s = size();
-        _VSTD::fill_n(this->__begin_, _VSTD::min(__n, __s), __u);
-        if (__n > __s)
-            __construct_at_end(__n - __s, __u);
-        else
-            this->__destruct_at_end(this->__begin_ + __n);
-    }
-    else
-    {
-        deallocate();
-        allocate(__recommend(static_cast<size_type>(__n)));
-        __construct_at_end(__n, __u);
-    }
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::__make_iter(pointer __p) _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return iterator(this, __p);
-#else
-    return iterator(__p);
-#endif
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::const_iterator
-vector<_Tp, _Allocator>::__make_iter(const_pointer __p) const _NOEXCEPT
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    return const_iterator(this, __p);
-#else
-    return const_iterator(__p);
-#endif
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::begin() _NOEXCEPT
-{
-    return __make_iter(this->__begin_);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::const_iterator
-vector<_Tp, _Allocator>::begin() const _NOEXCEPT
-{
-    return __make_iter(this->__begin_);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::end() _NOEXCEPT
-{
-    return __make_iter(this->__end_);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::const_iterator
-vector<_Tp, _Allocator>::end() const _NOEXCEPT
-{
-    return __make_iter(this->__end_);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::reference
-vector<_Tp, _Allocator>::operator[](size_type __n)
-{
-    _LIBCPP_ASSERT(__n < size(), "vector[] index out of bounds");
-    return this->__begin_[__n];
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::const_reference
-vector<_Tp, _Allocator>::operator[](size_type __n) const
-{
-    _LIBCPP_ASSERT(__n < size(), "vector[] index out of bounds");
-    return this->__begin_[__n];
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::reference
-vector<_Tp, _Allocator>::at(size_type __n)
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return this->__begin_[__n];
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::const_reference
-vector<_Tp, _Allocator>::at(size_type __n) const
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return this->__begin_[__n];
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::reserve(size_type __n)
-{
-    if (__n > capacity())
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__n, size(), __a);
-        __swap_out_circular_buffer(__v);
-    }
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::shrink_to_fit() _NOEXCEPT
-{
-    if (capacity() > size())
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            allocator_type& __a = this->__alloc();
-            __split_buffer<value_type, allocator_type&> __v(size(), size(), __a);
-            __swap_out_circular_buffer(__v);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Tp, class _Allocator>
-template <class _Up>
-void
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-vector<_Tp, _Allocator>::__push_back_slow_path(_Up&& __x)
-#else
-vector<_Tp, _Allocator>::__push_back_slow_path(_Up& __x)
-#endif
-{
-    allocator_type& __a = this->__alloc();
-    __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a);
-    // __v.push_back(_VSTD::forward<_Up>(__x));
-    __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(__v.__end_), _VSTD::forward<_Up>(__x));
-    __v.__end_++;
-    __swap_out_circular_buffer(__v);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::push_back(const_reference __x)
-{
-    if (this->__end_ != this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(this->__alloc(),
-                                  _VSTD::__to_raw_pointer(this->__end_), __x);
-        __annotator.__done();
-        ++this->__end_;
-    }
-    else
-        __push_back_slow_path(__x);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::push_back(value_type&& __x)
-{
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(this->__alloc(),
-                                  _VSTD::__to_raw_pointer(this->__end_),
-                                  _VSTD::move(__x));
-        __annotator.__done();
-        ++this->__end_;
-    }
-    else
-        __push_back_slow_path(_VSTD::move(__x));
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-void
-vector<_Tp, _Allocator>::__emplace_back_slow_path(_Args&&... __args)
-{
-    allocator_type& __a = this->__alloc();
-    __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), size(), __a);
-//    __v.emplace_back(_VSTD::forward<_Args>(__args)...);
-    __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(__v.__end_), _VSTD::forward<_Args>(__args)...);
-    __v.__end_++;
-    __swap_out_circular_buffer(__v);
-}
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::emplace_back(_Args&&... __args)
-{
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        __alloc_traits::construct(this->__alloc(),
-                                  _VSTD::__to_raw_pointer(this->__end_),
-                                  _VSTD::forward<_Args>(__args)...);
-        __annotator.__done();
-        ++this->__end_;
-    }
-    else
-        __emplace_back_slow_path(_VSTD::forward<_Args>(__args)...);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::pop_back()
-{
-    _LIBCPP_ASSERT(!empty(), "vector::pop_back called for empty vector");
-    this->__destruct_at_end(this->__end_ - 1);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::erase(const_iterator __position)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::erase(iterator) called with an iterator not"
-        " referring to this vector");
-#endif
-    _LIBCPP_ASSERT(__position != end(),
-        "vector::erase(iterator) called with a non-dereferenceable iterator");
-    difference_type __ps = __position - cbegin();
-    pointer __p = this->__begin_ + __ps;
-    iterator __r = __make_iter(__p);
-    this->__destruct_at_end(_VSTD::move(__p + 1, this->__end_, __p));
-    return __r;
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::erase(const_iterator __first, const_iterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__first) == this,
-        "vector::erase(iterator,  iterator) called with an iterator not"
-        " referring to this vector");
-#endif
-    _LIBCPP_ASSERT(__first <= __last, "vector::erase(first, last) called with invalid range");
-    pointer __p = this->__begin_ + (__first - begin());
-    iterator __r = __make_iter(__p);
-    if (__first != __last)
-        this->__destruct_at_end(_VSTD::move(__p + (__last - __first), this->__end_, __p));
-    return __r;
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::__move_range(pointer __from_s, pointer __from_e, pointer __to)
-{
-    pointer __old_last = this->__end_;
-    difference_type __n = __old_last - __to;
-    for (pointer __i = __from_s + __n; __i < __from_e; ++__i, ++this->__end_)
-        __alloc_traits::construct(this->__alloc(),
-                                  _VSTD::__to_raw_pointer(this->__end_),
-                                  _VSTD::move(*__i));
-    _VSTD::move_backward(__from_s, __from_s + __n, __old_last);
-}
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::insert(const_iterator __position, const_reference __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, x) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        if (__p == this->__end_)
-        {
-            __alloc_traits::construct(this->__alloc(),
-                                      _VSTD::__to_raw_pointer(this->__end_), __x);
-            ++this->__end_;
-        }
-        else
-        {
-            __move_range(__p, this->__end_, __p + 1);
-            const_pointer __xr = pointer_traits<const_pointer>::pointer_to(__x);
-            if (__p <= __xr && __xr < this->__end_)
-                ++__xr;
-            *__p = *__xr;
-        }
-        __annotator.__done();
-    }
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);
-        __v.push_back(__x);
-        __p = __swap_out_circular_buffer(__v, __p);
-    }
-    return __make_iter(__p);
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::insert(const_iterator __position, value_type&& __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, x) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        if (__p == this->__end_)
-        {
-            __alloc_traits::construct(this->__alloc(),
-                                      _VSTD::__to_raw_pointer(this->__end_),
-                                      _VSTD::move(__x));
-            ++this->__end_;
-        }
-        else
-        {
-            __move_range(__p, this->__end_, __p + 1);
-            *__p = _VSTD::move(__x);
-        }
-        __annotator.__done();
-    }
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);
-        __v.push_back(_VSTD::move(__x));
-        __p = __swap_out_circular_buffer(__v, __p);
-    }
-    return __make_iter(__p);
-}
-
-#ifndef _LIBCPP_HAS_NO_VARIADICS
-
-template <class _Tp, class _Allocator>
-template <class... _Args>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::emplace(const_iterator __position, _Args&&... __args)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::emplace(iterator, x) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    if (this->__end_ < this->__end_cap())
-    {
-        __RAII_IncreaseAnnotator __annotator(*this);
-        if (__p == this->__end_)
-        {
-            __alloc_traits::construct(this->__alloc(),
-                                      _VSTD::__to_raw_pointer(this->__end_),
-                                      _VSTD::forward<_Args>(__args)...);
-            ++this->__end_;
-        }
-        else
-        {
-            value_type __tmp(_VSTD::forward<_Args>(__args)...);
-            __move_range(__p, this->__end_, __p + 1);
-            *__p = _VSTD::move(__tmp);
-        }
-        __annotator.__done();
-    }
-    else
-    {
-        allocator_type& __a = this->__alloc();
-        __split_buffer<value_type, allocator_type&> __v(__recommend(size() + 1), __p - this->__begin_, __a);
-        __v.emplace_back(_VSTD::forward<_Args>(__args)...);
-        __p = __swap_out_circular_buffer(__v, __p);
-    }
-    return __make_iter(__p);
-}
-
-#endif  // _LIBCPP_HAS_NO_VARIADICS
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Tp, class _Allocator>
-typename vector<_Tp, _Allocator>::iterator
-vector<_Tp, _Allocator>::insert(const_iterator __position, size_type __n, const_reference __x)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, n, x) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    if (__n > 0)
-    {
-        if (__n <= static_cast<size_type>(this->__end_cap() - this->__end_))
-        {
-            size_type __old_n = __n;
-            pointer __old_last = this->__end_;
-            if (__n > static_cast<size_type>(this->__end_ - __p))
-            {
-                size_type __cx = __n - (this->__end_ - __p);
-                __construct_at_end(__cx, __x);
-                __n -= __cx;
-            }
-            if (__n > 0)
-            {
-                __RAII_IncreaseAnnotator __annotator(*this, __n);
-                __move_range(__p, __old_last, __p + __old_n);
-                __annotator.__done();
-                const_pointer __xr = pointer_traits<const_pointer>::pointer_to(__x);
-                if (__p <= __xr && __xr < this->__end_)
-                    __xr += __old_n;
-                _VSTD::fill_n(__p, __n, *__xr);
-            }
-        }
-        else
-        {
-            allocator_type& __a = this->__alloc();
-            __split_buffer<value_type, allocator_type&> __v(__recommend(size() + __n), __p - this->__begin_, __a);
-            __v.__construct_at_end(__n, __x);
-            __p = __swap_out_circular_buffer(__v, __p);
-        }
-    }
-    return __make_iter(__p);
-}
-
-template <class _Tp, class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value &&
-    is_constructible<
-       _Tp,
-       typename iterator_traits<_InputIterator>::reference>::value,
-    typename vector<_Tp, _Allocator>::iterator
->::type
-vector<_Tp, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, range) called with an iterator not"
-        " referring to this vector");
-#endif
-    difference_type __off = __position - begin();
-    pointer __p = this->__begin_ + __off;
-    allocator_type& __a = this->__alloc();
-    pointer __old_last = this->__end_;
-    for (; this->__end_ != this->__end_cap() && __first != __last; ++__first)
-    {
-        __alloc_traits::construct(__a, _VSTD::__to_raw_pointer(this->__end_),
-                                  *__first);
-        ++this->__end_;
-    }
-    __split_buffer<value_type, allocator_type&> __v(__a);
-    if (__first != __last)
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __v.__construct_at_end(__first, __last);
-            difference_type __old_size = __old_last - this->__begin_;
-            difference_type __old_p = __p - this->__begin_;
-            reserve(__recommend(size() + __v.size()));
-            __p = this->__begin_ + __old_p;
-            __old_last = this->__begin_ + __old_size;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            erase(__make_iter(__old_last), end());
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    __p = _VSTD::rotate(__p, __old_last, this->__end_);
-    insert(__make_iter(__p), make_move_iterator(__v.begin()),
-                                    make_move_iterator(__v.end()));
-    return begin() + __off;
-}
-
-template <class _Tp, class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value &&
-    is_constructible<
-       _Tp,
-       typename iterator_traits<_ForwardIterator>::reference>::value,
-    typename vector<_Tp, _Allocator>::iterator
->::type
-vector<_Tp, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    _LIBCPP_ASSERT(__get_const_db()->__find_c_from_i(&__position) == this,
-        "vector::insert(iterator, range) called with an iterator not"
-        " referring to this vector");
-#endif
-    pointer __p = this->__begin_ + (__position - begin());
-    difference_type __n = _VSTD::distance(__first, __last);
-    if (__n > 0)
-    {
-        if (__n <= this->__end_cap() - this->__end_)
-        {
-            size_type __old_n = __n;
-            pointer __old_last = this->__end_;
-            _ForwardIterator __m = __last;
-            difference_type __dx = this->__end_ - __p;
-            if (__n > __dx)
-            {
-                __m = __first;
-                _VSTD::advance(__m, this->__end_ - __p);
-                __construct_at_end(__m, __last);
-                __n = __dx;
-            }
-            if (__n > 0)
-            {
-                __RAII_IncreaseAnnotator __annotator(*this, __n);
-                __move_range(__p, __old_last, __p + __old_n);
-                __annotator.__done();
-                _VSTD::copy(__first, __m, __p);
-            }
-        }
-        else
-        {
-            allocator_type& __a = this->__alloc();
-            __split_buffer<value_type, allocator_type&> __v(__recommend(size() + __n), __p - this->__begin_, __a);
-            __v.__construct_at_end(__first, __last);
-            __p = __swap_out_circular_buffer(__v, __p);
-        }
-    }
-    return __make_iter(__p);
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::resize(size_type __sz)
-{
-    size_type __cs = size();
-    if (__cs < __sz)
-        this->__append(__sz - __cs);
-    else if (__cs > __sz)
-        this->__destruct_at_end(this->__begin_ + __sz);
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::resize(size_type __sz, const_reference __x)
-{
-    size_type __cs = size();
-    if (__cs < __sz)
-        this->__append(__sz - __cs, __x);
-    else if (__cs > __sz)
-        this->__destruct_at_end(this->__begin_ + __sz);
-}
-
-template <class _Tp, class _Allocator>
-void
-vector<_Tp, _Allocator>::swap(vector& __x)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-    _LIBCPP_ASSERT(__alloc_traits::propagate_on_container_swap::value ||
-                   this->__alloc() == __x.__alloc(),
-                   "vector::swap: Either propagate_on_container_swap must be true"
-                   " or the allocators must compare equal");
-    _VSTD::swap(this->__begin_, __x.__begin_);
-    _VSTD::swap(this->__end_, __x.__end_);
-    _VSTD::swap(this->__end_cap(), __x.__end_cap());
-    __base::__swap_alloc(this->__alloc(), __x.__alloc());
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->swap(this, &__x);
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-}
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__invariants() const
-{
-    if (this->__begin_ == nullptr)
-    {
-        if (this->__end_ != nullptr || this->__end_cap() != nullptr)
-            return false;
-    }
-    else
-    {
-        if (this->__begin_ > this->__end_)
-            return false;
-        if (this->__begin_ == this->__end_cap())
-            return false;
-        if (this->__end_ > this->__end_cap())
-            return false;
-    }
-    return true;
-}
-
-#if _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__dereferenceable(const const_iterator* __i) const
-{
-    return this->__begin_ <= __i->base() && __i->base() < this->__end_;
-}
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__decrementable(const const_iterator* __i) const
-{
-    return this->__begin_ < __i->base() && __i->base() <= this->__end_;
-}
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__addable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    const_pointer __p = __i->base() + __n;
-    return this->__begin_ <= __p && __p <= this->__end_;
-}
-
-template <class _Tp, class _Allocator>
-bool
-vector<_Tp, _Allocator>::__subscriptable(const const_iterator* __i, ptrdiff_t __n) const
-{
-    const_pointer __p = __i->base() + __n;
-    return this->__begin_ <= __p && __p < this->__end_;
-}
-
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<_Tp, _Allocator>::__invalidate_all_iterators()
-{
-#if _LIBCPP_DEBUG_LEVEL >= 2
-    __get_db()->__invalidate_all(this);
-#endif  // _LIBCPP_DEBUG_LEVEL >= 2
-}
-
-// vector<bool>
-
-template <class _Allocator> class vector<bool, _Allocator>;
-
-template <class _Allocator> struct hash<vector<bool, _Allocator> >;
-
-template <class _Allocator>
-struct __has_storage_type<vector<bool, _Allocator> >
-{
-    static const bool value = true;
-};
-
-template <class _Allocator>
-class _LIBCPP_TYPE_VIS_ONLY vector<bool, _Allocator>
-    : private __vector_base_common<true>
-{
-public:
-    typedef vector                                   __self;
-    typedef bool                                     value_type;
-    typedef _Allocator                               allocator_type;
-    typedef allocator_traits<allocator_type>         __alloc_traits;
-    typedef typename __alloc_traits::size_type       size_type;
-    typedef typename __alloc_traits::difference_type difference_type;
-    typedef size_type __storage_type;
-    typedef __bit_iterator<vector, false>            pointer;
-    typedef __bit_iterator<vector, true>             const_pointer;
-    typedef pointer                                  iterator;
-    typedef const_pointer                            const_iterator;
-    typedef _VSTD::reverse_iterator<iterator>         reverse_iterator;
-    typedef _VSTD::reverse_iterator<const_iterator>   const_reverse_iterator;
-
-private:
-    typedef typename __alloc_traits::template
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-                rebind_alloc<__storage_type>
-#else
-                rebind_alloc<__storage_type>::other
-#endif
-                                                     __storage_allocator;
-    typedef allocator_traits<__storage_allocator>    __storage_traits;
-    typedef typename __storage_traits::pointer       __storage_pointer;
-    typedef typename __storage_traits::const_pointer __const_storage_pointer;
-
-    __storage_pointer                                      __begin_;
-    size_type                                              __size_;
-    __compressed_pair<size_type, __storage_allocator> __cap_alloc_;
-public:
-    typedef __bit_reference<vector>                  reference;
-    typedef __bit_const_reference<vector>            const_reference;
-private:
-    _LIBCPP_INLINE_VISIBILITY
-    size_type& __cap() _NOEXCEPT
-        {return __cap_alloc_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    const size_type& __cap() const _NOEXCEPT
-        {return __cap_alloc_.first();}
-    _LIBCPP_INLINE_VISIBILITY
-    __storage_allocator& __alloc() _NOEXCEPT
-        {return __cap_alloc_.second();}
-    _LIBCPP_INLINE_VISIBILITY
-    const __storage_allocator& __alloc() const _NOEXCEPT
-        {return __cap_alloc_.second();}
-
-    static const unsigned __bits_per_word = static_cast<unsigned>(sizeof(__storage_type) * CHAR_BIT);
-
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __internal_cap_to_external(size_type __n) _NOEXCEPT
-        {return __n * __bits_per_word;}
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __external_cap_to_internal(size_type __n) _NOEXCEPT
-        {return (__n - 1) / __bits_per_word + 1;}
-
-public:
-    _LIBCPP_INLINE_VISIBILITY
-    vector()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a);
-    ~vector();
-    explicit vector(size_type __n);
-#if _LIBCPP_STD_VER > 11
-    explicit vector(size_type __n, const allocator_type& __a);
-#endif
-    vector(size_type __n, const value_type& __v);
-    vector(size_type __n, const value_type& __v, const allocator_type& __a);
-    template <class _InputIterator>
-        vector(_InputIterator __first, _InputIterator __last,
-               typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value>::type* = 0);
-    template <class _InputIterator>
-        vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
-               typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                                 !__is_forward_iterator<_InputIterator>::value>::type* = 0);
-    template <class _ForwardIterator>
-        vector(_ForwardIterator __first, _ForwardIterator __last,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type* = 0);
-    template <class _ForwardIterator>
-        vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-               typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type* = 0);
-
-    vector(const vector& __v);
-    vector(const vector& __v, const allocator_type& __a);
-    vector& operator=(const vector& __v);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    vector(initializer_list<value_type> __il);
-    vector(initializer_list<value_type> __il, const allocator_type& __a);
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-    _LIBCPP_INLINE_VISIBILITY
-    vector(vector&& __v)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value);
-    vector(vector&& __v, const allocator_type& __a);
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(vector&& __v)
-        _NOEXCEPT_(
-             __alloc_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value);
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    vector& operator=(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end()); return *this;}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    template <class _InputIterator>
-        typename enable_if
-        <
-            __is_input_iterator<_InputIterator>::value &&
-           !__is_forward_iterator<_InputIterator>::value,
-           void
-        >::type
-        assign(_InputIterator __first, _InputIterator __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-           void
-        >::type
-        assign(_ForwardIterator __first, _ForwardIterator __last);
-
-    void assign(size_type __n, const value_type& __x);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    void assign(initializer_list<value_type> __il)
-        {assign(__il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY allocator_type get_allocator() const _NOEXCEPT
-        {return allocator_type(this->__alloc());}
-
-    size_type max_size() const _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    size_type capacity() const _NOEXCEPT
-        {return __internal_cap_to_external(__cap());}
-    _LIBCPP_INLINE_VISIBILITY
-    size_type size() const _NOEXCEPT
-        {return __size_;}
-    _LIBCPP_INLINE_VISIBILITY
-    bool empty() const _NOEXCEPT
-        {return __size_ == 0;}
-    void reserve(size_type __n);
-    void shrink_to_fit() _NOEXCEPT;
-
-    _LIBCPP_INLINE_VISIBILITY
-    iterator begin() _NOEXCEPT
-        {return __make_iter(0);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator begin() const _NOEXCEPT
-        {return __make_iter(0);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator end() _NOEXCEPT
-        {return __make_iter(__size_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator end()   const _NOEXCEPT
-        {return __make_iter(__size_);}
-
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rbegin() _NOEXCEPT
-        {return       reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rbegin() const _NOEXCEPT
-        {return const_reverse_iterator(end());}
-    _LIBCPP_INLINE_VISIBILITY
-    reverse_iterator rend() _NOEXCEPT
-        {return       reverse_iterator(begin());}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator rend()   const _NOEXCEPT
-        {return const_reverse_iterator(begin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cbegin()  const _NOEXCEPT
-        {return __make_iter(0);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator         cend()    const _NOEXCEPT
-        {return __make_iter(__size_);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crbegin() const _NOEXCEPT
-        {return rbegin();}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reverse_iterator crend()   const _NOEXCEPT
-        {return rend();}
-
-    _LIBCPP_INLINE_VISIBILITY reference       operator[](size_type __n)       {return __make_ref(__n);}
-    _LIBCPP_INLINE_VISIBILITY const_reference operator[](size_type __n) const {return __make_ref(__n);}
-    reference       at(size_type __n);
-    const_reference at(size_type __n) const;
-
-    _LIBCPP_INLINE_VISIBILITY reference       front()       {return __make_ref(0);}
-    _LIBCPP_INLINE_VISIBILITY const_reference front() const {return __make_ref(0);}
-    _LIBCPP_INLINE_VISIBILITY reference       back()        {return __make_ref(__size_ - 1);}
-    _LIBCPP_INLINE_VISIBILITY const_reference back()  const {return __make_ref(__size_ - 1);}
-
-    void push_back(const value_type& __x);
-#if _LIBCPP_STD_VER > 11
-    template <class... _Args>
-    _LIBCPP_INLINE_VISIBILITY void emplace_back(_Args&&... __args)
-        { push_back ( value_type ( _VSTD::forward<_Args>(__args)... )); }
-#endif
-
-    _LIBCPP_INLINE_VISIBILITY void pop_back() {--__size_;}
-
-#if _LIBCPP_STD_VER > 11
-    template <class... _Args>
-   _LIBCPP_INLINE_VISIBILITY iterator emplace(const_iterator position, _Args&&... __args)
-        { return insert ( position, value_type ( _VSTD::forward<_Args>(__args)... )); }
-#endif
-
-    iterator insert(const_iterator __position, const value_type& __x);
-    iterator insert(const_iterator __position, size_type __n, const value_type& __x);
-    iterator insert(const_iterator __position, size_type __n, const_reference __x);
-    template <class _InputIterator>
-        typename enable_if
-        <
-             __is_input_iterator  <_InputIterator>::value &&
-            !__is_forward_iterator<_InputIterator>::value,
-            iterator
-        >::type
-        insert(const_iterator __position, _InputIterator __first, _InputIterator __last);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            iterator
-        >::type
-        insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last);
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-    _LIBCPP_INLINE_VISIBILITY
-    iterator insert(const_iterator __position, initializer_list<value_type> __il)
-        {return insert(__position, __il.begin(), __il.end());}
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-    _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __position);
-    iterator erase(const_iterator __first, const_iterator __last);
-
-    _LIBCPP_INLINE_VISIBILITY
-    void clear() _NOEXCEPT {__size_ = 0;}
-
-    void swap(vector&)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value);
-
-    void resize(size_type __sz, value_type __x = false);
-    void flip() _NOEXCEPT;
-
-    bool __invariants() const;
-
-private:
-    _LIBCPP_INLINE_VISIBILITY void __invalidate_all_iterators();
-    void allocate(size_type __n);
-    void deallocate() _NOEXCEPT;
-    _LIBCPP_INLINE_VISIBILITY
-    static size_type __align_it(size_type __new_size) _NOEXCEPT
-        {return __new_size + (__bits_per_word-1) & ~((size_type)__bits_per_word-1);};
-    _LIBCPP_INLINE_VISIBILITY  size_type __recommend(size_type __new_size) const;
-    _LIBCPP_INLINE_VISIBILITY void __construct_at_end(size_type __n, bool __x);
-    template <class _ForwardIterator>
-        typename enable_if
-        <
-            __is_forward_iterator<_ForwardIterator>::value,
-            void
-        >::type
-        __construct_at_end(_ForwardIterator __first, _ForwardIterator __last);
-    void __append(size_type __n, const_reference __x);
-    _LIBCPP_INLINE_VISIBILITY
-    reference __make_ref(size_type __pos) _NOEXCEPT
-        {return reference(__begin_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY
-    const_reference __make_ref(size_type __pos) const _NOEXCEPT
-        {return const_reference(__begin_ + __pos / __bits_per_word, __storage_type(1) << __pos % __bits_per_word);}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator __make_iter(size_type __pos) _NOEXCEPT
-        {return iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));}
-    _LIBCPP_INLINE_VISIBILITY
-    const_iterator __make_iter(size_type __pos) const _NOEXCEPT
-        {return const_iterator(__begin_ + __pos / __bits_per_word, static_cast<unsigned>(__pos % __bits_per_word));}
-    _LIBCPP_INLINE_VISIBILITY
-    iterator __const_iterator_cast(const_iterator __p) _NOEXCEPT
-        {return begin() + (__p - cbegin());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const vector& __v)
-        {__copy_assign_alloc(__v, integral_constant<bool,
-                      __storage_traits::propagate_on_container_copy_assignment::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const vector& __c, true_type)
-        {
-            if (__alloc() != __c.__alloc())
-                deallocate();
-            __alloc() = __c.__alloc();
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __copy_assign_alloc(const vector&, false_type)
-        {}
-
-    void __move_assign(vector& __c, false_type);
-    void __move_assign(vector& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value);
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(vector& __c)
-        _NOEXCEPT_(
-            !__storage_traits::propagate_on_container_move_assignment::value ||
-            is_nothrow_move_assignable<allocator_type>::value)
-        {__move_assign_alloc(__c, integral_constant<bool,
-                      __storage_traits::propagate_on_container_move_assignment::value>());}
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(vector& __c, true_type)
-        _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-        {
-            __alloc() = _VSTD::move(__c.__alloc());
-        }
-
-    _LIBCPP_INLINE_VISIBILITY
-    void __move_assign_alloc(vector&, false_type)
-        _NOEXCEPT
-        {}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__storage_allocator& __x, __storage_allocator& __y)
-        _NOEXCEPT_(
-            !__storage_traits::propagate_on_container_swap::value ||
-            __is_nothrow_swappable<allocator_type>::value)
-        {__swap_alloc(__x, __y, integral_constant<bool,
-                      __storage_traits::propagate_on_container_swap::value>());}
-
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__storage_allocator& __x, __storage_allocator& __y, true_type)
-        _NOEXCEPT_(__is_nothrow_swappable<allocator_type>::value)
-        {
-            using _VSTD::swap;
-            swap(__x, __y);
-        }
-    _LIBCPP_INLINE_VISIBILITY
-    static void __swap_alloc(__storage_allocator&, __storage_allocator&, false_type)
-        _NOEXCEPT
-        {}
-
-    size_t __hash_code() const _NOEXCEPT;
-
-    friend class __bit_reference<vector>;
-    friend class __bit_const_reference<vector>;
-    friend class __bit_iterator<vector, false>;
-    friend class __bit_iterator<vector, true>;
-    friend struct __bit_array<vector>;
-    friend struct _LIBCPP_TYPE_VIS_ONLY hash<vector>;
-};
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<bool, _Allocator>::__invalidate_all_iterators()
-{
-}
-
-//  Allocate space for __n objects
-//  throws length_error if __n > max_size()
-//  throws (probably bad_alloc) if memory run out
-//  Precondition:  __begin_ == __end_ == __cap() == 0
-//  Precondition:  __n > 0
-//  Postcondition:  capacity() == __n
-//  Postcondition:  size() == 0
-template <class _Allocator>
-void
-vector<bool, _Allocator>::allocate(size_type __n)
-{
-    if (__n > max_size())
-        this->__throw_length_error();
-    __n = __external_cap_to_internal(__n);
-    this->__begin_ = __storage_traits::allocate(this->__alloc(), __n);
-    this->__size_ = 0;
-    this->__cap() = __n;
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::deallocate() _NOEXCEPT
-{
-    if (this->__begin_ != nullptr)
-    {
-        __storage_traits::deallocate(this->__alloc(), this->__begin_, __cap());
-        __invalidate_all_iterators();
-        this->__begin_ = nullptr;
-        this->__size_ = this->__cap() = 0;
-    }
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::size_type
-vector<bool, _Allocator>::max_size() const _NOEXCEPT
-{
-    size_type __amax = __storage_traits::max_size(__alloc());
-    size_type __nmax = numeric_limits<size_type>::max() / 2;  // end() >= begin(), always
-    if (__nmax / __bits_per_word <= __amax)
-        return __nmax;
-    return __internal_cap_to_external(__amax);
-}
-
-//  Precondition:  __new_size > capacity()
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<bool, _Allocator>::size_type
-vector<bool, _Allocator>::__recommend(size_type __new_size) const
-{
-    const size_type __ms = max_size();
-    if (__new_size > __ms)
-        this->__throw_length_error();
-    const size_type __cap = capacity();
-    if (__cap >= __ms / 2)
-        return __ms;
-    return _VSTD::max(2*__cap, __align_it(__new_size));
-}
-
-//  Default constructs __n objects starting at __end_
-//  Precondition:  __n > 0
-//  Precondition:  size() + __n <= capacity()
-//  Postcondition:  size() == size() + __n
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-vector<bool, _Allocator>::__construct_at_end(size_type __n, bool __x)
-{
-    size_type __old_size = this->__size_;
-    this->__size_ += __n;
-    _VSTD::fill_n(__make_iter(__old_size), __n, __x);
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    void
->::type
-vector<bool, _Allocator>::__construct_at_end(_ForwardIterator __first, _ForwardIterator __last)
-{
-    size_type __old_size = this->__size_;
-    this->__size_ += _VSTD::distance(__first, __last);
-    _VSTD::copy(__first, __last, __make_iter(__old_size));
-}
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<bool, _Allocator>::vector()
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-}
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<bool, _Allocator>::vector(const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(size_type __n)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, false);
-    }
-}
-
-#if _LIBCPP_STD_VER > 11
-template <class _Allocator>
-vector<bool, _Allocator>::vector(size_type __n, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, false);
-    }
-}
-#endif
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(size_type __n, const value_type& __x)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, __x);
-    }
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(size_type __n, const value_type& __x, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__n, __x);
-    }
-}
-
-template <class _Allocator>
-template <class _InputIterator>
-vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last,
-       typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value>::type*)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (; __first != __last; ++__first)
-            push_back(*__first);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        if (__begin_ != nullptr)
-            __storage_traits::deallocate(__alloc(), __begin_, __cap());
-        __invalidate_all_iterators();
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Allocator>
-template <class _InputIterator>
-vector<bool, _Allocator>::vector(_InputIterator __first, _InputIterator __last, const allocator_type& __a,
-       typename enable_if<__is_input_iterator  <_InputIterator>::value &&
-                         !__is_forward_iterator<_InputIterator>::value>::type*)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    try
-    {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-        for (; __first != __last; ++__first)
-            push_back(*__first);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-    }
-    catch (...)
-    {
-        if (__begin_ != nullptr)
-            __storage_traits::deallocate(__alloc(), __begin_, __cap());
-        __invalidate_all_iterators();
-        throw;
-    }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-vector<bool, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type*)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-vector<bool, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __last, const allocator_type& __a,
-                                typename enable_if<__is_forward_iterator<_ForwardIterator>::value>::type*)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-    size_type __n = static_cast<size_type>(_VSTD::distance(__first, __last));
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__first, __last);
-    }
-}
-
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(initializer_list<value_type> __il)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0)
-{
-    size_type __n = static_cast<size_type>(__il.size());
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__il.begin(), __il.end());
-    }
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(initializer_list<value_type> __il, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, static_cast<__storage_allocator>(__a))
-{
-    size_type __n = static_cast<size_type>(__il.size());
-    if (__n > 0)
-    {
-        allocate(__n);
-        __construct_at_end(__il.begin(), __il.end());
-    }
-}
-
-#endif  // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
-
-template <class _Allocator>
-vector<bool, _Allocator>::~vector()
-{
-    if (__begin_ != nullptr)
-        __storage_traits::deallocate(__alloc(), __begin_, __cap());
-    __invalidate_all_iterators();
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(const vector& __v)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, __storage_traits::select_on_container_copy_construction(__v.__alloc()))
-{
-    if (__v.size() > 0)
-    {
-        allocate(__v.size());
-        __construct_at_end(__v.begin(), __v.end());
-    }
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(const vector& __v, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, __a)
-{
-    if (__v.size() > 0)
-    {
-        allocate(__v.size());
-        __construct_at_end(__v.begin(), __v.end());
-    }
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>&
-vector<bool, _Allocator>::operator=(const vector& __v)
-{
-    if (this != &__v)
-    {
-        __copy_assign_alloc(__v);
-        if (__v.__size_)
-        {
-            if (__v.__size_ > capacity())
-            {
-                deallocate();
-                allocate(__v.__size_);
-            }
-            _VSTD::copy(__v.__begin_, __v.__begin_ + __external_cap_to_internal(__v.__size_), __begin_);
-        }
-        __size_ = __v.__size_;
-    }
-    return *this;
-}
-
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<bool, _Allocator>::vector(vector&& __v)
-        _NOEXCEPT_(is_nothrow_move_constructible<allocator_type>::value)
-    : __begin_(__v.__begin_),
-      __size_(__v.__size_),
-      __cap_alloc_(__v.__cap_alloc_)
-{
-    __v.__begin_ = nullptr;
-    __v.__size_ = 0;
-    __v.__cap() = 0;
-}
-
-template <class _Allocator>
-vector<bool, _Allocator>::vector(vector&& __v, const allocator_type& __a)
-    : __begin_(nullptr),
-      __size_(0),
-      __cap_alloc_(0, __a)
-{
-    if (__a == allocator_type(__v.__alloc()))
-    {
-        this->__begin_ = __v.__begin_;
-        this->__size_ = __v.__size_;
-        this->__cap() = __v.__cap();
-        __v.__begin_ = nullptr;
-        __v.__cap() = __v.__size_ = 0;
-    }
-    else if (__v.size() > 0)
-    {
-        allocate(__v.size());
-        __construct_at_end(__v.begin(), __v.end());
-    }
-}
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-vector<bool, _Allocator>&
-vector<bool, _Allocator>::operator=(vector&& __v)
-        _NOEXCEPT_(
-             __alloc_traits::propagate_on_container_move_assignment::value &&
-             is_nothrow_move_assignable<allocator_type>::value)
-{
-    __move_assign(__v, integral_constant<bool,
-          __storage_traits::propagate_on_container_move_assignment::value>());
-    return *this;
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::__move_assign(vector& __c, false_type)
-{
-    if (__alloc() != __c.__alloc())
-        assign(__c.begin(), __c.end());
-    else
-        __move_assign(__c, true_type());
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::__move_assign(vector& __c, true_type)
-    _NOEXCEPT_(is_nothrow_move_assignable<allocator_type>::value)
-{
-    deallocate();
-    __move_assign_alloc(__c);
-    this->__begin_ = __c.__begin_;
-    this->__size_ = __c.__size_;
-    this->__cap() = __c.__cap();
-    __c.__begin_ = nullptr;
-    __c.__cap() = __c.__size_ = 0;
-}
-
-#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::assign(size_type __n, const value_type& __x)
-{
-    __size_ = 0;
-    if (__n > 0)
-    {
-        size_type __c = capacity();
-        if (__n <= __c)
-            __size_ = __n;
-        else
-        {
-            vector __v(__alloc());
-            __v.reserve(__recommend(__n));
-            __v.__size_ = __n;
-            swap(__v);
-        }
-        _VSTD::fill_n(begin(), __n, __x);
-    }
-}
-
-template <class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-    __is_input_iterator<_InputIterator>::value &&
-   !__is_forward_iterator<_InputIterator>::value,
-   void
->::type
-vector<bool, _Allocator>::assign(_InputIterator __first, _InputIterator __last)
-{
-    clear();
-    for (; __first != __last; ++__first)
-        push_back(*__first);
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-   void
->::type
-vector<bool, _Allocator>::assign(_ForwardIterator __first, _ForwardIterator __last)
-{
-    clear();
-    difference_type __n = _VSTD::distance(__first, __last);
-    if (__n)
-    {
-        if (__n > capacity())
-        {
-            deallocate();
-            allocate(__n);
-        }
-        __construct_at_end(__first, __last);
-    }
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::reserve(size_type __n)
-{
-    if (__n > capacity())
-    {
-        vector __v(this->__alloc());
-        __v.allocate(__n);
-        __v.__construct_at_end(this->begin(), this->end());
-        swap(__v);
-        __invalidate_all_iterators();
-    }
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::shrink_to_fit() _NOEXCEPT
-{
-    if (__external_cap_to_internal(size()) > __cap())
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            vector(*this, allocator_type(__alloc())).swap(*this);
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::reference
-vector<bool, _Allocator>::at(size_type __n)
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return (*this)[__n];
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::const_reference
-vector<bool, _Allocator>::at(size_type __n) const
-{
-    if (__n >= size())
-        this->__throw_out_of_range();
-    return (*this)[__n];
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::push_back(const value_type& __x)
-{
-    if (this->__size_ == this->capacity())
-        reserve(__recommend(this->__size_ + 1));
-    ++this->__size_;
-    back() = __x;
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::iterator
-vector<bool, _Allocator>::insert(const_iterator __position, const value_type& __x)
-{
-    iterator __r;
-    if (size() < capacity())
-    {
-        const_iterator __old_end = end();
-        ++__size_;
-        _VSTD::copy_backward(__position, __old_end, end());
-        __r = __const_iterator_cast(__position);
-    }
-    else
-    {
-        vector __v(__alloc());
-        __v.reserve(__recommend(__size_ + 1));
-        __v.__size_ = __size_ + 1;
-        __r = _VSTD::copy(cbegin(), __position, __v.begin());
-        _VSTD::copy_backward(__position, cend(), __v.end());
-        swap(__v);
-    }
-    *__r = __x;
-    return __r;
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::iterator
-vector<bool, _Allocator>::insert(const_iterator __position, size_type __n, const value_type& __x)
-{
-    iterator __r;
-    size_type __c = capacity();
-    if (__n <= __c && size() <= __c - __n)
-    {
-        const_iterator __old_end = end();
-        __size_ += __n;
-        _VSTD::copy_backward(__position, __old_end, end());
-        __r = __const_iterator_cast(__position);
-    }
-    else
-    {
-        vector __v(__alloc());
-        __v.reserve(__recommend(__size_ + __n));
-        __v.__size_ = __size_ + __n;
-        __r = _VSTD::copy(cbegin(), __position, __v.begin());
-        _VSTD::copy_backward(__position, cend(), __v.end());
-        swap(__v);
-    }
-    _VSTD::fill_n(__r, __n, __x);
-    return __r;
-}
-
-template <class _Allocator>
-template <class _InputIterator>
-typename enable_if
-<
-     __is_input_iterator  <_InputIterator>::value &&
-    !__is_forward_iterator<_InputIterator>::value,
-    typename vector<bool, _Allocator>::iterator
->::type
-vector<bool, _Allocator>::insert(const_iterator __position, _InputIterator __first, _InputIterator __last)
-{
-    difference_type __off = __position - begin();
-    iterator __p = __const_iterator_cast(__position);
-    iterator __old_end = end();
-    for (; size() != capacity() && __first != __last; ++__first)
-    {
-        ++this->__size_;
-        back() = *__first;
-    }
-    vector __v(__alloc());
-    if (__first != __last)
-    {
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        try
-        {
-#endif  // _LIBCPP_NO_EXCEPTIONS
-            __v.assign(__first, __last);
-            difference_type __old_size = static_cast<difference_type>(__old_end - begin());
-            difference_type __old_p = __p - begin();
-            reserve(__recommend(size() + __v.size()));
-            __p = begin() + __old_p;
-            __old_end = begin() + __old_size;
-#ifndef _LIBCPP_NO_EXCEPTIONS
-        }
-        catch (...)
-        {
-            erase(__old_end, end());
-            throw;
-        }
-#endif  // _LIBCPP_NO_EXCEPTIONS
-    }
-    __p = _VSTD::rotate(__p, __old_end, end());
-    insert(__p, __v.begin(), __v.end());
-    return begin() + __off;
-}
-
-template <class _Allocator>
-template <class _ForwardIterator>
-typename enable_if
-<
-    __is_forward_iterator<_ForwardIterator>::value,
-    typename vector<bool, _Allocator>::iterator
->::type
-vector<bool, _Allocator>::insert(const_iterator __position, _ForwardIterator __first, _ForwardIterator __last)
-{
-    difference_type __n = _VSTD::distance(__first, __last);
-    iterator __r;
-    size_type __c = capacity();
-    if (__n <= __c && size() <= __c - __n)
-    {
-        const_iterator __old_end = end();
-        __size_ += __n;
-        _VSTD::copy_backward(__position, __old_end, end());
-        __r = __const_iterator_cast(__position);
-    }
-    else
-    {
-        vector __v(__alloc());
-        __v.reserve(__recommend(__size_ + __n));
-        __v.__size_ = __size_ + __n;
-        __r = _VSTD::copy(cbegin(), __position, __v.begin());
-        _VSTD::copy_backward(__position, cend(), __v.end());
-        swap(__v);
-    }
-    _VSTD::copy(__first, __last, __r);
-    return __r;
-}
-
-template <class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-typename vector<bool, _Allocator>::iterator
-vector<bool, _Allocator>::erase(const_iterator __position)
-{
-    iterator __r = __const_iterator_cast(__position);
-    _VSTD::copy(__position + 1, this->cend(), __r);
-    --__size_;
-    return __r;
-}
-
-template <class _Allocator>
-typename vector<bool, _Allocator>::iterator
-vector<bool, _Allocator>::erase(const_iterator __first, const_iterator __last)
-{
-    iterator __r = __const_iterator_cast(__first);
-    difference_type __d = __last - __first;
-    _VSTD::copy(__last, this->cend(), __r);
-    __size_ -= __d;
-    return __r;
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::swap(vector& __x)
-        _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value ||
-                   __is_nothrow_swappable<allocator_type>::value)
-{
-    _VSTD::swap(this->__begin_, __x.__begin_);
-    _VSTD::swap(this->__size_, __x.__size_);
-    _VSTD::swap(this->__cap(), __x.__cap());
-    __swap_alloc(this->__alloc(), __x.__alloc());
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::resize(size_type __sz, value_type __x)
-{
-    size_type __cs = size();
-    if (__cs < __sz)
-    {
-        iterator __r;
-        size_type __c = capacity();
-        size_type __n = __sz - __cs;
-        if (__n <= __c && __cs <= __c - __n)
-        {
-            __r = end();
-            __size_ += __n;
-        }
-        else
-        {
-            vector __v(__alloc());
-            __v.reserve(__recommend(__size_ + __n));
-            __v.__size_ = __size_ + __n;
-            __r = _VSTD::copy(cbegin(), cend(), __v.begin());
-            swap(__v);
-        }
-        _VSTD::fill_n(__r, __n, __x);
-    }
-    else
-        __size_ = __sz;
-}
-
-template <class _Allocator>
-void
-vector<bool, _Allocator>::flip() _NOEXCEPT
-{
-    // do middle whole words
-    size_type __n = __size_;
-    __storage_pointer __p = __begin_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        *__p = ~*__p;
-    // do last partial word
-    if (__n > 0)
-    {
-        __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __storage_type __b = *__p & __m;
-        *__p &= ~__m;
-        *__p |= ~__b & __m;
-    }
-}
-
-template <class _Allocator>
-bool
-vector<bool, _Allocator>::__invariants() const
-{
-    if (this->__begin_ == nullptr)
-    {
-        if (this->__size_ != 0 || this->__cap() != 0)
-            return false;
-    }
-    else
-    {
-        if (this->__cap() == 0)
-            return false;
-        if (this->__size_ > this->capacity())
-            return false;
-    }
-    return true;
-}
-
-template <class _Allocator>
-size_t
-vector<bool, _Allocator>::__hash_code() const _NOEXCEPT
-{
-    size_t __h = 0;
-    // do middle whole words
-    size_type __n = __size_;
-    __storage_pointer __p = __begin_;
-    for (; __n >= __bits_per_word; ++__p, __n -= __bits_per_word)
-        __h ^= *__p;
-    // do last partial word
-    if (__n > 0)
-    {
-        const __storage_type __m = ~__storage_type(0) >> (__bits_per_word - __n);
-        __h ^= *__p & __m;
-    }
-    return __h;
-}
-
-template <class _Allocator>
-struct _LIBCPP_TYPE_VIS_ONLY hash<vector<bool, _Allocator> >
-    : public unary_function<vector<bool, _Allocator>, size_t>
-{
-    _LIBCPP_INLINE_VISIBILITY
-    size_t operator()(const vector<bool, _Allocator>& __vec) const _NOEXCEPT
-        {return __vec.__hash_code();}
-};
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator==(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    const typename vector<_Tp, _Allocator>::size_type __sz = __x.size();
-    return __sz == __y.size() && _VSTD::equal(__x.begin(), __x.end(), __y.begin());
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator!=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return !(__x == __y);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator< (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return _VSTD::lexicographical_compare(__x.begin(), __x.end(), __y.begin(), __y.end());
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator> (const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return __y < __x;
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator>=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return !(__x < __y);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-bool
-operator<=(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& __y)
-{
-    return !(__y < __x);
-}
-
-template <class _Tp, class _Allocator>
-inline _LIBCPP_INLINE_VISIBILITY
-void
-swap(vector<_Tp, _Allocator>& __x, vector<_Tp, _Allocator>& __y)
-    _NOEXCEPT_(_NOEXCEPT_(__x.swap(__y)))
-{
-    __x.swap(__y);
-}
-
-_LIBCPP_END_NAMESPACE_STD
-
-#endif  // _LIBCPP_VECTOR
diff --git a/include.new/calendar.h b/include.new/calendar.h
deleted file mode 100644
index 3c5e4cb..0000000
--- a/include.new/calendar.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 1997 Wolfgang Helbig
- * 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.
- *
- * 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: releng/10.2/lib/libcalendar/calendar.h 50476 1999-08-28 00:22:10Z peter $
- */
-struct date {
-	int y;	/* year */
-	int m;	/* month */
-	int d;	/* day */
-};
-
-struct date	*easterg(int _year, struct date *_dt);
-struct date	*easterog(int _year, struct date *_dt);
-struct date	*easteroj(int _year, struct date *_dt);
-struct date	*gdate(int _nd, struct date *_dt);
-struct date	*jdate(int _nd, struct date *_dt);
-int		 ndaysg(struct date *_dt);
-int		 ndaysj(struct date *_dt);
-int		 week(int _nd, int *_year);
-int		 weekday(int _nd);
diff --git a/include.new/cam/ata/ata_all.h b/include.new/cam/ata/ata_all.h
deleted file mode 100644
index f7a7eae..0000000
--- a/include.new/cam/ata/ata_all.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*-
- * Copyright (c) 2009 Alexander Motin <mav@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,
- *    without modification, immediately at the beginning of the file.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/cam/ata/ata_all.h 257049 2013-10-24 10:33:31Z mav $
- */
-
-#ifndef	CAM_ATA_ALL_H
-#define CAM_ATA_ALL_H 1
-
-#include <sys/ata.h>
-
-struct ccb_ataio;
-struct cam_periph;
-union  ccb;
-
-#define	SID_DMA48	0x01 /* Abuse inq_flags bit to track enabled DMA48. */
-#define	SID_AEN		0x04 /* Abuse inq_flags bit to track enabled AEN. */
-#define	SID_DMA		0x10 /* Abuse inq_flags bit to track enabled DMA. */
-
-struct ata_cmd {
-	u_int8_t	flags;		/* ATA command flags */
-#define		CAM_ATAIO_48BIT		0x01	/* Command has 48-bit format */
-#define		CAM_ATAIO_FPDMA		0x02	/* FPDMA command */
-#define		CAM_ATAIO_CONTROL	0x04	/* Control, not a command */
-#define		CAM_ATAIO_NEEDRESULT	0x08	/* Request requires result. */
-#define		CAM_ATAIO_DMA		0x10	/* DMA command */
-
-	u_int8_t	command;
-	u_int8_t	features;
-
-	u_int8_t	lba_low;
-	u_int8_t	lba_mid;
-	u_int8_t	lba_high;
-	u_int8_t	device;
-
-	u_int8_t	lba_low_exp;
-	u_int8_t	lba_mid_exp;
-	u_int8_t	lba_high_exp;
-	u_int8_t	features_exp;
-
-	u_int8_t	sector_count;
-	u_int8_t	sector_count_exp;
-	u_int8_t	control;
-};
-
-struct ata_res {
-	u_int8_t	flags;		/* ATA command flags */
-#define		CAM_ATAIO_48BIT		0x01	/* Command has 48-bit format */
-
-	u_int8_t	status;
-	u_int8_t	error;
-
-	u_int8_t	lba_low;
-	u_int8_t	lba_mid;
-	u_int8_t	lba_high;
-	u_int8_t	device;
-
-	u_int8_t	lba_low_exp;
-	u_int8_t	lba_mid_exp;
-	u_int8_t	lba_high_exp;
-
-	u_int8_t	sector_count;
-	u_int8_t	sector_count_exp;
-};
-
-struct sep_identify_data {
-	uint8_t		length;		/* Enclosure descriptor length */
-	uint8_t		subenc_id;	/* Sub-enclosure identifier */
-	uint8_t		logical_id[8];	/* Enclosure logical identifier (WWN) */
-	uint8_t		vendor_id[8];	/* Vendor identification string */
-	uint8_t		product_id[16];	/* Product identification string */
-	uint8_t		product_rev[4];	/* Product revision string */
-	uint8_t		channel_id;	/* Channel identifier */
-	uint8_t		firmware_rev[4];/* Firmware revision */
-	uint8_t		interface_id[6];/* Interface spec ("S-E-S "/"SAF-TE")*/
-	uint8_t		interface_rev[4];/* Interface spec revision */
-	uint8_t		vend_spec[11];	/* Vendor specific information */
-};
-
-int	ata_version(int ver);
-
-char *	ata_op_string(struct ata_cmd *cmd);
-char *	ata_cmd_string(struct ata_cmd *cmd, char *cmd_string, size_t len);
-char *	ata_res_string(struct ata_res *res, char *res_string, size_t len);
-int	ata_command_sbuf(struct ccb_ataio *ataio, struct sbuf *sb);
-int	ata_status_sbuf(struct ccb_ataio *ataio, struct sbuf *sb);
-int	ata_res_sbuf(struct ccb_ataio *ataio, struct sbuf *sb);
-
-void	ata_print_ident(struct ata_params *ident_data);
-void	ata_print_ident_short(struct ata_params *ident_data);
-
-uint32_t	ata_logical_sector_size(struct ata_params *ident_data);
-uint64_t	ata_physical_sector_size(struct ata_params *ident_data);
-uint64_t	ata_logical_sector_offset(struct ata_params *ident_data);
-
-void	ata_28bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint8_t features,
-    uint32_t lba, uint8_t sector_count);
-void	ata_48bit_cmd(struct ccb_ataio *ataio, uint8_t cmd, uint16_t features,
-    uint64_t lba, uint16_t sector_count);
-void	ata_ncq_cmd(struct ccb_ataio *ataio, uint8_t cmd,
-    uint64_t lba, uint16_t sector_count);
-void	ata_reset_cmd(struct ccb_ataio *ataio);
-void	ata_pm_read_cmd(struct ccb_ataio *ataio, int reg, int port);
-void	ata_pm_write_cmd(struct ccb_ataio *ataio, int reg, int port, uint32_t val);
-
-void	ata_bswap(int8_t *buf, int len);
-void	ata_btrim(int8_t *buf, int len);
-void	ata_bpack(int8_t *src, int8_t *dst, int len);
-
-int	ata_max_pmode(struct ata_params *ap);
-int	ata_max_wmode(struct ata_params *ap);
-int	ata_max_umode(struct ata_params *ap);
-int	ata_max_mode(struct ata_params *ap, int maxmode);
-
-char *	ata_mode2string(int mode);
-int	ata_string2mode(char *str);
-u_int	ata_mode2speed(int mode);
-u_int	ata_revision2speed(int revision);
-int	ata_speed2revision(u_int speed);
-
-int	ata_identify_match(caddr_t identbuffer, caddr_t table_entry);
-int	ata_static_identify_match(caddr_t identbuffer, caddr_t table_entry);
-
-void	semb_print_ident(struct sep_identify_data *ident_data);
-void	semb_print_ident_short(struct sep_identify_data *ident_data);
-
-void semb_receive_diagnostic_results(struct ccb_ataio *ataio,
-	uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb*),
-	uint8_t tag_action, int pcv, uint8_t page_code,
-	uint8_t *data_ptr, uint16_t allocation_length, uint32_t timeout);
-
-void semb_send_diagnostic(struct ccb_ataio *ataio,
-	uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *),
-	uint8_t tag_action, uint8_t *data_ptr, uint16_t param_list_length,
-	uint32_t timeout);
-
-void semb_read_buffer(struct ccb_ataio *ataio,
-	uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb*),
-	uint8_t tag_action, uint8_t page_code,
-	uint8_t *data_ptr, uint16_t allocation_length, uint32_t timeout);
-
-void semb_write_buffer(struct ccb_ataio *ataio,
-	uint32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *),
-	uint8_t tag_action, uint8_t *data_ptr, uint16_t param_list_length,
-	uint32_t timeout);
-
-#endif
diff --git a/include.new/cam/cam.h b/include.new/cam/cam.h
deleted file mode 100644
index e65d893..0000000
--- a/include.new/cam/cam.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/*-
- * Data structures and definitions for the CAM system.
- *
- * Copyright (c) 1997 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam.h 284435 2015-06-16 02:31:11Z ken $
- */
-
-#ifndef _CAM_CAM_H
-#define _CAM_CAM_H 1
-
-#ifdef _KERNEL
-#include <opt_cam.h>
-#endif
-
-#include <sys/cdefs.h>
-
-typedef u_int path_id_t;
-typedef u_int target_id_t;
-typedef u_int lun_id_t;
-typedef union {
-	u_int64_t	lun64;
-	u_int8_t	lun[8];
-} lun64_id_t;
-
-#define	CAM_XPT_PATH_ID	((path_id_t)~0)
-#define	CAM_BUS_WILDCARD ((path_id_t)~0)
-#define	CAM_TARGET_WILDCARD ((target_id_t)~0)
-#define	CAM_LUN_WILDCARD ((lun_id_t)~0)
-
-#define CAM_EXTLUN_BYTE_SWIZZLE(lun) (	\
-	((((u_int64_t)lun) & 0xffff000000000000L) >> 48) | \
-	((((u_int64_t)lun) & 0x0000ffff00000000L) >> 16) | \
-	((((u_int64_t)lun) & 0x00000000ffff0000L) << 16) | \
-	((((u_int64_t)lun) & 0x000000000000ffffL) << 48))
-
-/*
- * Maximum length for a CAM CDB.  
- */
-#define CAM_MAX_CDBLEN 16
-
-/*
- * Definition of a CAM peripheral driver entry.  Peripheral drivers instantiate
- * one of these for each device they wish to communicate with and pass it into
- * the xpt layer when they wish to schedule work on that device via the
- * xpt_schedule API.
- */
-struct cam_periph;
-
-/*
- * Priority information for a CAM structure. 
- */
-typedef enum {
-    CAM_RL_HOST,
-    CAM_RL_BUS,
-    CAM_RL_XPT,
-    CAM_RL_DEV,
-    CAM_RL_NORMAL,
-    CAM_RL_VALUES
-} cam_rl;
-/*
- * The generation number is incremented everytime a new entry is entered into
- * the queue giving round robin per priority level scheduling.
- */
-typedef struct {
-	uint32_t priority;
-#define CAM_PRIORITY_HOST	((CAM_RL_HOST << 8) + 0x80)
-#define CAM_PRIORITY_BUS	((CAM_RL_BUS << 8) + 0x80)
-#define CAM_PRIORITY_XPT	((CAM_RL_XPT << 8) + 0x80)
-#define CAM_PRIORITY_DEV	((CAM_RL_DEV << 8) + 0x80)
-#define CAM_PRIORITY_OOB	(CAM_RL_DEV << 8)
-#define CAM_PRIORITY_NORMAL	((CAM_RL_NORMAL << 8) + 0x80)
-#define CAM_PRIORITY_NONE	(uint32_t)-1
-	uint32_t generation;
-	int       index;
-#define CAM_UNQUEUED_INDEX	-1
-#define CAM_ACTIVE_INDEX	-2	
-#define CAM_DONEQ_INDEX		-3	
-#define CAM_EXTRAQ_INDEX	INT_MAX
-} cam_pinfo;
-
-/*
- * Macro to compare two generation numbers.  It is used like this:  
- *
- *	if (GENERATIONCMP(a, >=, b))
- *		...;
- *
- * GERERATIONCMP uses modular arithmetic to guard against wraps
- * wraps in the generation number.
- */
-#define GENERATIONCMP(x, op, y) ((int32_t)((x) - (y)) op 0)
-
-/* CAM flags XXX Move to cam_periph.h ??? */
-typedef enum {
-	CAM_FLAG_NONE		= 0x00,
-	CAM_EXPECT_INQ_CHANGE	= 0x01,
-	CAM_RETRY_SELTO		= 0x02 /* Retry Selection Timeouts */
-} cam_flags;
-
-enum {
-	SF_RETRY_UA		= 0x01,	/* Retry UNIT ATTENTION conditions. */
-	SF_NO_PRINT		= 0x02,	/* Never print error status. */
-	SF_QUIET_IR		= 0x04,	/* Be quiet about Illegal Request reponses */
-	SF_PRINT_ALWAYS		= 0x08,	/* Always print error status. */
-	SF_NO_RECOVERY		= 0x10,	/* Don't do active error recovery. */
-	SF_NO_RETRY		= 0x20,	/* Don't do any retries. */
-	SF_RETRY_BUSY		= 0x40	/* Retry BUSY status. */
-};
-
-/* CAM  Status field values */
-typedef enum {
-	/* CCB request is in progress */
-	CAM_REQ_INPROG		= 0x00,
-
-	/* CCB request completed without error */
-	CAM_REQ_CMP		= 0x01,
-
-	/* CCB request aborted by the host */
-	CAM_REQ_ABORTED		= 0x02,
-
-	/* Unable to abort CCB request */
-	CAM_UA_ABORT		= 0x03,
-
-	/* CCB request completed with an error */
-	CAM_REQ_CMP_ERR		= 0x04,
-
-	/* CAM subsystem is busy */
-	CAM_BUSY		= 0x05,
-
-	/* CCB request was invalid */
-	CAM_REQ_INVALID		= 0x06,
-
-	/* Supplied Path ID is invalid */
-	CAM_PATH_INVALID	= 0x07,
-
-	/* SCSI Device Not Installed/there */
-	CAM_DEV_NOT_THERE	= 0x08,
-
-	/* Unable to terminate I/O CCB request */
-	CAM_UA_TERMIO		= 0x09,
-
-	/* Target Selection Timeout */
-	CAM_SEL_TIMEOUT		= 0x0a,
-
-	/* Command timeout */
-	CAM_CMD_TIMEOUT		= 0x0b,
-
-	/* SCSI error, look at error code in CCB */
-	CAM_SCSI_STATUS_ERROR	= 0x0c,
-
-	/* Message Reject Received */
-	CAM_MSG_REJECT_REC	= 0x0d,
-
-	/* SCSI Bus Reset Sent/Received */
-	CAM_SCSI_BUS_RESET	= 0x0e,
-
-	/* Uncorrectable parity error occurred */
-	CAM_UNCOR_PARITY	= 0x0f,
-
-	/* Autosense: request sense cmd fail */
-	CAM_AUTOSENSE_FAIL	= 0x10,
-
-	/* No HBA Detected error */
-	CAM_NO_HBA		= 0x11,
-
-	/* Data Overrun error */
-	CAM_DATA_RUN_ERR	= 0x12,
-
-	/* Unexpected Bus Free */
-	CAM_UNEXP_BUSFREE	= 0x13,
-
-	/* Target Bus Phase Sequence Failure */
-	CAM_SEQUENCE_FAIL	= 0x14,
-
-	/* CCB length supplied is inadequate */
-	CAM_CCB_LEN_ERR		= 0x15,
-
-	/* Unable to provide requested capability*/
-	CAM_PROVIDE_FAIL	= 0x16,
-
-	/* A SCSI BDR msg was sent to target */
-	CAM_BDR_SENT		= 0x17,
-
-	/* CCB request terminated by the host */
-	CAM_REQ_TERMIO		= 0x18,
-
-	/* Unrecoverable Host Bus Adapter Error */
-	CAM_UNREC_HBA_ERROR	= 0x19,
-
-	/* Request was too large for this host */
-	CAM_REQ_TOO_BIG		= 0x1a,
-
-	/*
-	 * This request should be requeued to preserve
-	 * transaction ordering.  This typically occurs
-	 * when the SIM recognizes an error that should
-	 * freeze the queue and must place additional
-	 * requests for the target at the sim level
-	 * back into the XPT queue.
-	 */
-	CAM_REQUEUE_REQ		= 0x1b,
-
-	/* ATA error, look at error code in CCB */
-	CAM_ATA_STATUS_ERROR	= 0x1c,
-
-	/* Initiator/Target Nexus lost. */
-	CAM_SCSI_IT_NEXUS_LOST	= 0x1d,
-
-	/* SMP error, look at error code in CCB */
-	CAM_SMP_STATUS_ERROR	= 0x1e,
-
-	/*
-	 * Command completed without error but  exceeded the soft
-	 * timeout threshold.
-	 */
-	CAM_REQ_SOFTTIMEOUT	= 0x1f,
-
-	/*
-	 * 0x20 - 0x32 are unassigned
-	 */
-
-	/* Initiator Detected Error */
-	CAM_IDE			= 0x33,
-
-	/* Resource Unavailable */
-	CAM_RESRC_UNAVAIL	= 0x34,
-
-	/* Unacknowledged Event by Host */
-	CAM_UNACKED_EVENT	= 0x35,
-
-	/* Message Received in Host Target Mode */
-	CAM_MESSAGE_RECV	= 0x36,
-
-	/* Invalid CDB received in Host Target Mode */
-	CAM_INVALID_CDB		= 0x37,
-
-	/* Lun supplied is invalid */
-	CAM_LUN_INVALID		= 0x38,
-
-	/* Target ID supplied is invalid */
-	CAM_TID_INVALID		= 0x39,
-
-	/* The requested function is not available */
-	CAM_FUNC_NOTAVAIL	= 0x3a,
-
-	/* Nexus is not established */
-	CAM_NO_NEXUS		= 0x3b,
-
-	/* The initiator ID is invalid */
-	CAM_IID_INVALID		= 0x3c,
-
-	/* The SCSI CDB has been received */
-	CAM_CDB_RECVD		= 0x3d,
-
-	/* The LUN is already enabled for target mode */
-	CAM_LUN_ALRDY_ENA	= 0x3e,
-
-	/* SCSI Bus Busy */
-	CAM_SCSI_BUSY		= 0x3f,
-
-
-	/*
-	 * Flags
-	 */
-
-	/* The DEV queue is frozen w/this err */
-	CAM_DEV_QFRZN		= 0x40,
-
-	/* Autosense data valid for target */
-	CAM_AUTOSNS_VALID	= 0x80,
-
-	/* SIM ready to take more commands */
-	CAM_RELEASE_SIMQ	= 0x100,
-
-	/* SIM has this command in it's queue */
-	CAM_SIM_QUEUED		= 0x200,
-
-	/* Quality of service data is valid */
-	CAM_QOS_VALID		= 0x400,
-
-	/* Mask bits for just the status # */
-	CAM_STATUS_MASK = 0x3F,
-
-	/*
-	 * Target Specific Adjunct Status
-	 */
-	
-	/* sent sense with status */
-	CAM_SENT_SENSE		= 0x40000000
-} cam_status;
-
-typedef enum {
-	CAM_ESF_NONE		= 0x00,
-	CAM_ESF_COMMAND		= 0x01,
-	CAM_ESF_CAM_STATUS	= 0x02,
-	CAM_ESF_PROTO_STATUS	= 0x04,
-	CAM_ESF_ALL		= 0xff
-} cam_error_string_flags;
-
-typedef enum {
-	CAM_EPF_NONE		= 0x00,
-	CAM_EPF_MINIMAL		= 0x01,
-	CAM_EPF_NORMAL		= 0x02,
-	CAM_EPF_ALL		= 0x03,
-	CAM_EPF_LEVEL_MASK	= 0x0f
-	/* All bits above bit 3 are protocol-specific */
-} cam_error_proto_flags;
-
-typedef enum {
-	CAM_ESF_PRINT_NONE	= 0x00,
-	CAM_ESF_PRINT_STATUS	= 0x10,
-	CAM_ESF_PRINT_SENSE	= 0x20
-} cam_error_scsi_flags;
-
-typedef enum {
-	CAM_ESMF_PRINT_NONE	= 0x00,
-	CAM_ESMF_PRINT_STATUS	= 0x10,
-	CAM_ESMF_PRINT_FULL_CMD	= 0x20,
-} cam_error_smp_flags;
-
-typedef enum {
-	CAM_EAF_PRINT_NONE	= 0x00,
-	CAM_EAF_PRINT_STATUS	= 0x10,
-	CAM_EAF_PRINT_RESULT	= 0x20
-} cam_error_ata_flags;
-
-typedef enum {
-	CAM_STRVIS_FLAG_NONE		= 0x00,
-	CAM_STRVIS_FLAG_NONASCII_MASK	= 0x03,
-	CAM_STRVIS_FLAG_NONASCII_TRIM	= 0x00,
-	CAM_STRVIS_FLAG_NONASCII_RAW	= 0x01,
-	CAM_STRVIS_FLAG_NONASCII_SPC	= 0x02,
-	CAM_STRVIS_FLAG_NONASCII_ESC	= 0x03
-} cam_strvis_flags;
-
-struct cam_status_entry
-{
-	cam_status  status_code;
-	const char *status_text;
-};
-
-extern const struct cam_status_entry cam_status_table[];
-extern const int num_cam_status_entries;
-#ifdef _KERNEL
-extern int cam_sort_io_queues;
-#endif
-union ccb;
-struct sbuf;
-
-#ifdef SYSCTL_DECL	/* from sysctl.h */
-SYSCTL_DECL(_kern_cam);
-#endif
-
-__BEGIN_DECLS
-typedef int (cam_quirkmatch_t)(caddr_t, caddr_t);
-
-caddr_t	cam_quirkmatch(caddr_t target, caddr_t quirk_table, int num_entries,
-		       int entry_size, cam_quirkmatch_t *comp_func);
-
-void	cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen);
-void	cam_strvis_sbuf(struct sbuf *sb, const u_int8_t *src, int srclen,
-			uint32_t flags);
-
-int	cam_strmatch(const u_int8_t *str, const u_int8_t *pattern, int str_len);
-const struct cam_status_entry*
-	cam_fetch_status_entry(cam_status status);
-#ifdef _KERNEL
-char *	cam_error_string(union ccb *ccb, char *str, int str_len,
-			 cam_error_string_flags flags,
-			 cam_error_proto_flags proto_flags);
-void	cam_error_print(union ccb *ccb, cam_error_string_flags flags,
-			cam_error_proto_flags proto_flags);
-#else /* _KERNEL */
-struct cam_device;
-
-char *	cam_error_string(struct cam_device *device, union ccb *ccb, char *str,
-			 int str_len, cam_error_string_flags flags,
-			 cam_error_proto_flags proto_flags);
-void	cam_error_print(struct cam_device *device, union ccb *ccb,
-			cam_error_string_flags flags,
-			cam_error_proto_flags proto_flags, FILE *ofile);
-#endif /* _KERNEL */
-__END_DECLS
-
-#ifdef _KERNEL
-static __inline void cam_init_pinfo(cam_pinfo *pinfo);
-
-static __inline void cam_init_pinfo(cam_pinfo *pinfo)
-{
-	pinfo->priority = CAM_PRIORITY_NONE;	
-	pinfo->index = CAM_UNQUEUED_INDEX;
-}
-#endif
-
-#endif /* _CAM_CAM_H */
diff --git a/include.new/cam/cam_ccb.h b/include.new/cam/cam_ccb.h
deleted file mode 100644
index b2c4bb4..0000000
--- a/include.new/cam/cam_ccb.h
+++ /dev/null
@@ -1,1347 +0,0 @@
-/*-
- * Data structures and definitions for CAM Control Blocks (CCBs).
- *
- * Copyright (c) 1997, 1998 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_ccb.h 279329 2015-02-26 20:46:16Z ken $
- */
-
-#ifndef _CAM_CAM_CCB_H
-#define _CAM_CAM_CCB_H 1
-
-#include <sys/queue.h>
-#include <sys/cdefs.h>
-#include <sys/time.h>
-#include <sys/limits.h>
-#ifndef _KERNEL
-#include <sys/callout.h>
-#endif
-#include <cam/cam_debug.h>
-#include <cam/scsi/scsi_all.h>
-#include <cam/ata/ata_all.h>
-
-/* General allocation length definitions for CCB structures */
-#define	IOCDBLEN	CAM_MAX_CDBLEN	/* Space for CDB bytes/pointer */
-#define	VUHBALEN	14		/* Vendor Unique HBA length */
-#define	SIM_IDLEN	16		/* ASCII string len for SIM ID */
-#define	HBA_IDLEN	16		/* ASCII string len for HBA ID */
-#define	DEV_IDLEN	16		/* ASCII string len for device names */
-#define CCB_PERIPH_PRIV_SIZE 	2	/* size of peripheral private area */
-#define CCB_SIM_PRIV_SIZE 	2	/* size of sim private area */
-
-/* Struct definitions for CAM control blocks */
-
-/* Common CCB header */
-/* CAM CCB flags */
-typedef enum {
-	CAM_CDB_POINTER		= 0x00000001,/* The CDB field is a pointer    */
-	CAM_QUEUE_ENABLE	= 0x00000002,/* SIM queue actions are enabled */
-	CAM_CDB_LINKED		= 0x00000004,/* CCB contains a linked CDB     */
-	CAM_NEGOTIATE		= 0x00000008,/*
-					      * Perform transport negotiation
-					      * with this command.
-					      */
-	CAM_DATA_ISPHYS		= 0x00000010,/* Data type with physical addrs */
-	CAM_DIS_AUTOSENSE	= 0x00000020,/* Disable autosense feature     */
-	CAM_DIR_BOTH		= 0x00000000,/* Data direction (00:IN/OUT)    */
-	CAM_DIR_IN		= 0x00000040,/* Data direction (01:DATA IN)   */
-	CAM_DIR_OUT		= 0x00000080,/* Data direction (10:DATA OUT)  */
-	CAM_DIR_NONE		= 0x000000C0,/* Data direction (11:no data)   */
-	CAM_DIR_MASK		= 0x000000C0,/* Data direction Mask	      */
-	CAM_DATA_VADDR		= 0x00000000,/* Data type (000:Virtual)       */
-	CAM_DATA_PADDR		= 0x00000010,/* Data type (001:Physical)      */
-	CAM_DATA_SG		= 0x00040000,/* Data type (010:sglist)        */
-	CAM_DATA_SG_PADDR	= 0x00040010,/* Data type (011:sglist phys)   */
-	CAM_DATA_BIO		= 0x00200000,/* Data type (100:bio)           */
-	CAM_DATA_MASK		= 0x00240010,/* Data type mask                */
-	CAM_SOFT_RST_OP		= 0x00000100,/* Use Soft reset alternative    */
-	CAM_ENG_SYNC		= 0x00000200,/* Flush resid bytes on complete */
-	CAM_DEV_QFRZDIS		= 0x00000400,/* Disable DEV Q freezing	      */
-	CAM_DEV_QFREEZE		= 0x00000800,/* Freeze DEV Q on execution     */
-	CAM_HIGH_POWER		= 0x00001000,/* Command takes a lot of power  */
-	CAM_SENSE_PTR		= 0x00002000,/* Sense data is a pointer	      */
-	CAM_SENSE_PHYS		= 0x00004000,/* Sense pointer is physical addr*/
-	CAM_TAG_ACTION_VALID	= 0x00008000,/* Use the tag action in this ccb*/
-	CAM_PASS_ERR_RECOVER	= 0x00010000,/* Pass driver does err. recovery*/
-	CAM_DIS_DISCONNECT	= 0x00020000,/* Disable disconnect	      */
-	CAM_MSG_BUF_PHYS	= 0x00080000,/* Message buffer ptr is physical*/
-	CAM_SNS_BUF_PHYS	= 0x00100000,/* Autosense data ptr is physical*/
-	CAM_CDB_PHYS		= 0x00400000,/* CDB poiner is physical	      */
-	CAM_ENG_SGLIST		= 0x00800000,/* SG list is for the HBA engine */
-
-/* Phase cognizant mode flags */
-	CAM_DIS_AUTOSRP		= 0x01000000,/* Disable autosave/restore ptrs */
-	CAM_DIS_AUTODISC	= 0x02000000,/* Disable auto disconnect	      */
-	CAM_TGT_CCB_AVAIL	= 0x04000000,/* Target CCB available	      */
-	CAM_TGT_PHASE_MODE	= 0x08000000,/* The SIM runs in phase mode    */
-	CAM_MSGB_VALID		= 0x10000000,/* Message buffer valid	      */
-	CAM_STATUS_VALID	= 0x20000000,/* Status buffer valid	      */
-	CAM_DATAB_VALID		= 0x40000000,/* Data buffer valid	      */
-
-/* Host target Mode flags */
-	CAM_SEND_SENSE		= 0x08000000,/* Send sense data with status   */
-	CAM_TERM_IO		= 0x10000000,/* Terminate I/O Message sup.    */
-	CAM_DISCONNECT		= 0x20000000,/* Disconnects are mandatory     */
-	CAM_SEND_STATUS		= 0x40000000,/* Send status after data phase  */
-
-	CAM_UNLOCKED		= 0x80000000 /* Call callback without lock.   */
-} ccb_flags;
-
-typedef enum {
-	CAM_EXTLUN_VALID	= 0x00000001,/* 64bit lun field is valid      */
-} ccb_xflags;
-
-/* XPT Opcodes for xpt_action */
-typedef enum {
-/* Function code flags are bits greater than 0xff */
-	XPT_FC_QUEUED		= 0x100,
-				/* Non-immediate function code */
-	XPT_FC_USER_CCB		= 0x200,
-	XPT_FC_XPT_ONLY		= 0x400,
-				/* Only for the transport layer device */
-	XPT_FC_DEV_QUEUED	= 0x800 | XPT_FC_QUEUED,
-				/* Passes through the device queues */
-/* Common function commands: 0x00->0x0F */
-	XPT_NOOP 		= 0x00,
-				/* Execute Nothing */
-	XPT_SCSI_IO		= 0x01 | XPT_FC_DEV_QUEUED,
-				/* Execute the requested I/O operation */
-	XPT_GDEV_TYPE		= 0x02,
-				/* Get type information for specified device */
-	XPT_GDEVLIST		= 0x03,
-				/* Get a list of peripheral devices */
-	XPT_PATH_INQ		= 0x04,
-				/* Path routing inquiry */
-	XPT_REL_SIMQ		= 0x05,
-				/* Release a frozen device queue */
-	XPT_SASYNC_CB		= 0x06,
-				/* Set Asynchronous Callback Parameters */
-	XPT_SDEV_TYPE		= 0x07,
-				/* Set device type information */
-	XPT_SCAN_BUS		= 0x08 | XPT_FC_QUEUED | XPT_FC_USER_CCB
-				       | XPT_FC_XPT_ONLY,
-				/* (Re)Scan the SCSI Bus */
-	XPT_DEV_MATCH		= 0x09 | XPT_FC_XPT_ONLY,
-				/* Get EDT entries matching the given pattern */
-	XPT_DEBUG		= 0x0a,
-				/* Turn on debugging for a bus, target or lun */
-	XPT_PATH_STATS		= 0x0b,
-				/* Path statistics (error counts, etc.) */
-	XPT_GDEV_STATS		= 0x0c,
-				/* Device statistics (error counts, etc.) */
-	XPT_DEV_ADVINFO		= 0x0e,
-				/* Get/Set Device advanced information */
-	XPT_ASYNC		= 0x0f | XPT_FC_QUEUED | XPT_FC_USER_CCB
-				       | XPT_FC_XPT_ONLY,
-				/* Asynchronous event */
-/* SCSI Control Functions: 0x10->0x1F */
-	XPT_ABORT		= 0x10,
-				/* Abort the specified CCB */
-	XPT_RESET_BUS		= 0x11 | XPT_FC_XPT_ONLY,
-				/* Reset the specified SCSI bus */
-	XPT_RESET_DEV		= 0x12 | XPT_FC_DEV_QUEUED,
-				/* Bus Device Reset the specified SCSI device */
-	XPT_TERM_IO		= 0x13,
-				/* Terminate the I/O process */
-	XPT_SCAN_LUN		= 0x14 | XPT_FC_QUEUED | XPT_FC_USER_CCB
-				       | XPT_FC_XPT_ONLY,
-				/* Scan Logical Unit */
-	XPT_GET_TRAN_SETTINGS	= 0x15,
-				/*
-				 * Get default/user transfer settings
-				 * for the target
-				 */
-	XPT_SET_TRAN_SETTINGS	= 0x16,
-				/*
-				 * Set transfer rate/width
-				 * negotiation settings
-				 */
-	XPT_CALC_GEOMETRY	= 0x17,
-				/*
-				 * Calculate the geometry parameters for
-				 * a device give the sector size and
-				 * volume size.
-				 */
-	XPT_ATA_IO		= 0x18 | XPT_FC_DEV_QUEUED,
-				/* Execute the requested ATA I/O operation */
-
-	XPT_GET_SIM_KNOB	= 0x18,
-				/*
-				 * Get SIM specific knob values.
-				 */
-
-	XPT_SET_SIM_KNOB	= 0x19,
-				/*
-				 * Set SIM specific knob values.
-				 */
-
-	XPT_SMP_IO		= 0x1b | XPT_FC_DEV_QUEUED,
-				/* Serial Management Protocol */
-
-	XPT_SCAN_TGT		= 0x1E | XPT_FC_QUEUED | XPT_FC_USER_CCB
-				       | XPT_FC_XPT_ONLY,
-				/* Scan Target */
-
-/* HBA engine commands 0x20->0x2F */
-	XPT_ENG_INQ		= 0x20 | XPT_FC_XPT_ONLY,
-				/* HBA engine feature inquiry */
-	XPT_ENG_EXEC		= 0x21 | XPT_FC_DEV_QUEUED,
-				/* HBA execute engine request */
-
-/* Target mode commands: 0x30->0x3F */
-	XPT_EN_LUN		= 0x30,
-				/* Enable LUN as a target */
-	XPT_TARGET_IO		= 0x31 | XPT_FC_DEV_QUEUED,
-				/* Execute target I/O request */
-	XPT_ACCEPT_TARGET_IO	= 0x32 | XPT_FC_QUEUED | XPT_FC_USER_CCB,
-				/* Accept Host Target Mode CDB */
-	XPT_CONT_TARGET_IO	= 0x33 | XPT_FC_DEV_QUEUED,
-				/* Continue Host Target I/O Connection */
-	XPT_IMMED_NOTIFY	= 0x34 | XPT_FC_QUEUED | XPT_FC_USER_CCB,
-				/* Notify Host Target driver of event (obsolete) */
-	XPT_NOTIFY_ACK		= 0x35,
-				/* Acknowledgement of event (obsolete) */
-	XPT_IMMEDIATE_NOTIFY	= 0x36 | XPT_FC_QUEUED | XPT_FC_USER_CCB,
-				/* Notify Host Target driver of event */
-	XPT_NOTIFY_ACKNOWLEDGE	= 0x37 | XPT_FC_QUEUED | XPT_FC_USER_CCB,
-				/* Acknowledgement of event */
-
-/* Vendor Unique codes: 0x80->0x8F */
-	XPT_VUNIQUE		= 0x80
-} xpt_opcode;
-
-#define XPT_FC_GROUP_MASK		0xF0
-#define XPT_FC_GROUP(op) ((op) & XPT_FC_GROUP_MASK)
-#define XPT_FC_GROUP_COMMON		0x00
-#define XPT_FC_GROUP_SCSI_CONTROL	0x10
-#define XPT_FC_GROUP_HBA_ENGINE		0x20
-#define XPT_FC_GROUP_TMODE		0x30
-#define XPT_FC_GROUP_VENDOR_UNIQUE	0x80
-
-#define XPT_FC_IS_DEV_QUEUED(ccb) 	\
-    (((ccb)->ccb_h.func_code & XPT_FC_DEV_QUEUED) == XPT_FC_DEV_QUEUED)
-#define XPT_FC_IS_QUEUED(ccb) 	\
-    (((ccb)->ccb_h.func_code & XPT_FC_QUEUED) != 0)
-
-typedef enum {
-	PROTO_UNKNOWN,
-	PROTO_UNSPECIFIED,
-	PROTO_SCSI,	/* Small Computer System Interface */
-	PROTO_ATA,	/* AT Attachment */
-	PROTO_ATAPI,	/* AT Attachment Packetized Interface */
-	PROTO_SATAPM,	/* SATA Port Multiplier */
-	PROTO_SEMB,	/* SATA Enclosure Management Bridge */
-} cam_proto;
-
-typedef enum {
-	XPORT_UNKNOWN,
-	XPORT_UNSPECIFIED,
-	XPORT_SPI,	/* SCSI Parallel Interface */
-	XPORT_FC,	/* Fiber Channel */
-	XPORT_SSA,	/* Serial Storage Architecture */
-	XPORT_USB,	/* Universal Serial Bus */
-	XPORT_PPB,	/* Parallel Port Bus */
-	XPORT_ATA,	/* AT Attachment */
-	XPORT_SAS,	/* Serial Attached SCSI */
-	XPORT_SATA,	/* Serial AT Attachment */
-	XPORT_ISCSI,	/* iSCSI */
-	XPORT_SRP,	/* SCSI RDMA Protocol */
-} cam_xport;
-
-#define XPORT_IS_ATA(t)		((t) == XPORT_ATA || (t) == XPORT_SATA)
-#define XPORT_IS_SCSI(t)	((t) != XPORT_UNKNOWN && \
-				 (t) != XPORT_UNSPECIFIED && \
-				 !XPORT_IS_ATA(t))
-#define XPORT_DEVSTAT_TYPE(t)	(XPORT_IS_ATA(t) ? DEVSTAT_TYPE_IF_IDE : \
-				 XPORT_IS_SCSI(t) ? DEVSTAT_TYPE_IF_SCSI : \
-				 DEVSTAT_TYPE_IF_OTHER)
-
-#define PROTO_VERSION_UNKNOWN (UINT_MAX - 1)
-#define PROTO_VERSION_UNSPECIFIED UINT_MAX
-#define XPORT_VERSION_UNKNOWN (UINT_MAX - 1)
-#define XPORT_VERSION_UNSPECIFIED UINT_MAX
-
-typedef union {
-	LIST_ENTRY(ccb_hdr) le;
-	SLIST_ENTRY(ccb_hdr) sle;
-	TAILQ_ENTRY(ccb_hdr) tqe;
-	STAILQ_ENTRY(ccb_hdr) stqe;
-} camq_entry;
-
-typedef union {
-	void		*ptr;
-	u_long		field;
-	u_int8_t	bytes[sizeof(uintptr_t)];
-} ccb_priv_entry;
-
-typedef union {
-	ccb_priv_entry	entries[CCB_PERIPH_PRIV_SIZE];
-	u_int8_t	bytes[CCB_PERIPH_PRIV_SIZE * sizeof(ccb_priv_entry)];
-} ccb_ppriv_area;
-
-typedef union {
-	ccb_priv_entry	entries[CCB_SIM_PRIV_SIZE];
-	u_int8_t	bytes[CCB_SIM_PRIV_SIZE * sizeof(ccb_priv_entry)];
-} ccb_spriv_area;
-
-typedef struct {
-	struct timeval	*etime;
-	uintptr_t	sim_data;
-	uintptr_t	periph_data;
-} ccb_qos_area;
-
-struct ccb_hdr {
-	cam_pinfo	pinfo;		/* Info for priority scheduling */
-	camq_entry	xpt_links;	/* For chaining in the XPT layer */	
-	camq_entry	sim_links;	/* For chaining in the SIM layer */	
-	camq_entry	periph_links;	/* For chaining in the type driver */
-	uint32_t	retry_count;
-	void		(*cbfcnp)(struct cam_periph *, union ccb *);
-					/* Callback on completion function */
-	xpt_opcode	func_code;	/* XPT function code */
-	uint32_t	status;		/* Status returned by CAM subsystem */
-	struct		cam_path *path;	/* Compiled path for this ccb */
-	path_id_t	path_id;	/* Path ID for the request */
-	target_id_t	target_id;	/* Target device ID */
-	lun_id_t	target_lun;	/* Target LUN number */
-	lun64_id_t	ext_lun;	/* 64bit extended/multi-level LUNs */
-	uint32_t	flags;		/* ccb_flags */
-	uint32_t	xflags;		/* Extended flags */
-	ccb_ppriv_area	periph_priv;
-	ccb_spriv_area	sim_priv;
-	ccb_qos_area	qos;
-	uint32_t	timeout;	/* Hard timeout value in mseconds */
-	struct timeval	softtimeout;	/* Soft timeout value in sec + usec */
-};
-
-/* Get Device Information CCB */
-struct ccb_getdev {
-	struct	  ccb_hdr ccb_h;
-	cam_proto protocol;
-	struct scsi_inquiry_data inq_data;
-	struct ata_params ident_data;
-	u_int8_t  serial_num[252];
-	u_int8_t  inq_flags;
-	u_int8_t  serial_num_len;
-};
-
-/* Device Statistics CCB */
-struct ccb_getdevstats {
-	struct	ccb_hdr	ccb_h;
-	int	dev_openings;	/* Space left for more work on device*/	
-	int	dev_active;	/* Transactions running on the device */
-	int	allocated;	/* CCBs allocated for the device */
-	int	queued;		/* CCBs queued to be sent to the device */
-	int	held;		/*
-				 * CCBs held by peripheral drivers
-				 * for this device
-				 */
-	int	maxtags;	/*
-				 * Boundary conditions for number of
-				 * tagged operations
-				 */
-	int	mintags;
-	struct	timeval last_reset;	/* Time of last bus reset/loop init */
-};
-
-typedef enum {
-	CAM_GDEVLIST_LAST_DEVICE,
-	CAM_GDEVLIST_LIST_CHANGED,
-	CAM_GDEVLIST_MORE_DEVS,
-	CAM_GDEVLIST_ERROR
-} ccb_getdevlist_status_e;
-
-struct ccb_getdevlist {
-	struct ccb_hdr		ccb_h;
-	char 			periph_name[DEV_IDLEN];
-	uint32_t		unit_number;
-	unsigned int		generation;
-	uint32_t		index;
-	ccb_getdevlist_status_e	status;
-};
-
-typedef enum {
-	PERIPH_MATCH_NONE	= 0x000,
-	PERIPH_MATCH_PATH	= 0x001,
-	PERIPH_MATCH_TARGET	= 0x002,
-	PERIPH_MATCH_LUN	= 0x004,
-	PERIPH_MATCH_NAME	= 0x008,
-	PERIPH_MATCH_UNIT	= 0x010,
-	PERIPH_MATCH_ANY	= 0x01f
-} periph_pattern_flags;
-
-struct periph_match_pattern {
-	char			periph_name[DEV_IDLEN];
-	uint32_t		unit_number;
-	path_id_t		path_id;
-	target_id_t		target_id;
-	lun_id_t		target_lun;
-	periph_pattern_flags	flags;
-};
-
-typedef enum {
-	DEV_MATCH_NONE		= 0x000,
-	DEV_MATCH_PATH		= 0x001,
-	DEV_MATCH_TARGET	= 0x002,
-	DEV_MATCH_LUN		= 0x004,
-	DEV_MATCH_INQUIRY	= 0x008,
-	DEV_MATCH_DEVID		= 0x010,
-	DEV_MATCH_ANY		= 0x00f
-} dev_pattern_flags;
-
-struct device_id_match_pattern {
-	uint8_t id_len;
-	uint8_t id[256];
-};
-
-struct device_match_pattern {
-	path_id_t					path_id;
-	target_id_t					target_id;
-	lun_id_t					target_lun;
-	dev_pattern_flags				flags;
-	union {
-		struct scsi_static_inquiry_pattern	inq_pat;
-		struct device_id_match_pattern		devid_pat;
-	} data;	
-};
-
-typedef enum {
-	BUS_MATCH_NONE		= 0x000,
-	BUS_MATCH_PATH		= 0x001,
-	BUS_MATCH_NAME		= 0x002,
-	BUS_MATCH_UNIT		= 0x004,
-	BUS_MATCH_BUS_ID	= 0x008,
-	BUS_MATCH_ANY		= 0x00f
-} bus_pattern_flags;
-
-struct bus_match_pattern {
-	path_id_t		path_id;
-	char			dev_name[DEV_IDLEN];
-	uint32_t		unit_number;
-	uint32_t		bus_id;
-	bus_pattern_flags	flags;
-};
-
-union match_pattern {
-	struct periph_match_pattern	periph_pattern;
-	struct device_match_pattern	device_pattern;
-	struct bus_match_pattern	bus_pattern;
-};
-
-typedef enum {
-	DEV_MATCH_PERIPH,
-	DEV_MATCH_DEVICE,
-	DEV_MATCH_BUS
-} dev_match_type;
-
-struct dev_match_pattern {
-	dev_match_type		type;
-	union match_pattern	pattern;
-};
-
-struct periph_match_result {
-	char			periph_name[DEV_IDLEN];
-	uint32_t		unit_number;
-	path_id_t		path_id;
-	target_id_t		target_id;
-	lun_id_t		target_lun;
-};
-
-typedef enum {
-	DEV_RESULT_NOFLAG		= 0x00,
-	DEV_RESULT_UNCONFIGURED		= 0x01
-} dev_result_flags;
-
-struct device_match_result {
-	path_id_t			path_id;
-	target_id_t			target_id;
-	lun_id_t			target_lun;
-	cam_proto			protocol;
-	struct scsi_inquiry_data	inq_data;
-	struct ata_params		ident_data;
-	dev_result_flags		flags;
-};
-
-struct bus_match_result {
-	path_id_t	path_id;
-	char		dev_name[DEV_IDLEN];
-	uint32_t	unit_number;
-	uint32_t	bus_id;
-};
-
-union match_result {
-	struct periph_match_result	periph_result;
-	struct device_match_result	device_result;
-	struct bus_match_result		bus_result;
-};
-
-struct dev_match_result {
-	dev_match_type		type;
-	union match_result	result;
-};
-
-typedef enum {
-	CAM_DEV_MATCH_LAST,
-	CAM_DEV_MATCH_MORE,
-	CAM_DEV_MATCH_LIST_CHANGED,
-	CAM_DEV_MATCH_SIZE_ERROR,
-	CAM_DEV_MATCH_ERROR
-} ccb_dev_match_status;
-
-typedef enum {
-	CAM_DEV_POS_NONE	= 0x000,
-	CAM_DEV_POS_BUS		= 0x001,
-	CAM_DEV_POS_TARGET	= 0x002,
-	CAM_DEV_POS_DEVICE	= 0x004,
-	CAM_DEV_POS_PERIPH	= 0x008,
-	CAM_DEV_POS_PDPTR	= 0x010,
-	CAM_DEV_POS_TYPEMASK	= 0xf00,
-	CAM_DEV_POS_EDT		= 0x100,
-	CAM_DEV_POS_PDRV	= 0x200
-} dev_pos_type;
-
-struct ccb_dm_cookie {
-	void 	*bus;
-	void	*target;	
-	void	*device;
-	void	*periph;
-	void	*pdrv;
-};
-
-struct ccb_dev_position {
-	u_int			generations[4];
-#define	CAM_BUS_GENERATION	0x00
-#define CAM_TARGET_GENERATION	0x01
-#define CAM_DEV_GENERATION	0x02
-#define CAM_PERIPH_GENERATION	0x03
-	dev_pos_type		position_type;
-	struct ccb_dm_cookie	cookie;
-};
-
-struct ccb_dev_match {
-	struct ccb_hdr			ccb_h;
-	ccb_dev_match_status		status;
-	uint32_t			num_patterns;
-	uint32_t			pattern_buf_len;
-	struct dev_match_pattern	*patterns;
-	uint32_t			num_matches;
-	uint32_t			match_buf_len;
-	struct dev_match_result		*matches;
-	struct ccb_dev_position		pos;
-};
-
-/*
- * Definitions for the path inquiry CCB fields.
- */
-#define CAM_VERSION	0x18	/* Hex value for current version */
-
-typedef enum {
-	PI_MDP_ABLE	= 0x80,	/* Supports MDP message */
-	PI_WIDE_32	= 0x40,	/* Supports 32 bit wide SCSI */
-	PI_WIDE_16	= 0x20, /* Supports 16 bit wide SCSI */
-	PI_SDTR_ABLE	= 0x10,	/* Supports SDTR message */
-	PI_LINKED_CDB	= 0x08, /* Supports linked CDBs */
-	PI_SATAPM	= 0x04,	/* Supports SATA PM */
-	PI_TAG_ABLE	= 0x02,	/* Supports tag queue messages */
-	PI_SOFT_RST	= 0x01	/* Supports soft reset alternative */
-} pi_inqflag;
-
-typedef enum {
-	PIT_PROCESSOR	= 0x80,	/* Target mode processor mode */
-	PIT_PHASE	= 0x40,	/* Target mode phase cog. mode */
-	PIT_DISCONNECT	= 0x20,	/* Disconnects supported in target mode */
-	PIT_TERM_IO	= 0x10,	/* Terminate I/O message supported in TM */
-	PIT_GRP_6	= 0x08,	/* Group 6 commands supported */
-	PIT_GRP_7	= 0x04	/* Group 7 commands supported */
-} pi_tmflag;
-
-typedef enum {
-	PIM_EXTLUNS	= 0x100,/* 64bit extended LUNs supported */
-	PIM_SCANHILO	= 0x80,	/* Bus scans from high ID to low ID */
-	PIM_NOREMOVE	= 0x40,	/* Removeable devices not included in scan */
-	PIM_NOINITIATOR	= 0x20,	/* Initiator role not supported. */
-	PIM_NOBUSRESET	= 0x10,	/* User has disabled initial BUS RESET */
-	PIM_NO_6_BYTE	= 0x08,	/* Do not send 6-byte commands */
-	PIM_SEQSCAN	= 0x04,	/* Do bus scans sequentially, not in parallel */
-	PIM_UNMAPPED	= 0x02,
-	PIM_NOSCAN	= 0x01	/* SIM does its own scanning */
-} pi_miscflag;
-
-/* Path Inquiry CCB */
-struct ccb_pathinq_settings_spi {
-	u_int8_t ppr_options;
-};
-
-struct ccb_pathinq_settings_fc {
-	u_int64_t wwnn;		/* world wide node name */
-	u_int64_t wwpn;		/* world wide port name */
-	uint32_t port;		/* 24 bit port id, if known */
-	uint32_t bitrate;	/* Mbps */
-};
-
-struct ccb_pathinq_settings_sas {
-	uint32_t bitrate;	/* Mbps */
-};
-#define	PATHINQ_SETTINGS_SIZE	128
-
-struct ccb_pathinq {
-	struct 	    ccb_hdr ccb_h;
-	u_int8_t    version_num;	/* Version number for the SIM/HBA */
-	u_int8_t    hba_inquiry;	/* Mimic of INQ byte 7 for the HBA */
-	u_int16_t   target_sprt;	/* Flags for target mode support */
-	uint32_t   hba_misc;		/* Misc HBA features */
-	u_int16_t   hba_eng_cnt;	/* HBA engine count */
-					/* Vendor Unique capabilities */
-	u_int8_t    vuhba_flags[VUHBALEN];
-	uint32_t   max_target;		/* Maximum supported Target */
-	uint32_t   max_lun;		/* Maximum supported Lun */
-	uint32_t   async_flags;	/* Installed Async handlers */
-	path_id_t   hpath_id;		/* Highest Path ID in the subsystem */
-	target_id_t initiator_id;	/* ID of the HBA on the SCSI bus */
-	char	    sim_vid[SIM_IDLEN];	/* Vendor ID of the SIM */
-	char	    hba_vid[HBA_IDLEN];	/* Vendor ID of the HBA */
-	char 	    dev_name[DEV_IDLEN];/* Device name for SIM */
-	uint32_t   unit_number;	/* Unit number for SIM */
-	uint32_t   bus_id;		/* Bus ID for SIM */
-	uint32_t   base_transfer_speed;/* Base bus speed in KB/sec */
-	cam_proto   protocol;
-	u_int	    protocol_version;
-	cam_xport   transport;
-	u_int	    transport_version;
-	union {
-		struct ccb_pathinq_settings_spi spi;
-		struct ccb_pathinq_settings_fc fc;
-		struct ccb_pathinq_settings_sas sas;
-		char ccb_pathinq_settings_opaque[PATHINQ_SETTINGS_SIZE];
-	} xport_specific;
-	u_int		maxio;		/* Max supported I/O size, in bytes. */
-	u_int16_t	hba_vendor;	/* HBA vendor ID */
-	u_int16_t	hba_device;	/* HBA device ID */
-	u_int16_t	hba_subvendor;	/* HBA subvendor ID */
-	u_int16_t	hba_subdevice;	/* HBA subdevice ID */
-};
-
-/* Path Statistics CCB */
-struct ccb_pathstats {
-	struct	ccb_hdr	ccb_h;
-	struct	timeval last_reset;	/* Time of last bus reset/loop init */
-};
-
-typedef enum {
-	SMP_FLAG_NONE		= 0x00,
-	SMP_FLAG_REQ_SG		= 0x01,
-	SMP_FLAG_RSP_SG		= 0x02
-} ccb_smp_pass_flags;
-
-/*
- * Serial Management Protocol CCB
- * XXX Currently the semantics for this CCB are that it is executed either
- * by the addressed device, or that device's parent (i.e. an expander for
- * any device on an expander) if the addressed device doesn't support SMP.
- * Later, once we have the ability to probe SMP-only devices and put them
- * in CAM's topology, the CCB will only be executed by the addressed device
- * if possible.
- */
-struct ccb_smpio {
-	struct ccb_hdr		ccb_h;
-	uint8_t			*smp_request;
-	int			smp_request_len;
-	uint16_t		smp_request_sglist_cnt;
-	uint8_t			*smp_response;
-	int			smp_response_len;
-	uint16_t		smp_response_sglist_cnt;
-	ccb_smp_pass_flags	flags;
-};
-
-typedef union {
-	u_int8_t *sense_ptr;		/*
-					 * Pointer to storage
-					 * for sense information
-					 */
-	                                /* Storage Area for sense information */
-	struct	 scsi_sense_data sense_buf;
-} sense_t;
-
-typedef union {
-	u_int8_t  *cdb_ptr;		/* Pointer to the CDB bytes to send */
-					/* Area for the CDB send */
-	u_int8_t  cdb_bytes[IOCDBLEN];
-} cdb_t;
-
-/*
- * SCSI I/O Request CCB used for the XPT_SCSI_IO and XPT_CONT_TARGET_IO
- * function codes.
- */
-struct ccb_scsiio {
-	struct	   ccb_hdr ccb_h;
-	union	   ccb *next_ccb;	/* Ptr for next CCB for action */
-	u_int8_t   *req_map;		/* Ptr to mapping info */
-	u_int8_t   *data_ptr;		/* Ptr to the data buf/SG list */
-	uint32_t  dxfer_len;		/* Data transfer length */
-					/* Autosense storage */	
-	struct     scsi_sense_data sense_data;
-	u_int8_t   sense_len;		/* Number of bytes to autosense */
-	u_int8_t   cdb_len;		/* Number of bytes for the CDB */
-	u_int16_t  sglist_cnt;		/* Number of SG list entries */
-	u_int8_t   scsi_status;		/* Returned SCSI status */
-	u_int8_t   sense_resid;		/* Autosense resid length: 2's comp */
-	uint32_t  resid;		/* Transfer residual length: 2's comp */
-	cdb_t	   cdb_io;		/* Union for CDB bytes/pointer */
-	u_int8_t   *msg_ptr;		/* Pointer to the message buffer */
-	u_int16_t  msg_len;		/* Number of bytes for the Message */
-	u_int8_t   tag_action;		/* What to do for tag queueing */
-	/*
-	 * The tag action should be either the define below (to send a
-	 * non-tagged transaction) or one of the defined scsi tag messages
-	 * from scsi_message.h.
-	 */
-#define		CAM_TAG_ACTION_NONE	0x00
-	u_int	   tag_id;		/* tag id from initator (target mode) */
-	u_int	   init_id;		/* initiator id of who selected */
-};
-
-/*
- * ATA I/O Request CCB used for the XPT_ATA_IO function code.
- */
-struct ccb_ataio {
-	struct	   ccb_hdr ccb_h;
-	union	   ccb *next_ccb;	/* Ptr for next CCB for action */
-	struct ata_cmd	cmd;		/* ATA command register set */
-	struct ata_res	res;		/* ATA result register set */
-	u_int8_t   *data_ptr;		/* Ptr to the data buf/SG list */
-	uint32_t  dxfer_len;		/* Data transfer length */
-	uint32_t  resid;		/* Transfer residual length: 2's comp */
-	u_int8_t   tag_action;		/* What to do for tag queueing */
-	/*
-	 * The tag action should be either the define below (to send a
-	 * non-tagged transaction) or one of the defined scsi tag messages
-	 * from scsi_message.h.
-	 */
-#define		CAM_TAG_ACTION_NONE	0x00
-	u_int	   tag_id;		/* tag id from initator (target mode) */
-	u_int	   init_id;		/* initiator id of who selected */
-};
-
-struct ccb_accept_tio {
-	struct	   ccb_hdr ccb_h;
-	cdb_t	   cdb_io;		/* Union for CDB bytes/pointer */
-	u_int8_t   cdb_len;		/* Number of bytes for the CDB */
-	u_int8_t   tag_action;		/* What to do for tag queueing */
-	u_int8_t   sense_len;		/* Number of bytes of Sense Data */
-	u_int      tag_id;		/* tag id from initator (target mode) */
-	u_int      init_id;		/* initiator id of who selected */
-	struct     scsi_sense_data sense_data;
-};
-
-/* Release SIM Queue */
-struct ccb_relsim {
-	struct ccb_hdr ccb_h;
-	uint32_t      release_flags;
-#define RELSIM_ADJUST_OPENINGS		0x01
-#define RELSIM_RELEASE_AFTER_TIMEOUT	0x02
-#define RELSIM_RELEASE_AFTER_CMDCMPLT	0x04
-#define RELSIM_RELEASE_AFTER_QEMPTY	0x08
-	uint32_t      openings;
-	uint32_t      release_timeout;	/* Abstract argument. */
-	uint32_t      qfrozen_cnt;
-};
-
-/*
- * Definitions for the asynchronous callback CCB fields.
- */
-typedef enum {
-	AC_UNIT_ATTENTION	= 0x4000,/* Device reported UNIT ATTENTION */
-	AC_ADVINFO_CHANGED	= 0x2000,/* Advance info might have changes */
-	AC_CONTRACT		= 0x1000,/* A contractual callback */
-	AC_GETDEV_CHANGED	= 0x800,/* Getdev info might have changed */
-	AC_INQ_CHANGED		= 0x400,/* Inquiry info might have changed */
-	AC_TRANSFER_NEG		= 0x200,/* New transfer settings in effect */
-	AC_LOST_DEVICE		= 0x100,/* A device went away */
-	AC_FOUND_DEVICE		= 0x080,/* A new device was found */
-	AC_PATH_DEREGISTERED	= 0x040,/* A path has de-registered */
-	AC_PATH_REGISTERED	= 0x020,/* A new path has been registered */
-	AC_SENT_BDR		= 0x010,/* A BDR message was sent to target */
-	AC_SCSI_AEN		= 0x008,/* A SCSI AEN has been received */
-	AC_UNSOL_RESEL		= 0x002,/* Unsolicited reselection occurred */
-	AC_BUS_RESET		= 0x001	/* A SCSI bus reset occurred */
-} ac_code;
-
-typedef void ac_callback_t (void *softc, uint32_t code,
-			    struct cam_path *path, void *args);
-
-/*
- * Generic Asynchronous callbacks.
- *
- * Generic arguments passed bac which are then interpreted between a per-system
- * contract number.
- */
-#define	AC_CONTRACT_DATA_MAX (128 - sizeof (u_int64_t))
-struct ac_contract {
-	u_int64_t	contract_number;
-	u_int8_t	contract_data[AC_CONTRACT_DATA_MAX];
-};
-
-#define	AC_CONTRACT_DEV_CHG	1
-struct ac_device_changed {
-	u_int64_t	wwpn;
-	uint32_t	port;
-	target_id_t	target;
-	u_int8_t	arrived;
-};
-
-/* Set Asynchronous Callback CCB */
-struct ccb_setasync {
-	struct ccb_hdr	 ccb_h;
-	uint32_t	 event_enable;	/* Async Event enables */	
-	ac_callback_t	*callback;
-	void		*callback_arg;
-};
-
-/* Set Device Type CCB */
-struct ccb_setdev {
-	struct	   ccb_hdr ccb_h;
-	u_int8_t   dev_type;	/* Value for dev type field in EDT */
-};
-
-/* SCSI Control Functions */
-
-/* Abort XPT request CCB */
-struct ccb_abort {
-	struct 	ccb_hdr ccb_h;
-	union	ccb *abort_ccb;	/* Pointer to CCB to abort */
-};
-
-/* Reset SCSI Bus CCB */
-struct ccb_resetbus {
-	struct	ccb_hdr ccb_h;
-};
-
-/* Reset SCSI Device CCB */
-struct ccb_resetdev {
-	struct	ccb_hdr ccb_h;
-};
-
-/* Terminate I/O Process Request CCB */
-struct ccb_termio {
-	struct	ccb_hdr ccb_h;
-	union	ccb *termio_ccb;	/* Pointer to CCB to terminate */
-};
-
-typedef enum {
-	CTS_TYPE_CURRENT_SETTINGS,
-	CTS_TYPE_USER_SETTINGS
-} cts_type;
-
-struct ccb_trans_settings_scsi
-{
-	u_int	valid;	/* Which fields to honor */
-#define	CTS_SCSI_VALID_TQ		0x01
-	u_int	flags;
-#define	CTS_SCSI_FLAGS_TAG_ENB		0x01
-};
-
-struct ccb_trans_settings_ata
-{
-	u_int	valid;	/* Which fields to honor */
-#define	CTS_ATA_VALID_TQ		0x01
-	u_int	flags;
-#define	CTS_ATA_FLAGS_TAG_ENB		0x01
-};
-
-struct ccb_trans_settings_spi
-{
-	u_int	  valid;	/* Which fields to honor */
-#define	CTS_SPI_VALID_SYNC_RATE		0x01
-#define	CTS_SPI_VALID_SYNC_OFFSET	0x02
-#define	CTS_SPI_VALID_BUS_WIDTH		0x04
-#define	CTS_SPI_VALID_DISC		0x08
-#define CTS_SPI_VALID_PPR_OPTIONS	0x10
-	u_int	flags;
-#define	CTS_SPI_FLAGS_DISC_ENB		0x01
-	u_int	sync_period;
-	u_int	sync_offset;
-	u_int	bus_width;
-	u_int	ppr_options;
-};
-
-struct ccb_trans_settings_fc {
-	u_int     	valid;		/* Which fields to honor */
-#define	CTS_FC_VALID_WWNN		0x8000
-#define	CTS_FC_VALID_WWPN		0x4000
-#define	CTS_FC_VALID_PORT		0x2000
-#define	CTS_FC_VALID_SPEED		0x1000
-	u_int64_t	wwnn;		/* world wide node name */
-	u_int64_t 	wwpn;		/* world wide port name */
-	uint32_t 	port;		/* 24 bit port id, if known */
-	uint32_t 	bitrate;	/* Mbps */
-};
-
-struct ccb_trans_settings_sas {
-	u_int     	valid;		/* Which fields to honor */
-#define	CTS_SAS_VALID_SPEED		0x1000
-	uint32_t 	bitrate;	/* Mbps */
-};
-
-struct ccb_trans_settings_pata {
-	u_int     	valid;		/* Which fields to honor */
-#define	CTS_ATA_VALID_MODE		0x01
-#define	CTS_ATA_VALID_BYTECOUNT		0x02
-#define	CTS_ATA_VALID_ATAPI		0x20
-#define	CTS_ATA_VALID_CAPS		0x40
-	int		mode;		/* Mode */
-	u_int 		bytecount;	/* Length of PIO transaction */
-	u_int 		atapi;		/* Length of ATAPI CDB */
-	u_int 		caps;		/* Device and host SATA caps. */
-#define	CTS_ATA_CAPS_H			0x0000ffff
-#define	CTS_ATA_CAPS_H_DMA48		0x00000001 /* 48-bit DMA */
-#define	CTS_ATA_CAPS_D			0xffff0000
-};
-
-struct ccb_trans_settings_sata {
-	u_int     	valid;		/* Which fields to honor */
-#define	CTS_SATA_VALID_MODE		0x01
-#define	CTS_SATA_VALID_BYTECOUNT	0x02
-#define	CTS_SATA_VALID_REVISION		0x04
-#define	CTS_SATA_VALID_PM		0x08
-#define	CTS_SATA_VALID_TAGS		0x10
-#define	CTS_SATA_VALID_ATAPI		0x20
-#define	CTS_SATA_VALID_CAPS		0x40
-	int		mode;		/* Legacy PATA mode */
-	u_int 		bytecount;	/* Length of PIO transaction */
-	int		revision;	/* SATA revision */
-	u_int 		pm_present;	/* PM is present (XPT->SIM) */
-	u_int 		tags;		/* Number of allowed tags */
-	u_int 		atapi;		/* Length of ATAPI CDB */
-	u_int 		caps;		/* Device and host SATA caps. */
-#define	CTS_SATA_CAPS_H			0x0000ffff
-#define	CTS_SATA_CAPS_H_PMREQ		0x00000001
-#define	CTS_SATA_CAPS_H_APST		0x00000002
-#define	CTS_SATA_CAPS_H_DMAAA		0x00000010 /* Auto-activation */
-#define	CTS_SATA_CAPS_H_AN		0x00000020 /* Async. notification */
-#define	CTS_SATA_CAPS_D			0xffff0000
-#define	CTS_SATA_CAPS_D_PMREQ		0x00010000
-#define	CTS_SATA_CAPS_D_APST		0x00020000
-};
-
-/* Get/Set transfer rate/width/disconnection/tag queueing settings */
-struct ccb_trans_settings {
-	struct	  ccb_hdr ccb_h;
-	cts_type  type;		/* Current or User settings */
-	cam_proto protocol;
-	u_int	  protocol_version;
-	cam_xport transport;
-	u_int	  transport_version;
-	union {
-		u_int  valid;	/* Which fields to honor */
-		struct ccb_trans_settings_ata ata;
-		struct ccb_trans_settings_scsi scsi;
-	} proto_specific;
-	union {
-		u_int  valid;	/* Which fields to honor */
-		struct ccb_trans_settings_spi spi;
-		struct ccb_trans_settings_fc fc;
-		struct ccb_trans_settings_sas sas;
-		struct ccb_trans_settings_pata ata;
-		struct ccb_trans_settings_sata sata;
-	} xport_specific;
-};
-
-
-/*
- * Calculate the geometry parameters for a device
- * give the block size and volume size in blocks.
- */
-struct ccb_calc_geometry {
-	struct	  ccb_hdr ccb_h;
-	uint32_t block_size;
-	u_int64_t volume_size;
-	uint32_t cylinders;		
-	u_int8_t  heads;
-	u_int8_t  secs_per_track;
-};
-
-/*
- * Set or get SIM (and transport) specific knobs
- */
-
-#define	KNOB_VALID_ADDRESS	0x1
-#define	KNOB_VALID_ROLE		0x2
-
-
-#define	KNOB_ROLE_NONE		0x0
-#define	KNOB_ROLE_INITIATOR	0x1
-#define	KNOB_ROLE_TARGET	0x2
-#define	KNOB_ROLE_BOTH		0x3
-
-struct ccb_sim_knob_settings_spi {
-	u_int		valid;
-	u_int		initiator_id;
-	u_int		role;
-};
-
-struct ccb_sim_knob_settings_fc {
-	u_int		valid;
-	u_int64_t	wwnn;		/* world wide node name */
-	u_int64_t 	wwpn;		/* world wide port name */
-	u_int		role;
-};
-
-struct ccb_sim_knob_settings_sas {
-	u_int		valid;
-	u_int64_t	wwnn;		/* world wide node name */
-	u_int		role;
-};
-#define	KNOB_SETTINGS_SIZE	128
-
-struct ccb_sim_knob {
-	struct	  ccb_hdr ccb_h;
-	union {
-		u_int  valid;	/* Which fields to honor */
-		struct ccb_sim_knob_settings_spi spi;
-		struct ccb_sim_knob_settings_fc fc;
-		struct ccb_sim_knob_settings_sas sas;
-		char pad[KNOB_SETTINGS_SIZE];
-	} xport_specific;
-};
-
-/*
- * Rescan the given bus, or bus/target/lun
- */
-struct ccb_rescan {
-	struct	ccb_hdr ccb_h;
-	cam_flags	flags;
-};
-
-/*
- * Turn on debugging for the given bus, bus/target, or bus/target/lun.
- */
-struct ccb_debug {
-	struct	ccb_hdr ccb_h;
-	cam_debug_flags flags;
-};
-
-/* Target mode structures. */
-
-struct ccb_en_lun {
-	struct	  ccb_hdr ccb_h;
-	u_int16_t grp6_len;		/* Group 6 VU CDB length */
-	u_int16_t grp7_len;		/* Group 7 VU CDB length */
-	u_int8_t  enable;
-};
-
-/* old, barely used immediate notify, binary compatibility */
-struct ccb_immed_notify {
-	struct	  ccb_hdr ccb_h;
-	struct    scsi_sense_data sense_data;
-	u_int8_t  sense_len;		/* Number of bytes in sense buffer */
-	u_int8_t  initiator_id;		/* Id of initiator that selected */
-	u_int8_t  message_args[7];	/* Message Arguments */
-};
-
-struct ccb_notify_ack {
-	struct	  ccb_hdr ccb_h;
-	u_int16_t seq_id;		/* Sequence identifier */
-	u_int8_t  event;		/* Event flags */
-};
-
-struct ccb_immediate_notify {
-	struct    ccb_hdr ccb_h;
-	u_int     tag_id;		/* Tag for immediate notify */
-	u_int     seq_id;		/* Tag for target of notify */
-	u_int     initiator_id;		/* Initiator Identifier */
-	u_int     arg;			/* Function specific */
-};
-
-struct ccb_notify_acknowledge {
-	struct    ccb_hdr ccb_h;
-	u_int     tag_id;		/* Tag for immediate notify */
-	u_int     seq_id;		/* Tar for target of notify */
-	u_int     initiator_id;		/* Initiator Identifier */
-	u_int     arg;			/* Function specific */
-};
-
-/* HBA engine structures. */
-
-typedef enum {
-	EIT_BUFFER,	/* Engine type: buffer memory */
-	EIT_LOSSLESS,	/* Engine type: lossless compression */
-	EIT_LOSSY,	/* Engine type: lossy compression */
-	EIT_ENCRYPT	/* Engine type: encryption */
-} ei_type;
-
-typedef enum {
-	EAD_VUNIQUE,	/* Engine algorithm ID: vendor unique */
-	EAD_LZ1V1,	/* Engine algorithm ID: LZ1 var.1 */
-	EAD_LZ2V1,	/* Engine algorithm ID: LZ2 var.1 */
-	EAD_LZ2V2	/* Engine algorithm ID: LZ2 var.2 */
-} ei_algo;
-
-struct ccb_eng_inq {
-	struct	  ccb_hdr ccb_h;
-	u_int16_t eng_num;	/* The engine number for this inquiry */
-	ei_type   eng_type;	/* Returned engine type */
-	ei_algo   eng_algo;	/* Returned engine algorithm type */
-	uint32_t eng_memeory;	/* Returned engine memory size */
-};
-
-struct ccb_eng_exec {	/* This structure must match SCSIIO size */
-	struct	  ccb_hdr ccb_h;
-	u_int8_t  *pdrv_ptr;	/* Ptr used by the peripheral driver */
-	u_int8_t  *req_map;	/* Ptr for mapping info on the req. */
-	u_int8_t  *data_ptr;	/* Pointer to the data buf/SG list */
-	uint32_t dxfer_len;	/* Data transfer length */
-	u_int8_t  *engdata_ptr;	/* Pointer to the engine buffer data */
-	u_int16_t sglist_cnt;	/* Num of scatter gather list entries */
-	uint32_t dmax_len;	/* Destination data maximum length */
-	uint32_t dest_len;	/* Destination data length */
-	int32_t	  src_resid;	/* Source residual length: 2's comp */
-	uint32_t timeout;	/* Timeout value */
-	u_int16_t eng_num;	/* Engine number for this request */
-	u_int16_t vu_flags;	/* Vendor Unique flags */
-};
-
-/*
- * Definitions for the timeout field in the SCSI I/O CCB.
- */
-#define	CAM_TIME_DEFAULT	0x00000000	/* Use SIM default value */
-#define	CAM_TIME_INFINITY	0xFFFFFFFF	/* Infinite timeout */
-
-#define	CAM_SUCCESS	0	/* For signaling general success */
-#define	CAM_FAILURE	1	/* For signaling general failure */
-
-#define CAM_FALSE	0
-#define CAM_TRUE	1
-
-#define XPT_CCB_INVALID	-1	/* for signaling a bad CCB to free */
-
-/*
- * CCB for working with advanced device information.  This operates in a fashion
- * similar to XPT_GDEV_TYPE.  Specify the target in ccb_h, the buffer
- * type requested, and provide a buffer size/buffer to write to.  If the
- * buffer is too small, provsiz will be larger than bufsiz.
- */
-struct ccb_dev_advinfo {
-	struct ccb_hdr ccb_h;
-	uint32_t flags;
-#define	CDAI_FLAG_NONE		0x0	/* No flags set */
-#define	CDAI_FLAG_STORE		0x1	/* If set, action becomes store */
-	uint32_t buftype;		/* IN: Type of data being requested */
-	/* NB: buftype is interpreted on a per-transport basis */
-#define	CDAI_TYPE_SCSI_DEVID	1
-#define	CDAI_TYPE_SERIAL_NUM	2
-#define	CDAI_TYPE_PHYS_PATH	3
-#define	CDAI_TYPE_RCAPLONG	4
-#define	CDAI_TYPE_EXT_INQ	5
-	off_t bufsiz;			/* IN: Size of external buffer */
-#define	CAM_SCSI_DEVID_MAXLEN	65536	/* length in buffer is an uint16_t */
-	off_t provsiz;			/* OUT: Size required/used */
-	uint8_t *buf;			/* IN/OUT: Buffer for requested data */
-};
-
-/*
- * CCB for sending async events
- */
-struct ccb_async {
-	struct ccb_hdr ccb_h;
-	uint32_t async_code;
-	off_t async_arg_size;
-	void *async_arg_ptr;
-};
-
-/*
- * Union of all CCB types for kernel space allocation.  This union should
- * never be used for manipulating CCBs - its only use is for the allocation
- * and deallocation of raw CCB space and is the return type of xpt_ccb_alloc
- * and the argument to xpt_ccb_free.
- */
-union ccb {
-	struct	ccb_hdr			ccb_h;	/* For convenience */
-	struct	ccb_scsiio		csio;
-	struct	ccb_getdev		cgd;
-	struct	ccb_getdevlist		cgdl;
-	struct	ccb_pathinq		cpi;
-	struct	ccb_relsim		crs;
-	struct	ccb_setasync		csa;
-	struct	ccb_setdev		csd;
-	struct	ccb_pathstats		cpis;
-	struct	ccb_getdevstats		cgds;
-	struct	ccb_dev_match		cdm;
-	struct	ccb_trans_settings	cts;
-	struct	ccb_calc_geometry	ccg;	
-	struct	ccb_sim_knob		knob;	
-	struct	ccb_abort		cab;
-	struct	ccb_resetbus		crb;
-	struct	ccb_resetdev		crd;
-	struct	ccb_termio		tio;
-	struct	ccb_accept_tio		atio;
-	struct	ccb_scsiio		ctio;
-	struct	ccb_en_lun		cel;
-	struct	ccb_immed_notify	cin;
-	struct	ccb_notify_ack		cna;
-	struct	ccb_immediate_notify	cin1;
-	struct	ccb_notify_acknowledge	cna2;
-	struct	ccb_eng_inq		cei;
-	struct	ccb_eng_exec		cee;
-	struct	ccb_smpio		smpio;
-	struct 	ccb_rescan		crcn;
-	struct  ccb_debug		cdbg;
-	struct	ccb_ataio		ataio;
-	struct	ccb_dev_advinfo		cdai;
-	struct	ccb_async		casync;
-};
-
-__BEGIN_DECLS
-static __inline void
-cam_fill_csio(struct ccb_scsiio *csio, uint32_t retries,
-	      void (*cbfcnp)(struct cam_periph *, union ccb *),
-	      uint32_t flags, u_int8_t tag_action,
-	      u_int8_t *data_ptr, uint32_t dxfer_len,
-	      u_int8_t sense_len, u_int8_t cdb_len,
-	      uint32_t timeout);
-
-static __inline void
-cam_fill_ctio(struct ccb_scsiio *csio, uint32_t retries,
-	      void (*cbfcnp)(struct cam_periph *, union ccb *),
-	      uint32_t flags, u_int tag_action, u_int tag_id,
-	      u_int init_id, u_int scsi_status, u_int8_t *data_ptr,
-	      uint32_t dxfer_len, uint32_t timeout);
-
-static __inline void
-cam_fill_ataio(struct ccb_ataio *ataio, uint32_t retries,
-	      void (*cbfcnp)(struct cam_periph *, union ccb *),
-	      uint32_t flags, u_int tag_action,
-	      u_int8_t *data_ptr, uint32_t dxfer_len,
-	      uint32_t timeout);
-
-static __inline void
-cam_fill_smpio(struct ccb_smpio *smpio, uint32_t retries, 
-	       void (*cbfcnp)(struct cam_periph *, union ccb *), uint32_t flags,
-	       uint8_t *smp_request, int smp_request_len,
-	       uint8_t *smp_response, int smp_response_len,
-	       uint32_t timeout);
-
-static __inline void
-cam_fill_csio(struct ccb_scsiio *csio, uint32_t retries,
-	      void (*cbfcnp)(struct cam_periph *, union ccb *),
-	      uint32_t flags, u_int8_t tag_action,
-	      u_int8_t *data_ptr, uint32_t dxfer_len,
-	      u_int8_t sense_len, u_int8_t cdb_len,
-	      uint32_t timeout)
-{
-	csio->ccb_h.func_code = XPT_SCSI_IO;
-	csio->ccb_h.flags = flags;
-	csio->ccb_h.xflags = 0;
-	csio->ccb_h.retry_count = retries;	
-	csio->ccb_h.cbfcnp = cbfcnp;
-	csio->ccb_h.timeout = timeout;
-	csio->data_ptr = data_ptr;
-	csio->dxfer_len = dxfer_len;
-	csio->sense_len = sense_len;
-	csio->cdb_len = cdb_len;
-	csio->tag_action = tag_action;
-}
-
-static __inline void
-cam_fill_ctio(struct ccb_scsiio *csio, uint32_t retries,
-	      void (*cbfcnp)(struct cam_periph *, union ccb *),
-	      uint32_t flags, u_int tag_action, u_int tag_id,
-	      u_int init_id, u_int scsi_status, u_int8_t *data_ptr,
-	      uint32_t dxfer_len, uint32_t timeout)
-{
-	csio->ccb_h.func_code = XPT_CONT_TARGET_IO;
-	csio->ccb_h.flags = flags;
-	csio->ccb_h.xflags = 0;
-	csio->ccb_h.retry_count = retries;	
-	csio->ccb_h.cbfcnp = cbfcnp;
-	csio->ccb_h.timeout = timeout;
-	csio->data_ptr = data_ptr;
-	csio->dxfer_len = dxfer_len;
-	csio->scsi_status = scsi_status;
-	csio->tag_action = tag_action;
-	csio->tag_id = tag_id;
-	csio->init_id = init_id;
-}
-
-static __inline void
-cam_fill_ataio(struct ccb_ataio *ataio, uint32_t retries,
-	      void (*cbfcnp)(struct cam_periph *, union ccb *),
-	      uint32_t flags, u_int tag_action,
-	      u_int8_t *data_ptr, uint32_t dxfer_len,
-	      uint32_t timeout)
-{
-	ataio->ccb_h.func_code = XPT_ATA_IO;
-	ataio->ccb_h.flags = flags;
-	ataio->ccb_h.retry_count = retries;
-	ataio->ccb_h.cbfcnp = cbfcnp;
-	ataio->ccb_h.timeout = timeout;
-	ataio->data_ptr = data_ptr;
-	ataio->dxfer_len = dxfer_len;
-	ataio->tag_action = tag_action;
-}
-
-static __inline void
-cam_fill_smpio(struct ccb_smpio *smpio, uint32_t retries, 
-	       void (*cbfcnp)(struct cam_periph *, union ccb *), uint32_t flags,
-	       uint8_t *smp_request, int smp_request_len,
-	       uint8_t *smp_response, int smp_response_len,
-	       uint32_t timeout)
-{
-#ifdef _KERNEL
-	KASSERT((flags & CAM_DIR_MASK) == CAM_DIR_BOTH,
-		("direction != CAM_DIR_BOTH"));
-	KASSERT((smp_request != NULL) && (smp_response != NULL),
-		("need valid request and response buffers"));
-	KASSERT((smp_request_len != 0) && (smp_response_len != 0),
-		("need non-zero request and response lengths"));
-#endif /*_KERNEL*/
-	smpio->ccb_h.func_code = XPT_SMP_IO;
-	smpio->ccb_h.flags = flags;
-	smpio->ccb_h.retry_count = retries;
-	smpio->ccb_h.cbfcnp = cbfcnp;
-	smpio->ccb_h.timeout = timeout;
-	smpio->smp_request = smp_request;
-	smpio->smp_request_len = smp_request_len;
-	smpio->smp_response = smp_response;
-	smpio->smp_response_len = smp_response_len;
-}
-
-static __inline void
-cam_set_ccbstatus(union ccb *ccb, cam_status status)
-{
-	ccb->ccb_h.status &= ~CAM_STATUS_MASK;
-	ccb->ccb_h.status |= status;
-}
-
-static __inline cam_status
-cam_ccb_status(union ccb *ccb)
-{
-	return ((cam_status)(ccb->ccb_h.status & CAM_STATUS_MASK));
-}
-
-void cam_calc_geometry(struct ccb_calc_geometry *ccg, int extended);
-
-__END_DECLS
-
-#endif /* _CAM_CAM_CCB_H */
diff --git a/include.new/cam/cam_compat.h b/include.new/cam/cam_compat.h
deleted file mode 100644
index 51c8909..0000000
--- a/include.new/cam/cam_compat.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * CAM ioctl compatibility shims
- *
- * Copyright (c) 2013 Scott Long
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_compat.h 255870 2013-09-25 15:55:56Z scottl $
- */
-
-#ifndef _CAM_CAM_COMPAT_H
-#define _CAM_CAM_COMPAT_H
-
-/* No user-servicable parts in here. */
-#ifdef _KERNEL
-
-int cam_compat_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
-    struct thread *td, int(*cbfnp)(struct cdev *, u_long, caddr_t, int,
-    struct thread *));
-
-
-/* Version 0x16 compatibility */
-#define CAM_VERSION_0x16	0x16
-
-/* The size of the union ccb didn't change when going to 0x17 */
-#define CAMIOCOMMAND_0x16	_IOWR(CAM_VERSION_0x16, 2, union ccb)
-#define CAMGETPASSTHRU_0x16	_IOWR(CAM_VERSION_0x16, 3, union ccb)
-
-#define CAM_SCATTER_VALID_0x16	0x00000010
-#define CAM_SG_LIST_PHYS_0x16	0x00040000
-#define CAM_DATA_PHYS_0x16	0x00200000
-
-/* Version 0x17 compatibility */
-#define CAM_VERSION_0x17	0x17
-
-struct ccb_hdr_0x17 {
-	cam_pinfo	pinfo;		/* Info for priority scheduling */
-	camq_entry	xpt_links;	/* For chaining in the XPT layer */	
-	camq_entry	sim_links;	/* For chaining in the SIM layer */	
-	camq_entry	periph_links;	/* For chaining in the type driver */
-	uint32_t	retry_count;
-	void		(*cbfcnp)(struct cam_periph *, union ccb *);
-	xpt_opcode	func_code;	/* XPT function code */
-	uint32_t	status;		/* Status returned by CAM subsystem */
-	struct		cam_path *path;	/* Compiled path for this ccb */
-	path_id_t	path_id;	/* Path ID for the request */
-	target_id_t	target_id;	/* Target device ID */
-	lun_id_t	target_lun;	/* Target LUN number */
-	uint32_t	flags;		/* ccb_flags */
-	ccb_ppriv_area	periph_priv;
-	ccb_spriv_area	sim_priv;
-	uint32_t	timeout;	/* Hard timeout value in seconds */
-	struct callout_handle timeout_ch;
-};
-
-struct ccb_pathinq_0x17 {
-	struct ccb_hdr_0x17 ccb_h;
-	u_int8_t    version_num;	/* Version number for the SIM/HBA */
-	u_int8_t    hba_inquiry;	/* Mimic of INQ byte 7 for the HBA */
-	u_int8_t    target_sprt;	/* Flags for target mode support */
-	u_int8_t    hba_misc;		/* Misc HBA features */
-	u_int16_t   hba_eng_cnt;	/* HBA engine count */
-					/* Vendor Unique capabilities */
-	u_int8_t    vuhba_flags[VUHBALEN];
-	uint32_t   max_target;		/* Maximum supported Target */
-	uint32_t   max_lun;		/* Maximum supported Lun */
-	uint32_t   async_flags;	/* Installed Async handlers */
-	path_id_t   hpath_id;		/* Highest Path ID in the subsystem */
-	target_id_t initiator_id;	/* ID of the HBA on the SCSI bus */
-	char	    sim_vid[SIM_IDLEN];	/* Vendor ID of the SIM */
-	char	    hba_vid[HBA_IDLEN];	/* Vendor ID of the HBA */
-	char 	    dev_name[DEV_IDLEN];/* Device name for SIM */
-	uint32_t   unit_number;	/* Unit number for SIM */
-	uint32_t   bus_id;		/* Bus ID for SIM */
-	uint32_t   base_transfer_speed;/* Base bus speed in KB/sec */
-	cam_proto   protocol;
-	u_int	    protocol_version;
-	cam_xport   transport;
-	u_int	    transport_version;
-	union {
-		struct ccb_pathinq_settings_spi spi;
-		struct ccb_pathinq_settings_fc fc;
-		struct ccb_pathinq_settings_sas sas;
-		char ccb_pathinq_settings_opaque[PATHINQ_SETTINGS_SIZE];
-	} xport_specific;
-	u_int		maxio;		/* Max supported I/O size, in bytes. */
-	u_int16_t	hba_vendor;	/* HBA vendor ID */
-	u_int16_t	hba_device;	/* HBA device ID */
-	u_int16_t	hba_subvendor;	/* HBA subvendor ID */
-	u_int16_t	hba_subdevice;	/* HBA subdevice ID */
-};
-
-#define CAM_0X17_LEN	(sizeof(union ccb) - sizeof(struct ccb_hdr) + sizeof(struct ccb_hdr_0x17))
-#define CAM_0X17_DATA_LEN (sizeof(union ccb) - sizeof(struct ccb_hdr_0x17))
-
-#define	CAMIOCOMMAND_0x17	_IOC(IOC_INOUT, CAM_VERSION_0x17, 2, CAM_0X17_LEN)
-#define CAMGETPASSTHRU_0x17	_IOC(IOC_INOUT, CAM_VERSION_0x17, 3, CAM_0X17_LEN)
-
-#endif
-#endif
diff --git a/include.new/cam/cam_debug.h b/include.new/cam/cam_debug.h
deleted file mode 100644
index 17107ec..0000000
--- a/include.new/cam/cam_debug.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * Macros for tracing/loging information in the CAM layer
- *
- * Copyright (c) 1997 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_debug.h 265632 2014-05-08 06:55:48Z mav $
- */
-#ifndef	_CAM_CAM_DEBUG_H
-#define _CAM_CAM_DEBUG_H 1
-
-/*
- * Debugging flags.
- */
-typedef enum {
-	CAM_DEBUG_NONE		= 0x00, /* no debugging */
-	CAM_DEBUG_INFO		= 0x01,	/* scsi commands, errors, data */ 
-	CAM_DEBUG_TRACE		= 0x02,	/* routine flow tracking */
-	CAM_DEBUG_SUBTRACE	= 0x04,	/* internal to routine flows */
-	CAM_DEBUG_CDB		= 0x08, /* print out SCSI CDBs only */
-	CAM_DEBUG_XPT		= 0x10,	/* print out xpt scheduling */
-	CAM_DEBUG_PERIPH	= 0x20, /* print out peripheral calls */
-	CAM_DEBUG_PROBE		= 0x40  /* print out probe actions */
-} cam_debug_flags;
-
-#if defined(_KERNEL)
-
-#ifndef CAM_DEBUG_FLAGS
-#define CAM_DEBUG_FLAGS		CAM_DEBUG_NONE
-#endif
-
-#ifndef CAM_DEBUG_COMPILE
-#ifdef CAMDEBUG
-#define CAM_DEBUG_COMPILE	(-1)
-#else
-#define CAM_DEBUG_COMPILE	(CAM_DEBUG_INFO | CAM_DEBUG_CDB | \
-				 CAM_DEBUG_PERIPH | CAM_DEBUG_PROBE | \
-				 CAM_DEBUG_FLAGS)
-#endif
-#endif
-
-#ifndef CAM_DEBUG_BUS
-#define CAM_DEBUG_BUS		CAM_BUS_WILDCARD
-#endif
-#ifndef CAM_DEBUG_TARGET
-#define CAM_DEBUG_TARGET	CAM_TARGET_WILDCARD
-#endif
-#ifndef CAM_DEBUG_LUN
-#define CAM_DEBUG_LUN		CAM_LUN_WILDCARD
-#endif
-
-#ifndef CAM_DEBUG_DELAY
-#define CAM_DEBUG_DELAY		0
-#endif
-
-/* Path we want to debug */
-extern struct cam_path *cam_dpath;
-/* Current debug levels set */
-extern uint32_t cam_dflags;
-/* Printf delay value (to prevent scrolling) */
-extern uint32_t cam_debug_delay;
-
-/* Debugging macros. */
-#define	CAM_DEBUGGED(path, flag)			\
-	(((flag) & (CAM_DEBUG_COMPILE) & cam_dflags)	\
-	 && (cam_dpath != NULL)				\
-	 && (xpt_path_comp(cam_dpath, path) >= 0)	\
-	 && (xpt_path_comp(cam_dpath, path) < 2))
-
-#define	CAM_DEBUG(path, flag, printfargs)		\
-	if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags)	\
-	 && (cam_dpath != NULL)				\
-	 && (xpt_path_comp(cam_dpath, path) >= 0)	\
-	 && (xpt_path_comp(cam_dpath, path) < 2)) {	\
-		xpt_print_path(path);			\
-		printf printfargs;			\
-		if (cam_debug_delay != 0)		\
-			DELAY(cam_debug_delay);		\
-	}
-
-#define	CAM_DEBUG_DEV(dev, flag, printfargs)		\
-	if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags)	\
-	 && (cam_dpath != NULL)				\
-	 && (xpt_path_comp_dev(cam_dpath, dev) >= 0)	\
-	 && (xpt_path_comp_dev(cam_dpath, dev) < 2)) {	\
-		xpt_print_device(dev);			\
-		printf printfargs;			\
-		if (cam_debug_delay != 0)		\
-			DELAY(cam_debug_delay);		\
-	}
-
-#define	CAM_DEBUG_PRINT(flag, printfargs)		\
-	if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags)) {	\
-		printf("cam_debug: ");			\
-		printf printfargs;			\
-		if (cam_debug_delay != 0)		\
-			DELAY(cam_debug_delay);		\
-	}
-
-#define	CAM_DEBUG_PATH_PRINT(flag, path, printfargs)	\
-	if (((flag) & (CAM_DEBUG_COMPILE) & cam_dflags)) {	\
-		xpt_print(path, "cam_debug: ");		\
-		printf printfargs;			\
-		if (cam_debug_delay != 0)		\
-			DELAY(cam_debug_delay);		\
-	}
-
-#else /* !_KERNEL */
-
-#define	CAM_DEBUGGED(A, B)	0
-#define	CAM_DEBUG(A, B, C)
-#define	CAM_DEBUG_PRINT(A, B)
-#define	CAM_DEBUG_PATH_PRINT(A, B, C)
-
-#endif /* _KERNEL */
-
-#endif /* _CAM_CAM_DEBUG_H */
diff --git a/include.new/cam/cam_periph.h b/include.new/cam/cam_periph.h
deleted file mode 100644
index 83e8557..0000000
--- a/include.new/cam/cam_periph.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/*-
- * Data structures and definitions for CAM peripheral ("type") drivers.
- *
- * Copyright (c) 1997, 1998 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_periph.h 260626 2014-01-14 12:01:36Z mav $
- */
-
-#ifndef _CAM_CAM_PERIPH_H
-#define _CAM_CAM_PERIPH_H 1
-
-#include <sys/queue.h>
-#include <cam/cam_sim.h>
-
-#ifdef _KERNEL
-#include <sys/taskqueue.h>
-
-#include <cam/cam_xpt.h>
-
-struct devstat;
-
-extern struct cam_periph *xpt_periph;
-
-extern struct periph_driver **periph_drivers;
-void periphdriver_register(void *);
-void periphdriver_init(int level);
-
-#include <sys/module.h>
-#define PERIPHDRIVER_DECLARE(name, driver) \
-	static int name ## _modevent(module_t mod, int type, void *data) \
-	{ \
-		switch (type) { \
-		case MOD_LOAD: \
-			periphdriver_register(data); \
-			break; \
-		case MOD_UNLOAD: \
-			printf(#name " module unload - not possible for this module type\n"); \
-			return EINVAL; \
-		default: \
-			return EOPNOTSUPP; \
-		} \
-		return 0; \
-	} \
-	static moduledata_t name ## _mod = { \
-		#name, \
-		name ## _modevent, \
-		(void *)&driver \
-	}; \
-	DECLARE_MODULE(name, name ## _mod, SI_SUB_DRIVERS, SI_ORDER_ANY); \
-	MODULE_DEPEND(name, cam, 1, 1, 1)
-
-typedef void (periph_init_t)(void); /*
-				     * Callback informing the peripheral driver
-				     * it can perform it's initialization since
-				     * the XPT is now fully initialized.
-				     */
-typedef periph_init_t *periph_init_func_t;
-
-struct periph_driver {
-	periph_init_func_t	 init;
-	char			 *driver_name;
-	TAILQ_HEAD(,cam_periph)	 units;
-	u_int			 generation;
-	u_int			 flags;
-#define CAM_PERIPH_DRV_EARLY		0x01
-};
-
-typedef enum {
-	CAM_PERIPH_BIO
-} cam_periph_type;
-
-/* Generically useful offsets into the peripheral private area */
-#define ppriv_ptr0 periph_priv.entries[0].ptr
-#define ppriv_ptr1 periph_priv.entries[1].ptr
-#define ppriv_field0 periph_priv.entries[0].field
-#define ppriv_field1 periph_priv.entries[1].field
-
-typedef void		periph_start_t (struct cam_periph *periph,
-					union ccb *start_ccb);
-typedef cam_status	periph_ctor_t (struct cam_periph *periph,
-				       void *arg);
-typedef void		periph_oninv_t (struct cam_periph *periph);
-typedef void		periph_dtor_t (struct cam_periph *periph);
-struct cam_periph {
-	periph_start_t		*periph_start;
-	periph_oninv_t		*periph_oninval;
-	periph_dtor_t		*periph_dtor;
-	char			*periph_name;
-	struct cam_path		*path;	/* Compiled path to device */
-	void			*softc;
-	struct cam_sim		*sim;
-	uint32_t		 unit_number;
-	cam_periph_type		 type;
-	uint32_t		 flags;
-#define CAM_PERIPH_RUNNING		0x01
-#define CAM_PERIPH_LOCKED		0x02
-#define CAM_PERIPH_LOCK_WANTED		0x04
-#define CAM_PERIPH_INVALID		0x08
-#define CAM_PERIPH_NEW_DEV_FOUND	0x10
-#define CAM_PERIPH_RECOVERY_INPROG	0x20
-#define CAM_PERIPH_RUN_TASK		0x40
-#define CAM_PERIPH_FREE			0x80
-#define CAM_PERIPH_ANNOUNCED		0x100
-	uint32_t		 scheduled_priority;
-	uint32_t		 immediate_priority;
-	int			 periph_allocating;
-	int			 periph_allocated;
-	uint32_t		 refcount;
-	SLIST_HEAD(, ccb_hdr)	 ccb_list;	/* For "immediate" requests */
-	SLIST_ENTRY(cam_periph)  periph_links;
-	TAILQ_ENTRY(cam_periph)  unit_links;
-	ac_callback_t		*deferred_callback; 
-	ac_code			 deferred_ac;
-	struct task		 periph_run_task;
-};
-
-#define CAM_PERIPH_MAXMAPS	2
-
-struct cam_periph_map_info {
-	int		num_bufs_used;
-	struct buf	*bp[CAM_PERIPH_MAXMAPS];
-};
-
-cam_status cam_periph_alloc(periph_ctor_t *periph_ctor,
-			    periph_oninv_t *periph_oninvalidate,
-			    periph_dtor_t *periph_dtor,
-			    periph_start_t *periph_start,
-			    char *name, cam_periph_type type, struct cam_path *,
-			    ac_callback_t *, ac_code, void *arg);
-struct cam_periph *cam_periph_find(struct cam_path *path, char *name);
-int		cam_periph_list(struct cam_path *, struct sbuf *);
-cam_status	cam_periph_acquire(struct cam_periph *periph);
-void		cam_periph_doacquire(struct cam_periph *periph);
-void		cam_periph_release(struct cam_periph *periph);
-void		cam_periph_release_locked(struct cam_periph *periph);
-void		cam_periph_release_locked_buses(struct cam_periph *periph);
-int		cam_periph_hold(struct cam_periph *periph, int priority);
-void		cam_periph_unhold(struct cam_periph *periph);
-void		cam_periph_invalidate(struct cam_periph *periph);
-int		cam_periph_mapmem(union ccb *ccb,
-				  struct cam_periph_map_info *mapinfo);
-void		cam_periph_unmapmem(union ccb *ccb,
-				    struct cam_periph_map_info *mapinfo);
-union ccb	*cam_periph_getccb(struct cam_periph *periph,
-				   uint32_t priority);
-void		cam_periph_ccbwait(union ccb *ccb);
-int		cam_periph_runccb(union ccb *ccb,
-				  int (*error_routine)(union ccb *ccb,
-						       cam_flags camflags,
-						       uint32_t sense_flags),
-				  cam_flags camflags, uint32_t sense_flags,
-				  struct devstat *ds);
-int		cam_periph_ioctl(struct cam_periph *periph, u_long cmd, 
-				 caddr_t addr,
-				 int (*error_routine)(union ccb *ccb,
-						      cam_flags camflags,
-						      uint32_t sense_flags));
-void		cam_freeze_devq(struct cam_path *path);
-uint32_t	cam_release_devq(struct cam_path *path, uint32_t relsim_flags,
-				 uint32_t opening_reduction, uint32_t arg,
-				 int getcount_only);
-void		cam_periph_async(struct cam_periph *periph, uint32_t code,
-		 		 struct cam_path *path, void *arg);
-void		cam_periph_bus_settle(struct cam_periph *periph,
-				      u_int bus_settle_ms);
-void		cam_periph_freeze_after_event(struct cam_periph *periph,
-					      struct timeval* event_time,
-					      u_int duration_ms);
-int		cam_periph_error(union ccb *ccb, cam_flags camflags,
-				 uint32_t sense_flags, union ccb *save_ccb);
-
-static __inline struct mtx *
-cam_periph_mtx(struct cam_periph *periph)
-{
-	return (xpt_path_mtx(periph->path));
-}
-
-#define cam_periph_owned(periph)					\
-	mtx_owned(xpt_path_mtx((periph)->path))
-
-#define cam_periph_lock(periph)						\
-	mtx_lock(xpt_path_mtx((periph)->path))
-
-#define cam_periph_unlock(periph)					\
-	mtx_unlock(xpt_path_mtx((periph)->path))
-
-#define cam_periph_assert(periph, what)					\
-	mtx_assert(xpt_path_mtx((periph)->path), (what))
-
-#define cam_periph_sleep(periph, chan, priority, wmesg, timo)		\
-	xpt_path_sleep((periph)->path, (chan), (priority), (wmesg), (timo))
-
-static inline struct cam_periph *
-cam_periph_acquire_first(struct periph_driver *driver)
-{
-	struct cam_periph *periph;
-
-	xpt_lock_buses();
-	periph = TAILQ_FIRST(&driver->units);
-	while (periph != NULL && (periph->flags & CAM_PERIPH_INVALID) != 0)
-		periph = TAILQ_NEXT(periph, unit_links);
-	if (periph != NULL)
-		periph->refcount++;
-	xpt_unlock_buses();
-	return (periph);
-}
-
-static inline struct cam_periph *
-cam_periph_acquire_next(struct cam_periph *pperiph)
-{
-	struct cam_periph *periph = pperiph;
-
-	cam_periph_assert(pperiph, MA_NOTOWNED);
-	xpt_lock_buses();
-	do {
-		periph = TAILQ_NEXT(periph, unit_links);
-	} while (periph != NULL && (periph->flags & CAM_PERIPH_INVALID) != 0);
-	if (periph != NULL)
-		periph->refcount++;
-	xpt_unlock_buses();
-	cam_periph_release(pperiph);
-	return (periph);
-}
-
-#define CAM_PERIPH_FOREACH(periph, driver)				\
-	for ((periph) = cam_periph_acquire_first(driver);		\
-	    (periph) != NULL;						\
-	    (periph) = cam_periph_acquire_next(periph))
-
-#endif /* _KERNEL */
-#endif /* _CAM_CAM_PERIPH_H */
diff --git a/include.new/cam/cam_queue.h b/include.new/cam/cam_queue.h
deleted file mode 100644
index 293b537..0000000
--- a/include.new/cam/cam_queue.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*-
- * CAM request queue management definitions.
- *
- * Copyright (c) 1997 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_queue.h 273078 2014-10-14 12:13:01Z mav $
- */
-
-#ifndef _CAM_CAM_QUEUE_H
-#define _CAM_CAM_QUEUE_H 1
-
-#ifdef _KERNEL
-
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/queue.h>
-#include <cam/cam.h>
-
-/*
- * This structure implements a heap based priority queue.  The queue
- * assumes that the objects stored in it begin with a cam_qentry
- * structure holding the priority information used to sort the objects.
- * This structure is opaque to clients (outside of the XPT layer) to allow
- * the implementation to change without affecting them.
- */
-struct camq {
-	cam_pinfo **queue_array;
-	int	   array_size;
-	int	   entries;
-	uint32_t  generation;
-	uint32_t  qfrozen_cnt;
-};
-
-TAILQ_HEAD(ccb_hdr_tailq, ccb_hdr);
-LIST_HEAD(ccb_hdr_list, ccb_hdr);
-SLIST_HEAD(ccb_hdr_slist, ccb_hdr);
-
-struct cam_ccbq {
-	struct	camq queue;
-	struct ccb_hdr_tailq	queue_extra_head;
-	int	queue_extra_entries;
-	int	total_openings;
-	int	allocated;
-	int	dev_openings;
-	int	dev_active;
-};
-
-struct cam_ed;
-
-struct cam_devq {
-	struct mtx	 send_mtx;
-	struct camq	 send_queue;
-	int		 send_openings;
-	int		 send_active;
-};
-
-
-struct cam_devq *cam_devq_alloc(int devices, int openings);
-
-int		 cam_devq_init(struct cam_devq *devq, int devices,
-			       int openings);
-
-void		 cam_devq_free(struct cam_devq *devq);
-
-uint32_t	 cam_devq_resize(struct cam_devq *camq, int openings);
-	
-/*
- * Allocate a cam_ccb_queue structure and initialize it.
- */
-struct cam_ccbq	*cam_ccbq_alloc(int openings);
-
-uint32_t	cam_ccbq_resize(struct cam_ccbq *ccbq, int devices);
-
-int		cam_ccbq_init(struct cam_ccbq *ccbq, int openings);
-
-void		cam_ccbq_free(struct cam_ccbq *ccbq);
-
-void		cam_ccbq_fini(struct cam_ccbq *ccbq);
-
-/*
- * Allocate and initialize a cam_queue structure.
- */
-struct camq	*camq_alloc(int size);
-
-/*
- * Resize a cam queue
- */
-uint32_t	camq_resize(struct camq *queue, int new_size);
-
-/* 
- * Initialize a camq structure.  Return 0 on success, 1 on failure.
- */
-int		camq_init(struct camq *camq, int size);
-
-/*
- * Free a cam_queue structure.  This should only be called if a controller
- * driver failes somehow during its attach routine or is unloaded and has
- * obtained a cam_queue structure.
- */
-void		camq_free(struct camq *queue);
-
-/*
- * Finialize any internal storage or state of a cam_queue.
- */
-void		camq_fini(struct camq *queue);
-
-/*
- * cam_queue_insert: Given a CAM queue with at least one open spot,
- * insert the new entry maintaining order.
- */
-void		camq_insert(struct camq *queue, cam_pinfo *new_entry);
-
-/*
- * camq_remove: Remove and arbitrary entry from the queue maintaining
- * queue order.
- */
-cam_pinfo	*camq_remove(struct camq *queue, int index);
-#define CAMQ_HEAD 1	/* Head of queue index */
-
-/* Index the first element in the heap */
-#define CAMQ_GET_HEAD(camq) ((camq)->queue_array[CAMQ_HEAD])
-
-/* Get the first element priority. */
-#define CAMQ_GET_PRIO(camq) (((camq)->entries > 0) ?			\
-			    ((camq)->queue_array[CAMQ_HEAD]->priority) : 0)
-
-/*
- * camq_change_priority: Raise or lower the priority of an entry
- * maintaining queue order.
- */
-void		camq_change_priority(struct camq *queue, int index,
-				     uint32_t new_priority);
-
-static __inline int
-cam_ccbq_pending_ccb_count(struct cam_ccbq *ccbq);
-
-static __inline void
-cam_ccbq_take_opening(struct cam_ccbq *ccbq);
-
-static __inline void
-cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb);
-
-static __inline void
-cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb);
-
-static __inline union ccb *
-cam_ccbq_peek_ccb(struct cam_ccbq *ccbq, int index);
-
-static __inline void
-cam_ccbq_send_ccb(struct cam_ccbq *queue, union ccb *send_ccb);
-
-static __inline void
-cam_ccbq_ccb_done(struct cam_ccbq *ccbq, union ccb *done_ccb);
-
-static __inline void
-cam_ccbq_release_opening(struct cam_ccbq *ccbq);
-
-
-static __inline int
-cam_ccbq_pending_ccb_count(struct cam_ccbq *ccbq)
-{
-	return (ccbq->queue.entries + ccbq->queue_extra_entries);
-}
-
-static __inline void
-cam_ccbq_take_opening(struct cam_ccbq *ccbq)
-{
-
-	ccbq->allocated++;
-}
-
-static __inline void
-cam_ccbq_insert_ccb(struct cam_ccbq *ccbq, union ccb *new_ccb)
-{
-	struct ccb_hdr *old_ccb;
-	struct camq *queue = &ccbq->queue;
-
-	/*
-	 * If queue is already full, try to resize.
-	 * If resize fail, push CCB with lowest priority out to the TAILQ.
-	 */
-	if (queue->entries == queue->array_size &&
-	    camq_resize(&ccbq->queue, queue->array_size * 2) != CAM_REQ_CMP) {
-		old_ccb = (struct ccb_hdr *)camq_remove(queue, queue->entries);
-		TAILQ_INSERT_HEAD(&ccbq->queue_extra_head, old_ccb,
-		    xpt_links.tqe);
-		old_ccb->pinfo.index = CAM_EXTRAQ_INDEX;
-		ccbq->queue_extra_entries++;
-	}
-
-	camq_insert(queue, &new_ccb->ccb_h.pinfo);
-}
-
-static __inline void
-cam_ccbq_remove_ccb(struct cam_ccbq *ccbq, union ccb *ccb)
-{
-	struct ccb_hdr *cccb, *bccb;
-	struct camq *queue = &ccbq->queue;
-
-	/* If the CCB is on the TAILQ, remove it from there. */
-	if (ccb->ccb_h.pinfo.index == CAM_EXTRAQ_INDEX) {
-		TAILQ_REMOVE(&ccbq->queue_extra_head, &ccb->ccb_h,
-		    xpt_links.tqe);
-		ccb->ccb_h.pinfo.index = CAM_UNQUEUED_INDEX;
-		ccbq->queue_extra_entries--;
-		return;
-	}
-
-	camq_remove(queue, ccb->ccb_h.pinfo.index);
-
-	/*
-	 * If there are some CCBs on TAILQ, find the best one and move it
-	 * to the emptied space in the queue.
-	 */
-	bccb = TAILQ_FIRST(&ccbq->queue_extra_head);
-	if (bccb == NULL)
-		return;
-	TAILQ_FOREACH(cccb, &ccbq->queue_extra_head, xpt_links.tqe) {
-		if (bccb->pinfo.priority > cccb->pinfo.priority ||
-		    (bccb->pinfo.priority == cccb->pinfo.priority &&
-		     GENERATIONCMP(bccb->pinfo.generation, >,
-		      cccb->pinfo.generation)))
-		        bccb = cccb;
-	}
-	TAILQ_REMOVE(&ccbq->queue_extra_head, bccb, xpt_links.tqe);
-	ccbq->queue_extra_entries--;
-	camq_insert(queue, &bccb->pinfo);
-}
-
-static __inline union ccb *
-cam_ccbq_peek_ccb(struct cam_ccbq *ccbq, int index)
-{
-	return((union ccb *)ccbq->queue.queue_array[index]);
-}
-
-static __inline void
-cam_ccbq_send_ccb(struct cam_ccbq *ccbq, union ccb *send_ccb)
-{
-
-	send_ccb->ccb_h.pinfo.index = CAM_ACTIVE_INDEX;
-	ccbq->dev_active++;
-	ccbq->dev_openings--;
-}
-
-static __inline void
-cam_ccbq_ccb_done(struct cam_ccbq *ccbq, union ccb *done_ccb)
-{
-
-	ccbq->dev_active--;
-	ccbq->dev_openings++;
-}
-
-static __inline void
-cam_ccbq_release_opening(struct cam_ccbq *ccbq)
-{
-
-	ccbq->allocated--;
-}
-
-#endif /* _KERNEL */
-#endif  /* _CAM_CAM_QUEUE_H */
diff --git a/include.new/cam/cam_sim.h b/include.new/cam/cam_sim.h
deleted file mode 100644
index e70e719..0000000
--- a/include.new/cam/cam_sim.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Data structures and definitions for SCSI Interface Modules (SIMs).
- *
- * Copyright (c) 1997 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_sim.h 260387 2014-01-07 01:51:48Z scottl $
- */
-
-#ifndef _CAM_CAM_SIM_H
-#define _CAM_CAM_SIM_H 1
-
-#ifdef _KERNEL
-
-/*
- * The sim driver creates a sim for each controller.  The sim device
- * queue is separately created in order to allow resource sharing between
- * sims.  For instance, a driver may create one sim for each channel of
- * a multi-channel controller and use the same queue for each channel.
- * In this way, the queue resources are shared across all the channels
- * of the multi-channel controller.
- */
-
-struct cam_sim;
-struct cam_devq;
-
-typedef void (*sim_action_func)(struct cam_sim *sim, union ccb *ccb);
-typedef void (*sim_poll_func)(struct cam_sim *sim);
-
-struct cam_devq * cam_simq_alloc(uint32_t max_sim_transactions);
-void		  cam_simq_free(struct cam_devq *devq);
-
-struct cam_sim *  cam_sim_alloc(sim_action_func sim_action,
-				sim_poll_func sim_poll,
-				const char *sim_name,
-				void *softc,
-				uint32_t unit,
-				struct mtx *mtx,
-				int max_dev_transactions,
-				int max_tagged_dev_transactions,
-				struct cam_devq *queue);
-void		  cam_sim_free(struct cam_sim *sim, int free_devq);
-void		  cam_sim_hold(struct cam_sim *sim);
-void		  cam_sim_release(struct cam_sim *sim);
-
-/* Optional sim attributes may be set with these. */
-void	cam_sim_set_path(struct cam_sim *sim, uint32_t path_id);
-
-
-
-/* Convenience routines for accessing sim attributes. */
-static __inline uint32_t    cam_sim_path(struct cam_sim *sim);
-static __inline const char * cam_sim_name(struct cam_sim *sim);
-static __inline void *	     cam_sim_softc(struct cam_sim *sim);
-static __inline uint32_t    cam_sim_unit(struct cam_sim *sim);
-static __inline uint32_t    cam_sim_bus(struct cam_sim *sim);
-
-
-
-/* Generically useful offsets into the sim private area */
-#define spriv_ptr0 sim_priv.entries[0].ptr
-#define spriv_ptr1 sim_priv.entries[1].ptr
-#define spriv_field0 sim_priv.entries[0].field
-#define spriv_field1 sim_priv.entries[1].field
-
-/*
- * The sim driver should not access anything directly from this
- * structure.
- */
-struct cam_sim {
-	sim_action_func		sim_action;
-	sim_poll_func		sim_poll;
-	const char		*sim_name;
-	void			*softc;
-	struct mtx		*mtx;
-	TAILQ_HEAD(, ccb_hdr)	sim_doneq;
-	TAILQ_ENTRY(cam_sim)	links;
-	uint32_t		path_id;/* The Boot device may set this to 0? */
-	uint32_t		unit_number;
-	uint32_t		bus_id;
-	int			max_tagged_dev_openings;
-	int			max_dev_openings;
-	uint32_t		flags;
-#define	CAM_SIM_REL_TIMEOUT_PENDING	0x01
-#define	CAM_SIM_MPSAFE			0x02
-	struct callout		callout;
-	struct cam_devq 	*devq;	/* Device Queue to use for this SIM */
-	int			refcount; /* References to the SIM. */
-};
-
-#define CAM_SIM_LOCK(sim)	mtx_lock((sim)->mtx)
-#define CAM_SIM_UNLOCK(sim)	mtx_unlock((sim)->mtx)
-
-static __inline uint32_t
-cam_sim_path(struct cam_sim *sim)
-{
-	return (sim->path_id);
-}
-
-static __inline const char *
-cam_sim_name(struct cam_sim *sim)
-{
-	return (sim->sim_name);
-}
-
-static __inline void *
-cam_sim_softc(struct cam_sim *sim)
-{
-	return (sim->softc);
-}
-
-static __inline uint32_t
-cam_sim_unit(struct cam_sim *sim)
-{
-	return (sim->unit_number);
-}
-
-static __inline uint32_t
-cam_sim_bus(struct cam_sim *sim)
-{
-	return (sim->bus_id);
-}
-
-#endif /* _KERNEL */
-#endif /* _CAM_CAM_SIM_H */
diff --git a/include.new/cam/cam_xpt.h b/include.new/cam/cam_xpt.h
deleted file mode 100644
index 90267d8..0000000
--- a/include.new/cam/cam_xpt.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * Data structures and definitions for dealing with the 
- * Common Access Method Transport (xpt) layer.
- *
- * Copyright (c) 1997 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_xpt.h 260387 2014-01-07 01:51:48Z scottl $
- */
-
-#ifndef _CAM_CAM_XPT_H
-#define _CAM_CAM_XPT_H 1
-
-/* Forward Declarations */
-union ccb;
-struct cam_periph;
-struct cam_ed;
-struct cam_sim;
-
-/*
- * Definition of a CAM path.  Paths are created from bus, target, and lun ids
- * via xpt_create_path and allow for reference to devices without recurring
- * lookups in the edt.
- */
-struct cam_path;
-
-/* Path functions */
-
-#ifdef _KERNEL
-
-/*
- * Definition of an async handler callback block.  These are used to add
- * SIMs and peripherals to the async callback lists.
- */
-struct async_node {
-	SLIST_ENTRY(async_node)	links;
-	uint32_t	event_enable;	/* Async Event enables */
-	uint32_t	event_lock;	/* Take SIM lock for handlers. */
-	void		(*callback)(void *arg, uint32_t code,
-				    struct cam_path *path, void *args);
-	void		*callback_arg;
-};
-
-SLIST_HEAD(async_list, async_node);
-SLIST_HEAD(periph_list, cam_periph);
-
-void			xpt_action(union ccb *new_ccb);
-void			xpt_action_default(union ccb *new_ccb);
-union ccb		*xpt_alloc_ccb(void);
-union ccb		*xpt_alloc_ccb_nowait(void);
-void			xpt_free_ccb(union ccb *free_ccb);
-void			xpt_setup_ccb(struct ccb_hdr *ccb_h,
-				      struct cam_path *path,
-				      uint32_t priority);
-void			xpt_merge_ccb(union ccb *master_ccb,
-				      union ccb *slave_ccb);
-cam_status		xpt_create_path(struct cam_path **new_path_ptr,
-					struct cam_periph *perph,
-					path_id_t path_id,
-					target_id_t target_id, lun_id_t lun_id);
-cam_status		xpt_create_path_unlocked(struct cam_path **new_path_ptr,
-					struct cam_periph *perph,
-					path_id_t path_id,
-					target_id_t target_id, lun_id_t lun_id);
-int			xpt_getattr(char *buf, size_t len, const char *attr,
-				    struct cam_path *path);
-void			xpt_free_path(struct cam_path *path);
-void			xpt_path_counts(struct cam_path *path, uint32_t *bus_ref,
-					uint32_t *periph_ref, uint32_t *target_ref,
-					uint32_t *device_ref);
-int			xpt_path_comp(struct cam_path *path1,
-				      struct cam_path *path2);
-int			xpt_path_comp_dev(struct cam_path *path,
-					  struct cam_ed *dev);
-void			xpt_print_path(struct cam_path *path);
-void			xpt_print_device(struct cam_ed *device);
-void			xpt_print(struct cam_path *path, const char *fmt, ...);
-int			xpt_path_string(struct cam_path *path, char *str,
-					size_t str_len);
-path_id_t		xpt_path_path_id(struct cam_path *path);
-target_id_t		xpt_path_target_id(struct cam_path *path);
-lun_id_t		xpt_path_lun_id(struct cam_path *path);
-int			xpt_path_legacy_ata_id(struct cam_path *path);
-struct cam_sim		*xpt_path_sim(struct cam_path *path);
-struct cam_periph	*xpt_path_periph(struct cam_path *path);
-void			xpt_async(uint32_t async_code, struct cam_path *path,
-				  void *async_arg);
-void			xpt_rescan(union ccb *ccb);
-void			xpt_hold_boot(void);
-void			xpt_release_boot(void);
-void			xpt_lock_buses(void);
-void			xpt_unlock_buses(void);
-struct mtx *		xpt_path_mtx(struct cam_path *path);
-#define xpt_path_lock(path)	mtx_lock(xpt_path_mtx(path))
-#define xpt_path_unlock(path)	mtx_unlock(xpt_path_mtx(path))
-#define xpt_path_assert(path, what)	mtx_assert(xpt_path_mtx(path), (what))
-#define xpt_path_owned(path)	mtx_owned(xpt_path_mtx(path))
-#define xpt_path_sleep(path, chan, priority, wmesg, timo)		\
-    msleep((chan), xpt_path_mtx(path), (priority), (wmesg), (timo))
-cam_status		xpt_register_async(int event, ac_callback_t *cbfunc,
-					   void *cbarg, struct cam_path *path);
-cam_status		xpt_compile_path(struct cam_path *new_path,
-					 struct cam_periph *perph,
-					 path_id_t path_id,
-					 target_id_t target_id,
-					 lun_id_t lun_id);
-cam_status		xpt_clone_path(struct cam_path **new_path,
-				      struct cam_path *path);
-void			xpt_copy_path(struct cam_path *new_path,
-				      struct cam_path *path);
-
-void			xpt_release_path(struct cam_path *path);
-
-#endif /* _KERNEL */
-
-#endif /* _CAM_CAM_XPT_H */
diff --git a/include.new/cam/cam_xpt_internal.h b/include.new/cam/cam_xpt_internal.h
deleted file mode 100644
index 372f637..0000000
--- a/include.new/cam/cam_xpt_internal.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * Copyright 2009 Scott Long
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_xpt_internal.h 278974 2015-02-18 23:08:13Z ken $
- */
-
-#ifndef _CAM_CAM_XPT_INTERNAL_H
-#define _CAM_CAM_XPT_INTERNAL_H 1
-
-#include <sys/taskqueue.h>
-
-/* Forward Declarations */
-struct cam_eb;
-struct cam_et;
-struct cam_ed;
-
-typedef struct cam_ed * (*xpt_alloc_device_func)(struct cam_eb *bus,
-					         struct cam_et *target,
-					         lun_id_t lun_id);
-typedef void (*xpt_release_device_func)(struct cam_ed *device);
-typedef void (*xpt_action_func)(union ccb *start_ccb);
-typedef void (*xpt_dev_async_func)(uint32_t async_code,
-				   struct cam_eb *bus,
-				   struct cam_et *target,
-				   struct cam_ed *device,
-				   void *async_arg);
-typedef void (*xpt_announce_periph_func)(struct cam_periph *periph);
-
-struct xpt_xport {
-	xpt_alloc_device_func	alloc_device;
-	xpt_release_device_func	reldev;
-	xpt_action_func		action;
-	xpt_dev_async_func	async;
-	xpt_announce_periph_func announce;
-};
-
-/*
- * The CAM EDT (Existing Device Table) contains the device information for
- * all devices for all busses in the system.  The table contains a
- * cam_ed structure for each device on the bus.
- */
-struct cam_ed {
-	cam_pinfo	 devq_entry;
-	TAILQ_ENTRY(cam_ed) links;
-	struct	cam_et	 *target;
-	struct	cam_sim  *sim;
-	lun_id_t	 lun_id;
-	struct	cam_ccbq ccbq;		/* Queue of pending ccbs */
-	struct	async_list asyncs;	/* Async callback info for this B/T/L */
-	struct	periph_list periphs;	/* All attached devices */
-	u_int	generation;		/* Generation number */
-	void		 *quirk;	/* Oddities about this device */
-	u_int		 maxtags;
-	u_int		 mintags;
-	cam_proto	 protocol;
-	u_int		 protocol_version;
-	cam_xport	 transport;
-	u_int		 transport_version;
-	struct		 scsi_inquiry_data inq_data;
-	uint8_t		 *supported_vpds;
-	uint8_t		 supported_vpds_len;
-	uint32_t	 device_id_len;
-	uint8_t		 *device_id;
-	uint32_t	 ext_inq_len;
-	uint8_t		 *ext_inq;
-	uint8_t		 physpath_len;
-	uint8_t		 *physpath;	/* physical path string form */
-	uint32_t	 rcap_len;
-	uint8_t		 *rcap_buf;
-	struct		 ata_params ident_data;
-	u_int8_t	 inq_flags;	/*
-					 * Current settings for inquiry flags.
-					 * This allows us to override settings
-					 * like disconnection and tagged
-					 * queuing for a device.
-					 */
-	u_int8_t	 queue_flags;	/* Queue flags from the control page */
-	u_int8_t	 serial_num_len;
-	u_int8_t	*serial_num;
-	uint32_t	 flags;
-#define CAM_DEV_UNCONFIGURED	 	0x01
-#define CAM_DEV_REL_TIMEOUT_PENDING	0x02
-#define CAM_DEV_REL_ON_COMPLETE		0x04
-#define CAM_DEV_REL_ON_QUEUE_EMPTY	0x08
-#define CAM_DEV_TAG_AFTER_COUNT		0x20
-#define CAM_DEV_INQUIRY_DATA_VALID	0x40
-#define	CAM_DEV_IN_DV			0x80
-#define	CAM_DEV_DV_HIT_BOTTOM		0x100
-#define CAM_DEV_IDENTIFY_DATA_VALID	0x200
-	uint32_t	 tag_delay_count;
-#define	CAM_TAG_DELAY_COUNT		5
-	uint32_t	 tag_saved_openings;
-	uint32_t	 refcount;
-	struct callout	 callout;
-	STAILQ_ENTRY(cam_ed) highpowerq_entry;
-	struct mtx	 device_mtx;
-	struct task	 device_destroy_task;
-};
-
-/*
- * Each target is represented by an ET (Existing Target).  These
- * entries are created when a target is successfully probed with an
- * identify, and removed when a device fails to respond after a number
- * of retries, or a bus rescan finds the device missing.
- */
-struct cam_et {
-	TAILQ_HEAD(, cam_ed) ed_entries;
-	TAILQ_ENTRY(cam_et) links;
-	struct	cam_eb	*bus;
-	target_id_t	target_id;
-	uint32_t	refcount;
-	u_int		generation;
-	struct		timeval last_reset;
-	u_int		rpl_size;
-	struct scsi_report_luns_data *luns;
-	struct mtx	luns_mtx;	/* Protection for luns field. */
-};
-
-/*
- * Each bus is represented by an EB (Existing Bus).  These entries
- * are created by calls to xpt_bus_register and deleted by calls to
- * xpt_bus_deregister.
- */
-struct cam_eb {
-	TAILQ_HEAD(, cam_et) et_entries;
-	TAILQ_ENTRY(cam_eb)  links;
-	path_id_t	     path_id;
-	struct cam_sim	     *sim;
-	struct timeval	     last_reset;
-	uint32_t	     flags;
-#define	CAM_EB_RUNQ_SCHEDULED	0x01
-	uint32_t	     refcount;
-	u_int		     generation;
-	device_t	     parent_dev;
-	struct xpt_xport     *xport;
-	struct mtx	     eb_mtx;	/* Bus topology mutex. */
-};
-
-struct cam_path {
-	struct cam_periph *periph;
-	struct cam_eb	  *bus;
-	struct cam_et	  *target;
-	struct cam_ed	  *device;
-};
-
-struct xpt_xport *	scsi_get_xport(void);
-struct xpt_xport *	ata_get_xport(void);
-
-struct cam_ed *		xpt_alloc_device(struct cam_eb *bus,
-					 struct cam_et *target,
-					 lun_id_t lun_id);
-void			xpt_acquire_device(struct cam_ed *device);
-void			xpt_release_device(struct cam_ed *device);
-uint32_t		xpt_dev_ccbq_resize(struct cam_path *path, int newopenings);
-void			xpt_start_tags(struct cam_path *path);
-void			xpt_stop_tags(struct cam_path *path);
-
-MALLOC_DECLARE(M_CAMXPT);
-
-#endif
diff --git a/include.new/cam/cam_xpt_periph.h b/include.new/cam/cam_xpt_periph.h
deleted file mode 100644
index 8ad3b96..0000000
--- a/include.new/cam/cam_xpt_periph.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Data structures and definitions for dealing with the 
- * Common Access Method Transport (xpt) layer from peripheral
- * drivers.
- *
- * Copyright (c) 1997 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_xpt_periph.h 257049 2013-10-24 10:33:31Z mav $
- */
-
-#ifndef _CAM_CAM_XPT_PERIPH_H
-#define _CAM_CAM_XPT_PERIPH_H 1
-
-#include <cam/cam_queue.h>
-#include <cam/cam_xpt.h>
-
-/* Functions accessed by the peripheral drivers */
-#ifdef _KERNEL
-void		xpt_polled_action(union ccb *ccb);
-void		xpt_release_ccb(union ccb *released_ccb);
-void		xpt_schedule(struct cam_periph *perph, uint32_t new_priority);
-int32_t		xpt_add_periph(struct cam_periph *periph);
-void		xpt_remove_periph(struct cam_periph *periph);
-void		xpt_announce_periph(struct cam_periph *periph,
-				    char *announce_string);
-void		xpt_announce_quirks(struct cam_periph *periph,
-				    int quirks, char *bit_string);
-void		xpt_denounce_periph(struct cam_periph *periph);
-#endif
-
-#endif /* _CAM_CAM_XPT_PERIPH_H */
diff --git a/include.new/cam/cam_xpt_sim.h b/include.new/cam/cam_xpt_sim.h
deleted file mode 100644
index d949421..0000000
--- a/include.new/cam/cam_xpt_sim.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Data structures and definitions for dealing with the 
- * Common Access Method Transport (xpt) layer.
- *
- * Copyright (c) 1997 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/cam_xpt_sim.h 260387 2014-01-07 01:51:48Z scottl $
- */
-
-#ifndef _CAM_CAM_XPT_SIM_H
-#define _CAM_CAM_XPT_SIM_H 1
-
-#include <cam/cam_xpt.h>
-#include <cam/cam_queue.h>
-
-/* Functions accessed by SIM drivers */
-#ifdef _KERNEL
-int32_t		xpt_bus_register(struct cam_sim *sim, device_t parent,
-				 uint32_t bus);
-int32_t		xpt_bus_deregister(path_id_t path_id);
-uint32_t	xpt_freeze_simq(struct cam_sim *sim, u_int count);
-void		xpt_release_simq(struct cam_sim *sim, int run_queue);
-uint32_t	xpt_freeze_devq(struct cam_path *path, u_int count);
-void		xpt_release_devq(struct cam_path *path,
-		    u_int count, int run_queue);
-void		xpt_done(union ccb *done_ccb);
-void		xpt_done_direct(union ccb *done_ccb);
-#endif
-
-#endif /* _CAM_CAM_XPT_SIM_H */
-
diff --git a/include.new/cam/scsi/scsi_all.h b/include.new/cam/scsi/scsi_all.h
deleted file mode 100644
index 98f57df..0000000
--- a/include.new/cam/scsi/scsi_all.h
+++ /dev/null
@@ -1,4130 +0,0 @@
-/*-
- * Largely written by Julian Elischer (julian@tfs.com)
- * for TRW Financial Systems.
- *
- * TRW Financial Systems, in accordance with their agreement with Carnegie
- * Mellon University, makes this software available to CMU to distribute
- * or use in any manner that they see fit as long as this message is kept with
- * the software. For this reason TFS also grants any other persons or
- * organisations permission to use or modify this software.
- *
- * TFS supplies this software to be publicly redistributed
- * on the understanding that TFS is not responsible for the correct
- * functioning of this software in any circumstances.
- *
- * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
- * $FreeBSD: releng/10.2/sys/cam/scsi/scsi_all.h 284435 2015-06-16 02:31:11Z ken $
- */
-
-/*
- * SCSI general  interface description
- */
-
-#ifndef	_SCSI_SCSI_ALL_H
-#define	_SCSI_SCSI_ALL_H 1
-
-#include <sys/cdefs.h>
-#include <machine/stdarg.h>
-
-#ifdef _KERNEL
-/*
- * This is the number of seconds we wait for devices to settle after a SCSI
- * bus reset.
- */
-extern int scsi_delay;
-#endif /* _KERNEL */
-
-/*
- * SCSI command format
- */
-
-/*
- * Define dome bits that are in ALL (or a lot of) scsi commands
- */
-#define	SCSI_CTL_LINK		0x01
-#define	SCSI_CTL_FLAG		0x02
-#define	SCSI_CTL_VENDOR		0xC0
-#define	SCSI_CMD_LUN		0xA0	/* these two should not be needed */
-#define	SCSI_CMD_LUN_SHIFT	5	/* LUN in the cmd is no longer SCSI */
-
-#define	SCSI_MAX_CDBLEN		16	/* 
-					 * 16 byte commands are in the 
-					 * SCSI-3 spec 
-					 */
-#if defined(CAM_MAX_CDBLEN) && (CAM_MAX_CDBLEN < SCSI_MAX_CDBLEN)
-#error "CAM_MAX_CDBLEN cannot be less than SCSI_MAX_CDBLEN"
-#endif
-
-/* 6byte CDBs special case 0 length to be 256 */
-#define	SCSI_CDB6_LEN(len)	((len) == 0 ? 256 : len)
-
-/*
- * This type defines actions to be taken when a particular sense code is
- * received.  Right now, these flags are only defined to take up 16 bits,
- * but can be expanded in the future if necessary.
- */
-typedef enum {
-	SS_NOP      = 0x000000,	/* Do nothing */
-	SS_RETRY    = 0x010000,	/* Retry the command */
-	SS_FAIL     = 0x020000,	/* Bail out */
-	SS_START    = 0x030000,	/* Send a Start Unit command to the device,
-				 * then retry the original command.
-				 */
-	SS_TUR      = 0x040000,	/* Send a Test Unit Ready command to the
-				 * device, then retry the original command.
-				 */
-	SS_MASK     = 0xff0000
-} scsi_sense_action;
-
-typedef enum {
-	SSQ_NONE		= 0x0000,
-	SSQ_DECREMENT_COUNT	= 0x0100,  /* Decrement the retry count */
-	SSQ_MANY		= 0x0200,  /* send lots of recovery commands */
-	SSQ_RANGE		= 0x0400,  /*
-					    * This table entry represents the
-					    * end of a range of ASCQs that
-					    * have identical error actions
-					    * and text.
-					    */
-	SSQ_PRINT_SENSE		= 0x0800,
-	SSQ_UA			= 0x1000,  /* Broadcast UA. */
-	SSQ_RESCAN		= 0x2000,  /* Rescan target for LUNs. */
-	SSQ_LOST		= 0x4000,  /* Destroy the LUNs. */
-	SSQ_MASK		= 0xff00
-} scsi_sense_action_qualifier;
-
-/* Mask for error status values */
-#define	SS_ERRMASK	0xff
-
-/* The default, retyable, error action */
-#define	SS_RDEF		SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE|EIO
-
-/* The retyable, error action, with table specified error code */
-#define	SS_RET		SS_RETRY|SSQ_DECREMENT_COUNT|SSQ_PRINT_SENSE
-
-/* Fatal error action, with table specified error code */
-#define	SS_FATAL	SS_FAIL|SSQ_PRINT_SENSE
-
-struct scsi_generic
-{
-	u_int8_t opcode;
-	u_int8_t bytes[11];
-};
-
-struct scsi_request_sense
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SRS_DESC	0x01
-	u_int8_t unused[2];
-	u_int8_t length;
-	u_int8_t control;
-};
-
-struct scsi_test_unit_ready
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t unused[3];
-	u_int8_t control;
-};
-
-struct scsi_receive_diag {
-	uint8_t opcode;
-	uint8_t byte2;
-#define SRD_PCV		0x01
-	uint8_t page_code;
-	uint8_t length[2]; 
-	uint8_t control;
-};
-
-struct scsi_send_diag {
-	uint8_t opcode;
-	uint8_t byte2;
-#define SSD_UNITOFFL				0x01
-#define SSD_DEVOFFL				0x02
-#define SSD_SELFTEST				0x04
-#define SSD_PF					0x10
-#define SSD_SELF_TEST_CODE_MASK			0xE0
-#define SSD_SELF_TEST_CODE_SHIFT		5
-#define		SSD_SELF_TEST_CODE_NONE		0x00
-#define		SSD_SELF_TEST_CODE_BG_SHORT	0x01
-#define		SSD_SELF_TEST_CODE_BG_EXTENDED	0x02
-#define		SSD_SELF_TEST_CODE_BG_ABORT	0x04
-#define		SSD_SELF_TEST_CODE_FG_SHORT	0x05
-#define		SSD_SELF_TEST_CODE_FG_EXTENDED	0x06
-	uint8_t	reserved;
-	uint8_t	length[2];
-	uint8_t control;
-};
-
-struct scsi_sense
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t unused[2];
-	u_int8_t length;
-	u_int8_t control;
-};
-
-struct scsi_inquiry
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SI_EVPD 	0x01
-#define	SI_CMDDT	0x02
-	u_int8_t page_code;
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-struct scsi_mode_sense_6
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SMS_DBD				0x08
-	u_int8_t page;
-#define	SMS_PAGE_CODE 			0x3F
-#define	SMS_VENDOR_SPECIFIC_PAGE	0x00
-#define	SMS_DISCONNECT_RECONNECT_PAGE	0x02
-#define	SMS_FORMAT_DEVICE_PAGE		0x03
-#define	SMS_GEOMETRY_PAGE		0x04
-#define	SMS_CACHE_PAGE			0x08
-#define	SMS_PERIPHERAL_DEVICE_PAGE	0x09
-#define	SMS_CONTROL_MODE_PAGE		0x0A
-#define	SMS_PROTO_SPECIFIC_PAGE		0x19
-#define	SMS_INFO_EXCEPTIONS_PAGE	0x1C
-#define	SMS_ALL_PAGES_PAGE		0x3F
-#define	SMS_PAGE_CTRL_MASK		0xC0
-#define	SMS_PAGE_CTRL_CURRENT 		0x00
-#define	SMS_PAGE_CTRL_CHANGEABLE 	0x40
-#define	SMS_PAGE_CTRL_DEFAULT 		0x80
-#define	SMS_PAGE_CTRL_SAVED 		0xC0
-	u_int8_t subpage;
-#define	SMS_SUBPAGE_PAGE_0		0x00
-#define	SMS_SUBPAGE_ALL			0xff
-	u_int8_t length;
-	u_int8_t control;
-};
-
-struct scsi_mode_sense_10
-{
-	u_int8_t opcode;
-	u_int8_t byte2;		/* same bits as small version */
-#define	SMS10_LLBAA			0x10
-	u_int8_t page; 		/* same bits as small version */
-	u_int8_t subpage;
-	u_int8_t unused[3];
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-struct scsi_mode_select_6
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SMS_SP	0x01
-#define	SMS_PF	0x10
-	u_int8_t unused[2];
-	u_int8_t length;
-	u_int8_t control;
-};
-
-struct scsi_mode_select_10
-{
-	u_int8_t opcode;
-	u_int8_t byte2;		/* same bits as small version */
-	u_int8_t unused[5];
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-/*
- * When sending a mode select to a tape drive, the medium type must be 0.
- */
-struct scsi_mode_hdr_6
-{
-	u_int8_t datalen;
-	u_int8_t medium_type;
-	u_int8_t dev_specific;
-	u_int8_t block_descr_len;
-};
-
-struct scsi_mode_hdr_10
-{
-	u_int8_t datalen[2];
-	u_int8_t medium_type;
-	u_int8_t dev_specific;
-	u_int8_t reserved[2];
-	u_int8_t block_descr_len[2];
-};
-
-struct scsi_mode_block_descr
-{
-	u_int8_t density_code;
-	u_int8_t num_blocks[3];
-	u_int8_t reserved;
-	u_int8_t block_len[3];
-};
-
-struct scsi_per_res_in
-{
-	u_int8_t opcode;
-	u_int8_t action;
-#define	SPRI_RK	0x00
-#define	SPRI_RR	0x01
-#define	SPRI_RC	0x02
-#define	SPRI_RS	0x03
-	u_int8_t reserved[5];
-	u_int8_t length[2];
-#define	SPRI_MAX_LEN		0xffff
-	u_int8_t control;
-};
-
-struct scsi_per_res_in_header
-{
-	u_int8_t generation[4];
-	u_int8_t length[4];
-};
-
-struct scsi_per_res_key
-{
-	u_int8_t key[8];
-};
-
-struct scsi_per_res_in_keys
-{
-	struct scsi_per_res_in_header header;
-	struct scsi_per_res_key keys[0];
-};
-
-struct scsi_per_res_cap
-{
-	uint8_t length[2];
-	uint8_t flags1;
-#define	SPRI_RLR_C		0x80
-#define	SPRI_CRH		0x10
-#define	SPRI_SIP_C		0x08
-#define	SPRI_ATP_C		0x04
-#define	SPRI_PTPL_C		0x01
-	uint8_t flags2;
-#define	SPRI_TMV		0x80
-#define	SPRI_ALLOW_CMD_MASK	0x70
-#define	SPRI_ALLOW_CMD_SHIFT	4
-#define	SPRI_ALLOW_NA		0x00
-#define	SPRI_ALLOW_1		0x10
-#define	SPRI_ALLOW_2		0x20
-#define	SPRI_ALLOW_3		0x30
-#define	SPRI_ALLOW_4		0x40
-#define	SPRI_ALLOW_5		0x50
-#define	SPRI_PTPL_A		0x01
-	uint8_t type_mask[2];
-#define	SPRI_TM_WR_EX_AR	0x8000
-#define	SPRI_TM_EX_AC_RO	0x4000
-#define	SPRI_TM_WR_EX_RO	0x2000
-#define	SPRI_TM_EX_AC		0x0800
-#define	SPRI_TM_WR_EX		0x0200
-#define	SPRI_TM_EX_AC_AR	0x0001
-	uint8_t reserved[2];
-};
-
-struct scsi_per_res_in_rsrv_data
-{
-	uint8_t reservation[8];
-	uint8_t scope_addr[4];
-	uint8_t reserved;
-	uint8_t scopetype;
-#define	SPRT_WE    0x01
-#define	SPRT_EA    0x03
-#define	SPRT_WERO  0x05
-#define	SPRT_EARO  0x06
-#define	SPRT_WEAR  0x07
-#define	SPRT_EAAR  0x08
-	uint8_t extent_length[2];
-};
-
-struct scsi_per_res_in_rsrv
-{
-	struct scsi_per_res_in_header header;
-	struct scsi_per_res_in_rsrv_data data;
-};
-
-struct scsi_per_res_in_full_desc
-{
-	struct scsi_per_res_key res_key;
-	uint8_t reserved1[4];
-	uint8_t flags;
-#define	SPRI_FULL_ALL_TG_PT	0x02
-#define	SPRI_FULL_R_HOLDER	0x01
-	uint8_t scopetype;
-	uint8_t reserved2[4];
-	uint8_t rel_trgt_port_id[2];
-	uint8_t additional_length[4];
-	uint8_t transport_id[];
-};
-
-struct scsi_per_res_in_full
-{
-	struct scsi_per_res_in_header header;
-	struct scsi_per_res_in_full_desc desc[];
-};
-
-struct scsi_per_res_out
-{
-	u_int8_t opcode;
-	u_int8_t action;
-#define	SPRO_REGISTER		0x00
-#define	SPRO_RESERVE		0x01
-#define	SPRO_RELEASE		0x02
-#define	SPRO_CLEAR		0x03
-#define	SPRO_PREEMPT		0x04
-#define	SPRO_PRE_ABO		0x05
-#define	SPRO_REG_IGNO		0x06
-#define	SPRO_REG_MOVE		0x07
-#define	SPRO_REPL_LOST_RES	0x08
-#define	SPRO_ACTION_MASK	0x1f
-	u_int8_t scope_type;
-#define	SPR_SCOPE_MASK		0xf0
-#define	SPR_SCOPE_SHIFT		4
-#define	SPR_LU_SCOPE		0x00
-#define	SPR_EXTENT_SCOPE	0x10
-#define	SPR_ELEMENT_SCOPE	0x20
-#define	SPR_TYPE_MASK		0x0f
-#define	SPR_TYPE_RD_SHARED	0x00
-#define	SPR_TYPE_WR_EX		0x01
-#define	SPR_TYPE_RD_EX		0x02
-#define	SPR_TYPE_EX_AC		0x03
-#define	SPR_TYPE_SHARED		0x04
-#define	SPR_TYPE_WR_EX_RO	0x05
-#define	SPR_TYPE_EX_AC_RO	0x06
-#define	SPR_TYPE_WR_EX_AR	0x07
-#define	SPR_TYPE_EX_AC_AR	0x08
-	u_int8_t reserved[2];
-	u_int8_t length[4];
-	u_int8_t control;
-};
-
-struct scsi_per_res_out_parms
-{
-	struct scsi_per_res_key res_key;
-	u_int8_t serv_act_res_key[8];
-	u_int8_t scope_spec_address[4];
-	u_int8_t flags;
-#define	SPR_SPEC_I_PT		0x08
-#define	SPR_ALL_TG_PT		0x04
-#define	SPR_APTPL		0x01
-	u_int8_t reserved1;
-	u_int8_t extent_length[2];
-	u_int8_t transport_id_list[];
-};
-
-struct scsi_per_res_out_trans_ids {
-	u_int8_t additional_length[4];
-	u_int8_t transport_ids[];
-};
-
-/*
- * Used with REGISTER AND MOVE serivce action of the PERSISTENT RESERVE OUT
- * command.
- */
-struct scsi_per_res_reg_move
-{
-	struct scsi_per_res_key res_key;
-	u_int8_t serv_act_res_key[8];
-	u_int8_t reserved;
-	u_int8_t flags;
-#define	SPR_REG_MOVE_UNREG	0x02
-#define	SPR_REG_MOVE_APTPL	0x01
-	u_int8_t rel_trgt_port_id[2];
-	u_int8_t transport_id_length[4];
-	u_int8_t transport_id[];
-};
-
-struct scsi_transportid_header
-{
-	uint8_t format_protocol;
-#define	SCSI_TRN_FORMAT_MASK		0xc0
-#define	SCSI_TRN_FORMAT_SHIFT		6
-#define	SCSI_TRN_PROTO_MASK		0x0f
-};
-
-struct scsi_transportid_fcp
-{
-	uint8_t format_protocol;
-#define	SCSI_TRN_FCP_FORMAT_DEFAULT	0x00
-	uint8_t reserved1[7];
-	uint8_t n_port_name[8];
-	uint8_t reserved2[8];
-};
-
-struct scsi_transportid_spi
-{
-	uint8_t format_protocol;
-#define	SCSI_TRN_SPI_FORMAT_DEFAULT	0x00
-	uint8_t reserved1;
-	uint8_t scsi_addr[2];
-	uint8_t obsolete[2];
-	uint8_t rel_trgt_port_id[2];
-	uint8_t reserved2[16];
-};
-
-struct scsi_transportid_1394
-{
-	uint8_t format_protocol;
-#define	SCSI_TRN_1394_FORMAT_DEFAULT	0x00
-	uint8_t reserved1[7];
-	uint8_t eui64[8];
-	uint8_t reserved2[8];
-};
-
-struct scsi_transportid_rdma
-{
-	uint8_t format_protocol;
-#define	SCSI_TRN_RDMA_FORMAT_DEFAULT	0x00
-	uint8_t reserved[7];
-#define	SCSI_TRN_RDMA_PORT_LEN		16
-	uint8_t initiator_port_id[SCSI_TRN_RDMA_PORT_LEN];
-};
-
-struct scsi_transportid_iscsi_device
-{
-	uint8_t format_protocol;
-#define	SCSI_TRN_ISCSI_FORMAT_DEVICE	0x00
-	uint8_t reserved;
-	uint8_t additional_length[2];
-	uint8_t iscsi_name[];
-};
-
-struct scsi_transportid_iscsi_port
-{
-	uint8_t format_protocol;
-#define	SCSI_TRN_ISCSI_FORMAT_PORT	0x40
-	uint8_t reserved;
-	uint8_t additional_length[2];
-	uint8_t iscsi_name[];
-	/*
-	 * Followed by a separator and iSCSI initiator session ID
-	 */
-};
-
-struct scsi_transportid_sas
-{
-	uint8_t format_protocol;
-#define	SCSI_TRN_SAS_FORMAT_DEFAULT	0x00
-	uint8_t reserved1[3];
-	uint8_t sas_address[8];
-	uint8_t reserved2[12];
-};
-
-struct scsi_sop_routing_id_norm {
-	uint8_t bus;
-	uint8_t devfunc;
-#define	SCSI_TRN_SOP_BUS_MAX		0xff
-#define	SCSI_TRN_SOP_DEV_MAX		0x1f
-#define	SCSI_TRN_SOP_DEV_MASK		0xf8
-#define	SCSI_TRN_SOP_DEV_SHIFT		3
-#define	SCSI_TRN_SOP_FUNC_NORM_MASK	0x07
-#define	SCSI_TRN_SOP_FUNC_NORM_MAX	0x07
-};
-
-struct scsi_sop_routing_id_alt {
-	uint8_t bus;
-	uint8_t function;
-#define	SCSI_TRN_SOP_FUNC_ALT_MAX	0xff
-};
-
-struct scsi_transportid_sop
-{
-	uint8_t format_protocol;
-#define	SCSI_TRN_SOP_FORMAT_DEFAULT	0x00
-	uint8_t reserved1;
-	uint8_t routing_id[2];
-	uint8_t reserved2[20];
-};
-
-struct scsi_log_sense
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SLS_SP				0x01
-#define	SLS_PPC				0x02
-	u_int8_t page;
-#define	SLS_PAGE_CODE 			0x3F
-#define	SLS_SUPPORTED_PAGES_PAGE	0x00
-#define	SLS_OVERRUN_PAGE		0x01
-#define	SLS_ERROR_WRITE_PAGE		0x02
-#define	SLS_ERROR_READ_PAGE		0x03
-#define	SLS_ERROR_READREVERSE_PAGE	0x04
-#define	SLS_ERROR_VERIFY_PAGE		0x05
-#define	SLS_ERROR_NONMEDIUM_PAGE	0x06
-#define	SLS_ERROR_LASTN_PAGE		0x07
-#define	SLS_LOGICAL_BLOCK_PROVISIONING	0x0c
-#define	SLS_SELF_TEST_PAGE		0x10
-#define	SLS_STAT_AND_PERF		0x19
-#define	SLS_IE_PAGE			0x2f
-#define	SLS_PAGE_CTRL_MASK		0xC0
-#define	SLS_PAGE_CTRL_THRESHOLD		0x00
-#define	SLS_PAGE_CTRL_CUMULATIVE	0x40
-#define	SLS_PAGE_CTRL_THRESH_DEFAULT	0x80
-#define	SLS_PAGE_CTRL_CUMUL_DEFAULT	0xC0
-	u_int8_t subpage;
-#define	SLS_SUPPORTED_SUBPAGES_SUBPAGE	0xff
-	u_int8_t reserved;
-	u_int8_t paramptr[2];
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-struct scsi_log_select
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-/*	SLS_SP				0x01 */
-#define	SLS_PCR				0x02
-	u_int8_t page;
-/*	SLS_PAGE_CTRL_MASK		0xC0 */
-/*	SLS_PAGE_CTRL_THRESHOLD		0x00 */
-/*	SLS_PAGE_CTRL_CUMULATIVE	0x40 */
-/*	SLS_PAGE_CTRL_THRESH_DEFAULT	0x80 */
-/*	SLS_PAGE_CTRL_CUMUL_DEFAULT	0xC0 */
-	u_int8_t reserved[4];
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-struct scsi_log_header
-{
-	u_int8_t page;
-#define	SL_PAGE_CODE			0x3F
-#define	SL_SPF				0x40
-#define	SL_DS				0x80
-	u_int8_t subpage;
-	u_int8_t datalen[2];
-};
-
-struct scsi_log_param_header {
-	u_int8_t param_code[2];
-	u_int8_t param_control;
-#define	SLP_LP				0x01
-#define	SLP_LBIN			0x02
-#define	SLP_TMC_MASK			0x0C
-#define	SLP_TMC_ALWAYS			0x00
-#define	SLP_TMC_EQUAL			0x04
-#define	SLP_TMC_NOTEQUAL		0x08
-#define	SLP_TMC_GREATER			0x0C
-#define	SLP_ETC				0x10
-#define	SLP_TSD				0x20
-#define	SLP_DS				0x40
-#define	SLP_DU				0x80
-	u_int8_t param_len;
-};
-
-struct scsi_log_stat_and_perf {
-	struct scsi_log_param_header hdr;
-#define	SLP_SAP				0x0001
-	uint8_t	read_num[8];
-	uint8_t	write_num[8];
-	uint8_t	recvieved_lba[8];
-	uint8_t	transmitted_lba[8];
-	uint8_t	read_int[8];
-	uint8_t	write_int[8];
-	uint8_t	weighted_num[8];
-	uint8_t	weighted_int[8];
-};
-
-struct scsi_log_idle_time {
-	struct scsi_log_param_header hdr;
-#define	SLP_IT				0x0002
-	uint8_t	idle_int[8];
-};
-
-struct scsi_log_time_interval {
-	struct scsi_log_param_header hdr;
-#define	SLP_TI				0x0003
-	uint8_t	exponent[4];
-	uint8_t	integer[4];
-};
-
-struct scsi_log_fua_stat_and_perf {
-	struct scsi_log_param_header hdr;
-#define	SLP_FUA_SAP			0x0004
-	uint8_t	fua_read_num[8];
-	uint8_t	fua_write_num[8];
-	uint8_t	fuanv_read_num[8];
-	uint8_t	fuanv_write_num[8];
-	uint8_t	fua_read_int[8];
-	uint8_t	fua_write_int[8];
-	uint8_t	fuanv_read_int[8];
-	uint8_t	fuanv_write_int[8];
-};
-
-struct scsi_control_page {
-	u_int8_t page_code;
-	u_int8_t page_length;
-	u_int8_t rlec;
-#define	SCP_RLEC			0x01	/*Report Log Exception Cond*/
-#define	SCP_GLTSD			0x02	/*Global Logging target
-						  save disable */
-#define	SCP_DSENSE			0x04	/*Descriptor Sense */
-#define	SCP_DPICZ			0x08	/*Disable Prot. Info Check
-						  if Prot. Field is Zero */
-#define	SCP_TMF_ONLY			0x10	/*TM Functions Only*/
-#define	SCP_TST_MASK			0xE0	/*Task Set Type Mask*/
-#define	SCP_TST_ONE			0x00	/*One Task Set*/
-#define	SCP_TST_SEPARATE		0x20	/*Separate Task Sets*/
-	u_int8_t queue_flags;
-#define	SCP_QUEUE_ALG_MASK		0xF0
-#define	SCP_QUEUE_ALG_RESTRICTED	0x00
-#define	SCP_QUEUE_ALG_UNRESTRICTED	0x10
-#define	SCP_NUAR			0x08	/*No UA on release*/
-#define	SCP_QUEUE_ERR			0x02	/*Queued I/O aborted for CACs*/
-#define	SCP_QUEUE_DQUE			0x01	/*Queued I/O disabled*/
-	u_int8_t eca_and_aen;
-#define	SCP_EECA			0x80	/*Enable Extended CA*/
-#define	SCP_RAC				0x40	/*Report a check*/
-#define	SCP_SWP				0x08	/*Software Write Protect*/
-#define	SCP_RAENP			0x04	/*Ready AEN Permission*/
-#define	SCP_UAAENP			0x02	/*UA AEN Permission*/
-#define	SCP_EAENP			0x01	/*Error AEN Permission*/
-	u_int8_t flags4;
-#define	SCP_ATO				0x80	/*Application tag owner*/
-#define	SCP_TAS				0x40	/*Task aborted status*/
-#define	SCP_ATMPE			0x20	/*Application tag mode page*/
-#define	SCP_RWWP			0x10	/*Reject write without prot*/
-	u_int8_t aen_holdoff_period[2];
-	u_int8_t busy_timeout_period[2];
-	u_int8_t extended_selftest_completion_time[2];
-};
-
-struct scsi_cache_page {
-	u_int8_t page_code;
-#define	SCHP_PAGE_SAVABLE		0x80	/* Page is savable */
-	u_int8_t page_length;
-	u_int8_t cache_flags;
-#define	SCHP_FLAGS_WCE			0x04	/* Write Cache Enable */
-#define	SCHP_FLAGS_MF			0x02	/* Multiplication factor */
-#define	SCHP_FLAGS_RCD			0x01	/* Read Cache Disable */
-	u_int8_t rw_cache_policy;
-	u_int8_t dis_prefetch[2];
-	u_int8_t min_prefetch[2];
-	u_int8_t max_prefetch[2];
-	u_int8_t max_prefetch_ceil[2];
-};
-
-/*
- * XXX KDM
- * Updated version of the cache page, as of SBC.  Update this to SBC-3 and
- * rationalize the two.
- */
-struct scsi_caching_page {
-	uint8_t page_code;
-#define	SMS_CACHING_PAGE		0x08
-	uint8_t page_length;
-	uint8_t flags1;
-#define	SCP_IC		0x80
-#define	SCP_ABPF	0x40
-#define	SCP_CAP		0x20
-#define	SCP_DISC	0x10
-#define	SCP_SIZE	0x08
-#define	SCP_WCE		0x04
-#define	SCP_MF		0x02
-#define	SCP_RCD		0x01
-	uint8_t ret_priority;
-	uint8_t disable_pf_transfer_len[2];
-	uint8_t min_prefetch[2];
-	uint8_t max_prefetch[2];
-	uint8_t max_pf_ceiling[2];
-	uint8_t flags2;
-#define	SCP_FSW		0x80
-#define	SCP_LBCSS	0x40
-#define	SCP_DRA		0x20
-#define	SCP_VS1		0x10
-#define	SCP_VS2		0x08
-	uint8_t cache_segments;
-	uint8_t cache_seg_size[2];
-	uint8_t reserved;
-	uint8_t non_cache_seg_size[3];
-};
-
-/*
- * XXX KDM move this off to a vendor shim.
- */
-struct copan_debugconf_subpage {
-	uint8_t page_code;
-#define DBGCNF_PAGE_CODE		0x00
-	uint8_t subpage;
-#define DBGCNF_SUBPAGE_CODE	0xF0
-	uint8_t page_length[2];
-	uint8_t page_version;
-#define DBGCNF_VERSION			0x00
-	uint8_t ctl_time_io_secs[2];
-};
-
-
-struct scsi_info_exceptions_page {
-	u_int8_t page_code;
-#define	SIEP_PAGE_SAVABLE		0x80	/* Page is savable */
-	u_int8_t page_length;
-	u_int8_t info_flags;
-#define	SIEP_FLAGS_PERF			0x80
-#define	SIEP_FLAGS_EBF			0x20
-#define	SIEP_FLAGS_EWASC		0x10
-#define	SIEP_FLAGS_DEXCPT		0x08
-#define	SIEP_FLAGS_TEST			0x04
-#define	SIEP_FLAGS_EBACKERR		0x02
-#define	SIEP_FLAGS_LOGERR		0x01
-	u_int8_t mrie;
-	u_int8_t interval_timer[4];
-	u_int8_t report_count[4];
-};
-
-struct scsi_logical_block_provisioning_page_descr {
-	uint8_t flags;
-#define	SLBPPD_ENABLED		0x80
-#define	SLBPPD_TYPE_MASK	0x38
-#define	SLBPPD_ARMING_MASK	0x07
-#define	SLBPPD_ARMING_DEC	0x02
-#define	SLBPPD_ARMING_INC	0x01
-	uint8_t resource;
-	uint8_t reserved[2];
-	uint8_t count[4];
-};
-
-struct scsi_logical_block_provisioning_page {
-	uint8_t page_code;
-	uint8_t subpage_code;
-	uint8_t page_length[2];
-	uint8_t flags;
-#define	SLBPP_SITUA		0x01
-	uint8_t reserved[11];
-	struct scsi_logical_block_provisioning_page_descr descr[0];
-};
-
-/*
- * SCSI protocol identifier values, current as of SPC4r36l.
- */
-#define	SCSI_PROTO_FC		0x00	/* Fibre Channel */
-#define	SCSI_PROTO_SPI		0x01	/* Parallel SCSI */
-#define	SCSI_PROTO_SSA		0x02	/* Serial Storage Arch. */
-#define	SCSI_PROTO_1394		0x03	/* IEEE 1394 (Firewire) */
-#define	SCSI_PROTO_RDMA		0x04	/* SCSI RDMA Protocol */
-#define	SCSI_PROTO_ISCSI	0x05	/* Internet SCSI */
-#define	SCSI_PROTO_iSCSI	0x05	/* Internet SCSI */
-#define	SCSI_PROTO_SAS		0x06	/* SAS Serial SCSI Protocol */
-#define	SCSI_PROTO_ADT		0x07	/* Automation/Drive Int. Trans. Prot.*/
-#define	SCSI_PROTO_ADITP	0x07	/* Automation/Drive Int. Trans. Prot.*/
-#define	SCSI_PROTO_ATA		0x08	/* AT Attachment Interface */
-#define	SCSI_PROTO_UAS		0x09	/* USB Atached SCSI */
-#define	SCSI_PROTO_SOP		0x0a	/* SCSI over PCI Express */
-#define	SCSI_PROTO_NONE		0x0f	/* No specific protocol */
-
-struct scsi_proto_specific_page {
-	u_int8_t page_code;
-#define	SPSP_PAGE_SAVABLE		0x80	/* Page is savable */
-	u_int8_t page_length;
-	u_int8_t protocol;
-#define	SPSP_PROTO_FC			SCSI_PROTO_FC
-#define	SPSP_PROTO_SPI			SCSI_PROTO_SPI
-#define	SPSP_PROTO_SSA			SCSI_PROTO_SSA
-#define	SPSP_PROTO_1394			SCSI_PROTO_1394
-#define	SPSP_PROTO_RDMA			SCSI_PROTO_RDMA
-#define	SPSP_PROTO_ISCSI		SCSI_PROTO_ISCSI
-#define	SPSP_PROTO_SAS			SCSI_PROTO_SAS
-#define	SPSP_PROTO_ADT			SCSI_PROTO_ADITP
-#define	SPSP_PROTO_ATA			SCSI_PROTO_ATA
-#define	SPSP_PROTO_UAS			SCSI_PROTO_UAS
-#define	SPSP_PROTO_SOP			SCSI_PROTO_SOP
-#define	SPSP_PROTO_NONE			SCSI_PROTO_NONE
-};
-
-struct scsi_reserve
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SR_EXTENT	0x01
-#define	SR_ID_MASK	0x0e
-#define	SR_3RDPTY	0x10
-#define	SR_LUN_MASK	0xe0
-	u_int8_t resv_id;
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-struct scsi_reserve_10 {
-	uint8_t	opcode;
-	uint8_t	byte2;
-#define	SR10_3RDPTY	0x10
-#define	SR10_LONGID	0x02
-#define	SR10_EXTENT	0x01
-	uint8_t resv_id;
-	uint8_t thirdparty_id;
-	uint8_t reserved[3];
-	uint8_t length[2];
-	uint8_t control;
-};
-
-
-struct scsi_release
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t resv_id;
-	u_int8_t unused[1];
-	u_int8_t length;
-	u_int8_t control;
-};
-
-struct scsi_release_10 {
-	uint8_t opcode;
-	uint8_t byte2;
-	uint8_t resv_id;
-	uint8_t thirdparty_id;
-	uint8_t reserved[3];
-	uint8_t length[2];
-	uint8_t control;
-};
-
-struct scsi_prevent
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t unused[2];
-	u_int8_t how;
-	u_int8_t control;
-};
-#define	PR_PREVENT 0x01
-#define	PR_ALLOW   0x00
-
-struct scsi_sync_cache
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SSC_IMMED	0x02
-#define	SSC_RELADR	0x01
-	u_int8_t begin_lba[4];
-	u_int8_t reserved;
-	u_int8_t lb_count[2];
-	u_int8_t control;	
-};
-
-struct scsi_sync_cache_16
-{
-	uint8_t opcode;
-	uint8_t byte2;
-	uint8_t begin_lba[8];
-	uint8_t lb_count[4];
-	uint8_t reserved;
-	uint8_t control;
-};
-
-struct scsi_format {
-	uint8_t opcode;
-	uint8_t byte2;
-#define	SF_LONGLIST		0x20
-#define	SF_FMTDATA		0x10
-#define	SF_CMPLIST		0x08
-#define	SF_FORMAT_MASK		0x07
-#define	SF_FORMAT_BLOCK		0x00
-#define	SF_FORMAT_LONG_BLOCK	0x03
-#define	SF_FORMAT_BFI		0x04
-#define	SF_FORMAT_PHYS		0x05
-	uint8_t vendor;
-	uint8_t interleave[2];
-	uint8_t control;
-};
-
-struct scsi_format_header_short {
-	uint8_t reserved;
-#define	SF_DATA_FOV	0x80
-#define	SF_DATA_DPRY	0x40
-#define	SF_DATA_DCRT	0x20
-#define	SF_DATA_STPF	0x10
-#define	SF_DATA_IP	0x08
-#define	SF_DATA_DSP	0x04
-#define	SF_DATA_IMMED	0x02
-#define	SF_DATA_VS	0x01
-	uint8_t byte2;
-	uint8_t defect_list_len[2];
-};
-
-struct scsi_format_header_long {
-	uint8_t reserved;
-	uint8_t byte2;
-	uint8_t reserved2[2];
-	uint8_t defect_list_len[4];
-};
-
-struct scsi_changedef
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t unused1;
-	u_int8_t how;
-	u_int8_t unused[4];
-	u_int8_t datalen;
-	u_int8_t control;
-};
-
-struct scsi_read_buffer
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	RWB_MODE		0x1F
-#define	RWB_MODE_HDR_DATA	0x00
-#define	RWB_MODE_VENDOR		0x01
-#define	RWB_MODE_DATA		0x02
-#define	RWB_MODE_DESCR		0x03
-#define	RWB_MODE_DOWNLOAD	0x04
-#define	RWB_MODE_DOWNLOAD_SAVE	0x05
-#define	RWB_MODE_ECHO		0x0A
-#define	RWB_MODE_ECHO_DESCR	0x0B
-#define	RWB_MODE_ERROR_HISTORY	0x1C
-        u_int8_t buffer_id;
-        u_int8_t offset[3];
-        u_int8_t length[3];
-        u_int8_t control;
-};
-
-struct scsi_write_buffer
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t buffer_id;
-	u_int8_t offset[3];
-	u_int8_t length[3];
-	u_int8_t control;
-};
-
-struct scsi_read_attribute
-{
-	u_int8_t opcode;
-	u_int8_t service_action;
-#define	SRA_SA_ATTR_VALUES		0x00
-#define	SRA_SA_ATTR_LIST		0x01
-#define	SRA_SA_LOG_VOL_LIST		0x02
-#define	SRA_SA_PART_LIST		0x03
-#define	SRA_SA_RESTRICTED		0x04
-#define	SRA_SA_SUPPORTED_ATTRS		0x05
-#define	SRA_SA_MASK			0x1f
-	u_int8_t element[2];
-	u_int8_t elem_type;
-	u_int8_t logical_volume;
-	u_int8_t reserved1;
-	u_int8_t partition;
-	u_int8_t first_attribute[2];
-	u_int8_t length[4];
-	u_int8_t cache;
-#define	SRA_CACHE			0x01
-	u_int8_t control;
-};
-
-struct scsi_write_attribute
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SWA_WTC				0x01
-	u_int8_t element[3];
-	u_int8_t logical_volume;
-	u_int8_t reserved1;
-	u_int8_t partition;
-	u_int8_t reserved2[2];
-	u_int8_t length[4];
-	u_int8_t reserved3;
-	u_int8_t control;
-};
-
-
-struct scsi_read_attribute_values
-{
-	u_int8_t length[4];
-	u_int8_t attribute_0[0];
-};
-
-struct scsi_mam_attribute_header
-{
-	u_int8_t id[2];
-	/*
-	 * Attributes obtained from SPC-4r36g (section 7.4.2.2) and
-	 * SSC-4r03 (section 4.2.21). 
-	 */
-#define	SMA_ATTR_ID_DEVICE_MIN		0x0000
-
-#define	SMA_ATTR_REM_CAP_PARTITION	0x0000
-#define	SMA_ATTR_MAX_CAP_PARTITION	0x0001
-#define	SMA_ATTR_TAPEALERT_FLAGS	0x0002
-#define	SMA_ATTR_LOAD_COUNT		0x0003
-#define	SMA_ATTR_MAM_SPACE_REMAINING	0x0004
-
-#define	SMA_ATTR_DEV_ASSIGNING_ORG	0x0005
-#define	SMA_ATTR_FORMAT_DENSITY_CODE	0x0006
-#define	SMA_ATTR_INITIALIZATION_COUNT	0x0007
-#define	SMA_ATTR_VOLUME_ID		0x0008
-#define	SMA_ATTR_VOLUME_CHANGE_REF	0x0009
-
-#define	SMA_ATTR_DEV_SERIAL_LAST_LOAD	0x020a
-#define	SMA_ATTR_DEV_SERIAL_LAST_LOAD_1	0x020b
-#define	SMA_ATTR_DEV_SERIAL_LAST_LOAD_2	0x020c
-#define	SMA_ATTR_DEV_SERIAL_LAST_LOAD_3	0x020d
-
-#define	SMA_ATTR_TOTAL_MB_WRITTEN_LT	0x0220
-#define	SMA_ATTR_TOTAL_MB_READ_LT	0x0221
-#define	SMA_ATTR_TOTAL_MB_WRITTEN_CUR	0x0222
-#define	SMA_ATTR_TOTAL_MB_READ_CUR	0x0223
-#define	SMA_ATTR_FIRST_ENC_BLOCK	0x0224
-#define	SMA_ATTR_NEXT_UNENC_BLOCK	0x0225
-
-#define	SMA_ATTR_MEDIUM_USAGE_HIST	0x0340
-#define	SMA_ATTR_PART_USAGE_HIST	0x0341
-
-#define	SMA_ATTR_ID_DEVICE_MAX		0x03ff
-
-#define	SMA_ATTR_ID_MEDIUM_MIN		0x0400
-
-#define	SMA_ATTR_MED_MANUF		0x0400
-#define	SMA_ATTR_MED_SERIAL		0x0401
-
-#define	SMA_ATTR_MED_LENGTH		0x0402
-#define	SMA_ATTR_MED_WIDTH		0x0403
-#define	SMA_ATTR_MED_ASSIGNING_ORG	0x0404
-#define	SMA_ATTR_MED_DENSITY_CODE	0x0405
-
-#define	SMA_ATTR_MED_MANUF_DATE		0x0406
-#define	SMA_ATTR_MAM_CAPACITY		0x0407
-#define	SMA_ATTR_MED_TYPE		0x0408
-#define	SMA_ATTR_MED_TYPE_INFO		0x0409
-#define	SMA_ATTR_MED_SERIAL_NUM		0x040a
-
-#define	SMA_ATTR_ID_MEDIUM_MAX		0x07ff
-
-#define	SMA_ATTR_ID_HOST_MIN		0x0800
-
-#define	SMA_ATTR_APP_VENDOR		0x0800
-#define	SMA_ATTR_APP_NAME		0x0801
-#define	SMA_ATTR_APP_VERSION		0x0802
-#define	SMA_ATTR_USER_MED_TEXT_LABEL	0x0803
-#define	SMA_ATTR_LAST_WRITTEN_TIME	0x0804
-#define	SMA_ATTR_TEXT_LOCAL_ID		0x0805
-#define	SMA_ATTR_BARCODE		0x0806
-#define	SMA_ATTR_HOST_OWNER_NAME	0x0807
-#define	SMA_ATTR_MEDIA_POOL		0x0808
-#define	SMA_ATTR_PART_USER_LABEL	0x0809
-#define	SMA_ATTR_LOAD_UNLOAD_AT_PART	0x080a
-#define	SMA_ATTR_APP_FORMAT_VERSION	0x080b
-#define	SMA_ATTR_VOL_COHERENCY_INFO	0x080c
-
-#define	SMA_ATTR_ID_HOST_MAX		0x0bff
-
-#define	SMA_ATTR_VENDOR_DEVICE_MIN	0x0c00
-#define	SMA_ATTR_VENDOR_DEVICE_MAX	0x0fff
-#define	SMA_ATTR_VENDOR_MEDIUM_MIN	0x1000
-#define	SMA_ATTR_VENDOR_MEDIUM_MAX	0x13ff
-#define	SMA_ATTR_VENDOR_HOST_MIN	0x1400
-#define	SMA_ATTR_VENDOR_HOST_MAX	0x17ff
-	u_int8_t byte2;
-#define	SMA_FORMAT_BINARY	0x00
-#define	SMA_FORMAT_ASCII	0x01
-#define	SMA_FORMAT_TEXT		0x02
-#define	SMA_FORMAT_MASK		0x03
-#define	SMA_READ_ONLY		0x80
-	u_int8_t length[2];
-	u_int8_t attribute[0];
-};
-
-struct scsi_attrib_list_header {
-	u_int8_t length[4];
-	u_int8_t first_attr_0[0];
-};
-
-struct scsi_attrib_lv_list {
-	u_int8_t length[2];
-	u_int8_t first_lv_number;
-	u_int8_t num_logical_volumes;
-};
-
-struct scsi_attrib_vendser {
-	uint8_t vendor[8];
-	uint8_t serial_num[32];
-};
-
-/*
- * These values are used to decode the Volume Coherency Information
- * Attribute (0x080c) for LTFS-format coherency information.
- * Although the Application Client Specific lengths are different for
- * Version 0 and Version 1, the data is in fact the same.  The length
- * difference was due to a code bug.
- */
-#define	SCSI_LTFS_VER0_LEN	42
-#define	SCSI_LTFS_VER1_LEN	43
-#define	SCSI_LTFS_UUID_LEN	36
-#define	SCSI_LTFS_STR_NAME	"LTFS"
-#define	SCSI_LTFS_STR_LEN	4
-
-typedef enum {
-	SCSI_ATTR_FLAG_NONE		= 0x00,
-	SCSI_ATTR_FLAG_HEX		= 0x01,
-	SCSI_ATTR_FLAG_FP		= 0x02,
-	SCSI_ATTR_FLAG_DIV_10		= 0x04,
-	SCSI_ATTR_FLAG_FP_1DIGIT	= 0x08
-} scsi_attrib_flags;
-
-typedef enum {
-	SCSI_ATTR_OUTPUT_NONE		= 0x00,
-	SCSI_ATTR_OUTPUT_TEXT_MASK	= 0x03,
-	SCSI_ATTR_OUTPUT_TEXT_RAW	= 0x00,
-	SCSI_ATTR_OUTPUT_TEXT_ESC	= 0x01,
-	SCSI_ATTR_OUTPUT_TEXT_RSV1	= 0x02,
-	SCSI_ATTR_OUTPUT_TEXT_RSV2	= 0x03,
-	SCSI_ATTR_OUTPUT_NONASCII_MASK	= 0x0c,
-	SCSI_ATTR_OUTPUT_NONASCII_TRIM	= 0x00,
-	SCSI_ATTR_OUTPUT_NONASCII_ESC	= 0x04,
-	SCSI_ATTR_OUTPUT_NONASCII_RAW	= 0x08,
-	SCSI_ATTR_OUTPUT_NONASCII_RSV1	= 0x0c,
-	SCSI_ATTR_OUTPUT_FIELD_MASK	= 0xf0,
-	SCSI_ATTR_OUTPUT_FIELD_ALL	= 0xf0,
-	SCSI_ATTR_OUTPUT_FIELD_NONE	= 0x00,
-	SCSI_ATTR_OUTPUT_FIELD_DESC	= 0x10,
-	SCSI_ATTR_OUTPUT_FIELD_NUM	= 0x20,
-	SCSI_ATTR_OUTPUT_FIELD_SIZE	= 0x40,
-	SCSI_ATTR_OUTPUT_FIELD_RW	= 0x80
-} scsi_attrib_output_flags;
-
-struct sbuf;
-
-struct scsi_attrib_table_entry
-{
-	uint32_t id;
-	uint32_t flags;
-	const char *desc;
-	const char *suffix;
-	int (*to_str)(struct sbuf *sb, struct scsi_mam_attribute_header *hdr,
-		      uint32_t valid_len, uint32_t flags,
-		      uint32_t output_flags, char *error_str,
-		      int error_str_len);
-	int (*parse_str)(char *str, struct scsi_mam_attribute_header *hdr,
-			 uint32_t alloc_len, uint32_t flags, char *error_str,
-			 int error_str_len);
-};
-
-struct scsi_rw_6
-{
-	u_int8_t opcode;
-	u_int8_t addr[3];
-/* only 5 bits are valid in the MSB address byte */
-#define	SRW_TOPADDR	0x1F
-	u_int8_t length;
-	u_int8_t control;
-};
-
-struct scsi_rw_10
-{
-	u_int8_t opcode;
-#define	SRW10_RELADDR	0x01
-/* EBP defined for WRITE(10) only */
-#define	SRW10_EBP	0x04
-#define	SRW10_FUA	0x08
-#define	SRW10_DPO	0x10
-	u_int8_t byte2;
-	u_int8_t addr[4];
-	u_int8_t reserved;
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-struct scsi_rw_12
-{
-	u_int8_t opcode;
-#define	SRW12_RELADDR	0x01
-#define	SRW12_FUA	0x08
-#define	SRW12_DPO	0x10
-	u_int8_t byte2;
-	u_int8_t addr[4];
-	u_int8_t length[4];
-	u_int8_t reserved;
-	u_int8_t control;
-};
-
-struct scsi_rw_16
-{
-	u_int8_t opcode;
-#define	SRW16_RELADDR	0x01
-#define	SRW16_FUA	0x08
-#define	SRW16_DPO	0x10
-	u_int8_t byte2;
-	u_int8_t addr[8];
-	u_int8_t length[4];
-	u_int8_t reserved;
-	u_int8_t control;
-};
-
-struct scsi_write_same_10
-{
-	uint8_t	opcode;
-	uint8_t	byte2;
-#define	SWS_LBDATA	0x02
-#define	SWS_PBDATA	0x04
-#define	SWS_UNMAP	0x08
-#define	SWS_ANCHOR	0x10
-	uint8_t	addr[4];
-	uint8_t	group;
-	uint8_t	length[2];
-	uint8_t	control;
-};
-
-struct scsi_write_same_16
-{
-	uint8_t	opcode;
-	uint8_t	byte2;
-#define	SWS_NDOB	0x01
-	uint8_t	addr[8];
-	uint8_t	length[4];
-	uint8_t	group;
-	uint8_t	control;
-};
-
-struct scsi_unmap
-{
-	uint8_t	opcode;
-	uint8_t	byte2;
-#define	SU_ANCHOR	0x01
-	uint8_t	reserved[4];
-	uint8_t	group;
-	uint8_t	length[2];
-	uint8_t	control;
-};
-
-struct scsi_unmap_header
-{
-	uint8_t	length[2];
-	uint8_t	desc_length[2];
-	uint8_t	reserved[4];
-};
-
-struct scsi_unmap_desc
-{
-	uint8_t	lba[8];
-	uint8_t	length[4];
-	uint8_t	reserved[4];
-};
-
-struct scsi_write_verify_10
-{
-	uint8_t	opcode;
-	uint8_t	byte2;
-#define	SWV_BYTCHK		0x02
-#define	SWV_DPO			0x10
-#define	SWV_WRPROECT_MASK	0xe0
-	uint8_t	addr[4];
-	uint8_t	group;
-	uint8_t length[2];
-	uint8_t	control;
-};
-
-struct scsi_write_verify_12
-{
-	uint8_t	opcode;
-	uint8_t	byte2;
-	uint8_t	addr[4];
-	uint8_t	length[4];
-	uint8_t	group;
-	uint8_t	control;
-};
-
-struct scsi_write_verify_16
-{
-	uint8_t	opcode;
-	uint8_t	byte2;
-	uint8_t	addr[8];
-	uint8_t	length[4];
-	uint8_t	group;
-	uint8_t	control;
-};
-
-
-struct scsi_start_stop_unit
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SSS_IMMED		0x01
-	u_int8_t reserved[2];
-	u_int8_t how;
-#define	SSS_START		0x01
-#define	SSS_LOEJ		0x02
-#define	SSS_PC_MASK		0xf0
-#define	SSS_PC_START_VALID	0x00
-#define	SSS_PC_ACTIVE		0x10
-#define	SSS_PC_IDLE		0x20
-#define	SSS_PC_STANDBY		0x30
-#define	SSS_PC_LU_CONTROL	0x70
-#define	SSS_PC_FORCE_IDLE_0	0xa0
-#define	SSS_PC_FORCE_STANDBY_0	0xb0
-	u_int8_t control;
-};
-
-struct ata_pass_12 {
-	u_int8_t opcode;
-	u_int8_t protocol;
-#define	AP_PROTO_HARD_RESET	(0x00 << 1)
-#define	AP_PROTO_SRST		(0x01 << 1)
-#define	AP_PROTO_NON_DATA	(0x03 << 1)
-#define	AP_PROTO_PIO_IN		(0x04 << 1)
-#define	AP_PROTO_PIO_OUT	(0x05 << 1)
-#define	AP_PROTO_DMA		(0x06 << 1)
-#define	AP_PROTO_DMA_QUEUED	(0x07 << 1)
-#define	AP_PROTO_DEVICE_DIAG	(0x08 << 1)
-#define	AP_PROTO_DEVICE_RESET	(0x09 << 1)
-#define	AP_PROTO_UDMA_IN	(0x0a << 1)
-#define	AP_PROTO_UDMA_OUT	(0x0b << 1)
-#define	AP_PROTO_FPDMA		(0x0c << 1)
-#define	AP_PROTO_RESP_INFO	(0x0f << 1)
-#define	AP_MULTI	0xe0
-	u_int8_t flags;
-#define	AP_T_LEN	0x03
-#define	AP_BB		0x04
-#define	AP_T_DIR	0x08
-#define	AP_CK_COND	0x20
-#define	AP_OFFLINE	0x60
-	u_int8_t features;
-	u_int8_t sector_count;
-	u_int8_t lba_low;
-	u_int8_t lba_mid;
-	u_int8_t lba_high;
-	u_int8_t device;
-	u_int8_t command;
-	u_int8_t reserved;
-	u_int8_t control;
-};
-
-struct scsi_maintenance_in
-{
-        uint8_t  opcode;
-        uint8_t  byte2;
-#define SERVICE_ACTION_MASK  0x1f
-#define SA_RPRT_TRGT_GRP     0x0a
-        uint8_t  reserved[4];
-	uint8_t  length[4];
-	uint8_t  reserved1;
-	uint8_t  control;
-};
-
-struct scsi_report_supported_opcodes
-{
-        uint8_t  opcode;
-        uint8_t  service_action;
-        uint8_t  options;
-#define RSO_RCTD		0x80
-#define RSO_OPTIONS_MASK	0x07
-#define RSO_OPTIONS_ALL		0x00
-#define RSO_OPTIONS_OC		0x01
-#define RSO_OPTIONS_OC_SA	0x02
-        uint8_t  requested_opcode;
-        uint8_t  requested_service_action[2];
-	uint8_t  length[4];
-	uint8_t  reserved1;
-	uint8_t  control;
-};
-
-struct scsi_report_supported_opcodes_timeout
-{
-	uint8_t  length[2];
-	uint8_t  reserved;
-	uint8_t  cmd_specific;
-	uint8_t  nominal_time[4];
-	uint8_t  recommended_time[4];
-};
-
-struct scsi_report_supported_opcodes_descr
-{
-	uint8_t  opcode;
-	uint8_t  reserved;
-	uint8_t  service_action[2];
-	uint8_t  reserved2;
-	uint8_t  flags;
-#define RSO_SERVACTV		0x01
-#define RSO_CTDP		0x02
-	uint8_t  cdb_length[2];
-	struct scsi_report_supported_opcodes_timeout timeout[0];
-};
-
-struct scsi_report_supported_opcodes_all
-{
-	uint8_t  length[4];
-	struct scsi_report_supported_opcodes_descr descr[0];
-};
-
-struct scsi_report_supported_opcodes_one
-{
-	uint8_t  reserved;
-	uint8_t  support;
-#define RSO_ONE_CTDP		0x80
-	uint8_t  cdb_length[2];
-	uint8_t  cdb_usage[];
-};
-
-struct scsi_report_supported_tmf
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-	uint8_t  reserved[4];
-	uint8_t  length[4];
-	uint8_t  reserved1;
-	uint8_t  control;
-};
-
-struct scsi_report_supported_tmf_data
-{
-	uint8_t  byte1;
-#define RST_WAKES		0x01
-#define RST_TRS			0x02
-#define RST_QTS			0x04
-#define RST_LURS		0x08
-#define RST_CTSS		0x10
-#define RST_CACAS		0x20
-#define RST_ATSS		0x40
-#define RST_ATS			0x80
-	uint8_t  byte2;
-#define RST_ITNRS		0x01
-#define RST_QTSS		0x02
-#define RST_QAES		0x04
-	uint8_t  reserved[2];
-};
-
-struct scsi_report_timestamp
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-	uint8_t  reserved[4];
-	uint8_t  length[4];
-	uint8_t  reserved1;
-	uint8_t  control;
-};
-
-struct scsi_report_timestamp_data
-{
-	uint8_t  length[2];
-	uint8_t  origin;
-#define RTS_ORIG_MASK		0x00
-#define RTS_ORIG_ZERO		0x00
-#define RTS_ORIG_SET		0x02
-#define RTS_ORIG_OUTSIDE	0x03
-	uint8_t  reserved;
-	uint8_t  timestamp[6];
-	uint8_t  reserve2[2];
-};
-
-struct scsi_receive_copy_status_lid1
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define RCS_RCS_LID1		0x00
-	uint8_t  list_identifier;
-	uint8_t  reserved[7];
-	uint8_t  length[4];
-	uint8_t  reserved1;
-	uint8_t  control;
-};
-
-struct scsi_receive_copy_status_lid1_data
-{
-	uint8_t  available_data[4];
-	uint8_t  copy_command_status;
-#define RCS_CCS_INPROG		0x00
-#define RCS_CCS_COMPLETED	0x01
-#define RCS_CCS_ERROR		0x02
-	uint8_t  segments_processed[2];
-	uint8_t  transfer_count_units;
-#define RCS_TC_BYTES		0x00
-#define RCS_TC_KBYTES		0x01
-#define RCS_TC_MBYTES		0x02
-#define RCS_TC_GBYTES		0x03
-#define RCS_TC_TBYTES		0x04
-#define RCS_TC_PBYTES		0x05
-#define RCS_TC_EBYTES		0x06
-#define RCS_TC_LBAS		0xf1
-	uint8_t  transfer_count[4];
-};
-
-struct scsi_receive_copy_failure_details
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define RCS_RCFD		0x04
-	uint8_t  list_identifier;
-	uint8_t  reserved[7];
-	uint8_t  length[4];
-	uint8_t  reserved1;
-	uint8_t  control;
-};
-
-struct scsi_receive_copy_failure_details_data
-{
-	uint8_t  available_data[4];
-	uint8_t  reserved[52];
-	uint8_t  copy_command_status;
-	uint8_t  reserved2;
-	uint8_t  sense_data_length[2];
-	uint8_t  sense_data[];
-};
-
-struct scsi_receive_copy_status_lid4
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define RCS_RCS_LID4		0x05
-	uint8_t  list_identifier[4];
-	uint8_t  reserved[4];
-	uint8_t  length[4];
-	uint8_t  reserved1;
-	uint8_t  control;
-};
-
-struct scsi_receive_copy_status_lid4_data
-{
-	uint8_t  available_data[4];
-	uint8_t  response_to_service_action;
-	uint8_t  copy_command_status;
-#define RCS_CCS_COMPLETED_PROD	0x03
-#define RCS_CCS_COMPLETED_RESID	0x04
-#define RCS_CCS_INPROG_FGBG	0x10
-#define RCS_CCS_INPROG_FG	0x11
-#define RCS_CCS_INPROG_BG	0x12
-#define RCS_CCS_ABORTED		0x60
-	uint8_t  operation_counter[2];
-	uint8_t  estimated_status_update_delay[4];
-	uint8_t  extended_copy_completion_status;
-	uint8_t  length_of_the_sense_data_field;
-	uint8_t  sense_data_length;
-	uint8_t  transfer_count_units;
-	uint8_t  transfer_count[8];
-	uint8_t  segments_processed[2];
-	uint8_t  reserved[6];
-	uint8_t  sense_data[];
-};
-
-struct scsi_receive_copy_operating_parameters
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define RCS_RCOP		0x03
-	uint8_t  reserved[8];
-	uint8_t  length[4];
-	uint8_t  reserved1;
-	uint8_t  control;
-};
-
-struct scsi_receive_copy_operating_parameters_data
-{
-	uint8_t  length[4];
-	uint8_t  snlid;
-#define RCOP_SNLID		0x01
-	uint8_t  reserved[3];
-	uint8_t  maximum_cscd_descriptor_count[2];
-	uint8_t  maximum_segment_descriptor_count[2];
-	uint8_t  maximum_descriptor_list_length[4];
-	uint8_t  maximum_segment_length[4];
-	uint8_t  maximum_inline_data_length[4];
-	uint8_t  held_data_limit[4];
-	uint8_t  maximum_stream_device_transfer_size[4];
-	uint8_t  reserved2[2];
-	uint8_t  total_concurrent_copies[2];
-	uint8_t  maximum_concurrent_copies;
-	uint8_t  data_segment_granularity;
-	uint8_t  inline_data_granularity;
-	uint8_t  held_data_granularity;
-	uint8_t  reserved3[3];
-	uint8_t  implemented_descriptor_list_length;
-	uint8_t  list_of_implemented_descriptor_type_codes[0];
-};
-
-struct scsi_extended_copy
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define EC_EC_LID1		0x00
-#define EC_EC_LID4		0x01
-	uint8_t  reserved[8];
-	uint8_t  length[4];
-	uint8_t  reserved1;
-	uint8_t  control;
-};
-
-struct scsi_ec_cscd_dtsp
-{
-	uint8_t  flags;
-#define EC_CSCD_FIXED		0x01
-#define EC_CSCD_PAD		0x04
-	uint8_t  block_length[3];
-};
-
-struct scsi_ec_cscd
-{
-	uint8_t  type_code;
-#define EC_CSCD_EXT		0xff
-	uint8_t  luidt_pdt;
-#define EC_LUIDT_MASK		0xc0
-#define EC_LUIDT_LUN		0x00
-#define EC_LUIDT_PROXY_TOKEN	0x40
-	uint8_t  relative_initiator_port[2];
-	uint8_t  cscd_params[24];
-	struct scsi_ec_cscd_dtsp dtsp;
-};
-
-struct scsi_ec_cscd_id
-{
-	uint8_t  type_code;
-#define EC_CSCD_ID		0xe4
-	uint8_t  luidt_pdt;
-	uint8_t  relative_initiator_port[2];
-	uint8_t  codeset;
-	uint8_t  id_type;
-	uint8_t  reserved;
-	uint8_t  length;
-	uint8_t  designator[20];
-	struct scsi_ec_cscd_dtsp dtsp;
-};
-
-struct scsi_ec_segment
-{
-	uint8_t  type_code;
-	uint8_t  flags;
-#define EC_SEG_DC		0x02
-#define EC_SEG_CAT		0x01
-	uint8_t  descr_length[2];
-	uint8_t  params[];
-};
-
-struct scsi_ec_segment_b2b
-{
-	uint8_t  type_code;
-#define EC_SEG_B2B		0x02
-	uint8_t  flags;
-	uint8_t  descr_length[2];
-	uint8_t  src_cscd[2];
-	uint8_t  dst_cscd[2];
-	uint8_t  reserved[2];
-	uint8_t  number_of_blocks[2];
-	uint8_t  src_lba[8];
-	uint8_t  dst_lba[8];
-};
-
-struct scsi_ec_segment_verify
-{
-	uint8_t  type_code;
-#define EC_SEG_VERIFY		0x07
-	uint8_t  reserved;
-	uint8_t  descr_length[2];
-	uint8_t  src_cscd[2];
-	uint8_t  reserved2[2];
-	uint8_t  tur;
-	uint8_t  reserved3[3];
-};
-
-struct scsi_ec_segment_register_key
-{
-	uint8_t  type_code;
-#define EC_SEG_REGISTER_KEY	0x14
-	uint8_t  reserved;
-	uint8_t  descr_length[2];
-	uint8_t  reserved2[2];
-	uint8_t  dst_cscd[2];
-	uint8_t  res_key[8];
-	uint8_t  sa_res_key[8];
-	uint8_t  reserved3[4];
-};
-
-struct scsi_extended_copy_lid1_data
-{
-	uint8_t  list_identifier;
-	uint8_t  flags;
-#define EC_PRIORITY		0x07
-#define EC_LIST_ID_USAGE_MASK	0x18
-#define EC_LIST_ID_USAGE_FULL	0x08
-#define EC_LIST_ID_USAGE_NOHOLD	0x10
-#define EC_LIST_ID_USAGE_NONE	0x18
-#define EC_STR			0x20
-	uint8_t  cscd_list_length[2];
-	uint8_t  reserved[4];
-	uint8_t  segment_list_length[4];
-	uint8_t  inline_data_length[4];
-	uint8_t  data[];
-};
-
-struct scsi_extended_copy_lid4_data
-{
-	uint8_t  list_format;
-#define EC_LIST_FORMAT		0x01
-	uint8_t  flags;
-	uint8_t  header_cscd_list_length[2];
-	uint8_t  reserved[11];
-	uint8_t  flags2;
-#define EC_IMMED		0x01
-#define EC_G_SENSE		0x02
-	uint8_t  header_cscd_type_code;
-	uint8_t  reserved2[3];
-	uint8_t  list_identifier[4];
-	uint8_t  reserved3[18];
-	uint8_t  cscd_list_length[2];
-	uint8_t  segment_list_length[2];
-	uint8_t  inline_data_length[2];
-	uint8_t  data[];
-};
-
-struct scsi_copy_operation_abort
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define EC_COA			0x1c
-	uint8_t  list_identifier[4];
-	uint8_t  reserved[9];
-	uint8_t  control;
-};
-
-struct scsi_populate_token
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define EC_PT			0x10
-	uint8_t  reserved[4];
-	uint8_t  list_identifier[4];
-	uint8_t  length[4];
-	uint8_t  group_number;
-	uint8_t  control;
-};
-
-struct scsi_range_desc
-{
-	uint8_t	lba[8];
-	uint8_t	length[4];
-	uint8_t	reserved[4];
-};
-
-struct scsi_populate_token_data
-{
-	uint8_t  length[2];
-	uint8_t  flags;
-#define EC_PT_IMMED			0x01
-#define EC_PT_RTV			0x02
-	uint8_t  reserved;
-	uint8_t  inactivity_timeout[4];
-	uint8_t  rod_type[4];
-	uint8_t  reserved2[2];
-	uint8_t  range_descriptor_length[2];
-	struct scsi_range_desc desc[];
-};
-
-struct scsi_write_using_token
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define EC_WUT			0x11
-	uint8_t  reserved[4];
-	uint8_t  list_identifier[4];
-	uint8_t  length[4];
-	uint8_t  group_number;
-	uint8_t  control;
-};
-
-struct scsi_write_using_token_data
-{
-	uint8_t  length[2];
-	uint8_t  flags;
-#define EC_WUT_IMMED			0x01
-#define EC_WUT_DEL_TKN			0x02
-	uint8_t  reserved[5];
-	uint8_t  offset_into_rod[8];
-	uint8_t  rod_token[512];
-	uint8_t  reserved2[6];
-	uint8_t  range_descriptor_length[2];
-	struct scsi_range_desc desc[];
-};
-
-struct scsi_receive_rod_token_information
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define RCS_RRTI		0x07
-	uint8_t  list_identifier[4];
-	uint8_t  reserved[4];
-	uint8_t  length[4];
-	uint8_t  reserved2;
-	uint8_t  control;
-};
-
-struct scsi_token
-{
-	uint8_t  type[4];
-#define ROD_TYPE_INTERNAL	0x00000000
-#define ROD_TYPE_AUR		0x00010000
-#define ROD_TYPE_PIT_DEF	0x00800000
-#define ROD_TYPE_PIT_VULN	0x00800001
-#define ROD_TYPE_PIT_PERS	0x00800002
-#define ROD_TYPE_PIT_ANY	0x0080FFFF
-#define ROD_TYPE_BLOCK_ZERO	0xFFFF0001
-	uint8_t  reserved[2];
-	uint8_t  length[2];
-	uint8_t  body[0];
-};
-
-struct scsi_report_all_rod_tokens
-{
-	uint8_t  opcode;
-	uint8_t  service_action;
-#define RCS_RART		0x08
-	uint8_t  reserved[8];
-	uint8_t  length[4];
-	uint8_t  reserved2;
-	uint8_t  control;
-};
-
-struct scsi_report_all_rod_tokens_data
-{
-	uint8_t  available_data[4];
-	uint8_t  reserved[4];
-	uint8_t  rod_management_token_list[];
-};
-
-struct ata_pass_16 {
-	u_int8_t opcode;
-	u_int8_t protocol;
-#define	AP_EXTEND	0x01
-	u_int8_t flags;
-#define	AP_FLAG_TLEN_NO_DATA	(0 << 0)
-#define	AP_FLAG_TLEN_FEAT	(1 << 0)
-#define	AP_FLAG_TLEN_SECT_CNT	(2 << 0)
-#define	AP_FLAG_TLEN_STPSIU	(3 << 0)
-#define	AP_FLAG_BYT_BLOK_BYTES	(0 << 2)  
-#define	AP_FLAG_BYT_BLOK_BLOCKS	(1 << 2)  
-#define	AP_FLAG_TDIR_TO_DEV	(0 << 3)  
-#define	AP_FLAG_TDIR_FROM_DEV	(1 << 3)  
-#define	AP_FLAG_CHK_COND	(1 << 5)  
-	u_int8_t features_ext;
-	u_int8_t features;
-	u_int8_t sector_count_ext;
-	u_int8_t sector_count;
-	u_int8_t lba_low_ext;
-	u_int8_t lba_low;
-	u_int8_t lba_mid_ext;
-	u_int8_t lba_mid;
-	u_int8_t lba_high_ext;
-	u_int8_t lba_high;
-	u_int8_t device;
-	u_int8_t command;
-	u_int8_t control;
-};
-
-#define	SC_SCSI_1 0x01
-#define	SC_SCSI_2 0x03
-
-/*
- * Opcodes
- */
-
-#define	TEST_UNIT_READY		0x00
-#define	REQUEST_SENSE		0x03
-#define	READ_6			0x08
-#define	WRITE_6			0x0A
-#define	INQUIRY			0x12
-#define	MODE_SELECT_6		0x15
-#define	MODE_SENSE_6		0x1A
-#define	START_STOP_UNIT		0x1B
-#define	START_STOP		0x1B
-#define	RESERVE      		0x16
-#define	RELEASE      		0x17
-#define	RECEIVE_DIAGNOSTIC	0x1C
-#define	SEND_DIAGNOSTIC		0x1D
-#define	PREVENT_ALLOW		0x1E
-#define	READ_CAPACITY		0x25
-#define	READ_10			0x28
-#define	WRITE_10		0x2A
-#define	POSITION_TO_ELEMENT	0x2B
-#define	WRITE_VERIFY_10		0x2E
-#define	VERIFY_10		0x2F
-#define	SYNCHRONIZE_CACHE	0x35
-#define	READ_DEFECT_DATA_10	0x37
-#define	WRITE_BUFFER            0x3B
-#define	READ_BUFFER             0x3C
-#define	CHANGE_DEFINITION	0x40
-#define	WRITE_SAME_10		0x41
-#define	UNMAP			0x42
-#define	LOG_SELECT		0x4C
-#define	LOG_SENSE		0x4D
-#define	MODE_SELECT_10		0x55
-#define	RESERVE_10		0x56
-#define	RELEASE_10		0x57
-#define	MODE_SENSE_10		0x5A
-#define	PERSISTENT_RES_IN	0x5E
-#define	PERSISTENT_RES_OUT	0x5F
-#define	EXTENDED_COPY		0x83
-#define	RECEIVE_COPY_STATUS	0x84
-#define	ATA_PASS_16		0x85
-#define	READ_16			0x88
-#define	COMPARE_AND_WRITE	0x89
-#define	WRITE_16		0x8A
-#define	READ_ATTRIBUTE		0x8C
-#define	WRITE_ATTRIBUTE		0x8D
-#define	WRITE_VERIFY_16		0x8E
-#define	VERIFY_16		0x8F
-#define	SYNCHRONIZE_CACHE_16	0x91
-#define	WRITE_SAME_16		0x93
-#define	WRITE_ATOMIC_16		0x9C
-#define	SERVICE_ACTION_IN	0x9E
-#define	REPORT_LUNS		0xA0
-#define	ATA_PASS_12		0xA1
-#define	SECURITY_PROTOCOL_IN	0xA2
-#define	MAINTENANCE_IN		0xA3
-#define	MAINTENANCE_OUT		0xA4
-#define	MOVE_MEDIUM     	0xA5
-#define	READ_12			0xA8
-#define	WRITE_12		0xAA
-#define	WRITE_VERIFY_12		0xAE
-#define	VERIFY_12		0xAF
-#define	SECURITY_PROTOCOL_OUT	0xB5
-#define	READ_ELEMENT_STATUS	0xB8
-#define	READ_CD			0xBE
-
-/* Maintenance In Service Action Codes */
-#define	REPORT_IDENTIFYING_INFRMATION		0x05
-#define	REPORT_TARGET_PORT_GROUPS		0x0A
-#define	REPORT_ALIASES				0x0B
-#define	REPORT_SUPPORTED_OPERATION_CODES	0x0C
-#define	REPORT_SUPPORTED_TASK_MANAGEMENT_FUNCTIONS	0x0D
-#define	REPORT_PRIORITY				0x0E
-#define	REPORT_TIMESTAMP			0x0F
-#define	MANAGEMENT_PROTOCOL_IN			0x10
-/* Maintenance Out Service Action Codes */
-#define	SET_IDENTIFY_INFORMATION		0x06
-#define	SET_TARGET_PORT_GROUPS			0x0A
-#define	CHANGE_ALIASES				0x0B
-#define	SET_PRIORITY				0x0E
-#define	SET_TIMESTAMP				0x0F
-#define	MANGAEMENT_PROTOCOL_OUT			0x10
-
-/*
- * Device Types
- */
-#define	T_DIRECT	0x00
-#define	T_SEQUENTIAL	0x01
-#define	T_PRINTER	0x02
-#define	T_PROCESSOR	0x03
-#define	T_WORM		0x04
-#define	T_CDROM		0x05
-#define	T_SCANNER	0x06
-#define	T_OPTICAL 	0x07
-#define	T_CHANGER	0x08
-#define	T_COMM		0x09
-#define	T_ASC0		0x0a
-#define	T_ASC1		0x0b
-#define	T_STORARRAY	0x0c
-#define	T_ENCLOSURE	0x0d
-#define	T_RBC		0x0e
-#define	T_OCRW		0x0f
-#define	T_OSD		0x11
-#define	T_ADC		0x12
-#define	T_NODEVICE	0x1f
-#define	T_ANY		0xff	/* Used in Quirk table matches */
-
-#define	T_REMOV		1
-#define	T_FIXED		0
-
-/*
- * This length is the initial inquiry length used by the probe code, as    
- * well as the length necessary for scsi_print_inquiry() to function 
- * correctly.  If either use requires a different length in the future, 
- * the two values should be de-coupled.
- */
-#define	SHORT_INQUIRY_LENGTH	36
-
-struct scsi_inquiry_data
-{
-	u_int8_t device;
-#define	SID_TYPE(inq_data) ((inq_data)->device & 0x1f)
-#define	SID_QUAL(inq_data) (((inq_data)->device & 0xE0) >> 5)
-#define	SID_QUAL_LU_CONNECTED	0x00	/*
-					 * The specified peripheral device
-					 * type is currently connected to
-					 * logical unit.  If the target cannot
-					 * determine whether or not a physical
-					 * device is currently connected, it
-					 * shall also use this peripheral
-					 * qualifier when returning the INQUIRY
-					 * data.  This peripheral qualifier
-					 * does not mean that the device is
-					 * ready for access by the initiator.
-					 */
-#define	SID_QUAL_LU_OFFLINE	0x01	/*
-					 * The target is capable of supporting
-					 * the specified peripheral device type
-					 * on this logical unit; however, the
-					 * physical device is not currently
-					 * connected to this logical unit.
-					 */
-#define	SID_QUAL_RSVD		0x02
-#define	SID_QUAL_BAD_LU		0x03	/*
-					 * The target is not capable of
-					 * supporting a physical device on
-					 * this logical unit. For this
-					 * peripheral qualifier the peripheral
-					 * device type shall be set to 1Fh to
-					 * provide compatibility with previous
-					 * versions of SCSI. All other
-					 * peripheral device type values are
-					 * reserved for this peripheral
-					 * qualifier.
-					 */
-#define	SID_QUAL_IS_VENDOR_UNIQUE(inq_data) ((SID_QUAL(inq_data) & 0x04) != 0)
-	u_int8_t dev_qual2;
-#define	SID_QUAL2	0x7F
-#define	SID_LU_CONG	0x40
-#define	SID_RMB		0x80
-#define	SID_IS_REMOVABLE(inq_data) (((inq_data)->dev_qual2 & SID_RMB) != 0)
-	u_int8_t version;
-#define	SID_ANSI_REV(inq_data) ((inq_data)->version & 0x07)
-#define		SCSI_REV_0		0
-#define		SCSI_REV_CCS		1
-#define		SCSI_REV_2		2
-#define		SCSI_REV_SPC		3
-#define		SCSI_REV_SPC2		4
-#define		SCSI_REV_SPC3		5
-#define		SCSI_REV_SPC4		6
-
-#define	SID_ECMA	0x38
-#define	SID_ISO		0xC0
-	u_int8_t response_format;
-#define	SID_AENC	0x80
-#define	SID_TrmIOP	0x40
-#define	SID_NormACA	0x20
-#define	SID_HiSup	0x10
-	u_int8_t additional_length;
-#define	SID_ADDITIONAL_LENGTH(iqd)					\
-	((iqd)->additional_length +					\
-	__offsetof(struct scsi_inquiry_data, additional_length) + 1)
-	u_int8_t spc3_flags;
-#define	SPC3_SID_PROTECT	0x01
-#define	SPC3_SID_3PC		0x08
-#define	SPC3_SID_TPGS_MASK	0x30
-#define	SPC3_SID_TPGS_IMPLICIT	0x10
-#define	SPC3_SID_TPGS_EXPLICIT	0x20
-#define	SPC3_SID_ACC		0x40
-#define	SPC3_SID_SCCS		0x80
-	u_int8_t spc2_flags;
-#define	SPC2_SID_ADDR16		0x01
-#define	SPC2_SID_MChngr 	0x08
-#define	SPC2_SID_MultiP 	0x10
-#define	SPC2_SID_EncServ	0x40
-#define	SPC2_SID_BQueue		0x80
-
-#define	INQ_DATA_TQ_ENABLED(iqd)				\
-    ((SID_ANSI_REV(iqd) < SCSI_REV_SPC2)? ((iqd)->flags & SID_CmdQue) :	\
-    (((iqd)->flags & SID_CmdQue) && !((iqd)->spc2_flags & SPC2_SID_BQueue)) || \
-    (!((iqd)->flags & SID_CmdQue) && ((iqd)->spc2_flags & SPC2_SID_BQueue)))
-
-	u_int8_t flags;
-#define	SID_SftRe	0x01
-#define	SID_CmdQue	0x02
-#define	SID_Linked	0x08
-#define	SID_Sync	0x10
-#define	SID_WBus16	0x20
-#define	SID_WBus32	0x40
-#define	SID_RelAdr	0x80
-#define	SID_VENDOR_SIZE   8
-	char	 vendor[SID_VENDOR_SIZE];
-#define	SID_PRODUCT_SIZE  16
-	char	 product[SID_PRODUCT_SIZE];
-#define	SID_REVISION_SIZE 4
-	char	 revision[SID_REVISION_SIZE];
-	/*
-	 * The following fields were taken from SCSI Primary Commands - 2
-	 * (SPC-2) Revision 14, Dated 11 November 1999
-	 */
-#define	SID_VENDOR_SPECIFIC_0_SIZE	20
-	u_int8_t vendor_specific0[SID_VENDOR_SPECIFIC_0_SIZE];
-	/*
-	 * An extension of SCSI Parallel Specific Values
-	 */
-#define	SID_SPI_IUS		0x01
-#define	SID_SPI_QAS		0x02
-#define	SID_SPI_CLOCK_ST	0x00
-#define	SID_SPI_CLOCK_DT	0x04
-#define	SID_SPI_CLOCK_DT_ST	0x0C
-#define	SID_SPI_MASK		0x0F
-	u_int8_t spi3data;
-	u_int8_t reserved2;
-	/*
-	 * Version Descriptors, stored 2 byte values.
-	 */
-	u_int8_t version1[2];
-	u_int8_t version2[2];
-	u_int8_t version3[2];
-	u_int8_t version4[2];
-	u_int8_t version5[2];
-	u_int8_t version6[2];
-	u_int8_t version7[2];
-	u_int8_t version8[2];
-
-	u_int8_t reserved3[22];
-
-#define	SID_VENDOR_SPECIFIC_1_SIZE	160
-	u_int8_t vendor_specific1[SID_VENDOR_SPECIFIC_1_SIZE];
-};
-
-/*
- * This structure is more suited to initiator operation, because the
- * maximum number of supported pages is already allocated.
- */
-struct scsi_vpd_supported_page_list
-{
-	u_int8_t device;
-	u_int8_t page_code;
-#define	SVPD_SUPPORTED_PAGE_LIST	0x00
-#define	SVPD_SUPPORTED_PAGES_HDR_LEN	4
-	u_int8_t reserved;
-	u_int8_t length;	/* number of VPD entries */
-#define	SVPD_SUPPORTED_PAGES_SIZE	251
-	u_int8_t list[SVPD_SUPPORTED_PAGES_SIZE];
-};
-
-/*
- * This structure is more suited to target operation, because the
- * number of supported pages is left to the user to allocate.
- */
-struct scsi_vpd_supported_pages
-{
-	u_int8_t device;
-	u_int8_t page_code;
-	u_int8_t reserved;
-#define	SVPD_SUPPORTED_PAGES	0x00
-	u_int8_t length;
-	u_int8_t page_list[0];
-};
-
-
-struct scsi_vpd_unit_serial_number
-{
-	u_int8_t device;
-	u_int8_t page_code;
-#define	SVPD_UNIT_SERIAL_NUMBER	0x80
-	u_int8_t reserved;
-	u_int8_t length; /* serial number length */
-#define	SVPD_SERIAL_NUM_SIZE 251
-	u_int8_t serial_num[SVPD_SERIAL_NUM_SIZE];
-};
-
-struct scsi_vpd_device_id
-{
-	u_int8_t device;
-	u_int8_t page_code;
-#define	SVPD_DEVICE_ID			0x83
-#define	SVPD_DEVICE_ID_MAX_SIZE		252
-#define	SVPD_DEVICE_ID_HDR_LEN \
-    __offsetof(struct scsi_vpd_device_id, desc_list)
-	u_int8_t length[2];
-	u_int8_t desc_list[];
-};
-
-struct scsi_vpd_id_descriptor
-{
-	u_int8_t	proto_codeset;
-	/*
-	 * See the SCSI_PROTO definitions above for the protocols.
-	 */
-#define	SVPD_ID_PROTO_SHIFT	4
-#define	SVPD_ID_CODESET_BINARY	0x01
-#define	SVPD_ID_CODESET_ASCII	0x02
-#define	SVPD_ID_CODESET_UTF8	0x03
-#define	SVPD_ID_CODESET_MASK	0x0f
-	u_int8_t	id_type;
-#define	SVPD_ID_PIV		0x80
-#define	SVPD_ID_ASSOC_LUN	0x00
-#define	SVPD_ID_ASSOC_PORT	0x10
-#define	SVPD_ID_ASSOC_TARGET	0x20
-#define	SVPD_ID_ASSOC_MASK	0x30
-#define	SVPD_ID_TYPE_VENDOR	0x00
-#define	SVPD_ID_TYPE_T10	0x01
-#define	SVPD_ID_TYPE_EUI64	0x02
-#define	SVPD_ID_TYPE_NAA	0x03
-#define	SVPD_ID_TYPE_RELTARG	0x04
-#define	SVPD_ID_TYPE_TPORTGRP	0x05
-#define	SVPD_ID_TYPE_LUNGRP	0x06
-#define	SVPD_ID_TYPE_MD5_LUN_ID	0x07
-#define	SVPD_ID_TYPE_SCSI_NAME	0x08
-#define	SVPD_ID_TYPE_MASK	0x0f
-	u_int8_t	reserved;
-	u_int8_t	length;
-#define	SVPD_DEVICE_ID_DESC_HDR_LEN \
-    __offsetof(struct scsi_vpd_id_descriptor, identifier) 
-	u_int8_t	identifier[];
-};
-
-struct scsi_vpd_id_t10
-{
-	u_int8_t	vendor[8];
-	u_int8_t	vendor_spec_id[0];
-};
-
-struct scsi_vpd_id_eui64
-{
-	u_int8_t	ieee_company_id[3];
-	u_int8_t	extension_id[5];
-};
-
-struct scsi_vpd_id_naa_basic
-{
-	uint8_t naa;
-	/* big endian, packed:
-	uint8_t	naa : 4;
-	uint8_t naa_desig : 4;
-	*/
-#define	SVPD_ID_NAA_NAA_SHIFT		4
-#define	SVPD_ID_NAA_IEEE_EXT		0x02
-#define	SVPD_ID_NAA_LOCAL_REG		0x03
-#define	SVPD_ID_NAA_IEEE_REG		0x05
-#define	SVPD_ID_NAA_IEEE_REG_EXT	0x06
-	uint8_t	naa_data[];
-};
-
-struct scsi_vpd_id_naa_ieee_extended_id
-{
-	uint8_t naa;
-	uint8_t vendor_specific_id_a;
-	uint8_t ieee_company_id[3];
-	uint8_t vendor_specific_id_b[4];
-};
-
-struct scsi_vpd_id_naa_local_reg
-{
-	uint8_t naa;
-	uint8_t local_value[7];
-};
-
-struct scsi_vpd_id_naa_ieee_reg
-{
-	uint8_t naa;
-	uint8_t reg_value[7];
-	/* big endian, packed:
-	uint8_t naa_basic : 4;
-	uint8_t ieee_company_id_0 : 4;
-	uint8_t ieee_company_id_1[2];
-	uint8_t ieee_company_id_2 : 4;
-	uint8_t vendor_specific_id_0 : 4;
-	uint8_t vendor_specific_id_1[4];
-	*/
-};
-
-struct scsi_vpd_id_naa_ieee_reg_extended
-{
-	uint8_t naa;
-	uint8_t reg_value[15];
-	/* big endian, packed:
-	uint8_t naa_basic : 4;
-	uint8_t ieee_company_id_0 : 4;
-	uint8_t ieee_company_id_1[2];
-	uint8_t ieee_company_id_2 : 4;
-	uint8_t vendor_specific_id_0 : 4;
-	uint8_t vendor_specific_id_1[4];
-	uint8_t vendor_specific_id_ext[8];
-	*/
-};
-
-struct scsi_vpd_id_rel_trgt_port_id
-{
-	uint8_t obsolete[2];
-	uint8_t rel_trgt_port_id[2];
-};
-
-struct scsi_vpd_id_trgt_port_grp_id
-{
-	uint8_t reserved[2];
-	uint8_t trgt_port_grp[2];
-};
-
-struct scsi_vpd_id_lun_grp_id
-{
-	uint8_t reserved[2];
-	uint8_t log_unit_grp[2];
-};
-
-struct scsi_vpd_id_md5_lun_id
-{
-	uint8_t lun_id[16];
-};
-
-struct scsi_vpd_id_scsi_name
-{
-	uint8_t name_string[256];
-};
-
-struct scsi_service_action_in
-{
-	uint8_t opcode;
-	uint8_t service_action;
-	uint8_t action_dependent[13];
-	uint8_t control;
-};
-
-struct scsi_vpd_extended_inquiry_data
-{
-	uint8_t device;
-	uint8_t page_code;
-#define	SVPD_EXTENDED_INQUIRY_DATA	0x86
-	uint8_t page_length[2];
-	uint8_t flags1;
-
-	/* These values are for direct access devices */
-#define	SVPD_EID_AM_MASK	0xC0
-#define	SVPD_EID_AM_DEFER	0x80
-#define	SVPD_EID_AM_IMMED	0x40
-#define	SVPD_EID_AM_UNDEFINED	0x00
-#define	SVPD_EID_AM_RESERVED	0xc0
-#define	SVPD_EID_SPT		0x38
-#define	SVPD_EID_SPT_1		0x00
-#define	SVPD_EID_SPT_12		0x08
-#define	SVPD_EID_SPT_2		0x10
-#define	SVPD_EID_SPT_13		0x18
-#define	SVPD_EID_SPT_3		0x20
-#define	SVPD_EID_SPT_23		0x28
-#define	SVPD_EID_SPT_123	0x38
-
-	/* These values are for sequential access devices */
-#define	SVPD_EID_SA_SPT_LBP	0x08
-
-#define	SVPD_EID_GRD_CHK	0x04
-#define	SVPD_EID_APP_CHK	0x02
-#define	SVPD_EID_REF_CHK	0x01
-
-	uint8_t flags2;
-#define	SVPD_EID_UASK_SUP	0x20
-#define	SVPD_EID_GROUP_SUP	0x10
-#define	SVPD_EID_PRIOR_SUP	0x08
-#define	SVPD_EID_HEADSUP	0x04
-#define	SVPD_EID_ORDSUP		0x02
-#define	SVPD_EID_SIMPSUP	0x01
-	uint8_t flags3;
-#define	SVPD_EID_WU_SUP		0x08
-#define	SVPD_EID_CRD_SUP	0x04
-#define	SVPD_EID_NV_SUP		0x02
-#define	SVPD_EID_V_SUP		0x01
-	uint8_t flags4;
-#define	SVPD_EID_P_I_I_SUP	0x10
-#define	SVPD_EID_LUICLT		0x01
-	uint8_t flags5;
-#define	SVPD_EID_R_SUP		0x10
-#define	SVPD_EID_CBCS		0x01
-	uint8_t flags6;
-#define	SVPD_EID_MULTI_I_T_FW	0x0F
-#define	SVPD_EID_MC_VENDOR_SPEC	0x00
-#define	SVPD_EID_MC_MODE_1	0x01
-#define	SVPD_EID_MC_MODE_2	0x02
-#define	SVPD_EID_MC_MODE_3	0x03
-	uint8_t est[2];
-	uint8_t flags7;
-#define	SVPD_EID_POA_SUP	0x80
-#define	SVPD_EID_HRA_SUP	0x80
-#define	SVPD_EID_VSA_SUP	0x80
-	uint8_t max_sense_length;
-	uint8_t reserved2[50];
-};
-
-struct scsi_vpd_mode_page_policy_descr
-{
-	uint8_t page_code;
-	uint8_t subpage_code;
-	uint8_t policy;
-#define	SVPD_MPP_SHARED		0x00
-#define	SVPD_MPP_PORT		0x01
-#define	SVPD_MPP_I_T		0x03
-#define	SVPD_MPP_MLUS		0x80
-	uint8_t reserved;
-};
-
-struct scsi_vpd_mode_page_policy
-{
-	uint8_t device;
-	uint8_t page_code;
-#define	SVPD_MODE_PAGE_POLICY	0x87
-	uint8_t page_length[2];
-	struct scsi_vpd_mode_page_policy_descr descr[0];
-};
-
-struct scsi_diag_page {
-	uint8_t page_code;
-	uint8_t page_specific_flags;
-	uint8_t length[2];
-	uint8_t params[0];
-};
-
-struct scsi_vpd_port_designation
-{
-	uint8_t reserved[2];
-	uint8_t relative_port_id[2];
-	uint8_t reserved2[2];
-	uint8_t initiator_transportid_length[2];
-	uint8_t initiator_transportid[0];
-};
-
-struct scsi_vpd_port_designation_cont
-{
-	uint8_t reserved[2];
-	uint8_t target_port_descriptors_length[2];
-	struct scsi_vpd_id_descriptor target_port_descriptors[0];
-};
-
-struct scsi_vpd_scsi_ports
-{
-	u_int8_t device;
-	u_int8_t page_code;
-#define	SVPD_SCSI_PORTS		0x88
-	u_int8_t page_length[2];
-	struct scsi_vpd_port_designation design[];
-};
-
-/*
- * ATA Information VPD Page based on
- * T10/2126-D Revision 04
- */
-#define SVPD_ATA_INFORMATION		0x89
-
-
-struct scsi_vpd_tpc_descriptor
-{
-	uint8_t desc_type[2];
-	uint8_t desc_length[2];
-	uint8_t parameters[];
-};
-
-struct scsi_vpd_tpc_descriptor_bdrl
-{
-	uint8_t desc_type[2];
-#define	SVPD_TPC_BDRL			0x0000
-	uint8_t desc_length[2];
-	uint8_t vendor_specific[6];
-	uint8_t maximum_ranges[2];
-	uint8_t maximum_inactivity_timeout[4];
-	uint8_t default_inactivity_timeout[4];
-	uint8_t maximum_token_transfer_size[8];
-	uint8_t optimal_transfer_count[8];
-};
-
-struct scsi_vpd_tpc_descriptor_sc_descr
-{
-	uint8_t opcode;
-	uint8_t sa_length;
-	uint8_t supported_service_actions[0];
-};
-
-struct scsi_vpd_tpc_descriptor_sc
-{
-	uint8_t desc_type[2];
-#define	SVPD_TPC_SC			0x0001
-	uint8_t desc_length[2];
-	uint8_t list_length;
-	struct scsi_vpd_tpc_descriptor_sc_descr descr[];
-};
-
-struct scsi_vpd_tpc_descriptor_pd
-{
-	uint8_t desc_type[2];
-#define	SVPD_TPC_PD			0x0004
-	uint8_t desc_length[2];
-	uint8_t reserved[4];
-	uint8_t maximum_cscd_descriptor_count[2];
-	uint8_t maximum_segment_descriptor_count[2];
-	uint8_t maximum_descriptor_list_length[4];
-	uint8_t maximum_inline_data_length[4];
-	uint8_t reserved2[12];
-};
-
-struct scsi_vpd_tpc_descriptor_sd
-{
-	uint8_t desc_type[2];
-#define	SVPD_TPC_SD			0x0008
-	uint8_t desc_length[2];
-	uint8_t list_length;
-	uint8_t supported_descriptor_codes[];
-};
-
-struct scsi_vpd_tpc_descriptor_sdid
-{
-	uint8_t desc_type[2];
-#define	SVPD_TPC_SDID			0x000C
-	uint8_t desc_length[2];
-	uint8_t list_length[2];
-	uint8_t supported_descriptor_ids[];
-};
-
-struct scsi_vpd_tpc_descriptor_rtf_block
-{
-	uint8_t type_format;
-#define	SVPD_TPC_RTF_BLOCK			0x00
-	uint8_t reserved;
-	uint8_t desc_length[2];
-	uint8_t reserved2[2];
-	uint8_t optimal_length_granularity[2];
-	uint8_t maximum_bytes[8];
-	uint8_t optimal_bytes[8];
-	uint8_t optimal_bytes_to_token_per_segment[8];
-	uint8_t optimal_bytes_from_token_per_segment[8];
-	uint8_t reserved3[8];
-};
-
-struct scsi_vpd_tpc_descriptor_rtf
-{
-	uint8_t desc_type[2];
-#define	SVPD_TPC_RTF			0x0106
-	uint8_t desc_length[2];
-	uint8_t remote_tokens;
-	uint8_t reserved[11];
-	uint8_t minimum_token_lifetime[4];
-	uint8_t maximum_token_lifetime[4];
-	uint8_t maximum_token_inactivity_timeout[4];
-	uint8_t reserved2[18];
-	uint8_t type_specific_features_length[2];
-	uint8_t type_specific_features[0];
-};
-
-struct scsi_vpd_tpc_descriptor_srtd
-{
-	uint8_t rod_type[4];
-	uint8_t flags;
-#define	SVPD_TPC_SRTD_TOUT		0x01
-#define	SVPD_TPC_SRTD_TIN		0x02
-#define	SVPD_TPC_SRTD_ECPY		0x80
-	uint8_t reserved;
-	uint8_t preference_indicator[2];
-	uint8_t reserved2[56];
-};
-
-struct scsi_vpd_tpc_descriptor_srt
-{
-	uint8_t desc_type[2];
-#define	SVPD_TPC_SRT			0x0108
-	uint8_t desc_length[2];
-	uint8_t reserved[2];
-	uint8_t rod_type_descriptors_length[2];
-	uint8_t rod_type_descriptors[0];
-};
-
-struct scsi_vpd_tpc_descriptor_gco
-{
-	uint8_t desc_type[2];
-#define	SVPD_TPC_GCO			0x8001
-	uint8_t desc_length[2];
-	uint8_t total_concurrent_copies[4];
-	uint8_t maximum_identified_concurrent_copies[4];
-	uint8_t maximum_segment_length[4];
-	uint8_t data_segment_granularity;
-	uint8_t inline_data_granularity;
-	uint8_t reserved[18];
-};
-
-struct scsi_vpd_tpc
-{
-	uint8_t device;
-	uint8_t page_code;
-#define	SVPD_SCSI_TPC			0x8F
-	uint8_t page_length[2];
-	struct scsi_vpd_tpc_descriptor descr[];
-};
-
-/*
- * Block Device Characteristics VPD Page based on
- * T10/1799-D Revision 31
- */
-struct scsi_vpd_block_characteristics
-{
-	u_int8_t device;
-	u_int8_t page_code;
-#define SVPD_BDC			0xB1
-	u_int8_t page_length[2];
-	u_int8_t medium_rotation_rate[2];
-#define SVPD_BDC_RATE_NOT_REPORTED	0x00
-#define SVPD_BDC_RATE_NON_ROTATING	0x01
-	u_int8_t reserved1;
-	u_int8_t nominal_form_factor;
-#define SVPD_BDC_FORM_NOT_REPORTED	0x00
-#define SVPD_BDC_FORM_5_25INCH		0x01
-#define SVPD_BDC_FORM_3_5INCH		0x02
-#define SVPD_BDC_FORM_2_5INCH		0x03
-#define SVPD_BDC_FORM_1_5INCH		0x04
-#define SVPD_BDC_FORM_LESSTHAN_1_5INCH	0x05
-	u_int8_t reserved2[56];
-};
-
-/*
- * Block Device Characteristics VPD Page
- */
-struct scsi_vpd_block_device_characteristics
-{
-	uint8_t device;
-	uint8_t page_code;
-#define	SVPD_BDC		0xB1
-	uint8_t page_length[2];
-	uint8_t medium_rotation_rate[2];
-#define	SVPD_NOT_REPORTED	0x0000
-#define	SVPD_NON_ROTATING	0x0001
-	uint8_t product_type;
-	uint8_t wab_wac_ff;
-	uint8_t flags;
-#define	SVPD_VBULS		0x01
-#define	SVPD_FUAB		0x02
-#define	SVPD_HAW_ZBC		0x10
-	uint8_t reserved[55];
-};
-
-/*
- * Logical Block Provisioning VPD Page based on
- * T10/1799-D Revision 31
- */
-struct scsi_vpd_logical_block_prov
-{
-	u_int8_t device;
-	u_int8_t page_code;
-#define	SVPD_LBP		0xB2
-	u_int8_t page_length[2];
-#define SVPD_LBP_PL_BASIC	0x04
-	u_int8_t threshold_exponent;
-	u_int8_t flags;
-#define SVPD_LBP_UNMAP		0x80
-#define SVPD_LBP_WS16		0x40
-#define SVPD_LBP_WS10		0x20
-#define SVPD_LBP_RZ		0x04
-#define SVPD_LBP_ANC_SUP	0x02
-#define SVPD_LBP_DP		0x01
-	u_int8_t prov_type;
-#define SVPD_LBP_RESOURCE	0x01
-#define SVPD_LBP_THIN		0x02
-	u_int8_t reserved;
-	/*
-	 * Provisioning Group Descriptor can be here if SVPD_LBP_DP is set
-	 * Its size can be determined from page_length - 4
-	 */
-};
-
-/*
- * Block Limits VDP Page based on SBC-4 Revision 2
- */
-struct scsi_vpd_block_limits
-{
-	u_int8_t device;
-	u_int8_t page_code;
-#define	SVPD_BLOCK_LIMITS	0xB0
-	u_int8_t page_length[2];
-#define SVPD_BL_PL_BASIC	0x10
-#define SVPD_BL_PL_TP		0x3C
-	u_int8_t reserved1;
-	u_int8_t max_cmp_write_len;
-	u_int8_t opt_txfer_len_grain[2];
-	u_int8_t max_txfer_len[4];
-	u_int8_t opt_txfer_len[4];
-	u_int8_t max_prefetch[4];
-	u_int8_t max_unmap_lba_cnt[4];
-	u_int8_t max_unmap_blk_cnt[4];
-	u_int8_t opt_unmap_grain[4];
-	u_int8_t unmap_grain_align[4];
-	u_int8_t max_write_same_length[8];
-	u_int8_t max_atomic_transfer_length[4];
-	u_int8_t atomic_alignment[4];
-	u_int8_t atomic_transfer_length_granularity[4];
-	u_int8_t reserved2[8];
-};
-
-struct scsi_read_capacity
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define	SRC_RELADR	0x01
-	u_int8_t addr[4];
-	u_int8_t unused[2];
-	u_int8_t pmi;
-#define	SRC_PMI		0x01
-	u_int8_t control;
-};
-
-struct scsi_read_capacity_16
-{
-	uint8_t opcode;
-#define	SRC16_SERVICE_ACTION	0x10
-	uint8_t service_action;
-	uint8_t addr[8];
-	uint8_t alloc_len[4];
-#define	SRC16_PMI		0x01
-#define	SRC16_RELADR		0x02
-	uint8_t reladr;
-	uint8_t control;
-};
-
-struct scsi_read_capacity_data
-{
-	u_int8_t addr[4];
-	u_int8_t length[4];
-};
-
-struct scsi_read_capacity_data_long
-{
-	uint8_t addr[8];
-	uint8_t length[4];
-#define	SRC16_PROT_EN		0x01
-#define	SRC16_P_TYPE		0x0e
-#define	SRC16_PTYPE_1		0x00
-#define	SRC16_PTYPE_2		0x02
-#define	SRC16_PTYPE_3		0x04
-	uint8_t prot;
-#define	SRC16_LBPPBE		0x0f
-#define	SRC16_PI_EXPONENT	0xf0
-#define	SRC16_PI_EXPONENT_SHIFT	4
-	uint8_t prot_lbppbe;
-#define	SRC16_LALBA		0x3f
-#define	SRC16_LBPRZ		0x40
-#define	SRC16_LBPME		0x80
-/*
- * Alternate versions of these macros that are intended for use on a 16-bit
- * version of the lalba_lbp field instead of the array of 2 8 bit numbers.
- */
-#define	SRC16_LALBA_A		0x3fff
-#define	SRC16_LBPRZ_A		0x4000
-#define	SRC16_LBPME_A		0x8000
-	uint8_t lalba_lbp[2];
-	uint8_t	reserved[16];
-};
-
-struct scsi_get_lba_status
-{
-	uint8_t opcode;
-#define	SGLS_SERVICE_ACTION	0x12
-	uint8_t service_action;
-	uint8_t addr[8];
-	uint8_t alloc_len[4];
-	uint8_t reserved;
-	uint8_t control;
-};
-
-struct scsi_get_lba_status_data_descr
-{
-	uint8_t addr[8];
-	uint8_t length[4];
-	uint8_t status;
-	uint8_t reserved[3];
-};
-
-struct scsi_get_lba_status_data
-{
-	uint8_t length[4];
-	uint8_t reserved[4];
-	struct scsi_get_lba_status_data_descr descr[];
-};
-
-struct scsi_report_luns
-{
-	uint8_t opcode;
-	uint8_t reserved1;
-#define	RPL_REPORT_DEFAULT	0x00
-#define	RPL_REPORT_WELLKNOWN	0x01
-#define	RPL_REPORT_ALL		0x02
-	uint8_t select_report;
-	uint8_t reserved2[3];
-	uint8_t length[4];
-	uint8_t reserved3;
-	uint8_t control;
-};
-
-struct scsi_report_luns_lundata {
-	uint8_t lundata[8];
-#define	RPL_LUNDATA_PERIPH_BUS_MASK	0x3f
-#define	RPL_LUNDATA_FLAT_LUN_MASK	0x3f
-#define	RPL_LUNDATA_FLAT_LUN_BITS	0x06
-#define	RPL_LUNDATA_LUN_TARG_MASK	0x3f
-#define	RPL_LUNDATA_LUN_BUS_MASK	0xe0
-#define	RPL_LUNDATA_LUN_LUN_MASK	0x1f
-#define	RPL_LUNDATA_EXT_LEN_MASK	0x30
-#define	RPL_LUNDATA_EXT_EAM_MASK	0x0f
-#define	RPL_LUNDATA_EXT_EAM_WK		0x01
-#define	RPL_LUNDATA_EXT_EAM_NOT_SPEC	0x0f
-#define	RPL_LUNDATA_ATYP_MASK	0xc0	/* MBZ for type 0 lun */
-#define	RPL_LUNDATA_ATYP_PERIPH	0x00
-#define	RPL_LUNDATA_ATYP_FLAT	0x40
-#define	RPL_LUNDATA_ATYP_LUN	0x80
-#define	RPL_LUNDATA_ATYP_EXTLUN	0xc0
-};
-
-struct scsi_report_luns_data {
-	u_int8_t length[4];	/* length of LUN inventory, in bytes */
-	u_int8_t reserved[4];	/* unused */
-	/*
-	 * LUN inventory- we only support the type zero form for now.
-	 */
-	struct scsi_report_luns_lundata luns[0];
-};
-
-struct scsi_target_group
-{
-	uint8_t opcode;
-	uint8_t service_action;
-#define	STG_PDF_MASK		0xe0
-#define	STG_PDF_LENGTH		0x00
-#define	STG_PDF_EXTENDED	0x20
-	uint8_t reserved1[4];
-	uint8_t length[4];
-	uint8_t reserved2;
-	uint8_t control;
-};
-
-struct scsi_target_port_descriptor {
-	uint8_t	reserved[2];
-	uint8_t	relative_target_port_identifier[2];
-	uint8_t desc_list[];
-};
-
-struct scsi_target_port_group_descriptor {
-	uint8_t	pref_state;
-#define	TPG_PRIMARY				0x80
-#define	TPG_ASYMMETRIC_ACCESS_STATE_MASK	0xf
-#define	TPG_ASYMMETRIC_ACCESS_OPTIMIZED		0x0
-#define	TPG_ASYMMETRIC_ACCESS_NONOPTIMIZED	0x1
-#define	TPG_ASYMMETRIC_ACCESS_STANDBY		0x2
-#define	TPG_ASYMMETRIC_ACCESS_UNAVAILABLE	0x3
-#define	TPG_ASYMMETRIC_ACCESS_LBA_DEPENDENT	0x4
-#define	TPG_ASYMMETRIC_ACCESS_OFFLINE		0xE
-#define	TPG_ASYMMETRIC_ACCESS_TRANSITIONING	0xF
-	uint8_t support;
-#define	TPG_AO_SUP	0x01
-#define	TPG_AN_SUP	0x02
-#define	TPG_S_SUP	0x04
-#define	TPG_U_SUP	0x08
-#define	TPG_LBD_SUP	0x10
-#define	TPG_O_SUP	0x40
-#define	TPG_T_SUP	0x80
-	uint8_t target_port_group[2];
-	uint8_t reserved;
-	uint8_t status;
-#define TPG_UNAVLBL      0
-#define TPG_SET_BY_STPG  0x01
-#define TPG_IMPLICIT     0x02
-	uint8_t vendor_specific;
-	uint8_t	target_port_count;
-	struct scsi_target_port_descriptor descriptors[];
-};
-
-struct scsi_target_group_data {
-	uint8_t length[4];	/* length of returned data, in bytes */
-	struct scsi_target_port_group_descriptor groups[];
-};
-
-struct scsi_target_group_data_extended {
-	uint8_t length[4];	/* length of returned data, in bytes */
-	uint8_t format_type;	/* STG_PDF_LENGTH or STG_PDF_EXTENDED */
-	uint8_t	implicit_transition_time;
-	uint8_t reserved[2];
-	struct scsi_target_port_group_descriptor groups[];
-};
-
-struct scsi_security_protocol_in
-{
-	uint8_t opcode;
-	uint8_t security_protocol;
-#define	SPI_PROT_INFORMATION		0x00
-#define	SPI_PROT_CBCS			0x07
-#define	SPI_PROT_TAPE_DATA_ENC		0x20
-#define	SPI_PROT_DATA_ENC_CONFIG	0x21
-#define	SPI_PROT_SA_CREATE_CAP		0x40
-#define	SPI_PROT_IKEV2_SCSI		0x41
-#define	SPI_PROT_JEDEC_UFS		0xEC
-#define	SPI_PROT_SDCARD_TFSSS		0xED
-#define	SPI_PROT_AUTH_HOST_TRANSIENT	0xEE
-#define	SPI_PROT_ATA_DEVICE_PASSWORD	0xEF
-	uint8_t security_protocol_specific[2];
-	uint8_t byte4;
-#define	SPI_INC_512	0x80
-	uint8_t reserved1;
-	uint8_t length[4];
-	uint8_t reserved2;
-	uint8_t control;
-};
-
-struct scsi_security_protocol_out
-{
-	uint8_t opcode;
-	uint8_t security_protocol;
-	uint8_t security_protocol_specific[2];
-	uint8_t byte4;
-#define	SPO_INC_512	0x80
-	uint8_t reserved1;
-	uint8_t length[4];
-	uint8_t reserved2;
-	uint8_t control;
-};
-
-typedef enum {
-	SSD_TYPE_NONE,
-	SSD_TYPE_FIXED,
-	SSD_TYPE_DESC
-} scsi_sense_data_type;
-
-typedef enum {
-	SSD_ELEM_NONE,
-	SSD_ELEM_SKIP,
-	SSD_ELEM_DESC,
-	SSD_ELEM_SKS,
-	SSD_ELEM_COMMAND,
-	SSD_ELEM_INFO,
-	SSD_ELEM_FRU,
-	SSD_ELEM_STREAM,
-	SSD_ELEM_MAX
-} scsi_sense_elem_type;
-
-
-struct scsi_sense_data
-{
-	uint8_t error_code;
-	/*
-	 * SPC-4 says that the maximum length of sense data is 252 bytes.
-	 * So this structure is exactly 252 bytes log.
-	 */
-#define	SSD_FULL_SIZE 252
-	uint8_t sense_buf[SSD_FULL_SIZE - 1];
-	/*
-	 * XXX KDM is this still a reasonable minimum size?
-	 */
-#define	SSD_MIN_SIZE 18
-	/*
-	 * Maximum value for the extra_len field in the sense data.
-	 */
-#define	SSD_EXTRA_MAX 244
-};
-
-/*
- * Fixed format sense data.
- */
-struct scsi_sense_data_fixed
-{
-	u_int8_t error_code;
-#define	SSD_ERRCODE			0x7F
-#define		SSD_CURRENT_ERROR	0x70
-#define		SSD_DEFERRED_ERROR	0x71
-#define	SSD_ERRCODE_VALID	0x80	
-	u_int8_t segment;
-	u_int8_t flags;
-#define	SSD_KEY				0x0F
-#define		SSD_KEY_NO_SENSE	0x00
-#define		SSD_KEY_RECOVERED_ERROR	0x01
-#define		SSD_KEY_NOT_READY	0x02
-#define		SSD_KEY_MEDIUM_ERROR	0x03
-#define		SSD_KEY_HARDWARE_ERROR	0x04
-#define		SSD_KEY_ILLEGAL_REQUEST	0x05
-#define		SSD_KEY_UNIT_ATTENTION	0x06
-#define		SSD_KEY_DATA_PROTECT	0x07
-#define		SSD_KEY_BLANK_CHECK	0x08
-#define		SSD_KEY_Vendor_Specific	0x09
-#define		SSD_KEY_COPY_ABORTED	0x0a
-#define		SSD_KEY_ABORTED_COMMAND	0x0b		
-#define		SSD_KEY_EQUAL		0x0c
-#define		SSD_KEY_VOLUME_OVERFLOW	0x0d
-#define		SSD_KEY_MISCOMPARE	0x0e
-#define		SSD_KEY_COMPLETED	0x0f			
-#define	SSD_ILI		0x20
-#define	SSD_EOM		0x40
-#define	SSD_FILEMARK	0x80
-	u_int8_t info[4];
-	u_int8_t extra_len;
-	u_int8_t cmd_spec_info[4];
-	u_int8_t add_sense_code;
-	u_int8_t add_sense_code_qual;
-	u_int8_t fru;
-	u_int8_t sense_key_spec[3];
-#define	SSD_SCS_VALID		0x80
-#define	SSD_FIELDPTR_CMD	0x40
-#define	SSD_BITPTR_VALID	0x08
-#define	SSD_BITPTR_VALUE	0x07
-	u_int8_t extra_bytes[14];
-#define	SSD_FIXED_IS_PRESENT(sense, length, field) 			\
-	((length >= (offsetof(struct scsi_sense_data_fixed, field) +	\
-	sizeof(sense->field))) ? 1 :0)
-#define	SSD_FIXED_IS_FILLED(sense, field) 				\
-	((((offsetof(struct scsi_sense_data_fixed, field) +		\
-	sizeof(sense->field)) -						\
-	(offsetof(struct scsi_sense_data_fixed, extra_len) +		\
-	sizeof(sense->extra_len))) <= sense->extra_len) ? 1 : 0)
-};
-
-/*
- * Descriptor format sense data definitions.
- * Introduced in SPC-3.
- */
-struct scsi_sense_data_desc 
-{
-	uint8_t	error_code;
-#define	SSD_DESC_CURRENT_ERROR	0x72
-#define	SSD_DESC_DEFERRED_ERROR	0x73
-	uint8_t sense_key;
-	uint8_t	add_sense_code;
-	uint8_t	add_sense_code_qual;
-	uint8_t	reserved[3];
-	/*
-	 * Note that SPC-4, section 4.5.2.1 says that the extra_len field
-	 * must be less than or equal to 244.
-	 */
-	uint8_t	extra_len;
-	uint8_t	sense_desc[0];
-#define	SSD_DESC_IS_PRESENT(sense, length, field) 			\
-	((length >= (offsetof(struct scsi_sense_data_desc, field) +	\
-	sizeof(sense->field))) ? 1 :0)
-};
-
-struct scsi_sense_desc_header
-{
-	uint8_t desc_type;
-	uint8_t length;
-};
-/*
- * The information provide in the Information descriptor is device type or
- * command specific information, and defined in a command standard.
- *
- * Note that any changes to the field names or positions in this structure,
- * even reserved fields, should be accompanied by an examination of the
- * code in ctl_set_sense() that uses them.
- *
- * Maximum descriptors allowed: 1 (as of SPC-4)
- */
-struct scsi_sense_info
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_INFO	0x00
-	uint8_t	length;
-	uint8_t	byte2;
-#define	SSD_INFO_VALID	0x80
-	uint8_t	reserved;
-	uint8_t	info[8];
-};
-
-/*
- * Command-specific information depends on the command for which the
- * reported condition occured.
- *
- * Note that any changes to the field names or positions in this structure,
- * even reserved fields, should be accompanied by an examination of the
- * code in ctl_set_sense() that uses them.
- *
- * Maximum descriptors allowed: 1 (as of SPC-4)
- */
-struct scsi_sense_command
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_COMMAND	0x01
-	uint8_t	length;
-	uint8_t	reserved[2];
-	uint8_t	command_info[8];
-};
-
-/*
- * Sense key specific descriptor.  The sense key specific data format
- * depends on the sense key in question.
- *
- * Maximum descriptors allowed: 1 (as of SPC-4)
- */
-struct scsi_sense_sks
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_SKS		0x02
-	uint8_t	length;
-	uint8_t reserved1[2];
-	uint8_t	sense_key_spec[3];
-#define	SSD_SKS_VALID		0x80
-	uint8_t reserved2;
-};
-
-/*
- * This is used for the Illegal Request sense key (0x05) only.
- */
-struct scsi_sense_sks_field
-{
-	uint8_t	byte0;
-#define	SSD_SKS_FIELD_VALID	0x80
-#define	SSD_SKS_FIELD_CMD	0x40
-#define	SSD_SKS_BPV		0x08
-#define	SSD_SKS_BIT_VALUE	0x07
-	uint8_t	field[2];
-};
-
-
-/* 
- * This is used for the Hardware Error (0x04), Medium Error (0x03) and
- * Recovered Error (0x01) sense keys.
- */
-struct scsi_sense_sks_retry
-{
-	uint8_t byte0;
-#define	SSD_SKS_RETRY_VALID	0x80
-	uint8_t actual_retry_count[2];
-};
-
-/*
- * Used with the NO Sense (0x00) or Not Ready (0x02) sense keys.
- */
-struct scsi_sense_sks_progress
-{
-	uint8_t byte0;
-#define	SSD_SKS_PROGRESS_VALID	0x80
-	uint8_t progress[2];
-#define	SSD_SKS_PROGRESS_DENOM	0x10000
-};
-
-/*
- * Used with the Copy Aborted (0x0a) sense key.
- */
-struct scsi_sense_sks_segment
-{
-	uint8_t byte0;
-#define	SSD_SKS_SEGMENT_VALID	0x80
-#define	SSD_SKS_SEGMENT_SD	0x20
-#define	SSD_SKS_SEGMENT_BPV	0x08
-#define	SSD_SKS_SEGMENT_BITPTR	0x07
-	uint8_t field[2];
-};
-
-/*
- * Used with the Unit Attention (0x06) sense key.
- *
- * This is currently used to indicate that the unit attention condition
- * queue has overflowed (when the overflow bit is set).
- */
-struct scsi_sense_sks_overflow
-{
-	uint8_t byte0;
-#define	SSD_SKS_OVERFLOW_VALID	0x80
-#define	SSD_SKS_OVERFLOW_SET	0x01
-	uint8_t	reserved[2];
-};
-
-/*
- * This specifies which component is associated with the sense data.  There
- * is no standard meaning for the fru value.
- *
- * Maximum descriptors allowed: 1 (as of SPC-4)
- */
-struct scsi_sense_fru
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_FRU		0x03
-	uint8_t	length;
-	uint8_t reserved;
-	uint8_t fru;
-};
-
-/*
- * Used for Stream commands, defined in SSC-4.
- *
- * Maximum descriptors allowed: 1 (as of SPC-4)
- */
- 
-struct scsi_sense_stream
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_STREAM		0x04
-	uint8_t	length;
-	uint8_t	reserved;
-	uint8_t	byte3;
-#define	SSD_DESC_STREAM_FM	0x80
-#define	SSD_DESC_STREAM_EOM	0x40
-#define	SSD_DESC_STREAM_ILI	0x20
-};
-
-/*
- * Used for Block commands, defined in SBC-3.
- *
- * This is currently (as of SBC-3) only used for the Incorrect Length
- * Indication (ILI) bit, which says that the data length requested in the
- * READ LONG or WRITE LONG command did not match the length of the logical
- * block.
- *
- * Maximum descriptors allowed: 1 (as of SPC-4)
- */
-struct scsi_sense_block
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_BLOCK		0x05
-	uint8_t	length;
-	uint8_t	reserved;
-	uint8_t	byte3;
-#define	SSD_DESC_BLOCK_ILI	0x20
-};
-
-/*
- * Used for Object-Based Storage Devices (OSD-3).
- *
- * Maximum descriptors allowed: 1 (as of SPC-4)
- */
-struct scsi_sense_osd_objid
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_OSD_OBJID	0x06
-	uint8_t	length;
-	uint8_t	reserved[6];
-	/*
-	 * XXX KDM provide the bit definitions here?  There are a lot of
-	 * them, and we don't have an OSD driver yet.
-	 */
-	uint8_t	not_init_cmds[4];
-	uint8_t	completed_cmds[4];
-	uint8_t	partition_id[8];
-	uint8_t	object_id[8];
-};
-
-/*
- * Used for Object-Based Storage Devices (OSD-3).
- *
- * Maximum descriptors allowed: 1 (as of SPC-4)
- */
-struct scsi_sense_osd_integrity
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_OSD_INTEGRITY	0x07
-	uint8_t	length;
-	uint8_t	integ_check_val[32];
-};
-
-/*
- * Used for Object-Based Storage Devices (OSD-3).
- *
- * Maximum descriptors allowed: 1 (as of SPC-4)
- */
-struct scsi_sense_osd_attr_id
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_OSD_ATTR_ID	0x08
-	uint8_t	length;
-	uint8_t	reserved[2];
-	uint8_t	attr_desc[0];
-};
-
-/*
- * Used with Sense keys No Sense (0x00) and Not Ready (0x02).
- *
- * Maximum descriptors allowed: 32 (as of SPC-4)
- */
-struct scsi_sense_progress
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_PROGRESS	0x0a
-	uint8_t	length;
-	uint8_t	sense_key;
-	uint8_t	add_sense_code;
-	uint8_t	add_sense_code_qual;
-	uint8_t reserved;
-	uint8_t	progress[2];
-};
-
-/*
- * This is typically forwarded as the result of an EXTENDED COPY command.
- *
- * Maximum descriptors allowed: 2 (as of SPC-4)
- */
-struct scsi_sense_forwarded
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_FORWARDED	0x0c
-	uint8_t	length;
-	uint8_t	byte2;
-#define	SSD_FORWARDED_FSDT	0x80
-#define	SSD_FORWARDED_SDS_MASK	0x0f
-#define	SSD_FORWARDED_SDS_UNK	0x00
-#define	SSD_FORWARDED_SDS_EXSRC	0x01
-#define	SSD_FORWARDED_SDS_EXDST	0x02
-};
-
-/*
- * Vendor-specific sense descriptor.  The desc_type field will be in the
- * range bewteen MIN and MAX inclusive.
- */
-struct scsi_sense_vendor
-{
-	uint8_t	desc_type;
-#define	SSD_DESC_VENDOR_MIN	0x80
-#define	SSD_DESC_VENDOR_MAX	0xff
-	uint8_t length;
-	uint8_t	data[0];
-};
-
-struct scsi_mode_header_6
-{
-	u_int8_t data_length;	/* Sense data length */
-	u_int8_t medium_type;
-	u_int8_t dev_spec;
-	u_int8_t blk_desc_len;
-};
-
-struct scsi_mode_header_10
-{
-	u_int8_t data_length[2];/* Sense data length */
-	u_int8_t medium_type;
-	u_int8_t dev_spec;
-	u_int8_t unused[2];
-	u_int8_t blk_desc_len[2];
-};
-
-struct scsi_mode_page_header
-{
-	u_int8_t page_code;
-#define	SMPH_PS		0x80
-#define	SMPH_SPF	0x40
-#define	SMPH_PC_MASK	0x3f
-	u_int8_t page_length;
-};
-
-struct scsi_mode_page_header_sp
-{
-	uint8_t page_code;
-	uint8_t subpage;
-	uint8_t page_length[2];
-};
-
-
-struct scsi_mode_blk_desc
-{
-	u_int8_t density;
-	u_int8_t nblocks[3];
-	u_int8_t reserved;
-	u_int8_t blklen[3];
-};
-
-#define	SCSI_DEFAULT_DENSITY	0x00	/* use 'default' density */
-#define	SCSI_SAME_DENSITY	0x7f	/* use 'same' density- >= SCSI-2 only */
-
-
-/*
- * Status Byte
- */
-#define	SCSI_STATUS_OK			0x00
-#define	SCSI_STATUS_CHECK_COND		0x02
-#define	SCSI_STATUS_COND_MET		0x04
-#define	SCSI_STATUS_BUSY		0x08
-#define	SCSI_STATUS_INTERMED		0x10
-#define	SCSI_STATUS_INTERMED_COND_MET	0x14
-#define	SCSI_STATUS_RESERV_CONFLICT	0x18
-#define	SCSI_STATUS_CMD_TERMINATED	0x22	/* Obsolete in SAM-2 */
-#define	SCSI_STATUS_QUEUE_FULL		0x28
-#define	SCSI_STATUS_ACA_ACTIVE		0x30
-#define	SCSI_STATUS_TASK_ABORTED	0x40
-
-struct scsi_inquiry_pattern {
-	u_int8_t   type;
-	u_int8_t   media_type;
-#define	SIP_MEDIA_REMOVABLE	0x01
-#define	SIP_MEDIA_FIXED		0x02
-	const char *vendor;
-	const char *product;
-	const char *revision;
-}; 
-
-struct scsi_static_inquiry_pattern {
-	u_int8_t   type;
-	u_int8_t   media_type;
-	char       vendor[SID_VENDOR_SIZE+1];
-	char       product[SID_PRODUCT_SIZE+1];
-	char       revision[SID_REVISION_SIZE+1];
-};
-
-struct scsi_sense_quirk_entry {
-	struct scsi_inquiry_pattern	inq_pat;
-	int				num_sense_keys;
-	int				num_ascs;
-	struct sense_key_table_entry	*sense_key_info;
-	struct asc_table_entry		*asc_info;
-};
-
-struct sense_key_table_entry {
-	u_int8_t    sense_key;
-	uint32_t   action;
-	const char *desc;
-};
-
-struct asc_table_entry {
-	u_int8_t    asc;
-	u_int8_t    ascq;
-	uint32_t   action;
-	const char *desc;
-};
-
-struct op_table_entry {
-	u_int8_t    opcode;
-	uint32_t   opmask;
-	const char  *desc;
-};
-
-struct scsi_op_quirk_entry {
-	struct scsi_inquiry_pattern	inq_pat;
-	int				num_ops;
-	struct op_table_entry		*op_table;
-};
-
-typedef enum {
-	SSS_FLAG_NONE		= 0x00,
-	SSS_FLAG_PRINT_COMMAND	= 0x01
-} scsi_sense_string_flags;
-
-struct scsi_nv {
-	const char *name;
-	uint64_t value;
-};
-
-typedef enum {
-	SCSI_NV_FOUND,
-	SCSI_NV_AMBIGUOUS,
-	SCSI_NV_NOT_FOUND
-} scsi_nv_status;
-
-typedef enum {
-	SCSI_NV_FLAG_NONE	= 0x00,
-	SCSI_NV_FLAG_IG_CASE	= 0x01	/* Case insensitive comparison */
-} scsi_nv_flags;
-
-struct ccb_scsiio;
-struct cam_periph;
-union  ccb;
-#ifndef _KERNEL
-struct cam_device;
-#endif
-
-extern const char *scsi_sense_key_text[];
-
-__BEGIN_DECLS
-void scsi_sense_desc(int sense_key, int asc, int ascq,
-		     struct scsi_inquiry_data *inq_data,
-		     const char **sense_key_desc, const char **asc_desc);
-scsi_sense_action scsi_error_action(struct ccb_scsiio* csio,
-				    struct scsi_inquiry_data *inq_data,
-				    uint32_t sense_flags);
-const char *	scsi_status_string(struct ccb_scsiio *csio);
-
-void scsi_desc_iterate(struct scsi_sense_data_desc *sense, u_int sense_len,
-		       int (*iter_func)(struct scsi_sense_data_desc *sense,
-					u_int, struct scsi_sense_desc_header *,
-					void *), void *arg);
-uint8_t *scsi_find_desc(struct scsi_sense_data_desc *sense, u_int sense_len,
-			uint8_t desc_type);
-void scsi_set_sense_data(struct scsi_sense_data *sense_data, 
-			 scsi_sense_data_type sense_format, int current_error,
-			 int sense_key, int asc, int ascq, ...) ;
-void scsi_set_sense_data_va(struct scsi_sense_data *sense_data,
-			    scsi_sense_data_type sense_format,
-			    int current_error, int sense_key, int asc,
-			    int ascq, va_list ap);
-int scsi_get_sense_info(struct scsi_sense_data *sense_data, u_int sense_len,
-			uint8_t info_type, uint64_t *info,
-			int64_t *signed_info);
-int scsi_get_sks(struct scsi_sense_data *sense_data, u_int sense_len,
-		 uint8_t *sks);
-int scsi_get_block_info(struct scsi_sense_data *sense_data, u_int sense_len,
-			struct scsi_inquiry_data *inq_data,
-			uint8_t *block_bits);
-int scsi_get_stream_info(struct scsi_sense_data *sense_data, u_int sense_len,
-			 struct scsi_inquiry_data *inq_data,
-			 uint8_t *stream_bits);
-void scsi_info_sbuf(struct sbuf *sb, uint8_t *cdb, int cdb_len,
-		    struct scsi_inquiry_data *inq_data, uint64_t info);
-void scsi_command_sbuf(struct sbuf *sb, uint8_t *cdb, int cdb_len,
-		       struct scsi_inquiry_data *inq_data, uint64_t csi);
-void scsi_progress_sbuf(struct sbuf *sb, uint16_t progress);
-int scsi_sks_sbuf(struct sbuf *sb, int sense_key, uint8_t *sks);
-void scsi_fru_sbuf(struct sbuf *sb, uint64_t fru);
-void scsi_stream_sbuf(struct sbuf *sb, uint8_t stream_bits, uint64_t info);
-void scsi_block_sbuf(struct sbuf *sb, uint8_t block_bits, uint64_t info);
-void scsi_sense_info_sbuf(struct sbuf *sb, struct scsi_sense_data *sense,
-			  u_int sense_len, uint8_t *cdb, int cdb_len,
-			  struct scsi_inquiry_data *inq_data,
-			  struct scsi_sense_desc_header *header);
-
-void scsi_sense_command_sbuf(struct sbuf *sb, struct scsi_sense_data *sense,
-			     u_int sense_len, uint8_t *cdb, int cdb_len,
-			     struct scsi_inquiry_data *inq_data,
-			     struct scsi_sense_desc_header *header);
-void scsi_sense_sks_sbuf(struct sbuf *sb, struct scsi_sense_data *sense,
-			 u_int sense_len, uint8_t *cdb, int cdb_len,
-			 struct scsi_inquiry_data *inq_data,
-			 struct scsi_sense_desc_header *header);
-void scsi_sense_fru_sbuf(struct sbuf *sb, struct scsi_sense_data *sense,
-			 u_int sense_len, uint8_t *cdb, int cdb_len,
-			 struct scsi_inquiry_data *inq_data,
-			 struct scsi_sense_desc_header *header);
-void scsi_sense_stream_sbuf(struct sbuf *sb, struct scsi_sense_data *sense,
-			    u_int sense_len, uint8_t *cdb, int cdb_len,
-			    struct scsi_inquiry_data *inq_data,
-			    struct scsi_sense_desc_header *header);
-void scsi_sense_block_sbuf(struct sbuf *sb, struct scsi_sense_data *sense,
-			   u_int sense_len, uint8_t *cdb, int cdb_len,
-			   struct scsi_inquiry_data *inq_data,
-			   struct scsi_sense_desc_header *header);
-void scsi_sense_progress_sbuf(struct sbuf *sb, struct scsi_sense_data *sense,
-			      u_int sense_len, uint8_t *cdb, int cdb_len,
-			      struct scsi_inquiry_data *inq_data,
-			      struct scsi_sense_desc_header *header);
-void scsi_sense_generic_sbuf(struct sbuf *sb, struct scsi_sense_data *sense,
-			     u_int sense_len, uint8_t *cdb, int cdb_len,
-			     struct scsi_inquiry_data *inq_data,
-			     struct scsi_sense_desc_header *header);
-void scsi_sense_desc_sbuf(struct sbuf *sb, struct scsi_sense_data *sense,
-			  u_int sense_len, uint8_t *cdb, int cdb_len,
-			  struct scsi_inquiry_data *inq_data,
-			  struct scsi_sense_desc_header *header);
-scsi_sense_data_type scsi_sense_type(struct scsi_sense_data *sense_data);
-
-void scsi_sense_only_sbuf(struct scsi_sense_data *sense, u_int sense_len,
-			  struct sbuf *sb, char *path_str,
-			  struct scsi_inquiry_data *inq_data, uint8_t *cdb,
-			  int cdb_len);
-
-#ifdef _KERNEL
-int		scsi_command_string(struct ccb_scsiio *csio, struct sbuf *sb);
-int		scsi_sense_sbuf(struct ccb_scsiio *csio, struct sbuf *sb,
-				scsi_sense_string_flags flags);
-char *		scsi_sense_string(struct ccb_scsiio *csio,
-				  char *str, int str_len);
-void		scsi_sense_print(struct ccb_scsiio *csio);
-int 		scsi_vpd_supported_page(struct cam_periph *periph,
-					uint8_t page_id);
-#else /* _KERNEL */
-int		scsi_command_string(struct cam_device *device,
-				    struct ccb_scsiio *csio, struct sbuf *sb);
-int		scsi_sense_sbuf(struct cam_device *device, 
-				struct ccb_scsiio *csio, struct sbuf *sb,
-				scsi_sense_string_flags flags);
-char *		scsi_sense_string(struct cam_device *device, 
-				  struct ccb_scsiio *csio,
-				  char *str, int str_len);
-void		scsi_sense_print(struct cam_device *device, 
-				 struct ccb_scsiio *csio, FILE *ofile);
-#endif /* _KERNEL */
-
-const char *	scsi_op_desc(u_int16_t opcode, 
-			     struct scsi_inquiry_data *inq_data);
-char *		scsi_cdb_string(u_int8_t *cdb_ptr, char *cdb_string,
-				size_t len);
-
-void		scsi_print_inquiry(struct scsi_inquiry_data *inq_data);
-void		scsi_print_inquiry_short(struct scsi_inquiry_data *inq_data);
-
-u_int		scsi_calc_syncsrate(u_int period_factor);
-u_int		scsi_calc_syncparam(u_int period);
-
-typedef int	(*scsi_devid_checkfn_t)(uint8_t *);
-int		scsi_devid_is_naa_ieee_reg(uint8_t *bufp);
-int		scsi_devid_is_sas_target(uint8_t *bufp);
-int		scsi_devid_is_lun_eui64(uint8_t *bufp);
-int		scsi_devid_is_lun_naa(uint8_t *bufp);
-int		scsi_devid_is_lun_name(uint8_t *bufp);
-int		scsi_devid_is_lun_t10(uint8_t *bufp);
-struct scsi_vpd_id_descriptor *
-		scsi_get_devid(struct scsi_vpd_device_id *id, uint32_t len,
-			       scsi_devid_checkfn_t ck_fn);
-struct scsi_vpd_id_descriptor *
-		scsi_get_devid_desc(struct scsi_vpd_id_descriptor *desc, uint32_t len,
-			       scsi_devid_checkfn_t ck_fn);
-
-int		scsi_transportid_sbuf(struct sbuf *sb,
-				      struct scsi_transportid_header *hdr,
-				      uint32_t valid_len);
-
-const char *	scsi_nv_to_str(struct scsi_nv *table, int num_table_entries,
-			       uint64_t value);
-
-scsi_nv_status	scsi_get_nv(struct scsi_nv *table, int num_table_entries,
-			    char *name, int *table_entry, scsi_nv_flags flags);
-
-int	scsi_parse_transportid_64bit(int proto_id, char *id_str,
-				     struct scsi_transportid_header **hdr,
-				     unsigned int *alloc_len,
-#ifdef _KERNEL
-				     struct malloc_type *type, int flags,
-#endif
-				     char *error_str, int error_str_len);
-
-int	scsi_parse_transportid_spi(char *id_str,
-				   struct scsi_transportid_header **hdr,
-				   unsigned int *alloc_len,
-#ifdef _KERNEL
-				   struct malloc_type *type, int flags,
-#endif
-				   char *error_str, int error_str_len);
-
-int	scsi_parse_transportid_rdma(char *id_str,
-				    struct scsi_transportid_header **hdr,
-				    unsigned int *alloc_len,
-#ifdef _KERNEL
-				    struct malloc_type *type, int flags,
-#endif
-				    char *error_str, int error_str_len);
-
-int	scsi_parse_transportid_iscsi(char *id_str,
-				     struct scsi_transportid_header **hdr,
-				     unsigned int *alloc_len,
-#ifdef _KERNEL
-				     struct malloc_type *type, int flags,
-#endif
-				     char *error_str,int error_str_len);
-
-int	scsi_parse_transportid_sop(char *id_str,
-				   struct scsi_transportid_header **hdr,
-				   unsigned int *alloc_len,
-#ifdef _KERNEL
-				   struct malloc_type *type, int flags,
-#endif
-				   char *error_str,int error_str_len);
-
-int	scsi_parse_transportid(char *transportid_str,
-			       struct scsi_transportid_header **hdr,
-			       unsigned int *alloc_len,
-#ifdef _KERNEL
-			       struct malloc_type *type, int flags,
-#endif
-			       char *error_str, int error_str_len);
-
-
-int scsi_attrib_volcoh_sbuf(struct sbuf *sb,
-			    struct scsi_mam_attribute_header *hdr,
-			    uint32_t valid_len, uint32_t flags,
-			    uint32_t output_flags, char *error_str,
-			    int error_str_len);
-
-int scsi_attrib_vendser_sbuf(struct sbuf *sb,
-			     struct scsi_mam_attribute_header *hdr,
-			     uint32_t valid_len, uint32_t flags,
-			     uint32_t output_flags, char *error_str,
-			     int error_str_len);
-
-int scsi_attrib_hexdump_sbuf(struct sbuf *sb,
-			     struct scsi_mam_attribute_header *hdr,
-			     uint32_t valid_len, uint32_t flags,
-			     uint32_t output_flags, char *error_str,
-			     int error_str_len);
-
-int scsi_attrib_int_sbuf(struct sbuf *sb, struct scsi_mam_attribute_header *hdr,
-			 uint32_t valid_len, uint32_t flags,
-			 uint32_t output_flags, char *error_str,
-			 int error_str_len);
-
-int scsi_attrib_ascii_sbuf(struct sbuf *sb,
-			   struct scsi_mam_attribute_header *hdr,
-			   uint32_t valid_len, uint32_t flags,
-			   uint32_t output_flags, char *error_str,
-			   int error_str_len);
-
-int scsi_attrib_text_sbuf(struct sbuf *sb,
-			  struct scsi_mam_attribute_header *hdr,
-			  uint32_t valid_len, uint32_t flags,
-			  uint32_t output_flags, char *error_str,
-			  int error_str_len);
-
-struct scsi_attrib_table_entry *scsi_find_attrib_entry(
-			struct scsi_attrib_table_entry *table,
-			size_t num_table_entries, uint32_t id);
-
-struct scsi_attrib_table_entry *scsi_get_attrib_entry(uint32_t id);
-
-int scsi_attrib_value_sbuf(struct sbuf *sb, uint32_t valid_len,
-			   struct scsi_mam_attribute_header *hdr,
-			   uint32_t output_flags, char *error_str,
-			   size_t error_str_len);
-
-void scsi_attrib_prefix_sbuf(struct sbuf *sb, uint32_t output_flags,
-			     struct scsi_mam_attribute_header *hdr,
-			     uint32_t valid_len, const char *desc);
-
-int scsi_attrib_sbuf(struct sbuf *sb, struct scsi_mam_attribute_header *hdr,
-		     uint32_t valid_len,
-		     struct scsi_attrib_table_entry *user_table,
-		     size_t num_user_entries, int prefer_user_table,
-		     uint32_t output_flags, char *error_str, int error_str_len);
-
-void		scsi_test_unit_ready(struct ccb_scsiio *csio, uint32_t retries,
-				     void (*cbfcnp)(struct cam_periph *, 
-						    union ccb *),
-				     u_int8_t tag_action, 
-				     u_int8_t sense_len, uint32_t timeout);
-
-void		scsi_request_sense(struct ccb_scsiio *csio, uint32_t retries,
-				   void (*cbfcnp)(struct cam_periph *, 
-						  union ccb *),
-				   void *data_ptr, u_int8_t dxfer_len,
-				   u_int8_t tag_action, u_int8_t sense_len,
-				   uint32_t timeout);
-
-void		scsi_inquiry(struct ccb_scsiio *csio, uint32_t retries,
-			     void (*cbfcnp)(struct cam_periph *, union ccb *),
-			     u_int8_t tag_action, u_int8_t *inq_buf, 
-			     uint32_t inq_len, int evpd, u_int8_t page_code,
-			     u_int8_t sense_len, uint32_t timeout);
-
-void		scsi_mode_sense(struct ccb_scsiio *csio, uint32_t retries,
-				void (*cbfcnp)(struct cam_periph *,
-					       union ccb *),
-				u_int8_t tag_action, int dbd,
-				u_int8_t page_code, u_int8_t page,
-				u_int8_t *param_buf, uint32_t param_len,
-				u_int8_t sense_len, uint32_t timeout);
-
-void		scsi_mode_sense_len(struct ccb_scsiio *csio, uint32_t retries,
-				    void (*cbfcnp)(struct cam_periph *,
-						   union ccb *),
-				    u_int8_t tag_action, int dbd,
-				    u_int8_t page_code, u_int8_t page,
-				    u_int8_t *param_buf, uint32_t param_len,
-				    int minimum_cmd_size, u_int8_t sense_len,
-				    uint32_t timeout);
-
-void		scsi_mode_select(struct ccb_scsiio *csio, uint32_t retries,
-				 void (*cbfcnp)(struct cam_periph *,
-						union ccb *),
-				 u_int8_t tag_action, int scsi_page_fmt,
-				 int save_pages, u_int8_t *param_buf,
-				 uint32_t param_len, u_int8_t sense_len,
-				 uint32_t timeout);
-
-void		scsi_mode_select_len(struct ccb_scsiio *csio, uint32_t retries,
-				     void (*cbfcnp)(struct cam_periph *,
-						    union ccb *),
-				     u_int8_t tag_action, int scsi_page_fmt,
-				     int save_pages, u_int8_t *param_buf,
-				     uint32_t param_len, int minimum_cmd_size,
-				     u_int8_t sense_len, uint32_t timeout);
-
-void		scsi_log_sense(struct ccb_scsiio *csio, uint32_t retries,
-			       void (*cbfcnp)(struct cam_periph *, union ccb *),
-			       u_int8_t tag_action, u_int8_t page_code,
-			       u_int8_t page, int save_pages, int ppc,
-			       uint32_t paramptr, u_int8_t *param_buf,
-			       uint32_t param_len, u_int8_t sense_len,
-			       uint32_t timeout);
-
-void		scsi_log_select(struct ccb_scsiio *csio, uint32_t retries,
-				void (*cbfcnp)(struct cam_periph *,
-				union ccb *), u_int8_t tag_action,
-				u_int8_t page_code, int save_pages,
-				int pc_reset, u_int8_t *param_buf,
-				uint32_t param_len, u_int8_t sense_len,
-				uint32_t timeout);
-
-void		scsi_prevent(struct ccb_scsiio *csio, uint32_t retries,
-			     void (*cbfcnp)(struct cam_periph *, union ccb *),
-			     u_int8_t tag_action, u_int8_t action,
-			     u_int8_t sense_len, uint32_t timeout);
-
-void		scsi_read_capacity(struct ccb_scsiio *csio, uint32_t retries,
-				   void (*cbfcnp)(struct cam_periph *, 
-				   union ccb *), u_int8_t tag_action, 
-				   struct scsi_read_capacity_data *,
-				   u_int8_t sense_len, uint32_t timeout);
-void		scsi_read_capacity_16(struct ccb_scsiio *csio, uint32_t retries,
-				      void (*cbfcnp)(struct cam_periph *,
-				      union ccb *), uint8_t tag_action,
-				      uint64_t lba, int reladr, int pmi,
-				      uint8_t *rcap_buf, int rcap_buf_len,
-				      uint8_t sense_len, uint32_t timeout);
-
-void		scsi_report_luns(struct ccb_scsiio *csio, uint32_t retries,
-				 void (*cbfcnp)(struct cam_periph *, 
-				 union ccb *), u_int8_t tag_action, 
-				 u_int8_t select_report,
-				 struct scsi_report_luns_data *rpl_buf,
-				 uint32_t alloc_len, u_int8_t sense_len,
-				 uint32_t timeout);
-
-void		scsi_report_target_group(struct ccb_scsiio *csio, uint32_t retries,
-				 void (*cbfcnp)(struct cam_periph *, 
-				 union ccb *), u_int8_t tag_action, 
-				 u_int8_t pdf,
-				 void *buf,
-				 uint32_t alloc_len, u_int8_t sense_len,
-				 uint32_t timeout);
-
-void		scsi_set_target_group(struct ccb_scsiio *csio, uint32_t retries,
-				 void (*cbfcnp)(struct cam_periph *, 
-				 union ccb *), u_int8_t tag_action, void *buf,
-				 uint32_t alloc_len, u_int8_t sense_len,
-				 uint32_t timeout);
-
-void		scsi_synchronize_cache(struct ccb_scsiio *csio, 
-				       uint32_t retries,
-				       void (*cbfcnp)(struct cam_periph *, 
-				       union ccb *), u_int8_t tag_action, 
-				       uint32_t begin_lba, u_int16_t lb_count,
-				       u_int8_t sense_len, uint32_t timeout);
-
-void scsi_receive_diagnostic_results(struct ccb_scsiio *csio, uint32_t retries,
-				     void (*cbfcnp)(struct cam_periph *,
-						    union ccb*),
-				     uint8_t tag_action, int pcv,
-				     uint8_t page_code, uint8_t *data_ptr,
-				     uint16_t allocation_length,
-				     uint8_t sense_len, uint32_t timeout);
-
-void scsi_send_diagnostic(struct ccb_scsiio *csio, uint32_t retries,
-			  void (*cbfcnp)(struct cam_periph *, union ccb *),
-			  uint8_t tag_action, int unit_offline,
-			  int device_offline, int self_test, int page_format,
-			  int self_test_code, uint8_t *data_ptr,
-			  uint16_t param_list_length, uint8_t sense_len,
-			  uint32_t timeout);
-
-void scsi_read_buffer(struct ccb_scsiio *csio, uint32_t retries,
-			void (*cbfcnp)(struct cam_periph *, union ccb*),
-			uint8_t tag_action, int mode,
-			uint8_t buffer_id, uint32_t offset,
-			uint8_t *data_ptr, uint32_t allocation_length,
-			uint8_t sense_len, uint32_t timeout);
-
-void scsi_write_buffer(struct ccb_scsiio *csio, uint32_t retries,
-			void (*cbfcnp)(struct cam_periph *, union ccb *),
-			uint8_t tag_action, int mode,
-			uint8_t buffer_id, uint32_t offset,
-			uint8_t *data_ptr, uint32_t param_list_length,
-			uint8_t sense_len, uint32_t timeout);
-
-#define	SCSI_RW_READ	0x0001
-#define	SCSI_RW_WRITE	0x0002
-#define	SCSI_RW_DIRMASK	0x0003
-#define	SCSI_RW_BIO	0x1000
-void scsi_read_write(struct ccb_scsiio *csio, uint32_t retries,
-		     void (*cbfcnp)(struct cam_periph *, union ccb *),
-		     u_int8_t tag_action, int readop, u_int8_t byte2, 
-		     int minimum_cmd_size, u_int64_t lba,
-		     uint32_t block_count, u_int8_t *data_ptr,
-		     uint32_t dxfer_len, u_int8_t sense_len,
-		     uint32_t timeout);
-
-void scsi_write_same(struct ccb_scsiio *csio, uint32_t retries,
-		     void (*cbfcnp)(struct cam_periph *, union ccb *),
-		     u_int8_t tag_action, u_int8_t byte2, 
-		     int minimum_cmd_size, u_int64_t lba,
-		     uint32_t block_count, u_int8_t *data_ptr,
-		     uint32_t dxfer_len, u_int8_t sense_len,
-		     uint32_t timeout);
-
-void scsi_ata_identify(struct ccb_scsiio *csio, uint32_t retries,
-		       void (*cbfcnp)(struct cam_periph *, union ccb *),
-		       u_int8_t tag_action, u_int8_t *data_ptr,
-		       u_int16_t dxfer_len, u_int8_t sense_len,
-		       uint32_t timeout);
-
-void scsi_ata_trim(struct ccb_scsiio *csio, uint32_t retries,
-	           void (*cbfcnp)(struct cam_periph *, union ccb *),
-	           u_int8_t tag_action, u_int16_t block_count,
-	           u_int8_t *data_ptr, u_int16_t dxfer_len,
-	           u_int8_t sense_len, uint32_t timeout);
-
-void scsi_ata_pass_16(struct ccb_scsiio *csio, uint32_t retries,
-		      void (*cbfcnp)(struct cam_periph *, union ccb *),
-		      uint32_t flags, u_int8_t tag_action,
-		      u_int8_t protocol, u_int8_t ata_flags, u_int16_t features,
-		      u_int16_t sector_count, uint64_t lba, u_int8_t command,
-		      u_int8_t control, u_int8_t *data_ptr, u_int16_t dxfer_len,
-		      u_int8_t sense_len, uint32_t timeout);
-
-void scsi_unmap(struct ccb_scsiio *csio, uint32_t retries,
-		void (*cbfcnp)(struct cam_periph *, union ccb *),
-		u_int8_t tag_action, u_int8_t byte2,
-		u_int8_t *data_ptr, u_int16_t dxfer_len,
-		u_int8_t sense_len, uint32_t timeout);
-
-void scsi_start_stop(struct ccb_scsiio *csio, uint32_t retries,
-		     void (*cbfcnp)(struct cam_periph *, union ccb *),
-		     u_int8_t tag_action, int start, int load_eject,
-		     int immediate, u_int8_t sense_len, uint32_t timeout);
-void scsi_read_attribute(struct ccb_scsiio *csio, uint32_t retries, 
-			 void (*cbfcnp)(struct cam_periph *, union ccb *),
-			 u_int8_t tag_action, u_int8_t service_action,
-			 uint32_t element, u_int8_t elem_type,
-			 int logical_volume, int partition,
-			 uint32_t first_attribute, int cache, u_int8_t *data_ptr,
-			 uint32_t length, int sense_len, uint32_t timeout);
-void scsi_write_attribute(struct ccb_scsiio *csio, uint32_t retries, 
-			  void (*cbfcnp)(struct cam_periph *, union ccb *),
-			  u_int8_t tag_action, uint32_t element,
-			  int logical_volume, int partition, int wtc, u_int8_t *data_ptr,
-			  uint32_t length, int sense_len, uint32_t timeout);
-
-void scsi_security_protocol_in(struct ccb_scsiio *csio, uint32_t retries, 
-			       void (*cbfcnp)(struct cam_periph *, union ccb *),
-			       uint8_t tag_action, uint32_t security_protocol,
-			       uint32_t security_protocol_specific, int byte4,
-			       uint8_t *data_ptr, uint32_t dxfer_len,
-			       int sense_len, int timeout);
-
-void scsi_security_protocol_out(struct ccb_scsiio *csio, uint32_t retries, 
-				void (*cbfcnp)(struct cam_periph *,union ccb *),
-				uint8_t tag_action, uint32_t security_protocol,
-				uint32_t security_protocol_specific, int byte4,
-				uint8_t *data_ptr, uint32_t dxfer_len,
-				int sense_len, int timeout);
-
-void scsi_persistent_reserve_in(struct ccb_scsiio *csio, uint32_t retries, 
-				void (*cbfcnp)(struct cam_periph *,union ccb *),
-				uint8_t tag_action, int service_action,
-				uint8_t *data_ptr, uint32_t dxfer_len,
-				int sense_len, int timeout);
-
-void scsi_persistent_reserve_out(struct ccb_scsiio *csio, uint32_t retries, 
-				 void (*cbfcnp)(struct cam_periph *,
-				       union ccb *),
-				 uint8_t tag_action, int service_action,
-				 int scope, int res_type, uint8_t *data_ptr,
-				 uint32_t dxfer_len, int sense_len,
-				 int timeout);
-
-int		scsi_inquiry_match(caddr_t inqbuffer, caddr_t table_entry);
-int		scsi_static_inquiry_match(caddr_t inqbuffer,
-					  caddr_t table_entry);
-int		scsi_devid_match(uint8_t *rhs, size_t rhs_len,
-				 uint8_t *lhs, size_t lhs_len);
-
-void scsi_extract_sense(struct scsi_sense_data *sense, int *error_code,
-			int *sense_key, int *asc, int *ascq);
-int scsi_extract_sense_ccb(union ccb *ccb, int *error_code, int *sense_key,
-			   int *asc, int *ascq);
-void scsi_extract_sense_len(struct scsi_sense_data *sense,
-			    u_int sense_len, int *error_code, int *sense_key,
-			    int *asc, int *ascq, int show_errors);
-int scsi_get_sense_key(struct scsi_sense_data *sense, u_int sense_len,
-		       int show_errors);
-int scsi_get_asc(struct scsi_sense_data *sense, u_int sense_len,
-		 int show_errors);
-int scsi_get_ascq(struct scsi_sense_data *sense, u_int sense_len,
-		  int show_errors);
-static __inline void scsi_ulto2b(uint32_t val, u_int8_t *bytes);
-static __inline void scsi_ulto3b(uint32_t val, u_int8_t *bytes);
-static __inline void scsi_ulto4b(uint32_t val, u_int8_t *bytes);
-static __inline void scsi_u64to8b(u_int64_t val, u_int8_t *bytes);
-static __inline uint32_t scsi_2btoul(const uint8_t *bytes);
-static __inline uint32_t scsi_3btoul(const uint8_t *bytes);
-static __inline int32_t scsi_3btol(const uint8_t *bytes);
-static __inline uint32_t scsi_4btoul(const uint8_t *bytes);
-static __inline uint64_t scsi_8btou64(const uint8_t *bytes);
-static __inline void *find_mode_page_6(struct scsi_mode_header_6 *mode_header);
-static __inline void *find_mode_page_10(struct scsi_mode_header_10 *mode_header);
-
-static __inline void
-scsi_ulto2b(uint32_t val, u_int8_t *bytes)
-{
-
-	bytes[0] = (val >> 8) & 0xff;
-	bytes[1] = val & 0xff;
-}
-
-static __inline void
-scsi_ulto3b(uint32_t val, u_int8_t *bytes)
-{
-
-	bytes[0] = (val >> 16) & 0xff;
-	bytes[1] = (val >> 8) & 0xff;
-	bytes[2] = val & 0xff;
-}
-
-static __inline void
-scsi_ulto4b(uint32_t val, u_int8_t *bytes)
-{
-
-	bytes[0] = (val >> 24) & 0xff;
-	bytes[1] = (val >> 16) & 0xff;
-	bytes[2] = (val >> 8) & 0xff;
-	bytes[3] = val & 0xff;
-}
-
-static __inline void
-scsi_u64to8b(u_int64_t val, u_int8_t *bytes)
-{
-
-	bytes[0] = (val >> 56) & 0xff;
-	bytes[1] = (val >> 48) & 0xff;
-	bytes[2] = (val >> 40) & 0xff;
-	bytes[3] = (val >> 32) & 0xff;
-	bytes[4] = (val >> 24) & 0xff;
-	bytes[5] = (val >> 16) & 0xff;
-	bytes[6] = (val >> 8) & 0xff;
-	bytes[7] = val & 0xff;
-}
-
-static __inline uint32_t
-scsi_2btoul(const uint8_t *bytes)
-{
-	uint32_t rv;
-
-	rv = (bytes[0] << 8) |
-	     bytes[1];
-	return (rv);
-}
-
-static __inline uint32_t
-scsi_3btoul(const uint8_t *bytes)
-{
-	uint32_t rv;
-
-	rv = (bytes[0] << 16) |
-	     (bytes[1] << 8) |
-	     bytes[2];
-	return (rv);
-}
-
-static __inline int32_t 
-scsi_3btol(const uint8_t *bytes)
-{
-	uint32_t rc = scsi_3btoul(bytes);
- 
-	if (rc & 0x00800000)
-		rc |= 0xff000000;
-
-	return (int32_t) rc;
-}
-
-static __inline uint32_t
-scsi_4btoul(const uint8_t *bytes)
-{
-	uint32_t rv;
-
-	rv = (bytes[0] << 24) |
-	     (bytes[1] << 16) |
-	     (bytes[2] << 8) |
-	     bytes[3];
-	return (rv);
-}
-
-static __inline uint64_t
-scsi_8btou64(const uint8_t *bytes)
-{
-        uint64_t rv;
- 
-	rv = (((uint64_t)bytes[0]) << 56) |
-	     (((uint64_t)bytes[1]) << 48) |
-	     (((uint64_t)bytes[2]) << 40) |
-	     (((uint64_t)bytes[3]) << 32) |
-	     (((uint64_t)bytes[4]) << 24) |
-	     (((uint64_t)bytes[5]) << 16) |
-	     (((uint64_t)bytes[6]) << 8) |
-	     bytes[7];
-	return (rv);
-}
-
-/*
- * Given the pointer to a returned mode sense buffer, return a pointer to
- * the start of the first mode page.
- */
-static __inline void *
-find_mode_page_6(struct scsi_mode_header_6 *mode_header)
-{
-	void *page_start;
-
-	page_start = (void *)((u_int8_t *)&mode_header[1] +
-			      mode_header->blk_desc_len);
-
-	return(page_start);
-}
-
-static __inline void *
-find_mode_page_10(struct scsi_mode_header_10 *mode_header)
-{
-	void *page_start;
-
-	page_start = (void *)((u_int8_t *)&mode_header[1] +
-			       scsi_2btoul(mode_header->blk_desc_len));
-
-	return(page_start);
-}
-
-__END_DECLS
-
-#endif /*_SCSI_SCSI_ALL_H*/
diff --git a/include.new/cam/scsi/scsi_cd.h b/include.new/cam/scsi/scsi_cd.h
deleted file mode 100644
index 8c4abed..0000000
--- a/include.new/cam/scsi/scsi_cd.h
+++ /dev/null
@@ -1,747 +0,0 @@
-/*-
- * Copyright (c) 2000, 2002 Kenneth D. Merry
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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.
- *
- */
-/*
- * Written by Julian Elischer (julian@tfs.com)
- * for TRW Financial Systems.
- *
- * TRW Financial Systems, in accordance with their agreement with Carnegie
- * Mellon University, makes this software available to CMU to distribute
- * or use in any manner that they see fit as long as this message is kept with
- * the software. For this reason TFS also grants any other persons or
- * organisations permission to use or modify this software.
- *
- * TFS supplies this software to be publicly redistributed
- * on the understanding that TFS is not responsible for the correct
- * functioning of this software in any circumstances.
- *
- * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
- *	from: scsi_cd.h,v 1.10 1997/02/22 09:44:28 peter Exp $
- * $FreeBSD: releng/10.2/sys/cam/scsi/scsi_cd.h 111206 2003-02-21 06:19:38Z ken $
- */
-#ifndef	_SCSI_SCSI_CD_H
-#define _SCSI_SCSI_CD_H 1
-
-/*
- *	Define two bits always in the same place in byte 2 (flag byte)
- */
-#define	CD_RELADDR	0x01
-#define	CD_MSF		0x02
-
-/*
- * SCSI command format
- */
-
-struct scsi_pause
-{
-	u_int8_t op_code;
-	u_int8_t byte2;
-	u_int8_t unused[6];
-	u_int8_t resume;
-	u_int8_t control;
-};
-#define	PA_PAUSE	1
-#define PA_RESUME	0
-
-struct scsi_play_msf
-{
-	u_int8_t op_code;
-	u_int8_t byte2;
-	u_int8_t unused;
-	u_int8_t start_m;
-	u_int8_t start_s;
-	u_int8_t start_f;
-	u_int8_t end_m;
-	u_int8_t end_s;
-	u_int8_t end_f;
-	u_int8_t control;
-};
-
-struct scsi_play_track
-{
-	u_int8_t op_code;
-	u_int8_t byte2;
-	u_int8_t unused[2];
-	u_int8_t start_track;
-	u_int8_t start_index;
-	u_int8_t unused1;
-	u_int8_t end_track;
-	u_int8_t end_index;
-	u_int8_t control;
-};
-
-struct scsi_play_10
-{
-	u_int8_t op_code;
-	u_int8_t byte2;
-	u_int8_t blk_addr[4];
-	u_int8_t unused;
-	u_int8_t xfer_len[2];
-	u_int8_t control;
-};
-
-struct scsi_play_12
-{
-	u_int8_t op_code;
-	u_int8_t byte2;	/* same as above */
-	u_int8_t blk_addr[4];
-	u_int8_t xfer_len[4];
-	u_int8_t unused;
-	u_int8_t control;
-};
-
-struct scsi_play_rel_12
-{
-	u_int8_t op_code;
-	u_int8_t byte2;	/* same as above */
-	u_int8_t blk_addr[4];
-	u_int8_t xfer_len[4];
-	u_int8_t track;
-	u_int8_t control;
-};
-
-struct scsi_read_header
-{
-	u_int8_t op_code;
-	u_int8_t byte2;
-	u_int8_t blk_addr[4];
-	u_int8_t unused;
-	u_int8_t data_len[2];
-	u_int8_t control;
-};
-
-struct scsi_read_subchannel
-{
-	u_int8_t op_code;
-	u_int8_t byte1;
-	u_int8_t byte2;
-#define	SRS_SUBQ	0x40
-	u_int8_t subchan_format;
-	u_int8_t unused[2];
-	u_int8_t track;
-	u_int8_t data_len[2];
-	u_int8_t control;
-};
-
-struct scsi_read_toc
-{
-	u_int8_t op_code;
-	u_int8_t byte2;
-	u_int8_t unused[4];
-	u_int8_t from_track;
-	u_int8_t data_len[2];
-	u_int8_t control;
-};
-
-struct scsi_read_cd_capacity
-{
-	u_int8_t op_code;
-	u_int8_t byte2;
-	u_int8_t addr_3;	/* Most Significant */
-	u_int8_t addr_2;
-	u_int8_t addr_1;
-	u_int8_t addr_0;	/* Least Significant */
-	u_int8_t unused[3];
-	u_int8_t control;
-};
-
-struct scsi_set_speed
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t readspeed[2];
-	u_int8_t writespeed[2];
-	u_int8_t reserved[5];
-	u_int8_t control;
-};
-
-struct scsi_report_key 
-{
-	u_int8_t opcode;
-	u_int8_t reserved0;
-	u_int8_t lba[4];
-	u_int8_t reserved1[2];
-	u_int8_t alloc_len[2];
-	u_int8_t agid_keyformat;
-#define RK_KF_AGID_MASK		0xc0
-#define RK_KF_AGID_SHIFT	6
-#define RK_KF_KEYFORMAT_MASK	0x3f
-#define RK_KF_AGID		0x00
-#define RK_KF_CHALLENGE		0x01
-#define RF_KF_KEY1		0x02
-#define RK_KF_KEY2		0x03
-#define RF_KF_TITLE		0x04
-#define RF_KF_ASF		0x05
-#define RK_KF_RPC_SET		0x06
-#define RF_KF_RPC_REPORT	0x08
-#define RF_KF_INV_AGID		0x3f
-	u_int8_t control;
-};
-
-/*
- * See the report key structure for key format and AGID definitions.
- */
-struct scsi_send_key
-{
-	u_int8_t opcode;
-	u_int8_t reserved[7];
-	u_int8_t param_len[2];
-	u_int8_t agid_keyformat;
-	u_int8_t control;
-};
-
-struct scsi_read_dvd_structure
-{
-	u_int8_t opcode;
-	u_int8_t reserved;
-	u_int8_t address[4];
-	u_int8_t layer_number;
-	u_int8_t format;
-#define RDS_FORMAT_PHYSICAL		0x00
-#define RDS_FORMAT_COPYRIGHT		0x01
-#define RDS_FORMAT_DISC_KEY		0x02
-#define RDS_FORMAT_BCA			0x03
-#define RDS_FORMAT_MANUFACTURER		0x04
-#define RDS_FORMAT_CMGS_CPM		0x05
-#define RDS_FORMAT_PROT_DISCID		0x06
-#define RDS_FORMAT_DISC_KEY_BLOCK	0x07
-#define RDS_FORMAT_DDS			0x08
-#define RDS_FORMAT_DVDRAM_MEDIA_STAT	0x09
-#define RDS_FORMAT_SPARE_AREA		0x0a
-#define RDS_FORMAT_RMD_BORDEROUT	0x0c
-#define RDS_FORMAT_RMD			0x0d
-#define RDS_FORMAT_LEADIN		0x0e
-#define RDS_FORMAT_DISC_ID		0x0f
-#define RDS_FORMAT_DCB			0x30
-#define RDS_FORMAT_WRITE_PROT		0xc0
-#define RDS_FORMAT_STRUCTURE_LIST	0xff
-	u_int8_t alloc_len[2];
-	u_int8_t agid;
-	u_int8_t control;
-};
-
-/*
- * Opcodes
- */
-#define READ_CD_CAPACITY	0x25	/* slightly different from disk */
-#define READ_SUBCHANNEL		0x42	/* cdrom read Subchannel */
-#define READ_TOC		0x43	/* cdrom read TOC */
-#define READ_HEADER		0x44	/* cdrom read header */
-#define PLAY_10			0x45	/* cdrom play  'play audio' mode */
-#define PLAY_MSF		0x47	/* cdrom play Min,Sec,Frames mode */
-#define PLAY_TRACK		0x48	/* cdrom play track/index mode */
-#define PLAY_TRACK_REL		0x49	/* cdrom play track/index mode */
-#define PAUSE			0x4b	/* cdrom pause in 'play audio' mode */
-#define SEND_KEY		0xa3	/* dvd send key command */
-#define REPORT_KEY		0xa4	/* dvd report key command */
-#define PLAY_12			0xa5	/* cdrom pause in 'play audio' mode */
-#define PLAY_TRACK_REL_BIG	0xa9	/* cdrom play track/index mode */
-#define READ_DVD_STRUCTURE	0xad	/* read dvd structure */
-#define SET_CD_SPEED		0xbb	/* set c/dvd speed */
-
-struct scsi_report_key_data_header
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-};
-
-struct scsi_report_key_data_agid
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[5];
-	u_int8_t agid;
-#define RKD_AGID_MASK	0xc0
-#define RKD_AGID_SHIFT	6
-};
-
-struct scsi_report_key_data_challenge
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved0[2];
-	u_int8_t challenge_key[10];
-	u_int8_t reserved1[2];
-};
-
-struct scsi_report_key_data_key1_key2
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved0[2];
-	u_int8_t key1[5];
-	u_int8_t reserved1[3];
-};
-
-struct scsi_report_key_data_title
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved0[2];
-	u_int8_t byte0;
-#define RKD_TITLE_CPM		0x80
-#define RKD_TITLE_CPM_SHIFT	7
-#define RKD_TITLE_CP_SEC	0x40
-#define RKD_TITLE_CP_SEC_SHIFT	6
-#define RKD_TITLE_CMGS_MASK	0x30
-#define RKD_TITLE_CMGS_SHIFT	4
-#define RKD_TITLE_CMGS_NO_RST	0x00
-#define RKD_TITLE_CMGS_RSVD	0x10
-#define RKD_TITLE_CMGS_1_GEN	0x20
-#define RKD_TITLE_CMGS_NO_COPY	0x30
-	u_int8_t title_key[5];
-	u_int8_t reserved1[2];
-};
-
-struct scsi_report_key_data_asf
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[5];
-	u_int8_t success;
-#define RKD_ASF_SUCCESS	0x01
-};
-
-struct scsi_report_key_data_rpc
-{
-	u_int8_t data_len[2];
-	u_int8_t rpc_scheme0;
-#define RKD_RPC_SCHEME_UNKNOWN		0x00
-#define RKD_RPC_SCHEME_PHASE_II		0x01
-	u_int8_t reserved0;
-	u_int8_t byte4;
-#define RKD_RPC_TYPE_MASK		0xC0
-#define RKD_RPC_TYPE_SHIFT		6
-#define RKD_RPC_TYPE_NONE		0x00
-#define RKD_RPC_TYPE_SET		0x40
-#define RKD_RPC_TYPE_LAST_CHANCE	0x80
-#define RKD_RPC_TYPE_PERM		0xC0
-#define RKD_RPC_VENDOR_RESET_MASK	0x38
-#define RKD_RPC_VENDOR_RESET_SHIFT	3
-#define RKD_RPC_USER_RESET_MASK		0x07
-#define RKD_RPC_USER_RESET_SHIFT	0
-	u_int8_t region_mask;
-	u_int8_t rpc_scheme1;
-	u_int8_t reserved1;
-};
-
-struct scsi_send_key_data_rpc
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved0[2];
-	u_int8_t region_code;
-	u_int8_t reserved1[3];
-};
-
-/*
- * Common header for the return data from the READ DVD STRUCTURE command.
- */
-struct scsi_read_dvd_struct_data_header
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-};
-
-struct scsi_read_dvd_struct_data_layer_desc
-{
-	u_int8_t book_type_version;
-#define RDSD_BOOK_TYPE_DVD_ROM	0x00
-#define RDSD_BOOK_TYPE_DVD_RAM	0x10
-#define RDSD_BOOK_TYPE_DVD_R	0x20
-#define RDSD_BOOK_TYPE_DVD_RW	0x30
-#define RDSD_BOOK_TYPE_DVD_PRW	0x90
-#define RDSD_BOOK_TYPE_MASK	0xf0
-#define RDSD_BOOK_TYPE_SHIFT	4
-#define RDSD_BOOK_VERSION_MASK	0x0f
-	/*
-	 * The lower 4 bits of this field is referred to as the "minimum
-	 * rate" field in MMC2, and the "maximum rate" field in MMC3.  Ugh.
-	 */
-	u_int8_t disc_size_max_rate;
-#define RDSD_DISC_SIZE_120MM	0x00
-#define RDSD_DISC_SIZE_80MM	0x10
-#define RDSD_DISC_SIZE_MASK	0xf0
-#define RDSD_DISC_SIZE_SHIFT	4
-#define RDSD_MAX_RATE_0252	0x00
-#define RDSD_MAX_RATE_0504	0x01
-#define RDSD_MAX_RATE_1008	0x02
-#define RDSD_MAX_RATE_NOT_SPEC	0x0f
-#define RDSD_MAX_RATE_MASK	0x0f
-	u_int8_t layer_info;
-#define RDSD_NUM_LAYERS_MASK	0x60
-#define RDSD_NUM_LAYERS_SHIFT	5
-#define RDSD_NL_ONE_LAYER	0x00
-#define RDSD_NL_TWO_LAYERS	0x20
-#define RDSD_TRACK_PATH_MASK	0x10
-#define RDSD_TRACK_PATH_SHIFT	4
-#define RDSD_TP_PTP		0x00
-#define RDSD_TP_OTP		0x10
-#define RDSD_LAYER_TYPE_RO	0x01
-#define RDSD_LAYER_TYPE_RECORD	0x02
-#define RDSD_LAYER_TYPE_RW	0x04
-#define RDSD_LAYER_TYPE_MASK	0x0f
-	u_int8_t density;
-#define RDSD_LIN_DENSITY_0267		0x00
-#define RDSD_LIN_DENSITY_0293		0x10
-#define RDSD_LIN_DENSITY_0409_0435	0x20
-#define RDSD_LIN_DENSITY_0280_0291	0x40
-/* XXX MMC2 uses 0.176um/bit instead of 0.353 as in MMC3 */
-#define RDSD_LIN_DENSITY_0353		0x80
-#define RDSD_LIN_DENSITY_MASK		0xf0
-#define RDSD_LIN_DENSITY_SHIFT		4
-#define RDSD_TRACK_DENSITY_074		0x00
-#define RDSD_TRACK_DENSITY_080		0x01
-#define RDSD_TRACK_DENSITY_0615		0x02
-#define RDSD_TRACK_DENSITY_MASK		0x0f
-	u_int8_t zeros0;
-	u_int8_t main_data_start[3];
-#define RDSD_MAIN_DATA_START_DVD_RO	0x30000
-#define RDSD_MAIN_DATA_START_DVD_RW	0x31000
-	u_int8_t zeros1;
-	u_int8_t main_data_end[3];
-	u_int8_t zeros2;
-	u_int8_t end_sector_layer0[3];
-	u_int8_t bca;
-#define RDSD_BCA	0x80
-#define RDSD_BCA_MASK	0x80
-#define RDSD_BCA_SHIFT	7
-	u_int8_t media_specific[2031];
-};
-
-struct scsi_read_dvd_struct_data_physical
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	struct scsi_read_dvd_struct_data_layer_desc layer_desc;
-};
-
-struct scsi_read_dvd_struct_data_copyright
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved0[2];
-	u_int8_t cps_type;
-#define RDSD_CPS_NOT_PRESENT	0x00
-#define RDSD_CPS_DATA_EXISTS	0x01
-	u_int8_t region_info;
-	u_int8_t reserved1[2];
-};
-
-struct scsi_read_dvd_struct_data_disc_key
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	u_int8_t disc_key[2048];
-};
-
-struct scsi_read_dvd_struct_data_bca
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	u_int8_t bca_info[188]; /* XXX 12-188 bytes */
-};
-
-struct scsi_read_dvd_struct_data_manufacturer
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	u_int8_t manuf_info[2048];
-};
-
-struct scsi_read_dvd_struct_data_copy_manage
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved0[2];
-	u_int8_t byte4;
-#define RDSD_CPM_NO_COPYRIGHT	0x00
-#define RDSD_CPM_HAS_COPYRIGHT	0x80
-#define RDSD_CPM_MASK		0x80
-#define RDSD_CMGS_COPY_ALLOWED	0x00
-#define RDSD_CMGS_ONE_COPY	0x20
-#define RDSD_CMGS_NO_COPIES	0x30
-#define RDSD_CMGS_MASK		0x30
-	u_int8_t reserved1[3];
-};
-
-struct scsi_read_dvd_struct_data_prot_discid
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	u_int8_t prot_discid_data[16];
-};
-
-struct scsi_read_dvd_struct_data_disc_key_blk
-{
-	/*
-	 * Length is 0x6ffe == 28670 for CPRM, 0x3002 == 12990 for CSS2.
-	 */
-	u_int8_t data_len[2];
-	u_int8_t reserved;
-	u_int8_t total_packs;
-	u_int8_t disc_key_pack_data[28668];
-};
-struct scsi_read_dvd_struct_data_dds
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	u_int8_t dds_info[2048];
-};
-
-struct scsi_read_dvd_struct_data_medium_status
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved0[2];
-	u_int8_t byte4;
-#define RDSD_MS_CARTRIDGE	0x80
-#define RDSD_MS_OUT		0x40
-#define RDSD_MS_MSWI		0x08
-#define RDSD_MS_CWP		0x04
-#define RDSD_MS_PWP		0x02
-	u_int8_t disc_type_id;
-#define RDSD_DT_NEED_CARTRIDGE	0x00
-#define RDSD_DT_NO_CART_NEEDED	0x01
-	u_int8_t reserved1;
-	u_int8_t ram_swi_info;
-#define RDSD_SWI_NO_BARE	0x01
-#define RDSD_SWI_UNSPEC		0xff
-};
-
-struct scsi_read_dvd_struct_data_spare_area
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	u_int8_t unused_primary[4];
-	u_int8_t unused_supl[4];
-	u_int8_t allocated_supl[4];
-};
-
-struct scsi_read_dvd_struct_data_rmd_borderout
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	u_int8_t rmd[30720]; 	/* maximum is 30720 bytes */
-};
-
-struct scsi_read_dvd_struct_data_rmd
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	u_int8_t last_sector_num[4];
-	u_int8_t rmd_bytes[32768];  /* This is the maximum */
-};
-
-/*
- * XXX KDM this is the MMC2 version of the structure.
- * The variable positions have changed (in a semi-conflicting way) in the
- * MMC3 spec, although the overall length of the structure is the same.
- */
-struct scsi_read_dvd_struct_data_leadin
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved0[2];
-	u_int8_t field_id_1;
-	u_int8_t app_code;
-	u_int8_t disc_physical_data;
-	u_int8_t last_addr[3];
-	u_int8_t reserved1[2];
-	u_int8_t field_id_2;
-	u_int8_t rwp;
-	u_int8_t rwp_wavelength;
-	u_int8_t optimum_write_strategy;
-	u_int8_t reserved2[4];
-	u_int8_t field_id_3;
-	u_int8_t manuf_id_17_12[6];
-	u_int8_t reserved3;
-	u_int8_t field_id_4;
-	u_int8_t manuf_id_11_6[6];
-	u_int8_t reserved4;
-	u_int8_t field_id_5;
-	u_int8_t manuf_id_5_0[6];
-	u_int8_t reserved5[25];
-};
-
-struct scsi_read_dvd_struct_data_disc_id
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[4];
-	u_int8_t random_num[2];
-	u_int8_t year[4];
-	u_int8_t month[2];
-	u_int8_t day[2];
-	u_int8_t hour[2];
-	u_int8_t minute[2];
-	u_int8_t second[2];
-};
-
-struct scsi_read_dvd_struct_data_generic_dcb
-{
-	u_int8_t content_desc[4];
-#define SCSI_RCB
-	u_int8_t unknown_desc_actions[4];
-#define RDSD_ACTION_RECORDING	0x0001
-#define RDSD_ACTION_READING	0x0002
-#define RDSD_ACTION_FORMAT	0x0004
-#define RDSD_ACTION_MODIFY_DCB	0x0008
-	u_int8_t vendor_id[32];
-	u_int8_t dcb_data[32728];
-};
-
-struct scsi_read_dvd_struct_data_dcb
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	struct scsi_read_dvd_struct_data_generic_dcb dcb;
-};
-
-struct read_dvd_struct_write_prot
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved0[2];
-	u_int8_t write_prot_status;
-#define RDSD_WPS_MSWI		0x08
-#define RDSD_WPS_CWP		0x04
-#define RDSD_WPS_PWP		0x02
-#define RDSD_WPS_SWPP		0x01
-	u_int8_t reserved[3];
-};
-
-struct read_dvd_struct_list_entry
-{
-	u_int8_t format_code;
-	u_int8_t sds_rds;
-#define RDSD_SDS_NOT_WRITEABLE	0x00
-#define RDSD_SDS_WRITEABLE	0x80
-#define RDSD_SDS_MASK		0x80
-#define RDSD_RDS_NOT_READABLE	0x00
-#define RDSD_RDS_READABLE	0x40
-#define RDSD_RDS_MASK		0x40
-	u_int8_t struct_len[2];
-};
-
-struct read_dvd_struct_data_list
-{
-	u_int8_t data_len[2];
-	u_int8_t reserved[2];
-	struct read_dvd_struct_list_entry entries[0];
-};
-
-struct scsi_read_cd_cap_data
-{
-	u_int8_t addr_3;	/* Most significant */
-	u_int8_t addr_2;
-	u_int8_t addr_1;
-	u_int8_t addr_0;	/* Least significant */
-	u_int8_t length_3;	/* Most significant */
-	u_int8_t length_2;
-	u_int8_t length_1;
-	u_int8_t length_0;	/* Least significant */
-};
-
-struct cd_audio_page
-{
-	u_int8_t page_code;
-#define	CD_PAGE_CODE		0x3F
-#define	AUDIO_PAGE		0x0e
-#define	CD_PAGE_PS		0x80
-	u_int8_t param_len;
-	u_int8_t flags;
-#define	CD_PA_SOTC		0x02
-#define	CD_PA_IMMED		0x04
-	u_int8_t unused[2];
-	u_int8_t format_lba;
-#define	CD_PA_FORMAT_LBA	0x0F
-#define	CD_PA_APR_VALID		0x80
-	u_int8_t lb_per_sec[2];
-	struct	port_control
-	{
-		u_int8_t channels;
-#define	CHANNEL			0x0F
-#define	CHANNEL_0		1
-#define	CHANNEL_1		2
-#define	CHANNEL_2		4
-#define	CHANNEL_3		8
-#define	LEFT_CHANNEL		CHANNEL_0
-#define	RIGHT_CHANNEL		CHANNEL_1
-		u_int8_t volume;
-	} port[4];
-#define	LEFT_PORT		0
-#define	RIGHT_PORT		1
-};
-
-union cd_pages
-{
-	struct cd_audio_page audio;
-};
-
-struct cd_mode_data_10
-{
-	struct scsi_mode_header_10 header;
-	struct scsi_mode_blk_desc  blk_desc;
-	union cd_pages page;
-};
-
-struct cd_mode_data
-{
-	struct scsi_mode_header_6 header;
-	struct scsi_mode_blk_desc blk_desc;
-	union cd_pages page;
-};
-
-union cd_mode_data_6_10
-{
-	struct cd_mode_data mode_data_6;
-	struct cd_mode_data_10 mode_data_10;
-};
-
-struct cd_mode_params
-{
-	STAILQ_ENTRY(cd_mode_params)	links;
-	int				cdb_size;
-	int				alloc_len;
-	u_int8_t			*mode_buf;
-};
-
-__BEGIN_DECLS
-void scsi_report_key(struct ccb_scsiio *csio, uint32_t retries,
-		     void (*cbfcnp)(struct cam_periph *, union ccb *),
-		     u_int8_t tag_action, uint32_t lba, u_int8_t agid,
-		     u_int8_t key_format, u_int8_t *data_ptr,
-		     uint32_t dxfer_len, u_int8_t sense_len,
-		     uint32_t timeout);
-
-void scsi_send_key(struct ccb_scsiio *csio, uint32_t retries,
-		   void (*cbfcnp)(struct cam_periph *, union ccb *),
-		   u_int8_t tag_action, u_int8_t agid, u_int8_t key_format,
-		   u_int8_t *data_ptr, uint32_t dxfer_len, u_int8_t sense_len,
-		   uint32_t timeout);
-
-void scsi_read_dvd_structure(struct ccb_scsiio *csio, uint32_t retries,
-			     void (*cbfcnp)(struct cam_periph *, union ccb *),
-			     u_int8_t tag_action, uint32_t address,
-			     u_int8_t layer_number, u_int8_t format,
-			     u_int8_t agid, u_int8_t *data_ptr,
-			     uint32_t dxfer_len, u_int8_t sense_len,
-			     uint32_t timeout);
-
-__END_DECLS
-
-#endif /*_SCSI_SCSI_CD_H*/
-
diff --git a/include.new/cam/scsi/scsi_ch.h b/include.new/cam/scsi/scsi_ch.h
deleted file mode 100644
index 239d7bb..0000000
--- a/include.new/cam/scsi/scsi_ch.h
+++ /dev/null
@@ -1,510 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/cam/scsi/scsi_ch.h 249658 2013-04-19 20:03:51Z ken $ */
-/*	$NetBSD: scsi_changer.h,v 1.11 1998/02/13 08:28:32 enami Exp $	*/
-
-/*-
- * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
- * All rights reserved.
- *
- * Partially based on an autochanger driver written by Stefan Grefen
- * and on an autochanger driver written by the Systems Programming Group
- * at the University of Utah Computer Science Department.
- *
- * 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 acknowledgements:
- *	This product includes software developed by Jason R. Thorpe
- *	for And Communications, http://www.and.com/
- * 4. 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 ``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 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.
- */
-
-/*
- * SCSI changer interface description
- */
-
-/*-
- * Partially derived from software written by Stefan Grefen
- * (grefen@goofy.zdv.uni-mainz.de soon grefen@convex.com)
- * based on the SCSI System by written Julian Elischer (julian@tfs.com)
- * for TRW Financial Systems.
- *
- * TRW Financial Systems, in accordance with their agreement with Carnegie
- * Mellon University, makes this software available to CMU to distribute
- * or use in any manner that they see fit as long as this message is kept with 
- * the software. For this reason TFS also grants any other persons or
- * organisations permission to use or modify this software.
- *
- * TFS supplies this software to be publicly redistributed
- * on the understanding that TFS is not responsible for the correct
- * functioning of this software in any circumstances.
- *
- * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- */
-
-#ifndef _SCSI_SCSI_CH_H
-#define _SCSI_SCSI_CH_H 1
-
-#include <sys/cdefs.h>
-
-/*
- * SCSI command format
- */
-
-/*
- * Exchange the medium in the source element with the medium
- * located at the destination element.
- */
-struct scsi_exchange_medium {
-	u_int8_t	opcode;
-#define EXCHANGE_MEDIUM		0xa6
-	u_int8_t	byte2;
-	u_int8_t	tea[2];	/* transport element address */
-	u_int8_t	src[2];	/* source address */
-	u_int8_t	fdst[2]; /* first destination address */
-	u_int8_t	sdst[2]; /* second destination address */
-	u_int8_t	invert;
-#define EXCHANGE_MEDIUM_INV1	0x01
-#define EXCHANGE_MEDIUM_INV2	0x02
-	u_int8_t	control;
-};
-
-/*
- * Cause the medium changer to check all elements for medium and any
- * other status relevant to the element.
- */
-struct scsi_initialize_element_status {
-	u_int8_t	opcode;
-#define INITIALIZE_ELEMENT_STATUS	0x07
-	u_int8_t	byte2;
-	u_int8_t	reserved[3];
-	u_int8_t	control;
-};
-
-/*
- * Request the changer to move a unit of media from the source element
- * to the destination element.
- */
-struct scsi_move_medium {
-	u_int8_t	opcode;
-	u_int8_t	byte2;
-	u_int8_t	tea[2];	/* transport element address */
-	u_int8_t	src[2];	/* source element address */
-	u_int8_t	dst[2];	/* destination element address */
-	u_int8_t	reserved[2];
-	u_int8_t	invert;
-#define MOVE_MEDIUM_INVERT	0x01
-	u_int8_t	control;
-};
-
-/*
- * Position the specified transport element (picker) in front of
- * the destination element specified.
- */
-struct scsi_position_to_element {
-	u_int8_t	opcode;
-	u_int8_t	byte2;
-	u_int8_t	tea[2];	/* transport element address */
-	u_int8_t	dst[2];	/* destination element address */
-	u_int8_t	reserved[2];
-	u_int8_t	invert;
-#define POSITION_TO_ELEMENT_INVERT	0x01
-	u_int8_t	control;
-};
-
-/*
- * Request that the changer report the status of its internal elements.
- */
-struct scsi_read_element_status {
-	u_int8_t	opcode;
-	u_int8_t	byte2;
-#define	READ_ELEMENT_STATUS_VOLTAG	0x10	/* report volume tag info */
-	/* ...next 4 bits are an element type code... */
-	u_int8_t	sea[2];	/* starting element address */
-	u_int8_t	count[2]; /* number of elements */
-	u_int8_t	flags;
-#define	READ_ELEMENT_STATUS_DVCID	0x01 /* report device serial number */
-#define	READ_ELEMENT_STATUS_CURDATA	0x02 /* allow motion during command */
-
-	u_int8_t	len[3];	/* length of data buffer */
-	u_int8_t	reserved1;
-	u_int8_t	control;
-};
-
-struct scsi_request_volume_element_address {
-	u_int8_t	opcode;
-	u_int8_t	byte2;
-#define	REQUEST_VOLUME_ELEMENT_ADDRESS_VOLTAG	0x10
-	/* ...next 4 bits are an element type code... */
-	u_int8_t	eaddr[2];	/* element address */
-	u_int8_t	count[2];	/* number of elements */
-	u_int8_t	reserved0;
-	u_int8_t	len[3];		/* length of data buffer */
-	u_int8_t	reserved1;
-	u_int8_t	control;
-};
-
-/* XXX scsi_release */
-
-/*
- * Changer-specific mode page numbers.
- */
-#define	CH_ELEMENT_ADDR_ASSIGN_PAGE	0x1D
-#define	CH_TRANS_GEOM_PARAMS_PAGE	0x1E
-#define	CH_DEVICE_CAP_PAGE		0x1F
-
-/*
- * Data returned by READ ELEMENT STATUS consists of an 8-byte header
- * followed by one or more read_element_status_pages.
- */
-struct read_element_status_header {
-	u_int8_t	fear[2];  /* first element address reported */
-	u_int8_t	count[2]; /* number of elements available */
-	u_int8_t	reserved;
-	u_int8_t	nbytes[3]; /* byte count of all pages */
-};
-
-struct read_element_status_page_header {
-	u_int8_t	type;	/* element type code; see type codes below */
-	u_int8_t	flags;
-#define	READ_ELEMENT_STATUS_AVOLTAG	0x40
-#define	READ_ELEMENT_STATUS_PVOLTAG	0x80
-	u_int8_t	edl[2];	/* element descriptor length */
-	u_int8_t	reserved;
-	u_int8_t	nbytes[3]; /* byte count of all descriptors */
-};
-
-/*
- * Format of a volume tag
- */
-
-struct volume_tag {
-	u_int8_t	vif[32];	/* volume identification field */
-	u_int8_t	reserved[2];
-	u_int8_t	vsn[2];		/* volume sequence number */
-};
-
-struct read_element_status_device_id {
-	u_int8_t	prot_code_set;
-#define	READ_ELEMENT_STATUS_CODE_SET(p) ((p) & 0x0F)
-#define	READ_ELEMENT_STATUS_PROTOCOL_ID(p) ((p) >> 4)
-
-	u_int8_t	piv_assoc_designator_type;
-#define	READ_ELEMENT_STATUS_PIV_SET 0x80
-#define	READ_ELEMENT_STATUS_ASSOCIATION(p) ((p) >> 4)
-#define	READ_ELEMENT_STATUS_DESIGNATOR_TYPE(p) ((p) & 0x0F)
-
-	u_int8_t	reserved2;
-	u_int8_t	designator_length;
-	u_int8_t	designator[256]; /* Allocate max length */
-};
-
-struct read_element_status_descriptor {
-	u_int8_t	eaddr[2];	/* element address */
-	u_int8_t	flags1;
-
-#define	READ_ELEMENT_STATUS_FULL	0x01
-#define	READ_ELEMENT_STATUS_IMPEXP	0x02
-#define	READ_ELEMENT_STATUS_EXCEPT	0x04
-#define	READ_ELEMENT_STATUS_ACCESS	0x08
-#define	READ_ELEMENT_STATUS_EXENAB	0x10
-#define	READ_ELEMENT_STATUS_INENAB	0x20
-
-#define	READ_ELEMENT_STATUS_MT_MASK1	0x05
-#define	READ_ELEMENT_STATUS_ST_MASK1	0x0c
-#define	READ_ELEMENT_STATUS_IE_MASK1	0x3f
-#define	READ_ELEMENT_STATUS_DT_MASK1	0x0c
-
-	u_int8_t	reserved0;
-	u_int8_t	sense_code;
-	u_int8_t	sense_qual;
-
-	union {
-		struct {
-			u_int8_t	dt_scsi_flags;
-
-#define	READ_ELEMENT_STATUS_DT_LUNMASK	0x07
-#define	READ_ELEMENT_STATUS_DT_LUVALID	0x10
-#define	READ_ELEMENT_STATUS_DT_IDVALID	0x20
-#define	READ_ELEMENT_STATUS_DT_NOTBUS	0x80
-
-			u_int8_t	dt_scsi_addr;
-			u_int8_t	reserved1;
-		} scsi_2;
-
-		/* reserved and obsolete (as of SCSI-3) fields */
-		u_int8_t	reserved_or_obsolete[3];
-	} dt_or_obsolete;
-
-	u_int8_t	flags2;
-#define	READ_ELEMENT_STATUS_INVERT		0x40
-#define	READ_ELEMENT_STATUS_SVALID		0x80
-#define	READ_ELEMENT_STATUS_ED			0x80
-#define	READ_ELEMENT_STATUS_MEDIA_TYPE_MASK	0x07
-
-	u_int8_t	ssea[2];	/* source storage element address */
-
-	union {
-		struct volume_tag			pvoltag;
-		struct volume_tag 			voltag[2];
-		struct read_element_status_device_id	devid;
-		struct {
-			struct volume_tag			pvoltag;
-			struct read_element_status_device_id	devid;
-		} pvol_and_devid;
-		struct {
-			struct volume_tag			voltag[2];
-			struct read_element_status_device_id	devid;
-		} vol_tags_and_devid;
-	} voltag_devid;
-};
-
-/* XXX add data returned by REQUEST VOLUME ELEMENT ADDRESS */
-
-/* Element type codes */
-#define ELEMENT_TYPE_MASK	0x0f	/* Note: these aren't bits */
-#define ELEMENT_TYPE_ALL	0x00
-#define ELEMENT_TYPE_MT		0x01
-#define ELEMENT_TYPE_ST		0x02
-#define ELEMENT_TYPE_IE		0x03
-#define ELEMENT_TYPE_DT		0x04
-
-/*
- * XXX The following definitions should be common to all SCSI device types.
- */
-#define PGCODE_MASK	0x3f	/* valid page number bits in pg_code */
-#define PGCODE_PS	0x80	/* indicates page is savable */
-
-/*
- * Send volume tag information to the changer
- */
-
-struct scsi_send_volume_tag {
-	u_int8_t	opcode;
-#define SEND_VOLUME_TAG	0xb6
-	u_int8_t	byte2;
-	u_int8_t	ea[2];		/* element address */
-	u_int8_t	reserved2;
-  	u_int8_t	sac;		/* send action code */
-
-#define SEND_VOLUME_TAG_ASSERT_PRIMARY		0x08
-#define SEND_VOLUME_TAG_ASSERT_ALTERNATE	0x09
-#define SEND_VOLUME_TAG_REPLACE_PRIMARY		0x0a
-#define SEND_VOLUME_TAG_REPLACE_ALTERNATE	0x0b
-#define SEND_VOLUME_TAG_UNDEFINED_PRIMARY	0x0c
-#define SEND_VOLUME_TAG_UNDEFINED_ALTERNATE	0x0d
-
-	u_int8_t	reserved4[2];
-	u_int8_t	pll[2];		/* parameter list length */
-	u_int8_t	reserved5;
-	u_int8_t	control;
-};
-
-/*
- * Parameter format for SEND VOLUME TAG
- */
-
-struct scsi_send_volume_tag_parameters {
-	u_int8_t	vitf[32];	/* volume tag identification template */
-	u_int8_t	reserved1[2];
-	u_int8_t	minvsn[2];	/* minimum volume sequence number */
-	u_int8_t	reserved2[2];
-	u_int8_t	maxvsn[2];	/* maximum volume sequence number */
-};
-
-/*
- * Device capabilities page.
- *
- * This page defines characteristics of the elemenet types in the
- * medium changer device.
- *
- * Note in the definitions below, the following abbreviations are
- * used:
- *		MT	Medium transport element (picker)
- *		ST	Storage transport element (slot)
- *		IE	Import/export element (portal)
- *		DT	Data tranfer element (tape/disk drive)
- */
-struct page_device_capabilities {
-	u_int8_t	pg_code;	/* page code (0x1f) */
-	u_int8_t	pg_length;	/* page length (0x12) */
-
-	/*
-	 * The STOR_xx bits indicate that an element of a given
-	 * type may provide independent storage for a unit of
-	 * media.  The top four bits of this value are reserved.
-	 */
-	u_int8_t	stor;
-#define STOR_MT		0x01
-#define STOR_ST		0x02
-#define STOR_IE		0x04
-#define STOR_DT		0x08
-
-	u_int8_t	reserved0;
-
-	/*
-	 * The MOVE_TO_yy bits indicate the changer supports
-	 * moving a unit of medium from an element of a given type to an
-	 * element of type yy.  This is used to determine if a given
-	 * MOVE MEDIUM command is legal.  The top four bits of each
-	 * of these values are reserved.
-	 */
-	u_int8_t	move_from[CHET_MAX + 1];
-#define MOVE_TO_MT	0x01
-#define MOVE_TO_ST	0x02
-#define MOVE_TO_IE	0x04
-#define MOVE_TO_DT	0x08
-
-	u_int8_t	reserved1[4];
-
-	/*
-	 * Similar to above, but for EXCHANGE MEDIUM.
-	 */
-	u_int8_t	exchange_with[CHET_MAX + 1];
-#define EXCHANGE_WITH_MT	0x01
-#define EXCHANGE_WITH_ST	0x02
-#define EXCHANGE_WITH_IE	0x04
-#define EXCHANGE_WITH_DT	0x08
-};
-
-/*
- * Medium changer elemement address assignment page.
- *
- * Some of these fields can be a little confusing, so an explanation
- * is in order.
- *
- * Each component within a medium changer apparatus is called an
- * "element".
- *
- * The "medium transport element address" is the address of the first
- * picker (robotic arm).  "Number of medium transport elements" tells
- * us how many pickers exist in the changer.
- *
- * The "first storage element address" is the address of the first
- * slot in the tape or disk magazine.  "Number of storage elements" tells
- * us how many slots exist in the changer.
- *
- * The "first import/export element address" is the address of the first
- * medium portal accessible both by the medium changer and an outside
- * human operator.  This is where the changer might deposit tapes destined
- * for some vault.  The "number of import/export elements" tells us
- * not many of these portals exist in the changer.  NOTE: this number may
- * be 0.
- *
- * The "first data transfer element address" is the address of the first
- * tape or disk drive in the changer.  "Number of data transfer elements"
- * tells us how many drives exist in the changer.
- */
-struct page_element_address_assignment {
-	u_int8_t	pg_code;	/* page code (0x1d) */
-	u_int8_t	pg_length;	/* page length (0x12) */
-
-	/* Medium transport element address */
-	u_int8_t	mtea[2];
-
-	/* Number of medium transport elements */
-	u_int8_t	nmte[2];
-
-	/* First storage element address */
-	u_int8_t	fsea[2];
-
-	/* Number of storage elements */
-	u_int8_t	nse[2];
-
-	/* First import/export element address */
-	u_int8_t	fieea[2];
-
-	/* Number of import/export elements */
-	u_int8_t	niee[2];
-
-	/* First data transfer element address */
-	u_int8_t	fdtea[2];
-
-	/* Number of data trafer elements */
-	u_int8_t	ndte[2];
-
-	u_int8_t	reserved[2];
-};
-
-/*
- * Transport geometry parameters page.
- *
- * Defines whether each medium transport element is a member of a set of
- * elements that share a common robotics subsystem and whether the element
- * is capable of media rotation.  One transport geometry descriptor is
- * transferred for each medium transport element, beginning with the first
- * medium transport element (other than the default transport element address
- * of 0).
- */
-struct page_transport_geometry_parameters {
-	u_int8_t	pg_code;	/* page code (0x1e) */
-	u_int8_t	pg_length;	/* page length; variable */
-
-	/* Transport geometry descriptor(s) are here. */
-
-	u_int8_t	misc;
-#define CAN_ROTATE	0x01
-
-	/* Member number in transport element set. */
-	u_int8_t	member;
-};
-
-__BEGIN_DECLS
-void scsi_move_medium(struct ccb_scsiio *csio, uint32_t retries,
-		      void (*cbfcnp)(struct cam_periph *, union ccb *),
-		      u_int8_t tag_action, uint32_t tea, uint32_t src,
-		      uint32_t dst, int invert, u_int8_t sense_len,
-		      uint32_t timeout);
-
-void scsi_exchange_medium(struct ccb_scsiio *csio, uint32_t retries,
-			  void (*cbfcnp)(struct cam_periph *, union ccb *),
-			  u_int8_t tag_action, uint32_t tea, uint32_t src,
-			  uint32_t dst1, uint32_t dst2, int invert1,
-			  int invert2, u_int8_t sense_len, uint32_t timeout);
-
-void scsi_position_to_element(struct ccb_scsiio *csio, uint32_t retries,
-			      void (*cbfcnp)(struct cam_periph *, union ccb *),
-			      u_int8_t tag_action, uint32_t tea, uint32_t dst,
-			      int invert, u_int8_t sense_len,
-			      uint32_t timeout);
-
-void scsi_read_element_status(struct ccb_scsiio *csio, uint32_t retries,
-			      void (*cbfcnp)(struct cam_periph *, union ccb *),
-			      u_int8_t tag_action, int voltag, uint32_t sea,
-			      int curdata, int dvcid,
-			      uint32_t count, u_int8_t *data_ptr,
-			      uint32_t dxfer_len, u_int8_t sense_len,
-			      uint32_t timeout);
-
-void scsi_initialize_element_status(struct ccb_scsiio *csio, uint32_t retries,
-			       void (*cbfcnp)(struct cam_periph *, union ccb *),
-			       u_int8_t tag_action, u_int8_t sense_len,
-			       uint32_t timeout);
-void scsi_send_volume_tag(struct ccb_scsiio *csio, uint32_t retries,
-			  void (*cbfcnp)(struct cam_periph *, union ccb *),
-			  u_int8_t tag_action, 
-			  u_int16_t element_address,
-			  u_int8_t send_action_code,
-			  struct scsi_send_volume_tag_parameters *parameters,
-			  u_int8_t sense_len, uint32_t timeout);
-__END_DECLS
-
-#endif /* _SCSI_SCSI_CH_H */
diff --git a/include.new/cam/scsi/scsi_da.h b/include.new/cam/scsi/scsi_da.h
deleted file mode 100644
index 6f9a8f3..0000000
--- a/include.new/cam/scsi/scsi_da.h
+++ /dev/null
@@ -1,586 +0,0 @@
-/*
- * Structures and definitions for SCSI commands to Direct Access Devices
- */
-
-/*-
- * Some lines of this file come from a file of the name "scsi.h"
- * distributed by OSF as part of mach2.5,
- *  so the following disclaimer has been kept.
- *
- * Copyright 1990 by Open Software Foundation,
- * Grenoble, FRANCE
- *
- * 		All Rights Reserved
- *
- *   Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both the copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OSF or Open Software
- * Foundation not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission.
- *
- *   OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
- * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*-
- * Largely written by Julian Elischer (julian@tfs.com)
- * for TRW Financial Systems.
- *
- * TRW Financial Systems, in accordance with their agreement with Carnegie
- * Mellon University, makes this software available to CMU to distribute
- * or use in any manner that they see fit as long as this message is kept with
- * the software. For this reason TFS also grants any other persons or
- * organisations permission to use or modify this software.
- *
- * TFS supplies this software to be publicly redistributed
- * on the understanding that TFS is not responsible for the correct
- * functioning of this software in any circumstances.
- *
- * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
- * $FreeBSD: releng/10.2/sys/cam/scsi/scsi_da.h 278170 2015-02-03 22:18:48Z ken $
- */
-
-#ifndef	_SCSI_SCSI_DA_H
-#define _SCSI_SCSI_DA_H 1
-
-#include <sys/cdefs.h>
-
-struct scsi_rezero_unit
-{
-	u_int8_t opcode;
-#define SRZU_LUN_MASK 0xE0
-	u_int8_t byte2;
-	u_int8_t reserved[3];
-	u_int8_t control;
-};
-
-/*
- * NOTE:  The lower three bits of byte2 of the format CDB are the same as
- * the lower three bits of byte2 of the read defect data CDB, below.
- */
-struct scsi_format_unit
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define FU_FORMAT_MASK	SRDD10_DLIST_FORMAT_MASK
-#define FU_BLOCK_FORMAT	SRDD10_BLOCK_FORMAT
-#define FU_BFI_FORMAT	SRDD10_BYTES_FROM_INDEX_FORMAT
-#define FU_PHYS_FORMAT	SRDD10_PHYSICAL_SECTOR_FORMAT
-#define FU_CMPLST	0x08
-#define FU_FMT_DATA	0x10
-	u_int8_t vendor_specific;
-	u_int8_t interleave[2];
-	u_int8_t control;
-};
-
-struct scsi_reassign_blocks
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t unused[3];
-	u_int8_t control;
-};
-
-struct scsi_read_defect_data_10
-{
-	uint8_t opcode;
-	uint8_t byte2;
-#define SRDD10_GLIST 0x08
-#define SRDD10_PLIST 0x10
-#define SRDD10_DLIST_FORMAT_MASK 0x07
-#define SRDD10_BLOCK_FORMAT            0x00
-#define SRDD10_EXT_BFI_FORMAT 	       0x01
-#define SRDD10_EXT_PHYS_FORMAT 	       0x02
-#define SRDD10_LONG_BLOCK_FORMAT       0x03
-#define SRDD10_BYTES_FROM_INDEX_FORMAT 0x04
-#define SRDD10_PHYSICAL_SECTOR_FORMAT  0x05
-#define SRDD10_VENDOR_FORMAT	       0x06
-	uint8_t format;
-	uint8_t reserved[4];
-	uint8_t alloc_length[2];
-#define	SRDD10_MAX_LENGTH		0xffff
-	uint8_t control;
-};
-
-struct scsi_sanitize
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-#define SSZ_SERVICE_ACTION_OVERWRITE         0x01
-#define SSZ_SERVICE_ACTION_BLOCK_ERASE       0x02
-#define SSZ_SERVICE_ACTION_CRYPTO_ERASE      0x03
-#define SSZ_SERVICE_ACTION_EXIT_MODE_FAILURE 0x1F
-#define SSZ_UNRESTRICTED_EXIT                0x20
-#define SSZ_IMMED                            0x80
-	u_int8_t reserved[5];
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-struct scsi_sanitize_parameter_list
-{
-	u_int8_t byte1;
-#define SSZPL_INVERT 0x80
-	u_int8_t reserved;
-	u_int8_t length[2];
-	/* Variable length initialization pattern. */
-#define SSZPL_MAX_PATTERN_LENGTH 65535
-};
-
-struct scsi_read_defect_data_12
-{
-	uint8_t opcode;
-#define SRDD12_GLIST 0x08
-#define SRDD12_PLIST 0x10
-#define SRDD12_DLIST_FORMAT_MASK 0x07
-#define SRDD12_BLOCK_FORMAT            SRDD10_BLOCK_FORMAT
-#define SRDD12_BYTES_FROM_INDEX_FORMAT SRDD10_BYTES_FROM_INDEX_FORMAT
-#define SRDD12_PHYSICAL_SECTOR_FORMAT  SRDD10_PHYSICAL_SECTOR_FORMAT
-	uint8_t format;
-	uint8_t address_descriptor_index[4];
-	uint8_t alloc_length[4];
-#define	SRDD12_MAX_LENGTH		0xffffffff
-	uint8_t reserved;
-	uint8_t control;
-};
-
-
-/*
- * Opcodes
- */
-#define REZERO_UNIT		0x01
-#define FORMAT_UNIT		0x04
-#define	REASSIGN_BLOCKS		0x07
-#define MODE_SELECT		0x15
-#define MODE_SENSE		0x1a
-#define	READ_FORMAT_CAPACITIES	0x23
-#define	WRITE_AND_VERIFY	0x2e
-#define	VERIFY			0x2f
-#define READ_DEFECT_DATA_10	0x37
-#define SANITIZE		0x48
-#define READ_DEFECT_DATA_12	0xb7
-
-struct format_defect_list_header
-{
-	u_int8_t reserved;
-	u_int8_t byte2;
-#define FU_DLH_VS	0x01
-#define FU_DLH_IMMED	0x02
-#define FU_DLH_DSP	0x04
-#define FU_DLH_IP	0x08
-#define FU_DLH_STPF	0x10
-#define FU_DLH_DCRT	0x20
-#define FU_DLH_DPRY	0x40
-#define FU_DLH_FOV	0x80
-	u_int8_t defect_list_length[2];
-};
-
-struct format_ipat_descriptor
-{
-	u_int8_t byte1;
-#define	FU_INIT_NO_HDR		0x00
-#define FU_INIT_LBA_MSB		0x40
-#define FU_INIT_LBA_EACH	0x80
-#define FU_INIT_SI		0x20
-	u_int8_t pattern_type;
-#define FU_INIT_PAT_DEFAULT	0x00
-#define FU_INIT_PAT_REPEAT	0x01
-	u_int8_t pat_length[2];
-};
-
-struct scsi_read_format_capacities
-{
-	uint8_t	opcode;		/* READ_FORMAT_CAPACITIES */
-	uint8_t	byte2;
-#define	SRFC_LUN_MASK	0xE0
-	uint8_t	reserved0[5];
-	uint8_t	alloc_length[2];
-	uint8_t	reserved1[3];
-};
-
-struct scsi_verify_10
-{
-	uint8_t	opcode;		/* VERIFY(10) */
-	uint8_t	byte2;
-#define	SVFY_LUN_MASK	0xE0
-#define	SVFY_RELADR	0x01
-#define	SVFY_BYTCHK	0x02
-#define	SVFY_DPO	0x10
-	uint8_t	addr[4];	/* LBA to begin verification at */
-	uint8_t	group;
-	uint8_t	length[2];		/* number of blocks to verify */
-	uint8_t	control;
-};
-
-struct scsi_verify_12
-{
-	uint8_t	opcode;		/* VERIFY(12) */
-	uint8_t	byte2;
-	uint8_t	addr[4];	/* LBA to begin verification at */
-	uint8_t	length[4];		/* number of blocks to verify */
-	uint8_t	group;
-	uint8_t	control;
-};
-
-struct scsi_verify_16
-{
-	uint8_t	opcode;		/* VERIFY(16) */
-	uint8_t	byte2;
-	uint8_t	addr[8];	/* LBA to begin verification at */
-	uint8_t	length[4];		/* number of blocks to verify */
-	uint8_t	group;
-	uint8_t	control;
-};
-
-struct scsi_compare_and_write
-{
-	uint8_t	opcode;		/* COMPARE AND WRITE */
-	uint8_t	byte2;
-	uint8_t	addr[8];	/* LBA to begin verification at */
-	uint8_t	reserved[3];
-	uint8_t	length;		/* number of blocks */
-	uint8_t	group;
-	uint8_t	control;
-};
-
-struct scsi_write_and_verify
-{
-	uint8_t	opcode;		/* WRITE_AND_VERIFY */
-	uint8_t	byte2;
-#define	SWVY_LUN_MASK	0xE0
-#define	SWVY_RELADR	0x01
-#define	SWVY_BYTECHK	0x02
-#define	SWVY_DPO	0x10
-	uint8_t	addr[4];	/* LBA to begin verification at */
-	uint8_t	reserved0[1];
-	uint8_t	len[2];		/* number of blocks to write and verify */
-	uint8_t	reserved1[3];
-};
-
-/*
- * Replies to READ_FORMAT_CAPACITIES look like this:
- *
- * struct format_capacity_list_header
- * struct format_capacity_descriptor[1..n]
- *
- * These are similar, but not totally identical to, the
- * defect list used to format a rigid disk.
- *
- * The appropriate csio_decode() format string looks like this:
- * "{} *i3 {Len} i1 {Blocks} i4 {} *b6 {Code} b2 {Blocklen} i3"
- *
- * If the capacity_list_length is greater than
- * sizeof(struct format_capacity_descriptor), then there are
- * additional format capacity descriptors available which
- * denote which format(s) the drive can handle.
- *
- * (Source: USB Mass Storage UFI Specification)
- */
-
-struct format_capacity_list_header {
-	uint8_t	unused[3];
-	uint8_t	capacity_list_length;
-};
-
-struct format_capacity_descriptor {
-	uint8_t	nblocks[4];	/* total number of LBAs */
-	uint8_t	byte4;		/* only present in max/cur descriptor */
-#define FCD_CODE_MASK	0x03	/* mask for code field above */
-#define FCD_UNFORMATTED	0x01	/* unformatted media present,
-				 * maximum capacity returned */
-#define FCD_FORMATTED	0x02	/* formatted media present,
-				 * current capacity returned */
-#define FCD_NOMEDIA	0x03	/* no media present,
-				 * maximum device capacity returned */
-	uint8_t	block_length[3];	/* length of an LBA in bytes */
-};
-
-struct scsi_reassign_blocks_data
-{
-	u_int8_t reserved[2];
-	u_int8_t length[2];
-	struct {
-		u_int8_t dlbaddr[4];	/* defect logical block address */
-	} defect_descriptor[1];
-};
-
-
-/*
- * This is the list header for the READ DEFECT DATA(10) command above.
- * It may be a bit wrong to append the 10 at the end of the data structure,
- * since it's only 4 bytes but it does tie it to the 10 byte command.
- */
-struct scsi_read_defect_data_hdr_10
-{
-	u_int8_t reserved;
-#define SRDDH10_GLIST 0x08
-#define SRDDH10_PLIST 0x10
-#define SRDDH10_DLIST_FORMAT_MASK 0x07
-#define SRDDH10_BLOCK_FORMAT            0x00
-#define SRDDH10_BYTES_FROM_INDEX_FORMAT 0x04
-#define SRDDH10_PHYSICAL_SECTOR_FORMAT  0x05
-	u_int8_t format;
-	u_int8_t length[2];
-#define	SRDDH10_MAX_LENGTH	SRDD10_MAX_LENGTH -			     \
-				sizeof(struct scsi_read_defect_data_hdr_10) 
-};
-
-struct scsi_defect_desc_block
-{
-	u_int8_t address[4];
-};
-
-struct scsi_defect_desc_long_block
-{
-	u_int8_t address[8];
-};
-
-struct scsi_defect_desc_bytes_from_index
-{
-	u_int8_t cylinder[3];
-	u_int8_t head;
-#define	SDD_EXT_BFI_MADS		0x80000000
-#define	SDD_EXT_BFI_FLAG_MASK		0xf0000000
-#define	SDD_EXT_BFI_ENTIRE_TRACK	0x0fffffff
-	u_int8_t bytes_from_index[4];
-};
-
-struct scsi_defect_desc_phys_sector
-{
-	u_int8_t cylinder[3];
-	u_int8_t head;
-#define	SDD_EXT_PHYS_MADS		0x80000000
-#define	SDD_EXT_PHYS_FLAG_MASK		0xf0000000
-#define	SDD_EXT_PHYS_ENTIRE_TRACK	0x0fffffff
-	u_int8_t sector[4];
-};
-
-struct scsi_read_defect_data_hdr_12
-{
-	u_int8_t reserved;
-#define SRDDH12_GLIST 0x08
-#define SRDDH12_PLIST 0x10
-#define SRDDH12_DLIST_FORMAT_MASK 0x07
-#define SRDDH12_BLOCK_FORMAT            0x00
-#define SRDDH12_BYTES_FROM_INDEX_FORMAT 0x04
-#define SRDDH12_PHYSICAL_SECTOR_FORMAT  0x05
-	u_int8_t format;
-	u_int8_t generation[2];
-	u_int8_t length[4];
-#define	SRDDH12_MAX_LENGTH	SRDD12_MAX_LENGTH -			    \
-				sizeof(struct scsi_read_defect_data_hdr_12)
-};
-
-union	disk_pages /* this is the structure copied from osf */
-{
-	struct format_device_page {
-		u_int8_t pg_code;	/* page code (should be 3)	      */
-#define	SMS_FORMAT_DEVICE_PAGE	0x03	/* only 6 bits valid */
-		u_int8_t pg_length;	/* page length (should be 0x16)	      */
-#define	SMS_FORMAT_DEVICE_PLEN	0x16
-		u_int8_t trk_z_1;	/* tracks per zone (MSB)	      */
-		u_int8_t trk_z_0;	/* tracks per zone (LSB)	      */
-		u_int8_t alt_sec_1;	/* alternate sectors per zone (MSB)   */
-		u_int8_t alt_sec_0;	/* alternate sectors per zone (LSB)   */
-		u_int8_t alt_trk_z_1;	/* alternate tracks per zone (MSB)    */
-		u_int8_t alt_trk_z_0;	/* alternate tracks per zone (LSB)    */
-		u_int8_t alt_trk_v_1;	/* alternate tracks per volume (MSB)  */
-		u_int8_t alt_trk_v_0;	/* alternate tracks per volume (LSB)  */
-		u_int8_t ph_sec_t_1;	/* physical sectors per track (MSB)   */
-		u_int8_t ph_sec_t_0;	/* physical sectors per track (LSB)   */
-		u_int8_t bytes_s_1;	/* bytes per sector (MSB)	      */
-		u_int8_t bytes_s_0;	/* bytes per sector (LSB)	      */
-		u_int8_t interleave_1;	/* interleave (MSB)		      */
-		u_int8_t interleave_0;	/* interleave (LSB)		      */
-		u_int8_t trk_skew_1;	/* track skew factor (MSB)	      */
-		u_int8_t trk_skew_0;	/* track skew factor (LSB)	      */
-		u_int8_t cyl_skew_1;	/* cylinder skew (MSB)		      */
-		u_int8_t cyl_skew_0;	/* cylinder skew (LSB)		      */
-		u_int8_t flags;		/* various */
-#define			DISK_FMT_SURF	0x10
-#define	       		DISK_FMT_RMB	0x20
-#define			DISK_FMT_HSEC	0x40
-#define			DISK_FMT_SSEC	0x80
-		u_int8_t reserved21;
-		u_int8_t reserved22;
-		u_int8_t reserved23;
-	} format_device;
-	struct rigid_geometry_page {
-		u_int8_t pg_code;	/* page code (should be 4)	      */
-#define SMS_RIGID_GEOMETRY_PAGE 0x04
-		u_int8_t pg_length;	/* page length (should be 0x16)	      */
-#define SMS_RIGID_GEOMETRY_PLEN 0x16		
-		u_int8_t ncyl_2;	/* number of cylinders (MSB)	      */
-		u_int8_t ncyl_1;	/* number of cylinders 		      */
-		u_int8_t ncyl_0;	/* number of cylinders (LSB)	      */
-		u_int8_t nheads;	/* number of heads 		      */
-		u_int8_t st_cyl_wp_2;	/* starting cyl., write precomp (MSB) */
-		u_int8_t st_cyl_wp_1;	/* starting cyl., write precomp	      */
-		u_int8_t st_cyl_wp_0;	/* starting cyl., write precomp (LSB) */
-		u_int8_t st_cyl_rwc_2;	/* starting cyl., red. write cur (MSB)*/
-		u_int8_t st_cyl_rwc_1;	/* starting cyl., red. write cur      */
-		u_int8_t st_cyl_rwc_0;	/* starting cyl., red. write cur (LSB)*/
-		u_int8_t driv_step_1;	/* drive step rate (MSB)	      */
-		u_int8_t driv_step_0;	/* drive step rate (LSB)	      */
-		u_int8_t land_zone_2;	/* landing zone cylinder (MSB)	      */
-		u_int8_t land_zone_1;	/* landing zone cylinder 	      */
-		u_int8_t land_zone_0;	/* landing zone cylinder (LSB)	      */
-		u_int8_t rpl;		/* rotational position locking (2 bits) */
-		u_int8_t rot_offset;	/* rotational offset */
-		u_int8_t reserved19;
-		u_int8_t medium_rot_rate_1; /* medium rotation rate (RPM) (MSB) */
-		u_int8_t medium_rot_rate_0; /* medium rotation rate (RPM) (LSB) */
-		u_int8_t reserved22;
-		u_int8_t reserved23;
-    	} rigid_geometry;
-	struct flexible_disk_page {
-		u_int8_t pg_code;	/* page code (should be 5)	      */
-#define SMS_FLEXIBLE_GEOMETRY_PAGE 0x05
-		u_int8_t pg_length;	/* page length (should be 0x1E)	      */
-#define SMS_FLEXIBLE_GEOMETRY_PLEN 0x1E
-		u_int8_t xfr_rate_1;	/* transfer rate (MSB)		      */
-		u_int8_t xfr_rate_0;	/* transfer rate (LSB)		      */
-		u_int8_t nheads;	/* number of heads 		      */
-		u_int8_t sec_per_track;	/* Sectors per track		      */
-		u_int8_t bytes_s_1;	/* bytes per sector (MSB)	      */
-		u_int8_t bytes_s_0;	/* bytes per sector (LSB)	      */
-		u_int8_t ncyl_1;	/* number of cylinders (MSB)	      */
-		u_int8_t ncyl_0;	/* number of cylinders (LSB)	      */
-		u_int8_t st_cyl_wp_1;	/* starting cyl., write precomp (MSB) */
-		u_int8_t st_cyl_wp_0;	/* starting cyl., write precomp (LSB) */
-		u_int8_t st_cyl_rwc_1;	/* starting cyl., red. write cur (MSB)*/
-		u_int8_t st_cyl_rwc_0;	/* starting cyl., red. write cur (LSB)*/		
-		u_int8_t driv_step_1;	/* drive step rate (MSB)	      */
-		u_int8_t driv_step_0;	/* drive step rate (LSB)	      */
-		u_int8_t driv_step_pw;	/* drive step pulse width	      */
-		u_int8_t head_stl_del_1;/* Head settle delay (MSB)	      */
-		u_int8_t head_stl_del_0;/* Head settle delay (LSB)	      */
-		u_int8_t motor_on_del;	/* Motor on delay		      */
-		u_int8_t motor_off_del;	/* Motor off delay		      */
-		u_int8_t trdy_ssn_mo;	/* XXX ??? */
-		u_int8_t spc;		/* XXX ??? */
-		u_int8_t write_comp;	/* Write compensation */
-		u_int8_t head_load_del; /* Head load delay */
-		u_int8_t head_uload_del;/* Head un-load delay */
-		u_int8_t pin32_pin2;
-		u_int8_t pin4_pint1;
-		u_int8_t medium_rot_rate_1; /* medium rotation rate (RPM) (MSB) */
-		u_int8_t medium_rot_rate_0; /* medium rotation rate (RPM) (LSB) */		
-		u_int8_t reserved30;
-		u_int8_t reserved31;
-    	} flexible_disk;	
-};
-
-/*
- * XXX KDM
- * Here for CTL compatibility, reconcile this.
- */
-struct scsi_format_page {
-	uint8_t page_code;
-	uint8_t page_length;
-	uint8_t tracks_per_zone[2];
-	uint8_t alt_sectors_per_zone[2];
-	uint8_t alt_tracks_per_zone[2];
-	uint8_t alt_tracks_per_lun[2];
-	uint8_t sectors_per_track[2];
-	uint8_t bytes_per_sector[2];
-	uint8_t interleave[2];
-	uint8_t track_skew[2];
-	uint8_t cylinder_skew[2];
-	uint8_t flags;
-#define	SFP_SSEC	0x80
-#define	SFP_HSEC	0x40
-#define	SFP_RMB		0x20
-#define	SFP_SURF	0x10
-	uint8_t reserved[3];
-};
-
-/*
- * XXX KDM
- * Here for CTL compatibility, reconcile this.
- */
-struct scsi_rigid_disk_page {
-	uint8_t page_code;
-#define	SMS_RIGID_DISK_PAGE		0x04
-	uint8_t page_length;
-	uint8_t cylinders[3];
-	uint8_t heads;
-	uint8_t start_write_precomp[3];
-	uint8_t start_reduced_current[3];
-	uint8_t step_rate[2];
-	uint8_t landing_zone_cylinder[3];
-	uint8_t rpl;
-#define	SRDP_RPL_DISABLED	0x00
-#define	SRDP_RPL_SLAVE		0x01
-#define	SRDP_RPL_MASTER		0x02
-#define	SRDP_RPL_MASTER_CONTROL	0x03
-	uint8_t rotational_offset;
-	uint8_t reserved1;
-	uint8_t rotation_rate[2];
-	uint8_t reserved2[2];
-};
-
-
-struct scsi_da_rw_recovery_page {
-	u_int8_t page_code;
-#define SMS_RW_ERROR_RECOVERY_PAGE	0x01
-	u_int8_t page_length;
-	u_int8_t byte3;
-#define SMS_RWER_AWRE			0x80
-#define SMS_RWER_ARRE			0x40
-#define SMS_RWER_TB			0x20
-#define SMS_RWER_RC			0x10
-#define SMS_RWER_EER			0x08
-#define SMS_RWER_PER			0x04
-#define SMS_RWER_DTE			0x02
-#define SMS_RWER_DCR			0x01
-	u_int8_t read_retry_count;
-	u_int8_t correction_span;
-	u_int8_t head_offset_count;
-	u_int8_t data_strobe_offset_cnt;
-	u_int8_t byte8;
-#define SMS_RWER_LBPERE			0x80
-	u_int8_t write_retry_count;
-	u_int8_t reserved2;
-	u_int8_t recovery_time_limit[2];
-};
-
-__BEGIN_DECLS
-/*
- * XXX These are only left out of the kernel build to silence warnings.  If,
- * for some reason these functions are used in the kernel, the ifdefs should
- * be moved so they are included both in the kernel and userland.
- */
-#ifndef _KERNEL
-void scsi_format_unit(struct ccb_scsiio *csio, uint32_t retries,
-		      void (*cbfcnp)(struct cam_periph *, union ccb *),
-		      u_int8_t tag_action, u_int8_t byte2, u_int16_t ileave,
-		      u_int8_t *data_ptr, uint32_t dxfer_len,
-		      u_int8_t sense_len, uint32_t timeout);
-
-void scsi_read_defects(struct ccb_scsiio *csio, uint32_t retries,
-		       void (*cbfcnp)(struct cam_periph *, union ccb *),
-		       uint8_t tag_action, uint8_t list_format,
-		       uint32_t addr_desc_index, uint8_t *data_ptr,
-		       uint32_t dxfer_len, int minimum_cmd_size, 
-		       uint8_t sense_len, uint32_t timeout);
-
-void scsi_sanitize(struct ccb_scsiio *csio, uint32_t retries,
-		   void (*cbfcnp)(struct cam_periph *, union ccb *),
-		   u_int8_t tag_action, u_int8_t byte2, u_int16_t control,
-		   u_int8_t *data_ptr, uint32_t dxfer_len, u_int8_t sense_len,
-		   uint32_t timeout);
-
-#endif /* !_KERNEL */
-__END_DECLS
-
-#endif /* _SCSI_SCSI_DA_H */
diff --git a/include.new/cam/scsi/scsi_dvcfg.h b/include.new/cam/scsi/scsi_dvcfg.h
deleted file mode 100644
index 7d4fd68..0000000
--- a/include.new/cam/scsi/scsi_dvcfg.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/cam/scsi/scsi_dvcfg.h 139743 2005-01-05 22:34:37Z imp $	*/
-/*	$NecBSD: scsi_dvcfg.h,v 1.4 1998/03/14 07:05:06 kmatsuda Exp $	*/
-/*	$NetBSD$	*/
-
-/*-
- * [NetBSD for NEC PC-98 series]
- *  Copyright (c) 1994, 1995, 1996, 1997, 1998
- *	NetBSD/pc98 porting staff. All rights reserved.
- *  Copyright (c) 1994, 1995, 1996, 1997, 1998
- *	Naofumi HONDA. 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 ``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 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.
- */
-
-#ifndef	_SCSI_DVCFG_H_
-#define	_SCSI_DVCFG_H_
-
-/* common dvcfg flags defitions for bs, ncv, stg */
-
-#define	DVF_SCSI_SYNC		0x01
-#define	DVF_SCSI_DISC		0x02
-#define	DVF_SCSI_WAIT		0x04
-#define	DVF_SCSI_LINK		0x08
-#define	DVF_SCSI_QTAG		0x10
-#define	DVF_SCSI_SP0		0x100
-#define	DVF_SCSI_NOPARITY	0x200
-#define	DVF_SCSI_SAVESP		0x400
-#define	DVF_SCSI_SP1		0x800
-#define	DVF_SCSI_PERIOD(XXX)	(((XXX) >> 24) & 0xff)
-#define	DVF_SCSI_OFFSET(XXX)	(((XXX) >> 16) & 0xff)
-#define DVF_SCSI_SYNCMASK	0xffff0000
-
-#define	DVF_SCSI_DEFCFG	(DVF_SCSI_SYNC | DVF_SCSI_NOPARITY | DVF_SCSI_SYNCMASK)
-
-#define	DVF_SCSI_BITS		"\020\13fssp\12noparity\11nosat\005qtag\004cmdlnk\003wait\002disc\001sync"
-
-#endif	/* !_SCSI_DVCFG_H_ */
diff --git a/include.new/cam/scsi/scsi_enc.h b/include.new/cam/scsi/scsi_enc.h
deleted file mode 100644
index b6d3d99..0000000
--- a/include.new/cam/scsi/scsi_enc.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/cam/scsi/scsi_enc.h 235911 2012-05-24 14:07:44Z mav $ */
-/*-
- * Copyright (c) 2000 by Matthew Jacob
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * the GNU Public License ("GPL").
- *
- * 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.
- *
- */
-#ifndef	_SCSI_ENC_H_
-#define	_SCSI_ENC_H_
-
-#include <cam/scsi/scsi_ses.h>
-
-#define	ENCIOC			('s' - 040)
-#define	ENCIOC_GETNELM		_IO(ENCIOC, 1)
-#define	ENCIOC_GETELMMAP	_IO(ENCIOC, 2)
-#define	ENCIOC_GETENCSTAT	_IO(ENCIOC, 3)
-#define	ENCIOC_SETENCSTAT	_IO(ENCIOC, 4)
-#define	ENCIOC_GETELMSTAT	_IO(ENCIOC, 5)
-#define	ENCIOC_SETELMSTAT	_IO(ENCIOC, 6)
-#define	ENCIOC_GETTEXT		_IO(ENCIOC, 7)
-#define	ENCIOC_INIT		_IO(ENCIOC, 8)
-#define	ENCIOC_GETELMDESC	_IO(ENCIOC, 9)
-#define	ENCIOC_GETELMDEVNAMES	_IO(ENCIOC, 10)
-#define	ENCIOC_GETSTRING	_IO(ENCIOC, 11)
-#define	ENCIOC_SETSTRING	_IO(ENCIOC, 12)
-
-/*
- * Platform Independent Definitions for enclosure devices.
- */
-/*
- * SCSI Based Environmental Services Application Defines
- *
- * Based almost entirely on SCSI-3 ENC Revision 8A specification,
- * but slightly abstracted as the underlying device may in fact
- * be a SAF-TE or vendor unique device.
- */
-/*
- * ENC Driver Operations:
- * (The defines themselves are platform and access method specific)
- *
- * ENCIOC_GETNELM
- * ENCIOC_GETELMMAP
- * ENCIOC_GETENCSTAT
- * ENCIOC_SETENCSTAT
- * ENCIOC_GETELMSTAT
- * ENCIOC_SETELMSTAT
- * ENCIOC_INIT
- *
- *
- * An application finds out how many elements an enclosure instance
- * is managing by performing a ENCIOC_GETNELM operation. It then
- * performs a ENCIOC_GETELMMAP to get the map that contains the
- * elment identifiers for all elements (see encioc_element_t below).
- * This information is static.
- * 
- * The application may perform ENCIOC_GETELMSTAT operations to retrieve
- * status on an element (see the enc_elm_status_t structure below),
- * ENCIOC_SETELMSTAT operations to set status for an element.
- *
- * Similarly, overall enclosure status me be fetched or set via
- * ENCIOC_GETENCSTAT or  ENCIOC_SETENCSTAT operations (see encioc_enc_status_t
- * below).
- *
- * Readers should note that there is nothing that requires either a set
- * or a clear operation to actually latch and do anything in the target.
- *
- * A ENCIOC_INIT operation causes the enclosure to be initialized.
- */
-
-/* Element Types */
-typedef enum {
-	ELMTYP_UNSPECIFIED	= 0x00,
-	ELMTYP_DEVICE		= 0x01,
-	ELMTYP_POWER		= 0x02,
-	ELMTYP_FAN		= 0x03,
-	ELMTYP_THERM		= 0x04,
-	ELMTYP_DOORLOCK		= 0x05,
-	ELMTYP_ALARM		= 0x06,
-	ELMTYP_ESCC		= 0x07,	/* Enclosure SCC */
-	ELMTYP_SCC		= 0x08,	/* SCC */
-	ELMTYP_NVRAM		= 0x09,
-	ELMTYP_INV_OP_REASON    = 0x0a,
-	ELMTYP_UPS		= 0x0b,
-	ELMTYP_DISPLAY		= 0x0c,
-	ELMTYP_KEYPAD		= 0x0d,
-	ELMTYP_ENCLOSURE	= 0x0e,
-	ELMTYP_SCSIXVR		= 0x0f,
-	ELMTYP_LANGUAGE		= 0x10,
-	ELMTYP_COMPORT		= 0x11,
-	ELMTYP_VOM		= 0x12,
-	ELMTYP_AMMETER		= 0x13,
-	ELMTYP_SCSI_TGT		= 0x14,
-	ELMTYP_SCSI_INI		= 0x15,
-	ELMTYP_SUBENC		= 0x16,
-	ELMTYP_ARRAY_DEV	= 0x17,
-	ELMTYP_SAS_EXP		= 0x18, /* SAS expander */
-	ELMTYP_SAS_CONN		= 0x19  /* SAS connector */
-} elm_type_t;
-
-typedef struct encioc_element {
-	/* Element Index */
-	unsigned int	elm_idx;	
-
-	/* ID of SubEnclosure containing Element*/
-	unsigned int	elm_subenc_id;
-
-	/* Element Type */
-	elm_type_t	elm_type;
-} encioc_element_t;
-
-/*
- * Overall Enclosure Status
- */
-typedef unsigned char encioc_enc_status_t;
-
-/*
- * Element Status
- */
-typedef struct encioc_elm_status {
-	unsigned int	elm_idx;
-	unsigned char	cstat[4];
-} encioc_elm_status_t;
-
-/*
- * ENC String structure, for StringIn and StringOut commands; use this with
- * the ENCIOC_GETSTRING and ENCIOC_SETSTRING ioctls.
- */
-typedef struct encioc_string {
-	size_t bufsiz;		/* IN/OUT: length of string provided/returned */
-#define	ENC_STRING_MAX	0xffff
-	uint8_t *buf;		/* IN/OUT: string */
-} encioc_string_t;
-
-/*============================================================================*/
-
-/* 
- * SES v2 r20 6.1.10 (pg 39) - Element Descriptor diagnostic page
- * Tables 21, 22, and 23
- */
-typedef struct encioc_elm_desc {
-	unsigned int	 elm_idx;       /* IN: elment requested */
-	uint16_t	 elm_desc_len; /* IN: buffer size; OUT: bytes written */
-	char		*elm_desc_str; /* IN/OUT: buffer for descriptor data */
-} encioc_elm_desc_t;
-
-/*
- * ENCIOC_GETELMDEVNAMES:
- * ioctl structure to get an element's device names, if available
- */
-typedef struct  encioc_elm_devnames {
-	unsigned int	 elm_idx;	/* IN: element index */
-	size_t		 elm_names_size;/* IN: size of elm_devnames */
-	size_t		 elm_names_len;	/* OUT: actual size returned */
-	/*
-	 * IN/OUT: comma separated list of peripheral driver
-	 * instances servicing this element.
-	 */
-	char		*elm_devnames;
-} encioc_elm_devnames_t;
-
-/* ioctl structure for requesting FC info for a port */
-typedef struct encioc_elm_fc_port {
-	unsigned int		elm_idx;
-	unsigned int		port_idx;
-	struct ses_elm_fc_port	port_data;
-} encioc_elm_fc_port_t;
-
-/* ioctl structure for requesting SAS info for element phys */
-typedef struct encioc_elm_sas_device_phy {
-	unsigned int			elm_idx;
-	unsigned int			phy_idx;
-	struct ses_elm_sas_device_phy	phy_data;
-} enioc_elm_sas_phy_t;
-
-/* ioctl structure for requesting SAS info for an expander phy */
-typedef struct encioc_elm_sas_expander_phy {
-	unsigned int			elm_idx;
-	unsigned int			phy_idx;
-	struct ses_elm_sas_expander_phy phy_data;
-} encioc_elm_sas_expander_phy_t;
-
-/* ioctl structure for requesting SAS info for a port phy */
-typedef struct encioc_elm_sas_port_phy {
-	unsigned int			elm_idx;
-	unsigned int			phy_idx;
-	struct ses_elm_sas_port_phy	phy_data;
-} enioc_elm_sas_port_phy_t;
-
-/* ioctl structure for requesting additional status for an element */
-typedef struct encioc_addl_status {
-	unsigned int			   elm_idx;
-	union ses_elm_addlstatus_descr_hdr addl_hdr;
-	union ses_elm_addlstatus_proto_hdr proto_hdr;
-} enioc_addl_status_t;
-
-#endif /* _SCSI_ENC_H_ */
diff --git a/include.new/cam/scsi/scsi_enc_internal.h b/include.new/cam/scsi/scsi_enc_internal.h
deleted file mode 100644
index 3029849..0000000
--- a/include.new/cam/scsi/scsi_enc_internal.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/*-
- * Copyright (c) 2000 Matthew Jacob
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/scsi/scsi_enc_internal.h 260387 2014-01-07 01:51:48Z scottl $
- */
-
-/*
- * This file contains definitions only intended for use within
- * sys/cam/scsi/scsi_enc*.c, and not in other kernel components.
- */
-
-#ifndef	__SCSI_ENC_INTERNAL_H__
-#define	__SCSI_ENC_INTERNAL_H__
-
-typedef struct enc_element {
-	uint32_t
-		 enctype	: 8,	/* enclosure type */
-		 subenclosure : 8,	/* subenclosure id */
-		 svalid	: 1,		/* enclosure information valid */
-		 overall_status_elem: 1,/*
-					 * This object represents generic
-					 * status about all objects of this
-					 * type.
-					 */
-		 priv	: 14;		/* private data, per object */
-	uint8_t	 encstat[4];		/* state && stats */
-	uint8_t *physical_path;		/* Device physical path data. */
-	u_int    physical_path_len;	/* Length of device path data. */
-	void    *elm_private;		/* per-type object data */
-} enc_element_t;
-
-typedef enum {
-	ENC_NONE,
-	ENC_SES_SCSI2,
-	ENC_SES,
-	ENC_SES_PASSTHROUGH,
-	ENC_SEN,
-	ENC_SAFT,
-	ENC_SEMB_SES,
-	ENC_SEMB_SAFT
-} enctyp;
-
-/* Platform Independent Driver Internal Definitions for enclosure devices. */
-typedef struct enc_softc enc_softc_t;
-
-struct enc_fsm_state;
-typedef int fsm_fill_handler_t(enc_softc_t *ssc,
-				struct enc_fsm_state *state,
-				union ccb *ccb,
-				uint8_t *buf);
-typedef int fsm_error_handler_t(union ccb *ccb, uint32_t cflags,
-				uint32_t sflags);
-typedef int fsm_done_handler_t(enc_softc_t *ssc,
-			       struct enc_fsm_state *state, union ccb *ccb,
-			       uint8_t **bufp, int error, int xfer_len);
-
-struct enc_fsm_state {
-	const char	    *name;
-	int		     page_code;
-	size_t		     buf_size;
-	uint32_t	     timeout;
-	fsm_fill_handler_t  *fill;
-	fsm_done_handler_t  *done;
-	fsm_error_handler_t *error;
-};
-
-typedef int (enc_softc_init_t)(enc_softc_t *);
-typedef void (enc_softc_invalidate_t)(enc_softc_t *);
-typedef void (enc_softc_cleanup_t)(enc_softc_t *);
-typedef int (enc_init_enc_t)(enc_softc_t *); 
-typedef int (enc_get_enc_status_t)(enc_softc_t *, int);
-typedef int (enc_set_enc_status_t)(enc_softc_t *, encioc_enc_status_t, int);
-typedef int (enc_get_elm_status_t)(enc_softc_t *, encioc_elm_status_t *, int);
-typedef int (enc_set_elm_status_t)(enc_softc_t *, encioc_elm_status_t *, int);
-typedef int (enc_get_elm_desc_t)(enc_softc_t *, encioc_elm_desc_t *); 
-typedef int (enc_get_elm_devnames_t)(enc_softc_t *, encioc_elm_devnames_t *); 
-typedef int (enc_handle_string_t)(enc_softc_t *, encioc_string_t *, int);
-typedef void (enc_device_found_t)(enc_softc_t *);
-typedef void (enc_poll_status_t)(enc_softc_t *);
-
-struct enc_vec {
-	enc_softc_invalidate_t	*softc_invalidate;
-	enc_softc_cleanup_t	*softc_cleanup;
-	enc_init_enc_t		*init_enc;
-	enc_get_enc_status_t	*get_enc_status;
-	enc_set_enc_status_t	*set_enc_status;
-	enc_get_elm_status_t	*get_elm_status;
-	enc_set_elm_status_t	*set_elm_status;
-	enc_get_elm_desc_t	*get_elm_desc;
-	enc_get_elm_devnames_t	*get_elm_devnames;
-	enc_handle_string_t	*handle_string;
-	enc_device_found_t	*device_found;
-	enc_poll_status_t	*poll_status;
-};
-
-typedef struct enc_cache {
-	enc_element_t		*elm_map;	/* objects */
-	int			 nelms;		/* number of objects */
-	encioc_enc_status_t	 enc_status;	/* overall status */
-	void			*private;	/* per-type private data */
-} enc_cache_t;
-
-/* Enclosure instance toplevel structure */
-struct enc_softc {
-	enctyp			 enc_type;	/* type of enclosure */
-	struct enc_vec		 enc_vec;	/* vector to handlers */
-	void			*enc_private;	/* per-type private data */
-
-	/**
-	 * "Published" configuration and state data available to
-	 * external consumers.
-	 */
-	enc_cache_t		 enc_cache;
-
-	/**
-	 * Configuration and state data being actively updated
-	 * by the enclosure daemon.
-	 */
-	enc_cache_t		 enc_daemon_cache;
-
-	struct sx		 enc_cache_lock;
-	uint8_t			 enc_flags;
-#define	ENC_FLAG_INVALID	0x01
-#define	ENC_FLAG_INITIALIZED	0x02
-#define	ENC_FLAG_SHUTDOWN	0x04
-	union ccb		 saved_ccb;
-	struct cdev		*enc_dev;
-	struct cam_periph	*periph;
-	int			 open_count;
-
-	/* Bitmap of pending operations. */
-	uint32_t		 pending_actions;
-
-	/* The action on which the state machine is currently working. */
-	uint32_t		 current_action;
-#define	ENC_UPDATE_NONE		0x00
-#define	ENC_UPDATE_INVALID	0xff
-
-	/* Callout for auto-updating enclosure status */
-	struct callout		 status_updater;
-
-	struct proc		*enc_daemon;
-
-	struct enc_fsm_state 	*enc_fsm_states;
-
-	struct intr_config_hook  enc_boot_hold_ch;
-};
-
-static inline enc_cache_t *
-enc_other_cache(enc_softc_t *enc, enc_cache_t *primary)
-{
-	return (primary == &enc->enc_cache
-	      ? &enc->enc_daemon_cache : &enc->enc_cache);
-}
-
-/* SES Management mode page - SES2r20 Table 59 */
-struct ses_mgmt_mode_page {
-	struct scsi_mode_header_6 header;
-	struct scsi_mode_blk_desc blk_desc;
-	uint8_t byte0;  /* ps : 1, spf : 1, page_code : 6 */
-#define SES_MGMT_MODE_PAGE_CODE 0x14
-	uint8_t length;
-#define SES_MGMT_MODE_PAGE_LEN  6
-	uint8_t reserved[3];
-	uint8_t byte5;  /* reserved : 7, enbltc : 1 */
-#define SES_MGMT_TIMED_COMP_EN  0x1
-	uint8_t max_comp_time[2];
-};
-
-/* Enclosure core interface for sub-drivers */
-int  enc_runcmd(struct enc_softc *, char *, int, char *, int *);
-void enc_log(struct enc_softc *, const char *, ...);
-int  enc_error(union ccb *, uint32_t, uint32_t);
-void enc_update_request(enc_softc_t *, uint32_t);
-
-/* SES Native interface */
-enc_softc_init_t	ses_softc_init;
-
-/* SAF-TE interface */
-enc_softc_init_t	safte_softc_init;
-
-/* Helper macros */
-MALLOC_DECLARE(M_SCSIENC);
-#define	ENC_CFLAGS		CAM_RETRY_SELTO
-#define	ENC_FLAGS		SF_NO_PRINT | SF_RETRY_UA
-#define	STRNCMP			strncmp
-#define	PRINTF			printf
-#define	ENC_LOG			enc_log
-#if defined(DEBUG) || defined(ENC_DEBUG)
-#define	ENC_DLOG		enc_log
-#else
-#define	ENC_DLOG		if (0) enc_log
-#endif
-#define	ENC_VLOG		if (bootverbose) enc_log
-#define	ENC_MALLOC(amt)		malloc(amt, M_SCSIENC, M_NOWAIT)
-#define	ENC_MALLOCZ(amt)	malloc(amt, M_SCSIENC, M_ZERO|M_NOWAIT)
-/* Cast away const avoiding GCC warnings. */
-#define	ENC_FREE(ptr)		free((void *)((uintptr_t)ptr), M_SCSIENC)
-#define	ENC_FREE_AND_NULL(ptr)	do {	\
-	if (ptr != NULL) {		\
-		ENC_FREE(ptr);		\
-		ptr = NULL;		\
-	}				\
-} while(0)
-#define	MEMZERO			bzero
-#define	MEMCPY(dest, src, amt)	bcopy(src, dest, amt)
-
-#endif	/* __SCSI_ENC_INTERNAL_H__ */
diff --git a/include.new/cam/scsi/scsi_iu.h b/include.new/cam/scsi/scsi_iu.h
deleted file mode 100644
index 81b9e97..0000000
--- a/include.new/cam/scsi/scsi_iu.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * This file is in the public domain.
- * $FreeBSD: releng/10.2/sys/cam/scsi/scsi_iu.h 139743 2005-01-05 22:34:37Z imp $
- */
-#ifndef	_SCSI_SCSI_IU_H
-#define _SCSI_SCSI_IU_H 1
-
-struct scsi_status_iu_header
-{
-	u_int8_t reserved[2];
-	u_int8_t flags;
-#define	SIU_SNSVALID 0x2
-#define	SIU_RSPVALID 0x1
-	u_int8_t status;
-	u_int8_t sense_length[4];
-	u_int8_t pkt_failures_length[4];
-	u_int8_t pkt_failures[1];
-};
-
-#define SIU_PKTFAIL_OFFSET(siu) 12
-#define SIU_PKTFAIL_CODE(siu) (scsi_4btoul((siu)->pkt_failures) & 0xFF)
-#define		SIU_PFC_NONE			0
-#define		SIU_PFC_CIU_FIELDS_INVALID	2
-#define		SIU_PFC_TMF_NOT_SUPPORTED	4
-#define		SIU_PFC_TMF_FAILED		5
-#define		SIU_PFC_INVALID_TYPE_CODE	6
-#define		SIU_PFC_ILLEGAL_REQUEST		7
-#define SIU_SENSE_OFFSET(siu)				\
-    (12 + (((siu)->flags & SIU_RSPVALID)		\
-	? scsi_4btoul((siu)->pkt_failures_length)	\
-	: 0))
-
-#define	SIU_TASKMGMT_NONE		0x00
-#define	SIU_TASKMGMT_ABORT_TASK		0x01
-#define	SIU_TASKMGMT_ABORT_TASK_SET	0x02
-#define	SIU_TASKMGMT_CLEAR_TASK_SET	0x04
-#define	SIU_TASKMGMT_LUN_RESET		0x08
-#define	SIU_TASKMGMT_TARGET_RESET	0x20
-#define	SIU_TASKMGMT_CLEAR_ACA		0x40
-#endif /*_SCSI_SCSI_IU_H*/
diff --git a/include.new/cam/scsi/scsi_low.h b/include.new/cam/scsi/scsi_low.h
deleted file mode 100644
index 649f3cf..0000000
--- a/include.new/cam/scsi/scsi_low.h
+++ /dev/null
@@ -1,825 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/cam/scsi/scsi_low.h 240325 2012-09-10 18:49:49Z jhb $	*/
-/*	$NecBSD: scsi_low.h,v 1.24.10.5 2001/06/26 07:31:46 honda Exp $	*/
-/*	$NetBSD$	*/
-
-#define	SCSI_LOW_DIAGNOSTIC
-#define	SCSI_LOW_ALT_QTAG_ALLOCATE
-
-/*-
- * [NetBSD for NEC PC-98 series]
- *  Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
- *	NetBSD/pc98 porting staff. All rights reserved.
- *  Copyright (c) 1995, 1996, 1997, 1998, 1999, 2000, 2001
- *	Naofumi HONDA. All rights reserved.
- *
- * [Ported for FreeBSD CAM]
- *  Copyright (c) 2000, 2001
- *      MITSUNAGA Noriaki, NOKUBI Hirotaka and TAKAHASHI Yoshihiro.
- *      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 ``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 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.
- */
-
-#ifndef	_SCSI_LOW_H_
-#define	_SCSI_LOW_H_
-
-/*================================================
- * Scsi low OSDEP 
- * (All os depend structures should be here!)
- ================================================*/
-/******** includes *******************************/
-
-#include <sys/bus.h>
-#include <sys/kdb.h>
-#include <cam/cam.h>
-#include <cam/cam_ccb.h>
-#include <cam/cam_sim.h>
-#include <cam/cam_xpt_sim.h>
-#include <cam/cam_debug.h>
-
-#include <cam/scsi/scsi_dvcfg.h>
-#include <i386/isa/ccbque.h>
-
-/******** functions macro ************************/
-
-#undef	MSG_IDENTIFY
-
-/******** os depend interface structures **********/
-typedef	struct scsi_sense_data scsi_low_osdep_sense_data_t;
-
-struct scsi_low_osdep_interface {
-	device_t si_dev;
-
-	struct cam_sim *sim;
-	struct cam_path *path;
-
-	int si_poll_count;
-
-	struct callout_handle engage_ch;
-	struct callout_handle timeout_ch;
-#ifdef	SCSI_LOW_POWFUNC
-	struct callout_handle recover_ch;
-#endif
-};
-
-/******** os depend interface functions *************/
-struct slccb;
-struct scsi_low_softc;
-#define	SCSI_LOW_TIMEOUT_STOP		0
-#define	SCSI_LOW_TIMEOUT_START		1
-#define	SCSI_LOW_TIMEOUT_CH_IO		0
-#define	SCSI_LOW_TIMEOUT_CH_ENGAGE	1
-#define	SCSI_LOW_TIMEOUT_CH_RECOVER	2
-
-struct scsi_low_osdep_funcs {
-	int (*scsi_low_osdep_attach) \
-			(struct scsi_low_softc *);
-	int (*scsi_low_osdep_world_start) \
-			(struct scsi_low_softc *);
-	int (*scsi_low_osdep_dettach) \
-			(struct scsi_low_softc *);
-	int (*scsi_low_osdep_ccb_setup) \
-			(struct scsi_low_softc *, struct slccb *);
-	int (*scsi_low_osdep_done) \
-			(struct scsi_low_softc *, struct slccb *);
-	void (*scsi_low_osdep_timeout) \
-			(struct scsi_low_softc *, int, int);
-};
-
-/*================================================
- * Generic Scsi Low header file 
- * (All os depend structures should be above!)
- ================================================*/
-/*************************************************
- * Scsi low definitions
- *************************************************/
-#define	SCSI_LOW_SYNC		DVF_SCSI_SYNC
-#define	SCSI_LOW_DISC		DVF_SCSI_DISC
-#define	SCSI_LOW_WAIT		DVF_SCSI_WAIT
-#define	SCSI_LOW_LINK		DVF_SCSI_LINK
-#define	SCSI_LOW_QTAG		DVF_SCSI_QTAG
-#define	SCSI_LOW_NOPARITY	DVF_SCSI_NOPARITY
-#define	SCSI_LOW_SAVESP		DVF_SCSI_SAVESP
-#define	SCSI_LOW_DEFCFG		DVF_SCSI_DEFCFG
-#define	SCSI_LOW_BITS		DVF_SCSI_BITS
-
-#define	SCSI_LOW_PERIOD(n)	DVF_SCSI_PERIOD(n)
-#define	SCSI_LOW_OFFSET(n)	DVF_SCSI_OFFSET(n)
-
-/* host scsi id and targets macro */
-#ifndef	SCSI_LOW_NTARGETS
-#define	SCSI_LOW_NTARGETS			8
-#endif	/* SCSI_LOW_NTARGETS */
-#define	SCSI_LOW_NCCB				128
-
-#define	SCSI_LOW_MAX_RETRY			3
-#define	SCSI_LOW_MAX_SELECTION_RETRY		10
-
-/* timeout control macro */
-#define	SCSI_LOW_TIMEOUT_HZ			10
-#define SCSI_LOW_MIN_TOUT			12
-#define SCSI_LOW_TIMEOUT_CHECK_INTERVAL 	1
-#define	SCSI_LOW_POWDOWN_TC			15
-#define	SCSI_LOW_MAX_PHCHANGES			256
-#define	SCSI2_RESET_DELAY			5000000
-
-/* msg */
-#define	SCSI_LOW_MAX_MSGLEN			32
-#define	SCSI_LOW_MSG_LOG_DATALEN  		8
-
-/*************************************************
- * Scsi Data Pointer
- *************************************************/
-/* scsi pointer */
-struct sc_p {
-	u_int8_t *scp_data;
-	int scp_datalen;
-
-	u_int8_t *scp_cmd;
-	int scp_cmdlen;
-
-	u_int8_t scp_direction;
-#define	SCSI_LOW_RWUNK	(-1)
-#define	SCSI_LOW_WRITE	0
-#define	SCSI_LOW_READ	1
-	u_int8_t scp_status;
-	u_int8_t scp_spare[2];
-};
-
-/*************************************************
- * Command Control Block Structure
- *************************************************/
-typedef int scsi_low_tag_t;			
-struct targ_info;
-
-#define	SCSI_LOW_UNKLUN	((u_int) -1)
-#define	SCSI_LOW_UNKTAG	((scsi_low_tag_t) -1)
-
-struct slccb {
-	TAILQ_ENTRY(slccb) ccb_chain;
-
-	void *osdep;			/* os depend structure */
-
-	struct targ_info *ti;		/* targ_info */
-	struct lun_info *li;		/* lun info */
-	struct buf *bp;			/* io bufs */
-
-	scsi_low_tag_t ccb_tag;		/* effective qtag */
-	scsi_low_tag_t ccb_otag;	/* allocated qtag */
-
-	/*****************************************
-	 * Scsi data pointers (original and saved)
-	 *****************************************/
-	struct sc_p ccb_scp;		/* given */
-	struct sc_p ccb_sscp;		/* saved scsi data pointer */
-	int ccb_datalen;		/* transfered data counter */
-
-	/*****************************************
-	 * Msgout 
-	 *****************************************/
-	u_int ccb_msgoutflag;
-	u_int ccb_omsgoutflag;
-
-	/*****************************************
-	 * Error or Timeout counters
-	 *****************************************/
-	u_int ccb_flags;
-#define	CCB_INTERNAL	0x0001
-#define	CCB_SENSE	0x0002
-#define	CCB_CLEARQ	0x0004
-#define	CCB_DISCQ	0x0008
-#define	CCB_STARTQ	0x0010
-#define	CCB_POLLED	0x0100	/* polling ccb */
-#define	CCB_NORETRY	0x0200	/* do NOT retry */
-#define	CCB_AUTOSENSE	0x0400	/* do a sence after CA */
-#define	CCB_URGENT	0x0800	/* an urgent ccb */
-#define	CCB_NOSDONE	0x1000	/* do not call an os done routine */
-#define	CCB_SCSIIO	0x2000	/* a normal scsi io coming from upper layer */
-#define	CCB_SILENT	0x4000	/* no terminate messages */
-
-	u_int ccb_error;
-
-	int ccb_rcnt;			/* retry counter */
-	int ccb_selrcnt;		/* selection retry counter */
-	int ccb_tc;			/* timer counter */
-	int ccb_tcmax;			/* max timeout */
-
-	/*****************************************
-	 * Sense data buffer
-	 *****************************************/
-	u_int8_t ccb_scsi_cmd[12];
-	scsi_low_osdep_sense_data_t ccb_sense;
-};
-
-/*************************************************
- * Slccb functions
- *************************************************/
-GENERIC_CCB_ASSERT(scsi_low, slccb)
-
-/*************************************************
- * Target and Lun structures
- *************************************************/
-struct scsi_low_softc;
-LIST_HEAD(scsi_low_softc_tab, scsi_low_softc);
-TAILQ_HEAD(targ_info_tab, targ_info);
-LIST_HEAD(lun_info_tab, lun_info);
-
-struct lun_info {
-	int li_lun;
-	struct targ_info *li_ti;		/* my target */
-
-	LIST_ENTRY(lun_info) lun_chain;		/* targ_info link */
-
-	struct slccbtab li_discq;			/* disconnect queue */
-
-	/*
-	 * qtag control
-	 */
-	int li_maxnexus;
-	int li_maxnqio;	
-	int li_nqio;
-	int li_disc;
-
-#define	SCSI_LOW_MAXNEXUS (sizeof(u_int) * NBBY)
-	u_int li_qtagbits;
-
-#ifdef	SCSI_LOW_ALT_QTAG_ALLOCATE
-	u_int8_t li_qtagarray[SCSI_LOW_MAXNEXUS];
-	u_int li_qd;
-#endif	/* SCSI_LOW_ALT_QTAG_ALLOCATE */
-
-#define	SCSI_LOW_QFLAG_CA_QCLEAR	0x01
-	u_int li_qflags;
-
-	/*
-	 * lun state
-	 */
-#define	SCSI_LOW_LUN_SLEEP	0x00
-#define	SCSI_LOW_LUN_START	0x01
-#define	SCSI_LOW_LUN_INQ	0x02
-#define	SCSI_LOW_LUN_MODEQ	0x03
-#define	SCSI_LOW_LUN_OK		0x04
-	u_int li_state;				/* target lun state */
-
-	/*
-	 * lun control flags
- 	 */
-	u_int li_flags_valid;	/* valid flags */
-#define	SCSI_LOW_LUN_FLAGS_USER_VALID	0x0001
-#define	SCSI_LOW_LUN_FLAGS_DISK_VALID	0x0002
-#define	SCSI_LOW_LUN_FLAGS_QUIRKS_VALID	0x0004
-#define	SCSI_LOW_LUN_FLAGS_ALL_VALID \
-	(SCSI_LOW_LUN_FLAGS_USER_VALID | \
-	 SCSI_LOW_LUN_FLAGS_DISK_VALID | SCSI_LOW_LUN_FLAGS_QUIRKS_VALID)
-
-	u_int li_flags;		/* real lun control flags */
-	u_int li_cfgflags;	/* lun control flags given by user */
-	u_int li_diskflags;	/* lun control flags given by hardware info */
-	u_int li_quirks;	/* lun control flags given by upper layer */
-
-	/* inq buffer */
-	struct scsi_low_inq_data {
-		u_int8_t sd_type;	
-		u_int8_t sd_sp1;
-		u_int8_t sd_version;
-		u_int8_t sd_resp;
-		u_int8_t sd_len;
-		u_int8_t sd_sp2[2];
-		u_int8_t sd_support;
-	} __packed li_inq;
-
-	/* modeq buffer */
-	struct scsi_low_mode_sense_data {
-		u_int8_t sms_header[4];
-		struct {
-			u_int8_t cmp_page;
-			u_int8_t cmp_length;
-			u_int8_t cmp_rlec;
-			u_int8_t cmp_qc;
-			u_int8_t cmp_eca;
-			u_int8_t cmp_spare[3];
-		} __packed sms_cmp;	
-	
-	} li_sms;	
-};
-
-struct scsi_low_msg_log {
-	int slml_ptr;
-	struct {
-		u_int8_t msg[2];
-	} slml_msg[SCSI_LOW_MSG_LOG_DATALEN];
-};
-
-struct targ_info {
-	TAILQ_ENTRY(targ_info) ti_chain;	/* targ_info link */
-
-	struct scsi_low_softc *ti_sc;		/* our softc */
-	u_int ti_id;				/* scsi id */
-
-	/*
-	 * Lun chain
-	 */
-	struct lun_info_tab ti_litab;		/* lun chain */
-
-	/*
-	 * total disconnected nexus
-	 */
-	int ti_disc;
-
-	/*
-	 * Scsi phase control
- 	 */
-
-#define	PH_NULL		0x00
-#define	PH_ARBSTART	0x01
-#define	PH_SELSTART	0x02
-#define	PH_SELECTED	0x03
-#define	PH_CMD		0x04
-#define	PH_DATA		0x05
-#define	PH_MSGIN	0x06
-#define	PH_MSGOUT	0x07
-#define	PH_STAT		0x08
-#define	PH_DISC		0x09
-#define	PH_RESEL	0x0a
-	u_int ti_phase;				/* scsi phase */
-	u_int ti_ophase;			/* old scsi phase */
-
-	/*
-	 * Msg in
- 	 */
-	u_int ti_msginptr;			/* msgin ptr */
-	u_int ti_msginlen;			/* expected msg length */
-	int ti_msgin_parity_error;		/* parity error detected */
-	u_int8_t ti_msgin[SCSI_LOW_MAX_MSGLEN];	/* msgin buffer */
-
-	/*
-	 * Msg out
- 	 */
-	u_int ti_msgflags;			/* msgs to be asserted */
-	u_int ti_omsgflags;			/* msgs asserted */
-	u_int ti_emsgflags;			/* a msg currently asserted */
-#define	SCSI_LOW_MSG_RESET	0x00000001
-#define	SCSI_LOW_MSG_REJECT	0x00000002
-#define	SCSI_LOW_MSG_PARITY	0x00000004
-#define	SCSI_LOW_MSG_ERROR	0x00000008
-#define	SCSI_LOW_MSG_IDENTIFY	0x00000010
-#define	SCSI_LOW_MSG_ABORT	0x00000020
-#define	SCSI_LOW_MSG_TERMIO	0x00000040
-#define	SCSI_LOW_MSG_SIMPLE_QTAG	0x00000080
-#define	SCSI_LOW_MSG_ORDERED_QTAG	0x00000100
-#define	SCSI_LOW_MSG_HEAD_QTAG		0x00000200
-#define	SCSI_LOW_MSG_ABORT_QTAG 0x00000400
-#define	SCSI_LOW_MSG_CLEAR_QTAG 0x00000800
-#define	SCSI_LOW_MSG_WIDE	0x00001000
-#define	SCSI_LOW_MSG_SYNCH	0x00002000
-#define	SCSI_LOW_MSG_NOOP	0x00004000
-#define	SCSI_LOW_MSG_LAST	0x00008000
-#define	SCSI_LOW_MSG_ALL	0xffffffff
-
-	/* msgout buffer */
-	u_int8_t ti_msgoutstr[SCSI_LOW_MAX_MSGLEN];	/* scsi msgout */
-	u_int ti_msgoutlen;			/* msgout strlen */
-
-	/*
-	 * target initialize msgout 
- 	 */
-	u_int ti_setup_msg;		/* setup msgout requests */
-	u_int ti_setup_msg_done;
-
-	/*
-	 * synch and wide data info
- 	 */
-	u_int ti_flags_valid;	/* valid flags */
-#define	SCSI_LOW_TARG_FLAGS_USER_VALID		0x0001
-#define	SCSI_LOW_TARG_FLAGS_DISK_VALID		0x0002
-#define	SCSI_LOW_TARG_FLAGS_QUIRKS_VALID	0x0004
-#define	SCSI_LOW_TARG_FLAGS_ALL_VALID \
-	(SCSI_LOW_TARG_FLAGS_USER_VALID | \
-	 SCSI_LOW_TARG_FLAGS_DISK_VALID | SCSI_LOW_TARG_FLAGS_QUIRKS_VALID)
-
-	u_int ti_diskflags;	/* given target disk flags */
-	u_int ti_quirks;	/* given target quirk */
-
-	struct synch {
-		u_int8_t offset;
-		u_int8_t period;
-	} ti_osynch, ti_maxsynch;		/* synch data */
-
-#define	SCSI_LOW_BUS_WIDTH_8	0
-#define	SCSI_LOW_BUS_WIDTH_16	1
-#define	SCSI_LOW_BUS_WIDTH_32	2
-	u_int ti_owidth, ti_width;
-
-	/*
-	 * lun info size.
- 	 */
-	int ti_lunsize;	
-
-#ifdef	SCSI_LOW_DIAGNOSTIC
-	struct scsi_low_msg_log ti_log_msgout;
-	struct scsi_low_msg_log ti_log_msgin;
-#endif	/* SCSI_LOW_DIAGNOSTIC */
-};
-
-/*************************************************
- * COMMON HEADER STRUCTURE
- *************************************************/
-struct scsi_low_softc;
-struct proc;
-typedef struct scsi_low_softc *sc_low_t;
-
-#define	SCSI_LOW_START_OK	0
-#define	SCSI_LOW_START_FAIL	1
-#define	SCSI_LOW_INFO_ALLOC	0
-#define	SCSI_LOW_INFO_REVOKE	1
-#define	SCSI_LOW_INFO_DEALLOC	2
-#define	SCSI_LOW_POWDOWN	1
-#define	SCSI_LOW_ENGAGE		2
-
-#define	SC_LOW_INIT_T (int (*)(sc_low_t, int))
-#define	SC_LOW_BUSRST_T (void (*)(sc_low_t))
-#define	SC_LOW_TARG_INIT_T (int (*)(sc_low_t, struct targ_info *, int))
-#define	SC_LOW_LUN_INIT_T (int (*)(sc_low_t, struct targ_info *, struct lun_info *, int))
-#define	SC_LOW_SELECT_T (int (*)(sc_low_t, struct slccb *))
-#define	SC_LOW_ATTEN_T (void (*)(sc_low_t))
-#define	SC_LOW_NEXUS_T (int (*)(sc_low_t))
-#define	SC_LOW_MSG_T (int (*)(sc_low_t, struct targ_info *, u_int))
-#define	SC_LOW_POLL_T (int (*)(void *))
-#define	SC_LOW_POWER_T (int (*)(sc_low_t, u_int))
-#define	SC_LOW_TIMEOUT_T (int (*)(sc_low_t))
-
-struct scsi_low_funcs {
-	int (*scsi_low_init)(sc_low_t, int);
-	void (*scsi_low_bus_reset)(sc_low_t);
-	int (*scsi_low_targ_init)(sc_low_t, struct targ_info *, int);
-	int (*scsi_low_lun_init)(sc_low_t, struct targ_info *, struct lun_info *, int);
-	int (*scsi_low_start_bus)(sc_low_t, struct slccb *);
-	int (*scsi_low_establish_lun_nexus)(sc_low_t);
-	int (*scsi_low_establish_ccb_nexus)(sc_low_t);
-	void (*scsi_low_attention)(sc_low_t);
-	int (*scsi_low_msg)(sc_low_t, struct targ_info *, u_int);
-	int (*scsi_low_timeout)(sc_low_t);
-	int (*scsi_low_poll)(void *);
-	int (*scsi_low_power)(sc_low_t, u_int);
-	int (*scsi_low_ioctl)(sc_low_t, u_long, caddr_t, int, struct proc *);
-};
-
-struct scsi_low_softc {
-	/* os depend structure */
-	struct scsi_low_osdep_interface sl_si;
-#define	sl_dev	sl_si.si_dev
-	struct scsi_low_osdep_funcs *sl_osdep_fp;
-				
-	/* our chain */
-	LIST_ENTRY(scsi_low_softc) sl_chain;
-
-	/* my targets */
-	struct targ_info *sl_ti[SCSI_LOW_NTARGETS];
-	struct targ_info_tab sl_titab;
-
-	/* current active T_L_Q nexus */
-	struct targ_info *sl_Tnexus;		/* Target nexus */
-	struct lun_info *sl_Lnexus;		/* Lun nexus */
-	struct slccb *sl_Qnexus;			/* Qtag nexus */
-	int sl_nexus_call;
-
-	/* ccb start queue */
-	struct slccbtab sl_start;	
-
-	/* retry limit and phase change counter */
-	int sl_max_retry;
-	int sl_ph_count;
-	int sl_timeout_count;
-
-	/* selection & total num disconnect targets */
-	int sl_nio;
-	int sl_disc;
-	int sl_retry_sel;
-	struct slccb *sl_selid;
-
-	/* attention */
-	int sl_atten;			/* ATN asserted */
-	int sl_clear_atten;		/* negate ATN required */
-
-	/* scsi phase suggested by scsi msg */
-	u_int sl_msgphase;	
-#define	MSGPH_NULL	0x00		/* no msg */
-#define	MSGPH_DISC	0x01		/* disconnect msg */
-#define	MSGPH_CMDC	0x02		/* cmd complete msg */
-#define	MSGPH_ABORT	0x03		/* abort seq */
-#define	MSGPH_TERM	0x04		/* current io terminate */
-#define	MSGPH_LCTERM	0x05		/* cmd link terminated */
-#define	MSGPH_RESET	0x06		/* reset target */
-
-	/* error */
-	u_int sl_error;			/* error flags */
-#define	FATALIO		0x0001		/* generic io error & retry io */
-#define	ABORTIO		0x0002		/* generic io error & terminate io */
-#define	TIMEOUTIO	0x0004		/* watch dog timeout */
-#define	SELTIMEOUTIO	0x0008		/* selection timeout */
-#define	PDMAERR		0x0010		/* dma xfer error */
-#define	MSGERR		0x0020		/* msgsys error */
-#define	PARITYERR	0x0040		/* parity error */
-#define	BUSYERR		0x0080		/* target busy error */
-#define	STATERR		0x0100		/* status error */
-#define	UACAERR		0x0200		/* target CA state, no sense check */
-#define	SENSEIO		0x1000		/* cmd not excuted but sense data ok */
-#define	SENSEERR	0x2000		/* cmd not excuted and sense data bad */
-#define	UBFERR		0x4000		/* unexpected bus free */
-#define	PENDINGIO	0x8000		/* ccb start not yet */
-#define	SCSI_LOW_ERRORBITS "\020\017ubferr\016senseerr\015senseio\012uacaerr\011staterr\010busy\007parity\006msgerr\005pdmaerr\004seltimeout\003timeout\002abort\001fatal"
-
-	/* current scsi data pointer */
-	struct sc_p sl_scp;
-
-	/* power control */
-	u_int sl_active;		/* host is busy state */
-	int sl_powc;			/* power down timer counter */
-	u_int sl_rstep;			/* resume step */
-
-	/* configuration flags */
-	u_int sl_flags;		
-#define	HW_POWDOWN	0x0001
-#define	HW_RESUME	0x0002
-#define	HW_PDMASTART	0x0004
-#define	HW_INACTIVE	0x0008
-#define	HW_POWERCTRL	0x0010
-#define	HW_INITIALIZING 0x0020
-#define	HW_READ_PADDING		0x1000
-#define	HW_WRITE_PADDING	0x2000
-
-	u_int sl_cfgflags;
-#define	CFG_NODISC		0x0001
-#define	CFG_NOPARITY		0x0002
-#define	CFG_NOATTEN		0x0004
-#define	CFG_ASYNC		0x0008
-#define	CFG_NOQTAG		0x0010
-
-	int sl_show_result;
-#define	SHOW_SYNCH_NEG	0x0001
-#define	SHOW_WIDE_NEG	0x0002
-#define	SHOW_CALCF_RES	0x0010
-#define	SHOW_PROBE_RES	0x0020
-#define	SHOW_ALL_NEG	-1
-
-	/* host informations */
-	u_int sl_hostid;
-	int sl_nluns;
-	int sl_ntargs;
-	int sl_openings;
-
-	/* interface functions */
-	struct scsi_low_funcs *sl_funcs;
-
-	/* targinfo size */
-	int sl_targsize;
-};
-
-/*************************************************
- * SCSI LOW service functions
- *************************************************/
-/* 
- * Scsi low attachment function.
- */
-int scsi_low_attach(struct scsi_low_softc *, int, int, int, int, int);
-int scsi_low_dettach(struct scsi_low_softc *);
-
-/* 
- * Scsi low interface activate or deactivate functions
- */
-int scsi_low_is_busy(struct scsi_low_softc *);
-int scsi_low_activate(struct scsi_low_softc *);
-int scsi_low_deactivate(struct scsi_low_softc *);
-
-/* 
- * Scsi phase "bus service" functions.
- * These functions are corresponding to each scsi bus phaeses.
- */
-/* bus idle phase (other initiators or targets release bus) */
-void scsi_low_bus_idle(struct scsi_low_softc *);
-
-/* arbitration and selection phase */
-void scsi_low_arbit_fail(struct scsi_low_softc *, struct slccb *);
-static __inline void scsi_low_arbit_win(struct scsi_low_softc *);
-
-/* msgout phase */
-#define	SCSI_LOW_MSGOUT_INIT		0x00000001
-#define	SCSI_LOW_MSGOUT_UNIFY		0x00000002
-int scsi_low_msgout(struct scsi_low_softc *, struct targ_info *, u_int);
-
-/* msgin phase */
-#define SCSI_LOW_DATA_PE	0x80000000
-int scsi_low_msgin(struct scsi_low_softc *, struct targ_info *, u_int);
-
-/* statusin phase */
-static __inline int scsi_low_statusin(struct scsi_low_softc *, struct targ_info *, u_int);
-
-/* data phase */
-int scsi_low_data(struct scsi_low_softc *, struct targ_info *, struct buf **, int);
-static __inline void scsi_low_data_finish(struct scsi_low_softc *);
-
-/* cmd phase */
-int scsi_low_cmd(struct scsi_low_softc *, struct targ_info *);
-
-/* reselection phase */
-struct targ_info *scsi_low_reselected(struct scsi_low_softc *, u_int);
-
-/* disconnection phase */
-int scsi_low_disconnected(struct scsi_low_softc *, struct targ_info *);
-
-/* 
- * Scsi bus restart function.
- * Canncel all established nexuses => scsi system initialized => restart jobs.
- */
-#define	SCSI_LOW_RESTART_HARD	1
-#define	SCSI_LOW_RESTART_SOFT	0
-int scsi_low_restart(struct scsi_low_softc *, int, u_char *);
-
-/* 
- * Scsi utility fucntions
- */
-/* print current status */
-void scsi_low_print(struct scsi_low_softc *, struct targ_info *);
-
-/* bus reset utility */
-void scsi_low_bus_reset(struct scsi_low_softc *);
-
-/*************************************************
- * Message macro defs
- *************************************************/
-#define	SCSI_LOW_SETUP_PHASE(ti, phase)			\
-{							\
-	(ti)->ti_ophase = ti->ti_phase;			\
-	(ti)->ti_phase = (phase);			\
-}
-
-#define	SCSI_LOW_SETUP_MSGPHASE(slp, PHASE)		\
-{							\
-	(slp)->sl_msgphase = (PHASE);			\
-}
-
-#define	SCSI_LOW_ASSERT_ATN(slp)			\
-{							\
-	(slp)->sl_atten = 1;				\
-}
-
-#define	SCSI_LOW_DEASSERT_ATN(slp)			\
-{							\
-	(slp)->sl_atten = 0;				\
-}
-
-/*************************************************
- * Inline functions
- *************************************************/
-static __inline void scsi_low_attention(struct scsi_low_softc *);
-static __inline int scsi_low_is_msgout_continue(struct targ_info *, u_int);
-static __inline int scsi_low_assert_msg(struct scsi_low_softc *, struct targ_info *, u_int, int);
-static __inline int scsi_low_is_disconnect_ok(struct slccb *);
-
-static __inline int
-scsi_low_is_msgout_continue(ti, mask)
-	struct targ_info *ti;
-	u_int mask;
-{
-	
-	return ((ti->ti_msgflags & (~mask)) != 0);
-}
-
-static __inline int
-scsi_low_is_disconnect_ok(cb)
-	struct slccb *cb;
-{
-
-	return ((cb->li->li_flags & SCSI_LOW_DISC) != 0 &&
-		    (cb->ccb_flags & (CCB_SENSE | CCB_CLEARQ)) == 0);
-}
-
-static __inline void
-scsi_low_attention(slp)
-	struct scsi_low_softc *slp;
-{
-
-	if (slp->sl_atten != 0)
-		return;
-
-	(*slp->sl_funcs->scsi_low_attention) (slp);
-	SCSI_LOW_ASSERT_ATN(slp);
-}
-
-static __inline int
-scsi_low_assert_msg(slp, ti, msg, now)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	u_int msg;
-	int now;
-{
-
-	ti->ti_msgflags |= msg;
-	if (now != 0)
-		scsi_low_attention(slp);
-	return 0;
-}
-
-static __inline void
-scsi_low_arbit_win(slp)
-	struct scsi_low_softc *slp;
-{
-
-	slp->sl_selid = NULL;
-}
-
-static __inline void
-scsi_low_data_finish(slp)
-	struct scsi_low_softc *slp;
-{
-
-	if (slp->sl_Qnexus != NULL)
-	{
-		slp->sl_Qnexus->ccb_datalen = slp->sl_scp.scp_datalen;
-	}
-}
-
-static __inline int
-scsi_low_statusin(slp, ti, c)
-	struct scsi_low_softc *slp;
-	struct targ_info *ti;
-	u_int c;
-{
-
-	slp->sl_ph_count ++;
-	if ((c & SCSI_LOW_DATA_PE) != 0)
-	{
-		scsi_low_assert_msg(slp, ti, SCSI_LOW_MSG_ERROR, 0);
-		return EIO;
-	}
-	slp->sl_scp.scp_status = (u_int8_t) c;
-	return 0;
-}
-
-/*************************************************
- * Message out defs
- *************************************************/
-/* XXX: use scsi_message.h */
-#define	ST_GOOD		0x00
-#define	ST_CHKCOND	0x02
-#define	ST_MET		0x04
-#define	ST_BUSY		0x08
-#define	ST_INTERGOOD	0x10
-#define	ST_INTERMET	0x14
-#define	ST_CONFLICT	0x18
-#define	ST_CMDTERM	0x22
-#define	ST_QUEFULL	0x28
-#define	ST_UNKNOWN	0xff
-
-#define	MSG_COMP	0x00
-#define	MSG_EXTEND	0x01
-
-#define	MKMSG_EXTEND(XLEN, XCODE) ((((u_int)(XLEN)) << NBBY) | ((u_int)(XCODE)))
-#define	MSG_EXTEND_MDPCODE	0x00
-#define	MSG_EXTEND_MDPLEN	0x05
-#define	MSG_EXTEND_SYNCHCODE	0x01
-#define	MSG_EXTEND_SYNCHLEN	0x03
-#define	MSG_EXTEND_WIDECODE	0x03
-#define	MSG_EXTEND_WIDELEN	0x02
-
-#define	MSG_SAVESP	0x02
-#define	MSG_RESTORESP	0x03
-#define	MSG_DISCON	0x04
-#define	MSG_I_ERROR	0x05
-#define	MSG_ABORT	0x06
-#define	MSG_REJECT	0x07
-#define	MSG_NOOP	0x08
-#define	MSG_PARITY	0x09
-#define	MSG_LCOMP	0x0a
-#define	MSG_LCOMP_F	0x0b
-#define	MSG_RESET	0x0c
-#define	MSG_ABORT_QTAG	0x0d
-#define	MSG_CLEAR_QTAG	0x0e
-#define	MSG_TERM_IO	0x11
-#define	MSG_SIMPLE_QTAG	0x20
-#define	MSG_HEAD_QTAG	0x21
-#define	MSG_ORDERED_QTAG	0x22
-#define	MSG_IDENTIFY	  	0x80
-#define	MSG_IDENTIFY_DISCPRIV	0x40
-#endif	/* !_SCSI_LOW_H_ */
diff --git a/include.new/cam/scsi/scsi_low_pisa.h b/include.new/cam/scsi/scsi_low_pisa.h
deleted file mode 100644
index 9581be1..0000000
--- a/include.new/cam/scsi/scsi_low_pisa.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$FreeBSD: src/sys/cam/scsi/scsi_low_pisa.h,v 1.5 2005/01/05 22:34:34 imp Exp $	*/
-/*	$NecBSD: scsi_low_pisa.h,v 1.3.14.1 2001/06/08 06:27:49 honda Exp $	*/
-/*	$NetBSD$	*/
-
-/*-
- * [NetBSD for NEC PC-98 series]
- *  Copyright (c) 1998
- *	NetBSD/pc98 porting staff. 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 ``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 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.
- */
-
-#ifndef	_SCSI_LOW_PISA_H_
-#define	_SCSI_LOW_PISA_H_
-
-#ifdef	__NetBSD__
-int scsi_low_activate_pisa(pisa_device_handle_t);
-int scsi_low_deactivate_pisa(pisa_device_handle_t);
-int scsi_low_notify_pisa(pisa_device_handle_t, pisa_event_t);
-#endif	/* __NetBSD__ */
-
-#ifdef	__FreeBSD__
-int scsi_low_activate_pisa(struct scsi_low_softc *, int);
-int scsi_low_deactivate_pisa(struct scsi_low_softc *);
-#endif	/* __FreeBSD__ */
-#endif	/* !_SCSI_LOW_PISA_H_ */
diff --git a/include.new/cam/scsi/scsi_message.h b/include.new/cam/scsi/scsi_message.h
deleted file mode 100644
index 8532e51..0000000
--- a/include.new/cam/scsi/scsi_message.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * This file is in the public domain.
- * $FreeBSD: releng/10.2/sys/cam/scsi/scsi_message.h 139743 2005-01-05 22:34:37Z imp $
- */
-
-/* Messages (1 byte) */		     /* I/T (M)andatory or (O)ptional */
-#define MSG_CMDCOMPLETE		0x00 /* M/M */
-#define MSG_TASK_COMPLETE	0x00 /* M/M */ /* SPI3 Terminology */
-#define MSG_EXTENDED		0x01 /* O/O */
-#define MSG_SAVEDATAPOINTER	0x02 /* O/O */
-#define MSG_RESTOREPOINTERS	0x03 /* O/O */
-#define MSG_DISCONNECT		0x04 /* O/O */
-#define MSG_INITIATOR_DET_ERR	0x05 /* M/M */
-#define MSG_ABORT		0x06 /* O/M */
-#define MSG_ABORT_TASK_SET	0x06 /* O/M */ /* SPI3 Terminology */
-#define MSG_MESSAGE_REJECT	0x07 /* M/M */
-#define MSG_NOOP		0x08 /* M/M */
-#define MSG_PARITY_ERROR	0x09 /* M/M */
-#define MSG_LINK_CMD_COMPLETE	0x0a /* O/O */
-#define MSG_LINK_CMD_COMPLETEF	0x0b /* O/O */ /* Obsolete */
-#define MSG_BUS_DEV_RESET	0x0c /* O/M */
-#define MSG_TARGET_RESET	0x0c /* O/M */ /* SPI3 Terminology */
-#define MSG_ABORT_TAG		0x0d /* O/O */
-#define MSG_ABORT_TASK		0x0d /* O/O */ /* SPI3 Terminology */
-#define MSG_CLEAR_QUEUE		0x0e /* O/O */
-#define MSG_CLEAR_TASK_SET	0x0e /* O/O */ /* SPI3 Terminology */
-#define MSG_INIT_RECOVERY	0x0f /* O/O */ /* Deprecated in SPI3 */
-#define MSG_REL_RECOVERY	0x10 /* O/O */ /* Deprecated in SPI3 */
-#define MSG_TERM_IO_PROC	0x11 /* O/O */ /* Deprecated in SPI3 */
-#define MSG_CLEAR_ACA		0x16 /* O/O */ /* SPI3 */
-#define MSG_LOGICAL_UNIT_RESET	0x17 /* O/O */ /* SPI3 */
-#define MSG_QAS_REQUEST		0x55 /* O/O */ /* SPI3 */
-
-/* Messages (2 byte) */
-#define MSG_SIMPLE_Q_TAG	0x20 /* O/O */
-#define MSG_SIMPLE_TASK		0x20 /* O/O */ /* SPI3 Terminology */
-#define MSG_HEAD_OF_Q_TAG	0x21 /* O/O */
-#define MSG_HEAD_OF_QUEUE_TASK	0x21 /* O/O */ /* SPI3 Terminology */
-#define MSG_ORDERED_Q_TAG	0x22 /* O/O */
-#define MSG_ORDERED_TASK	0x22 /* O/O */ /* SPI3 Terminology */
-#define MSG_IGN_WIDE_RESIDUE	0x23 /* O/O */
-#define MSG_ACA_TASK		0x24 /* 0/0 */ /* SPI3 */
-
-/* Identify message */		     /* M/M */	
-#define MSG_IDENTIFYFLAG	0x80 
-#define MSG_IDENTIFY_DISCFLAG	0x40 
-#define MSG_IDENTIFY(lun, disc)	(((disc) ? 0xc0 : MSG_IDENTIFYFLAG) | (lun))
-#define MSG_ISIDENTIFY(m)	((m) & MSG_IDENTIFYFLAG)
-#define MSG_IDENTIFY_LUNMASK	0x3F 
-
-/* Extended messages (opcode and length) */
-#define MSG_EXT_SDTR		0x01
-#define MSG_EXT_SDTR_LEN	0x03
-
-#define MSG_EXT_WDTR		0x03
-#define MSG_EXT_WDTR_LEN	0x02
-#define MSG_EXT_WDTR_BUS_8_BIT	0x00
-#define MSG_EXT_WDTR_BUS_16_BIT	0x01
-#define MSG_EXT_WDTR_BUS_32_BIT	0x02 /* Deprecated in SPI3 */
-
-#define	MSG_EXT_PPR		0x04 /* SPI3/SPI4 */
-#define	MSG_EXT_PPR_LEN		0x06
-#define	MSG_EXT_PPR_PCOMP_EN	0x80
-#define	MSG_EXT_PPR_RTI		0x40
-#define	MSG_EXT_PPR_RD_STRM	0x20
-#define	MSG_EXT_PPR_WR_FLOW	0x10
-#define	MSG_EXT_PPR_HOLD_MCS	0x08
-#define	MSG_EXT_PPR_QAS_REQ	0x04
-#define	MSG_EXT_PPR_DT_REQ	0x02
-#define	MSG_EXT_PPR_IU_REQ	0x01
diff --git a/include.new/cam/scsi/scsi_pass.h b/include.new/cam/scsi/scsi_pass.h
deleted file mode 100644
index 661f5cf..0000000
--- a/include.new/cam/scsi/scsi_pass.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 1997, 1999 Kenneth D. Merry.
- * 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. 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: releng/10.2/sys/cam/scsi/scsi_pass.h 139743 2005-01-05 22:34:37Z imp $
- */
-
-#ifndef _SCSI_PASS_H
-#define _SCSI_PASS_H 1
-
-#include <sys/ioccom.h>
-
-#include <cam/cam_ccb.h>
-
-/*
- * Convert to using a pointer to a ccb in the next major version.
- * This should allow us to avoid an extra copy of the CCB data.
- */
-#define CAMIOCOMMAND	_IOWR(CAM_VERSION, 2, union ccb)
-#define CAMGETPASSTHRU	_IOWR(CAM_VERSION, 3, union ccb)
-
-#endif
diff --git a/include.new/cam/scsi/scsi_pt.h b/include.new/cam/scsi/scsi_pt.h
deleted file mode 100644
index 3e1215e..0000000
--- a/include.new/cam/scsi/scsi_pt.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Structure and function declarations for Processor type devices.
- *
- * Copyright (c) 1998 Justin T. Gibbs
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/scsi/scsi_pt.h 139743 2005-01-05 22:34:37Z imp $
- */
-
-#ifndef	_SCSI_SCSI_PT_H
-#define _SCSI_SCSI_PT_H 1
-
-struct scsi_send_receive
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t xfer_len[3];
-	u_int8_t control;
-};
-
-/*
- * Opcodes
- */
-#define RECEIVE			0x08
-#define SEND			0x0A
-
-#endif /* _SCSI_SCSI_PT_H */
diff --git a/include.new/cam/scsi/scsi_sa.h b/include.new/cam/scsi/scsi_sa.h
deleted file mode 100644
index 59f15f8..0000000
--- a/include.new/cam/scsi/scsi_sa.h
+++ /dev/null
@@ -1,1068 +0,0 @@
-/*-
- * Structure and function declarations for the
- * SCSI Sequential Access Peripheral driver for CAM.
- *
- * Copyright (c) 1999, 2000 Matthew Jacob
- * Copyright (c) 2013, 2014, 2015 Spectra Logic Corporation
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/scsi/scsi_sa.h 280438 2015-03-24 14:36:10Z ken $
- */
-
-#ifndef	_SCSI_SCSI_SA_H
-#define _SCSI_SCSI_SA_H 1
-
-#include <sys/cdefs.h>
-
-struct scsi_read_block_limits
-{
-	u_int8_t opcode;
-	u_int8_t byte2;
-	u_int8_t unused[3];
-	u_int8_t control;
-};
-
-struct scsi_read_block_limits_data
-{
-	u_int8_t gran;
-#define	RBL_GRAN_MASK	0x1F
-#define RBL_GRAN(rblim) ((rblim)->gran & RBL_GRAN_MASK)
-	u_int8_t maximum[3];
-	u_int8_t minimum[2];
-};
-
-struct scsi_sa_rw
-{
-	u_int8_t opcode;
-        u_int8_t sli_fixed;
-#define SAR_SLI		0x02
-#define SARW_FIXED	0x01
-	u_int8_t length[3];
-        u_int8_t control;
-};
-
-struct scsi_load_unload
-{
-	u_int8_t opcode;
-        u_int8_t immediate;
-#define SLU_IMMED	0x01
-	u_int8_t reserved[2];
-	u_int8_t eot_reten_load;
-#define SLU_EOT		0x04
-#define SLU_RETEN	0x02
-#define SLU_LOAD	0x01
-        u_int8_t control;
-};
-
-struct scsi_rewind
-{
-	u_int8_t opcode;
-        u_int8_t immediate;
-#define SREW_IMMED	0x01
-	u_int8_t reserved[3];
-        u_int8_t control;
-};
-
-typedef enum {
-	SS_BLOCKS,
-	SS_FILEMARKS,
-	SS_SEQFILEMARKS,
-	SS_EOD,
-	SS_SETMARKS,
-	SS_SEQSETMARKS
-} scsi_space_code;
-
-struct scsi_space
-{
-	u_int8_t opcode;
-        u_int8_t code;
-#define SREW_IMMED	0x01
-	u_int8_t count[3];
-        u_int8_t control;
-};
-
-struct scsi_write_filemarks
-{
-	u_int8_t opcode;
-        u_int8_t byte2;
-#define SWFMRK_IMMED	0x01
-#define SWFMRK_WSMK	0x02
-	u_int8_t num_marks[3];
-        u_int8_t control;
-};
-
-/*
- * Reserve and release unit have the same exact cdb format, but different
- * opcodes.
- */
-struct scsi_reserve_release_unit
-{
-	u_int8_t opcode;
-	u_int8_t lun_thirdparty;
-#define SRRU_LUN_MASK	0xE0
-#define SRRU_3RD_PARTY	0x10
-#define SRRU_3RD_SHAMT	1
-#define SRRU_3RD_MASK	0xE
-	u_int8_t reserved[3];
-	u_int8_t control;
-};
-
-/*
- * Erase a tape
- */
-struct scsi_erase
-{
-	u_int8_t opcode;
-	u_int8_t lun_imm_long;
-#define SE_LUN_MASK	0xE0
-#define SE_LONG		0x1
-#define SE_IMMED	0x2
-	u_int8_t reserved[3];
-	u_int8_t control;
-};
-
-/*
- * Set tape capacity.
- */
-struct scsi_set_capacity
-{
-	u_int8_t opcode;
-	u_int8_t byte1;
-#define	SA_SSC_IMMED		0x01
-	u_int8_t reserved;
-	u_int8_t cap_proportion[2];
-	u_int8_t control;
-};
-
-/*
- * Format tape media.  The CDB opcode is the same as the disk-specific
- * FORMAT UNIT command, but the fields are different inside the CDB.  Thus
- * the reason for a separate definition here.
- */
-struct scsi_format_medium
-{
-	u_int8_t opcode;
-	u_int8_t byte1;
-#define	SFM_IMMED		0x01
-#define	SFM_VERIFY		0x02
-	u_int8_t byte2;
-#define	SFM_FORMAT_DEFAULT	0x00
-#define	SFM_FORMAT_PARTITION	0x01
-#define	SFM_FORMAT_DEF_PART	0x02
-#define	SFM_FORMAT_MASK		0x0f
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-struct scsi_allow_overwrite
-{
-	u_int8_t opcode;
-	u_int8_t reserved1;
-	u_int8_t allow_overwrite;
-#define	SAO_ALLOW_OVERWRITE_DISABLED	0x00
-#define	SAO_ALLOW_OVERWRITE_CUR_POS	0x01
-#define	SAO_ALLOW_OVERWRITE_FORMAT	0x02
-	u_int8_t partition;
-	u_int8_t logical_id[8];
-	u_int8_t reserved2[3];
-	u_int8_t control;
-};
-
-/*
- * Dev specific mode page masks.
- */
-#define SMH_SA_WP		0x80
-#define	SMH_SA_BUF_MODE_MASK	0x70
-#define SMH_SA_BUF_MODE_NOBUF	0x00
-#define SMH_SA_BUF_MODE_SIBUF	0x10	/* Single-Initiator buffering */
-#define SMH_SA_BUF_MODE_MIBUF	0x20	/* Multi-Initiator buffering */
-#define SMH_SA_SPEED_MASK	0x0F
-#define SMH_SA_SPEED_DEFAULT	0x00
-
-/*
- * Sequential-access specific mode page numbers.
- */
-#define SA_DEVICE_CONFIGURATION_PAGE	0x10
-#define SA_MEDIUM_PARTITION_PAGE_1	0x11
-#define SA_MEDIUM_PARTITION_PAGE_2	0x12
-#define SA_MEDIUM_PARTITION_PAGE_3	0x13
-#define SA_MEDIUM_PARTITION_PAGE_4	0x14
-#define SA_DATA_COMPRESSION_PAGE	0x0f	/* SCSI-3 */
-
-/*
- * Mode page definitions.
- */
-
-/* See SCSI-II spec 9.3.3.1 */
-struct scsi_dev_conf_page {
-	u_int8_t pagecode;	/* 0x10 */
-	u_int8_t pagelength;	/* 0x0e */
-	u_int8_t byte2;		/* CAP, CAF, Active Format */
-	u_int8_t active_partition;
-	u_int8_t wb_full_ratio;
-	u_int8_t rb_empty_ratio;
-	u_int8_t wrdelay_time[2];
-	u_int8_t byte8;
-#define	SA_DBR			0x80	/* data buffer recovery */
-#define	SA_BIS			0x40	/* block identifiers supported */
-#define	SA_RSMK			0x20	/* report setmarks */
-#define	SA_AVC			0x10	/* automatic velocity control */
-#define	SA_SOCF_MASK		0x0c	/* stop on consecutive formats */
-#define	SA_RBO			0x02	/* recover buffer order */
-#define	SA_REW			0x01	/* report early warning */
-	u_int8_t gap_size;
-	u_int8_t byte10;
-/* from SCSI-3: SSC-4 Working draft (2/14) 8.3.3 */
-#define	SA_EOD_DEF_MASK		0xe0	/* EOD defined */
-#define	SA_EEG			0x10	/* Enable EOD Generation */
-#define	SA_SEW			0x08	/* Synchronize at Early Warning */
-#define	SA_SOFT_WP		0x04	/* Software Write Protect */
-#define	SA_BAML			0x02	/* Block Address Mode Lock */
-#define	SA_BAM			0x01	/* Block Address Mode */
-	u_int8_t ew_bufsize[3];
-	u_int8_t sel_comp_alg;
-#define	SA_COMP_NONE		0x00
-#define	SA_COMP_DEFAULT		0x01
-	/* the following is 'reserved' in SCSI-2 but is defined in SSC-r22 */
-	u_int8_t extra_wp;
-#define	SA_ASOC_WP		0x04	/* Associated Write Protect */
-#define	SA_PERS_WP		0x02	/* Persistent Write Protect */
-#define	SA_PERM_WP		0x01	/* Permanent Write Protect */
-};
-
-/* from SCSI-3: SSC-Rev10 (6/97) */
-struct scsi_data_compression_page {
-	u_int8_t page_code;	/* 0x0f */
-	u_int8_t page_length;	/* 0x0e */
-	u_int8_t dce_and_dcc;
-#define SA_DCP_DCE		0x80 	/* Data compression enable */
-#define SA_DCP_DCC		0x40	/* Data compression capable */
-	u_int8_t dde_and_red;
-#define SA_DCP_DDE		0x80	/* Data decompression enable */
-#define SA_DCP_RED_MASK		0x60	/* Report Exception on Decomp. */
-#define SA_DCP_RED_SHAMT	5
-#define SA_DCP_RED_0		0x00
-#define SA_DCP_RED_1		0x20
-#define SA_DCP_RED_2		0x40
-	u_int8_t comp_algorithm[4];
-	u_int8_t decomp_algorithm[4];
-	u_int8_t reserved[4];
-};
-
-typedef union {
-	struct { u_int8_t pagecode, pagelength; } hdr;
-	struct scsi_dev_conf_page dconf;
-	struct scsi_data_compression_page dcomp;
-} sa_comp_t;
-
-/*
- * Control Data Protection subpage.  This is as defined in SSC3r03.
- */
-struct scsi_control_data_prot_subpage {
-	uint8_t page_code;
-#define	SA_CTRL_DP_PAGE_CODE		0x0a
-	uint8_t subpage_code;
-#define	SA_CTRL_DP_SUBPAGE_CODE		0xf0
-	uint8_t length[2];
-	uint8_t prot_method;
-#define	SA_CTRL_DP_NO_LBP		0x00
-#define	SA_CTRL_DP_REED_SOLOMON		0x01
-#define	SA_CTRL_DP_METHOD_MAX		0xff
-	uint8_t pi_length;
-#define	SA_CTRL_DP_PI_LENGTH_MASK	0x3f
-#define	SA_CTRL_DP_RS_LENGTH		4
-	uint8_t prot_bits;
-#define	SA_CTRL_DP_LBP_W		0x80
-#define	SA_CTRL_DP_LBP_R		0x40
-#define	SA_CTRL_DP_RBDP			0x20
-	uint8_t reserved[];
-};
-
-/*
- * This is the Read/Write Control mode page used on IBM Enterprise Tape
- * Drives.  They are known as 3592, TS, or Jaguar drives.  The SCSI inquiry
- * data will show a Product ID "03592XXX", where XXX is 'J1A', 'E05' (TS1120),
- * 'E06' (TS1130), 'E07' (TS1140) or 'E08' (TS1150).
- *
- * This page definition is current as of the 3592 SCSI Reference v6,
- * released on December 16th, 2014.
- */
-struct scsi_tape_ibm_rw_control {
-	uint8_t page_code;
-#define SA_IBM_RW_CTRL_PAGE_CODE		0x25
-	uint8_t page_length;
-	uint8_t ignore_seq_checks;
-#define	SA_IBM_RW_CTRL_LOC_IGNORE_SEQ		0x04
-#define	SA_IBM_RW_CTRL_SPC_BLK_IGNORE_SEQ	0x02
-#define	SA_IBM_RW_CTRL_SPC_FM_IGNORE_SEQ	0x01
-	uint8_t ignore_data_checks;
-#define	SA_IBM_RW_CTRL_LOC_IGNORE_DATA		0x04
-#define	SA_IBM_RW_CTRL_SPC_BLK_IGNORE_DATA	0x02
-#define	SA_IBM_RW_CTRL_SPC_FM_IGNORE_DATA	0x01
-	uint8_t reserved1;
-	uint8_t leop_method;
-#define	SA_IBM_RW_CTRL_LEOP_DEFAULT		0x00
-#define	SA_IBM_RW_CTRL_LEOP_MAX_CAP		0x01
-#define	SA_IBM_RW_CTRL_LEOP_CONST_CAP		0x02
-	uint8_t leop_ew[2];
-	uint8_t byte8;
-#define	SA_IBM_RW_CTRL_DISABLE_FASTSYNC		0x80
-#define	SA_IBM_RW_CTRL_DISABLE_SKIPSYNC		0x40
-#define	SA_IBM_RW_CTRL_DISABLE_CROSS_EOD	0x08
-#define	SA_IBM_RW_CTRL_DISABLE_CROSS_PERM_ERR	0x04
-#define	SA_IBM_RW_CTRL_REPORT_SEG_EW		0x02
-#define	SA_IBM_RW_CTRL_REPORT_HOUSEKEEPING_ERR	0x01
-	uint8_t default_write_dens_bop_0;
-	uint8_t pending_write_dens_bop_0;
-	uint8_t reserved2[21];
-};
-
-struct scsi_tape_read_position {
-	u_int8_t opcode;		/* READ_POSITION */
-	u_int8_t byte1;			/* set LSB to read hardware block pos */
-#define	SA_RPOS_SHORT_FORM	0x00
-#define	SA_RPOS_SHORT_VENDOR	0x01
-#define	SA_RPOS_LONG_FORM	0x06
-#define	SA_RPOS_EXTENDED_FORM	0x08
-	u_int8_t reserved[5];
-	u_int8_t length[2];
-	u_int8_t control;
-};
-
-struct scsi_tape_position_data	{	/* Short Form */
-	u_int8_t flags;
-#define	SA_RPOS_BOP		0x80	/* Beginning of Partition */
-#define	SA_RPOS_EOP		0x40	/* End of Partition */
-#define	SA_RPOS_BCU		0x20	/* Block Count Unknown (SCSI3) */
-#define	SA_RPOS_BYCU		0x10	/* Byte Count Unknown (SCSI3) */
-#define	SA_RPOS_BPU		0x04	/* Block Position Unknown */
-#define	SA_RPOS_PERR		0x02	/* Position Error (SCSI3) */
-#define	SA_RPOS_BPEW		0x01	/* Beyond Programmable Early Warning */
-#define	SA_RPOS_UNCERTAIN	SA_RPOS_BPU
-	u_int8_t partition;
-	u_int8_t reserved[2];
-	u_int8_t firstblk[4];
-	u_int8_t lastblk[4];
-	u_int8_t reserved2;
-	u_int8_t nbufblk[3];
-	u_int8_t nbufbyte[4];
-};
-
-struct scsi_tape_position_long_data {
-	u_int8_t flags;
-#define	SA_RPOS_LONG_BOP	0x80	/* Beginning of Partition */
-#define	SA_RPOS_LONG_EOP	0x40	/* End of Partition */
-#define	SA_RPOS_LONG_MPU	0x08	/* Mark Position Unknown */
-#define	SA_RPOS_LONG_LONU	0x04	/* Logical Object Number Unknown */
-#define	SA_RPOS_LONG_BPEW	0x01	/* Beyond Programmable Early Warning */
-	u_int8_t reserved[3];
-	u_int8_t partition[4];
-	u_int8_t logical_object_num[8];
-	u_int8_t logical_file_num[8];
-	u_int8_t set_id[8];
-};
-
-struct scsi_tape_position_ext_data {
-	u_int8_t flags;
-#define	SA_RPOS_EXT_BOP		0x80	/* Beginning of Partition */
-#define	SA_RPOS_EXT_EOP		0x40	/* End of Partition */
-#define	SA_RPOS_EXT_LOCU	0x20	/* Logical Object Count Unknown */
-#define	SA_RPOS_EXT_BYCU	0x10	/* Byte Count Unknown */
-#define	SA_RPOS_EXT_LOLU	0x04	/* Logical Object Location Unknown */
-#define	SA_RPOS_EXT_PERR	0x02	/* Position Error */
-#define	SA_RPOS_EXT_BPEW	0x01	/* Beyond Programmable Early Warning */
-	u_int8_t partition;
-	u_int8_t length[2];
-	u_int8_t reserved;
-	u_int8_t num_objects[3];
-	u_int8_t first_object[8];
-	u_int8_t last_object[8];
-	u_int8_t bytes_in_buffer[8];
-};
-
-struct scsi_tape_locate {
-	u_int8_t opcode;
-	u_int8_t byte1;
-#define	SA_SPOS_IMMED		0x01
-#define	SA_SPOS_CP		0x02
-#define	SA_SPOS_BT		0x04
-	u_int8_t reserved1;
-	u_int8_t blkaddr[4];
-#define	SA_SPOS_MAX_BLK		0xffffffff
-	u_int8_t reserved2;
-	u_int8_t partition;
-	u_int8_t control;
-};
-
-struct scsi_locate_16 {
-	u_int8_t opcode;
-	u_int8_t byte1;
-#define	SA_LC_IMMEDIATE		0x01
-#define	SA_LC_CP		0x02
-#define	SA_LC_DEST_TYPE_MASK	0x38
-#define	SA_LC_DEST_TYPE_SHIFT	3
-#define	SA_LC_DEST_OBJECT	0x00
-#define	SA_LC_DEST_FILE		0x01
-#define	SA_LC_DEST_SET		0x02
-#define	SA_LC_DEST_EOD		0x03
-	u_int8_t byte2;
-#define	SA_LC_BAM_IMPLICIT	0x00
-#define	SA_LC_BAM_EXPLICIT	0x01
-	u_int8_t partition;
-	u_int8_t logical_id[8];
-	u_int8_t reserved[3];
-	u_int8_t control;
-};
-
-struct scsi_report_density_support {
-	u_int8_t opcode;
-	u_int8_t byte1;
-#define	SRDS_MEDIA		0x01
-#define	SRDS_MEDIUM_TYPE	0x02
-	u_int8_t reserved[5];
-	u_int8_t length[2];
-#define	SRDS_MAX_LENGTH		0xffff
-	u_int8_t control;
-};
-
-struct scsi_density_hdr {
-	u_int8_t length[2];
-	u_int8_t reserved[2];
-	u_int8_t descriptor[];
-};
-
-struct scsi_density_data {
-	u_int8_t primary_density_code;
-	u_int8_t secondary_density_code;
-	u_int8_t byte2;
-#define	SDD_DLV			0x01
-#define	SDD_DEFLT		0x20
-#define	SDD_DUP			0x40
-#define SDD_WRTOK		0x80
-	u_int8_t length[2];
-#define	SDD_DEFAULT_LENGTH	52
-	u_int8_t bits_per_mm[3];
-	u_int8_t media_width[2];
-	u_int8_t tracks[2];
-	u_int8_t capacity[4];
-	u_int8_t assigning_org[8];
-	u_int8_t density_name[8];
-	u_int8_t description[20];
-};
-
-struct scsi_medium_type_data {
-	u_int8_t medium_type;
-	u_int8_t reserved1;
-	u_int8_t length[2];
-#define	SMTD_DEFAULT_LENGTH	52
-	u_int8_t num_density_codes;
-	u_int8_t primary_density_codes[9];
-	u_int8_t media_width[2];
-	u_int8_t medium_length[2];
-	u_int8_t reserved2[2];
-	u_int8_t assigning_org[8];
-	u_int8_t medium_type_name[8];
-	u_int8_t description[20];
-};
-
-/*
- * Security Protocol Specific values for the Tape Data Encryption protocol
- * (0x20) used with SECURITY PROTOCOL IN.  See below for values used with
- * SECURITY PROTOCOL OUT.  Current as of SSC4r03.
- */
-#define	TDE_IN_SUPPORT_PAGE		0x0000
-#define	TDE_OUT_SUPPORT_PAGE		0x0001
-#define	TDE_DATA_ENC_CAP_PAGE		0x0010
-#define	TDE_SUPPORTED_KEY_FORMATS_PAGE	0x0011
-#define	TDE_DATA_ENC_MAN_CAP_PAGE	0x0012
-#define	TDE_DATA_ENC_STATUS_PAGE	0x0020
-#define	TDE_NEXT_BLOCK_ENC_STATUS_PAGE	0x0021
-#define	TDE_GET_ENC_MAN_ATTR_PAGE	0x0022
-#define	TDE_RANDOM_NUM_PAGE		0x0030
-#define	TDE_KEY_WRAP_PK_PAGE		0x0031
-
-/*
- * Tape Data Encryption protocol pages used with SECURITY PROTOCOL IN and
- * SECURITY PROTOCOL OUT.
- */
-/*
- * Tape Data Encryption In Support page (0x0000).
- */
-struct tde_in_support_page {
-	uint8_t page_code[2];
-	uint8_t page_length[2];
-	uint8_t page_codes[];
-};
-
-/*
- * Tape Data Encryption Out Support page (0x0001).
- */
-struct tde_out_support_page {
-	uint8_t page_code[2];
-	uint8_t page_length[2];
-	uint8_t page_codes[];
-};
-
-/*
- * Logical block encryption algorithm descriptor.  This is reported in the
- * Data Encryption Capabilities page.
- */
-struct tde_block_enc_alg_desc {
-	uint8_t alg_index;
-	uint8_t reserved1;
-	uint8_t desc_length[2];
-	uint8_t byte4;
-#define	TDE_BEA_AVFMV			0x80
-#define	TDE_BEA_SDK_C			0x40
-#define	TDE_BEA_MAC_C			0x20
-#define	TDE_BEA_DELB_C			0x10
-#define	TDE_BEA_DECRYPT_C_MASK		0x0c
-#define	TDE_BEA_DECRYPT_C_EXT		0x0c
-#define	TDE_BEA_DECRYPT_C_HARD		0x08
-#define	TDE_BEA_DECRYPT_C_SOFT		0x04
-#define	TDE_BEA_DECRYPT_C_NO_CAP	0x00
-#define	TDE_BEA_ENCRYPT_C_MASK		0x03
-#define	TDE_BEA_ENCRYPT_C_EXT		0x03
-#define	TDE_BEA_ENCRYPT_C_HARD		0x02
-#define	TDE_BEA_ENCRYPT_C_SOFT		0x01
-#define	TDE_BEA_ENCRYPT_C_NO_CAP	0x00
-	uint8_t byte5;
-#define	TDE_BEA_AVFCLP_MASK		0xc0
-#define	TDE_BEA_AVFCLP_VALID		0x80
-#define	TDE_BEA_AVFCLP_NOT_VALID	0x40
-#define	TDE_BEA_AVFCLP_NOT_APP		0x00
-#define	TDE_BEA_NONCE_C_MASK		0x30
-#define	TDE_BEA_NONCE_C_SUPPORTED	0x30
-#define	TDE_BEA_NONCE_C_PROVIDED	0x20
-#define	TDE_BEA_NONCE_C_GENERATED	0x10
-#define	TDE_BEA_NONCE_C_NOT_REQUIRED	0x00
-#define	TDE_BEA_KADF_C			0x08
-#define	TDE_BEA_VCELB_C			0x04
-#define	TDE_BEA_UKADF			0x02
-#define	TDE_BEA_AKADF			0x01
-	uint8_t max_unauth_key_bytes[2];
-	uint8_t max_auth_key_bytes[2];
-	uint8_t lbe_key_size[2];
-	uint8_t byte12;
-#define	TDE_BEA_DKAD_C_MASK		0xc0
-#define	TDE_BEA_DKAD_C_CAPABLE		0xc0
-#define	TDE_BEA_DKAD_C_NOT_ALLOWED	0x80
-#define	TDE_BEA_DKAD_C_REQUIRED		0x40
-#define	TDE_BEA_EEMC_C_MASK		0x30
-#define	TDE_BEA_EEMC_C_ALLOWED		0x20
-#define	TDE_BEA_EEMC_C_NOT_ALLOWED	0x10
-#define	TDE_BEA_EEMC_C_NOT_SPECIFIED	0x00
-	/*
-	 * Raw Decryption Mode Control Capabilities (RDMC_C) field.  The
-	 * descriptions are too complex to represent as a simple name.
-	 */
-#define	TDE_BEA_RDMC_C_MASK		0x0e
-#define	TDE_BEA_RDMC_C_MODE_7		0x0e
-#define	TDE_BEA_RDMC_C_MODE_6		0x0c
-#define	TDE_BEA_RDMC_C_MODE_5		0x0a
-#define	TDE_BEA_RDMC_C_MODE_4		0x08
-#define	TDE_BEA_RDMC_C_MODE_1		0x02
-#define	TDE_BEA_EAREM			0x01
-	uint8_t byte13;
-#define	TDE_BEA_MAX_EEDKS_MASK		0x0f
-	uint8_t msdk_count[2];
-	uint8_t max_eedk_size[2];
-	uint8_t reserved2[2];
-	uint8_t security_algo_code[4];
-};
-
-/*
- * Data Encryption Capabilities page (0x0010).
- */
-struct tde_data_enc_cap_page {
-	uint8_t page_code[2];
-	uint8_t page_length;
-	uint8_t byte4;
-#define	DATA_ENC_CAP_EXTDECC_MASK		0x0c
-#define	DATA_ENC_CAP_EXTDECC_NOT_REPORTED	0x00
-#define	DATA_ENC_CAP_EXTDECC_NOT_CAPABLE	0x04
-#define	DATA_ENC_CAP_EXTDECC_CAPABLE		0x08
-#define	DATA_ENC_CAP_CFG_P_MASK			0x03
-#define	DATA_ENC_CAP_CFG_P_NOT_REPORTED		0x00
-#define	DATA_ENC_CAP_CFG_P_ALLOWED		0x01
-#define	DATA_ENC_CAP_CFG_P_NOT_ALLOWED		0x02
-	uint8_t reserved[15];
-	struct tde_block_enc_alg_desc alg_descs[];
-};
-
-/*
- * Tape Data Encryption Supported Key Formats page (0x0011).
- */
-struct tde_supported_key_formats_page {
-	uint8_t page_code[2];
-	uint8_t page_length[2];
-	uint8_t key_formats_list[];
-};
-
-/*
- * Tape Data Encryption Management Capabilities page (0x0012).
- */
-struct tde_data_enc_man_cap_page {
-	uint8_t page_code[2];
-	uint8_t page_length[2];
-	uint8_t byte4;
-#define	TDE_DEMC_LOCK_C		0x01
-	uint8_t byte5;
-#define	TDE_DEMC_CKOD_C		0x04
-#define	TDE_DEMC_CKORP_C	0x02
-#define	TDE_DEMC_CKORL_C	0x01
-	uint8_t reserved1;
-	uint8_t byte7;
-#define	TDE_DEMC_AITN_C		0x04
-#define	TDE_DEMC_LOCAL_C	0x02
-#define	TDE_DEMC_PUBLIC_C	0x01
-	uint8_t reserved2[8];
-};
-
-/*
- * Tape Data Encryption Status Page (0x0020).
- */
-struct tde_data_enc_status_page {
-	uint8_t page_code[2];
-	uint8_t page_length[2];
-	uint8_t scope;
-#define	TDE_DES_IT_NEXUS_SCOPE_MASK	0xe0
-#define	TDE_DES_LBE_SCOPE_MASK		0x07
-	uint8_t encryption_mode;
-	uint8_t decryption_mode;
-	uint8_t algo_index;
-	uint8_t key_instance_counter[4];
-	uint8_t byte12;
-#define	TDE_DES_PARAM_CTRL_MASK		0x70
-#define	TDE_DES_PARAM_CTRL_MGMT		0x40
-#define	TDE_DES_PARAM_CTRL_CHANGER	0x30
-#define	TDE_DES_PARAM_CTRL_DRIVE	0x20
-#define	TDE_DES_PARAM_CTRL_EXT		0x10
-#define	TDE_DES_PARAM_CTRL_NOT_REPORTED	0x00
-#define	TDE_DES_VCELB			0x08
-#define	TDE_DES_CEEMS_MASK		0x06
-#define	TDE_DES_RDMD			0x01
-	uint8_t enc_params_kad_format;
-	uint8_t asdk_count[2];
-	uint8_t reserved[8];
-	uint8_t key_assoc_data_desc[];
-};
-
-/*
- * Tape Data Encryption Next Block Encryption Status page (0x0021).
- */
-struct tde_next_block_enc_status_page {
-	uint8_t page_code[2];
-	uint8_t page_length[2];
-	uint8_t logical_obj_number[8];
-	uint8_t status;
-#define	TDE_NBES_COMP_STATUS_MASK	0xf0
-#define	TDE_NBES_COMP_INCAPABLE		0x00
-#define	TDE_NBES_COMP_NOT_YET		0x10
-#define	TDE_NBES_COMP_NOT_A_BLOCK	0x20
-#define	TDE_NBES_COMP_NOT_COMPRESSED	0x30
-#define	TDE_NBES_COMP_COMPRESSED	0x40
-#define	TDE_NBES_ENC_STATUS_MASK	0x0f
-#define	TDE_NBES_ENC_INCAPABLE		0x00
-#define	TDE_NBES_ENC_NOT_YET		0x01
-#define	TDE_NBES_ENC_NOT_A_BLOCK	0x02
-#define	TDE_NBES_ENC_NOT_ENCRYPTED	0x03
-#define	TDE_NBES_ENC_ALG_NOT_SUPPORTED	0x04
-#define	TDE_NBES_ENC_SUPPORTED_ALG	0x05
-#define	TDE_NBES_ENC_NO_KEY		0x06
-	uint8_t algo_index;
-	uint8_t byte14;
-#define	TDE_NBES_EMES			0x02
-#define	TDE_NBES_RDMDS			0x01
-	uint8_t next_block_kad_format;
-	uint8_t key_assoc_data_desc[];
-};
-
-/*
- * Tape Data Encryption Get Encryption Management Attributes page (0x0022).
- */
-struct tde_get_enc_man_attr_page {
-	uint8_t page_code[2];
-	uint8_t reserved[3];
-	uint8_t byte5;
-#define	TDE_GEMA_CAOD			0x01
-	uint8_t page_length[2];
-	uint8_t enc_mgmt_attr_desc[];
-};
-
-/*
- * Tape Data Encryption Random Number page (0x0030).
- */
-struct tde_random_num_page {
-	uint8_t page_code[2];
-	uint8_t page_length[2];
-	uint8_t random_number[32];
-};
-
-/*
- * Tape Data Encryption Device Server Key Wrapping Public Key page (0x0031).
- */
-struct tde_key_wrap_pk_page {
-	uint8_t page_code[2];
-	uint8_t page_length[2];
-	uint8_t public_key_type[4];
-	uint8_t public_key_format[4];
-	uint8_t public_key_length[2];
-	uint8_t public_key[];
-};
-
-/*
- * Security Protocol Specific values for the Tape Data Encryption protocol
- * (0x20) used with SECURITY PROTOCOL OUT.  See above for values used with
- * SECURITY PROTOCOL IN.  Current as of SSCr03.
- */
-#define	TDE_SET_DATA_ENC_PAGE		0x0010
-#define	TDE_SA_ENCAP_PAGE		0x0011
-#define	TDE_SET_ENC_MGMT_ATTR_PAGE	0x0022
-
-/*
- * Tape Data Encryption Set Data Encryption page (0x0010).
- */
-struct tde_set_data_enc_page {
-	uint8_t page_code[2];
-	uint8_t page_length[2];
-	uint8_t byte4;
-#define	TDE_SDE_SCOPE_MASK		0xe0
-#define	TDE_SDE_SCOPE_ALL_IT_NEXUS	0x80
-#define	TDE_SDE_SCOPE_LOCAL		0x40
-#define	TDE_SDE_SCOPE_PUBLIC		0x00
-#define	TDE_SDE_LOCK			0x01
-	uint8_t byte5;
-#define	TDE_SDE_CEEM_MASK		0xc0
-#define	TDE_SDE_CEEM_ENCRYPT		0xc0
-#define	TDE_SDE_CEEM_EXTERNAL		0x80
-#define	TDE_SDE_CEEM_NO_CHECK		0x40
-#define	TDE_SDE_RDMC_MASK		0x30
-#define	TDE_SDE_RDMC_DISABLED		0x30
-#define	TDE_SDE_RDMC_ENABLED		0x20
-#define	TDE_SDE_RDMC_DEFAULT		0x00
-#define	TDE_SDE_SDK			0x08
-#define	TDE_SDE_CKOD			0x04
-#define	TDE_SDE_CKORP			0x02
-#define	TDE_SDE_CKORL			0x01
-	uint8_t encryption_mode;
-#define	TDE_SDE_ENC_MODE_DISABLE	0x00
-#define	TDE_SDE_ENC_MODE_EXTERNAL	0x01
-#define	TDE_SDE_ENC_MODE_ENCRYPT	0x02
-	uint8_t decryption_mode;
-#define	TDE_SDE_DEC_MODE_DISABLE	0x00
-#define	TDE_SDE_DEC_MODE_RAW		0x01
-#define	TDE_SDE_DEC_MODE_DECRYPT	0x02
-#define	TDE_SDE_DEC_MODE_MIXED		0x03
-	uint8_t algo_index;
-	uint8_t lbe_key_format;
-#define	TDE_SDE_KEY_PLAINTEXT		0x00
-#define	TDE_SDE_KEY_VENDOR_SPEC		0x01
-#define	TDE_SDE_KEY_PUBLIC_WRAP		0x02
-#define	TDE_SDE_KEY_ESP_SCSI		0x03
-	uint8_t kad_format;
-#define	TDE_SDE_KAD_ASCII		0x02
-#define	TDE_SDE_KAD_BINARY		0x01
-#define	TDE_SDE_KAD_UNSPECIFIED		0x00
-	uint8_t reserved[7];
-	uint8_t lbe_key_length[2];
-	uint8_t lbe_key[];
-};
-
-/*
- * Used for the Vendor Specific key format (0x01).
- */
-struct tde_key_format_vendor {
-	uint8_t t10_vendor_id[8];
-	uint8_t vendor_key[];
-};
-
-/*
- * Used for the public key wrapped format (0x02).
- */
-struct tde_key_format_public_wrap {
-	uint8_t parameter_set[2];
-#define	TDE_PARAM_SET_RSA2048		0x0000
-#define	TDE_PARAM_SET_ECC521		0x0010
-	uint8_t label_length[2];
-	uint8_t label[];
-};
-
-/*
- * Tape Data Encryption SA Encapsulation page (0x0011).
- */
-struct tde_sa_encap_page {
-	uint8_t page_code[2];
-	uint8_t data_desc[];
-};
-
-/*
- * Tape Data Encryption Set Encryption Management Attributes page (0x0022).
- */
-struct tde_set_enc_mgmt_attr_page {
-	uint8_t page_code[2];
-	uint8_t reserved[3];
-	uint8_t byte5;
-#define	TDE_SEMA_CAOD			0x01
-	uint8_t page_length[2];
-	uint8_t attr_desc[];
-};
-
-/*
- * Tape Data Encryption descriptor format.
- * SSC4r03 Section 8.5.4.2.1 Table 197
- */
-struct tde_data_enc_desc {
-	uint8_t key_desc_type;
-#define	TDE_KEY_DESC_WK_KAD		0x04
-#define	TDE_KEY_DESC_M_KAD		0x03
-#define	TDE_KEY_DESC_NONCE_VALUE	0x02
-#define	TDE_KEY_DESC_A_KAD		0x01
-#define	TDE_KEY_DESC_U_KAD		0x00
-	uint8_t byte2;
-#define	TDE_KEY_DESC_AUTH_MASK		0x07
-#define	TDE_KEY_DESC_AUTH_FAILED	0x04
-#define	TDE_KEY_DESC_AUTH_SUCCESS	0x03
-#define	TDE_KEY_DESC_AUTH_NO_ATTEMPT	0x02
-#define	TDE_KEY_DESC_AUTH_U_KAD		0x01
-	uint8_t key_desc_length[2];
-	uint8_t key_desc[];
-};
-
-/*
- * Wrapped Key descriptor format.
- * SSC4r03 Section 8.5.4.3.1 Table 200
- */
-struct tde_wrapped_key_desc {
-	uint8_t wrapped_key_type;
-#define	TDE_WRAP_KEY_DESC_LENGTH	0x04
-#define	TDE_WRAP_KEY_DESC_IDENT		0x03
-#define	TDE_WRAP_KEY_DESC_INFO		0x02
-#define	TDE_WRAP_KEY_DESC_ENTITY_ID	0x01
-#define	TDE_WRAP_KEY_DESC_DEVICE_ID	0x00
-	uint8_t reserved;
-	uint8_t wrapped_desc_length[2];
-	uint8_t wrapped_desc[];
-};
-
-/*
- * Encryption management attributes descriptor format.
- * SSC4r03 Section 8.5.4.4.1 Table 202
- */
-struct tde_enc_mgmt_attr_desc {
-	uint8_t enc_mgmt_attr_type[2];
-#define	TDE_EMAD_DESIRED_KEY_MGR_OP	0x0000
-#define	TDE_EMAD_LOG_BLOCK_ENC_KEY_CRIT	0x0001
-#define	TDE_EMAD_LOG_BLOCK_ENC_KEY_WRAP	0x0002
-	uint8_t reserved;
-	uint8_t byte2;
-#define	TDE_EMAD_CRIT			0x80
-	uint8_t attr_length[2];
-	uint8_t attributes[];
-#define	TDE_EMAD_DESIRED_KEY_CREATE	0x0001
-#define	TDE_EMAD_DESIRED_KEY_RESOLVE	0x0002
-};
-
-/*
- * Logical block encryption key selection criteria descriptor format.
- * SSC4r03 Section 8.5.4.4.3.1 Table 206
- */
-struct tde_lb_enc_key_sel_desc {
-	uint8_t lbe_key_sel_crit_type[2];
-	/*
-	 * The CRIT bit is the top bit of the first byte of the type.
-	 */
-#define	TDE_LBE_KEY_SEL_CRIT		0x80
-#define	TDE_LBE_KEY_SEL_ALGO		0x0001
-#define	TDE_LBE_KEY_SEL_ID		0x0002
-	uint8_t lbe_key_sel_crit_length[2];
-	uint8_t lbe_key_sel_crit[];
-};
-
-/*
- * Logical block encryption key wrapping attribute descriptor format.
- * SSC4r03 Section 8.5.4.4.4.1 Table 209
- */
-struct tde_lb_enc_key_wrap_desc {
-	uint8_t lbe_key_wrap_type[2];
-	/*
-	 * The CRIT bit is the top bit of the first byte of the type.
-	 */
-#define	TDE_LBE_KEY_WRAP_CRIT		0x80
-#define	TDE_LBE_KEY_WRAP_KEKS		0x0001
-	uint8_t lbe_key_wrap_length[2];
-	uint8_t lbe_key_wrap_attr[];
-};
-
-/*
- * Opcodes
- */
-#define REWIND			0x01
-#define FORMAT_MEDIUM		0x04
-#define READ_BLOCK_LIMITS	0x05
-#define SA_READ			0x08
-#define SA_WRITE		0x0A
-#define SET_CAPACITY		0x0B
-#define WRITE_FILEMARKS		0x10
-#define SPACE			0x11
-#define RESERVE_UNIT		0x16
-#define RELEASE_UNIT		0x17
-#define ERASE			0x19
-#define LOAD_UNLOAD		0x1B
-#define	LOCATE			0x2B
-#define	READ_POSITION		0x34
-#define	REPORT_DENSITY_SUPPORT	0x44
-#define	ALLOW_OVERWRITE		0x82
-#define	LOCATE_16		0x92
-
-/*
- * Tape specific density codes- only enough of them here to recognize
- * some specific older units so we can choose 2FM@EOD or FIXED blocksize
- * quirks.
- */
-#define SCSI_DENSITY_HALFINCH_800	0x01
-#define SCSI_DENSITY_HALFINCH_1600	0x02
-#define SCSI_DENSITY_HALFINCH_6250	0x03
-#define SCSI_DENSITY_HALFINCH_6250C	0xC3	/* HP Compressed 6250 */
-#define SCSI_DENSITY_QIC_11_4TRK	0x04
-#define SCSI_DENSITY_QIC_11_9TRK	0x84	/* Vendor Unique Emulex */
-#define SCSI_DENSITY_QIC_24		0x05
-#define SCSI_DENSITY_HALFINCH_PE	0x06
-#define SCSI_DENSITY_QIC_120		0x0f
-#define SCSI_DENSITY_QIC_150		0x10    
-#define	SCSI_DENSITY_QIC_525_320	0x11
-#define	SCSI_DENSITY_QIC_1320		0x12
-#define	SCSI_DENSITY_QIC_2GB		0x22
-#define	SCSI_DENSITY_QIC_4GB		0x26
-#define	SCSI_DENSITY_QIC_3080		0x29
-
-__BEGIN_DECLS
-void	scsi_read_block_limits(struct ccb_scsiio *, uint32_t,
-			       void (*cbfcnp)(struct cam_periph *, union ccb *),
-			       u_int8_t, struct scsi_read_block_limits_data *,
-			       u_int8_t , uint32_t);
-
-void	scsi_sa_read_write(struct ccb_scsiio *csio, uint32_t retries,
-			   void (*cbfcnp)(struct cam_periph *, union ccb *),
-			   u_int8_t tag_action, int readop, int sli,
-			   int fixed, uint32_t length, u_int8_t *data_ptr,
-			   uint32_t dxfer_len, u_int8_t sense_len,
-			   uint32_t timeout);
-
-void	scsi_rewind(struct ccb_scsiio *csio, uint32_t retries,
-		    void (*cbfcnp)(struct cam_periph *, union ccb *),
-		    u_int8_t tag_action, int immediate, u_int8_t sense_len,
-		    uint32_t timeout);
-
-void	scsi_space(struct ccb_scsiio *csio, uint32_t retries,
-		   void (*cbfcnp)(struct cam_periph *, union ccb *),
-		   u_int8_t tag_action, scsi_space_code code,
-		   uint32_t count, u_int8_t sense_len, uint32_t timeout);
-
-void	scsi_load_unload(struct ccb_scsiio *csio, uint32_t retries,         
-			 void (*cbfcnp)(struct cam_periph *, union ccb *),   
-			 u_int8_t tag_action, int immediate,   int eot,
-			 int reten, int load, u_int8_t sense_len,
-			 uint32_t timeout);
-	
-void	scsi_write_filemarks(struct ccb_scsiio *csio, uint32_t retries,
-			     void (*cbfcnp)(struct cam_periph *, union ccb *),
-			     u_int8_t tag_action, int immediate, int setmark,
-			     uint32_t num_marks, u_int8_t sense_len,
-			     uint32_t timeout);
-
-void	scsi_reserve_release_unit(struct ccb_scsiio *csio, uint32_t retries,
-				  void (*cbfcnp)(struct cam_periph *,
-				  union ccb *), u_int8_t tag_action,	
-				  int third_party, int third_party_id,
-				  u_int8_t sense_len, uint32_t timeout,
-				  int reserve);
-
-void	scsi_erase(struct ccb_scsiio *csio, uint32_t retries,
-		   void (*cbfcnp)(struct cam_periph *, union ccb *),
-		   u_int8_t tag_action, int immediate, int long_erase,
-		   u_int8_t sense_len, uint32_t timeout);
-
-void	scsi_data_comp_page(struct scsi_data_compression_page *page,
-			    u_int8_t dce, u_int8_t dde, u_int8_t red,
-			    uint32_t comp_algorithm,
-			    uint32_t decomp_algorithm);
-
-void	scsi_read_position(struct ccb_scsiio *csio, uint32_t retries,
-                           void (*cbfcnp)(struct cam_periph *, union ccb *),
-                           u_int8_t tag_action, int hardsoft,
-                           struct scsi_tape_position_data *sbp,
-                           u_int8_t sense_len, uint32_t timeout);
-void	scsi_read_position_10(struct ccb_scsiio *csio, uint32_t retries,
-			      void (*cbfcnp)(struct cam_periph *, union ccb *),
-			      u_int8_t tag_action, int service_action,
-			      u_int8_t *data_ptr, uint32_t length,
-			      uint32_t sense_len, uint32_t timeout);
-
-void	scsi_set_position(struct ccb_scsiio *csio, uint32_t retries,
-                         void (*cbfcnp)(struct cam_periph *, union ccb *),
-                         u_int8_t tag_action, int hardsoft, uint32_t blkno,
-                         u_int8_t sense_len, uint32_t timeout);
-
-void	scsi_locate_10(struct ccb_scsiio *csio, uint32_t retries,
-		       void (*cbfcnp)(struct cam_periph *, union ccb *),
-		       u_int8_t tag_action, int immed, int cp, int hard,
-		       int64_t partition, uint32_t block_address,
-		       int sense_len, uint32_t timeout);
-
-void	scsi_locate_16(struct ccb_scsiio *csio, uint32_t retries,
-		       void (*cbfcnp)(struct cam_periph *, union ccb *),
-		       u_int8_t tag_action, int immed, int cp,
-		       u_int8_t dest_type, int bam, int64_t partition,
-		       u_int64_t logical_id, int sense_len,
-		       uint32_t timeout);
-
-void	scsi_report_density_support(struct ccb_scsiio *csio, uint32_t retries,
-				    void (*cbfcnp)(struct cam_periph *,
-						   union ccb *),
-				    u_int8_t tag_action, int media,
-				    int medium_type, u_int8_t *data_ptr,
-				    uint32_t length, uint32_t sense_len,
-				    uint32_t timeout);
-
-void	scsi_set_capacity(struct ccb_scsiio *csio, uint32_t retries,
-			  void (*cbfcnp)(struct cam_periph *, union ccb *),
-			  u_int8_t tag_action, int byte1, uint32_t proportion,
-			  uint32_t sense_len, uint32_t timeout);
-
-void	scsi_format_medium(struct ccb_scsiio *csio, uint32_t retries,
-			   void (*cbfcnp)(struct cam_periph *, union ccb *),
-			   u_int8_t tag_action, int byte1, int byte2, 
-			   u_int8_t *data_ptr, uint32_t length,
-			   uint32_t sense_len, uint32_t timeout);
-
-void	scsi_allow_overwrite(struct ccb_scsiio *csio, uint32_t retries,
-			     void (*cbfcnp)(struct cam_periph *, union ccb *),
-			     u_int8_t tag_action, int allow_overwrite,
-			     int partition, u_int64_t logical_id,
-			     uint32_t sense_len, uint32_t timeout);
-
-__END_DECLS
-
-#endif /* _SCSI_SCSI_SA_H */
diff --git a/include.new/cam/scsi/scsi_ses.h b/include.new/cam/scsi/scsi_ses.h
deleted file mode 100644
index bd1190f..0000000
--- a/include.new/cam/scsi/scsi_ses.h
+++ /dev/null
@@ -1,2441 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/cam/scsi/scsi_ses.h 238740 2012-07-24 13:32:49Z mav $ */
-/*-
- * Copyright (c) 2000 by Matthew Jacob
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * the GNU Public License ("GPL").
- *
- * 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.
- *
- */
-
-#ifndef	_SCSI_SES_H_
-#define	_SCSI_SES_H_
-
-#include <cam/scsi/scsi_all.h>
-
-/*========================== Field Extraction Macros =========================*/
-#define MK_ENUM(S, F, SUFFIX) S ## _ ## F ## SUFFIX
-
-#define GEN_GETTER(LS, US, LF, UF)					    \
-static inline int							    \
-LS ## _get_ ## LF(struct LS *elem) {					    \
-	return ((elem->bytes[MK_ENUM(US,UF,_BYTE)] & MK_ENUM(US,UF,_MASK))  \
-	     >> MK_ENUM(US,UF,_SHIFT));					    \
-}
-
-#define GEN_SETTER(LS, US, LF, UF)					    \
-static inline void							    \
-LS ## _set_ ## LF(struct LS *elem, int val) {				    \
-	elem->bytes[MK_ENUM(US,UF,_BYTE)] &= ~MK_ENUM(US,UF,_MASK);	    \
-	elem->bytes[MK_ENUM(US,UF,_BYTE)] |=				    \
-	    (val << MK_ENUM(US,UF,_SHIFT)) & MK_ENUM(US,UF,_MASK);	    \
-}
-
-#define GEN_HDR_GETTER(LS, US, LF, UF)					    \
-static inline int							    \
-LS ## _get_ ## LF(struct LS *page) {					    \
-	return ((page->hdr.page_specific_flags & MK_ENUM(US,UF,_MASK))	    \
-	     >> MK_ENUM(US,UF,_SHIFT));					    \
-}
-
-#define GEN_HDR_SETTER(LS, US, LF, UF)					    \
-static inline void							    \
-LS ## _set_ ## LF(struct LS *page, int val) {				    \
-	page->hdr.page_specific_flags &= ~MK_ENUM(US,UF,_MASK);		    \
-	page->hdr.page_specific_flags |=				    \
-	    (val << MK_ENUM(US,UF,_SHIFT)) & MK_ENUM(US,UF,_MASK);	    \
-}
-
-#define GEN_ACCESSORS(LS, US, LF, UF)					    \
-GEN_GETTER(LS, US, LF, UF)						    \
-GEN_SETTER(LS, US, LF, UF)
-
-#define GEN_HDR_ACCESSORS(LS, US, LF, UF)				    \
-GEN_HDR_GETTER(LS, US, LF, UF)						    \
-GEN_HDR_SETTER(LS, US, LF, UF)
-
-/*===============  Common SCSI ENC Diagnostic Page Structures ===============*/
-struct ses_page_hdr {
-	uint8_t page_code;
-	uint8_t page_specific_flags;
-	uint8_t length[2];
-	uint8_t gen_code[4];
-};
-
-static inline size_t
-ses_page_length(const struct ses_page_hdr *hdr)
-{
-	/*
-	 * The page length as received only accounts for bytes that
-	 * follow the length field, namely starting with the generation
-	 * code field.
-	 */
-	return (scsi_2btoul(hdr->length)
-	      + offsetof(struct ses_page_hdr, gen_code));
-}
-
-/*============= SCSI ENC Configuration Diagnostic Page Structures ============*/
-struct ses_enc_desc {
-	uint8_t byte0;
-	/*
-	 * reserved0	: 1,
-	 * rel_id	: 3,	relative enclosure process id
-	 * reserved1	: 1,
-	 * num_procs	: 3;	number of enclosure procesenc
-	 */
-	uint8_t	subenc_id;	/* Sub-enclosure Identifier */
-	uint8_t	num_types;	/* # of supported types */
-	uint8_t	length;		/* Enclosure Descriptor Length */
-	uint8_t	logical_id[8];	/* formerly wwn */
-	uint8_t	vendor_id[8];
-	uint8_t	product_id[16];
-	uint8_t	product_rev[4];
-	uint8_t vendor_bytes[];
-};
-
-static inline uint8_t *
-ses_enc_desc_last_byte(struct ses_enc_desc *encdesc)
-{
-	return (&encdesc->length + encdesc->length);
-}
-
-static inline struct ses_enc_desc *
-ses_enc_desc_next(struct ses_enc_desc *encdesc)
-{
-	return ((struct ses_enc_desc *)(ses_enc_desc_last_byte(encdesc) + 1));
-}
-
-static inline int
-ses_enc_desc_is_complete(struct ses_enc_desc *encdesc, uint8_t *last_buf_byte)
-{
-	return (&encdesc->length <= last_buf_byte
-	     && ses_enc_desc_last_byte(encdesc) <= last_buf_byte);
-}
-
-struct ses_elm_type_desc {
-	uint8_t	etype_elm_type;	/* type of element */
-	uint8_t	etype_maxelt;	/* maximum supported */
-	uint8_t	etype_subenc;	/* in sub-enclosure #n */
-	uint8_t	etype_txt_len;	/* Type Descriptor Text Length */
-};
-
-struct ses_cfg_page {
-	struct ses_page_hdr hdr;
-	struct ses_enc_desc subencs[];
-	/* type descriptors */
-	/* type text */
-};
-
-static inline int
-ses_cfg_page_get_num_subenc(struct ses_cfg_page *page)
-{
-	return (page->hdr.page_specific_flags + 1);
-}
-
-
-/*================ SCSI SES Control Diagnostic Page Structures ==============*/
-struct ses_ctrl_common {
-	uint8_t bytes[1];
-};
-
-enum ses_ctrl_common_field_data {
-	SES_CTRL_COMMON_SELECT_BYTE		= 0,
-	SES_CTRL_COMMON_SELECT_MASK		= 0x80,
-	SES_CTRL_COMMON_SELECT_SHIFT		= 7,
-
-	SES_CTRL_COMMON_PRDFAIL_BYTE		= 0,
-	SES_CTRL_COMMON_PRDFAIL_MASK		= 0x40,
-	SES_CTRL_COMMON_PRDFAIL_SHIFT		= 6,
-
-	SES_CTRL_COMMON_DISABLE_BYTE		= 0,
-	SES_CTRL_COMMON_DISABLE_MASK		= 0x20,
-	SES_CTRL_COMMON_DISABLE_SHIFT		= 5,
-
-	SES_CTRL_COMMON_RST_SWAP_BYTE		= 0,
-	SES_CTRL_COMMON_RST_SWAP_MASK		= 0x10,
-	SES_CTRL_COMMON_RST_SWAP_SHIFT		= 4
-};
-
-#define GEN_SES_CTRL_COMMON_ACCESSORS(LCASE, UCASE) \
-    GEN_ACCESSORS(ses_ctrl_common, SES_CTRL_COMMON, LCASE, UCASE)
-GEN_SES_CTRL_COMMON_ACCESSORS(select,   SELECT)
-GEN_SES_CTRL_COMMON_ACCESSORS(prdfail,  PRDFAIL)
-GEN_SES_CTRL_COMMON_ACCESSORS(disable,  DISABLE)
-GEN_SES_CTRL_COMMON_ACCESSORS(rst_swap, RST_SWAP)
-#undef GEN_SES_CTRL_COMMON_ACCESSORS
-
-/*------------------------ Device Slot Control Element ----------------------*/
-struct ses_ctrl_dev_slot {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_dev_slot_field_data {
-	SES_CTRL_DEV_SLOT_RQST_ACTIVE_BYTE	= 1,
-	SES_CTRL_DEV_SLOT_RQST_ACTIVE_MASK	= 0x80,
-	SES_CTRL_DEV_SLOT_RQST_ACTIVE_SHIFT	= 7,
-
-	SES_CTRL_DEV_SLOT_DO_NOT_REMOVE_BYTE	= 1,
-	SES_CTRL_DEV_SLOT_DO_NOT_REMOVE_MASK	= 0x40,
-	SES_CTRL_DEV_SLOT_DO_NOT_REMOVE_SHIFT	= 6,
-
-	SES_CTRL_DEV_SLOT_RQST_MISSING_BYTE	= 1,
-	SES_CTRL_DEV_SLOT_RQST_MISSING_MASK	= 0x10,
-	SES_CTRL_DEV_SLOT_RQST_MISSING_SHIFT	= 4,
-
-	SES_CTRL_DEV_SLOT_RQST_INSERT_BYTE	= 1,
-	SES_CTRL_DEV_SLOT_RQST_INSERT_MASK	= 0x08,
-	SES_CTRL_DEV_SLOT_RQST_INSERT_SHIFT	= 3,
-
-	SES_CTRL_DEV_SLOT_RQST_REMOVE_BYTE	= 1,
-	SES_CTRL_DEV_SLOT_RQST_REMOVE_MASK	= 0x04,
-	SES_CTRL_DEV_SLOT_RQST_REMOVE_SHIFT	= 2,
-
-	SES_CTRL_DEV_SLOT_RQST_IDENT_BYTE	= 1,
-	SES_CTRL_DEV_SLOT_RQST_IDENT_MASK	= 0x02,
-	SES_CTRL_DEV_SLOT_RQST_IDENT_SHIFT	= 1,
-
-	SES_CTRL_DEV_SLOT_RQST_FAULT_BYTE	= 2,
-	SES_CTRL_DEV_SLOT_RQST_FAULT_MASK	= 0x20,
-	SES_CTRL_DEV_SLOT_RQST_FAULT_SHIFT	= 5,
-
-	SES_CTRL_DEV_SLOT_DEVICE_OFF_BYTE	= 2,
-	SES_CTRL_DEV_SLOT_DEVICE_OFF_MASK	= 0x10,
-	SES_CTRL_DEV_SLOT_DEVICE_OFF_SHIFT	= 4,
-
-	SES_CTRL_DEV_SLOT_ENABLE_BYP_A_BYTE	= 2,
-	SES_CTRL_DEV_SLOT_ENABLE_BYP_A_MASK	= 0x08,
-	SES_CTRL_DEV_SLOT_ENABLE_BYP_A_SHIFT	= 3,
-
-	SES_CTRL_DEV_SLOT_ENABLE_BYP_B_BYTE	= 2,
-	SES_CTRL_DEV_SLOT_ENABLE_BYP_B_MASK	= 0x04,
-	SES_CTRL_DEV_SLOT_ENABLE_BYP_B_SHIFT	= 2
-};
-#define GEN_SES_CTRL_DEV_SLOT_ACCESSORS(LCASE, UCASE) \
-    GEN_ACCESSORS(ses_ctrl_dev_slot, SES_CTRL_DEV_SLOT, LCASE, UCASE)
-
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(rqst_active,   RQST_ACTIVE)
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(do_not_remove, DO_NOT_REMOVE)
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(rqst_missing,  RQST_MISSING)
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(rqst_insert,   RQST_INSERT)
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(rqst_remove,   RQST_REMOVE)
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(rqst_ident,    RQST_IDENT)
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(rqst_fault,    RQST_FAULT)
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(device_off,    DEVICE_OFF)
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(enable_byp_a,  ENABLE_BYP_A)
-GEN_SES_CTRL_DEV_SLOT_ACCESSORS(enable_byp_b,  ENABLE_BYP_B)
-#undef GEN_SES_CTRL_DEV_SLOT_ACCESSORS
-
-/*--------------------- Array Device Slot Control Element --------------------*/
-struct ses_ctrl_array_dev_slot {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_array_dev_slot_field_data {
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_OK_BYTE			= 0,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_OK_MASK			= 0x80,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_OK_SHIFT			= 7,
-
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_RSVD_DEVICE_BYTE		= 0,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_RSVD_DEVICE_MASK		= 0x40,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_RSVD_DEVICE_SHIFT		= 6,
-
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_HOT_SPARE_BYTE		= 0,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_HOT_SPARE_MASK		= 0x20,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_HOT_SPARE_SHIFT		= 5,
-
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_CONS_CHECK_BYTE		= 0,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_CONS_CHECK_MASK		= 0x10,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_CONS_CHECK_SHIFT		= 4,
-
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_IN_CRIT_ARRAY_BYTE		= 0,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_IN_CRIT_ARRAY_MASK		= 0x08,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_IN_CRIT_ARRAY_SHIFT	= 3,
-
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_IN_FAILED_ARRAY_BYTE	= 0,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_IN_FAILED_ARRAY_MASK	= 0x04,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_IN_FAILED_ARRAY_SHIFT	= 2,
-
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_REBUILD_REMAP_BYTE		= 0,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_REBUILD_REMAP_MASK		= 0x02,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_REBUILD_REMAP_SHIFT	= 1,
-
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_REBUILD_REMAP_ABORT_BYTE	= 0,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_REBUILD_REMAP_ABORT_MASK	= 0x01,
-	SES_CTRL_ARRAY_DEV_SLOT_RQST_REBUILD_REMAP_ABORT_SHIFT	= 0
-
-	/*
-	 * The remaining fields are identical to the device
-	 * slot element type.  Access them through the device slot
-	 * element type and its accessors.
-	 */
-};
-#define GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_array_dev_slot, SES_CTRL_ARRAY_DEV_SLOT,	\
-		  LCASE, UCASE)
-GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS(rqst_ok,             RQST_OK)
-GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS(rqst_rsvd_device,    RQST_RSVD_DEVICE)
-GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS(rqst_hot_spare,      RQST_HOT_SPARE)
-GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS(rqst_cons_check,     RQST_CONS_CHECK)
-GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS(rqst_in_crit_array,  RQST_IN_CRIT_ARRAY)
-GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS(rqst_in_failed_array,
-				      RQST_IN_FAILED_ARRAY)
-GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS(rqst_rebuild_remap,  RQST_REBUILD_REMAP)
-GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS(rqst_rebuild_remap_abort,
-				      RQST_REBUILD_REMAP_ABORT)
-#undef GEN_SES_CTRL_ARRAY_DEV_SLOT_ACCESSORS
-
-/*----------------------- Power Supply Control Element -----------------------*/
-struct ses_ctrl_power_supply {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_power_supply_field_data {
-	SES_CTRL_POWER_SUPPLY_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_POWER_SUPPLY_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_POWER_SUPPLY_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_POWER_SUPPLY_RQST_FAIL_BYTE	= 2,
-	SES_CTRL_POWER_SUPPLY_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_POWER_SUPPLY_RQST_FAIL_SHIFT	= 6,
-
-	SES_CTRL_POWER_SUPPLY_RQST_ON_BYTE	= 2,
-	SES_CTRL_POWER_SUPPLY_RQST_ON_MASK	= 0x20,
-	SES_CTRL_POWER_SUPPLY_RQST_ON_SHIFT	= 5
-};
-
-#define GEN_SES_CTRL_POWER_SUPPLY_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_power_supply, SES_CTRL_POWER_SUPPLY, LCASE, UCASE)
-GEN_SES_CTRL_POWER_SUPPLY_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_POWER_SUPPLY_ACCESSORS(rqst_fail,  RQST_FAIL)
-GEN_SES_CTRL_POWER_SUPPLY_ACCESSORS(rqst_on,    RQST_ON)
-#undef GEN_SES_CTRL_POWER_SUPPLY_ACCESSORS
-
-/*-------------------------- Cooling Control Element -------------------------*/
-struct ses_ctrl_cooling {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_cooling_field_data {
-	SES_CTRL_COOLING_RQST_IDENT_BYTE		= 0,
-	SES_CTRL_COOLING_RQST_IDENT_MASK		= 0x80,
-	SES_CTRL_COOLING_RQST_IDENT_SHIFT		= 7,
-
-	SES_CTRL_COOLING_RQST_FAIL_BYTE			= 2,
-	SES_CTRL_COOLING_RQST_FAIL_MASK			= 0x40,
-	SES_CTRL_COOLING_RQST_FAIL_SHIFT		= 6,
-
-	SES_CTRL_COOLING_RQST_ON_BYTE			= 2,
-	SES_CTRL_COOLING_RQST_ON_MASK			= 0x20,
-	SES_CTRL_COOLING_RQST_ON_SHIFT			= 5,
-
-	SES_CTRL_COOLING_RQSTED_SPEED_CODE_BYTE		= 2,
-	SES_CTRL_COOLING_RQSTED_SPEED_CODE_MASK		= 0x07,
-	SES_CTRL_COOLING_RQSTED_SPEED_CODE_SHIFT	= 2,
-	SES_CTRL_COOLING_RQSTED_SPEED_CODE_UNCHANGED	= 0x00,
-	SES_CTRL_COOLING_RQSTED_SPEED_CODE_LOWEST	= 0x01,
-	SES_CTRL_COOLING_RQSTED_SPEED_CODE_HIGHEST	= 0x07
-};
-
-#define GEN_SES_CTRL_COOLING_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_cooling, SES_CTRL_COOLING, LCASE, UCASE)
-GEN_SES_CTRL_COOLING_ACCESSORS(rqst_ident,        RQST_IDENT)
-GEN_SES_CTRL_COOLING_ACCESSORS(rqst_fail,         RQST_FAIL)
-GEN_SES_CTRL_COOLING_ACCESSORS(rqst_on,           RQST_ON)
-GEN_SES_CTRL_COOLING_ACCESSORS(rqsted_speed_code, RQSTED_SPEED_CODE)
-#undef GEN_SES_CTRL_COOLING_ACCESSORS
-
-/*-------------------- Temperature Sensor Control Element --------------------*/
-struct ses_ctrl_temp_sensor {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_temp_sensor_field_data {
-	SES_CTRL_TEMP_SENSOR_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_TEMP_SENSOR_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_TEMP_SENSOR_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_TEMP_SENSOR_RQST_FAIL_BYTE	= 0,
-	SES_CTRL_TEMP_SENSOR_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_TEMP_SENSOR_RQST_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_CTRL_TEMP_SENSOR_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_temp_sensor, SES_CTRL_TEMP_SENSOR, LCASE, UCASE)
-GEN_SES_CTRL_TEMP_SENSOR_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_TEMP_SENSOR_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_TEMP_SENSOR_ACCESSORS
-
-/*------------------------- Door Lock Control Element ------------------------*/
-struct ses_ctrl_door_lock {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_door_lock_field_data {
-	SES_CTRL_DOOR_LOCK_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_DOOR_LOCK_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_DOOR_LOCK_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_DOOR_LOCK_RQST_FAIL_BYTE	= 0,
-	SES_CTRL_DOOR_LOCK_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_DOOR_LOCK_RQST_FAIL_SHIFT	= 6,
-
-	SES_CTRL_DOOR_LOCK_UNLOCK_BYTE		= 2,
-	SES_CTRL_DOOR_LOCK_UNLOCK_MASK		= 0x01,
-	SES_CTRL_DOOR_LOCK_UNLOCK_SHIFT		= 0
-};
-
-#define GEN_SES_CTRL_DOOR_LOCK_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_door_lock, SES_CTRL_DOOR_LOCK, LCASE, UCASE)
-GEN_SES_CTRL_DOOR_LOCK_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_DOOR_LOCK_ACCESSORS(rqst_fail,  RQST_FAIL)
-GEN_SES_CTRL_DOOR_LOCK_ACCESSORS(unlock,     UNLOCK)
-#undef GEN_SES_CTRL_DOOR_LOCK_ACCESSORS
-
-/*----------------------- Audible Alarm Control Element ----------------------*/
-struct ses_ctrl_audible_alarm {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_audible_alarm_field_data {
-	SES_CTRL_AUDIBLE_ALARM_RQST_IDENT_BYTE		= 0,
-	SES_CTRL_AUDIBLE_ALARM_RQST_IDENT_MASK		= 0x80,
-	SES_CTRL_AUDIBLE_ALARM_RQST_IDENT_SHIFT		= 7,
-
-	SES_CTRL_AUDIBLE_ALARM_RQST_FAIL_BYTE		= 0,
-	SES_CTRL_AUDIBLE_ALARM_RQST_FAIL_MASK		= 0x40,
-	SES_CTRL_AUDIBLE_ALARM_RQST_FAIL_SHIFT		= 6,
-
-	SES_CTRL_AUDIBLE_ALARM_SET_MUTE_BYTE		= 2,
-	SES_CTRL_AUDIBLE_ALARM_SET_MUTE_MASK		= 0x40,
-	SES_CTRL_AUDIBLE_ALARM_SET_MUTE_SHIFT		= 6,
-
-	SES_CTRL_AUDIBLE_ALARM_SET_REMIND_BYTE		= 2,
-	SES_CTRL_AUDIBLE_ALARM_SET_REMIND_MASK		= 0x10,
-	SES_CTRL_AUDIBLE_ALARM_SET_REMIND_SHIFT		= 4,
-
-	SES_CTRL_AUDIBLE_ALARM_TONE_CONTROL_BYTE	= 2,
-	SES_CTRL_AUDIBLE_ALARM_TONE_CONTROL_MASK	= 0x0F,
-	SES_CTRL_AUDIBLE_ALARM_TONE_CONTROL_SHIFT	= 0,
-	SES_CTRL_AUDIBLE_ALARM_TONE_CONTROL_INFO	= 0x08,
-	SES_CTRL_AUDIBLE_ALARM_TONE_CONTROL_NON_CRIT	= 0x04,
-	SES_CTRL_AUDIBLE_ALARM_TONE_CONTROL_CRIT	= 0x02,
-	SES_CTRL_AUDIBLE_ALARM_TONE_CONTROL_UNRECOV	= 0x01
-};
-
-#define GEN_SES_CTRL_AUDIBLE_ALARM_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_audible_alarm, SES_CTRL_AUDIBLE_ALARM, LCASE, UCASE)
-GEN_SES_CTRL_AUDIBLE_ALARM_ACCESSORS(rqst_ident,   RQST_IDENT)
-GEN_SES_CTRL_AUDIBLE_ALARM_ACCESSORS(rqst_fail,    RQST_FAIL)
-GEN_SES_CTRL_AUDIBLE_ALARM_ACCESSORS(set_mute,     SET_MUTE)
-GEN_SES_CTRL_AUDIBLE_ALARM_ACCESSORS(set_remind,   SET_REMIND)
-GEN_SES_CTRL_AUDIBLE_ALARM_ACCESSORS(tone_control, TONE_CONTROL)
-#undef GEN_SES_CTRL_AUDIBLE_ALARM_ACCESSORS
-
-/*--------- Enclosure Services Controller Electronics Control Element --------*/
-struct ses_ctrl_ecc_electronics {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_ecc_electronics_field_data {
-	SES_CTRL_ECC_ELECTRONICS_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_ECC_ELECTRONICS_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_ECC_ELECTRONICS_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_ECC_ELECTRONICS_RQST_FAIL_BYTE		= 0,
-	SES_CTRL_ECC_ELECTRONICS_RQST_FAIL_MASK		= 0x40,
-	SES_CTRL_ECC_ELECTRONICS_RQST_FAIL_SHIFT	= 6,
-
-	SES_CTRL_ECC_ELECTRONICS_SELECT_ELEMENT_BYTE	= 1,
-	SES_CTRL_ECC_ELECTRONICS_SELECT_ELEMENT_MASK	= 0x01,
-	SES_CTRL_ECC_ELECTRONICS_SELECT_ELEMENT_SHIFT	= 0
-};
-
-#define GEN_SES_CTRL_ECC_ELECTRONICS_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_ecc_electronics, SES_CTRL_ECC_ELECTRONICS,	\
-		  LCASE, UCASE)
-GEN_SES_CTRL_ECC_ELECTRONICS_ACCESSORS(rqst_ident,     RQST_IDENT)
-GEN_SES_CTRL_ECC_ELECTRONICS_ACCESSORS(rqst_fail,      RQST_FAIL)
-GEN_SES_CTRL_ECC_ELECTRONICS_ACCESSORS(select_element, SELECT_ELEMENT)
-#undef GEN_SES_CTRL_ECC_ELECTRONICS_ACCESSORS
-
-/*----------- SCSI Services Controller Electronics Control Element -----------*/
-struct ses_ctrl_scc_electronics {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_scc_electronics_field_data {
-	SES_CTRL_SCC_ELECTRONICS_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_SCC_ELECTRONICS_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_SCC_ELECTRONICS_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_SCC_ELECTRONICS_RQST_FAIL_BYTE		= 0,
-	SES_CTRL_SCC_ELECTRONICS_RQST_FAIL_MASK		= 0x40,
-	SES_CTRL_SCC_ELECTRONICS_RQST_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_CTRL_SCC_ELECTRONICS_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_scc_electronics, SES_CTRL_SCC_ELECTRONICS,	\
-		  LCASE, UCASE)
-GEN_SES_CTRL_SCC_ELECTRONICS_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_SCC_ELECTRONICS_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_SCC_ELECTRONICS_ACCESSORS
-
-/*--------------------- Nonvolatile Cache Control Element --------------------*/
-struct ses_ctrl_nv_cache {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_nv_cache_field_data {
-	SES_CTRL_NV_CACHE_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_NV_CACHE_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_NV_CACHE_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_NV_CACHE_RQST_FAIL_BYTE	= 0,
-	SES_CTRL_NV_CACHE_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_NV_CACHE_RQST_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_CTRL_NV_CACHE_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_nv_cache, SES_CTRL_NV_CACHE,	LCASE, UCASE)
-GEN_SES_CTRL_NV_CACHE_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_NV_CACHE_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_NV_CACHE_ACCESSORS
-
-/*----------------- Invalid Operation Reason Control Element -----------------*/
-struct ses_ctrl_invalid_op_reason {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-/* There are no element specific fields currently defined in the spec. */
-
-/*--------------- Uninterruptible Power Supply Control Element ---------------*/
-struct ses_ctrl_ups {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_ups_field_data {
-	SES_CTRL_UPS_RQST_IDENT_BYTE	= 2,
-	SES_CTRL_UPS_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_UPS_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_UPS_RQST_FAIL_BYTE	= 2,
-	SES_CTRL_UPS_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_UPS_RQST_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_CTRL_UPS_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_ups, SES_CTRL_UPS, LCASE, UCASE)
-GEN_SES_CTRL_UPS_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_UPS_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_UPS_ACCESSORS
-
-/*-------------------------- Display Control Element -------------------------*/
-struct ses_ctrl_display {
-	struct ses_ctrl_common common;
-	uint8_t bytes[1];
-	uint8_t display_character[2];
-};
-
-enum ses_ctrl_display_field_data {
-	SES_CTRL_DISPLAY_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_DISPLAY_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_DISPLAY_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_DISPLAY_RQST_FAIL_BYTE		= 0,
-	SES_CTRL_DISPLAY_RQST_FAIL_MASK		= 0x40,
-	SES_CTRL_DISPLAY_RQST_FAIL_SHIFT	= 6,
-
-	SES_CTRL_DISPLAY_DISPLAY_MODE_BYTE	= 0,
-	SES_CTRL_DISPLAY_DISPLAY_MODE_MASK	= 0x03,
-	SES_CTRL_DISPLAY_DISPLAY_MODE_SHIFT	= 6,
-	SES_CTRL_DISPLAY_DISPLAY_MODE_UNCHANGED = 0x0,
-	SES_CTRL_DISPLAY_DISPLAY_MODE_ESP	= 0x1,
-	SES_CTRL_DISPLAY_DISPLAY_MODE_DC_FIELD	= 0x2
-};
-
-#define GEN_SES_CTRL_DISPLAY_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_display, SES_CTRL_DISPLAY, LCASE, UCASE)
-GEN_SES_CTRL_DISPLAY_ACCESSORS(rqst_ident,   RQST_IDENT)
-GEN_SES_CTRL_DISPLAY_ACCESSORS(rqst_fail,    RQST_FAIL)
-GEN_SES_CTRL_DISPLAY_ACCESSORS(display_mode, DISPLAY_MODE)
-#undef GEN_SES_CTRL_DISPLAY_ACCESSORS
-
-/*----------------------- Key Pad Entry Control Element ----------------------*/
-struct ses_ctrl_key_pad_entry {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_key_pad_entry_field_data {
-	SES_CTRL_KEY_PAD_ENTRY_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_KEY_PAD_ENTRY_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_KEY_PAD_ENTRY_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_KEY_PAD_ENTRY_RQST_FAIL_BYTE	= 0,
-	SES_CTRL_KEY_PAD_ENTRY_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_KEY_PAD_ENTRY_RQST_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_CTRL_KEY_PAD_ENTRY_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_key_pad_entry, SES_CTRL_KEY_PAD_ENTRY, LCASE, UCASE)
-GEN_SES_CTRL_KEY_PAD_ENTRY_ACCESSORS(rqst_ident,   RQST_IDENT)
-GEN_SES_CTRL_KEY_PAD_ENTRY_ACCESSORS(rqst_fail,    RQST_FAIL)
-#undef GEN_SES_CTRL_KEY_PAD_ENTRY_ACCESSORS
-
-/*------------------------- Enclosure Control Element ------------------------*/
-struct ses_ctrl_enclosure {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_enclosure_field_data {
-	SES_CTRL_ENCLOSURE_RQST_IDENT_BYTE		= 0,
-	SES_CTRL_ENCLOSURE_RQST_IDENT_MASK		= 0x80,
-	SES_CTRL_ENCLOSURE_RQST_IDENT_SHIFT		= 7,
-
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_BYTE	= 1,
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_MASK	= 0xC0,
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_SHIFT	= 6,
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_NONE	= 0x0,
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_AFTER_DELAY	= 0x1,
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_RQST_CANCEL	= 0x2,
-
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_DELAY_BYTE	= 1,
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_DELAY_MASK	= 0x3F,
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_DELAY_SHIFT	= 0,
-	SES_CTRL_ENCLOSURE_POWER_CYCLE_DELAY_MAX	= 60,/*minutes*/
-
-	SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_BYTE	= 2,
-	SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_MASK	= 0xFC,
-	SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_SHIFT	= 2,
-	SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_MAX_AUTO	= 60,
-	SES_CTRL_ENCLOSURE_POWER_OFF_DURATION_MANUAL	= 63,
-
-	SES_CTRL_ENCLOSURE_RQST_FAIL_BYTE		= 2,
-	SES_CTRL_ENCLOSURE_RQST_FAIL_MASK		= 0x02,
-	SES_CTRL_ENCLOSURE_RQST_FAIL_SHIFT		= 1,
-
-	SES_CTRL_ENCLOSURE_RQST_WARN_BYTE		= 2,
-	SES_CTRL_ENCLOSURE_RQST_WARN_MASK		= 0x01,
-	SES_CTRL_ENCLOSURE_RQST_WARN_SHIFT		= 0
-};
-
-#define GEN_SES_CTRL_ENCLOSURE_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_enclosure, SES_CTRL_ENCLOSURE, LCASE, UCASE)
-GEN_SES_CTRL_ENCLOSURE_ACCESSORS(rqst_ident,         RQST_IDENT)
-GEN_SES_CTRL_ENCLOSURE_ACCESSORS(power_cycle_rqst,   POWER_CYCLE_RQST)
-GEN_SES_CTRL_ENCLOSURE_ACCESSORS(power_cycle_delay,  POWER_CYCLE_DELAY)
-GEN_SES_CTRL_ENCLOSURE_ACCESSORS(power_off_duration, POWER_OFF_DURATION)
-GEN_SES_CTRL_ENCLOSURE_ACCESSORS(rqst_fail,          RQST_FAIL)
-GEN_SES_CTRL_ENCLOSURE_ACCESSORS(rqst_warn,          RQST_WARN)
-#undef GEN_SES_CTRL_ENCLOSURE_ACCESSORS
-
-/*------------------- SCSI Port/Transceiver Control Element ------------------*/
-struct ses_ctrl_scsi_port_or_xcvr {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_scsi_port_or_xcvr_field_data {
-	SES_CTRL_SCSI_PORT_OR_XCVR_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_SCSI_PORT_OR_XCVR_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_SCSI_PORT_OR_XCVR_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_SCSI_PORT_OR_XCVR_RQST_FAIL_BYTE	= 0,
-	SES_CTRL_SCSI_PORT_OR_XCVR_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_SCSI_PORT_OR_XCVR_RQST_FAIL_SHIFT	= 6,
-
-	SES_CTRL_SCSI_PORT_OR_XCVR_DISABLE_BYTE		= 2,
-	SES_CTRL_SCSI_PORT_OR_XCVR_DISABLE_MASK		= 0x10,
-	SES_CTRL_SCSI_PORT_OR_XCVR_DISABLE_SHIFT	= 4
-};
-
-#define GEN_SES_CTRL_SCSI_PORT_OR_XCVR_ACCESSORS(LCASE, UCASE)		 \
-    GEN_ACCESSORS(ses_ctrl_scsi_port_or_xcvr, SES_CTRL_SCSI_PORT_OR_XCVR,\
-		  LCASE, UCASE)
-GEN_SES_CTRL_SCSI_PORT_OR_XCVR_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_SCSI_PORT_OR_XCVR_ACCESSORS(disable,    DISABLE)
-GEN_SES_CTRL_SCSI_PORT_OR_XCVR_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_SCSI_PORT_OR_XCVR_ACCESSORS
-
-/*------------------------- Language Control Element -------------------------*/
-struct ses_ctrl_language {
-	struct ses_ctrl_common common;
-	uint8_t bytes[1];
-	uint8_t language_code[2];
-};
-
-enum ses_ctrl_language_field_data {
-	SES_CTRL_LANGUAGE_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_LANGUAGE_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_LANGUAGE_RQST_IDENT_SHIFT	= 7
-};
-
-#define GEN_SES_CTRL_LANGUAGE_ACCESSORS(LCASE, UCASE)		 \
-    GEN_ACCESSORS(ses_ctrl_language, SES_CTRL_LANGUAGE, LCASE, UCASE)
-GEN_SES_CTRL_LANGUAGE_ACCESSORS(rqst_ident, RQST_IDENT)
-#undef GEN_SES_CTRL_LANGUAGE_ACCESSORS
-
-/*-------------------- Communication Port Control Element --------------------*/
-struct ses_ctrl_comm_port {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_comm_port_field_data {
-	SES_CTRL_COMM_PORT_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_COMM_PORT_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_COMM_PORT_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_COMM_PORT_RQST_FAIL_BYTE	= 0,
-	SES_CTRL_COMM_PORT_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_COMM_PORT_RQST_FAIL_SHIFT	= 6,
-
-	SES_CTRL_COMM_PORT_DISABLE_BYTE		= 2,
-	SES_CTRL_COMM_PORT_DISABLE_MASK		= 0x01,
-	SES_CTRL_COMM_PORT_DISABLE_SHIFT	= 0
-};
-
-#define GEN_SES_CTRL_COMM_PORT_ACCESSORS(LCASE, UCASE)		 \
-    GEN_ACCESSORS(ses_ctrl_comm_port, SES_CTRL_COMM_PORT, LCASE, UCASE)
-GEN_SES_CTRL_COMM_PORT_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_COMM_PORT_ACCESSORS(rqst_fail,  RQST_FAIL)
-GEN_SES_CTRL_COMM_PORT_ACCESSORS(disable,    DISABLE)
-#undef GEN_SES_CTRL_COMM_PORT_ACCESSORS
-
-/*---------------------- Voltage Sensor Control Element ----------------------*/
-struct ses_ctrl_voltage_sensor {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_voltage_sensor_field_data {
-	SES_CTRL_VOLTAGE_SENSOR_RQST_IDENT_BYTE		= 0,
-	SES_CTRL_VOLTAGE_SENSOR_RQST_IDENT_MASK		= 0x80,
-	SES_CTRL_VOLTAGE_SENSOR_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_VOLTAGE_SENSOR_RQST_FAIL_BYTE		= 0,
-	SES_CTRL_VOLTAGE_SENSOR_RQST_FAIL_MASK		= 0x40,
-	SES_CTRL_VOLTAGE_SENSOR_RQST_FAIL_SHIFT		= 6
-};
-
-#define GEN_SES_CTRL_VOLTAGE_SENSOR_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_voltage_sensor, SES_CTRL_VOLTAGE_SENSOR,	\
-		  LCASE, UCASE)
-GEN_SES_CTRL_VOLTAGE_SENSOR_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_VOLTAGE_SENSOR_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_VOLTAGE_SENSOR_ACCESSORS
-
-/*---------------------- Current Sensor Control Element ----------------------*/
-struct ses_ctrl_current_sensor {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_current_sensor_field_data {
-	SES_CTRL_CURRENT_SENSOR_RQST_IDENT_BYTE		= 0,
-	SES_CTRL_CURRENT_SENSOR_RQST_IDENT_MASK		= 0x80,
-	SES_CTRL_CURRENT_SENSOR_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_CURRENT_SENSOR_RQST_FAIL_BYTE		= 0,
-	SES_CTRL_CURRENT_SENSOR_RQST_FAIL_MASK		= 0x40,
-	SES_CTRL_CURRENT_SENSOR_RQST_FAIL_SHIFT		= 6
-};
-
-#define GEN_SES_CTRL_CURRENT_SENSOR_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_current_sensor, SES_CTRL_CURRENT_SENSOR,	\
-		  LCASE, UCASE)
-GEN_SES_CTRL_CURRENT_SENSOR_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_CURRENT_SENSOR_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_CURRENT_SENSOR_ACCESSORS
-
-/*--------------------- SCSI Target Port Control Element ---------------------*/
-struct ses_ctrl_target_port {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_scsi_target_port_field_data {
-	SES_CTRL_TARGET_PORT_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_TARGET_PORT_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_TARGET_PORT_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_TARGET_PORT_RQST_FAIL_BYTE	= 0,
-	SES_CTRL_TARGET_PORT_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_TARGET_PORT_RQST_FAIL_SHIFT	= 6,
-
-	SES_CTRL_TARGET_PORT_ENABLE_BYTE	= 2,
-	SES_CTRL_TARGET_PORT_ENABLE_MASK	= 0x01,
-	SES_CTRL_TARGET_PORT_ENABLE_SHIFT	= 0
-};
-
-#define GEN_SES_CTRL_TARGET_PORT_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_target_port, SES_CTRL_TARGET_PORT, LCASE, UCASE)
-GEN_SES_CTRL_TARGET_PORT_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_TARGET_PORT_ACCESSORS(rqst_fail,  RQST_FAIL)
-GEN_SES_CTRL_TARGET_PORT_ACCESSORS(enable,     ENABLE)
-#undef GEN_SES_CTRL_TARGET_PORT_ACCESSORS
-
-/*-------------------- SCSI Initiator Port Control Element -------------------*/
-struct ses_ctrl_initiator_port {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_initiator_port_field_data {
-	SES_CTRL_INITIATOR_PORT_RQST_IDENT_BYTE		= 0,
-	SES_CTRL_INITIATOR_PORT_RQST_IDENT_MASK		= 0x80,
-	SES_CTRL_INITIATOR_PORT_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_INITIATOR_PORT_RQST_FAIL_BYTE		= 0,
-	SES_CTRL_INITIATOR_PORT_RQST_FAIL_MASK		= 0x40,
-	SES_CTRL_INITIATOR_PORT_RQST_FAIL_SHIFT		= 6,
-
-	SES_CTRL_INITIATOR_PORT_ENABLE_BYTE		= 2,
-	SES_CTRL_INITIATOR_PORT_ENABLE_MASK		= 0x01,
-	SES_CTRL_INITIATOR_PORT_ENABLE_SHIFT		= 0
-};
-
-#define GEN_SES_CTRL_INITIATOR_PORT_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_initiator_port, SES_CTRL_INITIATOR_PORT,	\
-		  LCASE, UCASE)
-GEN_SES_CTRL_INITIATOR_PORT_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_INITIATOR_PORT_ACCESSORS(rqst_fail,  RQST_FAIL)
-GEN_SES_CTRL_INITIATOR_PORT_ACCESSORS(enable,     ENABLE)
-#undef GEN_SES_CTRL_INITIATOR_PORT_ACCESSORS
-
-/*-------------------- Simple Subenclosure Control Element -------------------*/
-struct ses_ctrl_simple_subenc {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_simple_subenc_field_data {
-	SES_CTRL_SIMPlE_SUBSES_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_SIMPlE_SUBSES_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_SIMPlE_SUBSES_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_SIMPlE_SUBSES_RQST_FAIL_BYTE	= 0,
-	SES_CTRL_SIMPlE_SUBSES_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_SIMPlE_SUBSES_RQST_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_CTRL_SIMPlE_SUBSES_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_simple_subenc, SES_CTRL_SIMPlE_SUBSES,	\
-		  LCASE, UCASE)
-GEN_SES_CTRL_SIMPlE_SUBSES_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_SIMPlE_SUBSES_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_SIMPlE_SUBSES_ACCESSORS
-
-/*----------------------- SAS Expander Control Element -----------------------*/
-struct ses_ctrl_sas_expander {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_sas_expander_field_data {
-	SES_CTRL_SAS_EXPANDER_RQST_IDENT_BYTE	= 0,
-	SES_CTRL_SAS_EXPANDER_RQST_IDENT_MASK	= 0x80,
-	SES_CTRL_SAS_EXPANDER_RQST_IDENT_SHIFT	= 7,
-
-	SES_CTRL_SAS_EXPANDER_RQST_FAIL_BYTE	= 0,
-	SES_CTRL_SAS_EXPANDER_RQST_FAIL_MASK	= 0x40,
-	SES_CTRL_SAS_EXPANDER_RQST_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_CTRL_SAS_EXPANDER_ACCESSORS(LCASE, UCASE)	\
-    GEN_ACCESSORS(ses_ctrl_sas_expander, SES_CTRL_SAS_EXPANDER,	LCASE, UCASE)
-GEN_SES_CTRL_SAS_EXPANDER_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_SAS_EXPANDER_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_SAS_EXPANDER_ACCESSORS
-
-/*----------------------- SAS Connector Control Element ----------------------*/
-struct ses_ctrl_sas_connector {
-	struct ses_ctrl_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_ctrl_sas_connector_field_data {
-	SES_CTRL_SAS_CONNECTOR_RQST_IDENT_BYTE		= 0,
-	SES_CTRL_SAS_CONNECTOR_RQST_IDENT_MASK		= 0x80,
-	SES_CTRL_SAS_CONNECTOR_RQST_IDENT_SHIFT		= 7,
-
-	SES_CTRL_SAS_CONNECTOR_RQST_FAIL_BYTE		= 2,
-	SES_CTRL_SAS_CONNECTOR_RQST_FAIL_MASK		= 0x40,
-	SES_CTRL_SAS_CONNECTOR_RQST_FAIL_SHIFT		= 6
-};
-
-#define GEN_SES_CTRL_SAS_CONNECTOR_ACCESSORS(LCASE, UCASE)		\
-    GEN_ACCESSORS(ses_ctrl_sas_connector, SES_CTRL_SAS_CONNECTOR,	\
-		  LCASE, UCASE)
-GEN_SES_CTRL_SAS_CONNECTOR_ACCESSORS(rqst_ident, RQST_IDENT)
-GEN_SES_CTRL_SAS_CONNECTOR_ACCESSORS(rqst_fail,  RQST_FAIL)
-#undef GEN_SES_CTRL_SAS_CONNECTOR_ACCESSORS
-
-/*------------------------- Universal Control Element ------------------------*/
-union ses_ctrl_element {
-	struct ses_ctrl_common            common;
-	struct ses_ctrl_dev_slot          dev_slot;
-	struct ses_ctrl_array_dev_slot    array_dev_slot;
-	struct ses_ctrl_power_supply      power_supply;
-	struct ses_ctrl_cooling           cooling;
-	struct ses_ctrl_temp_sensor       temp_sensor;
-	struct ses_ctrl_door_lock         door_lock;
-	struct ses_ctrl_audible_alarm     audible_alarm;
-	struct ses_ctrl_ecc_electronics   ecc_electronics;
-	struct ses_ctrl_scc_electronics   scc_electronics;
-	struct ses_ctrl_nv_cache          nv_cache;
-	struct ses_ctrl_invalid_op_reason invalid_op_reason;
-	struct ses_ctrl_ups               ups;
-	struct ses_ctrl_display           display;
-	struct ses_ctrl_key_pad_entry     key_pad_entry;
-	struct ses_ctrl_scsi_port_or_xcvr scsi_port_or_xcvr;
-	struct ses_ctrl_language          language;
-	struct ses_ctrl_comm_port         comm_port;
-	struct ses_ctrl_voltage_sensor    voltage_sensor;
-	struct ses_ctrl_current_sensor    current_sensor;
-	struct ses_ctrl_target_port	  target_port;
-	struct ses_ctrl_initiator_port    initiator_port;
-	struct ses_ctrl_simple_subenc	  simple_subenc;
-	struct ses_ctrl_sas_expander      sas_expander;
-	struct ses_ctrl_sas_connector     sas_connector;
-};
-
-/*--------------------- SCSI SES Control Diagnostic Page ---------------------*/
-struct ses_ctrl_page {
-	struct ses_page_hdr hdr;
-	union ses_ctrl_element   elements[];
-};
-
-enum ses_ctrl_page_field_data {
-	SES_CTRL_PAGE_INFO_MASK		= 0x08,
-	SES_CTRL_PAGE_INFO_SHIFT	= 3,
-
-	SES_CTRL_PAGE_NON_CRIT_MASK	= 0x04,
-	SES_CTRL_PAGE_NON_CRIT_SHIFT	= 2,
-
-	SES_CTRL_PAGE_CRIT_MASK		= 0x02,
-	SES_CTRL_PAGE_CRIT_SHIFT	= 1,
-
-	SES_CTRL_PAGE_UNRECOV_MASK	= 0x01,
-	SES_CTRL_PAGE_UNRECOV_SHIFT	= 0
-};
-
-#define GEN_SES_CTRL_PAGE_ACCESSORS(LCASE, UCASE) \
-    GEN_HDR_ACCESSORS(ses_ctrl_page, SES_CTRL_PAGE, LCASE, UCASE)
-
-GEN_SES_CTRL_PAGE_ACCESSORS(info,     INFO)
-GEN_SES_CTRL_PAGE_ACCESSORS(non_crit, NON_CRIT)
-GEN_SES_CTRL_PAGE_ACCESSORS(crit,     CRIT)
-GEN_SES_CTRL_PAGE_ACCESSORS(unrecov,  UNRECOV)
-#undef GEN_SES_CTRL_PAGE_ACCESSORS
-
-/*================= SCSI SES Status Diagnostic Page Structures ===============*/
-struct ses_status_common {
-	uint8_t bytes[1];
-};
-
-enum ses_status_common_field_data {
-	SES_STATUS_COMMON_PRDFAIL_BYTE			= 0,
-	SES_STATUS_COMMON_PRDFAIL_MASK			= 0x40,
-	SES_STATUS_COMMON_PRDFAIL_SHIFT			= 6,
-
-	SES_STATUS_COMMON_DISABLED_BYTE			= 0,
-	SES_STATUS_COMMON_DISABLED_MASK			= 0x20,
-	SES_STATUS_COMMON_DISABLED_SHIFT		= 5,
-
-	SES_STATUS_COMMON_SWAP_BYTE			= 0,
-	SES_STATUS_COMMON_SWAP_MASK			= 0x10,
-	SES_STATUS_COMMON_SWAP_SHIFT			= 4,
-
-	SES_STATUS_COMMON_ELEMENT_STATUS_CODE_BYTE	= 0,
-	SES_STATUS_COMMON_ELEMENT_STATUS_CODE_MASK	= 0x0F,
-	SES_STATUS_COMMON_ELEMENT_STATUS_CODE_SHIFT	= 0
-};
-
-#define GEN_SES_STATUS_COMMON_ACCESSORS(LCASE, UCASE) \
-    GEN_GETTER(ses_status_common, SES_STATUS_COMMON, LCASE, UCASE)
-
-GEN_SES_STATUS_COMMON_ACCESSORS(prdfail,             PRDFAIL)
-GEN_SES_STATUS_COMMON_ACCESSORS(disabled,            DISABLED)
-GEN_SES_STATUS_COMMON_ACCESSORS(swap,                SWAP)
-GEN_SES_STATUS_COMMON_ACCESSORS(element_status_code, ELEMENT_STATUS_CODE)
-#undef GEN_SES_STATUS_COMMON_ACCESSORS
-
-/*------------------------- Device Slot Status Element -----------------------*/
-struct ses_status_dev_slot {
-	struct ses_status_common common;
-	uint8_t slot_address;
-	uint8_t bytes[2];
-};
-
-enum ses_status_dev_slot_field_data {
-	SES_STATUS_DEV_SLOT_APP_CLIENT_BYPED_A_BYTE	= 0,
-	SES_STATUS_DEV_SLOT_APP_CLIENT_BYPED_A_MASK	= 0x80,
-	SES_STATUS_DEV_SLOT_APP_CLIENT_BYPED_A_SHIFT	= 7,
-
-	SES_STATUS_DEV_SLOT_DO_NOT_REMOVE_BYTE		= 0,
-	SES_STATUS_DEV_SLOT_DO_NOT_REMOVE_MASK		= 0x40,
-	SES_STATUS_DEV_SLOT_DO_NOT_REMOVE_SHIFT		= 6,
-
-	SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_A_BYTE	= 0,
-	SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_A_MASK	= 0x20,
-	SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_A_SHIFT	= 5,
-
-	SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_B_BYTE	= 0,
-	SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_B_MASK	= 0x10,
-	SES_STATUS_DEV_SLOT_ENCLOSURE_BYPED_B_SHIFT	= 4,
-
-	SES_STATUS_DEV_SLOT_INSERT_READY_BYTE		= 0,
-	SES_STATUS_DEV_SLOT_INSERT_READY_MASK		= 0x08,
-	SES_STATUS_DEV_SLOT_INSERT_READY_SHIFT		= 3,
-
-	SES_STATUS_DEV_SLOT_REMOVE_BYTE			= 0,
-	SES_STATUS_DEV_SLOT_REMOVE_MASK			= 0x04,
-	SES_STATUS_DEV_SLOT_REMOVE_SHIFT		= 2,
-
-	SES_STATUS_DEV_SLOT_IDENT_BYTE			= 0,
-	SES_STATUS_DEV_SLOT_IDENT_MASK			= 0x02,
-	SES_STATUS_DEV_SLOT_IDENT_SHIFT			= 1,
-
-	SES_STATUS_DEV_SLOT_REPORT_BYTE			= 0,
-	SES_STATUS_DEV_SLOT_REPORT_MASK			= 0x01,
-	SES_STATUS_DEV_SLOT_REPORT_SHIFT		= 0,
-
-	SES_STATUS_DEV_SLOT_APP_CLIENT_BYPED_B_BYTE	= 1,
-	SES_STATUS_DEV_SLOT_APP_CLIENT_BYPED_B_MASK	= 0x80,
-	SES_STATUS_DEV_SLOT_APP_CLIENT_BYPED_B_SHIFT	= 7,
-
-	SES_STATUS_DEV_SLOT_FAULT_SENSED_BYTE		= 1,
-	SES_STATUS_DEV_SLOT_FAULT_SENSED_MASK		= 0x40,
-	SES_STATUS_DEV_SLOT_FAULT_SENSED_SHIFT		= 6,
-
-	SES_STATUS_DEV_SLOT_FAULT_REQUESTED_BYTE	= 1,
-	SES_STATUS_DEV_SLOT_FAULT_REQUESTED_MASK	= 0x20,
-	SES_STATUS_DEV_SLOT_FAULT_REQUESTED_SHIFT	= 5,
-
-	SES_STATUS_DEV_SLOT_DEVICE_OFF_BYTE		= 1,
-	SES_STATUS_DEV_SLOT_DEVICE_OFF_MASK		= 0x10,
-	SES_STATUS_DEV_SLOT_DEVICE_OFF_SHIFT		= 4,
-
-	SES_STATUS_DEV_SLOT_BYPED_A_BYTE		= 1,
-	SES_STATUS_DEV_SLOT_BYPED_A_MASK		= 0x08,
-	SES_STATUS_DEV_SLOT_BYPED_A_SHIFT		= 3,
-
-	SES_STATUS_DEV_SLOT_BYPED_B_BYTE		= 1,
-	SES_STATUS_DEV_SLOT_BYPED_B_MASK		= 0x04,
-	SES_STATUS_DEV_SLOT_BYPED_B_SHIFT		= 2,
-
-	SES_STATUS_DEV_SLOT_DEVICE_BYPED_A_BYTE		= 1,
-	SES_STATUS_DEV_SLOT_DEVICE_BYPED_A_MASK		= 0x02,
-	SES_STATUS_DEV_SLOT_DEVICE_BYPED_A_SHIFT	= 1,
-
-	SES_STATUS_DEV_SLOT_DEVICE_BYPED_B_BYTE		= 1,
-	SES_STATUS_DEV_SLOT_DEVICE_BYPED_B_MASK		= 0x01,
-	SES_STATUS_DEV_SLOT_DEVICE_BYPED_B_SHIFT	= 0
-};
-#define GEN_SES_STATUS_DEV_SLOT_ACCESSORS(LCASE, UCASE) \
-    GEN_GETTER(ses_status_dev_slot, SES_STATUS_DEV_SLOT, LCASE, UCASE)
-
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(app_client_byped_a, APP_CLIENT_BYPED_A)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(do_not_remove,      DO_NOT_REMOVE)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(enclosure_byped_a,  ENCLOSURE_BYPED_A)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(enclosure_byped_b,  ENCLOSURE_BYPED_B)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(insert_ready,       INSERT_READY)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(remove,             REMOVE)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(ident,              IDENT)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(report,             REPORT)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(app_client_byped_b, APP_CLIENT_BYPED_B)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(fault_sensed,       FAULT_SENSED)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(fault_requested,    FAULT_REQUESTED)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(device_off,         DEVICE_OFF)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(byped_a,            BYPED_A)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(byped_b,            BYPED_B)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(device_byped_a,     DEVICE_BYPED_A)
-GEN_SES_STATUS_DEV_SLOT_ACCESSORS(device_byped_b,     DEVICE_BYPED_B)
-#undef GEN_SES_STATUS_DEV_SLOT_ACCESSORS
-
-/*---------------------- Array Device Slot Status Element --------------------*/
-struct ses_status_array_dev_slot {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_array_dev_slot_field_data {
-	SES_STATUS_ARRAY_DEV_SLOT_OK_BYTE			= 0,
-	SES_STATUS_ARRAY_DEV_SLOT_OK_MASK			= 0x80,
-	SES_STATUS_ARRAY_DEV_SLOT_OK_SHIFT			= 7,
-
-	SES_STATUS_ARRAY_DEV_SLOT_RSVD_DEVICE_BYTE		= 0,
-	SES_STATUS_ARRAY_DEV_SLOT_RSVD_DEVICE_MASK		= 0x40,
-	SES_STATUS_ARRAY_DEV_SLOT_RSVD_DEVICE_SHIFT		= 6,
-
-	SES_STATUS_ARRAY_DEV_SLOT_HOT_SPARE_BYTE		= 0,
-	SES_STATUS_ARRAY_DEV_SLOT_HOT_SPARE_MASK		= 0x20,
-	SES_STATUS_ARRAY_DEV_SLOT_HOT_SPARE_SHIFT		= 5,
-
-	SES_STATUS_ARRAY_DEV_SLOT_CONS_CHECK_BYTE		= 0,
-	SES_STATUS_ARRAY_DEV_SLOT_CONS_CHECK_MASK		= 0x10,
-	SES_STATUS_ARRAY_DEV_SLOT_CONS_CHECK_SHIFT		= 4,
-
-	SES_STATUS_ARRAY_DEV_SLOT_IN_CRIT_ARRAY_BYTE		= 0,
-	SES_STATUS_ARRAY_DEV_SLOT_IN_CRIT_ARRAY_MASK		= 0x08,
-	SES_STATUS_ARRAY_DEV_SLOT_IN_CRIT_ARRAY_SHIFT		= 3,
-
-	SES_STATUS_ARRAY_DEV_SLOT_IN_FAILED_ARRAY_BYTE		= 0,
-	SES_STATUS_ARRAY_DEV_SLOT_IN_FAILED_ARRAY_MASK		= 0x04,
-	SES_STATUS_ARRAY_DEV_SLOT_IN_FAILED_ARRAY_SHIFT		= 2,
-
-	SES_STATUS_ARRAY_DEV_SLOT_REBUILD_REMAP_BYTE		= 0,
-	SES_STATUS_ARRAY_DEV_SLOT_REBUILD_REMAP_MASK		= 0x02,
-	SES_STATUS_ARRAY_DEV_SLOT_REBUILD_REMAP_SHIFT		= 1,
-
-	SES_STATUS_ARRAY_DEV_SLOT_REBUILD_REMAP_ABORT_BYTE	= 0,
-	SES_STATUS_ARRAY_DEV_SLOT_REBUILD_REMAP_ABORT_MASK	= 0x01,
-	SES_STATUS_ARRAY_DEV_SLOT_REBUILD_REMAP_ABORT_SHIFT	= 0
-
-	/*
-	 * The remaining fields are identical to the device
-	 * slot element type.  Access them through the device slot
-	 * element type and its accessors.
-	 */
-};
-#define GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_array_dev_slot, SES_STATUS_ARRAY_DEV_SLOT,	\
-	       LCASE, UCASE)
-GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS(ok,              OK)
-GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS(rsvd_device,     RSVD_DEVICE)
-GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS(hot_spare,       HOT_SPARE)
-GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS(cons_check,      CONS_CHECK)
-GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS(in_crit_array,   IN_CRIT_ARRAY)
-GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS(in_failed_array, IN_FAILED_ARRAY)
-GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS(rebuild_remap,   REBUILD_REMAP)
-GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS(rebuild_remap_abort,
-					REBUILD_REMAP_ABORT)
-#undef GEN_SES_STATUS_ARRAY_DEV_SLOT_ACCESSORS
-
-/*----------------------- Power Supply Status Element ------------------------*/
-struct ses_status_power_supply {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_power_supply_field_data {
-	SES_STATUS_POWER_SUPPLY_IDENT_BYTE		= 0,
-	SES_STATUS_POWER_SUPPLY_IDENT_MASK		= 0x80,
-	SES_STATUS_POWER_SUPPLY_IDENT_SHIFT		= 7,
-
-	SES_STATUS_POWER_SUPPLY_DC_OVER_VOLTAGE_BYTE	= 1,
-	SES_STATUS_POWER_SUPPLY_DC_OVER_VOLTAGE_MASK	= 0x08,
-	SES_STATUS_POWER_SUPPLY_DC_OVER_VOLTAGE_SHIFT	= 3,
-
-	SES_STATUS_POWER_SUPPLY_DC_UNDER_VOLTAGE_BYTE	= 1,
-	SES_STATUS_POWER_SUPPLY_DC_UNDER_VOLTAGE_MASK	= 0x04,
-	SES_STATUS_POWER_SUPPLY_DC_UNDER_VOLTAGE_SHIFT	= 2,
-
-	SES_STATUS_POWER_SUPPLY_DC_OVER_CURRENT_BYTE	= 1,
-	SES_STATUS_POWER_SUPPLY_DC_OVER_CURRENT_MASK	= 0x02,
-	SES_STATUS_POWER_SUPPLY_DC_OVER_CURRENT_SHIFT	= 1,
-
-	SES_STATUS_POWER_SUPPLY_HOT_SWAP_BYTE		= 2,
-	SES_STATUS_POWER_SUPPLY_HOT_SWAP_MASK		= 0x80,
-	SES_STATUS_POWER_SUPPLY_HOT_SWAP_SHIFT		= 7,
-
-	SES_STATUS_POWER_SUPPLY_FAIL_BYTE		= 2,
-	SES_STATUS_POWER_SUPPLY_FAIL_MASK		= 0x40,
-	SES_STATUS_POWER_SUPPLY_FAIL_SHIFT		= 6,
-
-	SES_STATUS_POWER_SUPPLY_REQUESTED_ON_BYTE	= 2,
-	SES_STATUS_POWER_SUPPLY_REQUESTED_ON_MASK	= 0x20,
-	SES_STATUS_POWER_SUPPLY_REQUESTED_ON_SHIFT	= 5,
-
-	SES_STATUS_POWER_SUPPLY_OFF_BYTE		= 2,
-	SES_STATUS_POWER_SUPPLY_OFF_MASK		= 0x10,
-	SES_STATUS_POWER_SUPPLY_OFF_SHIFT		= 4,
-
-	SES_STATUS_POWER_SUPPLY_OVERTMP_FAIL_BYTE	= 2,
-	SES_STATUS_POWER_SUPPLY_OVERTMP_FAIL_MASK	= 0x08,
-	SES_STATUS_POWER_SUPPLY_OVERTMP_FAIL_SHIFT	= 3,
-
-	SES_STATUS_POWER_SUPPLY_TEMP_WARN_BYTE		= 2,
-	SES_STATUS_POWER_SUPPLY_TEMP_WARN_MASK		= 0x04,
-	SES_STATUS_POWER_SUPPLY_TEMP_WARN_SHIFT		= 2,
-
-	SES_STATUS_POWER_SUPPLY_AC_FAIL_BYTE		= 2,
-	SES_STATUS_POWER_SUPPLY_AC_FAIL_MASK		= 0x02,
-	SES_STATUS_POWER_SUPPLY_AC_FAIL_SHIFT		= 1,
-
-	SES_STATUS_POWER_SUPPLY_DC_FAIL_BYTE		= 2,
-	SES_STATUS_POWER_SUPPLY_DC_FAIL_MASK		= 0x01,
-	SES_STATUS_POWER_SUPPLY_DC_FAIL_SHIFT		= 0
-};
-
-#define GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_power_supply, SES_STATUS_POWER_SUPPLY, LCASE, UCASE)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(ident,            IDENT)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(dc_over_voltage,  DC_OVER_VOLTAGE)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(dc_under_voltage, DC_UNDER_VOLTAGE)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(dc_over_current,  DC_OVER_CURRENT)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(hot_swap,         HOT_SWAP)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(fail,             FAIL)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(requested_on,     REQUESTED_ON)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(off,              OFF)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(overtmp_fail,     OVERTMP_FAIL)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(temp_warn,        TEMP_WARN)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(ac_fail,          AC_FAIL)
-GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS(dc_fail,          DC_FAIL)
-#undef GEN_SES_STATUS_POWER_SUPPLY_ACCESSORS
-
-/*-------------------------- Cooling Status Element --------------------------*/
-struct ses_status_cooling {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_cooling_field_data {
-	SES_STATUS_COOLING_IDENT_BYTE			= 0,
-	SES_STATUS_COOLING_IDENT_MASK			= 0x80,
-	SES_STATUS_COOLING_IDENT_SHIFT			= 7,
-
-	SES_STATUS_COOLING_ACTUAL_FAN_SPEED_MSB_BYTE	= 0,
-	SES_STATUS_COOLING_ACTUAL_FAN_SPEED_MSB_MASK	= 0x07,
-	SES_STATUS_COOLING_ACTUAL_FAN_SPEED_MSB_SHIFT	= 0,
-
-	SES_STATUS_COOLING_ACTUAL_FAN_SPEED_LSB_BYTE	= 1,
-	SES_STATUS_COOLING_ACTUAL_FAN_SPEED_LSB_MASK	= 0xFF,
-	SES_STATUS_COOLING_ACTUAL_FAN_SPEED_LSB_SHIFT	= 0,
-
-	SES_STATUS_COOLING_HOT_SWAP_BYTE		= 2,
-	SES_STATUS_COOLING_HOT_SWAP_MASK		= 0x40,
-	SES_STATUS_COOLING_HOT_SWAP_SHIFT		= 6,
-
-	SES_STATUS_COOLING_FAIL_BYTE			= 2,
-	SES_STATUS_COOLING_FAIL_MASK			= 0x40,
-	SES_STATUS_COOLING_FAIL_SHIFT			= 6,
-
-	SES_STATUS_COOLING_REQUESTED_ON_BYTE		= 2,
-	SES_STATUS_COOLING_REQUESTED_ON_MASK		= 0x20,
-	SES_STATUS_COOLING_REQUESTED_ON_SHIFT		= 5,
-
-	SES_STATUS_COOLING_OFF_BYTE			= 2,
-	SES_STATUS_COOLING_OFF_MASK			= 0x20,
-	SES_STATUS_COOLING_OFF_SHIFT			= 5,
-
-	SES_STATUS_COOLING_ACTUAL_SPEED_CODE_BYTE	= 2,
-	SES_STATUS_COOLING_ACTUAL_SPEED_CODE_MASK	= 0x07,
-	SES_STATUS_COOLING_ACTUAL_SPEED_CODE_SHIFT	= 2,
-	SES_STATUS_COOLING_ACTUAL_SPEED_CODE_STOPPED	= 0x00,
-	SES_STATUS_COOLING_ACTUAL_SPEED_CODE_LOWEST	= 0x01,
-	SES_STATUS_COOLING_ACTUAL_SPEED_CODE_HIGHEST	= 0x07
-};
-
-#define GEN_SES_STATUS_COOLING_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_cooling, SES_STATUS_COOLING, LCASE, UCASE)
-GEN_SES_STATUS_COOLING_ACCESSORS(ident,                IDENT)
-GEN_SES_STATUS_COOLING_ACCESSORS(actual_fan_speed_msb, ACTUAL_FAN_SPEED_MSB)
-GEN_SES_STATUS_COOLING_ACCESSORS(actual_fan_speed_lsb, ACTUAL_FAN_SPEED_LSB)
-GEN_SES_STATUS_COOLING_ACCESSORS(hot_swap,             HOT_SWAP)
-GEN_SES_STATUS_COOLING_ACCESSORS(fail,                 FAIL)
-GEN_SES_STATUS_COOLING_ACCESSORS(requested_on,         REQUESTED_ON)
-GEN_SES_STATUS_COOLING_ACCESSORS(off,                  OFF)
-GEN_SES_STATUS_COOLING_ACCESSORS(actual_speed_code,    ACTUAL_SPEED_CODE)
-#undef GEN_SES_STATUS_COOLING_ACCESSORS
-
-static inline int
-ses_status_cooling_get_actual_fan_speed(struct ses_status_cooling *elem)
-{
-	return (ses_status_cooling_get_actual_fan_speed_msb(elem) << 8
-	      | ses_status_cooling_get_actual_fan_speed_lsb(elem));
-}
-
-/*-------------------- Temperature Sensor Status Element ---------------------*/
-struct ses_status_temp_sensor {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_temp_sensor_field_data {
-	SES_STATUS_TEMP_SENSOR_IDENT_BYTE		= 0,
-	SES_STATUS_TEMP_SENSOR_IDENT_MASK		= 0x80,
-	SES_STATUS_TEMP_SENSOR_IDENT_SHIFT		= 7,
-
-	SES_STATUS_TEMP_SENSOR_FAIL_BYTE		= 0,
-	SES_STATUS_TEMP_SENSOR_FAIL_MASK		= 0x40,
-	SES_STATUS_TEMP_SENSOR_FAIL_SHIFT		= 6,
-
-	SES_STATUS_TEMP_SENSOR_TEMPERATURE_BYTE		= 1,
-	SES_STATUS_TEMP_SENSOR_TEMPERATURE_MASK		= 0xFF,
-	SES_STATUS_TEMP_SENSOR_TEMPERATURE_SHIFT	= 0,
-
-	SES_STATUS_TEMP_SENSOR_OT_FAILURE_BYTE		= 2,
-	SES_STATUS_TEMP_SENSOR_OT_FAILURE_MASK		= 0x08,
-	SES_STATUS_TEMP_SENSOR_OT_FAILURE_SHIFT		= 3,
-
-	SES_STATUS_TEMP_SENSOR_OT_WARNING_BYTE		= 2,
-	SES_STATUS_TEMP_SENSOR_OT_WARNING_MASK		= 0x04,
-	SES_STATUS_TEMP_SENSOR_OT_WARNING_SHIFT		= 2,
-
-	SES_STATUS_TEMP_SENSOR_UT_FAILURE_BYTE		= 2,
-	SES_STATUS_TEMP_SENSOR_UT_FAILURE_MASK		= 0x02,
-	SES_STATUS_TEMP_SENSOR_UT_FAILURE_SHIFT		= 1,
-
-	SES_STATUS_TEMP_SENSOR_UT_WARNING_BYTE		= 2,
-	SES_STATUS_TEMP_SENSOR_UT_WARNING_MASK		= 0x01,
-	SES_STATUS_TEMP_SENSOR_UT_WARNING_SHIFT		= 0
-};
-
-#define GEN_SES_STATUS_TEMP_SENSOR_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_temp_sensor, SES_STATUS_TEMP_SENSOR, LCASE, UCASE)
-GEN_SES_STATUS_TEMP_SENSOR_ACCESSORS(ident,       IDENT)
-GEN_SES_STATUS_TEMP_SENSOR_ACCESSORS(fail,        FAIL)
-GEN_SES_STATUS_TEMP_SENSOR_ACCESSORS(temperature, TEMPERATURE)
-GEN_SES_STATUS_TEMP_SENSOR_ACCESSORS(ot_failure,  OT_FAILURE)
-GEN_SES_STATUS_TEMP_SENSOR_ACCESSORS(ot_warning,  OT_WARNING)
-GEN_SES_STATUS_TEMP_SENSOR_ACCESSORS(ut_failure,  UT_FAILURE)
-GEN_SES_STATUS_TEMP_SENSOR_ACCESSORS(ut_warning,  UT_WARNING)
-#undef GEN_SES_STATUS_TEMP_SENSOR_ACCESSORS
-
-/*------------------------- Door Lock Status Element -------------------------*/
-struct ses_status_door_lock {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_door_lock_field_data {
-	SES_STATUS_DOOR_LOCK_IDENT_BYTE		= 0,
-	SES_STATUS_DOOR_LOCK_IDENT_MASK		= 0x80,
-	SES_STATUS_DOOR_LOCK_IDENT_SHIFT	= 7,
-
-	SES_STATUS_DOOR_LOCK_FAIL_BYTE		= 0,
-	SES_STATUS_DOOR_LOCK_FAIL_MASK		= 0x40,
-	SES_STATUS_DOOR_LOCK_FAIL_SHIFT		= 6,
-
-	SES_STATUS_DOOR_LOCK_UNLOCKED_BYTE	= 2,
-	SES_STATUS_DOOR_LOCK_UNLOCKED_MASK	= 0x01,
-	SES_STATUS_DOOR_LOCK_UNLOCKED_SHIFT	= 0
-};
-
-#define GEN_SES_STATUS_DOOR_LOCK_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_door_lock, SES_STATUS_DOOR_LOCK, LCASE, UCASE)
-GEN_SES_STATUS_DOOR_LOCK_ACCESSORS(ident,    IDENT)
-GEN_SES_STATUS_DOOR_LOCK_ACCESSORS(fail,     FAIL)
-GEN_SES_STATUS_DOOR_LOCK_ACCESSORS(unlocked, UNLOCKED)
-#undef GEN_SES_STATUS_DOOR_LOCK_ACCESSORS
-
-/*----------------------- Audible Alarm Status Element -----------------------*/
-struct ses_status_audible_alarm {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_audible_alarm_field_data {
-	SES_STATUS_AUDIBLE_ALARM_IDENT_BYTE			= 0,
-	SES_STATUS_AUDIBLE_ALARM_IDENT_MASK			= 0x80,
-	SES_STATUS_AUDIBLE_ALARM_IDENT_SHIFT			= 7,
-
-	SES_STATUS_AUDIBLE_ALARM_FAIL_BYTE			= 0,
-	SES_STATUS_AUDIBLE_ALARM_FAIL_MASK			= 0x40,
-	SES_STATUS_AUDIBLE_ALARM_FAIL_SHIFT			= 6,
-
-	SES_STATUS_AUDIBLE_ALARM_RQST_MUTE_BYTE			= 2,
-	SES_STATUS_AUDIBLE_ALARM_RQST_MUTE_MASK			= 0x80,
-	SES_STATUS_AUDIBLE_ALARM_RQST_MUTE_SHIFT		= 7,
-
-	SES_STATUS_AUDIBLE_ALARM_MUTED_BYTE			= 2,
-	SES_STATUS_AUDIBLE_ALARM_MUTED_MASK			= 0x40,
-	SES_STATUS_AUDIBLE_ALARM_MUTED_SHIFT			= 6,
-
-	SES_STATUS_AUDIBLE_ALARM_REMIND_BYTE			= 2,
-	SES_STATUS_AUDIBLE_ALARM_REMIND_MASK			= 0x10,
-	SES_STATUS_AUDIBLE_ALARM_REMIND_SHIFT			= 4,
-
-	SES_STATUS_AUDIBLE_ALARM_TONE_INDICATOR_BYTE		= 2,
-	SES_STATUS_AUDIBLE_ALARM_TONE_INDICATOR_MASK		= 0x0F,
-	SES_STATUS_AUDIBLE_ALARM_TONE_INDICATOR_SHIFT		= 0,
-	SES_STATUS_AUDIBLE_ALARM_TONE_INDICATOR_INFO		= 0x08,
-	SES_STATUS_AUDIBLE_ALARM_TONE_INDICATOR_NON_CRIT	= 0x04,
-	SES_STATUS_AUDIBLE_ALARM_TONE_INDICATOR_CRIT		= 0x02,
-	SES_STATUS_AUDIBLE_ALARM_TONE_INDICATOR_UNRECOV		= 0x01
-};
-
-#define GEN_SES_STATUS_AUDIBLE_ALARM_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_audible_alarm, SES_STATUS_AUDIBLE_ALARM, LCASE, UCASE)
-GEN_SES_STATUS_AUDIBLE_ALARM_ACCESSORS(ident,          IDENT)
-GEN_SES_STATUS_AUDIBLE_ALARM_ACCESSORS(fail,           FAIL)
-GEN_SES_STATUS_AUDIBLE_ALARM_ACCESSORS(rqst_mute,      RQST_MUTE)
-GEN_SES_STATUS_AUDIBLE_ALARM_ACCESSORS(muted,          MUTED)
-GEN_SES_STATUS_AUDIBLE_ALARM_ACCESSORS(remind,         REMIND)
-GEN_SES_STATUS_AUDIBLE_ALARM_ACCESSORS(tone_indicator, TONE_INDICATOR)
-#undef GEN_SES_STATUS_AUDIBLE_ALARM_ACCESSORS
-
-/*---------- Enclosure Services Statusler Electronics Status Element ---------*/
-struct ses_status_ecc_electronics {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_ecc_electronics_field_data {
-	SES_STATUS_ECC_ELECTRONICS_IDENT_BYTE		= 0,
-	SES_STATUS_ECC_ELECTRONICS_IDENT_MASK		= 0x80,
-	SES_STATUS_ECC_ELECTRONICS_IDENT_SHIFT		= 7,
-
-	SES_STATUS_ECC_ELECTRONICS_FAIL_BYTE		= 0,
-	SES_STATUS_ECC_ELECTRONICS_FAIL_MASK		= 0x40,
-	SES_STATUS_ECC_ELECTRONICS_FAIL_SHIFT		= 6,
-
-	SES_STATUS_ECC_ELECTRONICS_REPORT_BYTE		= 1,
-	SES_STATUS_ECC_ELECTRONICS_REPORT_MASK		= 0x01,
-	SES_STATUS_ECC_ELECTRONICS_REPORT_SHIFT		= 0,
-
-	SES_STATUS_ECC_ELECTRONICS_HOT_SWAP_BYTE	= 2,
-	SES_STATUS_ECC_ELECTRONICS_HOT_SWAP_MASK	= 0x80,
-	SES_STATUS_ECC_ELECTRONICS_HOT_SWAP_SHIFT	= 7
-};
-
-#define GEN_SES_STATUS_ECC_ELECTRONICS_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_ecc_electronics, SES_STATUS_ECC_ELECTRONICS,	\
-		  LCASE, UCASE)
-GEN_SES_STATUS_ECC_ELECTRONICS_ACCESSORS(ident,     IDENT)
-GEN_SES_STATUS_ECC_ELECTRONICS_ACCESSORS(fail,      FAIL)
-GEN_SES_STATUS_ECC_ELECTRONICS_ACCESSORS(report,    REPORT)
-GEN_SES_STATUS_ECC_ELECTRONICS_ACCESSORS(hot_swap,  HOT_SWAP)
-#undef GEN_SES_STATUS_ECC_ELECTRONICS_ACCESSORS
-
-/*------------ SCSI Services Statusler Electronics Status Element ------------*/
-struct ses_status_scc_electronics {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_scc_electronics_field_data {
-	SES_STATUS_SCC_ELECTRONICS_IDENT_BYTE	= 0,
-	SES_STATUS_SCC_ELECTRONICS_IDENT_MASK	= 0x80,
-	SES_STATUS_SCC_ELECTRONICS_IDENT_SHIFT	= 7,
-
-	SES_STATUS_SCC_ELECTRONICS_FAIL_BYTE	= 0,
-	SES_STATUS_SCC_ELECTRONICS_FAIL_MASK	= 0x40,
-	SES_STATUS_SCC_ELECTRONICS_FAIL_SHIFT	= 6,
-
-	SES_STATUS_SCC_ELECTRONICS_REPORT_BYTE	= 1,
-	SES_STATUS_SCC_ELECTRONICS_REPORT_MASK	= 0x01,
-	SES_STATUS_SCC_ELECTRONICS_REPORT_SHIFT	= 0
-};
-
-#define GEN_SES_STATUS_SCC_ELECTRONICS_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_scc_electronics, SES_STATUS_SCC_ELECTRONICS,	\
-		  LCASE, UCASE)
-GEN_SES_STATUS_SCC_ELECTRONICS_ACCESSORS(ident,     IDENT)
-GEN_SES_STATUS_SCC_ELECTRONICS_ACCESSORS(fail,      FAIL)
-GEN_SES_STATUS_SCC_ELECTRONICS_ACCESSORS(report,    REPORT)
-#undef GEN_SES_STATUS_SCC_ELECTRONICS_ACCESSORS
-
-/*--------------------- Nonvolatile Cache Status Element ---------------------*/
-struct ses_status_nv_cache {
-	struct ses_status_common common;
-	uint8_t bytes[1];
-	uint8_t cache_size[2];
-};
-
-enum ses_status_nv_cache_field_data {
-	SES_STATUS_NV_CACHE_IDENT_BYTE			= 0,
-	SES_STATUS_NV_CACHE_IDENT_MASK			= 0x80,
-	SES_STATUS_NV_CACHE_IDENT_SHIFT			= 7,
-
-	SES_STATUS_NV_CACHE_FAIL_BYTE			= 0,
-	SES_STATUS_NV_CACHE_FAIL_MASK			= 0x40,
-	SES_STATUS_NV_CACHE_FAIL_SHIFT			= 6,
-
-	SES_STATUS_NV_CACHE_SIZE_MULTIPLIER_BYTE	= 0,
-	SES_STATUS_NV_CACHE_SIZE_MULTIPLIER_MASK	= 0x03,
-	SES_STATUS_NV_CACHE_SIZE_MULTIPLIER_SHIFT	= 0,
-	SES_STATUS_NV_CACHE_SIZE_MULTIPLIER_BYTES	= 0x0,
-	SES_STATUS_NV_CACHE_SIZE_MULTIPLIER_KBYTES	= 0x1,
-	SES_STATUS_NV_CACHE_SIZE_MULTIPLIER_MBYTES	= 0x2,
-	SES_STATUS_NV_CACHE_SIZE_MULTIPLIER_GBYTES	= 0x3
-};
-
-#define GEN_SES_STATUS_NV_CACHE_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_nv_cache, SES_STATUS_NV_CACHE, LCASE, UCASE)
-GEN_SES_STATUS_NV_CACHE_ACCESSORS(ident,           IDENT)
-GEN_SES_STATUS_NV_CACHE_ACCESSORS(fail,            FAIL)
-GEN_SES_STATUS_NV_CACHE_ACCESSORS(size_multiplier, SIZE_MULTIPLIER)
-#undef GEN_SES_STATUS_NV_CACHE_ACCESSORS
-
-static inline uintmax_t
-ses_status_nv_cache_get_cache_size(struct ses_status_nv_cache *elem)
-{
-	uintmax_t cache_size;
-	int multiplier;
-
-	/* Multiplier is in units of 2^10 */
-	cache_size = scsi_2btoul(elem->cache_size);
-	multiplier = 10 * ses_status_nv_cache_get_size_multiplier(elem);
-	return (cache_size << multiplier);
-}
-
-/*----------------- Invalid Operation Reason Status Element ------------------*/
-struct ses_status_invalid_op_reason {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_invalid_op_field_data {
-	SES_STATUS_INVALID_OP_REASON_TYPE_BYTE				= 0,
-	SES_STATUS_INVALID_OP_REASON_TYPE_MASK				= 0xC0,
-	SES_STATUS_INVALID_OP_REASON_TYPE_SHIFT				= 6,
-	SES_STATUS_INVALID_OP_REASON_TYPE_PC_ERROR			= 0x00,
-	SES_STATUS_INVALID_OP_REASON_TYPE_PF_ERROR			= 0x01,
-	SES_STATUS_INVALID_OP_REASON_TYPE_VS_ERROR			= 0x03,
-
-	SES_STATUS_INVALID_OP_REASON_PC_ERROR_PC_NOT_SUPPORTED_BYTE	= 0,
-	SES_STATUS_INVALID_OP_REASON_PC_ERROR_PC_NOT_SUPPORTED_MASK	= 0x01,
-	SES_STATUS_INVALID_OP_REASON_PC_ERROR_PC_NOT_SUPPORTED_SHIFT	= 0,
-
-	SES_STATUS_INVALID_OP_REASON_PF_ERROR_BIT_NUMBER_BYTE		= 0,
-	SES_STATUS_INVALID_OP_REASON_PF_ERROR_BIT_NUMBER_MASK		= 0x03,
-	SES_STATUS_INVALID_OP_REASON_PF_ERROR_BIT_NUMBER_SHIFT		= 0
-};
-
-#define GEN_SES_STATUS_INVALID_OP_REASON_ACCESSORS(LCASE, UCASE)	   \
-    GEN_GETTER(ses_status_invalid_op_reason, SES_STATUS_INVALID_OP_REASON, \
-	       LCASE, UCASE)
-GEN_SES_STATUS_INVALID_OP_REASON_ACCESSORS(type, TYPE)
-GEN_SES_STATUS_INVALID_OP_REASON_ACCESSORS(pc_error_pc_not_supported,
-					   PC_ERROR_PC_NOT_SUPPORTED)
-GEN_SES_STATUS_INVALID_OP_REASON_ACCESSORS(pf_error_bit_number,
-					   PF_ERROR_BIT_NUMBER)
-#undef GEN_SES_STATUS_INVALID_OP_ACCESSORS
-
-/*--------------- Uninterruptible Power Supply Status Element ----------------*/
-struct ses_status_ups {
-	struct ses_status_common common;
-	/* Minutes of remaining capacity. */
-	uint8_t battery_status;
-	uint8_t bytes[2];
-};
-
-enum ses_status_ups_field_data {
-	SES_STATUS_UPS_AC_LO_BYTE	= 0,
-	SES_STATUS_UPS_AC_LO_MASK	= 0x80,
-	SES_STATUS_UPS_AC_LO_SHIFT	= 7,
-
-	SES_STATUS_UPS_AC_HI_BYTE	= 0,
-	SES_STATUS_UPS_AC_HI_MASK	= 0x40,
-	SES_STATUS_UPS_AC_HI_SHIFT	= 6,
-
-	SES_STATUS_UPS_AC_QUAL_BYTE	= 0,
-	SES_STATUS_UPS_AC_QUAL_MASK	= 0x20,
-	SES_STATUS_UPS_AC_QUAL_SHIFT	= 5,
-
-	SES_STATUS_UPS_AC_FAIL_BYTE	= 0,
-	SES_STATUS_UPS_AC_FAIL_MASK	= 0x10,
-	SES_STATUS_UPS_AC_FAIL_SHIFT	= 4,
-
-	SES_STATUS_UPS_DC_FAIL_BYTE	= 0,
-	SES_STATUS_UPS_DC_FAIL_MASK	= 0x08,
-	SES_STATUS_UPS_DC_FAIL_SHIFT	= 3,
-
-	SES_STATUS_UPS_UPS_FAIL_BYTE	= 0,
-	SES_STATUS_UPS_UPS_FAIL_MASK	= 0x04,
-	SES_STATUS_UPS_UPS_FAIL_SHIFT	= 2,
-
-	SES_STATUS_UPS_WARN_BYTE	= 0,
-	SES_STATUS_UPS_WARN_MASK	= 0x02,
-	SES_STATUS_UPS_WARN_SHIFT	= 1,
-
-	SES_STATUS_UPS_INTF_FAIL_BYTE	= 0,
-	SES_STATUS_UPS_INTF_FAIL_MASK	= 0x01,
-	SES_STATUS_UPS_INTF_FAIL_SHIFT	= 0,
-
-	SES_STATUS_UPS_IDENT_BYTE	= 0,
-	SES_STATUS_UPS_IDENT_MASK	= 0x80,
-	SES_STATUS_UPS_IDENT_SHIFT	= 7,
-
-	SES_STATUS_UPS_FAIL_BYTE	= 1,
-	SES_STATUS_UPS_FAIL_MASK	= 0x40,
-	SES_STATUS_UPS_FAIL_SHIFT	= 6,
-
-	SES_STATUS_UPS_BATT_FAIL_BYTE	= 1,
-	SES_STATUS_UPS_BATT_FAIL_MASK	= 0x02,
-	SES_STATUS_UPS_BATT_FAIL_SHIFT	= 1,
-
-	SES_STATUS_UPS_BPF_BYTE		= 1,
-	SES_STATUS_UPS_BPF_MASK		= 0x01,
-	SES_STATUS_UPS_BPF_SHIFT	= 0
-};
-
-#define GEN_SES_STATUS_UPS_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_ups, SES_STATUS_UPS, LCASE, UCASE)
-GEN_SES_STATUS_UPS_ACCESSORS(ac_lo,           AC_LO)
-GEN_SES_STATUS_UPS_ACCESSORS(ac_hi,            AC_HI)
-GEN_SES_STATUS_UPS_ACCESSORS(ac_qual,          AC_QUAL)
-GEN_SES_STATUS_UPS_ACCESSORS(ac_fail,          AC_FAIL)
-GEN_SES_STATUS_UPS_ACCESSORS(dc_fail,          DC_FAIL)
-GEN_SES_STATUS_UPS_ACCESSORS(ups_fail,         UPS_FAIL)
-GEN_SES_STATUS_UPS_ACCESSORS(warn,             WARN)
-GEN_SES_STATUS_UPS_ACCESSORS(intf_fail,        INTF_FAIL)
-GEN_SES_STATUS_UPS_ACCESSORS(ident,            IDENT)
-GEN_SES_STATUS_UPS_ACCESSORS(fail,             FAIL)
-GEN_SES_STATUS_UPS_ACCESSORS(batt_fail,        BATT_FAIL)
-GEN_SES_STATUS_UPS_ACCESSORS(bpf,              BPF)
-#undef GEN_SES_STATUS_UPS_ACCESSORS
-
-/*-------------------------- Display Status Element --------------------------*/
-struct ses_status_display {
-	struct ses_status_common common;
-	uint8_t bytes[1];
-	uint8_t display_character[2];
-};
-
-enum ses_status_display_field_data {
-	SES_STATUS_DISPLAY_IDENT_BYTE			= 0,
-	SES_STATUS_DISPLAY_IDENT_MASK			= 0x80,
-	SES_STATUS_DISPLAY_IDENT_SHIFT			= 7,
-
-	SES_STATUS_DISPLAY_FAIL_BYTE			= 0,
-	SES_STATUS_DISPLAY_FAIL_MASK			= 0x40,
-	SES_STATUS_DISPLAY_FAIL_SHIFT			= 6,
-
-	SES_STATUS_DISPLAY_DISPLAY_MODE_BYTE		= 0,
-	SES_STATUS_DISPLAY_DISPLAY_MODE_MASK		= 0x03,
-	SES_STATUS_DISPLAY_DISPLAY_MODE_SHIFT		= 6,
-	SES_STATUS_DISPLAY_DISPLAY_MODE_DC_FIELD_UNSUPP	= 0x0,
-	SES_STATUS_DISPLAY_DISPLAY_MODE_DC_FIELD_SUPP	= 0x1,
-	SES_STATUS_DISPLAY_DISPLAY_MODE_DC_FIELD	= 0x2
-};
-
-#define GEN_SES_STATUS_DISPLAY_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_display, SES_STATUS_DISPLAY, LCASE, UCASE)
-GEN_SES_STATUS_DISPLAY_ACCESSORS(ident,        IDENT)
-GEN_SES_STATUS_DISPLAY_ACCESSORS(fail,         FAIL)
-GEN_SES_STATUS_DISPLAY_ACCESSORS(display_mode, DISPLAY_MODE)
-#undef GEN_SES_STATUS_DISPLAY_ACCESSORS
-
-/*----------------------- Key Pad Entry Status Element -----------------------*/
-struct ses_status_key_pad_entry {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_key_pad_entry_field_data {
-	SES_STATUS_KEY_PAD_ENTRY_IDENT_BYTE	= 0,
-	SES_STATUS_KEY_PAD_ENTRY_IDENT_MASK	= 0x80,
-	SES_STATUS_KEY_PAD_ENTRY_IDENT_SHIFT	= 7,
-
-	SES_STATUS_KEY_PAD_ENTRY_FAIL_BYTE	= 0,
-	SES_STATUS_KEY_PAD_ENTRY_FAIL_MASK	= 0x40,
-	SES_STATUS_KEY_PAD_ENTRY_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_STATUS_KEY_PAD_ENTRY_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_key_pad_entry, SES_STATUS_KEY_PAD_ENTRY, LCASE, UCASE)
-GEN_SES_STATUS_KEY_PAD_ENTRY_ACCESSORS(ident, IDENT)
-GEN_SES_STATUS_KEY_PAD_ENTRY_ACCESSORS(fail,  FAIL)
-#undef GEN_SES_STATUS_KEY_PAD_ENTRY_ACCESSORS
-
-/*------------------------- Enclosure Status Element -------------------------*/
-struct ses_status_enclosure {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_enclosure_field_data {
-	SES_STATUS_ENCLOSURE_IDENT_BYTE					= 0,
-	SES_STATUS_ENCLOSURE_IDENT_MASK					= 0x80,
-	SES_STATUS_ENCLOSURE_IDENT_SHIFT				= 7,
-
-	SES_STATUS_ENCLOSURE_TIME_UNTIL_POWER_CYCLE_BYTE		= 1,
-	SES_STATUS_ENCLOSURE_TIME_UNTIL_POWER_CYCLE_MASK		= 0xFC,
-	SES_STATUS_ENCLOSURE_TIME_UNTIL_POWER_CYCLE_SHIFT		= 2,
-
-	SES_STATUS_ENCLOSURE_FAIL_BYTE					= 1,
-	SES_STATUS_ENCLOSURE_FAIL_MASK					= 0x02,
-	SES_STATUS_ENCLOSURE_FAIL_SHIFT					= 1,
-
-	SES_STATUS_ENCLOSURE_WARN_BYTE					= 1,
-	SES_STATUS_ENCLOSURE_WARN_MASK					= 0x01,
-	SES_STATUS_ENCLOSURE_WARN_SHIFT					= 0,
-
-	SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_BYTE		= 2,
-	SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_MASK		= 0xFC,
-	SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_SHIFT		= 2,
-	SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_MAX_AUTO	= 60,
-	SES_STATUS_ENCLOSURE_REQUESTED_POWER_OFF_DURATION_MANUAL	= 63,
-
-	SES_STATUS_ENCLOSURE_REQUESTED_FAIL_BYTE			= 2,
-	SES_STATUS_ENCLOSURE_REQUESTED_FAIL_MASK			= 0x02,
-	SES_STATUS_ENCLOSURE_REQUESTED_FAIL_SHIFT			= 1,
-
-	SES_STATUS_ENCLOSURE_REQUESTED_WARN_BYTE			= 2,
-	SES_STATUS_ENCLOSURE_REQUESTED_WARN_MASK			= 0x01,
-	SES_STATUS_ENCLOSURE_REQUESTED_WARN_SHIFT			= 0
-};
-
-#define GEN_SES_STATUS_ENCLOSURE_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_enclosure, SES_STATUS_ENCLOSURE, LCASE, UCASE)
-GEN_SES_STATUS_ENCLOSURE_ACCESSORS(ident,          IDENT)
-GEN_SES_STATUS_ENCLOSURE_ACCESSORS(time_until_power_cycle,
-				   TIME_UNTIL_POWER_CYCLE)
-GEN_SES_STATUS_ENCLOSURE_ACCESSORS(fail,           FAIL)
-GEN_SES_STATUS_ENCLOSURE_ACCESSORS(warn,           WARN)
-GEN_SES_STATUS_ENCLOSURE_ACCESSORS(requested_power_off_duration,
-				   REQUESTED_POWER_OFF_DURATION)
-GEN_SES_STATUS_ENCLOSURE_ACCESSORS(requested_fail, REQUESTED_FAIL)
-GEN_SES_STATUS_ENCLOSURE_ACCESSORS(requested_warn, REQUESTED_WARN)
-#undef GEN_SES_STATUS_ENCLOSURE_ACCESSORS
-
-/*------------------- SCSI Port/Transceiver Status Element -------------------*/
-struct ses_status_scsi_port_or_xcvr {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_scsi_port_or_xcvr_field_data {
-	SES_STATUS_SCSI_PORT_OR_XCVR_IDENT_BYTE		= 0,
-	SES_STATUS_SCSI_PORT_OR_XCVR_IDENT_MASK		= 0x80,
-	SES_STATUS_SCSI_PORT_OR_XCVR_IDENT_SHIFT	= 7,
-
-	SES_STATUS_SCSI_PORT_OR_XCVR_FAIL_BYTE		= 0,
-	SES_STATUS_SCSI_PORT_OR_XCVR_FAIL_MASK		= 0x40,
-	SES_STATUS_SCSI_PORT_OR_XCVR_FAIL_SHIFT		= 6,
-
-	SES_STATUS_SCSI_PORT_OR_XCVR_REPORT_BYTE	= 1,
-	SES_STATUS_SCSI_PORT_OR_XCVR_REPORT_MASK	= 0x01,
-	SES_STATUS_SCSI_PORT_OR_XCVR_REPORT_SHIFT	= 0,
-
-	SES_STATUS_SCSI_PORT_OR_XCVR_DISABLED_BYTE	= 2,
-	SES_STATUS_SCSI_PORT_OR_XCVR_DISABLED_MASK	= 0x10,
-	SES_STATUS_SCSI_PORT_OR_XCVR_DISABLED_SHIFT	= 4,
-
-	SES_STATUS_SCSI_PORT_OR_XCVR_LOL_BYTE		= 2,
-	SES_STATUS_SCSI_PORT_OR_XCVR_LOL_MASK		= 0x02,
-	SES_STATUS_SCSI_PORT_OR_XCVR_LOL_SHIFT		= 1,
-
-	SES_STATUS_SCSI_PORT_OR_XCVR_XMIT_FAIL_BYTE	= 2,
-	SES_STATUS_SCSI_PORT_OR_XCVR_XMIT_FAIL_MASK	= 0x01,
-	SES_STATUS_SCSI_PORT_OR_XCVR_XMIT_FAIL_SHIFT	= 0
-};
-
-#define GEN_SES_STATUS_SCSI_PORT_OR_XCVR_ACCESSORS(LCASE, UCASE)	 \
-    GEN_GETTER(ses_status_scsi_port_or_xcvr, SES_STATUS_SCSI_PORT_OR_XCVR,\
-	       LCASE, UCASE)
-GEN_SES_STATUS_SCSI_PORT_OR_XCVR_ACCESSORS(ident,     IDENT)
-GEN_SES_STATUS_SCSI_PORT_OR_XCVR_ACCESSORS(fail,      FAIL)
-GEN_SES_STATUS_SCSI_PORT_OR_XCVR_ACCESSORS(report,    REPORT)
-GEN_SES_STATUS_SCSI_PORT_OR_XCVR_ACCESSORS(disable,   DISABLED)
-GEN_SES_STATUS_SCSI_PORT_OR_XCVR_ACCESSORS(lol,       LOL)
-GEN_SES_STATUS_SCSI_PORT_OR_XCVR_ACCESSORS(xmit_fail, XMIT_FAIL)
-#undef GEN_SES_STATUS_SCSI_PORT_OR_XCVR_ACCESSORS
-
-/*------------------------- Language Status Element --------------------------*/
-struct ses_status_language {
-	struct ses_status_common common;
-	uint8_t bytes[1];
-	uint8_t language_code[2];
-};
-
-enum ses_status_language_field_data {
-	SES_STATUS_LANGUAGE_IDENT_BYTE	= 0,
-	SES_STATUS_LANGUAGE_IDENT_MASK	= 0x80,
-	SES_STATUS_LANGUAGE_IDENT_SHIFT	= 7
-};
-
-#define GEN_SES_STATUS_LANGUAGE_ACCESSORS(LCASE, UCASE)		 \
-    GEN_GETTER(ses_status_language, SES_STATUS_LANGUAGE, LCASE, UCASE)
-GEN_SES_STATUS_LANGUAGE_ACCESSORS(ident, IDENT)
-#undef GEN_SES_STATUS_LANGUAGE_ACCESSORS
-
-/*-------------------- Communication Port Status Element ---------------------*/
-struct ses_status_comm_port {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_comm_port_field_data {
-	SES_STATUS_COMM_PORT_IDENT_BYTE		= 0,
-	SES_STATUS_COMM_PORT_IDENT_MASK		= 0x80,
-	SES_STATUS_COMM_PORT_IDENT_SHIFT	= 7,
-
-	SES_STATUS_COMM_PORT_FAIL_BYTE		= 0,
-	SES_STATUS_COMM_PORT_FAIL_MASK		= 0x40,
-	SES_STATUS_COMM_PORT_FAIL_SHIFT		= 6,
-
-	SES_STATUS_COMM_PORT_DISABLED_BYTE	= 2,
-	SES_STATUS_COMM_PORT_DISABLED_MASK	= 0x01,
-	SES_STATUS_COMM_PORT_DISABLED_SHIFT	= 0
-};
-
-#define GEN_SES_STATUS_COMM_PORT_ACCESSORS(LCASE, UCASE)		 \
-    GEN_GETTER(ses_status_comm_port, SES_STATUS_COMM_PORT, LCASE, UCASE)
-GEN_SES_STATUS_COMM_PORT_ACCESSORS(ident,    IDENT)
-GEN_SES_STATUS_COMM_PORT_ACCESSORS(fail,     FAIL)
-GEN_SES_STATUS_COMM_PORT_ACCESSORS(disabled, DISABLED)
-#undef GEN_SES_STATUS_COMM_PORT_ACCESSORS
-
-/*---------------------- Voltage Sensor Status Element -----------------------*/
-struct ses_status_voltage_sensor {
-	struct ses_status_common common;
-	uint8_t bytes[1];
-	uint8_t voltage[2];
-};
-
-enum ses_status_voltage_sensor_field_data {
-	SES_STATUS_VOLTAGE_SENSOR_IDENT_BYTE		= 0,
-	SES_STATUS_VOLTAGE_SENSOR_IDENT_MASK		= 0x80,
-	SES_STATUS_VOLTAGE_SENSOR_IDENT_SHIFT		= 7,
-
-	SES_STATUS_VOLTAGE_SENSOR_FAIL_BYTE		= 0,
-	SES_STATUS_VOLTAGE_SENSOR_FAIL_MASK		= 0x40,
-	SES_STATUS_VOLTAGE_SENSOR_FAIL_SHIFT		= 6,
-
-	SES_STATUS_VOLTAGE_SENSOR_WARN_OVER_BYTE	= 0,
-	SES_STATUS_VOLTAGE_SENSOR_WARN_OVER_MASK	= 0x08,
-	SES_STATUS_VOLTAGE_SENSOR_WARN_OVER_SHIFT	= 3,
-
-	SES_STATUS_VOLTAGE_SENSOR_WARN_UNDER_BYTE	= 0,
-	SES_STATUS_VOLTAGE_SENSOR_WARN_UNDER_MASK	= 0x04,
-	SES_STATUS_VOLTAGE_SENSOR_WARN_UNDER_SHIFT	= 2,
-
-	SES_STATUS_VOLTAGE_SENSOR_CRIT_OVER_BYTE	= 0,
-	SES_STATUS_VOLTAGE_SENSOR_CRIT_OVER_MASK	= 0x02,
-	SES_STATUS_VOLTAGE_SENSOR_CRIT_OVER_SHIFT	= 1,
-
-	SES_STATUS_VOLTAGE_SENSOR_CRIT_UNDER_BYTE	= 0,
-	SES_STATUS_VOLTAGE_SENSOR_CRIT_UNDER_MASK	= 0x01,
-	SES_STATUS_VOLTAGE_SENSOR_CRIT_UNDER_SHIFT	= 0
-};
-
-#define GEN_SES_STATUS_VOLTAGE_SENSOR_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_voltage_sensor, SES_STATUS_VOLTAGE_SENSOR,	\
-		  LCASE, UCASE)
-GEN_SES_STATUS_VOLTAGE_SENSOR_ACCESSORS(ident,      IDENT)
-GEN_SES_STATUS_VOLTAGE_SENSOR_ACCESSORS(fail,       FAIL)
-GEN_SES_STATUS_VOLTAGE_SENSOR_ACCESSORS(warn_over,  WARN_OVER)
-GEN_SES_STATUS_VOLTAGE_SENSOR_ACCESSORS(warn_under, WARN_UNDER)
-GEN_SES_STATUS_VOLTAGE_SENSOR_ACCESSORS(crit_over,  CRIT_OVER)
-GEN_SES_STATUS_VOLTAGE_SENSOR_ACCESSORS(crit_under, CRIT_UNDER)
-#undef GEN_SES_STATUS_VOLTAGE_SENSOR_ACCESSORS
-
-/*---------------------- Current Sensor Status Element -----------------------*/
-struct ses_status_current_sensor {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_current_sensor_field_data {
-	SES_STATUS_CURRENT_SENSOR_IDENT_BYTE		= 0,
-	SES_STATUS_CURRENT_SENSOR_IDENT_MASK		= 0x80,
-	SES_STATUS_CURRENT_SENSOR_IDENT_SHIFT		= 7,
-
-	SES_STATUS_CURRENT_SENSOR_FAIL_BYTE		= 0,
-	SES_STATUS_CURRENT_SENSOR_FAIL_MASK		= 0x40,
-	SES_STATUS_CURRENT_SENSOR_FAIL_SHIFT		= 6,
-
-	SES_STATUS_CURRENT_SENSOR_WARN_OVER_BYTE	= 0,
-	SES_STATUS_CURRENT_SENSOR_WARN_OVER_MASK	= 0x08,
-	SES_STATUS_CURRENT_SENSOR_WARN_OVER_SHIFT	= 3,
-
-	SES_STATUS_CURRENT_SENSOR_CRIT_OVER_BYTE	= 0,
-	SES_STATUS_CURRENT_SENSOR_CRIT_OVER_MASK	= 0x02,
-	SES_STATUS_CURRENT_SENSOR_CRIT_OVER_SHIFT	= 1
-};
-
-#define GEN_SES_STATUS_CURRENT_SENSOR_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_current_sensor, SES_STATUS_CURRENT_SENSOR,	\
-		  LCASE, UCASE)
-GEN_SES_STATUS_CURRENT_SENSOR_ACCESSORS(ident,      IDENT)
-GEN_SES_STATUS_CURRENT_SENSOR_ACCESSORS(fail,       FAIL)
-GEN_SES_STATUS_CURRENT_SENSOR_ACCESSORS(warn_over,  WARN_OVER)
-GEN_SES_STATUS_CURRENT_SENSOR_ACCESSORS(crit_over,  CRIT_OVER)
-#undef GEN_SES_STATUS_CURRENT_SENSOR_ACCESSORS
-
-/*--------------------- SCSI Target Port Status Element ----------------------*/
-struct ses_status_target_port {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_scsi_target_port_field_data {
-	SES_STATUS_TARGET_PORT_IDENT_BYTE	= 0,
-	SES_STATUS_TARGET_PORT_IDENT_MASK	= 0x80,
-	SES_STATUS_TARGET_PORT_IDENT_SHIFT	= 7,
-
-	SES_STATUS_TARGET_PORT_FAIL_BYTE	= 0,
-	SES_STATUS_TARGET_PORT_FAIL_MASK	= 0x40,
-	SES_STATUS_TARGET_PORT_FAIL_SHIFT	= 6,
-
-	SES_STATUS_TARGET_PORT_REPORT_BYTE	= 1,
-	SES_STATUS_TARGET_PORT_REPORT_MASK	= 0x01,
-	SES_STATUS_TARGET_PORT_REPORT_SHIFT	= 0,
-
-	SES_STATUS_TARGET_PORT_ENABLED_BYTE	= 2,
-	SES_STATUS_TARGET_PORT_ENABLED_MASK	= 0x01,
-	SES_STATUS_TARGET_PORT_ENABLED_SHIFT	= 0
-};
-
-#define GEN_SES_STATUS_TARGET_PORT_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_target_port, SES_STATUS_TARGET_PORT, LCASE, UCASE)
-GEN_SES_STATUS_TARGET_PORT_ACCESSORS(ident,   IDENT)
-GEN_SES_STATUS_TARGET_PORT_ACCESSORS(fail,    FAIL)
-GEN_SES_STATUS_TARGET_PORT_ACCESSORS(report,  REPORT)
-GEN_SES_STATUS_TARGET_PORT_ACCESSORS(enabled, ENABLED)
-#undef GEN_SES_STATUS_TARGET_PORT_ACCESSORS
-
-/*-------------------- SCSI Initiator Port Status Element --------------------*/
-struct ses_status_initiator_port {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_scsi_initiator_port_field_data {
-	SES_STATUS_INITIATOR_PORT_IDENT_BYTE	= 0,
-	SES_STATUS_INITIATOR_PORT_IDENT_MASK	= 0x80,
-	SES_STATUS_INITIATOR_PORT_IDENT_SHIFT	= 7,
-
-	SES_STATUS_INITIATOR_PORT_FAIL_BYTE	= 0,
-	SES_STATUS_INITIATOR_PORT_FAIL_MASK	= 0x40,
-	SES_STATUS_INITIATOR_PORT_FAIL_SHIFT	= 6,
-
-	SES_STATUS_INITIATOR_PORT_REPORT_BYTE	= 1,
-	SES_STATUS_INITIATOR_PORT_REPORT_MASK	= 0x01,
-	SES_STATUS_INITIATOR_PORT_REPORT_SHIFT	= 0,
-
-	SES_STATUS_INITIATOR_PORT_ENABLED_BYTE	= 2,
-	SES_STATUS_INITIATOR_PORT_ENABLED_MASK	= 0x01,
-	SES_STATUS_INITIATOR_PORT_ENABLED_SHIFT	= 0
-};
-
-#define GEN_SES_STATUS_INITIATOR_PORT_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_initiator_port, SES_STATUS_INITIATOR_PORT,	\
-	       LCASE, UCASE)
-GEN_SES_STATUS_INITIATOR_PORT_ACCESSORS(ident,   IDENT)
-GEN_SES_STATUS_INITIATOR_PORT_ACCESSORS(fail,    FAIL)
-GEN_SES_STATUS_INITIATOR_PORT_ACCESSORS(report,  REPORT)
-GEN_SES_STATUS_INITIATOR_PORT_ACCESSORS(enabled, ENABLED)
-#undef GEN_SES_STATUS_INITIATOR_PORT_ACCESSORS
-
-/*-------------------- Simple Subenclosure Status Element --------------------*/
-struct ses_status_simple_subses {
-	struct ses_status_common common;
-	uint8_t bytes[2];
-	uint8_t short_enclosure_status;
-};
-
-enum ses_status_simple_subses_field_data {
-	SES_STATUS_SIMPlE_SUBSES_IDENT_BYTE	= 0,
-	SES_STATUS_SIMPlE_SUBSES_IDENT_MASK	= 0x80,
-	SES_STATUS_SIMPlE_SUBSES_IDENT_SHIFT	= 7,
-
-	SES_STATUS_SIMPlE_SUBSES_FAIL_BYTE	= 0,
-	SES_STATUS_SIMPlE_SUBSES_FAIL_MASK	= 0x40,
-	SES_STATUS_SIMPlE_SUBSES_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_STATUS_SIMPlE_SUBSES_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_simple_subses, SES_STATUS_SIMPlE_SUBSES,	\
-		  LCASE, UCASE)
-GEN_SES_STATUS_SIMPlE_SUBSES_ACCESSORS(ident, IDENT)
-GEN_SES_STATUS_SIMPlE_SUBSES_ACCESSORS(fail,  FAIL)
-#undef GEN_SES_STATUS_SIMPlE_SUBSES_ACCESSORS
-
-/*----------------------- SAS Expander Status Element ------------------------*/
-struct ses_status_sas_expander {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_sas_expander_field_data {
-	SES_STATUS_SAS_EXPANDER_IDENT_BYTE	= 0,
-	SES_STATUS_SAS_EXPANDER_IDENT_MASK	= 0x80,
-	SES_STATUS_SAS_EXPANDER_IDENT_SHIFT	= 7,
-
-	SES_STATUS_SAS_EXPANDER_FAIL_BYTE	= 0,
-	SES_STATUS_SAS_EXPANDER_FAIL_MASK	= 0x40,
-	SES_STATUS_SAS_EXPANDER_FAIL_SHIFT	= 6
-};
-
-#define GEN_SES_STATUS_SAS_EXPANDER_ACCESSORS(LCASE, UCASE)	\
-    GEN_GETTER(ses_status_sas_expander, SES_STATUS_SAS_EXPANDER,	LCASE, UCASE)
-GEN_SES_STATUS_SAS_EXPANDER_ACCESSORS(ident, IDENT)
-GEN_SES_STATUS_SAS_EXPANDER_ACCESSORS(fail,  FAIL)
-#undef GEN_SES_STATUS_SAS_EXPANDER_ACCESSORS
-
-/*----------------------- SAS Connector Status Element -----------------------*/
-struct ses_status_sas_connector {
-	struct ses_status_common common;
-	uint8_t bytes[3];
-};
-
-enum ses_status_sas_connector_field_data {
-	SES_STATUS_SAS_CONNECTOR_IDENT_BYTE		= 0,
-	SES_STATUS_SAS_CONNECTOR_IDENT_MASK		= 0x80,
-	SES_STATUS_SAS_CONNECTOR_IDENT_SHIFT		= 7,
-
-	SES_STATUS_SAS_CONNECTOR_TYPE_BYTE		= 0,
-	SES_STATUS_SAS_CONNECTOR_TYPE_MASK		= 0x7F,
-	SES_STATUS_SAS_CONNECTOR_TYPE_SHIFT		= 0,
-
-	SES_STATUS_SAS_CONNECTOR_PHYS_LINK_BYTE		= 1,
-	SES_STATUS_SAS_CONNECTOR_PHYS_LINK_MASK		= 0xFF,
-	SES_STATUS_SAS_CONNECTOR_PHYS_LINK_SHIFT	= 0,
-	SES_STATUS_SAS_CONNECTOR_PHYS_LINK_ALL		= 0xFF,
-
-	SES_STATUS_SAS_CONNECTOR_FAIL_BYTE		= 2,
-	SES_STATUS_SAS_CONNECTOR_FAIL_MASK		= 0x40,
-	SES_STATUS_SAS_CONNECTOR_FAIL_SHIFT		= 6,
-};
-
-#define GEN_SES_STATUS_SAS_CONNECTOR_ACCESSORS(LCASE, UCASE)		\
-    GEN_GETTER(ses_status_sas_connector, SES_STATUS_SAS_CONNECTOR,	\
-		  LCASE, UCASE)
-GEN_SES_STATUS_SAS_CONNECTOR_ACCESSORS(ident,     IDENT)
-GEN_SES_STATUS_SAS_CONNECTOR_ACCESSORS(type,      TYPE)
-GEN_SES_STATUS_SAS_CONNECTOR_ACCESSORS(phys_link, PHYS_LINK)
-GEN_SES_STATUS_SAS_CONNECTOR_ACCESSORS(fail,      FAIL)
-#undef GEN_SES_STATUS_SAS_CONNECTOR_ACCESSORS
-
-/*------------------------- Universal Status Element -------------------------*/
-union ses_status_element {
-	struct ses_status_common            common;
-	struct ses_status_dev_slot          dev_slot;
-	struct ses_status_array_dev_slot    array_dev_slot;
-	struct ses_status_power_supply      power_supply;
-	struct ses_status_cooling           cooling;
-	struct ses_status_temp_sensor       temp_sensor;
-	struct ses_status_door_lock         door_lock;
-	struct ses_status_audible_alarm     audible_alarm;
-	struct ses_status_ecc_electronics   ecc_electronics;
-	struct ses_status_scc_electronics   scc_electronics;
-	struct ses_status_nv_cache          nv_cache;
-	struct ses_status_invalid_op_reason invalid_op_reason;
-	struct ses_status_ups               ups;
-	struct ses_status_display           display;
-	struct ses_status_key_pad_entry     key_pad_entry;
-	struct ses_status_scsi_port_or_xcvr scsi_port_or_xcvr;
-	struct ses_status_language          language;
-	struct ses_status_comm_port         comm_port;
-	struct ses_status_voltage_sensor    voltage_sensor;
-	struct ses_status_current_sensor    current_sensor;
-	struct ses_status_target_port       target_port;
-	struct ses_status_initiator_port    initiator_port;
-	struct ses_status_simple_subses     simple_subses;
-	struct ses_status_sas_expander      sas_expander;
-	struct ses_status_sas_connector     sas_connector;
-	uint8_t				    bytes[4];
-};
-
-/*===================== SCSI SES Status Diagnostic Page =====================*/
-struct ses_status_page {
-	struct ses_page_hdr  hdr;
-	union ses_status_element  elements[];
-};
-
-enum ses_status_page_field_data {
-	SES_STATUS_PAGE_INVOP_MASK	= 0x10,
-	SES_STATUS_PAGE_INVOP_SHIFT	= 4,
-
-	SES_STATUS_PAGE_INFO_MASK	= 0x08,
-	SES_STATUS_PAGE_INFO_SHIFT	= 3,
-
-	SES_STATUS_PAGE_NON_CRIT_MASK	= 0x04,
-	SES_STATUS_PAGE_NON_CRIT_SHIFT	= 2,
-
-	SES_STATUS_PAGE_CRIT_MASK	= 0x02,
-	SES_STATUS_PAGE_CRIT_SHIFT	= 1,
-
-	SES_STATUS_PAGE_UNRECOV_MASK	= 0x01,
-	SES_STATUS_PAGE_UNRECOV_SHIFT	= 0,
-
-	SES_STATUS_PAGE_CHANGED_MASK	= SES_STATUS_PAGE_INVOP_MASK
-					| SES_STATUS_PAGE_INFO_MASK
-					| SES_STATUS_PAGE_NON_CRIT_MASK
-					| SES_STATUS_PAGE_CRIT_MASK
-					| SES_STATUS_PAGE_UNRECOV_MASK,
-	SES_STATUS_PAGE_CHANGED_SHIFT	= 0,
-};
-
-#define GEN_SES_STATUS_PAGE_ACCESSORS(LCASE, UCASE) \
-    GEN_HDR_ACCESSORS(ses_status_page, SES_STATUS_PAGE, LCASE, UCASE)
-
-GEN_SES_STATUS_PAGE_ACCESSORS(invop,    INVOP)
-GEN_SES_STATUS_PAGE_ACCESSORS(info,     INFO)
-GEN_SES_STATUS_PAGE_ACCESSORS(non_crit, NON_CRIT)
-GEN_SES_STATUS_PAGE_ACCESSORS(crit,     CRIT)
-GEN_SES_STATUS_PAGE_ACCESSORS(unrecov,  UNRECOV)
-GEN_SES_STATUS_PAGE_ACCESSORS(changed,  CHANGED)
-#undef GEN_SES_STATUS_PAGE_ACCESSORS
-
-/*================ SCSI SES Element Descriptor Diagnostic Page ===============*/
-struct ses_elem_descr {
-	uint8_t	reserved[2];
-	uint8_t	length[2];
-	char	description[];
-};
-
-struct ses_elem_descr_page {
-	struct ses_page_hdr   hdr;
-	struct ses_elem_descr descrs[];
-};
-
-/*============ SCSI SES Additional Element Status Diagnostic Page ============*/
-struct ses_addl_elem_status_page {
-	struct ses_page_hdr   hdr;
-};
-
-/*====================== Legacy (Deprecated) Structures ======================*/
-struct ses_control_page_hdr {
-	uint8_t page_code;
-	uint8_t control_flags;
-	uint8_t length[2];
-	uint8_t gen_code[4];
-/* Followed by variable length array of descriptors. */
-};
-
-struct ses_status_page_hdr {
-	uint8_t page_code;
-	uint8_t status_flags;
-	uint8_t length[2];
-	uint8_t gen_code[4];
-/* Followed by variable length array of descriptors. */
-};
-
-/* ses_page_hdr.reserved values */
-/*
- * Enclosure Status Diagnostic Page:
- * uint8_t	reserved : 3,
- * 		invop : 1,
- * 		info : 1,
- * 		noncritical : 1,
- * 		critical : 1,
- * 		unrecov : 1;
- */
-#define	SES_ENCSTAT_UNRECOV		0x01
-#define	SES_ENCSTAT_CRITICAL		0x02
-#define	SES_ENCSTAT_NONCRITICAL		0x04
-#define	SES_ENCSTAT_INFO		0x08
-#define	SES_ENCSTAT_INVOP		0x10
-/* Status mask: All of the above OR'd together */
-#define	SES_STATUS_MASK			0x1f
-#define	SES_SET_STATUS_MASK		0xf
-/* Element Descriptor Diagnostic Page: unused */
-/* Additional Element Status Diagnostic Page: unused */
-
-
-
-/* Summary SES Status Defines, Common Status Codes */
-#define	SES_OBJSTAT_UNSUPPORTED		0
-#define	SES_OBJSTAT_OK			1
-#define	SES_OBJSTAT_CRIT		2
-#define	SES_OBJSTAT_NONCRIT		3
-#define	SES_OBJSTAT_UNRECOV		4
-#define	SES_OBJSTAT_NOTINSTALLED	5
-#define	SES_OBJSTAT_UNKNOWN		6
-#define	SES_OBJSTAT_NOTAVAIL		7
-#define	SES_OBJSTAT_NOACCESS		8
-
-/*
- * For control pages, cstat[0] is the same for the
- * enclosure and is common across all device types.
- *
- * If SESCTL_CSEL is set, then PRDFAIL, DISABLE and RSTSWAP
- * are checked, otherwise bits that are specific to the device
- * type in the other 3 bytes of cstat or checked.
- */
-#define	SESCTL_CSEL		0x80
-#define	SESCTL_PRDFAIL		0x40
-#define	SESCTL_DISABLE		0x20
-#define	SESCTL_RSTSWAP		0x10
-
-
-/* Control bits, Device Elements, byte 2 */
-#define	SESCTL_DRVLCK	0x40	/* "DO NOT REMOVE" */
-#define	SESCTL_RQSINS	0x08	/* RQST INSERT */
-#define	SESCTL_RQSRMV	0x04	/* RQST REMOVE */
-#define	SESCTL_RQSID	0x02	/* RQST IDENT */
-/* Control bits, Device Elements, byte 3 */
-#define	SESCTL_RQSFLT	0x20	/* RQST FAULT */
-#define	SESCTL_DEVOFF	0x10	/* DEVICE OFF */
-
-/* Control bits, Generic, byte 3 */
-#define	SESCTL_RQSTFAIL	0x40
-#define	SESCTL_RQSTON	0x20
-
-/*
- * Getting text for an object type is a little
- * trickier because it's string data that can
- * go up to 64 KBytes. Build this union and
- * fill the obj_id with the id of the object who's
- * help text you want, and if text is available,
- * obj_text will be filled in, null terminated.
- */
-
-typedef union {
-	unsigned int obj_id;
-	char obj_text[1];
-} ses_hlptxt;
-
-/*============================================================================*/
-struct ses_elm_desc_hdr {
-	uint8_t reserved[2];
-	uint8_t length[2];
-};
-
-/*
- * SES v2 r20 6.1.13 - Element Additional Status diagnostic page
- * Tables 26-28 (general), 29-32 (FC), 33-41 (SAS)
- *
- * Protocol identifier uses definitions in scsi_all.h;
- * SPSP_PROTO_FC, SPSP_PROTO_SAS are the only ones used here.
- */
-
-struct ses_elm_fc_eip_hdr {
-	uint8_t num_phys;
-	uint8_t reserved[2];
-	uint8_t dev_slot_num;
-	uint8_t node_name[8];
-};
-
-struct ses_elm_fc_noneip_hdr {
-	uint8_t num_phys;
-	uint8_t reserved;
-	uint8_t node_name[8];
-};
-
-struct ses_elm_fc_base_hdr {
-	uint8_t num_phys;
-};
-
-union ses_elm_fc_hdr {
-	struct ses_elm_fc_base_hdr	base_hdr;
-	struct ses_elm_fc_eip_hdr	eip_hdr;
-	struct ses_elm_fc_noneip_hdr	noneip_hdr;
-};
-
-struct ses_elm_fc_port {
-	uint8_t port_loop_position;
-	uint8_t bypass_reason;
-#define SES_FC_PORT_BYPASS_UNBYPASSED			0x00
-
-#define	SES_FC_PORT_BYPASS_LINKFAIL_RATE_TOO_HIGH	0x10
-#define	SES_FC_PORT_BYPASS_SYNC_LOSS_RATE_TOO_HIGH	0x11
-#define	SES_FC_PORT_BYPASS_SIGNAL_LOSS_RATE_TOO_HIGH	0x12
-#define	SES_FC_PORT_BYPASS_SEQPROTO_ERR_RATE_TOO_HIGH	0x13
-#define	SES_FC_PORT_BYPASS_INVAL_XMIT_RATE_TOO_HIGH	0x14
-#define	SES_FC_PORT_BYPASS_CRC_ERR_RATE_TOO_HIGH	0x15
-
-#define	SES_FC_PORT_BYPASS_ERR_RATE_RESERVED_BEGIN	0x16
-#define	SES_FC_PORT_BYPASS_ERR_RATE_RESERVED_END	0x1F
-
-#define	SES_FC_PORT_BYPASS_LINKFAIL_COUNT_TOO_HIGH	0x20
-#define	SES_FC_PORT_BYPASS_SYNC_LOSS_COUNT_TOO_HIGH	0x21
-#define	SES_FC_PORT_BYPASS_SIGNAL_LOSS_COUNT_TOO_HIGH	0x22
-#define	SES_FC_PORT_BYPASS_SEQPROTO_ERR_COUNT_TOO_HIGH	0x23
-#define	SES_FC_PORT_BYPASS_INVAL_XMIT_COUNT_TOO_HIGH	0x24
-#define	SES_FC_PORT_BYPASS_CRC_ERR_COUNT_TOO_HIGH	0x25
-
-#define	SES_FC_PORT_BYPASS_ERR_COUNT_RESERVED_BEGIN	0x26
-#define	SES_FC_PORT_BYPASS_ERR_COUNT_RESERVED_END	0x2F
-
-#define	SES_FC_PORT_BYPASS_RESERVED_BEGIN		0x30
-#define	SES_FC_PORT_BYPASS_RESERVED_END			0xBF
-
-#define	SES_FC_PORT_BYPASS_VENDOR_SPECIFIC_BEGIN	0xC0
-#define	SES_FC_PORT_BYPASS_VENDOR_SPECIFIC_END		0xFF
-	uint8_t port_req_hard_addr;
-	uint8_t n_port_id[3];
-	uint8_t n_port_name[8];
-};
-
-struct ses_elm_sas_device_phy {
-	uint8_t byte0;
-	/*
-	 * uint8_t reserved0 : 1,
-	 * uint8_t device_type : 3,
-	 * uint8_t reserved1 : 4;
-	 */
-
-	uint8_t reserved0;
-
-	/* Bit positions for initiator and target port protocols */
-#define	SES_SASOBJ_DEV_PHY_SMP		0x2
-#define	SES_SASOBJ_DEV_PHY_STP		0x4
-#define	SES_SASOBJ_DEV_PHY_SSP		0x8
-	/* Select all of the above protocols */
-#define	SES_SASOBJ_DEV_PHY_PROTOMASK	0xe
-	uint8_t initiator_ports;
-	/*
-	 * uint8_t reserved0 : 4,
-	 * uint8_t ssp : 1,
-	 * uint8_t stp : 1,
-	 * uint8_t smp : 1,
-	 * uint8_t reserved1 : 3;
-	 */
-	uint8_t target_ports;
-	/*
-	 * uint8_t sata_port_selector : 1,
-	 * uint8_t reserved : 3,
-	 * uint8_t ssp : 1,
-	 * uint8_t stp : 1,
-	 * uint8_t smp : 1,
-	 * uint8_t sata_device : 1;
-	 */
-	uint8_t parent_addr[8];		/* SAS address of parent */
-	uint8_t phy_addr[8];		/* SAS address of this phy */
-	uint8_t phy_id;
-	uint8_t reserved1[7];
-};
-#ifdef _KERNEL
-int ses_elm_sas_dev_phy_sata_dev(struct ses_elm_sas_device_phy *);
-int ses_elm_sas_dev_phy_sata_port(struct ses_elm_sas_device_phy *);
-int ses_elm_sas_dev_phy_dev_type(struct ses_elm_sas_device_phy *);
-#endif	/* _KERNEL */
-
-struct ses_elm_sas_expander_phy {
-	uint8_t connector_index;
-	uint8_t other_index;
-};
-
-struct ses_elm_sas_port_phy {
-	uint8_t phy_id;
-	uint8_t reserved;
-	uint8_t connector_index;
-	uint8_t other_index;
-	uint8_t phy_addr[8];
-};
-
-struct ses_elm_sas_type0_base_hdr {
-	uint8_t num_phys;
-	uint8_t byte1;
-	/*
-	 * uint8_t descriptor_type : 2,
-	 * uint8_t reserved : 5,
-	 * uint8_t not_all_phys : 1;
-	 */
-#define	SES_SASOBJ_TYPE0_NOT_ALL_PHYS(obj)	\
-	((obj)->byte1 & 0x1)
-};
-
-struct ses_elm_sas_type0_eip_hdr {
-	struct ses_elm_sas_type0_base_hdr base;
-	uint8_t reserved;
-	uint8_t dev_slot_num;
-};
-
-struct ses_elm_sas_type1_expander_hdr {
-	uint8_t num_phys;
-	uint8_t byte1;
-	/*
-	 * uint8_t descriptor_type : 2,
-	 * uint8_t reserved : 6;
-	 */
-	uint8_t reserved[2];
-	uint8_t sas_addr[8];
-};
-
-struct ses_elm_sas_type1_nonexpander_hdr {
-	uint8_t num_phys;
-	uint8_t byte1;
-	/*
-	 * uint8_t descriptor_type : 2,
-	 * uint8_t reserved : 6;
-	 */
-	uint8_t reserved[2];
-};
-
-/* NB: This is only usable for as long as the headers happen to match */
-struct ses_elm_sas_base_hdr {
-	uint8_t num_phys;
-	uint8_t byte1;
-	/*
-	 * uint8_t descriptor_type : 2,
-	 * uint8_t descr_specific : 6;
-	 */
-#define	SES_SASOBJ_TYPE_SLOT	0
-#define	SES_SASOBJ_TYPE_OTHER	1
-};
-
-union ses_elm_sas_hdr {
-	struct ses_elm_sas_base_hdr 			base_hdr;
-	struct ses_elm_sas_type0_base_hdr		type0_noneip;
-	struct ses_elm_sas_type0_eip_hdr		type0_eip;
-	struct ses_elm_sas_type1_expander_hdr		type1_exp;
-	struct ses_elm_sas_type1_nonexpander_hdr	type1_nonexp;
-};
-int ses_elm_sas_type0_not_all_phys(union ses_elm_sas_hdr *);
-int ses_elm_sas_descr_type(union ses_elm_sas_hdr *);
-
-struct ses_elm_addlstatus_base_hdr {
-	uint8_t byte0;
-	/*
-	 * uint8_t invalid : 1,
-	 * uint8_t reserved : 2,
-	 * uint8_t eip : 1,
-	 * uint8_t proto_id : 4;
-	 */
-	uint8_t length;
-};
-int ses_elm_addlstatus_proto(struct ses_elm_addlstatus_base_hdr *);
-int ses_elm_addlstatus_eip(struct ses_elm_addlstatus_base_hdr *);
-int ses_elm_addlstatus_invalid(struct ses_elm_addlstatus_base_hdr *);
-
-struct ses_elm_addlstatus_eip_hdr {
-	struct ses_elm_addlstatus_base_hdr base;
-	uint8_t reserved;
-	uint8_t element_index;
-	/* NB: This define (currently) applies to all eip=1 headers */
-#define	SES_EIP_HDR_EXTRA_LEN	2
-};
-
-union ses_elm_addlstatus_descr_hdr {
-	struct ses_elm_addlstatus_base_hdr	base;
-	struct ses_elm_addlstatus_eip_hdr	eip;
-};
-
-union ses_elm_addlstatus_proto_hdr {
-	union ses_elm_fc_hdr	fc;
-	union ses_elm_sas_hdr	sas;
-};
-
-/*============================= Namespace Cleanup ============================*/
-#undef GEN_HDR_ACCESSORS
-#undef GEN_ACCESSORS
-#undef GEN_HDR_SETTER
-#undef GEN_HDR_GETTER
-#undef GEN_SETTER
-#undef GEN_GETTER
-#undef MK_ENUM
-
-#endif	/* _SCSI_SES_H_ */
diff --git a/include.new/cam/scsi/scsi_sg.h b/include.new/cam/scsi/scsi_sg.h
deleted file mode 100644
index 0064507..0000000
--- a/include.new/cam/scsi/scsi_sg.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Structures and definitions for SCSI commands to the SG passthrough device.
- *
- * $FreeBSD: releng/10.2/sys/cam/scsi/scsi_sg.h 268139 2014-07-02 10:16:12Z mav $
- */
-
-#ifndef _SCSI_SG_H
-#define _SCSI_SG_H
-
-#define SGIOC	'"'
-#define SG_SET_TIMEOUT		_IOW(SGIOC, 0x01, u_int)
-#define SG_GET_TIMEOUT		_IO(SGIOC, 0x02)
-#define SG_EMULATED_HOST	_IOR(SGIOC, 0x03, int)
-#define SG_SET_TRANSFORM	_IO(SGIOC, 0x04)
-#define SG_GET_TRANSFORM	_IO(SGIOC, 0x05)
-#define SG_GET_COMMAND_Q	_IOW(SGIOC, 0x70, int)
-#define SG_SET_COMMAND_Q	_IOR(SGIOC, 0x71, int)
-#define SG_GET_RESERVED_SIZE	_IOR(SGIOC, 0x72, int)
-#define SG_SET_RESERVED_SIZE	_IOW(SGIOC, 0x75, int)
-#define SG_GET_SCSI_ID		_IOR(SGIOC, 0x76, struct sg_scsi_id)
-#define SG_SET_FORCE_LOW_DMA	_IOW(SGIOC, 0x79, int)
-#define SG_GET_LOW_DMA		_IOR(SGIOC, 0x7a, int)
-#define SG_SET_FORCE_PACK_ID	_IOW(SGIOC, 0x7b, int)
-#define SG_GET_PACK_ID		_IOR(SGIOC, 0x7c, int)
-#define SG_GET_NUM_WAITING	_IOR(SGIOC, 0x7d, int)
-#define SG_SET_DEBUG		_IOW(SGIOC, 0x7e, int)
-#define SG_GET_SG_TABLESIZE	_IOR(SGIOC, 0x7f, int)
-#define SG_GET_VERSION_NUM	_IOR(SGIOC, 0x82, int)
-#define SG_NEXT_CMD_LEN		_IOW(SGIOC, 0x83, int)
-#define SG_SCSI_RESET		_IOW(SGIOC, 0x84, int)
-#define SG_IO			_IOWR(SGIOC, 0x85, struct sg_io_hdr)
-#define SG_GET_REQUEST_TABLE	_IO(SGIOC, 0x86)
-#define SG_SET_KEEP_ORPHAN	_IOW(SGIOC, 0x87, int)
-#define SG_GET_KEEP_ORPHAN	_IOR(SGIOC, 0x88, int)
-#define SG_GET_ACCESS_COUNT	_IOR(SGIOC, 0x89, int)
-
-struct sg_io_hdr {
-	int		interface_id;
-	int		dxfer_direction;
-	u_char		cmd_len;
-	u_char		mx_sb_len;
-	u_short		iovec_count;
-	u_int		dxfer_len;
-	void		*dxferp;
-	u_char		*cmdp;
-	u_char		*sbp;
-	u_int		timeout;
-	u_int		flags;
-	int		pack_id;
-	void		*usr_ptr;
-	u_char		status;
-	u_char		masked_status;
-	u_char		msg_status;
-	u_char		sb_len_wr;
-	u_short		host_status;
-	u_short		driver_status;
-	int		resid;
-	u_int		duration;
-	u_int		info;
-};
-
-struct sg_io_hdr32 {
-	int		interface_id;
-	int		dxfer_direction;
-	u_char		cmd_len;
-	u_char		mx_sb_len;
-	u_short		iovec_count;
-	u_int		dxfer_len;
-	uint32_t	dxferp;
-	uint32_t	cmdp;
-	uint32_t	sbp;
-	u_int		timeout;
-	u_int		flags;
-	int		pack_id;
-	uint32_t	usr_ptr;
-	u_char		status;
-	u_char		masked_status;
-	u_char		msg_status;
-	u_char		sb_len_wr;
-	u_short		host_status;
-	u_short		driver_status;
-	int		resid;
-	u_int		duration;
-	u_int		info;
-};
-
-#define SG_DXFER_NONE		-1
-#define SG_DXFER_TO_DEV		-2
-#define SG_DXFER_FROM_DEV	-3
-#define SG_DXFER_TO_FROM_DEV	-4
-#define SG_DXFER_UNKNOWN	-5
-
-#define SG_MAX_SENSE 16
-struct sg_header {
-	int		pack_len;
-	int		reply_len;
-	int		pack_id;
-	int		result;
-	u_int		twelve_byte:1;
-	u_int		target_status:5;
-	u_int		host_status:8;
-	u_int		driver_status:8;
-	u_int		other_flags:10;
-	u_char		sense_buffer[SG_MAX_SENSE];
-};
-
-struct sg_scsi_id {
-	int		host_no;
-	int		channel;
-	int		scsi_id;
-	int		lun;
-	int		scsi_type;
-	short		h_cmd_per_lun;
-	short		d_queue_depth;
-	int		unused[2];
-};
-
-struct scsi_idlun {
-	uint32_t	dev_id;
-	uint32_t	host_unique_id;
-};
-
-/*
- * Host codes
- */
-#define DID_OK		0x00	/* OK */
-#define DID_NO_CONNECT	0x01	/* timeout during connect */
-#define DID_BUS_BUSY	0x02	/* timeout during command */
-#define DID_TIME_OUT	0x03	/* other timeout */
-#define DID_BAD_TARGET	0x04	/* bad target */
-#define DID_ABORT	0x05	/* abort */
-#define DID_PARITY	0x06	/* parity error */
-#define DID_ERROR	0x07	/* internal error */
-#define DID_RESET	0x08	/* reset by somebody */
-#define DID_BAD_INTR	0x09	/* unexpected interrupt */
-#define DID_PASSTHROUGH	0x0a	/* passthrough */
-#define DID_SOFT_ERROR	0x0b	/* low driver wants retry */
-#define DID_IMM_RETRY	0x0c	/* retry without decreasing retrycnt */
-
-/*
- * Driver codes
- */
-#define DRIVER_OK	0x00
-#define DRIVER_BUSY	0x01
-#define DRIVER_SOFT	0x02
-#define DRIVER_MEDIA	0x03
-#define DRIVER_ERROR	0x04
-
-#define DRIVER_INVALID	0x05
-#define DRIVER_TIMEOUT	0x06
-#define DRIVER_HARD	0x07
-#define DRIVER_SENSE	0x08
-
-#define SUGGEST_RETRY	0x10
-#define SUGGEST_ABORT	0x20
-#define SUGGEST_REMAP	0x30
-#define SUGGEST_DIE	0x40
-#define SUGGEST_SENSE	0x80
-#define SUGGEST_IS_OK	0xff
-
-#define DRIVER_MASK	0x0f
-#define SUGGEST_MASK	0xf0
-
-/* Other definitions */
-/* HZ isn't always available, so simulate it */
-#define SG_DEFAULT_HZ		1000
-#define SG_DEFAULT_TIMEOUT	(60*SG_DEFAULT_HZ)
-
-#endif /* !_SCSI_SG_H */
diff --git a/include.new/cam/scsi/scsi_targetio.h b/include.new/cam/scsi/scsi_targetio.h
deleted file mode 100644
index 0484b28..0000000
--- a/include.new/cam/scsi/scsi_targetio.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Ioctl definitions for the SCSI Target Driver
- *
- * Copyright (c) 2002 Nate Lawson.
- * Copyright (c) 1998 Justin T. Gibbs.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/cam/scsi/scsi_targetio.h 139743 2005-01-05 22:34:37Z imp $
- */
-
-#ifndef _CAM_SCSI_SCSI_TARGETIO_H_
-#define _CAM_SCSI_SCSI_TARGETIO_H_
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-#include <cam/cam.h>
-#include <cam/cam_ccb.h>
-
-/*
- * CCBs (ATIO, CTIO, INOT, REL_SIMQ) are sent to the kernel driver
- * by writing one or more pointers.  The user receives notification
- * of CCB completion through poll/select/kqueue and then calls
- * read(2) which outputs pointers to the completed CCBs.
- */
-
-/*
- * Enable and disable a target mode instance.  For enabling, the path_id,
- * target_id, and lun_id fields must be set.  The grp6/7_len fields
- * specify the length of vendor-specific CDBs the target expects and
- * should normally be set to 0.  On successful completion
- * of enable, the specified target instance will answer selection.
- * Disable causes the target instance to abort any outstanding commands
- * and stop accepting new ones.  The aborted CCBs will be returned to
- * the user via read(2) or discarded if the user closes the device.
- * The user can then re-enable the device for a new path.
- */
-struct ioc_enable_lun {
-	path_id_t	path_id;
-	target_id_t	target_id;
-	lun_id_t	lun_id;
-	int		grp6_len;
-	int		grp7_len;
-};
-#define TARGIOCENABLE	_IOW('C', 5, struct ioc_enable_lun)
-#define TARGIOCDISABLE	 _IO('C', 6)
-
-/*
- * Set/clear debugging for this target mode instance
- */
-#define	TARGIOCDEBUG	_IOW('C', 7, int)
-
-TAILQ_HEAD(ccb_queue, ccb_hdr);
-
-#endif /* _CAM_SCSI_SCSI_TARGETIO_H_ */
diff --git a/include.new/cam/scsi/smp_all.h b/include.new/cam/scsi/smp_all.h
deleted file mode 100644
index bb1d5e9..0000000
--- a/include.new/cam/scsi/smp_all.h
+++ /dev/null
@@ -1,520 +0,0 @@
-/*-
- * Copyright (c) 2010 Spectra Logic Corporation
- * 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,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
- *
- * $Id: //depot/users/kenm/FreeBSD-test/sys/cam/scsi/smp_all.h#4 $
- * $FreeBSD: releng/10.2/sys/cam/scsi/smp_all.h 216088 2010-11-30 22:39:46Z ken $
- */
-
-/*
- * Serial Management Protocol definitions.
- */
-
-#ifndef	_SCSI_SMP_ALL_H
-#define	_SCSI_SMP_ALL_H	1
-
-#define	SMP_FRAME_TYPE_REQUEST	0x40
-#define	SMP_FRAME_TYPE_RESPONSE	0x41
-#define	SMP_WORD_LEN		4
-#define	SMP_CRC_LEN		4
-
-/*
- * SMP Functions (current as of SPL Revision 7)
- */
-/* 0x00 to 0x7f: SMP input functions */
-/* 0x00 to 0x0f: General SMP input functions */
-#define	SMP_FUNC_REPORT_GENERAL		0x00
-#define	SMP_FUNC_REPORT_MANUF_INFO	0x01
-#define	SMP_FUNC_REPORT_SC_STATUS	0x03
-#define	SMP_FUNC_REPORT_ZONE_PERM_TBL	0x04
-#define	SMP_FUNC_REPORT_ZONE_MAN_PWD	0x05
-#define	SMP_FUNC_REPORT_BROADCAST	0x06
-
-/* 0x10 to 0x1f: Phy-based SMP input functions */
-#define	SMP_FUNC_DISCOVER		0x10
-#define	SMP_FUNC_REPORT_PHY_ERR_LOG	0x11
-#define	SMP_FUNC_REPORT_PHY_SATA	0x12
-#define	SMP_FUNC_REPORT_ROUTE_INFO	0x13
-#define	SMP_FUNC_REPORT_PHY_EVENT	0x14
-
-/* 0x20 to 0x2f: Descriptor list-based SMP input functions */
-#define	SMP_FUNC_DISCOVER_LIST		0x20
-#define	SMP_FUNC_REPORT_PHY_EVENT_LIST	0x21
-#define	SMP_FUNC_REPORT_EXP_RTL		0x22
-
-/* 0x30 to 0x3f: Reserved for SMP input functions */
-/* 0x40 to 0x7f: Vendor specific */
-
-/* 0x80 to 0xff: SMP output functions */
-/* 0x80 to 0x8f: General SMP output functions */
-#define	SMP_FUNC_CONFIG_GENERAL		0x80
-#define	SMP_FUNC_ENABLE_DISABLE_ZONING	0x81
-#define	SMP_FUNC_ZONED_BROADCAST	0x85
-#define	SMP_FUNC_ZONE_LOCK		0x86
-#define	SMP_FUNC_ZONE_ACTIVATE		0x87
-#define	SMP_FUNC_ZONE_UNLOCK		0x88
-#define	SMP_FUNC_CONFIG_ZM_PWD		0x89
-#define	SMP_FUNC_CONFIG_ZONE_PHY_INFO	0x8a
-#define	SMP_FUNC_CONFIG_ZONE_PERM_TBL	0x8b
-
-/* 0x90 to 0x9f: Phy-based SMP output functions */
-#define	SMP_FUNC_CONFIG_ROUTE_INFO	0x90
-#define	SMP_FUNC_PHY_CONTROL		0x91
-#define	SMP_FUNC_PHY_TEST_FUNC		0x92
-#define	SMP_FUNC_CONFIG_PHY_EVENT	0x93
-
-/* 0xa0 to 0xbf: Reserved for SMP output functions */
-/* 0xc0 to 0xff: Vendor specific */
-
-/*
- * Function Results (current as of SPL Revision 7)
- */
-#define	SMP_FR_ACCEPTED			0x00
-#define	SMP_FR_UNKNOWN_FUNC		0x01
-#define	SMP_FR_FUNCTION_FAILED		0x02
-#define	SMP_FR_INVALID_REQ_FRAME_LEN	0x03
-#define	SMP_FR_INVALID_EXP_CHG_CNT	0x04
-#define	SMP_FR_BUSY			0x05
-#define	SMP_FR_INCOMPLETE_DESC_LIST	0x06
-#define	SMP_FR_PHY_DOES_NOT_EXIST	0x10
-#define	SMP_FR_INDEX_DOES_NOT_EXIST	0x11
-#define	SMP_FR_PHY_DOES_NOT_SUP_SATA	0x12
-#define	SMP_FR_UNKNOWN_PHY_OP		0x13
-#define	SMP_FR_UNKNOWN_PHY_TEST_FUNC	0x14
-#define	SMP_FR_PHY_TEST_FUNC_INPROG	0x15
-#define	SMP_FR_PHY_VACANT		0x16
-#define	SMP_FR_UNKNOWN_PHY_EVENT_SRC	0x17
-#define	SMP_FR_UNKNOWN_DESC_TYPE	0x18
-#define	SMP_FR_UNKNOWN_PHY_FILTER	0x19
-#define	SMP_FR_AFFILIATION_VIOLATION	0x1a
-#define	SMP_FR_SMP_ZONE_VIOLATION	0x20
-#define	SMP_FR_NO_MGMT_ACCESS_RIGHTS	0x21
-#define	SMP_FR_UNKNOWN_ED_ZONING_VAL	0x22
-#define	SMP_FR_ZONE_LOCK_VIOLATION	0x23
-#define	SMP_FR_NOT_ACTIVATED		0x24
-#define	SMP_FR_ZG_OUT_OF_RANGE		0x25
-#define	SMP_FR_NO_PHYS_PRESENCE		0x26
-#define	SMP_FR_SAVING_NOT_SUP		0x27
-#define	SMP_FR_SRC_ZONE_DNE		0x28
-#define	SMP_FR_DISABLED_PWD_NOT_SUP	0x29
-
-/*
- * REPORT GENERAL request and response, current as of SPL Revision 7.
- */
-struct smp_report_general_request
-{
-	uint8_t	frame_type;
-	uint8_t	function;
-	uint8_t	response_len;
-	uint8_t	request_len;
-	uint8_t	crc[4];
-};
-
-struct smp_report_general_response
-{
-	uint8_t	frame_type;
-	uint8_t	function;
-	uint8_t	function_result;
-	uint8_t	response_len;
-#define	SMP_RG_RESPONSE_LEN		0x11
-	uint8_t	expander_change_count[2];
-	uint8_t	expander_route_indexes[2];
-	uint8_t	long_response;
-#define	SMP_RG_LONG_RESPONSE		0x80
-	uint8_t	num_phys;
-	uint8_t	config_bits0;
-#define	SMP_RG_TABLE_TO_TABLE_SUP	0x80
-#define	SMP_RG_ZONE_CONFIGURING		0x40
-#define	SMP_RG_SELF_CONFIGURING		0x20
-#define	SMP_RG_STP_CONTINUE_AWT		0x10
-#define	SMP_RG_OPEN_REJECT_RETRY_SUP	0x08
-#define	SMP_RG_CONFIGURES_OTHERS	0x04
-#define	SMP_RG_CONFIGURING		0x02
-#define	SMP_RG_EXT_CONFIG_ROUTE_TABLE	0x01
-	uint8_t	reserved0;
-	uint8_t	encl_logical_id[8];
-	uint8_t	reserved1[8];
-	uint8_t	reserved2[2];
-	uint8_t	stp_bus_inact_time_limit[2];
-	uint8_t	stp_max_conn_time_limit[2];
-	uint8_t	stp_smp_it_nexus_loss_time[2];
-	uint8_t	config_bits1;
-#define	SMP_RG_NUM_ZONE_GROUPS_MASK	0xc0
-#define	SMP_RG_NUM_ZONE_GROUPS_SHIFT	6
-#define	SMP_RG_ZONE_LOCKED		0x10
-#define	SMP_RG_PP_SUPPORTED		0x08
-#define	SMP_RG_PP_ASSERTED		0x04
-#define	SMP_RG_ZONING_SUPPORTED		0x02
-#define	SMP_RG_ZONING_ENABLED		0x01
-	uint8_t	config_bits2;
-#define	SMP_RG_SAVING			0x10
-#define	SMP_RG_SAVING_ZM_PWD_SUP	0x08
-#define	SMP_RG_SAVING_PHY_INFO_SUP	0x04
-#define	SMP_RG_SAVING_ZPERM_TAB_SUP	0x02
-#define	SMP_RG_SAVING_ZENABLED_SUP	0x01
-	uint8_t	max_num_routed_addrs[2];
-	uint8_t	active_zm_address[8];
-	uint8_t	zone_lock_inact_time_limit[2];
-	uint8_t	reserved3[2];
-	uint8_t	reserved4;
-	uint8_t	first_encl_conn_el_index;
-	uint8_t	num_encl_conn_el_indexes;
-	uint8_t	reserved5;
-	uint8_t	reduced_functionality;
-#define	SMP_RG_REDUCED_FUNCTIONALITY	0x80
-	uint8_t	time_to_reduced_func;
-	uint8_t	initial_time_to_reduced_func;
-	uint8_t	max_reduced_func_time;
-	uint8_t	last_sc_stat_desc_index[2];
-	uint8_t	max_sc_stat_descs[2];
-	uint8_t	last_phy_evl_desc_index[2];
-	uint8_t	max_stored_pel_descs[2];
-	uint8_t	stp_reject_to_open_limit[2];
-	uint8_t	reserved6[2];
-	uint8_t	crc[4];
-};
-
-/*
- * REPORT MANUFACTURER INFORMATION request and response, current as of SPL
- * Revision 7.
- */
-struct smp_report_manuf_info_request
-{
-	uint8_t	frame_type;
-	uint8_t	function;
-	uint8_t	response_len;
-	uint8_t	request_len;
-#define	SMP_RMI_REQUEST_LEN		0x00
-	uint8_t	crc[4];
-};
-
-struct smp_report_manuf_info_response
-{
-	uint8_t	frame_type;
-	uint8_t	function;
-	uint8_t	function_result;
-	uint8_t	response_len;
-#define	SMP_RMI_RESPONSE_LEN		0x0e
-	uint8_t	expander_change_count[2];
-	uint8_t	reserved0[2];
-	uint8_t	sas_11_format;
-#define	SMP_RMI_SAS11_FORMAT		0x01
-	uint8_t	reserved1[3];
-	uint8_t	vendor[8];
-	uint8_t	product[16];
-	uint8_t	revision[4];
-	uint8_t	comp_vendor[8];
-	uint8_t	comp_id[2];
-	uint8_t	comp_revision;
-	uint8_t	reserved2;
-	uint8_t	vendor_specific[8];
-	uint8_t	crc[4];
-};
-
-/*
- * DISCOVER request and response, current as of SPL Revision 7.
- */
-struct smp_discover_request
-{
-	uint8_t	frame_type;
-	uint8_t	function;
-	uint8_t response_len;
-	uint8_t request_len;
-#define	SMP_DIS_REQUEST_LEN		0x02
-	uint8_t reserved0[4];
-	uint8_t	ignore_zone_group;
-#define	SMP_DIS_IGNORE_ZONE_GROUP	0x01
-	uint8_t	phy;
-	uint8_t	reserved1[2];
-	uint8_t	crc[4];
-};
-
-struct smp_discover_response
-{
-	uint8_t	frame_type;
-	uint8_t	function;
-	uint8_t	function_result;
-	uint8_t	response_len;
-#define	SMP_DIS_RESPONSE_LEN		0x20
-	uint8_t	expander_change_count[2];
-	uint8_t	reserved0[3];
-	uint8_t	phy;
-	uint8_t	reserved1[2];
-	uint8_t	attached_device;
-#define	SMP_DIS_AD_TYPE_MASK		0x70
-#define	SMP_DIS_AD_TYPE_NONE		0x00
-#define	SMP_DIS_AD_TYPE_SAS_SATA	0x10
-#define	SMP_DIS_AD_TYPE_EXP		0x20
-#define	SMP_DIS_AD_TYPE_EXP_OLD		0x30
-#define	SMP_DIS_ATTACH_REASON_MASK	0x0f
-	uint8_t	neg_logical_link_rate;
-#define	SMP_DIS_LR_MASK			0x0f
-#define	SMP_DIS_LR_DISABLED		0x01
-#define	SMP_DIS_LR_PHY_RES_PROB		0x02
-#define	SMP_DIS_LR_SPINUP_HOLD		0x03
-#define	SMP_DIS_LR_PORT_SEL		0x04
-#define	SMP_DIS_LR_RESET_IN_PROG	0x05
-#define	SMP_DIS_LR_UNSUP_PHY_ATTACHED	0x06
-#define	SMP_DIS_LR_G1_15GBPS		0x08
-#define	SMP_DIS_LR_G2_30GBPS		0x09
-#define	SMP_DIS_LR_G3_60GBPS		0x0a
-	uint8_t	config_bits0;
-#define	SMP_DIS_ATTACHED_SSP_INIT	0x08
-#define	SMP_DIS_ATTACHED_STP_INIT	0x04
-#define	SMP_DIS_ATTACHED_SMP_INIT	0x02
-#define	SMP_DIS_ATTACHED_SATA_HOST	0x01
-	uint8_t	config_bits1;
-#define	SMP_DIS_ATTACHED_SATA_PORTSEL	0x80
-#define	SMP_DIS_STP_BUFFER_TOO_SMALL	0x10
-#define	SMP_DIS_ATTACHED_SSP_TARG	0x08
-#define	SMP_DIS_ATTACHED_STP_TARG	0x04
-#define	SMP_DIS_ATTACHED_SMP_TARG	0x02
-#define	SMP_DIS_ATTACHED_SATA_DEV	0x01
-	uint8_t	sas_address[8];
-	uint8_t	attached_sas_address[8];
-	uint8_t	attached_phy_id;
-	uint8_t	config_bits2;
-#define	SMP_DIS_ATT_SLUMB_CAP		0x10
-#define	SMP_DIS_ATT_PAR_CAP		0x08
-#define	SMP_DIS_ATT_IN_ZPSDS_PER	0x04
-#define	SMP_DIS_ATT_REQ_IN_ZPSDS	0x02
-#define	SMP_DIS_ATT_BREAK_RPL_CAP	0x01
-	uint8_t	reserved2[6];
-	uint8_t	link_rate0;
-#define	SMP_DIS_PROG_MIN_LR_MASK	0xf0
-#define	SMP_DIS_PROG_MIN_LR_SHIFT	4
-#define	SMP_DIS_HARD_MIN_LR_MASK	0x0f
-	uint8_t	link_rate1;
-#define	SMP_DIS_PROG_MAX_LR_MAX		0xf0
-#define	SMP_DIS_PROG_MAX_LR_SHIFT	4
-#define	SMP_DIS_HARD_MAX_LR_MASK	0x0f
-	uint8_t	phy_change_count;
-	uint8_t	pp_timeout;
-#define	SMP_DIS_VIRTUAL_PHY		0x80
-#define	SMP_DIS_PP_TIMEOUT_MASK		0x0f
-	uint8_t	routing_attr;
-	uint8_t	conn_type;
-	uint8_t	conn_el_index;
-	uint8_t	conn_phys_link;
-	uint8_t	config_bits3;
-#define	SMP_DIS_PHY_POW_COND_MASK	0xc0
-#define	SMP_DIS_PHY_POW_COND_SHIFT	6
-#define	SMP_DIS_SAS_SLUMB_CAP		0x08
-#define	SMP_DIS_SAS_PART_CAP		0x04
-#define	SMP_DIS_SATA_SLUMB_CAP		0x02
-#define	SMP_DIS_SATA_PART_CAP		0x01
-	uint8_t	config_bits4;
-#define	SMP_DIS_SAS_SLUMB_ENB		0x08
-#define	SMP_DIS_SAS_PART_ENB		0x04
-#define	SMP_DIS_SATA_SLUMB_ENB		0x02
-#define	SMP_DIS_SATA_PART_ENB		0x01
-	uint8_t	vendor_spec[2];
-	uint8_t	attached_dev_name[8];
-	uint8_t	config_bits5;
-#define	SMP_DIS_REQ_IN_ZPSDS_CHG	0x40
-#define	SMP_DIS_IN_ZPSDS_PER		0x20
-#define	SMP_DIS_REQ_IN_ZPSDS		0x10
-#define	SMP_DIS_ZG_PER			0x04
-#define	SMP_DIS_IN_ZPSDS		0x02
-#define	SMP_DIS_ZONING_ENB		0x01
-	uint8_t	reserved3[2];
-	uint8_t	zone_group;
-	uint8_t	self_config_status;
-	uint8_t	self_config_levels_comp;
-	uint8_t	reserved4[2];
-	uint8_t	self_config_sas_addr[8];
-	uint8_t	prog_phy_cap[4];
-	uint8_t	current_phy_cap[4];
-	uint8_t	attached_phy_cap[4];
-	uint8_t	reserved5[6];
-	uint8_t	neg_phys_link_rate;
-#define	SMP_DIS_REASON_MASK		0xf0
-#define	SMP_DIS_REASON_SHIFT		4
-#define	SMP_DIS_PHYS_LR_MASK		0x0f
-	uint8_t	config_bits6;
-#define	SMP_DIS_OPTICAL_MODE_ENB	0x04
-#define	SMP_DIS_NEG_SSC			0x02
-#define	SMP_DIS_HW_MUX_SUP		0x01
-	uint8_t	config_bits7;
-#define	SMP_DIS_DEF_IN_ZPSDS_PER	0x20
-#define	SMP_DIS_DEF_REQ_IN_ZPSDS	0x10
-#define	SMP_DIS_DEF_ZG_PER		0x04
-#define	SMP_DIS_DEF_ZONING_ENB		0x01
-	uint8_t	reserved6;
-	uint8_t	reserved7;
-	uint8_t	default_zone_group;
-	uint8_t	config_bits8;
-#define	SMP_DIS_SAVED_IN_ZPSDS_PER	0x20
-#define	SMP_DIS_SAVED_REQ_IN_SPSDS	0x10
-#define	SMP_DIS_SAVED_ZG_PER		0x04
-#define	SMP_DIS_SAVED_ZONING_ENB	0x01
-	uint8_t	reserved8;
-	uint8_t	reserved9;
-	uint8_t	saved_zone_group;
-	uint8_t	config_bits9;
-#define	SMP_DIS_SHADOW_IN_ZPSDS_PER	0x20
-#define	SMP_DIS_SHADOW_IN_REQ_IN_ZPSDS	0x10
-#define	SMP_DIS_SHADOW_ZG_PER		0x04
-	uint8_t reserved10;
-	uint8_t reserved11;
-	uint8_t	shadow_zone_group;
-	uint8_t	device_slot_num;
-	uint8_t	device_slot_group_num;
-	uint8_t	device_slot_group_out_conn[6];
-	uint8_t	stp_buffer_size[2];
-	uint8_t	reserved12;
-	uint8_t	reserved13;
-	uint8_t	crc[4];
-};
-
-/*
- * PHY CONTROL request and response.  Current as of SPL Revision 7.
- */
-struct smp_phy_control_request
-{
-	uint8_t	frame_type;
-	uint8_t	function;
-	uint8_t response_len;
-#define	SMP_PC_RESPONSE_LEN		0x00
-	uint8_t request_len;
-#define	SMP_PC_REQUEST_LEN		0x09
-	uint8_t expected_exp_chg_cnt[2];
-	uint8_t reserved0[3];
-	uint8_t phy;
-	uint8_t phy_operation;
-#define	SMP_PC_PHY_OP_NOP		0x00
-#define	SMP_PC_PHY_OP_LINK_RESET	0x01
-#define	SMP_PC_PHY_OP_HARD_RESET	0x02
-#define	SMP_PC_PHY_OP_DISABLE		0x03
-#define	SMP_PC_PHY_OP_CLEAR_ERR_LOG	0x05
-#define	SMP_PC_PHY_OP_CLEAR_AFFILIATON	0x06
-#define	SMP_PC_PHY_OP_TRANS_SATA_PSS	0x07
-#define	SMP_PC_PHY_OP_CLEAR_STP_ITN_LS	0x08
-#define	SMP_PC_PHY_OP_SET_ATT_DEV_NAME	0x09
-	uint8_t update_pp_timeout;
-#define	SMP_PC_UPDATE_PP_TIMEOUT	0x01
-	uint8_t reserved1[12];
-	uint8_t attached_device_name[8];
-	uint8_t prog_min_phys_link_rate;
-#define	SMP_PC_PROG_MIN_PL_RATE_MASK	0xf0
-#define	SMP_PC_PROG_MIN_PL_RATE_SHIFT	4
-	uint8_t prog_max_phys_link_rate;
-#define	SMP_PC_PROG_MAX_PL_RATE_MASK	0xf0
-#define	SMP_PC_PROG_MAX_PL_RATE_SHIFT	4
-	uint8_t	config_bits0;
-#define	SMP_PC_SP_NC			0x00
-#define	SMP_PC_SP_DISABLE		0x02
-#define	SMP_PC_SP_ENABLE		0x01
-#define	SMP_PC_SAS_SLUMBER_NC		0x00
-#define	SMP_PC_SAS_SLUMBER_DISABLE	0x80
-#define	SMP_PC_SAS_SLUMBER_ENABLE	0x40
-#define	SMP_PC_SAS_SLUMBER_MASK		0xc0
-#define	SMP_PC_SAS_SLUMBER_SHIFT	6
-#define	SMP_PC_SAS_PARTIAL_NC		0x00
-#define	SMP_PC_SAS_PARTIAL_DISABLE	0x20
-#define	SMP_PC_SAS_PARTIAL_ENABLE	0x10
-#define	SMP_PC_SAS_PARTIAL_MASK		0x30
-#define	SMP_PC_SAS_PARTIAL_SHIFT	4
-#define	SMP_PC_SATA_SLUMBER_NC		0x00
-#define	SMP_PC_SATA_SLUMBER_DISABLE	0x08
-#define	SMP_PC_SATA_SLUMBER_ENABLE	0x04
-#define	SMP_PC_SATA_SLUMBER_MASK	0x0c
-#define	SMP_PC_SATA_SLUMBER_SHIFT	2
-#define	SMP_PC_SATA_PARTIAL_NC		0x00
-#define	SMP_PC_SATA_PARTIAL_DISABLE	0x02
-#define	SMP_PC_SATA_PARTIAL_ENABLE	0x01
-#define	SMP_PC_SATA_PARTIAL_MASK	0x03
-#define	SMP_PC_SATA_PARTIAL_SHIFT	0
-	uint8_t	reserved2;
-	uint8_t	pp_timeout_value;
-#define	SMP_PC_PP_TIMEOUT_MASK		0x0f
-	uint8_t reserved3[3];
-	uint8_t	crc[4];
-};
-
-struct smp_phy_control_response
-{
-	uint8_t	frame_type;
-	uint8_t	function;
-	uint8_t	function_result;
-	uint8_t	response_len;
-#define	SMP_PC_RESPONSE_LEN		0x00
-	uint8_t crc[4];
-};
-
-__BEGIN_DECLS
-
-const char *smp_error_desc(int function_result);
-const char *smp_command_desc(uint8_t cmd_num);
-void smp_command_decode(uint8_t *smp_request, int request_len, struct sbuf *sb,
-			char *line_prefix, int first_line_len, int line_len);
-void smp_command_sbuf(struct ccb_smpio *smpio, struct sbuf *sb,
-		      char *line_prefix, int first_line_len, int line_len);
-
-#ifdef _KERNEL
-void smp_error_sbuf(struct ccb_smpio *smpio, struct sbuf *sb);
-#else /* !_KERNEL*/
-void smp_error_sbuf(struct cam_device *device, struct ccb_smpio *smpio,
-		    struct sbuf *sb);
-#endif /* _KERNEL/!_KERNEL */
-
-void smp_report_general_sbuf(struct smp_report_general_response *response,
-			     int response_len, struct sbuf *sb);
-
-void smp_report_manuf_info_sbuf(struct smp_report_manuf_info_response *response,
-				int response_len, struct sbuf *sb);
-
-void smp_report_general(struct ccb_smpio *smpio, uint32_t retries,
-			void (*cbfcnp)(struct cam_periph *, union ccb *),
-			struct smp_report_general_request *request,
-			int request_len, uint8_t *response, int response_len,
-			int long_response, uint32_t timeout);
-
-void smp_discover(struct ccb_smpio *smpio, uint32_t retries,
-		  void (*cbfcnp)(struct cam_periph *, union ccb *),
-		  struct smp_discover_request *request, int request_len,
-		  uint8_t *response, int response_len, int long_response,
-		  int ignore_zone_group, int phy, uint32_t timeout);
-
-void smp_report_manuf_info(struct ccb_smpio *smpio, uint32_t retries,
-			   void (*cbfcnp)(struct cam_periph *, union ccb *),
-			   struct smp_report_manuf_info_request *request,
-			   int request_len, uint8_t *response, int response_len,
-			   int long_response, uint32_t timeout);
-
-void smp_phy_control(struct ccb_smpio *smpio, uint32_t retries,
-		     void (*cbfcnp)(struct cam_periph *, union ccb *),
-		     struct smp_phy_control_request *request, int request_len,
-		     uint8_t *response, int response_len, int long_response,
-		     uint32_t expected_exp_change_count, int phy, int phy_op,
-		     int update_pp_timeout_val, uint64_t attached_device_name,
-		     int prog_min_prl, int prog_max_prl, int slumber_partial,
-		     int pp_timeout_value, uint32_t timeout);
-__END_DECLS
-
-#endif /*_SCSI_SMP_ALL_H*/
diff --git a/include.new/camlib.h b/include.new/camlib.h
deleted file mode 100644
index c337b10..0000000
--- a/include.new/camlib.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 1997, 1998 Kenneth D. Merry.
- * 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. 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: releng/10.2/lib/libcam/camlib.h 95331 2002-04-23 23:58:20Z obrien $
- */
-/*
- * Buffer encoding/decoding routines taken from the original FreeBSD SCSI
- * library and slightly modified.  The original header file had the following
- * copyright:
- */
-/* Copyright (c) 1994 HD Associates (hd@world.std.com)
- * 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 HD Associates
- * 4. Neither the name of the HD Associaates 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 HD ASSOCIATES``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 HD ASSOCIATES 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.
- */
-
-
-#ifndef _CAMLIB_H
-#define _CAMLIB_H
-
-#include <sys/cdefs.h>
-#include <sys/param.h>
-
-#include <cam/cam.h>
-#include <cam/cam_ccb.h>
-
-#define CAM_ERRBUF_SIZE 2048	/* sizeof the CAM libarary error string  */
-
-/*
- * Right now we hard code the transport layer device, but this will change
- * if we ever get more than one transport layer.
- */
-#define XPT_DEVICE	"/dev/xpt0"
-
-
-extern char cam_errbuf[];
-
-struct cam_device {
-	char 		device_path[MAXPATHLEN];/*
-						   * Pathname of the device 
-						   * given by the user. This
-						   * may be null if the
-						   * user states the device
-						   * name and unit number
-						   * separately.
-						   */
-	char		given_dev_name[DEV_IDLEN+1];/*
-						     * Device name given by
-						     * the user.
-						     */
-	uint32_t	given_unit_number;	    /*
-						     * Unit number given by
-						     * the user.
-						     */
-	char		device_name[DEV_IDLEN+1];/* 
-						  * Name of the device, 
-						  * e.g. 'pass' 
-						  */
-	uint32_t	dev_unit_num;	/* Unit number of the passthrough
-					 * device associated with this
-					 * particular device.
-					 */
-	
-	char		sim_name[SIM_IDLEN+1]; /* Controller name, e.g. 'ahc' */
-	uint32_t	sim_unit_number; /* Controller unit number */
-	uint32_t	bus_id;		 /* Controller bus number */
-	lun_id_t	target_lun;	 /* Logical Unit Number */
-	target_id_t	target_id;	 /* Target ID */
-	path_id_t	path_id;	 /* System SCSI bus number */
-	u_int16_t	pd_type;	 /* type of peripheral device */
-	struct scsi_inquiry_data inq_data;  /* SCSI Inquiry data */
-	u_int8_t	serial_num[252]; /* device serial number */
-	u_int8_t	serial_num_len;  /* length of the serial number */
-	u_int8_t	sync_period;	 /* Negotiated sync period */
-	u_int8_t	sync_offset;	 /* Negotiated sync offset */
-	u_int8_t	bus_width;	 /* Negotiated bus width */
-	int		fd;		 /* file descriptor for device */
-};
-
-__BEGIN_DECLS
-/* Basic utility commands */
-struct cam_device *	cam_open_device(const char *path, int flags);
-void			cam_close_device(struct cam_device *dev);
-void			cam_close_spec_device(struct cam_device *dev);
-struct cam_device *	cam_open_spec_device(const char *dev_name,
-					     int unit, int flags,
-					     struct cam_device *device);
-struct cam_device *	cam_open_btl(path_id_t path_id, target_id_t target_id,
-				     lun_id_t target_lun, int flags,
-				     struct cam_device *device);
-struct cam_device *	cam_open_pass(const char *path, int flags,
-				      struct cam_device *device);
-union ccb *		cam_getccb(struct cam_device *dev);
-void			cam_freeccb(union ccb *ccb);
-int			cam_send_ccb(struct cam_device *device, union ccb *ccb);
-char *			cam_path_string(struct cam_device *dev, char *str,
-					int len);
-struct cam_device *	cam_device_dup(struct cam_device *device);
-void			cam_device_copy(struct cam_device *src, 
-					struct cam_device *dst);
-int			cam_get_device(const char *path, char *dev_name,
-				       int devnamelen, int *unit);
-
-/*
- * Buffer encoding/decoding routines, from the old SCSI library.
- */
-int csio_decode(struct ccb_scsiio *csio, const char *fmt, ...)
-		__printflike(2, 3);
-int csio_decode_visit(struct ccb_scsiio *csio, const char *fmt,
-		      void (*arg_put)(void *, int, void *, int, char *),
-		      void *puthook);
-int buff_decode(u_int8_t *buff, size_t len, const char *fmt, ...)
-		__printflike(3, 4);
-int buff_decode_visit(u_int8_t *buff, size_t len, const char *fmt,
-		      void (*arg_put)(void *, int, void *, int, char *),
-		      void *puthook);
-int csio_build(struct ccb_scsiio *csio, u_int8_t *data_ptr,
-	       uint32_t dxfer_len, uint32_t flags, int retry_count,
-	       int timeout, const char *cmd_spec, ...);
-int csio_build_visit(struct ccb_scsiio *csio, u_int8_t *data_ptr,
-		     uint32_t dxfer_len, uint32_t flags, int retry_count,
-		     int timeout, const char *cmd_spec,
-		     int (*arg_get)(void *hook, char *field_name),
-		     void *gethook);
-int csio_encode(struct ccb_scsiio *csio, const char *fmt, ...)
-		__printflike(2, 3);
-int buff_encode_visit(u_int8_t *buff, size_t len, const char *fmt,
-		      int (*arg_get)(void *hook, char *field_name),
-		      void *gethook);
-int csio_encode_visit(struct ccb_scsiio *csio, const char *fmt,
-		      int (*arg_get)(void *hook, char *field_name),
-		      void *gethook);
-__END_DECLS
-
-#endif /* _CAMLIB_H */
diff --git a/include.new/clang/3.4.1/__wmmintrin_aes.h b/include.new/clang/3.4.1/__wmmintrin_aes.h
deleted file mode 100644
index 2bfa027..0000000
--- a/include.new/clang/3.4.1/__wmmintrin_aes.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*===---- __wmmintrin_aes.h - AES intrinsics -------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-#ifndef _WMMINTRIN_AES_H
-#define _WMMINTRIN_AES_H
-
-#include <emmintrin.h>
-
-#if !defined (__AES__)
-#  error "AES instructions not enabled"
-#else
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_aesenc_si128(__m128i __V, __m128i __R)
-{
-  return (__m128i)__builtin_ia32_aesenc128(__V, __R);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_aesenclast_si128(__m128i __V, __m128i __R)
-{
-  return (__m128i)__builtin_ia32_aesenclast128(__V, __R);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_aesdec_si128(__m128i __V, __m128i __R)
-{
-  return (__m128i)__builtin_ia32_aesdec128(__V, __R);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_aesdeclast_si128(__m128i __V, __m128i __R)
-{
-  return (__m128i)__builtin_ia32_aesdeclast128(__V, __R);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_aesimc_si128(__m128i __V)
-{
-  return (__m128i)__builtin_ia32_aesimc128(__V);
-}
-
-#define _mm_aeskeygenassist_si128(C, R) \
-  __builtin_ia32_aeskeygenassist128((C), (R))
-
-#endif
-
-#endif  /* _WMMINTRIN_AES_H */
diff --git a/include.new/clang/3.4.1/__wmmintrin_pclmul.h b/include.new/clang/3.4.1/__wmmintrin_pclmul.h
deleted file mode 100644
index 8d1f1b7..0000000
--- a/include.new/clang/3.4.1/__wmmintrin_pclmul.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*===---- __wmmintrin_pclmul.h - AES intrinsics ----------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-#ifndef _WMMINTRIN_PCLMUL_H
-#define _WMMINTRIN_PCLMUL_H
-
-#if !defined (__PCLMUL__)
-# error "PCLMUL instruction is not enabled"
-#else
-#define _mm_clmulepi64_si128(__X, __Y, __I) \
-  ((__m128i)__builtin_ia32_pclmulqdq128((__v2di)(__m128i)(__X), \
-                                        (__v2di)(__m128i)(__Y), (char)(__I)))
-#endif
-
-#endif /* _WMMINTRIN_PCLMUL_H */
diff --git a/include.new/clang/3.4.1/altivec.h b/include.new/clang/3.4.1/altivec.h
deleted file mode 100644
index 74ce08a..0000000
--- a/include.new/clang/3.4.1/altivec.h
+++ /dev/null
@@ -1,11856 +0,0 @@
-/*===---- altivec.h - Standard header for type generic math ---------------===*\
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
-\*===----------------------------------------------------------------------===*/
-
-#ifndef __ALTIVEC_H
-#define __ALTIVEC_H
-
-#ifndef __ALTIVEC__
-#error "AltiVec support not enabled"
-#endif
-
-/* constants for mapping CR6 bits to predicate result. */
-
-#define __CR6_EQ     0
-#define __CR6_EQ_REV 1
-#define __CR6_LT     2
-#define __CR6_LT_REV 3
-
-#define __ATTRS_o_ai __attribute__((__overloadable__, __always_inline__))
-
-static vector signed char __ATTRS_o_ai
-vec_perm(vector signed char __a, vector signed char __b, vector unsigned char __c);
-
-static vector unsigned char __ATTRS_o_ai
-vec_perm(vector unsigned char __a,
-         vector unsigned char __b,
-         vector unsigned char __c);
-
-static vector bool char __ATTRS_o_ai
-vec_perm(vector bool char __a, vector bool char __b, vector unsigned char __c);
-
-static vector short __ATTRS_o_ai
-vec_perm(vector short __a, vector short __b, vector unsigned char __c);
-
-static vector unsigned short __ATTRS_o_ai
-vec_perm(vector unsigned short __a,
-         vector unsigned short __b,
-         vector unsigned char __c);
-
-static vector bool short __ATTRS_o_ai
-vec_perm(vector bool short __a, vector bool short __b, vector unsigned char __c);
-
-static vector pixel __ATTRS_o_ai
-vec_perm(vector pixel __a, vector pixel __b, vector unsigned char __c);
-
-static vector int __ATTRS_o_ai
-vec_perm(vector int __a, vector int __b, vector unsigned char __c);
-
-static vector unsigned int __ATTRS_o_ai
-vec_perm(vector unsigned int __a, vector unsigned int __b, vector unsigned char __c);
-
-static vector bool int __ATTRS_o_ai
-vec_perm(vector bool int __a, vector bool int __b, vector unsigned char __c);
-
-static vector float __ATTRS_o_ai
-vec_perm(vector float __a, vector float __b, vector unsigned char __c);
-
-/* vec_abs */
-
-#define __builtin_altivec_abs_v16qi vec_abs
-#define __builtin_altivec_abs_v8hi  vec_abs
-#define __builtin_altivec_abs_v4si  vec_abs
-
-static vector signed char __ATTRS_o_ai
-vec_abs(vector signed char __a)
-{
-  return __builtin_altivec_vmaxsb(__a, -__a);
-}
-
-static vector signed short __ATTRS_o_ai
-vec_abs(vector signed short __a)
-{
-  return __builtin_altivec_vmaxsh(__a, -__a);
-}
-
-static vector signed int __ATTRS_o_ai
-vec_abs(vector signed int __a)
-{
-  return __builtin_altivec_vmaxsw(__a, -__a);
-}
-
-static vector float __ATTRS_o_ai
-vec_abs(vector float __a)
-{
-  vector unsigned int __res = (vector unsigned int)__a
-                            & (vector unsigned int)(0x7FFFFFFF);
-  return (vector float)__res;
-}
-
-/* vec_abss */
-
-#define __builtin_altivec_abss_v16qi vec_abss
-#define __builtin_altivec_abss_v8hi  vec_abss
-#define __builtin_altivec_abss_v4si  vec_abss
-
-static vector signed char __ATTRS_o_ai
-vec_abss(vector signed char __a)
-{
-  return __builtin_altivec_vmaxsb
-           (__a, __builtin_altivec_vsubsbs((vector signed char)(0), __a));
-}
-
-static vector signed short __ATTRS_o_ai
-vec_abss(vector signed short __a)
-{
-  return __builtin_altivec_vmaxsh
-           (__a, __builtin_altivec_vsubshs((vector signed short)(0), __a));
-}
-
-static vector signed int __ATTRS_o_ai
-vec_abss(vector signed int __a)
-{
-  return __builtin_altivec_vmaxsw
-           (__a, __builtin_altivec_vsubsws((vector signed int)(0), __a));
-}
-
-/* vec_add */
-
-static vector signed char __ATTRS_o_ai
-vec_add(vector signed char __a, vector signed char __b)
-{
-  return __a + __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_add(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a + __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_add(vector signed char __a, vector bool char __b)
-{
-  return __a + (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_add(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a + __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_add(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a + __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_add(vector unsigned char __a, vector bool char __b)
-{
-  return __a + (vector unsigned char)__b;
-}
-
-static vector short __ATTRS_o_ai
-vec_add(vector short __a, vector short __b)
-{
-  return __a + __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_add(vector bool short __a, vector short __b)
-{
-  return (vector short)__a + __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_add(vector short __a, vector bool short __b)
-{
-  return __a + (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_add(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a + __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_add(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a + __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_add(vector unsigned short __a, vector bool short __b)
-{
-  return __a + (vector unsigned short)__b;
-}
-
-static vector int __ATTRS_o_ai
-vec_add(vector int __a, vector int __b)
-{
-  return __a + __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_add(vector bool int __a, vector int __b)
-{
-  return (vector int)__a + __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_add(vector int __a, vector bool int __b)
-{
-  return __a + (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_add(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a + __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_add(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a + __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_add(vector unsigned int __a, vector bool int __b)
-{
-  return __a + (vector unsigned int)__b;
-}
-
-static vector float __ATTRS_o_ai
-vec_add(vector float __a, vector float __b)
-{
-  return __a + __b;
-}
-
-/* vec_vaddubm */
-
-#define __builtin_altivec_vaddubm vec_vaddubm
-
-static vector signed char __ATTRS_o_ai
-vec_vaddubm(vector signed char __a, vector signed char __b)
-{
-  return __a + __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vaddubm(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a + __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vaddubm(vector signed char __a, vector bool char __b)
-{
-  return __a + (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vaddubm(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a + __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vaddubm(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a + __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vaddubm(vector unsigned char __a, vector bool char __b)
-{
-  return __a + (vector unsigned char)__b;
-}
-
-/* vec_vadduhm */
-
-#define __builtin_altivec_vadduhm vec_vadduhm
-
-static vector short __ATTRS_o_ai
-vec_vadduhm(vector short __a, vector short __b)
-{
-  return __a + __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vadduhm(vector bool short __a, vector short __b)
-{
-  return (vector short)__a + __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vadduhm(vector short __a, vector bool short __b)
-{
-  return __a + (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vadduhm(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a + __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vadduhm(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a + __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vadduhm(vector unsigned short __a, vector bool short __b)
-{
-  return __a + (vector unsigned short)__b;
-}
-
-/* vec_vadduwm */
-
-#define __builtin_altivec_vadduwm vec_vadduwm
-
-static vector int __ATTRS_o_ai
-vec_vadduwm(vector int __a, vector int __b)
-{
-  return __a + __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vadduwm(vector bool int __a, vector int __b)
-{
-  return (vector int)__a + __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vadduwm(vector int __a, vector bool int __b)
-{
-  return __a + (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vadduwm(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a + __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vadduwm(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a + __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vadduwm(vector unsigned int __a, vector bool int __b)
-{
-  return __a + (vector unsigned int)__b;
-}
-
-/* vec_vaddfp */
-
-#define __builtin_altivec_vaddfp  vec_vaddfp
-
-static vector float __attribute__((__always_inline__))
-vec_vaddfp(vector float __a, vector float __b)
-{
-  return __a + __b;
-}
-
-/* vec_addc */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_addc(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vaddcuw(__a, __b);
-}
-
-/* vec_vaddcuw */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vaddcuw(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vaddcuw(__a, __b);
-}
-
-/* vec_adds */
-
-static vector signed char __ATTRS_o_ai
-vec_adds(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vaddsbs(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_adds(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vaddsbs((vector signed char)__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_adds(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vaddsbs(__a, (vector signed char)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_adds(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vaddubs(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_adds(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vaddubs((vector unsigned char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_adds(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vaddubs(__a, (vector unsigned char)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_adds(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vaddshs(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_adds(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vaddshs((vector short)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_adds(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vaddshs(__a, (vector short)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_adds(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vadduhs(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_adds(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vadduhs((vector unsigned short)__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_adds(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vadduhs(__a, (vector unsigned short)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_adds(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vaddsws(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_adds(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vaddsws((vector int)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_adds(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vaddsws(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_adds(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vadduws(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_adds(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vadduws((vector unsigned int)__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_adds(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vadduws(__a, (vector unsigned int)__b);
-}
-
-/* vec_vaddsbs */
-
-static vector signed char __ATTRS_o_ai
-vec_vaddsbs(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vaddsbs(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vaddsbs(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vaddsbs((vector signed char)__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vaddsbs(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vaddsbs(__a, (vector signed char)__b);
-}
-
-/* vec_vaddubs */
-
-static vector unsigned char __ATTRS_o_ai
-vec_vaddubs(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vaddubs(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vaddubs(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vaddubs((vector unsigned char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vaddubs(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vaddubs(__a, (vector unsigned char)__b);
-}
-
-/* vec_vaddshs */
-
-static vector short __ATTRS_o_ai
-vec_vaddshs(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vaddshs(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vaddshs(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vaddshs((vector short)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vaddshs(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vaddshs(__a, (vector short)__b);
-}
-
-/* vec_vadduhs */
-
-static vector unsigned short __ATTRS_o_ai
-vec_vadduhs(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vadduhs(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vadduhs(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vadduhs((vector unsigned short)__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vadduhs(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vadduhs(__a, (vector unsigned short)__b);
-}
-
-/* vec_vaddsws */
-
-static vector int __ATTRS_o_ai
-vec_vaddsws(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vaddsws(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vaddsws(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vaddsws((vector int)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vaddsws(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vaddsws(__a, (vector int)__b);
-}
-
-/* vec_vadduws */
-
-static vector unsigned int __ATTRS_o_ai
-vec_vadduws(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vadduws(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vadduws(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vadduws((vector unsigned int)__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vadduws(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vadduws(__a, (vector unsigned int)__b);
-}
-
-/* vec_and */
-
-#define __builtin_altivec_vand vec_and
-
-static vector signed char __ATTRS_o_ai
-vec_and(vector signed char __a, vector signed char __b)
-{
-  return __a & __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_and(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a & __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_and(vector signed char __a, vector bool char __b)
-{
-  return __a & (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_and(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a & __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_and(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a & __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_and(vector unsigned char __a, vector bool char __b)
-{
-  return __a & (vector unsigned char)__b;
-}
-
-static vector bool char __ATTRS_o_ai
-vec_and(vector bool char __a, vector bool char __b)
-{
-  return __a & __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_and(vector short __a, vector short __b)
-{
-  return __a & __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_and(vector bool short __a, vector short __b)
-{
-  return (vector short)__a & __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_and(vector short __a, vector bool short __b)
-{
-  return __a & (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_and(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a & __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_and(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a & __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_and(vector unsigned short __a, vector bool short __b)
-{
-  return __a & (vector unsigned short)__b;
-}
-
-static vector bool short __ATTRS_o_ai
-vec_and(vector bool short __a, vector bool short __b)
-{
-  return __a & __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_and(vector int __a, vector int __b)
-{
-  return __a & __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_and(vector bool int __a, vector int __b)
-{
-  return (vector int)__a & __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_and(vector int __a, vector bool int __b)
-{
-  return __a & (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_and(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a & __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_and(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a & __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_and(vector unsigned int __a, vector bool int __b)
-{
-  return __a & (vector unsigned int)__b;
-}
-
-static vector bool int __ATTRS_o_ai
-vec_and(vector bool int __a, vector bool int __b)
-{
-  return __a & __b;
-}
-
-static vector float __ATTRS_o_ai
-vec_and(vector float __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_and(vector bool int __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_and(vector float __a, vector bool int __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-/* vec_vand */
-
-static vector signed char __ATTRS_o_ai
-vec_vand(vector signed char __a, vector signed char __b)
-{
-  return __a & __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vand(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a & __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vand(vector signed char __a, vector bool char __b)
-{
-  return __a & (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vand(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a & __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vand(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a & __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vand(vector unsigned char __a, vector bool char __b)
-{
-  return __a & (vector unsigned char)__b;
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vand(vector bool char __a, vector bool char __b)
-{
-  return __a & __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vand(vector short __a, vector short __b)
-{
-  return __a & __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vand(vector bool short __a, vector short __b)
-{
-  return (vector short)__a & __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vand(vector short __a, vector bool short __b)
-{
-  return __a & (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vand(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a & __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vand(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a & __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vand(vector unsigned short __a, vector bool short __b)
-{
-  return __a & (vector unsigned short)__b;
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vand(vector bool short __a, vector bool short __b)
-{
-  return __a & __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vand(vector int __a, vector int __b)
-{
-  return __a & __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vand(vector bool int __a, vector int __b)
-{
-  return (vector int)__a & __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vand(vector int __a, vector bool int __b)
-{
-  return __a & (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vand(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a & __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vand(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a & __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vand(vector unsigned int __a, vector bool int __b)
-{
-  return __a & (vector unsigned int)__b;
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vand(vector bool int __a, vector bool int __b)
-{
-  return __a & __b;
-}
-
-static vector float __ATTRS_o_ai
-vec_vand(vector float __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_vand(vector bool int __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_vand(vector float __a, vector bool int __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-/* vec_andc */
-
-#define __builtin_altivec_vandc vec_andc
-
-static vector signed char __ATTRS_o_ai
-vec_andc(vector signed char __a, vector signed char __b)
-{
-  return __a & ~__b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_andc(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a & ~__b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_andc(vector signed char __a, vector bool char __b)
-{
-  return __a & ~(vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_andc(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a & ~__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_andc(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a & ~__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_andc(vector unsigned char __a, vector bool char __b)
-{
-  return __a & ~(vector unsigned char)__b;
-}
-
-static vector bool char __ATTRS_o_ai
-vec_andc(vector bool char __a, vector bool char __b)
-{
-  return __a & ~__b;
-}
-
-static vector short __ATTRS_o_ai
-vec_andc(vector short __a, vector short __b)
-{
-  return __a & ~__b;
-}
-
-static vector short __ATTRS_o_ai
-vec_andc(vector bool short __a, vector short __b)
-{
-  return (vector short)__a & ~__b;
-}
-
-static vector short __ATTRS_o_ai
-vec_andc(vector short __a, vector bool short __b)
-{
-  return __a & ~(vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_andc(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a & ~__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_andc(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a & ~__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_andc(vector unsigned short __a, vector bool short __b)
-{
-  return __a & ~(vector unsigned short)__b;
-}
-
-static vector bool short __ATTRS_o_ai
-vec_andc(vector bool short __a, vector bool short __b)
-{
-  return __a & ~__b;
-}
-
-static vector int __ATTRS_o_ai
-vec_andc(vector int __a, vector int __b)
-{
-  return __a & ~__b;
-}
-
-static vector int __ATTRS_o_ai
-vec_andc(vector bool int __a, vector int __b)
-{
-  return (vector int)__a & ~__b;
-}
-
-static vector int __ATTRS_o_ai
-vec_andc(vector int __a, vector bool int __b)
-{
-  return __a & ~(vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_andc(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a & ~__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_andc(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a & ~__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_andc(vector unsigned int __a, vector bool int __b)
-{
-  return __a & ~(vector unsigned int)__b;
-}
-
-static vector bool int __ATTRS_o_ai
-vec_andc(vector bool int __a, vector bool int __b)
-{
-  return __a & ~__b;
-}
-
-static vector float __ATTRS_o_ai
-vec_andc(vector float __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & ~(vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_andc(vector bool int __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & ~(vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_andc(vector float __a, vector bool int __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & ~(vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-/* vec_vandc */
-
-static vector signed char __ATTRS_o_ai
-vec_vandc(vector signed char __a, vector signed char __b)
-{
-  return __a & ~__b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vandc(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a & ~__b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vandc(vector signed char __a, vector bool char __b)
-{
-  return __a & ~(vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vandc(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a & ~__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vandc(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a & ~__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vandc(vector unsigned char __a, vector bool char __b)
-{
-  return __a & ~(vector unsigned char)__b;
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vandc(vector bool char __a, vector bool char __b)
-{
-  return __a & ~__b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vandc(vector short __a, vector short __b)
-{
-  return __a & ~__b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vandc(vector bool short __a, vector short __b)
-{
-  return (vector short)__a & ~__b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vandc(vector short __a, vector bool short __b)
-{
-  return __a & ~(vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vandc(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a & ~__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vandc(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a & ~__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vandc(vector unsigned short __a, vector bool short __b)
-{
-  return __a & ~(vector unsigned short)__b;
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vandc(vector bool short __a, vector bool short __b)
-{
-  return __a & ~__b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vandc(vector int __a, vector int __b)
-{
-  return __a & ~__b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vandc(vector bool int __a, vector int __b)
-{
-  return (vector int)__a & ~__b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vandc(vector int __a, vector bool int __b)
-{
-  return __a & ~(vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vandc(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a & ~__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vandc(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a & ~__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vandc(vector unsigned int __a, vector bool int __b)
-{
-  return __a & ~(vector unsigned int)__b;
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vandc(vector bool int __a, vector bool int __b)
-{
-  return __a & ~__b;
-}
-
-static vector float __ATTRS_o_ai
-vec_vandc(vector float __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & ~(vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_vandc(vector bool int __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & ~(vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_vandc(vector float __a, vector bool int __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a & ~(vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-/* vec_avg */
-
-static vector signed char __ATTRS_o_ai
-vec_avg(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vavgsb(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_avg(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vavgub(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_avg(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vavgsh(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_avg(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vavguh(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_avg(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vavgsw(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_avg(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vavguw(__a, __b);
-}
-
-/* vec_vavgsb */
-
-static vector signed char __attribute__((__always_inline__))
-vec_vavgsb(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vavgsb(__a, __b);
-}
-
-/* vec_vavgub */
-
-static vector unsigned char __attribute__((__always_inline__))
-vec_vavgub(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vavgub(__a, __b);
-}
-
-/* vec_vavgsh */
-
-static vector short __attribute__((__always_inline__))
-vec_vavgsh(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vavgsh(__a, __b);
-}
-
-/* vec_vavguh */
-
-static vector unsigned short __attribute__((__always_inline__))
-vec_vavguh(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vavguh(__a, __b);
-}
-
-/* vec_vavgsw */
-
-static vector int __attribute__((__always_inline__))
-vec_vavgsw(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vavgsw(__a, __b);
-}
-
-/* vec_vavguw */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vavguw(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vavguw(__a, __b);
-}
-
-/* vec_ceil */
-
-static vector float __attribute__((__always_inline__))
-vec_ceil(vector float __a)
-{
-  return __builtin_altivec_vrfip(__a);
-}
-
-/* vec_vrfip */
-
-static vector float __attribute__((__always_inline__))
-vec_vrfip(vector float __a)
-{
-  return __builtin_altivec_vrfip(__a);
-}
-
-/* vec_cmpb */
-
-static vector int __attribute__((__always_inline__))
-vec_cmpb(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpbfp(__a, __b);
-}
-
-/* vec_vcmpbfp */
-
-static vector int __attribute__((__always_inline__))
-vec_vcmpbfp(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpbfp(__a, __b);
-}
-
-/* vec_cmpeq */
-
-static vector bool char __ATTRS_o_ai
-vec_cmpeq(vector signed char __a, vector signed char __b)
-{
-  return (vector bool char)
-    __builtin_altivec_vcmpequb((vector char)__a, (vector char)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_cmpeq(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector bool char)
-    __builtin_altivec_vcmpequb((vector char)__a, (vector char)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_cmpeq(vector short __a, vector short __b)
-{
-  return (vector bool short)__builtin_altivec_vcmpequh(__a, __b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_cmpeq(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector bool short)
-    __builtin_altivec_vcmpequh((vector short)__a, (vector short)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_cmpeq(vector int __a, vector int __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpequw(__a, __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_cmpeq(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector bool int)
-    __builtin_altivec_vcmpequw((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_cmpeq(vector float __a, vector float __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpeqfp(__a, __b);
-}
-
-/* vec_cmpge */
-
-static vector bool int __attribute__((__always_inline__))
-vec_cmpge(vector float __a, vector float __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgefp(__a, __b);
-}
-
-/* vec_vcmpgefp */
-
-static vector bool int __attribute__((__always_inline__))
-vec_vcmpgefp(vector float __a, vector float __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgefp(__a, __b);
-}
-
-/* vec_cmpgt */
-
-static vector bool char __ATTRS_o_ai
-vec_cmpgt(vector signed char __a, vector signed char __b)
-{
-  return (vector bool char)__builtin_altivec_vcmpgtsb(__a, __b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_cmpgt(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector bool char)__builtin_altivec_vcmpgtub(__a, __b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_cmpgt(vector short __a, vector short __b)
-{
-  return (vector bool short)__builtin_altivec_vcmpgtsh(__a, __b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_cmpgt(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector bool short)__builtin_altivec_vcmpgtuh(__a, __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_cmpgt(vector int __a, vector int __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgtsw(__a, __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_cmpgt(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgtuw(__a, __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_cmpgt(vector float __a, vector float __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgtfp(__a, __b);
-}
-
-/* vec_vcmpgtsb */
-
-static vector bool char __attribute__((__always_inline__))
-vec_vcmpgtsb(vector signed char __a, vector signed char __b)
-{
-  return (vector bool char)__builtin_altivec_vcmpgtsb(__a, __b);
-}
-
-/* vec_vcmpgtub */
-
-static vector bool char __attribute__((__always_inline__))
-vec_vcmpgtub(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector bool char)__builtin_altivec_vcmpgtub(__a, __b);
-}
-
-/* vec_vcmpgtsh */
-
-static vector bool short __attribute__((__always_inline__))
-vec_vcmpgtsh(vector short __a, vector short __b)
-{
-  return (vector bool short)__builtin_altivec_vcmpgtsh(__a, __b);
-}
-
-/* vec_vcmpgtuh */
-
-static vector bool short __attribute__((__always_inline__))
-vec_vcmpgtuh(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector bool short)__builtin_altivec_vcmpgtuh(__a, __b);
-}
-
-/* vec_vcmpgtsw */
-
-static vector bool int __attribute__((__always_inline__))
-vec_vcmpgtsw(vector int __a, vector int __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgtsw(__a, __b);
-}
-
-/* vec_vcmpgtuw */
-
-static vector bool int __attribute__((__always_inline__))
-vec_vcmpgtuw(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgtuw(__a, __b);
-}
-
-/* vec_vcmpgtfp */
-
-static vector bool int __attribute__((__always_inline__))
-vec_vcmpgtfp(vector float __a, vector float __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgtfp(__a, __b);
-}
-
-/* vec_cmple */
-
-static vector bool int __attribute__((__always_inline__))
-vec_cmple(vector float __a, vector float __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgefp(__b, __a);
-}
-
-/* vec_cmplt */
-
-static vector bool char __ATTRS_o_ai
-vec_cmplt(vector signed char __a, vector signed char __b)
-{
-  return (vector bool char)__builtin_altivec_vcmpgtsb(__b, __a);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_cmplt(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector bool char)__builtin_altivec_vcmpgtub(__b, __a);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_cmplt(vector short __a, vector short __b)
-{
-  return (vector bool short)__builtin_altivec_vcmpgtsh(__b, __a);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_cmplt(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector bool short)__builtin_altivec_vcmpgtuh(__b, __a);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_cmplt(vector int __a, vector int __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgtsw(__b, __a);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_cmplt(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgtuw(__b, __a);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_cmplt(vector float __a, vector float __b)
-{
-  return (vector bool int)__builtin_altivec_vcmpgtfp(__b, __a);
-}
-
-/* vec_ctf */
-
-static vector float __ATTRS_o_ai
-vec_ctf(vector int __a, int __b)
-{
-  return __builtin_altivec_vcfsx(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_ctf(vector unsigned int __a, int __b)
-{
-  return __builtin_altivec_vcfux((vector int)__a, __b);
-}
-
-/* vec_vcfsx */
-
-static vector float __attribute__((__always_inline__))
-vec_vcfsx(vector int __a, int __b)
-{
-  return __builtin_altivec_vcfsx(__a, __b);
-}
-
-/* vec_vcfux */
-
-static vector float __attribute__((__always_inline__))
-vec_vcfux(vector unsigned int __a, int __b)
-{
-  return __builtin_altivec_vcfux((vector int)__a, __b);
-}
-
-/* vec_cts */
-
-static vector int __attribute__((__always_inline__))
-vec_cts(vector float __a, int __b)
-{
-  return __builtin_altivec_vctsxs(__a, __b);
-}
-
-/* vec_vctsxs */
-
-static vector int __attribute__((__always_inline__))
-vec_vctsxs(vector float __a, int __b)
-{
-  return __builtin_altivec_vctsxs(__a, __b);
-}
-
-/* vec_ctu */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_ctu(vector float __a, int __b)
-{
-  return __builtin_altivec_vctuxs(__a, __b);
-}
-
-/* vec_vctuxs */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vctuxs(vector float __a, int __b)
-{
-  return __builtin_altivec_vctuxs(__a, __b);
-}
-
-/* vec_dss */
-
-static void __attribute__((__always_inline__))
-vec_dss(int __a)
-{
-  __builtin_altivec_dss(__a);
-}
-
-/* vec_dssall */
-
-static void __attribute__((__always_inline__))
-vec_dssall(void)
-{
-  __builtin_altivec_dssall();
-}
-
-/* vec_dst */
-
-static void __attribute__((__always_inline__))
-vec_dst(const void *__a, int __b, int __c)
-{
-  __builtin_altivec_dst(__a, __b, __c);
-}
-
-/* vec_dstst */
-
-static void __attribute__((__always_inline__))
-vec_dstst(const void *__a, int __b, int __c)
-{
-  __builtin_altivec_dstst(__a, __b, __c);
-}
-
-/* vec_dststt */
-
-static void __attribute__((__always_inline__))
-vec_dststt(const void *__a, int __b, int __c)
-{
-  __builtin_altivec_dststt(__a, __b, __c);
-}
-
-/* vec_dstt */
-
-static void __attribute__((__always_inline__))
-vec_dstt(const void *__a, int __b, int __c)
-{
-  __builtin_altivec_dstt(__a, __b, __c);
-}
-
-/* vec_expte */
-
-static vector float __attribute__((__always_inline__))
-vec_expte(vector float __a)
-{
-  return __builtin_altivec_vexptefp(__a);
-}
-
-/* vec_vexptefp */
-
-static vector float __attribute__((__always_inline__))
-vec_vexptefp(vector float __a)
-{
-  return __builtin_altivec_vexptefp(__a);
-}
-
-/* vec_floor */
-
-static vector float __attribute__((__always_inline__))
-vec_floor(vector float __a)
-{
-  return __builtin_altivec_vrfim(__a);
-}
-
-/* vec_vrfim */
-
-static vector float __attribute__((__always_inline__))
-vec_vrfim(vector float __a)
-{
-  return __builtin_altivec_vrfim(__a);
-}
-
-/* vec_ld */
-
-static vector signed char __ATTRS_o_ai
-vec_ld(int __a, const vector signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_ld(int __a, const signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_ld(int __a, const vector unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_ld(int __a, const unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_ld(int __a, const vector bool char *__b)
-{
-  return (vector bool char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_ld(int __a, const vector short *__b)
-{
-  return (vector short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_ld(int __a, const short *__b)
-{
-  return (vector short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_ld(int __a, const vector unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_ld(int __a, const unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_ld(int __a, const vector bool short *__b)
-{
-  return (vector bool short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_ld(int __a, const vector pixel *__b)
-{
-  return (vector pixel)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_ld(int __a, const vector int *__b)
-{
-  return (vector int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_ld(int __a, const int *__b)
-{
-  return (vector int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_ld(int __a, const vector unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_ld(int __a, const unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_ld(int __a, const vector bool int *__b)
-{
-  return (vector bool int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_ld(int __a, const vector float *__b)
-{
-  return (vector float)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_ld(int __a, const float *__b)
-{
-  return (vector float)__builtin_altivec_lvx(__a, __b);
-}
-
-/* vec_lvx */
-
-static vector signed char __ATTRS_o_ai
-vec_lvx(int __a, const vector signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_lvx(int __a, const signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvx(int __a, const vector unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvx(int __a, const unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_lvx(int __a, const vector bool char *__b)
-{
-  return (vector bool char)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_lvx(int __a, const vector short *__b)
-{
-  return (vector short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_lvx(int __a, const short *__b)
-{
-  return (vector short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvx(int __a, const vector unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvx(int __a, const unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_lvx(int __a, const vector bool short *__b)
-{
-  return (vector bool short)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_lvx(int __a, const vector pixel *__b)
-{
-  return (vector pixel)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_lvx(int __a, const vector int *__b)
-{
-  return (vector int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_lvx(int __a, const int *__b)
-{
-  return (vector int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvx(int __a, const vector unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvx(int __a, const unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_lvx(int __a, const vector bool int *__b)
-{
-  return (vector bool int)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_lvx(int __a, const vector float *__b)
-{
-  return (vector float)__builtin_altivec_lvx(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_lvx(int __a, const float *__b)
-{
-  return (vector float)__builtin_altivec_lvx(__a, __b);
-}
-
-/* vec_lde */
-
-static vector signed char __ATTRS_o_ai
-vec_lde(int __a, const signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvebx(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lde(int __a, const unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvebx(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_lde(int __a, const short *__b)
-{
-  return (vector short)__builtin_altivec_lvehx(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lde(int __a, const unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvehx(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_lde(int __a, const int *__b)
-{
-  return (vector int)__builtin_altivec_lvewx(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lde(int __a, const unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvewx(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_lde(int __a, const float *__b)
-{
-  return (vector float)__builtin_altivec_lvewx(__a, __b);
-}
-
-/* vec_lvebx */
-
-static vector signed char __ATTRS_o_ai
-vec_lvebx(int __a, const signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvebx(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvebx(int __a, const unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvebx(__a, __b);
-}
-
-/* vec_lvehx */
-
-static vector short __ATTRS_o_ai
-vec_lvehx(int __a, const short *__b)
-{
-  return (vector short)__builtin_altivec_lvehx(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvehx(int __a, const unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvehx(__a, __b);
-}
-
-/* vec_lvewx */
-
-static vector int __ATTRS_o_ai
-vec_lvewx(int __a, const int *__b)
-{
-  return (vector int)__builtin_altivec_lvewx(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvewx(int __a, const unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvewx(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_lvewx(int __a, const float *__b)
-{
-  return (vector float)__builtin_altivec_lvewx(__a, __b);
-}
-
-/* vec_ldl */
-
-static vector signed char __ATTRS_o_ai
-vec_ldl(int __a, const vector signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_ldl(int __a, const signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_ldl(int __a, const vector unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_ldl(int __a, const unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_ldl(int __a, const vector bool char *__b)
-{
-  return (vector bool char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_ldl(int __a, const vector short *__b)
-{
-  return (vector short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_ldl(int __a, const short *__b)
-{
-  return (vector short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_ldl(int __a, const vector unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_ldl(int __a, const unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_ldl(int __a, const vector bool short *__b)
-{
-  return (vector bool short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_ldl(int __a, const vector pixel *__b)
-{
-  return (vector pixel short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_ldl(int __a, const vector int *__b)
-{
-  return (vector int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_ldl(int __a, const int *__b)
-{
-  return (vector int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_ldl(int __a, const vector unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_ldl(int __a, const unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_ldl(int __a, const vector bool int *__b)
-{
-  return (vector bool int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_ldl(int __a, const vector float *__b)
-{
-  return (vector float)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_ldl(int __a, const float *__b)
-{
-  return (vector float)__builtin_altivec_lvxl(__a, __b);
-}
-
-/* vec_lvxl */
-
-static vector signed char __ATTRS_o_ai
-vec_lvxl(int __a, const vector signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_lvxl(int __a, const signed char *__b)
-{
-  return (vector signed char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvxl(int __a, const vector unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvxl(int __a, const unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_lvxl(int __a, const vector bool char *__b)
-{
-  return (vector bool char)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_lvxl(int __a, const vector short *__b)
-{
-  return (vector short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_lvxl(int __a, const short *__b)
-{
-  return (vector short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvxl(int __a, const vector unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvxl(int __a, const unsigned short *__b)
-{
-  return (vector unsigned short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_lvxl(int __a, const vector bool short *__b)
-{
-  return (vector bool short)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_lvxl(int __a, const vector pixel *__b)
-{
-  return (vector pixel)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_lvxl(int __a, const vector int *__b)
-{
-  return (vector int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_lvxl(int __a, const int *__b)
-{
-  return (vector int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvxl(int __a, const vector unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvxl(int __a, const unsigned int *__b)
-{
-  return (vector unsigned int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_lvxl(int __a, const vector bool int *__b)
-{
-  return (vector bool int)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_lvxl(int __a, const vector float *__b)
-{
-  return (vector float)__builtin_altivec_lvxl(__a, __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_lvxl(int __a, const float *__b)
-{
-  return (vector float)__builtin_altivec_lvxl(__a, __b);
-}
-
-/* vec_loge */
-
-static vector float __attribute__((__always_inline__))
-vec_loge(vector float __a)
-{
-  return __builtin_altivec_vlogefp(__a);
-}
-
-/* vec_vlogefp */
-
-static vector float __attribute__((__always_inline__))
-vec_vlogefp(vector float __a)
-{
-  return __builtin_altivec_vlogefp(__a);
-}
-
-/* vec_lvsl */
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsl(int __a, const signed char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsl(int __a, const unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsl(int __a, const short *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsl(int __a, const unsigned short *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsl(int __a, const int *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsl(int __a, const unsigned int *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsl(int __a, const float *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsl(__a, __b);
-}
-
-/* vec_lvsr */
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsr(int __a, const signed char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsr(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsr(int __a, const unsigned char *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsr(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsr(int __a, const short *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsr(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsr(int __a, const unsigned short *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsr(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsr(int __a, const int *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsr(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsr(int __a, const unsigned int *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsr(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvsr(int __a, const float *__b)
-{
-  return (vector unsigned char)__builtin_altivec_lvsr(__a, __b);
-}
-
-/* vec_madd */
-
-static vector float __attribute__((__always_inline__))
-vec_madd(vector float __a, vector float __b, vector float __c)
-{
-  return __builtin_altivec_vmaddfp(__a, __b, __c);
-}
-
-/* vec_vmaddfp */
-
-static vector float __attribute__((__always_inline__))
-vec_vmaddfp(vector float __a, vector float __b, vector float __c)
-{
-  return __builtin_altivec_vmaddfp(__a, __b, __c);
-}
-
-/* vec_madds */
-
-static vector signed short __attribute__((__always_inline__))
-vec_madds(vector signed short __a, vector signed short __b, vector signed short __c)
-{
-  return __builtin_altivec_vmhaddshs(__a, __b, __c);
-}
-
-/* vec_vmhaddshs */
-static vector signed short __attribute__((__always_inline__))
-vec_vmhaddshs(vector signed short __a,
-              vector signed short __b,
-              vector signed short __c)
-{
-  return __builtin_altivec_vmhaddshs(__a, __b, __c);
-}
-
-/* vec_max */
-
-static vector signed char __ATTRS_o_ai
-vec_max(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vmaxsb(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_max(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vmaxsb((vector signed char)__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_max(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vmaxsb(__a, (vector signed char)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_max(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vmaxub(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_max(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vmaxub((vector unsigned char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_max(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vmaxub(__a, (vector unsigned char)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_max(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vmaxsh(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_max(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vmaxsh((vector short)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_max(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vmaxsh(__a, (vector short)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_max(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vmaxuh(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_max(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vmaxuh((vector unsigned short)__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_max(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vmaxuh(__a, (vector unsigned short)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_max(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vmaxsw(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_max(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vmaxsw((vector int)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_max(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vmaxsw(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_max(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vmaxuw(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_max(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vmaxuw((vector unsigned int)__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_max(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vmaxuw(__a, (vector unsigned int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_max(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vmaxfp(__a, __b);
-}
-
-/* vec_vmaxsb */
-
-static vector signed char __ATTRS_o_ai
-vec_vmaxsb(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vmaxsb(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vmaxsb(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vmaxsb((vector signed char)__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vmaxsb(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vmaxsb(__a, (vector signed char)__b);
-}
-
-/* vec_vmaxub */
-
-static vector unsigned char __ATTRS_o_ai
-vec_vmaxub(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vmaxub(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vmaxub(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vmaxub((vector unsigned char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vmaxub(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vmaxub(__a, (vector unsigned char)__b);
-}
-
-/* vec_vmaxsh */
-
-static vector short __ATTRS_o_ai
-vec_vmaxsh(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vmaxsh(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vmaxsh(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vmaxsh((vector short)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vmaxsh(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vmaxsh(__a, (vector short)__b);
-}
-
-/* vec_vmaxuh */
-
-static vector unsigned short __ATTRS_o_ai
-vec_vmaxuh(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vmaxuh(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vmaxuh(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vmaxuh((vector unsigned short)__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vmaxuh(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vmaxuh(__a, (vector unsigned short)__b);
-}
-
-/* vec_vmaxsw */
-
-static vector int __ATTRS_o_ai
-vec_vmaxsw(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vmaxsw(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vmaxsw(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vmaxsw((vector int)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vmaxsw(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vmaxsw(__a, (vector int)__b);
-}
-
-/* vec_vmaxuw */
-
-static vector unsigned int __ATTRS_o_ai
-vec_vmaxuw(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vmaxuw(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vmaxuw(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vmaxuw((vector unsigned int)__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vmaxuw(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vmaxuw(__a, (vector unsigned int)__b);
-}
-
-/* vec_vmaxfp */
-
-static vector float __attribute__((__always_inline__))
-vec_vmaxfp(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vmaxfp(__a, __b);
-}
-
-/* vec_mergeh */
-
-static vector signed char __ATTRS_o_ai
-vec_mergeh(vector signed char __a, vector signed char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x10, 0x01, 0x11, 0x02, 0x12, 0x03, 0x13, 
-     0x04, 0x14, 0x05, 0x15, 0x06, 0x16, 0x07, 0x17));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_mergeh(vector unsigned char __a, vector unsigned char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x10, 0x01, 0x11, 0x02, 0x12, 0x03, 0x13, 
-     0x04, 0x14, 0x05, 0x15, 0x06, 0x16, 0x07, 0x17));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_mergeh(vector bool char __a, vector bool char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x10, 0x01, 0x11, 0x02, 0x12, 0x03, 0x13, 
-     0x04, 0x14, 0x05, 0x15, 0x06, 0x16, 0x07, 0x17));
-}
-
-static vector short __ATTRS_o_ai
-vec_mergeh(vector short __a, vector short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x10, 0x11, 0x02, 0x03, 0x12, 0x13,
-     0x04, 0x05, 0x14, 0x15, 0x06, 0x07, 0x16, 0x17));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_mergeh(vector unsigned short __a, vector unsigned short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x10, 0x11, 0x02, 0x03, 0x12, 0x13,
-     0x04, 0x05, 0x14, 0x15, 0x06, 0x07, 0x16, 0x17));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_mergeh(vector bool short __a, vector bool short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x10, 0x11, 0x02, 0x03, 0x12, 0x13,
-     0x04, 0x05, 0x14, 0x15, 0x06, 0x07, 0x16, 0x17));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_mergeh(vector pixel __a, vector pixel __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x10, 0x11, 0x02, 0x03, 0x12, 0x13,
-     0x04, 0x05, 0x14, 0x15, 0x06, 0x07, 0x16, 0x17));
-}
-
-static vector int __ATTRS_o_ai
-vec_mergeh(vector int __a, vector int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x13,
-     0x04, 0x05, 0x06, 0x07, 0x14, 0x15, 0x16, 0x17));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_mergeh(vector unsigned int __a, vector unsigned int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x13,
-     0x04, 0x05, 0x06, 0x07, 0x14, 0x15, 0x16, 0x17));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_mergeh(vector bool int __a, vector bool int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x13,
-     0x04, 0x05, 0x06, 0x07, 0x14, 0x15, 0x16, 0x17));
-}
-
-static vector float __ATTRS_o_ai
-vec_mergeh(vector float __a, vector float __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x13,
-     0x04, 0x05, 0x06, 0x07, 0x14, 0x15, 0x16, 0x17));
-}
-
-/* vec_vmrghb */
-
-#define __builtin_altivec_vmrghb vec_vmrghb
-
-static vector signed char __ATTRS_o_ai
-vec_vmrghb(vector signed char __a, vector signed char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x10, 0x01, 0x11, 0x02, 0x12, 0x03, 0x13, 
-     0x04, 0x14, 0x05, 0x15, 0x06, 0x16, 0x07, 0x17));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vmrghb(vector unsigned char __a, vector unsigned char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x10, 0x01, 0x11, 0x02, 0x12, 0x03, 0x13, 
-     0x04, 0x14, 0x05, 0x15, 0x06, 0x16, 0x07, 0x17));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vmrghb(vector bool char __a, vector bool char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x10, 0x01, 0x11, 0x02, 0x12, 0x03, 0x13, 
-     0x04, 0x14, 0x05, 0x15, 0x06, 0x16, 0x07, 0x17));
-}
-
-/* vec_vmrghh */
-
-#define __builtin_altivec_vmrghh vec_vmrghh
-
-static vector short __ATTRS_o_ai
-vec_vmrghh(vector short __a, vector short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x10, 0x11, 0x02, 0x03, 0x12, 0x13,
-     0x04, 0x05, 0x14, 0x15, 0x06, 0x07, 0x16, 0x17));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vmrghh(vector unsigned short __a, vector unsigned short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x10, 0x11, 0x02, 0x03, 0x12, 0x13,
-     0x04, 0x05, 0x14, 0x15, 0x06, 0x07, 0x16, 0x17));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vmrghh(vector bool short __a, vector bool short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x10, 0x11, 0x02, 0x03, 0x12, 0x13,
-     0x04, 0x05, 0x14, 0x15, 0x06, 0x07, 0x16, 0x17));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vmrghh(vector pixel __a, vector pixel __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x10, 0x11, 0x02, 0x03, 0x12, 0x13,
-     0x04, 0x05, 0x14, 0x15, 0x06, 0x07, 0x16, 0x17));
-}
-
-/* vec_vmrghw */
-
-#define __builtin_altivec_vmrghw vec_vmrghw
-
-static vector int __ATTRS_o_ai
-vec_vmrghw(vector int __a, vector int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x13,
-     0x04, 0x05, 0x06, 0x07, 0x14, 0x15, 0x16, 0x17));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vmrghw(vector unsigned int __a, vector unsigned int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x13,
-     0x04, 0x05, 0x06, 0x07, 0x14, 0x15, 0x16, 0x17));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vmrghw(vector bool int __a, vector bool int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x13,
-     0x04, 0x05, 0x06, 0x07, 0x14, 0x15, 0x16, 0x17));
-}
-
-static vector float __ATTRS_o_ai
-vec_vmrghw(vector float __a, vector float __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x00, 0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x13,
-     0x04, 0x05, 0x06, 0x07, 0x14, 0x15, 0x16, 0x17));
-}
-
-/* vec_mergel */
-
-static vector signed char __ATTRS_o_ai
-vec_mergel(vector signed char __a, vector signed char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x18, 0x09, 0x19, 0x0A, 0x1A, 0x0B, 0x1B, 
-     0x0C, 0x1C, 0x0D, 0x1D, 0x0E, 0x1E, 0x0F, 0x1F));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_mergel(vector unsigned char __a, vector unsigned char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x18, 0x09, 0x19, 0x0A, 0x1A, 0x0B, 0x1B, 
-     0x0C, 0x1C, 0x0D, 0x1D, 0x0E, 0x1E, 0x0F, 0x1F));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_mergel(vector bool char __a, vector bool char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x18, 0x09, 0x19, 0x0A, 0x1A, 0x0B, 0x1B, 
-     0x0C, 0x1C, 0x0D, 0x1D, 0x0E, 0x1E, 0x0F, 0x1F));
-}
-
-static vector short __ATTRS_o_ai
-vec_mergel(vector short __a, vector short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x18, 0x19, 0x0A, 0x0B, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x1C, 0x1D, 0x0E, 0x0F, 0x1E, 0x1F));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_mergel(vector unsigned short __a, vector unsigned short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x18, 0x19, 0x0A, 0x0B, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x1C, 0x1D, 0x0E, 0x0F, 0x1E, 0x1F));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_mergel(vector bool short __a, vector bool short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x18, 0x19, 0x0A, 0x0B, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x1C, 0x1D, 0x0E, 0x0F, 0x1E, 0x1F));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_mergel(vector pixel __a, vector pixel __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x18, 0x19, 0x0A, 0x0B, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x1C, 0x1D, 0x0E, 0x0F, 0x1E, 0x1F));
-}
-
-static vector int __ATTRS_o_ai
-vec_mergel(vector int __a, vector int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x0A, 0x0B, 0x18, 0x19, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x0E, 0x0F, 0x1C, 0x1D, 0x1E, 0x1F));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_mergel(vector unsigned int __a, vector unsigned int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x0A, 0x0B, 0x18, 0x19, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x0E, 0x0F, 0x1C, 0x1D, 0x1E, 0x1F));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_mergel(vector bool int __a, vector bool int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x0A, 0x0B, 0x18, 0x19, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x0E, 0x0F, 0x1C, 0x1D, 0x1E, 0x1F));
-}
-
-static vector float __ATTRS_o_ai
-vec_mergel(vector float __a, vector float __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x0A, 0x0B, 0x18, 0x19, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x0E, 0x0F, 0x1C, 0x1D, 0x1E, 0x1F));
-}
-
-/* vec_vmrglb */
-
-#define __builtin_altivec_vmrglb vec_vmrglb
-
-static vector signed char __ATTRS_o_ai
-vec_vmrglb(vector signed char __a, vector signed char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x18, 0x09, 0x19, 0x0A, 0x1A, 0x0B, 0x1B, 
-     0x0C, 0x1C, 0x0D, 0x1D, 0x0E, 0x1E, 0x0F, 0x1F));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vmrglb(vector unsigned char __a, vector unsigned char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x18, 0x09, 0x19, 0x0A, 0x1A, 0x0B, 0x1B, 
-     0x0C, 0x1C, 0x0D, 0x1D, 0x0E, 0x1E, 0x0F, 0x1F));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vmrglb(vector bool char __a, vector bool char __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x18, 0x09, 0x19, 0x0A, 0x1A, 0x0B, 0x1B, 
-     0x0C, 0x1C, 0x0D, 0x1D, 0x0E, 0x1E, 0x0F, 0x1F));
-}
-
-/* vec_vmrglh */
-
-#define __builtin_altivec_vmrglh vec_vmrglh
-
-static vector short __ATTRS_o_ai
-vec_vmrglh(vector short __a, vector short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x18, 0x19, 0x0A, 0x0B, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x1C, 0x1D, 0x0E, 0x0F, 0x1E, 0x1F));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vmrglh(vector unsigned short __a, vector unsigned short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x18, 0x19, 0x0A, 0x0B, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x1C, 0x1D, 0x0E, 0x0F, 0x1E, 0x1F));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vmrglh(vector bool short __a, vector bool short __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x18, 0x19, 0x0A, 0x0B, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x1C, 0x1D, 0x0E, 0x0F, 0x1E, 0x1F));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vmrglh(vector pixel __a, vector pixel __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x18, 0x19, 0x0A, 0x0B, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x1C, 0x1D, 0x0E, 0x0F, 0x1E, 0x1F));
-}
-
-/* vec_vmrglw */
-
-#define __builtin_altivec_vmrglw vec_vmrglw
-
-static vector int __ATTRS_o_ai
-vec_vmrglw(vector int __a, vector int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x0A, 0x0B, 0x18, 0x19, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x0E, 0x0F, 0x1C, 0x1D, 0x1E, 0x1F));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vmrglw(vector unsigned int __a, vector unsigned int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x0A, 0x0B, 0x18, 0x19, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x0E, 0x0F, 0x1C, 0x1D, 0x1E, 0x1F));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vmrglw(vector bool int __a, vector bool int __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x0A, 0x0B, 0x18, 0x19, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x0E, 0x0F, 0x1C, 0x1D, 0x1E, 0x1F));
-}
-
-static vector float __ATTRS_o_ai
-vec_vmrglw(vector float __a, vector float __b)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (0x08, 0x09, 0x0A, 0x0B, 0x18, 0x19, 0x1A, 0x1B,
-     0x0C, 0x0D, 0x0E, 0x0F, 0x1C, 0x1D, 0x1E, 0x1F));
-}
-
-/* vec_mfvscr */
-
-static vector unsigned short __attribute__((__always_inline__))
-vec_mfvscr(void)
-{
-  return __builtin_altivec_mfvscr();
-}
-
-/* vec_min */
-
-static vector signed char __ATTRS_o_ai
-vec_min(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vminsb(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_min(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vminsb((vector signed char)__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_min(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vminsb(__a, (vector signed char)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_min(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vminub(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_min(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vminub((vector unsigned char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_min(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vminub(__a, (vector unsigned char)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_min(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vminsh(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_min(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vminsh((vector short)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_min(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vminsh(__a, (vector short)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_min(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vminuh(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_min(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vminuh((vector unsigned short)__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_min(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vminuh(__a, (vector unsigned short)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_min(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vminsw(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_min(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vminsw((vector int)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_min(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vminsw(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_min(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vminuw(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_min(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vminuw((vector unsigned int)__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_min(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vminuw(__a, (vector unsigned int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_min(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vminfp(__a, __b);
-}
-
-/* vec_vminsb */
-
-static vector signed char __ATTRS_o_ai
-vec_vminsb(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vminsb(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vminsb(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vminsb((vector signed char)__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vminsb(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vminsb(__a, (vector signed char)__b);
-}
-
-/* vec_vminub */
-
-static vector unsigned char __ATTRS_o_ai
-vec_vminub(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vminub(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vminub(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vminub((vector unsigned char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vminub(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vminub(__a, (vector unsigned char)__b);
-}
-
-/* vec_vminsh */
-
-static vector short __ATTRS_o_ai
-vec_vminsh(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vminsh(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vminsh(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vminsh((vector short)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vminsh(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vminsh(__a, (vector short)__b);
-}
-
-/* vec_vminuh */
-
-static vector unsigned short __ATTRS_o_ai
-vec_vminuh(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vminuh(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vminuh(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vminuh((vector unsigned short)__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vminuh(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vminuh(__a, (vector unsigned short)__b);
-}
-
-/* vec_vminsw */
-
-static vector int __ATTRS_o_ai
-vec_vminsw(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vminsw(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vminsw(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vminsw((vector int)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vminsw(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vminsw(__a, (vector int)__b);
-}
-
-/* vec_vminuw */
-
-static vector unsigned int __ATTRS_o_ai
-vec_vminuw(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vminuw(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vminuw(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vminuw((vector unsigned int)__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vminuw(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vminuw(__a, (vector unsigned int)__b);
-}
-
-/* vec_vminfp */
-
-static vector float __attribute__((__always_inline__))
-vec_vminfp(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vminfp(__a, __b);
-}
-
-/* vec_mladd */
-
-#define __builtin_altivec_vmladduhm vec_mladd
-
-static vector short __ATTRS_o_ai
-vec_mladd(vector short __a, vector short __b, vector short __c)
-{
-  return __a * __b + __c;
-}
-
-static vector short __ATTRS_o_ai
-vec_mladd(vector short __a, vector unsigned short __b, vector unsigned short __c)
-{
-  return __a * (vector short)__b + (vector short)__c;
-}
-
-static vector short __ATTRS_o_ai
-vec_mladd(vector unsigned short __a, vector short __b, vector short __c)
-{
-  return (vector short)__a * __b + __c;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_mladd(vector unsigned short __a,
-          vector unsigned short __b,
-          vector unsigned short __c)
-{
-  return __a * __b + __c;
-}
-
-/* vec_vmladduhm */
-
-static vector short __ATTRS_o_ai
-vec_vmladduhm(vector short __a, vector short __b, vector short __c)
-{
-  return __a * __b + __c;
-}
-
-static vector short __ATTRS_o_ai
-vec_vmladduhm(vector short __a, vector unsigned short __b, vector unsigned short __c)
-{
-  return __a * (vector short)__b + (vector short)__c;
-}
-
-static vector short __ATTRS_o_ai
-vec_vmladduhm(vector unsigned short __a, vector short __b, vector short __c)
-{
-  return (vector short)__a * __b + __c;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vmladduhm(vector unsigned short __a,
-              vector unsigned short __b,
-              vector unsigned short __c)
-{
-  return __a * __b + __c;
-}
-
-/* vec_mradds */
-
-static vector short __attribute__((__always_inline__))
-vec_mradds(vector short __a, vector short __b, vector short __c)
-{
-  return __builtin_altivec_vmhraddshs(__a, __b, __c);
-}
-
-/* vec_vmhraddshs */
-
-static vector short __attribute__((__always_inline__))
-vec_vmhraddshs(vector short __a, vector short __b, vector short __c)
-{
-  return __builtin_altivec_vmhraddshs(__a, __b, __c);
-}
-
-/* vec_msum */
-
-static vector int __ATTRS_o_ai
-vec_msum(vector signed char __a, vector unsigned char __b, vector int __c)
-{
-  return __builtin_altivec_vmsummbm(__a, __b, __c);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_msum(vector unsigned char __a, vector unsigned char __b, vector unsigned int __c)
-{
-  return __builtin_altivec_vmsumubm(__a, __b, __c);
-}
-
-static vector int __ATTRS_o_ai
-vec_msum(vector short __a, vector short __b, vector int __c)
-{
-  return __builtin_altivec_vmsumshm(__a, __b, __c);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_msum(vector unsigned short __a,
-         vector unsigned short __b,
-         vector unsigned int __c)
-{
-  return __builtin_altivec_vmsumuhm(__a, __b, __c);
-}
-
-/* vec_vmsummbm */
-
-static vector int __attribute__((__always_inline__))
-vec_vmsummbm(vector signed char __a, vector unsigned char __b, vector int __c)
-{
-  return __builtin_altivec_vmsummbm(__a, __b, __c);
-}
-
-/* vec_vmsumubm */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vmsumubm(vector unsigned char __a,
-             vector unsigned char __b,
-             vector unsigned int __c)
-{
-  return __builtin_altivec_vmsumubm(__a, __b, __c);
-}
-
-/* vec_vmsumshm */
-
-static vector int __attribute__((__always_inline__))
-vec_vmsumshm(vector short __a, vector short __b, vector int __c)
-{
-  return __builtin_altivec_vmsumshm(__a, __b, __c);
-}
-
-/* vec_vmsumuhm */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vmsumuhm(vector unsigned short __a,
-             vector unsigned short __b,
-             vector unsigned int __c)
-{
-  return __builtin_altivec_vmsumuhm(__a, __b, __c);
-}
-
-/* vec_msums */
-
-static vector int __ATTRS_o_ai
-vec_msums(vector short __a, vector short __b, vector int __c)
-{
-  return __builtin_altivec_vmsumshs(__a, __b, __c);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_msums(vector unsigned short __a,
-          vector unsigned short __b,
-          vector unsigned int __c)
-{
-  return __builtin_altivec_vmsumuhs(__a, __b, __c);
-}
-
-/* vec_vmsumshs */
-
-static vector int __attribute__((__always_inline__))
-vec_vmsumshs(vector short __a, vector short __b, vector int __c)
-{
-  return __builtin_altivec_vmsumshs(__a, __b, __c);
-}
-
-/* vec_vmsumuhs */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vmsumuhs(vector unsigned short __a,
-             vector unsigned short __b,
-             vector unsigned int __c)
-{
-  return __builtin_altivec_vmsumuhs(__a, __b, __c);
-}
-
-/* vec_mtvscr */
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector signed char __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector unsigned char __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector bool char __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector short __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector unsigned short __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector bool short __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector pixel __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector int __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector unsigned int __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector bool int __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-static void __ATTRS_o_ai
-vec_mtvscr(vector float __a)
-{
-  __builtin_altivec_mtvscr((vector int)__a);
-}
-
-/* vec_mule */
-
-static vector short __ATTRS_o_ai
-vec_mule(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vmulesb(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_mule(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vmuleub(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_mule(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vmulesh(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_mule(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vmuleuh(__a, __b);
-}
-
-/* vec_vmulesb */
-
-static vector short __attribute__((__always_inline__))
-vec_vmulesb(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vmulesb(__a, __b);
-}
-
-/* vec_vmuleub */
-
-static vector unsigned short __attribute__((__always_inline__))
-vec_vmuleub(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vmuleub(__a, __b);
-}
-
-/* vec_vmulesh */
-
-static vector int __attribute__((__always_inline__))
-vec_vmulesh(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vmulesh(__a, __b);
-}
-
-/* vec_vmuleuh */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vmuleuh(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vmuleuh(__a, __b);
-}
-
-/* vec_mulo */
-
-static vector short __ATTRS_o_ai
-vec_mulo(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vmulosb(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_mulo(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vmuloub(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_mulo(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vmulosh(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_mulo(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vmulouh(__a, __b);
-}
-
-/* vec_vmulosb */
-
-static vector short __attribute__((__always_inline__))
-vec_vmulosb(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vmulosb(__a, __b);
-}
-
-/* vec_vmuloub */
-
-static vector unsigned short __attribute__((__always_inline__))
-vec_vmuloub(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vmuloub(__a, __b);
-}
-
-/* vec_vmulosh */
-
-static vector int __attribute__((__always_inline__))
-vec_vmulosh(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vmulosh(__a, __b);
-}
-
-/* vec_vmulouh */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vmulouh(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vmulouh(__a, __b);
-}
-
-/* vec_nmsub */
-
-static vector float __attribute__((__always_inline__))
-vec_nmsub(vector float __a, vector float __b, vector float __c)
-{
-  return __builtin_altivec_vnmsubfp(__a, __b, __c);
-}
-
-/* vec_vnmsubfp */
-
-static vector float __attribute__((__always_inline__))
-vec_vnmsubfp(vector float __a, vector float __b, vector float __c)
-{
-  return __builtin_altivec_vnmsubfp(__a, __b, __c);
-}
-
-/* vec_nor */
-
-#define __builtin_altivec_vnor vec_nor
-
-static vector signed char __ATTRS_o_ai
-vec_nor(vector signed char __a, vector signed char __b)
-{
-  return ~(__a | __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_nor(vector unsigned char __a, vector unsigned char __b)
-{
-  return ~(__a | __b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_nor(vector bool char __a, vector bool char __b)
-{
-  return ~(__a | __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_nor(vector short __a, vector short __b)
-{
-  return ~(__a | __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_nor(vector unsigned short __a, vector unsigned short __b)
-{
-  return ~(__a | __b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_nor(vector bool short __a, vector bool short __b)
-{
-  return ~(__a | __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_nor(vector int __a, vector int __b)
-{
-  return ~(__a | __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_nor(vector unsigned int __a, vector unsigned int __b)
-{
-  return ~(__a | __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_nor(vector bool int __a, vector bool int __b)
-{
-  return ~(__a | __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_nor(vector float __a, vector float __b)
-{
-  vector unsigned int __res = ~((vector unsigned int)__a | (vector unsigned int)__b);
-  return (vector float)__res;
-}
-
-/* vec_vnor */
-
-static vector signed char __ATTRS_o_ai
-vec_vnor(vector signed char __a, vector signed char __b)
-{
-  return ~(__a | __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vnor(vector unsigned char __a, vector unsigned char __b)
-{
-  return ~(__a | __b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vnor(vector bool char __a, vector bool char __b)
-{
-  return ~(__a | __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vnor(vector short __a, vector short __b)
-{
-  return ~(__a | __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vnor(vector unsigned short __a, vector unsigned short __b)
-{
-  return ~(__a | __b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vnor(vector bool short __a, vector bool short __b)
-{
-  return ~(__a | __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vnor(vector int __a, vector int __b)
-{
-  return ~(__a | __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vnor(vector unsigned int __a, vector unsigned int __b)
-{
-  return ~(__a | __b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vnor(vector bool int __a, vector bool int __b)
-{
-  return ~(__a | __b);
-}
-
-static vector float __ATTRS_o_ai
-vec_vnor(vector float __a, vector float __b)
-{
-  vector unsigned int __res = ~((vector unsigned int)__a | (vector unsigned int)__b);
-  return (vector float)__res;
-}
-
-/* vec_or */
-
-#define __builtin_altivec_vor vec_or
-
-static vector signed char __ATTRS_o_ai
-vec_or(vector signed char __a, vector signed char __b)
-{
-  return __a | __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_or(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a | __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_or(vector signed char __a, vector bool char __b)
-{
-  return __a | (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_or(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a | __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_or(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a | __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_or(vector unsigned char __a, vector bool char __b)
-{
-  return __a | (vector unsigned char)__b;
-}
-
-static vector bool char __ATTRS_o_ai
-vec_or(vector bool char __a, vector bool char __b)
-{
-  return __a | __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_or(vector short __a, vector short __b)
-{
-  return __a | __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_or(vector bool short __a, vector short __b)
-{
-  return (vector short)__a | __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_or(vector short __a, vector bool short __b)
-{
-  return __a | (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_or(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a | __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_or(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a | __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_or(vector unsigned short __a, vector bool short __b)
-{
-  return __a | (vector unsigned short)__b;
-}
-
-static vector bool short __ATTRS_o_ai
-vec_or(vector bool short __a, vector bool short __b)
-{
-  return __a | __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_or(vector int __a, vector int __b)
-{
-  return __a | __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_or(vector bool int __a, vector int __b)
-{
-  return (vector int)__a | __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_or(vector int __a, vector bool int __b)
-{
-  return __a | (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_or(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a | __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_or(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a | __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_or(vector unsigned int __a, vector bool int __b)
-{
-  return __a | (vector unsigned int)__b;
-}
-
-static vector bool int __ATTRS_o_ai
-vec_or(vector bool int __a, vector bool int __b)
-{
-  return __a | __b;
-}
-
-static vector float __ATTRS_o_ai
-vec_or(vector float __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a | (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_or(vector bool int __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a | (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_or(vector float __a, vector bool int __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a | (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-/* vec_vor */
-
-static vector signed char __ATTRS_o_ai
-vec_vor(vector signed char __a, vector signed char __b)
-{
-  return __a | __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vor(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a | __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vor(vector signed char __a, vector bool char __b)
-{
-  return __a | (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vor(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a | __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vor(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a | __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vor(vector unsigned char __a, vector bool char __b)
-{
-  return __a | (vector unsigned char)__b;
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vor(vector bool char __a, vector bool char __b)
-{
-  return __a | __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vor(vector short __a, vector short __b)
-{
-  return __a | __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vor(vector bool short __a, vector short __b)
-{
-  return (vector short)__a | __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vor(vector short __a, vector bool short __b)
-{
-  return __a | (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vor(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a | __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vor(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a | __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vor(vector unsigned short __a, vector bool short __b)
-{
-  return __a | (vector unsigned short)__b;
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vor(vector bool short __a, vector bool short __b)
-{
-  return __a | __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vor(vector int __a, vector int __b)
-{
-  return __a | __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vor(vector bool int __a, vector int __b)
-{
-  return (vector int)__a | __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vor(vector int __a, vector bool int __b)
-{
-  return __a | (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vor(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a | __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vor(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a | __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vor(vector unsigned int __a, vector bool int __b)
-{
-  return __a | (vector unsigned int)__b;
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vor(vector bool int __a, vector bool int __b)
-{
-  return __a | __b;
-}
-
-static vector float __ATTRS_o_ai
-vec_vor(vector float __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a | (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_vor(vector bool int __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a | (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_vor(vector float __a, vector bool int __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a | (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-/* vec_pack */
-
-static vector signed char __ATTRS_o_ai
-vec_pack(vector signed short __a, vector signed short __b)
-{
-  return (vector signed char)vec_perm(__a, __b, (vector unsigned char)
-    (0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0D, 0x0F,
-     0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_pack(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned char)vec_perm(__a, __b, (vector unsigned char)
-    (0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0D, 0x0F,
-     0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_pack(vector bool short __a, vector bool short __b)
-{
-  return (vector bool char)vec_perm(__a, __b, (vector unsigned char)
-    (0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0D, 0x0F,
-     0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F));
-}
-
-static vector short __ATTRS_o_ai
-vec_pack(vector int __a, vector int __b)
-{
-  return (vector short)vec_perm(__a, __b, (vector unsigned char)
-    (0x02, 0x03, 0x06, 0x07, 0x0A, 0x0B, 0x0E, 0x0F,
-     0x12, 0x13, 0x16, 0x17, 0x1A, 0x1B, 0x1E, 0x1F));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_pack(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned short)vec_perm(__a, __b, (vector unsigned char)
-    (0x02, 0x03, 0x06, 0x07, 0x0A, 0x0B, 0x0E, 0x0F,
-     0x12, 0x13, 0x16, 0x17, 0x1A, 0x1B, 0x1E, 0x1F));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_pack(vector bool int __a, vector bool int __b)
-{
-  return (vector bool short)vec_perm(__a, __b, (vector unsigned char)
-    (0x02, 0x03, 0x06, 0x07, 0x0A, 0x0B, 0x0E, 0x0F,
-     0x12, 0x13, 0x16, 0x17, 0x1A, 0x1B, 0x1E, 0x1F));
-}
-
-/* vec_vpkuhum */
-
-#define __builtin_altivec_vpkuhum vec_vpkuhum
-
-static vector signed char __ATTRS_o_ai
-vec_vpkuhum(vector signed short __a, vector signed short __b)
-{
-  return (vector signed char)vec_perm(__a, __b, (vector unsigned char)
-    (0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0D, 0x0F,
-     0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vpkuhum(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned char)vec_perm(__a, __b, (vector unsigned char)
-    (0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0D, 0x0F,
-     0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vpkuhum(vector bool short __a, vector bool short __b)
-{
-  return (vector bool char)vec_perm(__a, __b, (vector unsigned char)
-    (0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0D, 0x0F,
-     0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1D, 0x1F));
-}
-
-/* vec_vpkuwum */
-
-#define __builtin_altivec_vpkuwum vec_vpkuwum
-
-static vector short __ATTRS_o_ai
-vec_vpkuwum(vector int __a, vector int __b)
-{
-  return (vector short)vec_perm(__a, __b, (vector unsigned char)
-    (0x02, 0x03, 0x06, 0x07, 0x0A, 0x0B, 0x0E, 0x0F,
-     0x12, 0x13, 0x16, 0x17, 0x1A, 0x1B, 0x1E, 0x1F));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vpkuwum(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned short)vec_perm(__a, __b, (vector unsigned char)
-    (0x02, 0x03, 0x06, 0x07, 0x0A, 0x0B, 0x0E, 0x0F,
-     0x12, 0x13, 0x16, 0x17, 0x1A, 0x1B, 0x1E, 0x1F));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vpkuwum(vector bool int __a, vector bool int __b)
-{
-  return (vector bool short)vec_perm(__a, __b, (vector unsigned char)
-    (0x02, 0x03, 0x06, 0x07, 0x0A, 0x0B, 0x0E, 0x0F,
-     0x12, 0x13, 0x16, 0x17, 0x1A, 0x1B, 0x1E, 0x1F));
-}
-
-/* vec_packpx */
-
-static vector pixel __attribute__((__always_inline__))
-vec_packpx(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector pixel)__builtin_altivec_vpkpx(__a, __b);
-}
-
-/* vec_vpkpx */
-
-static vector pixel __attribute__((__always_inline__))
-vec_vpkpx(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector pixel)__builtin_altivec_vpkpx(__a, __b);
-}
-
-/* vec_packs */
-
-static vector signed char __ATTRS_o_ai
-vec_packs(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vpkshss(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_packs(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vpkuhus(__a, __b);
-}
-
-static vector signed short __ATTRS_o_ai
-vec_packs(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vpkswss(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_packs(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vpkuwus(__a, __b);
-}
-
-/* vec_vpkshss */
-
-static vector signed char __attribute__((__always_inline__))
-vec_vpkshss(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vpkshss(__a, __b);
-}
-
-/* vec_vpkuhus */
-
-static vector unsigned char __attribute__((__always_inline__))
-vec_vpkuhus(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vpkuhus(__a, __b);
-}
-
-/* vec_vpkswss */
-
-static vector signed short __attribute__((__always_inline__))
-vec_vpkswss(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vpkswss(__a, __b);
-}
-
-/* vec_vpkuwus */
-
-static vector unsigned short __attribute__((__always_inline__))
-vec_vpkuwus(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vpkuwus(__a, __b);
-}
-
-/* vec_packsu */
-
-static vector unsigned char __ATTRS_o_ai
-vec_packsu(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vpkshus(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_packsu(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vpkuhus(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_packsu(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vpkswus(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_packsu(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vpkuwus(__a, __b);
-}
-
-/* vec_vpkshus */
-
-static vector unsigned char __ATTRS_o_ai
-vec_vpkshus(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vpkshus(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vpkshus(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vpkuhus(__a, __b);
-}
-
-/* vec_vpkswus */
-
-static vector unsigned short __ATTRS_o_ai
-vec_vpkswus(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vpkswus(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vpkswus(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vpkuwus(__a, __b);
-}
-
-/* vec_perm */
-
-vector signed char __ATTRS_o_ai
-vec_perm(vector signed char __a, vector signed char __b, vector unsigned char __c)
-{
-  return (vector signed char)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-vector unsigned char __ATTRS_o_ai
-vec_perm(vector unsigned char __a,
-         vector unsigned char __b,
-         vector unsigned char __c)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-vector bool char __ATTRS_o_ai
-vec_perm(vector bool char __a, vector bool char __b, vector unsigned char __c)
-{
-  return (vector bool char)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-vector short __ATTRS_o_ai
-vec_perm(vector short __a, vector short __b, vector unsigned char __c)
-{
-  return (vector short)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-vector unsigned short __ATTRS_o_ai
-vec_perm(vector unsigned short __a,
-         vector unsigned short __b,
-         vector unsigned char __c)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-vector bool short __ATTRS_o_ai
-vec_perm(vector bool short __a, vector bool short __b, vector unsigned char __c)
-{
-  return (vector bool short)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-vector pixel __ATTRS_o_ai
-vec_perm(vector pixel __a, vector pixel __b, vector unsigned char __c)
-{
-  return (vector pixel)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-vector int __ATTRS_o_ai
-vec_perm(vector int __a, vector int __b, vector unsigned char __c)
-{
-  return (vector int)__builtin_altivec_vperm_4si(__a, __b, __c);
-}
-
-vector unsigned int __ATTRS_o_ai
-vec_perm(vector unsigned int __a, vector unsigned int __b, vector unsigned char __c)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-vector bool int __ATTRS_o_ai
-vec_perm(vector bool int __a, vector bool int __b, vector unsigned char __c)
-{
-  return (vector bool int)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-vector float __ATTRS_o_ai
-vec_perm(vector float __a, vector float __b, vector unsigned char __c)
-{
-  return (vector float)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-/* vec_vperm */
-
-static vector signed char __ATTRS_o_ai
-vec_vperm(vector signed char __a, vector signed char __b, vector unsigned char __c)
-{
-  return (vector signed char)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vperm(vector unsigned char __a,
-          vector unsigned char __b,
-          vector unsigned char __c)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vperm(vector bool char __a, vector bool char __b, vector unsigned char __c)
-{
-  return (vector bool char)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-static vector short __ATTRS_o_ai
-vec_vperm(vector short __a, vector short __b, vector unsigned char __c)
-{
-  return (vector short)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vperm(vector unsigned short __a,
-          vector unsigned short __b,
-          vector unsigned char __c)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vperm(vector bool short __a, vector bool short __b, vector unsigned char __c)
-{
-  return (vector bool short)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vperm(vector pixel __a, vector pixel __b, vector unsigned char __c)
-{
-  return (vector pixel)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-static vector int __ATTRS_o_ai
-vec_vperm(vector int __a, vector int __b, vector unsigned char __c)
-{
-  return (vector int)__builtin_altivec_vperm_4si(__a, __b, __c);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vperm(vector unsigned int __a, vector unsigned int __b, vector unsigned char __c)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vperm(vector bool int __a, vector bool int __b, vector unsigned char __c)
-{
-  return (vector bool int)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-static vector float __ATTRS_o_ai
-vec_vperm(vector float __a, vector float __b, vector unsigned char __c)
-{
-  return (vector float)
-           __builtin_altivec_vperm_4si((vector int)__a, (vector int)__b, __c);
-}
-
-/* vec_re */
-
-static vector float __attribute__((__always_inline__))
-vec_re(vector float __a)
-{
-  return __builtin_altivec_vrefp(__a);
-}
-
-/* vec_vrefp */
-
-static vector float __attribute__((__always_inline__))
-vec_vrefp(vector float __a)
-{
-  return __builtin_altivec_vrefp(__a);
-}
-
-/* vec_rl */
-
-static vector signed char __ATTRS_o_ai
-vec_rl(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)__builtin_altivec_vrlb((vector char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_rl(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__builtin_altivec_vrlb((vector char)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_rl(vector short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vrlh(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_rl(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__builtin_altivec_vrlh((vector short)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_rl(vector int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vrlw(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_rl(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__builtin_altivec_vrlw((vector int)__a, __b);
-}
-
-/* vec_vrlb */
-
-static vector signed char __ATTRS_o_ai
-vec_vrlb(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)__builtin_altivec_vrlb((vector char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vrlb(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__builtin_altivec_vrlb((vector char)__a, __b);
-}
-
-/* vec_vrlh */
-
-static vector short __ATTRS_o_ai
-vec_vrlh(vector short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vrlh(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vrlh(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__builtin_altivec_vrlh((vector short)__a, __b);
-}
-
-/* vec_vrlw */
-
-static vector int __ATTRS_o_ai
-vec_vrlw(vector int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vrlw(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vrlw(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__builtin_altivec_vrlw((vector int)__a, __b);
-}
-
-/* vec_round */
-
-static vector float __attribute__((__always_inline__))
-vec_round(vector float __a)
-{
-  return __builtin_altivec_vrfin(__a);
-}
-
-/* vec_vrfin */
-
-static vector float __attribute__((__always_inline__))
-vec_vrfin(vector float __a)
-{
-  return __builtin_altivec_vrfin(__a);
-}
-
-/* vec_rsqrte */
-
-static __vector float __attribute__((__always_inline__))
-vec_rsqrte(vector float __a)
-{
-  return __builtin_altivec_vrsqrtefp(__a);
-}
-
-/* vec_vrsqrtefp */
-
-static __vector float __attribute__((__always_inline__))
-vec_vrsqrtefp(vector float __a)
-{
-  return __builtin_altivec_vrsqrtefp(__a);
-}
-
-/* vec_sel */
-
-#define __builtin_altivec_vsel_4si vec_sel
-
-static vector signed char __ATTRS_o_ai
-vec_sel(vector signed char __a, vector signed char __b, vector unsigned char __c)
-{
-  return (__a & ~(vector signed char)__c) | (__b & (vector signed char)__c);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_sel(vector signed char __a, vector signed char __b, vector bool char __c)
-{
-  return (__a & ~(vector signed char)__c) | (__b & (vector signed char)__c);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sel(vector unsigned char __a, vector unsigned char __b, vector unsigned char __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sel(vector unsigned char __a, vector unsigned char __b, vector bool char __c)
-{
-  return (__a & ~(vector unsigned char)__c) | (__b & (vector unsigned char)__c);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_sel(vector bool char __a, vector bool char __b, vector unsigned char __c)
-{
-  return (__a & ~(vector bool char)__c) | (__b & (vector bool char)__c);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_sel(vector bool char __a, vector bool char __b, vector bool char __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector short __ATTRS_o_ai
-vec_sel(vector short __a, vector short __b, vector unsigned short __c)
-{
-  return (__a & ~(vector short)__c) | (__b & (vector short)__c);
-}
-
-static vector short __ATTRS_o_ai
-vec_sel(vector short __a, vector short __b, vector bool short __c)
-{
-  return (__a & ~(vector short)__c) | (__b & (vector short)__c);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sel(vector unsigned short __a,
-        vector unsigned short __b,
-        vector unsigned short __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sel(vector unsigned short __a, vector unsigned short __b, vector bool short __c)
-{
-  return (__a & ~(vector unsigned short)__c) | (__b & (vector unsigned short)__c);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_sel(vector bool short __a, vector bool short __b, vector unsigned short __c)
-{
-  return (__a & ~(vector bool short)__c) | (__b & (vector bool short)__c);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_sel(vector bool short __a, vector bool short __b, vector bool short __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector int __ATTRS_o_ai
-vec_sel(vector int __a, vector int __b, vector unsigned int __c)
-{
-  return (__a & ~(vector int)__c) | (__b & (vector int)__c);
-}
-
-static vector int __ATTRS_o_ai
-vec_sel(vector int __a, vector int __b, vector bool int __c)
-{
-  return (__a & ~(vector int)__c) | (__b & (vector int)__c);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sel(vector unsigned int __a, vector unsigned int __b, vector unsigned int __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sel(vector unsigned int __a, vector unsigned int __b, vector bool int __c)
-{
-  return (__a & ~(vector unsigned int)__c) | (__b & (vector unsigned int)__c);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_sel(vector bool int __a, vector bool int __b, vector unsigned int __c)
-{
-  return (__a & ~(vector bool int)__c) | (__b & (vector bool int)__c);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_sel(vector bool int __a, vector bool int __b, vector bool int __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector float __ATTRS_o_ai
-vec_sel(vector float __a, vector float __b, vector unsigned int __c)
-{
-  vector int __res = ((vector int)__a & ~(vector int)__c)
-                   | ((vector int)__b & (vector int)__c);
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_sel(vector float __a, vector float __b, vector bool int __c)
-{
-  vector int __res = ((vector int)__a & ~(vector int)__c)
-                   | ((vector int)__b & (vector int)__c);
-  return (vector float)__res;
-}
-
-/* vec_vsel */
-
-static vector signed char __ATTRS_o_ai
-vec_vsel(vector signed char __a, vector signed char __b, vector unsigned char __c)
-{
-  return (__a & ~(vector signed char)__c) | (__b & (vector signed char)__c);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsel(vector signed char __a, vector signed char __b, vector bool char __c)
-{
-  return (__a & ~(vector signed char)__c) | (__b & (vector signed char)__c);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsel(vector unsigned char __a, vector unsigned char __b, vector unsigned char __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsel(vector unsigned char __a, vector unsigned char __b, vector bool char __c)
-{
-  return (__a & ~(vector unsigned char)__c) | (__b & (vector unsigned char)__c);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vsel(vector bool char __a, vector bool char __b, vector unsigned char __c)
-{
-  return (__a & ~(vector bool char)__c) | (__b & (vector bool char)__c);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vsel(vector bool char __a, vector bool char __b, vector bool char __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsel(vector short __a, vector short __b, vector unsigned short __c)
-{
-  return (__a & ~(vector short)__c) | (__b & (vector short)__c);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsel(vector short __a, vector short __b, vector bool short __c)
-{
-  return (__a & ~(vector short)__c) | (__b & (vector short)__c);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsel(vector unsigned short __a,
-         vector unsigned short __b,
-         vector unsigned short __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsel(vector unsigned short __a, vector unsigned short __b, vector bool short __c)
-{
-  return (__a & ~(vector unsigned short)__c) | (__b & (vector unsigned short)__c);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vsel(vector bool short __a, vector bool short __b, vector unsigned short __c)
-{
-  return (__a & ~(vector bool short)__c) | (__b & (vector bool short)__c);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vsel(vector bool short __a, vector bool short __b, vector bool short __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsel(vector int __a, vector int __b, vector unsigned int __c)
-{
-  return (__a & ~(vector int)__c) | (__b & (vector int)__c);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsel(vector int __a, vector int __b, vector bool int __c)
-{
-  return (__a & ~(vector int)__c) | (__b & (vector int)__c);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsel(vector unsigned int __a, vector unsigned int __b, vector unsigned int __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsel(vector unsigned int __a, vector unsigned int __b, vector bool int __c)
-{
-  return (__a & ~(vector unsigned int)__c) | (__b & (vector unsigned int)__c);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vsel(vector bool int __a, vector bool int __b, vector unsigned int __c)
-{
-  return (__a & ~(vector bool int)__c) | (__b & (vector bool int)__c);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vsel(vector bool int __a, vector bool int __b, vector bool int __c)
-{
-  return (__a & ~__c) | (__b & __c);
-}
-
-static vector float __ATTRS_o_ai
-vec_vsel(vector float __a, vector float __b, vector unsigned int __c)
-{
-  vector int __res = ((vector int)__a & ~(vector int)__c)
-                   | ((vector int)__b & (vector int)__c);
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_vsel(vector float __a, vector float __b, vector bool int __c)
-{
-  vector int __res = ((vector int)__a & ~(vector int)__c)
-                   | ((vector int)__b & (vector int)__c);
-  return (vector float)__res;
-}
-
-/* vec_sl */
-
-static vector signed char __ATTRS_o_ai
-vec_sl(vector signed char __a, vector unsigned char __b)
-{
-  return __a << (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sl(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a << __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_sl(vector short __a, vector unsigned short __b)
-{
-  return __a << (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sl(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a << __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_sl(vector int __a, vector unsigned int __b)
-{
-  return __a << (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sl(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a << __b;
-}
-
-/* vec_vslb */
-
-#define __builtin_altivec_vslb vec_vslb
-
-static vector signed char __ATTRS_o_ai
-vec_vslb(vector signed char __a, vector unsigned char __b)
-{
-  return vec_sl(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vslb(vector unsigned char __a, vector unsigned char __b)
-{
-  return vec_sl(__a, __b);
-}
-
-/* vec_vslh */
-
-#define __builtin_altivec_vslh vec_vslh
-
-static vector short __ATTRS_o_ai
-vec_vslh(vector short __a, vector unsigned short __b)
-{
-  return vec_sl(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vslh(vector unsigned short __a, vector unsigned short __b)
-{
-  return vec_sl(__a, __b);
-}
-
-/* vec_vslw */
-
-#define __builtin_altivec_vslw vec_vslw
-
-static vector int __ATTRS_o_ai
-vec_vslw(vector int __a, vector unsigned int __b)
-{
-  return vec_sl(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vslw(vector unsigned int __a, vector unsigned int __b)
-{
-  return vec_sl(__a, __b);
-}
-
-/* vec_sld */
-
-#define __builtin_altivec_vsldoi_4si vec_sld
-
-static vector signed char __ATTRS_o_ai
-vec_sld(vector signed char __a, vector signed char __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sld(vector unsigned char __a, vector unsigned char __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector short __ATTRS_o_ai
-vec_sld(vector short __a, vector short __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sld(vector unsigned short __a, vector unsigned short __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_sld(vector pixel __a, vector pixel __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector int __ATTRS_o_ai
-vec_sld(vector int __a, vector int __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sld(vector unsigned int __a, vector unsigned int __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector float __ATTRS_o_ai
-vec_sld(vector float __a, vector float __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-/* vec_vsldoi */
-
-static vector signed char __ATTRS_o_ai
-vec_vsldoi(vector signed char __a, vector signed char __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsldoi(vector unsigned char __a, vector unsigned char __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector short __ATTRS_o_ai
-vec_vsldoi(vector short __a, vector short __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsldoi(vector unsigned short __a, vector unsigned short __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsldoi(vector pixel __a, vector pixel __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector int __ATTRS_o_ai
-vec_vsldoi(vector int __a, vector int __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsldoi(vector unsigned int __a, vector unsigned int __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-static vector float __ATTRS_o_ai
-vec_vsldoi(vector float __a, vector float __b, unsigned char __c)
-{
-  return vec_perm(__a, __b, (vector unsigned char)
-    (__c,   __c+1, __c+2,  __c+3,  __c+4,  __c+5,  __c+6,  __c+7,
-     __c+8, __c+9, __c+10, __c+11, __c+12, __c+13, __c+14, __c+15));
-}
-
-/* vec_sll */
-
-static vector signed char __ATTRS_o_ai
-vec_sll(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_sll(vector signed char __a, vector unsigned short __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_sll(vector signed char __a, vector unsigned int __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sll(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sll(vector unsigned char __a, vector unsigned short __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sll(vector unsigned char __a, vector unsigned int __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_sll(vector bool char __a, vector unsigned char __b)
-{
-  return (vector bool char)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_sll(vector bool char __a, vector unsigned short __b)
-{
-  return (vector bool char)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_sll(vector bool char __a, vector unsigned int __b)
-{
-  return (vector bool char)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_sll(vector short __a, vector unsigned char __b)
-{
-  return (vector short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_sll(vector short __a, vector unsigned short __b)
-{
-  return (vector short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_sll(vector short __a, vector unsigned int __b)
-{
-  return (vector short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sll(vector unsigned short __a, vector unsigned char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sll(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sll(vector unsigned short __a, vector unsigned int __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_sll(vector bool short __a, vector unsigned char __b)
-{
-  return (vector bool short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_sll(vector bool short __a, vector unsigned short __b)
-{
-  return (vector bool short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_sll(vector bool short __a, vector unsigned int __b)
-{
-  return (vector bool short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_sll(vector pixel __a, vector unsigned char __b)
-{
-  return (vector pixel)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_sll(vector pixel __a, vector unsigned short __b)
-{
-  return (vector pixel)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_sll(vector pixel __a, vector unsigned int __b)
-{
-  return (vector pixel)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_sll(vector int __a, vector unsigned char __b)
-{
-  return (vector int)__builtin_altivec_vsl(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_sll(vector int __a, vector unsigned short __b)
-{
-  return (vector int)__builtin_altivec_vsl(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_sll(vector int __a, vector unsigned int __b)
-{
-  return (vector int)__builtin_altivec_vsl(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sll(vector unsigned int __a, vector unsigned char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sll(vector unsigned int __a, vector unsigned short __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sll(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_sll(vector bool int __a, vector unsigned char __b)
-{
-  return (vector bool int)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_sll(vector bool int __a, vector unsigned short __b)
-{
-  return (vector bool int)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_sll(vector bool int __a, vector unsigned int __b)
-{
-  return (vector bool int)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-/* vec_vsl */
-
-static vector signed char __ATTRS_o_ai
-vec_vsl(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsl(vector signed char __a, vector unsigned short __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsl(vector signed char __a, vector unsigned int __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsl(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsl(vector unsigned char __a, vector unsigned short __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsl(vector unsigned char __a, vector unsigned int __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vsl(vector bool char __a, vector unsigned char __b)
-{
-  return (vector bool char)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vsl(vector bool char __a, vector unsigned short __b)
-{
-  return (vector bool char)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vsl(vector bool char __a, vector unsigned int __b)
-{
-  return (vector bool char)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsl(vector short __a, vector unsigned char __b)
-{
-  return (vector short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsl(vector short __a, vector unsigned short __b)
-{
-  return (vector short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsl(vector short __a, vector unsigned int __b)
-{
-  return (vector short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsl(vector unsigned short __a, vector unsigned char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsl(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsl(vector unsigned short __a, vector unsigned int __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vsl(vector bool short __a, vector unsigned char __b)
-{
-  return (vector bool short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vsl(vector bool short __a, vector unsigned short __b)
-{
-  return (vector bool short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vsl(vector bool short __a, vector unsigned int __b)
-{
-  return (vector bool short)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsl(vector pixel __a, vector unsigned char __b)
-{
-  return (vector pixel)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsl(vector pixel __a, vector unsigned short __b)
-{
-  return (vector pixel)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsl(vector pixel __a, vector unsigned int __b)
-{
-  return (vector pixel)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsl(vector int __a, vector unsigned char __b)
-{
-  return (vector int)__builtin_altivec_vsl(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsl(vector int __a, vector unsigned short __b)
-{
-  return (vector int)__builtin_altivec_vsl(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsl(vector int __a, vector unsigned int __b)
-{
-  return (vector int)__builtin_altivec_vsl(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsl(vector unsigned int __a, vector unsigned char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsl(vector unsigned int __a, vector unsigned short __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsl(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vsl(vector bool int __a, vector unsigned char __b)
-{
-  return (vector bool int)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vsl(vector bool int __a, vector unsigned short __b)
-{
-  return (vector bool int)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vsl(vector bool int __a, vector unsigned int __b)
-{
-  return (vector bool int)__builtin_altivec_vsl((vector int)__a, (vector int)__b);
-}
-
-/* vec_slo */
-
-static vector signed char __ATTRS_o_ai
-vec_slo(vector signed char __a, vector signed char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_slo(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_slo(vector unsigned char __a, vector signed char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_slo(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_slo(vector short __a, vector signed char __b)
-{
-  return (vector short)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_slo(vector short __a, vector unsigned char __b)
-{
-  return (vector short)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_slo(vector unsigned short __a, vector signed char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_slo(vector unsigned short __a, vector unsigned char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_slo(vector pixel __a, vector signed char __b)
-{
-  return (vector pixel)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_slo(vector pixel __a, vector unsigned char __b)
-{
-  return (vector pixel)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_slo(vector int __a, vector signed char __b)
-{
-  return (vector int)__builtin_altivec_vslo(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_slo(vector int __a, vector unsigned char __b)
-{
-  return (vector int)__builtin_altivec_vslo(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_slo(vector unsigned int __a, vector signed char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_slo(vector unsigned int __a, vector unsigned char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_slo(vector float __a, vector signed char __b)
-{
-  return (vector float)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_slo(vector float __a, vector unsigned char __b)
-{
-  return (vector float)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-/* vec_vslo */
-
-static vector signed char __ATTRS_o_ai
-vec_vslo(vector signed char __a, vector signed char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vslo(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vslo(vector unsigned char __a, vector signed char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vslo(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vslo(vector short __a, vector signed char __b)
-{
-  return (vector short)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vslo(vector short __a, vector unsigned char __b)
-{
-  return (vector short)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vslo(vector unsigned short __a, vector signed char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vslo(vector unsigned short __a, vector unsigned char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vslo(vector pixel __a, vector signed char __b)
-{
-  return (vector pixel)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vslo(vector pixel __a, vector unsigned char __b)
-{
-  return (vector pixel)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vslo(vector int __a, vector signed char __b)
-{
-  return (vector int)__builtin_altivec_vslo(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vslo(vector int __a, vector unsigned char __b)
-{
-  return (vector int)__builtin_altivec_vslo(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vslo(vector unsigned int __a, vector signed char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vslo(vector unsigned int __a, vector unsigned char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_vslo(vector float __a, vector signed char __b)
-{
-  return (vector float)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_vslo(vector float __a, vector unsigned char __b)
-{
-  return (vector float)__builtin_altivec_vslo((vector int)__a, (vector int)__b);
-}
-
-/* vec_splat */
-
-static vector signed char __ATTRS_o_ai
-vec_splat(vector signed char __a, unsigned char __b)
-{
-  return vec_perm(__a, __a, (vector unsigned char)(__b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_splat(vector unsigned char __a, unsigned char __b)
-{
-  return vec_perm(__a, __a, (vector unsigned char)(__b));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_splat(vector bool char __a, unsigned char __b)
-{
-  return vec_perm(__a, __a, (vector unsigned char)(__b));
-}
-
-static vector short __ATTRS_o_ai
-vec_splat(vector short __a, unsigned char __b)
-{ 
-  __b *= 2;
-  unsigned char b1=__b+1;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_splat(vector unsigned short __a, unsigned char __b)
-{ 
-  __b *= 2;
-  unsigned char b1=__b+1;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_splat(vector bool short __a, unsigned char __b)
-{ 
-  __b *= 2;
-  unsigned char b1=__b+1;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_splat(vector pixel __a, unsigned char __b)
-{ 
-  __b *= 2;
-  unsigned char b1=__b+1;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1));
-}
-
-static vector int __ATTRS_o_ai
-vec_splat(vector int __a, unsigned char __b)
-{ 
-  __b *= 4;
-  unsigned char b1=__b+1, b2=__b+2, b3=__b+3;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_splat(vector unsigned int __a, unsigned char __b)
-{ 
-  __b *= 4;
-  unsigned char b1=__b+1, b2=__b+2, b3=__b+3;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_splat(vector bool int __a, unsigned char __b)
-{ 
-  __b *= 4;
-  unsigned char b1=__b+1, b2=__b+2, b3=__b+3;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3));
-}
-
-static vector float __ATTRS_o_ai
-vec_splat(vector float __a, unsigned char __b)
-{ 
-  __b *= 4;
-  unsigned char b1=__b+1, b2=__b+2, b3=__b+3;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3));
-}
-
-/* vec_vspltb */
-
-#define __builtin_altivec_vspltb vec_vspltb
-
-static vector signed char __ATTRS_o_ai
-vec_vspltb(vector signed char __a, unsigned char __b)
-{
-  return vec_perm(__a, __a, (vector unsigned char)(__b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vspltb(vector unsigned char __a, unsigned char __b)
-{
-  return vec_perm(__a, __a, (vector unsigned char)(__b));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vspltb(vector bool char __a, unsigned char __b)
-{
-  return vec_perm(__a, __a, (vector unsigned char)(__b));
-}
-
-/* vec_vsplth */
-
-#define __builtin_altivec_vsplth vec_vsplth
-
-static vector short __ATTRS_o_ai
-vec_vsplth(vector short __a, unsigned char __b)
-{
-  __b *= 2;
-  unsigned char b1=__b+1;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsplth(vector unsigned short __a, unsigned char __b)
-{
-  __b *= 2;
-  unsigned char b1=__b+1;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vsplth(vector bool short __a, unsigned char __b)
-{
-  __b *= 2;
-  unsigned char b1=__b+1;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsplth(vector pixel __a, unsigned char __b)
-{
-  __b *= 2;
-  unsigned char b1=__b+1;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1, __b, b1));
-}
-
-/* vec_vspltw */
-
-#define __builtin_altivec_vspltw vec_vspltw
-
-static vector int __ATTRS_o_ai
-vec_vspltw(vector int __a, unsigned char __b)
-{
-  __b *= 4;
-  unsigned char b1=__b+1, b2=__b+2, b3=__b+3;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vspltw(vector unsigned int __a, unsigned char __b)
-{
-  __b *= 4;
-  unsigned char b1=__b+1, b2=__b+2, b3=__b+3;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vspltw(vector bool int __a, unsigned char __b)
-{
-  __b *= 4;
-  unsigned char b1=__b+1, b2=__b+2, b3=__b+3;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3));
-}
-
-static vector float __ATTRS_o_ai
-vec_vspltw(vector float __a, unsigned char __b)
-{
-  __b *= 4;
-  unsigned char b1=__b+1, b2=__b+2, b3=__b+3;
-  return vec_perm(__a, __a, (vector unsigned char)
-    (__b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3, __b, b1, b2, b3));
-}
-
-/* vec_splat_s8 */
-
-#define __builtin_altivec_vspltisb vec_splat_s8
-
-// FIXME: parameter should be treated as 5-bit signed literal
-static vector signed char __ATTRS_o_ai
-vec_splat_s8(signed char __a)
-{
-  return (vector signed char)(__a);
-}
-
-/* vec_vspltisb */
-
-// FIXME: parameter should be treated as 5-bit signed literal
-static vector signed char __ATTRS_o_ai
-vec_vspltisb(signed char __a)
-{
-  return (vector signed char)(__a);
-}
-
-/* vec_splat_s16 */
-
-#define __builtin_altivec_vspltish vec_splat_s16
-
-// FIXME: parameter should be treated as 5-bit signed literal
-static vector short __ATTRS_o_ai
-vec_splat_s16(signed char __a)
-{
-  return (vector short)(__a);
-}
-
-/* vec_vspltish */
-
-// FIXME: parameter should be treated as 5-bit signed literal
-static vector short __ATTRS_o_ai
-vec_vspltish(signed char __a)
-{
-  return (vector short)(__a);
-}
-
-/* vec_splat_s32 */
-
-#define __builtin_altivec_vspltisw vec_splat_s32
-
-// FIXME: parameter should be treated as 5-bit signed literal
-static vector int __ATTRS_o_ai
-vec_splat_s32(signed char __a)
-{
-  return (vector int)(__a);
-}
-
-/* vec_vspltisw */
-
-// FIXME: parameter should be treated as 5-bit signed literal
-static vector int __ATTRS_o_ai
-vec_vspltisw(signed char __a)
-{
-  return (vector int)(__a);
-}
-
-/* vec_splat_u8 */
-
-// FIXME: parameter should be treated as 5-bit signed literal
-static vector unsigned char __ATTRS_o_ai
-vec_splat_u8(unsigned char __a)
-{
-  return (vector unsigned char)(__a);
-}
-
-/* vec_splat_u16 */
-
-// FIXME: parameter should be treated as 5-bit signed literal
-static vector unsigned short __ATTRS_o_ai
-vec_splat_u16(signed char __a)
-{
-  return (vector unsigned short)(__a);
-}
-
-/* vec_splat_u32 */
-
-// FIXME: parameter should be treated as 5-bit signed literal
-static vector unsigned int __ATTRS_o_ai
-vec_splat_u32(signed char __a)
-{
-  return (vector unsigned int)(__a);
-}
-
-/* vec_sr */
-
-static vector signed char __ATTRS_o_ai
-vec_sr(vector signed char __a, vector unsigned char __b)
-{
-  return __a >> (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sr(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a >> __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_sr(vector short __a, vector unsigned short __b)
-{
-  return __a >> (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sr(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a >> __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_sr(vector int __a, vector unsigned int __b)
-{
-  return __a >> (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sr(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a >> __b;
-}
-
-/* vec_vsrb */
-
-#define __builtin_altivec_vsrb vec_vsrb
-
-static vector signed char __ATTRS_o_ai
-vec_vsrb(vector signed char __a, vector unsigned char __b)
-{
-  return __a >> (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsrb(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a >> __b;
-}
-
-/* vec_vsrh */
-
-#define __builtin_altivec_vsrh vec_vsrh
-
-static vector short __ATTRS_o_ai
-vec_vsrh(vector short __a, vector unsigned short __b)
-{
-  return __a >> (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsrh(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a >> __b;
-}
-
-/* vec_vsrw */
-
-#define __builtin_altivec_vsrw vec_vsrw
-
-static vector int __ATTRS_o_ai
-vec_vsrw(vector int __a, vector unsigned int __b)
-{
-  return __a >> (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsrw(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a >> __b;
-}
-
-/* vec_sra */
-
-static vector signed char __ATTRS_o_ai
-vec_sra(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)__builtin_altivec_vsrab((vector char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sra(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__builtin_altivec_vsrab((vector char)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_sra(vector short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vsrah(__a, (vector unsigned short)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sra(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__builtin_altivec_vsrah((vector short)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_sra(vector int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsraw(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sra(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__builtin_altivec_vsraw((vector int)__a, __b);
-}
-
-/* vec_vsrab */
-
-static vector signed char __ATTRS_o_ai
-vec_vsrab(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)__builtin_altivec_vsrab((vector char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsrab(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__builtin_altivec_vsrab((vector char)__a, __b);
-}
-
-/* vec_vsrah */
-
-static vector short __ATTRS_o_ai
-vec_vsrah(vector short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vsrah(__a, (vector unsigned short)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsrah(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__builtin_altivec_vsrah((vector short)__a, __b);
-}
-
-/* vec_vsraw */
-
-static vector int __ATTRS_o_ai
-vec_vsraw(vector int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsraw(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsraw(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__builtin_altivec_vsraw((vector int)__a, __b);
-}
-
-/* vec_srl */
-
-static vector signed char __ATTRS_o_ai
-vec_srl(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_srl(vector signed char __a, vector unsigned short __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_srl(vector signed char __a, vector unsigned int __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_srl(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_srl(vector unsigned char __a, vector unsigned short __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_srl(vector unsigned char __a, vector unsigned int __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_srl(vector bool char __a, vector unsigned char __b)
-{
-  return (vector bool char)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_srl(vector bool char __a, vector unsigned short __b)
-{
-  return (vector bool char)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_srl(vector bool char __a, vector unsigned int __b)
-{
-  return (vector bool char)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_srl(vector short __a, vector unsigned char __b)
-{
-  return (vector short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_srl(vector short __a, vector unsigned short __b)
-{
-  return (vector short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_srl(vector short __a, vector unsigned int __b)
-{
-  return (vector short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_srl(vector unsigned short __a, vector unsigned char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_srl(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_srl(vector unsigned short __a, vector unsigned int __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_srl(vector bool short __a, vector unsigned char __b)
-{
-  return (vector bool short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_srl(vector bool short __a, vector unsigned short __b)
-{
-  return (vector bool short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_srl(vector bool short __a, vector unsigned int __b)
-{
-  return (vector bool short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_srl(vector pixel __a, vector unsigned char __b)
-{
-  return (vector pixel)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_srl(vector pixel __a, vector unsigned short __b)
-{
-  return (vector pixel)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_srl(vector pixel __a, vector unsigned int __b)
-{
-  return (vector pixel)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_srl(vector int __a, vector unsigned char __b)
-{
-  return (vector int)__builtin_altivec_vsr(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_srl(vector int __a, vector unsigned short __b)
-{
-  return (vector int)__builtin_altivec_vsr(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_srl(vector int __a, vector unsigned int __b)
-{
-  return (vector int)__builtin_altivec_vsr(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_srl(vector unsigned int __a, vector unsigned char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_srl(vector unsigned int __a, vector unsigned short __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_srl(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_srl(vector bool int __a, vector unsigned char __b)
-{
-  return (vector bool int)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_srl(vector bool int __a, vector unsigned short __b)
-{
-  return (vector bool int)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_srl(vector bool int __a, vector unsigned int __b)
-{
-  return (vector bool int)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-/* vec_vsr */
-
-static vector signed char __ATTRS_o_ai
-vec_vsr(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsr(vector signed char __a, vector unsigned short __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsr(vector signed char __a, vector unsigned int __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsr(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsr(vector unsigned char __a, vector unsigned short __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsr(vector unsigned char __a, vector unsigned int __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vsr(vector bool char __a, vector unsigned char __b)
-{
-  return (vector bool char)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vsr(vector bool char __a, vector unsigned short __b)
-{
-  return (vector bool char)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vsr(vector bool char __a, vector unsigned int __b)
-{
-  return (vector bool char)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsr(vector short __a, vector unsigned char __b)
-{
-  return (vector short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsr(vector short __a, vector unsigned short __b)
-{
-  return (vector short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsr(vector short __a, vector unsigned int __b)
-{
-  return (vector short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsr(vector unsigned short __a, vector unsigned char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsr(vector unsigned short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsr(vector unsigned short __a, vector unsigned int __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vsr(vector bool short __a, vector unsigned char __b)
-{
-  return (vector bool short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vsr(vector bool short __a, vector unsigned short __b)
-{
-  return (vector bool short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vsr(vector bool short __a, vector unsigned int __b)
-{
-  return (vector bool short)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsr(vector pixel __a, vector unsigned char __b)
-{
-  return (vector pixel)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsr(vector pixel __a, vector unsigned short __b)
-{
-  return (vector pixel)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsr(vector pixel __a, vector unsigned int __b)
-{
-  return (vector pixel)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsr(vector int __a, vector unsigned char __b)
-{
-  return (vector int)__builtin_altivec_vsr(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsr(vector int __a, vector unsigned short __b)
-{
-  return (vector int)__builtin_altivec_vsr(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsr(vector int __a, vector unsigned int __b)
-{
-  return (vector int)__builtin_altivec_vsr(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsr(vector unsigned int __a, vector unsigned char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsr(vector unsigned int __a, vector unsigned short __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsr(vector unsigned int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vsr(vector bool int __a, vector unsigned char __b)
-{
-  return (vector bool int)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vsr(vector bool int __a, vector unsigned short __b)
-{
-  return (vector bool int)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vsr(vector bool int __a, vector unsigned int __b)
-{
-  return (vector bool int)__builtin_altivec_vsr((vector int)__a, (vector int)__b);
-}
-
-/* vec_sro */
-
-static vector signed char __ATTRS_o_ai
-vec_sro(vector signed char __a, vector signed char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_sro(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sro(vector unsigned char __a, vector signed char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sro(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_sro(vector short __a, vector signed char __b)
-{
-  return (vector short)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_sro(vector short __a, vector unsigned char __b)
-{
-  return (vector short)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sro(vector unsigned short __a, vector signed char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sro(vector unsigned short __a, vector unsigned char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_sro(vector pixel __a, vector signed char __b)
-{
-  return (vector pixel)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_sro(vector pixel __a, vector unsigned char __b)
-{
-  return (vector pixel)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_sro(vector int __a, vector signed char __b)
-{
-  return (vector int)__builtin_altivec_vsro(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_sro(vector int __a, vector unsigned char __b)
-{
-  return (vector int)__builtin_altivec_vsro(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sro(vector unsigned int __a, vector signed char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sro(vector unsigned int __a, vector unsigned char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_sro(vector float __a, vector signed char __b)
-{
-  return (vector float)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_sro(vector float __a, vector unsigned char __b)
-{
-  return (vector float)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-/* vec_vsro */
-
-static vector signed char __ATTRS_o_ai
-vec_vsro(vector signed char __a, vector signed char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsro(vector signed char __a, vector unsigned char __b)
-{
-  return (vector signed char)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsro(vector unsigned char __a, vector signed char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsro(vector unsigned char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsro(vector short __a, vector signed char __b)
-{
-  return (vector short)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsro(vector short __a, vector unsigned char __b)
-{
-  return (vector short)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsro(vector unsigned short __a, vector signed char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsro(vector unsigned short __a, vector unsigned char __b)
-{
-  return (vector unsigned short)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsro(vector pixel __a, vector signed char __b)
-{
-  return (vector pixel)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector pixel __ATTRS_o_ai
-vec_vsro(vector pixel __a, vector unsigned char __b)
-{
-  return (vector pixel)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsro(vector int __a, vector signed char __b)
-{
-  return (vector int)__builtin_altivec_vsro(__a, (vector int)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsro(vector int __a, vector unsigned char __b)
-{
-  return (vector int)__builtin_altivec_vsro(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsro(vector unsigned int __a, vector signed char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsro(vector unsigned int __a, vector unsigned char __b)
-{
-  return (vector unsigned int)
-           __builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_vsro(vector float __a, vector signed char __b)
-{
-  return (vector float)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-static vector float __ATTRS_o_ai
-vec_vsro(vector float __a, vector unsigned char __b)
-{
-  return (vector float)__builtin_altivec_vsro((vector int)__a, (vector int)__b);
-}
-
-/* vec_st */
-
-static void __ATTRS_o_ai
-vec_st(vector signed char __a, int __b, vector signed char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector signed char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector unsigned char __a, int __b, vector unsigned char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector bool char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector bool char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector bool char __a, int __b, vector bool char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector short __a, int __b, vector short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector unsigned short __a, int __b, vector unsigned short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector bool short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector bool short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector bool short __a, int __b, vector bool short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector pixel __a, int __b, short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector pixel __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector pixel __a, int __b, vector pixel *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector int __a, int __b, vector int *__c)
-{
-  __builtin_altivec_stvx(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvx(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector unsigned int __a, int __b, vector unsigned int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector bool int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector bool int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector bool int __a, int __b, vector bool int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector float __a, int __b, vector float *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_st(vector float __a, int __b, float *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-/* vec_stvx */
-
-static void __ATTRS_o_ai
-vec_stvx(vector signed char __a, int __b, vector signed char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector signed char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector unsigned char __a, int __b, vector unsigned char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector bool char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector bool char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector bool char __a, int __b, vector bool char *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector short __a, int __b, vector short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector unsigned short __a, int __b, vector unsigned short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector bool short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector bool short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector bool short __a, int __b, vector bool short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector pixel __a, int __b, short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector pixel __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector pixel __a, int __b, vector pixel *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector int __a, int __b, vector int *__c)
-{
-  __builtin_altivec_stvx(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvx(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector unsigned int __a, int __b, vector unsigned int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector bool int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector bool int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector bool int __a, int __b, vector bool int *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector float __a, int __b, vector float *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvx(vector float __a, int __b, float *__c)
-{
-  __builtin_altivec_stvx((vector int)__a, __b, __c);
-}
-
-/* vec_ste */
-
-static void __ATTRS_o_ai
-vec_ste(vector signed char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvebx((vector char)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvebx((vector char)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector bool char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvebx((vector char)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector bool char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvebx((vector char)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvehx(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector bool short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector bool short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector pixel __a, int __b, short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector pixel __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvewx(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvewx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector bool int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvewx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector bool int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvewx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_ste(vector float __a, int __b, float *__c)
-{
-  __builtin_altivec_stvewx((vector int)__a, __b, __c);
-}
-
-/* vec_stvebx */
-
-static void __ATTRS_o_ai
-vec_stvebx(vector signed char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvebx((vector char)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvebx(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvebx((vector char)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvebx(vector bool char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvebx((vector char)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvebx(vector bool char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvebx((vector char)__a, __b, __c);
-}
-
-/* vec_stvehx */
-
-static void __ATTRS_o_ai
-vec_stvehx(vector short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvehx(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvehx(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvehx(vector bool short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvehx(vector bool short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvehx(vector pixel __a, int __b, short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvehx(vector pixel __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvehx((vector short)__a, __b, __c);
-}
-
-/* vec_stvewx */
-
-static void __ATTRS_o_ai
-vec_stvewx(vector int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvewx(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvewx(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvewx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvewx(vector bool int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvewx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvewx(vector bool int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvewx((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvewx(vector float __a, int __b, float *__c)
-{
-  __builtin_altivec_stvewx((vector int)__a, __b, __c);
-}
-
-/* vec_stl */
-
-static void __ATTRS_o_ai
-vec_stl(vector signed char __a, int __b, vector signed char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector signed char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector unsigned char __a, int __b, vector unsigned char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector bool char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector bool char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector bool char __a, int __b, vector bool char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector short __a, int __b, vector short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector unsigned short __a, int __b, vector unsigned short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector bool short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector bool short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector bool short __a, int __b, vector bool short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector pixel __a, int __b, short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector pixel __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector pixel __a, int __b, vector pixel *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector int __a, int __b, vector int *__c)
-{
-  __builtin_altivec_stvxl(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvxl(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector unsigned int __a, int __b, vector unsigned int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector bool int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector bool int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector bool int __a, int __b, vector bool int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector float __a, int __b, vector float *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stl(vector float __a, int __b, float *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-/* vec_stvxl */
-
-static void __ATTRS_o_ai
-vec_stvxl(vector signed char __a, int __b, vector signed char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector signed char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector unsigned char __a, int __b, vector unsigned char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector bool char __a, int __b, signed char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector bool char __a, int __b, unsigned char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector bool char __a, int __b, vector bool char *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector short __a, int __b, vector short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector unsigned short __a, int __b, vector unsigned short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector bool short __a, int __b, short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector bool short __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector bool short __a, int __b, vector bool short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector pixel __a, int __b, short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector pixel __a, int __b, unsigned short *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector pixel __a, int __b, vector pixel *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector int __a, int __b, vector int *__c)
-{
-  __builtin_altivec_stvxl(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvxl(__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector unsigned int __a, int __b, vector unsigned int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector bool int __a, int __b, int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector bool int __a, int __b, unsigned int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector bool int __a, int __b, vector bool int *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector float __a, int __b, vector float *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvxl(vector float __a, int __b, float *__c)
-{
-  __builtin_altivec_stvxl((vector int)__a, __b, __c);
-}
-
-/* vec_sub */
-
-static vector signed char __ATTRS_o_ai
-vec_sub(vector signed char __a, vector signed char __b)
-{
-  return __a - __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_sub(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a - __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_sub(vector signed char __a, vector bool char __b)
-{
-  return __a - (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sub(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a - __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sub(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a - __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_sub(vector unsigned char __a, vector bool char __b)
-{
-  return __a - (vector unsigned char)__b;
-}
-
-static vector short __ATTRS_o_ai
-vec_sub(vector short __a, vector short __b)
-{
-  return __a - __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_sub(vector bool short __a, vector short __b)
-{
-  return (vector short)__a - __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_sub(vector short __a, vector bool short __b)
-{
-  return __a - (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sub(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a - __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sub(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a - __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_sub(vector unsigned short __a, vector bool short __b)
-{
-  return __a - (vector unsigned short)__b;
-}
-
-static vector int __ATTRS_o_ai
-vec_sub(vector int __a, vector int __b)
-{
-  return __a - __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_sub(vector bool int __a, vector int __b)
-{
-  return (vector int)__a - __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_sub(vector int __a, vector bool int __b)
-{
-  return __a - (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sub(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a - __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sub(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a - __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sub(vector unsigned int __a, vector bool int __b)
-{
-  return __a - (vector unsigned int)__b;
-}
-
-static vector float __ATTRS_o_ai
-vec_sub(vector float __a, vector float __b)
-{
-  return __a - __b;
-}
-
-/* vec_vsububm */
-
-#define __builtin_altivec_vsububm vec_vsububm
-
-static vector signed char __ATTRS_o_ai
-vec_vsububm(vector signed char __a, vector signed char __b)
-{
-  return __a - __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsububm(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a - __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsububm(vector signed char __a, vector bool char __b)
-{
-  return __a - (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsububm(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a - __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsububm(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a - __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsububm(vector unsigned char __a, vector bool char __b)
-{
-  return __a - (vector unsigned char)__b;
-}
-
-/* vec_vsubuhm */
-
-#define __builtin_altivec_vsubuhm vec_vsubuhm
-
-static vector short __ATTRS_o_ai
-vec_vsubuhm(vector short __a, vector short __b)
-{
-  return __a - __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vsubuhm(vector bool short __a, vector short __b)
-{
-  return (vector short)__a - __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vsubuhm(vector short __a, vector bool short __b)
-{
-  return __a - (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsubuhm(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a - __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsubuhm(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a - __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsubuhm(vector unsigned short __a, vector bool short __b)
-{
-  return __a - (vector unsigned short)__b;
-}
-
-/* vec_vsubuwm */
-
-#define __builtin_altivec_vsubuwm vec_vsubuwm
-
-static vector int __ATTRS_o_ai
-vec_vsubuwm(vector int __a, vector int __b)
-{
-  return __a - __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vsubuwm(vector bool int __a, vector int __b)
-{
-  return (vector int)__a - __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vsubuwm(vector int __a, vector bool int __b)
-{
-  return __a - (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsubuwm(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a - __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsubuwm(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a - __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsubuwm(vector unsigned int __a, vector bool int __b)
-{
-  return __a - (vector unsigned int)__b;
-}
-
-/* vec_vsubfp */
-
-#define __builtin_altivec_vsubfp vec_vsubfp
-
-static vector float __attribute__((__always_inline__))
-vec_vsubfp(vector float __a, vector float __b)
-{
-  return __a - __b;
-}
-
-/* vec_subc */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_subc(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsubcuw(__a, __b);
-}
-
-/* vec_vsubcuw */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vsubcuw(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsubcuw(__a, __b);
-}
-
-/* vec_subs */
-
-static vector signed char __ATTRS_o_ai
-vec_subs(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vsubsbs(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_subs(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vsubsbs((vector signed char)__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_subs(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vsubsbs(__a, (vector signed char)__b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_subs(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vsububs(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_subs(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vsububs((vector unsigned char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_subs(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vsububs(__a, (vector unsigned char)__b);
-}
-
-static vector short __ATTRS_o_ai
-vec_subs(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vsubshs(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_subs(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vsubshs((vector short)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_subs(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vsubshs(__a, (vector short)__b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_subs(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vsubuhs(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_subs(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vsubuhs((vector unsigned short)__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_subs(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vsubuhs(__a, (vector unsigned short)__b);
-}
-
-static vector int __ATTRS_o_ai
-vec_subs(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vsubsws(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_subs(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vsubsws((vector int)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_subs(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vsubsws(__a, (vector int)__b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_subs(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsubuws(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_subs(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsubuws((vector unsigned int)__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_subs(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vsubuws(__a, (vector unsigned int)__b);
-}
-
-/* vec_vsubsbs */
-
-static vector signed char __ATTRS_o_ai
-vec_vsubsbs(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vsubsbs(__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsubsbs(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vsubsbs((vector signed char)__a, __b);
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vsubsbs(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vsubsbs(__a, (vector signed char)__b);
-}
-
-/* vec_vsububs */
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsububs(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vsububs(__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsububs(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vsububs((vector unsigned char)__a, __b);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vsububs(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vsububs(__a, (vector unsigned char)__b);
-}
-
-/* vec_vsubshs */
-
-static vector short __ATTRS_o_ai
-vec_vsubshs(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vsubshs(__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsubshs(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vsubshs((vector short)__a, __b);
-}
-
-static vector short __ATTRS_o_ai
-vec_vsubshs(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vsubshs(__a, (vector short)__b);
-}
-
-/* vec_vsubuhs */
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsubuhs(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vsubuhs(__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsubuhs(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vsubuhs((vector unsigned short)__a, __b);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vsubuhs(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vsubuhs(__a, (vector unsigned short)__b);
-}
-
-/* vec_vsubsws */
-
-static vector int __ATTRS_o_ai
-vec_vsubsws(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vsubsws(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsubsws(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vsubsws((vector int)__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_vsubsws(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vsubsws(__a, (vector int)__b);
-}
-
-/* vec_vsubuws */
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsubuws(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsubuws(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsubuws(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsubuws((vector unsigned int)__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vsubuws(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vsubuws(__a, (vector unsigned int)__b);
-}
-
-/* vec_sum4s */
-
-static vector int __ATTRS_o_ai
-vec_sum4s(vector signed char __a, vector int __b)
-{
-  return __builtin_altivec_vsum4sbs(__a, __b);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_sum4s(vector unsigned char __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsum4ubs(__a, __b);
-}
-
-static vector int __ATTRS_o_ai
-vec_sum4s(vector signed short __a, vector int __b)
-{
-  return __builtin_altivec_vsum4shs(__a, __b);
-}
-
-/* vec_vsum4sbs */
-
-static vector int __attribute__((__always_inline__))
-vec_vsum4sbs(vector signed char __a, vector int __b)
-{
-  return __builtin_altivec_vsum4sbs(__a, __b);
-}
-
-/* vec_vsum4ubs */
-
-static vector unsigned int __attribute__((__always_inline__))
-vec_vsum4ubs(vector unsigned char __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vsum4ubs(__a, __b);
-}
-
-/* vec_vsum4shs */
-
-static vector int __attribute__((__always_inline__))
-vec_vsum4shs(vector signed short __a, vector int __b)
-{
-  return __builtin_altivec_vsum4shs(__a, __b);
-}
-
-/* vec_sum2s */
-
-static vector signed int __attribute__((__always_inline__))
-vec_sum2s(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vsum2sws(__a, __b);
-}
-
-/* vec_vsum2sws */
-
-static vector signed int __attribute__((__always_inline__))
-vec_vsum2sws(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vsum2sws(__a, __b);
-}
-
-/* vec_sums */
-
-static vector signed int __attribute__((__always_inline__))
-vec_sums(vector signed int __a, vector signed int __b)
-{
-  return __builtin_altivec_vsumsws(__a, __b);
-}
-
-/* vec_vsumsws */
-
-static vector signed int __attribute__((__always_inline__))
-vec_vsumsws(vector signed int __a, vector signed int __b)
-{
-  return __builtin_altivec_vsumsws(__a, __b);
-}
-
-/* vec_trunc */
-
-static vector float __attribute__((__always_inline__))
-vec_trunc(vector float __a)
-{
-  return __builtin_altivec_vrfiz(__a);
-}
-
-/* vec_vrfiz */
-
-static vector float __attribute__((__always_inline__))
-vec_vrfiz(vector float __a)
-{
-  return __builtin_altivec_vrfiz(__a);
-}
-
-/* vec_unpackh */
-
-static vector short __ATTRS_o_ai
-vec_unpackh(vector signed char __a)
-{
-  return __builtin_altivec_vupkhsb((vector char)__a);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_unpackh(vector bool char __a)
-{
-  return (vector bool short)__builtin_altivec_vupkhsb((vector char)__a);
-}
-
-static vector int __ATTRS_o_ai
-vec_unpackh(vector short __a)
-{
-  return __builtin_altivec_vupkhsh(__a);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_unpackh(vector bool short __a)
-{
-  return (vector bool int)__builtin_altivec_vupkhsh((vector short)__a);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_unpackh(vector pixel __a)
-{
-  return (vector unsigned int)__builtin_altivec_vupkhsh((vector short)__a);
-}
-
-/* vec_vupkhsb */
-
-static vector short __ATTRS_o_ai
-vec_vupkhsb(vector signed char __a)
-{
-  return __builtin_altivec_vupkhsb((vector char)__a);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vupkhsb(vector bool char __a)
-{
-  return (vector bool short)__builtin_altivec_vupkhsb((vector char)__a);
-}
-
-/* vec_vupkhsh */
-
-static vector int __ATTRS_o_ai
-vec_vupkhsh(vector short __a)
-{
-  return __builtin_altivec_vupkhsh(__a);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vupkhsh(vector bool short __a)
-{
-  return (vector bool int)__builtin_altivec_vupkhsh((vector short)__a);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vupkhsh(vector pixel __a)
-{
-  return (vector unsigned int)__builtin_altivec_vupkhsh((vector short)__a);
-}
-
-/* vec_unpackl */
-
-static vector short __ATTRS_o_ai
-vec_unpackl(vector signed char __a)
-{
-  return __builtin_altivec_vupklsb((vector char)__a);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_unpackl(vector bool char __a)
-{
-  return (vector bool short)__builtin_altivec_vupklsb((vector char)__a);
-}
-
-static vector int __ATTRS_o_ai
-vec_unpackl(vector short __a)
-{
-  return __builtin_altivec_vupklsh(__a);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_unpackl(vector bool short __a)
-{
-  return (vector bool int)__builtin_altivec_vupklsh((vector short)__a);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_unpackl(vector pixel __a)
-{
-  return (vector unsigned int)__builtin_altivec_vupklsh((vector short)__a);
-}
-
-/* vec_vupklsb */
-
-static vector short __ATTRS_o_ai
-vec_vupklsb(vector signed char __a)
-{
-  return __builtin_altivec_vupklsb((vector char)__a);
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vupklsb(vector bool char __a)
-{
-  return (vector bool short)__builtin_altivec_vupklsb((vector char)__a);
-}
-
-/* vec_vupklsh */
-
-static vector int __ATTRS_o_ai
-vec_vupklsh(vector short __a)
-{
-  return __builtin_altivec_vupklsh(__a);
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vupklsh(vector bool short __a)
-{
-  return (vector bool int)__builtin_altivec_vupklsh((vector short)__a);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vupklsh(vector pixel __a)
-{
-  return (vector unsigned int)__builtin_altivec_vupklsh((vector short)__a);
-}
-
-/* vec_xor */
-
-#define __builtin_altivec_vxor vec_xor
-
-static vector signed char __ATTRS_o_ai
-vec_xor(vector signed char __a, vector signed char __b)
-{
-  return __a ^ __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_xor(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a ^ __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_xor(vector signed char __a, vector bool char __b)
-{
-  return __a ^ (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_xor(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a ^ __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_xor(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a ^ __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_xor(vector unsigned char __a, vector bool char __b)
-{
-  return __a ^ (vector unsigned char)__b;
-}
-
-static vector bool char __ATTRS_o_ai
-vec_xor(vector bool char __a, vector bool char __b)
-{
-  return __a ^ __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_xor(vector short __a, vector short __b)
-{
-  return __a ^ __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_xor(vector bool short __a, vector short __b)
-{
-  return (vector short)__a ^ __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_xor(vector short __a, vector bool short __b)
-{
-  return __a ^ (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_xor(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a ^ __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_xor(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a ^ __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_xor(vector unsigned short __a, vector bool short __b)
-{
-  return __a ^ (vector unsigned short)__b;
-}
-
-static vector bool short __ATTRS_o_ai
-vec_xor(vector bool short __a, vector bool short __b)
-{
-  return __a ^ __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_xor(vector int __a, vector int __b)
-{
-  return __a ^ __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_xor(vector bool int __a, vector int __b)
-{
-  return (vector int)__a ^ __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_xor(vector int __a, vector bool int __b)
-{
-  return __a ^ (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_xor(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a ^ __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_xor(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a ^ __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_xor(vector unsigned int __a, vector bool int __b)
-{
-  return __a ^ (vector unsigned int)__b;
-}
-
-static vector bool int __ATTRS_o_ai
-vec_xor(vector bool int __a, vector bool int __b)
-{
-  return __a ^ __b;
-}
-
-static vector float __ATTRS_o_ai
-vec_xor(vector float __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a ^ (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_xor(vector bool int __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a ^ (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_xor(vector float __a, vector bool int __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a ^ (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-/* vec_vxor */
-
-static vector signed char __ATTRS_o_ai
-vec_vxor(vector signed char __a, vector signed char __b)
-{
-  return __a ^ __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vxor(vector bool char __a, vector signed char __b)
-{
-  return (vector signed char)__a ^ __b;
-}
-
-static vector signed char __ATTRS_o_ai
-vec_vxor(vector signed char __a, vector bool char __b)
-{
-  return __a ^ (vector signed char)__b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vxor(vector unsigned char __a, vector unsigned char __b)
-{
-  return __a ^ __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vxor(vector bool char __a, vector unsigned char __b)
-{
-  return (vector unsigned char)__a ^ __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_vxor(vector unsigned char __a, vector bool char __b)
-{
-  return __a ^ (vector unsigned char)__b;
-}
-
-static vector bool char __ATTRS_o_ai
-vec_vxor(vector bool char __a, vector bool char __b)
-{
-  return __a ^ __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vxor(vector short __a, vector short __b)
-{
-  return __a ^ __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vxor(vector bool short __a, vector short __b)
-{
-  return (vector short)__a ^ __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_vxor(vector short __a, vector bool short __b)
-{
-  return __a ^ (vector short)__b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vxor(vector unsigned short __a, vector unsigned short __b)
-{
-  return __a ^ __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vxor(vector bool short __a, vector unsigned short __b)
-{
-  return (vector unsigned short)__a ^ __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_vxor(vector unsigned short __a, vector bool short __b)
-{
-  return __a ^ (vector unsigned short)__b;
-}
-
-static vector bool short __ATTRS_o_ai
-vec_vxor(vector bool short __a, vector bool short __b)
-{
-  return __a ^ __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vxor(vector int __a, vector int __b)
-{
-  return __a ^ __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vxor(vector bool int __a, vector int __b)
-{
-  return (vector int)__a ^ __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_vxor(vector int __a, vector bool int __b)
-{
-  return __a ^ (vector int)__b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vxor(vector unsigned int __a, vector unsigned int __b)
-{
-  return __a ^ __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vxor(vector bool int __a, vector unsigned int __b)
-{
-  return (vector unsigned int)__a ^ __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_vxor(vector unsigned int __a, vector bool int __b)
-{
-  return __a ^ (vector unsigned int)__b;
-}
-
-static vector bool int __ATTRS_o_ai
-vec_vxor(vector bool int __a, vector bool int __b)
-{
-  return __a ^ __b;
-}
-
-static vector float __ATTRS_o_ai
-vec_vxor(vector float __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a ^ (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_vxor(vector bool int __a, vector float __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a ^ (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-static vector float __ATTRS_o_ai
-vec_vxor(vector float __a, vector bool int __b)
-{
-  vector unsigned int __res = (vector unsigned int)__a ^ (vector unsigned int)__b;
-  return (vector float)__res;
-}
-
-/* ------------------------ extensions for CBEA ----------------------------- */
-
-/* vec_extract */
-
-static signed char __ATTRS_o_ai
-vec_extract(vector signed char __a, int __b)
-{
-  return __a[__b];
-}
-
-static unsigned char __ATTRS_o_ai
-vec_extract(vector unsigned char __a, int __b)
-{
-  return __a[__b];
-}
-
-static short __ATTRS_o_ai
-vec_extract(vector short __a, int __b)
-{
-  return __a[__b];
-}
-
-static unsigned short __ATTRS_o_ai
-vec_extract(vector unsigned short __a, int __b)
-{
-  return __a[__b];
-}
-
-static int __ATTRS_o_ai
-vec_extract(vector int __a, int __b)
-{
-  return __a[__b];
-}
-
-static unsigned int __ATTRS_o_ai
-vec_extract(vector unsigned int __a, int __b)
-{
-  return __a[__b];
-}
-
-static float __ATTRS_o_ai
-vec_extract(vector float __a, int __b)
-{
-  return __a[__b];
-}
-
-/* vec_insert */
-
-static vector signed char __ATTRS_o_ai
-vec_insert(signed char __a, vector signed char __b, int __c)
-{
-  __b[__c] = __a;
-  return __b;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_insert(unsigned char __a, vector unsigned char __b, int __c)
-{
-  __b[__c] = __a;
-  return __b;
-}
-
-static vector short __ATTRS_o_ai
-vec_insert(short __a, vector short __b, int __c)
-{
-  __b[__c] = __a;
-  return __b;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_insert(unsigned short __a, vector unsigned short __b, int __c)
-{
-  __b[__c] = __a;
-  return __b;
-}
-
-static vector int __ATTRS_o_ai
-vec_insert(int __a, vector int __b, int __c)
-{
-  __b[__c] = __a;
-  return __b;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_insert(unsigned int __a, vector unsigned int __b, int __c)
-{
-  __b[__c] = __a;
-  return __b;
-}
-
-static vector float __ATTRS_o_ai
-vec_insert(float __a, vector float __b, int __c)
-{
-  __b[__c] = __a;
-  return __b;
-}
-
-/* vec_lvlx */
-
-static vector signed char __ATTRS_o_ai
-vec_lvlx(int __a, const signed char *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector signed char)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector signed char __ATTRS_o_ai
-vec_lvlx(int __a, const vector signed char *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector signed char)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvlx(int __a, const unsigned char *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector unsigned char)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvlx(int __a, const vector unsigned char *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector unsigned char)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_lvlx(int __a, const vector bool char *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector bool char)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector short __ATTRS_o_ai
-vec_lvlx(int __a, const short *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector short)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector short __ATTRS_o_ai
-vec_lvlx(int __a, const vector short *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector short)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvlx(int __a, const unsigned short *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector unsigned short)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvlx(int __a, const vector unsigned short *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector unsigned short)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_lvlx(int __a, const vector bool short *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector bool short)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_lvlx(int __a, const vector pixel *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector pixel)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector int __ATTRS_o_ai
-vec_lvlx(int __a, const int *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector int)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector int __ATTRS_o_ai
-vec_lvlx(int __a, const vector int *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector int)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvlx(int __a, const unsigned int *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector unsigned int)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvlx(int __a, const vector unsigned int *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector unsigned int)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_lvlx(int __a, const vector bool int *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector bool int)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector float __ATTRS_o_ai
-vec_lvlx(int __a, const float *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector float)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector float __ATTRS_o_ai
-vec_lvlx(int __a, const vector float *__b)
-{
-  return vec_perm(vec_ld(__a, __b),
-                  (vector float)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-/* vec_lvlxl */
-
-static vector signed char __ATTRS_o_ai
-vec_lvlxl(int __a, const signed char *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector signed char)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector signed char __ATTRS_o_ai
-vec_lvlxl(int __a, const vector signed char *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector signed char)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvlxl(int __a, const unsigned char *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector unsigned char)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvlxl(int __a, const vector unsigned char *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector unsigned char)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_lvlxl(int __a, const vector bool char *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector bool char)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector short __ATTRS_o_ai
-vec_lvlxl(int __a, const short *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector short)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector short __ATTRS_o_ai
-vec_lvlxl(int __a, const vector short *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector short)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvlxl(int __a, const unsigned short *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector unsigned short)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvlxl(int __a, const vector unsigned short *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector unsigned short)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_lvlxl(int __a, const vector bool short *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector bool short)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_lvlxl(int __a, const vector pixel *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector pixel)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector int __ATTRS_o_ai
-vec_lvlxl(int __a, const int *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector int)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector int __ATTRS_o_ai
-vec_lvlxl(int __a, const vector int *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector int)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvlxl(int __a, const unsigned int *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector unsigned int)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvlxl(int __a, const vector unsigned int *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector unsigned int)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_lvlxl(int __a, const vector bool int *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector bool int)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector float __ATTRS_o_ai
-vec_lvlxl(int __a, const float *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector float)(0),
-                  vec_lvsl(__a, __b));
-}
-
-static vector float __ATTRS_o_ai
-vec_lvlxl(int __a, vector float *__b)
-{
-  return vec_perm(vec_ldl(__a, __b),
-                  (vector float)(0),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-/* vec_lvrx */
-
-static vector signed char __ATTRS_o_ai
-vec_lvrx(int __a, const signed char *__b)
-{
-  return vec_perm((vector signed char)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector signed char __ATTRS_o_ai
-vec_lvrx(int __a, const vector signed char *__b)
-{
-  return vec_perm((vector signed char)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvrx(int __a, const unsigned char *__b)
-{
-  return vec_perm((vector unsigned char)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvrx(int __a, const vector unsigned char *__b)
-{
-  return vec_perm((vector unsigned char)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_lvrx(int __a, const vector bool char *__b)
-{
-  return vec_perm((vector bool char)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector short __ATTRS_o_ai
-vec_lvrx(int __a, const short *__b)
-{
-  return vec_perm((vector short)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector short __ATTRS_o_ai
-vec_lvrx(int __a, const vector short *__b)
-{
-  return vec_perm((vector short)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvrx(int __a, const unsigned short *__b)
-{
-  return vec_perm((vector unsigned short)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvrx(int __a, const vector unsigned short *__b)
-{
-  return vec_perm((vector unsigned short)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_lvrx(int __a, const vector bool short *__b)
-{
-  return vec_perm((vector bool short)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_lvrx(int __a, const vector pixel *__b)
-{
-  return vec_perm((vector pixel)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector int __ATTRS_o_ai
-vec_lvrx(int __a, const int *__b)
-{
-  return vec_perm((vector int)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector int __ATTRS_o_ai
-vec_lvrx(int __a, const vector int *__b)
-{
-  return vec_perm((vector int)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvrx(int __a, const unsigned int *__b)
-{
-  return vec_perm((vector unsigned int)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvrx(int __a, const vector unsigned int *__b)
-{
-  return vec_perm((vector unsigned int)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_lvrx(int __a, const vector bool int *__b)
-{
-  return vec_perm((vector bool int)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector float __ATTRS_o_ai
-vec_lvrx(int __a, const float *__b)
-{
-  return vec_perm((vector float)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector float __ATTRS_o_ai
-vec_lvrx(int __a, const vector float *__b)
-{
-  return vec_perm((vector float)(0),
-                  vec_ld(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-/* vec_lvrxl */
-
-static vector signed char __ATTRS_o_ai
-vec_lvrxl(int __a, const signed char *__b)
-{
-  return vec_perm((vector signed char)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector signed char __ATTRS_o_ai
-vec_lvrxl(int __a, const vector signed char *__b)
-{
-  return vec_perm((vector signed char)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvrxl(int __a, const unsigned char *__b)
-{
-  return vec_perm((vector unsigned char)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_lvrxl(int __a, const vector unsigned char *__b)
-{
-  return vec_perm((vector unsigned char)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool char __ATTRS_o_ai
-vec_lvrxl(int __a, const vector bool char *__b)
-{
-  return vec_perm((vector bool char)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector short __ATTRS_o_ai
-vec_lvrxl(int __a, const short *__b)
-{
-  return vec_perm((vector short)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector short __ATTRS_o_ai
-vec_lvrxl(int __a, const vector short *__b)
-{
-  return vec_perm((vector short)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvrxl(int __a, const unsigned short *__b)
-{
-  return vec_perm((vector unsigned short)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_lvrxl(int __a, const vector unsigned short *__b)
-{
-  return vec_perm((vector unsigned short)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool short __ATTRS_o_ai
-vec_lvrxl(int __a, const vector bool short *__b)
-{
-  return vec_perm((vector bool short)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector pixel __ATTRS_o_ai
-vec_lvrxl(int __a, const vector pixel *__b)
-{
-  return vec_perm((vector pixel)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector int __ATTRS_o_ai
-vec_lvrxl(int __a, const int *__b)
-{
-  return vec_perm((vector int)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector int __ATTRS_o_ai
-vec_lvrxl(int __a, const vector int *__b)
-{
-  return vec_perm((vector int)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvrxl(int __a, const unsigned int *__b)
-{
-  return vec_perm((vector unsigned int)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_lvrxl(int __a, const vector unsigned int *__b)
-{
-  return vec_perm((vector unsigned int)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector bool int __ATTRS_o_ai
-vec_lvrxl(int __a, const vector bool int *__b)
-{
-  return vec_perm((vector bool int)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-static vector float __ATTRS_o_ai
-vec_lvrxl(int __a, const float *__b)
-{
-  return vec_perm((vector float)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, __b));
-}
-
-static vector float __ATTRS_o_ai
-vec_lvrxl(int __a, const vector float *__b)
-{
-  return vec_perm((vector float)(0),
-                  vec_ldl(__a, __b),
-                  vec_lvsl(__a, (unsigned char *)__b));
-}
-
-/* vec_stvlx */
-
-static void __ATTRS_o_ai
-vec_stvlx(vector signed char __a, int __b, signed char *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector signed char __a, int __b, vector signed char *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector unsigned char __a, int __b, vector unsigned char *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector bool char __a, int __b, vector bool char *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector short __a, int __b, short *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector short __a, int __b, vector short *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector unsigned short __a, int __b, vector unsigned short *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector bool short __a, int __b, vector bool short *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector pixel __a, int __b, vector pixel *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector int __a, int __b, int *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector int __a, int __b, vector int *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector unsigned int __a, int __b, vector unsigned int *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector bool int __a, int __b, vector bool int *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlx(vector float __a, int __b, vector float *__c)
-{
-  return vec_st(vec_perm(vec_lvrx(__b, __c),
-                         __a,
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-/* vec_stvlxl */
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector signed char __a, int __b, signed char *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector signed char __a, int __b, vector signed char *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector unsigned char __a, int __b, vector unsigned char *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector bool char __a, int __b, vector bool char *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector short __a, int __b, short *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector short __a, int __b, vector short *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector unsigned short __a, int __b, vector unsigned short *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector bool short __a, int __b, vector bool short *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector pixel __a, int __b, vector pixel *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector int __a, int __b, int *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector int __a, int __b, vector int *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector unsigned int __a, int __b, vector unsigned int *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector bool int __a, int __b, vector bool int *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvlxl(vector float __a, int __b, vector float *__c)
-{
-  return vec_stl(vec_perm(vec_lvrx(__b, __c),
-                          __a,
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-/* vec_stvrx */
-
-static void __ATTRS_o_ai
-vec_stvrx(vector signed char __a, int __b, signed char *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector signed char __a, int __b, vector signed char *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector unsigned char __a, int __b, vector unsigned char *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector bool char __a, int __b, vector bool char *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector short __a, int __b, short *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector short __a, int __b, vector short *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector unsigned short __a, int __b, vector unsigned short *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector bool short __a, int __b, vector bool short *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector pixel __a, int __b, vector pixel *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector int __a, int __b, int *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector int __a, int __b, vector int *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, __c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector unsigned int __a, int __b, vector unsigned int *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector bool int __a, int __b, vector bool int *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrx(vector float __a, int __b, vector float *__c)
-{
-  return vec_st(vec_perm(__a,
-                         vec_lvlx(__b, __c),
-                         vec_lvsr(__b, (unsigned char *)__c)),
-                __b, __c);
-}
-
-/* vec_stvrxl */
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector signed char __a, int __b, signed char *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector signed char __a, int __b, vector signed char *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector unsigned char __a, int __b, unsigned char *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector unsigned char __a, int __b, vector unsigned char *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector bool char __a, int __b, vector bool char *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector short __a, int __b, short *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector short __a, int __b, vector short *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector unsigned short __a, int __b, unsigned short *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector unsigned short __a, int __b, vector unsigned short *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector bool short __a, int __b, vector bool short *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector pixel __a, int __b, vector pixel *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector int __a, int __b, int *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector int __a, int __b, vector int *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector unsigned int __a, int __b, unsigned int *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, __c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector unsigned int __a, int __b, vector unsigned int *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector bool int __a, int __b, vector bool int *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-static void __ATTRS_o_ai
-vec_stvrxl(vector float __a, int __b, vector float *__c)
-{
-  return vec_stl(vec_perm(__a,
-                          vec_lvlx(__b, __c),
-                          vec_lvsr(__b, (unsigned char *)__c)),
-                 __b, __c);
-}
-
-/* vec_promote */
-
-static vector signed char __ATTRS_o_ai
-vec_promote(signed char __a, int __b)
-{
-  vector signed char __res = (vector signed char)(0);
-  __res[__b] = __a;
-  return __res;
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_promote(unsigned char __a, int __b)
-{
-  vector unsigned char __res = (vector unsigned char)(0);
-  __res[__b] = __a;
-  return __res;
-}
-
-static vector short __ATTRS_o_ai
-vec_promote(short __a, int __b)
-{
-  vector short __res = (vector short)(0);
-  __res[__b] = __a;
-  return __res;
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_promote(unsigned short __a, int __b)
-{
-  vector unsigned short __res = (vector unsigned short)(0);
-  __res[__b] = __a;
-  return __res;
-}
-
-static vector int __ATTRS_o_ai
-vec_promote(int __a, int __b)
-{
-  vector int __res = (vector int)(0);
-  __res[__b] = __a;
-  return __res;
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_promote(unsigned int __a, int __b)
-{
-  vector unsigned int __res = (vector unsigned int)(0);
-  __res[__b] = __a;
-  return __res;
-}
-
-static vector float __ATTRS_o_ai
-vec_promote(float __a, int __b)
-{
-  vector float __res = (vector float)(0);
-  __res[__b] = __a;
-  return __res;
-}
-
-/* vec_splats */
-
-static vector signed char __ATTRS_o_ai
-vec_splats(signed char __a)
-{
-  return (vector signed char)(__a);
-}
-
-static vector unsigned char __ATTRS_o_ai
-vec_splats(unsigned char __a)
-{
-  return (vector unsigned char)(__a);
-}
-
-static vector short __ATTRS_o_ai
-vec_splats(short __a)
-{
-  return (vector short)(__a);
-}
-
-static vector unsigned short __ATTRS_o_ai
-vec_splats(unsigned short __a)
-{
-  return (vector unsigned short)(__a);
-}
-
-static vector int __ATTRS_o_ai
-vec_splats(int __a)
-{
-  return (vector int)(__a);
-}
-
-static vector unsigned int __ATTRS_o_ai
-vec_splats(unsigned int __a)
-{
-  return (vector unsigned int)(__a);
-}
-
-static vector float __ATTRS_o_ai
-vec_splats(float __a)
-{
-  return (vector float)(__a);
-}
-
-/* ----------------------------- predicates --------------------------------- */
-
-/* vec_all_eq */
-
-static int __ATTRS_o_ai
-vec_all_eq(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_LT, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_LT, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_LT, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_LT, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_LT, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_LT, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_LT, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT, __a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector unsigned short __a, vector unsigned short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_LT, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector unsigned short __a, vector bool short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_LT, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector bool short __a, vector short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_LT, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector bool short __a, vector unsigned short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_LT, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector bool short __a, vector bool short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_LT, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector pixel __a, vector pixel __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_LT, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_LT, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_LT, __a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_LT, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_LT, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_LT, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_LT, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_LT, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_eq(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpeqfp_p(__CR6_LT, __a, __b);
-}
-
-/* vec_all_ge */
-
-static int __ATTRS_o_ai
-vec_all_ge(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_EQ, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_EQ, (vector signed char)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ, (vector unsigned char)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ,
-                                      (vector unsigned char)__b,
-                                      (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ, __b, (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ,
-                                      (vector unsigned char)__b,
-                                      (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_EQ, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_EQ, (vector short)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ, (vector unsigned short)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ,
-                                      (vector unsigned short)__b,
-                                      (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ, __b, (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ,
-                                      (vector unsigned short)__b,
-                                      (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_EQ, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_EQ, (vector int)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ, (vector unsigned int)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ,
-                                      (vector unsigned int)__b,
-                                      (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ, __b, (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ,
-                                      (vector unsigned int)__b,
-                                      (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_ge(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgefp_p(__CR6_LT, __a, __b);
-}
-
-/* vec_all_gt */
-
-static int __ATTRS_o_ai
-vec_all_gt(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_LT, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_LT, __a, (vector signed char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT, __a, (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT,
-                                      (vector unsigned char)__a,
-                                      (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT, (vector unsigned char)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT,
-                                      (vector unsigned char)__a,
-                                      (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_LT, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_LT, __a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT, __a, (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT,
-                                      (vector unsigned short)__a,
-                                      (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT, (vector unsigned short)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT,
-                                      (vector unsigned short)__a,
-                                      (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_LT, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_LT, __a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT, __a, (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT,
-                                      (vector unsigned int)__a,
-                                      (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT, (vector unsigned int)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT,
-                                      (vector unsigned int)__a,
-                                      (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_gt(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgtfp_p(__CR6_LT, __a, __b);
-}
-
-/* vec_all_in */
-
-static int __attribute__((__always_inline__))
-vec_all_in(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpbfp_p(__CR6_EQ, __a, __b);
-}
-
-/* vec_all_le */
-
-static int __ATTRS_o_ai
-vec_all_le(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_EQ, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_EQ, __a, (vector signed char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ, __a, (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ,
-                                      (vector unsigned char)__a,
-                                      (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ, (vector unsigned char)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ,
-                                      (vector unsigned char)__a,
-                                      (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_EQ, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_EQ, __a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ, __a, (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ,
-                                      (vector unsigned short)__a,
-                                      (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ, (vector unsigned short)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ,
-                                      (vector unsigned short)__a,
-                                      (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_EQ, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_EQ, __a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ, __a, (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ,
-                                      (vector unsigned int)__a,
-                                      (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ, (vector unsigned int)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ,
-                                      (vector unsigned int)__a,
-                                      (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_le(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgefp_p(__CR6_LT, __b, __a);
-}
-
-/* vec_all_lt */
-
-static int __ATTRS_o_ai
-vec_all_lt(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_LT, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_LT, (vector signed char)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT, (vector unsigned char)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT,
-                                      (vector unsigned char)__b,
-                                      (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT, __b, (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT,
-                                      (vector unsigned char)__b,
-                                      (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_LT, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_LT, (vector short)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT, (vector unsigned short)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT,
-                                      (vector unsigned short)__b,
-                                      (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT, __b, (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT,
-                                      (vector unsigned short)__b,
-                                      (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_LT, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_LT, (vector int)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT, (vector unsigned int)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT,
-                                      (vector unsigned int)__b,
-                                      (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT, __b, (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT,
-                                      (vector unsigned int)__b,
-                                      (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_all_lt(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgtfp_p(__CR6_LT, __b, __a);
-}
-
-/* vec_all_nan */
-
-static int __attribute__((__always_inline__))
-vec_all_nan(vector float __a)
-{
-  return __builtin_altivec_vcmpeqfp_p(__CR6_EQ, __a, __a);
-}
-
-/* vec_all_ne */
-
-static int __ATTRS_o_ai
-vec_all_ne(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_EQ, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_EQ, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_EQ, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_EQ, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_EQ, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_EQ, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpequb_p(__CR6_EQ, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ, __a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector unsigned short __a, vector unsigned short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_EQ, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector unsigned short __a, vector bool short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_EQ, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector bool short __a, vector short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_EQ, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector bool short __a, vector unsigned short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_EQ, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector bool short __a, vector bool short __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_EQ, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector pixel __a, vector pixel __b)
-{
-  return
-    __builtin_altivec_vcmpequh_p(__CR6_EQ, (vector short)__a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_EQ, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_EQ, __a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_EQ, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_EQ, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_EQ, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_EQ, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_EQ, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_all_ne(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpeqfp_p(__CR6_EQ, __a, __b);
-}
-
-/* vec_all_nge */
-
-static int __attribute__((__always_inline__))
-vec_all_nge(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgefp_p(__CR6_EQ, __a, __b);
-}
-
-/* vec_all_ngt */
-
-static int __attribute__((__always_inline__))
-vec_all_ngt(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgtfp_p(__CR6_EQ, __a, __b);
-}
-
-/* vec_all_nle */
-
-static int __attribute__((__always_inline__))
-vec_all_nle(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgefp_p(__CR6_EQ, __b, __a);
-}
-
-/* vec_all_nlt */
-
-static int __attribute__((__always_inline__))
-vec_all_nlt(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgtfp_p(__CR6_EQ, __b, __a);
-}
-
-/* vec_all_numeric */
-
-static int __attribute__((__always_inline__))
-vec_all_numeric(vector float __a)
-{
-  return __builtin_altivec_vcmpeqfp_p(__CR6_LT, __a, __a);
-}
-
-/* vec_any_eq */
-
-static int __ATTRS_o_ai
-vec_any_eq(vector signed char __a, vector signed char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_EQ_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector signed char __a, vector bool char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_EQ_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector unsigned char __a, vector unsigned char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_EQ_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector unsigned char __a, vector bool char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_EQ_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector bool char __a, vector signed char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_EQ_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector bool char __a, vector unsigned char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_EQ_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector bool char __a, vector bool char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_EQ_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ_REV, __a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ_REV, 
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ_REV, 
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ_REV,
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ_REV,
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ_REV,
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector pixel __a, vector pixel __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_EQ_REV, 
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_EQ_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_EQ_REV, __a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector unsigned int __a, vector unsigned int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_EQ_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector unsigned int __a, vector bool int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_EQ_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector bool int __a, vector int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_EQ_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector bool int __a, vector unsigned int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_EQ_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector bool int __a, vector bool int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_EQ_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_eq(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpeqfp_p(__CR6_EQ_REV, __a, __b);
-}
-
-/* vec_any_ge */
-
-static int __ATTRS_o_ai
-vec_any_ge(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_LT_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_LT_REV, (vector signed char)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector unsigned char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT_REV, (vector unsigned char)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT_REV,
-                                      (vector unsigned char)__b,
-                                      (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector bool char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT_REV, __b, (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT_REV,
-                                      (vector unsigned char)__b,
-                                      (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_LT_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_LT_REV, (vector short)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector unsigned short __a, vector bool short __b)
-{
-  return
-    __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV, (vector unsigned short)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV,
-                                      (vector unsigned short)__b,
-                                      (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector bool short __a, vector unsigned short __b)
-{
-  return 
-    __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV, __b, (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV,
-                                      (vector unsigned short)__b,
-                                      (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_LT_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_LT_REV, (vector int)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV, (vector unsigned int)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV,
-                                      (vector unsigned int)__b,
-                                      (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV, __b, (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV,
-                                      (vector unsigned int)__b,
-                                      (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_ge(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgefp_p(__CR6_EQ_REV, __a, __b);
-}
-
-/* vec_any_gt */
-
-static int __ATTRS_o_ai
-vec_any_gt(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_EQ_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_EQ_REV, __a, (vector signed char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector unsigned char __a, vector bool char __b)
-{
-  return 
-    __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV, __a, (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV,
-                                      (vector unsigned char)__a,
-                                      (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector bool char __a, vector unsigned char __b)
-{
-  return 
-    __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV, (vector unsigned char)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV,
-                                      (vector unsigned char)__a,
-                                      (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_EQ_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_EQ_REV, __a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector unsigned short __a, vector bool short __b)
-{
-  return 
-    __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV, __a, (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV,
-                                      (vector unsigned short)__a,
-                                      (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector bool short __a, vector unsigned short __b)
-{
-  return
-    __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV, (vector unsigned short)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV,
-                                      (vector unsigned short)__a,
-                                      (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_EQ_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_EQ_REV, __a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV, __a, (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV,
-                                      (vector unsigned int)__a,
-                                      (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV, (vector unsigned int)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV,
-                                      (vector unsigned int)__a,
-                                      (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_gt(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgtfp_p(__CR6_EQ_REV, __a, __b);
-}
-
-/* vec_any_le */
-
-static int __ATTRS_o_ai
-vec_any_le(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_LT_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_LT_REV, __a, (vector signed char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector unsigned char __a, vector bool char __b)
-{
-  return 
-    __builtin_altivec_vcmpgtub_p(__CR6_LT_REV, __a, (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT_REV,
-                                      (vector unsigned char)__a,
-                                      (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector bool char __a, vector unsigned char __b)
-{
-  return 
-    __builtin_altivec_vcmpgtub_p(__CR6_LT_REV, (vector unsigned char)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_LT_REV,
-                                      (vector unsigned char)__a,
-                                      (vector unsigned char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_LT_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_LT_REV, __a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector unsigned short __a, vector bool short __b)
-{
-  return 
-    __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV, __a, (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV,
-                                      (vector unsigned short)__a,
-                                      (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector bool short __a, vector unsigned short __b)
-{
-  return 
-    __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV, (vector unsigned short)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_LT_REV,
-                                      (vector unsigned short)__a,
-                                      (vector unsigned short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_LT_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_LT_REV, __a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV, __a, (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV,
-                                      (vector unsigned int)__a,
-                                      (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV, (vector unsigned int)__a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_LT_REV,
-                                      (vector unsigned int)__a,
-                                      (vector unsigned int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_le(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgefp_p(__CR6_EQ_REV, __b, __a);
-}
-
-/* vec_any_lt */
-
-static int __ATTRS_o_ai
-vec_any_lt(vector signed char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_EQ_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector signed char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtsb_p(__CR6_EQ_REV, (vector signed char)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector unsigned char __a, vector unsigned char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector unsigned char __a, vector bool char __b)
-{
-  return 
-    __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV, (vector unsigned char)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector bool char __a, vector signed char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV,
-                                      (vector unsigned char)__b,
-                                      (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector bool char __a, vector unsigned char __b)
-{
-  return 
-    __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV, __b, (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector bool char __a, vector bool char __b)
-{
-  return __builtin_altivec_vcmpgtub_p(__CR6_EQ_REV,
-                                      (vector unsigned char)__b,
-                                      (vector unsigned char)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_EQ_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtsh_p(__CR6_EQ_REV, (vector short)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector unsigned short __a, vector bool short __b)
-{
-  return 
-    __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV, (vector unsigned short)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV,
-                                      (vector unsigned short)__b,
-                                      (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector bool short __a, vector unsigned short __b)
-{
-  return 
-    __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV, __b, (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpgtuh_p(__CR6_EQ_REV,
-                                      (vector unsigned short)__b,
-                                      (vector unsigned short)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_EQ_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtsw_p(__CR6_EQ_REV, (vector int)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector unsigned int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV, __b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector unsigned int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV, (vector unsigned int)__b, __a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector bool int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV,
-                                      (vector unsigned int)__b,
-                                      (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector bool int __a, vector unsigned int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV, __b, (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector bool int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpgtuw_p(__CR6_EQ_REV,
-                                      (vector unsigned int)__b,
-                                      (vector unsigned int)__a);
-}
-
-static int __ATTRS_o_ai
-vec_any_lt(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgtfp_p(__CR6_EQ_REV, __b, __a);
-}
-
-/* vec_any_nan */
-
-static int __attribute__((__always_inline__))
-vec_any_nan(vector float __a)
-{
-  return __builtin_altivec_vcmpeqfp_p(__CR6_LT_REV, __a, __a);
-}
-
-/* vec_any_ne */
-
-static int __ATTRS_o_ai
-vec_any_ne(vector signed char __a, vector signed char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_LT_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector signed char __a, vector bool char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_LT_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector unsigned char __a, vector unsigned char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_LT_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector unsigned char __a, vector bool char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_LT_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector bool char __a, vector signed char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_LT_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector bool char __a, vector unsigned char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_LT_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector bool char __a, vector bool char __b)
-{
-  return
-    __builtin_altivec_vcmpequb_p(__CR6_LT_REV, (vector char)__a, (vector char)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT_REV, __a, (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector unsigned short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT_REV, 
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector unsigned short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT_REV,
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector bool short __a, vector short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT_REV,
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector bool short __a, vector unsigned short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT_REV,
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector bool short __a, vector bool short __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT_REV,
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector pixel __a, vector pixel __b)
-{
-  return __builtin_altivec_vcmpequh_p(__CR6_LT_REV,
-                                      (vector short)__a,
-                                      (vector short)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector int __a, vector int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_LT_REV, __a, __b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector int __a, vector bool int __b)
-{
-  return __builtin_altivec_vcmpequw_p(__CR6_LT_REV, __a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector unsigned int __a, vector unsigned int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_LT_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector unsigned int __a, vector bool int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_LT_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector bool int __a, vector int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_LT_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector bool int __a, vector unsigned int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_LT_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector bool int __a, vector bool int __b)
-{
-  return
-    __builtin_altivec_vcmpequw_p(__CR6_LT_REV, (vector int)__a, (vector int)__b);
-}
-
-static int __ATTRS_o_ai
-vec_any_ne(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpeqfp_p(__CR6_LT_REV, __a, __b);
-}
-
-/* vec_any_nge */
-
-static int __attribute__((__always_inline__))
-vec_any_nge(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgefp_p(__CR6_LT_REV, __a, __b);
-}
-
-/* vec_any_ngt */
-
-static int __attribute__((__always_inline__))
-vec_any_ngt(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgtfp_p(__CR6_LT_REV, __a, __b);
-}
-
-/* vec_any_nle */
-
-static int __attribute__((__always_inline__))
-vec_any_nle(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgefp_p(__CR6_LT_REV, __b, __a);
-}
-
-/* vec_any_nlt */
-
-static int __attribute__((__always_inline__))
-vec_any_nlt(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpgtfp_p(__CR6_LT_REV, __b, __a);
-}
-
-/* vec_any_numeric */
-
-static int __attribute__((__always_inline__))
-vec_any_numeric(vector float __a)
-{
-  return __builtin_altivec_vcmpeqfp_p(__CR6_EQ_REV, __a, __a);
-}
-
-/* vec_any_out */
-
-static int __attribute__((__always_inline__))
-vec_any_out(vector float __a, vector float __b)
-{
-  return __builtin_altivec_vcmpbfp_p(__CR6_EQ_REV, __a, __b);
-}
-
-#undef __ATTRS_o_ai
-
-#endif /* __ALTIVEC_H */
diff --git a/include.new/clang/3.4.1/ammintrin.h b/include.new/clang/3.4.1/ammintrin.h
deleted file mode 100644
index d87b9cd..0000000
--- a/include.new/clang/3.4.1/ammintrin.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*===---- ammintrin.h - SSE4a intrinsics -----------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __AMMINTRIN_H
-#define __AMMINTRIN_H
-
-#ifndef __SSE4A__
-#error "SSE4A instruction set not enabled"
-#else
-
-#include <pmmintrin.h>
-
-#define _mm_extracti_si64(x, len, idx) \
-  ((__m128i)__builtin_ia32_extrqi((__v2di)(__m128i)(x), \
-                                  (char)(len), (char)(idx)))
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_extract_si64(__m128i __x, __m128i __y)
-{
-  return (__m128i)__builtin_ia32_extrq((__v2di)__x, (__v16qi)__y);
-}
-
-#define _mm_inserti_si64(x, y, len, idx) \
-  ((__m128i)__builtin_ia32_insertqi((__v2di)(__m128i)(x), \
-                                    (__v2di)(__m128i)(y), \
-                                    (char)(len), (char)(idx)))
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_insert_si64(__m128i __x, __m128i __y)
-{
-  return (__m128i)__builtin_ia32_insertq((__v2di)__x, (__v2di)__y);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_stream_sd(double *__p, __m128d __a)
-{
-  __builtin_ia32_movntsd(__p, (__v2df)__a);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_stream_ss(float *__p, __m128 __a)
-{
-  __builtin_ia32_movntss(__p, (__v4sf)__a);
-}
-
-#endif /* __SSE4A__ */
-
-#endif /* __AMMINTRIN_H */
diff --git a/include.new/clang/3.4.1/arm_neon.h b/include.new/clang/3.4.1/arm_neon.h
deleted file mode 100644
index c297518..0000000
--- a/include.new/clang/3.4.1/arm_neon.h
+++ /dev/null
@@ -1,9595 +0,0 @@
-/*===---- arm_neon.h - ARM Neon intrinsics ---------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __ARM_NEON_H
-#define __ARM_NEON_H
-
-#if !defined(__ARM_NEON__) && !defined(__ARM_NEON)
-#error "NEON support not enabled"
-#endif
-
-#include <stdint.h>
-
-typedef float float32_t;
-typedef __fp16 float16_t;
-#ifdef __aarch64__
-typedef double float64_t;
-#endif
-
-#ifdef __aarch64__
-typedef uint8_t poly8_t;
-typedef uint16_t poly16_t;
-typedef uint64_t poly64_t;
-#else
-typedef int8_t poly8_t;
-typedef int16_t poly16_t;
-#endif
-typedef __attribute__((neon_vector_type(8)))  int8_t int8x8_t;
-typedef __attribute__((neon_vector_type(16))) int8_t int8x16_t;
-typedef __attribute__((neon_vector_type(4)))  int16_t int16x4_t;
-typedef __attribute__((neon_vector_type(8)))  int16_t int16x8_t;
-typedef __attribute__((neon_vector_type(2)))  int32_t int32x2_t;
-typedef __attribute__((neon_vector_type(4)))  int32_t int32x4_t;
-typedef __attribute__((neon_vector_type(1)))  int64_t int64x1_t;
-typedef __attribute__((neon_vector_type(2)))  int64_t int64x2_t;
-typedef __attribute__((neon_vector_type(8)))  uint8_t uint8x8_t;
-typedef __attribute__((neon_vector_type(16))) uint8_t uint8x16_t;
-typedef __attribute__((neon_vector_type(4)))  uint16_t uint16x4_t;
-typedef __attribute__((neon_vector_type(8)))  uint16_t uint16x8_t;
-typedef __attribute__((neon_vector_type(2)))  uint32_t uint32x2_t;
-typedef __attribute__((neon_vector_type(4)))  uint32_t uint32x4_t;
-typedef __attribute__((neon_vector_type(1)))  uint64_t uint64x1_t;
-typedef __attribute__((neon_vector_type(2)))  uint64_t uint64x2_t;
-typedef __attribute__((neon_vector_type(4)))  float16_t float16x4_t;
-typedef __attribute__((neon_vector_type(8)))  float16_t float16x8_t;
-typedef __attribute__((neon_vector_type(2)))  float32_t float32x2_t;
-typedef __attribute__((neon_vector_type(4)))  float32_t float32x4_t;
-#ifdef __aarch64__
-typedef __attribute__((neon_vector_type(1)))  float64_t float64x1_t;
-typedef __attribute__((neon_vector_type(2)))  float64_t float64x2_t;
-#endif
-typedef __attribute__((neon_polyvector_type(8)))  poly8_t poly8x8_t;
-typedef __attribute__((neon_polyvector_type(16))) poly8_t poly8x16_t;
-typedef __attribute__((neon_polyvector_type(4)))  poly16_t poly16x4_t;
-typedef __attribute__((neon_polyvector_type(8)))  poly16_t poly16x8_t;
-#ifdef __aarch64__
-typedef __attribute__((neon_polyvector_type(1)))  poly64_t poly64x1_t;
-typedef __attribute__((neon_polyvector_type(2)))  poly64_t poly64x2_t;
-#endif
-
-typedef struct int8x8x2_t {
-  int8x8_t val[2];
-} int8x8x2_t;
-
-typedef struct int8x16x2_t {
-  int8x16_t val[2];
-} int8x16x2_t;
-
-typedef struct int16x4x2_t {
-  int16x4_t val[2];
-} int16x4x2_t;
-
-typedef struct int16x8x2_t {
-  int16x8_t val[2];
-} int16x8x2_t;
-
-typedef struct int32x2x2_t {
-  int32x2_t val[2];
-} int32x2x2_t;
-
-typedef struct int32x4x2_t {
-  int32x4_t val[2];
-} int32x4x2_t;
-
-typedef struct int64x1x2_t {
-  int64x1_t val[2];
-} int64x1x2_t;
-
-typedef struct int64x2x2_t {
-  int64x2_t val[2];
-} int64x2x2_t;
-
-typedef struct uint8x8x2_t {
-  uint8x8_t val[2];
-} uint8x8x2_t;
-
-typedef struct uint8x16x2_t {
-  uint8x16_t val[2];
-} uint8x16x2_t;
-
-typedef struct uint16x4x2_t {
-  uint16x4_t val[2];
-} uint16x4x2_t;
-
-typedef struct uint16x8x2_t {
-  uint16x8_t val[2];
-} uint16x8x2_t;
-
-typedef struct uint32x2x2_t {
-  uint32x2_t val[2];
-} uint32x2x2_t;
-
-typedef struct uint32x4x2_t {
-  uint32x4_t val[2];
-} uint32x4x2_t;
-
-typedef struct uint64x1x2_t {
-  uint64x1_t val[2];
-} uint64x1x2_t;
-
-typedef struct uint64x2x2_t {
-  uint64x2_t val[2];
-} uint64x2x2_t;
-
-typedef struct float16x4x2_t {
-  float16x4_t val[2];
-} float16x4x2_t;
-
-typedef struct float16x8x2_t {
-  float16x8_t val[2];
-} float16x8x2_t;
-
-typedef struct float32x2x2_t {
-  float32x2_t val[2];
-} float32x2x2_t;
-
-typedef struct float32x4x2_t {
-  float32x4_t val[2];
-} float32x4x2_t;
-
-#ifdef __aarch64__
-typedef struct float64x1x2_t {
-  float64x1_t val[2];
-} float64x1x2_t;
-
-typedef struct float64x2x2_t {
-  float64x2_t val[2];
-} float64x2x2_t;
-
-#endif
-typedef struct poly8x8x2_t {
-  poly8x8_t val[2];
-} poly8x8x2_t;
-
-typedef struct poly8x16x2_t {
-  poly8x16_t val[2];
-} poly8x16x2_t;
-
-typedef struct poly16x4x2_t {
-  poly16x4_t val[2];
-} poly16x4x2_t;
-
-typedef struct poly16x8x2_t {
-  poly16x8_t val[2];
-} poly16x8x2_t;
-
-#ifdef __aarch64__
-typedef struct poly64x1x2_t {
-  poly64x1_t val[2];
-} poly64x1x2_t;
-
-typedef struct poly64x2x2_t {
-  poly64x2_t val[2];
-} poly64x2x2_t;
-
-#endif
-typedef struct int8x8x3_t {
-  int8x8_t val[3];
-} int8x8x3_t;
-
-typedef struct int8x16x3_t {
-  int8x16_t val[3];
-} int8x16x3_t;
-
-typedef struct int16x4x3_t {
-  int16x4_t val[3];
-} int16x4x3_t;
-
-typedef struct int16x8x3_t {
-  int16x8_t val[3];
-} int16x8x3_t;
-
-typedef struct int32x2x3_t {
-  int32x2_t val[3];
-} int32x2x3_t;
-
-typedef struct int32x4x3_t {
-  int32x4_t val[3];
-} int32x4x3_t;
-
-typedef struct int64x1x3_t {
-  int64x1_t val[3];
-} int64x1x3_t;
-
-typedef struct int64x2x3_t {
-  int64x2_t val[3];
-} int64x2x3_t;
-
-typedef struct uint8x8x3_t {
-  uint8x8_t val[3];
-} uint8x8x3_t;
-
-typedef struct uint8x16x3_t {
-  uint8x16_t val[3];
-} uint8x16x3_t;
-
-typedef struct uint16x4x3_t {
-  uint16x4_t val[3];
-} uint16x4x3_t;
-
-typedef struct uint16x8x3_t {
-  uint16x8_t val[3];
-} uint16x8x3_t;
-
-typedef struct uint32x2x3_t {
-  uint32x2_t val[3];
-} uint32x2x3_t;
-
-typedef struct uint32x4x3_t {
-  uint32x4_t val[3];
-} uint32x4x3_t;
-
-typedef struct uint64x1x3_t {
-  uint64x1_t val[3];
-} uint64x1x3_t;
-
-typedef struct uint64x2x3_t {
-  uint64x2_t val[3];
-} uint64x2x3_t;
-
-typedef struct float16x4x3_t {
-  float16x4_t val[3];
-} float16x4x3_t;
-
-typedef struct float16x8x3_t {
-  float16x8_t val[3];
-} float16x8x3_t;
-
-typedef struct float32x2x3_t {
-  float32x2_t val[3];
-} float32x2x3_t;
-
-typedef struct float32x4x3_t {
-  float32x4_t val[3];
-} float32x4x3_t;
-
-#ifdef __aarch64__
-typedef struct float64x1x3_t {
-  float64x1_t val[3];
-} float64x1x3_t;
-
-typedef struct float64x2x3_t {
-  float64x2_t val[3];
-} float64x2x3_t;
-
-#endif
-typedef struct poly8x8x3_t {
-  poly8x8_t val[3];
-} poly8x8x3_t;
-
-typedef struct poly8x16x3_t {
-  poly8x16_t val[3];
-} poly8x16x3_t;
-
-typedef struct poly16x4x3_t {
-  poly16x4_t val[3];
-} poly16x4x3_t;
-
-typedef struct poly16x8x3_t {
-  poly16x8_t val[3];
-} poly16x8x3_t;
-
-#ifdef __aarch64__
-typedef struct poly64x1x3_t {
-  poly64x1_t val[3];
-} poly64x1x3_t;
-
-typedef struct poly64x2x3_t {
-  poly64x2_t val[3];
-} poly64x2x3_t;
-
-#endif
-typedef struct int8x8x4_t {
-  int8x8_t val[4];
-} int8x8x4_t;
-
-typedef struct int8x16x4_t {
-  int8x16_t val[4];
-} int8x16x4_t;
-
-typedef struct int16x4x4_t {
-  int16x4_t val[4];
-} int16x4x4_t;
-
-typedef struct int16x8x4_t {
-  int16x8_t val[4];
-} int16x8x4_t;
-
-typedef struct int32x2x4_t {
-  int32x2_t val[4];
-} int32x2x4_t;
-
-typedef struct int32x4x4_t {
-  int32x4_t val[4];
-} int32x4x4_t;
-
-typedef struct int64x1x4_t {
-  int64x1_t val[4];
-} int64x1x4_t;
-
-typedef struct int64x2x4_t {
-  int64x2_t val[4];
-} int64x2x4_t;
-
-typedef struct uint8x8x4_t {
-  uint8x8_t val[4];
-} uint8x8x4_t;
-
-typedef struct uint8x16x4_t {
-  uint8x16_t val[4];
-} uint8x16x4_t;
-
-typedef struct uint16x4x4_t {
-  uint16x4_t val[4];
-} uint16x4x4_t;
-
-typedef struct uint16x8x4_t {
-  uint16x8_t val[4];
-} uint16x8x4_t;
-
-typedef struct uint32x2x4_t {
-  uint32x2_t val[4];
-} uint32x2x4_t;
-
-typedef struct uint32x4x4_t {
-  uint32x4_t val[4];
-} uint32x4x4_t;
-
-typedef struct uint64x1x4_t {
-  uint64x1_t val[4];
-} uint64x1x4_t;
-
-typedef struct uint64x2x4_t {
-  uint64x2_t val[4];
-} uint64x2x4_t;
-
-typedef struct float16x4x4_t {
-  float16x4_t val[4];
-} float16x4x4_t;
-
-typedef struct float16x8x4_t {
-  float16x8_t val[4];
-} float16x8x4_t;
-
-typedef struct float32x2x4_t {
-  float32x2_t val[4];
-} float32x2x4_t;
-
-typedef struct float32x4x4_t {
-  float32x4_t val[4];
-} float32x4x4_t;
-
-#ifdef __aarch64__
-typedef struct float64x1x4_t {
-  float64x1_t val[4];
-} float64x1x4_t;
-
-typedef struct float64x2x4_t {
-  float64x2_t val[4];
-} float64x2x4_t;
-
-#endif
-typedef struct poly8x8x4_t {
-  poly8x8_t val[4];
-} poly8x8x4_t;
-
-typedef struct poly8x16x4_t {
-  poly8x16_t val[4];
-} poly8x16x4_t;
-
-typedef struct poly16x4x4_t {
-  poly16x4_t val[4];
-} poly16x4x4_t;
-
-typedef struct poly16x8x4_t {
-  poly16x8_t val[4];
-} poly16x8x4_t;
-
-#ifdef __aarch64__
-typedef struct poly64x1x4_t {
-  poly64x1_t val[4];
-} poly64x1x4_t;
-
-typedef struct poly64x2x4_t {
-  poly64x2_t val[4];
-} poly64x2x4_t;
-
-#endif
-
-#define __ai static inline __attribute__((__always_inline__, __nodebug__))
-
-__ai int16x8_t vmovl_s8(int8x8_t __a) {
-  return (int16x8_t)__builtin_neon_vmovl_v(__a, 33); }
-__ai int32x4_t vmovl_s16(int16x4_t __a) {
-  return (int32x4_t)__builtin_neon_vmovl_v((int8x8_t)__a, 34); }
-__ai int64x2_t vmovl_s32(int32x2_t __a) {
-  return (int64x2_t)__builtin_neon_vmovl_v((int8x8_t)__a, 35); }
-__ai uint16x8_t vmovl_u8(uint8x8_t __a) {
-  return (uint16x8_t)__builtin_neon_vmovl_v((int8x8_t)__a, 49); }
-__ai uint32x4_t vmovl_u16(uint16x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vmovl_v((int8x8_t)__a, 50); }
-__ai uint64x2_t vmovl_u32(uint32x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vmovl_v((int8x8_t)__a, 51); }
-
-__ai int16x8_t vmull_s8(int8x8_t __a, int8x8_t __b) {
-  return (int16x8_t)__builtin_neon_vmull_v(__a, __b, 33); }
-__ai int32x4_t vmull_s16(int16x4_t __a, int16x4_t __b) {
-  return (int32x4_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)__b, 34); }
-__ai int64x2_t vmull_s32(int32x2_t __a, int32x2_t __b) {
-  return (int64x2_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)__b, 35); }
-__ai uint16x8_t vmull_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)__b, 49); }
-__ai uint32x4_t vmull_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)__b, 50); }
-__ai uint64x2_t vmull_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)__b, 51); }
-__ai poly16x8_t vmull_p8(poly8x8_t __a, poly8x8_t __b) {
-  return (poly16x8_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)__b, 37); }
-
-__ai int8x8_t vabd_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vabd_v(__a, __b, 0); }
-__ai int16x4_t vabd_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vabd_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vabd_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vabd_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai uint8x8_t vabd_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vabd_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vabd_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vabd_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vabd_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vabd_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai float32x2_t vabd_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vabd_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai int8x16_t vabdq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vabdq_v(__a, __b, 32); }
-__ai int16x8_t vabdq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vabdq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vabdq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vabdq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai uint8x16_t vabdq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vabdq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vabdq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vabdq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vabdq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vabdq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai float32x4_t vabdq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vabdq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-
-__ai int16x8_t vabdl_s8(int8x8_t __a, int8x8_t __b) {
-  return (int16x8_t)vmovl_u8((uint8x8_t)vabd_s8(__a, __b)); }
-__ai int32x4_t vabdl_s16(int16x4_t __a, int16x4_t __b) {
-  return (int32x4_t)vmovl_u16((uint16x4_t)vabd_s16(__a, __b)); }
-__ai int64x2_t vabdl_s32(int32x2_t __a, int32x2_t __b) {
-  return (int64x2_t)vmovl_u32((uint32x2_t)vabd_s32(__a, __b)); }
-__ai uint16x8_t vabdl_u8(uint8x8_t __a, uint8x8_t __b) {
-  return vmovl_u8(vabd_u8(__a, __b)); }
-__ai uint32x4_t vabdl_u16(uint16x4_t __a, uint16x4_t __b) {
-  return vmovl_u16(vabd_u16(__a, __b)); }
-__ai uint64x2_t vabdl_u32(uint32x2_t __a, uint32x2_t __b) {
-  return vmovl_u32(vabd_u32(__a, __b)); }
-
-__ai int8x8_t vaba_s8(int8x8_t __a, int8x8_t __b, int8x8_t __c) {
-  return __a + vabd_s8(__b, __c); }
-__ai int16x4_t vaba_s16(int16x4_t __a, int16x4_t __b, int16x4_t __c) {
-  return __a + vabd_s16(__b, __c); }
-__ai int32x2_t vaba_s32(int32x2_t __a, int32x2_t __b, int32x2_t __c) {
-  return __a + vabd_s32(__b, __c); }
-__ai uint8x8_t vaba_u8(uint8x8_t __a, uint8x8_t __b, uint8x8_t __c) {
-  return __a + vabd_u8(__b, __c); }
-__ai uint16x4_t vaba_u16(uint16x4_t __a, uint16x4_t __b, uint16x4_t __c) {
-  return __a + vabd_u16(__b, __c); }
-__ai uint32x2_t vaba_u32(uint32x2_t __a, uint32x2_t __b, uint32x2_t __c) {
-  return __a + vabd_u32(__b, __c); }
-__ai int8x16_t vabaq_s8(int8x16_t __a, int8x16_t __b, int8x16_t __c) {
-  return __a + vabdq_s8(__b, __c); }
-__ai int16x8_t vabaq_s16(int16x8_t __a, int16x8_t __b, int16x8_t __c) {
-  return __a + vabdq_s16(__b, __c); }
-__ai int32x4_t vabaq_s32(int32x4_t __a, int32x4_t __b, int32x4_t __c) {
-  return __a + vabdq_s32(__b, __c); }
-__ai uint8x16_t vabaq_u8(uint8x16_t __a, uint8x16_t __b, uint8x16_t __c) {
-  return __a + vabdq_u8(__b, __c); }
-__ai uint16x8_t vabaq_u16(uint16x8_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return __a + vabdq_u16(__b, __c); }
-__ai uint32x4_t vabaq_u32(uint32x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return __a + vabdq_u32(__b, __c); }
-
-__ai int16x8_t vabal_s8(int16x8_t __a, int8x8_t __b, int8x8_t __c) {
-  return __a + vabdl_s8(__b, __c); }
-__ai int32x4_t vabal_s16(int32x4_t __a, int16x4_t __b, int16x4_t __c) {
-  return __a + vabdl_s16(__b, __c); }
-__ai int64x2_t vabal_s32(int64x2_t __a, int32x2_t __b, int32x2_t __c) {
-  return __a + vabdl_s32(__b, __c); }
-__ai uint16x8_t vabal_u8(uint16x8_t __a, uint8x8_t __b, uint8x8_t __c) {
-  return __a + vabdl_u8(__b, __c); }
-__ai uint32x4_t vabal_u16(uint32x4_t __a, uint16x4_t __b, uint16x4_t __c) {
-  return __a + vabdl_u16(__b, __c); }
-__ai uint64x2_t vabal_u32(uint64x2_t __a, uint32x2_t __b, uint32x2_t __c) {
-  return __a + vabdl_u32(__b, __c); }
-
-
-__ai int8x8_t vabs_s8(int8x8_t __a) {
-  return (int8x8_t)__builtin_neon_vabs_v(__a, 0); }
-__ai int16x4_t vabs_s16(int16x4_t __a) {
-  return (int16x4_t)__builtin_neon_vabs_v((int8x8_t)__a, 1); }
-__ai int32x2_t vabs_s32(int32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vabs_v((int8x8_t)__a, 2); }
-__ai float32x2_t vabs_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vabs_v((int8x8_t)__a, 8); }
-__ai int8x16_t vabsq_s8(int8x16_t __a) {
-  return (int8x16_t)__builtin_neon_vabsq_v(__a, 32); }
-__ai int16x8_t vabsq_s16(int16x8_t __a) {
-  return (int16x8_t)__builtin_neon_vabsq_v((int8x16_t)__a, 33); }
-__ai int32x4_t vabsq_s32(int32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vabsq_v((int8x16_t)__a, 34); }
-__ai float32x4_t vabsq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vabsq_v((int8x16_t)__a, 40); }
-
-__ai int8x8_t vadd_s8(int8x8_t __a, int8x8_t __b) {
-  return __a + __b; }
-__ai int16x4_t vadd_s16(int16x4_t __a, int16x4_t __b) {
-  return __a + __b; }
-__ai int32x2_t vadd_s32(int32x2_t __a, int32x2_t __b) {
-  return __a + __b; }
-__ai int64x1_t vadd_s64(int64x1_t __a, int64x1_t __b) {
-  return __a + __b; }
-__ai float32x2_t vadd_f32(float32x2_t __a, float32x2_t __b) {
-  return __a + __b; }
-__ai uint8x8_t vadd_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __a + __b; }
-__ai uint16x4_t vadd_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __a + __b; }
-__ai uint32x2_t vadd_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __a + __b; }
-__ai uint64x1_t vadd_u64(uint64x1_t __a, uint64x1_t __b) {
-  return __a + __b; }
-__ai int8x16_t vaddq_s8(int8x16_t __a, int8x16_t __b) {
-  return __a + __b; }
-__ai int16x8_t vaddq_s16(int16x8_t __a, int16x8_t __b) {
-  return __a + __b; }
-__ai int32x4_t vaddq_s32(int32x4_t __a, int32x4_t __b) {
-  return __a + __b; }
-__ai int64x2_t vaddq_s64(int64x2_t __a, int64x2_t __b) {
-  return __a + __b; }
-__ai float32x4_t vaddq_f32(float32x4_t __a, float32x4_t __b) {
-  return __a + __b; }
-__ai uint8x16_t vaddq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __a + __b; }
-__ai uint16x8_t vaddq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __a + __b; }
-__ai uint32x4_t vaddq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __a + __b; }
-__ai uint64x2_t vaddq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __a + __b; }
-
-__ai int8x8_t vaddhn_s16(int16x8_t __a, int16x8_t __b) {
-  return (int8x8_t)__builtin_neon_vaddhn_v((int8x16_t)__a, (int8x16_t)__b, 0); }
-__ai int16x4_t vaddhn_s32(int32x4_t __a, int32x4_t __b) {
-  return (int16x4_t)__builtin_neon_vaddhn_v((int8x16_t)__a, (int8x16_t)__b, 1); }
-__ai int32x2_t vaddhn_s64(int64x2_t __a, int64x2_t __b) {
-  return (int32x2_t)__builtin_neon_vaddhn_v((int8x16_t)__a, (int8x16_t)__b, 2); }
-__ai uint8x8_t vaddhn_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vaddhn_v((int8x16_t)__a, (int8x16_t)__b, 16); }
-__ai uint16x4_t vaddhn_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vaddhn_v((int8x16_t)__a, (int8x16_t)__b, 17); }
-__ai uint32x2_t vaddhn_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vaddhn_v((int8x16_t)__a, (int8x16_t)__b, 18); }
-
-__ai int16x8_t vaddl_s8(int8x8_t __a, int8x8_t __b) {
-  return vmovl_s8(__a) + vmovl_s8(__b); }
-__ai int32x4_t vaddl_s16(int16x4_t __a, int16x4_t __b) {
-  return vmovl_s16(__a) + vmovl_s16(__b); }
-__ai int64x2_t vaddl_s32(int32x2_t __a, int32x2_t __b) {
-  return vmovl_s32(__a) + vmovl_s32(__b); }
-__ai uint16x8_t vaddl_u8(uint8x8_t __a, uint8x8_t __b) {
-  return vmovl_u8(__a) + vmovl_u8(__b); }
-__ai uint32x4_t vaddl_u16(uint16x4_t __a, uint16x4_t __b) {
-  return vmovl_u16(__a) + vmovl_u16(__b); }
-__ai uint64x2_t vaddl_u32(uint32x2_t __a, uint32x2_t __b) {
-  return vmovl_u32(__a) + vmovl_u32(__b); }
-
-__ai int16x8_t vaddw_s8(int16x8_t __a, int8x8_t __b) {
-  return __a + vmovl_s8(__b); }
-__ai int32x4_t vaddw_s16(int32x4_t __a, int16x4_t __b) {
-  return __a + vmovl_s16(__b); }
-__ai int64x2_t vaddw_s32(int64x2_t __a, int32x2_t __b) {
-  return __a + vmovl_s32(__b); }
-__ai uint16x8_t vaddw_u8(uint16x8_t __a, uint8x8_t __b) {
-  return __a + vmovl_u8(__b); }
-__ai uint32x4_t vaddw_u16(uint32x4_t __a, uint16x4_t __b) {
-  return __a + vmovl_u16(__b); }
-__ai uint64x2_t vaddw_u32(uint64x2_t __a, uint32x2_t __b) {
-  return __a + vmovl_u32(__b); }
-
-__ai int8x8_t vand_s8(int8x8_t __a, int8x8_t __b) {
-  return __a & __b; }
-__ai int16x4_t vand_s16(int16x4_t __a, int16x4_t __b) {
-  return __a & __b; }
-__ai int32x2_t vand_s32(int32x2_t __a, int32x2_t __b) {
-  return __a & __b; }
-__ai int64x1_t vand_s64(int64x1_t __a, int64x1_t __b) {
-  return __a & __b; }
-__ai uint8x8_t vand_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __a & __b; }
-__ai uint16x4_t vand_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __a & __b; }
-__ai uint32x2_t vand_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __a & __b; }
-__ai uint64x1_t vand_u64(uint64x1_t __a, uint64x1_t __b) {
-  return __a & __b; }
-__ai int8x16_t vandq_s8(int8x16_t __a, int8x16_t __b) {
-  return __a & __b; }
-__ai int16x8_t vandq_s16(int16x8_t __a, int16x8_t __b) {
-  return __a & __b; }
-__ai int32x4_t vandq_s32(int32x4_t __a, int32x4_t __b) {
-  return __a & __b; }
-__ai int64x2_t vandq_s64(int64x2_t __a, int64x2_t __b) {
-  return __a & __b; }
-__ai uint8x16_t vandq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __a & __b; }
-__ai uint16x8_t vandq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __a & __b; }
-__ai uint32x4_t vandq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __a & __b; }
-__ai uint64x2_t vandq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __a & __b; }
-
-__ai int8x8_t vbic_s8(int8x8_t __a, int8x8_t __b) {
-  return __a & ~__b; }
-__ai int16x4_t vbic_s16(int16x4_t __a, int16x4_t __b) {
-  return __a & ~__b; }
-__ai int32x2_t vbic_s32(int32x2_t __a, int32x2_t __b) {
-  return __a & ~__b; }
-__ai int64x1_t vbic_s64(int64x1_t __a, int64x1_t __b) {
-  return __a & ~__b; }
-__ai uint8x8_t vbic_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __a & ~__b; }
-__ai uint16x4_t vbic_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __a & ~__b; }
-__ai uint32x2_t vbic_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __a & ~__b; }
-__ai uint64x1_t vbic_u64(uint64x1_t __a, uint64x1_t __b) {
-  return __a & ~__b; }
-__ai int8x16_t vbicq_s8(int8x16_t __a, int8x16_t __b) {
-  return __a & ~__b; }
-__ai int16x8_t vbicq_s16(int16x8_t __a, int16x8_t __b) {
-  return __a & ~__b; }
-__ai int32x4_t vbicq_s32(int32x4_t __a, int32x4_t __b) {
-  return __a & ~__b; }
-__ai int64x2_t vbicq_s64(int64x2_t __a, int64x2_t __b) {
-  return __a & ~__b; }
-__ai uint8x16_t vbicq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __a & ~__b; }
-__ai uint16x8_t vbicq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __a & ~__b; }
-__ai uint32x4_t vbicq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __a & ~__b; }
-__ai uint64x2_t vbicq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __a & ~__b; }
-
-__ai int8x8_t vbsl_s8(uint8x8_t __a, int8x8_t __b, int8x8_t __c) {
-  return (int8x8_t)__builtin_neon_vbsl_v((int8x8_t)__a, __b, __c, 0); }
-__ai int16x4_t vbsl_s16(uint16x4_t __a, int16x4_t __b, int16x4_t __c) {
-  return (int16x4_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 1); }
-__ai int32x2_t vbsl_s32(uint32x2_t __a, int32x2_t __b, int32x2_t __c) {
-  return (int32x2_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 2); }
-__ai int64x1_t vbsl_s64(uint64x1_t __a, int64x1_t __b, int64x1_t __c) {
-  return (int64x1_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 3); }
-__ai uint8x8_t vbsl_u8(uint8x8_t __a, uint8x8_t __b, uint8x8_t __c) {
-  return (uint8x8_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 16); }
-__ai uint16x4_t vbsl_u16(uint16x4_t __a, uint16x4_t __b, uint16x4_t __c) {
-  return (uint16x4_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 17); }
-__ai uint32x2_t vbsl_u32(uint32x2_t __a, uint32x2_t __b, uint32x2_t __c) {
-  return (uint32x2_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 18); }
-__ai uint64x1_t vbsl_u64(uint64x1_t __a, uint64x1_t __b, uint64x1_t __c) {
-  return (uint64x1_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 19); }
-__ai float32x2_t vbsl_f32(uint32x2_t __a, float32x2_t __b, float32x2_t __c) {
-  return (float32x2_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 8); }
-__ai poly8x8_t vbsl_p8(uint8x8_t __a, poly8x8_t __b, poly8x8_t __c) {
-  return (poly8x8_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 4); }
-__ai poly16x4_t vbsl_p16(uint16x4_t __a, poly16x4_t __b, poly16x4_t __c) {
-  return (poly16x4_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 5); }
-__ai int8x16_t vbslq_s8(uint8x16_t __a, int8x16_t __b, int8x16_t __c) {
-  return (int8x16_t)__builtin_neon_vbslq_v((int8x16_t)__a, __b, __c, 32); }
-__ai int16x8_t vbslq_s16(uint16x8_t __a, int16x8_t __b, int16x8_t __c) {
-  return (int16x8_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 33); }
-__ai int32x4_t vbslq_s32(uint32x4_t __a, int32x4_t __b, int32x4_t __c) {
-  return (int32x4_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 34); }
-__ai int64x2_t vbslq_s64(uint64x2_t __a, int64x2_t __b, int64x2_t __c) {
-  return (int64x2_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 35); }
-__ai uint8x16_t vbslq_u8(uint8x16_t __a, uint8x16_t __b, uint8x16_t __c) {
-  return (uint8x16_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 48); }
-__ai uint16x8_t vbslq_u16(uint16x8_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return (uint16x8_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 49); }
-__ai uint32x4_t vbslq_u32(uint32x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return (uint32x4_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 50); }
-__ai uint64x2_t vbslq_u64(uint64x2_t __a, uint64x2_t __b, uint64x2_t __c) {
-  return (uint64x2_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 51); }
-__ai float32x4_t vbslq_f32(uint32x4_t __a, float32x4_t __b, float32x4_t __c) {
-  return (float32x4_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 40); }
-__ai poly8x16_t vbslq_p8(uint8x16_t __a, poly8x16_t __b, poly8x16_t __c) {
-  return (poly8x16_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 36); }
-__ai poly16x8_t vbslq_p16(uint16x8_t __a, poly16x8_t __b, poly16x8_t __c) {
-  return (poly16x8_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 37); }
-
-__ai uint32x2_t vcage_f32(float32x2_t __a, float32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vcage_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint32x4_t vcageq_f32(float32x4_t __a, float32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vcageq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-
-__ai uint32x2_t vcagt_f32(float32x2_t __a, float32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vcagt_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint32x4_t vcagtq_f32(float32x4_t __a, float32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vcagtq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-
-__ai uint32x2_t vcale_f32(float32x2_t __a, float32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vcale_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint32x4_t vcaleq_f32(float32x4_t __a, float32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vcaleq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-
-__ai uint32x2_t vcalt_f32(float32x2_t __a, float32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vcalt_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint32x4_t vcaltq_f32(float32x4_t __a, float32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vcaltq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-
-__ai uint8x8_t vceq_s8(int8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)(__a == __b); }
-__ai uint16x4_t vceq_s16(int16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)(__a == __b); }
-__ai uint32x2_t vceq_s32(int32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)(__a == __b); }
-__ai uint32x2_t vceq_f32(float32x2_t __a, float32x2_t __b) {
-  return (uint32x2_t)(__a == __b); }
-__ai uint8x8_t vceq_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)(__a == __b); }
-__ai uint16x4_t vceq_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)(__a == __b); }
-__ai uint32x2_t vceq_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)(__a == __b); }
-__ai uint8x8_t vceq_p8(poly8x8_t __a, poly8x8_t __b) {
-  return (uint8x8_t)(__a == __b); }
-__ai uint8x16_t vceqq_s8(int8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)(__a == __b); }
-__ai uint16x8_t vceqq_s16(int16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)(__a == __b); }
-__ai uint32x4_t vceqq_s32(int32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)(__a == __b); }
-__ai uint32x4_t vceqq_f32(float32x4_t __a, float32x4_t __b) {
-  return (uint32x4_t)(__a == __b); }
-__ai uint8x16_t vceqq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)(__a == __b); }
-__ai uint16x8_t vceqq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)(__a == __b); }
-__ai uint32x4_t vceqq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)(__a == __b); }
-__ai uint8x16_t vceqq_p8(poly8x16_t __a, poly8x16_t __b) {
-  return (uint8x16_t)(__a == __b); }
-
-__ai uint8x8_t vcge_s8(int8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)(__a >= __b); }
-__ai uint16x4_t vcge_s16(int16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)(__a >= __b); }
-__ai uint32x2_t vcge_s32(int32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)(__a >= __b); }
-__ai uint32x2_t vcge_f32(float32x2_t __a, float32x2_t __b) {
-  return (uint32x2_t)(__a >= __b); }
-__ai uint8x8_t vcge_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)(__a >= __b); }
-__ai uint16x4_t vcge_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)(__a >= __b); }
-__ai uint32x2_t vcge_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)(__a >= __b); }
-__ai uint8x16_t vcgeq_s8(int8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)(__a >= __b); }
-__ai uint16x8_t vcgeq_s16(int16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)(__a >= __b); }
-__ai uint32x4_t vcgeq_s32(int32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)(__a >= __b); }
-__ai uint32x4_t vcgeq_f32(float32x4_t __a, float32x4_t __b) {
-  return (uint32x4_t)(__a >= __b); }
-__ai uint8x16_t vcgeq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)(__a >= __b); }
-__ai uint16x8_t vcgeq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)(__a >= __b); }
-__ai uint32x4_t vcgeq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)(__a >= __b); }
-
-__ai uint8x8_t vcgt_s8(int8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)(__a > __b); }
-__ai uint16x4_t vcgt_s16(int16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)(__a > __b); }
-__ai uint32x2_t vcgt_s32(int32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)(__a > __b); }
-__ai uint32x2_t vcgt_f32(float32x2_t __a, float32x2_t __b) {
-  return (uint32x2_t)(__a > __b); }
-__ai uint8x8_t vcgt_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)(__a > __b); }
-__ai uint16x4_t vcgt_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)(__a > __b); }
-__ai uint32x2_t vcgt_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)(__a > __b); }
-__ai uint8x16_t vcgtq_s8(int8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)(__a > __b); }
-__ai uint16x8_t vcgtq_s16(int16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)(__a > __b); }
-__ai uint32x4_t vcgtq_s32(int32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)(__a > __b); }
-__ai uint32x4_t vcgtq_f32(float32x4_t __a, float32x4_t __b) {
-  return (uint32x4_t)(__a > __b); }
-__ai uint8x16_t vcgtq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)(__a > __b); }
-__ai uint16x8_t vcgtq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)(__a > __b); }
-__ai uint32x4_t vcgtq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)(__a > __b); }
-
-__ai uint8x8_t vcle_s8(int8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)(__a <= __b); }
-__ai uint16x4_t vcle_s16(int16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)(__a <= __b); }
-__ai uint32x2_t vcle_s32(int32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)(__a <= __b); }
-__ai uint32x2_t vcle_f32(float32x2_t __a, float32x2_t __b) {
-  return (uint32x2_t)(__a <= __b); }
-__ai uint8x8_t vcle_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)(__a <= __b); }
-__ai uint16x4_t vcle_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)(__a <= __b); }
-__ai uint32x2_t vcle_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)(__a <= __b); }
-__ai uint8x16_t vcleq_s8(int8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)(__a <= __b); }
-__ai uint16x8_t vcleq_s16(int16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)(__a <= __b); }
-__ai uint32x4_t vcleq_s32(int32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)(__a <= __b); }
-__ai uint32x4_t vcleq_f32(float32x4_t __a, float32x4_t __b) {
-  return (uint32x4_t)(__a <= __b); }
-__ai uint8x16_t vcleq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)(__a <= __b); }
-__ai uint16x8_t vcleq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)(__a <= __b); }
-__ai uint32x4_t vcleq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)(__a <= __b); }
-
-__ai int8x8_t vcls_s8(int8x8_t __a) {
-  return (int8x8_t)__builtin_neon_vcls_v(__a, 0); }
-__ai int16x4_t vcls_s16(int16x4_t __a) {
-  return (int16x4_t)__builtin_neon_vcls_v((int8x8_t)__a, 1); }
-__ai int32x2_t vcls_s32(int32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vcls_v((int8x8_t)__a, 2); }
-__ai int8x16_t vclsq_s8(int8x16_t __a) {
-  return (int8x16_t)__builtin_neon_vclsq_v(__a, 32); }
-__ai int16x8_t vclsq_s16(int16x8_t __a) {
-  return (int16x8_t)__builtin_neon_vclsq_v((int8x16_t)__a, 33); }
-__ai int32x4_t vclsq_s32(int32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vclsq_v((int8x16_t)__a, 34); }
-
-__ai uint8x8_t vclt_s8(int8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)(__a < __b); }
-__ai uint16x4_t vclt_s16(int16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)(__a < __b); }
-__ai uint32x2_t vclt_s32(int32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)(__a < __b); }
-__ai uint32x2_t vclt_f32(float32x2_t __a, float32x2_t __b) {
-  return (uint32x2_t)(__a < __b); }
-__ai uint8x8_t vclt_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)(__a < __b); }
-__ai uint16x4_t vclt_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)(__a < __b); }
-__ai uint32x2_t vclt_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)(__a < __b); }
-__ai uint8x16_t vcltq_s8(int8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)(__a < __b); }
-__ai uint16x8_t vcltq_s16(int16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)(__a < __b); }
-__ai uint32x4_t vcltq_s32(int32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)(__a < __b); }
-__ai uint32x4_t vcltq_f32(float32x4_t __a, float32x4_t __b) {
-  return (uint32x4_t)(__a < __b); }
-__ai uint8x16_t vcltq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)(__a < __b); }
-__ai uint16x8_t vcltq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)(__a < __b); }
-__ai uint32x4_t vcltq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)(__a < __b); }
-
-__ai int8x8_t vclz_s8(int8x8_t __a) {
-  return (int8x8_t)__builtin_neon_vclz_v(__a, 0); }
-__ai int16x4_t vclz_s16(int16x4_t __a) {
-  return (int16x4_t)__builtin_neon_vclz_v((int8x8_t)__a, 1); }
-__ai int32x2_t vclz_s32(int32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vclz_v((int8x8_t)__a, 2); }
-__ai uint8x8_t vclz_u8(uint8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vclz_v((int8x8_t)__a, 16); }
-__ai uint16x4_t vclz_u16(uint16x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vclz_v((int8x8_t)__a, 17); }
-__ai uint32x2_t vclz_u32(uint32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vclz_v((int8x8_t)__a, 18); }
-__ai int8x16_t vclzq_s8(int8x16_t __a) {
-  return (int8x16_t)__builtin_neon_vclzq_v(__a, 32); }
-__ai int16x8_t vclzq_s16(int16x8_t __a) {
-  return (int16x8_t)__builtin_neon_vclzq_v((int8x16_t)__a, 33); }
-__ai int32x4_t vclzq_s32(int32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vclzq_v((int8x16_t)__a, 34); }
-__ai uint8x16_t vclzq_u8(uint8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vclzq_v((int8x16_t)__a, 48); }
-__ai uint16x8_t vclzq_u16(uint16x8_t __a) {
-  return (uint16x8_t)__builtin_neon_vclzq_v((int8x16_t)__a, 49); }
-__ai uint32x4_t vclzq_u32(uint32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vclzq_v((int8x16_t)__a, 50); }
-
-__ai uint8x8_t vcnt_u8(uint8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vcnt_v((int8x8_t)__a, 16); }
-__ai int8x8_t vcnt_s8(int8x8_t __a) {
-  return (int8x8_t)__builtin_neon_vcnt_v(__a, 0); }
-__ai poly8x8_t vcnt_p8(poly8x8_t __a) {
-  return (poly8x8_t)__builtin_neon_vcnt_v((int8x8_t)__a, 4); }
-__ai uint8x16_t vcntq_u8(uint8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vcntq_v((int8x16_t)__a, 48); }
-__ai int8x16_t vcntq_s8(int8x16_t __a) {
-  return (int8x16_t)__builtin_neon_vcntq_v(__a, 32); }
-__ai poly8x16_t vcntq_p8(poly8x16_t __a) {
-  return (poly8x16_t)__builtin_neon_vcntq_v((int8x16_t)__a, 36); }
-
-__ai int8x16_t vcombine_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x16_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai int16x8_t vcombine_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x8_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai int32x4_t vcombine_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x4_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai int64x2_t vcombine_s64(int64x1_t __a, int64x1_t __b) {
-  return (int64x2_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai float16x8_t vcombine_f16(float16x4_t __a, float16x4_t __b) {
-  return (float16x8_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai float32x4_t vcombine_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x4_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai uint8x16_t vcombine_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x16_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai uint16x8_t vcombine_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x8_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai uint32x4_t vcombine_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x4_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai uint64x2_t vcombine_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x2_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai poly8x16_t vcombine_p8(poly8x8_t __a, poly8x8_t __b) {
-  return (poly8x16_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai poly16x8_t vcombine_p16(poly16x4_t __a, poly16x4_t __b) {
-  return (poly16x8_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-
-__ai int8x8_t vcreate_s8(uint64_t __a) {
-  return (int8x8_t)__a; }
-__ai int16x4_t vcreate_s16(uint64_t __a) {
-  return (int16x4_t)__a; }
-__ai int32x2_t vcreate_s32(uint64_t __a) {
-  return (int32x2_t)__a; }
-__ai float16x4_t vcreate_f16(uint64_t __a) {
-  return (float16x4_t)__a; }
-__ai float32x2_t vcreate_f32(uint64_t __a) {
-  return (float32x2_t)__a; }
-__ai uint8x8_t vcreate_u8(uint64_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint16x4_t vcreate_u16(uint64_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint32x2_t vcreate_u32(uint64_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint64x1_t vcreate_u64(uint64_t __a) {
-  return (uint64x1_t)__a; }
-__ai poly8x8_t vcreate_p8(uint64_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly16x4_t vcreate_p16(uint64_t __a) {
-  return (poly16x4_t)__a; }
-__ai int64x1_t vcreate_s64(uint64_t __a) {
-  return (int64x1_t)__a; }
-
-__ai float16x4_t vcvt_f16_f32(float32x4_t __a) {
-  return (float16x4_t)__builtin_neon_vcvt_f16_v((int8x16_t)__a, 7); }
-
-__ai float32x2_t vcvt_f32_s32(int32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vcvt_f32_v((int8x8_t)__a, 2); }
-__ai float32x2_t vcvt_f32_u32(uint32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vcvt_f32_v((int8x8_t)__a, 18); }
-__ai float32x4_t vcvtq_f32_s32(int32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vcvtq_f32_v((int8x16_t)__a, 34); }
-__ai float32x4_t vcvtq_f32_u32(uint32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vcvtq_f32_v((int8x16_t)__a, 50); }
-
-__ai float32x4_t vcvt_f32_f16(float16x4_t __a) {
-  return (float32x4_t)__builtin_neon_vcvt_f32_f16((int8x8_t)__a, 7); }
-
-#define vcvt_n_f32_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  (float32x2_t)__builtin_neon_vcvt_n_f32_v((int8x8_t)__a, __b, 2); })
-#define vcvt_n_f32_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  (float32x2_t)__builtin_neon_vcvt_n_f32_v((int8x8_t)__a, __b, 18); })
-#define vcvtq_n_f32_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (float32x4_t)__builtin_neon_vcvtq_n_f32_v((int8x16_t)__a, __b, 34); })
-#define vcvtq_n_f32_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (float32x4_t)__builtin_neon_vcvtq_n_f32_v((int8x16_t)__a, __b, 50); })
-
-#define vcvt_n_s32_f32(a, __b) __extension__ ({ \
-  float32x2_t __a = (a); \
-  (int32x2_t)__builtin_neon_vcvt_n_s32_v((int8x8_t)__a, __b, 2); })
-#define vcvtq_n_s32_f32(a, __b) __extension__ ({ \
-  float32x4_t __a = (a); \
-  (int32x4_t)__builtin_neon_vcvtq_n_s32_v((int8x16_t)__a, __b, 34); })
-
-#define vcvt_n_u32_f32(a, __b) __extension__ ({ \
-  float32x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vcvt_n_u32_v((int8x8_t)__a, __b, 18); })
-#define vcvtq_n_u32_f32(a, __b) __extension__ ({ \
-  float32x4_t __a = (a); \
-  (uint32x4_t)__builtin_neon_vcvtq_n_u32_v((int8x16_t)__a, __b, 50); })
-
-__ai int32x2_t vcvt_s32_f32(float32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vcvt_s32_v((int8x8_t)__a, 2); }
-__ai int32x4_t vcvtq_s32_f32(float32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vcvtq_s32_v((int8x16_t)__a, 34); }
-
-__ai uint32x2_t vcvt_u32_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcvt_u32_v((int8x8_t)__a, 18); }
-__ai uint32x4_t vcvtq_u32_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcvtq_u32_v((int8x16_t)__a, 50); }
-
-#define vdup_lane_u8(a, __b) __extension__ ({ \
-  uint8x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdup_lane_u16(a, __b) __extension__ ({ \
-  uint16x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdup_lane_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdup_lane_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdup_lane_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdup_lane_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdup_lane_p8(a, __b) __extension__ ({ \
-  poly8x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdup_lane_p16(a, __b) __extension__ ({ \
-  poly16x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdup_lane_f32(a, __b) __extension__ ({ \
-  float32x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdupq_lane_u8(a, __b) __extension__ ({ \
-  uint8x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_lane_u16(a, __b) __extension__ ({ \
-  uint16x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_lane_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdupq_lane_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_lane_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_lane_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdupq_lane_p8(a, __b) __extension__ ({ \
-  poly8x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_lane_p16(a, __b) __extension__ ({ \
-  poly16x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_lane_f32(a, __b) __extension__ ({ \
-  float32x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdup_lane_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b); })
-#define vdup_lane_u64(a, __b) __extension__ ({ \
-  uint64x1_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b); })
-#define vdupq_lane_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdupq_lane_u64(a, __b) __extension__ ({ \
-  uint64x1_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-
-__ai uint8x8_t vdup_n_u8(uint8_t __a) {
-  return (uint8x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai uint16x4_t vdup_n_u16(uint16_t __a) {
-  return (uint16x4_t){ __a, __a, __a, __a }; }
-__ai uint32x2_t vdup_n_u32(uint32_t __a) {
-  return (uint32x2_t){ __a, __a }; }
-__ai int8x8_t vdup_n_s8(int8_t __a) {
-  return (int8x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai int16x4_t vdup_n_s16(int16_t __a) {
-  return (int16x4_t){ __a, __a, __a, __a }; }
-__ai int32x2_t vdup_n_s32(int32_t __a) {
-  return (int32x2_t){ __a, __a }; }
-__ai poly8x8_t vdup_n_p8(poly8_t __a) {
-  return (poly8x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai poly16x4_t vdup_n_p16(poly16_t __a) {
-  return (poly16x4_t){ __a, __a, __a, __a }; }
-__ai float32x2_t vdup_n_f32(float32_t __a) {
-  return (float32x2_t){ __a, __a }; }
-__ai uint8x16_t vdupq_n_u8(uint8_t __a) {
-  return (uint8x16_t){ __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai uint16x8_t vdupq_n_u16(uint16_t __a) {
-  return (uint16x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai uint32x4_t vdupq_n_u32(uint32_t __a) {
-  return (uint32x4_t){ __a, __a, __a, __a }; }
-__ai int8x16_t vdupq_n_s8(int8_t __a) {
-  return (int8x16_t){ __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai int16x8_t vdupq_n_s16(int16_t __a) {
-  return (int16x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai int32x4_t vdupq_n_s32(int32_t __a) {
-  return (int32x4_t){ __a, __a, __a, __a }; }
-__ai poly8x16_t vdupq_n_p8(poly8_t __a) {
-  return (poly8x16_t){ __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai poly16x8_t vdupq_n_p16(poly16_t __a) {
-  return (poly16x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai float32x4_t vdupq_n_f32(float32_t __a) {
-  return (float32x4_t){ __a, __a, __a, __a }; }
-__ai int64x1_t vdup_n_s64(int64_t __a) {
-  return (int64x1_t){ __a }; }
-__ai uint64x1_t vdup_n_u64(uint64_t __a) {
-  return (uint64x1_t){ __a }; }
-__ai int64x2_t vdupq_n_s64(int64_t __a) {
-  return (int64x2_t){ __a, __a }; }
-__ai uint64x2_t vdupq_n_u64(uint64_t __a) {
-  return (uint64x2_t){ __a, __a }; }
-
-__ai int8x8_t veor_s8(int8x8_t __a, int8x8_t __b) {
-  return __a ^ __b; }
-__ai int16x4_t veor_s16(int16x4_t __a, int16x4_t __b) {
-  return __a ^ __b; }
-__ai int32x2_t veor_s32(int32x2_t __a, int32x2_t __b) {
-  return __a ^ __b; }
-__ai int64x1_t veor_s64(int64x1_t __a, int64x1_t __b) {
-  return __a ^ __b; }
-__ai uint8x8_t veor_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __a ^ __b; }
-__ai uint16x4_t veor_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __a ^ __b; }
-__ai uint32x2_t veor_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __a ^ __b; }
-__ai uint64x1_t veor_u64(uint64x1_t __a, uint64x1_t __b) {
-  return __a ^ __b; }
-__ai int8x16_t veorq_s8(int8x16_t __a, int8x16_t __b) {
-  return __a ^ __b; }
-__ai int16x8_t veorq_s16(int16x8_t __a, int16x8_t __b) {
-  return __a ^ __b; }
-__ai int32x4_t veorq_s32(int32x4_t __a, int32x4_t __b) {
-  return __a ^ __b; }
-__ai int64x2_t veorq_s64(int64x2_t __a, int64x2_t __b) {
-  return __a ^ __b; }
-__ai uint8x16_t veorq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __a ^ __b; }
-__ai uint16x8_t veorq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __a ^ __b; }
-__ai uint32x4_t veorq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __a ^ __b; }
-__ai uint64x2_t veorq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __a ^ __b; }
-
-#define vext_s8(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int8x8_t __b = (b); \
-  (int8x8_t)__builtin_neon_vext_v(__a, __b, __c, 0); })
-#define vext_u8(a, b, __c) __extension__ ({ \
-  uint8x8_t __a = (a); uint8x8_t __b = (b); \
-  (uint8x8_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 16); })
-#define vext_p8(a, b, __c) __extension__ ({ \
-  poly8x8_t __a = (a); poly8x8_t __b = (b); \
-  (poly8x8_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 4); })
-#define vext_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  (int16x4_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 1); })
-#define vext_u16(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); \
-  (uint16x4_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 17); })
-#define vext_p16(a, b, __c) __extension__ ({ \
-  poly16x4_t __a = (a); poly16x4_t __b = (b); \
-  (poly16x4_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 5); })
-#define vext_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  (int32x2_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 2); })
-#define vext_u32(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); \
-  (uint32x2_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 18); })
-#define vext_s64(a, b, __c) __extension__ ({ \
-  int64x1_t __a = (a); int64x1_t __b = (b); \
-  (int64x1_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 3); })
-#define vext_u64(a, b, __c) __extension__ ({ \
-  uint64x1_t __a = (a); uint64x1_t __b = (b); \
-  (uint64x1_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 19); })
-#define vext_f32(a, b, __c) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); \
-  (float32x2_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 8); })
-#define vextq_s8(a, b, __c) __extension__ ({ \
-  int8x16_t __a = (a); int8x16_t __b = (b); \
-  (int8x16_t)__builtin_neon_vextq_v(__a, __b, __c, 32); })
-#define vextq_u8(a, b, __c) __extension__ ({ \
-  uint8x16_t __a = (a); uint8x16_t __b = (b); \
-  (uint8x16_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 48); })
-#define vextq_p8(a, b, __c) __extension__ ({ \
-  poly8x16_t __a = (a); poly8x16_t __b = (b); \
-  (poly8x16_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 36); })
-#define vextq_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  (int16x8_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 33); })
-#define vextq_u16(a, b, __c) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); \
-  (uint16x8_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 49); })
-#define vextq_p16(a, b, __c) __extension__ ({ \
-  poly16x8_t __a = (a); poly16x8_t __b = (b); \
-  (poly16x8_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 37); })
-#define vextq_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  (int32x4_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 34); })
-#define vextq_u32(a, b, __c) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); \
-  (uint32x4_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 50); })
-#define vextq_s64(a, b, __c) __extension__ ({ \
-  int64x2_t __a = (a); int64x2_t __b = (b); \
-  (int64x2_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 35); })
-#define vextq_u64(a, b, __c) __extension__ ({ \
-  uint64x2_t __a = (a); uint64x2_t __b = (b); \
-  (uint64x2_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 51); })
-#define vextq_f32(a, b, __c) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); \
-  (float32x4_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 40); })
-
-__ai float32x2_t vfma_f32(float32x2_t __a, float32x2_t __b, float32x2_t __c) {
-  return (float32x2_t)__builtin_neon_vfma_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 8); }
-__ai float32x4_t vfmaq_f32(float32x4_t __a, float32x4_t __b, float32x4_t __c) {
-  return (float32x4_t)__builtin_neon_vfmaq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 40); }
-
-__ai int8x8_t vget_high_s8(int8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 8, 9, 10, 11, 12, 13, 14, 15); }
-__ai int16x4_t vget_high_s16(int16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 4, 5, 6, 7); }
-__ai int32x2_t vget_high_s32(int32x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 2, 3); }
-__ai int64x1_t vget_high_s64(int64x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 1); }
-__ai float16x4_t vget_high_f16(float16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 4, 5, 6, 7); }
-__ai float32x2_t vget_high_f32(float32x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 2, 3); }
-__ai uint8x8_t vget_high_u8(uint8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 8, 9, 10, 11, 12, 13, 14, 15); }
-__ai uint16x4_t vget_high_u16(uint16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 4, 5, 6, 7); }
-__ai uint32x2_t vget_high_u32(uint32x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 2, 3); }
-__ai uint64x1_t vget_high_u64(uint64x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 1); }
-__ai poly8x8_t vget_high_p8(poly8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 8, 9, 10, 11, 12, 13, 14, 15); }
-__ai poly16x4_t vget_high_p16(poly16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 4, 5, 6, 7); }
-
-#define vget_lane_u8(a, __b) __extension__ ({ \
-  uint8x8_t __a = (a); \
-  (uint8_t)__builtin_neon_vget_lane_i8((int8x8_t)__a, __b); })
-#define vget_lane_u16(a, __b) __extension__ ({ \
-  uint16x4_t __a = (a); \
-  (uint16_t)__builtin_neon_vget_lane_i16((int16x4_t)__a, __b); })
-#define vget_lane_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  (uint32_t)__builtin_neon_vget_lane_i32((int32x2_t)__a, __b); })
-#define vget_lane_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  (int8_t)__builtin_neon_vget_lane_i8(__a, __b); })
-#define vget_lane_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  (int16_t)__builtin_neon_vget_lane_i16(__a, __b); })
-#define vget_lane_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  (int32_t)__builtin_neon_vget_lane_i32(__a, __b); })
-#define vget_lane_p8(a, __b) __extension__ ({ \
-  poly8x8_t __a = (a); \
-  (poly8_t)__builtin_neon_vget_lane_i8((int8x8_t)__a, __b); })
-#define vget_lane_p16(a, __b) __extension__ ({ \
-  poly16x4_t __a = (a); \
-  (poly16_t)__builtin_neon_vget_lane_i16((int16x4_t)__a, __b); })
-#define vget_lane_f32(a, __b) __extension__ ({ \
-  float32x2_t __a = (a); \
-  (float32_t)__builtin_neon_vget_lane_f32(__a, __b); })
-#define vgetq_lane_u8(a, __b) __extension__ ({ \
-  uint8x16_t __a = (a); \
-  (uint8_t)__builtin_neon_vgetq_lane_i8((int8x16_t)__a, __b); })
-#define vgetq_lane_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint16_t)__builtin_neon_vgetq_lane_i16((int16x8_t)__a, __b); })
-#define vgetq_lane_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint32_t)__builtin_neon_vgetq_lane_i32((int32x4_t)__a, __b); })
-#define vgetq_lane_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  (int8_t)__builtin_neon_vgetq_lane_i8(__a, __b); })
-#define vgetq_lane_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int16_t)__builtin_neon_vgetq_lane_i16(__a, __b); })
-#define vgetq_lane_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int32_t)__builtin_neon_vgetq_lane_i32(__a, __b); })
-#define vgetq_lane_p8(a, __b) __extension__ ({ \
-  poly8x16_t __a = (a); \
-  (poly8_t)__builtin_neon_vgetq_lane_i8((int8x16_t)__a, __b); })
-#define vgetq_lane_p16(a, __b) __extension__ ({ \
-  poly16x8_t __a = (a); \
-  (poly16_t)__builtin_neon_vgetq_lane_i16((int16x8_t)__a, __b); })
-#define vgetq_lane_f32(a, __b) __extension__ ({ \
-  float32x4_t __a = (a); \
-  (float32_t)__builtin_neon_vgetq_lane_f32(__a, __b); })
-#define vget_lane_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  (int64_t)__builtin_neon_vget_lane_i64(__a, __b); })
-#define vget_lane_u64(a, __b) __extension__ ({ \
-  uint64x1_t __a = (a); \
-  (uint64_t)__builtin_neon_vget_lane_i64((int64x1_t)__a, __b); })
-#define vgetq_lane_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int64_t)__builtin_neon_vgetq_lane_i64(__a, __b); })
-#define vgetq_lane_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint64_t)__builtin_neon_vgetq_lane_i64((int64x2_t)__a, __b); })
-
-__ai int8x8_t vget_low_s8(int8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1, 2, 3, 4, 5, 6, 7); }
-__ai int16x4_t vget_low_s16(int16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1, 2, 3); }
-__ai int32x2_t vget_low_s32(int32x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1); }
-__ai int64x1_t vget_low_s64(int64x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 0); }
-__ai float16x4_t vget_low_f16(float16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1, 2, 3); }
-__ai float32x2_t vget_low_f32(float32x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1); }
-__ai uint8x8_t vget_low_u8(uint8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1, 2, 3, 4, 5, 6, 7); }
-__ai uint16x4_t vget_low_u16(uint16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1, 2, 3); }
-__ai uint32x2_t vget_low_u32(uint32x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1); }
-__ai uint64x1_t vget_low_u64(uint64x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 0); }
-__ai poly8x8_t vget_low_p8(poly8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1, 2, 3, 4, 5, 6, 7); }
-__ai poly16x4_t vget_low_p16(poly16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 0, 1, 2, 3); }
-
-__ai int8x8_t vhadd_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vhadd_v(__a, __b, 0); }
-__ai int16x4_t vhadd_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vhadd_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vhadd_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vhadd_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai uint8x8_t vhadd_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vhadd_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vhadd_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vhadd_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vhadd_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vhadd_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai int8x16_t vhaddq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vhaddq_v(__a, __b, 32); }
-__ai int16x8_t vhaddq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vhaddq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vhaddq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vhaddq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai uint8x16_t vhaddq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vhaddq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vhaddq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vhaddq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vhaddq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vhaddq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-
-__ai int8x8_t vhsub_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vhsub_v(__a, __b, 0); }
-__ai int16x4_t vhsub_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vhsub_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vhsub_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vhsub_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai uint8x8_t vhsub_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vhsub_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vhsub_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vhsub_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vhsub_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vhsub_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai int8x16_t vhsubq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vhsubq_v(__a, __b, 32); }
-__ai int16x8_t vhsubq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vhsubq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vhsubq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vhsubq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai uint8x16_t vhsubq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vhsubq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vhsubq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vhsubq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vhsubq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vhsubq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-
-#define vld1q_u8(__a) __extension__ ({ \
-  (uint8x16_t)__builtin_neon_vld1q_v(__a, 48); })
-#define vld1q_u16(__a) __extension__ ({ \
-  (uint16x8_t)__builtin_neon_vld1q_v(__a, 49); })
-#define vld1q_u32(__a) __extension__ ({ \
-  (uint32x4_t)__builtin_neon_vld1q_v(__a, 50); })
-#define vld1q_u64(__a) __extension__ ({ \
-  (uint64x2_t)__builtin_neon_vld1q_v(__a, 51); })
-#define vld1q_s8(__a) __extension__ ({ \
-  (int8x16_t)__builtin_neon_vld1q_v(__a, 32); })
-#define vld1q_s16(__a) __extension__ ({ \
-  (int16x8_t)__builtin_neon_vld1q_v(__a, 33); })
-#define vld1q_s32(__a) __extension__ ({ \
-  (int32x4_t)__builtin_neon_vld1q_v(__a, 34); })
-#define vld1q_s64(__a) __extension__ ({ \
-  (int64x2_t)__builtin_neon_vld1q_v(__a, 35); })
-#define vld1q_f16(__a) __extension__ ({ \
-  (float16x8_t)__builtin_neon_vld1q_v(__a, 39); })
-#define vld1q_f32(__a) __extension__ ({ \
-  (float32x4_t)__builtin_neon_vld1q_v(__a, 40); })
-#define vld1q_p8(__a) __extension__ ({ \
-  (poly8x16_t)__builtin_neon_vld1q_v(__a, 36); })
-#define vld1q_p16(__a) __extension__ ({ \
-  (poly16x8_t)__builtin_neon_vld1q_v(__a, 37); })
-#define vld1_u8(__a) __extension__ ({ \
-  (uint8x8_t)__builtin_neon_vld1_v(__a, 16); })
-#define vld1_u16(__a) __extension__ ({ \
-  (uint16x4_t)__builtin_neon_vld1_v(__a, 17); })
-#define vld1_u32(__a) __extension__ ({ \
-  (uint32x2_t)__builtin_neon_vld1_v(__a, 18); })
-#define vld1_u64(__a) __extension__ ({ \
-  (uint64x1_t)__builtin_neon_vld1_v(__a, 19); })
-#define vld1_s8(__a) __extension__ ({ \
-  (int8x8_t)__builtin_neon_vld1_v(__a, 0); })
-#define vld1_s16(__a) __extension__ ({ \
-  (int16x4_t)__builtin_neon_vld1_v(__a, 1); })
-#define vld1_s32(__a) __extension__ ({ \
-  (int32x2_t)__builtin_neon_vld1_v(__a, 2); })
-#define vld1_s64(__a) __extension__ ({ \
-  (int64x1_t)__builtin_neon_vld1_v(__a, 3); })
-#define vld1_f16(__a) __extension__ ({ \
-  (float16x4_t)__builtin_neon_vld1_v(__a, 7); })
-#define vld1_f32(__a) __extension__ ({ \
-  (float32x2_t)__builtin_neon_vld1_v(__a, 8); })
-#define vld1_p8(__a) __extension__ ({ \
-  (poly8x8_t)__builtin_neon_vld1_v(__a, 4); })
-#define vld1_p16(__a) __extension__ ({ \
-  (poly16x4_t)__builtin_neon_vld1_v(__a, 5); })
-
-#define vld1q_dup_u8(__a) __extension__ ({ \
-  (uint8x16_t)__builtin_neon_vld1q_dup_v(__a, 48); })
-#define vld1q_dup_u16(__a) __extension__ ({ \
-  (uint16x8_t)__builtin_neon_vld1q_dup_v(__a, 49); })
-#define vld1q_dup_u32(__a) __extension__ ({ \
-  (uint32x4_t)__builtin_neon_vld1q_dup_v(__a, 50); })
-#define vld1q_dup_u64(__a) __extension__ ({ \
-  (uint64x2_t)__builtin_neon_vld1q_dup_v(__a, 51); })
-#define vld1q_dup_s8(__a) __extension__ ({ \
-  (int8x16_t)__builtin_neon_vld1q_dup_v(__a, 32); })
-#define vld1q_dup_s16(__a) __extension__ ({ \
-  (int16x8_t)__builtin_neon_vld1q_dup_v(__a, 33); })
-#define vld1q_dup_s32(__a) __extension__ ({ \
-  (int32x4_t)__builtin_neon_vld1q_dup_v(__a, 34); })
-#define vld1q_dup_s64(__a) __extension__ ({ \
-  (int64x2_t)__builtin_neon_vld1q_dup_v(__a, 35); })
-#define vld1q_dup_f16(__a) __extension__ ({ \
-  (float16x8_t)__builtin_neon_vld1q_dup_v(__a, 39); })
-#define vld1q_dup_f32(__a) __extension__ ({ \
-  (float32x4_t)__builtin_neon_vld1q_dup_v(__a, 40); })
-#define vld1q_dup_p8(__a) __extension__ ({ \
-  (poly8x16_t)__builtin_neon_vld1q_dup_v(__a, 36); })
-#define vld1q_dup_p16(__a) __extension__ ({ \
-  (poly16x8_t)__builtin_neon_vld1q_dup_v(__a, 37); })
-#define vld1_dup_u8(__a) __extension__ ({ \
-  (uint8x8_t)__builtin_neon_vld1_dup_v(__a, 16); })
-#define vld1_dup_u16(__a) __extension__ ({ \
-  (uint16x4_t)__builtin_neon_vld1_dup_v(__a, 17); })
-#define vld1_dup_u32(__a) __extension__ ({ \
-  (uint32x2_t)__builtin_neon_vld1_dup_v(__a, 18); })
-#define vld1_dup_u64(__a) __extension__ ({ \
-  (uint64x1_t)__builtin_neon_vld1_dup_v(__a, 19); })
-#define vld1_dup_s8(__a) __extension__ ({ \
-  (int8x8_t)__builtin_neon_vld1_dup_v(__a, 0); })
-#define vld1_dup_s16(__a) __extension__ ({ \
-  (int16x4_t)__builtin_neon_vld1_dup_v(__a, 1); })
-#define vld1_dup_s32(__a) __extension__ ({ \
-  (int32x2_t)__builtin_neon_vld1_dup_v(__a, 2); })
-#define vld1_dup_s64(__a) __extension__ ({ \
-  (int64x1_t)__builtin_neon_vld1_dup_v(__a, 3); })
-#define vld1_dup_f16(__a) __extension__ ({ \
-  (float16x4_t)__builtin_neon_vld1_dup_v(__a, 7); })
-#define vld1_dup_f32(__a) __extension__ ({ \
-  (float32x2_t)__builtin_neon_vld1_dup_v(__a, 8); })
-#define vld1_dup_p8(__a) __extension__ ({ \
-  (poly8x8_t)__builtin_neon_vld1_dup_v(__a, 4); })
-#define vld1_dup_p16(__a) __extension__ ({ \
-  (poly16x4_t)__builtin_neon_vld1_dup_v(__a, 5); })
-
-#define vld1q_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x16_t __b = (b); \
-  (uint8x16_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 48); })
-#define vld1q_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x8_t __b = (b); \
-  (uint16x8_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 49); })
-#define vld1q_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x4_t __b = (b); \
-  (uint32x4_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 50); })
-#define vld1q_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x2_t __b = (b); \
-  (uint64x2_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 51); })
-#define vld1q_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x16_t __b = (b); \
-  (int8x16_t)__builtin_neon_vld1q_lane_v(__a, __b, __c, 32); })
-#define vld1q_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x8_t __b = (b); \
-  (int16x8_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 33); })
-#define vld1q_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x4_t __b = (b); \
-  (int32x4_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 34); })
-#define vld1q_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x2_t __b = (b); \
-  (int64x2_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 35); })
-#define vld1q_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x8_t __b = (b); \
-  (float16x8_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 39); })
-#define vld1q_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x4_t __b = (b); \
-  (float32x4_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 40); })
-#define vld1q_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x16_t __b = (b); \
-  (poly8x16_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 36); })
-#define vld1q_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x8_t __b = (b); \
-  (poly16x8_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 37); })
-#define vld1_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x8_t __b = (b); \
-  (uint8x8_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 16); })
-#define vld1_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x4_t __b = (b); \
-  (uint16x4_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 17); })
-#define vld1_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x2_t __b = (b); \
-  (uint32x2_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 18); })
-#define vld1_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x1_t __b = (b); \
-  (uint64x1_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 19); })
-#define vld1_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x8_t __b = (b); \
-  (int8x8_t)__builtin_neon_vld1_lane_v(__a, __b, __c, 0); })
-#define vld1_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x4_t __b = (b); \
-  (int16x4_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 1); })
-#define vld1_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x2_t __b = (b); \
-  (int32x2_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 2); })
-#define vld1_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x1_t __b = (b); \
-  (int64x1_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 3); })
-#define vld1_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x4_t __b = (b); \
-  (float16x4_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 7); })
-#define vld1_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x2_t __b = (b); \
-  (float32x2_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 8); })
-#define vld1_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x8_t __b = (b); \
-  (poly8x8_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 4); })
-#define vld1_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x4_t __b = (b); \
-  (poly16x4_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 5); })
-
-#define vld2q_u8(__a) __extension__ ({ \
-  uint8x16x2_t r; __builtin_neon_vld2q_v(&r, __a, 48); r; })
-#define vld2q_u16(__a) __extension__ ({ \
-  uint16x8x2_t r; __builtin_neon_vld2q_v(&r, __a, 49); r; })
-#define vld2q_u32(__a) __extension__ ({ \
-  uint32x4x2_t r; __builtin_neon_vld2q_v(&r, __a, 50); r; })
-#define vld2q_s8(__a) __extension__ ({ \
-  int8x16x2_t r; __builtin_neon_vld2q_v(&r, __a, 32); r; })
-#define vld2q_s16(__a) __extension__ ({ \
-  int16x8x2_t r; __builtin_neon_vld2q_v(&r, __a, 33); r; })
-#define vld2q_s32(__a) __extension__ ({ \
-  int32x4x2_t r; __builtin_neon_vld2q_v(&r, __a, 34); r; })
-#define vld2q_f16(__a) __extension__ ({ \
-  float16x8x2_t r; __builtin_neon_vld2q_v(&r, __a, 39); r; })
-#define vld2q_f32(__a) __extension__ ({ \
-  float32x4x2_t r; __builtin_neon_vld2q_v(&r, __a, 40); r; })
-#define vld2q_p8(__a) __extension__ ({ \
-  poly8x16x2_t r; __builtin_neon_vld2q_v(&r, __a, 36); r; })
-#define vld2q_p16(__a) __extension__ ({ \
-  poly16x8x2_t r; __builtin_neon_vld2q_v(&r, __a, 37); r; })
-#define vld2_u8(__a) __extension__ ({ \
-  uint8x8x2_t r; __builtin_neon_vld2_v(&r, __a, 16); r; })
-#define vld2_u16(__a) __extension__ ({ \
-  uint16x4x2_t r; __builtin_neon_vld2_v(&r, __a, 17); r; })
-#define vld2_u32(__a) __extension__ ({ \
-  uint32x2x2_t r; __builtin_neon_vld2_v(&r, __a, 18); r; })
-#define vld2_u64(__a) __extension__ ({ \
-  uint64x1x2_t r; __builtin_neon_vld2_v(&r, __a, 19); r; })
-#define vld2_s8(__a) __extension__ ({ \
-  int8x8x2_t r; __builtin_neon_vld2_v(&r, __a, 0); r; })
-#define vld2_s16(__a) __extension__ ({ \
-  int16x4x2_t r; __builtin_neon_vld2_v(&r, __a, 1); r; })
-#define vld2_s32(__a) __extension__ ({ \
-  int32x2x2_t r; __builtin_neon_vld2_v(&r, __a, 2); r; })
-#define vld2_s64(__a) __extension__ ({ \
-  int64x1x2_t r; __builtin_neon_vld2_v(&r, __a, 3); r; })
-#define vld2_f16(__a) __extension__ ({ \
-  float16x4x2_t r; __builtin_neon_vld2_v(&r, __a, 7); r; })
-#define vld2_f32(__a) __extension__ ({ \
-  float32x2x2_t r; __builtin_neon_vld2_v(&r, __a, 8); r; })
-#define vld2_p8(__a) __extension__ ({ \
-  poly8x8x2_t r; __builtin_neon_vld2_v(&r, __a, 4); r; })
-#define vld2_p16(__a) __extension__ ({ \
-  poly16x4x2_t r; __builtin_neon_vld2_v(&r, __a, 5); r; })
-
-#define vld2_dup_u8(__a) __extension__ ({ \
-  uint8x8x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 16); r; })
-#define vld2_dup_u16(__a) __extension__ ({ \
-  uint16x4x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 17); r; })
-#define vld2_dup_u32(__a) __extension__ ({ \
-  uint32x2x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 18); r; })
-#define vld2_dup_u64(__a) __extension__ ({ \
-  uint64x1x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 19); r; })
-#define vld2_dup_s8(__a) __extension__ ({ \
-  int8x8x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 0); r; })
-#define vld2_dup_s16(__a) __extension__ ({ \
-  int16x4x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 1); r; })
-#define vld2_dup_s32(__a) __extension__ ({ \
-  int32x2x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 2); r; })
-#define vld2_dup_s64(__a) __extension__ ({ \
-  int64x1x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 3); r; })
-#define vld2_dup_f16(__a) __extension__ ({ \
-  float16x4x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 7); r; })
-#define vld2_dup_f32(__a) __extension__ ({ \
-  float32x2x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 8); r; })
-#define vld2_dup_p8(__a) __extension__ ({ \
-  poly8x8x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 4); r; })
-#define vld2_dup_p16(__a) __extension__ ({ \
-  poly16x4x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 5); r; })
-
-#define vld2q_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x8x2_t __b = (b); \
-  uint16x8x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 49); r; })
-#define vld2q_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x4x2_t __b = (b); \
-  uint32x4x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 50); r; })
-#define vld2q_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x8x2_t __b = (b); \
-  int16x8x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 33); r; })
-#define vld2q_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x4x2_t __b = (b); \
-  int32x4x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 34); r; })
-#define vld2q_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x8x2_t __b = (b); \
-  float16x8x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 39); r; })
-#define vld2q_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x4x2_t __b = (b); \
-  float32x4x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 40); r; })
-#define vld2q_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x8x2_t __b = (b); \
-  poly16x8x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 37); r; })
-#define vld2_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x8x2_t __b = (b); \
-  uint8x8x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 16); r; })
-#define vld2_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x4x2_t __b = (b); \
-  uint16x4x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 17); r; })
-#define vld2_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x2x2_t __b = (b); \
-  uint32x2x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 18); r; })
-#define vld2_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x8x2_t __b = (b); \
-  int8x8x2_t r; __builtin_neon_vld2_lane_v(&r, __a, __b.val[0], __b.val[1], __c, 0); r; })
-#define vld2_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x4x2_t __b = (b); \
-  int16x4x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 1); r; })
-#define vld2_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x2x2_t __b = (b); \
-  int32x2x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 2); r; })
-#define vld2_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x4x2_t __b = (b); \
-  float16x4x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 7); r; })
-#define vld2_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x2x2_t __b = (b); \
-  float32x2x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 8); r; })
-#define vld2_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x8x2_t __b = (b); \
-  poly8x8x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 4); r; })
-#define vld2_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x4x2_t __b = (b); \
-  poly16x4x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 5); r; })
-
-#define vld3q_u8(__a) __extension__ ({ \
-  uint8x16x3_t r; __builtin_neon_vld3q_v(&r, __a, 48); r; })
-#define vld3q_u16(__a) __extension__ ({ \
-  uint16x8x3_t r; __builtin_neon_vld3q_v(&r, __a, 49); r; })
-#define vld3q_u32(__a) __extension__ ({ \
-  uint32x4x3_t r; __builtin_neon_vld3q_v(&r, __a, 50); r; })
-#define vld3q_s8(__a) __extension__ ({ \
-  int8x16x3_t r; __builtin_neon_vld3q_v(&r, __a, 32); r; })
-#define vld3q_s16(__a) __extension__ ({ \
-  int16x8x3_t r; __builtin_neon_vld3q_v(&r, __a, 33); r; })
-#define vld3q_s32(__a) __extension__ ({ \
-  int32x4x3_t r; __builtin_neon_vld3q_v(&r, __a, 34); r; })
-#define vld3q_f16(__a) __extension__ ({ \
-  float16x8x3_t r; __builtin_neon_vld3q_v(&r, __a, 39); r; })
-#define vld3q_f32(__a) __extension__ ({ \
-  float32x4x3_t r; __builtin_neon_vld3q_v(&r, __a, 40); r; })
-#define vld3q_p8(__a) __extension__ ({ \
-  poly8x16x3_t r; __builtin_neon_vld3q_v(&r, __a, 36); r; })
-#define vld3q_p16(__a) __extension__ ({ \
-  poly16x8x3_t r; __builtin_neon_vld3q_v(&r, __a, 37); r; })
-#define vld3_u8(__a) __extension__ ({ \
-  uint8x8x3_t r; __builtin_neon_vld3_v(&r, __a, 16); r; })
-#define vld3_u16(__a) __extension__ ({ \
-  uint16x4x3_t r; __builtin_neon_vld3_v(&r, __a, 17); r; })
-#define vld3_u32(__a) __extension__ ({ \
-  uint32x2x3_t r; __builtin_neon_vld3_v(&r, __a, 18); r; })
-#define vld3_u64(__a) __extension__ ({ \
-  uint64x1x3_t r; __builtin_neon_vld3_v(&r, __a, 19); r; })
-#define vld3_s8(__a) __extension__ ({ \
-  int8x8x3_t r; __builtin_neon_vld3_v(&r, __a, 0); r; })
-#define vld3_s16(__a) __extension__ ({ \
-  int16x4x3_t r; __builtin_neon_vld3_v(&r, __a, 1); r; })
-#define vld3_s32(__a) __extension__ ({ \
-  int32x2x3_t r; __builtin_neon_vld3_v(&r, __a, 2); r; })
-#define vld3_s64(__a) __extension__ ({ \
-  int64x1x3_t r; __builtin_neon_vld3_v(&r, __a, 3); r; })
-#define vld3_f16(__a) __extension__ ({ \
-  float16x4x3_t r; __builtin_neon_vld3_v(&r, __a, 7); r; })
-#define vld3_f32(__a) __extension__ ({ \
-  float32x2x3_t r; __builtin_neon_vld3_v(&r, __a, 8); r; })
-#define vld3_p8(__a) __extension__ ({ \
-  poly8x8x3_t r; __builtin_neon_vld3_v(&r, __a, 4); r; })
-#define vld3_p16(__a) __extension__ ({ \
-  poly16x4x3_t r; __builtin_neon_vld3_v(&r, __a, 5); r; })
-
-#define vld3_dup_u8(__a) __extension__ ({ \
-  uint8x8x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 16); r; })
-#define vld3_dup_u16(__a) __extension__ ({ \
-  uint16x4x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 17); r; })
-#define vld3_dup_u32(__a) __extension__ ({ \
-  uint32x2x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 18); r; })
-#define vld3_dup_u64(__a) __extension__ ({ \
-  uint64x1x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 19); r; })
-#define vld3_dup_s8(__a) __extension__ ({ \
-  int8x8x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 0); r; })
-#define vld3_dup_s16(__a) __extension__ ({ \
-  int16x4x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 1); r; })
-#define vld3_dup_s32(__a) __extension__ ({ \
-  int32x2x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 2); r; })
-#define vld3_dup_s64(__a) __extension__ ({ \
-  int64x1x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 3); r; })
-#define vld3_dup_f16(__a) __extension__ ({ \
-  float16x4x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 7); r; })
-#define vld3_dup_f32(__a) __extension__ ({ \
-  float32x2x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 8); r; })
-#define vld3_dup_p8(__a) __extension__ ({ \
-  poly8x8x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 4); r; })
-#define vld3_dup_p16(__a) __extension__ ({ \
-  poly16x4x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 5); r; })
-
-#define vld3q_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x8x3_t __b = (b); \
-  uint16x8x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 49); r; })
-#define vld3q_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x4x3_t __b = (b); \
-  uint32x4x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 50); r; })
-#define vld3q_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x8x3_t __b = (b); \
-  int16x8x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 33); r; })
-#define vld3q_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x4x3_t __b = (b); \
-  int32x4x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 34); r; })
-#define vld3q_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x8x3_t __b = (b); \
-  float16x8x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 39); r; })
-#define vld3q_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x4x3_t __b = (b); \
-  float32x4x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 40); r; })
-#define vld3q_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x8x3_t __b = (b); \
-  poly16x8x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 37); r; })
-#define vld3_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x8x3_t __b = (b); \
-  uint8x8x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 16); r; })
-#define vld3_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x4x3_t __b = (b); \
-  uint16x4x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 17); r; })
-#define vld3_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x2x3_t __b = (b); \
-  uint32x2x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 18); r; })
-#define vld3_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x8x3_t __b = (b); \
-  int8x8x3_t r; __builtin_neon_vld3_lane_v(&r, __a, __b.val[0], __b.val[1], __b.val[2], __c, 0); r; })
-#define vld3_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x4x3_t __b = (b); \
-  int16x4x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 1); r; })
-#define vld3_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x2x3_t __b = (b); \
-  int32x2x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 2); r; })
-#define vld3_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x4x3_t __b = (b); \
-  float16x4x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 7); r; })
-#define vld3_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x2x3_t __b = (b); \
-  float32x2x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 8); r; })
-#define vld3_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x8x3_t __b = (b); \
-  poly8x8x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 4); r; })
-#define vld3_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x4x3_t __b = (b); \
-  poly16x4x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 5); r; })
-
-#define vld4q_u8(__a) __extension__ ({ \
-  uint8x16x4_t r; __builtin_neon_vld4q_v(&r, __a, 48); r; })
-#define vld4q_u16(__a) __extension__ ({ \
-  uint16x8x4_t r; __builtin_neon_vld4q_v(&r, __a, 49); r; })
-#define vld4q_u32(__a) __extension__ ({ \
-  uint32x4x4_t r; __builtin_neon_vld4q_v(&r, __a, 50); r; })
-#define vld4q_s8(__a) __extension__ ({ \
-  int8x16x4_t r; __builtin_neon_vld4q_v(&r, __a, 32); r; })
-#define vld4q_s16(__a) __extension__ ({ \
-  int16x8x4_t r; __builtin_neon_vld4q_v(&r, __a, 33); r; })
-#define vld4q_s32(__a) __extension__ ({ \
-  int32x4x4_t r; __builtin_neon_vld4q_v(&r, __a, 34); r; })
-#define vld4q_f16(__a) __extension__ ({ \
-  float16x8x4_t r; __builtin_neon_vld4q_v(&r, __a, 39); r; })
-#define vld4q_f32(__a) __extension__ ({ \
-  float32x4x4_t r; __builtin_neon_vld4q_v(&r, __a, 40); r; })
-#define vld4q_p8(__a) __extension__ ({ \
-  poly8x16x4_t r; __builtin_neon_vld4q_v(&r, __a, 36); r; })
-#define vld4q_p16(__a) __extension__ ({ \
-  poly16x8x4_t r; __builtin_neon_vld4q_v(&r, __a, 37); r; })
-#define vld4_u8(__a) __extension__ ({ \
-  uint8x8x4_t r; __builtin_neon_vld4_v(&r, __a, 16); r; })
-#define vld4_u16(__a) __extension__ ({ \
-  uint16x4x4_t r; __builtin_neon_vld4_v(&r, __a, 17); r; })
-#define vld4_u32(__a) __extension__ ({ \
-  uint32x2x4_t r; __builtin_neon_vld4_v(&r, __a, 18); r; })
-#define vld4_u64(__a) __extension__ ({ \
-  uint64x1x4_t r; __builtin_neon_vld4_v(&r, __a, 19); r; })
-#define vld4_s8(__a) __extension__ ({ \
-  int8x8x4_t r; __builtin_neon_vld4_v(&r, __a, 0); r; })
-#define vld4_s16(__a) __extension__ ({ \
-  int16x4x4_t r; __builtin_neon_vld4_v(&r, __a, 1); r; })
-#define vld4_s32(__a) __extension__ ({ \
-  int32x2x4_t r; __builtin_neon_vld4_v(&r, __a, 2); r; })
-#define vld4_s64(__a) __extension__ ({ \
-  int64x1x4_t r; __builtin_neon_vld4_v(&r, __a, 3); r; })
-#define vld4_f16(__a) __extension__ ({ \
-  float16x4x4_t r; __builtin_neon_vld4_v(&r, __a, 7); r; })
-#define vld4_f32(__a) __extension__ ({ \
-  float32x2x4_t r; __builtin_neon_vld4_v(&r, __a, 8); r; })
-#define vld4_p8(__a) __extension__ ({ \
-  poly8x8x4_t r; __builtin_neon_vld4_v(&r, __a, 4); r; })
-#define vld4_p16(__a) __extension__ ({ \
-  poly16x4x4_t r; __builtin_neon_vld4_v(&r, __a, 5); r; })
-
-#define vld4_dup_u8(__a) __extension__ ({ \
-  uint8x8x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 16); r; })
-#define vld4_dup_u16(__a) __extension__ ({ \
-  uint16x4x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 17); r; })
-#define vld4_dup_u32(__a) __extension__ ({ \
-  uint32x2x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 18); r; })
-#define vld4_dup_u64(__a) __extension__ ({ \
-  uint64x1x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 19); r; })
-#define vld4_dup_s8(__a) __extension__ ({ \
-  int8x8x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 0); r; })
-#define vld4_dup_s16(__a) __extension__ ({ \
-  int16x4x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 1); r; })
-#define vld4_dup_s32(__a) __extension__ ({ \
-  int32x2x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 2); r; })
-#define vld4_dup_s64(__a) __extension__ ({ \
-  int64x1x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 3); r; })
-#define vld4_dup_f16(__a) __extension__ ({ \
-  float16x4x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 7); r; })
-#define vld4_dup_f32(__a) __extension__ ({ \
-  float32x2x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 8); r; })
-#define vld4_dup_p8(__a) __extension__ ({ \
-  poly8x8x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 4); r; })
-#define vld4_dup_p16(__a) __extension__ ({ \
-  poly16x4x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 5); r; })
-
-#define vld4q_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x8x4_t __b = (b); \
-  uint16x8x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 49); r; })
-#define vld4q_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x4x4_t __b = (b); \
-  uint32x4x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 50); r; })
-#define vld4q_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x8x4_t __b = (b); \
-  int16x8x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 33); r; })
-#define vld4q_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x4x4_t __b = (b); \
-  int32x4x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 34); r; })
-#define vld4q_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x8x4_t __b = (b); \
-  float16x8x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 39); r; })
-#define vld4q_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x4x4_t __b = (b); \
-  float32x4x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 40); r; })
-#define vld4q_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x8x4_t __b = (b); \
-  poly16x8x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 37); r; })
-#define vld4_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x8x4_t __b = (b); \
-  uint8x8x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 16); r; })
-#define vld4_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x4x4_t __b = (b); \
-  uint16x4x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 17); r; })
-#define vld4_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x2x4_t __b = (b); \
-  uint32x2x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 18); r; })
-#define vld4_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x8x4_t __b = (b); \
-  int8x8x4_t r; __builtin_neon_vld4_lane_v(&r, __a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], __c, 0); r; })
-#define vld4_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x4x4_t __b = (b); \
-  int16x4x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 1); r; })
-#define vld4_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x2x4_t __b = (b); \
-  int32x2x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 2); r; })
-#define vld4_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x4x4_t __b = (b); \
-  float16x4x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 7); r; })
-#define vld4_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x2x4_t __b = (b); \
-  float32x2x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 8); r; })
-#define vld4_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x8x4_t __b = (b); \
-  poly8x8x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 4); r; })
-#define vld4_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x4x4_t __b = (b); \
-  poly16x4x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 5); r; })
-
-__ai int8x8_t vmax_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vmax_v(__a, __b, 0); }
-__ai int16x4_t vmax_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vmax_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vmax_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vmax_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai uint8x8_t vmax_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vmax_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vmax_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vmax_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vmax_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vmax_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai float32x2_t vmax_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vmax_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai int8x16_t vmaxq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vmaxq_v(__a, __b, 32); }
-__ai int16x8_t vmaxq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vmaxq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vmaxq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vmaxq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai uint8x16_t vmaxq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vmaxq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vmaxq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vmaxq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vmaxq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vmaxq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai float32x4_t vmaxq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vmaxq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-
-__ai int8x8_t vmin_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vmin_v(__a, __b, 0); }
-__ai int16x4_t vmin_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vmin_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vmin_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vmin_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai uint8x8_t vmin_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vmin_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vmin_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vmin_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vmin_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vmin_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai float32x2_t vmin_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vmin_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai int8x16_t vminq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vminq_v(__a, __b, 32); }
-__ai int16x8_t vminq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vminq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vminq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vminq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai uint8x16_t vminq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vminq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vminq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vminq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vminq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vminq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai float32x4_t vminq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vminq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-
-__ai int8x8_t vmla_s8(int8x8_t __a, int8x8_t __b, int8x8_t __c) {
-  return __a + (__b * __c); }
-__ai int16x4_t vmla_s16(int16x4_t __a, int16x4_t __b, int16x4_t __c) {
-  return __a + (__b * __c); }
-__ai int32x2_t vmla_s32(int32x2_t __a, int32x2_t __b, int32x2_t __c) {
-  return __a + (__b * __c); }
-__ai float32x2_t vmla_f32(float32x2_t __a, float32x2_t __b, float32x2_t __c) {
-  return __a + (__b * __c); }
-__ai uint8x8_t vmla_u8(uint8x8_t __a, uint8x8_t __b, uint8x8_t __c) {
-  return __a + (__b * __c); }
-__ai uint16x4_t vmla_u16(uint16x4_t __a, uint16x4_t __b, uint16x4_t __c) {
-  return __a + (__b * __c); }
-__ai uint32x2_t vmla_u32(uint32x2_t __a, uint32x2_t __b, uint32x2_t __c) {
-  return __a + (__b * __c); }
-__ai int8x16_t vmlaq_s8(int8x16_t __a, int8x16_t __b, int8x16_t __c) {
-  return __a + (__b * __c); }
-__ai int16x8_t vmlaq_s16(int16x8_t __a, int16x8_t __b, int16x8_t __c) {
-  return __a + (__b * __c); }
-__ai int32x4_t vmlaq_s32(int32x4_t __a, int32x4_t __b, int32x4_t __c) {
-  return __a + (__b * __c); }
-__ai float32x4_t vmlaq_f32(float32x4_t __a, float32x4_t __b, float32x4_t __c) {
-  return __a + (__b * __c); }
-__ai uint8x16_t vmlaq_u8(uint8x16_t __a, uint8x16_t __b, uint8x16_t __c) {
-  return __a + (__b * __c); }
-__ai uint16x8_t vmlaq_u16(uint16x8_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return __a + (__b * __c); }
-__ai uint32x4_t vmlaq_u32(uint32x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return __a + (__b * __c); }
-
-__ai int16x8_t vmlal_s8(int16x8_t __a, int8x8_t __b, int8x8_t __c) {
-  return __a + vmull_s8(__b, __c); }
-__ai int32x4_t vmlal_s16(int32x4_t __a, int16x4_t __b, int16x4_t __c) {
-  return __a + vmull_s16(__b, __c); }
-__ai int64x2_t vmlal_s32(int64x2_t __a, int32x2_t __b, int32x2_t __c) {
-  return __a + vmull_s32(__b, __c); }
-__ai uint16x8_t vmlal_u8(uint16x8_t __a, uint8x8_t __b, uint8x8_t __c) {
-  return __a + vmull_u8(__b, __c); }
-__ai uint32x4_t vmlal_u16(uint32x4_t __a, uint16x4_t __b, uint16x4_t __c) {
-  return __a + vmull_u16(__b, __c); }
-__ai uint64x2_t vmlal_u32(uint64x2_t __a, uint32x2_t __b, uint32x2_t __c) {
-  return __a + vmull_u32(__b, __c); }
-
-#define vmlal_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x4_t __b = (b); int16x4_t __c = (c); \
-  __a + vmull_s16(__b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlal_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x2_t __b = (b); int32x2_t __c = (c); \
-  __a + vmull_s32(__b, __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlal_lane_u16(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint16x4_t __b = (b); uint16x4_t __c = (c); \
-  __a + vmull_u16(__b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlal_lane_u32(a, b, c, __d) __extension__ ({ \
-  uint64x2_t __a = (a); uint32x2_t __b = (b); uint32x2_t __c = (c); \
-  __a + vmull_u32(__b, __builtin_shufflevector(__c, __c, __d, __d)); })
-
-__ai int32x4_t vmlal_n_s16(int32x4_t __a, int16x4_t __b, int16_t __c) {
-  return __a + vmull_s16(__b, (int16x4_t){ __c, __c, __c, __c }); }
-__ai int64x2_t vmlal_n_s32(int64x2_t __a, int32x2_t __b, int32_t __c) {
-  return __a + vmull_s32(__b, (int32x2_t){ __c, __c }); }
-__ai uint32x4_t vmlal_n_u16(uint32x4_t __a, uint16x4_t __b, uint16_t __c) {
-  return __a + vmull_u16(__b, (uint16x4_t){ __c, __c, __c, __c }); }
-__ai uint64x2_t vmlal_n_u32(uint64x2_t __a, uint32x2_t __b, uint32_t __c) {
-  return __a + vmull_u32(__b, (uint32x2_t){ __c, __c }); }
-
-#define vmla_lane_s16(a, b, c, __d) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); int16x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmla_lane_s32(a, b, c, __d) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); int32x2_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmla_lane_u16(a, b, c, __d) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); uint16x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmla_lane_u32(a, b, c, __d) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); uint32x2_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmla_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); float32x2_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlaq_lane_s16(a, b, c, __d) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); int16x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d, __d, __d, __d, __d)); })
-#define vmlaq_lane_s32(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); int32x2_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlaq_lane_u16(a, b, c, __d) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); uint16x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d, __d, __d, __d, __d)); })
-#define vmlaq_lane_u32(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); uint32x2_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlaq_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); float32x2_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-
-__ai int16x4_t vmla_n_s16(int16x4_t __a, int16x4_t __b, int16_t __c) {
-  return __a + (__b * (int16x4_t){ __c, __c, __c, __c }); }
-__ai int32x2_t vmla_n_s32(int32x2_t __a, int32x2_t __b, int32_t __c) {
-  return __a + (__b * (int32x2_t){ __c, __c }); }
-__ai uint16x4_t vmla_n_u16(uint16x4_t __a, uint16x4_t __b, uint16_t __c) {
-  return __a + (__b * (uint16x4_t){ __c, __c, __c, __c }); }
-__ai uint32x2_t vmla_n_u32(uint32x2_t __a, uint32x2_t __b, uint32_t __c) {
-  return __a + (__b * (uint32x2_t){ __c, __c }); }
-__ai float32x2_t vmla_n_f32(float32x2_t __a, float32x2_t __b, float32_t __c) {
-  return __a + (__b * (float32x2_t){ __c, __c }); }
-__ai int16x8_t vmlaq_n_s16(int16x8_t __a, int16x8_t __b, int16_t __c) {
-  return __a + (__b * (int16x8_t){ __c, __c, __c, __c, __c, __c, __c, __c }); }
-__ai int32x4_t vmlaq_n_s32(int32x4_t __a, int32x4_t __b, int32_t __c) {
-  return __a + (__b * (int32x4_t){ __c, __c, __c, __c }); }
-__ai uint16x8_t vmlaq_n_u16(uint16x8_t __a, uint16x8_t __b, uint16_t __c) {
-  return __a + (__b * (uint16x8_t){ __c, __c, __c, __c, __c, __c, __c, __c }); }
-__ai uint32x4_t vmlaq_n_u32(uint32x4_t __a, uint32x4_t __b, uint32_t __c) {
-  return __a + (__b * (uint32x4_t){ __c, __c, __c, __c }); }
-__ai float32x4_t vmlaq_n_f32(float32x4_t __a, float32x4_t __b, float32_t __c) {
-  return __a + (__b * (float32x4_t){ __c, __c, __c, __c }); }
-
-__ai int8x8_t vmls_s8(int8x8_t __a, int8x8_t __b, int8x8_t __c) {
-  return __a - (__b * __c); }
-__ai int16x4_t vmls_s16(int16x4_t __a, int16x4_t __b, int16x4_t __c) {
-  return __a - (__b * __c); }
-__ai int32x2_t vmls_s32(int32x2_t __a, int32x2_t __b, int32x2_t __c) {
-  return __a - (__b * __c); }
-__ai float32x2_t vmls_f32(float32x2_t __a, float32x2_t __b, float32x2_t __c) {
-  return __a - (__b * __c); }
-__ai uint8x8_t vmls_u8(uint8x8_t __a, uint8x8_t __b, uint8x8_t __c) {
-  return __a - (__b * __c); }
-__ai uint16x4_t vmls_u16(uint16x4_t __a, uint16x4_t __b, uint16x4_t __c) {
-  return __a - (__b * __c); }
-__ai uint32x2_t vmls_u32(uint32x2_t __a, uint32x2_t __b, uint32x2_t __c) {
-  return __a - (__b * __c); }
-__ai int8x16_t vmlsq_s8(int8x16_t __a, int8x16_t __b, int8x16_t __c) {
-  return __a - (__b * __c); }
-__ai int16x8_t vmlsq_s16(int16x8_t __a, int16x8_t __b, int16x8_t __c) {
-  return __a - (__b * __c); }
-__ai int32x4_t vmlsq_s32(int32x4_t __a, int32x4_t __b, int32x4_t __c) {
-  return __a - (__b * __c); }
-__ai float32x4_t vmlsq_f32(float32x4_t __a, float32x4_t __b, float32x4_t __c) {
-  return __a - (__b * __c); }
-__ai uint8x16_t vmlsq_u8(uint8x16_t __a, uint8x16_t __b, uint8x16_t __c) {
-  return __a - (__b * __c); }
-__ai uint16x8_t vmlsq_u16(uint16x8_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return __a - (__b * __c); }
-__ai uint32x4_t vmlsq_u32(uint32x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return __a - (__b * __c); }
-
-__ai int16x8_t vmlsl_s8(int16x8_t __a, int8x8_t __b, int8x8_t __c) {
-  return __a - vmull_s8(__b, __c); }
-__ai int32x4_t vmlsl_s16(int32x4_t __a, int16x4_t __b, int16x4_t __c) {
-  return __a - vmull_s16(__b, __c); }
-__ai int64x2_t vmlsl_s32(int64x2_t __a, int32x2_t __b, int32x2_t __c) {
-  return __a - vmull_s32(__b, __c); }
-__ai uint16x8_t vmlsl_u8(uint16x8_t __a, uint8x8_t __b, uint8x8_t __c) {
-  return __a - vmull_u8(__b, __c); }
-__ai uint32x4_t vmlsl_u16(uint32x4_t __a, uint16x4_t __b, uint16x4_t __c) {
-  return __a - vmull_u16(__b, __c); }
-__ai uint64x2_t vmlsl_u32(uint64x2_t __a, uint32x2_t __b, uint32x2_t __c) {
-  return __a - vmull_u32(__b, __c); }
-
-#define vmlsl_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x4_t __b = (b); int16x4_t __c = (c); \
-  __a - vmull_s16(__b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsl_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x2_t __b = (b); int32x2_t __c = (c); \
-  __a - vmull_s32(__b, __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlsl_lane_u16(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint16x4_t __b = (b); uint16x4_t __c = (c); \
-  __a - vmull_u16(__b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsl_lane_u32(a, b, c, __d) __extension__ ({ \
-  uint64x2_t __a = (a); uint32x2_t __b = (b); uint32x2_t __c = (c); \
-  __a - vmull_u32(__b, __builtin_shufflevector(__c, __c, __d, __d)); })
-
-__ai int32x4_t vmlsl_n_s16(int32x4_t __a, int16x4_t __b, int16_t __c) {
-  return __a - vmull_s16(__b, (int16x4_t){ __c, __c, __c, __c }); }
-__ai int64x2_t vmlsl_n_s32(int64x2_t __a, int32x2_t __b, int32_t __c) {
-  return __a - vmull_s32(__b, (int32x2_t){ __c, __c }); }
-__ai uint32x4_t vmlsl_n_u16(uint32x4_t __a, uint16x4_t __b, uint16_t __c) {
-  return __a - vmull_u16(__b, (uint16x4_t){ __c, __c, __c, __c }); }
-__ai uint64x2_t vmlsl_n_u32(uint64x2_t __a, uint32x2_t __b, uint32_t __c) {
-  return __a - vmull_u32(__b, (uint32x2_t){ __c, __c }); }
-
-#define vmls_lane_s16(a, b, c, __d) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); int16x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmls_lane_s32(a, b, c, __d) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); int32x2_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmls_lane_u16(a, b, c, __d) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); uint16x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmls_lane_u32(a, b, c, __d) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); uint32x2_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmls_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); float32x2_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlsq_lane_s16(a, b, c, __d) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); int16x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d, __d, __d, __d, __d)); })
-#define vmlsq_lane_s32(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); int32x2_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsq_lane_u16(a, b, c, __d) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); uint16x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d, __d, __d, __d, __d)); })
-#define vmlsq_lane_u32(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); uint32x2_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsq_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); float32x2_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-
-__ai int16x4_t vmls_n_s16(int16x4_t __a, int16x4_t __b, int16_t __c) {
-  return __a - (__b * (int16x4_t){ __c, __c, __c, __c }); }
-__ai int32x2_t vmls_n_s32(int32x2_t __a, int32x2_t __b, int32_t __c) {
-  return __a - (__b * (int32x2_t){ __c, __c }); }
-__ai uint16x4_t vmls_n_u16(uint16x4_t __a, uint16x4_t __b, uint16_t __c) {
-  return __a - (__b * (uint16x4_t){ __c, __c, __c, __c }); }
-__ai uint32x2_t vmls_n_u32(uint32x2_t __a, uint32x2_t __b, uint32_t __c) {
-  return __a - (__b * (uint32x2_t){ __c, __c }); }
-__ai float32x2_t vmls_n_f32(float32x2_t __a, float32x2_t __b, float32_t __c) {
-  return __a - (__b * (float32x2_t){ __c, __c }); }
-__ai int16x8_t vmlsq_n_s16(int16x8_t __a, int16x8_t __b, int16_t __c) {
-  return __a - (__b * (int16x8_t){ __c, __c, __c, __c, __c, __c, __c, __c }); }
-__ai int32x4_t vmlsq_n_s32(int32x4_t __a, int32x4_t __b, int32_t __c) {
-  return __a - (__b * (int32x4_t){ __c, __c, __c, __c }); }
-__ai uint16x8_t vmlsq_n_u16(uint16x8_t __a, uint16x8_t __b, uint16_t __c) {
-  return __a - (__b * (uint16x8_t){ __c, __c, __c, __c, __c, __c, __c, __c }); }
-__ai uint32x4_t vmlsq_n_u32(uint32x4_t __a, uint32x4_t __b, uint32_t __c) {
-  return __a - (__b * (uint32x4_t){ __c, __c, __c, __c }); }
-__ai float32x4_t vmlsq_n_f32(float32x4_t __a, float32x4_t __b, float32_t __c) {
-  return __a - (__b * (float32x4_t){ __c, __c, __c, __c }); }
-
-__ai int8x8_t vmovn_s16(int16x8_t __a) {
-  return (int8x8_t)__builtin_neon_vmovn_v((int8x16_t)__a, 0); }
-__ai int16x4_t vmovn_s32(int32x4_t __a) {
-  return (int16x4_t)__builtin_neon_vmovn_v((int8x16_t)__a, 1); }
-__ai int32x2_t vmovn_s64(int64x2_t __a) {
-  return (int32x2_t)__builtin_neon_vmovn_v((int8x16_t)__a, 2); }
-__ai uint8x8_t vmovn_u16(uint16x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vmovn_v((int8x16_t)__a, 16); }
-__ai uint16x4_t vmovn_u32(uint32x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vmovn_v((int8x16_t)__a, 17); }
-__ai uint32x2_t vmovn_u64(uint64x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vmovn_v((int8x16_t)__a, 18); }
-
-__ai uint8x8_t vmov_n_u8(uint8_t __a) {
-  return (uint8x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai uint16x4_t vmov_n_u16(uint16_t __a) {
-  return (uint16x4_t){ __a, __a, __a, __a }; }
-__ai uint32x2_t vmov_n_u32(uint32_t __a) {
-  return (uint32x2_t){ __a, __a }; }
-__ai int8x8_t vmov_n_s8(int8_t __a) {
-  return (int8x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai int16x4_t vmov_n_s16(int16_t __a) {
-  return (int16x4_t){ __a, __a, __a, __a }; }
-__ai int32x2_t vmov_n_s32(int32_t __a) {
-  return (int32x2_t){ __a, __a }; }
-__ai poly8x8_t vmov_n_p8(poly8_t __a) {
-  return (poly8x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai poly16x4_t vmov_n_p16(poly16_t __a) {
-  return (poly16x4_t){ __a, __a, __a, __a }; }
-__ai float32x2_t vmov_n_f32(float32_t __a) {
-  return (float32x2_t){ __a, __a }; }
-__ai uint8x16_t vmovq_n_u8(uint8_t __a) {
-  return (uint8x16_t){ __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai uint16x8_t vmovq_n_u16(uint16_t __a) {
-  return (uint16x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai uint32x4_t vmovq_n_u32(uint32_t __a) {
-  return (uint32x4_t){ __a, __a, __a, __a }; }
-__ai int8x16_t vmovq_n_s8(int8_t __a) {
-  return (int8x16_t){ __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai int16x8_t vmovq_n_s16(int16_t __a) {
-  return (int16x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai int32x4_t vmovq_n_s32(int32_t __a) {
-  return (int32x4_t){ __a, __a, __a, __a }; }
-__ai poly8x16_t vmovq_n_p8(poly8_t __a) {
-  return (poly8x16_t){ __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai poly16x8_t vmovq_n_p16(poly16_t __a) {
-  return (poly16x8_t){ __a, __a, __a, __a, __a, __a, __a, __a }; }
-__ai float32x4_t vmovq_n_f32(float32_t __a) {
-  return (float32x4_t){ __a, __a, __a, __a }; }
-__ai int64x1_t vmov_n_s64(int64_t __a) {
-  return (int64x1_t){ __a }; }
-__ai uint64x1_t vmov_n_u64(uint64_t __a) {
-  return (uint64x1_t){ __a }; }
-__ai int64x2_t vmovq_n_s64(int64_t __a) {
-  return (int64x2_t){ __a, __a }; }
-__ai uint64x2_t vmovq_n_u64(uint64_t __a) {
-  return (uint64x2_t){ __a, __a }; }
-
-__ai int8x8_t vmul_s8(int8x8_t __a, int8x8_t __b) {
-  return __a * __b; }
-__ai int16x4_t vmul_s16(int16x4_t __a, int16x4_t __b) {
-  return __a * __b; }
-__ai int32x2_t vmul_s32(int32x2_t __a, int32x2_t __b) {
-  return __a * __b; }
-__ai float32x2_t vmul_f32(float32x2_t __a, float32x2_t __b) {
-  return __a * __b; }
-__ai uint8x8_t vmul_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __a * __b; }
-__ai uint16x4_t vmul_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __a * __b; }
-__ai uint32x2_t vmul_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __a * __b; }
-__ai int8x16_t vmulq_s8(int8x16_t __a, int8x16_t __b) {
-  return __a * __b; }
-__ai int16x8_t vmulq_s16(int16x8_t __a, int16x8_t __b) {
-  return __a * __b; }
-__ai int32x4_t vmulq_s32(int32x4_t __a, int32x4_t __b) {
-  return __a * __b; }
-__ai float32x4_t vmulq_f32(float32x4_t __a, float32x4_t __b) {
-  return __a * __b; }
-__ai uint8x16_t vmulq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __a * __b; }
-__ai uint16x8_t vmulq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __a * __b; }
-__ai uint32x4_t vmulq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __a * __b; }
-
-#define vmull_lane_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  vmull_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmull_lane_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  vmull_s32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vmull_lane_u16(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); \
-  vmull_u16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmull_lane_u32(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); \
-  vmull_u32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-
-__ai int32x4_t vmull_n_s16(int16x4_t __a, int16_t __b) {
-  return (int32x4_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)(int16x4_t){ __b, __b, __b, __b }, 34); }
-__ai int64x2_t vmull_n_s32(int32x2_t __a, int32_t __b) {
-  return (int64x2_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)(int32x2_t){ __b, __b }, 35); }
-__ai uint32x4_t vmull_n_u16(uint16x4_t __a, uint16_t __b) {
-  return (uint32x4_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)(uint16x4_t){ __b, __b, __b, __b }, 50); }
-__ai uint64x2_t vmull_n_u32(uint32x2_t __a, uint32_t __b) {
-  return (uint64x2_t)__builtin_neon_vmull_v((int8x8_t)__a, (int8x8_t)(uint32x2_t){ __b, __b }, 51); }
-
-__ai poly8x8_t vmul_p8(poly8x8_t __a, poly8x8_t __b) {
-  return (poly8x8_t)__builtin_neon_vmul_v((int8x8_t)__a, (int8x8_t)__b, 4); }
-__ai poly8x16_t vmulq_p8(poly8x16_t __a, poly8x16_t __b) {
-  return (poly8x16_t)__builtin_neon_vmulq_v((int8x16_t)__a, (int8x16_t)__b, 36); }
-
-#define vmul_lane_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-#define vmul_lane_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c); })
-#define vmul_lane_f32(a, b, __c) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c); })
-#define vmul_lane_u16(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-#define vmul_lane_u32(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c); })
-#define vmulq_lane_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c, __c, __c, __c, __c); })
-#define vmulq_lane_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x2_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-#define vmulq_lane_f32(a, b, __c) __extension__ ({ \
-  float32x4_t __a = (a); float32x2_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-#define vmulq_lane_u16(a, b, __c) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c, __c, __c, __c, __c); })
-#define vmulq_lane_u32(a, b, __c) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x2_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-
-__ai int16x4_t vmul_n_s16(int16x4_t __a, int16_t __b) {
-  return __a * (int16x4_t){ __b, __b, __b, __b }; }
-__ai int32x2_t vmul_n_s32(int32x2_t __a, int32_t __b) {
-  return __a * (int32x2_t){ __b, __b }; }
-__ai float32x2_t vmul_n_f32(float32x2_t __a, float32_t __b) {
-  return __a * (float32x2_t){ __b, __b }; }
-__ai uint16x4_t vmul_n_u16(uint16x4_t __a, uint16_t __b) {
-  return __a * (uint16x4_t){ __b, __b, __b, __b }; }
-__ai uint32x2_t vmul_n_u32(uint32x2_t __a, uint32_t __b) {
-  return __a * (uint32x2_t){ __b, __b }; }
-__ai int16x8_t vmulq_n_s16(int16x8_t __a, int16_t __b) {
-  return __a * (int16x8_t){ __b, __b, __b, __b, __b, __b, __b, __b }; }
-__ai int32x4_t vmulq_n_s32(int32x4_t __a, int32_t __b) {
-  return __a * (int32x4_t){ __b, __b, __b, __b }; }
-__ai float32x4_t vmulq_n_f32(float32x4_t __a, float32_t __b) {
-  return __a * (float32x4_t){ __b, __b, __b, __b }; }
-__ai uint16x8_t vmulq_n_u16(uint16x8_t __a, uint16_t __b) {
-  return __a * (uint16x8_t){ __b, __b, __b, __b, __b, __b, __b, __b }; }
-__ai uint32x4_t vmulq_n_u32(uint32x4_t __a, uint32_t __b) {
-  return __a * (uint32x4_t){ __b, __b, __b, __b }; }
-
-__ai int8x8_t vmvn_s8(int8x8_t __a) {
-  return  ~__a; }
-__ai int16x4_t vmvn_s16(int16x4_t __a) {
-  return  ~__a; }
-__ai int32x2_t vmvn_s32(int32x2_t __a) {
-  return  ~__a; }
-__ai uint8x8_t vmvn_u8(uint8x8_t __a) {
-  return  ~__a; }
-__ai uint16x4_t vmvn_u16(uint16x4_t __a) {
-  return  ~__a; }
-__ai uint32x2_t vmvn_u32(uint32x2_t __a) {
-  return  ~__a; }
-__ai poly8x8_t vmvn_p8(poly8x8_t __a) {
-  return  ~__a; }
-__ai int8x16_t vmvnq_s8(int8x16_t __a) {
-  return  ~__a; }
-__ai int16x8_t vmvnq_s16(int16x8_t __a) {
-  return  ~__a; }
-__ai int32x4_t vmvnq_s32(int32x4_t __a) {
-  return  ~__a; }
-__ai uint8x16_t vmvnq_u8(uint8x16_t __a) {
-  return  ~__a; }
-__ai uint16x8_t vmvnq_u16(uint16x8_t __a) {
-  return  ~__a; }
-__ai uint32x4_t vmvnq_u32(uint32x4_t __a) {
-  return  ~__a; }
-__ai poly8x16_t vmvnq_p8(poly8x16_t __a) {
-  return  ~__a; }
-
-__ai int8x8_t vneg_s8(int8x8_t __a) {
-  return  -__a; }
-__ai int16x4_t vneg_s16(int16x4_t __a) {
-  return  -__a; }
-__ai int32x2_t vneg_s32(int32x2_t __a) {
-  return  -__a; }
-__ai float32x2_t vneg_f32(float32x2_t __a) {
-  return  -__a; }
-__ai int8x16_t vnegq_s8(int8x16_t __a) {
-  return  -__a; }
-__ai int16x8_t vnegq_s16(int16x8_t __a) {
-  return  -__a; }
-__ai int32x4_t vnegq_s32(int32x4_t __a) {
-  return  -__a; }
-__ai float32x4_t vnegq_f32(float32x4_t __a) {
-  return  -__a; }
-
-__ai int8x8_t vorn_s8(int8x8_t __a, int8x8_t __b) {
-  return __a | ~__b; }
-__ai int16x4_t vorn_s16(int16x4_t __a, int16x4_t __b) {
-  return __a | ~__b; }
-__ai int32x2_t vorn_s32(int32x2_t __a, int32x2_t __b) {
-  return __a | ~__b; }
-__ai int64x1_t vorn_s64(int64x1_t __a, int64x1_t __b) {
-  return __a | ~__b; }
-__ai uint8x8_t vorn_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __a | ~__b; }
-__ai uint16x4_t vorn_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __a | ~__b; }
-__ai uint32x2_t vorn_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __a | ~__b; }
-__ai uint64x1_t vorn_u64(uint64x1_t __a, uint64x1_t __b) {
-  return __a | ~__b; }
-__ai int8x16_t vornq_s8(int8x16_t __a, int8x16_t __b) {
-  return __a | ~__b; }
-__ai int16x8_t vornq_s16(int16x8_t __a, int16x8_t __b) {
-  return __a | ~__b; }
-__ai int32x4_t vornq_s32(int32x4_t __a, int32x4_t __b) {
-  return __a | ~__b; }
-__ai int64x2_t vornq_s64(int64x2_t __a, int64x2_t __b) {
-  return __a | ~__b; }
-__ai uint8x16_t vornq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __a | ~__b; }
-__ai uint16x8_t vornq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __a | ~__b; }
-__ai uint32x4_t vornq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __a | ~__b; }
-__ai uint64x2_t vornq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __a | ~__b; }
-
-__ai int8x8_t vorr_s8(int8x8_t __a, int8x8_t __b) {
-  return __a | __b; }
-__ai int16x4_t vorr_s16(int16x4_t __a, int16x4_t __b) {
-  return __a | __b; }
-__ai int32x2_t vorr_s32(int32x2_t __a, int32x2_t __b) {
-  return __a | __b; }
-__ai int64x1_t vorr_s64(int64x1_t __a, int64x1_t __b) {
-  return __a | __b; }
-__ai uint8x8_t vorr_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __a | __b; }
-__ai uint16x4_t vorr_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __a | __b; }
-__ai uint32x2_t vorr_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __a | __b; }
-__ai uint64x1_t vorr_u64(uint64x1_t __a, uint64x1_t __b) {
-  return __a | __b; }
-__ai int8x16_t vorrq_s8(int8x16_t __a, int8x16_t __b) {
-  return __a | __b; }
-__ai int16x8_t vorrq_s16(int16x8_t __a, int16x8_t __b) {
-  return __a | __b; }
-__ai int32x4_t vorrq_s32(int32x4_t __a, int32x4_t __b) {
-  return __a | __b; }
-__ai int64x2_t vorrq_s64(int64x2_t __a, int64x2_t __b) {
-  return __a | __b; }
-__ai uint8x16_t vorrq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __a | __b; }
-__ai uint16x8_t vorrq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __a | __b; }
-__ai uint32x4_t vorrq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __a | __b; }
-__ai uint64x2_t vorrq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __a | __b; }
-
-__ai int16x4_t vpadal_s8(int16x4_t __a, int8x8_t __b) {
-  return (int16x4_t)__builtin_neon_vpadal_v((int8x8_t)__a, __b, 1); }
-__ai int32x2_t vpadal_s16(int32x2_t __a, int16x4_t __b) {
-  return (int32x2_t)__builtin_neon_vpadal_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int64x1_t vpadal_s32(int64x1_t __a, int32x2_t __b) {
-  return (int64x1_t)__builtin_neon_vpadal_v((int8x8_t)__a, (int8x8_t)__b, 3); }
-__ai uint16x4_t vpadal_u8(uint16x4_t __a, uint8x8_t __b) {
-  return (uint16x4_t)__builtin_neon_vpadal_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vpadal_u16(uint32x2_t __a, uint16x4_t __b) {
-  return (uint32x2_t)__builtin_neon_vpadal_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint64x1_t vpadal_u32(uint64x1_t __a, uint32x2_t __b) {
-  return (uint64x1_t)__builtin_neon_vpadal_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai int16x8_t vpadalq_s8(int16x8_t __a, int8x16_t __b) {
-  return (int16x8_t)__builtin_neon_vpadalq_v((int8x16_t)__a, __b, 33); }
-__ai int32x4_t vpadalq_s16(int32x4_t __a, int16x8_t __b) {
-  return (int32x4_t)__builtin_neon_vpadalq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai int64x2_t vpadalq_s32(int64x2_t __a, int32x4_t __b) {
-  return (int64x2_t)__builtin_neon_vpadalq_v((int8x16_t)__a, (int8x16_t)__b, 35); }
-__ai uint16x8_t vpadalq_u8(uint16x8_t __a, uint8x16_t __b) {
-  return (uint16x8_t)__builtin_neon_vpadalq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vpadalq_u16(uint32x4_t __a, uint16x8_t __b) {
-  return (uint32x4_t)__builtin_neon_vpadalq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint64x2_t vpadalq_u32(uint64x2_t __a, uint32x4_t __b) {
-  return (uint64x2_t)__builtin_neon_vpadalq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-__ai int8x8_t vpadd_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vpadd_v(__a, __b, 0); }
-__ai int16x4_t vpadd_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vpadd_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vpadd_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vpadd_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai uint8x8_t vpadd_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vpadd_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vpadd_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vpadd_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vpadd_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vpadd_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai float32x2_t vpadd_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vpadd_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-
-__ai int16x4_t vpaddl_s8(int8x8_t __a) {
-  return (int16x4_t)__builtin_neon_vpaddl_v(__a, 1); }
-__ai int32x2_t vpaddl_s16(int16x4_t __a) {
-  return (int32x2_t)__builtin_neon_vpaddl_v((int8x8_t)__a, 2); }
-__ai int64x1_t vpaddl_s32(int32x2_t __a) {
-  return (int64x1_t)__builtin_neon_vpaddl_v((int8x8_t)__a, 3); }
-__ai uint16x4_t vpaddl_u8(uint8x8_t __a) {
-  return (uint16x4_t)__builtin_neon_vpaddl_v((int8x8_t)__a, 17); }
-__ai uint32x2_t vpaddl_u16(uint16x4_t __a) {
-  return (uint32x2_t)__builtin_neon_vpaddl_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vpaddl_u32(uint32x2_t __a) {
-  return (uint64x1_t)__builtin_neon_vpaddl_v((int8x8_t)__a, 19); }
-__ai int16x8_t vpaddlq_s8(int8x16_t __a) {
-  return (int16x8_t)__builtin_neon_vpaddlq_v(__a, 33); }
-__ai int32x4_t vpaddlq_s16(int16x8_t __a) {
-  return (int32x4_t)__builtin_neon_vpaddlq_v((int8x16_t)__a, 34); }
-__ai int64x2_t vpaddlq_s32(int32x4_t __a) {
-  return (int64x2_t)__builtin_neon_vpaddlq_v((int8x16_t)__a, 35); }
-__ai uint16x8_t vpaddlq_u8(uint8x16_t __a) {
-  return (uint16x8_t)__builtin_neon_vpaddlq_v((int8x16_t)__a, 49); }
-__ai uint32x4_t vpaddlq_u16(uint16x8_t __a) {
-  return (uint32x4_t)__builtin_neon_vpaddlq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vpaddlq_u32(uint32x4_t __a) {
-  return (uint64x2_t)__builtin_neon_vpaddlq_v((int8x16_t)__a, 51); }
-
-__ai int8x8_t vpmax_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vpmax_v(__a, __b, 0); }
-__ai int16x4_t vpmax_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vpmax_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vpmax_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vpmax_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai uint8x8_t vpmax_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vpmax_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vpmax_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vpmax_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vpmax_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vpmax_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai float32x2_t vpmax_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vpmax_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-
-__ai int8x8_t vpmin_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vpmin_v(__a, __b, 0); }
-__ai int16x4_t vpmin_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vpmin_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vpmin_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vpmin_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai uint8x8_t vpmin_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vpmin_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vpmin_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vpmin_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vpmin_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vpmin_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai float32x2_t vpmin_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vpmin_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-
-__ai int8x8_t vqabs_s8(int8x8_t __a) {
-  return (int8x8_t)__builtin_neon_vqabs_v(__a, 0); }
-__ai int16x4_t vqabs_s16(int16x4_t __a) {
-  return (int16x4_t)__builtin_neon_vqabs_v((int8x8_t)__a, 1); }
-__ai int32x2_t vqabs_s32(int32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vqabs_v((int8x8_t)__a, 2); }
-__ai int8x16_t vqabsq_s8(int8x16_t __a) {
-  return (int8x16_t)__builtin_neon_vqabsq_v(__a, 32); }
-__ai int16x8_t vqabsq_s16(int16x8_t __a) {
-  return (int16x8_t)__builtin_neon_vqabsq_v((int8x16_t)__a, 33); }
-__ai int32x4_t vqabsq_s32(int32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vqabsq_v((int8x16_t)__a, 34); }
-
-__ai int8x8_t vqadd_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vqadd_v(__a, __b, 0); }
-__ai int16x4_t vqadd_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vqadd_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vqadd_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vqadd_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int64x1_t vqadd_s64(int64x1_t __a, int64x1_t __b) {
-  return (int64x1_t)__builtin_neon_vqadd_v((int8x8_t)__a, (int8x8_t)__b, 3); }
-__ai uint8x8_t vqadd_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vqadd_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vqadd_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vqadd_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vqadd_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vqadd_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint64x1_t vqadd_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vqadd_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai int8x16_t vqaddq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vqaddq_v(__a, __b, 32); }
-__ai int16x8_t vqaddq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vqaddq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vqaddq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vqaddq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai int64x2_t vqaddq_s64(int64x2_t __a, int64x2_t __b) {
-  return (int64x2_t)__builtin_neon_vqaddq_v((int8x16_t)__a, (int8x16_t)__b, 35); }
-__ai uint8x16_t vqaddq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vqaddq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vqaddq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vqaddq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vqaddq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vqaddq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint64x2_t vqaddq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vqaddq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-__ai int32x4_t vqdmlal_s16(int32x4_t __a, int16x4_t __b, int16x4_t __c) {
-  return (int32x4_t)__builtin_neon_vqdmlal_v((int8x16_t)__a, (int8x8_t)__b, (int8x8_t)__c, 34); }
-__ai int64x2_t vqdmlal_s32(int64x2_t __a, int32x2_t __b, int32x2_t __c) {
-  return (int64x2_t)__builtin_neon_vqdmlal_v((int8x16_t)__a, (int8x8_t)__b, (int8x8_t)__c, 35); }
-
-#define vqdmlal_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x4_t __b = (b); int16x4_t __c = (c); \
-  vqdmlal_s16(__a, __b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vqdmlal_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x2_t __b = (b); int32x2_t __c = (c); \
-  vqdmlal_s32(__a, __b, __builtin_shufflevector(__c, __c, __d, __d)); })
-
-__ai int32x4_t vqdmlal_n_s16(int32x4_t __a, int16x4_t __b, int16_t __c) {
-  return (int32x4_t)__builtin_neon_vqdmlal_v((int8x16_t)__a, (int8x8_t)__b, (int8x8_t)(int16x4_t){ __c, __c, __c, __c }, 34); }
-__ai int64x2_t vqdmlal_n_s32(int64x2_t __a, int32x2_t __b, int32_t __c) {
-  return (int64x2_t)__builtin_neon_vqdmlal_v((int8x16_t)__a, (int8x8_t)__b, (int8x8_t)(int32x2_t){ __c, __c }, 35); }
-
-__ai int32x4_t vqdmlsl_s16(int32x4_t __a, int16x4_t __b, int16x4_t __c) {
-  return (int32x4_t)__builtin_neon_vqdmlsl_v((int8x16_t)__a, (int8x8_t)__b, (int8x8_t)__c, 34); }
-__ai int64x2_t vqdmlsl_s32(int64x2_t __a, int32x2_t __b, int32x2_t __c) {
-  return (int64x2_t)__builtin_neon_vqdmlsl_v((int8x16_t)__a, (int8x8_t)__b, (int8x8_t)__c, 35); }
-
-#define vqdmlsl_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x4_t __b = (b); int16x4_t __c = (c); \
-  vqdmlsl_s16(__a, __b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vqdmlsl_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x2_t __b = (b); int32x2_t __c = (c); \
-  vqdmlsl_s32(__a, __b, __builtin_shufflevector(__c, __c, __d, __d)); })
-
-__ai int32x4_t vqdmlsl_n_s16(int32x4_t __a, int16x4_t __b, int16_t __c) {
-  return (int32x4_t)__builtin_neon_vqdmlsl_v((int8x16_t)__a, (int8x8_t)__b, (int8x8_t)(int16x4_t){ __c, __c, __c, __c }, 34); }
-__ai int64x2_t vqdmlsl_n_s32(int64x2_t __a, int32x2_t __b, int32_t __c) {
-  return (int64x2_t)__builtin_neon_vqdmlsl_v((int8x16_t)__a, (int8x8_t)__b, (int8x8_t)(int32x2_t){ __c, __c }, 35); }
-
-__ai int16x4_t vqdmulh_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vqdmulh_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vqdmulh_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vqdmulh_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int16x8_t vqdmulhq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vqdmulhq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vqdmulhq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vqdmulhq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-
-#define vqdmulh_lane_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  vqdmulh_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vqdmulh_lane_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  vqdmulh_s32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vqdmulhq_lane_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x4_t __b = (b); \
-  vqdmulhq_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c, __c, __c, __c, __c)); })
-#define vqdmulhq_lane_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x2_t __b = (b); \
-  vqdmulhq_s32(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-
-__ai int16x4_t vqdmulh_n_s16(int16x4_t __a, int16_t __b) {
-  return (int16x4_t)__builtin_neon_vqdmulh_v((int8x8_t)__a, (int8x8_t)(int16x4_t){ __b, __b, __b, __b }, 1); }
-__ai int32x2_t vqdmulh_n_s32(int32x2_t __a, int32_t __b) {
-  return (int32x2_t)__builtin_neon_vqdmulh_v((int8x8_t)__a, (int8x8_t)(int32x2_t){ __b, __b }, 2); }
-__ai int16x8_t vqdmulhq_n_s16(int16x8_t __a, int16_t __b) {
-  return (int16x8_t)__builtin_neon_vqdmulhq_v((int8x16_t)__a, (int8x16_t)(int16x8_t){ __b, __b, __b, __b, __b, __b, __b, __b }, 33); }
-__ai int32x4_t vqdmulhq_n_s32(int32x4_t __a, int32_t __b) {
-  return (int32x4_t)__builtin_neon_vqdmulhq_v((int8x16_t)__a, (int8x16_t)(int32x4_t){ __b, __b, __b, __b }, 34); }
-
-__ai int32x4_t vqdmull_s16(int16x4_t __a, int16x4_t __b) {
-  return (int32x4_t)__builtin_neon_vqdmull_v((int8x8_t)__a, (int8x8_t)__b, 34); }
-__ai int64x2_t vqdmull_s32(int32x2_t __a, int32x2_t __b) {
-  return (int64x2_t)__builtin_neon_vqdmull_v((int8x8_t)__a, (int8x8_t)__b, 35); }
-
-#define vqdmull_lane_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  vqdmull_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vqdmull_lane_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  vqdmull_s32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-
-__ai int32x4_t vqdmull_n_s16(int16x4_t __a, int16_t __b) {
-  return (int32x4_t)__builtin_neon_vqdmull_v((int8x8_t)__a, (int8x8_t)(int16x4_t){ __b, __b, __b, __b }, 34); }
-__ai int64x2_t vqdmull_n_s32(int32x2_t __a, int32_t __b) {
-  return (int64x2_t)__builtin_neon_vqdmull_v((int8x8_t)__a, (int8x8_t)(int32x2_t){ __b, __b }, 35); }
-
-__ai int8x8_t vqmovn_s16(int16x8_t __a) {
-  return (int8x8_t)__builtin_neon_vqmovn_v((int8x16_t)__a, 0); }
-__ai int16x4_t vqmovn_s32(int32x4_t __a) {
-  return (int16x4_t)__builtin_neon_vqmovn_v((int8x16_t)__a, 1); }
-__ai int32x2_t vqmovn_s64(int64x2_t __a) {
-  return (int32x2_t)__builtin_neon_vqmovn_v((int8x16_t)__a, 2); }
-__ai uint8x8_t vqmovn_u16(uint16x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vqmovn_v((int8x16_t)__a, 16); }
-__ai uint16x4_t vqmovn_u32(uint32x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vqmovn_v((int8x16_t)__a, 17); }
-__ai uint32x2_t vqmovn_u64(uint64x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vqmovn_v((int8x16_t)__a, 18); }
-
-__ai uint8x8_t vqmovun_s16(int16x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vqmovun_v((int8x16_t)__a, 16); }
-__ai uint16x4_t vqmovun_s32(int32x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vqmovun_v((int8x16_t)__a, 17); }
-__ai uint32x2_t vqmovun_s64(int64x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vqmovun_v((int8x16_t)__a, 18); }
-
-__ai int8x8_t vqneg_s8(int8x8_t __a) {
-  return (int8x8_t)__builtin_neon_vqneg_v(__a, 0); }
-__ai int16x4_t vqneg_s16(int16x4_t __a) {
-  return (int16x4_t)__builtin_neon_vqneg_v((int8x8_t)__a, 1); }
-__ai int32x2_t vqneg_s32(int32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vqneg_v((int8x8_t)__a, 2); }
-__ai int8x16_t vqnegq_s8(int8x16_t __a) {
-  return (int8x16_t)__builtin_neon_vqnegq_v(__a, 32); }
-__ai int16x8_t vqnegq_s16(int16x8_t __a) {
-  return (int16x8_t)__builtin_neon_vqnegq_v((int8x16_t)__a, 33); }
-__ai int32x4_t vqnegq_s32(int32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vqnegq_v((int8x16_t)__a, 34); }
-
-__ai int16x4_t vqrdmulh_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vqrdmulh_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vqrdmulh_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vqrdmulh_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int16x8_t vqrdmulhq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vqrdmulhq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vqrdmulhq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vqrdmulhq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-
-#define vqrdmulh_lane_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  vqrdmulh_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vqrdmulh_lane_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  vqrdmulh_s32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vqrdmulhq_lane_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x4_t __b = (b); \
-  vqrdmulhq_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c, __c, __c, __c, __c)); })
-#define vqrdmulhq_lane_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x2_t __b = (b); \
-  vqrdmulhq_s32(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-
-__ai int16x4_t vqrdmulh_n_s16(int16x4_t __a, int16_t __b) {
-  return (int16x4_t)__builtin_neon_vqrdmulh_v((int8x8_t)__a, (int8x8_t)(int16x4_t){ __b, __b, __b, __b }, 1); }
-__ai int32x2_t vqrdmulh_n_s32(int32x2_t __a, int32_t __b) {
-  return (int32x2_t)__builtin_neon_vqrdmulh_v((int8x8_t)__a, (int8x8_t)(int32x2_t){ __b, __b }, 2); }
-__ai int16x8_t vqrdmulhq_n_s16(int16x8_t __a, int16_t __b) {
-  return (int16x8_t)__builtin_neon_vqrdmulhq_v((int8x16_t)__a, (int8x16_t)(int16x8_t){ __b, __b, __b, __b, __b, __b, __b, __b }, 33); }
-__ai int32x4_t vqrdmulhq_n_s32(int32x4_t __a, int32_t __b) {
-  return (int32x4_t)__builtin_neon_vqrdmulhq_v((int8x16_t)__a, (int8x16_t)(int32x4_t){ __b, __b, __b, __b }, 34); }
-
-__ai int8x8_t vqrshl_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vqrshl_v(__a, __b, 0); }
-__ai int16x4_t vqrshl_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vqrshl_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vqrshl_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vqrshl_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int64x1_t vqrshl_s64(int64x1_t __a, int64x1_t __b) {
-  return (int64x1_t)__builtin_neon_vqrshl_v((int8x8_t)__a, (int8x8_t)__b, 3); }
-__ai uint8x8_t vqrshl_u8(uint8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vqrshl_v((int8x8_t)__a, __b, 16); }
-__ai uint16x4_t vqrshl_u16(uint16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vqrshl_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vqrshl_u32(uint32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vqrshl_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint64x1_t vqrshl_u64(uint64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vqrshl_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai int8x16_t vqrshlq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vqrshlq_v(__a, __b, 32); }
-__ai int16x8_t vqrshlq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vqrshlq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vqrshlq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vqrshlq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai int64x2_t vqrshlq_s64(int64x2_t __a, int64x2_t __b) {
-  return (int64x2_t)__builtin_neon_vqrshlq_v((int8x16_t)__a, (int8x16_t)__b, 35); }
-__ai uint8x16_t vqrshlq_u8(uint8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vqrshlq_v((int8x16_t)__a, __b, 48); }
-__ai uint16x8_t vqrshlq_u16(uint16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vqrshlq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vqrshlq_u32(uint32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vqrshlq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint64x2_t vqrshlq_u64(uint64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vqrshlq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-#define vqrshrn_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int8x8_t)__builtin_neon_vqrshrn_n_v((int8x16_t)__a, __b, 0); })
-#define vqrshrn_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int16x4_t)__builtin_neon_vqrshrn_n_v((int8x16_t)__a, __b, 1); })
-#define vqrshrn_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int32x2_t)__builtin_neon_vqrshrn_n_v((int8x16_t)__a, __b, 2); })
-#define vqrshrn_n_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vqrshrn_n_v((int8x16_t)__a, __b, 16); })
-#define vqrshrn_n_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vqrshrn_n_v((int8x16_t)__a, __b, 17); })
-#define vqrshrn_n_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vqrshrn_n_v((int8x16_t)__a, __b, 18); })
-
-#define vqrshrun_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vqrshrun_n_v((int8x16_t)__a, __b, 16); })
-#define vqrshrun_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vqrshrun_n_v((int8x16_t)__a, __b, 17); })
-#define vqrshrun_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vqrshrun_n_v((int8x16_t)__a, __b, 18); })
-
-__ai int8x8_t vqshl_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vqshl_v(__a, __b, 0); }
-__ai int16x4_t vqshl_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vqshl_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vqshl_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vqshl_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int64x1_t vqshl_s64(int64x1_t __a, int64x1_t __b) {
-  return (int64x1_t)__builtin_neon_vqshl_v((int8x8_t)__a, (int8x8_t)__b, 3); }
-__ai uint8x8_t vqshl_u8(uint8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vqshl_v((int8x8_t)__a, __b, 16); }
-__ai uint16x4_t vqshl_u16(uint16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vqshl_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vqshl_u32(uint32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vqshl_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint64x1_t vqshl_u64(uint64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vqshl_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai int8x16_t vqshlq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vqshlq_v(__a, __b, 32); }
-__ai int16x8_t vqshlq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vqshlq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vqshlq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vqshlq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai int64x2_t vqshlq_s64(int64x2_t __a, int64x2_t __b) {
-  return (int64x2_t)__builtin_neon_vqshlq_v((int8x16_t)__a, (int8x16_t)__b, 35); }
-__ai uint8x16_t vqshlq_u8(uint8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vqshlq_v((int8x16_t)__a, __b, 48); }
-__ai uint16x8_t vqshlq_u16(uint16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vqshlq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vqshlq_u32(uint32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vqshlq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint64x2_t vqshlq_u64(uint64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vqshlq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-#define vqshlu_n_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vqshlu_n_v(__a, __b, 16); })
-#define vqshlu_n_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vqshlu_n_v((int8x8_t)__a, __b, 17); })
-#define vqshlu_n_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vqshlu_n_v((int8x8_t)__a, __b, 18); })
-#define vqshlu_n_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  (uint64x1_t)__builtin_neon_vqshlu_n_v((int8x8_t)__a, __b, 19); })
-#define vqshluq_n_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  (uint8x16_t)__builtin_neon_vqshluq_n_v(__a, __b, 48); })
-#define vqshluq_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (uint16x8_t)__builtin_neon_vqshluq_n_v((int8x16_t)__a, __b, 49); })
-#define vqshluq_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (uint32x4_t)__builtin_neon_vqshluq_n_v((int8x16_t)__a, __b, 50); })
-#define vqshluq_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (uint64x2_t)__builtin_neon_vqshluq_n_v((int8x16_t)__a, __b, 51); })
-
-#define vqshl_n_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  (int8x8_t)__builtin_neon_vqshl_n_v(__a, __b, 0); })
-#define vqshl_n_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  (int16x4_t)__builtin_neon_vqshl_n_v((int8x8_t)__a, __b, 1); })
-#define vqshl_n_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  (int32x2_t)__builtin_neon_vqshl_n_v((int8x8_t)__a, __b, 2); })
-#define vqshl_n_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  (int64x1_t)__builtin_neon_vqshl_n_v((int8x8_t)__a, __b, 3); })
-#define vqshl_n_u8(a, __b) __extension__ ({ \
-  uint8x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vqshl_n_v((int8x8_t)__a, __b, 16); })
-#define vqshl_n_u16(a, __b) __extension__ ({ \
-  uint16x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vqshl_n_v((int8x8_t)__a, __b, 17); })
-#define vqshl_n_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vqshl_n_v((int8x8_t)__a, __b, 18); })
-#define vqshl_n_u64(a, __b) __extension__ ({ \
-  uint64x1_t __a = (a); \
-  (uint64x1_t)__builtin_neon_vqshl_n_v((int8x8_t)__a, __b, 19); })
-#define vqshlq_n_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  (int8x16_t)__builtin_neon_vqshlq_n_v(__a, __b, 32); })
-#define vqshlq_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int16x8_t)__builtin_neon_vqshlq_n_v((int8x16_t)__a, __b, 33); })
-#define vqshlq_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int32x4_t)__builtin_neon_vqshlq_n_v((int8x16_t)__a, __b, 34); })
-#define vqshlq_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int64x2_t)__builtin_neon_vqshlq_n_v((int8x16_t)__a, __b, 35); })
-#define vqshlq_n_u8(a, __b) __extension__ ({ \
-  uint8x16_t __a = (a); \
-  (uint8x16_t)__builtin_neon_vqshlq_n_v((int8x16_t)__a, __b, 48); })
-#define vqshlq_n_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint16x8_t)__builtin_neon_vqshlq_n_v((int8x16_t)__a, __b, 49); })
-#define vqshlq_n_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint32x4_t)__builtin_neon_vqshlq_n_v((int8x16_t)__a, __b, 50); })
-#define vqshlq_n_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint64x2_t)__builtin_neon_vqshlq_n_v((int8x16_t)__a, __b, 51); })
-
-#define vqshrn_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int8x8_t)__builtin_neon_vqshrn_n_v((int8x16_t)__a, __b, 0); })
-#define vqshrn_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int16x4_t)__builtin_neon_vqshrn_n_v((int8x16_t)__a, __b, 1); })
-#define vqshrn_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int32x2_t)__builtin_neon_vqshrn_n_v((int8x16_t)__a, __b, 2); })
-#define vqshrn_n_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vqshrn_n_v((int8x16_t)__a, __b, 16); })
-#define vqshrn_n_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vqshrn_n_v((int8x16_t)__a, __b, 17); })
-#define vqshrn_n_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vqshrn_n_v((int8x16_t)__a, __b, 18); })
-
-#define vqshrun_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vqshrun_n_v((int8x16_t)__a, __b, 16); })
-#define vqshrun_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vqshrun_n_v((int8x16_t)__a, __b, 17); })
-#define vqshrun_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vqshrun_n_v((int8x16_t)__a, __b, 18); })
-
-__ai int8x8_t vqsub_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vqsub_v(__a, __b, 0); }
-__ai int16x4_t vqsub_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vqsub_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vqsub_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vqsub_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int64x1_t vqsub_s64(int64x1_t __a, int64x1_t __b) {
-  return (int64x1_t)__builtin_neon_vqsub_v((int8x8_t)__a, (int8x8_t)__b, 3); }
-__ai uint8x8_t vqsub_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vqsub_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vqsub_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vqsub_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vqsub_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vqsub_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint64x1_t vqsub_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vqsub_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai int8x16_t vqsubq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vqsubq_v(__a, __b, 32); }
-__ai int16x8_t vqsubq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vqsubq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vqsubq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vqsubq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai int64x2_t vqsubq_s64(int64x2_t __a, int64x2_t __b) {
-  return (int64x2_t)__builtin_neon_vqsubq_v((int8x16_t)__a, (int8x16_t)__b, 35); }
-__ai uint8x16_t vqsubq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vqsubq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vqsubq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vqsubq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vqsubq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vqsubq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint64x2_t vqsubq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vqsubq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-__ai int8x8_t vraddhn_s16(int16x8_t __a, int16x8_t __b) {
-  return (int8x8_t)__builtin_neon_vraddhn_v((int8x16_t)__a, (int8x16_t)__b, 0); }
-__ai int16x4_t vraddhn_s32(int32x4_t __a, int32x4_t __b) {
-  return (int16x4_t)__builtin_neon_vraddhn_v((int8x16_t)__a, (int8x16_t)__b, 1); }
-__ai int32x2_t vraddhn_s64(int64x2_t __a, int64x2_t __b) {
-  return (int32x2_t)__builtin_neon_vraddhn_v((int8x16_t)__a, (int8x16_t)__b, 2); }
-__ai uint8x8_t vraddhn_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vraddhn_v((int8x16_t)__a, (int8x16_t)__b, 16); }
-__ai uint16x4_t vraddhn_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vraddhn_v((int8x16_t)__a, (int8x16_t)__b, 17); }
-__ai uint32x2_t vraddhn_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vraddhn_v((int8x16_t)__a, (int8x16_t)__b, 18); }
-
-__ai float32x2_t vrecpe_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vrecpe_v((int8x8_t)__a, 8); }
-__ai uint32x2_t vrecpe_u32(uint32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vrecpe_v((int8x8_t)__a, 18); }
-__ai float32x4_t vrecpeq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vrecpeq_v((int8x16_t)__a, 40); }
-__ai uint32x4_t vrecpeq_u32(uint32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vrecpeq_v((int8x16_t)__a, 50); }
-
-__ai float32x2_t vrecps_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vrecps_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai float32x4_t vrecpsq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vrecpsq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-
-__ai int8x8_t vreinterpret_s8_s16(int16x4_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_s32(int32x2_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_s64(int64x1_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_u8(uint8x8_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_u16(uint16x4_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_u32(uint32x2_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_u64(uint64x1_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_f16(float16x4_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_f32(float32x2_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_p8(poly8x8_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_p16(poly16x4_t __a) {
-  return (int8x8_t)__a; }
-__ai int16x4_t vreinterpret_s16_s8(int8x8_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_s32(int32x2_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_s64(int64x1_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_u8(uint8x8_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_u16(uint16x4_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_u32(uint32x2_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_u64(uint64x1_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_f16(float16x4_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_f32(float32x2_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_p8(poly8x8_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_p16(poly16x4_t __a) {
-  return (int16x4_t)__a; }
-__ai int32x2_t vreinterpret_s32_s8(int8x8_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_s16(int16x4_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_s64(int64x1_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_u8(uint8x8_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_u16(uint16x4_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_u32(uint32x2_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_u64(uint64x1_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_f16(float16x4_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_f32(float32x2_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_p8(poly8x8_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_p16(poly16x4_t __a) {
-  return (int32x2_t)__a; }
-__ai int64x1_t vreinterpret_s64_s8(int8x8_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_s16(int16x4_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_s32(int32x2_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_u8(uint8x8_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_u16(uint16x4_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_u32(uint32x2_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_u64(uint64x1_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_f16(float16x4_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_f32(float32x2_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_p8(poly8x8_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_p16(poly16x4_t __a) {
-  return (int64x1_t)__a; }
-__ai uint8x8_t vreinterpret_u8_s8(int8x8_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_s16(int16x4_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_s32(int32x2_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_s64(int64x1_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_u16(uint16x4_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_u32(uint32x2_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_u64(uint64x1_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_f16(float16x4_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_f32(float32x2_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_p8(poly8x8_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_p16(poly16x4_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint16x4_t vreinterpret_u16_s8(int8x8_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_s16(int16x4_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_s32(int32x2_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_s64(int64x1_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_u8(uint8x8_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_u32(uint32x2_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_u64(uint64x1_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_f16(float16x4_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_f32(float32x2_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_p8(poly8x8_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_p16(poly16x4_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint32x2_t vreinterpret_u32_s8(int8x8_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_s16(int16x4_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_s32(int32x2_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_s64(int64x1_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_u8(uint8x8_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_u16(uint16x4_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_u64(uint64x1_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_f16(float16x4_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_f32(float32x2_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_p8(poly8x8_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_p16(poly16x4_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint64x1_t vreinterpret_u64_s8(int8x8_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_s16(int16x4_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_s32(int32x2_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_s64(int64x1_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_u8(uint8x8_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_u16(uint16x4_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_u32(uint32x2_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_f16(float16x4_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_f32(float32x2_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_p8(poly8x8_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_p16(poly16x4_t __a) {
-  return (uint64x1_t)__a; }
-__ai float16x4_t vreinterpret_f16_s8(int8x8_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_s16(int16x4_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_s32(int32x2_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_s64(int64x1_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_u8(uint8x8_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_u16(uint16x4_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_u32(uint32x2_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_u64(uint64x1_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_f32(float32x2_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_p8(poly8x8_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_p16(poly16x4_t __a) {
-  return (float16x4_t)__a; }
-__ai float32x2_t vreinterpret_f32_s8(int8x8_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_s16(int16x4_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_s32(int32x2_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_s64(int64x1_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_u8(uint8x8_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_u16(uint16x4_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_u32(uint32x2_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_u64(uint64x1_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_f16(float16x4_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_p8(poly8x8_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_p16(poly16x4_t __a) {
-  return (float32x2_t)__a; }
-__ai poly8x8_t vreinterpret_p8_s8(int8x8_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_s16(int16x4_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_s32(int32x2_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_s64(int64x1_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_u8(uint8x8_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_u16(uint16x4_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_u32(uint32x2_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_u64(uint64x1_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_f16(float16x4_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_f32(float32x2_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_p16(poly16x4_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly16x4_t vreinterpret_p16_s8(int8x8_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_s16(int16x4_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_s32(int32x2_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_s64(int64x1_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_u8(uint8x8_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_u16(uint16x4_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_u32(uint32x2_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_u64(uint64x1_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_f16(float16x4_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_f32(float32x2_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_p8(poly8x8_t __a) {
-  return (poly16x4_t)__a; }
-__ai int8x16_t vreinterpretq_s8_s16(int16x8_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_s32(int32x4_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_s64(int64x2_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_u8(uint8x16_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_u16(uint16x8_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_u32(uint32x4_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_u64(uint64x2_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_f16(float16x8_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_f32(float32x4_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_p8(poly8x16_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_p16(poly16x8_t __a) {
-  return (int8x16_t)__a; }
-__ai int16x8_t vreinterpretq_s16_s8(int8x16_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_s32(int32x4_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_s64(int64x2_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_u8(uint8x16_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_u16(uint16x8_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_u32(uint32x4_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_u64(uint64x2_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_f16(float16x8_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_f32(float32x4_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_p8(poly8x16_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_p16(poly16x8_t __a) {
-  return (int16x8_t)__a; }
-__ai int32x4_t vreinterpretq_s32_s8(int8x16_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_s16(int16x8_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_s64(int64x2_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_u8(uint8x16_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_u16(uint16x8_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_u32(uint32x4_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_u64(uint64x2_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_f16(float16x8_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_f32(float32x4_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_p8(poly8x16_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_p16(poly16x8_t __a) {
-  return (int32x4_t)__a; }
-__ai int64x2_t vreinterpretq_s64_s8(int8x16_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_s16(int16x8_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_s32(int32x4_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_u8(uint8x16_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_u16(uint16x8_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_u32(uint32x4_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_u64(uint64x2_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_f16(float16x8_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_f32(float32x4_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_p8(poly8x16_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_p16(poly16x8_t __a) {
-  return (int64x2_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_s8(int8x16_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_s16(int16x8_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_s32(int32x4_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_s64(int64x2_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_u16(uint16x8_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_u32(uint32x4_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_u64(uint64x2_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_f16(float16x8_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_f32(float32x4_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_p8(poly8x16_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_p16(poly16x8_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_s8(int8x16_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_s16(int16x8_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_s32(int32x4_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_s64(int64x2_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_u8(uint8x16_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_u32(uint32x4_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_u64(uint64x2_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_f16(float16x8_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_f32(float32x4_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_p8(poly8x16_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_p16(poly16x8_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_s8(int8x16_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_s16(int16x8_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_s32(int32x4_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_s64(int64x2_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_u8(uint8x16_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_u16(uint16x8_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_u64(uint64x2_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_f16(float16x8_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_f32(float32x4_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_p8(poly8x16_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_p16(poly16x8_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_s8(int8x16_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_s16(int16x8_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_s32(int32x4_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_s64(int64x2_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_u8(uint8x16_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_u16(uint16x8_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_u32(uint32x4_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_f16(float16x8_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_f32(float32x4_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_p8(poly8x16_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_p16(poly16x8_t __a) {
-  return (uint64x2_t)__a; }
-__ai float16x8_t vreinterpretq_f16_s8(int8x16_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_s16(int16x8_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_s32(int32x4_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_s64(int64x2_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_u8(uint8x16_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_u16(uint16x8_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_u32(uint32x4_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_u64(uint64x2_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_f32(float32x4_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_p8(poly8x16_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_p16(poly16x8_t __a) {
-  return (float16x8_t)__a; }
-__ai float32x4_t vreinterpretq_f32_s8(int8x16_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_s16(int16x8_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_s32(int32x4_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_s64(int64x2_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_u8(uint8x16_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_u16(uint16x8_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_u32(uint32x4_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_u64(uint64x2_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_f16(float16x8_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_p8(poly8x16_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_p16(poly16x8_t __a) {
-  return (float32x4_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_s8(int8x16_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_s16(int16x8_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_s32(int32x4_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_s64(int64x2_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_u8(uint8x16_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_u16(uint16x8_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_u32(uint32x4_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_u64(uint64x2_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_f16(float16x8_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_f32(float32x4_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_p16(poly16x8_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_s8(int8x16_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_s16(int16x8_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_s32(int32x4_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_s64(int64x2_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_u8(uint8x16_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_u16(uint16x8_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_u32(uint32x4_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_u64(uint64x2_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_f16(float16x8_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_f32(float32x4_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_p8(poly8x16_t __a) {
-  return (poly16x8_t)__a; }
-
-__ai int8x8_t vrev16_s8(int8x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2, 5, 4, 7, 6); }
-__ai uint8x8_t vrev16_u8(uint8x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2, 5, 4, 7, 6); }
-__ai poly8x8_t vrev16_p8(poly8x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2, 5, 4, 7, 6); }
-__ai int8x16_t vrev16q_s8(int8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2, 5, 4, 7, 6, 9, 8, 11, 10, 13, 12, 15, 14); }
-__ai uint8x16_t vrev16q_u8(uint8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2, 5, 4, 7, 6, 9, 8, 11, 10, 13, 12, 15, 14); }
-__ai poly8x16_t vrev16q_p8(poly8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2, 5, 4, 7, 6, 9, 8, 11, 10, 13, 12, 15, 14); }
-
-__ai int8x8_t vrev32_s8(int8x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0, 7, 6, 5, 4); }
-__ai int16x4_t vrev32_s16(int16x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2); }
-__ai uint8x8_t vrev32_u8(uint8x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0, 7, 6, 5, 4); }
-__ai uint16x4_t vrev32_u16(uint16x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2); }
-__ai poly8x8_t vrev32_p8(poly8x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0, 7, 6, 5, 4); }
-__ai poly16x4_t vrev32_p16(poly16x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2); }
-__ai int8x16_t vrev32q_s8(int8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12); }
-__ai int16x8_t vrev32q_s16(int16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2, 5, 4, 7, 6); }
-__ai uint8x16_t vrev32q_u8(uint8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12); }
-__ai uint16x8_t vrev32q_u16(uint16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2, 5, 4, 7, 6); }
-__ai poly8x16_t vrev32q_p8(poly8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12); }
-__ai poly16x8_t vrev32q_p16(poly16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2, 5, 4, 7, 6); }
-
-__ai int8x8_t vrev64_s8(int8x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 7, 6, 5, 4, 3, 2, 1, 0); }
-__ai int16x4_t vrev64_s16(int16x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0); }
-__ai int32x2_t vrev64_s32(int32x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0); }
-__ai uint8x8_t vrev64_u8(uint8x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 7, 6, 5, 4, 3, 2, 1, 0); }
-__ai uint16x4_t vrev64_u16(uint16x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0); }
-__ai uint32x2_t vrev64_u32(uint32x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0); }
-__ai poly8x8_t vrev64_p8(poly8x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 7, 6, 5, 4, 3, 2, 1, 0); }
-__ai poly16x4_t vrev64_p16(poly16x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0); }
-__ai float32x2_t vrev64_f32(float32x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0); }
-__ai int8x16_t vrev64q_s8(int8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8); }
-__ai int16x8_t vrev64q_s16(int16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0, 7, 6, 5, 4); }
-__ai int32x4_t vrev64q_s32(int32x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2); }
-__ai uint8x16_t vrev64q_u8(uint8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8); }
-__ai uint16x8_t vrev64q_u16(uint16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0, 7, 6, 5, 4); }
-__ai uint32x4_t vrev64q_u32(uint32x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2); }
-__ai poly8x16_t vrev64q_p8(poly8x16_t __a) {
-  return __builtin_shufflevector(__a, __a, 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8); }
-__ai poly16x8_t vrev64q_p16(poly16x8_t __a) {
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0, 7, 6, 5, 4); }
-__ai float32x4_t vrev64q_f32(float32x4_t __a) {
-  return __builtin_shufflevector(__a, __a, 1, 0, 3, 2); }
-
-__ai int8x8_t vrhadd_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vrhadd_v(__a, __b, 0); }
-__ai int16x4_t vrhadd_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vrhadd_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vrhadd_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vrhadd_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai uint8x8_t vrhadd_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vrhadd_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vrhadd_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vrhadd_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vrhadd_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vrhadd_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai int8x16_t vrhaddq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vrhaddq_v(__a, __b, 32); }
-__ai int16x8_t vrhaddq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vrhaddq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vrhaddq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vrhaddq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai uint8x16_t vrhaddq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vrhaddq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vrhaddq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vrhaddq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vrhaddq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vrhaddq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-
-__ai int8x8_t vrshl_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vrshl_v(__a, __b, 0); }
-__ai int16x4_t vrshl_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vrshl_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vrshl_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vrshl_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int64x1_t vrshl_s64(int64x1_t __a, int64x1_t __b) {
-  return (int64x1_t)__builtin_neon_vrshl_v((int8x8_t)__a, (int8x8_t)__b, 3); }
-__ai uint8x8_t vrshl_u8(uint8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vrshl_v((int8x8_t)__a, __b, 16); }
-__ai uint16x4_t vrshl_u16(uint16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vrshl_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vrshl_u32(uint32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vrshl_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint64x1_t vrshl_u64(uint64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vrshl_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai int8x16_t vrshlq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vrshlq_v(__a, __b, 32); }
-__ai int16x8_t vrshlq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vrshlq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vrshlq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vrshlq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai int64x2_t vrshlq_s64(int64x2_t __a, int64x2_t __b) {
-  return (int64x2_t)__builtin_neon_vrshlq_v((int8x16_t)__a, (int8x16_t)__b, 35); }
-__ai uint8x16_t vrshlq_u8(uint8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vrshlq_v((int8x16_t)__a, __b, 48); }
-__ai uint16x8_t vrshlq_u16(uint16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vrshlq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vrshlq_u32(uint32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vrshlq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint64x2_t vrshlq_u64(uint64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vrshlq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-#define vrshrn_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int8x8_t)__builtin_neon_vrshrn_n_v((int8x16_t)__a, __b, 0); })
-#define vrshrn_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int16x4_t)__builtin_neon_vrshrn_n_v((int8x16_t)__a, __b, 1); })
-#define vrshrn_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int32x2_t)__builtin_neon_vrshrn_n_v((int8x16_t)__a, __b, 2); })
-#define vrshrn_n_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vrshrn_n_v((int8x16_t)__a, __b, 16); })
-#define vrshrn_n_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vrshrn_n_v((int8x16_t)__a, __b, 17); })
-#define vrshrn_n_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vrshrn_n_v((int8x16_t)__a, __b, 18); })
-
-#define vrshr_n_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  (int8x8_t)__builtin_neon_vrshr_n_v(__a, __b, 0); })
-#define vrshr_n_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  (int16x4_t)__builtin_neon_vrshr_n_v((int8x8_t)__a, __b, 1); })
-#define vrshr_n_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  (int32x2_t)__builtin_neon_vrshr_n_v((int8x8_t)__a, __b, 2); })
-#define vrshr_n_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  (int64x1_t)__builtin_neon_vrshr_n_v((int8x8_t)__a, __b, 3); })
-#define vrshr_n_u8(a, __b) __extension__ ({ \
-  uint8x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vrshr_n_v((int8x8_t)__a, __b, 16); })
-#define vrshr_n_u16(a, __b) __extension__ ({ \
-  uint16x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vrshr_n_v((int8x8_t)__a, __b, 17); })
-#define vrshr_n_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vrshr_n_v((int8x8_t)__a, __b, 18); })
-#define vrshr_n_u64(a, __b) __extension__ ({ \
-  uint64x1_t __a = (a); \
-  (uint64x1_t)__builtin_neon_vrshr_n_v((int8x8_t)__a, __b, 19); })
-#define vrshrq_n_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  (int8x16_t)__builtin_neon_vrshrq_n_v(__a, __b, 32); })
-#define vrshrq_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int16x8_t)__builtin_neon_vrshrq_n_v((int8x16_t)__a, __b, 33); })
-#define vrshrq_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int32x4_t)__builtin_neon_vrshrq_n_v((int8x16_t)__a, __b, 34); })
-#define vrshrq_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int64x2_t)__builtin_neon_vrshrq_n_v((int8x16_t)__a, __b, 35); })
-#define vrshrq_n_u8(a, __b) __extension__ ({ \
-  uint8x16_t __a = (a); \
-  (uint8x16_t)__builtin_neon_vrshrq_n_v((int8x16_t)__a, __b, 48); })
-#define vrshrq_n_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint16x8_t)__builtin_neon_vrshrq_n_v((int8x16_t)__a, __b, 49); })
-#define vrshrq_n_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint32x4_t)__builtin_neon_vrshrq_n_v((int8x16_t)__a, __b, 50); })
-#define vrshrq_n_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint64x2_t)__builtin_neon_vrshrq_n_v((int8x16_t)__a, __b, 51); })
-
-__ai float32x2_t vrsqrte_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vrsqrte_v((int8x8_t)__a, 8); }
-__ai uint32x2_t vrsqrte_u32(uint32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vrsqrte_v((int8x8_t)__a, 18); }
-__ai float32x4_t vrsqrteq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vrsqrteq_v((int8x16_t)__a, 40); }
-__ai uint32x4_t vrsqrteq_u32(uint32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vrsqrteq_v((int8x16_t)__a, 50); }
-
-__ai float32x2_t vrsqrts_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vrsqrts_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai float32x4_t vrsqrtsq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vrsqrtsq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-
-#define vrsra_n_s8(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int8x8_t __b = (b); \
-  (int8x8_t)__builtin_neon_vrsra_n_v(__a, __b, __c, 0); })
-#define vrsra_n_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  (int16x4_t)__builtin_neon_vrsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 1); })
-#define vrsra_n_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  (int32x2_t)__builtin_neon_vrsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 2); })
-#define vrsra_n_s64(a, b, __c) __extension__ ({ \
-  int64x1_t __a = (a); int64x1_t __b = (b); \
-  (int64x1_t)__builtin_neon_vrsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 3); })
-#define vrsra_n_u8(a, b, __c) __extension__ ({ \
-  uint8x8_t __a = (a); uint8x8_t __b = (b); \
-  (uint8x8_t)__builtin_neon_vrsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 16); })
-#define vrsra_n_u16(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); \
-  (uint16x4_t)__builtin_neon_vrsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 17); })
-#define vrsra_n_u32(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); \
-  (uint32x2_t)__builtin_neon_vrsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 18); })
-#define vrsra_n_u64(a, b, __c) __extension__ ({ \
-  uint64x1_t __a = (a); uint64x1_t __b = (b); \
-  (uint64x1_t)__builtin_neon_vrsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 19); })
-#define vrsraq_n_s8(a, b, __c) __extension__ ({ \
-  int8x16_t __a = (a); int8x16_t __b = (b); \
-  (int8x16_t)__builtin_neon_vrsraq_n_v(__a, __b, __c, 32); })
-#define vrsraq_n_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  (int16x8_t)__builtin_neon_vrsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 33); })
-#define vrsraq_n_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  (int32x4_t)__builtin_neon_vrsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 34); })
-#define vrsraq_n_s64(a, b, __c) __extension__ ({ \
-  int64x2_t __a = (a); int64x2_t __b = (b); \
-  (int64x2_t)__builtin_neon_vrsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 35); })
-#define vrsraq_n_u8(a, b, __c) __extension__ ({ \
-  uint8x16_t __a = (a); uint8x16_t __b = (b); \
-  (uint8x16_t)__builtin_neon_vrsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 48); })
-#define vrsraq_n_u16(a, b, __c) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); \
-  (uint16x8_t)__builtin_neon_vrsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 49); })
-#define vrsraq_n_u32(a, b, __c) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); \
-  (uint32x4_t)__builtin_neon_vrsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 50); })
-#define vrsraq_n_u64(a, b, __c) __extension__ ({ \
-  uint64x2_t __a = (a); uint64x2_t __b = (b); \
-  (uint64x2_t)__builtin_neon_vrsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 51); })
-
-__ai int8x8_t vrsubhn_s16(int16x8_t __a, int16x8_t __b) {
-  return (int8x8_t)__builtin_neon_vrsubhn_v((int8x16_t)__a, (int8x16_t)__b, 0); }
-__ai int16x4_t vrsubhn_s32(int32x4_t __a, int32x4_t __b) {
-  return (int16x4_t)__builtin_neon_vrsubhn_v((int8x16_t)__a, (int8x16_t)__b, 1); }
-__ai int32x2_t vrsubhn_s64(int64x2_t __a, int64x2_t __b) {
-  return (int32x2_t)__builtin_neon_vrsubhn_v((int8x16_t)__a, (int8x16_t)__b, 2); }
-__ai uint8x8_t vrsubhn_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vrsubhn_v((int8x16_t)__a, (int8x16_t)__b, 16); }
-__ai uint16x4_t vrsubhn_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vrsubhn_v((int8x16_t)__a, (int8x16_t)__b, 17); }
-__ai uint32x2_t vrsubhn_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vrsubhn_v((int8x16_t)__a, (int8x16_t)__b, 18); }
-
-#define vset_lane_u8(a, b, __c) __extension__ ({ \
-  uint8_t __a = (a); uint8x8_t __b = (b); \
-  (uint8x8_t)__builtin_neon_vset_lane_i8(__a, (int8x8_t)__b, __c); })
-#define vset_lane_u16(a, b, __c) __extension__ ({ \
-  uint16_t __a = (a); uint16x4_t __b = (b); \
-  (uint16x4_t)__builtin_neon_vset_lane_i16(__a, (int16x4_t)__b, __c); })
-#define vset_lane_u32(a, b, __c) __extension__ ({ \
-  uint32_t __a = (a); uint32x2_t __b = (b); \
-  (uint32x2_t)__builtin_neon_vset_lane_i32(__a, (int32x2_t)__b, __c); })
-#define vset_lane_s8(a, b, __c) __extension__ ({ \
-  int8_t __a = (a); int8x8_t __b = (b); \
-  (int8x8_t)__builtin_neon_vset_lane_i8(__a, __b, __c); })
-#define vset_lane_s16(a, b, __c) __extension__ ({ \
-  int16_t __a = (a); int16x4_t __b = (b); \
-  (int16x4_t)__builtin_neon_vset_lane_i16(__a, __b, __c); })
-#define vset_lane_s32(a, b, __c) __extension__ ({ \
-  int32_t __a = (a); int32x2_t __b = (b); \
-  (int32x2_t)__builtin_neon_vset_lane_i32(__a, __b, __c); })
-#define vset_lane_p8(a, b, __c) __extension__ ({ \
-  poly8_t __a = (a); poly8x8_t __b = (b); \
-  (poly8x8_t)__builtin_neon_vset_lane_i8(__a, (int8x8_t)__b, __c); })
-#define vset_lane_p16(a, b, __c) __extension__ ({ \
-  poly16_t __a = (a); poly16x4_t __b = (b); \
-  (poly16x4_t)__builtin_neon_vset_lane_i16(__a, (int16x4_t)__b, __c); })
-#define vset_lane_f32(a, b, __c) __extension__ ({ \
-  float32_t __a = (a); float32x2_t __b = (b); \
-  (float32x2_t)__builtin_neon_vset_lane_f32(__a, __b, __c); })
-#define vsetq_lane_u8(a, b, __c) __extension__ ({ \
-  uint8_t __a = (a); uint8x16_t __b = (b); \
-  (uint8x16_t)__builtin_neon_vsetq_lane_i8(__a, (int8x16_t)__b, __c); })
-#define vsetq_lane_u16(a, b, __c) __extension__ ({ \
-  uint16_t __a = (a); uint16x8_t __b = (b); \
-  (uint16x8_t)__builtin_neon_vsetq_lane_i16(__a, (int16x8_t)__b, __c); })
-#define vsetq_lane_u32(a, b, __c) __extension__ ({ \
-  uint32_t __a = (a); uint32x4_t __b = (b); \
-  (uint32x4_t)__builtin_neon_vsetq_lane_i32(__a, (int32x4_t)__b, __c); })
-#define vsetq_lane_s8(a, b, __c) __extension__ ({ \
-  int8_t __a = (a); int8x16_t __b = (b); \
-  (int8x16_t)__builtin_neon_vsetq_lane_i8(__a, __b, __c); })
-#define vsetq_lane_s16(a, b, __c) __extension__ ({ \
-  int16_t __a = (a); int16x8_t __b = (b); \
-  (int16x8_t)__builtin_neon_vsetq_lane_i16(__a, __b, __c); })
-#define vsetq_lane_s32(a, b, __c) __extension__ ({ \
-  int32_t __a = (a); int32x4_t __b = (b); \
-  (int32x4_t)__builtin_neon_vsetq_lane_i32(__a, __b, __c); })
-#define vsetq_lane_p8(a, b, __c) __extension__ ({ \
-  poly8_t __a = (a); poly8x16_t __b = (b); \
-  (poly8x16_t)__builtin_neon_vsetq_lane_i8(__a, (int8x16_t)__b, __c); })
-#define vsetq_lane_p16(a, b, __c) __extension__ ({ \
-  poly16_t __a = (a); poly16x8_t __b = (b); \
-  (poly16x8_t)__builtin_neon_vsetq_lane_i16(__a, (int16x8_t)__b, __c); })
-#define vsetq_lane_f32(a, b, __c) __extension__ ({ \
-  float32_t __a = (a); float32x4_t __b = (b); \
-  (float32x4_t)__builtin_neon_vsetq_lane_f32(__a, __b, __c); })
-#define vset_lane_s64(a, b, __c) __extension__ ({ \
-  int64_t __a = (a); int64x1_t __b = (b); \
-  (int64x1_t)__builtin_neon_vset_lane_i64(__a, __b, __c); })
-#define vset_lane_u64(a, b, __c) __extension__ ({ \
-  uint64_t __a = (a); uint64x1_t __b = (b); \
-  (uint64x1_t)__builtin_neon_vset_lane_i64(__a, (int64x1_t)__b, __c); })
-#define vsetq_lane_s64(a, b, __c) __extension__ ({ \
-  int64_t __a = (a); int64x2_t __b = (b); \
-  (int64x2_t)__builtin_neon_vsetq_lane_i64(__a, __b, __c); })
-#define vsetq_lane_u64(a, b, __c) __extension__ ({ \
-  uint64_t __a = (a); uint64x2_t __b = (b); \
-  (uint64x2_t)__builtin_neon_vsetq_lane_i64(__a, (int64x2_t)__b, __c); })
-
-__ai int8x8_t vshl_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vshl_v(__a, __b, 0); }
-__ai int16x4_t vshl_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vshl_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vshl_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vshl_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int64x1_t vshl_s64(int64x1_t __a, int64x1_t __b) {
-  return (int64x1_t)__builtin_neon_vshl_v((int8x8_t)__a, (int8x8_t)__b, 3); }
-__ai uint8x8_t vshl_u8(uint8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vshl_v((int8x8_t)__a, __b, 16); }
-__ai uint16x4_t vshl_u16(uint16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vshl_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vshl_u32(uint32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vshl_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint64x1_t vshl_u64(uint64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vshl_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai int8x16_t vshlq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vshlq_v(__a, __b, 32); }
-__ai int16x8_t vshlq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vshlq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vshlq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vshlq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai int64x2_t vshlq_s64(int64x2_t __a, int64x2_t __b) {
-  return (int64x2_t)__builtin_neon_vshlq_v((int8x16_t)__a, (int8x16_t)__b, 35); }
-__ai uint8x16_t vshlq_u8(uint8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vshlq_v((int8x16_t)__a, __b, 48); }
-__ai uint16x8_t vshlq_u16(uint16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vshlq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vshlq_u32(uint32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vshlq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint64x2_t vshlq_u64(uint64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vshlq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-#define vshll_n_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  (int16x8_t)__builtin_neon_vshll_n_v(__a, __b, 33); })
-#define vshll_n_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  (int32x4_t)__builtin_neon_vshll_n_v((int8x8_t)__a, __b, 34); })
-#define vshll_n_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  (int64x2_t)__builtin_neon_vshll_n_v((int8x8_t)__a, __b, 35); })
-#define vshll_n_u8(a, __b) __extension__ ({ \
-  uint8x8_t __a = (a); \
-  (uint16x8_t)__builtin_neon_vshll_n_v((int8x8_t)__a, __b, 49); })
-#define vshll_n_u16(a, __b) __extension__ ({ \
-  uint16x4_t __a = (a); \
-  (uint32x4_t)__builtin_neon_vshll_n_v((int8x8_t)__a, __b, 50); })
-#define vshll_n_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  (uint64x2_t)__builtin_neon_vshll_n_v((int8x8_t)__a, __b, 51); })
-
-#define vshl_n_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  (int8x8_t)__builtin_neon_vshl_n_v(__a, __b, 0); })
-#define vshl_n_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  (int16x4_t)__builtin_neon_vshl_n_v((int8x8_t)__a, __b, 1); })
-#define vshl_n_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  (int32x2_t)__builtin_neon_vshl_n_v((int8x8_t)__a, __b, 2); })
-#define vshl_n_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  (int64x1_t)__builtin_neon_vshl_n_v((int8x8_t)__a, __b, 3); })
-#define vshl_n_u8(a, __b) __extension__ ({ \
-  uint8x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vshl_n_v((int8x8_t)__a, __b, 16); })
-#define vshl_n_u16(a, __b) __extension__ ({ \
-  uint16x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vshl_n_v((int8x8_t)__a, __b, 17); })
-#define vshl_n_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vshl_n_v((int8x8_t)__a, __b, 18); })
-#define vshl_n_u64(a, __b) __extension__ ({ \
-  uint64x1_t __a = (a); \
-  (uint64x1_t)__builtin_neon_vshl_n_v((int8x8_t)__a, __b, 19); })
-#define vshlq_n_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  (int8x16_t)__builtin_neon_vshlq_n_v(__a, __b, 32); })
-#define vshlq_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int16x8_t)__builtin_neon_vshlq_n_v((int8x16_t)__a, __b, 33); })
-#define vshlq_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int32x4_t)__builtin_neon_vshlq_n_v((int8x16_t)__a, __b, 34); })
-#define vshlq_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int64x2_t)__builtin_neon_vshlq_n_v((int8x16_t)__a, __b, 35); })
-#define vshlq_n_u8(a, __b) __extension__ ({ \
-  uint8x16_t __a = (a); \
-  (uint8x16_t)__builtin_neon_vshlq_n_v((int8x16_t)__a, __b, 48); })
-#define vshlq_n_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint16x8_t)__builtin_neon_vshlq_n_v((int8x16_t)__a, __b, 49); })
-#define vshlq_n_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint32x4_t)__builtin_neon_vshlq_n_v((int8x16_t)__a, __b, 50); })
-#define vshlq_n_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint64x2_t)__builtin_neon_vshlq_n_v((int8x16_t)__a, __b, 51); })
-
-#define vshrn_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int8x8_t)__builtin_neon_vshrn_n_v((int8x16_t)__a, __b, 0); })
-#define vshrn_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int16x4_t)__builtin_neon_vshrn_n_v((int8x16_t)__a, __b, 1); })
-#define vshrn_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int32x2_t)__builtin_neon_vshrn_n_v((int8x16_t)__a, __b, 2); })
-#define vshrn_n_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vshrn_n_v((int8x16_t)__a, __b, 16); })
-#define vshrn_n_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vshrn_n_v((int8x16_t)__a, __b, 17); })
-#define vshrn_n_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vshrn_n_v((int8x16_t)__a, __b, 18); })
-
-#define vshr_n_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  (int8x8_t)__builtin_neon_vshr_n_v(__a, __b, 0); })
-#define vshr_n_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  (int16x4_t)__builtin_neon_vshr_n_v((int8x8_t)__a, __b, 1); })
-#define vshr_n_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  (int32x2_t)__builtin_neon_vshr_n_v((int8x8_t)__a, __b, 2); })
-#define vshr_n_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  (int64x1_t)__builtin_neon_vshr_n_v((int8x8_t)__a, __b, 3); })
-#define vshr_n_u8(a, __b) __extension__ ({ \
-  uint8x8_t __a = (a); \
-  (uint8x8_t)__builtin_neon_vshr_n_v((int8x8_t)__a, __b, 16); })
-#define vshr_n_u16(a, __b) __extension__ ({ \
-  uint16x4_t __a = (a); \
-  (uint16x4_t)__builtin_neon_vshr_n_v((int8x8_t)__a, __b, 17); })
-#define vshr_n_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  (uint32x2_t)__builtin_neon_vshr_n_v((int8x8_t)__a, __b, 18); })
-#define vshr_n_u64(a, __b) __extension__ ({ \
-  uint64x1_t __a = (a); \
-  (uint64x1_t)__builtin_neon_vshr_n_v((int8x8_t)__a, __b, 19); })
-#define vshrq_n_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  (int8x16_t)__builtin_neon_vshrq_n_v(__a, __b, 32); })
-#define vshrq_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int16x8_t)__builtin_neon_vshrq_n_v((int8x16_t)__a, __b, 33); })
-#define vshrq_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int32x4_t)__builtin_neon_vshrq_n_v((int8x16_t)__a, __b, 34); })
-#define vshrq_n_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int64x2_t)__builtin_neon_vshrq_n_v((int8x16_t)__a, __b, 35); })
-#define vshrq_n_u8(a, __b) __extension__ ({ \
-  uint8x16_t __a = (a); \
-  (uint8x16_t)__builtin_neon_vshrq_n_v((int8x16_t)__a, __b, 48); })
-#define vshrq_n_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint16x8_t)__builtin_neon_vshrq_n_v((int8x16_t)__a, __b, 49); })
-#define vshrq_n_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint32x4_t)__builtin_neon_vshrq_n_v((int8x16_t)__a, __b, 50); })
-#define vshrq_n_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint64x2_t)__builtin_neon_vshrq_n_v((int8x16_t)__a, __b, 51); })
-
-#define vsli_n_s8(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int8x8_t __b = (b); \
-  (int8x8_t)__builtin_neon_vsli_n_v(__a, __b, __c, 0); })
-#define vsli_n_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  (int16x4_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 1); })
-#define vsli_n_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  (int32x2_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 2); })
-#define vsli_n_s64(a, b, __c) __extension__ ({ \
-  int64x1_t __a = (a); int64x1_t __b = (b); \
-  (int64x1_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 3); })
-#define vsli_n_u8(a, b, __c) __extension__ ({ \
-  uint8x8_t __a = (a); uint8x8_t __b = (b); \
-  (uint8x8_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 16); })
-#define vsli_n_u16(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); \
-  (uint16x4_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 17); })
-#define vsli_n_u32(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); \
-  (uint32x2_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 18); })
-#define vsli_n_u64(a, b, __c) __extension__ ({ \
-  uint64x1_t __a = (a); uint64x1_t __b = (b); \
-  (uint64x1_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 19); })
-#define vsli_n_p8(a, b, __c) __extension__ ({ \
-  poly8x8_t __a = (a); poly8x8_t __b = (b); \
-  (poly8x8_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 4); })
-#define vsli_n_p16(a, b, __c) __extension__ ({ \
-  poly16x4_t __a = (a); poly16x4_t __b = (b); \
-  (poly16x4_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 5); })
-#define vsliq_n_s8(a, b, __c) __extension__ ({ \
-  int8x16_t __a = (a); int8x16_t __b = (b); \
-  (int8x16_t)__builtin_neon_vsliq_n_v(__a, __b, __c, 32); })
-#define vsliq_n_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  (int16x8_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 33); })
-#define vsliq_n_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  (int32x4_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 34); })
-#define vsliq_n_s64(a, b, __c) __extension__ ({ \
-  int64x2_t __a = (a); int64x2_t __b = (b); \
-  (int64x2_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 35); })
-#define vsliq_n_u8(a, b, __c) __extension__ ({ \
-  uint8x16_t __a = (a); uint8x16_t __b = (b); \
-  (uint8x16_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 48); })
-#define vsliq_n_u16(a, b, __c) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); \
-  (uint16x8_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 49); })
-#define vsliq_n_u32(a, b, __c) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); \
-  (uint32x4_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 50); })
-#define vsliq_n_u64(a, b, __c) __extension__ ({ \
-  uint64x2_t __a = (a); uint64x2_t __b = (b); \
-  (uint64x2_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 51); })
-#define vsliq_n_p8(a, b, __c) __extension__ ({ \
-  poly8x16_t __a = (a); poly8x16_t __b = (b); \
-  (poly8x16_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 36); })
-#define vsliq_n_p16(a, b, __c) __extension__ ({ \
-  poly16x8_t __a = (a); poly16x8_t __b = (b); \
-  (poly16x8_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 37); })
-
-#define vsra_n_s8(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int8x8_t __b = (b); \
-  (int8x8_t)__builtin_neon_vsra_n_v(__a, __b, __c, 0); })
-#define vsra_n_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  (int16x4_t)__builtin_neon_vsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 1); })
-#define vsra_n_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  (int32x2_t)__builtin_neon_vsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 2); })
-#define vsra_n_s64(a, b, __c) __extension__ ({ \
-  int64x1_t __a = (a); int64x1_t __b = (b); \
-  (int64x1_t)__builtin_neon_vsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 3); })
-#define vsra_n_u8(a, b, __c) __extension__ ({ \
-  uint8x8_t __a = (a); uint8x8_t __b = (b); \
-  (uint8x8_t)__builtin_neon_vsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 16); })
-#define vsra_n_u16(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); \
-  (uint16x4_t)__builtin_neon_vsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 17); })
-#define vsra_n_u32(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); \
-  (uint32x2_t)__builtin_neon_vsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 18); })
-#define vsra_n_u64(a, b, __c) __extension__ ({ \
-  uint64x1_t __a = (a); uint64x1_t __b = (b); \
-  (uint64x1_t)__builtin_neon_vsra_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 19); })
-#define vsraq_n_s8(a, b, __c) __extension__ ({ \
-  int8x16_t __a = (a); int8x16_t __b = (b); \
-  (int8x16_t)__builtin_neon_vsraq_n_v(__a, __b, __c, 32); })
-#define vsraq_n_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  (int16x8_t)__builtin_neon_vsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 33); })
-#define vsraq_n_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  (int32x4_t)__builtin_neon_vsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 34); })
-#define vsraq_n_s64(a, b, __c) __extension__ ({ \
-  int64x2_t __a = (a); int64x2_t __b = (b); \
-  (int64x2_t)__builtin_neon_vsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 35); })
-#define vsraq_n_u8(a, b, __c) __extension__ ({ \
-  uint8x16_t __a = (a); uint8x16_t __b = (b); \
-  (uint8x16_t)__builtin_neon_vsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 48); })
-#define vsraq_n_u16(a, b, __c) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); \
-  (uint16x8_t)__builtin_neon_vsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 49); })
-#define vsraq_n_u32(a, b, __c) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); \
-  (uint32x4_t)__builtin_neon_vsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 50); })
-#define vsraq_n_u64(a, b, __c) __extension__ ({ \
-  uint64x2_t __a = (a); uint64x2_t __b = (b); \
-  (uint64x2_t)__builtin_neon_vsraq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 51); })
-
-#define vsri_n_s8(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int8x8_t __b = (b); \
-  (int8x8_t)__builtin_neon_vsri_n_v(__a, __b, __c, 0); })
-#define vsri_n_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); \
-  (int16x4_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 1); })
-#define vsri_n_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); \
-  (int32x2_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 2); })
-#define vsri_n_s64(a, b, __c) __extension__ ({ \
-  int64x1_t __a = (a); int64x1_t __b = (b); \
-  (int64x1_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 3); })
-#define vsri_n_u8(a, b, __c) __extension__ ({ \
-  uint8x8_t __a = (a); uint8x8_t __b = (b); \
-  (uint8x8_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 16); })
-#define vsri_n_u16(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); \
-  (uint16x4_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 17); })
-#define vsri_n_u32(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); \
-  (uint32x2_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 18); })
-#define vsri_n_u64(a, b, __c) __extension__ ({ \
-  uint64x1_t __a = (a); uint64x1_t __b = (b); \
-  (uint64x1_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 19); })
-#define vsri_n_p8(a, b, __c) __extension__ ({ \
-  poly8x8_t __a = (a); poly8x8_t __b = (b); \
-  (poly8x8_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 4); })
-#define vsri_n_p16(a, b, __c) __extension__ ({ \
-  poly16x4_t __a = (a); poly16x4_t __b = (b); \
-  (poly16x4_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 5); })
-#define vsriq_n_s8(a, b, __c) __extension__ ({ \
-  int8x16_t __a = (a); int8x16_t __b = (b); \
-  (int8x16_t)__builtin_neon_vsriq_n_v(__a, __b, __c, 32); })
-#define vsriq_n_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  (int16x8_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 33); })
-#define vsriq_n_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  (int32x4_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 34); })
-#define vsriq_n_s64(a, b, __c) __extension__ ({ \
-  int64x2_t __a = (a); int64x2_t __b = (b); \
-  (int64x2_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 35); })
-#define vsriq_n_u8(a, b, __c) __extension__ ({ \
-  uint8x16_t __a = (a); uint8x16_t __b = (b); \
-  (uint8x16_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 48); })
-#define vsriq_n_u16(a, b, __c) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); \
-  (uint16x8_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 49); })
-#define vsriq_n_u32(a, b, __c) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); \
-  (uint32x4_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 50); })
-#define vsriq_n_u64(a, b, __c) __extension__ ({ \
-  uint64x2_t __a = (a); uint64x2_t __b = (b); \
-  (uint64x2_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 51); })
-#define vsriq_n_p8(a, b, __c) __extension__ ({ \
-  poly8x16_t __a = (a); poly8x16_t __b = (b); \
-  (poly8x16_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 36); })
-#define vsriq_n_p16(a, b, __c) __extension__ ({ \
-  poly16x8_t __a = (a); poly16x8_t __b = (b); \
-  (poly16x8_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 37); })
-
-#define vst1q_u8(__a, b) __extension__ ({ \
-  uint8x16_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 48); })
-#define vst1q_u16(__a, b) __extension__ ({ \
-  uint16x8_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 49); })
-#define vst1q_u32(__a, b) __extension__ ({ \
-  uint32x4_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 50); })
-#define vst1q_u64(__a, b) __extension__ ({ \
-  uint64x2_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 51); })
-#define vst1q_s8(__a, b) __extension__ ({ \
-  int8x16_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, __b, 32); })
-#define vst1q_s16(__a, b) __extension__ ({ \
-  int16x8_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 33); })
-#define vst1q_s32(__a, b) __extension__ ({ \
-  int32x4_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 34); })
-#define vst1q_s64(__a, b) __extension__ ({ \
-  int64x2_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 35); })
-#define vst1q_f16(__a, b) __extension__ ({ \
-  float16x8_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 39); })
-#define vst1q_f32(__a, b) __extension__ ({ \
-  float32x4_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 40); })
-#define vst1q_p8(__a, b) __extension__ ({ \
-  poly8x16_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 36); })
-#define vst1q_p16(__a, b) __extension__ ({ \
-  poly16x8_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 37); })
-#define vst1_u8(__a, b) __extension__ ({ \
-  uint8x8_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 16); })
-#define vst1_u16(__a, b) __extension__ ({ \
-  uint16x4_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 17); })
-#define vst1_u32(__a, b) __extension__ ({ \
-  uint32x2_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 18); })
-#define vst1_u64(__a, b) __extension__ ({ \
-  uint64x1_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 19); })
-#define vst1_s8(__a, b) __extension__ ({ \
-  int8x8_t __b = (b); \
-  __builtin_neon_vst1_v(__a, __b, 0); })
-#define vst1_s16(__a, b) __extension__ ({ \
-  int16x4_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 1); })
-#define vst1_s32(__a, b) __extension__ ({ \
-  int32x2_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 2); })
-#define vst1_s64(__a, b) __extension__ ({ \
-  int64x1_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 3); })
-#define vst1_f16(__a, b) __extension__ ({ \
-  float16x4_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 7); })
-#define vst1_f32(__a, b) __extension__ ({ \
-  float32x2_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 8); })
-#define vst1_p8(__a, b) __extension__ ({ \
-  poly8x8_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 4); })
-#define vst1_p16(__a, b) __extension__ ({ \
-  poly16x4_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 5); })
-
-#define vst1q_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x16_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 48); })
-#define vst1q_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x8_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 49); })
-#define vst1q_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x4_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 50); })
-#define vst1q_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x2_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 51); })
-#define vst1q_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x16_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, __b, __c, 32); })
-#define vst1q_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x8_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 33); })
-#define vst1q_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x4_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 34); })
-#define vst1q_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x2_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 35); })
-#define vst1q_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x8_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 39); })
-#define vst1q_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x4_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 40); })
-#define vst1q_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x16_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 36); })
-#define vst1q_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x8_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 37); })
-#define vst1_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x8_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 16); })
-#define vst1_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x4_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 17); })
-#define vst1_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x2_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 18); })
-#define vst1_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x1_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 19); })
-#define vst1_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x8_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, __b, __c, 0); })
-#define vst1_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x4_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 1); })
-#define vst1_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x2_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 2); })
-#define vst1_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x1_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 3); })
-#define vst1_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x4_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 7); })
-#define vst1_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x2_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 8); })
-#define vst1_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x8_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 4); })
-#define vst1_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x4_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 5); })
-
-#define vst2q_u8(__a, b) __extension__ ({ \
-  uint8x16x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 48); })
-#define vst2q_u16(__a, b) __extension__ ({ \
-  uint16x8x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 49); })
-#define vst2q_u32(__a, b) __extension__ ({ \
-  uint32x4x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 50); })
-#define vst2q_s8(__a, b) __extension__ ({ \
-  int8x16x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, __b.val[0], __b.val[1], 32); })
-#define vst2q_s16(__a, b) __extension__ ({ \
-  int16x8x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 33); })
-#define vst2q_s32(__a, b) __extension__ ({ \
-  int32x4x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 34); })
-#define vst2q_f16(__a, b) __extension__ ({ \
-  float16x8x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 39); })
-#define vst2q_f32(__a, b) __extension__ ({ \
-  float32x4x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 40); })
-#define vst2q_p8(__a, b) __extension__ ({ \
-  poly8x16x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 36); })
-#define vst2q_p16(__a, b) __extension__ ({ \
-  poly16x8x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 37); })
-#define vst2_u8(__a, b) __extension__ ({ \
-  uint8x8x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 16); })
-#define vst2_u16(__a, b) __extension__ ({ \
-  uint16x4x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 17); })
-#define vst2_u32(__a, b) __extension__ ({ \
-  uint32x2x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 18); })
-#define vst2_u64(__a, b) __extension__ ({ \
-  uint64x1x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 19); })
-#define vst2_s8(__a, b) __extension__ ({ \
-  int8x8x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, __b.val[0], __b.val[1], 0); })
-#define vst2_s16(__a, b) __extension__ ({ \
-  int16x4x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 1); })
-#define vst2_s32(__a, b) __extension__ ({ \
-  int32x2x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 2); })
-#define vst2_s64(__a, b) __extension__ ({ \
-  int64x1x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 3); })
-#define vst2_f16(__a, b) __extension__ ({ \
-  float16x4x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 7); })
-#define vst2_f32(__a, b) __extension__ ({ \
-  float32x2x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 8); })
-#define vst2_p8(__a, b) __extension__ ({ \
-  poly8x8x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 4); })
-#define vst2_p16(__a, b) __extension__ ({ \
-  poly16x4x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 5); })
-
-#define vst2q_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x8x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 49); })
-#define vst2q_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x4x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 50); })
-#define vst2q_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x8x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 33); })
-#define vst2q_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x4x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 34); })
-#define vst2q_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x8x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 39); })
-#define vst2q_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x4x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 40); })
-#define vst2q_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x8x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 37); })
-#define vst2_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x8x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 16); })
-#define vst2_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x4x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 17); })
-#define vst2_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x2x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 18); })
-#define vst2_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x8x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, __b.val[0], __b.val[1], __c, 0); })
-#define vst2_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x4x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 1); })
-#define vst2_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x2x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 2); })
-#define vst2_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x4x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 7); })
-#define vst2_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x2x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 8); })
-#define vst2_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x8x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 4); })
-#define vst2_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x4x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 5); })
-
-#define vst3q_u8(__a, b) __extension__ ({ \
-  uint8x16x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 48); })
-#define vst3q_u16(__a, b) __extension__ ({ \
-  uint16x8x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 49); })
-#define vst3q_u32(__a, b) __extension__ ({ \
-  uint32x4x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 50); })
-#define vst3q_s8(__a, b) __extension__ ({ \
-  int8x16x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, __b.val[0], __b.val[1], __b.val[2], 32); })
-#define vst3q_s16(__a, b) __extension__ ({ \
-  int16x8x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 33); })
-#define vst3q_s32(__a, b) __extension__ ({ \
-  int32x4x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 34); })
-#define vst3q_f16(__a, b) __extension__ ({ \
-  float16x8x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 39); })
-#define vst3q_f32(__a, b) __extension__ ({ \
-  float32x4x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 40); })
-#define vst3q_p8(__a, b) __extension__ ({ \
-  poly8x16x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 36); })
-#define vst3q_p16(__a, b) __extension__ ({ \
-  poly16x8x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 37); })
-#define vst3_u8(__a, b) __extension__ ({ \
-  uint8x8x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 16); })
-#define vst3_u16(__a, b) __extension__ ({ \
-  uint16x4x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 17); })
-#define vst3_u32(__a, b) __extension__ ({ \
-  uint32x2x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 18); })
-#define vst3_u64(__a, b) __extension__ ({ \
-  uint64x1x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 19); })
-#define vst3_s8(__a, b) __extension__ ({ \
-  int8x8x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, __b.val[0], __b.val[1], __b.val[2], 0); })
-#define vst3_s16(__a, b) __extension__ ({ \
-  int16x4x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 1); })
-#define vst3_s32(__a, b) __extension__ ({ \
-  int32x2x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 2); })
-#define vst3_s64(__a, b) __extension__ ({ \
-  int64x1x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 3); })
-#define vst3_f16(__a, b) __extension__ ({ \
-  float16x4x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 7); })
-#define vst3_f32(__a, b) __extension__ ({ \
-  float32x2x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 8); })
-#define vst3_p8(__a, b) __extension__ ({ \
-  poly8x8x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 4); })
-#define vst3_p16(__a, b) __extension__ ({ \
-  poly16x4x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 5); })
-
-#define vst3q_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x8x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 49); })
-#define vst3q_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x4x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 50); })
-#define vst3q_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x8x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 33); })
-#define vst3q_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x4x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 34); })
-#define vst3q_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x8x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 39); })
-#define vst3q_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x4x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 40); })
-#define vst3q_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x8x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 37); })
-#define vst3_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x8x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 16); })
-#define vst3_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x4x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 17); })
-#define vst3_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x2x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 18); })
-#define vst3_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x8x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, __b.val[0], __b.val[1], __b.val[2], __c, 0); })
-#define vst3_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x4x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 1); })
-#define vst3_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x2x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 2); })
-#define vst3_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x4x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 7); })
-#define vst3_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x2x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 8); })
-#define vst3_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x8x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 4); })
-#define vst3_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x4x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 5); })
-
-#define vst4q_u8(__a, b) __extension__ ({ \
-  uint8x16x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 48); })
-#define vst4q_u16(__a, b) __extension__ ({ \
-  uint16x8x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 49); })
-#define vst4q_u32(__a, b) __extension__ ({ \
-  uint32x4x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 50); })
-#define vst4q_s8(__a, b) __extension__ ({ \
-  int8x16x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], 32); })
-#define vst4q_s16(__a, b) __extension__ ({ \
-  int16x8x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 33); })
-#define vst4q_s32(__a, b) __extension__ ({ \
-  int32x4x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 34); })
-#define vst4q_f16(__a, b) __extension__ ({ \
-  float16x8x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 39); })
-#define vst4q_f32(__a, b) __extension__ ({ \
-  float32x4x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 40); })
-#define vst4q_p8(__a, b) __extension__ ({ \
-  poly8x16x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 36); })
-#define vst4q_p16(__a, b) __extension__ ({ \
-  poly16x8x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 37); })
-#define vst4_u8(__a, b) __extension__ ({ \
-  uint8x8x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 16); })
-#define vst4_u16(__a, b) __extension__ ({ \
-  uint16x4x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 17); })
-#define vst4_u32(__a, b) __extension__ ({ \
-  uint32x2x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 18); })
-#define vst4_u64(__a, b) __extension__ ({ \
-  uint64x1x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 19); })
-#define vst4_s8(__a, b) __extension__ ({ \
-  int8x8x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], 0); })
-#define vst4_s16(__a, b) __extension__ ({ \
-  int16x4x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 1); })
-#define vst4_s32(__a, b) __extension__ ({ \
-  int32x2x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 2); })
-#define vst4_s64(__a, b) __extension__ ({ \
-  int64x1x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 3); })
-#define vst4_f16(__a, b) __extension__ ({ \
-  float16x4x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 7); })
-#define vst4_f32(__a, b) __extension__ ({ \
-  float32x2x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 8); })
-#define vst4_p8(__a, b) __extension__ ({ \
-  poly8x8x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 4); })
-#define vst4_p16(__a, b) __extension__ ({ \
-  poly16x4x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 5); })
-
-#define vst4q_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x8x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 49); })
-#define vst4q_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x4x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 50); })
-#define vst4q_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x8x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 33); })
-#define vst4q_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x4x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 34); })
-#define vst4q_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x8x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 39); })
-#define vst4q_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x4x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 40); })
-#define vst4q_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x8x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 37); })
-#define vst4_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x8x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 16); })
-#define vst4_lane_u16(__a, b, __c) __extension__ ({ \
-  uint16x4x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 17); })
-#define vst4_lane_u32(__a, b, __c) __extension__ ({ \
-  uint32x2x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 18); })
-#define vst4_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x8x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], __c, 0); })
-#define vst4_lane_s16(__a, b, __c) __extension__ ({ \
-  int16x4x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 1); })
-#define vst4_lane_s32(__a, b, __c) __extension__ ({ \
-  int32x2x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 2); })
-#define vst4_lane_f16(__a, b, __c) __extension__ ({ \
-  float16x4x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 7); })
-#define vst4_lane_f32(__a, b, __c) __extension__ ({ \
-  float32x2x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 8); })
-#define vst4_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x8x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 4); })
-#define vst4_lane_p16(__a, b, __c) __extension__ ({ \
-  poly16x4x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 5); })
-
-__ai int8x8_t vsub_s8(int8x8_t __a, int8x8_t __b) {
-  return __a - __b; }
-__ai int16x4_t vsub_s16(int16x4_t __a, int16x4_t __b) {
-  return __a - __b; }
-__ai int32x2_t vsub_s32(int32x2_t __a, int32x2_t __b) {
-  return __a - __b; }
-__ai int64x1_t vsub_s64(int64x1_t __a, int64x1_t __b) {
-  return __a - __b; }
-__ai float32x2_t vsub_f32(float32x2_t __a, float32x2_t __b) {
-  return __a - __b; }
-__ai uint8x8_t vsub_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __a - __b; }
-__ai uint16x4_t vsub_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __a - __b; }
-__ai uint32x2_t vsub_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __a - __b; }
-__ai uint64x1_t vsub_u64(uint64x1_t __a, uint64x1_t __b) {
-  return __a - __b; }
-__ai int8x16_t vsubq_s8(int8x16_t __a, int8x16_t __b) {
-  return __a - __b; }
-__ai int16x8_t vsubq_s16(int16x8_t __a, int16x8_t __b) {
-  return __a - __b; }
-__ai int32x4_t vsubq_s32(int32x4_t __a, int32x4_t __b) {
-  return __a - __b; }
-__ai int64x2_t vsubq_s64(int64x2_t __a, int64x2_t __b) {
-  return __a - __b; }
-__ai float32x4_t vsubq_f32(float32x4_t __a, float32x4_t __b) {
-  return __a - __b; }
-__ai uint8x16_t vsubq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __a - __b; }
-__ai uint16x8_t vsubq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __a - __b; }
-__ai uint32x4_t vsubq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __a - __b; }
-__ai uint64x2_t vsubq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __a - __b; }
-
-__ai int8x8_t vsubhn_s16(int16x8_t __a, int16x8_t __b) {
-  return (int8x8_t)__builtin_neon_vsubhn_v((int8x16_t)__a, (int8x16_t)__b, 0); }
-__ai int16x4_t vsubhn_s32(int32x4_t __a, int32x4_t __b) {
-  return (int16x4_t)__builtin_neon_vsubhn_v((int8x16_t)__a, (int8x16_t)__b, 1); }
-__ai int32x2_t vsubhn_s64(int64x2_t __a, int64x2_t __b) {
-  return (int32x2_t)__builtin_neon_vsubhn_v((int8x16_t)__a, (int8x16_t)__b, 2); }
-__ai uint8x8_t vsubhn_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vsubhn_v((int8x16_t)__a, (int8x16_t)__b, 16); }
-__ai uint16x4_t vsubhn_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vsubhn_v((int8x16_t)__a, (int8x16_t)__b, 17); }
-__ai uint32x2_t vsubhn_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vsubhn_v((int8x16_t)__a, (int8x16_t)__b, 18); }
-
-__ai int16x8_t vsubl_s8(int8x8_t __a, int8x8_t __b) {
-  return vmovl_s8(__a) - vmovl_s8(__b); }
-__ai int32x4_t vsubl_s16(int16x4_t __a, int16x4_t __b) {
-  return vmovl_s16(__a) - vmovl_s16(__b); }
-__ai int64x2_t vsubl_s32(int32x2_t __a, int32x2_t __b) {
-  return vmovl_s32(__a) - vmovl_s32(__b); }
-__ai uint16x8_t vsubl_u8(uint8x8_t __a, uint8x8_t __b) {
-  return vmovl_u8(__a) - vmovl_u8(__b); }
-__ai uint32x4_t vsubl_u16(uint16x4_t __a, uint16x4_t __b) {
-  return vmovl_u16(__a) - vmovl_u16(__b); }
-__ai uint64x2_t vsubl_u32(uint32x2_t __a, uint32x2_t __b) {
-  return vmovl_u32(__a) - vmovl_u32(__b); }
-
-__ai int16x8_t vsubw_s8(int16x8_t __a, int8x8_t __b) {
-  return __a - vmovl_s8(__b); }
-__ai int32x4_t vsubw_s16(int32x4_t __a, int16x4_t __b) {
-  return __a - vmovl_s16(__b); }
-__ai int64x2_t vsubw_s32(int64x2_t __a, int32x2_t __b) {
-  return __a - vmovl_s32(__b); }
-__ai uint16x8_t vsubw_u8(uint16x8_t __a, uint8x8_t __b) {
-  return __a - vmovl_u8(__b); }
-__ai uint32x4_t vsubw_u16(uint32x4_t __a, uint16x4_t __b) {
-  return __a - vmovl_u16(__b); }
-__ai uint64x2_t vsubw_u32(uint64x2_t __a, uint32x2_t __b) {
-  return __a - vmovl_u32(__b); }
-
-__ai uint8x8_t vtbl1_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vtbl1_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai int8x8_t vtbl1_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vtbl1_v(__a, __b, 0); }
-__ai poly8x8_t vtbl1_p8(poly8x8_t __a, uint8x8_t __b) {
-  return (poly8x8_t)__builtin_neon_vtbl1_v((int8x8_t)__a, (int8x8_t)__b, 4); }
-
-__ai uint8x8_t vtbl2_u8(uint8x8x2_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vtbl2_v((int8x8_t)__a.val[0], (int8x8_t)__a.val[1], (int8x8_t)__b, 16); }
-__ai int8x8_t vtbl2_s8(int8x8x2_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vtbl2_v(__a.val[0], __a.val[1], __b, 0); }
-__ai poly8x8_t vtbl2_p8(poly8x8x2_t __a, uint8x8_t __b) {
-  return (poly8x8_t)__builtin_neon_vtbl2_v((int8x8_t)__a.val[0], (int8x8_t)__a.val[1], (int8x8_t)__b, 4); }
-
-__ai uint8x8_t vtbl3_u8(uint8x8x3_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vtbl3_v((int8x8_t)__a.val[0], (int8x8_t)__a.val[1], (int8x8_t)__a.val[2], (int8x8_t)__b, 16); }
-__ai int8x8_t vtbl3_s8(int8x8x3_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vtbl3_v(__a.val[0], __a.val[1], __a.val[2], __b, 0); }
-__ai poly8x8_t vtbl3_p8(poly8x8x3_t __a, uint8x8_t __b) {
-  return (poly8x8_t)__builtin_neon_vtbl3_v((int8x8_t)__a.val[0], (int8x8_t)__a.val[1], (int8x8_t)__a.val[2], (int8x8_t)__b, 4); }
-
-__ai uint8x8_t vtbl4_u8(uint8x8x4_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vtbl4_v((int8x8_t)__a.val[0], (int8x8_t)__a.val[1], (int8x8_t)__a.val[2], (int8x8_t)__a.val[3], (int8x8_t)__b, 16); }
-__ai int8x8_t vtbl4_s8(int8x8x4_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vtbl4_v(__a.val[0], __a.val[1], __a.val[2], __a.val[3], __b, 0); }
-__ai poly8x8_t vtbl4_p8(poly8x8x4_t __a, uint8x8_t __b) {
-  return (poly8x8_t)__builtin_neon_vtbl4_v((int8x8_t)__a.val[0], (int8x8_t)__a.val[1], (int8x8_t)__a.val[2], (int8x8_t)__a.val[3], (int8x8_t)__b, 4); }
-
-__ai uint8x8_t vtbx1_u8(uint8x8_t __a, uint8x8_t __b, uint8x8_t __c) {
-  return (uint8x8_t)__builtin_neon_vtbx1_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 16); }
-__ai int8x8_t vtbx1_s8(int8x8_t __a, int8x8_t __b, int8x8_t __c) {
-  return (int8x8_t)__builtin_neon_vtbx1_v(__a, __b, __c, 0); }
-__ai poly8x8_t vtbx1_p8(poly8x8_t __a, poly8x8_t __b, uint8x8_t __c) {
-  return (poly8x8_t)__builtin_neon_vtbx1_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 4); }
-
-__ai uint8x8_t vtbx2_u8(uint8x8_t __a, uint8x8x2_t __b, uint8x8_t __c) {
-  return (uint8x8_t)__builtin_neon_vtbx2_v((int8x8_t)__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__c, 16); }
-__ai int8x8_t vtbx2_s8(int8x8_t __a, int8x8x2_t __b, int8x8_t __c) {
-  return (int8x8_t)__builtin_neon_vtbx2_v(__a, __b.val[0], __b.val[1], __c, 0); }
-__ai poly8x8_t vtbx2_p8(poly8x8_t __a, poly8x8x2_t __b, uint8x8_t __c) {
-  return (poly8x8_t)__builtin_neon_vtbx2_v((int8x8_t)__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__c, 4); }
-
-__ai uint8x8_t vtbx3_u8(uint8x8_t __a, uint8x8x3_t __b, uint8x8_t __c) {
-  return (uint8x8_t)__builtin_neon_vtbx3_v((int8x8_t)__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__c, 16); }
-__ai int8x8_t vtbx3_s8(int8x8_t __a, int8x8x3_t __b, int8x8_t __c) {
-  return (int8x8_t)__builtin_neon_vtbx3_v(__a, __b.val[0], __b.val[1], __b.val[2], __c, 0); }
-__ai poly8x8_t vtbx3_p8(poly8x8_t __a, poly8x8x3_t __b, uint8x8_t __c) {
-  return (poly8x8_t)__builtin_neon_vtbx3_v((int8x8_t)__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__c, 4); }
-
-__ai uint8x8_t vtbx4_u8(uint8x8_t __a, uint8x8x4_t __b, uint8x8_t __c) {
-  return (uint8x8_t)__builtin_neon_vtbx4_v((int8x8_t)__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], (int8x8_t)__c, 16); }
-__ai int8x8_t vtbx4_s8(int8x8_t __a, int8x8x4_t __b, int8x8_t __c) {
-  return (int8x8_t)__builtin_neon_vtbx4_v(__a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], __c, 0); }
-__ai poly8x8_t vtbx4_p8(poly8x8_t __a, poly8x8x4_t __b, uint8x8_t __c) {
-  return (poly8x8_t)__builtin_neon_vtbx4_v((int8x8_t)__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], (int8x8_t)__c, 4); }
-
-__ai int8x8x2_t vtrn_s8(int8x8_t __a, int8x8_t __b) {
-  int8x8x2_t r; __builtin_neon_vtrn_v(&r, __a, __b, 0); return r; }
-__ai int16x4x2_t vtrn_s16(int16x4_t __a, int16x4_t __b) {
-  int16x4x2_t r; __builtin_neon_vtrn_v(&r, (int8x8_t)__a, (int8x8_t)__b, 1); return r; }
-__ai int32x2x2_t vtrn_s32(int32x2_t __a, int32x2_t __b) {
-  int32x2x2_t r; __builtin_neon_vtrn_v(&r, (int8x8_t)__a, (int8x8_t)__b, 2); return r; }
-__ai uint8x8x2_t vtrn_u8(uint8x8_t __a, uint8x8_t __b) {
-  uint8x8x2_t r; __builtin_neon_vtrn_v(&r, (int8x8_t)__a, (int8x8_t)__b, 16); return r; }
-__ai uint16x4x2_t vtrn_u16(uint16x4_t __a, uint16x4_t __b) {
-  uint16x4x2_t r; __builtin_neon_vtrn_v(&r, (int8x8_t)__a, (int8x8_t)__b, 17); return r; }
-__ai uint32x2x2_t vtrn_u32(uint32x2_t __a, uint32x2_t __b) {
-  uint32x2x2_t r; __builtin_neon_vtrn_v(&r, (int8x8_t)__a, (int8x8_t)__b, 18); return r; }
-__ai float32x2x2_t vtrn_f32(float32x2_t __a, float32x2_t __b) {
-  float32x2x2_t r; __builtin_neon_vtrn_v(&r, (int8x8_t)__a, (int8x8_t)__b, 8); return r; }
-__ai poly8x8x2_t vtrn_p8(poly8x8_t __a, poly8x8_t __b) {
-  poly8x8x2_t r; __builtin_neon_vtrn_v(&r, (int8x8_t)__a, (int8x8_t)__b, 4); return r; }
-__ai poly16x4x2_t vtrn_p16(poly16x4_t __a, poly16x4_t __b) {
-  poly16x4x2_t r; __builtin_neon_vtrn_v(&r, (int8x8_t)__a, (int8x8_t)__b, 5); return r; }
-__ai int8x16x2_t vtrnq_s8(int8x16_t __a, int8x16_t __b) {
-  int8x16x2_t r; __builtin_neon_vtrnq_v(&r, __a, __b, 32); return r; }
-__ai int16x8x2_t vtrnq_s16(int16x8_t __a, int16x8_t __b) {
-  int16x8x2_t r; __builtin_neon_vtrnq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 33); return r; }
-__ai int32x4x2_t vtrnq_s32(int32x4_t __a, int32x4_t __b) {
-  int32x4x2_t r; __builtin_neon_vtrnq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 34); return r; }
-__ai uint8x16x2_t vtrnq_u8(uint8x16_t __a, uint8x16_t __b) {
-  uint8x16x2_t r; __builtin_neon_vtrnq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 48); return r; }
-__ai uint16x8x2_t vtrnq_u16(uint16x8_t __a, uint16x8_t __b) {
-  uint16x8x2_t r; __builtin_neon_vtrnq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 49); return r; }
-__ai uint32x4x2_t vtrnq_u32(uint32x4_t __a, uint32x4_t __b) {
-  uint32x4x2_t r; __builtin_neon_vtrnq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 50); return r; }
-__ai float32x4x2_t vtrnq_f32(float32x4_t __a, float32x4_t __b) {
-  float32x4x2_t r; __builtin_neon_vtrnq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 40); return r; }
-__ai poly8x16x2_t vtrnq_p8(poly8x16_t __a, poly8x16_t __b) {
-  poly8x16x2_t r; __builtin_neon_vtrnq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 36); return r; }
-__ai poly16x8x2_t vtrnq_p16(poly16x8_t __a, poly16x8_t __b) {
-  poly16x8x2_t r; __builtin_neon_vtrnq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 37); return r; }
-
-__ai uint8x8_t vtst_s8(int8x8_t __a, int8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vtst_v(__a, __b, 16); }
-__ai uint16x4_t vtst_s16(int16x4_t __a, int16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vtst_s32(int32x2_t __a, int32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint8x8_t vtst_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vtst_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vtst_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint8x8_t vtst_p8(poly8x8_t __a, poly8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vtst_p16(poly16x4_t __a, poly16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint8x16_t vtstq_s8(int8x16_t __a, int8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vtstq_v(__a, __b, 48); }
-__ai uint16x8_t vtstq_s16(int16x8_t __a, int16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vtstq_s32(int32x4_t __a, int32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint8x16_t vtstq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vtstq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vtstq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint8x16_t vtstq_p8(poly8x16_t __a, poly8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vtstq_p16(poly16x8_t __a, poly16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-
-__ai int8x8x2_t vuzp_s8(int8x8_t __a, int8x8_t __b) {
-  int8x8x2_t r; __builtin_neon_vuzp_v(&r, __a, __b, 0); return r; }
-__ai int16x4x2_t vuzp_s16(int16x4_t __a, int16x4_t __b) {
-  int16x4x2_t r; __builtin_neon_vuzp_v(&r, (int8x8_t)__a, (int8x8_t)__b, 1); return r; }
-__ai int32x2x2_t vuzp_s32(int32x2_t __a, int32x2_t __b) {
-  int32x2x2_t r; __builtin_neon_vuzp_v(&r, (int8x8_t)__a, (int8x8_t)__b, 2); return r; }
-__ai uint8x8x2_t vuzp_u8(uint8x8_t __a, uint8x8_t __b) {
-  uint8x8x2_t r; __builtin_neon_vuzp_v(&r, (int8x8_t)__a, (int8x8_t)__b, 16); return r; }
-__ai uint16x4x2_t vuzp_u16(uint16x4_t __a, uint16x4_t __b) {
-  uint16x4x2_t r; __builtin_neon_vuzp_v(&r, (int8x8_t)__a, (int8x8_t)__b, 17); return r; }
-__ai uint32x2x2_t vuzp_u32(uint32x2_t __a, uint32x2_t __b) {
-  uint32x2x2_t r; __builtin_neon_vuzp_v(&r, (int8x8_t)__a, (int8x8_t)__b, 18); return r; }
-__ai float32x2x2_t vuzp_f32(float32x2_t __a, float32x2_t __b) {
-  float32x2x2_t r; __builtin_neon_vuzp_v(&r, (int8x8_t)__a, (int8x8_t)__b, 8); return r; }
-__ai poly8x8x2_t vuzp_p8(poly8x8_t __a, poly8x8_t __b) {
-  poly8x8x2_t r; __builtin_neon_vuzp_v(&r, (int8x8_t)__a, (int8x8_t)__b, 4); return r; }
-__ai poly16x4x2_t vuzp_p16(poly16x4_t __a, poly16x4_t __b) {
-  poly16x4x2_t r; __builtin_neon_vuzp_v(&r, (int8x8_t)__a, (int8x8_t)__b, 5); return r; }
-__ai int8x16x2_t vuzpq_s8(int8x16_t __a, int8x16_t __b) {
-  int8x16x2_t r; __builtin_neon_vuzpq_v(&r, __a, __b, 32); return r; }
-__ai int16x8x2_t vuzpq_s16(int16x8_t __a, int16x8_t __b) {
-  int16x8x2_t r; __builtin_neon_vuzpq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 33); return r; }
-__ai int32x4x2_t vuzpq_s32(int32x4_t __a, int32x4_t __b) {
-  int32x4x2_t r; __builtin_neon_vuzpq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 34); return r; }
-__ai uint8x16x2_t vuzpq_u8(uint8x16_t __a, uint8x16_t __b) {
-  uint8x16x2_t r; __builtin_neon_vuzpq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 48); return r; }
-__ai uint16x8x2_t vuzpq_u16(uint16x8_t __a, uint16x8_t __b) {
-  uint16x8x2_t r; __builtin_neon_vuzpq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 49); return r; }
-__ai uint32x4x2_t vuzpq_u32(uint32x4_t __a, uint32x4_t __b) {
-  uint32x4x2_t r; __builtin_neon_vuzpq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 50); return r; }
-__ai float32x4x2_t vuzpq_f32(float32x4_t __a, float32x4_t __b) {
-  float32x4x2_t r; __builtin_neon_vuzpq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 40); return r; }
-__ai poly8x16x2_t vuzpq_p8(poly8x16_t __a, poly8x16_t __b) {
-  poly8x16x2_t r; __builtin_neon_vuzpq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 36); return r; }
-__ai poly16x8x2_t vuzpq_p16(poly16x8_t __a, poly16x8_t __b) {
-  poly16x8x2_t r; __builtin_neon_vuzpq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 37); return r; }
-
-__ai int8x8x2_t vzip_s8(int8x8_t __a, int8x8_t __b) {
-  int8x8x2_t r; __builtin_neon_vzip_v(&r, __a, __b, 0); return r; }
-__ai int16x4x2_t vzip_s16(int16x4_t __a, int16x4_t __b) {
-  int16x4x2_t r; __builtin_neon_vzip_v(&r, (int8x8_t)__a, (int8x8_t)__b, 1); return r; }
-__ai int32x2x2_t vzip_s32(int32x2_t __a, int32x2_t __b) {
-  int32x2x2_t r; __builtin_neon_vzip_v(&r, (int8x8_t)__a, (int8x8_t)__b, 2); return r; }
-__ai uint8x8x2_t vzip_u8(uint8x8_t __a, uint8x8_t __b) {
-  uint8x8x2_t r; __builtin_neon_vzip_v(&r, (int8x8_t)__a, (int8x8_t)__b, 16); return r; }
-__ai uint16x4x2_t vzip_u16(uint16x4_t __a, uint16x4_t __b) {
-  uint16x4x2_t r; __builtin_neon_vzip_v(&r, (int8x8_t)__a, (int8x8_t)__b, 17); return r; }
-__ai uint32x2x2_t vzip_u32(uint32x2_t __a, uint32x2_t __b) {
-  uint32x2x2_t r; __builtin_neon_vzip_v(&r, (int8x8_t)__a, (int8x8_t)__b, 18); return r; }
-__ai float32x2x2_t vzip_f32(float32x2_t __a, float32x2_t __b) {
-  float32x2x2_t r; __builtin_neon_vzip_v(&r, (int8x8_t)__a, (int8x8_t)__b, 8); return r; }
-__ai poly8x8x2_t vzip_p8(poly8x8_t __a, poly8x8_t __b) {
-  poly8x8x2_t r; __builtin_neon_vzip_v(&r, (int8x8_t)__a, (int8x8_t)__b, 4); return r; }
-__ai poly16x4x2_t vzip_p16(poly16x4_t __a, poly16x4_t __b) {
-  poly16x4x2_t r; __builtin_neon_vzip_v(&r, (int8x8_t)__a, (int8x8_t)__b, 5); return r; }
-__ai int8x16x2_t vzipq_s8(int8x16_t __a, int8x16_t __b) {
-  int8x16x2_t r; __builtin_neon_vzipq_v(&r, __a, __b, 32); return r; }
-__ai int16x8x2_t vzipq_s16(int16x8_t __a, int16x8_t __b) {
-  int16x8x2_t r; __builtin_neon_vzipq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 33); return r; }
-__ai int32x4x2_t vzipq_s32(int32x4_t __a, int32x4_t __b) {
-  int32x4x2_t r; __builtin_neon_vzipq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 34); return r; }
-__ai uint8x16x2_t vzipq_u8(uint8x16_t __a, uint8x16_t __b) {
-  uint8x16x2_t r; __builtin_neon_vzipq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 48); return r; }
-__ai uint16x8x2_t vzipq_u16(uint16x8_t __a, uint16x8_t __b) {
-  uint16x8x2_t r; __builtin_neon_vzipq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 49); return r; }
-__ai uint32x4x2_t vzipq_u32(uint32x4_t __a, uint32x4_t __b) {
-  uint32x4x2_t r; __builtin_neon_vzipq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 50); return r; }
-__ai float32x4x2_t vzipq_f32(float32x4_t __a, float32x4_t __b) {
-  float32x4x2_t r; __builtin_neon_vzipq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 40); return r; }
-__ai poly8x16x2_t vzipq_p8(poly8x16_t __a, poly8x16_t __b) {
-  poly8x16x2_t r; __builtin_neon_vzipq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 36); return r; }
-__ai poly16x8x2_t vzipq_p16(poly16x8_t __a, poly16x8_t __b) {
-  poly16x8x2_t r; __builtin_neon_vzipq_v(&r, (int8x16_t)__a, (int8x16_t)__b, 37); return r; }
-
-#ifdef __aarch64__
-__ai int16x8_t vmovl_high_s8(int8x16_t __a) {
-  int8x8_t __a1 = vget_high_s8(__a);
-  return (int16x8_t)vshll_n_s8(__a1, 0); }
-__ai int32x4_t vmovl_high_s16(int16x8_t __a) {
-  int16x4_t __a1 = vget_high_s16(__a);
-  return (int32x4_t)vshll_n_s16(__a1, 0); }
-__ai int64x2_t vmovl_high_s32(int32x4_t __a) {
-  int32x2_t __a1 = vget_high_s32(__a);
-  return (int64x2_t)vshll_n_s32(__a1, 0); }
-__ai uint16x8_t vmovl_high_u8(uint8x16_t __a) {
-  uint8x8_t __a1 = vget_high_u8(__a);
-  return (uint16x8_t)vshll_n_u8(__a1, 0); }
-__ai uint32x4_t vmovl_high_u16(uint16x8_t __a) {
-  uint16x4_t __a1 = vget_high_u16(__a);
-  return (uint32x4_t)vshll_n_u16(__a1, 0); }
-__ai uint64x2_t vmovl_high_u32(uint32x4_t __a) {
-  uint32x2_t __a1 = vget_high_u32(__a);
-  return (uint64x2_t)vshll_n_u32(__a1, 0); }
-
-__ai int16x8_t vmull_high_s8(int8x16_t __a, int8x16_t __b) {
-  return vmull_s8(vget_high_s8(__a), vget_high_s8(__b)); }
-__ai int32x4_t vmull_high_s16(int16x8_t __a, int16x8_t __b) {
-  return vmull_s16(vget_high_s16(__a), vget_high_s16(__b)); }
-__ai int64x2_t vmull_high_s32(int32x4_t __a, int32x4_t __b) {
-  return vmull_s32(vget_high_s32(__a), vget_high_s32(__b)); }
-__ai uint16x8_t vmull_high_u8(uint8x16_t __a, uint8x16_t __b) {
-  return vmull_u8(vget_high_u8(__a), vget_high_u8(__b)); }
-__ai uint32x4_t vmull_high_u16(uint16x8_t __a, uint16x8_t __b) {
-  return vmull_u16(vget_high_u16(__a), vget_high_u16(__b)); }
-__ai uint64x2_t vmull_high_u32(uint32x4_t __a, uint32x4_t __b) {
-  return vmull_u32(vget_high_u32(__a), vget_high_u32(__b)); }
-__ai poly16x8_t vmull_high_p8(poly8x16_t __a, poly8x16_t __b) {
-  return vmull_p8(vget_high_p8(__a), vget_high_p8(__b)); }
-
-__ai int16x8_t vabdl_high_s8(int8x16_t __a, int8x16_t __b) {
-  return vabdl_s8(vget_high_s8(__a), vget_high_s8(__b)); }
-__ai int32x4_t vabdl_high_s16(int16x8_t __a, int16x8_t __b) {
-  return vabdl_s16(vget_high_s16(__a), vget_high_s16(__b)); }
-__ai int64x2_t vabdl_high_s32(int32x4_t __a, int32x4_t __b) {
-  return vabdl_s32(vget_high_s32(__a), vget_high_s32(__b)); }
-__ai uint16x8_t vabdl_high_u8(uint8x16_t __a, uint8x16_t __b) {
-  return vabdl_u8(vget_high_u8(__a), vget_high_u8(__b)); }
-__ai uint32x4_t vabdl_high_u16(uint16x8_t __a, uint16x8_t __b) {
-  return vabdl_u16(vget_high_u16(__a), vget_high_u16(__b)); }
-__ai uint64x2_t vabdl_high_u32(uint32x4_t __a, uint32x4_t __b) {
-  return vabdl_u32(vget_high_u32(__a), vget_high_u32(__b)); }
-
-__ai float64x1_t vabd_f64(float64x1_t __a, float64x1_t __b) {
-  return (float64x1_t)__builtin_neon_vabd_v((int8x8_t)__a, (int8x8_t)__b, 9); }
-__ai float64x2_t vabdq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vabdq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai int64x1_t vabs_s64(int64x1_t __a) {
-  return (int64x1_t)__builtin_neon_vabs_v((int8x8_t)__a, 3); }
-__ai float64x1_t vabs_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vabs_v((int8x8_t)__a, 9); }
-__ai int64x2_t vabsq_s64(int64x2_t __a) {
-  return (int64x2_t)__builtin_neon_vabsq_v((int8x16_t)__a, 35); }
-__ai float64x2_t vabsq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vabsq_v((int8x16_t)__a, 41); }
-
-__ai float64x1_t vadd_f64(float64x1_t __a, float64x1_t __b) {
-  return __a + __b; }
-__ai float64x2_t vaddq_f64(float64x2_t __a, float64x2_t __b) {
-  return __a + __b; }
-
-__ai int8x16_t vpaddq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vpaddq_v(__a, __b, 32); }
-__ai int16x8_t vpaddq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vpaddq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vpaddq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vpaddq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai int64x2_t vpaddq_s64(int64x2_t __a, int64x2_t __b) {
-  return (int64x2_t)__builtin_neon_vpaddq_v((int8x16_t)__a, (int8x16_t)__b, 35); }
-__ai uint8x16_t vpaddq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vpaddq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vpaddq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vpaddq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vpaddq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vpaddq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint64x2_t vpaddq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vpaddq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-__ai float32x4_t vpaddq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vpaddq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-__ai float64x2_t vpaddq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vpaddq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai float64x1_t vbsl_f64(uint64x1_t __a, float64x1_t __b, float64x1_t __c) {
-  return (float64x1_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 9); }
-__ai float64x2_t vbslq_f64(uint64x2_t __a, float64x2_t __b, float64x2_t __c) {
-  return (float64x2_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 41); }
-__ai poly64x1_t vbsl_p64(uint64x1_t __a, poly64x1_t __b, poly64x1_t __c) {
-  return (poly64x1_t)__builtin_neon_vbsl_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 6); }
-__ai poly64x2_t vbslq_p64(uint64x2_t __a, poly64x2_t __b, poly64x2_t __c) {
-  return (poly64x2_t)__builtin_neon_vbslq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 38); }
-
-__ai uint64x1_t vceq_s64(int64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)(__a == __b); }
-__ai uint64x1_t vceq_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x1_t)(__a == __b); }
-__ai uint64x1_t vceq_f64(float64x1_t __a, float64x1_t __b) {
-  return (uint64x1_t)(__a == __b); }
-__ai uint64x2_t vceqq_f64(float64x2_t __a, float64x2_t __b) {
-  return (uint64x2_t)(__a == __b); }
-__ai uint64x2_t vceqq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)(__a == __b); }
-__ai uint64x2_t vceqq_s64(int64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)(__a == __b); }
-__ai uint64x1_t vceq_p64(poly64x1_t __a, poly64x1_t __b) {
-  return (uint64x1_t)(__a == __b); }
-__ai uint64x2_t vceqq_p64(poly64x2_t __a, poly64x2_t __b) {
-  return (uint64x2_t)(__a == __b); }
-
-__ai uint64x1_t vcge_s64(int64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)(__a >= __b); }
-__ai uint64x1_t vcge_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x1_t)(__a >= __b); }
-__ai uint64x2_t vcgeq_s64(int64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)(__a >= __b); }
-__ai uint64x2_t vcgeq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)(__a >= __b); }
-__ai uint64x1_t vcge_f64(float64x1_t __a, float64x1_t __b) {
-  return (uint64x1_t)(__a >= __b); }
-__ai uint64x2_t vcgeq_f64(float64x2_t __a, float64x2_t __b) {
-  return (uint64x2_t)(__a >= __b); }
-
-__ai uint64x1_t vcgt_s64(int64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)(__a > __b); }
-__ai uint64x1_t vcgt_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x1_t)(__a > __b); }
-__ai uint64x2_t vcgtq_s64(int64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)(__a > __b); }
-__ai uint64x2_t vcgtq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)(__a > __b); }
-__ai uint64x1_t vcgt_f64(float64x1_t __a, float64x1_t __b) {
-  return (uint64x1_t)(__a > __b); }
-__ai uint64x2_t vcgtq_f64(float64x2_t __a, float64x2_t __b) {
-  return (uint64x2_t)(__a > __b); }
-
-__ai uint64x1_t vcle_s64(int64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)(__a <= __b); }
-__ai uint64x1_t vcle_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x1_t)(__a <= __b); }
-__ai uint64x2_t vcleq_s64(int64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)(__a <= __b); }
-__ai uint64x2_t vcleq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)(__a <= __b); }
-__ai uint64x1_t vcle_f64(float64x1_t __a, float64x1_t __b) {
-  return (uint64x1_t)(__a <= __b); }
-__ai uint64x2_t vcleq_f64(float64x2_t __a, float64x2_t __b) {
-  return (uint64x2_t)(__a <= __b); }
-
-__ai uint64x1_t vclt_s64(int64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)(__a < __b); }
-__ai uint64x1_t vclt_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x1_t)(__a < __b); }
-__ai uint64x2_t vcltq_s64(int64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)(__a < __b); }
-__ai uint64x2_t vcltq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)(__a < __b); }
-__ai uint64x1_t vclt_f64(float64x1_t __a, float64x1_t __b) {
-  return (uint64x1_t)(__a < __b); }
-__ai uint64x2_t vcltq_f64(float64x2_t __a, float64x2_t __b) {
-  return (uint64x2_t)(__a < __b); }
-
-__ai uint8x8_t vceqz_s8(int8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vceqz_v(__a, 16); }
-__ai uint16x4_t vceqz_s16(int16x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vceqz_v((int8x8_t)__a, 17); }
-__ai uint32x2_t vceqz_s32(int32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vceqz_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vceqz_s64(int64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vceqz_v((int8x8_t)__a, 19); }
-__ai uint32x2_t vceqz_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vceqz_v((int8x8_t)__a, 18); }
-__ai uint8x8_t vceqz_u8(uint8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vceqz_v((int8x8_t)__a, 16); }
-__ai uint16x4_t vceqz_u16(uint16x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vceqz_v((int8x8_t)__a, 17); }
-__ai uint32x2_t vceqz_u32(uint32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vceqz_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vceqz_u64(uint64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vceqz_v((int8x8_t)__a, 19); }
-__ai uint8x8_t vceqz_p8(poly8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vceqz_v((int8x8_t)__a, 16); }
-__ai uint16x4_t vceqz_p16(poly16x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vceqz_v((int8x8_t)__a, 17); }
-__ai uint64x1_t vceqz_p64(poly64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vceqz_v((int8x8_t)__a, 19); }
-__ai uint8x16_t vceqzq_s8(int8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vceqzq_v(__a, 48); }
-__ai uint16x8_t vceqzq_s16(int16x8_t __a) {
-  return (uint16x8_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 49); }
-__ai uint32x4_t vceqzq_s32(int32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vceqzq_s64(int64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 51); }
-__ai uint32x4_t vceqzq_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 50); }
-__ai uint8x16_t vceqzq_u8(uint8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 48); }
-__ai uint16x8_t vceqzq_u16(uint16x8_t __a) {
-  return (uint16x8_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 49); }
-__ai uint32x4_t vceqzq_u32(uint32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vceqzq_u64(uint64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 51); }
-__ai uint8x16_t vceqzq_p8(poly8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 48); }
-__ai uint16x8_t vceqzq_p16(poly16x8_t __a) {
-  return (uint16x8_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 49); }
-__ai uint64x1_t vceqz_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vceqz_v((int8x8_t)__a, 19); }
-__ai uint64x2_t vceqzq_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 51); }
-__ai uint64x2_t vceqzq_p64(poly64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vceqzq_v((int8x16_t)__a, 51); }
-
-__ai uint8x8_t vcgez_s8(int8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vcgez_v(__a, 16); }
-__ai uint16x4_t vcgez_s16(int16x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vcgez_v((int8x8_t)__a, 17); }
-__ai uint32x2_t vcgez_s32(int32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcgez_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vcgez_s64(int64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcgez_v((int8x8_t)__a, 19); }
-__ai uint32x2_t vcgez_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcgez_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vcgez_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcgez_v((int8x8_t)__a, 19); }
-__ai uint8x16_t vcgezq_s8(int8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vcgezq_v(__a, 48); }
-__ai uint16x8_t vcgezq_s16(int16x8_t __a) {
-  return (uint16x8_t)__builtin_neon_vcgezq_v((int8x16_t)__a, 49); }
-__ai uint32x4_t vcgezq_s32(int32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcgezq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vcgezq_s64(int64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcgezq_v((int8x16_t)__a, 51); }
-__ai uint32x4_t vcgezq_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcgezq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vcgezq_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcgezq_v((int8x16_t)__a, 51); }
-
-__ai uint8x8_t vcgtz_s8(int8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vcgtz_v(__a, 16); }
-__ai uint16x4_t vcgtz_s16(int16x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vcgtz_v((int8x8_t)__a, 17); }
-__ai uint32x2_t vcgtz_s32(int32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcgtz_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vcgtz_s64(int64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcgtz_v((int8x8_t)__a, 19); }
-__ai uint32x2_t vcgtz_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcgtz_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vcgtz_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcgtz_v((int8x8_t)__a, 19); }
-__ai uint8x16_t vcgtzq_s8(int8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vcgtzq_v(__a, 48); }
-__ai uint16x8_t vcgtzq_s16(int16x8_t __a) {
-  return (uint16x8_t)__builtin_neon_vcgtzq_v((int8x16_t)__a, 49); }
-__ai uint32x4_t vcgtzq_s32(int32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcgtzq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vcgtzq_s64(int64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcgtzq_v((int8x16_t)__a, 51); }
-__ai uint32x4_t vcgtzq_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcgtzq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vcgtzq_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcgtzq_v((int8x16_t)__a, 51); }
-
-__ai uint8x8_t vclez_s8(int8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vclez_v(__a, 16); }
-__ai uint16x4_t vclez_s16(int16x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vclez_v((int8x8_t)__a, 17); }
-__ai uint32x2_t vclez_s32(int32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vclez_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vclez_s64(int64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vclez_v((int8x8_t)__a, 19); }
-__ai uint32x2_t vclez_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vclez_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vclez_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vclez_v((int8x8_t)__a, 19); }
-__ai uint8x16_t vclezq_s8(int8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vclezq_v(__a, 48); }
-__ai uint16x8_t vclezq_s16(int16x8_t __a) {
-  return (uint16x8_t)__builtin_neon_vclezq_v((int8x16_t)__a, 49); }
-__ai uint32x4_t vclezq_s32(int32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vclezq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vclezq_s64(int64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vclezq_v((int8x16_t)__a, 51); }
-__ai uint32x4_t vclezq_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vclezq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vclezq_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vclezq_v((int8x16_t)__a, 51); }
-
-__ai uint8x8_t vcltz_s8(int8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vcltz_v(__a, 16); }
-__ai uint16x4_t vcltz_s16(int16x4_t __a) {
-  return (uint16x4_t)__builtin_neon_vcltz_v((int8x8_t)__a, 17); }
-__ai uint32x2_t vcltz_s32(int32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcltz_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vcltz_s64(int64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcltz_v((int8x8_t)__a, 19); }
-__ai uint32x2_t vcltz_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcltz_v((int8x8_t)__a, 18); }
-__ai uint64x1_t vcltz_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcltz_v((int8x8_t)__a, 19); }
-__ai uint8x16_t vcltzq_s8(int8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vcltzq_v(__a, 48); }
-__ai uint16x8_t vcltzq_s16(int16x8_t __a) {
-  return (uint16x8_t)__builtin_neon_vcltzq_v((int8x16_t)__a, 49); }
-__ai uint32x4_t vcltzq_s32(int32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcltzq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vcltzq_s64(int64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcltzq_v((int8x16_t)__a, 51); }
-__ai uint32x4_t vcltzq_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcltzq_v((int8x16_t)__a, 50); }
-__ai uint64x2_t vcltzq_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcltzq_v((int8x16_t)__a, 51); }
-
-__ai uint64x1_t vtst_s64(int64x1_t __a, int64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai uint64x1_t vtst_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai uint64x2_t vtstq_s64(int64x2_t __a, int64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-__ai uint64x2_t vtstq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-__ai uint64x1_t vtst_p64(poly64x1_t __a, poly64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vtst_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai uint64x2_t vtstq_p64(poly64x2_t __a, poly64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vtstq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-__ai float64x2_t vcombine_f64(float64x1_t __a, float64x1_t __b) {
-  return (float64x2_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-__ai poly64x2_t vcombine_p64(poly64x1_t __a, poly64x1_t __b) {
-  return (poly64x2_t)__builtin_shufflevector((int64x1_t)__a, (int64x1_t)__b, 0, 1); }
-
-#define vcopyq_lane_s8(a1, __b1, c1, __d1) __extension__ ({ \
-  int8x16_t __a1 = (a1); int8x8_t __c1 = (c1); \
-  int8_t __c2 = vget_lane_s8(__c1, __d1); \
-  vsetq_lane_s8(__c2, __a1, __b1); })
-#define vcopyq_lane_s16(a1, __b1, c1, __d1) __extension__ ({ \
-  int16x8_t __a1 = (a1); int16x4_t __c1 = (c1); \
-  int16_t __c2 = vget_lane_s16(__c1, __d1); \
-  vsetq_lane_s16(__c2, __a1, __b1); })
-#define vcopyq_lane_s32(a1, __b1, c1, __d1) __extension__ ({ \
-  int32x4_t __a1 = (a1); int32x2_t __c1 = (c1); \
-  int32_t __c2 = vget_lane_s32(__c1, __d1); \
-  vsetq_lane_s32(__c2, __a1, __b1); })
-#define vcopyq_lane_s64(a1, __b1, c1, __d1) __extension__ ({ \
-  int64x2_t __a1 = (a1); int64x1_t __c1 = (c1); \
-  int64_t __c2 = vget_lane_s64(__c1, __d1); \
-  vsetq_lane_s64(__c2, __a1, __b1); })
-#define vcopyq_lane_u8(a1, __b1, c1, __d1) __extension__ ({ \
-  uint8x16_t __a1 = (a1); uint8x8_t __c1 = (c1); \
-  uint8_t __c2 = vget_lane_u8(__c1, __d1); \
-  vsetq_lane_u8(__c2, __a1, __b1); })
-#define vcopyq_lane_u16(a1, __b1, c1, __d1) __extension__ ({ \
-  uint16x8_t __a1 = (a1); uint16x4_t __c1 = (c1); \
-  uint16_t __c2 = vget_lane_u16(__c1, __d1); \
-  vsetq_lane_u16(__c2, __a1, __b1); })
-#define vcopyq_lane_u32(a1, __b1, c1, __d1) __extension__ ({ \
-  uint32x4_t __a1 = (a1); uint32x2_t __c1 = (c1); \
-  uint32_t __c2 = vget_lane_u32(__c1, __d1); \
-  vsetq_lane_u32(__c2, __a1, __b1); })
-#define vcopyq_lane_u64(a1, __b1, c1, __d1) __extension__ ({ \
-  uint64x2_t __a1 = (a1); uint64x1_t __c1 = (c1); \
-  uint64_t __c2 = vget_lane_u64(__c1, __d1); \
-  vsetq_lane_u64(__c2, __a1, __b1); })
-#define vcopyq_lane_p8(a1, __b1, c1, __d1) __extension__ ({ \
-  poly8x16_t __a1 = (a1); poly8x8_t __c1 = (c1); \
-  poly8_t __c2 = vget_lane_p8(__c1, __d1); \
-  vsetq_lane_p8(__c2, __a1, __b1); })
-#define vcopyq_lane_p16(a1, __b1, c1, __d1) __extension__ ({ \
-  poly16x8_t __a1 = (a1); poly16x4_t __c1 = (c1); \
-  poly16_t __c2 = vget_lane_p16(__c1, __d1); \
-  vsetq_lane_p16(__c2, __a1, __b1); })
-#define vcopyq_lane_f32(a1, __b1, c1, __d1) __extension__ ({ \
-  float32x4_t __a1 = (a1); float32x2_t __c1 = (c1); \
-  float32_t __c2 = vget_lane_f32(__c1, __d1); \
-  vsetq_lane_f32(__c2, __a1, __b1); })
-#define vcopyq_lane_f64(a1, __b1, c1, __d1) __extension__ ({ \
-  float64x2_t __a1 = (a1); float64x1_t __c1 = (c1); \
-  float64_t __c2 = vget_lane_f64(__c1, __d1); \
-  vsetq_lane_f64(__c2, __a1, __b1); })
-#define vcopyq_lane_p64(a1, __b1, c1, __d1) __extension__ ({ \
-  poly64x2_t __a1 = (a1); poly64x1_t __c1 = (c1); \
-  poly64_t __c2 = vget_lane_p64(__c1, __d1); \
-  vsetq_lane_p64(__c2, __a1, __b1); })
-
-#define vcopyq_laneq_s8(a1, __b1, c1, __d1) __extension__ ({ \
-  int8x16_t __a1 = (a1); int8x16_t __c1 = (c1); \
-  int8_t __c2 = vgetq_lane_s8(__c1, __d1); \
-  vsetq_lane_s8(__c2, __a1, __b1); })
-#define vcopyq_laneq_s16(a1, __b1, c1, __d1) __extension__ ({ \
-  int16x8_t __a1 = (a1); int16x8_t __c1 = (c1); \
-  int16_t __c2 = vgetq_lane_s16(__c1, __d1); \
-  vsetq_lane_s16(__c2, __a1, __b1); })
-#define vcopyq_laneq_s32(a1, __b1, c1, __d1) __extension__ ({ \
-  int32x4_t __a1 = (a1); int32x4_t __c1 = (c1); \
-  int32_t __c2 = vgetq_lane_s32(__c1, __d1); \
-  vsetq_lane_s32(__c2, __a1, __b1); })
-#define vcopyq_laneq_s64(a1, __b1, c1, __d1) __extension__ ({ \
-  int64x2_t __a1 = (a1); int64x2_t __c1 = (c1); \
-  int64_t __c2 = vgetq_lane_s64(__c1, __d1); \
-  vsetq_lane_s64(__c2, __a1, __b1); })
-#define vcopyq_laneq_u8(a1, __b1, c1, __d1) __extension__ ({ \
-  uint8x16_t __a1 = (a1); uint8x16_t __c1 = (c1); \
-  uint8_t __c2 = vgetq_lane_u8(__c1, __d1); \
-  vsetq_lane_u8(__c2, __a1, __b1); })
-#define vcopyq_laneq_u16(a1, __b1, c1, __d1) __extension__ ({ \
-  uint16x8_t __a1 = (a1); uint16x8_t __c1 = (c1); \
-  uint16_t __c2 = vgetq_lane_u16(__c1, __d1); \
-  vsetq_lane_u16(__c2, __a1, __b1); })
-#define vcopyq_laneq_u32(a1, __b1, c1, __d1) __extension__ ({ \
-  uint32x4_t __a1 = (a1); uint32x4_t __c1 = (c1); \
-  uint32_t __c2 = vgetq_lane_u32(__c1, __d1); \
-  vsetq_lane_u32(__c2, __a1, __b1); })
-#define vcopyq_laneq_u64(a1, __b1, c1, __d1) __extension__ ({ \
-  uint64x2_t __a1 = (a1); uint64x2_t __c1 = (c1); \
-  uint64_t __c2 = vgetq_lane_u64(__c1, __d1); \
-  vsetq_lane_u64(__c2, __a1, __b1); })
-#define vcopyq_laneq_p8(a1, __b1, c1, __d1) __extension__ ({ \
-  poly8x16_t __a1 = (a1); poly8x16_t __c1 = (c1); \
-  poly8_t __c2 = vgetq_lane_p8(__c1, __d1); \
-  vsetq_lane_p8(__c2, __a1, __b1); })
-#define vcopyq_laneq_p16(a1, __b1, c1, __d1) __extension__ ({ \
-  poly16x8_t __a1 = (a1); poly16x8_t __c1 = (c1); \
-  poly16_t __c2 = vgetq_lane_p16(__c1, __d1); \
-  vsetq_lane_p16(__c2, __a1, __b1); })
-#define vcopyq_laneq_f32(a1, __b1, c1, __d1) __extension__ ({ \
-  float32x4_t __a1 = (a1); float32x4_t __c1 = (c1); \
-  float32_t __c2 = vgetq_lane_f32(__c1, __d1); \
-  vsetq_lane_f32(__c2, __a1, __b1); })
-#define vcopyq_laneq_f64(a1, __b1, c1, __d1) __extension__ ({ \
-  float64x2_t __a1 = (a1); float64x2_t __c1 = (c1); \
-  float64_t __c2 = vgetq_lane_f64(__c1, __d1); \
-  vsetq_lane_f64(__c2, __a1, __b1); })
-#define vcopyq_laneq_p64(a1, __b1, c1, __d1) __extension__ ({ \
-  poly64x2_t __a1 = (a1); poly64x2_t __c1 = (c1); \
-  poly64_t __c2 = vgetq_lane_p64(__c1, __d1); \
-  vsetq_lane_p64(__c2, __a1, __b1); })
-
-#define vcopy_lane_s8(a1, __b1, c1, __d1) __extension__ ({ \
-  int8x8_t __a1 = (a1); int8x8_t __c1 = (c1); \
-  int8_t __c2 = vget_lane_s8(__c1, __d1); \
-  vset_lane_s8(__c2, __a1, __b1); })
-#define vcopy_lane_s16(a1, __b1, c1, __d1) __extension__ ({ \
-  int16x4_t __a1 = (a1); int16x4_t __c1 = (c1); \
-  int16_t __c2 = vget_lane_s16(__c1, __d1); \
-  vset_lane_s16(__c2, __a1, __b1); })
-#define vcopy_lane_s32(a1, __b1, c1, __d1) __extension__ ({ \
-  int32x2_t __a1 = (a1); int32x2_t __c1 = (c1); \
-  int32_t __c2 = vget_lane_s32(__c1, __d1); \
-  vset_lane_s32(__c2, __a1, __b1); })
-#define vcopy_lane_s64(a1, __b1, c1, __d1) __extension__ ({ \
-  int64x1_t __a1 = (a1); int64x1_t __c1 = (c1); \
-  int64_t __c2 = vget_lane_s64(__c1, __d1); \
-  vset_lane_s64(__c2, __a1, __b1); })
-#define vcopy_lane_p8(a1, __b1, c1, __d1) __extension__ ({ \
-  poly8x8_t __a1 = (a1); poly8x8_t __c1 = (c1); \
-  poly8_t __c2 = vget_lane_p8(__c1, __d1); \
-  vset_lane_p8(__c2, __a1, __b1); })
-#define vcopy_lane_p16(a1, __b1, c1, __d1) __extension__ ({ \
-  poly16x4_t __a1 = (a1); poly16x4_t __c1 = (c1); \
-  poly16_t __c2 = vget_lane_p16(__c1, __d1); \
-  vset_lane_p16(__c2, __a1, __b1); })
-#define vcopy_lane_u8(a1, __b1, c1, __d1) __extension__ ({ \
-  uint8x8_t __a1 = (a1); uint8x8_t __c1 = (c1); \
-  uint8_t __c2 = vget_lane_u8(__c1, __d1); \
-  vset_lane_u8(__c2, __a1, __b1); })
-#define vcopy_lane_u16(a1, __b1, c1, __d1) __extension__ ({ \
-  uint16x4_t __a1 = (a1); uint16x4_t __c1 = (c1); \
-  uint16_t __c2 = vget_lane_u16(__c1, __d1); \
-  vset_lane_u16(__c2, __a1, __b1); })
-#define vcopy_lane_u32(a1, __b1, c1, __d1) __extension__ ({ \
-  uint32x2_t __a1 = (a1); uint32x2_t __c1 = (c1); \
-  uint32_t __c2 = vget_lane_u32(__c1, __d1); \
-  vset_lane_u32(__c2, __a1, __b1); })
-#define vcopy_lane_u64(a1, __b1, c1, __d1) __extension__ ({ \
-  uint64x1_t __a1 = (a1); uint64x1_t __c1 = (c1); \
-  uint64_t __c2 = vget_lane_u64(__c1, __d1); \
-  vset_lane_u64(__c2, __a1, __b1); })
-#define vcopy_lane_p64(a1, __b1, c1, __d1) __extension__ ({ \
-  poly64x1_t __a1 = (a1); poly64x1_t __c1 = (c1); \
-  poly64_t __c2 = vget_lane_p64(__c1, __d1); \
-  vset_lane_p64(__c2, __a1, __b1); })
-#define vcopy_lane_f32(a1, __b1, c1, __d1) __extension__ ({ \
-  float32x2_t __a1 = (a1); float32x2_t __c1 = (c1); \
-  float32_t __c2 = vget_lane_f32(__c1, __d1); \
-  vset_lane_f32(__c2, __a1, __b1); })
-#define vcopy_lane_f64(a1, __b1, c1, __d1) __extension__ ({ \
-  float64x1_t __a1 = (a1); float64x1_t __c1 = (c1); \
-  float64_t __c2 = vget_lane_f64(__c1, __d1); \
-  vset_lane_f64(__c2, __a1, __b1); })
-
-#define vcopy_laneq_s8(a1, __b1, c1, __d1) __extension__ ({ \
-  int8x8_t __a1 = (a1); int8x16_t __c1 = (c1); \
-  int8_t __c2 = vgetq_lane_s8(__c1, __d1); \
-  vset_lane_s8(__c2, __a1, __b1); })
-#define vcopy_laneq_s16(a1, __b1, c1, __d1) __extension__ ({ \
-  int16x4_t __a1 = (a1); int16x8_t __c1 = (c1); \
-  int16_t __c2 = vgetq_lane_s16(__c1, __d1); \
-  vset_lane_s16(__c2, __a1, __b1); })
-#define vcopy_laneq_s32(a1, __b1, c1, __d1) __extension__ ({ \
-  int32x2_t __a1 = (a1); int32x4_t __c1 = (c1); \
-  int32_t __c2 = vgetq_lane_s32(__c1, __d1); \
-  vset_lane_s32(__c2, __a1, __b1); })
-#define vcopy_laneq_s64(a1, __b1, c1, __d1) __extension__ ({ \
-  int64x1_t __a1 = (a1); int64x2_t __c1 = (c1); \
-  int64_t __c2 = vgetq_lane_s64(__c1, __d1); \
-  vset_lane_s64(__c2, __a1, __b1); })
-#define vcopy_laneq_p8(a1, __b1, c1, __d1) __extension__ ({ \
-  poly8x8_t __a1 = (a1); poly8x16_t __c1 = (c1); \
-  poly8_t __c2 = vgetq_lane_p8(__c1, __d1); \
-  vset_lane_p8(__c2, __a1, __b1); })
-#define vcopy_laneq_p16(a1, __b1, c1, __d1) __extension__ ({ \
-  poly16x4_t __a1 = (a1); poly16x8_t __c1 = (c1); \
-  poly16_t __c2 = vgetq_lane_p16(__c1, __d1); \
-  vset_lane_p16(__c2, __a1, __b1); })
-#define vcopy_laneq_p64(a1, __b1, c1, __d1) __extension__ ({ \
-  poly64x1_t __a1 = (a1); poly64x2_t __c1 = (c1); \
-  poly64_t __c2 = vgetq_lane_p64(__c1, __d1); \
-  vset_lane_p64(__c2, __a1, __b1); })
-#define vcopy_laneq_u8(a1, __b1, c1, __d1) __extension__ ({ \
-  uint8x8_t __a1 = (a1); uint8x16_t __c1 = (c1); \
-  uint8_t __c2 = vgetq_lane_u8(__c1, __d1); \
-  vset_lane_u8(__c2, __a1, __b1); })
-#define vcopy_laneq_u16(a1, __b1, c1, __d1) __extension__ ({ \
-  uint16x4_t __a1 = (a1); uint16x8_t __c1 = (c1); \
-  uint16_t __c2 = vgetq_lane_u16(__c1, __d1); \
-  vset_lane_u16(__c2, __a1, __b1); })
-#define vcopy_laneq_u32(a1, __b1, c1, __d1) __extension__ ({ \
-  uint32x2_t __a1 = (a1); uint32x4_t __c1 = (c1); \
-  uint32_t __c2 = vgetq_lane_u32(__c1, __d1); \
-  vset_lane_u32(__c2, __a1, __b1); })
-#define vcopy_laneq_u64(a1, __b1, c1, __d1) __extension__ ({ \
-  uint64x1_t __a1 = (a1); uint64x2_t __c1 = (c1); \
-  uint64_t __c2 = vgetq_lane_u64(__c1, __d1); \
-  vset_lane_u64(__c2, __a1, __b1); })
-#define vcopy_laneq_f32(a1, __b1, c1, __d1) __extension__ ({ \
-  float32x2_t __a1 = (a1); float32x4_t __c1 = (c1); \
-  float32_t __c2 = vgetq_lane_f32(__c1, __d1); \
-  vset_lane_f32(__c2, __a1, __b1); })
-#define vcopy_laneq_f64(a1, __b1, c1, __d1) __extension__ ({ \
-  float64x1_t __a1 = (a1); float64x2_t __c1 = (c1); \
-  float64_t __c2 = vgetq_lane_f64(__c1, __d1); \
-  vset_lane_f64(__c2, __a1, __b1); })
-
-__ai float64x1_t vcreate_f64(uint64_t __a) {
-  return (float64x1_t)__a; }
-__ai poly64x1_t vcreate_p64(uint64_t __a) {
-  return (poly64x1_t)__a; }
-
-#define vcvt_n_f64_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  (float64x1_t)__builtin_neon_vcvt_n_f64_v((int8x8_t)__a, __b, 3); })
-#define vcvt_n_f64_u64(a, __b) __extension__ ({ \
-  uint64x1_t __a = (a); \
-  (float64x1_t)__builtin_neon_vcvt_n_f64_v((int8x8_t)__a, __b, 19); })
-#define vcvtq_n_f64_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (float64x2_t)__builtin_neon_vcvtq_n_f64_v((int8x16_t)__a, __b, 35); })
-#define vcvtq_n_f64_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (float64x2_t)__builtin_neon_vcvtq_n_f64_v((int8x16_t)__a, __b, 51); })
-
-__ai float64x1_t vdup_n_f64(float64_t __a) {
-  return (float64x1_t){ __a }; }
-__ai float64x2_t vdupq_n_f64(float64_t __a) {
-  return (float64x2_t){ __a, __a }; }
-__ai poly64x1_t vdup_n_p64(poly64_t __a) {
-  return (poly64x1_t){ __a }; }
-__ai poly64x2_t vdupq_n_p64(poly64_t __a) {
-  return (poly64x2_t){ __a, __a }; }
-
-__ai uint64x1_t vcage_f64(float64x1_t __a, float64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vcage_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai uint64x2_t vcageq_f64(float64x2_t __a, float64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vcageq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-__ai uint64x1_t vcagt_f64(float64x1_t __a, float64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vcagt_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai uint64x2_t vcagtq_f64(float64x2_t __a, float64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vcagtq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-__ai uint64x1_t vcale_f64(float64x1_t __a, float64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vcale_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai uint64x2_t vcaleq_f64(float64x2_t __a, float64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vcaleq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-__ai uint64x1_t vcalt_f64(float64x1_t __a, float64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vcalt_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai uint64x2_t vcaltq_f64(float64x2_t __a, float64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vcaltq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-__ai int32x2_t vcvta_s32_f32(float32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vcvta_s32_v((int8x8_t)__a, 2); }
-__ai int32x4_t vcvtaq_s32_f32(float32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vcvtaq_s32_v((int8x16_t)__a, 34); }
-
-__ai int64x1_t vcvta_s64_f64(float64x1_t __a) {
-  return (int64x1_t)__builtin_neon_vcvta_s64_v((int8x8_t)__a, 3); }
-__ai int64x2_t vcvtaq_s64_f64(float64x2_t __a) {
-  return (int64x2_t)__builtin_neon_vcvtaq_s64_v((int8x16_t)__a, 35); }
-
-__ai uint32x2_t vcvta_u32_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcvta_u32_v((int8x8_t)__a, 18); }
-__ai uint32x4_t vcvtaq_u32_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcvtaq_u32_v((int8x16_t)__a, 50); }
-
-__ai uint64x1_t vcvta_u64_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcvta_u64_v((int8x8_t)__a, 19); }
-__ai uint64x2_t vcvtaq_u64_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcvtaq_u64_v((int8x16_t)__a, 51); }
-
-__ai int32x2_t vcvtm_s32_f32(float32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vcvtm_s32_v((int8x8_t)__a, 2); }
-__ai int32x4_t vcvtmq_s32_f32(float32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vcvtmq_s32_v((int8x16_t)__a, 34); }
-
-__ai int64x1_t vcvtm_s64_f64(float64x1_t __a) {
-  return (int64x1_t)__builtin_neon_vcvtm_s64_v((int8x8_t)__a, 3); }
-__ai int64x2_t vcvtmq_s64_f64(float64x2_t __a) {
-  return (int64x2_t)__builtin_neon_vcvtmq_s64_v((int8x16_t)__a, 35); }
-
-__ai uint32x2_t vcvtm_u32_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcvtm_u32_v((int8x8_t)__a, 18); }
-__ai uint32x4_t vcvtmq_u32_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcvtmq_u32_v((int8x16_t)__a, 50); }
-
-__ai uint64x1_t vcvtm_u64_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcvtm_u64_v((int8x8_t)__a, 19); }
-__ai uint64x2_t vcvtmq_u64_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcvtmq_u64_v((int8x16_t)__a, 51); }
-
-__ai int32x2_t vcvtn_s32_f32(float32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vcvtn_s32_v((int8x8_t)__a, 2); }
-__ai int32x4_t vcvtnq_s32_f32(float32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vcvtnq_s32_v((int8x16_t)__a, 34); }
-
-__ai int64x1_t vcvtn_s64_f64(float64x1_t __a) {
-  return (int64x1_t)__builtin_neon_vcvtn_s64_v((int8x8_t)__a, 3); }
-__ai int64x2_t vcvtnq_s64_f64(float64x2_t __a) {
-  return (int64x2_t)__builtin_neon_vcvtnq_s64_v((int8x16_t)__a, 35); }
-
-__ai uint32x2_t vcvtn_u32_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcvtn_u32_v((int8x8_t)__a, 18); }
-__ai uint32x4_t vcvtnq_u32_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcvtnq_u32_v((int8x16_t)__a, 50); }
-
-__ai uint64x1_t vcvtn_u64_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcvtn_u64_v((int8x8_t)__a, 19); }
-__ai uint64x2_t vcvtnq_u64_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcvtnq_u64_v((int8x16_t)__a, 51); }
-
-__ai int32x2_t vcvtp_s32_f32(float32x2_t __a) {
-  return (int32x2_t)__builtin_neon_vcvtp_s32_v((int8x8_t)__a, 2); }
-__ai int32x4_t vcvtpq_s32_f32(float32x4_t __a) {
-  return (int32x4_t)__builtin_neon_vcvtpq_s32_v((int8x16_t)__a, 34); }
-
-__ai int64x1_t vcvtp_s64_f64(float64x1_t __a) {
-  return (int64x1_t)__builtin_neon_vcvtp_s64_v((int8x8_t)__a, 3); }
-__ai int64x2_t vcvtpq_s64_f64(float64x2_t __a) {
-  return (int64x2_t)__builtin_neon_vcvtpq_s64_v((int8x16_t)__a, 35); }
-
-__ai uint32x2_t vcvtp_u32_f32(float32x2_t __a) {
-  return (uint32x2_t)__builtin_neon_vcvtp_u32_v((int8x8_t)__a, 18); }
-__ai uint32x4_t vcvtpq_u32_f32(float32x4_t __a) {
-  return (uint32x4_t)__builtin_neon_vcvtpq_u32_v((int8x16_t)__a, 50); }
-
-__ai uint64x1_t vcvtp_u64_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcvtp_u64_v((int8x8_t)__a, 19); }
-__ai uint64x2_t vcvtpq_u64_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcvtpq_u64_v((int8x16_t)__a, 51); }
-
-#define vcvt_n_s64_f64(a, __b) __extension__ ({ \
-  float64x1_t __a = (a); \
-  (int64x1_t)__builtin_neon_vcvt_n_s64_v((int8x8_t)__a, __b, 3); })
-#define vcvtq_n_s64_f64(a, __b) __extension__ ({ \
-  float64x2_t __a = (a); \
-  (int64x2_t)__builtin_neon_vcvtq_n_s64_v((int8x16_t)__a, __b, 35); })
-
-#define vcvt_n_u64_f64(a, __b) __extension__ ({ \
-  float64x1_t __a = (a); \
-  (uint64x1_t)__builtin_neon_vcvt_n_u64_v((int8x8_t)__a, __b, 19); })
-#define vcvtq_n_u64_f64(a, __b) __extension__ ({ \
-  float64x2_t __a = (a); \
-  (uint64x2_t)__builtin_neon_vcvtq_n_u64_v((int8x16_t)__a, __b, 51); })
-
-__ai float32x2_t vdiv_f32(float32x2_t __a, float32x2_t __b) {
-  return __a / __b; }
-__ai float64x1_t vdiv_f64(float64x1_t __a, float64x1_t __b) {
-  return __a / __b; }
-__ai float32x4_t vdivq_f32(float32x4_t __a, float32x4_t __b) {
-  return __a / __b; }
-__ai float64x2_t vdivq_f64(float64x2_t __a, float64x2_t __b) {
-  return __a / __b; }
-
-__ai float32x2_t vmaxnm_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vmaxnm_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai float64x1_t vmaxnm_f64(float64x1_t __a, float64x1_t __b) {
-  return (float64x1_t)__builtin_neon_vmaxnm_v((int8x8_t)__a, (int8x8_t)__b, 9); }
-__ai float32x4_t vmaxnmq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vmaxnmq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-__ai float64x2_t vmaxnmq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vmaxnmq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai float32x2_t vpmaxnm_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vpmaxnm_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai float32x4_t vpmaxnmq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vpmaxnmq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-__ai float64x2_t vpmaxnmq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vpmaxnmq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai float32_t vmaxnmv_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vmaxnmv_f32(__a); }
-__ai float32_t vmaxnmvq_f32(float32x4_t __a) {
-  return (float32_t)__builtin_neon_vmaxnmvq_f32(__a); }
-__ai float64_t vmaxnmvq_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vmaxnmvq_f64(__a); }
-
-__ai float32x2_t vminnm_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vminnm_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai float64x1_t vminnm_f64(float64x1_t __a, float64x1_t __b) {
-  return (float64x1_t)__builtin_neon_vminnm_v((int8x8_t)__a, (int8x8_t)__b, 9); }
-__ai float32x4_t vminnmq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vminnmq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-__ai float64x2_t vminnmq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vminnmq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai float32x2_t vpminnm_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vpminnm_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai float32x4_t vpminnmq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vpminnmq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-__ai float64x2_t vpminnmq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vpminnmq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai float32_t vminnmv_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vminnmv_f32(__a); }
-__ai float32_t vminnmvq_f32(float32x4_t __a) {
-  return (float32_t)__builtin_neon_vminnmvq_f32(__a); }
-__ai float64_t vminnmvq_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vminnmvq_f64(__a); }
-
-__ai float64x1_t vfma_f64(float64x1_t __a, float64x1_t __b, float64x1_t __c) {
-  return (float64x1_t)__builtin_neon_vfma_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 9); }
-__ai float64x2_t vfmaq_f64(float64x2_t __a, float64x2_t __b, float64x2_t __c) {
-  return (float64x2_t)__builtin_neon_vfmaq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 41); }
-
-__ai float32x2_t vfma_n_f32(float32x2_t __a, float32x2_t __b, float32_t __c) {
-  return vfma_f32(__a, __b, (float32x2_t){ __c, __c }); }
-__ai float32x4_t vfmaq_n_f32(float32x4_t __a, float32x4_t __b, float32_t __c) {
-  return vfmaq_f32(__a, __b, (float32x4_t){ __c, __c, __c, __c }); }
-
-__ai float32x2_t vfms_f32(float32x2_t __a, float32x2_t __b, float32x2_t __c) {
-  return (float32x2_t)__builtin_neon_vfms_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 8); }
-__ai float64x1_t vfms_f64(float64x1_t __a, float64x1_t __b, float64x1_t __c) {
-  return (float64x1_t)__builtin_neon_vfms_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, 9); }
-__ai float32x4_t vfmsq_f32(float32x4_t __a, float32x4_t __b, float32x4_t __c) {
-  return (float32x4_t)__builtin_neon_vfmsq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 40); }
-__ai float64x2_t vfmsq_f64(float64x2_t __a, float64x2_t __b, float64x2_t __c) {
-  return (float64x2_t)__builtin_neon_vfmsq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 41); }
-
-__ai float32x2_t vfms_n_f32(float32x2_t __a, float32x2_t __b, float32_t __c) {
-  return vfms_f32(__a, __b, (float32x2_t){ __c, __c }); }
-__ai float32x4_t vfmsq_n_f32(float32x4_t __a, float32x4_t __b, float32_t __c) {
-  return vfmsq_f32(__a, __b, (float32x4_t){ __c, __c, __c, __c }); }
-
-__ai float64x1_t vrecpe_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vrecpe_v((int8x8_t)__a, 9); }
-__ai float64x2_t vrecpeq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vrecpeq_v((int8x16_t)__a, 41); }
-
-__ai float64x1_t vrecps_f64(float64x1_t __a, float64x1_t __b) {
-  return (float64x1_t)__builtin_neon_vrecps_v((int8x8_t)__a, (int8x8_t)__b, 9); }
-__ai float64x2_t vrecpsq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vrecpsq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai float32x2_t vrnda_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vrnda_v((int8x8_t)__a, 8); }
-__ai float64x1_t vrnda_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vrnda_v((int8x8_t)__a, 9); }
-__ai float32x4_t vrndaq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vrndaq_v((int8x16_t)__a, 40); }
-__ai float64x2_t vrndaq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vrndaq_v((int8x16_t)__a, 41); }
-
-__ai float32x2_t vrndi_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vrndi_v((int8x8_t)__a, 8); }
-__ai float64x1_t vrndi_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vrndi_v((int8x8_t)__a, 9); }
-__ai float32x4_t vrndiq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vrndiq_v((int8x16_t)__a, 40); }
-__ai float64x2_t vrndiq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vrndiq_v((int8x16_t)__a, 41); }
-
-__ai float32x2_t vrndm_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vrndm_v((int8x8_t)__a, 8); }
-__ai float64x1_t vrndm_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vrndm_v((int8x8_t)__a, 9); }
-__ai float32x4_t vrndmq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vrndmq_v((int8x16_t)__a, 40); }
-__ai float64x2_t vrndmq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vrndmq_v((int8x16_t)__a, 41); }
-
-__ai float32x2_t vrndn_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vrndn_v((int8x8_t)__a, 8); }
-__ai float64x1_t vrndn_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vrndn_v((int8x8_t)__a, 9); }
-__ai float32x4_t vrndnq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vrndnq_v((int8x16_t)__a, 40); }
-__ai float64x2_t vrndnq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vrndnq_v((int8x16_t)__a, 41); }
-
-__ai float32x2_t vrndp_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vrndp_v((int8x8_t)__a, 8); }
-__ai float64x1_t vrndp_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vrndp_v((int8x8_t)__a, 9); }
-__ai float32x4_t vrndpq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vrndpq_v((int8x16_t)__a, 40); }
-__ai float64x2_t vrndpq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vrndpq_v((int8x16_t)__a, 41); }
-
-__ai float32x2_t vrndx_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vrndx_v((int8x8_t)__a, 8); }
-__ai float64x1_t vrndx_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vrndx_v((int8x8_t)__a, 9); }
-__ai float32x4_t vrndxq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vrndxq_v((int8x16_t)__a, 40); }
-__ai float64x2_t vrndxq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vrndxq_v((int8x16_t)__a, 41); }
-
-__ai float32x2_t vrnd_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vrnd_v((int8x8_t)__a, 8); }
-__ai float64x1_t vrnd_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vrnd_v((int8x8_t)__a, 9); }
-__ai float32x4_t vrndq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vrndq_v((int8x16_t)__a, 40); }
-__ai float64x2_t vrndq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vrndq_v((int8x16_t)__a, 41); }
-
-__ai float64x1_t vrsqrte_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vrsqrte_v((int8x8_t)__a, 9); }
-__ai float64x2_t vrsqrteq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vrsqrteq_v((int8x16_t)__a, 41); }
-
-__ai float64x1_t vrsqrts_f64(float64x1_t __a, float64x1_t __b) {
-  return (float64x1_t)__builtin_neon_vrsqrts_v((int8x8_t)__a, (int8x8_t)__b, 9); }
-__ai float64x2_t vrsqrtsq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vrsqrtsq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai float32x2_t vsqrt_f32(float32x2_t __a) {
-  return (float32x2_t)__builtin_neon_vsqrt_v((int8x8_t)__a, 8); }
-__ai float64x1_t vsqrt_f64(float64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vsqrt_v((int8x8_t)__a, 9); }
-__ai float32x4_t vsqrtq_f32(float32x4_t __a) {
-  return (float32x4_t)__builtin_neon_vsqrtq_v((int8x16_t)__a, 40); }
-__ai float64x2_t vsqrtq_f64(float64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vsqrtq_v((int8x16_t)__a, 41); }
-
-#define vget_lane_f64(a, __b) __extension__ ({ \
-  float64x1_t __a = (a); \
-  (float64_t)__builtin_neon_vget_lane_f64(__a, __b); })
-#define vgetq_lane_f64(a, __b) __extension__ ({ \
-  float64x2_t __a = (a); \
-  (float64_t)__builtin_neon_vgetq_lane_f64(__a, __b); })
-#define vget_lane_p64(a, __b) __extension__ ({ \
-  poly64x1_t __a = (a); \
-  (poly64_t)__builtin_neon_vget_lane_i64((int64x1_t)__a, __b); })
-#define vgetq_lane_p64(a, __b) __extension__ ({ \
-  poly64x2_t __a = (a); \
-  (poly64_t)__builtin_neon_vgetq_lane_i64((int64x2_t)__a, __b); })
-
-#define vld1q_f64(__a) __extension__ ({ \
-  (float64x2_t)__builtin_neon_vld1q_v(__a, 41); })
-#define vld1_f64(__a) __extension__ ({ \
-  (float64x1_t)__builtin_neon_vld1_v(__a, 9); })
-#define vld1_p64(__a) __extension__ ({ \
-  (poly64x1_t)__builtin_neon_vld1_v(__a, 6); })
-#define vld1q_p64(__a) __extension__ ({ \
-  (poly64x2_t)__builtin_neon_vld1q_v(__a, 38); })
-
-#define vld1q_dup_f64(__a) __extension__ ({ \
-  (float64x2_t)__builtin_neon_vld1q_dup_v(__a, 41); })
-#define vld1q_dup_p64(__a) __extension__ ({ \
-  (poly64x2_t)__builtin_neon_vld1q_dup_v(__a, 38); })
-#define vld1_dup_f64(__a) __extension__ ({ \
-  (float64x1_t)__builtin_neon_vld1_dup_v(__a, 9); })
-#define vld1_dup_p64(__a) __extension__ ({ \
-  (poly64x1_t)__builtin_neon_vld1_dup_v(__a, 6); })
-
-#define vld1q_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x2_t __b = (b); \
-  (float64x2_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 41); })
-#define vld1q_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x2_t __b = (b); \
-  (poly64x2_t)__builtin_neon_vld1q_lane_v(__a, (int8x16_t)__b, __c, 38); })
-#define vld1_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x1_t __b = (b); \
-  (float64x1_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 9); })
-#define vld1_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x1_t __b = (b); \
-  (poly64x1_t)__builtin_neon_vld1_lane_v(__a, (int8x8_t)__b, __c, 6); })
-
-#define vld1q_u8_x2(__a) __extension__ ({ \
-  uint8x16x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 48); r; })
-#define vld1q_u16_x2(__a) __extension__ ({ \
-  uint16x8x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 49); r; })
-#define vld1q_u32_x2(__a) __extension__ ({ \
-  uint32x4x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 50); r; })
-#define vld1q_u64_x2(__a) __extension__ ({ \
-  uint64x2x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 51); r; })
-#define vld1q_s8_x2(__a) __extension__ ({ \
-  int8x16x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 32); r; })
-#define vld1q_s16_x2(__a) __extension__ ({ \
-  int16x8x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 33); r; })
-#define vld1q_s32_x2(__a) __extension__ ({ \
-  int32x4x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 34); r; })
-#define vld1q_s64_x2(__a) __extension__ ({ \
-  int64x2x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 35); r; })
-#define vld1q_f16_x2(__a) __extension__ ({ \
-  float16x8x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 39); r; })
-#define vld1q_f32_x2(__a) __extension__ ({ \
-  float32x4x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 40); r; })
-#define vld1q_f64_x2(__a) __extension__ ({ \
-  float64x2x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 41); r; })
-#define vld1q_p8_x2(__a) __extension__ ({ \
-  poly8x16x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 36); r; })
-#define vld1q_p16_x2(__a) __extension__ ({ \
-  poly16x8x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 37); r; })
-#define vld1q_p64_x2(__a) __extension__ ({ \
-  poly64x2x2_t r; __builtin_neon_vld1q_x2_v(&r, __a, 38); r; })
-#define vld1_u8_x2(__a) __extension__ ({ \
-  uint8x8x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 16); r; })
-#define vld1_u16_x2(__a) __extension__ ({ \
-  uint16x4x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 17); r; })
-#define vld1_u32_x2(__a) __extension__ ({ \
-  uint32x2x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 18); r; })
-#define vld1_u64_x2(__a) __extension__ ({ \
-  uint64x1x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 19); r; })
-#define vld1_s8_x2(__a) __extension__ ({ \
-  int8x8x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 0); r; })
-#define vld1_s16_x2(__a) __extension__ ({ \
-  int16x4x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 1); r; })
-#define vld1_s32_x2(__a) __extension__ ({ \
-  int32x2x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 2); r; })
-#define vld1_s64_x2(__a) __extension__ ({ \
-  int64x1x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 3); r; })
-#define vld1_f16_x2(__a) __extension__ ({ \
-  float16x4x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 7); r; })
-#define vld1_f32_x2(__a) __extension__ ({ \
-  float32x2x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 8); r; })
-#define vld1_f64_x2(__a) __extension__ ({ \
-  float64x1x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 9); r; })
-#define vld1_p8_x2(__a) __extension__ ({ \
-  poly8x8x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 4); r; })
-#define vld1_p16_x2(__a) __extension__ ({ \
-  poly16x4x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 5); r; })
-#define vld1_p64_x2(__a) __extension__ ({ \
-  poly64x1x2_t r; __builtin_neon_vld1_x2_v(&r, __a, 6); r; })
-
-#define vld2q_u64(__a) __extension__ ({ \
-  uint64x2x2_t r; __builtin_neon_vld2q_v(&r, __a, 51); r; })
-#define vld2q_s64(__a) __extension__ ({ \
-  int64x2x2_t r; __builtin_neon_vld2q_v(&r, __a, 35); r; })
-#define vld2q_f64(__a) __extension__ ({ \
-  float64x2x2_t r; __builtin_neon_vld2q_v(&r, __a, 41); r; })
-#define vld2_f64(__a) __extension__ ({ \
-  float64x1x2_t r; __builtin_neon_vld2_v(&r, __a, 9); r; })
-#define vld2_p64(__a) __extension__ ({ \
-  poly64x1x2_t r; __builtin_neon_vld2_v(&r, __a, 6); r; })
-#define vld2q_p64(__a) __extension__ ({ \
-  poly64x2x2_t r; __builtin_neon_vld2q_v(&r, __a, 38); r; })
-
-#define vld2q_dup_u8(__a) __extension__ ({ \
-  uint8x16x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 48); r; })
-#define vld2q_dup_u16(__a) __extension__ ({ \
-  uint16x8x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 49); r; })
-#define vld2q_dup_u32(__a) __extension__ ({ \
-  uint32x4x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 50); r; })
-#define vld2q_dup_u64(__a) __extension__ ({ \
-  uint64x2x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 51); r; })
-#define vld2q_dup_s8(__a) __extension__ ({ \
-  int8x16x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 32); r; })
-#define vld2q_dup_s16(__a) __extension__ ({ \
-  int16x8x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 33); r; })
-#define vld2q_dup_s32(__a) __extension__ ({ \
-  int32x4x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 34); r; })
-#define vld2q_dup_s64(__a) __extension__ ({ \
-  int64x2x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 35); r; })
-#define vld2q_dup_f16(__a) __extension__ ({ \
-  float16x8x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 39); r; })
-#define vld2q_dup_f32(__a) __extension__ ({ \
-  float32x4x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 40); r; })
-#define vld2q_dup_f64(__a) __extension__ ({ \
-  float64x2x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 41); r; })
-#define vld2q_dup_p8(__a) __extension__ ({ \
-  poly8x16x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 36); r; })
-#define vld2q_dup_p16(__a) __extension__ ({ \
-  poly16x8x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 37); r; })
-#define vld2q_dup_p64(__a) __extension__ ({ \
-  poly64x2x2_t r; __builtin_neon_vld2q_dup_v(&r, __a, 38); r; })
-#define vld2_dup_f64(__a) __extension__ ({ \
-  float64x1x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 9); r; })
-#define vld2_dup_p64(__a) __extension__ ({ \
-  poly64x1x2_t r; __builtin_neon_vld2_dup_v(&r, __a, 6); r; })
-
-#define vld2q_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x16x2_t __b = (b); \
-  uint8x16x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 48); r; })
-#define vld2q_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x2x2_t __b = (b); \
-  uint64x2x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 51); r; })
-#define vld2q_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x16x2_t __b = (b); \
-  int8x16x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, __b.val[0], __b.val[1], __c, 32); r; })
-#define vld2q_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x2x2_t __b = (b); \
-  int64x2x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 35); r; })
-#define vld2q_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x2x2_t __b = (b); \
-  float64x2x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 41); r; })
-#define vld2q_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x16x2_t __b = (b); \
-  poly8x16x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 36); r; })
-#define vld2q_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x2x2_t __b = (b); \
-  poly64x2x2_t r; __builtin_neon_vld2q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 38); r; })
-#define vld2_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x1x2_t __b = (b); \
-  uint64x1x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 19); r; })
-#define vld2_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x1x2_t __b = (b); \
-  int64x1x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 3); r; })
-#define vld2_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x1x2_t __b = (b); \
-  float64x1x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 9); r; })
-#define vld2_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x1x2_t __b = (b); \
-  poly64x1x2_t r; __builtin_neon_vld2_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 6); r; })
-
-#define vld3q_u64(__a) __extension__ ({ \
-  uint64x2x3_t r; __builtin_neon_vld3q_v(&r, __a, 51); r; })
-#define vld3q_s64(__a) __extension__ ({ \
-  int64x2x3_t r; __builtin_neon_vld3q_v(&r, __a, 35); r; })
-#define vld3q_f64(__a) __extension__ ({ \
-  float64x2x3_t r; __builtin_neon_vld3q_v(&r, __a, 41); r; })
-#define vld3_f64(__a) __extension__ ({ \
-  float64x1x3_t r; __builtin_neon_vld3_v(&r, __a, 9); r; })
-#define vld3_p64(__a) __extension__ ({ \
-  poly64x1x3_t r; __builtin_neon_vld3_v(&r, __a, 6); r; })
-#define vld3q_p64(__a) __extension__ ({ \
-  poly64x2x3_t r; __builtin_neon_vld3q_v(&r, __a, 38); r; })
-
-#define vld3q_dup_u8(__a) __extension__ ({ \
-  uint8x16x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 48); r; })
-#define vld3q_dup_u16(__a) __extension__ ({ \
-  uint16x8x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 49); r; })
-#define vld3q_dup_u32(__a) __extension__ ({ \
-  uint32x4x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 50); r; })
-#define vld3q_dup_u64(__a) __extension__ ({ \
-  uint64x2x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 51); r; })
-#define vld3q_dup_s8(__a) __extension__ ({ \
-  int8x16x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 32); r; })
-#define vld3q_dup_s16(__a) __extension__ ({ \
-  int16x8x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 33); r; })
-#define vld3q_dup_s32(__a) __extension__ ({ \
-  int32x4x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 34); r; })
-#define vld3q_dup_s64(__a) __extension__ ({ \
-  int64x2x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 35); r; })
-#define vld3q_dup_f16(__a) __extension__ ({ \
-  float16x8x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 39); r; })
-#define vld3q_dup_f32(__a) __extension__ ({ \
-  float32x4x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 40); r; })
-#define vld3q_dup_f64(__a) __extension__ ({ \
-  float64x2x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 41); r; })
-#define vld3q_dup_p8(__a) __extension__ ({ \
-  poly8x16x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 36); r; })
-#define vld3q_dup_p16(__a) __extension__ ({ \
-  poly16x8x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 37); r; })
-#define vld3q_dup_p64(__a) __extension__ ({ \
-  poly64x2x3_t r; __builtin_neon_vld3q_dup_v(&r, __a, 38); r; })
-#define vld3_dup_f64(__a) __extension__ ({ \
-  float64x1x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 9); r; })
-#define vld3_dup_p64(__a) __extension__ ({ \
-  poly64x1x3_t r; __builtin_neon_vld3_dup_v(&r, __a, 6); r; })
-
-#define vld3q_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x16x3_t __b = (b); \
-  uint8x16x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 48); r; })
-#define vld3q_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x2x3_t __b = (b); \
-  uint64x2x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 51); r; })
-#define vld3q_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x16x3_t __b = (b); \
-  int8x16x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, __b.val[0], __b.val[1], __b.val[2], __c, 32); r; })
-#define vld3q_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x2x3_t __b = (b); \
-  int64x2x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 35); r; })
-#define vld3q_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x2x3_t __b = (b); \
-  float64x2x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 41); r; })
-#define vld3q_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x16x3_t __b = (b); \
-  poly8x16x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 36); r; })
-#define vld3q_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x2x3_t __b = (b); \
-  poly64x2x3_t r; __builtin_neon_vld3q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 38); r; })
-#define vld3_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x1x3_t __b = (b); \
-  uint64x1x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 19); r; })
-#define vld3_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x1x3_t __b = (b); \
-  int64x1x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 3); r; })
-#define vld3_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x1x3_t __b = (b); \
-  float64x1x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 9); r; })
-#define vld3_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x1x3_t __b = (b); \
-  poly64x1x3_t r; __builtin_neon_vld3_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 6); r; })
-
-#define vld1q_u8_x3(__a) __extension__ ({ \
-  uint8x16x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 48); r; })
-#define vld1q_u16_x3(__a) __extension__ ({ \
-  uint16x8x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 49); r; })
-#define vld1q_u32_x3(__a) __extension__ ({ \
-  uint32x4x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 50); r; })
-#define vld1q_u64_x3(__a) __extension__ ({ \
-  uint64x2x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 51); r; })
-#define vld1q_s8_x3(__a) __extension__ ({ \
-  int8x16x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 32); r; })
-#define vld1q_s16_x3(__a) __extension__ ({ \
-  int16x8x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 33); r; })
-#define vld1q_s32_x3(__a) __extension__ ({ \
-  int32x4x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 34); r; })
-#define vld1q_s64_x3(__a) __extension__ ({ \
-  int64x2x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 35); r; })
-#define vld1q_f16_x3(__a) __extension__ ({ \
-  float16x8x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 39); r; })
-#define vld1q_f32_x3(__a) __extension__ ({ \
-  float32x4x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 40); r; })
-#define vld1q_f64_x3(__a) __extension__ ({ \
-  float64x2x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 41); r; })
-#define vld1q_p8_x3(__a) __extension__ ({ \
-  poly8x16x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 36); r; })
-#define vld1q_p16_x3(__a) __extension__ ({ \
-  poly16x8x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 37); r; })
-#define vld1q_p64_x3(__a) __extension__ ({ \
-  poly64x2x3_t r; __builtin_neon_vld1q_x3_v(&r, __a, 38); r; })
-#define vld1_u8_x3(__a) __extension__ ({ \
-  uint8x8x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 16); r; })
-#define vld1_u16_x3(__a) __extension__ ({ \
-  uint16x4x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 17); r; })
-#define vld1_u32_x3(__a) __extension__ ({ \
-  uint32x2x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 18); r; })
-#define vld1_u64_x3(__a) __extension__ ({ \
-  uint64x1x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 19); r; })
-#define vld1_s8_x3(__a) __extension__ ({ \
-  int8x8x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 0); r; })
-#define vld1_s16_x3(__a) __extension__ ({ \
-  int16x4x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 1); r; })
-#define vld1_s32_x3(__a) __extension__ ({ \
-  int32x2x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 2); r; })
-#define vld1_s64_x3(__a) __extension__ ({ \
-  int64x1x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 3); r; })
-#define vld1_f16_x3(__a) __extension__ ({ \
-  float16x4x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 7); r; })
-#define vld1_f32_x3(__a) __extension__ ({ \
-  float32x2x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 8); r; })
-#define vld1_f64_x3(__a) __extension__ ({ \
-  float64x1x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 9); r; })
-#define vld1_p8_x3(__a) __extension__ ({ \
-  poly8x8x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 4); r; })
-#define vld1_p16_x3(__a) __extension__ ({ \
-  poly16x4x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 5); r; })
-#define vld1_p64_x3(__a) __extension__ ({ \
-  poly64x1x3_t r; __builtin_neon_vld1_x3_v(&r, __a, 6); r; })
-
-#define vld4q_u64(__a) __extension__ ({ \
-  uint64x2x4_t r; __builtin_neon_vld4q_v(&r, __a, 51); r; })
-#define vld4q_s64(__a) __extension__ ({ \
-  int64x2x4_t r; __builtin_neon_vld4q_v(&r, __a, 35); r; })
-#define vld4q_f64(__a) __extension__ ({ \
-  float64x2x4_t r; __builtin_neon_vld4q_v(&r, __a, 41); r; })
-#define vld4_f64(__a) __extension__ ({ \
-  float64x1x4_t r; __builtin_neon_vld4_v(&r, __a, 9); r; })
-#define vld4_p64(__a) __extension__ ({ \
-  poly64x1x4_t r; __builtin_neon_vld4_v(&r, __a, 6); r; })
-#define vld4q_p64(__a) __extension__ ({ \
-  poly64x2x4_t r; __builtin_neon_vld4q_v(&r, __a, 38); r; })
-
-#define vld4q_dup_u8(__a) __extension__ ({ \
-  uint8x16x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 48); r; })
-#define vld4q_dup_u16(__a) __extension__ ({ \
-  uint16x8x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 49); r; })
-#define vld4q_dup_u32(__a) __extension__ ({ \
-  uint32x4x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 50); r; })
-#define vld4q_dup_u64(__a) __extension__ ({ \
-  uint64x2x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 51); r; })
-#define vld4q_dup_s8(__a) __extension__ ({ \
-  int8x16x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 32); r; })
-#define vld4q_dup_s16(__a) __extension__ ({ \
-  int16x8x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 33); r; })
-#define vld4q_dup_s32(__a) __extension__ ({ \
-  int32x4x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 34); r; })
-#define vld4q_dup_s64(__a) __extension__ ({ \
-  int64x2x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 35); r; })
-#define vld4q_dup_f16(__a) __extension__ ({ \
-  float16x8x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 39); r; })
-#define vld4q_dup_f32(__a) __extension__ ({ \
-  float32x4x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 40); r; })
-#define vld4q_dup_f64(__a) __extension__ ({ \
-  float64x2x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 41); r; })
-#define vld4q_dup_p8(__a) __extension__ ({ \
-  poly8x16x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 36); r; })
-#define vld4q_dup_p16(__a) __extension__ ({ \
-  poly16x8x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 37); r; })
-#define vld4q_dup_p64(__a) __extension__ ({ \
-  poly64x2x4_t r; __builtin_neon_vld4q_dup_v(&r, __a, 38); r; })
-#define vld4_dup_f64(__a) __extension__ ({ \
-  float64x1x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 9); r; })
-#define vld4_dup_p64(__a) __extension__ ({ \
-  poly64x1x4_t r; __builtin_neon_vld4_dup_v(&r, __a, 6); r; })
-
-#define vld4q_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x16x4_t __b = (b); \
-  uint8x16x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 48); r; })
-#define vld4q_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x2x4_t __b = (b); \
-  uint64x2x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 51); r; })
-#define vld4q_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x16x4_t __b = (b); \
-  int8x16x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], __c, 32); r; })
-#define vld4q_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x2x4_t __b = (b); \
-  int64x2x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 35); r; })
-#define vld4q_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x2x4_t __b = (b); \
-  float64x2x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 41); r; })
-#define vld4q_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x16x4_t __b = (b); \
-  poly8x16x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 36); r; })
-#define vld4q_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x2x4_t __b = (b); \
-  poly64x2x4_t r; __builtin_neon_vld4q_lane_v(&r, __a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 38); r; })
-#define vld4_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x1x4_t __b = (b); \
-  uint64x1x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 19); r; })
-#define vld4_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x1x4_t __b = (b); \
-  int64x1x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 3); r; })
-#define vld4_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x1x4_t __b = (b); \
-  float64x1x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 9); r; })
-#define vld4_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x1x4_t __b = (b); \
-  poly64x1x4_t r; __builtin_neon_vld4_lane_v(&r, __a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 6); r; })
-
-#define vld1q_u8_x4(__a) __extension__ ({ \
-  uint8x16x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 48); r; })
-#define vld1q_u16_x4(__a) __extension__ ({ \
-  uint16x8x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 49); r; })
-#define vld1q_u32_x4(__a) __extension__ ({ \
-  uint32x4x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 50); r; })
-#define vld1q_u64_x4(__a) __extension__ ({ \
-  uint64x2x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 51); r; })
-#define vld1q_s8_x4(__a) __extension__ ({ \
-  int8x16x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 32); r; })
-#define vld1q_s16_x4(__a) __extension__ ({ \
-  int16x8x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 33); r; })
-#define vld1q_s32_x4(__a) __extension__ ({ \
-  int32x4x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 34); r; })
-#define vld1q_s64_x4(__a) __extension__ ({ \
-  int64x2x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 35); r; })
-#define vld1q_f16_x4(__a) __extension__ ({ \
-  float16x8x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 39); r; })
-#define vld1q_f32_x4(__a) __extension__ ({ \
-  float32x4x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 40); r; })
-#define vld1q_f64_x4(__a) __extension__ ({ \
-  float64x2x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 41); r; })
-#define vld1q_p8_x4(__a) __extension__ ({ \
-  poly8x16x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 36); r; })
-#define vld1q_p16_x4(__a) __extension__ ({ \
-  poly16x8x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 37); r; })
-#define vld1q_p64_x4(__a) __extension__ ({ \
-  poly64x2x4_t r; __builtin_neon_vld1q_x4_v(&r, __a, 38); r; })
-#define vld1_u8_x4(__a) __extension__ ({ \
-  uint8x8x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 16); r; })
-#define vld1_u16_x4(__a) __extension__ ({ \
-  uint16x4x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 17); r; })
-#define vld1_u32_x4(__a) __extension__ ({ \
-  uint32x2x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 18); r; })
-#define vld1_u64_x4(__a) __extension__ ({ \
-  uint64x1x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 19); r; })
-#define vld1_s8_x4(__a) __extension__ ({ \
-  int8x8x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 0); r; })
-#define vld1_s16_x4(__a) __extension__ ({ \
-  int16x4x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 1); r; })
-#define vld1_s32_x4(__a) __extension__ ({ \
-  int32x2x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 2); r; })
-#define vld1_s64_x4(__a) __extension__ ({ \
-  int64x1x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 3); r; })
-#define vld1_f16_x4(__a) __extension__ ({ \
-  float16x4x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 7); r; })
-#define vld1_f32_x4(__a) __extension__ ({ \
-  float32x2x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 8); r; })
-#define vld1_f64_x4(__a) __extension__ ({ \
-  float64x1x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 9); r; })
-#define vld1_p8_x4(__a) __extension__ ({ \
-  poly8x8x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 4); r; })
-#define vld1_p16_x4(__a) __extension__ ({ \
-  poly16x4x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 5); r; })
-#define vld1_p64_x4(__a) __extension__ ({ \
-  poly64x1x4_t r; __builtin_neon_vld1_x4_v(&r, __a, 6); r; })
-
-__ai float64x1_t vmax_f64(float64x1_t __a, float64x1_t __b) {
-  return (float64x1_t)__builtin_neon_vmax_v((int8x8_t)__a, (int8x8_t)__b, 9); }
-__ai float64x2_t vmaxq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vmaxq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai int8x16_t vpmaxq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vpmaxq_v(__a, __b, 32); }
-__ai int16x8_t vpmaxq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vpmaxq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vpmaxq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vpmaxq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai uint8x16_t vpmaxq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vpmaxq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vpmaxq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vpmaxq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vpmaxq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vpmaxq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai float32x4_t vpmaxq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vpmaxq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-__ai float64x2_t vpmaxq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vpmaxq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai float64x1_t vmin_f64(float64x1_t __a, float64x1_t __b) {
-  return (float64x1_t)__builtin_neon_vmin_v((int8x8_t)__a, (int8x8_t)__b, 9); }
-__ai float64x2_t vminq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vminq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai int8x16_t vpminq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vpminq_v(__a, __b, 32); }
-__ai int16x8_t vpminq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vpminq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vpminq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vpminq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai uint8x16_t vpminq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vpminq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vpminq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vpminq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vpminq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vpminq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai float32x4_t vpminq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vpminq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-__ai float64x2_t vpminq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vpminq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai float64x1_t vmla_f64(float64x1_t __a, float64x1_t __b, float64x1_t __c) {
-  return __a + (__b * __c); }
-__ai float64x2_t vmlaq_f64(float64x2_t __a, float64x2_t __b, float64x2_t __c) {
-  return __a + (__b * __c); }
-
-__ai float64x1_t vmls_f64(float64x1_t __a, float64x1_t __b, float64x1_t __c) {
-  return __a - (__b * __c); }
-__ai float64x2_t vmlsq_f64(float64x2_t __a, float64x2_t __b, float64x2_t __c) {
-  return __a - (__b * __c); }
-
-__ai float64x1_t vmov_n_f64(float64_t __a) {
-  return (float64x1_t){ __a }; }
-__ai float64x2_t vmovq_n_f64(float64_t __a) {
-  return (float64x2_t){ __a, __a }; }
-
-__ai float64x1_t vmul_f64(float64x1_t __a, float64x1_t __b) {
-  return __a * __b; }
-__ai float64x2_t vmulq_f64(float64x2_t __a, float64x2_t __b) {
-  return __a * __b; }
-
-__ai float32x2_t vmulx_f32(float32x2_t __a, float32x2_t __b) {
-  return (float32x2_t)__builtin_neon_vmulx_v((int8x8_t)__a, (int8x8_t)__b, 8); }
-__ai float64x1_t vmulx_f64(float64x1_t __a, float64x1_t __b) {
-  return (float64x1_t)__builtin_neon_vmulx_v((int8x8_t)__a, (int8x8_t)__b, 9); }
-__ai float32x4_t vmulxq_f32(float32x4_t __a, float32x4_t __b) {
-  return (float32x4_t)__builtin_neon_vmulxq_v((int8x16_t)__a, (int8x16_t)__b, 40); }
-__ai float64x2_t vmulxq_f64(float64x2_t __a, float64x2_t __b) {
-  return (float64x2_t)__builtin_neon_vmulxq_v((int8x16_t)__a, (int8x16_t)__b, 41); }
-
-__ai int64x1_t vneg_s64(int64x1_t __a) {
-  return  -__a; }
-__ai float64x1_t vneg_f64(float64x1_t __a) {
-  return  -__a; }
-__ai float64x2_t vnegq_f64(float64x2_t __a) {
-  return  -__a; }
-__ai int64x2_t vnegq_s64(int64x2_t __a) {
-  return  -__a; }
-
-__ai int64x1_t vqabs_s64(int64x1_t __a) {
-  return (int64x1_t)__builtin_neon_vqabs_v((int8x8_t)__a, 3); }
-__ai int64x2_t vqabsq_s64(int64x2_t __a) {
-  return (int64x2_t)__builtin_neon_vqabsq_v((int8x16_t)__a, 35); }
-
-__ai int64x1_t vqneg_s64(int64x1_t __a) {
-  return (int64x1_t)__builtin_neon_vqneg_v((int8x8_t)__a, 3); }
-__ai int64x2_t vqnegq_s64(int64x2_t __a) {
-  return (int64x2_t)__builtin_neon_vqnegq_v((int8x16_t)__a, 35); }
-
-#define vqrshrn_high_n_s16(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int16x8_t __b = (b); \
-  (int8x16_t)vcombine_s16(__a, vqrshrn_n_s16(__b, __c)); })
-#define vqrshrn_high_n_s32(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int32x4_t __b = (b); \
-  (int16x8_t)vcombine_s32(__a, vqrshrn_n_s32(__b, __c)); })
-#define vqrshrn_high_n_s64(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int64x2_t __b = (b); \
-  (int32x4_t)vcombine_s64(__a, vqrshrn_n_s64(__b, __c)); })
-#define vqrshrn_high_n_u16(a, b, __c) __extension__ ({ \
-  uint8x8_t __a = (a); uint16x8_t __b = (b); \
-  (uint8x16_t)vcombine_u16(__a, vqrshrn_n_u16(__b, __c)); })
-#define vqrshrn_high_n_u32(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint32x4_t __b = (b); \
-  (uint16x8_t)vcombine_u32(__a, vqrshrn_n_u32(__b, __c)); })
-#define vqrshrn_high_n_u64(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint64x2_t __b = (b); \
-  (uint32x4_t)vcombine_u64(__a, vqrshrn_n_u64(__b, __c)); })
-
-#define vqrshrun_high_n_s16(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int16x8_t __b = (b); \
-  (int8x16_t)vcombine_s16(__a, vqrshrun_n_s16(__b, __c)); })
-#define vqrshrun_high_n_s32(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int32x4_t __b = (b); \
-  (int16x8_t)vcombine_s32(__a, vqrshrun_n_s32(__b, __c)); })
-#define vqrshrun_high_n_s64(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int64x2_t __b = (b); \
-  (int32x4_t)vcombine_s64(__a, vqrshrun_n_s64(__b, __c)); })
-
-#define vqshrn_high_n_s16(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int16x8_t __b = (b); \
-  (int8x16_t)vcombine_s16(__a, vqshrn_n_s16(__b, __c)); })
-#define vqshrn_high_n_s32(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int32x4_t __b = (b); \
-  (int16x8_t)vcombine_s32(__a, vqshrn_n_s32(__b, __c)); })
-#define vqshrn_high_n_s64(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int64x2_t __b = (b); \
-  (int32x4_t)vcombine_s64(__a, vqshrn_n_s64(__b, __c)); })
-#define vqshrn_high_n_u16(a, b, __c) __extension__ ({ \
-  uint8x8_t __a = (a); uint16x8_t __b = (b); \
-  (uint8x16_t)vcombine_u16(__a, vqshrn_n_u16(__b, __c)); })
-#define vqshrn_high_n_u32(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint32x4_t __b = (b); \
-  (uint16x8_t)vcombine_u32(__a, vqshrn_n_u32(__b, __c)); })
-#define vqshrn_high_n_u64(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint64x2_t __b = (b); \
-  (uint32x4_t)vcombine_u64(__a, vqshrn_n_u64(__b, __c)); })
-
-#define vqshrun_high_n_s16(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int16x8_t __b = (b); \
-  (int8x16_t)vcombine_s16(__a, vqshrun_n_s16(__b, __c)); })
-#define vqshrun_high_n_s32(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int32x4_t __b = (b); \
-  (int16x8_t)vcombine_s32(__a, vqshrun_n_s32(__b, __c)); })
-#define vqshrun_high_n_s64(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int64x2_t __b = (b); \
-  (int32x4_t)vcombine_s64(__a, vqshrun_n_s64(__b, __c)); })
-
-__ai int8x16_t vqmovn_high_s16(int8x8_t __a, int16x8_t __b) {
-  int8x8_t __a1 = vqmovn_s16(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); }
-__ai int16x8_t vqmovn_high_s32(int16x4_t __a, int32x4_t __b) {
-  int16x4_t __a1 = vqmovn_s32(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7); }
-__ai int32x4_t vqmovn_high_s64(int32x2_t __a, int64x2_t __b) {
-  int32x2_t __a1 = vqmovn_s64(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3); }
-__ai uint8x16_t vqmovn_high_u16(uint8x8_t __a, uint16x8_t __b) {
-  uint8x8_t __a1 = vqmovn_u16(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); }
-__ai uint16x8_t vqmovn_high_u32(uint16x4_t __a, uint32x4_t __b) {
-  uint16x4_t __a1 = vqmovn_u32(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7); }
-__ai uint32x4_t vqmovn_high_u64(uint32x2_t __a, uint64x2_t __b) {
-  uint32x2_t __a1 = vqmovn_u64(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3); }
-
-__ai int8x8_t vrbit_s8(int8x8_t __a) {
-  return (int8x8_t)__builtin_neon_vrbit_v(__a, 0); }
-__ai uint8x8_t vrbit_u8(uint8x8_t __a) {
-  return (uint8x8_t)__builtin_neon_vrbit_v((int8x8_t)__a, 16); }
-__ai poly8x8_t vrbit_p8(poly8x8_t __a) {
-  return (poly8x8_t)__builtin_neon_vrbit_v((int8x8_t)__a, 4); }
-__ai int8x16_t vrbitq_s8(int8x16_t __a) {
-  return (int8x16_t)__builtin_neon_vrbitq_v(__a, 32); }
-__ai uint8x16_t vrbitq_u8(uint8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vrbitq_v((int8x16_t)__a, 48); }
-__ai poly8x16_t vrbitq_p8(poly8x16_t __a) {
-  return (poly8x16_t)__builtin_neon_vrbitq_v((int8x16_t)__a, 36); }
-
-__ai int8x8_t vreinterpret_s8_f64(float64x1_t __a) {
-  return (int8x8_t)__a; }
-__ai int8x8_t vreinterpret_s8_p64(poly64x1_t __a) {
-  return (int8x8_t)__a; }
-__ai int16x4_t vreinterpret_s16_f64(float64x1_t __a) {
-  return (int16x4_t)__a; }
-__ai int16x4_t vreinterpret_s16_p64(poly64x1_t __a) {
-  return (int16x4_t)__a; }
-__ai int32x2_t vreinterpret_s32_f64(float64x1_t __a) {
-  return (int32x2_t)__a; }
-__ai int32x2_t vreinterpret_s32_p64(poly64x1_t __a) {
-  return (int32x2_t)__a; }
-__ai int64x1_t vreinterpret_s64_f64(float64x1_t __a) {
-  return (int64x1_t)__a; }
-__ai int64x1_t vreinterpret_s64_p64(poly64x1_t __a) {
-  return (int64x1_t)__a; }
-__ai uint8x8_t vreinterpret_u8_f64(float64x1_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint8x8_t vreinterpret_u8_p64(poly64x1_t __a) {
-  return (uint8x8_t)__a; }
-__ai uint16x4_t vreinterpret_u16_f64(float64x1_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint16x4_t vreinterpret_u16_p64(poly64x1_t __a) {
-  return (uint16x4_t)__a; }
-__ai uint32x2_t vreinterpret_u32_f64(float64x1_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint32x2_t vreinterpret_u32_p64(poly64x1_t __a) {
-  return (uint32x2_t)__a; }
-__ai uint64x1_t vreinterpret_u64_f64(float64x1_t __a) {
-  return (uint64x1_t)__a; }
-__ai uint64x1_t vreinterpret_u64_p64(poly64x1_t __a) {
-  return (uint64x1_t)__a; }
-__ai float16x4_t vreinterpret_f16_f64(float64x1_t __a) {
-  return (float16x4_t)__a; }
-__ai float16x4_t vreinterpret_f16_p64(poly64x1_t __a) {
-  return (float16x4_t)__a; }
-__ai float32x2_t vreinterpret_f32_f64(float64x1_t __a) {
-  return (float32x2_t)__a; }
-__ai float32x2_t vreinterpret_f32_p64(poly64x1_t __a) {
-  return (float32x2_t)__a; }
-__ai float64x1_t vreinterpret_f64_s8(int8x8_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_s16(int16x4_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_s32(int32x2_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_s64(int64x1_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_u8(uint8x8_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_u16(uint16x4_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_u32(uint32x2_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_u64(uint64x1_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_f16(float16x4_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_f32(float32x2_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_p8(poly8x8_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_p16(poly16x4_t __a) {
-  return (float64x1_t)__a; }
-__ai float64x1_t vreinterpret_f64_p64(poly64x1_t __a) {
-  return (float64x1_t)__a; }
-__ai poly8x8_t vreinterpret_p8_f64(float64x1_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly8x8_t vreinterpret_p8_p64(poly64x1_t __a) {
-  return (poly8x8_t)__a; }
-__ai poly16x4_t vreinterpret_p16_f64(float64x1_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly16x4_t vreinterpret_p16_p64(poly64x1_t __a) {
-  return (poly16x4_t)__a; }
-__ai poly64x1_t vreinterpret_p64_s8(int8x8_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_s16(int16x4_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_s32(int32x2_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_s64(int64x1_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_u8(uint8x8_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_u16(uint16x4_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_u32(uint32x2_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_u64(uint64x1_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_f16(float16x4_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_f32(float32x2_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_f64(float64x1_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_p8(poly8x8_t __a) {
-  return (poly64x1_t)__a; }
-__ai poly64x1_t vreinterpret_p64_p16(poly16x4_t __a) {
-  return (poly64x1_t)__a; }
-__ai int8x16_t vreinterpretq_s8_f64(float64x2_t __a) {
-  return (int8x16_t)__a; }
-__ai int8x16_t vreinterpretq_s8_p64(poly64x2_t __a) {
-  return (int8x16_t)__a; }
-__ai int16x8_t vreinterpretq_s16_f64(float64x2_t __a) {
-  return (int16x8_t)__a; }
-__ai int16x8_t vreinterpretq_s16_p64(poly64x2_t __a) {
-  return (int16x8_t)__a; }
-__ai int32x4_t vreinterpretq_s32_f64(float64x2_t __a) {
-  return (int32x4_t)__a; }
-__ai int32x4_t vreinterpretq_s32_p64(poly64x2_t __a) {
-  return (int32x4_t)__a; }
-__ai int64x2_t vreinterpretq_s64_f64(float64x2_t __a) {
-  return (int64x2_t)__a; }
-__ai int64x2_t vreinterpretq_s64_p64(poly64x2_t __a) {
-  return (int64x2_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_f64(float64x2_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint8x16_t vreinterpretq_u8_p64(poly64x2_t __a) {
-  return (uint8x16_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_f64(float64x2_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint16x8_t vreinterpretq_u16_p64(poly64x2_t __a) {
-  return (uint16x8_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_f64(float64x2_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint32x4_t vreinterpretq_u32_p64(poly64x2_t __a) {
-  return (uint32x4_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_f64(float64x2_t __a) {
-  return (uint64x2_t)__a; }
-__ai uint64x2_t vreinterpretq_u64_p64(poly64x2_t __a) {
-  return (uint64x2_t)__a; }
-__ai float16x8_t vreinterpretq_f16_f64(float64x2_t __a) {
-  return (float16x8_t)__a; }
-__ai float16x8_t vreinterpretq_f16_p64(poly64x2_t __a) {
-  return (float16x8_t)__a; }
-__ai float32x4_t vreinterpretq_f32_f64(float64x2_t __a) {
-  return (float32x4_t)__a; }
-__ai float32x4_t vreinterpretq_f32_p64(poly64x2_t __a) {
-  return (float32x4_t)__a; }
-__ai float64x2_t vreinterpretq_f64_s8(int8x16_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_s16(int16x8_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_s32(int32x4_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_s64(int64x2_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_u8(uint8x16_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_u16(uint16x8_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_u32(uint32x4_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_u64(uint64x2_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_f16(float16x8_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_f32(float32x4_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_p8(poly8x16_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_p16(poly16x8_t __a) {
-  return (float64x2_t)__a; }
-__ai float64x2_t vreinterpretq_f64_p64(poly64x2_t __a) {
-  return (float64x2_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_f64(float64x2_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly8x16_t vreinterpretq_p8_p64(poly64x2_t __a) {
-  return (poly8x16_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_f64(float64x2_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly16x8_t vreinterpretq_p16_p64(poly64x2_t __a) {
-  return (poly16x8_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_s8(int8x16_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_s16(int16x8_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_s32(int32x4_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_s64(int64x2_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_u8(uint8x16_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_u16(uint16x8_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_u32(uint32x4_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_u64(uint64x2_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_f16(float16x8_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_f32(float32x4_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_f64(float64x2_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_p8(poly8x16_t __a) {
-  return (poly64x2_t)__a; }
-__ai poly64x2_t vreinterpretq_p64_p16(poly16x8_t __a) {
-  return (poly64x2_t)__a; }
-
-#define vrshrn_high_n_s16(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int16x8_t __b = (b); \
-  (int8x16_t)vcombine_s16(__a, vrshrn_n_s16(__b, __c)); })
-#define vrshrn_high_n_s32(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int32x4_t __b = (b); \
-  (int16x8_t)vcombine_s32(__a, vrshrn_n_s32(__b, __c)); })
-#define vrshrn_high_n_s64(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int64x2_t __b = (b); \
-  (int32x4_t)vcombine_s64(__a, vrshrn_n_s64(__b, __c)); })
-#define vrshrn_high_n_u16(a, b, __c) __extension__ ({ \
-  uint8x8_t __a = (a); uint16x8_t __b = (b); \
-  (uint8x16_t)vcombine_u16(__a, vrshrn_n_u16(__b, __c)); })
-#define vrshrn_high_n_u32(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint32x4_t __b = (b); \
-  (uint16x8_t)vcombine_u32(__a, vrshrn_n_u32(__b, __c)); })
-#define vrshrn_high_n_u64(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint64x2_t __b = (b); \
-  (uint32x4_t)vcombine_u64(__a, vrshrn_n_u64(__b, __c)); })
-
-__ai float32_t vabds_f32(float32_t __a, float32_t __b) {
-  return (float32_t)__builtin_neon_vabds_f32(__a, __b); }
-__ai float64_t vabdd_f64(float64_t __a, float64_t __b) {
-  return (float64_t)__builtin_neon_vabdd_f64(__a, __b); }
-
-__ai int64_t vabsd_s64(int64_t __a) {
-  return (int64_t)__builtin_neon_vabsd_s64(__a); }
-
-__ai int64_t vaddd_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vaddd_s64(__a, __b); }
-__ai uint64_t vaddd_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vaddd_u64(__a, __b); }
-
-__ai float32_t vpadds_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vpadds_f32(__a); }
-__ai int64_t vpaddd_s64(int64x2_t __a) {
-  return (int64_t)__builtin_neon_vpaddd_s64(__a); }
-__ai float64_t vpaddd_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vpaddd_f64(__a); }
-__ai uint64_t vpaddd_u64(uint64x2_t __a) {
-  return (uint64_t)__builtin_neon_vpaddd_u64((int64x2_t)__a); }
-
-__ai int64_t vceqd_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vceqd_s64(__a, __b); }
-__ai uint64_t vceqd_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vceqd_u64(__a, __b); }
-
-__ai int64_t vceqzd_s64(int64_t __a) {
-  return (int64_t)__builtin_neon_vceqzd_s64(__a); }
-__ai uint64_t vceqzd_u64(uint64_t __a) {
-  return (uint64_t)__builtin_neon_vceqzd_u64(__a); }
-
-__ai int64_t vcged_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vcged_s64(__a, __b); }
-
-__ai int64_t vcgezd_s64(int64_t __a) {
-  return (int64_t)__builtin_neon_vcgezd_s64(__a); }
-
-__ai int64_t vcgtd_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vcgtd_s64(__a, __b); }
-
-__ai int64_t vcgtzd_s64(int64_t __a) {
-  return (int64_t)__builtin_neon_vcgtzd_s64(__a); }
-
-__ai uint64_t vcgtd_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vcgtd_u64(__a, __b); }
-
-__ai uint64_t vcged_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vcged_u64(__a, __b); }
-
-__ai int64_t vcled_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vcled_s64(__a, __b); }
-__ai uint64_t vcled_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vcled_u64(__a, __b); }
-
-__ai int64_t vclezd_s64(int64_t __a) {
-  return (int64_t)__builtin_neon_vclezd_s64(__a); }
-
-__ai int64_t vcltd_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vcltd_s64(__a, __b); }
-__ai uint64_t vcltd_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vcltd_u64(__a, __b); }
-
-__ai int64_t vcltzd_s64(int64_t __a) {
-  return (int64_t)__builtin_neon_vcltzd_s64(__a); }
-
-__ai int64_t vtstd_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vtstd_s64(__a, __b); }
-__ai uint64_t vtstd_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vtstd_u64(__a, __b); }
-
-__ai uint32_t vcages_f32(float32_t __a, float32_t __b) {
-  return (uint32_t)__builtin_neon_vcages_f32(__a, __b); }
-__ai uint64_t vcaged_f64(float64_t __a, float64_t __b) {
-  return (uint64_t)__builtin_neon_vcaged_f64(__a, __b); }
-
-__ai uint32_t vcagts_f32(float32_t __a, float32_t __b) {
-  return (uint32_t)__builtin_neon_vcagts_f32(__a, __b); }
-__ai uint64_t vcagtd_f64(float64_t __a, float64_t __b) {
-  return (uint64_t)__builtin_neon_vcagtd_f64(__a, __b); }
-
-__ai uint32_t vcales_f32(float32_t __a, float32_t __b) {
-  return (uint32_t)__builtin_neon_vcales_f32(__a, __b); }
-__ai uint64_t vcaled_f64(float64_t __a, float64_t __b) {
-  return (uint64_t)__builtin_neon_vcaled_f64(__a, __b); }
-
-__ai uint32_t vcalts_f32(float32_t __a, float32_t __b) {
-  return (uint32_t)__builtin_neon_vcalts_f32(__a, __b); }
-__ai uint64_t vcaltd_f64(float64_t __a, float64_t __b) {
-  return (uint64_t)__builtin_neon_vcaltd_f64(__a, __b); }
-
-__ai uint32_t vceqs_f32(float32_t __a, float32_t __b) {
-  return (uint32_t)__builtin_neon_vceqs_f32(__a, __b); }
-__ai uint64_t vceqd_f64(float64_t __a, float64_t __b) {
-  return (uint64_t)__builtin_neon_vceqd_f64(__a, __b); }
-
-__ai uint32_t vceqzs_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vceqzs_f32(__a); }
-__ai uint64_t vceqzd_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vceqzd_f64(__a); }
-
-__ai uint32_t vcges_f32(float32_t __a, float32_t __b) {
-  return (uint32_t)__builtin_neon_vcges_f32(__a, __b); }
-__ai uint64_t vcged_f64(float64_t __a, float64_t __b) {
-  return (uint64_t)__builtin_neon_vcged_f64(__a, __b); }
-
-__ai uint32_t vcgezs_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vcgezs_f32(__a); }
-__ai uint64_t vcgezd_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vcgezd_f64(__a); }
-
-__ai uint32_t vcgts_f32(float32_t __a, float32_t __b) {
-  return (uint32_t)__builtin_neon_vcgts_f32(__a, __b); }
-__ai uint64_t vcgtd_f64(float64_t __a, float64_t __b) {
-  return (uint64_t)__builtin_neon_vcgtd_f64(__a, __b); }
-
-__ai uint32_t vcgtzs_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vcgtzs_f32(__a); }
-__ai uint64_t vcgtzd_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vcgtzd_f64(__a); }
-
-__ai uint32_t vcles_f32(float32_t __a, float32_t __b) {
-  return (uint32_t)__builtin_neon_vcles_f32(__a, __b); }
-__ai uint64_t vcled_f64(float64_t __a, float64_t __b) {
-  return (uint64_t)__builtin_neon_vcled_f64(__a, __b); }
-
-__ai uint32_t vclezs_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vclezs_f32(__a); }
-__ai uint64_t vclezd_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vclezd_f64(__a); }
-
-__ai uint32_t vclts_f32(float32_t __a, float32_t __b) {
-  return (uint32_t)__builtin_neon_vclts_f32(__a, __b); }
-__ai uint64_t vcltd_f64(float64_t __a, float64_t __b) {
-  return (uint64_t)__builtin_neon_vcltd_f64(__a, __b); }
-
-__ai uint32_t vcltzs_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vcltzs_f32(__a); }
-__ai uint64_t vcltzd_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vcltzd_f64(__a); }
-
-__ai int64_t vcvtad_s64_f64(float64_t __a) {
-  return (int64_t)__builtin_neon_vcvtad_s64_f64(__a); }
-
-__ai int32_t vcvtas_s32_f32(float32_t __a) {
-  return (int32_t)__builtin_neon_vcvtas_s32_f32(__a); }
-
-__ai uint64_t vcvtad_u64_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vcvtad_u64_f64(__a); }
-
-__ai uint32_t vcvtas_u32_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vcvtas_u32_f32(__a); }
-
-__ai int64_t vcvtmd_s64_f64(float64_t __a) {
-  return (int64_t)__builtin_neon_vcvtmd_s64_f64(__a); }
-
-__ai int32_t vcvtms_s32_f32(float32_t __a) {
-  return (int32_t)__builtin_neon_vcvtms_s32_f32(__a); }
-
-__ai uint64_t vcvtmd_u64_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vcvtmd_u64_f64(__a); }
-
-__ai uint32_t vcvtms_u32_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vcvtms_u32_f32(__a); }
-
-__ai int64_t vcvtnd_s64_f64(float64_t __a) {
-  return (int64_t)__builtin_neon_vcvtnd_s64_f64(__a); }
-
-__ai int32_t vcvtns_s32_f32(float32_t __a) {
-  return (int32_t)__builtin_neon_vcvtns_s32_f32(__a); }
-
-__ai uint64_t vcvtnd_u64_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vcvtnd_u64_f64(__a); }
-
-__ai uint32_t vcvtns_u32_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vcvtns_u32_f32(__a); }
-
-__ai int64_t vcvtpd_s64_f64(float64_t __a) {
-  return (int64_t)__builtin_neon_vcvtpd_s64_f64(__a); }
-
-__ai int32_t vcvtps_s32_f32(float32_t __a) {
-  return (int32_t)__builtin_neon_vcvtps_s32_f32(__a); }
-
-__ai uint64_t vcvtpd_u64_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vcvtpd_u64_f64(__a); }
-
-__ai uint32_t vcvtps_u32_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vcvtps_u32_f32(__a); }
-
-__ai float32_t vcvtxd_f32_f64(float64_t __a) {
-  return (float32_t)__builtin_neon_vcvtxd_f32_f64(__a); }
-
-__ai int64_t vcvtd_s64_f64(float64_t __a) {
-  return (int64_t)__builtin_neon_vcvtd_s64_f64(__a); }
-
-__ai int32_t vcvts_s32_f32(float32_t __a) {
-  return (int32_t)__builtin_neon_vcvts_s32_f32(__a); }
-
-#define vcvts_n_s32_f32(a, __b) __extension__ ({ \
-  float32_t __a = (a); \
-  (int32_t)__builtin_neon_vcvts_n_s32_f32(__a, __b); })
-
-#define vcvtd_n_s64_f64(a, __b) __extension__ ({ \
-  float64_t __a = (a); \
-  (int64_t)__builtin_neon_vcvtd_n_s64_f64(__a, __b); })
-
-__ai uint64_t vcvtd_u64_f64(float64_t __a) {
-  return (uint64_t)__builtin_neon_vcvtd_u64_f64(__a); }
-
-__ai uint32_t vcvts_u32_f32(float32_t __a) {
-  return (uint32_t)__builtin_neon_vcvts_u32_f32(__a); }
-
-#define vcvts_n_u32_f32(a, __b) __extension__ ({ \
-  float32_t __a = (a); \
-  (uint32_t)__builtin_neon_vcvts_n_u32_f32(__a, __b); })
-
-#define vcvtd_n_u64_f64(a, __b) __extension__ ({ \
-  float64_t __a = (a); \
-  (uint64_t)__builtin_neon_vcvtd_n_u64_f64(__a, __b); })
-
-__ai float32_t vpmaxnms_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vpmaxnms_f32(__a); }
-__ai float64_t vpmaxnmqd_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vpmaxnmqd_f64(__a); }
-
-__ai float32_t vpmaxs_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vpmaxs_f32(__a); }
-__ai float64_t vpmaxqd_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vpmaxqd_f64(__a); }
-
-__ai float32_t vpminnms_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vpminnms_f32(__a); }
-__ai float64_t vpminnmqd_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vpminnmqd_f64(__a); }
-
-__ai float32_t vpmins_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vpmins_f32(__a); }
-__ai float64_t vpminqd_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vpminqd_f64(__a); }
-
-#define vfmas_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32_t __a = (a); float32_t __b = (b); float32x2_t __c = (c); \
-  (float32_t)__builtin_neon_vfmas_lane_f32(__a, __b, __c, __d); })
-#define vfmad_lane_f64(a, b, c, __d) __extension__ ({ \
-  float64_t __a = (a); float64_t __b = (b); float64x1_t __c = (c); \
-  (float64_t)__builtin_neon_vfmad_lane_f64(__a, __b, __c, __d); })
-
-#define vfmas_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32_t __a = (a); float32_t __b = (b); float32x4_t __c = (c); \
-  (float32_t)__builtin_neon_vfmas_laneq_f32(__a, __b, __c, __d); })
-#define vfmad_laneq_f64(a, b, c, __d) __extension__ ({ \
-  float64_t __a = (a); float64_t __b = (b); float64x2_t __c = (c); \
-  (float64_t)__builtin_neon_vfmad_laneq_f64(__a, __b, __c, __d); })
-
-#define vfmss_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32_t __a = (a); float32_t __b = (b); float32x2_t __c = (c); \
-  float32_t __a1 = __a; \
-  float32_t __b1 = __b; \
-  float32x2_t __c1 = __c; \
-  vfmas_lane_f32(__a1, __b1, -__c1, __d); })
-#define vfmsd_lane_f64(a, b, c, __d) __extension__ ({ \
-  float64_t __a = (a); float64_t __b = (b); float64x1_t __c = (c); \
-  float64_t __a1 = __a; \
-  float64_t __b1 = __b; \
-  float64x1_t __c1 = __c; \
-  vfmad_lane_f64(__a1, __b1, -__c1, __d); })
-
-#define vfmss_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32_t __a = (a); float32_t __b = (b); float32x4_t __c = (c); \
-  float32_t __a1 = __a; \
-  float32_t __b1 = __b; \
-  float32x4_t __c1 = __c; \
-  vfmas_laneq_f32(__a1, __b1, -__c1, __d); })
-#define vfmsd_laneq_f64(a, b, c, __d) __extension__ ({ \
-  float64_t __a = (a); float64_t __b = (b); float64x2_t __c = (c); \
-  float64_t __a1 = __a; \
-  float64_t __b1 = __b; \
-  float64x2_t __c1 = __c; \
-  vfmad_laneq_f64(__a1, __b1, -__c1, __d); })
-
-__ai float32_t vmulxs_f32(float32_t __a, float32_t __b) {
-  return (float32_t)__builtin_neon_vmulxs_f32(__a, __b); }
-__ai float64_t vmulxd_f64(float64_t __a, float64_t __b) {
-  return (float64_t)__builtin_neon_vmulxd_f64(__a, __b); }
-
-#define vmulxs_lane_f32(a, b, __c) __extension__ ({ \
-  float32_t __a = (a); float32x2_t __b = (b); \
-  float32_t __d1 = vget_lane_f32(__b, __c);\
-  vmulxs_f32(__a, __d1); })
-#define vmulxd_lane_f64(a, b, __c) __extension__ ({ \
-  float64_t __a = (a); float64x1_t __b = (b); \
-  float64_t __d1 = vget_lane_f64(__b, __c);\
-  vmulxd_f64(__a, __d1); })
-
-#define vmulxs_laneq_f32(a, b, __c) __extension__ ({ \
-  float32_t __a = (a); float32x4_t __b = (b); \
-  float32_t __d1 = vgetq_lane_f32(__b, __c);\
-  vmulxs_f32(__a, __d1); })
-#define vmulxd_laneq_f64(a, b, __c) __extension__ ({ \
-  float64_t __a = (a); float64x2_t __b = (b); \
-  float64_t __d1 = vgetq_lane_f64(__b, __c);\
-  vmulxd_f64(__a, __d1); })
-
-#define vmuls_lane_f32(a, b, __c) __extension__ ({ \
-  float32_t __a = (a); float32x2_t __b = (b); \
-  float32_t __d1 = vget_lane_f32(__b, __c);\
-  __a * __d1; })
-#define vmuld_lane_f64(a, b, __c) __extension__ ({ \
-  float64_t __a = (a); float64x1_t __b = (b); \
-  float64_t __d1 = vget_lane_f64(__b, __c);\
-  __a * __d1; })
-
-#define vmuls_laneq_f32(a, b, __c) __extension__ ({ \
-  float32_t __a = (a); float32x4_t __b = (b); \
-  float32_t __d1 = vgetq_lane_f32(__b, __c);\
-  __a * __d1; })
-#define vmuld_laneq_f64(a, b, __c) __extension__ ({ \
-  float64_t __a = (a); float64x2_t __b = (b); \
-  float64_t __d1 = vgetq_lane_f64(__b, __c);\
-  __a * __d1; })
-
-__ai float32_t vrecpes_f32(float32_t __a) {
-  return (float32_t)__builtin_neon_vrecpes_f32(__a); }
-__ai float64_t vrecped_f64(float64_t __a) {
-  return (float64_t)__builtin_neon_vrecped_f64(__a); }
-
-__ai float32_t vrecpss_f32(float32_t __a, float32_t __b) {
-  return (float32_t)__builtin_neon_vrecpss_f32(__a, __b); }
-__ai float64_t vrecpsd_f64(float64_t __a, float64_t __b) {
-  return (float64_t)__builtin_neon_vrecpsd_f64(__a, __b); }
-
-__ai float32_t vrecpxs_f32(float32_t __a) {
-  return (float32_t)__builtin_neon_vrecpxs_f32(__a); }
-__ai float64_t vrecpxd_f64(float64_t __a) {
-  return (float64_t)__builtin_neon_vrecpxd_f64(__a); }
-
-__ai float32_t vrsqrtes_f32(float32_t __a) {
-  return (float32_t)__builtin_neon_vrsqrtes_f32(__a); }
-__ai float64_t vrsqrted_f64(float64_t __a) {
-  return (float64_t)__builtin_neon_vrsqrted_f64(__a); }
-
-__ai float32_t vrsqrtss_f32(float32_t __a, float32_t __b) {
-  return (float32_t)__builtin_neon_vrsqrtss_f32(__a, __b); }
-__ai float64_t vrsqrtsd_f64(float64_t __a, float64_t __b) {
-  return (float64_t)__builtin_neon_vrsqrtsd_f64(__a, __b); }
-
-#define vget_lane_f16(a, __b) __extension__ ({ \
-  float16x4_t __a = (a); \
-  int16x4_t __a1 = vreinterpret_s16_f16(__a);\
-  vget_lane_s16(__a1, __b); })
-#define vgetq_lane_f16(a, __b) __extension__ ({ \
-  float16x8_t __a = (a); \
-  int16x8_t __a1 = vreinterpretq_s16_f16(__a);\
-  vgetq_lane_s16(__a1, __b); })
-
-__ai int64_t vnegd_s64(int64_t __a) {
-  return (int64_t)__builtin_neon_vnegd_s64(__a); }
-
-__ai int8_t vqaddb_s8(int8_t __a, int8_t __b) {
-  return (int8_t)__builtin_neon_vqaddb_s8(__a, __b); }
-__ai int16_t vqaddh_s16(int16_t __a, int16_t __b) {
-  return (int16_t)__builtin_neon_vqaddh_s16(__a, __b); }
-__ai int32_t vqadds_s32(int32_t __a, int32_t __b) {
-  return (int32_t)__builtin_neon_vqadds_s32(__a, __b); }
-__ai int64_t vqaddd_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vqaddd_s64(__a, __b); }
-__ai uint8_t vqaddb_u8(uint8_t __a, uint8_t __b) {
-  return (uint8_t)__builtin_neon_vqaddb_u8(__a, __b); }
-__ai uint16_t vqaddh_u16(uint16_t __a, uint16_t __b) {
-  return (uint16_t)__builtin_neon_vqaddh_u16(__a, __b); }
-__ai uint32_t vqadds_u32(uint32_t __a, uint32_t __b) {
-  return (uint32_t)__builtin_neon_vqadds_u32(__a, __b); }
-__ai uint64_t vqaddd_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vqaddd_u64(__a, __b); }
-
-__ai int8_t vqrshlb_s8(int8_t __a, int8_t __b) {
-  return (int8_t)__builtin_neon_vqrshlb_s8(__a, __b); }
-__ai int16_t vqrshlh_s16(int16_t __a, int16_t __b) {
-  return (int16_t)__builtin_neon_vqrshlh_s16(__a, __b); }
-__ai int32_t vqrshls_s32(int32_t __a, int32_t __b) {
-  return (int32_t)__builtin_neon_vqrshls_s32(__a, __b); }
-__ai int64_t vqrshld_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vqrshld_s64(__a, __b); }
-__ai uint8_t vqrshlb_u8(uint8_t __a, uint8_t __b) {
-  return (uint8_t)__builtin_neon_vqrshlb_u8(__a, __b); }
-__ai uint16_t vqrshlh_u16(uint16_t __a, uint16_t __b) {
-  return (uint16_t)__builtin_neon_vqrshlh_u16(__a, __b); }
-__ai uint32_t vqrshls_u32(uint32_t __a, uint32_t __b) {
-  return (uint32_t)__builtin_neon_vqrshls_u32(__a, __b); }
-__ai uint64_t vqrshld_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vqrshld_u64(__a, __b); }
-
-__ai int8_t vqshlb_s8(int8_t __a, int8_t __b) {
-  return (int8_t)__builtin_neon_vqshlb_s8(__a, __b); }
-__ai int16_t vqshlh_s16(int16_t __a, int16_t __b) {
-  return (int16_t)__builtin_neon_vqshlh_s16(__a, __b); }
-__ai int32_t vqshls_s32(int32_t __a, int32_t __b) {
-  return (int32_t)__builtin_neon_vqshls_s32(__a, __b); }
-__ai int64_t vqshld_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vqshld_s64(__a, __b); }
-__ai uint8_t vqshlb_u8(uint8_t __a, uint8_t __b) {
-  return (uint8_t)__builtin_neon_vqshlb_u8(__a, __b); }
-__ai uint16_t vqshlh_u16(uint16_t __a, uint16_t __b) {
-  return (uint16_t)__builtin_neon_vqshlh_u16(__a, __b); }
-__ai uint32_t vqshls_u32(uint32_t __a, uint32_t __b) {
-  return (uint32_t)__builtin_neon_vqshls_u32(__a, __b); }
-__ai uint64_t vqshld_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vqshld_u64(__a, __b); }
-
-__ai int8_t vqsubb_s8(int8_t __a, int8_t __b) {
-  return (int8_t)__builtin_neon_vqsubb_s8(__a, __b); }
-__ai int16_t vqsubh_s16(int16_t __a, int16_t __b) {
-  return (int16_t)__builtin_neon_vqsubh_s16(__a, __b); }
-__ai int32_t vqsubs_s32(int32_t __a, int32_t __b) {
-  return (int32_t)__builtin_neon_vqsubs_s32(__a, __b); }
-__ai int64_t vqsubd_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vqsubd_s64(__a, __b); }
-__ai uint8_t vqsubb_u8(uint8_t __a, uint8_t __b) {
-  return (uint8_t)__builtin_neon_vqsubb_u8(__a, __b); }
-__ai uint16_t vqsubh_u16(uint16_t __a, uint16_t __b) {
-  return (uint16_t)__builtin_neon_vqsubh_u16(__a, __b); }
-__ai uint32_t vqsubs_u32(uint32_t __a, uint32_t __b) {
-  return (uint32_t)__builtin_neon_vqsubs_u32(__a, __b); }
-__ai uint64_t vqsubd_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vqsubd_u64(__a, __b); }
-
-__ai int64_t vrshld_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vrshld_s64(__a, __b); }
-__ai uint64_t vrshld_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vrshld_u64(__a, __b); }
-
-__ai float64_t vcvtd_f64_s64(int64_t __a) {
-  return (float64_t)__builtin_neon_vcvtd_f64_s64(__a); }
-
-__ai float32_t vcvts_f32_s32(int32_t __a) {
-  return (float32_t)__builtin_neon_vcvts_f32_s32(__a); }
-
-#define vcvts_n_f32_s32(a, __b) __extension__ ({ \
-  int32_t __a = (a); \
-  (float32_t)__builtin_neon_vcvts_n_f32_s32(__a, __b); })
-#define vcvts_n_f32_u32(a, __b) __extension__ ({ \
-  uint32_t __a = (a); \
-  (float32_t)__builtin_neon_vcvts_n_f32_u32(__a, __b); })
-
-#define vcvtd_n_f64_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (float64_t)__builtin_neon_vcvtd_n_f64_s64(__a, __b); })
-#define vcvtd_n_f64_u64(a, __b) __extension__ ({ \
-  uint64_t __a = (a); \
-  (float64_t)__builtin_neon_vcvtd_n_f64_u64(__a, __b); })
-
-#define vset_lane_f16(a, b, __c) __extension__ ({ \
-  float16_t __a = (a); float16x4_t __b = (b); \
-  int16_t __a1 = (int16_t)__a;\
-  int16x4_t __b1 = vreinterpret_s16_f16(b);\
-  int16x4_t __b2 = vset_lane_s16(__a1, __b1, __c);\
-  vreinterpret_f16_s16(__b2); })
-#define vsetq_lane_f16(a, b, __c) __extension__ ({ \
-  float16_t __a = (a); float16x8_t __b = (b); \
-  int16_t __a1 = (int16_t)__a;\
-  int16x8_t __b1 = vreinterpretq_s16_f16(b);\
-  int16x8_t __b2 = vsetq_lane_s16(__a1, __b1, __c);\
-  vreinterpretq_f16_s16(__b2); })
-
-__ai int64_t vshld_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vshld_s64(__a, __b); }
-__ai uint64_t vshld_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vshld_u64(__a, __b); }
-
-#define vshld_n_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (int64_t)__builtin_neon_vshld_n_s64(__a, __b); })
-#define vshld_n_u64(a, __b) __extension__ ({ \
-  uint64_t __a = (a); \
-  (uint64_t)__builtin_neon_vshld_n_u64(__a, __b); })
-
-#define vslid_n_s64(a, b, __c) __extension__ ({ \
-  int64_t __a = (a); int64_t __b = (b); \
-  (int64_t)__builtin_neon_vslid_n_s64(__a, __b, __c); })
-#define vslid_n_u64(a, b, __c) __extension__ ({ \
-  uint64_t __a = (a); uint64_t __b = (b); \
-  (uint64_t)__builtin_neon_vslid_n_u64(__a, __b, __c); })
-
-__ai int8_t vqabsb_s8(int8_t __a) {
-  return (int8_t)__builtin_neon_vqabsb_s8(__a); }
-__ai int16_t vqabsh_s16(int16_t __a) {
-  return (int16_t)__builtin_neon_vqabsh_s16(__a); }
-__ai int32_t vqabss_s32(int32_t __a) {
-  return (int32_t)__builtin_neon_vqabss_s32(__a); }
-__ai int64_t vqabsd_s64(int64_t __a) {
-  return (int64_t)__builtin_neon_vqabsd_s64(__a); }
-
-__ai int32_t vqdmlalh_s16(int32_t __a, int16_t __b, int16_t __c) {
-  return (int32_t)__builtin_neon_vqdmlalh_s16(__a, __b, __c); }
-__ai int64_t vqdmlals_s32(int64_t __a, int32_t __b, int32_t __c) {
-  return (int64_t)__builtin_neon_vqdmlals_s32(__a, __b, __c); }
-
-#define vqdmlalh_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32_t __a = (a); int16_t __b = (b); int16x4_t __c = (c); \
-  (int32_t)__builtin_neon_vqdmlalh_lane_s16(__a, __b, __c, __d); })
-#define vqdmlals_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64_t __a = (a); int32_t __b = (b); int32x2_t __c = (c); \
-  (int64_t)__builtin_neon_vqdmlals_lane_s32(__a, __b, __c, __d); })
-
-#define vqdmlalh_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32_t __a = (a); int16_t __b = (b); int16x8_t __c = (c); \
-  (int32_t)__builtin_neon_vqdmlalh_laneq_s16(__a, __b, __c, __d); })
-#define vqdmlals_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64_t __a = (a); int32_t __b = (b); int32x4_t __c = (c); \
-  (int64_t)__builtin_neon_vqdmlals_laneq_s32(__a, __b, __c, __d); })
-
-__ai int32_t vqdmlslh_s16(int32_t __a, int16_t __b, int16_t __c) {
-  return (int32_t)__builtin_neon_vqdmlslh_s16(__a, __b, __c); }
-__ai int64_t vqdmlsls_s32(int64_t __a, int32_t __b, int32_t __c) {
-  return (int64_t)__builtin_neon_vqdmlsls_s32(__a, __b, __c); }
-
-#define vqdmlslh_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32_t __a = (a); int16_t __b = (b); int16x4_t __c = (c); \
-  (int32_t)__builtin_neon_vqdmlslh_lane_s16(__a, __b, __c, __d); })
-#define vqdmlsls_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64_t __a = (a); int32_t __b = (b); int32x2_t __c = (c); \
-  (int64_t)__builtin_neon_vqdmlsls_lane_s32(__a, __b, __c, __d); })
-
-#define vqdmlslh_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32_t __a = (a); int16_t __b = (b); int16x8_t __c = (c); \
-  (int32_t)__builtin_neon_vqdmlslh_laneq_s16(__a, __b, __c, __d); })
-#define vqdmlsls_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64_t __a = (a); int32_t __b = (b); int32x4_t __c = (c); \
-  (int64_t)__builtin_neon_vqdmlsls_laneq_s32(__a, __b, __c, __d); })
-
-__ai int16_t vqdmulhh_s16(int16_t __a, int16_t __b) {
-  return (int16_t)__builtin_neon_vqdmulhh_s16(__a, __b); }
-__ai int32_t vqdmulhs_s32(int32_t __a, int32_t __b) {
-  return (int32_t)__builtin_neon_vqdmulhs_s32(__a, __b); }
-
-#define vqdmulhh_lane_s16(a, b, __c) __extension__ ({ \
-  int16_t __a = (a); int16x4_t __b = (b); \
-  vqdmulhh_s16(__a, vget_lane_s16(__b, __c)); })
-#define vqdmulhs_lane_s32(a, b, __c) __extension__ ({ \
-  int32_t __a = (a); int32x2_t __b = (b); \
-  vqdmulhs_s32(__a, vget_lane_s32(__b, __c)); })
-
-#define vqdmulhh_laneq_s16(a, b, __c) __extension__ ({ \
-  int16_t __a = (a); int16x8_t __b = (b); \
-  vqdmulhh_s16(__a, vgetq_lane_s16(__b, __c)); })
-#define vqdmulhs_laneq_s32(a, b, __c) __extension__ ({ \
-  int32_t __a = (a); int32x4_t __b = (b); \
-  vqdmulhs_s32(__a, vgetq_lane_s32(__b, __c)); })
-
-__ai int32_t vqdmullh_s16(int16_t __a, int16_t __b) {
-  return (int32_t)__builtin_neon_vqdmullh_s16(__a, __b); }
-__ai int64_t vqdmulls_s32(int32_t __a, int32_t __b) {
-  return (int64_t)__builtin_neon_vqdmulls_s32(__a, __b); }
-
-#define vqdmullh_lane_s16(a, b, __c) __extension__ ({ \
-  int16_t __a = (a); int16x4_t __b = (b); \
-  vqdmullh_s16(__a, vget_lane_s16(b, __c)); })
-#define vqdmulls_lane_s32(a, b, __c) __extension__ ({ \
-  int32_t __a = (a); int32x2_t __b = (b); \
-  vqdmulls_s32(__a, vget_lane_s32(b, __c)); })
-
-#define vqdmullh_laneq_s16(a, b, __c) __extension__ ({ \
-  int16_t __a = (a); int16x8_t __b = (b); \
-  vqdmullh_s16(__a, vgetq_lane_s16(b, __c)); })
-#define vqdmulls_laneq_s32(a, b, __c) __extension__ ({ \
-  int32_t __a = (a); int32x4_t __b = (b); \
-  vqdmulls_s32(__a, vgetq_lane_s32(b, __c)); })
-
-__ai int8_t vqnegb_s8(int8_t __a) {
-  return (int8_t)__builtin_neon_vqnegb_s8(__a); }
-__ai int16_t vqnegh_s16(int16_t __a) {
-  return (int16_t)__builtin_neon_vqnegh_s16(__a); }
-__ai int32_t vqnegs_s32(int32_t __a) {
-  return (int32_t)__builtin_neon_vqnegs_s32(__a); }
-__ai int64_t vqnegd_s64(int64_t __a) {
-  return (int64_t)__builtin_neon_vqnegd_s64(__a); }
-
-__ai int16_t vqrdmulhh_s16(int16_t __a, int16_t __b) {
-  return (int16_t)__builtin_neon_vqrdmulhh_s16(__a, __b); }
-__ai int32_t vqrdmulhs_s32(int32_t __a, int32_t __b) {
-  return (int32_t)__builtin_neon_vqrdmulhs_s32(__a, __b); }
-
-#define vqrdmulhh_lane_s16(a, b, __c) __extension__ ({ \
-  int16_t __a = (a); int16x4_t __b = (b); \
-  vqrdmulhh_s16(__a, vget_lane_s16(__b, __c)); })
-#define vqrdmulhs_lane_s32(a, b, __c) __extension__ ({ \
-  int32_t __a = (a); int32x2_t __b = (b); \
-  vqrdmulhs_s32(__a, vget_lane_s32(__b, __c)); })
-
-#define vqrdmulhh_laneq_s16(a, b, __c) __extension__ ({ \
-  int16_t __a = (a); int16x8_t __b = (b); \
-  vqrdmulhh_s16(__a, vgetq_lane_s16(__b, __c)); })
-#define vqrdmulhs_laneq_s32(a, b, __c) __extension__ ({ \
-  int32_t __a = (a); int32x4_t __b = (b); \
-  vqrdmulhs_s32(__a, vgetq_lane_s32(__b, __c)); })
-
-#define vqrshrnh_n_s16(a, __b) __extension__ ({ \
-  int16_t __a = (a); \
-  (int8_t)__builtin_neon_vqrshrnh_n_s16(__a, __b); })
-#define vqrshrns_n_s32(a, __b) __extension__ ({ \
-  int32_t __a = (a); \
-  (int16_t)__builtin_neon_vqrshrns_n_s32(__a, __b); })
-#define vqrshrnd_n_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (int32_t)__builtin_neon_vqrshrnd_n_s64(__a, __b); })
-#define vqrshrnh_n_u16(a, __b) __extension__ ({ \
-  uint16_t __a = (a); \
-  (uint8_t)__builtin_neon_vqrshrnh_n_u16(__a, __b); })
-#define vqrshrns_n_u32(a, __b) __extension__ ({ \
-  uint32_t __a = (a); \
-  (uint16_t)__builtin_neon_vqrshrns_n_u32(__a, __b); })
-#define vqrshrnd_n_u64(a, __b) __extension__ ({ \
-  uint64_t __a = (a); \
-  (uint32_t)__builtin_neon_vqrshrnd_n_u64(__a, __b); })
-
-#define vqrshrunh_n_s16(a, __b) __extension__ ({ \
-  int16_t __a = (a); \
-  (int8_t)__builtin_neon_vqrshrunh_n_s16(__a, __b); })
-#define vqrshruns_n_s32(a, __b) __extension__ ({ \
-  int32_t __a = (a); \
-  (int16_t)__builtin_neon_vqrshruns_n_s32(__a, __b); })
-#define vqrshrund_n_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (int32_t)__builtin_neon_vqrshrund_n_s64(__a, __b); })
-
-#define vqshlub_n_s8(a, __b) __extension__ ({ \
-  int8_t __a = (a); \
-  (int8_t)__builtin_neon_vqshlub_n_s8(__a, __b); })
-#define vqshluh_n_s16(a, __b) __extension__ ({ \
-  int16_t __a = (a); \
-  (int16_t)__builtin_neon_vqshluh_n_s16(__a, __b); })
-#define vqshlus_n_s32(a, __b) __extension__ ({ \
-  int32_t __a = (a); \
-  (int32_t)__builtin_neon_vqshlus_n_s32(__a, __b); })
-#define vqshlud_n_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (int64_t)__builtin_neon_vqshlud_n_s64(__a, __b); })
-
-#define vqshlb_n_s8(a, __b) __extension__ ({ \
-  int8_t __a = (a); \
-  (int8_t)__builtin_neon_vqshlb_n_s8(__a, __b); })
-#define vqshlh_n_s16(a, __b) __extension__ ({ \
-  int16_t __a = (a); \
-  (int16_t)__builtin_neon_vqshlh_n_s16(__a, __b); })
-#define vqshls_n_s32(a, __b) __extension__ ({ \
-  int32_t __a = (a); \
-  (int32_t)__builtin_neon_vqshls_n_s32(__a, __b); })
-#define vqshld_n_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (int64_t)__builtin_neon_vqshld_n_s64(__a, __b); })
-#define vqshlb_n_u8(a, __b) __extension__ ({ \
-  uint8_t __a = (a); \
-  (uint8_t)__builtin_neon_vqshlb_n_u8(__a, __b); })
-#define vqshlh_n_u16(a, __b) __extension__ ({ \
-  uint16_t __a = (a); \
-  (uint16_t)__builtin_neon_vqshlh_n_u16(__a, __b); })
-#define vqshls_n_u32(a, __b) __extension__ ({ \
-  uint32_t __a = (a); \
-  (uint32_t)__builtin_neon_vqshls_n_u32(__a, __b); })
-#define vqshld_n_u64(a, __b) __extension__ ({ \
-  uint64_t __a = (a); \
-  (uint64_t)__builtin_neon_vqshld_n_u64(__a, __b); })
-
-#define vqshrnh_n_s16(a, __b) __extension__ ({ \
-  int16_t __a = (a); \
-  (int8_t)__builtin_neon_vqshrnh_n_s16(__a, __b); })
-#define vqshrns_n_s32(a, __b) __extension__ ({ \
-  int32_t __a = (a); \
-  (int16_t)__builtin_neon_vqshrns_n_s32(__a, __b); })
-#define vqshrnd_n_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (int32_t)__builtin_neon_vqshrnd_n_s64(__a, __b); })
-#define vqshrnh_n_u16(a, __b) __extension__ ({ \
-  uint16_t __a = (a); \
-  (uint8_t)__builtin_neon_vqshrnh_n_u16(__a, __b); })
-#define vqshrns_n_u32(a, __b) __extension__ ({ \
-  uint32_t __a = (a); \
-  (uint16_t)__builtin_neon_vqshrns_n_u32(__a, __b); })
-#define vqshrnd_n_u64(a, __b) __extension__ ({ \
-  uint64_t __a = (a); \
-  (uint32_t)__builtin_neon_vqshrnd_n_u64(__a, __b); })
-
-#define vqshrunh_n_s16(a, __b) __extension__ ({ \
-  int16_t __a = (a); \
-  (int8_t)__builtin_neon_vqshrunh_n_s16(__a, __b); })
-#define vqshruns_n_s32(a, __b) __extension__ ({ \
-  int32_t __a = (a); \
-  (int16_t)__builtin_neon_vqshruns_n_s32(__a, __b); })
-#define vqshrund_n_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (int32_t)__builtin_neon_vqshrund_n_s64(__a, __b); })
-
-__ai int8_t vqmovnh_s16(int16_t __a) {
-  return (int8_t)__builtin_neon_vqmovnh_s16(__a); }
-__ai int16_t vqmovns_s32(int32_t __a) {
-  return (int16_t)__builtin_neon_vqmovns_s32(__a); }
-__ai int32_t vqmovnd_s64(int64_t __a) {
-  return (int32_t)__builtin_neon_vqmovnd_s64(__a); }
-
-__ai int8_t vqmovunh_s16(int16_t __a) {
-  return (int8_t)__builtin_neon_vqmovunh_s16(__a); }
-__ai int16_t vqmovuns_s32(int32_t __a) {
-  return (int16_t)__builtin_neon_vqmovuns_s32(__a); }
-__ai int32_t vqmovund_s64(int64_t __a) {
-  return (int32_t)__builtin_neon_vqmovund_s64(__a); }
-
-#define vsrid_n_s64(a, b, __c) __extension__ ({ \
-  int64_t __a = (a); int64_t __b = (b); \
-  (int64_t)__builtin_neon_vsrid_n_s64(__a, __b, __c); })
-#define vsrid_n_u64(a, b, __c) __extension__ ({ \
-  uint64_t __a = (a); uint64_t __b = (b); \
-  (uint64_t)__builtin_neon_vsrid_n_u64(__a, __b, __c); })
-
-#define vrshrd_n_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (int64_t)__builtin_neon_vrshrd_n_s64(__a, __b); })
-#define vrshrd_n_u64(a, __b) __extension__ ({ \
-  uint64_t __a = (a); \
-  (uint64_t)__builtin_neon_vrshrd_n_u64(__a, __b); })
-
-#define vrsrad_n_s64(a, b, __c) __extension__ ({ \
-  int64_t __a = (a); int64_t __b = (b); \
-  (int64_t)__builtin_neon_vrsrad_n_s64(__a, __b, __c); })
-#define vrsrad_n_u64(a, b, __c) __extension__ ({ \
-  uint64_t __a = (a); uint64_t __b = (b); \
-  (uint64_t)__builtin_neon_vrsrad_n_u64(__a, __b, __c); })
-
-#define vshrd_n_s64(a, __b) __extension__ ({ \
-  int64_t __a = (a); \
-  (int64_t)__builtin_neon_vshrd_n_s64(__a, __b); })
-#define vshrd_n_u64(a, __b) __extension__ ({ \
-  uint64_t __a = (a); \
-  (uint64_t)__builtin_neon_vshrd_n_u64(__a, __b); })
-
-#define vsrad_n_s64(a, b, __c) __extension__ ({ \
-  int64_t __a = (a); int64_t __b = (b); \
-  (int64_t)__builtin_neon_vsrad_n_s64(__a, __b, __c); })
-#define vsrad_n_u64(a, b, __c) __extension__ ({ \
-  uint64_t __a = (a); uint64_t __b = (b); \
-  (uint64_t)__builtin_neon_vsrad_n_u64(__a, __b, __c); })
-
-__ai int64_t vsubd_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vsubd_s64(__a, __b); }
-__ai uint64_t vsubd_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vsubd_u64(__a, __b); }
-
-__ai int8_t vuqaddb_s8(int8_t __a, int8_t __b) {
-  return (int8_t)__builtin_neon_vuqaddb_s8(__a, __b); }
-__ai int16_t vuqaddh_s16(int16_t __a, int16_t __b) {
-  return (int16_t)__builtin_neon_vuqaddh_s16(__a, __b); }
-__ai int32_t vuqadds_s32(int32_t __a, int32_t __b) {
-  return (int32_t)__builtin_neon_vuqadds_s32(__a, __b); }
-__ai int64_t vuqaddd_s64(int64_t __a, int64_t __b) {
-  return (int64_t)__builtin_neon_vuqaddd_s64(__a, __b); }
-
-__ai float64_t vcvtd_f64_u64(uint64_t __a) {
-  return (float64_t)__builtin_neon_vcvtd_f64_u64(__a); }
-
-__ai float32_t vcvts_f32_u32(uint32_t __a) {
-  return (float32_t)__builtin_neon_vcvts_f32_u32(__a); }
-
-__ai uint8_t vqmovnh_u16(uint16_t __a) {
-  return (uint8_t)__builtin_neon_vqmovnh_u16(__a); }
-__ai uint16_t vqmovns_u32(uint32_t __a) {
-  return (uint16_t)__builtin_neon_vqmovns_u32(__a); }
-__ai uint32_t vqmovnd_u64(uint64_t __a) {
-  return (uint32_t)__builtin_neon_vqmovnd_u64(__a); }
-
-__ai uint8_t vsqaddb_u8(uint8_t __a, uint8_t __b) {
-  return (uint8_t)__builtin_neon_vsqaddb_u8(__a, __b); }
-__ai uint16_t vsqaddh_u16(uint16_t __a, uint16_t __b) {
-  return (uint16_t)__builtin_neon_vsqaddh_u16(__a, __b); }
-__ai uint32_t vsqadds_u32(uint32_t __a, uint32_t __b) {
-  return (uint32_t)__builtin_neon_vsqadds_u32(__a, __b); }
-__ai uint64_t vsqaddd_u64(uint64_t __a, uint64_t __b) {
-  return (uint64_t)__builtin_neon_vsqaddd_u64(__a, __b); }
-
-#define vdupb_lane_s8(a, __b) __extension__ ({ \
-  int8x8_t __a = (a); \
-  (int8_t)__builtin_neon_vdupb_lane_i8(__a, __b); })
-#define vduph_lane_s16(a, __b) __extension__ ({ \
-  int16x4_t __a = (a); \
-  (int16_t)__builtin_neon_vduph_lane_i16(__a, __b); })
-#define vdups_lane_s32(a, __b) __extension__ ({ \
-  int32x2_t __a = (a); \
-  (int32_t)__builtin_neon_vdups_lane_i32(__a, __b); })
-#define vdupd_lane_s64(a, __b) __extension__ ({ \
-  int64x1_t __a = (a); \
-  (int64_t)__builtin_neon_vdupd_lane_i64(__a, __b); })
-#define vdups_lane_f32(a, __b) __extension__ ({ \
-  float32x2_t __a = (a); \
-  (float32_t)__builtin_neon_vdups_lane_f32(__a, __b); })
-#define vdupd_lane_f64(a, __b) __extension__ ({ \
-  float64x1_t __a = (a); \
-  (float64_t)__builtin_neon_vdupd_lane_f64(__a, __b); })
-#define vdupb_lane_u8(a, __b) __extension__ ({ \
-  uint8x8_t __a = (a); \
-  (uint8_t)__builtin_neon_vdupb_lane_i8((int8x8_t)__a, __b); })
-#define vduph_lane_u16(a, __b) __extension__ ({ \
-  uint16x4_t __a = (a); \
-  (uint16_t)__builtin_neon_vduph_lane_i16((int16x4_t)__a, __b); })
-#define vdups_lane_u32(a, __b) __extension__ ({ \
-  uint32x2_t __a = (a); \
-  (uint32_t)__builtin_neon_vdups_lane_i32((int32x2_t)__a, __b); })
-#define vdupd_lane_u64(a, __b) __extension__ ({ \
-  uint64x1_t __a = (a); \
-  (uint64_t)__builtin_neon_vdupd_lane_i64((int64x1_t)__a, __b); })
-#define vdupb_lane_p8(a, __b) __extension__ ({ \
-  poly8x8_t __a = (a); \
-  (poly8_t)__builtin_neon_vdupb_lane_i8((int8x8_t)__a, __b); })
-#define vduph_lane_p16(a, __b) __extension__ ({ \
-  poly16x4_t __a = (a); \
-  (poly16_t)__builtin_neon_vduph_lane_i16((int16x4_t)__a, __b); })
-
-#define vdupb_laneq_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  (int8_t)__builtin_neon_vdupb_laneq_i8(__a, __b); })
-#define vduph_laneq_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  (int16_t)__builtin_neon_vduph_laneq_i16(__a, __b); })
-#define vdups_laneq_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  (int32_t)__builtin_neon_vdups_laneq_i32(__a, __b); })
-#define vdupd_laneq_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  (int64_t)__builtin_neon_vdupd_laneq_i64(__a, __b); })
-#define vdups_laneq_f32(a, __b) __extension__ ({ \
-  float32x4_t __a = (a); \
-  (float32_t)__builtin_neon_vdups_laneq_f32(__a, __b); })
-#define vdupd_laneq_f64(a, __b) __extension__ ({ \
-  float64x2_t __a = (a); \
-  (float64_t)__builtin_neon_vdupd_laneq_f64(__a, __b); })
-#define vdupb_laneq_u8(a, __b) __extension__ ({ \
-  uint8x16_t __a = (a); \
-  (uint8_t)__builtin_neon_vdupb_laneq_i8((int8x16_t)__a, __b); })
-#define vduph_laneq_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  (uint16_t)__builtin_neon_vduph_laneq_i16((int16x8_t)__a, __b); })
-#define vdups_laneq_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  (uint32_t)__builtin_neon_vdups_laneq_i32((int32x4_t)__a, __b); })
-#define vdupd_laneq_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  (uint64_t)__builtin_neon_vdupd_laneq_i64((int64x2_t)__a, __b); })
-#define vdupb_laneq_p8(a, __b) __extension__ ({ \
-  poly8x16_t __a = (a); \
-  (poly8_t)__builtin_neon_vdupb_laneq_i8((int8x16_t)__a, __b); })
-#define vduph_laneq_p16(a, __b) __extension__ ({ \
-  poly16x8_t __a = (a); \
-  (poly16_t)__builtin_neon_vduph_laneq_i16((int16x8_t)__a, __b); })
-
-#define vmulx_lane_f64(a, b, __c) __extension__ ({ \
-  float64x1_t __a = (a); float64x1_t __b = (b); \
-  float64_t __d1 = vget_lane_f64(__a, 0);\
-  float64_t __e1 = vget_lane_f64(__b, __c);\
-  float64_t __f1 = vmulxd_f64(__d1, __e1);\
-  float64x1_t __g1;\
-  vset_lane_f64(__f1, __g1, __c); })
-
-#define vmulx_laneq_f64(a, b, __c) __extension__ ({ \
-  float64x1_t __a = (a); float64x2_t __b = (b); \
-  float64_t __d1 = vget_lane_f64(__a, 0);\
-  float64_t __e1 = vgetq_lane_f64(__b, __c);\
-  float64_t __f1 = vmulxd_f64(__d1, __e1);\
-  float64x1_t __g1;\
-  vset_lane_f64(__f1, __g1, 0); })
-
-#define vmul_lane_f64(a, b, __c) __extension__ ({ \
-  float64x1_t __a = (a); float64x1_t __b = (b); \
-  (float64x1_t)__builtin_neon_vmul_lane_v((int8x8_t)__a, (int8x8_t)__b, __c, 9); })
-
-#define vmul_laneq_f64(a, b, __c) __extension__ ({ \
-  float64x1_t __a = (a); float64x2_t __b = (b); \
-  (float64x1_t)__builtin_neon_vmul_laneq_v((int8x8_t)__a, (int8x16_t)__b, __c, 9); })
-
-__ai float64x1_t vmul_n_f64(float64x1_t __a, float64_t __b) {
-  return (float64x1_t)__builtin_neon_vmul_n_f64(__a, __b); }
-
-#define vset_lane_f64(a, b, __c) __extension__ ({ \
-  float64_t __a = (a); float64x1_t __b = (b); \
-  (float64x1_t)__builtin_neon_vset_lane_f64(__a, __b, __c); })
-#define vsetq_lane_f64(a, b, __c) __extension__ ({ \
-  float64_t __a = (a); float64x2_t __b = (b); \
-  (float64x2_t)__builtin_neon_vsetq_lane_f64(__a, __b, __c); })
-#define vset_lane_p64(a, b, __c) __extension__ ({ \
-  poly64_t __a = (a); poly64x1_t __b = (b); \
-  (poly64x1_t)__builtin_neon_vset_lane_i64(__a, (int64x1_t)__b, __c); })
-#define vsetq_lane_p64(a, b, __c) __extension__ ({ \
-  poly64_t __a = (a); poly64x2_t __b = (b); \
-  (poly64x2_t)__builtin_neon_vsetq_lane_i64(__a, (int64x2_t)__b, __c); })
-
-#define vshll_high_n_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  int8x8_t __a1 = vget_high_s8(__a); \
-  (int16x8_t)vshll_n_s8(__a1, __b); })
-#define vshll_high_n_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  int16x4_t __a1 = vget_high_s16(__a); \
-  (int32x4_t)vshll_n_s16(__a1, __b); })
-#define vshll_high_n_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  int32x2_t __a1 = vget_high_s32(__a); \
-  (int64x2_t)vshll_n_s32(__a1, __b); })
-#define vshll_high_n_u8(a, __b) __extension__ ({ \
-  uint8x16_t __a = (a); \
-  uint8x8_t __a1 = vget_high_u8(__a); \
-  (uint16x8_t)vshll_n_u8(__a1, __b); })
-#define vshll_high_n_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  uint16x4_t __a1 = vget_high_u16(__a); \
-  (uint32x4_t)vshll_n_u16(__a1, __b); })
-#define vshll_high_n_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  uint32x2_t __a1 = vget_high_u32(__a); \
-  (uint64x2_t)vshll_n_u32(__a1, __b); })
-
-#define vshrn_high_n_s16(a, b, __c) __extension__ ({ \
-  int8x8_t __a = (a); int16x8_t __b = (b); \
-  (int8x16_t)vcombine_s16(__a, vshrn_n_s16(__b, __c)); })
-#define vshrn_high_n_s32(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int32x4_t __b = (b); \
-  (int16x8_t)vcombine_s32(__a, vshrn_n_s32(__b, __c)); })
-#define vshrn_high_n_s64(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int64x2_t __b = (b); \
-  (int32x4_t)vcombine_s64(__a, vshrn_n_s64(__b, __c)); })
-#define vshrn_high_n_u16(a, b, __c) __extension__ ({ \
-  uint8x8_t __a = (a); uint16x8_t __b = (b); \
-  (uint8x16_t)vcombine_u16(__a, vshrn_n_u16(__b, __c)); })
-#define vshrn_high_n_u32(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint32x4_t __b = (b); \
-  (uint16x8_t)vcombine_u32(__a, vshrn_n_u32(__b, __c)); })
-#define vshrn_high_n_u64(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint64x2_t __b = (b); \
-  (uint32x4_t)vcombine_u64(__a, vshrn_n_u64(__b, __c)); })
-
-#define vsli_n_p64(a, b, __c) __extension__ ({ \
-  poly64x1_t __a = (a); poly64x1_t __b = (b); \
-  (poly64x1_t)__builtin_neon_vsli_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 6); })
-#define vsliq_n_p64(a, b, __c) __extension__ ({ \
-  poly64x2_t __a = (a); poly64x2_t __b = (b); \
-  (poly64x2_t)__builtin_neon_vsliq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 38); })
-
-__ai int8x16_t vqmovun_high_s16(int8x8_t __a, int16x8_t __b) {
-  int8x8_t __a1 = vqmovun_s16(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); }
-__ai int16x8_t vqmovun_high_s32(int16x4_t __a, int32x4_t __b) {
-  int16x4_t __a1 = vqmovun_s32(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7); }
-__ai int32x4_t vqmovun_high_s64(int32x2_t __a, int64x2_t __b) {
-  int32x2_t __a1 = vqmovun_s64(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3); }
-
-#define vsri_n_p64(a, b, __c) __extension__ ({ \
-  poly64x1_t __a = (a); poly64x1_t __b = (b); \
-  (poly64x1_t)__builtin_neon_vsri_n_v((int8x8_t)__a, (int8x8_t)__b, __c, 6); })
-#define vsriq_n_p64(a, b, __c) __extension__ ({ \
-  poly64x2_t __a = (a); poly64x2_t __b = (b); \
-  (poly64x2_t)__builtin_neon_vsriq_n_v((int8x16_t)__a, (int8x16_t)__b, __c, 38); })
-
-#define vst1q_f64(__a, b) __extension__ ({ \
-  float64x2_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 41); })
-#define vst1_f64(__a, b) __extension__ ({ \
-  float64x1_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 9); })
-#define vst1_p64(__a, b) __extension__ ({ \
-  poly64x1_t __b = (b); \
-  __builtin_neon_vst1_v(__a, (int8x8_t)__b, 6); })
-#define vst1q_p64(__a, b) __extension__ ({ \
-  poly64x2_t __b = (b); \
-  __builtin_neon_vst1q_v(__a, (int8x16_t)__b, 38); })
-
-#define vst1q_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x2_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 41); })
-#define vst1q_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x2_t __b = (b); \
-  __builtin_neon_vst1q_lane_v(__a, (int8x16_t)__b, __c, 38); })
-#define vst1_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x1_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 9); })
-#define vst1_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x1_t __b = (b); \
-  __builtin_neon_vst1_lane_v(__a, (int8x8_t)__b, __c, 6); })
-
-#define vst1q_u8_x2(__a, b) __extension__ ({ \
-  uint8x16x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 48); })
-#define vst1q_u16_x2(__a, b) __extension__ ({ \
-  uint16x8x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 49); })
-#define vst1q_u32_x2(__a, b) __extension__ ({ \
-  uint32x4x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 50); })
-#define vst1q_u64_x2(__a, b) __extension__ ({ \
-  uint64x2x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 51); })
-#define vst1q_s8_x2(__a, b) __extension__ ({ \
-  int8x16x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, __b.val[0], __b.val[1], 32); })
-#define vst1q_s16_x2(__a, b) __extension__ ({ \
-  int16x8x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 33); })
-#define vst1q_s32_x2(__a, b) __extension__ ({ \
-  int32x4x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 34); })
-#define vst1q_s64_x2(__a, b) __extension__ ({ \
-  int64x2x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 35); })
-#define vst1q_f16_x2(__a, b) __extension__ ({ \
-  float16x8x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 39); })
-#define vst1q_f32_x2(__a, b) __extension__ ({ \
-  float32x4x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 40); })
-#define vst1q_f64_x2(__a, b) __extension__ ({ \
-  float64x2x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 41); })
-#define vst1q_p8_x2(__a, b) __extension__ ({ \
-  poly8x16x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 36); })
-#define vst1q_p16_x2(__a, b) __extension__ ({ \
-  poly16x8x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 37); })
-#define vst1q_p64_x2(__a, b) __extension__ ({ \
-  poly64x2x2_t __b = (b); \
-  __builtin_neon_vst1q_x2_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 38); })
-#define vst1_u8_x2(__a, b) __extension__ ({ \
-  uint8x8x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 16); })
-#define vst1_u16_x2(__a, b) __extension__ ({ \
-  uint16x4x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 17); })
-#define vst1_u32_x2(__a, b) __extension__ ({ \
-  uint32x2x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 18); })
-#define vst1_u64_x2(__a, b) __extension__ ({ \
-  uint64x1x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 19); })
-#define vst1_s8_x2(__a, b) __extension__ ({ \
-  int8x8x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, __b.val[0], __b.val[1], 0); })
-#define vst1_s16_x2(__a, b) __extension__ ({ \
-  int16x4x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 1); })
-#define vst1_s32_x2(__a, b) __extension__ ({ \
-  int32x2x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 2); })
-#define vst1_s64_x2(__a, b) __extension__ ({ \
-  int64x1x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 3); })
-#define vst1_f16_x2(__a, b) __extension__ ({ \
-  float16x4x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 7); })
-#define vst1_f32_x2(__a, b) __extension__ ({ \
-  float32x2x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 8); })
-#define vst1_f64_x2(__a, b) __extension__ ({ \
-  float64x1x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 9); })
-#define vst1_p8_x2(__a, b) __extension__ ({ \
-  poly8x8x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 4); })
-#define vst1_p16_x2(__a, b) __extension__ ({ \
-  poly16x4x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 5); })
-#define vst1_p64_x2(__a, b) __extension__ ({ \
-  poly64x1x2_t __b = (b); \
-  __builtin_neon_vst1_x2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 6); })
-
-#define vst1q_u8_x3(__a, b) __extension__ ({ \
-  uint8x16x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 48); })
-#define vst1q_u16_x3(__a, b) __extension__ ({ \
-  uint16x8x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 49); })
-#define vst1q_u32_x3(__a, b) __extension__ ({ \
-  uint32x4x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 50); })
-#define vst1q_u64_x3(__a, b) __extension__ ({ \
-  uint64x2x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 51); })
-#define vst1q_s8_x3(__a, b) __extension__ ({ \
-  int8x16x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, __b.val[0], __b.val[1], __b.val[2], 32); })
-#define vst1q_s16_x3(__a, b) __extension__ ({ \
-  int16x8x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 33); })
-#define vst1q_s32_x3(__a, b) __extension__ ({ \
-  int32x4x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 34); })
-#define vst1q_s64_x3(__a, b) __extension__ ({ \
-  int64x2x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 35); })
-#define vst1q_f16_x3(__a, b) __extension__ ({ \
-  float16x8x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 39); })
-#define vst1q_f32_x3(__a, b) __extension__ ({ \
-  float32x4x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 40); })
-#define vst1q_f64_x3(__a, b) __extension__ ({ \
-  float64x2x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 41); })
-#define vst1q_p8_x3(__a, b) __extension__ ({ \
-  poly8x16x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 36); })
-#define vst1q_p16_x3(__a, b) __extension__ ({ \
-  poly16x8x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 37); })
-#define vst1q_p64_x3(__a, b) __extension__ ({ \
-  poly64x2x3_t __b = (b); \
-  __builtin_neon_vst1q_x3_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 38); })
-#define vst1_u8_x3(__a, b) __extension__ ({ \
-  uint8x8x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 16); })
-#define vst1_u16_x3(__a, b) __extension__ ({ \
-  uint16x4x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 17); })
-#define vst1_u32_x3(__a, b) __extension__ ({ \
-  uint32x2x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 18); })
-#define vst1_u64_x3(__a, b) __extension__ ({ \
-  uint64x1x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 19); })
-#define vst1_s8_x3(__a, b) __extension__ ({ \
-  int8x8x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, __b.val[0], __b.val[1], __b.val[2], 0); })
-#define vst1_s16_x3(__a, b) __extension__ ({ \
-  int16x4x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 1); })
-#define vst1_s32_x3(__a, b) __extension__ ({ \
-  int32x2x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 2); })
-#define vst1_s64_x3(__a, b) __extension__ ({ \
-  int64x1x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 3); })
-#define vst1_f16_x3(__a, b) __extension__ ({ \
-  float16x4x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 7); })
-#define vst1_f32_x3(__a, b) __extension__ ({ \
-  float32x2x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 8); })
-#define vst1_f64_x3(__a, b) __extension__ ({ \
-  float64x1x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 9); })
-#define vst1_p8_x3(__a, b) __extension__ ({ \
-  poly8x8x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 4); })
-#define vst1_p16_x3(__a, b) __extension__ ({ \
-  poly16x4x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 5); })
-#define vst1_p64_x3(__a, b) __extension__ ({ \
-  poly64x1x3_t __b = (b); \
-  __builtin_neon_vst1_x3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 6); })
-
-#define vst1q_u8_x4(__a, b) __extension__ ({ \
-  uint8x16x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 48); })
-#define vst1q_u16_x4(__a, b) __extension__ ({ \
-  uint16x8x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 49); })
-#define vst1q_u32_x4(__a, b) __extension__ ({ \
-  uint32x4x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 50); })
-#define vst1q_u64_x4(__a, b) __extension__ ({ \
-  uint64x2x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 51); })
-#define vst1q_s8_x4(__a, b) __extension__ ({ \
-  int8x16x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], 32); })
-#define vst1q_s16_x4(__a, b) __extension__ ({ \
-  int16x8x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 33); })
-#define vst1q_s32_x4(__a, b) __extension__ ({ \
-  int32x4x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 34); })
-#define vst1q_s64_x4(__a, b) __extension__ ({ \
-  int64x2x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 35); })
-#define vst1q_f16_x4(__a, b) __extension__ ({ \
-  float16x8x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 39); })
-#define vst1q_f32_x4(__a, b) __extension__ ({ \
-  float32x4x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 40); })
-#define vst1q_f64_x4(__a, b) __extension__ ({ \
-  float64x2x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 41); })
-#define vst1q_p8_x4(__a, b) __extension__ ({ \
-  poly8x16x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 36); })
-#define vst1q_p16_x4(__a, b) __extension__ ({ \
-  poly16x8x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 37); })
-#define vst1q_p64_x4(__a, b) __extension__ ({ \
-  poly64x2x4_t __b = (b); \
-  __builtin_neon_vst1q_x4_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 38); })
-#define vst1_u8_x4(__a, b) __extension__ ({ \
-  uint8x8x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 16); })
-#define vst1_u16_x4(__a, b) __extension__ ({ \
-  uint16x4x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 17); })
-#define vst1_u32_x4(__a, b) __extension__ ({ \
-  uint32x2x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 18); })
-#define vst1_u64_x4(__a, b) __extension__ ({ \
-  uint64x1x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 19); })
-#define vst1_s8_x4(__a, b) __extension__ ({ \
-  int8x8x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], 0); })
-#define vst1_s16_x4(__a, b) __extension__ ({ \
-  int16x4x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 1); })
-#define vst1_s32_x4(__a, b) __extension__ ({ \
-  int32x2x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 2); })
-#define vst1_s64_x4(__a, b) __extension__ ({ \
-  int64x1x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 3); })
-#define vst1_f16_x4(__a, b) __extension__ ({ \
-  float16x4x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 7); })
-#define vst1_f32_x4(__a, b) __extension__ ({ \
-  float32x2x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 8); })
-#define vst1_f64_x4(__a, b) __extension__ ({ \
-  float64x1x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 9); })
-#define vst1_p8_x4(__a, b) __extension__ ({ \
-  poly8x8x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 4); })
-#define vst1_p16_x4(__a, b) __extension__ ({ \
-  poly16x4x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 5); })
-#define vst1_p64_x4(__a, b) __extension__ ({ \
-  poly64x1x4_t __b = (b); \
-  __builtin_neon_vst1_x4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 6); })
-
-#define vst2q_u64(__a, b) __extension__ ({ \
-  uint64x2x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 51); })
-#define vst2q_s64(__a, b) __extension__ ({ \
-  int64x2x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 35); })
-#define vst2q_f64(__a, b) __extension__ ({ \
-  float64x2x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 41); })
-#define vst2_f64(__a, b) __extension__ ({ \
-  float64x1x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 9); })
-#define vst2_p64(__a, b) __extension__ ({ \
-  poly64x1x2_t __b = (b); \
-  __builtin_neon_vst2_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], 6); })
-#define vst2q_p64(__a, b) __extension__ ({ \
-  poly64x2x2_t __b = (b); \
-  __builtin_neon_vst2q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], 38); })
-
-#define vst2q_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x16x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 48); })
-#define vst2q_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x2x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 51); })
-#define vst2q_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x16x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, __b.val[0], __b.val[1], __c, 32); })
-#define vst2q_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x2x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 35); })
-#define vst2q_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x2x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 41); })
-#define vst2q_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x16x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 36); })
-#define vst2q_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x2x2_t __b = (b); \
-  __builtin_neon_vst2q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], __c, 38); })
-#define vst2_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x1x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 19); })
-#define vst2_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x1x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 3); })
-#define vst2_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x1x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 9); })
-#define vst2_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x1x2_t __b = (b); \
-  __builtin_neon_vst2_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], __c, 6); })
-
-#define vst3q_u64(__a, b) __extension__ ({ \
-  uint64x2x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 51); })
-#define vst3q_s64(__a, b) __extension__ ({ \
-  int64x2x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 35); })
-#define vst3q_f64(__a, b) __extension__ ({ \
-  float64x2x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 41); })
-#define vst3_f64(__a, b) __extension__ ({ \
-  float64x1x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 9); })
-#define vst3_p64(__a, b) __extension__ ({ \
-  poly64x1x3_t __b = (b); \
-  __builtin_neon_vst3_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], 6); })
-#define vst3q_p64(__a, b) __extension__ ({ \
-  poly64x2x3_t __b = (b); \
-  __builtin_neon_vst3q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], 38); })
-
-#define vst3q_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x16x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 48); })
-#define vst3q_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x2x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 51); })
-#define vst3q_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x16x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, __b.val[0], __b.val[1], __b.val[2], __c, 32); })
-#define vst3q_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x2x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 35); })
-#define vst3q_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x2x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 41); })
-#define vst3q_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x16x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 36); })
-#define vst3q_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x2x3_t __b = (b); \
-  __builtin_neon_vst3q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], __c, 38); })
-#define vst3_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x1x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 19); })
-#define vst3_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x1x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 3); })
-#define vst3_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x1x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 9); })
-#define vst3_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x1x3_t __b = (b); \
-  __builtin_neon_vst3_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], __c, 6); })
-
-#define vst4q_u64(__a, b) __extension__ ({ \
-  uint64x2x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 51); })
-#define vst4q_s64(__a, b) __extension__ ({ \
-  int64x2x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 35); })
-#define vst4q_f64(__a, b) __extension__ ({ \
-  float64x2x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 41); })
-#define vst4_f64(__a, b) __extension__ ({ \
-  float64x1x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 9); })
-#define vst4_p64(__a, b) __extension__ ({ \
-  poly64x1x4_t __b = (b); \
-  __builtin_neon_vst4_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], 6); })
-#define vst4q_p64(__a, b) __extension__ ({ \
-  poly64x2x4_t __b = (b); \
-  __builtin_neon_vst4q_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], 38); })
-
-#define vst4q_lane_u8(__a, b, __c) __extension__ ({ \
-  uint8x16x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 48); })
-#define vst4q_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x2x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 51); })
-#define vst4q_lane_s8(__a, b, __c) __extension__ ({ \
-  int8x16x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], __c, 32); })
-#define vst4q_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x2x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 35); })
-#define vst4q_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x2x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 41); })
-#define vst4q_lane_p8(__a, b, __c) __extension__ ({ \
-  poly8x16x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 36); })
-#define vst4q_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x2x4_t __b = (b); \
-  __builtin_neon_vst4q_lane_v(__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], __c, 38); })
-#define vst4_lane_u64(__a, b, __c) __extension__ ({ \
-  uint64x1x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 19); })
-#define vst4_lane_s64(__a, b, __c) __extension__ ({ \
-  int64x1x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 3); })
-#define vst4_lane_f64(__a, b, __c) __extension__ ({ \
-  float64x1x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 9); })
-#define vst4_lane_p64(__a, b, __c) __extension__ ({ \
-  poly64x1x4_t __b = (b); \
-  __builtin_neon_vst4_lane_v(__a, (int8x8_t)__b.val[0], (int8x8_t)__b.val[1], (int8x8_t)__b.val[2], (int8x8_t)__b.val[3], __c, 6); })
-
-__ai float64x1_t vsub_f64(float64x1_t __a, float64x1_t __b) {
-  return __a - __b; }
-__ai float64x2_t vsubq_f64(float64x2_t __a, float64x2_t __b) {
-  return __a - __b; }
-
-__ai int8x8_t vuqadd_s8(int8x8_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vuqadd_v(__a, __b, 0); }
-__ai int16x4_t vuqadd_s16(int16x4_t __a, int16x4_t __b) {
-  return (int16x4_t)__builtin_neon_vuqadd_v((int8x8_t)__a, (int8x8_t)__b, 1); }
-__ai int32x2_t vuqadd_s32(int32x2_t __a, int32x2_t __b) {
-  return (int32x2_t)__builtin_neon_vuqadd_v((int8x8_t)__a, (int8x8_t)__b, 2); }
-__ai int64x1_t vuqadd_s64(int64x1_t __a, int64x1_t __b) {
-  return (int64x1_t)__builtin_neon_vuqadd_v((int8x8_t)__a, (int8x8_t)__b, 3); }
-__ai int8x16_t vuqaddq_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vuqaddq_v(__a, __b, 32); }
-__ai int16x8_t vuqaddq_s16(int16x8_t __a, int16x8_t __b) {
-  return (int16x8_t)__builtin_neon_vuqaddq_v((int8x16_t)__a, (int8x16_t)__b, 33); }
-__ai int32x4_t vuqaddq_s32(int32x4_t __a, int32x4_t __b) {
-  return (int32x4_t)__builtin_neon_vuqaddq_v((int8x16_t)__a, (int8x16_t)__b, 34); }
-__ai int64x2_t vuqaddq_s64(int64x2_t __a, int64x2_t __b) {
-  return (int64x2_t)__builtin_neon_vuqaddq_v((int8x16_t)__a, (int8x16_t)__b, 35); }
-
-__ai uint8x8_t vsqadd_u8(uint8x8_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vsqadd_v((int8x8_t)__a, (int8x8_t)__b, 16); }
-__ai uint16x4_t vsqadd_u16(uint16x4_t __a, uint16x4_t __b) {
-  return (uint16x4_t)__builtin_neon_vsqadd_v((int8x8_t)__a, (int8x8_t)__b, 17); }
-__ai uint32x2_t vsqadd_u32(uint32x2_t __a, uint32x2_t __b) {
-  return (uint32x2_t)__builtin_neon_vsqadd_v((int8x8_t)__a, (int8x8_t)__b, 18); }
-__ai uint64x1_t vsqadd_u64(uint64x1_t __a, uint64x1_t __b) {
-  return (uint64x1_t)__builtin_neon_vsqadd_v((int8x8_t)__a, (int8x8_t)__b, 19); }
-__ai uint8x16_t vsqaddq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vsqaddq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai uint16x8_t vsqaddq_u16(uint16x8_t __a, uint16x8_t __b) {
-  return (uint16x8_t)__builtin_neon_vsqaddq_v((int8x16_t)__a, (int8x16_t)__b, 49); }
-__ai uint32x4_t vsqaddq_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vsqaddq_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-__ai uint64x2_t vsqaddq_u64(uint64x2_t __a, uint64x2_t __b) {
-  return (uint64x2_t)__builtin_neon_vsqaddq_v((int8x16_t)__a, (int8x16_t)__b, 51); }
-
-__ai int16x8_t vabal_high_s8(int16x8_t __a, int8x16_t __b, int8x16_t __c) {
-  return vabal_s8(__a, vget_high_s8(__b), vget_high_s8(__c)); }
-__ai int32x4_t vabal_high_s16(int32x4_t __a, int16x8_t __b, int16x8_t __c) {
-  return vabal_s16(__a, vget_high_s16(__b), vget_high_s16(__c)); }
-__ai int64x2_t vabal_high_s32(int64x2_t __a, int32x4_t __b, int32x4_t __c) {
-  return vabal_s32(__a, vget_high_s32(__b), vget_high_s32(__c)); }
-__ai uint16x8_t vabal_high_u8(uint16x8_t __a, uint8x16_t __b, uint8x16_t __c) {
-  return vabal_u8(__a, vget_high_u8(__b), vget_high_u8(__c)); }
-__ai uint32x4_t vabal_high_u16(uint32x4_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return vabal_u16(__a, vget_high_u16(__b), vget_high_u16(__c)); }
-__ai uint64x2_t vabal_high_u32(uint64x2_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return vabal_u32(__a, vget_high_u32(__b), vget_high_u32(__c)); }
-
-
-__ai int8x16_t vaddhn_high_s16(int8x8_t __a, int16x8_t __b, int16x8_t __c) {
-  return vcombine_s8(__a, vaddhn_s16(__b, __c)); }
-__ai int16x8_t vaddhn_high_s32(int16x4_t __a, int32x4_t __b, int32x4_t __c) {
-  return vcombine_s16(__a, vaddhn_s32(__b, __c)); }
-__ai int32x4_t vaddhn_high_s64(int32x2_t __a, int64x2_t __b, int64x2_t __c) {
-  return vcombine_s32(__a, vaddhn_s64(__b, __c)); }
-__ai uint8x16_t vaddhn_high_u16(uint8x8_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return vcombine_u8(__a, vaddhn_u16(__b, __c)); }
-__ai uint16x8_t vaddhn_high_u32(uint16x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return vcombine_u16(__a, vaddhn_u32(__b, __c)); }
-__ai uint32x4_t vaddhn_high_u64(uint32x2_t __a, uint64x2_t __b, uint64x2_t __c) {
-  return vcombine_u32(__a, vaddhn_u64(__b, __c)); }
-
-__ai int16_t vaddlv_s8(int8x8_t __a) {
-  return (int16_t)__builtin_neon_vaddlv_s8(__a); }
-__ai int32_t vaddlv_s16(int16x4_t __a) {
-  return (int32_t)__builtin_neon_vaddlv_s16(__a); }
-__ai int64_t vaddlv_s32(int32x2_t __a) {
-  return (int64_t)__builtin_neon_vaddlv_s32(__a); }
-__ai uint16_t vaddlv_u8(uint8x8_t __a) {
-  return (uint16_t)__builtin_neon_vaddlv_u8((int8x8_t)__a); }
-__ai uint32_t vaddlv_u16(uint16x4_t __a) {
-  return (uint32_t)__builtin_neon_vaddlv_u16((int16x4_t)__a); }
-__ai uint64_t vaddlv_u32(uint32x2_t __a) {
-  return (uint64_t)__builtin_neon_vaddlv_u32((int32x2_t)__a); }
-__ai int16_t vaddlvq_s8(int8x16_t __a) {
-  return (int16_t)__builtin_neon_vaddlvq_s8(__a); }
-__ai int32_t vaddlvq_s16(int16x8_t __a) {
-  return (int32_t)__builtin_neon_vaddlvq_s16(__a); }
-__ai int64_t vaddlvq_s32(int32x4_t __a) {
-  return (int64_t)__builtin_neon_vaddlvq_s32(__a); }
-__ai uint16_t vaddlvq_u8(uint8x16_t __a) {
-  return (uint16_t)__builtin_neon_vaddlvq_u8((int8x16_t)__a); }
-__ai uint32_t vaddlvq_u16(uint16x8_t __a) {
-  return (uint32_t)__builtin_neon_vaddlvq_u16((int16x8_t)__a); }
-__ai uint64_t vaddlvq_u32(uint32x4_t __a) {
-  return (uint64_t)__builtin_neon_vaddlvq_u32((int32x4_t)__a); }
-
-__ai int16x8_t vaddl_high_s8(int8x16_t __a, int8x16_t __b) {
-  return vmovl_high_s8(__a) + vmovl_high_s8(__b); }
-__ai int32x4_t vaddl_high_s16(int16x8_t __a, int16x8_t __b) {
-  return vmovl_high_s16(__a) + vmovl_high_s16(__b); }
-__ai int64x2_t vaddl_high_s32(int32x4_t __a, int32x4_t __b) {
-  return vmovl_high_s32(__a) + vmovl_high_s32(__b); }
-__ai uint16x8_t vaddl_high_u8(uint8x16_t __a, uint8x16_t __b) {
-  return vmovl_high_u8(__a) + vmovl_high_u8(__b); }
-__ai uint32x4_t vaddl_high_u16(uint16x8_t __a, uint16x8_t __b) {
-  return vmovl_high_u16(__a) + vmovl_high_u16(__b); }
-__ai uint64x2_t vaddl_high_u32(uint32x4_t __a, uint32x4_t __b) {
-  return vmovl_high_u32(__a) + vmovl_high_u32(__b); }
-
-__ai int8_t vaddv_s8(int8x8_t __a) {
-  return (int8_t)__builtin_neon_vaddv_s8(__a); }
-__ai int16_t vaddv_s16(int16x4_t __a) {
-  return (int16_t)__builtin_neon_vaddv_s16(__a); }
-__ai int32_t vaddv_s32(int32x2_t __a) {
-  return (int32_t)__builtin_neon_vaddv_s32(__a); }
-__ai float32_t vaddv_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vaddv_f32(__a); }
-__ai uint8_t vaddv_u8(uint8x8_t __a) {
-  return (uint8_t)__builtin_neon_vaddv_u8((int8x8_t)__a); }
-__ai uint16_t vaddv_u16(uint16x4_t __a) {
-  return (uint16_t)__builtin_neon_vaddv_u16((int16x4_t)__a); }
-__ai uint32_t vaddv_u32(uint32x2_t __a) {
-  return (uint32_t)__builtin_neon_vaddv_u32((int32x2_t)__a); }
-__ai int8_t vaddvq_s8(int8x16_t __a) {
-  return (int8_t)__builtin_neon_vaddvq_s8(__a); }
-__ai int16_t vaddvq_s16(int16x8_t __a) {
-  return (int16_t)__builtin_neon_vaddvq_s16(__a); }
-__ai int32_t vaddvq_s32(int32x4_t __a) {
-  return (int32_t)__builtin_neon_vaddvq_s32(__a); }
-__ai uint8_t vaddvq_u8(uint8x16_t __a) {
-  return (uint8_t)__builtin_neon_vaddvq_u8((int8x16_t)__a); }
-__ai uint16_t vaddvq_u16(uint16x8_t __a) {
-  return (uint16_t)__builtin_neon_vaddvq_u16((int16x8_t)__a); }
-__ai uint32_t vaddvq_u32(uint32x4_t __a) {
-  return (uint32_t)__builtin_neon_vaddvq_u32((int32x4_t)__a); }
-__ai float32_t vaddvq_f32(float32x4_t __a) {
-  return (float32_t)__builtin_neon_vaddvq_f32(__a); }
-__ai float64_t vaddvq_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vaddvq_f64(__a); }
-__ai int64_t vaddvq_s64(int64x2_t __a) {
-  return (int64_t)__builtin_neon_vaddvq_s64(__a); }
-__ai uint64_t vaddvq_u64(uint64x2_t __a) {
-  return (uint64_t)__builtin_neon_vaddvq_u64((int64x2_t)__a); }
-
-__ai int16x8_t vaddw_high_s8(int16x8_t __a, int8x16_t __b) {
-  return __a + vmovl_high_s8(__b); }
-__ai int32x4_t vaddw_high_s16(int32x4_t __a, int16x8_t __b) {
-  return __a + vmovl_high_s16(__b); }
-__ai int64x2_t vaddw_high_s32(int64x2_t __a, int32x4_t __b) {
-  return __a + vmovl_high_s32(__b); }
-__ai uint16x8_t vaddw_high_u8(uint16x8_t __a, uint8x16_t __b) {
-  return __a + vmovl_high_u8(__b); }
-__ai uint32x4_t vaddw_high_u16(uint32x4_t __a, uint16x8_t __b) {
-  return __a + vmovl_high_u16(__b); }
-__ai uint64x2_t vaddw_high_u32(uint64x2_t __a, uint32x4_t __b) {
-  return __a + vmovl_high_u32(__b); }
-
-__ai float32x2_t vcvtx_f32_f64(float64x2_t __a) {
-  return (float32x2_t)__builtin_neon_vcvtx_f32_v((int8x16_t)__a, 41); }
-
-__ai float32x4_t vcvtx_high_f32_f64(float32x2_t __a, float64x2_t __b) {
-  float32x2_t __a1 = vcvtx_f32_f64(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3); }
-
-__ai float32x2_t vcvt_f32_f64(float64x2_t __a) {
-  return (float32x2_t)__builtin_neon_vcvt_f32_f64((int8x16_t)__a, 41); }
-
-__ai float64x1_t vcvt_f64_s64(int64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vcvt_f64_v((int8x8_t)__a, 3); }
-__ai float64x1_t vcvt_f64_u64(uint64x1_t __a) {
-  return (float64x1_t)__builtin_neon_vcvt_f64_v((int8x8_t)__a, 19); }
-__ai float64x2_t vcvtq_f64_s64(int64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vcvtq_f64_v((int8x16_t)__a, 35); }
-__ai float64x2_t vcvtq_f64_u64(uint64x2_t __a) {
-  return (float64x2_t)__builtin_neon_vcvtq_f64_v((int8x16_t)__a, 51); }
-
-__ai float64x2_t vcvt_f64_f32(float32x2_t __a) {
-  return (float64x2_t)__builtin_neon_vcvt_f64_f32((int8x8_t)__a, 41); }
-
-__ai float16x8_t vcvt_high_f16_f32(float16x4_t __a, float32x4_t __b) {
-  float16x4_t __a1 = vcvt_f16_f32(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7); }
-
-__ai float32x4_t vcvt_high_f32_f16(float16x8_t __a) {
-  float16x4_t __a1 = vget_high_f16(__a);
-  return vcvt_f32_f16(__a1); }
-
-__ai float32x4_t vcvt_high_f32_f64(float32x2_t __a, float64x2_t __b) {
-  float32x2_t __a1 = vcvt_f32_f64(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3); }
-
-__ai float64x2_t vcvt_high_f64_f32(float32x4_t __a) {
-  float32x2_t __a1 = vget_high_f32(__a);
-  return vcvt_f64_f32(__a1); }
-
-__ai int64x1_t vcvt_s64_f64(float64x1_t __a) {
-  return (int64x1_t)__builtin_neon_vcvt_s64_v((int8x8_t)__a, 3); }
-__ai int64x2_t vcvtq_s64_f64(float64x2_t __a) {
-  return (int64x2_t)__builtin_neon_vcvtq_s64_v((int8x16_t)__a, 35); }
-
-__ai uint64x1_t vcvt_u64_f64(float64x1_t __a) {
-  return (uint64x1_t)__builtin_neon_vcvt_u64_v((int8x8_t)__a, 19); }
-__ai uint64x2_t vcvtq_u64_f64(float64x2_t __a) {
-  return (uint64x2_t)__builtin_neon_vcvtq_u64_v((int8x16_t)__a, 51); }
-
-#define vdup_lane_f16(a, __b) __extension__ ({ \
-  float16x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdup_lane_f64(a, __b) __extension__ ({ \
-  float64x1_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b); })
-#define vdupq_lane_f16(a, __b) __extension__ ({ \
-  float16x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_lane_f64(a, __b) __extension__ ({ \
-  float64x1_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdup_lane_p64(a, __b) __extension__ ({ \
-  poly64x1_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b); })
-#define vdupq_lane_p64(a, __b) __extension__ ({ \
-  poly64x1_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-
-#define vdup_laneq_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdup_laneq_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdup_laneq_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdup_laneq_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b); })
-#define vdup_laneq_p8(a, __b) __extension__ ({ \
-  poly8x16_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdup_laneq_p16(a, __b) __extension__ ({ \
-  poly16x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdup_laneq_u8(a, __b) __extension__ ({ \
-  uint8x16_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdup_laneq_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdup_laneq_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdup_laneq_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b); })
-#define vdup_laneq_f16(a, __b) __extension__ ({ \
-  float16x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdup_laneq_f32(a, __b) __extension__ ({ \
-  float32x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdup_laneq_f64(a, __b) __extension__ ({ \
-  float64x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b); })
-#define vdupq_laneq_s8(a, __b) __extension__ ({ \
-  int8x16_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_laneq_s16(a, __b) __extension__ ({ \
-  int16x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_laneq_s32(a, __b) __extension__ ({ \
-  int32x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdupq_laneq_s64(a, __b) __extension__ ({ \
-  int64x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdupq_laneq_p8(a, __b) __extension__ ({ \
-  poly8x16_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_laneq_p16(a, __b) __extension__ ({ \
-  poly16x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_laneq_u8(a, __b) __extension__ ({ \
-  uint8x16_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_laneq_u16(a, __b) __extension__ ({ \
-  uint16x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_laneq_u32(a, __b) __extension__ ({ \
-  uint32x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdupq_laneq_u64(a, __b) __extension__ ({ \
-  uint64x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdupq_laneq_f16(a, __b) __extension__ ({ \
-  float16x8_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b, __b, __b, __b, __b); })
-#define vdupq_laneq_f32(a, __b) __extension__ ({ \
-  float32x4_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b, __b, __b); })
-#define vdupq_laneq_f64(a, __b) __extension__ ({ \
-  float64x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-#define vdup_laneq_p64(a, __b) __extension__ ({ \
-  poly64x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b); })
-#define vdupq_laneq_p64(a, __b) __extension__ ({ \
-  poly64x2_t __a = (a); \
-  __builtin_shufflevector(__a, __a, __b, __b); })
-
-#define vext_f64(a, b, __c) __extension__ ({ \
-  float64x1_t __a = (a); float64x1_t __b = (b); \
-  (float64x1_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 9); })
-#define vextq_f64(a, b, __c) __extension__ ({ \
-  float64x2_t __a = (a); float64x2_t __b = (b); \
-  (float64x2_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 41); })
-#define vext_p64(a, b, __c) __extension__ ({ \
-  poly64x1_t __a = (a); poly64x1_t __b = (b); \
-  (poly64x1_t)__builtin_neon_vext_v((int8x8_t)__a, (int8x8_t)__b, __c, 6); })
-#define vextq_p64(a, b, __c) __extension__ ({ \
-  poly64x2_t __a = (a); poly64x2_t __b = (b); \
-  (poly64x2_t)__builtin_neon_vextq_v((int8x16_t)__a, (int8x16_t)__b, __c, 38); })
-
-#define vfma_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); float32x2_t __c = (c); \
-  (float32x2_t)__builtin_neon_vfma_lane_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, __d, 8); })
-#define vfma_lane_f64(a, b, c, __d) __extension__ ({ \
-  float64x1_t __a = (a); float64x1_t __b = (b); float64x1_t __c = (c); \
-  (float64x1_t)__builtin_neon_vfma_lane_v((int8x8_t)__a, (int8x8_t)__b, (int8x8_t)__c, __d, 9); })
-#define vfmaq_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); float32x2_t __c = (c); \
-  (float32x4_t)__builtin_neon_vfmaq_lane_v((int8x16_t)__a, (int8x16_t)__b, (int8x8_t)__c, __d, 40); })
-#define vfmaq_lane_f64(a, b, c, __d) __extension__ ({ \
-  float64x2_t __a = (a); float64x2_t __b = (b); float64x1_t __c = (c); \
-  (float64x2_t)__builtin_neon_vfmaq_lane_v((int8x16_t)__a, (int8x16_t)__b, (int8x8_t)__c, __d, 41); })
-
-#define vfma_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); float32x4_t __c = (c); \
-  (float32x2_t)__builtin_neon_vfma_laneq_v((int8x8_t)__a, (int8x8_t)__b, (int8x16_t)__c, __d, 8); })
-#define vfma_laneq_f64(a, b, c, __d) __extension__ ({ \
-  float64x1_t __a = (a); float64x1_t __b = (b); float64x2_t __c = (c); \
-  (float64x1_t)__builtin_neon_vfma_laneq_v((int8x8_t)__a, (int8x8_t)__b, (int8x16_t)__c, __d, 9); })
-#define vfmaq_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); float32x4_t __c = (c); \
-  (float32x4_t)__builtin_neon_vfmaq_laneq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, __d, 40); })
-#define vfmaq_laneq_f64(a, b, c, __d) __extension__ ({ \
-  float64x2_t __a = (a); float64x2_t __b = (b); float64x2_t __c = (c); \
-  (float64x2_t)__builtin_neon_vfmaq_laneq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, __d, 41); })
-
-#define vfms_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); float32x2_t __c = (c); \
-  float32x2_t __a1 = __a; \
-  float32x2_t __b1 = __b; \
-  float32x2_t __c1 = __c; \
-  vfma_lane_f32(__a1, __b1, -__c1, __d); })
-#define vfms_lane_f64(a, b, c, __d) __extension__ ({ \
-  float64x1_t __a = (a); float64x1_t __b = (b); float64x1_t __c = (c); \
-  float64x1_t __a1 = __a; \
-  float64x1_t __b1 = __b; \
-  float64x1_t __c1 = __c; \
-  vfma_lane_f64(__a1, __b1, -__c1, __d); })
-#define vfmsq_lane_f32(a, b, c, __d) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); float32x2_t __c = (c); \
-  float32x4_t __a1 = __a; \
-  float32x4_t __b1 = __b; \
-  float32x2_t __c1 = __c; \
-  vfmaq_lane_f32(__a1, __b1, -__c1, __d); })
-#define vfmsq_lane_f64(a, b, c, __d) __extension__ ({ \
-  float64x2_t __a = (a); float64x2_t __b = (b); float64x1_t __c = (c); \
-  float64x2_t __a1 = __a; \
-  float64x2_t __b1 = __b; \
-  float64x1_t __c1 = __c; \
-  vfmaq_lane_f64(__a1, __b1, -__c1, __d); })
-
-#define vfms_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); float32x4_t __c = (c); \
-  float32x2_t __a1 = __a; \
-  float32x2_t __b1 = __b; \
-  float32x4_t __c1 = __c; \
-  vfma_laneq_f32(__a1, __b1, -__c1, __d); })
-#define vfms_laneq_f64(a, b, c, __d) __extension__ ({ \
-  float64x1_t __a = (a); float64x1_t __b = (b); float64x2_t __c = (c); \
-  float64x1_t __a1 = __a; \
-  float64x1_t __b1 = __b; \
-  float64x2_t __c1 = __c; \
-  vfma_laneq_f64(__a1, __b1, -__c1, __d); })
-#define vfmsq_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); float32x4_t __c = (c); \
-  float32x4_t __a1 = __a; \
-  float32x4_t __b1 = __b; \
-  float32x4_t __c1 = __c; \
-  vfmaq_laneq_f32(__a1, __b1, -__c1, __d); })
-#define vfmsq_laneq_f64(a, b, c, __d) __extension__ ({ \
-  float64x2_t __a = (a); float64x2_t __b = (b); float64x2_t __c = (c); \
-  float64x2_t __a1 = __a; \
-  float64x2_t __b1 = __b; \
-  float64x2_t __c1 = __c; \
-  vfmaq_laneq_f64(__a1, __b1, -__c1, __d); })
-
-__ai float64x1_t vget_high_f64(float64x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 1); }
-__ai poly64x1_t vget_high_p64(poly64x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 1); }
-
-__ai float64x1_t vget_low_f64(float64x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 0); }
-__ai poly64x1_t vget_low_p64(poly64x2_t __a) {
-  return __builtin_shufflevector(__a, __a, 0); }
-
-__ai int8_t vmaxv_s8(int8x8_t __a) {
-  return (int8_t)__builtin_neon_vmaxv_s8(__a); }
-__ai int16_t vmaxv_s16(int16x4_t __a) {
-  return (int16_t)__builtin_neon_vmaxv_s16(__a); }
-__ai int32_t vmaxv_s32(int32x2_t __a) {
-  return (int32_t)__builtin_neon_vmaxv_s32(__a); }
-__ai float32_t vmaxv_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vmaxv_f32(__a); }
-__ai uint8_t vmaxv_u8(uint8x8_t __a) {
-  return (uint8_t)__builtin_neon_vmaxv_u8((int8x8_t)__a); }
-__ai uint16_t vmaxv_u16(uint16x4_t __a) {
-  return (uint16_t)__builtin_neon_vmaxv_u16((int16x4_t)__a); }
-__ai uint32_t vmaxv_u32(uint32x2_t __a) {
-  return (uint32_t)__builtin_neon_vmaxv_u32((int32x2_t)__a); }
-__ai int8_t vmaxvq_s8(int8x16_t __a) {
-  return (int8_t)__builtin_neon_vmaxvq_s8(__a); }
-__ai int16_t vmaxvq_s16(int16x8_t __a) {
-  return (int16_t)__builtin_neon_vmaxvq_s16(__a); }
-__ai int32_t vmaxvq_s32(int32x4_t __a) {
-  return (int32_t)__builtin_neon_vmaxvq_s32(__a); }
-__ai uint8_t vmaxvq_u8(uint8x16_t __a) {
-  return (uint8_t)__builtin_neon_vmaxvq_u8((int8x16_t)__a); }
-__ai uint16_t vmaxvq_u16(uint16x8_t __a) {
-  return (uint16_t)__builtin_neon_vmaxvq_u16((int16x8_t)__a); }
-__ai uint32_t vmaxvq_u32(uint32x4_t __a) {
-  return (uint32_t)__builtin_neon_vmaxvq_u32((int32x4_t)__a); }
-__ai float32_t vmaxvq_f32(float32x4_t __a) {
-  return (float32_t)__builtin_neon_vmaxvq_f32(__a); }
-__ai float64_t vmaxvq_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vmaxvq_f64(__a); }
-
-__ai int8_t vminv_s8(int8x8_t __a) {
-  return (int8_t)__builtin_neon_vminv_s8(__a); }
-__ai int16_t vminv_s16(int16x4_t __a) {
-  return (int16_t)__builtin_neon_vminv_s16(__a); }
-__ai int32_t vminv_s32(int32x2_t __a) {
-  return (int32_t)__builtin_neon_vminv_s32(__a); }
-__ai float32_t vminv_f32(float32x2_t __a) {
-  return (float32_t)__builtin_neon_vminv_f32(__a); }
-__ai uint8_t vminv_u8(uint8x8_t __a) {
-  return (uint8_t)__builtin_neon_vminv_u8((int8x8_t)__a); }
-__ai uint16_t vminv_u16(uint16x4_t __a) {
-  return (uint16_t)__builtin_neon_vminv_u16((int16x4_t)__a); }
-__ai uint32_t vminv_u32(uint32x2_t __a) {
-  return (uint32_t)__builtin_neon_vminv_u32((int32x2_t)__a); }
-__ai int8_t vminvq_s8(int8x16_t __a) {
-  return (int8_t)__builtin_neon_vminvq_s8(__a); }
-__ai int16_t vminvq_s16(int16x8_t __a) {
-  return (int16_t)__builtin_neon_vminvq_s16(__a); }
-__ai int32_t vminvq_s32(int32x4_t __a) {
-  return (int32_t)__builtin_neon_vminvq_s32(__a); }
-__ai uint8_t vminvq_u8(uint8x16_t __a) {
-  return (uint8_t)__builtin_neon_vminvq_u8((int8x16_t)__a); }
-__ai uint16_t vminvq_u16(uint16x8_t __a) {
-  return (uint16_t)__builtin_neon_vminvq_u16((int16x8_t)__a); }
-__ai uint32_t vminvq_u32(uint32x4_t __a) {
-  return (uint32_t)__builtin_neon_vminvq_u32((int32x4_t)__a); }
-__ai float32_t vminvq_f32(float32x4_t __a) {
-  return (float32_t)__builtin_neon_vminvq_f32(__a); }
-__ai float64_t vminvq_f64(float64x2_t __a) {
-  return (float64_t)__builtin_neon_vminvq_f64(__a); }
-
-__ai int16x8_t vmlal_high_s8(int16x8_t __a, int8x16_t __b, int8x16_t __c) {
-  return vmlal_s8(__a, vget_high_s8(__b), vget_high_s8(__c)); }
-__ai int32x4_t vmlal_high_s16(int32x4_t __a, int16x8_t __b, int16x8_t __c) {
-  return vmlal_s16(__a, vget_high_s16(__b), vget_high_s16(__c)); }
-__ai int64x2_t vmlal_high_s32(int64x2_t __a, int32x4_t __b, int32x4_t __c) {
-  return vmlal_s32(__a, vget_high_s32(__b), vget_high_s32(__c)); }
-__ai uint16x8_t vmlal_high_u8(uint16x8_t __a, uint8x16_t __b, uint8x16_t __c) {
-  return vmlal_u8(__a, vget_high_u8(__b), vget_high_u8(__c)); }
-__ai uint32x4_t vmlal_high_u16(uint32x4_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return vmlal_u16(__a, vget_high_u16(__b), vget_high_u16(__c)); }
-__ai uint64x2_t vmlal_high_u32(uint64x2_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return vmlal_u32(__a, vget_high_u32(__b), vget_high_u32(__c)); }
-
-#define vmlal_high_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x8_t __b = (b); int16x4_t __c = (c); \
-  __a + vmull_s16(vget_high_s16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlal_high_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x4_t __b = (b); int32x2_t __c = (c); \
-  __a + vmull_s32(vget_high_s32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlal_high_lane_u16(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint16x8_t __b = (b); uint16x4_t __c = (c); \
-  __a + vmull_u16(vget_high_u16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlal_high_lane_u32(a, b, c, __d) __extension__ ({ \
-  uint64x2_t __a = (a); uint32x4_t __b = (b); uint32x2_t __c = (c); \
-  __a + vmull_u32(vget_high_u32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-
-#define vmlal_high_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x8_t __b = (b); int16x8_t __c = (c); \
-  __a + vmull_s16(vget_high_s16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlal_high_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x4_t __b = (b); int32x4_t __c = (c); \
-  __a + vmull_s32(vget_high_s32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlal_high_laneq_u16(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint16x8_t __b = (b); uint16x8_t __c = (c); \
-  __a + vmull_u16(vget_high_u16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlal_high_laneq_u32(a, b, c, __d) __extension__ ({ \
-  uint64x2_t __a = (a); uint32x4_t __b = (b); uint32x4_t __c = (c); \
-  __a + vmull_u32(vget_high_u32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-
-__ai int32x4_t vmlal_high_n_s16(int32x4_t __a, int16x8_t __b, int16_t __c) {
-  return vmlal_n_s16(__a, vget_high_s16(__b), __c); }
-__ai int64x2_t vmlal_high_n_s32(int64x2_t __a, int32x4_t __b, int32_t __c) {
-  return vmlal_n_s32(__a, vget_high_s32(__b), __c); }
-__ai uint32x4_t vmlal_high_n_u16(uint32x4_t __a, uint16x8_t __b, uint16_t __c) {
-  return vmlal_n_u16(__a, vget_high_u16(__b), __c); }
-__ai uint64x2_t vmlal_high_n_u32(uint64x2_t __a, uint32x4_t __b, uint32_t __c) {
-  return vmlal_n_u32(__a, vget_high_u32(__b), __c); }
-
-#define vmlal_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x4_t __b = (b); int16x8_t __c = (c); \
-  __a + vmull_s16(__b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlal_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x2_t __b = (b); int32x4_t __c = (c); \
-  __a + vmull_s32(__b, __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlal_laneq_u16(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint16x4_t __b = (b); uint16x8_t __c = (c); \
-  __a + vmull_u16(__b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlal_laneq_u32(a, b, c, __d) __extension__ ({ \
-  uint64x2_t __a = (a); uint32x2_t __b = (b); uint32x4_t __c = (c); \
-  __a + vmull_u32(__b, __builtin_shufflevector(__c, __c, __d, __d)); })
-
-#define vmla_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); int16x8_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmla_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); int32x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmla_laneq_u16(a, b, c, __d) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); uint16x8_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmla_laneq_u32(a, b, c, __d) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); uint32x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmla_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); float32x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlaq_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); int16x8_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d, __d, __d, __d, __d)); })
-#define vmlaq_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); int32x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlaq_laneq_u16(a, b, c, __d) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); uint16x8_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d, __d, __d, __d, __d)); })
-#define vmlaq_laneq_u32(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); uint32x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlaq_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); float32x4_t __c = (c); \
-  __a + (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-
-__ai int16x8_t vmlsl_high_s8(int16x8_t __a, int8x16_t __b, int8x16_t __c) {
-  return vmlsl_s8(__a, vget_high_s8(__b), vget_high_s8(__c)); }
-__ai int32x4_t vmlsl_high_s16(int32x4_t __a, int16x8_t __b, int16x8_t __c) {
-  return vmlsl_s16(__a, vget_high_s16(__b), vget_high_s16(__c)); }
-__ai int64x2_t vmlsl_high_s32(int64x2_t __a, int32x4_t __b, int32x4_t __c) {
-  return vmlsl_s32(__a, vget_high_s32(__b), vget_high_s32(__c)); }
-__ai uint16x8_t vmlsl_high_u8(uint16x8_t __a, uint8x16_t __b, uint8x16_t __c) {
-  return vmlsl_u8(__a, vget_high_u8(__b), vget_high_u8(__c)); }
-__ai uint32x4_t vmlsl_high_u16(uint32x4_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return vmlsl_u16(__a, vget_high_u16(__b), vget_high_u16(__c)); }
-__ai uint64x2_t vmlsl_high_u32(uint64x2_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return vmlsl_u32(__a, vget_high_u32(__b), vget_high_u32(__c)); }
-
-#define vmlsl_high_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x8_t __b = (b); int16x4_t __c = (c); \
-  __a - vmull_s16(vget_high_s16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsl_high_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x4_t __b = (b); int32x2_t __c = (c); \
-  __a - vmull_s32(vget_high_s32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlsl_high_lane_u16(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint16x8_t __b = (b); uint16x4_t __c = (c); \
-  __a - vmull_u16(vget_high_u16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsl_high_lane_u32(a, b, c, __d) __extension__ ({ \
-  uint64x2_t __a = (a); uint32x4_t __b = (b); uint32x2_t __c = (c); \
-  __a - vmull_u32(vget_high_u32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-
-#define vmlsl_high_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x8_t __b = (b); int16x8_t __c = (c); \
-  __a - vmull_s16(vget_high_s16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsl_high_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x4_t __b = (b); int32x4_t __c = (c); \
-  __a - vmull_s32(vget_high_s32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlsl_high_laneq_u16(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint16x8_t __b = (b); uint16x8_t __c = (c); \
-  __a - vmull_u16(vget_high_u16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsl_high_laneq_u32(a, b, c, __d) __extension__ ({ \
-  uint64x2_t __a = (a); uint32x4_t __b = (b); uint32x4_t __c = (c); \
-  __a - vmull_u32(vget_high_u32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-
-__ai int32x4_t vmlsl_high_n_s16(int32x4_t __a, int16x8_t __b, int16_t __c) {
-  return vmlsl_n_s16(__a, vget_high_s16(__b), __c); }
-__ai int64x2_t vmlsl_high_n_s32(int64x2_t __a, int32x4_t __b, int32_t __c) {
-  return vmlsl_n_s32(__a, vget_high_s32(__b), __c); }
-__ai uint32x4_t vmlsl_high_n_u16(uint32x4_t __a, uint16x8_t __b, uint16_t __c) {
-  return vmlsl_n_u16(__a, vget_high_u16(__b), __c); }
-__ai uint64x2_t vmlsl_high_n_u32(uint64x2_t __a, uint32x4_t __b, uint32_t __c) {
-  return vmlsl_n_u32(__a, vget_high_u32(__b), __c); }
-
-#define vmlsl_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x4_t __b = (b); int16x8_t __c = (c); \
-  __a - vmull_s16(__b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsl_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x2_t __b = (b); int32x4_t __c = (c); \
-  __a - vmull_s32(__b, __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlsl_laneq_u16(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint16x4_t __b = (b); uint16x8_t __c = (c); \
-  __a - vmull_u16(__b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsl_laneq_u32(a, b, c, __d) __extension__ ({ \
-  uint64x2_t __a = (a); uint32x2_t __b = (b); uint32x4_t __c = (c); \
-  __a - vmull_u32(__b, __builtin_shufflevector(__c, __c, __d, __d)); })
-
-#define vmls_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int16x4_t __a = (a); int16x4_t __b = (b); int16x8_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmls_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int32x2_t __a = (a); int32x2_t __b = (b); int32x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmls_laneq_u16(a, b, c, __d) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x4_t __b = (b); uint16x8_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmls_laneq_u32(a, b, c, __d) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x2_t __b = (b); uint32x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmls_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); float32x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d)); })
-#define vmlsq_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); int16x8_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d, __d, __d, __d, __d)); })
-#define vmlsq_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); int32x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsq_laneq_u16(a, b, c, __d) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); uint16x8_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d, __d, __d, __d, __d)); })
-#define vmlsq_laneq_u32(a, b, c, __d) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); uint32x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vmlsq_laneq_f32(a, b, c, __d) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); float32x4_t __c = (c); \
-  __a - (__b * __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-
-
-
-#define vmull_high_lane_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x4_t __b = (b); \
-  vmull_s16(vget_high_s16(__a), __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmull_high_lane_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x2_t __b = (b); \
-  vmull_s32(vget_high_s32(__a), __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vmull_high_lane_u16(a, b, __c) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x4_t __b = (b); \
-  vmull_u16(vget_high_u16(__a), __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmull_high_lane_u32(a, b, __c) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x2_t __b = (b); \
-  vmull_u32(vget_high_u32(__a), __builtin_shufflevector(__b, __b, __c, __c)); })
-
-#define vmull_high_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  vmull_s16(vget_high_s16(__a), __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmull_high_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  vmull_s32(vget_high_s32(__a), __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vmull_high_laneq_u16(a, b, __c) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); \
-  vmull_u16(vget_high_u16(__a), __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmull_high_laneq_u32(a, b, __c) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); \
-  vmull_u32(vget_high_u32(__a), __builtin_shufflevector(__b, __b, __c, __c)); })
-
-__ai int32x4_t vmull_high_n_s16(int16x8_t __a, int16_t __b) {
-  return vmull_n_s16(vget_high_s16(__a), __b); }
-__ai int64x2_t vmull_high_n_s32(int32x4_t __a, int32_t __b) {
-  return vmull_n_s32(vget_high_s32(__a), __b); }
-__ai uint32x4_t vmull_high_n_u16(uint16x8_t __a, uint16_t __b) {
-  return vmull_n_u16(vget_high_u16(__a), __b); }
-__ai uint64x2_t vmull_high_n_u32(uint32x4_t __a, uint32_t __b) {
-  return vmull_n_u32(vget_high_u32(__a), __b); }
-
-#define vmull_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x8_t __b = (b); \
-  vmull_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmull_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x4_t __b = (b); \
-  vmull_s32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vmull_laneq_u16(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x8_t __b = (b); \
-  vmull_u16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmull_laneq_u32(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x4_t __b = (b); \
-  vmull_u32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-
-#define vmulx_lane_f32(a, b, __c) __extension__ ({ \
-  float32x2_t __a = (a); float32x2_t __b = (b); \
-  vmulx_f32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vmulxq_lane_f32(a, b, __c) __extension__ ({ \
-  float32x4_t __a = (a); float32x2_t __b = (b); \
-  vmulxq_f32(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmulxq_lane_f64(a, b, __c) __extension__ ({ \
-  float64x2_t __a = (a); float64x1_t __b = (b); \
-  vmulxq_f64(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-
-#define vmulx_laneq_f32(a, b, __c) __extension__ ({ \
-  float32x2_t __a = (a); float32x4_t __b = (b); \
-  vmulx_f32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vmulxq_laneq_f32(a, b, __c) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); \
-  vmulxq_f32(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vmulxq_laneq_f64(a, b, __c) __extension__ ({ \
-  float64x2_t __a = (a); float64x2_t __b = (b); \
-  vmulxq_f64(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-
-#define vmul_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x8_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-#define vmul_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c); })
-#define vmul_laneq_f32(a, b, __c) __extension__ ({ \
-  float32x2_t __a = (a); float32x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c); })
-#define vmul_laneq_u16(a, b, __c) __extension__ ({ \
-  uint16x4_t __a = (a); uint16x8_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-#define vmul_laneq_u32(a, b, __c) __extension__ ({ \
-  uint32x2_t __a = (a); uint32x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c); })
-#define vmulq_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c, __c, __c, __c, __c); })
-#define vmulq_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-#define vmulq_laneq_f32(a, b, __c) __extension__ ({ \
-  float32x4_t __a = (a); float32x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-#define vmulq_laneq_u16(a, b, __c) __extension__ ({ \
-  uint16x8_t __a = (a); uint16x8_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c, __c, __c, __c, __c); })
-#define vmulq_laneq_u32(a, b, __c) __extension__ ({ \
-  uint32x4_t __a = (a); uint32x4_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c, __c, __c); })
-#define vmulq_laneq_f64(a, b, __c) __extension__ ({ \
-  float64x2_t __a = (a); float64x2_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c); })
-
-#define vmulq_lane_f64(a, b, __c) __extension__ ({ \
-  float64x2_t __a = (a); float64x1_t __b = (b); \
-  __a * __builtin_shufflevector(__b, __b, __c, __c); })
-
-__ai float64x2_t vmulq_n_f64(float64x2_t __a, float64_t __b) {
-  return __a * (float64x2_t){ __b, __b }; }
-
-__ai int32x4_t vqdmlal_high_s16(int32x4_t __a, int16x8_t __b, int16x8_t __c) {
-  return vqdmlal_s16(__a, vget_high_s16(__b), vget_high_s16(__c)); }
-__ai int64x2_t vqdmlal_high_s32(int64x2_t __a, int32x4_t __b, int32x4_t __c) {
-  return vqdmlal_s32(__a, vget_high_s32(__b), vget_high_s32(__c)); }
-
-#define vqdmlal_high_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x8_t __b = (b); int16x4_t __c = (c); \
-  vqdmlal_s16(__a, vget_high_s16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vqdmlal_high_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x4_t __b = (b); int32x2_t __c = (c); \
-  vqdmlal_s32(__a, vget_high_s32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-
-#define vqdmlal_high_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x8_t __b = (b); int16x8_t __c = (c); \
-  vqdmlal_s16(__a, vget_high_s16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vqdmlal_high_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x4_t __b = (b); int32x4_t __c = (c); \
-  vqdmlal_s32(__a, vget_high_s32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-
-__ai int32x4_t vqdmlal_high_n_s16(int32x4_t __a, int16x8_t __b, int16_t __c) {
-  return vqdmlal_n_s16(__a, vget_high_s16(__b), __c); }
-__ai int64x2_t vqdmlal_high_n_s32(int64x2_t __a, int32x4_t __b, int32_t __c) {
-  return vqdmlal_n_s32(__a, vget_high_s32(__b), __c); }
-
-#define vqdmlal_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x4_t __b = (b); int16x8_t __c = (c); \
-  vqdmlal_s16(__a, __b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vqdmlal_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x2_t __b = (b); int32x4_t __c = (c); \
-  vqdmlal_s32(__a, __b, __builtin_shufflevector(__c, __c, __d, __d)); })
-
-__ai int32x4_t vqdmlsl_high_s16(int32x4_t __a, int16x8_t __b, int16x8_t __c) {
-  return vqdmlsl_s16(__a, vget_high_s16(__b), vget_high_s16(__c)); }
-__ai int64x2_t vqdmlsl_high_s32(int64x2_t __a, int32x4_t __b, int32x4_t __c) {
-  return vqdmlsl_s32(__a, vget_high_s32(__b), vget_high_s32(__c)); }
-
-#define vqdmlsl_high_lane_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x8_t __b = (b); int16x4_t __c = (c); \
-  vqdmlsl_s16(__a, vget_high_s16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vqdmlsl_high_lane_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x4_t __b = (b); int32x2_t __c = (c); \
-  vqdmlsl_s32(__a, vget_high_s32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-
-#define vqdmlsl_high_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x8_t __b = (b); int16x8_t __c = (c); \
-  vqdmlsl_s16(__a, vget_high_s16(__b), __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vqdmlsl_high_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x4_t __b = (b); int32x4_t __c = (c); \
-  vqdmlsl_s32(__a, vget_high_s32(__b), __builtin_shufflevector(__c, __c, __d, __d)); })
-
-__ai int32x4_t vqdmlsl_high_n_s16(int32x4_t __a, int16x8_t __b, int16_t __c) {
-  return vqdmlsl_n_s16(__a, vget_high_s16(__b), __c); }
-__ai int64x2_t vqdmlsl_high_n_s32(int64x2_t __a, int32x4_t __b, int32_t __c) {
-  return vqdmlsl_n_s32(__a, vget_high_s32(__b), __c); }
-
-#define vqdmlsl_laneq_s16(a, b, c, __d) __extension__ ({ \
-  int32x4_t __a = (a); int16x4_t __b = (b); int16x8_t __c = (c); \
-  vqdmlsl_s16(__a, __b, __builtin_shufflevector(__c, __c, __d, __d, __d, __d)); })
-#define vqdmlsl_laneq_s32(a, b, c, __d) __extension__ ({ \
-  int64x2_t __a = (a); int32x2_t __b = (b); int32x4_t __c = (c); \
-  vqdmlsl_s32(__a, __b, __builtin_shufflevector(__c, __c, __d, __d)); })
-
-#define vqdmulh_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x8_t __b = (b); \
-  vqdmulh_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vqdmulh_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x4_t __b = (b); \
-  vqdmulh_s32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vqdmulhq_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  vqdmulhq_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c, __c, __c, __c, __c)); })
-#define vqdmulhq_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  vqdmulhq_s32(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-
-__ai int32x4_t vqdmull_high_s16(int16x8_t __a, int16x8_t __b) {
-  return vqdmull_s16(vget_high_s16(__a), vget_high_s16(__b)); }
-__ai int64x2_t vqdmull_high_s32(int32x4_t __a, int32x4_t __b) {
-  return vqdmull_s32(vget_high_s32(__a), vget_high_s32(__b)); }
-
-#define vqdmull_high_lane_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x4_t __b = (b); \
-  vqdmull_s16(vget_high_s16(__a), __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vqdmull_high_lane_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x2_t __b = (b); \
-  vqdmull_s32(vget_high_s32(__a), __builtin_shufflevector(__b, __b, __c, __c)); })
-
-#define vqdmull_high_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  vqdmull_s16(vget_high_s16(__a), __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vqdmull_high_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  vqdmull_s32(vget_high_s32(__a), __builtin_shufflevector(__b, __b, __c, __c)); })
-
-__ai int32x4_t vqdmull_high_n_s16(int16x8_t __a, int16_t __b) {
-  return vqdmull_n_s16(vget_high_s16(__a), __b); }
-__ai int64x2_t vqdmull_high_n_s32(int32x4_t __a, int32_t __b) {
-  return vqdmull_n_s32(vget_high_s32(__a), __b); }
-
-#define vqdmull_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x8_t __b = (b); \
-  vqdmull_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vqdmull_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x4_t __b = (b); \
-  vqdmull_s32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-
-#define vqrdmulh_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x4_t __a = (a); int16x8_t __b = (b); \
-  vqrdmulh_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-#define vqrdmulh_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x2_t __a = (a); int32x4_t __b = (b); \
-  vqrdmulh_s32(__a, __builtin_shufflevector(__b, __b, __c, __c)); })
-#define vqrdmulhq_laneq_s16(a, b, __c) __extension__ ({ \
-  int16x8_t __a = (a); int16x8_t __b = (b); \
-  vqrdmulhq_s16(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c, __c, __c, __c, __c)); })
-#define vqrdmulhq_laneq_s32(a, b, __c) __extension__ ({ \
-  int32x4_t __a = (a); int32x4_t __b = (b); \
-  vqrdmulhq_s32(__a, __builtin_shufflevector(__b, __b, __c, __c, __c, __c)); })
-
-__ai uint8x8_t vqtbl1_u8(uint8x16_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vqtbl1_v((int8x16_t)__a, (int8x8_t)__b, 16); }
-__ai int8x8_t vqtbl1_s8(int8x16_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vqtbl1_v(__a, __b, 0); }
-__ai poly8x8_t vqtbl1_p8(poly8x16_t __a, uint8x8_t __b) {
-  return (poly8x8_t)__builtin_neon_vqtbl1_v((int8x16_t)__a, (int8x8_t)__b, 4); }
-__ai uint8x16_t vqtbl1q_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vqtbl1q_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-__ai int8x16_t vqtbl1q_s8(int8x16_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vqtbl1q_v(__a, __b, 32); }
-__ai poly8x16_t vqtbl1q_p8(poly8x16_t __a, uint8x16_t __b) {
-  return (poly8x16_t)__builtin_neon_vqtbl1q_v((int8x16_t)__a, (int8x16_t)__b, 36); }
-
-__ai uint8x8_t vqtbl2_u8(uint8x16x2_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vqtbl2_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x8_t)__b, 16); }
-__ai int8x8_t vqtbl2_s8(int8x16x2_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vqtbl2_v(__a.val[0], __a.val[1], __b, 0); }
-__ai poly8x8_t vqtbl2_p8(poly8x16x2_t __a, uint8x8_t __b) {
-  return (poly8x8_t)__builtin_neon_vqtbl2_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x8_t)__b, 4); }
-__ai uint8x16_t vqtbl2q_u8(uint8x16x2_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vqtbl2q_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__b, 48); }
-__ai int8x16_t vqtbl2q_s8(int8x16x2_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vqtbl2q_v(__a.val[0], __a.val[1], __b, 32); }
-__ai poly8x16_t vqtbl2q_p8(poly8x16x2_t __a, uint8x16_t __b) {
-  return (poly8x16_t)__builtin_neon_vqtbl2q_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__b, 36); }
-
-__ai uint8x8_t vqtbl3_u8(uint8x16x3_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vqtbl3_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__a.val[2], (int8x8_t)__b, 16); }
-__ai int8x8_t vqtbl3_s8(int8x16x3_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vqtbl3_v(__a.val[0], __a.val[1], __a.val[2], __b, 0); }
-__ai poly8x8_t vqtbl3_p8(poly8x16x3_t __a, uint8x8_t __b) {
-  return (poly8x8_t)__builtin_neon_vqtbl3_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__a.val[2], (int8x8_t)__b, 4); }
-__ai uint8x16_t vqtbl3q_u8(uint8x16x3_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vqtbl3q_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__a.val[2], (int8x16_t)__b, 48); }
-__ai int8x16_t vqtbl3q_s8(int8x16x3_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vqtbl3q_v(__a.val[0], __a.val[1], __a.val[2], __b, 32); }
-__ai poly8x16_t vqtbl3q_p8(poly8x16x3_t __a, uint8x16_t __b) {
-  return (poly8x16_t)__builtin_neon_vqtbl3q_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__a.val[2], (int8x16_t)__b, 36); }
-
-__ai uint8x8_t vqtbl4_u8(uint8x16x4_t __a, uint8x8_t __b) {
-  return (uint8x8_t)__builtin_neon_vqtbl4_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__a.val[2], (int8x16_t)__a.val[3], (int8x8_t)__b, 16); }
-__ai int8x8_t vqtbl4_s8(int8x16x4_t __a, int8x8_t __b) {
-  return (int8x8_t)__builtin_neon_vqtbl4_v(__a.val[0], __a.val[1], __a.val[2], __a.val[3], __b, 0); }
-__ai poly8x8_t vqtbl4_p8(poly8x16x4_t __a, uint8x8_t __b) {
-  return (poly8x8_t)__builtin_neon_vqtbl4_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__a.val[2], (int8x16_t)__a.val[3], (int8x8_t)__b, 4); }
-__ai uint8x16_t vqtbl4q_u8(uint8x16x4_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vqtbl4q_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__a.val[2], (int8x16_t)__a.val[3], (int8x16_t)__b, 48); }
-__ai int8x16_t vqtbl4q_s8(int8x16x4_t __a, int8x16_t __b) {
-  return (int8x16_t)__builtin_neon_vqtbl4q_v(__a.val[0], __a.val[1], __a.val[2], __a.val[3], __b, 32); }
-__ai poly8x16_t vqtbl4q_p8(poly8x16x4_t __a, uint8x16_t __b) {
-  return (poly8x16_t)__builtin_neon_vqtbl4q_v((int8x16_t)__a.val[0], (int8x16_t)__a.val[1], (int8x16_t)__a.val[2], (int8x16_t)__a.val[3], (int8x16_t)__b, 36); }
-
-__ai uint8x8_t vqtbx1_u8(uint8x8_t __a, uint8x16_t __b, uint8x8_t __c) {
-  return (uint8x8_t)__builtin_neon_vqtbx1_v((int8x8_t)__a, (int8x16_t)__b, (int8x8_t)__c, 16); }
-__ai int8x8_t vqtbx1_s8(int8x8_t __a, int8x16_t __b, int8x8_t __c) {
-  return (int8x8_t)__builtin_neon_vqtbx1_v(__a, __b, __c, 0); }
-__ai poly8x8_t vqtbx1_p8(poly8x8_t __a, poly8x16_t __b, uint8x8_t __c) {
-  return (poly8x8_t)__builtin_neon_vqtbx1_v((int8x8_t)__a, (int8x16_t)__b, (int8x8_t)__c, 4); }
-__ai uint8x16_t vqtbx1q_u8(uint8x16_t __a, uint8x16_t __b, uint8x16_t __c) {
-  return (uint8x16_t)__builtin_neon_vqtbx1q_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 48); }
-__ai int8x16_t vqtbx1q_s8(int8x16_t __a, int8x16_t __b, int8x16_t __c) {
-  return (int8x16_t)__builtin_neon_vqtbx1q_v(__a, __b, __c, 32); }
-__ai poly8x16_t vqtbx1q_p8(poly8x16_t __a, poly8x16_t __b, uint8x16_t __c) {
-  return (poly8x16_t)__builtin_neon_vqtbx1q_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 36); }
-
-__ai uint8x8_t vqtbx2_u8(uint8x8_t __a, uint8x16x2_t __b, uint8x8_t __c) {
-  return (uint8x8_t)__builtin_neon_vqtbx2_v((int8x8_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x8_t)__c, 16); }
-__ai int8x8_t vqtbx2_s8(int8x8_t __a, int8x16x2_t __b, int8x8_t __c) {
-  return (int8x8_t)__builtin_neon_vqtbx2_v(__a, __b.val[0], __b.val[1], __c, 0); }
-__ai poly8x8_t vqtbx2_p8(poly8x8_t __a, poly8x16x2_t __b, uint8x8_t __c) {
-  return (poly8x8_t)__builtin_neon_vqtbx2_v((int8x8_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x8_t)__c, 4); }
-__ai uint8x16_t vqtbx2q_u8(uint8x16_t __a, uint8x16x2_t __b, uint8x16_t __c) {
-  return (uint8x16_t)__builtin_neon_vqtbx2q_v((int8x16_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__c, 48); }
-__ai int8x16_t vqtbx2q_s8(int8x16_t __a, int8x16x2_t __b, int8x16_t __c) {
-  return (int8x16_t)__builtin_neon_vqtbx2q_v(__a, __b.val[0], __b.val[1], __c, 32); }
-__ai poly8x16_t vqtbx2q_p8(poly8x16_t __a, poly8x16x2_t __b, uint8x16_t __c) {
-  return (poly8x16_t)__builtin_neon_vqtbx2q_v((int8x16_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__c, 36); }
-
-__ai uint8x8_t vqtbx3_u8(uint8x8_t __a, uint8x16x3_t __b, uint8x8_t __c) {
-  return (uint8x8_t)__builtin_neon_vqtbx3_v((int8x8_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x8_t)__c, 16); }
-__ai int8x8_t vqtbx3_s8(int8x8_t __a, int8x16x3_t __b, int8x8_t __c) {
-  return (int8x8_t)__builtin_neon_vqtbx3_v(__a, __b.val[0], __b.val[1], __b.val[2], __c, 0); }
-__ai poly8x8_t vqtbx3_p8(poly8x8_t __a, poly8x16x3_t __b, uint8x8_t __c) {
-  return (poly8x8_t)__builtin_neon_vqtbx3_v((int8x8_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x8_t)__c, 4); }
-__ai uint8x16_t vqtbx3q_u8(uint8x16_t __a, uint8x16x3_t __b, uint8x16_t __c) {
-  return (uint8x16_t)__builtin_neon_vqtbx3q_v((int8x16_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__c, 48); }
-__ai int8x16_t vqtbx3q_s8(int8x16_t __a, int8x16x3_t __b, int8x16_t __c) {
-  return (int8x16_t)__builtin_neon_vqtbx3q_v(__a, __b.val[0], __b.val[1], __b.val[2], __c, 32); }
-__ai poly8x16_t vqtbx3q_p8(poly8x16_t __a, poly8x16x3_t __b, uint8x16_t __c) {
-  return (poly8x16_t)__builtin_neon_vqtbx3q_v((int8x16_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__c, 36); }
-
-__ai uint8x8_t vqtbx4_u8(uint8x8_t __a, uint8x16x4_t __b, uint8x8_t __c) {
-  return (uint8x8_t)__builtin_neon_vqtbx4_v((int8x8_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], (int8x8_t)__c, 16); }
-__ai int8x8_t vqtbx4_s8(int8x8_t __a, int8x16x4_t __b, int8x8_t __c) {
-  return (int8x8_t)__builtin_neon_vqtbx4_v(__a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], __c, 0); }
-__ai poly8x8_t vqtbx4_p8(poly8x8_t __a, poly8x16x4_t __b, uint8x8_t __c) {
-  return (poly8x8_t)__builtin_neon_vqtbx4_v((int8x8_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], (int8x8_t)__c, 4); }
-__ai uint8x16_t vqtbx4q_u8(uint8x16_t __a, uint8x16x4_t __b, uint8x16_t __c) {
-  return (uint8x16_t)__builtin_neon_vqtbx4q_v((int8x16_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], (int8x16_t)__c, 48); }
-__ai int8x16_t vqtbx4q_s8(int8x16_t __a, int8x16x4_t __b, int8x16_t __c) {
-  return (int8x16_t)__builtin_neon_vqtbx4q_v(__a, __b.val[0], __b.val[1], __b.val[2], __b.val[3], __c, 32); }
-__ai poly8x16_t vqtbx4q_p8(poly8x16_t __a, poly8x16x4_t __b, uint8x16_t __c) {
-  return (poly8x16_t)__builtin_neon_vqtbx4q_v((int8x16_t)__a, (int8x16_t)__b.val[0], (int8x16_t)__b.val[1], (int8x16_t)__b.val[2], (int8x16_t)__b.val[3], (int8x16_t)__c, 36); }
-
-__ai int8x16_t vraddhn_high_s16(int8x8_t __a, int16x8_t __b, int16x8_t __c) {
-  return vcombine_s8(__a, vraddhn_s16(__b, __c)); }
-__ai int16x8_t vraddhn_high_s32(int16x4_t __a, int32x4_t __b, int32x4_t __c) {
-  return vcombine_s16(__a, vraddhn_s32(__b, __c)); }
-__ai int32x4_t vraddhn_high_s64(int32x2_t __a, int64x2_t __b, int64x2_t __c) {
-  return vcombine_s32(__a, vraddhn_s64(__b, __c)); }
-__ai uint8x16_t vraddhn_high_u16(uint8x8_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return vcombine_u8(__a, vraddhn_u16(__b, __c)); }
-__ai uint16x8_t vraddhn_high_u32(uint16x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return vcombine_u16(__a, vraddhn_u32(__b, __c)); }
-__ai uint32x4_t vraddhn_high_u64(uint32x2_t __a, uint64x2_t __b, uint64x2_t __c) {
-  return vcombine_u32(__a, vraddhn_u64(__b, __c)); }
-
-__ai int8x16_t vrsubhn_high_s16(int8x8_t __a, int16x8_t __b, int16x8_t __c) {
-  return vcombine_s8(__a, vrsubhn_s16(__b, __c)); }
-__ai int16x8_t vrsubhn_high_s32(int16x4_t __a, int32x4_t __b, int32x4_t __c) {
-  return vcombine_s16(__a, vrsubhn_s32(__b, __c)); }
-__ai int32x4_t vrsubhn_high_s64(int32x2_t __a, int64x2_t __b, int64x2_t __c) {
-  return vcombine_s32(__a, vrsubhn_s64(__b, __c)); }
-__ai uint8x16_t vrsubhn_high_u16(uint8x8_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return vcombine_u8(__a, vrsubhn_u16(__b, __c)); }
-__ai uint16x8_t vrsubhn_high_u32(uint16x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return vcombine_u16(__a, vrsubhn_u32(__b, __c)); }
-__ai uint32x4_t vrsubhn_high_u64(uint32x2_t __a, uint64x2_t __b, uint64x2_t __c) {
-  return vcombine_u32(__a, vrsubhn_u64(__b, __c)); }
-
-__ai int8x16_t vsubhn_high_s16(int8x8_t __a, int16x8_t __b, int16x8_t __c) {
-  return vcombine_s8(__a, vsubhn_s16(__b, __c)); }
-__ai int16x8_t vsubhn_high_s32(int16x4_t __a, int32x4_t __b, int32x4_t __c) {
-  return vcombine_s16(__a, vsubhn_s32(__b, __c)); }
-__ai int32x4_t vsubhn_high_s64(int32x2_t __a, int64x2_t __b, int64x2_t __c) {
-  return vcombine_s32(__a, vsubhn_s64(__b, __c)); }
-__ai uint8x16_t vsubhn_high_u16(uint8x8_t __a, uint16x8_t __b, uint16x8_t __c) {
-  return vcombine_u8(__a, vsubhn_u16(__b, __c)); }
-__ai uint16x8_t vsubhn_high_u32(uint16x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return vcombine_u16(__a, vsubhn_u32(__b, __c)); }
-__ai uint32x4_t vsubhn_high_u64(uint32x2_t __a, uint64x2_t __b, uint64x2_t __c) {
-  return vcombine_u32(__a, vsubhn_u64(__b, __c)); }
-
-__ai int16x8_t vsubl_high_s8(int8x16_t __a, int8x16_t __b) {
-  return vmovl_high_s8(__a) - vmovl_high_s8(__b); }
-__ai int32x4_t vsubl_high_s16(int16x8_t __a, int16x8_t __b) {
-  return vmovl_high_s16(__a) - vmovl_high_s16(__b); }
-__ai int64x2_t vsubl_high_s32(int32x4_t __a, int32x4_t __b) {
-  return vmovl_high_s32(__a) - vmovl_high_s32(__b); }
-__ai uint16x8_t vsubl_high_u8(uint8x16_t __a, uint8x16_t __b) {
-  return vmovl_high_u8(__a) - vmovl_high_u8(__b); }
-__ai uint32x4_t vsubl_high_u16(uint16x8_t __a, uint16x8_t __b) {
-  return vmovl_high_u16(__a) - vmovl_high_u16(__b); }
-__ai uint64x2_t vsubl_high_u32(uint32x4_t __a, uint32x4_t __b) {
-  return vmovl_high_u32(__a) - vmovl_high_u32(__b); }
-
-__ai int16x8_t vsubw_high_s8(int16x8_t __a, int8x16_t __b) {
-  return __a - vmovl_high_s8(__b); }
-__ai int32x4_t vsubw_high_s16(int32x4_t __a, int16x8_t __b) {
-  return __a - vmovl_high_s16(__b); }
-__ai int64x2_t vsubw_high_s32(int64x2_t __a, int32x4_t __b) {
-  return __a - vmovl_high_s32(__b); }
-__ai uint16x8_t vsubw_high_u8(uint16x8_t __a, uint8x16_t __b) {
-  return __a - vmovl_high_u8(__b); }
-__ai uint32x4_t vsubw_high_u16(uint32x4_t __a, uint16x8_t __b) {
-  return __a - vmovl_high_u16(__b); }
-__ai uint64x2_t vsubw_high_u32(uint64x2_t __a, uint32x4_t __b) {
-  return __a - vmovl_high_u32(__b); }
-
-__ai int8x8_t vtrn1_s8(int8x8_t __a, int8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 2, 10, 4, 12, 6, 14); }
-__ai int16x4_t vtrn1_s16(int16x4_t __a, int16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 2, 6); }
-__ai int32x2_t vtrn1_s32(int32x2_t __a, int32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai uint8x8_t vtrn1_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 2, 10, 4, 12, 6, 14); }
-__ai uint16x4_t vtrn1_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 2, 6); }
-__ai uint32x2_t vtrn1_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai float32x2_t vtrn1_f32(float32x2_t __a, float32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai poly8x8_t vtrn1_p8(poly8x8_t __a, poly8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 2, 10, 4, 12, 6, 14); }
-__ai poly16x4_t vtrn1_p16(poly16x4_t __a, poly16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 2, 6); }
-__ai int8x16_t vtrn1q_s8(int8x16_t __a, int8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 16, 2, 18, 4, 20, 6, 22, 8, 24, 10, 26, 12, 28, 14, 30); }
-__ai int16x8_t vtrn1q_s16(int16x8_t __a, int16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 2, 10, 4, 12, 6, 14); }
-__ai int32x4_t vtrn1q_s32(int32x4_t __a, int32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 2, 6); }
-__ai int64x2_t vtrn1q_s64(int64x2_t __a, int64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai uint8x16_t vtrn1q_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 16, 2, 18, 4, 20, 6, 22, 8, 24, 10, 26, 12, 28, 14, 30); }
-__ai uint16x8_t vtrn1q_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 2, 10, 4, 12, 6, 14); }
-__ai uint32x4_t vtrn1q_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 2, 6); }
-__ai uint64x2_t vtrn1q_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai float32x4_t vtrn1q_f32(float32x4_t __a, float32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 2, 6); }
-__ai float64x2_t vtrn1q_f64(float64x2_t __a, float64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai poly8x16_t vtrn1q_p8(poly8x16_t __a, poly8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 16, 2, 18, 4, 20, 6, 22, 8, 24, 10, 26, 12, 28, 14, 30); }
-__ai poly16x8_t vtrn1q_p16(poly16x8_t __a, poly16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 2, 10, 4, 12, 6, 14); }
-__ai poly64x2_t vtrn1q_p64(poly64x2_t __a, poly64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-
-__ai int8x8_t vtrn2_s8(int8x8_t __a, int8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 9, 3, 11, 5, 13, 7, 15); }
-__ai int16x4_t vtrn2_s16(int16x4_t __a, int16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 5, 3, 7); }
-__ai int32x2_t vtrn2_s32(int32x2_t __a, int32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai uint8x8_t vtrn2_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 9, 3, 11, 5, 13, 7, 15); }
-__ai uint16x4_t vtrn2_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 5, 3, 7); }
-__ai uint32x2_t vtrn2_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai float32x2_t vtrn2_f32(float32x2_t __a, float32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai poly8x8_t vtrn2_p8(poly8x8_t __a, poly8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 9, 3, 11, 5, 13, 7, 15); }
-__ai poly16x4_t vtrn2_p16(poly16x4_t __a, poly16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 5, 3, 7); }
-__ai int8x16_t vtrn2q_s8(int8x16_t __a, int8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 17, 3, 19, 5, 21, 7, 23, 9, 25, 11, 27, 13, 29, 15, 31); }
-__ai int16x8_t vtrn2q_s16(int16x8_t __a, int16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 9, 3, 11, 5, 13, 7, 15); }
-__ai int32x4_t vtrn2q_s32(int32x4_t __a, int32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 5, 3, 7); }
-__ai int64x2_t vtrn2q_s64(int64x2_t __a, int64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai uint8x16_t vtrn2q_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 17, 3, 19, 5, 21, 7, 23, 9, 25, 11, 27, 13, 29, 15, 31); }
-__ai uint16x8_t vtrn2q_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 9, 3, 11, 5, 13, 7, 15); }
-__ai uint32x4_t vtrn2q_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 5, 3, 7); }
-__ai uint64x2_t vtrn2q_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai float32x4_t vtrn2q_f32(float32x4_t __a, float32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 5, 3, 7); }
-__ai float64x2_t vtrn2q_f64(float64x2_t __a, float64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai poly8x16_t vtrn2q_p8(poly8x16_t __a, poly8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 17, 3, 19, 5, 21, 7, 23, 9, 25, 11, 27, 13, 29, 15, 31); }
-__ai poly16x8_t vtrn2q_p16(poly16x8_t __a, poly16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 9, 3, 11, 5, 13, 7, 15); }
-__ai poly64x2_t vtrn2q_p64(poly64x2_t __a, poly64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-
-__ai int8x8_t vuzp1_s8(int8x8_t __a, int8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6, 8, 10, 12, 14); }
-__ai int16x4_t vuzp1_s16(int16x4_t __a, int16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6); }
-__ai int32x2_t vuzp1_s32(int32x2_t __a, int32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai uint8x8_t vuzp1_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6, 8, 10, 12, 14); }
-__ai uint16x4_t vuzp1_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6); }
-__ai uint32x2_t vuzp1_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai float32x2_t vuzp1_f32(float32x2_t __a, float32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai poly8x8_t vuzp1_p8(poly8x8_t __a, poly8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6, 8, 10, 12, 14); }
-__ai poly16x4_t vuzp1_p16(poly16x4_t __a, poly16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6); }
-__ai int8x16_t vuzp1q_s8(int8x16_t __a, int8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30); }
-__ai int16x8_t vuzp1q_s16(int16x8_t __a, int16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6, 8, 10, 12, 14); }
-__ai int32x4_t vuzp1q_s32(int32x4_t __a, int32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6); }
-__ai int64x2_t vuzp1q_s64(int64x2_t __a, int64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai uint8x16_t vuzp1q_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30); }
-__ai uint16x8_t vuzp1q_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6, 8, 10, 12, 14); }
-__ai uint32x4_t vuzp1q_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6); }
-__ai uint64x2_t vuzp1q_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai float32x4_t vuzp1q_f32(float32x4_t __a, float32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6); }
-__ai float64x2_t vuzp1q_f64(float64x2_t __a, float64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai poly8x16_t vuzp1q_p8(poly8x16_t __a, poly8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30); }
-__ai poly16x8_t vuzp1q_p16(poly16x8_t __a, poly16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2, 4, 6, 8, 10, 12, 14); }
-__ai poly64x2_t vuzp1q_p64(poly64x2_t __a, poly64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-
-__ai int8x8_t vuzp2_s8(int8x8_t __a, int8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7, 9, 11, 13, 15); }
-__ai int16x4_t vuzp2_s16(int16x4_t __a, int16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7); }
-__ai int32x2_t vuzp2_s32(int32x2_t __a, int32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai uint8x8_t vuzp2_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7, 9, 11, 13, 15); }
-__ai uint16x4_t vuzp2_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7); }
-__ai uint32x2_t vuzp2_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai float32x2_t vuzp2_f32(float32x2_t __a, float32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai poly8x8_t vuzp2_p8(poly8x8_t __a, poly8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7, 9, 11, 13, 15); }
-__ai poly16x4_t vuzp2_p16(poly16x4_t __a, poly16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7); }
-__ai int8x16_t vuzp2q_s8(int8x16_t __a, int8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31); }
-__ai int16x8_t vuzp2q_s16(int16x8_t __a, int16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7, 9, 11, 13, 15); }
-__ai int32x4_t vuzp2q_s32(int32x4_t __a, int32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7); }
-__ai int64x2_t vuzp2q_s64(int64x2_t __a, int64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai uint8x16_t vuzp2q_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31); }
-__ai uint16x8_t vuzp2q_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7, 9, 11, 13, 15); }
-__ai uint32x4_t vuzp2q_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7); }
-__ai uint64x2_t vuzp2q_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai float32x4_t vuzp2q_f32(float32x4_t __a, float32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7); }
-__ai float64x2_t vuzp2q_f64(float64x2_t __a, float64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai poly8x16_t vuzp2q_p8(poly8x16_t __a, poly8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31); }
-__ai poly16x8_t vuzp2q_p16(poly16x8_t __a, poly16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3, 5, 7, 9, 11, 13, 15); }
-__ai poly64x2_t vuzp2q_p64(poly64x2_t __a, poly64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-
-__ai int8x8_t vzip1_s8(int8x8_t __a, int8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 1, 9, 2, 10, 3, 11); }
-__ai int16x4_t vzip1_s16(int16x4_t __a, int16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 1, 5); }
-__ai int32x2_t vzip1_s32(int32x2_t __a, int32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai uint8x8_t vzip1_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 1, 9, 2, 10, 3, 11); }
-__ai uint16x4_t vzip1_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 1, 5); }
-__ai uint32x2_t vzip1_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai float32x2_t vzip1_f32(float32x2_t __a, float32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai poly8x8_t vzip1_p8(poly8x8_t __a, poly8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 1, 9, 2, 10, 3, 11); }
-__ai poly16x4_t vzip1_p16(poly16x4_t __a, poly16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 1, 5); }
-__ai int8x16_t vzip1q_s8(int8x16_t __a, int8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23); }
-__ai int16x8_t vzip1q_s16(int16x8_t __a, int16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 1, 9, 2, 10, 3, 11); }
-__ai int32x4_t vzip1q_s32(int32x4_t __a, int32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 1, 5); }
-__ai int64x2_t vzip1q_s64(int64x2_t __a, int64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai uint8x16_t vzip1q_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23); }
-__ai uint16x8_t vzip1q_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 1, 9, 2, 10, 3, 11); }
-__ai uint32x4_t vzip1q_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 1, 5); }
-__ai uint64x2_t vzip1q_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai float32x4_t vzip1q_f32(float32x4_t __a, float32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 4, 1, 5); }
-__ai float64x2_t vzip1q_f64(float64x2_t __a, float64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-__ai poly8x16_t vzip1q_p8(poly8x16_t __a, poly8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 16, 1, 17, 2, 18, 3, 19, 4, 20, 5, 21, 6, 22, 7, 23); }
-__ai poly16x8_t vzip1q_p16(poly16x8_t __a, poly16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 8, 1, 9, 2, 10, 3, 11); }
-__ai poly64x2_t vzip1q_p64(poly64x2_t __a, poly64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 0, 2); }
-
-__ai int8x8_t vzip2_s8(int8x8_t __a, int8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 4, 12, 5, 13, 6, 14, 7, 15); }
-__ai int16x4_t vzip2_s16(int16x4_t __a, int16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 2, 6, 3, 7); }
-__ai int32x2_t vzip2_s32(int32x2_t __a, int32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai uint8x8_t vzip2_u8(uint8x8_t __a, uint8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 4, 12, 5, 13, 6, 14, 7, 15); }
-__ai uint16x4_t vzip2_u16(uint16x4_t __a, uint16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 2, 6, 3, 7); }
-__ai uint32x2_t vzip2_u32(uint32x2_t __a, uint32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai float32x2_t vzip2_f32(float32x2_t __a, float32x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai poly8x8_t vzip2_p8(poly8x8_t __a, poly8x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 4, 12, 5, 13, 6, 14, 7, 15); }
-__ai poly16x4_t vzip2_p16(poly16x4_t __a, poly16x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 2, 6, 3, 7); }
-__ai int8x16_t vzip2q_s8(int8x16_t __a, int8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31); }
-__ai int16x8_t vzip2q_s16(int16x8_t __a, int16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 4, 12, 5, 13, 6, 14, 7, 15); }
-__ai int32x4_t vzip2q_s32(int32x4_t __a, int32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 2, 6, 3, 7); }
-__ai int64x2_t vzip2q_s64(int64x2_t __a, int64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai uint8x16_t vzip2q_u8(uint8x16_t __a, uint8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31); }
-__ai uint16x8_t vzip2q_u16(uint16x8_t __a, uint16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 4, 12, 5, 13, 6, 14, 7, 15); }
-__ai uint32x4_t vzip2q_u32(uint32x4_t __a, uint32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 2, 6, 3, 7); }
-__ai uint64x2_t vzip2q_u64(uint64x2_t __a, uint64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai float32x4_t vzip2q_f32(float32x4_t __a, float32x4_t __b) {
-  return __builtin_shufflevector(__a, __b, 2, 6, 3, 7); }
-__ai float64x2_t vzip2q_f64(float64x2_t __a, float64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-__ai poly8x16_t vzip2q_p8(poly8x16_t __a, poly8x16_t __b) {
-  return __builtin_shufflevector(__a, __b, 8, 24, 9, 25, 10, 26, 11, 27, 12, 28, 13, 29, 14, 30, 15, 31); }
-__ai poly16x8_t vzip2q_p16(poly16x8_t __a, poly16x8_t __b) {
-  return __builtin_shufflevector(__a, __b, 4, 12, 5, 13, 6, 14, 7, 15); }
-__ai poly64x2_t vzip2q_p64(poly64x2_t __a, poly64x2_t __b) {
-  return __builtin_shufflevector(__a, __b, 1, 3); }
-
-__ai int8x16_t vmovn_high_s16(int8x8_t __a, int16x8_t __b) {
-  int8x8_t __a1 = vmovn_s16(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); }
-__ai int16x8_t vmovn_high_s32(int16x4_t __a, int32x4_t __b) {
-  int16x4_t __a1 = vmovn_s32(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7); }
-__ai int32x4_t vmovn_high_s64(int32x2_t __a, int64x2_t __b) {
-  int32x2_t __a1 = vmovn_s64(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3); }
-__ai uint8x16_t vmovn_high_u16(uint8x8_t __a, uint16x8_t __b) {
-  uint8x8_t __a1 = vmovn_u16(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15); }
-__ai uint16x8_t vmovn_high_u32(uint16x4_t __a, uint32x4_t __b) {
-  uint16x4_t __a1 = vmovn_u32(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3, 4, 5, 6, 7); }
-__ai uint32x4_t vmovn_high_u64(uint32x2_t __a, uint64x2_t __b) {
-  uint32x2_t __a1 = vmovn_u64(__b);
-  return __builtin_shufflevector(__a, __a1, 0, 1, 2, 3); }
-
-#ifdef __ARM_FEATURE_CRYPTO
-__ai uint8x16_t vaesdq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vaesdq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-
-__ai uint8x16_t vaeseq_u8(uint8x16_t __a, uint8x16_t __b) {
-  return (uint8x16_t)__builtin_neon_vaeseq_v((int8x16_t)__a, (int8x16_t)__b, 48); }
-
-__ai uint8x16_t vaesimcq_u8(uint8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vaesimcq_v((int8x16_t)__a, 48); }
-
-__ai uint8x16_t vaesmcq_u8(uint8x16_t __a) {
-  return (uint8x16_t)__builtin_neon_vaesmcq_v((int8x16_t)__a, 48); }
-
-__ai uint32x4_t vsha1cq_u32(uint32x4_t __a, uint32_t __b, uint32x4_t __c) {
-  return (uint32x4_t)__builtin_neon_vsha1cq_u32((int32x4_t)__a, __b, (int32x4_t)__c); }
-
-__ai uint32_t vsha1h_u32(uint32_t __a) {
-  return (uint32_t)__builtin_neon_vsha1h_u32(__a); }
-
-__ai uint32x4_t vsha1mq_u32(uint32x4_t __a, uint32_t __b, uint32x4_t __c) {
-  return (uint32x4_t)__builtin_neon_vsha1mq_u32((int32x4_t)__a, __b, (int32x4_t)__c); }
-
-__ai uint32x4_t vsha1pq_u32(uint32x4_t __a, uint32_t __b, uint32x4_t __c) {
-  return (uint32x4_t)__builtin_neon_vsha1pq_u32((int32x4_t)__a, __b, (int32x4_t)__c); }
-
-__ai uint32x4_t vsha1su0q_u32(uint32x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return (uint32x4_t)__builtin_neon_vsha1su0q_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 50); }
-
-__ai uint32x4_t vsha1su1q_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vsha1su1q_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-
-__ai uint32x4_t vsha256hq_u32(uint32x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return (uint32x4_t)__builtin_neon_vsha256hq_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 50); }
-
-__ai uint32x4_t vsha256h2q_u32(uint32x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return (uint32x4_t)__builtin_neon_vsha256h2q_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 50); }
-
-__ai uint32x4_t vsha256su0q_u32(uint32x4_t __a, uint32x4_t __b) {
-  return (uint32x4_t)__builtin_neon_vsha256su0q_v((int8x16_t)__a, (int8x16_t)__b, 50); }
-
-__ai uint32x4_t vsha256su1q_u32(uint32x4_t __a, uint32x4_t __b, uint32x4_t __c) {
-  return (uint32x4_t)__builtin_neon_vsha256su1q_v((int8x16_t)__a, (int8x16_t)__b, (int8x16_t)__c, 50); }
-
-#endif
-
-#endif
-
-#undef __ai
-
-#endif /* __ARM_NEON_H */
diff --git a/include.new/clang/3.4.1/avx2intrin.h b/include.new/clang/3.4.1/avx2intrin.h
deleted file mode 100644
index 9574469..0000000
--- a/include.new/clang/3.4.1/avx2intrin.h
+++ /dev/null
@@ -1,1206 +0,0 @@
-/*===---- avx2intrin.h - AVX2 intrinsics -----------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __IMMINTRIN_H
-#error "Never use <avx2intrin.h> directly; include <immintrin.h> instead."
-#endif
-
-#ifndef __AVX2INTRIN_H
-#define __AVX2INTRIN_H
-
-/* SSE4 Multiple Packed Sums of Absolute Difference.  */
-#define _mm256_mpsadbw_epu8(X, Y, M) __builtin_ia32_mpsadbw256((X), (Y), (M))
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_abs_epi8(__m256i __a)
-{
-    return (__m256i)__builtin_ia32_pabsb256((__v32qi)__a);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_abs_epi16(__m256i __a)
-{
-    return (__m256i)__builtin_ia32_pabsw256((__v16hi)__a);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_abs_epi32(__m256i __a)
-{
-    return (__m256i)__builtin_ia32_pabsd256((__v8si)__a);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_packs_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_packsswb256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_packs_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_packssdw256((__v8si)__a, (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_packus_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_packuswb256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_packus_epi32(__m256i __V1, __m256i __V2)
-{
-  return (__m256i) __builtin_ia32_packusdw256((__v8si)__V1, (__v8si)__V2);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_add_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v32qi)__a + (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_add_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v16hi)__a + (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_add_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v8si)__a + (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_add_epi64(__m256i __a, __m256i __b)
-{
-  return __a + __b;
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_adds_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_paddsb256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_adds_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_paddsw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_adds_epu8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_paddusb256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_adds_epu16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_paddusw256((__v16hi)__a, (__v16hi)__b);
-}
-
-#define _mm256_alignr_epi8(a, b, n) __extension__ ({ \
-  __m256i __a = (a); \
-  __m256i __b = (b); \
-  (__m256i)__builtin_ia32_palignr256((__v32qi)__a, (__v32qi)__b, (n)); })
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_and_si256(__m256i __a, __m256i __b)
-{
-  return __a & __b;
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_andnot_si256(__m256i __a, __m256i __b)
-{
-  return ~__a & __b;
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_avg_epu8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pavgb256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_avg_epu16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pavgw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_blendv_epi8(__m256i __V1, __m256i __V2, __m256i __M)
-{
-  return (__m256i)__builtin_ia32_pblendvb256((__v32qi)__V1, (__v32qi)__V2,
-                                              (__v32qi)__M);
-}
-
-#define _mm256_blend_epi16(V1, V2, M) __extension__ ({ \
-  __m256i __V1 = (V1); \
-  __m256i __V2 = (V2); \
-  (__m256i)__builtin_ia32_pblendw256((__v16hi)__V1, (__v16hi)__V2, (M)); })
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cmpeq_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v32qi)__a == (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cmpeq_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v16hi)__a == (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cmpeq_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v8si)__a == (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cmpeq_epi64(__m256i __a, __m256i __b)
-{
-  return (__m256i)(__a == __b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cmpgt_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v32qi)__a > (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cmpgt_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v16hi)__a > (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cmpgt_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v8si)__a > (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cmpgt_epi64(__m256i __a, __m256i __b)
-{
-  return (__m256i)(__a > __b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_hadd_epi16(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_phaddw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_hadd_epi32(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_phaddd256((__v8si)__a, (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_hadds_epi16(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_phaddsw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_hsub_epi16(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_phsubw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_hsub_epi32(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_phsubd256((__v8si)__a, (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_hsubs_epi16(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_phsubsw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_maddubs_epi16(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_pmaddubsw256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_madd_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmaddwd256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_max_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmaxsb256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_max_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmaxsw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_max_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmaxsd256((__v8si)__a, (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_max_epu8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmaxub256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_max_epu16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmaxuw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_max_epu32(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmaxud256((__v8si)__a, (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_min_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pminsb256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_min_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pminsw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_min_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pminsd256((__v8si)__a, (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_min_epu8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pminub256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_min_epu16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pminuw256 ((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_min_epu32(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pminud256((__v8si)__a, (__v8si)__b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm256_movemask_epi8(__m256i __a)
-{
-  return __builtin_ia32_pmovmskb256((__v32qi)__a);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepi8_epi16(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovsxbw256((__v16qi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepi8_epi32(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovsxbd256((__v16qi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepi8_epi64(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovsxbq256((__v16qi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepi16_epi32(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovsxwd256((__v8hi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepi16_epi64(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovsxwq256((__v8hi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepi32_epi64(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovsxdq256((__v4si)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepu8_epi16(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovzxbw256((__v16qi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepu8_epi32(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovzxbd256((__v16qi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepu8_epi64(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovzxbq256((__v16qi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepu16_epi32(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovzxwd256((__v8hi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepu16_epi64(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovzxwq256((__v8hi)__V);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepu32_epi64(__m128i __V)
-{
-  return (__m256i)__builtin_ia32_pmovzxdq256((__v4si)__V);
-}
-
-static __inline__  __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_mul_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmuldq256((__v8si)__a, (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_mulhrs_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmulhrsw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_mulhi_epu16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmulhuw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_mulhi_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pmulhw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_mullo_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v16hi)__a * (__v16hi)__b);
-}
-
-static __inline__  __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_mullo_epi32 (__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v8si)__a * (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_mul_epu32(__m256i __a, __m256i __b)
-{
-  return __builtin_ia32_pmuludq256((__v8si)__a, (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_or_si256(__m256i __a, __m256i __b)
-{
-  return __a | __b;
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sad_epu8(__m256i __a, __m256i __b)
-{
-  return __builtin_ia32_psadbw256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_shuffle_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_pshufb256((__v32qi)__a, (__v32qi)__b);
-}
-
-#define _mm256_shuffle_epi32(a, imm) __extension__ ({ \
-  __m256i __a = (a); \
-  (__m256i)__builtin_shufflevector((__v8si)__a, (__v8si)_mm256_set1_epi32(0), \
-                                   (imm) & 0x3, ((imm) & 0xc) >> 2, \
-                                   ((imm) & 0x30) >> 4, ((imm) & 0xc0) >> 6, \
-                                   4 + (((imm) & 0x03) >> 0), \
-                                   4 + (((imm) & 0x0c) >> 2), \
-                                   4 + (((imm) & 0x30) >> 4), \
-                                   4 + (((imm) & 0xc0) >> 6)); })
-
-#define _mm256_shufflehi_epi16(a, imm) __extension__ ({ \
-  __m256i __a = (a); \
-  (__m256i)__builtin_shufflevector((__v16hi)__a, (__v16hi)_mm256_set1_epi16(0), \
-                                   0, 1, 2, 3, \
-                                   4 + (((imm) & 0x03) >> 0), \
-                                   4 + (((imm) & 0x0c) >> 2), \
-                                   4 + (((imm) & 0x30) >> 4), \
-                                   4 + (((imm) & 0xc0) >> 6), \
-                                   8, 9, 10, 11, \
-                                   12 + (((imm) & 0x03) >> 0), \
-                                   12 + (((imm) & 0x0c) >> 2), \
-                                   12 + (((imm) & 0x30) >> 4), \
-                                   12 + (((imm) & 0xc0) >> 6)); })
-
-#define _mm256_shufflelo_epi16(a, imm) __extension__ ({ \
-  __m256i __a = (a); \
-  (__m256i)__builtin_shufflevector((__v16hi)__a, (__v16hi)_mm256_set1_epi16(0), \
-                                   (imm) & 0x3,((imm) & 0xc) >> 2, \
-                                   ((imm) & 0x30) >> 4, ((imm) & 0xc0) >> 6, \
-                                   4, 5, 6, 7, \
-                                   8 + (((imm) & 0x03) >> 0), \
-                                   8 + (((imm) & 0x0c) >> 2), \
-                                   8 + (((imm) & 0x30) >> 4), \
-                                   8 + (((imm) & 0xc0) >> 6), \
-                                   12, 13, 14, 15); })
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sign_epi8(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_psignb256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sign_epi16(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_psignw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sign_epi32(__m256i __a, __m256i __b)
-{
-    return (__m256i)__builtin_ia32_psignd256((__v8si)__a, (__v8si)__b);
-}
-
-#define _mm256_slli_si256(a, count) __extension__ ({ \
-  __m256i __a = (a); \
-  (__m256i)__builtin_ia32_pslldqi256(__a, (count)*8); })
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_slli_epi16(__m256i __a, int __count)
-{
-  return (__m256i)__builtin_ia32_psllwi256((__v16hi)__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sll_epi16(__m256i __a, __m128i __count)
-{
-  return (__m256i)__builtin_ia32_psllw256((__v16hi)__a, (__v8hi)__count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_slli_epi32(__m256i __a, int __count)
-{
-  return (__m256i)__builtin_ia32_pslldi256((__v8si)__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sll_epi32(__m256i __a, __m128i __count)
-{
-  return (__m256i)__builtin_ia32_pslld256((__v8si)__a, (__v4si)__count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_slli_epi64(__m256i __a, int __count)
-{
-  return __builtin_ia32_psllqi256(__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sll_epi64(__m256i __a, __m128i __count)
-{
-  return __builtin_ia32_psllq256(__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srai_epi16(__m256i __a, int __count)
-{
-  return (__m256i)__builtin_ia32_psrawi256((__v16hi)__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sra_epi16(__m256i __a, __m128i __count)
-{
-  return (__m256i)__builtin_ia32_psraw256((__v16hi)__a, (__v8hi)__count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srai_epi32(__m256i __a, int __count)
-{
-  return (__m256i)__builtin_ia32_psradi256((__v8si)__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sra_epi32(__m256i __a, __m128i __count)
-{
-  return (__m256i)__builtin_ia32_psrad256((__v8si)__a, (__v4si)__count);
-}
-
-#define _mm256_srli_si256(a, count) __extension__ ({ \
-  __m256i __a = (a); \
-  (__m256i)__builtin_ia32_psrldqi256(__a, (count)*8); })
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srli_epi16(__m256i __a, int __count)
-{
-  return (__m256i)__builtin_ia32_psrlwi256((__v16hi)__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srl_epi16(__m256i __a, __m128i __count)
-{
-  return (__m256i)__builtin_ia32_psrlw256((__v16hi)__a, (__v8hi)__count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srli_epi32(__m256i __a, int __count)
-{
-  return (__m256i)__builtin_ia32_psrldi256((__v8si)__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srl_epi32(__m256i __a, __m128i __count)
-{
-  return (__m256i)__builtin_ia32_psrld256((__v8si)__a, (__v4si)__count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srli_epi64(__m256i __a, int __count)
-{
-  return __builtin_ia32_psrlqi256(__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srl_epi64(__m256i __a, __m128i __count)
-{
-  return __builtin_ia32_psrlq256(__a, __count);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sub_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v32qi)__a - (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sub_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v16hi)__a - (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sub_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)((__v8si)__a - (__v8si)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sub_epi64(__m256i __a, __m256i __b)
-{
-  return __a - __b;
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_subs_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_psubsb256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_subs_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_psubsw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_subs_epu8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_psubusb256((__v32qi)__a, (__v32qi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_subs_epu16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_psubusw256((__v16hi)__a, (__v16hi)__b);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_unpackhi_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_shufflevector((__v32qi)__a, (__v32qi)__b, 8, 32+8, 9, 32+9, 10, 32+10, 11, 32+11, 12, 32+12, 13, 32+13, 14, 32+14, 15, 32+15, 24, 32+24, 25, 32+25, 26, 32+26, 27, 32+27, 28, 32+28, 29, 32+29, 30, 32+30, 31, 32+31);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_unpackhi_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_shufflevector((__v16hi)__a, (__v16hi)__b, 4, 16+4, 5, 16+5, 6, 16+6, 7, 16+7, 12, 16+12, 13, 16+13, 14, 16+14, 15, 16+15);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_unpackhi_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_shufflevector((__v8si)__a, (__v8si)__b, 2, 8+2, 3, 8+3, 6, 8+6, 7, 8+7);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_unpackhi_epi64(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_shufflevector(__a, __b, 1, 4+1, 3, 4+3);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_unpacklo_epi8(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_shufflevector((__v32qi)__a, (__v32qi)__b, 0, 32+0, 1, 32+1, 2, 32+2, 3, 32+3, 4, 32+4, 5, 32+5, 6, 32+6, 7, 32+7, 16, 32+16, 17, 32+17, 18, 32+18, 19, 32+19, 20, 32+20, 21, 32+21, 22, 32+22, 23, 32+23);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_unpacklo_epi16(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_shufflevector((__v16hi)__a, (__v16hi)__b, 0, 16+0, 1, 16+1, 2, 16+2, 3, 16+3, 8, 16+8, 9, 16+9, 10, 16+10, 11, 16+11);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_unpacklo_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_shufflevector((__v8si)__a, (__v8si)__b, 0, 8+0, 1, 8+1, 4, 8+4, 5, 8+5);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_unpacklo_epi64(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_shufflevector(__a, __b, 0, 4+0, 2, 4+2);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_xor_si256(__m256i __a, __m256i __b)
-{
-  return __a ^ __b;
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_stream_load_si256(__m256i *__V)
-{
-  return (__m256i)__builtin_ia32_movntdqa256((__v4di *)__V);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_broadcastss_ps(__m128 __X)
-{
-  return (__m128)__builtin_ia32_vbroadcastss_ps((__v4sf)__X);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcastss_ps(__m128 __X)
-{
-  return (__m256)__builtin_ia32_vbroadcastss_ps256((__v4sf)__X);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcastsd_pd(__m128d __X)
-{
-  return (__m256d)__builtin_ia32_vbroadcastsd_pd256((__v2df)__X);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcastsi128_si256(__m128i __X)
-{
-  return (__m256i)__builtin_ia32_vbroadcastsi256(__X);
-}
-
-#define _mm_blend_epi32(V1, V2, M) __extension__ ({ \
-  __m128i __V1 = (V1); \
-  __m128i __V2 = (V2); \
-  (__m128i)__builtin_ia32_pblendd128((__v4si)__V1, (__v4si)__V2, (M)); })
-
-#define _mm256_blend_epi32(V1, V2, M) __extension__ ({ \
-  __m256i __V1 = (V1); \
-  __m256i __V2 = (V2); \
-  (__m256i)__builtin_ia32_pblendd256((__v8si)__V1, (__v8si)__V2, (M)); })
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcastb_epi8(__m128i __X)
-{
-  return (__m256i)__builtin_ia32_pbroadcastb256((__v16qi)__X);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcastw_epi16(__m128i __X)
-{
-  return (__m256i)__builtin_ia32_pbroadcastw256((__v8hi)__X);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcastd_epi32(__m128i __X)
-{
-  return (__m256i)__builtin_ia32_pbroadcastd256((__v4si)__X);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcastq_epi64(__m128i __X)
-{
-  return (__m256i)__builtin_ia32_pbroadcastq256(__X);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_broadcastb_epi8(__m128i __X)
-{
-  return (__m128i)__builtin_ia32_pbroadcastb128((__v16qi)__X);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_broadcastw_epi16(__m128i __X)
-{
-  return (__m128i)__builtin_ia32_pbroadcastw128((__v8hi)__X);
-}
-
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_broadcastd_epi32(__m128i __X)
-{
-  return (__m128i)__builtin_ia32_pbroadcastd128((__v4si)__X);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_broadcastq_epi64(__m128i __X)
-{
-  return (__m128i)__builtin_ia32_pbroadcastq128(__X);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_permutevar8x32_epi32(__m256i __a, __m256i __b)
-{
-  return (__m256i)__builtin_ia32_permvarsi256((__v8si)__a, (__v8si)__b);
-}
-
-#define _mm256_permute4x64_pd(V, M) __extension__ ({ \
-  __m256d __V = (V); \
-  (__m256d)__builtin_shufflevector((__v4df)__V, (__v4df) _mm256_setzero_pd(), \
-                                   (M) & 0x3, ((M) & 0xc) >> 2, \
-                                   ((M) & 0x30) >> 4, ((M) & 0xc0) >> 6); })
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_permutevar8x32_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)__builtin_ia32_permvarsf256((__v8sf)__a, (__v8sf)__b);
-}
-
-#define _mm256_permute4x64_epi64(V, M) __extension__ ({ \
-  __m256i __V = (V); \
-  (__m256i)__builtin_shufflevector((__v4di)__V, (__v4di) _mm256_setzero_si256(), \
-                                   (M) & 0x3, ((M) & 0xc) >> 2, \
-                                   ((M) & 0x30) >> 4, ((M) & 0xc0) >> 6); })
-
-#define _mm256_permute2x128_si256(V1, V2, M) __extension__ ({ \
-  __m256i __V1 = (V1); \
-  __m256i __V2 = (V2); \
-  (__m256i)__builtin_ia32_permti256(__V1, __V2, (M)); })
-
-#define _mm256_extracti128_si256(A, O) __extension__ ({ \
-  __m256i __A = (A); \
-  (__m128i)__builtin_ia32_extract128i256(__A, (O)); })
-
-#define _mm256_inserti128_si256(V1, V2, O) __extension__ ({ \
-  __m256i __V1 = (V1); \
-  __m128i __V2 = (V2); \
-  (__m256i)__builtin_ia32_insert128i256(__V1, __V2, (O)); })
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_maskload_epi32(int const *__X, __m256i __M)
-{
-  return (__m256i)__builtin_ia32_maskloadd256((const __v8si *)__X, (__v8si)__M);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_maskload_epi64(long long const *__X, __m256i __M)
-{
-  return (__m256i)__builtin_ia32_maskloadq256((const __v4di *)__X, __M);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maskload_epi32(int const *__X, __m128i __M)
-{
-  return (__m128i)__builtin_ia32_maskloadd((const __v4si *)__X, (__v4si)__M);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maskload_epi64(long long const *__X, __m128i __M)
-{
-  return (__m128i)__builtin_ia32_maskloadq((const __v2di *)__X, (__v2di)__M);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm256_maskstore_epi32(int *__X, __m256i __M, __m256i __Y)
-{
-  __builtin_ia32_maskstored256((__v8si *)__X, (__v8si)__M, (__v8si)__Y);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm256_maskstore_epi64(long long *__X, __m256i __M, __m256i __Y)
-{
-  __builtin_ia32_maskstoreq256((__v4di *)__X, __M, __Y);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_maskstore_epi32(int *__X, __m128i __M, __m128i __Y)
-{
-  __builtin_ia32_maskstored((__v4si *)__X, (__v4si)__M, (__v4si)__Y);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_maskstore_epi64(long long *__X, __m128i __M, __m128i __Y)
-{
-  __builtin_ia32_maskstoreq(( __v2di *)__X, __M, __Y);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sllv_epi32(__m256i __X, __m256i __Y)
-{
-  return (__m256i)__builtin_ia32_psllv8si((__v8si)__X, (__v8si)__Y);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sllv_epi32(__m128i __X, __m128i __Y)
-{
-  return (__m128i)__builtin_ia32_psllv4si((__v4si)__X, (__v4si)__Y);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_sllv_epi64(__m256i __X, __m256i __Y)
-{
-  return (__m256i)__builtin_ia32_psllv4di(__X, __Y);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sllv_epi64(__m128i __X, __m128i __Y)
-{
-  return (__m128i)__builtin_ia32_psllv2di(__X, __Y);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srav_epi32(__m256i __X, __m256i __Y)
-{
-  return (__m256i)__builtin_ia32_psrav8si((__v8si)__X, (__v8si)__Y);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srav_epi32(__m128i __X, __m128i __Y)
-{
-  return (__m128i)__builtin_ia32_psrav4si((__v4si)__X, (__v4si)__Y);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srlv_epi32(__m256i __X, __m256i __Y)
-{
-  return (__m256i)__builtin_ia32_psrlv8si((__v8si)__X, (__v8si)__Y);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srlv_epi32(__m128i __X, __m128i __Y)
-{
-  return (__m128i)__builtin_ia32_psrlv4si((__v4si)__X, (__v4si)__Y);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_srlv_epi64(__m256i __X, __m256i __Y)
-{
-  return (__m256i)__builtin_ia32_psrlv4di(__X, __Y);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srlv_epi64(__m128i __X, __m128i __Y)
-{
-  return (__m128i)__builtin_ia32_psrlv2di(__X, __Y);
-}
-
-#define _mm_mask_i32gather_pd(a, m, i, mask, s) __extension__ ({ \
-  __m128d __a = (a); \
-  double const *__m = (m); \
-  __m128i __i = (i); \
-  __m128d __mask = (mask); \
-  (__m128d)__builtin_ia32_gatherd_pd((__v2df)__a, (const __v2df *)__m, \
-             (__v4si)__i, (__v2df)__mask, (s)); })
-
-#define _mm256_mask_i32gather_pd(a, m, i, mask, s) __extension__ ({ \
-  __m256d __a = (a); \
-  double const *__m = (m); \
-  __m128i __i = (i); \
-  __m256d __mask = (mask); \
-  (__m256d)__builtin_ia32_gatherd_pd256((__v4df)__a, (const __v4df *)__m, \
-             (__v4si)__i, (__v4df)__mask, (s)); })
-
-#define _mm_mask_i64gather_pd(a, m, i, mask, s) __extension__ ({ \
-  __m128d __a = (a); \
-  double const *__m = (m); \
-  __m128i __i = (i); \
-  __m128d __mask = (mask); \
-  (__m128d)__builtin_ia32_gatherq_pd((__v2df)__a, (const __v2df *)__m, \
-             (__v2di)__i, (__v2df)__mask, (s)); })
-
-#define _mm256_mask_i64gather_pd(a, m, i, mask, s) __extension__ ({ \
-  __m256d __a = (a); \
-  double const *__m = (m); \
-  __m256i __i = (i); \
-  __m256d __mask = (mask); \
-  (__m256d)__builtin_ia32_gatherq_pd256((__v4df)__a, (const __v4df *)__m, \
-             (__v4di)__i, (__v4df)__mask, (s)); })
-
-#define _mm_mask_i32gather_ps(a, m, i, mask, s) __extension__ ({ \
-  __m128 __a = (a); \
-  float const *__m = (m); \
-  __m128i __i = (i); \
-  __m128 __mask = (mask); \
-  (__m128)__builtin_ia32_gatherd_ps((__v4sf)__a, (const __v4sf *)__m, \
-            (__v4si)__i, (__v4sf)__mask, (s)); })
-
-#define _mm256_mask_i32gather_ps(a, m, i, mask, s) __extension__ ({ \
-  __m256 __a = (a); \
-  float const *__m = (m); \
-  __m256i __i = (i); \
-  __m256 __mask = (mask); \
-  (__m256)__builtin_ia32_gatherd_ps256((__v8sf)__a, (const __v8sf *)__m, \
-            (__v8si)__i, (__v8sf)__mask, (s)); })
-
-#define _mm_mask_i64gather_ps(a, m, i, mask, s) __extension__ ({ \
-  __m128 __a = (a); \
-  float const *__m = (m); \
-  __m128i __i = (i); \
-  __m128 __mask = (mask); \
-  (__m128)__builtin_ia32_gatherq_ps((__v4sf)__a, (const __v4sf *)__m, \
-            (__v2di)__i, (__v4sf)__mask, (s)); })
-
-#define _mm256_mask_i64gather_ps(a, m, i, mask, s) __extension__ ({ \
-  __m128 __a = (a); \
-  float const *__m = (m); \
-  __m256i __i = (i); \
-  __m128 __mask = (mask); \
-  (__m128)__builtin_ia32_gatherq_ps256((__v4sf)__a, (const __v4sf *)__m, \
-            (__v4di)__i, (__v4sf)__mask, (s)); })
-
-#define _mm_mask_i32gather_epi32(a, m, i, mask, s) __extension__ ({ \
-  __m128i __a = (a); \
-  int const *__m = (m); \
-  __m128i __i = (i); \
-  __m128i __mask = (mask); \
-  (__m128i)__builtin_ia32_gatherd_d((__v4si)__a, (const __v4si *)__m, \
-            (__v4si)__i, (__v4si)__mask, (s)); })
-
-#define _mm256_mask_i32gather_epi32(a, m, i, mask, s) __extension__ ({ \
-  __m256i __a = (a); \
-  int const *__m = (m); \
-  __m256i __i = (i); \
-  __m256i __mask = (mask); \
-  (__m256i)__builtin_ia32_gatherd_d256((__v8si)__a, (const __v8si *)__m, \
-            (__v8si)__i, (__v8si)__mask, (s)); })
-
-#define _mm_mask_i64gather_epi32(a, m, i, mask, s) __extension__ ({ \
-  __m128i __a = (a); \
-  int const *__m = (m); \
-  __m128i __i = (i); \
-  __m128i __mask = (mask); \
-  (__m128i)__builtin_ia32_gatherq_d((__v4si)__a, (const __v4si *)__m, \
-            (__v2di)__i, (__v4si)__mask, (s)); })
-
-#define _mm256_mask_i64gather_epi32(a, m, i, mask, s) __extension__ ({ \
-  __m128i __a = (a); \
-  int const *__m = (m); \
-  __m256i __i = (i); \
-  __m128i __mask = (mask); \
-  (__m128i)__builtin_ia32_gatherq_d256((__v4si)__a, (const __v4si *)__m, \
-            (__v4di)__i, (__v4si)__mask, (s)); })
-
-#define _mm_mask_i32gather_epi64(a, m, i, mask, s) __extension__ ({ \
-  __m128i __a = (a); \
-  long long const *__m = (m); \
-  __m128i __i = (i); \
-  __m128i __mask = (mask); \
-  (__m128i)__builtin_ia32_gatherd_q((__v2di)__a, (const __v2di *)__m, \
-             (__v4si)__i, (__v2di)__mask, (s)); })
-
-#define _mm256_mask_i32gather_epi64(a, m, i, mask, s) __extension__ ({ \
-  __m256i __a = (a); \
-  long long const *__m = (m); \
-  __m128i __i = (i); \
-  __m256i __mask = (mask); \
-  (__m256i)__builtin_ia32_gatherd_q256((__v4di)__a, (const __v4di *)__m, \
-             (__v4si)__i, (__v4di)__mask, (s)); })
-
-#define _mm_mask_i64gather_epi64(a, m, i, mask, s) __extension__ ({ \
-  __m128i __a = (a); \
-  long long const *__m = (m); \
-  __m128i __i = (i); \
-  __m128i __mask = (mask); \
-  (__m128i)__builtin_ia32_gatherq_q((__v2di)__a, (const __v2di *)__m, \
-             (__v2di)__i, (__v2di)__mask, (s)); })
-
-#define _mm256_mask_i64gather_epi64(a, m, i, mask, s) __extension__ ({ \
-  __m256i __a = (a); \
-  long long const *__m = (m); \
-  __m256i __i = (i); \
-  __m256i __mask = (mask); \
-  (__m256i)__builtin_ia32_gatherq_q256((__v4di)__a, (const __v4di *)__m, \
-             (__v4di)__i, (__v4di)__mask, (s)); })
-
-#define _mm_i32gather_pd(m, i, s) __extension__ ({ \
-  double const *__m = (m); \
-  __m128i __i = (i); \
-  (__m128d)__builtin_ia32_gatherd_pd((__v2df)_mm_setzero_pd(), \
-             (const __v2df *)__m, (__v4si)__i, \
-             (__v2df)_mm_set1_pd((double)(long long int)-1), (s)); })
-
-#define _mm256_i32gather_pd(m, i, s) __extension__ ({ \
-  double const *__m = (m); \
-  __m128i __i = (i); \
-  (__m256d)__builtin_ia32_gatherd_pd256((__v4df)_mm256_setzero_pd(), \
-             (const __v4df *)__m, (__v4si)__i, \
-             (__v4df)_mm256_set1_pd((double)(long long int)-1), (s)); })
-
-#define _mm_i64gather_pd(m, i, s) __extension__ ({ \
-  double const *__m = (m); \
-  __m128i __i = (i); \
-  (__m128d)__builtin_ia32_gatherq_pd((__v2df)_mm_setzero_pd(), \
-             (const __v2df *)__m, (__v2di)__i, \
-             (__v2df)_mm_set1_pd((double)(long long int)-1), (s)); })
-
-#define _mm256_i64gather_pd(m, i, s) __extension__ ({ \
-  double const *__m = (m); \
-  __m256i __i = (i); \
-  (__m256d)__builtin_ia32_gatherq_pd256((__v4df)_mm256_setzero_pd(), \
-             (const __v4df *)__m, (__v4di)__i, \
-             (__v4df)_mm256_set1_pd((double)(long long int)-1), (s)); })
-
-#define _mm_i32gather_ps(m, i, s) __extension__ ({ \
-  float const *__m = (m); \
-  __m128i __i = (i); \
-  (__m128)__builtin_ia32_gatherd_ps((__v4sf)_mm_setzero_ps(), \
-             (const __v4sf *)__m, (__v4si)__i, \
-             (__v4sf)_mm_set1_ps((float)(int)-1), (s)); })
-
-#define _mm256_i32gather_ps(m, i, s) __extension__ ({ \
-  float const *__m = (m); \
-  __m256i __i = (i); \
-  (__m256)__builtin_ia32_gatherd_ps256((__v8sf)_mm256_setzero_ps(), \
-             (const __v8sf *)__m, (__v8si)__i, \
-             (__v8sf)_mm256_set1_ps((float)(int)-1), (s)); })
-
-#define _mm_i64gather_ps(m, i, s) __extension__ ({ \
-  float const *__m = (m); \
-  __m128i __i = (i); \
-  (__m128)__builtin_ia32_gatherq_ps((__v4sf)_mm_setzero_ps(), \
-             (const __v4sf *)__m, (__v2di)__i, \
-             (__v4sf)_mm_set1_ps((float)(int)-1), (s)); })
-
-#define _mm256_i64gather_ps(m, i, s) __extension__ ({ \
-  float const *__m = (m); \
-  __m256i __i = (i); \
-  (__m128)__builtin_ia32_gatherq_ps256((__v4sf)_mm_setzero_ps(), \
-             (const __v4sf *)__m, (__v4di)__i, \
-             (__v4sf)_mm_set1_ps((float)(int)-1), (s)); })
-
-#define _mm_i32gather_epi32(m, i, s) __extension__ ({ \
-  int const *__m = (m); \
-  __m128i __i = (i); \
-  (__m128i)__builtin_ia32_gatherd_d((__v4si)_mm_setzero_si128(), \
-            (const __v4si *)__m, (__v4si)__i, \
-            (__v4si)_mm_set1_epi32(-1), (s)); })
-
-#define _mm256_i32gather_epi32(m, i, s) __extension__ ({ \
-  int const *__m = (m); \
-  __m256i __i = (i); \
-  (__m256i)__builtin_ia32_gatherd_d256((__v8si)_mm256_setzero_si256(), \
-            (const __v8si *)__m, (__v8si)__i, \
-            (__v8si)_mm256_set1_epi32(-1), (s)); })
-
-#define _mm_i64gather_epi32(m, i, s) __extension__ ({ \
-  int const *__m = (m); \
-  __m128i __i = (i); \
-  (__m128i)__builtin_ia32_gatherq_d((__v4si)_mm_setzero_si128(), \
-            (const __v4si *)__m, (__v2di)__i, \
-            (__v4si)_mm_set1_epi32(-1), (s)); })
-
-#define _mm256_i64gather_epi32(m, i, s) __extension__ ({ \
-  int const *__m = (m); \
-  __m256i __i = (i); \
-  (__m128i)__builtin_ia32_gatherq_d256((__v4si)_mm_setzero_si128(), \
-            (const __v4si *)__m, (__v4di)__i, \
-            (__v4si)_mm_set1_epi32(-1), (s)); })
-
-#define _mm_i32gather_epi64(m, i, s) __extension__ ({ \
-  long long const *__m = (m); \
-  __m128i __i = (i); \
-  (__m128i)__builtin_ia32_gatherd_q((__v2di)_mm_setzero_si128(), \
-             (const __v2di *)__m, (__v4si)__i, \
-             (__v2di)_mm_set1_epi64x(-1), (s)); })
-
-#define _mm256_i32gather_epi64(m, i, s) __extension__ ({ \
-  long long const *__m = (m); \
-  __m128i __i = (i); \
-  (__m256i)__builtin_ia32_gatherd_q256((__v4di)_mm256_setzero_si256(), \
-             (const __v4di *)__m, (__v4si)__i, \
-             (__v4di)_mm256_set1_epi64x(-1), (s)); })
-
-#define _mm_i64gather_epi64(m, i, s) __extension__ ({ \
-  long long const *__m = (m); \
-  __m128i __i = (i); \
-  (__m128i)__builtin_ia32_gatherq_q((__v2di)_mm_setzero_si128(), \
-             (const __v2di *)__m, (__v2di)__i, \
-             (__v2di)_mm_set1_epi64x(-1), (s)); })
-
-#define _mm256_i64gather_epi64(m, i, s) __extension__ ({ \
-  long long const *__m = (m); \
-  __m256i __i = (i); \
-  (__m256i)__builtin_ia32_gatherq_q256((__v4di)_mm256_setzero_si256(), \
-             (const __v4di *)__m, (__v4di)__i, \
-             (__v4di)_mm256_set1_epi64x(-1), (s)); })
-
-#endif /* __AVX2INTRIN_H */
diff --git a/include.new/clang/3.4.1/avxintrin.h b/include.new/clang/3.4.1/avxintrin.h
deleted file mode 100644
index 141c4d9..0000000
--- a/include.new/clang/3.4.1/avxintrin.h
+++ /dev/null
@@ -1,1224 +0,0 @@
-/*===---- avxintrin.h - AVX intrinsics -------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __IMMINTRIN_H
-#error "Never use <avxintrin.h> directly; include <immintrin.h> instead."
-#endif
-
-#ifndef __AVXINTRIN_H
-#define __AVXINTRIN_H
-
-typedef double __v4df __attribute__ ((__vector_size__ (32)));
-typedef float __v8sf __attribute__ ((__vector_size__ (32)));
-typedef long long __v4di __attribute__ ((__vector_size__ (32)));
-typedef int __v8si __attribute__ ((__vector_size__ (32)));
-typedef short __v16hi __attribute__ ((__vector_size__ (32)));
-typedef char __v32qi __attribute__ ((__vector_size__ (32)));
-
-typedef float __m256 __attribute__ ((__vector_size__ (32)));
-typedef double __m256d __attribute__((__vector_size__(32)));
-typedef long long __m256i __attribute__((__vector_size__(32)));
-
-/* Arithmetic */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_add_pd(__m256d __a, __m256d __b)
-{
-  return __a+__b;
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_add_ps(__m256 __a, __m256 __b)
-{
-  return __a+__b;
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_sub_pd(__m256d __a, __m256d __b)
-{
-  return __a-__b;
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_sub_ps(__m256 __a, __m256 __b)
-{
-  return __a-__b;
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_addsub_pd(__m256d __a, __m256d __b)
-{
-  return (__m256d)__builtin_ia32_addsubpd256((__v4df)__a, (__v4df)__b);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_addsub_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)__builtin_ia32_addsubps256((__v8sf)__a, (__v8sf)__b);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_div_pd(__m256d __a, __m256d __b)
-{
-  return __a / __b;
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_div_ps(__m256 __a, __m256 __b)
-{
-  return __a / __b;
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_max_pd(__m256d __a, __m256d __b)
-{
-  return (__m256d)__builtin_ia32_maxpd256((__v4df)__a, (__v4df)__b);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_max_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)__builtin_ia32_maxps256((__v8sf)__a, (__v8sf)__b);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_min_pd(__m256d __a, __m256d __b)
-{
-  return (__m256d)__builtin_ia32_minpd256((__v4df)__a, (__v4df)__b);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_min_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)__builtin_ia32_minps256((__v8sf)__a, (__v8sf)__b);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_mul_pd(__m256d __a, __m256d __b)
-{
-  return __a * __b;
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_mul_ps(__m256 __a, __m256 __b)
-{
-  return __a * __b;
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_sqrt_pd(__m256d __a)
-{
-  return (__m256d)__builtin_ia32_sqrtpd256((__v4df)__a);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_sqrt_ps(__m256 __a)
-{
-  return (__m256)__builtin_ia32_sqrtps256((__v8sf)__a);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_rsqrt_ps(__m256 __a)
-{
-  return (__m256)__builtin_ia32_rsqrtps256((__v8sf)__a);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_rcp_ps(__m256 __a)
-{
-  return (__m256)__builtin_ia32_rcpps256((__v8sf)__a);
-}
-
-#define _mm256_round_pd(V, M) __extension__ ({ \
-    __m256d __V = (V); \
-    (__m256d)__builtin_ia32_roundpd256((__v4df)__V, (M)); })
-
-#define _mm256_round_ps(V, M) __extension__ ({ \
-  __m256 __V = (V); \
-  (__m256)__builtin_ia32_roundps256((__v8sf)__V, (M)); })
-
-#define _mm256_ceil_pd(V)  _mm256_round_pd((V), _MM_FROUND_CEIL)
-#define _mm256_floor_pd(V) _mm256_round_pd((V), _MM_FROUND_FLOOR)
-#define _mm256_ceil_ps(V)  _mm256_round_ps((V), _MM_FROUND_CEIL)
-#define _mm256_floor_ps(V) _mm256_round_ps((V), _MM_FROUND_FLOOR)
-
-/* Logical */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_and_pd(__m256d __a, __m256d __b)
-{
-  return (__m256d)((__v4di)__a & (__v4di)__b);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_and_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)((__v8si)__a & (__v8si)__b);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_andnot_pd(__m256d __a, __m256d __b)
-{
-  return (__m256d)(~(__v4di)__a & (__v4di)__b);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_andnot_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)(~(__v8si)__a & (__v8si)__b);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_or_pd(__m256d __a, __m256d __b)
-{
-  return (__m256d)((__v4di)__a | (__v4di)__b);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_or_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)((__v8si)__a | (__v8si)__b);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_xor_pd(__m256d __a, __m256d __b)
-{
-  return (__m256d)((__v4di)__a ^ (__v4di)__b);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_xor_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)((__v8si)__a ^ (__v8si)__b);
-}
-
-/* Horizontal arithmetic */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_hadd_pd(__m256d __a, __m256d __b)
-{
-  return (__m256d)__builtin_ia32_haddpd256((__v4df)__a, (__v4df)__b);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_hadd_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)__builtin_ia32_haddps256((__v8sf)__a, (__v8sf)__b);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_hsub_pd(__m256d __a, __m256d __b)
-{
-  return (__m256d)__builtin_ia32_hsubpd256((__v4df)__a, (__v4df)__b);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_hsub_ps(__m256 __a, __m256 __b)
-{
-  return (__m256)__builtin_ia32_hsubps256((__v8sf)__a, (__v8sf)__b);
-}
-
-/* Vector permutations */
-static __inline __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_permutevar_pd(__m128d __a, __m128i __c)
-{
-  return (__m128d)__builtin_ia32_vpermilvarpd((__v2df)__a, (__v2di)__c);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_permutevar_pd(__m256d __a, __m256i __c)
-{
-  return (__m256d)__builtin_ia32_vpermilvarpd256((__v4df)__a, (__v4di)__c);
-}
-
-static __inline __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_permutevar_ps(__m128 __a, __m128i __c)
-{
-  return (__m128)__builtin_ia32_vpermilvarps((__v4sf)__a, (__v4si)__c);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_permutevar_ps(__m256 __a, __m256i __c)
-{
-  return (__m256)__builtin_ia32_vpermilvarps256((__v8sf)__a,
-						  (__v8si)__c);
-}
-
-#define _mm_permute_pd(A, C) __extension__ ({ \
-  __m128d __A = (A); \
-  (__m128d)__builtin_shufflevector((__v2df)__A, (__v2df) _mm_setzero_pd(), \
-                                   (C) & 0x1, ((C) & 0x2) >> 1); })
-
-#define _mm256_permute_pd(A, C) __extension__ ({ \
-  __m256d __A = (A); \
-  (__m256d)__builtin_shufflevector((__v4df)__A, (__v4df) _mm256_setzero_pd(), \
-                                   (C) & 0x1, ((C) & 0x2) >> 1, \
-                                   2 + (((C) & 0x4) >> 2), \
-                                   2 + (((C) & 0x8) >> 3)); })
-
-#define _mm_permute_ps(A, C) __extension__ ({ \
-  __m128 __A = (A); \
-  (__m128)__builtin_shufflevector((__v4sf)__A, (__v4sf) _mm_setzero_ps(), \
-                                   (C) & 0x3, ((C) & 0xc) >> 2, \
-                                   ((C) & 0x30) >> 4, ((C) & 0xc0) >> 6); })
-
-#define _mm256_permute_ps(A, C) __extension__ ({ \
-  __m256 __A = (A); \
-  (__m256)__builtin_shufflevector((__v8sf)__A, (__v8sf) _mm256_setzero_ps(), \
-                                  (C) & 0x3, ((C) & 0xc) >> 2, \
-                                  ((C) & 0x30) >> 4, ((C) & 0xc0) >> 6, \
-                                  4 + (((C) & 0x03) >> 0), \
-                                  4 + (((C) & 0x0c) >> 2), \
-                                  4 + (((C) & 0x30) >> 4), \
-                                  4 + (((C) & 0xc0) >> 6)); })
-
-#define _mm256_permute2f128_pd(V1, V2, M) __extension__ ({ \
-  __m256d __V1 = (V1); \
-  __m256d __V2 = (V2); \
-  (__m256d)__builtin_ia32_vperm2f128_pd256((__v4df)__V1, (__v4df)__V2, (M)); })
-
-#define _mm256_permute2f128_ps(V1, V2, M) __extension__ ({ \
-  __m256 __V1 = (V1); \
-  __m256 __V2 = (V2); \
-  (__m256)__builtin_ia32_vperm2f128_ps256((__v8sf)__V1, (__v8sf)__V2, (M)); })
-
-#define _mm256_permute2f128_si256(V1, V2, M) __extension__ ({ \
-  __m256i __V1 = (V1); \
-  __m256i __V2 = (V2); \
-  (__m256i)__builtin_ia32_vperm2f128_si256((__v8si)__V1, (__v8si)__V2, (M)); })
-
-/* Vector Blend */
-#define _mm256_blend_pd(V1, V2, M) __extension__ ({ \
-  __m256d __V1 = (V1); \
-  __m256d __V2 = (V2); \
-  (__m256d)__builtin_ia32_blendpd256((__v4df)__V1, (__v4df)__V2, (M)); })
-
-#define _mm256_blend_ps(V1, V2, M) __extension__ ({ \
-  __m256 __V1 = (V1); \
-  __m256 __V2 = (V2); \
-  (__m256)__builtin_ia32_blendps256((__v8sf)__V1, (__v8sf)__V2, (M)); })
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_blendv_pd(__m256d __a, __m256d __b, __m256d __c)
-{
-  return (__m256d)__builtin_ia32_blendvpd256(
-    (__v4df)__a, (__v4df)__b, (__v4df)__c);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_blendv_ps(__m256 __a, __m256 __b, __m256 __c)
-{
-  return (__m256)__builtin_ia32_blendvps256(
-    (__v8sf)__a, (__v8sf)__b, (__v8sf)__c);
-}
-
-/* Vector Dot Product */
-#define _mm256_dp_ps(V1, V2, M) __extension__ ({ \
-  __m256 __V1 = (V1); \
-  __m256 __V2 = (V2); \
-  (__m256)__builtin_ia32_dpps256((__v8sf)__V1, (__v8sf)__V2, (M)); })
-
-/* Vector shuffle */
-#define _mm256_shuffle_ps(a, b, mask) __extension__ ({ \
-        __m256 __a = (a); \
-        __m256 __b = (b); \
-        (__m256)__builtin_shufflevector((__v8sf)__a, (__v8sf)__b, \
-        (mask) & 0x3,                ((mask) & 0xc) >> 2, \
-        (((mask) & 0x30) >> 4) + 8,  (((mask) & 0xc0) >> 6) + 8, \
-        ((mask) & 0x3) + 4,          (((mask) & 0xc) >> 2) + 4, \
-        (((mask) & 0x30) >> 4) + 12, (((mask) & 0xc0) >> 6) + 12); })
-
-#define _mm256_shuffle_pd(a, b, mask) __extension__ ({ \
-        __m256d __a = (a); \
-        __m256d __b = (b); \
-        (__m256d)__builtin_shufflevector((__v4df)__a, (__v4df)__b, \
-        (mask) & 0x1, \
-        (((mask) & 0x2) >> 1) + 4, \
-        (((mask) & 0x4) >> 2) + 2, \
-        (((mask) & 0x8) >> 3) + 6); })
-
-/* Compare */
-#define _CMP_EQ_OQ    0x00 /* Equal (ordered, non-signaling)  */
-#define _CMP_LT_OS    0x01 /* Less-than (ordered, signaling)  */
-#define _CMP_LE_OS    0x02 /* Less-than-or-equal (ordered, signaling)  */
-#define _CMP_UNORD_Q  0x03 /* Unordered (non-signaling)  */
-#define _CMP_NEQ_UQ   0x04 /* Not-equal (unordered, non-signaling)  */
-#define _CMP_NLT_US   0x05 /* Not-less-than (unordered, signaling)  */
-#define _CMP_NLE_US   0x06 /* Not-less-than-or-equal (unordered, signaling)  */
-#define _CMP_ORD_Q    0x07 /* Ordered (nonsignaling)   */
-#define _CMP_EQ_UQ    0x08 /* Equal (unordered, non-signaling)  */
-#define _CMP_NGE_US   0x09 /* Not-greater-than-or-equal (unord, signaling)  */
-#define _CMP_NGT_US   0x0a /* Not-greater-than (unordered, signaling)  */
-#define _CMP_FALSE_OQ 0x0b /* False (ordered, non-signaling)  */
-#define _CMP_NEQ_OQ   0x0c /* Not-equal (ordered, non-signaling)  */
-#define _CMP_GE_OS    0x0d /* Greater-than-or-equal (ordered, signaling)  */
-#define _CMP_GT_OS    0x0e /* Greater-than (ordered, signaling)  */
-#define _CMP_TRUE_UQ  0x0f /* True (unordered, non-signaling)  */
-#define _CMP_EQ_OS    0x10 /* Equal (ordered, signaling)  */
-#define _CMP_LT_OQ    0x11 /* Less-than (ordered, non-signaling)  */
-#define _CMP_LE_OQ    0x12 /* Less-than-or-equal (ordered, non-signaling)  */
-#define _CMP_UNORD_S  0x13 /* Unordered (signaling)  */
-#define _CMP_NEQ_US   0x14 /* Not-equal (unordered, signaling)  */
-#define _CMP_NLT_UQ   0x15 /* Not-less-than (unordered, non-signaling)  */
-#define _CMP_NLE_UQ   0x16 /* Not-less-than-or-equal (unord, non-signaling)  */
-#define _CMP_ORD_S    0x17 /* Ordered (signaling)  */
-#define _CMP_EQ_US    0x18 /* Equal (unordered, signaling)  */
-#define _CMP_NGE_UQ   0x19 /* Not-greater-than-or-equal (unord, non-sign)  */
-#define _CMP_NGT_UQ   0x1a /* Not-greater-than (unordered, non-signaling)  */
-#define _CMP_FALSE_OS 0x1b /* False (ordered, signaling)  */
-#define _CMP_NEQ_OS   0x1c /* Not-equal (ordered, signaling)  */
-#define _CMP_GE_OQ    0x1d /* Greater-than-or-equal (ordered, non-signaling)  */
-#define _CMP_GT_OQ    0x1e /* Greater-than (ordered, non-signaling)  */
-#define _CMP_TRUE_US  0x1f /* True (unordered, signaling)  */
-
-#define _mm_cmp_pd(a, b, c) __extension__ ({ \
-  __m128d __a = (a); \
-  __m128d __b = (b); \
-  (__m128d)__builtin_ia32_cmppd((__v2df)__a, (__v2df)__b, (c)); })
-
-#define _mm_cmp_ps(a, b, c) __extension__ ({ \
-  __m128 __a = (a); \
-  __m128 __b = (b); \
-  (__m128)__builtin_ia32_cmpps((__v4sf)__a, (__v4sf)__b, (c)); })
-
-#define _mm256_cmp_pd(a, b, c) __extension__ ({ \
-  __m256d __a = (a); \
-  __m256d __b = (b); \
-  (__m256d)__builtin_ia32_cmppd256((__v4df)__a, (__v4df)__b, (c)); })
-
-#define _mm256_cmp_ps(a, b, c) __extension__ ({ \
-  __m256 __a = (a); \
-  __m256 __b = (b); \
-  (__m256)__builtin_ia32_cmpps256((__v8sf)__a, (__v8sf)__b, (c)); })
-
-#define _mm_cmp_sd(a, b, c) __extension__ ({ \
-  __m128d __a = (a); \
-  __m128d __b = (b); \
-  (__m128d)__builtin_ia32_cmpsd((__v2df)__a, (__v2df)__b, (c)); })
-
-#define _mm_cmp_ss(a, b, c) __extension__ ({ \
-  __m128 __a = (a); \
-  __m128 __b = (b); \
-  (__m128)__builtin_ia32_cmpss((__v4sf)__a, (__v4sf)__b, (c)); })
-
-/* Vector extract */
-#define _mm256_extractf128_pd(A, O) __extension__ ({ \
-  __m256d __A = (A); \
-  (__m128d)__builtin_ia32_vextractf128_pd256((__v4df)__A, (O)); })
-
-#define _mm256_extractf128_ps(A, O) __extension__ ({ \
-  __m256 __A = (A); \
-  (__m128)__builtin_ia32_vextractf128_ps256((__v8sf)__A, (O)); })
-
-#define _mm256_extractf128_si256(A, O) __extension__ ({ \
-  __m256i __A = (A); \
-  (__m128i)__builtin_ia32_vextractf128_si256((__v8si)__A, (O)); })
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_extract_epi32(__m256i __a, int const __imm)
-{
-  __v8si __b = (__v8si)__a;
-  return __b[__imm & 7];
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_extract_epi16(__m256i __a, int const __imm)
-{
-  __v16hi __b = (__v16hi)__a;
-  return __b[__imm & 15];
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_extract_epi8(__m256i __a, int const __imm)
-{
-  __v32qi __b = (__v32qi)__a;
-  return __b[__imm & 31];
-}
-
-#ifdef __x86_64__
-static __inline long long  __attribute__((__always_inline__, __nodebug__))
-_mm256_extract_epi64(__m256i __a, const int __imm)
-{
-  __v4di __b = (__v4di)__a;
-  return __b[__imm & 3];
-}
-#endif
-
-/* Vector insert */
-#define _mm256_insertf128_pd(V1, V2, O) __extension__ ({ \
-  __m256d __V1 = (V1); \
-  __m128d __V2 = (V2); \
-  (__m256d)__builtin_ia32_vinsertf128_pd256((__v4df)__V1, (__v2df)__V2, (O)); })
-
-#define _mm256_insertf128_ps(V1, V2, O) __extension__ ({ \
-  __m256 __V1 = (V1); \
-  __m128 __V2 = (V2); \
-  (__m256)__builtin_ia32_vinsertf128_ps256((__v8sf)__V1, (__v4sf)__V2, (O)); })
-
-#define _mm256_insertf128_si256(V1, V2, O) __extension__ ({ \
-  __m256i __V1 = (V1); \
-  __m128i __V2 = (V2); \
-  (__m256i)__builtin_ia32_vinsertf128_si256((__v8si)__V1, (__v4si)__V2, (O)); })
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_insert_epi32(__m256i __a, int __b, int const __imm)
-{
-  __v8si __c = (__v8si)__a;
-  __c[__imm & 7] = __b;
-  return (__m256i)__c;
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_insert_epi16(__m256i __a, int __b, int const __imm)
-{
-  __v16hi __c = (__v16hi)__a;
-  __c[__imm & 15] = __b;
-  return (__m256i)__c;
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_insert_epi8(__m256i __a, int __b, int const __imm)
-{
-  __v32qi __c = (__v32qi)__a;
-  __c[__imm & 31] = __b;
-  return (__m256i)__c;
-}
-
-#ifdef __x86_64__
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_insert_epi64(__m256i __a, int __b, int const __imm)
-{
-  __v4di __c = (__v4di)__a;
-  __c[__imm & 3] = __b;
-  return (__m256i)__c;
-}
-#endif
-
-/* Conversion */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepi32_pd(__m128i __a)
-{
-  return (__m256d)__builtin_ia32_cvtdq2pd256((__v4si) __a);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtepi32_ps(__m256i __a)
-{
-  return (__m256)__builtin_ia32_cvtdq2ps256((__v8si) __a);
-}
-
-static __inline __m128 __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtpd_ps(__m256d __a)
-{
-  return (__m128)__builtin_ia32_cvtpd2ps256((__v4df) __a);
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtps_epi32(__m256 __a)
-{
-  return (__m256i)__builtin_ia32_cvtps2dq256((__v8sf) __a);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtps_pd(__m128 __a)
-{
-  return (__m256d)__builtin_ia32_cvtps2pd256((__v4sf) __a);
-}
-
-static __inline __m128i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvttpd_epi32(__m256d __a)
-{
-  return (__m128i)__builtin_ia32_cvttpd2dq256((__v4df) __a);
-}
-
-static __inline __m128i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtpd_epi32(__m256d __a)
-{
-  return (__m128i)__builtin_ia32_cvtpd2dq256((__v4df) __a);
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cvttps_epi32(__m256 __a)
-{
-  return (__m256i)__builtin_ia32_cvttps2dq256((__v8sf) __a);
-}
-
-/* Vector replicate */
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_movehdup_ps(__m256 __a)
-{
-  return __builtin_shufflevector(__a, __a, 1, 1, 3, 3, 5, 5, 7, 7);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_moveldup_ps(__m256 __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 0, 2, 2, 4, 4, 6, 6);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_movedup_pd(__m256d __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 0, 2, 2);
-}
-
-/* Unpack and Interleave */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_unpackhi_pd(__m256d __a, __m256d __b)
-{
-  return __builtin_shufflevector(__a, __b, 1, 5, 1+2, 5+2);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_unpacklo_pd(__m256d __a, __m256d __b)
-{
-  return __builtin_shufflevector(__a, __b, 0, 4, 0+2, 4+2);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_unpackhi_ps(__m256 __a, __m256 __b)
-{
-  return __builtin_shufflevector(__a, __b, 2, 10, 2+1, 10+1, 6, 14, 6+1, 14+1);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_unpacklo_ps(__m256 __a, __m256 __b)
-{
-  return __builtin_shufflevector(__a, __b, 0, 8, 0+1, 8+1, 4, 12, 4+1, 12+1);
-}
-
-/* Bit Test */
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm_testz_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_vtestzpd((__v2df)__a, (__v2df)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm_testc_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_vtestcpd((__v2df)__a, (__v2df)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm_testnzc_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_vtestnzcpd((__v2df)__a, (__v2df)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm_testz_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_vtestzps((__v4sf)__a, (__v4sf)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm_testc_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_vtestcps((__v4sf)__a, (__v4sf)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm_testnzc_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_vtestnzcps((__v4sf)__a, (__v4sf)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_testz_pd(__m256d __a, __m256d __b)
-{
-  return __builtin_ia32_vtestzpd256((__v4df)__a, (__v4df)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_testc_pd(__m256d __a, __m256d __b)
-{
-  return __builtin_ia32_vtestcpd256((__v4df)__a, (__v4df)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_testnzc_pd(__m256d __a, __m256d __b)
-{
-  return __builtin_ia32_vtestnzcpd256((__v4df)__a, (__v4df)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_testz_ps(__m256 __a, __m256 __b)
-{
-  return __builtin_ia32_vtestzps256((__v8sf)__a, (__v8sf)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_testc_ps(__m256 __a, __m256 __b)
-{
-  return __builtin_ia32_vtestcps256((__v8sf)__a, (__v8sf)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_testnzc_ps(__m256 __a, __m256 __b)
-{
-  return __builtin_ia32_vtestnzcps256((__v8sf)__a, (__v8sf)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_testz_si256(__m256i __a, __m256i __b)
-{
-  return __builtin_ia32_ptestz256((__v4di)__a, (__v4di)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_testc_si256(__m256i __a, __m256i __b)
-{
-  return __builtin_ia32_ptestc256((__v4di)__a, (__v4di)__b);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_testnzc_si256(__m256i __a, __m256i __b)
-{
-  return __builtin_ia32_ptestnzc256((__v4di)__a, (__v4di)__b);
-}
-
-/* Vector extract sign mask */
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_movemask_pd(__m256d __a)
-{
-  return __builtin_ia32_movmskpd256((__v4df)__a);
-}
-
-static __inline int __attribute__((__always_inline__, __nodebug__))
-_mm256_movemask_ps(__m256 __a)
-{
-  return __builtin_ia32_movmskps256((__v8sf)__a);
-}
-
-/* Vector __zero */
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_zeroall(void)
-{
-  __builtin_ia32_vzeroall();
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_zeroupper(void)
-{
-  __builtin_ia32_vzeroupper();
-}
-
-/* Vector load with broadcast */
-static __inline __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_broadcast_ss(float const *__a)
-{
-  return (__m128)__builtin_ia32_vbroadcastss(__a);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcast_sd(double const *__a)
-{
-  return (__m256d)__builtin_ia32_vbroadcastsd256(__a);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcast_ss(float const *__a)
-{
-  return (__m256)__builtin_ia32_vbroadcastss256(__a);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcast_pd(__m128d const *__a)
-{
-  return (__m256d)__builtin_ia32_vbroadcastf128_pd256(__a);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_broadcast_ps(__m128 const *__a)
-{
-  return (__m256)__builtin_ia32_vbroadcastf128_ps256(__a);
-}
-
-/* SIMD load ops */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_load_pd(double const *__p)
-{
-  return *(__m256d *)__p;
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_load_ps(float const *__p)
-{
-  return *(__m256 *)__p;
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_loadu_pd(double const *__p)
-{
-  struct __loadu_pd {
-    __m256d __v;
-  } __attribute__((packed, may_alias));
-  return ((struct __loadu_pd*)__p)->__v;
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_loadu_ps(float const *__p)
-{
-  struct __loadu_ps {
-    __m256 __v;
-  } __attribute__((packed, may_alias));
-  return ((struct __loadu_ps*)__p)->__v;
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_load_si256(__m256i const *__p)
-{
-  return *__p;
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_loadu_si256(__m256i const *__p)
-{
-  struct __loadu_si256 {
-    __m256i __v;
-  } __attribute__((packed, may_alias));
-  return ((struct __loadu_si256*)__p)->__v;
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_lddqu_si256(__m256i const *__p)
-{
-  return (__m256i)__builtin_ia32_lddqu256((char const *)__p);
-}
-
-/* SIMD store ops */
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_store_pd(double *__p, __m256d __a)
-{
-  *(__m256d *)__p = __a;
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_store_ps(float *__p, __m256 __a)
-{
-  *(__m256 *)__p = __a;
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_storeu_pd(double *__p, __m256d __a)
-{
-  __builtin_ia32_storeupd256(__p, (__v4df)__a);
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_storeu_ps(float *__p, __m256 __a)
-{
-  __builtin_ia32_storeups256(__p, (__v8sf)__a);
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_store_si256(__m256i *__p, __m256i __a)
-{
-  *__p = __a;
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_storeu_si256(__m256i *__p, __m256i __a)
-{
-  __builtin_ia32_storedqu256((char *)__p, (__v32qi)__a);
-}
-
-/* Conditional load ops */
-static __inline __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_maskload_pd(double const *__p, __m128d __m)
-{
-  return (__m128d)__builtin_ia32_maskloadpd((const __v2df *)__p, (__v2df)__m);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_maskload_pd(double const *__p, __m256d __m)
-{
-  return (__m256d)__builtin_ia32_maskloadpd256((const __v4df *)__p,
-                                               (__v4df)__m);
-}
-
-static __inline __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_maskload_ps(float const *__p, __m128 __m)
-{
-  return (__m128)__builtin_ia32_maskloadps((const __v4sf *)__p, (__v4sf)__m);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_maskload_ps(float const *__p, __m256 __m)
-{
-  return (__m256)__builtin_ia32_maskloadps256((const __v8sf *)__p, (__v8sf)__m);
-}
-
-/* Conditional store ops */
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_maskstore_ps(float *__p, __m256 __m, __m256 __a)
-{
-  __builtin_ia32_maskstoreps256((__v8sf *)__p, (__v8sf)__m, (__v8sf)__a);
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm_maskstore_pd(double *__p, __m128d __m, __m128d __a)
-{
-  __builtin_ia32_maskstorepd((__v2df *)__p, (__v2df)__m, (__v2df)__a);
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_maskstore_pd(double *__p, __m256d __m, __m256d __a)
-{
-  __builtin_ia32_maskstorepd256((__v4df *)__p, (__v4df)__m, (__v4df)__a);
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm_maskstore_ps(float *__p, __m128 __m, __m128 __a)
-{
-  __builtin_ia32_maskstoreps((__v4sf *)__p, (__v4sf)__m, (__v4sf)__a);
-}
-
-/* Cacheability support ops */
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_stream_si256(__m256i *__a, __m256i __b)
-{
-  __builtin_ia32_movntdq256((__v4di *)__a, (__v4di)__b);
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_stream_pd(double *__a, __m256d __b)
-{
-  __builtin_ia32_movntpd256(__a, (__v4df)__b);
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_stream_ps(float *__p, __m256 __a)
-{
-  __builtin_ia32_movntps256(__p, (__v8sf)__a);
-}
-
-/* Create vectors */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_set_pd(double __a, double __b, double __c, double __d)
-{
-  return (__m256d){ __d, __c, __b, __a };
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_set_ps(float __a, float __b, float __c, float __d,
-	            float __e, float __f, float __g, float __h)
-{
-  return (__m256){ __h, __g, __f, __e, __d, __c, __b, __a };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_set_epi32(int __i0, int __i1, int __i2, int __i3,
-		             int __i4, int __i5, int __i6, int __i7)
-{
-  return (__m256i)(__v8si){ __i7, __i6, __i5, __i4, __i3, __i2, __i1, __i0 };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_set_epi16(short __w15, short __w14, short __w13, short __w12,
-		             short __w11, short __w10, short __w09, short __w08,
-		             short __w07, short __w06, short __w05, short __w04,
-		             short __w03, short __w02, short __w01, short __w00)
-{
-  return (__m256i)(__v16hi){ __w00, __w01, __w02, __w03, __w04, __w05, __w06,
-    __w07, __w08, __w09, __w10, __w11, __w12, __w13, __w14, __w15 };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_set_epi8(char __b31, char __b30, char __b29, char __b28,
-		            char __b27, char __b26, char __b25, char __b24,
-		            char __b23, char __b22, char __b21, char __b20,
-		            char __b19, char __b18, char __b17, char __b16,
-		            char __b15, char __b14, char __b13, char __b12,
-		            char __b11, char __b10, char __b09, char __b08,
-		            char __b07, char __b06, char __b05, char __b04,
-		            char __b03, char __b02, char __b01, char __b00)
-{
-  return (__m256i)(__v32qi){
-    __b00, __b01, __b02, __b03, __b04, __b05, __b06, __b07,
-    __b08, __b09, __b10, __b11, __b12, __b13, __b14, __b15,
-    __b16, __b17, __b18, __b19, __b20, __b21, __b22, __b23,
-    __b24, __b25, __b26, __b27, __b28, __b29, __b30, __b31
-  };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_set_epi64x(long long __a, long long __b, long long __c, long long __d)
-{
-  return (__m256i)(__v4di){ __d, __c, __b, __a };
-}
-
-/* Create vectors with elements in reverse order */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_setr_pd(double __a, double __b, double __c, double __d)
-{
-  return (__m256d){ __a, __b, __c, __d };
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_setr_ps(float __a, float __b, float __c, float __d,
-		           float __e, float __f, float __g, float __h)
-{
-  return (__m256){ __a, __b, __c, __d, __e, __f, __g, __h };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_setr_epi32(int __i0, int __i1, int __i2, int __i3,
-		              int __i4, int __i5, int __i6, int __i7)
-{
-  return (__m256i)(__v8si){ __i0, __i1, __i2, __i3, __i4, __i5, __i6, __i7 };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_setr_epi16(short __w15, short __w14, short __w13, short __w12,
-		   short __w11, short __w10, short __w09, short __w08,
-		   short __w07, short __w06, short __w05, short __w04,
-		   short __w03, short __w02, short __w01, short __w00)
-{
-  return (__m256i)(__v16hi){ __w15, __w14, __w13, __w12, __w11, __w10, __w09,
-    __w08, __w07, __w06, __w05, __w04, __w03, __w02, __w01, __w00 };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_setr_epi8(char __b31, char __b30, char __b29, char __b28,
-		             char __b27, char __b26, char __b25, char __b24,
-		             char __b23, char __b22, char __b21, char __b20,
-		             char __b19, char __b18, char __b17, char __b16,
-		             char __b15, char __b14, char __b13, char __b12,
-		             char __b11, char __b10, char __b09, char __b08,
-		             char __b07, char __b06, char __b05, char __b04,
-		             char __b03, char __b02, char __b01, char __b00)
-{
-  return (__m256i)(__v32qi){
-    __b31, __b30, __b29, __b28, __b27, __b26, __b25, __b24,
-		__b23, __b22, __b21, __b20, __b19, __b18, __b17, __b16,
-		__b15, __b14, __b13, __b12, __b11, __b10, __b09, __b08,
-		__b07, __b06, __b05, __b04, __b03, __b02, __b01, __b00 };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_setr_epi64x(long long __a, long long __b, long long __c, long long __d)
-{
-  return (__m256i)(__v4di){ __a, __b, __c, __d };
-}
-
-/* Create vectors with repeated elements */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_set1_pd(double __w)
-{
-  return (__m256d){ __w, __w, __w, __w };
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_set1_ps(float __w)
-{
-  return (__m256){ __w, __w, __w, __w, __w, __w, __w, __w };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_set1_epi32(int __i)
-{
-  return (__m256i)(__v8si){ __i, __i, __i, __i, __i, __i, __i, __i };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_set1_epi16(short __w)
-{
-  return (__m256i)(__v16hi){ __w, __w, __w, __w, __w, __w, __w, __w, __w, __w,
-    __w, __w, __w, __w, __w, __w };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_set1_epi8(char __b)
-{
-  return (__m256i)(__v32qi){ __b, __b, __b, __b, __b, __b, __b, __b, __b, __b,
-    __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b,
-    __b, __b, __b, __b, __b, __b, __b };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_set1_epi64x(long long __q)
-{
-  return (__m256i)(__v4di){ __q, __q, __q, __q };
-}
-
-/* Create __zeroed vectors */
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_setzero_pd(void)
-{
-  return (__m256d){ 0, 0, 0, 0 };
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_setzero_ps(void)
-{
-  return (__m256){ 0, 0, 0, 0, 0, 0, 0, 0 };
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_setzero_si256(void)
-{
-  return (__m256i){ 0LL, 0LL, 0LL, 0LL };
-}
-
-/* Cast between vector types */
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_castpd_ps(__m256d __a)
-{
-  return (__m256)__a;
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_castpd_si256(__m256d __a)
-{
-  return (__m256i)__a;
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_castps_pd(__m256 __a)
-{
-  return (__m256d)__a;
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_castps_si256(__m256 __a)
-{
-  return (__m256i)__a;
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_castsi256_ps(__m256i __a)
-{
-  return (__m256)__a;
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_castsi256_pd(__m256i __a)
-{
-  return (__m256d)__a;
-}
-
-static __inline __m128d __attribute__((__always_inline__, __nodebug__))
-_mm256_castpd256_pd128(__m256d __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 1);
-}
-
-static __inline __m128 __attribute__((__always_inline__, __nodebug__))
-_mm256_castps256_ps128(__m256 __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 1, 2, 3);
-}
-
-static __inline __m128i __attribute__((__always_inline__, __nodebug__))
-_mm256_castsi256_si128(__m256i __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 1);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_castpd128_pd256(__m128d __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 1, -1, -1);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_castps128_ps256(__m128 __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 1, 2, 3, -1, -1, -1, -1);
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_castsi128_si256(__m128i __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 1, -1, -1);
-}
-
-/* SIMD load ops (unaligned) */
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_loadu2_m128(float const *__addr_hi, float const *__addr_lo)
-{
-  struct __loadu_ps {
-    __m128 __v;
-  } __attribute__((__packed__, __may_alias__));
-
-  __m256 __v256 = _mm256_castps128_ps256(((struct __loadu_ps*)__addr_lo)->__v);
-  return _mm256_insertf128_ps(__v256, ((struct __loadu_ps*)__addr_hi)->__v, 1);
-}
-
-static __inline __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_loadu2_m128d(double const *__addr_hi, double const *__addr_lo)
-{
-  struct __loadu_pd {
-    __m128d __v;
-  } __attribute__((__packed__, __may_alias__));
-  
-  __m256d __v256 = _mm256_castpd128_pd256(((struct __loadu_pd*)__addr_lo)->__v);
-  return _mm256_insertf128_pd(__v256, ((struct __loadu_pd*)__addr_hi)->__v, 1);
-}
-
-static __inline __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_loadu2_m128i(__m128i const *__addr_hi, __m128i const *__addr_lo)
-{
-  struct __loadu_si128 {
-    __m128i __v;
-  } __attribute__((packed, may_alias));
-  __m256i __v256 = _mm256_castsi128_si256(
-    ((struct __loadu_si128*)__addr_lo)->__v);
-  return _mm256_insertf128_si256(__v256,
-                                 ((struct __loadu_si128*)__addr_hi)->__v, 1);
-}
-
-/* SIMD store ops (unaligned) */
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_storeu2_m128(float *__addr_hi, float *__addr_lo, __m256 __a)
-{
-  __m128 __v128;
-
-  __v128 = _mm256_castps256_ps128(__a);
-  __builtin_ia32_storeups(__addr_lo, __v128);
-  __v128 = _mm256_extractf128_ps(__a, 1);
-  __builtin_ia32_storeups(__addr_hi, __v128);
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_storeu2_m128d(double *__addr_hi, double *__addr_lo, __m256d __a)
-{
-  __m128d __v128;
-
-  __v128 = _mm256_castpd256_pd128(__a);
-  __builtin_ia32_storeupd(__addr_lo, __v128);
-  __v128 = _mm256_extractf128_pd(__a, 1);
-  __builtin_ia32_storeupd(__addr_hi, __v128);
-}
-
-static __inline void __attribute__((__always_inline__, __nodebug__))
-_mm256_storeu2_m128i(__m128i *__addr_hi, __m128i *__addr_lo, __m256i __a)
-{
-  __m128i __v128;
-
-  __v128 = _mm256_castsi256_si128(__a);
-  __builtin_ia32_storedqu((char *)__addr_lo, (__v16qi)__v128);
-  __v128 = _mm256_extractf128_si256(__a, 1);
-  __builtin_ia32_storedqu((char *)__addr_hi, (__v16qi)__v128);
-}
-
-#endif /* __AVXINTRIN_H */
diff --git a/include.new/clang/3.4.1/bmi2intrin.h b/include.new/clang/3.4.1/bmi2intrin.h
deleted file mode 100644
index a05cfad..0000000
--- a/include.new/clang/3.4.1/bmi2intrin.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*===---- bmi2intrin.h - BMI2 intrinsics -----------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H
-#error "Never use <bmi2intrin.h> directly; include <x86intrin.h> instead."
-#endif
-
-#ifndef __BMI2__
-# error "BMI2 instruction set not enabled"
-#endif /* __BMI2__ */
-
-#ifndef __BMI2INTRIN_H
-#define __BMI2INTRIN_H
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-_bzhi_u32(unsigned int __X, unsigned int __Y)
-{
-  return __builtin_ia32_bzhi_si(__X, __Y);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-_pdep_u32(unsigned int __X, unsigned int __Y)
-{
-  return __builtin_ia32_pdep_si(__X, __Y);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-_pext_u32(unsigned int __X, unsigned int __Y)
-{
-  return __builtin_ia32_pext_si(__X, __Y);
-}
-
-#ifdef  __x86_64__
-
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-_bzhi_u64(unsigned long long __X, unsigned long long __Y)
-{
-  return __builtin_ia32_bzhi_di(__X, __Y);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-_pdep_u64(unsigned long long __X, unsigned long long __Y)
-{
-  return __builtin_ia32_pdep_di(__X, __Y);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-_pext_u64(unsigned long long __X, unsigned long long __Y)
-{
-  return __builtin_ia32_pext_di(__X, __Y);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-_mulx_u64 (unsigned long long __X, unsigned long long __Y,
-	   unsigned long long *__P)
-{
-  unsigned __int128 __res = (unsigned __int128) __X * __Y;
-  *__P = (unsigned long long) (__res >> 64);
-  return (unsigned long long) __res;
-}
-
-#else /* !__x86_64__ */
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-_mulx_u32 (unsigned int __X, unsigned int __Y, unsigned int *__P)
-{
-  unsigned long long __res = (unsigned long long) __X * __Y;
-  *__P = (unsigned int) (__res >> 32);
-  return (unsigned int) __res;
-}
-
-#endif /* !__x86_64__  */
-
-#endif /* __BMI2INTRIN_H */
diff --git a/include.new/clang/3.4.1/bmiintrin.h b/include.new/clang/3.4.1/bmiintrin.h
deleted file mode 100644
index 8cb00f5..0000000
--- a/include.new/clang/3.4.1/bmiintrin.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*===---- bmiintrin.h - BMI intrinsics -------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H
-#error "Never use <bmiintrin.h> directly; include <x86intrin.h> instead."
-#endif
-
-#ifndef __BMI__
-# error "BMI instruction set not enabled"
-#endif /* __BMI__ */
-
-#ifndef __BMIINTRIN_H
-#define __BMIINTRIN_H
-
-static __inline__ unsigned short __attribute__((__always_inline__, __nodebug__))
-__tzcnt_u16(unsigned short __X)
-{
-  return __builtin_ctzs(__X);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__andn_u32(unsigned int __X, unsigned int __Y)
-{
-  return ~__X & __Y;
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__bextr_u32(unsigned int __X, unsigned int __Y)
-{
-  return __builtin_ia32_bextr_u32(__X, __Y);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blsi_u32(unsigned int __X)
-{
-  return __X & -__X;
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blsmsk_u32(unsigned int __X)
-{
-  return __X ^ (__X - 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blsr_u32(unsigned int __X)
-{
-  return __X & (__X - 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__tzcnt_u32(unsigned int __X)
-{
-  return __builtin_ctz(__X);
-}
-
-#ifdef __x86_64__
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-__andn_u64 (unsigned long long __X, unsigned long long __Y)
-{
-  return ~__X & __Y;
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-__bextr_u64(unsigned long long __X, unsigned long long __Y)
-{
-  return __builtin_ia32_bextr_u64(__X, __Y);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-__blsi_u64(unsigned long long __X)
-{
-  return __X & -__X;
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-__blsmsk_u64(unsigned long long __X)
-{
-  return __X ^ (__X - 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-__blsr_u64(unsigned long long __X)
-{
-  return __X & (__X - 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-__tzcnt_u64(unsigned long long __X)
-{
-  return __builtin_ctzll(__X);
-}
-#endif
-
-#endif /* __BMIINTRIN_H */
diff --git a/include.new/clang/3.4.1/cpuid.h b/include.new/clang/3.4.1/cpuid.h
deleted file mode 100644
index f9254e9..0000000
--- a/include.new/clang/3.4.1/cpuid.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*===---- cpuid.h - X86 cpu model detection --------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#if !(__x86_64__ || __i386__)
-#error this header is for x86 only
-#endif
-
-/* Features in %ecx for level 1 */
-#define bit_SSE3        0x00000001
-#define bit_PCLMULQDQ   0x00000002
-#define bit_DTES64      0x00000004
-#define bit_MONITOR     0x00000008
-#define bit_DSCPL       0x00000010
-#define bit_VMX         0x00000020
-#define bit_SMX         0x00000040
-#define bit_EIST        0x00000080
-#define bit_TM2         0x00000100
-#define bit_SSSE3       0x00000200
-#define bit_CNXTID      0x00000400
-#define bit_FMA         0x00001000
-#define bit_CMPXCHG16B  0x00002000
-#define bit_xTPR        0x00004000
-#define bit_PDCM        0x00008000
-#define bit_PCID        0x00020000
-#define bit_DCA         0x00040000
-#define bit_SSE41       0x00080000
-#define bit_SSE42       0x00100000
-#define bit_x2APIC      0x00200000
-#define bit_MOVBE       0x00400000
-#define bit_POPCNT      0x00800000
-#define bit_TSCDeadline 0x01000000
-#define bit_AESNI       0x02000000
-#define bit_XSAVE       0x04000000
-#define bit_OSXSAVE     0x08000000
-#define bit_AVX         0x10000000
-#define bit_RDRAND      0x40000000
-
-/* Features in %edx for level 1 */
-#define bit_FPU         0x00000001
-#define bit_VME         0x00000002
-#define bit_DE          0x00000004
-#define bit_PSE         0x00000008
-#define bit_TSC         0x00000010
-#define bit_MSR         0x00000020
-#define bit_PAE         0x00000040
-#define bit_MCE         0x00000080
-#define bit_CX8         0x00000100
-#define bit_APIC        0x00000200
-#define bit_SEP         0x00000800
-#define bit_MTRR        0x00001000
-#define bit_PGE         0x00002000
-#define bit_MCA         0x00004000
-#define bit_CMOV        0x00008000
-#define bit_PAT         0x00010000
-#define bit_PSE36       0x00020000
-#define bit_PSN         0x00040000
-#define bit_CLFSH       0x00080000
-#define bit_DS          0x00200000
-#define bit_ACPI        0x00400000
-#define bit_MMX         0x00800000
-#define bit_FXSR        0x01000000
-#define bit_FXSAVE      bit_FXSR    /* for gcc compat */
-#define bit_SSE         0x02000000
-#define bit_SSE2        0x04000000
-#define bit_SS          0x08000000
-#define bit_HTT         0x10000000
-#define bit_TM          0x20000000
-#define bit_PBE         0x80000000
-
-/* Features in %ebx for level 7 sub-leaf 0 */
-#define bit_FSGSBASE    0x00000001
-#define bit_SMEP        0x00000080
-#define bit_ENH_MOVSB   0x00000200
-
-/* PIC on i386 uses %ebx, so preserve it. */
-#if __i386__
-#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \
-    __asm("  pushl  %%ebx\n" \
-          "  cpuid\n" \
-          "  mov    %%ebx,%1\n" \
-          "  popl   %%ebx" \
-        : "=a"(__eax), "=r" (__ebx), "=c"(__ecx), "=d"(__edx) \
-        : "0"(__level))
-
-#define __cpuid_count(__level, __count, __eax, __ebx, __ecx, __edx) \
-    __asm("  pushl  %%ebx\n" \
-          "  cpuid\n" \
-          "  mov    %%ebx,%1\n" \
-          "  popl   %%ebx" \
-        : "=a"(__eax), "=r" (__ebx), "=c"(__ecx), "=d"(__edx) \
-        : "0"(__level), "2"(__count))
-#else
-#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \
-    __asm("cpuid" : "=a"(__eax), "=b" (__ebx), "=c"(__ecx), "=d"(__edx) \
-                  : "0"(__level))
-
-#define __cpuid_count(__level, __count, __eax, __ebx, __ecx, __edx) \
-    __asm("cpuid" : "=a"(__eax), "=b" (__ebx), "=c"(__ecx), "=d"(__edx) \
-                  : "0"(__level), "2"(__count))
-#endif
-
-static __inline int __get_cpuid (unsigned int __level, unsigned int *__eax,
-                                 unsigned int *__ebx, unsigned int *__ecx,
-                                 unsigned int *__edx) {
-    __cpuid(__level, *__eax, *__ebx, *__ecx, *__edx);
-    return 1;
-}
-
-static __inline int __get_cpuid_max (unsigned int __level, unsigned int *__sig)
-{
-    unsigned int __eax, __ebx, __ecx, __edx;
-#if __i386__
-    int __cpuid_supported;
-
-    __asm("  pushfl\n"
-          "  popl   %%eax\n"
-          "  movl   %%eax,%%ecx\n"
-          "  xorl   $0x00200000,%%eax\n"
-          "  pushl  %%eax\n"
-          "  popfl\n"
-          "  pushfl\n"
-          "  popl   %%eax\n"
-          "  movl   $0,%0\n"
-          "  cmpl   %%eax,%%ecx\n"
-          "  je     1f\n"
-          "  movl   $1,%0\n"
-          "1:"
-        : "=r" (__cpuid_supported) : : "eax", "ecx");
-    if (!__cpuid_supported)
-        return 0;
-#endif
-
-    __cpuid(__level, __eax, __ebx, __ecx, __edx);
-    if (__sig)
-        *__sig = __ebx;
-    return __eax;
-}
diff --git a/include.new/clang/3.4.1/emmintrin.h b/include.new/clang/3.4.1/emmintrin.h
deleted file mode 100644
index b3f8569..0000000
--- a/include.new/clang/3.4.1/emmintrin.h
+++ /dev/null
@@ -1,1451 +0,0 @@
-/*===---- emmintrin.h - SSE2 intrinsics ------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __EMMINTRIN_H
-#define __EMMINTRIN_H
-
-#ifndef __SSE2__
-#error "SSE2 instruction set not enabled"
-#else
-
-#include <xmmintrin.h>
-
-typedef double __m128d __attribute__((__vector_size__(16)));
-typedef long long __m128i __attribute__((__vector_size__(16)));
-
-/* Type defines.  */
-typedef double __v2df __attribute__ ((__vector_size__ (16)));
-typedef long long __v2di __attribute__ ((__vector_size__ (16)));
-typedef short __v8hi __attribute__((__vector_size__(16)));
-typedef char __v16qi __attribute__((__vector_size__(16)));
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_add_sd(__m128d __a, __m128d __b)
-{
-  __a[0] += __b[0];
-  return __a;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_add_pd(__m128d __a, __m128d __b)
-{
-  return __a + __b;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_sub_sd(__m128d __a, __m128d __b)
-{
-  __a[0] -= __b[0];
-  return __a;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_sub_pd(__m128d __a, __m128d __b)
-{
-  return __a - __b;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_mul_sd(__m128d __a, __m128d __b)
-{
-  __a[0] *= __b[0];
-  return __a;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_mul_pd(__m128d __a, __m128d __b)
-{
-  return __a * __b;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_div_sd(__m128d __a, __m128d __b)
-{
-  __a[0] /= __b[0];
-  return __a;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_div_pd(__m128d __a, __m128d __b)
-{
-  return __a / __b;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_sqrt_sd(__m128d __a, __m128d __b)
-{
-  __m128d __c = __builtin_ia32_sqrtsd(__b);
-  return (__m128d) { __c[0], __a[1] };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_sqrt_pd(__m128d __a)
-{
-  return __builtin_ia32_sqrtpd(__a);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_min_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_minsd(__a, __b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_min_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_minpd(__a, __b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_max_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_maxsd(__a, __b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_max_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_maxpd(__a, __b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_and_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)((__v4si)__a & (__v4si)__b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_andnot_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)(~(__v4si)__a & (__v4si)__b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_or_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)((__v4si)__a | (__v4si)__b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_xor_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)((__v4si)__a ^ (__v4si)__b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__a, __b, 0);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmplt_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__a, __b, 1);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmple_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__a, __b, 2);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__b, __a, 1);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpge_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__b, __a, 2);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpord_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__a, __b, 7);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpunord_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__a, __b, 3);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpneq_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__a, __b, 4);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnlt_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__a, __b, 5);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnle_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__a, __b, 6);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpngt_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__b, __a, 5);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnge_pd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmppd(__b, __a, 6);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_sd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmpsd(__a, __b, 0);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmplt_sd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmpsd(__a, __b, 1);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmple_sd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmpsd(__a, __b, 2);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_sd(__m128d __a, __m128d __b)
-{
-  __m128d __c = __builtin_ia32_cmpsd(__b, __a, 1);
-  return (__m128d) { __c[0], __a[1] };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpge_sd(__m128d __a, __m128d __b)
-{
-  __m128d __c = __builtin_ia32_cmpsd(__b, __a, 2);
-  return (__m128d) { __c[0], __a[1] };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpord_sd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmpsd(__a, __b, 7);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpunord_sd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmpsd(__a, __b, 3);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpneq_sd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmpsd(__a, __b, 4);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnlt_sd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmpsd(__a, __b, 5);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnle_sd(__m128d __a, __m128d __b)
-{
-  return (__m128d)__builtin_ia32_cmpsd(__a, __b, 6);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpngt_sd(__m128d __a, __m128d __b)
-{
-  __m128d __c = __builtin_ia32_cmpsd(__b, __a, 5);
-  return (__m128d) { __c[0], __a[1] };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnge_sd(__m128d __a, __m128d __b)
-{
-  __m128d __c = __builtin_ia32_cmpsd(__b, __a, 6);
-  return (__m128d) { __c[0], __a[1] };
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comieq_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_comisdeq(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comilt_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_comisdlt(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comile_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_comisdle(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comigt_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_comisdgt(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comige_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_comisdge(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comineq_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_comisdneq(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomieq_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_ucomisdeq(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomilt_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_ucomisdlt(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomile_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_ucomisdle(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomigt_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_ucomisdgt(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomige_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_ucomisdge(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomineq_sd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_ucomisdneq(__a, __b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpd_ps(__m128d __a)
-{
-  return __builtin_ia32_cvtpd2ps(__a);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cvtps_pd(__m128 __a)
-{
-  return __builtin_ia32_cvtps2pd(__a);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepi32_pd(__m128i __a)
-{
-  return __builtin_ia32_cvtdq2pd((__v4si)__a);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpd_epi32(__m128d __a)
-{
-  return __builtin_ia32_cvtpd2dq(__a);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsd_si32(__m128d __a)
-{
-  return __builtin_ia32_cvtsd2si(__a);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsd_ss(__m128 __a, __m128d __b)
-{
-  __a[0] = __b[0];
-  return __a;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi32_sd(__m128d __a, int __b)
-{
-  __a[0] = __b;
-  return __a;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cvtss_sd(__m128d __a, __m128 __b)
-{
-  __a[0] = __b[0];
-  return __a;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvttpd_epi32(__m128d __a)
-{
-  return (__m128i)__builtin_ia32_cvttpd2dq(__a);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_cvttsd_si32(__m128d __a)
-{
-  return __a[0];
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpd_pi32(__m128d __a)
-{
-  return (__m64)__builtin_ia32_cvtpd2pi(__a);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvttpd_pi32(__m128d __a)
-{
-  return (__m64)__builtin_ia32_cvttpd2pi(__a);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpi32_pd(__m64 __a)
-{
-  return __builtin_ia32_cvtpi2pd((__v2si)__a);
-}
-
-static __inline__ double __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsd_f64(__m128d __a)
-{
-  return __a[0];
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_load_pd(double const *__dp)
-{
-  return *(__m128d*)__dp;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_load1_pd(double const *__dp)
-{
-  struct __mm_load1_pd_struct {
-    double __u;
-  } __attribute__((__packed__, __may_alias__));
-  double __u = ((struct __mm_load1_pd_struct*)__dp)->__u;
-  return (__m128d){ __u, __u };
-}
-
-#define        _mm_load_pd1(dp)        _mm_load1_pd(dp)
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_loadr_pd(double const *__dp)
-{
-  __m128d __u = *(__m128d*)__dp;
-  return __builtin_shufflevector(__u, __u, 1, 0);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_loadu_pd(double const *__dp)
-{
-  struct __loadu_pd {
-    __m128d __v;
-  } __attribute__((packed, may_alias));
-  return ((struct __loadu_pd*)__dp)->__v;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_load_sd(double const *__dp)
-{
-  struct __mm_load_sd_struct {
-    double __u;
-  } __attribute__((__packed__, __may_alias__));
-  double __u = ((struct __mm_load_sd_struct*)__dp)->__u;
-  return (__m128d){ __u, 0 };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_loadh_pd(__m128d __a, double const *__dp)
-{
-  struct __mm_loadh_pd_struct {
-    double __u;
-  } __attribute__((__packed__, __may_alias__));
-  double __u = ((struct __mm_loadh_pd_struct*)__dp)->__u;
-  return (__m128d){ __a[0], __u };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_loadl_pd(__m128d __a, double const *__dp)
-{
-  struct __mm_loadl_pd_struct {
-    double __u;
-  } __attribute__((__packed__, __may_alias__));
-  double __u = ((struct __mm_loadl_pd_struct*)__dp)->__u;
-  return (__m128d){ __u, __a[1] };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_set_sd(double __w)
-{
-  return (__m128d){ __w, 0 };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_set1_pd(double __w)
-{
-  return (__m128d){ __w, __w };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_set_pd(double __w, double __x)
-{
-  return (__m128d){ __x, __w };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_setr_pd(double __w, double __x)
-{
-  return (__m128d){ __w, __x };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_setzero_pd(void)
-{
-  return (__m128d){ 0, 0 };
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_move_sd(__m128d __a, __m128d __b)
-{
-  return (__m128d){ __b[0], __a[1] };
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_store_sd(double *__dp, __m128d __a)
-{
-  struct __mm_store_sd_struct {
-    double __u;
-  } __attribute__((__packed__, __may_alias__));
-  ((struct __mm_store_sd_struct*)__dp)->__u = __a[0];
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_store1_pd(double *__dp, __m128d __a)
-{
-  struct __mm_store1_pd_struct {
-    double __u[2];
-  } __attribute__((__packed__, __may_alias__));
-  ((struct __mm_store1_pd_struct*)__dp)->__u[0] = __a[0];
-  ((struct __mm_store1_pd_struct*)__dp)->__u[1] = __a[0];
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_store_pd(double *__dp, __m128d __a)
-{
-  *(__m128d *)__dp = __a;
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_storeu_pd(double *__dp, __m128d __a)
-{
-  __builtin_ia32_storeupd(__dp, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_storer_pd(double *__dp, __m128d __a)
-{
-  __a = __builtin_shufflevector(__a, __a, 1, 0);
-  *(__m128d *)__dp = __a;
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_storeh_pd(double *__dp, __m128d __a)
-{
-  struct __mm_storeh_pd_struct {
-    double __u;
-  } __attribute__((__packed__, __may_alias__));
-  ((struct __mm_storeh_pd_struct*)__dp)->__u = __a[1];
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_storel_pd(double *__dp, __m128d __a)
-{
-  struct __mm_storeh_pd_struct {
-    double __u;
-  } __attribute__((__packed__, __may_alias__));
-  ((struct __mm_storeh_pd_struct*)__dp)->__u = __a[0];
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_add_epi8(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v16qi)__a + (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_add_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v8hi)__a + (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_add_epi32(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v4si)__a + (__v4si)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_add_si64(__m64 __a, __m64 __b)
-{
-  return __a + __b;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_add_epi64(__m128i __a, __m128i __b)
-{
-  return __a + __b;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_adds_epi8(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_paddsb128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_adds_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_paddsw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_adds_epu8(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_paddusb128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_adds_epu16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_paddusw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_avg_epu8(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_pavgb128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_avg_epu16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_pavgw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_madd_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_pmaddwd128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_max_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_pmaxsw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_max_epu8(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_pmaxub128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_min_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_pminsw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_min_epu8(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_pminub128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_mulhi_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_pmulhw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_mulhi_epu16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_pmulhuw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_mullo_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v8hi)__a * (__v8hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_mul_su32(__m64 __a, __m64 __b)
-{
-  return __builtin_ia32_pmuludq((__v2si)__a, (__v2si)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_mul_epu32(__m128i __a, __m128i __b)
-{
-  return __builtin_ia32_pmuludq128((__v4si)__a, (__v4si)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sad_epu8(__m128i __a, __m128i __b)
-{
-  return __builtin_ia32_psadbw128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sub_epi8(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v16qi)__a - (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sub_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v8hi)__a - (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sub_epi32(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v4si)__a - (__v4si)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sub_si64(__m64 __a, __m64 __b)
-{
-  return __a - __b;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sub_epi64(__m128i __a, __m128i __b)
-{
-  return __a - __b;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_subs_epi8(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_psubsb128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_subs_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_psubsw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_subs_epu8(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_psubusb128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_subs_epu16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_psubusw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_and_si128(__m128i __a, __m128i __b)
-{
-  return __a & __b;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_andnot_si128(__m128i __a, __m128i __b)
-{
-  return ~__a & __b;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_or_si128(__m128i __a, __m128i __b)
-{
-  return __a | __b;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_xor_si128(__m128i __a, __m128i __b)
-{
-  return __a ^ __b;
-}
-
-#define _mm_slli_si128(a, count) __extension__ ({ \
-  _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wshadow\""); \
-  __m128i __a = (a); \
-   _Pragma("clang diagnostic pop"); \
-  (__m128i)__builtin_ia32_pslldqi128(__a, (count)*8); })
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_slli_epi16(__m128i __a, int __count)
-{
-  return (__m128i)__builtin_ia32_psllwi128((__v8hi)__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sll_epi16(__m128i __a, __m128i __count)
-{
-  return (__m128i)__builtin_ia32_psllw128((__v8hi)__a, (__v8hi)__count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_slli_epi32(__m128i __a, int __count)
-{
-  return (__m128i)__builtin_ia32_pslldi128((__v4si)__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sll_epi32(__m128i __a, __m128i __count)
-{
-  return (__m128i)__builtin_ia32_pslld128((__v4si)__a, (__v4si)__count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_slli_epi64(__m128i __a, int __count)
-{
-  return __builtin_ia32_psllqi128(__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sll_epi64(__m128i __a, __m128i __count)
-{
-  return __builtin_ia32_psllq128(__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srai_epi16(__m128i __a, int __count)
-{
-  return (__m128i)__builtin_ia32_psrawi128((__v8hi)__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sra_epi16(__m128i __a, __m128i __count)
-{
-  return (__m128i)__builtin_ia32_psraw128((__v8hi)__a, (__v8hi)__count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srai_epi32(__m128i __a, int __count)
-{
-  return (__m128i)__builtin_ia32_psradi128((__v4si)__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sra_epi32(__m128i __a, __m128i __count)
-{
-  return (__m128i)__builtin_ia32_psrad128((__v4si)__a, (__v4si)__count);
-}
-
-
-#define _mm_srli_si128(a, count) __extension__ ({ \
-  _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wshadow\""); \
-  __m128i __a = (a); \
-  _Pragma("clang diagnostic pop"); \
-  (__m128i)__builtin_ia32_psrldqi128(__a, (count)*8); })
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srli_epi16(__m128i __a, int __count)
-{
-  return (__m128i)__builtin_ia32_psrlwi128((__v8hi)__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srl_epi16(__m128i __a, __m128i __count)
-{
-  return (__m128i)__builtin_ia32_psrlw128((__v8hi)__a, (__v8hi)__count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srli_epi32(__m128i __a, int __count)
-{
-  return (__m128i)__builtin_ia32_psrldi128((__v4si)__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srl_epi32(__m128i __a, __m128i __count)
-{
-  return (__m128i)__builtin_ia32_psrld128((__v4si)__a, (__v4si)__count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srli_epi64(__m128i __a, int __count)
-{
-  return __builtin_ia32_psrlqi128(__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_srl_epi64(__m128i __a, __m128i __count)
-{
-  return __builtin_ia32_psrlq128(__a, __count);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_epi8(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v16qi)__a == (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v8hi)__a == (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_epi32(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v4si)__a == (__v4si)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_epi8(__m128i __a, __m128i __b)
-{
-  /* This function always performs a signed comparison, but __v16qi is a char
-     which may be signed or unsigned. */
-  typedef signed char __v16qs __attribute__((__vector_size__(16)));
-  return (__m128i)((__v16qs)__a > (__v16qs)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v8hi)__a > (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_epi32(__m128i __a, __m128i __b)
-{
-  return (__m128i)((__v4si)__a > (__v4si)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmplt_epi8(__m128i __a, __m128i __b)
-{
-  return _mm_cmpgt_epi8(__b, __a);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmplt_epi16(__m128i __a, __m128i __b)
-{
-  return _mm_cmpgt_epi16(__b, __a);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmplt_epi32(__m128i __a, __m128i __b)
-{
-  return _mm_cmpgt_epi32(__b, __a);
-}
-
-#ifdef __x86_64__
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi64_sd(__m128d __a, long long __b)
-{
-  __a[0] = __b;
-  return __a;
-}
-
-static __inline__ long long __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsd_si64(__m128d __a)
-{
-  return __builtin_ia32_cvtsd2si64(__a);
-}
-
-static __inline__ long long __attribute__((__always_inline__, __nodebug__))
-_mm_cvttsd_si64(__m128d __a)
-{
-  return __a[0];
-}
-#endif
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepi32_ps(__m128i __a)
-{
-  return __builtin_ia32_cvtdq2ps((__v4si)__a);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtps_epi32(__m128 __a)
-{
-  return (__m128i)__builtin_ia32_cvtps2dq(__a);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvttps_epi32(__m128 __a)
-{
-  return (__m128i)__builtin_ia32_cvttps2dq(__a);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi32_si128(int __a)
-{
-  return (__m128i)(__v4si){ __a, 0, 0, 0 };
-}
-
-#ifdef __x86_64__
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi64_si128(long long __a)
-{
-  return (__m128i){ __a, 0 };
-}
-#endif
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi128_si32(__m128i __a)
-{
-  __v4si __b = (__v4si)__a;
-  return __b[0];
-}
-
-#ifdef __x86_64__
-static __inline__ long long __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi128_si64(__m128i __a)
-{
-  return __a[0];
-}
-#endif
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_load_si128(__m128i const *__p)
-{
-  return *__p;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_loadu_si128(__m128i const *__p)
-{
-  struct __loadu_si128 {
-    __m128i __v;
-  } __attribute__((packed, may_alias));
-  return ((struct __loadu_si128*)__p)->__v;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_loadl_epi64(__m128i const *__p)
-{
-  struct __mm_loadl_epi64_struct {
-    long long __u;
-  } __attribute__((__packed__, __may_alias__));
-  return (__m128i) { ((struct __mm_loadl_epi64_struct*)__p)->__u, 0};
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set_epi64x(long long q1, long long q0)
-{
-  return (__m128i){ q0, q1 };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set_epi64(__m64 q1, __m64 q0)
-{
-  return (__m128i){ (long long)q0, (long long)q1 };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set_epi32(int i3, int i2, int i1, int i0)
-{
-  return (__m128i)(__v4si){ i0, i1, i2, i3};
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set_epi16(short w7, short w6, short w5, short w4, short w3, short w2, short w1, short w0)
-{
-  return (__m128i)(__v8hi){ w0, w1, w2, w3, w4, w5, w6, w7 };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set_epi8(char b15, char b14, char b13, char b12, char b11, char b10, char b9, char b8, char b7, char b6, char b5, char b4, char b3, char b2, char b1, char b0)
-{
-  return (__m128i)(__v16qi){ b0, b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15 };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set1_epi64x(long long __q)
-{
-  return (__m128i){ __q, __q };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set1_epi64(__m64 __q)
-{
-  return (__m128i){ (long long)__q, (long long)__q };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set1_epi32(int __i)
-{
-  return (__m128i)(__v4si){ __i, __i, __i, __i };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set1_epi16(short __w)
-{
-  return (__m128i)(__v8hi){ __w, __w, __w, __w, __w, __w, __w, __w };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_set1_epi8(char __b)
-{
-  return (__m128i)(__v16qi){ __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b, __b };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_setr_epi64(__m64 q0, __m64 q1)
-{
-  return (__m128i){ (long long)q0, (long long)q1 };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_setr_epi32(int i0, int i1, int i2, int i3)
-{
-  return (__m128i)(__v4si){ i0, i1, i2, i3};
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_setr_epi16(short w0, short w1, short w2, short w3, short w4, short w5, short w6, short w7)
-{
-  return (__m128i)(__v8hi){ w0, w1, w2, w3, w4, w5, w6, w7 };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_setr_epi8(char b0, char b1, char b2, char b3, char b4, char b5, char b6, char b7, char b8, char b9, char b10, char b11, char b12, char b13, char b14, char b15)
-{
-  return (__m128i)(__v16qi){ b0, b1, b2, b3, b4, b5, b6, b7, b8, b9, b10, b11, b12, b13, b14, b15 };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_setzero_si128(void)
-{
-  return (__m128i){ 0LL, 0LL };
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_store_si128(__m128i *__p, __m128i __b)
-{
-  *__p = __b;
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_storeu_si128(__m128i *__p, __m128i __b)
-{
-  __builtin_ia32_storedqu((char *)__p, (__v16qi)__b);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_maskmoveu_si128(__m128i __d, __m128i __n, char *__p)
-{
-  __builtin_ia32_maskmovdqu((__v16qi)__d, (__v16qi)__n, __p);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_storel_epi64(__m128i *__p, __m128i __a)
-{
-  struct __mm_storel_epi64_struct {
-    long long __u;
-  } __attribute__((__packed__, __may_alias__));
-  ((struct __mm_storel_epi64_struct*)__p)->__u = __a[0];
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_stream_pd(double *__p, __m128d __a)
-{
-  __builtin_ia32_movntpd(__p, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_stream_si128(__m128i *__p, __m128i __a)
-{
-  __builtin_ia32_movntdq(__p, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_stream_si32(int *__p, int __a)
-{
-  __builtin_ia32_movnti(__p, __a);
-}
-
-#ifdef __x86_64__
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_stream_si64(long long *__p, long long __a)
-{
-  __builtin_ia32_movnti64(__p, __a);
-}
-#endif
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_clflush(void const *__p)
-{
-  __builtin_ia32_clflush(__p);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_lfence(void)
-{
-  __builtin_ia32_lfence();
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_mfence(void)
-{
-  __builtin_ia32_mfence();
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_packs_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_packsswb128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_packs_epi32(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_packssdw128((__v4si)__a, (__v4si)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_packus_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_ia32_packuswb128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_extract_epi16(__m128i __a, int __imm)
-{
-  __v8hi __b = (__v8hi)__a;
-  return (unsigned short)__b[__imm & 7];
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_insert_epi16(__m128i __a, int __b, int __imm)
-{
-  __v8hi __c = (__v8hi)__a;
-  __c[__imm & 7] = __b;
-  return (__m128i)__c;
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_movemask_epi8(__m128i __a)
-{
-  return __builtin_ia32_pmovmskb128((__v16qi)__a);
-}
-
-#define _mm_shuffle_epi32(a, imm) __extension__ ({ \
-  _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wshadow\""); \
-  __m128i __a = (a); \
-  _Pragma("clang diagnostic pop"); \
-  (__m128i)__builtin_shufflevector((__v4si)__a, (__v4si) _mm_set1_epi32(0), \
-                                   (imm) & 0x3, ((imm) & 0xc) >> 2, \
-                                   ((imm) & 0x30) >> 4, ((imm) & 0xc0) >> 6); })
-
-#define _mm_shufflelo_epi16(a, imm) __extension__ ({ \
-  _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wshadow\""); \
-  __m128i __a = (a); \
-  _Pragma("clang diagnostic pop"); \
-  (__m128i)__builtin_shufflevector((__v8hi)__a, (__v8hi) _mm_set1_epi16(0), \
-                                   (imm) & 0x3, ((imm) & 0xc) >> 2, \
-                                   ((imm) & 0x30) >> 4, ((imm) & 0xc0) >> 6, \
-                                   4, 5, 6, 7); })
-
-#define _mm_shufflehi_epi16(a, imm) __extension__ ({ \
-  _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wshadow\""); \
-  __m128i __a = (a); \
-  _Pragma("clang diagnostic pop"); \
-  (__m128i)__builtin_shufflevector((__v8hi)__a, (__v8hi) _mm_set1_epi16(0), \
-                                   0, 1, 2, 3, \
-                                   4 + (((imm) & 0x03) >> 0), \
-                                   4 + (((imm) & 0x0c) >> 2), \
-                                   4 + (((imm) & 0x30) >> 4), \
-                                   4 + (((imm) & 0xc0) >> 6)); })
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_unpackhi_epi8(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_shufflevector((__v16qi)__a, (__v16qi)__b, 8, 16+8, 9, 16+9, 10, 16+10, 11, 16+11, 12, 16+12, 13, 16+13, 14, 16+14, 15, 16+15);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_unpackhi_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_shufflevector((__v8hi)__a, (__v8hi)__b, 4, 8+4, 5, 8+5, 6, 8+6, 7, 8+7);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_unpackhi_epi32(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_shufflevector((__v4si)__a, (__v4si)__b, 2, 4+2, 3, 4+3);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_unpackhi_epi64(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_shufflevector(__a, __b, 1, 2+1);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_unpacklo_epi8(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_shufflevector((__v16qi)__a, (__v16qi)__b, 0, 16+0, 1, 16+1, 2, 16+2, 3, 16+3, 4, 16+4, 5, 16+5, 6, 16+6, 7, 16+7);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_unpacklo_epi16(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_shufflevector((__v8hi)__a, (__v8hi)__b, 0, 8+0, 1, 8+1, 2, 8+2, 3, 8+3);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_unpacklo_epi32(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_shufflevector((__v4si)__a, (__v4si)__b, 0, 4+0, 1, 4+1);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_unpacklo_epi64(__m128i __a, __m128i __b)
-{
-  return (__m128i)__builtin_shufflevector(__a, __b, 0, 2+0);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_movepi64_pi64(__m128i __a)
-{
-  return (__m64)__a[0];
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_movpi64_epi64(__m64 __a)
-{
-  return (__m128i){ (long long)__a, 0 };
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_move_epi64(__m128i __a)
-{
-  return __builtin_shufflevector(__a, (__m128i){ 0 }, 0, 2);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_unpackhi_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_shufflevector(__a, __b, 1, 2+1);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_unpacklo_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_shufflevector(__a, __b, 0, 2+0);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_movemask_pd(__m128d __a)
-{
-  return __builtin_ia32_movmskpd(__a);
-}
-
-#define _mm_shuffle_pd(a, b, i) __extension__ ({ \
-  _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wshadow\""); \
-  __m128d __a = (a); \
-  __m128d __b = (b); \
-  _Pragma("clang diagnostic pop"); \
-  __builtin_shufflevector(__a, __b, (i) & 1, (((i) & 2) >> 1) + 2); })
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_castpd_ps(__m128d __a)
-{
-  return (__m128)__a;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_castpd_si128(__m128d __a)
-{
-  return (__m128i)__a;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_castps_pd(__m128 __a)
-{
-  return (__m128d)__a;
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_castps_si128(__m128 __a)
-{
-  return (__m128i)__a;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_castsi128_ps(__m128i __a)
-{
-  return (__m128)__a;
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_castsi128_pd(__m128i __a)
-{
-  return (__m128d)__a;
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_pause(void)
-{
-  __asm__ volatile ("pause");
-}
-
-#define _MM_SHUFFLE2(x, y) (((x) << 1) | (y))
-
-#endif /* __SSE2__ */
-
-#endif /* __EMMINTRIN_H */
diff --git a/include.new/clang/3.4.1/f16cintrin.h b/include.new/clang/3.4.1/f16cintrin.h
deleted file mode 100644
index f3614c0..0000000
--- a/include.new/clang/3.4.1/f16cintrin.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*===---- f16cintrin.h - F16C intrinsics -----------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H
-#error "Never use <f16cintrin.h> directly; include <x86intrin.h> instead."
-#endif
-
-#ifndef __F16C__
-# error "F16C instruction is not enabled"
-#endif /* __F16C__ */
-
-#ifndef __F16CINTRIN_H
-#define __F16CINTRIN_H
-
-typedef float __v8sf __attribute__ ((__vector_size__ (32)));
-typedef float __m256 __attribute__ ((__vector_size__ (32)));
-
-#define _mm_cvtps_ph(a, imm) __extension__ ({ \
-  __m128 __a = (a); \
- (__m128i)__builtin_ia32_vcvtps2ph((__v4sf)__a, (imm)); })
-
-#define _mm256_cvtps_ph(a, imm) __extension__ ({ \
-  __m256 __a = (a); \
- (__m128i)__builtin_ia32_vcvtps2ph256((__v8sf)__a, (imm)); })
-
-static __inline __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtph_ps(__m128i __a)
-{
-  return (__m128)__builtin_ia32_vcvtph2ps((__v8hi)__a);
-}
-
-static __inline __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_cvtph_ps(__m128i __a)
-{
-  return (__m256)__builtin_ia32_vcvtph2ps256((__v8hi)__a);
-}
-
-#endif /* __F16CINTRIN_H */
diff --git a/include.new/clang/3.4.1/fma4intrin.h b/include.new/clang/3.4.1/fma4intrin.h
deleted file mode 100644
index c30920d..0000000
--- a/include.new/clang/3.4.1/fma4intrin.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*===---- fma4intrin.h - FMA4 intrinsics -----------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __X86INTRIN_H
-#error "Never use <fma4intrin.h> directly; include <x86intrin.h> instead."
-#endif
-
-#ifndef __FMA4INTRIN_H
-#define __FMA4INTRIN_H
-
-#ifndef __FMA4__
-# error "FMA4 instruction set is not enabled"
-#else
-
-#include <pmmintrin.h>
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_macc_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmaddps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_macc_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmaddpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_macc_ss(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmaddss(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_macc_sd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmaddsd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_msub_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmsubps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_msub_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmsubpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_msub_ss(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmsubss(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_msub_sd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmsubsd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_nmacc_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfnmaddps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_nmacc_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfnmaddpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_nmacc_ss(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfnmaddss(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_nmacc_sd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfnmaddsd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_nmsub_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfnmsubps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_nmsub_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfnmsubpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_nmsub_ss(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfnmsubss(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_nmsub_sd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfnmsubsd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_maddsub_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmaddsubps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_maddsub_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmaddsubpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_msubadd_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmsubaddps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_msubadd_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmsubaddpd(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_macc_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfmaddps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_macc_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfmaddpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_msub_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfmsubps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_msub_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfmsubpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_nmacc_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfnmaddps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_nmacc_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfnmaddpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_nmsub_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfnmsubps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_nmsub_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfnmsubpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_maddsub_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfmaddsubps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_maddsub_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfmaddsubpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_msubadd_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfmsubaddps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_msubadd_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfmsubaddpd256(__A, __B, __C);
-}
-
-#endif /* __FMA4__ */
-
-#endif /* __FMA4INTRIN_H */
diff --git a/include.new/clang/3.4.1/fmaintrin.h b/include.new/clang/3.4.1/fmaintrin.h
deleted file mode 100644
index 6bfd5a8..0000000
--- a/include.new/clang/3.4.1/fmaintrin.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/*===---- fma4intrin.h - FMA4 intrinsics -----------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __IMMINTRIN_H
-#error "Never use <fmaintrin.h> directly; include <immintrin.h> instead."
-#endif
-
-#ifndef __FMAINTRIN_H
-#define __FMAINTRIN_H
-
-#ifndef __FMA__
-# error "FMA instruction set is not enabled"
-#else
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fmadd_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmaddps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fmadd_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmaddpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fmadd_ss(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmaddss(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fmadd_sd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmaddsd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fmsub_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmsubps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fmsub_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmsubpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fmsub_ss(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmsubss(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fmsub_sd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmsubsd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fnmadd_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfnmaddps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fnmadd_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfnmaddpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fnmadd_ss(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfnmaddss(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fnmadd_sd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfnmaddsd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fnmsub_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfnmsubps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fnmsub_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfnmsubpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fnmsub_ss(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfnmsubss(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fnmsub_sd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfnmsubsd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fmaddsub_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmaddsubps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fmaddsub_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmaddsubpd(__A, __B, __C);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_fmsubadd_ps(__m128 __A, __m128 __B, __m128 __C)
-{
-  return (__m128)__builtin_ia32_vfmsubaddps(__A, __B, __C);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_fmsubadd_pd(__m128d __A, __m128d __B, __m128d __C)
-{
-  return (__m128d)__builtin_ia32_vfmsubaddpd(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_fmadd_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfmaddps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_fmadd_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfmaddpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_fmsub_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfmsubps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_fmsub_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfmsubpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_fnmadd_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfnmaddps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_fnmadd_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfnmaddpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_fnmsub_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfnmsubps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_fnmsub_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfnmsubpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_fmaddsub_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfmaddsubps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_fmaddsub_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfmaddsubpd256(__A, __B, __C);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_fmsubadd_ps(__m256 __A, __m256 __B, __m256 __C)
-{
-  return (__m256)__builtin_ia32_vfmsubaddps256(__A, __B, __C);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_fmsubadd_pd(__m256d __A, __m256d __B, __m256d __C)
-{
-  return (__m256d)__builtin_ia32_vfmsubaddpd256(__A, __B, __C);
-}
-
-#endif /* __FMA__ */
-
-#endif /* __FMAINTRIN_H */
diff --git a/include.new/clang/3.4.1/immintrin.h b/include.new/clang/3.4.1/immintrin.h
deleted file mode 100644
index 15d6e05..0000000
--- a/include.new/clang/3.4.1/immintrin.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*===---- immintrin.h - Intel intrinsics -----------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __IMMINTRIN_H
-#define __IMMINTRIN_H
-
-#ifdef __MMX__
-#include <mmintrin.h>
-#endif
-
-#ifdef __SSE__
-#include <xmmintrin.h>
-#endif
-
-#ifdef __SSE2__
-#include <emmintrin.h>
-#endif
-
-#ifdef __SSE3__
-#include <pmmintrin.h>
-#endif
-
-#ifdef __SSSE3__
-#include <tmmintrin.h>
-#endif
-
-#if defined (__SSE4_2__) || defined (__SSE4_1__)
-#include <smmintrin.h>
-#endif
-
-#if defined (__AES__)
-#include <wmmintrin.h>
-#endif
-
-#ifdef __AVX__
-#include <avxintrin.h>
-#endif
-
-#ifdef __AVX2__
-#include <avx2intrin.h>
-#endif
-
-#ifdef __BMI__
-#include <bmiintrin.h>
-#endif
-
-#ifdef __BMI2__
-#include <bmi2intrin.h>
-#endif
-
-#ifdef __LZCNT__
-#include <lzcntintrin.h>
-#endif
-
-#ifdef __FMA__
-#include <fmaintrin.h>
-#endif
-
-#ifdef __RDRND__
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_rdrand16_step(unsigned short *__p)
-{
-  return __builtin_ia32_rdrand16_step(__p);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_rdrand32_step(unsigned int *__p)
-{
-  return __builtin_ia32_rdrand32_step(__p);
-}
-
-#ifdef __x86_64__
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_rdrand64_step(unsigned long long *__p)
-{
-  return __builtin_ia32_rdrand64_step(__p);
-}
-#endif
-#endif /* __RDRND__ */
-
-#ifdef __RTM__
-#include <rtmintrin.h>
-#endif
-
-/* FIXME: check __HLE__ as well when HLE is supported. */
-#if defined (__RTM__)
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_xtest(void)
-{
-  return __builtin_ia32_xtest();
-}
-#endif
-
-#ifdef __SHA__
-#include <shaintrin.h>
-#endif
-
-#endif /* __IMMINTRIN_H */
diff --git a/include.new/clang/3.4.1/lzcntintrin.h b/include.new/clang/3.4.1/lzcntintrin.h
deleted file mode 100644
index 62ab5ca..0000000
--- a/include.new/clang/3.4.1/lzcntintrin.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*===---- lzcntintrin.h - LZCNT intrinsics ---------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#if !defined __X86INTRIN_H && !defined __IMMINTRIN_H
-#error "Never use <lzcntintrin.h> directly; include <x86intrin.h> instead."
-#endif
-
-#ifndef __LZCNT__
-# error "LZCNT instruction is not enabled"
-#endif /* __LZCNT__ */
-
-#ifndef __LZCNTINTRIN_H
-#define __LZCNTINTRIN_H
-
-static __inline__ unsigned short __attribute__((__always_inline__, __nodebug__))
-__lzcnt16(unsigned short __X)
-{
-  return __builtin_clzs(__X);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__lzcnt32(unsigned int __X)
-{
-  return __builtin_clz(__X);
-}
-
-#ifdef __x86_64__
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-__lzcnt64(unsigned long long __X)
-{
-  return __builtin_clzll(__X);
-}
-#endif
-
-#endif /* __LZCNTINTRIN_H */
diff --git a/include.new/clang/3.4.1/mm3dnow.h b/include.new/clang/3.4.1/mm3dnow.h
deleted file mode 100644
index 5242d99..0000000
--- a/include.new/clang/3.4.1/mm3dnow.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*===---- mm3dnow.h - 3DNow! intrinsics ------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef _MM3DNOW_H_INCLUDED
-#define _MM3DNOW_H_INCLUDED
-
-#include <mmintrin.h>
-#include <prfchwintrin.h>
-
-typedef float __v2sf __attribute__((__vector_size__(8)));
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_m_femms() {
-  __builtin_ia32_femms();
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pavgusb(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pavgusb((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pf2id(__m64 __m) {
-  return (__m64)__builtin_ia32_pf2id((__v2sf)__m);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfacc(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfacc((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfadd(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfadd((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfcmpeq(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfcmpeq((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfcmpge(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfcmpge((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfcmpgt(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfcmpgt((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfmax(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfmax((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfmin(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfmin((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfmul(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfmul((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfrcp(__m64 __m) {
-  return (__m64)__builtin_ia32_pfrcp((__v2sf)__m);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfrcpit1(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfrcpit1((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfrcpit2(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfrcpit2((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfrsqrt(__m64 __m) {
-  return (__m64)__builtin_ia32_pfrsqrt((__v2sf)__m);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfrsqrtit1(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfrsqit1((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfsub(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfsub((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfsubr(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfsubr((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pi2fd(__m64 __m) {
-  return (__m64)__builtin_ia32_pi2fd((__v2si)__m);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pmulhrw(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pmulhrw((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pf2iw(__m64 __m) {
-  return (__m64)__builtin_ia32_pf2iw((__v2sf)__m);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfnacc(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfnacc((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pfpnacc(__m64 __m1, __m64 __m2) {
-  return (__m64)__builtin_ia32_pfpnacc((__v2sf)__m1, (__v2sf)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pi2fw(__m64 __m) {
-  return (__m64)__builtin_ia32_pi2fw((__v2si)__m);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pswapdsf(__m64 __m) {
-  return (__m64)__builtin_ia32_pswapdsf((__v2sf)__m);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_m_pswapdsi(__m64 __m) {
-  return (__m64)__builtin_ia32_pswapdsi((__v2si)__m);
-}
-
-#endif
diff --git a/include.new/clang/3.4.1/mm_malloc.h b/include.new/clang/3.4.1/mm_malloc.h
deleted file mode 100644
index 305afd3..0000000
--- a/include.new/clang/3.4.1/mm_malloc.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*===---- mm_malloc.h - Allocating and Freeing Aligned Memory Blocks -------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __MM_MALLOC_H
-#define __MM_MALLOC_H
-
-#include <stdlib.h>
-
-#ifdef _WIN32
-#include <malloc.h>
-#else
-#ifndef __cplusplus
-extern int posix_memalign(void **__memptr, size_t __alignment, size_t __size);
-#else
-// Some systems (e.g. those with GNU libc) declare posix_memalign with an
-// exception specifier. Via an "egregious workaround" in
-// Sema::CheckEquivalentExceptionSpec, Clang accepts the following as a valid
-// redeclaration of glibc's declaration.
-extern "C" int posix_memalign(void **__memptr, size_t __alignment, size_t __size);
-#endif
-#endif
-
-#if !(defined(_WIN32) && defined(_mm_malloc))
-static __inline__ void *__attribute__((__always_inline__, __nodebug__,
-                                       __malloc__))
-_mm_malloc(size_t __size, size_t __align)
-{
-  if (__align == 1) {
-    return malloc(__size);
-  }
-
-  if (!(__align & (__align - 1)) && __align < sizeof(void *))
-    __align = sizeof(void *);
-
-  void *__mallocedMemory;
-#if defined(__MINGW32__)
-  __mallocedMemory = __mingw_aligned_malloc(__size, __align);
-#elif defined(_WIN32)
-  __mallocedMemory = _aligned_malloc(__size, __align);
-#else
-  if (posix_memalign(&__mallocedMemory, __align, __size))
-    return 0;
-#endif
-
-  return __mallocedMemory;
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_free(void *__p)
-{
-  free(__p);
-}
-#endif
-
-#endif /* __MM_MALLOC_H */
diff --git a/include.new/clang/3.4.1/mmintrin.h b/include.new/clang/3.4.1/mmintrin.h
deleted file mode 100644
index 986870a..0000000
--- a/include.new/clang/3.4.1/mmintrin.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/*===---- mmintrin.h - MMX intrinsics --------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __MMINTRIN_H
-#define __MMINTRIN_H
-
-#ifndef __MMX__
-#error "MMX instruction set not enabled"
-#else
-
-typedef long long __m64 __attribute__((__vector_size__(8)));
-
-typedef int __v2si __attribute__((__vector_size__(8)));
-typedef short __v4hi __attribute__((__vector_size__(8)));
-typedef char __v8qi __attribute__((__vector_size__(8)));
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_empty(void)
-{
-    __builtin_ia32_emms();
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi32_si64(int __i)
-{
-    return (__m64)__builtin_ia32_vec_init_v2si(__i, 0);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi64_si32(__m64 __m)
-{
-    return __builtin_ia32_vec_ext_v2si((__v2si)__m, 0);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi64_m64(long long __i)
-{
-    return (__m64)__i;
-}
-
-static __inline__ long long __attribute__((__always_inline__, __nodebug__))
-_mm_cvtm64_si64(__m64 __m)
-{
-    return (long long)__m;
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_packs_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_packsswb((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_packs_pi32(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_packssdw((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_packs_pu16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_packuswb((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_unpackhi_pi8(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_punpckhbw((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_unpackhi_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_punpckhwd((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_unpackhi_pi32(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_punpckhdq((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_unpacklo_pi8(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_punpcklbw((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_unpacklo_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_punpcklwd((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_unpacklo_pi32(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_punpckldq((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_add_pi8(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_paddb((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_add_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_paddw((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_add_pi32(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_paddd((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_adds_pi8(__m64 __m1, __m64 __m2) 
-{
-    return (__m64)__builtin_ia32_paddsb((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_adds_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_paddsw((__v4hi)__m1, (__v4hi)__m2);    
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_adds_pu8(__m64 __m1, __m64 __m2) 
-{
-    return (__m64)__builtin_ia32_paddusb((__v8qi)__m1, (__v8qi)__m2);
-}
- 
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_adds_pu16(__m64 __m1, __m64 __m2) 
-{
-    return (__m64)__builtin_ia32_paddusw((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sub_pi8(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_psubb((__v8qi)__m1, (__v8qi)__m2);
-}
- 
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sub_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_psubw((__v4hi)__m1, (__v4hi)__m2);
-}
- 
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sub_pi32(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_psubd((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_subs_pi8(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_psubsb((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_subs_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_psubsw((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_subs_pu8(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_psubusb((__v8qi)__m1, (__v8qi)__m2);
-}
- 
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_subs_pu16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_psubusw((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_madd_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_pmaddwd((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_mulhi_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_pmulhw((__v4hi)__m1, (__v4hi)__m2);
-}
- 
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_mullo_pi16(__m64 __m1, __m64 __m2) 
-{
-    return (__m64)__builtin_ia32_pmullw((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sll_pi16(__m64 __m, __m64 __count)
-{
-    return (__m64)__builtin_ia32_psllw((__v4hi)__m, __count);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_slli_pi16(__m64 __m, int __count)
-{
-    return (__m64)__builtin_ia32_psllwi((__v4hi)__m, __count);    
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sll_pi32(__m64 __m, __m64 __count)
-{
-    return (__m64)__builtin_ia32_pslld((__v2si)__m, __count);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_slli_pi32(__m64 __m, int __count)
-{
-    return (__m64)__builtin_ia32_pslldi((__v2si)__m, __count);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sll_si64(__m64 __m, __m64 __count)
-{
-    return (__m64)__builtin_ia32_psllq(__m, __count);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_slli_si64(__m64 __m, int __count)
-{
-    return (__m64)__builtin_ia32_psllqi(__m, __count);    
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sra_pi16(__m64 __m, __m64 __count)
-{
-    return (__m64)__builtin_ia32_psraw((__v4hi)__m, __count);    
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_srai_pi16(__m64 __m, int __count)
-{
-    return (__m64)__builtin_ia32_psrawi((__v4hi)__m, __count);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sra_pi32(__m64 __m, __m64 __count)
-{
-    return (__m64)__builtin_ia32_psrad((__v2si)__m, __count);    
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_srai_pi32(__m64 __m, int __count)
-{
-    return (__m64)__builtin_ia32_psradi((__v2si)__m, __count);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_srl_pi16(__m64 __m, __m64 __count)
-{
-    return (__m64)__builtin_ia32_psrlw((__v4hi)__m, __count);    
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_srli_pi16(__m64 __m, int __count)
-{
-    return (__m64)__builtin_ia32_psrlwi((__v4hi)__m, __count);    
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_srl_pi32(__m64 __m, __m64 __count)
-{
-    return (__m64)__builtin_ia32_psrld((__v2si)__m, __count);       
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_srli_pi32(__m64 __m, int __count)
-{
-    return (__m64)__builtin_ia32_psrldi((__v2si)__m, __count);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_srl_si64(__m64 __m, __m64 __count)
-{
-    return (__m64)__builtin_ia32_psrlq(__m, __count);    
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_srli_si64(__m64 __m, int __count)
-{
-    return (__m64)__builtin_ia32_psrlqi(__m, __count);    
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_and_si64(__m64 __m1, __m64 __m2)
-{
-    return __builtin_ia32_pand(__m1, __m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_andnot_si64(__m64 __m1, __m64 __m2)
-{
-    return __builtin_ia32_pandn(__m1, __m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_or_si64(__m64 __m1, __m64 __m2)
-{
-    return __builtin_ia32_por(__m1, __m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_xor_si64(__m64 __m1, __m64 __m2)
-{
-    return __builtin_ia32_pxor(__m1, __m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_pi8(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_pcmpeqb((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_pcmpeqw((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_pi32(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_pcmpeqd((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_pi8(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_pcmpgtb((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_pi16(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_pcmpgtw((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_pi32(__m64 __m1, __m64 __m2)
-{
-    return (__m64)__builtin_ia32_pcmpgtd((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_setzero_si64(void)
-{
-    return (__m64){ 0LL };
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_set_pi32(int __i1, int __i0)
-{
-    return (__m64)__builtin_ia32_vec_init_v2si(__i0, __i1);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_set_pi16(short __s3, short __s2, short __s1, short __s0)
-{
-    return (__m64)__builtin_ia32_vec_init_v4hi(__s0, __s1, __s2, __s3);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_set_pi8(char __b7, char __b6, char __b5, char __b4, char __b3, char __b2,
-            char __b1, char __b0)
-{
-    return (__m64)__builtin_ia32_vec_init_v8qi(__b0, __b1, __b2, __b3,
-                                               __b4, __b5, __b6, __b7);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_set1_pi32(int __i)
-{
-    return _mm_set_pi32(__i, __i);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_set1_pi16(short __w)
-{
-    return _mm_set_pi16(__w, __w, __w, __w);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_set1_pi8(char __b)
-{
-    return _mm_set_pi8(__b, __b, __b, __b, __b, __b, __b, __b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_setr_pi32(int __i0, int __i1)
-{
-    return _mm_set_pi32(__i1, __i0);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_setr_pi16(short __w0, short __w1, short __w2, short __w3)
-{
-    return _mm_set_pi16(__w3, __w2, __w1, __w0);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_setr_pi8(char __b0, char __b1, char __b2, char __b3, char __b4, char __b5,
-             char __b6, char __b7)
-{
-    return _mm_set_pi8(__b7, __b6, __b5, __b4, __b3, __b2, __b1, __b0);
-}
-
-
-/* Aliases for compatibility. */
-#define _m_empty _mm_empty
-#define _m_from_int _mm_cvtsi32_si64
-#define _m_to_int _mm_cvtsi64_si32
-#define _m_packsswb _mm_packs_pi16
-#define _m_packssdw _mm_packs_pi32
-#define _m_packuswb _mm_packs_pu16
-#define _m_punpckhbw _mm_unpackhi_pi8
-#define _m_punpckhwd _mm_unpackhi_pi16
-#define _m_punpckhdq _mm_unpackhi_pi32
-#define _m_punpcklbw _mm_unpacklo_pi8
-#define _m_punpcklwd _mm_unpacklo_pi16
-#define _m_punpckldq _mm_unpacklo_pi32
-#define _m_paddb _mm_add_pi8
-#define _m_paddw _mm_add_pi16
-#define _m_paddd _mm_add_pi32
-#define _m_paddsb _mm_adds_pi8
-#define _m_paddsw _mm_adds_pi16
-#define _m_paddusb _mm_adds_pu8
-#define _m_paddusw _mm_adds_pu16
-#define _m_psubb _mm_sub_pi8
-#define _m_psubw _mm_sub_pi16
-#define _m_psubd _mm_sub_pi32
-#define _m_psubsb _mm_subs_pi8
-#define _m_psubsw _mm_subs_pi16
-#define _m_psubusb _mm_subs_pu8
-#define _m_psubusw _mm_subs_pu16
-#define _m_pmaddwd _mm_madd_pi16
-#define _m_pmulhw _mm_mulhi_pi16
-#define _m_pmullw _mm_mullo_pi16
-#define _m_psllw _mm_sll_pi16
-#define _m_psllwi _mm_slli_pi16
-#define _m_pslld _mm_sll_pi32
-#define _m_pslldi _mm_slli_pi32
-#define _m_psllq _mm_sll_si64
-#define _m_psllqi _mm_slli_si64
-#define _m_psraw _mm_sra_pi16
-#define _m_psrawi _mm_srai_pi16
-#define _m_psrad _mm_sra_pi32
-#define _m_psradi _mm_srai_pi32
-#define _m_psrlw _mm_srl_pi16
-#define _m_psrlwi _mm_srli_pi16
-#define _m_psrld _mm_srl_pi32
-#define _m_psrldi _mm_srli_pi32
-#define _m_psrlq _mm_srl_si64
-#define _m_psrlqi _mm_srli_si64
-#define _m_pand _mm_and_si64
-#define _m_pandn _mm_andnot_si64
-#define _m_por _mm_or_si64
-#define _m_pxor _mm_xor_si64
-#define _m_pcmpeqb _mm_cmpeq_pi8
-#define _m_pcmpeqw _mm_cmpeq_pi16
-#define _m_pcmpeqd _mm_cmpeq_pi32
-#define _m_pcmpgtb _mm_cmpgt_pi8
-#define _m_pcmpgtw _mm_cmpgt_pi16
-#define _m_pcmpgtd _mm_cmpgt_pi32
-
-#endif /* __MMX__ */
-
-#endif /* __MMINTRIN_H */
-
diff --git a/include.new/clang/3.4.1/module.map b/include.new/clang/3.4.1/module.map
deleted file mode 100644
index 9f7944d..0000000
--- a/include.new/clang/3.4.1/module.map
+++ /dev/null
@@ -1,156 +0,0 @@
-module _Builtin_intrinsics [system] {
-  explicit module altivec {
-    requires altivec
-    header "altivec.h"
-  }
-
-  explicit module arm {
-    requires arm
-
-    explicit module neon {
-      requires neon
-      header "arm_neon.h"
-      export *
-    }
-  }
-
-  explicit module intel {
-    requires x86
-    export *
-
-    header "immintrin.h"
-    header "x86intrin.h"
-
-    explicit module mm_malloc {
-      header "mm_malloc.h"
-      export * // note: for <stdlib.h> dependency
-    }
-
-    explicit module cpuid {
-      requires x86
-      header "cpuid.h"
-    }
-
-    explicit module mmx {
-      requires mmx
-      header "mmintrin.h"
-    }
-
-    explicit module f16c {
-      requires f16c
-      header "f16cintrin.h"
-    }
-
-    explicit module sse {
-      requires sse
-      export mmx
-      export * // note: for hackish <emmintrin.h> dependency
-      header "xmmintrin.h"
-    }
-
-    explicit module sse2 {
-      requires sse2
-      export sse
-      header "emmintrin.h"
-    }
-
-    explicit module sse3 {
-      requires sse3
-      export sse2
-      header "pmmintrin.h"
-    }
-
-    explicit module ssse3 {
-      requires ssse3
-      export sse3
-      header "tmmintrin.h"
-    }
-
-    explicit module sse4_1 {
-      requires sse41
-      export ssse3
-      header "smmintrin.h"
-    }
-
-    explicit module sse4_2 {
-      requires sse42
-      export sse4_1
-      header "nmmintrin.h"
-    }
-
-    explicit module sse4a {
-      requires sse4a
-      export sse3
-      header "ammintrin.h"
-    }
-
-    explicit module avx {
-      requires avx
-      export sse4_2
-      header "avxintrin.h"
-    }
-
-    explicit module avx2 {
-      requires avx2
-      export avx
-      header "avx2intrin.h"
-    }
-
-    explicit module bmi {
-      requires bmi
-      header "bmiintrin.h"
-    }
-
-    explicit module bmi2 {
-      requires bmi2
-      header "bmi2intrin.h"
-    }
-
-    explicit module fma {
-      requires fma
-      header "fmaintrin.h"
-    }
-
-    explicit module fma4 {
-      requires fma4
-      export sse3
-      header "fma4intrin.h"
-    }
-
-    explicit module lzcnt {
-      requires lzcnt
-      header "lzcntintrin.h"
-    }
-
-    explicit module popcnt {
-      requires popcnt
-      header "popcntintrin.h"
-    }
-
-    explicit module mm3dnow {
-      requires mm3dnow
-      header "mm3dnow.h"
-    }
-
-    explicit module xop {
-      requires xop
-      export fma4
-      header "xopintrin.h"
-    }
-
-    explicit module aes_pclmul {
-      requires aes, pclmul
-      header "wmmintrin.h"
-    }
-
-    explicit module aes {
-      requires aes
-      header "__wmmintrin_aes.h"
-    }
-
-    explicit module pclmul {
-      requires pclmul
-      header "__wmmintrin_pclmul.h"
-    }
-  }
-}
diff --git a/include.new/clang/3.4.1/nmmintrin.h b/include.new/clang/3.4.1/nmmintrin.h
deleted file mode 100644
index f12622d..0000000
--- a/include.new/clang/3.4.1/nmmintrin.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*===---- nmmintrin.h - SSE4 intrinsics ------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef _NMMINTRIN_H
-#define _NMMINTRIN_H
-
-#ifndef __SSE4_2__
-#error "SSE4.2 instruction set not enabled"
-#else
-
-/* To match expectations of gcc we put the sse4.2 definitions into smmintrin.h,
-   just include it now then.  */
-#include <smmintrin.h>
-#endif /* __SSE4_2__ */
-#endif /* _NMMINTRIN_H */
diff --git a/include.new/clang/3.4.1/pmmintrin.h b/include.new/clang/3.4.1/pmmintrin.h
deleted file mode 100644
index 6f1fc32..0000000
--- a/include.new/clang/3.4.1/pmmintrin.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*===---- pmmintrin.h - SSE3 intrinsics ------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
- 
-#ifndef __PMMINTRIN_H
-#define __PMMINTRIN_H
-
-#ifndef __SSE3__
-#error "SSE3 instruction set not enabled"
-#else
-
-#include <emmintrin.h>
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_lddqu_si128(__m128i const *__p)
-{
-  return (__m128i)__builtin_ia32_lddqu((char const *)__p);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_addsub_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_addsubps(__a, __b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_hadd_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_haddps(__a, __b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_hsub_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_hsubps(__a, __b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_movehdup_ps(__m128 __a)
-{
-  return __builtin_shufflevector(__a, __a, 1, 1, 3, 3);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_moveldup_ps(__m128 __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 0, 2, 2);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_addsub_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_addsubpd(__a, __b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_hadd_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_haddpd(__a, __b);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_hsub_pd(__m128d __a, __m128d __b)
-{
-  return __builtin_ia32_hsubpd(__a, __b);
-}
-
-#define        _mm_loaddup_pd(dp)        _mm_load1_pd(dp)
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_movedup_pd(__m128d __a)
-{
-  return __builtin_shufflevector(__a, __a, 0, 0);
-}
-
-#define _MM_DENORMALS_ZERO_ON   (0x0040)
-#define _MM_DENORMALS_ZERO_OFF  (0x0000)
-
-#define _MM_DENORMALS_ZERO_MASK (0x0040)
-
-#define _MM_GET_DENORMALS_ZERO_MODE() (_mm_getcsr() & _MM_DENORMALS_ZERO_MASK)
-#define _MM_SET_DENORMALS_ZERO_MODE(x) (_mm_setcsr((_mm_getcsr() & ~_MM_DENORMALS_ZERO_MASK) | (x)))
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_monitor(void const *__p, unsigned __extensions, unsigned __hints)
-{
-  __builtin_ia32_monitor((void *)__p, __extensions, __hints);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_mwait(unsigned __extensions, unsigned __hints)
-{
-  __builtin_ia32_mwait(__extensions, __hints);
-}
-
-#endif /* __SSE3__ */
-
-#endif /* __PMMINTRIN_H */
diff --git a/include.new/clang/3.4.1/popcntintrin.h b/include.new/clang/3.4.1/popcntintrin.h
deleted file mode 100644
index d439daa..0000000
--- a/include.new/clang/3.4.1/popcntintrin.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*===---- popcntintrin.h - POPCNT intrinsics -------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __POPCNT__
-#error "POPCNT instruction set not enabled"
-#endif
-
-#ifndef _POPCNTINTRIN_H
-#define _POPCNTINTRIN_H
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_popcnt_u32(unsigned int __A)
-{
-  return __builtin_popcount(__A);
-}
-
-#ifdef __x86_64__
-static __inline__ long long __attribute__((__always_inline__, __nodebug__))
-_mm_popcnt_u64(unsigned long long __A)
-{
-  return __builtin_popcountll(__A);
-}
-#endif /* __x86_64__ */
-
-#endif /* _POPCNTINTRIN_H */
diff --git a/include.new/clang/3.4.1/prfchwintrin.h b/include.new/clang/3.4.1/prfchwintrin.h
deleted file mode 100644
index 9825bd8..0000000
--- a/include.new/clang/3.4.1/prfchwintrin.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*===---- prfchwintrin.h - PREFETCHW intrinsic -----------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#if !defined(__X86INTRIN_H) && !defined(_MM3DNOW_H_INCLUDED)
-#error "Never use <prfchwintrin.h> directly; include <x86intrin.h> or <mm3dnow.h> instead."
-#endif
-
-#ifndef __PRFCHWINTRIN_H
-#define __PRFCHWINTRIN_H
-
-#if defined(__PRFCHW__) || defined(__3dNOW__)
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_m_prefetchw(void *__P)
-{
-  __builtin_prefetch (__P, 1, 3 /* _MM_HINT_T0 */);
-}
-#endif
-
-#endif /* __PRFCHWINTRIN_H */
diff --git a/include.new/clang/3.4.1/rdseedintrin.h b/include.new/clang/3.4.1/rdseedintrin.h
deleted file mode 100644
index 0fef1fa..0000000
--- a/include.new/clang/3.4.1/rdseedintrin.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*===---- rdseedintrin.h - RDSEED intrinsics -------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __X86INTRIN_H
-#error "Never use <rdseedintrin.h> directly; include <x86intrin.h> instead."
-#endif
-
-#ifndef __RDSEEDINTRIN_H
-#define __RDSEEDINTRIN_H
-
-#ifdef __RDSEED__
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_rdseed16_step(unsigned short *__p)
-{
-  return __builtin_ia32_rdseed16_step(__p);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_rdseed32_step(unsigned int *__p)
-{
-  return __builtin_ia32_rdseed32_step(__p);
-}
-
-#ifdef __x86_64__
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_rdseed64_step(unsigned long long *__p)
-{
-  return __builtin_ia32_rdseed64_step(__p);
-}
-#endif
-#endif /* __RDSEED__ */
-#endif /* __RDSEEDINTRIN_H */
diff --git a/include.new/clang/3.4.1/rtmintrin.h b/include.new/clang/3.4.1/rtmintrin.h
deleted file mode 100644
index 26149ca..0000000
--- a/include.new/clang/3.4.1/rtmintrin.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*===---- rtmintrin.h - RTM intrinsics -------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __IMMINTRIN_H
-#error "Never use <rtmintrin.h> directly; include <immintrin.h> instead."
-#endif
-
-#ifndef __RTMINTRIN_H
-#define __RTMINTRIN_H
-
-#define _XBEGIN_STARTED   (~0u)
-#define _XABORT_EXPLICIT  (1 << 0)
-#define _XABORT_RETRY     (1 << 1)
-#define _XABORT_CONFLICT  (1 << 2)
-#define _XABORT_CAPACITY  (1 << 3)
-#define _XABORT_DEBUG     (1 << 4)
-#define _XABORT_NESTED    (1 << 5)
-#define _XABORT_CODE(x)   (((x) >> 24) & 0xFF)
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-_xbegin(void)
-{
-  return __builtin_ia32_xbegin();
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_xend(void)
-{
-  __builtin_ia32_xend();
-}
-
-#define _xabort(imm) __builtin_ia32_xabort((imm))
-
-#endif /* __RTMINTRIN_H */
diff --git a/include.new/clang/3.4.1/shaintrin.h b/include.new/clang/3.4.1/shaintrin.h
deleted file mode 100644
index 66ed055..0000000
--- a/include.new/clang/3.4.1/shaintrin.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*===---- shaintrin.h - SHA intrinsics -------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __IMMINTRIN_H
-#error "Never use <shaintrin.h> directly; include <immintrin.h> instead."
-#endif
-
-#ifndef __SHAINTRIN_H
-#define __SHAINTRIN_H
-
-#if !defined (__SHA__)
-#  error "SHA instructions not enabled"
-#endif
-
-#define _mm_sha1rnds4_epu32(V1, V2, M) __extension__ ({ \
-  __builtin_ia32_sha1rnds4((V1), (V2), (M)); })
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha1nexte_epu32(__m128i __X, __m128i __Y)
-{
-  return __builtin_ia32_sha1nexte(__X, __Y);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha1msg1_epu32(__m128i __X, __m128i __Y)
-{
-  return __builtin_ia32_sha1msg1(__X, __Y);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha1msg2_epu32(__m128i __X, __m128i __Y)
-{
-  return __builtin_ia32_sha1msg2(__X, __Y);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha256rnds2_epu32(__m128i __X, __m128i __Y, __m128i __Z)
-{
-  return __builtin_ia32_sha256rnds2(__X, __Y, __Z);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha256msg1_epu32(__m128i __X, __m128i __Y)
-{
-  return __builtin_ia32_sha256msg1(__X, __Y);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha256msg2_epu32(__m128i __X, __m128i __Y)
-{
-  return __builtin_ia32_sha256msg2(__X, __Y);
-}
-
-#endif /* __SHAINTRIN_H */
diff --git a/include.new/clang/3.4.1/smmintrin.h b/include.new/clang/3.4.1/smmintrin.h
deleted file mode 100644
index 53b3ccb..0000000
--- a/include.new/clang/3.4.1/smmintrin.h
+++ /dev/null
@@ -1,468 +0,0 @@
-/*===---- smmintrin.h - SSE4 intrinsics ------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef _SMMINTRIN_H
-#define _SMMINTRIN_H
-
-#ifndef __SSE4_1__
-#error "SSE4.1 instruction set not enabled"
-#else
-
-#include <tmmintrin.h>
-
-/* SSE4 Rounding macros. */
-#define _MM_FROUND_TO_NEAREST_INT    0x00
-#define _MM_FROUND_TO_NEG_INF        0x01
-#define _MM_FROUND_TO_POS_INF        0x02
-#define _MM_FROUND_TO_ZERO           0x03
-#define _MM_FROUND_CUR_DIRECTION     0x04
-
-#define _MM_FROUND_RAISE_EXC         0x00
-#define _MM_FROUND_NO_EXC            0x08
-
-#define _MM_FROUND_NINT      (_MM_FROUND_RAISE_EXC | _MM_FROUND_TO_NEAREST_INT)
-#define _MM_FROUND_FLOOR     (_MM_FROUND_RAISE_EXC | _MM_FROUND_TO_NEG_INF)
-#define _MM_FROUND_CEIL      (_MM_FROUND_RAISE_EXC | _MM_FROUND_TO_POS_INF)
-#define _MM_FROUND_TRUNC     (_MM_FROUND_RAISE_EXC | _MM_FROUND_TO_ZERO)
-#define _MM_FROUND_RINT      (_MM_FROUND_RAISE_EXC | _MM_FROUND_CUR_DIRECTION)
-#define _MM_FROUND_NEARBYINT (_MM_FROUND_NO_EXC | _MM_FROUND_CUR_DIRECTION)
-
-#define _mm_ceil_ps(X)       _mm_round_ps((X), _MM_FROUND_CEIL)
-#define _mm_ceil_pd(X)       _mm_round_pd((X), _MM_FROUND_CEIL)
-#define _mm_ceil_ss(X, Y)    _mm_round_ss((X), (Y), _MM_FROUND_CEIL)
-#define _mm_ceil_sd(X, Y)    _mm_round_sd((X), (Y), _MM_FROUND_CEIL)
-
-#define _mm_floor_ps(X)      _mm_round_ps((X), _MM_FROUND_FLOOR)
-#define _mm_floor_pd(X)      _mm_round_pd((X), _MM_FROUND_FLOOR)
-#define _mm_floor_ss(X, Y)   _mm_round_ss((X), (Y), _MM_FROUND_FLOOR)
-#define _mm_floor_sd(X, Y)   _mm_round_sd((X), (Y), _MM_FROUND_FLOOR)
-
-#define _mm_round_ps(X, M) __extension__ ({ \
-  __m128 __X = (X); \
-  (__m128) __builtin_ia32_roundps((__v4sf)__X, (M)); })
-
-#define _mm_round_ss(X, Y, M) __extension__ ({ \
-  __m128 __X = (X); \
-  __m128 __Y = (Y); \
-  (__m128) __builtin_ia32_roundss((__v4sf)__X, (__v4sf)__Y, (M)); })
-
-#define _mm_round_pd(X, M) __extension__ ({ \
-  __m128d __X = (X); \
-  (__m128d) __builtin_ia32_roundpd((__v2df)__X, (M)); })
-
-#define _mm_round_sd(X, Y, M) __extension__ ({ \
-  __m128d __X = (X); \
-  __m128d __Y = (Y); \
-  (__m128d) __builtin_ia32_roundsd((__v2df)__X, (__v2df)__Y, (M)); })
-
-/* SSE4 Packed Blending Intrinsics.  */
-#define _mm_blend_pd(V1, V2, M) __extension__ ({ \
-  __m128d __V1 = (V1); \
-  __m128d __V2 = (V2); \
-  (__m128d) __builtin_ia32_blendpd ((__v2df)__V1, (__v2df)__V2, (M)); })
-
-#define _mm_blend_ps(V1, V2, M) __extension__ ({ \
-  __m128 __V1 = (V1); \
-  __m128 __V2 = (V2); \
-  (__m128) __builtin_ia32_blendps ((__v4sf)__V1, (__v4sf)__V2, (M)); })
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_blendv_pd (__m128d __V1, __m128d __V2, __m128d __M)
-{
-  return (__m128d) __builtin_ia32_blendvpd ((__v2df)__V1, (__v2df)__V2,
-                                            (__v2df)__M);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_blendv_ps (__m128 __V1, __m128 __V2, __m128 __M)
-{
-  return (__m128) __builtin_ia32_blendvps ((__v4sf)__V1, (__v4sf)__V2,
-                                           (__v4sf)__M);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_blendv_epi8 (__m128i __V1, __m128i __V2, __m128i __M)
-{
-  return (__m128i) __builtin_ia32_pblendvb128 ((__v16qi)__V1, (__v16qi)__V2,
-                                               (__v16qi)__M);
-}
-
-#define _mm_blend_epi16(V1, V2, M) __extension__ ({ \
-  __m128i __V1 = (V1); \
-  __m128i __V2 = (V2); \
-  (__m128i) __builtin_ia32_pblendw128 ((__v8hi)__V1, (__v8hi)__V2, (M)); })
-
-/* SSE4 Dword Multiply Instructions.  */
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_mullo_epi32 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) ((__v4si)__V1 * (__v4si)__V2);
-}
-
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_mul_epi32 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_pmuldq128 ((__v4si)__V1, (__v4si)__V2);
-}
-
-/* SSE4 Floating Point Dot Product Instructions.  */
-#define _mm_dp_ps(X, Y, M) __extension__ ({ \
-  __m128 __X = (X); \
-  __m128 __Y = (Y); \
-  (__m128) __builtin_ia32_dpps((__v4sf)__X, (__v4sf)__Y, (M)); })
-
-#define _mm_dp_pd(X, Y, M) __extension__ ({\
-  __m128d __X = (X); \
-  __m128d __Y = (Y); \
-  (__m128d) __builtin_ia32_dppd((__v2df)__X, (__v2df)__Y, (M)); })
-
-/* SSE4 Streaming Load Hint Instruction.  */
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_stream_load_si128 (__m128i *__V)
-{
-  return (__m128i) __builtin_ia32_movntdqa ((__v2di *) __V);
-}
-
-/* SSE4 Packed Integer Min/Max Instructions.  */
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_min_epi8 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_pminsb128 ((__v16qi) __V1, (__v16qi) __V2);
-}
-
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_max_epi8 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_pmaxsb128 ((__v16qi) __V1, (__v16qi) __V2);
-}
-
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_min_epu16 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_pminuw128 ((__v8hi) __V1, (__v8hi) __V2);
-}
-
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_max_epu16 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_pmaxuw128 ((__v8hi) __V1, (__v8hi) __V2);
-}
-
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_min_epi32 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_pminsd128 ((__v4si) __V1, (__v4si) __V2);
-}
-
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_max_epi32 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_pmaxsd128 ((__v4si) __V1, (__v4si) __V2);
-}
-
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_min_epu32 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_pminud128((__v4si) __V1, (__v4si) __V2);
-}
-
-static __inline__  __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_max_epu32 (__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_pmaxud128((__v4si) __V1, (__v4si) __V2);
-}
-
-/* SSE4 Insertion and Extraction from XMM Register Instructions.  */
-#define _mm_insert_ps(X, Y, N) __builtin_ia32_insertps128((X), (Y), (N))
-#define _mm_extract_ps(X, N) (__extension__                      \
-                              ({ union { int __i; float __f; } __t;  \
-                                 __v4sf __a = (__v4sf)(X);       \
-                                 __t.__f = __a[(N) & 3];                 \
-                                 __t.__i;}))
-
-/* Miscellaneous insert and extract macros.  */
-/* Extract a single-precision float from X at index N into D.  */
-#define _MM_EXTRACT_FLOAT(D, X, N) (__extension__ ({ __v4sf __a = (__v4sf)(X); \
-                                                    (D) = __a[N]; }))
-                                                    
-/* Or together 2 sets of indexes (X and Y) with the zeroing bits (Z) to create
-   an index suitable for _mm_insert_ps.  */
-#define _MM_MK_INSERTPS_NDX(X, Y, Z) (((X) << 6) | ((Y) << 4) | (Z))
-                                           
-/* Extract a float from X at index N into the first index of the return.  */
-#define _MM_PICK_OUT_PS(X, N) _mm_insert_ps (_mm_setzero_ps(), (X),   \
-                                             _MM_MK_INSERTPS_NDX((N), 0, 0x0e))
-                                             
-/* Insert int into packed integer array at index.  */
-#define _mm_insert_epi8(X, I, N) (__extension__ ({ __v16qi __a = (__v16qi)(X); \
-                                                   __a[(N) & 15] = (I);             \
-                                                   __a;}))
-#define _mm_insert_epi32(X, I, N) (__extension__ ({ __v4si __a = (__v4si)(X); \
-                                                    __a[(N) & 3] = (I);           \
-                                                    __a;}))
-#ifdef __x86_64__
-#define _mm_insert_epi64(X, I, N) (__extension__ ({ __v2di __a = (__v2di)(X); \
-                                                    __a[(N) & 1] = (I);           \
-                                                    __a;}))
-#endif /* __x86_64__ */
-
-/* Extract int from packed integer array at index.  This returns the element
- * as a zero extended value, so it is unsigned.
- */
-#define _mm_extract_epi8(X, N) (__extension__ ({ __v16qi __a = (__v16qi)(X); \
-                                                 (int)(unsigned char) \
-                                                     __a[(N) & 15];}))
-#define _mm_extract_epi32(X, N) (__extension__ ({ __v4si __a = (__v4si)(X); \
-                                                  __a[(N) & 3];}))
-#ifdef __x86_64__
-#define _mm_extract_epi64(X, N) (__extension__ ({ __v2di __a = (__v2di)(X); \
-                                                  __a[(N) & 1];}))
-#endif /* __x86_64 */
-
-/* SSE4 128-bit Packed Integer Comparisons.  */
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_testz_si128(__m128i __M, __m128i __V)
-{
-  return __builtin_ia32_ptestz128((__v2di)__M, (__v2di)__V);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_testc_si128(__m128i __M, __m128i __V)
-{
-  return __builtin_ia32_ptestc128((__v2di)__M, (__v2di)__V);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_testnzc_si128(__m128i __M, __m128i __V)
-{
-  return __builtin_ia32_ptestnzc128((__v2di)__M, (__v2di)__V);
-}
-
-#define _mm_test_all_ones(V) _mm_testc_si128((V), _mm_cmpeq_epi32((V), (V)))
-#define _mm_test_mix_ones_zeros(M, V) _mm_testnzc_si128((M), (V))
-#define _mm_test_all_zeros(M, V) _mm_testz_si128 ((M), (V))
-
-/* SSE4 64-bit Packed Integer Comparisons.  */
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_epi64(__m128i __V1, __m128i __V2)
-{
-  return (__m128i)((__v2di)__V1 == (__v2di)__V2);
-}
-
-/* SSE4 Packed Integer Sign-Extension.  */
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepi8_epi16(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovsxbw128((__v16qi) __V);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepi8_epi32(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovsxbd128((__v16qi) __V);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepi8_epi64(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovsxbq128((__v16qi) __V);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepi16_epi32(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovsxwd128((__v8hi) __V); 
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepi16_epi64(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovsxwq128((__v8hi)__V);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepi32_epi64(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovsxdq128((__v4si)__V);
-}
-
-/* SSE4 Packed Integer Zero-Extension.  */
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepu8_epi16(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovzxbw128((__v16qi) __V);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepu8_epi32(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovzxbd128((__v16qi)__V);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepu8_epi64(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovzxbq128((__v16qi)__V);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepu16_epi32(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovzxwd128((__v8hi)__V);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepu16_epi64(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovzxwq128((__v8hi)__V);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cvtepu32_epi64(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_pmovzxdq128((__v4si)__V);
-}
-
-/* SSE4 Pack with Unsigned Saturation.  */
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_packus_epi32(__m128i __V1, __m128i __V2)
-{
-  return (__m128i) __builtin_ia32_packusdw128((__v4si)__V1, (__v4si)__V2);
-}
-
-/* SSE4 Multiple Packed Sums of Absolute Difference.  */
-#define _mm_mpsadbw_epu8(X, Y, M) __extension__ ({ \
-  __m128i __X = (X); \
-  __m128i __Y = (Y); \
-  (__m128i) __builtin_ia32_mpsadbw128((__v16qi)__X, (__v16qi)__Y, (M)); })
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_minpos_epu16(__m128i __V)
-{
-  return (__m128i) __builtin_ia32_phminposuw128((__v8hi)__V);
-}
-
-/* These definitions are normally in nmmintrin.h, but gcc puts them in here
-   so we'll do the same.  */
-#ifdef __SSE4_2__
-
-/* These specify the type of data that we're comparing.  */
-#define _SIDD_UBYTE_OPS                 0x00
-#define _SIDD_UWORD_OPS                 0x01
-#define _SIDD_SBYTE_OPS                 0x02
-#define _SIDD_SWORD_OPS                 0x03
-
-/* These specify the type of comparison operation.  */
-#define _SIDD_CMP_EQUAL_ANY             0x00
-#define _SIDD_CMP_RANGES                0x04
-#define _SIDD_CMP_EQUAL_EACH            0x08
-#define _SIDD_CMP_EQUAL_ORDERED         0x0c
-
-/* These macros specify the polarity of the operation.  */
-#define _SIDD_POSITIVE_POLARITY         0x00
-#define _SIDD_NEGATIVE_POLARITY         0x10
-#define _SIDD_MASKED_POSITIVE_POLARITY  0x20
-#define _SIDD_MASKED_NEGATIVE_POLARITY  0x30
-
-/* These macros are used in _mm_cmpXstri() to specify the return.  */
-#define _SIDD_LEAST_SIGNIFICANT         0x00
-#define _SIDD_MOST_SIGNIFICANT          0x40
-
-/* These macros are used in _mm_cmpXstri() to specify the return.  */
-#define _SIDD_BIT_MASK                  0x00
-#define _SIDD_UNIT_MASK                 0x40
-
-/* SSE4.2 Packed Comparison Intrinsics.  */
-#define _mm_cmpistrm(A, B, M) __builtin_ia32_pcmpistrm128((A), (B), (M))
-#define _mm_cmpistri(A, B, M) __builtin_ia32_pcmpistri128((A), (B), (M))
-
-#define _mm_cmpestrm(A, LA, B, LB, M) \
-     __builtin_ia32_pcmpestrm128((A), (LA), (B), (LB), (M))
-#define _mm_cmpestri(A, LA, B, LB, M) \
-     __builtin_ia32_pcmpestri128((A), (LA), (B), (LB), (M))
-     
-/* SSE4.2 Packed Comparison Intrinsics and EFlag Reading.  */
-#define _mm_cmpistra(A, B, M) \
-     __builtin_ia32_pcmpistria128((A), (B), (M))
-#define _mm_cmpistrc(A, B, M) \
-     __builtin_ia32_pcmpistric128((A), (B), (M))
-#define _mm_cmpistro(A, B, M) \
-     __builtin_ia32_pcmpistrio128((A), (B), (M))
-#define _mm_cmpistrs(A, B, M) \
-     __builtin_ia32_pcmpistris128((A), (B), (M))
-#define _mm_cmpistrz(A, B, M) \
-     __builtin_ia32_pcmpistriz128((A), (B), (M))
-
-#define _mm_cmpestra(A, LA, B, LB, M) \
-     __builtin_ia32_pcmpestria128((A), (LA), (B), (LB), (M))
-#define _mm_cmpestrc(A, LA, B, LB, M) \
-     __builtin_ia32_pcmpestric128((A), (LA), (B), (LB), (M))
-#define _mm_cmpestro(A, LA, B, LB, M) \
-     __builtin_ia32_pcmpestrio128((A), (LA), (B), (LB), (M))
-#define _mm_cmpestrs(A, LA, B, LB, M) \
-     __builtin_ia32_pcmpestris128((A), (LA), (B), (LB), (M))
-#define _mm_cmpestrz(A, LA, B, LB, M) \
-     __builtin_ia32_pcmpestriz128((A), (LA), (B), (LB), (M))
-
-/* SSE4.2 Compare Packed Data -- Greater Than.  */
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_epi64(__m128i __V1, __m128i __V2)
-{
-  return (__m128i)((__v2di)__V1 > (__v2di)__V2);
-}
-
-/* SSE4.2 Accumulate CRC32.  */
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-_mm_crc32_u8(unsigned int __C, unsigned char __D)
-{
-  return __builtin_ia32_crc32qi(__C, __D);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-_mm_crc32_u16(unsigned int __C, unsigned short __D)
-{
-  return __builtin_ia32_crc32hi(__C, __D);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-_mm_crc32_u32(unsigned int __C, unsigned int __D)
-{
-  return __builtin_ia32_crc32si(__C, __D);
-}
-
-#ifdef __x86_64__
-static __inline__ unsigned long long __attribute__((__always_inline__, __nodebug__))
-_mm_crc32_u64(unsigned long long __C, unsigned long long __D)
-{
-  return __builtin_ia32_crc32di(__C, __D);
-}
-#endif /* __x86_64__ */
-
-#ifdef __POPCNT__
-#include <popcntintrin.h>
-#endif
-
-#endif /* __SSE4_2__ */
-#endif /* __SSE4_1__ */
-
-#endif /* _SMMINTRIN_H */
diff --git a/include.new/clang/3.4.1/tbmintrin.h b/include.new/clang/3.4.1/tbmintrin.h
deleted file mode 100644
index f95e34f..0000000
--- a/include.new/clang/3.4.1/tbmintrin.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*===---- tbmintrin.h - TBM intrinsics -------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __TBM__
-#error "TBM instruction set is not enabled"
-#endif
-
-#ifndef __X86INTRIN_H
-#error "Never use <tbmintrin.h> directly; include <x86intrin.h> instead."
-#endif
-
-#ifndef __TBMINTRIN_H
-#define __TBMINTRIN_H
-
-#define __bextri_u32(a, b) (__builtin_ia32_bextri_u32((a), (b)))
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blcfill_u32(unsigned int a)
-{
-  return a & (a + 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blci_u32(unsigned int a)
-{
-  return a | ~(a + 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blcic_u32(unsigned int a)
-{
-  return ~a & (a + 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blcmsk_u32(unsigned int a)
-{
-  return a ^ (a + 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blcs_u32(unsigned int a)
-{
-  return a | (a + 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blsfill_u32(unsigned int a)
-{
-  return a | (a - 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__blsic_u32(unsigned int a)
-{
-  return ~a | (a - 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__t1mskc_u32(unsigned int a)
-{
-  return ~a | (a + 1);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-__tzmsk_u32(unsigned int a)
-{
-  return ~a & (a - 1);
-}
-
-#ifdef __x86_64__
-#define __bextri_u64(a, b) (__builtin_ia32_bextri_u64((a), (int)(b)))
-
-static __inline__ unsigned long long __attribute__((__always_inline__,
-                                                    __nodebug__))
-__blcfill_u64(unsigned long long a)
-{
-  return a & (a + 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__,
-                                                    __nodebug__))
-__blci_u64(unsigned long long a)
-{
-  return a | ~(a + 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__,
-                                                    __nodebug__))
-__blcic_u64(unsigned long long a)
-{
-  return ~a & (a + 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__,
-                                                    __nodebug__))
-__blcmsk_u64(unsigned long long a)
-{
-  return a ^ (a + 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__,
-                                                    __nodebug__))
-__blcs_u64(unsigned long long a)
-{
-  return a | (a + 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__,
-                                                    __nodebug__))
-__blsfill_u64(unsigned long long a)
-{
-  return a | (a - 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__,
-                                                    __nodebug__))
-__blsic_u64(unsigned long long a)
-{
-  return ~a | (a - 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__,
-                                                    __nodebug__))
-__t1mskc_u64(unsigned long long a)
-{
-  return ~a | (a + 1);
-}
-
-static __inline__ unsigned long long __attribute__((__always_inline__,
-                                                    __nodebug__))
-__tzmsk_u64(unsigned long long a)
-{
-  return ~a & (a - 1);
-}
-#endif
-
-#endif /* __TBMINTRIN_H */
diff --git a/include.new/clang/3.4.1/tmmintrin.h b/include.new/clang/3.4.1/tmmintrin.h
deleted file mode 100644
index 4238f5b..0000000
--- a/include.new/clang/3.4.1/tmmintrin.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*===---- tmmintrin.h - SSSE3 intrinsics -----------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
- 
-#ifndef __TMMINTRIN_H
-#define __TMMINTRIN_H
-
-#ifndef __SSSE3__
-#error "SSSE3 instruction set not enabled"
-#else
-
-#include <pmmintrin.h>
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_abs_pi8(__m64 __a)
-{
-    return (__m64)__builtin_ia32_pabsb((__v8qi)__a);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_abs_epi8(__m128i __a)
-{
-    return (__m128i)__builtin_ia32_pabsb128((__v16qi)__a);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_abs_pi16(__m64 __a)
-{
-    return (__m64)__builtin_ia32_pabsw((__v4hi)__a);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_abs_epi16(__m128i __a)
-{
-    return (__m128i)__builtin_ia32_pabsw128((__v8hi)__a);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_abs_pi32(__m64 __a)
-{
-    return (__m64)__builtin_ia32_pabsd((__v2si)__a);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_abs_epi32(__m128i __a)
-{
-    return (__m128i)__builtin_ia32_pabsd128((__v4si)__a);
-}
-
-#define _mm_alignr_epi8(a, b, n) __extension__ ({ \
-  __m128i __a = (a); \
-  __m128i __b = (b); \
-  (__m128i)__builtin_ia32_palignr128((__v16qi)__a, (__v16qi)__b, (n)); })
-
-#define _mm_alignr_pi8(a, b, n) __extension__ ({ \
-  __m64 __a = (a); \
-  __m64 __b = (b); \
-  (__m64)__builtin_ia32_palignr((__v8qi)__a, (__v8qi)__b, (n)); })
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_hadd_epi16(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_phaddw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_hadd_epi32(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_phaddd128((__v4si)__a, (__v4si)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_hadd_pi16(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_phaddw((__v4hi)__a, (__v4hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_hadd_pi32(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_phaddd((__v2si)__a, (__v2si)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_hadds_epi16(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_phaddsw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_hadds_pi16(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_phaddsw((__v4hi)__a, (__v4hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_hsub_epi16(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_phsubw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_hsub_epi32(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_phsubd128((__v4si)__a, (__v4si)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_hsub_pi16(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_phsubw((__v4hi)__a, (__v4hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_hsub_pi32(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_phsubd((__v2si)__a, (__v2si)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_hsubs_epi16(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_phsubsw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_hsubs_pi16(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_phsubsw((__v4hi)__a, (__v4hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maddubs_epi16(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_pmaddubsw128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_maddubs_pi16(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_pmaddubsw((__v8qi)__a, (__v8qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_mulhrs_epi16(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_pmulhrsw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_mulhrs_pi16(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_pmulhrsw((__v4hi)__a, (__v4hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_shuffle_epi8(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_pshufb128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_shuffle_pi8(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_pshufb((__v8qi)__a, (__v8qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sign_epi8(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_psignb128((__v16qi)__a, (__v16qi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sign_epi16(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_psignw128((__v8hi)__a, (__v8hi)__b);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sign_epi32(__m128i __a, __m128i __b)
-{
-    return (__m128i)__builtin_ia32_psignd128((__v4si)__a, (__v4si)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sign_pi8(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_psignb((__v8qi)__a, (__v8qi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sign_pi16(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_psignw((__v4hi)__a, (__v4hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sign_pi32(__m64 __a, __m64 __b)
-{
-    return (__m64)__builtin_ia32_psignd((__v2si)__a, (__v2si)__b);
-}
-
-#endif /* __SSSE3__ */
-
-#endif /* __TMMINTRIN_H */
diff --git a/include.new/clang/3.4.1/wmmintrin.h b/include.new/clang/3.4.1/wmmintrin.h
deleted file mode 100644
index 369e3c2..0000000
--- a/include.new/clang/3.4.1/wmmintrin.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*===---- wmmintrin.h - AES intrinsics ------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef _WMMINTRIN_H
-#define _WMMINTRIN_H
-
-#include <emmintrin.h>
-
-#if !defined (__AES__) && !defined (__PCLMUL__)
-# error "AES/PCLMUL instructions not enabled"
-#else
-
-#ifdef __AES__
-#include <__wmmintrin_aes.h>
-#endif /* __AES__ */
-
-#ifdef __PCLMUL__
-#include <__wmmintrin_pclmul.h>
-#endif /* __PCLMUL__ */
-
-#endif /* __AES__ || __PCLMUL__ */
-#endif /* _WMMINTRIN_H */
diff --git a/include.new/clang/3.4.1/x86intrin.h b/include.new/clang/3.4.1/x86intrin.h
deleted file mode 100644
index 399016f..0000000
--- a/include.new/clang/3.4.1/x86intrin.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*===---- x86intrin.h - X86 intrinsics -------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __X86INTRIN_H
-#define __X86INTRIN_H
-
-#include <immintrin.h>
-
-#ifdef __3dNOW__
-#include <mm3dnow.h>
-#endif
-
-#ifdef __BMI__
-#include <bmiintrin.h>
-#endif
-
-#ifdef __BMI2__
-#include <bmi2intrin.h>
-#endif
-
-#ifdef __LZCNT__
-#include <lzcntintrin.h>
-#endif
-
-#ifdef __POPCNT__
-#include <popcntintrin.h>
-#endif
-
-#ifdef __RDSEED__
-#include <rdseedintrin.h>
-#endif
-
-#ifdef __PRFCHW__
-#include <prfchwintrin.h>
-#endif
-
-#ifdef __SSE4A__
-#include <ammintrin.h>
-#endif
-
-#ifdef __FMA4__
-#include <fma4intrin.h>
-#endif
-
-#ifdef __XOP__
-#include <xopintrin.h>
-#endif
-
-#ifdef __TBM__
-#include <tbmintrin.h>
-#endif
-
-#ifdef __F16C__
-#include <f16cintrin.h>
-#endif
-
-// FIXME: LWP
-
-#endif /* __X86INTRIN_H */
diff --git a/include.new/clang/3.4.1/xmmintrin.h b/include.new/clang/3.4.1/xmmintrin.h
deleted file mode 100644
index f6305fb..0000000
--- a/include.new/clang/3.4.1/xmmintrin.h
+++ /dev/null
@@ -1,1001 +0,0 @@
-/*===---- xmmintrin.h - SSE intrinsics -------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
- 
-#ifndef __XMMINTRIN_H
-#define __XMMINTRIN_H
- 
-#ifndef __SSE__
-#error "SSE instruction set not enabled"
-#else
-
-#include <mmintrin.h>
-
-typedef int __v4si __attribute__((__vector_size__(16)));
-typedef float __v4sf __attribute__((__vector_size__(16)));
-typedef float __m128 __attribute__((__vector_size__(16)));
-
-// This header should only be included in a hosted environment as it depends on
-// a standard library to provide allocation routines.
-#if __STDC_HOSTED__
-#include <mm_malloc.h>
-#endif
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_add_ss(__m128 __a, __m128 __b)
-{
-  __a[0] += __b[0];
-  return __a;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_add_ps(__m128 __a, __m128 __b)
-{
-  return __a + __b;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_sub_ss(__m128 __a, __m128 __b)
-{
-  __a[0] -= __b[0];
-  return __a;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_sub_ps(__m128 __a, __m128 __b)
-{
-  return __a - __b;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_mul_ss(__m128 __a, __m128 __b)
-{
-  __a[0] *= __b[0];
-  return __a;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_mul_ps(__m128 __a, __m128 __b)
-{
-  return __a * __b;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_div_ss(__m128 __a, __m128 __b)
-{
-  __a[0] /= __b[0];
-  return __a;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_div_ps(__m128 __a, __m128 __b)
-{
-  return __a / __b;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_sqrt_ss(__m128 __a)
-{
-  __m128 __c = __builtin_ia32_sqrtss(__a);
-  return (__m128) { __c[0], __a[1], __a[2], __a[3] };
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_sqrt_ps(__m128 __a)
-{
-  return __builtin_ia32_sqrtps(__a);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_rcp_ss(__m128 __a)
-{
-  __m128 __c = __builtin_ia32_rcpss(__a);
-  return (__m128) { __c[0], __a[1], __a[2], __a[3] };
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_rcp_ps(__m128 __a)
-{
-  return __builtin_ia32_rcpps(__a);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_rsqrt_ss(__m128 __a)
-{
-  __m128 __c = __builtin_ia32_rsqrtss(__a);
-  return (__m128) { __c[0], __a[1], __a[2], __a[3] };
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_rsqrt_ps(__m128 __a)
-{
-  return __builtin_ia32_rsqrtps(__a);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_min_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_minss(__a, __b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_min_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_minps(__a, __b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_max_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_maxss(__a, __b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_max_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_maxps(__a, __b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_and_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)((__v4si)__a & (__v4si)__b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_andnot_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)(~(__v4si)__a & (__v4si)__b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_or_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)((__v4si)__a | (__v4si)__b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_xor_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)((__v4si)__a ^ (__v4si)__b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpss(__a, __b, 0);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpeq_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__a, __b, 0);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmplt_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpss(__a, __b, 1);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmplt_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__a, __b, 1);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmple_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpss(__a, __b, 2);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmple_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__a, __b, 2);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_shufflevector(__a,
-                                         __builtin_ia32_cmpss(__b, __a, 1),
-                                         4, 1, 2, 3);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpgt_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__b, __a, 1);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpge_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_shufflevector(__a,
-                                         __builtin_ia32_cmpss(__b, __a, 2),
-                                         4, 1, 2, 3);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpge_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__b, __a, 2);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpneq_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpss(__a, __b, 4);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpneq_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__a, __b, 4);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnlt_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpss(__a, __b, 5);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnlt_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__a, __b, 5);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnle_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpss(__a, __b, 6);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnle_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__a, __b, 6);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpngt_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_shufflevector(__a,
-                                         __builtin_ia32_cmpss(__b, __a, 5),
-                                         4, 1, 2, 3);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpngt_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__b, __a, 5);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnge_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_shufflevector(__a,
-                                         __builtin_ia32_cmpss(__b, __a, 6),
-                                         4, 1, 2, 3);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpnge_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__b, __a, 6);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpord_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpss(__a, __b, 7);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpord_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__a, __b, 7);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpunord_ss(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpss(__a, __b, 3);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cmpunord_ps(__m128 __a, __m128 __b)
-{
-  return (__m128)__builtin_ia32_cmpps(__a, __b, 3);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comieq_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_comieq(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comilt_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_comilt(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comile_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_comile(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comigt_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_comigt(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comige_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_comige(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_comineq_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_comineq(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomieq_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_ucomieq(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomilt_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_ucomilt(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomile_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_ucomile(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomigt_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_ucomigt(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomige_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_ucomige(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_ucomineq_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_ia32_ucomineq(__a, __b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_cvtss_si32(__m128 __a)
-{
-  return __builtin_ia32_cvtss2si(__a);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_cvt_ss2si(__m128 __a)
-{
-  return _mm_cvtss_si32(__a);
-}
-
-#ifdef __x86_64__
-
-static __inline__ long long __attribute__((__always_inline__, __nodebug__))
-_mm_cvtss_si64(__m128 __a)
-{
-  return __builtin_ia32_cvtss2si64(__a);
-}
-
-#endif
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtps_pi32(__m128 __a)
-{
-  return (__m64)__builtin_ia32_cvtps2pi(__a);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvt_ps2pi(__m128 __a)
-{
-  return _mm_cvtps_pi32(__a);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_cvttss_si32(__m128 __a)
-{
-  return __a[0];
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_cvtt_ss2si(__m128 __a)
-{
-  return _mm_cvttss_si32(__a);
-}
-
-static __inline__ long long __attribute__((__always_inline__, __nodebug__))
-_mm_cvttss_si64(__m128 __a)
-{
-  return __a[0];
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvttps_pi32(__m128 __a)
-{
-  return (__m64)__builtin_ia32_cvttps2pi(__a);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtt_ps2pi(__m128 __a)
-{
-  return _mm_cvttps_pi32(__a);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi32_ss(__m128 __a, int __b)
-{
-  __a[0] = __b;
-  return __a;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvt_si2ss(__m128 __a, int __b)
-{
-  return _mm_cvtsi32_ss(__a, __b);
-}
-
-#ifdef __x86_64__
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtsi64_ss(__m128 __a, long long __b)
-{
-  __a[0] = __b;
-  return __a;
-}
-
-#endif
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpi32_ps(__m128 __a, __m64 __b)
-{
-  return __builtin_ia32_cvtpi2ps(__a, (__v2si)__b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvt_pi2ps(__m128 __a, __m64 __b)
-{
-  return _mm_cvtpi32_ps(__a, __b);
-}
-
-static __inline__ float __attribute__((__always_inline__, __nodebug__))
-_mm_cvtss_f32(__m128 __a)
-{
-  return __a[0];
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_loadh_pi(__m128 __a, const __m64 *__p)
-{
-  typedef float __mm_loadh_pi_v2f32 __attribute__((__vector_size__(8)));
-  struct __mm_loadh_pi_struct {
-    __mm_loadh_pi_v2f32 __u;
-  } __attribute__((__packed__, __may_alias__));
-  __mm_loadh_pi_v2f32 __b = ((struct __mm_loadh_pi_struct*)__p)->__u;
-  __m128 __bb = __builtin_shufflevector(__b, __b, 0, 1, 0, 1);
-  return __builtin_shufflevector(__a, __bb, 0, 1, 4, 5);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_loadl_pi(__m128 __a, const __m64 *__p)
-{
-  typedef float __mm_loadl_pi_v2f32 __attribute__((__vector_size__(8)));
-  struct __mm_loadl_pi_struct {
-    __mm_loadl_pi_v2f32 __u;
-  } __attribute__((__packed__, __may_alias__));
-  __mm_loadl_pi_v2f32 __b = ((struct __mm_loadl_pi_struct*)__p)->__u;
-  __m128 __bb = __builtin_shufflevector(__b, __b, 0, 1, 0, 1);
-  return __builtin_shufflevector(__a, __bb, 4, 5, 2, 3);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_load_ss(const float *__p)
-{
-  struct __mm_load_ss_struct {
-    float __u;
-  } __attribute__((__packed__, __may_alias__));
-  float __u = ((struct __mm_load_ss_struct*)__p)->__u;
-  return (__m128){ __u, 0, 0, 0 };
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_load1_ps(const float *__p)
-{
-  struct __mm_load1_ps_struct {
-    float __u;
-  } __attribute__((__packed__, __may_alias__));
-  float __u = ((struct __mm_load1_ps_struct*)__p)->__u;
-  return (__m128){ __u, __u, __u, __u };
-}
-
-#define        _mm_load_ps1(p) _mm_load1_ps(p)
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_load_ps(const float *__p)
-{
-  return *(__m128*)__p;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_loadu_ps(const float *__p)
-{
-  struct __loadu_ps {
-    __m128 __v;
-  } __attribute__((__packed__, __may_alias__));
-  return ((struct __loadu_ps*)__p)->__v;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_loadr_ps(const float *__p)
-{
-  __m128 __a = _mm_load_ps(__p);
-  return __builtin_shufflevector(__a, __a, 3, 2, 1, 0);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_set_ss(float __w)
-{
-  return (__m128){ __w, 0, 0, 0 };
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_set1_ps(float __w)
-{
-  return (__m128){ __w, __w, __w, __w };
-}
-
-// Microsoft specific.
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_set_ps1(float __w)
-{
-    return _mm_set1_ps(__w);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_set_ps(float __z, float __y, float __x, float __w)
-{
-  return (__m128){ __w, __x, __y, __z };
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_setr_ps(float __z, float __y, float __x, float __w)
-{
-  return (__m128){ __z, __y, __x, __w };
-}
-
-static __inline__ __m128 __attribute__((__always_inline__))
-_mm_setzero_ps(void)
-{
-  return (__m128){ 0, 0, 0, 0 };
-}
-
-static __inline__ void __attribute__((__always_inline__))
-_mm_storeh_pi(__m64 *__p, __m128 __a)
-{
-  __builtin_ia32_storehps((__v2si *)__p, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__))
-_mm_storel_pi(__m64 *__p, __m128 __a)
-{
-  __builtin_ia32_storelps((__v2si *)__p, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__))
-_mm_store_ss(float *__p, __m128 __a)
-{
-  struct __mm_store_ss_struct {
-    float __u;
-  } __attribute__((__packed__, __may_alias__));
-  ((struct __mm_store_ss_struct*)__p)->__u = __a[0];
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_storeu_ps(float *__p, __m128 __a)
-{
-  __builtin_ia32_storeups(__p, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_store1_ps(float *__p, __m128 __a)
-{
-  __a = __builtin_shufflevector(__a, __a, 0, 0, 0, 0);
-  _mm_storeu_ps(__p, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_store_ps1(float *__p, __m128 __a)
-{
-    return _mm_store1_ps(__p, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_store_ps(float *__p, __m128 __a)
-{
-  *(__m128 *)__p = __a;
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_storer_ps(float *__p, __m128 __a)
-{
-  __a = __builtin_shufflevector(__a, __a, 3, 2, 1, 0);
-  _mm_store_ps(__p, __a);
-}
-
-#define _MM_HINT_T0 3
-#define _MM_HINT_T1 2
-#define _MM_HINT_T2 1
-#define _MM_HINT_NTA 0
-
-/* FIXME: We have to #define this because "sel" must be a constant integer, and
-   Sema doesn't do any form of constant propagation yet. */
-
-#define _mm_prefetch(a, sel) (__builtin_prefetch((void *)(a), 0, (sel)))
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_stream_pi(__m64 *__p, __m64 __a)
-{
-  __builtin_ia32_movntq(__p, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_stream_ps(float *__p, __m128 __a)
-{
-  __builtin_ia32_movntps(__p, __a);
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_sfence(void)
-{
-  __builtin_ia32_sfence();
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_extract_pi16(__m64 __a, int __n)
-{
-  __v4hi __b = (__v4hi)__a;
-  return (unsigned short)__b[__n & 3];
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_insert_pi16(__m64 __a, int __d, int __n)
-{
-   __v4hi __b = (__v4hi)__a;
-   __b[__n & 3] = __d;
-   return (__m64)__b;
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_max_pi16(__m64 __a, __m64 __b)
-{
-  return (__m64)__builtin_ia32_pmaxsw((__v4hi)__a, (__v4hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_max_pu8(__m64 __a, __m64 __b)
-{
-  return (__m64)__builtin_ia32_pmaxub((__v8qi)__a, (__v8qi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_min_pi16(__m64 __a, __m64 __b)
-{
-  return (__m64)__builtin_ia32_pminsw((__v4hi)__a, (__v4hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_min_pu8(__m64 __a, __m64 __b)
-{
-  return (__m64)__builtin_ia32_pminub((__v8qi)__a, (__v8qi)__b);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_movemask_pi8(__m64 __a)
-{
-  return __builtin_ia32_pmovmskb((__v8qi)__a);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_mulhi_pu16(__m64 __a, __m64 __b)
-{
-  return (__m64)__builtin_ia32_pmulhuw((__v4hi)__a, (__v4hi)__b);
-}
-
-#define _mm_shuffle_pi16(a, n) __extension__ ({ \
-  __m64 __a = (a); \
-  (__m64)__builtin_ia32_pshufw((__v4hi)__a, (n)); })
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_maskmove_si64(__m64 __d, __m64 __n, char *__p)
-{
-  __builtin_ia32_maskmovq((__v8qi)__d, (__v8qi)__n, __p);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_avg_pu8(__m64 __a, __m64 __b)
-{
-  return (__m64)__builtin_ia32_pavgb((__v8qi)__a, (__v8qi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_avg_pu16(__m64 __a, __m64 __b)
-{
-  return (__m64)__builtin_ia32_pavgw((__v4hi)__a, (__v4hi)__b);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_sad_pu8(__m64 __a, __m64 __b)
-{
-  return (__m64)__builtin_ia32_psadbw((__v8qi)__a, (__v8qi)__b);
-}
-
-static __inline__ unsigned int __attribute__((__always_inline__, __nodebug__))
-_mm_getcsr(void)
-{
-  return __builtin_ia32_stmxcsr();
-}
-
-static __inline__ void __attribute__((__always_inline__, __nodebug__))
-_mm_setcsr(unsigned int __i)
-{
-  __builtin_ia32_ldmxcsr(__i);
-}
-
-#define _mm_shuffle_ps(a, b, mask) __extension__ ({ \
-  __m128 __a = (a); \
-  __m128 __b = (b); \
-  (__m128)__builtin_shufflevector((__v4sf)__a, (__v4sf)__b, \
-                                  (mask) & 0x3, ((mask) & 0xc) >> 2, \
-                                  (((mask) & 0x30) >> 4) + 4, \
-                                  (((mask) & 0xc0) >> 6) + 4); })
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_unpackhi_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_shufflevector(__a, __b, 2, 6, 3, 7);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_unpacklo_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_shufflevector(__a, __b, 0, 4, 1, 5);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_move_ss(__m128 __a, __m128 __b)
-{
-  return __builtin_shufflevector(__a, __b, 4, 1, 2, 3);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_movehl_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_shufflevector(__a, __b, 6, 7, 2, 3);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_movelh_ps(__m128 __a, __m128 __b)
-{
-  return __builtin_shufflevector(__a, __b, 0, 1, 4, 5);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpi16_ps(__m64 __a)
-{
-  __m64 __b, __c;
-  __m128 __r;
-
-  __b = _mm_setzero_si64();
-  __b = _mm_cmpgt_pi16(__b, __a);
-  __c = _mm_unpackhi_pi16(__a, __b);
-  __r = _mm_setzero_ps();
-  __r = _mm_cvtpi32_ps(__r, __c);
-  __r = _mm_movelh_ps(__r, __r);
-  __c = _mm_unpacklo_pi16(__a, __b);
-  __r = _mm_cvtpi32_ps(__r, __c);
-
-  return __r;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpu16_ps(__m64 __a)
-{
-  __m64 __b, __c;
-  __m128 __r;
-
-  __b = _mm_setzero_si64();
-  __c = _mm_unpackhi_pi16(__a, __b);
-  __r = _mm_setzero_ps();
-  __r = _mm_cvtpi32_ps(__r, __c);
-  __r = _mm_movelh_ps(__r, __r);
-  __c = _mm_unpacklo_pi16(__a, __b);
-  __r = _mm_cvtpi32_ps(__r, __c);
-
-  return __r;
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpi8_ps(__m64 __a)
-{
-  __m64 __b;
-  
-  __b = _mm_setzero_si64();
-  __b = _mm_cmpgt_pi8(__b, __a);
-  __b = _mm_unpacklo_pi8(__a, __b);
-
-  return _mm_cvtpi16_ps(__b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpu8_ps(__m64 __a)
-{
-  __m64 __b;
-  
-  __b = _mm_setzero_si64();
-  __b = _mm_unpacklo_pi8(__a, __b);
-
-  return _mm_cvtpi16_ps(__b);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtpi32x2_ps(__m64 __a, __m64 __b)
-{
-  __m128 __c;
-  
-  __c = _mm_setzero_ps();
-  __c = _mm_cvtpi32_ps(__c, __b);
-  __c = _mm_movelh_ps(__c, __c);
-
-  return _mm_cvtpi32_ps(__c, __a);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtps_pi16(__m128 __a)
-{
-  __m64 __b, __c;
-  
-  __b = _mm_cvtps_pi32(__a);
-  __a = _mm_movehl_ps(__a, __a);
-  __c = _mm_cvtps_pi32(__a);
-  
-  return _mm_packs_pi32(__b, __c);
-}
-
-static __inline__ __m64 __attribute__((__always_inline__, __nodebug__))
-_mm_cvtps_pi8(__m128 __a)
-{
-  __m64 __b, __c;
-  
-  __b = _mm_cvtps_pi16(__a);
-  __c = _mm_setzero_si64();
-  
-  return _mm_packs_pi16(__b, __c);
-}
-
-static __inline__ int __attribute__((__always_inline__, __nodebug__))
-_mm_movemask_ps(__m128 __a)
-{
-  return __builtin_ia32_movmskps(__a);
-}
-
-#define _MM_SHUFFLE(z, y, x, w) (((z) << 6) | ((y) << 4) | ((x) << 2) | (w))
-
-#define _MM_EXCEPT_INVALID    (0x0001)
-#define _MM_EXCEPT_DENORM     (0x0002)
-#define _MM_EXCEPT_DIV_ZERO   (0x0004)
-#define _MM_EXCEPT_OVERFLOW   (0x0008)
-#define _MM_EXCEPT_UNDERFLOW  (0x0010)
-#define _MM_EXCEPT_INEXACT    (0x0020)
-#define _MM_EXCEPT_MASK       (0x003f)
-
-#define _MM_MASK_INVALID      (0x0080)
-#define _MM_MASK_DENORM       (0x0100)
-#define _MM_MASK_DIV_ZERO     (0x0200)
-#define _MM_MASK_OVERFLOW     (0x0400)
-#define _MM_MASK_UNDERFLOW    (0x0800)
-#define _MM_MASK_INEXACT      (0x1000)
-#define _MM_MASK_MASK         (0x1f80)
-
-#define _MM_ROUND_NEAREST     (0x0000)
-#define _MM_ROUND_DOWN        (0x2000)
-#define _MM_ROUND_UP          (0x4000)
-#define _MM_ROUND_TOWARD_ZERO (0x6000)
-#define _MM_ROUND_MASK        (0x6000)
-
-#define _MM_FLUSH_ZERO_MASK   (0x8000)
-#define _MM_FLUSH_ZERO_ON     (0x8000)
-#define _MM_FLUSH_ZERO_OFF    (0x0000)
-
-#define _MM_GET_EXCEPTION_MASK() (_mm_getcsr() & _MM_MASK_MASK)
-#define _MM_GET_EXCEPTION_STATE() (_mm_getcsr() & _MM_EXCEPT_MASK)
-#define _MM_GET_FLUSH_ZERO_MODE() (_mm_getcsr() & _MM_FLUSH_ZERO_MASK)
-#define _MM_GET_ROUNDING_MODE() (_mm_getcsr() & _MM_ROUND_MASK)
-
-#define _MM_SET_EXCEPTION_MASK(x) (_mm_setcsr((_mm_getcsr() & ~_MM_MASK_MASK) | (x)))
-#define _MM_SET_EXCEPTION_STATE(x) (_mm_setcsr((_mm_getcsr() & ~_MM_EXCEPT_MASK) | (x)))
-#define _MM_SET_FLUSH_ZERO_MODE(x) (_mm_setcsr((_mm_getcsr() & ~_MM_FLUSH_ZERO_MASK) | (x)))
-#define _MM_SET_ROUNDING_MODE(x) (_mm_setcsr((_mm_getcsr() & ~_MM_ROUND_MASK) | (x)))
-
-#define _MM_TRANSPOSE4_PS(row0, row1, row2, row3) \
-do { \
-  __m128 tmp3, tmp2, tmp1, tmp0; \
-  tmp0 = _mm_unpacklo_ps((row0), (row1)); \
-  tmp2 = _mm_unpacklo_ps((row2), (row3)); \
-  tmp1 = _mm_unpackhi_ps((row0), (row1)); \
-  tmp3 = _mm_unpackhi_ps((row2), (row3)); \
-  (row0) = _mm_movelh_ps(tmp0, tmp2); \
-  (row1) = _mm_movehl_ps(tmp2, tmp0); \
-  (row2) = _mm_movelh_ps(tmp1, tmp3); \
-  (row3) = _mm_movehl_ps(tmp3, tmp1); \
-} while (0)
-
-/* Aliases for compatibility. */
-#define _m_pextrw _mm_extract_pi16
-#define _m_pinsrw _mm_insert_pi16
-#define _m_pmaxsw _mm_max_pi16
-#define _m_pmaxub _mm_max_pu8
-#define _m_pminsw _mm_min_pi16
-#define _m_pminub _mm_min_pu8
-#define _m_pmovmskb _mm_movemask_pi8
-#define _m_pmulhuw _mm_mulhi_pu16
-#define _m_pshufw _mm_shuffle_pi16
-#define _m_maskmovq _mm_maskmove_si64
-#define _m_pavgb _mm_avg_pu8
-#define _m_pavgw _mm_avg_pu16
-#define _m_psadbw _mm_sad_pu8
-#define _m_ _mm_
-#define _m_ _mm_
-
-/* Ugly hack for backwards-compatibility (compatible with gcc) */
-#ifdef __SSE2__
-#include <emmintrin.h>
-#endif
-
-#endif /* __SSE__ */
-
-#endif /* __XMMINTRIN_H */
diff --git a/include.new/clang/3.4.1/xopintrin.h b/include.new/clang/3.4.1/xopintrin.h
deleted file mode 100644
index cc94ca0..0000000
--- a/include.new/clang/3.4.1/xopintrin.h
+++ /dev/null
@@ -1,804 +0,0 @@
-/*===---- xopintrin.h - XOP intrinsics -------------------------------------===
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- *===-----------------------------------------------------------------------===
- */
-
-#ifndef __X86INTRIN_H
-#error "Never use <xopintrin.h> directly; include <x86intrin.h> instead."
-#endif
-
-#ifndef __XOPINTRIN_H
-#define __XOPINTRIN_H
-
-#ifndef __XOP__
-# error "XOP instruction set is not enabled"
-#else
-
-#include <fma4intrin.h>
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maccs_epi16(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacssww((__v8hi)__A, (__v8hi)__B, (__v8hi)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_macc_epi16(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacsww((__v8hi)__A, (__v8hi)__B, (__v8hi)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maccsd_epi16(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacsswd((__v8hi)__A, (__v8hi)__B, (__v4si)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maccd_epi16(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacswd((__v8hi)__A, (__v8hi)__B, (__v4si)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maccs_epi32(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacssdd((__v4si)__A, (__v4si)__B, (__v4si)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_macc_epi32(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacsdd((__v4si)__A, (__v4si)__B, (__v4si)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maccslo_epi32(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacssdql((__v4si)__A, (__v4si)__B, (__v2di)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_macclo_epi32(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacsdql((__v4si)__A, (__v4si)__B, (__v2di)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maccshi_epi32(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacssdqh((__v4si)__A, (__v4si)__B, (__v2di)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_macchi_epi32(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmacsdqh((__v4si)__A, (__v4si)__B, (__v2di)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maddsd_epi16(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmadcsswd((__v8hi)__A, (__v8hi)__B, (__v4si)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_maddd_epi16(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpmadcswd((__v8hi)__A, (__v8hi)__B, (__v4si)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddw_epi8(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphaddbw((__v16qi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddd_epi8(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphaddbd((__v16qi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddq_epi8(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphaddbq((__v16qi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddd_epi16(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphaddwd((__v8hi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddq_epi16(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphaddwq((__v8hi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddq_epi32(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphadddq((__v4si)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddw_epu8(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphaddubw((__v16qi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddd_epu8(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphaddubd((__v16qi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddq_epu8(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphaddubq((__v16qi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddd_epu16(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphadduwd((__v8hi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddq_epu16(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphadduwq((__v8hi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_haddq_epu32(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphaddudq((__v4si)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_hsubw_epi8(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphsubbw((__v16qi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_hsubd_epi16(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphsubwd((__v8hi)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_hsubq_epi32(__m128i __A)
-{
-  return (__m128i)__builtin_ia32_vphsubdq((__v4si)__A);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_cmov_si128(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpcmov(__A, __B, __C);
-}
-
-static __inline__ __m256i __attribute__((__always_inline__, __nodebug__))
-_mm256_cmov_si256(__m256i __A, __m256i __B, __m256i __C)
-{
-  return (__m256i)__builtin_ia32_vpcmov_256(__A, __B, __C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_perm_epi8(__m128i __A, __m128i __B, __m128i __C)
-{
-  return (__m128i)__builtin_ia32_vpperm((__v16qi)__A, (__v16qi)__B, (__v16qi)__C);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_rot_epi8(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vprotb((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_rot_epi16(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vprotw((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_rot_epi32(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vprotd((__v4si)__A, (__v4si)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_rot_epi64(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vprotq((__v2di)__A, (__v2di)__B);
-}
-
-#define _mm_roti_epi8(A, N) __extension__ ({ \
-  __m128i __A = (A); \
-  (__m128i)__builtin_ia32_vprotbi((__v16qi)__A, (N)); })
-
-#define _mm_roti_epi16(A, N) __extension__ ({ \
-  __m128i __A = (A); \
-  (__m128i)__builtin_ia32_vprotwi((__v8hi)__A, (N)); })
-
-#define _mm_roti_epi32(A, N) __extension__ ({ \
-  __m128i __A = (A); \
-  (__m128i)__builtin_ia32_vprotdi((__v4si)__A, (N)); })
-
-#define _mm_roti_epi64(A, N) __extension__ ({ \
-  __m128i __A = (A); \
-  (__m128i)__builtin_ia32_vprotqi((__v2di)__A, (N)); })
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_shl_epi8(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vpshlb((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_shl_epi16(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vpshlw((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_shl_epi32(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vpshld((__v4si)__A, (__v4si)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_shl_epi64(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vpshlq((__v2di)__A, (__v2di)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha_epi8(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vpshab((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha_epi16(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vpshaw((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha_epi32(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vpshad((__v4si)__A, (__v4si)__B);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_sha_epi64(__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_vpshaq((__v2di)__A, (__v2di)__B);
-}
-
-#define _mm_com_epu8(A, B, N) __extension__ ({ \
-  __m128i __A = (A); \
-  __m128i __B = (B); \
-  (__m128i)__builtin_ia32_vpcomub((__v16qi)__A, (__v16qi)__B, (N)); })
-
-#define _mm_com_epu16(A, B, N) __extension__ ({ \
-  __m128i __A = (A); \
-  __m128i __B = (B); \
-  (__m128i)__builtin_ia32_vpcomuw((__v8hi)__A, (__v8hi)__B, (N)); })
-
-#define _mm_com_epu32(A, B, N) __extension__ ({ \
-  __m128i __A = (A); \
-  __m128i __B = (B); \
-  (__m128i)__builtin_ia32_vpcomud((__v4si)__A, (__v4si)__B, (N)); })
-
-#define _mm_com_epu64(A, B, N) __extension__ ({ \
-  __m128i __A = (A); \
-  __m128i __B = (B); \
-  (__m128i)__builtin_ia32_vpcomuq((__v2di)__A, (__v2di)__B, (N)); })
-
-#define _mm_com_epi8(A, B, N) __extension__ ({ \
-  __m128i __A = (A); \
-  __m128i __B = (B); \
-  (__m128i)__builtin_ia32_vpcomb((__v16qi)__A, (__v16qi)__B, (N)); })
-
-#define _mm_com_epi16(A, B, N) __extension__ ({ \
-  __m128i __A = (A); \
-  __m128i __B = (B); \
-  (__m128i)__builtin_ia32_vpcomw((__v8hi)__A, (__v8hi)__B, (N)); })
-
-#define _mm_com_epi32(A, B, N) __extension__ ({ \
-  __m128i __A = (A); \
-  __m128i __B = (B); \
-  (__m128i)__builtin_ia32_vpcomd((__v4si)__A, (__v4si)__B, (N)); })
-
-#define _mm_com_epi64(A, B, N) __extension__ ({ \
-  __m128i __A = (A); \
-  __m128i __B = (B); \
-  (__m128i)__builtin_ia32_vpcomq((__v2di)__A, (__v2di)__B, (N)); })
-
-#define _MM_PCOMCTRL_LT    0
-#define _MM_PCOMCTRL_LE    1
-#define _MM_PCOMCTRL_GT    2
-#define _MM_PCOMCTRL_GE    3
-#define _MM_PCOMCTRL_EQ    4
-#define _MM_PCOMCTRL_NEQ   5
-#define _MM_PCOMCTRL_FALSE 6
-#define _MM_PCOMCTRL_TRUE  7
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comlt_epu8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu8(__A, __B, _MM_PCOMCTRL_LT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comle_epu8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu8(__A, __B, _MM_PCOMCTRL_LE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comgt_epu8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu8(__A, __B, _MM_PCOMCTRL_GT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comge_epu8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu8(__A, __B, _MM_PCOMCTRL_GE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comeq_epu8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu8(__A, __B, _MM_PCOMCTRL_EQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comneq_epu8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu8(__A, __B, _MM_PCOMCTRL_NEQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comfalse_epu8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu8(__A, __B, _MM_PCOMCTRL_FALSE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comtrue_epu8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu8(__A, __B, _MM_PCOMCTRL_TRUE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comlt_epu16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu16(__A, __B, _MM_PCOMCTRL_LT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comle_epu16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu16(__A, __B, _MM_PCOMCTRL_LE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comgt_epu16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu16(__A, __B, _MM_PCOMCTRL_GT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comge_epu16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu16(__A, __B, _MM_PCOMCTRL_GE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comeq_epu16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu16(__A, __B, _MM_PCOMCTRL_EQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comneq_epu16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu16(__A, __B, _MM_PCOMCTRL_NEQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comfalse_epu16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu16(__A, __B, _MM_PCOMCTRL_FALSE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comtrue_epu16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu16(__A, __B, _MM_PCOMCTRL_TRUE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comlt_epu32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu32(__A, __B, _MM_PCOMCTRL_LT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comle_epu32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu32(__A, __B, _MM_PCOMCTRL_LE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comgt_epu32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu32(__A, __B, _MM_PCOMCTRL_GT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comge_epu32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu32(__A, __B, _MM_PCOMCTRL_GE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comeq_epu32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu32(__A, __B, _MM_PCOMCTRL_EQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comneq_epu32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu32(__A, __B, _MM_PCOMCTRL_NEQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comfalse_epu32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu32(__A, __B, _MM_PCOMCTRL_FALSE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comtrue_epu32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu32(__A, __B, _MM_PCOMCTRL_TRUE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comlt_epu64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu64(__A, __B, _MM_PCOMCTRL_LT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comle_epu64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu64(__A, __B, _MM_PCOMCTRL_LE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comgt_epu64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu64(__A, __B, _MM_PCOMCTRL_GT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comge_epu64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu64(__A, __B, _MM_PCOMCTRL_GE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comeq_epu64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu64(__A, __B, _MM_PCOMCTRL_EQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comneq_epu64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu64(__A, __B, _MM_PCOMCTRL_NEQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comfalse_epu64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu64(__A, __B, _MM_PCOMCTRL_FALSE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comtrue_epu64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epu64(__A, __B, _MM_PCOMCTRL_TRUE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comlt_epi8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi8(__A, __B, _MM_PCOMCTRL_LT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comle_epi8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi8(__A, __B, _MM_PCOMCTRL_LE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comgt_epi8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi8(__A, __B, _MM_PCOMCTRL_GT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comge_epi8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi8(__A, __B, _MM_PCOMCTRL_GE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comeq_epi8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi8(__A, __B, _MM_PCOMCTRL_EQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comneq_epi8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi8(__A, __B, _MM_PCOMCTRL_NEQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comfalse_epi8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi8(__A, __B, _MM_PCOMCTRL_FALSE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comtrue_epi8(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi8(__A, __B, _MM_PCOMCTRL_TRUE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comlt_epi16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi16(__A, __B, _MM_PCOMCTRL_LT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comle_epi16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi16(__A, __B, _MM_PCOMCTRL_LE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comgt_epi16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi16(__A, __B, _MM_PCOMCTRL_GT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comge_epi16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi16(__A, __B, _MM_PCOMCTRL_GE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comeq_epi16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi16(__A, __B, _MM_PCOMCTRL_EQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comneq_epi16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi16(__A, __B, _MM_PCOMCTRL_NEQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comfalse_epi16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi16(__A, __B, _MM_PCOMCTRL_FALSE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comtrue_epi16(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi16(__A, __B, _MM_PCOMCTRL_TRUE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comlt_epi32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi32(__A, __B, _MM_PCOMCTRL_LT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comle_epi32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi32(__A, __B, _MM_PCOMCTRL_LE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comgt_epi32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi32(__A, __B, _MM_PCOMCTRL_GT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comge_epi32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi32(__A, __B, _MM_PCOMCTRL_GE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comeq_epi32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi32(__A, __B, _MM_PCOMCTRL_EQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comneq_epi32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi32(__A, __B, _MM_PCOMCTRL_NEQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comfalse_epi32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi32(__A, __B, _MM_PCOMCTRL_FALSE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comtrue_epi32(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi32(__A, __B, _MM_PCOMCTRL_TRUE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comlt_epi64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi64(__A, __B, _MM_PCOMCTRL_LT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comle_epi64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi64(__A, __B, _MM_PCOMCTRL_LE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comgt_epi64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi64(__A, __B, _MM_PCOMCTRL_GT);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comge_epi64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi64(__A, __B, _MM_PCOMCTRL_GE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comeq_epi64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi64(__A, __B, _MM_PCOMCTRL_EQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comneq_epi64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi64(__A, __B, _MM_PCOMCTRL_NEQ);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comfalse_epi64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi64(__A, __B, _MM_PCOMCTRL_FALSE);
-}
-
-static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_comtrue_epi64(__m128i __A, __m128i __B)
-{
-  return _mm_com_epi64(__A, __B, _MM_PCOMCTRL_TRUE);
-}
-
-#define _mm_permute2_pd(X, Y, C, I) __extension__ ({ \
-  __m128d __X = (X); \
-  __m128d __Y = (Y); \
-  __m128i __C = (C); \
-  (__m128d)__builtin_ia32_vpermil2pd((__v2df)__X, (__v2df)__Y, \
-                                     (__v2di)__C, (I)); })
-
-#define _mm256_permute2_pd(X, Y, C, I) __extension__ ({ \
-  __m256d __X = (X); \
-  __m256d __Y = (Y); \
-  __m256i __C = (C); \
-  (__m256d)__builtin_ia32_vpermil2pd256((__v4df)__X, (__v4df)__Y, \
-                                        (__v4di)__C, (I)); })
-
-#define _mm_permute2_ps(X, Y, C, I) __extension__ ({ \
-  __m128 __X = (X); \
-  __m128 __Y = (Y); \
-  __m128i __C = (C); \
-  (__m128)__builtin_ia32_vpermil2ps((__v4sf)__X, (__v4sf)__Y, \
-                                    (__v4si)__C, (I)); })
-
-#define _mm256_permute2_ps(X, Y, C, I) __extension__ ({ \
-  __m256 __X = (X); \
-  __m256 __Y = (Y); \
-  __m256i __C = (C); \
-  (__m256)__builtin_ia32_vpermil2ps256((__v8sf)__X, (__v8sf)__Y, \
-                                       (__v8si)__C, (I)); })
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_frcz_ss(__m128 __A)
-{
-  return (__m128)__builtin_ia32_vfrczss((__v4sf)__A);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_frcz_sd(__m128d __A)
-{
-  return (__m128d)__builtin_ia32_vfrczsd((__v2df)__A);
-}
-
-static __inline__ __m128 __attribute__((__always_inline__, __nodebug__))
-_mm_frcz_ps(__m128 __A)
-{
-  return (__m128)__builtin_ia32_vfrczps((__v4sf)__A);
-}
-
-static __inline__ __m128d __attribute__((__always_inline__, __nodebug__))
-_mm_frcz_pd(__m128d __A)
-{
-  return (__m128d)__builtin_ia32_vfrczpd((__v2df)__A);
-}
-
-static __inline__ __m256 __attribute__((__always_inline__, __nodebug__))
-_mm256_frcz_ps(__m256 __A)
-{
-  return (__m256)__builtin_ia32_vfrczps256((__v8sf)__A);
-}
-
-static __inline__ __m256d __attribute__((__always_inline__, __nodebug__))
-_mm256_frcz_pd(__m256d __A)
-{
-  return (__m256d)__builtin_ia32_vfrczpd256((__v4df)__A);
-}
-
-#endif /* __XOP__ */
-
-#endif /* __XOPINTRIN_H */
diff --git a/include.new/cms_asn1.h b/include.new/cms_asn1.h
deleted file mode 100644
index 28415d2..0000000
--- a/include.new/cms_asn1.h
+++ /dev/null
@@ -1,717 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/cms.asn1 */
-/* Do not edit */
-
-#ifndef __cms_asn1_h__
-#define __cms_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <rfc2459_asn1.h>
-#include <heim_asn1.h>
-/* OBJECT IDENTIFIER id-pkcs7 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs7(7) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs7;
-#define ASN1_OID_ID_PKCS7 (&asn1_oid_id_pkcs7)
-
-/* OBJECT IDENTIFIER id-pkcs7-data ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_data;
-#define ASN1_OID_ID_PKCS7_DATA (&asn1_oid_id_pkcs7_data)
-
-/* OBJECT IDENTIFIER id-pkcs7-signedData ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_signedData;
-#define ASN1_OID_ID_PKCS7_SIGNEDDATA (&asn1_oid_id_pkcs7_signedData)
-
-/* OBJECT IDENTIFIER id-pkcs7-envelopedData ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_envelopedData;
-#define ASN1_OID_ID_PKCS7_ENVELOPEDDATA (&asn1_oid_id_pkcs7_envelopedData)
-
-/* OBJECT IDENTIFIER id-pkcs7-signedAndEnvelopedData ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_signedAndEnvelopedData;
-#define ASN1_OID_ID_PKCS7_SIGNEDANDENVELOPEDDATA (&asn1_oid_id_pkcs7_signedAndEnvelopedData)
-
-/* OBJECT IDENTIFIER id-pkcs7-digestedData ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_digestedData;
-#define ASN1_OID_ID_PKCS7_DIGESTEDDATA (&asn1_oid_id_pkcs7_digestedData)
-
-/* OBJECT IDENTIFIER id-pkcs7-encryptedData ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs7(7) label-less(6) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs7_encryptedData;
-#define ASN1_OID_ID_PKCS7_ENCRYPTEDDATA (&asn1_oid_id_pkcs7_encryptedData)
-
-/*
-CMSVersion ::= INTEGER {
-  CMSVersion_v0(0),
-  CMSVersion_v1(1),
-  CMSVersion_v2(2),
-  CMSVersion_v3(3),
-  CMSVersion_v4(4)
-}
-*/
-
-typedef enum CMSVersion {
-  CMSVersion_v0 = 0,
-  CMSVersion_v1 = 1,
-  CMSVersion_v2 = 2,
-  CMSVersion_v3 = 3,
-  CMSVersion_v4 = 4
-} CMSVersion;
-
-ASN1EXP int    ASN1CALL decode_CMSVersion(const unsigned char *, size_t, CMSVersion *, size_t *);
-ASN1EXP int    ASN1CALL encode_CMSVersion(unsigned char *, size_t, const CMSVersion *, size_t *);
-ASN1EXP size_t ASN1CALL length_CMSVersion(const CMSVersion *);
-ASN1EXP int    ASN1CALL copy_CMSVersion  (const CMSVersion *, CMSVersion *);
-ASN1EXP void   ASN1CALL free_CMSVersion  (CMSVersion *);
-
-
-/*
-DigestAlgorithmIdentifier ::= AlgorithmIdentifier
-*/
-
-typedef AlgorithmIdentifier DigestAlgorithmIdentifier;
-
-ASN1EXP int    ASN1CALL decode_DigestAlgorithmIdentifier(const unsigned char *, size_t, DigestAlgorithmIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestAlgorithmIdentifier(unsigned char *, size_t, const DigestAlgorithmIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestAlgorithmIdentifier(const DigestAlgorithmIdentifier *);
-ASN1EXP int    ASN1CALL copy_DigestAlgorithmIdentifier  (const DigestAlgorithmIdentifier *, DigestAlgorithmIdentifier *);
-ASN1EXP void   ASN1CALL free_DigestAlgorithmIdentifier  (DigestAlgorithmIdentifier *);
-
-
-/*
-DigestAlgorithmIdentifiers ::= SET OF DigestAlgorithmIdentifier
-*/
-
-typedef struct DigestAlgorithmIdentifiers {
-  unsigned int len;
-  DigestAlgorithmIdentifier *val;
-} DigestAlgorithmIdentifiers;
-
-ASN1EXP int   ASN1CALL add_DigestAlgorithmIdentifiers  (DigestAlgorithmIdentifiers *, const DigestAlgorithmIdentifier *);
-ASN1EXP int   ASN1CALL remove_DigestAlgorithmIdentifiers  (DigestAlgorithmIdentifiers *, unsigned int);
-ASN1EXP int    ASN1CALL decode_DigestAlgorithmIdentifiers(const unsigned char *, size_t, DigestAlgorithmIdentifiers *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestAlgorithmIdentifiers(unsigned char *, size_t, const DigestAlgorithmIdentifiers *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestAlgorithmIdentifiers(const DigestAlgorithmIdentifiers *);
-ASN1EXP int    ASN1CALL copy_DigestAlgorithmIdentifiers  (const DigestAlgorithmIdentifiers *, DigestAlgorithmIdentifiers *);
-ASN1EXP void   ASN1CALL free_DigestAlgorithmIdentifiers  (DigestAlgorithmIdentifiers *);
-
-
-/*
-SignatureAlgorithmIdentifier ::= AlgorithmIdentifier
-*/
-
-typedef AlgorithmIdentifier SignatureAlgorithmIdentifier;
-
-ASN1EXP int    ASN1CALL decode_SignatureAlgorithmIdentifier(const unsigned char *, size_t, SignatureAlgorithmIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_SignatureAlgorithmIdentifier(unsigned char *, size_t, const SignatureAlgorithmIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_SignatureAlgorithmIdentifier(const SignatureAlgorithmIdentifier *);
-ASN1EXP int    ASN1CALL copy_SignatureAlgorithmIdentifier  (const SignatureAlgorithmIdentifier *, SignatureAlgorithmIdentifier *);
-ASN1EXP void   ASN1CALL free_SignatureAlgorithmIdentifier  (SignatureAlgorithmIdentifier *);
-
-
-/*
-ContentType ::= OBJECT IDENTIFIER
-*/
-
-typedef heim_oid ContentType;
-
-ASN1EXP int    ASN1CALL decode_ContentType(const unsigned char *, size_t, ContentType *, size_t *);
-ASN1EXP int    ASN1CALL encode_ContentType(unsigned char *, size_t, const ContentType *, size_t *);
-ASN1EXP size_t ASN1CALL length_ContentType(const ContentType *);
-ASN1EXP int    ASN1CALL copy_ContentType  (const ContentType *, ContentType *);
-ASN1EXP void   ASN1CALL free_ContentType  (ContentType *);
-
-
-/*
-MessageDigest ::= OCTET STRING
-*/
-
-typedef heim_octet_string MessageDigest;
-
-ASN1EXP int    ASN1CALL decode_MessageDigest(const unsigned char *, size_t, MessageDigest *, size_t *);
-ASN1EXP int    ASN1CALL encode_MessageDigest(unsigned char *, size_t, const MessageDigest *, size_t *);
-ASN1EXP size_t ASN1CALL length_MessageDigest(const MessageDigest *);
-ASN1EXP int    ASN1CALL copy_MessageDigest  (const MessageDigest *, MessageDigest *);
-ASN1EXP void   ASN1CALL free_MessageDigest  (MessageDigest *);
-
-
-/*
-ContentInfo ::= SEQUENCE {
-  contentType     ContentType,
-  content         [0] heim_any OPTIONAL,
-}
-*/
-
-typedef struct ContentInfo {
-  ContentType contentType;
-  heim_any *content;
-} ContentInfo;
-
-ASN1EXP int    ASN1CALL decode_ContentInfo(const unsigned char *, size_t, ContentInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_ContentInfo(unsigned char *, size_t, const ContentInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_ContentInfo(const ContentInfo *);
-ASN1EXP int    ASN1CALL copy_ContentInfo  (const ContentInfo *, ContentInfo *);
-ASN1EXP void   ASN1CALL free_ContentInfo  (ContentInfo *);
-
-
-/*
-EncapsulatedContentInfo ::= SEQUENCE {
-  eContentType    ContentType,
-  eContent        [0] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct EncapsulatedContentInfo {
-  ContentType eContentType;
-  heim_octet_string *eContent;
-} EncapsulatedContentInfo;
-
-ASN1EXP int    ASN1CALL decode_EncapsulatedContentInfo(const unsigned char *, size_t, EncapsulatedContentInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncapsulatedContentInfo(unsigned char *, size_t, const EncapsulatedContentInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncapsulatedContentInfo(const EncapsulatedContentInfo *);
-ASN1EXP int    ASN1CALL copy_EncapsulatedContentInfo  (const EncapsulatedContentInfo *, EncapsulatedContentInfo *);
-ASN1EXP void   ASN1CALL free_EncapsulatedContentInfo  (EncapsulatedContentInfo *);
-
-
-/*
-CertificateSet ::= SET OF heim_any
-*/
-
-typedef struct CertificateSet {
-  unsigned int len;
-  heim_any *val;
-} CertificateSet;
-
-ASN1EXP int    ASN1CALL decode_CertificateSet(const unsigned char *, size_t, CertificateSet *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertificateSet(unsigned char *, size_t, const CertificateSet *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertificateSet(const CertificateSet *);
-ASN1EXP int    ASN1CALL copy_CertificateSet  (const CertificateSet *, CertificateSet *);
-ASN1EXP void   ASN1CALL free_CertificateSet  (CertificateSet *);
-
-
-/*
-CertificateList ::= Certificate
-*/
-
-typedef Certificate CertificateList;
-
-ASN1EXP int    ASN1CALL decode_CertificateList(const unsigned char *, size_t, CertificateList *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertificateList(unsigned char *, size_t, const CertificateList *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertificateList(const CertificateList *);
-ASN1EXP int    ASN1CALL copy_CertificateList  (const CertificateList *, CertificateList *);
-ASN1EXP void   ASN1CALL free_CertificateList  (CertificateList *);
-
-
-/*
-CertificateRevocationLists ::= SET OF CertificateList
-*/
-
-typedef struct CertificateRevocationLists {
-  unsigned int len;
-  CertificateList *val;
-} CertificateRevocationLists;
-
-ASN1EXP int    ASN1CALL decode_CertificateRevocationLists(const unsigned char *, size_t, CertificateRevocationLists *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertificateRevocationLists(unsigned char *, size_t, const CertificateRevocationLists *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertificateRevocationLists(const CertificateRevocationLists *);
-ASN1EXP int    ASN1CALL copy_CertificateRevocationLists  (const CertificateRevocationLists *, CertificateRevocationLists *);
-ASN1EXP void   ASN1CALL free_CertificateRevocationLists  (CertificateRevocationLists *);
-
-
-/*
-IssuerAndSerialNumber ::= SEQUENCE {
-  issuer          Name,
-  serialNumber    CertificateSerialNumber,
-}
-*/
-
-typedef struct IssuerAndSerialNumber {
-  Name issuer;
-  CertificateSerialNumber serialNumber;
-} IssuerAndSerialNumber;
-
-ASN1EXP int    ASN1CALL decode_IssuerAndSerialNumber(const unsigned char *, size_t, IssuerAndSerialNumber *, size_t *);
-ASN1EXP int    ASN1CALL encode_IssuerAndSerialNumber(unsigned char *, size_t, const IssuerAndSerialNumber *, size_t *);
-ASN1EXP size_t ASN1CALL length_IssuerAndSerialNumber(const IssuerAndSerialNumber *);
-ASN1EXP int    ASN1CALL copy_IssuerAndSerialNumber  (const IssuerAndSerialNumber *, IssuerAndSerialNumber *);
-ASN1EXP void   ASN1CALL free_IssuerAndSerialNumber  (IssuerAndSerialNumber *);
-
-
-/*
-CMSIdentifier ::= CHOICE {
-  issuerAndSerialNumber   IssuerAndSerialNumber,
-  subjectKeyIdentifier    [0] SubjectKeyIdentifier,
-}
-*/
-
-typedef struct CMSIdentifier {
-  enum {
-    choice_CMSIdentifier_issuerAndSerialNumber = 1,
-    choice_CMSIdentifier_subjectKeyIdentifier
-  } element;
-  union {
-    IssuerAndSerialNumber issuerAndSerialNumber;
-    SubjectKeyIdentifier subjectKeyIdentifier;
-  } u;
-} CMSIdentifier;
-
-ASN1EXP int    ASN1CALL decode_CMSIdentifier(const unsigned char *, size_t, CMSIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_CMSIdentifier(unsigned char *, size_t, const CMSIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_CMSIdentifier(const CMSIdentifier *);
-ASN1EXP int    ASN1CALL copy_CMSIdentifier  (const CMSIdentifier *, CMSIdentifier *);
-ASN1EXP void   ASN1CALL free_CMSIdentifier  (CMSIdentifier *);
-
-
-/*
-SignerIdentifier ::= CMSIdentifier
-*/
-
-typedef CMSIdentifier SignerIdentifier;
-
-ASN1EXP int    ASN1CALL decode_SignerIdentifier(const unsigned char *, size_t, SignerIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_SignerIdentifier(unsigned char *, size_t, const SignerIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_SignerIdentifier(const SignerIdentifier *);
-ASN1EXP int    ASN1CALL copy_SignerIdentifier  (const SignerIdentifier *, SignerIdentifier *);
-ASN1EXP void   ASN1CALL free_SignerIdentifier  (SignerIdentifier *);
-
-
-/*
-RecipientIdentifier ::= CMSIdentifier
-*/
-
-typedef CMSIdentifier RecipientIdentifier;
-
-ASN1EXP int    ASN1CALL decode_RecipientIdentifier(const unsigned char *, size_t, RecipientIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_RecipientIdentifier(unsigned char *, size_t, const RecipientIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_RecipientIdentifier(const RecipientIdentifier *);
-ASN1EXP int    ASN1CALL copy_RecipientIdentifier  (const RecipientIdentifier *, RecipientIdentifier *);
-ASN1EXP void   ASN1CALL free_RecipientIdentifier  (RecipientIdentifier *);
-
-
-/*
-CMSAttributes ::= SET OF Attribute
-*/
-
-typedef struct CMSAttributes {
-  unsigned int len;
-  Attribute *val;
-} CMSAttributes;
-
-ASN1EXP int    ASN1CALL decode_CMSAttributes(const unsigned char *, size_t, CMSAttributes *, size_t *);
-ASN1EXP int    ASN1CALL encode_CMSAttributes(unsigned char *, size_t, const CMSAttributes *, size_t *);
-ASN1EXP size_t ASN1CALL length_CMSAttributes(const CMSAttributes *);
-ASN1EXP int    ASN1CALL copy_CMSAttributes  (const CMSAttributes *, CMSAttributes *);
-ASN1EXP void   ASN1CALL free_CMSAttributes  (CMSAttributes *);
-
-
-/*
-SignatureValue ::= OCTET STRING
-*/
-
-typedef heim_octet_string SignatureValue;
-
-ASN1EXP int    ASN1CALL decode_SignatureValue(const unsigned char *, size_t, SignatureValue *, size_t *);
-ASN1EXP int    ASN1CALL encode_SignatureValue(unsigned char *, size_t, const SignatureValue *, size_t *);
-ASN1EXP size_t ASN1CALL length_SignatureValue(const SignatureValue *);
-ASN1EXP int    ASN1CALL copy_SignatureValue  (const SignatureValue *, SignatureValue *);
-ASN1EXP void   ASN1CALL free_SignatureValue  (SignatureValue *);
-
-
-/*
-SignerInfo ::= SEQUENCE {
-  version              CMSVersion,
-  sid                  SignerIdentifier,
-  digestAlgorithm      DigestAlgorithmIdentifier,
-  signedAttrs          [0] IMPLICIT SET OF Attribute OPTIONAL,
-  signatureAlgorithm   SignatureAlgorithmIdentifier,
-  signature            SignatureValue,
-  unsignedAttrs        [1] IMPLICIT SET OF Attribute OPTIONAL,
-}
-*/
-
-typedef struct SignerInfo {
-  CMSVersion version;
-  SignerIdentifier sid;
-  DigestAlgorithmIdentifier digestAlgorithm;
-  struct SignerInfo_signedAttrs {
-    unsigned int len;
-    Attribute *val;
-  } *signedAttrs;
-  SignatureAlgorithmIdentifier signatureAlgorithm;
-  SignatureValue signature;
-  struct SignerInfo_unsignedAttrs {
-    unsigned int len;
-    Attribute *val;
-  } *unsignedAttrs;
-} SignerInfo;
-
-ASN1EXP int    ASN1CALL decode_SignerInfo(const unsigned char *, size_t, SignerInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_SignerInfo(unsigned char *, size_t, const SignerInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_SignerInfo(const SignerInfo *);
-ASN1EXP int    ASN1CALL copy_SignerInfo  (const SignerInfo *, SignerInfo *);
-ASN1EXP void   ASN1CALL free_SignerInfo  (SignerInfo *);
-
-
-/*
-SignerInfos ::= SET OF SignerInfo
-*/
-
-typedef struct SignerInfos {
-  unsigned int len;
-  SignerInfo *val;
-} SignerInfos;
-
-ASN1EXP int    ASN1CALL decode_SignerInfos(const unsigned char *, size_t, SignerInfos *, size_t *);
-ASN1EXP int    ASN1CALL encode_SignerInfos(unsigned char *, size_t, const SignerInfos *, size_t *);
-ASN1EXP size_t ASN1CALL length_SignerInfos(const SignerInfos *);
-ASN1EXP int    ASN1CALL copy_SignerInfos  (const SignerInfos *, SignerInfos *);
-ASN1EXP void   ASN1CALL free_SignerInfos  (SignerInfos *);
-
-
-/*
-SignedData ::= SEQUENCE {
-  version            CMSVersion,
-  digestAlgorithms   DigestAlgorithmIdentifiers,
-  encapContentInfo   EncapsulatedContentInfo,
-  certificates       [0] IMPLICIT SET OF heim_any OPTIONAL,
-  crls               [1] IMPLICIT heim_any OPTIONAL,
-  signerInfos        SignerInfos,
-}
-*/
-
-typedef struct SignedData {
-  CMSVersion version;
-  DigestAlgorithmIdentifiers digestAlgorithms;
-  EncapsulatedContentInfo encapContentInfo;
-  struct SignedData_certificates {
-    unsigned int len;
-    heim_any *val;
-  } *certificates;
-  heim_any *crls;
-  SignerInfos signerInfos;
-} SignedData;
-
-ASN1EXP int    ASN1CALL decode_SignedData(const unsigned char *, size_t, SignedData *, size_t *);
-ASN1EXP int    ASN1CALL encode_SignedData(unsigned char *, size_t, const SignedData *, size_t *);
-ASN1EXP size_t ASN1CALL length_SignedData(const SignedData *);
-ASN1EXP int    ASN1CALL copy_SignedData  (const SignedData *, SignedData *);
-ASN1EXP void   ASN1CALL free_SignedData  (SignedData *);
-
-
-/*
-OriginatorInfo ::= SEQUENCE {
-  certs           [0] IMPLICIT SET OF heim_any OPTIONAL,
-  crls            [1] IMPLICIT heim_any OPTIONAL,
-}
-*/
-
-typedef struct OriginatorInfo {
-  struct OriginatorInfo_certs {
-    unsigned int len;
-    heim_any *val;
-  } *certs;
-  heim_any *crls;
-} OriginatorInfo;
-
-ASN1EXP int    ASN1CALL decode_OriginatorInfo(const unsigned char *, size_t, OriginatorInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_OriginatorInfo(unsigned char *, size_t, const OriginatorInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_OriginatorInfo(const OriginatorInfo *);
-ASN1EXP int    ASN1CALL copy_OriginatorInfo  (const OriginatorInfo *, OriginatorInfo *);
-ASN1EXP void   ASN1CALL free_OriginatorInfo  (OriginatorInfo *);
-
-
-/*
-KeyEncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
-*/
-
-typedef AlgorithmIdentifier KeyEncryptionAlgorithmIdentifier;
-
-ASN1EXP int    ASN1CALL decode_KeyEncryptionAlgorithmIdentifier(const unsigned char *, size_t, KeyEncryptionAlgorithmIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_KeyEncryptionAlgorithmIdentifier(unsigned char *, size_t, const KeyEncryptionAlgorithmIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_KeyEncryptionAlgorithmIdentifier(const KeyEncryptionAlgorithmIdentifier *);
-ASN1EXP int    ASN1CALL copy_KeyEncryptionAlgorithmIdentifier  (const KeyEncryptionAlgorithmIdentifier *, KeyEncryptionAlgorithmIdentifier *);
-ASN1EXP void   ASN1CALL free_KeyEncryptionAlgorithmIdentifier  (KeyEncryptionAlgorithmIdentifier *);
-
-
-/*
-ContentEncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
-*/
-
-typedef AlgorithmIdentifier ContentEncryptionAlgorithmIdentifier;
-
-ASN1EXP int    ASN1CALL decode_ContentEncryptionAlgorithmIdentifier(const unsigned char *, size_t, ContentEncryptionAlgorithmIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_ContentEncryptionAlgorithmIdentifier(unsigned char *, size_t, const ContentEncryptionAlgorithmIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_ContentEncryptionAlgorithmIdentifier(const ContentEncryptionAlgorithmIdentifier *);
-ASN1EXP int    ASN1CALL copy_ContentEncryptionAlgorithmIdentifier  (const ContentEncryptionAlgorithmIdentifier *, ContentEncryptionAlgorithmIdentifier *);
-ASN1EXP void   ASN1CALL free_ContentEncryptionAlgorithmIdentifier  (ContentEncryptionAlgorithmIdentifier *);
-
-
-/*
-EncryptedKey ::= OCTET STRING
-*/
-
-typedef heim_octet_string EncryptedKey;
-
-ASN1EXP int    ASN1CALL decode_EncryptedKey(const unsigned char *, size_t, EncryptedKey *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncryptedKey(unsigned char *, size_t, const EncryptedKey *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncryptedKey(const EncryptedKey *);
-ASN1EXP int    ASN1CALL copy_EncryptedKey  (const EncryptedKey *, EncryptedKey *);
-ASN1EXP void   ASN1CALL free_EncryptedKey  (EncryptedKey *);
-
-
-/*
-KeyTransRecipientInfo ::= SEQUENCE {
-  version                  CMSVersion,
-  rid                      RecipientIdentifier,
-  keyEncryptionAlgorithm   KeyEncryptionAlgorithmIdentifier,
-  encryptedKey             EncryptedKey,
-}
-*/
-
-typedef struct KeyTransRecipientInfo {
-  CMSVersion version;
-  RecipientIdentifier rid;
-  KeyEncryptionAlgorithmIdentifier keyEncryptionAlgorithm;
-  EncryptedKey encryptedKey;
-} KeyTransRecipientInfo;
-
-ASN1EXP int    ASN1CALL decode_KeyTransRecipientInfo(const unsigned char *, size_t, KeyTransRecipientInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_KeyTransRecipientInfo(unsigned char *, size_t, const KeyTransRecipientInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_KeyTransRecipientInfo(const KeyTransRecipientInfo *);
-ASN1EXP int    ASN1CALL copy_KeyTransRecipientInfo  (const KeyTransRecipientInfo *, KeyTransRecipientInfo *);
-ASN1EXP void   ASN1CALL free_KeyTransRecipientInfo  (KeyTransRecipientInfo *);
-
-
-/*
-RecipientInfo ::= KeyTransRecipientInfo
-*/
-
-typedef KeyTransRecipientInfo RecipientInfo;
-
-ASN1EXP int    ASN1CALL decode_RecipientInfo(const unsigned char *, size_t, RecipientInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_RecipientInfo(unsigned char *, size_t, const RecipientInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_RecipientInfo(const RecipientInfo *);
-ASN1EXP int    ASN1CALL copy_RecipientInfo  (const RecipientInfo *, RecipientInfo *);
-ASN1EXP void   ASN1CALL free_RecipientInfo  (RecipientInfo *);
-
-
-/*
-RecipientInfos ::= SET OF RecipientInfo
-*/
-
-typedef struct RecipientInfos {
-  unsigned int len;
-  RecipientInfo *val;
-} RecipientInfos;
-
-ASN1EXP int    ASN1CALL decode_RecipientInfos(const unsigned char *, size_t, RecipientInfos *, size_t *);
-ASN1EXP int    ASN1CALL encode_RecipientInfos(unsigned char *, size_t, const RecipientInfos *, size_t *);
-ASN1EXP size_t ASN1CALL length_RecipientInfos(const RecipientInfos *);
-ASN1EXP int    ASN1CALL copy_RecipientInfos  (const RecipientInfos *, RecipientInfos *);
-ASN1EXP void   ASN1CALL free_RecipientInfos  (RecipientInfos *);
-
-
-/*
-EncryptedContent ::= OCTET STRING
-*/
-
-typedef heim_octet_string EncryptedContent;
-
-ASN1EXP int    ASN1CALL decode_EncryptedContent(const unsigned char *, size_t, EncryptedContent *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncryptedContent(unsigned char *, size_t, const EncryptedContent *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncryptedContent(const EncryptedContent *);
-ASN1EXP int    ASN1CALL copy_EncryptedContent  (const EncryptedContent *, EncryptedContent *);
-ASN1EXP void   ASN1CALL free_EncryptedContent  (EncryptedContent *);
-
-
-/*
-EncryptedContentInfo ::= SEQUENCE {
-  contentType                  ContentType,
-  contentEncryptionAlgorithm   ContentEncryptionAlgorithmIdentifier,
-  encryptedContent             [0] IMPLICIT OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct EncryptedContentInfo {
-  ContentType contentType;
-  ContentEncryptionAlgorithmIdentifier contentEncryptionAlgorithm;
-  heim_octet_string *encryptedContent;
-} EncryptedContentInfo;
-
-ASN1EXP int    ASN1CALL decode_EncryptedContentInfo(const unsigned char *, size_t, EncryptedContentInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncryptedContentInfo(unsigned char *, size_t, const EncryptedContentInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncryptedContentInfo(const EncryptedContentInfo *);
-ASN1EXP int    ASN1CALL copy_EncryptedContentInfo  (const EncryptedContentInfo *, EncryptedContentInfo *);
-ASN1EXP void   ASN1CALL free_EncryptedContentInfo  (EncryptedContentInfo *);
-
-
-/*
-UnprotectedAttributes ::= SET OF Attribute
-*/
-
-typedef struct UnprotectedAttributes {
-  unsigned int len;
-  Attribute *val;
-} UnprotectedAttributes;
-
-ASN1EXP int    ASN1CALL decode_UnprotectedAttributes(const unsigned char *, size_t, UnprotectedAttributes *, size_t *);
-ASN1EXP int    ASN1CALL encode_UnprotectedAttributes(unsigned char *, size_t, const UnprotectedAttributes *, size_t *);
-ASN1EXP size_t ASN1CALL length_UnprotectedAttributes(const UnprotectedAttributes *);
-ASN1EXP int    ASN1CALL copy_UnprotectedAttributes  (const UnprotectedAttributes *, UnprotectedAttributes *);
-ASN1EXP void   ASN1CALL free_UnprotectedAttributes  (UnprotectedAttributes *);
-
-
-/*
-CMSEncryptedData ::= SEQUENCE {
-  version                CMSVersion,
-  encryptedContentInfo   EncryptedContentInfo,
-  unprotectedAttrs       [1] IMPLICIT heim_any OPTIONAL,
-}
-*/
-
-typedef struct CMSEncryptedData {
-  CMSVersion version;
-  EncryptedContentInfo encryptedContentInfo;
-  heim_any *unprotectedAttrs;
-} CMSEncryptedData;
-
-ASN1EXP int    ASN1CALL decode_CMSEncryptedData(const unsigned char *, size_t, CMSEncryptedData *, size_t *);
-ASN1EXP int    ASN1CALL encode_CMSEncryptedData(unsigned char *, size_t, const CMSEncryptedData *, size_t *);
-ASN1EXP size_t ASN1CALL length_CMSEncryptedData(const CMSEncryptedData *);
-ASN1EXP int    ASN1CALL copy_CMSEncryptedData  (const CMSEncryptedData *, CMSEncryptedData *);
-ASN1EXP void   ASN1CALL free_CMSEncryptedData  (CMSEncryptedData *);
-
-
-/*
-EnvelopedData ::= SEQUENCE {
-  version                CMSVersion,
-  originatorInfo         [0] IMPLICIT heim_any OPTIONAL,
-  recipientInfos         RecipientInfos,
-  encryptedContentInfo   EncryptedContentInfo,
-  unprotectedAttrs       [1] IMPLICIT heim_any OPTIONAL,
-}
-*/
-
-typedef struct EnvelopedData {
-  CMSVersion version;
-  heim_any *originatorInfo;
-  RecipientInfos recipientInfos;
-  EncryptedContentInfo encryptedContentInfo;
-  heim_any *unprotectedAttrs;
-} EnvelopedData;
-
-ASN1EXP int    ASN1CALL decode_EnvelopedData(const unsigned char *, size_t, EnvelopedData *, size_t *);
-ASN1EXP int    ASN1CALL encode_EnvelopedData(unsigned char *, size_t, const EnvelopedData *, size_t *);
-ASN1EXP size_t ASN1CALL length_EnvelopedData(const EnvelopedData *);
-ASN1EXP int    ASN1CALL copy_EnvelopedData  (const EnvelopedData *, EnvelopedData *);
-ASN1EXP void   ASN1CALL free_EnvelopedData  (EnvelopedData *);
-
-
-/*
-CMSRC2CBCParameter ::= SEQUENCE {
-  rc2ParameterVersion   INTEGER (0..2147483647),
-  iv                    OCTET STRING,
-}
-*/
-
-typedef struct CMSRC2CBCParameter {
-  unsigned int rc2ParameterVersion;
-  heim_octet_string iv;
-} CMSRC2CBCParameter;
-
-ASN1EXP int    ASN1CALL decode_CMSRC2CBCParameter(const unsigned char *, size_t, CMSRC2CBCParameter *, size_t *);
-ASN1EXP int    ASN1CALL encode_CMSRC2CBCParameter(unsigned char *, size_t, const CMSRC2CBCParameter *, size_t *);
-ASN1EXP size_t ASN1CALL length_CMSRC2CBCParameter(const CMSRC2CBCParameter *);
-ASN1EXP int    ASN1CALL copy_CMSRC2CBCParameter  (const CMSRC2CBCParameter *, CMSRC2CBCParameter *);
-ASN1EXP void   ASN1CALL free_CMSRC2CBCParameter  (CMSRC2CBCParameter *);
-
-
-/*
-CMSCBCParameter ::= OCTET STRING
-*/
-
-typedef heim_octet_string CMSCBCParameter;
-
-ASN1EXP int    ASN1CALL decode_CMSCBCParameter(const unsigned char *, size_t, CMSCBCParameter *, size_t *);
-ASN1EXP int    ASN1CALL encode_CMSCBCParameter(unsigned char *, size_t, const CMSCBCParameter *, size_t *);
-ASN1EXP size_t ASN1CALL length_CMSCBCParameter(const CMSCBCParameter *);
-ASN1EXP int    ASN1CALL copy_CMSCBCParameter  (const CMSCBCParameter *, CMSCBCParameter *);
-ASN1EXP void   ASN1CALL free_CMSCBCParameter  (CMSCBCParameter *);
-
-
-#endif /* __cms_asn1_h__ */
diff --git a/include.new/com_err.h b/include.new/com_err.h
deleted file mode 100644
index 8e3c7ec..0000000
--- a/include.new/com_err.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id: com_err.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-/* MIT compatible com_err library */
-
-#ifndef __COM_ERR_H__
-#define __COM_ERR_H__
-
-#include <com_right.h>
-#include <stdarg.h>
-
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(X)
-#endif
-
-typedef void (KRB5_CALLCONV *errf) (const char *, long, const char *, va_list);
-
-KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
-error_message (long);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-init_error_table (const char**, long, int);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-com_err_va (const char *, long, const char *, va_list)
-    __attribute__((format(printf, 3, 0)));
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-com_err (const char *, long, const char *, ...)
-    __attribute__((format(printf, 3, 4)));
-
-KRB5_LIB_FUNCTION errf KRB5_LIB_CALL
-set_com_err_hook (errf);
-
-KRB5_LIB_FUNCTION errf KRB5_LIB_CALL
-reset_com_err_hook (void);
-
-KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
-error_table_name  (int num);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-add_to_error_table (struct et_list *new_table);
-
-#endif /* __COM_ERR_H__ */
diff --git a/include.new/com_right.h b/include.new/com_right.h
deleted file mode 100644
index e5fcd36..0000000
--- a/include.new/com_right.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 1997 - 2000 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id: com_right.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __COM_RIGHT_H__
-#define __COM_RIGHT_H__
-
-#ifndef KRB5_LIB_FUNCTION
-#if defined(_WIN32)
-#define KRB5_LIB_FUNCTION __declspec(dllimport)
-#else
-#define KRB5_LIB_FUNCTION
-#endif
-#endif
-
-#ifndef KRB5_LIB_CALL
-#if defined(_WIN32)
-#define KRB5_LIB_CALL __stdcall
-#else
-#define KRB5_LIB_CALL
-#endif
-#endif
-
-#ifndef KRB5_LIB_VARIABLE
-#if defined(_WIN32)
-#define KRB5_LIB_VARIABLE __declspec(dllimport)
-#else
-#define KRB5_LIB_VARIABLE
-#endif
-#endif
-
-#ifdef _WIN32
-#define KRB5_CALLCONV __stdcall
-#else
-#define KRB5_CALLCONV
-#endif
-
-#include <sys/cdefs.h>
-
-#ifdef __STDC__
-#include <stdarg.h>
-#endif
-
-struct error_table {
-    char const * const * msgs;
-    long base;
-    int n_msgs;
-};
-struct et_list {
-    struct et_list *next;
-    struct error_table *table;
-};
-extern struct et_list *_et_list;
-
-KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
-com_right (struct et_list *list, long code);
-
-KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
-com_right_r (struct et_list *list, long code, char *, size_t);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-initialize_error_table_r (struct et_list **, const char **, int, long);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-free_error_table (struct et_list *);
-
-#endif /* __COM_RIGHT_H__ */
diff --git a/include.new/complex.h b/include.new/complex.h
deleted file mode 100644
index b5dd7cf..0000000
--- a/include.new/complex.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * Copyright (c) 2001-2011 The FreeBSD Project.
- * 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.
- *
- * 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: releng/10.2/include/complex.h 251121 2013-05-30 04:49:26Z das $
- */
-
-#ifndef _COMPLEX_H
-#define	_COMPLEX_H
-
-#include <sys/cdefs.h>
-
-#ifdef __GNUC__
-#if __STDC_VERSION__ < 199901
-#define	_Complex	__complex__
-#endif
-#define	_Complex_I	((float _Complex)1.0i)
-#endif
-
-#ifdef __generic
-_Static_assert(__generic(_Complex_I, float _Complex, 1, 0),
-    "_Complex_I must be of type float _Complex");
-#endif
-
-#define	complex		_Complex
-#define	I		_Complex_I
-
-#if __ISO_C_VISIBLE >= 2011
-#ifdef __clang__
-#define	CMPLX(x, y)	((double complex){ x, y })
-#define	CMPLXF(x, y)	((float complex){ x, y })
-#define	CMPLXL(x, y)	((long double complex){ x, y })
-#elif __GNUC_PREREQ__(4, 7)
-#define	CMPLX(x, y)	__builtin_complex((double)(x), (double)(y))
-#define	CMPLXF(x, y)	__builtin_complex((float)(x), (float)(y))
-#define	CMPLXL(x, y)	__builtin_complex((long double)(x), (long double)(y))
-#endif
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-__BEGIN_DECLS
-
-double		cabs(double complex);
-float		cabsf(float complex);
-long double	cabsl(long double complex);
-double complex	cacos(double complex);
-float complex	cacosf(float complex);
-double complex	cacosh(double complex);
-float complex	cacoshf(float complex);
-double		carg(double complex);
-float		cargf(float complex);
-long double	cargl(long double complex);
-double complex	casin(double complex);
-float complex	casinf(float complex);
-double complex	casinh(double complex);
-float complex	casinhf(float complex);
-double complex	catan(double complex);
-float complex	catanf(float complex);
-double complex	catanh(double complex);
-float complex	catanhf(float complex);
-double complex	ccos(double complex);
-float complex	ccosf(float complex);
-double complex	ccosh(double complex);
-float complex	ccoshf(float complex);
-double complex	cexp(double complex);
-float complex	cexpf(float complex);
-double		cimag(double complex) __pure2;
-float		cimagf(float complex) __pure2;
-long double	cimagl(long double complex) __pure2;
-double complex	conj(double complex) __pure2;
-float complex	conjf(float complex) __pure2;
-long double complex
-		conjl(long double complex) __pure2;
-float complex	cprojf(float complex) __pure2;
-double complex	cproj(double complex) __pure2;
-long double complex
-		cprojl(long double complex) __pure2;
-double		creal(double complex) __pure2;
-float		crealf(float complex) __pure2;
-long double	creall(long double complex) __pure2;
-double complex	csin(double complex);
-float complex	csinf(float complex);
-double complex	csinh(double complex);
-float complex	csinhf(float complex);
-double complex	csqrt(double complex);
-float complex	csqrtf(float complex);
-long double complex
-		csqrtl(long double complex);
-double complex	ctan(double complex);
-float complex	ctanf(float complex);
-double complex	ctanh(double complex);
-float complex	ctanhf(float complex);
-
-__END_DECLS
-
-#endif /* _COMPLEX_H */
diff --git a/include.new/cpio.h b/include.new/cpio.h
deleted file mode 100644
index cb09c80..0000000
--- a/include.new/cpio.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/include/cpio.h 101138 2002-08-01 07:18:38Z mike $
- */
-
-#ifndef _CPIO_H_
-#define	_CPIO_H_
-
-#define	C_ISSOCK 0140000	/* Socket. */
-#define	C_ISLNK	0120000		/* Symbolic link. */
-#define	C_ISCTG	0110000		/* Reserved. */
-#define	C_ISREG	0100000		/* Regular file. */
-#define	C_ISBLK	0060000		/* Block special. */
-#define	C_ISDIR	0040000		/* Directory. */
-#define	C_ISCHR	0020000		/* Character special. */
-#define	C_ISFIFO 0010000	/* FIFO. */
-#define	C_ISUID	0004000		/* Set user ID. */
-#define	C_ISGID	0002000		/* Set group ID. */
-#define	C_ISVTX	0001000		/* On directories, restricted deletion flag. */
-#define	C_IRUSR	0000400		/* Read by owner. */
-#define	C_IWUSR	0000200		/* Write by owner. */
-#define	C_IXUSR	0000100		/* Execute by owner. */
-#define	C_IRGRP	0000040		/* Read by group. */
-#define	C_IWGRP	0000020		/* Write by group. */
-#define	C_IXGRP	0000010		/* Execute by group. */
-#define	C_IROTH	0000004		/* Read by others. */
-#define	C_IWOTH	0000002		/* Write by others. */
-#define	C_IXOTH	0000001		/* Execute by others. */
-
-#define	MAGIC	"070707"
-
-#endif /* _CPIO_H_ */
diff --git a/include.new/crmf_asn1.h b/include.new/crmf_asn1.h
deleted file mode 100644
index 4bd50e8..0000000
--- a/include.new/crmf_asn1.h
+++ /dev/null
@@ -1,442 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libhx509/../../../crypto/heimdal/lib/hx509/crmf.asn1 */
-/* Do not edit */
-
-#ifndef __crmf_asn1_h__
-#define __crmf_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <rfc2459_asn1.h>
-#include <heim_asn1.h>
-/*
-CRMFRDNSequence ::= SEQUENCE OF RelativeDistinguishedName
-*/
-
-typedef struct CRMFRDNSequence {
-  unsigned int len;
-  RelativeDistinguishedName *val;
-} CRMFRDNSequence;
-
-ASN1EXP int    ASN1CALL decode_CRMFRDNSequence(const unsigned char *, size_t, CRMFRDNSequence *, size_t *);
-ASN1EXP int    ASN1CALL encode_CRMFRDNSequence(unsigned char *, size_t, const CRMFRDNSequence *, size_t *);
-ASN1EXP size_t ASN1CALL length_CRMFRDNSequence(const CRMFRDNSequence *);
-ASN1EXP int    ASN1CALL copy_CRMFRDNSequence  (const CRMFRDNSequence *, CRMFRDNSequence *);
-ASN1EXP void   ASN1CALL free_CRMFRDNSequence  (CRMFRDNSequence *);
-
-
-/*
-Controls ::= SEQUENCE OF AttributeTypeAndValue
-*/
-
-typedef struct Controls {
-  unsigned int len;
-  AttributeTypeAndValue *val;
-} Controls;
-
-ASN1EXP int    ASN1CALL decode_Controls(const unsigned char *, size_t, Controls *, size_t *);
-ASN1EXP int    ASN1CALL encode_Controls(unsigned char *, size_t, const Controls *, size_t *);
-ASN1EXP size_t ASN1CALL length_Controls(const Controls *);
-ASN1EXP int    ASN1CALL copy_Controls  (const Controls *, Controls *);
-ASN1EXP void   ASN1CALL free_Controls  (Controls *);
-
-
-/*
-POPOSigningKey ::= SEQUENCE {
-  poposkInput           [0] IMPLICIT POPOSigningKeyInput OPTIONAL,
-  algorithmIdentifier   AlgorithmIdentifier,
-  signature               BIT STRING {
-  },
-}
-*/
-
-typedef struct POPOSigningKey {
-  POPOSigningKeyInput *poposkInput;
-  AlgorithmIdentifier algorithmIdentifier;
-  heim_bit_string signature;
-} POPOSigningKey;
-
-ASN1EXP int    ASN1CALL decode_POPOSigningKey(const unsigned char *, size_t, POPOSigningKey *, size_t *);
-ASN1EXP int    ASN1CALL encode_POPOSigningKey(unsigned char *, size_t, const POPOSigningKey *, size_t *);
-ASN1EXP size_t ASN1CALL length_POPOSigningKey(const POPOSigningKey *);
-ASN1EXP int    ASN1CALL copy_POPOSigningKey  (const POPOSigningKey *, POPOSigningKey *);
-ASN1EXP void   ASN1CALL free_POPOSigningKey  (POPOSigningKey *);
-
-
-/*
-PKMACValue ::= SEQUENCE {
-  algId           AlgorithmIdentifier,
-  value             BIT STRING {
-  },
-}
-*/
-
-typedef struct PKMACValue {
-  AlgorithmIdentifier algId;
-  heim_bit_string value;
-} PKMACValue;
-
-ASN1EXP int    ASN1CALL decode_PKMACValue(const unsigned char *, size_t, PKMACValue *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKMACValue(unsigned char *, size_t, const PKMACValue *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKMACValue(const PKMACValue *);
-ASN1EXP int    ASN1CALL copy_PKMACValue  (const PKMACValue *, PKMACValue *);
-ASN1EXP void   ASN1CALL free_PKMACValue  (PKMACValue *);
-
-
-/*
-POPOSigningKeyInput ::= SEQUENCE {
-  authInfo        CHOICE {
-    sender          [0] IMPLICIT GeneralName,
-    publicKeyMAC    PKMACValue,
-  },
-  publicKey       SubjectPublicKeyInfo,
-}
-*/
-
-typedef struct POPOSigningKeyInput {
-  struct POPOSigningKeyInput_authInfo {
-    enum {
-      choice_POPOSigningKeyInput_authInfo_sender = 1,
-      choice_POPOSigningKeyInput_authInfo_publicKeyMAC
-    } element;
-    union {
-      GeneralName sender;
-      PKMACValue publicKeyMAC;
-    } u;
-  } authInfo;
-  SubjectPublicKeyInfo publicKey;
-} POPOSigningKeyInput;
-
-ASN1EXP int    ASN1CALL decode_POPOSigningKeyInput(const unsigned char *, size_t, POPOSigningKeyInput *, size_t *);
-ASN1EXP int    ASN1CALL encode_POPOSigningKeyInput(unsigned char *, size_t, const POPOSigningKeyInput *, size_t *);
-ASN1EXP size_t ASN1CALL length_POPOSigningKeyInput(const POPOSigningKeyInput *);
-ASN1EXP int    ASN1CALL copy_POPOSigningKeyInput  (const POPOSigningKeyInput *, POPOSigningKeyInput *);
-ASN1EXP void   ASN1CALL free_POPOSigningKeyInput  (POPOSigningKeyInput *);
-
-
-/*
-PBMParameter ::= SEQUENCE {
-  salt             OCTET STRING,
-  owf              AlgorithmIdentifier,
-  iterationCount   INTEGER,
-  mac              AlgorithmIdentifier,
-}
-*/
-
-typedef struct PBMParameter {
-  heim_octet_string salt;
-  AlgorithmIdentifier owf;
-  heim_integer iterationCount;
-  AlgorithmIdentifier mac;
-} PBMParameter;
-
-ASN1EXP int    ASN1CALL decode_PBMParameter(const unsigned char *, size_t, PBMParameter *, size_t *);
-ASN1EXP int    ASN1CALL encode_PBMParameter(unsigned char *, size_t, const PBMParameter *, size_t *);
-ASN1EXP size_t ASN1CALL length_PBMParameter(const PBMParameter *);
-ASN1EXP int    ASN1CALL copy_PBMParameter  (const PBMParameter *, PBMParameter *);
-ASN1EXP void   ASN1CALL free_PBMParameter  (PBMParameter *);
-
-
-/*
-SubsequentMessage ::= INTEGER {
-  encrCert(0),
-  challengeResp(1)
-}
-*/
-
-typedef enum SubsequentMessage {
-  encrCert = 0,
-  challengeResp = 1
-} SubsequentMessage;
-
-ASN1EXP int    ASN1CALL decode_SubsequentMessage(const unsigned char *, size_t, SubsequentMessage *, size_t *);
-ASN1EXP int    ASN1CALL encode_SubsequentMessage(unsigned char *, size_t, const SubsequentMessage *, size_t *);
-ASN1EXP size_t ASN1CALL length_SubsequentMessage(const SubsequentMessage *);
-ASN1EXP int    ASN1CALL copy_SubsequentMessage  (const SubsequentMessage *, SubsequentMessage *);
-ASN1EXP void   ASN1CALL free_SubsequentMessage  (SubsequentMessage *);
-
-
-/*
-POPOPrivKey ::= CHOICE {
-  thisMessage         [0]   BIT STRING {
-  },
-  subsequentMessage   [1] IMPLICIT SubsequentMessage,
-  dhMAC               [2]   BIT STRING {
-  },
-  agreeMAC            [3] IMPLICIT PKMACValue,
-  encryptedKey        [4] heim_any,
-}
-*/
-
-typedef struct POPOPrivKey {
-  enum {
-    choice_POPOPrivKey_thisMessage = 1,
-    choice_POPOPrivKey_subsequentMessage,
-    choice_POPOPrivKey_dhMAC,
-    choice_POPOPrivKey_agreeMAC,
-    choice_POPOPrivKey_encryptedKey
-  } element;
-  union {
-    heim_bit_string thisMessage;
-    SubsequentMessage subsequentMessage;
-    heim_bit_string dhMAC;
-    PKMACValue agreeMAC;
-    heim_any encryptedKey;
-  } u;
-} POPOPrivKey;
-
-ASN1EXP int    ASN1CALL decode_POPOPrivKey(const unsigned char *, size_t, POPOPrivKey *, size_t *);
-ASN1EXP int    ASN1CALL encode_POPOPrivKey(unsigned char *, size_t, const POPOPrivKey *, size_t *);
-ASN1EXP size_t ASN1CALL length_POPOPrivKey(const POPOPrivKey *);
-ASN1EXP int    ASN1CALL copy_POPOPrivKey  (const POPOPrivKey *, POPOPrivKey *);
-ASN1EXP void   ASN1CALL free_POPOPrivKey  (POPOPrivKey *);
-
-
-/*
-ProofOfPossession ::= CHOICE {
-  raVerified        [0]   NULL,
-  signature         [1] POPOSigningKey,
-  keyEncipherment   [2] POPOPrivKey,
-  keyAgreement      [3] POPOPrivKey,
-}
-*/
-
-typedef struct ProofOfPossession {
-  enum {
-    choice_ProofOfPossession_raVerified = 1,
-    choice_ProofOfPossession_signature,
-    choice_ProofOfPossession_keyEncipherment,
-    choice_ProofOfPossession_keyAgreement
-  } element;
-  union {
-    int raVerified;
-    POPOSigningKey signature;
-    POPOPrivKey keyEncipherment;
-    POPOPrivKey keyAgreement;
-  } u;
-} ProofOfPossession;
-
-ASN1EXP int    ASN1CALL decode_ProofOfPossession(const unsigned char *, size_t, ProofOfPossession *, size_t *);
-ASN1EXP int    ASN1CALL encode_ProofOfPossession(unsigned char *, size_t, const ProofOfPossession *, size_t *);
-ASN1EXP size_t ASN1CALL length_ProofOfPossession(const ProofOfPossession *);
-ASN1EXP int    ASN1CALL copy_ProofOfPossession  (const ProofOfPossession *, ProofOfPossession *);
-ASN1EXP void   ASN1CALL free_ProofOfPossession  (ProofOfPossession *);
-
-
-/*
-CertTemplate ::= SEQUENCE {
-  version         [0] INTEGER OPTIONAL,
-  serialNumber    [1] INTEGER OPTIONAL,
-  signingAlg      [2] SEQUENCE {
-    algorithm           OBJECT IDENTIFIER,
-    parameters      heim_any OPTIONAL,
-  } OPTIONAL,
-  issuer          [3] IMPLICIT CHOICE {
-    rdnSequence     CRMFRDNSequence,
-  } OPTIONAL,
-  validity        [4] SEQUENCE {
-    notBefore       [0] Time OPTIONAL,
-    notAfter        [1] Time OPTIONAL,
-  } OPTIONAL,
-  subject         [5] IMPLICIT CHOICE {
-    rdnSequence     CRMFRDNSequence,
-  } OPTIONAL,
-  publicKey       [6] IMPLICIT SEQUENCE {
-    algorithm          AlgorithmIdentifier,
-    subjectPublicKey       BIT STRING {
-    } OPTIONAL,
-  } OPTIONAL,
-  issuerUID       [7] IMPLICIT   BIT STRING {
-  } OPTIONAL,
-  subjectUID      [8] IMPLICIT   BIT STRING {
-  } OPTIONAL,
-  extensions      [9] IMPLICIT SEQUENCE OF Extension OPTIONAL,
-}
-*/
-
-typedef struct CertTemplate {
-  heim_integer *version;
-  heim_integer *serialNumber;
-  struct CertTemplate_signingAlg {
-    heim_oid algorithm;
-    heim_any *parameters;
-  } *signingAlg;
-  struct CertTemplate_issuer {
-    enum {
-      choice_CertTemplate_issuer_rdnSequence = 1
-    } element;
-    union {
-      CRMFRDNSequence rdnSequence;
-    } u;
-  } *issuer;
-  struct CertTemplate_validity {
-    Time *notBefore;
-    Time *notAfter;
-  } *validity;
-  struct CertTemplate_subject {
-    enum {
-      choice_CertTemplate_subject_rdnSequence = 1
-    } element;
-    union {
-      CRMFRDNSequence rdnSequence;
-    } u;
-  } *subject;
-  struct CertTemplate_publicKey {
-    AlgorithmIdentifier algorithm;
-    heim_bit_string *subjectPublicKey;
-  } *publicKey;
-  heim_bit_string *issuerUID;
-  heim_bit_string *subjectUID;
-  struct CertTemplate_extensions {
-    unsigned int len;
-    Extension *val;
-  } *extensions;
-} CertTemplate;
-
-ASN1EXP int    ASN1CALL decode_CertTemplate(const unsigned char *, size_t, CertTemplate *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertTemplate(unsigned char *, size_t, const CertTemplate *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertTemplate(const CertTemplate *);
-ASN1EXP int    ASN1CALL copy_CertTemplate  (const CertTemplate *, CertTemplate *);
-ASN1EXP void   ASN1CALL free_CertTemplate  (CertTemplate *);
-
-
-/*
-CertRequest ::= SEQUENCE {
-  certReqId       INTEGER,
-  certTemplate    CertTemplate,
-  controls        Controls OPTIONAL,
-}
-*/
-
-typedef struct CertRequest {
-  heim_integer certReqId;
-  CertTemplate certTemplate;
-  Controls *controls;
-} CertRequest;
-
-ASN1EXP int    ASN1CALL decode_CertRequest(const unsigned char *, size_t, CertRequest *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertRequest(unsigned char *, size_t, const CertRequest *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertRequest(const CertRequest *);
-ASN1EXP int    ASN1CALL copy_CertRequest  (const CertRequest *, CertRequest *);
-ASN1EXP void   ASN1CALL free_CertRequest  (CertRequest *);
-
-
-/*
-CertReqMsg ::= SEQUENCE {
-  certReq         CertRequest,
-  popo            ProofOfPossession OPTIONAL,
-  regInfo         SEQUENCE OF AttributeTypeAndValue OPTIONAL,
-}
-*/
-
-typedef struct CertReqMsg {
-  CertRequest certReq;
-  ProofOfPossession *popo;
-  struct CertReqMsg_regInfo {
-    unsigned int len;
-    AttributeTypeAndValue *val;
-  } *regInfo;
-} CertReqMsg;
-
-ASN1EXP int    ASN1CALL decode_CertReqMsg(const unsigned char *, size_t, CertReqMsg *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertReqMsg(unsigned char *, size_t, const CertReqMsg *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertReqMsg(const CertReqMsg *);
-ASN1EXP int    ASN1CALL copy_CertReqMsg  (const CertReqMsg *, CertReqMsg *);
-ASN1EXP void   ASN1CALL free_CertReqMsg  (CertReqMsg *);
-
-
-/*
-CertReqMessages ::= SEQUENCE OF CertReqMsg
-*/
-
-typedef struct CertReqMessages {
-  unsigned int len;
-  CertReqMsg *val;
-} CertReqMessages;
-
-ASN1EXP int    ASN1CALL decode_CertReqMessages(const unsigned char *, size_t, CertReqMessages *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertReqMessages(unsigned char *, size_t, const CertReqMessages *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertReqMessages(const CertReqMessages *);
-ASN1EXP int    ASN1CALL copy_CertReqMessages  (const CertReqMessages *, CertReqMessages *);
-ASN1EXP void   ASN1CALL free_CertReqMessages  (CertReqMessages *);
-
-
-#endif /* __crmf_asn1_h__ */
diff --git a/include.new/crypto/cast.h b/include.new/crypto/cast.h
deleted file mode 100644
index b8c3134..0000000
--- a/include.new/crypto/cast.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/opencrypto/cast.h 139825 2005-01-07 02:29:27Z imp $	*/
-/*      $OpenBSD: cast.h,v 1.2 2002/03/14 01:26:51 millert Exp $       */
-
-/*-
- *	CAST-128 in C
- *	Written by Steve Reid <sreid@sea-to-sky.net>
- *	100% Public Domain - no warranty
- *	Released 1997.10.11
- */
-
-#ifndef _CAST_H_
-#define _CAST_H_
-
-typedef struct {
-	uint32_t	xkey[32];	/* Key, after expansion */
-	int		rounds;		/* Number of rounds to use, 12 or 16 */
-} cast_key;
-
-void cast_setkey(cast_key * key, u_int8_t * rawkey, int keybytes);
-void cast_encrypt(cast_key * key, u_int8_t * inblock, u_int8_t * outblock);
-void cast_decrypt(cast_key * key, u_int8_t * inblock, u_int8_t * outblock);
-
-#endif /* ifndef _CAST_H_ */
diff --git a/include.new/crypto/castsb.h b/include.new/crypto/castsb.h
deleted file mode 100644
index 04a4214..0000000
--- a/include.new/crypto/castsb.h
+++ /dev/null
@@ -1,545 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/opencrypto/castsb.h 139825 2005-01-07 02:29:27Z imp $	*/
-/*      $OpenBSD: castsb.h,v 1.1 2000/02/28 23:13:04 deraadt Exp $       */
-/*-
- *	CAST-128 in C
- *	Written by Steve Reid <sreid@sea-to-sky.net>
- *	100% Public Domain - no warranty
- *	Released 1997.10.11
- */
-
-static const uint32_t cast_sbox1[256] = {
-	0x30FB40D4, 0x9FA0FF0B, 0x6BECCD2F, 0x3F258C7A,
-	0x1E213F2F, 0x9C004DD3, 0x6003E540, 0xCF9FC949,
-	0xBFD4AF27, 0x88BBBDB5, 0xE2034090, 0x98D09675,
-	0x6E63A0E0, 0x15C361D2, 0xC2E7661D, 0x22D4FF8E,
-	0x28683B6F, 0xC07FD059, 0xFF2379C8, 0x775F50E2,
-	0x43C340D3, 0xDF2F8656, 0x887CA41A, 0xA2D2BD2D,
-	0xA1C9E0D6, 0x346C4819, 0x61B76D87, 0x22540F2F,
-	0x2ABE32E1, 0xAA54166B, 0x22568E3A, 0xA2D341D0,
-	0x66DB40C8, 0xA784392F, 0x004DFF2F, 0x2DB9D2DE,
-	0x97943FAC, 0x4A97C1D8, 0x527644B7, 0xB5F437A7,
-	0xB82CBAEF, 0xD751D159, 0x6FF7F0ED, 0x5A097A1F,
-	0x827B68D0, 0x90ECF52E, 0x22B0C054, 0xBC8E5935,
-	0x4B6D2F7F, 0x50BB64A2, 0xD2664910, 0xBEE5812D,
-	0xB7332290, 0xE93B159F, 0xB48EE411, 0x4BFF345D,
-	0xFD45C240, 0xAD31973F, 0xC4F6D02E, 0x55FC8165,
-	0xD5B1CAAD, 0xA1AC2DAE, 0xA2D4B76D, 0xC19B0C50,
-	0x882240F2, 0x0C6E4F38, 0xA4E4BFD7, 0x4F5BA272,
-	0x564C1D2F, 0xC59C5319, 0xB949E354, 0xB04669FE,
-	0xB1B6AB8A, 0xC71358DD, 0x6385C545, 0x110F935D,
-	0x57538AD5, 0x6A390493, 0xE63D37E0, 0x2A54F6B3,
-	0x3A787D5F, 0x6276A0B5, 0x19A6FCDF, 0x7A42206A,
-	0x29F9D4D5, 0xF61B1891, 0xBB72275E, 0xAA508167,
-	0x38901091, 0xC6B505EB, 0x84C7CB8C, 0x2AD75A0F,
-	0x874A1427, 0xA2D1936B, 0x2AD286AF, 0xAA56D291,
-	0xD7894360, 0x425C750D, 0x93B39E26, 0x187184C9,
-	0x6C00B32D, 0x73E2BB14, 0xA0BEBC3C, 0x54623779,
-	0x64459EAB, 0x3F328B82, 0x7718CF82, 0x59A2CEA6,
-	0x04EE002E, 0x89FE78E6, 0x3FAB0950, 0x325FF6C2,
-	0x81383F05, 0x6963C5C8, 0x76CB5AD6, 0xD49974C9,
-	0xCA180DCF, 0x380782D5, 0xC7FA5CF6, 0x8AC31511,
-	0x35E79E13, 0x47DA91D0, 0xF40F9086, 0xA7E2419E,
-	0x31366241, 0x051EF495, 0xAA573B04, 0x4A805D8D,
-	0x548300D0, 0x00322A3C, 0xBF64CDDF, 0xBA57A68E,
-	0x75C6372B, 0x50AFD341, 0xA7C13275, 0x915A0BF5,
-	0x6B54BFAB, 0x2B0B1426, 0xAB4CC9D7, 0x449CCD82,
-	0xF7FBF265, 0xAB85C5F3, 0x1B55DB94, 0xAAD4E324,
-	0xCFA4BD3F, 0x2DEAA3E2, 0x9E204D02, 0xC8BD25AC,
-	0xEADF55B3, 0xD5BD9E98, 0xE31231B2, 0x2AD5AD6C,
-	0x954329DE, 0xADBE4528, 0xD8710F69, 0xAA51C90F,
-	0xAA786BF6, 0x22513F1E, 0xAA51A79B, 0x2AD344CC,
-	0x7B5A41F0, 0xD37CFBAD, 0x1B069505, 0x41ECE491,
-	0xB4C332E6, 0x032268D4, 0xC9600ACC, 0xCE387E6D,
-	0xBF6BB16C, 0x6A70FB78, 0x0D03D9C9, 0xD4DF39DE,
-	0xE01063DA, 0x4736F464, 0x5AD328D8, 0xB347CC96,
-	0x75BB0FC3, 0x98511BFB, 0x4FFBCC35, 0xB58BCF6A,
-	0xE11F0ABC, 0xBFC5FE4A, 0xA70AEC10, 0xAC39570A,
-	0x3F04442F, 0x6188B153, 0xE0397A2E, 0x5727CB79,
-	0x9CEB418F, 0x1CACD68D, 0x2AD37C96, 0x0175CB9D,
-	0xC69DFF09, 0xC75B65F0, 0xD9DB40D8, 0xEC0E7779,
-	0x4744EAD4, 0xB11C3274, 0xDD24CB9E, 0x7E1C54BD,
-	0xF01144F9, 0xD2240EB1, 0x9675B3FD, 0xA3AC3755,
-	0xD47C27AF, 0x51C85F4D, 0x56907596, 0xA5BB15E6,
-	0x580304F0, 0xCA042CF1, 0x011A37EA, 0x8DBFAADB,
-	0x35BA3E4A, 0x3526FFA0, 0xC37B4D09, 0xBC306ED9,
-	0x98A52666, 0x5648F725, 0xFF5E569D, 0x0CED63D0,
-	0x7C63B2CF, 0x700B45E1, 0xD5EA50F1, 0x85A92872,
-	0xAF1FBDA7, 0xD4234870, 0xA7870BF3, 0x2D3B4D79,
-	0x42E04198, 0x0CD0EDE7, 0x26470DB8, 0xF881814C,
-	0x474D6AD7, 0x7C0C5E5C, 0xD1231959, 0x381B7298,
-	0xF5D2F4DB, 0xAB838653, 0x6E2F1E23, 0x83719C9E,
-	0xBD91E046, 0x9A56456E, 0xDC39200C, 0x20C8C571,
-	0x962BDA1C, 0xE1E696FF, 0xB141AB08, 0x7CCA89B9,
-	0x1A69E783, 0x02CC4843, 0xA2F7C579, 0x429EF47D,
-	0x427B169C, 0x5AC9F049, 0xDD8F0F00, 0x5C8165BF
-};
-
-static const uint32_t cast_sbox2[256] = {
-	0x1F201094, 0xEF0BA75B, 0x69E3CF7E, 0x393F4380,
-	0xFE61CF7A, 0xEEC5207A, 0x55889C94, 0x72FC0651,
-	0xADA7EF79, 0x4E1D7235, 0xD55A63CE, 0xDE0436BA,
-	0x99C430EF, 0x5F0C0794, 0x18DCDB7D, 0xA1D6EFF3,
-	0xA0B52F7B, 0x59E83605, 0xEE15B094, 0xE9FFD909,
-	0xDC440086, 0xEF944459, 0xBA83CCB3, 0xE0C3CDFB,
-	0xD1DA4181, 0x3B092AB1, 0xF997F1C1, 0xA5E6CF7B,
-	0x01420DDB, 0xE4E7EF5B, 0x25A1FF41, 0xE180F806,
-	0x1FC41080, 0x179BEE7A, 0xD37AC6A9, 0xFE5830A4,
-	0x98DE8B7F, 0x77E83F4E, 0x79929269, 0x24FA9F7B,
-	0xE113C85B, 0xACC40083, 0xD7503525, 0xF7EA615F,
-	0x62143154, 0x0D554B63, 0x5D681121, 0xC866C359,
-	0x3D63CF73, 0xCEE234C0, 0xD4D87E87, 0x5C672B21,
-	0x071F6181, 0x39F7627F, 0x361E3084, 0xE4EB573B,
-	0x602F64A4, 0xD63ACD9C, 0x1BBC4635, 0x9E81032D,
-	0x2701F50C, 0x99847AB4, 0xA0E3DF79, 0xBA6CF38C,
-	0x10843094, 0x2537A95E, 0xF46F6FFE, 0xA1FF3B1F,
-	0x208CFB6A, 0x8F458C74, 0xD9E0A227, 0x4EC73A34,
-	0xFC884F69, 0x3E4DE8DF, 0xEF0E0088, 0x3559648D,
-	0x8A45388C, 0x1D804366, 0x721D9BFD, 0xA58684BB,
-	0xE8256333, 0x844E8212, 0x128D8098, 0xFED33FB4,
-	0xCE280AE1, 0x27E19BA5, 0xD5A6C252, 0xE49754BD,
-	0xC5D655DD, 0xEB667064, 0x77840B4D, 0xA1B6A801,
-	0x84DB26A9, 0xE0B56714, 0x21F043B7, 0xE5D05860,
-	0x54F03084, 0x066FF472, 0xA31AA153, 0xDADC4755,
-	0xB5625DBF, 0x68561BE6, 0x83CA6B94, 0x2D6ED23B,
-	0xECCF01DB, 0xA6D3D0BA, 0xB6803D5C, 0xAF77A709,
-	0x33B4A34C, 0x397BC8D6, 0x5EE22B95, 0x5F0E5304,
-	0x81ED6F61, 0x20E74364, 0xB45E1378, 0xDE18639B,
-	0x881CA122, 0xB96726D1, 0x8049A7E8, 0x22B7DA7B,
-	0x5E552D25, 0x5272D237, 0x79D2951C, 0xC60D894C,
-	0x488CB402, 0x1BA4FE5B, 0xA4B09F6B, 0x1CA815CF,
-	0xA20C3005, 0x8871DF63, 0xB9DE2FCB, 0x0CC6C9E9,
-	0x0BEEFF53, 0xE3214517, 0xB4542835, 0x9F63293C,
-	0xEE41E729, 0x6E1D2D7C, 0x50045286, 0x1E6685F3,
-	0xF33401C6, 0x30A22C95, 0x31A70850, 0x60930F13,
-	0x73F98417, 0xA1269859, 0xEC645C44, 0x52C877A9,
-	0xCDFF33A6, 0xA02B1741, 0x7CBAD9A2, 0x2180036F,
-	0x50D99C08, 0xCB3F4861, 0xC26BD765, 0x64A3F6AB,
-	0x80342676, 0x25A75E7B, 0xE4E6D1FC, 0x20C710E6,
-	0xCDF0B680, 0x17844D3B, 0x31EEF84D, 0x7E0824E4,
-	0x2CCB49EB, 0x846A3BAE, 0x8FF77888, 0xEE5D60F6,
-	0x7AF75673, 0x2FDD5CDB, 0xA11631C1, 0x30F66F43,
-	0xB3FAEC54, 0x157FD7FA, 0xEF8579CC, 0xD152DE58,
-	0xDB2FFD5E, 0x8F32CE19, 0x306AF97A, 0x02F03EF8,
-	0x99319AD5, 0xC242FA0F, 0xA7E3EBB0, 0xC68E4906,
-	0xB8DA230C, 0x80823028, 0xDCDEF3C8, 0xD35FB171,
-	0x088A1BC8, 0xBEC0C560, 0x61A3C9E8, 0xBCA8F54D,
-	0xC72FEFFA, 0x22822E99, 0x82C570B4, 0xD8D94E89,
-	0x8B1C34BC, 0x301E16E6, 0x273BE979, 0xB0FFEAA6,
-	0x61D9B8C6, 0x00B24869, 0xB7FFCE3F, 0x08DC283B,
-	0x43DAF65A, 0xF7E19798, 0x7619B72F, 0x8F1C9BA4,
-	0xDC8637A0, 0x16A7D3B1, 0x9FC393B7, 0xA7136EEB,
-	0xC6BCC63E, 0x1A513742, 0xEF6828BC, 0x520365D6,
-	0x2D6A77AB, 0x3527ED4B, 0x821FD216, 0x095C6E2E,
-	0xDB92F2FB, 0x5EEA29CB, 0x145892F5, 0x91584F7F,
-	0x5483697B, 0x2667A8CC, 0x85196048, 0x8C4BACEA,
-	0x833860D4, 0x0D23E0F9, 0x6C387E8A, 0x0AE6D249,
-	0xB284600C, 0xD835731D, 0xDCB1C647, 0xAC4C56EA,
-	0x3EBD81B3, 0x230EABB0, 0x6438BC87, 0xF0B5B1FA,
-	0x8F5EA2B3, 0xFC184642, 0x0A036B7A, 0x4FB089BD,
-	0x649DA589, 0xA345415E, 0x5C038323, 0x3E5D3BB9,
-	0x43D79572, 0x7E6DD07C, 0x06DFDF1E, 0x6C6CC4EF,
-	0x7160A539, 0x73BFBE70, 0x83877605, 0x4523ECF1
-};
-
-static const uint32_t cast_sbox3[256] = {
-	0x8DEFC240, 0x25FA5D9F, 0xEB903DBF, 0xE810C907,
-	0x47607FFF, 0x369FE44B, 0x8C1FC644, 0xAECECA90,
-	0xBEB1F9BF, 0xEEFBCAEA, 0xE8CF1950, 0x51DF07AE,
-	0x920E8806, 0xF0AD0548, 0xE13C8D83, 0x927010D5,
-	0x11107D9F, 0x07647DB9, 0xB2E3E4D4, 0x3D4F285E,
-	0xB9AFA820, 0xFADE82E0, 0xA067268B, 0x8272792E,
-	0x553FB2C0, 0x489AE22B, 0xD4EF9794, 0x125E3FBC,
-	0x21FFFCEE, 0x825B1BFD, 0x9255C5ED, 0x1257A240,
-	0x4E1A8302, 0xBAE07FFF, 0x528246E7, 0x8E57140E,
-	0x3373F7BF, 0x8C9F8188, 0xA6FC4EE8, 0xC982B5A5,
-	0xA8C01DB7, 0x579FC264, 0x67094F31, 0xF2BD3F5F,
-	0x40FFF7C1, 0x1FB78DFC, 0x8E6BD2C1, 0x437BE59B,
-	0x99B03DBF, 0xB5DBC64B, 0x638DC0E6, 0x55819D99,
-	0xA197C81C, 0x4A012D6E, 0xC5884A28, 0xCCC36F71,
-	0xB843C213, 0x6C0743F1, 0x8309893C, 0x0FEDDD5F,
-	0x2F7FE850, 0xD7C07F7E, 0x02507FBF, 0x5AFB9A04,
-	0xA747D2D0, 0x1651192E, 0xAF70BF3E, 0x58C31380,
-	0x5F98302E, 0x727CC3C4, 0x0A0FB402, 0x0F7FEF82,
-	0x8C96FDAD, 0x5D2C2AAE, 0x8EE99A49, 0x50DA88B8,
-	0x8427F4A0, 0x1EAC5790, 0x796FB449, 0x8252DC15,
-	0xEFBD7D9B, 0xA672597D, 0xADA840D8, 0x45F54504,
-	0xFA5D7403, 0xE83EC305, 0x4F91751A, 0x925669C2,
-	0x23EFE941, 0xA903F12E, 0x60270DF2, 0x0276E4B6,
-	0x94FD6574, 0x927985B2, 0x8276DBCB, 0x02778176,
-	0xF8AF918D, 0x4E48F79E, 0x8F616DDF, 0xE29D840E,
-	0x842F7D83, 0x340CE5C8, 0x96BBB682, 0x93B4B148,
-	0xEF303CAB, 0x984FAF28, 0x779FAF9B, 0x92DC560D,
-	0x224D1E20, 0x8437AA88, 0x7D29DC96, 0x2756D3DC,
-	0x8B907CEE, 0xB51FD240, 0xE7C07CE3, 0xE566B4A1,
-	0xC3E9615E, 0x3CF8209D, 0x6094D1E3, 0xCD9CA341,
-	0x5C76460E, 0x00EA983B, 0xD4D67881, 0xFD47572C,
-	0xF76CEDD9, 0xBDA8229C, 0x127DADAA, 0x438A074E,
-	0x1F97C090, 0x081BDB8A, 0x93A07EBE, 0xB938CA15,
-	0x97B03CFF, 0x3DC2C0F8, 0x8D1AB2EC, 0x64380E51,
-	0x68CC7BFB, 0xD90F2788, 0x12490181, 0x5DE5FFD4,
-	0xDD7EF86A, 0x76A2E214, 0xB9A40368, 0x925D958F,
-	0x4B39FFFA, 0xBA39AEE9, 0xA4FFD30B, 0xFAF7933B,
-	0x6D498623, 0x193CBCFA, 0x27627545, 0x825CF47A,
-	0x61BD8BA0, 0xD11E42D1, 0xCEAD04F4, 0x127EA392,
-	0x10428DB7, 0x8272A972, 0x9270C4A8, 0x127DE50B,
-	0x285BA1C8, 0x3C62F44F, 0x35C0EAA5, 0xE805D231,
-	0x428929FB, 0xB4FCDF82, 0x4FB66A53, 0x0E7DC15B,
-	0x1F081FAB, 0x108618AE, 0xFCFD086D, 0xF9FF2889,
-	0x694BCC11, 0x236A5CAE, 0x12DECA4D, 0x2C3F8CC5,
-	0xD2D02DFE, 0xF8EF5896, 0xE4CF52DA, 0x95155B67,
-	0x494A488C, 0xB9B6A80C, 0x5C8F82BC, 0x89D36B45,
-	0x3A609437, 0xEC00C9A9, 0x44715253, 0x0A874B49,
-	0xD773BC40, 0x7C34671C, 0x02717EF6, 0x4FEB5536,
-	0xA2D02FFF, 0xD2BF60C4, 0xD43F03C0, 0x50B4EF6D,
-	0x07478CD1, 0x006E1888, 0xA2E53F55, 0xB9E6D4BC,
-	0xA2048016, 0x97573833, 0xD7207D67, 0xDE0F8F3D,
-	0x72F87B33, 0xABCC4F33, 0x7688C55D, 0x7B00A6B0,
-	0x947B0001, 0x570075D2, 0xF9BB88F8, 0x8942019E,
-	0x4264A5FF, 0x856302E0, 0x72DBD92B, 0xEE971B69,
-	0x6EA22FDE, 0x5F08AE2B, 0xAF7A616D, 0xE5C98767,
-	0xCF1FEBD2, 0x61EFC8C2, 0xF1AC2571, 0xCC8239C2,
-	0x67214CB8, 0xB1E583D1, 0xB7DC3E62, 0x7F10BDCE,
-	0xF90A5C38, 0x0FF0443D, 0x606E6DC6, 0x60543A49,
-	0x5727C148, 0x2BE98A1D, 0x8AB41738, 0x20E1BE24,
-	0xAF96DA0F, 0x68458425, 0x99833BE5, 0x600D457D,
-	0x282F9350, 0x8334B362, 0xD91D1120, 0x2B6D8DA0,
-	0x642B1E31, 0x9C305A00, 0x52BCE688, 0x1B03588A,
-	0xF7BAEFD5, 0x4142ED9C, 0xA4315C11, 0x83323EC5,
-	0xDFEF4636, 0xA133C501, 0xE9D3531C, 0xEE353783
-};
-
-static const uint32_t cast_sbox4[256] = {
-	0x9DB30420, 0x1FB6E9DE, 0xA7BE7BEF, 0xD273A298,
-	0x4A4F7BDB, 0x64AD8C57, 0x85510443, 0xFA020ED1,
-	0x7E287AFF, 0xE60FB663, 0x095F35A1, 0x79EBF120,
-	0xFD059D43, 0x6497B7B1, 0xF3641F63, 0x241E4ADF,
-	0x28147F5F, 0x4FA2B8CD, 0xC9430040, 0x0CC32220,
-	0xFDD30B30, 0xC0A5374F, 0x1D2D00D9, 0x24147B15,
-	0xEE4D111A, 0x0FCA5167, 0x71FF904C, 0x2D195FFE,
-	0x1A05645F, 0x0C13FEFE, 0x081B08CA, 0x05170121,
-	0x80530100, 0xE83E5EFE, 0xAC9AF4F8, 0x7FE72701,
-	0xD2B8EE5F, 0x06DF4261, 0xBB9E9B8A, 0x7293EA25,
-	0xCE84FFDF, 0xF5718801, 0x3DD64B04, 0xA26F263B,
-	0x7ED48400, 0x547EEBE6, 0x446D4CA0, 0x6CF3D6F5,
-	0x2649ABDF, 0xAEA0C7F5, 0x36338CC1, 0x503F7E93,
-	0xD3772061, 0x11B638E1, 0x72500E03, 0xF80EB2BB,
-	0xABE0502E, 0xEC8D77DE, 0x57971E81, 0xE14F6746,
-	0xC9335400, 0x6920318F, 0x081DBB99, 0xFFC304A5,
-	0x4D351805, 0x7F3D5CE3, 0xA6C866C6, 0x5D5BCCA9,
-	0xDAEC6FEA, 0x9F926F91, 0x9F46222F, 0x3991467D,
-	0xA5BF6D8E, 0x1143C44F, 0x43958302, 0xD0214EEB,
-	0x022083B8, 0x3FB6180C, 0x18F8931E, 0x281658E6,
-	0x26486E3E, 0x8BD78A70, 0x7477E4C1, 0xB506E07C,
-	0xF32D0A25, 0x79098B02, 0xE4EABB81, 0x28123B23,
-	0x69DEAD38, 0x1574CA16, 0xDF871B62, 0x211C40B7,
-	0xA51A9EF9, 0x0014377B, 0x041E8AC8, 0x09114003,
-	0xBD59E4D2, 0xE3D156D5, 0x4FE876D5, 0x2F91A340,
-	0x557BE8DE, 0x00EAE4A7, 0x0CE5C2EC, 0x4DB4BBA6,
-	0xE756BDFF, 0xDD3369AC, 0xEC17B035, 0x06572327,
-	0x99AFC8B0, 0x56C8C391, 0x6B65811C, 0x5E146119,
-	0x6E85CB75, 0xBE07C002, 0xC2325577, 0x893FF4EC,
-	0x5BBFC92D, 0xD0EC3B25, 0xB7801AB7, 0x8D6D3B24,
-	0x20C763EF, 0xC366A5FC, 0x9C382880, 0x0ACE3205,
-	0xAAC9548A, 0xECA1D7C7, 0x041AFA32, 0x1D16625A,
-	0x6701902C, 0x9B757A54, 0x31D477F7, 0x9126B031,
-	0x36CC6FDB, 0xC70B8B46, 0xD9E66A48, 0x56E55A79,
-	0x026A4CEB, 0x52437EFF, 0x2F8F76B4, 0x0DF980A5,
-	0x8674CDE3, 0xEDDA04EB, 0x17A9BE04, 0x2C18F4DF,
-	0xB7747F9D, 0xAB2AF7B4, 0xEFC34D20, 0x2E096B7C,
-	0x1741A254, 0xE5B6A035, 0x213D42F6, 0x2C1C7C26,
-	0x61C2F50F, 0x6552DAF9, 0xD2C231F8, 0x25130F69,
-	0xD8167FA2, 0x0418F2C8, 0x001A96A6, 0x0D1526AB,
-	0x63315C21, 0x5E0A72EC, 0x49BAFEFD, 0x187908D9,
-	0x8D0DBD86, 0x311170A7, 0x3E9B640C, 0xCC3E10D7,
-	0xD5CAD3B6, 0x0CAEC388, 0xF73001E1, 0x6C728AFF,
-	0x71EAE2A1, 0x1F9AF36E, 0xCFCBD12F, 0xC1DE8417,
-	0xAC07BE6B, 0xCB44A1D8, 0x8B9B0F56, 0x013988C3,
-	0xB1C52FCA, 0xB4BE31CD, 0xD8782806, 0x12A3A4E2,
-	0x6F7DE532, 0x58FD7EB6, 0xD01EE900, 0x24ADFFC2,
-	0xF4990FC5, 0x9711AAC5, 0x001D7B95, 0x82E5E7D2,
-	0x109873F6, 0x00613096, 0xC32D9521, 0xADA121FF,
-	0x29908415, 0x7FBB977F, 0xAF9EB3DB, 0x29C9ED2A,
-	0x5CE2A465, 0xA730F32C, 0xD0AA3FE8, 0x8A5CC091,
-	0xD49E2CE7, 0x0CE454A9, 0xD60ACD86, 0x015F1919,
-	0x77079103, 0xDEA03AF6, 0x78A8565E, 0xDEE356DF,
-	0x21F05CBE, 0x8B75E387, 0xB3C50651, 0xB8A5C3EF,
-	0xD8EEB6D2, 0xE523BE77, 0xC2154529, 0x2F69EFDF,
-	0xAFE67AFB, 0xF470C4B2, 0xF3E0EB5B, 0xD6CC9876,
-	0x39E4460C, 0x1FDA8538, 0x1987832F, 0xCA007367,
-	0xA99144F8, 0x296B299E, 0x492FC295, 0x9266BEAB,
-	0xB5676E69, 0x9BD3DDDA, 0xDF7E052F, 0xDB25701C,
-	0x1B5E51EE, 0xF65324E6, 0x6AFCE36C, 0x0316CC04,
-	0x8644213E, 0xB7DC59D0, 0x7965291F, 0xCCD6FD43,
-	0x41823979, 0x932BCDF6, 0xB657C34D, 0x4EDFD282,
-	0x7AE5290C, 0x3CB9536B, 0x851E20FE, 0x9833557E,
-	0x13ECF0B0, 0xD3FFB372, 0x3F85C5C1, 0x0AEF7ED2
-};
-
-static const uint32_t cast_sbox5[256] = {
-	0x7EC90C04, 0x2C6E74B9, 0x9B0E66DF, 0xA6337911,
-	0xB86A7FFF, 0x1DD358F5, 0x44DD9D44, 0x1731167F,
-	0x08FBF1FA, 0xE7F511CC, 0xD2051B00, 0x735ABA00,
-	0x2AB722D8, 0x386381CB, 0xACF6243A, 0x69BEFD7A,
-	0xE6A2E77F, 0xF0C720CD, 0xC4494816, 0xCCF5C180,
-	0x38851640, 0x15B0A848, 0xE68B18CB, 0x4CAADEFF,
-	0x5F480A01, 0x0412B2AA, 0x259814FC, 0x41D0EFE2,
-	0x4E40B48D, 0x248EB6FB, 0x8DBA1CFE, 0x41A99B02,
-	0x1A550A04, 0xBA8F65CB, 0x7251F4E7, 0x95A51725,
-	0xC106ECD7, 0x97A5980A, 0xC539B9AA, 0x4D79FE6A,
-	0xF2F3F763, 0x68AF8040, 0xED0C9E56, 0x11B4958B,
-	0xE1EB5A88, 0x8709E6B0, 0xD7E07156, 0x4E29FEA7,
-	0x6366E52D, 0x02D1C000, 0xC4AC8E05, 0x9377F571,
-	0x0C05372A, 0x578535F2, 0x2261BE02, 0xD642A0C9,
-	0xDF13A280, 0x74B55BD2, 0x682199C0, 0xD421E5EC,
-	0x53FB3CE8, 0xC8ADEDB3, 0x28A87FC9, 0x3D959981,
-	0x5C1FF900, 0xFE38D399, 0x0C4EFF0B, 0x062407EA,
-	0xAA2F4FB1, 0x4FB96976, 0x90C79505, 0xB0A8A774,
-	0xEF55A1FF, 0xE59CA2C2, 0xA6B62D27, 0xE66A4263,
-	0xDF65001F, 0x0EC50966, 0xDFDD55BC, 0x29DE0655,
-	0x911E739A, 0x17AF8975, 0x32C7911C, 0x89F89468,
-	0x0D01E980, 0x524755F4, 0x03B63CC9, 0x0CC844B2,
-	0xBCF3F0AA, 0x87AC36E9, 0xE53A7426, 0x01B3D82B,
-	0x1A9E7449, 0x64EE2D7E, 0xCDDBB1DA, 0x01C94910,
-	0xB868BF80, 0x0D26F3FD, 0x9342EDE7, 0x04A5C284,
-	0x636737B6, 0x50F5B616, 0xF24766E3, 0x8ECA36C1,
-	0x136E05DB, 0xFEF18391, 0xFB887A37, 0xD6E7F7D4,
-	0xC7FB7DC9, 0x3063FCDF, 0xB6F589DE, 0xEC2941DA,
-	0x26E46695, 0xB7566419, 0xF654EFC5, 0xD08D58B7,
-	0x48925401, 0xC1BACB7F, 0xE5FF550F, 0xB6083049,
-	0x5BB5D0E8, 0x87D72E5A, 0xAB6A6EE1, 0x223A66CE,
-	0xC62BF3CD, 0x9E0885F9, 0x68CB3E47, 0x086C010F,
-	0xA21DE820, 0xD18B69DE, 0xF3F65777, 0xFA02C3F6,
-	0x407EDAC3, 0xCBB3D550, 0x1793084D, 0xB0D70EBA,
-	0x0AB378D5, 0xD951FB0C, 0xDED7DA56, 0x4124BBE4,
-	0x94CA0B56, 0x0F5755D1, 0xE0E1E56E, 0x6184B5BE,
-	0x580A249F, 0x94F74BC0, 0xE327888E, 0x9F7B5561,
-	0xC3DC0280, 0x05687715, 0x646C6BD7, 0x44904DB3,
-	0x66B4F0A3, 0xC0F1648A, 0x697ED5AF, 0x49E92FF6,
-	0x309E374F, 0x2CB6356A, 0x85808573, 0x4991F840,
-	0x76F0AE02, 0x083BE84D, 0x28421C9A, 0x44489406,
-	0x736E4CB8, 0xC1092910, 0x8BC95FC6, 0x7D869CF4,
-	0x134F616F, 0x2E77118D, 0xB31B2BE1, 0xAA90B472,
-	0x3CA5D717, 0x7D161BBA, 0x9CAD9010, 0xAF462BA2,
-	0x9FE459D2, 0x45D34559, 0xD9F2DA13, 0xDBC65487,
-	0xF3E4F94E, 0x176D486F, 0x097C13EA, 0x631DA5C7,
-	0x445F7382, 0x175683F4, 0xCDC66A97, 0x70BE0288,
-	0xB3CDCF72, 0x6E5DD2F3, 0x20936079, 0x459B80A5,
-	0xBE60E2DB, 0xA9C23101, 0xEBA5315C, 0x224E42F2,
-	0x1C5C1572, 0xF6721B2C, 0x1AD2FFF3, 0x8C25404E,
-	0x324ED72F, 0x4067B7FD, 0x0523138E, 0x5CA3BC78,
-	0xDC0FD66E, 0x75922283, 0x784D6B17, 0x58EBB16E,
-	0x44094F85, 0x3F481D87, 0xFCFEAE7B, 0x77B5FF76,
-	0x8C2302BF, 0xAAF47556, 0x5F46B02A, 0x2B092801,
-	0x3D38F5F7, 0x0CA81F36, 0x52AF4A8A, 0x66D5E7C0,
-	0xDF3B0874, 0x95055110, 0x1B5AD7A8, 0xF61ED5AD,
-	0x6CF6E479, 0x20758184, 0xD0CEFA65, 0x88F7BE58,
-	0x4A046826, 0x0FF6F8F3, 0xA09C7F70, 0x5346ABA0,
-	0x5CE96C28, 0xE176EDA3, 0x6BAC307F, 0x376829D2,
-	0x85360FA9, 0x17E3FE2A, 0x24B79767, 0xF5A96B20,
-	0xD6CD2595, 0x68FF1EBF, 0x7555442C, 0xF19F06BE,
-	0xF9E0659A, 0xEEB9491D, 0x34010718, 0xBB30CAB8,
-	0xE822FE15, 0x88570983, 0x750E6249, 0xDA627E55,
-	0x5E76FFA8, 0xB1534546, 0x6D47DE08, 0xEFE9E7D4
-};
-
-static const uint32_t cast_sbox6[256] = {
-	0xF6FA8F9D, 0x2CAC6CE1, 0x4CA34867, 0xE2337F7C,
-	0x95DB08E7, 0x016843B4, 0xECED5CBC, 0x325553AC,
-	0xBF9F0960, 0xDFA1E2ED, 0x83F0579D, 0x63ED86B9,
-	0x1AB6A6B8, 0xDE5EBE39, 0xF38FF732, 0x8989B138,
-	0x33F14961, 0xC01937BD, 0xF506C6DA, 0xE4625E7E,
-	0xA308EA99, 0x4E23E33C, 0x79CBD7CC, 0x48A14367,
-	0xA3149619, 0xFEC94BD5, 0xA114174A, 0xEAA01866,
-	0xA084DB2D, 0x09A8486F, 0xA888614A, 0x2900AF98,
-	0x01665991, 0xE1992863, 0xC8F30C60, 0x2E78EF3C,
-	0xD0D51932, 0xCF0FEC14, 0xF7CA07D2, 0xD0A82072,
-	0xFD41197E, 0x9305A6B0, 0xE86BE3DA, 0x74BED3CD,
-	0x372DA53C, 0x4C7F4448, 0xDAB5D440, 0x6DBA0EC3,
-	0x083919A7, 0x9FBAEED9, 0x49DBCFB0, 0x4E670C53,
-	0x5C3D9C01, 0x64BDB941, 0x2C0E636A, 0xBA7DD9CD,
-	0xEA6F7388, 0xE70BC762, 0x35F29ADB, 0x5C4CDD8D,
-	0xF0D48D8C, 0xB88153E2, 0x08A19866, 0x1AE2EAC8,
-	0x284CAF89, 0xAA928223, 0x9334BE53, 0x3B3A21BF,
-	0x16434BE3, 0x9AEA3906, 0xEFE8C36E, 0xF890CDD9,
-	0x80226DAE, 0xC340A4A3, 0xDF7E9C09, 0xA694A807,
-	0x5B7C5ECC, 0x221DB3A6, 0x9A69A02F, 0x68818A54,
-	0xCEB2296F, 0x53C0843A, 0xFE893655, 0x25BFE68A,
-	0xB4628ABC, 0xCF222EBF, 0x25AC6F48, 0xA9A99387,
-	0x53BDDB65, 0xE76FFBE7, 0xE967FD78, 0x0BA93563,
-	0x8E342BC1, 0xE8A11BE9, 0x4980740D, 0xC8087DFC,
-	0x8DE4BF99, 0xA11101A0, 0x7FD37975, 0xDA5A26C0,
-	0xE81F994F, 0x9528CD89, 0xFD339FED, 0xB87834BF,
-	0x5F04456D, 0x22258698, 0xC9C4C83B, 0x2DC156BE,
-	0x4F628DAA, 0x57F55EC5, 0xE2220ABE, 0xD2916EBF,
-	0x4EC75B95, 0x24F2C3C0, 0x42D15D99, 0xCD0D7FA0,
-	0x7B6E27FF, 0xA8DC8AF0, 0x7345C106, 0xF41E232F,
-	0x35162386, 0xE6EA8926, 0x3333B094, 0x157EC6F2,
-	0x372B74AF, 0x692573E4, 0xE9A9D848, 0xF3160289,
-	0x3A62EF1D, 0xA787E238, 0xF3A5F676, 0x74364853,
-	0x20951063, 0x4576698D, 0xB6FAD407, 0x592AF950,
-	0x36F73523, 0x4CFB6E87, 0x7DA4CEC0, 0x6C152DAA,
-	0xCB0396A8, 0xC50DFE5D, 0xFCD707AB, 0x0921C42F,
-	0x89DFF0BB, 0x5FE2BE78, 0x448F4F33, 0x754613C9,
-	0x2B05D08D, 0x48B9D585, 0xDC049441, 0xC8098F9B,
-	0x7DEDE786, 0xC39A3373, 0x42410005, 0x6A091751,
-	0x0EF3C8A6, 0x890072D6, 0x28207682, 0xA9A9F7BE,
-	0xBF32679D, 0xD45B5B75, 0xB353FD00, 0xCBB0E358,
-	0x830F220A, 0x1F8FB214, 0xD372CF08, 0xCC3C4A13,
-	0x8CF63166, 0x061C87BE, 0x88C98F88, 0x6062E397,
-	0x47CF8E7A, 0xB6C85283, 0x3CC2ACFB, 0x3FC06976,
-	0x4E8F0252, 0x64D8314D, 0xDA3870E3, 0x1E665459,
-	0xC10908F0, 0x513021A5, 0x6C5B68B7, 0x822F8AA0,
-	0x3007CD3E, 0x74719EEF, 0xDC872681, 0x073340D4,
-	0x7E432FD9, 0x0C5EC241, 0x8809286C, 0xF592D891,
-	0x08A930F6, 0x957EF305, 0xB7FBFFBD, 0xC266E96F,
-	0x6FE4AC98, 0xB173ECC0, 0xBC60B42A, 0x953498DA,
-	0xFBA1AE12, 0x2D4BD736, 0x0F25FAAB, 0xA4F3FCEB,
-	0xE2969123, 0x257F0C3D, 0x9348AF49, 0x361400BC,
-	0xE8816F4A, 0x3814F200, 0xA3F94043, 0x9C7A54C2,
-	0xBC704F57, 0xDA41E7F9, 0xC25AD33A, 0x54F4A084,
-	0xB17F5505, 0x59357CBE, 0xEDBD15C8, 0x7F97C5AB,
-	0xBA5AC7B5, 0xB6F6DEAF, 0x3A479C3A, 0x5302DA25,
-	0x653D7E6A, 0x54268D49, 0x51A477EA, 0x5017D55B,
-	0xD7D25D88, 0x44136C76, 0x0404A8C8, 0xB8E5A121,
-	0xB81A928A, 0x60ED5869, 0x97C55B96, 0xEAEC991B,
-	0x29935913, 0x01FDB7F1, 0x088E8DFA, 0x9AB6F6F5,
-	0x3B4CBF9F, 0x4A5DE3AB, 0xE6051D35, 0xA0E1D855,
-	0xD36B4CF1, 0xF544EDEB, 0xB0E93524, 0xBEBB8FBD,
-	0xA2D762CF, 0x49C92F54, 0x38B5F331, 0x7128A454,
-	0x48392905, 0xA65B1DB8, 0x851C97BD, 0xD675CF2F
-};
-
-static const uint32_t cast_sbox7[256] = {
-	0x85E04019, 0x332BF567, 0x662DBFFF, 0xCFC65693,
-	0x2A8D7F6F, 0xAB9BC912, 0xDE6008A1, 0x2028DA1F,
-	0x0227BCE7, 0x4D642916, 0x18FAC300, 0x50F18B82,
-	0x2CB2CB11, 0xB232E75C, 0x4B3695F2, 0xB28707DE,
-	0xA05FBCF6, 0xCD4181E9, 0xE150210C, 0xE24EF1BD,
-	0xB168C381, 0xFDE4E789, 0x5C79B0D8, 0x1E8BFD43,
-	0x4D495001, 0x38BE4341, 0x913CEE1D, 0x92A79C3F,
-	0x089766BE, 0xBAEEADF4, 0x1286BECF, 0xB6EACB19,
-	0x2660C200, 0x7565BDE4, 0x64241F7A, 0x8248DCA9,
-	0xC3B3AD66, 0x28136086, 0x0BD8DFA8, 0x356D1CF2,
-	0x107789BE, 0xB3B2E9CE, 0x0502AA8F, 0x0BC0351E,
-	0x166BF52A, 0xEB12FF82, 0xE3486911, 0xD34D7516,
-	0x4E7B3AFF, 0x5F43671B, 0x9CF6E037, 0x4981AC83,
-	0x334266CE, 0x8C9341B7, 0xD0D854C0, 0xCB3A6C88,
-	0x47BC2829, 0x4725BA37, 0xA66AD22B, 0x7AD61F1E,
-	0x0C5CBAFA, 0x4437F107, 0xB6E79962, 0x42D2D816,
-	0x0A961288, 0xE1A5C06E, 0x13749E67, 0x72FC081A,
-	0xB1D139F7, 0xF9583745, 0xCF19DF58, 0xBEC3F756,
-	0xC06EBA30, 0x07211B24, 0x45C28829, 0xC95E317F,
-	0xBC8EC511, 0x38BC46E9, 0xC6E6FA14, 0xBAE8584A,
-	0xAD4EBC46, 0x468F508B, 0x7829435F, 0xF124183B,
-	0x821DBA9F, 0xAFF60FF4, 0xEA2C4E6D, 0x16E39264,
-	0x92544A8B, 0x009B4FC3, 0xABA68CED, 0x9AC96F78,
-	0x06A5B79A, 0xB2856E6E, 0x1AEC3CA9, 0xBE838688,
-	0x0E0804E9, 0x55F1BE56, 0xE7E5363B, 0xB3A1F25D,
-	0xF7DEBB85, 0x61FE033C, 0x16746233, 0x3C034C28,
-	0xDA6D0C74, 0x79AAC56C, 0x3CE4E1AD, 0x51F0C802,
-	0x98F8F35A, 0x1626A49F, 0xEED82B29, 0x1D382FE3,
-	0x0C4FB99A, 0xBB325778, 0x3EC6D97B, 0x6E77A6A9,
-	0xCB658B5C, 0xD45230C7, 0x2BD1408B, 0x60C03EB7,
-	0xB9068D78, 0xA33754F4, 0xF430C87D, 0xC8A71302,
-	0xB96D8C32, 0xEBD4E7BE, 0xBE8B9D2D, 0x7979FB06,
-	0xE7225308, 0x8B75CF77, 0x11EF8DA4, 0xE083C858,
-	0x8D6B786F, 0x5A6317A6, 0xFA5CF7A0, 0x5DDA0033,
-	0xF28EBFB0, 0xF5B9C310, 0xA0EAC280, 0x08B9767A,
-	0xA3D9D2B0, 0x79D34217, 0x021A718D, 0x9AC6336A,
-	0x2711FD60, 0x438050E3, 0x069908A8, 0x3D7FEDC4,
-	0x826D2BEF, 0x4EEB8476, 0x488DCF25, 0x36C9D566,
-	0x28E74E41, 0xC2610ACA, 0x3D49A9CF, 0xBAE3B9DF,
-	0xB65F8DE6, 0x92AEAF64, 0x3AC7D5E6, 0x9EA80509,
-	0xF22B017D, 0xA4173F70, 0xDD1E16C3, 0x15E0D7F9,
-	0x50B1B887, 0x2B9F4FD5, 0x625ABA82, 0x6A017962,
-	0x2EC01B9C, 0x15488AA9, 0xD716E740, 0x40055A2C,
-	0x93D29A22, 0xE32DBF9A, 0x058745B9, 0x3453DC1E,
-	0xD699296E, 0x496CFF6F, 0x1C9F4986, 0xDFE2ED07,
-	0xB87242D1, 0x19DE7EAE, 0x053E561A, 0x15AD6F8C,
-	0x66626C1C, 0x7154C24C, 0xEA082B2A, 0x93EB2939,
-	0x17DCB0F0, 0x58D4F2AE, 0x9EA294FB, 0x52CF564C,
-	0x9883FE66, 0x2EC40581, 0x763953C3, 0x01D6692E,
-	0xD3A0C108, 0xA1E7160E, 0xE4F2DFA6, 0x693ED285,
-	0x74904698, 0x4C2B0EDD, 0x4F757656, 0x5D393378,
-	0xA132234F, 0x3D321C5D, 0xC3F5E194, 0x4B269301,
-	0xC79F022F, 0x3C997E7E, 0x5E4F9504, 0x3FFAFBBD,
-	0x76F7AD0E, 0x296693F4, 0x3D1FCE6F, 0xC61E45BE,
-	0xD3B5AB34, 0xF72BF9B7, 0x1B0434C0, 0x4E72B567,
-	0x5592A33D, 0xB5229301, 0xCFD2A87F, 0x60AEB767,
-	0x1814386B, 0x30BCC33D, 0x38A0C07D, 0xFD1606F2,
-	0xC363519B, 0x589DD390, 0x5479F8E6, 0x1CB8D647,
-	0x97FD61A9, 0xEA7759F4, 0x2D57539D, 0x569A58CF,
-	0xE84E63AD, 0x462E1B78, 0x6580F87E, 0xF3817914,
-	0x91DA55F4, 0x40A230F3, 0xD1988F35, 0xB6E318D2,
-	0x3FFA50BC, 0x3D40F021, 0xC3C0BDAE, 0x4958C24C,
-	0x518F36B2, 0x84B1D370, 0x0FEDCE83, 0x878DDADA,
-	0xF2A279C7, 0x94E01BE8, 0x90716F4B, 0x954B8AA3
-};
-
-static const uint32_t cast_sbox8[256] = {
-	0xE216300D, 0xBBDDFFFC, 0xA7EBDABD, 0x35648095,
-	0x7789F8B7, 0xE6C1121B, 0x0E241600, 0x052CE8B5,
-	0x11A9CFB0, 0xE5952F11, 0xECE7990A, 0x9386D174,
-	0x2A42931C, 0x76E38111, 0xB12DEF3A, 0x37DDDDFC,
-	0xDE9ADEB1, 0x0A0CC32C, 0xBE197029, 0x84A00940,
-	0xBB243A0F, 0xB4D137CF, 0xB44E79F0, 0x049EEDFD,
-	0x0B15A15D, 0x480D3168, 0x8BBBDE5A, 0x669DED42,
-	0xC7ECE831, 0x3F8F95E7, 0x72DF191B, 0x7580330D,
-	0x94074251, 0x5C7DCDFA, 0xABBE6D63, 0xAA402164,
-	0xB301D40A, 0x02E7D1CA, 0x53571DAE, 0x7A3182A2,
-	0x12A8DDEC, 0xFDAA335D, 0x176F43E8, 0x71FB46D4,
-	0x38129022, 0xCE949AD4, 0xB84769AD, 0x965BD862,
-	0x82F3D055, 0x66FB9767, 0x15B80B4E, 0x1D5B47A0,
-	0x4CFDE06F, 0xC28EC4B8, 0x57E8726E, 0x647A78FC,
-	0x99865D44, 0x608BD593, 0x6C200E03, 0x39DC5FF6,
-	0x5D0B00A3, 0xAE63AFF2, 0x7E8BD632, 0x70108C0C,
-	0xBBD35049, 0x2998DF04, 0x980CF42A, 0x9B6DF491,
-	0x9E7EDD53, 0x06918548, 0x58CB7E07, 0x3B74EF2E,
-	0x522FFFB1, 0xD24708CC, 0x1C7E27CD, 0xA4EB215B,
-	0x3CF1D2E2, 0x19B47A38, 0x424F7618, 0x35856039,
-	0x9D17DEE7, 0x27EB35E6, 0xC9AFF67B, 0x36BAF5B8,
-	0x09C467CD, 0xC18910B1, 0xE11DBF7B, 0x06CD1AF8,
-	0x7170C608, 0x2D5E3354, 0xD4DE495A, 0x64C6D006,
-	0xBCC0C62C, 0x3DD00DB3, 0x708F8F34, 0x77D51B42,
-	0x264F620F, 0x24B8D2BF, 0x15C1B79E, 0x46A52564,
-	0xF8D7E54E, 0x3E378160, 0x7895CDA5, 0x859C15A5,
-	0xE6459788, 0xC37BC75F, 0xDB07BA0C, 0x0676A3AB,
-	0x7F229B1E, 0x31842E7B, 0x24259FD7, 0xF8BEF472,
-	0x835FFCB8, 0x6DF4C1F2, 0x96F5B195, 0xFD0AF0FC,
-	0xB0FE134C, 0xE2506D3D, 0x4F9B12EA, 0xF215F225,
-	0xA223736F, 0x9FB4C428, 0x25D04979, 0x34C713F8,
-	0xC4618187, 0xEA7A6E98, 0x7CD16EFC, 0x1436876C,
-	0xF1544107, 0xBEDEEE14, 0x56E9AF27, 0xA04AA441,
-	0x3CF7C899, 0x92ECBAE6, 0xDD67016D, 0x151682EB,
-	0xA842EEDF, 0xFDBA60B4, 0xF1907B75, 0x20E3030F,
-	0x24D8C29E, 0xE139673B, 0xEFA63FB8, 0x71873054,
-	0xB6F2CF3B, 0x9F326442, 0xCB15A4CC, 0xB01A4504,
-	0xF1E47D8D, 0x844A1BE5, 0xBAE7DFDC, 0x42CBDA70,
-	0xCD7DAE0A, 0x57E85B7A, 0xD53F5AF6, 0x20CF4D8C,
-	0xCEA4D428, 0x79D130A4, 0x3486EBFB, 0x33D3CDDC,
-	0x77853B53, 0x37EFFCB5, 0xC5068778, 0xE580B3E6,
-	0x4E68B8F4, 0xC5C8B37E, 0x0D809EA2, 0x398FEB7C,
-	0x132A4F94, 0x43B7950E, 0x2FEE7D1C, 0x223613BD,
-	0xDD06CAA2, 0x37DF932B, 0xC4248289, 0xACF3EBC3,
-	0x5715F6B7, 0xEF3478DD, 0xF267616F, 0xC148CBE4,
-	0x9052815E, 0x5E410FAB, 0xB48A2465, 0x2EDA7FA4,
-	0xE87B40E4, 0xE98EA084, 0x5889E9E1, 0xEFD390FC,
-	0xDD07D35B, 0xDB485694, 0x38D7E5B2, 0x57720101,
-	0x730EDEBC, 0x5B643113, 0x94917E4F, 0x503C2FBA,
-	0x646F1282, 0x7523D24A, 0xE0779695, 0xF9C17A8F,
-	0x7A5B2121, 0xD187B896, 0x29263A4D, 0xBA510CDF,
-	0x81F47C9F, 0xAD1163ED, 0xEA7B5965, 0x1A00726E,
-	0x11403092, 0x00DA6D77, 0x4A0CDD61, 0xAD1F4603,
-	0x605BDFB0, 0x9EEDC364, 0x22EBE6A8, 0xCEE7D28A,
-	0xA0E736A0, 0x5564A6B9, 0x10853209, 0xC7EB8F37,
-	0x2DE705CA, 0x8951570F, 0xDF09822B, 0xBD691A6C,
-	0xAA12E4F2, 0x87451C0F, 0xE0F6A27A, 0x3ADA4819,
-	0x4CF1764F, 0x0D771C2B, 0x67CDB156, 0x350D8384,
-	0x5938FA0F, 0x42399EF3, 0x36997B07, 0x0E84093D,
-	0x4AA93E61, 0x8360D87B, 0x1FA98B0C, 0x1149382C,
-	0xE97625A5, 0x0614D1B7, 0x0E25244B, 0x0C768347,
-	0x589E8D82, 0x0D2059D1, 0xA466BB1E, 0xF8DA0A82,
-	0x04F19130, 0xBA6E4EC0, 0x99265164, 0x1EE7230D,
-	0x50B2AD80, 0xEAEE6801, 0x8DB2A283, 0xEA8BF59E
-};
-
diff --git a/include.new/crypto/cryptodev.h b/include.new/crypto/cryptodev.h
deleted file mode 100644
index e54c36a..0000000
--- a/include.new/crypto/cryptodev.h
+++ /dev/null
@@ -1,432 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/opencrypto/cryptodev.h 213068 2010-09-23 11:52:32Z pjd $	*/
-/*	$OpenBSD: cryptodev.h,v 1.31 2002/06/11 11:14:29 beck Exp $	*/
-
-/*-
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
- * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting
- *
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
- * supported the development of this code.
- *
- * Copyright (c) 2000 Angelos D. Keromytis
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all source code copies of any software which is or includes a copy or
- * modification of this software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- *
- * Copyright (c) 2001 Theo de Raadt
- *
- * 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 ``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 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.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- */
-
-#ifndef _CRYPTO_CRYPTO_H_
-#define _CRYPTO_CRYPTO_H_
-
-#include <sys/ioccom.h>
-
-/* Some initial values */
-#define CRYPTO_DRIVERS_INITIAL	4
-#define CRYPTO_SW_SESSIONS	32
-
-/* Hash values */
-#define	NULL_HASH_LEN		16
-#define	MD5_HASH_LEN		16
-#define	SHA1_HASH_LEN		20
-#define	RIPEMD160_HASH_LEN	20
-#define	SHA2_256_HASH_LEN	32
-#define	SHA2_384_HASH_LEN	48
-#define	SHA2_512_HASH_LEN	64
-#define	MD5_KPDK_HASH_LEN	16
-#define	SHA1_KPDK_HASH_LEN	20
-/* Maximum hash algorithm result length */
-#define	HASH_MAX_LEN		SHA2_512_HASH_LEN /* Keep this updated */
-
-/* HMAC values */
-#define	NULL_HMAC_BLOCK_LEN		64
-#define	MD5_HMAC_BLOCK_LEN		64
-#define	SHA1_HMAC_BLOCK_LEN		64
-#define	RIPEMD160_HMAC_BLOCK_LEN	64
-#define	SHA2_256_HMAC_BLOCK_LEN		64
-#define	SHA2_384_HMAC_BLOCK_LEN		128
-#define	SHA2_512_HMAC_BLOCK_LEN		128
-/* Maximum HMAC block length */
-#define	HMAC_MAX_BLOCK_LEN		SHA2_512_HMAC_BLOCK_LEN /* Keep this updated */
-#define	HMAC_IPAD_VAL			0x36
-#define	HMAC_OPAD_VAL			0x5C
-
-/* Encryption algorithm block sizes */
-#define NULL_BLOCK_LEN		4
-#define DES_BLOCK_LEN		8
-#define DES3_BLOCK_LEN		8
-#define BLOWFISH_BLOCK_LEN	8
-#define SKIPJACK_BLOCK_LEN	8
-#define CAST128_BLOCK_LEN	8
-#define RIJNDAEL128_BLOCK_LEN	16
-#define AES_BLOCK_LEN		RIJNDAEL128_BLOCK_LEN
-#define CAMELLIA_BLOCK_LEN	16
-#define EALG_MAX_BLOCK_LEN	AES_BLOCK_LEN /* Keep this updated */
-
-#define	CRYPTO_ALGORITHM_MIN	1
-#define CRYPTO_DES_CBC		1
-#define CRYPTO_3DES_CBC		2
-#define CRYPTO_BLF_CBC		3
-#define CRYPTO_CAST_CBC		4
-#define CRYPTO_SKIPJACK_CBC	5
-#define CRYPTO_MD5_HMAC		6
-#define CRYPTO_SHA1_HMAC	7
-#define CRYPTO_RIPEMD160_HMAC	8
-#define CRYPTO_MD5_KPDK		9
-#define CRYPTO_SHA1_KPDK	10
-#define CRYPTO_RIJNDAEL128_CBC	11 /* 128 bit blocksize */
-#define CRYPTO_AES_CBC		11 /* 128 bit blocksize -- the same as above */
-#define CRYPTO_ARC4		12
-#define	CRYPTO_MD5		13
-#define	CRYPTO_SHA1		14
-#define	CRYPTO_NULL_HMAC	15
-#define	CRYPTO_NULL_CBC		16
-#define	CRYPTO_DEFLATE_COMP	17 /* Deflate compression algorithm */
-#define	CRYPTO_SHA2_256_HMAC	18
-#define	CRYPTO_SHA2_384_HMAC	19
-#define	CRYPTO_SHA2_512_HMAC	20
-#define CRYPTO_CAMELLIA_CBC	21
-#define	CRYPTO_AES_XTS		22
-#define	CRYPTO_ALGORITHM_MAX	22 /* Keep updated - see below */
-
-/* Algorithm flags */
-#define	CRYPTO_ALG_FLAG_SUPPORTED	0x01 /* Algorithm is supported */
-#define	CRYPTO_ALG_FLAG_RNG_ENABLE	0x02 /* Has HW RNG for DH/DSA */
-#define	CRYPTO_ALG_FLAG_DSA_SHA		0x04 /* Can do SHA on msg */
-
-/*
- * Crypto driver/device flags.  They can set in the crid
- * parameter when creating a session or submitting a key
- * op to affect the device/driver assigned.  If neither
- * of these are specified then the crid is assumed to hold
- * the driver id of an existing (and suitable) device that
- * must be used to satisfy the request.
- */
-#define CRYPTO_FLAG_HARDWARE	0x01000000	/* hardware accelerated */
-#define CRYPTO_FLAG_SOFTWARE	0x02000000	/* software implementation */
-
-/* NB: deprecated */
-struct session_op {
-	uint32_t	cipher;		/* ie. CRYPTO_DES_CBC */
-	uint32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
-
-	uint32_t	keylen;		/* cipher key */
-	caddr_t		key;
-	int		mackeylen;	/* mac key */
-	caddr_t		mackey;
-
-  	uint32_t	ses;		/* returns: session # */ 
-};
-
-struct session2_op {
-	uint32_t	cipher;		/* ie. CRYPTO_DES_CBC */
-	uint32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
-
-	uint32_t	keylen;		/* cipher key */
-	caddr_t		key;
-	int		mackeylen;	/* mac key */
-	caddr_t		mackey;
-
-  	uint32_t	ses;		/* returns: session # */ 
-	int		crid;		/* driver id + flags (rw) */
-	int		pad[4];		/* for future expansion */
-};
-
-struct crypt_op {
-	uint32_t	ses;
-	u_int16_t	op;		/* i.e. COP_ENCRYPT */
-#define COP_ENCRYPT	1
-#define COP_DECRYPT	2
-	u_int16_t	flags;
-#define	COP_F_BATCH	0x0008		/* Batch op if possible */
-	u_int		len;
-	caddr_t		src, dst;	/* become iov[] inside kernel */
-	caddr_t		mac;		/* must be big enough for chosen MAC */
-	caddr_t		iv;
-};
-
-/*
- * Parameters for looking up a crypto driver/device by
- * device name or by id.  The latter are returned for
- * created sessions (crid) and completed key operations.
- */
-struct crypt_find_op {
-	int		crid;		/* driver id + flags */
-	char		name[32];	/* device/driver name */
-};
-
-/* bignum parameter, in packed bytes, ... */
-struct crparam {
-	caddr_t		crp_p;
-	u_int		crp_nbits;
-};
-
-#define CRK_MAXPARAM	8
-
-struct crypt_kop {
-	u_int		crk_op;		/* ie. CRK_MOD_EXP or other */
-	u_int		crk_status;	/* return status */
-	u_short		crk_iparams;	/* # of input parameters */
-	u_short		crk_oparams;	/* # of output parameters */
-	u_int		crk_crid;	/* NB: only used by CIOCKEY2 (rw) */
-	struct crparam	crk_param[CRK_MAXPARAM];
-};
-#define	CRK_ALGORITM_MIN	0
-#define CRK_MOD_EXP		0
-#define CRK_MOD_EXP_CRT		1
-#define CRK_DSA_SIGN		2
-#define CRK_DSA_VERIFY		3
-#define CRK_DH_COMPUTE_KEY	4
-#define CRK_ALGORITHM_MAX	4 /* Keep updated - see below */
-
-#define CRF_MOD_EXP		(1 << CRK_MOD_EXP)
-#define CRF_MOD_EXP_CRT		(1 << CRK_MOD_EXP_CRT)
-#define CRF_DSA_SIGN		(1 << CRK_DSA_SIGN)
-#define CRF_DSA_VERIFY		(1 << CRK_DSA_VERIFY)
-#define CRF_DH_COMPUTE_KEY	(1 << CRK_DH_COMPUTE_KEY)
-
-/*
- * done against open of /dev/crypto, to get a cloned descriptor.
- * Please use F_SETFD against the cloned descriptor.
- */
-#define	CRIOGET		_IOWR('c', 100, uint32_t)
-#define	CRIOASYMFEAT	CIOCASYMFEAT
-#define	CRIOFINDDEV	CIOCFINDDEV
-
-/* the following are done against the cloned descriptor */
-#define	CIOCGSESSION	_IOWR('c', 101, struct session_op)
-#define	CIOCFSESSION	_IOW('c', 102, uint32_t)
-#define CIOCCRYPT	_IOWR('c', 103, struct crypt_op)
-#define CIOCKEY		_IOWR('c', 104, struct crypt_kop)
-#define CIOCASYMFEAT	_IOR('c', 105, uint32_t)
-#define	CIOCGSESSION2	_IOWR('c', 106, struct session2_op)
-#define	CIOCKEY2	_IOWR('c', 107, struct crypt_kop)
-#define	CIOCFINDDEV	_IOWR('c', 108, struct crypt_find_op)
-
-struct cryptotstat {
-	struct timespec	acc;		/* total accumulated time */
-	struct timespec	min;		/* min time */
-	struct timespec	max;		/* max time */
-	uint32_t	count;		/* number of observations */
-};
-
-struct cryptostats {
-	uint32_t	cs_ops;		/* symmetric crypto ops submitted */
-	uint32_t	cs_errs;	/* symmetric crypto ops that failed */
-	uint32_t	cs_kops;	/* asymetric/key ops submitted */
-	uint32_t	cs_kerrs;	/* asymetric/key ops that failed */
-	uint32_t	cs_intrs;	/* crypto swi thread activations */
-	uint32_t	cs_rets;	/* crypto return thread activations */
-	uint32_t	cs_blocks;	/* symmetric op driver block */
-	uint32_t	cs_kblocks;	/* symmetric op driver block */
-	/*
-	 * When CRYPTO_TIMING is defined at compile time and the
-	 * sysctl debug.crypto is set to 1, the crypto system will
-	 * accumulate statistics about how long it takes to process
-	 * crypto requests at various points during processing.
-	 */
-	struct cryptotstat cs_invoke;	/* crypto_dipsatch -> crypto_invoke */
-	struct cryptotstat cs_done;	/* crypto_invoke -> crypto_done */
-	struct cryptotstat cs_cb;	/* crypto_done -> callback */
-	struct cryptotstat cs_finis;	/* callback -> callback return */
-};
-
-#ifdef _KERNEL
-/* Standard initialization structure beginning */
-struct cryptoini {
-	int		cri_alg;	/* Algorithm to use */
-	int		cri_klen;	/* Key length, in bits */
-	int		cri_mlen;	/* Number of bytes we want from the
-					   entire hash. 0 means all. */
-	caddr_t		cri_key;	/* key to use */
-	u_int8_t	cri_iv[EALG_MAX_BLOCK_LEN];	/* IV to use */
-	struct cryptoini *cri_next;
-};
-
-/* Describe boundaries of a single crypto operation */
-struct cryptodesc {
-	int		crd_skip;	/* How many bytes to ignore from start */
-	int		crd_len;	/* How many bytes to process */
-	int		crd_inject;	/* Where to inject results, if applicable */
-	int		crd_flags;
-
-#define	CRD_F_ENCRYPT		0x01	/* Set when doing encryption */
-#define	CRD_F_IV_PRESENT	0x02	/* When encrypting, IV is already in
-					   place, so don't copy. */
-#define	CRD_F_IV_EXPLICIT	0x04	/* IV explicitly provided */
-#define	CRD_F_DSA_SHA_NEEDED	0x08	/* Compute SHA-1 of buffer for DSA */
-#define	CRD_F_KEY_EXPLICIT	0x10	/* Key explicitly provided */
-#define CRD_F_COMP		0x0f    /* Set when doing compression */
-
-	struct cryptoini	CRD_INI; /* Initialization/context data */
-#define crd_iv		CRD_INI.cri_iv
-#define crd_key		CRD_INI.cri_key
-#define crd_alg		CRD_INI.cri_alg
-#define crd_klen	CRD_INI.cri_klen
-
-	struct cryptodesc *crd_next;
-};
-
-/* Structure describing complete operation */
-struct cryptop {
-	TAILQ_ENTRY(cryptop) crp_next;
-
-	u_int64_t	crp_sid;	/* Session ID */
-	int		crp_ilen;	/* Input data total length */
-	int		crp_olen;	/* Result total length */
-
-	int		crp_etype;	/*
-					 * Error type (zero means no error).
-					 * All error codes except EAGAIN
-					 * indicate possible data corruption (as in,
-					 * the data have been touched). On all
-					 * errors, the crp_sid may have changed
-					 * (reset to a new one), so the caller
-					 * should always check and use the new
-					 * value on future requests.
-					 */
-	int		crp_flags;
-
-#define CRYPTO_F_IMBUF		0x0001	/* Input/output are mbuf chains */
-#define CRYPTO_F_IOV		0x0002	/* Input/output are uio */
-#define CRYPTO_F_REL		0x0004	/* Must return data in same place */
-#define	CRYPTO_F_BATCH		0x0008	/* Batch op if possible */
-#define	CRYPTO_F_CBIMM		0x0010	/* Do callback immediately */
-#define	CRYPTO_F_DONE		0x0020	/* Operation completed */
-#define	CRYPTO_F_CBIFSYNC	0x0040	/* Do CBIMM if op is synchronous */
-
-	caddr_t		crp_buf;	/* Data to be processed */
-	caddr_t		crp_opaque;	/* Opaque pointer, passed along */
-	struct cryptodesc *crp_desc;	/* Linked list of processing descriptors */
-
-	int (*crp_callback)(struct cryptop *); /* Callback function */
-
-	struct bintime	crp_tstamp;	/* performance time stamp */
-};
-
-#define CRYPTO_BUF_CONTIG	0x0
-#define CRYPTO_BUF_IOV		0x1
-#define CRYPTO_BUF_MBUF		0x2
-
-#define CRYPTO_OP_DECRYPT	0x0
-#define CRYPTO_OP_ENCRYPT	0x1
-
-/*
- * Hints passed to process methods.
- */
-#define	CRYPTO_HINT_MORE	0x1	/* more ops coming shortly */
-
-struct cryptkop {
-	TAILQ_ENTRY(cryptkop) krp_next;
-
-	u_int		krp_op;		/* ie. CRK_MOD_EXP or other */
-	u_int		krp_status;	/* return status */
-	u_short		krp_iparams;	/* # of input parameters */
-	u_short		krp_oparams;	/* # of output parameters */
-	u_int		krp_crid;	/* desired device, etc. */
-	uint32_t	krp_hid;
-	struct crparam	krp_param[CRK_MAXPARAM];	/* kvm */
-	int		(*krp_callback)(struct cryptkop *);
-};
-
-/*
- * Session ids are 64 bits.  The lower 32 bits contain a "local id" which
- * is a driver-private session identifier.  The upper 32 bits contain a
- * "hardware id" used by the core crypto code to identify the driver and
- * a copy of the driver's capabilities that can be used by client code to
- * optimize operation.
- */
-#define	CRYPTO_SESID2HID(_sid)	(((_sid) >> 32) & 0x00ffffff)
-#define	CRYPTO_SESID2CAPS(_sid)	(((_sid) >> 32) & 0xff000000)
-#define	CRYPTO_SESID2LID(_sid)	(((uint32_t) (_sid)) & 0xffffffff)
-
-MALLOC_DECLARE(M_CRYPTO_DATA);
-
-extern	int crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int hard);
-extern	int crypto_freesession(u_int64_t sid);
-#define CRYPTOCAP_F_HARDWARE	CRYPTO_FLAG_HARDWARE
-#define CRYPTOCAP_F_SOFTWARE	CRYPTO_FLAG_SOFTWARE
-#define CRYPTOCAP_F_SYNC	0x04000000	/* operates synchronously */
-extern	int32_t crypto_get_driverid(device_t dev, int flags);
-extern	int crypto_find_driver(const char *);
-extern	device_t crypto_find_device_byhid(int hid);
-extern	int crypto_getcaps(int hid);
-extern	int crypto_register(uint32_t driverid, int alg, u_int16_t maxoplen,
-	    uint32_t flags);
-extern	int crypto_kregister(uint32_t, int, uint32_t);
-extern	int crypto_unregister(uint32_t driverid, int alg);
-extern	int crypto_unregister_all(uint32_t driverid);
-extern	int crypto_dispatch(struct cryptop *crp);
-extern	int crypto_kdispatch(struct cryptkop *);
-#define	CRYPTO_SYMQ	0x1
-#define	CRYPTO_ASYMQ	0x2
-extern	int crypto_unblock(uint32_t, int);
-extern	void crypto_done(struct cryptop *crp);
-extern	void crypto_kdone(struct cryptkop *);
-extern	int crypto_getfeat(int *);
-
-extern	void crypto_freereq(struct cryptop *crp);
-extern	struct cryptop *crypto_getreq(int num);
-
-extern	int crypto_usercrypto;		/* userland may do crypto requests */
-extern	int crypto_userasymcrypto;	/* userland may do asym crypto reqs */
-extern	int crypto_devallowsoft;	/* only use hardware crypto */
-
-/*
- * Crypto-related utility routines used mainly by drivers.
- *
- * XXX these don't really belong here; but for now they're
- *     kept apart from the rest of the system.
- */
-struct uio;
-extern	void cuio_copydata(struct uio* uio, int off, int len, caddr_t cp);
-extern	void cuio_copyback(struct uio* uio, int off, int len, caddr_t cp);
-extern	struct iovec *cuio_getptr(struct uio *uio, int loc, int *off);
-extern	int cuio_apply(struct uio *uio, int off, int len,
-	    int (*f)(void *, void *, u_int), void *arg);
-
-extern	void crypto_copyback(int flags, caddr_t buf, int off, int size,
-	    caddr_t in);
-extern	void crypto_copydata(int flags, caddr_t buf, int off, int size,
-	    caddr_t out);
-extern	int crypto_apply(int flags, caddr_t buf, int off, int len,
-	    int (*f)(void *, void *, u_int), void *arg);
-#endif /* _KERNEL */
-#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/include.new/crypto/cryptosoft.h b/include.new/crypto/cryptosoft.h
deleted file mode 100644
index c64d6df..0000000
--- a/include.new/crypto/cryptosoft.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/opencrypto/cryptosoft.h 167755 2007-03-21 03:42:51Z sam $	*/
-/*	$OpenBSD: cryptosoft.h,v 1.10 2002/04/22 23:10:09 deraadt Exp $	*/
-
-/*-
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
- *
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
- * supported the development of this code.
- *
- * Copyright (c) 2000 Angelos D. Keromytis
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all source code copies of any software which is or includes a copy or
- * modification of this software.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- */
-
-#ifndef _CRYPTO_CRYPTOSOFT_H_
-#define _CRYPTO_CRYPTOSOFT_H_
-
-/* Software session entry */
-struct swcr_data {
-	int		sw_alg;		/* Algorithm */
-	union {
-		struct {
-			u_int8_t	 *SW_ictx;
-			u_int8_t	 *SW_octx;
-			u_int16_t	 SW_klen;
-			u_int16_t	 SW_mlen;
-			struct auth_hash *SW_axf;
-		} SWCR_AUTH;
-		struct {
-			u_int8_t	 *SW_kschedule;
-			struct enc_xform *SW_exf;
-		} SWCR_ENC;
-		struct {
-			uint32_t	 SW_size;
-			struct comp_algo *SW_cxf;
-		} SWCR_COMP;
-	} SWCR_UN;
-
-#define sw_ictx		SWCR_UN.SWCR_AUTH.SW_ictx
-#define sw_octx		SWCR_UN.SWCR_AUTH.SW_octx
-#define sw_klen		SWCR_UN.SWCR_AUTH.SW_klen
-#define sw_mlen		SWCR_UN.SWCR_AUTH.SW_mlen
-#define sw_axf		SWCR_UN.SWCR_AUTH.SW_axf
-#define sw_kschedule	SWCR_UN.SWCR_ENC.SW_kschedule
-#define sw_exf		SWCR_UN.SWCR_ENC.SW_exf
-#define sw_size		SWCR_UN.SWCR_COMP.SW_size
-#define sw_cxf		SWCR_UN.SWCR_COMP.SW_cxf
-
-	struct swcr_data *sw_next;
-};
-
-#ifdef _KERNEL
-extern u_int8_t hmac_ipad_buffer[];
-extern u_int8_t hmac_opad_buffer[];
-#endif /* _KERNEL */
-
-#endif /* _CRYPTO_CRYPTO_H_ */
diff --git a/include.new/crypto/deflate.h b/include.new/crypto/deflate.h
deleted file mode 100644
index 2199107..0000000
--- a/include.new/crypto/deflate.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/opencrypto/deflate.h 199895 2009-11-28 21:08:19Z bz $	*/
-/* $OpenBSD: deflate.h,v 1.3 2002/03/14 01:26:51 millert Exp $ */
-
-/*-
- * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org)
- *
- * 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 ``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 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.
- */
-
-/*
- * Definition for the wrapper around the deflate compression 
- * algorithm used in /sys/crypto
- */
-
-#ifndef _CRYPTO_DEFLATE_H_
-#define _CRYPTO_DEFLATE_H_
-
-#include <net/zlib.h>
-
-#define Z_METHOD	8
-#define Z_MEMLEVEL	8
-#define MINCOMP		2	/* won't be used, but must be defined */
-#define ZBUF		10
-
-uint32_t deflate_global(u_int8_t *, uint32_t, int, u_int8_t **);
-void *z_alloc(void *, u_int, u_int);
-void z_free(void *, void *);
-
-/*
- * We are going to use a combined allocation to hold the metadata
- * from the struct immediately followed by the real application data.
- */
-struct deflate_buf {
-	struct deflate_buf *next;
-	uint32_t size;
-	uint8_t data[];
-};
-
-#endif /* _CRYPTO_DEFLATE_H_ */
diff --git a/include.new/crypto/rijndael.h b/include.new/crypto/rijndael.h
deleted file mode 100644
index 1f05f70..0000000
--- a/include.new/crypto/rijndael.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$KAME: rijndael.h,v 1.6 2003/08/28 08:36:32 itojun Exp $	*/
-/*	$FreeBSD: releng/10.2/sys/crypto/rijndael/rijndael.h 143431 2005-03-11 22:07:04Z ume $	*/
-
-/**
- * rijndael-alg-fst.h
- *
- * @version 3.0 (December 2000)
- *
- * Optimised ANSI C code for the Rijndael cipher (now AES)
- *
- * @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
- * @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
- * @author Paulo Barreto <paulo.barreto@terra.com.br>
- *
- * This code is hereby placed in the public domain.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''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 AUTHORS 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.
- */
-
-#ifndef __RIJNDAEL_H
-#define	__RIJNDAEL_H
-
-#define RIJNDAEL_MAXKC	(256/32)
-#define RIJNDAEL_MAXKB	(256/8)
-#define RIJNDAEL_MAXNR	14
-
-typedef struct {
-	int	decrypt;
-	int	Nr;		/* key-length-dependent number of rounds */
-	uint32_t ek[4 * (RIJNDAEL_MAXNR + 1)];	/* encrypt key schedule */
-	uint32_t dk[4 * (RIJNDAEL_MAXNR + 1)];	/* decrypt key schedule */
-} rijndael_ctx;
-
-void	rijndael_set_key(rijndael_ctx *, const u_char *, int);
-void	rijndael_decrypt(const rijndael_ctx *, const u_char *, u_char *);
-void	rijndael_encrypt(const rijndael_ctx *, const u_char *, u_char *);
-
-int	rijndaelKeySetupEnc(uint32_t [/*4*(Nr+1)*/], const u_int8_t [], int);
-int	rijndaelKeySetupDec(uint32_t [/*4*(Nr+1)*/], const u_int8_t [], int);
-void	rijndaelEncrypt(const uint32_t [/*4*(Nr+1)*/], int,
-	const u_int8_t[16], u_int8_t [16]);
-void	rijndaelDecrypt(const uint32_t [/*4*(Nr+1)*/], int,
-	const u_int8_t [16], u_int8_t [16]);
-
-#endif /* __RIJNDAEL_H */
diff --git a/include.new/crypto/rmd160.h b/include.new/crypto/rmd160.h
deleted file mode 100644
index 32dc9ae..0000000
--- a/include.new/crypto/rmd160.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/opencrypto/rmd160.h 139825 2005-01-07 02:29:27Z imp $	*/
-/*	$OpenBSD: rmd160.h,v 1.3 2002/03/14 01:26:51 millert Exp $	*/
-/*-
- * Copyright (c) 2001 Markus Friedl.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-#ifndef  _RMD160_H
-#define  _RMD160_H
-
-/* RMD160 context. */
-typedef struct RMD160Context {
-	uint32_t state[5];	/* state */
-	u_int64_t count;	/* number of bits, modulo 2^64 */
-	u_char buffer[64];	/* input buffer */
-} RMD160_CTX;
-
-void	 RMD160Init(RMD160_CTX *);
-void	 RMD160Transform(uint32_t [5], const u_char [64]);
-void	 RMD160Update(RMD160_CTX *, const u_char *, uint32_t);
-void	 RMD160Final(u_char [20], RMD160_CTX *);
-
-#endif  /* _RMD160_H */
diff --git a/include.new/crypto/skipjack.h b/include.new/crypto/skipjack.h
deleted file mode 100644
index e0fd02a..0000000
--- a/include.new/crypto/skipjack.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/opencrypto/skipjack.h 139825 2005-01-07 02:29:27Z imp $	*/
-/*	$OpenBSD: skipjack.h,v 1.3 2002/03/14 01:26:51 millert Exp $	*/
-
-/*-
- * Further optimized test implementation of SKIPJACK algorithm 
- * Mark Tillotson <markt@chaos.org.uk>, 25 June 98
- * Optimizations suit RISC (lots of registers) machine best.
- *
- * based on unoptimized implementation of
- * Panu Rissanen <bande@lut.fi> 960624
- *
- * SKIPJACK and KEA Algorithm Specifications 
- * Version 2.0 
- * 29 May 1998
-*/
-
-extern void skipjack_forwards(u_int8_t *plain, u_int8_t *cipher, u_int8_t **key);
-extern void skipjack_backwards(u_int8_t *cipher, u_int8_t *plain, u_int8_t **key);
-extern void subkey_table_gen(u_int8_t *key, u_int8_t **key_tables);
diff --git a/include.new/crypto/xform.h b/include.new/crypto/xform.h
deleted file mode 100644
index 548fdcf..0000000
--- a/include.new/crypto/xform.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/opencrypto/xform.h 219026 2011-02-25 09:29:32Z vanhu $	*/
-/*	$OpenBSD: xform.h,v 1.8 2001/08/28 12:20:43 ben Exp $	*/
-
-/*-
- * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
- *
- * This code was written by Angelos D. Keromytis in Athens, Greece, in
- * February 2000. Network Security Technologies Inc. (NSTI) kindly
- * supported the development of this code.
- *
- * Copyright (c) 2000 Angelos D. Keromytis
- *
- * Permission to use, copy, and modify this software without fee
- * is hereby granted, provided that this entire notice is included in
- * all source code copies of any software which is or includes a copy or
- * modification of this software. 
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- */
-
-#ifndef _CRYPTO_XFORM_H_
-#define _CRYPTO_XFORM_H_
-
-#include <sys/md5.h>
-#include <crypto/sha1.h>
-#include <crypto/sha2/sha2.h>
-#include <opencrypto/rmd160.h>
-
-/* Declarations */
-struct auth_hash {
-	int type;
-	char *name;
-	u_int16_t keysize;
-	u_int16_t hashsize; 
-	u_int16_t blocksize;
-	u_int16_t ctxsize;
-	void (*Init) (void *);
-	int  (*Update) (void *, u_int8_t *, u_int16_t);
-	void (*Final) (u_int8_t *, void *);
-};
-
-/* XXX use a define common with other hash stuff ! */
-#define	AH_ALEN_MAX	64	/* max authenticator hash length */
-
-struct enc_xform {
-	int type;
-	char *name;
-	u_int16_t blocksize;
-	u_int16_t minkey, maxkey;
-	void (*encrypt) (caddr_t, u_int8_t *);
-	void (*decrypt) (caddr_t, u_int8_t *);
-	int (*setkey) (u_int8_t **, u_int8_t *, int len);
-	void (*zerokey) (u_int8_t **);
-	void (*reinit) (caddr_t, u_int8_t *);
-};
-
-struct comp_algo {
-	int type;
-	char *name;
-	size_t minlen;
-	uint32_t (*compress) (u_int8_t *, uint32_t, u_int8_t **);
-	uint32_t (*decompress) (u_int8_t *, uint32_t, u_int8_t **);
-};
-
-union authctx {
-	MD5_CTX md5ctx;
-	SHA1_CTX sha1ctx;
-	RMD160_CTX rmd160ctx;
-	SHA256_CTX sha256ctx;
-	SHA384_CTX sha384ctx;
-	SHA512_CTX sha512ctx;
-};
-
-extern struct enc_xform enc_xform_null;
-extern struct enc_xform enc_xform_des;
-extern struct enc_xform enc_xform_3des;
-extern struct enc_xform enc_xform_blf;
-extern struct enc_xform enc_xform_cast5;
-extern struct enc_xform enc_xform_skipjack;
-extern struct enc_xform enc_xform_rijndael128;
-extern struct enc_xform enc_xform_aes_xts;
-extern struct enc_xform enc_xform_arc4;
-extern struct enc_xform enc_xform_camellia;
-
-extern struct auth_hash auth_hash_null;
-extern struct auth_hash auth_hash_key_md5;
-extern struct auth_hash auth_hash_key_sha1;
-extern struct auth_hash auth_hash_hmac_md5;
-extern struct auth_hash auth_hash_hmac_sha1;
-extern struct auth_hash auth_hash_hmac_ripemd_160;
-extern struct auth_hash auth_hash_hmac_sha2_256;
-extern struct auth_hash auth_hash_hmac_sha2_384;
-extern struct auth_hash auth_hash_hmac_sha2_512;
-
-extern struct comp_algo comp_algo_deflate;
-
-#ifdef _KERNEL
-#include <sys/malloc.h>
-MALLOC_DECLARE(M_XDATA);
-#endif
-#endif /* _CRYPTO_XFORM_H_ */
diff --git a/include.new/ctype.h b/include.new/ctype.h
deleted file mode 100644
index 4fd1d13..0000000
--- a/include.new/ctype.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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. 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.
- *
- *	@(#)ctype.h	8.4 (Berkeley) 1/21/94
- *      $FreeBSD: releng/10.2/include/ctype.h 233600 2012-03-28 12:11:54Z theraven $
- */
-
-#ifndef _CTYPE_H_
-#define	_CTYPE_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <_ctype.h>
-
-__BEGIN_DECLS
-int	isalnum(int);
-int	isalpha(int);
-int	iscntrl(int);
-int	isdigit(int);
-int	isgraph(int);
-int	islower(int);
-int	isprint(int);
-int	ispunct(int);
-int	isspace(int);
-int	isupper(int);
-int	isxdigit(int);
-int	tolower(int);
-int	toupper(int);
-
-#if __XSI_VISIBLE
-int	isascii(int);
-int	toascii(int);
-#endif
-
-#if __ISO_C_VISIBLE >= 1999
-int	isblank(int);
-#endif
-
-#if __BSD_VISIBLE
-int	digittoint(int);
-int	ishexnumber(int);
-int	isideogram(int);
-int	isnumber(int);
-int	isphonogram(int);
-int	isrune(int);
-int	isspecial(int);
-#endif
-
-#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
-#include <xlocale/_ctype.h>
-#endif
-__END_DECLS
-
-#ifndef __cplusplus
-#define	isalnum(c)	__sbistype((c), _CTYPE_A|_CTYPE_D)
-#define	isalpha(c)	__sbistype((c), _CTYPE_A)
-#define	iscntrl(c)	__sbistype((c), _CTYPE_C)
-#define	isdigit(c)	__isctype((c), _CTYPE_D) /* ANSI -- locale independent */
-#define	isgraph(c)	__sbistype((c), _CTYPE_G)
-#define	islower(c)	__sbistype((c), _CTYPE_L)
-#define	isprint(c)	__sbistype((c), _CTYPE_R)
-#define	ispunct(c)	__sbistype((c), _CTYPE_P)
-#define	isspace(c)	__sbistype((c), _CTYPE_S)
-#define	isupper(c)	__sbistype((c), _CTYPE_U)
-#define	isxdigit(c)	__isctype((c), _CTYPE_X) /* ANSI -- locale independent */
-#define	tolower(c)	__sbtolower(c)
-#define	toupper(c)	__sbtoupper(c)
-#endif /* !__cplusplus */
-
-#if __XSI_VISIBLE
-/*
- * POSIX.1-2001 specifies _tolower() and _toupper() to be macros equivalent to
- * tolower() and toupper() respectively, minus extra checking to ensure that
- * the argument is a lower or uppercase letter respectively.  We've chosen to
- * implement these macros with the same error checking as tolower() and
- * toupper() since this doesn't violate the specification itself, only its
- * intent.  We purposely leave _tolower() and _toupper() undocumented to
- * discourage their use.
- *
- * XXX isascii() and toascii() should similarly be undocumented.
- */
-#define	_tolower(c)	__sbtolower(c)
-#define	_toupper(c)	__sbtoupper(c)
-#define	isascii(c)	(((c) & ~0x7F) == 0)
-#define	toascii(c)	((c) & 0x7F)
-#endif
-
-#if __ISO_C_VISIBLE >= 1999 && !defined(__cplusplus)
-#define	isblank(c)	__sbistype((c), _CTYPE_B)
-#endif
-
-#if __BSD_VISIBLE
-#define	digittoint(c)	__sbmaskrune((c), 0xFF)
-#define	ishexnumber(c)	__sbistype((c), _CTYPE_X)
-#define	isideogram(c)	__sbistype((c), _CTYPE_I)
-#define	isnumber(c)	__sbistype((c), _CTYPE_D)
-#define	isphonogram(c)	__sbistype((c), _CTYPE_Q)
-#define	isrune(c)	__sbistype((c), 0xFFFFFF00L)
-#define	isspecial(c)	__sbistype((c), _CTYPE_T)
-#endif
-
-#endif /* !_CTYPE_H_ */
diff --git a/include.new/curses.h b/include.new/curses.h
deleted file mode 100644
index c8470ab..0000000
--- a/include.new/curses.h
+++ /dev/null
@@ -1,1757 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Thomas E. Dickey                        1996-on                 *
- ****************************************************************************/
-
-/* $Id: curses.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __NCURSES_H
-#define __NCURSES_H
-
-#define CURSES 1
-#define CURSES_H 1
-
-/* This should be defined for the enhanced functionality to be visible.
- * However, some of the wide-character (enhanced) functionality is missing.
- * So we do not define it (yet).
-#define _XOPEN_CURSES 1
- */
-
-/* These are defined only in curses.h, and are used for conditional compiles */
-#define NCURSES_VERSION_MAJOR 5
-#define NCURSES_VERSION_MINOR 7
-#define NCURSES_VERSION_PATCH 20081102
-
-/* This is defined in more than one ncurses header, for identification */
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "5.7"
-
-/*
- * Identify the mouse encoding version.
- */
-#define NCURSES_MOUSE_VERSION 1
-
-/*
- * Definitions to facilitate DLL's.
- */
-#include <ncurses_dll.h>
-
-/*
- * User-definable tweak to disable the include of <stdbool.h>.
- */
-#ifndef NCURSES_ENABLE_STDBOOL_H
-#define NCURSES_ENABLE_STDBOOL_H 1
-#endif
-
-/*
- * NCURSES_ATTR_T is used to quiet compiler warnings when building ncurses
- * configured using --disable-macros.
- */
-#ifdef NCURSES_NOMACROS
-#ifndef NCURSES_ATTR_T
-#define NCURSES_ATTR_T attr_t
-#endif
-#endif /* NCURSES_NOMACROS */
-
-#ifndef NCURSES_ATTR_T
-#define NCURSES_ATTR_T int
-#endif
-
-/*
- * Expands to 'const' if ncurses is configured using --enable-const.  Note that
- * doing so makes it incompatible with other implementations of X/Open Curses.
- */
-#undef  NCURSES_CONST
-#define NCURSES_CONST const
-
-#undef NCURSES_INLINE
-#define NCURSES_INLINE inline
-
-/*
- * The internal type used for color values
- */
-#undef	NCURSES_COLOR_T
-#define	NCURSES_COLOR_T short
-
-/*
- * Definition used to make WINDOW and similar structs opaque.
- */
-#ifndef NCURSES_OPAQUE
-#define NCURSES_OPAQUE 0
-#endif
-
-/*
- * The internal type used for window dimensions.
- */
-#undef	NCURSES_SIZE_T
-#define	NCURSES_SIZE_T short
-
-/*
- * Control whether tparm() supports varargs or fixed-parameter list.
- */
-#undef NCURSES_TPARM_VARARGS
-#define NCURSES_TPARM_VARARGS 1
-
-/*
- * NCURSES_CH_T is used in building the library, but not used otherwise in
- * this header file, since that would make the normal/wide-character versions
- * of the header incompatible.
- */
-#undef	NCURSES_CH_T
-#define NCURSES_CH_T cchar_t
-
-#if 0 && defined(_LP64)
-typedef unsigned chtype;
-typedef unsigned mmask_t;
-#else
-typedef unsigned long chtype;
-typedef unsigned long mmask_t;
-#endif
-
-#include <stdio.h>
-#include <unctrl.h>
-#include <stdarg.h>	/* we need va_list */
-#ifdef _XOPEN_SOURCE_EXTENDED
-#include <stddef.h>	/* we want wchar_t */
-#endif /* _XOPEN_SOURCE_EXTENDED */
-
-/* X/Open and SVr4 specify that curses implements 'bool'.  However, C++ may also
- * implement it.  If so, we must use the C++ compiler's type to avoid conflict
- * with other interfaces.
- *
- * A further complication is that <stdbool.h> may declare 'bool' to be a
- * different type, such as an enum which is not necessarily compatible with
- * C++.  If we have <stdbool.h>, make 'bool' a macro, so users may #undef it.
- * Otherwise, let it remain a typedef to avoid conflicts with other #define's.
- * In either case, make a typedef for NCURSES_BOOL which can be used if needed
- * from either C or C++.
- */
-
-#undef TRUE
-#define TRUE    1
-
-#undef FALSE
-#define FALSE   0
-
-typedef unsigned char NCURSES_BOOL;
-
-#if defined(__cplusplus)	/* __cplusplus, etc. */
-
-/* use the C++ compiler's bool type */
-#define NCURSES_BOOL bool
-
-#else			/* c89, c99, etc. */
-
-#if NCURSES_ENABLE_STDBOOL_H
-#include <stdbool.h>
-/* use whatever the C compiler decides bool really is */
-#define NCURSES_BOOL bool
-#else
-/* there is no predefined bool - use our own */
-#undef bool
-#define bool NCURSES_BOOL
-#endif
-
-#endif /* !__cplusplus, etc. */
-
-#ifdef __cplusplus
-extern "C" {
-#define NCURSES_CAST(type,value) static_cast<type>(value)
-#else
-#define NCURSES_CAST(type,value) (type)(value)
-#endif
-
-/*
- * X/Open attributes.  In the ncurses implementation, they are identical to the
- * A_ attributes.
- */
-#define WA_ATTRIBUTES	A_ATTRIBUTES
-#define WA_NORMAL	A_NORMAL
-#define WA_STANDOUT	A_STANDOUT
-#define WA_UNDERLINE	A_UNDERLINE
-#define WA_REVERSE	A_REVERSE
-#define WA_BLINK	A_BLINK
-#define WA_DIM		A_DIM
-#define WA_BOLD		A_BOLD
-#define WA_ALTCHARSET	A_ALTCHARSET
-#define WA_INVIS	A_INVIS
-#define WA_PROTECT	A_PROTECT
-#define WA_HORIZONTAL	A_HORIZONTAL
-#define WA_LEFT		A_LEFT
-#define WA_LOW		A_LOW
-#define WA_RIGHT	A_RIGHT
-#define WA_TOP		A_TOP
-#define WA_VERTICAL	A_VERTICAL
-
-/* colors */
-#define COLOR_BLACK	0
-#define COLOR_RED	1
-#define COLOR_GREEN	2
-#define COLOR_YELLOW	3
-#define COLOR_BLUE	4
-#define COLOR_MAGENTA	5
-#define COLOR_CYAN	6
-#define COLOR_WHITE	7
-
-/* line graphics */
-
-#if 0 || 0
-NCURSES_WRAPPED_VAR(chtype*, acs_map);
-#define acs_map (_nc_acs_map())
-#else
-extern NCURSES_EXPORT_VAR(chtype) acs_map[];
-#endif
-
-#define NCURSES_ACS(c)	(acs_map[NCURSES_CAST(unsigned char,c)])
-
-/* VT100 symbols begin here */
-#define ACS_ULCORNER	NCURSES_ACS('l') /* upper left corner */
-#define ACS_LLCORNER	NCURSES_ACS('m') /* lower left corner */
-#define ACS_URCORNER	NCURSES_ACS('k') /* upper right corner */
-#define ACS_LRCORNER	NCURSES_ACS('j') /* lower right corner */
-#define ACS_LTEE	NCURSES_ACS('t') /* tee pointing right */
-#define ACS_RTEE	NCURSES_ACS('u') /* tee pointing left */
-#define ACS_BTEE	NCURSES_ACS('v') /* tee pointing up */
-#define ACS_TTEE	NCURSES_ACS('w') /* tee pointing down */
-#define ACS_HLINE	NCURSES_ACS('q') /* horizontal line */
-#define ACS_VLINE	NCURSES_ACS('x') /* vertical line */
-#define ACS_PLUS	NCURSES_ACS('n') /* large plus or crossover */
-#define ACS_S1		NCURSES_ACS('o') /* scan line 1 */
-#define ACS_S9		NCURSES_ACS('s') /* scan line 9 */
-#define ACS_DIAMOND	NCURSES_ACS('`') /* diamond */
-#define ACS_CKBOARD	NCURSES_ACS('a') /* checker board (stipple) */
-#define ACS_DEGREE	NCURSES_ACS('f') /* degree symbol */
-#define ACS_PLMINUS	NCURSES_ACS('g') /* plus/minus */
-#define ACS_BULLET	NCURSES_ACS('~') /* bullet */
-/* Teletype 5410v1 symbols begin here */
-#define ACS_LARROW	NCURSES_ACS(',') /* arrow pointing left */
-#define ACS_RARROW	NCURSES_ACS('+') /* arrow pointing right */
-#define ACS_DARROW	NCURSES_ACS('.') /* arrow pointing down */
-#define ACS_UARROW	NCURSES_ACS('-') /* arrow pointing up */
-#define ACS_BOARD	NCURSES_ACS('h') /* board of squares */
-#define ACS_LANTERN	NCURSES_ACS('i') /* lantern symbol */
-#define ACS_BLOCK	NCURSES_ACS('0') /* solid square block */
-/*
- * These aren't documented, but a lot of System Vs have them anyway
- * (you can spot pprryyzz{{||}} in a lot of AT&T terminfo strings).
- * The ACS_names may not match AT&T's, our source didn't know them.
- */
-#define ACS_S3		NCURSES_ACS('p') /* scan line 3 */
-#define ACS_S7		NCURSES_ACS('r') /* scan line 7 */
-#define ACS_LEQUAL	NCURSES_ACS('y') /* less/equal */
-#define ACS_GEQUAL	NCURSES_ACS('z') /* greater/equal */
-#define ACS_PI		NCURSES_ACS('{') /* Pi */
-#define ACS_NEQUAL	NCURSES_ACS('|') /* not equal */
-#define ACS_STERLING	NCURSES_ACS('}') /* UK pound sign */
-
-/*
- * Line drawing ACS names are of the form ACS_trbl, where t is the top, r
- * is the right, b is the bottom, and l is the left.  t, r, b, and l might
- * be B (blank), S (single), D (double), or T (thick).  The subset defined
- * here only uses B and S.
- */
-#define ACS_BSSB	ACS_ULCORNER
-#define ACS_SSBB	ACS_LLCORNER
-#define ACS_BBSS	ACS_URCORNER
-#define ACS_SBBS	ACS_LRCORNER
-#define ACS_SBSS	ACS_RTEE
-#define ACS_SSSB	ACS_LTEE
-#define ACS_SSBS	ACS_BTEE
-#define ACS_BSSS	ACS_TTEE
-#define ACS_BSBS	ACS_HLINE
-#define ACS_SBSB	ACS_VLINE
-#define ACS_SSSS	ACS_PLUS
-
-#undef	ERR
-#define ERR     (-1)
-
-#undef	OK
-#define OK      (0)
-
-/* values for the _flags member */
-#define _SUBWIN         0x01	/* is this a sub-window? */
-#define _ENDLINE        0x02	/* is the window flush right? */
-#define _FULLWIN        0x04	/* is the window full-screen? */
-#define _SCROLLWIN      0x08	/* bottom edge is at screen bottom? */
-#define _ISPAD	        0x10	/* is this window a pad? */
-#define _HASMOVED       0x20	/* has cursor moved since last refresh? */
-#define _WRAPPED        0x40	/* cursor was just wrappped */
-
-/*
- * this value is used in the firstchar and lastchar fields to mark
- * unchanged lines
- */
-#define _NOCHANGE       -1
-
-/*
- * this value is used in the oldindex field to mark lines created by insertions
- * and scrolls.
- */
-#define _NEWINDEX	-1
-
-typedef struct screen  SCREEN;
-typedef struct _win_st WINDOW;
-
-typedef	chtype	attr_t;		/* ...must be at least as wide as chtype */
-
-#ifdef _XOPEN_SOURCE_EXTENDED
-
-#if 0
-#ifdef mblen			/* libutf8.h defines it w/o undefining first */
-#undef mblen
-#endif
-#include <libutf8.h>
-#endif
-
-#if 1
-#include <wchar.h>		/* ...to get mbstate_t, etc. */
-#endif
-
-#if 0
-typedef unsigned short wchar_t1;
-#endif
-
-#if 0
-typedef unsigned int wint_t1;
-#endif
-
-#define CCHARW_MAX	5
-typedef struct
-{
-    attr_t	attr;
-    wchar_t	chars[CCHARW_MAX];
-#if 0
-#undef NCURSES_EXT_COLORS
-#define NCURSES_EXT_COLORS 20081102
-    int		ext_color;	/* color pair, must be more than 16-bits */
-#endif
-}
-cchar_t;
-
-#endif /* _XOPEN_SOURCE_EXTENDED */
-
-#if !NCURSES_OPAQUE
-struct ldat;
-
-struct _win_st
-{
-	NCURSES_SIZE_T _cury, _curx; /* current cursor position */
-
-	/* window location and size */
-	NCURSES_SIZE_T _maxy, _maxx; /* maximums of x and y, NOT window size */
-	NCURSES_SIZE_T _begy, _begx; /* screen coords of upper-left-hand corner */
-
-	short   _flags;		/* window state flags */
-
-	/* attribute tracking */
-	attr_t  _attrs;		/* current attribute for non-space character */
-	chtype  _bkgd;		/* current background char/attribute pair */
-
-	/* option values set by user */
-	bool	_notimeout;	/* no time out on function-key entry? */
-	bool	_clear;		/* consider all data in the window invalid? */
-	bool	_leaveok;	/* OK to not reset cursor on exit? */
-	bool	_scroll;	/* OK to scroll this window? */
-	bool	_idlok;		/* OK to use insert/delete line? */
-	bool	_idcok;		/* OK to use insert/delete char? */
-	bool	_immed;		/* window in immed mode? (not yet used) */
-	bool	_sync;		/* window in sync mode? */
-	bool	_use_keypad;	/* process function keys into KEY_ symbols? */
-	int	_delay;		/* 0 = nodelay, <0 = blocking, >0 = delay */
-
-	struct ldat *_line;	/* the actual line data */
-
-	/* global screen state */
-	NCURSES_SIZE_T _regtop;	/* top line of scrolling region */
-	NCURSES_SIZE_T _regbottom; /* bottom line of scrolling region */
-
-	/* these are used only if this is a sub-window */
-	int	_parx;		/* x coordinate of this window in parent */
-	int	_pary;		/* y coordinate of this window in parent */
-	WINDOW	*_parent;	/* pointer to parent if a sub-window */
-
-	/* these are used only if this is a pad */
-	struct pdat
-	{
-	    NCURSES_SIZE_T _pad_y,      _pad_x;
-	    NCURSES_SIZE_T _pad_top,    _pad_left;
-	    NCURSES_SIZE_T _pad_bottom, _pad_right;
-	} _pad;
-
-	NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */
-
-#ifdef _XOPEN_SOURCE_EXTENDED
-	cchar_t  _bkgrnd;	/* current background char/attribute pair */
-#if 0
-	int	_color;		/* current color-pair for non-space character */
-#endif
-#endif
-};
-#endif /* NCURSES_OPAQUE */
-
-/*
- * This is an extension to support events...
- */
-#if 1
-#ifdef NCURSES_WGETCH_EVENTS
-#if !defined(__BEOS__) || defined(__HAIKU__)
-   /* Fix _nc_timed_wait() on BEOS... */
-#  define NCURSES_EVENT_VERSION	1
-#endif	/* !defined(__BEOS__) */
-
-/*
- * Bits to set in _nc_event.data.flags
- */
-#  define _NC_EVENT_TIMEOUT_MSEC	1
-#  define _NC_EVENT_FILE		2
-#  define _NC_EVENT_FILE_READABLE	2
-#  if 0					/* Not supported yet... */
-#    define _NC_EVENT_FILE_WRITABLE	4
-#    define _NC_EVENT_FILE_EXCEPTION	8
-#  endif
-
-typedef struct
-{
-    int type;
-    union
-    {
-	long timeout_msec;	/* _NC_EVENT_TIMEOUT_MSEC */
-	struct
-	{
-	    unsigned int flags;
-	    int fd;
-	    unsigned int result;
-	} fev;				/* _NC_EVENT_FILE */
-    } data;
-} _nc_event;
-
-typedef struct
-{
-    int count;
-    int result_flags;	/* _NC_EVENT_TIMEOUT_MSEC or _NC_EVENT_FILE_READABLE */
-    _nc_event *events[1];
-} _nc_eventlist;
-
-extern NCURSES_EXPORT(int) wgetch_events(WINDOW *, _nc_eventlist *);	/* experimental */
-extern NCURSES_EXPORT(int) wgetnstr_events(WINDOW *,char *,int,_nc_eventlist *);/* experimental */
-
-#endif /* NCURSES_WGETCH_EVENTS */
-#endif /* NCURSES_EXT_FUNCS */
-
-/*
- * GCC (and some other compilers) define '__attribute__'; we're using this
- * macro to alert the compiler to flag inconsistencies in printf/scanf-like
- * function calls.  Just in case '__attribute__' isn't defined, make a dummy.
- * Old versions of G++ do not accept it anyway, at least not consistently with
- * GCC.
- */
-#if !(defined(__GNUC__) || defined(__GNUG__) || defined(__attribute__))
-#define __attribute__(p) /* nothing */
-#endif
-
-/*
- * We cannot define these in ncurses_cfg.h, since they require parameters to be
- * passed (that is non-portable).  If you happen to be using gcc with warnings
- * enabled, define
- *	GCC_PRINTF
- *	GCC_SCANF
- * to improve checking of calls to printw(), etc.
- */
-#ifndef GCC_PRINTFLIKE
-#if defined(GCC_PRINTF) && !defined(printf)
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-#else
-#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
-#endif
-#endif
-
-#ifndef GCC_SCANFLIKE
-#if defined(GCC_SCANF) && !defined(scanf)
-#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
-#else
-#define GCC_SCANFLIKE(fmt,var)  /*nothing*/
-#endif
-#endif
-
-#ifndef	GCC_NORETURN
-#define	GCC_NORETURN /* nothing */
-#endif
-
-#ifndef	GCC_UNUSED
-#define	GCC_UNUSED /* nothing */
-#endif
-
-/*
- * Function prototypes.  This is the complete X/Open Curses list of required
- * functions.  Those marked `generated' will have sources generated from the
- * macro definitions later in this file, in order to satisfy XPG4.2
- * requirements.
- */
-
-extern NCURSES_EXPORT(int) addch (const chtype);			/* generated */
-extern NCURSES_EXPORT(int) addchnstr (const chtype *, int);		/* generated */
-extern NCURSES_EXPORT(int) addchstr (const chtype *);			/* generated */
-extern NCURSES_EXPORT(int) addnstr (const char *, int);			/* generated */
-extern NCURSES_EXPORT(int) addstr (const char *);			/* generated */
-extern NCURSES_EXPORT(int) attroff (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attron (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attrset (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attr_get (attr_t *, short *, void *);	/* generated */
-extern NCURSES_EXPORT(int) attr_off (attr_t, void *);			/* generated */
-extern NCURSES_EXPORT(int) attr_on (attr_t, void *);			/* generated */
-extern NCURSES_EXPORT(int) attr_set (attr_t, short, void *);		/* generated */
-extern NCURSES_EXPORT(int) baudrate (void);				/* implemented */
-extern NCURSES_EXPORT(int) beep  (void);				/* implemented */
-extern NCURSES_EXPORT(int) bkgd (chtype);				/* generated */
-extern NCURSES_EXPORT(void) bkgdset (chtype);				/* generated */
-extern NCURSES_EXPORT(int) border (chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* generated */
-extern NCURSES_EXPORT(int) box (WINDOW *, chtype, chtype);		/* generated */
-extern NCURSES_EXPORT(bool) can_change_color (void);			/* implemented */
-extern NCURSES_EXPORT(int) cbreak (void);				/* implemented */
-extern NCURSES_EXPORT(int) chgat (int, attr_t, short, const void *);	/* generated */
-extern NCURSES_EXPORT(int) clear (void);				/* generated */
-extern NCURSES_EXPORT(int) clearok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) clrtobot (void);				/* generated */
-extern NCURSES_EXPORT(int) clrtoeol (void);				/* generated */
-extern NCURSES_EXPORT(int) color_content (short,short*,short*,short*);	/* implemented */
-extern NCURSES_EXPORT(int) color_set (short,void*);			/* generated */
-extern NCURSES_EXPORT(int) COLOR_PAIR (int);				/* generated */
-extern NCURSES_EXPORT(int) copywin (const WINDOW*,WINDOW*,int,int,int,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) curs_set (int);				/* implemented */
-extern NCURSES_EXPORT(int) def_prog_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) def_shell_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) delay_output (int);				/* implemented */
-extern NCURSES_EXPORT(int) delch (void);				/* generated */
-extern NCURSES_EXPORT(void) delscreen (SCREEN *);			/* implemented */
-extern NCURSES_EXPORT(int) delwin (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) deleteln (void);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) derwin (WINDOW *,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) doupdate (void);				/* implemented */
-extern NCURSES_EXPORT(WINDOW *) dupwin (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) echo (void);					/* implemented */
-extern NCURSES_EXPORT(int) echochar (const chtype);			/* generated */
-extern NCURSES_EXPORT(int) erase (void);				/* generated */
-extern NCURSES_EXPORT(int) endwin (void);				/* implemented */
-extern NCURSES_EXPORT(char) erasechar (void);				/* implemented */
-extern NCURSES_EXPORT(void) filter (void);				/* implemented */
-extern NCURSES_EXPORT(int) flash (void);				/* implemented */
-extern NCURSES_EXPORT(int) flushinp (void);				/* implemented */
-extern NCURSES_EXPORT(chtype) getbkgd (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getch (void);				/* generated */
-extern NCURSES_EXPORT(int) getnstr (char *, int);			/* generated */
-extern NCURSES_EXPORT(int) getstr (char *);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) getwin (FILE *);			/* implemented */
-extern NCURSES_EXPORT(int) halfdelay (int);				/* implemented */
-extern NCURSES_EXPORT(bool) has_colors (void);				/* implemented */
-extern NCURSES_EXPORT(bool) has_ic (void);				/* implemented */
-extern NCURSES_EXPORT(bool) has_il (void);				/* implemented */
-extern NCURSES_EXPORT(int) hline (chtype, int);				/* generated */
-extern NCURSES_EXPORT(void) idcok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(int) idlok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(void) immedok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(chtype) inch (void);				/* generated */
-extern NCURSES_EXPORT(int) inchnstr (chtype *, int);			/* generated */
-extern NCURSES_EXPORT(int) inchstr (chtype *);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) initscr (void);				/* implemented */
-extern NCURSES_EXPORT(int) init_color (short,short,short,short);	/* implemented */
-extern NCURSES_EXPORT(int) init_pair (short,short,short);		/* implemented */
-extern NCURSES_EXPORT(int) innstr (char *, int);			/* generated */
-extern NCURSES_EXPORT(int) insch (chtype);				/* generated */
-extern NCURSES_EXPORT(int) insdelln (int);				/* generated */
-extern NCURSES_EXPORT(int) insertln (void);				/* generated */
-extern NCURSES_EXPORT(int) insnstr (const char *, int);			/* generated */
-extern NCURSES_EXPORT(int) insstr (const char *);			/* generated */
-extern NCURSES_EXPORT(int) instr (char *);				/* generated */
-extern NCURSES_EXPORT(int) intrflush (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(bool) isendwin (void);				/* implemented */
-extern NCURSES_EXPORT(bool) is_linetouched (WINDOW *,int);		/* implemented */
-extern NCURSES_EXPORT(bool) is_wintouched (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(NCURSES_CONST char *) keyname (int);		/* implemented */
-extern NCURSES_EXPORT(int) keypad (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(char) killchar (void);				/* implemented */
-extern NCURSES_EXPORT(int) leaveok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(char *) longname (void);				/* implemented */
-extern NCURSES_EXPORT(int) meta (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) move (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvaddch (int, int, const chtype);		/* generated */
-extern NCURSES_EXPORT(int) mvaddchnstr (int, int, const chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvaddchstr (int, int, const chtype *);	/* generated */
-extern NCURSES_EXPORT(int) mvaddnstr (int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvaddstr (int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvchgat (int, int, int, attr_t, short, const void *);	/* generated */
-extern NCURSES_EXPORT(int) mvcur (int,int,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) mvdelch (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvderwin (WINDOW *, int, int);		/* implemented */
-extern NCURSES_EXPORT(int) mvgetch (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvgetnstr (int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvgetstr (int, int, char *);			/* generated */
-extern NCURSES_EXPORT(int) mvhline (int, int, chtype, int);		/* generated */
-extern NCURSES_EXPORT(chtype) mvinch (int, int);			/* generated */
-extern NCURSES_EXPORT(int) mvinchnstr (int, int, chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvinchstr (int, int, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) mvinnstr (int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvinsch (int, int, chtype);			/* generated */
-extern NCURSES_EXPORT(int) mvinsnstr (int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvinsstr (int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvinstr (int, int, char *);			/* generated */
-extern NCURSES_EXPORT(int) mvprintw (int,int, const char *,...)		/* implemented */
-		GCC_PRINTFLIKE(3,4);
-extern NCURSES_EXPORT(int) mvscanw (int,int, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(3,4);
-extern NCURSES_EXPORT(int) mvvline (int, int, chtype, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwaddch (WINDOW *, int, int, const chtype);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddchnstr (WINDOW *, int, int, const chtype *, int);/* generated */
-extern NCURSES_EXPORT(int) mvwaddchstr (WINDOW *, int, int, const chtype *);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddnstr (WINDOW *, int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddstr (WINDOW *, int, int, const char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwchgat (WINDOW *, int, int, int, attr_t, short, const void *);/* generated */
-extern NCURSES_EXPORT(int) mvwdelch (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwgetch (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwgetnstr (WINDOW *, int, int, char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwgetstr (WINDOW *, int, int, char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwhline (WINDOW *, int, int, chtype, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwin (WINDOW *,int,int);			/* implemented */
-extern NCURSES_EXPORT(chtype) mvwinch (WINDOW *, int, int);			/* generated */
-extern NCURSES_EXPORT(int) mvwinchnstr (WINDOW *, int, int, chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwinchstr (WINDOW *, int, int, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype);		/* generated */
-extern NCURSES_EXPORT(int) mvwinsnstr (WINDOW *, int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvwinstr (WINDOW *, int, int, char *);		/* generated */
-extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...)	/* implemented */
-		GCC_PRINTFLIKE(4,5);
-extern NCURSES_EXPORT(int) mvwscanw (WINDOW *,int,int, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(4,5);
-extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int);	/* generated */
-extern NCURSES_EXPORT(int) napms (int);					/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newpad (int,int);				/* implemented */
-extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *);	/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) nl (void);					/* implemented */
-extern NCURSES_EXPORT(int) nocbreak (void);				/* implemented */
-extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) noecho (void);				/* implemented */
-extern NCURSES_EXPORT(int) nonl (void);					/* implemented */
-extern NCURSES_EXPORT(void) noqiflush (void);				/* implemented */
-extern NCURSES_EXPORT(int) noraw (void);				/* implemented */
-extern NCURSES_EXPORT(int) notimeout (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) overlay (const WINDOW*,WINDOW *);		/* implemented */
-extern NCURSES_EXPORT(int) overwrite (const WINDOW*,WINDOW *);		/* implemented */
-extern NCURSES_EXPORT(int) pair_content (short,short*,short*);		/* implemented */
-extern NCURSES_EXPORT(int) PAIR_NUMBER (int);				/* generated */
-extern NCURSES_EXPORT(int) pechochar (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) pnoutrefresh (WINDOW*,int,int,int,int,int,int);/* implemented */
-extern NCURSES_EXPORT(int) prefresh (WINDOW *,int,int,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) printw (const char *,...)			/* implemented */
-		GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(int) putwin (WINDOW *, FILE *);			/* implemented */
-extern NCURSES_EXPORT(void) qiflush (void);				/* implemented */
-extern NCURSES_EXPORT(int) raw (void);					/* implemented */
-extern NCURSES_EXPORT(int) redrawwin (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) refresh (void);				/* generated */
-extern NCURSES_EXPORT(int) resetty (void);				/* implemented */
-extern NCURSES_EXPORT(int) reset_prog_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) reset_shell_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) ripoffline (int, int (*)(WINDOW *, int));	/* implemented */
-extern NCURSES_EXPORT(int) savetty (void);				/* implemented */
-extern NCURSES_EXPORT(int) scanw (NCURSES_CONST char *,...)		/* implemented */
-		GCC_SCANFLIKE(1,2);
-extern NCURSES_EXPORT(int) scr_dump (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scr_init (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scrl (int);					/* generated */
-extern NCURSES_EXPORT(int) scroll (WINDOW *);				/* generated */
-extern NCURSES_EXPORT(int) scrollok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) scr_restore (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scr_set (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) setscrreg (int,int);				/* generated */
-extern NCURSES_EXPORT(SCREEN *) set_term (SCREEN *);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attroff (const chtype);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_off (const attr_t, void *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) slk_attron (const chtype);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_on (attr_t,void*);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) slk_attrset (const chtype);			/* implemented */
-extern NCURSES_EXPORT(attr_t) slk_attr (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_set (const attr_t,short,void*);	/* implemented */
-extern NCURSES_EXPORT(int) slk_clear (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_color (short);				/* implemented */
-extern NCURSES_EXPORT(int) slk_init (int);				/* implemented */
-extern NCURSES_EXPORT(char *) slk_label (int);				/* implemented */
-extern NCURSES_EXPORT(int) slk_noutrefresh (void);			/* implemented */
-extern NCURSES_EXPORT(int) slk_refresh (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_restore (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_set (int,const char *,int);		/* implemented */
-extern NCURSES_EXPORT(int) slk_touch (void);				/* implemented */
-extern NCURSES_EXPORT(int) standout (void);				/* generated */
-extern NCURSES_EXPORT(int) standend (void);				/* generated */
-extern NCURSES_EXPORT(int) start_color (void);				/* implemented */
-extern NCURSES_EXPORT(WINDOW *) subpad (WINDOW *, int, int, int, int);	/* implemented */
-extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *, int, int, int, int);	/* implemented */
-extern NCURSES_EXPORT(int) syncok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(chtype) termattrs (void);				/* implemented */
-extern NCURSES_EXPORT(char *) termname (void);				/* implemented */
-extern NCURSES_EXPORT(void) timeout (int);				/* generated */
-extern NCURSES_EXPORT(int) touchline (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) touchwin (WINDOW *);				/* generated */
-extern NCURSES_EXPORT(int) typeahead (int);				/* implemented */
-extern NCURSES_EXPORT(int) ungetch (int);				/* implemented */
-extern NCURSES_EXPORT(int) untouchwin (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(void) use_env (bool);				/* implemented */
-extern NCURSES_EXPORT(int) vidattr (chtype);				/* implemented */
-extern NCURSES_EXPORT(int) vidputs (chtype, int (*)(int));		/* implemented */
-extern NCURSES_EXPORT(int) vline (chtype, int);				/* generated */
-extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *,va_list);	/* implemented */
-extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *,va_list);	/* generated */
-extern NCURSES_EXPORT(int) vwscanw (WINDOW *, NCURSES_CONST char *,va_list);	/* implemented */
-extern NCURSES_EXPORT(int) vw_scanw (WINDOW *, NCURSES_CONST char *,va_list);	/* generated */
-extern NCURSES_EXPORT(int) waddch (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) waddchnstr (WINDOW *,const chtype *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddchstr (WINDOW *,const chtype *);		/* generated */
-extern NCURSES_EXPORT(int) waddnstr (WINDOW *,const char *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddstr (WINDOW *,const char *);		/* generated */
-extern NCURSES_EXPORT(int) wattron (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattroff (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattrset (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattr_get (WINDOW *, attr_t *, short *, void *);	/* generated */
-extern NCURSES_EXPORT(int) wattr_on (WINDOW *, attr_t, void *);		/* implemented */
-extern NCURSES_EXPORT(int) wattr_off (WINDOW *, attr_t, void *);	/* implemented */
-extern NCURSES_EXPORT(int) wattr_set (WINDOW *, attr_t, short, void *);	/* generated */
-extern NCURSES_EXPORT(int) wbkgd (WINDOW *, chtype);			/* implemented */
-extern NCURSES_EXPORT(void) wbkgdset (WINDOW *,chtype);			/* implemented */
-extern NCURSES_EXPORT(int) wborder (WINDOW *,chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* implemented */
-extern NCURSES_EXPORT(int) wchgat (WINDOW *, int, attr_t, short, const void *);/* implemented */
-extern NCURSES_EXPORT(int) wclear (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wclrtobot (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wclrtoeol (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wcolor_set (WINDOW*,short,void*);		/* implemented */
-extern NCURSES_EXPORT(void) wcursyncup (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wdelch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wdeleteln (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) wechochar (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) werase (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wgetch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wgetnstr (WINDOW *,char *,int);		/* implemented */
-extern NCURSES_EXPORT(int) wgetstr (WINDOW *, char *);			/* generated */
-extern NCURSES_EXPORT(int) whline (WINDOW *, chtype, int);		/* implemented */
-extern NCURSES_EXPORT(chtype) winch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) winchnstr (WINDOW *, chtype *, int);		/* implemented */
-extern NCURSES_EXPORT(int) winchstr (WINDOW *, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) winnstr (WINDOW *, char *, int);		/* implemented */
-extern NCURSES_EXPORT(int) winsch (WINDOW *, chtype);			/* implemented */
-extern NCURSES_EXPORT(int) winsdelln (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) winsertln (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) winsnstr (WINDOW *, const char *,int);	/* implemented */
-extern NCURSES_EXPORT(int) winsstr (WINDOW *, const char *);		/* generated */
-extern NCURSES_EXPORT(int) winstr (WINDOW *, char *);			/* generated */
-extern NCURSES_EXPORT(int) wmove (WINDOW *,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) wnoutrefresh (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wprintw (WINDOW *, const char *,...)		/* implemented */
-		GCC_PRINTFLIKE(2,3);
-extern NCURSES_EXPORT(int) wredrawln (WINDOW *,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wrefresh (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wscanw (WINDOW *, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(2,3);
-extern NCURSES_EXPORT(int) wscrl (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) wsetscrreg (WINDOW *,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wstandout (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) wstandend (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(void) wsyncdown (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(void) wsyncup (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(void) wtimeout (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) wtouchln (WINDOW *,int,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wvline (WINDOW *,chtype,int);		/* implemented */
-
-/*
- * These are also declared in <term.h>:
- */
-extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(int) putp (const char *);				/* implemented */
-
-#if NCURSES_TPARM_VARARGS
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
-#else
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
-extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
-#endif
-
-/*
- * These functions are not in X/Open, but we use them in macro definitions:
- */
-extern NCURSES_EXPORT(int) getattrs (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getcurx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getcury (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getbegx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getbegy (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getmaxx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getmaxy (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getparx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getpary (const WINDOW *);			/* generated */
-
-/*
- * vid_attr() was implemented originally based on a draft of X/Open curses.
- */
-#ifndef _XOPEN_SOURCE_EXTENDED
-#define vid_attr(a,pair,opts) vidattr(a)
-#endif
-
-/*
- * These functions are extensions - not in X/Open Curses.
- */
-#if 1
-#undef  NCURSES_EXT_FUNCS
-#define NCURSES_EXT_FUNCS 20081102
-typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
-typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
-extern NCURSES_EXPORT(bool) is_term_resized (int, int);
-extern NCURSES_EXPORT(char *) keybound (int, int);
-extern NCURSES_EXPORT(const char *) curses_version (void);
-extern NCURSES_EXPORT(int) assume_default_colors (int, int);
-extern NCURSES_EXPORT(int) define_key (const char *, int);
-extern NCURSES_EXPORT(int) key_defined (const char *);
-extern NCURSES_EXPORT(int) keyok (int, bool);
-extern NCURSES_EXPORT(int) resize_term (int, int);
-extern NCURSES_EXPORT(int) resizeterm (int, int);
-extern NCURSES_EXPORT(int) set_escdelay (int);
-extern NCURSES_EXPORT(int) set_tabsize (int);
-extern NCURSES_EXPORT(int) use_default_colors (void);
-extern NCURSES_EXPORT(int) use_extended_names (bool);
-extern NCURSES_EXPORT(int) use_legacy_coding (int);
-extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_SCREEN_CB, void *);
-extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_WINDOW_CB, void *);
-extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
-extern NCURSES_EXPORT(void) nofilter(void);
-
-/*
- * These extensions provide access to information stored in the WINDOW even
- * when NCURSES_OPAQUE is set:
- */
-extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
-
-#else
-#define curses_version() NCURSES_VERSION
-#endif
-
-/* attributes */
-
-#define NCURSES_ATTR_SHIFT       8
-#define NCURSES_BITS(mask,shift) ((mask) << ((shift) + NCURSES_ATTR_SHIFT))
-
-#define A_NORMAL	(1UL - 1UL)
-#define A_ATTRIBUTES	NCURSES_BITS(~(1UL - 1UL),0)
-#define A_CHARTEXT	(NCURSES_BITS(1UL,0) - 1UL)
-#define A_COLOR		NCURSES_BITS(((1UL) << 8) - 1UL,0)
-#define A_STANDOUT	NCURSES_BITS(1UL,8)
-#define A_UNDERLINE	NCURSES_BITS(1UL,9)
-#define A_REVERSE	NCURSES_BITS(1UL,10)
-#define A_BLINK		NCURSES_BITS(1UL,11)
-#define A_DIM		NCURSES_BITS(1UL,12)
-#define A_BOLD		NCURSES_BITS(1UL,13)
-#define A_ALTCHARSET	NCURSES_BITS(1UL,14)
-#define A_INVIS		NCURSES_BITS(1UL,15)
-#define A_PROTECT	NCURSES_BITS(1UL,16)
-#define A_HORIZONTAL	NCURSES_BITS(1UL,17)
-#define A_LEFT		NCURSES_BITS(1UL,18)
-#define A_LOW		NCURSES_BITS(1UL,19)
-#define A_RIGHT		NCURSES_BITS(1UL,20)
-#define A_TOP		NCURSES_BITS(1UL,21)
-#define A_VERTICAL	NCURSES_BITS(1UL,22)
-
-/*
- * Most of the pseudo functions are macros that either provide compatibility
- * with older versions of curses, or provide inline functionality to improve
- * performance.
- */
-
-/*
- * These pseudo functions are always implemented as macros:
- */
-
-#define getyx(win,y,x)   	(y = getcury(win), x = getcurx(win))
-#define getbegyx(win,y,x)	(y = getbegy(win), x = getbegx(win))
-#define getmaxyx(win,y,x)	(y = getmaxy(win), x = getmaxx(win))
-#define getparyx(win,y,x)	(y = getpary(win), x = getparx(win))
-
-#define getsyx(y,x) do { if (newscr) { \
-			     if (is_leaveok(newscr)) \
-				(y) = (x) = -1; \
-			     else \
-				 getyx(newscr,(y), (x)); \
-			} \
-		    } while(0)
-
-#define setsyx(y,x) do { if (newscr) { \
-			    if ((y) == -1 && (x) == -1) \
-				leaveok(newscr, TRUE); \
-			    else { \
-				leaveok(newscr, FALSE); \
-				wmove(newscr, (y), (x)); \
-			    } \
-			} \
-		    } while(0)
-
-#ifndef NCURSES_NOMACROS
-
-/*
- * These miscellaneous pseudo functions are provided for compatibility:
- */
-
-#define wgetstr(w, s)		wgetnstr(w, s, -1)
-#define getnstr(s, n)		wgetnstr(stdscr, s, n)
-
-#define setterm(term)		setupterm(term, 1, (int *)0)
-
-#define fixterm()		reset_prog_mode()
-#define resetterm()		reset_shell_mode()
-#define saveterm()		def_prog_mode()
-#define crmode()		cbreak()
-#define nocrmode()		nocbreak()
-#define gettmode()
-
-/* It seems older SYSV curses versions define these */
-#if !NCURSES_OPAQUE
-#define getattrs(win)		((win) ? (win)->_attrs : A_NORMAL)
-#define getcurx(win)		((win) ? (win)->_curx : ERR)
-#define getcury(win)		((win) ? (win)->_cury : ERR)
-#define getbegx(win)		((win) ? (win)->_begx : ERR)
-#define getbegy(win)		((win) ? (win)->_begy : ERR)
-#define getmaxx(win)		((win) ? ((win)->_maxx + 1) : ERR)
-#define getmaxy(win)		((win) ? ((win)->_maxy + 1) : ERR)
-#define getparx(win)		((win) ? (win)->_parx : ERR)
-#define getpary(win)		((win) ? (win)->_pary : ERR)
-#endif /* NCURSES_OPAQUE */
-
-#define wstandout(win)      	(wattrset(win,A_STANDOUT))
-#define wstandend(win)      	(wattrset(win,A_NORMAL))
-
-#define wattron(win,at)		wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
-#define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
-
-#if !NCURSES_OPAQUE
-#if defined(_XOPEN_SOURCE_EXTENDED) && 0
-#define wattrset(win,at)	((win)->_color = PAIR_NUMBER(at), \
-				 (win)->_attrs = (at))
-#else
-#define wattrset(win,at)	((win)->_attrs = (at))
-#endif
-#endif /* NCURSES_OPAQUE */
-
-#define scroll(win)		wscrl(win,1)
-
-#define touchwin(win)		wtouchln((win), 0, getmaxy(win), 1)
-#define touchline(win, s, c)	wtouchln((win), s, c, 1)
-#define untouchwin(win)		wtouchln((win), 0, getmaxy(win), 0)
-
-#define box(win, v, h)		wborder(win, v, v, h, h, 0, 0, 0, 0)
-#define border(ls, rs, ts, bs, tl, tr, bl, br)	wborder(stdscr, ls, rs, ts, bs, tl, tr, bl, br)
-#define hline(ch, n)		whline(stdscr, ch, n)
-#define vline(ch, n)		wvline(stdscr, ch, n)
-
-#define winstr(w, s)		winnstr(w, s, -1)
-#define winchstr(w, s)		winchnstr(w, s, -1)
-#define winsstr(w, s)		winsnstr(w, s, -1)
-
-#if !NCURSES_OPAQUE
-#define redrawwin(win)		wredrawln(win, 0, (win)->_maxy+1)
-#endif /* NCURSES_OPAQUE */
-
-#define waddstr(win,str)	waddnstr(win,str,-1)
-#define waddchstr(win,str)	waddchnstr(win,str,-1)
-
-/*
- * These apply to the first 256 color pairs.
- */
-#define COLOR_PAIR(n)	NCURSES_BITS(n, 0)
-#define PAIR_NUMBER(a)	(NCURSES_CAST(int,(((a) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
-
-/*
- * pseudo functions for standard screen
- */
-
-#define addch(ch)		waddch(stdscr,ch)
-#define addchnstr(str,n)	waddchnstr(stdscr,str,n)
-#define addchstr(str)		waddchstr(stdscr,str)
-#define addnstr(str,n)		waddnstr(stdscr,str,n)
-#define addstr(str)		waddnstr(stdscr,str,-1)
-#define attroff(at)		wattroff(stdscr,at)
-#define attron(at)		wattron(stdscr,at)
-#define attrset(at)		wattrset(stdscr,at)
-#define attr_get(ap,cp,o)	wattr_get(stdscr,ap,cp,o)
-#define attr_off(a,o)		wattr_off(stdscr,a,o)
-#define attr_on(a,o)		wattr_on(stdscr,a,o)
-#define attr_set(a,c,o)		wattr_set(stdscr,a,c,o)
-#define bkgd(ch)		wbkgd(stdscr,ch)
-#define bkgdset(ch)		wbkgdset(stdscr,ch)
-#define chgat(n,a,c,o)		wchgat(stdscr,n,a,c,o)
-#define clear()			wclear(stdscr)
-#define clrtobot()		wclrtobot(stdscr)
-#define clrtoeol()		wclrtoeol(stdscr)
-#define color_set(c,o)		wcolor_set(stdscr,c,o)
-#define delch()			wdelch(stdscr)
-#define deleteln()		winsdelln(stdscr,-1)
-#define echochar(c)		wechochar(stdscr,c)
-#define erase()			werase(stdscr)
-#define getch()			wgetch(stdscr)
-#define getstr(str)		wgetstr(stdscr,str)
-#define inch()			winch(stdscr)
-#define inchnstr(s,n)		winchnstr(stdscr,s,n)
-#define inchstr(s)		winchstr(stdscr,s)
-#define innstr(s,n)		winnstr(stdscr,s,n)
-#define insch(c)		winsch(stdscr,c)
-#define insdelln(n)		winsdelln(stdscr,n)
-#define insertln()		winsdelln(stdscr,1)
-#define insnstr(s,n)		winsnstr(stdscr,s,n)
-#define insstr(s)		winsstr(stdscr,s)
-#define instr(s)		winstr(stdscr,s)
-#define move(y,x)		wmove(stdscr,y,x)
-#define refresh()		wrefresh(stdscr)
-#define scrl(n)			wscrl(stdscr,n)
-#define setscrreg(t,b)		wsetscrreg(stdscr,t,b)
-#define standend()		wstandend(stdscr)
-#define standout()		wstandout(stdscr)
-#define timeout(delay)		wtimeout(stdscr,delay)
-#define wdeleteln(win)		winsdelln(win,-1)
-#define winsertln(win)		winsdelln(win,1)
-
-/*
- * mv functions
- */
-
-#define mvwaddch(win,y,x,ch)		(wmove(win,y,x) == ERR ? ERR : waddch(win,ch))
-#define mvwaddchnstr(win,y,x,str,n)	(wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,n))
-#define mvwaddchstr(win,y,x,str)	(wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,-1))
-#define mvwaddnstr(win,y,x,str,n)	(wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,n))
-#define mvwaddstr(win,y,x,str)		(wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,-1))
-#define mvwdelch(win,y,x)		(wmove(win,y,x) == ERR ? ERR : wdelch(win))
-#define mvwchgat(win,y,x,n,a,c,o)	(wmove(win,y,x) == ERR ? ERR : wchgat(win,n,a,c,o))
-#define mvwgetch(win,y,x)		(wmove(win,y,x) == ERR ? ERR : wgetch(win))
-#define mvwgetnstr(win,y,x,str,n)	(wmove(win,y,x) == ERR ? ERR : wgetnstr(win,str,n))
-#define mvwgetstr(win,y,x,str)		(wmove(win,y,x) == ERR ? ERR : wgetstr(win,str))
-#define mvwhline(win,y,x,c,n)		(wmove(win,y,x) == ERR ? ERR : whline(win,c,n))
-#define mvwinch(win,y,x)		(wmove(win,y,x) == ERR ? NCURSES_CAST(chtype, ERR) : winch(win))
-#define mvwinchnstr(win,y,x,s,n)	(wmove(win,y,x) == ERR ? ERR : winchnstr(win,s,n))
-#define mvwinchstr(win,y,x,s)		(wmove(win,y,x) == ERR ? ERR : winchstr(win,s))
-#define mvwinnstr(win,y,x,s,n)		(wmove(win,y,x) == ERR ? ERR : winnstr(win,s,n))
-#define mvwinsch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : winsch(win,c))
-#define mvwinsnstr(win,y,x,s,n)		(wmove(win,y,x) == ERR ? ERR : winsnstr(win,s,n))
-#define mvwinsstr(win,y,x,s)		(wmove(win,y,x) == ERR ? ERR : winsstr(win,s))
-#define mvwinstr(win,y,x,s)		(wmove(win,y,x) == ERR ? ERR : winstr(win,s))
-#define mvwvline(win,y,x,c,n)		(wmove(win,y,x) == ERR ? ERR : wvline(win,c,n))
-
-#define mvaddch(y,x,ch)			mvwaddch(stdscr,y,x,ch)
-#define mvaddchnstr(y,x,str,n)		mvwaddchnstr(stdscr,y,x,str,n)
-#define mvaddchstr(y,x,str)		mvwaddchstr(stdscr,y,x,str)
-#define mvaddnstr(y,x,str,n)		mvwaddnstr(stdscr,y,x,str,n)
-#define mvaddstr(y,x,str)		mvwaddstr(stdscr,y,x,str)
-#define mvchgat(y,x,n,a,c,o)		mvwchgat(stdscr,y,x,n,a,c,o)
-#define mvdelch(y,x)			mvwdelch(stdscr,y,x)
-#define mvgetch(y,x)			mvwgetch(stdscr,y,x)
-#define mvgetnstr(y,x,str,n)		mvwgetnstr(stdscr,y,x,str,n)
-#define mvgetstr(y,x,str)		mvwgetstr(stdscr,y,x,str)
-#define mvhline(y,x,c,n)		mvwhline(stdscr,y,x,c,n)
-#define mvinch(y,x)			mvwinch(stdscr,y,x)
-#define mvinchnstr(y,x,s,n)		mvwinchnstr(stdscr,y,x,s,n)
-#define mvinchstr(y,x,s)		mvwinchstr(stdscr,y,x,s)
-#define mvinnstr(y,x,s,n)		mvwinnstr(stdscr,y,x,s,n)
-#define mvinsch(y,x,c)			mvwinsch(stdscr,y,x,c)
-#define mvinsnstr(y,x,s,n)		mvwinsnstr(stdscr,y,x,s,n)
-#define mvinsstr(y,x,s)			mvwinsstr(stdscr,y,x,s)
-#define mvinstr(y,x,s)			mvwinstr(stdscr,y,x,s)
-#define mvvline(y,x,c,n)		mvwvline(stdscr,y,x,c,n)
-
-/*
- * Some wide-character functions can be implemented without the extensions.
- */
-#if !NCURSES_OPAQUE
-#define getbkgd(win)                    ((win)->_bkgd)
-#endif /* NCURSES_OPAQUE */
-
-#define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
-#define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
-
-#if !NCURSES_OPAQUE
-#if defined(_XOPEN_SOURCE_EXTENDED) && 0
-#define wattr_set(win,a,p,opts)		((win)->_attrs = ((a) & ~A_COLOR), \
-					 (win)->_color = (p), \
-					 OK)
-#define wattr_get(win,a,p,opts)		((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
-					 (void)((p) != (void *)0 && (*(p) = (win)->_color)), \
-					 OK)
-#else
-#define wattr_set(win,a,p,opts)		((win)->_attrs = (((a) & ~A_COLOR) | COLOR_PAIR(p)), OK)
-#define wattr_get(win,a,p,opts)		((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
-					 (void)((p) != (void *)0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \
-					 OK)
-#endif
-#endif /* NCURSES_OPAQUE */
-
-/*
- * X/Open curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
- * varargs.h.  It adds new calls vw_printw/vw_scanw, which are supposed to
- * use POSIX stdarg.h.  The ncurses versions of vwprintw/vwscanw already
- * use stdarg.h, so...
- */
-#define vw_printw		vwprintw
-#define vw_scanw		vwscanw
-
-/*
- * Export fallback function for use in C++ binding.
- */
-#if !1
-#define vsscanf(a,b,c) _nc_vsscanf(a,b,c)
-NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
-#endif
-
-/*
- * These macros are extensions - not in X/Open Curses.
- */
-#if 1
-#if !NCURSES_OPAQUE
-#define is_cleared(win)		((win)->_clear)
-#define is_idcok(win)		((win)->_idcok)
-#define is_idlok(win)		((win)->_idlok)
-#define is_immedok(win)		((win)->_immed)
-#define is_keypad(win)		((win)->_use_keypad)
-#define is_leaveok(win)		((win)->_leaveok)
-#define is_nodelay(win)		((win)->_delay == 0)
-#define is_notimeout(win)	((win)->_notimeout)
-#define is_scrollok(win)	((win)->_scroll)
-#define is_syncok(win)		((win)->_sync)
-#define wgetparent(win)		((win) ? (win)->_parent : 0)
-#define wgetscrreg(win,t,b)	((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
-#endif
-#endif
-
-#endif /* NCURSES_NOMACROS */
-
-/*
- * Public variables.
- *
- * Notes:
- *	a. ESCDELAY was an undocumented feature under AIX curses.
- *	   It gives the ESC expire time in milliseconds.
- *	b. ttytype is needed for backward compatibility
- */
-#if 0
-
-NCURSES_WRAPPED_VAR(WINDOW *, curscr);
-NCURSES_WRAPPED_VAR(WINDOW *, newscr);
-NCURSES_WRAPPED_VAR(WINDOW *, stdscr);
-NCURSES_WRAPPED_VAR(char *, ttytype);
-NCURSES_WRAPPED_VAR(int, COLORS);
-NCURSES_WRAPPED_VAR(int, COLOR_PAIRS);
-NCURSES_WRAPPED_VAR(int, COLS);
-NCURSES_WRAPPED_VAR(int, ESCDELAY);
-NCURSES_WRAPPED_VAR(int, LINES);
-NCURSES_WRAPPED_VAR(int, TABSIZE);
-
-#define curscr      NCURSES_PUBLIC_VAR(curscr())
-#define newscr      NCURSES_PUBLIC_VAR(newscr())
-#define stdscr      NCURSES_PUBLIC_VAR(stdscr())
-#define ttytype     NCURSES_PUBLIC_VAR(ttytype())
-#define COLORS      NCURSES_PUBLIC_VAR(COLORS())
-#define COLOR_PAIRS NCURSES_PUBLIC_VAR(COLOR_PAIRS())
-#define COLS        NCURSES_PUBLIC_VAR(COLS())
-#define ESCDELAY    NCURSES_PUBLIC_VAR(ESCDELAY())
-#define LINES       NCURSES_PUBLIC_VAR(LINES())
-#define TABSIZE     NCURSES_PUBLIC_VAR(TABSIZE())
-
-#else
-
-extern NCURSES_EXPORT_VAR(WINDOW *) curscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) newscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) stdscr;
-extern NCURSES_EXPORT_VAR(char) ttytype[];
-extern NCURSES_EXPORT_VAR(int) COLORS;
-extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
-extern NCURSES_EXPORT_VAR(int) COLS;
-extern NCURSES_EXPORT_VAR(int) ESCDELAY;
-extern NCURSES_EXPORT_VAR(int) LINES;
-extern NCURSES_EXPORT_VAR(int) TABSIZE;
-
-#endif
-
-/*
- * Pseudo-character tokens outside ASCII range.  The curses wgetch() function
- * will return any given one of these only if the corresponding k- capability
- * is defined in your terminal's terminfo entry.
- *
- * Some keys (KEY_A1, etc) are arranged like this:
- *	a1     up    a3
- *	left   b2    right
- *	c1     down  c3
- *
- * A few key codes do not depend upon the terminfo entry.
- */
-#define KEY_CODE_YES	0400		/* A wchar_t contains a key code */
-#define KEY_MIN		0401		/* Minimum curses key */
-#define KEY_BREAK	0401		/* Break key (unreliable) */
-#define KEY_SRESET	0530		/* Soft (partial) reset (unreliable) */
-#define KEY_RESET	0531		/* Reset or hard reset (unreliable) */
-/*
- * These definitions were generated by /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/MKkey_defs.sh /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/Caps
- */
-#define KEY_DOWN	0402		/* down-arrow key */
-#define KEY_UP		0403		/* up-arrow key */
-#define KEY_LEFT	0404		/* left-arrow key */
-#define KEY_RIGHT	0405		/* right-arrow key */
-#define KEY_HOME	0406		/* home key */
-#define KEY_BACKSPACE	0407		/* backspace key */
-#define KEY_F0		0410		/* Function keys.  Space for 64 */
-#define KEY_F(n)	(KEY_F0+(n))	/* Value of function key n */
-#define KEY_DL		0510		/* delete-line key */
-#define KEY_IL		0511		/* insert-line key */
-#define KEY_DC		0512		/* delete-character key */
-#define KEY_IC		0513		/* insert-character key */
-#define KEY_EIC		0514		/* sent by rmir or smir in insert mode */
-#define KEY_CLEAR	0515		/* clear-screen or erase key */
-#define KEY_EOS		0516		/* clear-to-end-of-screen key */
-#define KEY_EOL		0517		/* clear-to-end-of-line key */
-#define KEY_SF		0520		/* scroll-forward key */
-#define KEY_SR		0521		/* scroll-backward key */
-#define KEY_NPAGE	0522		/* next-page key */
-#define KEY_PPAGE	0523		/* previous-page key */
-#define KEY_STAB	0524		/* set-tab key */
-#define KEY_CTAB	0525		/* clear-tab key */
-#define KEY_CATAB	0526		/* clear-all-tabs key */
-#define KEY_ENTER	0527		/* enter/send key */
-#define KEY_PRINT	0532		/* print key */
-#define KEY_LL		0533		/* lower-left key (home down) */
-#define KEY_A1		0534		/* upper left of keypad */
-#define KEY_A3		0535		/* upper right of keypad */
-#define KEY_B2		0536		/* center of keypad */
-#define KEY_C1		0537		/* lower left of keypad */
-#define KEY_C3		0540		/* lower right of keypad */
-#define KEY_BTAB	0541		/* back-tab key */
-#define KEY_BEG		0542		/* begin key */
-#define KEY_CANCEL	0543		/* cancel key */
-#define KEY_CLOSE	0544		/* close key */
-#define KEY_COMMAND	0545		/* command key */
-#define KEY_COPY	0546		/* copy key */
-#define KEY_CREATE	0547		/* create key */
-#define KEY_END		0550		/* end key */
-#define KEY_EXIT	0551		/* exit key */
-#define KEY_FIND	0552		/* find key */
-#define KEY_HELP	0553		/* help key */
-#define KEY_MARK	0554		/* mark key */
-#define KEY_MESSAGE	0555		/* message key */
-#define KEY_MOVE	0556		/* move key */
-#define KEY_NEXT	0557		/* next key */
-#define KEY_OPEN	0560		/* open key */
-#define KEY_OPTIONS	0561		/* options key */
-#define KEY_PREVIOUS	0562		/* previous key */
-#define KEY_REDO	0563		/* redo key */
-#define KEY_REFERENCE	0564		/* reference key */
-#define KEY_REFRESH	0565		/* refresh key */
-#define KEY_REPLACE	0566		/* replace key */
-#define KEY_RESTART	0567		/* restart key */
-#define KEY_RESUME	0570		/* resume key */
-#define KEY_SAVE	0571		/* save key */
-#define KEY_SBEG	0572		/* shifted begin key */
-#define KEY_SCANCEL	0573		/* shifted cancel key */
-#define KEY_SCOMMAND	0574		/* shifted command key */
-#define KEY_SCOPY	0575		/* shifted copy key */
-#define KEY_SCREATE	0576		/* shifted create key */
-#define KEY_SDC		0577		/* shifted delete-character key */
-#define KEY_SDL		0600		/* shifted delete-line key */
-#define KEY_SELECT	0601		/* select key */
-#define KEY_SEND	0602		/* shifted end key */
-#define KEY_SEOL	0603		/* shifted clear-to-end-of-line key */
-#define KEY_SEXIT	0604		/* shifted exit key */
-#define KEY_SFIND	0605		/* shifted find key */
-#define KEY_SHELP	0606		/* shifted help key */
-#define KEY_SHOME	0607		/* shifted home key */
-#define KEY_SIC		0610		/* shifted insert-character key */
-#define KEY_SLEFT	0611		/* shifted left-arrow key */
-#define KEY_SMESSAGE	0612		/* shifted message key */
-#define KEY_SMOVE	0613		/* shifted move key */
-#define KEY_SNEXT	0614		/* shifted next key */
-#define KEY_SOPTIONS	0615		/* shifted options key */
-#define KEY_SPREVIOUS	0616		/* shifted previous key */
-#define KEY_SPRINT	0617		/* shifted print key */
-#define KEY_SREDO	0620		/* shifted redo key */
-#define KEY_SREPLACE	0621		/* shifted replace key */
-#define KEY_SRIGHT	0622		/* shifted right-arrow key */
-#define KEY_SRSUME	0623		/* shifted resume key */
-#define KEY_SSAVE	0624		/* shifted save key */
-#define KEY_SSUSPEND	0625		/* shifted suspend key */
-#define KEY_SUNDO	0626		/* shifted undo key */
-#define KEY_SUSPEND	0627		/* suspend key */
-#define KEY_UNDO	0630		/* undo key */
-#define KEY_MOUSE	0631		/* Mouse event has occurred */
-#define KEY_RESIZE	0632		/* Terminal resize event */
-#define KEY_EVENT	0633		/* We were interrupted by an event */
-
-#define KEY_MAX		0777		/* Maximum key value is 0633 */
-/* $Id: curses.h 103 2016-01-12 05:32:24Z reddawg $ */
-/*
- * vile:cmode:
- * This file is part of ncurses, designed to be appended after curses.h.in
- * (see that file for the relevant copyright).
- */
-#ifdef _XOPEN_SOURCE_EXTENDED
-
-extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
-
-#define NCURSES_WACS(c)	(&_nc_wacs[(unsigned char)c])
-
-#define WACS_BSSB	NCURSES_WACS('l')
-#define WACS_SSBB	NCURSES_WACS('m')
-#define WACS_BBSS	NCURSES_WACS('k')
-#define WACS_SBBS	NCURSES_WACS('j')
-#define WACS_SBSS	NCURSES_WACS('u')
-#define WACS_SSSB	NCURSES_WACS('t')
-#define WACS_SSBS	NCURSES_WACS('v')
-#define WACS_BSSS	NCURSES_WACS('w')
-#define WACS_BSBS	NCURSES_WACS('q')
-#define WACS_SBSB	NCURSES_WACS('x')
-#define WACS_SSSS	NCURSES_WACS('n')
-
-#define WACS_ULCORNER	WACS_BSSB
-#define WACS_LLCORNER	WACS_SSBB
-#define WACS_URCORNER	WACS_BBSS
-#define WACS_LRCORNER	WACS_SBBS
-#define WACS_RTEE	WACS_SBSS
-#define WACS_LTEE	WACS_SSSB
-#define WACS_BTEE	WACS_SSBS
-#define WACS_TTEE	WACS_BSSS
-#define WACS_HLINE	WACS_BSBS
-#define WACS_VLINE	WACS_SBSB
-#define WACS_PLUS	WACS_SSSS
-
-#define WACS_S1		NCURSES_WACS('o') /* scan line 1 */
-#define WACS_S9 	NCURSES_WACS('s') /* scan line 9 */
-#define WACS_DIAMOND	NCURSES_WACS('`') /* diamond */
-#define WACS_CKBOARD	NCURSES_WACS('a') /* checker board */
-#define WACS_DEGREE	NCURSES_WACS('f') /* degree symbol */
-#define WACS_PLMINUS	NCURSES_WACS('g') /* plus/minus */
-#define WACS_BULLET	NCURSES_WACS('~') /* bullet */
-
-	/* Teletype 5410v1 symbols */
-#define WACS_LARROW	NCURSES_WACS(',') /* arrow left */
-#define WACS_RARROW	NCURSES_WACS('+') /* arrow right */
-#define WACS_DARROW	NCURSES_WACS('.') /* arrow down */
-#define WACS_UARROW	NCURSES_WACS('-') /* arrow up */
-#define WACS_BOARD	NCURSES_WACS('h') /* board of squares */
-#define WACS_LANTERN	NCURSES_WACS('i') /* lantern symbol */
-#define WACS_BLOCK	NCURSES_WACS('0') /* solid square block */
-
-	/* ncurses extensions */
-#define WACS_S3		NCURSES_WACS('p') /* scan line 3 */
-#define WACS_S7		NCURSES_WACS('r') /* scan line 7 */
-#define WACS_LEQUAL	NCURSES_WACS('y') /* less/equal */
-#define WACS_GEQUAL	NCURSES_WACS('z') /* greater/equal */
-#define WACS_PI		NCURSES_WACS('{') /* Pi */
-#define WACS_NEQUAL	NCURSES_WACS('|') /* not equal */
-#define WACS_STERLING	NCURSES_WACS('}') /* UK pound sign */
-
-/*
- * Function prototypes for wide-character operations.
- *
- * "generated" comments should include ":WIDEC" to make the corresponding
- * functions ifdef'd in lib_gen.c
- *
- * "implemented" comments do not need this marker.
- */
-
-extern NCURSES_EXPORT(int) add_wch (const cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) add_wchnstr (const cchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) add_wchstr (const cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) addnwstr (const wchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) addwstr (const wchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) bkgrnd (const cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(void) bkgrndset (const cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) border_set (const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) box_set (WINDOW *, const cchar_t *, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) echo_wchar (const cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) erasewchar (wchar_t*);			/* implemented */
-extern NCURSES_EXPORT(int) get_wch (wint_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(int) get_wstr (wint_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(int) getbkgrnd (cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) getcchar (const cchar_t *, wchar_t*, attr_t*, short*, void*);	/* implemented */
-extern NCURSES_EXPORT(int) getn_wstr (wint_t *, int);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) hline_set (const cchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) in_wch (cchar_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(int) in_wchnstr (cchar_t *, int);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) in_wchstr (cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) innwstr (wchar_t *, int);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) ins_nwstr (const wchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) ins_wch (const cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) ins_wstr (const wchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) inwstr (wchar_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(NCURSES_CONST char*) key_name (wchar_t);		/* implemented */
-extern NCURSES_EXPORT(int) killwchar (wchar_t *);			/* implemented */
-extern NCURSES_EXPORT(int) mvadd_wch (int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvadd_wchnstr (int, int, const cchar_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvadd_wchstr (int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvaddnwstr (int, int, const wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvaddwstr (int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvget_wch (int, int, wint_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvget_wstr (int, int, wint_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvgetn_wstr (int, int, wint_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvhline_set (int, int, const cchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvin_wch (int, int, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvin_wchnstr (int, int, cchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvin_wchstr (int, int, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvinnwstr (int, int, wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvins_nwstr (int, int, const wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvins_wch (int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvins_wstr (int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvinwstr (int, int, wchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvvline_set (int, int, const cchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwadd_wch (WINDOW *, int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwadd_wchnstr (WINDOW *, int, int, const cchar_t *, int); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwadd_wchstr (WINDOW *, int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwaddnwstr (WINDOW *, int, int, const wchar_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwaddwstr (WINDOW *, int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwget_wch (WINDOW *, int, int, wint_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwget_wstr (WINDOW *, int, int, wint_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwgetn_wstr (WINDOW *, int, int, wint_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwhline_set (WINDOW *, int, int, const cchar_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwin_wch (WINDOW *, int, int, cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwin_wchnstr (WINDOW *, int,int, cchar_t *,int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwin_wchstr (WINDOW *, int, int, cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwinnwstr (WINDOW *, int, int, wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwins_nwstr (WINDOW *, int,int, const wchar_t *,int); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwins_wch (WINDOW *, int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwins_wstr (WINDOW *, int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwinwstr (WINDOW *, int, int, wchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwvline_set (WINDOW *, int,int, const cchar_t *,int); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) pecho_wchar (WINDOW *, const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) setcchar (cchar_t *, const wchar_t *, const attr_t, short, const void *);	/* implemented */
-extern NCURSES_EXPORT(int) slk_wset (int, const wchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(attr_t) term_attrs (void);			/* implemented */
-extern NCURSES_EXPORT(int) unget_wch (const wchar_t);			/* implemented */
-extern NCURSES_EXPORT(int) vid_attr (attr_t, short, void *);		/* implemented */
-extern NCURSES_EXPORT(int) vid_puts (attr_t, short, void *, int (*)(int)); /* implemented */
-extern NCURSES_EXPORT(int) vline_set (const cchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wadd_wch (WINDOW *,const cchar_t *);		/* implemented */
-extern NCURSES_EXPORT(int) wadd_wchnstr (WINDOW *,const cchar_t *,int);	/* implemented */
-extern NCURSES_EXPORT(int) wadd_wchstr (WINDOW *,const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) waddnwstr (WINDOW *,const wchar_t *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddwstr (WINDOW *,const wchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wbkgrnd (WINDOW *,const cchar_t *);		/* implemented */
-extern NCURSES_EXPORT(void) wbkgrndset (WINDOW *,const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) wborder_set (WINDOW *,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*);	/* implemented */
-extern NCURSES_EXPORT(int) wecho_wchar (WINDOW *, const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) wget_wch (WINDOW *, wint_t *);		/* implemented */
-extern NCURSES_EXPORT(int) wget_wstr (WINDOW *, wint_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wgetbkgrnd (WINDOW *, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wgetn_wstr (WINDOW *,wint_t *, int);		/* implemented */
-extern NCURSES_EXPORT(int) whline_set (WINDOW *, const cchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(int) win_wch (WINDOW *, cchar_t *);		/* implemented */
-extern NCURSES_EXPORT(int) win_wchnstr (WINDOW *, cchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(int) win_wchstr (WINDOW *, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) winnwstr (WINDOW *, wchar_t *, int);		/* implemented */
-extern NCURSES_EXPORT(int) wins_nwstr (WINDOW *, const wchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(int) wins_wch (WINDOW *, const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) wins_wstr (WINDOW *, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) winwstr (WINDOW *, wchar_t *);		/* implemented */
-extern NCURSES_EXPORT(wchar_t*) wunctrl (cchar_t *);			/* implemented */
-extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int);	/* implemented */
-
-#ifndef NCURSES_NOMACROS
-
-/*
- * XSI curses macros for XPG4 conformance.
- */
-#define add_wch(c)			wadd_wch(stdscr,c)
-#define add_wchnstr(str,n)		wadd_wchnstr(stdscr,str,n)
-#define add_wchstr(str)			wadd_wchstr(stdscr,str)
-#define addnwstr(wstr,n)		waddnwstr(stdscr,wstr,n)
-#define addwstr(wstr)			waddwstr(stdscr,wstr)
-#define bkgrnd(c)			wbkgrnd(stdscr,c)
-#define bkgrndset(c)			wbkgrndset(stdscr,c)
-#define border_set(l,r,t,b,tl,tr,bl,br) wborder_set(stdscr,l,r,t,b,tl,tr,bl,br)
-#define box_set(w,v,h)			wborder_set(w,v,v,h,h,0,0,0,0)
-#define echo_wchar(c)			wecho_wchar(stdscr,c)
-#define get_wch(c)			wget_wch(stdscr,c)
-#define get_wstr(t)			wget_wstr(stdscr,t)
-#define getbkgrnd(wch)			wgetbkgrnd(stdscr,wch)
-#define getn_wstr(t,n)			wgetn_wstr(stdscr,t,n)
-#define hline_set(c,n)			whline_set(stdscr,c,n)
-#define in_wch(c)			win_wch(stdscr,c)
-#define in_wchnstr(c,n)			win_wchnstr(stdscr,c,n)
-#define in_wchstr(c)			win_wchstr(stdscr,c)
-#define innwstr(c,n)			winnwstr(stdscr,c,n)
-#define ins_nwstr(t,n)			wins_nwstr(stdscr,t,n)
-#define ins_wch(c)			wins_wch(stdscr,c)
-#define ins_wstr(t)			wins_wstr(stdscr,t)
-#define inwstr(c)			winwstr(stdscr,c)
-#define vline_set(c,n)			wvline_set(stdscr,c,n)
-#define wadd_wchstr(win,str)		wadd_wchnstr(win,str,-1)
-#define waddwstr(win,wstr)		waddnwstr(win,wstr,-1)
-#define wget_wstr(w,t)			wgetn_wstr(w,t,-1)
-#define win_wchstr(w,c)			win_wchnstr(w,c,-1)
-#define wins_wstr(w,t)			wins_nwstr(w,t,-1)
-
-#if !NCURSES_OPAQUE
-#define wgetbkgrnd(win,wch)		(*wch = win->_bkgrnd, OK)
-#endif
-
-#define mvadd_wch(y,x,c)		mvwadd_wch(stdscr,y,x,c)
-#define mvadd_wchnstr(y,x,s,n)		mvwadd_wchnstr(stdscr,y,x,s,n)
-#define mvadd_wchstr(y,x,s)		mvwadd_wchstr(stdscr,y,x,s)
-#define mvaddnwstr(y,x,wstr,n)		mvwaddnwstr(stdscr,y,x,wstr,n)
-#define mvaddwstr(y,x,wstr)		mvwaddwstr(stdscr,y,x,wstr)
-#define mvget_wch(y,x,c)		mvwget_wch(stdscr,y,x,c)
-#define mvget_wstr(y,x,t)		mvwget_wstr(stdscr,y,x,t)
-#define mvgetn_wstr(y,x,t,n)		mvwgetn_wstr(stdscr,y,x,t,n)
-#define mvhline_set(y,x,c,n)		mvwhline_set(stdscr,y,x,c,n)
-#define mvin_wch(y,x,c)			mvwin_wch(stdscr,y,x,c)
-#define mvin_wchnstr(y,x,c,n)		mvwin_wchnstr(stdscr,y,x,c,n)
-#define mvin_wchstr(y,x,c)		mvwin_wchstr(stdscr,y,x,c)
-#define mvinnwstr(y,x,c,n)		mvwinnwstr(stdscr,y,x,c,n)
-#define mvins_nwstr(y,x,t,n)		mvwins_nwstr(stdscr,y,x,t,n)
-#define mvins_wch(y,x,c)		mvwins_wch(stdscr,y,x,c)
-#define mvins_wstr(y,x,t)		mvwins_wstr(stdscr,y,x,t)
-#define mvinwstr(y,x,c)			mvwinwstr(stdscr,y,x,c)
-#define mvvline_set(y,x,c,n)		mvwvline_set(stdscr,y,x,c,n)
-
-#define mvwadd_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wadd_wch(win,c))
-#define mvwadd_wchnstr(win,y,x,s,n)	(wmove(win,y,x) == ERR ? ERR : wadd_wchnstr(win,s,n))
-#define mvwadd_wchstr(win,y,x,s)	(wmove(win,y,x) == ERR ? ERR : wadd_wchstr(win,s))
-#define mvwaddnwstr(win,y,x,wstr,n)	(wmove(win,y,x) == ERR ? ERR : waddnwstr(win,wstr,n))
-#define mvwaddwstr(win,y,x,wstr)	(wmove(win,y,x) == ERR ? ERR : waddwstr(win,wstr))
-#define mvwget_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wget_wch(win,c))
-#define mvwget_wstr(win,y,x,t)		(wmove(win,y,x) == ERR ? ERR : wget_wstr(win,t))
-#define mvwgetn_wstr(win,y,x,t,n)	(wmove(win,y,x) == ERR ? ERR : wgetn_wstr(win,t,n))
-#define mvwhline_set(win,y,x,c,n)	(wmove(win,y,x) == ERR ? ERR : whline_set(win,c,n))
-#define mvwin_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : win_wch(win,c))
-#define mvwin_wchnstr(win,y,x,c,n)	(wmove(win,y,x) == ERR ? ERR : win_wchnstr(win,c,n))
-#define mvwin_wchstr(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : win_wchstr(win,c))
-#define mvwinnwstr(win,y,x,c,n)		(wmove(win,y,x) == ERR ? ERR : winnwstr(win,c,n))
-#define mvwins_nwstr(win,y,x,t,n)	(wmove(win,y,x) == ERR ? ERR : wins_nwstr(win,t,n))
-#define mvwins_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wins_wch(win,c))
-#define mvwins_wstr(win,y,x,t)		(wmove(win,y,x) == ERR ? ERR : wins_wstr(win,t))
-#define mvwinwstr(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : winwstr(win,c))
-#define mvwvline_set(win,y,x,c,n)	(wmove(win,y,x) == ERR ? ERR : wvline_set(win,c,n))
-
-#endif /* NCURSES_NOMACROS */
-
-#if defined(TRACE) || defined(NCURSES_TEST)
-extern NCURSES_EXPORT(const char *) _nc_viswbuf(const wchar_t *);
-extern NCURSES_EXPORT(const char *) _nc_viswibuf(const wint_t *);
-#endif
-
-#endif /* _XOPEN_SOURCE_EXTENDED */
-/* $Id: curses.h 103 2016-01-12 05:32:24Z reddawg $ */
-/*
- * vile:cmode:
- * This file is part of ncurses, designed to be appended after curses.h.in
- * (see that file for the relevant copyright).
- */
-
-/* mouse interface */
-
-#if NCURSES_MOUSE_VERSION > 1
-#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 5))
-#else
-#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 6))
-#endif
-
-#define	NCURSES_BUTTON_RELEASED	001L
-#define	NCURSES_BUTTON_PRESSED	002L
-#define	NCURSES_BUTTON_CLICKED	004L
-#define	NCURSES_DOUBLE_CLICKED	010L
-#define	NCURSES_TRIPLE_CLICKED	020L
-#define	NCURSES_RESERVED_EVENT	040L
-
-/* event masks */
-#define	BUTTON1_RELEASED	NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED)
-#define	BUTTON1_PRESSED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_PRESSED)
-#define	BUTTON1_CLICKED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_CLICKED)
-#define	BUTTON1_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON1_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON2_RELEASED	NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_RELEASED)
-#define	BUTTON2_PRESSED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_PRESSED)
-#define	BUTTON2_CLICKED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_CLICKED)
-#define	BUTTON2_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON2_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON3_RELEASED	NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_RELEASED)
-#define	BUTTON3_PRESSED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_PRESSED)
-#define	BUTTON3_CLICKED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_CLICKED)
-#define	BUTTON3_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON3_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON4_RELEASED	NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_RELEASED)
-#define	BUTTON4_PRESSED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_PRESSED)
-#define	BUTTON4_CLICKED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_CLICKED)
-#define	BUTTON4_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON4_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_TRIPLE_CLICKED)
-
-/*
- * In 32 bits the version-1 scheme does not provide enough space for a 5th
- * button, unless we choose to change the ABI by omitting the reserved-events.
- */
-#if NCURSES_MOUSE_VERSION > 1
-
-#define	BUTTON5_RELEASED	NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_RELEASED)
-#define	BUTTON5_PRESSED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_PRESSED)
-#define	BUTTON5_CLICKED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_CLICKED)
-#define	BUTTON5_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON5_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(6, 0001L)
-#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(6, 0002L)
-#define	BUTTON_ALT		NCURSES_MOUSE_MASK(6, 0004L)
-#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(6, 0010L)
-
-#else
-
-#define	BUTTON1_RESERVED_EVENT	NCURSES_MOUSE_MASK(1, NCURSES_RESERVED_EVENT)
-#define	BUTTON2_RESERVED_EVENT	NCURSES_MOUSE_MASK(2, NCURSES_RESERVED_EVENT)
-#define	BUTTON3_RESERVED_EVENT	NCURSES_MOUSE_MASK(3, NCURSES_RESERVED_EVENT)
-#define	BUTTON4_RESERVED_EVENT	NCURSES_MOUSE_MASK(4, NCURSES_RESERVED_EVENT)
-
-#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(5, 0001L)
-#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(5, 0002L)
-#define	BUTTON_ALT		NCURSES_MOUSE_MASK(5, 0004L)
-#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(5, 0010L)
-
-#endif
-
-#define	ALL_MOUSE_EVENTS	(REPORT_MOUSE_POSITION - 1)
-
-/* macros to extract single event-bits from masks */
-#define	BUTTON_RELEASE(e, x)		((e) & NCURSES_MOUSE_MASK(x, 001))
-#define	BUTTON_PRESS(e, x)		((e) & NCURSES_MOUSE_MASK(x, 002))
-#define	BUTTON_CLICK(e, x)		((e) & NCURSES_MOUSE_MASK(x, 004))
-#define	BUTTON_DOUBLE_CLICK(e, x)	((e) & NCURSES_MOUSE_MASK(x, 010))
-#define	BUTTON_TRIPLE_CLICK(e, x)	((e) & NCURSES_MOUSE_MASK(x, 020))
-#define	BUTTON_RESERVED_EVENT(e, x)	((e) & NCURSES_MOUSE_MASK(x, 040))
-
-typedef struct
-{
-    short id;		/* ID to distinguish multiple devices */
-    int x, y, z;	/* event coordinates (character-cell) */
-    mmask_t bstate;	/* button state bits */
-}
-MEVENT;
-
-extern NCURSES_EXPORT(int) getmouse (MEVENT *);
-extern NCURSES_EXPORT(int) ungetmouse (MEVENT *);
-extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *);
-extern NCURSES_EXPORT(bool) wenclose (const WINDOW *, int, int);
-extern NCURSES_EXPORT(int) mouseinterval (int);
-extern NCURSES_EXPORT(bool) wmouse_trafo (const WINDOW*, int*, int*, bool);
-extern NCURSES_EXPORT(bool) mouse_trafo (int*, int*, bool);              /* generated */
-
-#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
-
-/* other non-XSI functions */
-
-extern NCURSES_EXPORT(int) mcprint (char *, int);	/* direct data to printer */
-extern NCURSES_EXPORT(int) has_key (int);		/* do we have given key? */
-
-/* Debugging : use with libncurses_g.a */
-
-extern NCURSES_EXPORT(void) _tracef (const char *, ...) GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(void) _tracedump (const char *, WINDOW *);
-extern NCURSES_EXPORT(char *) _traceattr (attr_t);
-extern NCURSES_EXPORT(char *) _traceattr2 (int, chtype);
-extern NCURSES_EXPORT(char *) _nc_tracebits (void);
-extern NCURSES_EXPORT(char *) _tracechar (int);
-extern NCURSES_EXPORT(char *) _tracechtype (chtype);
-extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype);
-#ifdef _XOPEN_SOURCE_EXTENDED
-#define _tracech_t		_tracecchar_t
-extern NCURSES_EXPORT(char *) _tracecchar_t (const cchar_t *);
-#define _tracech_t2		_tracecchar_t2
-extern NCURSES_EXPORT(char *) _tracecchar_t2 (int, const cchar_t *);
-#else
-#define _tracech_t		_tracechtype
-#define _tracech_t2		_tracechtype2
-#endif
-extern NCURSES_EXPORT(char *) _tracemouse (const MEVENT *);
-extern NCURSES_EXPORT(void) trace (const unsigned int);
-
-/* trace masks */
-#define TRACE_DISABLE	0x0000	/* turn off tracing */
-#define TRACE_TIMES	0x0001	/* trace user and system times of updates */
-#define TRACE_TPUTS	0x0002	/* trace tputs calls */
-#define TRACE_UPDATE	0x0004	/* trace update actions, old & new screens */
-#define TRACE_MOVE	0x0008	/* trace cursor moves and scrolls */
-#define TRACE_CHARPUT	0x0010	/* trace all character outputs */
-#define TRACE_ORDINARY	0x001F	/* trace all update actions */
-#define TRACE_CALLS	0x0020	/* trace all curses calls */
-#define TRACE_VIRTPUT	0x0040	/* trace virtual character puts */
-#define TRACE_IEVENT	0x0080	/* trace low-level input processing */
-#define TRACE_BITS	0x0100	/* trace state of TTY control bits */
-#define TRACE_ICALLS	0x0200	/* trace internal/nested calls */
-#define TRACE_CCALLS	0x0400	/* trace per-character calls */
-#define TRACE_DATABASE	0x0800	/* trace read/write of terminfo/termcap data */
-#define TRACE_ATTRS	0x1000	/* trace attribute updates */
-
-#define TRACE_SHIFT	13	/* number of bits in the trace masks */
-#define TRACE_MAXIMUM	((1 << TRACE_SHIFT) - 1) /* maximum trace level */
-
-#if defined(TRACE) || defined(NCURSES_TEST)
-extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable;		/* enable optimizations */
-extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
-#define OPTIMIZE_MVCUR		0x01	/* cursor movement optimization */
-#define OPTIMIZE_HASHMAP	0x02	/* diff hashing to detect scrolls */
-#define OPTIMIZE_SCROLL		0x04	/* scroll optimization */
-#define OPTIMIZE_ALL		0xff	/* enable all optimizations (dflt) */
-#endif
-
-#ifdef __cplusplus
-
-#ifndef NCURSES_NOMACROS
-
-/* these names conflict with STL */
-#undef box
-#undef clear
-#undef erase
-#undef move
-#undef refresh
-
-#endif /* NCURSES_NOMACROS */
-
-}
-#endif
-
-#endif /* __NCURSES_H */
diff --git a/include.new/db.h b/include.new/db.h
deleted file mode 100644
index 7cafb08..0000000
--- a/include.new/db.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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. 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.
- *
- *	@(#)db.h	8.7 (Berkeley) 6/16/94
- * $FreeBSD: releng/10.2/include/db.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _DB_H_
-#define	_DB_H_
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-
-#include <limits.h>
-
-#define	RET_ERROR	-1		/* Return values. */
-#define	RET_SUCCESS	 0
-#define	RET_SPECIAL	 1
-
-#define	MAX_PAGE_NUMBER	0xffffffff	/* >= # of pages in a file */
-typedef uint32_t	pgno_t;
-#define	MAX_PAGE_OFFSET	65535		/* >= # of bytes in a page */
-typedef uint16_t	indx_t;
-#define	MAX_REC_NUMBER	0xffffffff	/* >= # of records in a tree */
-typedef uint32_t	recno_t;
-
-/* Key/data structure -- a Data-Base Thang. */
-typedef struct {
-	void	*data;			/* data */
-	size_t	 size;			/* data length */
-} DBT;
-
-/* Routine flags. */
-#define	R_CURSOR	1		/* del, put, seq */
-#define	__R_UNUSED	2		/* UNUSED */
-#define	R_FIRST		3		/* seq */
-#define	R_IAFTER	4		/* put (RECNO) */
-#define	R_IBEFORE	5		/* put (RECNO) */
-#define	R_LAST		6		/* seq (BTREE, RECNO) */
-#define	R_NEXT		7		/* seq */
-#define	R_NOOVERWRITE	8		/* put */
-#define	R_PREV		9		/* seq (BTREE, RECNO) */
-#define	R_SETCURSOR	10		/* put (RECNO) */
-#define	R_RECNOSYNC	11		/* sync (RECNO) */
-
-typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
-
-/*
- * !!!
- * The following flags are included in the dbopen(3) call as part of the
- * open(2) flags.  In order to avoid conflicts with the open flags, start
- * at the top of the 16 or 32-bit number space and work our way down.  If
- * the open flags were significantly expanded in the future, it could be
- * a problem.  Wish I'd left another flags word in the dbopen call.
- *
- * !!!
- * None of this stuff is implemented yet.  The only reason that it's here
- * is so that the access methods can skip copying the key/data pair when
- * the DB_LOCK flag isn't set.
- */
-#if UINT_MAX > 65535
-#define	DB_LOCK		0x20000000	/* Do locking. */
-#define	DB_SHMEM	0x40000000	/* Use shared memory. */
-#define	DB_TXN		0x80000000	/* Do transactions. */
-#else
-#define	DB_LOCK		    0x2000	/* Do locking. */
-#define	DB_SHMEM	    0x4000	/* Use shared memory. */
-#define	DB_TXN		    0x8000	/* Do transactions. */
-#endif
-
-/* Access method description structure. */
-typedef struct __db {
-	DBTYPE type;			/* Underlying db type. */
-	int (*close)(struct __db *);
-	int (*del)(const struct __db *, const DBT *, unsigned int);
-	int (*get)(const struct __db *, const DBT *, DBT *, unsigned int);
-	int (*put)(const struct __db *, DBT *, const DBT *, unsigned int);
-	int (*seq)(const struct __db *, DBT *, DBT *, unsigned int);
-	int (*sync)(const struct __db *, unsigned int);
-	void *internal;			/* Access method private. */
-	int (*fd)(const struct __db *);
-} DB;
-
-#define	BTREEMAGIC	0x053162
-#define	BTREEVERSION	3
-
-/* Structure used to pass parameters to the btree routines. */
-typedef struct {
-#define	R_DUP		0x01	/* duplicate keys */
-	unsigned long	flags;
-	unsigned int	cachesize;	/* bytes to cache */
-	int		maxkeypage;	/* maximum keys per page */
-	int		minkeypage;	/* minimum keys per page */
-	unsigned int	psize;		/* page size */
-	int		(*compare)	/* comparison function */
-			    (const DBT *, const DBT *);
-	size_t		(*prefix)	/* prefix function */
-			    (const DBT *, const DBT *);
-	int		lorder;		/* byte order */
-} BTREEINFO;
-
-#define	HASHMAGIC	0x061561
-#define	HASHVERSION	2
-
-/* Structure used to pass parameters to the hashing routines. */
-typedef struct {
-	unsigned int	bsize;		/* bucket size */
-	unsigned int	ffactor;	/* fill factor */
-	unsigned int	nelem;		/* number of elements */
-	unsigned int	cachesize;	/* bytes to cache */
-	uint32_t			/* hash function */
-		(*hash)(const void *, size_t);
-	int	lorder;		/* byte order */
-} HASHINFO;
-
-/* Structure used to pass parameters to the record routines. */
-typedef struct {
-#define	R_FIXEDLEN	0x01	/* fixed-length records */
-#define	R_NOKEY		0x02	/* key not required */
-#define	R_SNAPSHOT	0x04	/* snapshot the input */
-	unsigned long	flags;
-	unsigned int	cachesize; /* bytes to cache */
-	unsigned int	psize;	/* page size */
-	int		lorder;	/* byte order */
-	size_t		reclen;	/* record length (fixed-length records) */
-	unsigned char	bval;	/* delimiting byte (variable-length records */
-	char	*bfname;	/* btree file name */ 
-} RECNOINFO;
-
-#ifdef __DBINTERFACE_PRIVATE
-/*
- * Little endian <==> big endian 32-bit swap macros.
- *	M_32_SWAP	swap a memory location
- *	P_32_SWAP	swap a referenced memory location
- *	P_32_COPY	swap from one location to another
- */
-#define	M_32_SWAP(a) {							\
-	uint32_t _tmp = a;						\
-	((char *)&a)[0] = ((char *)&_tmp)[3];				\
-	((char *)&a)[1] = ((char *)&_tmp)[2];				\
-	((char *)&a)[2] = ((char *)&_tmp)[1];				\
-	((char *)&a)[3] = ((char *)&_tmp)[0];				\
-}
-#define	P_32_SWAP(a) {							\
-	uint32_t _tmp = *(uint32_t *)a;					\
-	((char *)a)[0] = ((char *)&_tmp)[3];				\
-	((char *)a)[1] = ((char *)&_tmp)[2];				\
-	((char *)a)[2] = ((char *)&_tmp)[1];				\
-	((char *)a)[3] = ((char *)&_tmp)[0];				\
-}
-#define	P_32_COPY(a, b) {						\
-	((char *)&(b))[0] = ((char *)&(a))[3];				\
-	((char *)&(b))[1] = ((char *)&(a))[2];				\
-	((char *)&(b))[2] = ((char *)&(a))[1];				\
-	((char *)&(b))[3] = ((char *)&(a))[0];				\
-}
-
-/*
- * Little endian <==> big endian 16-bit swap macros.
- *	M_16_SWAP	swap a memory location
- *	P_16_SWAP	swap a referenced memory location
- *	P_16_COPY	swap from one location to another
- */
-#define	M_16_SWAP(a) {							\
-	uint16_t _tmp = a;						\
-	((char *)&a)[0] = ((char *)&_tmp)[1];				\
-	((char *)&a)[1] = ((char *)&_tmp)[0];				\
-}
-#define	P_16_SWAP(a) {							\
-	uint16_t _tmp = *(uint16_t *)a;					\
-	((char *)a)[0] = ((char *)&_tmp)[1];				\
-	((char *)a)[1] = ((char *)&_tmp)[0];				\
-}
-#define	P_16_COPY(a, b) {						\
-	((char *)&(b))[0] = ((char *)&(a))[1];				\
-	((char *)&(b))[1] = ((char *)&(a))[0];				\
-}
-#endif
-
-__BEGIN_DECLS
-#if __BSD_VISIBLE
-DB *dbopen(const char *, int, int, DBTYPE, const void *);
-#endif
-
-#ifdef __DBINTERFACE_PRIVATE
-DB	*__bt_open(const char *, int, int, const BTREEINFO *, int);
-DB	*__hash_open(const char *, int, int, const HASHINFO *, int);
-DB	*__rec_open(const char *, int, int, const RECNOINFO *, int);
-void	 __dbpanic(DB *dbp);
-#endif
-__END_DECLS
-#endif /* !_DB_H_ */
diff --git a/include.new/der-private.h b/include.new/der-private.h
deleted file mode 100644
index 555f71b..0000000
--- a/include.new/der-private.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* This is a generated file */
-#ifndef __der_private_h__
-#define __der_private_h__
-
-#include <stdarg.h>
-
-int
-_asn1_copy (
-	const struct asn1_template */*t*/,
-	const void */*from*/,
-	void */*to*/);
-
-int
-_asn1_copy_top (
-	const struct asn1_template */*t*/,
-	const void */*from*/,
-	void */*to*/);
-
-int
-_asn1_decode (
-	const struct asn1_template */*t*/,
-	unsigned /*flags*/,
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	void */*data*/,
-	size_t */*size*/);
-
-int
-_asn1_decode_top (
-	const struct asn1_template */*t*/,
-	unsigned /*flags*/,
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	void */*data*/,
-	size_t */*size*/);
-
-int
-_asn1_encode (
-	const struct asn1_template */*t*/,
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const void */*data*/,
-	size_t */*size*/);
-
-void
-_asn1_free (
-	const struct asn1_template */*t*/,
-	void */*data*/);
-
-size_t
-_asn1_length (
-	const struct asn1_template */*t*/,
-	const void */*data*/);
-
-struct tm *
-_der_gmtime (
-	time_t /*t*/,
-	struct tm */*tm*/);
-
-int
-_heim_der_set_sort (
-	const void */*a1*/,
-	const void */*a2*/);
-
-int
-_heim_fix_dce (
-	size_t /*reallen*/,
-	size_t */*len*/);
-
-size_t
-_heim_len_int (int /*val*/);
-
-size_t
-_heim_len_unsigned (unsigned /*val*/);
-
-int
-_heim_time2generalizedtime (
-	time_t /*t*/,
-	heim_octet_string */*s*/,
-	int /*gtimep*/);
-
-#endif /* __der_private_h__ */
diff --git a/include.new/der-protos.h b/include.new/der-protos.h
deleted file mode 100644
index 3b3d81d..0000000
--- a/include.new/der-protos.h
+++ /dev/null
@@ -1,628 +0,0 @@
-/* This is a generated file */
-#ifndef __der_protos_h__
-#define __der_protos_h__
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int
-copy_heim_any (
-	const heim_any */*from*/,
-	heim_any */*to*/);
-
-int
-copy_heim_any_set (
-	const heim_any_set */*from*/,
-	heim_any_set */*to*/);
-
-int
-decode_heim_any (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_any */*data*/,
-	size_t */*size*/);
-
-int
-decode_heim_any_set (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_any_set */*data*/,
-	size_t */*size*/);
-
-int
-der_copy_bit_string (
-	const heim_bit_string */*from*/,
-	heim_bit_string */*to*/);
-
-int
-der_copy_bmp_string (
-	const heim_bmp_string */*from*/,
-	heim_bmp_string */*to*/);
-
-int
-der_copy_general_string (
-	const heim_general_string */*from*/,
-	heim_general_string */*to*/);
-
-int
-der_copy_generalized_time (
-	const time_t */*from*/,
-	time_t */*to*/);
-
-int
-der_copy_heim_integer (
-	const heim_integer */*from*/,
-	heim_integer */*to*/);
-
-int
-der_copy_ia5_string (
-	const heim_ia5_string */*from*/,
-	heim_ia5_string */*to*/);
-
-int
-der_copy_integer (
-	const int */*from*/,
-	int */*to*/);
-
-int
-der_copy_octet_string (
-	const heim_octet_string */*from*/,
-	heim_octet_string */*to*/);
-
-int
-der_copy_oid (
-	const heim_oid */*from*/,
-	heim_oid */*to*/);
-
-int
-der_copy_printable_string (
-	const heim_printable_string */*from*/,
-	heim_printable_string */*to*/);
-
-int
-der_copy_universal_string (
-	const heim_universal_string */*from*/,
-	heim_universal_string */*to*/);
-
-int
-der_copy_unsigned (
-	const unsigned */*from*/,
-	unsigned */*to*/);
-
-int
-der_copy_utctime (
-	const time_t */*from*/,
-	time_t */*to*/);
-
-int
-der_copy_utf8string (
-	const heim_utf8_string */*from*/,
-	heim_utf8_string */*to*/);
-
-int
-der_copy_visible_string (
-	const heim_visible_string */*from*/,
-	heim_visible_string */*to*/);
-
-void
-der_free_bit_string (heim_bit_string */*k*/);
-
-void
-der_free_bmp_string (heim_bmp_string */*k*/);
-
-void
-der_free_general_string (heim_general_string */*str*/);
-
-void
-der_free_generalized_time (time_t */*t*/);
-
-void
-der_free_heim_integer (heim_integer */*k*/);
-
-void
-der_free_ia5_string (heim_ia5_string */*str*/);
-
-void
-der_free_integer (int */*i*/);
-
-void
-der_free_octet_string (heim_octet_string */*k*/);
-
-void
-der_free_oid (heim_oid */*k*/);
-
-void
-der_free_printable_string (heim_printable_string */*str*/);
-
-void
-der_free_universal_string (heim_universal_string */*k*/);
-
-void
-der_free_unsigned (unsigned */*u*/);
-
-void
-der_free_utctime (time_t */*t*/);
-
-void
-der_free_utf8string (heim_utf8_string */*str*/);
-
-void
-der_free_visible_string (heim_visible_string */*str*/);
-
-int
-der_get_bit_string (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_bit_string */*data*/,
-	size_t */*size*/);
-
-int
-der_get_bmp_string (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_bmp_string */*data*/,
-	size_t */*size*/);
-
-int
-der_get_boolean (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	int */*data*/,
-	size_t */*size*/);
-
-const char *
-der_get_class_name (unsigned /*num*/);
-
-int
-der_get_class_num (const char */*name*/);
-
-int
-der_get_general_string (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_general_string */*str*/,
-	size_t */*size*/);
-
-int
-der_get_generalized_time (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	time_t */*data*/,
-	size_t */*size*/);
-
-int
-der_get_heim_integer (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_integer */*data*/,
-	size_t */*size*/);
-
-int
-der_get_ia5_string (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_ia5_string */*str*/,
-	size_t */*size*/);
-
-int
-der_get_integer (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	int */*ret*/,
-	size_t */*size*/);
-
-int
-der_get_length (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	size_t */*val*/,
-	size_t */*size*/);
-
-int
-der_get_octet_string (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_octet_string */*data*/,
-	size_t */*size*/);
-
-int
-der_get_octet_string_ber (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_octet_string */*data*/,
-	size_t */*size*/);
-
-int
-der_get_oid (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_oid */*data*/,
-	size_t */*size*/);
-
-int
-der_get_printable_string (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_printable_string */*str*/,
-	size_t */*size*/);
-
-int
-der_get_tag (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	Der_class */*class*/,
-	Der_type */*type*/,
-	unsigned int */*tag*/,
-	size_t */*size*/);
-
-const char *
-der_get_tag_name (unsigned /*num*/);
-
-int
-der_get_tag_num (const char */*name*/);
-
-const char *
-der_get_type_name (unsigned /*num*/);
-
-int
-der_get_type_num (const char */*name*/);
-
-int
-der_get_universal_string (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_universal_string */*data*/,
-	size_t */*size*/);
-
-int
-der_get_unsigned (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	unsigned */*ret*/,
-	size_t */*size*/);
-
-int
-der_get_utctime (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	time_t */*data*/,
-	size_t */*size*/);
-
-int
-der_get_utf8string (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_utf8_string */*str*/,
-	size_t */*size*/);
-
-int
-der_get_visible_string (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	heim_visible_string */*str*/,
-	size_t */*size*/);
-
-int
-der_heim_bit_string_cmp (
-	const heim_bit_string */*p*/,
-	const heim_bit_string */*q*/);
-
-int
-der_heim_bmp_string_cmp (
-	const heim_bmp_string */*p*/,
-	const heim_bmp_string */*q*/);
-
-int
-der_heim_integer_cmp (
-	const heim_integer */*p*/,
-	const heim_integer */*q*/);
-
-int
-der_heim_octet_string_cmp (
-	const heim_octet_string */*p*/,
-	const heim_octet_string */*q*/);
-
-int
-der_heim_oid_cmp (
-	const heim_oid */*p*/,
-	const heim_oid */*q*/);
-
-int
-der_heim_universal_string_cmp (
-	const heim_universal_string */*p*/,
-	const heim_universal_string */*q*/);
-
-int
-der_ia5_string_cmp (
-	const heim_ia5_string */*p*/,
-	const heim_ia5_string */*q*/);
-
-size_t
-der_length_bit_string (const heim_bit_string */*k*/);
-
-size_t
-der_length_bmp_string (const heim_bmp_string */*data*/);
-
-size_t
-der_length_boolean (const int */*k*/);
-
-size_t
-der_length_enumerated (const unsigned */*data*/);
-
-size_t
-der_length_general_string (const heim_general_string */*data*/);
-
-size_t
-der_length_generalized_time (const time_t */*t*/);
-
-size_t
-der_length_heim_integer (const heim_integer */*k*/);
-
-size_t
-der_length_ia5_string (const heim_ia5_string */*data*/);
-
-size_t
-der_length_integer (const int */*data*/);
-
-size_t
-der_length_len (size_t /*len*/);
-
-size_t
-der_length_octet_string (const heim_octet_string */*k*/);
-
-size_t
-der_length_oid (const heim_oid */*k*/);
-
-size_t
-der_length_printable_string (const heim_printable_string */*data*/);
-
-size_t
-der_length_tag (unsigned int /*tag*/);
-
-size_t
-der_length_universal_string (const heim_universal_string */*data*/);
-
-size_t
-der_length_unsigned (const unsigned */*data*/);
-
-size_t
-der_length_utctime (const time_t */*t*/);
-
-size_t
-der_length_utf8string (const heim_utf8_string */*data*/);
-
-size_t
-der_length_visible_string (const heim_visible_string */*data*/);
-
-int
-der_match_tag (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	Der_class /*class*/,
-	Der_type /*type*/,
-	unsigned int /*tag*/,
-	size_t */*size*/);
-
-int
-der_match_tag2 (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	Der_class /*class*/,
-	Der_type */*type*/,
-	unsigned int /*tag*/,
-	size_t */*size*/);
-
-int
-der_match_tag_and_length (
-	const unsigned char */*p*/,
-	size_t /*len*/,
-	Der_class /*class*/,
-	Der_type */*type*/,
-	unsigned int /*tag*/,
-	size_t */*length_ret*/,
-	size_t */*size*/);
-
-int
-der_parse_heim_oid (
-	const char */*str*/,
-	const char */*sep*/,
-	heim_oid */*data*/);
-
-int
-der_parse_hex_heim_integer (
-	const char */*p*/,
-	heim_integer */*data*/);
-
-int
-der_print_heim_oid (
-	const heim_oid */*oid*/,
-	char /*delim*/,
-	char **/*str*/);
-
-int
-der_print_hex_heim_integer (
-	const heim_integer */*data*/,
-	char **/*p*/);
-
-int
-der_printable_string_cmp (
-	const heim_printable_string */*p*/,
-	const heim_printable_string */*q*/);
-
-int
-der_put_bit_string (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_bit_string */*data*/,
-	size_t */*size*/);
-
-int
-der_put_bmp_string (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_bmp_string */*data*/,
-	size_t */*size*/);
-
-int
-der_put_boolean (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const int */*data*/,
-	size_t */*size*/);
-
-int
-der_put_general_string (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_general_string */*str*/,
-	size_t */*size*/);
-
-int
-der_put_generalized_time (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const time_t */*data*/,
-	size_t */*size*/);
-
-int
-der_put_heim_integer (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_integer */*data*/,
-	size_t */*size*/);
-
-int
-der_put_ia5_string (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_ia5_string */*str*/,
-	size_t */*size*/);
-
-int
-der_put_integer (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const int */*v*/,
-	size_t */*size*/);
-
-int
-der_put_length (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	size_t /*val*/,
-	size_t */*size*/);
-
-int
-der_put_length_and_tag (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	size_t /*len_val*/,
-	Der_class /*class*/,
-	Der_type /*type*/,
-	unsigned int /*tag*/,
-	size_t */*size*/);
-
-int
-der_put_octet_string (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_octet_string */*data*/,
-	size_t */*size*/);
-
-int
-der_put_oid (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_oid */*data*/,
-	size_t */*size*/);
-
-int
-der_put_printable_string (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_printable_string */*str*/,
-	size_t */*size*/);
-
-int
-der_put_tag (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	Der_class /*class*/,
-	Der_type /*type*/,
-	unsigned int /*tag*/,
-	size_t */*size*/);
-
-int
-der_put_universal_string (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_universal_string */*data*/,
-	size_t */*size*/);
-
-int
-der_put_unsigned (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const unsigned */*v*/,
-	size_t */*size*/);
-
-int
-der_put_utctime (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const time_t */*data*/,
-	size_t */*size*/);
-
-int
-der_put_utf8string (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_utf8_string */*str*/,
-	size_t */*size*/);
-
-int
-der_put_visible_string (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_visible_string */*str*/,
-	size_t */*size*/);
-
-int
-encode_heim_any (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_any */*data*/,
-	size_t */*size*/);
-
-int
-encode_heim_any_set (
-	unsigned char */*p*/,
-	size_t /*len*/,
-	const heim_any_set */*data*/,
-	size_t */*size*/);
-
-void
-free_heim_any (heim_any */*data*/);
-
-void
-free_heim_any_set (heim_any_set */*data*/);
-
-int
-heim_any_cmp (
-	const heim_any_set */*p*/,
-	const heim_any_set */*q*/);
-
-size_t
-length_heim_any (const heim_any */*data*/);
-
-size_t
-length_heim_any_set (const heim_any */*data*/);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __der_protos_h__ */
diff --git a/include.new/der.h b/include.new/der.h
deleted file mode 100644
index f20cdb8..0000000
--- a/include.new/der.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef __DER_H__
-#define __DER_H__
-
-typedef enum {
-    ASN1_C_UNIV = 0,
-    ASN1_C_APPL = 1,
-    ASN1_C_CONTEXT = 2,
-    ASN1_C_PRIVATE = 3
-} Der_class;
-
-typedef enum {PRIM = 0, CONS = 1} Der_type;
-
-#define MAKE_TAG(CLASS, TYPE, TAG)  (((CLASS) << 6) | ((TYPE) << 5) | (TAG))
-
-/* Universal tags */
-
-enum {
-    UT_EndOfContent	= 0,
-    UT_Boolean		= 1,
-    UT_Integer		= 2,
-    UT_BitString	= 3,
-    UT_OctetString	= 4,
-    UT_Null		= 5,
-    UT_OID		= 6,
-    UT_Enumerated	= 10,
-    UT_UTF8String	= 12,
-    UT_Sequence		= 16,
-    UT_Set		= 17,
-    UT_PrintableString	= 19,
-    UT_IA5String	= 22,
-    UT_UTCTime		= 23,
-    UT_GeneralizedTime	= 24,
-    UT_UniversalString	= 25,
-    UT_VisibleString	= 26,
-    UT_GeneralString	= 27,
-    UT_BMPString	= 30,
-    /* unsupported types */
-    UT_ObjectDescriptor = 7,
-    UT_External		= 8,
-    UT_Real		= 9,
-    UT_EmbeddedPDV	= 11,
-    UT_RelativeOID	= 13,
-    UT_NumericString	= 18,
-    UT_TeletexString	= 20,
-    UT_VideotexString	= 21,
-    UT_GraphicString	= 25
-};
-
-#define ASN1_INDEFINITE 0xdce0deed
-
-typedef struct heim_der_time_t {
-    time_t dt_sec;
-    unsigned long dt_nsec;
-} heim_der_time_t;
-
-typedef struct heim_ber_time_t {
-    time_t bt_sec;
-    unsigned bt_nsec;
-    int bt_zone;
-} heim_ber_time_t;
-
-struct asn1_template;
-
-#include <der-protos.h>
-
-int _heim_fix_dce(size_t reallen, size_t *len);
-int _heim_der_set_sort(const void *, const void *);
-int _heim_time2generalizedtime (time_t, heim_octet_string *, int);
-
-#endif /* __DER_H__ */
diff --git a/include.new/dev/acpica/acpi_hpet.h b/include.new/dev/acpica/acpi_hpet.h
deleted file mode 100644
index 957901a..0000000
--- a/include.new/dev/acpica/acpi_hpet.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/sys/dev/acpica/acpi_hpet.h 224919 2011-08-16 21:51:29Z mav $
- */
-
-#ifndef __ACPI_HPET_H__
-#define	__ACPI_HPET_H__
-
-#define HPET_MEM_WIDTH		0x400	/* Expected memory region size */
-
-/* General registers */
-#define HPET_CAPABILITIES	0x0	/* General capabilities and ID */
-#define	HPET_CAP_VENDOR_ID	0xffff0000
-#define	HPET_CAP_LEG_RT		0x00008000
-#define	HPET_CAP_COUNT_SIZE	0x00002000 /* 1 = 64-bit, 0 = 32-bit */
-#define	HPET_CAP_NUM_TIM	0x00001f00
-#define	HPET_CAP_REV_ID		0x000000ff
-#define HPET_PERIOD		0x4	/* Period (1/hz) of timer */
-#define HPET_CONFIG		0x10	/* General configuration register */
-#define	HPET_CNF_LEG_RT		0x00000002
-#define	HPET_CNF_ENABLE		0x00000001
-#define	HPET_ISR		0x20	/* General interrupt status register */
-#define HPET_MAIN_COUNTER	0xf0	/* Main counter register */
-
-/* Timer registers */
-#define	HPET_TIMER_CAP_CNF(x)	((x) * 0x20 + 0x100)
-#define	HPET_TCAP_INT_ROUTE	0xffffffff00000000
-#define	HPET_TCAP_FSB_INT_DEL	0x00008000
-#define	HPET_TCNF_FSB_EN	0x00004000
-#define	HPET_TCNF_INT_ROUTE	0x00003e00
-#define	HPET_TCNF_32MODE	0x00000100
-#define	HPET_TCNF_VAL_SET	0x00000040
-#define	HPET_TCAP_SIZE		0x00000020 /* 1 = 64-bit, 0 = 32-bit */
-#define	HPET_TCAP_PER_INT	0x00000010 /* Supports periodic interrupts */
-#define	HPET_TCNF_TYPE		0x00000008 /* 1 = periodic, 0 = one-shot */
-#define	HPET_TCNF_INT_ENB	0x00000004
-#define	HPET_TCNF_INT_TYPE	0x00000002 /* 1 = level triggered, 0 = edge */
-#define	HPET_TIMER_COMPARATOR(x) ((x) * 0x20 + 0x108)
-#define	HPET_TIMER_FSB_VAL(x)	((x) * 0x20 + 0x110)
-#define	HPET_TIMER_FSB_ADDR(x)	((x) * 0x20 + 0x114)
-
-#define	HPET_MIN_CYCLES		128	/* Period considered reliable. */
-
-#endif /* !__ACPI_HPET_H__ */
diff --git a/include.new/dev/acpica/acpiio.h b/include.new/dev/acpica/acpiio.h
deleted file mode 100644
index 6c245f1..0000000
--- a/include.new/dev/acpica/acpiio.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * Copyright (c) 1999 Takanori Watanabe <takawata@jp.freebsd.org>
- * Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@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.
- *
- * 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: releng/10.2/sys/dev/acpica/acpiio.h 216503 2010-12-17 16:21:30Z avg $
- */
-
-#ifndef _ACPIIO_H_
-#define _ACPIIO_H_
-
-/*
- * Core ACPI subsystem ioctls
- */
-#define ACPIIO_SETSLPSTATE	_IOW('P', 3, int) /* DEPRECATED */
-
-/* Request S1-5 sleep state. User is notified and then sleep proceeds. */
-#define ACPIIO_REQSLPSTATE	_IOW('P', 4, int)
-
-/* Allow suspend to continue (0) or abort it (errno). */
-#define ACPIIO_ACKSLPSTATE	_IOW('P', 5, int)
-
-struct acpi_battinfo {
-    int	 cap;				/* percent */
-    int	 min;				/* remaining time (in minutes) */
-    int	 state;				/* battery state */
-    int	 rate;				/* emptying rate */
-};
-
-#define ACPI_CMBAT_MAXSTRLEN 32
-struct acpi_bif {
-    uint32_t units;			/* Units (mW or mA). */
-#define ACPI_BIF_UNITS_MW	0	/* Capacity in mWh, rate in mW. */
-#define ACPI_BIF_UNITS_MA	1	/* Capacity in mAh, rate in mA. */
-    uint32_t dcap;			/* Design Capacity */
-    uint32_t lfcap;			/* Last Full capacity */
-    uint32_t btech;			/* Battery Technology */
-    uint32_t dvol;			/* Design voltage (mV) */
-    uint32_t wcap;			/* WARN capacity */
-    uint32_t lcap;			/* Low capacity */
-    uint32_t gra1;			/* Granularity 1 (Warn to Low) */
-    uint32_t gra2;			/* Granularity 2 (Full to Warn) */
-    char model[ACPI_CMBAT_MAXSTRLEN];	/* model identifier */
-    char serial[ACPI_CMBAT_MAXSTRLEN];	/* Serial number */
-    char type[ACPI_CMBAT_MAXSTRLEN];	/* Type */
-    char oeminfo[ACPI_CMBAT_MAXSTRLEN];	/* OEM infomation */
-};
-
-struct acpi_bst {
-    uint32_t state;			/* Battery State */
-    uint32_t rate;			/* Present Rate */
-    uint32_t cap;			/* Remaining Capacity */
-    uint32_t volt;			/* Present Voltage */
-};
-
-/*
- * Note that the following definitions represent status bits for internal
- * driver state.  The first three of them (charging, discharging and critical)
- * conveninetly conform to ACPI specification of status returned by _BST
- * method.  Other definitions (not present, etc) are synthetic.
- * Also note that according to the specification the charging and discharging
- * status bits must not be set at the same time.
- */
-#define ACPI_BATT_STAT_DISCHARG		0x0001
-#define ACPI_BATT_STAT_CHARGING		0x0002
-#define ACPI_BATT_STAT_CRITICAL		0x0004
-#define ACPI_BATT_STAT_INVALID					\
-    (ACPI_BATT_STAT_DISCHARG | ACPI_BATT_STAT_CHARGING)
-#define ACPI_BATT_STAT_BST_MASK					\
-    (ACPI_BATT_STAT_INVALID | ACPI_BATT_STAT_CRITICAL)
-#define ACPI_BATT_STAT_NOT_PRESENT	ACPI_BATT_STAT_BST_MASK
-
-union acpi_battery_ioctl_arg {
-    int			 unit;	/* Device unit or ACPI_BATTERY_ALL_UNITS. */
-
-    struct acpi_battinfo battinfo;
-
-    struct acpi_bif	 bif;
-    struct acpi_bst	 bst;
-};
-
-#define ACPI_BATTERY_ALL_UNITS 	(-1)
-#define ACPI_BATT_UNKNOWN 	0xffffffff /* _BST or _BIF value unknown. */
-
-/* Common battery ioctls */
-#define ACPIIO_BATT_GET_UNITS	  _IOR('B', 0x01, int)
-#define ACPIIO_BATT_GET_BATTINFO _IOWR('B', 0x03, union acpi_battery_ioctl_arg)
-#define ACPIIO_BATT_GET_BIF	 _IOWR('B', 0x10, union acpi_battery_ioctl_arg)
-#define ACPIIO_BATT_GET_BST	 _IOWR('B', 0x11, union acpi_battery_ioctl_arg)
-
-/* Control Method battery ioctls (deprecated) */
-#define ACPIIO_CMBAT_GET_BIF	 ACPIIO_BATT_GET_BIF
-#define ACPIIO_CMBAT_GET_BST	 ACPIIO_BATT_GET_BST
-
-/* Get AC adapter status. */
-#define ACPIIO_ACAD_GET_STATUS	  _IOR('A', 1, int)
-
-#ifdef _KERNEL
-typedef int	(*acpi_ioctl_fn)(u_long cmd, caddr_t addr, void *arg);
-extern int	acpi_register_ioctl(u_long cmd, acpi_ioctl_fn fn, void *arg);
-extern void	acpi_deregister_ioctl(u_long cmd, acpi_ioctl_fn fn);
-#endif
-
-#endif /* !_ACPIIO_H_ */
diff --git a/include.new/dev/agp/agpreg.h b/include.new/dev/agp/agpreg.h
deleted file mode 100644
index 4b1b8f1..0000000
--- a/include.new/dev/agp/agpreg.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/dev/agp/agpreg.h 235782 2012-05-22 10:59:26Z kib $
- */
-
-#ifndef _PCI_AGPREG_H_
-#define _PCI_AGPREG_H_
-
-/*
- * Offsets for various AGP configuration registers.
- */
-#define AGP_APBASE		PCIR_BAR(0)
-
-/*
- * Offsets from the AGP Capability pointer.
- */
-#define AGP_CAPID		0x0
-#define AGP_STATUS		0x4
-#define AGP_COMMAND		0x8
-#define AGP_STATUS_AGP3		0x0008
-#define AGP_STATUS_RQ_MASK	0xff000000
-#define AGP_COMMAND_RQ_MASK	0xff000000
-#define AGP_STATUS_ARQSZ_MASK	0xe000
-#define AGP_COMMAND_ARQSZ_MASK	0xe000
-#define AGP_STATUS_CAL_MASK	0x1c00
-#define AGP_COMMAND_CAL_MASK	0x1c00
-#define AGP_STATUS_ISOCH	0x10000
-#define AGP_STATUS_SBA		0x0200
-#define AGP_STATUS_ITA_COH	0x0100
-#define AGP_STATUS_GART64	0x0080
-#define AGP_STATUS_HTRANS	0x0040
-#define AGP_STATUS_64BIT	0x0020
-#define AGP_STATUS_FW		0x0010
-#define AGP_COMMAND_RQ_MASK 	0xff000000
-#define AGP_COMMAND_ARQSZ_MASK	0xe000
-#define AGP_COMMAND_CAL_MASK	0x1c00
-#define AGP_COMMAND_SBA		0x0200
-#define AGP_COMMAND_AGP		0x0100
-#define AGP_COMMAND_GART64	0x0080
-#define AGP_COMMAND_64BIT	0x0020
-#define AGP_COMMAND_FW		0x0010
-
-/*
- * Config offsets for Intel AGP chipsets.
- */
-#define AGP_INTEL_NBXCFG	0x50
-#define AGP_INTEL_ERRSTS	0x91
-#define AGP_INTEL_AGPCTRL	0xb0
-#define AGP_INTEL_APSIZE	0xb4
-#define AGP_INTEL_ATTBASE	0xb8
-
-/*
- * Config offsets for Intel i8xx/E7xxx AGP chipsets.
- */
-#define AGP_INTEL_MCHCFG	0x50
-#define AGP_INTEL_I820_RDCR	0x51
-#define AGP_INTEL_I845_AGPM	0x51
-#define AGP_INTEL_I8XX_ERRSTS	0xc8
-
-/*
- * Config offsets for VIA AGP 2.x chipsets.
- */
-#define AGP_VIA_GARTCTRL	0x80
-#define AGP_VIA_APSIZE		0x84
-#define AGP_VIA_ATTBASE		0x88
-
-/*
- * Config offsets for VIA AGP 3.0 chipsets.
- */
-#define AGP3_VIA_GARTCTRL        0x90
-#define AGP3_VIA_APSIZE          0x94
-#define AGP3_VIA_ATTBASE         0x98
-#define AGP_VIA_AGPSEL		 0xfd
-
-/*
- * Config offsets for SiS AGP chipsets.
- */
-#define AGP_SIS_ATTBASE		0x90
-#define AGP_SIS_WINCTRL		0x94
-#define AGP_SIS_TLBCTRL		0x97
-#define AGP_SIS_TLBFLUSH	0x98
-
-/*
- * Config offsets for Ali AGP chipsets.
- */
-#define AGP_ALI_AGPCTRL		0xb8
-#define AGP_ALI_ATTBASE		0xbc
-#define AGP_ALI_TLBCTRL		0xc0
-
-/*
- * Config offsets for the AMD 751 chipset.
- */
-#define AGP_AMD751_APBASE	0x10
-#define AGP_AMD751_REGISTERS	0x14
-#define AGP_AMD751_APCTRL	0xac
-#define AGP_AMD751_MODECTRL	0xb0
-#define AGP_AMD751_MODECTRL_SYNEN	0x80
-#define AGP_AMD751_MODECTRL2	0xb2
-#define AGP_AMD751_MODECTRL2_G1LM	0x01
-#define AGP_AMD751_MODECTRL2_GPDCE	0x02
-#define AGP_AMD751_MODECTRL2_NGSE	0x08
-
-/*
- * Memory mapped register offsets for AMD 751 chipset.
- */
-#define AGP_AMD751_CAPS		0x00
-#define AGP_AMD751_CAPS_EHI		0x0800
-#define AGP_AMD751_CAPS_P2P		0x0400
-#define AGP_AMD751_CAPS_MPC		0x0200
-#define AGP_AMD751_CAPS_VBE		0x0100
-#define AGP_AMD751_CAPS_REV		0x00ff
-#define AGP_AMD751_STATUS	0x02
-#define AGP_AMD751_STATUS_P2PS		0x0800
-#define AGP_AMD751_STATUS_GCS		0x0400
-#define AGP_AMD751_STATUS_MPS		0x0200
-#define AGP_AMD751_STATUS_VBES		0x0100
-#define AGP_AMD751_STATUS_P2PE		0x0008
-#define AGP_AMD751_STATUS_GCE		0x0004
-#define AGP_AMD751_STATUS_VBEE		0x0001
-#define AGP_AMD751_ATTBASE	0x04
-#define AGP_AMD751_TLBCTRL	0x0c
-
-/*
- * Config registers for i810 device 0
- */
-#define AGP_I810_SMRAM		0x70
-#define AGP_I810_SMRAM_GMS		0xc0
-#define AGP_I810_SMRAM_GMS_DISABLED	0x00
-#define AGP_I810_SMRAM_GMS_ENABLED_0	0x40
-#define AGP_I810_SMRAM_GMS_ENABLED_512	0x80
-#define AGP_I810_SMRAM_GMS_ENABLED_1024	0xc0
-#define AGP_I810_MISCC		0x72
-#define	AGP_I810_MISCC_WINSIZE		0x0001
-#define AGP_I810_MISCC_WINSIZE_64	0x0000
-#define AGP_I810_MISCC_WINSIZE_32	0x0001
-#define AGP_I810_MISCC_PLCK		0x0008
-#define AGP_I810_MISCC_PLCK_UNLOCKED	0x0000
-#define AGP_I810_MISCC_PLCK_LOCKED	0x0008
-#define AGP_I810_MISCC_WPTC		0x0030
-#define AGP_I810_MISCC_WPTC_NOLIMIT	0x0000
-#define AGP_I810_MISCC_WPTC_62		0x0010
-#define AGP_I810_MISCC_WPTC_50		0x0020
-#define	AGP_I810_MISCC_WPTC_37		0x0030
-#define AGP_I810_MISCC_RPTC		0x00c0
-#define AGP_I810_MISCC_RPTC_NOLIMIT	0x0000
-#define AGP_I810_MISCC_RPTC_62		0x0040
-#define AGP_I810_MISCC_RPTC_50		0x0080
-#define AGP_I810_MISCC_RPTC_37		0x00c0
-
-/*
- * Config registers for i810 device 1
- */
-#define AGP_I810_GMADR		0x10
-#define AGP_I810_MMADR		0x14
-
-#define	I810_PTE_VALID		0x00000001
-
-/*
- * Cache control
- *
- * Pre-Sandybridge bits
- */
-#define	I810_PTE_MAIN_UNCACHED	0x00000000
-#define	I810_PTE_LOCAL		0x00000002	/* Non-snooped main phys memory */
-#define	I830_PTE_SYSTEM_CACHED  0x00000006	/* Snooped main phys memory */
-
-/*
- * Sandybridge
- * LLC - Last Level Cache
- * MMC - Mid Level Cache
- */
-#define	GEN6_PTE_RESERVED	0x00000000
-#define	GEN6_PTE_UNCACHED	0x00000002	/* Do not cache */
-#define	GEN6_PTE_LLC		0x00000004	/* Cache in LLC */
-#define	GEN6_PTE_LLC_MLC	0x00000006	/* Cache in LLC and MLC */
-#define	GEN6_PTE_GFDT		0x00000008	/* Graphics Data Type */
-
-/*
- * Memory mapped register offsets for i810 chipset.
- */
-#define AGP_I810_PGTBL_CTL	0x2020
-#define	AGP_I810_PGTBL_ENABLED	0x00000001
-/**
- * This field determines the actual size of the global GTT on the 965
- * and G33
- */
-#define AGP_I810_PGTBL_SIZE_MASK	0x0000000e
-#define AGP_I810_PGTBL_SIZE_512KB	(0 << 1)
-#define AGP_I810_PGTBL_SIZE_256KB	(1 << 1)
-#define	AGP_I810_PGTBL_SIZE_128KB	(2 << 1)
-#define	AGP_I810_PGTBL_SIZE_1MB		(3 << 1)
-#define	AGP_I810_PGTBL_SIZE_2MB		(4 << 1)
-#define	AGP_I810_PGTBL_SIZE_1_5MB	(5 << 1)
-#define AGP_G33_GCC1_SIZE_MASK		(3 << 8)
-#define AGP_G33_GCC1_SIZE_1M		(1 << 8)
-#define AGP_G33_GCC1_SIZE_2M		(2 << 8)
-#define AGP_G4x_GCC1_SIZE_MASK		(0xf << 8)
-#define AGP_G4x_GCC1_SIZE_1M		(0x1 << 8)
-#define AGP_G4x_GCC1_SIZE_2M		(0x3 << 8)
-#define AGP_G4x_GCC1_SIZE_VT_EN		(0x8 << 8)
-#define AGP_G4x_GCC1_SIZE_VT_1M \
-    (AGP_G4x_GCC1_SIZE_1M | AGP_G4x_GCC1_SIZE_VT_EN)
-#define AGP_G4x_GCC1_SIZE_VT_1_5M	((0x2 << 8) | AGP_G4x_GCC1_SIZE_VT_EN)
-#define AGP_G4x_GCC1_SIZE_VT_2M	\
-    (AGP_G4x_GCC1_SIZE_2M | AGP_G4x_GCC1_SIZE_VT_EN)
-
-#define AGP_I810_DRT		0x3000
-#define AGP_I810_DRT_UNPOPULATED 0x00
-#define AGP_I810_DRT_POPULATED	0x01
-#define AGP_I810_GTT		0x10000
-
-/*
- * Config registers for i830MG device 0
- */
-#define AGP_I830_GCC1			0x52
-#define AGP_I830_GCC1_DEV2		0x08
-#define AGP_I830_GCC1_DEV2_ENABLED	0x00
-#define AGP_I830_GCC1_DEV2_DISABLED	0x08
-#define AGP_I830_GCC1_GMS		0xf0 /* Top bit reserved pre-G33 */
-#define AGP_I830_GCC1_GMS_STOLEN_512	0x20
-#define AGP_I830_GCC1_GMS_STOLEN_1024	0x30
-#define AGP_I830_GCC1_GMS_STOLEN_8192	0x40
-#define AGP_I830_GCC1_GMASIZE		0x01
-#define AGP_I830_GCC1_GMASIZE_64	0x01
-#define AGP_I830_GCC1_GMASIZE_128	0x00
-#define	AGP_I830_HIC			0x70
-
-/*
- * Config registers for 852GM/855GM/865G device 0
- */
-#define AGP_I855_GCC1			0x52
-#define AGP_I855_GCC1_DEV2		0x08
-#define AGP_I855_GCC1_DEV2_ENABLED	0x00
-#define AGP_I855_GCC1_DEV2_DISABLED	0x08
-#define AGP_I855_GCC1_GMS		0xf0 /* Top bit reserved pre-G33 */
-#define AGP_I855_GCC1_GMS_STOLEN_0M	0x00
-#define AGP_I855_GCC1_GMS_STOLEN_1M	0x10
-#define AGP_I855_GCC1_GMS_STOLEN_4M	0x20
-#define AGP_I855_GCC1_GMS_STOLEN_8M	0x30
-#define AGP_I855_GCC1_GMS_STOLEN_16M	0x40
-#define AGP_I855_GCC1_GMS_STOLEN_32M	0x50
-
-/*
- * 852GM/855GM variant identification
- */
-#define AGP_I85X_CAPID			0x44
-#define AGP_I85X_VARIANT_MASK		0x7
-#define AGP_I85X_VARIANT_SHIFT		5
-#define AGP_I855_GME			0x0
-#define AGP_I855_GM			0x4
-#define AGP_I852_GME			0x2
-#define AGP_I852_GM			0x5
-
-/*
- * 915G registers
- */
-#define AGP_I915_GMADR			0x18
-#define AGP_I915_MMADR			0x10
-#define AGP_I915_GTTADR			0x1C
-#define AGP_I915_GCC1_GMS_STOLEN_48M	0x60
-#define AGP_I915_GCC1_GMS_STOLEN_64M	0x70
-#define AGP_I915_DEVEN			0x54
-#define	AGP_SB_DEVEN_D2EN		0x10	/* SB+ has IGD enabled bit */
-#define	AGP_SB_DEVEN_D2EN_ENABLED	0x10	/* in different place */
-#define	AGP_SB_DEVEN_D2EN_DISABLED	0x00
-#define AGP_I915_DEVEN_D2F0		0x08
-#define AGP_I915_DEVEN_D2F0_ENABLED	0x08
-#define AGP_I915_DEVEN_D2F0_DISABLED	0x00
-#define AGP_I915_MSAC			0x62
-#define AGP_I915_MSAC_GMASIZE		0x02
-#define AGP_I915_MSAC_GMASIZE_128	0x02
-#define AGP_I915_MSAC_GMASIZE_256	0x00
-#define	AGP_I915_IFPADDR		0x60
-
-/*
- * G965 registers
- */
-#define AGP_I965_GTTMMADR		0x10
-#define AGP_I965_MSAC			0x62
-#define AGP_I965_MSAC_GMASIZE_128	0x00
-#define AGP_I965_MSAC_GMASIZE_256	0x02
-#define AGP_I965_MSAC_GMASIZE_512	0x06
-#define AGP_I965_PGTBL_SIZE_1MB		(3 << 1)
-#define AGP_I965_PGTBL_SIZE_2MB		(4 << 1)
-#define AGP_I965_PGTBL_SIZE_1_5MB	(5 << 1)
-#define AGP_I965_PGTBL_CTL2		0x20c4
-#define	AGP_I965_IFPADDR		0x70
-
-/*
- * G33 registers
- */
-#define AGP_G33_MGGC_GGMS_MASK		(3 << 8)
-#define AGP_G33_MGGC_GGMS_SIZE_1M	(1 << 8)
-#define AGP_G33_MGGC_GGMS_SIZE_2M	(2 << 8)
-#define AGP_G33_GCC1_GMS_STOLEN_128M	0x80
-#define AGP_G33_GCC1_GMS_STOLEN_256M	0x90
-
-/*
- * G4X registers
- */
-#define AGP_G4X_GMADR			0x20
-#define AGP_G4X_MMADR			0x10
-#define AGP_G4X_GTTADR			0x18
-#define AGP_G4X_GCC1_GMS_STOLEN_96M	0xa0
-#define AGP_G4X_GCC1_GMS_STOLEN_160M	0xb0
-#define AGP_G4X_GCC1_GMS_STOLEN_224M	0xc0
-#define AGP_G4X_GCC1_GMS_STOLEN_352M	0xd0
-
-/*
- * SandyBridge/IvyBridge registers
- */
-#define AGP_SNB_GCC1			0x50
-#define AGP_SNB_GMCH_GMS_STOLEN_MASK	0xF8
-#define AGP_SNB_GMCH_GMS_STOLEN_32M	(1 << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_64M	(2 << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_96M	(3 << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_128M	(4 << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_160M	(5 << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_192M	(6 << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_224M	(7 << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_256M	(8 << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_288M	(9 << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_320M	(0xa << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_352M	(0xb << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_384M	(0xc << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_416M	(0xd << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_448M	(0xe << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_480M	(0xf << 3)
-#define AGP_SNB_GMCH_GMS_STOLEN_512M	(0x10 << 3)
-#define AGP_SNB_GTT_SIZE_0M		(0 << 8)
-#define AGP_SNB_GTT_SIZE_1M		(1 << 8)
-#define AGP_SNB_GTT_SIZE_2M		(2 << 8)
-#define AGP_SNB_GTT_SIZE_MASK		(3 << 8)
-
-#define AGP_SNB_GFX_MODE		0x02520
-
-/*
- * NVIDIA nForce/nForce2 registers
- */
-#define	AGP_NVIDIA_0_APBASE		0x10
-#define	AGP_NVIDIA_0_APSIZE		0x80
-#define	AGP_NVIDIA_1_WBC		0xf0
-#define	AGP_NVIDIA_2_GARTCTRL		0xd0
-#define	AGP_NVIDIA_2_APBASE		0xd8
-#define	AGP_NVIDIA_2_APLIMIT		0xdc
-#define	AGP_NVIDIA_2_ATTBASE(i)		(0xe0 + (i) * 4)
-#define	AGP_NVIDIA_3_APBASE		0x50
-#define	AGP_NVIDIA_3_APLIMIT		0x54
-
-/*
- * AMD64 GART registers
- */
-#define	AGP_AMD64_APCTRL		0x90
-#define	AGP_AMD64_APBASE		0x94
-#define	AGP_AMD64_ATTBASE		0x98
-#define	AGP_AMD64_CACHECTRL		0x9c
-#define	AGP_AMD64_APCTRL_GARTEN		0x00000001
-#define	AGP_AMD64_APCTRL_SIZE_MASK	0x0000000e
-#define	AGP_AMD64_APCTRL_DISGARTCPU	0x00000010
-#define	AGP_AMD64_APCTRL_DISGARTIO	0x00000020
-#define	AGP_AMD64_APCTRL_DISWLKPRB	0x00000040
-#define	AGP_AMD64_APBASE_MASK		0x00007fff
-#define	AGP_AMD64_ATTBASE_MASK		0xfffffff0
-#define	AGP_AMD64_CACHECTRL_INVGART	0x00000001
-#define	AGP_AMD64_CACHECTRL_PTEERR	0x00000002
-
-/*
- * NVIDIA nForce3 registers
- */
-#define AGP_AMD64_NVIDIA_0_APBASE	0x10
-#define AGP_AMD64_NVIDIA_1_APBASE1	0x50
-#define AGP_AMD64_NVIDIA_1_APLIMIT1	0x54
-#define AGP_AMD64_NVIDIA_1_APSIZE	0xa8
-#define AGP_AMD64_NVIDIA_1_APBASE2	0xd8
-#define AGP_AMD64_NVIDIA_1_APLIMIT2	0xdc
-
-/*
- * ULi M1689 registers
- */
-#define AGP_AMD64_ULI_APBASE		0x10
-#define AGP_AMD64_ULI_HTT_FEATURE	0x50
-#define AGP_AMD64_ULI_ENU_SCR		0x54
-
-/*
- * ATI IGP registers
- */
-#define ATI_GART_MMADDR		0x14
-#define ATI_RS100_APSIZE	0xac
-#define ATI_RS100_IG_AGPMODE	0xb0
-#define ATI_RS300_APSIZE	0xf8
-#define ATI_RS300_IG_AGPMODE	0xfc
-#define ATI_GART_FEATURE_ID	0x00
-#define ATI_GART_BASE		0x04
-#define ATI_GART_CACHE_CNTRL	0x0c
-
-#endif /* !_PCI_AGPREG_H_ */
diff --git a/include.new/dev/an/if_aironet_ieee.h b/include.new/dev/an/if_aironet_ieee.h
deleted file mode 100644
index 5151fdc..0000000
--- a/include.new/dev/an/if_aironet_ieee.h
+++ /dev/null
@@ -1,798 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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: releng/10.2/sys/dev/an/if_aironet_ieee.h 139749 2005-01-06 01:43:34Z imp $
- */
-
-#ifndef _IF_AIRONET_IEEE_H
-#define _IF_AIRONET_IEEE_H
-
-/*
- * This header defines a simple command interface to the FreeBSD
- * Aironet driver (an) driver, which is used to set certain
- * device-specific parameters which can't be easily managed through
- * ifconfig(8). No, sysctl(2) is not the answer. I said a _simple_
- * interface, didn't I.
- */
-
-#ifndef SIOCSAIRONET
-#define SIOCSAIRONET	SIOCSIFGENERIC
-#endif
-
-#ifndef SIOCGAIRONET
-#define SIOCGAIRONET	SIOCGIFGENERIC
-#endif
-
-/*
- * This is a make-predend RID value used only by the driver
- * to allow the user to set the speed.
- */
-#define AN_RID_TX_SPEED		0x1234
-
-/*
- * Technically I don't think there's a limit to a record
- * length. The largest record is the one that contains the CIS
- * data, which is 240 words long, so 256 should be a safe
- * value.
- */
-#define AN_MAX_DATALEN	4096
-
-struct an_req {
-	u_int16_t	an_len;
-	u_int16_t	an_type;
-	u_int16_t	an_val[AN_MAX_DATALEN];
-};
-
-/*
- * Private LTV records (interpreted only by the driver). This is
- * a minor kludge to allow reading the interface statistics from
- * the driver.
- */
-#define AN_RID_IFACE_STATS	0x0100
-#define AN_RID_MGMT_XMIT	0x0200
-#ifdef ANCACHE
-#define AN_RID_ZERO_CACHE	0x0300
-#define AN_RID_READ_CACHE	0x0400
-#endif
-
-#define AN_FCTL_VERS		0x0002
-#define AN_FCTL_FTYPE		0x000C
-#define AN_FCTL_STYPE		0x00F0
-#define AN_FCTL_TODS		0x0100
-#define AN_FCTL_FROMDS		0x0200
-#define AN_FCTL_MOREFRAGS	0x0400
-#define AN_FCTL_RETRY		0x0800
-#define AN_FCTL_PM		0x1000
-#define AN_FCTL_MOREDATA	0x2000
-#define AN_FCTL_WEP		0x4000
-#define AN_FCTL_ORDER		0x8000
-
-#define AN_FTYPE_MGMT		0x0000
-#define AN_FTYPE_CTL		0x0004
-#define AN_FTYPE_DATA		0x0008
-
-#define AN_STYPE_MGMT_ASREQ	0x0000	/* association request */
-#define AN_STYPE_MGMT_ASRESP	0x0010	/* association response */
-#define AN_STYPE_MGMT_REASREQ	0x0020	/* reassociation request */
-#define AN_STYPE_MGMT_REASRESP	0x0030	/* reassociation response */
-#define AN_STYPE_MGMT_PROBEREQ	0x0040	/* probe request */
-#define AN_STYPE_MGMT_PROBERESP	0x0050	/* probe response */
-#define AN_STYPE_MGMT_BEACON	0x0080	/* beacon */
-#define AN_STYPE_MGMT_ATIM	0x0090	/* announcement traffic ind msg */
-#define AN_STYPE_MGMT_DISAS	0x00A0	/* disassociation */
-#define AN_STYPE_MGMT_AUTH	0x00B0	/* authentication */
-#define AN_STYPE_MGMT_DEAUTH	0x00C0	/* deauthentication */
-
-/*
- * Aironet IEEE signal strength cache
- *
- * driver keeps cache of last
- * MAXANCACHE packets to arrive including signal strength info.
- * daemons may read this via ioctl
- *
- * Each entry in the wi_sigcache has a unique macsrc.
- */
-#ifdef ANCACHE
-#define MAXANCACHE      10
-
-struct an_sigcache {
-	char	macsrc[6];	/* unique MAC address for entry */
-	int	ipsrc;		/* ip address associated with packet */
-	int	signal;		/* signal strength of the packet */
-	int	noise;		/* noise value */
-	int	quality;	/* quality of the packet */
-};
-#endif
-
-/*
- * The card provides an 8-bit signal strength value (RSSI), which can
- * be converted to a dBm power value (or a percent) using a table in
- * the card's firmware (when available).  The tables are slightly
- * different in individual cards, even of the same model.  If the
- * table is not available, the mapping can be approximated by dBm =
- * RSSI - 100.  This approximation can be seen by plotting a few
- * tables, and also matches some info on the Intersil web site (I
- * think they make the RF front end for the cards.  However, the linux
- * driver uses the approximation dBm = RSSI/2 - 95.  I think that is
- * just wrong. 
- */
-
-struct an_rssi_entry {
-	u_int8_t	an_rss_pct;
-	u_int8_t	an_rss_dbm;
-};
-
-
-struct an_ltv_key {
-	u_int16_t	an_len;
-	u_int16_t	an_type;
-	u_int16_t       kindex;
-	u_int8_t        mac[6];
-	u_int16_t       klen;
-	u_int8_t        key[16];  /* 128-bit keys */
-};
-
-struct an_ltv_stats {
-	u_int16_t		an_fudge;
-	u_int16_t		an_len;			/* 0x00 */
-	u_int16_t		an_type;		/* 0xXX */
-	u_int16_t		an_spacer;		/* 0x02 */
-	uint32_t		an_rx_overruns;		/* 0x04 */
-	uint32_t		an_rx_plcp_csum_errs;	/* 0x08 */
-	uint32_t		an_rx_plcp_format_errs;	/* 0x0C */
-	uint32_t		an_rx_plcp_len_errs;	/* 0x10 */
-	uint32_t		an_rx_mac_crc_errs;	/* 0x14 */
-	uint32_t		an_rx_mac_crc_ok;	/* 0x18 */
-	uint32_t		an_rx_wep_errs;		/* 0x1C */
-	uint32_t		an_rx_wep_ok;		/* 0x20 */
-	uint32_t		an_retry_long;		/* 0x24 */
-	uint32_t		an_retry_short;		/* 0x28 */
-	uint32_t		an_retry_max;		/* 0x2C */
-	uint32_t		an_no_ack;		/* 0x30 */
-	uint32_t		an_no_cts;		/* 0x34 */
-	uint32_t		an_rx_ack_ok;		/* 0x38 */
-	uint32_t		an_rx_cts_ok;		/* 0x3C */
-	uint32_t		an_tx_ack_ok;		/* 0x40 */
-	uint32_t		an_tx_rts_ok;		/* 0x44 */
-	uint32_t		an_tx_cts_ok;		/* 0x48 */
-	uint32_t		an_tx_lmac_mcasts;	/* 0x4C */
-	uint32_t		an_tx_lmac_bcasts;	/* 0x50 */
-	uint32_t		an_tx_lmac_ucast_frags;	/* 0x54 */
-	uint32_t		an_tx_lmac_ucasts;	/* 0x58 */
-	uint32_t		an_tx_beacons;		/* 0x5C */
-	uint32_t		an_rx_beacons;		/* 0x60 */
-	uint32_t		an_tx_single_cols;	/* 0x64 */
-	uint32_t		an_tx_multi_cols;	/* 0x68 */
-	uint32_t		an_tx_defers_no;	/* 0x6C */
-	uint32_t		an_tx_defers_prot;	/* 0x70 */
-	uint32_t		an_tx_defers_energy;	/* 0x74 */
-	uint32_t		an_rx_dups;		/* 0x78 */
-	uint32_t		an_rx_partial;		/* 0x7C */
-	uint32_t		an_tx_too_old;		/* 0x80 */
-	uint32_t		an_rx_too_old;		/* 0x84 */
-	uint32_t		an_lostsync_max_retries;/* 0x88 */
-	uint32_t		an_lostsync_missed_beacons;/* 0x8C */
-	uint32_t		an_lostsync_arl_exceeded;/*0x90 */
-	uint32_t		an_lostsync_deauthed;	/* 0x94 */
-	uint32_t		an_lostsync_disassociated;/*0x98 */
-	uint32_t		an_lostsync_tsf_timing;	/* 0x9C */
-	uint32_t		an_tx_host_mcasts;	/* 0xA0 */
-	uint32_t		an_tx_host_bcasts;	/* 0xA4 */
-	uint32_t		an_tx_host_ucasts;	/* 0xA8 */
-	uint32_t		an_tx_host_failed;	/* 0xAC */
-	uint32_t		an_rx_host_mcasts;	/* 0xB0 */
-	uint32_t		an_rx_host_bcasts;	/* 0xB4 */
-	uint32_t		an_rx_host_ucasts;	/* 0xB8 */
-	uint32_t		an_rx_host_discarded;	/* 0xBC */
-	uint32_t		an_tx_hmac_mcasts;	/* 0xC0 */
-	uint32_t		an_tx_hmac_bcasts;	/* 0xC4 */
-	uint32_t		an_tx_hmac_ucasts;	/* 0xC8 */
-	uint32_t		an_tx_hmac_failed;	/* 0xCC */
-	uint32_t		an_rx_hmac_mcasts;	/* 0xD0 */
-	uint32_t		an_rx_hmac_bcasts;	/* 0xD4 */
-	uint32_t		an_rx_hmac_ucasts;	/* 0xD8 */
-	uint32_t		an_rx_hmac_discarded;	/* 0xDC */
-	uint32_t		an_tx_hmac_accepted;	/* 0xE0 */
-	uint32_t		an_ssid_mismatches;	/* 0xE4 */
-	uint32_t		an_ap_mismatches;	/* 0xE8 */
-	uint32_t		an_rates_mismatches;	/* 0xEC */
-	uint32_t		an_auth_rejects;	/* 0xF0 */
-	uint32_t		an_auth_timeouts;	/* 0xF4 */
-	uint32_t		an_assoc_rejects;	/* 0xF8 */
-	uint32_t		an_assoc_timeouts;	/* 0xFC */
-	uint32_t		an_reason_outside_table;/* 0x100 */
-	uint32_t		an_reason1;		/* 0x104 */
-	uint32_t		an_reason2;		/* 0x108 */
-	uint32_t		an_reason3;		/* 0x10C */
-	uint32_t		an_reason4;		/* 0x110 */
-	uint32_t		an_reason5;		/* 0x114 */
-	uint32_t		an_reason6;		/* 0x118 */
-	uint32_t		an_reason7;		/* 0x11C */
-	uint32_t		an_reason8;		/* 0x120 */
-	uint32_t		an_reason9;		/* 0x124 */
-	uint32_t		an_reason10;		/* 0x128 */
-	uint32_t		an_reason11;		/* 0x12C */
-	uint32_t		an_reason12;		/* 0x130 */
-	uint32_t		an_reason13;		/* 0x134 */
-	uint32_t		an_reason14;		/* 0x138 */
-	uint32_t		an_reason15;		/* 0x13C */
-	uint32_t		an_reason16;		/* 0x140 */
-	uint32_t		an_reason17;		/* 0x144 */
-	uint32_t		an_reason18;		/* 0x148 */
-	uint32_t		an_reason19;		/* 0x14C */
-	uint32_t		an_rx_mgmt_pkts;	/* 0x150 */
-	uint32_t		an_tx_mgmt_pkts;	/* 0x154 */
-	uint32_t		an_rx_refresh_pkts;	/* 0x158 */
-	uint32_t		an_tx_refresh_pkts;	/* 0x15C */
-	uint32_t		an_rx_poll_pkts;	/* 0x160 */
-	uint32_t		an_tx_poll_pkts;	/* 0x164 */
-	uint32_t		an_host_retries;	/* 0x168 */
-	uint32_t		an_lostsync_hostreq;	/* 0x16C */
-	uint32_t		an_host_tx_bytes;	/* 0x170 */
-	uint32_t		an_host_rx_bytes;	/* 0x174 */
-	uint32_t		an_uptime_usecs;	/* 0x178 */
-	uint32_t		an_uptime_secs;		/* 0x17C */
-	uint32_t		an_lostsync_better_ap;	/* 0x180 */
-	uint32_t		an_rsvd[15];
-};
-
-/*
- * General configuration information.
- */
-struct an_ltv_genconfig {
-	/* General configuration. */
-	u_int16_t		an_len;			/* 0x00 */
-	u_int16_t		an_type;		/* XXXX */
-	u_int16_t		an_opmode;		/* 0x02 */
-	u_int16_t		an_rxmode;		/* 0x04 */
-	u_int16_t		an_fragthresh;		/* 0x06 */
-	u_int16_t		an_rtsthresh;		/* 0x08 */
-	u_int8_t		an_macaddr[6];		/* 0x0A */
-	u_int8_t		an_rates[8];		/* 0x10 */
-	u_int16_t		an_shortretry_limit;	/* 0x18 */
-	u_int16_t		an_longretry_limit;	/* 0x1A */
-	u_int16_t		an_tx_msdu_lifetime;	/* 0x1C */
-	u_int16_t		an_rx_msdu_lifetime;	/* 0x1E */
-	u_int16_t		an_stationary;		/* 0x20 */
-	u_int16_t		an_ordering;		/* 0x22 */
-	u_int16_t		an_devtype;		/* 0x24 */
-	u_int16_t		an_rsvd0[5];		/* 0x26 */
-	/* Scanning associating. */
-	u_int16_t		an_scanmode;		/* 0x30 */
-	u_int16_t		an_probedelay;		/* 0x32 */
-	u_int16_t		an_probe_energy_timeout;/* 0x34 */
-	u_int16_t		an_probe_response_timeout;/*0x36 */
-	u_int16_t		an_beacon_listen_timeout;/*0x38 */
-	u_int16_t		an_ibss_join_net_timeout;/*0x3A */
-	u_int16_t		an_auth_timeout;	/* 0x3C */
-	u_int16_t		an_authtype;		/* 0x3E */
-	u_int16_t		an_assoc_timeout;	/* 0x40 */
-	u_int16_t		an_specified_ap_timeout;/* 0x42 */
-	u_int16_t		an_offline_scan_interval;/*0x44 */
-	u_int16_t		an_offline_scan_duration;/*0x46 */
-	u_int16_t		an_link_loss_delay;	/* 0x48 */
-	u_int16_t		an_max_beacon_lost_time;/* 0x4A */
-	u_int16_t		an_refresh_interval;	/* 0x4C */
-	u_int16_t		an_rsvd1;		/* 0x4E */
-	/* Power save operation */
-	u_int16_t		an_psave_mode;		/* 0x50 */
-	u_int16_t		an_sleep_for_dtims;	/* 0x52 */
-	u_int16_t		an_listen_interval;	/* 0x54 */
-	u_int16_t		an_fast_listen_interval;/* 0x56 */
-	u_int16_t		an_listen_decay;	/* 0x58 */
-	u_int16_t		an_fast_listen_decay;	/* 0x5A */
-	u_int16_t		an_rsvd2[2];		/* 0x5C */
-	/* Ad-hoc (or AP) operation. */
-	u_int16_t		an_beacon_period;	/* 0x60 */
-	u_int16_t		an_atim_duration;	/* 0x62 */
-	u_int16_t		an_rsvd3;		/* 0x64 */
-	u_int16_t		an_ds_channel;		/* 0x66 */
-	u_int16_t		an_rsvd4;		/* 0x68 */
-	u_int16_t		an_dtim_period;		/* 0x6A */
-	u_int16_t		an_rsvd5[2];		/* 0x6C */
-	/* Radio operation. */
-	u_int16_t		an_radiotype;		/* 0x70 */
-	u_int16_t		an_diversity;		/* 0x72 */
-	u_int16_t		an_tx_power;		/* 0x74 */
-	u_int16_t		an_rss_thresh;		/* 0x76 */
-	u_int16_t		an_modulation_type;	/* 0x78 */
-	u_int16_t		an_short_preamble;	/* 0x7A */
-	u_int16_t		an_home_product;	/* 0x7C */
-	u_int16_t		an_rsvd6;		/* 0x7E */
-	/* Aironet extensions. */
-	u_int8_t		an_nodename[16];	/* 0x80 */
-	u_int16_t		an_arl_thresh;		/* 0x90 */
-	u_int16_t		an_arl_decay;		/* 0x92 */
-	u_int16_t		an_arl_delay;		/* 0x94 */
-	u_int8_t		an_rsvd7;		/* 0x96 */
-	u_int8_t		an_rsvd8;		/* 0x97 */
-	u_int8_t		an_magic_packet_action;	/* 0x98 */
-	u_int8_t		an_magic_packet_ctl;	/* 0x99 */
-	u_int16_t		an_rsvd9;
-	u_int16_t		an_spare[19];
-};
-
-#define AN_OPMODE_IBSS_ADHOC			0x0000
-#define AN_OPMODE_INFRASTRUCTURE_STATION	0x0001
-#define AN_OPMODE_AP				0x0002
-#define AN_OPMODE_AP_REPEATER			0x0003
-#define AN_OPMODE_UNMODIFIED_PAYLOAD		0x0100
-#define AN_OPMODE_AIRONET_EXTENSIONS		0x0200
-#define AN_OPMODE_AP_EXTENSIONS			0x0400
-
-#define AN_RXMODE_BC_MC_ADDR			0x0000
-#define AN_RXMODE_BC_ADDR			0x0001
-#define AN_RXMODE_ADDR				0x0002
-#define AN_RXMODE_80211_MONITOR_CURBSS		0x0003
-#define AN_RXMODE_80211_MONITOR_ANYBSS		0x0004
-#define AN_RXMODE_LAN_MONITOR_CURBSS		0x0005
-#define AN_RXMODE_NO_8023_HEADER		0x0100
-#define AN_RXMODE_NORMALIZED_RSSI		0x0200
-
-#define AN_RATE_1MBPS				0x0002
-#define AN_RATE_2MBPS				0x0004
-#define AN_RATE_5_5MBPS				0x000B
-#define AN_RATE_11MBPS				0x0016
-
-#define AN_DEVTYPE_PC4500			0x0065
-#define AN_DEVTYPE_PC4800			0x006D
-
-#define AN_SCANMODE_ACTIVE			0x0000
-#define AN_SCANMODE_PASSIVE			0x0001
-#define AN_SCANMODE_AIRONET_ACTIVE		0x0002
-
-#define AN_AUTHTYPE_NONE			0x0000
-#define AN_AUTHTYPE_OPEN			0x0001
-#define AN_AUTHTYPE_SHAREDKEY			0x0002
-#define AN_AUTHTYPE_MASK                        0x00ff
-#define AN_AUTHTYPE_ENABLE			0x0100
-#define AN_AUTHTYPE_PRIVACY_IN_USE		0x0100
-#define AN_AUTHTYPE_ALLOW_UNENCRYPTED		0x0200
-#define AN_AUTHTYPE_LEAP			0x1000
-
-#define AN_PSAVE_NONE				0x0000
-#define AN_PSAVE_CAM				0x0001
-#define AN_PSAVE_PSP				0x0002
-#define AN_PSAVE_PSP_CAM			0x0003
-
-#define AN_RADIOTYPE_80211_FH			0x0001
-#define AN_RADIOTYPE_80211_DS			0x0002
-#define AN_RADIOTYPE_LM2000_DS			0x0004
-
-#define AN_DIVERSITY_FACTORY_DEFAULT		0x0000
-#define AN_DIVERSITY_ANTENNA_1_ONLY		0x0001
-#define AN_DIVERSITY_ANTENNA_2_ONLY		0x0002
-#define AN_DIVERSITY_ANTENNA_1_AND_2		0x0003
-
-#define AN_TXPOWER_FACTORY_DEFAULT		0x0000
-#define AN_TXPOWER_50MW				50
-#define AN_TXPOWER_100MW			100
-#define AN_TXPOWER_250MW			250
-
-#define AN_HOME_NETWORK				0x0001
-#define AN_HOME_INSTALL_AP			0x0002
-
-/*
- * Valid SSID list. You can specify up to three SSIDs denoting
- * the service sets that you want to join. The first SSID always
- * defaults to "tsunami" which is a handy way to detect the
- * card.
- */
-
-struct an_ltv_ssidlist {
-	u_int16_t		an_len;
-	u_int16_t		an_type;
-	u_int16_t		an_ssid1_len;
-	char			an_ssid1[32];
-	u_int16_t		an_ssid2_len;
-	char			an_ssid2[32];
-	u_int16_t		an_ssid3_len;
-	char			an_ssid3[32];
-};
-
-struct an_ltv_ssid_entry{
-	u_int16_t		an_len;
-	char			an_ssid[32];
-};
-
-#define MAX_SSIDS 25
-struct an_ltv_ssidlist_new {
-	u_int16_t		an_len;
-	u_int16_t		an_type;
-	struct an_ltv_ssid_entry an_entry[MAX_SSIDS];
-};
-
-/*
- * Valid AP list.
- */
-struct an_ltv_aplist {
-	u_int16_t		an_len;
-	u_int16_t		an_type;
-	u_int8_t		an_ap1[8];
-	u_int8_t		an_ap2[8];
-	u_int8_t		an_ap3[8];
-	u_int8_t		an_ap4[8];
-};
-
-/*
- * Driver name.
- */
-struct an_ltv_drvname {
-	u_int16_t		an_len;
-	u_int16_t		an_type;
-	u_int8_t		an_drvname[16];
-};
-
-/*
- * Frame encapsulation.
- */
-struct an_rid_encap {
-	u_int16_t		an_len;
-	u_int16_t		an_type;
-	u_int16_t		an_ethertype_default;
-	u_int16_t		an_action_default;
-	u_int16_t		an_ethertype0;
-	u_int16_t		an_action0;
-	u_int16_t		an_ethertype1;
-	u_int16_t		an_action1;
-	u_int16_t		an_ethertype2;
-	u_int16_t		an_action2;
-	u_int16_t		an_ethertype3;
-	u_int16_t		an_action3;
-	u_int16_t		an_ethertype4;
-	u_int16_t		an_action4;
-	u_int16_t		an_ethertype5;
-	u_int16_t		an_action5;
-	u_int16_t		an_ethertype6;
-	u_int16_t		an_action6;
-};
-
-#define AN_ENCAP_ACTION_RX	0x0001
-#define AN_ENCAP_ACTION_TX	0x0002
-
-#define AN_RXENCAP_NONE		0x0000
-#define AN_RXENCAP_RFC1024	0x0001
-
-#define AN_TXENCAP_RFC1024	0x0000
-#define AN_TXENCAP_80211	0x0002
-
-/*
- * Card capabilities (read only).
- */
-struct an_ltv_caps {
-	u_int16_t		an_len;			/* 0x00 */
-	u_int16_t		an_type;		/* XXXX */
-	u_int8_t		an_oui[3];		/* 0x02 */
-	u_int8_t		an_rsvd0;		/* 0x05 */
-	u_int16_t		an_prodnum;		/* 0x06 */
-	u_int8_t		an_manufname[32];	/* 0x08 */
-	u_int8_t		an_prodname[16];	/* 0x28 */
-	u_int8_t		an_prodvers[8];		/* 0x38 */
-	u_int8_t		an_oemaddr[6];		/* 0x40 */
-	u_int8_t		an_aironetaddr[6];	/* 0x46 */
-	u_int16_t		an_radiotype;		/* 0x4C */
-	u_int16_t		an_regdomain;		/* 0x4E */
-	u_int8_t		an_callid[6];		/* 0x50 */
-	u_int8_t		an_rates[8];		/* 0x56 */
-	u_int8_t		an_rx_diversity;	/* 0x5E */
-	u_int8_t		an_tx_diversity;	/* 0x5F */
-	u_int16_t		an_tx_powerlevels[8];	/* 0x60 */
-	u_int16_t		an_hwrev;		/* 0x70 */
-	u_int16_t		an_hwcaps;		/* 0x72 */
-	u_int16_t		an_temprange;		/* 0x74 */
-	u_int16_t		an_fwrev;		/* 0x76 */
-	u_int16_t		an_fwsubrev;		/* 0x78 */
-	u_int16_t		an_ifacerev;		/* 0x7A */
-	u_int16_t		an_softcaps;		/* 0x7C */
-	u_int16_t		an_bootblockrev;	/* 0x7E */
-	u_int16_t		an_req_hw_support;	/* 0x80 */
-	u_int16_t		an_unknown[31];		/* 0x82 */
-};
-
-/*
- * Access point (read only)
- */
-struct an_ltv_apinfo {
-	u_int16_t		an_len;
-	u_int16_t		an_type;
-	u_int16_t		an_tim_addr;
-	u_int16_t		an_airo_addr;
-};
-
-/*
- * Radio info (read only).
- */
-struct an_ltv_radioinfo {
-	u_int16_t		an_len;
-	u_int16_t		an_type;
-	/* ??? */
-};
-
-/* 
- * RSSI map.  If available in the card's firmware, this can be used to
- * convert the 8-bit RSSI values from the card into dBm.
- */
-struct an_ltv_rssi_map {
-	u_int16_t		an_len;
-	u_int16_t		an_type;
-	struct an_rssi_entry	an_entries[256];
-};
-
-/*
- * Status (read only). Note: the manual claims this RID is 108 bytes
- * long (0x6A is the last datum, which is 2 bytes long) however when
- * this RID is read from the NIC, it returns a length of 110. To be
- * on the safe side, this structure is padded with an extra 16-bit
- * word. (There is a misprint in the manual which says the macaddr
- * field is 8 bytes long.)
- *
- * Also, the channel_set and current_channel fields appear to be
- * reversed. Either that, or the hop_period field is unused.
- */
-struct an_ltv_status {
-	u_int16_t		an_len;			/* 0x00 */
-	u_int16_t		an_type;		/* 0xXX */
-	u_int8_t		an_macaddr[6];		/* 0x02 */
-	u_int16_t		an_opmode;		/* 0x08 */
-	u_int16_t		an_errcode;		/* 0x0A */
-	u_int16_t		an_signal_quality;	/* 0x0C */
-	u_int16_t		an_ssidlen;		/* 0x0E */
-	u_int8_t		an_ssid[32];		/* 0x10 */
-	u_int8_t		an_ap_name[16];		/* 0x30 */
-	u_int8_t		an_cur_bssid[6];	/* 0x40 */
-	u_int8_t		an_prev_bssid1[6];	/* 0x46 */
-	u_int8_t		an_prev_bssid2[6];	/* 0x4C */
-	u_int8_t		an_prev_bssid3[6];	/* 0x52 */
-	u_int16_t		an_beacon_period;	/* 0x58 */
-	u_int16_t		an_dtim_period;		/* 0x5A */
-	u_int16_t		an_atim_duration;	/* 0x5C */
-	u_int16_t		an_hop_period;		/* 0x5E */
-	u_int16_t		an_cur_channel;		/* 0x62 */
-	u_int16_t		an_channel_set;		/* 0x60 */
-	u_int16_t		an_hops_to_backbone;	/* 0x64 */
-	u_int16_t		an_ap_total_load;	/* 0x66 */
-	u_int16_t		an_our_generated_load;	/* 0x68 */
-	u_int16_t		an_accumulated_arl;	/* 0x6A */
-	u_int16_t		an_cur_signal_quality;	/* 0x6C */
-	u_int16_t		an_current_tx_rate;	/* 0x6E */
-	u_int16_t		an_ap_device;		/* 0x70 */
-	u_int16_t		an_normalized_strength;	/* 0x72 */
-	u_int16_t		an_short_pre_in_use;	/* 0x74 */
-	u_int8_t		an_ap_ip_addr[4];	/* 0x76 */
-	u_int8_t		an_noise_prev_sec_pc;   /* 0x7A */
-	u_int8_t		an_noise_prev_sec_db;   /* 0x7B */
-	u_int8_t		an_avg_noise_prev_min_pc;       /* 0x7C */
-	u_int8_t		an_avg_noise_prev_min_db;       /* 0x7D */
-	u_int8_t		an_max_noise_prev_min_pc;       /* 0x7E */
-	u_int8_t		an_max_noise_prev_min_db;       /* 0x7F */
-	u_int16_t		an_spare[18];
-};
-
-#define AN_STATUS_OPMODE_CONFIGURED		0x0001
-#define AN_STATUS_OPMODE_MAC_ENABLED		0x0002
-#define AN_STATUS_OPMODE_RX_ENABLED		0x0004
-#define AN_STATUS_OPMODE_IN_SYNC		0x0010
-#define AN_STATUS_OPMODE_ASSOCIATED		0x0020
-#define AN_STATUS_OPMODE_LEAP			0x0040
-#define AN_STATUS_OPMODE_ERROR			0x8000
-
-/*
- * WEP Key
- */
-struct an_ltv_wepkey {
-	u_int16_t		an_len;			/* 0x00 */
-	u_int16_t		an_type;		/* 0xXX */
-	u_int16_t		an_key_index;		/* 0x02 */
-	u_int8_t		an_mac_addr[6];		/* 0x04 */
-	u_int16_t		an_key_len;		/* 0x0A */
-	u_int8_t		an_key[13];		/* 0x0C */
-};
-
-/*
- * Receive frame structure.
- */
-struct an_rxframe {
-	uint32_t		an_rx_time;		/* 0x00 */
-	u_int16_t		an_rx_status;		/* 0x04 */
-	u_int16_t		an_rx_payload_len;	/* 0x06 */
-	u_int8_t		an_rsvd0;		/* 0x08 */
-	u_int8_t		an_rx_signal_strength;	/* 0x09 */
-	u_int8_t		an_rx_rate;		/* 0x0A */
-	u_int8_t		an_rx_chan;		/* 0x0B */
-	u_int8_t		an_rx_assoc_cnt;	/* 0x0C */
-	u_int8_t		an_rsvd1[3];		/* 0x0D */
-	u_int8_t		an_plcp_hdr[4];		/* 0x10 */
-	u_int16_t		an_frame_ctl;		/* 0x14 */
-	u_int16_t		an_duration;		/* 0x16 */
-	u_int8_t		an_addr1[6];		/* 0x18 */
-	u_int8_t		an_addr2[6];		/* 0x1E */
-	u_int8_t		an_addr3[6];		/* 0x24 */
-	u_int16_t		an_seq_ctl;		/* 0x2A */
-	u_int8_t		an_addr4[6];		/* 0x2C */
-	u_int8_t		an_gaplen;		/* 0x32 */
-} __packed;
-
-
-/* Do not modify this unless you are modifying LEAP itself */
-#define LEAP_USERNAME_MAX 32
-#define LEAP_PASSWORD_MAX 32
-
-/*
- * LEAP Username
- */
-struct an_ltv_leap_username {
-	u_int16_t		an_len;			/* 0x00 */
-	u_int16_t		an_type;		/* 0xXX */
-	u_int16_t		an_username_len;	/* 0x02 */
-	u_int8_t		an_username[LEAP_USERNAME_MAX];	/* 0x04 */
-};
-
-/*
- * LEAP Password
- */
-struct an_ltv_leap_password {
-	u_int16_t		an_len;			/* 0x00 */
-	u_int16_t		an_type;		/* 0xXX */
-	u_int16_t		an_password_len;	/* 0x02 */
-	u_int8_t		an_password[LEAP_PASSWORD_MAX];	/* 0x04 */
-};
-
-/*
- * These are all the LTV record types that we can read or write
- * from the Aironet. Not all of them are temendously useful, but I
- * list as many as I know about here for completeness.
- */
-
-/*
- * Configuration (read/write)
- */
-#define AN_RID_GENCONFIG	0xFF10	/* General configuration info */
-#define AN_RID_SSIDLIST		0xFF11	/* Valid SSID list */
-#define AN_RID_APLIST		0xFF12	/* Valid AP list */
-#define AN_RID_DRVNAME		0xFF13	/* ID name of this node for diag */
-#define AN_RID_ENCAPPROTO	0xFF14	/* Payload encapsulation type */
-#define AN_RID_WEP_TEMP	        0xFF15  /* Temporary Key */
-#define AN_RID_WEP_PERM	        0xFF16  /* Perminant Key */
-#define AN_RID_ACTUALCFG	0xFF20	/* Current configuration settings */
-
-/*
- * Reporting (read only)
- */
-#define AN_RID_CAPABILITIES	0xFF00	/* PC 4500/4800 capabilities */
-#define AN_RID_AP_INFO		0xFF01	/* Access point info */
-#define AN_RID_RADIO_INFO	0xFF02	/* Radio info */
-#define AN_RID_RSSI_MAP         0xFF04  /* RSSI <-> dBm table */
-#define AN_RID_STATUS		0xFF50	/* Current status info */
-#define AN_RID_BEACONS_HST	0xFF51
-#define AN_RID_BUSY_HST		0xFF52
-#define AN_RID_RETRIES_HST	0xFF53
-
-/*
- * Statistics
- */
-#define AN_RID_16BITS_CUM	0xFF60	/* Cumulative 16-bit stats counters */
-#define AN_RID_16BITS_DELTA	0xFF61	/* 16-bit stats (since last clear) */
-#define AN_RID_16BITS_DELTACLR	0xFF62	/* 16-bit stats, clear on read */
-#define AN_RID_32BITS_CUM	0xFF68	/* Cumulative 32-bit stats counters */
-#define AN_RID_32BITS_DELTA	0xFF69	/* 32-bit stats (since last clear) */
-#define AN_RID_32BITS_DELTACLR	0xFF6A	/* 32-bit stats, clear on read */
-
-/*
- * LEAP
- */
-
-#define AN_RID_LEAPUSERNAME	0xFF23	/* Username */
-#define AN_RID_LEAPPASSWORD	0xFF24	/* Password */
-
-/*
- * OTHER Unknonwn for now
- */
-
-#define AN_RID_MOD		0xFF17
-#define AN_RID_OPTIONS		0xFF18
-#define AN_RID_FACTORY_CONFIG	0xFF18
-
-/*
- *   FreeBSD fake RID
- */
-
-#define AN_RID_MONITOR_MODE	0x0001	/* Set monitor mode for driver */
-#define AN_MONITOR			 1
-#define AN_MONITOR_ANY_BSS		 2
-#define AN_MONITOR_INCLUDE_BEACON	 4
-#define AN_MONITOR_AIRONET_HEADER	 8
-
-#define DLT_AIRONET_HEADER 	120	/* Has been allocated at tcpdump.org */
-
-/*
- * from the Linux driver from Cisco ... no copyright header.
- * Removed duplicated information that already existed in the FreeBSD driver
- * provides emulation of the Cisco extensions to the Linux Aironet driver.
- */
-
-/*
- * Ioctl constants to be used in airo_ioctl.command
- */
-
-#define	AIROGCAP	0	/* Capability rid */
-#define AIROGCFG	1	/* USED A LOT  */
-#define AIROGSLIST	2	/* System ID list  */
-#define AIROGVLIST	3	/* List of specified AP's */
-#define AIROGDRVNAM	4	/* NOTUSED */
-#define AIROGEHTENC	5	/* NOTUSED */
-#define AIROGWEPKTMP	6
-#define AIROGWEPKNV	7
-#define AIROGSTAT	8
-#define AIROGSTATSC32	9
-#define AIROGSTATSD32	10
-
-/*
- * Leave gap of 40 commands after AIROGSTATSD32
- */
-
-#define AIROPCAP	AIROGSTATSD32	+ 40
-#define AIROPVLIST	AIROPCAP	+ 1
-#define AIROPSLIST	AIROPVLIST	+ 1
-#define AIROPCFG	AIROPSLIST	+ 1
-#define AIROPSIDS	AIROPCFG	+ 1
-#define AIROPAPLIST	AIROPSIDS	+ 1
-#define AIROPMACON	AIROPAPLIST	+ 1	/* Enable mac  */
-#define AIROPMACOFF	AIROPMACON	+ 1	/* Disable mac */
-#define AIROPSTCLR	AIROPMACOFF	+ 1
-#define AIROPWEPKEY	AIROPSTCLR	+ 1
-#define AIROPWEPKEYNV	AIROPWEPKEY	+ 1
-#define AIROPLEAPPWD	AIROPWEPKEYNV	+ 1
-#define AIROPLEAPUSR	AIROPLEAPPWD	+ 1
-
-/*
- * Another gap of 40 commands before flash codes
- */
-
-#define AIROFLSHRST	AIROPWEPKEYNV	+ 40
-#define AIROFLSHGCHR	AIROFLSHRST	+ 1
-#define AIROFLSHSTFL	AIROFLSHGCHR	+ 1
-#define AIROFLSHPCHR	AIROFLSHSTFL	+ 1
-#define AIROFLPUTBUF	AIROFLSHPCHR	+ 1
-#define AIRORESTART	AIROFLPUTBUF	+ 1
-
-/*
- * Struct to enable up to 65535 ioctl's
- */
-
-#define AIROMAGIC	0xa55a
-
-typedef struct aironet_ioctl {
-  unsigned short command;	/* What to do */
-  unsigned short len;		/* Len of data */
-  unsigned char *data;		/* d-data */
-} airo_ioctl;
-
-#endif
diff --git a/include.new/dev/an/if_anreg.h b/include.new/dev/an/if_anreg.h
deleted file mode 100644
index b9c6370..0000000
--- a/include.new/dev/an/if_anreg.h
+++ /dev/null
@@ -1,547 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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: releng/10.2/sys/dev/an/if_anreg.h 199757 2009-11-24 16:57:35Z jhb $
- */
-
-#define AN_TIMEOUT	65536
-
-/* Default network name: <empty string> */
-#define AN_DEFAULT_NETNAME	""
-
-/* The nodename must be less than 16 bytes */
-#define AN_DEFAULT_NODENAME	"FreeBSD"
-
-#define AN_DEFAULT_IBSS		"FreeBSD IBSS"
-
-/*
- * register space access macros
- */
-#define CSR_WRITE_2(sc, reg, val)	bus_write_2(sc->port_res, reg, val)
-
-#define CSR_READ_2(sc, reg)		bus_read_2(sc->port_res, reg)
-
-#define CSR_WRITE_1(sc, reg, val)	bus_write_1(sc->port_res, reg, val)
-
-#define CSR_READ_1(sc, reg)		bus_read_1(sc->port_res, reg)
-
-/*
- * memory space access macros
- */
-#define CSR_MEM_WRITE_2(sc, reg, val)	bus_write_2(sc->mem_res, reg, val)
-
-#define CSR_MEM_READ_2(sc, reg)		bus_read_2(sc->mem_res, reg)
-
-#define CSR_MEM_WRITE_1(sc, reg, val)	bus_write_1(sc->mem_res, reg, val)
-
-#define CSR_MEM_READ_1(sc, reg)		bus_read_1(sc->mem_res, reg)
-
-/*
- * aux. memory space access macros
- */
-#define CSR_MEM_AUX_WRITE_4(sc, reg, val)	\
-	bus_write_4(sc->mem_aux_res, reg, val)
-
-#define CSR_MEM_AUX_READ_4(sc, reg)		\
-	bus_read_4(sc->mem_aux_res, reg)
-
-#define CSR_MEM_AUX_WRITE_1(sc, reg, val)	\
-	bus_write_1(sc->mem_aux_res, reg, val)
-
-#define CSR_MEM_AUX_READ_1(sc, reg)		\
-	bus_read_1(sc->mem_aux_res, reg)
-
-/*
- * Size of Aironet I/O space.
- */
-#define AN_IOSIZ		0x40
-
-/*
- * Size of aux. memory space ... probably not needed DJA 
- */
-#define AN_AUX_MEM_SIZE		(256 * 1024)
-
-/*
- * Hermes register definitions and what little I know about them.
- */
-
-/* Hermes command/status registers. */
-#define AN_COMMAND(x)		(x ? 0x00 : 0x00)
-#define AN_PARAM0(x)		(x ? 0x04 : 0x02)
-#define AN_PARAM1(x)		(x ? 0x08 : 0x04)
-#define AN_PARAM2(x)		(x ? 0x0c : 0x06)
-#define AN_STATUS(x)		(x ? 0x10 : 0x08)
-#define AN_RESP0(x)		(x ? 0x14 : 0x0A)
-#define AN_RESP1(x)		(x ? 0x18 : 0x0C)
-#define AN_RESP2(x)		(x ? 0x1c : 0x0E)
-#define AN_LINKSTAT(x)		(x ? 0x20 : 0x10)
-
-/* Command register */
-#define AN_CMD_BUSY		0x8000 /* busy bit */
-#define AN_CMD_NO_ACK		0x0080 /* don't acknowledge command */
-#define AN_CMD_CODE_MASK	0x003F
-#define AN_CMD_QUAL_MASK	0x7F00
-
-/* Command codes */
-#define AN_CMD_NOOP		0x0000 /* no-op */
-#define AN_CMD_ENABLE		0x0001 /* enable */
-#define AN_CMD_DISABLE		0x0002 /* disable */
-#define AN_CMD_FORCE_SYNCLOSS	0x0003 /* force loss of sync */
-#define AN_CMD_FW_RESTART	0x0004 /* firmware restart */
-#define AN_CMD_HOST_SLEEP	0x0005
-#define AN_CMD_MAGIC_PKT	0x0006
-#define AN_CMD_READCFG		0x0008
-#define AN_CMD_SET_MODE		0x0009
-#define AN_CMD_ALLOC_MEM	0x000A /* allocate NIC memory */
-#define AN_CMD_TX		0x000B /* transmit */
-#define AN_CMD_DEALLOC_MEM	0x000C
-#define AN_CMD_NOOP2		0x0010
-#define AN_CMD_ALLOC_DESC	0x0020
-#define AN_CMD_ACCESS		0x0021
-#define AN_CMD_ALLOC_BUF	0x0028
-#define AN_CMD_PSP_NODES	0x0030
-#define AN_CMD_SET_PHYREG	0x003E
-#define AN_CMD_TX_TEST		0x003F
-#define AN_CMD_SLEEP		0x0085
-#define AN_CMD_SAVECFG		0x0108
-
-/*
- * MPI 350 DMA descriptor information
- */
-#define AN_DESCRIPTOR_TX	0x01
-#define AN_DESCRIPTOR_RX	0x02
-#define AN_DESCRIPTOR_TXCMP	0x04
-#define AN_DESCRIPTOR_HOSTWRITE	0x08
-#define AN_DESCRIPTOR_HOSTREAD	0x10
-#define AN_DESCRIPTOR_HOSTRW	0x20
-
-#define AN_MAX_RX_DESC 1
-#define AN_MAX_TX_DESC 1
-#define AN_HOSTBUFSIZ 1840
-
-struct an_card_rid_desc
-{
-	unsigned	an_rid:16;
-	unsigned	an_len:15;
-	unsigned	an_valid:1;
-	u_int64_t	an_phys;
-};
-
-struct an_card_rx_desc
-{
-	unsigned	an_ctrl:15;
-	unsigned	an_done:1;
-	unsigned	an_len:15;
-	unsigned	an_valid:1;
-	u_int64_t	an_phys;
-};
-
-struct an_card_tx_desc
-{
-	unsigned	an_offset:15;
-	unsigned	an_eoc:1;
-	unsigned	an_len:15;
-	unsigned	an_valid:1;
-	u_int64_t	an_phys;
-};
-
-#define AN_RID_BUFFER_SIZE	AN_MAX_DATALEN
-#define AN_RX_BUFFER_SIZE	AN_HOSTBUFSIZ
-#define AN_TX_BUFFER_SIZE	AN_HOSTBUFSIZ
-/*#define AN_HOST_DESC_OFFSET	0xC sort of works */
-#define AN_HOST_DESC_OFFSET	0x800
-#define AN_RX_DESC_OFFSET  (AN_HOST_DESC_OFFSET + \
-    sizeof(struct an_card_rid_desc))
-#define AN_TX_DESC_OFFSET (AN_RX_DESC_OFFSET + \
-    (AN_MAX_RX_DESC * sizeof(struct an_card_rx_desc)))
-
-struct an_command {
-	u_int16_t	an_cmd;
-	u_int16_t	an_parm0;
-	u_int16_t	an_parm1;
-	u_int16_t	an_parm2;
-};
-
-struct an_reply {
-	u_int16_t	an_status;
-	u_int16_t	an_resp0;
-	u_int16_t	an_resp1;
-	u_int16_t	an_resp2;
-};
-
-/*
- * Reclaim qualifier bit, applicable to the
- * TX command.
- */
-#define AN_RECLAIM		0x0100 /* reclaim NIC memory */
-
-/*
- * ACCESS command qualifier bits.
- */
-#define AN_ACCESS_READ		0x0000
-#define AN_ACCESS_WRITE		0x0100
-
-/*
- * PROGRAM command qualifier bits.
- */
-#define AN_PROGRAM_DISABLE	0x0000
-#define AN_PROGRAM_ENABLE_RAM	0x0100
-#define AN_PROGRAM_ENABLE_NVRAM	0x0200
-#define AN_PROGRAM_NVRAM	0x0300
-
-/* Status register values */
-#define AN_STAT_CMD_CODE	0x003F
-#define AN_STAT_CMD_RESULT	0x7F00
-
-/* Linkstat register */
-#define AN_LINKSTAT_ASSOCIATED		0x0400
-#define AN_LINKSTAT_AUTHFAIL		0x0300
-#define AN_LINKSTAT_ASSOC_FAIL		0x8400
-#define AN_LINKSTAT_DISASSOC		0x8200
-#define AN_LINKSTAT_DEAUTH		0x8100
-#define AN_LINKSTAT_SYNCLOST_TSF	0x8004
-#define AN_LINKSTAT_SYNCLOST_HOSTREQ	0x8003
-#define AN_LINKSTAT_SYNCLOST_AVGRETRY	0x8002
-#define AN_LINKSTAT_SYNCLOST_MAXRETRY	0x8001
-#define AN_LINKSTAT_SYNCLOST_MISSBEACON	0x8000
-
-/* memory handle management registers */
-#define AN_RX_FID		0x20
-#define AN_ALLOC_FID		0x22
-#define AN_TX_CMP_FID(x)	(x ? 0x1a : 0x24)
-
-/*
- * Buffer Access Path (BAP) registers.
- * These are I/O channels. I believe you can use each one for
- * any desired purpose independently of the other. In general
- * though, we use BAP1 for reading and writing LTV records and
- * reading received data frames, and BAP0 for writing transmit
- * frames. This is a convention though, not a rule.
- */
-#define AN_SEL0			0x18
-#define AN_SEL1			0x1A
-#define AN_OFF0			0x1C
-#define AN_OFF1			0x1E
-#define AN_DATA0		0x36
-#define AN_DATA1		0x38
-#define AN_BAP0			AN_DATA0
-#define AN_BAP1			AN_DATA1
-
-#define AN_OFF_BUSY		0x8000
-#define AN_OFF_ERR		0x4000
-#define AN_OFF_DONE		0x2000
-#define AN_OFF_DATAOFF		0x0FFF
-
-/* Event registers */
-#define AN_EVENT_STAT(x)	(x ? 0x60 : 0x30)	/* Event status */
-#define AN_INT_EN(x)		(x ? 0x64 : 0x32)	/* Interrupt enable/
-							   disable */
-#define AN_EVENT_ACK(x)		(x ? 0x68 : 0x34)	/* Ack event */
-
-/* Events */
-#define AN_EV_CLR_STUCK_BUSY	0x4000	/* clear stuck busy bit */
-#define AN_EV_WAKEREQUEST	0x2000	/* awaken from PSP mode */
-#define AN_EV_MIC		0x1000	/* Message Integrity Check*/
-#define AN_EV_AWAKE		0x0100	/* station woke up from PSP mode*/
-#define AN_EV_LINKSTAT		0x0080	/* link status available */
-#define AN_EV_CMD		0x0010	/* command completed */
-#define AN_EV_ALLOC		0x0008	/* async alloc/reclaim completed */
-#define AN_EV_TX_CPY		0x0400
-#define AN_EV_TX_EXC		0x0004	/* async xmit completed with failure */
-#define AN_EV_TX		0x0002	/* async xmit completed succesfully */
-#define AN_EV_RX		0x0001	/* async rx completed */
-
-#define AN_INTRS(x)	\
-	( x ? (AN_EV_RX|AN_EV_TX|AN_EV_TX_EXC|AN_EV_TX_CPY|AN_EV_ALLOC \
-	       |AN_EV_LINKSTAT|AN_EV_MIC) \
-	  : \
-	      (AN_EV_RX|AN_EV_TX|AN_EV_TX_EXC|AN_EV_ALLOC \
-	       |AN_EV_LINKSTAT|AN_EV_MIC) \
-	      )
-
-/* Host software registers */
-#define AN_SW0(x)		(x ? 0x50 : 0x28)
-#define AN_SW1(x)		(x ? 0x54 : 0x2A)
-#define AN_SW2(x)		(x ? 0x58 : 0x2C)
-#define AN_SW3(x)		(x ? 0x5c : 0x2E)
-
-#define AN_CNTL			0x14
-
-#define AN_CNTL_AUX_ENA		0xC000
-#define AN_CNTL_AUX_ENA_STAT	0xC000
-#define AN_CNTL_AUX_DIS_STAT	0x0000
-#define AN_CNTL_AUX_ENA_CNTL	0x8000
-#define AN_CNTL_AUX_DIS_CNTL	0x4000
-
-#define AN_AUX_PAGE		0x3A
-#define AN_AUX_OFFSET		0x3C
-#define AN_AUX_DATA		0x3E
-
-/*
- * Length, Type, Value (LTV) record definitions and RID values.
- */
-struct an_ltv_gen {
-	u_int16_t		an_len;
-	u_int16_t		an_type;
-	u_int16_t		an_val;
-};
-
-#define AN_DEF_SSID_LEN		7
-#define AN_DEF_SSID		"tsunami"
-
-#define AN_RXGAP_MAX	8
-
-/*
- * Transmit frame structure.
- */
-struct an_txframe {
-	uint32_t		an_tx_sw;		/* 0x00 */
-	u_int16_t		an_tx_status;		/* 0x04 */
-	u_int16_t		an_tx_payload_len;	/* 0x06 */
-	u_int16_t		an_tx_ctl;		/* 0x08 */
-	u_int16_t		an_tx_assoc_id;		/* 0x0A */
-	u_int16_t		an_tx_retry;		/* 0x0C */
-	u_int8_t		an_tx_assoc_cnt;	/* 0x0E */
-	u_int8_t		an_tx_rate;		/* 0x0F */
-	u_int8_t		an_tx_max_long_retries;	/* 0x10 */
-	u_int8_t		an_tx_max_short_retries; /*0x11 */
-	u_int8_t		an_rsvd0[2];		/* 0x12 */
-	u_int16_t		an_frame_ctl;		/* 0x14 */
-	u_int16_t		an_duration;		/* 0x16 */
-	u_int8_t		an_addr1[6];		/* 0x18 */
-	u_int8_t		an_addr2[6];		/* 0x1E */
-	u_int8_t		an_addr3[6];		/* 0x24 */
-	u_int16_t		an_seq_ctl;		/* 0x2A */
-	u_int8_t		an_addr4[6];		/* 0x2C */
-	u_int8_t		an_gaplen;		/* 0x32 */
-} __packed;
-
-struct an_rxframe_802_3 {
-        u_int16_t		an_rx_802_3_status;     /* 0x34 */
-	u_int16_t		an_rx_802_3_payload_len;/* 0x36 */
-	u_int8_t		an_rx_dst_addr[6];      /* 0x38 */
-	u_int8_t		an_rx_src_addr[6];      /* 0x3E */
-};
-#define AN_RXGAP_MAX	8
-
-
-struct an_txframe_802_3 {
-/*
- * Transmit 802.3 header structure.
- */
-        u_int16_t		an_tx_802_3_status;     /* 0x34 */
-	u_int16_t		an_tx_802_3_payload_len;/* 0x36 */
-	u_int8_t		an_tx_dst_addr[6];      /* 0x38 */
-	u_int8_t		an_tx_src_addr[6];      /* 0x3E */
-};
-
-#define AN_TXSTAT_EXCESS_RETRY	0x0002
-#define AN_TXSTAT_LIFE_EXCEEDED	0x0004
-#define AN_TXSTAT_AID_FAIL	0x0008
-#define AN_TXSTAT_MAC_DISABLED	0x0010
-#define AN_TXSTAT_ASSOC_LOST	0x0020
-
-#define AN_TXCTL_RSVD		0x0001
-#define AN_TXCTL_TXOK_INTR	0x0002
-#define AN_TXCTL_TXERR_INTR	0x0004
-#define AN_TXCTL_HEADER_TYPE	0x0008
-#define AN_TXCTL_PAYLOAD_TYPE	0x0010
-#define AN_TXCTL_NORELEASE	0x0020
-#define AN_TXCTL_NORETRIES	0x0040
-#define AN_TXCTL_CLEAR_AID	0x0080
-#define AN_TXCTL_STRICT_ORDER	0x0100
-#define AN_TXCTL_USE_RTS	0x0200
-
-#define AN_HEADERTYPE_8023	0x0000
-#define AN_HEADERTYPE_80211	0x0008
-
-#define AN_PAYLOADTYPE_ETHER	0x0000
-#define AN_PAYLOADTYPE_LLC	0x0010
-
-#define AN_TXCTL_80211		(AN_HEADERTYPE_80211|AN_PAYLOADTYPE_LLC)
-
-#define AN_TXCTL_8023		(AN_HEADERTYPE_8023|AN_PAYLOADTYPE_ETHER)
-
-/*
- * Additions to transmit control bits for MPI350
- */
-#define	AN_TXCTL_HW(x)	\
-	( x ? (AN_TXCTL_NORELEASE) \
-	  : \
-	      (AN_TXCTL_TXOK_INTR|AN_TXCTL_TXERR_INTR|AN_TXCTL_NORELEASE) \
-	      )
-
-#define AN_TXGAP_80211		0
-#define AN_TXGAP_8023		0
-
-struct an_802_3_hdr {
-	u_int16_t		an_8023_status;
-	u_int16_t		an_8023_payload_len;
-	u_int8_t		an_8023_dst_addr[6];
-	u_int8_t		an_8023_src_addr[6];
-	u_int16_t		an_8023_dat[3];	/* SNAP header */
-	u_int16_t		an_8023_type;
-};
-
-struct an_snap_hdr {
-	u_int16_t		an_snap_dat[3];	/* SNAP header */
-	u_int16_t		an_snap_type;
-};
-
-struct an_dma_alloc {
-	uint32_t		an_dma_paddr;
-	caddr_t			an_dma_vaddr;
-	bus_dmamap_t		an_dma_map;
-	bus_dma_segment_t	an_dma_seg;
-	bus_size_t		an_dma_size;
-	int			an_dma_nseg;
-};
-
-#define AN_TX_RING_CNT		4
-#define AN_INC(x, y)		(x) = (x + 1) % y
-
-struct an_tx_ring_data {
-	u_int16_t		an_tx_fids[AN_TX_RING_CNT];
-	u_int16_t		an_tx_ring[AN_TX_RING_CNT];
-	int			an_tx_prod;
-	int			an_tx_cons;
-	int			an_tx_empty;
-};
-
-struct an_softc	{
-	struct ifnet		*an_ifp;
-
-	int	port_rid;	/* resource id for port range */
-	struct resource* port_res; /* resource for port range */
-	int     mem_rid;	/* resource id for memory range */
-        int     mem_used;	/* nonzero if memory used */
-	struct resource* mem_res; /* resource for memory range */
-	int     mem_aux_rid;	/* resource id for memory range */
-        int     mem_aux_used;	/* nonzero if memory used */
-	struct resource* mem_aux_res; /* resource for memory range */
-	int	irq_rid;	/* resource id for irq */
-	void*	irq_handle;	/* handle for irq handler */
-	struct resource* irq_res; /* resource for irq */
-
-	bus_space_handle_t	an_mem_aux_bhandle;
-	bus_space_tag_t		an_mem_aux_btag;
-	bus_dma_tag_t		an_dtag;
-	struct an_ltv_genconfig	an_config;
-	struct an_ltv_caps	an_caps;
-	struct an_ltv_ssidlist_new	an_ssidlist;
-	struct an_ltv_aplist	an_aplist;
-        struct an_ltv_key	an_temp_keys[4];
-	int			an_tx_rate;
-	int			an_rxmode;
-	int			an_gone;
-	int			an_if_flags;
-	u_int8_t		an_txbuf[1536];
-	struct an_tx_ring_data	an_rdata;
-	struct an_ltv_stats	an_stats;
-	struct an_ltv_status	an_status;
-	u_int8_t		an_associated;
-#ifdef ANCACHE
-	int			an_sigitems;
-	struct an_sigcache	an_sigcache[MAXANCACHE];
-	int			an_nextitem;
-	int			an_have_rssimap;
-	struct an_ltv_rssi_map	an_rssimap;
-#endif
-	struct callout		an_stat_ch;
-	struct mtx		an_mtx;
-	device_t		an_dev;
-	struct ifmedia		an_ifmedia;
-	int		        an_monitor;
-	int		        an_was_monitor;
-	int			an_timer;
-	u_char			buf_802_11[MCLBYTES];
-	struct an_req		areq;
-	unsigned short*		an_flash_buffer;
-	int			mpi350;
-	struct an_dma_alloc	an_rid_buffer;
-	struct an_dma_alloc	an_rx_buffer[AN_MAX_RX_DESC];
-	struct an_dma_alloc	an_tx_buffer[AN_MAX_TX_DESC];
-};
-
-#define AN_LOCK(_sc)		mtx_lock(&(_sc)->an_mtx)
-#define AN_UNLOCK(_sc)		mtx_unlock(&(_sc)->an_mtx)
-#define AN_LOCK_ASSERT(_sc)	mtx_assert(&(_sc)->an_mtx, MA_OWNED)
-
-void	an_release_resources	(device_t);
-int	an_alloc_port		(device_t, int, int);
-int	an_alloc_memory		(device_t, int, int);
-int	an_alloc_aux_memory	(device_t, int, int);
-int	an_alloc_irq		(device_t, int, int);
-int	an_pci_probe	(device_t);
-int	an_probe	(device_t);
-int	an_shutdown	(device_t);
-void	an_resume	(device_t);
-int	an_attach		(struct an_softc *, int);
-int	an_detach	(device_t);
-void    an_stop		(struct an_softc *);
-
-driver_intr_t	an_intr;
-
-#define AN_802_3_OFFSET		0x2E
-#define AN_802_11_OFFSET	0x44
-#define AN_802_11_OFFSET_RAW	0x3C
-
-#define AN_STAT_BADCRC		0x0001
-#define AN_STAT_UNDECRYPTABLE	0x0002
-#define AN_STAT_ERRSTAT		0x0003
-#define AN_STAT_MAC_PORT	0x0700
-#define AN_STAT_1042		0x2000	/* RFC1042 encoded */
-#define AN_STAT_TUNNEL		0x4000	/* Bridge-tunnel encoded */
-#define AN_STAT_WMP_MSG		0x6000	/* WaveLAN-II management protocol */
-#define AN_RXSTAT_MSG_TYPE	0xE000
-
-#define AN_ENC_TX_802_3		0x00
-#define AN_ENC_TX_802_11	0x11
-#define AN_ENC_TX_E_II		0x0E
-
-#define AN_ENC_TX_1042		0x00
-#define AN_ENC_TX_TUNNEL	0xF8
-
-#define AN_TXCNTL_MACPORT	0x00FF
-#define AN_TXCNTL_STRUCTTYPE	0xFF00
-
-/*
- * SNAP (sub-network access protocol) constants for transmission
- * of IP datagrams over IEEE 802 networks, taken from RFC1042.
- * We need these for the LLC/SNAP header fields in the TX/RX frame
- * structure.
- */
-#define AN_SNAP_K1		0xaa	/* assigned global SAP for SNAP */
-#define AN_SNAP_K2		0x00
-#define AN_SNAP_CONTROL		0x03	/* unnumbered information format */
-#define AN_SNAP_WORD0		(AN_SNAP_K1 | (AN_SNAP_K1 << 8))
-#define AN_SNAP_WORD1		(AN_SNAP_K2 | (AN_SNAP_CONTROL << 8))
-#define AN_SNAPHDR_LEN		0x6
diff --git a/include.new/dev/bktr/ioctl_bt848.h b/include.new/dev/bktr/ioctl_bt848.h
deleted file mode 100644
index cc27e11..0000000
--- a/include.new/dev/bktr/ioctl_bt848.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * extensions to ioctl_meteor.h for the bt848 cards
- *
- * $FreeBSD: releng/10.2/sys/dev/bktr/ioctl_bt848.h 205781 2010-03-28 00:10:09Z gibbs $
- */
-
-#ifndef  _DEV_BKTR_IOCTL_BT848_H_
-#define  _DEV_BKTR_IOCTL_BT848_H_
-
-/*
- * frequency sets
- */
-#define CHNLSET_NABCST		1
-#define CHNLSET_CABLEIRC	2
-#define CHNLSET_CABLEHRC	3
-#define CHNLSET_WEUROPE		4
-#define CHNLSET_JPNBCST         5
-#define CHNLSET_JPNCABLE        6
-#define CHNLSET_XUSSR           7
-#define CHNLSET_AUSTRALIA       8
-#define CHNLSET_FRANCE          9
-#define CHNLSET_MIN	        CHNLSET_NABCST
-#define CHNLSET_MAX	        CHNLSET_FRANCE
-
-
-/*
- * constants for various tuner registers
- */
-#define BT848_HUEMIN		(-90)
-#define BT848_HUEMAX		90
-#define BT848_HUECENTER		0
-#define BT848_HUERANGE		179.3
-#define BT848_HUEREGMIN		(-128)
-#define BT848_HUEREGMAX		127
-#define BT848_HUESTEPS		256
-
-#define BT848_BRIGHTMIN		(-50)
-#define BT848_BRIGHTMAX		50
-#define BT848_BRIGHTCENTER	0
-#define BT848_BRIGHTRANGE	99.6
-#define BT848_BRIGHTREGMIN	(-128)
-#define BT848_BRIGHTREGMAX	127
-#define BT848_BRIGHTSTEPS	256
-
-#define BT848_CONTRASTMIN	0
-#define BT848_CONTRASTMAX	237
-#define BT848_CONTRASTCENTER	100
-#define BT848_CONTRASTRANGE	236.57
-#define BT848_CONTRASTREGMIN	0
-#define BT848_CONTRASTREGMAX	511
-#define BT848_CONTRASTSTEPS	512
-
-#define BT848_CHROMAMIN		0
-#define BT848_CHROMAMAX		284
-#define BT848_CHROMACENTER	100
-#define BT848_CHROMARANGE	283.89
-#define BT848_CHROMAREGMIN	0
-#define BT848_CHROMAREGMAX	511
-#define BT848_CHROMASTEPS	512
-
-#define BT848_SATUMIN		0
-#define BT848_SATUMAX		202
-#define BT848_SATUCENTER	100
-#define BT848_SATURANGE		201.18
-#define BT848_SATUREGMIN	0
-#define BT848_SATUREGMAX	511
-#define BT848_SATUSTEPS		512
-
-#define BT848_SATVMIN		0
-#define BT848_SATVMAX		284
-#define BT848_SATVCENTER	100
-#define BT848_SATVRANGE		283.89
-#define BT848_SATVREGMIN	0
-#define BT848_SATVREGMAX	511
-#define BT848_SATVSTEPS		512
-
-
-/*
- * audio stuff
- */
-#define AUDIO_TUNER		0x00	/* command for the audio routine */
-#define AUDIO_EXTERN		0x01	/* don't confuse them with bit */
-#define AUDIO_INTERN		0x02	/* settings */
-#define AUDIO_MUTE		0x80
-#define AUDIO_UNMUTE		0x81
-
-
-/*
- * EEProm stuff
- */
-struct eeProm {
-	short		offset;
-	short		count;
-	unsigned char	bytes[ 256 ];
-};
-
-
-/*
- * XXX: this is a hack, should be in ioctl_meteor.h
- * here to avoid touching that file for now...
- */
-#define	TVTUNER_SETCHNL    _IOW('x', 32, unsigned int)	/* set channel */
-#define	TVTUNER_GETCHNL    _IOR('x', 32, unsigned int)	/* get channel */
-#define	TVTUNER_SETTYPE    _IOW('x', 33, unsigned int)	/* set tuner type */
-#define	TVTUNER_GETTYPE    _IOR('x', 33, unsigned int)	/* get tuner type */
-#define	TVTUNER_GETSTATUS  _IOR('x', 34, unsigned int)	/* get tuner status */
-#define	TVTUNER_SETFREQ    _IOW('x', 35, unsigned int)	/* set frequency */
-#define	TVTUNER_GETFREQ    _IOR('x', 36, unsigned int)	/* get frequency */
- 
-
-#define BT848_SHUE	_IOW('x', 37, int)		/* set hue */
-#define BT848_GHUE	_IOR('x', 37, int)		/* get hue */
-#define	BT848_SBRIG	_IOW('x', 38, int)		/* set brightness */
-#define BT848_GBRIG	_IOR('x', 38, int)		/* get brightness */
-#define	BT848_SCSAT	_IOW('x', 39, int)		/* set chroma sat */
-#define BT848_GCSAT	_IOR('x', 39, int)		/* get UV saturation */
-#define	BT848_SCONT	_IOW('x', 40, int)		/* set contrast */
-#define	BT848_GCONT	_IOR('x', 40, int)		/* get contrast */
-#define	BT848_SVSAT	_IOW('x', 41, int)		/* set chroma V sat */
-#define BT848_GVSAT	_IOR('x', 41, int)		/* get V saturation */
-#define	BT848_SUSAT	_IOW('x', 42, int)		/* set chroma U sat */
-#define BT848_GUSAT	_IOR('x', 42, int)		/* get U saturation */
-
-#define	BT848_SCBARS	_IOR('x', 43, int)		/* set colorbar */
-#define	BT848_CCBARS	_IOR('x', 44, int)		/* clear colorbar */
-
-
-#define	BT848_SAUDIO	_IOW('x', 46, int)		/* set audio channel */
-#define BT848_GAUDIO	_IOR('x', 47, int)		/* get audio channel */
-#define	BT848_SBTSC	_IOW('x', 48, int)		/* set audio channel */
-
-#define	BT848_GSTATUS	_IOR('x', 49, unsigned int)	/* reap status */
-
-#define	BT848_WEEPROM	_IOWR('x', 50, struct eeProm)	/* write to EEProm */
-#define	BT848_REEPROM	_IOWR('x', 51, struct eeProm)	/* read from EEProm */
-
-#define	BT848_SIGNATURE	_IOWR('x', 52, struct eeProm)	/* read card sig */
-
-#define	TVTUNER_SETAFC	_IOW('x', 53, int)		/* turn AFC on/off */
-#define TVTUNER_GETAFC	_IOR('x', 54, int)		/* query AFC on/off */
-#define BT848_SLNOTCH	_IOW('x', 55, int)		/* set luma notch */
-#define BT848_GLNOTCH	_IOR('x', 56, int)		/* get luma notch */
-
-/* Read/Write the BT848's I2C bus directly
- * b7-b0:    data (read/write)
- * b15-b8:   internal peripheral register (write)   
- * b23-b16:  i2c addr (write)
- * b31-b24:  1 = write, 0 = read 
- */
-#define BT848_I2CWR     _IOWR('x', 57, unsigned long)    /* i2c read-write */
-
-struct bktr_msp_control {
-	unsigned char function;
-	unsigned int  address;
-	unsigned int  data;
-};
-
-#define BT848_MSP_RESET _IO('x', 76)				/* MSP chip reset */
-#define BT848_MSP_READ  _IOWR('x', 77, struct bktr_msp_control)	/* MSP chip read */
-#define BT848_MSP_WRITE _IOWR('x', 78, struct bktr_msp_control)	/* MSP chip write */
-
-/* Support for radio tuner */
-#define RADIO_SETMODE	 _IOW('x', 58, unsigned int)  /* set radio modes */
-#define RADIO_GETMODE	 _IOR('x', 58, unsigned char)  /* get radio modes */
-#define   RADIO_AFC	 0x01		/* These modes will probably not */
-#define   RADIO_MONO	 0x02		/*  work on the FRxxxx. It does	 */
-#define   RADIO_MUTE	 0x08		/*  work on the FMxxxx.	*/
-#define RADIO_SETFREQ    _IOW('x', 59, unsigned int)  /* set frequency   */
-#define RADIO_GETFREQ    _IOR('x', 59, unsigned int)  /* set frequency   */
- /*        Argument is frequency*100MHz  */
-
-/*
- * XXX: more bad magic,
- *      we need to fix the METEORGINPUT to return something public
- *      duplicate them here for now...
- */
-#define	METEOR_DEV0		0x00001000
-#define	METEOR_DEV1		0x00002000
-#define	METEOR_DEV2		0x00004000
-#define	METEOR_DEV3		0x00008000
-#define	METEOR_DEV_SVIDEO	0x00006000
-/*
- * right now I don't know were to put these, but as they are suppose to be
- * a part of a common video capture interface, these should be relocated to
- * another place.  Probably most of the METEOR_xxx defines need to be
- * renamed and moved to a common header
- */
-
-typedef enum { METEOR_PIXTYPE_RGB, METEOR_PIXTYPE_YUV,
-	       METEOR_PIXTYPE_YUV_PACKED,
-	       METEOR_PIXTYPE_YUV_12 } METEOR_PIXTYPE;
-
-
-struct meteor_pixfmt {
-	unsigned int   index;         /* Index in supported pixfmt list     */
-	METEOR_PIXTYPE type;          /* What's the board gonna feed us     */
-	unsigned int   Bpp;           /* Bytes per pixel                    */
-	unsigned long  masks[3];      /* R,G,B or Y,U,V masks, respectively */
-	unsigned       swap_bytes :1; /* Bytes  swapped within shorts       */
-	unsigned       swap_shorts:1; /* Shorts swapped within longs        */
-};
-
-
-struct bktr_clip {
-    int          x_min;
-    int          x_max;
-    int          y_min;
-    int          y_max;
-};
-
-#define BT848_MAX_CLIP_NODE 100
-struct _bktr_clip {
-    struct bktr_clip x[BT848_MAX_CLIP_NODE];
-};
-
-/*
- * I'm using METEOR_xxx just because that will be common to other interface
- * and less of a surprise
- */
-#define METEORSACTPIXFMT	_IOW('x', 64, int )
-#define METEORGACTPIXFMT	_IOR('x', 64, int )
-#define METEORGSUPPIXFMT	_IOWR('x', 65, struct meteor_pixfmt)
-
-/* set clip list */
-#define BT848SCLIP     _IOW('x', 66, struct _bktr_clip )
-#define BT848GCLIP     _IOR('x', 66, struct _bktr_clip )
-
-
-/* set input format */
-#define BT848SFMT		_IOW('x', 67, unsigned long )
-#define BT848GFMT		_IOR('x', 67, unsigned long )
-
-/* set clear-buffer-on-start */
-#define BT848SCBUF	_IOW('x', 68, int)
-#define BT848GCBUF	_IOR('x', 68, int)
-
-/* set capture area */
-/* The capture area is the area of the video image which is grabbed */
-/* Usually the capture area is 640x480 (768x576 PAL) pixels */
-/* This area is then scaled to the dimensions the user requires */
-/* using the METEORGEO ioctl */
-/* However, the capture area could be 400x300 pixels from the top right */
-/* corner of the video image */
-struct bktr_capture_area {
-   int      x_offset;
-   int      y_offset;
-   int      x_size;
-   int      y_size;
-};
-#define BT848_SCAPAREA   _IOW('x', 69, struct bktr_capture_area)
-#define BT848_GCAPAREA   _IOR('x', 69, struct bktr_capture_area)
-
-
-/* Get channel Set */
-#define BT848_MAX_CHNLSET_NAME_LEN 16
-struct bktr_chnlset {
-       short   index;
-       short   max_channel;
-       char    name[BT848_MAX_CHNLSET_NAME_LEN];
-};
-#define	TVTUNER_GETCHNLSET _IOWR('x', 70, struct bktr_chnlset)
-
-
-
-/* Infra Red Remote Control */
-struct bktr_remote {
-       unsigned char data[3];
-};
-#define	REMOTE_GETKEY      _IOR('x', 71, struct bktr_remote)/*read the remote */
-                                                            /*control receiver*/
-                                                            /*returns raw data*/
-
- 
-/*
- * Direct access to GPIO pins. You must add BKTR_GPIO_ACCESS to your kernel
- * configuration file to use these 
- */
-#define BT848_GPIO_SET_EN      _IOW('x', 72, int)      /* set gpio_out_en */
-#define BT848_GPIO_GET_EN      _IOR('x', 73, int)      /* get gpio_out_en */
-#define BT848_GPIO_SET_DATA    _IOW('x', 74, int)      /* set gpio_data */
-#define BT848_GPIO_GET_DATA    _IOR('x', 75, int)      /* get gpio_data */
-
-
-
-/*  XXX - Copied from /sys/pci/brktree_reg.h  */
-#define BT848_IFORM_FORMAT              (0x7<<0)
-# define BT848_IFORM_F_RSVD             (0x7)
-# define BT848_IFORM_F_SECAM            (0x6)
-# define BT848_IFORM_F_PALN             (0x5)
-# define BT848_IFORM_F_PALM             (0x4)
-# define BT848_IFORM_F_PALBDGHI         (0x3)
-# define BT848_IFORM_F_NTSCJ            (0x2)
-# define BT848_IFORM_F_NTSCM            (0x1)
-# define BT848_IFORM_F_AUTO             (0x0)
-
-
-#endif	/* _DEV_BKTR_IOCTL_BT848_H_ */
-
diff --git a/include.new/dev/bktr/ioctl_meteor.h b/include.new/dev/bktr/ioctl_meteor.h
deleted file mode 100644
index a97bad2..0000000
--- a/include.new/dev/bktr/ioctl_meteor.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * Copyright (c) 1995 Mark Tinguely and Jim Lowe
- * 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 Mark Tinguely and Jim Lowe
- * 4. 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 ``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 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: releng/10.2/sys/dev/bktr/ioctl_meteor.h 205781 2010-03-28 00:10:09Z gibbs $
- */
-/*
- *	ioctl constants for Matrox Meteor Capture card.
- */
-
-#ifndef	_DEV_BKTR_IOCTL_METEOR_H_
-#define	_DEV_BKTR_IOCTL_METEOR_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-struct meteor_capframe {
-	short	command;	/* see below for valid METEORCAPFRM commands */
-	short	lowat;		/* start transfer if < this number */
-	short	hiwat;		/* stop transfer if > this number */
-} ;
-
-/* structure for METEOR[GS]ETGEO - get/set geometry  */
-struct meteor_geomet {
-	unsigned short		rows;
-	unsigned short		columns;
-	unsigned short		frames;
-	unsigned long		oformat;
-} ;
-
-/* structure for METEORGCOUNT-get count of frames, fifo errors and dma errors */
-struct meteor_counts {
-	unsigned long fifo_errors;	/* count of fifo errors since open */
-	unsigned long dma_errors;	/* count of dma errors since open */
-	unsigned long frames_captured;	/* count of frames captured since open */
-	unsigned long even_fields_captured; /* count of even fields captured */
-	unsigned long odd_fields_captured; /* count of odd fields captured */
-} ;
-
-/* structure for getting and setting direct transfers to vram */
-struct meteor_video {
-	unsigned long	addr;		/* Address of location to dma to */
-	unsigned long	width;		/* Width of memory area */
-	unsigned long	banksize;	/* Size of Vram bank */
-	unsigned long	ramsize;	/* Size of Vram */
-};
-
-#define METEORCAPTUR _IOW('x', 1, int)			 /* capture a frame */
-#define METEORCAPFRM _IOW('x', 2, struct meteor_capframe)  /* sync capture */
-#define METEORSETGEO _IOW('x', 3, struct meteor_geomet)  /* set geometry */
-#define METEORGETGEO _IOR('x', 4, struct meteor_geomet)  /* get geometry */
-#define METEORSTATUS _IOR('x', 5, unsigned short)	/* get status */
-#define METEORSHUE   _IOW('x', 6, signed char)		/* set hue */
-#define METEORGHUE   _IOR('x', 6, signed char)		/* get hue */
-#define METEORSFMT   _IOW('x', 7, unsigned long)	/* set format */
-#define METEORGFMT   _IOR('x', 7, unsigned long)	/* get format */
-#define METEORSINPUT _IOW('x', 8, unsigned long)	/* set input dev */
-#define METEORGINPUT _IOR('x', 8, unsigned long)	/* get input dev */
-#define	METEORSCHCV  _IOW('x', 9, unsigned char)	/* set uv gain */
-#define	METEORGCHCV  _IOR('x', 9, unsigned char)	/* get uv gain */
-#define	METEORSCOUNT _IOW('x',10, struct meteor_counts)
-#define	METEORGCOUNT _IOR('x',10, struct meteor_counts)
-#define METEORSFPS   _IOW('x',11, unsigned short)	/* set fps */
-#define METEORGFPS   _IOR('x',11, unsigned short)	/* get fps */
-#define METEORSSIGNAL _IOW('x', 12, unsigned int)	/* set signal */
-#define METEORGSIGNAL _IOR('x', 12, unsigned int)	/* get signal */
-#define	METEORSVIDEO _IOW('x', 13, struct meteor_video)	/* set video */
-#define	METEORGVIDEO _IOR('x', 13, struct meteor_video)	/* get video */
-#define	METEORSBRIG  _IOW('x', 14, unsigned char)	/* set brightness */
-#define METEORGBRIG  _IOR('x', 14, unsigned char)	/* get brightness */
-#define	METEORSCSAT  _IOW('x', 15, unsigned char)	/* set chroma sat */
-#define METEORGCSAT  _IOR('x', 15, unsigned char)	/* get uv saturation */
-#define	METEORSCONT  _IOW('x', 16, unsigned char)	/* set contrast */
-#define	METEORGCONT  _IOR('x', 16, unsigned char)	/* get contrast */
-#define METEORSBT254 _IOW('x', 17, unsigned short)	/* set Bt254 reg */
-#define METEORGBT254 _IOR('x', 17, unsigned short)	/* get Bt254 reg */
-#define METEORSHWS   _IOW('x', 18, unsigned char)	/* set hor start reg */
-#define METEORGHWS   _IOR('x', 18, unsigned char)	/* get hor start reg */
-#define METEORSVWS   _IOW('x', 19, unsigned char)	/* set vert start reg */
-#define METEORGVWS   _IOR('x', 19, unsigned char)	/* get vert start reg */
-#define	METEORSTS    _IOW('x', 20, unsigned char)	/* set time stamp */
-#define	METEORGTS    _IOR('x', 20, unsigned char)	/* get time stamp */
-
-#define	METEOR_STATUS_ID_MASK	0xf000	/* ID of 7196 */
-#define	METEOR_STATUS_DIR	0x0800	/* Direction of Expansion port YUV */
-#define	METEOR_STATUS_OEF	0x0200	/* Field detected: Even/Odd */
-#define	METEOR_STATUS_SVP	0x0100	/* State of VRAM Port:inactive/active */
-#define	METEOR_STATUS_STTC	0x0080	/* Time Constant: TV/VCR */
-#define	METEOR_STATUS_HCLK	0x0040	/* Horiz PLL: locked/unlocked */
-#define	METEOR_STATUS_FIDT	0x0020	/* Field detect: 50/60hz */
-#define	METEOR_STATUS_ALTD	0x0002	/* Line alt: no line alt/line alt */
-#define METEOR_STATUS_CODE	0x0001	/* Colour info: no colour/colour */
-
-				/* METEORCAPTUR capture options */
-#define METEOR_CAP_SINGLE	0x0001	/* capture one frame */
-#define METEOR_CAP_CONTINOUS	0x0002	/* continuously capture */
-#define METEOR_CAP_STOP_CONT	0x0004	/* stop the continuous capture */
-
-				/* METEORCAPFRM capture commands */
-#define METEOR_CAP_N_FRAMES	0x0001	/* capture N frames */
-#define METEOR_CAP_STOP_FRAMES	0x0002	/* stop capture N frames */
-#define	METEOR_HALT_N_FRAMES	0x0003	/* halt of capture N frames */
-#define METEOR_CONT_N_FRAMES	0x0004	/* continue after above halt */
-
-				/* valid video input formats:  */
-#define METEOR_FMT_NTSC		0x00100	/* NTSC --  initialized default */
-#define METEOR_FMT_PAL		0x00200	/* PAL */
-#define METEOR_FMT_SECAM	0x00400	/* SECAM */
-#define METEOR_FMT_AUTOMODE	0x00800 /* auto-mode */
-#define METEOR_INPUT_DEV0	0x01000	/* camera input 0 -- default */
-#define METEOR_INPUT_DEV_RCA	METEOR_INPUT_DEV0
-#define METEOR_INPUT_DEV1	0x02000	/* camera input 1 */
-#define METEOR_INPUT_DEV2	0x04000	/* camera input 2 */
-#define METEOR_INPUT_DEV3	0x08000	/* camera input 3 */
-#define METEOR_INPUT_DEV_RGB	0x0a000	/* for rgb version of meteor */
-#define METEOR_INPUT_DEV_SVIDEO	0x06000 /* S-video input port */
-
-				/* valid video output formats:  */
-#define METEOR_GEO_RGB16	0x0010000 /* packed -- initialized default */
-#define METEOR_GEO_RGB24	0x0020000 /* RBG 24 bits packed */
-					  /* internally stored in 32 bits */
-#define METEOR_GEO_YUV_PACKED	0x0040000 /* 4-2-2 YUV 16 bits packed */
-#define METEOR_GEO_YUV_PLANAR	0x0080000 /* 4-2-2 YUV 16 bits planer */
-#define METEOR_GEO_YUV_PLANER	METEOR_GEO_YUV_PLANAR
-#define METEOR_GEO_UNSIGNED	0x0400000 /* unsigned uv outputs */
-#define METEOR_GEO_EVEN_ONLY	0x1000000 /* set for even only field capture */
-#define METEOR_GEO_ODD_ONLY	0x2000000 /* set for odd only field capture */
-#define METEOR_GEO_FIELD_MASK	0x3000000
-#define METEOR_GEO_YUV_422	0x4000000 /* 4-2-2 YUV in Y-U-V combined */
-#define METEOR_GEO_OUTPUT_MASK	0x40f0000
-#define METEOR_GEO_YUV_12	0x10000000	/* YUV 12 format */
-#define METEOR_GEO_YUV_9	0x40000000	/* YUV 9 format */
-
-#define	METEOR_FIELD_MODE	0x80000000	/* Field cap or Frame cap */
-
-#define	METEOR_SIG_MODE_MASK	0xffff0000
-#define	METEOR_SIG_FRAME	0x00000000	/* signal every frame */
-#define	METEOR_SIG_FIELD	0x00010000	/* signal every field */
-
-	/* following structure is used to coordinate the synchronous */
-	   
-struct meteor_mem {
-		/* kernel write only  */
-	int	frame_size;	 /* row*columns*depth */
-	unsigned num_bufs;	 /* number of frames in buffer (1-32) */
-		/* user and kernel change these */
-	int	lowat;		 /* kernel starts capture if < this number */
-	int	hiwat;		 /* kernel stops capture if > this number.
-				    hiwat <= numbufs */
-	unsigned active;	 /* bit mask of active frame buffers
-				    kernel sets, user clears */
-	int	num_active_bufs; /* count of active frame buffer
-				    kernel increments, user decrements */
-
-		/* reference to mmapped data */
-	caddr_t	buf;		 /* The real space (virtual addr) */
-} ;
-
-#endif /* !_DEV_BKTR_IOCTL_METEOR_H_ */
diff --git a/include.new/dev/ciss/cissio.h b/include.new/dev/ciss/cissio.h
deleted file mode 100644
index 66c7535..0000000
--- a/include.new/dev/ciss/cissio.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/*-
- * Copyright (c) 2001 Michael Smith
- * 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.
- *
- * 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: releng/10.2/sys/dev/ciss/cissio.h 180454 2008-07-11 21:20:51Z scottl $
- */
-
-/*
- * Driver ioctl interface.
- *
- * Note that this interface is API-compatible with the Linux implementation
- * except as noted, and thus this header bears a striking resemblance to 
- * the Linux driver's cciss_ioctl.h.
- *
- */
-
-#include <sys/ioccom.h>
-
-#pragma pack(1)
-
-typedef struct
-{
-    u_int8_t	bus;
-    u_int8_t	dev_fn;
-    uint32_t	board_id;
-} cciss_pci_info_struct; 
-
-typedef struct
-{
-    uint32_t	delay;
-    uint32_t	count;
-} cciss_coalint_struct;
-
-typedef char		NodeName_type[16];
-typedef uint32_t	Heartbeat_type;
-
-#define CISS_PARSCSIU2	0x0001
-#define CISS_PARCSCIU3	0x0002
-#define CISS_FIBRE1G	0x0100
-#define CISS_FIBRE2G	0x0200
-typedef uint32_t	BusTypes_type;
-
-typedef char		FirmwareVer_type[4];
-typedef uint32_t	DriverVer_type;
-
-/* passthrough command definitions */
-#define SENSEINFOBYTES          32
-#define CISS_MAX_LUN		16	
-#define LEVEL2LUN		1
-#define LEVEL3LUN		0
-
-/* command status value */
-#define CMD_SUCCESS		0x0000
-#define CMD_TARGET_STATUS	0x0001
-#define CMD_DATA_UNDERRUN	0x0002
-#define CMD_DATA_OVERRUN	0x0003
-#define CMD_INVALID		0x0004
-#define CMD_PROTOCOL_ERR	0x0005
-#define CMD_HARDWARE_ERR	0x0006
-#define CMD_CONNECTION_LOST	0x0007
-#define CMD_ABORTED		0x0008
-#define CMD_ABORT_FAILED	0x0009
-#define CMD_UNSOLICITED_ABORT	0x000A
-#define CMD_TIMEOUT		0x000B
-#define CMD_UNABORTABLE		0x000C
-
-/* transfer direction */
-#define XFER_NONE		0x00
-#define XFER_WRITE		0x01
-#define XFER_READ		0x02
-#define XFER_RSVD		0x03
-
-/* task attribute */
-#define ATTR_UNTAGGED		0x00
-#define ATTR_SIMPLE		0x04
-#define ATTR_HEADOFQUEUE	0x05
-#define ATTR_ORDERED		0x06
-#define ATTR_ACA		0x07
-
-/* CDB type */
-#define TYPE_CMD		0x00
-#define TYPE_MSG		0x01
-
-/* command list structure */
-typedef union {
-    struct {
-	u_int8_t	Dev;
-	u_int8_t	Bus:6;
-	u_int8_t	Mode:2;
-    } __packed PeripDev;
-    struct {
-	u_int8_t	DevLSB;
-	u_int8_t	DevMSB:6;
-	u_int8_t	Mode:2;
-    } __packed LogDev;
-    struct {
-	u_int8_t	Dev:5;
-	u_int8_t	Bus:3;
-	u_int8_t	Targ:6;
-	u_int8_t	Mode:2;
-    } __packed LogUnit;
-} SCSI3Addr_struct;
-
-typedef struct {
-    uint32_t		TargetId:24;
-    uint32_t		Bus:6;
-    uint32_t		Mode:2;
-    SCSI3Addr_struct	Target[2];
-} __packed PhysDevAddr_struct;
-  
-typedef struct {
-    uint32_t		VolId:30;
-    uint32_t		Mode:2;
-    u_int8_t		reserved[4];
-} __packed LogDevAddr_struct;
-
-typedef union {
-    u_int8_t		LunAddrBytes[8];
-    SCSI3Addr_struct	SCSI3Lun[4];
-    PhysDevAddr_struct	PhysDev;
-    LogDevAddr_struct	LogDev;
-} __packed LUNAddr_struct;
-
-typedef struct {
-    u_int8_t	CDBLen;
-    struct {
-	u_int8_t	Type:3;
-	u_int8_t	Attribute:3;
-	u_int8_t	Direction:2;
-    } __packed Type;
-    u_int16_t	Timeout;
-    u_int8_t	CDB[16];
-} __packed RequestBlock_struct;
-
-typedef union {
-    struct {
-	u_int8_t	Reserved[3];
-	u_int8_t	Type;
-	uint32_t	ErrorInfo;
-    } __packed Common_Info;
-    struct {
-	u_int8_t	Reserved[2];
-	u_int8_t	offense_size;
-	u_int8_t	offense_num;
-	uint32_t	offense_value;
-    } __packed Invalid_Cmd;
-} __packed MoreErrInfo_struct;
-
-typedef struct {
-    u_int8_t		ScsiStatus;
-    u_int8_t		SenseLen;
-    u_int16_t		CommandStatus;
-    uint32_t		ResidualCnt;
-    MoreErrInfo_struct	MoreErrInfo;
-    u_int8_t		SenseInfo[SENSEINFOBYTES];
-} __packed ErrorInfo_struct;
-
-typedef struct {
-    LUNAddr_struct	LUN_info;	/* 8 */
-    RequestBlock_struct	Request;	/* 20 */
-    ErrorInfo_struct	error_info;	/* 48 */
-    u_int16_t		buf_size;	/* 2 */
-    u_int8_t		*buf;		/* 4 */
-} __packed IOCTL_Command_struct;
-
-#ifdef __amd64__
-typedef struct {
-    LUNAddr_struct	LUN_info;	/* 8 */
-    RequestBlock_struct	Request;	/* 20 */
-    ErrorInfo_struct	error_info;	/* 48 */
-    u_int16_t		buf_size;	/* 2 */
-    uint32_t		buf;		/* 4 */
-} __packed IOCTL_Command_struct32;
-#endif
-
-/************************************************************************
- * Command queue statistics
- */
-
-#define CISSQ_FREE	0
-#define CISSQ_NOTIFY	1
-#define CISSQ_COUNT	2
-
-struct ciss_qstat {
-    uint32_t		q_length;
-    uint32_t		q_max;
-};
-
-union ciss_statrequest {
-    uint32_t		cs_item;
-    struct ciss_qstat	cs_qstat;
-};
-
-/*
- * Note that we'd normally pass the struct in directly, but
- * this code is trying to be compatible with other drivers.
- */
-#define CCISS_GETPCIINFO	_IOR ('C', 200, cciss_pci_info_struct)
-#define CCISS_GETINTINFO	_IOR ('C', 201, cciss_coalint_struct)
-#define CCISS_SETINTINFO	_IOW ('C', 202, cciss_coalint_struct)
-#define CCISS_GETNODENAME	_IOR ('C', 203, NodeName_type)
-#define CCISS_SETNODENAME	_IOW ('C', 204, NodeName_type)
-#define CCISS_GETHEARTBEAT	_IOR ('C', 205, Heartbeat_type)
-#define CCISS_GETBUSTYPES	_IOR ('C', 206, BusTypes_type)
-#define CCISS_GETFIRMVER	_IOR ('C', 207, FirmwareVer_type)
-#define CCISS_GETDRIVERVER	_IOR ('C', 208, DriverVer_type)
-#define CCISS_REVALIDVOLS	_IO  ('C', 209)
-#define CCISS_PASSTHRU		_IOWR ('C', 210, IOCTL_Command_struct)
-#ifdef __amd64
-#define CCISS_PASSTHRU32	_IOWR ('C', 210, IOCTL_Command_struct32)
-#endif
-#define CCISS_GETQSTATS		_IOWR ('C', 211, union ciss_statrequest)
-
-#pragma pack()
diff --git a/include.new/dev/ciss/cissreg.h b/include.new/dev/ciss/cissreg.h
deleted file mode 100644
index ff6c31b..0000000
--- a/include.new/dev/ciss/cissreg.h
+++ /dev/null
@@ -1,858 +0,0 @@
-/*-
- * Copyright (c) 2001 Michael Smith
- * 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.
- *
- * 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: releng/10.2/sys/dev/ciss/cissreg.h 268955 2014-07-21 20:08:53Z sbruno $
- */
-
-/*
- * Structure and I/O definitions for the Command Interface for SCSI-3 Support.
- *
- * Data in command CDBs are in big-endian format.  All other data is little-endian.
- * This header only supports little-endian hosts at this time.
- */
-
-union ciss_device_address
-{
-    struct 				/* MODE_PERIPHERAL and MODE_MASK_PERIPHERAL */
-    {
-	uint32_t	target:24;	/* SCSI target */
-	uint32_t	bus:6;		/* SCSI bus */
-	uint32_t	mode:2;		/* CISS_HDR_ADDRESS_MODE_* */
-	uint32_t	extra_address;	/* SCSI-3 level-2 and level-3 address bytes */
-    } physical;
-    struct 				/* MODE_LOGICAL */
-    {
-	uint32_t	lun:30;		/* logical device ID */
-	uint32_t	mode:2;		/* CISS_HDR_ADDRESS_MODE_LOGICAL */
-	uint32_t	:32;		/* reserved */
-    } logical;
-    struct
-    {
-	uint32_t	:30;
-	uint32_t	mode:2;
-	uint32_t	:32;
-    } mode;
-};
-#define CISS_HDR_ADDRESS_MODE_PERIPHERAL	0x0
-#define CISS_HDR_ADDRESS_MODE_LOGICAL		0x1
-#define CISS_HDR_ADDRESS_MODE_MASK_PERIPHERAL	0x3
-
-#define CISS_EXTRA_MODE2(extra)		((extra & 0xc0000000) >> 30)
-#define CISS_EXTRA_BUS2(extra)		((extra & 0x3f000000) >> 24)
-#define CISS_EXTRA_TARGET2(extra)	((extra & 0x00ff0000) >> 16)
-#define CISS_EXTRA_MODE3(extra)		((extra & 0x0000c000) >> 14)
-#define CISS_EXTRA_BUS3(extra)		((extra & 0x00003f00) >> 8)
-#define CISS_EXTRA_TARGET3(extra)	((extra & 0x000000ff))
-
-struct ciss_header
-{
-    u_int8_t	:8;			/* reserved */
-    u_int8_t	sg_in_list;		/* SG's in the command structure */
-    u_int16_t	sg_total;		/* total count of SGs for this command */
-    uint32_t	host_tag;		/* host identifier, bits 0&1 must be clear */
-#define CISS_HDR_HOST_TAG_ERROR	(1<<1)
-    uint32_t	host_tag_zeroes;	/* tag is 64 bits, but interface only supports 32 */
-    union ciss_device_address address;
-} __packed;
-
-struct ciss_cdb
-{
-    u_int8_t	cdb_length;		/* valid CDB bytes */
-    u_int8_t	type:3;
-#define CISS_CDB_TYPE_COMMAND			0
-#define CISS_CDB_TYPE_MESSAGE			1
-    u_int8_t	attribute:3;
-#define CISS_CDB_ATTRIBUTE_UNTAGGED		0
-#define CISS_CDB_ATTRIBUTE_SIMPLE		4
-#define CISS_CDB_ATTRIBUTE_HEAD_OF_QUEUE	5
-#define CISS_CDB_ATTRIBUTE_ORDERED		6
-#define CISS_CDB_ATTRIBUTE_AUTO_CONTINGENT	7
-    u_int8_t	direction:2;
-#define CISS_CDB_DIRECTION_NONE			0
-#define CISS_CDB_DIRECTION_WRITE		1
-#define CISS_CDB_DIRECTION_READ			2
-    u_int16_t	timeout;		/* seconds */
-#define CISS_CDB_BUFFER_SIZE	16
-    u_int8_t	cdb[CISS_CDB_BUFFER_SIZE];
-} __packed;
-
-struct ciss_error_info_pointer
-{
-    u_int64_t	error_info_address;	/* points to ciss_error_info structure */
-    uint32_t	error_info_length;
-} __packed;
-
-struct ciss_error_info
-{
-    u_int8_t	scsi_status;
-#define CISS_SCSI_STATUS_GOOD			0x00	/* these are scsi-standard values */
-#define CISS_SCSI_STATUS_CHECK_CONDITION	0x02
-#define CISS_SCSI_STATUS_CONDITION_MET		0x04
-#define CISS_SCSI_STATUS_BUSY			0x08
-#define CISS_SCSI_STATUS_INDETERMINATE		0x10
-#define CISS_SCSI_STATUS_INDETERMINATE_CM	0x14
-#define CISS_SCSI_STATUS_RESERVATION_CONFLICT	0x18
-#define CISS_SCSI_STATUS_COMMAND_TERMINATED	0x22
-#define CISS_SCSI_STATUS_QUEUE_FULL		0x28
-#define CISS_SCSI_STATUS_ACA_ACTIVE		0x30
-    u_int8_t	sense_length;
-    u_int16_t	command_status;
-#define CISS_CMD_STATUS_SUCCESS			0
-#define CISS_CMD_STATUS_TARGET_STATUS		1
-#define CISS_CMD_STATUS_DATA_UNDERRUN		2
-#define CISS_CMD_STATUS_DATA_OVERRUN		3
-#define CISS_CMD_STATUS_INVALID_COMMAND		4
-#define CISS_CMD_STATUS_PROTOCOL_ERROR		5
-#define CISS_CMD_STATUS_HARDWARE_ERROR		6
-#define CISS_CMD_STATUS_CONNECTION_LOST		7
-#define CISS_CMD_STATUS_ABORTED			8
-#define CISS_CMD_STATUS_ABORT_FAILED		9
-#define CISS_CMD_STATUS_UNSOLICITED_ABORT	10
-#define CISS_CMD_STATUS_TIMEOUT			11
-#define CISS_CMD_STATUS_UNABORTABLE		12
-    uint32_t	residual_count;
-    union {
-	struct {
-	    u_int8_t	res1[3];
-	    u_int8_t	type;
-	    uint32_t	error_info;
-	} __packed common_info;
-	struct {
-	    u_int8_t	res1[2];
-	    u_int8_t	offense_size;
-	    u_int8_t	offense_offset;
-	    uint32_t	offense_value;
-	} __packed invalid_command;
-    } additional_error_info;
-    u_int8_t	sense_info[0];
-} __packed;
-
-struct ciss_sg_entry
-{
-    u_int64_t	address;
-#define CISS_SG_ADDRESS_BITBUCKET	(~(u_int64_t)0)
-    uint32_t	length;
-    uint32_t	:31;
-    uint32_t	extension:1;		/* address points to another s/g chain */
-} __packed;
-
-struct ciss_command
-{
-    struct ciss_header			header;
-    struct ciss_cdb			cdb;
-    struct ciss_error_info_pointer	error_info;
-    struct ciss_sg_entry		sg[0];
-} __packed;
-
-#define CISS_OPCODE_REPORT_LOGICAL_LUNS		0xc2
-#define CISS_OPCODE_REPORT_PHYSICAL_LUNS	0xc3
-
-struct ciss_lun_report
-{
-    uint32_t	list_size;		/* big-endian */
-    uint32_t	:32;
-    union ciss_device_address lun[0];
-} __packed;
-
-#define	CISS_VPD_LOGICAL_DRIVE_GEOMETRY		0xc1
-struct ciss_ldrive_geometry
-{
-    u_int8_t	periph_qualifier:3;
-    u_int8_t	periph_devtype:5;
-    u_int8_t	page_code;
-    u_int8_t	res1;
-    u_int8_t	page_length;
-    u_int16_t	cylinders;		/* big-endian */
-    u_int8_t	heads;
-    u_int8_t	sectors;
-    u_int8_t	fault_tolerance;
-    u_int8_t	res2[3];
-} __attribute__ ((packed));
-
-struct ciss_report_cdb
-{
-    u_int8_t	opcode;
-    u_int8_t	reserved[5];
-    uint32_t	length;			/* big-endian */
-    u_int8_t	:8;
-    u_int8_t	control;
-} __packed;
-
-/*
- * Note that it's not clear whether we have to set the detail field to
- * the tag of the command to be aborted, or the tag field in the command itself;
- * documentation conflicts on this.
- */
-#define CISS_OPCODE_MESSAGE_ABORT		0x00
-#define CISS_MESSAGE_ABORT_TASK			0x00
-#define CISS_MESSAGE_ABORT_TASK_SET		0x01
-#define CISS_MESSAGE_ABORT_CLEAR_ACA		0x02
-#define CISS_MESSAGE_ABORT_CLEAR_TASK_SET	0x03
-
-#define CISS_OPCODE_MESSAGE_RESET		0x01
-#define CISS_MESSAGE_RESET_CONTROLLER		0x00
-#define CISS_MESSAGE_RESET_BUS			0x01
-#define CISS_MESSAGE_RESET_TARGET		0x03
-#define CISS_MESSAGE_RESET_LOGICAL_UNIT		0x04
-
-#define CISS_OPCODE_MESSAGE_SCAN		0x02
-#define CISS_MESSAGE_SCAN_CONTROLLER		0x00
-#define CISS_MESSAGE_SCAN_BUS			0x01
-#define CISS_MESSAGE_SCAN_TARGET		0x03
-#define CISS_MESSAGE_SCAN_LOGICAL_UNIT		0x04
-
-#define CISS_OPCODE_MESSAGE_NOP			0x03
-
-struct ciss_message_cdb
-{
-    u_int8_t	opcode;
-    u_int8_t	type;
-    u_int16_t	:16;
-    uint32_t	abort_tag;					/* XXX endianness? */
-    u_int8_t	reserved[8];
-} __packed;
-
-/*
- * CISS vendor-specific commands/messages.
- *
- * Note that while messages and vendor-specific commands are
- * differentiated, they are handled in basically the same way and can
- * be considered to be basically the same thing, as long as the cdb
- * type field is set correctly.
- */
-#define CISS_OPCODE_READ		0xc0
-#define CISS_OPCODE_WRITE		0xc1
-#define CISS_COMMAND_NOTIFY_ON_EVENT	0xd0
-#define CISS_COMMAND_ABORT_NOTIFY	0xd1
-
-struct ciss_notify_cdb
-{
-    u_int8_t	opcode;
-    u_int8_t	command;
-    u_int8_t	res1[2];
-    u_int16_t	timeout;		/* seconds, little-endian */
-    u_int8_t	res2;			/* reserved */
-    u_int8_t	synchronous:1;		/* return immediately */
-    u_int8_t	ordered:1;		/* return events in recorded order */
-    u_int8_t	seek_to_oldest:1;	/* reset read counter to oldest event */
-    u_int8_t	new_only:1;		/* ignore any queued events */
-    u_int8_t	:4;
-    uint32_t	length;			/* must be 512, little-endian */
-#define CISS_NOTIFY_DATA_SIZE	512
-    u_int8_t	control;
-} __packed;
-
-#define CISS_NOTIFY_NOTIFIER		0
-#define CISS_NOTIFY_NOTIFIER_STATUS		0
-#define CISS_NOTIFY_NOTIFIER_PROTOCOL		1
-
-#define CISS_NOTIFY_HOTPLUG		1
-#define CISS_NOTIFY_HOTPLUG_PHYSICAL		0
-#define CISS_NOTIFY_HOTPLUG_POWERSUPPLY		1
-#define CISS_NOTIFY_HOTPLUG_FAN			2
-#define CISS_NOTIFY_HOTPLUG_POWER		3
-#define CISS_NOTIFY_HOTPLUG_REDUNDANT		4
-#define CISS_NOTIFY_HOTPLUG_NONDISK		5
-
-#define CISS_NOTIFY_HARDWARE		2
-#define CISS_NOTIFY_HARDWARE_CABLES		0
-#define CISS_NOTIFY_HARDWARE_MEMORY		1
-#define CISS_NOTIFY_HARDWARE_FAN		2
-#define CISS_NOTIFY_HARDWARE_VRM		3
-
-#define CISS_NOTIFY_ENVIRONMENT		3
-#define CISS_NOTIFY_ENVIRONMENT_TEMPERATURE	0
-#define CISS_NOTIFY_ENVIRONMENT_POWERSUPPLY	1
-#define CISS_NOTIFY_ENVIRONMENT_CHASSIS		2
-#define CISS_NOTIFY_ENVIRONMENT_POWER		3
-
-#define CISS_NOTIFY_PHYSICAL		4
-#define CISS_NOTIFY_PHYSICAL_STATE		0
-
-#define CISS_NOTIFY_LOGICAL		5
-#define CISS_NOTIFY_LOGICAL_STATUS		0
-#define CISS_NOTIFY_LOGICAL_ERROR		1
-#define CISS_NOTIFY_LOGICAL_SURFACE		2
-
-#define CISS_NOTIFY_REDUNDANT		6
-#define CISS_NOTIFY_REDUNDANT_STATUS		0
-
-#define CISS_NOTIFY_CISS		8
-#define CISS_NOTIFY_CISS_REDUNDANT_CHANGE	0
-#define CISS_NOTIFY_CISS_PATH_STATUS		1
-#define CISS_NOTIFY_CISS_HARDWARE_ERROR		2
-#define CISS_NOTIFY_CISS_LOGICAL		3
-
-struct ciss_notify_drive
-{
-    u_int16_t	physical_drive_number;
-    u_int8_t	configured_drive_flag;
-    u_int8_t	spare_drive_flag;
-    u_int8_t	big_physical_drive_number;
-    u_int8_t	enclosure_bay_number;
-} __packed;
-
-struct ciss_notify_locator
-{
-    u_int16_t	port;
-    u_int16_t	id;
-    u_int16_t	box;
-} __packed;
-
-struct ciss_notify_redundant_controller
-{
-    u_int16_t	slot;
-} __packed;
-
-struct ciss_notify_logical_status
-{
-    u_int16_t	logical_drive;
-    u_int8_t	previous_state;
-    u_int8_t	new_state;
-    u_int8_t	spare_state;
-} __packed;
-
-struct ciss_notify_rebuild_aborted
-{
-    u_int16_t	logical_drive;
-    u_int8_t	replacement_drive;
-    u_int8_t	error_drive;
-    u_int8_t	big_replacement_drive;
-    u_int8_t	big_error_drive;
-} __packed;
-
-struct ciss_notify_io_error
-{
-    u_int16_t	logical_drive;
-    uint32_t	lba;
-    u_int16_t	block_count;
-    u_int8_t	command;
-    u_int8_t	failure_bus;
-    u_int8_t	failure_drive;
-    u_int64_t	big_lba;
-} __packed;
-
-struct ciss_notify_consistency_completed
-{
-    u_int16_t	logical_drive;
-} __packed;
-
-struct ciss_notify
-{
-    uint32_t	timestamp;		/* seconds since controller power-on */
-    u_int16_t	class;
-    u_int16_t	subclass;
-    u_int16_t	detail;
-    union
-    {
-	struct ciss_notify_drive		drive;
-	struct ciss_notify_locator		location;
-	struct ciss_notify_redundant_controller	redundant_controller;
-	struct ciss_notify_logical_status	logical_status;
-	struct ciss_notify_rebuild_aborted	rebuild_aborted;
-	struct ciss_notify_io_error		io_error;
-	struct ciss_notify_consistency_completed consistency_completed;
-	u_int8_t	data[64];
-    } data;
-    char	message[80];
-    uint32_t	tag;
-    u_int16_t	date;
-    u_int16_t	year;
-    uint32_t	time;
-    u_int16_t	pre_power_up_time;
-    union ciss_device_address	device;
-    /* XXX pads to 512 bytes */
-} __packed;
-
-/*
- * CISS config table, which describes the controller's
- * supported interface(s) and capabilities.
- *
- * This is mapped directly via PCI.
- */
-struct ciss_config_table
-{
-    char	signature[4];		/* "CISS" */
-    uint32_t	valence;
-    uint32_t	supported_methods;
-#define CISS_TRANSPORT_METHOD_READY	(1<<0)
-#define CISS_TRANSPORT_METHOD_SIMPLE	(1<<1)
-#define CISS_TRANSPORT_METHOD_PERF	(1<<2)
-    uint32_t	active_method;
-    uint32_t	requested_method;
-    uint32_t	command_physlimit;
-    uint32_t	interrupt_coalesce_delay;
-    uint32_t	interrupt_coalesce_count;
-    uint32_t	max_outstanding_commands;
-    uint32_t	bus_types;
-#define CISS_TRANSPORT_BUS_TYPE_ULTRA2	(1<<0)
-#define CISS_TRANSPORT_BUS_TYPE_ULTRA3	(1<<1)
-#define CISS_TRANSPORT_BUS_TYPE_FIBRE1	(1<<8)
-#define CISS_TRANSPORT_BUS_TYPE_FIBRE2	(1<<9)
-    uint32_t	transport_offset;
-    char	server_name[16];
-    uint32_t	heartbeat;
-    uint32_t	host_driver;
-#define CISS_DRIVER_SUPPORT_UNIT_ATTENTION	(1<<0)
-#define CISS_DRIVER_QUICK_INIT			(1<<1)
-#define CISS_DRIVER_INTERRUPT_ON_LOCKUP		(1<<2)
-#define CISS_DRIVER_SUPPORT_MIXED_Q_TAGS	(1<<3)
-#define CISS_DRIVER_HOST_IS_ALPHA		(1<<4)
-#define CISS_DRIVER_MULTI_LUN_SUPPORT		(1<<5)
-#define CISS_DRIVER_MESSAGE_REQUESTS_SUPPORTED	(1<<7)
-#define CISS_DRIVER_DAUGHTER_ATTACHED		(1<<8)
-#define CISS_DRIVER_SCSI_PREFETCH		(1<<9)
-    uint32_t	max_sg_length;		/* 31 in older firmware */
-/*
- * these fields appear in OpenCISS Spec 1.06
- * http://cciss.sourceforge.net/#docs
- */
-    uint32_t	max_logical_supported;
-    uint32_t	max_physical_supported;
-    uint32_t	max_physical_per_logical;
-    uint32_t	max_perfomant_mode_cmds;
-    uint32_t	max_block_fetch_count;
-} __packed;
-
-/*
- * Configuration table for the Performant transport.  Only 4 request queues
- * are mentioned in this table, though apparently up to 256 can exist.
- */
-struct ciss_perf_config {
-    uint32_t	fetch_count[8];
-#define CISS_SG_FETCH_MAX	0
-#define CISS_SG_FETCH_1		1
-#define CISS_SG_FETCH_2		2
-#define CISS_SG_FETCH_4		3
-#define CISS_SG_FETCH_8		4
-#define CISS_SG_FETCH_16	5
-#define CISS_SG_FETCH_32	6
-#define CISS_SG_FETCH_NONE	7
-    uint32_t	rq_size;
-    uint32_t	rq_count;
-    uint32_t	rq_bank_lo;
-    uint32_t	rq_bank_hi;
-    struct {
-	uint32_t	rq_addr_lo;
-	uint32_t	rq_addr_hi;
-    } __packed rq[4];
-} __packed;
-
-/*
- * In a flagrant violation of what CISS seems to be meant to be about,
- * Compaq recycle a goodly portion of their previous generation's
- * command set (and all the legacy baggage related to a design
- * originally aimed at narrow SCSI) through the Array Controller Read
- * and Array Controller Write interface.
- *
- * Command ID values here can be looked up for in the
- * publically-available documentation for the older controllers; note
- * that the command layout is necessarily different to fit within the
- * CDB.
- */
-#define CISS_ARRAY_CONTROLLER_READ	0x26
-#define CISS_ARRAY_CONTROLLER_WRITE	0x27
-
-#define CISS_BMIC_ID_LDRIVE		0x10
-#define CISS_BMIC_ID_CTLR		0x11
-#define CISS_BMIC_ID_LSTATUS		0x12
-#define CISS_BMIC_ID_PDRIVE		0x15
-#define CISS_BMIC_BLINK_PDRIVE		0x16
-#define CISS_BMIC_SENSE_BLINK_PDRIVE	0x17
-#define CISS_BMIC_SOFT_RESET		0x40
-#define CISS_BMIC_FLUSH_CACHE		0xc2
-#define CISS_BMIC_ACCEPT_MEDIA		0xe0
-
-/*
- * When numbering drives, the original design assumed that
- * drives 0-7 are on the first SCSI bus, 8-15 on the second,
- * and so forth.  In order to handle modern SCSI configurations,
- * the MSB is set in the drive ID field, in which case the
- * modulus changes from 8 to the number of supported drives
- * per SCSI bus (as obtained from the ID_CTLR command).
- * This feature is referred to as BIG_MAP support, and we assume
- * that all CISS controllers support it.
- */
-
-#define CISS_BIG_MAP_ID(sc, bus, target)		\
-	(0x80 | 					\
-	 ((sc)->ciss_id->drives_per_scsi_bus * (bus)) |	\
-	 (target))
-
-#define CISS_BIG_MAP_BUS(sc, id)			\
-	(((id) & 0x80) ? (((id) & ~0x80) / (sc)->ciss_id->drives_per_scsi_bus) : -1)
-
-#define CISS_BIG_MAP_TARGET(sc, id)			\
-	(((id) & 0x80) ? (((id) & ~0x80) % (sc)->ciss_id->drives_per_scsi_bus) : -1)
-
-#define CISS_BIG_MAP_ENTRIES	128	/* number of entries in a BIG_MAP */
-
-/*
- * In the device address of a logical volume, the bus number
- * is encoded into the logical lun volume number starting
- * at the second byte, with the first byte defining the
- * logical drive number.
- */
-#define CISS_LUN_TO_BUS(x)    (((x) >> 16) & 0xFF)
-#define CISS_LUN_TO_TARGET(x) ((x) & 0xFF)
-
-/*
- * BMIC CDB
- *
- * Note that the phys_drive/res1 field is nominally the 32-bit
- * "block number" field, but the only BMIC command(s) of interest
- * implemented overload the MSB (note big-endian format here)
- * to be the physical drive ID, so we define accordingly.
- */
-struct ciss_bmic_cdb {
-    u_int8_t	opcode;
-    u_int8_t	log_drive;
-    u_int8_t	phys_drive;
-    u_int8_t	res1[3];
-    u_int8_t	bmic_opcode;
-    u_int16_t	size;			/* big-endian */
-    u_int8_t	res2;
-} __packed;
-
-/*
- * BMIC command command/return structures.
- */
-
-/* CISS_BMIC_ID_LDRIVE */
-struct ciss_bmic_id_ldrive {
-    u_int16_t	block_size;
-    uint32_t	blocks_available;
-    u_int8_t	drive_parameter_table[16];	/* XXX define */
-    u_int8_t	fault_tolerance;
-#define CISS_LDRIVE_RAID0	0
-#define CISS_LDRIVE_RAID4	1
-#define CISS_LDRIVE_RAID1	2
-#define CISS_LDRIVE_RAID5	3
-#define CISS_LDRIVE_RAID51	4
-#define CISS_LDRIVE_RAIDADG	5
-    u_int8_t	res1;
-    u_int8_t	bios_disable_flag;
-    u_int8_t	res2;
-    uint32_t	logical_drive_identifier;
-    char	logical_drive_label[64];
-    u_int64_t	big_blocks_available;
-    u_int8_t	res3[410];
-} __packed;
-
-/* CISS_BMIC_ID_LSTATUS */
-struct ciss_bmic_id_lstatus {
-    u_int8_t	status;
-#define CISS_LSTATUS_OK				0
-#define CISS_LSTATUS_FAILED			1
-#define CISS_LSTATUS_NOT_CONFIGURED		2
-#define CISS_LSTATUS_INTERIM_RECOVERY		3
-#define CISS_LSTATUS_READY_RECOVERY		4
-#define CISS_LSTATUS_RECOVERING			5
-#define CISS_LSTATUS_WRONG_PDRIVE		6
-#define CISS_LSTATUS_MISSING_PDRIVE		7
-#define CISS_LSTATUS_EXPANDING			10
-#define CISS_LSTATUS_BECOMING_READY		11
-#define CISS_LSTATUS_QUEUED_FOR_EXPANSION	12
-    uint32_t	deprecated_drive_failure_map;
-    u_int8_t	res1[416];
-    uint32_t	blocks_to_recover;
-    u_int8_t	deprecated_drive_rebuilding;
-    u_int16_t	deprecated_remap_count[32];
-    uint32_t	deprecated_replacement_map;
-    uint32_t	deprecated_active_spare_map;
-    u_int8_t	spare_configured:1;
-    u_int8_t	spare_rebuilding:1;
-    u_int8_t	spare_rebuilt:1;
-    u_int8_t	spare_failed:1;
-    u_int8_t	spare_switched:1;
-    u_int8_t	spare_available:1;
-    u_int8_t	res2:2;
-    u_int8_t	deprecated_spare_to_replace_map[32];
-    uint32_t	deprecated_replaced_marked_ok_map;
-    u_int8_t	media_exchanged;
-    u_int8_t	cache_failure;
-    u_int8_t	expand_failure;
-    u_int8_t	rebuild_read_failure:1;
-    u_int8_t	rebuild_write_failure:1;
-    u_int8_t	res3:6;
-    u_int8_t	drive_failure_map[CISS_BIG_MAP_ENTRIES / 8];
-    u_int16_t	remap_count[CISS_BIG_MAP_ENTRIES];
-    u_int8_t	replacement_map[CISS_BIG_MAP_ENTRIES / 8];
-    u_int8_t	active_spare_map[CISS_BIG_MAP_ENTRIES / 8];
-    u_int8_t	spare_to_replace_map[CISS_BIG_MAP_ENTRIES];
-    u_int8_t	replaced_marked_ok_map[CISS_BIG_MAP_ENTRIES / 8];
-    u_int8_t	drive_rebuilding;
-    u_int64_t	big_blocks_to_recover;
-    u_int8_t	res4[28];
-} __packed;
-
-/* CISS_BMIC_ID_CTLR */
-struct ciss_bmic_id_table {
-    u_int8_t	configured_logical_drives;
-    uint32_t	config_signature;
-    char	running_firmware_revision[4];
-    char	stored_firmware_revision[4];
-    u_int8_t	hardware_revision;
-    u_int8_t	boot_block_revision[4];
-    uint32_t	deprecated_drive_present_map;
-    uint32_t	deprecated_external_drive_present_map;
-    uint32_t	board_id;
-    u_int8_t	swapped_error_cable;
-    uint32_t	deprecated_non_disk_map;
-    u_int8_t	bad_host_ram_addr;
-    u_int8_t	cpu_revision;
-    u_int8_t	res3[3];
-    char	marketting_revision;
-    u_int8_t	controller_flags;
-#define	CONTROLLER_FLAGS_FLASH_ROM_INSTALLED	0x01
-#define	CONTROLLER_FLAGS_DIAGS_MODE_BIT		0x02
-#define	CONTROLLER_FLAGS_EXPAND_32MB_FX 	0x04
-#define	CONTROLLER_FLAGS_MORE_THAN_7_SUPPORT 	0x08
-#define	CONTROLLER_FLAGS_DAISY_SUPPORT_BIT 	0x10
-#define	CONTROLLER_FLAGS_RES6 			0x20
-#define	CONTROLLER_FLAGS_RES7 			0x40
-#define	CONTROLLER_FLAGS_BIG_MAP_SUPPORT 	0x80
-    u_int8_t	host_flags;
-#define HOST_FLAGS_SDB_ASIC_WORK_AROUND 	0x01
-#define HOST_FLAGS_PCI_DATA_BUS_PARITY_SUPPORT	0x02
-#define HOST_FLAGS_RES3				0x04
-#define HOST_FLAGS_RES4				0x08
-#define HOST_FLAGS_RES5				0x10
-#define HOST_FLAGS_RES6				0x20
-#define HOST_FLAGS_RES7				0x30
-#define HOST_FLAGS_RES8				0x40
-    u_int8_t	expand_disable_code;
-#define EXPAND_DISABLE_NOT_NEEDED		0x01
-#define EXPAND_DISABLE_MISSING_CACHE_BOARD	0x02
-#define EXPAND_DISABLE_WCXC_FATAL_CACHE_BITS	0x04
-#define EXPAND_DISABLE_CACHE_PERM_DISABLED	0x08
-#define EXPAND_DISABLE_RAM_ALLOCATION_FAILED	0x10
-#define EXPAND_DISABLE_BATTEREIS_DISCHARGED	0x20
-#define EXPAND_DISABLE_RES7			0x40
-#define EXPAND_DISABLE_REBUILD_RUNNING		0x80
-    u_int8_t	scsi_chip_count;
-    uint32_t	maximum_blocks;
-    uint32_t	controller_clock;
-    u_int8_t	drives_per_scsi_bus;
-    u_int8_t	big_drive_present_map[CISS_BIG_MAP_ENTRIES / 8];
-    u_int8_t	big_external_drive_present_map[CISS_BIG_MAP_ENTRIES / 8];
-    u_int8_t	big_non_disk_map[CISS_BIG_MAP_ENTRIES / 8];
-
-    u_int16_t	task_flags;		/* used for FW debugging */
-    u_int8_t	ICL_bus_map;		/* Bitmap used for ICL between controllers */
-    u_int8_t	redund_ctlr_modes_support;	/* See REDUNDANT MODE VALUES */
-    u_int8_t	curr_redund_ctlr_mode;
-    u_int8_t	redund_ctlr_status;
-    u_int8_t	redund_op_failure_code;
-
-    u_int8_t	unsupported_nile_bus;
-    u_int8_t	host_i2c_autorev;
-    u_int8_t	cpld_revision;
-    u_int8_t	fibre_chip_count;
-    u_int8_t	daughterboard_type;
-    u_int8_t	more_swapped_config_cable_error;
-
-    u_int8_t	license_key_status;
-    u_int8_t	access_module_status;
-    u_int8_t	features_supported[12];
-    u_int8_t	rec_rom_inact_rev[4];    /* Recovery ROM inactive f/w revision  */
-    u_int8_t	rec_rom_act_status;      /* Recovery ROM flags                  */
-    u_int8_t	pci_to_pci_status;       /* PCI to PCI bridge status            */
-    uint32_t	redundant_server_info;   /* Reserved for future use             */
-    u_int8_t	percent_write_cache;     /* Percent of memory allocated to write cache */
-    u_int16_t	daughterboard_size_mb;   /* Total size (MB) of cache board      */
-    u_int8_t	cache_batter_count;      /* Number of cache batteries           */
-    u_int16_t	total_controller_mem_mb; /* Total size (MB) of atttached memory */
-    u_int8_t	more_controller_flags;   /* Additional controller flags byte    */
-    u_int8_t	x_board_host_i2c_rev;    /* 2nd byte of 3 byte autorev field    */
-    u_int8_t	battery_pic_rev;         /* BBWC PIC revision                   */
-/*
- * Below here I have no documentation on the rest of this data structure.  It is
- * inferred from the opensource cciss_vol_status application.  I assume that this 
- * data strucutre is 512 bytes in total size, do not exceed it.
- */
-    u_int8_t	bDdffVersion[4];         /* DDFF update engine version          */
-    u_int16_t	usMaxLogicalUnits;       /* Maximum logical units supported */
-    u_int16_t	usExtLogicalUnitCount;   /* Big num configured logical units */
-    u_int16_t	usMaxPhysicalDevices;    /* Maximum physical devices supported */
-    u_int16_t	usMaxPhyDrvPerLogicalUnit; /* Max physical drive per logical unit */
-    u_int8_t	bEnclosureCount;         /* Number of attached enclosures */
-    u_int8_t	bExpanderCount;          /* Number of expanders detected */
-    u_int16_t	usOffsetToEDPbitmap;     /* Offset to extended drive present map*/
-    u_int16_t	usOffsetToEEDPbitmap;    /* Offset to extended external drive present map */
-    u_int16_t	usOffsetToENDbitmap;     /* Offset to extended non-disk map */
-    u_int8_t	bInternalPortStatus[8];  /* Internal port status bytes */
-    u_int8_t	bExternalPortStatus[8];  /* External port status bytes */
-    uint32_t	uiYetMoreControllerFlags;/* Yet More Controller flags  */
-#define YMORE_CONTROLLER_FLAGS_JBOD_SUPPORTED \
-	( 1 << 25 )			 /* Controller has JBOD support */
-
-    u_int8_t	bLastLockup;              /* Last lockup code */
-    u_int8_t	bSlot;                    /* PCI slot according to option ROM*/
-    u_int16_t	usBuildNum;               /* Build number */
-    uint32_t	uiMaxSafeFullStripeSize;  /* Maximum safe full stripe size */
-    uint32_t	uiTotalLength;            /* Total structure length */
-    u_int8_t	bVendorID[8];             /* Vendor ID */
-    u_int8_t	bProductID[16];           /* Product ID */
-/*
- * These are even more obscure as they seem to only be available in cciss_vol_status
- */
-    uint32_t	ExtendedLastLockupCode;
-    u_int16_t	MaxRaid;
-    u_int16_t	MaxParity;
-    u_int16_t	MaxADGStripSize;
-    u_int16_t	YetMoreSwappedCables;
-    u_int8_t	MaxDevicePaths;
-    u_int8_t	PowerUPNvramFlags;
-#define PWR_UP_FLAG_JBOD_ENABLED	0x08	/*JBOD mode is enabled, all RAID features off */
-
-    u_int16_t	ZonedOffset;
-    uint32_t   FixedFieldsLength;
-    u_int8_t	FWCompileTimeStamp[24];
-    uint32_t	EvenMoreControllerFlags;
-    u_int8_t	padding[240];
-} __packed;
-
-/* CISS_BMIC_ID_PDRIVE */
-struct ciss_bmic_id_pdrive {
-    u_int8_t	scsi_bus;
-    u_int8_t	scsi_id;
-    u_int16_t	block_size;
-    uint32_t	total_blocks;
-    uint32_t	reserved_blocks;
-    char	model[40];
-    char	serial[40];
-    char	revision[8];
-    u_int8_t	inquiry_bits;
-    u_int8_t	res1[2];
-    u_int8_t	drive_present:1;
-    u_int8_t	non_disk:1;
-    u_int8_t	wide:1;
-    u_int8_t	synchronous:1;
-    u_int8_t	narrow:1;
-    u_int8_t	wide_downgraded_to_narrow:1;
-    u_int8_t	ultra:1;
-    u_int8_t	ultra2:1;
-    u_int8_t	SMART:1;
-    u_int8_t	SMART_errors_recorded:1;
-    u_int8_t	SMART_errors_enabled:1;
-    u_int8_t	SMART_errors_detected:1;
-    u_int8_t	external:1;
-    u_int8_t	configured:1;
-    u_int8_t	configured_spare:1;
-    u_int8_t	cache_saved_enabled:1;
-    u_int8_t	res2;
-    u_int8_t	res3:6;
-    u_int8_t	cache_currently_enabled:1;
-    u_int8_t	cache_safe:1;
-    u_int8_t	res4[5];
-    char	connector[2];
-    u_int8_t	res5;
-    u_int8_t	bay;
-    u_int16_t	rpm;
-    u_int8_t	drive_type;
-    u_int8_t	res6[393];
-} __packed;
-
-/* CISS_BMIC_BLINK_PDRIVE */
-/* CISS_BMIC_SENSE_BLINK_PDRIVE */
-struct ciss_bmic_blink_pdrive {
-    uint32_t	blink_duration;		/* 10ths of a second */
-    uint32_t	duration_elapsed;	/* only for sense command  */
-    u_int8_t	blinktab[256];
-#define CISS_BMIC_BLINK_ALL	1
-#define CISS_BMIC_BLINK_TIMED	2
-    u_int8_t	res2[248];
-} __packed;
-
-/* CISS_BMIC_FLUSH_CACHE */
-struct ciss_bmic_flush_cache {
-    u_int16_t	flag;
-#define CISS_BMIC_FLUSH_AND_ENABLE	0
-#define CISS_BMIC_FLUSH_AND_DISABLE	1
-    u_int8_t	res1[510];
-} __packed;
-
-#ifdef _KERNEL
-/*
- * CISS "simple" transport layer.
- *
- * Note that there are two slightly different versions of this interface
- * with different interrupt mask bits.  There's nothing like consistency...
- */
-#define CISS_TL_SIMPLE_BAR_REGS	0x10	/* BAR pointing to register space */
-#define CISS_TL_SIMPLE_BAR_CFG	0x14	/* BAR pointing to space containing config table */
-
-#define CISS_TL_SIMPLE_IDBR	0x20	/* inbound doorbell register */
-#define CISS_TL_SIMPLE_IDBR_CFG_TABLE	(1<<0)	/* notify controller of config table update */
-
-#define CISS_TL_SIMPLE_ISR	0x30	/* interrupt status register */
-#define CISS_TL_SIMPLE_IMR	0x34	/* interrupt mask register */
-#define CISS_TL_SIMPLE_INTR_OPQ_SA5	(1<<3)	/* OPQ not empty interrupt, SA5 boards */
-#define CISS_TL_SIMPLE_INTR_OPQ_SA5B	(1<<2)	/* OPQ not empty interrupt, SA5B boards */
-
-#define CISS_TL_SIMPLE_IPQ	0x40	/* inbound post queue */
-#define CISS_TL_SIMPLE_OPQ	0x44	/* outbound post queue */
-#define CISS_TL_SIMPLE_OPQ_EMPTY	(~(uint32_t)0)
-
-#define CISS_TL_SIMPLE_OSR	0x9c	/* outbound status register */
-#define CISS_TL_SIMPLE_ODC	0xa0	/* outbound doorbell clear register */
-#define CISS_TL_SIMPLE_ODC_CLEAR	(0x1)
-
-#define CISS_TL_SIMPLE_CFG_BAR	0xb4	/* should be 0x14 */
-#define CISS_TL_SIMPLE_CFG_OFF	0xb8	/* offset in BAR at which config table is located */
-
-/*
- * Register access primitives.
- */
-#define CISS_TL_SIMPLE_READ(sc, ofs) \
-	bus_space_read_4(sc->ciss_regs_btag, sc->ciss_regs_bhandle, ofs)
-#define CISS_TL_SIMPLE_WRITE(sc, ofs, val) \
-	bus_space_write_4(sc->ciss_regs_btag, sc->ciss_regs_bhandle, ofs, val)
-
-#define CISS_TL_SIMPLE_POST_CMD(sc, phys)	CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IPQ, phys)
-#define CISS_TL_SIMPLE_FETCH_CMD(sc)		CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_OPQ)
-
-#define CISS_TL_PERF_INTR_OPQ	(CISS_TL_SIMPLE_INTR_OPQ_SA5 | CISS_TL_SIMPLE_INTR_OPQ_SA5B)
-#define CISS_TL_PERF_INTR_MSI	0x01
-
-#define CISS_TL_PERF_POST_CMD(sc, cr)		CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IPQ, cr->cr_ccphys | (cr)->cr_sg_tag)
-#define CISS_TL_PERF_FLUSH_INT(sc)		CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_OSR)
-#define CISS_TL_PERF_CLEAR_INT(sc)		CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_ODC, CISS_TL_SIMPLE_ODC_CLEAR)
-#define CISS_CYCLE_MASK		0x00000001
-
-/* Only need one MSI/MSI-X vector */
-#define CISS_MSI_COUNT	1
-
-#define CISS_TL_SIMPLE_DISABLE_INTERRUPTS(sc) \
-	CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, \
-			     CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR) | (sc)->ciss_interrupt_mask)
-#define CISS_TL_SIMPLE_ENABLE_INTERRUPTS(sc) \
-	CISS_TL_SIMPLE_WRITE(sc, CISS_TL_SIMPLE_IMR, \
-			     CISS_TL_SIMPLE_READ(sc, CISS_TL_SIMPLE_IMR) & ~(sc)->ciss_interrupt_mask)
-
-
-
-#endif /* _KERNEL */
diff --git a/include.new/dev/ciss/cissvar.h b/include.new/dev/ciss/cissvar.h
deleted file mode 100644
index 960fb14..0000000
--- a/include.new/dev/ciss/cissvar.h
+++ /dev/null
@@ -1,398 +0,0 @@
-/*-
- * Copyright (c) 2001 Michael Smith
- * 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.
- *
- * 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: releng/10.2/sys/dev/ciss/cissvar.h 246713 2013-02-12 16:57:20Z kib $
- */
-
-/*
- * CISS adapter driver datastructures
- */
-
-typedef STAILQ_HEAD(, ciss_request)	cr_qhead_t;
-
-/************************************************************************
- * Tunable parameters
- */
-
-/*
- * There is no guaranteed upper bound on the number of concurrent
- * commands an adapter may claim to support.  Cap it at a reasonable
- * value.
- */
-#define CISS_MAX_REQUESTS	1024
-
-/*
- * Maximum number of logical drives we support.
- * If the controller does not indicate a maximum
- * value.  This is a compatibiliy value to support
- * older ciss controllers (e.g. model 6i)
- */
-#define CISS_MAX_LOGICAL	16
-
-/*
- * Maximum number of physical devices we support.
- */
-#define CISS_MAX_PHYSICAL	1024
-
-/*
- * Interrupt reduction can be controlled by tuning the interrupt
- * coalesce delay and count paramters.  The delay (in microseconds)
- * defers delivery of interrupts to increase the chance of there being
- * more than one completed command ready when the interrupt is
- * delivered.  The count expedites the delivery of the interrupt when
- * the given number of commands are ready.
- *
- * If the delay is set to 0, interrupts are delivered immediately.
- */
-#define CISS_INTERRUPT_COALESCE_DELAY	0
-#define CISS_INTERRUPT_COALESCE_COUNT	16
-
-/*
- * Heartbeat routine timeout in seconds.  Note that since event
- * handling is performed on a callback basis, we don't need this to
- * run very often.
- */
-#define CISS_HEARTBEAT_RATE		10
-
-/************************************************************************
- * Compatibility with older versions of FreeBSD
- */
-#if __FreeBSD_version < 440001
-#warning testing old-FreeBSD compat
-typedef struct proc	d_thread_t;
-#endif
-
-/************************************************************************
- * Driver version.  Only really significant to the ACU interface.
- */
-#define CISS_DRIVER_VERSION	20011201
-
-/************************************************************************
- * Driver data structures
- */
-
-/*
- * Each command issued to the adapter is managed by a request
- * structure.
- */
-struct ciss_request
-{
-    STAILQ_ENTRY(ciss_request)	cr_link;
-    int				cr_onq;		/* which queue we are on */
-
-    struct ciss_softc		*cr_sc;		/* controller softc */
-    void			*cr_data;	/* data buffer */
-    uint32_t			cr_length;	/* data length */
-    bus_dmamap_t		cr_datamap;	/* DMA map for data */
-    struct ciss_command		*cr_cc;
-    uint32_t			cr_ccphys;
-    int				cr_tag;
-    int				cr_flags;
-#define CISS_REQ_MAPPED		(1<<0)		/* data mapped */
-#define CISS_REQ_SLEEP		(1<<1)		/* submitter sleeping */
-#define CISS_REQ_POLL		(1<<2)		/* submitter polling */
-#define CISS_REQ_DATAOUT	(1<<3)		/* data host->adapter */
-#define CISS_REQ_DATAIN		(1<<4)		/* data adapter->host */
-#define CISS_REQ_BUSY		(1<<5)		/* controller has req */
-#define CISS_REQ_CCB		(1<<6)		/* data is ccb */
-
-    void			(* cr_complete)(struct ciss_request *);
-    void			*cr_private;
-    int				cr_sg_tag;
-#define CISS_SG_MAX		((CISS_SG_FETCH_MAX << 1) | 0x1)
-#define CISS_SG_1		((CISS_SG_FETCH_1 << 1) | 0x01)
-#define CISS_SG_2		((CISS_SG_FETCH_2 << 1) | 0x01)
-#define CISS_SG_4		((CISS_SG_FETCH_4 << 1) | 0x01)
-#define CISS_SG_8		((CISS_SG_FETCH_8 << 1) | 0x01)
-#define CISS_SG_16		((CISS_SG_FETCH_16 << 1) | 0x01)
-#define CISS_SG_32		((CISS_SG_FETCH_32 << 1) | 0x01)
-#define CISS_SG_NONE		((CISS_SG_FETCH_NONE << 1) | 0x01)
-};
-
-/*
- * The adapter command structure is defined with a zero-length
- * scatter/gather list size.  In practise, we want space for a
- * scatter-gather list, and we also want to avoid having commands
- * cross page boundaries.
- *
- * The size of the ciss_command is 52 bytes.  65 s/g elements are reserved
- * to allow a max i/o size of 256k.  This gives a total command size of
- * 1120 bytes, including the 32 byte alignment padding.  Modern controllers
- * seem to saturate nicely at this value.
- */
-
-#define CISS_MAX_SG_ELEMENTS	65
-#define CISS_COMMAND_ALIGN	32
-#define CISS_COMMAND_SG_LENGTH	(sizeof(struct ciss_sg_entry) * CISS_MAX_SG_ELEMENTS)
-#define CISS_COMMAND_ALLOC_SIZE		(roundup2(sizeof(struct ciss_command) + CISS_COMMAND_SG_LENGTH, CISS_COMMAND_ALIGN))
-
-/*
- * Per-logical-drive data.
- */
-struct ciss_ldrive
-{
-    union ciss_device_address	cl_address;
-    union ciss_device_address	*cl_controller;
-    int				cl_status;
-#define CISS_LD_NONEXISTENT	0
-#define CISS_LD_ONLINE		1
-#define CISS_LD_OFFLINE		2
-
-    int				cl_update;
-
-    struct ciss_bmic_id_ldrive	*cl_ldrive;
-    struct ciss_bmic_id_lstatus	*cl_lstatus;
-    struct ciss_ldrive_geometry	cl_geometry;
-
-    char			cl_name[16];		/* device name */
-};
-
-/*
- * Per-physical-drive data
- */
-struct ciss_pdrive
-{
-    union ciss_device_address	cp_address;
-    int				cp_online;
-};
-
-#define CISS_PHYSICAL_SHIFT	5
-#define CISS_PHYSICAL_BASE	(1 << CISS_PHYSICAL_SHIFT)
-#define CISS_MAX_PHYSTGT	256
-
-#define CISS_IS_PHYSICAL(bus)	(bus >= CISS_PHYSICAL_BASE)
-#define CISS_CAM_TO_PBUS(bus)	(bus - CISS_PHYSICAL_BASE)
-
-/*
- * Per-adapter data
- */
-struct ciss_softc
-{
-    /* bus connections */
-    device_t			ciss_dev;		/* bus attachment */
-    struct cdev *ciss_dev_t;		/* control device */
-
-    struct resource		*ciss_regs_resource;	/* register interface window */
-    int				ciss_regs_rid;		/* resource ID */
-    bus_space_handle_t		ciss_regs_bhandle;	/* bus space handle */
-    bus_space_tag_t		ciss_regs_btag;		/* bus space tag */
-
-    struct resource		*ciss_cfg_resource;	/* config struct interface window */
-    int				ciss_cfg_rid;		/* resource ID */
-    struct ciss_config_table	*ciss_cfg;		/* config table in adapter memory */
-    struct ciss_perf_config	*ciss_perf;		/* config table for the performant */
-    struct ciss_bmic_id_table	*ciss_id;		/* ID table in host memory */
-    uint32_t			ciss_heartbeat;		/* last heartbeat value */
-    int				ciss_heart_attack;	/* number of times we have seen this value */
-
-    int				ciss_msi;
-    struct resource		*ciss_irq_resource;	/* interrupt */
-    int				ciss_irq_rid[CISS_MSI_COUNT];		/* resource ID */
-    void			*ciss_intr;		/* interrupt handle */
-
-    bus_dma_tag_t		ciss_parent_dmat;	/* parent DMA tag */
-    bus_dma_tag_t		ciss_buffer_dmat;	/* data buffer/command DMA tag */
-
-    uint32_t			ciss_interrupt_mask;	/* controller interrupt mask bits */
-
-    uint64_t			*ciss_reply;
-    int				ciss_cycle;
-    int				ciss_rqidx;
-    bus_dma_tag_t		ciss_reply_dmat;
-    bus_dmamap_t		ciss_reply_map;
-    uint32_t			ciss_reply_phys;
-
-    int				ciss_max_requests;
-    struct ciss_request		ciss_request[CISS_MAX_REQUESTS];	/* requests */
-    void			*ciss_command;		/* command structures */
-    bus_dma_tag_t		ciss_command_dmat;	/* command DMA tag */
-    bus_dmamap_t		ciss_command_map;	/* command DMA map */
-    uint32_t			ciss_command_phys;	/* command array base address */
-    cr_qhead_t			ciss_free;		/* requests available for reuse */
-    cr_qhead_t			ciss_notify;		/* requests which are defered for processing */
-    struct proc			*ciss_notify_thread;
-
-    struct callout		ciss_periodic;		/* periodic event handling */
-    struct ciss_request		*ciss_periodic_notify;	/* notify callback request */
-
-    struct mtx			ciss_mtx;
-    struct ciss_ldrive		**ciss_logical;
-    struct ciss_pdrive		**ciss_physical;
-    union ciss_device_address	*ciss_controllers;	/* controller address */
-    int				ciss_max_bus_number;	/* maximum bus number */
-    int				ciss_max_logical_bus;
-    int				ciss_max_physical_bus;
-
-    struct cam_devq		*ciss_cam_devq;
-    struct cam_sim		**ciss_cam_sim;
-
-    int				ciss_soft_reset;
-
-    int				ciss_flags;
-#define CISS_FLAG_NOTIFY_OK	(1<<0)		/* notify command running OK */
-#define CISS_FLAG_CONTROL_OPEN	(1<<1)		/* control device is open */
-#define CISS_FLAG_ABORTING	(1<<2)		/* driver is going away */
-#define CISS_FLAG_RUNNING	(1<<3)		/* driver is running (interrupts usable) */
-#define CISS_FLAG_BUSY		(1<<4)		/* no free commands */
-
-#define CISS_FLAG_FAKE_SYNCH	(1<<16)		/* needs SYNCHRONISE_CACHE faked */
-#define CISS_FLAG_BMIC_ABORT	(1<<17)		/* use BMIC command to abort Notify on Event */
-#define CISS_FLAG_THREAD_SHUT	(1<<20)		/* shutdown the kthread */
-
-    struct ciss_qstat		ciss_qstat[CISSQ_COUNT];	/* queue statistics */
-};
-
-/************************************************************************
- * Debugging/diagnostic output.
- */
-
-/*
- * Debugging levels:
- *  0 - quiet, only emit warnings
- *  1 - talkative, log major events, but nothing on the I/O path
- *  2 - noisy, log events on the I/O path
- *  3 - extremely noisy, log items in loops
- */
-#ifdef CISS_DEBUG
-# define debug(level, fmt, args...)							\
-	do {										\
-	    if (level <= CISS_DEBUG) printf("%s: " fmt "\n", __func__ , ##args);	\
-	} while(0)
-# define debug_called(level)						\
-	do {								\
-	    if (level <= CISS_DEBUG) printf("%s: called\n", __func__);	\
-	} while(0)
-# define debug_struct(s)		printf("  SIZE %s: %zu\n", #s, sizeof(struct s))
-# define debug_union(s)			printf("  SIZE %s: %zu\n", #s, sizeof(union s))
-# define debug_type(s)			printf("  SIZE %s: %zu\n", #s, sizeof(s))
-# define debug_field(s, f)		printf("  OFFSET %s.%s: %d\n", #s, #f, ((int)&(((struct s *)0)->f)))
-# define debug_const(c)			printf("  CONST %s %jd/0x%jx\n", #c, (intmax_t)c, (intmax_t)c);
-#else
-# define debug(level, fmt, args...)
-# define debug_called(level)
-# define debug_struct(s)
-# define debug_union(s)
-# define debug_type(s)
-# define debug_field(s, f)
-# define debug_const(c)
-#endif
-
-#define ciss_printf(sc, fmt, args...)	device_printf(sc->ciss_dev, fmt , ##args)
-
-/************************************************************************
- * Queue primitives
- */
-
-#define CISSQ_ADD(sc, qname)					\
-	do {							\
-	    struct ciss_qstat *qs = &(sc)->ciss_qstat[qname];	\
-								\
-	    qs->q_length++;					\
-	    if (qs->q_length > qs->q_max)			\
-		qs->q_max = qs->q_length;			\
-	} while(0)
-
-#define CISSQ_REMOVE(sc, qname)    (sc)->ciss_qstat[qname].q_length--
-#define CISSQ_INIT(sc, qname)			\
-	do {					\
-	    sc->ciss_qstat[qname].q_length = 0;	\
-	    sc->ciss_qstat[qname].q_max = 0;	\
-	} while(0)
-
-
-#define CISSQ_REQUEST_QUEUE(name, index)				\
-static __inline void							\
-ciss_initq_ ## name (struct ciss_softc *sc)				\
-{									\
-    STAILQ_INIT(&sc->ciss_ ## name);					\
-    CISSQ_INIT(sc, index);						\
-}									\
-static __inline void							\
-ciss_enqueue_ ## name (struct ciss_request *cr)				\
-{									\
-									\
-    STAILQ_INSERT_TAIL(&cr->cr_sc->ciss_ ## name, cr, cr_link);		\
-    CISSQ_ADD(cr->cr_sc, index);					\
-    cr->cr_onq = index;							\
-}									\
-static __inline void							\
-ciss_requeue_ ## name (struct ciss_request *cr)				\
-{									\
-									\
-    STAILQ_INSERT_HEAD(&cr->cr_sc->ciss_ ## name, cr, cr_link);		\
-    CISSQ_ADD(cr->cr_sc, index);					\
-    cr->cr_onq = index;							\
-}									\
-static __inline struct ciss_request *					\
-ciss_dequeue_ ## name (struct ciss_softc *sc)				\
-{									\
-    struct ciss_request	*cr;						\
-									\
-    if ((cr = STAILQ_FIRST(&sc->ciss_ ## name)) != NULL) {		\
-	STAILQ_REMOVE_HEAD(&sc->ciss_ ## name, cr_link);		\
-	CISSQ_REMOVE(sc, index);					\
-	cr->cr_onq = -1;						\
-    }									\
-    return(cr);								\
-}									\
-struct hack
-
-CISSQ_REQUEST_QUEUE(free, CISSQ_FREE);
-CISSQ_REQUEST_QUEUE(notify, CISSQ_NOTIFY);
-
-static __inline void
-ciss_enqueue_complete(struct ciss_request *ac, cr_qhead_t *head)
-{
-
-    STAILQ_INSERT_TAIL(head, ac, cr_link);
-}
-
-static __inline struct ciss_request *
-ciss_dequeue_complete(struct ciss_softc *sc, cr_qhead_t *head)
-{
-    struct ciss_request  *ac;
-
-    if ((ac = STAILQ_FIRST(head)) != NULL)
-        STAILQ_REMOVE_HEAD(head, cr_link);
-    return(ac);
-}
-
-/********************************************************************************
- * space-fill a character string
- */
-static __inline void
-padstr(char *targ, const char *src, int len)
-{
-    while (len-- > 0) {
-	if (*src != 0) {
-	    *targ++ = *src++;
-	} else {
-	    *targ++ = ' ';
-	}
-    }
-}
-
-#define ciss_report_request(a, b, c)	\
-	_ciss_report_request(a, b, c, __FUNCTION__)
diff --git a/include.new/dev/filemon/filemon.h b/include.new/dev/filemon/filemon.h
deleted file mode 100644
index a8c448d..0000000
--- a/include.new/dev/filemon/filemon.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * Copyright (c) 2011, David E. O'Brien.
- * Copyright (c) 2009-2011, Juniper Networks, Inc.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY JUNIPER NETWORKS 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 JUNIPER NETWORKS 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: releng/10.2/sys/dev/filemon/filemon.h 285112 2015-07-03 20:43:31Z sjg $
- */
-
-#define FILEMON_SET_FD		_IOWR('S', 1, int)
-#define FILEMON_SET_PID		_IOWR('S', 2, pid_t)
-
-#define FILEMON_VERSION		5	/* output format
-					   (bump when adding record types) */
diff --git a/include.new/dev/firewire/firewire.h b/include.new/dev/firewire/firewire.h
deleted file mode 100644
index 78f6667..0000000
--- a/include.new/dev/firewire/firewire.h
+++ /dev/null
@@ -1,470 +0,0 @@
-/*-
- * Copyright (c) 2003 Hidetoshi Shimokawa
- * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
- * 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 acknowledgement as bellow:
- *
- *    This product includes software developed by K. Kobayashi and H. Shimokawa
- *
- * 4. 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 ``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 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: releng/10.2/sys/dev/firewire/firewire.h 188726 2009-02-17 19:37:04Z sbruno $
- *
- */
-
-#ifndef _FIREWIRE_H
-#define _FIREWIRE_H 1
-
-#define	DEV_DEF  0
-#define	DEV_DV   2
-
-struct fw_isochreq {
-	unsigned char	ch:6,
-			tag:2;
-};
-
-struct fw_isobufreq {
-	struct fw_bufspec {
-		unsigned int nchunk;
-		unsigned int npacket;
-		unsigned int psize;
-	} tx, rx;
-};
-
-struct fw_addr {
-	uint32_t hi;
-	uint32_t lo;
-};
-
-struct fw_asybindreq {
-	struct fw_addr start;
-	unsigned long len;
-};
-
-struct fw_reg_req_t {
-	uint32_t addr;
-	uint32_t data;
-};
-
-#define MAXREC(x)	(2 << (x))
-#define FWPMAX_S400 (2048 + 20)	/* MAXREC plus space for control data */
-#define FWMAXQUEUE 128
-
-#define	FWLOCALBUS	0xffc0
-
-#define FWTCODE_WREQQ	0
-#define FWTCODE_WREQB	1
-#define FWTCODE_WRES	2
-#define FWTCODE_RREQQ	4
-#define FWTCODE_RREQB	5
-#define FWTCODE_RRESQ	6
-#define FWTCODE_RRESB	7
-#define FWTCODE_CYCS	8
-#define FWTCODE_LREQ	9
-#define FWTCODE_STREAM	0xa
-#define FWTCODE_LRES	0xb
-#define FWTCODE_PHY	0xe
-
-#define	FWRETRY_1	0
-#define	FWRETRY_X	1
-#define	FWRETRY_A	2
-#define	FWRETRY_B	3
-
-#define FWRCODE_COMPLETE	0
-#define FWRCODE_ER_CONFL	4
-#define FWRCODE_ER_DATA		5
-#define FWRCODE_ER_TYPE		6
-#define FWRCODE_ER_ADDR		7
-
-/*
- * Defined 1394a-2000
- * Table 5B-1
- */
-#define FWSPD_S100	0
-#define FWSPD_S200	1
-#define FWSPD_S400	2
-#define FWSPD_S800	3
-#define FWSPD_S1600	4
-#define FWSPD_S3200	5
-
-#define	FWP_TL_VALID (1 << 7)
-
-struct fw_isohdr {
-	uint32_t hdr[1];
-};
-
-struct fw_asyhdr {
-	uint32_t hdr[4];
-};
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define BIT4x2(x,y)	 uint8_t  x:4, y:4
-#define BIT16x2(x,y)	uint32_t x:16, y:16
-#else
-#define BIT4x2(x,y)	 uint8_t  y:4, x:4
-#define BIT16x2(x,y)	uint32_t y:16, x:16
-#endif
-
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define COMMON_HDR(a,b,c,d)	uint32_t a:16,b:8,c:4,d:4
-#define COMMON_RES(a,b,c,d)	uint32_t a:16,b:4,c:4,d:8
-#else
-#define COMMON_HDR(a,b,c,d)	uint32_t d:4,c:4,b:8,a:16
-#define COMMON_RES(a,b,c,d)	uint32_t d:8,c:4,b:4,a:16
-#endif
-
-struct fw_pkt {
-	union {
-		uint32_t ld[0];
-		struct {
-			COMMON_HDR(, , tcode, );
-		} common;
-		struct {
-			COMMON_HDR(len, chtag, tcode, sy);
-			uint32_t payload[0];
-		} stream;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			BIT16x2(src, );
-		} hdr;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			BIT16x2(src, dest_hi);
-			uint32_t dest_lo;
-		} rreqq;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			COMMON_RES(src, rtcode, , );
-			uint32_t :32;
-		} wres;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			BIT16x2(src, dest_hi);
-			uint32_t dest_lo;
-			BIT16x2(len, extcode);
-		} rreqb;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			BIT16x2(src, dest_hi);
-			uint32_t dest_lo;
-			uint32_t data;
-		} wreqq;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			BIT16x2(src, dest_hi);
-			uint32_t dest_lo;
-			uint32_t data;
-		} cyc;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			COMMON_RES(src, rtcode, , );
-			uint32_t :32;
-			uint32_t data;
-		} rresq;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			BIT16x2(src, dest_hi);
-			uint32_t dest_lo;
-			BIT16x2(len, extcode);
-			uint32_t payload[0];
-		} wreqb;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			BIT16x2(src, dest_hi);
-			uint32_t dest_lo;
-			BIT16x2(len, extcode);
-			uint32_t payload[0];
-		} lreq;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			COMMON_RES(src, rtcode, , );
-			uint32_t :32;
-			BIT16x2(len, extcode);
-			uint32_t payload[0];
-		} rresb;
-		struct {
-			COMMON_HDR(dst, tlrt, tcode, pri);
-			COMMON_RES(src, rtcode, , );
-			uint32_t :32;
-			BIT16x2(len, extcode);
-			uint32_t payload[0];
-		} lres;
-	} mode;
-};
-
-/*
- * Response code (rtcode)
- */
-/* The node has successfully completed the command. */
-#define	RESP_CMP		0
-/* A resource conflict was detected. The request may be retried. */
-#define	RESP_CONFLICT_ERROR	4
-/* Hardware error, data is unavailable. */
-#define	RESP_DATA_ERROR		5
-/* A field in the request packet header was set to an unsupported or incorrect
- * value, or an invalid transaction was attempted (e.g., a write to a read-only
- * address). */
-#define	RESP_TYPE_ERROR		6
-/* The destination offset field in the request was set to an address not
- * accessible in the destination node. */
-#define	RESP_ADDRESS_ERROR	7
-
-/*
- * Extended transaction code (extcode)
- */
-#define EXTCODE_MASK_SWAP	1
-#define EXTCODE_CMP_SWAP	2
-#define EXTCODE_FETCH_ADD	3
-#define EXTCODE_LITTLE_ADD	4
-#define EXTCODE_BOUNDED_ADD	5
-#define EXTCODE_WRAP_ADD	6
-
-struct fw_eui64 {
-	uint32_t hi, lo;
-};
-#define FW_EUI64_BYTE(eui, x) \
-	((((x)<4)?				\
-		((eui)->hi >> (8*(3-(x)))): 	\
-		((eui)->lo >> (8*(7-(x))))	\
-	) & 0xff)
-#define FW_EUI64_EQUAL(x, y) \
-	((x).hi == (y).hi && (x).lo == (y).lo)
-
-struct fw_asyreq {
-	struct fw_asyreq_t{
-		unsigned char sped;
-		unsigned int type;
-#define FWASREQNODE	0
-#define FWASREQEUI	1
-#define FWASRESTL	2
-#define FWASREQSTREAM	3
-		unsigned short len;
-		union {
-			struct fw_eui64 eui;
-		}dst;
-	}req;
-	struct fw_pkt pkt;
-	uint32_t data[512];
-};
-
-struct fw_devinfo {
-	struct fw_eui64 eui;
-	uint16_t dst;
-	uint16_t status;
-};
-
-#define FW_MAX_DEVLST 70
-struct fw_devlstreq {
-	uint16_t n;
-	uint16_t info_len;
-	struct fw_devinfo dev[FW_MAX_DEVLST];
-};
-
-/*
- * Defined in IEEE 1394a-2000
- * 4.3.4.1
- */
-#define FW_SELF_ID_PORT_CONNECTED_TO_CHILD 3
-#define FW_SELF_ID_PORT_CONNECTED_TO_PARENT 2
-#define FW_SELF_ID_PORT_NOT_CONNECTED 1
-#define FW_SELF_ID_PORT_NOT_EXISTS 0
-
-#define FW_SELF_ID_PAGE0 0
-#define FW_SELF_ID_PAGE1 1
-
-#if BYTE_ORDER == BIG_ENDIAN
-union fw_self_id {
-	struct {
-		uint32_t  id:2,
-			  phy_id:6,
-			  sequel:1,
-			  link_active:1,
-			  gap_count:6,
-			  phy_speed:2,
-			  reserved:2,
-			  contender:1,
-			  power_class:3,
-			  port0:2,
-			  port1:2,
-			  port2:2,
-			  initiated_reset:1,
-			  more_packets:1;
-	} p0;
-	struct {
-		uint32_t
-			  id:2,
-			  phy_id:6,
-			  sequel:1,
-			  sequence_num:3,
-			  reserved2:2,
-			  port3:2,
-			  port4:2,
-			  port5:2,
-			  port6:2,
-			  port7:2,
-			  port8:2,
-			  port9:2,
-			  port10:2,
-			  reserved1:1,
-			  more_packets:1;
-	} p1;
-	struct {
-		uint32_t
-			  id:2,
-			  phy_id:6,
-			  sequel:1,
-			  sequence_num:3,
-			  :2,
-			  port11:2,
-			  port12:2,
-			  port13:2,
-			  port14:2,
-			  port15:2,
-			  :8;
-	} p2;
-};
-#else
-union fw_self_id {
-	struct {
-		uint32_t  more_packets:1,
-			  initiated_reset:1,
-			  port2:2,
-			  port1:2,
-			  port0:2,
-			  power_class:3,
-			  contender:1,
-			  reserved:2,
-			  phy_speed:2,
-			  gap_count:6,
-			  link_active:1,
-			  sequel:1,
-			  phy_id:6,
-			  id:2;
-	} p0;
-	struct {
-		uint32_t  more_packets:1,
-			  reserved1:1,
-			  port10:2,
-			  port9:2,
-			  port8:2,
-			  port7:2,
-			  port6:2,
-			  port5:2,
-			  port4:2,
-			  port3:2,
-			  reserved2:2,
-			  sequence_num:3,
-			  sequel:1,
-			  phy_id:6,
-			  id:2;
-	} p1;
-	struct {
-		uint32_t
-			  reserved3:8,
-			  port15:2,
-			  port14:2,
-			  port13:2,
-			  port12:2,
-			  port11:2,
-			  reserved4:2,
-			  sequence_num:3,
-			  sequel:1,
-			  phy_id:6,
-			  id:2;
-	} p2;
-};
-#endif
-
-
-struct fw_topology_map {
-	uint32_t crc:16,
-		 crc_len:16;
-	uint32_t generation;
-	uint32_t self_id_count:16,
-		 node_count:16;
-	union fw_self_id self_id[4*64];
-};
-
-struct fw_speed_map {
-	uint32_t crc:16,
-		 crc_len:16;
-	uint32_t generation;
-	uint8_t  speed[64][64];
-};
-
-struct fw_crom_buf {
-	struct fw_eui64 eui;
-	uint32_t len;
-	void *ptr;
-};
-
-/*
- * FireWire specific system requests.
- */
-#define	FW_SSTBUF	_IOWR('S', 86, struct fw_isobufreq)
-#define	FW_GSTBUF	_IOWR('S', 87, struct fw_isobufreq)
-#define	FW_SRSTREAM	_IOWR('S', 88, struct fw_isochreq)
-#define	FW_GRSTREAM	_IOWR('S', 89, struct fw_isochreq)
-#define	FW_STSTREAM	_IOWR('S', 90, struct fw_isochreq)
-#define	FW_GTSTREAM	_IOWR('S', 91, struct fw_isochreq)
-
-#define	FW_ASYREQ	_IOWR('S', 92, struct fw_asyreq)
-#define FW_IBUSRST	_IOR('S', 1, unsigned int)
-#define FW_GDEVLST	_IOWR('S', 2, struct fw_devlstreq)
-#define	FW_SBINDADDR	_IOWR('S', 3, struct fw_asybindreq)
-#define	FW_CBINDADDR	_IOWR('S', 4, struct fw_asybindreq)
-#define	FW_GTPMAP	_IOR('S', 5, struct fw_topology_map)
-#define	FW_GCROM	_IOWR('S', 7, struct fw_crom_buf)
-
-#define	FW_SDEUI64	_IOW('S', 20, struct fw_eui64)
-#define	FW_GDEUI64	_IOR('S', 21, struct fw_eui64)
-
-#define FWOHCI_RDREG	_IOWR('S', 80, struct fw_reg_req_t)
-#define FWOHCI_WRREG	_IOWR('S', 81, struct fw_reg_req_t)
-#define FWOHCI_RDPHYREG	_IOWR('S', 82, struct fw_reg_req_t)
-#define FWOHCI_WRPHYREG	_IOWR('S', 83, struct fw_reg_req_t)
-
-#define DUMPDMA		_IOWR('S', 82, uint32_t)
-
-#ifdef _KERNEL
-
-#define FWMAXNDMA 0x100 /* 8 bits DMA channel id. in device No. */
-
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-#define dev2unit(x)	((minor(x) & 0xff) | (minor(x) >> 8))
-#define unit2minor(x)	(((x) & 0xff) | (((x) << 8) & ~0xffff))
-#endif
-
-#define MAKEMINOR(f, u, s)	\
-	((f) | (((u) & 0xff) << 8) | (s & 0xff))
-#define DEV2UNIT(x)	((dev2unit(x) & 0xff00) >> 8)
-#define DEV2SUB(x)	(dev2unit(x) & 0xff)
-
-#define FWMEM_FLAG	0x10000
-#define DEV_FWMEM(x)	(dev2unit(x) & FWMEM_FLAG)
-#endif
-#endif
diff --git a/include.new/dev/firewire/firewire_phy.h b/include.new/dev/firewire/firewire_phy.h
deleted file mode 100644
index 6985505..0000000
--- a/include.new/dev/firewire/firewire_phy.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
- * 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 acknowledgement as bellow:
- *
- *    This product includes software developed by K. Kobayashi and H. Shimokawa
- *
- * 4. 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 ``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 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: releng/10.2/sys/dev/firewire/firewire_phy.h 139749 2005-01-06 01:43:34Z imp $
- *
- */
-
-#define	FW_PHY_PHYSID_REG		0x00
-#define	FW_PHY_PHYSID			(63<<2)
-#define	FW_PHY_ROOT_REG			0x00
-#define	FW_PHY_ROOT			(1<<1)
-#define	FW_PHY_CPS_REG			0x00
-#define	FW_PHY_CPS			(1<<0)
-
-#define	FW_PHY_RHB_REG			0x01
-#define	FW_PHY_RHB			(1<<7)
-#define	FW_PHY_IBR_REG			0x01
-#define	FW_PHY_IBR			(1<<6)
-#define	FW_PHY_ISBR_REG			0x05
-#define	FW_PHY_ISBR			(1<<6)
-#define	FW_PHY_GC_REG			0x01
-
-#define	FW_PHY_SPD_REG			0x02
-#define	FW_PHY_SPD			(3<<6)
-#define	FW_PHY_REV_REG			0x02
-#define	FW_PHY_REV			(3<<4)
-#define	FW_PHY_NP_REG			0x02
-#define	FW_PHY_NP			(15<<0)
-
-#define	FW_PHY_P1_REG			0x03
-#define	FW_PHY_P2_REG			0x04
-#define	FW_PHY_P3_REG			0x05
-
-#define	FW_PHY_P_ASTAT			(3<<6)
-#define	FW_PHY_P_BSTAT			(3<<4)
-#define	FW_PHY_P_CH			(1<<3)
-#define	FW_PHY_P_CON			(1<<2)
-
-#define FW_PHY_LOOPINT_REG		0x06
-#define FW_PHY_LOOPINT			(1<<7)
-#define FW_PHY_CPSINT_REG		0x06
-#define FW_PHY_CPSNT			(1<<6)
-/*
-#define FW_PHY_CPS_REG			0x06
-#define FW_PHY_CPS			(1<<5)
-*/
-#define FW_PHY_IR_REG			0x06
-#define FW_PHY_IR			(1<<4)
-#define FW_PHY_C_REG			0x06
-#define FW_PHY_C			(1<<0)
-
-#define FW_PHY_ESPD_REG			0x03
-#define	FW_PHY_ESPD			(7<<5)
-
-#define FW_PHY_EDEL_REG			0x03
-#define FW_PHY_EDEL			15<<0
diff --git a/include.new/dev/firewire/firewirereg.h b/include.new/dev/firewire/firewirereg.h
deleted file mode 100644
index 3cde469..0000000
--- a/include.new/dev/firewire/firewirereg.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*-
- * Copyright (c) 2003 Hidetoshi Shimokawa
- * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
- * 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 acknowledgement as bellow:
- *
- *    This product includes software developed by K. Kobayashi and H. Shimokawa
- *
- * 4. 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 ``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 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: releng/10.2/sys/dev/firewire/firewirereg.h 171513 2007-07-20 03:42:57Z simokawa $
- *
- */
-
-#ifdef __DragonFly__
-typedef	d_thread_t fw_proc;
-#include <sys/select.h>
-#elif __FreeBSD_version >= 500000
-typedef	struct thread fw_proc;
-#include <sys/selinfo.h>
-#else
-typedef	struct proc fw_proc;
-#include <sys/select.h>
-#endif
-
-#include <sys/uio.h>
-#include <sys/mutex.h>
-#include <sys/taskqueue.h>
-
-#define	splfw splimp
-
-STAILQ_HEAD(fw_xferlist, fw_xfer);
-
-struct fw_device{
-	uint16_t dst;
-	struct fw_eui64 eui;
-	uint8_t speed;
-	uint8_t maxrec;
-	uint8_t nport;
-	uint8_t power;
-#define CSRROMOFF 0x400
-#define CSRROMSIZE 0x400
-	int rommax;	/* offset from 0xffff f000 0000 */
-	uint32_t csrrom[CSRROMSIZE/4];
-	int rcnt;
-	struct firewire_comm *fc;
-	uint32_t status;
-#define FWDEVINIT	1
-#define FWDEVATTACHED	2
-#define FWDEVINVAL	3
-	STAILQ_ENTRY(fw_device) link;
-};
-
-struct firewire_softc {
-#if defined(__FreeBSD__) && __FreeBSD_version >= 500000
-	struct cdev *dev;
-#endif
-	struct firewire_comm *fc;
-};
-
-#define FW_MAX_DMACH 0x20
-#define FW_MAX_DEVCH FW_MAX_DMACH
-#define FW_XFERTIMEOUT 1
-
-struct firewire_dev_comm {
-	device_t dev;
-	struct firewire_comm *fc;
-	void (*post_busreset) (void *);
-	void (*post_explore) (void *);
-};
-
-struct tcode_info {
-	u_char hdr_len;	/* IEEE1394 header length */
-	u_char flag;
-#define FWTI_REQ	(1 << 0)
-#define FWTI_RES	(1 << 1)
-#define FWTI_TLABEL	(1 << 2)
-#define FWTI_BLOCK_STR	(1 << 3)
-#define FWTI_BLOCK_ASY	(1 << 4)
-	u_char valid_res;
-};
-
-struct firewire_comm{
-	device_t dev;
-	device_t bdev;
-	uint16_t busid:10,
-		  nodeid:6;
-	u_int mode;
-	u_int nport;
-	u_int speed;
-	u_int maxrec;
-	u_int irm;
-	u_int max_node;
-	u_int max_hop;
-#define FWPHYASYST (1 << 0)
-	uint32_t status;
-#define	FWBUSDETACH	(-2)
-#define	FWBUSNOTREADY	(-1)
-#define	FWBUSRESET	0
-#define	FWBUSINIT	1
-#define	FWBUSCYMELECT	2
-#define	FWBUSMGRELECT	3
-#define	FWBUSMGRDONE	4
-#define	FWBUSEXPLORE	5
-#define	FWBUSPHYCONF	6
-#define	FWBUSEXPDONE	7
-#define	FWBUSCOMPLETION	10
-	int nisodma;
-	struct fw_eui64 eui;
-	struct fw_xferq
-		*arq, *atq, *ars, *ats, *it[FW_MAX_DMACH],*ir[FW_MAX_DMACH];
-	struct fw_xferlist tlabels[0x40];
-	u_char last_tlabel[0x40];
-	struct mtx tlabel_lock;
-	STAILQ_HEAD(, fw_bind) binds;
-	STAILQ_HEAD(, fw_device) devices;
-	u_int  sid_cnt;
-#define CSRSIZE 0x4000
-	uint32_t csr_arc[CSRSIZE/4];
-#define CROMSIZE 0x400
-	uint32_t *config_rom;
-	struct crom_src_buf *crom_src_buf;
-	struct crom_src *crom_src;
-	struct crom_chunk *crom_root;
-	struct fw_topology_map *topology_map;
-	struct fw_speed_map *speed_map;
-	struct callout busprobe_callout;
-	struct callout bmr_callout;
-	struct callout timeout_callout;
-	struct task task_timeout;
-	uint32_t (*cyctimer) (struct  firewire_comm *);
-	void (*ibr) (struct firewire_comm *);
-	uint32_t (*set_bmr) (struct firewire_comm *, uint32_t);
-	int (*ioctl) (struct cdev *, u_long, caddr_t, int, fw_proc *);
-	int (*irx_enable) (struct firewire_comm *, int);
-	int (*irx_disable) (struct firewire_comm *, int);
-	int (*itx_enable) (struct firewire_comm *, int);
-	int (*itx_disable) (struct firewire_comm *, int);
-	void (*timeout) (void *);
-	void (*poll) (struct firewire_comm *, int, int);
-	void (*set_intr) (struct firewire_comm *, int);
-	void (*irx_post) (struct firewire_comm *, uint32_t *);
-	void (*itx_post) (struct firewire_comm *, uint32_t *);
-	struct tcode_info *tcode;
-	bus_dma_tag_t dmat;
-	struct mtx mtx;
-	struct mtx wait_lock;
-	struct taskqueue *taskqueue;
-	struct proc *probe_thread;
-};
-#define CSRARC(sc, offset) ((sc)->csr_arc[(offset)/4])
-
-#define FW_GMTX(fc)		(&(fc)->mtx)
-#define FW_GLOCK(fc)		mtx_lock(FW_GMTX(fc))
-#define FW_GUNLOCK(fc)		mtx_unlock(FW_GMTX(fc))
-#define FW_GLOCK_ASSERT(fc)	mtx_assert(FW_GMTX(fc), MA_OWNED)
-
-struct fw_xferq {
-	int flag;
-#define FWXFERQ_CHTAGMASK 0xff
-#define FWXFERQ_RUNNING (1 << 8)
-#define FWXFERQ_STREAM (1 << 9)
-
-#define FWXFERQ_BULK (1 << 11)
-#define FWXFERQ_MODEMASK (7 << 10)
-
-#define FWXFERQ_EXTBUF (1 << 13)
-#define FWXFERQ_OPEN (1 << 14)
-
-#define FWXFERQ_HANDLER (1 << 16)
-#define FWXFERQ_WAKEUP (1 << 17)
-	void (*start) (struct firewire_comm*);
-	int dmach;
-	struct fw_xferlist q;
-	u_int queued;
-	u_int maxq;
-	u_int psize;
-	struct fwdma_alloc_multi *buf;
-	u_int bnchunk;
-	u_int bnpacket;
-	struct fw_bulkxfer *bulkxfer;
-	STAILQ_HEAD(, fw_bulkxfer) stvalid;
-	STAILQ_HEAD(, fw_bulkxfer) stfree;
-	STAILQ_HEAD(, fw_bulkxfer) stdma;
-	struct fw_bulkxfer *stproc;
-	struct selinfo rsel;
-	caddr_t sc;
-	void (*hand) (struct fw_xferq *);
-};
-
-struct fw_bulkxfer{
-	int poffset;
-	struct mbuf *mbuf;
-	STAILQ_ENTRY(fw_bulkxfer) link;
-	caddr_t start;
-	caddr_t end;
-	int resp;
-};
-
-struct fw_bind{
-	u_int64_t start;
-	u_int64_t end;
-	struct fw_xferlist xferlist;
-	STAILQ_ENTRY(fw_bind) fclist;
-	STAILQ_ENTRY(fw_bind) chlist;
-	void *sc;
-};
-
-struct fw_xfer{
-	caddr_t sc;
-	struct firewire_comm *fc;
-	struct fw_xferq *q;
-	struct timeval tv;
-	int8_t resp;
-#define FWXF_INIT	0x00
-#define FWXF_INQ	0x01
-#define FWXF_START	0x02
-#define FWXF_SENT	0x04
-#define FWXF_SENTERR	0x08
-#define FWXF_BUSY	0x10
-#define FWXF_RCVD	0x20
-
-#define FWXF_WAKE	0x80
-	uint8_t flag;
-	int8_t tl;
-	void (*hand) (struct fw_xfer *);
-	struct {
-		struct fw_pkt hdr;
-		uint32_t *payload;
-		uint16_t pay_len;
-		uint8_t spd;
-	} send, recv;
-	struct mbuf *mbuf;
-	STAILQ_ENTRY(fw_xfer) link;
-	STAILQ_ENTRY(fw_xfer) tlabel;
-	struct malloc_type *malloc;
-};
-
-struct fw_rcv_buf {
-	struct firewire_comm *fc;
-	struct fw_xfer *xfer;
-	struct iovec *vec;
-	u_int nvec;
-	uint8_t spd;
-};
-
-void fw_sidrcv (struct firewire_comm *, uint32_t *, u_int);
-void fw_rcv (struct fw_rcv_buf *);
-void fw_xfer_unload ( struct fw_xfer*);
-void fw_xfer_free_buf ( struct fw_xfer*);
-void fw_xfer_free ( struct fw_xfer*);
-struct fw_xfer *fw_xfer_alloc (struct malloc_type *);
-struct fw_xfer *fw_xfer_alloc_buf (struct malloc_type *, int, int);
-void fw_init (struct firewire_comm *);
-int fw_tbuf_update (struct firewire_comm *, int, int);
-int fw_rbuf_update (struct firewire_comm *, int, int);
-int fw_bindadd (struct firewire_comm *, struct fw_bind *);
-int fw_bindremove (struct firewire_comm *, struct fw_bind *);
-int fw_xferlist_add (struct fw_xferlist *, struct malloc_type *, int, int, int,
-    struct firewire_comm *, void *, void (*)(struct fw_xfer *));
-void fw_xferlist_remove (struct fw_xferlist *);
-int fw_asyreq (struct firewire_comm *, int, struct fw_xfer*);
-void fw_busreset (struct firewire_comm *, uint32_t);
-uint16_t fw_crc16 (uint32_t *, uint32_t);
-void fw_xfer_timeout (void *);
-void fw_xfer_done (struct fw_xfer *);
-void fw_xferwake (struct fw_xfer *);
-int fw_xferwait (struct fw_xfer *);
-void fw_asy_callback_free (struct fw_xfer *);
-struct fw_device *fw_noderesolve_nodeid (struct firewire_comm *, int);
-struct fw_device *fw_noderesolve_eui64 (struct firewire_comm *, struct fw_eui64 *);
-struct fw_bind *fw_bindlookup (struct firewire_comm *, uint16_t, uint32_t);
-void fw_drain_txq (struct firewire_comm *);
-int fwdev_makedev (struct firewire_softc *);
-int fwdev_destroydev (struct firewire_softc *);
-void fwdev_clone (void *, struct ucred *, char *, int, struct cdev **);
-int fw_open_isodma(struct firewire_comm *, int);
-
-extern int firewire_debug;
-extern devclass_t firewire_devclass;
-extern int firewire_phydma_enable;
-
-#ifdef __DragonFly__
-#define		FWPRI		PCATCH
-#else
-#define		FWPRI		((PZERO+8)|PCATCH)
-#endif
-
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-#define CALLOUT_INIT(x) callout_init(x)
-#else
-#define CALLOUT_INIT(x) callout_init(x, 1 /* mpsafe */)
-#endif
-
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-/* compatibility shim for 4.X */
-#define bio buf
-#define bio_bcount b_bcount
-#define bio_cmd b_flags
-#define bio_count b_count
-#define bio_data b_data
-#define bio_dev b_dev
-#define bio_error b_error
-#define bio_flags b_flags
-#define bio_offset b_offset
-#define bio_resid b_resid
-#define BIO_ERROR B_ERROR
-#define BIO_READ B_READ
-#define BIO_WRITE B_WRITE
-#define MIN(a,b) (((a)<(b))?(a):(b))
-#define MAX(a,b) (((a)>(b))?(a):(b))
-#endif
-
-MALLOC_DECLARE(M_FW);
-MALLOC_DECLARE(M_FWXFER);
diff --git a/include.new/dev/firewire/fwdma.h b/include.new/dev/firewire/fwdma.h
deleted file mode 100644
index a3313f5..0000000
--- a/include.new/dev/firewire/fwdma.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * Copyright (C) 2003
- * 	Hidetoshi Shimokawa. 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 Hidetoshi Shimokawa.
- *
- * 4. Neither the name of the author 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.
- * 
- * $FreeBSD: releng/10.2/sys/dev/firewire/fwdma.h 139749 2005-01-06 01:43:34Z imp $
- */
-
-struct fwdma_alloc {
-	bus_dma_tag_t	dma_tag;
-	bus_dmamap_t	dma_map;
-	void *		v_addr;
-	bus_addr_t	bus_addr;
-};
-
-struct fwdma_seg {
-	bus_dmamap_t	dma_map;
-	void *		v_addr;
-	bus_addr_t	bus_addr;
-};
-
-struct fwdma_alloc_multi {
-	bus_size_t	ssize;
-	bus_size_t	esize;
-	int		nseg;
-	bus_dma_tag_t	dma_tag;
-	struct fwdma_seg seg[0];
-};
-
-static __inline void *
-fwdma_v_addr(struct fwdma_alloc_multi *am, int index)
-{
-	bus_size_t ssize = am->ssize;
-	int offset = am->esize * index;
-
-	return ((caddr_t)am->seg[offset / ssize].v_addr + (offset % ssize));
-}
-
-static __inline bus_addr_t
-fwdma_bus_addr(struct fwdma_alloc_multi *am, int index)
-{
-	bus_size_t ssize = am->ssize;
-	int offset = am->esize * index;
-
-	return (am->seg[offset / ssize].bus_addr + (offset % ssize));
-}
-
-static __inline void
-fwdma_sync(struct fwdma_alloc *dma, bus_dmasync_op_t op)  
-{
-	bus_dmamap_sync(dma->dma_tag, dma->dma_map, op);
-}
-
-static __inline void
-fwdma_sync_multiseg(struct fwdma_alloc_multi *am,
-			int start, int end, bus_dmasync_op_t op)
-{
-	struct fwdma_seg *seg, *eseg;
-
-	seg = &am->seg[am->esize * start / am->ssize];
-	eseg = &am->seg[am->esize * end / am->ssize];
-	for (; seg <= eseg; seg ++)
-		bus_dmamap_sync(am->dma_tag, seg->dma_map, op);
-}
-
-static __inline void
-fwdma_sync_multiseg_all(struct fwdma_alloc_multi *am, bus_dmasync_op_t op)
-{
-	struct fwdma_seg *seg;
-	int i;
-
-	seg = &am->seg[0];
-	for (i = 0; i < am->nseg; i++, seg++)
-		bus_dmamap_sync(am->dma_tag, seg->dma_map, op);
-}
-
-void *fwdma_malloc(struct firewire_comm *, int, bus_size_t, struct fwdma_alloc *, int);
-void fwdma_free(struct firewire_comm *, struct fwdma_alloc *);
-void *fwdma_malloc_size(bus_dma_tag_t, bus_dmamap_t *, bus_size_t, bus_addr_t *, int);
-void fwdma_free_size(bus_dma_tag_t, bus_dmamap_t, void *, bus_size_t);
-struct fwdma_alloc_multi *fwdma_malloc_multiseg(struct firewire_comm *,
-	int, int, int, int);
-void fwdma_free_multiseg(struct fwdma_alloc_multi *);
-
diff --git a/include.new/dev/firewire/fwmem.h b/include.new/dev/firewire/fwmem.h
deleted file mode 100644
index 30388b4..0000000
--- a/include.new/dev/firewire/fwmem.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (C) 2002-2003
- * 	Hidetoshi Shimokawa. 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 Hidetoshi Shimokawa.
- *
- * 4. Neither the name of the author 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.
- * 
- * $FreeBSD: releng/10.2/sys/dev/firewire/fwmem.h 139749 2005-01-06 01:43:34Z imp $
- */
-
-struct fw_xfer *fwmem_read_quad(struct fw_device *, caddr_t, uint8_t,
-	uint16_t, uint32_t, void *, void (*)(struct fw_xfer *));
-struct fw_xfer *fwmem_write_quad(struct fw_device *, caddr_t, uint8_t,
-	uint16_t, uint32_t, void *, void (*)(struct fw_xfer *));
-struct fw_xfer *fwmem_read_block(struct fw_device *, caddr_t, uint8_t,
-	uint16_t, uint32_t, int, void *, void (*)(struct fw_xfer *));
-struct fw_xfer *fwmem_write_block(struct fw_device *, caddr_t, uint8_t,
-	uint16_t, uint32_t, int, void *, void (*)(struct fw_xfer *));
-
-d_open_t	fwmem_open;
-d_close_t	fwmem_close;
-d_ioctl_t	fwmem_ioctl;
-d_read_t	fwmem_read;
-d_write_t	fwmem_write;
-d_poll_t	fwmem_poll;
-d_mmap_t	fwmem_mmap;
-d_strategy_t	fwmem_strategy;
diff --git a/include.new/dev/firewire/fwohcireg.h b/include.new/dev/firewire/fwohcireg.h
deleted file mode 100644
index 415570b..0000000
--- a/include.new/dev/firewire/fwohcireg.h
+++ /dev/null
@@ -1,447 +0,0 @@
-/*-
- * Copyright (c) 2003 Hidetoshi Shimokawa
- * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
- * 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 acknowledgement as bellow:
- *
- *    This product includes software developed by K. Kobayashi and H. Shimokawa
- *
- * 4. 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 ``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 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: releng/10.2/sys/dev/firewire/fwohcireg.h 261455 2014-02-04 03:36:42Z eadler $
- *
- */
-#define		PCI_CBMEM		PCIR_BAR(0)
-
-#define		FW_VENDORID_NATSEMI	0x100B
-#define		FW_VENDORID_NEC		0x1033
-#define		FW_VENDORID_SIS		0x1039
-#define		FW_VENDORID_TI		0x104c
-#define		FW_VENDORID_SONY	0x104d
-#define		FW_VENDORID_VIA		0x1106
-#define		FW_VENDORID_RICOH	0x1180
-#define		FW_VENDORID_APPLE	0x106b
-#define		FW_VENDORID_LUCENT	0x11c1
-#define		FW_VENDORID_INTEL	0x8086
-#define		FW_VENDORID_ADAPTEC	0x9004
-#define		FW_VENDORID_SUN		0x108e
-
-#define		FW_DEVICE_CS4210	(0x000f << 16)
-#define		FW_DEVICE_UPD861	(0x0063 << 16)
-#define		FW_DEVICE_UPD871	(0x00ce << 16)
-#define		FW_DEVICE_UPD72870	(0x00cd << 16)
-#define		FW_DEVICE_UPD72873	(0x00e7 << 16)
-#define		FW_DEVICE_UPD72874	(0x00f2 << 16)
-#define		FW_DEVICE_TITSB22	(0x8009 << 16)
-#define		FW_DEVICE_TITSB23	(0x8019 << 16)
-#define		FW_DEVICE_TITSB26	(0x8020 << 16)
-#define		FW_DEVICE_TITSB43	(0x8021 << 16)
-#define		FW_DEVICE_TITSB43A	(0x8023 << 16)
-#define		FW_DEVICE_TITSB43AB23	(0x8024 << 16)
-#define		FW_DEVICE_TITSB82AA2	(0x8025 << 16)
-#define		FW_DEVICE_TITSB43AB21	(0x8026 << 16)
-#define		FW_DEVICE_TIPCI4410A	(0x8017 << 16)
-#define		FW_DEVICE_TIPCI4450	(0x8011 << 16)
-#define		FW_DEVICE_TIPCI4451	(0x8027 << 16)
-#define		FW_DEVICE_CXD1947	(0x8009 << 16)
-#define		FW_DEVICE_CXD3222	(0x8039 << 16)
-#define		FW_DEVICE_VT6306	(0x3044 << 16)
-#define		FW_DEVICE_R5C551	(0x0551 << 16)
-#define		FW_DEVICE_R5C552	(0x0552 << 16)
-#define		FW_DEVICE_PANGEA	(0x0030 << 16)
-#define		FW_DEVICE_UNINORTH	(0x0031 << 16)
-#define		FW_DEVICE_AIC5800	(0x5800 << 16)
-#define		FW_DEVICE_FW322		(0x5811 << 16)
-#define		FW_DEVICE_7007		(0x7007 << 16)
-#define		FW_DEVICE_82372FB	(0x7605 << 16)
-#define		FW_DEVICE_PCIO2FW	(0x1102 << 16)
-
-#define PCI_INTERFACE_OHCI	0x10
-
-#define FW_OHCI_BASE_REG	0x10
-
-#define		OHCI_DMA_ITCH		0x20
-#define		OHCI_DMA_IRCH		0x20
-
-#define		OHCI_MAX_DMA_CH		(0x4 + OHCI_DMA_ITCH + OHCI_DMA_IRCH)
-
-
-typedef uint32_t 	fwohcireg_t;
-
-/* for PCI */
-#if BYTE_ORDER == BIG_ENDIAN
-#define FWOHCI_DMA_WRITE(x, y)	((x) = htole32(y))
-#define FWOHCI_DMA_READ(x)	le32toh(x)
-#define FWOHCI_DMA_SET(x, y)	((x) |= htole32(y))
-#define FWOHCI_DMA_CLEAR(x, y)	((x) &= htole32(~(y)))
-#else
-#define FWOHCI_DMA_WRITE(x, y)	((x) = (y))
-#define FWOHCI_DMA_READ(x)	(x)
-#define FWOHCI_DMA_SET(x, y)	((x) |= (y))
-#define FWOHCI_DMA_CLEAR(x, y)	((x) &= ~(y))
-#endif
-
-struct fwohcidb {
-	union {
-		struct {
-			uint32_t cmd;
-			uint32_t addr;
-			uint32_t depend;
-			uint32_t res;
-		} desc;
-		uint32_t immed[4];
-	} db;
-#define OHCI_STATUS_SHIFT	16
-#define OHCI_COUNT_MASK		0xffff
-#define OHCI_OUTPUT_MORE	(0 << 28)
-#define OHCI_OUTPUT_LAST	(1 << 28)
-#define OHCI_INPUT_MORE		(2 << 28)
-#define OHCI_INPUT_LAST		(3 << 28)
-#define OHCI_STORE_QUAD		(4 << 28)
-#define OHCI_LOAD_QUAD		(5 << 28)
-#define OHCI_NOP		(6 << 28)
-#define OHCI_STOP		(7 << 28)
-#define OHCI_STORE		(8 << 28)
-#define OHCI_CMD_MASK		(0xf << 28)
-
-#define	OHCI_UPDATE		(1 << 27)
-
-#define OHCI_KEY_ST0		(0 << 24)
-#define OHCI_KEY_ST1		(1 << 24)
-#define OHCI_KEY_ST2		(2 << 24)
-#define OHCI_KEY_ST3		(3 << 24)
-#define OHCI_KEY_REGS		(5 << 24)
-#define OHCI_KEY_SYS		(6 << 24)
-#define OHCI_KEY_DEVICE		(7 << 24)
-#define OHCI_KEY_MASK		(7 << 24)
-
-#define OHCI_INTERRUPT_NEVER	(0 << 20)
-#define OHCI_INTERRUPT_TRUE	(1 << 20)
-#define OHCI_INTERRUPT_FALSE	(2 << 20)
-#define OHCI_INTERRUPT_ALWAYS	(3 << 20)
-
-#define OHCI_BRANCH_NEVER	(0 << 18)
-#define OHCI_BRANCH_TRUE	(1 << 18)
-#define OHCI_BRANCH_FALSE	(2 << 18)
-#define OHCI_BRANCH_ALWAYS	(3 << 18)
-#define OHCI_BRANCH_MASK	(3 << 18)
-
-#define OHCI_WAIT_NEVER		(0 << 16)
-#define OHCI_WAIT_TRUE		(1 << 16)
-#define OHCI_WAIT_FALSE		(2 << 16)
-#define OHCI_WAIT_ALWAYS	(3 << 16)
-};
-
-#define OHCI_SPD_S100 0x4
-#define OHCI_SPD_S200 0x1
-#define OHCI_SPD_S400 0x2
-
-
-#define FWOHCIEV_NOSTAT 0
-#define FWOHCIEV_LONGP 2
-#define FWOHCIEV_MISSACK 3
-#define FWOHCIEV_UNDRRUN 4
-#define FWOHCIEV_OVRRUN 5
-#define FWOHCIEV_DESCERR 6
-#define FWOHCIEV_DTRDERR 7
-#define FWOHCIEV_DTWRERR 8
-#define FWOHCIEV_BUSRST 9
-#define FWOHCIEV_TIMEOUT 0xa
-#define FWOHCIEV_TCODERR 0xb
-#define FWOHCIEV_UNKNOWN 0xe
-#define FWOHCIEV_FLUSHED 0xf
-#define FWOHCIEV_ACKCOMPL 0x11
-#define FWOHCIEV_ACKPEND 0x12
-#define FWOHCIEV_ACKBSX 0x14
-#define FWOHCIEV_ACKBSA 0x15
-#define FWOHCIEV_ACKBSB 0x16
-#define FWOHCIEV_ACKTARD 0x1b
-#define FWOHCIEV_ACKDERR 0x1d
-#define FWOHCIEV_ACKTERR 0x1e
-
-#define FWOHCIEV_MASK 0x1f
-
-struct ohci_dma{
-	fwohcireg_t	cntl;
-
-#define	OHCI_CNTL_CYCMATCH_S	(0x1 << 31)
-
-#define	OHCI_CNTL_BUFFIL	(0x1 << 31)
-#define	OHCI_CNTL_ISOHDR	(0x1 << 30)
-#define	OHCI_CNTL_CYCMATCH_R	(0x1 << 29)
-#define	OHCI_CNTL_MULTICH	(0x1 << 28)
-
-#define	OHCI_CNTL_DMA_RUN	(0x1 << 15)
-#define	OHCI_CNTL_DMA_WAKE	(0x1 << 12)
-#define	OHCI_CNTL_DMA_DEAD	(0x1 << 11)
-#define	OHCI_CNTL_DMA_ACTIVE	(0x1 << 10)
-#define	OHCI_CNTL_DMA_BT	(0x1 << 8)
-#define	OHCI_CNTL_DMA_BAD	(0x1 << 7)
-#define	OHCI_CNTL_DMA_STAT	(0xff)
-
-	fwohcireg_t	cntl_clr;
-	fwohcireg_t	dummy0;
-	fwohcireg_t	cmd;
-	fwohcireg_t	match;
-	fwohcireg_t	dummy1;
-	fwohcireg_t	dummy2;
-	fwohcireg_t	dummy3;
-};
-
-struct ohci_itdma{
-	fwohcireg_t	cntl;
-	fwohcireg_t	cntl_clr;
-	fwohcireg_t	dummy0;
-	fwohcireg_t	cmd;
-};
-
-struct ohci_registers {
-	fwohcireg_t	ver;		/* Version No. 0x0 */
-	fwohcireg_t	guid;		/* GUID_ROM No. 0x4 */
-	fwohcireg_t	retry;		/* AT retries 0x8 */
-#define FWOHCI_RETRY	0x8
-	fwohcireg_t	csr_data;	/* CSR data   0xc */
-	fwohcireg_t	csr_cmp;	/* CSR compare 0x10 */
-	fwohcireg_t	csr_cntl;	/* CSR compare 0x14 */
-	fwohcireg_t	rom_hdr;	/* config ROM ptr. 0x18 */
-	fwohcireg_t	bus_id;		/* BUS_ID 0x1c */
-	fwohcireg_t	bus_opt;	/* BUS option 0x20 */
-#define	FWOHCIGUID_H	0x24
-#define	FWOHCIGUID_L	0x28
-	fwohcireg_t	guid_hi;	/* GUID hi 0x24 */
-	fwohcireg_t	guid_lo;	/* GUID lo 0x28 */
-	fwohcireg_t	dummy0[2];	/* dummy 0x2c-0x30 */
-	fwohcireg_t	config_rom;	/* config ROM map 0x34 */
-	fwohcireg_t	post_wr_lo;	/* post write addr lo 0x38 */
-	fwohcireg_t	post_wr_hi;	/* post write addr hi 0x3c */
-	fwohcireg_t	vender;		/* vender ID 0x40 */
-	fwohcireg_t	dummy1[3];	/* dummy 0x44-0x4c */
-	fwohcireg_t	hcc_cntl_set;	/* HCC control set 0x50 */
-	fwohcireg_t	hcc_cntl_clr;	/* HCC control clr 0x54 */
-#define	OHCI_HCC_BIBIV	(1U << 31)	/* BIBimage Valid */
-#define	OHCI_HCC_BIGEND	(1 << 30)	/* noByteSwapData */
-#define	OHCI_HCC_PRPHY	(1 << 23)	/* programPhyEnable */
-#define	OHCI_HCC_PHYEN	(1 << 22)	/* aPhyEnhanceEnable */
-#define	OHCI_HCC_LPS	(1 << 19)	/* LPS */
-#define	OHCI_HCC_POSTWR	(1 << 18)	/* postedWriteEnable */
-#define	OHCI_HCC_LINKEN	(1 << 17)	/* linkEnable */
-#define	OHCI_HCC_RESET	(1 << 16)	/* softReset */
-	fwohcireg_t	dummy2[2];	/* dummy 0x58-0x5c */
-	fwohcireg_t	dummy3[1];	/* dummy 0x60 */
-	fwohcireg_t	sid_buf;	/* self id buffer 0x64 */
-	fwohcireg_t	sid_cnt;	/* self id count 0x68 */
-	fwohcireg_t	dummy4[1];	/* dummy 0x6c */
-	fwohcireg_t	ir_mask_hi_set;	/* ir mask hi set 0x70 */
-	fwohcireg_t	ir_mask_hi_clr;	/* ir mask hi set 0x74 */
-	fwohcireg_t	ir_mask_lo_set;	/* ir mask hi set 0x78 */
-	fwohcireg_t	ir_mask_lo_clr;	/* ir mask hi set 0x7c */
-#define	FWOHCI_INTSTAT		0x80
-#define	FWOHCI_INTSTATCLR	0x84
-#define	FWOHCI_INTMASK		0x88
-#define	FWOHCI_INTMASKCLR	0x8c
-	fwohcireg_t	int_stat;   /*       0x80 */
-	fwohcireg_t	int_clear;  /*       0x84 */
-	fwohcireg_t	int_mask;   /*       0x88 */
-	fwohcireg_t	int_mask_clear;   /*       0x8c */
-	fwohcireg_t	it_int_stat;   /*       0x90 */
-	fwohcireg_t	it_int_clear;  /*       0x94 */
-	fwohcireg_t	it_int_mask;   /*       0x98 */
-	fwohcireg_t	it_mask_clear;   /*       0x9c */
-	fwohcireg_t	ir_int_stat;   /*       0xa0 */
-	fwohcireg_t	ir_int_clear;  /*       0xa4 */
-	fwohcireg_t	ir_int_mask;   /*       0xa8 */
-	fwohcireg_t	ir_mask_clear;   /*       0xac */
-	fwohcireg_t	dummy5[11];	/* dummy 0xb0-d8 */
-	fwohcireg_t	fairness;   /* fairness control      0xdc */
-	fwohcireg_t	link_cntl;		/* Chip control 0xe0*/
-	fwohcireg_t	link_cntl_clr;	/* Chip control clear 0xe4*/
-#define FWOHCI_NODEID	0xe8
-	fwohcireg_t	node;		/* Node ID 0xe8 */
-#define	OHCI_NODE_VALID	(1U << 31)
-#define	OHCI_NODE_ROOT	(1 << 30)
-
-#define	OHCI_ASYSRCBUS	1
-
-	fwohcireg_t	phy_access;	/* PHY cntl 0xec */
-#define	PHYDEV_RDDONE		(1<<31)
-#define	PHYDEV_RDCMD		(1<<15)
-#define	PHYDEV_WRCMD		(1<<14)
-#define	PHYDEV_REGADDR		8
-#define	PHYDEV_WRDATA		0
-#define	PHYDEV_RDADDR		24
-#define	PHYDEV_RDDATA		16
-
-	fwohcireg_t	cycle_timer;	/* Cycle Timer 0xf0 */
-	fwohcireg_t	dummy6[3];	/* dummy 0xf4-fc */
-	fwohcireg_t	areq_hi;	/* Async req. filter hi 0x100 */
-	fwohcireg_t	areq_hi_clr;	/* Async req. filter hi 0x104 */
-	fwohcireg_t	areq_lo;	/* Async req. filter lo 0x108 */
-	fwohcireg_t	areq_lo_clr;	/* Async req. filter lo 0x10c */
-	fwohcireg_t	preq_hi;	/* Async req. filter hi 0x110 */
-	fwohcireg_t	preq_hi_clr;	/* Async req. filter hi 0x114 */
-	fwohcireg_t	preq_lo;	/* Async req. filter lo 0x118 */
-	fwohcireg_t	preq_lo_clr;	/* Async req. filter lo 0x11c */
-
-	fwohcireg_t	pys_upper;	/* Physical Upper bound 0x120 */
-
-	fwohcireg_t	dummy7[23];	/* dummy 0x124-0x17c */
-	
-	/*       0x180, 0x184, 0x188, 0x18c */
-	/*       0x190, 0x194, 0x198, 0x19c */
-	/*       0x1a0, 0x1a4, 0x1a8, 0x1ac */
-	/*       0x1b0, 0x1b4, 0x1b8, 0x1bc */
-	/*       0x1c0, 0x1c4, 0x1c8, 0x1cc */
-	/*       0x1d0, 0x1d4, 0x1d8, 0x1dc */
-	/*       0x1e0, 0x1e4, 0x1e8, 0x1ec */
-	/*       0x1f0, 0x1f4, 0x1f8, 0x1fc */
-	struct ohci_dma dma_ch[0x4];
-
-	/*       0x200, 0x204, 0x208, 0x20c */
-	/*       0x210, 0x204, 0x208, 0x20c */
-	struct ohci_itdma dma_itch[0x20];
-
-	/*       0x400, 0x404, 0x408, 0x40c */
-	/*       0x410, 0x404, 0x408, 0x40c */
-	struct ohci_dma dma_irch[0x20];
-};
-
-struct fwohcidb_tr{
-	STAILQ_ENTRY(fwohcidb_tr) link;
-	struct fw_xfer *xfer;
-	struct fwohcidb *db;
-	bus_dmamap_t dma_map;
-	caddr_t buf;
-	bus_addr_t bus_addr;
-	int dbcnt;
-};
-
-/*
- * OHCI info structure.
- */
-struct fwohci_txpkthdr{
-	union{
-		uint32_t ld[4];
-		struct {
-#if BYTE_ORDER == BIG_ENDIAN
-			uint32_t spd:16, /* XXX include reserved field */
-				 :8,
-				 tcode:4,
-				 :4;
-#else
-			uint32_t :4,
-				 tcode:4,
-				 :8,
-				 spd:16; /* XXX include reserved fields */
-#endif
-		}common;
-		struct {
-#if BYTE_ORDER == BIG_ENDIAN
-			uint32_t :8,
-				 srcbus:1,
-				 :4,
-				 spd:3,
-				 tlrt:8,
-				 tcode:4,
-				 :4;
-#else
-			uint32_t :4,
-				 tcode:4,
-				 tlrt:8,
-				 spd:3,
-				 :4,
-				 srcbus:1,
-				 :8;
-#endif
-			BIT16x2(dst, );
-		}asycomm;
-		struct {
-#if BYTE_ORDER == BIG_ENDIAN
-			uint32_t :13,
-			         spd:3,
-				 chtag:8,
-				 tcode:4,
-				 sy:4;
-#else
-			uint32_t sy:4,
-				 tcode:4,
-				 chtag:8,
-			         spd:3,
-				 :13;
-#endif
-			BIT16x2(len, );
-		}stream;
-	}mode;
-};
-struct fwohci_trailer{
-#if BYTE_ORDER == BIG_ENDIAN
-	uint32_t stat:16,
-		  time:16;
-#else
-	uint32_t time:16,
-		  stat:16;
-#endif
-};
-
-#define	OHCI_CNTL_CYCSRC	(0x1 << 22)
-#define	OHCI_CNTL_CYCMTR	(0x1 << 21)
-#define	OHCI_CNTL_CYCTIMER	(0x1 << 20)
-#define	OHCI_CNTL_PHYPKT	(0x1 << 10)
-#define	OHCI_CNTL_SID		(0x1 << 9)
-
-/*
- * defined in OHCI 1.1 
- * chapter 6.1
- */
-#define OHCI_INT_DMA_ATRQ	(0x1 << 0)
-#define OHCI_INT_DMA_ATRS	(0x1 << 1)
-#define OHCI_INT_DMA_ARRQ	(0x1 << 2)
-#define OHCI_INT_DMA_ARRS	(0x1 << 3)
-#define OHCI_INT_DMA_PRRQ	(0x1 << 4)
-#define OHCI_INT_DMA_PRRS	(0x1 << 5)
-#define OHCI_INT_DMA_IT 	(0x1 << 6)
-#define OHCI_INT_DMA_IR 	(0x1 << 7)
-#define OHCI_INT_PW_ERR 	(0x1 << 8)
-#define OHCI_INT_LR_ERR 	(0x1 << 9)
-#define OHCI_INT_PHY_SID	(0x1 << 16)
-#define OHCI_INT_PHY_BUS_R	(0x1 << 17)
-#define OHCI_INT_REG_FAIL	(0x1 << 18)
-#define OHCI_INT_PHY_INT	(0x1 << 19)
-#define OHCI_INT_CYC_START	(0x1 << 20)
-#define OHCI_INT_CYC_64SECOND	(0x1 << 21)
-#define OHCI_INT_CYC_LOST	(0x1 << 22)
-#define OHCI_INT_CYC_ERR	(0x1 << 23)
-#define OHCI_INT_ERR		(0x1 << 24)
-#define OHCI_INT_CYC_LONG	(0x1 << 25)
-#define OHCI_INT_PHY_REG	(0x1 << 26)
-#define OHCI_INT_EN		(0x1 << 31)
-
-#define IP_CHANNELS             0x0234
-#define FWOHCI_MAXREC		2048
-
-#define	OHCI_ISORA		0x02
-#define	OHCI_ISORB		0x04
-
-#define FWOHCITCODE_PHY		0xe
diff --git a/include.new/dev/firewire/fwohcivar.h b/include.new/dev/firewire/fwohcivar.h
deleted file mode 100644
index d949a58..0000000
--- a/include.new/dev/firewire/fwohcivar.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 2003 Hidetoshi SHimokawa
- * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi SHimokawa
- * 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 acknowledgement as bellow:
- *
- *    This product includes software developed by K. Kobayashi and H. Shimokawa
- *
- * 4. 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 ``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 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: releng/10.2/sys/dev/firewire/fwohcivar.h 188079 2009-02-03 17:13:37Z sbruno $
- *
- */
-
-#include <sys/taskqueue.h>
-
-typedef struct fwohci_softc {
-	struct firewire_comm fc;
-	bus_space_tag_t bst;
-	bus_space_handle_t bsh;
-	void *ih;
-#if defined(__DragonFly__) || __FreeBSD_version < 500000
-	void *ih_cam;
-	void *ih_bio;
-#endif
-	struct resource *bsr;
-	struct resource *irq_res;
-	struct fwohci_dbch{
-		u_int ndb;
-		u_int ndesc;
-		STAILQ_HEAD(, fwohcidb_tr) db_trq;
-		struct fwohcidb_tr *top, *bottom, *pdb_tr;
-		struct fw_xferq xferq;
-		int flags;
-#define	FWOHCI_DBCH_INIT	(1<<0)
-#define	FWOHCI_DBCH_FULL	(1<<1)
-		/* used only in receive context */
-		int buf_offset;	/* signed */
-#define FWOHCI_DBCH_MAX_PAGES	32
-		/* Context programs buffer */
-		struct fwdma_alloc_multi *am;
-		bus_dma_tag_t dmat;
-	} arrq, arrs, atrq, atrs, it[OHCI_DMA_ITCH], ir[OHCI_DMA_IRCH];
-	u_int maxrec;
-	uint32_t *sid_buf;
-	struct fwdma_alloc sid_dma;
-	struct fwdma_alloc crom_dma;
-	struct fwdma_alloc dummy_dma;
-	uint32_t intmask, irstat, itstat;
-	uint32_t intstat;
-	struct task fwohci_task_busreset;
-	struct task fwohci_task_sid;
-	struct task fwohci_task_dma;
-	int cycle_lost;
-} fwohci_softc_t;
-
-void fwohci_intr (void *arg);
-int fwohci_init (struct fwohci_softc *, device_t);
-void fwohci_poll (struct firewire_comm *, int, int);
-void fwohci_reset (struct fwohci_softc *, device_t);
-int fwohci_detach (struct fwohci_softc *, device_t);
-int fwohci_resume (struct fwohci_softc *, device_t);
-int fwohci_stop (struct fwohci_softc *, device_t dev);
diff --git a/include.new/dev/firewire/fwphyreg.h b/include.new/dev/firewire/fwphyreg.h
deleted file mode 100644
index ede9e6f..0000000
--- a/include.new/dev/firewire/fwphyreg.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*-
- * Copyright (C) 2003
- * 	Hidetoshi Shimokawa. 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 Hidetoshi Shimokawa.
- *
- * 4. Neither the name of the author 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.
- * 
- * $FreeBSD: releng/10.2/sys/dev/firewire/fwphyreg.h 188508 2009-02-12 03:05:42Z sbruno $
- */
-
-/*
- * IEEE 1394a
- * Figure 5B - 1
- */
-struct phyreg_base {
-#if BYTE_ORDER == BIG_ENDIAN
-	uint8_t	phy_id:6,
-		r:1,
-		cps:1;
-	uint8_t	rhb:1,
-		ibr:1,
-		gap_count:6;
-	uint8_t	extended:3,
-		num_ports:5;
-	uint8_t	phy_speed:3,
-		:1,
-		delay:4;
-	uint8_t	lctrl:1,
-		c:1,
-		jitter:3,
-		pwr_class:3;
-	uint8_t	wdie:1,
-		isbr:1,
-		ctoi:1,
-		cpsi:1,
-		stoi:1,
-		pei:1,
-		eaa:1,
-		emc:1;
-	uint8_t	legacy_spd:3,
-		blink:1,
-		bridge:2,
-		:2;
-	uint8_t	page_select:3,
-		:1,
-		port_select:4;
-#else
-	uint8_t	cps:1,
-		r:1,
-		phy_id:6;
-	uint8_t	gap_count:6,
-		ibr:1,
-		rhb:1;
-	uint8_t	num_ports:5,
-		extended:3;
-	uint8_t	delay:4,
-		:1,
-		phy_speed:3;
-	uint8_t	pwr_class:3,
-		jitter:3,
-		c:1,
-		lctrl:1;
-	uint8_t	emc:1,
-		eaa:1,
-		pei:1,
-		stoi:1,
-		cpsi:1,
-		ctoi:1,
-		isbr:1,
-		wdie:1;
-	uint8_t	:2,
-		bridge:2,
-		blink:1,
-		legacy_spd:3;
-	uint8_t	port_select:4,
-		:1,
-		page_select:3;
-#endif
-};
-
-/*
- * IEEE 1394a
- * Figure 5B - 2
- */
-struct phyreg_page0 {
-#if BYTE_ORDER == BIG_ENDIAN
-	uint8_t	astat:2,
-		bstat:2,
-		ch:1,
-		con:1,
-		rxok:1,
-		dis:1;
-	uint8_t	negotiated_speed:3,
-		pie:1,
-		fault:1,
-		stanby_fault:1,
-		disscrm:1,
-		b_only:1;
-	uint8_t	dc_connected:1,
-		max_port_speed:3,
-		lpp:1,
-		cable_speed:3;
-	uint8_t	connection_unreliable:1,
-		:3,
-		beta_mode:1,
-		:3;
-	uint8_t	port_error;
-	uint8_t	:5,
-		loop_disable:1,
-		in_standby:1,
-		hard_disable:1;
-	uint8_t	:8;
-	uint8_t	:8;
-#else
-	uint8_t	dis:1,
-		rxok:1,
-		con:1,
-		ch:1,
-		bstat:2,
-		astat:2;
-	uint8_t	b_only:1,
-		disscrm:1,
-		stanby_fault:1,
-		fault:1,
-		pie:1,
-		negotiated_speed:3;
-	uint8_t	cable_speed:3,
-		lpp:1,
-		max_port_speed:3,
-		dc_connected:1;
-	uint8_t	:3,
-		beta_mode:1,
-		:3,
-		connection_unreliable:1;
-	uint8_t	port_error;
-	uint8_t	hard_disable:1,
-		in_standby:1,
-		loop_disable:1,
-		:5;
-	uint8_t	:8;
-	uint8_t	:8;
-#endif
-};
-
-/* 
- * IEEE 1394a
- * Figure 5B - 3
- */
-struct phyreg_page1 {
-	uint8_t	compliance;
-	uint8_t	:8;
-	uint8_t	vendor_id[3];
-	uint8_t	product_id[3];
-};
diff --git a/include.new/dev/firewire/iec13213.h b/include.new/dev/firewire/iec13213.h
deleted file mode 100644
index 71b7cc0..0000000
--- a/include.new/dev/firewire/iec13213.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*-
- * Copyright (c) 2003 Hidetoshi Shimokawa
- * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
- * 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 acknowledgement as bellow:
- *
- *    This product includes software developed by K. Kobayashi and H. Shimokawa
- *
- * 4. 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 ``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 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: releng/10.2/sys/dev/firewire/iec13213.h 139749 2005-01-06 01:43:34Z imp $
- *
- */
-
-#define	STATE_CLEAR	0x0000
-#define	STATE_SET	0x0004
-#define	NODE_IDS	0x0008
-#define	RESET_START	0x000c
-#define	SPLIT_TIMEOUT_HI	0x0018
-#define	SPLIT_TIMEOUT_LO	0x001c
-#define	CYCLE_TIME	0x0200
-#define	BUS_TIME	0x0204
-#define	BUSY_TIMEOUT	0x0210
-#define	PRIORITY_BUDGET 0x0218
-#define	BUS_MGR_ID	0x021c
-#define	BANDWIDTH_AV	0x0220
-#define	CHANNELS_AV_HI	0x0224
-#define	CHANNELS_AV_LO	0x0228
-#define	IP_CHANNELS	0x0234
-
-#define	CONF_ROM	0x0400
-
-#define	TOPO_MAP	0x1000
-#define	SPED_MAP	0x2000
-
-#define CSRTYPE_SHIFT	6
-#define CSRTYPE_MASK	(3 << CSRTYPE_SHIFT)
-#define CSRTYPE_I	(0 << CSRTYPE_SHIFT) /* Immediate */
-#define CSRTYPE_C	(1 << CSRTYPE_SHIFT) /* CSR offset */
-#define CSRTYPE_L	(2 << CSRTYPE_SHIFT) /* Leaf */
-#define CSRTYPE_D	(3 << CSRTYPE_SHIFT) /* Directory */
-
-/*
- * CSR keys
- * 00 - 2F: defined by CSR architecture standards.
- * 30 - 37: defined by BUS starndards
- * 38 - 3F: defined by Vendor/Specifier
- */
-#define CSRKEY_MASK	0x3f
-#define CSRKEY_DESC	0x01 /* Descriptor */
-#define CSRKEY_BDINFO	0x02 /* Bus_Dependent_Info */
-#define CSRKEY_VENDOR	0x03 /* Vendor */
-#define CSRKEY_HW	0x04 /* Hardware_Version */
-#define CSRKEY_MODULE	0x07 /* Module */
-#define CSRKEY_NCAP	0x0c /* Node_Capabilities */
-#define CSRKEY_EUI64	0x0d /* EUI_64 */
-#define CSRKEY_UNIT	0x11 /* Unit */
-#define CSRKEY_SPEC	0x12 /* Specifier_ID */
-#define CSRKEY_VER	0x13 /* Version */
-#define CSRKEY_DINFO	0x14 /* Dependent_Info */
-#define CSRKEY_ULOC	0x15 /* Unit_Location */
-#define CSRKEY_MODEL	0x17 /* Model */
-#define CSRKEY_INST	0x18 /* Instance */
-#define CSRKEY_KEYW	0x19 /* Keyword */
-#define CSRKEY_FEAT	0x1a /* Feature */
-#define CSRKEY_EROM	0x1b /* Extended_ROM */
-#define CSRKEY_EKSID	0x1c /* Extended_Key_Specifier_ID */
-#define CSRKEY_EKEY	0x1d /* Extended_Key */
-#define CSRKEY_EDATA	0x1e /* Extended_Data */
-#define CSRKEY_MDESC	0x1f /* Modifiable_Descriptor */
-#define CSRKEY_DID	0x20 /* Directory_ID */
-#define CSRKEY_REV	0x21 /* Revision */
-
-#define CSRKEY_FIRM_VER	0x3c /* Firmware version */
-#define CSRKEY_UNIT_CH	0x3a /* Unit characteristics */
-#define CSRKEY_COM_SPEC	0x38 /* Command set revision */
-#define CSRKEY_COM_SET	0x39 /* Command set */
-
-#define CROM_UDIR	(CSRTYPE_D | CSRKEY_UNIT)  /* 0x81 Unit directory */
-#define CROM_TEXTLEAF	(CSRTYPE_L | CSRKEY_DESC)  /* 0x81 Text leaf */
-#define CROM_LUN	(CSRTYPE_I | CSRKEY_DINFO) /* 0x14 Logical unit num. */
-#define CROM_MGM	(CSRTYPE_C | CSRKEY_DINFO) /* 0x54 Management agent */
-
-#define CSRVAL_VENDOR_PRIVATE	0xacde48
-#define CSRVAL_1394TA	0x00a02d
-#define CSRVAL_ANSIT10	0x00609e
-#define CSRVAL_IETF	0x00005e
-
-#define CSR_PROTAVC	0x010001
-#define CSR_PROTCAL	0x010002
-#define CSR_PROTEHS	0x010004
-#define CSR_PROTHAVI	0x010008
-#define CSR_PROTCAM104	0x000100
-#define CSR_PROTCAM120	0x000101
-#define CSR_PROTCAM130	0x000102
-#define CSR_PROTDPP	0x0a6be2
-#define CSR_PROTIICP	0x4b661f
-
-#define CSRVAL_T10SBP2	0x010483
-#define CSRVAL_SCSI	0x0104d8
-
-struct csrreg {
-#if BYTE_ORDER == BIG_ENDIAN
-	uint32_t key:8,
-		 val:24;
-#else
-	uint32_t val:24,
-		 key:8;
-#endif
-};
-struct csrhdr {
-#if BYTE_ORDER == BIG_ENDIAN
-	uint32_t info_len:8,
-		 crc_len:8,
-		 crc:16;
-#else
-	uint32_t crc:16,
-		 crc_len:8,
-		 info_len:8;
-#endif
-};
-struct csrdirectory {
-	BIT16x2(crc_len, crc);
-	struct csrreg entry[0];
-};
-struct csrtext {
-	BIT16x2(crc_len, crc);
-#if BYTE_ORDER == BIG_ENDIAN
-	uint32_t spec_type:8,
-		 spec_id:24;
-#else
-	uint32_t spec_id:24,
-		 spec_type:8;
-#endif
-	uint32_t lang_id;
-	uint32_t text[0];
-};
-
-struct bus_info {
-#define	CSR_BUS_NAME_IEEE1394	0x31333934
-	uint32_t bus_name;	
-#if BYTE_ORDER == BIG_ENDIAN
-	uint32_t irmc:1,		/* iso. resource manager capable */
-		 cmc:1,			/* cycle master capable */
-		 isc:1,			/* iso. operation support */
-		 bmc:1,			/* bus manager capable */
-		 pmc:1,			/* power manager capable */
-		 :3,
-		 cyc_clk_acc:8,		/* 0 <= ppm <= 100 */
-		 max_rec:4,		/* (2 << max_rec) bytes */
-		 :2,
-		 max_rom:2,
-		 generation:4,
-		 :1,
-		 link_spd:3;
-#else
-	uint32_t link_spd:3,
-		 :1,
-		 generation:4,
-		 max_rom:2,
-		 :2,
-		 max_rec:4,		/* (2 << max_rec) bytes */
-		 cyc_clk_acc:8,		/* 0 <= ppm <= 100 */
-		 :3,
-		 pmc:1,			/* power manager capable */
-		 bmc:1,			/* bus manager capable */
-		 isc:1,			/* iso. operation support */
-		 cmc:1,			/* cycle master capable */
-		 irmc:1;		/* iso. resource manager capable */
-#endif
-	struct fw_eui64 eui64;
-};
-/* max_rom */
-#define MAXROM_4	0
-#define MAXROM_64	1
-#define MAXROM_1024	2
-
-#define CROM_MAX_DEPTH	10
-struct crom_ptr {
-	struct csrdirectory *dir;
-	int index;
-};
-
-struct crom_context {
-	int depth;
-	struct crom_ptr stack[CROM_MAX_DEPTH];
-};
-
-void crom_init_context(struct crom_context *, uint32_t *);
-struct csrreg *crom_get(struct crom_context *);
-void crom_next(struct crom_context *);
-void crom_parse_text(struct crom_context *, char *, int);
-uint16_t crom_crc(uint32_t *r, int);
-struct csrreg *crom_search_key(struct crom_context *, uint8_t);
-int crom_has_specver(uint32_t *, uint32_t, uint32_t);
-
-#if !defined(_KERNEL) && !defined(_BOOT)
-char *crom_desc(struct crom_context *, char *, int);
-#endif
-
-/* For CROM build */
-#if defined(_KERNEL) || defined(_BOOT) || defined(TEST)
-#define CROM_MAX_CHUNK_LEN 20
-struct crom_src {
-	struct csrhdr hdr;
-	struct bus_info businfo;
-	STAILQ_HEAD(, crom_chunk) chunk_list;
-};
-
-struct crom_chunk {
-	STAILQ_ENTRY(crom_chunk) link;
-	struct crom_chunk *ref_chunk; 
-	int ref_index; 
-	int offset;
-	struct {
-		BIT16x2(crc_len, crc);
-		uint32_t buf[CROM_MAX_CHUNK_LEN]; 
-	} data;
-};
-
-extern int crom_add_quad(struct crom_chunk *, uint32_t);
-extern int crom_add_entry(struct crom_chunk *, int, int);
-extern int crom_add_chunk(struct crom_src *src, struct crom_chunk *,
-					struct crom_chunk *, int);
-extern int crom_add_simple_text(struct crom_src *src, struct crom_chunk *,
-					struct crom_chunk *, char *);
-extern int crom_load(struct crom_src *, uint32_t *, int);
-#endif
diff --git a/include.new/dev/firewire/iec68113.h b/include.new/dev/firewire/iec68113.h
deleted file mode 100644
index 5e4e96e..0000000
--- a/include.new/dev/firewire/iec68113.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (c) 2003 Hidetoshi Shimokawa
- * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
- * 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 acknowledgement as bellow:
- *
- *    This product includes software developed by K. Kobayashi and H. Shimokawa
- *
- * 4. 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 ``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 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: releng/10.2/sys/dev/firewire/iec68113.h 139749 2005-01-06 01:43:34Z imp $
- *
- */
-
-#define		DV_BROADCAST_ON (1<<30)
-#define		oMPR		0x900
-#define		oPCR		0x904
-#define		iMPR		0x980
-#define		iPCR		0x984
-
-struct ciphdr {
-#if BYTE_ORDER == BIG_ENDIAN
-	uint8_t eoh0:1,		/* 0 */
-		form0:1,	/* 0 */
-		src:6;
-#else
-	uint8_t src:6,
-		form0:1,	/* 0 */
-		eoh0:1;		/* 0 */
-#endif
-	uint8_t len;
-#if BYTE_ORDER == BIG_ENDIAN
-	uint8_t fn:2,
-		qpc:3,
-		sph:1,
-		:2;
-#else
-	uint8_t :2,
-		sph:1,
-		qpc:3,
-		fn:2;
-#endif
-	uint8_t dbc;
-#if BYTE_ORDER == BIG_ENDIAN
-	uint8_t eoh1:1,		/* 1 */
-		form1:1,	/* 0 */
-		fmt:6;
-#else
-	uint8_t fmt:6,
-		form1:1,	/* 0 */
-		eoh1:1;		/* 1 */
-#endif
-#define CIP_FMT_DVCR	0
-#define CIP_FMT_MPEG	(1<<5)
-	union {
-		struct {
-#if BYTE_ORDER == BIG_ENDIAN
-			uint8_t fs:1,		/* 50/60 field system
-								NTSC/PAL */
-				stype:5,
-				:2;
-#else
-			uint8_t :2,
-				stype:5,
-		  		fs:1;		/* 50/60 field system
-								NTSC/PAL */
-#endif
-#define	CIP_STYPE_SD	0
-#define	CIP_STYPE_SDL	1
-#define	CIP_STYPE_HD	2
-	  		uint16_t cyc:16;	/* take care of byte order! */
-		} __attribute__ ((packed)) dv;
-		uint8_t bytes[3];
-	} fdf;
-
-};
-struct dvdbc{
-#if BYTE_ORDER == BIG_ENDIAN
-	uint8_t sct:3,		/* Section type */
-		:1,		/* Reserved */
-		arb:4;		/* Arbitrary bit */
-#else
-	uint8_t arb:4,		/* Arbitrary bit */
-		:1,		/* Reserved */
-		sct:3;		/* Section type */
-#endif
-#define	DV_SCT_HEADER	0
-#define	DV_SCT_SUBCODE	1
-#define	DV_SCT_VAUX	2
-#define	DV_SCT_AUDIO	3
-#define	DV_SCT_VIDEO	4
-#if BYTE_ORDER == BIG_ENDIAN
-	uint8_t dseq:4,		/* DIF sequence number */
-		fsc:1,		/* ID of a DIF block in each channel */
-		:3;
-#else
-	uint8_t :3,
-		fsc:1,		/* ID of a DIF block in each channel */
-		dseq:4;		/* DIF sequence number */
-#endif
-	uint8_t dbn;		/* DIF block number */
-	uint8_t payload[77];
-#define	DV_DSF_12	0x80	/* PAL: payload[0] in Header DIF */
-};
diff --git a/include.new/dev/firewire/if_fwevar.h b/include.new/dev/firewire/if_fwevar.h
deleted file mode 100644
index 168934d..0000000
--- a/include.new/dev/firewire/if_fwevar.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2002-2003
- * 	Hidetoshi Shimokawa. 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 Hidetoshi Shimokawa.
- *
- * 4. Neither the name of the author 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.
- * 
- * $FreeBSD: releng/10.2/sys/dev/firewire/if_fwevar.h 170374 2007-06-06 14:31:36Z simokawa $
- */
-
-#ifndef _NET_IF_FWEVAR_H_
-#define _NET_IF_FWEVAR_H_
-
-struct fwe_softc {
-	/* XXX this must be the first for fd.post_explore() */
-	struct firewire_dev_comm fd;
-	short stream_ch;
-	short dma_ch;
-	struct fw_pkt pkt_hdr;
-	STAILQ_HEAD(, fw_xfer) xferlist;
-	struct fwe_eth_softc {
-		struct ifnet *ifp;
-		struct fwe_softc *fwe;
-	} eth_softc;
-	struct mtx mtx;
-};
-#define FWE_LOCK(fwe)	mtx_lock(&(fwe)->mtx)
-#define FWE_UNLOCK(fwe)	mtx_unlock(&(fwe)->mtx)
-#endif /* !_NET_IF_FWEVAR_H_ */
diff --git a/include.new/dev/firewire/if_fwipvar.h b/include.new/dev/firewire/if_fwipvar.h
deleted file mode 100644
index 160a34d..0000000
--- a/include.new/dev/firewire/if_fwipvar.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2004
- *	Doug Rabson
- * Copyright (c) 2002-2003
- * 	Hidetoshi Shimokawa. 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 Hidetoshi Shimokawa.
- *
- * 4. Neither the name of the author 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.
- * 
- * $FreeBSD: releng/10.2/sys/dev/firewire/if_fwipvar.h 170374 2007-06-06 14:31:36Z simokawa $
- */
-
-#ifndef _NET_IF_FWIPVAR_H_
-#define _NET_IF_FWIPVAR_H_
-
-struct fwip_softc {
-	/* XXX this must be first for fd.post_explore() */
-	struct firewire_dev_comm fd;
-	short dma_ch;
-	struct fw_bind fwb;
-	struct fw_eui64 last_dest;
-	struct fw_pkt last_hdr;
-	struct task start_send;
-	STAILQ_HEAD(, fw_xfer) xferlist;
-	struct crom_chunk unit4;	/* unit directory for IPv4 */
-	struct crom_chunk spec4;	/* specifier description IPv4 */
-	struct crom_chunk ver4;		/* version description IPv4 */
-	struct crom_chunk unit6;	/* unit directory for IPv6 */
-	struct crom_chunk spec6;	/* specifier description IPv6 */
-	struct crom_chunk ver6;		/* version description IPv6 */
-	struct fwip_eth_softc {
-		struct ifnet *fwip_ifp;
-		struct fwip_softc *fwip;
-	} fw_softc;
-	struct mtx mtx;
-};
-#define FWIP_LOCK(fwip)   mtx_lock(&(fwip)->mtx)
-#define FWIP_UNLOCK(fwip) mtx_unlock(&(fwip)->mtx)
-#endif /* !_NET_IF_FWIPVAR_H_ */
diff --git a/include.new/dev/firewire/sbp.h b/include.new/dev/firewire/sbp.h
deleted file mode 100644
index 46b6a32..0000000
--- a/include.new/dev/firewire/sbp.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * Copyright (c) 2003 Hidetoshi Shimokawa
- * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
- * 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 acknowledgement as bellow:
- *
- *    This product includes software developed by K. Kobayashi and H. Shimokawa
- *
- * 4. 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 ``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 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: releng/10.2/sys/dev/firewire/sbp.h 261455 2014-02-04 03:36:42Z eadler $
- *
- */
-
-#define ORB_NOTIFY	(1U << 31)
-#define	ORB_FMT_STD	(0 << 29)
-#define	ORB_FMT_VED	(2 << 29)
-#define	ORB_FMT_NOP	(3 << 29)
-#define	ORB_FMT_MSK	(3 << 29)
-#define	ORB_EXV		(1 << 28)
-/* */
-#define	ORB_CMD_IN	(1 << 27)
-/* */
-#define	ORB_CMD_SPD(x)	((x) << 24)
-#define	ORB_CMD_MAXP(x)	((x) << 20)
-#define	ORB_RCN_TMO(x)	((x) << 20)
-#define	ORB_CMD_PTBL	(1 << 19)
-#define	ORB_CMD_PSZ(x)	((x) << 16)
-
-#define	ORB_FUN_LGI	(0 << 16)
-#define	ORB_FUN_QLG	(1 << 16)
-#define	ORB_FUN_RCN	(3 << 16)
-#define	ORB_FUN_LGO	(7 << 16)
-#define	ORB_FUN_ATA	(0xb << 16)
-#define	ORB_FUN_ATS	(0xc << 16)
-#define	ORB_FUN_LUR	(0xe << 16)
-#define	ORB_FUN_RST	(0xf << 16)
-#define	ORB_FUN_MSK	(0xf << 16)
-#define	ORB_FUN_RUNQUEUE 0xffff
-
-#define ORB_RES_CMPL 0
-#define ORB_RES_FAIL 1
-#define ORB_RES_ILLE 2
-#define ORB_RES_VEND 3
-
-#define SBP_DEBUG(x)	if (debug > x) {
-#define END_DEBUG	}
-
-struct ind_ptr {
-	uint32_t hi,lo;
-};
-
-
-#define SBP_RECV_LEN 32
-
-struct sbp_login_res{
-	uint16_t	len;
-	uint16_t	id;
-	uint16_t	res0;
-	uint16_t	cmd_hi;
-	uint32_t	cmd_lo;
-	uint16_t	res1;
-	uint16_t	recon_hold;
-};
-
-struct sbp_status{
-#if BYTE_ORDER == BIG_ENDIAN
-	uint8_t		src:2,
-			resp:2,
-			dead:1,
-			len:3;
-#else
-	uint8_t		len:3,
-			dead:1,
-			resp:2,
-			src:2;
-#endif
-	uint8_t		status;
-	uint16_t	orb_hi;
-	uint32_t	orb_lo;
-	uint32_t	data[6];
-};
-/* src */
-#define SRC_NEXT_EXISTS	0
-#define SRC_NO_NEXT	1
-#define SRC_UNSOL	2
-
-/* resp */
-#define SBP_REQ_CMP	0	/* request complete */
-#define SBP_TRANS_FAIL	1	/* transport failure */
-#define SBP_ILLE_REQ	2	/* illegal request */
-#define SBP_VEND_DEP	3	/* vendor dependent */
-
-/* status (resp == 0) */
-/*   0: No additional Information to report */
-/*   1: Request Type not supported */
-/*   2: Speed not supported */
-/*   3: Page size not supported */
-/*   4: Access denied */
-#define STATUS_ACCESS_DENY	4
-#define STATUS_LUR		5
-/*   6: Maximum payload too small */
-/*   7: Reserved for future standardization */
-/*   8: Resource unavailabe */
-#define STATUS_RES_UNAVAIL	8
-/*   9: Function Rejected */
-/*  10: Login ID not recognized */
-/*  11: Dummy ORB completed */
-/*  12: Request aborted */
-/* 255: Unspecified error */
-
-/* status (resp == 1) */
-/* Referenced object */
-#define OBJ_ORB		(0 << 6)	/* 0: ORB */
-#define OBJ_DATA	(1 << 6)	/* 1: Data buffer */
-#define OBJ_PT		(2 << 6)	/* 2: Page table */
-#define OBJ_UNSPEC	(3 << 6)	/* 3: Unable to specify */
-/* Serial bus error */
-/* 0: Missing acknowledge */
-/* 1: Reserved; not to be used */
-/* 2: Time-out error */
-#define SBE_TIMEOUT 2
-/* 3: Reserved; not to be used */
-/* 4: Busy retry limit exceeded: ack_busy_X */
-/* 5: Busy retry limit exceeded: ack_busy_A */
-/* 6: Busy retry limit exceeded: ack_busy_B */
-/* 7-A: Reserved for future standardization */
-/* B: Tardy retry limit exceeded */
-/* C: Confilict error */
-/* D: Data error */
-/* E: Type error */
-/* F: Address error */
-
-
-struct sbp_cmd_status{
-#define SBP_SFMT_CURR 0
-#define SBP_SFMT_DEFER 1
-#if BYTE_ORDER == BIG_ENDIAN
-	uint8_t		sfmt:2,
-			status:6;
-	uint8_t		valid:1,
-			mark:1,
-			eom:1,
-			ill_len:1,
-			s_key:4;
-#else
-	uint8_t		status:6,
-			sfmt:2;
-	uint8_t		s_key:4,
-			ill_len:1,
-			eom:1,
-			mark:1,
-			valid:1;
-#endif
-	uint8_t		s_code;
-	uint8_t		s_qlfr;
-	uint32_t	info;
-	uint32_t	cdb;
-	uint8_t		fru;
-	uint8_t		s_keydep[3];
-	uint32_t	vend[2];
-};
-
-#define ORB_FUN_NAMES \
-	/* 0 */ "LOGIN", \
-	/* 1 */ "QUERY LOGINS", \
-	/* 2 */ "Reserved", \
-	/* 3 */ "RECONNECT", \
-	/* 4 */ "SET PASSWORD", \
-	/* 5 */ "Reserved", \
-	/* 6 */ "Reserved", \
-	/* 7 */ "LOGOUT", \
-	/* 8 */ "Reserved", \
-	/* 9 */ "Reserved", \
-	/* A */ "Reserved", \
-	/* B */ "ABORT TASK", \
-	/* C */ "ABORT TASK SET", \
-	/* D */ "Reserved", \
-	/* E */ "LOGICAL UNIT RESET", \
-	/* F */ "TARGET RESET"
diff --git a/include.new/dev/hwpmc/hwpmc_amd.h b/include.new/dev/hwpmc/hwpmc_amd.h
deleted file mode 100644
index afc0d6f..0000000
--- a/include.new/dev/hwpmc/hwpmc_amd.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 2005, Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_amd.h 184802 2008-11-09 17:37:54Z jkoshy $
- */
-
-/* Machine dependent interfaces */
-
-#ifndef _DEV_HWPMC_AMD_H_
-#define	_DEV_HWPMC_AMD_H_ 1
-
-/* AMD K7 and K8 PMCs */
-
-#define	AMD_PMC_EVSEL_0		0xC0010000
-#define	AMD_PMC_EVSEL_1		0xC0010001
-#define	AMD_PMC_EVSEL_2		0xC0010002
-#define	AMD_PMC_EVSEL_3		0xC0010003
-
-#define	AMD_PMC_PERFCTR_0	0xC0010004
-#define	AMD_PMC_PERFCTR_1	0xC0010005
-#define	AMD_PMC_PERFCTR_2	0xC0010006
-#define	AMD_PMC_PERFCTR_3	0xC0010007
-
-
-#define	AMD_NPMCS		4
-
-#define	AMD_PMC_COUNTERMASK	0xFF000000
-#define	AMD_PMC_TO_COUNTER(x)	(((x) << 24) & AMD_PMC_COUNTERMASK)
-#define	AMD_PMC_INVERT		(1 << 23)
-#define	AMD_PMC_ENABLE		(1 << 22)
-#define	AMD_PMC_INT		(1 << 20)
-#define	AMD_PMC_PC		(1 << 19)
-#define	AMD_PMC_EDGE		(1 << 18)
-#define	AMD_PMC_OS		(1 << 17)
-#define	AMD_PMC_USR		(1 << 16)
-
-#define	AMD_PMC_UNITMASK_M	0x10
-#define	AMD_PMC_UNITMASK_O	0x08
-#define	AMD_PMC_UNITMASK_E	0x04
-#define	AMD_PMC_UNITMASK_S	0x02
-#define	AMD_PMC_UNITMASK_I	0x01
-#define	AMD_PMC_UNITMASK_MOESI	0x1F
-
-#define	AMD_PMC_UNITMASK	0xFF00
-#define	AMD_PMC_EVENTMASK 	0x00FF
-
-#define	AMD_PMC_TO_UNITMASK(x)	(((x) << 8) & AMD_PMC_UNITMASK)
-#define	AMD_PMC_TO_EVENTMASK(x)	((x) & 0xFF)
-#define	AMD_VALID_BITS		(AMD_PMC_COUNTERMASK | AMD_PMC_INVERT |	\
-	AMD_PMC_ENABLE | AMD_PMC_INT | AMD_PMC_PC | AMD_PMC_EDGE | 	\
-	AMD_PMC_OS | AMD_PMC_USR | AMD_PMC_UNITMASK | AMD_PMC_EVENTMASK)
-
-#define AMD_PMC_CAPS		(PMC_CAP_INTERRUPT | PMC_CAP_USER | 	\
-	PMC_CAP_SYSTEM | PMC_CAP_EDGE | PMC_CAP_THRESHOLD | 		\
-	PMC_CAP_READ | PMC_CAP_WRITE | PMC_CAP_INVERT | PMC_CAP_QUALIFIER)
-
-#define AMD_PMC_IS_STOPPED(evsel) ((rdmsr((evsel)) & AMD_PMC_ENABLE) == 0)
-#define AMD_PMC_HAS_OVERFLOWED(pmc) ((rdpmc(pmc) & (1ULL << 47)) == 0)
-
-#define	AMD_RELOAD_COUNT_TO_PERFCTR_VALUE(V)	(-(V))
-#define	AMD_PERFCTR_VALUE_TO_RELOAD_COUNT(P)	(-(P))
-
-struct pmc_md_amd_op_pmcallocate {
-	uint32_t	pm_amd_config;
-};
-
-#ifdef _KERNEL
-
-/* MD extension for 'struct pmc' */
-struct pmc_md_amd_pmc {
-	uint32_t	pm_amd_evsel;
-};
-
-#endif /* _KERNEL */
-#endif /* _DEV_HWPMC_AMD_H_ */
diff --git a/include.new/dev/hwpmc/hwpmc_core.h b/include.new/dev/hwpmc/hwpmc_core.h
deleted file mode 100644
index 45f75cf..0000000
--- a/include.new/dev/hwpmc/hwpmc_core.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*-
- * Copyright (c) 2008 Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_core.h 266452 2014-05-19 19:49:06Z markj $
- */
-
-#ifndef _DEV_HWPMC_CORE_H_
-#define	_DEV_HWPMC_CORE_H_ 1
-
-/*
- * Fixed-function PMCs.
- */
-struct pmc_md_iaf_op_pmcallocate {
-	uint16_t	pm_iaf_flags;	/* additional flags */
-};
-
-#define	IAF_OS		0x1
-#define	IAF_USR		0x2
-#define	IAF_ANY		0x4
-#define	IAF_PMI		0x8
-
-/*
- * Programmable PMCs.
- */
-struct pmc_md_iap_op_pmcallocate {
-	uint32_t	pm_iap_config;
-	uint64_t	pm_iap_rsp;
-};
-
-#define	IAP_EVSEL(C)	((C) & 0xFF)
-#define	IAP_UMASK(C)	((C) & 0xFF00)
-#define	IAP_USR		(1 << 16)
-#define	IAP_OS		(1 << 17)
-#define	IAP_EDGE	(1 << 18)
-#define	IAP_INT		(1 << 20)
-#define	IAP_ANY		(1 << 21)
-#define	IAP_EN		(1 << 22)
-#define	IAP_INV		(1 << 23)
-#define	IAP_CMASK(C)	(((C) & 0xFF) << 24)
-
-#define	IA_OFFCORE_RSP_MASK_I7WM	0x000000F7FF
-#define	IA_OFFCORE_RSP_MASK_SBIB	0x3F807F8FFF
-
-#ifdef	_KERNEL
-
-/*
- * Fixed-function counters.
- */
-
-#define	IAF_MASK				0xF
-
-#define	IAF_COUNTER_MASK			0x0000ffffffffffff
-#define	IAF_CTR0				0x309
-#define	IAF_CTR1				0x30A
-#define	IAF_CTR2				0x30B
-
-/*
- * The IAF_CTRL MSR is laid out in the following way.
- *
- * Bit Position    Use
- * 63 - 12         Reserved (do not touch)
- * 11              Ctr 2 PMI
- * 10              Reserved (do not touch)
- * 9-8             Ctr 2 Enable
- * 7               Ctr 1 PMI
- * 6               Reserved (do not touch)
- * 5-4             Ctr 1 Enable
- * 3               Ctr 0 PMI
- * 2               Reserved (do not touch)
- * 1-0             Ctr 0 Enable (3: All Levels, 2: User, 1: OS, 0: Disable)
- */
-
-#define	IAF_OFFSET				32
-#define	IAF_CTRL				0x38D
-#define	IAF_CTRL_MASK				0x0000000000000bbb
-
-/*
- * Programmable counters.
- */
-
-#define	IAP_PMC0				0x0C1
-
-/*
- * IAP_EVSEL(n) is laid out in the following way.
- *
- * Bit Position    Use
- * 63-31           Reserved (do not touch)
- * 31-24           Counter Mask
- * 23              Invert
- * 22              Enable
- * 21              Reserved (do not touch)
- * 20              APIC Interrupt Enable
- * 19              Pin Control
- * 18              Edge Detect
- * 17              OS
- * 16              User
- * 15-8            Unit Mask
- * 7-0             Event Select
- */
-
-#define	IAP_EVSEL_MASK				0x00000000ffdfffff
-#define	IAP_EVSEL0				0x186
-
-/*
- * Simplified programming interface in Intel Performance Architecture
- * v2 and later.
- */
-
-#define	IA_GLOBAL_STATUS			0x38E
-#define	IA_GLOBAL_CTRL				0x38F
-
-/*
- * IA_GLOBAL_CTRL is layed out in the following way.
- * 
- * Bit Position    Use
- * 63-35           Reserved (do not touch)
- * 34              IAF Counter 2 Enable
- * 33              IAF Counter 1 Enable
- * 32              IAF Counter 0 Enable
- * 31-0            Depends on programmable counters
- */
-
-/* The mask is only for the fixed porttion of the register. */
-#define	IAF_GLOBAL_CTRL_MASK			0x0000000700000000
-
-/* The mask is only for the programmable porttion of the register. */
-#define IAP_GLOBAL_CTRL_MASK			0x00000000ffffffff
-
-/* The mask is for both the fixed and programmable porttions of the register. */
-#define IA_GLOBAL_CTRL_MASK			0x00000007ffffffff
-
-#define	IA_GLOBAL_OVF_CTRL			0x390
-
-#define	IA_GLOBAL_STATUS_FLAG_CONDCHG		(1ULL << 63)
-#define	IA_GLOBAL_STATUS_FLAG_OVFBUF		(1ULL << 62)
-
-/*
- * Offcore response configuration.
- */
-#define	IA_OFFCORE_RSP0				0x1A6
-#define	IA_OFFCORE_RSP1				0x1A7
-
-struct pmc_md_iaf_pmc {
-	uint64_t	pm_iaf_ctrl;
-};
-
-struct pmc_md_iap_pmc {
-	uint32_t	pm_iap_evsel;
-	uint64_t	pm_iap_rsp;
-};
-
-/*
- * Prototypes.
- */
-
-int	pmc_core_initialize(struct pmc_mdep *_md, int _maxcpu);
-void	pmc_core_finalize(struct pmc_mdep *_md);
-
-int	pmc_iaf_initialize(struct pmc_mdep *_md, int _maxcpu, int _npmc, int _width);
-void	pmc_iaf_finalize(struct pmc_mdep *_md);
-
-int	pmc_iap_initialize(struct pmc_mdep *_md, int _maxcpu, int _npmc, int _width,
-	    int _flags);
-void	pmc_iap_finalize(struct pmc_mdep *_md);
-
-#endif	/* _KERNEL */
-#endif	/* _DEV_HWPMC_CORE_H */
diff --git a/include.new/dev/hwpmc/hwpmc_pentium.h b/include.new/dev/hwpmc/hwpmc_pentium.h
deleted file mode 100644
index 11f0234..0000000
--- a/include.new/dev/hwpmc/hwpmc_pentium.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 2005, Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_pentium.h 184802 2008-11-09 17:37:54Z jkoshy $
- */
-
-/* Machine dependent interfaces */
-
-#ifndef _DEV_HWPMC_PENTIUM_H_
-#define	_DEV_HWPMC_PENTIUM_H_ 1
-
-/* Intel Pentium PMCs */
-
-#define	PENTIUM_NPMCS	2
-#define	PENTIUM_CESR_PC1		(1 << 25)
-#define	PENTIUM_CESR_CC1_MASK		0x01C00000
-#define	PENTIUM_CESR_TO_CC1(C)		(((C) & 0x07) << 22)
-#define	PENTIUM_CESR_ES1_MASK		0x003F0000
-#define	PENTIUM_CESR_TO_ES1(E)		(((E) & 0x3F) << 16)
-#define	PENTIUM_CESR_PC0		(1 << 9)
-#define	PENTIUM_CESR_CC0_MASK		0x000001C0
-#define	PENTIUM_CESR_TO_CC0(C)		(((C) & 0x07) << 6)
-#define	PENTIUM_CESR_ES0_MASK		0x0000003F
-#define	PENTIUM_CESR_TO_ES0(E)		((E) & 0x3F)
-#define	PENTIUM_CESR_RESERVED		0xFC00FC00
-
-#define	PENTIUM_MSR_CESR		0x11
-#define	PENTIUM_MSR_CTR0		0x12
-#define	PENTIUM_MSR_CTR1		0x13
-
-struct pmc_md_pentium_op_pmcallocate {
-	uint32_t	pm_pentium_config;
-};
-
-#ifdef _KERNEL
-
-/* MD extension for 'struct pmc' */
-struct pmc_md_pentium_pmc {
-	uint32_t	pm_pentium_cesr;
-};
-
-
-/*
- * Prototypes
- */
-
-int	pmc_p5_initialize(struct pmc_mdep *_md, int _ncpus);
-void	pmc_p5_finalize(struct pmc_mdep *_md);
-
-#endif /* _KERNEL */
-#endif /* _DEV_HWPMC_PENTIUM_H_ */
diff --git a/include.new/dev/hwpmc/hwpmc_piv.h b/include.new/dev/hwpmc/hwpmc_piv.h
deleted file mode 100644
index 0e6bf01..0000000
--- a/include.new/dev/hwpmc/hwpmc_piv.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * Copyright (c) 2005, Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_piv.h 261455 2014-02-04 03:36:42Z eadler $
- */
-
-/* Machine dependent interfaces */
-
-#ifndef _DEV_HWPMC_PIV_H_
-#define	_DEV_HWPMC_PIV_H_ 1
-
-/* Intel P4 PMCs */
-
-#define	P4_NPMCS		18
-#define	P4_NESCR		45
-#define	P4_INVALID_PMC_INDEX	-1
-#define	P4_MAX_ESCR_PER_EVENT	2
-#define	P4_MAX_PMC_PER_ESCR	3
-
-#define	P4_CCCR_OVF			(1U << 31)
-#define	P4_CCCR_CASCADE			(1 << 30)
-#define	P4_CCCR_OVF_PMI_T1		(1 << 27)
-#define	P4_CCCR_OVF_PMI_T0		(1 << 26)
-#define	P4_CCCR_FORCE_OVF		(1 << 25)
-#define	P4_CCCR_EDGE			(1 << 24)
-#define	P4_CCCR_THRESHOLD_SHIFT		20
-#define	P4_CCCR_THRESHOLD_MASK		0x00F00000
-#define	P4_CCCR_TO_THRESHOLD(C)		(((C) << P4_CCCR_THRESHOLD_SHIFT) & \
-	P4_CCCR_THRESHOLD_MASK)
-#define	P4_CCCR_COMPLEMENT		(1 << 19)
-#define	P4_CCCR_COMPARE			(1 << 18)
-#define	P4_CCCR_ACTIVE_THREAD_SHIFT	16
-#define	P4_CCCR_ACTIVE_THREAD_MASK	0x00030000
-#define	P4_CCCR_TO_ACTIVE_THREAD(T)	(((T) << P4_CCCR_ACTIVE_THREAD_SHIFT) & \
-	P4_CCCR_ACTIVE_THREAD_MASK)
-#define	P4_CCCR_ESCR_SELECT_SHIFT	13
-#define	P4_CCCR_ESCR_SELECT_MASK	0x0000E000
-#define	P4_CCCR_TO_ESCR_SELECT(E)	(((E) << P4_CCCR_ESCR_SELECT_SHIFT) & \
-	P4_CCCR_ESCR_SELECT_MASK)
-#define	P4_CCCR_ENABLE			(1 << 12)
-#define	P4_CCCR_VALID_BITS		(P4_CCCR_OVF | P4_CCCR_CASCADE | \
-    P4_CCCR_OVF_PMI_T1 | P4_CCCR_OVF_PMI_T0 | P4_CCCR_FORCE_OVF | 	 \
-    P4_CCCR_EDGE | P4_CCCR_THRESHOLD_MASK | P4_CCCR_COMPLEMENT |	 \
-    P4_CCCR_COMPARE | P4_CCCR_ESCR_SELECT_MASK | P4_CCCR_ENABLE)
-
-#define	P4_ESCR_EVENT_SELECT_SHIFT	25
-#define	P4_ESCR_EVENT_SELECT_MASK	0x7E000000
-#define	P4_ESCR_TO_EVENT_SELECT(E)	(((E) << P4_ESCR_EVENT_SELECT_SHIFT) & \
-	P4_ESCR_EVENT_SELECT_MASK)
-#define	P4_ESCR_EVENT_MASK_SHIFT	9
-#define	P4_ESCR_EVENT_MASK_MASK		0x01FFFE00
-#define	P4_ESCR_TO_EVENT_MASK(M)	(((M) << P4_ESCR_EVENT_MASK_SHIFT) & \
-	P4_ESCR_EVENT_MASK_MASK)
-#define	P4_ESCR_TAG_VALUE_SHIFT		5
-#define	P4_ESCR_TAG_VALUE_MASK		0x000001E0
-#define	P4_ESCR_TO_TAG_VALUE(T)		(((T) << P4_ESCR_TAG_VALUE_SHIFT) & \
-	P4_ESCR_TAG_VALUE_MASK)
-#define	P4_ESCR_TAG_ENABLE 		0x00000010
-#define	P4_ESCR_T0_OS			0x00000008
-#define	P4_ESCR_T0_USR			0x00000004
-#define	P4_ESCR_T1_OS			0x00000002
-#define	P4_ESCR_T1_USR			0x00000001
-#define	P4_ESCR_OS			P4_ESCR_T0_OS
-#define	P4_ESCR_USR			P4_ESCR_T0_USR
-#define	P4_ESCR_VALID_BITS		(P4_ESCR_EVENT_SELECT_MASK |	\
-    P4_ESCR_EVENT_MASK_MASK | P4_ESCR_TAG_VALUE_MASK | 			\
-    P4_ESCR_TAG_ENABLE | P4_ESCR_T0_OS | P4_ESCR_T0_USR | P4_ESCR_T1_OS \
-    P4_ESCR_T1_USR)
-
-#define	P4_PERFCTR_MASK			0xFFFFFFFFFFLL /* 40 bits */
-#define	P4_PERFCTR_OVERFLOWED(PMC)	((rdpmc(PMC) & (1LL << 39)) == 0)
-
-#define	P4_CCCR_MSR_FIRST		0x360 /* MSR_BPU_CCCR0 */
-#define	P4_PERFCTR_MSR_FIRST		0x300 /* MSR_BPU_COUNTER0 */
-
-#define	P4_RELOAD_COUNT_TO_PERFCTR_VALUE(V)	(1 - (V))
-#define	P4_PERFCTR_VALUE_TO_RELOAD_COUNT(P)	(1 - (P))
-
-struct pmc_md_p4_op_pmcallocate {
-	uint32_t	pm_p4_cccrconfig;
-	uint32_t	pm_p4_escrconfig;
-};
-
-#ifdef _KERNEL
-
-/* MD extension for 'struct pmc' */
-struct pmc_md_p4_pmc {
-	uint32_t	pm_p4_cccrvalue;
-	uint32_t	pm_p4_escrvalue;
-	uint32_t	pm_p4_escr;
-	uint32_t	pm_p4_escrmsr;
-};
-
-
-/*
- * Prototypes
- */
-
-int	pmc_p4_initialize(struct pmc_mdep *_md, int _ncpus);
-void	pmc_p4_finalize(struct pmc_mdep *md);
-
-#endif /* _KERNEL */
-#endif /* _DEV_HWPMC_PIV_H_ */
diff --git a/include.new/dev/hwpmc/hwpmc_powerpc.h b/include.new/dev/hwpmc/hwpmc_powerpc.h
deleted file mode 100644
index 89c4099..0000000
--- a/include.new/dev/hwpmc/hwpmc_powerpc.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2013 Justin Hibbits
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_powerpc.h 263122 2014-03-14 00:12:53Z jhibbits $
- */
-
-#ifndef _DEV_HWPMC_POWERPC_H_
-#define	_DEV_HWPMC_POWERPC_H_ 1
-
-#ifdef _KERNEL
-
-#define	POWERPC_PMC_CAPS	(PMC_CAP_INTERRUPT | PMC_CAP_USER |     \
-				 PMC_CAP_SYSTEM | PMC_CAP_EDGE |	\
-				 PMC_CAP_THRESHOLD | PMC_CAP_READ |	\
-				 PMC_CAP_WRITE | PMC_CAP_INVERT |	\
-				 PMC_CAP_QUALIFIER)
-
-#define POWERPC_PMC_KERNEL_ENABLE	(0x1 << 30)
-#define POWERPC_PMC_USER_ENABLE		(0x1 << 31)
-
-#define POWERPC_PMC_ENABLE	(POWERPC_PMC_KERNEL_ENABLE | POWERPC_PMC_USER_ENABLE)
-#define	POWERPC_RELOAD_COUNT_TO_PERFCTR_VALUE(V)	(0x80000000-(V))
-#define	POWERPC_PERFCTR_VALUE_TO_RELOAD_COUNT(P)	(0x80000000-(P))
-
-struct powerpc_cpu {
-	struct pmc_hw   *pc_ppcpmcs;
-	enum pmc_class	 pc_class;
-};
-
-extern struct powerpc_cpu **powerpc_pcpu;
-
-extern int pmc_mpc7xxx_initialize(struct pmc_mdep *pmc_mdep);
-extern int pmc_ppc970_initialize(struct pmc_mdep *pmc_mdep);
-
-extern int powerpc_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc);
-extern int powerpc_get_config(int cpu, int ri, struct pmc **ppm);
-#endif /* _KERNEL */
-
-#endif	/* _DEV_HWPMC_POWERPC_H_ */
diff --git a/include.new/dev/hwpmc/hwpmc_ppro.h b/include.new/dev/hwpmc/hwpmc_ppro.h
deleted file mode 100644
index c3e2281..0000000
--- a/include.new/dev/hwpmc/hwpmc_ppro.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * Copyright (c) 2005, Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_ppro.h 184802 2008-11-09 17:37:54Z jkoshy $
- */
-
-/* Machine dependent interfaces */
-
-#ifndef _DEV_HWPMC_PPRO_H_
-#define	_DEV_HWPMC_PPRO_H_
-
-/* Intel PPro, Celeron, P-II, P-III, Pentium-M PMCS */
-
-#define	P6_NPMCS	2		/* 2 PMCs */
-
-#define	P6_EVSEL_CMASK_MASK		0xFF000000
-#define	P6_EVSEL_TO_CMASK(C)		(((C) & 0xFF) << 24)
-#define	P6_EVSEL_INV			(1 << 23)
-#define	P6_EVSEL_EN			(1 << 22)
-#define	P6_EVSEL_INT			(1 << 20)
-#define	P6_EVSEL_PC			(1 << 19)
-#define	P6_EVSEL_E			(1 << 18)
-#define	P6_EVSEL_OS			(1 << 17)
-#define	P6_EVSEL_USR			(1 << 16)
-#define	P6_EVSEL_UMASK_MASK		0x0000FF00
-#define	P6_EVSEL_TO_UMASK(U)		(((U) & 0xFF) << 8)
-#define	P6_EVSEL_EVENT_SELECT(ES)	((ES) & 0xFF)
-#define	P6_EVSEL_RESERVED		(1 << 21)
-
-#define	P6_MSR_EVSEL0			0x0186
-#define	P6_MSR_EVSEL1			0x0187
-#define	P6_MSR_PERFCTR0			0x00C1
-#define	P6_MSR_PERFCTR1			0x00C2
-
-#define	P6_PERFCTR_READ_MASK		0xFFFFFFFFFFLL	/* 40 bits */
-#define	P6_PERFCTR_WRITE_MASK		0xFFFFFFFFU	/* 32 bits */
-
-#define	P6_RELOAD_COUNT_TO_PERFCTR_VALUE(R)	(-(R))
-#define	P6_PERFCTR_VALUE_TO_RELOAD_COUNT(P)	(-(P))
-
-#define	P6_PMC_HAS_OVERFLOWED(P)	((rdpmc(P) & (1LL << 39)) == 0)
-
-struct pmc_md_ppro_op_pmcallocate {
-	uint32_t	pm_ppro_config;
-};
-
-#ifdef _KERNEL
-
-/* MD extension for 'struct pmc' */
-struct pmc_md_ppro_pmc {
-	uint32_t	pm_ppro_evsel;
-};
-
-/*
- * Prototypes
- */
-
-int	pmc_p6_initialize(struct pmc_mdep *_md, int _ncpus);
-void	pmc_p6_finalize(struct pmc_mdep *_md);
-
-#endif /* _KERNEL */
-#endif /* _DEV_HWPMC_PPRO_H_ */
diff --git a/include.new/dev/hwpmc/hwpmc_soft.h b/include.new/dev/hwpmc/hwpmc_soft.h
deleted file mode 100644
index d0644f5..0000000
--- a/include.new/dev/hwpmc/hwpmc_soft.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2012 Fabien Thomas
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_soft.h 233628 2012-03-28 20:58:30Z fabient $
- */
-
-#ifndef _DEV_HWPMC_SOFT_H_
-#define _DEV_HWPMC_SOFT_H_ 1
-
-#include <sys/pmckern.h>
-
-#ifdef	_KERNEL
-
-#define	PMC_CLASS_INDEX_SOFT	0
-#define	SOFT_NPMCS		16
-
-/*
- * Prototypes.
- */
-
-void pmc_soft_initialize(struct pmc_mdep *md);
-void pmc_soft_finalize(struct pmc_mdep *md);
-int pmc_soft_intr(struct pmckern_soft *ks);
-
-#endif	/* _KERNEL */
-#endif	/* _DEV_HWPMC_SOFT_H */
diff --git a/include.new/dev/hwpmc/hwpmc_tsc.h b/include.new/dev/hwpmc/hwpmc_tsc.h
deleted file mode 100644
index 2ba0c02..0000000
--- a/include.new/dev/hwpmc/hwpmc_tsc.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2008 Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_tsc.h 184802 2008-11-09 17:37:54Z jkoshy $
- */
-
-#ifndef _DEV_HWPMC_TSC_H_
-#define	_DEV_HWPMC_TSC_H_ 1
-
-#ifdef	_KERNEL
-
-#define	TSC_NPMCS	1
-
-/*
- * Prototypes.
- */
-
-int	pmc_tsc_initialize(struct pmc_mdep *_md, int _maxcpu);
-void	pmc_tsc_finalize(struct pmc_mdep *_md);
-#endif	/* _KERNEL */
-#endif	/* _DEV_HWPMC_TSC_H */
diff --git a/include.new/dev/hwpmc/hwpmc_uncore.h b/include.new/dev/hwpmc/hwpmc_uncore.h
deleted file mode 100644
index ac49a38..0000000
--- a/include.new/dev/hwpmc/hwpmc_uncore.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * Copyright (c) 2010 Fabien Thomas
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_uncore.h 266452 2014-05-19 19:49:06Z markj $
- */
-
-#ifndef _DEV_HWPMC_UNCORE_H_
-#define	_DEV_HWPMC_UNCORE_H_ 1
-
-/*
- * Fixed-function PMCs.
- */
-struct pmc_md_ucf_op_pmcallocate {
-	uint16_t	pm_ucf_flags;	/* additional flags */
-};
-
-#define	UCF_EN		0x1
-#define	UCF_PMI		0x4
-
-/*
- * Programmable PMCs.
- */
-struct pmc_md_ucp_op_pmcallocate {
-	uint32_t	pm_ucp_config;
-};
-
-#define	UCP_EVSEL(C)	((C) & 0xFF)
-#define	UCP_UMASK(C)	((C) & 0xFF00)
-#define	UCP_CTRR	(1 << 17)
-#define	UCP_EDGE	(1 << 18)
-#define	UCP_INT		(1 << 20)
-#define	UCP_EN		(1 << 22)
-#define	UCP_INV		(1 << 23)
-#define	UCP_CMASK(C)	(((C) & 0xFF) << 24)
-
-#ifdef	_KERNEL
-
-#define	DCTL_FLAG_UNC_PMI	(1ULL << 13)
-
-/*
- * Fixed-function counters.
- */
-
-#define	UCF_MASK				0xF
-
-#define	UCF_CTR0				0x394
-
-#define	UCF_OFFSET				32
-#define UCF_OFFSET_SB				29
-#define	UCF_CTRL				0x395
-
-/*
- * Programmable counters.
- */
-
-#define	UCP_PMC0				0x3B0
-#define	UCP_EVSEL0				0x3C0
-#define UCP_OPCODE_MATCH			0x396
-#define UCP_CB0_EVSEL0				0x700
-
-/*
- * Simplified programming interface in Intel Performance Architecture
- * v2 and later.
- */
-
-#define	UC_GLOBAL_STATUS			0x392
-#define	UC_GLOBAL_CTRL				0x391
-#define	UC_GLOBAL_OVF_CTRL			0x393
-
-#define	UC_GLOBAL_STATUS_FLAG_CLRCHG		(1ULL << 63)
-#define	UC_GLOBAL_STATUS_FLAG_OVFPMI		(1ULL << 61)
-#define	UC_GLOBAL_CTRL_FLAG_FRZ			(1ULL << 63)
-#define	UC_GLOBAL_CTRL_FLAG_ENPMICORE0		(1ULL << 48)
-
-/*
- * Model specific registers.
- */
-
-#define MSR_GQ_SNOOP_MESF			0x301
-
-struct pmc_md_ucf_pmc {
-	uint64_t	pm_ucf_ctrl;
-};
-
-struct pmc_md_ucp_pmc {
-	uint32_t	pm_ucp_evsel;
-};
-
-/*
- * Prototypes.
- */
-
-int	pmc_uncore_initialize(struct pmc_mdep *_md, int _maxcpu);
-void	pmc_uncore_finalize(struct pmc_mdep *_md);
-
-int	pmc_ucf_initialize(struct pmc_mdep *_md, int _maxcpu, int _npmc, int _width);
-void	pmc_ucf_finalize(struct pmc_mdep *_md);
-
-int	pmc_ucp_initialize(struct pmc_mdep *_md, int _maxcpu, int _npmc, int _width,
-	    int _flags);
-void	pmc_ucp_finalize(struct pmc_mdep *_md);
-
-#endif	/* _KERNEL */
-#endif	/* _DEV_HWPMC_UNCORE_H */
diff --git a/include.new/dev/hwpmc/hwpmc_xscale.h b/include.new/dev/hwpmc/hwpmc_xscale.h
deleted file mode 100644
index 3c004b4..0000000
--- a/include.new/dev/hwpmc/hwpmc_xscale.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 2009 Rui Paulo <rpaulo@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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/hwpmc_xscale.h 200928 2009-12-23 23:16:54Z rpaulo $
- */
-
-#ifndef _DEV_HWPMC_XSCALE_H_
-#define _DEV_HWPMC_XSCALE_H_
-
-#define	XSCALE_PMC_CAPS		(PMC_CAP_INTERRUPT | PMC_CAP_USER |     \
-				 PMC_CAP_SYSTEM | PMC_CAP_EDGE |	\
-				 PMC_CAP_THRESHOLD | PMC_CAP_READ |	\
-				 PMC_CAP_WRITE | PMC_CAP_INVERT |	\
-				 PMC_CAP_QUALIFIER)
-
-
-#define	XSCALE_PMNC_ENABLE		0x01	/* Enable all Counters */
-#define	XSCALE_PMNC_PMNRESET		0x02	/* Performance Counter Reset */
-#define	XSCALE_PMNC_CCNTRESET		0x04	/* Clock Counter Reset */
-#define	XSCALE_PMNC_CCNTDIV		0x08	/* Clock Counter Divider */
-/* IXP425 only -- first generation */
-#define	XSCALE_PMNC_EVT0_MASK		0x00ff000
-#define	XSCALE_PMNC_EVT1_MASK		0xff00000
-
-#define	XSCALE_INTEN_CCNT		0x01	/* Enable Clock Counter Int. */
-#define	XSCALE_INTEN_PMN0		0x02	/* Enable PMN0 Interrupts */
-#define	XSCALE_INTEN_PMN1		0x04	/* Enable PMN1 Interrupts */
-#define	XSCALE_INTEN_PMN2		0x08	/* Enable PMN2 Interrupts */
-#define	XSCALE_INTEN_PMN3		0x10	/* Enable PMN3 Interrupts */
-
-#define	XSCALE_EVTSEL_EVT0_MASK		0x000000ff
-#define	XSCALE_EVTSEL_EVT1_MASK		0x0000ff00
-#define	XSCALE_EVTSEL_EVT2_MASK		0x00ff0000
-#define	XSCALE_EVTSEL_EVT3_MASK		0xff000000
-
-#define	XSCALE_FLAG_CCNT_OVERFLOW	0x01
-#define	XSCALE_FLAG_PMN0_OVERFLOW	0x02
-#define	XSCALE_FLAG_PMN1_OVERFLOW	0x04
-#define	XSCALE_FLAG_PMN2_OVERFLOW	0x08
-#define	XSCALE_FLAG_PMN3_OVERFLOW	0x10
-
-#define	XSCALE_RELOAD_COUNT_TO_PERFCTR_VALUE(R)	(-(R))
-#define	XSCALE_PERFCTR_VALUE_TO_RELOAD_COUNT(P)	(-(P))
-
-#ifdef _KERNEL
-/* MD extension for 'struct pmc' */
-struct pmc_md_xscale_pmc {
-	uint32_t	pm_xscale_evsel;
-};
-#endif /* _KERNEL */
-#endif /* _DEV_HWPMC_XSCALE_H_ */
diff --git a/include.new/dev/hwpmc/pmc_events.h b/include.new/dev/hwpmc/pmc_events.h
deleted file mode 100644
index 0835c0b..0000000
--- a/include.new/dev/hwpmc/pmc_events.h
+++ /dev/null
@@ -1,5260 +0,0 @@
-/*-
- * Copyright (c) 2005  Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/sys/dev/hwpmc/pmc_events.h 280455 2015-03-24 20:00:11Z rrs $
- */
-
-#ifndef _DEV_HWPMC_PMC_EVENTS_H_
-#define	_DEV_HWPMC_PMC_EVENTS_H_
-
-/*
- * Note: Documentation on adding events can be found both in
- * the source tree at src/share/doc/papers/hwpmc/hwpmc.ms
- * as well as on-line at:
- *
- * http://wiki.freebsd.org/PmcTools/PmcHardwareHowTo
- *
- * Please refer to those resources before you attempt to modify
- * this file or the hwpmc driver/subsystem.
- */
-
-/* * PMC event codes.
- *
- * __PMC_EV(CLASS, SYMBOLIC-NAME)
- *
- */
-
-/*
- * AMD K7 Events, from "The AMD Athlon(tm) Processor x86 Code
- * Optimization Guide" [Doc#22007K, Feb 2002]
- */
-
-#define	__PMC_EV_K7()					\
-__PMC_EV(K7, DC_ACCESSES)				\
-__PMC_EV(K7, DC_MISSES)					\
-__PMC_EV(K7, DC_REFILLS_FROM_L2)			\
-__PMC_EV(K7, DC_REFILLS_FROM_SYSTEM)			\
-__PMC_EV(K7, DC_WRITEBACKS)				\
-__PMC_EV(K7, L1_DTLB_MISS_AND_L2_DTLB_HITS)		\
-__PMC_EV(K7, L1_AND_L2_DTLB_MISSES)			\
-__PMC_EV(K7, MISALIGNED_REFERENCES)			\
-__PMC_EV(K7, IC_FETCHES)				\
-__PMC_EV(K7, IC_MISSES)					\
-__PMC_EV(K7, L1_ITLB_MISSES)				\
-__PMC_EV(K7, L1_L2_ITLB_MISSES)				\
-__PMC_EV(K7, RETIRED_INSTRUCTIONS)			\
-__PMC_EV(K7, RETIRED_OPS)				\
-__PMC_EV(K7, RETIRED_BRANCHES)				\
-__PMC_EV(K7, RETIRED_BRANCHES_MISPREDICTED)		\
-__PMC_EV(K7, RETIRED_TAKEN_BRANCHES)			\
-__PMC_EV(K7, RETIRED_TAKEN_BRANCHES_MISPREDICTED)	\
-__PMC_EV(K7, RETIRED_FAR_CONTROL_TRANSFERS)		\
-__PMC_EV(K7, RETIRED_RESYNC_BRANCHES)			\
-__PMC_EV(K7, INTERRUPTS_MASKED_CYCLES)			\
-__PMC_EV(K7, INTERRUPTS_MASKED_WHILE_PENDING_CYCLES)	\
-__PMC_EV(K7, HARDWARE_INTERRUPTS)
-
-#define	PMC_EV_K7_FIRST	PMC_EV_K7_DC_ACCESSES
-#define	PMC_EV_K7_LAST	PMC_EV_K7_HARDWARE_INTERRUPTS
-
-
-/*
- * Intel P4 Events, from "IA-32 Intel(r) Architecture Software
- * Developer's Manual, Volume 3: System Programming Guide" [245472-012]
- */
-
-#define	__PMC_EV_P4()				\
-__PMC_EV(P4, TC_DELIVER_MODE)			\
-__PMC_EV(P4, BPU_FETCH_REQUEST)			\
-__PMC_EV(P4, ITLB_REFERENCE)			\
-__PMC_EV(P4, MEMORY_CANCEL)			\
-__PMC_EV(P4, MEMORY_COMPLETE)			\
-__PMC_EV(P4, LOAD_PORT_REPLAY)			\
-__PMC_EV(P4, STORE_PORT_REPLAY)			\
-__PMC_EV(P4, MOB_LOAD_REPLAY)			\
-__PMC_EV(P4, PAGE_WALK_TYPE)			\
-__PMC_EV(P4, BSQ_CACHE_REFERENCE)		\
-__PMC_EV(P4, IOQ_ALLOCATION)			\
-__PMC_EV(P4, IOQ_ACTIVE_ENTRIES)		\
-__PMC_EV(P4, FSB_DATA_ACTIVITY)			\
-__PMC_EV(P4, BSQ_ALLOCATION)			\
-__PMC_EV(P4, BSQ_ACTIVE_ENTRIES)		\
-__PMC_EV(P4, SSE_INPUT_ASSIST)			\
-__PMC_EV(P4, PACKED_SP_UOP)			\
-__PMC_EV(P4, PACKED_DP_UOP)			\
-__PMC_EV(P4, SCALAR_SP_UOP)			\
-__PMC_EV(P4, SCALAR_DP_UOP)			\
-__PMC_EV(P4, 64BIT_MMX_UOP)			\
-__PMC_EV(P4, 128BIT_MMX_UOP)			\
-__PMC_EV(P4, X87_FP_UOP)			\
-__PMC_EV(P4, X87_SIMD_MOVES_UOP)		\
-__PMC_EV(P4, GLOBAL_POWER_EVENTS)		\
-__PMC_EV(P4, TC_MS_XFER)			\
-__PMC_EV(P4, UOP_QUEUE_WRITES)			\
-__PMC_EV(P4, RETIRED_MISPRED_BRANCH_TYPE)	\
-__PMC_EV(P4, RETIRED_BRANCH_TYPE)		\
-__PMC_EV(P4, RESOURCE_STALL)			\
-__PMC_EV(P4, WC_BUFFER)				\
-__PMC_EV(P4, B2B_CYCLES)			\
-__PMC_EV(P4, BNR)				\
-__PMC_EV(P4, SNOOP)				\
-__PMC_EV(P4, RESPONSE)				\
-__PMC_EV(P4, FRONT_END_EVENT)			\
-__PMC_EV(P4, EXECUTION_EVENT)			\
-__PMC_EV(P4, REPLAY_EVENT)			\
-__PMC_EV(P4, INSTR_RETIRED)			\
-__PMC_EV(P4, UOPS_RETIRED)			\
-__PMC_EV(P4, UOP_TYPE)				\
-__PMC_EV(P4, BRANCH_RETIRED)			\
-__PMC_EV(P4, MISPRED_BRANCH_RETIRED)		\
-__PMC_EV(P4, X87_ASSIST)			\
-__PMC_EV(P4, MACHINE_CLEAR)
-
-#define	PMC_EV_P4_FIRST PMC_EV_P4_TC_DELIVER_MODE
-#define	PMC_EV_P4_LAST	PMC_EV_P4_MACHINE_CLEAR
-
-/* Intel Pentium Pro, P-II, P-III and Pentium-M style events */
-
-#define	__PMC_EV_P6()				\
-__PMC_EV(P6, DATA_MEM_REFS)			\
-__PMC_EV(P6, DCU_LINES_IN)			\
-__PMC_EV(P6, DCU_M_LINES_IN)			\
-__PMC_EV(P6, DCU_M_LINES_OUT)			\
-__PMC_EV(P6, DCU_MISS_OUTSTANDING)		\
-__PMC_EV(P6, IFU_FETCH)				\
-__PMC_EV(P6, IFU_FETCH_MISS)			\
-__PMC_EV(P6, ITLB_MISS)				\
-__PMC_EV(P6, IFU_MEM_STALL)			\
-__PMC_EV(P6, ILD_STALL)				\
-__PMC_EV(P6, L2_IFETCH)				\
-__PMC_EV(P6, L2_LD)				\
-__PMC_EV(P6, L2_ST)				\
-__PMC_EV(P6, L2_LINES_IN)			\
-__PMC_EV(P6, L2_LINES_OUT)			\
-__PMC_EV(P6, L2_M_LINES_INM)			\
-__PMC_EV(P6, L2_M_LINES_OUTM)			\
-__PMC_EV(P6, L2_RQSTS)				\
-__PMC_EV(P6, L2_ADS)				\
-__PMC_EV(P6, L2_DBUS_BUSY)			\
-__PMC_EV(P6, L2_DBUS_BUSY_RD)			\
-__PMC_EV(P6, BUS_DRDY_CLOCKS)			\
-__PMC_EV(P6, BUS_LOCK_CLOCKS)			\
-__PMC_EV(P6, BUS_REQ_OUTSTANDING)		\
-__PMC_EV(P6, BUS_TRAN_BRD)			\
-__PMC_EV(P6, BUS_TRAN_RFO)			\
-__PMC_EV(P6, BUS_TRANS_WB)			\
-__PMC_EV(P6, BUS_TRAN_IFETCH)			\
-__PMC_EV(P6, BUS_TRAN_INVAL)			\
-__PMC_EV(P6, BUS_TRAN_PWR)			\
-__PMC_EV(P6, BUS_TRANS_P)			\
-__PMC_EV(P6, BUS_TRANS_IO)			\
-__PMC_EV(P6, BUS_TRAN_DEF)			\
-__PMC_EV(P6, BUS_TRAN_BURST)			\
-__PMC_EV(P6, BUS_TRAN_ANY)			\
-__PMC_EV(P6, BUS_TRAN_MEM)			\
-__PMC_EV(P6, BUS_DATA_RCV)			\
-__PMC_EV(P6, BUS_BNR_DRV)			\
-__PMC_EV(P6, BUS_HIT_DRV)			\
-__PMC_EV(P6, BUS_HITM_DRV)			\
-__PMC_EV(P6, BUS_SNOOP_STALL)			\
-__PMC_EV(P6, FLOPS)				\
-__PMC_EV(P6, FP_COMPS_OPS_EXE)			\
-__PMC_EV(P6, FP_ASSIST)				\
-__PMC_EV(P6, MUL)				\
-__PMC_EV(P6, DIV)				\
-__PMC_EV(P6, CYCLES_DIV_BUSY)			\
-__PMC_EV(P6, LD_BLOCKS)				\
-__PMC_EV(P6, SB_DRAINS)				\
-__PMC_EV(P6, MISALIGN_MEM_REF)			\
-__PMC_EV(P6, EMON_KNI_PREF_DISPATCHED)		\
-__PMC_EV(P6, EMON_KNI_PREF_MISS)		\
-__PMC_EV(P6, INST_RETIRED)			\
-__PMC_EV(P6, UOPS_RETIRED)			\
-__PMC_EV(P6, INST_DECODED)			\
-__PMC_EV(P6, EMON_KNI_INST_RETIRED)		\
-__PMC_EV(P6, EMON_KNI_COMP_INST_RET)		\
-__PMC_EV(P6, HW_INT_RX)				\
-__PMC_EV(P6, CYCLES_INT_MASKED)			\
-__PMC_EV(P6, CYCLES_INT_PENDING_AND_MASKED)	\
-__PMC_EV(P6, BR_INST_RETIRED)			\
-__PMC_EV(P6, BR_MISS_PRED_RETIRED)		\
-__PMC_EV(P6, BR_TAKEN_RETIRED)			\
-__PMC_EV(P6, BR_MISS_PRED_TAKEN_RET)		\
-__PMC_EV(P6, BR_INST_DECODED)			\
-__PMC_EV(P6, BTB_MISSES)			\
-__PMC_EV(P6, BR_BOGUS)				\
-__PMC_EV(P6, BACLEARS)				\
-__PMC_EV(P6, RESOURCE_STALLS)			\
-__PMC_EV(P6, PARTIAL_RAT_STALLS)		\
-__PMC_EV(P6, SEGMENT_REG_LOADS)			\
-__PMC_EV(P6, CPU_CLK_UNHALTED)			\
-__PMC_EV(P6, MMX_INSTR_EXEC)			\
-__PMC_EV(P6, MMX_SAT_INSTR_EXEC)		\
-__PMC_EV(P6, MMX_UOPS_EXEC)			\
-__PMC_EV(P6, MMX_INSTR_TYPE_EXEC)		\
-__PMC_EV(P6, FP_MMX_TRANS)			\
-__PMC_EV(P6, MMX_ASSIST)			\
-__PMC_EV(P6, MMX_INSTR_RET)			\
-__PMC_EV(P6, SEG_RENAME_STALLS)			\
-__PMC_EV(P6, SEG_REG_RENAMES)			\
-__PMC_EV(P6, RET_SEG_RENAMES)			\
-__PMC_EV(P6, EMON_EST_TRANS)			\
-__PMC_EV(P6, EMON_THERMAL_TRIP)			\
-__PMC_EV(P6, BR_INST_EXEC)			\
-__PMC_EV(P6, BR_MISSP_EXEC)			\
-__PMC_EV(P6, BR_BAC_MISSP_EXEC)			\
-__PMC_EV(P6, BR_CND_EXEC)			\
-__PMC_EV(P6, BR_CND_MISSP_EXEC)			\
-__PMC_EV(P6, BR_IND_EXEC)			\
-__PMC_EV(P6, BR_IND_MISSP_EXEC)			\
-__PMC_EV(P6, BR_RET_EXEC)			\
-__PMC_EV(P6, BR_RET_MISSP_EXEC)			\
-__PMC_EV(P6, BR_RET_BAC_MISSP_EXEC)		\
-__PMC_EV(P6, BR_CALL_EXEC)			\
-__PMC_EV(P6, BR_CALL_MISSP_EXEC)		\
-__PMC_EV(P6, BR_IND_CALL_EXEC)			\
-__PMC_EV(P6, EMON_SIMD_INSTR_RETIRED)		\
-__PMC_EV(P6, EMON_SYNCH_UOPS)			\
-__PMC_EV(P6, EMON_ESP_UOPS)			\
-__PMC_EV(P6, EMON_FUSED_UOPS_RET)		\
-__PMC_EV(P6, EMON_UNFUSION)			\
-__PMC_EV(P6, EMON_PREF_RQSTS_UP)		\
-__PMC_EV(P6, EMON_PREF_RQSTS_DN)		\
-__PMC_EV(P6, EMON_SSE_SSE2_INST_RETIRED)	\
-__PMC_EV(P6, EMON_SSE_SSE2_COMP_INST_RETIRED)
-
-
-#define	PMC_EV_P6_FIRST	PMC_EV_P6_DATA_MEM_REFS
-#define	PMC_EV_P6_LAST	PMC_EV_P6_EMON_SSE_SSE2_COMP_INST_RETIRED
-
-/* AMD K8 PMCs */
-
-#define	__PMC_EV_K8()							\
-__PMC_EV(K8, FP_DISPATCHED_FPU_OPS)					\
-__PMC_EV(K8, FP_CYCLES_WITH_NO_FPU_OPS_RETIRED)				\
-__PMC_EV(K8, FP_DISPATCHED_FPU_FAST_FLAG_OPS)				\
-__PMC_EV(K8, LS_SEGMENT_REGISTER_LOAD)					\
-__PMC_EV(K8, LS_MICROARCHITECTURAL_RESYNC_BY_SELF_MODIFYING_CODE)	\
-__PMC_EV(K8, LS_MICROARCHITECTURAL_RESYNC_BY_SNOOP)			\
-__PMC_EV(K8, LS_BUFFER2_FULL)						\
-__PMC_EV(K8, LS_LOCKED_OPERATION)					\
-__PMC_EV(K8, LS_MICROARCHITECTURAL_LATE_CANCEL)				\
-__PMC_EV(K8, LS_RETIRED_CFLUSH_INSTRUCTIONS)				\
-__PMC_EV(K8, LS_RETIRED_CPUID_INSTRUCTIONS)				\
-__PMC_EV(K8, DC_ACCESS)							\
-__PMC_EV(K8, DC_MISS)							\
-__PMC_EV(K8, DC_REFILL_FROM_L2)						\
-__PMC_EV(K8, DC_REFILL_FROM_SYSTEM)					\
-__PMC_EV(K8, DC_COPYBACK)						\
-__PMC_EV(K8, DC_L1_DTLB_MISS_AND_L2_DTLB_HIT)				\
-__PMC_EV(K8, DC_L1_DTLB_MISS_AND_L2_DTLB_MISS)				\
-__PMC_EV(K8, DC_MISALIGNED_DATA_REFERENCE)				\
-__PMC_EV(K8, DC_MICROARCHITECTURAL_LATE_CANCEL)				\
-__PMC_EV(K8, DC_MICROARCHITECTURAL_EARLY_CANCEL)			\
-__PMC_EV(K8, DC_ONE_BIT_ECC_ERROR)					\
-__PMC_EV(K8, DC_DISPATCHED_PREFETCH_INSTRUCTIONS)			\
-__PMC_EV(K8, DC_DCACHE_ACCESSES_BY_LOCKS)				\
-__PMC_EV(K8, BU_CPU_CLK_UNHALTED)					\
-__PMC_EV(K8, BU_INTERNAL_L2_REQUEST)					\
-__PMC_EV(K8, BU_FILL_REQUEST_L2_MISS)					\
-__PMC_EV(K8, BU_FILL_INTO_L2)						\
-__PMC_EV(K8, IC_FETCH)							\
-__PMC_EV(K8, IC_MISS)							\
-__PMC_EV(K8, IC_REFILL_FROM_L2)						\
-__PMC_EV(K8, IC_REFILL_FROM_SYSTEM)					\
-__PMC_EV(K8, IC_L1_ITLB_MISS_AND_L2_ITLB_HIT)				\
-__PMC_EV(K8, IC_L1_ITLB_MISS_AND_L2_ITLB_MISS)				\
-__PMC_EV(K8, IC_MICROARCHITECTURAL_RESYNC_BY_SNOOP)			\
-__PMC_EV(K8, IC_INSTRUCTION_FETCH_STALL)				\
-__PMC_EV(K8, IC_RETURN_STACK_HIT)					\
-__PMC_EV(K8, IC_RETURN_STACK_OVERFLOW)					\
-__PMC_EV(K8, FR_RETIRED_X86_INSTRUCTIONS)				\
-__PMC_EV(K8, FR_RETIRED_UOPS)						\
-__PMC_EV(K8, FR_RETIRED_BRANCHES)					\
-__PMC_EV(K8, FR_RETIRED_BRANCHES_MISPREDICTED)				\
-__PMC_EV(K8, FR_RETIRED_TAKEN_BRANCHES)					\
-__PMC_EV(K8, FR_RETIRED_TAKEN_BRANCHES_MISPREDICTED)			\
-__PMC_EV(K8, FR_RETIRED_FAR_CONTROL_TRANSFERS)				\
-__PMC_EV(K8, FR_RETIRED_RESYNCS)					\
-__PMC_EV(K8, FR_RETIRED_NEAR_RETURNS)					\
-__PMC_EV(K8, FR_RETIRED_NEAR_RETURNS_MISPREDICTED)			\
-__PMC_EV(K8, FR_RETIRED_TAKEN_BRANCHES_MISPREDICTED_BY_ADDR_MISCOMPARE)	\
-__PMC_EV(K8, FR_RETIRED_FPU_INSTRUCTIONS)				\
-__PMC_EV(K8, FR_RETIRED_FASTPATH_DOUBLE_OP_INSTRUCTIONS)		\
-__PMC_EV(K8, FR_INTERRUPTS_MASKED_CYCLES)				\
-__PMC_EV(K8, FR_INTERRUPTS_MASKED_WHILE_PENDING_CYCLES)			\
-__PMC_EV(K8, FR_TAKEN_HARDWARE_INTERRUPTS)				\
-__PMC_EV(K8, FR_DECODER_EMPTY)						\
-__PMC_EV(K8, FR_DISPATCH_STALLS)					\
-__PMC_EV(K8, FR_DISPATCH_STALL_FROM_BRANCH_ABORT_TO_RETIRE)		\
-__PMC_EV(K8, FR_DISPATCH_STALL_FOR_SERIALIZATION)			\
-__PMC_EV(K8, FR_DISPATCH_STALL_FOR_SEGMENT_LOAD)			\
-__PMC_EV(K8, FR_DISPATCH_STALL_WHEN_REORDER_BUFFER_IS_FULL)		\
-__PMC_EV(K8, FR_DISPATCH_STALL_WHEN_RESERVATION_STATIONS_ARE_FULL)	\
-__PMC_EV(K8, FR_DISPATCH_STALL_WHEN_FPU_IS_FULL)			\
-__PMC_EV(K8, FR_DISPATCH_STALL_WHEN_LS_IS_FULL)				\
-__PMC_EV(K8, FR_DISPATCH_STALL_WHEN_WAITING_FOR_ALL_TO_BE_QUIET)	\
-__PMC_EV(K8, FR_DISPATCH_STALL_WHEN_FAR_XFER_OR_RESYNC_BRANCH_PENDING)	\
-__PMC_EV(K8, FR_FPU_EXCEPTIONS)						\
-__PMC_EV(K8, FR_NUMBER_OF_BREAKPOINTS_FOR_DR0)				\
-__PMC_EV(K8, FR_NUMBER_OF_BREAKPOINTS_FOR_DR1)				\
-__PMC_EV(K8, FR_NUMBER_OF_BREAKPOINTS_FOR_DR2)				\
-__PMC_EV(K8, FR_NUMBER_OF_BREAKPOINTS_FOR_DR3)				\
-__PMC_EV(K8, NB_MEMORY_CONTROLLER_PAGE_ACCESS_EVENT)			\
-__PMC_EV(K8, NB_MEMORY_CONTROLLER_PAGE_TABLE_OVERFLOW)			\
-__PMC_EV(K8, NB_MEMORY_CONTROLLER_DRAM_COMMAND_SLOTS_MISSED)		\
-__PMC_EV(K8, NB_MEMORY_CONTROLLER_TURNAROUND)				\
-__PMC_EV(K8, NB_MEMORY_CONTROLLER_BYPASS_SATURATION)			\
-__PMC_EV(K8, NB_SIZED_COMMANDS)						\
-__PMC_EV(K8, NB_PROBE_RESULT)						\
-__PMC_EV(K8, NB_HT_BUS0_BANDWIDTH)					\
-__PMC_EV(K8, NB_HT_BUS1_BANDWIDTH)					\
-__PMC_EV(K8, NB_HT_BUS2_BANDWIDTH)
-
-#define	PMC_EV_K8_FIRST		PMC_EV_K8_FP_DISPATCHED_FPU_OPS
-#define	PMC_EV_K8_LAST		PMC_EV_K8_NB_HT_BUS2_BANDWIDTH
-
-
-/*
- * Intel Pentium and Pentium MMX events, from the "Intel 64 and IA-32
- * Architectures Software Developer's Manual, Volume 3B: System Programming
- * Guide, Part 2, August 2007".
- */
-#define	__PMC_EV_P5()							\
-__PMC_EV(P5, DATA_READ)							\
-__PMC_EV(P5, DATA_WRITE)						\
-__PMC_EV(P5, DATA_TLB_MISS)						\
-__PMC_EV(P5, DATA_READ_MISS)						\
-__PMC_EV(P5, DATA_WRITE_MISS)						\
-__PMC_EV(P5, WRITE_HIT_TO_M_OR_E_STATE_LINES)				\
-__PMC_EV(P5, DATA_CACHE_LINES_WRITTEN_BACK)				\
-__PMC_EV(P5, EXTERNAL_SNOOPS)						\
-__PMC_EV(P5, EXTERNAL_DATA_CACHE_SNOOP_HITS)				\
-__PMC_EV(P5, MEMORY_ACCESSES_IN_BOTH_PIPES)				\
-__PMC_EV(P5, BANK_CONFLICTS)						\
-__PMC_EV(P5, MISALIGNED_DATA_OR_IO_REFERENCES)				\
-__PMC_EV(P5, CODE_READ)							\
-__PMC_EV(P5, CODE_TLB_MISS)						\
-__PMC_EV(P5, CODE_CACHE_MISS)						\
-__PMC_EV(P5, ANY_SEGMENT_REGISTER_LOADED)				\
-__PMC_EV(P5, BRANCHES)							\
-__PMC_EV(P5, BTB_HITS)							\
-__PMC_EV(P5, TAKEN_BRANCH_OR_BTB_HIT)					\
-__PMC_EV(P5, PIPELINE_FLUSHES)						\
-__PMC_EV(P5, INSTRUCTIONS_EXECUTED)					\
-__PMC_EV(P5, INSTRUCTIONS_EXECUTED_V_PIPE)				\
-__PMC_EV(P5, BUS_CYCLE_DURATION)					\
-__PMC_EV(P5, WRITE_BUFFER_FULL_STALL_DURATION)				\
-__PMC_EV(P5, WAITING_FOR_DATA_MEMORY_READ_STALL_DURATION)		\
-__PMC_EV(P5, STALL_ON_WRITE_TO_AN_E_OR_M_STATE_LINE)			\
-__PMC_EV(P5, LOCKED_BUS_CYCLE)						\
-__PMC_EV(P5, IO_READ_OR_WRITE_CYCLE)					\
-__PMC_EV(P5, NONCACHEABLE_MEMORY_READS)					\
-__PMC_EV(P5, PIPELINE_AGI_STALLS)					\
-__PMC_EV(P5, FLOPS)							\
-__PMC_EV(P5, BREAKPOINT_MATCH_ON_DR0_REGISTER)				\
-__PMC_EV(P5, BREAKPOINT_MATCH_ON_DR1_REGISTER)				\
-__PMC_EV(P5, BREAKPOINT_MATCH_ON_DR2_REGISTER)				\
-__PMC_EV(P5, BREAKPOINT_MATCH_ON_DR3_REGISTER)				\
-__PMC_EV(P5, HARDWARE_INTERRUPTS)					\
-__PMC_EV(P5, DATA_READ_OR_WRITE)					\
-__PMC_EV(P5, DATA_READ_MISS_OR_WRITE_MISS)				\
-__PMC_EV(P5, BUS_OWNERSHIP_LATENCY)					\
-__PMC_EV(P5, BUS_OWNERSHIP_TRANSFERS)					\
-__PMC_EV(P5, MMX_INSTRUCTIONS_EXECUTED_U_PIPE)				\
-__PMC_EV(P5, MMX_INSTRUCTIONS_EXECUTED_V_PIPE)				\
-__PMC_EV(P5, CACHE_M_LINE_SHARING)					\
-__PMC_EV(P5, CACHE_LINE_SHARING)					\
-__PMC_EV(P5, EMMS_INSTRUCTIONS_EXECUTED)				\
-__PMC_EV(P5, TRANSITIONS_BETWEEN_MMX_AND_FP_INSTRUCTIONS)		\
-__PMC_EV(P5, BUS_UTILIZATION_DUE_TO_PROCESSOR_ACTIVITY)			\
-__PMC_EV(P5, WRITES_TO_NONCACHEABLE_MEMORY)				\
-__PMC_EV(P5, SATURATING_MMX_INSTRUCTIONS_EXECUTED)			\
-__PMC_EV(P5, SATURATIONS_PERFORMED)					\
-__PMC_EV(P5, NUMBER_OF_CYCLES_NOT_IN_HALT_STATE)			\
-__PMC_EV(P5, DATA_CACHE_TLB_MISS_STALL_DURATION)			\
-__PMC_EV(P5, MMX_INSTRUCTION_DATA_READS)				\
-__PMC_EV(P5, MMX_INSTRUCTION_DATA_READ_MISSES)				\
-__PMC_EV(P5, FLOATING_POINT_STALLS_DURATION)				\
-__PMC_EV(P5, TAKEN_BRANCHES)						\
-__PMC_EV(P5, D1_STARVATION_AND_FIFO_IS_EMPTY)				\
-__PMC_EV(P5, D1_STARVATION_AND_ONLY_ONE_INSTRUCTION_IN_FIFO)		\
-__PMC_EV(P5, MMX_INSTRUCTION_DATA_WRITES)				\
-__PMC_EV(P5, MMX_INSTRUCTION_DATA_WRITE_MISSES)				\
-__PMC_EV(P5, PIPELINE_FLUSHES_DUE_TO_WRONG_BRANCH_PREDICTIONS)		\
-__PMC_EV(P5,								\
-    PIPELINE_FLUSHES_DUE_TO_WRONG_BRANCH_PREDICTIONS_RESOLVED_IN_WB_STAGE) \
-__PMC_EV(P5, MISALIGNED_DATA_MEMORY_REFERENCE_ON_MMX_INSTRUCTIONS)	\
-__PMC_EV(P5, PIPELINE_STALL_FOR_MMX_INSTRUCTION_DATA_MEMORY_READS)	\
-__PMC_EV(P5, MISPREDICTED_OR_UNPREDICTED_RETURNS)			\
-__PMC_EV(P5, PREDICTED_RETURNS)						\
-__PMC_EV(P5, MMX_MULTIPLY_UNIT_INTERLOCK)				\
-__PMC_EV(P5, MOVD_MOVQ_STORE_STALL_DUE_TO_PREVIOUS_MMX_OPERATION)	\
-__PMC_EV(P5, RETURNS)							\
-__PMC_EV(P5, BTB_FALSE_ENTRIES)						\
-__PMC_EV(P5, BTB_MISS_PREDICTION_ON_NOT_TAKEN_BRANCH)			\
-__PMC_EV(P5,								\
-    FULL_WRITE_BUFFER_STALL_DURATION_WHILE_EXECUTING_MMX_INSTRUCTIONS)	\
-__PMC_EV(P5, STALL_ON_MMX_INSTRUCTION_WRITE_TO_E_OR_M_STATE_LINE)
-
-#define	PMC_EV_P5_FIRST		PMC_EV_P5_DATA_READ
-#define	PMC_EV_P5_LAST	        \
-	PMC_EV_P5_STALL_ON_MMX_INSTRUCTION_WRITE_TO_E_OR_M_STATE_LINE
-
-/*
- * Events supported by Intel architectural fixed function counters,
- * from the "Intel 64 and IA-32 Architectures Software Developer's
- * Manual Volume 3B: System Programming Guide, Part 2", July 2008.
- */
-#define	__PMC_EV_IAF()							\
-__PMC_EV(IAF, INSTR_RETIRED_ANY)					\
-__PMC_EV(IAF, CPU_CLK_UNHALTED_CORE)					\
-__PMC_EV(IAF, CPU_CLK_UNHALTED_REF)
-
-#define	PMC_EV_IAF_FIRST	PMC_EV_IAF_INSTR_RETIRED_ANY
-#define	PMC_EV_IAF_LAST		PMC_EV_IAF_CPU_CLK_UNHALTED_REF
-
-#define	__PMC_EV_ALIAS_IAF()						\
-__PMC_EV_ALIAS("instruction-retired",	IAF_INSTR_RETIRED_ANY)		\
-__PMC_EV_ALIAS("unhalted-core-cycles",	IAF_CPU_CLK_UNHALTED_CORE)	\
-__PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF)
-
-/*
- * Events supported by programmable function counters present in
- * Intel Atom, Core and Core2 CPUs, from the "Intel 64 and IA-32
- * Architectures Software Developer's Manual Volume 3B: System Programming
- * Guide, Part 2", July 2008.
- *
- * These PMCs select events with a combination of an event code and
- * unit mask.  Quirks that need to be taken care of include:
- * - The set of (event code, umask) combinations supported by a processor
- *   varies according to the processor model.
- * - A given (event code, umask) combination need not measure the same
- *   hardware event in all processor models.
- * - Event names in vendor documentation for an (event code, umask) pair
- *   may vary according to the CPU model.
- * - Identically named events can map to different (event code, umask)
- *   pairs on different CPUs.
- * - New (event code, umask) combinations continue to be added as CPUs
- *   evolve.  The interface between hwpmc(4) and libpmc(3) needs to be
- *   robust with respect to ABI changes.
- *
- * The IAP_EVENT_* symbols below define the ABI between userland and kernel.
- * New (event code, * umask) combinations used in new CPUs would be added
- * to the end of the list.  Vendor names for events are mapped to IAP_EVENT_*
- * symbols using aliases.  The final disambiguation of semantics based on
- * the CPU model happens inside hwpmc(4).
- */
-#define	__PMC_EV_IAP()				\
-__PMC_EV(IAP, ARCH_BR_INS_RET)			\
-__PMC_EV(IAP, ARCH_BR_MIS_RET)			\
-__PMC_EV(IAP, ARCH_INS_RET)			\
-__PMC_EV(IAP, ARCH_LLC_MIS)			\
-__PMC_EV(IAP, ARCH_LLC_REF)			\
-__PMC_EV(IAP, ARCH_UNH_REF_CYC)			\
-__PMC_EV(IAP, ARCH_UNH_COR_CYC)			\
-__PMC_EV(IAP, EVENT_02H_01H)			\
-__PMC_EV(IAP, EVENT_02H_81H)			\
-__PMC_EV(IAP, EVENT_03H_00H)			\
-__PMC_EV(IAP, EVENT_03H_01H)			\
-__PMC_EV(IAP, EVENT_03H_02H)			\
-__PMC_EV(IAP, EVENT_03H_04H)			\
-__PMC_EV(IAP, EVENT_03H_08H)			\
-__PMC_EV(IAP, EVENT_03H_10H)			\
-__PMC_EV(IAP, EVENT_03H_20H)			\
-__PMC_EV(IAP, EVENT_03H_40H)			\
-__PMC_EV(IAP, EVENT_03H_80H)			\
-__PMC_EV(IAP, EVENT_04H_00H)			\
-__PMC_EV(IAP, EVENT_04H_01H)			\
-__PMC_EV(IAP, EVENT_04H_02H)			\
-__PMC_EV(IAP, EVENT_04H_04H)			\
-__PMC_EV(IAP, EVENT_04H_07H)			\
-__PMC_EV(IAP, EVENT_04H_08H)			\
-__PMC_EV(IAP, EVENT_04H_10H)			\
-__PMC_EV(IAP, EVENT_04H_20H)			\
-__PMC_EV(IAP, EVENT_04H_40H)			\
-__PMC_EV(IAP, EVENT_04H_80H)			\
-__PMC_EV(IAP, EVENT_05H_00H)			\
-__PMC_EV(IAP, EVENT_05H_01H)			\
-__PMC_EV(IAP, EVENT_05H_02H)			\
-__PMC_EV(IAP, EVENT_05H_03H)			\
-__PMC_EV(IAP, EVENT_06H_00H)			\
-__PMC_EV(IAP, EVENT_06H_01H)			\
-__PMC_EV(IAP, EVENT_06H_02H)			\
-__PMC_EV(IAP, EVENT_06H_04H)			\
-__PMC_EV(IAP, EVENT_06H_08H)			\
-__PMC_EV(IAP, EVENT_06H_0FH)			\
-__PMC_EV(IAP, EVENT_07H_00H)			\
-__PMC_EV(IAP, EVENT_07H_01H)			\
-__PMC_EV(IAP, EVENT_07H_02H)			\
-__PMC_EV(IAP, EVENT_07H_03H)			\
-__PMC_EV(IAP, EVENT_07H_06H)			\
-__PMC_EV(IAP, EVENT_07H_08H)			\
-__PMC_EV(IAP, EVENT_08H_01H)			\
-__PMC_EV(IAP, EVENT_08H_02H)			\
-__PMC_EV(IAP, EVENT_08H_04H)			\
-__PMC_EV(IAP, EVENT_08H_05H)			\
-__PMC_EV(IAP, EVENT_08H_06H)			\
-__PMC_EV(IAP, EVENT_08H_07H)			\
-__PMC_EV(IAP, EVENT_08H_08H)			\
-__PMC_EV(IAP, EVENT_08H_09H)			\
-__PMC_EV(IAP, EVENT_08H_0EH)			\
-__PMC_EV(IAP, EVENT_08H_10H)			\
-__PMC_EV(IAP, EVENT_08H_20H)			\
-__PMC_EV(IAP, EVENT_08H_40H)			\
-__PMC_EV(IAP, EVENT_08H_60H)			\
-__PMC_EV(IAP, EVENT_08H_80H)			\
-__PMC_EV(IAP, EVENT_08H_81H)			\
-__PMC_EV(IAP, EVENT_08H_82H)			\
-__PMC_EV(IAP, EVENT_08H_84H)			\
-__PMC_EV(IAP, EVENT_08H_88H)			\
-__PMC_EV(IAP, EVENT_09H_01H)			\
-__PMC_EV(IAP, EVENT_09H_02H)			\
-__PMC_EV(IAP, EVENT_09H_04H)			\
-__PMC_EV(IAP, EVENT_09H_08H)			\
-__PMC_EV(IAP, EVENT_0BH_01H)			\
-__PMC_EV(IAP, EVENT_0BH_02H)			\
-__PMC_EV(IAP, EVENT_0BH_10H)			\
-__PMC_EV(IAP, EVENT_0CH_01H)			\
-__PMC_EV(IAP, EVENT_0CH_02H)			\
-__PMC_EV(IAP, EVENT_0CH_03H)			\
-__PMC_EV(IAP, EVENT_0DH_03H)			\
-__PMC_EV(IAP, EVENT_0DH_40H)			\
-__PMC_EV(IAP, EVENT_0EH_01H)			\
-__PMC_EV(IAP, EVENT_0EH_02H)			\
-__PMC_EV(IAP, EVENT_0EH_10H)			\
-__PMC_EV(IAP, EVENT_0EH_20H)			\
-__PMC_EV(IAP, EVENT_0EH_40H)			\
-__PMC_EV(IAP, EVENT_0FH_01H)			\
-__PMC_EV(IAP, EVENT_0FH_02H)			\
-__PMC_EV(IAP, EVENT_0FH_08H)			\
-__PMC_EV(IAP, EVENT_0FH_10H)			\
-__PMC_EV(IAP, EVENT_0FH_20H)			\
-__PMC_EV(IAP, EVENT_0FH_80H)			\
-__PMC_EV(IAP, EVENT_10H_00H)			\
-__PMC_EV(IAP, EVENT_10H_01H)			\
-__PMC_EV(IAP, EVENT_10H_02H)			\
-__PMC_EV(IAP, EVENT_10H_04H)			\
-__PMC_EV(IAP, EVENT_10H_08H)			\
-__PMC_EV(IAP, EVENT_10H_10H)			\
-__PMC_EV(IAP, EVENT_10H_20H)			\
-__PMC_EV(IAP, EVENT_10H_40H)			\
-__PMC_EV(IAP, EVENT_10H_80H)			\
-__PMC_EV(IAP, EVENT_10H_81H)			\
-__PMC_EV(IAP, EVENT_11H_00H)			\
-__PMC_EV(IAP, EVENT_11H_01H)			\
-__PMC_EV(IAP, EVENT_11H_02H)			\
-__PMC_EV(IAP, EVENT_11H_81H)			\
-__PMC_EV(IAP, EVENT_12H_00H)			\
-__PMC_EV(IAP, EVENT_12H_01H)			\
-__PMC_EV(IAP, EVENT_12H_02H)			\
-__PMC_EV(IAP, EVENT_12H_04H)			\
-__PMC_EV(IAP, EVENT_12H_08H)			\
-__PMC_EV(IAP, EVENT_12H_10H)			\
-__PMC_EV(IAP, EVENT_12H_20H)			\
-__PMC_EV(IAP, EVENT_12H_40H)			\
-__PMC_EV(IAP, EVENT_12H_81H)			\
-__PMC_EV(IAP, EVENT_13H_00H)			\
-__PMC_EV(IAP, EVENT_13H_01H)			\
-__PMC_EV(IAP, EVENT_13H_02H)			\
-__PMC_EV(IAP, EVENT_13H_04H)			\
-__PMC_EV(IAP, EVENT_13H_07H)			\
-__PMC_EV(IAP, EVENT_13H_81H)			\
-__PMC_EV(IAP, EVENT_14H_00H)			\
-__PMC_EV(IAP, EVENT_14H_01H)			\
-__PMC_EV(IAP, EVENT_14H_02H)			\
-__PMC_EV(IAP, EVENT_17H_01H)			\
-__PMC_EV(IAP, EVENT_18H_00H)			\
-__PMC_EV(IAP, EVENT_18H_01H)			\
-__PMC_EV(IAP, EVENT_19H_00H)			\
-__PMC_EV(IAP, EVENT_19H_01H)			\
-__PMC_EV(IAP, EVENT_19H_02H)			\
-__PMC_EV(IAP, EVENT_1DH_01H)			\
-__PMC_EV(IAP, EVENT_1DH_02H)			\
-__PMC_EV(IAP, EVENT_1DH_04H)			\
-__PMC_EV(IAP, EVENT_1EH_01H)			\
-__PMC_EV(IAP, EVENT_20H_01H)			\
-__PMC_EV(IAP, EVENT_21H)			\
-__PMC_EV(IAP, EVENT_22H)			\
-__PMC_EV(IAP, EVENT_22H_01H)			\
-__PMC_EV(IAP, EVENT_22H_02H)			\
-__PMC_EV(IAP, EVENT_22H_04H)			\
-__PMC_EV(IAP, EVENT_22H_08H)			\
-__PMC_EV(IAP, EVENT_22H_10H)			\
-__PMC_EV(IAP, EVENT_22H_20H)			\
-__PMC_EV(IAP, EVENT_22H_40H)			\
-__PMC_EV(IAP, EVENT_22H_80H)			\
-__PMC_EV(IAP, EVENT_23H)			\
-__PMC_EV(IAP, EVENT_24H)			\
-__PMC_EV(IAP, EVENT_24H_01H)			\
-__PMC_EV(IAP, EVENT_24H_02H)			\
-__PMC_EV(IAP, EVENT_24H_03H)			\
-__PMC_EV(IAP, EVENT_24H_04H)			\
-__PMC_EV(IAP, EVENT_24H_08H)			\
-__PMC_EV(IAP, EVENT_24H_0CH)			\
-__PMC_EV(IAP, EVENT_24H_10H)			\
-__PMC_EV(IAP, EVENT_24H_20H)			\
-__PMC_EV(IAP, EVENT_24H_21H)			\
-__PMC_EV(IAP, EVENT_24H_22H)			\
-__PMC_EV(IAP, EVENT_24H_24H)			\
-__PMC_EV(IAP, EVENT_24H_27H)			\
-__PMC_EV(IAP, EVENT_24H_30H)			\
-__PMC_EV(IAP, EVENT_24H_40H)			\
-__PMC_EV(IAP, EVENT_24H_41H)			\
-__PMC_EV(IAP, EVENT_24H_42H)			\
-__PMC_EV(IAP, EVENT_24H_44H)			\
-__PMC_EV(IAP, EVENT_24H_50H)			\
-__PMC_EV(IAP, EVENT_24H_80H)			\
-__PMC_EV(IAP, EVENT_24H_AAH)			\
-__PMC_EV(IAP, EVENT_24H_3FH)			\
-__PMC_EV(IAP, EVENT_24H_BFH)			\
-__PMC_EV(IAP, EVENT_24H_C0H)			\
-__PMC_EV(IAP, EVENT_24H_E1H)			\
-__PMC_EV(IAP, EVENT_24H_E2H)			\
-__PMC_EV(IAP, EVENT_24H_E4H)			\
-__PMC_EV(IAP, EVENT_24H_E7H)			\
-__PMC_EV(IAP, EVENT_24H_F8H)			\
-__PMC_EV(IAP, EVENT_24H_FFH)			\
-__PMC_EV(IAP, EVENT_25H)			\
-__PMC_EV(IAP, EVENT_26H)			\
-__PMC_EV(IAP, EVENT_26H_01H)			\
-__PMC_EV(IAP, EVENT_26H_02H)			\
-__PMC_EV(IAP, EVENT_26H_04H)			\
-__PMC_EV(IAP, EVENT_26H_08H)			\
-__PMC_EV(IAP, EVENT_26H_0FH)			\
-__PMC_EV(IAP, EVENT_26H_10H)			\
-__PMC_EV(IAP, EVENT_26H_20H)			\
-__PMC_EV(IAP, EVENT_26H_40H)			\
-__PMC_EV(IAP, EVENT_26H_80H)			\
-__PMC_EV(IAP, EVENT_26H_F0H)			\
-__PMC_EV(IAP, EVENT_26H_FFH)			\
-__PMC_EV(IAP, EVENT_27H)			\
-__PMC_EV(IAP, EVENT_27H_01H)			\
-__PMC_EV(IAP, EVENT_27H_02H)			\
-__PMC_EV(IAP, EVENT_27H_04H)			\
-__PMC_EV(IAP, EVENT_27H_08H)			\
-__PMC_EV(IAP, EVENT_27H_0EH)			\
-__PMC_EV(IAP, EVENT_27H_0FH)			\
-__PMC_EV(IAP, EVENT_27H_10H)			\
-__PMC_EV(IAP, EVENT_27H_20H)			\
-__PMC_EV(IAP, EVENT_27H_40H)			\
-__PMC_EV(IAP, EVENT_27H_50H)			\
-__PMC_EV(IAP, EVENT_27H_80H)			\
-__PMC_EV(IAP, EVENT_27H_E0H)			\
-__PMC_EV(IAP, EVENT_27H_F0H)			\
-__PMC_EV(IAP, EVENT_28H)			\
-__PMC_EV(IAP, EVENT_28H_01H)			\
-__PMC_EV(IAP, EVENT_28H_02H)			\
-__PMC_EV(IAP, EVENT_28H_04H)			\
-__PMC_EV(IAP, EVENT_28H_08H)			\
-__PMC_EV(IAP, EVENT_28H_0FH)			\
-__PMC_EV(IAP, EVENT_29H)			\
-__PMC_EV(IAP, EVENT_2AH)			\
-__PMC_EV(IAP, EVENT_2BH)			\
-__PMC_EV(IAP, EVENT_2EH)			\
-__PMC_EV(IAP, EVENT_2EH_01H)			\
-__PMC_EV(IAP, EVENT_2EH_02H)			\
-__PMC_EV(IAP, EVENT_2EH_41H)			\
-__PMC_EV(IAP, EVENT_2EH_4FH)			\
-__PMC_EV(IAP, EVENT_30H)			\
-__PMC_EV(IAP, EVENT_30H_00H)			\
-__PMC_EV(IAP, EVENT_31H_00H)			\
-__PMC_EV(IAP, EVENT_32H)			\
-__PMC_EV(IAP, EVENT_3AH)			\
-__PMC_EV(IAP, EVENT_3AH_00H)			\
-__PMC_EV(IAP, EVENT_3BH_C0H)			\
-__PMC_EV(IAP, EVENT_3CH_00H)			\
-__PMC_EV(IAP, EVENT_3CH_01H)			\
-__PMC_EV(IAP, EVENT_3CH_02H)			\
-__PMC_EV(IAP, EVENT_3DH_01H)			\
-__PMC_EV(IAP, EVENT_40H)			\
-__PMC_EV(IAP, EVENT_40H_01H)			\
-__PMC_EV(IAP, EVENT_40H_02H)			\
-__PMC_EV(IAP, EVENT_40H_04H)			\
-__PMC_EV(IAP, EVENT_40H_08H)			\
-__PMC_EV(IAP, EVENT_40H_0FH)			\
-__PMC_EV(IAP, EVENT_40H_21H)			\
-__PMC_EV(IAP, EVENT_41H)			\
-__PMC_EV(IAP, EVENT_41H_01H)			\
-__PMC_EV(IAP, EVENT_41H_02H)			\
-__PMC_EV(IAP, EVENT_41H_04H)			\
-__PMC_EV(IAP, EVENT_41H_08H)			\
-__PMC_EV(IAP, EVENT_41H_0FH)			\
-__PMC_EV(IAP, EVENT_41H_22H)			\
-__PMC_EV(IAP, EVENT_42H)			\
-__PMC_EV(IAP, EVENT_42H_01H)			\
-__PMC_EV(IAP, EVENT_42H_02H)			\
-__PMC_EV(IAP, EVENT_42H_04H)			\
-__PMC_EV(IAP, EVENT_42H_08H)			\
-__PMC_EV(IAP, EVENT_42H_10H)			\
-__PMC_EV(IAP, EVENT_43H_01H)			\
-__PMC_EV(IAP, EVENT_43H_02H)			\
-__PMC_EV(IAP, EVENT_44H_02H)			\
-__PMC_EV(IAP, EVENT_45H_0FH)			\
-__PMC_EV(IAP, EVENT_46H_00H)			\
-__PMC_EV(IAP, EVENT_47H_00H)			\
-__PMC_EV(IAP, EVENT_48H_00H)			\
-__PMC_EV(IAP, EVENT_48H_01H)			\
-__PMC_EV(IAP, EVENT_48H_02H)			\
-__PMC_EV(IAP, EVENT_49H_00H)			\
-__PMC_EV(IAP, EVENT_49H_0EH)			\
-__PMC_EV(IAP, EVENT_49H_01H)			\
-__PMC_EV(IAP, EVENT_49H_02H)			\
-__PMC_EV(IAP, EVENT_49H_04H)			\
-__PMC_EV(IAP, EVENT_49H_10H)			\
-__PMC_EV(IAP, EVENT_49H_20H)			\
-__PMC_EV(IAP, EVENT_49H_40H)			\
-__PMC_EV(IAP, EVENT_49H_60H)			\
-__PMC_EV(IAP, EVENT_49H_80H)			\
-__PMC_EV(IAP, EVENT_4BH_00H)			\
-__PMC_EV(IAP, EVENT_4BH_01H)			\
-__PMC_EV(IAP, EVENT_4BH_02H)			\
-__PMC_EV(IAP, EVENT_4BH_03H)			\
-__PMC_EV(IAP, EVENT_4BH_08H)			\
-__PMC_EV(IAP, EVENT_4CH_00H)			\
-__PMC_EV(IAP, EVENT_4CH_01H)			\
-__PMC_EV(IAP, EVENT_4CH_02H)			\
-__PMC_EV(IAP, EVENT_4DH_01H)			\
-__PMC_EV(IAP, EVENT_4EH_01H)			\
-__PMC_EV(IAP, EVENT_4EH_02H)			\
-__PMC_EV(IAP, EVENT_4EH_04H)			\
-__PMC_EV(IAP, EVENT_4EH_10H)			\
-__PMC_EV(IAP, EVENT_4FH_00H)			\
-__PMC_EV(IAP, EVENT_4FH_02H)			\
-__PMC_EV(IAP, EVENT_4FH_04H)			\
-__PMC_EV(IAP, EVENT_4FH_08H)			\
-__PMC_EV(IAP, EVENT_4FH_10H)			\
-__PMC_EV(IAP, EVENT_51H_01H)			\
-__PMC_EV(IAP, EVENT_51H_02H)			\
-__PMC_EV(IAP, EVENT_51H_04H)			\
-__PMC_EV(IAP, EVENT_51H_08H)			\
-__PMC_EV(IAP, EVENT_52H_01H)			\
-__PMC_EV(IAP, EVENT_53H_01H)			\
-__PMC_EV(IAP, EVENT_58H_01H)			\
-__PMC_EV(IAP, EVENT_58H_02H)			\
-__PMC_EV(IAP, EVENT_58H_04H)			\
-__PMC_EV(IAP, EVENT_58H_08H)			\
-__PMC_EV(IAP, EVENT_59H_20H)			\
-__PMC_EV(IAP, EVENT_59H_40H)			\
-__PMC_EV(IAP, EVENT_59H_80H)			\
-__PMC_EV(IAP, EVENT_5BH_0CH)			\
-__PMC_EV(IAP, EVENT_5BH_0FH)			\
-__PMC_EV(IAP, EVENT_5BH_40H)			\
-__PMC_EV(IAP, EVENT_5BH_4FH)			\
-__PMC_EV(IAP, EVENT_5CH_01H)			\
-__PMC_EV(IAP, EVENT_5CH_02H)			\
-__PMC_EV(IAP, EVENT_5EH_01H)			\
-__PMC_EV(IAP, EVENT_5FH_01H)			\
-__PMC_EV(IAP, EVENT_5FH_04H)			\
-__PMC_EV(IAP, EVENT_60H)			\
-__PMC_EV(IAP, EVENT_60H_01H)			\
-__PMC_EV(IAP, EVENT_60H_02H)			\
-__PMC_EV(IAP, EVENT_60H_04H)			\
-__PMC_EV(IAP, EVENT_60H_08H)			\
-__PMC_EV(IAP, EVENT_61H)			\
-__PMC_EV(IAP, EVENT_61H_00H)			\
-__PMC_EV(IAP, EVENT_62H)			\
-__PMC_EV(IAP, EVENT_62H_00H)			\
-__PMC_EV(IAP, EVENT_63H)			\
-__PMC_EV(IAP, EVENT_63H_01H)			\
-__PMC_EV(IAP, EVENT_63H_02H)			\
-__PMC_EV(IAP, EVENT_64H)			\
-__PMC_EV(IAP, EVENT_64H_40H)			\
-__PMC_EV(IAP, EVENT_65H)			\
-__PMC_EV(IAP, EVENT_66H)			\
-__PMC_EV(IAP, EVENT_67H)			\
-__PMC_EV(IAP, EVENT_68H)			\
-__PMC_EV(IAP, EVENT_69H)			\
-__PMC_EV(IAP, EVENT_6AH)			\
-__PMC_EV(IAP, EVENT_6BH)			\
-__PMC_EV(IAP, EVENT_6CH)			\
-__PMC_EV(IAP, EVENT_6CH_01H)			\
-__PMC_EV(IAP, EVENT_6DH)			\
-__PMC_EV(IAP, EVENT_6EH)			\
-__PMC_EV(IAP, EVENT_6FH)			\
-__PMC_EV(IAP, EVENT_70H)			\
-__PMC_EV(IAP, EVENT_77H)			\
-__PMC_EV(IAP, EVENT_78H)			\
-__PMC_EV(IAP, EVENT_79H_02H)			\
-__PMC_EV(IAP, EVENT_79H_04H)			\
-__PMC_EV(IAP, EVENT_79H_08H)			\
-__PMC_EV(IAP, EVENT_79H_10H)			\
-__PMC_EV(IAP, EVENT_79H_20H)			\
-__PMC_EV(IAP, EVENT_79H_30H)			\
-__PMC_EV(IAP, EVENT_79H_18H)			\
-__PMC_EV(IAP, EVENT_79H_24H)			\
-__PMC_EV(IAP, EVENT_79H_3CH)			\
-__PMC_EV(IAP, EVENT_7AH)			\
-__PMC_EV(IAP, EVENT_7BH)			\
-__PMC_EV(IAP, EVENT_7DH)			\
-__PMC_EV(IAP, EVENT_7EH)			\
-__PMC_EV(IAP, EVENT_7EH_00H)			\
-__PMC_EV(IAP, EVENT_7FH)			\
-__PMC_EV(IAP, EVENT_80H_00H)			\
-__PMC_EV(IAP, EVENT_80H_01H)			\
-__PMC_EV(IAP, EVENT_80H_02H)			\
-__PMC_EV(IAP, EVENT_80H_03H)			\
-__PMC_EV(IAP, EVENT_80H_04H)			\
-__PMC_EV(IAP, EVENT_80H_10H)			\
-__PMC_EV(IAP, EVENT_81H_00H)			\
-__PMC_EV(IAP, EVENT_81H_01H)			\
-__PMC_EV(IAP, EVENT_81H_02H)			\
-__PMC_EV(IAP, EVENT_82H_01H)			\
-__PMC_EV(IAP, EVENT_82H_02H)			\
-__PMC_EV(IAP, EVENT_82H_04H)			\
-__PMC_EV(IAP, EVENT_82H_10H)			\
-__PMC_EV(IAP, EVENT_82H_12H)			\
-__PMC_EV(IAP, EVENT_82H_40H)			\
-__PMC_EV(IAP, EVENT_83H_01H)			\
-__PMC_EV(IAP, EVENT_83H_02H)			\
-__PMC_EV(IAP, EVENT_85H_00H)			\
-__PMC_EV(IAP, EVENT_85H_01H)			\
-__PMC_EV(IAP, EVENT_85H_02H)			\
-__PMC_EV(IAP, EVENT_85H_04H)			\
-__PMC_EV(IAP, EVENT_85H_0EH)			\
-__PMC_EV(IAP, EVENT_85H_10H)			\
-__PMC_EV(IAP, EVENT_85H_20H)			\
-__PMC_EV(IAP, EVENT_85H_40H)			\
-__PMC_EV(IAP, EVENT_85H_60H)			\
-__PMC_EV(IAP, EVENT_85H_80H)			\
-__PMC_EV(IAP, EVENT_86H_00H)			\
-__PMC_EV(IAP, EVENT_87H_00H)			\
-__PMC_EV(IAP, EVENT_87H_01H)			\
-__PMC_EV(IAP, EVENT_87H_02H)			\
-__PMC_EV(IAP, EVENT_87H_04H)			\
-__PMC_EV(IAP, EVENT_87H_08H)			\
-__PMC_EV(IAP, EVENT_87H_0FH)			\
-__PMC_EV(IAP, EVENT_88H_00H)			\
-__PMC_EV(IAP, EVENT_88H_01H)			\
-__PMC_EV(IAP, EVENT_88H_02H)			\
-__PMC_EV(IAP, EVENT_88H_04H)			\
-__PMC_EV(IAP, EVENT_88H_07H)			\
-__PMC_EV(IAP, EVENT_88H_08H)			\
-__PMC_EV(IAP, EVENT_88H_10H)			\
-__PMC_EV(IAP, EVENT_88H_20H)			\
-__PMC_EV(IAP, EVENT_88H_30H)			\
-__PMC_EV(IAP, EVENT_88H_40H)			\
-__PMC_EV(IAP, EVENT_88H_80H)			\
-__PMC_EV(IAP, EVENT_88H_7FH)			\
-__PMC_EV(IAP, EVENT_88H_FFH)			\
-__PMC_EV(IAP, EVENT_89H_00H)			\
-__PMC_EV(IAP, EVENT_89H_01H)			\
-__PMC_EV(IAP, EVENT_89H_02H)			\
-__PMC_EV(IAP, EVENT_89H_04H)			\
-__PMC_EV(IAP, EVENT_89H_07H)			\
-__PMC_EV(IAP, EVENT_89H_08H)			\
-__PMC_EV(IAP, EVENT_89H_10H)			\
-__PMC_EV(IAP, EVENT_89H_20H)			\
-__PMC_EV(IAP, EVENT_89H_30H)			\
-__PMC_EV(IAP, EVENT_89H_40H)			\
-__PMC_EV(IAP, EVENT_89H_80H)			\
-__PMC_EV(IAP, EVENT_89H_7FH)			\
-__PMC_EV(IAP, EVENT_89H_FFH)			\
-__PMC_EV(IAP, EVENT_8AH_00H)			\
-__PMC_EV(IAP, EVENT_8BH_00H)			\
-__PMC_EV(IAP, EVENT_8CH_00H)			\
-__PMC_EV(IAP, EVENT_8DH_00H)			\
-__PMC_EV(IAP, EVENT_8EH_00H)			\
-__PMC_EV(IAP, EVENT_8FH_00H)			\
-__PMC_EV(IAP, EVENT_90H_00H)			\
-__PMC_EV(IAP, EVENT_91H_00H)			\
-__PMC_EV(IAP, EVENT_92H_00H)			\
-__PMC_EV(IAP, EVENT_93H_00H)			\
-__PMC_EV(IAP, EVENT_94H_00H)			\
-__PMC_EV(IAP, EVENT_97H_00H)			\
-__PMC_EV(IAP, EVENT_98H_00H)			\
-__PMC_EV(IAP, EVENT_9CH_01H)			\
-__PMC_EV(IAP, EVENT_A0H_00H)			\
-__PMC_EV(IAP, EVENT_A1H_01H)			\
-__PMC_EV(IAP, EVENT_A1H_02H)			\
-__PMC_EV(IAP, EVENT_A1H_04H)			\
-__PMC_EV(IAP, EVENT_A1H_08H)			\
-__PMC_EV(IAP, EVENT_A1H_0CH)			\
-__PMC_EV(IAP, EVENT_A1H_10H)			\
-__PMC_EV(IAP, EVENT_A1H_20H)			\
-__PMC_EV(IAP, EVENT_A1H_30H)			\
-__PMC_EV(IAP, EVENT_A1H_40H)			\
-__PMC_EV(IAP, EVENT_A1H_80H)			\
-__PMC_EV(IAP, EVENT_A2H_00H)			\
-__PMC_EV(IAP, EVENT_A2H_01H)			\
-__PMC_EV(IAP, EVENT_A2H_02H)			\
-__PMC_EV(IAP, EVENT_A2H_04H)			\
-__PMC_EV(IAP, EVENT_A2H_08H)			\
-__PMC_EV(IAP, EVENT_A2H_10H)			\
-__PMC_EV(IAP, EVENT_A2H_20H)			\
-__PMC_EV(IAP, EVENT_A2H_40H)			\
-__PMC_EV(IAP, EVENT_A2H_80H)			\
-__PMC_EV(IAP, EVENT_A3H_01H)			\
-__PMC_EV(IAP, EVENT_A3H_02H)			\
-__PMC_EV(IAP, EVENT_A3H_04H)			\
-__PMC_EV(IAP, EVENT_A3H_05H)			\
-__PMC_EV(IAP, EVENT_A3H_08H)			\
-__PMC_EV(IAP, EVENT_A3H_0CH)			\
-__PMC_EV(IAP, EVENT_A6H_01H)			\
-__PMC_EV(IAP, EVENT_A7H_01H)			\
-__PMC_EV(IAP, EVENT_A8H_01H)			\
-__PMC_EV(IAP, EVENT_AAH_01H)			\
-__PMC_EV(IAP, EVENT_AAH_02H)			\
-__PMC_EV(IAP, EVENT_AAH_03H)			\
-__PMC_EV(IAP, EVENT_AAH_08H)			\
-__PMC_EV(IAP, EVENT_ABH_01H)			\
-__PMC_EV(IAP, EVENT_ABH_02H)			\
-__PMC_EV(IAP, EVENT_ACH_02H)			\
-__PMC_EV(IAP, EVENT_ACH_08H)			\
-__PMC_EV(IAP, EVENT_ACH_0AH)			\
-__PMC_EV(IAP, EVENT_AEH_01H)			\
-__PMC_EV(IAP, EVENT_B0H_00H)			\
-__PMC_EV(IAP, EVENT_B0H_01H)			\
-__PMC_EV(IAP, EVENT_B0H_02H)			\
-__PMC_EV(IAP, EVENT_B0H_04H)			\
-__PMC_EV(IAP, EVENT_B0H_08H)			\
-__PMC_EV(IAP, EVENT_B0H_10H)			\
-__PMC_EV(IAP, EVENT_B0H_20H)			\
-__PMC_EV(IAP, EVENT_B0H_40H)			\
-__PMC_EV(IAP, EVENT_B0H_80H)			\
-__PMC_EV(IAP, EVENT_B1H_00H)			\
-__PMC_EV(IAP, EVENT_B1H_01H)			\
-__PMC_EV(IAP, EVENT_B1H_02H)			\
-__PMC_EV(IAP, EVENT_B1H_04H)			\
-__PMC_EV(IAP, EVENT_B1H_08H)			\
-__PMC_EV(IAP, EVENT_B1H_10H)			\
-__PMC_EV(IAP, EVENT_B1H_1FH)			\
-__PMC_EV(IAP, EVENT_B1H_20H)			\
-__PMC_EV(IAP, EVENT_B1H_3FH)			\
-__PMC_EV(IAP, EVENT_B1H_40H)			\
-__PMC_EV(IAP, EVENT_B1H_80H)			\
-__PMC_EV(IAP, EVENT_B2H_01H)			\
-__PMC_EV(IAP, EVENT_B3H_01H)			\
-__PMC_EV(IAP, EVENT_B3H_02H)			\
-__PMC_EV(IAP, EVENT_B3H_04H)			\
-__PMC_EV(IAP, EVENT_B3H_08H)			\
-__PMC_EV(IAP, EVENT_B3H_10H)			\
-__PMC_EV(IAP, EVENT_B3H_20H)			\
-__PMC_EV(IAP, EVENT_B3H_81H)			\
-__PMC_EV(IAP, EVENT_B3H_82H)			\
-__PMC_EV(IAP, EVENT_B3H_84H)			\
-__PMC_EV(IAP, EVENT_B3H_88H)			\
-__PMC_EV(IAP, EVENT_B3H_90H)			\
-__PMC_EV(IAP, EVENT_B3H_A0H)			\
-__PMC_EV(IAP, EVENT_B4H_01H)			\
-__PMC_EV(IAP, EVENT_B4H_02H)			\
-__PMC_EV(IAP, EVENT_B4H_04H)			\
-__PMC_EV(IAP, EVENT_B6H_01H)			\
-__PMC_EV(IAP, EVENT_B6H_04H)			\
-__PMC_EV(IAP, EVENT_B7H_01H)			\
-__PMC_EV(IAP, EVENT_B7H_02H)			\
-__PMC_EV(IAP, EVENT_B8H_01H)			\
-__PMC_EV(IAP, EVENT_B8H_02H)			\
-__PMC_EV(IAP, EVENT_B8H_04H)			\
-__PMC_EV(IAP, EVENT_BAH_01H)			\
-__PMC_EV(IAP, EVENT_BAH_02H)			\
-__PMC_EV(IAP, EVENT_BBH_01H)			\
-__PMC_EV(IAP, EVENT_BCH_11H)			\
-__PMC_EV(IAP, EVENT_BCH_12H)			\
-__PMC_EV(IAP, EVENT_BCH_14H)			\
-__PMC_EV(IAP, EVENT_BCH_18H)			\
-__PMC_EV(IAP, EVENT_BCH_21H)			\
-__PMC_EV(IAP, EVENT_BCH_22H)			\
-__PMC_EV(IAP, EVENT_BCH_24H)			\
-__PMC_EV(IAP, EVENT_BCH_28H)			\
-__PMC_EV(IAP, EVENT_BDH_01H)			\
-__PMC_EV(IAP, EVENT_BDH_20H)			\
-__PMC_EV(IAP, EVENT_BFH_05H)			\
-__PMC_EV(IAP, EVENT_C0H_00H)			\
-__PMC_EV(IAP, EVENT_C0H_01H)			\
-__PMC_EV(IAP, EVENT_C0H_02H)			\
-__PMC_EV(IAP, EVENT_C0H_04H)			\
-__PMC_EV(IAP, EVENT_C0H_08H)			\
-__PMC_EV(IAP, EVENT_C1H_00H)			\
-__PMC_EV(IAP, EVENT_C1H_01H)			\
-__PMC_EV(IAP, EVENT_C1H_02H)			\
-__PMC_EV(IAP, EVENT_C1H_08H)			\
-__PMC_EV(IAP, EVENT_C1H_10H)			\
-__PMC_EV(IAP, EVENT_C1H_20H)			\
-__PMC_EV(IAP, EVENT_C1H_40H)			\
-__PMC_EV(IAP, EVENT_C1H_80H)			\
-__PMC_EV(IAP, EVENT_C1H_FEH)			\
-__PMC_EV(IAP, EVENT_C2H_00H)			\
-__PMC_EV(IAP, EVENT_C2H_01H)			\
-__PMC_EV(IAP, EVENT_C2H_02H)			\
-__PMC_EV(IAP, EVENT_C2H_04H)			\
-__PMC_EV(IAP, EVENT_C2H_07H)			\
-__PMC_EV(IAP, EVENT_C2H_08H)			\
-__PMC_EV(IAP, EVENT_C2H_0FH)			\
-__PMC_EV(IAP, EVENT_C2H_10H)			\
-__PMC_EV(IAP, EVENT_C3H_00H)			\
-__PMC_EV(IAP, EVENT_C3H_01H)			\
-__PMC_EV(IAP, EVENT_C3H_02H)			\
-__PMC_EV(IAP, EVENT_C3H_04H)			\
-__PMC_EV(IAP, EVENT_C3H_08H)			\
-__PMC_EV(IAP, EVENT_C3H_10H)			\
-__PMC_EV(IAP, EVENT_C3H_20H)			\
-__PMC_EV(IAP, EVENT_C4H_00H)			\
-__PMC_EV(IAP, EVENT_C4H_01H)			\
-__PMC_EV(IAP, EVENT_C4H_02H)			\
-__PMC_EV(IAP, EVENT_C4H_04H)			\
-__PMC_EV(IAP, EVENT_C4H_08H)			\
-__PMC_EV(IAP, EVENT_C4H_0CH)			\
-__PMC_EV(IAP, EVENT_C4H_0FH)			\
-__PMC_EV(IAP, EVENT_C4H_10H)			\
-__PMC_EV(IAP, EVENT_C4H_20H)			\
-__PMC_EV(IAP, EVENT_C4H_40H)			\
-__PMC_EV(IAP, EVENT_C4H_7EH)			\
-__PMC_EV(IAP, EVENT_C4H_BFH)			\
-__PMC_EV(IAP, EVENT_C4H_EBH)			\
-__PMC_EV(IAP, EVENT_C4H_F7H)			\
-__PMC_EV(IAP, EVENT_C4H_F9H)			\
-__PMC_EV(IAP, EVENT_C4H_FBH)			\
-__PMC_EV(IAP, EVENT_C4H_FDH)			\
-__PMC_EV(IAP, EVENT_C4H_FEH)			\
-__PMC_EV(IAP, EVENT_C5H_00H)			\
-__PMC_EV(IAP, EVENT_C5H_01H)			\
-__PMC_EV(IAP, EVENT_C5H_02H)			\
-__PMC_EV(IAP, EVENT_C5H_04H)			\
-__PMC_EV(IAP, EVENT_C5H_10H)			\
-__PMC_EV(IAP, EVENT_C5H_20H)			\
-__PMC_EV(IAP, EVENT_C5H_7EH)			\
-__PMC_EV(IAP, EVENT_C5H_BFH)			\
-__PMC_EV(IAP, EVENT_C5H_EBH)			\
-__PMC_EV(IAP, EVENT_C5H_F7H)			\
-__PMC_EV(IAP, EVENT_C5H_F9H)			\
-__PMC_EV(IAP, EVENT_C5H_FBH)			\
-__PMC_EV(IAP, EVENT_C5H_FDH)			\
-__PMC_EV(IAP, EVENT_C5H_FEH)			\
-__PMC_EV(IAP, EVENT_C6H_00H)			\
-__PMC_EV(IAP, EVENT_C6H_01H)			\
-__PMC_EV(IAP, EVENT_C6H_02H)			\
-__PMC_EV(IAP, EVENT_C7H_00H)			\
-__PMC_EV(IAP, EVENT_C7H_01H)			\
-__PMC_EV(IAP, EVENT_C7H_02H)			\
-__PMC_EV(IAP, EVENT_C7H_04H)			\
-__PMC_EV(IAP, EVENT_C7H_08H)			\
-__PMC_EV(IAP, EVENT_C7H_10H)			\
-__PMC_EV(IAP, EVENT_C7H_1FH)			\
-__PMC_EV(IAP, EVENT_C8H_00H)			\
-__PMC_EV(IAP, EVENT_C8H_20H)			\
-__PMC_EV(IAP, EVENT_C9H_00H)			\
-__PMC_EV(IAP, EVENT_CAH_00H)			\
-__PMC_EV(IAP, EVENT_CAH_01H)			\
-__PMC_EV(IAP, EVENT_CAH_02H)			\
-__PMC_EV(IAP, EVENT_CAH_04H)			\
-__PMC_EV(IAP, EVENT_CAH_08H)			\
-__PMC_EV(IAP, EVENT_CAH_10H)			\
-__PMC_EV(IAP, EVENT_CAH_20H)			\
-__PMC_EV(IAP, EVENT_CAH_1EH)			\
-__PMC_EV(IAP, EVENT_CAH_3FH)			\
-__PMC_EV(IAP, EVENT_CAH_50H)			\
-__PMC_EV(IAP, EVENT_CBH_01H)			\
-__PMC_EV(IAP, EVENT_CBH_02H)			\
-__PMC_EV(IAP, EVENT_CBH_04H)			\
-__PMC_EV(IAP, EVENT_CBH_08H)			\
-__PMC_EV(IAP, EVENT_CBH_10H)			\
-__PMC_EV(IAP, EVENT_CBH_1FH)			\
-__PMC_EV(IAP, EVENT_CBH_40H)			\
-__PMC_EV(IAP, EVENT_CBH_80H)			\
-__PMC_EV(IAP, EVENT_CCH_00H)			\
-__PMC_EV(IAP, EVENT_CCH_01H)			\
-__PMC_EV(IAP, EVENT_CCH_02H)			\
-__PMC_EV(IAP, EVENT_CCH_03H)			\
-__PMC_EV(IAP, EVENT_CCH_20H)			\
-__PMC_EV(IAP, EVENT_CDH_00H)			\
-__PMC_EV(IAP, EVENT_CDH_01H)			\
-__PMC_EV(IAP, EVENT_CDH_02H)			\
-__PMC_EV(IAP, EVENT_CEH_00H)			\
-__PMC_EV(IAP, EVENT_CFH_00H)			\
-__PMC_EV(IAP, EVENT_D0H_00H)			\
-__PMC_EV(IAP, EVENT_D0H_01H)			\
-__PMC_EV(IAP, EVENT_D0H_02H)			\
-__PMC_EV(IAP, EVENT_D0H_10H)			\
-__PMC_EV(IAP, EVENT_D0H_11H)			\
-__PMC_EV(IAP, EVENT_D0H_12H)			\
-__PMC_EV(IAP, EVENT_D0H_20H)			\
-__PMC_EV(IAP, EVENT_D0H_21H)			\
-__PMC_EV(IAP, EVENT_D0H_40H)			\
-__PMC_EV(IAP, EVENT_D0H_41H)			\
-__PMC_EV(IAP, EVENT_D0H_42H)			\
-__PMC_EV(IAP, EVENT_D0H_80H)			\
-__PMC_EV(IAP, EVENT_D0H_81H)			\
-__PMC_EV(IAP, EVENT_D0H_82H)			\
-__PMC_EV(IAP, EVENT_D1H_01H)			\
-__PMC_EV(IAP, EVENT_D1H_02H)			\
-__PMC_EV(IAP, EVENT_D1H_04H)			\
-__PMC_EV(IAP, EVENT_D1H_08H)			\
-__PMC_EV(IAP, EVENT_D1H_10H)			\
-__PMC_EV(IAP, EVENT_D1H_20H)			\
-__PMC_EV(IAP, EVENT_D1H_40H)			\
-__PMC_EV(IAP, EVENT_D2H_01H)			\
-__PMC_EV(IAP, EVENT_D2H_02H)			\
-__PMC_EV(IAP, EVENT_D2H_04H)			\
-__PMC_EV(IAP, EVENT_D2H_08H)			\
-__PMC_EV(IAP, EVENT_D2H_0FH)			\
-__PMC_EV(IAP, EVENT_D2H_10H)			\
-__PMC_EV(IAP, EVENT_D3H_01H)			\
-__PMC_EV(IAP, EVENT_D3H_03H)			\
-__PMC_EV(IAP, EVENT_D3H_04H)			\
-__PMC_EV(IAP, EVENT_D3H_0CH)			\
-__PMC_EV(IAP, EVENT_D3H_10H)			\
-__PMC_EV(IAP, EVENT_D3H_20H)			\
-__PMC_EV(IAP, EVENT_D4H_01H)			\
-__PMC_EV(IAP, EVENT_D4H_02H)			\
-__PMC_EV(IAP, EVENT_D4H_04H)			\
-__PMC_EV(IAP, EVENT_D4H_08H)			\
-__PMC_EV(IAP, EVENT_D4H_0FH)			\
-__PMC_EV(IAP, EVENT_D5H_01H)			\
-__PMC_EV(IAP, EVENT_D5H_02H)			\
-__PMC_EV(IAP, EVENT_D5H_04H)			\
-__PMC_EV(IAP, EVENT_D5H_08H)			\
-__PMC_EV(IAP, EVENT_D5H_0FH)			\
-__PMC_EV(IAP, EVENT_D7H_00H)			\
-__PMC_EV(IAP, EVENT_D8H_00H)			\
-__PMC_EV(IAP, EVENT_D8H_01H)			\
-__PMC_EV(IAP, EVENT_D8H_02H)			\
-__PMC_EV(IAP, EVENT_D8H_03H)			\
-__PMC_EV(IAP, EVENT_D8H_04H)			\
-__PMC_EV(IAP, EVENT_D9H_00H)			\
-__PMC_EV(IAP, EVENT_D9H_01H)			\
-__PMC_EV(IAP, EVENT_D9H_02H)			\
-__PMC_EV(IAP, EVENT_D9H_03H)			\
-__PMC_EV(IAP, EVENT_DAH_00H)			\
-__PMC_EV(IAP, EVENT_DAH_01H)			\
-__PMC_EV(IAP, EVENT_DAH_02H)			\
-__PMC_EV(IAP, EVENT_DBH_00H)			\
-__PMC_EV(IAP, EVENT_DBH_01H)			\
-__PMC_EV(IAP, EVENT_DCH_01H)			\
-__PMC_EV(IAP, EVENT_DCH_02H)			\
-__PMC_EV(IAP, EVENT_DCH_04H)			\
-__PMC_EV(IAP, EVENT_DCH_08H)			\
-__PMC_EV(IAP, EVENT_DCH_10H)			\
-__PMC_EV(IAP, EVENT_DCH_1FH)			\
-__PMC_EV(IAP, EVENT_E0H_00H)			\
-__PMC_EV(IAP, EVENT_E0H_01H)			\
-__PMC_EV(IAP, EVENT_E2H_00H)			\
-__PMC_EV(IAP, EVENT_E4H_00H)			\
-__PMC_EV(IAP, EVENT_E4H_01H)			\
-__PMC_EV(IAP, EVENT_E5H_01H)			\
-__PMC_EV(IAP, EVENT_E6H_00H)			\
-__PMC_EV(IAP, EVENT_E6H_01H)			\
-__PMC_EV(IAP, EVENT_E6H_02H)			\
-__PMC_EV(IAP, EVENT_E6H_08H)			\
-__PMC_EV(IAP, EVENT_E6H_10H)			\
-__PMC_EV(IAP, EVENT_E6H_1FH)			\
-__PMC_EV(IAP, EVENT_E7H_01H)			\
-__PMC_EV(IAP, EVENT_E8H_01H)			\
-__PMC_EV(IAP, EVENT_E8H_02H)			\
-__PMC_EV(IAP, EVENT_E8H_03H)			\
-__PMC_EV(IAP, EVENT_ECH_01H)			\
-__PMC_EV(IAP, EVENT_F0H_00H)			\
-__PMC_EV(IAP, EVENT_F0H_01H)			\
-__PMC_EV(IAP, EVENT_F0H_02H)			\
-__PMC_EV(IAP, EVENT_F0H_04H)			\
-__PMC_EV(IAP, EVENT_F0H_08H)			\
-__PMC_EV(IAP, EVENT_F0H_10H)			\
-__PMC_EV(IAP, EVENT_F0H_20H)			\
-__PMC_EV(IAP, EVENT_F0H_40H)			\
-__PMC_EV(IAP, EVENT_F0H_80H)			\
-__PMC_EV(IAP, EVENT_F1H_01H)			\
-__PMC_EV(IAP, EVENT_F1H_02H)			\
-__PMC_EV(IAP, EVENT_F1H_04H)			\
-__PMC_EV(IAP, EVENT_F1H_07H)			\
-__PMC_EV(IAP, EVENT_F2H_01H)			\
-__PMC_EV(IAP, EVENT_F2H_02H)			\
-__PMC_EV(IAP, EVENT_F2H_04H)			\
-__PMC_EV(IAP, EVENT_F2H_05H)			\
-__PMC_EV(IAP, EVENT_F2H_06H)			\
-__PMC_EV(IAP, EVENT_F2H_08H)			\
-__PMC_EV(IAP, EVENT_F2H_0AH)			\
-__PMC_EV(IAP, EVENT_F2H_0FH)			\
-__PMC_EV(IAP, EVENT_F3H_01H)			\
-__PMC_EV(IAP, EVENT_F3H_02H)			\
-__PMC_EV(IAP, EVENT_F3H_04H)			\
-__PMC_EV(IAP, EVENT_F3H_08H)			\
-__PMC_EV(IAP, EVENT_F3H_10H)			\
-__PMC_EV(IAP, EVENT_F3H_20H)			\
-__PMC_EV(IAP, EVENT_F4H_01H)			\
-__PMC_EV(IAP, EVENT_F4H_02H)			\
-__PMC_EV(IAP, EVENT_F4H_04H)			\
-__PMC_EV(IAP, EVENT_F4H_08H)			\
-__PMC_EV(IAP, EVENT_F4H_10H)			\
-__PMC_EV(IAP, EVENT_F6H_01H)			\
-__PMC_EV(IAP, EVENT_F7H_01H)			\
-__PMC_EV(IAP, EVENT_F7H_02H)			\
-__PMC_EV(IAP, EVENT_F7H_04H)			\
-__PMC_EV(IAP, EVENT_F8H_00H)			\
-__PMC_EV(IAP, EVENT_F8H_01H)			\
-__PMC_EV(IAP, EVENT_FDH_01H)			\
-__PMC_EV(IAP, EVENT_FDH_02H)			\
-__PMC_EV(IAP, EVENT_FDH_04H)			\
-__PMC_EV(IAP, EVENT_FDH_08H)			\
-__PMC_EV(IAP, EVENT_FDH_10H)			\
-__PMC_EV(IAP, EVENT_FDH_20H)			\
-__PMC_EV(IAP, EVENT_FDH_40H)
-
-#define	PMC_EV_IAP_FIRST	PMC_EV_IAP_ARCH_BR_INS_RET
-#define	PMC_EV_IAP_LAST		PMC_EV_IAP_EVENT_FDH_40H
-
-/*
- * Map "architectural" event names to event ids.
- */
-#define	__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()				\
-__PMC_EV_ALIAS("branch-instruction-retired",	IAP_ARCH_BR_INS_RET)	\
-__PMC_EV_ALIAS("branch-misses-retired",		IAP_ARCH_BR_MIS_RET)	\
-__PMC_EV_ALIAS("instruction-retired",		IAP_ARCH_INS_RET)	\
-__PMC_EV_ALIAS("llc-misses",			IAP_ARCH_LLC_MIS)	\
-__PMC_EV_ALIAS("llc-reference",			IAP_ARCH_LLC_REF)	\
-__PMC_EV_ALIAS("unhalted-reference-cycles",	IAP_ARCH_UNH_REF_CYC)	\
-__PMC_EV_ALIAS("unhalted-core-cycles",		IAP_ARCH_UNH_COR_CYC)
-
-/*
- * Aliases for Atom PMCs.
- */
-#define	__PMC_EV_ALIAS_ATOM()						\
-__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
-__PMC_EV_ALIAS("BACLEARS",			IAP_EVENT_E6H_01H)	\
-__PMC_EV_ALIAS("BOGUS_BR",			IAP_EVENT_E4H_00H)	\
-__PMC_EV_ALIAS("BR_BAC_MISSP_EXEC",		IAP_EVENT_8AH_00H)	\
-__PMC_EV_ALIAS("BR_CALL_EXEC",			IAP_EVENT_92H_00H)	\
-__PMC_EV_ALIAS("BR_CALL_MISSP_EXEC",		IAP_EVENT_93H_00H)	\
-__PMC_EV_ALIAS("BR_CND_EXEC",			IAP_EVENT_8BH_00H)	\
-__PMC_EV_ALIAS("BR_CND_MISSP_EXEC",		IAP_EVENT_8CH_00H)	\
-__PMC_EV_ALIAS("BR_IND_CALL_EXEC",		IAP_EVENT_94H_00H)	\
-__PMC_EV_ALIAS("BR_IND_EXEC",			IAP_EVENT_8DH_00H)	\
-__PMC_EV_ALIAS("BR_IND_MISSP_EXEC",		IAP_EVENT_8EH_00H)	\
-__PMC_EV_ALIAS("BR_INST_DECODED",		IAP_EVENT_E0H_01H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC",			IAP_EVENT_88H_00H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ANY",		IAP_EVENT_C4H_00H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ANY1",		IAP_EVENT_C4H_0FH)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.MISPRED",	IAP_EVENT_C5H_00H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.MISPRED_NOT_TAKEN",			\
-    IAP_EVENT_C4H_02H)							\
-__PMC_EV_ALIAS("BR_INST_RETIRED.MISPRED_TAKEN",	IAP_EVENT_C4H_08H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.PRED_NOT_TAKEN", IAP_EVENT_C4H_01H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.PRED_TAKEN",	IAP_EVENT_C4H_04H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.TAKEN",		IAP_EVENT_C4H_0CH)	\
-__PMC_EV_ALIAS("BR_MISSP_EXEC",			IAP_EVENT_89H_00H)	\
-__PMC_EV_ALIAS("BR_RET_BAC_MISSP_EXEC",		IAP_EVENT_91H_00H)	\
-__PMC_EV_ALIAS("BR_RET_EXEC",			IAP_EVENT_8FH_00H)	\
-__PMC_EV_ALIAS("BR_RET_MISSP_EXEC",		IAP_EVENT_90H_00H)	\
-__PMC_EV_ALIAS("BR_TKN_BUBBLE_1",		IAP_EVENT_97H_00H)	\
-__PMC_EV_ALIAS("BR_TKN_BUBBLE_2",		IAP_EVENT_98H_00H)	\
-__PMC_EV_ALIAS("BUSQ_EMPTY",			IAP_EVENT_7DH)		\
-__PMC_EV_ALIAS("BUS_BNR_DRV",			IAP_EVENT_61H)		\
-__PMC_EV_ALIAS("BUS_DATA_RCV",			IAP_EVENT_64H)		\
-__PMC_EV_ALIAS("BUS_DRDY_CLOCKS",		IAP_EVENT_62H)		\
-__PMC_EV_ALIAS("BUS_HITM_DRV",			IAP_EVENT_7BH)		\
-__PMC_EV_ALIAS("BUS_HIT_DRV",			IAP_EVENT_7AH)		\
-__PMC_EV_ALIAS("BUS_IO_WAIT",			IAP_EVENT_7FH)		\
-__PMC_EV_ALIAS("BUS_LOCK_CLOCKS",		IAP_EVENT_63H)		\
-__PMC_EV_ALIAS("BUS_REQUEST_OUTSTANDING",	IAP_EVENT_60H)		\
-__PMC_EV_ALIAS("BUS_TRANS_ANY",			IAP_EVENT_70H)		\
-__PMC_EV_ALIAS("BUS_TRANS_BRD",			IAP_EVENT_65H)		\
-__PMC_EV_ALIAS("BUS_TRANS_BURST",		IAP_EVENT_6EH)		\
-__PMC_EV_ALIAS("BUS_TRANS_DEF",			IAP_EVENT_6DH)		\
-__PMC_EV_ALIAS("BUS_TRANS_IFETCH",		IAP_EVENT_68H)		\
-__PMC_EV_ALIAS("BUS_TRANS_INVAL",		IAP_EVENT_69H)		\
-__PMC_EV_ALIAS("BUS_TRANS_IO",			IAP_EVENT_6CH)		\
-__PMC_EV_ALIAS("BUS_TRANS_MEM",			IAP_EVENT_6FH)		\
-__PMC_EV_ALIAS("BUS_TRANS_P",			IAP_EVENT_6BH)		\
-__PMC_EV_ALIAS("BUS_TRANS_PWR",			IAP_EVENT_6AH)		\
-__PMC_EV_ALIAS("BUS_TRANS_RFO",			IAP_EVENT_66H)		\
-__PMC_EV_ALIAS("BUS_TRANS_WB",			IAP_EVENT_67H)		\
-__PMC_EV_ALIAS("CMP_SNOOP",			IAP_EVENT_78H)		\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.BUS",		IAP_EVENT_3CH_01H)	\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.CORE_P",	IAP_EVENT_3CH_00H)	\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.NO_OTHER",	IAP_EVENT_3CH_02H)	\
-__PMC_EV_ALIAS("CYCLES_DIV_BUSY",		IAP_EVENT_14H_01H)	\
-__PMC_EV_ALIAS("CYCLES_INT_MASKED.CYCLES_INT_MASKED",			\
-    IAP_EVENT_C6H_01H)							\
-__PMC_EV_ALIAS("CYCLES_INT_MASKED.CYCLES_INT_PENDING_AND_MASKED",	\
-    IAP_EVENT_C6H_02H)							\
-__PMC_EV_ALIAS("CYCLES_L1I_MEM_STALLED",	IAP_EVENT_86H_00H)	\
-__PMC_EV_ALIAS("DATA_TLB_MISSES.DTLB_MISS",	IAP_EVENT_08H_07H)	\
-__PMC_EV_ALIAS("DATA_TLB_MISSES.DTLB_MISS_LD",	IAP_EVENT_08H_05H)	\
-__PMC_EV_ALIAS("DATA_TLB_MISSES.DTLB_MISS_ST",	IAP_EVENT_08H_06H)	\
-__PMC_EV_ALIAS("DATA_TLB_MISSES.UTLB_MISS_LD",	IAP_EVENT_08H_09H)	\
-__PMC_EV_ALIAS("DELAYED_BYPASS.FP",		IAP_EVENT_19H_00H)	\
-__PMC_EV_ALIAS("DELAYED_BYPASS.LOAD",		IAP_EVENT_19H_01H)	\
-__PMC_EV_ALIAS("DELAYED_BYPASS.SIMD",		IAP_EVENT_19H_02H)	\
-__PMC_EV_ALIAS("DIV",				IAP_EVENT_13H_00H)	\
-__PMC_EV_ALIAS("DIV.AR",			IAP_EVENT_13H_81H)	\
-__PMC_EV_ALIAS("DIV.S",				IAP_EVENT_13H_01H)	\
-__PMC_EV_ALIAS("DTLB_MISSES.ANY",		IAP_EVENT_08H_01H)	\
-__PMC_EV_ALIAS("DTLB_MISSES.L0_MISS_LD",	IAP_EVENT_08H_04H)	\
-__PMC_EV_ALIAS("DTLB_MISSES.MISS_LD",		IAP_EVENT_08H_02H)	\
-__PMC_EV_ALIAS("DTLB_MISSES.MISS_ST",		IAP_EVENT_08H_08H)	\
-__PMC_EV_ALIAS("EIST_TRANS",			IAP_EVENT_3AH_00H)	\
-__PMC_EV_ALIAS("ESP.ADDITIONS",			IAP_EVENT_ABH_02H)	\
-__PMC_EV_ALIAS("ESP.SYNCH",			IAP_EVENT_ABH_01H)	\
-__PMC_EV_ALIAS("EXT_SNOOP",			IAP_EVENT_77H)		\
-__PMC_EV_ALIAS("FP_ASSIST",			IAP_EVENT_11H_01H)	\
-__PMC_EV_ALIAS("FP_ASSIST.AR",			IAP_EVENT_11H_81H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE",		IAP_EVENT_10H_00H)	\
-__PMC_EV_ALIAS("FP_MMX_TRANS_TO_FP",		IAP_EVENT_CCH_02H)	\
-__PMC_EV_ALIAS("FP_MMX_TRANS_TO_MMX",		IAP_EVENT_CCH_01H)	\
-__PMC_EV_ALIAS("HW_INT_RCV",			IAP_EVENT_C8H_00H)	\
-__PMC_EV_ALIAS("ICACHE.ACCESSES",		IAP_EVENT_80H_03H)	\
-__PMC_EV_ALIAS("ICACHE.MISSES",			IAP_EVENT_80H_02H)	\
-__PMC_EV_ALIAS("IDLE_DURING_DIV",		IAP_EVENT_18H_00H)	\
-__PMC_EV_ALIAS("ILD_STALL",			IAP_EVENT_87H_00H)	\
-__PMC_EV_ALIAS("INST_QUEUE.FULL",		IAP_EVENT_83H_02H)	\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P",		IAP_EVENT_C0H_00H)	\
-__PMC_EV_ALIAS("INST_RETIRED.LOADS",		IAP_EVENT_C0H_01H)	\
-__PMC_EV_ALIAS("INST_RETIRED.OTHER",		IAP_EVENT_C0H_04H)	\
-__PMC_EV_ALIAS("INST_RETIRED.STORES",		IAP_EVENT_C0H_02H)	\
-__PMC_EV_ALIAS("ITLB.FLUSH",			IAP_EVENT_82H_04H)	\
-__PMC_EV_ALIAS("ITLB.LARGE_MISS",		IAP_EVENT_82H_10H)	\
-__PMC_EV_ALIAS("ITLB.MISSES",			IAP_EVENT_82H_02H)	\
-__PMC_EV_ALIAS("ITLB.SMALL_MISS",		IAP_EVENT_82H_02H)	\
-__PMC_EV_ALIAS("ITLB_MISS_RETIRED",		IAP_EVENT_C9H_00H)	\
-__PMC_EV_ALIAS("L1D_ALL_CACHE_REF",		IAP_EVENT_43H_02H)	\
-__PMC_EV_ALIAS("L1D_ALL_REF",			IAP_EVENT_43H_01H)	\
-__PMC_EV_ALIAS("L1D_CACHE.LD",			IAP_EVENT_40H_21H)	\
-__PMC_EV_ALIAS("L1D_CACHE.ST",			IAP_EVENT_41H_22H)	\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK",		IAP_EVENT_42H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK_DURATION",	IAP_EVENT_42H_10H)	\
-__PMC_EV_ALIAS("L1D_M_EVICT",			IAP_EVENT_47H_00H)	\
-__PMC_EV_ALIAS("L1D_M_REPL",			IAP_EVENT_46H_00H)	\
-__PMC_EV_ALIAS("L1D_PEND_MISS",			IAP_EVENT_48H_00H)	\
-__PMC_EV_ALIAS("L1D_PREFETCH.REQUESTS",		IAP_EVENT_4EH_10H)	\
-__PMC_EV_ALIAS("L1D_REPL",			IAP_EVENT_45H_0FH)	\
-__PMC_EV_ALIAS("L1D_SPLIT.LOADS",		IAP_EVENT_49H_01H)	\
-__PMC_EV_ALIAS("L1D_SPLIT.STORES",		IAP_EVENT_49H_02H)	\
-__PMC_EV_ALIAS("L1I_MISSES",			IAP_EVENT_81H_00H)	\
-__PMC_EV_ALIAS("L1I_READS",			IAP_EVENT_80H_00H)	\
-__PMC_EV_ALIAS("L2_ADS",			IAP_EVENT_21H)		\
-__PMC_EV_ALIAS("L2_DBUS_BUSY_RD",		IAP_EVENT_23H)		\
-__PMC_EV_ALIAS("L2_IFETCH",			IAP_EVENT_28H)		\
-__PMC_EV_ALIAS("L2_LD",				IAP_EVENT_29H)		\
-__PMC_EV_ALIAS("L2_LINES_IN",			IAP_EVENT_24H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT",			IAP_EVENT_26H)		\
-__PMC_EV_ALIAS("L2_LOCK",			IAP_EVENT_2BH)		\
-__PMC_EV_ALIAS("L2_M_LINES_IN",			IAP_EVENT_25H)		\
-__PMC_EV_ALIAS("L2_M_LINES_OUT",		IAP_EVENT_27H)		\
-__PMC_EV_ALIAS("L2_NO_REQ",			IAP_EVENT_32H)		\
-__PMC_EV_ALIAS("L2_REJECT_BUSQ",		IAP_EVENT_30H)		\
-__PMC_EV_ALIAS("L2_RQSTS",			IAP_EVENT_2EH)		\
-__PMC_EV_ALIAS("L2_RQSTS.SELF.DEMAND.I_STATE",	IAP_EVENT_2EH_41H)	\
-__PMC_EV_ALIAS("L2_RQSTS.SELF.DEMAND.MESI",	IAP_EVENT_2EH_4FH)	\
-__PMC_EV_ALIAS("L2_ST",				IAP_EVENT_2AH)		\
-__PMC_EV_ALIAS("LOAD_BLOCK.L1D",		IAP_EVENT_03H_20H)	\
-__PMC_EV_ALIAS("LOAD_BLOCK.OVERLAP_STORE",	IAP_EVENT_03H_08H)	\
-__PMC_EV_ALIAS("LOAD_BLOCK.STA",		IAP_EVENT_03H_02H)	\
-__PMC_EV_ALIAS("LOAD_BLOCK.STD",		IAP_EVENT_03H_04H)	\
-__PMC_EV_ALIAS("LOAD_BLOCK.UNTIL_RETIRE",	IAP_EVENT_03H_10H)	\
-__PMC_EV_ALIAS("LOAD_HIT_PRE",			IAP_EVENT_4CH_00H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC",		IAP_EVENT_C3H_01H)	\
-__PMC_EV_ALIAS("MACHINE_NUKES.MEM_ORDER",	IAP_EVENT_C3H_04H)	\
-__PMC_EV_ALIAS("MACRO_INSTS.ALL_DECODED",	IAP_EVENT_AAH_03H)	\
-__PMC_EV_ALIAS("MACRO_INSTS.CISC_DECODED",	IAP_EVENT_AAH_02H)	\
-__PMC_EV_ALIAS("MEMORY_DISAMBIGUATION.RESET",	IAP_EVENT_09H_01H)	\
-__PMC_EV_ALIAS("MEMORY_DISAMBIGUATION.SUCCESS",	IAP_EVENT_09H_02H)	\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.DTLB_MISS",	IAP_EVENT_CBH_04H)	\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L2_HIT",	IAP_EVENT_CBH_01H)	\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L2_LINE_MISS",	IAP_EVENT_CBH_08H)	\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L2_MISS",	IAP_EVENT_CBH_02H)	\
-__PMC_EV_ALIAS("MUL",				IAP_EVENT_12H_00H)	\
-__PMC_EV_ALIAS("MUL.AR",			IAP_EVENT_12H_81H)	\
-__PMC_EV_ALIAS("MUL.S",				IAP_EVENT_12H_01H)	\
-__PMC_EV_ALIAS("PAGE_WALKS.CYCLES",		IAP_EVENT_0CH_03H)	\
-__PMC_EV_ALIAS("PAGE_WALKS.WALKS",		IAP_EVENT_0CH_03H)	\
-__PMC_EV_ALIAS("PREFETCH.PREFETCHNTA",		IAP_EVENT_07H_08H)	\
-__PMC_EV_ALIAS("PREFETCH.PREFETCHT0",		IAP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("PREFETCH.SW_L2",		IAP_EVENT_07H_06H)	\
-__PMC_EV_ALIAS("PREF_RQSTS_DN",			IAP_EVENT_F8H_00H)	\
-__PMC_EV_ALIAS("PREF_RQSTS_UP",			IAP_EVENT_F0H_00H)	\
-__PMC_EV_ALIAS("RAT_STALLS.ANY",		IAP_EVENT_D2H_0FH)	\
-__PMC_EV_ALIAS("RAT_STALLS.FLAGS",		IAP_EVENT_D2H_04H)	\
-__PMC_EV_ALIAS("RAT_STALLS.FPSW",		IAP_EVENT_D2H_08H)	\
-__PMC_EV_ALIAS("RAT_STALLS.PARTIAL_CYCLES",	IAP_EVENT_D2H_02H)	\
-__PMC_EV_ALIAS("RAT_STALLS.ROB_READ_PORT",	IAP_EVENT_D2H_01H)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY",		IAP_EVENT_DCH_1FH)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS.BR_MISS_CLEAR",	IAP_EVENT_DCH_10H)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS.FPCW",		IAP_EVENT_DCH_08H)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS.LD_ST",		IAP_EVENT_DCH_04H)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB_FULL",	IAP_EVENT_DCH_01H)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS.RS_FULL",	IAP_EVENT_DCH_02H)	\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED",		IAP_EVENT_A0H_00H)	\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT0",	IAP_EVENT_A1H_01H)	\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT1",	IAP_EVENT_A1H_02H)	\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT2",	IAP_EVENT_A1H_04H)	\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT3",	IAP_EVENT_A1H_08H)	\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT4",	IAP_EVENT_A1H_10H)	\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT5",	IAP_EVENT_A1H_20H)	\
-__PMC_EV_ALIAS("SB_DRAIN_CYCLES",		IAP_EVENT_04H_01H)	\
-__PMC_EV_ALIAS("SEGMENT_REG_LOADS.ANY",		IAP_EVENT_06H_00H)	\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.ANY",		IAP_EVENT_D5H_0FH)	\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.DS",		IAP_EVENT_D5H_02H)	\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.ES",		IAP_EVENT_D5H_01H)	\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.FS",		IAP_EVENT_D5H_04H)	\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.GS",		IAP_EVENT_D5H_08H)	\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.ANY",		IAP_EVENT_D4H_0FH)	\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.DS",		IAP_EVENT_D4H_02H)	\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.ES",		IAP_EVENT_D4H_01H)	\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.FS",		IAP_EVENT_D4H_04H)	\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.GS",		IAP_EVENT_D4H_08H)	\
-__PMC_EV_ALIAS("SIMD_ASSIST",			IAP_EVENT_CDH_00H)	\
-__PMC_EV_ALIAS("SIMD_COMP_INST_RETIRED.PACKED_DOUBLE",			\
-    IAP_EVENT_CAH_04H)							\
-__PMC_EV_ALIAS("SIMD_COMP_INST_RETIRED.PACKED_SINGLE",			\
-    IAP_EVENT_CAH_01H)							\
-__PMC_EV_ALIAS("SIMD_COMP_INST_RETIRED.SCALAR_DOUBLE",			\
-    IAP_EVENT_CAH_08H)							\
-__PMC_EV_ALIAS("SIMD_COMP_INST_RETIRED.SCALAR_SINGLE",			\
-    IAP_EVENT_CAH_02H)							\
-__PMC_EV_ALIAS("SIMD_INSTR_RETIRED",		IAP_EVENT_CEH_00H)	\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.ANY",		IAP_EVENT_C7H_1FH)	\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.PACKED_DOUBLE", IAP_EVENT_C7H_04H)	\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.PACKED_SINGLE", IAP_EVENT_C7H_01H)	\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.SCALAR_DOUBLE", IAP_EVENT_C7H_08H)	\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.SCALAR_SINGLE", IAP_EVENT_C7H_02H)	\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.VECTOR",	IAP_EVENT_C7H_10H)	\
-__PMC_EV_ALIAS("SIMD_SAT_INSTR_RETIRED",	IAP_EVENT_CFH_00H)	\
-__PMC_EV_ALIAS("SIMD_SAT_UOP_EXEC.AR",		IAP_EVENT_B1H_80H)	\
-__PMC_EV_ALIAS("SIMD_SAT_UOP_EXEC.S",		IAP_EVENT_B1H_00H)	\
-__PMC_EV_ALIAS("SIMD_UOPS_EXEC.AR",		IAP_EVENT_B0H_80H)	\
-__PMC_EV_ALIAS("SIMD_UOPS_EXEC.S",		IAP_EVENT_B0H_00H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.ARITHMETIC.AR", IAP_EVENT_B3H_A0H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.ARITHMETIC.S",  IAP_EVENT_B3H_20H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.LOGICAL.AR",	IAP_EVENT_B3H_90H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.LOGICAL.S",	IAP_EVENT_B3H_10H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.MUL.AR",	IAP_EVENT_B3H_81H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.MUL.S",	IAP_EVENT_B3H_01H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.PACK.AR",	IAP_EVENT_B3H_84H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.PACK.S",	IAP_EVENT_B3H_04H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.SHIFT.AR",	IAP_EVENT_B3H_82H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.SHIFT.S",	IAP_EVENT_B3H_02H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.UNPACK.AR",	IAP_EVENT_B3H_88H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.UNPACK.S",	IAP_EVENT_B3H_08H)	\
-__PMC_EV_ALIAS("SNOOP_STALL_DRV",		IAP_EVENT_7EH)		\
-__PMC_EV_ALIAS("SSE_PRE_EXEC.L2",		IAP_EVENT_07H_02H)	\
-__PMC_EV_ALIAS("SSE_PRE_EXEC.STORES",		IAP_EVENT_07H_03H)	\
-__PMC_EV_ALIAS("SSE_PRE_MISS.L1",		IAP_EVENT_4BH_01H)	\
-__PMC_EV_ALIAS("SSE_PRE_MISS.L2",		IAP_EVENT_4BH_02H)	\
-__PMC_EV_ALIAS("SSE_PRE_MISS.NTA",		IAP_EVENT_4BH_00H)	\
-__PMC_EV_ALIAS("STORE_BLOCK.ORDER",		IAP_EVENT_04H_02H)	\
-__PMC_EV_ALIAS("STORE_BLOCK.SNOOP",		IAP_EVENT_04H_08H)	\
-__PMC_EV_ALIAS("STORE_FORWARDS.GOOD",		IAP_EVENT_02H_81H)	\
-__PMC_EV_ALIAS("THERMAL_TRIP",			IAP_EVENT_3BH_C0H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.ANY",		IAP_EVENT_C2H_10H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.FUSED",		IAP_EVENT_C2H_07H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.LD_IND_BR",	IAP_EVENT_C2H_01H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.MACRO_FUSION",	IAP_EVENT_C2H_04H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.NON_FUSED",	IAP_EVENT_C2H_08H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.STD_STA",		IAP_EVENT_C2H_02H)	\
-__PMC_EV_ALIAS("X87_COMP_OPS_EXE.ANY.AR",	IAP_EVENT_10H_81H)	\
-__PMC_EV_ALIAS("X87_COMP_OPS_EXE.ANY.S",	IAP_EVENT_10H_01H)	\
-__PMC_EV_ALIAS("X87_OPS_RETIRED.ANY",		IAP_EVENT_C1H_FEH)	\
-__PMC_EV_ALIAS("X87_OPS_RETIRED.FXCH",		IAP_EVENT_C1H_01H)
-
-/*
- * Aliases for Atom Silvermont PMCs.
- */
-#define	__PMC_EV_ALIAS_ATOM_SILVERMONT()				\
-__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
-__PMC_EV_ALIAS("REHABQ.LD_BLOCK_ST_FORWARD",	    IAP_EVENT_03H_01H)	\
-__PMC_EV_ALIAS("REHABQ.LD_BLOCK_STD_NOTREADY",	    IAP_EVENT_03H_02H)	\
-__PMC_EV_ALIAS("REHABQ.ST_SPLITS",		    IAP_EVENT_03H_04H)	\
-__PMC_EV_ALIAS("REHABQ.LD_SPLITS",		    IAP_EVENT_03H_08H)	\
-__PMC_EV_ALIAS("REHABQ.LOCK",			    IAP_EVENT_03H_10H)	\
-__PMC_EV_ALIAS("REHABQ.STA_FULL",		    IAP_EVENT_03H_20H)	\
-__PMC_EV_ALIAS("REHABQ.ANY_LD",			    IAP_EVENT_03H_40H)	\
-__PMC_EV_ALIAS("REHABQ.ANY_ST",			    IAP_EVENT_03H_80H)	\
-__PMC_EV_ALIAS("MEM_UOPS_RETIRED.L1_MISS_LOADS",    IAP_EVENT_04H_01H)	\
-__PMC_EV_ALIAS("MEM_UOPS_RETIRED.L2_HIT_LOADS",	    IAP_EVENT_04H_02H)	\
-__PMC_EV_ALIAS("MEM_UOPS_RETIRED.L2_MISS_LOADS",    IAP_EVENT_04H_04H)	\
-__PMC_EV_ALIAS("MEM_UOPS_RETIRED.DTLB_MISS_LOADS",  IAP_EVENT_04H_08H)	\
-__PMC_EV_ALIAS("MEM_UOPS_RETIRED.UTLB_MISS",	    IAP_EVENT_04H_10H)	\
-__PMC_EV_ALIAS("MEM_UOPS_RETIRED.HITM",		    IAP_EVENT_04H_20H)	\
-__PMC_EV_ALIAS("MEM_UOPS_RETIRED.ALL_LOADS",	    IAP_EVENT_04H_40H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL_STORES",	    IAP_EVENT_04H_80H)	\
-__PMC_EV_ALIAS("PAGE_WALKS.D_SIDE_CYCLES",	    IAP_EVENT_05H_01H)	\
-__PMC_EV_ALIAS("PAGE_WALKS.I_SIDE_CYCLES",	    IAP_EVENT_05H_02H)	\
-__PMC_EV_ALIAS("PAGE_WALKS.WALKS",		    IAP_EVENT_05H_03H)	\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.MISS",	    IAP_EVENT_2EH_41H)	\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.REFERENCE",	    IAP_EVENT_2EH_4FH)	\
-__PMC_EV_ALIAS("L2_REJECT_XQ.ALL",		    IAP_EVENT_30H_00H)	\
-__PMC_EV_ALIAS("CORE_REJECT_L2Q.ALL",		    IAP_EVENT_31H_00H)	\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.CORE_P",	    IAP_EVENT_3CH_00H)	\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.REF_P",	    IAP_EVENT_3CH_01H)	\
-__PMC_EV_ALIAS("ICACHE.HIT",			    IAP_EVENT_80H_01H)	\
-__PMC_EV_ALIAS("ICACHE.MISSES",			    IAP_EVENT_80H_02H)	\
-__PMC_EV_ALIAS("ICACHE.ACCESSES",		    IAP_EVENT_80H_03H)	\
-__PMC_EV_ALIAS("NIP_STALL.ICACHE_MISS",		    IAP_EVENT_B6H_04H)	\
-__PMC_EV_ALIAS("OFFCORE_RESPONSE_0",		    IAP_EVENT_B7H_01H)	\
-__PMC_EV_ALIAS("OFFCORE_RESPONSE_1",		    IAP_EVENT_B7H_02H)	\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P",		    IAP_EVENT_C0H_00H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.MS",		    IAP_EVENT_C2H_01H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.ALL",		    IAP_EVENT_C2H_10H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC",		    IAP_EVENT_C3H_01H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MEMORY_ORDERING",    IAP_EVENT_C3H_02H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.FP_ASSIST",	    IAP_EVENT_C3H_04H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.ALL",		    IAP_EVENT_C3H_08H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES",	    IAP_EVENT_C4H_00H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.JCC",		    IAP_EVENT_C4H_7EH)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.FAR_BRANCH",	    IAP_EVENT_C4H_BFH)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NON_RETURN_IND",    IAP_EVENT_C4H_EBH)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.RETURN",	    IAP_EVENT_C4H_F7H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.CALL",		    IAP_EVENT_C4H_F9H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.IND_CALL",	    IAP_EVENT_C4H_FBH)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.REL_CALL",	    IAP_EVENT_C4H_FDH)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.TAKEN_JCC",	    IAP_EVENT_C4H_FEH)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES",	    IAP_EVENT_C5H_00H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.JCC",		    IAP_EVENT_C5H_7EH)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.FAR",		    IAP_EVENT_C5H_BFH)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NON_RETURN_IND",    IAP_EVENT_C5H_EBH)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.RETURN",	    IAP_EVENT_C5H_F7H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CALL",		    IAP_EVENT_C5H_F9H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.IND_CALL",	    IAP_EVENT_C5H_FBH)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.REL_CALL",	    IAP_EVENT_C5H_FDH)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.TAKEN_JCC",	    IAP_EVENT_C5H_FEH)	\
-__PMC_EV_ALIAS("NO_ALLOC_CYCLES.ROB_FULL",	    IAP_EVENT_CAH_01H)	\
-__PMC_EV_ALIAS("NO_ALLOC_CYCLES.RAT_STALL",	    IAP_EVENT_CAH_20H)	\
-__PMC_EV_ALIAS("NO_ALLOC_CYCLES.ALL",		    IAP_EVENT_CAH_3FH)	\
-__PMC_EV_ALIAS("NO_ALLOC_CYCLES.NOT_DELIVERED",	    IAP_EVENT_CAH_50H)	\
-__PMC_EV_ALIAS("RS_FULL_STALL.MEC",		    IAP_EVENT_CBH_01H)	\
-__PMC_EV_ALIAS("RS_FULL_STALL.ALL",		    IAP_EVENT_CBH_1FH)	\
-__PMC_EV_ALIAS("CYCLES_DIV_BUSY.ANY",		    IAP_EVENT_CDH_01H)	\
-__PMC_EV_ALIAS("BACLEARS.ALL",			    IAP_EVENT_E6H_01H)	\
-__PMC_EV_ALIAS("BACLEARS.RETURN",		    IAP_EVENT_E6H_08H)	\
-__PMC_EV_ALIAS("BACLEARS.COND",			    IAP_EVENT_E6H_10H)	\
-__PMC_EV_ALIAS("MS_DECODED.MS_ENTRY",		    IAP_EVENT_E7H_01H)
-
-
-/*
- * Aliases for Core PMC events.
- */
-#define	__PMC_EV_ALIAS_CORE()						\
-__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
-__PMC_EV_ALIAS("BAClears",		IAP_EVENT_E6H_00H)		\
-__PMC_EV_ALIAS("BTB_Misses",		IAP_EVENT_E2H_00H)		\
-__PMC_EV_ALIAS("Br_BAC_Missp_Exec",	IAP_EVENT_8AH_00H)		\
-__PMC_EV_ALIAS("Br_Bogus",		IAP_EVENT_E4H_00H)		\
-__PMC_EV_ALIAS("Br_Call_Exec",		IAP_EVENT_92H_00H)		\
-__PMC_EV_ALIAS("Br_Call_Missp_Exec",	IAP_EVENT_93H_00H)		\
-__PMC_EV_ALIAS("Br_Cnd_Exec",		IAP_EVENT_8BH_00H)		\
-__PMC_EV_ALIAS("Br_Cnd_Missp_Exec",	IAP_EVENT_8CH_00H)		\
-__PMC_EV_ALIAS("Br_Ind_Call_Exec",	IAP_EVENT_94H_00H)		\
-__PMC_EV_ALIAS("Br_Ind_Exec",		IAP_EVENT_8DH_00H)		\
-__PMC_EV_ALIAS("Br_Ind_Missp_Exec",	IAP_EVENT_8EH_00H)		\
-__PMC_EV_ALIAS("Br_Inst_Exec",		IAP_EVENT_88H_00H)		\
-__PMC_EV_ALIAS("Br_Instr_Decoded",	IAP_EVENT_E0H_00H)		\
-__PMC_EV_ALIAS("Br_Instr_Ret",		IAP_EVENT_C4H_00H)		\
-__PMC_EV_ALIAS("Br_MisPred_Ret",	IAP_EVENT_C5H_00H)		\
-__PMC_EV_ALIAS("Br_MisPred_Taken_Ret",	IAP_EVENT_CAH_00H)		\
-__PMC_EV_ALIAS("Br_Missp_Exec",		IAP_EVENT_89H_00H)		\
-__PMC_EV_ALIAS("Br_Ret_BAC_Missp_Exec",	IAP_EVENT_91H_00H)		\
-__PMC_EV_ALIAS("Br_Ret_Exec",		IAP_EVENT_8FH_00H)		\
-__PMC_EV_ALIAS("Br_Ret_Missp_Exec",	IAP_EVENT_90H_00H)		\
-__PMC_EV_ALIAS("Br_Taken_Ret",		IAP_EVENT_C9H_00H)		\
-__PMC_EV_ALIAS("Bus_BNR_Clocks",	IAP_EVENT_61H_00H)		\
-__PMC_EV_ALIAS("Bus_DRDY_Clocks",	IAP_EVENT_62H_00H)		\
-__PMC_EV_ALIAS("Bus_Data_Rcv",		IAP_EVENT_64H_40H)		\
-__PMC_EV_ALIAS("Bus_Locks_Clocks",	IAP_EVENT_63H)			\
-__PMC_EV_ALIAS("Bus_Not_In_Use",	IAP_EVENT_7DH)			\
-__PMC_EV_ALIAS("Bus_Req_Outstanding",	IAP_EVENT_60H)			\
-__PMC_EV_ALIAS("Bus_Snoop_Stall",	IAP_EVENT_7EH_00H)		\
-__PMC_EV_ALIAS("Bus_Snoops",		IAP_EVENT_77H)			\
-__PMC_EV_ALIAS("Bus_Trans_Any",		IAP_EVENT_70H)			\
-__PMC_EV_ALIAS("Bus_Trans_Brd",		IAP_EVENT_65H)			\
-__PMC_EV_ALIAS("Bus_Trans_Burst",	IAP_EVENT_6EH)			\
-__PMC_EV_ALIAS("Bus_Trans_Def",		IAP_EVENT_6DH)			\
-__PMC_EV_ALIAS("Bus_Trans_IO",		IAP_EVENT_6CH)			\
-__PMC_EV_ALIAS("Bus_Trans_Ifetch",	IAP_EVENT_68H)			\
-__PMC_EV_ALIAS("Bus_Trans_Inval",	IAP_EVENT_69H)			\
-__PMC_EV_ALIAS("Bus_Trans_Mem",		IAP_EVENT_6FH)			\
-__PMC_EV_ALIAS("Bus_Trans_P",		IAP_EVENT_6BH)			\
-__PMC_EV_ALIAS("Bus_Trans_Pwr",		IAP_EVENT_6AH)			\
-__PMC_EV_ALIAS("Bus_Trans_RFO",		IAP_EVENT_66H)			\
-__PMC_EV_ALIAS("Bus_Trans_WB",		IAP_EVENT_67H)			\
-__PMC_EV_ALIAS("Cycles_Div_Busy",	IAP_EVENT_14H_00H)		\
-__PMC_EV_ALIAS("Cycles_Int_Masked",	IAP_EVENT_C6H_00H)		\
-__PMC_EV_ALIAS("Cycles_Int_Pending_Masked", IAP_EVENT_C7H_00H)		\
-__PMC_EV_ALIAS("DCU_Snoop_To_Share",	IAP_EVENT_78H)			\
-__PMC_EV_ALIAS("DCache_Cache_LD",	IAP_EVENT_40H)			\
-__PMC_EV_ALIAS("DCache_Cache_Lock",	IAP_EVENT_42H)			\
-__PMC_EV_ALIAS("DCache_Cache_ST",	IAP_EVENT_41H)			\
-__PMC_EV_ALIAS("DCache_M_Evict",	IAP_EVENT_47H_00H)		\
-__PMC_EV_ALIAS("DCache_M_Repl",		IAP_EVENT_46H_00H)		\
-__PMC_EV_ALIAS("DCache_Pend_Miss",	IAP_EVENT_48H_00H)		\
-__PMC_EV_ALIAS("DCache_Repl",		IAP_EVENT_45H_0FH)		\
-__PMC_EV_ALIAS("Data_Mem_Cache_Ref",	IAP_EVENT_44H_02H)		\
-__PMC_EV_ALIAS("Data_Mem_Ref",		IAP_EVENT_43H_01H)		\
-__PMC_EV_ALIAS("Dbus_Busy",		IAP_EVENT_22H)			\
-__PMC_EV_ALIAS("Dbus_Busy_Rd",		IAP_EVENT_23H)			\
-__PMC_EV_ALIAS("Div",			IAP_EVENT_13H_00H)		\
-__PMC_EV_ALIAS("Dtlb_Miss",		IAP_EVENT_49H_00H)		\
-__PMC_EV_ALIAS("ESP_Uops",		IAP_EVENT_D7H_00H)		\
-__PMC_EV_ALIAS("EST_Trans",		IAP_EVENT_3AH)			\
-__PMC_EV_ALIAS("FP_Assist",		IAP_EVENT_11H_00H)		\
-__PMC_EV_ALIAS("FP_Comp_Instr_Ret",	IAP_EVENT_C1H_00H)		\
-__PMC_EV_ALIAS("FP_Comps_Op_Exe",	IAP_EVENT_10H_00H)		\
-__PMC_EV_ALIAS("FP_MMX_Trans",		IAP_EVENT_CCH_01H)		\
-__PMC_EV_ALIAS("Fused_Ld_Uops_Ret",	IAP_EVENT_DAH_01H)		\
-__PMC_EV_ALIAS("Fused_St_Uops_Ret",	IAP_EVENT_DAH_02H)		\
-__PMC_EV_ALIAS("Fused_Uops_Ret",	IAP_EVENT_DAH_00H)		\
-__PMC_EV_ALIAS("HW_Int_Rx",		IAP_EVENT_C8H_00H)		\
-__PMC_EV_ALIAS("ICache_Misses",		IAP_EVENT_81H_00H)		\
-__PMC_EV_ALIAS("ICache_Reads",		IAP_EVENT_80H_00H)		\
-__PMC_EV_ALIAS("IFU_Mem_Stall",		IAP_EVENT_86H_00H)		\
-__PMC_EV_ALIAS("ILD_Stall",		IAP_EVENT_87H_00H)		\
-__PMC_EV_ALIAS("ITLB_Misses",		IAP_EVENT_85H_00H)		\
-__PMC_EV_ALIAS("Instr_Decoded",		IAP_EVENT_D0H_00H)		\
-__PMC_EV_ALIAS("Instr_Ret",		IAP_EVENT_C0H_00H)		\
-__PMC_EV_ALIAS("L1_Pref_Req",		IAP_EVENT_4FH_00H)		\
-__PMC_EV_ALIAS("L2_ADS",		IAP_EVENT_21H)			\
-__PMC_EV_ALIAS("L2_IFetch",		IAP_EVENT_28H)			\
-__PMC_EV_ALIAS("L2_LD",			IAP_EVENT_29H)			\
-__PMC_EV_ALIAS("L2_Lines_In",		IAP_EVENT_24H)			\
-__PMC_EV_ALIAS("L2_Lines_Out",		IAP_EVENT_26H)			\
-__PMC_EV_ALIAS("L2_M_Lines_In",		IAP_EVENT_25H)			\
-__PMC_EV_ALIAS("L2_M_Lines_Out",	IAP_EVENT_27H)			\
-__PMC_EV_ALIAS("L2_No_Request_Cycles",	IAP_EVENT_32H)			\
-__PMC_EV_ALIAS("L2_Reject_Cycles",	IAP_EVENT_30H)			\
-__PMC_EV_ALIAS("L2_Rqsts",		IAP_EVENT_2EH)			\
-__PMC_EV_ALIAS("L2_ST",			IAP_EVENT_2AH)			\
-__PMC_EV_ALIAS("LD_Blocks",		IAP_EVENT_03H_00H)		\
-__PMC_EV_ALIAS("LLC_Misses",		IAP_EVENT_2EH_41H)		\
-__PMC_EV_ALIAS("LLC_Reference",		IAP_EVENT_2EH_4FH)		\
-__PMC_EV_ALIAS("MMX_Assist",		IAP_EVENT_CDH_00H)		\
-__PMC_EV_ALIAS("MMX_FP_Trans",		IAP_EVENT_CCH_00H)		\
-__PMC_EV_ALIAS("MMX_Instr_Exec",	IAP_EVENT_B0H_00H)		\
-__PMC_EV_ALIAS("MMX_Instr_Ret",		IAP_EVENT_CEH_00H)		\
-__PMC_EV_ALIAS("Misalign_Mem_Ref",	IAP_EVENT_05H_00H)		\
-__PMC_EV_ALIAS("Mul",			IAP_EVENT_12H_00H)		\
-__PMC_EV_ALIAS("NonHlt_Ref_Cycles",	IAP_EVENT_3CH_01H)		\
-__PMC_EV_ALIAS("Pref_Rqsts_Dn",		IAP_EVENT_F8H_00H)		\
-__PMC_EV_ALIAS("Pref_Rqsts_Up",		IAP_EVENT_F0H_00H)		\
-__PMC_EV_ALIAS("Resource_Stall",	IAP_EVENT_A2H_00H)		\
-__PMC_EV_ALIAS("SD_Drains",		IAP_EVENT_04H_00H)		\
-__PMC_EV_ALIAS("SIMD_FP_DP_P_Comp_Ret",	IAP_EVENT_D9H_02H)		\
-__PMC_EV_ALIAS("SIMD_FP_DP_P_Ret",	IAP_EVENT_D8H_02H)		\
-__PMC_EV_ALIAS("SIMD_FP_DP_S_Comp_Ret",	IAP_EVENT_D9H_03H)		\
-__PMC_EV_ALIAS("SIMD_FP_DP_S_Ret",	IAP_EVENT_D8H_03H)		\
-__PMC_EV_ALIAS("SIMD_FP_SP_P_Comp_Ret",	IAP_EVENT_D9H_00H)		\
-__PMC_EV_ALIAS("SIMD_FP_SP_Ret",	IAP_EVENT_D8H_00H)		\
-__PMC_EV_ALIAS("SIMD_FP_SP_S_Comp_Ret",	IAP_EVENT_D9H_01H)		\
-__PMC_EV_ALIAS("SIMD_FP_SP_S_Ret",	IAP_EVENT_D8H_01H)		\
-__PMC_EV_ALIAS("SIMD_Int_128_Ret",	IAP_EVENT_D8H_04H)		\
-__PMC_EV_ALIAS("SIMD_Int_Pari_Exec",	IAP_EVENT_B3H_20H)		\
-__PMC_EV_ALIAS("SIMD_Int_Pck_Exec",	IAP_EVENT_B3H_04H)		\
-__PMC_EV_ALIAS("SIMD_Int_Plog_Exec",	IAP_EVENT_B3H_10H)		\
-__PMC_EV_ALIAS("SIMD_Int_Pmul_Exec",	IAP_EVENT_B3H_01H)		\
-__PMC_EV_ALIAS("SIMD_Int_Psft_Exec",	IAP_EVENT_B3H_02H)		\
-__PMC_EV_ALIAS("SIMD_Int_Sat_Exec",	IAP_EVENT_B1H_00H)		\
-__PMC_EV_ALIAS("SIMD_Int_Upck_Exec",	IAP_EVENT_B3H_08H)		\
-__PMC_EV_ALIAS("SMC_Detected",		IAP_EVENT_C3H_00H)		\
-__PMC_EV_ALIAS("SSE_NTStores_Miss",	IAP_EVENT_4BH_03H)		\
-__PMC_EV_ALIAS("SSE_NTStores_Ret",	IAP_EVENT_07H_03H)		\
-__PMC_EV_ALIAS("SSE_PrefNta_Miss",	IAP_EVENT_4BH_00H)		\
-__PMC_EV_ALIAS("SSE_PrefNta_Ret",	IAP_EVENT_07H_00H)		\
-__PMC_EV_ALIAS("SSE_PrefT1_Miss",	IAP_EVENT_4BH_01H)		\
-__PMC_EV_ALIAS("SSE_PrefT1_Ret",	IAP_EVENT_07H_01H)		\
-__PMC_EV_ALIAS("SSE_PrefT2_Miss",	IAP_EVENT_4BH_02H)		\
-__PMC_EV_ALIAS("SSE_PrefT2_Ret",	IAP_EVENT_07H_02H)		\
-__PMC_EV_ALIAS("Seg_Reg_Loads",		IAP_EVENT_06H_00H)		\
-__PMC_EV_ALIAS("Serial_Execution_Cycles", IAP_EVENT_3CH_02H)		\
-__PMC_EV_ALIAS("Thermal_Trip",		IAP_EVENT_3BH_C0H)		\
-__PMC_EV_ALIAS("Unfusion",		IAP_EVENT_DBH_00H)		\
-__PMC_EV_ALIAS("Unhalted_Core_Cycles",	IAP_EVENT_3CH_00H)		\
-__PMC_EV_ALIAS("Uops_Ret",		IAP_EVENT_C2H_00H)
-
-/*
- * Aliases for Core2 PMC events.
- */
-#define	__PMC_EV_ALIAS_CORE2()						\
-__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
-__PMC_EV_ALIAS("BACLEARS",		IAP_EVENT_E6H_00H)		\
-__PMC_EV_ALIAS("BOGUS_BR",		IAP_EVENT_E4H_00H)		\
-__PMC_EV_ALIAS("BR_BAC_MISSP_EXEC",	IAP_EVENT_8AH_00H)		\
-__PMC_EV_ALIAS("BR_CALL_EXEC",		IAP_EVENT_92H_00H)		\
-__PMC_EV_ALIAS("BR_CALL_MISSP_EXEC",	IAP_EVENT_93H_00H)		\
-__PMC_EV_ALIAS("BR_CND_EXEC",		IAP_EVENT_8BH_00H)		\
-__PMC_EV_ALIAS("BR_CND_MISSP_EXEC",	IAP_EVENT_8CH_00H)		\
-__PMC_EV_ALIAS("BR_IND_CALL_EXEC",	IAP_EVENT_94H_00H)		\
-__PMC_EV_ALIAS("BR_IND_EXEC",		IAP_EVENT_8DH_00H)		\
-__PMC_EV_ALIAS("BR_IND_MISSP_EXEC",	IAP_EVENT_8EH_00H)		\
-__PMC_EV_ALIAS("BR_INST_DECODED",	IAP_EVENT_E0H_00H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC",		IAP_EVENT_88H_00H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ANY",	IAP_EVENT_C4H_00H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.MISPRED", IAP_EVENT_C5H_00H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.MISPRED_NOT_TAKEN",			\
-    IAP_EVENT_C4H_02H)							\
-__PMC_EV_ALIAS("BR_INST_RETIRED.MISPRED_TAKEN",				\
-    IAP_EVENT_C4H_08H)							\
-__PMC_EV_ALIAS("BR_INST_RETIRED.PRED_NOT_TAKEN",			\
-    IAP_EVENT_C4H_01H)							\
-__PMC_EV_ALIAS("BR_INST_RETIRED.PRED_TAKEN",				\
-    IAP_EVENT_C4H_04H)							\
-__PMC_EV_ALIAS("BR_INST_RETIRED.TAKEN",	IAP_EVENT_C4H_0CH)		\
-__PMC_EV_ALIAS("BR_MISSP_EXEC",		IAP_EVENT_89H_00H)		\
-__PMC_EV_ALIAS("BR_RET_BAC_MISSP_EXEC",	IAP_EVENT_91H_00H)		\
-__PMC_EV_ALIAS("BR_RET_EXEC",		IAP_EVENT_8FH_00H)		\
-__PMC_EV_ALIAS("BR_RET_MISSP_EXEC",	IAP_EVENT_90H_00H)		\
-__PMC_EV_ALIAS("BR_TKN_BUBBLE_1",	IAP_EVENT_97H_00H)		\
-__PMC_EV_ALIAS("BR_TKN_BUBBLE_2",	IAP_EVENT_98H_00H)		\
-__PMC_EV_ALIAS("BUSQ_EMPTY",		IAP_EVENT_7DH)			\
-__PMC_EV_ALIAS("BUS_BNR_DRV",		IAP_EVENT_61H)			\
-__PMC_EV_ALIAS("BUS_DATA_RCV",		IAP_EVENT_64H)			\
-__PMC_EV_ALIAS("BUS_DRDY_CLOCKS",	IAP_EVENT_62H)			\
-__PMC_EV_ALIAS("BUS_HITM_DRV",		IAP_EVENT_7BH)			\
-__PMC_EV_ALIAS("BUS_HIT_DRV",		IAP_EVENT_7AH)			\
-__PMC_EV_ALIAS("BUS_IO_WAIT",		IAP_EVENT_7FH)			\
-__PMC_EV_ALIAS("BUS_LOCK_CLOCKS",	IAP_EVENT_63H)			\
-__PMC_EV_ALIAS("BUS_REQUEST_OUTSTANDING",				\
-    IAP_EVENT_60H)							\
-__PMC_EV_ALIAS("BUS_TRANS_ANY",		IAP_EVENT_70H)			\
-__PMC_EV_ALIAS("BUS_TRANS_BRD",		IAP_EVENT_65H)			\
-__PMC_EV_ALIAS("BUS_TRANS_BURST",	IAP_EVENT_6EH)			\
-__PMC_EV_ALIAS("BUS_TRANS_DEF",		IAP_EVENT_6DH)			\
-__PMC_EV_ALIAS("BUS_TRANS_IFETCH",	IAP_EVENT_68H)			\
-__PMC_EV_ALIAS("BUS_TRANS_INVAL",	IAP_EVENT_69H)			\
-__PMC_EV_ALIAS("BUS_TRANS_IO",		IAP_EVENT_6CH)			\
-__PMC_EV_ALIAS("BUS_TRANS_MEM",		IAP_EVENT_6FH)			\
-__PMC_EV_ALIAS("BUS_TRANS_P",		IAP_EVENT_6BH)			\
-__PMC_EV_ALIAS("BUS_TRANS_PWR",		IAP_EVENT_6AH)			\
-__PMC_EV_ALIAS("BUS_TRANS_RFO",		IAP_EVENT_66H)			\
-__PMC_EV_ALIAS("BUS_TRANS_WB",		IAP_EVENT_67H)			\
-__PMC_EV_ALIAS("CMP_SNOOP",		IAP_EVENT_78H)			\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.BUS",	IAP_EVENT_3CH_01H)		\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.CORE_P",				\
-    IAP_EVENT_3CH_00H)							\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.NO_OTHER",				\
-    IAP_EVENT_3CH_02H)							\
-__PMC_EV_ALIAS("CYCLES_DIV_BUSY",	IAP_EVENT_14H_00H)		\
-__PMC_EV_ALIAS("CYCLES_INT_MASKED",	IAP_EVENT_C6H_01H)		\
-__PMC_EV_ALIAS("CYCLES_INT_PENDING_AND_MASKED",				\
-    IAP_EVENT_C6H_02H)							\
-__PMC_EV_ALIAS("CYCLES_L1I_MEM_STALLED", IAP_EVENT_86H_00H)		\
-__PMC_EV_ALIAS("DELAYED_BYPASS.FP",	IAP_EVENT_19H_00H)		\
-__PMC_EV_ALIAS("DELAYED_BYPASS.LOAD",	IAP_EVENT_19H_01H)		\
-__PMC_EV_ALIAS("DELAYED_BYPASS.SIMD",	IAP_EVENT_19H_02H)		\
-__PMC_EV_ALIAS("DIV",			IAP_EVENT_13H_00H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.ANY",	IAP_EVENT_08H_01H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.L0_MISS_LD", IAP_EVENT_08H_04H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.MISS_LD",	IAP_EVENT_08H_02H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.MISS_ST",	IAP_EVENT_08H_08H)		\
-__PMC_EV_ALIAS("EIST_TRANS",		IAP_EVENT_3AH_00H)		\
-__PMC_EV_ALIAS("ESP.ADDITIONS",		IAP_EVENT_ABH_02H)		\
-__PMC_EV_ALIAS("ESP.SYNCH",		IAP_EVENT_ABH_01H)		\
-__PMC_EV_ALIAS("EXT_SNOOP",		IAP_EVENT_77H)			\
-__PMC_EV_ALIAS("FP_ASSIST",		IAP_EVENT_11H_00H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE",	IAP_EVENT_10H_00H)		\
-__PMC_EV_ALIAS("FP_MMX_TRANS_TO_FP",	IAP_EVENT_CCH_02H)		\
-__PMC_EV_ALIAS("FP_MMX_TRANS_TO_MMX",	IAP_EVENT_CCH_01H)		\
-__PMC_EV_ALIAS("HW_INT_RCV",		IAP_EVENT_C8H_00H)		\
-__PMC_EV_ALIAS("IDLE_DURING_DIV",	IAP_EVENT_18H_00H)		\
-__PMC_EV_ALIAS("ILD_STALL",		IAP_EVENT_87H_00H)		\
-__PMC_EV_ALIAS("INST_QUEUE.FULL",	IAP_EVENT_83H_02H)		\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P",	IAP_EVENT_C0H_00H)		\
-__PMC_EV_ALIAS("INST_RETIRED.LOADS",	IAP_EVENT_C0H_01H)		\
-__PMC_EV_ALIAS("INST_RETIRED.OTHER",	IAP_EVENT_C0H_04H)		\
-__PMC_EV_ALIAS("INST_RETIRED.STORES",	IAP_EVENT_C0H_02H)		\
-__PMC_EV_ALIAS("INST_RETIRED.VM_H",	IAP_EVENT_C0H_08H)		\
-__PMC_EV_ALIAS("ITLB.FLUSH",		IAP_EVENT_82H_40H)		\
-__PMC_EV_ALIAS("ITLB.LARGE_MISS",	IAP_EVENT_82H_10H)		\
-__PMC_EV_ALIAS("ITLB.MISSES",		IAP_EVENT_82H_12H)		\
-__PMC_EV_ALIAS("ITLB.SMALL_MISS",	IAP_EVENT_82H_02H)		\
-__PMC_EV_ALIAS("ITLB_MISS_RETIRED",	IAP_EVENT_C9H_00H)		\
-__PMC_EV_ALIAS("L1D_ALL_CACHE_REF",	IAP_EVENT_43H_02H)		\
-__PMC_EV_ALIAS("L1D_ALL_REF",		IAP_EVENT_43H_01H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LD",		IAP_EVENT_40H)			\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK",	IAP_EVENT_42H)			\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK_DURATION", IAP_EVENT_42H_10H)		\
-__PMC_EV_ALIAS("L1D_CACHE_ST",		IAP_EVENT_41H)			\
-__PMC_EV_ALIAS("L1D_M_EVICT",		IAP_EVENT_47H_00H)		\
-__PMC_EV_ALIAS("L1D_M_REPL",		IAP_EVENT_46H_00H)		\
-__PMC_EV_ALIAS("L1D_PEND_MISS",		IAP_EVENT_48H_00H)		\
-__PMC_EV_ALIAS("L1D_PREFETCH.REQUESTS",	IAP_EVENT_4EH_10H)		\
-__PMC_EV_ALIAS("L1D_REPL",		IAP_EVENT_45H_0FH)		\
-__PMC_EV_ALIAS("L1D_SPLIT.LOADS",	IAP_EVENT_49H_01H)		\
-__PMC_EV_ALIAS("L1D_SPLIT.STORES",	IAP_EVENT_49H_02H)		\
-__PMC_EV_ALIAS("L1I_MISSES",		IAP_EVENT_81H_00H)		\
-__PMC_EV_ALIAS("L1I_READS",		IAP_EVENT_80H_00H)		\
-__PMC_EV_ALIAS("L2_ADS",		IAP_EVENT_21H)			\
-__PMC_EV_ALIAS("L2_DBUS_BUSY_RD",	IAP_EVENT_23H)			\
-__PMC_EV_ALIAS("L2_IFETCH",		IAP_EVENT_28H)			\
-__PMC_EV_ALIAS("L2_LD",			IAP_EVENT_29H)			\
-__PMC_EV_ALIAS("L2_LINES_IN",		IAP_EVENT_24H)			\
-__PMC_EV_ALIAS("L2_LINES_OUT",		IAP_EVENT_26H)			\
-__PMC_EV_ALIAS("L2_LOCK",		IAP_EVENT_2BH)			\
-__PMC_EV_ALIAS("L2_M_LINES_IN",		IAP_EVENT_25H)			\
-__PMC_EV_ALIAS("L2_M_LINES_OUT",	IAP_EVENT_27H)			\
-__PMC_EV_ALIAS("L2_NO_REQ",		IAP_EVENT_32H)			\
-__PMC_EV_ALIAS("L2_REJECT_BUSQ",	IAP_EVENT_30H)			\
-__PMC_EV_ALIAS("L2_RQSTS",		IAP_EVENT_2EH)			\
-__PMC_EV_ALIAS("L2_RQSTS.SELF.DEMAND.I_STATE",				\
-    IAP_EVENT_2EH_41H)							\
-__PMC_EV_ALIAS("L2_RQSTS.SELF.DEMAND.MESI",				\
-    IAP_EVENT_2EH_4FH)							\
-__PMC_EV_ALIAS("L2_ST",			IAP_EVENT_2AH)			\
-__PMC_EV_ALIAS("LOAD_BLOCK.L1D",	IAP_EVENT_03H_20H)		\
-__PMC_EV_ALIAS("LOAD_BLOCK.OVERLAP_STORE",				\
-    IAP_EVENT_03H_08H)							\
-__PMC_EV_ALIAS("LOAD_BLOCK.STA",	IAP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("LOAD_BLOCK.STD",	IAP_EVENT_03H_04H)		\
-__PMC_EV_ALIAS("LOAD_BLOCK.UNTIL_RETIRE", IAP_EVENT_03H_10H)		\
-__PMC_EV_ALIAS("LOAD_HIT_PRE",		IAP_EVENT_4CH_00H)		\
-__PMC_EV_ALIAS("MACHINE_NUKES.MEM_ORDER", IAP_EVENT_C3H_04H)		\
-__PMC_EV_ALIAS("MACHINE_NUKES.SMC",	IAP_EVENT_C3H_01H)		\
-__PMC_EV_ALIAS("MACRO_INSTS.CISC_DECODED", IAP_EVENT_AAH_08H)		\
-__PMC_EV_ALIAS("MACRO_INSTS.DECODED",	IAP_EVENT_AAH_01H)		\
-__PMC_EV_ALIAS("MEMORY_DISAMBIGUATION.RESET",				\
-    IAP_EVENT_09H_01H)							\
-__PMC_EV_ALIAS("MEMORY_DISAMBIGUATION.SUCCESS",				\
-    IAP_EVENT_09H_02H)							\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.DTLB_MISS",				\
-    IAP_EVENT_CBH_10H)							\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L1D_LINE_MISS",			\
-    IAP_EVENT_CBH_02H)							\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L1D_MISS",				\
-    IAP_EVENT_CBH_01H)							\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L2_LINE_MISS",				\
-    IAP_EVENT_CBH_08H)							\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L2_MISS",				\
-    IAP_EVENT_CBH_04H)							\
-__PMC_EV_ALIAS("MUL",			IAP_EVENT_12H_00H)		\
-__PMC_EV_ALIAS("PAGE_WALKS.COUNT",	IAP_EVENT_0CH_01H)		\
-__PMC_EV_ALIAS("PAGE_WALKS.CYCLES",	IAP_EVENT_0CH_02H)		\
-__PMC_EV_ALIAS("PREF_RQSTS_DN",		IAP_EVENT_F8H_00H)		\
-__PMC_EV_ALIAS("PREF_RQSTS_UP",		IAP_EVENT_F0H_00H)		\
-__PMC_EV_ALIAS("RAT_STALLS.ANY",	IAP_EVENT_D2H_0FH)		\
-__PMC_EV_ALIAS("RAT_STALLS.FLAGS",	IAP_EVENT_D2H_04H)		\
-__PMC_EV_ALIAS("RAT_STALLS.FPSW",	IAP_EVENT_D2H_08H)		\
-__PMC_EV_ALIAS("RAT_STALLS.OTHER_SERIALIZATION_STALLS",			\
-    IAP_EVENT_D2H_10H)							\
-__PMC_EV_ALIAS("RAT_STALLS.PARTIAL_CYCLES",				\
-    IAP_EVENT_D2H_02H)							\
-__PMC_EV_ALIAS("RAT_STALLS.ROB_READ_PORT",				\
-    IAP_EVENT_D2H_01H)							\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY",	IAP_EVENT_DCH_1FH)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.BR_MISS_CLEAR",				\
-    IAP_EVENT_DCH_10H)							\
-__PMC_EV_ALIAS("RESOURCE_STALLS.FPCW",	IAP_EVENT_DCH_08H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.LD_ST",	IAP_EVENT_DCH_04H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB_FULL",				\
-    IAP_EVENT_DCH_01H)							\
-__PMC_EV_ALIAS("RESOURCE_STALLS.RS_FULL", IAP_EVENT_DCH_02H)		\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED",	IAP_EVENT_A0H_00H)		\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT0", IAP_EVENT_A1H_01H)		\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT1", IAP_EVENT_A1H_02H)		\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT2", IAP_EVENT_A1H_04H)		\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT3", IAP_EVENT_A1H_08H)		\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT4", IAP_EVENT_A1H_10H)		\
-__PMC_EV_ALIAS("RS_UOPS_DISPATCHED.PORT5", IAP_EVENT_A1H_20H)		\
-__PMC_EV_ALIAS("SB_DRAIN_CYCLES",	IAP_EVENT_04H_01H)		\
-__PMC_EV_ALIAS("SEGMENT_REG_LOADS",	IAP_EVENT_06H_00H)		\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.ANY",	IAP_EVENT_D5H_0FH)		\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.DS",	IAP_EVENT_D5H_02H)		\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.ES",	IAP_EVENT_D5H_01H)		\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.FS",	IAP_EVENT_D5H_04H)		\
-__PMC_EV_ALIAS("SEG_REG_RENAMES.GS",	IAP_EVENT_D5H_08H)		\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.ANY",	IAP_EVENT_D4H_0FH)		\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.DS",	IAP_EVENT_D4H_02H)		\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.ES",	IAP_EVENT_D4H_01H)		\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.FS",	IAP_EVENT_D4H_04H)		\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS.GS",	IAP_EVENT_D4H_08H)		\
-__PMC_EV_ALIAS("SIMD_ASSIST",		IAP_EVENT_CDH_00H)		\
-__PMC_EV_ALIAS("SIMD_COMP_INST_RETIRED.PACKED_DOUBLE",			\
-    IAP_EVENT_CAH_04H)							\
-__PMC_EV_ALIAS("SIMD_COMP_INST_RETIRED.PACKED_SINGLE",			\
-    IAP_EVENT_CAH_01H)							\
-__PMC_EV_ALIAS("SIMD_COMP_INST_RETIRED.SCALAR_DOUBLE",			\
-    IAP_EVENT_CAH_08H)							\
-__PMC_EV_ALIAS("SIMD_COMP_INST_RETIRED.SCALAR_SINGLE",			\
-    IAP_EVENT_CAH_02H)							\
-__PMC_EV_ALIAS("SIMD_INSTR_RETIRED",	IAP_EVENT_CEH_00H)		\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.ANY",	IAP_EVENT_C7H_1FH)		\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.PACKED_DOUBLE",			\
-    IAP_EVENT_C7H_04H)							\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.PACKED_SINGLE",			\
-    IAP_EVENT_C7H_01H)							\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.SCALAR_DOUBLE",			\
-    IAP_EVENT_C7H_08H)							\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.SCALAR_SINGLE",			\
-    IAP_EVENT_C7H_02H)							\
-__PMC_EV_ALIAS("SIMD_INST_RETIRED.VECTOR",	IAP_EVENT_C7H_10H)	\
-__PMC_EV_ALIAS("SIMD_SAT_INSTR_RETIRED",	IAP_EVENT_CFH_00H)	\
-__PMC_EV_ALIAS("SIMD_SAT_UOP_EXEC",		IAP_EVENT_B1H_00H)	\
-__PMC_EV_ALIAS("SIMD_UOPS_EXEC",		IAP_EVENT_B0H_00H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.ARITHMETIC",	IAP_EVENT_B3H_20H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.LOGICAL",	IAP_EVENT_B3H_10H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.MUL",	IAP_EVENT_B3H_01H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.PACK",	IAP_EVENT_B3H_04H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.SHIFT",	IAP_EVENT_B3H_02H)	\
-__PMC_EV_ALIAS("SIMD_UOP_TYPE_EXEC.UNPACK",	IAP_EVENT_B3H_08H)	\
-__PMC_EV_ALIAS("SNOOP_STALL_DRV",		IAP_EVENT_7EH)		\
-__PMC_EV_ALIAS("SSE_PRE_EXEC.L1",		IAP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("SSE_PRE_EXEC.L2",		IAP_EVENT_07H_02H)	\
-__PMC_EV_ALIAS("SSE_PRE_EXEC.NTA",		IAP_EVENT_07H_00H)	\
-__PMC_EV_ALIAS("SSE_PRE_EXEC.STORES",		IAP_EVENT_07H_03H)	\
-__PMC_EV_ALIAS("SSE_PRE_MISS.L1",		IAP_EVENT_4BH_01H)	\
-__PMC_EV_ALIAS("SSE_PRE_MISS.L2",		IAP_EVENT_4BH_02H)	\
-__PMC_EV_ALIAS("SSE_PRE_MISS.NTA",		IAP_EVENT_4BH_00H)	\
-__PMC_EV_ALIAS("STORE_BLOCK.ORDER",		IAP_EVENT_04H_02H)	\
-__PMC_EV_ALIAS("STORE_BLOCK.SNOOP",		IAP_EVENT_04H_08H)	\
-__PMC_EV_ALIAS("THERMAL_TRIP",			IAP_EVENT_3BH_C0H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.ANY",		IAP_EVENT_C2H_0FH)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.FUSED",		IAP_EVENT_C2H_07H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.LD_IND_BR",	IAP_EVENT_C2H_01H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.MACRO_FUSION",	IAP_EVENT_C2H_04H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.NON_FUSED",	IAP_EVENT_C2H_08H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.STD_STA",		IAP_EVENT_C2H_02H)	\
-__PMC_EV_ALIAS("X87_OPS_RETIRED.ANY",		IAP_EVENT_C1H_FEH)	\
-__PMC_EV_ALIAS("X87_OPS_RETIRED.FXCH",		IAP_EVENT_C1H_01H)
-
-/*
- * Core i7 and Xeon 5500 events removed between 253669-031US June 2009
- * and 253669-040US October 2011.
- */
-#define	__PMC_EV_ALIAS_COREI7_OLD()					\
-__PMC_EV_ALIAS("SB_FORWARD.ANY", IAP_EVENT_02H_01H)			\
-__PMC_EV_ALIAS("LOAD_BLOCK.STD", IAP_EVENT_03H_01H)			\
-__PMC_EV_ALIAS("LOAD_BLOCK.ADDRESS_OFFSET", IAP_EVENT_03H_04H)		\
-__PMC_EV_ALIAS("SB_DRAIN.CYCLES", IAP_EVENT_04H_01H)			\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.LOAD", IAP_EVENT_05H_01H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.STORE", IAP_EVENT_05H_02H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.ANY", IAP_EVENT_05H_03H)		\
-__PMC_EV_ALIAS("STORE_BLOCKS.NOT_STA", IAP_EVENT_06H_01H)		\
-__PMC_EV_ALIAS("STORE_BLOCKS.STA", IAP_EVENT_06H_02H)			\
-__PMC_EV_ALIAS("STORE_BLOCKS.ANY", IAP_EVENT_06H_0FH)			\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.PDP_MISS", IAP_EVENT_08H_40H)		\
-__PMC_EV_ALIAS("MEMORY_DISAMBIGURATION.RESET", IAP_EVENT_09H_01H)	\
-__PMC_EV_ALIAS("MEMORY_DISAMBIGURATION.SUCCESS", IAP_EVENT_09H_02H)	\
-__PMC_EV_ALIAS("MEMORY_DISAMBIGURATION.WATCHDOG", IAP_EVENT_09H_04H)	\
-__PMC_EV_ALIAS("MEMORY_DISAMBIGURATION.WATCH_CYCLES", IAP_EVENT_09H_08H)\
-__PMC_EV_ALIAS("HW_INT.RCV", IAP_EVENT_1DH_01H)				\
-__PMC_EV_ALIAS("HW_INT.CYCLES_MASKED", IAP_EVENT_1DH_02H)		\
-__PMC_EV_ALIAS("HW_INT.CYCLES_PENDING_AND_MASKED", IAP_EVENT_1DH_04H)	\
-__PMC_EV_ALIAS("L2_WRITE.RFO.E_STATE", IAP_EVENT_27H_04H)		\
-__PMC_EV_ALIAS("UOPS_DECODED.DEC0", IAP_EVENT_3DH_01H)			\
-__PMC_EV_ALIAS("L1D_CACHE_ST.I_STATE", IAP_EVENT_41H_01H)		\
-__PMC_EV_ALIAS("L1D_CACHE_ST.MESI", IAP_EVENT_41H_0FH)			\
-__PMC_EV_ALIAS("L1D_PEND_MISS.LOAD_BUFFERS_FULL", IAP_EVENT_48H_02H)	\
-__PMC_EV_ALIAS("DTLB_MISSES.PDP_MISS", IAP_EVENT_49H_40H)		\
-__PMC_EV_ALIAS("SSE_MEM_EXEC.NTA", IAP_EVENT_4BH_01H)			\
-__PMC_EV_ALIAS("SSE_MEM_EXEC.STREAMING_STORES", IAP_EVENT_4BH_08H)	\
-__PMC_EV_ALIAS("SFENCE_CYCLES", IAP_EVENT_4DH_01H)			\
-__PMC_EV_ALIAS("EPT.EPDE_MISS", IAP_EVENT_4FH_02H)			\
-__PMC_EV_ALIAS("EPT.EPDPE_HIT", IAP_EVENT_4FH_04H)			\
-__PMC_EV_ALIAS("EPT.EPDPE_MISS", IAP_EVENT_4FH_08H)			\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND.READ_DATA",		\
-    IAP_EVENT_60H_01H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND.READ_CODE",		\
-    IAP_EVENT_60H_02H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND.RFO",		\
-    IAP_EVENT_60H_04H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.ANY.READ",			\
-    IAP_EVENT_60H_08H)							\
-__PMC_EV_ALIAS("IFU_IVC.FULL", IAP_EVENT_81H_01H)			\
-__PMC_EV_ALIAS("IFU_IVC.L1I_EVICTION", IAP_EVENT_81H_02H)		\
-__PMC_EV_ALIAS("L1I_OPPORTUNISTIC_HITS", IAP_EVENT_83H_01H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_CYCLES", IAP_EVENT_85H_04H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.PMH_BUSY_CYCLES", IAP_EVENT_85H_04H)	\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT", IAP_EVENT_85H_10H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.PDE_MISS", IAP_EVENT_85H_20H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.PDP_MISS", IAP_EVENT_85H_40H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.LARGE_WALK_COMPLETED", IAP_EVENT_85H_80H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND.READ_DATA", IAP_EVENT_B0H_01H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND.READ_CODE", IAP_EVENT_B0H_02H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND.RFO", IAP_EVENT_B0H_04H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ANY.READ", IAP_EVENT_B0H_08H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ANY.RFO", IAP_EVENT_B0H_10H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.UNCACHED_MEM", IAP_EVENT_B0H_20H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ANY", IAP_EVENT_B0H_80H)		\
-__PMC_EV_ALIAS("SNOOPQ_REQUESTS_OUTSTANDING.DATA", IAP_EVENT_B3H_01H)	\
-__PMC_EV_ALIAS("SNOOPQ_REQUESTS_OUTSTANDING.INVALIDATE",		\
-    IAP_EVENT_B3H_02H)							\
-__PMC_EV_ALIAS("SNOOPQ_REQUESTS_OUTSTANDING.CODE", IAP_EVENT_B3H_04H)	\
-__PMC_EV_ALIAS("PIC_ACCESSES.TPR_READS", IAP_EVENT_BAH_01H)		\
-__PMC_EV_ALIAS("PIC_ACCESSES.TPR_WRITES", IAP_EVENT_BAH_02H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.FUSION_ASSIST", IAP_EVENT_C3H_10H)	\
-__PMC_EV_ALIAS("BOGUS_BR", IAP_EVENT_E4H_01H)				\
-__PMC_EV_ALIAS("BPU_CLEARS.ANY", IAP_EVENT_E8H_03H)			\
-__PMC_EV_ALIAS("L2_HW_PREFETCH.HIT", IAP_EVENT_F3H_01H)			\
-__PMC_EV_ALIAS("L2_HW_PREFETCH.ALLOC", IAP_EVENT_F3H_02H)		\
-__PMC_EV_ALIAS("L2_HW_PREFETCH.DATA_TRIGGER", IAP_EVENT_F3H_04H)	\
-__PMC_EV_ALIAS("L2_HW_PREFETCH.CODE_TRIGGER", IAP_EVENT_F3H_08H)	\
-__PMC_EV_ALIAS("L2_HW_PREFETCH.DCA_TRIGGER", IAP_EVENT_F3H_10H)		\
-__PMC_EV_ALIAS("L2_HW_PREFETCH.KICK_START", IAP_EVENT_F3H_20H)		\
-__PMC_EV_ALIAS("SQ_MISC.PROMOTION", IAP_EVENT_F4H_01H)			\
-__PMC_EV_ALIAS("SQ_MISC.PROMOTION_POST_GO", IAP_EVENT_F4H_02H)		\
-__PMC_EV_ALIAS("SQ_MISC.LRU_HINTS", IAP_EVENT_F4H_04H)			\
-__PMC_EV_ALIAS("SQ_MISC.FILL_DROPPED", IAP_EVENT_F4H_08H)		\
-__PMC_EV_ALIAS("SEGMENT_REG_LOADS", IAP_EVENT_F8H_01H)
-
-/*
- * Aliases for Core i7 and Xeon 5500 PMC events (253669-033US December 2009)
- */
-#define	__PMC_EV_ALIAS_COREI7()						\
-__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
-__PMC_EV_ALIAS("SB_DRAIN.ANY", IAP_EVENT_04H_07H)			\
-__PMC_EV_ALIAS("STORE_BLOCKS.AT_RET", IAP_EVENT_06H_04H)		\
-__PMC_EV_ALIAS("STORE_BLOCKS.L1D_BLOCK", IAP_EVENT_06H_08H)		\
-__PMC_EV_ALIAS("PARTIAL_ADDRESS_ALIAS", IAP_EVENT_07H_01H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.ANY", IAP_EVENT_08H_01H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_02H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_08H_10H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.PDE_MISS", IAP_EVENT_08H_20H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.LARGE_WALK_COMPLETED",			\
-    IAP_EVENT_08H_80H)							\
-__PMC_EV_ALIAS("MEM_INST_RETIRED.LOADS", IAP_EVENT_0BH_01H)		\
-__PMC_EV_ALIAS("MEM_INST_RETIRED.STORES", IAP_EVENT_0BH_02H)		\
-__PMC_EV_ALIAS("MEM_INST_RETIRED.LATENCY_ABOVE_THRESHOLD",		\
-    IAP_EVENT_0BH_10H)							\
-__PMC_EV_ALIAS("MEM_STORE_RETIRED.DTLB_MISS", IAP_EVENT_0CH_01H)	\
-__PMC_EV_ALIAS("UOPS_ISSUED.ANY", IAP_EVENT_0EH_01H)			\
-__PMC_EV_ALIAS("UOPS_ISSUED.STALLED_CYCLES", IAP_EVENT_0EH_01H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.FUSED", IAP_EVENT_0EH_02H)			\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.L3_DATA_MISS_UNKNOWN",		\
-    IAP_EVENT_0FH_01H)							\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.OTHER_CORE_L2_HITM",			\
-    IAP_EVENT_0FH_02H)							\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.REMOTE_CACHE_LOCAL_HOME_HIT",	\
-    IAP_EVENT_0FH_08H)							\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.REMOTE_DRAM",			\
-    IAP_EVENT_0FH_10H)							\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.LOCAL_DRAM", IAP_EVENT_0FH_20H)	\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.UNCACHEABLE", IAP_EVENT_0FH_80H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.X87", IAP_EVENT_10H_01H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.MMX", IAP_EVENT_10H_02H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP", IAP_EVENT_10H_04H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE2_INTEGER", IAP_EVENT_10H_08H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_PACKED", IAP_EVENT_10H_10H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_SCALAR", IAP_EVENT_10H_20H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_SINGLE_PRECISION",			\
-    IAP_EVENT_10H_40H)							\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_DOUBLE_PRECISION",			\
-    IAP_EVENT_10H_80H)							\
-__PMC_EV_ALIAS("SIMD_INT_128.PACKED_MPY", IAP_EVENT_12H_01H)		\
-__PMC_EV_ALIAS("SIMD_INT_128.PACKED_SHIFT", IAP_EVENT_12H_02H)		\
-__PMC_EV_ALIAS("SIMD_INT_128.PACK", IAP_EVENT_12H_04H)			\
-__PMC_EV_ALIAS("SIMD_INT_128.UNPACK", IAP_EVENT_12H_08H)		\
-__PMC_EV_ALIAS("SIMD_INT_128.PACKED_LOGICAL", IAP_EVENT_12H_10H)	\
-__PMC_EV_ALIAS("SIMD_INT_128.PACKED_ARITH", IAP_EVENT_12H_20H)		\
-__PMC_EV_ALIAS("SIMD_INT_128.SHUFFLE_MOVE", IAP_EVENT_12H_40H)		\
-__PMC_EV_ALIAS("LOAD_DISPATCH.RS", IAP_EVENT_13H_01H)			\
-__PMC_EV_ALIAS("LOAD_DISPATCH.RS_DELAYED", IAP_EVENT_13H_02H)		\
-__PMC_EV_ALIAS("LOAD_DISPATCH.MOB", IAP_EVENT_13H_04H)			\
-__PMC_EV_ALIAS("LOAD_DISPATCH.ANY", IAP_EVENT_13H_07H)			\
-__PMC_EV_ALIAS("ARITH.CYCLES_DIV_BUSY", IAP_EVENT_14H_01H)		\
-__PMC_EV_ALIAS("ARITH.MUL", IAP_EVENT_14H_02H)				\
-__PMC_EV_ALIAS("INST_QUEUE_WRITES", IAP_EVENT_17H_01H)			\
-__PMC_EV_ALIAS("INST_DECODED.DEC0", IAP_EVENT_18H_01H)			\
-__PMC_EV_ALIAS("TWO_UOP_INSTS_DECODED", IAP_EVENT_19H_01H)		\
-__PMC_EV_ALIAS("INST_QUEUE_WRITE_CYCLES", IAP_EVENT_1EH_01H)		\
-__PMC_EV_ALIAS("LSD_OVERFLOW", IAP_EVENT_20H_01H)			\
-__PMC_EV_ALIAS("L2_RQSTS.LD_HIT", IAP_EVENT_24H_01H)			\
-__PMC_EV_ALIAS("L2_RQSTS.LD_MISS", IAP_EVENT_24H_02H)			\
-__PMC_EV_ALIAS("L2_RQSTS.LOADS", IAP_EVENT_24H_03H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_HIT", IAP_EVENT_24H_04H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_MISS", IAP_EVENT_24H_08H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFOS", IAP_EVENT_24H_0CH)			\
-__PMC_EV_ALIAS("L2_RQSTS.IFETCH_HIT", IAP_EVENT_24H_10H)		\
-__PMC_EV_ALIAS("L2_RQSTS.IFETCH_MISS", IAP_EVENT_24H_20H)		\
-__PMC_EV_ALIAS("L2_RQSTS.IFETCHES", IAP_EVENT_24H_30H)			\
-__PMC_EV_ALIAS("L2_RQSTS.PREFETCH_HIT", IAP_EVENT_24H_40H)		\
-__PMC_EV_ALIAS("L2_RQSTS.PREFETCH_MISS", IAP_EVENT_24H_80H)		\
-__PMC_EV_ALIAS("L2_RQSTS.PREFETCHES", IAP_EVENT_24H_C0H)		\
-__PMC_EV_ALIAS("L2_RQSTS.MISS", IAP_EVENT_24H_AAH)			\
-__PMC_EV_ALIAS("L2_RQSTS.REFERENCES", IAP_EVENT_24H_FFH)		\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.I_STATE", IAP_EVENT_26H_01H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.S_STATE", IAP_EVENT_26H_02H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.E_STATE", IAP_EVENT_26H_04H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.M_STATE", IAP_EVENT_26H_08H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.MESI", IAP_EVENT_26H_0FH)		\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.I_STATE", IAP_EVENT_26H_10H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.S_STATE", IAP_EVENT_26H_20H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.E_STATE", IAP_EVENT_26H_40H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.M_STATE", IAP_EVENT_26H_80H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.MESI", IAP_EVENT_26H_F0H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.ANY", IAP_EVENT_26H_FFH)			\
-__PMC_EV_ALIAS("L2_WRITE.RFO.I_STATE", IAP_EVENT_27H_01H)		\
-__PMC_EV_ALIAS("L2_WRITE.RFO.S_STATE", IAP_EVENT_27H_02H)		\
-__PMC_EV_ALIAS("L2_WRITE.RFO.M_STATE", IAP_EVENT_27H_08H)		\
-__PMC_EV_ALIAS("L2_WRITE.RFO.HIT", IAP_EVENT_27H_0EH)			\
-__PMC_EV_ALIAS("L2_WRITE.RFO.MESI", IAP_EVENT_27H_0FH)			\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.I_STATE", IAP_EVENT_27H_10H)		\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.S_STATE", IAP_EVENT_27H_20H)		\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.E_STATE", IAP_EVENT_27H_40H)		\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.M_STATE", IAP_EVENT_27H_80H)		\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.HIT", IAP_EVENT_27H_E0H)			\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.MESI", IAP_EVENT_27H_F0H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.I_STATE", IAP_EVENT_28H_01H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.S_STATE", IAP_EVENT_28H_02H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.E_STATE", IAP_EVENT_28H_04H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.M_STATE", IAP_EVENT_28H_08H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.MESI", IAP_EVENT_28H_0FH)			\
-__PMC_EV_ALIAS("L3_LAT_CACHE.REFERENCE", IAP_EVENT_2EH_4FH)		\
-__PMC_EV_ALIAS("L3_LAT_CACHE.MISS", IAP_EVENT_2EH_41H)			\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.THREAD_P", IAP_EVENT_3CH_00H)		\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.REF_P", IAP_EVENT_3CH_01H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LD.I_STATE", IAP_EVENT_40H_01H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LD.S_STATE", IAP_EVENT_40H_02H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LD.E_STATE", IAP_EVENT_40H_04H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LD.M_STATE", IAP_EVENT_40H_08H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LD.MESI", IAP_EVENT_40H_0FH)			\
-__PMC_EV_ALIAS("L1D_CACHE_ST.S_STATE", IAP_EVENT_41H_02H)		\
-__PMC_EV_ALIAS("L1D_CACHE_ST.E_STATE", IAP_EVENT_41H_04H)		\
-__PMC_EV_ALIAS("L1D_CACHE_ST.M_STATE", IAP_EVENT_41H_08H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK.HIT", IAP_EVENT_42H_01H)			\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK.S_STATE", IAP_EVENT_42H_02H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK.E_STATE", IAP_EVENT_42H_04H)		\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK.M_STATE", IAP_EVENT_42H_08H)		\
-__PMC_EV_ALIAS("L1D_ALL_REF.ANY", IAP_EVENT_43H_01H)			\
-__PMC_EV_ALIAS("L1D_ALL_REF.CACHEABLE", IAP_EVENT_43H_02H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.ANY", IAP_EVENT_49H_01H)			\
-__PMC_EV_ALIAS("DTLB_MISSES.WALK_COMPLETED", IAP_EVENT_49H_02H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.STLB_HIT", IAP_EVENT_49H_10H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.PDE_MISS", IAP_EVENT_49H_20H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.LARGE_WALK_COMPLETED", IAP_EVENT_49H_80H)	\
-__PMC_EV_ALIAS("LOAD_HIT_PRE", IAP_EVENT_4CH_01H)			\
-__PMC_EV_ALIAS("L1D_PREFETCH.REQUESTS", IAP_EVENT_4EH_01H)		\
-__PMC_EV_ALIAS("L1D_PREFETCH.MISS", IAP_EVENT_4EH_02H)			\
-__PMC_EV_ALIAS("L1D_PREFETCH.TRIGGERS", IAP_EVENT_4EH_04H)		\
-__PMC_EV_ALIAS("L1D.REPL", IAP_EVENT_51H_01H)				\
-__PMC_EV_ALIAS("L1D.M_REPL", IAP_EVENT_51H_02H)				\
-__PMC_EV_ALIAS("L1D.M_EVICT", IAP_EVENT_51H_04H)			\
-__PMC_EV_ALIAS("L1D.M_SNOOP_EVICT", IAP_EVENT_51H_08H)			\
-__PMC_EV_ALIAS("L1D_CACHE_PREFETCH_LOCK_FB_HIT", IAP_EVENT_52H_01H)	\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK_FB_HIT", IAP_EVENT_53H_01H)		\
-__PMC_EV_ALIAS("CACHE_LOCK_CYCLES.L1D_L2", IAP_EVENT_63H_01H)		\
-__PMC_EV_ALIAS("CACHE_LOCK_CYCLES.L1D", IAP_EVENT_63H_02H)		\
-__PMC_EV_ALIAS("IO_TRANSACTIONS", IAP_EVENT_6CH_01H)			\
-__PMC_EV_ALIAS("L1I.HITS", IAP_EVENT_80H_01H)				\
-__PMC_EV_ALIAS("L1I.MISSES", IAP_EVENT_80H_02H)				\
-__PMC_EV_ALIAS("L1I.READS", IAP_EVENT_80H_03H)				\
-__PMC_EV_ALIAS("L1I.CYCLES_STALLED", IAP_EVENT_80H_04H)			\
-__PMC_EV_ALIAS("LARGE_ITLB.HIT", IAP_EVENT_82H_01H)			\
-__PMC_EV_ALIAS("ITLB_MISSES.ANY", IAP_EVENT_85H_01H)			\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED", IAP_EVENT_85H_02H)		\
-__PMC_EV_ALIAS("ILD_STALL.LCP", IAP_EVENT_87H_01H)			\
-__PMC_EV_ALIAS("ILD_STALL.MRU", IAP_EVENT_87H_02H)			\
-__PMC_EV_ALIAS("ILD_STALL.IQ_FULL", IAP_EVENT_87H_04H)			\
-__PMC_EV_ALIAS("ILD_STALL.REGEN", IAP_EVENT_87H_08H)			\
-__PMC_EV_ALIAS("ILD_STALL.ANY", IAP_EVENT_87H_0FH)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.COND", IAP_EVENT_88H_01H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT", IAP_EVENT_88H_02H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NON_CALL", IAP_EVENT_88H_04H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.NON_CALLS", IAP_EVENT_88H_07H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.RETURN_NEAR", IAP_EVENT_88H_08H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_88H_10H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_88H_20H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.NEAR_CALLS", IAP_EVENT_88H_30H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.TAKEN", IAP_EVENT_88H_40H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.ANY", IAP_EVENT_88H_7FH)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.COND", IAP_EVENT_89H_01H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT", IAP_EVENT_89H_02H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NON_CALL", IAP_EVENT_89H_04H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.NON_CALLS", IAP_EVENT_89H_07H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.RETURN_NEAR", IAP_EVENT_89H_08H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_89H_10H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_89H_20H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.NEAR_CALLS", IAP_EVENT_89H_30H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.TAKEN", IAP_EVENT_89H_40H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.ANY", IAP_EVENT_89H_7FH)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY", IAP_EVENT_A2H_01H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.LOAD", IAP_EVENT_A2H_02H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.RS_FULL", IAP_EVENT_A2H_04H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.STORE", IAP_EVENT_A2H_08H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB_FULL", IAP_EVENT_A2H_10H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.FPCW", IAP_EVENT_A2H_20H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.MXCSR", IAP_EVENT_A2H_40H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.OTHER", IAP_EVENT_A2H_80H)		\
-__PMC_EV_ALIAS("MACRO_INSTS.FUSIONS_DECODED", IAP_EVENT_A6H_01H)	\
-__PMC_EV_ALIAS("BACLEAR_FORCE_IQ", IAP_EVENT_A7H_01H)			\
-__PMC_EV_ALIAS("LSD.UOPS", IAP_EVENT_A8H_01H)				\
-__PMC_EV_ALIAS("ITLB_FLUSH", IAP_EVENT_AEH_01H)				\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.L1D_WRITEBACK", IAP_EVENT_B0H_40H)	\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT0", IAP_EVENT_B1H_01H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT1", IAP_EVENT_B1H_02H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT2_CORE", IAP_EVENT_B1H_04H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT3_CORE", IAP_EVENT_B1H_08H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT4_CORE", IAP_EVENT_B1H_10H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.CORE_ACTIVE_CYCLES_NO_PORT5",		\
-    IAP_EVENT_B1H_1FH)							\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT5", IAP_EVENT_B1H_20H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.CORE_ACTIVE_CYCLES", IAP_EVENT_B1H_3FH)	\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT015", IAP_EVENT_B1H_40H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT234", IAP_EVENT_B1H_80H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_SQ_FULL", IAP_EVENT_B2H_01H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_0", IAP_EVENT_B7H_01H)		\
-__PMC_EV_ALIAS("SNOOP_RESPONSE.HIT", IAP_EVENT_B8H_01H)			\
-__PMC_EV_ALIAS("SNOOP_RESPONSE.HITE", IAP_EVENT_B8H_02H)		\
-__PMC_EV_ALIAS("SNOOP_RESPONSE.HITM", IAP_EVENT_B8H_04H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_1", IAP_EVENT_BBH_01H)		\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P", IAP_EVENT_C0H_01H)			\
-__PMC_EV_ALIAS("INST_RETIRED.X87", IAP_EVENT_C0H_02H)			\
-__PMC_EV_ALIAS("INST_RETIRED.MMX", IAP_EVENT_C0H_04H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.ANY", IAP_EVENT_C2H_01H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.RETIRE_SLOTS", IAP_EVENT_C2H_02H)		\
-__PMC_EV_ALIAS("UOPS_RETIRED.MACRO_FUSED", IAP_EVENT_C2H_04H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.CYCLES", IAP_EVENT_C3H_01H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MEM_ORDER", IAP_EVENT_C3H_02H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC", IAP_EVENT_C3H_04H)			\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_00H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.CONDITIONAL", IAP_EVENT_C4H_01H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_CALL", IAP_EVENT_C4H_02H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_04H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_00H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NEAR_CALL", IAP_EVENT_C5H_02H)		\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.PACKED_SINGLE", IAP_EVENT_C7H_01H)	\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.SCALAR_SINGLE", IAP_EVENT_C7H_02H)	\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.PACKED_DOUBLE", IAP_EVENT_C7H_04H)	\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.SCALAR_DOUBLE", IAP_EVENT_C7H_08H)	\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.VECTOR_INTEGER", IAP_EVENT_C7H_10H)	\
-__PMC_EV_ALIAS("ITLB_MISS_RETIRED", IAP_EVENT_C8H_20H)			\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L1D_HIT", IAP_EVENT_CBH_01H)		\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L2_HIT", IAP_EVENT_CBH_02H)		\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L3_UNSHARED_HIT", IAP_EVENT_CBH_04H)	\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.OTHER_CORE_L2_HIT_HITM",		\
-    IAP_EVENT_CBH_08H)							\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L3_MISS", IAP_EVENT_CBH_10H)		\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.HIT_LFB", IAP_EVENT_CBH_40H)		\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.DTLB_MISS", IAP_EVENT_CBH_80H)		\
-__PMC_EV_ALIAS("FP_MMX_TRANS.TO_FP", IAP_EVENT_CCH_01H)			\
-__PMC_EV_ALIAS("FP_MMX_TRANS.TO_MMX", IAP_EVENT_CCH_02H)		\
-__PMC_EV_ALIAS("FP_MMX_TRANS.ANY", IAP_EVENT_CCH_03H)			\
-__PMC_EV_ALIAS("MACRO_INSTS.DECODED", IAP_EVENT_D0H_01H)		\
-__PMC_EV_ALIAS("UOPS_DECODED.MS", IAP_EVENT_D1H_02H)			\
-__PMC_EV_ALIAS("UOPS_DECODED.ESP_FOLDING", IAP_EVENT_D1H_04H)		\
-__PMC_EV_ALIAS("UOPS_DECODED.ESP_SYNC", IAP_EVENT_D1H_08H)		\
-__PMC_EV_ALIAS("RAT_STALLS.FLAGS", IAP_EVENT_D2H_01H)			\
-__PMC_EV_ALIAS("RAT_STALLS.REGISTERS", IAP_EVENT_D2H_02H)		\
-__PMC_EV_ALIAS("RAT_STALLS.ROB_READ_PORT", IAP_EVENT_D2H_04H)		\
-__PMC_EV_ALIAS("RAT_STALLS.SCOREBOARD", IAP_EVENT_D2H_08H)		\
-__PMC_EV_ALIAS("RAT_STALLS.ANY", IAP_EVENT_D2H_0FH)			\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS", IAP_EVENT_D4H_01H)			\
-__PMC_EV_ALIAS("ES_REG_RENAMES", IAP_EVENT_D5H_01H)			\
-__PMC_EV_ALIAS("UOP_UNFUSION", IAP_EVENT_DBH_01H)			\
-__PMC_EV_ALIAS("BR_INST_DECODED", IAP_EVENT_E0H_01H)			\
-__PMC_EV_ALIAS("BPU_MISSED_CALL_RET", IAP_EVENT_E5H_01H)		\
-__PMC_EV_ALIAS("BACLEAR.CLEAR", IAP_EVENT_E6H_01H)			\
-__PMC_EV_ALIAS("BACLEAR.BAD_TARGET", IAP_EVENT_E6H_02H)			\
-__PMC_EV_ALIAS("BPU_CLEARS.EARLY", IAP_EVENT_E8H_01H)			\
-__PMC_EV_ALIAS("BPU_CLEARS.LATE", IAP_EVENT_E8H_02H)			\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.LOAD", IAP_EVENT_F0H_01H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.RFO", IAP_EVENT_F0H_02H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.IFETCH", IAP_EVENT_F0H_04H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.PREFETCH", IAP_EVENT_F0H_08H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.L1D_WB", IAP_EVENT_F0H_10H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.FILL", IAP_EVENT_F0H_20H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.WB", IAP_EVENT_F0H_40H)			\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.ANY", IAP_EVENT_F0H_80H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.S_STATE", IAP_EVENT_F1H_02H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.E_STATE", IAP_EVENT_F1H_04H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.ANY", IAP_EVENT_F1H_07H)			\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_01H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_02H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.PREFETCH_CLEAN", IAP_EVENT_F2H_04H)	\
-__PMC_EV_ALIAS("L2_LINES_OUT.PREFETCH_DIRTY", IAP_EVENT_F2H_08H)	\
-__PMC_EV_ALIAS("L2_LINES_OUT.ANY", IAP_EVENT_F2H_0FH)			\
-__PMC_EV_ALIAS("SQ_MISC.SPLIT_LOCK", IAP_EVENT_F4H_10H)			\
-__PMC_EV_ALIAS("SQ_FULL_STALL_CYCLES", IAP_EVENT_F6H_01H)		\
-__PMC_EV_ALIAS("FP_ASSIST.ALL", IAP_EVENT_F7H_01H)			\
-__PMC_EV_ALIAS("FP_ASSIST.OUTPUT", IAP_EVENT_F7H_02H)			\
-__PMC_EV_ALIAS("FP_ASSIST.INPUT", IAP_EVENT_F7H_04H)			\
-__PMC_EV_ALIAS("SIMD_INT_64.PACKED_MPY", IAP_EVENT_FDH_01H)		\
-__PMC_EV_ALIAS("SIMD_INT_64.PACKED_SHIFT", IAP_EVENT_FDH_02H)		\
-__PMC_EV_ALIAS("SIMD_INT_64.PACK", IAP_EVENT_FDH_04H)			\
-__PMC_EV_ALIAS("SIMD_INT_64.UNPACK", IAP_EVENT_FDH_08H)			\
-__PMC_EV_ALIAS("SIMD_INT_64.PACKED_LOGICAL", IAP_EVENT_FDH_10H)		\
-__PMC_EV_ALIAS("SIMD_INT_64.PACKED_ARITH", IAP_EVENT_FDH_20H)		\
-__PMC_EV_ALIAS("SIMD_INT_64.SHUFFLE_MOVE", IAP_EVENT_FDH_40H)		\
-__PMC_EV_ALIAS_COREI7_OLD()
-
-/*
- * Aliases for Westmere PMC events (253669-033US December 2009)
- */
-#define	__PMC_EV_ALIAS_WESTMERE()					\
-__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
-__PMC_EV_ALIAS("LOAD_BLOCK.OVERLAP_STORE", IAP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("SB_DRAIN.ANY", IAP_EVENT_04H_07H)			\
-__PMC_EV_ALIAS("MISALIGN_MEMORY.STORE", IAP_EVENT_05H_02H)		\
-__PMC_EV_ALIAS("STORE_BLOCKS.AT_RET", IAP_EVENT_06H_04H)		\
-__PMC_EV_ALIAS("STORE_BLOCKS.L1D_BLOCK", IAP_EVENT_06H_08H)		\
-__PMC_EV_ALIAS("PARTIAL_ADDRESS_ALIAS", IAP_EVENT_07H_01H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.ANY", IAP_EVENT_08H_01H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_02H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_CYCLES", IAP_EVENT_08H_04H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_08H_10H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.PDE_MISS", IAP_EVENT_08H_20H)		\
-__PMC_EV_ALIAS("MEM_INST_RETIRED.LOADS", IAP_EVENT_0BH_01H)		\
-__PMC_EV_ALIAS("MEM_INST_RETIRED.STORES", IAP_EVENT_0BH_02H)		\
-__PMC_EV_ALIAS("MEM_INST_RETIRED.LATENCY_ABOVE_THRESHOLD",		\
-    IAP_EVENT_0BH_10H)							\
-__PMC_EV_ALIAS("MEM_STORE_RETIRED.DTLB_MISS", IAP_EVENT_0CH_01H)	\
-__PMC_EV_ALIAS("UOPS_ISSUED.ANY", IAP_EVENT_0EH_01H)			\
-__PMC_EV_ALIAS("UOPS_ISSUED.STALLED_CYCLES", IAP_EVENT_0EH_01H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.FUSED", IAP_EVENT_0EH_02H)			\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.LOCAL_HITM", IAP_EVENT_0FH_02H)	\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.LOCAL_DRAM_AND_REMOTE_CACHE_HIT",	\
-    IAP_EVENT_0FH_08H)							\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.LOCAL_DRAM", IAP_EVENT_0FH_10H)	\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.REMOTE_DRAM", IAP_EVENT_0FH_20H)	\
-__PMC_EV_ALIAS("MEM_UNCORE_RETIRED.UNCACHEABLE", IAP_EVENT_0FH_80H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.X87", IAP_EVENT_10H_01H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.MMX", IAP_EVENT_10H_02H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP", IAP_EVENT_10H_04H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE2_INTEGER", IAP_EVENT_10H_08H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_PACKED", IAP_EVENT_10H_10H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_SCALAR", IAP_EVENT_10H_20H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_SINGLE_PRECISION",			\
-    IAP_EVENT_10H_40H)							\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_DOUBLE_PRECISION",			\
-    IAP_EVENT_10H_80H)							\
-__PMC_EV_ALIAS("SIMD_INT_128.PACKED_MPY", IAP_EVENT_12H_01H)		\
-__PMC_EV_ALIAS("SIMD_INT_128.PACKED_SHIFT", IAP_EVENT_12H_02H)		\
-__PMC_EV_ALIAS("SIMD_INT_128.PACK", IAP_EVENT_12H_04H)			\
-__PMC_EV_ALIAS("SIMD_INT_128.UNPACK", IAP_EVENT_12H_08H)		\
-__PMC_EV_ALIAS("SIMD_INT_128.PACKED_LOGICAL", IAP_EVENT_12H_10H)	\
-__PMC_EV_ALIAS("SIMD_INT_128.PACKED_ARITH", IAP_EVENT_12H_20H)		\
-__PMC_EV_ALIAS("SIMD_INT_128.SHUFFLE_MOVE", IAP_EVENT_12H_40H)		\
-__PMC_EV_ALIAS("LOAD_DISPATCH.RS", IAP_EVENT_13H_01H)			\
-__PMC_EV_ALIAS("LOAD_DISPATCH.RS_DELAYED", IAP_EVENT_13H_02H)		\
-__PMC_EV_ALIAS("LOAD_DISPATCH.MOB", IAP_EVENT_13H_04H)			\
-__PMC_EV_ALIAS("LOAD_DISPATCH.ANY", IAP_EVENT_13H_07H)			\
-__PMC_EV_ALIAS("ARITH.CYCLES_DIV_BUSY", IAP_EVENT_14H_01H)		\
-__PMC_EV_ALIAS("ARITH.MUL", IAP_EVENT_14H_02H)				\
-__PMC_EV_ALIAS("INST_QUEUE_WRITES", IAP_EVENT_17H_01H)			\
-__PMC_EV_ALIAS("INST_DECODED.DEC0", IAP_EVENT_18H_01H)			\
-__PMC_EV_ALIAS("TWO_UOP_INSTS_DECODED", IAP_EVENT_19H_01H)		\
-__PMC_EV_ALIAS("INST_QUEUE_WRITE_CYCLES", IAP_EVENT_1EH_01H)		\
-__PMC_EV_ALIAS("LSD_OVERFLOW", IAP_EVENT_20H_01H)			\
-__PMC_EV_ALIAS("L2_RQSTS.LD_HIT", IAP_EVENT_24H_01H)			\
-__PMC_EV_ALIAS("L2_RQSTS.LD_MISS", IAP_EVENT_24H_02H)			\
-__PMC_EV_ALIAS("L2_RQSTS.LOADS", IAP_EVENT_24H_03H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_HIT", IAP_EVENT_24H_04H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_MISS", IAP_EVENT_24H_08H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFOS", IAP_EVENT_24H_0CH)			\
-__PMC_EV_ALIAS("L2_RQSTS.IFETCH_HIT", IAP_EVENT_24H_10H)		\
-__PMC_EV_ALIAS("L2_RQSTS.IFETCH_MISS", IAP_EVENT_24H_20H)		\
-__PMC_EV_ALIAS("L2_RQSTS.IFETCHES", IAP_EVENT_24H_30H)			\
-__PMC_EV_ALIAS("L2_RQSTS.PREFETCH_HIT", IAP_EVENT_24H_40H)		\
-__PMC_EV_ALIAS("L2_RQSTS.PREFETCH_MISS", IAP_EVENT_24H_80H)		\
-__PMC_EV_ALIAS("L2_RQSTS.PREFETCHES", IAP_EVENT_24H_C0H)		\
-__PMC_EV_ALIAS("L2_RQSTS.MISS", IAP_EVENT_24H_AAH)			\
-__PMC_EV_ALIAS("L2_RQSTS.REFERENCES", IAP_EVENT_24H_FFH)		\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.I_STATE", IAP_EVENT_26H_01H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.S_STATE", IAP_EVENT_26H_02H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.E_STATE", IAP_EVENT_26H_04H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.M_STATE", IAP_EVENT_26H_08H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.DEMAND.MESI", IAP_EVENT_26H_0FH)		\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.I_STATE", IAP_EVENT_26H_10H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.S_STATE", IAP_EVENT_26H_20H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.E_STATE", IAP_EVENT_26H_40H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.M_STATE", IAP_EVENT_26H_80H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.PREFETCH.MESI", IAP_EVENT_26H_F0H)	\
-__PMC_EV_ALIAS("L2_DATA_RQSTS.ANY", IAP_EVENT_26H_FFH)			\
-__PMC_EV_ALIAS("L2_WRITE.RFO.I_STATE", IAP_EVENT_27H_01H)		\
-__PMC_EV_ALIAS("L2_WRITE.RFO.S_STATE", IAP_EVENT_27H_02H)		\
-__PMC_EV_ALIAS("L2_WRITE.RFO.M_STATE", IAP_EVENT_27H_08H)		\
-__PMC_EV_ALIAS("L2_WRITE.RFO.HIT", IAP_EVENT_27H_0EH)			\
-__PMC_EV_ALIAS("L2_WRITE.RFO.MESI", IAP_EVENT_27H_0FH)			\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.I_STATE", IAP_EVENT_27H_10H)		\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.S_STATE", IAP_EVENT_27H_20H)		\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.E_STATE", IAP_EVENT_27H_40H)		\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.M_STATE", IAP_EVENT_27H_80H)		\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.HIT", IAP_EVENT_27H_E0H)			\
-__PMC_EV_ALIAS("L2_WRITE.LOCK.MESI", IAP_EVENT_27H_F0H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.I_STATE", IAP_EVENT_28H_01H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.S_STATE", IAP_EVENT_28H_02H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.E_STATE", IAP_EVENT_28H_04H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.M_STATE", IAP_EVENT_28H_08H)			\
-__PMC_EV_ALIAS("L1D_WB_L2.MESI", IAP_EVENT_28H_0FH)			\
-__PMC_EV_ALIAS("L3_LAT_CACHE.REFERENCE", IAP_EVENT_2EH_02H)		\
-__PMC_EV_ALIAS("L3_LAT_CACHE.MISS", IAP_EVENT_2EH_01H)			\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.THREAD_P", IAP_EVENT_3CH_00H)		\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.REF_P", IAP_EVENT_3CH_01H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.ANY", IAP_EVENT_49H_01H)			\
-__PMC_EV_ALIAS("DTLB_MISSES.WALK_COMPLETED", IAP_EVENT_49H_02H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.WALK_CYCLES", IAP_EVENT_49H_04H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.STLB_HIT", IAP_EVENT_49H_10H)		\
-__PMC_EV_ALIAS("DTLB_MISSES.LARGE_WALK_COMPLETED", IAP_EVENT_49H_80H)	\
-__PMC_EV_ALIAS("LOAD_HIT_PRE", IAP_EVENT_4CH_01H)			\
-__PMC_EV_ALIAS("L1D_PREFETCH.REQUESTS", IAP_EVENT_4EH_01H)		\
-__PMC_EV_ALIAS("L1D_PREFETCH.MISS", IAP_EVENT_4EH_02H)			\
-__PMC_EV_ALIAS("L1D_PREFETCH.TRIGGERS", IAP_EVENT_4EH_04H)		\
-__PMC_EV_ALIAS("EPT.WALK_CYCLES", IAP_EVENT_4FH_10H)			\
-__PMC_EV_ALIAS("L1D.REPL", IAP_EVENT_51H_01H)				\
-__PMC_EV_ALIAS("L1D.M_REPL", IAP_EVENT_51H_02H)				\
-__PMC_EV_ALIAS("L1D.M_EVICT", IAP_EVENT_51H_04H)			\
-__PMC_EV_ALIAS("L1D.M_SNOOP_EVICT", IAP_EVENT_51H_08H)			\
-__PMC_EV_ALIAS("L1D_CACHE_PREFETCH_LOCK_FB_HIT", IAP_EVENT_52H_01H)	\
-__PMC_EV_ALIAS("L1D_CACHE_LOCK_FB_HIT", IAP_EVENT_53H_01H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND.READ_DATA",		\
-    IAP_EVENT_60H_01H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND.READ_CODE",		\
-    IAP_EVENT_60H_02H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND.RFO",		\
-    IAP_EVENT_60H_04H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.ANY.READ",			\
-    IAP_EVENT_60H_08H)							\
-__PMC_EV_ALIAS("CACHE_LOCK_CYCLES.L1D_L2", IAP_EVENT_63H_01H)		\
-__PMC_EV_ALIAS("CACHE_LOCK_CYCLES.L1D", IAP_EVENT_63H_02H)		\
-__PMC_EV_ALIAS("IO_TRANSACTIONS", IAP_EVENT_6CH_01H)			\
-__PMC_EV_ALIAS("L1I.HITS", IAP_EVENT_80H_01H)				\
-__PMC_EV_ALIAS("L1I.MISSES", IAP_EVENT_80H_02H)				\
-__PMC_EV_ALIAS("L1I.READS", IAP_EVENT_80H_03H)				\
-__PMC_EV_ALIAS("L1I.CYCLES_STALLED", IAP_EVENT_80H_04H)			\
-__PMC_EV_ALIAS("LARGE_ITLB.HIT", IAP_EVENT_82H_01H)			\
-__PMC_EV_ALIAS("ITLB_MISSES.ANY", IAP_EVENT_85H_01H)			\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED", IAP_EVENT_85H_02H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_CYCLES", IAP_EVENT_85H_04H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.LARGE_WALK_COMPLETED", IAP_EVENT_85H_80H)	\
-__PMC_EV_ALIAS("ILD_STALL.LCP", IAP_EVENT_87H_01H)			\
-__PMC_EV_ALIAS("ILD_STALL.MRU", IAP_EVENT_87H_02H)			\
-__PMC_EV_ALIAS("ILD_STALL.IQ_FULL", IAP_EVENT_87H_04H)			\
-__PMC_EV_ALIAS("ILD_STALL.REGEN", IAP_EVENT_87H_08H)			\
-__PMC_EV_ALIAS("ILD_STALL.ANY", IAP_EVENT_87H_0FH)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.COND", IAP_EVENT_88H_01H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT", IAP_EVENT_88H_02H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NON_CALL", IAP_EVENT_88H_04H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.NON_CALLS", IAP_EVENT_88H_07H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.RETURN_NEAR", IAP_EVENT_88H_08H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_88H_10H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_88H_20H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.NEAR_CALLS", IAP_EVENT_88H_30H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.TAKEN", IAP_EVENT_88H_40H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.ANY", IAP_EVENT_88H_7FH)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.COND", IAP_EVENT_89H_01H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT", IAP_EVENT_89H_02H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NON_CALL", IAP_EVENT_89H_04H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.NON_CALLS", IAP_EVENT_89H_07H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.RETURN_NEAR", IAP_EVENT_89H_08H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_89H_10H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_89H_20H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.NEAR_CALLS", IAP_EVENT_89H_30H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.TAKEN", IAP_EVENT_89H_40H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.ANY", IAP_EVENT_89H_7FH)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY", IAP_EVENT_A2H_01H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.LOAD", IAP_EVENT_A2H_02H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.RS_FULL", IAP_EVENT_A2H_04H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.STORE", IAP_EVENT_A2H_08H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB_FULL", IAP_EVENT_A2H_10H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.FPCW", IAP_EVENT_A2H_20H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.MXCSR", IAP_EVENT_A2H_40H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.OTHER", IAP_EVENT_A2H_80H)		\
-__PMC_EV_ALIAS("MACRO_INSTS.FUSIONS_DECODED", IAP_EVENT_A6H_01H)	\
-__PMC_EV_ALIAS("BACLEAR_FORCE_IQ", IAP_EVENT_A7H_01H)			\
-__PMC_EV_ALIAS("LSD.UOPS", IAP_EVENT_A8H_01H)				\
-__PMC_EV_ALIAS("ITLB_FLUSH", IAP_EVENT_AEH_01H)				\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND.READ_DATA", IAP_EVENT_B0H_01H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND.READ_CODE", IAP_EVENT_B0H_02H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND.RFO", IAP_EVENT_B0H_04H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ANY.READ", IAP_EVENT_B0H_08H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ANY.RFO", IAP_EVENT_B0H_10H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.L1D_WRITEBACK", IAP_EVENT_B0H_40H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ANY", IAP_EVENT_B0H_80H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT0", IAP_EVENT_B1H_01H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT1", IAP_EVENT_B1H_02H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT2_CORE", IAP_EVENT_B1H_04H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT3_CORE", IAP_EVENT_B1H_08H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT4_CORE", IAP_EVENT_B1H_10H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.CORE_ACTIVE_CYCLES_NO_PORT5",		\
-    IAP_EVENT_B1H_1FH)							\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT5", IAP_EVENT_B1H_20H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.CORE_ACTIVE_CYCLES", IAP_EVENT_B1H_3FH)	\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT015", IAP_EVENT_B1H_40H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.PORT234", IAP_EVENT_B1H_80H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_SQ_FULL", IAP_EVENT_B2H_01H)		\
-__PMC_EV_ALIAS("SNOOPQ_REQUESTS_OUTSTANDING.DATA", IAP_EVENT_B3H_01H)	\
-__PMC_EV_ALIAS("SNOOPQ_REQUESTS_OUTSTANDING.INVALIDATE",		\
-    IAP_EVENT_B3H_02H)							\
-__PMC_EV_ALIAS("SNOOPQ_REQUESTS_OUTSTANDING.CODE", IAP_EVENT_B3H_04H)	\
-__PMC_EV_ALIAS("SNOOPQ_REQUESTS.CODE", IAP_EVENT_B4H_01H)		\
-__PMC_EV_ALIAS("SNOOPQ_REQUESTS.DATA", IAP_EVENT_B4H_02H)		\
-__PMC_EV_ALIAS("SNOOPQ_REQUESTS.INVALIDATE", IAP_EVENT_B4H_04H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_0", IAP_EVENT_B7H_01H)		\
-__PMC_EV_ALIAS("SNOOP_RESPONSE.HIT", IAP_EVENT_B8H_01H)			\
-__PMC_EV_ALIAS("SNOOP_RESPONSE.HITE", IAP_EVENT_B8H_02H)		\
-__PMC_EV_ALIAS("SNOOP_RESPONSE.HITM", IAP_EVENT_B8H_04H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_1", IAP_EVENT_BBH_01H)		\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P", IAP_EVENT_C0H_01H)			\
-__PMC_EV_ALIAS("INST_RETIRED.X87", IAP_EVENT_C0H_02H)			\
-__PMC_EV_ALIAS("INST_RETIRED.MMX", IAP_EVENT_C0H_04H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.ANY", IAP_EVENT_C2H_01H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.RETIRE_SLOTS", IAP_EVENT_C2H_02H)		\
-__PMC_EV_ALIAS("UOPS_RETIRED.MACRO_FUSED", IAP_EVENT_C2H_04H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.CYCLES", IAP_EVENT_C3H_01H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MEM_ORDER", IAP_EVENT_C3H_02H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC", IAP_EVENT_C3H_04H)			\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ANY_P", IAP_EVENT_C4H_00H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.CONDITIONAL", IAP_EVENT_C4H_01H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_CALL", IAP_EVENT_C4H_02H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_04H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ANY_P", IAP_EVENT_C5H_00H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_01H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NEAR_CALL", IAP_EVENT_C5H_02H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_04H)	\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.PACKED_SINGLE", IAP_EVENT_C7H_01H)	\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.SCALAR_SINGLE", IAP_EVENT_C7H_02H)	\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.PACKED_DOUBLE", IAP_EVENT_C7H_04H)	\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.SCALAR_DOUBLE", IAP_EVENT_C7H_08H)	\
-__PMC_EV_ALIAS("SSEX_UOPS_RETIRED.VECTOR_INTEGER", IAP_EVENT_C7H_10H)	\
-__PMC_EV_ALIAS("ITLB_MISS_RETIRED", IAP_EVENT_C8H_20H)			\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L1D_HIT", IAP_EVENT_CBH_01H)		\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L2_HIT", IAP_EVENT_CBH_02H)		\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L3_UNSHARED_HIT", IAP_EVENT_CBH_04H)	\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.OTHER_CORE_L2_HIT_HITM",		\
-    IAP_EVENT_CBH_08H)							\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.L3_MISS", IAP_EVENT_CBH_10H)		\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.HIT_LFB", IAP_EVENT_CBH_40H)		\
-__PMC_EV_ALIAS("MEM_LOAD_RETIRED.DTLB_MISS", IAP_EVENT_CBH_80H)		\
-__PMC_EV_ALIAS("FP_MMX_TRANS.TO_FP", IAP_EVENT_CCH_01H)			\
-__PMC_EV_ALIAS("FP_MMX_TRANS.TO_MMX", IAP_EVENT_CCH_02H)		\
-__PMC_EV_ALIAS("FP_MMX_TRANS.ANY", IAP_EVENT_CCH_03H)			\
-__PMC_EV_ALIAS("MACRO_INSTS.DECODED", IAP_EVENT_D0H_01H)		\
-__PMC_EV_ALIAS("UOPS_DECODED.STALL_CYCLES", IAP_EVENT_D1H_01H)		\
-__PMC_EV_ALIAS("UOPS_DECODED.MS", IAP_EVENT_D1H_02H)			\
-__PMC_EV_ALIAS("UOPS_DECODED.ESP_FOLDING", IAP_EVENT_D1H_04H)		\
-__PMC_EV_ALIAS("UOPS_DECODED.ESP_SYNC", IAP_EVENT_D1H_08H)		\
-__PMC_EV_ALIAS("RAT_STALLS.FLAGS", IAP_EVENT_D2H_01H)			\
-__PMC_EV_ALIAS("RAT_STALLS.REGISTERS", IAP_EVENT_D2H_02H)		\
-__PMC_EV_ALIAS("RAT_STALLS.ROB_READ_PORT", IAP_EVENT_D2H_04H)		\
-__PMC_EV_ALIAS("RAT_STALLS.SCOREBOARD", IAP_EVENT_D2H_08H)		\
-__PMC_EV_ALIAS("RAT_STALLS.ANY", IAP_EVENT_D2H_0FH)			\
-__PMC_EV_ALIAS("SEG_RENAME_STALLS", IAP_EVENT_D4H_01H)			\
-__PMC_EV_ALIAS("ES_REG_RENAMES", IAP_EVENT_D5H_01H)			\
-__PMC_EV_ALIAS("UOP_UNFUSION", IAP_EVENT_DBH_01H)			\
-__PMC_EV_ALIAS("BR_INST_DECODED", IAP_EVENT_E0H_01H)			\
-__PMC_EV_ALIAS("BPU_MISSED_CALL_RET", IAP_EVENT_E5H_01H)		\
-__PMC_EV_ALIAS("BACLEAR.CLEAR", IAP_EVENT_E6H_01H)			\
-__PMC_EV_ALIAS("BACLEAR.BAD_TARGET", IAP_EVENT_E6H_02H)			\
-__PMC_EV_ALIAS("BPU_CLEARS.EARLY", IAP_EVENT_E8H_01H)			\
-__PMC_EV_ALIAS("BPU_CLEARS.LATE", IAP_EVENT_E8H_02H)			\
-__PMC_EV_ALIAS("THREAD_ACTIVE", IAP_EVENT_ECH_01H)			\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.LOAD", IAP_EVENT_F0H_01H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.RFO", IAP_EVENT_F0H_02H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.IFETCH", IAP_EVENT_F0H_04H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.PREFETCH", IAP_EVENT_F0H_08H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.L1D_WB", IAP_EVENT_F0H_10H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.FILL", IAP_EVENT_F0H_20H)		\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.WB", IAP_EVENT_F0H_40H)			\
-__PMC_EV_ALIAS("L2_TRANSACTIONS.ANY", IAP_EVENT_F0H_80H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.S_STATE", IAP_EVENT_F1H_02H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.E_STATE", IAP_EVENT_F1H_04H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.ANY", IAP_EVENT_F1H_07H)			\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_01H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_02H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.PREFETCH_CLEAN", IAP_EVENT_F2H_04H)	\
-__PMC_EV_ALIAS("L2_LINES_OUT.PREFETCH_DIRTY", IAP_EVENT_F2H_08H)	\
-__PMC_EV_ALIAS("L2_LINES_OUT.ANY", IAP_EVENT_F2H_0FH)			\
-__PMC_EV_ALIAS("SQ_MISC.LRU_HINTS", IAP_EVENT_F4H_04H)			\
-__PMC_EV_ALIAS("SQ_MISC.SPLIT_LOCK", IAP_EVENT_F4H_10H)			\
-__PMC_EV_ALIAS("SQ_FULL_STALL_CYCLES", IAP_EVENT_F6H_01H)		\
-__PMC_EV_ALIAS("FP_ASSIST.ALL", IAP_EVENT_F7H_01H)			\
-__PMC_EV_ALIAS("FP_ASSIST.OUTPUT", IAP_EVENT_F7H_02H)			\
-__PMC_EV_ALIAS("FP_ASSIST.INPUT", IAP_EVENT_F7H_04H)			\
-__PMC_EV_ALIAS("SIMD_INT_64.PACKED_MPY", IAP_EVENT_FDH_01H)		\
-__PMC_EV_ALIAS("SIMD_INT_64.PACKED_SHIFT", IAP_EVENT_FDH_02H)		\
-__PMC_EV_ALIAS("SIMD_INT_64.PACK", IAP_EVENT_FDH_04H)			\
-__PMC_EV_ALIAS("SIMD_INT_64.UNPACK", IAP_EVENT_FDH_08H)			\
-__PMC_EV_ALIAS("SIMD_INT_64.PACKED_LOGICAL", IAP_EVENT_FDH_10H)		\
-__PMC_EV_ALIAS("SIMD_INT_64.PACKED_ARITH", IAP_EVENT_FDH_20H)		\
-__PMC_EV_ALIAS("SIMD_INT_64.SHUFFLE_MOVE", IAP_EVENT_FDH_40H)
-
-/*
- * Aliases for Haswell core PMC events
- */
-#define __PMC_EV_ALIAS_HASWELL_XEON()					\
-__PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)		 	\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.STORES", IAP_EVENT_05H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS_PARTIAL.ADDRESS_ALIAS", IAP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_08H_01H)\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED_4K", IAP_EVENT_08H_02H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED_2M_4K",			\
-    IAP_EVENT_08H_04H)							\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_0EH)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_DURATION", IAP_EVENT_08H_10H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT_4K", IAP_EVENT_08H_20H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT_2M", IAP_EVENT_08H_40H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_08H_60H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.PDE_CACHE_MISS", IAP_EVENT_08H_80H)	\
-__PMC_EV_ALIAS("INT_MISC.RECOVERY_CYCLES", IAP_EVENT_0DH_03H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.ANY", IAP_EVENT_0EH_01H)			\
-__PMC_EV_ALIAS("UOPS_ISSUED.FLAGS_MERGE", IAP_EVENT_0EH_10H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.SLOW_LEA", IAP_EVENT_0EH_20H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.SINGLE_MUL", IAP_EVENT_0EH_40H)		\
-__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_MISS", IAP_EVENT_24H_21H)	\
-__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_HIT", IAP_EVENT_24H_41H)	\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_DATA_RD", IAP_EVENT_24H_E1H)	\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_HIT", IAP_EVENT_24H_42H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_MISS", IAP_EVENT_24H_22H)			\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_RFO", IAP_EVENT_24H_E2H)			\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_HIT", IAP_EVENT_24H_44H)		\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_MISS", IAP_EVENT_24H_24H)		\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_MISS", IAP_EVENT_24H_27H)		\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_REFERENCES", IAP_EVENT_24H_E7H)	\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_CODE_RD", IAP_EVENT_24H_E4H)		\
-__PMC_EV_ALIAS("L2_RQSTS.L2_PF_HIT", IAP_EVENT_24H_50H)			\
-__PMC_EV_ALIAS("L2_RQSTS.L2_PF_MISS", IAP_EVENT_24H_30H)		\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_PF", IAP_EVENT_24H_F8H)			\
-__PMC_EV_ALIAS("L2_RQSTS.MISS", IAP_EVENT_24H_3FH)			\
-__PMC_EV_ALIAS("L2_RQSTS.REFERENCES", IAP_EVENT_24H_FFH)		\
-__PMC_EV_ALIAS("L2_DEMAND_RQSTS.WB_HIT", IAP_EVENT_27H_50H)		\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.REFERENCE", IAP_EVENT_2EH_4FH)	\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.MISS", IAP_EVENT_2EH_41H)		\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.THREAD_P", IAP_EVENT_3CH_00H)		\
-__PMC_EV_ALIAS("CPU_CLK_THREAD_UNHALTED.REF_XCLK", IAP_EVENT_3CH_01H)	\
-__PMC_EV_ALIAS("L1D_PEND_MISS.PENDING", IAP_EVENT_48H_01H)		\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.MISS_CAUSES_A_WALK",			\
-    IAP_EVENT_49H_01H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED_4K",			\
-    IAP_EVENT_49H_02H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED_2M_4M",		\
-    IAP_EVENT_49H_04H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED", IAP_EVENT_49H_0EH)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_DURATION", IAP_EVENT_49H_10H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT_4K", IAP_EVENT_49H_20H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT_2M", IAP_EVENT_49H_40H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT", IAP_EVENT_49H_60H)		\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.PDE_CACHE_MISS", IAP_EVENT_49H_80H)	\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.SW_PF", IAP_EVENT_4CH_01H)			\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.HW_PF", IAP_EVENT_4CH_02H)			\
-__PMC_EV_ALIAS("L1D.REPLACEMENT", IAP_EVENT_51H_01H)			\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.INT_NOT_ELIMINATED",			\
-    IAP_EVENT_58H_04H)							\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.SMID_NOT_ELIMINATED",			\
-    IAP_EVENT_58H_08H)							\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.INT_ELIMINATED", IAP_EVENT_58H_01H)	\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.SMID_ELIMINATED", IAP_EVENT_58H_02H)	\
-__PMC_EV_ALIAS("CPL_CYCLES.RING0", IAP_EVENT_5CH_02H)			\
-__PMC_EV_ALIAS("CPL_CYCLES.RING123", IAP_EVENT_5CH_01H)			\
-__PMC_EV_ALIAS("RS_EVENTS.EMPTY_CYCLES", IAP_EVENT_5EH_01H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD",		\
-    IAP_EVENT_60H_01H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CORE_RD",		\
-    IAP_EVENT_60H_02H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO",		\
-    IAP_EVENT_60H_04H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD",		\
-    IAP_EVENT_60H_08H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION",		\
-    IAP_EVENT_63H_01H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.CACHE_LOCK_DURATION", IAP_EVENT_63H_02H)	\
-__PMC_EV_ALIAS("IDQ.EMPTY", IAP_EVENT_79H_02H)				\
-__PMC_EV_ALIAS("IDQ.MITE_UOPS", IAP_EVENT_79H_04H)			\
-__PMC_EV_ALIAS("IDQ.DSB_UOPS", IAP_EVENT_79H_08H)			\
-__PMC_EV_ALIAS("IDQ.MS_DSB_UOPS", IAP_EVENT_79H_10H)			\
-__PMC_EV_ALIAS("IDQ.MS_MITE_UOPS", IAP_EVENT_79H_20H)			\
-__PMC_EV_ALIAS("IDQ.MS_UOPS", IAP_EVENT_79H_30H)			\
-__PMC_EV_ALIAS("IDQ.ALL_DSB_CYCLES_ANY_UOPS", IAP_EVENT_79H_18H)	\
-__PMC_EV_ALIAS("IDQ.ALL_DSB_CYCLES_4_UOPS", IAP_EVENT_79H_18H)		\
-__PMC_EV_ALIAS("IDQ.ALL_MITE_CYCLES_ANY_UOPS", IAP_EVENT_79H_24H)	\
-__PMC_EV_ALIAS("IDQ.ALL_MITE_CYCLES_4_UOPS", IAP_EVENT_79H_24H)		\
-__PMC_EV_ALIAS("IDQ.MITE_ALL_UOPS", IAP_EVENT_79H_3CH)			\
-__PMC_EV_ALIAS("ICACHE.MISSES", IAP_EVENT_80H_02H)			\
-__PMC_EV_ALIAS("ITLB_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_85H_01H)	\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED_4K", IAP_EVENT_85H_02H)	\
-__PMC_EV_ALIAS("TLB_MISSES.WALK_COMPLETED_2M_4M", IAP_EVENT_85H_04H)	\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED", IAP_EVENT_85H_0EH)		\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_DURATION", IAP_EVENT_85H_10H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT_4K", IAP_EVENT_85H_20H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT_2M", IAP_EVENT_85H_40H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT", IAP_EVENT_85H_60H)		\
-__PMC_EV_ALIAS("ILD_STALL.LCP", IAP_EVENT_87H_01H)			\
-__PMC_EV_ALIAS("ILD_STALL.IQ_FULL", IAP_EVENT_87H_04H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.COND", IAP_EVENT_88H_01H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_JMP", IAP_EVENT_88H_02H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_88H_04H)							\
-__PMC_EV_ALIAS("BR_INST_EXEC.RETURN_NEAR", IAP_EVENT_88H_08H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_88H_10H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_88H_20H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.NONTAKEN", IAP_EVENT_88H_40H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.TAKEN", IAP_EVENT_88H_80H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.ALL_BRANCHES", IAP_EVENT_88H_FFH)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.COND", IAP_EVENT_89H_01H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_89H_04H)							\
-__PMC_EV_ALIAS("BR_MISP_EXEC.RETURN_NEAR", IAP_EVENT_89H_08H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_89H_10H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_89H_20H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.NONTAKEN", IAP_EVENT_89H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.TAKEN", IAP_EVENT_89H_80H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.ALL_BRANCHES", IAP_EVENT_89H_FFH)		\
-__PMC_EV_ALIAS("IDQ_UOPS_NOT_DELIVERED.CORE", IAP_EVENT_9CH_01H)	\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_0", IAP_EVENT_A1H_01H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_1", IAP_EVENT_A1H_02H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_2", IAP_EVENT_A1H_04H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_3", IAP_EVENT_A1H_08H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_4", IAP_EVENT_A1H_10H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_5", IAP_EVENT_A1H_20H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_6", IAP_EVENT_A1H_40H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_7", IAP_EVENT_A1H_80H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY", IAP_EVENT_A2H_01H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.RS", IAP_EVENT_A2H_04H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.SB", IAP_EVENT_A2H_08H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB", IAP_EVENT_A2H_10H)		\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L2_PENDING", IAP_EVENT_A3H_01H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_LDM_PENDING", IAP_EVENT_A3H_02H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.STALLS_L2_PENDING", IAP_EVENT_A3H_05H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L1D_PENDING", IAP_EVENT_A3H_08H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.STALLS_L1D_PENDING", IAP_EVENT_A3H_0CH)	\
-__PMC_EV_ALIAS("LSD.UOPS", IAP_EVENT_A8H_01H)				\
-__PMC_EV_ALIAS("ITLB.ITLB_FLUSH", IAP_EVENT_AEH_01H)			\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_DATA_RD", IAP_EVENT_B0H_01H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_CODE_RD", IAP_EVENT_B0H_02H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_RFO", IAP_EVENT_B0H_04H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ALL_DATA_RD", IAP_EVENT_B0H_08H)	\
-__PMC_EV_ALIAS("UOPS_EXECUTED.CORE", IAP_EVENT_B1H_02H)			\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_0", IAP_EVENT_B7H_01H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_1", IAP_EVENT_BBH_01H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.DTLB_L1", IAP_EVENT_BCH_11H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.ITLB_L1", IAP_EVENT_BCH_21H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.DTLB_L2", IAP_EVENT_BCH_12H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.ITLB_L2", IAP_EVENT_BCH_22H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.DTLB_L3", IAP_EVENT_BCH_14H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.ITLB_L3", IAP_EVENT_BCH_24H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.DTLB_MEMORY", IAP_EVENT_BCH_18H)	\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.ITLB_MEMORY", IAP_EVENT_BCH_28H)	\
-__PMC_EV_ALIAS("TLB_FLUSH.DTLB_THREAD", IAP_EVENT_BDH_01H)		\
-__PMC_EV_ALIAS("TLB_FLUSH.STLB_ANY", IAP_EVENT_BDH_20H)			\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P", IAP_EVENT_C0H_00H)			\
-__PMC_EV_ALIAS("INST_RETIRED.PREC_DIST", IAP_EVENT_C0H_01H)			\
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_TO_SSE", IAP_EVENT_C1H_08H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.SSE_TO_AVX", IAP_EVENT_C1H_10H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.ANY_WB_ASSIST", IAP_EVENT_C1H_40H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.ALL", IAP_EVENT_C2H_01H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.RETIRE_SLOTS", IAP_EVENT_C2H_02H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MEMORY_ORDERING", IAP_EVENT_C3H_02H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC", IAP_EVENT_C3H_04H)			\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MASKMOV", IAP_EVENT_C3H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_00H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.CONDITIONAL", IAP_EVENT_C4H_01H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_CALL", IAP_EVENT_C4H_02H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_04H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_RETURN", IAP_EVENT_C4H_08H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NOT_TAKEN", IAP_EVENT_C4H_10H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_TAKEN", IAP_EVENT_C4H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.FAR_BRANCH", IAP_EVENT_C4H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_00H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_01H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_04H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NEAR_TAKEN", IAP_EVENT_C5H_20H)	\
-__PMC_EV_ALIAS("FP_ASSIST.X87_OUTPUT", IAP_EVENT_CAH_02H)		\
-__PMC_EV_ALIAS("FP_ASSIST.X87_INPUT", IAP_EVENT_CAH_04H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_OUTPUT", IAP_EVENT_CAH_08H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_INPUT", IAP_EVENT_CAH_10H)		\
-__PMC_EV_ALIAS("FP_ASSIST.ANY", IAP_EVENT_CAH_1EH)			\
-__PMC_EV_ALIAS("ROB_MISC_EVENTS.LBR_INSERTS", IAP_EVENT_CCH_20H)	\
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.LOAD_LATENCY", IAP_EVENT_CDH_01H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOADS", IAP_EVENT_D0H_01H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STORES", IAP_EVENT_D0H_02H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STLB_MISS", IAP_EVENT_D0H_10H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOCK", IAP_EVENT_D0H_20H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT", IAP_EVENT_D0H_40H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_LOADS", IAP_EVENT_D0H_41H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_STORES", IAP_EVENT_D0H_42H)     	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL", IAP_EVENT_D0H_80H)		\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_HIT", IAP_EVENT_D1H_01H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_HIT", IAP_EVENT_D1H_02H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.LLC_HIT", IAP_EVENT_D1H_04H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_MISS", IAP_EVENT_D1H_08H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_MISS", IAP_EVENT_D1H_10H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L3_MISS", IAP_EVENT_D1H_20H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.HIT_LFB", IAP_EVENT_D1H_40H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS",		\
-    IAP_EVENT_D2H_01H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT",		\
-    IAP_EVENT_D2H_02H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM",		\
-    IAP_EVENT_D2H_04H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE",		\
-    IAP_EVENT_D2H_08H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.ALL",			\
-    IAP_EVENT_D2H_0FH)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM",		\
-    IAP_EVENT_D3H_01H)							\
-__PMC_EV_ALIAS("BACLEARS.ANY", IAP_EVENT_E6H_1FH)			\
-__PMC_EV_ALIAS("L2_TRANS.DEMAND_DATA_RD", IAP_EVENT_F0H_01H)		\
-__PMC_EV_ALIAS("L2_TRANS.RFO", IAP_EVENT_F0H_02H)			\
-__PMC_EV_ALIAS("L2_TRANS.CODE_RD", IAP_EVENT_F0H_04H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_PF", IAP_EVENT_F0H_08H)			\
-__PMC_EV_ALIAS("L2_TRANS.L1D_WB", IAP_EVENT_F0H_10H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_FILL", IAP_EVENT_F0H_20H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_WB", IAP_EVENT_F0H_40H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_REQUESTS", IAP_EVENT_F0H_80H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.I", IAP_EVENT_F1H_01H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.S", IAP_EVENT_F1H_02H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.E", IAP_EVENT_F1H_04H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.ALL", IAP_EVENT_F1H_07H)			\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_05H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_06H)
-
-
-#define __PMC_EV_ALIAS_HASWELL()					\
-__PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)		 	\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.STORES", IAP_EVENT_05H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS_PARTIAL.ADDRESS_ALIAS", IAP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_08H_01H)\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED_4K", IAP_EVENT_08H_02H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED_2M_4K",			\
-    IAP_EVENT_08H_04H)							\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_0EH)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_DURATION", IAP_EVENT_08H_10H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT_4K", IAP_EVENT_08H_20H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT_2M", IAP_EVENT_08H_40H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_08H_60H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.PDE_CACHE_MISS", IAP_EVENT_08H_80H)	\
-__PMC_EV_ALIAS("INT_MISC.RECOVERY_CYCLES", IAP_EVENT_0DH_03H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.ANY", IAP_EVENT_0EH_01H)			\
-__PMC_EV_ALIAS("UOPS_ISSUED.FLAGS_MERGE", IAP_EVENT_0EH_10H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.SLOW_LEA", IAP_EVENT_0EH_20H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.SINGLE_MUL", IAP_EVENT_0EH_40H)		\
-__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_MISS", IAP_EVENT_24H_21H)	\
-__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_HIT", IAP_EVENT_24H_41H)	\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_DATA_RD", IAP_EVENT_24H_E1H)	\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_HIT", IAP_EVENT_24H_42H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_MISS", IAP_EVENT_24H_22H)			\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_RFO", IAP_EVENT_24H_E2H)			\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_HIT", IAP_EVENT_24H_44H)		\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_MISS", IAP_EVENT_24H_24H)		\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_MISS", IAP_EVENT_24H_27H)		\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_REFERENCES", IAP_EVENT_24H_E7H)	\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_CODE_RD", IAP_EVENT_24H_E4H)		\
-__PMC_EV_ALIAS("L2_RQSTS.L2_PF_HIT", IAP_EVENT_24H_50H)			\
-__PMC_EV_ALIAS("L2_RQSTS.L2_PF_MISS", IAP_EVENT_24H_30H)		\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_PF", IAP_EVENT_24H_F8H)			\
-__PMC_EV_ALIAS("L2_RQSTS.MISS", IAP_EVENT_24H_3FH)			\
-__PMC_EV_ALIAS("L2_RQSTS.REFERENCES", IAP_EVENT_24H_FFH)		\
-__PMC_EV_ALIAS("L2_DEMAND_RQSTS.WB_HIT", IAP_EVENT_27H_50H)		\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.REFERENCE", IAP_EVENT_2EH_4FH)	\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.MISS", IAP_EVENT_2EH_41H)		\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.THREAD_P", IAP_EVENT_3CH_00H)		\
-__PMC_EV_ALIAS("CPU_CLK_THREAD_UNHALTED.REF_XCLK", IAP_EVENT_3CH_01H)	\
-__PMC_EV_ALIAS("L1D_PEND_MISS.PENDING", IAP_EVENT_48H_01H)		\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.MISS_CAUSES_A_WALK",			\
-    IAP_EVENT_49H_01H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED_4K",			\
-    IAP_EVENT_49H_02H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED_2M_4M",		\
-    IAP_EVENT_49H_04H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED", IAP_EVENT_49H_0EH)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_DURATION", IAP_EVENT_49H_10H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT_4K", IAP_EVENT_49H_20H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT_2M", IAP_EVENT_49H_40H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT", IAP_EVENT_49H_60H)		\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.PDE_CACHE_MISS", IAP_EVENT_49H_80H)	\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.SW_PF", IAP_EVENT_4CH_01H)			\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.HW_PF", IAP_EVENT_4CH_02H)			\
-__PMC_EV_ALIAS("L1D.REPLACEMENT", IAP_EVENT_51H_01H)			\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.INT_NOT_ELIMINATED",			\
-    IAP_EVENT_58H_04H)							\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.SMID_NOT_ELIMINATED",			\
-    IAP_EVENT_58H_08H)							\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.INT_ELIMINATED", IAP_EVENT_58H_01H)	\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.SMID_ELIMINATED", IAP_EVENT_58H_02H)	\
-__PMC_EV_ALIAS("CPL_CYCLES.RING0", IAP_EVENT_5CH_02H)			\
-__PMC_EV_ALIAS("CPL_CYCLES.RING123", IAP_EVENT_5CH_01H)			\
-__PMC_EV_ALIAS("RS_EVENTS.EMPTY_CYCLES", IAP_EVENT_5EH_01H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD",		\
-    IAP_EVENT_60H_01H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CORE_RD",		\
-    IAP_EVENT_60H_02H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO",		\
-    IAP_EVENT_60H_04H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD",		\
-    IAP_EVENT_60H_08H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION",		\
-    IAP_EVENT_63H_01H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.CACHE_LOCK_DURATION", IAP_EVENT_63H_02H)	\
-__PMC_EV_ALIAS("IDQ.EMPTY", IAP_EVENT_79H_02H)				\
-__PMC_EV_ALIAS("IDQ.MITE_UOPS", IAP_EVENT_79H_04H)			\
-__PMC_EV_ALIAS("IDQ.DSB_UOPS", IAP_EVENT_79H_08H)			\
-__PMC_EV_ALIAS("IDQ.MS_DSB_UOPS", IAP_EVENT_79H_10H)			\
-__PMC_EV_ALIAS("IDQ.MS_MITE_UOPS", IAP_EVENT_79H_20H)			\
-__PMC_EV_ALIAS("IDQ.MS_UOPS", IAP_EVENT_79H_30H)			\
-__PMC_EV_ALIAS("IDQ.ALL_DSB_CYCLES_ANY_UOPS", IAP_EVENT_79H_18H)	\
-__PMC_EV_ALIAS("IDQ.ALL_DSB_CYCLES_4_UOPS", IAP_EVENT_79H_18H)		\
-__PMC_EV_ALIAS("IDQ.ALL_MITE_CYCLES_ANY_UOPS", IAP_EVENT_79H_24H)	\
-__PMC_EV_ALIAS("IDQ.ALL_MITE_CYCLES_4_UOPS", IAP_EVENT_79H_24H)		\
-__PMC_EV_ALIAS("IDQ.MITE_ALL_UOPS", IAP_EVENT_79H_3CH)			\
-__PMC_EV_ALIAS("ICACHE.MISSES", IAP_EVENT_80H_02H)			\
-__PMC_EV_ALIAS("ITLB_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_85H_01H)	\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED_4K", IAP_EVENT_85H_02H)	\
-__PMC_EV_ALIAS("TLB_MISSES.WALK_COMPLETED_2M_4M", IAP_EVENT_85H_04H)	\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED", IAP_EVENT_85H_0EH)		\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_DURATION", IAP_EVENT_85H_10H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT_4K", IAP_EVENT_85H_20H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT_2M", IAP_EVENT_85H_40H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT", IAP_EVENT_85H_60H)		\
-__PMC_EV_ALIAS("ILD_STALL.LCP", IAP_EVENT_87H_01H)			\
-__PMC_EV_ALIAS("ILD_STALL.IQ_FULL", IAP_EVENT_87H_04H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.COND", IAP_EVENT_88H_01H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_JMP", IAP_EVENT_88H_02H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_88H_04H)							\
-__PMC_EV_ALIAS("BR_INST_EXEC.RETURN_NEAR", IAP_EVENT_88H_08H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_88H_10H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_88H_20H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.NONTAKEN", IAP_EVENT_88H_40H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.TAKEN", IAP_EVENT_88H_80H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.ALL_BRANCHES", IAP_EVENT_88H_FFH)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.COND", IAP_EVENT_89H_01H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_89H_04H)							\
-__PMC_EV_ALIAS("BR_MISP_EXEC.RETURN_NEAR", IAP_EVENT_89H_08H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_89H_10H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_89H_20H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.NONTAKEN", IAP_EVENT_89H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.TAKEN", IAP_EVENT_89H_80H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.ALL_BRANCHES", IAP_EVENT_89H_FFH)		\
-__PMC_EV_ALIAS("IDQ_UOPS_NOT_DELIVERED.CORE", IAP_EVENT_9CH_01H)	\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_0", IAP_EVENT_A1H_01H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_1", IAP_EVENT_A1H_02H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_2", IAP_EVENT_A1H_04H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_3", IAP_EVENT_A1H_08H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_4", IAP_EVENT_A1H_10H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_5", IAP_EVENT_A1H_20H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_6", IAP_EVENT_A1H_40H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED_PORT.PORT_7", IAP_EVENT_A1H_80H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY", IAP_EVENT_A2H_01H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.RS", IAP_EVENT_A2H_04H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.SB", IAP_EVENT_A2H_08H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB", IAP_EVENT_A2H_10H)		\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L2_PENDING", IAP_EVENT_A3H_01H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_LDM_PENDING", IAP_EVENT_A3H_02H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.STALLS_L2_PENDING", IAP_EVENT_A3H_05H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L1D_PENDING", IAP_EVENT_A3H_08H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.STALLS_L1D_PENDING", IAP_EVENT_A3H_0CH)	\
-__PMC_EV_ALIAS("LSD.UOPS", IAP_EVENT_A8H_01H)				\
-__PMC_EV_ALIAS("ITLB.ITLB_FLUSH", IAP_EVENT_AEH_01H)			\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_DATA_RD", IAP_EVENT_B0H_01H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_CODE_RD", IAP_EVENT_B0H_02H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_RFO", IAP_EVENT_B0H_04H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ALL_DATA_RD", IAP_EVENT_B0H_08H)	\
-__PMC_EV_ALIAS("UOPS_EXECUTED.CORE", IAP_EVENT_B1H_02H)			\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_0", IAP_EVENT_B7H_01H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_1", IAP_EVENT_BBH_01H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.DTLB_L1", IAP_EVENT_BCH_11H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.ITLB_L1", IAP_EVENT_BCH_21H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.DTLB_L2", IAP_EVENT_BCH_12H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.ITLB_L2", IAP_EVENT_BCH_22H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.DTLB_L3", IAP_EVENT_BCH_14H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.ITLB_L3", IAP_EVENT_BCH_24H)		\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.DTLB_MEMORY", IAP_EVENT_BCH_18H)	\
-__PMC_EV_ALIAS("PAGE_WALKER_LOADS.ITLB_MEMORY", IAP_EVENT_BCH_28H)	\
-__PMC_EV_ALIAS("TLB_FLUSH.DTLB_THREAD", IAP_EVENT_BDH_01H)		\
-__PMC_EV_ALIAS("TLB_FLUSH.STLB_ANY", IAP_EVENT_BDH_20H)			\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P", IAP_EVENT_C0H_00H)			\
-__PMC_EV_ALIAS("INST_RETIRED.PREC_DIST", IAP_EVENT_C0H_01H)			\
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_TO_SSE", IAP_EVENT_C1H_08H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.SSE_TO_AVX", IAP_EVENT_C1H_10H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.ANY_WB_ASSIST", IAP_EVENT_C1H_40H)	\
-__PMC_EV_ALIAS("UOPS_RETIRED.ALL", IAP_EVENT_C2H_01H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.RETIRE_SLOTS", IAP_EVENT_C2H_02H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MEMORY_ORDERING", IAP_EVENT_C3H_02H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC", IAP_EVENT_C3H_04H)			\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MASKMOV", IAP_EVENT_C3H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_00H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.CONDITIONAL", IAP_EVENT_C4H_01H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_CALL", IAP_EVENT_C4H_02H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_04H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_RETURN", IAP_EVENT_C4H_08H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NOT_TAKEN", IAP_EVENT_C4H_10H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_TAKEN", IAP_EVENT_C4H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.FAR_BRANCH", IAP_EVENT_C4H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_00H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_01H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_04H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NEAR_TAKEN", IAP_EVENT_C5H_20H)	\
-__PMC_EV_ALIAS("FP_ASSIST.X87_OUTPUT", IAP_EVENT_CAH_02H)		\
-__PMC_EV_ALIAS("FP_ASSIST.X87_INPUT", IAP_EVENT_CAH_04H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_OUTPUT", IAP_EVENT_CAH_08H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_INPUT", IAP_EVENT_CAH_10H)		\
-__PMC_EV_ALIAS("FP_ASSIST.ANY", IAP_EVENT_CAH_1EH)			\
-__PMC_EV_ALIAS("ROB_MISC_EVENTS.LBR_INSERTS", IAP_EVENT_CCH_20H)	\
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.LOAD_LATENCY", IAP_EVENT_CDH_01H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOADS", IAP_EVENT_D0H_01H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STORES", IAP_EVENT_D0H_02H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STLB_MISS", IAP_EVENT_D0H_10H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOCK", IAP_EVENT_D0H_20H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT", IAP_EVENT_D0H_40H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_LOADS", IAP_EVENT_D0H_41H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_STORES", IAP_EVENT_D0H_42H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL", IAP_EVENT_D0H_80H)		\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_HIT", IAP_EVENT_D1H_01H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_HIT", IAP_EVENT_D1H_02H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.LLC_HIT", IAP_EVENT_D1H_04H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_MISS", IAP_EVENT_D1H_08H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_MISS", IAP_EVENT_D1H_10H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L3_MISS", IAP_EVENT_D1H_20H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.HIT_LFB", IAP_EVENT_D1H_40H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS",		\
-    IAP_EVENT_D2H_01H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT",		\
-    IAP_EVENT_D2H_02H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM",		\
-    IAP_EVENT_D2H_04H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE",		\
-    IAP_EVENT_D2H_08H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.ALL",			\
-    IAP_EVENT_D2H_0FH)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM",		\
-    IAP_EVENT_D3H_01H)							\
-__PMC_EV_ALIAS("BACLEARS.ANY", IAP_EVENT_E6H_1FH)			\
-__PMC_EV_ALIAS("L2_TRANS.DEMAND_DATA_RD", IAP_EVENT_F0H_01H)		\
-__PMC_EV_ALIAS("L2_TRANS.RFO", IAP_EVENT_F0H_02H)			\
-__PMC_EV_ALIAS("L2_TRANS.CODE_RD", IAP_EVENT_F0H_04H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_PF", IAP_EVENT_F0H_08H)			\
-__PMC_EV_ALIAS("L2_TRANS.L1D_WB", IAP_EVENT_F0H_10H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_FILL", IAP_EVENT_F0H_20H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_WB", IAP_EVENT_F0H_40H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_REQUESTS", IAP_EVENT_F0H_80H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.I", IAP_EVENT_F1H_01H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.S", IAP_EVENT_F1H_02H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.E", IAP_EVENT_F1H_04H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.ALL", IAP_EVENT_F1H_07H)			\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_05H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_06H)
-
-
-#define __PMC_EV_ALIAS_IVYBRIDGE()					\
-__PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)		 	\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.STORES", IAP_EVENT_05H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS_PARTIAL.ADDRESS_ALIAS", IAP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("INT_MISC.RECOVERY_CYCLES", IAP_EVENT_0DH_03H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_08H_81H)\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_82H)    \
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_DURATION", IAP_EVENT_08H_84H)    	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.LARGE_PG_WALK_DURATION", 		\
-	       IAP_EVENT_08H_88H)					\
-__PMC_EV_ALIAS("UOPS_ISSUED.ANY", IAP_EVENT_0EH_01H)			\
-__PMC_EV_ALIAS("UOPS_ISSUED.FLAGS_MERGE", IAP_EVENT_0EH_10H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.SLOW_LEA", IAP_EVENT_0EH_20H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.SINGLE_MUL", IAP_EVENT_0EH_40H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.X87", IAP_EVENT_10H_01H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_PACKED_DOUBLE", 			\
-	       IAP_EVENT_10H_10H)					\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_SCALAR_SINGLE", 			\
-	       IAP_EVENT_10H_20H)					\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_PACKED_SINGLE", IAP_EVENT_10H_40H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_SCALAR_DOUBLE", IAP_EVENT_10H_80H)	\
-__PMC_EV_ALIAS("SIMD_FP_256.PACKED_SINGLE", IAP_EVENT_11H_01H)		\
-__PMC_EV_ALIAS("SIMD_FP_256.PACKED_DOUBLE", IAP_EVENT_11H_02H)		\
-__PMC_EV_ALIAS("ARITH.FPU_DIV_ACTIVE", IAP_EVENT_14H_01H)		\
-__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_HIT", IAP_EVENT_24H_01H)	\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_DATA_RD", IAP_EVENT_24H_03H)	\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_HITS", IAP_EVENT_24H_04H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_MISS", IAP_EVENT_24H_08H)			\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_RFO", IAP_EVENT_24H_0CH)			\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_HIT", IAP_EVENT_24H_10H)		\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_MISS", IAP_EVENT_24H_20H)		\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_CODE_RD", IAP_EVENT_24H_30H)		\
-__PMC_EV_ALIAS("L2_RQSTS.PF_HIT", IAP_EVENT_24H_40H)			\
-__PMC_EV_ALIAS("L2_RQSTS.PF_MISS", IAP_EVENT_24H_80H)			\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_PF", IAP_EVENT_24H_C0H)			\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.MISS", IAP_EVENT_27H_01H)		\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.HIT_M", IAP_EVENT_27H_08H)		\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.ALL", IAP_EVENT_27H_0FH)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.MISS", IAP_EVENT_28H_01H)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.HIT_E", IAP_EVENT_28H_04H)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.HIT_M", IAP_EVENT_28H_08H)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.ALL", IAP_EVENT_28H_0FH)		\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.REFERENCE", IAP_EVENT_2EH_4FH)	\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.MISS", IAP_EVENT_2EH_41H)		\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.THREAD_P", IAP_EVENT_3CH_00H)		\
-__PMC_EV_ALIAS("CPU_CLK_THREAD_UNHALTED.REF_XCLK", IAP_EVENT_3CH_01H)	\
-__PMC_EV_ALIAS("L1D_PEND_MISS.PENDING", IAP_EVENT_48H_01H)		\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.MISS_CAUSES_A_WALK",			\
-    IAP_EVENT_49H_01H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED", IAP_EVENT_49H_02H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_DURATION", IAP_EVENT_49H_04H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT", IAP_EVENT_49H_10H)		\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.SW_PF", IAP_EVENT_4CH_01H)			\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.HW_PF", IAP_EVENT_4CH_02H)			\
-__PMC_EV_ALIAS("L1D.REPLACEMENT", IAP_EVENT_51H_01H)			\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.INT_NOT_ELIMINATED",			\
-    IAP_EVENT_58H_01H)							\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.SIMD_NOT_ELIMINATED",			\
-    IAP_EVENT_58H_02H)							\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.INT_ELIMINATED", IAP_EVENT_58H_04H)	\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.SIMD_ELIMINATED", IAP_EVENT_58H_08H)	\
-__PMC_EV_ALIAS("CPL_CYCLES.RING0", IAP_EVENT_5CH_01H)			\
-__PMC_EV_ALIAS("CPL_CYCLES.RING123", IAP_EVENT_5CH_02H)			\
-__PMC_EV_ALIAS("RS_EVENTS.EMPTY_CYCLES", IAP_EVENT_5EH_01H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_5FH_04H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD",		\
-    IAP_EVENT_60H_01H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CODE_RD",		\
-    IAP_EVENT_60H_02H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO",		\
-    IAP_EVENT_60H_04H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD",		\
-    IAP_EVENT_60H_08H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION",		\
-    IAP_EVENT_63H_01H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.CACHE_LOCK_DURATION", IAP_EVENT_63H_02H)	\
-__PMC_EV_ALIAS("IDQ.EMPTY", IAP_EVENT_79H_02H)				\
-__PMC_EV_ALIAS("IDQ.MITE_UOPS", IAP_EVENT_79H_04H)			\
-__PMC_EV_ALIAS("IDQ.DSB_UOPS", IAP_EVENT_79H_08H)			\
-__PMC_EV_ALIAS("IDQ.MS_DSB_UOPS", IAP_EVENT_79H_10H)			\
-__PMC_EV_ALIAS("IDQ.MS_MITE_UOPS", IAP_EVENT_79H_20H)			\
-__PMC_EV_ALIAS("IDQ.MS_UOPS", IAP_EVENT_79H_30H)			\
-__PMC_EV_ALIAS("IDQ.ALL_DSB_CYCLES_ANY_UOPS", IAP_EVENT_79H_18H)	\
-__PMC_EV_ALIAS("IDQ.ALL_DSB_CYCLES_4_UOPS", IAP_EVENT_79H_18H)		\
-__PMC_EV_ALIAS("IDQ.ALL_MITE_CYCLES_ANY_UOPS", IAP_EVENT_79H_24H)	\
-__PMC_EV_ALIAS("IDQ.ALL_MITE_CYCLES_4_UOPS", IAP_EVENT_79H_24H)		\
-__PMC_EV_ALIAS("IDQ.MITE_ALL_UOPS", IAP_EVENT_79H_3CH)			\
-__PMC_EV_ALIAS("ICACHE.MISSES", IAP_EVENT_80H_02H)			\
-__PMC_EV_ALIAS("ICACHE.IFETCH_STALL", IAP_EVENT_80H_04H)	 	\
-__PMC_EV_ALIAS("ITLB_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_85H_01H)	\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED", IAP_EVENT_85H_02H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_DURATION", IAP_EVENT_85H_04H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT", IAP_EVENT_85H_10H)		\
-__PMC_EV_ALIAS("ILD_STALL.LCP", IAP_EVENT_87H_01H)			\
-__PMC_EV_ALIAS("ILD_STALL.IQ_FULL", IAP_EVENT_87H_04H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.COND", IAP_EVENT_88H_01H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_JMP", IAP_EVENT_88H_02H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_88H_04H)							\
-__PMC_EV_ALIAS("BR_INST_EXEC.RETURN_NEAR", IAP_EVENT_88H_08H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_88H_10H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_88H_20H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.NONTAKEN", IAP_EVENT_88H_40H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.TAKEN", IAP_EVENT_88H_80H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.ALL_BRANCHES", IAP_EVENT_88H_FFH)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.COND", IAP_EVENT_89H_01H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_89H_04H)							\
-__PMC_EV_ALIAS("BR_MISP_EXEC.RETURN_NEAR", IAP_EVENT_89H_08H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_89H_10H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_89H_20H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.NONTAKEN", IAP_EVENT_89H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.TAKEN", IAP_EVENT_89H_80H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.ALL_BRANCHES", IAP_EVENT_89H_FFH)		\
-__PMC_EV_ALIAS("IDQ_UOPS_NOT_DELIVERED.CORE", IAP_EVENT_9CH_01H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_0", IAP_EVENT_A1H_01H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_1", IAP_EVENT_A1H_02H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2_LD", IAP_EVENT_A1H_04H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2_STA", IAP_EVENT_A1H_08H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2", IAP_EVENT_A1H_0CH)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3_LD", IAP_EVENT_A1H_10H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3_STA", IAP_EVENT_A1H_20H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3", IAP_EVENT_A1H_30H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_4", IAP_EVENT_A1H_40H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_5", IAP_EVENT_A1H_80H)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY", IAP_EVENT_A2H_01H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.RS", IAP_EVENT_A2H_04H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.SB", IAP_EVENT_A2H_08H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB", IAP_EVENT_A2H_10H)		\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L2_PENDING", IAP_EVENT_A3H_01H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_LDM_PENDING", IAP_EVENT_A3H_02H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_NO_EXECUTE", IAP_EVENT_A3H_04H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L1D_PENDING", IAP_EVENT_A3H_08H)	\
-__PMC_EV_ALIAS("LSD.UOPS", IAP_EVENT_A8H_01H)				\
-__PMC_EV_ALIAS("DSB2MITE_SWITCHES.COUNT", IAP_EVENT_ABH_01H)		\
-__PMC_EV_ALIAS("DSB2MITE_SWITCHES.PENALTY_CYCLES", IAP_EVENT_ABH_02H)	\
-__PMC_EV_ALIAS("DSB_FILL.EXCEED_DSB_LINES", IAP_EVENT_ACH_08H)		\
-__PMC_EV_ALIAS("ITLB.ITLB_FLUSH", IAP_EVENT_AEH_01H)			\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_DATA_RD", IAP_EVENT_B0H_01H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_CODE_RD", IAP_EVENT_B0H_02H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_RFO", IAP_EVENT_B0H_04H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ALL_DATA_RD", IAP_EVENT_B0H_08H)	\
-__PMC_EV_ALIAS("UOPS_EXECUTED.THREAD", IAP_EVENT_B1H_01H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.CORE", IAP_EVENT_B1H_02H)			\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_0", IAP_EVENT_B7H_01H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_1", IAP_EVENT_BBH_01H)		\
-__PMC_EV_ALIAS("TLB_FLUSH.DTLB_THREAD", IAP_EVENT_BDH_01H)		\
-__PMC_EV_ALIAS("TLB_FLUSH.STLB_ANY", IAP_EVENT_BDH_20H)			\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P", IAP_EVENT_C0H_00H)			\
-__PMC_EV_ALIAS("INST_RETIRED.ALL", IAP_EVENT_C0H_01H)			\
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_STORE", IAP_EVENT_C1H_08H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_TO_SSE", IAP_EVENT_C1H_10H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.SSE_TO_AVX", IAP_EVENT_C1H_20H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.WB", IAP_EVENT_C1H_80H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.ALL", IAP_EVENT_C2H_01H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.RETIRE_SLOTS", IAP_EVENT_C2H_02H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MEMORY_ORDERING", IAP_EVENT_C3H_02H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC", IAP_EVENT_C3H_04H)			\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MASKMOV", IAP_EVENT_C3H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_00H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.CONDITIONAL", IAP_EVENT_C4H_01H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_CALL", IAP_EVENT_C4H_02H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_04H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_RETURN", IAP_EVENT_C4H_08H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NOT_TAKEN", IAP_EVENT_C4H_10H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_TAKEN", IAP_EVENT_C4H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.FAR_BRANCH", IAP_EVENT_C4H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_00H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_01H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NEAR_CALL", IAP_EVENT_C5H_02H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_04H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NOT_TAKEN", IAP_EVENT_C5H_10H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.TAKEN", IAP_EVENT_C5H_20H)		\
-__PMC_EV_ALIAS("FP_ASSIST.X87_OUTPUT", IAP_EVENT_CAH_02H)		\
-__PMC_EV_ALIAS("FP_ASSIST.X87_INPUT", IAP_EVENT_CAH_04H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_OUTPUT", IAP_EVENT_CAH_08H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_INPUT", IAP_EVENT_CAH_10H)		\
-__PMC_EV_ALIAS("FP_ASSIST.ANY", IAP_EVENT_CAH_1EH)			\
-__PMC_EV_ALIAS("ROB_MISC_EVENTS.LBR_INSERTS", IAP_EVENT_CCH_20H)	\
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.LOAD_LATENCY", IAP_EVENT_CDH_01H)	\
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.PRECISE_STORE", IAP_EVENT_CDH_02H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOADS", IAP_EVENT_D0H_01H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STORES", IAP_EVENT_D0H_02H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STLB_MISS", IAP_EVENT_D0H_10H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOCK", IAP_EVENT_D0H_20H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT", IAP_EVENT_D0H_40H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_STORES", IAP_EVENT_D0H_42H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL", IAP_EVENT_D0H_80H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL_LOADS", IAP_EVENT_D0H_81H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL_STORES", IAP_EVENT_D0H_82H)		\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_HIT", IAP_EVENT_D1H_01H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_HIT", IAP_EVENT_D1H_02H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.LLC_HIT", IAP_EVENT_D1H_04H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_MISS", IAP_EVENT_D1H_08H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_MISS", IAP_EVENT_D1H_10H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.LLC_MISS", IAP_EVENT_D1H_20H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.HIT_LFB", IAP_EVENT_D1H_40H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS",		\
-    IAP_EVENT_D2H_01H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT",		\
-    IAP_EVENT_D2H_02H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM",		\
-    IAP_EVENT_D2H_04H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE",		\
-    IAP_EVENT_D2H_08H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.ALL",			\
-    IAP_EVENT_D2H_0FH)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM",		\
-    IAP_EVENT_D3H_01H)							\
-__PMC_EV_ALIAS("BACLEARS.ANY", IAP_EVENT_E6H_1FH)			\
-__PMC_EV_ALIAS("L2_TRANS.DEMAND_DATA_RD", IAP_EVENT_F0H_01H)		\
-__PMC_EV_ALIAS("L2_TRANS.RFO", IAP_EVENT_F0H_02H)			\
-__PMC_EV_ALIAS("L2_TRANS.CODE_RD", IAP_EVENT_F0H_04H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_PF", IAP_EVENT_F0H_08H)			\
-__PMC_EV_ALIAS("L2_TRANS.L1D_WB", IAP_EVENT_F0H_10H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_FILL", IAP_EVENT_F0H_20H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_WB", IAP_EVENT_F0H_40H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_REQUESTS", IAP_EVENT_F0H_80H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.I", IAP_EVENT_F1H_01H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.S", IAP_EVENT_F1H_02H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.E", IAP_EVENT_F1H_04H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.ALL", IAP_EVENT_F1H_07H)			\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_01H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_02H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.PF_CLEAN", IAP_EVENT_F2H_04H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.PF_DIRTY", IAP_EVENT_F2H_08H)
-
-/*
- * Aliases for Ivy Bridge Xeon PMC events (325462-045US January 2013)
- */
-#define __PMC_EV_ALIAS_IVYBRIDGE_XEON()					\
-__PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)	 		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.STORES", IAP_EVENT_05H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS_PARTIAL.ADDRESS_ALIAS", IAP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("INT_MISC.RECOVERY_CYCLES", IAP_EVENT_0DH_03H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_08H_81H)\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_82H)    \
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_DURATION", IAP_EVENT_08H_84H)    	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.LARGE_PG_WALK_DURATION",		 \
-	       IAP_EVENT_08H_88H)					\
-__PMC_EV_ALIAS("UOPS_ISSUED.ANY", IAP_EVENT_0EH_01H)			\
-__PMC_EV_ALIAS("UOPS_ISSUED.FLAGS_MERGE", IAP_EVENT_0EH_10H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.SLOW_LEA", IAP_EVENT_0EH_20H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.SINGLE_MUL", IAP_EVENT_0EH_40H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.X87", IAP_EVENT_10H_01H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_PACKED_DOUBLE", 			\
-	       IAP_EVENT_10H_10H)					\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_SCALAR_SINGLE", 			\
-	       IAP_EVENT_10H_20H)					\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_PACKED_SINGLE", IAP_EVENT_10H_40H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_SCALAR_DOUBLE", IAP_EVENT_10H_80H)	\
-__PMC_EV_ALIAS("SIMD_FP_256.PACKED_SINGLE", IAP_EVENT_11H_01H)		\
-__PMC_EV_ALIAS("SIMD_FP_256.PACKED_DOUBLE", IAP_EVENT_11H_02H)		\
-__PMC_EV_ALIAS("ARITH.FPU_DIV_ACTIVE", IAP_EVENT_14H_01H)		\
-__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_HIT", IAP_EVENT_24H_01H)	\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_DATA_RD", IAP_EVENT_24H_03H)	\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_HITS", IAP_EVENT_24H_04H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_MISS", IAP_EVENT_24H_08H)			\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_RFO", IAP_EVENT_24H_0CH)			\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_HIT", IAP_EVENT_24H_10H)		\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_MISS", IAP_EVENT_24H_20H)		\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_CODE_RD", IAP_EVENT_24H_30H)		\
-__PMC_EV_ALIAS("L2_RQSTS.PF_HIT", IAP_EVENT_24H_40H)			\
-__PMC_EV_ALIAS("L2_RQSTS.PF_MISS", IAP_EVENT_24H_80H)			\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_PF", IAP_EVENT_24H_C0H)			\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.MISS", IAP_EVENT_27H_01H)		\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.HIT_M", IAP_EVENT_27H_08H)		\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.ALL", IAP_EVENT_27H_0FH)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.MISS", IAP_EVENT_28H_01H)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.HIT_E", IAP_EVENT_28H_04H)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.HIT_M", IAP_EVENT_28H_08H)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.ALL", IAP_EVENT_28H_0FH)		\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.REFERENCE", IAP_EVENT_2EH_4FH)	\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.MISS", IAP_EVENT_2EH_41H)		\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.THREAD_P", IAP_EVENT_3CH_00H)		\
-__PMC_EV_ALIAS("CPU_CLK_THREAD_UNHALTED.REF_XCLK", IAP_EVENT_3CH_01H)	\
-__PMC_EV_ALIAS("L1D_PEND_MISS.PENDING", IAP_EVENT_48H_01H)		\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.MISS_CAUSES_A_WALK",			\
-    IAP_EVENT_49H_01H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED", IAP_EVENT_49H_02H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_DURATION", IAP_EVENT_49H_04H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT", IAP_EVENT_49H_10H)		\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.SW_PF", IAP_EVENT_4CH_01H)			\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.HW_PF", IAP_EVENT_4CH_02H)			\
-__PMC_EV_ALIAS("L1D.REPLACEMENT", IAP_EVENT_51H_01H)			\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.INT_NOT_ELIMINATED", IAP_EVENT_58H_01H)\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.SIMD_NOT_ELIMINATED",			\
-    IAP_EVENT_58H_02H)							\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.INT_ELIMINATED", IAP_EVENT_58H_04H)	\
-__PMC_EV_ALIAS("MOVE_ELIMINATION.SIMD_ELIMINATED", IAP_EVENT_58H_08H)	\
-__PMC_EV_ALIAS("CPL_CYCLES.RING0", IAP_EVENT_5CH_01H)			\
-__PMC_EV_ALIAS("CPL_CYCLES.RING123", IAP_EVENT_5CH_02H)			\
-__PMC_EV_ALIAS("RS_EVENTS.EMPTY_CYCLES", IAP_EVENT_5EH_01H)		\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_5FH_04H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD",		\
-    IAP_EVENT_60H_01H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_CODE_RD",		\
-    IAP_EVENT_60H_02H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO",		\
-    IAP_EVENT_60H_04H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD",		\
-    IAP_EVENT_60H_08H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION",		\
-    IAP_EVENT_63H_01H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.CACHE_LOCK_DURATION", IAP_EVENT_63H_02H)	\
-__PMC_EV_ALIAS("IDQ.EMPTY", IAP_EVENT_79H_02H)				\
-__PMC_EV_ALIAS("IDQ.MITE_UOPS", IAP_EVENT_79H_04H)			\
-__PMC_EV_ALIAS("IDQ.DSB_UOPS", IAP_EVENT_79H_08H)			\
-__PMC_EV_ALIAS("IDQ.MS_DSB_UOPS", IAP_EVENT_79H_10H)			\
-__PMC_EV_ALIAS("IDQ.MS_MITE_UOPS", IAP_EVENT_79H_20H)			\
-__PMC_EV_ALIAS("IDQ.MS_UOPS", IAP_EVENT_79H_30H)			\
-__PMC_EV_ALIAS("IDQ.ALL_DSB_CYCLES_ANY_UOPS", IAP_EVENT_79H_18H)	\
-__PMC_EV_ALIAS("IDQ.ALL_DSB_CYCLES_4_UOPS", IAP_EVENT_79H_18H)		\
-__PMC_EV_ALIAS("IDQ.ALL_MITE_CYCLES_ANY_UOPS", IAP_EVENT_79H_24H)	\
-__PMC_EV_ALIAS("IDQ.ALL_MITE_CYCLES_4_UOPS", IAP_EVENT_79H_24H)		\
-__PMC_EV_ALIAS("IDQ.MITE_ALL_UOPS", IAP_EVENT_79H_3CH)			\
-__PMC_EV_ALIAS("ICACHE.MISSES", IAP_EVENT_80H_02H)			\
-__PMC_EV_ALIAS("ICACHE.IFETCH_STALL", IAP_EVENT_80H_04H)	 	\
-__PMC_EV_ALIAS("ITLB_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_85H_01H)	\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED", IAP_EVENT_85H_02H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_DURATION", IAP_EVENT_85H_04H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT", IAP_EVENT_85H_10H)		\
-__PMC_EV_ALIAS("ILD_STALL.LCP", IAP_EVENT_87H_01H)			\
-__PMC_EV_ALIAS("ILD_STALL.IQ_FULL", IAP_EVENT_87H_04H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.COND", IAP_EVENT_88H_01H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_JMP", IAP_EVENT_88H_02H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_88H_04H)							\
-__PMC_EV_ALIAS("BR_INST_EXEC.RETURN_NEAR", IAP_EVENT_88H_08H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_88H_10H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_88H_20H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.NONTAKEN", IAP_EVENT_88H_40H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.TAKEN", IAP_EVENT_88H_80H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.ALL_BRANCHES", IAP_EVENT_88H_FFH)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.COND", IAP_EVENT_89H_01H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_89H_04H)							\
-__PMC_EV_ALIAS("BR_MISP_EXEC.RETURN_NEAR", IAP_EVENT_89H_08H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_89H_10H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_89H_20H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.NONTAKEN", IAP_EVENT_89H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.TAKEN", IAP_EVENT_89H_80H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.ALL_BRANCHES", IAP_EVENT_89H_FFH)		\
-__PMC_EV_ALIAS("IDQ_UOPS_NOT_DELIVERED.CORE", IAP_EVENT_9CH_01H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_0", IAP_EVENT_A1H_01H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_1", IAP_EVENT_A1H_02H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2_LD", IAP_EVENT_A1H_04H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2_STA", IAP_EVENT_A1H_08H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2", IAP_EVENT_A1H_0CH)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3_LD", IAP_EVENT_A1H_10H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3_STA", IAP_EVENT_A1H_20H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3", IAP_EVENT_A1H_30H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_4", IAP_EVENT_A1H_40H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_5", IAP_EVENT_A1H_80H)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY", IAP_EVENT_A2H_01H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.RS", IAP_EVENT_A2H_04H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.SB", IAP_EVENT_A2H_08H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB", IAP_EVENT_A2H_10H)		\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L2_PENDING", IAP_EVENT_A3H_01H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_LDM_PENDING", IAP_EVENT_A3H_02H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_NO_EXECUTE", IAP_EVENT_A3H_04H)	\
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L1D_PENDING", IAP_EVENT_A3H_08H)	\
-__PMC_EV_ALIAS("LSD.UOPS", IAP_EVENT_A8H_01H)				\
-__PMC_EV_ALIAS("DSB2MITE_SWITCHES.COUNT", IAP_EVENT_ABH_01H)		\
-__PMC_EV_ALIAS("DSB2MITE_SWITCHES.PENALTY_CYCLES", IAP_EVENT_ABH_02H)	\
-__PMC_EV_ALIAS("DSB_FILL.EXCEED_DSB_LINES", IAP_EVENT_ACH_08H)		\
-__PMC_EV_ALIAS("ITLB.ITLB_FLUSH", IAP_EVENT_AEH_01H)			\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_DATA_RD", IAP_EVENT_B0H_01H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_CODE_RD", IAP_EVENT_B0H_02H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_RFO", IAP_EVENT_B0H_04H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ALL_DATA_RD", IAP_EVENT_B0H_08H)	\
-__PMC_EV_ALIAS("UOPS_EXECUTED.THREAD", IAP_EVENT_B1H_01H)		\
-__PMC_EV_ALIAS("UOPS_EXECUTED.CORE", IAP_EVENT_B1H_02H)			\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_0", IAP_EVENT_B7H_01H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_1", IAP_EVENT_BBH_01H)		\
-__PMC_EV_ALIAS("TLB_FLUSH.DTLB_THREAD", IAP_EVENT_BDH_01H)		\
-__PMC_EV_ALIAS("TLB_FLUSH.STLB_ANY", IAP_EVENT_BDH_20H)			\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P", IAP_EVENT_C0H_00H)			\
-__PMC_EV_ALIAS("INST_RETIRED.ALL", IAP_EVENT_C0H_01H)			\
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_STORE", IAP_EVENT_C1H_08H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_TO_SSE", IAP_EVENT_C1H_10H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.SSE_TO_AVX", IAP_EVENT_C1H_20H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.WB", IAP_EVENT_C1H_80H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.ALL", IAP_EVENT_C2H_01H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.RETIRE_SLOTS", IAP_EVENT_C2H_02H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MEMORY_ORDERING", IAP_EVENT_C3H_02H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC", IAP_EVENT_C3H_04H)			\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MASKMOV", IAP_EVENT_C3H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_00H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.CONDITIONAL", IAP_EVENT_C4H_01H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_CALL", IAP_EVENT_C4H_02H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_04H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_RETURN", IAP_EVENT_C4H_08H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NOT_TAKEN", IAP_EVENT_C4H_10H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_TAKEN", IAP_EVENT_C4H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.FAR_BRANCH", IAP_EVENT_C4H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_00H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_01H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NEAR_CALL", IAP_EVENT_C5H_02H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_04H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NOT_TAKEN", IAP_EVENT_C5H_10H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.TAKEN", IAP_EVENT_C5H_20H)		\
-__PMC_EV_ALIAS("FP_ASSIST.X87_OUTPUT", IAP_EVENT_CAH_02H)		\
-__PMC_EV_ALIAS("FP_ASSIST.X87_INPUT", IAP_EVENT_CAH_04H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_OUTPUT", IAP_EVENT_CAH_08H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_INPUT", IAP_EVENT_CAH_10H)		\
-__PMC_EV_ALIAS("FP_ASSIST.ANY", IAP_EVENT_CAH_1EH)			\
-__PMC_EV_ALIAS("ROB_MISC_EVENTS.LBR_INSERTS", IAP_EVENT_CCH_20H)	\
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.LOAD_LATENCY", IAP_EVENT_CDH_01H)	\
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.PRECISE_STORE", IAP_EVENT_CDH_02H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOADS", IAP_EVENT_D0H_01H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STORES", IAP_EVENT_D0H_02H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STLB_MISS", IAP_EVENT_D0H_10H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOCK", IAP_EVENT_D0H_20H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT", IAP_EVENT_D0H_40H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_STORES", IAP_EVENT_D0H_42H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL", IAP_EVENT_D0H_80H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL_LOADS", IAP_EVENT_D0H_81H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL_STORES", IAP_EVENT_D0H_82H)		\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_HIT", IAP_EVENT_D1H_01H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_HIT", IAP_EVENT_D1H_02H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.LLC_HIT", IAP_EVENT_D1H_04H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_MISS", IAP_EVENT_D1H_08H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_MISS", IAP_EVENT_D1H_10H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.LLC_MISS", IAP_EVENT_D1H_20H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.HIT_LFB", IAP_EVENT_D1H_40H) 	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS",		\
-    IAP_EVENT_D2H_01H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT",		\
-    IAP_EVENT_D2H_02H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM",		\
-    IAP_EVENT_D2H_04H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE",		\
-    IAP_EVENT_D2H_08H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM",		\
-    IAP_EVENT_D3H_01H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM", 		\
-    IAP_EVENT_D3H_03H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.REMOTE_DRAM",		\
-    IAP_EVENT_D3H_0CH)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.REMOTE_HITM",		\
-    IAP_EVENT_D3H_10H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.REMOTE_FWD",		\
-    IAP_EVENT_D3H_20H)							\
-__PMC_EV_ALIAS("BACLEARS.ANY", IAP_EVENT_E6H_1FH)			\
-__PMC_EV_ALIAS("L2_TRANS.DEMAND_DATA_RD", IAP_EVENT_F0H_01H)		\
-__PMC_EV_ALIAS("L2_TRANS.RFO", IAP_EVENT_F0H_02H)			\
-__PMC_EV_ALIAS("L2_TRANS.CODE_RD", IAP_EVENT_F0H_04H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_PF", IAP_EVENT_F0H_08H)			\
-__PMC_EV_ALIAS("L2_TRANS.L1D_WB", IAP_EVENT_F0H_10H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_FILL", IAP_EVENT_F0H_20H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_WB", IAP_EVENT_F0H_40H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_REQUESTS", IAP_EVENT_F0H_80H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.I", IAP_EVENT_F1H_01H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.S", IAP_EVENT_F1H_02H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.E", IAP_EVENT_F1H_04H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.ALL", IAP_EVENT_F1H_07H)			\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_01H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_02H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.PF_CLEAN", IAP_EVENT_F2H_04H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.PF_DIRTY", IAP_EVENT_F2H_08H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.DIRTY_ALL", IAP_EVENT_F2H_0AH)
-
-/*
- *  Aliases for Sandy Bridge PMC events (253669-039US May 2011)
- */
-#define __PMC_EV_ALIAS_SANDYBRIDGE()					\
-__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
-__PMC_EV_ALIAS("LD_BLOCKS.DATA_UNKNOWN", IAP_EVENT_03H_01H)		\
-__PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)			\
-__PMC_EV_ALIAS("LD_BLOCKS.ALL_BLOCK", IAP_EVENT_03H_10H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.STORES", IAP_EVENT_05H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS_PARTIAL.ADDRESS_ALIAS", IAP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("LD_BLOCKS_PARTIAL.ALL_STA_BLOCK", IAP_EVENT_07H_08H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_08H_01H)\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_02H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_DURATION", IAP_EVENT_08H_04H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_08H_10H)		\
-__PMC_EV_ALIAS("INT_MISC.RECOVERY_CYCLES", IAP_EVENT_0DH_03H)		\
-__PMC_EV_ALIAS("INT_MISC.RAT_STALL_CYCLES", IAP_EVENT_0DH_40H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.ANY", IAP_EVENT_0EH_01H)			\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.X87", IAP_EVENT_10H_01H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_PACKED_DOUBLE",			\
-    IAP_EVENT_10H_10H)							\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_SCALAR_SINGLE",			\
-    IAP_EVENT_10H_20H)							\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_PACKED_SINGLE", IAP_EVENT_10H_40H)	\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_SCALAR_DOUBLE", IAP_EVENT_10H_80H)	\
-__PMC_EV_ALIAS("SIMD_FP_256.PACKED_SINGLE", IAP_EVENT_11H_01H)		\
-__PMC_EV_ALIAS("SIMD_FP_256.PACKED_DOUBLE", IAP_EVENT_11H_02H)		\
-__PMC_EV_ALIAS("ARITH.FPU_DIV_ACTIVE", IAP_EVENT_14H_01H)		\
-__PMC_EV_ALIAS("INSTS_WRITTEN_TO_IQ.INSTS", IAP_EVENT_17H_01H)		\
-__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_HIT", IAP_EVENT_24H_01H)	\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_DATA_RD", IAP_EVENT_24H_03H)	\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_HITS", IAP_EVENT_24H_04H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_MISS", IAP_EVENT_24H_08H)			\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_RFO", IAP_EVENT_24H_0CH)			\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_HIT", IAP_EVENT_24H_10H)		\
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_MISS", IAP_EVENT_24H_20H)		\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_CODE_RD", IAP_EVENT_24H_30H)		\
-__PMC_EV_ALIAS("L2_RQSTS.PF_HIT", IAP_EVENT_24H_40H)			\
-__PMC_EV_ALIAS("L2_RQSTS.PF_MISS", IAP_EVENT_24H_80H)			\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_PF", IAP_EVENT_24H_C0H)			\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.MISS", IAP_EVENT_27H_01H)		\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.HIT_E", IAP_EVENT_27H_04H)		\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.HIT_M", IAP_EVENT_27H_08H)		\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.ALL", IAP_EVENT_27H_0FH)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.HIT_E", IAP_EVENT_28H_04H)		\
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.HIT_M", IAP_EVENT_28H_08H)		\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.REFERENCE", IAP_EVENT_2EH_4FH)	\
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.MISS", IAP_EVENT_2EH_41H)		\
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.THREAD_P", IAP_EVENT_3CH_00H)		\
-__PMC_EV_ALIAS("CPU_CLK_THREAD_UNHALTED.REF_XCLK", IAP_EVENT_3CH_01H)	\
-__PMC_EV_ALIAS("L1D_PEND_MISS.PENDING", IAP_EVENT_48H_01H)		\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.MISS_CAUSES_A_WALK",			\
-    IAP_EVENT_49H_01H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED", IAP_EVENT_49H_02H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_DURATION", IAP_EVENT_49H_04H)	\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT", IAP_EVENT_49H_10H)		\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.SW_PF", IAP_EVENT_4CH_01H)			\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.HW_PF", IAP_EVENT_4CH_02H)			\
-__PMC_EV_ALIAS("HW_PRE_REQ.DL1_MISS", IAP_EVENT_4EH_02H)		\
-__PMC_EV_ALIAS("L1D.REPLACEMENT", IAP_EVENT_51H_01H)			\
-__PMC_EV_ALIAS("L1D.ALLOCATED_IN_M", IAP_EVENT_51H_02H)			\
-__PMC_EV_ALIAS("L1D.EVICTION", IAP_EVENT_51H_04H)			\
-__PMC_EV_ALIAS("L1D.ALL_M_REPLACEMENT", IAP_EVENT_51H_08H)		\
-__PMC_EV_ALIAS("PARTIAL_RAT_STALLS.FLAGS_MERGE_UOP", IAP_EVENT_59H_20H)	\
-__PMC_EV_ALIAS("PARTIAL_RAT_STALLS.SLOW_LEA_WINDOW", IAP_EVENT_59H_40H)	\
-__PMC_EV_ALIAS("PARTIAL_RAT_STALLS.MUL_SINGLE_UOP", IAP_EVENT_59H_80H)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS2.ALL_FL_EMPTY", IAP_EVENT_5BH_0CH)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS2.ALL_PRF_CONTROL", IAP_EVENT_5BH_0FH)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS2.BOB_FULL", IAP_EVENT_5BH_40H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS2.OOO_RSRC", IAP_EVENT_5BH_4FH)		\
-__PMC_EV_ALIAS("CPL_CYCLES.RING0", IAP_EVENT_5CH_01H)			\
-__PMC_EV_ALIAS("CPL_CYCLES.RING123", IAP_EVENT_5CH_02H)			\
-__PMC_EV_ALIAS("RS_EVENTS.EMPTY_CYCLES", IAP_EVENT_5EH_01H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD",		\
-    IAP_EVENT_60H_01H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO",		\
-    IAP_EVENT_60H_04H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD",		\
-    IAP_EVENT_60H_08H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION",		\
-    IAP_EVENT_63H_01H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.CACHE_LOCK_DURATION", IAP_EVENT_63H_02H)	\
-__PMC_EV_ALIAS("IDQ.EMPTY", IAP_EVENT_79H_02H)				\
-__PMC_EV_ALIAS("IDQ.MITE_UOPS", IAP_EVENT_79H_04H)			\
-__PMC_EV_ALIAS("IDQ.DSB_UOPS", IAP_EVENT_79H_08H)			\
-__PMC_EV_ALIAS("IDQ.MS_DSB_UOPS", IAP_EVENT_79H_10H)			\
-__PMC_EV_ALIAS("IDQ.MS_MITE_UOPS", IAP_EVENT_79H_20H)			\
-__PMC_EV_ALIAS("IDQ.MS_UOPS", IAP_EVENT_79H_30H)			\
-__PMC_EV_ALIAS("ICACHE.MISSES", IAP_EVENT_80H_02H)			\
-__PMC_EV_ALIAS("ITLB_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_85H_01H)	\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED", IAP_EVENT_85H_02H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_DURATION", IAP_EVENT_85H_04H)		\
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT", IAP_EVENT_85H_10H)		\
-__PMC_EV_ALIAS("ILD_STALL.LCP", IAP_EVENT_87H_01H)			\
-__PMC_EV_ALIAS("ILD_STALL.IQ_FULL", IAP_EVENT_87H_04H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.COND", IAP_EVENT_88H_01H)			\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_JMP", IAP_EVENT_88H_02H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_88H_04H)							\
-__PMC_EV_ALIAS("BR_INST_EXEC.RETURN_NEAR", IAP_EVENT_88H_08H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_88H_10H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_88H_20H)	\
-__PMC_EV_ALIAS("BR_INST_EXEC.NONTAKEN", IAP_EVENT_88H_40H)		\
-__PMC_EV_ALIAS("BR_INST_EXEC.TAKEN", IAP_EVENT_88H_80H)			\
-__PMC_EV_ALIAS("BR_INST_EXE.ALL_BRANCHES", IAP_EVENT_88H_FFH)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.COND", IAP_EVENT_89H_01H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_89H_04H)							\
-__PMC_EV_ALIAS("BR_MISP_EXEC.RETURN_NEAR", IAP_EVENT_89H_08H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_89H_10H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_89H_20H)	\
-__PMC_EV_ALIAS("BR_MISP_EXEC.NONTAKEN", IAP_EVENT_89H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_EXEC.TAKEN", IAP_EVENT_89H_80H)			\
-__PMC_EV_ALIAS("BR_MISP_EXEC.ALL_BRANCHES", IAP_EVENT_89H_FFH)		\
-__PMC_EV_ALIAS("IDQ_UOPS_NOT_DELIVERED.CORE", IAP_EVENT_9CH_01H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_0", IAP_EVENT_A1H_01H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_1", IAP_EVENT_A1H_02H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2_LD", IAP_EVENT_A1H_04H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2_STA", IAP_EVENT_A1H_08H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2", IAP_EVENT_A1H_0CH)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3_LD", IAP_EVENT_A1H_10H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3_STA", IAP_EVENT_A1H_20H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3", IAP_EVENT_A1H_30H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_4", IAP_EVENT_A1H_40H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_5", IAP_EVENT_A1H_80H)	\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY", IAP_EVENT_A2H_01H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.LB", IAP_EVENT_A2H_04H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.SB", IAP_EVENT_A2H_08H)			\
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB", IAP_EVENT_A2H_10H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.FCSW", IAP_EVENT_A2H_20H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.MXCSR", IAP_EVENT_A2H_40H)		\
-__PMC_EV_ALIAS("RESOURCE_STALLS.OTHER", IAP_EVENT_A2H_80H)		\
-__PMC_EV_ALIAS("LSD.UOPS", IAP_EVENT_A8H_01H)				\
-__PMC_EV_ALIAS("DSB2MITE_SWITCHES.COUNT", IAP_EVENT_ABH_01H)		\
-__PMC_EV_ALIAS("DSB2MITE_SWITCHES.PENALTY_CYCLES", IAP_EVENT_ABH_02H)	\
-__PMC_EV_ALIAS("DSB_FILL.OTHER_CANCEL", IAP_EVENT_ACH_02H)		\
-__PMC_EV_ALIAS("DSB_FILL.EXCEED_DSB_LINES", IAP_EVENT_ACH_08H)		\
-__PMC_EV_ALIAS("DSB_FILL.ALL_CANCEL", IAP_EVENT_ACH_0AH)		\
-__PMC_EV_ALIAS("ITLB.ITLB_FLUSH", IAP_EVENT_AEH_01H)			\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_DATA_RD", IAP_EVENT_B0H_01H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_RFO", IAP_EVENT_B0H_04H)	\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ALL_DATA_RD", IAP_EVENT_B0H_08H)	\
-__PMC_EV_ALIAS("UOPS_DISPATCHED.THREAD", IAP_EVENT_B1H_01H)		\
-__PMC_EV_ALIAS("UOPS_DISPATCHED.CORE", IAP_EVENT_B1H_02H)		\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_BUFFER.SQ_FULL", IAP_EVENT_B2H_01H)	\
-__PMC_EV_ALIAS("AGU_BYPASS_CANCEL.COUNT", IAP_EVENT_B6H_01H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_0", IAP_EVENT_B7H_01H)		\
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_1", IAP_EVENT_BBH_01H)		\
-__PMC_EV_ALIAS("TLB_FLUSH.DTLB_THREAD", IAP_EVENT_BDH_01H)		\
-__PMC_EV_ALIAS("TLB_FLUSH.STLB_ANY", IAP_EVENT_BDH_20H)			\
-__PMC_EV_ALIAS("L1D_BLOCKS.BANK_CONFLICT_CYCLES", IAP_EVENT_BFH_05H)	\
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P", IAP_EVENT_C0H_00H)			\
-__PMC_EV_ALIAS("INST_RETIRED.PREC_DIST", IAP_EVENT_C0H_01H)		\
-__PMC_EV_ALIAS("INST_RETIRED.X87", IAP_EVENT_C0H_02H)			\
-__PMC_EV_ALIAS("OTHER_ASSISTS.ITLB_MISS_RETIRED", IAP_EVENT_C1H_02H)	\
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_STORE", IAP_EVENT_C1H_08H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_TO_SSE", IAP_EVENT_C1H_10H)		\
-__PMC_EV_ALIAS("OTHER_ASSISTS.SSE_TO_AVX", IAP_EVENT_C1H_20H)		\
-__PMC_EV_ALIAS("UOPS_RETIRED.ALL", IAP_EVENT_C2H_01H)			\
-__PMC_EV_ALIAS("UOPS_RETIRED.RETIRE_SLOTS", IAP_EVENT_C2H_02H)		\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MEMORY_ORDERING", IAP_EVENT_C3H_02H)	\
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC", IAP_EVENT_C3H_04H)			\
-__PMC_EV_ALIAS("MACHINE_CLEARS.MASKMOV", IAP_EVENT_C3H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCH", IAP_EVENT_C4H_00H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.CONDITIONAL", IAP_EVENT_C4H_01H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_CALL", IAP_EVENT_C4H_02H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_04H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_RETURN", IAP_EVENT_C4H_08H)	\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NOT_TAKEN", IAP_EVENT_C4H_10H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_TAKEN", IAP_EVENT_C4H_20H)		\
-__PMC_EV_ALIAS("BR_INST_RETIRED.FAR_BRANCH", IAP_EVENT_C4H_40H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_00H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_01H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NEAR_CALL", IAP_EVENT_C5H_02H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES_PS", IAP_EVENT_C5H_04H)	\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NOT_TAKEN", IAP_EVENT_C5H_10H)		\
-__PMC_EV_ALIAS("BR_MISP_RETIRED.TAKEN", IAP_EVENT_C5H_20H)		\
-__PMC_EV_ALIAS("FP_ASSIST.X87_OUTPUT", IAP_EVENT_CAH_02H)		\
-__PMC_EV_ALIAS("FP_ASSIST.X87_INPUT", IAP_EVENT_CAH_04H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_OUTPUT", IAP_EVENT_CAH_08H)		\
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_INPUT", IAP_EVENT_CAH_10H)		\
-__PMC_EV_ALIAS("FP_ASSIST.ANY", IAP_EVENT_CAH_1EH)			\
-__PMC_EV_ALIAS("ROB_MISC_EVENTS.LBR_INSERTS", IAP_EVENT_CCH_20H)	\
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.LOAD_LATENCY", IAP_EVENT_CDH_01H)	\
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.PRECISE_STORE", IAP_EVENT_CDH_02H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STLB_MISS_LOADS", IAP_EVENT_D0H_11H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STLB_MISS_STORES", IAP_EVENT_D0H_12H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOCK_LOADS", IAP_EVENT_D0H_21H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_LOADS", IAP_EVENT_D0H_41H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_STORES", IAP_EVENT_D0H_42H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL_LOADS", IAP_EVENT_D0H_81H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL_STORES", IAP_EVENT_D0H_82H)		\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_HIT", IAP_EVENT_D1H_01H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_HIT", IAP_EVENT_D1H_02H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.LLC_HIT", IAP_EVENT_D1H_04H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.HIT_LFB", IAP_EVENT_D1H_40H)	\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS",		\
-    IAP_EVENT_D2H_01H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT",		\
-    IAP_EVENT_D2H_02H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM",		\
-    IAP_EVENT_D2H_04H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE",		\
-    IAP_EVENT_D2H_08H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_MISC_RETIRED.LLC_MISS",			\
-    IAP_EVENT_D4H_02H)							\
-__PMC_EV_ALIAS("L2_TRANS.DEMAND_DATA_RD", IAP_EVENT_F0H_01H)		\
-__PMC_EV_ALIAS("L2_TRANS.RFO", IAP_EVENT_F0H_02H)			\
-__PMC_EV_ALIAS("L2_TRANS.CODE_RD", IAP_EVENT_F0H_04H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_PF", IAP_EVENT_F0H_08H)			\
-__PMC_EV_ALIAS("L2_TRANS.L1D_WB", IAP_EVENT_F0H_10H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_FILL", IAP_EVENT_F0H_20H)			\
-__PMC_EV_ALIAS("L2_TRANS.L2_WB", IAP_EVENT_F0H_40H)			\
-__PMC_EV_ALIAS("L2_TRANS.ALL_REQUESTS", IAP_EVENT_F0H_80H)		\
-__PMC_EV_ALIAS("L2_LINES_IN.I", IAP_EVENT_F1H_01H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.S", IAP_EVENT_F1H_02H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.E", IAP_EVENT_F1H_04H)			\
-__PMC_EV_ALIAS("L2_LINES_IN.ALL", IAP_EVENT_F1H_07H)			\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_01H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_02H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.PF_CLEAN", IAP_EVENT_F2H_04H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.PF_DIRTY", IAP_EVENT_F2H_08H)		\
-__PMC_EV_ALIAS("L2_LINES_OUT.DIRTY_ALL", IAP_EVENT_F2H_0AH)		\
-__PMC_EV_ALIAS("SQ_MISC.SPLIT_LOCK", IAP_EVENT_F4H_10H)
-
-/*
- * Aliases for Sandy Bridge Xeon PMC events (253669-044US August 2012)
- */
-#define __PMC_EV_ALIAS_SANDYBRIDGE_XEON()				\
-__PMC_EV_ALIAS_INTEL_ARCHITECTURAL()					\
-__PMC_EV_ALIAS("LD_BLOCKS.DATA_UNKNOWN", IAP_EVENT_03H_01H)		\
-__PMC_EV_ALIAS("LD_BLOCKS.STORE_FORWARD", IAP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS.NO_SR", IAP_EVENT_03H_08H)			\
-__PMC_EV_ALIAS("LD_BLOCKS.ALL_BLOCK", IAP_EVENT_03H_10H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.LOADS", IAP_EVENT_05H_01H)		\
-__PMC_EV_ALIAS("MISALIGN_MEM_REF.STORES", IAP_EVENT_05H_02H)		\
-__PMC_EV_ALIAS("LD_BLOCKS_PARTIAL.ADDRESS_ALIAS", IAP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("LD_BLOCKS_PARTIAL.ALL_STA_BLOCK", IAP_EVENT_07H_08H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_08H_01H)\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_COMPLETED", IAP_EVENT_08H_02H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.WALK_DURATION", IAP_EVENT_08H_04H)	\
-__PMC_EV_ALIAS("DTLB_LOAD_MISSES.STLB_HIT", IAP_EVENT_08H_10H)		\
-__PMC_EV_ALIAS("INT_MISC.RECOVERY_CYCLES", IAP_EVENT_0DH_03H)		\
-__PMC_EV_ALIAS("INT_MISC.RAT_STALL_CYCLES", IAP_EVENT_0DH_40H)		\
-__PMC_EV_ALIAS("UOPS_ISSUED.ANY", IAP_EVENT_0EH_01H)			\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.X87", IAP_EVENT_10H_01H)		\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_PACKED_DOUBLE",			\
-    IAP_EVENT_10H_10H)							\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_FP_SCALAR_SINGLE",			\
-    IAP_EVENT_10H_20H)							\
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_PACKED_SINGLE", IAP_EVENT_10H_40H)  \
-__PMC_EV_ALIAS("FP_COMP_OPS_EXE.SSE_SCALAR_DOUBLE", IAP_EVENT_10H_80H)  \
-__PMC_EV_ALIAS("SIMD_FP_256.PACKED_SINGLE", IAP_EVENT_11H_01H)		\
-__PMC_EV_ALIAS("SIMD_FP_256.PACKED_DOUBLE", IAP_EVENT_11H_02H)		\
-__PMC_EV_ALIAS("ARITH.FPU_DIV_ACTIVE", IAP_EVENT_14H_01H)		\
-__PMC_EV_ALIAS("INSTS_WRITTEN_TO_IQ.INSTS", IAP_EVENT_17H_01H)          \
-__PMC_EV_ALIAS("L2_RQSTS.DEMAND_DATA_RD_HIT", IAP_EVENT_24H_01H)        \
-__PMC_EV_ALIAS("L2_RQSTS.ALL_DEMAND_DATA_RD", IAP_EVENT_24H_03H)        \
-__PMC_EV_ALIAS("L2_RQSTS.RFO_HITS", IAP_EVENT_24H_04H)			\
-__PMC_EV_ALIAS("L2_RQSTS.RFO_MISS", IAP_EVENT_24H_08H)			\
-__PMC_EV_ALIAS("L2_RQSTS.ALL_RFO", IAP_EVENT_24H_0CH)                   \
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_HIT", IAP_EVENT_24H_10H)               \
-__PMC_EV_ALIAS("L2_RQSTS.CODE_RD_MISS", IAP_EVENT_24H_20H)              \
-__PMC_EV_ALIAS("L2_RQSTS.ALL_CODE_RD", IAP_EVENT_24H_30H)               \
-__PMC_EV_ALIAS("L2_RQSTS.PF_HIT", IAP_EVENT_24H_40H)                    \
-__PMC_EV_ALIAS("L2_RQSTS.PF_MISS", IAP_EVENT_24H_80H)                   \
-__PMC_EV_ALIAS("L2_RQSTS.ALL_PF", IAP_EVENT_24H_C0H)                    \
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.MISS", IAP_EVENT_27H_01H)           \
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.HIT_E", IAP_EVENT_27H_04H)		\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.HIT_M", IAP_EVENT_27H_08H)		\
-__PMC_EV_ALIAS("L2_STORE_LOCK_RQSTS.ALL", IAP_EVENT_27H_0FH)            \
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.MISS", IAP_EVENT_28H_01H)               \
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.HIT_S", IAP_EVENT_28H_02H)              \
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.HIT_E", IAP_EVENT_28H_04H)              \
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.HIT_M", IAP_EVENT_28H_08H)              \
-__PMC_EV_ALIAS("L2_L1D_WB_RQSTS.ALL", IAP_EVENT_28H_0FH)                \
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.REFERENCE", IAP_EVENT_2EH_4FH)        \
-__PMC_EV_ALIAS("LONGEST_LAT_CACHE.MISS", IAP_EVENT_2EH_41H)             \
-__PMC_EV_ALIAS("CPU_CLK_UNHALTED.THREAD_P", IAP_EVENT_3CH_00H)		\
-__PMC_EV_ALIAS("CPU_CLK_THREAD_UNHALTED.REF_XCLK", IAP_EVENT_3CH_01H)   \
-__PMC_EV_ALIAS("L1D_PEND_MISS.PENDING", IAP_EVENT_48H_01H)              \
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.MISS_CAUSES_A_WALK",			\
-    IAP_EVENT_49H_01H)							\
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_COMPLETED", IAP_EVENT_49H_02H)   \
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.WALK_DURATION", IAP_EVENT_49H_04H)    \
-__PMC_EV_ALIAS("DTLB_STORE_MISSES.STLB_HIT", IAP_EVENT_49H_10H)		\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.SW_PF", IAP_EVENT_4CH_01H)			\
-__PMC_EV_ALIAS("LOAD_HIT_PRE.HW_PF", IAP_EVENT_4CH_02H)			\
-__PMC_EV_ALIAS("HW_PRE_REQ.DL1_MISS", IAP_EVENT_4EH_02H)		\
-__PMC_EV_ALIAS("L1D.REPLACEMENT", IAP_EVENT_51H_01H)                    \
-__PMC_EV_ALIAS("L1D.ALLOCATED_IN_M", IAP_EVENT_51H_02H)                 \
-__PMC_EV_ALIAS("L1D.EVICTION", IAP_EVENT_51H_04H)                       \
-__PMC_EV_ALIAS("L1D.ALL_M_REPLACEMENT", IAP_EVENT_51H_08H)              \
-__PMC_EV_ALIAS("PARTIAL_RAT_STALLS.FLAGS_MERGE_UOP", IAP_EVENT_59H_20H) \
-__PMC_EV_ALIAS("PARTIAL_RAT_STALLS.SLOW_LEA_WINDOW", IAP_EVENT_59H_40H) \
-__PMC_EV_ALIAS("PARTIAL_RAT_STALLS.MUL_SINGLE_UOP", IAP_EVENT_59H_80H)  \
-__PMC_EV_ALIAS("RESOURCE_STALLS2.ALL_FL_EMPTY", IAP_EVENT_5BH_0CH)      \
-__PMC_EV_ALIAS("RESOURCE_STALLS2.ALL_PRF_CONTROL", IAP_EVENT_5BH_0FH)   \
-__PMC_EV_ALIAS("RESOURCE_STALLS2.BOB_FULL", IAP_EVENT_5BH_40H)          \
-__PMC_EV_ALIAS("RESOURCE_STALLS2.OOO_RSRC", IAP_EVENT_5BH_4FH)          \
-__PMC_EV_ALIAS("CPL_CYCLES.RING0", IAP_EVENT_5CH_01H)                   \
-__PMC_EV_ALIAS("CPL_CYCLES.RING123", IAP_EVENT_5CH_02H)                 \
-__PMC_EV_ALIAS("RS_EVENTS.EMPTY_CYCLES", IAP_EVENT_5EH_01H)             \
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_DATA_RD",		\
-    IAP_EVENT_60H_01H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.DEMAND_RFO",		\
-    IAP_EVENT_60H_04H)							\
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_OUTSTANDING.ALL_DATA_RD",		\
-    IAP_EVENT_60H_08H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.SPLIT_LOCK_UC_LOCK_DURATION",		\
-    IAP_EVENT_63H_01H)							\
-__PMC_EV_ALIAS("LOCK_CYCLES.CACHE_LOCK_DURATION", IAP_EVENT_63H_02H)    \
-__PMC_EV_ALIAS("IDQ.EMPTY", IAP_EVENT_79H_02H)                          \
-__PMC_EV_ALIAS("IDQ.MITE_UOPS", IAP_EVENT_79H_04H)                      \
-__PMC_EV_ALIAS("IDQ.DSB_UOPS", IAP_EVENT_79H_08H)                       \
-__PMC_EV_ALIAS("IDQ.MS_DSB_UOPS", IAP_EVENT_79H_10H)                    \
-__PMC_EV_ALIAS("IDQ.MS_MITE_UOPS", IAP_EVENT_79H_20H)                   \
-__PMC_EV_ALIAS("IDQ.MS_UOPS", IAP_EVENT_79H_30H)                        \
-__PMC_EV_ALIAS("ICACHE.MISSES", IAP_EVENT_80H_02H)                      \
-__PMC_EV_ALIAS("ITLB_MISSES.MISS_CAUSES_A_WALK", IAP_EVENT_85H_01H)     \
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_COMPLETED", IAP_EVENT_85H_02H)         \
-__PMC_EV_ALIAS("ITLB_MISSES.WALK_DURATION", IAP_EVENT_85H_04H)          \
-__PMC_EV_ALIAS("ITLB_MISSES.STLB_HIT", IAP_EVENT_85H_10H)               \
-__PMC_EV_ALIAS("ILD_STALL.LCP", IAP_EVENT_87H_01H)                      \
-__PMC_EV_ALIAS("ILD_STALL.IQ_FULL", IAP_EVENT_87H_04H)                  \
-__PMC_EV_ALIAS("BR_INST_EXEC.COND", IAP_EVENT_88H_01H)                  \
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_JMP", IAP_EVENT_88H_02H)            \
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_88H_04H)							\
-__PMC_EV_ALIAS("BR_INST_EXEC.RETURN_NEAR", IAP_EVENT_88H_08H)           \
-__PMC_EV_ALIAS("BR_INST_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_88H_10H)      \
-__PMC_EV_ALIAS("BR_INST_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_88H_20H)    \
-__PMC_EV_ALIAS("BR_INST_EXEC.NONTAKEN", IAP_EVENT_88H_40H)              \
-__PMC_EV_ALIAS("BR_INST_EXEC.TAKEN", IAP_EVENT_88H_80H)                 \
-__PMC_EV_ALIAS("BR_INST_EXE.ALL_BRANCHES", IAP_EVENT_88H_FFH)           \
-__PMC_EV_ALIAS("BR_MISP_EXEC.COND", IAP_EVENT_89H_01H)                  \
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_JMP_NON_CALL_RET",		\
-    IAP_EVENT_89H_04H)							\
-__PMC_EV_ALIAS("BR_MISP_EXEC.RETURN_NEAR", IAP_EVENT_89H_08H)           \
-__PMC_EV_ALIAS("BR_MISP_EXEC.DIRECT_NEAR_CALL", IAP_EVENT_89H_10H)      \
-__PMC_EV_ALIAS("BR_MISP_EXEC.INDIRECT_NEAR_CALL", IAP_EVENT_89H_20H)    \
-__PMC_EV_ALIAS("BR_MISP_EXEC.NONTAKEN", IAP_EVENT_89H_40H)              \
-__PMC_EV_ALIAS("BR_MISP_EXEC.TAKEN", IAP_EVENT_89H_80H)                 \
-__PMC_EV_ALIAS("BR_MISP_EXEC.ALL_BRANCHES", IAP_EVENT_89H_FFH)          \
-__PMC_EV_ALIAS("IDQ_UOPS_NOT_DELIVERED.CORE", IAP_EVENT_9CH_01H)        \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_0", IAP_EVENT_A1H_01H)        \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_1", IAP_EVENT_A1H_02H)        \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2_LD", IAP_EVENT_A1H_04H)     \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2_STA", IAP_EVENT_A1H_08H)    \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_2", IAP_EVENT_A1H_0CH)        \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3_LD", IAP_EVENT_A1H_10H)     \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3_STA", IAP_EVENT_A1H_20H)    \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_3", IAP_EVENT_A1H_30H)        \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_4", IAP_EVENT_A1H_40H)        \
-__PMC_EV_ALIAS("UOPS_DISPATCHED_PORT.PORT_5", IAP_EVENT_A1H_80H)        \
-__PMC_EV_ALIAS("RESOURCE_STALLS.ANY", IAP_EVENT_A2H_01H)                \
-__PMC_EV_ALIAS("RESOURCE_STALLS.LB", IAP_EVENT_A2H_02H)                 \
-__PMC_EV_ALIAS("RESOURCE_STALLS.RS", IAP_EVENT_A2H_04H)                 \
-__PMC_EV_ALIAS("RESOURCE_STALLS.SB", IAP_EVENT_A2H_08H)                 \
-__PMC_EV_ALIAS("RESOURCE_STALLS.ROB", IAP_EVENT_A2H_10H)                \
-__PMC_EV_ALIAS("RESOURCE_STALLS.FCSW", IAP_EVENT_A2H_20H)               \
-__PMC_EV_ALIAS("RESOURCE_STALLS.MXCSR", IAP_EVENT_A2H_40H)              \
-__PMC_EV_ALIAS("RESOURCE_STALLS.OTHER", IAP_EVENT_A2H_80H)              \
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L2_PENDING", IAP_EVENT_A3H_01H)   \
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_L1D_PENDING", IAP_EVENT_A3H_02H)  \
-__PMC_EV_ALIAS("CYCLE_ACTIVITY.CYCLES_NO_DISPATCH", IAP_EVENT_A3H_04H)  \
-__PMC_EV_ALIAS("LSD.UOPS", IAP_EVENT_A8H_01H)				\
-__PMC_EV_ALIAS("DSB2MITE_SWITCHES.COUNT", IAP_EVENT_ABH_01H)            \
-__PMC_EV_ALIAS("DSB2MITE_SWITCHES.PENALTY_CYCLES", IAP_EVENT_ABH_02H)   \
-__PMC_EV_ALIAS("DSB_FILL.OTHER_CANCEL", IAP_EVENT_ACH_02H)              \
-__PMC_EV_ALIAS("DSB_FILL.EXCEED_DSB_LINES", IAP_EVENT_ACH_08H)          \
-__PMC_EV_ALIAS("DSB_FILL.ALL_CANCEL", IAP_EVENT_ACH_0AH)                \
-__PMC_EV_ALIAS("ITLB.ITLB_FLUSH", IAP_EVENT_AEH_01H)                    \
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_DATA_RD", IAP_EVENT_B0H_01H)    \
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.DEMAND_RFO", IAP_EVENT_B0H_04H)        \
-__PMC_EV_ALIAS("OFFCORE_REQUESTS.ALL_DATA_RD", IAP_EVENT_B0H_08H)       \
-__PMC_EV_ALIAS("UOPS_DISPATCHED.THREAD", IAP_EVENT_B1H_01H)             \
-__PMC_EV_ALIAS("UOPS_DISPATCHED.CORE", IAP_EVENT_B1H_02H)               \
-__PMC_EV_ALIAS("OFFCORE_REQUESTS_BUFFER.SQ_FULL", IAP_EVENT_B2H_01H)    \
-__PMC_EV_ALIAS("AGU_BYPASS_CANCEL.COUNT", IAP_EVENT_B6H_01H)            \
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_0", IAP_EVENT_B7H_01H)                \
-__PMC_EV_ALIAS("OFF_CORE_RESPONSE_1", IAP_EVENT_BBH_01H)                \
-__PMC_EV_ALIAS("TLB_FLUSH.DTLB_THREAD", IAP_EVENT_BDH_01H)              \
-__PMC_EV_ALIAS("TLB_FLUSH.STLB_ANY", IAP_EVENT_BDH_20H)                 \
-__PMC_EV_ALIAS("L1D_BLOCKS.BANK_CONFLICT_CYCLES", IAP_EVENT_BFH_05H)    \
-__PMC_EV_ALIAS("INST_RETIRED.ANY_P", IAP_EVENT_C0H_00H)                 \
-__PMC_EV_ALIAS("INST_RETIRED.ALL", IAP_EVENT_C0H_01H)                   \
-__PMC_EV_ALIAS("OTHER_ASSISTS.ITLB_MISS_RETIRED", IAP_EVENT_C1H_02H)    \
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_STORE", IAP_EVENT_C1H_08H)            \
-__PMC_EV_ALIAS("OTHER_ASSISTS.AVX_TO_SSE", IAP_EVENT_C1H_10H)           \
-__PMC_EV_ALIAS("OTHER_ASSISTS.SSE_TO_AVX", IAP_EVENT_C1H_20H)           \
-__PMC_EV_ALIAS("UOPS_RETIRED.ALL", IAP_EVENT_C2H_01H)                   \
-__PMC_EV_ALIAS("UOPS_RETIRED.RETIRE_SLOTS", IAP_EVENT_C2H_02H)          \
-__PMC_EV_ALIAS("MACHINE_CLEARS.MEMORY_ORDERING", IAP_EVENT_C3H_02H)     \
-__PMC_EV_ALIAS("MACHINE_CLEARS.SMC", IAP_EVENT_C3H_04H)                 \
-__PMC_EV_ALIAS("MACHINE_CLEARS.MASKMOV", IAP_EVENT_C3H_20H)             \
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCH", IAP_EVENT_C4H_00H)         \
-__PMC_EV_ALIAS("BR_INST_RETIRED.CONDITIONAL", IAP_EVENT_C4H_01H)        \
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_CALL", IAP_EVENT_C4H_02H)          \
-__PMC_EV_ALIAS("BR_INST_RETIRED.ALL_BRANCHES", IAP_EVENT_C4H_04H)       \
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_RETURN", IAP_EVENT_C4H_08H)        \
-__PMC_EV_ALIAS("BR_INST_RETIRED.NOT_TAKEN", IAP_EVENT_C4H_10H)          \
-__PMC_EV_ALIAS("BR_INST_RETIRED.NEAR_TAKEN", IAP_EVENT_C4H_20H)         \
-__PMC_EV_ALIAS("BR_INST_RETIRED.FAR_BRANCH", IAP_EVENT_C4H_40H)         \
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES", IAP_EVENT_C5H_00H)       \
-__PMC_EV_ALIAS("BR_MISP_RETIRED.CONDITIONAL", IAP_EVENT_C5H_01H)        \
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NEAR_CALL", IAP_EVENT_C5H_02H)          \
-__PMC_EV_ALIAS("BR_MISP_RETIRED.ALL_BRANCHES_PS", IAP_EVENT_C5H_04H)    \
-__PMC_EV_ALIAS("BR_MISP_RETIRED.NOT_TAKEN", IAP_EVENT_C5H_10H)          \
-__PMC_EV_ALIAS("BR_MISP_RETIRED.TAKEN", IAP_EVENT_C5H_20H)              \
-__PMC_EV_ALIAS("FP_ASSIST.X87_OUTPUT", IAP_EVENT_CAH_02H)               \
-__PMC_EV_ALIAS("FP_ASSIST.X87_INPUT", IAP_EVENT_CAH_04H)                \
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_OUTPUT", IAP_EVENT_CAH_08H)              \
-__PMC_EV_ALIAS("FP_ASSIST.SIMD_INPUT", IAP_EVENT_CAH_10H)               \
-__PMC_EV_ALIAS("FP_ASSIST.ANY", IAP_EVENT_CAH_1EH)                      \
-__PMC_EV_ALIAS("ROB_MISC_EVENTS.LBR_INSERTS", IAP_EVENT_CCH_20H)        \
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.LOAD_LATENCY", IAP_EVENT_CDH_01H)     \
-__PMC_EV_ALIAS("MEM_TRANS_RETIRED.PRECISE_STORE", IAP_EVENT_CDH_02H)    \
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STLB_MISS_LOADS", IAP_EVENT_D0H_11H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.STLB_MISS_STORES", IAP_EVENT_D0H_12H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.LOCK_LOADS", IAP_EVENT_D0H_21H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_LOADS", IAP_EVENT_D0H_41H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.SPLIT_STORES", IAP_EVENT_D0H_42H)	\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL_LOADS", IAP_EVENT_D0H_81H)		\
-__PMC_EV_ALIAS("MEM_UOP_RETIRED.ALL_STORES", IAP_EVENT_D0H_82H)		\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L1_HIT", IAP_EVENT_D1H_01H)       \
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.L2_HIT", IAP_EVENT_D1H_02H)       \
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.LLC_HIT", IAP_EVENT_D1H_04H)      \
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.LLC_MISS", IAP_EVENT_D1H_20H)     \
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_RETIRED.HIT_LFB", IAP_EVENT_D1H_40H)      \
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_MISS",		\
-    IAP_EVENT_D2H_01H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HIT",		\
-    IAP_EVENT_D2H_02H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_HITM",		\
-    IAP_EVENT_D2H_04H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.XSNP_NONE",		\
-    IAP_EVENT_D2H_08H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_HIT_RETIRED.ALL",			\
-    IAP_EVENT_D2H_0FH)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.LOCAL_DRAM",		\
-    IAP_EVENT_D3H_01H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_LLC_MISS_RETIRED.REMOTE_DRAM",		\
-    IAP_EVENT_D3H_04H)							\
-__PMC_EV_ALIAS("MEM_LOAD_UOPS_MISC_RETIRED.LLC_MISS",			\
-    IAP_EVENT_D4H_02H)							\
-__PMC_EV_ALIAS("BACLEARS.ANY", IAP_EVENT_E6H_01H)                       \
-__PMC_EV_ALIAS("L2_TRANS.DEMAND_DATA_RD", IAP_EVENT_F0H_01H)            \
-__PMC_EV_ALIAS("L2_TRANS.RFO", IAP_EVENT_F0H_02H)                       \
-__PMC_EV_ALIAS("L2_TRANS.CODE_RD", IAP_EVENT_F0H_04H)                   \
-__PMC_EV_ALIAS("L2_TRANS.ALL_PF", IAP_EVENT_F0H_08H)                    \
-__PMC_EV_ALIAS("L2_TRANS.L1D_WB", IAP_EVENT_F0H_10H)                    \
-__PMC_EV_ALIAS("L2_TRANS.L2_FILL", IAP_EVENT_F0H_20H)                   \
-__PMC_EV_ALIAS("L2_TRANS.L2_WB", IAP_EVENT_F0H_40H)                     \
-__PMC_EV_ALIAS("L2_TRANS.ALL_REQUESTS", IAP_EVENT_F0H_80H)              \
-__PMC_EV_ALIAS("L2_LINES_IN.I", IAP_EVENT_F1H_01H)                      \
-__PMC_EV_ALIAS("L2_LINES_IN.S", IAP_EVENT_F1H_02H)                      \
-__PMC_EV_ALIAS("L2_LINES_IN.E", IAP_EVENT_F1H_04H)                      \
-__PMC_EV_ALIAS("L2_LINES_IN.ALL", IAP_EVENT_F1H_07H)                    \
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_CLEAN", IAP_EVENT_F2H_01H)          \
-__PMC_EV_ALIAS("L2_LINES_OUT.DEMAND_DIRTY", IAP_EVENT_F2H_02H)          \
-__PMC_EV_ALIAS("L2_LINES_OUT.PF_CLEAN", IAP_EVENT_F2H_04H)              \
-__PMC_EV_ALIAS("L2_LINES_OUT.PF_DIRTY", IAP_EVENT_F2H_08H)              \
-__PMC_EV_ALIAS("L2_LINES_OUT.DIRTY_ALL", IAP_EVENT_F2H_0AH)             \
-__PMC_EV_ALIAS("SQ_MISC.SPLIT_LOCK", IAP_EVENT_F4H_10H)
-
-/* timestamp counters. */
-#define	__PMC_EV_TSC()							\
-	__PMC_EV(TSC, TSC)
-
-#define	PMC_EV_TSC_FIRST	PMC_EV_TSC_TSC
-#define	PMC_EV_TSC_LAST		PMC_EV_TSC_TSC
-
-/*
- * Software events are dynamicaly defined.
- */
-
-#define	PMC_EV_DYN_COUNT	0x1000
-
-#define	PMC_EV_SOFT_FIRST	0x20000
-#define	PMC_EV_SOFT_LAST	(PMC_EV_SOFT_FIRST + PMC_EV_DYN_COUNT - 1)
-
-#define	__PMC_EV_UCF()				\
-__PMC_EV(UCF, UCLOCK)
-
-#define	PMC_EV_UCF_FIRST	PMC_EV_UCF_UCLOCK
-#define	PMC_EV_UCF_LAST		PMC_EV_UCF_UCLOCK
-
-#define	__PMC_EV_UCP()				\
-__PMC_EV(UCP, EVENT_00H_01H)			\
-__PMC_EV(UCP, EVENT_00H_02H)			\
-__PMC_EV(UCP, EVENT_00H_04H)			\
-__PMC_EV(UCP, EVENT_01H_01H)			\
-__PMC_EV(UCP, EVENT_01H_02H)			\
-__PMC_EV(UCP, EVENT_01H_04H)			\
-__PMC_EV(UCP, EVENT_02H_01H)			\
-__PMC_EV(UCP, EVENT_03H_01H)			\
-__PMC_EV(UCP, EVENT_03H_02H)			\
-__PMC_EV(UCP, EVENT_03H_04H)			\
-__PMC_EV(UCP, EVENT_03H_08H)			\
-__PMC_EV(UCP, EVENT_03H_10H)			\
-__PMC_EV(UCP, EVENT_03H_20H)			\
-__PMC_EV(UCP, EVENT_03H_40H)			\
-__PMC_EV(UCP, EVENT_04H_01H)			\
-__PMC_EV(UCP, EVENT_04H_02H)			\
-__PMC_EV(UCP, EVENT_04H_04H)			\
-__PMC_EV(UCP, EVENT_04H_08H)			\
-__PMC_EV(UCP, EVENT_04H_10H)			\
-__PMC_EV(UCP, EVENT_05H_01H)			\
-__PMC_EV(UCP, EVENT_05H_02H)			\
-__PMC_EV(UCP, EVENT_05H_04H)			\
-__PMC_EV(UCP, EVENT_06H_01H)			\
-__PMC_EV(UCP, EVENT_06H_02H)			\
-__PMC_EV(UCP, EVENT_06H_04H)			\
-__PMC_EV(UCP, EVENT_06H_08H)			\
-__PMC_EV(UCP, EVENT_06H_10H)			\
-__PMC_EV(UCP, EVENT_06H_20H)			\
-__PMC_EV(UCP, EVENT_07H_01H)			\
-__PMC_EV(UCP, EVENT_07H_02H)			\
-__PMC_EV(UCP, EVENT_07H_04H)			\
-__PMC_EV(UCP, EVENT_07H_08H)			\
-__PMC_EV(UCP, EVENT_07H_10H)			\
-__PMC_EV(UCP, EVENT_07H_20H)			\
-__PMC_EV(UCP, EVENT_07H_24H)			\
-__PMC_EV(UCP, EVENT_08H_01H)			\
-__PMC_EV(UCP, EVENT_08H_02H)			\
-__PMC_EV(UCP, EVENT_08H_04H)			\
-__PMC_EV(UCP, EVENT_08H_03H)			\
-__PMC_EV(UCP, EVENT_09H_01H)			\
-__PMC_EV(UCP, EVENT_09H_02H)			\
-__PMC_EV(UCP, EVENT_09H_04H)			\
-__PMC_EV(UCP, EVENT_09H_03H)			\
-__PMC_EV(UCP, EVENT_0AH_01H)			\
-__PMC_EV(UCP, EVENT_0AH_02H)			\
-__PMC_EV(UCP, EVENT_0AH_04H)			\
-__PMC_EV(UCP, EVENT_0AH_08H)			\
-__PMC_EV(UCP, EVENT_0AH_0FH)			\
-__PMC_EV(UCP, EVENT_0BH_01H)			\
-__PMC_EV(UCP, EVENT_0BH_02H)			\
-__PMC_EV(UCP, EVENT_0BH_04H)			\
-__PMC_EV(UCP, EVENT_0BH_08H)			\
-__PMC_EV(UCP, EVENT_0BH_10H)			\
-__PMC_EV(UCP, EVENT_0BH_1FH)			\
-__PMC_EV(UCP, EVENT_0CH_01H)			\
-__PMC_EV(UCP, EVENT_0CH_02H)			\
-__PMC_EV(UCP, EVENT_0CH_04H_E)			\
-__PMC_EV(UCP, EVENT_0CH_04H_F)			\
-__PMC_EV(UCP, EVENT_0CH_04H_M)			\
-__PMC_EV(UCP, EVENT_0CH_04H_S)			\
-__PMC_EV(UCP, EVENT_0CH_08H_E)			\
-__PMC_EV(UCP, EVENT_0CH_08H_F)			\
-__PMC_EV(UCP, EVENT_0CH_08H_M)			\
-__PMC_EV(UCP, EVENT_0CH_08H_S)			\
-__PMC_EV(UCP, EVENT_20H_01H)			\
-__PMC_EV(UCP, EVENT_20H_02H)			\
-__PMC_EV(UCP, EVENT_20H_04H)			\
-__PMC_EV(UCP, EVENT_20H_08H)			\
-__PMC_EV(UCP, EVENT_20H_10H)			\
-__PMC_EV(UCP, EVENT_20H_20H)			\
-__PMC_EV(UCP, EVENT_21H_01H)			\
-__PMC_EV(UCP, EVENT_21H_02H)			\
-__PMC_EV(UCP, EVENT_21H_04H)			\
-__PMC_EV(UCP, EVENT_22H_01H)			\
-__PMC_EV(UCP, EVENT_22H_02H)			\
-__PMC_EV(UCP, EVENT_22H_04H)			\
-__PMC_EV(UCP, EVENT_22H_08H)			\
-__PMC_EV(UCP, EVENT_22H_10H)			\
-__PMC_EV(UCP, EVENT_22H_20H)			\
-__PMC_EV(UCP, EVENT_22H_40H)			\
-__PMC_EV(UCP, EVENT_22H_80H)			\
-__PMC_EV(UCP, EVENT_23H_01H)			\
-__PMC_EV(UCP, EVENT_23H_02H)			\
-__PMC_EV(UCP, EVENT_23H_04H)			\
-__PMC_EV(UCP, EVENT_24H_02H)			\
-__PMC_EV(UCP, EVENT_24H_04H)			\
-__PMC_EV(UCP, EVENT_25H_01H)			\
-__PMC_EV(UCP, EVENT_25H_02H)			\
-__PMC_EV(UCP, EVENT_25H_04H)			\
-__PMC_EV(UCP, EVENT_26H_01H)			\
-__PMC_EV(UCP, EVENT_27H_01H)			\
-__PMC_EV(UCP, EVENT_27H_02H)			\
-__PMC_EV(UCP, EVENT_27H_04H)			\
-__PMC_EV(UCP, EVENT_27H_08H)			\
-__PMC_EV(UCP, EVENT_27H_10H)			\
-__PMC_EV(UCP, EVENT_27H_20H)			\
-__PMC_EV(UCP, EVENT_28H_01H)			\
-__PMC_EV(UCP, EVENT_28H_02H)			\
-__PMC_EV(UCP, EVENT_28H_04H)			\
-__PMC_EV(UCP, EVENT_28H_08H)			\
-__PMC_EV(UCP, EVENT_28H_10H)			\
-__PMC_EV(UCP, EVENT_28H_20H)			\
-__PMC_EV(UCP, EVENT_29H_01H)			\
-__PMC_EV(UCP, EVENT_29H_02H)			\
-__PMC_EV(UCP, EVENT_29H_04H)			\
-__PMC_EV(UCP, EVENT_29H_08H)			\
-__PMC_EV(UCP, EVENT_29H_10H)			\
-__PMC_EV(UCP, EVENT_29H_20H)			\
-__PMC_EV(UCP, EVENT_2AH_01H)			\
-__PMC_EV(UCP, EVENT_2AH_02H)			\
-__PMC_EV(UCP, EVENT_2AH_04H)			\
-__PMC_EV(UCP, EVENT_2AH_07H)			\
-__PMC_EV(UCP, EVENT_2BH_01H)			\
-__PMC_EV(UCP, EVENT_2BH_02H)			\
-__PMC_EV(UCP, EVENT_2BH_04H)			\
-__PMC_EV(UCP, EVENT_2BH_07H)			\
-__PMC_EV(UCP, EVENT_2CH_01H)			\
-__PMC_EV(UCP, EVENT_2CH_02H)			\
-__PMC_EV(UCP, EVENT_2CH_04H)			\
-__PMC_EV(UCP, EVENT_2CH_07H)			\
-__PMC_EV(UCP, EVENT_2DH_01H)			\
-__PMC_EV(UCP, EVENT_2DH_02H)			\
-__PMC_EV(UCP, EVENT_2DH_04H)			\
-__PMC_EV(UCP, EVENT_2DH_07H)			\
-__PMC_EV(UCP, EVENT_2EH_01H)			\
-__PMC_EV(UCP, EVENT_2EH_02H)			\
-__PMC_EV(UCP, EVENT_2EH_04H)			\
-__PMC_EV(UCP, EVENT_2EH_07H)			\
-__PMC_EV(UCP, EVENT_2FH_01H)			\
-__PMC_EV(UCP, EVENT_2FH_02H)			\
-__PMC_EV(UCP, EVENT_2FH_04H)			\
-__PMC_EV(UCP, EVENT_2FH_07H)			\
-__PMC_EV(UCP, EVENT_2FH_08H)			\
-__PMC_EV(UCP, EVENT_2FH_10H)			\
-__PMC_EV(UCP, EVENT_2FH_20H)			\
-__PMC_EV(UCP, EVENT_2FH_38H)			\
-__PMC_EV(UCP, EVENT_30H_01H)			\
-__PMC_EV(UCP, EVENT_30H_02H)			\
-__PMC_EV(UCP, EVENT_30H_04H)			\
-__PMC_EV(UCP, EVENT_30H_07H)			\
-__PMC_EV(UCP, EVENT_31H_01H)			\
-__PMC_EV(UCP, EVENT_31H_02H)			\
-__PMC_EV(UCP, EVENT_31H_04H)			\
-__PMC_EV(UCP, EVENT_31H_07H)			\
-__PMC_EV(UCP, EVENT_32H_01H)			\
-__PMC_EV(UCP, EVENT_32H_02H)			\
-__PMC_EV(UCP, EVENT_32H_04H)			\
-__PMC_EV(UCP, EVENT_32H_07H)			\
-__PMC_EV(UCP, EVENT_33H_01H)			\
-__PMC_EV(UCP, EVENT_33H_02H)			\
-__PMC_EV(UCP, EVENT_33H_04H)			\
-__PMC_EV(UCP, EVENT_33H_07H)			\
-__PMC_EV(UCP, EVENT_34H_01H)			\
-__PMC_EV(UCP, EVENT_34H_02H)			\
-__PMC_EV(UCP, EVENT_34H_04H)			\
-__PMC_EV(UCP, EVENT_34H_06H)			\
-__PMC_EV(UCP, EVENT_34H_08H)			\
-__PMC_EV(UCP, EVENT_34H_10H)			\
-__PMC_EV(UCP, EVENT_34H_20H)			\
-__PMC_EV(UCP, EVENT_34H_40H)			\
-__PMC_EV(UCP, EVENT_34H_80H)			\
-__PMC_EV(UCP, EVENT_35H_01H)			\
-__PMC_EV(UCP, EVENT_35H_02H)			\
-__PMC_EV(UCP, EVENT_35H_04H)			\
-__PMC_EV(UCP, EVENT_40H_01H)			\
-__PMC_EV(UCP, EVENT_40H_02H)			\
-__PMC_EV(UCP, EVENT_40H_04H)			\
-__PMC_EV(UCP, EVENT_40H_08H)			\
-__PMC_EV(UCP, EVENT_40H_10H)			\
-__PMC_EV(UCP, EVENT_40H_20H)			\
-__PMC_EV(UCP, EVENT_40H_07H)			\
-__PMC_EV(UCP, EVENT_40H_38H)			\
-__PMC_EV(UCP, EVENT_41H_01H)			\
-__PMC_EV(UCP, EVENT_41H_02H)			\
-__PMC_EV(UCP, EVENT_41H_04H)			\
-__PMC_EV(UCP, EVENT_41H_08H)			\
-__PMC_EV(UCP, EVENT_41H_10H)			\
-__PMC_EV(UCP, EVENT_41H_20H)			\
-__PMC_EV(UCP, EVENT_41H_07H)			\
-__PMC_EV(UCP, EVENT_41H_38H)			\
-__PMC_EV(UCP, EVENT_42H_01H)			\
-__PMC_EV(UCP, EVENT_42H_02H)			\
-__PMC_EV(UCP, EVENT_42H_04H)			\
-__PMC_EV(UCP, EVENT_42H_08H)			\
-__PMC_EV(UCP, EVENT_43H_01H)			\
-__PMC_EV(UCP, EVENT_43H_02H)			\
-__PMC_EV(UCP, EVENT_60H_01H)			\
-__PMC_EV(UCP, EVENT_60H_02H)			\
-__PMC_EV(UCP, EVENT_60H_04H)			\
-__PMC_EV(UCP, EVENT_61H_01H)			\
-__PMC_EV(UCP, EVENT_61H_02H)			\
-__PMC_EV(UCP, EVENT_61H_04H)			\
-__PMC_EV(UCP, EVENT_62H_01H)			\
-__PMC_EV(UCP, EVENT_62H_02H)			\
-__PMC_EV(UCP, EVENT_62H_04H)			\
-__PMC_EV(UCP, EVENT_63H_01H)			\
-__PMC_EV(UCP, EVENT_63H_02H)			\
-__PMC_EV(UCP, EVENT_63H_04H)			\
-__PMC_EV(UCP, EVENT_63H_08H)			\
-__PMC_EV(UCP, EVENT_63H_10H)			\
-__PMC_EV(UCP, EVENT_63H_20H)			\
-__PMC_EV(UCP, EVENT_64H_01H)			\
-__PMC_EV(UCP, EVENT_64H_02H)			\
-__PMC_EV(UCP, EVENT_64H_04H)			\
-__PMC_EV(UCP, EVENT_64H_08H)			\
-__PMC_EV(UCP, EVENT_64H_10H)			\
-__PMC_EV(UCP, EVENT_64H_20H)			\
-__PMC_EV(UCP, EVENT_65H_01H)			\
-__PMC_EV(UCP, EVENT_65H_02H)			\
-__PMC_EV(UCP, EVENT_65H_04H)			\
-__PMC_EV(UCP, EVENT_66H_01H)			\
-__PMC_EV(UCP, EVENT_66H_02H)			\
-__PMC_EV(UCP, EVENT_66H_04H)			\
-__PMC_EV(UCP, EVENT_67H_01H)			\
-__PMC_EV(UCP, EVENT_80H_01H)			\
-__PMC_EV(UCP, EVENT_80H_02H)			\
-__PMC_EV(UCP, EVENT_80H_04H)			\
-__PMC_EV(UCP, EVENT_80H_08H)			\
-__PMC_EV(UCP, EVENT_81H_01H)			\
-__PMC_EV(UCP, EVENT_81H_02H)			\
-__PMC_EV(UCP, EVENT_81H_04H)			\
-__PMC_EV(UCP, EVENT_81H_08H)			\
-__PMC_EV(UCP, EVENT_81H_20H)			\
-__PMC_EV(UCP, EVENT_81H_80H)			\
-__PMC_EV(UCP, EVENT_82H_01H)			\
-__PMC_EV(UCP, EVENT_83H_01H)			\
-__PMC_EV(UCP, EVENT_83H_02H)			\
-__PMC_EV(UCP, EVENT_83H_04H)			\
-__PMC_EV(UCP, EVENT_83H_08H)			\
-__PMC_EV(UCP, EVENT_84H_01H)			\
-__PMC_EV(UCP, EVENT_84H_02H)			\
-__PMC_EV(UCP, EVENT_84H_04H)			\
-__PMC_EV(UCP, EVENT_84H_08H)			\
-__PMC_EV(UCP, EVENT_85H_02H)			\
-__PMC_EV(UCP, EVENT_86H_01H)
-
-#define	PMC_EV_UCP_FIRST	PMC_EV_UCP_EVENT_00H_01H
-#define	PMC_EV_UCP_LAST		PMC_EV_UCP_EVENT_86H_01H
-
-#define	__PMC_EV_ALIAS_COREI7UC()					\
-__PMC_EV_ALIAS("GQ_CYCLES_FULL.READ_TRACKER", UCP_EVENT_00H_01H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_FULL.WRITE_TRACKER", UCP_EVENT_00H_02H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_FULL.PEER_PROBE_TRACKER", UCP_EVENT_00H_04H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_NOT_EMPTY.READ_TRACKER", UCP_EVENT_01H_01H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_NOT_EMPTY.WRITE_TRACKER", UCP_EVENT_01H_02H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_NOT_EMPTY.PEER_PROBE_TRACKER",		\
-    UCP_EVENT_01H_04H)							\
-__PMC_EV_ALIAS("GQ_ALLOC.READ_TRACKER", UCP_EVENT_03H_01H)		\
-__PMC_EV_ALIAS("GQ_ALLOC.RT_L3_MISS", UCP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("GQ_ALLOC.RT_TO_L3_RESP", UCP_EVENT_03H_04H)		\
-__PMC_EV_ALIAS("GQ_ALLOC.RT_TO_RTID_ACQUIRED", UCP_EVENT_03H_08H)	\
-__PMC_EV_ALIAS("GQ_ALLOC.WT_TO_RTID_ACQUIRED", UCP_EVENT_03H_10H)	\
-__PMC_EV_ALIAS("GQ_ALLOC.WRITE_TRACKER", UCP_EVENT_03H_20H)		\
-__PMC_EV_ALIAS("GQ_ALLOC.PEER_PROBE_TRACKER", UCP_EVENT_03H_40H)	\
-__PMC_EV_ALIAS("GQ_DATA.FROM_QPI", UCP_EVENT_04H_01H)			\
-__PMC_EV_ALIAS("GQ_DATA.FROM_QMC", UCP_EVENT_04H_02H)			\
-__PMC_EV_ALIAS("GQ_DATA.FROM_L3", UCP_EVENT_04H_04H)			\
-__PMC_EV_ALIAS("GQ_DATA.FROM_CORES_02", UCP_EVENT_04H_08H)		\
-__PMC_EV_ALIAS("GQ_DATA.FROM_CORES_13", UCP_EVENT_04H_10H)		\
-__PMC_EV_ALIAS("GQ_DATA.TO_QPI_QMC", UCP_EVENT_05H_01H)			\
-__PMC_EV_ALIAS("GQ_DATA.TO_L3", UCP_EVENT_05H_02H)			\
-__PMC_EV_ALIAS("GQ_DATA.TO_CORES", UCP_EVENT_05H_04H)			\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.I_STATE", UCP_EVENT_06H_01H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.S_STATE", UCP_EVENT_06H_02H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.FWD_S_STATE", UCP_EVENT_06H_04H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.FWD_I_STATE", UCP_EVENT_06H_08H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.CONFLICT", UCP_EVENT_06H_10H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.WB", UCP_EVENT_06H_20H)		\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.I_STATE", UCP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.S_STATE", UCP_EVENT_07H_02H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.FWD_S_STATE", UCP_EVENT_07H_04H)\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.FWD_I_STATE", UCP_EVENT_07H_08H)\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.CONFLICT", UCP_EVENT_07H_10H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.WB", UCP_EVENT_07H_20H)		\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.HITM", UCP_EVENT_07H_24H)	\
-__PMC_EV_ALIAS("L3_HITS.READ", UCP_EVENT_08H_01H)			\
-__PMC_EV_ALIAS("L3_HITS.WRITE", UCP_EVENT_08H_02H)			\
-__PMC_EV_ALIAS("L3_HITS.PROBE", UCP_EVENT_08H_04H)			\
-__PMC_EV_ALIAS("L3_HITS.ANY", UCP_EVENT_08H_03H)			\
-__PMC_EV_ALIAS("L3_MISS.READ", UCP_EVENT_09H_01H)			\
-__PMC_EV_ALIAS("L3_MISS.WRITE", UCP_EVENT_09H_02H)			\
-__PMC_EV_ALIAS("L3_MISS.PROBE", UCP_EVENT_09H_04H)			\
-__PMC_EV_ALIAS("L3_MISS.ANY", UCP_EVENT_09H_03H)			\
-__PMC_EV_ALIAS("L3_LINES_IN.M_STATE", UCP_EVENT_0AH_01H)		\
-__PMC_EV_ALIAS("L3_LINES_IN.E_STATE", UCP_EVENT_0AH_02H)		\
-__PMC_EV_ALIAS("L3_LINES_IN.S_STATE", UCP_EVENT_0AH_04H)		\
-__PMC_EV_ALIAS("L3_LINES_IN.F_STATE", UCP_EVENT_0AH_08H)		\
-__PMC_EV_ALIAS("L3_LINES_IN.ANY", UCP_EVENT_0AH_0FH)			\
-__PMC_EV_ALIAS("L3_LINES_OUT.M_STATE", UCP_EVENT_0BH_01H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.E_STATE", UCP_EVENT_0BH_02H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.S_STATE", UCP_EVENT_0BH_04H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.I_STATE", UCP_EVENT_0BH_08H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.F_STATE", UCP_EVENT_0BH_10H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.ANY", UCP_EVENT_0BH_1FH)			\
-__PMC_EV_ALIAS("QHL_REQUESTS.IOH_READS", UCP_EVENT_20H_01H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.IOH_WRITES", UCP_EVENT_20H_02H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.REMOTE_READS", UCP_EVENT_20H_04H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.REMOTE_WRITES", UCP_EVENT_20H_08H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.LOCAL_READS", UCP_EVENT_20H_10H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.LOCAL_WRITES", UCP_EVENT_20H_20H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_FULL.IOH", UCP_EVENT_21H_01H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_FULL.REMOTE", UCP_EVENT_21H_02H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_FULL.LOCAL", UCP_EVENT_21H_04H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_NOT_EMPTY.IOH", UCP_EVENT_22H_01H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_NOT_EMPTY.REMOTE", UCP_EVENT_22H_02H)	\
-__PMC_EV_ALIAS("QHL_CYCLES_NOT_EMPTY.LOCAL", UCP_EVENT_22H_04H)		\
-__PMC_EV_ALIAS("QHL_OCCUPANCY.IOH", UCP_EVENT_23H_01H)			\
-__PMC_EV_ALIAS("QHL_OCCUPANCY.REMOTE", UCP_EVENT_23H_02H)		\
-__PMC_EV_ALIAS("QHL_OCCUPANCY.LOCAL", UCP_EVENT_23H_04H)		\
-__PMC_EV_ALIAS("QHL_ADDRESS_CONFLICTS.2WAY", UCP_EVENT_24H_02H)		\
-__PMC_EV_ALIAS("QHL_ADDRESS_CONFLICTS.3WAY", UCP_EVENT_24H_04H)		\
-__PMC_EV_ALIAS("QHL_CONFLICT_CYCLES.IOH", UCP_EVENT_25H_01H)		\
-__PMC_EV_ALIAS("QHL_CONFLICT_CYCLES.REMOTE", UCP_EVENT_25H_02H)		\
-__PMC_EV_ALIAS("QHL_CONFLICT_CYCLES.LOCAL", UCP_EVENT_25H_04H)		\
-__PMC_EV_ALIAS("QHL_TO_QMC_BYPASS", UCP_EVENT_26H_01H)			\
-__PMC_EV_ALIAS("QMC_NORMAL_FULL.READ.CH0", UCP_EVENT_27H_01H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_FULL.READ.CH1", UCP_EVENT_27H_02H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_FULL.READ.CH2", UCP_EVENT_27H_04H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_FULL.WRITE.CH0", UCP_EVENT_27H_08H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_FULL.WRITE.CH1", UCP_EVENT_27H_10H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_FULL.WRITE.CH2", UCP_EVENT_27H_20H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.READ.CH0", UCP_EVENT_28H_01H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.READ.CH1", UCP_EVENT_28H_02H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.READ.CH2", UCP_EVENT_28H_04H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.WRITE.CH0", UCP_EVENT_28H_08H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.WRITE.CH1", UCP_EVENT_28H_10H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.WRITE.CH2", UCP_EVENT_28H_20H)		\
-__PMC_EV_ALIAS("QMC_BUSY.READ.CH0", UCP_EVENT_29H_01H)			\
-__PMC_EV_ALIAS("QMC_BUSY.READ.CH1", UCP_EVENT_29H_02H)			\
-__PMC_EV_ALIAS("QMC_BUSY.READ.CH2", UCP_EVENT_29H_04H)			\
-__PMC_EV_ALIAS("QMC_BUSY.WRITE.CH0", UCP_EVENT_29H_08H)			\
-__PMC_EV_ALIAS("QMC_BUSY.WRITE.CH1", UCP_EVENT_29H_10H)			\
-__PMC_EV_ALIAS("QMC_BUSY.WRITE.CH2", UCP_EVENT_29H_20H)			\
-__PMC_EV_ALIAS("QMC_OCCUPANCY.CH0", UCP_EVENT_2AH_01H)			\
-__PMC_EV_ALIAS("QMC_OCCUPANCY.CH1", UCP_EVENT_2AH_02H)			\
-__PMC_EV_ALIAS("QMC_OCCUPANCY.CH2", UCP_EVENT_2AH_04H)			\
-__PMC_EV_ALIAS("QMC_ISSOC_OCCUPANCY.CH0", UCP_EVENT_2BH_01H)		\
-__PMC_EV_ALIAS("QMC_ISSOC_OCCUPANCY.CH1", UCP_EVENT_2BH_02H)		\
-__PMC_EV_ALIAS("QMC_ISSOC_OCCUPANCY.CH2", UCP_EVENT_2BH_04H)		\
-__PMC_EV_ALIAS("QMC_ISSOC_READS.ANY", UCP_EVENT_2BH_07H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_READS.CH0", UCP_EVENT_2CH_01H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_READS.CH1", UCP_EVENT_2CH_02H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_READS.CH2", UCP_EVENT_2CH_04H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_READS.ANY", UCP_EVENT_2CH_07H)		\
-__PMC_EV_ALIAS("QMC_HIGH_PRIORITY_READS.CH0", UCP_EVENT_2DH_01H)	\
-__PMC_EV_ALIAS("QMC_HIGH_PRIORITY_READS.CH1", UCP_EVENT_2DH_02H)	\
-__PMC_EV_ALIAS("QMC_HIGH_PRIORITY_READS.CH2", UCP_EVENT_2DH_04H)	\
-__PMC_EV_ALIAS("QMC_HIGH_PRIORITY_READS.ANY", UCP_EVENT_2DH_07H)	\
-__PMC_EV_ALIAS("QMC_CRITICAL_PRIORITY_READS.CH0", UCP_EVENT_2EH_01H)	\
-__PMC_EV_ALIAS("QMC_CRITICAL_PRIORITY_READS.CH1", UCP_EVENT_2EH_02H)	\
-__PMC_EV_ALIAS("QMC_CRITICAL_PRIORITY_READS.CH2", UCP_EVENT_2EH_04H)	\
-__PMC_EV_ALIAS("QMC_CRITICAL_PRIORITY_READS.ANY", UCP_EVENT_2EH_07H)	\
-__PMC_EV_ALIAS("QMC_WRITES.FULL.CH0", UCP_EVENT_2FH_01H)		\
-__PMC_EV_ALIAS("QMC_WRITES.FULL.CH1", UCP_EVENT_2FH_02H)		\
-__PMC_EV_ALIAS("QMC_WRITES.FULL.CH2", UCP_EVENT_2FH_04H)		\
-__PMC_EV_ALIAS("QMC_WRITES.FULL.ANY", UCP_EVENT_2FH_07H)		\
-__PMC_EV_ALIAS("QMC_WRITES.PARTIAL.CH0", UCP_EVENT_2FH_08H)		\
-__PMC_EV_ALIAS("QMC_WRITES.PARTIAL.CH1", UCP_EVENT_2FH_10H)		\
-__PMC_EV_ALIAS("QMC_WRITES.PARTIAL.CH2", UCP_EVENT_2FH_20H)		\
-__PMC_EV_ALIAS("QMC_WRITES.PARTIAL.ANY", UCP_EVENT_2FH_38H)		\
-__PMC_EV_ALIAS("QMC_CANCEL.CH0", UCP_EVENT_30H_01H)			\
-__PMC_EV_ALIAS("QMC_CANCEL.CH1", UCP_EVENT_30H_02H)			\
-__PMC_EV_ALIAS("QMC_CANCEL.CH2", UCP_EVENT_30H_04H)			\
-__PMC_EV_ALIAS("QMC_CANCEL.ANY", UCP_EVENT_30H_07H)			\
-__PMC_EV_ALIAS("QMC_PRIORITY_UPDATES.CH0", UCP_EVENT_31H_01H)		\
-__PMC_EV_ALIAS("QMC_PRIORITY_UPDATES.CH1", UCP_EVENT_31H_02H)		\
-__PMC_EV_ALIAS("QMC_PRIORITY_UPDATES.CH2", UCP_EVENT_31H_04H)		\
-__PMC_EV_ALIAS("QMC_PRIORITY_UPDATES.ANY", UCP_EVENT_31H_07H)		\
-__PMC_EV_ALIAS("QHL_FRC_ACK_CNFLTS.LOCAL", UCP_EVENT_33H_04H)		\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_0",		\
-    UCP_EVENT_40H_01H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.SNOOP.LINK_0",		\
-    UCP_EVENT_40H_02H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.NDR.LINK_0",			\
-    UCP_EVENT_40H_04H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_1",		\
-    UCP_EVENT_40H_08H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.SNOOP.LINK_1",		\
-    UCP_EVENT_40H_10H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.NDR.LINK_1",			\
-    UCP_EVENT_40H_20H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.LINK_0", UCP_EVENT_40H_07H)	\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.LINK_1", UCP_EVENT_40H_38H)	\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.DRS.LINK_0",			\
-    UCP_EVENT_41H_01H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.NCB.LINK_0",			\
-    UCP_EVENT_41H_02H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.NCS.LINK_0",			\
-    UCP_EVENT_41H_04H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.DRS.LINK_1",			\
-    UCP_EVENT_41H_08H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.NCB.LINK_1",			\
-    UCP_EVENT_41H_10H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.NCS.LINK_1",			\
-    UCP_EVENT_41H_20H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.LINK_0", UCP_EVENT_41H_07H)	\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.LINK_1", UCP_EVENT_41H_38H)	\
-__PMC_EV_ALIAS("QPI_TX_HEADER.BUSY.LINK_0", UCP_EVENT_42H_02H)		\
-__PMC_EV_ALIAS("QPI_TX_HEADER.BUSY.LINK_1", UCP_EVENT_42H_08H)		\
-__PMC_EV_ALIAS("QPI_RX_NO_PPT_CREDIT.STALLS.LINK_0", UCP_EVENT_43H_01H)	\
-__PMC_EV_ALIAS("QPI_RX_NO_PPT_CREDIT.STALLS.LINK_1", UCP_EVENT_43H_02H)	\
-__PMC_EV_ALIAS("DRAM_OPEN.CH0", UCP_EVENT_60H_01H)			\
-__PMC_EV_ALIAS("DRAM_OPEN.CH1", UCP_EVENT_60H_02H)			\
-__PMC_EV_ALIAS("DRAM_OPEN.CH2", UCP_EVENT_60H_04H)			\
-__PMC_EV_ALIAS("DRAM_PAGE_CLOSE.CH0", UCP_EVENT_61H_01H)		\
-__PMC_EV_ALIAS("DRAM_PAGE_CLOSE.CH1", UCP_EVENT_61H_02H)		\
-__PMC_EV_ALIAS("DRAM_PAGE_CLOSE.CH2", UCP_EVENT_61H_04H)		\
-__PMC_EV_ALIAS("DRAM_PAGE_MISS.CH0", UCP_EVENT_62H_01H)			\
-__PMC_EV_ALIAS("DRAM_PAGE_MISS.CH1", UCP_EVENT_62H_02H)			\
-__PMC_EV_ALIAS("DRAM_PAGE_MISS.CH2", UCP_EVENT_62H_04H)			\
-__PMC_EV_ALIAS("DRAM_READ_CAS.CH0", UCP_EVENT_63H_01H)			\
-__PMC_EV_ALIAS("DRAM_READ_CAS.AUTOPRE_CH0", UCP_EVENT_63H_02H)		\
-__PMC_EV_ALIAS("DRAM_READ_CAS.CH1", UCP_EVENT_63H_04H)			\
-__PMC_EV_ALIAS("DRAM_READ_CAS.AUTOPRE_CH1", UCP_EVENT_63H_08H)		\
-__PMC_EV_ALIAS("DRAM_READ_CAS.CH2", UCP_EVENT_63H_10H)			\
-__PMC_EV_ALIAS("DRAM_READ_CAS.AUTOPRE_CH2", UCP_EVENT_63H_20H)		\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.CH0", UCP_EVENT_64H_01H)			\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.AUTOPRE_CH0", UCP_EVENT_64H_02H)		\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.CH1", UCP_EVENT_64H_04H)			\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.AUTOPRE_CH1", UCP_EVENT_64H_08H)		\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.CH2", UCP_EVENT_64H_10H)			\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.AUTOPRE_CH2", UCP_EVENT_64H_20H)		\
-__PMC_EV_ALIAS("DRAM_REFRESH.CH0", UCP_EVENT_65H_01H)			\
-__PMC_EV_ALIAS("DRAM_REFRESH.CH1", UCP_EVENT_65H_02H)			\
-__PMC_EV_ALIAS("DRAM_REFRESH.CH2", UCP_EVENT_65H_04H)			\
-__PMC_EV_ALIAS("DRAM_PRE_ALL.CH0", UCP_EVENT_66H_01H)			\
-__PMC_EV_ALIAS("DRAM_PRE_ALL.CH1", UCP_EVENT_66H_02H)			\
-__PMC_EV_ALIAS("DRAM_PRE_ALL.CH2", UCP_EVENT_66H_04H)
-
-/*
- * Aliases for Haswell uncore PMC events
- */
-#define __PMC_EV_ALIAS_HASWELLUC()					\
-__PMC_EV_ALIAS("UNC_CBO_XSNP_RESPONSE.MISS", UCP_EVENT_22H_01H)		\
-__PMC_EV_ALIAS("UNC_CBO_XSNP_RESPONSE.INVAL", UCP_EVENT_22H_02H)	\
-__PMC_EV_ALIAS("UNC_CBO_XSNP_RESPONSE.HIT", UCP_EVENT_22H_04H)		\
-__PMC_EV_ALIAS("UNC_CBO_XSNP_RESPONSE.HITM", UCP_EVENT_22H_08H)		\
-__PMC_EV_ALIAS("UNC_CBO_XSNP_RESPONSE.INVAL_M", UCP_EVENT_22H_10H)	\
-__PMC_EV_ALIAS("UNC_CBO_XSNP_RESPONSE.EXTERNAL_FILTER",			\
-    UCP_EVENT_22H_20H)							\
-__PMC_EV_ALIAS("UNC_CBO_XSNP_RESPONSE.XCORE_FILTER", UCP_EVENT_22H_40H)	\
-__PMC_EV_ALIAS("UNC_CBO_XSNP_RESPONSE.EVICTION_FILTER",			\
-    UCP_EVENT_22H_80H)							\
-__PMC_EV_ALIAS("UNC_CBO_CACHE_LOOKUP.M", UCP_EVENT_34H_01H)		\
-__PMC_EV_ALIAS("UNC_CBO_CACHE_LOOKUP.ES", UCP_EVENT_34H_06H)		\
-__PMC_EV_ALIAS("UNC_CBO_CACHE_LOOKUP.I", UCP_EVENT_34H_08H)		\
-__PMC_EV_ALIAS("UNC_CBO_CACHE_LOOKUP.READ_FILTER", UCP_EVENT_34H_10H)	\
-__PMC_EV_ALIAS("UNC_CBO_CACHE_LOOKUP.WRITE_FILTER", UCP_EVENT_34H_20H)	\
-__PMC_EV_ALIAS("UNC_CBO_CACHE_LOOKUP.EXTSNP_FILTER", UCP_EVENT_34H_40H)	\
-__PMC_EV_ALIAS("UNC_CBO_CACHE_LOOKUP.ANY_REQUEST_FILTER",		\
-    UCP_EVENT_34H_80H)							\
-__PMC_EV_ALIAS("UNC_ARB_TRK_OCCUPANCY.ALL", UCP_EVENT_80H_01H)		\
-__PMC_EV_ALIAS("UNC_ARB_TRK_REQUEST.ALL", UCP_EVENT_81H_01H)		\
-__PMC_EV_ALIAS("UNC_ARB_TRK_REQUEST.WRITES", UCP_EVENT_81H_20H)		\
-__PMC_EV_ALIAS("UNC_ARB_TRK_REQUEST.EVICTIONS", UCP_EVENT_81H_80H)	\
-__PMC_EV_ALIAS("UNC_ARB_COH_TRK_OCCUPANCY.ALL", UCP_EVENT_83H_01H)	\
-__PMC_EV_ALIAS("UNC_ARB_COH_TRK_REQUEST.ALL", UCP_EVENT_84H_01H)
-
-
-#define	__PMC_EV_ALIAS_WESTMEREUC()					\
-__PMC_EV_ALIAS("GQ_CYCLES_FULL.READ_TRACKER", UCP_EVENT_00H_01H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_FULL.WRITE_TRACKER", UCP_EVENT_00H_02H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_FULL.PEER_PROBE_TRACKER", UCP_EVENT_00H_04H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_NOT_EMPTY.READ_TRACKER", UCP_EVENT_01H_01H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_NOT_EMPTY.WRITE_TRACKER", UCP_EVENT_01H_02H)	\
-__PMC_EV_ALIAS("GQ_CYCLES_NOT_EMPTY.PEER_PROBE_TRACKER",		\
-    UCP_EVENT_01H_04H)							\
-__PMC_EV_ALIAS("GQ_OCCUPANCY.READ_TRACKER", UCP_EVENT_02H_01H)		\
-__PMC_EV_ALIAS("GQ_ALLOC.READ_TRACKER", UCP_EVENT_03H_01H)		\
-__PMC_EV_ALIAS("GQ_ALLOC.RT_L3_MISS", UCP_EVENT_03H_02H)		\
-__PMC_EV_ALIAS("GQ_ALLOC.RT_TO_L3_RESP", UCP_EVENT_03H_04H)		\
-__PMC_EV_ALIAS("GQ_ALLOC.RT_TO_RTID_ACQUIRED", UCP_EVENT_03H_08H)	\
-__PMC_EV_ALIAS("GQ_ALLOC.WT_TO_RTID_ACQUIRED", UCP_EVENT_03H_10H)	\
-__PMC_EV_ALIAS("GQ_ALLOC.WRITE_TRACKER", UCP_EVENT_03H_20H)		\
-__PMC_EV_ALIAS("GQ_ALLOC.PEER_PROBE_TRACKER", UCP_EVENT_03H_40H)	\
-__PMC_EV_ALIAS("GQ_DATA.FROM_QPI", UCP_EVENT_04H_01H)			\
-__PMC_EV_ALIAS("GQ_DATA.FROM_QMC", UCP_EVENT_04H_02H)			\
-__PMC_EV_ALIAS("GQ_DATA.FROM_L3", UCP_EVENT_04H_04H)			\
-__PMC_EV_ALIAS("GQ_DATA.FROM_CORES_02", UCP_EVENT_04H_08H)		\
-__PMC_EV_ALIAS("GQ_DATA.FROM_CORES_13", UCP_EVENT_04H_10H)		\
-__PMC_EV_ALIAS("GQ_DATA.TO_QPI_QMC", UCP_EVENT_05H_01H)			\
-__PMC_EV_ALIAS("GQ_DATA.TO_L3", UCP_EVENT_05H_02H)			\
-__PMC_EV_ALIAS("GQ_DATA.TO_CORES", UCP_EVENT_05H_04H)			\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.I_STATE", UCP_EVENT_06H_01H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.S_STATE", UCP_EVENT_06H_02H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.FWD_S_STATE", UCP_EVENT_06H_04H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.FWD_I_STATE", UCP_EVENT_06H_08H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.CONFLICT", UCP_EVENT_06H_10H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_LOCAL_HOME.WB", UCP_EVENT_06H_20H)		\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.I_STATE", UCP_EVENT_07H_01H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.S_STATE", UCP_EVENT_07H_02H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.FWD_S_STATE", UCP_EVENT_07H_04H)\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.FWD_I_STATE", UCP_EVENT_07H_08H)\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.CONFLICT", UCP_EVENT_07H_10H)	\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.WB", UCP_EVENT_07H_20H)		\
-__PMC_EV_ALIAS("SNP_RESP_TO_REMOTE_HOME.HITM", UCP_EVENT_07H_24H)	\
-__PMC_EV_ALIAS("L3_HITS.READ", UCP_EVENT_08H_01H)			\
-__PMC_EV_ALIAS("L3_HITS.WRITE", UCP_EVENT_08H_02H)			\
-__PMC_EV_ALIAS("L3_HITS.PROBE", UCP_EVENT_08H_04H)			\
-__PMC_EV_ALIAS("L3_HITS.ANY", UCP_EVENT_08H_03H)			\
-__PMC_EV_ALIAS("L3_MISS.READ", UCP_EVENT_09H_01H)			\
-__PMC_EV_ALIAS("L3_MISS.WRITE", UCP_EVENT_09H_02H)			\
-__PMC_EV_ALIAS("L3_MISS.PROBE", UCP_EVENT_09H_04H)			\
-__PMC_EV_ALIAS("L3_MISS.ANY", UCP_EVENT_09H_03H)			\
-__PMC_EV_ALIAS("L3_LINES_IN.M_STATE", UCP_EVENT_0AH_01H)		\
-__PMC_EV_ALIAS("L3_LINES_IN.E_STATE", UCP_EVENT_0AH_02H)		\
-__PMC_EV_ALIAS("L3_LINES_IN.S_STATE", UCP_EVENT_0AH_04H)		\
-__PMC_EV_ALIAS("L3_LINES_IN.F_STATE", UCP_EVENT_0AH_08H)		\
-__PMC_EV_ALIAS("L3_LINES_IN.ANY", UCP_EVENT_0AH_0FH)			\
-__PMC_EV_ALIAS("L3_LINES_OUT.M_STATE", UCP_EVENT_0BH_01H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.E_STATE", UCP_EVENT_0BH_02H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.S_STATE", UCP_EVENT_0BH_04H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.I_STATE", UCP_EVENT_0BH_08H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.F_STATE", UCP_EVENT_0BH_10H)		\
-__PMC_EV_ALIAS("L3_LINES_OUT.ANY", UCP_EVENT_0BH_1FH)			\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S", UCP_EVENT_0CH_01H)			\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I", UCP_EVENT_0CH_02H)			\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S_HIT_E", UCP_EVENT_0CH_04H_E)		\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S_HIT_F", UCP_EVENT_0CH_04H_F)		\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S_HIT_M", UCP_EVENT_0CH_04H_M)		\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_S_HIT_S", UCP_EVENT_0CH_04H_S)		\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I_HIT_E", UCP_EVENT_0CH_08H_E)		\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I_HIT_F", UCP_EVENT_0CH_08H_F)		\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I_HIT_M", UCP_EVENT_0CH_08H_M)		\
-__PMC_EV_ALIAS("GQ_SNOOP.GOTO_I_HIT_S", UCP_EVENT_0CH_08H_S)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.IOH_READS", UCP_EVENT_20H_01H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.IOH_WRITES", UCP_EVENT_20H_02H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.REMOTE_READS", UCP_EVENT_20H_04H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.REMOTE_WRITES", UCP_EVENT_20H_08H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.LOCAL_READS", UCP_EVENT_20H_10H)		\
-__PMC_EV_ALIAS("QHL_REQUESTS.LOCAL_WRITES", UCP_EVENT_20H_20H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_FULL.IOH", UCP_EVENT_21H_01H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_FULL.REMOTE", UCP_EVENT_21H_02H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_FULL.LOCAL", UCP_EVENT_21H_04H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_NOT_EMPTY.IOH", UCP_EVENT_22H_01H)		\
-__PMC_EV_ALIAS("QHL_CYCLES_NOT_EMPTY.REMOTE", UCP_EVENT_22H_02H)	\
-__PMC_EV_ALIAS("QHL_CYCLES_NOT_EMPTY.LOCAL", UCP_EVENT_22H_04H)		\
-__PMC_EV_ALIAS("QHL_OCCUPANCY.IOH", UCP_EVENT_23H_01H)			\
-__PMC_EV_ALIAS("QHL_OCCUPANCY.REMOTE", UCP_EVENT_23H_02H)		\
-__PMC_EV_ALIAS("QHL_OCCUPANCY.LOCAL", UCP_EVENT_23H_04H)		\
-__PMC_EV_ALIAS("QHL_ADDRESS_CONFLICTS.2WAY", UCP_EVENT_24H_02H)		\
-__PMC_EV_ALIAS("QHL_ADDRESS_CONFLICTS.3WAY", UCP_EVENT_24H_04H)		\
-__PMC_EV_ALIAS("QHL_CONFLICT_CYCLES.IOH", UCP_EVENT_25H_01H)		\
-__PMC_EV_ALIAS("QHL_CONFLICT_CYCLES.REMOTE", UCP_EVENT_25H_02H)		\
-__PMC_EV_ALIAS("QHL_CONFLICT_CYCLES.LOCAL", UCP_EVENT_25H_04H)		\
-__PMC_EV_ALIAS("QHL_TO_QMC_BYPASS", UCP_EVENT_26H_01H)			\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.READ.CH0", UCP_EVENT_28H_01H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.READ.CH1", UCP_EVENT_28H_02H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.READ.CH2", UCP_EVENT_28H_04H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.WRITE.CH0", UCP_EVENT_28H_08H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.WRITE.CH1", UCP_EVENT_28H_10H)		\
-__PMC_EV_ALIAS("QMC_ISOC_FULL.WRITE.CH2", UCP_EVENT_28H_20H)		\
-__PMC_EV_ALIAS("QMC_BUSY.READ.CH0", UCP_EVENT_29H_01H)			\
-__PMC_EV_ALIAS("QMC_BUSY.READ.CH1", UCP_EVENT_29H_02H)			\
-__PMC_EV_ALIAS("QMC_BUSY.READ.CH2", UCP_EVENT_29H_04H)			\
-__PMC_EV_ALIAS("QMC_BUSY.WRITE.CH0", UCP_EVENT_29H_08H)			\
-__PMC_EV_ALIAS("QMC_BUSY.WRITE.CH1", UCP_EVENT_29H_10H)			\
-__PMC_EV_ALIAS("QMC_BUSY.WRITE.CH2", UCP_EVENT_29H_20H)			\
-__PMC_EV_ALIAS("QMC_OCCUPANCY.CH0", UCP_EVENT_2AH_01H)			\
-__PMC_EV_ALIAS("QMC_OCCUPANCY.CH1", UCP_EVENT_2AH_02H)			\
-__PMC_EV_ALIAS("QMC_OCCUPANCY.CH2", UCP_EVENT_2AH_04H)			\
-__PMC_EV_ALIAS("QMC_OCCUPANCY.ANY", UCP_EVENT_2AH_07H)			\
-__PMC_EV_ALIAS("QMC_ISSOC_OCCUPANCY.CH0", UCP_EVENT_2BH_01H)		\
-__PMC_EV_ALIAS("QMC_ISSOC_OCCUPANCY.CH1", UCP_EVENT_2BH_02H)		\
-__PMC_EV_ALIAS("QMC_ISSOC_OCCUPANCY.CH2", UCP_EVENT_2BH_04H)		\
-__PMC_EV_ALIAS("QMC_ISSOC_READS.ANY", UCP_EVENT_2BH_07H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_READS.CH0", UCP_EVENT_2CH_01H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_READS.CH1", UCP_EVENT_2CH_02H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_READS.CH2", UCP_EVENT_2CH_04H)		\
-__PMC_EV_ALIAS("QMC_NORMAL_READS.ANY", UCP_EVENT_2CH_07H)		\
-__PMC_EV_ALIAS("QMC_HIGH_PRIORITY_READS.CH0", UCP_EVENT_2DH_01H)	\
-__PMC_EV_ALIAS("QMC_HIGH_PRIORITY_READS.CH1", UCP_EVENT_2DH_02H)	\
-__PMC_EV_ALIAS("QMC_HIGH_PRIORITY_READS.CH2", UCP_EVENT_2DH_04H)	\
-__PMC_EV_ALIAS("QMC_HIGH_PRIORITY_READS.ANY", UCP_EVENT_2DH_07H)	\
-__PMC_EV_ALIAS("QMC_CRITICAL_PRIORITY_READS.CH0", UCP_EVENT_2EH_01H)	\
-__PMC_EV_ALIAS("QMC_CRITICAL_PRIORITY_READS.CH1", UCP_EVENT_2EH_02H)	\
-__PMC_EV_ALIAS("QMC_CRITICAL_PRIORITY_READS.CH2", UCP_EVENT_2EH_04H)	\
-__PMC_EV_ALIAS("QMC_CRITICAL_PRIORITY_READS.ANY", UCP_EVENT_2EH_07H)	\
-__PMC_EV_ALIAS("QMC_WRITES.FULL.CH0", UCP_EVENT_2FH_01H)		\
-__PMC_EV_ALIAS("QMC_WRITES.FULL.CH1", UCP_EVENT_2FH_02H)		\
-__PMC_EV_ALIAS("QMC_WRITES.FULL.CH2", UCP_EVENT_2FH_04H)		\
-__PMC_EV_ALIAS("QMC_WRITES.FULL.ANY", UCP_EVENT_2FH_07H)		\
-__PMC_EV_ALIAS("QMC_WRITES.PARTIAL.CH0", UCP_EVENT_2FH_08H)		\
-__PMC_EV_ALIAS("QMC_WRITES.PARTIAL.CH1", UCP_EVENT_2FH_10H)		\
-__PMC_EV_ALIAS("QMC_WRITES.PARTIAL.CH2", UCP_EVENT_2FH_20H)		\
-__PMC_EV_ALIAS("QMC_WRITES.PARTIAL.ANY", UCP_EVENT_2FH_38H)		\
-__PMC_EV_ALIAS("QMC_CANCEL.CH0", UCP_EVENT_30H_01H)			\
-__PMC_EV_ALIAS("QMC_CANCEL.CH1", UCP_EVENT_30H_02H)			\
-__PMC_EV_ALIAS("QMC_CANCEL.CH2", UCP_EVENT_30H_04H)			\
-__PMC_EV_ALIAS("QMC_CANCEL.ANY", UCP_EVENT_30H_07H)			\
-__PMC_EV_ALIAS("QMC_PRIORITY_UPDATES.CH0", UCP_EVENT_31H_01H)		\
-__PMC_EV_ALIAS("QMC_PRIORITY_UPDATES.CH1", UCP_EVENT_31H_02H)		\
-__PMC_EV_ALIAS("QMC_PRIORITY_UPDATES.CH2", UCP_EVENT_31H_04H)		\
-__PMC_EV_ALIAS("QMC_PRIORITY_UPDATES.ANY", UCP_EVENT_31H_07H)		\
-__PMC_EV_ALIAS("IMC_RETRY.CH0", UCP_EVENT_32H_01H)			\
-__PMC_EV_ALIAS("IMC_RETRY.CH1", UCP_EVENT_32H_02H)			\
-__PMC_EV_ALIAS("IMC_RETRY.CH2", UCP_EVENT_32H_04H)			\
-__PMC_EV_ALIAS("IMC_RETRY.ANY", UCP_EVENT_32H_07H)			\
-__PMC_EV_ALIAS("QHL_FRC_ACK_CNFLTS.IOH", UCP_EVENT_33H_01H)		\
-__PMC_EV_ALIAS("QHL_FRC_ACK_CNFLTS.REMOTE", UCP_EVENT_33H_02H)		\
-__PMC_EV_ALIAS("QHL_FRC_ACK_CNFLTS.LOCAL", UCP_EVENT_33H_04H)		\
-__PMC_EV_ALIAS("QHL_FRC_ACK_CNFLTS.ANY", UCP_EVENT_33H_07H)		\
-__PMC_EV_ALIAS("QHL_SLEEPS.IOH_ORDER", UCP_EVENT_34H_01H)		\
-__PMC_EV_ALIAS("QHL_SLEEPS.REMOTE_ORDER", UCP_EVENT_34H_02H)		\
-__PMC_EV_ALIAS("QHL_SLEEPS.LOCAL_ORDER", UCP_EVENT_34H_04H)		\
-__PMC_EV_ALIAS("QHL_SLEEPS.IOH_CONFLICT", UCP_EVENT_34H_08H)		\
-__PMC_EV_ALIAS("QHL_SLEEPS.REMOTE_CONFLICT", UCP_EVENT_34H_10H)		\
-__PMC_EV_ALIAS("QHL_SLEEPS.LOCAL_CONFLICT", UCP_EVENT_34H_20H)		\
-__PMC_EV_ALIAS("ADDR_OPCODE_MATCH.IOH", UCP_EVENT_35H_01H)		\
-__PMC_EV_ALIAS("ADDR_OPCODE_MATCH.REMOTE", UCP_EVENT_35H_02H)		\
-__PMC_EV_ALIAS("ADDR_OPCODE_MATCH.LOCAL", UCP_EVENT_35H_04H)		\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_0",		\
-    UCP_EVENT_40H_01H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.SNOOP.LINK_0",		\
-    UCP_EVENT_40H_02H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.NDR.LINK_0",			\
-    UCP_EVENT_40H_04H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_1",		\
-    UCP_EVENT_40H_08H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.SNOOP.LINK_1",		\
-    UCP_EVENT_40H_10H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.NDR.LINK_1",			\
-    UCP_EVENT_40H_20H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.LINK_0", UCP_EVENT_40H_07H)	\
-__PMC_EV_ALIAS("QPI_TX_STALLED_SINGLE_FLIT.LINK_1", UCP_EVENT_40H_38H)	\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.DRS.LINK_0",			\
-    UCP_EVENT_41H_01H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.NCB.LINK_0",			\
-    UCP_EVENT_41H_02H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.NCS.LINK_0",			\
-    UCP_EVENT_41H_04H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.DRS.LINK_1",			\
-    UCP_EVENT_41H_08H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.NCB.LINK_1",			\
-    UCP_EVENT_41H_10H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.NCS.LINK_1",			\
-    UCP_EVENT_41H_20H)							\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.LINK_0", UCP_EVENT_41H_07H)	\
-__PMC_EV_ALIAS("QPI_TX_STALLED_MULTI_FLIT.LINK_1", UCP_EVENT_41H_38H)	\
-__PMC_EV_ALIAS("QPI_TX_HEADER.FULL.LINK_0", UCP_EVENT_42H_01H)		\
-__PMC_EV_ALIAS("QPI_TX_HEADER.BUSY.LINK_0", UCP_EVENT_42H_02H)		\
-__PMC_EV_ALIAS("QPI_TX_HEADER.FULL.LINK_1", UCP_EVENT_42H_04H)		\
-__PMC_EV_ALIAS("QPI_TX_HEADER.BUSY.LINK_1", UCP_EVENT_42H_08H)		\
-__PMC_EV_ALIAS("QPI_RX_NO_PPT_CREDIT.STALLS.LINK_0", UCP_EVENT_43H_01H)	\
-__PMC_EV_ALIAS("QPI_RX_NO_PPT_CREDIT.STALLS.LINK_1", UCP_EVENT_43H_02H)	\
-__PMC_EV_ALIAS("DRAM_OPEN.CH0", UCP_EVENT_60H_01H)			\
-__PMC_EV_ALIAS("DRAM_OPEN.CH1", UCP_EVENT_60H_02H)			\
-__PMC_EV_ALIAS("DRAM_OPEN.CH2", UCP_EVENT_60H_04H)			\
-__PMC_EV_ALIAS("DRAM_PAGE_CLOSE.CH0", UCP_EVENT_61H_01H)		\
-__PMC_EV_ALIAS("DRAM_PAGE_CLOSE.CH1", UCP_EVENT_61H_02H)		\
-__PMC_EV_ALIAS("DRAM_PAGE_CLOSE.CH2", UCP_EVENT_61H_04H)		\
-__PMC_EV_ALIAS("DRAM_PAGE_MISS.CH0", UCP_EVENT_62H_01H)			\
-__PMC_EV_ALIAS("DRAM_PAGE_MISS.CH1", UCP_EVENT_62H_02H)			\
-__PMC_EV_ALIAS("DRAM_PAGE_MISS.CH2", UCP_EVENT_62H_04H)			\
-__PMC_EV_ALIAS("DRAM_READ_CAS.CH0", UCP_EVENT_63H_01H)			\
-__PMC_EV_ALIAS("DRAM_READ_CAS.AUTOPRE_CH0", UCP_EVENT_63H_02H)		\
-__PMC_EV_ALIAS("DRAM_READ_CAS.CH1", UCP_EVENT_63H_04H)			\
-__PMC_EV_ALIAS("DRAM_READ_CAS.AUTOPRE_CH1", UCP_EVENT_63H_08H)		\
-__PMC_EV_ALIAS("DRAM_READ_CAS.CH2", UCP_EVENT_63H_10H)			\
-__PMC_EV_ALIAS("DRAM_READ_CAS.AUTOPRE_CH2", UCP_EVENT_63H_20H)		\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.CH0", UCP_EVENT_64H_01H)			\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.AUTOPRE_CH0", UCP_EVENT_64H_02H)		\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.CH1", UCP_EVENT_64H_04H)			\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.AUTOPRE_CH1", UCP_EVENT_64H_08H)		\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.CH2", UCP_EVENT_64H_10H)			\
-__PMC_EV_ALIAS("DRAM_WRITE_CAS.AUTOPRE_CH2", UCP_EVENT_64H_20H)		\
-__PMC_EV_ALIAS("DRAM_REFRESH.CH0", UCP_EVENT_65H_01H)			\
-__PMC_EV_ALIAS("DRAM_REFRESH.CH1", UCP_EVENT_65H_02H)			\
-__PMC_EV_ALIAS("DRAM_REFRESH.CH2", UCP_EVENT_65H_04H)			\
-__PMC_EV_ALIAS("DRAM_PRE_ALL.CH0", UCP_EVENT_66H_01H)			\
-__PMC_EV_ALIAS("DRAM_PRE_ALL.CH1", UCP_EVENT_66H_02H)			\
-__PMC_EV_ALIAS("DRAM_PRE_ALL.CH2", UCP_EVENT_66H_04H)			\
-__PMC_EV_ALIAS("DRAM_THERMAL_THROTTLED", UCP_EVENT_67H_01H)		\
-__PMC_EV_ALIAS("THERMAL_THROTTLING_TEMP.CORE_0", UCP_EVENT_80H_01H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLING_TEMP.CORE_1", UCP_EVENT_80H_02H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLING_TEMP.CORE_2", UCP_EVENT_80H_04H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLING_TEMP.CORE_3", UCP_EVENT_80H_08H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLED_TEMP.CORE_0", UCP_EVENT_81H_01H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLED_TEMP.CORE_1", UCP_EVENT_81H_02H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLED_TEMP.CORE_2", UCP_EVENT_81H_04H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLED_TEMP.CORE_3", UCP_EVENT_81H_08H)	\
-__PMC_EV_ALIAS("PROCHOT_ASSERTION", UCP_EVENT_82H_01H)			\
-__PMC_EV_ALIAS("THERMAL_THROTTLING_PROCHOT.CORE_0", UCP_EVENT_83H_01H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLING_PROCHOT.CORE_1", UCP_EVENT_83H_02H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLING_PROCHOT.CORE_2", UCP_EVENT_83H_04H)	\
-__PMC_EV_ALIAS("THERMAL_THROTTLING_PROCHOT.CORE_3", UCP_EVENT_83H_08H)	\
-__PMC_EV_ALIAS("TURBO_MODE.CORE_0", UCP_EVENT_84H_01H)			\
-__PMC_EV_ALIAS("TURBO_MODE.CORE_1", UCP_EVENT_84H_02H)			\
-__PMC_EV_ALIAS("TURBO_MODE.CORE_2", UCP_EVENT_84H_04H)			\
-__PMC_EV_ALIAS("TURBO_MODE.CORE_3", UCP_EVENT_84H_08H)			\
-__PMC_EV_ALIAS("CYCLES_UNHALTED_L3_FLL_ENABLE", UCP_EVENT_85H_02H)	\
-__PMC_EV_ALIAS("CYCLES_UNHALTED_L3_FLL_DISABLE", UCP_EVENT_86H_01H)
-
-
-#define	__PMC_EV_ALIAS_SANDYBRIDGEUC()					\
-__PMC_EV_ALIAS("CB0_XSNP_RESPONSE.RSPIHITI", UCP_EVENT_22H_01H)		\
-__PMC_EV_ALIAS("CB0_XSNP_RESPONSE.RSPIHITFSE", UCP_EVENT_22H_02H)	\
-__PMC_EV_ALIAS("CB0_XSNP_RESPONSE.RSPSHITFSE", UCP_EVENT_22H_04H)	\
-__PMC_EV_ALIAS("CB0_XSNP_RESPONSE.RSPSFWDM", UCP_EVENT_22H_08H)		\
-__PMC_EV_ALIAS("CB0_XSNP_RESPONSE.AND_EXTERNAL", UCP_EVENT_22H_20H)	\
-__PMC_EV_ALIAS("CB0_XSNP_RESPONSE.AND_XCORE", UCP_EVENT_22H_40H)	\
-__PMC_EV_ALIAS("CB0_XSNP_RESPONSE_AND_XCORE2", UCP_EVENT_22H_80H)	\
-__PMC_EV_ALIAS("CB0_CACHE_LOOKUP.M", UCP_EVENT_34H_01H)			\
-__PMC_EV_ALIAS("CB0_CACHE_LOOKUP.E", UCP_EVENT_34H_02H)			\
-__PMC_EV_ALIAS("CB0_CACHE_LOOKUP.S", UCP_EVENT_34H_04H)			\
-__PMC_EV_ALIAS("CB0_CACHE_LOOKUP.I", UCP_EVENT_34H_08H)			\
-__PMC_EV_ALIAS("CB0_CACHE_LOOKUP.AND_READ", UCP_EVENT_34H_10H)		\
-__PMC_EV_ALIAS("CB0_CACHE_LOOKUP_AND_READ2", UCP_EVENT_34H_20H)		\
-__PMC_EV_ALIAS("CB0_CACHE_LOOKUP.AND_EXTSNP", UCP_EVENT_34H_40H)	\
-__PMC_EV_ALIAS("CB0_CACHE_LOOKUP.AND_ANY", UCP_EVENT_34H_80H)		\
-__PMC_EV_ALIAS("IMPH_CB0_TRK_OCCUPANCY.ALL", UCP_EVENT_80H_01H)		\
-__PMC_EV_ALIAS("IMPH_CB0_TRK_REQUEST.ALL", UCP_EVENT_81H_01H)		\
-__PMC_EV_ALIAS("IMPH_CB0_TRK_REQUEST.WRITES", UCP_EVENT_81H_20H)	\
-__PMC_EV_ALIAS("IMPH_CB0_TRK_REQUEST.EVICTIONS", UCP_EVENT_81H_80H)	\
-__PMC_EV_ALIAS("IMPH_C0H_TRK_OCCUPANCY.ALL", UCP_EVENT_83H_01H)		\
-__PMC_EV_ALIAS("IMPC_C0H_TRK_REQUEST.ALL", UCP_EVENT_84H_01H)
-
-/*
- * Intel XScale events from:
- *
- * Intel XScale Core Developer's Manual
- * January, 2004, #27347302
- *
- * 3rd Generation Intel XScale Microarchitecture
- * Developer's Manual
- * May 2007, #31628302
- *
- * First 14 events are for 1st and 2nd Generation Intel XScale cores. The
- * remaining are available only on 3rd Generation Intel XScale cores.
- */
-#define	__PMC_EV_XSCALE()				\
-	__PMC_EV(XSCALE, IC_FETCH)			\
-	__PMC_EV(XSCALE, IC_MISS)			\
-	__PMC_EV(XSCALE, DATA_DEPENDENCY_STALLED)	\
-	__PMC_EV(XSCALE, ITLB_MISS)			\
-	__PMC_EV(XSCALE, DTLB_MISS)			\
-	__PMC_EV(XSCALE, BRANCH_RETIRED)		\
-	__PMC_EV(XSCALE, BRANCH_MISPRED)		\
-	__PMC_EV(XSCALE, INSTR_RETIRED)			\
-	__PMC_EV(XSCALE, DC_FULL_CYCLE)			\
-	__PMC_EV(XSCALE, DC_FULL_CONTIG)		\
-	__PMC_EV(XSCALE, DC_ACCESS)			\
-	__PMC_EV(XSCALE, DC_MISS)			\
-	__PMC_EV(XSCALE, DC_WRITEBACK)			\
-	__PMC_EV(XSCALE, PC_CHANGE)			\
-	__PMC_EV(XSCALE, BRANCH_RETIRED_ALL)		\
-	__PMC_EV(XSCALE, INSTR_CYCLE)			\
-	__PMC_EV(XSCALE, CP_STALL)			\
-	__PMC_EV(XSCALE, PC_CHANGE_ALL)			\
-	__PMC_EV(XSCALE, PIPELINE_FLUSH)		\
-	__PMC_EV(XSCALE, BACKEND_STALL)			\
-	__PMC_EV(XSCALE, MULTIPLIER_USE)		\
-	__PMC_EV(XSCALE, MULTIPLIER_STALLED)		\
-	__PMC_EV(XSCALE, DATA_CACHE_STALLED)		\
-	__PMC_EV(XSCALE, L2_CACHE_REQ)			\
-	__PMC_EV(XSCALE, L2_CACHE_MISS)			\
-	__PMC_EV(XSCALE, ADDRESS_BUS_TRANS)		\
-	__PMC_EV(XSCALE, SELF_ADDRESS_BUS_TRANS)	\
-	__PMC_EV(XSCALE, DATA_BUS_TRANS)
-
-#define	PMC_EV_XSCALE_FIRST	PMC_EV_XSCALE_IC_FETCH
-#define	PMC_EV_XSCALE_LAST	PMC_EV_XSCALE_DATA_BUS_TRANS
-
-/*
- * MIPS Events from "Programming the MIPS32 24K Core Family",
- * Document Number: MD00355 Revision 04.63 December 19, 2008
- * These events are kept in the order found in Table 7.4.
- * For counters which are different between the left hand
- * column (0/2) and the right hand column (1/3) the left
- * hand is given first, e.g. BRANCH_COMPLETED and BRANCH_MISPRED
- * in the definition below.
- */
-
-#define __PMC_EV_MIPS24K()                         \
-	__PMC_EV(MIPS24K, CYCLE)                   \
-	__PMC_EV(MIPS24K, INSTR_EXECUTED)          \
-	__PMC_EV(MIPS24K, BRANCH_COMPLETED)        \
-	__PMC_EV(MIPS24K, BRANCH_MISPRED)          \
-	__PMC_EV(MIPS24K, RETURN)                  \
-	__PMC_EV(MIPS24K, RETURN_MISPRED)          \
-	__PMC_EV(MIPS24K, RETURN_NOT_31)           \
-	__PMC_EV(MIPS24K, RETURN_NOTPRED)          \
-	__PMC_EV(MIPS24K, ITLB_ACCESS)             \
-	__PMC_EV(MIPS24K, ITLB_MISS)               \
-	__PMC_EV(MIPS24K, DTLB_ACCESS)             \
-	__PMC_EV(MIPS24K, DTLB_MISS)               \
-	__PMC_EV(MIPS24K, JTLB_IACCESS)            \
-	__PMC_EV(MIPS24K, JTLB_IMISS)              \
-	__PMC_EV(MIPS24K, JTLB_DACCESS)            \
-	__PMC_EV(MIPS24K, JTLB_DMISS)              \
-	__PMC_EV(MIPS24K, IC_FETCH)                \
-	__PMC_EV(MIPS24K, IC_MISS)                 \
-	__PMC_EV(MIPS24K, DC_LOADSTORE)            \
-	__PMC_EV(MIPS24K, DC_WRITEBACK)            \
-	__PMC_EV(MIPS24K, DC_MISS)                 \
-	__PMC_EV(MIPS24K, STORE_MISS)              \
-	__PMC_EV(MIPS24K, LOAD_MISS)               \
-	__PMC_EV(MIPS24K, INTEGER_COMPLETED)       \
-	__PMC_EV(MIPS24K, FP_COMPLETED)            \
-	__PMC_EV(MIPS24K, LOAD_COMPLETED)          \
-	__PMC_EV(MIPS24K, STORE_COMPLETED)         \
-	__PMC_EV(MIPS24K, BARRIER_COMPLETED)       \
-	__PMC_EV(MIPS24K, MIPS16_COMPLETED)        \
-	__PMC_EV(MIPS24K, NOP_COMPLETED)           \
-	__PMC_EV(MIPS24K, INTEGER_MULDIV_COMPLETED)\
-	__PMC_EV(MIPS24K, RF_STALL)                \
-	__PMC_EV(MIPS24K, INSTR_REFETCH)           \
-	__PMC_EV(MIPS24K, STORE_COND_COMPLETED)    \
-	__PMC_EV(MIPS24K, STORE_COND_FAILED)       \
-	__PMC_EV(MIPS24K, ICACHE_REQUESTS)         \
-	__PMC_EV(MIPS24K, ICACHE_HIT)              \
-	__PMC_EV(MIPS24K, L2_WRITEBACK)            \
-	__PMC_EV(MIPS24K, L2_ACCESS)               \
-	__PMC_EV(MIPS24K, L2_MISS)                 \
-	__PMC_EV(MIPS24K, L2_ERR_CORRECTED)        \
-	__PMC_EV(MIPS24K, EXCEPTIONS)              \
-	__PMC_EV(MIPS24K, RF_CYCLES_STALLED)       \
-	__PMC_EV(MIPS24K, IFU_CYCLES_STALLED)      \
-	__PMC_EV(MIPS24K, ALU_CYCLES_STALLED)      \
-	__PMC_EV(MIPS24K, UNCACHED_LOAD)           \
-	__PMC_EV(MIPS24K, UNCACHED_STORE)          \
-	__PMC_EV(MIPS24K, CP2_REG_TO_REG_COMPLETED)\
-	__PMC_EV(MIPS24K, MFTC_COMPLETED)          \
-	__PMC_EV(MIPS24K, IC_BLOCKED_CYCLES)       \
-	__PMC_EV(MIPS24K, DC_BLOCKED_CYCLES)       \
-	__PMC_EV(MIPS24K, L2_IMISS_STALL_CYCLES)   \
-	__PMC_EV(MIPS24K, L2_DMISS_STALL_CYCLES)   \
-	__PMC_EV(MIPS24K, DMISS_CYCLES)            \
-	__PMC_EV(MIPS24K, L2_MISS_CYCLES)          \
-	__PMC_EV(MIPS24K, UNCACHED_BLOCK_CYCLES)   \
-	__PMC_EV(MIPS24K, MDU_STALL_CYCLES)        \
-	__PMC_EV(MIPS24K, FPU_STALL_CYCLES)        \
-	__PMC_EV(MIPS24K, CP2_STALL_CYCLES)        \
-	__PMC_EV(MIPS24K, COREXTEND_STALL_CYCLES)  \
-	__PMC_EV(MIPS24K, ISPRAM_STALL_CYCLES)     \
-	__PMC_EV(MIPS24K, DSPRAM_STALL_CYCLES)     \
-	__PMC_EV(MIPS24K, CACHE_STALL_CYCLES)      \
-	__PMC_EV(MIPS24K, LOAD_TO_USE_STALLS)      \
-	__PMC_EV(MIPS24K, BASE_MISPRED_STALLS)     \
-	__PMC_EV(MIPS24K, CPO_READ_STALLS)         \
-	__PMC_EV(MIPS24K, BRANCH_MISPRED_CYCLES)   \
-	__PMC_EV(MIPS24K, IFETCH_BUFFER_FULL)      \
-	__PMC_EV(MIPS24K, FETCH_BUFFER_ALLOCATED)  \
-	__PMC_EV(MIPS24K, EJTAG_ITRIGGER)          \
-	__PMC_EV(MIPS24K, EJTAG_DTRIGGER)          \
-	__PMC_EV(MIPS24K, FSB_LT_QUARTER)          \
-	__PMC_EV(MIPS24K, FSB_QUARTER_TO_HALF)     \
-	__PMC_EV(MIPS24K, FSB_GT_HALF)             \
-	__PMC_EV(MIPS24K, FSB_FULL_PIPELINE_STALLS)\
-	__PMC_EV(MIPS24K, LDQ_LT_QUARTER)          \
-	__PMC_EV(MIPS24K, LDQ_QUARTER_TO_HALF)     \
-	__PMC_EV(MIPS24K, LDQ_GT_HALF)             \
-	__PMC_EV(MIPS24K, LDQ_FULL_PIPELINE_STALLS)\
-	__PMC_EV(MIPS24K, WBB_LT_QUARTER)          \
-	__PMC_EV(MIPS24K, WBB_QUARTER_TO_HALF)     \
-	__PMC_EV(MIPS24K, WBB_GT_HALF)             \
-	__PMC_EV(MIPS24K, WBB_FULL_PIPELINE_STALLS) \
-	__PMC_EV(MIPS24K, REQUEST_LATENCY)         \
-	__PMC_EV(MIPS24K, REQUEST_COUNT)
-
-#define	PMC_EV_MIPS24K_FIRST	PMC_EV_MIPS24K_CYCLE
-#define	PMC_EV_MIPS24K_LAST	PMC_EV_MIPS24K_WBB_FULL_PIPELINE_STALLS
-
-/*
- * Cavium Octeon counters. Obtained from cvmx-core.h
- */
-#define __PMC_EV_OCTEON()                         \
-    __PMC_EV(OCTEON, CLK)                         \
-    __PMC_EV(OCTEON, ISSUE)                       \
-    __PMC_EV(OCTEON, RET)                         \
-    __PMC_EV(OCTEON, NISSUE)                      \
-    __PMC_EV(OCTEON, SISSUE)                      \
-    __PMC_EV(OCTEON, DISSUE)                      \
-    __PMC_EV(OCTEON, IFI)                         \
-    __PMC_EV(OCTEON, BR)                          \
-    __PMC_EV(OCTEON, BRMIS)                       \
-    __PMC_EV(OCTEON, J)                           \
-    __PMC_EV(OCTEON, JMIS)                        \
-    __PMC_EV(OCTEON, REPLAY)                      \
-    __PMC_EV(OCTEON, IUNA)                        \
-    __PMC_EV(OCTEON, TRAP)                        \
-    __PMC_EV(OCTEON, UULOAD)                      \
-    __PMC_EV(OCTEON, UUSTORE)                     \
-    __PMC_EV(OCTEON, ULOAD)                       \
-    __PMC_EV(OCTEON, USTORE)                      \
-    __PMC_EV(OCTEON, EC)                          \
-    __PMC_EV(OCTEON, MC)                          \
-    __PMC_EV(OCTEON, CC)                          \
-    __PMC_EV(OCTEON, CSRC)                        \
-    __PMC_EV(OCTEON, CFETCH)                      \
-    __PMC_EV(OCTEON, CPREF)                       \
-    __PMC_EV(OCTEON, ICA)                         \
-    __PMC_EV(OCTEON, II)                          \
-    __PMC_EV(OCTEON, IP)                          \
-    __PMC_EV(OCTEON, CIMISS)                      \
-    __PMC_EV(OCTEON, WBUF)                        \
-    __PMC_EV(OCTEON, WDAT)                        \
-    __PMC_EV(OCTEON, WBUFLD)                      \
-    __PMC_EV(OCTEON, WBUFFL)                      \
-    __PMC_EV(OCTEON, WBUFTR)                      \
-    __PMC_EV(OCTEON, BADD)                        \
-    __PMC_EV(OCTEON, BADDL2)                      \
-    __PMC_EV(OCTEON, BFILL)                       \
-    __PMC_EV(OCTEON, DDIDS)                       \
-    __PMC_EV(OCTEON, IDIDS)                       \
-    __PMC_EV(OCTEON, DIDNA)                       \
-    __PMC_EV(OCTEON, LDS)                         \
-    __PMC_EV(OCTEON, LMLDS)                       \
-    __PMC_EV(OCTEON, IOLDS)                       \
-    __PMC_EV(OCTEON, DMLDS)                       \
-    __PMC_EV(OCTEON, STS)                         \
-    __PMC_EV(OCTEON, LMSTS)                       \
-    __PMC_EV(OCTEON, IOSTS)                       \
-    __PMC_EV(OCTEON, IOBDMA)                      \
-    __PMC_EV(OCTEON, DTLB)                        \
-    __PMC_EV(OCTEON, DTLBAD)                      \
-    __PMC_EV(OCTEON, ITLB)                        \
-    __PMC_EV(OCTEON, SYNC)                        \
-    __PMC_EV(OCTEON, SYNCIOB)                     \
-    __PMC_EV(OCTEON, SYNCW)
-
-#define	PMC_EV_OCTEON_FIRST	PMC_EV_OCTEON_CLK
-#define	PMC_EV_OCTEON_LAST	PMC_EV_OCTEON_SYNCW
-
-#define __PMC_EV_PPC7450()						\
-	__PMC_EV(PPC7450, CYCLE)					\
-	__PMC_EV(PPC7450, INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, TLB_BIT_TRANSITIONS)				\
-	__PMC_EV(PPC7450, INSTR_DISPATCHED)				\
-	__PMC_EV(PPC7450, PMON_EXCEPT)					\
-	__PMC_EV(PPC7450, PMON_SIG)					\
-	__PMC_EV(PPC7450, VPU_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, VFPU_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, VIU1_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, VIU2_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, MTVSCR_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, MTVRSAVE_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, VPU_INSTR_WAIT_CYCLES)			\
-	__PMC_EV(PPC7450, VFPU_INSTR_WAIT_CYCLES)			\
-	__PMC_EV(PPC7450, VIU1_INSTR_WAIT_CYCLES)			\
-	__PMC_EV(PPC7450, VIU2_INSTR_WAIT_CYCLES)			\
-	__PMC_EV(PPC7450, MFVSCR_SYNC_CYCLES)				\
-	__PMC_EV(PPC7450, VSCR_SAT_SET)					\
-	__PMC_EV(PPC7450, STORE_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, L1_INSTR_CACHE_MISSES)			\
-	__PMC_EV(PPC7450, L1_DATA_SNOOPS)				\
-	__PMC_EV(PPC7450, UNRESOLVED_BRANCHES)				\
-	__PMC_EV(PPC7450, SPEC_BUFFER_CYCLES)				\
-	__PMC_EV(PPC7450, BRANCH_UNIT_STALL_CYCLES)			\
-	__PMC_EV(PPC7450, TRUE_BRANCH_TARGET_HITS)			\
-	__PMC_EV(PPC7450, BRANCH_LINK_STAC_PREDICTED)			\
-	__PMC_EV(PPC7450, GPR_ISSUE_QUEUE_DISPATCHES)			\
-	__PMC_EV(PPC7450, CYCLES_THREE_INSTR_DISPATCHED)		\
-	__PMC_EV(PPC7450, THRESHOLD_INSTR_QUEUE_ENTRIES_CYCLES)		\
-	__PMC_EV(PPC7450, THRESHOLD_VEC_INSTR_QUEUE_ENTRIES_CYCLES)	\
-	__PMC_EV(PPC7450, CYCLES_NO_COMPLETED_INSTRS)			\
-	__PMC_EV(PPC7450, IU2_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, BRANCHES_COMPLETED)				\
-	__PMC_EV(PPC7450, EIEIO_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, MTSPR_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, SC_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, LS_LM_COMPLETED)				\
-	__PMC_EV(PPC7450, ITLB_HW_TABLE_SEARCH_CYCLES)			\
-	__PMC_EV(PPC7450, DTLB_HW_SEARCH_CYCLES_OVER_THRESHOLD)		\
-	__PMC_EV(PPC7450, L1_INSTR_CACHE_ACCESSES)			\
-	__PMC_EV(PPC7450, INSTR_BKPT_MATCHES)				\
-	__PMC_EV(PPC7450, L1_DATA_CACHE_LOAD_MISS_CYCLES_OVER_THRESHOLD)\
-	__PMC_EV(PPC7450, L1_DATA_SNOOP_HIT_ON_MODIFIED)		\
-	__PMC_EV(PPC7450, LOAD_MISS_ALIAS)				\
-	__PMC_EV(PPC7450, LOAD_MISS_ALIAS_ON_TOUCH)			\
-	__PMC_EV(PPC7450, TOUCH_ALIAS)					\
-	__PMC_EV(PPC7450, L1_DATA_SNOOP_HIT_CASTOUT_QUEUE)		\
-	__PMC_EV(PPC7450, L1_DATA_SNOOP_HIT_CASTOUT)			\
-	__PMC_EV(PPC7450, L1_DATA_SNOOP_HITS)				\
-	__PMC_EV(PPC7450, WRITE_THROUGH_STORES)				\
-	__PMC_EV(PPC7450, CACHE_INHIBITED_STORES)			\
-	__PMC_EV(PPC7450, L1_DATA_LOAD_HIT)				\
-	__PMC_EV(PPC7450, L1_DATA_TOUCH_HIT)				\
-	__PMC_EV(PPC7450, L1_DATA_STORE_HIT)				\
-	__PMC_EV(PPC7450, L1_DATA_TOTAL_HITS)				\
-	__PMC_EV(PPC7450, DST_INSTR_DISPATCHED)				\
-	__PMC_EV(PPC7450, REFRESHED_DSTS)				\
-	__PMC_EV(PPC7450, SUCCESSFUL_DST_TABLE_SEARCHES)		\
-	__PMC_EV(PPC7450, DSS_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, DST_STREAM_0_CACHE_LINE_FETCHES)		\
-	__PMC_EV(PPC7450, VTQ_SUSPENDS_DUE_TO_CTX_CHANGE)		\
-	__PMC_EV(PPC7450, VTQ_LINE_FETCH_HIT)				\
-	__PMC_EV(PPC7450, VEC_LOAD_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, FP_STORE_INSTR_COMPLETED_IN_LSU)		\
-	__PMC_EV(PPC7450, FPU_RENORMALIZATION)				\
-	__PMC_EV(PPC7450, FPU_DENORMALIZATION)				\
-	__PMC_EV(PPC7450, FP_STORE_CAUSES_STALL_IN_LSU)			\
-	__PMC_EV(PPC7450, LD_ST_TRUE_ALIAS_STALL)			\
-	__PMC_EV(PPC7450, LSU_INDEXED_ALIAS_STALL)			\
-	__PMC_EV(PPC7450, LSU_ALIAS_VS_FSQ_WB0_WB1)			\
-	__PMC_EV(PPC7450, LSU_ALIAS_VS_CSQ)				\
-	__PMC_EV(PPC7450, LSU_LOAD_HIT_LINE_ALIAS_VS_CSQ0)		\
-	__PMC_EV(PPC7450, LSU_LOAD_MISS_LINE_ALIAS_VS_CSQ0)		\
-	__PMC_EV(PPC7450, LSU_TOUCH_LINE_ALIAS_VS_FSQ_WB0_WB1)		\
-	__PMC_EV(PPC7450, LSU_TOUCH_ALIAS_VS_CSQ)			\
-	__PMC_EV(PPC7450, LSU_LMQ_FULL_STALL)				\
-	__PMC_EV(PPC7450, FP_LOAD_INSTR_COMPLETED_IN_LSU)		\
-	__PMC_EV(PPC7450, FP_LOAD_SINGLE_INSTR_COMPLETED_IN_LSU)	\
-	__PMC_EV(PPC7450, FP_LOAD_DOUBLE_COMPLETED_IN_LSU)		\
-	__PMC_EV(PPC7450, LSU_RA_LATCH_STALL)				\
-	__PMC_EV(PPC7450, LSU_LOAD_VS_STORE_QUEUE_ALIAS_STALL)		\
-	__PMC_EV(PPC7450, LSU_LMQ_INDEX_ALIAS)				\
-	__PMC_EV(PPC7450, LSU_STORE_QUEUE_INDEX_ALIAS)			\
-	__PMC_EV(PPC7450, LSU_CSQ_FORWARDING)				\
-	__PMC_EV(PPC7450, LSU_MISALIGNED_LOAD_FINISH)			\
-	__PMC_EV(PPC7450, LSU_MISALIGN_STORE_COMPLETED)			\
-	__PMC_EV(PPC7450, LSU_MISALIGN_STALL)				\
-	__PMC_EV(PPC7450, FP_ONE_QUARTER_FPSCR_RENAMES_BUSY)		\
-	__PMC_EV(PPC7450, FP_ONE_HALF_FPSCR_RENAMES_BUSY)		\
-	__PMC_EV(PPC7450, FP_THREE_QUARTERS_FPSCR_RENAMES_BUSY)		\
-	__PMC_EV(PPC7450, FP_ALL_FPSCR_RENAMES_BUSY)			\
-	__PMC_EV(PPC7450, FP_DENORMALIZED_RESULT)			\
-	__PMC_EV(PPC7450, L1_DATA_TOTAL_MISSES)				\
-	__PMC_EV(PPC7450, DISPATCHES_TO_FPR_ISSUE_QUEUE)		\
-	__PMC_EV(PPC7450, LSU_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, LOAD_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, SS_SM_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, TLBIE_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, LWARX_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, MFSPR_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, REFETCH_SERIALIZATION)			\
-	__PMC_EV(PPC7450, COMPLETION_QUEUE_ENTRIES_OVER_THRESHOLD)	\
-	__PMC_EV(PPC7450, CYCLES_ONE_INSTR_DISPATCHED)			\
-	__PMC_EV(PPC7450, CYCLES_TWO_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, ITLB_NON_SPECULATIVE_MISSES)			\
-	__PMC_EV(PPC7450, CYCLES_WAITING_FROM_L1_INSTR_CACHE_MISS)	\
-	__PMC_EV(PPC7450, L1_DATA_LOAD_ACCESS_MISS)			\
-	__PMC_EV(PPC7450, L1_DATA_TOUCH_MISS)				\
-	__PMC_EV(PPC7450, L1_DATA_STORE_MISS)				\
-	__PMC_EV(PPC7450, L1_DATA_TOUCH_MISS_CYCLES)			\
-	__PMC_EV(PPC7450, L1_DATA_CYCLES_USED)				\
-	__PMC_EV(PPC7450, DST_STREAM_1_CACHE_LINE_FETCHES)		\
-	__PMC_EV(PPC7450, VTQ_STREAM_CANCELED_PREMATURELY)		\
-	__PMC_EV(PPC7450, VTQ_RESUMES_DUE_TO_CTX_CHANGE)		\
-	__PMC_EV(PPC7450, VTQ_LINE_FETCH_MISS)				\
-	__PMC_EV(PPC7450, VTQ_LINE_FETCH)				\
-	__PMC_EV(PPC7450, TLBIE_SNOOPS)					\
-	__PMC_EV(PPC7450, L1_INSTR_CACHE_RELOADS)			\
-	__PMC_EV(PPC7450, L1_DATA_CACHE_RELOADS)			\
-	__PMC_EV(PPC7450, L1_DATA_CACHE_CASTOUTS_TO_L2)			\
-	__PMC_EV(PPC7450, STORE_MERGE_GATHER)				\
-	__PMC_EV(PPC7450, CACHEABLE_STORE_MERGE_TO_32_BYTES)		\
-	__PMC_EV(PPC7450, DATA_BKPT_MATCHES)				\
-	__PMC_EV(PPC7450, FALL_THROUGH_BRANCHES_PROCESSED)		\
-	__PMC_EV(PPC7450,						\
-	    FIRST_SPECULATIVE_BRANCH_BUFFER_RESOLVED_CORRECTLY)		\
-	__PMC_EV(PPC7450, SECOND_SPECULATION_BUFFER_ACTIVE)		\
-	__PMC_EV(PPC7450, BPU_STALL_ON_LR_DEPENDENCY)			\
-	__PMC_EV(PPC7450, BTIC_MISS)					\
-	__PMC_EV(PPC7450, BRANCH_LINK_STACK_CORRECTLY_RESOLVED)		\
-	__PMC_EV(PPC7450, FPR_ISSUE_STALLED)				\
-	__PMC_EV(PPC7450, SWITCHES_BETWEEN_PRIV_USER)			\
-	__PMC_EV(PPC7450, LSU_COMPLETES_FP_STORE_SINGLE)		\
-	__PMC_EV(PPC7450, VR_ISSUE_QUEUE_DISPATCHES)			\
-	__PMC_EV(PPC7450, VR_STALLS)					\
-	__PMC_EV(PPC7450, GPR_RENAME_BUFFER_ENTRIES_OVER_THRESHOLD)	\
-	__PMC_EV(PPC7450, FPR_ISSUE_QUEUE_ENTRIES)			\
-	__PMC_EV(PPC7450, FPU_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, STWCX_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, LS_LM_INSTR_PIECES)				\
-	__PMC_EV(PPC7450, ITLB_HW_SEARCH_CYCLES_OVER_THRESHOLD)		\
-	__PMC_EV(PPC7450, DTLB_MISSES)					\
-	__PMC_EV(PPC7450, CANCELLED_L1_INSTR_CACHE_MISSES)		\
-	__PMC_EV(PPC7450, L1_DATA_CACHE_OP_HIT)				\
-	__PMC_EV(PPC7450, L1_DATA_LOAD_MISS_CYCLES)			\
-	__PMC_EV(PPC7450, L1_DATA_PUSHES)				\
-	__PMC_EV(PPC7450, L1_DATA_TOTAL_MISS)				\
-	__PMC_EV(PPC7450, VT2_FETCHES)					\
-	__PMC_EV(PPC7450, TAKEN_BRANCHES_PROCESSED)			\
-	__PMC_EV(PPC7450, BRANCH_FLUSHES)				\
-	__PMC_EV(PPC7450,						\
-	    SECOND_SPECULATIVE_BRANCH_BUFFER_RESOLVED_CORRECTLY)	\
-	__PMC_EV(PPC7450, THIRD_SPECULATION_BUFFER_ACTIVE)		\
-	__PMC_EV(PPC7450, BRANCH_UNIT_STALL_ON_CTR_DEPENDENCY)		\
-	__PMC_EV(PPC7450, FAST_BTIC_HIT)				\
-	__PMC_EV(PPC7450, BRANCH_LINK_STACK_MISPREDICTED)		\
-	__PMC_EV(PPC7450, CYCLES_THREE_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, CYCLES_NO_INSTR_DISPATCHED)			\
-	__PMC_EV(PPC7450, GPR_ISSUE_QUEUE_ENTRIES_OVER_THRESHOLD)	\
-	__PMC_EV(PPC7450, GPR_ISSUE_QUEUE_STALLED)			\
-	__PMC_EV(PPC7450, IU1_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, DSSALL_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, TLBSYNC_INSTR_COMPLETED)			\
-	__PMC_EV(PPC7450, SYNC_INSTR_COMPLETED)				\
-	__PMC_EV(PPC7450, SS_SM_INSTR_PIECES)				\
-	__PMC_EV(PPC7450, DTLB_HW_SEARCH_CYCLES)			\
-	__PMC_EV(PPC7450, SNOOP_RETRIES)				\
-	__PMC_EV(PPC7450, SUCCESSFUL_STWCX)				\
-	__PMC_EV(PPC7450, DST_STREAM_3_CACHE_LINE_FETCHES)		\
-	__PMC_EV(PPC7450,						\
-	    THIRD_SPECULATIVE_BRANCH_BUFFER_RESOLVED_CORRECTLY)		\
-	__PMC_EV(PPC7450, MISPREDICTED_BRANCHES)			\
-	__PMC_EV(PPC7450, FOLDED_BRANCHES)				\
-	__PMC_EV(PPC7450, FP_STORE_DOUBLE_COMPLETES_IN_LSU)		\
-	__PMC_EV(PPC7450, L2_CACHE_HITS)				\
-	__PMC_EV(PPC7450, L3_CACHE_HITS)				\
-	__PMC_EV(PPC7450, L2_INSTR_CACHE_MISSES)			\
-	__PMC_EV(PPC7450, L3_INSTR_CACHE_MISSES)			\
-	__PMC_EV(PPC7450, L2_DATA_CACHE_MISSES)				\
-	__PMC_EV(PPC7450, L3_DATA_CACHE_MISSES)				\
-	__PMC_EV(PPC7450, L2_LOAD_HITS)					\
-	__PMC_EV(PPC7450, L2_STORE_HITS)				\
-	__PMC_EV(PPC7450, L3_LOAD_HITS)					\
-	__PMC_EV(PPC7450, L3_STORE_HITS)				\
-	__PMC_EV(PPC7450, L2_TOUCH_HITS)				\
-	__PMC_EV(PPC7450, L3_TOUCH_HITS)				\
-	__PMC_EV(PPC7450, SNOOP_MODIFIED)				\
-	__PMC_EV(PPC7450, SNOOP_VALID)					\
-	__PMC_EV(PPC7450, INTERVENTION)					\
-	__PMC_EV(PPC7450, L2_CACHE_MISSES)				\
-	__PMC_EV(PPC7450, L3_CACHE_MISSES)				\
-	__PMC_EV(PPC7450, L2_CACHE_CASTOUTS)				\
-	__PMC_EV(PPC7450, L3_CACHE_CASTOUTS)				\
-	__PMC_EV(PPC7450, L2SQ_FULL_CYCLES)				\
-	__PMC_EV(PPC7450, L3SQ_FULL_CYCLES)				\
-	__PMC_EV(PPC7450, RAQ_FULL_CYCLES)				\
-	__PMC_EV(PPC7450, WAQ_FULL_CYCLES)				\
-	__PMC_EV(PPC7450, L1_EXTERNAL_INTERVENTIONS)			\
-	__PMC_EV(PPC7450, L2_EXTERNAL_INTERVENTIONS)			\
-	__PMC_EV(PPC7450, L3_EXTERNAL_INTERVENTIONS)			\
-	__PMC_EV(PPC7450, EXTERNAL_INTERVENTIONS)			\
-	__PMC_EV(PPC7450, EXTERNAL_PUSHES)				\
-	__PMC_EV(PPC7450, EXTERNAL_SNOOP_RETRY)				\
-	__PMC_EV(PPC7450, DTQ_FULL_CYCLES)				\
-	__PMC_EV(PPC7450, BUS_RETRY)					\
-	__PMC_EV(PPC7450, L2_VALID_REQUEST)				\
-	__PMC_EV(PPC7450, BORDQ_FULL)					\
-	__PMC_EV(PPC7450, BUS_TAS_FOR_READS)				\
-	__PMC_EV(PPC7450, BUS_TAS_FOR_WRITES)				\
-	__PMC_EV(PPC7450, BUS_READS_NOT_RETRIED)			\
-	__PMC_EV(PPC7450, BUS_WRITES_NOT_RETRIED)			\
-	__PMC_EV(PPC7450, BUS_READS_WRITES_NOT_RETRIED)			\
-	__PMC_EV(PPC7450, BUS_RETRY_DUE_TO_L1_RETRY)			\
-	__PMC_EV(PPC7450, BUS_RETRY_DUE_TO_PREVIOUS_ADJACENT)		\
-	__PMC_EV(PPC7450, BUS_RETRY_DUE_TO_COLLISION)			\
-	__PMC_EV(PPC7450, BUS_RETRY_DUE_TO_INTERVENTION_ORDERING)	\
-	__PMC_EV(PPC7450, SNOOP_REQUESTS)				\
-	__PMC_EV(PPC7450, PREFETCH_ENGINE_REQUEST)			\
-	__PMC_EV(PPC7450, PREFETCH_ENGINE_COLLISION_VS_LOAD)		\
-	__PMC_EV(PPC7450, PREFETCH_ENGINE_COLLISION_VS_STORE)		\
-	__PMC_EV(PPC7450, PREFETCH_ENGINE_COLLISION_VS_INSTR_FETCH)	\
-	__PMC_EV(PPC7450,						\
-	    PREFETCH_ENGINE_COLLISION_VS_LOAD_STORE_INSTR_FETCH)	\
-	__PMC_EV(PPC7450, PREFETCH_ENGINE_FULL)
-
-#define PMC_EV_PPC7450_FIRST	PMC_EV_PPC7450_CYCLE
-#define PMC_EV_PPC7450_LAST	PMC_EV_PPC7450_PREFETCH_ENGINE_FULL
-
-#define __PMC_EV_PPC970() \
-	__PMC_EV(PPC970, INSTR_COMPLETED) \
-	__PMC_EV(PPC970, MARKED_GROUP_DISPATCH) \
-	__PMC_EV(PPC970, MARKED_STORE_COMPLETED) \
-	__PMC_EV(PPC970, GCT_EMPTY) \
-	__PMC_EV(PPC970, RUN_CYCLES) \
-	__PMC_EV(PPC970, OVERFLOW) \
-	__PMC_EV(PPC970, CYCLES) \
-	__PMC_EV(PPC970, THRESHOLD_TIMEOUT) \
-	__PMC_EV(PPC970, GROUP_DISPATCH) \
-	__PMC_EV(PPC970, BR_MARKED_INSTR_FINISH) \
-	__PMC_EV(PPC970, GCT_EMPTY_BY_SRQ_FULL) \
-	__PMC_EV(PPC970, STOP_COMPLETION) \
-	__PMC_EV(PPC970, LSU_EMPTY) \
-	__PMC_EV(PPC970, MARKED_STORE_WITH_INTR) \
-	__PMC_EV(PPC970, CYCLES_IN_SUPER) \
-	__PMC_EV(PPC970, VPU_MARKED_INSTR_COMPLETED) \
-	__PMC_EV(PPC970, FXU0_IDLE_FXU1_BUSY) \
-	__PMC_EV(PPC970, SRQ_EMPTY) \
-	__PMC_EV(PPC970, MARKED_GROUP_COMPLETED) \
-	__PMC_EV(PPC970, CR_MARKED_INSTR_FINISH) \
-	__PMC_EV(PPC970, DISPATCH_SUCCESS) \
-	__PMC_EV(PPC970, FXU0_IDLE_FXU1_IDLE) \
-	__PMC_EV(PPC970, ONE_PLUS_INSTR_COMPLETED) \
-	__PMC_EV(PPC970, GROUP_MARKED_IDU) \
-	__PMC_EV(PPC970, MARKED_GROUP_COMPLETE_TIMEOUT) \
-	__PMC_EV(PPC970, FXU0_BUSY_FXU1_BUSY) \
-	__PMC_EV(PPC970, MARKED_STORE_SENT_TO_STS) \
-	__PMC_EV(PPC970, FXU_MARKED_INSTR_FINISHED) \
-	__PMC_EV(PPC970, MARKED_GROUP_ISSUED) \
-	__PMC_EV(PPC970, FXU0_BUSY_FXU1_IDLE) \
-	__PMC_EV(PPC970, GROUP_COMPLETED) \
-	__PMC_EV(PPC970, FPU_MARKED_INSTR_COMPLETED) \
-	__PMC_EV(PPC970, MARKED_INSTR_FINISH_ANY_UNIT) \
-	__PMC_EV(PPC970, EXTERNAL_INTERRUPT) \
-	__PMC_EV(PPC970, GROUP_DISPATCH_REJECT) \
-	__PMC_EV(PPC970, LSU_MARKED_INSTR_FINISH) \
-	__PMC_EV(PPC970, TIMEBASE_EVENT) \
-	__PMC_EV(PPC970, LSU_COMPLETION_STALL) \
-	__PMC_EV(PPC970, FXU_COMPLETION_STALL) \
-	__PMC_EV(PPC970, DCACHE_MISS_COMPLETION_STALL) \
-	__PMC_EV(PPC970, FPU_COMPLETION_STALL) \
-	__PMC_EV(PPC970, FXU_LONG_INSTR_COMPLETION_STALL) \
-	__PMC_EV(PPC970, REJECT_COMPLETION_STALL) \
-	__PMC_EV(PPC970, FPU_LONG_INSTR_COMPLETION_STALL) \
-	__PMC_EV(PPC970, GCT_EMPTY_BY_ICACHE_MISS) \
-	__PMC_EV(PPC970, REJECT_COMPLETION_STALL_ERAT_MISS) \
-	__PMC_EV(PPC970, GCT_EMPTY_BY_BRANCH_MISS_PREDICT) \
-	__PMC_EV(PPC970, BUS_HIGH) \
-	__PMC_EV(PPC970, BUS_LOW) \
-	__PMC_EV(PPC970, ADDER)
-
-
-#define PMC_EV_PPC970_FIRST		PMC_EV_PPC970_INSTR_COMPLETED
-#define PMC_EV_PPC970_LAST		PMC_EV_PPC970_ADDER
-/*
- * All known PMC events.
- *
- * PMC event numbers are allocated sparsely to allow new PMC events to
- * be added to a PMC class without breaking ABI compatibility.  The
- * current allocation scheme is:
- *
- * START	#EVENTS		DESCRIPTION
- * 0		0x1000		Reserved
- * 0x1000	0x0001		TSC
- * 0x2000	0x0080		AMD K7 events
- * 0x2080	0x0100		AMD K8 events
- * 0x10000	0x0080		INTEL architectural fixed-function events
- * 0x10080	0x0F80		INTEL architectural programmable events
- * 0x11000	0x0080		INTEL Pentium 4 events
- * 0x11080	0x0080		INTEL Pentium MMX events
- * 0x11100	0x0100		INTEL Pentium Pro/P-II/P-III/Pentium-M events
- * 0x11200	0x00FF		INTEL XScale events
- * 0x11300      0x00FF          MIPS 24K events
- * 0x20000	0x1000		Software events
- */
-#define	__PMC_EVENTS()				\
-	__PMC_EV_BLOCK(TSC,	0x01000)	\
-	__PMC_EV_TSC()				\
-	__PMC_EV_BLOCK(K7,	0x2000)		\
-	__PMC_EV_K7()				\
-	__PMC_EV_BLOCK(K8,	0x2080)		\
-	__PMC_EV_K8()				\
-	__PMC_EV_BLOCK(IAF,	0x10000)	\
-	__PMC_EV_IAF()				\
-	__PMC_EV_BLOCK(IAP,	0x10080)	\
-	__PMC_EV_IAP()				\
-	__PMC_EV_BLOCK(P4,	0x11000)	\
-	__PMC_EV_P4()				\
-	__PMC_EV_BLOCK(P5,	0x11080)	\
-	__PMC_EV_P5()				\
-	__PMC_EV_BLOCK(P6,	0x11100)	\
-	__PMC_EV_P6()				\
-	__PMC_EV_BLOCK(XSCALE,	0x11200)	\
-	__PMC_EV_XSCALE()                       \
-	__PMC_EV_BLOCK(MIPS24K,	0x11300)	\
-	__PMC_EV_MIPS24K()			\
-	__PMC_EV_BLOCK(OCTEON,	0x11400)	\
-	__PMC_EV_OCTEON()			\
-	__PMC_EV_BLOCK(UCF,	0x12000)	\
-	__PMC_EV_UCF()				\
-	__PMC_EV_BLOCK(UCP,	0x12080)	\
-	__PMC_EV_UCP()				\
-	__PMC_EV_BLOCK(PPC7450,	0x13000)	\
-	__PMC_EV_PPC7450()			\
-	__PMC_EV_BLOCK(PPC970,	0x13100)	\
-	__PMC_EV_PPC970()			\
-
-#define	PMC_EVENT_FIRST	PMC_EV_TSC_TSC
-#define	PMC_EVENT_LAST	PMC_EV_SOFT_LAST
-
-#endif /* _DEV_HWPMC_PMC_EVENTS_H_ */
diff --git a/include.new/dev/ic/cd1400.h b/include.new/dev/ic/cd1400.h
deleted file mode 100644
index b46c5a7..0000000
--- a/include.new/dev/ic/cd1400.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * cyclades cyclom-y serial driver
- *	Andrew Herbert <andrew@werple.apana.org.au>, 17 August 1993
- *
- * Copyright (c) 1993 Andrew Herbert.
- * 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 Andrew Herbert may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY ``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 I 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: releng/10.2/sys/dev/ic/cd1400.h 50477 1999-08-28 01:08:13Z peter $
- */
-
-/*
- * Definitions for Cirrus Logic CD1400 serial/parallel chips.
- */
-
-#define	CD1400_NO_OF_CHANNELS	4	/* 4 serial channels per chip */
-#define	CD1400_RX_FIFO_SIZE	12
-#define	CD1400_TX_FIFO_SIZE	12
-
-/*
- * Global registers.
- */
-#define	CD1400_GFRCR		0x40	/* global firmware revision code */
-#define	CD1400_CAR		0x68	/* channel access */
-#define	CD1400_CAR_CHAN			(3<<0)	/* channel select */
-#define	CD1400_GCR		0x4B	/* global configuration */
-#define	CD1400_GCR_PARALLEL		(1<<7)	/* channel 0 is parallel */
-#define	CD1400_SVRR		0x67	/* service request */
-#define	CD1400_SVRR_MDMCH		(1<<2)
-#define	CD1400_SVRR_TXRDY		(1<<1)
-#define	CD1400_SVRR_RXRDY		(1<<0)
-#define	CD1400_RICR		0x44	/* receive interrupting channel */
-#define	CD1400_TICR		0x45	/* transmit interrupting channel */
-#define	CD1400_MICR		0x46	/* modem interrupting channel */
-#define	CD1400_RIR		0x6B	/* receive interrupt status */
-#define	CD1400_RIR_RDIREQ		(1<<7)	/* rx service required */
-#define	CD1400_RIR_RBUSY		(1<<6)	/* rx service in progress */
-#define	CD1400_RIR_CHAN			(3<<0)	/* channel select */
-#define	CD1400_TIR		0x6A	/* transmit interrupt status */
-#define	CD1400_TIR_RDIREQ		(1<<7)	/* tx service required */
-#define	CD1400_TIR_RBUSY		(1<<6)	/* tx service in progress */
-#define	CD1400_TIR_CHAN			(3<<0)	/* channel select */
-#define	CD1400_MIR		0x69	/* modem interrupt status */
-#define	CD1400_MIR_RDIREQ		(1<<7)	/* modem service required */
-#define	CD1400_MIR_RBUSY		(1<<6)	/* modem service in progress */
-#define	CD1400_MIR_CHAN			(3<<0)	/* channel select */
-#define	CD1400_PPR		0x7E	/* prescaler period */
-#define	CD1400_PPR_PRESCALER		512
-
-/*
- * Virtual registers.
- */
-#define	CD1400_RIVR		0x43	/* receive interrupt vector */
-#define	CD1400_RIVR_EXCEPTION		(1<<2)	/* receive exception bit */
-#define	CD1400_TIVR		0x42	/* transmit interrupt vector */
-#define	CD1400_MIVR		0x41	/* modem interrupt vector */
-#define	CD1400_TDR		0x63	/* transmit data */
-#define	CD1400_RDSR		0x62	/* receive data/status */
-#define	CD1400_RDSR_TIMEOUT		(1<<7)	/* rx timeout */
-#define	CD1400_RDSR_SPECIAL_SHIFT	4	/* rx special char shift */
-#define	CD1400_RDSR_SPECIAL		(7<<4)	/* rx special char */
-#define	CD1400_RDSR_BREAK		(1<<3)	/* rx break */
-#define	CD1400_RDSR_PE			(1<<2)	/* rx parity error */
-#define	CD1400_RDSR_FE			(1<<1)	/* rx framing error */
-#define	CD1400_RDSR_OE			(1<<0)	/* rx overrun error */
-#define	CD1400_MISR		0x4C	/* modem interrupt status */
-#define	CD1400_MISR_DSRd		(1<<7)	/* DSR delta */
-#define	CD1400_MISR_CTSd		(1<<6)	/* CTS delta */
-#define	CD1400_MISR_RId			(1<<5)	/* RI delta */
-#define	CD1400_MISR_CDd			(1<<4)	/* CD delta */
-#define	CD1400_EOSRR		0x60	/* end of service request */
-
-/*
- * Channel registers.
- */
-#define	CD1400_LIVR		0x18	/* local interrupt vector */
-#define	CD1400_CCR		0x05	/* channel control */
-#define	CD1400_CCR_CMDRESET		(1<<7)	/* enables following: */
-#define	CD1400_CCR_FTF				(1<<1)	/* flush tx fifo */
-#define	CD1400_CCR_FULLRESET			(1<<0)	/* full reset */
-#define	CD1400_CCR_CHANRESET			0	/*  current channel */
-#define	CD1400_CCR_CMDCORCHG		(1<<6)	/* enables following: */
-#define	CD1400_CCR_COR3				(1<<3)	/* COR3 changed */
-#define	CD1400_CCR_COR2				(1<<2)	/* COR2 changed */
-#define	CD1400_CCR_COR1				(1<<1)	/* COR1 changed */
-#define	CD1400_CCR_CMDSENDSC		(1<<5)	/* enables following: */
-#define	CD1400_CCR_SC				(7<<0)	/* special char 1-4 */
-#define	CD1400_CCR_CMDCHANCTL		(1<<4)	/* enables following: */
-#define	CD1400_CCR_XMTEN			(1<<3)	/* tx enable */
-#define	CD1400_CCR_XMTDIS			(1<<2)	/* tx disable */
-#define	CD1400_CCR_RCVEN			(1<<1)	/* rx enable */
-#define	CD1400_CCR_RCVDIS			(1<<0)	/* rx disable */
-#define	CD1400_SRER		0x06	/* service request enable */
-#define	CD1400_SRER_MDMCH		(1<<7)	/* modem change */
-#define	CD1400_SRER_RXDATA		(1<<4)	/* rx data */
-#define	CD1400_SRER_TXRDY		(1<<2)	/* tx fifo empty */
-#define	CD1400_SRER_TXMPTY		(1<<1)	/* tx shift reg empty */
-#define	CD1400_SRER_NNDT		(1<<0)	/* no new data */
-#define	CD1400_COR1		0x08	/* channel option 1 */
-#define	CD1400_COR1_PARODD		(1<<7)
-#define	CD1400_COR1_PARNORMAL		(2<<5)
-#define	CD1400_COR1_PARFORCE		(1<<5)	/* odd/even = force 1/0 */
-#define	CD1400_COR1_PARNONE		(0<<5)
-#define	CD1400_COR1_NOINPCK		(1<<4)
-#define	CD1400_COR1_STOP2		(2<<2)
-#define	CD1400_COR1_STOP15		(1<<2)	/* 1.5 stop bits */
-#define	CD1400_COR1_STOP1		(0<<2)
-#define	CD1400_COR1_CS8			(3<<0)
-#define	CD1400_COR1_CS7			(2<<0)
-#define	CD1400_COR1_CS6			(1<<0)
-#define	CD1400_COR1_CS5			(0<<0)
-#define	CD1400_COR2		0x09	/* channel option 2 */
-#define	CD1400_COR2_IXANY		(1<<7)	/* implied XON mode */
-#define	CD1400_COR2_IXOFF		(1<<6)	/* in-band tx flow control */
-#define	CD1400_COR2_ETC			(1<<5)	/* embedded tx command */
-#define	CD1400_ETC_CMD				0x00	/* start an ETC */
-#define	CD1400_ETC_SENDBREAK			0x81
-#define	CD1400_ETC_INSERTDELAY			0x82
-#define	CD1400_ETC_STOPBREAK			0x83
-#define	CD1400_COR2_LLM			(1<<4)	/* local loopback mode */
-#define	CD1400_COR2_RLM			(1<<3)	/* remote loopback mode */
-#define	CD1400_COR2_RTSAO		(1<<2)	/* RTS auto output */
-#define	CD1400_COR2_CCTS_OFLOW		(1<<1)	/* CTS auto enable */
-#define	CD1400_COR2_CDSR_OFLOW		(1<<0)	/* DSR auto enable */
-#define	CD1400_COR3		0x0A	/* channel option 3 */
-#define	CD1400_COR3_SCDRNG		(1<<7)	/* special char detect range */
-#define	CD1400_COR3_SCD34		(1<<6)	/* special char detect 3-4 */
-#define	CD1400_COR3_FTC			(1<<5)	/* flow control transparency */
-#define	CD1400_COR3_SCD12		(1<<4)	/* special char detect 1-2 */
-#define	CD1400_COR3_RXTH		(15<<0)	/* rx fifo threshold */
-#define	CD1400_COR4		0x1E	/* channel option 4 */
-#define	CD1400_COR4_IGNCR		(1<<7)
-#define	CD1400_COR4_ICRNL		(1<<6)
-#define	CD1400_COR4_INLCR		(1<<5)
-#define	CD1400_COR4_IGNBRK		(1<<4)
-#define	CD1400_COR4_NOBRKINT		(1<<3)
-#define	CD1400_COR4_PFO_ESC		(4<<0)	/* parity/framing/overrun... */
-#define	CD1400_COR4_PFO_NUL		(3<<0)
-#define	CD1400_COR4_PFO_DISCARD		(2<<0)
-#define	CD1400_COR4_PFO_GOOD		(1<<0)
-#define	CD1400_COR4_PFO_EXCEPTION	(0<<0)
-#define	CD1400_COR5		0x1F	/* channel option 5 */
-#define	CD1400_COR5_ISTRIP		(1<<7)
-#define	CD1400_COR5_LNEXT		(1<<6)
-#define	CD1400_COR5_CMOE		(1<<5)	/* char matching on error */
-#define	CD1400_COR5_EBD			(1<<2)	/* end of break detected */
-#define	CD1400_COR5_ONLCR		(1<<1)
-#define	CD1400_COR5_OCRNL		(1<<0)
-#define	CD1400_CCSR		0x0B	/* channel control status */
-#define	CD1400_RDCR		0x0E	/* received data count */
-#define	CD1400_SCHR1		0x1A	/* special character 1 */
-#define	CD1400_SCHR2		0x1B	/* special character 2 */
-#define	CD1400_SCHR3		0x1C	/* special character 3 */
-#define	CD1400_SCHR4		0x1D	/* special character 4 */
-#define	CD1400_SCRL		0x22	/* special character range, low */
-#define	CD1400_SCRH		0x23	/* special character range, high */
-#define	CD1400_LNC		0x24	/* lnext character */
-#define	CD1400_MCOR1		0x15	/* modem change option 1 */
-#define	CD1400_MCOR1_DSRzd		(1<<7)	/* DSR one-to-zero delta */
-#define	CD1400_MCOR1_CTSzd		(1<<6)
-#define	CD1400_MCOR1_RIzd		(1<<5)
-#define	CD1400_MCOR1_CDzd		(1<<4)
-#define	CD1400_MCOR1_DTRth		(15<<0)	/* dtrflow threshold */
-#define	CD1400_MCOR2		0x16	/* modem change option 2 */
-#define	CD1400_MCOR2_DSRod		(1<<7)	/* DSR zero-to-one delta */
-#define	CD1400_MCOR2_CTSod		(1<<6)
-#define	CD1400_MCOR2_RIod		(1<<5)
-#define	CD1400_MCOR2_CDod		(1<<4)
-#define	CD1400_RTPR		0x21	/* receive timeout period */
-#define	CD1400_MSVR1		0x6C	/* modem signal value 1 */
-#define	CD1400_MSVR1_RTS		(1<<0)	/* RTS line (r/w) */
-#define	CD1400_MSVR2		0x6D	/* modem signal value 2 */
-#define	CD1400_MSVR2_DSR		(1<<7)	/* !DSR line (r) */
-#define	CD1400_MSVR2_CTS		(1<<6)	/* !CTS line (r) */
-#define	CD1400_MSVR2_RI			(1<<5)	/* !RI line (r) */
-#define	CD1400_MSVR2_CD			(1<<4)	/* !CD line (r) */
-#define	CD1400_MSVR2_DTR		(1<<1)	/* DTR line (r/w) */
-#define	CD1400_PSVR		0x6F	/* printer signal value */
-#define	CD1400_RBPR		0x78	/* receive baud rate period */
-#define	CD1400_RCOR		0x7C	/* receive clock option */
-#define	CD1400_TBPR		0x72	/* transmit baud rate period */
-#define	CD1400_TCOR		0x76	/* transmit clock option */
diff --git a/include.new/dev/ic/cd180.h b/include.new/dev/ic/cd180.h
deleted file mode 100644
index 37176af..0000000
--- a/include.new/dev/ic/cd180.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * Copyright (C) 1995 by Pavel Antonov, Moscow, Russia.
- * Copyright (C) 1995 by Andrey A. Chernov, Moscow, Russia.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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.
- *
- * $FreeBSD: releng/10.2/sys/dev/ic/cd180.h 139749 2005-01-06 01:43:34Z imp $
- */
-
-/*
- * Cirrus Logic CD180 registers
- */
-
-/* Global registers */
-#define CD180_GIVR      0x40    /* Global Interrupt Verctor Register      */
-#define CD180_GICR      0x41    /* Global Interrupting Channel Register   */
-#define CD180_PILR1     0x61    /* Priority Interrupt Level Register 1    */
-#define CD180_PILR2     0x62    /* Priority Interrupt Level Register 2    */
-#define CD180_PILR3     0x63    /* Priority Interrupt Level Register 3    */
-#define CD180_CAR       0x64    /* Channel Access Register                */
-#define CD180_GFRCR     0x6B    /* Global Firmware Revision Code Register */
-#define CD180_PPRH      0x70    /* Prescaler Period Register MSB          */
-#define CD180_PPRL      0x71    /* Prescaler Period Register LSB          */
-#define CD180_RDR       0x78    /* Receiver Data Register                 */
-#define CD180_RCSR      0x7A    /* Receiver Character Status Register     */
-#define CD180_TDR       0x7B    /* Transmit Data Register                 */
-#define CD180_EOIR      0x7F    /* End of Interrupt Register              */
-
-/* Channel Registers */
-#define CD180_CCR       0x01    /* Channel Command Register               */
-#define CD180_IER       0x02    /* Interrupt Enable Register              */
-#define CD180_COR1      0x03    /* Channel Option Register 1              */
-#define CD180_COR2      0x04    /* Channel Option Register 1              */
-#define CD180_COR3      0x05    /* Channel Option Register 1              */
-#define CD180_CCSR      0x06    /* Channel Control STatus Register        */
-#define CD180_RDCR      0x07    /* Receive Data Count Register            */
-#define CD180_SCHR1     0x09    /* Special Character Register 1           */
-#define CD180_SCHR2     0x0A    /* Special Character Register 2           */
-#define CD180_SCHR3     0x0B    /* Special Character Register 3           */
-#define CD180_SCHR4     0x0C    /* Special Character Register 4           */
-#define CD180_MCOR1     0x10    /* Modem Change Option 1 Register         */
-#define CD180_MCOR2     0x11    /* Modem Change Option 2 Register         */
-#define CD180_MCR       0x12    /* Modem Change Register                  */
-#define CD180_RTPR      0x18    /* Receive Timeout Period Register        */
-#define CD180_MSVR      0x28    /* Modem Signal Value Register            */
-#define CD180_RBPRH     0x31    /* Receive Baud Rate Period Register MSB  */
-#define CD180_RBPRL     0x32    /* Receive Baud Rate Period Register LSB  */
-#define CD180_TBPRH     0x39    /* Transmit Baud Rate Period Register MSB */
-#define CD180_TBPRL     0x3A    /* Transmit Baud Rate Period Register LSB */
-
-/** Register descritpions **/
-
-/* Global Interrupt Vector Register */
-#define GIVR_IT_MSCI    0x01    /* Modem Signal Change Interrupt          */
-#define GIVR_IT_TDI     0x02    /* Transmit Data Interrupt                */
-#define GIVR_IT_RGDI    0x03    /* Receive Good Data Interrupt            */
-#define GIVR_IT_REI     0x07    /* Receive Exception Interrupt            */
-
-/* Global Interrupt Channel Register */
-#define GICR_CHAN       0x1C    /* Channel Number Mask                    */
-#define GICR_LSH        2       /* Channel Number Shift                   */
-
-/* Channel Address Register */
-#define CAR_CHAN        0x07    /* Channel Number Mask                    */
-#define CAR_A7          0x08    /* Addres bit 7 (unused)                  */
-
-/* Receive Character Status Register */
-#define RCSR_OE         0x01    /* Overrun Error                          */
-#define RCSR_FE         0x02    /* Frame Error                            */
-#define RCSR_PE         0x04    /* Parity Error                           */
-#define RCSR_Break      0x08    /* Break detected                         */
-#define RCSR_Timeout    0x80    /* Rx Timeout                             */
-#define RCSR_SCMASK     0x70    /* Special Character Detected Mask        */
-#define RCSR_SC1        0x10    /* Special Char 1 (or 1 & 3 seq matched)  */
-#define RCSR_SC2        0x20    /* Special Char 2 (or 2 & 4 seq matched)  */
-#define RCSR_SC3        0x30    /* Special Char 3                         */
-#define RCSR_SC4        0x40    /* Special Char 4                         */
-
-/* Channel Command Register */
-#define CCR_ResetChan   0x80    /* Reset Channel                          */
-#define CCR_HWRESET     0x81    /* Hardware Reset (all channels)          */
-#define CCR_CORCHG1     0x42    /* Channel Option Register 1 Changed      */
-#define CCR_CORCHG2     0x44    /* Channel Option Register 2 Changed      */
-#define CCR_CORCHG3     0x48    /* Channel Option Register 3 Changed      */
-#define CCR_SENDSPCH1   0x21    /* Send Special Character 1               */
-#define CCR_SENDSPCH2   0x22    /* Send Special Character 2               */
-#define CCR_SENDSPCH3   0x23    /* Send Special Character 3               */
-#define CCR_SENDSPCH4   0x24    /* Send Special Character 4               */
-#define CCR_RCVRDIS     0x11    /* Receiver Disable                       */
-#define CCR_RCVREN      0x12    /* Receiver Enable                        */
-#define CCR_XMTRDIS     0x14    /* Transmitter Disable                    */
-#define CCR_XMTREN      0x18    /* Transmitter Enable                     */
-
-/* Interrupt Enable Register */
-#define IER_DSR         0x80    /* Enable interrupt on DSR change         */
-#define IER_CD          0x40    /* Enable interrupt on CD change          */
-#define IER_CTS         0x20    /* Enable interrupt on CTS change         */
-#define IER_RxData      0x10    /* Enable interrupt on Receive Data       */
-#define IER_RxSC        0x08    /* Enable interrupt on Receive Spec. Char */
-#define IER_TxRdy       0x04    /* Enable interrupt on TX FIFO empty      */
-#define IER_TxMpty      0x02    /* Enable interrupt on TX completely empty*/
-#define IER_RET         0x01    /* Enable interrupt on RX Except. Timeout */
-
-/* Channel Option Register 1 */
-#define COR1_ODDP       0x80    /* Odd Parity                             */
-#define COR1_ParMMASK   0x60    /* Parity Mode mask                       */
-#define COR1_NOPAR      0x02    /* No Parity                              */
-#define COR1_FORCEPAR   0x20    /* Force Parity                           */
-#define COR1_NORMPAR    0x40    /* Normal Parity                          */
-#define COR1_Ignore     0x10    /* Ignore Parity on RX                    */
-#define COR1_StopMASK   0x0C    /* Stop Bits mode mask                    */
-#define COR1_1SB        0x00    /* 1 Stop Bit                             */
-#define COR1_15SB       0x04    /* 1.5 Stop Bits                          */
-#define COR1_2SB        0x08    /* 2 Stop Bits                            */
-#define COR1_CHLMASK    0x03    /* Character Length mask                  */
-#define COR1_5BITS      0x00    /* 5 bits                                 */
-#define COR1_6BITS      0x01    /* 6 bits                                 */
-#define COR1_7BITS      0x02    /* 7 bits                                 */
-#define COR1_8BITS      0x03    /* 8 bits                                 */
-
-/* Channel Option Register 2 */
-#define COR2_IXM        0x80    /* Implied XON mode                       */
-#define COR2_TxIBE      0x40    /* Enable In-Band XON/XOFF Flow Control   */
-#define COR2_ETC        0x20    /* Embedded Tx Commands Enable            */
-#define COR2_LLM        0x10    /* Local Loopback Mode                    */
-#define COR2_RLM        0x08    /* Remote Loopback Mode                   */
-#define COR2_RtsAO      0x04    /* RTS Automatic Output Enable            */
-#define COR2_CtsAE      0x02    /* CTS Automatic Enable                   */
-#define COR2_DsrAE      0x01    /* DSR Automatic Enable                   */
-
-/* Channel Option Register 3 */
-#define COR3_XonCH      0x80    /* XON is a double seq (1 & 3)            */
-#define COR3_XoffCH     0x40    /* XOFF is a double seq (1 & 3)           */
-#define COR3_FCT        0x20    /* Flow-Control Transparency Mode         */
-#define COR3_SCDE       0x10    /* Special Character Detection Enable     */
-#define COR3_RxTHMASK   0x0F    /* RX FIFO Threshold value (1-8)          */
-
-/* Channel Control Status Register */
-#define CCSR_RxEn       0x80    /* Revceiver Enabled                      */
-#define CCSR_RxFloff    0x40    /* Receive Flow Off (XOFF sent)           */
-#define CCSR_RxFlon     0x20    /* Receive Flow On (XON sent)             */
-#define CCSR_TxEn       0x08    /* Transmitter Enabled                    */
-#define CCSR_TxFloff    0x04    /* Transmit Flow Off (got XOFF)           */
-#define CCSR_TxFlon     0x02    /* Transmit Flow On (got XON)             */
-
-/* Modem Change Option Register 1 */
-#define MCOR1_DSRzd     0x80    /* Detect 0->1 transition of DSR          */
-#define MCOR1_CDzd      0x40    /* Detect 0->1 transition of CD           */
-#define MCOR1_CTSzd     0x20    /* Detect 0->1 transition of CTS          */
-#define MCOR1_DTRthMASK 0x0F    /* Automatic DTR FC Threshold (1-8) chars */
-
-/* Modem Change Option Register 2 */
-#define MCOR2_DSRod     0x80    /* Detect 1->0 transition of DSR          */
-#define MCOR2_CDod      0x40    /* Detect 1->0 transition of CD           */
-#define MCOR2_CTSod     0x20    /* Detect 1->0 transition of CTS          */
-
-/* Modem Change Register */
-#define MCR_DSRchg      0x80    /* DSR Changed                            */
-#define MCR_CDchg       0x40    /* CD  Changed                            */
-#define MCR_CTSchg      0x20    /* CTS Changed                            */
-
-/* Modem Signal Value Register */
-#define MSVR_DSR        0x80    /* Current state of DSR input             */
-#define MSVR_CD         0x40    /* Current state of DSR input             */
-#define MSVR_CTS        0x20    /* Current state of CTS input             */
-#define MSVR_DTR        0x02    /* Current state of DTR output            */
-#define MSVR_RTS        0x01    /* Current state of RTS output            */
-
-/* Escape characters */
-#define CD180_C_ESC     0x00    /* Escape character                       */
-#define CD180_C_SBRK    0x81    /* Start sending BREAK                    */
-#define CD180_C_DELAY   0x82    /* Delay output                           */
-#define CD180_C_EBRK    0x83    /* Stop sending BREAK                     */
-
-/* Miscellaneous */
-#define CD180_NCHAN     8       /* 8 channels per chip                    */
-#define CD180_CTICKS    16      /* 16 ticks for character processing      */
-#define CD180_NFIFO     8       /* 8 bytes in FIFO                        */
diff --git a/include.new/dev/ic/esp.h b/include.new/dev/ic/esp.h
deleted file mode 100644
index 4428b08..0000000
--- a/include.new/dev/ic/esp.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1995 Sean Eric Fagan.
- * 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. Neither the name of the author nor the names of contributors
- *    may 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: releng/10.2/sys/dev/ic/esp.h 77961 2001-06-10 04:20:37Z nyan $
- */
-
-#ifndef _IC_ESP_H_
-#define	_IC_ESP_H_
-
-/*
- * Definitions for Hayes ESP serial cards.
- */
-
-/*
- * CMD1 and CMD2 are the command ports, offsets from <esp_iobase>.
- */
-#define	ESP_CMD1	4
-#define	ESP_CMD2	5
-
-/*
- * STAT1 and STAT2 are to get return values and status bytes;
- * they overload CMD1 and CMD2.
- */
-#define	ESP_STATUS1	ESP_CMD1
-#define	ESP_STATUS2	ESP_CMD2
-
-/*
- * Commands.  Commands are given by writing the command value to
- * ESP_CMD1 and then writing or reading some number of bytes from
- * ESP_CMD2 or ESP_STATUS2.
- */
-#define	ESP_GETTEST	0x01	/* self-test command (1 byte + extras) */
-#define	ESP_GETDIPS	0x02	/* get on-board DIP switches (1 byte) */
-#define	ESP_SETFLOWTYPE	0x08	/* set type of flow-control (2 bytes) */
-#define	ESP_SETRXFLOW	0x0a	/* set Rx FIFO flow control levels (4 bytes) */
-#define	ESP_SETMODE	0x10	/* set board mode (1 byte) */
-#define	ESP_SETCLOCK	0x23	/* set UART clock prescaler */
-
-/* Mode bits (ESP_SETMODE). */
-#define	ESP_MODE_FIFO	0x02	/* act like a 16550 (compatibility mode) */
-#define	ESP_MODE_RTS	0x04	/* use RTS hardware flow control */
-#define	ESP_MODE_SCALE	0x80	/* scale FIFO trigger levels */
-
-/* Flow control type bits (ESP_SETFLOWTYPE). */
-#define	ESP_FLOW_RTS	0x04	/* cmd1: local Rx sends RTS flow control */
-#define	ESP_FLOW_CTS	0x10	/* cmd2: local transmitter responds to CTS */
-
-/* Used by ESP_SETRXFLOW. */
-#define	HIBYTE(w)	(((w) >> 8) & 0xff)
-#define	LOBYTE(w)	((w) & 0xff)
-
-#endif /* !_IC_ESP_H_ */
diff --git a/include.new/dev/ic/hd64570.h b/include.new/dev/ic/hd64570.h
deleted file mode 100644
index a636a32..0000000
--- a/include.new/dev/ic/hd64570.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/*-
- * Copyright (c) 1995 John Hay.  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 [your name]
- *	and [any other names deserving credit ]
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY [your name] 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.
- *
- * $FreeBSD: releng/10.2/sys/dev/ic/hd64570.h 139749 2005-01-06 01:43:34Z imp $
- */
-#ifndef _HD64570_H_
-#define _HD64570_H_
-
-typedef struct msci_channel
-  {
-  union
-    {
-    unsigned short us_trb;    /* rw */
-    struct
-      {
-      unsigned char uc_trbl;
-      unsigned char uc_trbh;
-      }uc_trb;
-    }u_trb;
-  unsigned char st0;          /* ro */
-  unsigned char st1;          /* rw */
-  unsigned char st2;          /* rw */
-  unsigned char st3;          /* ro */
-  unsigned char fst;          /* rw */
-  unsigned char unused0;
-  unsigned char ie0;          /* rw */
-  unsigned char ie1;          /* rw */
-  unsigned char ie2;          /* rw */
-  unsigned char fie;          /* rw */
-  unsigned char cmd;          /* wo */
-  unsigned char unused1;
-  unsigned char md0;          /* rw */
-  unsigned char md1;          /* rw */
-  unsigned char md2;          /* rw */
-  unsigned char ctl;          /* rw */
-  unsigned char sa0;          /* rw */
-  unsigned char sa1;          /* rw */
-  unsigned char idl;          /* rw */
-  unsigned char tmc;          /* rw */
-  unsigned char rxs;          /* rw */
-  unsigned char txs;          /* rw */
-  unsigned char trc0;         /* rw */
-  unsigned char trc1;         /* rw */
-  unsigned char rrc;          /* rw */
-  unsigned char unused2;
-  unsigned char cst0;         /* rw */
-  unsigned char cst1;         /* rw */
-  unsigned char unused3[2];
-  }msci_channel;
-
-#define trb     u_trb.us_trb
-#define trbl    u_trb.uc_trb.uc_trbl
-#define trbh    u_trb.uc_trb.uc_trbh
-
-typedef struct timer_channel
-  {
-  unsigned short tcnt;        /* rw */
-  unsigned short tconr;       /* wo */
-  unsigned char tcsr;         /* rw */
-  unsigned char tepr;         /* rw */
-  unsigned char unused[2];
-  }timer_channel;
-
-typedef struct dmac_channel
-  {
-  unsigned short dar;         /* rw */
-  unsigned char darb;         /* rw */
-  unsigned char unused0;
-  unsigned short sar;         /* rw On odd numbered dmacs (tx) only */
-  unsigned char sarb;         /* rw */
-#define cpb sarb
-  unsigned char unused1;
-  unsigned short cda;         /* rw */
-  unsigned short eda;         /* rw */
-  unsigned short bfl;         /* rw On even numbered dmacs (rx) only */
-  unsigned short bcr;         /* rw */
-  unsigned char dsr;          /* rw */
-  unsigned char dmr;          /* rw */
-  unsigned char unused2;
-  unsigned char fct;          /* rw */
-  unsigned char dir;          /* rw */
-  unsigned char dcr;          /* rw */
-  unsigned char unused3[10];
-  }dmac_channel;
-
-/* x is the channel number. rx channels are even numbered and tx, odd. */
-#define DMAC_RXCH(x)            ((x*2) + 0)
-#define DMAC_TXCH(x)            ((x*2) + 1)
-
-typedef struct sca_regs
-  {
-  unsigned char lpr;          /* rw */
-  unsigned char unused0;      /* -- */
-  /* Wait system */
-  unsigned char pabr0;        /* rw */
-  unsigned char pabr1;        /* rw */
-  unsigned char wcrl;         /* rw */
-  unsigned char wcrm;         /* rw */
-  unsigned char wcrh;         /* rw */
-  unsigned char unused1;
-  /* DMAC */
-  unsigned char pcr;          /* rw */
-  unsigned char dmer;         /* rw */
-  unsigned char unused2[6];
-  /* Interrupt */
-  unsigned char isr0;          /* ro */
-  unsigned char isr1;          /* ro */
-  unsigned char isr2;          /* ro */
-  unsigned char unused3;
-  unsigned char ier0;          /* rw */
-  unsigned char ier1;          /* rw */
-  unsigned char ier2;          /* rw */
-  unsigned char unused4;
-  unsigned char itcr;          /* rw */
-  unsigned char unused5;
-  unsigned char ivr;           /* rw */
-  unsigned char unused6;
-  unsigned char imvr;          /* rw */
-  unsigned char unused7[3];
-  /* MSCI Channel 0 */
-  msci_channel  msci[2];
-  timer_channel timer[4];
-  dmac_channel  dmac[4];
-  }sca_regs;
-
-#define SCA_CMD_TXRESET         0x01
-#define SCA_CMD_TXENABLE        0x02
-#define SCA_CMD_TXDISABLE       0x03
-#define SCA_CMD_TXCRCINIT       0x04
-#define SCA_CMD_TXCRCEXCL       0x05
-#define SCA_CMS_TXEOM           0x06
-#define SCA_CMD_TXABORT         0x07
-#define SCA_CMD_MPON            0x08
-#define SCA_CMD_TXBCLEAR        0x09
-
-#define SCA_CMD_RXRESET         0x11
-#define SCA_CMD_RXENABLE        0x12
-#define SCA_CMD_RXDISABLE       0x13
-#define SCA_CMD_RXCRCINIT       0x14
-#define SCA_CMD_RXMSGREJ        0x15
-#define SCA_CMD_MPSEARCH        0x16
-#define SCA_CMD_RXCRCEXCL       0x17
-#define SCA_CMD_RXCRCCALC       0x18
-
-#define SCA_CMD_NOP             0x00
-#define SCA_CMD_RESET           0x21
-#define SCA_CMD_SEARCH          0x31
-
-#define SCA_MD0_CRC_1           0x01
-#define SCA_MD0_CRC_CCITT       0x02
-#define SCA_MD0_CRC_ENABLE      0x04
-#define SCA_MD0_AUTO_ENABLE     0x10
-#define SCA_MD0_MODE_ASYNC      0x00
-#define SCA_MD0_MODE_BYTESYNC1  0x20
-#define SCA_MD0_MODE_BISYNC     0x40
-#define SCA_MD0_MODE_BYTESYNC2  0x60
-#define SCA_MD0_MODE_HDLC       0x80
-
-#define SCA_MD1_NOADDRCHK       0x00
-#define SCA_MD1_SNGLADDR1       0x40
-#define SCA_MD1_SNGLADDR2       0x80
-#define SCA_MD1_DUALADDR        0xC0
-
-#define SCA_MD2_DUPLEX          0x00
-#define SCA_MD2_ECHO            0x01
-#define SCA_MD2_LOOPBACK        0x03
-#define SCA_MD2_ADPLLx8         0x00
-#define SCA_MD2_ADPLLx16        0x08
-#define SCA_MD2_ADPLLx32        0x10
-#define SCA_MD2_NRZ             0x00
-#define SCA_MD2_NRZI            0x20
-#define SCA_MD2_MANCHESTER      0x80
-#define SCA_MD2_FM0             0xC0
-#define SCA_MD2_FM1             0xA0
-
-#define SCA_CTL_RTS             0x01
-#define SCA_CTL_IDLPAT          0x10
-#define SCA_CTL_UDRNC           0x20
-
-#define SCA_RXS_DIV_MASK        0x0F
-#define SCA_RXS_DIV1            0x00
-#define SCA_RXS_DIV2            0x01
-#define SCA_RXS_DIV4            0x02
-#define SCA_RXS_DIV8            0x03
-#define SCA_RXS_DIV16           0x04
-#define SCA_RXS_DIV32           0x05
-#define SCA_RXS_DIV64           0x06
-#define SCA_RXS_DIV128          0x07
-#define SCA_RXS_DIV256          0x08
-#define SCA_RXS_DIV512          0x09
-#define SCA_RXS_CLK_RXC0        0x00
-#define SCA_RXS_CLK_RXC1        0x20
-#define SCA_RXS_CLK_INT         0x40
-#define SCA_RXS_CLK_ADPLL_OUT   0x60
-#define SCA_RXS_CLK_ADPLL_IN    0x70
-
-#define SCA_TXS_DIV_MASK        0x0F
-#define SCA_TXS_DIV1            0x00
-#define SCA_TXS_DIV2            0x01
-#define SCA_TXS_DIV4            0x02
-#define SCA_TXS_DIV8            0x03
-#define SCA_TXS_DIV16           0x04
-#define SCA_TXS_DIV32           0x05
-#define SCA_TXS_DIV64           0x06
-#define SCA_TXS_DIV128          0x07
-#define SCA_TXS_DIV256          0x08
-#define SCA_TXS_DIV512          0x09
-#define SCA_TXS_CLK_TXC         0x00
-#define SCA_TXS_CLK_INT         0x40
-#define SCA_TXS_CLK_RX          0x60
-
-#define SCA_ST0_RXRDY           0x01
-#define SCA_ST0_TXRDY           0x02
-#define SCA_ST0_RXINT           0x40
-#define SCA_ST0_TXINT           0x80
-
-#define SCA_ST1_IDLST           0x01
-#define SCA_ST1_ABTST           0x02
-#define SCA_ST1_DCDCHG          0x04
-#define SCA_ST1_CTSCHG          0x08
-#define SCA_ST1_FLAG            0x10
-#define SCA_ST1_TXIDL           0x40
-#define SCA_ST1_UDRN            0x80
-
-/* ST2 and FST look the same */
-#define SCA_FST_CRCERR          0x04
-#define SCA_FST_OVRN            0x08
-#define SCA_FST_RESFRM          0x10
-#define SCA_FST_ABRT            0x20
-#define SCA_FST_SHRT            0x40
-#define SCA_FST_EOM             0x80
-
-#define SCA_ST3_RXENA           0x01
-#define SCA_ST3_TXENA           0x02
-#define SCA_ST3_DCD             0x04
-#define SCA_ST3_CTS             0x08
-#define SCA_ST3_ADPLLSRCH       0x10
-#define SCA_ST3_TXDATA          0x20
-
-#define SCA_FIE_EOMFE           0x80
-
-#define SCA_IE0_RXRDY           0x01
-#define SCA_IE0_TXRDY           0x02
-#define SCA_IE0_RXINT           0x40
-#define SCA_IE0_TXINT           0x80
-
-#define SCA_IE1_IDLDE           0x01
-#define SCA_IE1_ABTDE           0x02
-#define SCA_IE1_DCD             0x04
-#define SCA_IE1_CTS             0x08
-#define SCA_IE1_FLAG            0x10
-#define SCA_IE1_IDL             0x40
-#define SCA_IE1_UDRN            0x80
-
-#define SCA_IE2_CRCERR          0x04
-#define SCA_IE2_OVRN            0x08
-#define SCA_IE2_RESFRM          0x10
-#define SCA_IE2_ABRT            0x20
-#define SCA_IE2_SHRT            0x40
-#define SCA_IE2_EOM             0x80
-
-/* This is for RRC, TRC0 and TRC1. */
-#define SCA_RCR_MASK            0x1F
-
-#define SCA_IE1_
-
-#define SCA_IV_CHAN0            0x00
-#define SCA_IV_CHAN1            0x20
-
-#define SCA_IV_RXRDY            0x04
-#define SCA_IV_TXRDY            0x06
-#define SCA_IV_RXINT            0x08
-#define SCA_IV_TXINT            0x0A
-
-#define SCA_IV_DMACH0           0x00
-#define SCA_IV_DMACH1           0x08
-#define SCA_IV_DMACH2           0x20
-#define SCA_IV_DMACH3           0x28
-
-#define SCA_IV_DMIA             0x14
-#define SCA_IV_DMIB             0x16
-
-#define SCA_IV_TIMER0           0x1C
-#define SCA_IV_TIMER1           0x1E
-#define SCA_IV_TIMER2           0x3C
-#define SCA_IV_TIMER3           0x3E
-
-/*
- * DMA registers
- */
-#define SCA_DSR_EOT             0x80
-#define SCA_DSR_EOM             0x40
-#define SCA_DSR_BOF             0x20
-#define SCA_DSR_COF             0x10
-#define SCA_DSR_DE              0x02
-#define SCA_DSR_DWE             0x01
-
-#define SCA_DMR_TMOD            0x10
-#define SCA_DMR_NF              0x04
-#define SCA_DMR_CNTE            0x02
-
-#define SCA_DMER_EN             0x80
-
-#define SCA_DCR_ABRT            0x01
-#define SCA_DCR_FCCLR           0x02  /* Clear frame end intr counter */
-
-#define SCA_DIR_EOT             0x80
-#define SCA_DIR_EOM             0x40
-#define SCA_DIR_BOF             0x20
-#define SCA_DIR_COF             0x10
-
-#define SCA_PCR_BRC             0x10
-#define SCA_PCR_CCC             0x08
-#define SCA_PCR_PR2             0x04
-#define SCA_PCR_PR1             0x02
-#define SCA_PCR_PR0             0x01
-
-typedef struct sca_descriptor
-  {
-  unsigned short cp;
-  unsigned short bp;
-  unsigned char  bpb;
-  unsigned char  unused0;
-  unsigned short len;
-  unsigned char  stat;
-  unsigned char  unused1;
-  }sca_descriptor;
-
-#define SCA_DESC_EOT            0x01
-#define SCA_DESC_CRC            0x04
-#define SCA_DESC_OVRN           0x08
-#define SCA_DESC_RESD           0x10
-#define SCA_DESC_ABORT          0x20
-#define SCA_DESC_SHRTFRM        0x40
-#define SCA_DESC_EOM            0x80
-#define SCA_DESC_ERRORS         0x7C
-
-/*
-***************************************************************************
-**                                 END
-***************************************************************************
-**/
-#endif /* _HD64570_H_ */
-
diff --git a/include.new/dev/ic/i8237.h b/include.new/dev/ic/i8237.h
deleted file mode 100644
index 64d6acc..0000000
--- a/include.new/dev/ic/i8237.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Intel 8237 DMA Controller
- *
- * $FreeBSD: releng/10.2/sys/dev/ic/i8237.h 146214 2005-05-14 10:14:56Z nyan $
- */
-
-#define	DMA37MD_SINGLE	0x40	/* single pass mode */
-#define	DMA37MD_CASCADE	0xc0	/* cascade mode */
-#define	DMA37MD_AUTO	0x50	/* autoinitialise single pass mode */
-#define	DMA37MD_WRITE	0x04	/* read the device, write memory operation */
-#define	DMA37MD_READ	0x08	/* write the device, read memory operation */
diff --git a/include.new/dev/ic/i8251.h b/include.new/dev/ic/i8251.h
deleted file mode 100644
index 24b215a..0000000
--- a/include.new/dev/ic/i8251.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * Copyright (c) 1991 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/dev/ic/i8251.h 182835 2008-09-07 04:35:04Z nyan $
- */
-
-/*
- * modified for PC9801 by M.Ishii 
- *			Kyoto University Microcomputer Club (KMC)
- *
- * modified for 8251(FIFO) by Seigo TANIMURA <tanimura@FreeBSD.org>
- */
-
-/* i8251 mode register */
-#define	MOD8251_5BITS	0x00
-#define	MOD8251_6BITS	0x04
-#define	MOD8251_7BITS	0x08
-#define	MOD8251_8BITS	0x0c
-#define	MOD8251_PENAB	0x10	/* parity enable */
-#define	MOD8251_PEVEN	0x20	/* parity even */
-#define	MOD8251_STOP1	0x40	/* 1 stop bit */
-#define	MOD8251_STOP15	0x80	/* 1.5 stop bit */
-#define	MOD8251_STOP2	0xc0	/* 2 stop bit */
-#define	MOD8251_CLKx1	0x01	/* x1 */
-#define	MOD8251_CLKx16	0x02	/* x16 */
-#define	MOD8251_CLKx64	0x03	/* x64 */
-
-/* i8251 command register */
-#define	CMD8251_TxEN	0x01	/* transmit enable */
-#define	CMD8251_DTR	0x02	/* assert DTR */
-#define	CMD8251_RxEN	0x04	/* receive enable */
-#define	CMD8251_SBRK	0x08	/* send break */
-#define	CMD8251_ER	0x10	/* error reset */
-#define	CMD8251_RTS	0x20	/* assert RTS */
-#define	CMD8251_RESET	0x40	/* internal reset */
-#define	CMD8251_EH	0x80	/* enter hunt mode */
-
-/* i8251 status register */
-#define	STS8251_TxRDY	0x01	/* transmit READY */
-#define	STS8251_RxRDY	0x02	/* data exists in receive buffer */
-#define	STS8251_TxEMP	0x04	/* transmit buffer EMPTY */
-#define	STS8251_PE	0x08	/* perity error */
-#define	STS8251_OE	0x10	/* overrun error */
-#define	STS8251_FE	0x20	/* framing error */
-#define	STS8251_BI	0x40	/* break detect */
-#define	STS8251_DSR	0x80	/* DSR is asserted */
-
-/* i8251F line status register */
-#define	FLSR_TxEMP	0x01	/* transmit buffer EMPTY */
-#define	FLSR_TxRDY	0x02	/* transmit READY */
-#define	FLSR_RxRDY	0x04	/* data exists in receive buffer */
-#define	FLSR_OE		0x10	/* overrun error */
-#define	FLSR_PE		0x20	/* perity error */
-#define	FLSR_BI		0x80	/* break detect */
-
-/* i8251F modem status register */
-#define	MSR_DCD		0x80	/* Current Data Carrier Detect */
-#define	MSR_RI		0x40	/* Current Ring Indicator */
-#define	MSR_DSR		0x20	/* Current Data Set Ready */
-#define	MSR_CTS		0x10	/* Current Clear to Send */
-#define	MSR_DDCD	0x08	/* DCD has changed state */
-#define	MSR_TERI	0x04	/* RI has toggled low to high */
-#define	MSR_DDSR	0x02	/* DSR has changed state */
-#define	MSR_DCTS	0x01	/* CTS has changed state */
-
-/* i8251F interrupt identification register */
-#define	IIR_FIFO_CK1	0x40
-#define	IIR_FIFO_CK2	0x20
-#define	IIR_IMASK	0x0f
-#define	IIR_RXTOUT	0x0c	/* Receiver timeout */
-#define	IIR_RLS		0x06	/* Line status change */
-#define	IIR_RXRDY	0x04	/* Receiver ready */
-#define	IIR_TXRDY	0x02	/* Transmitter ready */
-#define	IIR_NOPEND	0x01	/* Transmitter ready */
-#define	IIR_MLSC	0x00	/* Modem status */
-
-/* i8251F fifo control register */
-#define	FIFO_ENABLE	0x01	/* Turn the FIFO on */
-#define	FIFO_RCV_RST	0x02	/* Reset RX FIFO */
-#define	FIFO_XMT_RST	0x04	/* Reset TX FIFO */
-#define	FIFO_LSR_EN	0x08
-#define	FIFO_MSR_EN	0x10
-#define	FIFO_TRIGGER_1	0x00	/* Trigger RXRDY intr on 1 character */
-#define	FIFO_TRIGGER_4	0x40	/* ibid 4 */
-#define	FIFO_TRIGGER_8	0x80	/* ibid 8 */
-#define	FIFO_TRIGGER_14	0xc0	/* ibid 14 */
diff --git a/include.new/dev/ic/i8253reg.h b/include.new/dev/ic/i8253reg.h
deleted file mode 100644
index fa969ca..0000000
--- a/include.new/dev/ic/i8253reg.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 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.
- * 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.
- *
- *	from: Header: timerreg.h,v 1.2 93/02/28 15:08:58 mccanne Exp
- * $FreeBSD: releng/10.2/sys/dev/ic/i8253reg.h 146215 2005-05-14 10:26:31Z nyan $
- */
-
-/*
- * Register definitions for the Intel 8253 Programmable Interval Timer.
- *
- * This chip has three independent 16-bit down counters that can be
- * read on the fly.  There are three mode registers and three countdown
- * registers.  The countdown registers are addressed directly, via the
- * first three I/O ports.  The three mode registers are accessed via
- * the fourth I/O port, with two bits in the mode byte indicating the
- * register.  (Why are hardware interfaces always so braindead?).
- *
- * To write a value into the countdown register, the mode register
- * is first programmed with a command indicating the which byte of
- * the two byte register is to be modified.  The three possibilities
- * are load msb (TMR_MR_MSB), load lsb (TMR_MR_LSB), or load lsb then
- * msb (TMR_MR_BOTH).
- *
- * To read the current value ("on the fly") from the countdown register,
- * you write a "latch" command into the mode register, then read the stable
- * value from the corresponding I/O port.  For example, you write
- * TMR_MR_LATCH into the corresponding mode register.  Presumably,
- * after doing this, a write operation to the I/O port would result
- * in undefined behavior (but hopefully not fry the chip).
- * Reading in this manner has no side effects.
- */
-
-/*
- * Macros for specifying values to be written into a mode register.
- */
-#define	TIMER_REG_CNTR0	0	/* timer 0 counter port */
-#define	TIMER_REG_CNTR1	1	/* timer 1 counter port */
-#define	TIMER_REG_CNTR2	2	/* timer 2 counter port */
-#define	TIMER_REG_MODE	3	/* timer mode port */
-#define		TIMER_SEL0	0x00	/* select counter 0 */
-#define		TIMER_SEL1	0x40	/* select counter 1 */
-#define		TIMER_SEL2	0x80	/* select counter 2 */
-#define		TIMER_INTTC	0x00	/* mode 0, intr on terminal cnt */
-#define		TIMER_ONESHOT	0x02	/* mode 1, one shot */
-#define		TIMER_RATEGEN	0x04	/* mode 2, rate generator */
-#define		TIMER_SQWAVE	0x06	/* mode 3, square wave */
-#define		TIMER_SWSTROBE	0x08	/* mode 4, s/w triggered strobe */
-#define		TIMER_HWSTROBE	0x0a	/* mode 5, h/w triggered strobe */
-#define		TIMER_LATCH	0x00	/* latch counter for reading */
-#define		TIMER_LSB	0x10	/* r/w counter LSB */
-#define		TIMER_MSB	0x20	/* r/w counter MSB */
-#define		TIMER_16BIT	0x30	/* r/w counter 16 bits, LSB first */
-#define		TIMER_BCD	0x01	/* count in BCD */
diff --git a/include.new/dev/ic/i8255.h b/include.new/dev/ic/i8255.h
deleted file mode 100644
index 60572a0..0000000
--- a/include.new/dev/ic/i8255.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2008 TAKAHASHI Yoshihiro
- * 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.
- *
- * 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: releng/10.2/sys/dev/ic/i8255.h 182835 2008-09-07 04:35:04Z nyan $
- */
-
-#ifndef	_DEV_IC_I8255_H_
-#define	_DEV_IC_I8255_H_
-
-/*
- * modem status via SYSTM_PORTB
- */
-#define	CICSCD_CD	0x20	/* CD */
-#define	CICSCD_CS	0x40	/* CS */
-#define	CICSCD_CI	0x80	/* CI */
-
-/*
- * control intrline via SYSTM_PORTC 
- */
-#define	IEN_Rx		0x01
-#define	IEN_TxEMP	0x02
-#define	IEN_Tx		0x04
-
-#endif	/* _DEV_IC_I8255_H_ */
diff --git a/include.new/dev/ic/i82586.h b/include.new/dev/ic/i82586.h
deleted file mode 100644
index f91f4de..0000000
--- a/include.new/dev/ic/i82586.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*-
- * Copyright (c) 1992, University of Vermont and State Agricultural College.
- * Copyright (c) 1992, Garrett A. Wollman.
- * 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
- *	Vermont and State Agricultural College and Garrett A. Wollman.
- * 4. Neither the name of the University nor the name of the author
- *    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 UNIVERSITY OR AUTHOR 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: releng/10.2/sys/dev/ic/i82586.h 112734 2003-03-28 06:27:08Z mdodd $
- */
-
-/*
- * Intel 82586 Ethernet chip
- * Register, bit, and structure definitions.
- *
- * Written by GAW with reference to the Clarkson Packet Driver code for this
- * chip written by Russ Nelson and others.
- */
-
-struct ie_en_addr {
-	u_char data[6];
-};
-
-/*
- * This is the master configuration block.  It tells the hardware where all
- * the rest of the stuff is.
- */
-struct ie_sys_conf_ptr {
-	u_short mbz;			/* must be zero */
-	u_char ie_bus_use;		/* true if 8-bit only */
-	u_char mbz2[5];			/* must be zero */
-	caddr_t ie_iscp_ptr;		/* 24-bit physaddr of ISCP */
-};
-
-/*
- * Note that this is wired in hardware; the SCP is always located here, no
- * matter what.
- */
-#define IE_SCP_ADDR 0xfffff4
-
-/*
- * The tells the hardware where all the rest of the stuff is, too.
- * FIXME: some of these should be re-commented after we figure out their
- * REAL function.
- */
-struct ie_int_sys_conf_ptr {
-	u_char ie_busy;			/* zeroed after init */
-	u_char mbz;
-	u_short ie_scb_offset;		/* 16-bit physaddr of next struct */
-	caddr_t ie_base;		/* 24-bit physaddr for all 16-bit vars */
-};
-
-/*
- * This FINALLY tells the hardware what to do and where to put it.
- */
-struct ie_sys_ctl_block {
-	u_short ie_status;		/* status word */
-	u_short ie_command;		/* command word */
-	u_short ie_command_list;	/* 16-pointer to command block list */
-	u_short ie_recv_list;		/* 16-pointer to receive frame list */
-	u_short ie_err_crc;		/* CRC errors */
-	u_short ie_err_align;		/* Alignment errors */
-	u_short ie_err_resource;	/* Resource errors */
-	u_short ie_err_overrun;		/* Overrun errors */
-};
-
-/* Command values */
-#define IE_RU_COMMAND	0x0070	/* mask for RU command */
-#define IE_RU_NOP	0	/* for completeness */
-#define IE_RU_START	0x0010	/* start receive unit command */
-#define IE_RU_ENABLE	0x0020	/* enable receiver command */
-#define IE_RU_DISABLE	0x0030	/* disable receiver command */
-#define IE_RU_ABORT	0x0040	/* abort current receive operation */
-
-#define IE_CU_COMMAND	0x0700	/* mask for CU command */
-#define IE_CU_NOP	0	/* included for completeness */
-#define IE_CU_START	0x0100	/* do-command command */
-#define IE_CU_RESUME	0x0200	/* resume a suspended cmd list */
-#define IE_CU_STOP	0x0300	/* SUSPEND was already taken */
-#define IE_CU_ABORT	0x0400	/* abort current command */
-
-#define IE_ACK_COMMAND	0xf000	/* mask for ACK command */
-#define IE_ACK_CX	0x8000	/* ack IE_ST_DONE */
-#define IE_ACK_FR	0x4000	/* ack IE_ST_RECV */
-#define IE_ACK_CNA	0x2000	/* ack IE_ST_ALLDONE */
-#define IE_ACK_RNR	0x1000	/* ack IE_ST_RNR */
-
-#define IE_ACTION_COMMAND(x) (((x) & IE_CU_COMMAND) == IE_CU_START)
-				/* is this command an action command? */
-
-/* Status values */
-#define IE_ST_WHENCE	0xf000	/* mask for cause of interrupt */
-#define IE_ST_DONE	0x8000	/* command with I bit completed */
-#define IE_ST_RECV	0x4000	/* frame received */
-#define IE_ST_ALLDONE	0x2000	/* all commands completed */
-#define IE_ST_RNR	0x1000	/* receive not ready */
-
-#define IE_CU_STATUS	0x700	/* mask for command unit status */
-#define IE_CU_ACTIVE	0x200	/* command unit is active */
-#define IE_CU_SUSPEND	0x100	/* command unit is suspended */
-
-#define IE_RU_STATUS	0x70	/* mask for receiver unit status */
-#define IE_RU_SUSPEND	0x10	/* receiver is suspended */
-#define IE_RU_NOSPACE	0x20	/* receiver has no resources */
-#define IE_RU_READY	0x40	/* reveiver is ready */
-
-/*
- * This is filled in partially by the chip, partially by us.
- */
-struct ie_recv_frame_desc {
-	u_short ie_fd_status;		/* status for this frame */
-	u_short ie_fd_last;		/* end of frame list flag */
-	u_short ie_fd_next;		/* 16-pointer to next RFD */
-	u_short ie_fd_buf_desc;		/* 16-pointer to list of buffer desc's */
-	struct ie_en_addr dest;		/* destination ether */
-	struct ie_en_addr src;		/* source ether */
-	u_short ie_length;		/* 802 length/Ether type */
-	u_short mbz;			/* must be zero */
-};
-
-#define IE_FD_LAST	0x8000	/* last rfd in list */
-#define IE_FD_SUSP	0x4000	/* suspend RU after receipt */
-
-#define IE_FD_COMPLETE	0x8000	/* frame is complete */
-#define IE_FD_BUSY	0x4000	/* frame is busy */
-#define IE_FD_OK	0x2000	/* frame is bad */
-#define IE_FD_RNR	0x0200	/* receiver out of resources here */
-
-/*
- * linked list of buffers...
- */
-struct ie_recv_buf_desc {
-	u_short ie_rbd_actual;		/* status for this buffer */
-	u_short ie_rbd_next;		/* 16-pointer to next RBD */
-	caddr_t ie_rbd_buffer;		/* 24-pointer to buffer for this RBD */
-	u_short ie_rbd_length;		/* length of the buffer */
-	u_short mbz;			/* must be zero */
-};
-
-#define IE_RBD_LAST	0x8000	/* last buffer */
-#define IE_RBD_USED	0x4000	/* this buffer has data */
-/*
- * All commands share this in common.
- */
-struct ie_cmd_common {
-	u_short ie_cmd_status;		/* status of this command */
-	u_short ie_cmd_cmd;		/* command word */
-	u_short ie_cmd_link;		/* link to next command */
-};
-
-#define IE_STAT_COMPL	0x8000	/* command is completed */
-#define IE_STAT_BUSY	0x4000	/* command is running now */
-#define IE_STAT_OK	0x2000	/* command completed successfully */
-
-#define IE_CMD_NOP	0x0000	/* NOP */
-#define IE_CMD_IASETUP	0x0001	/* initial address setup */
-#define IE_CMD_CONFIG	0x0002	/* configure command */
-#define IE_CMD_MCAST	0x0003	/* multicast setup command */
-#define IE_CMD_XMIT	0x0004	/* transmit command */
-#define IE_CMD_TDR	0x0005	/* time-domain reflectometer command */
-#define IE_CMD_DUMP	0x0006	/* dump command */
-#define IE_CMD_DIAGNOSE	0x0007	/* diagnostics command */
-
-#define IE_CMD_LAST	0x8000	/* this is the last command in the list */
-#define IE_CMD_SUSPEND	0x4000	/* suspend CU after this command */
-#define IE_CMD_INTR	0x2000	/* post an interrupt after completion */
-
-/*
- * This is the command to transmit a frame.
- */
-struct ie_xmit_cmd {
-	struct ie_cmd_common com;	/* common part */
-#define ie_xmit_status com.ie_cmd_status
-
-	u_short ie_xmit_desc;		/* 16-pointer to buffer descriptor */
-	struct ie_en_addr ie_xmit_addr; /* destination address */
-
-	u_short ie_xmit_length;		/* 802.3 length/Ether type field */
-};
-
-#define IE_XS_MAXCOLL  	0x000f	/* number of collisions during transmit */
-#define IE_XS_EXCMAX	0x0020	/* exceeded maximum number of collisions */
-#define IE_XS_SQE	0x0040	/* SQE positive */
-#define IE_XS_DEFERRED	0x0080	/* transmission deferred */
-#define IE_XS_UNDERRUN	0x0100	/* DMA underrun */
-#define IE_XS_LOSTCTS	0x0200	/* Lost CTS */
-#define IE_XS_NOCARRIER	0x0400	/* No Carrier */
-#define IE_XS_LATECOLL	0x0800	/* Late collision */
-
-/*
- * This is a buffer descriptor for a frame to be transmitted.
- */
-
-struct ie_xmit_buf {
-	u_short ie_xmit_flags;		/* see below */
-	u_short ie_xmit_next;		/* 16-pointer to next desc. */
-	caddr_t ie_xmit_buf;		/* 24-pointer to the actual buffer */
-};
-
-#define IE_XMIT_LAST 0x8000	/* this TBD is the last one */
-/* The rest of the `flags' word is actually the length. */
-
-/*
- * Multicast setup command.
- */
-
-#define MAXMCAST 50		/* must fit in transmit buffer */
-
-struct ie_mcast_cmd {
-	struct ie_cmd_common com;	/* common part */
-#define ie_mcast_status com.ie_cmd_status
-
-	u_short ie_mcast_bytes;	/* size (in bytes) of multicast addresses */
-	struct ie_en_addr ie_mcast_addrs[MAXMCAST + 1];	/* space for them */
-};
-
-/*
- * Time Domain Reflectometer command.
- */
-
-struct ie_tdr_cmd {
-	struct ie_cmd_common com;	/* common part */
-#define ie_tdr_status com.ie_cmd_status
-
-	u_short ie_tdr_time;		/* error bits and time */
-};
-
-#define IE_TDR_SUCCESS	0x8000	/* TDR succeeded without error */
-#define IE_TDR_XCVR	0x4000	/* detected a transceiver problem */
-#define IE_TDR_OPEN	0x2000	/* detected an open */
-#define IE_TDR_SHORT	0x1000	/* TDR detected a short */
-#define IE_TDR_TIME	0x07ff	/* mask for reflection time */
-
-/*
- * Initial Address Setup command
- */
-struct ie_iasetup_cmd {
-	struct ie_cmd_common com;
-#define ie_iasetup_status com.ie_cmd_status
-
-	struct ie_en_addr ie_address;
-};
-
-/*
- * Configuration command
- */
-struct ie_config_cmd {
-	struct ie_cmd_common com;	/* common part */
-#define ie_config_status com.ie_cmd_status
-
-	u_char ie_config_count;		/* byte count (0x0c) */
-	u_char ie_fifo;			/* fifo (8) */
-	u_char ie_save_bad;		/* save bad frames (0x40) */
-	u_char ie_addr_len;		/* address length (0x2e) (AL-LOC == 1) */
-	u_char ie_priority;		/* priority and backoff (0x0) */
-	u_char ie_ifs;			/* inter-frame spacing (0x60) */
-	u_char ie_slot_low;		/* slot time, LSB (0x0) */
-	u_char ie_slot_high;		/* slot time, MSN, and retries (0xf2) */
-	u_char ie_promisc;		/* 1 if promiscuous, else 0 */
-	u_char ie_crs_cdt;		/* CSMA/CD parameters (0x0) */
-	u_char ie_min_len;		/* min frame length (0x40) */
-	u_char ie_junk;			/* stuff for 82596 (0xff) */
-};
-
-/*
- * Here are a few useful functions.  We could have done these as macros,
- * but since we have the inline facility, it makes sense to use that
- * instead.
- */
-static __inline void
-ie_setup_config(volatile struct ie_config_cmd *cmd,
-		int promiscuous, int manchester) {
-	cmd->ie_config_count = 0x0c;
-	cmd->ie_fifo = 8;
-	cmd->ie_save_bad = 0x40;
-	cmd->ie_addr_len = 0x2e;
-	cmd->ie_priority = 0;
-	cmd->ie_ifs = 0x60;
-	cmd->ie_slot_low = 0;
-	cmd->ie_slot_high = 0xf2;
-	cmd->ie_promisc = !!promiscuous | manchester << 2;
-	cmd->ie_crs_cdt = 0;
-	cmd->ie_min_len = 64;
-	cmd->ie_junk = 0xff;
-}
-
-static __inline void *
-Align(void *ptr) {
-	uintptr_t l = (uintptr_t)ptr;
-	l = (l + 3) & ~3L;
-	return (void *)l;
-}
-
-static __inline volatile void *
-Alignvol(volatile void *ptr) {
-	uintptr_t l = (uintptr_t)ptr;
-	l = (l + 3) & ~3L;
-	return (volatile void *)l;
-}
-
-#if 0
-static __inline void
-ie_ack(volatile struct ie_sys_ctl_block *scb,
-				  u_int mask, int unit,
-				  void (*ca)(int)) {
-	scb->ie_command = scb->ie_status & mask;
-	(*ca)(unit);
-}
-#endif
diff --git a/include.new/dev/ic/i8259.h b/include.new/dev/ic/i8259.h
deleted file mode 100644
index a82903c..0000000
--- a/include.new/dev/ic/i8259.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 2003 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/sys/dev/ic/i8259.h 151580 2005-10-23 09:05:51Z glebius $
- */
-
-/*
- * Register defintions for the i8259A programmable interrupt controller.
- */
-
-#ifndef _DEV_IC_I8259_H_
-#define	_DEV_IC_I8259_H_
-
-/* Initialization control word 1. Written to even address. */
-#define	ICW1_IC4	0x01		/* ICW4 present */
-#define	ICW1_SNGL	0x02		/* 1 = single, 0 = cascaded */
-#define	ICW1_ADI	0x04		/* 1 = 4, 0 = 8 byte vectors */
-#define	ICW1_LTIM	0x08		/* 1 = level trigger, 0 = edge */
-#define	ICW1_RESET	0x10		/* must be 1 */
-/* 0x20 - 0x80 - in 8080/8085 mode only */
-
-/* Initialization control word 2. Written to the odd address. */
-/* No definitions, it is the base vector of the IDT for 8086 mode */
-
-/* Initialization control word 3. Written to the odd address. */
-/* For a master PIC, bitfield indicating a slave 8259 on given input */
-/* For slave, lower 3 bits are the slave's ID binary id on master */
-
-/* Initialization control word 4. Written to the odd address. */
-#define	ICW4_8086	0x01		/* 1 = 8086, 0 = 8080 */
-#define	ICW4_AEOI	0x02		/* 1 = Auto EOI */
-#define	ICW4_MS		0x04		/* 1 = buffered master, 0 = slave */
-#define	ICW4_BUF	0x08		/* 1 = enable buffer mode */
-#define	ICW4_SFNM	0x10		/* 1 = special fully nested mode */
-
-/* Operation control words.  Written after initialization. */
-
-/* Operation control word type 1 */
-/*
- * No definitions.  Written to the odd address.  Bitmask for interrupts.
- * 1 = disabled.
- */
-
-/* Operation control word type 2.  Bit 3 (0x08) must be zero. Even address. */
-#define	OCW2_L0		0x01		/* Level */
-#define	OCW2_L1		0x02
-#define	OCW2_L2		0x04
-/* 0x08 must be 0 to select OCW2 vs OCW3 */
-/* 0x10 must be 0 to select OCW2 vs ICW1 */
-#define	OCW2_EOI	0x20		/* 1 = EOI */
-#define	OCW2_SL		0x40		/* EOI mode */
-#define	OCW2_R		0x80		/* EOI mode */
-
-/* Operation control word type 3.  Bit 3 (0x08) must be set. Even address. */
-#define	OCW3_RIS	0x01		/* 1 = read IS, 0 = read IR */
-#define	OCW3_RR		0x02		/* register read */
-#define	OCW3_P		0x04		/* poll mode command */
-/* 0x08 must be 1 to select OCW3 vs OCW2 */
-#define	OCW3_SEL	0x08		/* must be 1 */
-/* 0x10 must be 0 to select OCW3 vs ICW1 */
-#define	OCW3_SMM	0x20		/* special mode mask */
-#define	OCW3_ESMM	0x40		/* enable SMM */
-
-#endif /* !_DEV_IC_I8259_H_ */
diff --git a/include.new/dev/ic/nec765.h b/include.new/dev/ic/nec765.h
deleted file mode 100644
index 992735d..0000000
--- a/include.new/dev/ic/nec765.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-
- * Copyright (c) 1991 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.
- * 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.
- *
- *	from: @(#)nec765.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: releng/10.2/sys/dev/ic/nec765.h 162165 2006-09-08 21:46:01Z jkim $
- */
-
-/*
- * Nec 765 floppy disc controller definitions
- */
-
-/* Main status register */
-#define NE7_DAB		0x01	/* Diskette drive A is seeking, thus busy */
-#define NE7_DBB		0x02	/* Diskette drive B is seeking, thus busy */
-#define NE7_CB		0x10	/* Diskette Controller Busy */
-#define NE7_NDM		0x20	/* Diskette Controller in Non Dma Mode */
-#define NE7_DIO		0x40	/* Diskette Controller Data register I/O */
-#define NE7_RQM		0x80	/* Diskette Controller ReQuest for Master */
-
-/* Status register ST0 */
-#define NE7_ST0BITS	"\020\010invld\007abnrml\006seek_cmplt\005equ_chck\004drive_notrdy\003top_head"
-
-#define NE7_ST0_IC	0xc0	/* interrupt completion code */
-
-#define NE7_ST0_IC_RC	0xc0	/* terminated due to ready changed, n/a */
-#define NE7_ST0_IC_IV	0x80	/* invalid command; must reset FDC */
-#define NE7_ST0_IC_AT	0x40	/* abnormal termination, check error stat */
-#define NE7_ST0_IC_NT	0x00	/* normal termination */
-
-#define NE7_ST0_SE	0x20	/* seek end */
-#define NE7_ST0_EC	0x10	/* equipment check, recalibrated but no trk0 */
-#define NE7_ST0_NR	0x08	/* not ready (n/a) */
-#define NE7_ST0_HD	0x04	/* upper head selected */
-#define NE7_ST0_DR	0x03	/* drive code */
-
-/* Status register ST1 */
-#define NE7_ST1BITS	"\020\010end_of_cyl\006bad_crc\005data_overrun\003sec_not_fnd\002write_protect\001no_am"
-
-#define NE7_ST1_EN	0x80	/* end of cylinder, access past last record */
-#define NE7_ST1_DE	0x20	/* data error, CRC fail in ID or data */
-#define NE7_ST1_OR	0x10	/* DMA overrun, DMA failed to do i/o quickly */
-#define NE7_ST1_ND	0x04	/* no data, sector not found or CRC in ID f. */
-#define NE7_ST1_NW	0x02	/* not writeable, attempt to violate WP */
-#define NE7_ST1_MA	0x01	/* missing address mark (in ID or data field)*/
-
-/* Status register ST2 */
-#define NE7_ST2BITS	"\020\007ctrl_mrk\006bad_crc\005wrong_cyl\004scn_eq\003scn_not_fnd\002bad_cyl\001no_dam"
-
-#define NE7_ST2_CM	0x40	/* control mark; found deleted data */
-#define NE7_ST2_DD	0x20	/* data error in data field, CRC fail */
-#define NE7_ST2_WC	0x10	/* wrong cylinder, ID field mismatches cmd */
-#define NE7_ST2_SH	0x08	/* scan equal hit */
-#define NE7_ST2_SN	0x04	/* scan not satisfied */
-#define NE7_ST2_BC	0x02	/* bad cylinder, cylinder marked 0xff */
-#define NE7_ST2_MD	0x01	/* missing address mark in data field */
-
-/* Status register ST3 */
-#define NE7_ST3BITS	"\020\010fault\007write_protect\006drdy\005tk0\004two_side\003side_sel\002"
-
-#define NE7_ST3_FT	0x80	/* fault; PC: n/a */
-#define NE7_ST3_WP	0x40	/* write protected */
-#define NE7_ST3_RD	0x20	/* ready; PC: always true */
-#define NE7_ST3_T0	0x10	/* track 0 */
-#define NE7_ST3_TS	0x08	/* two-sided; PC: n/a */
-#define NE7_ST3_HD	0x04	/* upper head select */
-#define NE7_ST3_US	0x03	/* unit select */
-
-/* Data Rate Select Register DSR (enhanced controller) */
-#define I8207X_DSR_SR	0x80	/* software reset */
-#define I8207X_DSR_LP	0x40	/* low power */
-#define I8207X_DSR_PS	0x1c	/* precompensation select */
-#define I8207X_DSR_RS	0x03	/* data rate select */
-
-/* Commands */
-/*
- * the top three bits -- where appropriate -- are set as follows:
- *
- * MT  - multi-track; allow both sides to be handled in single cmd
- * MFM - modified frequency modulation; use MFM encoding
- * SK  - skip; skip sectors marked as "deleted"
- */
-
-#define NE7CMD_MT	0x80	/* READ, WRITE, WRITEDEL, READDEL, SCAN* */
-#define NE7CMD_MFM	0x40	/* same as MT, plus READTRK, READID, FORMAT */
-#define NE7CMD_SK	0x20	/* READ, READDEL, SCAN* */
-
-#define NE7CMD_READTRK	0x02	/*  read whole track */
-#define NE7CMD_SPECIFY	0x03	/*  specify drive parameters - requires unit
-				 *  parameters byte */
-#define NE7CMD_SENSED	0x04	/*  sense drive - requires unit select byte */
-#define NE7CMD_WRITE	0x05	/*  write - requires eight additional bytes */
-#define NE7CMD_READ	0x06	/*  read - requires eight additional bytes */
-#define NE7CMD_RECAL	0x07	/*  recalibrate drive - requires
-				 *  unit select byte */
-#define NE7CMD_SENSEI	0x08	/*  sense controller interrupt status */
-#define NE7CMD_WRITEDEL	0x09	/*  write deleted data */
-#define NE7CMD_READID	0x0a	/*  read ID field */
-#define NE7CMD_READDEL	0x0c	/*  read deleted data */
-#define NE7CMD_FORMAT	0x0d	/*  format - requires five additional bytes */
-#define NE7CMD_SEEK	0x0f	/*  seek drive - requires unit select byte
-				 *  and new cyl byte */
-#define NE7CMD_VERSION	0x10	/*  get version */
-#define NE7CMD_SCNEQU	0x11	/*  scan equal */
-#define NE7CMD_SCNLE	0x19	/*  scan less or equal */
-#define NE7CMD_SCNGE	0x1d	/*  scan greater or equal */
-
-/*
- * Enhanced controller commands:
- */
-#define I8207X_DUMPREG	0x0e	/*  dump internal registers */
-#define I8207X_CONFIG	0x13	/*  configure enhanced features */
-
-/*
- * "specify" definitions
- *
- * acronyms (times are relative to a FDC clock of 8 MHz):
- * srt - step rate; PC usually 3 ms
- * hut - head unload time; PC usually maximum of 240 ms
- * hlt - head load time; PC usually minimum of 2 ms
- * nd  - no DMA flag; PC usually not set (0)
- */
-
-#define NE7_SPEC_1(srt, hut)	(((16 - (srt)) << 4) | (((hut) / 16)))
-#define NE7_SPEC_2(hlt, nd)	(((hlt) & 0xFE) | ((nd) & 1))
diff --git a/include.new/dev/ic/ns16550.h b/include.new/dev/ic/ns16550.h
deleted file mode 100644
index 09fb97c..0000000
--- a/include.new/dev/ic/ns16550.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/*-
- * Copyright (c) 1991 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.
- * 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.
- *
- *	from: @(#)ns16550.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: releng/10.2/sys/dev/ic/ns16550.h 266046 2014-05-14 16:32:27Z ian $
- */
-
-/*
- * NS8250... UART registers.
- */
-
-/* 8250 registers #[0-6]. */
-
-#define	com_data	0	/* data register (R/W) */
-#define	REG_DATA	com_data
-
-#define	com_ier		1	/* interrupt enable register (W) */
-#define	REG_IER		com_ier
-#define	IER_ERXRDY	0x1
-#define	IER_ETXRDY	0x2
-#define	IER_ERLS	0x4
-#define	IER_EMSC	0x8
-
-#define	IER_BITS	"\20\1ERXRDY\2ETXRDY\3ERLS\4EMSC"
-
-#define	com_iir		2	/* interrupt identification register (R) */
-#define	REG_IIR		com_iir
-#define	IIR_IMASK	0xf
-#define	IIR_RXTOUT	0xc
-#define	IIR_BUSY	0x7
-#define	IIR_RLS		0x6
-#define	IIR_RXRDY	0x4
-#define	IIR_TXRDY	0x2
-#define	IIR_NOPEND	0x1
-#define	IIR_MLSC	0x0
-#define	IIR_FIFO_MASK	0xc0	/* set if FIFOs are enabled */
-
-#define	IIR_BITS	"\20\1NOPEND\2TXRDY\3RXRDY"
-
-#define	com_lcr		3	/* line control register (R/W) */
-#define	com_cfcr	com_lcr	/* character format control register (R/W) */
-#define	REG_LCR		com_lcr
-#define	LCR_DLAB	0x80
-#define	CFCR_DLAB	LCR_DLAB
-#define	LCR_EFR_ENABLE	0xbf	/* magic to enable EFR on 16650 up */
-#define	CFCR_EFR_ENABLE	LCR_EFR_ENABLE
-#define	LCR_SBREAK	0x40
-#define	CFCR_SBREAK	LCR_SBREAK
-#define	LCR_PZERO	0x30
-#define	CFCR_PZERO	LCR_PZERO
-#define	LCR_PONE	0x20
-#define	CFCR_PONE	LCR_PONE
-#define	LCR_PEVEN	0x10
-#define	CFCR_PEVEN	LCR_PEVEN
-#define	LCR_PODD	0x00
-#define	CFCR_PODD	LCR_PODD
-#define	LCR_PENAB	0x08
-#define	CFCR_PENAB	LCR_PENAB
-#define	LCR_STOPB	0x04
-#define	CFCR_STOPB	LCR_STOPB
-#define	LCR_8BITS	0x03
-#define	CFCR_8BITS	LCR_8BITS
-#define	LCR_7BITS	0x02
-#define	CFCR_7BITS	LCR_7BITS
-#define	LCR_6BITS	0x01
-#define	CFCR_6BITS	LCR_6BITS
-#define	LCR_5BITS	0x00
-#define	CFCR_5BITS	LCR_5BITS
-
-#define	com_mcr		4	/* modem control register (R/W) */
-#define	REG_MCR		com_mcr
-#define	MCR_PRESCALE	0x80	/* only available on 16650 up */
-#define	MCR_LOOPBACK	0x10
-#define	MCR_IE		0x08
-#define	MCR_IENABLE	MCR_IE
-#define	MCR_DRS		0x04
-#define	MCR_RTS		0x02
-#define	MCR_DTR		0x01
-
-#define	MCR_BITS	"\20\1DTR\2RTS\3DRS\4IE\5LOOPBACK\10PRESCALE"
-
-#define	com_lsr		5	/* line status register (R/W) */
-#define	REG_LSR		com_lsr
-#define	LSR_RCV_FIFO	0x80
-#define	LSR_TEMT	0x40
-#define	LSR_TSRE	LSR_TEMT
-#define	LSR_THRE	0x20
-#define	LSR_TXRDY	LSR_THRE
-#define	LSR_BI		0x10
-#define	LSR_FE		0x08
-#define	LSR_PE		0x04
-#define	LSR_OE		0x02
-#define	LSR_RXRDY	0x01
-#define	LSR_RCV_MASK	0x1f
-
-#define	LSR_BITS	"\20\1RXRDY\2OE\3PE\4FE\5BI\6THRE\7TEMT\10RCV_FIFO"
-
-#define	com_msr		6	/* modem status register (R/W) */
-#define	REG_MSR		com_msr
-#define	MSR_DCD		0x80
-#define	MSR_RI		0x40
-#define	MSR_DSR		0x20
-#define	MSR_CTS		0x10
-#define	MSR_DDCD	0x08
-#define	MSR_TERI	0x04
-#define	MSR_DDSR	0x02
-#define	MSR_DCTS	0x01
-
-#define	MSR_BITS	"\20\1DCTS\2DDSR\3TERI\4DDCD\5CTS\6DSR\7RI\10DCD"
-
-/* 8250 multiplexed registers #[0-1].  Access enabled by LCR[7]. */
-#define	com_dll		0	/* divisor latch low (R/W) */
-#define	com_dlbl	com_dll
-#define	com_dlm		1	/* divisor latch high (R/W) */
-#define	com_dlbh	com_dlm
-#define	REG_DLL		com_dll
-#define	REG_DLH		com_dlm
-
-/* 16450 register #7.  Not multiplexed. */
-#define	com_scr		7	/* scratch register (R/W) */
-
-/* 16550 register #2.  Not multiplexed. */
-#define	com_fcr		2	/* FIFO control register (W) */
-#define	com_fifo	com_fcr
-#define	REG_FCR		com_fcr
-#define	FCR_ENABLE	0x01
-#define	FIFO_ENABLE	FCR_ENABLE
-#define	FCR_RCV_RST	0x02
-#define	FIFO_RCV_RST	FCR_RCV_RST
-#define	FCR_XMT_RST	0x04
-#define	FIFO_XMT_RST	FCR_XMT_RST
-#define	FCR_DMA		0x08
-#define	FIFO_DMA_MODE	FCR_DMA
-#define	FCR_RX_LOW	0x00
-#define	FIFO_RX_LOW	FCR_RX_LOW
-#define	FCR_RX_MEDL	0x40
-#define	FIFO_RX_MEDL	FCR_RX_MEDL
-#define	FCR_RX_MEDH	0x80
-#define	FIFO_RX_MEDH	FCR_RX_MEDH
-#define	FCR_RX_HIGH	0xc0
-#define	FIFO_RX_HIGH	FCR_RX_HIGH
-
-#define	FCR_BITS	"\20\1ENABLE\2RCV_RST\3XMT_RST\4DMA"
-
-/* 16650 registers #2,[4-7].  Access enabled by LCR_EFR_ENABLE. */
-
-#define	com_efr		2	/* enhanced features register (R/W) */
-#define	REG_EFR		com_efr
-#define	EFR_CTS		0x80
-#define	EFR_AUTOCTS	EFR_CTS
-#define	EFR_RTS		0x40
-#define	EFR_AUTORTS	EFR_RTS
-#define	EFR_EFE		0x10	/* enhanced functions enable */
-
-#define	com_xon1	4	/* XON 1 character (R/W) */
-#define	com_xon2	5	/* XON 2 character (R/W) */
-#define	com_xoff1	6	/* XOFF 1 character (R/W) */
-#define	com_xoff2	7	/* XOFF 2 character (R/W) */
-
-#define DW_REG_USR	31	/* DesignWare derived Uart Status Reg */
-#define com_usr		39	/* Octeon 16750/16550 Uart Status Reg */
-#define REG_USR		com_usr
-#define USR_BUSY	1	/* Uart Busy. Serial transfer in progress */
-#define USR_TXFIFO_NOTFULL 2    /* Uart TX FIFO Not full */
-
-/* 16950 register #1.  Access enabled by ACR[7].  Also requires !LCR[7]. */
-#define	com_asr		1	/* additional status register (R[0-7]/W[0-1]) */
-
-/* 16950 register #3.  R/W access enabled by ACR[7]. */
-#define	com_rfl		3	/* receiver fifo level (R) */
-
-/*
- * 16950 register #4.  Access enabled by ACR[7].  Also requires
- * !LCR_EFR_ENABLE.
- */
-#define	com_tfl		4	/* transmitter fifo level (R) */
-
-/*
- * 16950 register #5.  Accessible if !LCR_EFR_ENABLE.  Read access also
- * requires ACR[6].
- */
-#define	com_icr		5	/* index control register (R/W) */
-
-/*
- * 16950 register #7.  It is the same as com_scr except it has a different
- * abbreviation in the manufacturer's data sheet and it also serves as an
- * index into the Indexed Control register set.
- */
-#define	com_spr		com_scr	/* scratch pad (and index) register (R/W) */
-#define	REG_SPR		com_scr
-
-/*
- * 16950 indexed control registers #[0-0x13].  Access is via index in SPR,
- * data in ICR (if ICR is accessible).
- */
-
-#define	com_acr		0	/* additional control register (R/W) */
-#define	ACR_ASE		0x80	/* ASR/RFL/TFL enable */
-#define	ACR_ICRE	0x40	/* ICR enable */
-#define	ACR_TLE		0x20	/* TTL/RTL enable */
-
-#define	com_cpr		1	/* clock prescaler register (R/W) */
-#define	com_tcr		2	/* times clock register (R/W) */
-#define	com_ttl		4	/* transmitter trigger level (R/W) */
-#define	com_rtl		5	/* receiver trigger level (R/W) */
-/* ... */
-
-/* Hardware extension mode register for RSB-2000/3000. */
-#define	com_emr		com_msr
-#define	EMR_EXBUFF	0x04
-#define	EMR_CTSFLW	0x08
-#define	EMR_DSRFLW	0x10
-#define	EMR_RTSFLW	0x20
-#define	EMR_DTRFLW	0x40
-#define	EMR_EFMODE	0x80
diff --git a/include.new/dev/ic/quicc.h b/include.new/dev/ic/quicc.h
deleted file mode 100644
index 7dd46f8..0000000
--- a/include.new/dev/ic/quicc.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * Copyright (c) 2006 Juniper Networks
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/dev/ic/quicc.h 176772 2008-03-03 18:20:17Z raj $
- */
-
-#ifndef _DEV_IC_QUICC_H_
-#define	_DEV_IC_QUICC_H_
-
-/*
- * Device parameter RAM
- */
-#define	QUICC_PRAM_BASE		0x8000
-
-#define	QUICC_PRAM_REV_NUM	(QUICC_PRAM_BASE + 0xaf0)
-
-/* SCC parameter RAM. */
-#define	QUICC_PRAM_SIZE_SCC	256
-#define	QUICC_PRAM_BASE_SCC(u)	(QUICC_PRAM_BASE + QUICC_PRAM_SIZE_SCC * (u))
-
-/* SCC parameters that are common for all modes. */
-#define	QUICC_PRAM_SCC_RBASE(u)	(QUICC_PRAM_BASE_SCC(u) + 0x00)
-#define	QUICC_PRAM_SCC_TBASE(u)	(QUICC_PRAM_BASE_SCC(u) + 0x02)
-#define	QUICC_PRAM_SCC_RFCR(u)	(QUICC_PRAM_BASE_SCC(u) + 0x04)
-#define	QUICC_PRAM_SCC_TFCR(u)	(QUICC_PRAM_BASE_SCC(u) + 0x05)
-#define	QUICC_PRAM_SCC_MRBLR(u)	(QUICC_PRAM_BASE_SCC(u) + 0x06)
-#define	QUICC_PRAM_SCC_RBPTR(u)	(QUICC_PRAM_BASE_SCC(u) + 0x10)
-#define	QUICC_PRAM_SCC_TBPTR(u)	(QUICC_PRAM_BASE_SCC(u) + 0x20)
-
-/*
- * SCC parameters that are specific to UART/ASYNC mode.
- */
-#define	QUICC_PRAM_SIZE_SCC_UART	0x68	/* Rounded up. */
-
-#define	QUICC_PRAM_SCC_UART_MAX_IDL(u)	(QUICC_PRAM_BASE_SCC(u) + 0x38)
-#define	QUICC_PRAM_SCC_UART_IDLC(u)	(QUICC_PRAM_BASE_SCC(u) + 0x3a)
-#define	QUICC_PRAM_SCC_UART_BRKCR(u)	(QUICC_PRAM_BASE_SCC(u) + 0x3c)
-#define	QUICC_PRAM_SCC_UART_PAREC(u)	(QUICC_PRAM_BASE_SCC(u) + 0x3e)
-#define	QUICC_PRAM_SCC_UART_FRMEC(u)	(QUICC_PRAM_BASE_SCC(u) + 0x40)
-#define	QUICC_PRAM_SCC_UART_NOSEC(u)	(QUICC_PRAM_BASE_SCC(u) + 0x42)
-#define	QUICC_PRAM_SCC_UART_BRKEC(u)	(QUICC_PRAM_BASE_SCC(u) + 0x44)
-#define	QUICC_PRAM_SCC_UART_BRKLN(u)	(QUICC_PRAM_BASE_SCC(u) + 0x46)
-#define	QUICC_PRAM_SCC_UART_UADDR1(u)	(QUICC_PRAM_BASE_SCC(u) + 0x48)
-#define	QUICC_PRAM_SCC_UART_UADDR2(u)	(QUICC_PRAM_BASE_SCC(u) + 0x4a)
-#define	QUICC_PRAM_SCC_UART_TOSEQ(u)	(QUICC_PRAM_BASE_SCC(u) + 0x4e)
-#define	QUICC_PRAM_SCC_UART_CC(u,n)	(QUICC_PRAM_BASE_SCC(u) + 0x50 + (n)*2)
-#define	QUICC_PRAM_SCC_UART_RCCM(u)	(QUICC_PRAM_BASE_SCC(u) + 0x60)
-#define	QUICC_PRAM_SCC_UART_RCCR(u)	(QUICC_PRAM_BASE_SCC(u) + 0x62)
-#define	QUICC_PRAM_SCC_UART_RLBC(u)	(QUICC_PRAM_BASE_SCC(u) + 0x64)
-
-/*
- * Interrupt controller.
- */
-#define	QUICC_REG_SICR		0x10c00
-#define	QUICC_REG_SIVEC		0x10c04
-#define	QUICC_REG_SIPNR_H	0x10c08
-#define	QUICC_REG_SIPNR_L	0x10c0c
-#define	QUICC_REG_SCPRR_H	0x10c14
-#define	QUICC_REG_SCPRR_L	0x10c18
-#define	QUICC_REG_SIMR_H	0x10c1c
-#define	QUICC_REG_SIMR_L	0x10c20
-#define	QUICC_REG_SIEXR		0x10c24
-
-/*
- * System clock control register.
- */
-#define	QUICC_REG_SCCR		0x10c80
-
-/*
- * Baudrate generator registers.
- */
-#define	QUICC_REG_BRG(u)	(0x119f0 + ((u) & 3) * 4 - ((u) & 4) * 0x100)
-
-/*
- * SCC registers.
- */
-#define	QUICC_REG_SIZE_SCC	0x20
-#define	QUICC_REG_BASE_SCC(u)	(0x11a00 + QUICC_REG_SIZE_SCC * (u))
-
-#define	QUICC_REG_SCC_GSMR_L(u)	(QUICC_REG_BASE_SCC(u) + 0x00)
-#define	QUICC_REG_SCC_GSMR_H(u)	(QUICC_REG_BASE_SCC(u) + 0x04)
-#define	QUICC_REG_SCC_PSMR(u)	(QUICC_REG_BASE_SCC(u) + 0x08)
-#define	QUICC_REG_SCC_TODR(u)	(QUICC_REG_BASE_SCC(u) + 0x0c)
-#define	QUICC_REG_SCC_DSR(u)	(QUICC_REG_BASE_SCC(u) + 0x0e)
-#define	QUICC_REG_SCC_SCCE(u)	(QUICC_REG_BASE_SCC(u) + 0x10)
-#define	QUICC_REG_SCC_SCCM(u)	(QUICC_REG_BASE_SCC(u) + 0x14)
-#define	QUICC_REG_SCC_SCCS(u)	(QUICC_REG_BASE_SCC(u) + 0x17)
-
-#endif /* _DEV_IC_QUICC_H_ */
diff --git a/include.new/dev/ic/rsa.h b/include.new/dev/ic/rsa.h
deleted file mode 100644
index b77d5fc..0000000
--- a/include.new/dev/ic/rsa.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 1999 FreeBSD Inc.
- * 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.
- *
- * 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: releng/10.2/sys/dev/ic/rsa.h 77962 2001-06-10 04:28:39Z nyan $
- */
-
-/*
- * RSA Mode Driver Data Sheet
- *
- * <<Register Map>>
- * Base + 0x00
- * Mode Select Register(Read/Write)
- * bit4=interrupt type(1: level, 0: edge)
- * bit3=Auto RTS-CTS Flow Control Enable
- * bit2=External FIFO Enable
- * bit1=Reserved(Default 0)Don't Change!!
- * bit0=Swap Upper 8byte and Lower 8byte in 16byte space.
- *
- * Base + 0x01
- * Interrupt Enable Register(Read/Write)
- * bit4=Hardware Timer Interrupt Enable
- * bit3=Character Time-Out Interrupt Enable
- * bit2=Tx FIFO Empty Interrupt Enable
- * bit1=Tx FIFO Half Full Interrupt Enable
- * bit0=Rx FIFO Half Full Interrupt Enable
- *
- * Base + 0x02
- * Status Read Register(Read)
- * bit7=Hardware  Time Out Interrupt Status(1: True, 0: False)
- * bit6=Character Time Out Interrupt Status
- * bit5=Rx FIFO Full Flag(0: True, 1: False)
- * bit4=Rx FIFO Half Full Flag
- * bit3=Rx FIFO Empty Flag
- * bit2=Tx FIFO Full Flag
- * bit1=Tx FIFO Half Full Flag
- * bit0=Tx FIFO Empty Flag
- *
- * Base + 0x02
- * FIFO Reset Register(Write)
- * Reset Extrnal FIFO
- *
- * Base + 0x03
- * Timer Interval Value Set Register(Read/Write)
- * Range of n: 1-255
- * Interval Value: n * 0.2ms
- *
- * Base + 0x04
- * Timer Control Register(Read/Write)
- * bit0=Timer Enable
- *
- * Base + 0x08 - 0x0f
- * Same as UART 16550
- *
- * Special Regisgter in RSA Mode
- * UART Data Register(Base + 0x08)
- * Data transfer between Extrnal FIFO
- *
- * UART MCR(Base + 0x0c)
- * bit3(OUT2[MCR_IENABLE])=1: Diable 16550   to Rx FIFO transfer
- * bit2(OUT1[MCR_DRS])=1:     Diable Tx FIFO to 16550   transfer
- *
- * <<Intrrupt and Intrrupt Reset>>
- * o Reciver Line Status(from UART16550)
- *   Reset: Read LSR
- *
- * o Modem Status(from UART16550)
- *   Reset: Read MSR
- *
- * o Rx FIFO Half Full(from Extrnal FIFO)
- *   Reset: Read Rx FIFO under Hall Full 
- *
- * o Character Time Out(from Extrnal FIFO)
- *   Reset: Read Rx FIFO or SRR
- *
- * o Tx FIFO Empty(from Extrnal FIFO)
- *   Reset: Write Tx FIFO or Read SRR
- *
- * o Tx FIFO Half Full(from Extrnal FIFO)
- *   Reset: Write Tx FIFO until Hall Full or Read SRR
- * 
- * o Hardware Timer(from Extrnal FIFO)
- *   Reset: Disable Timer in TCR
- *   Notes: If you want to use Timer for next intrrupt,
- *          you must enable Timer in TCR
- *
- * <<Used Setting>>
- * Auto RTS-CTS:    Enable or Disable
- * External FIFO:   Enable
- * Swap 8bytes:     Disable
- * Haredware Timer: Disable
- * interrupt type:  edge
- * interrupt source:
- *           Hareware Timer
- *           Character Time Out
- *           Tx FIFO Empty
- *           Rx FIFO Half Full
- *
- */
-
-/* I/O-DATA RSA Serise Exrension Register */
-#define rsa_msr		0	/* Mode Status Register (R/W) */
-#define	rsa_ier		1	/* Interrupt Enable Register (R/W) */
-#define	rsa_srr		2	/* Status Read Register (R) */
-#define	rsa_frr		2	/* FIFO Reset Register (W) */
-#define	rsa_tivsr	3	/* Timer Interval Value Set Register (R/W) */
-#define	rsa_tcr		4	/* Timer Control Register (W) */
diff --git a/include.new/dev/ic/sab82532.h b/include.new/dev/ic/sab82532.h
deleted file mode 100644
index c882713..0000000
--- a/include.new/dev/ic/sab82532.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/*	$OpenBSD: sab82532reg.h,v 1.2 2002/04/08 17:49:42 jason Exp $	*/
-
-/*-
- * Copyright (c) 2001 Jason L. Wright (jason@thought.net)
- * 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 Jason L. Wright
- * 4. 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 ``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 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.
- *
- * Effort sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F30602-01-2-0537.
- *
- * $FreeBSD: releng/10.2/sys/dev/ic/sab82532.h 139749 2005-01-06 01:43:34Z imp $
- */
-
-#ifndef _DEV_IC_SAB82532_H_
-#define	_DEV_IC_SAB82532_H_
-
-/*
- * Register definitions for SAB82532 based on "Enhanced Serial Communication
- * Controller ESCC2 Version 3.2 User's Manual 07.96" from:
- * http://www.infineon.com
- */
-
-#define	SAB_NCHAN	2	/* number of channels */
-#define	SAB_CHANLEN	0x40	/* length of channel register set */
-
-#define	SAB_CHAN_A	0x00	/* channel A register offset */
-#define	SAB_CHAN_B	0x40	/* channel B register offset */
-
-#define	SAB_RFIFO	0x00	/* r: rx fifo */
-#define	SAB_XFIFO	0x00	/* w: tx fifo */
-#define	SAB_STAR	0x20	/* r: status register */
-#define	SAB_CMDR	0x20	/* w: command register */
-#define	SAB_MODE	0x22	/* rw: mode register */
-#define	SAB_TIMR	0x23	/* rw: timer register */
-#define	SAB_XON		0x24	/* rw: xon character */
-#define	SAB_XOFF	0x25	/* rw: xoff character */
-#define	SAB_TCR		0x26	/* rw: termination character */
-#define	SAB_DAFO	0x27	/* rw: data format */
-#define	SAB_RFC		0x28	/* rw: rfifo control register */
-#define	SAB_RBCL	0x2a	/* r: rx byte count low */
-#define	SAB_TBCL	0x2a	/* w: tx byte count low */
-#define	SAB_RBCH	0x2b	/* r: rx byte count high */
-#define	SAB_XBCH	0x2b	/* w: tx byte count high */
-#define	SAB_CCR0	0x2c	/* rw: channel configuration register 0 */
-#define	SAB_CCR1	0x2d	/* rw: channel configuration register 1 */
-#define	SAB_CCR2	0x2e	/* rw: channel configuration register 2 */
-#define	SAB_CCR3	0x2f	/* rw: channel configuration register 3 */
-#define	SAB_TSAX	0x30	/* w: time-slot assignment register tx */
-#define	SAB_TSAR	0x31	/* w: time-slot assignment register rx */
-#define	SAB_XCCR	0x32	/* w: tx channel capacity register */
-#define	SAB_RCCR	0x33	/* w: receive channel capacity register */
-#define	SAB_VSTR	0x34	/* r: version status */
-#define	SAB_BGR		0x34	/* w: baud rate generator */
-#define	SAB_TIC		0x35	/* w: transmit immediate character */
-#define	SAB_MXN		0x36	/* w: mask xon character */
-#define	SAB_MXF		0x37	/* w: mask xoff character */
-#define	SAB_GIS		0x38	/* r: global interrupt status */
-#define	SAB_IVA		0x38	/* w: interrupt vector address */
-#define	SAB_IPC		0x39	/* rw: interrupt port configuration */
-#define	SAB_ISR0	0x3a	/* r: interrupt status 0 */
-#define	SAB_IMR0	0x3a	/* w: interrupt mask 0 */
-#define	SAB_ISR1	0x3b	/* r: interrupt status 1 */
-#define	SAB_IMR1	0x3b	/* w: interrupt mask 1 */
-#define	SAB_PVR		0x3c	/* rw: port value register */
-#define	SAB_PIS		0x3d	/* r: port interrupt status */
-#define	SAB_PIM		0x3d	/* w: port interrupt mask */
-#define	SAB_PCR		0x3e	/* w: port configuration register */
-#define	SAB_CCR4	0x3f	/* rw: channel configuration register 4 */
-
-/* SAB_STAR: status register */
-#define	SAB_STAR_XDOV	0x80	/* transmit data overflow */
-#define	SAB_STAR_XFW	0x40	/* transmit fifo write enable */
-#define	SAB_STAR_RFNE	0x20	/* rfifo not empty */
-#define	SAB_STAR_FCS	0x10	/* flow control status */
-#define	SAB_STAR_TEC	0x08	/* tx immediate char is executing */
-#define	SAB_STAR_CEC	0x04	/* command is executing */
-#define	SAB_STAR_CTS	0x02	/* cts status: 0:inactive/high,1:active/low */
-
-/* SAB_CMDR: command register */
-#define	SAB_CMDR_RMC	0x80	/* receive message complete */
-#define	SAB_CMDR_RRES	0x40	/* receiver reset */
-#define	SAB_CMDR_RFRD	0x20	/* receive fifo read enable */
-#define	SAB_CMDR_STI	0x10	/* start timer */
-#define	SAB_CMDR_XF	0x08	/* transmit frame */
-#define	SAB_CMDR_XRES	0x01	/* transmit reset */
-
-/* SAB_MODE: mode register */
-#define	SAB_MODE_FRTS	0x40	/* flow control using rts */
-#define	SAB_MODE_FCTS	0x20	/* flow control using cts */
-#define	SAB_MODE_FLON	0x10	/* flow control on */
-#define	SAB_MODE_RAC	0x08	/* receiver active */
-#define	SAB_MODE_RTS	0x04	/* request to send */
-#define	SAB_MODE_TRS	0x02	/* timer resolution */
-#define	SAB_MODE_TLP	0x01	/* test loop */
-
-/* SAB_TIMR: timer register */
-#define	SAB_TIMR_CNT	0xe0	/* count mask */
-#define	SAB_TIMR_VAL	0x1f	/* value mask */
-
-/* SAB_DAFO: data format */
-#define	SAB_DAFO_XBRK	0x40	/* transmit break */
-#define	SAB_DAFO_STOP	0x20	/* stop bit: 0:1 bit, 1:2 bits */
-#define	SAB_DAFO_PAR1	0x10	/* parity 1, see below */
-#define	SAB_DAFO_PAR0	0x08	/* parity 0, see below */
-#define	SAB_DAFO_PARE	0x04	/* parity enable */
-#define	SAB_DAFO_CHL1	0x02	/* character length 1, see below */
-#define	SAB_DAFO_CHL0	0x01	/* character length 0, see below */
-
-#define	SAB_DAFO_CHL_CSIZE	(SAB_DAFO_CHL1|SAB_DAFO_CHL0)
-#define	SAB_DAFO_CHL_CS5	(SAB_DAFO_CHL1|SAB_DAFO_CHL0)
-#define	SAB_DAFO_CHL_CS6	(SAB_DAFO_CHL1)
-#define	SAB_DAFO_CHL_CS7	(SAB_DAFO_CHL0)
-#define	SAB_DAFO_CHL_CS8	(0)
-
-#define	SAB_DAFO_PARMASK	(SAB_DAFO_PAR1|SAB_DAFO_PAR0|SAB_DAFO_PARE)
-#define	SAB_DAFO_PAR_MARK	(SAB_DAFO_PAR1|SAB_DAFO_PAR0|SAB_DAFO_PARE)
-#define	SAB_DAFO_PAR_EVEN	(SAB_DAFO_PAR1|SAB_DAFO_PARE)
-#define	SAB_DAFO_PAR_ODD	(SAB_DAFO_PAR0|SAB_DAFO_PARE)
-#define	SAB_DAFO_PAR_SPACE	(SAB_DAFO_PARE)
-#define	SAB_DAFO_PAR_NONE	(0)
-
-/* SAB_RFC: rfifo control register */
-#define	SAB_RFC_DPS	0x40	/* disable parity storage */
-#define	SAB_RFC_DXS	0x20	/* disable storage of xon/xoff characters */
-#define	SAB_RFC_RFDF	0x10	/* rfifo data format: 0 data,1 data+stat */
-#define	SAB_RFC_RFTH1	0x08	/* rfifo threshold level 1, see below */
-#define	SAB_RFC_RFTH0	0x04	/* rfifo threshold level 0, see below */
-#define	SAB_RFC_TCDE	0x01	/* termination character detection enable */
-
-#define	SAB_RFC_RFTH_MASK	(SAB_RFC_RFTH1|SAB_RFC_RFTH0)
-#define	SAB_RFC_RFTH_32CHAR	(SAB_RFC_RFTH1|SAB_RFC_RFTH0)
-#define	SAB_RFC_RFTH_16CHAR	(SAB_RFC_RFTH1)
-#define	SAB_RFC_RFTH_4CHAR	(SAB_RFC_RFTH0)
-#define	SAB_RFC_RFTH_1CHAR	(0)
-
-/* SAB_RBCH: received byte count high */
-#define	SAB_RBCH_DMA	0x80	/* read back of XBCH DMA bit */
-#define	SAB_RBCH_CAS	0x20	/* read back of XBCH CAS bit */
-#define	SAB_RBCH_CNT	0x0f	/* ms 4 bits of rx byte count (not used) */
-
-/* SAB_XBCH: transmit byte count high */
-#define	SAB_XBCH_DMA	0x80	/* dma mode: 1:dma, 0:interrupt */
-#define	SAB_XBCH_CAS	0x20	/* carrier detect auto-start */
-#define	SAB_XBCH_XC	0x10	/* transmit continuously */
-#define	SAB_XBCH_CNT	0x0f	/* ms 4 bits of tx byte count */
-
-/* SAB_CCR0: channel configuration register 0 */
-#define	SAB_CCR0_PU	0x80	/* 0:power-down, 1:power-up */
-#define	SAB_CCR0_MCE	0x40	/* master clock enable */
-#define	SAB_CCR0_SC2	0x10	/* serial port config 2, see below */
-#define	SAB_CCR0_SC1	0x08	/* serial port config 1, see below */
-#define	SAB_CCR0_SC0	0x04	/* serial port config 0, see below */
-#define	SAB_CCR0_SM1	0x02	/* serial mode 1, see below */
-#define	SAB_CCR0_SM0	0x01	/* serial mode 0, see below */
-
-#define	SAB_CCR0_SC_MASK	(SAB_CCR0_SC2|SAB_CCR0_SC1|SAB_CCR0_SC0)
-#define	SAB_CCR0_SC_NRZ		(0)
-#define	SAB_CCR0_SC_NRZI	(SAB_CCR0_SC1)
-#define	SAB_CCR0_SC_FM0		(SAB_CCR0_SC2)
-#define	SAB_CCR0_SC_FM1		(SAB_CCR0_SC2|SAB_CCR0_SC0)
-#define	SAB_CCR0_SC_MANCHESTER	(SAB_CCR0_SC2|SAB_CCR0_SC1)
-
-#define	SAB_CCR0_SM_MASK	(SAB_CCR0_SM1|SAB_CCR0_SM0)
-#define	SAB_CCR0_SM_DLC		(0)
-#define	SAB_CCR0_SM_DLCLOOP	(SAB_CCR0_SM0)
-#define	SAB_CCR0_SM_BISYNC	(SAB_CCR0_SM1)
-#define	SAB_CCR0_SM_ASYNC	(SAB_CCR0_SM1|SAB_CCR0_SM0)
-
-/* SAB_CCR1: channel configuration register 1 */
-#define	SAB_CCR1_ODS	0x10	/* Output driver select:1:pushpull,0:odrain */
-#define	SAB_CCR1_BCR	0x08	/* bit clock rate: 1:async, 0:isochronous */
-#define	SAB_CCR1_CM2	0x04	/* clock mode 2, see below */
-#define	SAB_CCR1_CM1	0x02	/* clock mode 1, see below */
-#define	SAB_CCR1_CM0	0x01	/* clock mode 0, see below */
-
-#define	SAB_CCR1_CM_MASK	(SAB_CCR1_CM2|SAB_CCR1_CM1|SAB_CCR1_CM0)
-#define	SAB_CCR1_CM_7		(SAB_CCR1_CM2|SAB_CCR1_CM1|SAB_CCR1_CM0)
-
-/* SAB_CCR2: channel configuration register 2, depends on clock mode above */
-/* clock mode 0a, 1, 4, 5 */
-#define	SAB_CCR2_SOC1	0x80	/* special output 1, below */
-#define	SAB_CCR2_SOC0	0x40	/* special output 0, below */
-#define	SAB_CCR2_SOC_MASK	(SAB_CCR2_SOC1|SAB_CCR2_SOC0)
-#define	SAB_CCR2_SOC_RTSHIGH	(SAB_CCR2_SOC1)
-#define	SAB_CCR2_SOC_RTSNORM	(0)
-#define	SAB_CCR2_SOC_RTSRX	(SAB_CCR2_SOC1|SAB_CCR2_SOC0)
-/* clock mode 0b, 2, 3, 6, 7 */
-#define	SAB_CCR2_BR9	0x80	/* baud rate bit 9 */
-#define	SAB_CCR2_BR8	0x40	/* baud rate bit 8 */
-#define	SAB_CCR2_BDF	0x20	/* baud rate division factor: 0:1: 1:BRG */
-#define	SAB_CCR2_SSEL	0x10	/* clock source select */
-/* clock mode 5 */
-#define	SAB_CCR2_XCS0	0x20	/* tx clock shift, bit 0 */
-#define	SAB_CCR2_RCS0	0x10	/* rx clock shift, bit 0 */
-/* clock mode 0b, 2, 3, 4, 5, 6, 7 */
-#define	SAB_CCR2_TOE	0x08	/* tx clock output enable */
-/* clock mode 0a, 0b, 1, 2, 3, 4, 5, 6, 7 */
-#define	SAB_CCR2_RWX	0x04	/* read/write exchange (dma mode only) */
-#define	SAB_CCR2_DIV	0x01	/* data inversion (nrz) */
-
-/* SAB_CCR3: channel configuration register 3 (v2 or greater) */
-#define	SAB_CCR3_PSD	0x01	/* dpll phase shift disable (nrz/nrzi) */
-
-/* SAB_TSAX: time-slot assignment register transmit (clock mode 5 only) */
-#define	SAB_TSAX_TSNX	0xfc	/* time-slot number transmit */
-#define	SAB_TSAX_XCS2	0x02	/* transmit clock shift bit 2 */
-#define	SAB_TSAX_XCS1	0x01	/* transmit clock shift bit 1 */
-
-/* SAB_TSAR: time-slot assignment register receive (clock mode 5 only) */
-#define	SAB_TSAR_TSNR	0xfc	/* time-slot number receive */
-#define	SAB_TSAR_RCS2	0x02	/* receive clock shift bit 2 */
-#define	SAB_TSAR_RCS1	0x01	/* receive clock shift bit 1 */
-
-/* SAB_VSTR: version status register */
-#define	SAB_VSTR_CD	0x80	/* carrier detect status */
-#define	SAB_VSTR_DPLA	0x40	/* dpll asynchronous */
-#define	SAB_VSTR_VMASK	0x0f	/* chip version mask: */
-#define	SAB_VSTR_V_1	0x00	/*   version 1 */
-#define	SAB_VSTR_V_2	0x01	/*   version 2 */
-#define	SAB_VSTR_V_32	0x02	/*   version 3.2 */
-
-/* SAB_GIS: global interrupt status register */
-#define	SAB_GIS_PI	0x80	/* universal port interrupt */
-#define	SAB_GIS_ISA1	0x08	/* interrupt status a1 */
-#define	SAB_GIS_ISA0	0x04	/* interrupt status a0 */
-#define	SAB_GIS_ISB1	0x02	/* interrupt status b1 */
-#define	SAB_GIS_ISB0	0x01	/* interrupt status b0 */
-
-/* SAB_IVA: interrupt vector address */
-#define	SAB_IVA_MASK	0xf8	/* interrupt vector address mask */
-
-/* SAB_IPC: interrupt port configuration */
-#define	SAB_IPC_VIS	0x80	/* masked interrupt bits visible */
-#define	SAB_IPC_SLAMASK	0x18	/* slave address mask */
-#define	SAB_IPC_CASM	0x04	/* cascading mode */
-#define	SAB_IPC_ICMASK	0x03	/* port config mask: */
-#define	SAB_IPC_ICOD	0x00	/*   open drain output */
-#define	SAB_IPC_ICPL	0x01	/*   push/pull active low output */
-#define	SAB_IPC_ICPH	0x03	/*   push/pull active high output */
-
-/* SAB_ISR0: interrupt status 0 */
-#define	SAB_ISR0_TCD	0x80	/* termination character detected */
-#define	SAB_ISR0_TIME	0x40	/* time-out limit exceeded */
-#define	SAB_ISR0_PERR	0x20	/* parity error */
-#define	SAB_ISR0_FERR	0x10	/* framing error */
-#define	SAB_ISR0_PLLA	0x08	/* dpll asynchronous */
-#define	SAB_ISR0_CDSC	0x04	/* carrier detect status change */
-#define	SAB_ISR0_RFO	0x02	/* rfifo overflow */
-#define	SAB_ISR0_RPF	0x01	/* receive pool full */
-
-/* SAB_ISR1: interrupt status 1 */
-#define	SAB_ISR1_BRK	0x80	/* break detected */
-#define	SAB_ISR1_BRKT	0x40	/* break terminated */
-#define	SAB_ISR1_ALLS	0x20	/* all sent */
-#define	SAB_ISR1_XOFF	0x10	/* xoff detected */
-#define	SAB_ISR1_TIN	0x08	/* timer interrupt */
-#define	SAB_ISR1_CSC	0x04	/* clear to send status change */
-#define	SAB_ISR1_XON	0x02	/* xon detected */
-#define	SAB_ISR1_XPR	0x01	/* transmit pool ready */
-
-/* SAB_IMR0: interrupt mask 0 */
-#define	SAB_IMR0_TCD	0x80	/* termination character detected */
-#define	SAB_IMR0_TIME	0x40	/* time-out limit exceeded */
-#define	SAB_IMR0_PERR	0x20	/* parity error */
-#define	SAB_IMR0_FERR	0x10	/* framing error */
-#define	SAB_IMR0_PLLA	0x08	/* dpll asynchronous */
-#define	SAB_IMR0_CDSC	0x04	/* carrier detect status change */
-#define	SAB_IMR0_RFO	0x02	/* rfifo overflow */
-#define	SAB_IMR0_RPF	0x01	/* receive pool full */
-
-/* SAB_ISR1: interrupt mask 1 */
-#define	SAB_IMR1_BRK	0x80	/* break detected */
-#define	SAB_IMR1_BRKT	0x40	/* break terminated */
-#define	SAB_IMR1_ALLS	0x20	/* all sent */
-#define	SAB_IMR1_XDU	0x10	/* xoff detected */
-#define	SAB_IMR1_TIN	0x08	/* timer interrupt */
-#define	SAB_IMR1_CSC	0x04	/* clear to send status change */
-#define	SAB_IMR1_XMR	0x02	/* xon detected */
-#define	SAB_IMR1_XPR	0x01	/* transmit pool ready */
-
-/* SAB_PVR: port value register */
-#define	SAB_PVR_DSR_A	0x01	/* port A DSR */
-#define	SAB_PVR_DTR_A	0x02	/* port A DTR */
-#define	SAB_PVR_DTR_B	0x04	/* port B DTR */
-#define	SAB_PVR_DSR_B	0x08	/* port B DSR */
-#define	SAB_PVR_MAGIC	0x10	/* dunno... */
-
-/* SAB_CCR4: channel configuration register 4 */
-#define	SAB_CCR4_MCK4	0x80	/* master clock divide by 4 */
-#define	SAB_CCR4_EBRG	0x40	/* enhanced baud rate generator mode */
-#define	SAB_CCR4_TST1	0x20	/* test pin */
-#define	SAB_CCR4_ICD	0x10	/* invert polarity of carrier detect */
-
-/* Receive status byte */
-#define	SAB_RSTAT_PE	0x80	/* parity error */
-#define	SAB_RSTAT_FE	0x40	/* framing error */
-#define	SAB_RSTAT_PAR	0x01	/* parity bit */
-
-#endif /* _DEV_IC_SAB82532_H_ */
diff --git a/include.new/dev/ic/via6522reg.h b/include.new/dev/ic/via6522reg.h
deleted file mode 100644
index eced453..0000000
--- a/include.new/dev/ic/via6522reg.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright 2004 by Peter Grehan. 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 ``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 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: releng/10.2/sys/dev/ic/via6522reg.h 153030 2005-12-02 22:36:14Z grehan $
- */
-
-#ifndef _VIA6522REG_H_
-#define _VIA6522REG_H_
-
-/* Registers */
-#define REG_OIRB	0	/* Input/output register B */
-#define REG_OIRA	1	/* Input/output register A */
-#define REG_DDRB	2	/* Data direction register B */
-#define REG_DDRA	3	/* Data direction register A */
-#define REG_T1CL	4	/* T1 low-order latch/low-order counter */
-#define REG_T1CH	5	/* T1 high-order counter */
-#define REG_T1LL	6	/* T1 low-order latches */
-#define REG_T1LH	7	/* T1 high-order latches */
-#define REG_T2CL	8	/* T2 low-order latch/low-order counter */
-#define REG_T2CH	9	/* T2 high-order counter */
-#define REG_SR		10	/* Shift register */
-#define REG_ACR		11	/* Auxiliary control register */
-#define REG_PCR		12	/* Peripheral control register */
-#define REG_IFR		13	/* Interrupt flag register */
-#define REG_IER		14	/* Interrupt-enable register */
-#define REG_OIRA_NH	15	/* Input/output register A: no handshake */
-
-
-/* Auxiliary control register (11) */
-#define ACR_SR_NONE	0x0	/* Disabled */
-#define ACR_SR_DIR	0x4	/* Bit for shift-register direction 1=out */
-#define ACR_SRI_T2	0x1	/* Shift in under control of T2 */
-#define ACR_SRI_PHI2	0x2	/*   "    "   "     "      " PHI2 */
-#define ACR_SRI_EXTCLK	0x3	/*   "    "   "     "      " external clk */
-#define ACR_SRO		0x4	/* Shift out free running at T2 rate */
-#define ACR_SRO_T2	0x5	/* Shift out under control of T2 */
-#define ACR_SRO_PHI2	0x6	/*   "    "   "     "      "  PHI2 */
-#define ACR_SRO_EXTCLK	0x7	/*   "    "   "     "      "  external clk */
-
-#define ACR_T1_SHIFT	5	/* bits 7-5 */
-#define ACR_SR_SHIFT	2	/* bits 4-2 */
-
-
-/* Peripheral control register (12) */
-#define PCR_INTCNTL	0x01	/* interrupt active edge: +ve=1, -ve=0 */
-
-#define PCR_CNTL_MASK	0x3	/* 3 bits */
-#define PCR_CNTL_NEDGE	0x0	/* Input - negative active edge */
-#define PCR_CNTL_INEDGE 0x1	/* Interrupt - negative active edge */
-#define PCR_CNTL_PEDGE	0x2	/* Input - positive active edge */
-#define PCR_CNTL_IPEDGE 0x3	/* Interrupt - positive active edge */
-#define PCR_CNTL_HSHAKE 0x4	/* Handshake output */
-#define PCR_CNTL_PULSE	0x5	/* Pulse output */
-#define PCR_CNTL_LOW	0x6	/* Low output */
-#define PCR_CNTL_HIGH	0x7	/* High output */
-
-#define PCR_CB2_SHIFT	5	/* bits 7-5 */
-#define PCR_CB1_SHIFT	4	/* bit 4 */
-#define PCR_CA2_SHIFT	1	/* bits 3-1 */
-#define PCR_CA1_SHIFT	0	/* bit 0 */
-
-/* Interrupt flag register (13) */
-#define IFR_CA2		0x01
-#define IFR_CA1		0x02
-#define IFR_SR		0x04
-#define IFR_CB2		0x08
-#define IFR_CB1		0x10
-#define IFR_T2		0x20
-#define IFR_T1		0x40
-#define IFR_IRQB       	0x80	/* status of IRQB output pin */
-
-/* Interrupt enable register (14) */
-#define IER_CA2		IFR_CA2
-#define IER_CA1		IFR_CA1
-#define IER_SR		IFR_SR
-#define IER_CB2		IFR_CB2
-#define IER_CB1		IFR_CB1
-#define IER_T2		IFR_T2
-#define IER_T1		IFR_T1
-#define IER_IRQB	IFR_IRQB
-
-#endif /* _VIA6522REG_H_ */
diff --git a/include.new/dev/ic/wd33c93reg.h b/include.new/dev/ic/wd33c93reg.h
deleted file mode 100644
index 1b4315a..0000000
--- a/include.new/dev/ic/wd33c93reg.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/ic/wd33c93reg.h 139749 2005-01-06 01:43:34Z imp $ */
-/*	$NecBSD: wd33c93reg.h,v 1.21.24.1 2001/06/13 05:52:05 honda Exp $	*/
-/*	$NetBSD$	*/
-/*-
- * [NetBSD for NEC PC-98 series]
- *  Copyright (c) 1996, 1997, 1998
- *	NetBSD/pc98 porting staff. All rights reserved.
- *  Copyright (c) 1996, 1997, 1998
- *	Naofumi Honda. 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 ``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 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.
- */
-
-#ifndef	_WD33C93REG_H_
-#define	_WD33C93REG_H_
-
-/* wd33c93 register */
-#define	wd3s_oid		0x00
-#define	IDR_FS_16_20		0x80
-#define	IDR_FS_12_15		0x40
-#define	IDR_FS_8_10		0x00
-#define	IDR_RAF			0x20
-#define	IDR_EHP			0x10
-#define	IDR_EAF			0x08
-#define	IDR_IDM			0x07
-
-#define	wd3s_ctrl		0x01
-#define	CR_DMA			0x80
-#define	CR_DMAD			0x40
-#define	CR_HLT_HOST_PARITY	0x10
-#define	CR_DIS_INT		0x08
-#define	CR_IDIS_INT		0x04
-#define	CR_HLT_ATN		0x02
-#define	CR_HLT_BUS_PARITY	0x01
-#define	CR_DEFAULT		(CR_DIS_INT | CR_IDIS_INT)
-#define	CR_DEFAULT_HP		(CR_DEFAULT | CR_HLT_BUS_PARITY)
-
-#define	wd3s_tout		0x02
-#define	wd3s_cdb		0x03
-#define	wd3s_lun		0x0f
-#define	wd3s_cph		0x10
-#define	wd3s_synch		0x11
-#define	wd3s_cnt		0x12
-#define	wd3s_did		0x15
-#define	DIDR_SCC		0x80
-#define	DIDR_DPD		0x40
-
-#define	wd3s_sid		0x16
-#define	SIDR_RESEL		0x80
-#define	SIDR_SEL		0x40
-#define	SIDR_VALID		0x08
-#define	SIDR_IDM		0x07
-
-#define	wd3s_stat		0x17
-
-#define	BSR_CM			0xf0
-#define	BSR_CMDCPL		0x10
-#define	BSR_CMDABT		0x20
-#define	BSR_CMDERR		0x40
-#define	BSR_CMDREQ		0x80
-
-#define	BSR_SM			0x0f
-#define	BSR_PM			0x07
-#define	BSR_PHVALID		0x08
-#define	BSR_IOR			0x01
-#define	BSR_DATAOUT		0x00
-#define	BSR_DATAIN		0x01
-#define	BSR_CMDOUT		0x02
-#define	BSR_STATIN		0x03
-#define	BSR_UNSPINFO0		0x04
-#define	BSR_UNSPINFO1		0x05
-#define	BSR_MSGOUT		0x06
-#define	BSR_MSGIN		0x07
-
-#define	BSR_RESET		0x00
-#define	BSR_AFM_RESET		0x01
-#define	BSR_SELECTED		0x11
-#define	BSR_SATFIN		0x16
-#define	BSR_ACKREQ		0x20
-#define	BSR_SATSDP		0x21
-#define	BSR_RESEL		0x80
-#define	BSR_AFM_RESEL		0x81
-#define	BSR_DISC		0x85
-
-#define	wd3s_cmd		0x18
-#define	wd3s_data		0x19
-#define	wd3s_qtag		0x1a
-
-#define	wd3s_mbank		0x30
-#define	MBR_RST			0x02
-#define	MBR_IEN			0x04
-
-#define	wd3s_mwin		0x31
-#define	wd3s_auxc		0x33
-#define	AUXCR_HIDM		0x07
-#define	AUXCR_INTM		0x38
-#define	AUXCR_RRST		0x80
-
-/* status port */
-#define	STR_INT			0x80
-#define	STR_LCI			0x40
-#define	STR_BSY			0x20
-#define	STR_CIP			0x10
-#define	STR_PE			0x02
-#define	STR_DBR			0x01
-#define	STR_BUSY		0xf0
-
-/* cmd port */
-#define	CMDP_DMES		0x01
-#define	CMDP_DMER		0x02
-#define	CMDP_TCMS		0x04
-#define	CMDP_TCMR		0x08
-#define	CMDP_TCIR		0x10
-
-/* wd33c93 chip cmds */
-#define	WD3S_SBT		0x80
-#define	WD3S_RESET		0x00
-#define	WD3S_ABORT		0x01
-#define	WD3S_ASSERT_ATN		0x02
-#define	WD3S_NEGATE_ACK		0x03
-#define	WD3S_DISCONNECT		0x04
-#define	WD3S_RESELECT		0x05
-#define	WD3S_SELECT_ATN		0x06
-#define	WD3S_SELECT_NO_ATN	0x07
-#define	WD3S_SELECT_ATN_TFR	0x08
-#define	WD3S_SELECT_NO_ATN_TFR	0x09
-#define	WD3S_RESELECT_RCV_DATA	0x0a
-#define	WD3S_RESELECT_SEND_DATA	0x0b
-#define	WD3S_WAIT_SELECT_RCV	0x0c
-#define	WD3S_CMD_COMPSEQ	0x0d
-#define	WD3S_SEND_DISC_MSG	0x0e
-#define	WD3S_SET_IDI		0x0f
-#define	WD3S_RCV_CMD		0x10
-#define	WD3S_RCV_DATA		0x11
-#define	WD3S_RCV_MSG_OUT	0x12
-#define	WD3S_RCV_UNSP_INFO_OUT	0x13
-#define	WD3S_SEND_STATUS	0x14
-#define	WD3S_SEND_DATA		0x15
-#define	WD3S_SEND_MSG_IN	0x16
-#define	WD3S_SEND_UNSP_INFO_IN	0x17
-#define	WD3S_TRANSLATE_ADDRESS	0x18
-#define	WD3S_TFR_INFO		0x20
-
-#endif	/* !_WD33C93REG_H_ */
diff --git a/include.new/dev/ic/z8530.h b/include.new/dev/ic/z8530.h
deleted file mode 100644
index 33ecc68..0000000
--- a/include.new/dev/ic/z8530.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*-
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/dev/ic/z8530.h 155967 2006-02-24 02:03:35Z marcel $
- */
-
-#ifndef _DEV_IC_Z8530_H_
-#define	_DEV_IC_Z8530_H_
-
-/*
- * Channel B control:	0
- * Channel B data:	1
- * Channel A control:	2
- * Channel A data:	3
- */
-
-/* The following apply when using a device-scoped bus handle */
-#define	CHAN_A		2
-#define	CHAN_B		0
-
-#define	REG_CTRL	0
-#define	REG_DATA	1
-
-/* Write registers. */
-#define	WR_CR		0	/* Command Register. */
-#define	WR_IDT		1	/* Interrupt and Data Transfer Mode. */
-#define	WR_IV		2	/* Interrupt Vector (shared). */
-#define	WR_RPC		3	/* Receive Parameters and Control. */
-#define	WR_MPM		4	/* Miscellaneous Parameters and Modes. */
-#define	WR_TPC		5	/* Transmit Parameters and Control. */
-#define	WR_SCAF		6	/* Sync Character or (SDLC) Address Field. */
-#define	WR_SCF		7	/* Sync Character or (SDCL) Flag. */
-#define	WR_EFC		7	/* Extended Feature and FIFO Control. */
-#define	WR_TB		8	/* Transmit Buffer. */
-#define	WR_MIC		9	/* Master Interrupt Control (shared). */
-#define	WR_MCB1		10	/* Miscellaneous Control Bits (part 1 :-). */
-#define	WR_CMC		11	/* Clock Mode Control. */
-#define	WR_TCL		12	/* BRG Time Constant Low. */
-#define	WR_TCH		13	/* BRG Time Constant High. */
-#define	WR_MCB2		14	/* Miscellaneous Control Bits (part 2 :-). */
-#define	WR_IC		15	/* Interrupt Control. */
-
-/* Read registers. */
-#define	RR_BES		0	/* Buffer and External Status. */
-#define	RR_SRC		1	/* Special Receive Condition. */
-#define	RR_IV		2	/* Interrupt Vector. */
-#define	RR_IP		3	/* Interrupt Pending (ch A only). */
-#define	RR_MPM		4	/* Miscellaneous Parameters and Modes. */
-#define	RR_TPC		5	/* Transmit Parameters and Control. */
-#define	RR_BCL		6	/* Byte Count Low. */
-#define	RR_BCH		7	/* Byte Count High. */
-#define	RR_RB		8	/* Receive Buffer. */
-#define	RR_RPC		9	/* Receive Parameters and Control. */
-#define	RR_MSB		10	/* Miscellaneous Status Bits. */
-#define	RR_MCB1		11	/* Miscellaneous Control Bits (part 1). */
-#define	RR_TCL		12	/* BRG Time Constant Low. */
-#define	RR_TCH		13	/* BRG Time Constant High. */
-#define	RR_EFC		14	/* Extended Feature and FIFO Control. */
-#define	RR_IC		15	/* Interrupt Control. */
-
-/* Buffer and External Status (RR0). */
-#define	BES_BRK		0x80	/* Break (Abort). */
-#define	BES_TXU		0x40	/* Tx Underrun (EOM). */
-#define	BES_CTS		0x20	/* CTS. */
-#define	BES_SYNC	0x10	/* Sync. */
-#define	BES_DCD		0x08	/* DCD. */
-#define	BES_TXE		0x04	/* Tx Empty. */
-#define	BES_ZC		0x02	/* Zero Count. */
-#define	BES_RXA		0x01	/* Rx Available. */
-
-/* Clock Mode Control (WR11). */
-#define	CMC_XTAL	0x80	/* -RTxC connects to quartz crystal. */
-#define	CMC_RC_DPLL	0x60	/* Rx Clock from DPLL. */
-#define	CMC_RC_BRG	0x40	/* Rx Clock from BRG. */
-#define	CMC_RC_TRXC	0x20	/* Rx Clock from -TRxC. */
-#define	CMC_RC_RTXC	0x00	/* Rx Clock from -RTxC. */
-#define	CMC_TC_DPLL	0x18	/* Tx Clock from DPLL */
-#define	CMC_TC_BRG	0x10	/* Tx Clock from BRG */
-#define	CMC_TC_TRXC	0x08	/* Tx Clock from -TRxC. */
-#define	CMC_TC_RTXC	0x00	/* Tx Clock from -RTxC. */
-#define	CMC_TRXC_OUT	0x04	/* -TRxC is output. */
-#define	CMC_TRXC_DPLL	0x03	/* -TRxC from DPLL */
-#define	CMC_TRXC_BRG	0x02	/* -TRxC from BRG */
-#define	CMC_TRXC_XMIT	0x01	/* -TRxC from Tx clock. */
-#define	CMC_TRXC_XTAL	0x00	/* -TRxC from XTAL. */
-
-/* Command Register (WR0). */
-#define	CR_RSTTXU	0xc0	/* Reset Tx. Underrun/EOM. */
-#define	CR_RSTTXCRC	0x80	/* Reset Tx. CRC. */
-#define	CR_RSTRXCRC	0x40	/* Reset Rx. CRC. */
-#define	CR_RSTIUS	0x38	/* Reset Int. Under Service. */
-#define	CR_RSTERR	0x30	/* Error Reset. */
-#define	CR_RSTTXI	0x28	/* Reset Tx. Int. */
-#define	CR_ENARXI	0x20	/* Enable Rx. Int. */
-#define	CR_ABORT	0x18	/* Send Abort. */
-#define	CR_RSTXSI	0x10	/* Reset Ext/Status Int. */
-
-/* Extended Feature and FIFO Control (WR7 prime). */
-#define	EFC_ERE		0x40	/* Extended Read Enable. */
-#define	EFC_FE		0x20	/* Transmit FIFO Empty. */
-#define	EFC_RQT		0x10	/* Request Timing. */
-#define	EFC_FHF		0x08	/* Receive FIFO Half Full. */
-#define	EFC_RTS		0x04	/* Auto RTS Deactivation. */
-#define	EFC_EOM		0x02	/* Auto EOM Reset. */
-#define	EFC_FLAG	0x01	/* Auto SDLC Flag on Tx. */
-
-/* Interrupt Control (WR15). */
-#define	IC_BRK		0x80	/* Break (Abort) IE. */
-#define	IC_TXU		0x40	/* Tx Underrun IE. */
-#define	IC_CTS		0x20	/* CTS IE. */
-#define	IC_SYNC		0x10	/* Sync IE. */
-#define	IC_DCD		0x08	/* DCD IE. */
-#define	IC_FIFO		0x04	/* SDLC FIFO Enable. */
-#define	IC_ZC		0x02	/* Zero Count IE. */
-#define	IC_EF		0x01	/* Extended Feature Enable. */
-
-/* Interrupt and Data Transfer Mode (WR1). */
-#define	IDT_WRE		0x80	/* Wait/DMA Request Enable. */
-#define	IDT_REQ		0x40	/* DMA Request. */
-#define	IDT_WRR		0x20	/* Wait/DMA Reuest on Receive. */
-#define	IDT_RISC	0x18	/* Rx Int. on Special Condition Only. */
-#define	IDT_RIA		0x10	/* Rx Int. on All Characters. */
-#define	IDT_RIF		0x08	/* Rx Int. on First Character. */
-#define	IDT_PSC		0x04	/* Parity is Special Condition. */
-#define	IDT_TIE		0x02	/* Tx Int. Enable. */
-#define	IDT_XIE		0x01	/* Ext. Int. Enable. */
-
-/* Interrupt Pending (RR3). */
-#define	IP_RIA		0x20	/* Rx. Int. ch. A. */
-#define	IP_TIA		0x10	/* Tx. Int. ch. A. */ 
-#define	IP_SIA		0x08	/* Ext/Status Int. ch. A. */
-#define	IP_RIB		0x04	/* Rx. Int. ch. B. */
-#define	IP_TIB		0x02	/* Tx. Int. ch. B. */
-#define	IP_SIB		0x01	/* Ext/Status Int. ch. B. */
-
-/* Interrupt Vector Status Low (RR2). */
-#define	IV_SCA		0x0e	/* Special Condition ch. A. */
-#define	IV_RAA		0x0c	/* Receive Available ch. A. */
-#define	IV_XSA		0x0a	/* External/Status Change ch. A. */
-#define	IV_TEA		0x08	/* Transmitter Empty ch. A. */
-#define	IV_SCB		0x06	/* Special Condition ch. B. */
-#define	IV_RAB		0x04	/* Receive Available ch. B. */
-#define	IV_XSB		0x02	/* External/Status Change ch. B. */
-#define	IV_TEB		0x00	/* Transmitter Empty ch. B. */
-
-/* Miscellaneous Control Bits part 1 (WR10). */
-#define	MCB1_CRC1	0x80	/* CRC presets to 1. */
-#define	MCB1_FM0	0x60	/* FM0 Encoding. */
-#define	MCB1_FM1	0x40	/* FM1 Encoding. */
-#define	MCB1_NRZI	0x20	/* NRZI Encoding. */
-#define	MCB1_NRZ	0x00	/* NRZ Encoding. */
-#define	MCB1_AOP	0x10	/* Active On Poll. */
-#define	MCB1_MI		0x08	/* Mark Idle. */
-#define	MCB1_AOU	0x04	/* Abort On Underrun. */
-#define	MCB1_LM		0x02	/* Loop Mode. */
-#define	MCB1_SIX	0x01	/* 6 or 12 bit SYNC. */
-
-/* Miscellaneous Control Bits part 2 (WR14). */
-#define	MCB2_NRZI	0xe0	/* DPLL - NRZI mode. */
-#define	MCB2_FM		0xc0	/* DPLL - FM mode. */
-#define	MCB2_RTXC	0xa0	/* DPLL - Clock from -RTxC. */
-#define	MCB2_BRG	0x80	/* DPLL - Clock from BRG. */
-#define	MCB2_OFF	0x60	/* DPLL - Disable. */
-#define	MCB2_RMC	0x40	/* DPLL - Reset Missing Clock. */
-#define	MCB2_ESM	0x20	/* DPLL - Enter Search Mode. */
-#define	MCB2_LL		0x10	/* Local Loopback. */
-#define	MCB2_AE		0x08	/* Auto Echo. */
-#define	MCB2_REQ	0x04	/* Request Function. */
-#define	MCB2_PCLK	0x02	/* BRG source is PCLK. */
-#define	MCB2_BRGE	0x01	/* BRG enable. */
-
-/* Master Interrupt Control (WR9). */
-#define	MIC_FHR		0xc0	/* Force Hardware Reset. */
-#define	MIC_CRA		0x80	/* Channel Reset A. */
-#define	MIC_CRB		0x40	/* Channel Reset B. */
-#define	MIC_SIE		0x20	/* Software INTACK Enable. */
-#define	MIC_SH		0x10	/* Status High. */
-#define	MIC_MIE		0x08	/* Master Interrupt Enable. */
-#define	MIC_DLC		0x04	/* Disable Lower Chain. */
-#define	MIC_NV		0x02	/* No Vector. */
-#define	MIC_VIS		0x01	/* Vector Includes Status. */
-
-/* Transmit/Receive Miscellaneous Parameters and Modes (WR4). */
-#define	MPM_CM64	0xc0	/* X64 Clock Mode. */
-#define	MPM_CM32	0x80	/* X32 Clock Mode. */
-#define	MPM_CM16	0x40	/* X16 Clock Mode. */
-#define	MPM_CM1		0x00	/* X1 Clock Mode. */
-#define	MPM_EXT		0x30	/* External Sync Mode. */
-#define	MPM_SDLC 	0x20	/* SDLC mode. */
-#define	MPM_BI		0x10	/* 16-bit Sync (bi-sync). */
-#define	MPM_MONO	0x00	/* 8-bit Sync (mono-sync). */
-#define	MPM_SB2 	0x0c	/* Async mode: 2 stopbits. */
-#define	MPM_SB15 	0x08	/* Async mode: 1.5 stopbits. */
-#define	MPM_SB1 	0x04	/* Async mode: 1 stopbit. */
-#define	MPM_SYNC	0x00	/* Sync Mode Enable. */
-#define	MPM_EVEN 	0x02	/* Async mode: even parity. */
-#define	MPM_PE		0x01	/* Async mode: parity enable. */
-
-/* Receive Parameters and Control (WR3). */
-#define	RPC_RB8		0xc0	/* 8 databits. */
-#define	RPC_RB6		0x80	/* 6 databits. */
-#define	RPC_RB7		0x40	/* 7 databits. */
-#define	RPC_RB5		0x00	/* 5 databits. */
-#define	RPC_AE		0x20	/* Auto Enable. */
-#define	RPC_EHM		0x10	/* Enter Hunt Mode. */
-#define	RPC_CRC		0x08	/* CRC Enable. */
-#define	RPC_ASM		0x04	/* Address Search Mode. */
-#define	RPC_LI		0x02	/* SYNC Character Load Inhibit */
-#define	RPC_RXE		0x01	/* Receiver Enable */
-
-/* Special Receive Condition (RR1). */
-#define	SRC_EOF		0x80	/* End Of Frame. */
-#define	SRC_FE		0x40	/* Framing Error. */
-#define	SRC_OVR		0x20	/* Rx. Overrun. */
-#define	SRC_PE		0x10	/* Parity Error. */
-#define	SRC_RC0		0x08	/* Residue Code 0. */
-#define	SRC_RC1		0x04	/* Residue Code 1. */
-#define	SRC_RC2		0x02	/* Residue Code 2. */
-#define	SRC_AS		0x01	/* All Sent. */
-
-/* Transmit Parameter and Control (WR5). */
-#define	TPC_DTR		0x80	/* DTR. */
-#define	TPC_TB8		0x60	/* 8 databits. */
-#define	TPC_TB6		0x40	/* 6 databits. */
-#define	TPC_TB7		0x20	/* 7 databits. */
-#define	TPC_TB5		0x00	/* 5 or fewer databits. */
-#define	TPC_BRK		0x10	/* Send break. */
-#define	TPC_TXE		0x08	/* Transmitter Enable. */
-#define	TPC_CRC16	0x04	/* CRC16. */
-#define	TPC_RTS		0x02	/* RTS. */
-#define	TPC_CRC		0x01	/* CRC Enable. */
-
-#endif /* _DEV_IC_Z8530_H_ */
diff --git a/include.new/dev/ieee488/ibfoo_int.h b/include.new/dev/ieee488/ibfoo_int.h
deleted file mode 100644
index 7cb6e71..0000000
--- a/include.new/dev/ieee488/ibfoo_int.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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.
- *
- * This file defines the ABI between the userland gpib library and the
- * kernel.  This file should not be used anywhere else.
- *
- * $FreeBSD: releng/10.2/sys/dev/ieee488/ibfoo_int.h 141768 2005-02-12 21:07:09Z phk $
- */
-
-#include <sys/ioccom.h>
-
-typedef void ibsrq_t(void);
-enum ibfoo_id {
-	__ID_INVALID = 0,
-	__ID_IBASK,
-	__ID_IBBNA,
-	__ID_IBCAC,
-	__ID_IBCLR,
-	__ID_IBCMD,
-	__ID_IBCMDA,
-	__ID_IBCONFIG,
-	__ID_IBDEV,
-	__ID_IBDIAG,
-	__ID_IBDMA,
-	__ID_IBEOS,
-	__ID_IBEOT,
-	__ID_IBEVENT,
-	__ID_IBFIND,
-	__ID_IBGTS,
-	__ID_IBIST,
-	__ID_IBLINES,
-	__ID_IBLLO,
-	__ID_IBLN,
-	__ID_IBLOC,
-	__ID_IBONL,
-	__ID_IBPAD,
-	__ID_IBPCT,
-	__ID_IBPOKE,
-	__ID_IBPPC,
-	__ID_IBRD,
-	__ID_IBRDA,
-	__ID_IBRDF,
-	__ID_IBRDKEY,
-	__ID_IBRPP,
-	__ID_IBRSC,
-	__ID_IBRSP,
-	__ID_IBRSV,
-	__ID_IBSAD,
-	__ID_IBSGNL,
-	__ID_IBSIC,
-	__ID_IBSRE,
-	__ID_IBSRQ,
-	__ID_IBSTOP,
-	__ID_IBTMO,
-	__ID_IBTRAP,
-	__ID_IBTRG,
-	__ID_IBWAIT,
-	__ID_IBWRT,
-	__ID_IBWRTA,
-	__ID_IBWRTF,
-	__ID_IBWRTKEY,
-	__ID_IBXTRC
-};
-
-#define __F_HANDLE              (1 << 0)
-#define __F_SPR                 (1 << 1)
-#define __F_BUFFER              (1 << 2)
-#define __F_RETVAL              (1 << 3)
-#define __F_BDNAME              (1 << 4)
-#define __F_MASK                (1 << 5)
-#define __F_PADVAL              (1 << 6)
-#define __F_SADVAL              (1 << 7)
-#define __F_CNT                 (1 << 8)
-#define __F_TMO                 (1 << 9)
-#define __F_EOS                 (1 << 10)
-#define __F_PPR                 (1 << 11)
-#define __F_EOT                 (1 << 12)
-#define __F_V                   (1 << 13)
-#define __F_VALUE               (1 << 14)
-#define __F_SAD                 (1 << 15)
-#define __F_BOARDID             (1 << 16)
-#define __F_OPTION              (1 << 17)
-#define __F_FLNAME              (1 << 18)
-#define __F_FUNC                (1 << 19)
-#define __F_LINES               (1 << 20)
-#define __F_PAD                 (1 << 21)
-#define __F_MODE                (1 << 22)
-#define __F_LISTENFLAG          (1 << 23)
-#define __F_EVENT               (1 << 24)
-
-struct ibarg {
-	enum ibfoo_id       __ident;
-	unsigned int        __field;
-	int		    __retval;
-	int		    __ibsta;
-	int		    __iberr;
-	int		    __ibcnt;
-	int                 handle;
-	char *              spr;
-	void *              buffer;
-	int *               retval;
-	char *              bdname;
-	int                 mask;
-	int                 padval;
-	int                 sadval;
-	long                cnt;
-	int                 tmo;
-	int                 eos;
-	char *              ppr;
-	int                 eot;
-	int                 v;
-	int                 value;
-	int                 sad;
-	int                 boardID;
-	int                 option;
-	char *              flname;
-	ibsrq_t *           func;
-	short *             lines;
-	int                 pad;
-	int                 mode;
-	short *             listenflag;
-	short *             event;
-};
-
-#define GPIB_IBFOO	_IOWR(4, 0, struct ibarg)
diff --git a/include.new/dev/ieee488/tnt4882.h b/include.new/dev/ieee488/tnt4882.h
deleted file mode 100644
index a46c7e9..0000000
--- a/include.new/dev/ieee488/tnt4882.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2010 Joerg Wunsch
- * 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.
- *
- * 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: releng/10.2/sys/dev/ieee488/tnt4882.h 203360 2010-02-01 21:21:10Z joerg $
- */
-
-enum tnt4882reg {
-	dir = 0x00,
-	cdor = 0x00,
-	isr1 = 0x02,
-	imr1 = 0x02,
-	isr2 = 0x04,
-	imr2 = 0x04,
-	accwr = 0x05,
-	spsr = 0x06,
-	spmr = 0x06,
-	intr = 0x07,
-	adsr = 0x08,
-	admr = 0x08,
-	cnt2 = 0x09,
-	cptr = 0x0a,
-	auxmr = 0x0a,
-	tauxcr = 0x0a,	/* 9914 mode register */
-	cnt3 = 0x0b,
-	adr0 = 0x0c,
-	adr = 0x0c,
-	hssel = 0x0d,
-	adr1 = 0x0e,
-	eosr = 0x0e,
-	sts1 = 0x10,
-	cfg = 0x10,
-	dsr = 0x11,
-	sh_cnt = 0x11,
-	imr3 = 0x12,
-	hier = 0x13,
-	cnt0 = 0x14,
-	misc = 0x15,
-	cnt1 = 0x16,
-	csr = 0x17,
-	keyreg = 0x17,
-	fifob = 0x18,
-	fifoa = 0x19,
-	isr3 = 0x1a,
-	ccr = 0x1a,
-	sasr = 0x1b,
-	dcr = 0x1b,
-	sts2 = 0x1c,
-	cmdr = 0x1c,
-	isr0 = 0x1d,
-	imr0 = 0x1d,
-	timer = 0x1e,
-	bsr = 0x1f,
-	bcr = 0x1f
-};
-
diff --git a/include.new/dev/ieee488/ugpib.h b/include.new/dev/ieee488/ugpib.h
deleted file mode 100644
index b0a6de4..0000000
--- a/include.new/dev/ieee488/ugpib.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp <phk@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.
- *
- * 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: releng/10.2/sys/dev/ieee488/ugpib.h 141777 2005-02-12 23:52:44Z phk $
- *
- */
-
-#ifndef _DEV_IEEE488_UGPIB_H_
-#define _DEV_IEEE488_UGPIB_H_
-
-/* ibfoo() return values */
-#define EDVR	0		/* System error				*/
-#define ECIC	1		/* Not Active Controller		*/
-#define ENOL	2		/* Nobody listening			*/
-#define EADR	3		/* Controller not addressed		*/
-#define EARG	4		/* Invalid argument			*/
-#define ESAC	5		/* Not System Controller		*/
-#define EABO	6		/* I/O Aborted/Time out			*/
-#define ENEB	7		/* No such controller			*/
-#define EOIP	10		/* Async I/O in progress		*/
-#define ECAP	11		/* No such capability			*/
-#define EFSO	12		/* File system error			*/
-#define EBUS	14		/* Command byte xfer error		*/
-#define ESTB	15		/* Serial poll status byte lost		*/
-#define ESRQ	16		/* SRQ line stuck			*/
-#define ETAB	20		/* Table problem			*/
-
-/* ibsta bits */
-#define ERR	(1<<15)		/* Error				*/
-#define TIMO	(1<<14)		/* Timeout				*/
-#define END	(1<<13)		/* EOI/EOS				*/
-#define SRQI	(1<<12)		/* SRQ					*/
-#define RQS	(1<<11)		/* Device requests service		*/
-#define SPOLL	(1<<10)		/* Serial Poll				*/
-#define EVENT	(1<<9)		/* Event occured			*/
-#define CMPL	(1<<8)		/* I/O complete				*/
-#define LOK	(1<<7)		/* Lockout				*/
-#define REM	(1<<6)		/* Remote				*/
-#define CIC	(1<<5)		/* CIC					*/
-#define ATN	(1<<4)		/* ATN					*/
-#define TACS	(1<<3)		/* Talker				*/
-#define LACS	(1<<2)		/* Listener				*/
-#define DTAS	(1<<1)		/* Device trigger status		*/
-#define DCAS	(1<<0)		/* Device clear state			*/
-
-/* Timeouts */
-#define TNONE	0
-#define T10us	1
-#define T30us	2
-#define T100us	3
-#define T300us	4
-#define T1ms	5
-#define T3ms	6
-#define T10ms	7
-#define T30ms	8
-#define T100ms	9
-#define T300ms	10
-#define T1s	11
-#define T3s	12
-#define T10s	13
-#define T30s	14
-#define T100s	15
-#define T300s	16
-#define T1000s	17
-
-/* EOS bits */
-#define REOS	(1 << 10)
-#define XEOS	(1 << 11)
-#define BIN	(1 << 12)
-
-/* Bus commands */
-#define GTL	0x01		/* Go To Local				*/
-#define SDC	0x04		/* Selected Device Clear		*/
-#define GET	0x08		/* Group Execute Trigger		*/
-#define LAD	0x20		/* Listen address			*/
-#define UNL	0x3F		/* Unlisten				*/
-#define TAD	0x40		/* Talk address				*/
-#define UNT	0x5F		/* Untalk				*/
-
-#ifndef _KERNEL
-
-extern int ibcnt, iberr, ibsta;
-
-int ibask(int handle, int option, int *retval);
-int ibbna(int handle, char *bdname);
-int ibcac(int handle, int v);
-int ibclr(int handle);
-int ibcmd(int handle, void *buffer, long cnt);
-int ibcmda(int handle, void *buffer, long cnt);
-int ibconfig(int handle, int option, int value);
-int ibdev(int boardID, int pad, int sad, int tmo, int eot, int eos);
-int ibdiag(int handle, void *buffer, long cnt);
-int ibdma(int handle, int v);
-int ibeos(int handle, int eos);
-int ibeot(int handle, int eot);
-int ibevent(int handle, short *event);
-int ibfind(char *bdname);
-int ibgts(int handle, int v);
-int ibist(int handle, int v);
-int iblines(int handle, short *lines);
-int ibllo(int handle);
-int ibln(int handle, int padval, int sadval, short *listenflag);
-int ibloc(int handle);
-int ibonl(int handle, int v);
-int ibpad(int handle, int pad);
-int ibpct(int handle);
-int ibpoke(int handle, int option, int value);
-int ibppc(int handle, int v);
-int ibrd(int handle, void *buffer, long cnt);
-int ibrda(int handle, void *buffer, long cnt);
-int ibrdf(int handle, char *flname);
-int ibrdkey(int handle, void *buffer, int cnt);
-int ibrpp(int handle, char *ppr);
-int ibrsc(int handle, int v);
-int ibrsp(int handle, char *spr);
-int ibrsv(int handle, int v);
-int ibsad(int handle, int sad);
-int ibsgnl(int handle, int v);
-int ibsic(int handle);
-int ibsre(int handle, int v);
-int ibsrq(void (*func)(void));
-int ibstop(int handle);
-int ibtmo(int handle, int tmo);
-int ibtrap(int  mask, int mode);
-int ibtrg(int handle);
-int ibwait(int handle, int mask);
-int ibwrt(int handle, const void *buffer, long cnt);
-int ibwrta(int handle, const void *buffer, long cnt);
-int ibwrtf(int handle, const char *flname);
-int ibwrtkey(int handle, const void *buffer, int cnt);
-int ibxtrc(int handle, void *buffer, long cnt);
-#endif /* _KERNEL */
-#endif /* _DEV_IEEE488_UGPIB_H_ */
diff --git a/include.new/dev/ieee488/upd7210.h b/include.new/dev/ieee488/upd7210.h
deleted file mode 100644
index 3b05002..0000000
--- a/include.new/dev/ieee488/upd7210.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp <phk@FreeBSD.org>
- * Copyright (c) 2010 Joerg Wunsch <joerg@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.
- *
- * 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: releng/10.2/sys/dev/ieee488/upd7210.h 230134 2012-01-15 13:23:43Z uqs $
- *
- * Locating an actual µPD7210 data book has proven quite impossible for me.
- * There are a fair number of newer chips which are supersets of the µPD7210
- * but they are particular eager to comprehensively mark what the extensions
- * are and what is in the base set.  Some even give the registers and their
- * bits new names.
- *
- * The following information is based on a description of the µPD7210 found
- * in an old manual for a VME board which used the chip.
- */
-
-#ifndef _DEV_IEEE488_UPD7210_H_
-#define _DEV_IEEE488_UPD7210_H_
-#ifdef _KERNEL
-
-struct upd7210;
-struct ibfoo;
-
-/* upd7210 interface definitions for HW drivers */
-
-typedef int upd7210_irq_t(struct upd7210 *, int);
-
-struct upd7210 {
-	struct resource		*reg_res[8];
-	struct resource		*irq_clear_res;
-	u_int			reg_offset[8];
-	int			dmachan;
-	int			unit;
-	int			use_fifo;
-
-	/* private stuff */
-	struct mtx		mutex;
-	uint8_t			rreg[8];
-	uint8_t			wreg[8 + 8];
-
-	upd7210_irq_t		*irq;
-
-	int			busy;
-	u_char			*buf;
-	size_t			bufsize;
-	u_int			buf_wp;
-	u_int			buf_rp;
-	struct cdev		*cdev;
-
-	struct ibfoo		*ibfoo;
-};
-
-#ifdef UPD7210_HW_DRIVER
-void upd7210intr(void *);
-void upd7210attach(struct upd7210 *);
-void upd7210detach(struct upd7210 *);
-#endif
-
-#ifdef UPD7210_SW_DRIVER
-
-/* upd7210 hardware definitions. */
-
-/* Write registers */
-enum upd7210_wreg {
-	CDOR	= 0,			/* Command/Data Out Register	*/
-	IMR1	= 1,			/* Interrupt Mask Register 1	*/
-	IMR2	= 2,			/* Interrupt Mask Register 2	*/
-	SPMR	= 3,			/* Serial Poll Mode Register	*/
-	ADMR	= 4,			/* ADdress Mode Register	*/
-	AUXMR	= 5,			/* AUXilliary Mode Register	*/
-	ICR	= 5,			/* Internal Counter Register	*/
-	PPR	= 5,			/* Parallel Poll Register	*/
-	AUXRA	= 5,			/* AUXilliary Register A	*/
-	AUXRB	= 5,			/* AUXilliary Register B	*/
-	AUXRE	= 5,			/* AUXilliary Register E	*/
-	ADR	= 6,			/* ADdress Register		*/
-	EOSR	= 7,			/* End-Of-String Register	*/
-};
-
-/* Read registers */
-enum upd7210_rreg {
-	DIR	= 0,			/* Data In Register		*/
-	ISR1	= 1,			/* Interrupt Status Register 1	*/
-	ISR2	= 2,			/* Interrupt Status Register 2	*/
-	SPSR	= 3,			/* Serial Poll Status Register	*/
-	ADSR	= 4,			/* ADdress Status Register	*/
-	CPTR	= 5,			/* Command Pass Though Register	*/
-	ADR0	= 6,			/* ADdress Register 0		*/
-	ADR1	= 7,			/* ADdress Register 1		*/
-};
-
-/* Bits for ISR1 and IMR1 */
-#define IXR1_DI		(1 << 0)	/* Data In			*/
-#define IXR1_DO		(1 << 1)	/* Data Out			*/
-#define IXR1_ERR	(1 << 2)	/* Error			*/
-#define IXR1_DEC	(1 << 3)	/* Device Clear			*/
-#define IXR1_ENDRX	(1 << 4)	/* End Received			*/
-#define IXR1_DET	(1 << 5)	/* Device Execute Trigger	*/
-#define IXR1_APT	(1 << 6)	/* Address Pass-Through		*/
-#define IXR1_CPT	(1 << 7)	/* Command Pass-Through		*/
-
-/* Bits for ISR2 and IMR2 */
-#define IXR2_ADSC	(1 << 0)	/* Addressed Status Change	*/
-#define IXR2_REMC	(1 << 1)	/* Remote Change		*/
-#define IXR2_LOKC	(1 << 2)	/* Lockout Change		*/
-#define IXR2_CO		(1 << 3)	/* Command Out			*/
-#define ISR2_REM	(1 << 4)	/* Remove			*/
-#define IMR2_DMAI	(1 << 4)	/* DMA In Enable		*/
-#define ISR2_LOK	(1 << 5)	/* Lockout			*/
-#define IMR2_DMAO	(1 << 5)	/* DMA Out Enable		*/
-#define IXR2_SRQI	(1 << 6)	/* Service Request Input	*/
-#define ISR2_INT	(1 << 7)	/* Interrupt			*/
-
-#define SPSR_PEND	(1 << 6)	/* Pending			*/
-#define SPMR_RSV	(1 << 6)	/* Request SerVice		*/
-
-#define ADSR_MJMN	(1 << 0)	/* MaJor MiNor			*/
-#define ADSR_TA		(1 << 1)	/* Talker Active		*/
-#define ADSR_LA		(1 << 2)	/* Listener Active		*/
-#define ADSR_TPAS	(1 << 3)	/* Talker Primary Addr. State	*/
-#define ADSR_LPAS	(1 << 4)	/* Listener Primary Addr. State	*/
-#define ADSR_SPMS	(1 << 5)	/* Serial Poll Mode State	*/
-#define ADSR_ATN	(1 << 6)	/* Attention			*/
-#define ADSR_CIC	(1 << 7)	/* Controller In Charge		*/
-
-#define ADMR_ADM0	(1 << 0)	/* Address Mode 0		*/
-#define ADMR_ADM1	(1 << 1)	/* Address Mode 1		*/
-#define ADMR_TRM0	(1 << 4)	/* Transmit/Receive Mode 0	*/
-#define ADMR_TRM1	(1 << 5)	/* Transmit/Receive Mode 1	*/
-#define ADMR_LON	(1 << 6)	/* Listen Only			*/
-#define ADMR_TON	(1 << 7)	/* Talk Only			*/
-
-/* Constant part of overloaded write registers */
-#define	C_ICR		0x20
-#define	C_PPR		0x60
-#define	C_AUXA		0x80
-#define	C_AUXB		0xa0
-#define	C_AUXE		0xc0
-
-#define AUXMR_PON	0x00		/* Immediate Execute pon	*/
-#define AUXMR_CPP	0x01		/* Clear Parallel Poll		*/
-#define AUXMR_CRST	0x02		/* Chip Reset			*/
-#define AUXMR_RFD	0x03		/* Finish Handshake		*/
-#define AUXMR_TRIG	0x04		/* Trigger			*/
-#define AUXMR_RTL	0x05		/* Return to local		*/
-#define AUXMR_SEOI	0x06		/* Send EOI			*/
-#define AUXMR_NVSA	0x07		/* Non-Valid Secondary cmd/addr	*/
-					/* 0x08 undefined/unknown	*/
-#define AUXMR_SPP	0x09		/* Set Parallel Poll		*/
-					/* 0x0a undefined/unknown	*/
-					/* 0x0b undefined/unknown	*/
-					/* 0x0c undefined/unknown	*/
-					/* 0x0d undefined/unknown	*/
-					/* 0x0e undefined/unknown	*/
-#define AUXMR_VSA	0x0f		/* Valid Secondary cmd/addr	*/
-#define AUXMR_GTS	0x10		/* Go to Standby		*/
-#define AUXMR_TCA	0x11		/* Take Control Async (pulsed)	*/
-#define AUXMR_TCS	0x12		/* Take Control Synchronously	*/
-#define AUXMR_LISTEN	0x13		/* Listen			*/
-#define AUXMR_DSC	0x14		/* Disable System Control	*/
-					/* 0x15 undefined/unknown	*/
-#define AUXMR_SIFC	0x16		/* Set IFC			*/
-#define AUXMR_CREN	0x17		/* Clear REN			*/
-					/* 0x18 undefined/unknown	*/
-					/* 0x19 undefined/unknown	*/
-#define AUXMR_TCSE	0x1a		/* Take Control Sync on End	*/
-#define AUXMR_LCM	0x1b		/* Listen Continuously Mode	*/
-#define AUXMR_LUNL	0x1c		/* Local Unlisten		*/
-#define AUXMR_EPP	0x1d		/* Execute Parallel Poll	*/
-#define AUXMR_CIFC	0x1e		/* Clear IFC			*/
-#define AUXMR_SREN	0x1f		/* Set REN			*/
-
-#define PPR_U		(1 << 4)	/* Unconfigure			*/
-#define PPR_S		(1 << 3)	/* Status Polarity		*/
-
-#define AUXA_HLDA	(1 << 0)	/* Holdoff on All		*/
-#define AUXA_HLDE	(1 << 1)	/* Holdoff on END		*/
-#define AUXA_REOS	(1 << 2)	/* End on EOS received		*/
-#define AUXA_XEOS	(1 << 3)	/* Transmit END with EOS	*/
-#define AUXA_BIN	(1 << 4)	/* Binary			*/
-
-#define AUXB_CPTE	(1 << 0)	/* Cmd Pass Through Enable	*/
-#define AUXB_SPEOI	(1 << 1)	/* Send Serial Poll EOI		*/
-#define AUXB_TRI	(1 << 2)	/* Three-State Timing		*/
-#define AUXB_INV	(1 << 3)	/* Invert			*/
-#define AUXB_ISS	(1 << 4)	/* Individual Status Select	*/
-
-#define AUXE_DHDT	(1 << 0)	/* DAC Holdoff on DTAS		*/
-#define AUXE_DHDC	(1 << 1)	/* DAC Holdoff on DCAS		*/
-
-#define ADR0_DL0	(1 << 5)	/* Disable Listener 0		*/
-#define ADR0_DT0	(1 << 6)	/* Disable Talker 0		*/
-
-#define ADR_DL		(1 << 5)	/* Disable Listener		*/
-#define ADR_DT		(1 << 6)	/* Disable Talker		*/
-#define ADR_ARS		(1 << 7)	/* Address Register Select	*/
-
-#define ADR1_DL1	(1 << 5)	/* Disable Listener 1		*/
-#define ADR1_DT1	(1 << 6)	/* Disable Talker 1		*/
-#define ADR1_EOI	(1 << 7)	/* End or Identify		*/
-
-/* Stuff from software drivers */
-extern struct cdevsw gpib_ib_cdevsw;
-
-/* Stuff from upd7210.c */
-void upd7210_print_isr(u_int isr1, u_int isr2);
-u_int upd7210_rd(struct upd7210 *u, enum upd7210_rreg reg);
-void upd7210_wr(struct upd7210 *u, enum upd7210_wreg reg, u_int val);
-int upd7210_take_ctrl_async(struct upd7210 *u);
-int upd7210_goto_standby(struct upd7210 *u);
-
-#endif /* UPD7210_SW_DRIVER */
-
-#endif /* _KERNEL */
-#endif /* _DEV_IEEE488_UPD7210_H_ */
diff --git a/include.new/dev/iicbus/iic.h b/include.new/dev/iicbus/iic.h
deleted file mode 100644
index f963d7e..0000000
--- a/include.new/dev/iicbus/iic.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1998 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/iicbus/iic.h 210998 2010-08-07 08:31:32Z joel $
- *
- */
-#ifndef __IIC_H
-#define __IIC_H
-
-#include <sys/ioccom.h>
-
-/* Designed to be compatible with linux's struct i2c_msg */
-struct iic_msg
-{
-	uint16_t	slave;
-	uint16_t	flags;
-#define	IIC_M_WR	0	/* Fake flag for write */
-#define	IIC_M_RD	0x0001	/* read vs write */
-#define	IIC_M_NOSTOP	0x0002	/* do not send a I2C stop after message */
-#define	IIC_M_NOSTART	0x0004	/* do not send a I2C start before message */
-	uint16_t	len;	/* msg length */
-	uint8_t *	buf;
-};
-
-struct iiccmd {
-	u_char slave;
-	int count;
-	int last;
-	char *buf;
-};
-
-struct iic_rdwr_data {
-	struct iic_msg *msgs;
-	uint32_t nmsgs;
-};
-
-#define I2CSTART	_IOW('i', 1, struct iiccmd)	/* start condition */
-#define I2CSTOP		_IO('i', 2)			/* stop condition */
-#define I2CRSTCARD	_IOW('i', 3, struct iiccmd)	/* reset the card */
-#define I2CWRITE	_IOW('i', 4, struct iiccmd)	/* send data */
-#define I2CREAD		_IOW('i', 5, struct iiccmd)	/* receive data */
-#define I2CRDWR		_IOW('i', 6, struct iic_rdwr_data)	/* General read/write interface */
-#define I2CRPTSTART	_IOW('i', 7, struct iiccmd)	/* repeated start */
-
-#endif
diff --git a/include.new/dev/iicbus/iicbus.h b/include.new/dev/iicbus/iicbus.h
deleted file mode 100644
index 54fdca8..0000000
--- a/include.new/dev/iicbus/iicbus.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1998 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/iicbus/iicbus.h 276278 2014-12-27 02:37:52Z ian $
- *
- */
-#ifndef __IICBUS_H
-#define __IICBUS_H
-
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-
-#define IICBUS_IVAR(d) (struct iicbus_ivar *) device_get_ivars(d)
-#define IICBUS_SOFTC(d) (struct iicbus_softc *) device_get_softc(d)
-
-struct iicbus_softc
-{
-	device_t dev;		/* Myself */
-	device_t owner;		/* iicbus owner device structure */
-	u_char started;		/* address of the 'started' slave
-				 * 0 if no start condition succeeded */
-	u_char strict;		/* deny operations that violate the
-				 * I2C protocol */
-	struct mtx lock;
-	u_int bus_freq;		/* Configured bus Hz. */
-};
-
-struct iicbus_ivar
-{
-	uint32_t	addr;
-	bool		nostop;
-};
-
-enum {
-	IICBUS_IVAR_ADDR,		/* Address or base address */
-	IICBUS_IVAR_NOSTOP,		/* nostop defaults */
-};
-
-#define IICBUS_ACCESSOR(A, B, T)					\
-	__BUS_ACCESSOR(iicbus, A, IICBUS, B, T)
-	
-IICBUS_ACCESSOR(addr,		ADDR,		uint32_t)
-IICBUS_ACCESSOR(nostop,		NOSTOP,		bool)
-
-#define	IICBUS_LOCK(sc)			mtx_lock(&(sc)->lock)
-#define	IICBUS_UNLOCK(sc)      		mtx_unlock(&(sc)->lock)
-#define	IICBUS_ASSERT_LOCKED(sc)       	mtx_assert(&(sc)->lock, MA_OWNED)
-
-int  iicbus_generic_intr(device_t dev, int event, char *buf);
-void iicbus_init_frequency(device_t dev, u_int bus_freq);
-
-extern driver_t iicbus_driver;
-extern devclass_t iicbus_devclass;
-
-#endif
diff --git a/include.new/dev/iicbus/iicoc.h b/include.new/dev/iicbus/iicoc.h
deleted file mode 100644
index bd94c0a..0000000
--- a/include.new/dev/iicbus/iicoc.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 2003-2012 Broadcom Corporation
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY BROADCOM ``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 BROADCOM 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: releng/10.2/sys/dev/iicbus/iicoc.h 233539 2012-03-27 10:44:32Z jchandra $
- */
-
-#ifndef __OPENCORE_I2C_H__
-#define __OPENCORE_I2C_H__
-
-/* I2C specific registers */
-#define OC_I2C_PRESCALE_LO_REG		0x00
-#define OC_I2C_PRESCALE_HI_REG		0x01
-#define OC_I2C_CTRL_REG			0x02
-#define OC_I2C_TRANSMIT_REG		0x03  /* tx and rx - same reg */
-#define OC_I2C_RECV_REG			0x03  /* tx and rx - same reg */
-#define OC_I2C_DATA_REG			0x03  /* tx and rx - same reg */
-#define OC_I2C_CMD_REG			0x04  /* cmd and status - same reg */
-#define OC_I2C_STATUS_REG		0x04  /* cmd and status - same reg */
-
-#define XLP_I2C_CLKFREQ			133333333 /* XLP 133 MHz IO clock */
-#define XLP_I2C_FREQ			100000	/* default 100kHz */
-#define I2C_TIMEOUT			500000
-
-/*
- * These defines pertain to the OpenCores
- * I2C Master Host Controller used in XLP
- */
-
-#define OC_PRESCALER_LO			0
-#define OC_PRESCALER_HI			1
-
-#define OC_CONTROL			2
-#define OC_CONTROL_EN			0x80
-#define OC_CONTROL_IEN			0x40
-
-#define OC_DATA				3	/* Data TX & RX Reg */
-
-#define OC_COMMAND			4
-#define OC_COMMAND_START		0x90
-#define OC_COMMAND_STOP			0x40
-#define OC_COMMAND_READ			0x20
-#define OC_COMMAND_WRITE		0x10
-#define OC_COMMAND_RDACK		0x20
-#define OC_COMMAND_RDNACK		0x28
-#define OC_COMMAND_IACK			0x01	/* Not used */
-
-#define OC_STATUS			4	/* Same as 'command' */
-#define OC_STATUS_NACK			0x80	/* Did not get an ACK */
-#define OC_STATUS_BUSY			0x40
-#define OC_STATUS_AL			0x20	/* Arbitration Lost */
-#define OC_STATUS_TIP			0x02	/* Transfer in Progress  */
-#define OC_STATUS_IF			0x01	/* Intr. Pending Flag */
-
-#endif
diff --git a/include.new/dev/iicbus/iiconf.h b/include.new/dev/iicbus/iiconf.h
deleted file mode 100644
index 6ceb426..0000000
--- a/include.new/dev/iicbus/iiconf.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 1998, 2001 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/iicbus/iiconf.h 164901 2006-12-05 06:19:36Z imp $
- */
-#ifndef __IICONF_H
-#define __IICONF_H
-
-#include <sys/queue.h>
-#include <dev/iicbus/iic.h>
-
-
-#define IICPRI (PZERO+8)		/* XXX sleep/wakeup queue priority */
-
-#define LSB 0x1
-
-/*
- * How tsleep() is called in iic_request_bus().
- */
-#define IIC_DONTWAIT	0
-#define IIC_NOINTR	0
-#define IIC_WAIT	0x1
-#define IIC_INTR	0x2
-
-/*
- * i2c modes
- */
-#define IIC_MASTER	0x1
-#define IIC_SLAVE	0x2
-#define IIC_POLLED	0x4
-
-/*
- * i2c speed
- */
-#define IIC_UNKNOWN	0x0
-#define IIC_SLOW	0x1
-#define IIC_FAST	0x2
-#define IIC_FASTEST	0x3
-
-#define IIC_LAST_READ	0x1
-
-/*
- * callback index
- */
-#define IIC_REQUEST_BUS	0x1
-#define IIC_RELEASE_BUS	0x2
-
-/*
- * interrupt events
- */
-#define INTR_GENERAL	0x1	/* general call received */
-#define INTR_START	0x2	/* the I2C interface is addressed */
-#define INTR_STOP	0x3	/* stop condition received */
-#define INTR_RECEIVE	0x4	/* character received */
-#define INTR_TRANSMIT	0x5	/* character to transmit */
-#define INTR_ERROR	0x6	/* error */
-#define INTR_NOACK	0x7	/* no ack from master receiver */
-
-/*
- * adapter layer errors
- */
-#define IIC_NOERR	0x0	/* no error occured */
-#define IIC_EBUSERR	0x1	/* bus error */
-#define IIC_ENOACK	0x2	/* ack not received until timeout */
-#define IIC_ETIMEOUT	0x3	/* timeout */
-#define IIC_EBUSBSY	0x4	/* bus busy */
-#define IIC_ESTATUS	0x5	/* status error */
-#define IIC_EUNDERFLOW	0x6	/* slave ready for more data */
-#define IIC_EOVERFLOW	0x7	/* too much data */
-#define IIC_ENOTSUPP	0x8	/* request not supported */
-#define IIC_ENOADDR	0x9	/* no address assigned to the interface */
-
-extern int iicbus_request_bus(device_t, device_t, int);
-extern int iicbus_release_bus(device_t, device_t);
-extern device_t iicbus_alloc_bus(device_t);
-
-extern void iicbus_intr(device_t, int, char *);
-
-extern int iicbus_null_repeated_start(device_t, u_char);
-extern int iicbus_null_callback(device_t, int, caddr_t);
-
-#define iicbus_reset(bus,speed,addr,oldaddr) \
-	(IICBUS_RESET(device_get_parent(bus), speed, addr, oldaddr))
-
-/* basic I2C operations */
-extern int iicbus_started(device_t);
-extern int iicbus_start(device_t, u_char, int);
-extern int iicbus_stop(device_t);
-extern int iicbus_repeated_start(device_t, u_char, int);
-extern int iicbus_write(device_t, const char *, int, int *, int);
-extern int iicbus_read(device_t, char *, int, int *, int, int);
-
-/* single byte read/write functions, start/stop not managed */
-extern int iicbus_write_byte(device_t, char, int);
-extern int iicbus_read_byte(device_t, char *, int);
-
-/* Read/write operations with start/stop conditions managed */
-extern int iicbus_block_write(device_t, u_char, char *, int, int *);
-extern int iicbus_block_read(device_t, u_char, char *, int, int *);
-
-/* vectors of iic operations to pass to bridge */
-int iicbus_transfer(device_t bus, struct iic_msg *msgs, uint32_t nmsgs);
-int iicbus_transfer_gen(device_t bus, struct iic_msg *msgs, uint32_t nmsgs);
-
-#define IICBUS_MODVER	1
-#define IICBUS_MINVER	1
-#define IICBUS_MAXVER	1
-#define IICBUS_PREFVER	IICBUS_MODVER
-
-extern driver_t iicbb_driver;
-extern devclass_t iicbb_devclass;
-
-#define IICBB_MODVER	1
-#define IICBB_MINVER	1
-#define IICBB_MAXVER	1
-#define IICBB_PREFVER	IICBB_MODVER
-
-#endif
diff --git a/include.new/dev/iicbus/pcf8563reg.h b/include.new/dev/iicbus/pcf8563reg.h
deleted file mode 100644
index cd4e923..0000000
--- a/include.new/dev/iicbus/pcf8563reg.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: pcf8563reg.h,v 1.1 2011/01/21 19:11:47 jakllsch Exp $	*/
-
-/*-
- * Jonathan Kollasch, 2011
- *
- * This file is in the public domain.
- *
- * $FreeBSD: releng/10.2/sys/dev/iicbus/pcf8563reg.h 234248 2012-04-13 23:07:32Z marius $
- */
-
-/*
- * NXP (Philips) PCF8563 RTC registers
- */
-
-/* We only have clock mode registers here. */
-
-#ifndef _PCF8563REG_H_
-#define _PCF8563REG_H_
-
-/*
- * PCF8563 RTC I2C address:
- *
- *	101 0001
- */
-#define PCF8563_ADDR		0xa2
-
-#define PCF8563_R_CS1		0x00
-#define PCF8563_R_CS2		0x01
-#define PCF8563_R_SECOND	0x02
-#define PCF8563_R_MINUTE	0x03
-#define PCF8563_R_HOUR		0x04
-#define PCF8563_R_DAY		0x05
-#define PCF8563_R_WEEKDAY	0x06
-#define PCF8563_R_MONTH		0x07
-#define PCF8563_R_YEAR		0x08
-#define PCF8563_R_MINUTE_ALARM	0x09
-#define PCF8563_R_HOUR_ALARM	0x0a
-#define PCF8563_R_DAY_ALARM	0x0b
-#define PCF8563_R_WEEKDAY_ALARM	0x0c
-#define PCF8563_R_CLKOUT_CNTRL	0x0d
-#define PCF8563_R_TIMER_CNTRL	0x0e
-#define PCF8563_R_TIMER		0x0f
-
-#define PCF8563_R_SECOND_VL	0x80
-#define	PCF8563_R_MONTH_C	0x80
-
-#define PCF8563_NREGS		0x10
-
-#define PCF8563_M_SECOND	0x7f
-#define PCF8563_M_MINUTE	0x7f
-#define PCF8563_M_HOUR		0x3f
-#define PCF8563_M_DAY		0x3f
-#define PCF8563_M_WEEKDAY	0x07
-#define PCF8563_M_MONTH		0x1f
-#define PCF8563_M_CENTURY	0x80
-#define PCF8563_M_YEAR		0xff
-
-#endif	/* _PCF8563REG_H_ */
diff --git a/include.new/dev/io/iodev.h b/include.new/dev/io/iodev.h
deleted file mode 100644
index 2cac0dc..0000000
--- a/include.new/dev/io/iodev.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2010 Marcel Moolenaar
- * 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.
- *
- * 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: releng/10.2/sys/dev/io/iodev.h 207329 2010-04-28 15:38:01Z attilio $
- */
-
-#ifndef _DEV_IODEV_H_
-#define	_DEV_IODEV_H_
-
-#define	IODEV_PIO_READ		0
-#define	IODEV_PIO_WRITE		1
-
-struct iodev_pio_req {
-	u_int access;
-	u_int port;
-	u_int width;
-	u_int val;
-};
-
-#define	IODEV_PIO	_IOWR('I', 0, struct iodev_pio_req)
-
-#endif /* _DEV_IODEV_H_ */
diff --git a/include.new/dev/lmc/if_lmc.h b/include.new/dev/lmc/if_lmc.h
deleted file mode 100644
index 6624dcc..0000000
--- a/include.new/dev/lmc/if_lmc.h
+++ /dev/null
@@ -1,1690 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/sys/dev/lmc/if_lmc.h 249925 2013-04-26 12:50:32Z glebius $
- *
- * Copyright (c) 2002-2004 David Boggs. (boggs@boggs.palo-alto.ca.us)
- * All rights reserved.
- *
- * BSD License:
- *
- * 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.
- *
- * 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.
- *
- * GNU General Public License:
- *
- * This program is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License as published by the Free 
- * Software Foundation; either version 2 of the License, or (at your option) 
- * any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT 
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 
- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-#ifndef IF_LMC_H
-#define IF_LMC_H
-
-#define DEVICE_NAME		"lmc"
-
-/* Linux RPM-style version information */
-#define DRIVER_MAJOR_VERSION	2005	/* year */
-#define DRIVER_MINOR_VERSION	9	/* month */
-#define DRIVER_SUB_VERSION	29	/* day */
-
-/* netgraph stuff */
-#define NG_LMC_NODE_TYPE	DEVICE_NAME
-#define NGM_LMC_COOKIE		1128054761	/* date -u +'%s' */
-
-/* Tulip PCI configuration registers */
-#define	TLP_CFID		0x00		/*  0: CFg ID register     */
-#define	TLP_CFCS		0x04		/*  1: CFg Command/Status  */
-#define	TLP_CFRV		0x08		/*  2: CFg ReVision        */
-#define	TLP_CFLT		0x0C		/*  3: CFg Latency Timer   */
-#define	TLP_CBIO		0x10		/*  4: Cfg Base IO address */
-#define	TLP_CBMA		0x14		/*  5: Cfg Base Mem Addr   */
-#define TLP_CSID		0x2C		/* 11: Cfg Subsys ID reg   */
-#define	TLP_CFIT		0x3C		/* 15: CFg InTerrupt       */
-#define	TLP_CFDD		0x40		/* 16: CFg Driver Data     */
-
-#define TLP_CFID_TULIP		0x00091011	/* DEC 21140A Ethernet chip */
-
-#define TLP_CFCS_MSTR_ABORT	0x20000000
-#define TLP_CFCS_TARG_ABORT	0x10000000
-#define TLP_CFCS_SYS_ERROR	0x00000100
-#define TLP_CFCS_PAR_ERROR	0x00000040
-#define TLP_CFCS_MWI_ENABLE	0x00000010
-#define TLP_CFCS_BUS_MASTER	0x00000004
-#define TLP_CFCS_MEM_ENABLE	0x00000002
-#define TLP_CFCS_IO_ENABLE	0x00000001
-
-#define TLP_CFLT_LATENCY	0x0000FF00
-#define TLP_CFLT_CACHE		0x000000FF
-
-#define TLP_CSID_HSSI		0x00031376	/* LMC 5200 HSSI card */
-#define TLP_CSID_T3		0x00041376	/* LMC 5245 T3   card */
-#define TLP_CSID_SSI		0x00051376	/* LMC 1000 SSI  card */
-#define TLP_CSID_T1E1		0x00061376	/* LMC 1200 T1E1 card */
-#define TLP_CSID_HSSIc		0x00071376	/* LMC 5200 HSSI cPCI */
-#define TLP_CSID_SDSL		0x00081376	/* LMC 1168 SDSL card */
-
-#define TLP_CFIT_MAX_LAT	0xFF000000
-
-#define TLP_CFDD_SLEEP		0x80000000
-#define TLP_CFDD_SNOOZE		0x40000000
-
-/* Tulip Control and Status Registers */
-#define TLP_CSR_STRIDE		 8		/* 64 bits */
-#define TLP_BUS_MODE		 0 * TLP_CSR_STRIDE
-#define TLP_TX_POLL		 1 * TLP_CSR_STRIDE
-#define TLP_RX_POLL		 2 * TLP_CSR_STRIDE
-#define TLP_RX_LIST		 3 * TLP_CSR_STRIDE
-#define TLP_TX_LIST		 4 * TLP_CSR_STRIDE
-#define TLP_STATUS		 5 * TLP_CSR_STRIDE
-#define TLP_OP_MODE		 6 * TLP_CSR_STRIDE
-#define TLP_INT_ENBL		 7 * TLP_CSR_STRIDE
-#define TLP_MISSED		 8 * TLP_CSR_STRIDE
-#define TLP_SROM_MII		 9 * TLP_CSR_STRIDE
-#define TLP_BIOS_ROM		10 * TLP_CSR_STRIDE
-#define TLP_TIMER		11 * TLP_CSR_STRIDE
-#define TLP_GPIO		12 * TLP_CSR_STRIDE
-#define TLP_CSR13		13 * TLP_CSR_STRIDE
-#define TLP_CSR14		14 * TLP_CSR_STRIDE
-#define TLP_WDOG		15 * TLP_CSR_STRIDE
-#define TLP_CSR_SIZE		128		/* IO bus space size */
-
-/* CSR 0 - PCI Bus Mode Register */
-#define TLP_BUS_WRITE_INVAL	0x01000000 /* DONT USE! */
-#define TLP_BUS_READ_LINE	0x00800000
-#define TLP_BUS_READ_MULT	0x00200000
-#define TLP_BUS_DESC_BIGEND	0x00100000
-#define TLP_BUS_TAP		0x000E0000
-#define TLP_BUS_CAL		0x0000C000
-#define TLP_BUS_PBL		0x00003F00
-#define TLP_BUS_DATA_BIGEND	0x00000080
-#define TLP_BUS_DSL		0x0000007C
-#define TLP_BUS_ARB		0x00000002
-#define TLP_BUS_RESET		0x00000001
-#define TLP_BUS_CAL_SHIFT	14
-#define TLP_BUS_PBL_SHIFT	 8
-
-/* CSR 5 - Status Register */
-#define TLP_STAT_FATAL_BITS	0x03800000
-#define TLP_STAT_TX_FSM		0x00700000
-#define TLP_STAT_RX_FSM		0x000E0000
-#define TLP_STAT_FATAL_ERROR	0x00002000
-#define TLP_STAT_TX_UNDERRUN	0x00000020
-#define TLP_STAT_FATAL_SHIFT	23
-
-/* CSR 6 - Operating Mode Register */
-#define TLP_OP_RECEIVE_ALL	0x40000000
-#define TLP_OP_MUST_BE_ONE	0x02000000
-#define TLP_OP_NO_HEART_BEAT	0x00080000
-#define TLP_OP_PORT_SELECT	0x00040000
-#define TLP_OP_TX_THRESH	0x0000C000
-#define TLP_OP_TX_RUN		0x00002000
-#define TLP_OP_LOOP_MODE	0x00000C00
-#define TLP_OP_EXT_LOOP		0x00000800
-#define TLP_OP_INT_LOOP		0x00000400
-#define TLP_OP_FULL_DUPLEX	0x00000200
-#define TLP_OP_PROMISCUOUS	0x00000040
-#define TLP_OP_PASS_BAD_PKT	0x00000008
-#define TLP_OP_RX_RUN		0x00000002
-#define TLP_OP_TR_SHIFT		14
-#define TLP_OP_INIT		(TLP_OP_PORT_SELECT   | \
-				 TLP_OP_FULL_DUPLEX   | \
-				 TLP_OP_MUST_BE_ONE   | \
-				 TLP_OP_NO_HEART_BEAT | \
-				 TLP_OP_RECEIVE_ALL   | \
-				 TLP_OP_PROMISCUOUS   | \
-				 TLP_OP_PASS_BAD_PKT  | \
-				 TLP_OP_RX_RUN        | \
-				 TLP_OP_TX_RUN)
-
-/* CSR 7 - Interrupt Enable Register */
-#define TLP_INT_NORMAL_INTR	0x00010000
-#define TLP_INT_ABNRML_INTR	0x00008000
-#define TLP_INT_FATAL_ERROR	0x00002000
-#define TLP_INT_RX_NO_BUFS	0x00000080
-#define TLP_INT_RX_INTR		0x00000040
-#define TLP_INT_TX_UNDERRUN	0x00000020
-#define TLP_INT_TX_INTR		0x00000001
-#define TLP_INT_DISABLE		0
-#define TLP_INT_TX		(TLP_INT_NORMAL_INTR | \
-				 TLP_INT_ABNRML_INTR | \
-				 TLP_INT_FATAL_ERROR | \
-				 TLP_INT_TX_UNDERRUN | \
-				 TLP_INT_TX_INTR)
-#define TLP_INT_RX		(TLP_INT_NORMAL_INTR | \
-				 TLP_INT_ABNRML_INTR | \
-				 TLP_INT_FATAL_ERROR | \
-				 TLP_INT_RX_NO_BUFS  | \
-				 TLP_INT_RX_INTR)
-#define TLP_INT_TXRX		(TLP_INT_TX | TLP_INT_RX)
-
-/* CSR 8 - RX Missed Frames & Overrun Register */
-#define TLP_MISS_OCO		0x10000000
-#define TLP_MISS_OVERRUN	0x0FFE0000
-#define TLP_MISS_MFO		0x00010000
-#define TLP_MISS_MISSED		0x0000FFFF
-#define TLP_OVERRUN_SHIFT	17
-
-/* CSR 9 - SROM & MII & Boot ROM Register */
-#define TLP_MII_MDIN		0x00080000
-#define TLP_MII_MDOE		0x00040000
-#define TLP_MII_MDOUT		0x00020000
-#define TLP_MII_MDC		0x00010000
-
-#define TLP_BIOS_RD		0x00004000
-#define TLP_BIOS_WR		0x00002000
-#define TLP_BIOS_SEL		0x00001000
-
-#define TLP_SROM_RD		0x00004000
-#define TLP_SROM_SEL		0x00000800
-#define TLP_SROM_DOUT		0x00000008
-#define TLP_SROM_DIN		0x00000004
-#define TLP_SROM_CLK		0x00000002
-#define TLP_SROM_CS		0x00000001
-
-/* CSR 12 - General Purpose IO register */
-#define TLP_GPIO_DIR		0x00000100
-
-/* CSR 15 - Watchdog Timer Register */
-#define TLP_WDOG_RX_OFF		0x00000010
-#define TLP_WDOG_TX_OFF		0x00000001
-#define TLP_WDOG_INIT		(TLP_WDOG_TX_OFF | \
-				 TLP_WDOG_RX_OFF)
-
-/* GPIO bits common to all cards */
-#define GPIO_INIT		0x01	/*    from Xilinx                  */
-#define GPIO_RESET		0x02	/* to      Xilinx                  */
-/* bits 2 and 3 vary with board type -- see below */
-#define GPIO_MODE		0x10	/* to      Xilinx                  */
-#define GPIO_DP			0x20	/* to/from Xilinx                  */
-#define GPIO_DATA		0x40	/* serial data                     */
-#define GPIO_CLK		0x80	/* serial clock                    */
-
-/* HSSI GPIO bits */
-#define GPIO_HSSI_ST		0x04	/* send timing sense (deprecated)  */
-#define GPIO_HSSI_TXCLK		0x08	/* clock source                    */
-
-/* HSSIc GPIO bits */
-#define GPIO_HSSI_SYNTH		0x04	/* Synth osc chip select           */
-#define GPIO_HSSI_DCE		0x08	/* provide clock on TXCLOCK output */
-
-/* T3   GPIO bits */
-#define GPIO_T3_DAC		0x04	/* DAC chip select                 */
-#define GPIO_T3_INTEN		0x08	/* Framer Interupt enable          */
-
-/* SSI  GPIO bits */
-#define GPIO_SSI_SYNTH		0x04	/* Synth osc chip select           */
-#define GPIO_SSI_DCE		0x08	/* provide clock on TXCLOCK output */
-
-/* T1E1 GPIO bits */
-#define GPIO_T1_INTEN		0x08	/* Framer Interupt enable          */
-
-/* MII register 16 bits common to all cards */
-/* NB: LEDs  for HSSI & SSI are in DIFFERENT bits than for T1E1 & T3; oops */
-/* NB: CRC32 for HSSI & SSI is  in DIFFERENT bit  than for T1E1 & T3; oops */
-#define MII16_LED_ALL		0x0780	/* RW: LED bit mask                */
-#define MII16_FIFO		0x0800	/* RW: 1=reset, 0=not reset        */
-
-/* MII register 16 bits for HSSI */
-#define MII16_HSSI_TA		0x0001	/* RW: host ready;  host->modem    */
-#define MII16_HSSI_CA		0x0002	/* RO: modem ready; modem->host    */
-#define MII16_HSSI_LA		0x0004	/* RW: loopback A;  host->modem    */
-#define MII16_HSSI_LB		0x0008	/* RW: loopback B;  host->modem    */
-#define MII16_HSSI_LC		0x0010	/* RO: loopback C;  modem->host    */
-#define MII16_HSSI_TM		0x0020	/* RO: test mode;   modem->host    */
-#define MII16_HSSI_CRC32	0x0040	/* RW: CRC length 16/32            */
-#define MII16_HSSI_LED_LL	0x0080	/* RW: lower left  - green         */
-#define MII16_HSSI_LED_LR	0x0100	/* RW: lower right - green         */
-#define MII16_HSSI_LED_UL	0x0200	/* RW: upper left  - green         */
-#define MII16_HSSI_LED_UR	0x0400	/* RW: upper right - red           */
-#define MII16_HSSI_FIFO		0x0800	/* RW: reset fifos                 */
-#define MII16_HSSI_FORCECA	0x1000	/* RW: [cPCI] force CA on          */
-#define MII16_HSSI_CLKMUX	0x6000  /* RW: [cPCI] TX clock selection   */
-#define MII16_HSSI_LOOP		0x8000	/* RW: [cPCI] LOOP TX into RX      */
-#define MII16_HSSI_MODEM	0x003F	/* TA+CA+LA+LB+LC+TM               */
-
-/* MII register 16 bits for DS3 */
-#define MII16_DS3_ZERO		0x0001	/* RW: short/long cables           */
-#define MII16_DS3_TRLBK		0x0002	/* RW: loop towards host           */
-#define MII16_DS3_LNLBK		0x0004	/* RW: loop towards net            */
-#define MII16_DS3_RAIS		0x0008	/* RO: LIU receive AIS      (depr) */
-#define MII16_DS3_TAIS		0x0010	/* RW: LIU transmit AIS     (depr) */
-#define MII16_DS3_BIST		0x0020	/* RO: LIU QRSS patt match  (depr) */
-#define MII16_DS3_DLOS		0x0040	/* RO: LIU Digital LOS      (depr) */
-#define MII16_DS3_LED_BLU	0x0080	/* RW: lower right - blue          */
-#define MII16_DS3_LED_YEL	0x0100	/* RW: lower left  - yellow        */
-#define MII16_DS3_LED_RED	0x0200	/* RW: upper right - red           */
-#define MII16_DS3_LED_GRN	0x0400	/* RW: upper left  - green         */
-#define MII16_DS3_FIFO		0x0800	/* RW: reset fifos                 */
-#define MII16_DS3_CRC32		0x1000	/* RW: CRC length 16/32            */
-#define MII16_DS3_SCRAM		0x2000	/* RW: payload scrambler           */
-#define MII16_DS3_POLY		0x4000	/* RW: 1=Larse, 0=DigLink|Kentrox  */
-#define MII16_DS3_FRAME		0x8000	/* RW: 1=stop txframe pulses       */
-
-/* MII register 16 bits for SSI */
-#define MII16_SSI_DTR		0x0001	/* RW: DTR host->modem             */
-#define MII16_SSI_DSR		0x0002	/* RO: DSR modem->host             */
-#define MII16_SSI_RTS		0x0004	/* RW: RTS host->modem             */
-#define MII16_SSI_CTS		0x0008	/* RO: CTS modem->host             */
-#define MII16_SSI_DCD		0x0010	/* RW: DCD modem<->host            */
-#define MII16_SSI_RI		0x0020	/* RO: RI  modem->host             */
-#define MII16_SSI_CRC32		0x0040	/* RW: CRC length 16/32            */
-#define MII16_SSI_LED_LL	0x0080	/* RW: lower left  - green         */
-#define MII16_SSI_LED_LR	0x0100	/* RW: lower right - green         */
-#define MII16_SSI_LED_UL	0x0200	/* RW: upper left  - green         */
-#define MII16_SSI_LED_UR	0x0400	/* RW: upper right - red           */
-#define MII16_SSI_FIFO		0x0800	/* RW: reset fifos                 */
-#define MII16_SSI_LL		0x1000	/* RW: LL: host->modem             */
-#define MII16_SSI_RL		0x2000	/* RW: RL: host->modem             */
-#define MII16_SSI_TM		0x4000	/* RO: TM: modem->host             */
-#define MII16_SSI_LOOP		0x8000	/* RW: Loop at ext conn            */
-#define MII16_SSI_MODEM		0x703F	/* DTR+DSR+RTS+CTS+DCD+RI+LL+RL+TM */
-
-/* Mii register 17 has the SSI cable bits */
-#define MII17_SSI_CABLE_SHIFT	3	/* shift to get cable type         */
-#define MII17_SSI_CABLE_MASK	0x0038	/* RO: mask  to get cable type     */
-#define MII17_SSI_PRESCALE	0x0040	/* RW: divide by: 0=16; 1=512      */
-#define MII17_SSI_ITF		0x0100	/* RW: fill with: 0=flags; 1=ones  */
-#define MII17_SSI_NRZI		0x0400	/* RW: coding: NRZ= 0; NRZI=1      */
-
-/* MII register 16 bits for T1/E1 */
-#define MII16_T1_UNUSED1	0x0001
-#define MII16_T1_INVERT		0x0002	/* RW: invert data (for SF/AMI)    */
-#define MII16_T1_XOE		0x0004	/* RW: TX Output Enable; 0=disable */
-#define MII16_T1_RST		0x0008	/* RW: Bt8370 chip reset           */
-#define MII16_T1_Z		0x0010	/* RW: output impedance T1=1 E1=0  */
-#define MII16_T1_INTR		0x0020	/* RO: interrupt from Bt8370       */
-#define MII16_T1_ONESEC		0x0040	/* RO: one second square wave      */
-#define MII16_T1_LED_BLU	0x0080	/* RW: lower right - blue          */
-#define MII16_T1_LED_YEL	0x0100	/* RW: lower left  - yellow        */
-#define MII16_T1_LED_RED	0x0200	/* RW: upper right - red           */
-#define MII16_T1_LED_GRN	0x0400	/* RW: upper left  - green         */
-#define MII16_T1_FIFO		0x0800	/* RW: reset fifos                 */
-#define MII16_T1_CRC32		0x1000	/* RW: CRC length 16/32            */
-#define MII16_T1_UNUSED2	0xE000
-
-/* T3 framer:  RW=Read/Write;  RO=Read-Only;  RC=Read/Clr;  WO=Write-Only  */
-#define T3CSR_STAT0		0x00	/* RO: real-time status            */
-#define T3CSR_CTL1		0x01	/* RW: global control bits         */
-#define T3CSR_FEBE		0x02	/* RC: Far End Block Error Counter */
-#define T3CSR_CERR		0x03	/* RC: C-bit Parity Error Counter  */
-#define T3CSR_PERR		0x04	/* RC: P-bit Parity Error Counter  */
-#define T3CSR_TX_FEAC		0x05	/* RW: Far End Alarm & Control     */
-#define T3CSR_RX_FEAC		0x06	/* RO: Far End Alarm & Control     */
-#define T3CSR_STAT7		0x07	/* RL: latched real-time status    */
-#define T3CSR_CTL8		0x08	/* RW: extended global ctl bits    */
-#define T3CSR_STAT9		0x09	/* RL: extended status bits        */
-#define T3CSR_FERR		0x0A	/* RC: F-bit Error Counter         */
-#define T3CSR_MERR		0x0B	/* RC: M-bit Error Counter         */
-#define T3CSR_CTL12		0x0C	/* RW: more extended ctl bits      */
-#define T3CSR_DBL_FEAC		0x0D	/* RW: TX double FEAC              */
-#define T3CSR_CTL14		0x0E	/* RW: even more extended ctl bits */
-#define T3CSR_FEAC_STK		0x0F	/* RO: RX FEAC stack               */
-#define T3CSR_STAT16		0x10	/* RL: extended latched status     */
-#define T3CSR_INTEN		0x11	/* RW: interrupt enable            */
-#define T3CSR_CVLO		0x12	/* RC: coding violation cntr LSB   */
-#define T3CSR_CVHI		0x13	/* RC: coding violation cntr MSB   */
-#define T3CSR_CTL20		0x14	/* RW: yet more extended ctl bits  */
-
-#define CTL1_XTX		0x01	/* Transmit X-bit value            */
-#define CTL1_3LOOP		0x02	/* framer loop back                */
-#define CTL1_SER		0x04	/* SERial interface selected       */
-#define CTL1_M13MODE		0x08	/* M13 frame format                */
-#define CTL1_TXIDL		0x10	/* Transmit Idle signal            */
-#define CTL1_ENAIS		0x20	/* Enable AIS upon LOS             */
-#define CTL1_TXAIS		0x40	/* Transmit Alarm Indication Sig   */
-#define CTL1_NOFEBE		0x80	/* No Far End Block Errors         */
-
-#define CTL5_EMODE		0x80	/* rev B Extended features enabled */
-#define CTL5_START		0x40	/* transmit the FEAC msg now       */
-
-#define CTL8_FBEC		0x80	/* F-Bit Error Count control       */
-#define CTL8_TBLU		0x20	/* Transmit Blue signal            */
-
-#define STAT9_SEF		0x80	/* Severely Errored Frame          */
-#define STAT9_RBLU		0x20	/* Receive Blue signal             */
-
-#define CTL12_RTPLLEN		0x80	/* Rx-to-Tx Payload Lpbk Lock ENbl */
-#define CTL12_RTPLOOP		0x40	/* Rx-to-Tx Payload Loopback       */
-#define CTL12_DLCB1		0x08	/* Data Link C-Bits forced to 1    */
-#define CTL12_C21		0x04	/* C2 forced to 1                  */
-#define CTL12_MCB1		0x02	/* Most C-Bits forced to 1         */
-
-#define CTL13_DFEXEC		0x40	/* Execute Double FEAC             */
-
-#define CTL14_FEAC10		0x80	/* Transmit FEAC word 10 times     */
-#define CTL14_RGCEN		0x20	/* Receive Gapped Clock Out Enbl   */
-#define CTL14_TGCEN		0x10	/* Timing Gen Gapped Clk Out Enbl  */
-
-#define FEAC_STK_MORE		0x80	/* FEAC stack has more FEACs       */
-#define FEAC_STK_VALID		0x40	/* FEAC stack is valid             */
-#define FEAC_STK_FEAC		0x3F	/* FEAC stack FEAC data            */
-
-#define STAT16_XERR		0x01	/* X-bit Error                     */
-#define STAT16_SEF		0x02    /* Severely Errored Frame          */
-#define STAT16_RTLOC		0x04	/* Rx/Tx Loss Of Clock             */
-#define STAT16_FEAC		0x08	/* new FEAC msg                    */
-#define STAT16_RIDL		0x10	/* channel IDLe signal             */
-#define STAT16_RAIS		0x20	/* Alarm Indication Signal         */
-#define STAT16_ROOF		0x40	/* Out Of Frame sync               */
-#define STAT16_RLOS		0x80	/* Loss Of Signal                  */
-
-#define CTL20_CVEN		0x01	/* Coding Violation Counter Enbl   */
-
-/* T1.107 Bit Oriented C-Bit Parity Far End Alarm Control and Status codes */
-#define T3BOP_OOF		0x00	/* Yellow alarm status             */
-#define T3BOP_LINE_UP		0x07	/* line loopback activate          */
-#define T3BOP_LINE_DOWN		0x1C	/* line loopback deactivate        */
-#define T3BOP_LOOP_DS3		0x1B	/* loopback full DS3               */
-#define T3BOP_IDLE		0x1A	/* IDLE alarm status               */
-#define T3BOP_AIS		0x16	/* AIS  alarm status               */
-#define T3BOP_LOS		0x0E	/* LOS  alarm status               */
-
-/* T1E1 regs;  RW=Read/Write;  RO=Read-Only;  RC=Read/Clr;  WO=Write-Only  */
-#define Bt8370_DID		0x000	/* RO: Device ID                   */
-#define Bt8370_CR0		0x001	/* RW; Primary Control Register    */
-#define Bt8370_JAT_CR		0x002	/* RW: Jitter Attenuator CR        */
-#define Bt8370_IRR		0x003	/* RO: Interrupt Request Reg       */
-#define Bt8370_ISR7		0x004	/* RC: Alarm 1 Interrupt Status    */
-#define Bt8370_ISR6		0x005	/* RC: Alarm 2 Interrupt Status    */
-#define Bt8370_ISR5		0x006	/* RC: Error Interrupt Status      */
-#define Bt8370_ISR4		0x007	/* RC; Cntr Ovfl Interrupt Status  */
-#define Bt8370_ISR3		0x008	/* RC: Timer Interrupt Status      */
-#define Bt8370_ISR2		0x009	/* RC: Data Link 1 Int Status      */
-#define Bt8370_ISR1		0x00A	/* RC: Data Link 2 Int Status      */
-#define Bt8370_ISR0		0x00B	/* RC: Pattrn Interrupt Status     */
-#define Bt8370_IER7		0x00C	/* RW: Alarm 1 Interrupt Enable    */
-#define Bt8370_IER6		0x00D	/* RW: Alarm 2 Interrupt Enable    */
-#define Bt8370_IER5		0x00E	/* RW: Error Interrupt Enable      */
-#define Bt8370_IER4		0x00F	/* RW: Cntr Ovfl Interrupt Enable  */
-
-#define Bt8370_IER3		0x010	/* RW: Timer Interrupt Enable      */
-#define Bt8370_IER2		0x011	/* RW: Data Link 1 Int Enable      */
-#define Bt8370_IER1		0x012	/* RW: Data Link 2 Int Enable      */
-#define Bt8370_IER0		0x013	/* RW: Pattern Interrupt Enable    */
-#define Bt8370_LOOP		0x014	/* RW: Loopback Config Reg         */
-#define Bt8370_DL3_TS		0x015	/* RW: External Data Link Channel  */
-#define Bt8370_DL3_BIT		0x016	/* RW: External Data Link Bit      */
-#define Bt8370_FSTAT		0x017	/* RO: Offline Framer Status       */
-#define Bt8370_PIO		0x018	/* RW: Programmable Input/Output   */
-#define Bt8370_POE		0x019	/* RW: Programmable Output Enable  */
-#define Bt8370_CMUX		0x01A	/* RW: Clock Input Mux             */
-#define Bt8370_TMUX		0x01B	/* RW: Test Mux Config             */
-#define Bt8370_TEST		0x01C	/* RW: Test Config                 */
-
-#define Bt8370_LIU_CR		0x020	/* RW: Line Intf Unit Config Reg   */
-#define Bt8370_RSTAT		0x021	/* RO; Receive LIU Status          */
-#define Bt8370_RLIU_CR		0x022	/* RW: Receive LIU Config          */
-#define Bt8370_LPF		0x023	/* RW: RPLL Low Pass Filter        */
-#define Bt8370_VGA_MAX		0x024	/* RW: Variable Gain Amplifier Max */
-#define Bt8370_EQ_DAT		0x025	/* RW: Equalizer Coeff Data Reg    */
-#define Bt8370_EQ_PTR		0x026	/* RW: Equzlizer Coeff Table Ptr   */
-#define Bt8370_DSLICE		0x027	/* RW: Data Slicer Threshold       */
-#define Bt8370_EQ_OUT		0x028	/* RW: Equalizer Output Levels     */
-#define Bt8370_VGA		0x029	/* RO: Variable Gain Ampl Status   */
-#define Bt8370_PRE_EQ		0x02A	/* RW: Pre-Equalizer               */
-
-#define Bt8370_COEFF0		0x030	/* RO: LMS Adj Eq Coeff Status     */
-#define Bt8370_GAIN0		0x038	/* RW: Equalizer Gain Thresh       */
-#define Bt8370_GAIN1		0x039	/* RW: Equalizer Gain Thresh       */
-#define Bt8370_GAIN2		0x03A	/* RW: Equalizer Gain Thresh       */
-#define Bt8370_GAIN3		0x03B	/* RW: Equalizer Gain Thresh       */
-#define Bt8370_GAIN4		0x03C	/* RW: Equalizer Gain Thresh       */
-
-#define Bt8370_RCR0		0x040	/* RW: Rx Configuration            */
-#define Bt8370_RPATT		0x041	/* RW: Rx Test Pattern Config      */
-#define Bt8370_RLB		0x042	/* RW: Rx Loopback Code Detr Conf  */
-#define Bt8370_LBA		0x043	/* RW: Loopback Activate Code Patt */
-#define Bt8370_LBD		0x044	/* RW: Loopback Deact Code Patt    */
-#define Bt8370_RALM		0x045	/* RW: Rx Alarm Signal Config      */
-#define Bt8370_LATCH		0x046	/* RW: Alarm/Err/Cntr Latch Config */
-#define Bt8370_ALM1		0x047	/* RO: Alarm 1 Status              */
-#define Bt8370_ALM2		0x048	/* RO: Alarm 2 Status              */
-#define Bt8370_ALM3		0x049	/* RO: Alarm 3 Status              */
-
-#define Bt8370_FERR_LO		0x050	/* RC: Framing Bit Error Cntr LSB  */
-#define Bt8370_FERR_HI		0x051	/* RC: Framing Bit Error Cntr MSB  */
-#define Bt8370_CRC_LO		0x052	/* RC: CRC    Error   Counter LSB  */
-#define Bt8370_CRC_HI		0x053	/* RC: CRC    Error   Counter MSB  */
-#define Bt8370_LCV_LO		0x054	/* RC: Line Code Viol Counter LSB  */
-#define Bt8370_LCV_HI		0x055	/* RC: Line Code Viol Counter MSB  */
-#define Bt8370_FEBE_LO		0x056	/* RC: Far End Block Err Cntr LSB  */
-#define Bt8370_FEBE_HI		0x057	/* RC: Far End Block Err Cntr MSB  */
-#define Bt8370_BERR_LO		0x058	/* RC: PRBS Bit Error Counter LSB  */
-#define Bt8370_BERR_HI		0x059	/* RC: PRBS Bit Error Counter MSB  */
-#define Bt8370_AERR		0x05A	/* RC: SEF/LOF/COFA counter        */
-#define Bt8370_RSA4		0x05B	/* RO: Rx Sa4 Byte Buffer          */
-#define Bt8370_RSA5		0x05C	/* RO: Rx Sa5 Byte Buffer          */
-#define Bt8370_RSA6		0x05D	/* RO: Rx Sa6 Byte Buffer          */
-#define Bt8370_RSA7		0x05E	/* RO: Rx Sa7 Byte Buffer          */
-#define Bt8370_RSA8		0x05F	/* RO: Rx Sa8 Byte Buffer          */
-
-#define Bt8370_SHAPE0		0x060	/* RW: Tx Pulse Shape Config       */
-#define Bt8370_TLIU_CR		0x068	/* RW: Tx LIU Config Reg           */
-
-#define Bt8370_TCR0		0x070	/* RW: Tx Framer Config            */
-#define Bt8370_TCR1		0x071	/* RW: Txter Configuration         */
-#define Bt8370_TFRM		0x072	/* RW: Tx Frame Format             */
-#define Bt8370_TERROR		0x073	/* RW: Tx Error Insert             */
-#define Bt8370_TMAN		0x074	/* RW: Tx Manual Sa/FEBE Config    */
-#define Bt8370_TALM		0x075	/* RW: Tx Alarm Signal Config      */
-#define Bt8370_TPATT		0x076	/* RW: Tx Test Pattern Config      */
-#define Bt8370_TLB		0x077	/* RW: Tx Inband Loopback Config   */
-#define Bt8370_LBP		0x078	/* RW: Tx Inband Loopback Patt     */
-#define Bt8370_TSA4		0x07B	/* RW: Tx Sa4 Byte Buffer          */
-#define Bt8370_TSA5		0x07C	/* RW: Tx Sa5 Byte Buffer          */
-#define Bt8370_TSA6		0x07D	/* RW: Tx Sa6 Byte Buffer          */
-#define Bt8370_TSA7		0x07E	/* RW: Tx Sa7 Byte Buffer          */
-#define Bt8370_TSA8		0x07F	/* RW: Tx Sa8 Byte Buffer          */
-
-#define Bt8370_CLAD_CR		0x090	/* RW: Clock Rate Adapter Config   */
-#define Bt8370_CSEL		0x091	/* RW: CLAD Frequency Select       */
-#define Bt8370_CPHASE		0x092	/* RW: CLAD Phase Det Scale Factor */
-#define Bt8370_CTEST		0x093	/* RW: CLAD Test                   */
-
-#define Bt8370_BOP		0x0A0	/* RW: Bit Oriented Protocol Xcvr  */
-#define Bt8370_TBOP		0x0A1	/* RW: Tx BOP Codeword             */
-#define Bt8370_RBOP		0x0A2	/* RO; Rx BOP Codeword             */
-#define Bt8370_BOP_STAT		0x0A3	/* RO: BOP Status                  */
-#define Bt8370_DL1_TS		0x0A4	/* RW: DL1 Time Slot Enable        */
-#define Bt8370_DL1_BIT		0x0A5	/* RW: DL1 Bit Enable              */
-#define Bt8370_DL1_CTL		0x0A6	/* RW: DL1 Control                 */
-#define Bt8370_RDL1_FFC		0x0A7	/* RW: RDL1 FIFO Fill Control      */
-#define Bt8370_RDL1		0x0A8	/* RO: RDL1 FIFO                   */
-#define Bt8370_RDL1_STAT	0x0A9	/* RO: RDL1 Status                 */
-#define Bt8370_PRM		0x0AA	/* RW: Performance Report Message  */
-#define Bt8370_TDL1_FEC		0x0AB	/* RW: TDL1 FIFO Empty Control     */
-#define Bt8370_TDL1_EOM		0x0AC	/* WO: TDL1 End Of Message Control */
-#define Bt8370_TDL1		0x0AD	/* RW: TDL1 FIFO                   */
-#define Bt8370_TDL1_STAT	0x0AE	/* RO: TDL1 Status                 */
-#define Bt8370_DL2_TS		0x0AF	/* RW: DL2 Time Slot Enable        */
-
-#define Bt8370_DL2_BIT		0x0B0	/* RW: DL2 Bit Enable              */
-#define Bt8370_DL2_CTL		0x0B1	/* RW: DL2 Control                 */
-#define Bt8370_RDL2_FFC		0x0B2	/* RW: RDL2 FIFO Fill Control      */
-#define Bt8370_RDL2		0x0B3	/* RO: RDL2 FIFO                   */
-#define Bt8370_RDL2_STAT	0x0B4	/* RO: RDL2 Status                 */
-#define Bt8370_TDL2_FEC		0x0B6	/* RW: TDL2 FIFO Empty Control     */
-#define Bt8370_TDL2_EOM		0x0B7	/* WO; TDL2 End Of Message Control */
-#define Bt8370_TDL2		0x0B8	/* RW: TDL2 FIFO                   */
-#define Bt8370_TDL2_STAT	0x0B9	/* RO: TDL2 Status                 */
-#define Bt8370_DL_TEST1		0x0BA	/* RW: DLINK Test Config           */
-#define Bt8370_DL_TEST2		0x0BB	/* RW: DLINK Test Status           */
-#define Bt8370_DL_TEST3		0x0BC	/* RW: DLINK Test Status           */
-#define Bt8370_DL_TEST4		0x0BD	/* RW: DLINK Test Control          */
-#define Bt8370_DL_TEST5		0x0BE	/* RW: DLINK Test Control          */
-
-#define Bt8370_SBI_CR		0x0D0	/* RW: System Bus Interface Config */
-#define Bt8370_RSB_CR		0x0D1	/* RW: Rx System Bus Config        */
-#define Bt8370_RSYNC_BIT	0x0D2	/* RW: Rx System Bus Sync Bit Offs */
-#define Bt8370_RSYNC_TS		0x0D3	/* RW: Rx System Bus Sync TS Offs  */
-#define Bt8370_TSB_CR		0x0D4	/* RW: Tx System Bus Config        */
-#define Bt8370_TSYNC_BIT	0x0D5	/* RW: Tx System Bus Sync Bit OFfs */
-#define Bt8370_TSYNC_TS		0x0D6	/* RW: Tx System Bus Sync TS Offs  */
-#define Bt8370_RSIG_CR		0x0D7	/* RW: Rx Siganalling Config       */
-#define Bt8370_RSYNC_FRM	0x0D8	/* RW: Sig Reinsertion Frame Offs  */
-#define Bt8370_SSTAT		0x0D9	/* RO: Slip Buffer Status          */
-#define Bt8370_STACK		0x0DA	/* RO: Rx Signalling Stack         */
-#define Bt8370_RPHASE		0x0DB	/* RO: RSLIP Phase Status          */
-#define Bt8370_TPHASE		0x0DC	/* RO: TSLIP Phase Status          */
-#define Bt8370_PERR		0x0DD	/* RO: RAM Parity Status           */
-
-#define Bt8370_SBCn		0x0E0	/* RW: System Bus Per-Channel Ctl  */
-#define Bt8370_TPCn		0x100	/* RW: Tx Per-Channel Control      */
-#define Bt8370_TSIGn		0x120	/* RW: Tx Signalling Buffer        */
-#define Bt8370_TSLIP_LOn	0x140	/* RW: Tx PCM Slip Buffer Lo       */
-#define Bt8370_TSLIP_HIn	0x160	/* RW: Tx PCM Slip Buffer Hi       */
-#define Bt8370_RPCn		0x180	/* RW: Rx Per-Channel Control      */
-#define Bt8370_RSIGn		0x1A0	/* RW: Rx Signalling Buffer        */
-#define Bt8370_RSLIP_LOn	0x1C0	/* RW: Rx PCM Slip Buffer Lo       */
-#define Bt8370_RSLIP_HIn	0x1E0	/* RW: Rx PCM Slip Buffer Hi       */
-
-/* Bt8370_LOOP (0x14) framer loopback control register bits */
-#define LOOP_ANALOG		0x01	/* inward  loop thru LIU           */
-#define LOOP_FRAMER		0x02	/* inward  loop thru framer        */
-#define LOOP_LINE		0x04	/* outward loop thru LIU           */
-#define LOOP_PAYLOAD		0x08	/* outward loop of payload         */
-#define LOOP_DUAL		0x06	/* inward framer + outward line    */
-
-/* Bt8370_ALM1 (0x47) receiver alarm status register bits */
-#define ALM1_SIGFRZ		0x01	/* Rx Signalling Freeze            */
-#define ALM1_RLOF		0x02	/* Rx loss of frame alignment      */
-#define ALM1_RLOS		0x04	/* Rx digital loss of signal       */
-#define ALM1_RALOS		0x08	/* Rx analog  loss of signal       */
-#define ALM1_RAIS		0x10	/* Rx Alarm Indication Signal      */
-#define ALM1_RYEL		0x40	/* Rx Yellow alarm indication      */
-#define ALM1_RMYEL		0x80	/* Rx multiframe YELLOW alarm      */
-
-/* Bt8370_ALM3 (0x49) receive framer status register bits */
-#define ALM3_FRED		0x04	/* Rx Out Of T1/FAS alignment      */
-#define ALM3_MRED		0x08	/* Rx Out Of MFAS alignment        */
-#define ALM3_SRED		0x10	/* Rx Out Of CAS alignment         */
-#define ALM3_SEF		0x20	/* Rx Severely Errored Frame       */
-#define ALM3_RMAIS		0x40	/* Rx TS16 AIS (CAS)               */
-
-/* Bt8370_TALM (0x75) transmit alarm control register bits */
-#define TALM_TAIS		0x01	/* Tx Alarm Indication Signal      */
-#define TALM_TYEL		0x02	/* Tx Yellow alarm                 */
-#define TALM_TMYEL		0x04	/* Tx Multiframe Yellow alarm      */
-#define TALM_AUTO_AIS		0x08	/* auto send AIS on LOS            */
-#define TALM_AUTO_YEL		0x10	/* auto send YEL on LOF            */
-#define TALM_AUTO_MYEL		0x20	/* auto send E1-Y16 on loss-of-CAS */
-
-/* 8370 BOP (Bit Oriented Protocol) command fragments */
-#define RBOP_OFF		0x00	/* BOP Rx disabled                 */
-#define RBOP_25			0xE0	/* BOP Rx requires 25 BOPs         */
-#define TBOP_OFF		0x00	/* BOP Tx disabled                 */
-#define TBOP_25			0x0B	/* BOP Tx sends 25 BOPs            */
-#define TBOP_CONT		0x0F	/* BOP Tx sends continuously       */
-
-/* T1.403 Bit-Oriented ESF Data-Link Message codes */
-#define T1BOP_OOF		0x00	/* Yellow alarm status             */
-#define T1BOP_LINE_UP		0x07	/* line loopback activate          */
-#define T1BOP_LINE_DOWN		0x1C	/* line loopback deactivate        */
-#define T1BOP_PAY_UP		0x0A	/* payload loopback activate       */
-#define T1BOP_PAY_DOWN		0x19	/* payload loopback deactivate     */
-#define T1BOP_NET_UP		0x09	/* network loopback activate       */
-#define T1BOP_NET_DOWN		0x12	/* network loopback deactivate     */
-
-/* Unix & Linux reserve 16 device-private IOCTLs */
-#if BSD
-# define LMCIOCGSTAT		_IOWR('i', 240, struct status)
-# define LMCIOCGCFG		_IOWR('i', 241, struct config)
-# define LMCIOCSCFG		 _IOW('i', 242, struct config)
-# define LMCIOCREAD		_IOWR('i', 243, struct ioctl)
-# define LMCIOCWRITE		 _IOW('i', 244, struct ioctl)
-# define LMCIOCTL		_IOWR('i', 245, struct ioctl)
-#elif defined(__linux__)  /* sigh */
-# define LMCIOCGSTAT		SIOCDEVPRIVATE+0
-# define LMCIOCGCFG		SIOCDEVPRIVATE+1
-# define LMCIOCSCFG		SIOCDEVPRIVATE+2
-# define LMCIOCREAD		SIOCDEVPRIVATE+3
-# define LMCIOCWRITE		SIOCDEVPRIVATE+4
-# define LMCIOCTL		SIOCDEVPRIVATE+5
-#endif
-
-struct iohdr				/* all LMCIOCs begin with this     */
-  {
-  char ifname[IFNAMSIZ];		/* interface name, e.g. "lmc0"     */
-  uint32_t cookie;			/* interface version number        */
-  u_int16_t direction;			/* missing in Linux IOCTL          */
-  u_int16_t length;			/* missing in Linux IOCTL          */
-  struct iohdr *iohdr;			/* missing in Linux IOCTL          */
-  uint32_t spare;			/* pad this struct to **32 bytes** */
-  };
-
-#define DIR_IO   0
-#define DIR_IOW  1			/* copy data user->kernel          */
-#define DIR_IOR  2			/* copy data kernel->user          */
-#define DIR_IOWR 3			/* copy data kernel<->user         */
-
-struct hssi_snmp
-  {
-  u_int16_t sigs;			/* MII16_HSSI & MII16_HSSI_MODEM   */
-  };
-
-struct ssi_snmp
-  {
-  u_int16_t sigs;			/* MII16_SSI & MII16_SSI_MODEM     */
-  };
-
-struct t3_snmp
-  {
-  u_int16_t febe;			/*  8 bits - Far End Block err cnt */
-  u_int16_t lcv;			/* 16 bits - BPV           err cnt */
-  u_int16_t pcv;			/*  8 bits - P-bit         err cnt */
-  u_int16_t ccv;			/*  8 bits - C-bit         err cnt */
-  u_int16_t line;			/* line status bit vector          */
-  u_int16_t loop;			/* loop status bit vector          */
-  };
-
-struct t1_snmp
-  {
-  u_int16_t prm[4];			/* T1.403 Performance Report Msg   */
-  u_int16_t febe;			/* 10 bits - E1 FAR CRC    err cnt */
-  u_int16_t lcv;			/* 16 bits - BPV + EXZ     err cnt */
-  u_int16_t fe;				/* 12 bits - Ft/Fs/FPS/FAS err cnt */
-  u_int16_t crc;			/* 10 bits - CRC6/CRC4     err cnt */
-  u_int16_t line;			/* line status bit vector          */
-  u_int16_t loop;			/* loop status bit vector          */
-  };
-
-/* SNMP trunk MIB Send codes */
-#define TSEND_NORMAL		   1	/* Send data (normal or looped)    */
-#define TSEND_LINE		   2	/* Send 'line loopback activate'   */
-#define TSEND_PAYLOAD		   3	/* Send 'payload loop activate'    */
-#define TSEND_RESET		   4	/* Send 'loopback deactivate'      */
-#define TSEND_QRS		   5	/* Send Quasi Random Signal        */
-
-/* ANSI T1.403 Performance Report Msg -- once a second from the far end    */
-#define T1PRM_FE		0x8000	/* Frame Sync Bit Error Event >= 1 */
-#define T1PRM_SE		0x4000	/* Severely Err Framing Event >= 1 */
-#define T1PRM_LB		0x2000	/* Payload Loopback Activated      */
-#define T1PRM_G1		0x1000	/* CRC Error Event = 1             */
-#define T1PRM_R			0x0800  /* Reserved                        */
-#define T1PRM_G2		0x0400	/* 1 < CRC Error Event <= 5        */
-#define T1PRM_SEQ		0x0300	/* modulo 4 counter                */
-#define T1PRM_G3		0x0080	/* 5 < CRC Error Event <= 10       */
-#define T1PRM_LV		0x0040	/* Line Code Violation Event >= 1  */
-#define T1PRM_G4		0x0020	/* 10 < CRC Error Event <= 100     */
-#define T1PRM_U			0x0018	/* Under study for synchronization */
-#define T1PRM_G5		0x0004	/* 100 < CRC Error Event <= 319    */
-#define T1PRM_SL		0x0002  /* Slip Event >= 1                 */
-#define T1PRM_G6		0x0001	/* CRC Error Event >= 320          */
-
-/* SNMP Line Status */
-#define TLINE_NORM		0x0001	/* no alarm present                */
-#define TLINE_RX_RAI		0x0002	/* receiving RAI = Yellow alarm    */
-#define TLINE_TX_RAI		0x0004	/* sending   RAI = Yellow alarm    */
-#define TLINE_RX_AIS		0x0008  /* receiving AIS =  blue  alarm    */
-#define TLINE_TX_AIS		0x0010	/* sending   AIS =  blue  alarm    */
-#define TLINE_LOF		0x0020	/* near end  LOF =   red  alarm    */
-#define TLINE_LOS		0x0040	/* near end loss of Signal         */
-#define TLINE_LOOP		0x0080	/* near end is looped              */
-#define T1LINE_RX_TS16_AIS	0x0100	/* near end receiving TS16 AIS     */
-#define T1LINE_RX_TS16_LOMF	0x0200	/* near end sending   TS16 LOMF    */
-#define T1LINE_TX_TS16_LOMF	0x0400	/* near end receiving TS16 LOMF    */
-#define T1LINE_RX_TEST		0x0800	/* near end receiving QRS Signal   */
-#define T1LINE_SEF		0x1000	/* near end severely errored frame */
-#define T3LINE_RX_IDLE		0x0100	/* near end receiving IDLE signal  */
-#define T3LINE_SEF		0x0200	/* near end severely errored frame */
-
-/* SNMP Loopback Status */
-#define TLOOP_NONE		0x01    /* no loopback                     */
-#define TLOOP_NEAR_PAYLOAD	0x02	/* near end payload loopback       */
-#define TLOOP_NEAR_LINE		0x04	/* near end line loopback          */
-#define TLOOP_NEAR_OTHER	0x08	/* near end looped somehow         */
-#define TLOOP_NEAR_INWARD	0x10	/* near end looped inward          */
-#define TLOOP_FAR_PAYLOAD	0x20	/* far  end payload loopback       */
-#define TLOOP_FAR_LINE		0x40	/* far  end line loopback          */
-
-/* event counters record interesting statistics */
-struct event_cntrs
-  {
-  struct timeval reset_time;		/* time when cntrs were reset      */
-  u_int64_t ibytes;			/* Rx bytes   with good status     */
-  u_int64_t obytes;			/* Tx bytes                        */
-  u_int64_t ipackets;			/* Rx packets with good status     */
-  u_int64_t opackets;			/* Tx packets                      */
-  uint32_t ierrors;			/* Rx packets with bad status      */
-  uint32_t oerrors;			/* Tx packets with bad status      */
-  uint32_t idiscards;			/* Rx packets discarded            */
-  uint32_t odiscards;			/* Tx packets discarded            */
-  uint32_t fifo_over;			/* Rx fifo overruns                */
-  uint32_t fifo_under;			/* Tx fifo underruns               */
-  uint32_t missed;			/* Rx pkts missed: no DMA descs    */
-  uint32_t overruns;			/* Rx pkts missed: fifo overrun    */
-  uint32_t fdl_pkts;			/* Rx T1 Facility Data Link pkts   */
-  uint32_t crc_errs;			/* Rx T1 frame CRC errors          */
-  uint32_t lcv_errs;			/* Rx T1 T3 Line Coding Violation  */
-  uint32_t frm_errs;			/* Rx T1 T3 Frame bit errors       */
-  uint32_t febe_errs;			/* Rx T1 T3 Far End Bit Errors     */
-  uint32_t par_errs;			/* Rx T3 P-bit parity errors       */
-  uint32_t cpar_errs;			/* Rx T3 C-bit parity errors       */
-  uint32_t mfrm_errs;			/* Rx T3 Multi-frame bit errors    */
-  uint32_t rxdma;			/* Rx out of kernel buffers        */
-  uint32_t txdma;			/* Tx out of DMA desciptors        */
-  uint32_t lck_watch;			/* try_lock conflict in watchdog   */
-  uint32_t lck_ioctl;			/* try_lock conflict in ioctl      */
-  uint32_t lck_intr;			/* try_lock conflict in interrupt  */
-  };
-
-/* sc->status is the READ ONLY status of the card.                         */
-/* Accessed using socket IO control calls or netgraph control messages.    */
-struct status
-  {
-  struct iohdr iohdr;			/* common ioctl header             */
-  uint32_t card_type;			/* PCI device number               */
-  u_int16_t ieee[3];			/* IEEE MAC-addr from Tulip SROM   */
-  u_int16_t oper_status;		/* actual state:  up, down, test   */
-  uint32_t tx_speed;			/* measured TX bits/sec            */
-  uint32_t cable_type;			/* SSI only: cable type            */
-  uint32_t line_pkg;			/* actual line pkg in use          */
-  uint32_t line_prot;			/* actual line proto in use        */
-  uint32_t ticks;			/* incremented by watchdog @ 1 Hz  */
-  struct event_cntrs cntrs;		/* event counters                  */
-  union
-    {
-    struct hssi_snmp hssi;		/* data for RFC-???? HSSI MIB      */
-    struct t3_snmp t3;			/* data for RFC-2496 T3 MIB        */
-    struct ssi_snmp ssi;		/* data for RFC-1659 RS232 MIB     */
-    struct t1_snmp t1;			/* data for RFC-2495 T1 MIB        */
-    } snmp;
-  };
-
-/* line protocol package codes                                       fnobl */
-#define PKG_RAWIP		   1	/* driver                    yyyyy */
-#define PKG_SPPP		   2	/* fbsd, nbsd, obsd          yyynn */
-#define PKG_P2P			   3	/* bsd/os                    nnnyn */
-#define PKG_NG			   4	/* fbsd                      ynnnn */
-#define PKG_GEN_HDLC		   5	/* linux                     nnnny */
-
-/* line protocol codes                                               fnobl */
-#define PROT_PPP		   1	/* Point-to-Point Protocol   yyyyy */
-#define PROT_C_HDLC		   2	/* Cisco HDLC Protocol       yyyyy */
-#define PROT_FRM_RLY		   3	/* Frame Relay Protocol      ynnyy */
-#define PROT_X25		   4	/* X.25/LAPB Protocol        nnnny */
-#define PROT_ETH_HDLC		   5	/* raw Ether pkts in HDLC    nnnny */
-#define PROT_IP_HDLC		   6	/* raw IP4/6 pkts in HDLC    yyyyy */
-
-/* oper_status codes (same as SNMP status codes) */
-#define STATUS_UP		   1	/* may/will    tx/rx pkts          */
-#define STATUS_DOWN		   2	/* can't/won't tx/rx pkts          */
-#define STATUS_TEST		   3	/* currently not used              */
-
-struct synth				/* programmable oscillator params  */
-  {
-  unsigned n :7;			/*   numerator (3..127)            */
-  unsigned m :7;			/* denominator (3..127)            */
-  unsigned v :1;			/* mul by 1|8                      */
-  unsigned x :2;			/* div by 1|2|4|8                  */
-  unsigned r :2;			/* div by 1|2|4|8                  */
-  unsigned prescale :13;		/* log(final divisor): 2, 4 or 9   */
-  } __attribute__ ((packed));
-
-#define SYNTH_FREF	        20e6	/* reference xtal =  20 MHz        */
-#define SYNTH_FMIN	        50e6	/* internal VCO min  50 MHz        */
-#define SYNTH_FMAX	       250e6	/* internal VCO max 250 MHz        */
-
-/* sc->config is the READ/WRITE configuration of the card.                 */
-/* Accessed using socket IO control calls or netgraph control messages.    */
-struct config
-  {
-  struct iohdr iohdr;			/* common ioctl header             */
-  uint32_t crc_len;			/* ALL: CRC-16 or CRC-32 or none   */
-  uint32_t loop_back;			/* ALL: many kinds of loopbacks    */
-  uint32_t tx_clk_src;			/* T1, HSSI: ST, RT, int, ext      */
-  uint32_t format;			/* T3, T1: ckt framing format      */
-  uint32_t time_slots;			/* T1: 64Kb time slot config       */
-  uint32_t cable_len;			/* T3, T1: cable length in meters  */
-  uint32_t scrambler;			/* T3: payload scrambler config    */
-  uint32_t dte_dce;			/* SSI, HSSIc: drive TXCLK         */
-  struct synth synth;			/* SSI, HSSIc: synth oscil params  */
-  uint32_t rx_gain;			/* T1: receiver gain limit 0-50 dB */
-  uint32_t tx_pulse;			/* T1: transmitter pulse shape     */
-  uint32_t tx_lbo;			/* T1: transmitter atten 0-22.5 dB */
-  uint32_t debug;			/* ALL: extra printout             */
-  uint32_t line_pkg;			/* ALL:  use this line pkg         */
-  uint32_t line_prot;			/* SPPP: use this line proto       */
-  uint32_t keep_alive;			/* SPPP: use keep-alive packets    */
-  };
-
-#define CFG_CRC_0		   0	/* no CRC                          */
-#define CFG_CRC_16		   2    /* X^16+X^12+X^5+1 (default)       */
-#define CFG_CRC_32		   4	/* X^32+X^26+X^23+X^22+X^16+X^12+  */
-					/* X^11+X^10+X^8+X^7+X^5+X^4+X^2+X+1 */
-#define CFG_LOOP_NONE		   1	/* SNMP don't loop back anything   */
-#define CFG_LOOP_PAYLOAD	   2    /* SNMP loop outward thru framer   */
-#define CFG_LOOP_LINE		   3	/* SNMP loop outward thru LIU      */
-#define CFG_LOOP_OTHER		   4	/* SNMP loop  inward thru LIU      */
-#define CFG_LOOP_INWARD		   5	/* SNMP loop  inward thru framer   */
-#define CFG_LOOP_DUAL		   6	/* SNMP loop  inward & outward     */
-#define CFG_LOOP_TULIP		  16	/* ALL: loop  inward thru Tulip    */
-#define CFG_LOOP_PINS		  17	/* HSSIc, SSI: loop inward-pins    */
-#define CFG_LOOP_LL		  18	/* HSSI, SSI: assert LA/LL mdm pin */
-#define CFG_LOOP_RL		  19	/* HSSI, SSI: assert LB/RL mdm pin */
-
-#define CFG_CLKMUX_ST		   1	/* TX clk <- Send timing           */
-#define CFG_CLKMUX_INT		   2	/* TX clk <- internal source       */
-#define CFG_CLKMUX_RT		   3	/* TX clk <- Receive (loop) timing */
-#define CFG_CLKMUX_EXT		   4    /* TX clk <- ext connector         */
-
-/* values 0-31 are Bt8370 CR0 register values (LSB is zero if E1).         */
-/* values 32-99 are reserved for other T1E1 formats, (even number if E1)   */
-/* values 100 and up are used for T3 frame formats.                        */
-#define CFG_FORMAT_T1SF		   9	/* T1-SF          AMI              */
-#define CFG_FORMAT_T1ESF	  27	/* T1-ESF+CRC     B8ZS     X^6+X+1 */
-#define CFG_FORMAT_E1FAS	   0	/* E1-FAS         HDB3 TS0         */
-#define CFG_FORMAT_E1FASCRC	   8	/* E1-FAS+CRC     HDB3 TS0 X^4+X+1 */
-#define CFG_FORMAT_E1FASCAS	  16	/* E1-FAS    +CAS HDB3 TS0 & TS16  */
-#define CFG_FORMAT_E1FASCRCCAS	  24	/* E1-FAS+CRC+CAS HDB3 TS0 & TS16  */
-#define CFG_FORMAT_E1NONE	  32	/* E1-NO framing  HDB3             */
-#define CFG_FORMAT_T3CPAR	 100	/* T3-C-Bit par   B3ZS             */
-#define CFG_FORMAT_T3M13	 101	/* T3-M13 format  B3ZS             */
-
-/* format aliases that improve code readability */
-#define FORMAT_T1ANY		((sc->config.format & 1)==1)
-#define FORMAT_E1ANY		((sc->config.format & 1)==0)
-#define FORMAT_E1CAS		((sc->config.format & 0x11)==0x10)
-#define FORMAT_E1CRC		((sc->config.format & 0x09)==0x08)
-#define FORMAT_E1NONE		 (sc->config.format == CFG_FORMAT_E1NONE)
-#define FORMAT_T1ESF		 (sc->config.format == CFG_FORMAT_T1ESF)
-#define FORMAT_T1SF		 (sc->config.format == CFG_FORMAT_T1SF)
-#define FORMAT_T3CPAR		 (sc->config.format == CFG_FORMAT_T3CPAR)
-
-#define CFG_SCRAM_OFF		   1	/* DS3 payload scrambler off       */
-#define CFG_SCRAM_DL_KEN	   2	/* DS3 DigitalLink/Kentrox X^43+1  */
-#define CFG_SCRAM_LARS		   3	/* DS3 Larscom X^20+X^17+1 w/28ZS  */
-
-#define CFG_DTE			   1	/* HSSIc, SSI: rcv TXCLK; rcv DCD  */
-#define CFG_DCE			   2	/* HSSIc, SSI: drv TXCLK; drv DCD  */
-
-#define CFG_GAIN_SHORT		0x24	/* 0-20 dB of equalized gain       */
-#define CFG_GAIN_MEDIUM		0x2C	/* 0-30 dB of equalized gain       */
-#define CFG_GAIN_LONG		0x34	/* 0-40 dB of equalized gain       */
-#define CFG_GAIN_EXTEND		0x3F	/* 0-64 dB of equalized gain       */
-#define CFG_GAIN_AUTO		0xFF	/* auto-set based on cable length  */
-
-#define CFG_PULSE_T1DSX0	   0	/* T1 DSX   0- 40 meters           */
-#define CFG_PULSE_T1DSX1	   2	/* T1 DSX  40- 80 meters           */
-#define CFG_PULSE_T1DSX2	   4	/* T1 DSX  80-120 meters           */
-#define CFG_PULSE_T1DSX3	   6	/* T1 DSX 120-160 meters           */
-#define CFG_PULSE_T1DSX4	   8	/* T1 DSX 160-200 meters           */
-#define CFG_PULSE_E1COAX	  10	/* E1  75 ohm coax pair            */
-#define CFG_PULSE_E1TWIST	  12	/* E1 120 ohm twisted pairs        */
-#define CFG_PULSE_T1CSU		  14	/* T1 CSU 200-2000 meters; set LBO */
-#define CFG_PULSE_AUTO		0xFF	/* auto-set based on cable length  */
-
-#define CFG_LBO_0DB		   0	/* T1CSU LBO =  0.0 dB; FCC opt A  */
-#define CFG_LBO_7DB		  16	/* T1CSU LBO =  7.5 dB; FCC opt B  */
-#define CFG_LBO_15DB		  32	/* T1CSU LBO = 15.0 dB; FCC opt C  */
-#define CFG_LBO_22DB		  48	/* T1CSU LBO = 22.5 dB; final span */
-#define CFG_LBO_AUTO		0xFF	/* auto-set based on cable length  */
-
-struct ioctl
-  {
-  struct iohdr iohdr;			/* common ioctl header             */
-  uint32_t cmd;			/* command			   */
-  uint32_t address;			/* command address                 */
-  uint32_t data;			/* command data                    */
-  char *ucode;				/* user-land address of ucode      */
-  };
-
-#define IOCTL_RW_PCI		   1	/* RW: Tulip PCI config registers  */
-#define IOCTL_RW_CSR		   2	/* RW: Tulip Control & Status Regs */
-#define IOCTL_RW_SROM		   3	/* RW: Tulip Serial Rom            */
-#define IOCTL_RW_BIOS		   4	/* RW: Tulip Boot rom              */
-#define IOCTL_RW_MII		   5	/* RW: MII registers               */
-#define IOCTL_RW_FRAME		   6	/* RW: Framer registers            */
-#define IOCTL_WO_SYNTH		   7	/* WO: Synthesized oscillator      */
-#define IOCTL_WO_DAC		   8	/* WO: Digital/Analog Converter    */
-
-#define IOCTL_XILINX_RESET	  16	/* reset Xilinx: all FFs set to 0  */
-#define IOCTL_XILINX_ROM	  17	/* load  Xilinx program from ROM   */
-#define IOCTL_XILINX_FILE	  18	/* load  Xilinx program from file  */
-
-#define IOCTL_SET_STATUS	  50	/* set mdm ctrl bits (internal use)*/
-#define IOCTL_SNMP_SEND		  51	/* trunk MIB send code             */
-#define IOCTL_SNMP_LOOP		  52	/* trunk MIB loop configuration    */
-#define IOCTL_SNMP_SIGS		  53	/* RS232-like modem control sigs   */
-#define IOCTL_RESET_CNTRS	  54	/* reset event counters            */
-
-/* storage for these strings is allocated here! */
-const char *ssi_cables[] =
-  {
-  "V.10/EIA423",
-  "V.11/EIA530A",
-  "RESERVED",
-  "X.21",
-  "V.35",
-  "V.36/EIA449",
-  "V.28/EIA232",
-  "NO CABLE",
-  NULL,
-  };
-
-/***************************************************************************/
-/*    Declarations above here are shared with the user lmcconfig program.  */
-/*    Declarations below here are private to the kernel device driver.     */
-/***************************************************************************/
-
-#if (_KERNEL || KERNEL || __KERNEL__)
-
-#define SNDQ_MAXLEN	32	/* packets awaiting transmission */
-#define DESCS_PER_PKT	 4	/* DMA descriptors per TX pkt */
-#define	NUM_TX_DESCS	(DESCS_PER_PKT * SNDQ_MAXLEN)
-/* Increase DESCS_PER_PKT if status.cntrs.txdma increments. */
-
-/* A Tulip DMA descriptor can point to two chunks of memory.
- * Each chunk has a max length of 2047 bytes (ask the VMS guys...).
- * 2047 isn't a multiple of a cache line size (32 bytes typically).
- * So back off to 2048-32 = 2016 bytes per chunk (2 chunks per descr).
- */
-#define MAX_CHUNK_LEN	2016
-#define MAX_DESC_LEN	(2 * MAX_CHUNK_LEN)
-
-/* Tulip DMA descriptor; THIS STRUCT MUST MATCH THE HARDWARE */
-struct dma_desc
-  {
-  uint32_t status;		/* hardware->to->software */
-#if (BYTE_ORDER == LITTLE_ENDIAN) /* left-to-right packing by compiler */
-  unsigned  length1:11;		/* buffer1 length */
-  unsigned  length2:11;		/* buffer2 length */
-  unsigned  control:10;		/* software->to->hardware */
-#else /* right-to-left packing by compiler */
-  unsigned  control:10;		/* software->to->hardware */
-  unsigned  length2:11;		/* buffer2 length */
-  unsigned  length1:11;		/* buffer1 length */
-#endif
-  uint32_t address1;		/* buffer1 bus address */
-  uint32_t address2;		/* buffer2 bus address */
-#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
-  bus_dmamap_t map;		/* bus dmamap for this descriptor */
-# define TLP_BUS_DSL_VAL	(sizeof(bus_dmamap_t) & TLP_BUS_DSL)
-#else
-# define TLP_BUS_DSL_VAL	0
-#endif
-  } __attribute__ ((packed));
-
-/* Tulip DMA descriptor status bits */
-#define TLP_DSTS_OWNER		0x80000000
-#define TLP_DSTS_RX_DESC_ERR	0x00004000
-#define TLP_DSTS_RX_FIRST_DESC	0x00000200
-#define TLP_DSTS_RX_LAST_DESC	0x00000100
-#define TLP_DSTS_RX_MII_ERR	0x00000008
-#define TLP_DSTS_RX_DRIBBLE	0x00000004
-#define TLP_DSTS_TX_UNDERRUN	0x00000002
-#define TLP_DSTS_RX_OVERRUN	0x00000001  /* not documented in rev AF */
-#define TLP_DSTS_RX_BAD		(TLP_DSTS_RX_MII_ERR  | \
-				 TLP_DSTS_RX_DRIBBLE  | \
-				 TLP_DSTS_RX_DESC_ERR | \
-				 TLP_DSTS_RX_OVERRUN)
-
-/* Tulip DMA descriptor control bits */
-#define TLP_DCTL_TX_INTERRUPT	0x0200
-#define TLP_DCTL_TX_LAST_SEG	0x0100
-#define TLP_DCTL_TX_FIRST_SEG	0x0080
-#define TLP_DCTL_TX_NO_CRC	0x0010
-#define TLP_DCTL_END_RING	0x0008
-#define TLP_DCTL_TX_NO_PAD	0x0002
-
-/* DMA descriptors are kept in a ring.
- * Ring is empty when (read == write).
- * Ring is full  when (read == wrap(write+1)),
- * The ring also contains a tailq of data buffers.
- */
-struct desc_ring
-  {
-  struct dma_desc *read;	/* next  descriptor to be read */
-  struct dma_desc *write;	/* next  descriptor to be written */
-  struct dma_desc *first;	/* first descriptor in ring */
-  struct dma_desc *last;	/* last  descriptor in ring */
-  struct dma_desc *temp;	/* temporary write pointer for tx */
-  uint32_t dma_addr;		/* bus address for desc array */
-  int size_descs;		/* bus_dmamap_sync needs this */
-  int num_descs;		/* used to set rx quota */
-#ifdef __linux__
-  struct sk_buff *head;		/* tail-queue of skbuffs */
-  struct sk_buff *tail;
-#elif BSD
-  struct mbuf *head;		/* tail-queue of mbufs */
-  struct mbuf *tail;
-# if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
-  bus_dma_tag_t tag;		/* bus_dma tag for desc array */
-  bus_dmamap_t map;		/* bus_dma map for desc array */
-  bus_dma_segment_t segs[2];	/* bus_dmamap_load() or bus_dmamem_alloc() */
-  int nsegs;			/* bus_dmamap_load() or bus_dmamem_alloc() */
-# endif
-#endif
-  };
-
-/* break circular definition */
-typedef struct softc softc_t;
-
-/* card-dependent methods */
-struct card
-  {
-  void (* config)(softc_t *);
-  void (* ident)(softc_t *);
-  int  (* watchdog)(softc_t *);		/* must not sleep */
-  int  (* ioctl)(softc_t *, struct ioctl *); /* can sleep */
-  };
-
-/* flag bits in sc->flags */
-#define FLAG_IFNET		0x00000002  /* IFNET is attached           */
-#define FLAG_NETDEV		0x00000004  /* NETDEV is registered        */
-#define FLAG_NETGRAPH		0x00000008  /* NETGRAPH is attached        */
-
-/* Accessing Tulip CSRs:
- * There are two ways: IO instruction (default) and memory reference.
- *  IO refs are used if IOREF_CSR is defined; otherwise memory refs are used.
- *  MEMORY REFERENCES DO NOT WORK in BSD/OS: page faults happen.
- */
-#define IOREF_CSR 1  /* access Tulip CSRs with IO cycles if 1 */
-
-#if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
-# define DEV_POLL 1
-#else
-# define DEV_POLL 0
-#endif
-
-#if defined(ALTQ) && ALTQ
-# define ALTQ_PRESENT 1
-#else
-# define ALTQ_PRESENT 0
-#endif
-
-/* This is the instance data, or "software context" for the device driver. */
-/* NetBSD, OpenBSD and BSD/OS want struct device first in the softc. */
-/* FreeBSD wants struct ifnet first in the softc. */
-struct softc
-  {
-#if (defined(__NetBSD__) || defined(__OpenBSD__))
-  struct device	dev;		/* base device -- must be first in softc   */
-  pcitag_t	pa_tag;		/* pci_conf_read/write need this           */
-  pci_chipset_tag_t pa_pc;	/* pci_conf_read/write need this           */
-  bus_dma_tag_t	pa_dmat;	/* bus_dma needs this                      */
-  bus_space_tag_t csr_tag;	/* bus_space needs this                    */
-  bus_space_handle_t csr_handle;/* bus_space needs this                    */
-  pci_intr_handle_t intr_handle;/* interrupt handle                        */
-  void		*irq_cookie;	/* pci_intr_disestablish needs this        */
-  void		*sdh_cookie;	/* shutdownhook_disestablish needs this    */
-  struct simplelock top_lock;	/* lock card->watchdog vs core_ioctl       */
-  struct simplelock bottom_lock;/* lock for buf queues & descriptor rings  */
-  struct mbuf	*tx_mbuf;	/* hang mbuf here while building dma descs */
-#endif  /* __NetBSD__ || __OpenBSD__ */
-
-#ifdef __bsdi__
-  struct device	dev;		/* base device -- must be first in softc   */
-  struct isadev	id;		/* bus resource                            */
-  struct intrhand ih;		/* interrupt vectoring                     */
-  struct atshutdown ats;	/* shutdown hook                           */
-  pci_devaddr_t	cfgbase;	/* base address of PCI config regs         */
-  u_int16_t	 csr_iobase;	/*     io base address of Tulip CSRs       */
-  uint32_t	*csr_membase;	/* kv mem base address of Tulip CSRs       */
-  struct simplelock top_lock;	/* lock card->watchdog vs core_ioctl       */
-  struct simplelock bottom_lock;/* lock for buf queues & descriptor rings  */
-  struct mbuf	*tx_mbuf;	/* hang mbuf here while building dma descs */
-#endif /* __bsdi__ */
-
-  /* State for kernel-resident Line Protocols */
-#if IFNET
-  struct ifnet *ifp;
-  struct ifmedia ifm;		/* hooks for ifconfig(8) */
-# if NSPPP
-#  if (__FreeBSD_version < 600000)
-  struct sppp spppcom;		/* must be first in sc for fbsd < 6 */
-#  endif
-  struct sppp *sppp;
-# elif P2P
-  struct p2pcom p2pcom;
-  struct p2pcom *p2p;
-# elif (__FreeBSD_version < 600000)
-  struct ifnet ifnet;		/* must be first in sc for fbsd < 6 */
-# endif
-#endif
-
-#ifdef __linux__
-# if GEN_HDLC
-  hdlc_device	*hdlc_dev;	/* state for HDLC code                     */
-  sync_serial_settings hdlc_settings; /* state set by sethdlc program      */
-# else
-  struct net_device_stats net_stats; /* linux_stats storage                */
-# endif
-#endif
-
-#if NETGRAPH
-  node_p	ng_node;	/* pointer to our node struct              */
-  hook_p	ng_hook;	/* non-zero means NETGRAPH owns device     */
-# if (__FreeBSD_version >= 503000)
-  struct ifaltq	ng_sndq;
-  struct ifaltq ng_fastq;
-# else
-  struct ifqueue ng_sndq;
-  struct ifqueue ng_fastq;
-# endif
-#endif
-
-#ifdef __FreeBSD__
-  struct callout callout;	/* watchdog needs this                  */
-  struct device	*dev;		/* base device pointer                     */
-  bus_space_tag_t csr_tag;	/* bus_space needs this                    */
-  bus_space_handle_t csr_handle;/* bus_space_needs this                    */
-  void		*irq_cookie;	/* bus_teardown_intr needs this            */
-  struct resource *irq_res;	/* bus_release_resource needs this         */
-  int		irq_res_id;	/* bus_release_resource needs this         */
-  struct resource *csr_res;	/* bus_release_resource needs this         */
-  int		csr_res_id;	/* bus_release resource needs this         */
-  int		csr_res_type;	/* bus_release resource needs this         */
-  struct mbuf	*tx_mbuf;	/* hang mbuf here while building dma descs */
-# ifdef DEVICE_POLLING
-  int		quota;		/* used for incoming packet flow control   */
-# endif
-# if (__FreeBSD_version >= 500000)
-  struct mtx	top_mtx;	/* lock card->watchdog vs core_ioctl       */
-  struct mtx	bottom_mtx;	/* lock for buf queues & descriptor rings  */
-# else /* FreeBSD-4 */
-  int		top_spl;	/* lock card->watchdog vs core_ioctl       */
-  int		bottom_spl;	/* lock for buf queues & descriptor rings  */
-# endif
-#endif /* __FreeBSD__ */
-
-#ifdef __linux__
-  struct pci_dev    *pci_dev;	/* READ/WRITE_PCI_CFG macros need this     */
-  struct net_device *net_dev;	/* NAME_UNIT macro needs this              */
-  struct timer_list wd_timer;	/* timer calls watchdog() once a second    */
-  uint32_t	 csr_iobase;	/*     io base address of Tulip CSRs       */
-  void		*csr_membase;	/* kv mem base address of Tulip CSRs       */
-  struct sk_buff *tx_skb;	/* hang skb here while building dma descs  */
-  int		quota;		/* used for incoming packet flow control   */
-  struct semaphore top_lock;	/* lock card->watchdog vs core_ioctl       */
-  spinlock_t	bottom_lock;	/* lock for buf queues & descriptor rings  */
-#endif  /* __linux__ */
-
-  /* Top-half state used by all card types; lock with top_lock,            */
-  const char	*dev_desc;	/* string describing type of board         */
-  struct status status;		/* driver status lmcconfig can read        */
-  struct config	config;		/* driver config lmcconfig can read/write  */
-  struct card	*card;		/* card methods: config, ioctl, watchdog   */
-  uint32_t	gpio_dir;	/* s/w copy of GPIO direction register     */
-  u_int16_t	led_state;	/* last value written to mii16             */
-  uint32_t	flags;		/* driver-global flags                     */
-
-  /* Top-half state used by card-specific watchdogs; lock with top_lock.   */
-  uint32_t	last_mii16;	/* SSI, HSSI: MII reg 16 one second ago    */
-  uint32_t	last_stat16;	/* T3:     framer reg 16 one second ago    */
-  uint32_t	last_alm1;	/* T1E1:   framer reg 47 one second ago    */
-  uint32_t	last_FEAC;	/* last FEAC msg code received             */
-  uint32_t	loop_timer;	/* seconds until loopback expires          */
-
-  /* Bottom-half state used by the interrupt code; lock with bottom_lock.  */
-  struct desc_ring txring;	/* tx descriptor ring state                */
-  struct desc_ring rxring;	/* rx descriptor ring state                */
-  };  /* end of softc */
-
-/* Hide the minor differences between OS versions */
-
-#ifdef __FreeBSD__
-  typedef void intr_return_t;
-# define  READ_PCI_CFG(sc, addr)       pci_read_config ((sc)->dev, addr, 4)
-# define WRITE_PCI_CFG(sc, addr, data) pci_write_config((sc)->dev, addr, data, 4)
-# define  READ_CSR(csr)		bus_space_read_4 (sc->csr_tag, sc->csr_handle, csr)
-# define WRITE_CSR(csr, val)	bus_space_write_4(sc->csr_tag, sc->csr_handle, csr, val)
-# define NAME_UNIT		device_get_nameunit(sc->dev)
-# define DRIVER_DEBUG		((sc->config.debug) || (sc->ifp->if_flags & IFF_DEBUG))
-# if (__FreeBSD_version >= 500000)
-#  define TOP_TRYLOCK		mtx_trylock(&sc->top_mtx)
-#  define TOP_UNLOCK		mtx_unlock (&sc->top_mtx)
-#  define BOTTOM_TRYLOCK	mtx_trylock(&sc->bottom_mtx)
-#  define BOTTOM_UNLOCK		mtx_unlock (&sc->bottom_mtx)
-#  if (__FreeBSD_version >= 700000)
-#   define CHECK_CAP		priv_check(curthread, PRIV_DRIVER)
-#  else
-#   define CHECK_CAP		suser(curthread)
-#  endif
-# else /* FreeBSD-4 */
-#  define TOP_TRYLOCK		(sc->top_spl = splimp())
-#  define TOP_UNLOCK		splx(sc->top_spl)
-#  define BOTTOM_TRYLOCK	1 /* giant_lock protects */
-#  define BOTTOM_UNLOCK		/* nothing */
-#  define CHECK_CAP		suser(curproc)
-# endif
-# define DISABLE_INTR		/* nothing */
-# define ENABLE_INTR		/* nothing */
-# define IRQ_NONE		/* nothing */
-# define IRQ_HANDLED		/* nothing */
-# define IFP2SC(ifp)		(ifp)->if_softc
-# define COPY_BREAK		MHLEN
-# define SLEEP(usecs)		tsleep(sc, PCATCH | PZERO, DEVICE_NAME, 1+(usecs/tick))
-# define DMA_SYNC(map, size, flags) bus_dmamap_sync(ring->tag, map, flags)
-# define DMA_LOAD(map, addr, size)  bus_dmamap_load(ring->tag, map, addr, size, fbsd_dmamap_load, ring, 0)
-# if (NBPFILTER != 0)
-#  if (__FreeBSD_version >= 500000)
-#   define LMC_BPF_MTAP(mbuf)	BPF_MTAP(sc->ifp, mbuf)
-#  else  /* FreeBSD-4 */
-#   define LMC_BPF_MTAP(mbuf)	if (sc->ifp->if_bpf) bpf_mtap(sc->ifp, mbuf)
-#  endif
-#  define LMC_BPF_ATTACH(dlt, len) bpfattach(sc->ifp, dlt, len)
-#  define LMC_BPF_DETACH	   bpfdetach(sc->ifp)
-# endif
-# if (__FreeBSD_version >= 500000)
-#  define IF_DROP(ifq)		_IF_DROP(ifq)
-#  define IF_QFULL(ifq)		_IF_QFULL(ifq)
-# endif
-# if (__FreeBSD_version < 500000)
-#  define INTR_MPSAFE		0
-#  define BUS_DMA_COHERENT	0
-# endif
-# if (__FreeBSD_version >= 600000)
-#  define IFF_RUNNING		IFF_DRV_RUNNING
-# endif
-#endif  /* __FreeBSD__ */
-
-#ifdef __NetBSD__
-  typedef int intr_return_t;
-# define  READ_PCI_CFG(sc, addr)       pci_conf_read ((sc)->pa_pc, (sc)->pa_tag, addr)
-# define WRITE_PCI_CFG(sc, addr, data) pci_conf_write((sc)->pa_pc, (sc)->pa_tag, addr, data)
-# define  READ_CSR(csr)		bus_space_read_4 (sc->csr_tag, sc->csr_handle, csr)
-# define WRITE_CSR(csr, val)	bus_space_write_4(sc->csr_tag, sc->csr_handle, csr, val)
-# define NAME_UNIT		sc->dev.dv_xname
-# define DRIVER_DEBUG		((sc->config.debug) || (sc->ifp->if_flags & IFF_DEBUG))
-# define TOP_TRYLOCK		simple_lock_try(&sc->top_lock)
-# define TOP_UNLOCK		simple_unlock  (&sc->top_lock)
-# define BOTTOM_TRYLOCK		simple_lock_try(&sc->bottom_lock)
-# define BOTTOM_UNLOCK		simple_unlock  (&sc->bottom_lock)
-# define CHECK_CAP		suser(curproc->p_ucred, &curproc->p_acflag)
-# define DISABLE_INTR		int spl = splnet()
-# define ENABLE_INTR		splx(spl)
-# define IRQ_NONE		0
-# define IRQ_HANDLED		1
-# define IFP2SC(ifp)		(ifp)->if_softc
-# define COPY_BREAK		MHLEN
-# define SLEEP(usecs)		tsleep(sc, PCATCH | PZERO, DEVICE_NAME, 1+(usecs/tick))
-# define DMA_SYNC(map, size, flags) bus_dmamap_sync(ring->tag, map, 0, size, flags)
-# define DMA_LOAD(map, addr, size)  bus_dmamap_load(ring->tag, map, addr, size, 0, BUS_DMA_NOWAIT)
-# if (NBPFILTER != 0)
-#  define LMC_BPF_MTAP(mbuf)	if (sc->ifp->if_bpf) bpf_mtap(sc->ifp->if_bpf, mbuf)
-#  define LMC_BPF_ATTACH(dlt, len) bpfattach(sc->ifp, dlt, len)
-#  define LMC_BPF_DETACH	   bpfdetach(sc->ifp)
-# endif
-#endif /* __NetBSD__ */
-
-#ifdef __OpenBSD__
-  typedef int intr_return_t;
-# define  READ_PCI_CFG(sc, addr)       pci_conf_read ((sc)->pa_pc, (sc)->pa_tag, addr)
-# define WRITE_PCI_CFG(sc, addr, data) pci_conf_write((sc)->pa_pc, (sc)->pa_tag, addr, data)
-# define  READ_CSR(csr)		bus_space_read_4 (sc->csr_tag, sc->csr_handle, csr)
-# define WRITE_CSR(csr, val)	bus_space_write_4(sc->csr_tag, sc->csr_handle, csr, val)
-# define NAME_UNIT		sc->dev.dv_xname
-# define DRIVER_DEBUG		((sc->config.debug) || (sc->ifp->if_flags & IFF_DEBUG))
-# define TOP_TRYLOCK		simple_lock_try(&sc->top_lock)
-# define TOP_UNLOCK		simple_unlock  (&sc->top_lock)
-# define BOTTOM_TRYLOCK		simple_lock_try(&sc->bottom_lock)
-# define BOTTOM_UNLOCK		simple_unlock  (&sc->bottom_lock)
-# define CHECK_CAP		suser(curproc, 0)
-# define DISABLE_INTR		int spl = splnet()
-# define ENABLE_INTR		splx(spl)
-# define IRQ_NONE		0
-# define IRQ_HANDLED		1
-# define IFP2SC(ifp)		(ifp)->if_softc
-# define COPY_BREAK		MHLEN
-# define SLEEP(usecs)		tsleep(sc, PCATCH | PZERO, DEVICE_NAME, 1+(usecs/tick))
-# define DMA_SYNC(map, size, flags) bus_dmamap_sync(ring->tag, map, 0, size, flags)
-# define DMA_LOAD(map, addr, size)  bus_dmamap_load(ring->tag, map, addr, size, 0, BUS_DMA_NOWAIT)
-# if (NBPFILTER != 0)
-#  define LMC_BPF_MTAP(mbuf)	if (sc->ifp->if_bpf) bpf_mtap(sc->ifp->if_bpf, mbuf)
-#  define LMC_BPF_ATTACH(dlt, len) bpfattach(&sc->ifp->if_bpf, sc->ifp, dlt, len)
-#  define LMC_BPF_DETACH	   bpfdetach(sc->ifp)
-# endif
-#endif /* __OpenBSD__ */
-
-#ifdef __bsdi__
-  typedef int intr_return_t;
-# define  READ_PCI_CFG(sc, addr)        pci_inl(&(sc)->cfgbase, addr)
-# define WRITE_PCI_CFG(sc, addr, data) pci_outl(&(sc)->cfgbase, addr, data)
-# if IOREF_CSR
-#  define  READ_CSR(csr)	 inl(sc->csr_iobase+(csr))
-#  define WRITE_CSR(csr, val)	outl(sc->csr_iobase+(csr), (val))
-# else
-# error Memory refs to Tulip CSRs cause page faults in BSD/OS
-#  define  READ_CSR(csr)	   (0 + *(sc->csr_membase+(csr)))
-#  define WRITE_CSR(csr, val)	((void)(*(sc->csr_membase+(csr)) = (val)))
-# endif
-# define NAME_UNIT		sc->dev.dv_xname
-# define DRIVER_DEBUG		((sc->config.debug) || (sc->ifp->if_flags & IFF_DEBUG))
-# define TOP_TRYLOCK		simple_lock_try(&sc->top_lock)
-# define TOP_UNLOCK		simple_unlock  (&sc->top_lock)
-# define BOTTOM_TRYLOCK		simple_lock_try(&sc->bottom_lock)
-# define BOTTOM_UNLOCK		simple_unlock  (&sc->bottom_lock)
-# define CHECK_CAP		suser(PCPU(curproc)->p_ucred, &PCPU(curproc)->p_acflag)
-# define DISABLE_INTR		int spl = splimp()
-# define ENABLE_INTR		splx(spl)
-# define IRQ_NONE		1 /* XXX 0 */
-# define IRQ_HANDLED		1
-# define IFP2SC(ifp)		(ifp)->if_softc
-# define COPY_BREAK		MHLEN
-# define SLEEP(usecs)		tsleep(sc, PCATCH | PZERO, DEVICE_NAME, 1+(usecs/tick))
-# define DMA_SYNC(map, size, flags)   /* nothing */
-# define DMA_LOAD(map, addr, size)    0
-# define bus_dmamap_unload(tag, map)  /* nothing */
-# define bus_dmamap_destroy(tag, map) /* nothing */
-# if (NBPFILTER != 0)
-#  define LMC_BPF_MTAP(mbuf)	if (sc->ifp->if_bpf) bpf_mtap(sc->ifp->if_bpf, mbuf)
-#  define LMC_BPF_ATTACH(dlt, len) bpfattach(&sc->ifp->if_bpf, sc->ifp, dlt, len)
-#  define LMC_BPF_DETACH	/* bpfdetach(sc->ifp) */
-# endif
-# define memcpy(dst, src, len)  bcopy(src, dst, len)
-# define if_detach(ifp)		/* nothing */
-
-/*  BSD/OS-4.1 doesn't have a back pointer to softc in struct ifnet, */
-/*  and it passes a unit number not a struct ifnet* to watchdog. */
-# if (_BSDI_VERSION <= 199910)
-   extern struct cfdriver	lmccd;
-#  undef  IFP2SC
-#  define UNIT2SC(unit)		((softc_t *)lmccd.cd_devs[unit])
-#  define IFP2SC(ifp)		(UNIT2SC((ifp)->if_unit))
-# endif
-#endif /* __bsdi__ */
-
-#ifdef __linux__
-static uint32_t /* inline? so rare it doesn't matter */
-READ_PCI_CFG(softc_t *sc, uint32_t addr)
-  {
-  uint32_t data;
-  pci_read_config_dword(sc->pci_dev, addr, &data);
-  return data;
-  }
-# define WRITE_PCI_CFG(sc, addr, data) pci_write_config_dword(sc->pci_dev, addr, data)
-# if IOREF_CSR
-#  define  READ_CSR(csr)	       inl((sc->csr_iobase+(csr)))
-#  define WRITE_CSR(csr, val)	outl((val),(sc->csr_iobase+(csr)))
-# else
-#  define  READ_CSR(csr)	       readl((sc->csr_membase+(csr)))
-#  define WRITE_CSR(csr, val)	writel((val),(sc->csr_membase+(csr)))
-# endif
-# define NAME_UNIT		sc->net_dev->name
-# define DRIVER_DEBUG		((sc->config.debug) || (sc->net_dev->flags & IFF_DEBUG))
-# define TOP_TRYLOCK		((down_trylock(&sc->top_lock)==0) ? 1:0)
-# define TOP_UNLOCK		up(&sc->top_lock)
-# define BOTTOM_TRYLOCK		spin_trylock_bh(&sc->bottom_lock)
-# define BOTTOM_UNLOCK		spin_unlock_bh(&sc->bottom_lock)
-# define CHECK_CAP		capable(CAP_NET_ADMIN)? 0 : -EPERM
-# define DISABLE_INTR		/* nothing */
-# define ENABLE_INTR		/* nothing */
-# define COPY_BREAK		200
-# define DELAY(usecs)		udelay(usecs)
-# define SLEEP(usecs)		do { set_current_state(TASK_INTERRUPTIBLE);\
-				schedule_timeout(1+(usecs*HZ)/1000000UL); } while (0)
-# define printf			printk
-# define copyin(u, k, len)	copy_from_user(k, u, len)
-# define microtime(time)	do_gettimeofday(time)
-# define malloc(len, t, f)	kmalloc(len, GFP_KERNEL)
-# define free(addr, t)		kfree(addr)
-# define LITTLE_ENDIAN		4321
-# define BIG_ENDIAN		1234
-# if defined(__LITTLE_ENDIAN)
-#  define BYTE_ORDER LITTLE_ENDIAN
-# elif defined(__BIG_ENDIAN)
-#  define BYTE_ORDER BIG_ENDIAN
-# else
-#  error "asm/byteorder.h is wrong"
-# endif
-# if (GEN_HDLC == 0)
-#  define dev_to_hdlc(net_dev) net_dev
-#  define hdlc_set_carrier(val, net_dev) /* nothing */
-# endif
-#endif /* __linux__ */
-
-#if (NBPFILTER == 0)
-# define LMC_BPF_MTAP(mbuf)		/* nothing */
-# define LMC_BPF_ATTACH(dlt, len)	/* nothing */
-# define LMC_BPF_DETACH			/* nothing */
-#endif
-
-#if (defined(__bsdi__) || /* unconditionally */ \
-    (defined(__FreeBSD__) && (__FreeBSD_version < 503000)) || \
-    (defined(__NetBSD__)  && (__NetBSD_Version__ < 106000000)) || \
-    (defined(__OpenBSD__) && (  OpenBSD < 200111)))
-# define IFQ_ENQUEUE(ifq, m, pa, err)   \
-do {					\
-  if (pa==0); /* suppress warning */	\
-  if (IF_QFULL(ifq))			\
-    {					\
-    IF_DROP(ifq);			\
-    m_freem(m);				\
-    err = ENOBUFS;			\
-    }					\
-  else					\
-    {					\
-    IF_ENQUEUE(ifq, m);			\
-    err = 0;				\
-    }					\
-   } while (0)
-# define IFQ_DEQUEUE(ifq, m)		do { IF_DEQUEUE((ifq), m) } while (0)
-# define IFQ_IS_EMPTY(ifq)		((ifq)->ifq_head == NULL)
-# define IFQ_SET_MAXLEN(ifq, len)	(ifq)->ifq_maxlen = len
-# define IFQ_SET_READY(ifq)		/* nothing */
-# define IFQ_PURGE(ifq)			\
-do {					\
-  while ((ifq)->ifq_head != NULL)	\
-    {					\
-    struct mbuf *m;			\
-    IF_DEQUEUE(ifq, m);			\
-    m_freem(m);				\
-    }					\
-   } while (0)
-#endif
-
-#define HSSI_DESC "SBE/LMC HSSI Card"
-#define T3_DESC   "SBE/LMC T3 Card"
-#define SSI_DESC  "SBE/LMC SSI Card"
-#define T1E1_DESC "SBE/LMC T1E1 Card"
-
-/* procedure prototypes */
-
-static void shift_srom_bits(softc_t *, uint32_t, uint32_t);
-static u_int16_t read_srom(softc_t *, u_int8_t);
-static void write_srom(softc_t *, u_int8_t, u_int16_t);
-
-static u_int8_t read_bios(softc_t *, uint32_t);
-static void write_bios_phys(softc_t *, uint32_t, u_int8_t);
-static void write_bios(softc_t *, uint32_t, u_int8_t);
-static void erase_bios(softc_t *);
-
-static void shift_mii_bits(softc_t *, uint32_t, uint32_t);
-static u_int16_t read_mii(softc_t *, u_int8_t);
-static void write_mii(softc_t *, u_int8_t, u_int16_t);
-
-static void set_mii16_bits(softc_t *, u_int16_t);
-static void clr_mii16_bits(softc_t *, u_int16_t);
-static void set_mii17_bits(softc_t *, u_int16_t);
-static void clr_mii17_bits(softc_t *, u_int16_t);
-
-static void led_off(softc_t *, u_int16_t);
-static void led_on(softc_t *, u_int16_t);
-static void led_inv(softc_t *, u_int16_t);
-
-static void write_framer(softc_t *, u_int16_t, u_int8_t);
-static u_int8_t read_framer(softc_t *, u_int16_t);
-
-static void make_gpio_input(softc_t *, uint32_t);
-static void make_gpio_output(softc_t *, uint32_t);
-static uint32_t read_gpio(softc_t *);
-static void set_gpio_bits(softc_t *, uint32_t);
-static void clr_gpio_bits(softc_t *, uint32_t);
-
-static void reset_xilinx(softc_t *);
-static void  load_xilinx_from_rom(softc_t *);
-static int   load_xilinx_from_file(softc_t *, char *, uint32_t);
-
-static void shift_synth_bits(softc_t *, uint32_t, uint32_t);
-static void write_synth(softc_t *, struct synth *);
-
-static void write_dac(softc_t *, u_int16_t);
-
-static void hssi_config(softc_t *);
-static void hssi_ident(softc_t *);
-static int  hssi_watchdog(softc_t *);
-static int  hssi_ioctl(softc_t *, struct ioctl *);
-
-static void t3_config(softc_t *);
-static void t3_ident(softc_t *);
-static int  t3_watchdog(softc_t *);
-static void t3_send_dbl_feac(softc_t *, int, int);
-static int  t3_ioctl(softc_t *, struct ioctl *);
-
-static void ssi_config(softc_t *);
-static void ssi_ident(softc_t *);
-static int  ssi_watchdog(softc_t *);
-static int  ssi_ioctl(softc_t *, struct ioctl *);
-
-static void t1_config(softc_t *);
-static void t1_ident(softc_t *);
-static int  t1_watchdog(softc_t *);
-static void t1_send_bop(softc_t *, int);
-static int  t1_ioctl(softc_t *, struct ioctl *);
-
-#if IFNET
-# if ((defined(__FreeBSD__) && (__FreeBSD_version < 500000)) ||\
-        defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__))
-static void netisr_dispatch(int, struct mbuf *);
-# endif
-static void lmc_raw_input(struct ifnet *, struct mbuf *);
-#endif /* IFNET */
-
-#if BSD
-static void mbuf_enqueue(struct desc_ring *, struct mbuf *);
-static struct mbuf* mbuf_dequeue(struct desc_ring *);
-# ifdef __FreeBSD__
-static void fbsd_dmamap_load(void *, bus_dma_segment_t *, int, int);
-# endif
-static int create_ring(softc_t *, struct desc_ring *, int);
-static void destroy_ring(softc_t *, struct desc_ring *);
-static int rxintr_cleanup(softc_t *);
-static int rxintr_setup(softc_t *);
-static int txintr_cleanup(softc_t *);
-static int txintr_setup_mbuf(softc_t *, struct mbuf *);
-static int txintr_setup(softc_t *);
-#endif /* BSD */
-
-#ifdef __linux__
-static void skbuff_enqueue(struct desc_ring *, struct sk_buff *);
-static struct sk_buff* skbuff_dequeue(struct desc_ring *);
-static int create_ring(softc_t *, struct desc_ring *, int);
-static void destroy_ring(softc_t *, struct desc_ring *);
-static int rxintr_cleanup(softc_t *);
-static int rxintr_setup(softc_t *);
-static int txintr_cleanup(softc_t *sc);
-static int txintr_setup_frag(softc_t *, char *, int);
-static int txintr_setup_skb(softc_t *, struct sk_buff *);
-static int txintr_setup(softc_t *);
-#endif /* __linux__ */
-
-static void check_intr_status(softc_t *);
-static void core_interrupt(void *, int);
-static void user_interrupt(softc_t *, int);
-#if BSD
-# if (defined(__FreeBSD__) && defined(DEVICE_POLLING))
-static int fbsd_poll(struct ifnet *, enum poll_cmd, int);
-# endif
-static intr_return_t bsd_interrupt(void *);
-#endif /* BSD */
-
-static void set_status(softc_t *, int);
-#if P2P
-static int p2p_getmdm(struct p2pcom *, caddr_t);
-static int p2p_mdmctl(struct p2pcom *, int);
-#endif
-#if NSPPP
-static void sppp_tls(struct sppp *);
-static void sppp_tlf(struct sppp *);
-#endif
-
-static void config_proto(softc_t *, struct config *);
-static int core_ioctl(softc_t *, u_long, caddr_t);
-static void core_watchdog(softc_t *);
-
-#if IFNET
-static int lmc_raw_ioctl(struct ifnet *, u_long, caddr_t);
-static int lmc_ifnet_ioctl(struct ifnet *, u_long, caddr_t);
-static void lmc_ifnet_start(struct ifnet *);
-static int lmc_raw_output(struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct route *);
-# ifdef __OpenBSD__
-static int ifmedia_change(struct ifnet *);
-static void ifmedia_status(struct ifnet *, struct ifmediareq *);
-# endif /* __OpenBSD__ */
-static void setup_ifnet(struct ifnet *);
-static int lmc_ifnet_attach(softc_t *);
-static void lmc_ifnet_detach(softc_t *);
-#endif /* IFNET */
-
-#if NETGRAPH
-# if (__FreeBSD_version >= 500000)
-static int ng_constructor(node_p);
-# else /* FreeBSD-4 */
-static int ng_constructor(node_p *);
-# endif
-# if (__FreeBSD_version >= 500000)
-static int ng_rcvmsg(node_p, item_p, hook_p);
-# else /* FreeBSD-4 */
-static int ng_rcvmsg(node_p, struct ng_mesg *,
- const char *,  struct ng_mesg **);
-# endif
-static int ng_shutdown(node_p);
-static int ng_newhook(node_p, hook_p, const char *);
-static int ng_connect(hook_p);
-# if (__FreeBSD_version >= 500000)
-static int ng_rcvdata(hook_p, item_p);
-# else /* FreeBSD-4 */
-static int ng_rcvdata(hook_p, struct mbuf *, meta_p);
-# endif
-static int ng_disconnect(hook_p);
-# if (IFNET == 0)
-static void ng_watchdog(void *);
-# endif
-static int ng_attach(softc_t *);
-static void ng_detach(softc_t *);
-#endif /* NETGRAPH */
-
-static int startup_card(softc_t *);
-static void shutdown_card(void *);
-static int attach_card(softc_t *, const char *);
-static void detach_card(softc_t *);
-
-#ifdef __FreeBSD__
-static int fbsd_probe(device_t);
-static int fbsd_detach(device_t);
-static int fbsd_shutdown(device_t);
-static int fbsd_attach(device_t);
-#endif /* __FreeBSD__ */
-
-#ifdef __NetBSD__
-static int nbsd_match(struct device *t, struct cfdata *, void *);
-static int nbsd_detach(struct device *, int);
-static void nbsd_attach(struct device *, struct device *, void *);
-static int lkm_nbsd_match(struct pci_attach_args *);
-int if_lmc_lkmentry(struct lkm_table *, int, int);
-#endif  /* __NetBSD__ */
-
-#ifdef __OpenBSD__
-static int obsd_match(struct device *, void *, void *);
-static int obsd_detach(struct device *, int);
-static void obsd_attach(struct device *, struct device *, void *);
-int if_lmc_lkmentry(struct lkm_table *, int, int);
-#endif  /* __OpenBSD__ */
-
-#ifdef __bsdi__
-static int bsdi_match(pci_devaddr_t *);
-static int bsdi_probe(struct device *, struct cfdata *, void *);
-static void bsdi_attach(struct device *, struct device *, void *);
-#endif  /* __bsdi__ */
-
-#ifdef __linux__
-static irqreturn_t linux_interrupt(int, void *, struct pt_regs *);
-static int linux_poll(struct net_device *, int *);
-static int linux_start(struct sk_buff *, struct net_device *);
-static void linux_timeout(struct net_device *);
-static int linux_ioctl(struct net_device *, struct ifreq *, int);
-static struct net_device_stats * linux_stats(struct net_device *);
-static void linux_watchdog(unsigned long);
-static int linux_stop(struct net_device *);
-static int linux_open(struct net_device *);
-# if GEN_HDLC
-static int hdlc_attach(struct net_device *,
- unsigned short, unsigned short);
-# endif
-static void __exit linux_remove(struct pci_dev *);
-static void setup_netdev(struct net_device *);
-static int __init linux_probe(struct pci_dev *, const struct pci_device_id *);
-#endif /* __linux__ */
-
-#endif /* KERNEL */
-
-#endif /* IF_LMC_H */
diff --git a/include.new/dev/mfi/mfi_ioctl.h b/include.new/dev/mfi/mfi_ioctl.h
deleted file mode 100644
index 87dcf16..0000000
--- a/include.new/dev/mfi/mfi_ioctl.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * Copyright (c) 2006 IronPort Systems
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/dev/mfi/mfi_ioctl.h 233805 2012-04-02 19:13:02Z ambrisko $");
-
-#include <dev/mfi/mfireg.h>
-
-struct iovec32 {
-	uint32_t	iov_base;
-	int		iov_len;
-};
-
-#define MFIQ_FREE	0
-#define MFIQ_BIO	1
-#define MFIQ_READY	2
-#define MFIQ_BUSY	3
-#define MFIQ_COUNT	4
-
-struct mfi_qstat {
-	uint32_t	q_length;
-	uint32_t	q_max;
-};
-
-union mfi_statrequest {
-	uint32_t		ms_item;
-	struct mfi_qstat	ms_qstat;
-};
-
-#define MAX_SPACE_FOR_SENSE_PTR		32
-union mfi_sense_ptr {
-	uint8_t		sense_ptr_data[MAX_SPACE_FOR_SENSE_PTR];
-	void 		*user_space;
-	struct {
-		uint32_t	low;
-		uint32_t	high;
-	} addr;
-} __packed;
-
-#define MAX_IOCTL_SGE	16
-
-struct mfi_ioc_packet {
-	uint16_t	mfi_adapter_no;
-	uint16_t	mfi_pad1;
-	uint32_t	mfi_sgl_off;
-	uint32_t	mfi_sge_count;
-	uint32_t	mfi_sense_off;
-	uint32_t	mfi_sense_len;
-	union {
-		uint8_t raw[128];
-		struct mfi_frame_header hdr;
-	} mfi_frame;
-
-	struct iovec mfi_sgl[MAX_IOCTL_SGE];
-} __packed;
-
-#ifdef COMPAT_FREEBSD32
-struct mfi_ioc_packet32 {
-	uint16_t	mfi_adapter_no;
-	uint16_t	mfi_pad1;
-	uint32_t	mfi_sgl_off;
-	uint32_t	mfi_sge_count;
-	uint32_t	mfi_sense_off;
-	uint32_t	mfi_sense_len;
-	union {
-		uint8_t raw[128];
-		struct mfi_frame_header hdr;
-	} mfi_frame;
-
-	struct iovec32 mfi_sgl[MAX_IOCTL_SGE];
-} __packed;
-#endif
-
-struct mfi_ioc_aen {
-	uint16_t	aen_adapter_no;
-	uint16_t	aen_pad1;
-	uint32_t	aen_seq_num;
-	uint32_t	aen_class_locale;
-} __packed;
-
-#define MFI_CMD		_IOWR('M', 1, struct mfi_ioc_packet)
-#ifdef COMPAT_FREEBSD32
-#define MFI_CMD32	_IOWR('M', 1, struct mfi_ioc_packet32)
-#endif
-#define MFI_SET_AEN	_IOW('M', 3, struct mfi_ioc_aen)
-
-#define MAX_LINUX_IOCTL_SGE	16
-
-struct mfi_linux_ioc_packet {
-	uint16_t	lioc_adapter_no;
-	uint16_t	lioc_pad1;
-	uint32_t	lioc_sgl_off;
-	uint32_t	lioc_sge_count;
-	uint32_t	lioc_sense_off;
-	uint32_t	lioc_sense_len;
-	union {
-		uint8_t raw[128];
-		struct mfi_frame_header hdr;
-	} lioc_frame;
-
-#if defined(__amd64__) /* Assume amd64 wants 32 bit Linux */
-	struct iovec32 lioc_sgl[MAX_LINUX_IOCTL_SGE];
-#else
-	struct iovec lioc_sgl[MAX_LINUX_IOCTL_SGE];
-#endif
-} __packed;
-
-struct mfi_ioc_passthru {
-	struct mfi_dcmd_frame	ioc_frame;
-	uint32_t		buf_size;
-	uint8_t			*buf;
-} __packed;
-
-#ifdef COMPAT_FREEBSD32
-struct mfi_ioc_passthru32 {
-	struct mfi_dcmd_frame	ioc_frame;
-	uint32_t		buf_size;
-	uint32_t		buf;
-} __packed;
-#endif
-
-#define MFIIO_STATS	_IOWR('Q', 101, union mfi_statrequest)
-#define MFIIO_PASSTHRU	_IOWR('C', 102, struct mfi_ioc_passthru)
-#ifdef COMPAT_FREEBSD32
-#define MFIIO_PASSTHRU32	_IOWR('C', 102, struct mfi_ioc_passthru32)
-#endif
-
-struct mfi_linux_ioc_aen {
-	uint16_t	laen_adapter_no;
-	uint16_t	laen_pad1;
-	uint32_t	laen_seq_num;
-	uint32_t	laen_class_locale;
-} __packed;
-
-struct mfi_query_disk {
-	uint8_t	array_id;
-	uint8_t	present;
-	uint8_t	open;
-	uint8_t reserved;	/* reserved for future use */
-	char	devname[SPECNAMELEN + 1];
-} __packed;
-
-#define MFIIO_QUERY_DISK	_IOWR('Q', 102, struct mfi_query_disk)
-
-/*
- * Create a second set so the FreeBSD native ioctl doesn't
- * conflict in FreeBSD ioctl handler.  Translate in mfi_linux.c.
- */
-#define MFI_LINUX_CMD		0xc1144d01
-#define MFI_LINUX_SET_AEN	0x400c4d03
-#define MFI_LINUX_CMD_2		0xc1144d02
-#define MFI_LINUX_SET_AEN_2	0x400c4d04
diff --git a/include.new/dev/mfi/mfireg.h b/include.new/dev/mfi/mfireg.h
deleted file mode 100644
index f082d7c..0000000
--- a/include.new/dev/mfi/mfireg.h
+++ /dev/null
@@ -1,1900 +0,0 @@
-/*-
- * Copyright (c) 2006 IronPort Systems
- * 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.
- *
- * 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.
- */
-/*-
- * Copyright (c) 2007 LSI Corp.
- * Copyright (c) 2007 Rajesh Prabhakaran.
- * 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.
- *
- * 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.
- */
-
-#ifndef _MFIREG_H
-#define _MFIREG_H
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/dev/mfi/mfireg.h 255806 2013-09-22 23:48:41Z sbruno $");
-
-/*
- * MegaRAID SAS MFI firmware definitions
- *
- * Calling this driver 'MegaRAID SAS' is a bit misleading.  It's a completely
- * new firmware interface from the old AMI MegaRAID one, and there is no
- * reason why this interface should be limited to just SAS.  In any case, LSI
- * seems to also call this interface 'MFI', so that will be used here.
- */
-#define MEGAMFI_FRAME_SIZE              64
-/*
- * Start with the register set.  All registers are 32 bits wide.
- * The usual Intel IOP style setup.
- */
-#define MFI_IMSG0	0x10	/* Inbound message 0 */
-#define MFI_IMSG1	0x14	/* Inbound message 1 */
-#define MFI_OMSG0	0x18	/* Outbound message 0 */
-#define MFI_OMSG1	0x1c	/* Outbound message 1 */
-#define MFI_IDB		0x20	/* Inbound doorbell */
-#define MFI_ISTS	0x24	/* Inbound interrupt status */
-#define MFI_IMSK	0x28	/* Inbound interrupt mask */
-#define MFI_ODB		0x2c	/* Outbound doorbell */
-#define MFI_OSTS	0x30	/* Outbound interrupt status */
-#define MFI_OMSK	0x34	/* Outbound interrupt mask */
-#define MFI_IQP		0x40	/* Inbound queue port */
-#define MFI_OQP		0x44	/* Outbound queue port */
-
-/*
-*  ThunderBolt specific Register
-*/
-
-#define MFI_RFPI	0x48 		/* reply_free_post_host_index */
-#define MFI_RPI		0x6c 		/* reply_post_host_index */
-#define MFI_ILQP 	0xc0		/* inbound_low_queue_port */
-#define MFI_IHQP 	0xc4		/* inbound_high_queue_port */
-
-/*
- * 1078 specific related register
- */
-#define MFI_ODR0	0x9c 		/* outbound doorbell register0 */
-#define MFI_ODCR0	0xa0 		/* outbound doorbell clear register0  */
-#define MFI_OSP0	0xb0 		/* outbound scratch pad0  */
-#define MFI_1078_EIM	0x80000004 	/* 1078 enable intrrupt mask  */
-#define MFI_RMI		0x2 		/* reply message interrupt  */
-#define MFI_1078_RM	0x80000000 	/* reply 1078 message interrupt  */
-#define MFI_ODC		0x4 		/* outbound doorbell change interrupt */
-
-/* OCR registers */
-#define MFI_WSR		0x004		/* write sequence register */
-#define MFI_HDR		0x008		/* host diagnostic register */
-#define MFI_RSR		0x3c3		/* Reset Status Register */
-
-/*
- * GEN2 specific changes
- */
-#define MFI_GEN2_EIM	0x00000005	/* GEN2 enable interrupt mask */
-#define MFI_GEN2_RM	0x00000001	/* reply GEN2 message interrupt */
-
-/*
- * skinny specific changes
- */
-#define MFI_SKINNY_IDB	0x00	/* Inbound doorbell is at 0x00 for skinny */
-#define MFI_IQPL	0x000000c0
-#define MFI_IQPH	0x000000c4
-#define MFI_SKINNY_RM	0x00000001	/* reply skinny message interrupt */
-
-/* Bits for MFI_OSTS */
-#define MFI_OSTS_INTR_VALID	0x00000002
-
-/* OCR specific flags */
-#define MFI_FIRMWARE_STATE_CHANGE	0x00000002
-#define MFI_STATE_CHANGE_INTERRUPT	0x00000004  /* MFI state change interrrupt */
-
-/*
- * Firmware state values.  Found in OMSG0 during initialization.
- */
-#define MFI_FWSTATE_MASK		0xf0000000
-#define MFI_FWSTATE_UNDEFINED		0x00000000
-#define MFI_FWSTATE_BB_INIT		0x10000000
-#define MFI_FWSTATE_FW_INIT		0x40000000
-#define MFI_FWSTATE_WAIT_HANDSHAKE	0x60000000
-#define MFI_FWSTATE_FW_INIT_2		0x70000000
-#define MFI_FWSTATE_DEVICE_SCAN		0x80000000
-#define MFI_FWSTATE_BOOT_MESSAGE_PENDING	0x90000000
-#define MFI_FWSTATE_FLUSH_CACHE		0xa0000000
-#define MFI_FWSTATE_READY		0xb0000000
-#define MFI_FWSTATE_OPERATIONAL		0xc0000000
-#define MFI_FWSTATE_FAULT		0xf0000000
-#define MFI_FWSTATE_MAXSGL_MASK		0x00ff0000
-#define MFI_FWSTATE_MAXCMD_MASK		0x0000ffff
-#define MFI_FWSTATE_HOSTMEMREQD_MASK	0x08000000
-#define MFI_FWSTATE_BOOT_MESSAGE_PENDING	0x90000000
-#define MFI_RESET_REQUIRED		0x00000001
-
-/* ThunderBolt Support */
-#define MFI_FWSTATE_TB_MASK		0xf0000000
-#define MFI_FWSTATE_TB_RESET		0x00000000
-#define MFI_FWSTATE_TB_READY		0x10000000
-#define MFI_FWSTATE_TB_OPERATIONAL	0x20000000
-#define MFI_FWSTATE_TB_FAULT		0x40000000
-
-/*
- * Control bits to drive the card to ready state.  These go into the IDB
- * register.
- */
-#define MFI_FWINIT_ABORT	0x00000000 /* Abort all pending commands */
-#define MFI_FWINIT_READY	0x00000002 /* Move from operational to ready */
-#define MFI_FWINIT_MFIMODE	0x00000004 /* unknown */
-#define MFI_FWINIT_CLEAR_HANDSHAKE 0x00000008 /* Respond to WAIT_HANDSHAKE */
-#define MFI_FWINIT_HOTPLUG	0x00000010
-
-/* ADP reset flags */
-#define MFI_STOP_ADP		0x00000020
-#define MFI_ADP_RESET		0x00000040
-#define DIAG_WRITE_ENABLE	0x00000080
-#define DIAG_RESET_ADAPTER	0x00000004
-
-/* MFI Commands */
-typedef enum {
-	MFI_CMD_INIT =		0x00,
-	MFI_CMD_LD_READ,
-	MFI_CMD_LD_WRITE,
-	MFI_CMD_LD_SCSI_IO,
-	MFI_CMD_PD_SCSI_IO,
-	MFI_CMD_DCMD,
-	MFI_CMD_ABORT,
-	MFI_CMD_SMP,
-	MFI_CMD_STP
-} mfi_cmd_t;
-
-/* Direct commands */
-typedef enum {
-	MFI_DCMD_CTRL_GETINFO =		0x01010000,
-	MFI_DCMD_CTRL_MFI_HOST_MEM_ALLOC =0x0100e100,
-	MFI_DCMD_CTRL_MFC_DEFAULTS_GET =0x010e0201,
-	MFI_DCMD_CTRL_MFC_DEFAULTS_SET =0x010e0202,
-	MFI_DCMD_CTRL_FLUSHCACHE =	0x01101000,
-	MFI_DCMD_CTRL_GET_PROPS =       0x01020100,
-	MFI_DCMD_CTRL_SET_PROPS =       0x01020200,
-	MFI_DCMD_CTRL_SHUTDOWN =	0x01050000,
-	MFI_DCMD_CTRL_EVENT_GETINFO =	0x01040100,
-	MFI_DCMD_CTRL_EVENT_GET =	0x01040300,
-	MFI_DCMD_CTRL_EVENT_WAIT =	0x01040500,
-	MFI_DCMD_PR_GET_STATUS =	0x01070100,
-	MFI_DCMD_PR_GET_PROPERTIES =	0x01070200,
-	MFI_DCMD_PR_SET_PROPERTIES =	0x01070300,
-	MFI_DCMD_PR_START =		0x01070400,
-	MFI_DCMD_PR_STOP =		0x01070500,
-	MFI_DCMD_TIME_SECS_GET =	0x01080201,
-	MFI_DCMD_FLASH_FW_OPEN =	0x010f0100,
-	MFI_DCMD_FLASH_FW_DOWNLOAD =	0x010f0200,
-	MFI_DCMD_FLASH_FW_FLASH =	0x010f0300,
-	MFI_DCMD_FLASH_FW_CLOSE =	0x010f0400,
-	MFI_DCMD_PD_GET_LIST =		0x02010000,
-	MFI_DCMD_PD_LIST_QUERY =	0x02010100,
-	MFI_DCMD_PD_GET_INFO = 		0x02020000,
-	MFI_DCMD_PD_STATE_SET =		0x02030100,
-	MFI_DCMD_PD_REBUILD_START =	0x02040100,
-	MFI_DCMD_PD_REBUILD_ABORT =	0x02040200,
-	MFI_DCMD_PD_CLEAR_START =	0x02050100,
-	MFI_DCMD_PD_CLEAR_ABORT =	0x02050200,
-	MFI_DCMD_PD_GET_PROGRESS =	0x02060000,
-	MFI_DCMD_PD_LOCATE_START =	0x02070100,
-	MFI_DCMD_PD_LOCATE_STOP =	0x02070200,
-	MFI_DCMD_LD_MAP_GET_INFO =	0x0300e101,
-	MFI_DCMD_LD_SYNC =		0x0300e102,
-	MFI_DCMD_LD_GET_LIST =		0x03010000,
-	MFI_DCMD_LD_GET_INFO =		0x03020000,
-	MFI_DCMD_LD_GET_PROP =		0x03030000,
-	MFI_DCMD_LD_SET_PROP =		0x03040000,
-	MFI_DCMD_LD_INIT_START =	0x03060100,
-	MFI_DCMD_LD_DELETE =		0x03090000,
-	MFI_DCMD_CFG_READ =		0x04010000,
-	MFI_DCMD_CFG_ADD =		0x04020000,
-	MFI_DCMD_CFG_CLEAR =		0x04030000,
-	MFI_DCMD_CFG_MAKE_SPARE =	0x04040000,
-	MFI_DCMD_CFG_REMOVE_SPARE =	0x04050000,
-	MFI_DCMD_CFG_FOREIGN_SCAN =     0x04060100,
-	MFI_DCMD_CFG_FOREIGN_DISPLAY =  0x04060200,
-	MFI_DCMD_CFG_FOREIGN_PREVIEW =  0x04060300,
-	MFI_DCMD_CFG_FOREIGN_IMPORT =	0x04060400,
-	MFI_DCMD_CFG_FOREIGN_CLEAR =    0x04060500,
-	MFI_DCMD_BBU_GET_STATUS =	0x05010000,
-	MFI_DCMD_BBU_GET_CAPACITY_INFO =0x05020000,
-	MFI_DCMD_BBU_GET_DESIGN_INFO =	0x05030000,
-	MFI_DCMD_BBU_START_LEARN =	0x05040000,
-	MFI_DCMD_BBU_GET_PROP =		0x05050100,
-	MFI_DCMD_BBU_SET_PROP =		0x05050200,
-	MFI_DCMD_CLUSTER =		0x08000000,
-	MFI_DCMD_CLUSTER_RESET_ALL =	0x08010100,
-	MFI_DCMD_CLUSTER_RESET_LD =	0x08010200
-} mfi_dcmd_t;
-
-/* Modifiers for MFI_DCMD_CTRL_FLUSHCACHE */
-#define MFI_FLUSHCACHE_CTRL	0x01
-#define MFI_FLUSHCACHE_DISK	0x02
-
-/* Modifiers for MFI_DCMD_CTRL_SHUTDOWN */
-#define MFI_SHUTDOWN_SPINDOWN	0x01
-
-/*
- * MFI Frame flags
- */
-#define MFI_FRAME_POST_IN_REPLY_QUEUE		0x0000
-#define MFI_FRAME_DONT_POST_IN_REPLY_QUEUE	0x0001
-#define MFI_FRAME_SGL32				0x0000
-#define MFI_FRAME_SGL64				0x0002
-#define MFI_FRAME_SENSE32			0x0000
-#define MFI_FRAME_SENSE64			0x0004
-#define MFI_FRAME_DIR_NONE			0x0000
-#define MFI_FRAME_DIR_WRITE			0x0008
-#define MFI_FRAME_DIR_READ			0x0010
-#define MFI_FRAME_DIR_BOTH			0x0018
-#define MFI_FRAME_IEEE_SGL			0x0020
-#define MFI_FRAME_FMT "\20" \
-    "\1NOPOST" \
-    "\2SGL64" \
-    "\3SENSE64" \
-    "\4WRITE" \
-    "\5READ" \
-    "\6IEEESGL"
-
-/* ThunderBolt Specific */
-
-/*
- * Pre-TB command size and TB command size.
- * We will be checking it at the load time for the time being
- */
-#define MR_COMMAND_SIZE (MFI_FRAME_SIZE*20) /* 1280 bytes */
-
-#define MEGASAS_THUNDERBOLT_MSG_ALLIGNMENT  256
-/*
- * We are defining only 128 byte message to reduce memory move over head
- * and also it will reduce the SRB extension size by 128byte compared with
- * 256 message size
- */
-#define MEGASAS_THUNDERBOLT_NEW_MSG_SIZE	256
-#define MEGASAS_THUNDERBOLT_MAX_COMMANDS	1024
-#define MEGASAS_THUNDERBOLT_MAX_REPLY_COUNT	1024
-#define MEGASAS_THUNDERBOLT_REPLY_SIZE		8
-#define MEGASAS_THUNDERBOLT_MAX_CHAIN_COUNT	1
-#define MEGASAS_MAX_SZ_CHAIN_FRAME		1024
-
-#define MPI2_FUNCTION_PASSTHRU_IO_REQUEST       0xF0
-#define MPI2_FUNCTION_LD_IO_REQUEST             0xF1
-
-#define MR_INTERNAL_MFI_FRAMES_SMID             1
-#define MR_CTRL_EVENT_WAIT_SMID                 2
-#define MR_INTERNAL_DRIVER_RESET_SMID           3
-
-
-/* MFI Status codes */
-typedef enum {
-	MFI_STAT_OK =			0x00,
-	MFI_STAT_INVALID_CMD,
-	MFI_STAT_INVALID_DCMD,
-	MFI_STAT_INVALID_PARAMETER,
-	MFI_STAT_INVALID_SEQUENCE_NUMBER,
-	MFI_STAT_ABORT_NOT_POSSIBLE,
-	MFI_STAT_APP_HOST_CODE_NOT_FOUND,
-	MFI_STAT_APP_IN_USE,
-	MFI_STAT_APP_NOT_INITIALIZED,
-	MFI_STAT_ARRAY_INDEX_INVALID,
-	MFI_STAT_ARRAY_ROW_NOT_EMPTY,
-	MFI_STAT_CONFIG_RESOURCE_CONFLICT,
-	MFI_STAT_DEVICE_NOT_FOUND,
-	MFI_STAT_DRIVE_TOO_SMALL,
-	MFI_STAT_FLASH_ALLOC_FAIL,
-	MFI_STAT_FLASH_BUSY,
-	MFI_STAT_FLASH_ERROR =		0x10,
-	MFI_STAT_FLASH_IMAGE_BAD,
-	MFI_STAT_FLASH_IMAGE_INCOMPLETE,
-	MFI_STAT_FLASH_NOT_OPEN,
-	MFI_STAT_FLASH_NOT_STARTED,
-	MFI_STAT_FLUSH_FAILED,
-	MFI_STAT_HOST_CODE_NOT_FOUNT,
-	MFI_STAT_LD_CC_IN_PROGRESS,
-	MFI_STAT_LD_INIT_IN_PROGRESS,
-	MFI_STAT_LD_LBA_OUT_OF_RANGE,
-	MFI_STAT_LD_MAX_CONFIGURED,
-	MFI_STAT_LD_NOT_OPTIMAL,
-	MFI_STAT_LD_RBLD_IN_PROGRESS,
-	MFI_STAT_LD_RECON_IN_PROGRESS,
-	MFI_STAT_LD_WRONG_RAID_LEVEL,
-	MFI_STAT_MAX_SPARES_EXCEEDED,
-	MFI_STAT_MEMORY_NOT_AVAILABLE =	0x20,
-	MFI_STAT_MFC_HW_ERROR,
-	MFI_STAT_NO_HW_PRESENT,
-	MFI_STAT_NOT_FOUND,
-	MFI_STAT_NOT_IN_ENCL,
-	MFI_STAT_PD_CLEAR_IN_PROGRESS,
-	MFI_STAT_PD_TYPE_WRONG,
-	MFI_STAT_PR_DISABLED,
-	MFI_STAT_ROW_INDEX_INVALID,
-	MFI_STAT_SAS_CONFIG_INVALID_ACTION,
-	MFI_STAT_SAS_CONFIG_INVALID_DATA,
-	MFI_STAT_SAS_CONFIG_INVALID_PAGE,
-	MFI_STAT_SAS_CONFIG_INVALID_TYPE,
-	MFI_STAT_SCSI_DONE_WITH_ERROR,
-	MFI_STAT_SCSI_IO_FAILED,
-	MFI_STAT_SCSI_RESERVATION_CONFLICT,
-	MFI_STAT_SHUTDOWN_FAILED =	0x30,
-	MFI_STAT_TIME_NOT_SET,
-	MFI_STAT_WRONG_STATE,
-	MFI_STAT_LD_OFFLINE,
-	MFI_STAT_PEER_NOTIFICATION_REJECTED,
-	MFI_STAT_PEER_NOTIFICATION_FAILED,
-	MFI_STAT_RESERVATION_IN_PROGRESS,
-	MFI_STAT_I2C_ERRORS_DETECTED,
-	MFI_STAT_PCI_ERRORS_DETECTED,
-	MFI_STAT_DIAG_FAILED,
-	MFI_STAT_BOOT_MSG_PENDING,
-	MFI_STAT_FOREIGN_CONFIG_INCOMPLETE,
-	MFI_STAT_INVALID_STATUS =	0xFF
-} mfi_status_t;
-
-typedef enum {
-	MFI_EVT_CLASS_DEBUG =		-2,
-	MFI_EVT_CLASS_PROGRESS =	-1,
-	MFI_EVT_CLASS_INFO =		0,
-	MFI_EVT_CLASS_WARNING =		1,
-	MFI_EVT_CLASS_CRITICAL =	2,
-	MFI_EVT_CLASS_FATAL =		3,
-	MFI_EVT_CLASS_DEAD =		4
-} mfi_evt_class_t;
-
-typedef enum {
-	MFI_EVT_LOCALE_LD =		0x0001,
-	MFI_EVT_LOCALE_PD =		0x0002,
-	MFI_EVT_LOCALE_ENCL =		0x0004,
-	MFI_EVT_LOCALE_BBU =		0x0008,
-	MFI_EVT_LOCALE_SAS =		0x0010,
-	MFI_EVT_LOCALE_CTRL =		0x0020,
-	MFI_EVT_LOCALE_CONFIG =		0x0040,
-	MFI_EVT_LOCALE_CLUSTER =	0x0080,
-	MFI_EVT_LOCALE_ALL =		0xffff
-} mfi_evt_locale_t;
-
-typedef enum {
-	MR_EVT_ARGS_NONE =		0x00,
-	MR_EVT_ARGS_CDB_SENSE,
-	MR_EVT_ARGS_LD,
-	MR_EVT_ARGS_LD_COUNT,
-	MR_EVT_ARGS_LD_LBA,
-	MR_EVT_ARGS_LD_OWNER,
-	MR_EVT_ARGS_LD_LBA_PD_LBA,
-	MR_EVT_ARGS_LD_PROG,
-	MR_EVT_ARGS_LD_STATE,
-	MR_EVT_ARGS_LD_STRIP,
-	MR_EVT_ARGS_PD,
-	MR_EVT_ARGS_PD_ERR,
-	MR_EVT_ARGS_PD_LBA,
-	MR_EVT_ARGS_PD_LBA_LD,
-	MR_EVT_ARGS_PD_PROG,
-	MR_EVT_ARGS_PD_STATE,
-	MR_EVT_ARGS_PCI,
-	MR_EVT_ARGS_RATE,
-	MR_EVT_ARGS_STR,
-	MR_EVT_ARGS_TIME,
-	MR_EVT_ARGS_ECC
-} mfi_evt_args;
-
-#define MR_EVT_CTRL_HOST_BUS_SCAN_REQUESTED	0x0152
-#define MR_EVT_PD_REMOVED			0x0070
-#define MR_EVT_PD_INSERTED			0x005b
-#define MR_EVT_LD_CHANGE			0x0051
-
-typedef enum {
-	MR_LD_CACHE_WRITE_BACK =	0x01,
-	MR_LD_CACHE_WRITE_ADAPTIVE =	0x02,
-	MR_LD_CACHE_READ_AHEAD =	0x04,
-	MR_LD_CACHE_READ_ADAPTIVE =	0x08,
-	MR_LD_CACHE_WRITE_CACHE_BAD_BBU=0x10,
-	MR_LD_CACHE_ALLOW_WRITE_CACHE =	0x20,
-	MR_LD_CACHE_ALLOW_READ_CACHE =	0x40
-} mfi_ld_cache;
-#define	MR_LD_CACHE_MASK	0x7f
-
-#define	MR_LD_CACHE_POLICY_READ_AHEAD_NONE		0
-#define	MR_LD_CACHE_POLICY_READ_AHEAD_ALWAYS		MR_LD_CACHE_READ_AHEAD
-#define	MR_LD_CACHE_POLICY_READ_AHEAD_ADAPTIVE		\
-	(MR_LD_CACHE_READ_AHEAD | MR_LD_CACHE_READ_ADAPTIVE)
-#define	MR_LD_CACHE_POLICY_WRITE_THROUGH		0
-#define	MR_LD_CACHE_POLICY_WRITE_BACK			MR_LD_CACHE_WRITE_BACK
-#define	MR_LD_CACHE_POLICY_IO_CACHED			\
-	(MR_LD_CACHE_ALLOW_WRITE_CACHE | MR_LD_CACHE_ALLOW_READ_CACHE)
-#define	MR_LD_CACHE_POLICY_IO_DIRECT			0
-
-typedef enum {
-	MR_PD_CACHE_UNCHANGED  =	0,
-	MR_PD_CACHE_ENABLE =		1,
-	MR_PD_CACHE_DISABLE =		2
-} mfi_pd_cache;
-
-typedef enum {
-	MR_PD_QUERY_TYPE_ALL =		0,
-	MR_PD_QUERY_TYPE_STATE =	1,
-	MR_PD_QUERY_TYPE_POWER_STATE =	2,
-	MR_PD_QUERY_TYPE_MEDIA_TYPE =	3,
-	MR_PD_QUERY_TYPE_SPEED =	4,
-	MR_PD_QUERY_TYPE_EXPOSED_TO_HOST = 5 /*query for system drives */
-} mfi_pd_query_type;
-
-/*
- * Other propertities and definitions
- */
-#define MFI_MAX_PD_CHANNELS	2
-#define MFI_MAX_LD_CHANNELS	2
-#define MFI_MAX_CHANNELS	(MFI_MAX_PD_CHANNELS + MFI_MAX_LD_CHANNELS)
-#define MFI_MAX_CHANNEL_DEVS	128
-#define MFI_DEFAULT_ID		-1
-#define MFI_MAX_LUN		8
-#define MFI_MAX_LD		64
-#define	MFI_MAX_PD		256
-
-#define MFI_FRAME_SIZE		64
-#define MFI_MBOX_SIZE		12
-
-/* Firmware flashing can take 50+ seconds */
-#define MFI_POLL_TIMEOUT_SECS	60
-
-/* Allow for speedier math calculations */
-#define MFI_SECTOR_LEN		512
-
-/* Scatter Gather elements */
-struct mfi_sg32 {
-	uint32_t	addr;
-	uint32_t	len;
-} __packed;
-
-struct mfi_sg64 {
-	uint64_t	addr;
-	uint32_t	len;
-} __packed;
-
-struct mfi_sg_skinny {
-	uint64_t	addr;
-	uint32_t	len;
-	uint32_t	flag;
-} __packed;
-
-union mfi_sgl {
-	struct mfi_sg32		sg32[1];
-	struct mfi_sg64		sg64[1];
-	struct mfi_sg_skinny	sg_skinny[1];
-} __packed;
-
-/* Message frames.  All messages have a common header */
-struct mfi_frame_header {
-	uint8_t		cmd;
-	uint8_t		sense_len;
-	uint8_t		cmd_status;
-	uint8_t		scsi_status;
-	uint8_t		target_id;
-	uint8_t		lun_id;
-	uint8_t		cdb_len;
-	uint8_t		sg_count;
-	uint32_t	context;
-	/*
-	 * pad0 is MSI Specific. Not used by Driver. Zero the value before
-	 * sending the command to f/w.
-	 */
-	uint32_t	pad0;
-	uint16_t	flags;
-#define MFI_FRAME_DATAOUT	0x08
-#define MFI_FRAME_DATAIN	0x10
-	uint16_t	timeout;
-	uint32_t	data_len;
-} __packed;
-
-struct mfi_init_frame {
-	struct mfi_frame_header	header;
-	uint32_t	qinfo_new_addr_lo;
-	uint32_t	qinfo_new_addr_hi;
-	uint32_t	qinfo_old_addr_lo;
-	uint32_t	qinfo_old_addr_hi;
-	// Start LSIP200113393
-	uint32_t	driver_ver_lo;      /*28h */
-	uint32_t	driver_ver_hi;      /*2Ch */
-
-	uint32_t	reserved[4];
-	// End LSIP200113393
-} __packed;
-
-/*
- * Define MFI Address Context union.
- */
-#ifdef MFI_ADDRESS_IS_uint64_t
-    typedef uint64_t     MFI_ADDRESS;
-#else
-    typedef union _MFI_ADDRESS {
-        struct {
-            uint32_t     addressLow;
-            uint32_t     addressHigh;
-        } u;
-        uint64_t     address;
-    } MFI_ADDRESS, *PMFI_ADDRESS;
-#endif
-
-#define MFI_IO_FRAME_SIZE 40
-struct mfi_io_frame {
-	struct mfi_frame_header	header;
-	uint32_t	sense_addr_lo;
-	uint32_t	sense_addr_hi;
-	uint32_t	lba_lo;
-	uint32_t	lba_hi;
-	union mfi_sgl	sgl;
-} __packed;
-
-#define MFI_PASS_FRAME_SIZE 48
-struct mfi_pass_frame {
-	struct mfi_frame_header header;
-	uint32_t	sense_addr_lo;
-	uint32_t	sense_addr_hi;
-	uint8_t		cdb[16];
-	union mfi_sgl	sgl;
-} __packed;
-
-#define MFI_DCMD_FRAME_SIZE 40
-struct mfi_dcmd_frame {
-	struct mfi_frame_header header;
-	uint32_t	opcode;
-	uint8_t		mbox[MFI_MBOX_SIZE];
-	union mfi_sgl	sgl;
-} __packed;
-
-struct mfi_abort_frame {
-	struct mfi_frame_header header;
-	uint32_t	abort_context;
-	/* pad is changed to reserved.*/
-	uint32_t	reserved0;
-	uint32_t	abort_mfi_addr_lo;
-	uint32_t	abort_mfi_addr_hi;
-	uint32_t	reserved1[6];
-} __packed;
-
-struct mfi_smp_frame {
-	struct mfi_frame_header header;
-	uint64_t	sas_addr;
-	union {
-		struct mfi_sg32 sg32[2];
-		struct mfi_sg64 sg64[2];
-	} sgl;
-} __packed;
-
-struct mfi_stp_frame {
-	struct mfi_frame_header header;
-	uint16_t	fis[10];
-	uint32_t	stp_flags;
-	union {
-		struct mfi_sg32 sg32[2];
-		struct mfi_sg64 sg64[2];
-	} sgl;
-} __packed;
-
-union mfi_frame {
-	struct mfi_frame_header header;
-	struct mfi_init_frame	init;
-	/* ThunderBolt Initialization */
-	struct mfi_io_frame	io;
-	struct mfi_pass_frame	pass;
-	struct mfi_dcmd_frame	dcmd;
-	struct mfi_abort_frame	abort;
-	struct mfi_smp_frame	smp;
-	struct mfi_stp_frame	stp;
-	uint8_t			bytes[MFI_FRAME_SIZE];
-};
-
-#define MFI_SENSE_LEN 128
-struct mfi_sense {
-	uint8_t		data[MFI_SENSE_LEN];
-};
-
-/* The queue init structure that is passed with the init message */
-struct mfi_init_qinfo {
-	uint32_t	flags;
-	uint32_t	rq_entries;
-	uint32_t	rq_addr_lo;
-	uint32_t	rq_addr_hi;
-	uint32_t	pi_addr_lo;
-	uint32_t	pi_addr_hi;
-	uint32_t	ci_addr_lo;
-	uint32_t	ci_addr_hi;
-} __packed;
-
-/* SAS (?) controller properties, part of mfi_ctrl_info */
-struct mfi_ctrl_props {
-	uint16_t	seq_num;
-	uint16_t	pred_fail_poll_interval;
-	uint16_t	intr_throttle_cnt;
-	uint16_t	intr_throttle_timeout;
-	uint8_t		rebuild_rate;
-	uint8_t		patrol_read_rate;
-	uint8_t		bgi_rate;
-	uint8_t		cc_rate;
-	uint8_t		recon_rate;
-	uint8_t		cache_flush_interval;
-	uint8_t		spinup_drv_cnt;
-	uint8_t		spinup_delay;
-	uint8_t		cluster_enable;
-	uint8_t		coercion_mode;
-	uint8_t		alarm_enable;
-	uint8_t		disable_auto_rebuild;
-	uint8_t		disable_battery_warn;
-	uint8_t		ecc_bucket_size;
-	uint16_t	ecc_bucket_leak_rate;
-	uint8_t		restore_hotspare_on_insertion;
-	uint8_t		expose_encl_devices;
-	uint8_t		maintainPdFailHistory;
-	uint8_t		disallowHostRequestReordering;
-	/* set TRUE to abort CC on detecting an inconsistency */
-	uint8_t		abortCCOnError;
-	/* load balance mode (MR_LOAD_BALANCE_MODE) */
-	uint8_t		loadBalanceMode;
-	/*
-	 * 0 - use auto detect logic of backplanes like SGPIO, i2c SEP using
-	 *     h/w mechansim like GPIO pins
-	 * 1 - disable auto detect SGPIO,
-	 * 2 - disable i2c SEP auto detect
-	 * 3 - disable both auto detect
-	 */
-	uint8_t		disableAutoDetectBackplane;
-	/*
-	 * % of source LD to be reserved for a VDs snapshot in snapshot
-	 * repository, for metadata and user data: 1=5%, 2=10%, 3=15% and so on
-	 */
-	uint8_t		snapVDSpace;
-
-	/*
-	 * Add properties that can be controlled by a bit in the following
-	 * structure.
-	 */
-	struct {
-		/* set TRUE to disable copyBack (0=copback enabled) */
-		uint32_t	copyBackDisabled		:1;
-		uint32_t	SMARTerEnabled			:1;
-		uint32_t	prCorrectUnconfiguredAreas	:1;
-		uint32_t	useFdeOnly			:1;
-		uint32_t	disableNCQ			:1;
-		uint32_t	SSDSMARTerEnabled		:1;
-		uint32_t	SSDPatrolReadEnabled		:1;
-		uint32_t	enableSpinDownUnconfigured	:1;
-		uint32_t	autoEnhancedImport		:1;
-		uint32_t	enableSecretKeyControl		:1;
-		uint32_t	disableOnlineCtrlReset		:1;
-		uint32_t	allowBootWithPinnedCache	:1;
-		uint32_t	disableSpinDownHS		:1;
-		uint32_t	enableJBOD			:1;
-		uint32_t	reserved			:18;
-	} OnOffProperties;
-	/*
-	 * % of source LD to be reserved for auto snapshot in snapshot
-	 * repository, for metadata and user data: 1=5%, 2=10%, 3=15% and so on.
-	 */
-	uint8_t		autoSnapVDSpace;
-	/*
-	 * Snapshot writeable VIEWs capacity as a % of source LD capacity:
-	 * 0=READ only, 1=5%, 2=10%, 3=15% and so on.
-	 */
-	uint8_t		viewSpace;
-	/* # of idle minutes before device is spun down (0=use FW defaults) */
-	uint16_t	spinDownTime;
-	uint8_t		reserved[24];
-} __packed;
-
-/* PCI information about the card. */
-struct mfi_info_pci {
-	uint16_t	vendor;
-	uint16_t	device;
-	uint16_t	subvendor;
-	uint16_t	subdevice;
-	uint8_t		reserved[24];
-} __packed;
-
-/* Host (front end) interface information */
-struct mfi_info_host {
-	uint8_t		type;
-#define MFI_INFO_HOST_PCIX	0x01
-#define MFI_INFO_HOST_PCIE	0x02
-#define MFI_INFO_HOST_ISCSI	0x04
-#define MFI_INFO_HOST_SAS3G	0x08
-	uint8_t		reserved[6];
-	uint8_t		port_count;
-	uint64_t	port_addr[8];
-} __packed;
-
-/* Device (back end) interface information */
-struct mfi_info_device {
-	uint8_t		type;
-#define MFI_INFO_DEV_SPI	0x01
-#define MFI_INFO_DEV_SAS3G	0x02
-#define MFI_INFO_DEV_SATA1	0x04
-#define MFI_INFO_DEV_SATA3G	0x08
-	uint8_t		reserved[6];
-	uint8_t		port_count;
-	uint64_t	port_addr[8];
-} __packed;
-
-/* Firmware component information */
-struct mfi_info_component {
-	char		 name[8];
-	char		 version[32];
-	char		 build_date[16];
-	char		 build_time[16];
-} __packed;
-
-/* Controller default settings */
-struct mfi_defaults {
-	uint64_t	sas_addr;
-	uint8_t		phy_polarity;
-	uint8_t		background_rate;
-	uint8_t		stripe_size;
-	uint8_t		flush_time;
-	uint8_t		write_back;
-	uint8_t		read_ahead;
-	uint8_t		cache_when_bbu_bad;
-	uint8_t		cached_io;
-	uint8_t		smart_mode;
-	uint8_t		alarm_disable;
-	uint8_t		coercion;
-	uint8_t		zrc_config;
-	uint8_t		dirty_led_shows_drive_activity;
-	uint8_t		bios_continue_on_error;
-	uint8_t		spindown_mode;
-	uint8_t		allowed_device_types;
-	uint8_t		allow_mix_in_enclosure;
-	uint8_t		allow_mix_in_ld;
-	uint8_t		allow_sata_in_cluster;
-	uint8_t		max_chained_enclosures;
-	uint8_t		disable_ctrl_r;
-	uint8_t		enabel_web_bios;
-	uint8_t		phy_polarity_split;
-	uint8_t		direct_pd_mapping;
-	uint8_t		bios_enumerate_lds;
-	uint8_t		restored_hot_spare_on_insertion;
-	uint8_t		expose_enclosure_devices;
-	uint8_t		maintain_pd_fail_history;
-	uint8_t		resv[28];
-} __packed;
-
-/* Controller default settings */
-struct mfi_bios_data {
-	uint16_t	boot_target_id;
-	uint8_t		do_not_int_13;
-	uint8_t		continue_on_error;
-	uint8_t		verbose;
-	uint8_t		geometry;
-	uint8_t		expose_all_drives;
-	uint8_t		reserved[56];
-	uint8_t		check_sum;
-} __packed;
-
-/* SAS (?) controller info, returned from MFI_DCMD_CTRL_GETINFO. */
-struct mfi_ctrl_info {
-	struct mfi_info_pci	pci;
-	struct mfi_info_host	host;
-	struct mfi_info_device	device;
-
-	/* Firmware components that are present and active. */
-	uint32_t		image_check_word;
-	uint32_t		image_component_count;
-	struct mfi_info_component image_component[8];
-
-	/* Firmware components that have been flashed but are inactive */
-	uint32_t		pending_image_component_count;
-	struct mfi_info_component pending_image_component[8];
-
-	uint8_t			max_arms;
-	uint8_t			max_spans;
-	uint8_t			max_arrays;
-	uint8_t			max_lds;
-	char			product_name[80];
-	char			serial_number[32];
-	uint32_t		hw_present;
-#define MFI_INFO_HW_BBU		0x01
-#define MFI_INFO_HW_ALARM	0x02
-#define MFI_INFO_HW_NVRAM	0x04
-#define MFI_INFO_HW_UART	0x08
-	uint32_t		current_fw_time;
-	uint16_t		max_cmds;
-	uint16_t		max_sg_elements;
-	uint32_t		max_request_size;
-	uint16_t		lds_present;
-	uint16_t		lds_degraded;
-	uint16_t		lds_offline;
-	uint16_t		pd_present;
-	uint16_t		pd_disks_present;
-	uint16_t		pd_disks_pred_failure;
-	uint16_t		pd_disks_failed;
-	uint16_t		nvram_size;
-	uint16_t		memory_size;
-	uint16_t		flash_size;
-	uint16_t		ram_correctable_errors;
-	uint16_t		ram_uncorrectable_errors;
-	uint8_t			cluster_allowed;
-	uint8_t			cluster_active;
-	uint16_t		max_strips_per_io;
-
-	uint32_t		raid_levels;
-#define MFI_INFO_RAID_0		0x01
-#define MFI_INFO_RAID_1		0x02
-#define MFI_INFO_RAID_5		0x04
-#define MFI_INFO_RAID_1E	0x08
-#define MFI_INFO_RAID_6		0x10
-
-	uint32_t		adapter_ops;
-#define MFI_INFO_AOPS_RBLD_RATE		0x0001
-#define MFI_INFO_AOPS_CC_RATE		0x0002
-#define MFI_INFO_AOPS_BGI_RATE		0x0004
-#define MFI_INFO_AOPS_RECON_RATE	0x0008
-#define MFI_INFO_AOPS_PATROL_RATE	0x0010
-#define MFI_INFO_AOPS_ALARM_CONTROL	0x0020
-#define MFI_INFO_AOPS_CLUSTER_SUPPORTED	0x0040
-#define MFI_INFO_AOPS_BBU		0x0080
-#define MFI_INFO_AOPS_SPANNING_ALLOWED	0x0100
-#define MFI_INFO_AOPS_DEDICATED_SPARES	0x0200
-#define MFI_INFO_AOPS_REVERTIBLE_SPARES	0x0400
-#define MFI_INFO_AOPS_FOREIGN_IMPORT	0x0800
-#define MFI_INFO_AOPS_SELF_DIAGNOSTIC	0x1000
-#define MFI_INFO_AOPS_MIXED_ARRAY	0x2000
-#define MFI_INFO_AOPS_GLOBAL_SPARES	0x4000
-
-	uint32_t		ld_ops;
-#define MFI_INFO_LDOPS_READ_POLICY	0x01
-#define MFI_INFO_LDOPS_WRITE_POLICY	0x02
-#define MFI_INFO_LDOPS_IO_POLICY	0x04
-#define MFI_INFO_LDOPS_ACCESS_POLICY	0x08
-#define MFI_INFO_LDOPS_DISK_CACHE_POLICY 0x10
-
-	struct {
-		uint8_t		min;
-		uint8_t		max;
-		uint8_t		reserved[2];
-	} __packed stripe_sz_ops;
-
-	uint32_t		pd_ops;
-#define MFI_INFO_PDOPS_FORCE_ONLINE	0x01
-#define MFI_INFO_PDOPS_FORCE_OFFLINE	0x02
-#define MFI_INFO_PDOPS_FORCE_REBUILD	0x04
-
-	uint32_t		pd_mix_support;
-#define MFI_INFO_PDMIX_SAS		0x01
-#define MFI_INFO_PDMIX_SATA		0x02
-#define MFI_INFO_PDMIX_ENCL		0x04
-#define MFI_INFO_PDMIX_LD		0x08
-#define MFI_INFO_PDMIX_SATA_CLUSTER	0x10
-
-	uint8_t			ecc_bucket_count;
-	uint8_t			reserved2[11];
-	struct mfi_ctrl_props	properties;
-	char			package_version[0x60];
-	uint8_t			pad[0x800 - 0x6a0];
-} __packed;
-
-/* keep track of an event. */
-union mfi_evt {
-	struct {
-		uint16_t	locale;
-		uint8_t		reserved;
-		int8_t		evt_class;
-	} members;
-	uint32_t		word;
-} __packed;
-
-/* event log state. */
-struct mfi_evt_log_state {
-	uint32_t		newest_seq_num;
-	uint32_t		oldest_seq_num;
-	uint32_t		clear_seq_num;
-	uint32_t		shutdown_seq_num;
-	uint32_t		boot_seq_num;
-} __packed;
-
-struct mfi_progress {
-	uint16_t		progress;
-	uint16_t		elapsed_seconds;
-} __packed;
-
-struct mfi_evt_ld {
-	uint16_t		target_id;
-	uint8_t			ld_index;
-	uint8_t			reserved;
-} __packed;
-
-struct mfi_evt_pd {
-	uint16_t		device_id;
-	uint8_t			enclosure_index;
-	uint8_t			slot_number;
-} __packed;
-
-/* SAS (?) event detail, returned from MFI_DCMD_CTRL_EVENT_WAIT. */
-struct mfi_evt_detail {
-	uint32_t		seq;
-	uint32_t		time;
-	uint32_t		code;
-	union mfi_evt		evt_class;
-	uint8_t			arg_type;
-	uint8_t			reserved1[15];
-
-	union {
-		struct {
-			struct mfi_evt_pd	pd;
-			uint8_t			cdb_len;
-			uint8_t			sense_len;
-			uint8_t			reserved[2];
-			uint8_t			cdb[16];
-			uint8_t			sense[64];
-		} cdb_sense;
-
-		struct mfi_evt_ld		ld;
-
-		struct {
-			struct mfi_evt_ld	ld;
-			uint64_t		count;
-		} ld_count;
-
-		struct {
-			uint64_t		lba;
-			struct mfi_evt_ld	ld;
-		} ld_lba;
-
-		struct {
-			struct mfi_evt_ld	ld;
-			uint32_t		pre_owner;
-			uint32_t		new_owner;
-		} ld_owner;
-
-		struct {
-			uint64_t		ld_lba;
-			uint64_t		pd_lba;
-			struct mfi_evt_ld	ld;
-			struct mfi_evt_pd	pd;
-		} ld_lba_pd_lba;
-
-		struct {
-			struct mfi_evt_ld	ld;
-			struct mfi_progress	prog;
-		} ld_prog;
-
-		struct {
-			struct mfi_evt_ld	ld;
-			uint32_t		prev_state;
-			uint32_t		new_state;
-		} ld_state;
-
-		struct {
-			uint64_t		strip;
-			struct mfi_evt_ld	ld;
-		} ld_strip;
-
-		struct mfi_evt_pd		pd;
-
-		struct {
-			struct mfi_evt_pd	pd;
-			uint32_t		err;
-		} pd_err;
-
-		struct {
-			uint64_t		lba;
-			struct mfi_evt_pd	pd;
-		} pd_lba;
-
-		struct {
-			uint64_t		lba;
-			struct mfi_evt_pd	pd;
-			struct mfi_evt_ld	ld;
-		} pd_lba_ld;
-
-		struct {
-			struct mfi_evt_pd	pd;
-			struct mfi_progress	prog;
-		} pd_prog;
-
-		struct {
-			struct mfi_evt_pd	ld;
-			uint32_t		prev_state;
-			uint32_t		new_state;
-		} pd_state;
-
-		struct {
-			uint16_t		venderId;
-			uint16_t		deviceId;
-			uint16_t		subVenderId;
-			uint16_t		subDeviceId;
-		} pci;
-
-		uint32_t			rate;
-
-		char				str[96];
-
-		struct {
-			uint32_t		rtc;
-			uint16_t		elapsedSeconds;
-		} time;
-
-		struct {
-			uint32_t		ecar;
-			uint32_t		elog;
-			char			str[64];
-		} ecc;
-
-		uint8_t		b[96];
-		uint16_t	s[48];
-		uint32_t	w[24];
-		uint64_t	d[12];
-	} args;
-
-	char description[128];
-} __packed;
-
-struct mfi_evt_list {
-	uint32_t		count;
-	uint32_t		reserved;
-	struct mfi_evt_detail	event[1];
-} __packed;
-
-union mfi_pd_ref {
-	struct {
-		uint16_t	device_id;
-		uint16_t	seq_num;
-	} v;
-	uint32_t	ref;
-} __packed;
-
-union mfi_pd_ddf_type {
-	struct {
-		union {
-			struct {
-				uint16_t	forced_pd_guid	: 1;
-				uint16_t	in_vd		: 1;
-				uint16_t	is_global_spare	: 1;
-				uint16_t	is_spare	: 1;
-				uint16_t	is_foreign	: 1;
-				uint16_t	reserved	: 7;
-				uint16_t	intf		: 4;
-			} pd_type;
-			uint16_t	type;
-		} v;
-		uint16_t		reserved;
-	} ddf;
-	struct {
-		uint32_t		reserved;
-	} non_disk;
-	uint32_t			type;
-} __packed;
-
-struct mfi_pd_progress {
-	uint32_t			active;
-#define	MFI_PD_PROGRESS_REBUILD	(1<<0)
-#define	MFI_PD_PROGRESS_PATROL	(1<<1)
-#define	MFI_PD_PROGRESS_CLEAR	(1<<2)
-	struct mfi_progress		rbld;
-	struct mfi_progress		patrol;
-	struct mfi_progress		clear;
-	struct mfi_progress		reserved[4];
-} __packed;
-
-struct mfi_pd_info {
-	union mfi_pd_ref		ref;
-	uint8_t				inquiry_data[96];
-	uint8_t				vpd_page83[64];
-	uint8_t				not_supported;
-	uint8_t				scsi_dev_type;
-	uint8_t				connected_port_bitmap;
-	uint8_t				device_speed;
-	uint32_t			media_err_count;
-	uint32_t			other_err_count;
-	uint32_t			pred_fail_count;
-	uint32_t			last_pred_fail_event_seq_num;
-	uint16_t			fw_state;	/* MFI_PD_STATE_* */
-	uint8_t				disabled_for_removal;
-	uint8_t				link_speed;
-	union mfi_pd_ddf_type		state;
-	struct {
-		uint8_t			count;
-		uint8_t			is_path_broken;
-		uint8_t			reserved[6];
-		uint64_t		sas_addr[4];
-	} path_info;
-	uint64_t			raw_size;
-	uint64_t			non_coerced_size;
-	uint64_t			coerced_size;
-	uint16_t			encl_device_id;
-	uint8_t				encl_index;
-	uint8_t				slot_number;
-	struct mfi_pd_progress		prog_info;
-	uint8_t				bad_block_table_full;
-	uint8_t				unusable_in_current_config;
-	uint8_t				vpd_page83_ext[64];
-	uint8_t				reserved[512-358];
-} __packed;
-
-struct mfi_pd_address {
-	uint16_t		device_id;
-	uint16_t		encl_device_id;
-	uint8_t			encl_index;
-	uint8_t			slot_number;
-	uint8_t			scsi_dev_type;	/* 0 = disk */
-	uint8_t			connect_port_bitmap;
-	uint64_t		sas_addr[2];
-} __packed;
-
-#define MAX_SYS_PDS 240
-struct mfi_pd_list {
-	uint32_t		size;
-	uint32_t		count;
-	struct mfi_pd_address	addr[MAX_SYS_PDS];
-} __packed;
-
-enum mfi_pd_state {
-	MFI_PD_STATE_UNCONFIGURED_GOOD = 0x00,
-	MFI_PD_STATE_UNCONFIGURED_BAD = 0x01,
-	MFI_PD_STATE_HOT_SPARE = 0x02,
-	MFI_PD_STATE_OFFLINE = 0x10,
-	MFI_PD_STATE_FAILED = 0x11,
-	MFI_PD_STATE_REBUILD = 0x14,
-	MFI_PD_STATE_ONLINE = 0x18,
-	MFI_PD_STATE_COPYBACK = 0x20,
-	MFI_PD_STATE_SYSTEM = 0x40
-};
-
-/*
- * "SYSTEM" disk appears to be "JBOD" support from the RAID controller.
- * Adding a #define to denote this.
- */
-#define MFI_PD_STATE_JBOD MFI_PD_STATE_SYSTEM
-
-union mfi_ld_ref {
-	struct {
-		uint8_t		target_id;
-		uint8_t		reserved;
-		uint16_t	seq;
-	} v;
-	uint32_t		ref;
-} __packed;
-
-struct mfi_ld_list {
-	uint32_t		ld_count;
-	uint32_t		reserved1;
-	struct {
-		union mfi_ld_ref	ld;
-		uint8_t		state;
-		uint8_t		reserved2[3];
-		uint64_t	size;
-	} ld_list[MFI_MAX_LD];
-} __packed;
-
-enum mfi_ld_access {
-	MFI_LD_ACCESS_RW =	0,
-	MFI_LD_ACCSSS_RO = 	2,
-	MFI_LD_ACCESS_BLOCKED =	3,
-};
-#define MFI_LD_ACCESS_MASK	3
-
-enum mfi_ld_state {
-	MFI_LD_STATE_OFFLINE =			0,
-	MFI_LD_STATE_PARTIALLY_DEGRADED =	1,
-	MFI_LD_STATE_DEGRADED =			2,
-	MFI_LD_STATE_OPTIMAL =			3
-};
-
-struct mfi_ld_props {
-	union mfi_ld_ref	ld;
-	char			name[16];
-	uint8_t			default_cache_policy;
-	uint8_t			access_policy;
-	uint8_t			disk_cache_policy;
-	uint8_t			current_cache_policy;
-	uint8_t			no_bgi;
-	uint8_t			reserved[7];
-} __packed;
-
-struct mfi_ld_params {
-	uint8_t			primary_raid_level;
-	uint8_t			raid_level_qualifier;
-	uint8_t			secondary_raid_level;
-	uint8_t			stripe_size;
-	uint8_t			num_drives;
-	uint8_t			span_depth;
-	uint8_t			state;
-	uint8_t			init_state;
-#define	MFI_LD_PARAMS_INIT_NO		0
-#define	MFI_LD_PARAMS_INIT_QUICK	1
-#define	MFI_LD_PARAMS_INIT_FULL		2
-	uint8_t			is_consistent;
-	uint8_t			reserved1[6];
-	uint8_t			isSSCD;
-	uint8_t			reserved2[16];
-} __packed;
-
-struct mfi_ld_progress {
-	uint32_t		active;
-#define	MFI_LD_PROGRESS_CC	(1<<0)
-#define	MFI_LD_PROGRESS_BGI	(1<<1)
-#define	MFI_LD_PROGRESS_FGI	(1<<2)
-#define	MFI_LD_PROGRESS_RECON	(1<<3)
-	struct mfi_progress	cc;
-	struct mfi_progress	bgi;
-	struct mfi_progress	fgi;
-	struct mfi_progress	recon;
-	struct mfi_progress	reserved[4];
-} __packed;
-
-struct mfi_span {
-	uint64_t		start_block;
-	uint64_t		num_blocks;
-	uint16_t		array_ref;
-	uint8_t			reserved[6];
-} __packed;
-
-#define	MFI_MAX_SPAN_DEPTH	8
-struct mfi_ld_config {
-	struct mfi_ld_props	properties;
-	struct mfi_ld_params	params;
-	struct mfi_span		span[MFI_MAX_SPAN_DEPTH];
-} __packed;
-
-struct mfi_ld_info {
-	struct mfi_ld_config	ld_config;
-	uint64_t		size;
-	struct mfi_ld_progress	progress;
-	uint16_t		cluster_owner;
-	uint8_t			reconstruct_active;
-	uint8_t			reserved1[1];
-	uint8_t			vpd_page83[64];
-	uint8_t			reserved2[16];
-} __packed;
-
-#define MFI_MAX_ARRAYS 16
-struct mfi_spare {
-	union mfi_pd_ref	ref;
-	uint8_t			spare_type;
-#define	MFI_SPARE_DEDICATED	(1 << 0)
-#define	MFI_SPARE_REVERTIBLE	(1 << 1)
-#define	MFI_SPARE_ENCL_AFFINITY	(1 << 2)
-	uint8_t			reserved[2];
-	uint8_t			array_count;
-	uint16_t		array_ref[MFI_MAX_ARRAYS];
-} __packed;
-
-#define MFI_MAX_ROW_SIZE 32
-struct mfi_array {
-	uint64_t			size;
-	uint8_t				num_drives;
-	uint8_t				reserved;
-	uint16_t			array_ref;
-	uint8_t				pad[20];
-	struct {
-		union mfi_pd_ref	ref;	/* 0xffff == missing drive */
-		uint16_t		fw_state;	/* MFI_PD_STATE_* */
-		struct {
-			uint8_t		pd;
-			uint8_t		slot;
-		} encl;
-	} pd[MFI_MAX_ROW_SIZE];
-} __packed;
-
-struct mfi_config_data {
-	uint32_t		size;
-	uint16_t		array_count;
-	uint16_t		array_size;
-	uint16_t		log_drv_count;
-	uint16_t		log_drv_size;
-	uint16_t		spares_count;
-	uint16_t		spares_size;
-	uint8_t			reserved[16];
-	struct mfi_array	array[0];
-	struct mfi_ld_config	ld[0];
-	struct mfi_spare	spare[0];
-} __packed;
-
-struct mfi_bbu_capacity_info {
-	uint16_t		relative_charge;
-	uint16_t		absolute_charge;
-	uint16_t		remaining_capacity;
-	uint16_t		full_charge_capacity;
-	uint16_t		run_time_to_empty;
-	uint16_t		average_time_to_empty;
-	uint16_t		average_time_to_full;
-	uint16_t		cycle_count;
-	uint16_t		max_error;
-	uint16_t		remaining_capacity_alarm;
-	uint16_t		remaining_time_alarm;
-	uint8_t			reserved[26];
-} __packed;
-
-struct mfi_bbu_design_info {
-	uint32_t		mfg_date;
-	uint16_t		design_capacity;
-	uint16_t		design_voltage;
-	uint16_t		spec_info;
-	uint16_t		serial_number;
-	uint16_t		pack_stat_config;
-	uint8_t			mfg_name[12];
-	uint8_t			device_name[8];
-	uint8_t			device_chemistry[8];
-	uint8_t			mfg_data[8];
-	uint8_t			reserved[17];
-} __packed;
-
-struct mfi_ibbu_state {
-	uint16_t		gas_guage_status;
-	uint16_t		relative_charge;
-	uint16_t		charger_system_state;
-	uint16_t		charger_system_ctrl;
-	uint16_t		charging_current;
-	uint16_t		absolute_charge;
-	uint16_t		max_error;
-	uint8_t			reserved[18];
-} __packed;
-
-struct mfi_bbu_state {
-	uint16_t		gas_guage_status;
-	uint16_t		relative_charge;
-	uint16_t		charger_status;
-	uint16_t		remaining_capacity;
-	uint16_t		full_charge_capacity;
-	uint8_t			is_SOH_good;
-	uint8_t			reserved[21];
-} __packed;
-
-struct mfi_bbu_properties {
-	uint32_t		auto_learn_period;
-	uint32_t		next_learn_time;
-	uint8_t			learn_delay_interval;
-	uint8_t			auto_learn_mode;
-	uint8_t			bbu_mode;
-	uint8_t			reserved[21];
-} __packed;
-
-union mfi_bbu_status_detail {
-	struct mfi_ibbu_state	ibbu;
-	struct mfi_bbu_state	bbu;
-};
-
-struct mfi_bbu_status {
-	uint8_t			battery_type;
-#define	MFI_BBU_TYPE_NONE	0
-#define	MFI_BBU_TYPE_IBBU	1
-#define	MFI_BBU_TYPE_BBU	2
-	uint8_t			reserved;
-	uint16_t		voltage;
-	int16_t			current;
-	uint16_t		temperature;
-	uint32_t		fw_status;
-#define	MFI_BBU_STATE_PACK_MISSING	(1 << 0)
-#define	MFI_BBU_STATE_VOLTAGE_LOW	(1 << 1)
-#define	MFI_BBU_STATE_TEMPERATURE_HIGH	(1 << 2)
-#define	MFI_BBU_STATE_CHARGE_ACTIVE	(1 << 3)
-#define	MFI_BBU_STATE_DISCHARGE_ACTIVE	(1 << 4)
-#define	MFI_BBU_STATE_LEARN_CYC_REQ	(1 << 5)
-#define	MFI_BBU_STATE_LEARN_CYC_ACTIVE	(1 << 6)
-#define	MFI_BBU_STATE_LEARN_CYC_FAIL	(1 << 7)
-#define	MFI_BBU_STATE_LEARN_CYC_TIMEOUT	(1 << 8)
-#define	MFI_BBU_STATE_I2C_ERR_DETECT	(1 << 9)
-	uint8_t			pad[20];
-	union mfi_bbu_status_detail detail;
-} __packed;
-
-enum mfi_pr_state {
-	MFI_PR_STATE_STOPPED = 0,
-	MFI_PR_STATE_READY = 1,
-	MFI_PR_STATE_ACTIVE = 2,
-	MFI_PR_STATE_ABORTED = 0xff
-};
-
-struct mfi_pr_status {
-	uint32_t		num_iteration;
-	uint8_t			state;
-	uint8_t			num_pd_done;
-	uint8_t			reserved[10];
-};
-
-enum mfi_pr_opmode {
-	MFI_PR_OPMODE_AUTO = 0,
-	MFI_PR_OPMODE_MANUAL = 1,
-	MFI_PR_OPMODE_DISABLED = 2
-};
-
-struct mfi_pr_properties {
-	uint8_t			op_mode;
-	uint8_t			max_pd;
-	uint8_t			reserved;
-	uint8_t			exclude_ld_count;
-	uint16_t		excluded_ld[MFI_MAX_LD];
-	uint8_t			cur_pd_map[MFI_MAX_PD / 8];
-	uint8_t			last_pd_map[MFI_MAX_PD / 8];
-	uint32_t		next_exec;
-	uint32_t		exec_freq;
-	uint32_t		clear_freq;
-};
-
-/* ThunderBolt support */
-
-/*
- * Raid Context structure which describes MegaRAID specific IO Paramenters
- * This resides at offset 0x60 where the SGL normally starts in MPT IO Frames
- */
-typedef struct _MPI2_SCSI_IO_VENDOR_UNIQUE {
-	uint16_t	resvd0;		/* 0x00 - 0x01 */
-	uint16_t	timeoutValue;	/* 0x02 - 0x03 */
-	uint8_t		regLockFlags;
-	uint8_t		armId;
-	uint16_t	TargetID;	/* 0x06 - 0x07 */
-
-	uint64_t	RegLockLBA;	/* 0x08 - 0x0F */
-
-	uint32_t	RegLockLength;	/* 0x10 - 0x13 */
-
-	uint16_t	SMID;		/* 0x14 - 0x15 nextLMId */
-	uint8_t		exStatus;	/* 0x16 */
-	uint8_t		Status;		/* 0x17 status */
-
-	uint8_t		RAIDFlags;	/* 0x18 */
-	uint8_t		numSGE;		/* 0x19 numSge */
-	uint16_t	configSeqNum;	/* 0x1A - 0x1B */
-	uint8_t		spanArm;	/* 0x1C */
-	uint8_t		resvd2[3];	/* 0x1D - 0x1F */
-} MPI2_SCSI_IO_VENDOR_UNIQUE, MPI25_SCSI_IO_VENDOR_UNIQUE;
-
-/*****************************************************************************
-*
-*        Message Functions
-*
-*****************************************************************************/
-
-#define NA_MPI2_FUNCTION_SCSI_IO_REQUEST            (0x00) /* SCSI IO */
-#define MPI2_FUNCTION_SCSI_TASK_MGMT                (0x01) /* SCSI Task Management */
-#define MPI2_FUNCTION_IOC_INIT                      (0x02) /* IOC Init */
-#define MPI2_FUNCTION_IOC_FACTS                     (0x03) /* IOC Facts */
-#define MPI2_FUNCTION_CONFIG                        (0x04) /* Configuration */
-#define MPI2_FUNCTION_PORT_FACTS                    (0x05) /* Port Facts */
-#define MPI2_FUNCTION_PORT_ENABLE                   (0x06) /* Port Enable */
-#define MPI2_FUNCTION_EVENT_NOTIFICATION            (0x07) /* Event Notification */
-#define MPI2_FUNCTION_EVENT_ACK                     (0x08) /* Event Acknowledge */
-#define MPI2_FUNCTION_FW_DOWNLOAD                   (0x09) /* FW Download */
-#define MPI2_FUNCTION_TARGET_ASSIST                 (0x0B) /* Target Assist */
-#define MPI2_FUNCTION_TARGET_STATUS_SEND            (0x0C) /* Target Status Send */
-#define MPI2_FUNCTION_TARGET_MODE_ABORT             (0x0D) /* Target Mode Abort */
-#define MPI2_FUNCTION_FW_UPLOAD                     (0x12) /* FW Upload */
-#define MPI2_FUNCTION_RAID_ACTION                   (0x15) /* RAID Action */
-#define MPI2_FUNCTION_RAID_SCSI_IO_PASSTHROUGH      (0x16) /* SCSI IO RAID Passthrough */
-#define MPI2_FUNCTION_TOOLBOX                       (0x17) /* Toolbox */
-#define MPI2_FUNCTION_SCSI_ENCLOSURE_PROCESSOR      (0x18) /* SCSI Enclosure Processor */
-#define MPI2_FUNCTION_SMP_PASSTHROUGH               (0x1A) /* SMP Passthrough */
-#define MPI2_FUNCTION_SAS_IO_UNIT_CONTROL           (0x1B) /* SAS IO Unit Control */
-#define MPI2_FUNCTION_SATA_PASSTHROUGH              (0x1C) /* SATA Passthrough */
-#define MPI2_FUNCTION_DIAG_BUFFER_POST              (0x1D) /* Diagnostic Buffer Post */
-#define MPI2_FUNCTION_DIAG_RELEASE                  (0x1E) /* Diagnostic Release */
-#define MPI2_FUNCTION_TARGET_CMD_BUF_BASE_POST      (0x24) /* Target Command Buffer Post Base */
-#define MPI2_FUNCTION_TARGET_CMD_BUF_LIST_POST      (0x25) /* Target Command Buffer Post List */
-#define MPI2_FUNCTION_RAID_ACCELERATOR              (0x2C) /* RAID Accelerator */
-#define MPI2_FUNCTION_HOST_BASED_DISCOVERY_ACTION   (0x2F) /* Host Based Discovery Action */
-#define MPI2_FUNCTION_PWR_MGMT_CONTROL              (0x30) /* Power Management Control */
-#define MPI2_FUNCTION_MIN_PRODUCT_SPECIFIC          (0xF0) /* beginning of product-specific range */
-#define MPI2_FUNCTION_MAX_PRODUCT_SPECIFIC          (0xFF) /* end of product-specific range */
-
-/* Doorbell functions */
-#define MPI2_FUNCTION_IOC_MESSAGE_UNIT_RESET        (0x40)
-#define MPI2_FUNCTION_HANDSHAKE                     (0x42)
-
-/*****************************************************************************
-*
-*        MPI Version Definitions
-*
-*****************************************************************************/
-
-#define MPI2_VERSION_MAJOR                  (0x02)
-#define MPI2_VERSION_MINOR                  (0x00)
-#define MPI2_VERSION_MAJOR_MASK             (0xFF00)
-#define MPI2_VERSION_MAJOR_SHIFT            (8)
-#define MPI2_VERSION_MINOR_MASK             (0x00FF)
-#define MPI2_VERSION_MINOR_SHIFT            (0)
-#define MPI2_VERSION ((MPI2_VERSION_MAJOR << MPI2_VERSION_MAJOR_SHIFT) |   \
-                                      MPI2_VERSION_MINOR)
-
-#define MPI2_VERSION_02_00                  (0x0200)
-
-/* versioning for this MPI header set */
-#define MPI2_HEADER_VERSION_UNIT            (0x10)
-#define MPI2_HEADER_VERSION_DEV             (0x00)
-#define MPI2_HEADER_VERSION_UNIT_MASK       (0xFF00)
-#define MPI2_HEADER_VERSION_UNIT_SHIFT      (8)
-#define MPI2_HEADER_VERSION_DEV_MASK        (0x00FF)
-#define MPI2_HEADER_VERSION_DEV_SHIFT       (0)
-#define MPI2_HEADER_VERSION ((MPI2_HEADER_VERSION_UNIT << 8) |		\
-					MPI2_HEADER_VERSION_DEV)
-
-
-/* IOCInit Request message */
-struct MPI2_IOC_INIT_REQUEST {
-	uint8_t		WhoInit;                        /* 0x00 */
-	uint8_t		Reserved1;                      /* 0x01 */
-	uint8_t		ChainOffset;                    /* 0x02 */
-	uint8_t		Function;                       /* 0x03 */
-	uint16_t	Reserved2;                      /* 0x04 */
-	uint8_t		Reserved3;                      /* 0x06 */
-	uint8_t		MsgFlags;                       /* 0x07 */
-	uint8_t		VP_ID;                          /* 0x08 */
-	uint8_t		VF_ID;                          /* 0x09 */
-	uint16_t	Reserved4;                      /* 0x0A */
-	uint16_t	MsgVersion;                     /* 0x0C */
-	uint16_t	HeaderVersion;                  /* 0x0E */
-	uint32_t	Reserved5;                      /* 0x10 */
-	uint16_t	Reserved6;                      /* 0x14 */
-	uint8_t		Reserved7;                      /* 0x16 */
-	uint8_t		HostMSIxVectors;                /* 0x17 */
-	uint16_t	Reserved8;                      /* 0x18 */
-	uint16_t	SystemRequestFrameSize;         /* 0x1A */
-	uint16_t	ReplyDescriptorPostQueueDepth;  /* 0x1C */
-	uint16_t	ReplyFreeQueueDepth;            /* 0x1E */
-	uint32_t	SenseBufferAddressHigh;         /* 0x20 */
-	uint32_t	SystemReplyAddressHigh;         /* 0x24 */
-	uint64_t	SystemRequestFrameBaseAddress;  /* 0x28 */
-	uint64_t	ReplyDescriptorPostQueueAddress;/* 0x30 */
-	uint64_t	ReplyFreeQueueAddress;          /* 0x38 */
-	uint64_t	TimeStamp;                      /* 0x40 */
-};
-
-/* WhoInit values */
-#define MPI2_WHOINIT_NOT_INITIALIZED            (0x00)
-#define MPI2_WHOINIT_SYSTEM_BIOS                (0x01)
-#define MPI2_WHOINIT_ROM_BIOS                   (0x02)
-#define MPI2_WHOINIT_PCI_PEER                   (0x03)
-#define MPI2_WHOINIT_HOST_DRIVER                (0x04)
-#define MPI2_WHOINIT_MANUFACTURER               (0x05)
-
-struct MPI2_SGE_CHAIN_UNION {
-	uint16_t	Length;
-	uint8_t		NextChainOffset;
-	uint8_t		Flags;
-	union {
-		uint32_t	Address32;
-		uint64_t	Address64;
-	} u;
-};
-
-struct MPI2_IEEE_SGE_SIMPLE32 {
-	uint32_t	Address;
-	uint32_t	FlagsLength;
-};
-
-struct MPI2_IEEE_SGE_SIMPLE64 {
-	uint64_t	Address;
-	uint32_t	Length;
-	uint16_t	Reserved1;
-	uint8_t		Reserved2;
-	uint8_t		Flags;
-};
-
-typedef union _MPI2_IEEE_SGE_SIMPLE_UNION {
-	struct MPI2_IEEE_SGE_SIMPLE32	Simple32;
-	struct MPI2_IEEE_SGE_SIMPLE64	Simple64;
-} MPI2_IEEE_SGE_SIMPLE_UNION;
-
-typedef struct _MPI2_SGE_SIMPLE_UNION {
-	uint32_t	FlagsLength;
-	union {
-		uint32_t	Address32;
-		uint64_t	Address64;
-	} u;
-} MPI2_SGE_SIMPLE_UNION;
-
-/****************************************************************************
-*  IEEE SGE field definitions and masks
-****************************************************************************/
-
-/* Flags field bit definitions */
-
-#define MPI2_IEEE_SGE_FLAGS_ELEMENT_TYPE_MASK   (0x80)
-
-#define MPI2_IEEE32_SGE_FLAGS_SHIFT             (24)
-
-#define MPI2_IEEE32_SGE_LENGTH_MASK             (0x00FFFFFF)
-
-/* Element Type */
-
-#define MPI2_IEEE_SGE_FLAGS_SIMPLE_ELEMENT      (0x00)
-#define MPI2_IEEE_SGE_FLAGS_CHAIN_ELEMENT       (0x80)
-
-/* Data Location Address Space */
-
-#define MPI2_IEEE_SGE_FLAGS_ADDR_MASK           (0x03)
-#define MPI2_IEEE_SGE_FLAGS_SYSTEM_ADDR         (0x00)
-#define MPI2_IEEE_SGE_FLAGS_IOCDDR_ADDR         (0x01)
-#define MPI2_IEEE_SGE_FLAGS_IOCPLB_ADDR         (0x02)
-#define MPI2_IEEE_SGE_FLAGS_IOCPLBNTA_ADDR      (0x03)
-
-/* Address Size */
-
-#define MPI2_SGE_FLAGS_32_BIT_ADDRESSING        (0x00)
-#define MPI2_SGE_FLAGS_64_BIT_ADDRESSING        (0x02)
-
-/*******************/
-/* SCSI IO Control bits */
-#define MPI2_SCSIIO_CONTROL_ADDCDBLEN_MASK      (0xFC000000)
-#define MPI2_SCSIIO_CONTROL_ADDCDBLEN_SHIFT     (26)
-
-#define MPI2_SCSIIO_CONTROL_DATADIRECTION_MASK  (0x03000000)
-#define MPI2_SCSIIO_CONTROL_NODATATRANSFER      (0x00000000)
-#define MPI2_SCSIIO_CONTROL_WRITE               (0x01000000)
-#define MPI2_SCSIIO_CONTROL_READ                (0x02000000)
-#define MPI2_SCSIIO_CONTROL_BIDIRECTIONAL       (0x03000000)
-
-#define MPI2_SCSIIO_CONTROL_TASKPRI_MASK        (0x00007800)
-#define MPI2_SCSIIO_CONTROL_TASKPRI_SHIFT       (11)
-
-#define MPI2_SCSIIO_CONTROL_TASKATTRIBUTE_MASK  (0x00000700)
-#define MPI2_SCSIIO_CONTROL_SIMPLEQ             (0x00000000)
-#define MPI2_SCSIIO_CONTROL_HEADOFQ             (0x00000100)
-#define MPI2_SCSIIO_CONTROL_ORDEREDQ            (0x00000200)
-#define MPI2_SCSIIO_CONTROL_ACAQ                (0x00000400)
-
-#define MPI2_SCSIIO_CONTROL_TLR_MASK            (0x000000C0)
-#define MPI2_SCSIIO_CONTROL_NO_TLR              (0x00000000)
-#define MPI2_SCSIIO_CONTROL_TLR_ON              (0x00000040)
-#define MPI2_SCSIIO_CONTROL_TLR_OFF             (0x00000080)
-
-/*******************/
-
-typedef struct {
-	uint8_t		CDB[20];                    /* 0x00 */
-	uint32_t	PrimaryReferenceTag;        /* 0x14 */
-	uint16_t	PrimaryApplicationTag;      /* 0x18 */
-	uint16_t	PrimaryApplicationTagMask;  /* 0x1A */
-	uint32_t	TransferLength;             /* 0x1C */
-} MPI2_SCSI_IO_CDB_EEDP32;
-
-
-typedef union _MPI2_IEEE_SGE_CHAIN_UNION {
-	struct MPI2_IEEE_SGE_SIMPLE32	Chain32;
-	struct MPI2_IEEE_SGE_SIMPLE64	Chain64;
-} MPI2_IEEE_SGE_CHAIN_UNION;
-
-typedef union _MPI2_SIMPLE_SGE_UNION {
-	MPI2_SGE_SIMPLE_UNION		MpiSimple;
-	MPI2_IEEE_SGE_SIMPLE_UNION	IeeeSimple;
-} MPI2_SIMPLE_SGE_UNION;
-
-typedef union _MPI2_SGE_IO_UNION {
-	MPI2_SGE_SIMPLE_UNION		MpiSimple;
-	struct MPI2_SGE_CHAIN_UNION	MpiChain;
-	MPI2_IEEE_SGE_SIMPLE_UNION	IeeeSimple;
-	MPI2_IEEE_SGE_CHAIN_UNION	IeeeChain;
-} MPI2_SGE_IO_UNION;
-
-typedef union {
-	uint8_t			CDB32[32];
-	MPI2_SCSI_IO_CDB_EEDP32	EEDP32;
-	MPI2_SGE_SIMPLE_UNION	SGE;
-} MPI2_SCSI_IO_CDB_UNION;
-
-
-/* MPI 2.5 SGLs */
-
-#define MPI25_IEEE_SGE_FLAGS_END_OF_LIST        (0x40)
-
-typedef struct _MPI25_IEEE_SGE_CHAIN64 {
-	uint64_t	Address;
-	uint32_t	Length;
-	uint16_t	Reserved1;
-	uint8_t		NextChainOffset;
-	uint8_t		Flags;
-} MPI25_IEEE_SGE_CHAIN64, *pMpi25IeeeSgeChain64_t;
-
-/* use MPI2_IEEE_SGE_FLAGS_ defines for the Flags field */
-
-
-/********/
-
-/*
- * RAID SCSI IO Request Message
- * Total SGE count will be one less than  _MPI2_SCSI_IO_REQUEST
- */
-struct mfi_mpi2_request_raid_scsi_io {
-	uint16_t		DevHandle;                      /* 0x00 */
-	uint8_t			ChainOffset;                    /* 0x02 */
-	uint8_t			Function;                       /* 0x03 */
-	uint16_t		Reserved1;                      /* 0x04 */
-	uint8_t			Reserved2;                      /* 0x06 */
-	uint8_t			MsgFlags;                       /* 0x07 */
-	uint8_t			VP_ID;                          /* 0x08 */
-	uint8_t			VF_ID;                          /* 0x09 */
-	uint16_t		Reserved3;                      /* 0x0A */
-	uint32_t		SenseBufferLowAddress;          /* 0x0C */
-	uint16_t		SGLFlags;                       /* 0x10 */
-	uint8_t			SenseBufferLength;              /* 0x12 */
-	uint8_t			Reserved4;                      /* 0x13 */
-	uint8_t			SGLOffset0;                     /* 0x14 */
-	uint8_t			SGLOffset1;                     /* 0x15 */
-	uint8_t			SGLOffset2;                     /* 0x16 */
-	uint8_t			SGLOffset3;                     /* 0x17 */
-	uint32_t		SkipCount;                      /* 0x18 */
-	uint32_t		DataLength;                     /* 0x1C */
-	uint32_t		BidirectionalDataLength;        /* 0x20 */
-	uint16_t		IoFlags;                        /* 0x24 */
-	uint16_t		EEDPFlags;                      /* 0x26 */
-	uint32_t		EEDPBlockSize;                  /* 0x28 */
-	uint32_t		SecondaryReferenceTag;          /* 0x2C */
-	uint16_t		SecondaryApplicationTag;        /* 0x30 */
-	uint16_t		ApplicationTagTranslationMask;  /* 0x32 */
-	uint8_t			LUN[8];                         /* 0x34 */
-	uint32_t		Control;                        /* 0x3C */
-	MPI2_SCSI_IO_CDB_UNION	CDB;                            /* 0x40 */
-	MPI2_SCSI_IO_VENDOR_UNIQUE	RaidContext;              /* 0x60 */
-	MPI2_SGE_IO_UNION	SGL;                            /* 0x80 */
-} __packed;
-
-/*
- * MPT RAID MFA IO Descriptor.
- */
-typedef struct _MFI_RAID_MFA_IO_DESCRIPTOR {
-	uint32_t	RequestFlags : 8;
-	uint32_t	MessageAddress1 : 24; /* bits 31:8*/
-	uint32_t	MessageAddress2;      /* bits 61:32 */
-} MFI_RAID_MFA_IO_REQUEST_DESCRIPTOR,*PMFI_RAID_MFA_IO_REQUEST_DESCRIPTOR;
-
-struct mfi_mpi2_request_header {
-	uint8_t		RequestFlags;       /* 0x00 */
-	uint8_t		MSIxIndex;          /* 0x01 */
-	uint16_t	SMID;               /* 0x02 */
-	uint16_t	LMID;               /* 0x04 */
-};
-
-/* defines for the RequestFlags field */
-#define MPI2_REQ_DESCRIPT_FLAGS_TYPE_MASK               (0x0E)
-#define MPI2_REQ_DESCRIPT_FLAGS_SCSI_IO                 (0x00)
-#define MPI2_REQ_DESCRIPT_FLAGS_SCSI_TARGET             (0x02)
-#define MPI2_REQ_DESCRIPT_FLAGS_HIGH_PRIORITY           (0x06)
-#define MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE            (0x08)
-#define MPI2_REQ_DESCRIPT_FLAGS_RAID_ACCELERATOR        (0x0A)
-
-#define MPI2_REQ_DESCRIPT_FLAGS_IOC_FIFO_MARKER (0x01)
-
-struct mfi_mpi2_request_high_priority {
-	struct mfi_mpi2_request_header	header;
-	uint16_t			reserved;
-};
-
-struct mfi_mpi2_request_scsi_io {
-	struct mfi_mpi2_request_header	header;
-	uint16_t			scsi_io_dev_handle;
-};
-
-struct mfi_mpi2_request_scsi_target {
-	struct mfi_mpi2_request_header	header;
-	uint16_t			scsi_target_io_index;
-};
-
-/* Request Descriptors */
-union mfi_mpi2_request_descriptor {
-	struct mfi_mpi2_request_header		header;
-	struct mfi_mpi2_request_high_priority	high_priority;
-	struct mfi_mpi2_request_scsi_io		scsi_io;
-	struct mfi_mpi2_request_scsi_target	scsi_target;
-	uint64_t				words;
-};
-
-
-struct mfi_mpi2_reply_header {
-	uint8_t		ReplyFlags;                 /* 0x00 */
-	uint8_t		MSIxIndex;                  /* 0x01 */
-	uint16_t	SMID;                       /* 0x02 */
-};
-
-/* defines for the ReplyFlags field */
-#define MPI2_RPY_DESCRIPT_FLAGS_TYPE_MASK                   (0x0F)
-#define MPI2_RPY_DESCRIPT_FLAGS_SCSI_IO_SUCCESS             (0x00)
-#define MPI2_RPY_DESCRIPT_FLAGS_ADDRESS_REPLY               (0x01)
-#define MPI2_RPY_DESCRIPT_FLAGS_TARGETASSIST_SUCCESS        (0x02)
-#define MPI2_RPY_DESCRIPT_FLAGS_TARGET_COMMAND_BUFFER       (0x03)
-#define MPI2_RPY_DESCRIPT_FLAGS_RAID_ACCELERATOR_SUCCESS    (0x05)
-#define MPI2_RPY_DESCRIPT_FLAGS_UNUSED                      (0x0F)
-
-/* values for marking a reply descriptor as unused */
-#define MPI2_RPY_DESCRIPT_UNUSED_WORD0_MARK             (0xFFFFFFFF)
-#define MPI2_RPY_DESCRIPT_UNUSED_WORD1_MARK             (0xFFFFFFFF)
-
-struct mfi_mpi2_reply_default {
-	struct mfi_mpi2_reply_header	header;
-	uint32_t			DescriptorTypeDependent2;
-};
-
-struct mfi_mpi2_reply_address {
-	struct mfi_mpi2_reply_header	header;
-	uint32_t			ReplyFrameAddress;
-};
-
-struct mfi_mpi2_reply_scsi_io {
-	struct mfi_mpi2_reply_header	header;
-	uint16_t			TaskTag;		/* 0x04 */
-	uint16_t			Reserved1;		/* 0x06 */
-};
-
-struct mfi_mpi2_reply_target_assist {
-	struct mfi_mpi2_reply_header	header;
-	uint8_t				SequenceNumber;		/* 0x04 */
-	uint8_t				Reserved1;		/* 0x04 */
-	uint16_t			IoIndex;		/* 0x06 */
-};
-
-struct mfi_mpi2_reply_target_cmd_buffer {
-	struct mfi_mpi2_reply_header	header;
-	uint8_t				SequenceNumber;		/* 0x04 */
-	uint8_t				Flags;			/* 0x04 */
-	uint16_t			InitiatorDevHandle;	/* 0x06 */
-	uint16_t			IoIndex;		/* 0x06 */
-};
-
-struct mfi_mpi2_reply_raid_accel {
-	struct mfi_mpi2_reply_header	header;
-	uint8_t				SequenceNumber;		/* 0x04 */
-	uint32_t			Reserved;		/* 0x04 */
-};
-
-/* union of Reply Descriptors */
-union mfi_mpi2_reply_descriptor {
-	struct mfi_mpi2_reply_header		header;
-	struct mfi_mpi2_reply_scsi_io		scsi_io;
-	struct mfi_mpi2_reply_target_assist	target_assist;
-	struct mfi_mpi2_reply_target_cmd_buffer	target_cmd;
-	struct mfi_mpi2_reply_raid_accel	raid_accel;
-	struct mfi_mpi2_reply_default		reply_default;
-	uint64_t				words;
-};
-
-struct IO_REQUEST_INFO {
-	uint64_t	ldStartBlock;
-	uint32_t	numBlocks;
-	uint16_t	ldTgtId;
-	uint8_t		isRead;
-	uint16_t	devHandle;
-	uint64_t	pdBlock;
-	uint8_t		fpOkForIo;
-};
-
-#define MFI_SCSI_MAX_TARGETS	128
-#define MFI_SCSI_MAX_LUNS	8
-#define MFI_SCSI_INITIATOR_ID	255
-#define MFI_SCSI_MAX_CMDS	8
-#define MFI_SCSI_MAX_CDB_LEN	16
-
-#endif /* _MFIREG_H */
diff --git a/include.new/dev/mfi/mfivar.h b/include.new/dev/mfi/mfivar.h
deleted file mode 100644
index ed40243..0000000
--- a/include.new/dev/mfi/mfivar.h
+++ /dev/null
@@ -1,636 +0,0 @@
-/*-
- * Copyright (c) 2006 IronPort Systems
- * 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.
- *
- * 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.
- */
-/*-
- * Copyright (c) 2007 LSI Corp.
- * Copyright (c) 2007 Rajesh Prabhakaran.
- * 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.
- *
- * 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.
- */
-
-#ifndef _MFIVAR_H
-#define _MFIVAR_H
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/dev/mfi/mfivar.h 270732 2014-08-27 21:11:19Z markj $");
-
-#include <sys/lock.h>
-#include <sys/sx.h>
-
-#include <sys/types.h>
-#include <sys/taskqueue.h>
-#include "opt_mfi.h"
-
-/*
- * SCSI structures and definitions are used from here, but no linking
- * requirements are made to CAM.
- */
-#include <cam/scsi/scsi_all.h>
-
-struct mfi_hwcomms {
-	uint32_t		hw_pi;
-	uint32_t		hw_ci;
-	uint32_t		hw_reply_q[1];
-};
-#define	MEGASAS_MAX_NAME	32
-#define	MEGASAS_VERSION		"4.23"
-
-struct mfi_softc;
-struct disk;
-struct ccb_hdr;
-
-struct mfi_command {
-	TAILQ_ENTRY(mfi_command) cm_link;
-	time_t			cm_timestamp;
-	struct mfi_softc	*cm_sc;
-	union mfi_frame		*cm_frame;
-	bus_addr_t		cm_frame_busaddr;
-	struct mfi_sense	*cm_sense;
-	bus_addr_t		cm_sense_busaddr;
-	bus_dmamap_t		cm_dmamap;
-	union mfi_sgl		*cm_sg;
-	void			*cm_data;
-	int			cm_len;
-	int			cm_stp_len;
-	int			cm_total_frame_size;
-	int			cm_extra_frames;
-	int			cm_flags;
-#define MFI_CMD_MAPPED		(1<<0)
-#define MFI_CMD_DATAIN		(1<<1)
-#define MFI_CMD_DATAOUT		(1<<2)
-#define MFI_CMD_COMPLETED	(1<<3)
-#define MFI_CMD_POLLED		(1<<4)
-#define MFI_CMD_SCSI		(1<<5)
-#define MFI_CMD_CCB		(1<<6)
-#define	MFI_CMD_BIO		(1<<7)
-#define MFI_CMD_TBOLT		(1<<8)
-#define MFI_ON_MFIQ_FREE	(1<<9)
-#define MFI_ON_MFIQ_READY	(1<<10)
-#define MFI_ON_MFIQ_BUSY	(1<<11)
-#define MFI_ON_MFIQ_MASK	(MFI_ON_MFIQ_FREE | MFI_ON_MFIQ_READY| \
-    MFI_ON_MFIQ_BUSY)
-#define MFI_CMD_FLAGS_FMT	"\20" \
-    "\1MAPPED" \
-    "\2DATAIN" \
-    "\3DATAOUT" \
-    "\4COMPLETED" \
-    "\5POLLED" \
-    "\6SCSI" \
-    "\7BIO" \
-    "\10TBOLT" \
-    "\11Q_FREE" \
-    "\12Q_READY" \
-    "\13Q_BUSY"
-	uint8_t			retry_for_fw_reset;
-	void			(* cm_complete)(struct mfi_command *cm);
-	void			*cm_private;
-	int			cm_index;
-	int			cm_error;
-};
-
-struct mfi_disk {
-	TAILQ_ENTRY(mfi_disk)	ld_link;
-	device_t	ld_dev;
-	int		ld_id;
-	int		ld_unit;
-	struct mfi_softc *ld_controller;
-	struct mfi_ld_info	*ld_info;
-	struct disk	*ld_disk;
-	int		ld_flags;
-#define MFI_DISK_FLAGS_OPEN	0x01
-#define	MFI_DISK_FLAGS_DISABLED	0x02
-};
-
-struct mfi_disk_pending {
-	TAILQ_ENTRY(mfi_disk_pending)	ld_link;
-	int		ld_id;
-};
-
-struct mfi_system_pd {
-	TAILQ_ENTRY(mfi_system_pd) pd_link;
-	device_t	pd_dev;
-	int		pd_id;
-	int		pd_unit;
-	struct mfi_softc *pd_controller;
-	struct mfi_pd_info *pd_info;
-	struct disk	*pd_disk;
-	int		pd_flags;
-};
-
-struct mfi_system_pending {
-	TAILQ_ENTRY(mfi_system_pending) pd_link;
-	int		pd_id;
-};
-
-struct mfi_evt_queue_elm {
-	TAILQ_ENTRY(mfi_evt_queue_elm)	link;
-	struct mfi_evt_detail		detail;
-};
-
-struct mfi_aen {
-	TAILQ_ENTRY(mfi_aen) aen_link;
-	struct proc			*p;
-};
-
-struct mfi_skinny_dma_info {
-	bus_dma_tag_t			dmat[514];
-	bus_dmamap_t			dmamap[514];
-	uint32_t			mem[514];
-	int				noofmaps;
-};
-
-struct megasas_sge
-{
-	bus_addr_t			phys_addr;
-	uint32_t			length;
-};
-
-struct mfi_cmd_tbolt;
-
-struct mfi_softc {
-	device_t			mfi_dev;
-	int				mfi_flags;
-#define MFI_FLAGS_SG64		(1<<0)
-#define MFI_FLAGS_QFRZN		(1<<1)
-#define MFI_FLAGS_OPEN		(1<<2)
-#define MFI_FLAGS_STOP		(1<<3)
-#define MFI_FLAGS_1064R		(1<<4)
-#define MFI_FLAGS_1078		(1<<5)
-#define MFI_FLAGS_GEN2		(1<<6)
-#define MFI_FLAGS_SKINNY	(1<<7)
-#define MFI_FLAGS_TBOLT		(1<<8)
-#define MFI_FLAGS_MRSAS		(1<<9)
-#define MFI_FLAGS_INVADER	(1<<10)
-#define MFI_FLAGS_FURY		(1<<11)
-	// Start: LSIP200113393
-	bus_dma_tag_t			verbuf_h_dmat;
-	bus_dmamap_t			verbuf_h_dmamap;
-	bus_addr_t			verbuf_h_busaddr;
-	uint32_t			*verbuf;
-	void				*kbuff_arr[MAX_IOCTL_SGE];
-	bus_dma_tag_t			mfi_kbuff_arr_dmat[2];
-	bus_dmamap_t			mfi_kbuff_arr_dmamap[2];
-	bus_addr_t			mfi_kbuff_arr_busaddr[2];
-
-	struct mfi_hwcomms		*mfi_comms;
-	TAILQ_HEAD(,mfi_command)	mfi_free;
-	TAILQ_HEAD(,mfi_command)	mfi_ready;
-	TAILQ_HEAD(BUSYQ,mfi_command)	mfi_busy;
-	struct bio_queue_head		mfi_bioq;
-	struct mfi_qstat		mfi_qstat[MFIQ_COUNT];
-
-	struct resource			*mfi_regs_resource;
-	bus_space_handle_t		mfi_bhandle;
-	bus_space_tag_t			mfi_btag;
-	int				mfi_regs_rid;
-
-	bus_dma_tag_t			mfi_parent_dmat;
-	bus_dma_tag_t			mfi_buffer_dmat;
-
-	bus_dma_tag_t			mfi_comms_dmat;
-	bus_dmamap_t			mfi_comms_dmamap;
-	bus_addr_t			mfi_comms_busaddr;
-
-	bus_dma_tag_t			mfi_frames_dmat;
-	bus_dmamap_t			mfi_frames_dmamap;
-	bus_addr_t			mfi_frames_busaddr;
-	union mfi_frame			*mfi_frames;
-
-	bus_dma_tag_t			mfi_tb_init_dmat;
-	bus_dmamap_t			mfi_tb_init_dmamap;
-	bus_addr_t			mfi_tb_init_busaddr;
-	bus_addr_t			mfi_tb_ioc_init_busaddr;
-	union mfi_frame			*mfi_tb_init;
-
-	TAILQ_HEAD(,mfi_evt_queue_elm)	mfi_evt_queue;
-	struct task			mfi_evt_task;
-	struct task			mfi_map_sync_task;
-	TAILQ_HEAD(,mfi_aen)		mfi_aen_pids;
-	struct mfi_command		*mfi_aen_cm;
-	struct mfi_command		*mfi_skinny_cm;
-	struct mfi_command		*mfi_map_sync_cm;
-	int				cm_aen_abort;
-	int				cm_map_abort;
-	uint32_t			mfi_aen_triggered;
-	uint32_t			mfi_poll_waiting;
-	uint32_t			mfi_boot_seq_num;
-	struct selinfo			mfi_select;
-	int				mfi_delete_busy_volumes;
-	int				mfi_keep_deleted_volumes;
-	int				mfi_detaching;
-
-	bus_dma_tag_t			mfi_sense_dmat;
-	bus_dmamap_t			mfi_sense_dmamap;
-	bus_addr_t			mfi_sense_busaddr;
-	struct mfi_sense		*mfi_sense;
-
-	struct resource			*mfi_irq;
-	void				*mfi_intr;
-	int				mfi_irq_rid;
-
-	struct intr_config_hook		mfi_ich;
-	eventhandler_tag		eh;
-	/* OCR flags */
-	uint8_t adpreset;
-	uint8_t issuepend_done;
-	uint8_t disableOnlineCtrlReset;
-	uint32_t mfiStatus;
-	uint32_t last_seq_num;
-	uint32_t volatile hw_crit_error;
-
-	/*
-	 * Allocation for the command array.  Used as an indexable array to
-	 * recover completed commands.
-	 */
-	struct mfi_command		*mfi_commands;
-	/*
-	 * How many commands the firmware can handle.  Also how big the reply
-	 * queue is, minus 1.
-	 */
-	int				mfi_max_fw_cmds;
-	/*
-	 * How many S/G elements we'll ever actually use
-	 */
-	int				mfi_max_sge;
-	/*
-	 * How many bytes a compound frame is, including all of the extra frames
-	 * that are used for S/G elements.
-	 */
-	int				mfi_cmd_size;
-	/*
-	 * How large an S/G element is.  Used to calculate the number of single
-	 * frames in a command.
-	 */
-	int				mfi_sge_size;
-	/*
-	 * Max number of sectors that the firmware allows
-	 */
-	uint32_t			mfi_max_io;
-
-	TAILQ_HEAD(,mfi_disk)		mfi_ld_tqh;
-	TAILQ_HEAD(,mfi_system_pd)	mfi_syspd_tqh;
-	TAILQ_HEAD(,mfi_disk_pending)	mfi_ld_pend_tqh;
-	TAILQ_HEAD(,mfi_system_pending)	mfi_syspd_pend_tqh;
-	eventhandler_tag		mfi_eh;
-	struct cdev			*mfi_cdev;
-
-	TAILQ_HEAD(, ccb_hdr)		mfi_cam_ccbq;
-	struct mfi_command *		(* mfi_cam_start)(void *);
-	void				(*mfi_cam_rescan_cb)(struct mfi_softc *,
-					    uint32_t);
-	struct callout			mfi_watchdog_callout;
-	struct mtx			mfi_io_lock;
-	struct sx			mfi_config_lock;
-
-	/* Controller type specific interfaces */
-	void	(*mfi_enable_intr)(struct mfi_softc *sc);
-	void	(*mfi_disable_intr)(struct mfi_softc *sc);
-	int32_t	(*mfi_read_fw_status)(struct mfi_softc *sc);
-	int	(*mfi_check_clear_intr)(struct mfi_softc *sc);
-	void	(*mfi_issue_cmd)(struct mfi_softc *sc, bus_addr_t bus_add,
-		    uint32_t frame_cnt);
-	int	(*mfi_adp_reset)(struct mfi_softc *sc);
-	int	(*mfi_adp_check_reset)(struct mfi_softc *sc);
-	void				(*mfi_intr_ptr)(void *sc);
-
-	/* ThunderBolt */
-	uint32_t			mfi_tbolt;
-	uint32_t			MFA_enabled;
-	/* Single Reply structure size */
-	uint16_t			reply_size;
-	/* Singler message size. */
-	uint16_t			raid_io_msg_size;
-	TAILQ_HEAD(TB, mfi_cmd_tbolt)	mfi_cmd_tbolt_tqh;
-	/* ThunderBolt base contiguous memory mapping. */
-	bus_dma_tag_t			mfi_tb_dmat;
-	bus_dmamap_t			mfi_tb_dmamap;
-	bus_addr_t			mfi_tb_busaddr;
-	/* ThunderBolt Contiguous DMA memory Mapping */
-	uint8_t	*			request_message_pool;
-	uint8_t *			request_message_pool_align;
-	uint8_t *			request_desc_pool;
-	bus_addr_t			request_msg_busaddr;
-	bus_addr_t			reply_frame_busaddr;
-	bus_addr_t			sg_frame_busaddr;
-	/* ThunderBolt IOC Init Descriptor */
-	bus_dma_tag_t			mfi_tb_ioc_init_dmat;
-	bus_dmamap_t			mfi_tb_ioc_init_dmamap;
-	uint8_t *			mfi_tb_ioc_init_desc;
-	struct mfi_cmd_tbolt		**mfi_cmd_pool_tbolt;
-	/* Virtual address of reply Frame Pool */
-	struct mfi_mpi2_reply_header*	reply_frame_pool;
-	struct mfi_mpi2_reply_header*	reply_frame_pool_align;
-
-	/* Last reply frame address */
-	uint8_t *			reply_pool_limit;
-	uint16_t			last_reply_idx;
-	uint8_t				max_SGEs_in_chain_message;
-	uint8_t				max_SGEs_in_main_message;
-	uint8_t				chain_offset_value_for_main_message;
-	uint8_t				chain_offset_value_for_mpt_ptmsg;
-};
-
-union desc_value {
-	uint64_t	word;
-	struct {
-		uint32_t	low;
-		uint32_t	high;
-	}u;
-};
-
-// TODO find the right definition
-#define XXX_MFI_CMD_OP_INIT2                    0x9
-/*
- * Request descriptor types
- */
-#define MFI_REQ_DESCRIPT_FLAGS_LD_IO           0x7
-#define MFI_REQ_DESCRIPT_FLAGS_MFA             0x1
-#define MFI_REQ_DESCRIPT_FLAGS_TYPE_SHIFT	0x1
-#define MFI_FUSION_FP_DEFAULT_TIMEOUT		0x14
-#define MFI_LOAD_BALANCE_FLAG			0x1
-#define MFI_DCMD_MBOX_PEND_FLAG			0x1
-
-//#define MR_PROT_INFO_TYPE_CONTROLLER	0x08
-#define	MEGASAS_SCSI_VARIABLE_LENGTH_CMD	0x7f
-#define MEGASAS_SCSI_SERVICE_ACTION_READ32	0x9
-#define MEGASAS_SCSI_SERVICE_ACTION_WRITE32	0xB
-#define	MEGASAS_SCSI_ADDL_CDB_LEN   		0x18
-#define MEGASAS_RD_WR_PROTECT_CHECK_ALL		0x20
-#define MEGASAS_RD_WR_PROTECT_CHECK_NONE	0x60
-#define MEGASAS_EEDPBLOCKSIZE			512
-struct mfi_cmd_tbolt {
-	union mfi_mpi2_request_descriptor *request_desc;
-	struct mfi_mpi2_request_raid_scsi_io *io_request;
-	bus_addr_t		io_request_phys_addr;
-	bus_addr_t		sg_frame_phys_addr;
-	bus_addr_t 		sense_phys_addr;
-	MPI2_SGE_IO_UNION	*sg_frame;
-	uint8_t			*sense;
-	TAILQ_ENTRY(mfi_cmd_tbolt) next;
-	/*
-	 * Context for a MFI frame.
-	 * Used to get the mfi cmd from list when a MFI cmd is completed
-	 */
-	uint32_t		sync_cmd_idx;
-	uint16_t		index;
-	uint8_t			status;
-};
-
-extern int mfi_attach(struct mfi_softc *);
-extern void mfi_free(struct mfi_softc *);
-extern int mfi_shutdown(struct mfi_softc *);
-extern void mfi_startio(struct mfi_softc *);
-extern void mfi_disk_complete(struct bio *);
-extern int mfi_disk_disable(struct mfi_disk *);
-extern void mfi_disk_enable(struct mfi_disk *);
-extern int mfi_dump_blocks(struct mfi_softc *, int id, uint64_t, void *, int);
-extern int mfi_syspd_disable(struct mfi_system_pd *);
-extern void mfi_syspd_enable(struct mfi_system_pd *);
-extern int mfi_dump_syspd_blocks(struct mfi_softc *, int id, uint64_t, void *,
-    int);
-extern int mfi_transition_firmware(struct mfi_softc *sc);
-extern int mfi_aen_setup(struct mfi_softc *sc, uint32_t seq_start);
-extern void mfi_complete(struct mfi_softc *sc, struct mfi_command *cm);
-extern int mfi_mapcmd(struct mfi_softc *sc,struct mfi_command *cm);
-extern int mfi_wait_command(struct mfi_softc *sc, struct mfi_command *cm);
-extern void mfi_tbolt_enable_intr_ppc(struct mfi_softc *);
-extern void mfi_tbolt_disable_intr_ppc(struct mfi_softc *);
-extern int32_t mfi_tbolt_read_fw_status_ppc(struct mfi_softc *);
-extern int32_t mfi_tbolt_check_clear_intr_ppc(struct mfi_softc *);
-extern void mfi_tbolt_issue_cmd_ppc(struct mfi_softc *, bus_addr_t, uint32_t);
-extern void mfi_tbolt_init_globals(struct mfi_softc*);
-extern uint32_t mfi_tbolt_get_memory_requirement(struct mfi_softc *);
-extern int mfi_tbolt_init_desc_pool(struct mfi_softc *, uint8_t *, uint32_t);
-extern int mfi_tbolt_init_MFI_queue(struct mfi_softc *);
-extern void mfi_intr_tbolt(void *arg);
-extern int mfi_tbolt_alloc_cmd(struct mfi_softc *sc);
-extern int mfi_tbolt_send_frame(struct mfi_softc *sc, struct mfi_command *cm);
-extern int mfi_tbolt_adp_reset(struct mfi_softc *sc);
-extern int mfi_tbolt_reset(struct mfi_softc *sc);
-extern void mfi_tbolt_sync_map_info(struct mfi_softc *sc);
-extern void mfi_handle_map_sync(void *context, int pending);
-extern int mfi_dcmd_command(struct mfi_softc *, struct mfi_command **,
-     uint32_t, void **, size_t);
-extern int mfi_build_cdb(int, uint8_t, u_int64_t, uint32_t, uint8_t *);
-
-#define MFIQ_ADD(sc, qname)					\
-	do {							\
-		struct mfi_qstat *qs;				\
-								\
-		qs = &(sc)->mfi_qstat[qname];			\
-		qs->q_length++;					\
-		if (qs->q_length > qs->q_max)			\
-			qs->q_max = qs->q_length;		\
-	} while (0)
-
-#define MFIQ_REMOVE(sc, qname)	(sc)->mfi_qstat[qname].q_length--
-
-#define MFIQ_INIT(sc, qname)					\
-	do {							\
-		sc->mfi_qstat[qname].q_length = 0;		\
-		sc->mfi_qstat[qname].q_max = 0;			\
-	} while (0)
-
-#define MFIQ_COMMAND_QUEUE(name, index)					\
-	static __inline void						\
-	mfi_initq_ ## name (struct mfi_softc *sc)			\
-	{								\
-		TAILQ_INIT(&sc->mfi_ ## name);				\
-		MFIQ_INIT(sc, index);					\
-	}								\
-	static __inline void						\
-	mfi_enqueue_ ## name (struct mfi_command *cm)			\
-	{								\
-		if ((cm->cm_flags & MFI_ON_MFIQ_MASK) != 0) {		\
-			panic("command %p is on another queue, "	\
-			    "flags = %#x\n", cm, cm->cm_flags);		\
-		}							\
-		TAILQ_INSERT_TAIL(&cm->cm_sc->mfi_ ## name, cm, cm_link); \
-		cm->cm_flags |= MFI_ON_ ## index;			\
-		MFIQ_ADD(cm->cm_sc, index);				\
-	}								\
-	static __inline void						\
-	mfi_requeue_ ## name (struct mfi_command *cm)			\
-	{								\
-		if ((cm->cm_flags & MFI_ON_MFIQ_MASK) != 0) {		\
-			panic("command %p is on another queue, "	\
-			    "flags = %#x\n", cm, cm->cm_flags);		\
-		}							\
-		TAILQ_INSERT_HEAD(&cm->cm_sc->mfi_ ## name, cm, cm_link); \
-		cm->cm_flags |= MFI_ON_ ## index;			\
-		MFIQ_ADD(cm->cm_sc, index);				\
-	}								\
-	static __inline struct mfi_command *				\
-	mfi_dequeue_ ## name (struct mfi_softc *sc)			\
-	{								\
-		struct mfi_command *cm;					\
-									\
-		if ((cm = TAILQ_FIRST(&sc->mfi_ ## name)) != NULL) {	\
-			if ((cm->cm_flags & MFI_ON_ ## index) == 0) {	\
-				panic("command %p not in queue, "	\
-				    "flags = %#x, bit = %#x\n", cm,	\
-				    cm->cm_flags, MFI_ON_ ## index);	\
-			}						\
-			TAILQ_REMOVE(&sc->mfi_ ## name, cm, cm_link);	\
-			cm->cm_flags &= ~MFI_ON_ ## index;		\
-			MFIQ_REMOVE(sc, index);				\
-		}							\
-		return (cm);						\
-	}								\
-	static __inline void						\
-	mfi_remove_ ## name (struct mfi_command *cm)			\
-	{								\
-		if ((cm->cm_flags & MFI_ON_ ## index) == 0) {		\
-			panic("command %p not in queue, flags = %#x, " \
-			    "bit = %#x\n", cm, cm->cm_flags,		\
-			    MFI_ON_ ## index);				\
-		}							\
-		TAILQ_REMOVE(&cm->cm_sc->mfi_ ## name, cm, cm_link);	\
-		cm->cm_flags &= ~MFI_ON_ ## index;			\
-		MFIQ_REMOVE(cm->cm_sc, index);				\
-	}								\
-struct hack
-
-MFIQ_COMMAND_QUEUE(free, MFIQ_FREE);
-MFIQ_COMMAND_QUEUE(ready, MFIQ_READY);
-MFIQ_COMMAND_QUEUE(busy, MFIQ_BUSY);
-
-static __inline void
-mfi_initq_bio(struct mfi_softc *sc)
-{
-	bioq_init(&sc->mfi_bioq);
-	MFIQ_INIT(sc, MFIQ_BIO);
-}
-
-static __inline void
-mfi_enqueue_bio(struct mfi_softc *sc, struct bio *bp)
-{
-	bioq_insert_tail(&sc->mfi_bioq, bp);
-	MFIQ_ADD(sc, MFIQ_BIO);
-}
-
-static __inline struct bio *
-mfi_dequeue_bio(struct mfi_softc *sc)
-{
-	struct bio *bp;
-
-	if ((bp = bioq_first(&sc->mfi_bioq)) != NULL) {
-		bioq_remove(&sc->mfi_bioq, bp);
-		MFIQ_REMOVE(sc, MFIQ_BIO);
-	}
-	return (bp);
-}
-
-/*
- * This is from the original scsi_extract_sense() in CAM.  It's copied
- * here because CAM now uses a non-inline version that follows more complex
- * additions to the SPC spec, and we don't want to force a dependency on
- * the CAM module for such a trivial action.
- */
-static __inline void
-mfi_extract_sense(struct scsi_sense_data_fixed *sense,
-    int *error_code, int *sense_key, int *asc, int *ascq)
-{
-
-	*error_code = sense->error_code & SSD_ERRCODE;
-	*sense_key = sense->flags & SSD_KEY;
-	*asc = (sense->extra_len >= 5) ? sense->add_sense_code : 0;
-	*ascq = (sense->extra_len >= 6) ? sense->add_sense_code_qual : 0;
-}
-
-static __inline void
-mfi_print_sense(struct mfi_softc *sc, void *sense)
-{
-	int error, key, asc, ascq;
-
-	mfi_extract_sense((struct scsi_sense_data_fixed *)sense,
-	    &error, &key, &asc, &ascq);
-	device_printf(sc->mfi_dev, "sense error %d, sense_key %d, "
-	    "asc %d, ascq %d\n", error, key, asc, ascq);
-}
-
-
-#define MFI_WRITE4(sc, reg, val)	bus_space_write_4((sc)->mfi_btag, \
-	sc->mfi_bhandle, (reg), (val))
-#define MFI_READ4(sc, reg)		bus_space_read_4((sc)->mfi_btag, \
-	(sc)->mfi_bhandle, (reg))
-#define MFI_WRITE2(sc, reg, val)	bus_space_write_2((sc)->mfi_btag, \
-	sc->mfi_bhandle, (reg), (val))
-#define MFI_READ2(sc, reg)		bus_space_read_2((sc)->mfi_btag, \
-	(sc)->mfi_bhandle, (reg))
-#define MFI_WRITE1(sc, reg, val)	bus_space_write_1((sc)->mfi_btag, \
-	sc->mfi_bhandle, (reg), (val))
-#define MFI_READ1(sc, reg)		bus_space_read_1((sc)->mfi_btag, \
-	(sc)->mfi_bhandle, (reg))
-
-MALLOC_DECLARE(M_MFIBUF);
-SYSCTL_DECL(_hw_mfi);
-
-#define MFI_RESET_WAIT_TIME 180
-#define MFI_CMD_TIMEOUT 30
-#define MFI_SYS_PD_IO	0
-#define MFI_LD_IO	1
-#define MFI_SKINNY_MEMORY 0x02000000
-#define MFI_MAXPHYS (128 * 1024)
-
-#ifdef MFI_DEBUG
-extern void mfi_print_cmd(struct mfi_command *cm);
-extern void mfi_dump_cmds(struct mfi_softc *sc);
-extern void mfi_validate_sg(struct mfi_softc *, struct mfi_command *,
-    const char *, int);
-#define MFI_PRINT_CMD(cm)	mfi_print_cmd(cm)
-#define MFI_DUMP_CMDS(sc)	mfi_dump_cmds(sc)
-#define MFI_VALIDATE_CMD(sc, cm) mfi_validate_sg(sc, cm, __FUNCTION__, __LINE__)
-#else
-#define MFI_PRINT_CMD(cm)
-#define MFI_DUMP_CMDS(sc)
-#define MFI_VALIDATE_CMD(sc, cm)
-#endif
-
-extern void mfi_release_command(struct mfi_command *);
-extern void mfi_tbolt_return_cmd(struct mfi_softc *,
-    struct mfi_cmd_tbolt *, struct mfi_command *);
-
-#endif /* _MFIVAR_H */
diff --git a/include.new/dev/mpt/mpilib/mpi.h b/include.new/dev/mpt/mpilib/mpi.h
deleted file mode 100644
index 9deecb3..0000000
--- a/include.new/dev/mpt/mpilib/mpi.h
+++ /dev/null
@@ -1,827 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *           Name:  mpi.h
- *          Title:  MPI Message independent structures and definitions
- *  Creation Date:  July 27, 2000
- *
- *    mpi.h Version:  01.05.17
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  05-08-00  00.10.01  Original release for 0.10 spec dated 4/26/2000.
- *  05-24-00  00.10.02  Added MPI_IOCSTATUS_SCSI_RESIDUAL_MISMATCH definition.
- *  06-06-00  01.00.01  Update MPI_VERSION_MAJOR and MPI_VERSION_MINOR.
- *  06-22-00  01.00.02  Added MPI_IOCSTATUS_LAN_ definitions.
- *                      Removed LAN_SUSPEND function definition.
- *                      Added MPI_MSGFLAGS_CONTINUATION_REPLY definition.
- *  06-30-00  01.00.03  Added MPI_CONTEXT_REPLY_TYPE_LAN definition.
- *                      Added MPI_GET/SET_CONTEXT_REPLY_TYPE macros.
- *  07-27-00  01.00.04  Added MPI_FAULT_ definitions.
- *                      Removed MPI_IOCSTATUS_MSG/DATA_XFER_ERROR definitions.
- *                      Added MPI_IOCSTATUS_INTERNAL_ERROR definition.
- *                      Added MPI_IOCSTATUS_TARGET_XFER_COUNT_MISMATCH.
- *  11-02-00  01.01.01  Original release for post 1.0 work.
- *  12-04-00  01.01.02  Added new function codes.
- *  01-09-01  01.01.03  Added more definitions to the system interface section
- *                      Added MPI_IOCSTATUS_TARGET_STS_DATA_NOT_SENT.
- *  01-25-01  01.01.04  Changed MPI_VERSION_MINOR from 0x00 to 0x01.
- *  02-20-01  01.01.05  Started using MPI_POINTER.
- *                      Fixed value for MPI_DIAG_RW_ENABLE.
- *                      Added defines for MPI_DIAG_PREVENT_IOC_BOOT and
- *                      MPI_DIAG_CLEAR_FLASH_BAD_SIG.
- *                      Obsoleted MPI_IOCSTATUS_TARGET_FC_ defines.
- *  02-27-01  01.01.06  Removed MPI_HOST_INDEX_REGISTER define.
- *                      Added function codes for RAID.
- *  04-09-01  01.01.07  Added alternate define for MPI_DOORBELL_ACTIVE,
- *                      MPI_DOORBELL_USED, to better match the spec.
- *  08-08-01  01.02.01  Original release for v1.2 work.
- *                      Changed MPI_VERSION_MINOR from 0x01 to 0x02.
- *                      Added define MPI_FUNCTION_TOOLBOX.
- *  09-28-01  01.02.02  New function code MPI_SCSI_ENCLOSURE_PROCESSOR.
- *  11-01-01  01.02.03  Changed name to MPI_FUNCTION_SCSI_ENCLOSURE_PROCESSOR.
- *  03-14-02  01.02.04  Added MPI_HEADER_VERSION_ defines.
- *  05-31-02  01.02.05  Bumped MPI_HEADER_VERSION_UNIT.
- *  07-12-02  01.02.06  Added define for MPI_FUNCTION_MAILBOX.
- *  09-16-02  01.02.07  Bumped value for MPI_HEADER_VERSION_UNIT.
- *  11-15-02  01.02.08  Added define MPI_IOCSTATUS_TARGET_INVALID_IO_INDEX and
- *                      obsoleted define MPI_IOCSTATUS_TARGET_INVALID_IOCINDEX.
- *  04-01-03  01.02.09  New IOCStatus code: MPI_IOCSTATUS_FC_EXCHANGE_CANCELED
- *  06-26-03  01.02.10  Bumped MPI_HEADER_VERSION_UNIT value.
- *  01-16-04  01.02.11  Added define for MPI_IOCLOGINFO_TYPE_SHIFT.
- *  04-29-04  01.02.12  Added function codes for MPI_FUNCTION_DIAG_BUFFER_POST
- *                      and MPI_FUNCTION_DIAG_RELEASE.
- *                      Added MPI_IOCSTATUS_DIAGNOSTIC_RELEASED define.
- *                      Bumped MPI_HEADER_VERSION_UNIT value.
- *  05-11-04  01.03.01  Bumped MPI_VERSION_MINOR for MPI v1.3.
- *                      Added codes for Inband.
- *  08-19-04  01.05.01  Added defines for Host Buffer Access Control doorbell.
- *                      Added define for offset of High Priority Request Queue.
- *                      Added new function codes and new IOCStatus codes.
- *                      Added a IOCLogInfo type of SAS.
- *  12-07-04  01.05.02  Bumped MPI_HEADER_VERSION_UNIT.
- *  12-09-04  01.05.03  Bumped MPI_HEADER_VERSION_UNIT.
- *  01-15-05  01.05.04  Bumped MPI_HEADER_VERSION_UNIT.
- *  02-09-05  01.05.05  Bumped MPI_HEADER_VERSION_UNIT.
- *  02-22-05  01.05.06  Bumped MPI_HEADER_VERSION_UNIT.
- *  03-11-05  01.05.07  Removed function codes for SCSI IO 32 and
- *                      TargetAssistExtended requests.
- *                      Removed EEDP IOCStatus codes.
- *  06-24-05  01.05.08  Added function codes for SCSI IO 32 and
- *                      TargetAssistExtended requests.
- *                      Added EEDP IOCStatus codes.
- *  08-03-05  01.05.09  Bumped MPI_HEADER_VERSION_UNIT.
- *  08-30-05  01.05.10  Added 2 new IOCStatus codes for Target.
- *  03-27-06  01.05.11  Bumped MPI_HEADER_VERSION_UNIT.
- *  10-11-06  01.05.12  Bumped MPI_HEADER_VERSION_UNIT.
- *  05-24-07  01.05.13  Bumped MPI_HEADER_VERSION_UNIT.
- *  08-07-07  01.05.14  Bumped MPI_HEADER_VERSION_UNIT.
- *  01-15-08  01.05.15  Bumped MPI_HEADER_VERSION_UNIT.
- *  03-28-08  01.05.16  Bumped MPI_HEADER_VERSION_UNIT.
- *  07-11-08  01.05.17  Bumped MPI_HEADER_VERSION_UNIT.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_H
-#define MPI_H
-
-
-/*****************************************************************************
-*
-*        M P I    V e r s i o n    D e f i n i t i o n s
-*
-*****************************************************************************/
-
-#define MPI_VERSION_MAJOR                   (0x01)
-#define MPI_VERSION_MINOR                   (0x05)
-#define MPI_VERSION_MAJOR_MASK              (0xFF00)
-#define MPI_VERSION_MAJOR_SHIFT             (8)
-#define MPI_VERSION_MINOR_MASK              (0x00FF)
-#define MPI_VERSION_MINOR_SHIFT             (0)
-#define MPI_VERSION ((MPI_VERSION_MAJOR << MPI_VERSION_MAJOR_SHIFT) |   \
-                                      MPI_VERSION_MINOR)
-
-#define MPI_VERSION_01_00                   (0x0100)
-#define MPI_VERSION_01_01                   (0x0101)
-#define MPI_VERSION_01_02                   (0x0102)
-#define MPI_VERSION_01_03                   (0x0103)
-#define MPI_VERSION_01_05                   (0x0105)
-/* Note: The major versions of 0xe0 through 0xff are reserved */
-
-/* versioning for this MPI header set */
-#define MPI_HEADER_VERSION_UNIT             (0x14)
-#define MPI_HEADER_VERSION_DEV              (0x00)
-#define MPI_HEADER_VERSION_UNIT_MASK        (0xFF00)
-#define MPI_HEADER_VERSION_UNIT_SHIFT       (8)
-#define MPI_HEADER_VERSION_DEV_MASK         (0x00FF)
-#define MPI_HEADER_VERSION_DEV_SHIFT        (0)
-#define MPI_HEADER_VERSION ((MPI_HEADER_VERSION_UNIT << 8) | MPI_HEADER_VERSION_DEV)
-
-/*****************************************************************************
-*
-*        I O C    S t a t e    D e f i n i t i o n s
-*
-*****************************************************************************/
-
-#define MPI_IOC_STATE_RESET                 (0x00000000)
-#define MPI_IOC_STATE_READY                 (0x10000000)
-#define MPI_IOC_STATE_OPERATIONAL           (0x20000000)
-#define MPI_IOC_STATE_FAULT                 (0x40000000)
-
-#define MPI_IOC_STATE_MASK                  (0xF0000000)
-#define MPI_IOC_STATE_SHIFT                 (28)
-
-/* Fault state codes (product independent range 0x8000-0xFFFF) */
-
-#define MPI_FAULT_REQUEST_MESSAGE_PCI_PARITY_ERROR  (0x8111)
-#define MPI_FAULT_REQUEST_MESSAGE_PCI_BUS_FAULT     (0x8112)
-#define MPI_FAULT_REPLY_MESSAGE_PCI_PARITY_ERROR    (0x8113)
-#define MPI_FAULT_REPLY_MESSAGE_PCI_BUS_FAULT       (0x8114)
-#define MPI_FAULT_DATA_SEND_PCI_PARITY_ERROR        (0x8115)
-#define MPI_FAULT_DATA_SEND_PCI_BUS_FAULT           (0x8116)
-#define MPI_FAULT_DATA_RECEIVE_PCI_PARITY_ERROR     (0x8117)
-#define MPI_FAULT_DATA_RECEIVE_PCI_BUS_FAULT        (0x8118)
-
-
-/*****************************************************************************
-*
-*        P C I    S y s t e m    I n t e r f a c e    R e g i s t e r s
-*
-*****************************************************************************/
-
-/*
- * Defines for working with the System Doorbell register.
- * Values for doorbell function codes are included in the section that defines
- * all the function codes (further on in this file).
- */
-#define MPI_DOORBELL_OFFSET                 (0x00000000)
-#define MPI_DOORBELL_ACTIVE                 (0x08000000) /* DoorbellUsed */
-#define MPI_DOORBELL_USED                   (MPI_DOORBELL_ACTIVE)
-#define MPI_DOORBELL_ACTIVE_SHIFT           (27)
-#define MPI_DOORBELL_WHO_INIT_MASK          (0x07000000)
-#define MPI_DOORBELL_WHO_INIT_SHIFT         (24)
-#define MPI_DOORBELL_FUNCTION_MASK          (0xFF000000)
-#define MPI_DOORBELL_FUNCTION_SHIFT         (24)
-#define MPI_DOORBELL_ADD_DWORDS_MASK        (0x00FF0000)
-#define MPI_DOORBELL_ADD_DWORDS_SHIFT       (16)
-#define MPI_DOORBELL_DATA_MASK              (0x0000FFFF)
-#define MPI_DOORBELL_FUNCTION_SPECIFIC_MASK (0x0000FFFF)
-
-/* values for Host Buffer Access Control doorbell function */
-#define MPI_DB_HPBAC_VALUE_MASK             (0x0000F000)
-#define MPI_DB_HPBAC_ENABLE_ACCESS          (0x01)
-#define MPI_DB_HPBAC_DISABLE_ACCESS         (0x02)
-#define MPI_DB_HPBAC_FREE_BUFFER            (0x03)
-
-
-#define MPI_WRITE_SEQUENCE_OFFSET           (0x00000004)
-#define MPI_WRSEQ_KEY_VALUE_MASK            (0x0000000F)
-#define MPI_WRSEQ_1ST_KEY_VALUE             (0x04)
-#define MPI_WRSEQ_2ND_KEY_VALUE             (0x0B)
-#define MPI_WRSEQ_3RD_KEY_VALUE             (0x02)
-#define MPI_WRSEQ_4TH_KEY_VALUE             (0x07)
-#define MPI_WRSEQ_5TH_KEY_VALUE             (0x0D)
-
-#define MPI_DIAGNOSTIC_OFFSET               (0x00000008)
-#define MPI_DIAG_CLEAR_FLASH_BAD_SIG        (0x00000400)
-#define MPI_DIAG_PREVENT_IOC_BOOT           (0x00000200)
-#define MPI_DIAG_DRWE                       (0x00000080)
-#define MPI_DIAG_FLASH_BAD_SIG              (0x00000040)
-#define MPI_DIAG_RESET_HISTORY              (0x00000020)
-#define MPI_DIAG_RW_ENABLE                  (0x00000010)
-#define MPI_DIAG_RESET_ADAPTER              (0x00000004)
-#define MPI_DIAG_DISABLE_ARM                (0x00000002)
-#define MPI_DIAG_MEM_ENABLE                 (0x00000001)
-
-#define MPI_TEST_BASE_ADDRESS_OFFSET        (0x0000000C)
-
-#define MPI_DIAG_RW_DATA_OFFSET             (0x00000010)
-
-#define MPI_DIAG_RW_ADDRESS_OFFSET          (0x00000014)
-
-#define MPI_HOST_INTERRUPT_STATUS_OFFSET    (0x00000030)
-#define MPI_HIS_IOP_DOORBELL_STATUS         (0x80000000)
-#define MPI_HIS_REPLY_MESSAGE_INTERRUPT     (0x00000008)
-#define MPI_HIS_DOORBELL_INTERRUPT          (0x00000001)
-
-#define MPI_HOST_INTERRUPT_MASK_OFFSET      (0x00000034)
-#define MPI_HIM_RIM                         (0x00000008)
-#define MPI_HIM_DIM                         (0x00000001)
-
-#define MPI_REQUEST_QUEUE_OFFSET            (0x00000040)
-#define MPI_REQUEST_POST_FIFO_OFFSET        (0x00000040)
-
-#define MPI_REPLY_QUEUE_OFFSET              (0x00000044)
-#define MPI_REPLY_POST_FIFO_OFFSET          (0x00000044)
-#define MPI_REPLY_FREE_FIFO_OFFSET          (0x00000044)
-
-#define MPI_HI_PRI_REQUEST_QUEUE_OFFSET     (0x00000048)
-
-
-
-/*****************************************************************************
-*
-*        M e s s a g e    F r a m e    D e s c r i p t o r s
-*
-*****************************************************************************/
-
-#define MPI_REQ_MF_DESCRIPTOR_NB_MASK       (0x00000003)
-#define MPI_REQ_MF_DESCRIPTOR_F_BIT         (0x00000004)
-#define MPI_REQ_MF_DESCRIPTOR_ADDRESS_MASK  (0xFFFFFFF8)
-
-#define MPI_ADDRESS_REPLY_A_BIT             (0x80000000)
-#define MPI_ADDRESS_REPLY_ADDRESS_MASK      (0x7FFFFFFF)
-
-#define MPI_CONTEXT_REPLY_A_BIT             (0x80000000)
-#define MPI_CONTEXT_REPLY_TYPE_MASK         (0x60000000)
-#define MPI_CONTEXT_REPLY_TYPE_SCSI_INIT    (0x00)
-#define MPI_CONTEXT_REPLY_TYPE_SCSI_TARGET  (0x01)
-#define MPI_CONTEXT_REPLY_TYPE_LAN          (0x02)
-#define MPI_CONTEXT_REPLY_TYPE_SHIFT        (29)
-#define MPI_CONTEXT_REPLY_CONTEXT_MASK      (0x1FFFFFFF)
-
-
-/****************************************************************************/
-/* Context Reply macros                                                     */
-/****************************************************************************/
-
-#define MPI_GET_CONTEXT_REPLY_TYPE(x)  (((x) & MPI_CONTEXT_REPLY_TYPE_MASK) \
-                                          >> MPI_CONTEXT_REPLY_TYPE_SHIFT)
-
-#define MPI_SET_CONTEXT_REPLY_TYPE(x, typ)                                  \
-            ((x) = ((x) & ~MPI_CONTEXT_REPLY_TYPE_MASK) |                   \
-                            (((typ) << MPI_CONTEXT_REPLY_TYPE_SHIFT) &      \
-                                        MPI_CONTEXT_REPLY_TYPE_MASK))
-
-
-/*****************************************************************************
-*
-*        M e s s a g e    F u n c t i o n s
-*              0x80 -> 0x8F reserved for private message use per product
-*
-*
-*****************************************************************************/
-
-#define MPI_FUNCTION_SCSI_IO_REQUEST                (0x00)
-#define MPI_FUNCTION_SCSI_TASK_MGMT                 (0x01)
-#define MPI_FUNCTION_IOC_INIT                       (0x02)
-#define MPI_FUNCTION_IOC_FACTS                      (0x03)
-#define MPI_FUNCTION_CONFIG                         (0x04)
-#define MPI_FUNCTION_PORT_FACTS                     (0x05)
-#define MPI_FUNCTION_PORT_ENABLE                    (0x06)
-#define MPI_FUNCTION_EVENT_NOTIFICATION             (0x07)
-#define MPI_FUNCTION_EVENT_ACK                      (0x08)
-#define MPI_FUNCTION_FW_DOWNLOAD                    (0x09)
-#define MPI_FUNCTION_TARGET_CMD_BUFFER_POST         (0x0A)
-#define MPI_FUNCTION_TARGET_ASSIST                  (0x0B)
-#define MPI_FUNCTION_TARGET_STATUS_SEND             (0x0C)
-#define MPI_FUNCTION_TARGET_MODE_ABORT              (0x0D)
-#define MPI_FUNCTION_FC_LINK_SRVC_BUF_POST          (0x0E)
-#define MPI_FUNCTION_FC_LINK_SRVC_RSP               (0x0F)
-#define MPI_FUNCTION_FC_EX_LINK_SRVC_SEND           (0x10)
-#define MPI_FUNCTION_FC_ABORT                       (0x11)
-#define MPI_FUNCTION_FW_UPLOAD                      (0x12)
-#define MPI_FUNCTION_FC_COMMON_TRANSPORT_SEND       (0x13)
-#define MPI_FUNCTION_FC_PRIMITIVE_SEND              (0x14)
-
-#define MPI_FUNCTION_RAID_ACTION                    (0x15)
-#define MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH       (0x16)
-
-#define MPI_FUNCTION_TOOLBOX                        (0x17)
-
-#define MPI_FUNCTION_SCSI_ENCLOSURE_PROCESSOR       (0x18)
-
-#define MPI_FUNCTION_MAILBOX                        (0x19)
-
-#define MPI_FUNCTION_SMP_PASSTHROUGH                (0x1A)
-#define MPI_FUNCTION_SAS_IO_UNIT_CONTROL            (0x1B)
-#define MPI_FUNCTION_SATA_PASSTHROUGH               (0x1C)
-
-#define MPI_FUNCTION_DIAG_BUFFER_POST               (0x1D)
-#define MPI_FUNCTION_DIAG_RELEASE                   (0x1E)
-
-#define MPI_FUNCTION_SCSI_IO_32                     (0x1F)
-
-#define MPI_FUNCTION_LAN_SEND                       (0x20)
-#define MPI_FUNCTION_LAN_RECEIVE                    (0x21)
-#define MPI_FUNCTION_LAN_RESET                      (0x22)
-
-#define MPI_FUNCTION_TARGET_ASSIST_EXTENDED         (0x23)
-#define MPI_FUNCTION_TARGET_CMD_BUF_BASE_POST       (0x24)
-#define MPI_FUNCTION_TARGET_CMD_BUF_LIST_POST       (0x25)
-
-#define MPI_FUNCTION_INBAND_BUFFER_POST             (0x28)
-#define MPI_FUNCTION_INBAND_SEND                    (0x29)
-#define MPI_FUNCTION_INBAND_RSP                     (0x2A)
-#define MPI_FUNCTION_INBAND_ABORT                   (0x2B)
-
-#define MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET         (0x40)
-#define MPI_FUNCTION_IO_UNIT_RESET                  (0x41)
-#define MPI_FUNCTION_HANDSHAKE                      (0x42)
-#define MPI_FUNCTION_REPLY_FRAME_REMOVAL            (0x43)
-#define MPI_FUNCTION_HOST_PAGEBUF_ACCESS_CONTROL    (0x44)
-
-
-/* standard version format */
-typedef struct _MPI_VERSION_STRUCT
-{
-    U8                      Dev;                        /* 00h */
-    U8                      Unit;                       /* 01h */
-    U8                      Minor;                      /* 02h */
-    U8                      Major;                      /* 03h */
-} MPI_VERSION_STRUCT, MPI_POINTER PTR_MPI_VERSION_STRUCT,
-  MpiVersionStruct_t, MPI_POINTER pMpiVersionStruct;
-
-typedef union _MPI_VERSION_FORMAT
-{
-    MPI_VERSION_STRUCT      Struct;
-    U32                     Word;
-} MPI_VERSION_FORMAT, MPI_POINTER PTR_MPI_VERSION_FORMAT,
-  MpiVersionFormat_t, MPI_POINTER pMpiVersionFormat_t;
-
-
-/*****************************************************************************
-*
-*        S c a t t e r    G a t h e r    E l e m e n t s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/*  Simple element structures                                               */
-/****************************************************************************/
-
-typedef struct _SGE_SIMPLE32
-{
-    U32                     FlagsLength;
-    U32                     Address;
-} SGE_SIMPLE32, MPI_POINTER PTR_SGE_SIMPLE32,
-  SGESimple32_t, MPI_POINTER pSGESimple32_t;
-
-typedef struct _SGE_SIMPLE64
-{
-    U32                     FlagsLength;
-    U64                     Address;
-} SGE_SIMPLE64, MPI_POINTER PTR_SGE_SIMPLE64,
-  SGESimple64_t, MPI_POINTER pSGESimple64_t;
-
-typedef struct _SGE_SIMPLE_UNION
-{
-    U32                     FlagsLength;
-    union
-    {
-        U32                 Address32;
-        U64                 Address64;
-    }u;
-} SGE_SIMPLE_UNION, MPI_POINTER PTR_SGE_SIMPLE_UNION,
-  SGESimpleUnion_t, MPI_POINTER pSGESimpleUnion_t;
-
-/****************************************************************************/
-/*  Chain element structures                                                */
-/****************************************************************************/
-
-typedef struct _SGE_CHAIN32
-{
-    U16                     Length;
-    U8                      NextChainOffset;
-    U8                      Flags;
-    U32                     Address;
-} SGE_CHAIN32, MPI_POINTER PTR_SGE_CHAIN32,
-  SGEChain32_t, MPI_POINTER pSGEChain32_t;
-
-typedef struct _SGE_CHAIN64
-{
-    U16                     Length;
-    U8                      NextChainOffset;
-    U8                      Flags;
-    U64                     Address;
-} SGE_CHAIN64, MPI_POINTER PTR_SGE_CHAIN64,
-  SGEChain64_t, MPI_POINTER pSGEChain64_t;
-
-typedef struct _SGE_CHAIN_UNION
-{
-    U16                     Length;
-    U8                      NextChainOffset;
-    U8                      Flags;
-    union
-    {
-        U32                 Address32;
-        U64                 Address64;
-    }u;
-} SGE_CHAIN_UNION, MPI_POINTER PTR_SGE_CHAIN_UNION,
-  SGEChainUnion_t, MPI_POINTER pSGEChainUnion_t;
-
-/****************************************************************************/
-/*  Transaction Context element                                             */
-/****************************************************************************/
-
-typedef struct _SGE_TRANSACTION32
-{
-    U8                      Reserved;
-    U8                      ContextSize;
-    U8                      DetailsLength;
-    U8                      Flags;
-    U32                     TransactionContext[1];
-    U32                     TransactionDetails[1];
-} SGE_TRANSACTION32, MPI_POINTER PTR_SGE_TRANSACTION32,
-  SGETransaction32_t, MPI_POINTER pSGETransaction32_t;
-
-typedef struct _SGE_TRANSACTION64
-{
-    U8                      Reserved;
-    U8                      ContextSize;
-    U8                      DetailsLength;
-    U8                      Flags;
-    U32                     TransactionContext[2];
-    U32                     TransactionDetails[1];
-} SGE_TRANSACTION64, MPI_POINTER PTR_SGE_TRANSACTION64,
-  SGETransaction64_t, MPI_POINTER pSGETransaction64_t;
-
-typedef struct _SGE_TRANSACTION96
-{
-    U8                      Reserved;
-    U8                      ContextSize;
-    U8                      DetailsLength;
-    U8                      Flags;
-    U32                     TransactionContext[3];
-    U32                     TransactionDetails[1];
-} SGE_TRANSACTION96, MPI_POINTER PTR_SGE_TRANSACTION96,
-  SGETransaction96_t, MPI_POINTER pSGETransaction96_t;
-
-typedef struct _SGE_TRANSACTION128
-{
-    U8                      Reserved;
-    U8                      ContextSize;
-    U8                      DetailsLength;
-    U8                      Flags;
-    U32                     TransactionContext[4];
-    U32                     TransactionDetails[1];
-} SGE_TRANSACTION128, MPI_POINTER PTR_SGE_TRANSACTION128,
-  SGETransaction_t128, MPI_POINTER pSGETransaction_t128;
-
-typedef struct _SGE_TRANSACTION_UNION
-{
-    U8                      Reserved;
-    U8                      ContextSize;
-    U8                      DetailsLength;
-    U8                      Flags;
-    union
-    {
-        U32                 TransactionContext32[1];
-        U32                 TransactionContext64[2];
-        U32                 TransactionContext96[3];
-        U32                 TransactionContext128[4];
-    }u;
-    U32                     TransactionDetails[1];
-} SGE_TRANSACTION_UNION, MPI_POINTER PTR_SGE_TRANSACTION_UNION,
-  SGETransactionUnion_t, MPI_POINTER pSGETransactionUnion_t;
-
-
-/****************************************************************************/
-/*  SGE IO types union  for IO SGL's                                        */
-/****************************************************************************/
-
-typedef struct _SGE_IO_UNION
-{
-    union
-    {
-        SGE_SIMPLE_UNION    Simple;
-        SGE_CHAIN_UNION     Chain;
-    } u;
-} SGE_IO_UNION, MPI_POINTER PTR_SGE_IO_UNION,
-  SGEIOUnion_t, MPI_POINTER pSGEIOUnion_t;
-
-/****************************************************************************/
-/*  SGE union for SGL's with Simple and Transaction elements                */
-/****************************************************************************/
-
-typedef struct _SGE_TRANS_SIMPLE_UNION
-{
-    union
-    {
-        SGE_SIMPLE_UNION        Simple;
-        SGE_TRANSACTION_UNION   Transaction;
-    } u;
-} SGE_TRANS_SIMPLE_UNION, MPI_POINTER PTR_SGE_TRANS_SIMPLE_UNION,
-  SGETransSimpleUnion_t, MPI_POINTER pSGETransSimpleUnion_t;
-
-/****************************************************************************/
-/*  All SGE types union                                                     */
-/****************************************************************************/
-
-typedef struct _SGE_MPI_UNION
-{
-    union
-    {
-        SGE_SIMPLE_UNION        Simple;
-        SGE_CHAIN_UNION         Chain;
-        SGE_TRANSACTION_UNION   Transaction;
-    } u;
-} SGE_MPI_UNION, MPI_POINTER PTR_SGE_MPI_UNION,
-  MPI_SGE_UNION_t, MPI_POINTER pMPI_SGE_UNION_t,
-  SGEAllUnion_t, MPI_POINTER pSGEAllUnion_t;
-
-
-/****************************************************************************/
-/*  SGE field definition and masks                                          */
-/****************************************************************************/
-
-/* Flags field bit definitions */
-
-#define MPI_SGE_FLAGS_LAST_ELEMENT              (0x80)
-#define MPI_SGE_FLAGS_END_OF_BUFFER             (0x40)
-#define MPI_SGE_FLAGS_ELEMENT_TYPE_MASK         (0x30)
-#define MPI_SGE_FLAGS_LOCAL_ADDRESS             (0x08)
-#define MPI_SGE_FLAGS_DIRECTION                 (0x04)
-#define MPI_SGE_FLAGS_ADDRESS_SIZE              (0x02)
-#define MPI_SGE_FLAGS_END_OF_LIST               (0x01)
-
-#define MPI_SGE_FLAGS_SHIFT                     (24)
-
-#define MPI_SGE_LENGTH_MASK                     (0x00FFFFFF)
-#define MPI_SGE_CHAIN_LENGTH_MASK               (0x0000FFFF)
-
-/* Element Type */
-
-#define MPI_SGE_FLAGS_TRANSACTION_ELEMENT       (0x00)
-#define MPI_SGE_FLAGS_SIMPLE_ELEMENT            (0x10)
-#define MPI_SGE_FLAGS_CHAIN_ELEMENT             (0x30)
-#define MPI_SGE_FLAGS_ELEMENT_MASK              (0x30)
-
-/* Address location */
-
-#define MPI_SGE_FLAGS_SYSTEM_ADDRESS            (0x00)
-
-/* Direction */
-
-#define MPI_SGE_FLAGS_IOC_TO_HOST               (0x00)
-#define MPI_SGE_FLAGS_HOST_TO_IOC               (0x04)
-
-/* Address Size */
-
-#define MPI_SGE_FLAGS_32_BIT_ADDRESSING         (0x00)
-#define MPI_SGE_FLAGS_64_BIT_ADDRESSING         (0x02)
-
-/* Context Size */
-
-#define MPI_SGE_FLAGS_32_BIT_CONTEXT            (0x00)
-#define MPI_SGE_FLAGS_64_BIT_CONTEXT            (0x02)
-#define MPI_SGE_FLAGS_96_BIT_CONTEXT            (0x04)
-#define MPI_SGE_FLAGS_128_BIT_CONTEXT           (0x06)
-
-#define MPI_SGE_CHAIN_OFFSET_MASK               (0x00FF0000)
-#define MPI_SGE_CHAIN_OFFSET_SHIFT              (16)
-
-
-/****************************************************************************/
-/*  SGE operation Macros                                                    */
-/****************************************************************************/
-
-         /* SIMPLE FlagsLength manipulations... */
-#define  MPI_SGE_SET_FLAGS(f)           ((U32)(f) << MPI_SGE_FLAGS_SHIFT)
-#define  MPI_SGE_GET_FLAGS(fl)          (((fl) & ~MPI_SGE_LENGTH_MASK) >> MPI_SGE_FLAGS_SHIFT)
-#define  MPI_SGE_LENGTH(fl)             ((fl) & MPI_SGE_LENGTH_MASK)
-#define  MPI_SGE_CHAIN_LENGTH(fl)       ((fl) & MPI_SGE_CHAIN_LENGTH_MASK)
-
-#define  MPI_SGE_SET_FLAGS_LENGTH(f,l)  (MPI_SGE_SET_FLAGS(f) | MPI_SGE_LENGTH(l))
-
-#define  MPI_pSGE_GET_FLAGS(psg)        MPI_SGE_GET_FLAGS((psg)->FlagsLength)
-#define  MPI_pSGE_GET_LENGTH(psg)       MPI_SGE_LENGTH((psg)->FlagsLength)
-#define  MPI_pSGE_SET_FLAGS_LENGTH(psg,f,l)  (psg)->FlagsLength = MPI_SGE_SET_FLAGS_LENGTH(f,l)
-         /* CAUTION - The following are READ-MODIFY-WRITE! */
-#define  MPI_pSGE_SET_FLAGS(psg,f)      (psg)->FlagsLength |= MPI_SGE_SET_FLAGS(f)
-#define  MPI_pSGE_SET_LENGTH(psg,l)     (psg)->FlagsLength |= MPI_SGE_LENGTH(l)
-
-#define  MPI_GET_CHAIN_OFFSET(x) ((x&MPI_SGE_CHAIN_OFFSET_MASK)>>MPI_SGE_CHAIN_OFFSET_SHIFT)
-
-
-
-/*****************************************************************************
-*
-*        S t a n d a r d    M e s s a g e    S t r u c t u r e s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/* Standard message request header for all request messages                 */
-/****************************************************************************/
-
-typedef struct _MSG_REQUEST_HEADER
-{
-    U8                      Reserved[2];      /* function specific */
-    U8                      ChainOffset;
-    U8                      Function;
-    U8                      Reserved1[3];     /* function specific */
-    U8                      MsgFlags;
-    U32                     MsgContext;
-} MSG_REQUEST_HEADER, MPI_POINTER PTR_MSG_REQUEST_HEADER,
-  MPIHeader_t, MPI_POINTER pMPIHeader_t;
-
-
-/****************************************************************************/
-/*  Default Reply                                                           */
-/****************************************************************************/
-
-typedef struct _MSG_DEFAULT_REPLY
-{
-    U8                      Reserved[2];      /* function specific */
-    U8                      MsgLength;
-    U8                      Function;
-    U8                      Reserved1[3];     /* function specific */
-    U8                      MsgFlags;
-    U32                     MsgContext;
-    U8                      Reserved2[2];     /* function specific */
-    U16                     IOCStatus;
-    U32                     IOCLogInfo;
-} MSG_DEFAULT_REPLY, MPI_POINTER PTR_MSG_DEFAULT_REPLY,
-  MPIDefaultReply_t, MPI_POINTER pMPIDefaultReply_t;
-
-
-/* MsgFlags definition for all replies */
-
-#define MPI_MSGFLAGS_CONTINUATION_REPLY         (0x80)
-
-
-/*****************************************************************************
-*
-*               I O C    S t a t u s   V a l u e s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/*  Common IOCStatus values for all replies                                 */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_SUCCESS                   (0x0000)
-#define MPI_IOCSTATUS_INVALID_FUNCTION          (0x0001)
-#define MPI_IOCSTATUS_BUSY                      (0x0002)
-#define MPI_IOCSTATUS_INVALID_SGL               (0x0003)
-#define MPI_IOCSTATUS_INTERNAL_ERROR            (0x0004)
-#define MPI_IOCSTATUS_RESERVED                  (0x0005)
-#define MPI_IOCSTATUS_INSUFFICIENT_RESOURCES    (0x0006)
-#define MPI_IOCSTATUS_INVALID_FIELD             (0x0007)
-#define MPI_IOCSTATUS_INVALID_STATE             (0x0008)
-#define MPI_IOCSTATUS_OP_STATE_NOT_SUPPORTED    (0x0009)
-
-/****************************************************************************/
-/*  Config IOCStatus values                                                 */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_CONFIG_INVALID_ACTION     (0x0020)
-#define MPI_IOCSTATUS_CONFIG_INVALID_TYPE       (0x0021)
-#define MPI_IOCSTATUS_CONFIG_INVALID_PAGE       (0x0022)
-#define MPI_IOCSTATUS_CONFIG_INVALID_DATA       (0x0023)
-#define MPI_IOCSTATUS_CONFIG_NO_DEFAULTS        (0x0024)
-#define MPI_IOCSTATUS_CONFIG_CANT_COMMIT        (0x0025)
-
-/****************************************************************************/
-/*  SCSIIO Reply (SPI & FCP) initiator values                               */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_SCSI_RECOVERED_ERROR      (0x0040)
-#define MPI_IOCSTATUS_SCSI_INVALID_BUS          (0x0041)
-#define MPI_IOCSTATUS_SCSI_INVALID_TARGETID     (0x0042)
-#define MPI_IOCSTATUS_SCSI_DEVICE_NOT_THERE     (0x0043)
-#define MPI_IOCSTATUS_SCSI_DATA_OVERRUN         (0x0044)
-#define MPI_IOCSTATUS_SCSI_DATA_UNDERRUN        (0x0045)
-#define MPI_IOCSTATUS_SCSI_IO_DATA_ERROR        (0x0046)
-#define MPI_IOCSTATUS_SCSI_PROTOCOL_ERROR       (0x0047)
-#define MPI_IOCSTATUS_SCSI_TASK_TERMINATED      (0x0048)
-#define MPI_IOCSTATUS_SCSI_RESIDUAL_MISMATCH    (0x0049)
-#define MPI_IOCSTATUS_SCSI_TASK_MGMT_FAILED     (0x004A)
-#define MPI_IOCSTATUS_SCSI_IOC_TERMINATED       (0x004B)
-#define MPI_IOCSTATUS_SCSI_EXT_TERMINATED       (0x004C)
-
-/****************************************************************************/
-/*  For use by SCSI Initiator and SCSI Target end-to-end data protection    */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_EEDP_GUARD_ERROR          (0x004D)
-#define MPI_IOCSTATUS_EEDP_REF_TAG_ERROR        (0x004E)
-#define MPI_IOCSTATUS_EEDP_APP_TAG_ERROR        (0x004F)
-
-
-/****************************************************************************/
-/*  SCSI Target values                                                      */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_TARGET_PRIORITY_IO         (0x0060)
-#define MPI_IOCSTATUS_TARGET_INVALID_PORT        (0x0061)
-#define MPI_IOCSTATUS_TARGET_INVALID_IOCINDEX    (0x0062)   /* obsolete name */
-#define MPI_IOCSTATUS_TARGET_INVALID_IO_INDEX    (0x0062)
-#define MPI_IOCSTATUS_TARGET_ABORTED             (0x0063)
-#define MPI_IOCSTATUS_TARGET_NO_CONN_RETRYABLE   (0x0064)
-#define MPI_IOCSTATUS_TARGET_NO_CONNECTION       (0x0065)
-#define MPI_IOCSTATUS_TARGET_XFER_COUNT_MISMATCH (0x006A)
-#define MPI_IOCSTATUS_TARGET_STS_DATA_NOT_SENT   (0x006B)
-#define MPI_IOCSTATUS_TARGET_DATA_OFFSET_ERROR   (0x006D)
-#define MPI_IOCSTATUS_TARGET_TOO_MUCH_WRITE_DATA (0x006E)
-#define MPI_IOCSTATUS_TARGET_IU_TOO_SHORT        (0x006F)
-#define MPI_IOCSTATUS_TARGET_ACK_NAK_TIMEOUT     (0x0070)
-#define MPI_IOCSTATUS_TARGET_NAK_RECEIVED        (0x0071)
-
-/****************************************************************************/
-/*  Additional FCP target values (obsolete)                                 */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_TARGET_FC_ABORTED         (0x0066)    /* obsolete */
-#define MPI_IOCSTATUS_TARGET_FC_RX_ID_INVALID   (0x0067)    /* obsolete */
-#define MPI_IOCSTATUS_TARGET_FC_DID_INVALID     (0x0068)    /* obsolete */
-#define MPI_IOCSTATUS_TARGET_FC_NODE_LOGGED_OUT (0x0069)    /* obsolete */
-
-/****************************************************************************/
-/*  Fibre Channel Direct Access values                                      */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_FC_ABORTED                (0x0066)
-#define MPI_IOCSTATUS_FC_RX_ID_INVALID          (0x0067)
-#define MPI_IOCSTATUS_FC_DID_INVALID            (0x0068)
-#define MPI_IOCSTATUS_FC_NODE_LOGGED_OUT        (0x0069)
-#define MPI_IOCSTATUS_FC_EXCHANGE_CANCELED      (0x006C)
-
-/****************************************************************************/
-/*  LAN values                                                              */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_LAN_DEVICE_NOT_FOUND      (0x0080)
-#define MPI_IOCSTATUS_LAN_DEVICE_FAILURE        (0x0081)
-#define MPI_IOCSTATUS_LAN_TRANSMIT_ERROR        (0x0082)
-#define MPI_IOCSTATUS_LAN_TRANSMIT_ABORTED      (0x0083)
-#define MPI_IOCSTATUS_LAN_RECEIVE_ERROR         (0x0084)
-#define MPI_IOCSTATUS_LAN_RECEIVE_ABORTED       (0x0085)
-#define MPI_IOCSTATUS_LAN_PARTIAL_PACKET        (0x0086)
-#define MPI_IOCSTATUS_LAN_CANCELED              (0x0087)
-
-/****************************************************************************/
-/*  Serial Attached SCSI values                                             */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_SAS_SMP_REQUEST_FAILED    (0x0090)
-#define MPI_IOCSTATUS_SAS_SMP_DATA_OVERRUN      (0x0091)
-
-/****************************************************************************/
-/*  Inband values                                                           */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_INBAND_ABORTED            (0x0098)
-#define MPI_IOCSTATUS_INBAND_NO_CONNECTION      (0x0099)
-
-/****************************************************************************/
-/*  Diagnostic Tools values                                                 */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_DIAGNOSTIC_RELEASED       (0x00A0)
-
-
-/****************************************************************************/
-/*  IOCStatus flag to indicate that log info is available                   */
-/****************************************************************************/
-
-#define MPI_IOCSTATUS_FLAG_LOG_INFO_AVAILABLE   (0x8000)
-#define MPI_IOCSTATUS_MASK                      (0x7FFF)
-
-/****************************************************************************/
-/*  LogInfo Types                                                           */
-/****************************************************************************/
-
-#define MPI_IOCLOGINFO_TYPE_MASK                (0xF0000000)
-#define MPI_IOCLOGINFO_TYPE_SHIFT               (28)
-#define MPI_IOCLOGINFO_TYPE_NONE                (0x0)
-#define MPI_IOCLOGINFO_TYPE_SCSI                (0x1)
-#define MPI_IOCLOGINFO_TYPE_FC                  (0x2)
-#define MPI_IOCLOGINFO_TYPE_SAS                 (0x3)
-#define MPI_IOCLOGINFO_TYPE_ISCSI               (0x4)
-#define MPI_IOCLOGINFO_LOG_DATA_MASK            (0x0FFFFFFF)
-
-
-#endif
diff --git a/include.new/dev/mpt/mpilib/mpi_cnfg.h b/include.new/dev/mpt/mpilib/mpi_cnfg.h
deleted file mode 100644
index 6a2fe26..0000000
--- a/include.new/dev/mpt/mpilib/mpi_cnfg.h
+++ /dev/null
@@ -1,3157 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_cnfg.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *           Name:  mpi_cnfg.h
- *          Title:  MPI Config message, structures, and Pages
- *  Creation Date:  July 27, 2000
- *
- *    mpi_cnfg.h Version:  01.05.19
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  05-08-00  00.10.01  Original release for 0.10 spec dated 4/26/2000.
- *  06-06-00  01.00.01  Update version number for 1.0 release.
- *  06-08-00  01.00.02  Added _PAGEVERSION definitions for all pages.
- *                      Added FcPhLowestVersion, FcPhHighestVersion, Reserved2
- *                      fields to FC_DEVICE_0 page, updated the page version.
- *                      Changed _FREE_RUNNING_CLOCK to _PACING_TRANSFERS in
- *                      SCSI_PORT_0, SCSI_DEVICE_0 and SCSI_DEVICE_1 pages
- *                      and updated the page versions.
- *                      Added _RESPONSE_ID_MASK definition to SCSI_PORT_1
- *                      page and updated the page version.
- *                      Added Information field and _INFO_PARAMS_NEGOTIATED
- *                      definitionto SCSI_DEVICE_0 page.
- *  06-22-00  01.00.03  Removed batch controls from LAN_0 page and updated the
- *                      page version.
- *                      Added BucketsRemaining to LAN_1 page, redefined the
- *                      state values, and updated the page version.
- *                      Revised bus width definitions in SCSI_PORT_0,
- *                      SCSI_DEVICE_0 and SCSI_DEVICE_1 pages.
- *  06-30-00  01.00.04  Added MaxReplySize to LAN_1 page and updated the page
- *                      version.
- *                      Moved FC_DEVICE_0 PageAddress description to spec.
- *  07-27-00  01.00.05  Corrected the SubsystemVendorID and SubsystemID field
- *                      widths in IOC_0 page and updated the page version.
- *  11-02-00  01.01.01  Original release for post 1.0 work
- *                      Added Manufacturing pages, IO Unit Page 2, SCSI SPI
- *                      Port Page 2, FC Port Page 4, FC Port Page 5
- *  11-15-00  01.01.02  Interim changes to match proposals
- *  12-04-00  01.01.03  Config page changes to match MPI rev 1.00.01.
- *  12-05-00  01.01.04  Modified config page actions.
- *  01-09-01  01.01.05  Added defines for page address formats.
- *                      Data size for Manufacturing pages 2 and 3 no longer
- *                      defined here.
- *                      Io Unit Page 2 size is fixed at 4 adapters and some
- *                      flags were changed.
- *                      SCSI Port Page 2 Device Settings modified.
- *                      New fields added to FC Port Page 0 and some flags
- *                      cleaned up.
- *                      Removed impedance flash from FC Port Page 1.
- *                      Added FC Port pages 6 and 7.
- *  01-25-01  01.01.06  Added MaxInitiators field to FcPortPage0.
- *  01-29-01  01.01.07  Changed some defines to make them 32 character unique.
- *                      Added some LinkType defines for FcPortPage0.
- *  02-20-01  01.01.08  Started using MPI_POINTER.
- *  02-27-01  01.01.09  Replaced MPI_CONFIG_PAGETYPE_SCSI_LUN with
- *                      MPI_CONFIG_PAGETYPE_RAID_VOLUME.
- *                      Added definitions and structures for IOC Page 2 and
- *                      RAID Volume Page 2.
- *  03-27-01  01.01.10  Added CONFIG_PAGE_FC_PORT_8 and CONFIG_PAGE_FC_PORT_9.
- *                      CONFIG_PAGE_FC_PORT_3 now supports persistent by DID.
- *                      Added VendorId and ProductRevLevel fields to
- *                      RAIDVOL2_IM_PHYS_ID struct.
- *                      Modified values for MPI_FCPORTPAGE0_FLAGS_ATTACH_
- *                      defines to make them compatible to MPI version 1.0.
- *                      Added structure offset comments.
- *  04-09-01  01.01.11  Added some new defines for the PageAddress field and
- *                      removed some obsolete ones.
- *                      Added IO Unit Page 3.
- *                      Modified defines for Scsi Port Page 2.
- *                      Modified RAID Volume Pages.
- *  08-08-01  01.02.01  Original release for v1.2 work.
- *                      Added SepID and SepBus to RVP2 IMPhysicalDisk struct.
- *                      Added defines for the SEP bits in RVP2 VolumeSettings.
- *                      Modified the DeviceSettings field in RVP2 to use the
- *                      proper structure.
- *                      Added defines for SES, SAF-TE, and cross channel for
- *                      IOCPage2 CapabilitiesFlags.
- *                      Removed define for MPI_IOUNITPAGE2_FLAGS_RAID_DISABLE.
- *                      Removed define for
- *                      MPI_SCSIPORTPAGE2_PORT_FLAGS_PARITY_ENABLE.
- *                      Added define for MPI_CONFIG_PAGEATTR_RO_PERSISTENT.
- *  08-29-01 01.02.02   Fixed value for MPI_MANUFACTPAGE_DEVID_53C1035.
- *                      Added defines for MPI_FCPORTPAGE1_FLAGS_HARD_ALPA_ONLY
- *                      and MPI_FCPORTPAGE1_FLAGS_IMMEDIATE_ERROR_REPLY.
- *                      Removed MPI_SCSIPORTPAGE0_CAP_PACING_TRANSFERS,
- *                      MPI_SCSIDEVPAGE0_NP_PACING_TRANSFERS, and
- *                      MPI_SCSIDEVPAGE1_RP_PACING_TRANSFERS, and
- *                      MPI_SCSIDEVPAGE1_CONF_PPR_ALLOWED.
- *                      Added defines for MPI_SCSIDEVPAGE1_CONF_WDTR_DISALLOWED
- *                      and MPI_SCSIDEVPAGE1_CONF_SDTR_DISALLOWED.
- *                      Added OnBusTimerValue to CONFIG_PAGE_SCSI_PORT_1.
- *                      Added rejected bits to SCSI Device Page 0 Information.
- *                      Increased size of ALPA array in FC Port Page 2 by one
- *                      and removed a one byte reserved field.
- *  09-28-01 01.02.03   Swapped NegWireSpeedLow and NegWireSpeedLow in
- *                      CONFIG_PAGE_LAN_1 to match preferred 64-bit ordering.
- *                      Added structures for Manufacturing Page 4, IO Unit
- *                      Page 3, IOC Page 3, IOC Page 4, RAID Volume Page 0, and
- *                      RAID PhysDisk Page 0.
- *  10-04-01 01.02.04   Added define for MPI_CONFIG_PAGETYPE_RAID_PHYSDISK.
- *                      Modified some of the new defines to make them 32
- *                      character unique.
- *                      Modified how variable length pages (arrays) are defined.
- *                      Added generic defines for hot spare pools and RAID
- *                      volume types.
- *  11-01-01 01.02.05   Added define for MPI_IOUNITPAGE1_DISABLE_IR.
- *  03-14-02 01.02.06   Added PCISlotNum field to CONFIG_PAGE_IOC_1 along with
- *                      related define, and bumped the page version define.
- *  05-31-02 01.02.07   Added a Flags field to CONFIG_PAGE_IOC_2_RAID_VOL in a
- *                      reserved byte and added a define.
- *                      Added define for
- *                      MPI_RAIDVOL0_STATUS_FLAG_VOLUME_INACTIVE.
- *                      Added new config page: CONFIG_PAGE_IOC_5.
- *                      Added MaxAliases, MaxHardAliases, and NumCurrentAliases
- *                      fields to CONFIG_PAGE_FC_PORT_0.
- *                      Added AltConnector and NumRequestedAliases fields to
- *                      CONFIG_PAGE_FC_PORT_1.
- *                      Added new config page: CONFIG_PAGE_FC_PORT_10.
- *  07-12-02 01.02.08   Added more MPI_MANUFACTPAGE_DEVID_ defines.
- *                      Added additional MPI_SCSIDEVPAGE0_NP_ defines.
- *                      Added more MPI_SCSIDEVPAGE1_RP_ defines.
- *                      Added define for
- *                      MPI_SCSIDEVPAGE1_CONF_EXTENDED_PARAMS_ENABLE.
- *                      Added new config page: CONFIG_PAGE_SCSI_DEVICE_3.
- *                      Modified MPI_FCPORTPAGE5_FLAGS_ defines.
- *  09-16-02 01.02.09   Added MPI_SCSIDEVPAGE1_CONF_FORCE_PPR_MSG define.
- *  11-15-02 01.02.10   Added ConnectedID defines for CONFIG_PAGE_SCSI_PORT_0.
- *                      Added more Flags defines for CONFIG_PAGE_FC_PORT_1.
- *                      Added more Flags defines for CONFIG_PAGE_FC_DEVICE_0.
- *  04-01-03 01.02.11   Added RR_TOV field and additional Flags defines for
- *                      CONFIG_PAGE_FC_PORT_1.
- *                      Added define MPI_FCPORTPAGE5_FLAGS_DISABLE to disable
- *                      an alias.
- *                      Added more device id defines.
- *  06-26-03 01.02.12   Added MPI_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID define.
- *                      Added TargetConfig and IDConfig fields to
- *                      CONFIG_PAGE_SCSI_PORT_1.
- *                      Added more PortFlags defines for CONFIG_PAGE_SCSI_PORT_2
- *                      to control DV.
- *                      Added more Flags defines for CONFIG_PAGE_FC_PORT_1.
- *                      In CONFIG_PAGE_FC_DEVICE_0, replaced Reserved1 field
- *                      with ADISCHardALPA.
- *                      Added MPI_FC_DEVICE_PAGE0_PROT_FCP_RETRY define.
- *  01-16-04 01.02.13   Added InitiatorDeviceTimeout and InitiatorIoPendTimeout
- *                      fields and related defines to CONFIG_PAGE_FC_PORT_1.
- *                      Added define for
- *                      MPI_FCPORTPAGE1_FLAGS_SOFT_ALPA_FALLBACK.
- *                      Added new fields to the substructures of
- *                      CONFIG_PAGE_FC_PORT_10.
- *  04-29-04 01.02.14   Added define for IDP bit for CONFIG_PAGE_SCSI_PORT_0,
- *                      CONFIG_PAGE_SCSI_DEVICE_0, and
- *                      CONFIG_PAGE_SCSI_DEVICE_1. Also bumped Page Version for
- *                      these pages.
- *  05-11-04 01.03.01   Added structure for CONFIG_PAGE_INBAND_0.
- *  08-19-04 01.05.01   Modified MSG_CONFIG request to support extended config
- *                      pages.
- *                      Added a new structure for extended config page header.
- *                      Added new extended config pages types and structures for
- *                      SAS IO Unit, SAS Expander, SAS Device, and SAS PHY.
- *                      Replaced a reserved byte in CONFIG_PAGE_MANUFACTURING_4
- *                      to add a Flags field.
- *                      Two new Manufacturing config pages (5 and 6).
- *                      Two new bits defined for IO Unit Page 1 Flags field.
- *                      Modified CONFIG_PAGE_IO_UNIT_2 to add three new fields
- *                      to specify the BIOS boot device.
- *                      Four new Flags bits defined for IO Unit Page 2.
- *                      Added IO Unit Page 4.
- *                      Added EEDP Flags settings to IOC Page 1.
- *                      Added new BIOS Page 1 config page.
- *  10-05-04 01.05.02   Added define for
- *                      MPI_IOCPAGE1_INITIATOR_CONTEXT_REPLY_DISABLE.
- *                      Added new Flags field to CONFIG_PAGE_MANUFACTURING_5 and
- *                      associated defines.
- *                      Added more defines for SAS IO Unit Page 0
- *                      DiscoveryStatus field.
- *                      Added define for MPI_SAS_IOUNIT0_DS_SUBTRACTIVE_LINK
- *                      and MPI_SAS_IOUNIT0_DS_TABLE_LINK.
- *                      Added defines for Physical Mapping Modes to SAS IO Unit
- *                      Page 2.
- *                      Added define for
- *                      MPI_SAS_DEVICE0_FLAGS_PORT_SELECTOR_ATTACH.
- *  10-27-04 01.05.03   Added defines for new SAS PHY page addressing mode.
- *                      Added defines for MaxTargetSpinUp to BIOS Page 1.
- *                      Added 5 new ControlFlags defines for SAS IO Unit
- *                      Page 1.
- *                      Added MaxNumPhysicalMappedIDs field to SAS IO Unit
- *                      Page 2.
- *                      Added AccessStatus field to SAS Device Page 0 and added
- *                      new Flags bits for supported SATA features.
- *  12-07-04  01.05.04  Added config page structures for BIOS Page 2, RAID
- *                      Volume Page 1, and RAID Physical Disk Page 1.
- *                      Replaced IO Unit Page 1 BootTargetID,BootBus, and
- *                      BootAdapterNum with reserved field.
- *                      Added DataScrubRate and ResyncRate to RAID Volume
- *                      Page 0.
- *                      Added MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT
- *                      define.
- *  12-09-04  01.05.05  Added Target Mode Large CDB Enable to FC Port Page 1
- *                      Flags field.
- *                      Added Auto Port Config flag define for SAS IOUNIT
- *                      Page 1 ControlFlags.
- *                      Added Disabled bad Phy define to Expander Page 1
- *                      Discovery Info field.
- *                      Added SAS/SATA device support to SAS IOUnit Page 1
- *                      ControlFlags.
- *                      Added Unsupported device to SAS Dev Page 0 Flags field
- *                      Added disable use SATA Hash Address for SAS IOUNIT
- *                      page 1 in ControlFields.
- *  01-15-05  01.05.06  Added defaults for data scrub rate and resync rate to
- *                      Manufacturing Page 4.
- *                      Added new defines for BIOS Page 1 IOCSettings field.
- *                      Added ExtDiskIdentifier field to RAID Physical Disk
- *                      Page 0.
- *                      Added new defines for SAS IO Unit Page 1 ControlFlags
- *                      and to SAS Device Page 0 Flags to control SATA devices.
- *                      Added defines and structures for the new Log Page 0, a
- *                      new type of configuration page.
- *  02-09-05  01.05.07  Added InactiveStatus field to RAID Volume Page 0.
- *                      Added WWID field to RAID Volume Page 1.
- *                      Added PhysicalPort field to SAS Expander pages 0 and 1.
- *  03-11-05  01.05.08  Removed the EEDP flags from IOC Page 1.
- *                      Added Enclosure/Slot boot device format to BIOS Page 2.
- *                      New status value for RAID Volume Page 0 VolumeStatus
- *                      (VolumeState subfield).
- *                      New value for RAID Physical Page 0 InactiveStatus.
- *                      Added Inactive Volume Member flag RAID Physical Disk
- *                      Page 0 PhysDiskStatus field.
- *                      New physical mapping mode in SAS IO Unit Page 2.
- *                      Added CONFIG_PAGE_SAS_ENCLOSURE_0.
- *                      Added Slot and Enclosure fields to SAS Device Page 0.
- *  06-24-05  01.05.09  Added EEDP defines to IOC Page 1.
- *                      Added more RAID type defines to IOC Page 2.
- *                      Added Port Enable Delay settings to BIOS Page 1.
- *                      Added Bad Block Table Full define to RAID Volume Page 0.
- *                      Added Previous State defines to RAID Physical Disk
- *                      Page 0.
- *                      Added Max Sata Targets define for DiscoveryStatus field
- *                      of SAS IO Unit Page 0.
- *                      Added Device Self Test to Control Flags of SAS IO Unit
- *                      Page 1.
- *                      Added Direct Attach Starting Slot Number define for SAS
- *                      IO Unit Page 2.
- *                      Added new fields in SAS Device Page 2 for enclosure
- *                      mapping.
- *                      Added OwnerDevHandle and Flags field to SAS PHY Page 0.
- *                      Added IOC GPIO Flags define to SAS Enclosure Page 0.
- *                      Fixed the value for MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT.
- *  08-03-05  01.05.10  Removed ISDataScrubRate and ISResyncRate from
- *                      Manufacturing Page 4.
- *                      Added MPI_IOUNITPAGE1_SATA_WRITE_CACHE_DISABLE bit.
- *                      Added NumDevsPerEnclosure field to SAS IO Unit page 2.
- *                      Added MPI_SAS_IOUNIT2_FLAGS_HOST_ASSIGNED_PHYS_MAP
- *                      define.
- *                      Added EnclosureHandle field to SAS Expander page 0.
- *                      Removed redundant NumTableEntriesProg field from SAS
- *                      Expander Page 1.
- *  08-30-05  01.05.11  Added DeviceID for FC949E and changed the DeviceID for
- *                      SAS1078.
- *                      Added more defines for Manufacturing Page 4 Flags field.
- *                      Added more defines for IOCSettings and added
- *                      ExpanderSpinup field to Bios Page 1.
- *                      Added postpone SATA Init bit to SAS IO Unit Page 1
- *                      ControlFlags.
- *                      Changed LogEntry format for Log Page 0.
- *  03-27-06  01.05.12  Added two new Flags defines for Manufacturing Page 4.
- *                      Added Manufacturing Page 7.
- *                      Added MPI_IOCPAGE2_CAP_FLAGS_RAID_64_BIT_ADDRESSING.
- *                      Added IOC Page 6.
- *                      Added PrevBootDeviceForm field to CONFIG_PAGE_BIOS_2.
- *                      Added MaxLBAHigh field to RAID Volume Page 0.
- *                      Added Nvdata version fields to SAS IO Unit Page 0.
- *                      Added AdditionalControlFlags, MaxTargetPortConnectTime,
- *                      ReportDeviceMissingDelay, and IODeviceMissingDelay
- *                      fields to SAS IO Unit Page 1.
- *  10-11-06  01.05.13  Added NumForceWWID field and ForceWWID array to
- *                      Manufacturing Page 5.
- *                      Added Manufacturing pages 8 through 10.
- *                      Added defines for supported metadata size bits in
- *                      CapabilitiesFlags field of IOC Page 6.
- *                      Added defines for metadata size bits in VolumeSettings
- *                      field of RAID Volume Page 0.
- *                      Added SATA Link Reset settings, Enable SATA Asynchronous
- *                      Notification bit, and HideNonZeroAttachedPhyIdentifiers
- *                      bit to AdditionalControlFlags field of SAS IO Unit
- *                      Page 1.
- *                      Added defines for Enclosure Devices Unmapped and
- *                      Device Limit Exceeded bits in Status field of SAS IO
- *                      Unit Page 2.
- *                      Added more AccessStatus values for SAS Device Page 0.
- *                      Added bit for SATA Asynchronous Notification Support in
- *                      Flags field of SAS Device Page 0.
- *  02-28-07  01.05.14  Added ExtFlags field to Manufacturing Page 4.
- *                      Added Disable SMART Polling for CapabilitiesFlags of
- *                      IOC Page 6.
- *                      Added Disable SMART Polling to DeviceSettings of BIOS
- *                      Page 1.
- *                      Added Multi-Port Domain bit for DiscoveryStatus field
- *                      of SAS IO Unit Page.
- *                      Added Multi-Port Domain Illegal flag for SAS IO Unit
- *                      Page 1 AdditionalControlFlags field.
- *  05-24-07  01.05.15  Added Hide Physical Disks with Non-Integrated RAID
- *                      Metadata bit to Manufacturing Page 4 ExtFlags field.
- *                      Added Internal Connector to End Device Present bit to
- *                      Expander Page 0 Flags field.
- *                      Fixed define for
- *                      MPI_SAS_EXPANDER1_DISCINFO_BAD_PHY_DISABLED.
- *  08-07-07  01.05.16  Added MPI_IOCPAGE6_CAP_FLAGS_MULTIPORT_DRIVE_SUPPORT
- *                      define.
- *                      Added BIOS Page 4 structure.
- *                      Added MPI_RAID_PHYS_DISK1_PATH_MAX define for RAID
- *                      Physcial Disk Page 1.
- *  01-15-07  01.05.17  Added additional bit defines for ExtFlags field of
- *                      Manufacturing Page 4.
- *                      Added Solid State Drives Supported bit to IOC Page 6
- *                      Capabilities Flags.
- *                      Added new value for AccessStatus field of SAS Device
- *                      Page 0 (_SATA_NEEDS_INITIALIZATION).
- *  03-28-08  01.05.18  Defined new bits in Manufacturing Page 4 ExtFlags field
- *                      to control coercion size and the mixing of SAS and SATA
- *                      SSD drives.
- *  07-11-08  01.05.19  Added defines MPI_MANPAGE4_EXTFLAGS_RAID0_SINGLE_DRIVE
- *                      and MPI_MANPAGE4_EXTFLAGS_SSD_SCRUB_DISABLE for ExtFlags
- *                      field of Manufacturing Page 4.
- *                      Added defines for a new bit in BIOS Page 1 BiosOptions
- *                      field to control adapter scan order.
- *                      Added BootDeviceWaitTime field to SAS IO Unit Page 2.
- *                      Added MPI_SAS_PHY0_PHYINFO_PHY_VACANT for use in PhyInfo
- *                      field of SAS Expander Page 1.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_CNFG_H
-#define MPI_CNFG_H
-
-
-/*****************************************************************************
-*
-*       C o n f i g    M e s s a g e    a n d    S t r u c t u r e s
-*
-*****************************************************************************/
-
-typedef struct _CONFIG_PAGE_HEADER
-{
-    U8                      PageVersion;                /* 00h */
-    U8                      PageLength;                 /* 01h */
-    U8                      PageNumber;                 /* 02h */
-    U8                      PageType;                   /* 03h */
-} CONFIG_PAGE_HEADER, MPI_POINTER PTR_CONFIG_PAGE_HEADER,
-  ConfigPageHeader_t, MPI_POINTER pConfigPageHeader_t;
-
-typedef union _CONFIG_PAGE_HEADER_UNION
-{
-   ConfigPageHeader_t  Struct;
-   U8                  Bytes[4];
-   U16                 Word16[2];
-   U32                 Word32;
-} ConfigPageHeaderUnion, MPI_POINTER pConfigPageHeaderUnion,
-  CONFIG_PAGE_HEADER_UNION, MPI_POINTER PTR_CONFIG_PAGE_HEADER_UNION;
-
-typedef struct _CONFIG_EXTENDED_PAGE_HEADER
-{
-    U8                  PageVersion;                /* 00h */
-    U8                  Reserved1;                  /* 01h */
-    U8                  PageNumber;                 /* 02h */
-    U8                  PageType;                   /* 03h */
-    U16                 ExtPageLength;              /* 04h */
-    U8                  ExtPageType;                /* 06h */
-    U8                  Reserved2;                  /* 07h */
-} CONFIG_EXTENDED_PAGE_HEADER, MPI_POINTER PTR_CONFIG_EXTENDED_PAGE_HEADER,
-  ConfigExtendedPageHeader_t, MPI_POINTER pConfigExtendedPageHeader_t;
-
-
-
-/****************************************************************************
-*   PageType field values
-****************************************************************************/
-#define MPI_CONFIG_PAGEATTR_READ_ONLY               (0x00)
-#define MPI_CONFIG_PAGEATTR_CHANGEABLE              (0x10)
-#define MPI_CONFIG_PAGEATTR_PERSISTENT              (0x20)
-#define MPI_CONFIG_PAGEATTR_RO_PERSISTENT           (0x30)
-#define MPI_CONFIG_PAGEATTR_MASK                    (0xF0)
-
-#define MPI_CONFIG_PAGETYPE_IO_UNIT                 (0x00)
-#define MPI_CONFIG_PAGETYPE_IOC                     (0x01)
-#define MPI_CONFIG_PAGETYPE_BIOS                    (0x02)
-#define MPI_CONFIG_PAGETYPE_SCSI_PORT               (0x03)
-#define MPI_CONFIG_PAGETYPE_SCSI_DEVICE             (0x04)
-#define MPI_CONFIG_PAGETYPE_FC_PORT                 (0x05)
-#define MPI_CONFIG_PAGETYPE_FC_DEVICE               (0x06)
-#define MPI_CONFIG_PAGETYPE_LAN                     (0x07)
-#define MPI_CONFIG_PAGETYPE_RAID_VOLUME             (0x08)
-#define MPI_CONFIG_PAGETYPE_MANUFACTURING           (0x09)
-#define MPI_CONFIG_PAGETYPE_RAID_PHYSDISK           (0x0A)
-#define MPI_CONFIG_PAGETYPE_INBAND                  (0x0B)
-#define MPI_CONFIG_PAGETYPE_EXTENDED                (0x0F)
-#define MPI_CONFIG_PAGETYPE_MASK                    (0x0F)
-
-#define MPI_CONFIG_TYPENUM_MASK                     (0x0FFF)
-
-
-/****************************************************************************
-*   ExtPageType field values
-****************************************************************************/
-#define MPI_CONFIG_EXTPAGETYPE_SAS_IO_UNIT          (0x10)
-#define MPI_CONFIG_EXTPAGETYPE_SAS_EXPANDER         (0x11)
-#define MPI_CONFIG_EXTPAGETYPE_SAS_DEVICE           (0x12)
-#define MPI_CONFIG_EXTPAGETYPE_SAS_PHY              (0x13)
-#define MPI_CONFIG_EXTPAGETYPE_LOG                  (0x14)
-#define MPI_CONFIG_EXTPAGETYPE_ENCLOSURE            (0x15)
-
-
-/****************************************************************************
-*   PageAddress field values
-****************************************************************************/
-#define MPI_SCSI_PORT_PGAD_PORT_MASK                (0x000000FF)
-
-#define MPI_SCSI_DEVICE_FORM_MASK                   (0xF0000000)
-#define MPI_SCSI_DEVICE_FORM_BUS_TID                (0x00000000)
-#define MPI_SCSI_DEVICE_TARGET_ID_MASK              (0x000000FF)
-#define MPI_SCSI_DEVICE_TARGET_ID_SHIFT             (0)
-#define MPI_SCSI_DEVICE_BUS_MASK                    (0x0000FF00)
-#define MPI_SCSI_DEVICE_BUS_SHIFT                   (8)
-#define MPI_SCSI_DEVICE_FORM_TARGET_MODE            (0x10000000)
-#define MPI_SCSI_DEVICE_TM_RESPOND_ID_MASK          (0x000000FF)
-#define MPI_SCSI_DEVICE_TM_RESPOND_ID_SHIFT         (0)
-#define MPI_SCSI_DEVICE_TM_BUS_MASK                 (0x0000FF00)
-#define MPI_SCSI_DEVICE_TM_BUS_SHIFT                (8)
-#define MPI_SCSI_DEVICE_TM_INIT_ID_MASK             (0x00FF0000)
-#define MPI_SCSI_DEVICE_TM_INIT_ID_SHIFT            (16)
-
-#define MPI_FC_PORT_PGAD_PORT_MASK                  (0xF0000000)
-#define MPI_FC_PORT_PGAD_PORT_SHIFT                 (28)
-#define MPI_FC_PORT_PGAD_FORM_MASK                  (0x0F000000)
-#define MPI_FC_PORT_PGAD_FORM_INDEX                 (0x01000000)
-#define MPI_FC_PORT_PGAD_INDEX_MASK                 (0x0000FFFF)
-#define MPI_FC_PORT_PGAD_INDEX_SHIFT                (0)
-
-#define MPI_FC_DEVICE_PGAD_PORT_MASK                (0xF0000000)
-#define MPI_FC_DEVICE_PGAD_PORT_SHIFT               (28)
-#define MPI_FC_DEVICE_PGAD_FORM_MASK                (0x0F000000)
-#define MPI_FC_DEVICE_PGAD_FORM_NEXT_DID            (0x00000000)
-#define MPI_FC_DEVICE_PGAD_ND_PORT_MASK             (0xF0000000)
-#define MPI_FC_DEVICE_PGAD_ND_PORT_SHIFT            (28)
-#define MPI_FC_DEVICE_PGAD_ND_DID_MASK              (0x00FFFFFF)
-#define MPI_FC_DEVICE_PGAD_ND_DID_SHIFT             (0)
-#define MPI_FC_DEVICE_PGAD_FORM_BUS_TID             (0x01000000)
-#define MPI_FC_DEVICE_PGAD_BT_BUS_MASK              (0x0000FF00)
-#define MPI_FC_DEVICE_PGAD_BT_BUS_SHIFT             (8)
-#define MPI_FC_DEVICE_PGAD_BT_TID_MASK              (0x000000FF)
-#define MPI_FC_DEVICE_PGAD_BT_TID_SHIFT             (0)
-
-#define MPI_PHYSDISK_PGAD_PHYSDISKNUM_MASK          (0x000000FF)
-#define MPI_PHYSDISK_PGAD_PHYSDISKNUM_SHIFT         (0)
-
-#define MPI_SAS_EXPAND_PGAD_FORM_MASK             (0xF0000000)
-#define MPI_SAS_EXPAND_PGAD_FORM_SHIFT            (28)
-#define MPI_SAS_EXPAND_PGAD_FORM_GET_NEXT_HANDLE  (0x00000000)
-#define MPI_SAS_EXPAND_PGAD_FORM_HANDLE_PHY_NUM   (0x00000001)
-#define MPI_SAS_EXPAND_PGAD_FORM_HANDLE           (0x00000002)
-#define MPI_SAS_EXPAND_PGAD_GNH_MASK_HANDLE       (0x0000FFFF)
-#define MPI_SAS_EXPAND_PGAD_GNH_SHIFT_HANDLE      (0)
-#define MPI_SAS_EXPAND_PGAD_HPN_MASK_PHY          (0x00FF0000)
-#define MPI_SAS_EXPAND_PGAD_HPN_SHIFT_PHY         (16)
-#define MPI_SAS_EXPAND_PGAD_HPN_MASK_HANDLE       (0x0000FFFF)
-#define MPI_SAS_EXPAND_PGAD_HPN_SHIFT_HANDLE      (0)
-#define MPI_SAS_EXPAND_PGAD_H_MASK_HANDLE         (0x0000FFFF)
-#define MPI_SAS_EXPAND_PGAD_H_SHIFT_HANDLE        (0)
-
-#define MPI_SAS_DEVICE_PGAD_FORM_MASK               (0xF0000000)
-#define MPI_SAS_DEVICE_PGAD_FORM_SHIFT              (28)
-#define MPI_SAS_DEVICE_PGAD_FORM_GET_NEXT_HANDLE    (0x00000000)
-#define MPI_SAS_DEVICE_PGAD_FORM_BUS_TARGET_ID      (0x00000001)
-#define MPI_SAS_DEVICE_PGAD_FORM_HANDLE             (0x00000002)
-#define MPI_SAS_DEVICE_PGAD_GNH_HANDLE_MASK         (0x0000FFFF)
-#define MPI_SAS_DEVICE_PGAD_GNH_HANDLE_SHIFT        (0)
-#define MPI_SAS_DEVICE_PGAD_BT_BUS_MASK             (0x0000FF00)
-#define MPI_SAS_DEVICE_PGAD_BT_BUS_SHIFT            (8)
-#define MPI_SAS_DEVICE_PGAD_BT_TID_MASK             (0x000000FF)
-#define MPI_SAS_DEVICE_PGAD_BT_TID_SHIFT            (0)
-#define MPI_SAS_DEVICE_PGAD_H_HANDLE_MASK           (0x0000FFFF)
-#define MPI_SAS_DEVICE_PGAD_H_HANDLE_SHIFT          (0)
-
-#define MPI_SAS_PHY_PGAD_FORM_MASK                  (0xF0000000)
-#define MPI_SAS_PHY_PGAD_FORM_SHIFT                 (28)
-#define MPI_SAS_PHY_PGAD_FORM_PHY_NUMBER            (0x0)
-#define MPI_SAS_PHY_PGAD_FORM_PHY_TBL_INDEX         (0x1)
-#define MPI_SAS_PHY_PGAD_PHY_NUMBER_MASK            (0x000000FF)
-#define MPI_SAS_PHY_PGAD_PHY_NUMBER_SHIFT           (0)
-#define MPI_SAS_PHY_PGAD_PHY_TBL_INDEX_MASK         (0x0000FFFF)
-#define MPI_SAS_PHY_PGAD_PHY_TBL_INDEX_SHIFT        (0)
-
-#define MPI_SAS_ENCLOS_PGAD_FORM_MASK               (0xF0000000)
-#define MPI_SAS_ENCLOS_PGAD_FORM_SHIFT              (28)
-#define MPI_SAS_ENCLOS_PGAD_FORM_GET_NEXT_HANDLE    (0x00000000)
-#define MPI_SAS_ENCLOS_PGAD_FORM_HANDLE             (0x00000001)
-#define MPI_SAS_ENCLOS_PGAD_GNH_HANDLE_MASK         (0x0000FFFF)
-#define MPI_SAS_ENCLOS_PGAD_GNH_HANDLE_SHIFT        (0)
-#define MPI_SAS_ENCLOS_PGAD_H_HANDLE_MASK           (0x0000FFFF)
-#define MPI_SAS_ENCLOS_PGAD_H_HANDLE_SHIFT          (0)
-
-
-
-/****************************************************************************
-*   Config Request Message
-****************************************************************************/
-typedef struct _MSG_CONFIG
-{
-    U8                      Action;                     /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     ExtPageLength;              /* 04h */
-    U8                      ExtPageType;                /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U8                      Reserved2[8];               /* 0Ch */
-    CONFIG_PAGE_HEADER      Header;                     /* 14h */
-    U32                     PageAddress;                /* 18h */
-    SGE_IO_UNION            PageBufferSGE;              /* 1Ch */
-} MSG_CONFIG, MPI_POINTER PTR_MSG_CONFIG,
-  Config_t, MPI_POINTER pConfig_t;
-
-
-/****************************************************************************
-*   Action field values
-****************************************************************************/
-#define MPI_CONFIG_ACTION_PAGE_HEADER               (0x00)
-#define MPI_CONFIG_ACTION_PAGE_READ_CURRENT         (0x01)
-#define MPI_CONFIG_ACTION_PAGE_WRITE_CURRENT        (0x02)
-#define MPI_CONFIG_ACTION_PAGE_DEFAULT              (0x03)
-#define MPI_CONFIG_ACTION_PAGE_WRITE_NVRAM          (0x04)
-#define MPI_CONFIG_ACTION_PAGE_READ_DEFAULT         (0x05)
-#define MPI_CONFIG_ACTION_PAGE_READ_NVRAM           (0x06)
-
-
-/* Config Reply Message */
-typedef struct _MSG_CONFIG_REPLY
-{
-    U8                      Action;                     /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     ExtPageLength;              /* 04h */
-    U8                      ExtPageType;                /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U8                      Reserved2[2];               /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-    CONFIG_PAGE_HEADER      Header;                     /* 14h */
-} MSG_CONFIG_REPLY, MPI_POINTER PTR_MSG_CONFIG_REPLY,
-  ConfigReply_t, MPI_POINTER pConfigReply_t;
-
-
-
-/*****************************************************************************
-*
-*               C o n f i g u r a t i o n    P a g e s
-*
-*****************************************************************************/
-
-/****************************************************************************
-*   Manufacturing Config pages
-****************************************************************************/
-#define MPI_MANUFACTPAGE_VENDORID_LSILOGIC          (0x1000)
-/* Fibre Channel */
-#define MPI_MANUFACTPAGE_DEVICEID_FC909             (0x0621)
-#define MPI_MANUFACTPAGE_DEVICEID_FC919             (0x0624)
-#define MPI_MANUFACTPAGE_DEVICEID_FC929             (0x0622)
-#define MPI_MANUFACTPAGE_DEVICEID_FC919X            (0x0628)
-#define MPI_MANUFACTPAGE_DEVICEID_FC929X            (0x0626)
-#define MPI_MANUFACTPAGE_DEVICEID_FC939X            (0x0642)
-#define MPI_MANUFACTPAGE_DEVICEID_FC949X            (0x0640)
-#define MPI_MANUFACTPAGE_DEVICEID_FC949E            (0x0646)
-/* SCSI */
-#define MPI_MANUFACTPAGE_DEVID_53C1030              (0x0030)
-#define MPI_MANUFACTPAGE_DEVID_53C1030ZC            (0x0031)
-#define MPI_MANUFACTPAGE_DEVID_1030_53C1035         (0x0032)
-#define MPI_MANUFACTPAGE_DEVID_1030ZC_53C1035       (0x0033)
-#define MPI_MANUFACTPAGE_DEVID_53C1035              (0x0040)
-#define MPI_MANUFACTPAGE_DEVID_53C1035ZC            (0x0041)
-/* SAS */
-#define MPI_MANUFACTPAGE_DEVID_SAS1064              (0x0050)
-#define MPI_MANUFACTPAGE_DEVID_SAS1064A             (0x005C)
-#define MPI_MANUFACTPAGE_DEVID_SAS1064E             (0x0056)
-#define MPI_MANUFACTPAGE_DEVID_SAS1066              (0x005E)
-#define MPI_MANUFACTPAGE_DEVID_SAS1066E             (0x005A)
-#define MPI_MANUFACTPAGE_DEVID_SAS1068              (0x0054)
-#define MPI_MANUFACTPAGE_DEVID_SAS1068E             (0x0058)
-#define MPI_MANUFACTPAGE_DEVID_SAS1078              (0x0062)
-
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_0
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U8                      ChipName[16];               /* 04h */
-    U8                      ChipRevision[8];            /* 14h */
-    U8                      BoardName[16];              /* 1Ch */
-    U8                      BoardAssembly[16];          /* 2Ch */
-    U8                      BoardTracerNumber[16];      /* 3Ch */
-
-} CONFIG_PAGE_MANUFACTURING_0, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_0,
-  ManufacturingPage0_t, MPI_POINTER pManufacturingPage0_t;
-
-#define MPI_MANUFACTURING0_PAGEVERSION                 (0x00)
-
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_1
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U8                      VPD[256];                   /* 04h */
-} CONFIG_PAGE_MANUFACTURING_1, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_1,
-  ManufacturingPage1_t, MPI_POINTER pManufacturingPage1_t;
-
-#define MPI_MANUFACTURING1_PAGEVERSION                 (0x00)
-
-
-typedef struct _MPI_CHIP_REVISION_ID
-{
-    U16 DeviceID;                                       /* 00h */
-    U8  PCIRevisionID;                                  /* 02h */
-    U8  Reserved;                                       /* 03h */
-} MPI_CHIP_REVISION_ID, MPI_POINTER PTR_MPI_CHIP_REVISION_ID,
-  MpiChipRevisionId_t, MPI_POINTER pMpiChipRevisionId_t;
-
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_MAN_PAGE_2_HW_SETTINGS_WORDS
-#define MPI_MAN_PAGE_2_HW_SETTINGS_WORDS    (1)
-#endif
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_2
-{
-    CONFIG_PAGE_HEADER      Header;                                 /* 00h */
-    MPI_CHIP_REVISION_ID    ChipId;                                 /* 04h */
-    U32                     HwSettings[MPI_MAN_PAGE_2_HW_SETTINGS_WORDS];/* 08h */
-} CONFIG_PAGE_MANUFACTURING_2, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_2,
-  ManufacturingPage2_t, MPI_POINTER pManufacturingPage2_t;
-
-#define MPI_MANUFACTURING2_PAGEVERSION                  (0x00)
-
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_MAN_PAGE_3_INFO_WORDS
-#define MPI_MAN_PAGE_3_INFO_WORDS           (1)
-#endif
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_3
-{
-    CONFIG_PAGE_HEADER                  Header;                     /* 00h */
-    MPI_CHIP_REVISION_ID                ChipId;                     /* 04h */
-    U32                                 Info[MPI_MAN_PAGE_3_INFO_WORDS];/* 08h */
-} CONFIG_PAGE_MANUFACTURING_3, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_3,
-  ManufacturingPage3_t, MPI_POINTER pManufacturingPage3_t;
-
-#define MPI_MANUFACTURING3_PAGEVERSION                  (0x00)
-
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_4
-{
-    CONFIG_PAGE_HEADER              Header;             /* 00h */
-    U32                             Reserved1;          /* 04h */
-    U8                              InfoOffset0;        /* 08h */
-    U8                              InfoSize0;          /* 09h */
-    U8                              InfoOffset1;        /* 0Ah */
-    U8                              InfoSize1;          /* 0Bh */
-    U8                              InquirySize;        /* 0Ch */
-    U8                              Flags;              /* 0Dh */
-    U16                             ExtFlags;           /* 0Eh */
-    U8                              InquiryData[56];    /* 10h */
-    U32                             ISVolumeSettings;   /* 48h */
-    U32                             IMEVolumeSettings;  /* 4Ch */
-    U32                             IMVolumeSettings;   /* 50h */
-    U32                             Reserved3;          /* 54h */
-    U32                             Reserved4;          /* 58h */
-    U32                             Reserved5;          /* 5Ch */
-    U8                              IMEDataScrubRate;   /* 60h */
-    U8                              IMEResyncRate;      /* 61h */
-    U16                             Reserved6;          /* 62h */
-    U8                              IMDataScrubRate;    /* 64h */
-    U8                              IMResyncRate;       /* 65h */
-    U16                             Reserved7;          /* 66h */
-    U32                             Reserved8;          /* 68h */
-    U32                             Reserved9;          /* 6Ch */
-} CONFIG_PAGE_MANUFACTURING_4, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_4,
-  ManufacturingPage4_t, MPI_POINTER pManufacturingPage4_t;
-
-#define MPI_MANUFACTURING4_PAGEVERSION                  (0x05)
-
-/* defines for the Flags field */
-#define MPI_MANPAGE4_FORCE_BAD_BLOCK_TABLE              (0x80)
-#define MPI_MANPAGE4_FORCE_OFFLINE_FAILOVER             (0x40)
-#define MPI_MANPAGE4_IME_DISABLE                        (0x20)
-#define MPI_MANPAGE4_IM_DISABLE                         (0x10)
-#define MPI_MANPAGE4_IS_DISABLE                         (0x08)
-#define MPI_MANPAGE4_IR_MODEPAGE8_DISABLE               (0x04)
-#define MPI_MANPAGE4_IM_RESYNC_CACHE_ENABLE             (0x02)
-#define MPI_MANPAGE4_IR_NO_MIX_SAS_SATA                 (0x01)
-
-/* defines for the ExtFlags field */
-#define MPI_MANPAGE4_EXTFLAGS_RAID0_SINGLE_DRIVE        (0x0400)
-#define MPI_MANPAGE4_EXTFLAGS_SSD_SCRUB_DISABLE         (0x0200)
-#define MPI_MANPAGE4_EXTFLAGS_MASK_COERCION_SIZE        (0x0180)
-#define MPI_MANPAGE4_EXTFLAGS_SHIFT_COERCION_SIZE       (7)
-#define MPI_MANPAGE4_EXTFLAGS_1GB_COERCION_SIZE         (0)
-#define MPI_MANPAGE4_EXTFLAGS_128MB_COERCION_SIZE       (1)
-
-#define MPI_MANPAGE4_EXTFLAGS_NO_MIX_SSD_SAS_SATA       (0x0040)
-#define MPI_MANPAGE4_EXTFLAGS_MIX_SSD_AND_NON_SSD       (0x0020)
-#define MPI_MANPAGE4_EXTFLAGS_DUAL_PORT_SUPPORT         (0x0010)
-#define MPI_MANPAGE4_EXTFLAGS_HIDE_NON_IR_METADATA      (0x0008)
-#define MPI_MANPAGE4_EXTFLAGS_SAS_CACHE_DISABLE         (0x0004)
-#define MPI_MANPAGE4_EXTFLAGS_SATA_CACHE_DISABLE        (0x0002)
-#define MPI_MANPAGE4_EXTFLAGS_LEGACY_MODE               (0x0001)
-
-
-#ifndef MPI_MANPAGE5_NUM_FORCEWWID
-#define MPI_MANPAGE5_NUM_FORCEWWID      (1)
-#endif
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_5
-{
-    CONFIG_PAGE_HEADER              Header;             /* 00h */
-    U64                             BaseWWID;           /* 04h */
-    U8                              Flags;              /* 0Ch */
-    U8                              NumForceWWID;       /* 0Dh */
-    U16                             Reserved2;          /* 0Eh */
-    U32                             Reserved3;          /* 10h */
-    U32                             Reserved4;          /* 14h */
-    U64                             ForceWWID[MPI_MANPAGE5_NUM_FORCEWWID]; /* 18h */
-} CONFIG_PAGE_MANUFACTURING_5, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_5,
-  ManufacturingPage5_t, MPI_POINTER pManufacturingPage5_t;
-
-#define MPI_MANUFACTURING5_PAGEVERSION                  (0x02)
-
-/* defines for the Flags field */
-#define MPI_MANPAGE5_TWO_WWID_PER_PHY                   (0x01)
-
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_6
-{
-    CONFIG_PAGE_HEADER              Header;             /* 00h */
-    U32                             ProductSpecificInfo;/* 04h */
-} CONFIG_PAGE_MANUFACTURING_6, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_6,
-  ManufacturingPage6_t, MPI_POINTER pManufacturingPage6_t;
-
-#define MPI_MANUFACTURING6_PAGEVERSION                  (0x00)
-
-
-typedef struct _MPI_MANPAGE7_CONNECTOR_INFO
-{
-    U32                         Pinout;                 /* 00h */
-    U8                          Connector[16];          /* 04h */
-    U8                          Location;               /* 14h */
-    U8                          Reserved1;              /* 15h */
-    U16                         Slot;                   /* 16h */
-    U32                         Reserved2;              /* 18h */
-} MPI_MANPAGE7_CONNECTOR_INFO, MPI_POINTER PTR_MPI_MANPAGE7_CONNECTOR_INFO,
-  MpiManPage7ConnectorInfo_t, MPI_POINTER pMpiManPage7ConnectorInfo_t;
-
-/* defines for the Pinout field */
-#define MPI_MANPAGE7_PINOUT_SFF_8484_L4                 (0x00080000)
-#define MPI_MANPAGE7_PINOUT_SFF_8484_L3                 (0x00040000)
-#define MPI_MANPAGE7_PINOUT_SFF_8484_L2                 (0x00020000)
-#define MPI_MANPAGE7_PINOUT_SFF_8484_L1                 (0x00010000)
-#define MPI_MANPAGE7_PINOUT_SFF_8470_L4                 (0x00000800)
-#define MPI_MANPAGE7_PINOUT_SFF_8470_L3                 (0x00000400)
-#define MPI_MANPAGE7_PINOUT_SFF_8470_L2                 (0x00000200)
-#define MPI_MANPAGE7_PINOUT_SFF_8470_L1                 (0x00000100)
-#define MPI_MANPAGE7_PINOUT_SFF_8482                    (0x00000002)
-#define MPI_MANPAGE7_PINOUT_CONNECTION_UNKNOWN          (0x00000001)
-
-/* defines for the Location field */
-#define MPI_MANPAGE7_LOCATION_UNKNOWN                   (0x01)
-#define MPI_MANPAGE7_LOCATION_INTERNAL                  (0x02)
-#define MPI_MANPAGE7_LOCATION_EXTERNAL                  (0x04)
-#define MPI_MANPAGE7_LOCATION_SWITCHABLE                (0x08)
-#define MPI_MANPAGE7_LOCATION_AUTO                      (0x10)
-#define MPI_MANPAGE7_LOCATION_NOT_PRESENT               (0x20)
-#define MPI_MANPAGE7_LOCATION_NOT_CONNECTED             (0x80)
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check NumPhys at runtime.
- */
-#ifndef MPI_MANPAGE7_CONNECTOR_INFO_MAX
-#define MPI_MANPAGE7_CONNECTOR_INFO_MAX   (1)
-#endif
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_7
-{
-    CONFIG_PAGE_HEADER          Header;                 /* 00h */
-    U32                         Reserved1;              /* 04h */
-    U32                         Reserved2;              /* 08h */
-    U32                         Flags;                  /* 0Ch */
-    U8                          EnclosureName[16];      /* 10h */
-    U8                          NumPhys;                /* 20h */
-    U8                          Reserved3;              /* 21h */
-    U16                         Reserved4;              /* 22h */
-    MPI_MANPAGE7_CONNECTOR_INFO ConnectorInfo[MPI_MANPAGE7_CONNECTOR_INFO_MAX]; /* 24h */
-} CONFIG_PAGE_MANUFACTURING_7, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_7,
-  ManufacturingPage7_t, MPI_POINTER pManufacturingPage7_t;
-
-#define MPI_MANUFACTURING7_PAGEVERSION                  (0x00)
-
-/* defines for the Flags field */
-#define MPI_MANPAGE7_FLAG_USE_SLOT_INFO                 (0x00000001)
-
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_8
-{
-    CONFIG_PAGE_HEADER              Header;             /* 00h */
-    U32                             ProductSpecificInfo;/* 04h */
-} CONFIG_PAGE_MANUFACTURING_8, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_8,
-  ManufacturingPage8_t, MPI_POINTER pManufacturingPage8_t;
-
-#define MPI_MANUFACTURING8_PAGEVERSION                  (0x00)
-
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_9
-{
-    CONFIG_PAGE_HEADER              Header;             /* 00h */
-    U32                             ProductSpecificInfo;/* 04h */
-} CONFIG_PAGE_MANUFACTURING_9, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_9,
-  ManufacturingPage9_t, MPI_POINTER pManufacturingPage9_t;
-
-#define MPI_MANUFACTURING9_PAGEVERSION                  (0x00)
-
-
-typedef struct _CONFIG_PAGE_MANUFACTURING_10
-{
-    CONFIG_PAGE_HEADER              Header;             /* 00h */
-    U32                             ProductSpecificInfo;/* 04h */
-} CONFIG_PAGE_MANUFACTURING_10, MPI_POINTER PTR_CONFIG_PAGE_MANUFACTURING_10,
-  ManufacturingPage10_t, MPI_POINTER pManufacturingPage10_t;
-
-#define MPI_MANUFACTURING10_PAGEVERSION                 (0x00)
-
-
-/****************************************************************************
-*   IO Unit Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_IO_UNIT_0
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U64                     UniqueValue;                /* 04h */
-} CONFIG_PAGE_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_0,
-  IOUnitPage0_t, MPI_POINTER pIOUnitPage0_t;
-
-#define MPI_IOUNITPAGE0_PAGEVERSION                     (0x00)
-
-
-typedef struct _CONFIG_PAGE_IO_UNIT_1
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Flags;                      /* 04h */
-} CONFIG_PAGE_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_1,
-  IOUnitPage1_t, MPI_POINTER pIOUnitPage1_t;
-
-#define MPI_IOUNITPAGE1_PAGEVERSION                     (0x02)
-
-/* IO Unit Page 1 Flags defines */
-#define MPI_IOUNITPAGE1_MULTI_FUNCTION                  (0x00000000)
-#define MPI_IOUNITPAGE1_SINGLE_FUNCTION                 (0x00000001)
-#define MPI_IOUNITPAGE1_MULTI_PATHING                   (0x00000002)
-#define MPI_IOUNITPAGE1_SINGLE_PATHING                  (0x00000000)
-#define MPI_IOUNITPAGE1_IR_USE_STATIC_VOLUME_ID         (0x00000004)
-#define MPI_IOUNITPAGE1_DISABLE_QUEUE_FULL_HANDLING     (0x00000020)
-#define MPI_IOUNITPAGE1_DISABLE_IR                      (0x00000040)
-#define MPI_IOUNITPAGE1_FORCE_32                        (0x00000080)
-#define MPI_IOUNITPAGE1_NATIVE_COMMAND_Q_DISABLE        (0x00000100)
-#define MPI_IOUNITPAGE1_SATA_WRITE_CACHE_DISABLE        (0x00000200)
-
-typedef struct _MPI_ADAPTER_INFO
-{
-    U8      PciBusNumber;                               /* 00h */
-    U8      PciDeviceAndFunctionNumber;                 /* 01h */
-    U16     AdapterFlags;                               /* 02h */
-} MPI_ADAPTER_INFO, MPI_POINTER PTR_MPI_ADAPTER_INFO,
-  MpiAdapterInfo_t, MPI_POINTER pMpiAdapterInfo_t;
-
-#define MPI_ADAPTER_INFO_FLAGS_EMBEDDED                 (0x0001)
-#define MPI_ADAPTER_INFO_FLAGS_INIT_STATUS              (0x0002)
-
-typedef struct _CONFIG_PAGE_IO_UNIT_2
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Flags;                      /* 04h */
-    U32                     BiosVersion;                /* 08h */
-    MPI_ADAPTER_INFO        AdapterOrder[4];            /* 0Ch */
-    U32                     Reserved1;                  /* 1Ch */
-} CONFIG_PAGE_IO_UNIT_2, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_2,
-  IOUnitPage2_t, MPI_POINTER pIOUnitPage2_t;
-
-#define MPI_IOUNITPAGE2_PAGEVERSION                     (0x02)
-
-#define MPI_IOUNITPAGE2_FLAGS_PAUSE_ON_ERROR            (0x00000002)
-#define MPI_IOUNITPAGE2_FLAGS_VERBOSE_ENABLE            (0x00000004)
-#define MPI_IOUNITPAGE2_FLAGS_COLOR_VIDEO_DISABLE       (0x00000008)
-#define MPI_IOUNITPAGE2_FLAGS_DONT_HOOK_INT_40          (0x00000010)
-
-#define MPI_IOUNITPAGE2_FLAGS_DEV_LIST_DISPLAY_MASK     (0x000000E0)
-#define MPI_IOUNITPAGE2_FLAGS_INSTALLED_DEV_DISPLAY     (0x00000000)
-#define MPI_IOUNITPAGE2_FLAGS_ADAPTER_DISPLAY           (0x00000020)
-#define MPI_IOUNITPAGE2_FLAGS_ADAPTER_DEV_DISPLAY       (0x00000040)
-
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_IO_UNIT_PAGE_3_GPIO_VAL_MAX
-#define MPI_IO_UNIT_PAGE_3_GPIO_VAL_MAX     (1)
-#endif
-
-typedef struct _CONFIG_PAGE_IO_UNIT_3
-{
-    CONFIG_PAGE_HEADER      Header;                                   /* 00h */
-    U8                      GPIOCount;                                /* 04h */
-    U8                      Reserved1;                                /* 05h */
-    U16                     Reserved2;                                /* 06h */
-    U16                     GPIOVal[MPI_IO_UNIT_PAGE_3_GPIO_VAL_MAX]; /* 08h */
-} CONFIG_PAGE_IO_UNIT_3, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_3,
-  IOUnitPage3_t, MPI_POINTER pIOUnitPage3_t;
-
-#define MPI_IOUNITPAGE3_PAGEVERSION                     (0x01)
-
-#define MPI_IOUNITPAGE3_GPIO_FUNCTION_MASK              (0xFC)
-#define MPI_IOUNITPAGE3_GPIO_FUNCTION_SHIFT             (2)
-#define MPI_IOUNITPAGE3_GPIO_SETTING_OFF                (0x00)
-#define MPI_IOUNITPAGE3_GPIO_SETTING_ON                 (0x01)
-
-
-typedef struct _CONFIG_PAGE_IO_UNIT_4
-{
-    CONFIG_PAGE_HEADER      Header;                                   /* 00h */
-    U32                     Reserved1;                                /* 04h */
-    SGE_SIMPLE_UNION        FWImageSGE;                               /* 08h */
-} CONFIG_PAGE_IO_UNIT_4, MPI_POINTER PTR_CONFIG_PAGE_IO_UNIT_4,
-  IOUnitPage4_t, MPI_POINTER pIOUnitPage4_t;
-
-#define MPI_IOUNITPAGE4_PAGEVERSION                     (0x00)
-
-
-/****************************************************************************
-*   IOC Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_IOC_0
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     TotalNVStore;               /* 04h */
-    U32                     FreeNVStore;                /* 08h */
-    U16                     VendorID;                   /* 0Ch */
-    U16                     DeviceID;                   /* 0Eh */
-    U8                      RevisionID;                 /* 10h */
-    U8                      Reserved[3];                /* 11h */
-    U32                     ClassCode;                  /* 14h */
-    U16                     SubsystemVendorID;          /* 18h */
-    U16                     SubsystemID;                /* 1Ah */
-} CONFIG_PAGE_IOC_0, MPI_POINTER PTR_CONFIG_PAGE_IOC_0,
-  IOCPage0_t, MPI_POINTER pIOCPage0_t;
-
-#define MPI_IOCPAGE0_PAGEVERSION                        (0x01)
-
-
-typedef struct _CONFIG_PAGE_IOC_1
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Flags;                      /* 04h */
-    U32                     CoalescingTimeout;          /* 08h */
-    U8                      CoalescingDepth;            /* 0Ch */
-    U8                      PCISlotNum;                 /* 0Dh */
-    U8                      Reserved[2];                /* 0Eh */
-} CONFIG_PAGE_IOC_1, MPI_POINTER PTR_CONFIG_PAGE_IOC_1,
-  IOCPage1_t, MPI_POINTER pIOCPage1_t;
-
-#define MPI_IOCPAGE1_PAGEVERSION                        (0x03)
-
-/* defines for the Flags field */
-#define MPI_IOCPAGE1_EEDP_MODE_MASK                     (0x07000000)
-#define MPI_IOCPAGE1_EEDP_MODE_OFF                      (0x00000000)
-#define MPI_IOCPAGE1_EEDP_MODE_T10                      (0x01000000)
-#define MPI_IOCPAGE1_EEDP_MODE_LSI_1                    (0x02000000)
-#define MPI_IOCPAGE1_INITIATOR_CONTEXT_REPLY_DISABLE    (0x00000010)
-#define MPI_IOCPAGE1_REPLY_COALESCING                   (0x00000001)
-
-#define MPI_IOCPAGE1_PCISLOTNUM_UNKNOWN                 (0xFF)
-
-
-typedef struct _CONFIG_PAGE_IOC_2_RAID_VOL
-{
-    U8                          VolumeID;               /* 00h */
-    U8                          VolumeBus;              /* 01h */
-    U8                          VolumeIOC;              /* 02h */
-    U8                          VolumePageNumber;       /* 03h */
-    U8                          VolumeType;             /* 04h */
-    U8                          Flags;                  /* 05h */
-    U16                         Reserved3;              /* 06h */
-} CONFIG_PAGE_IOC_2_RAID_VOL, MPI_POINTER PTR_CONFIG_PAGE_IOC_2_RAID_VOL,
-  ConfigPageIoc2RaidVol_t, MPI_POINTER pConfigPageIoc2RaidVol_t;
-
-/* IOC Page 2 Volume RAID Type values, also used in RAID Volume pages */
-
-#define MPI_RAID_VOL_TYPE_IS                        (0x00)
-#define MPI_RAID_VOL_TYPE_IME                       (0x01)
-#define MPI_RAID_VOL_TYPE_IM                        (0x02)
-#define MPI_RAID_VOL_TYPE_RAID_5                    (0x03)
-#define MPI_RAID_VOL_TYPE_RAID_6                    (0x04)
-#define MPI_RAID_VOL_TYPE_RAID_10                   (0x05)
-#define MPI_RAID_VOL_TYPE_RAID_50                   (0x06)
-#define MPI_RAID_VOL_TYPE_UNKNOWN                   (0xFF)
-
-/* IOC Page 2 Volume Flags values */
-
-#define MPI_IOCPAGE2_FLAG_VOLUME_INACTIVE           (0x08)
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_IOC_PAGE_2_RAID_VOLUME_MAX
-#define MPI_IOC_PAGE_2_RAID_VOLUME_MAX      (1)
-#endif
-
-typedef struct _CONFIG_PAGE_IOC_2
-{
-    CONFIG_PAGE_HEADER          Header;                              /* 00h */
-    U32                         CapabilitiesFlags;                   /* 04h */
-    U8                          NumActiveVolumes;                    /* 08h */
-    U8                          MaxVolumes;                          /* 09h */
-    U8                          NumActivePhysDisks;                  /* 0Ah */
-    U8                          MaxPhysDisks;                        /* 0Bh */
-    CONFIG_PAGE_IOC_2_RAID_VOL  RaidVolume[MPI_IOC_PAGE_2_RAID_VOLUME_MAX];/* 0Ch */
-} CONFIG_PAGE_IOC_2, MPI_POINTER PTR_CONFIG_PAGE_IOC_2,
-  IOCPage2_t, MPI_POINTER pIOCPage2_t;
-
-#define MPI_IOCPAGE2_PAGEVERSION                        (0x04)
-
-/* IOC Page 2 Capabilities flags */
-
-#define MPI_IOCPAGE2_CAP_FLAGS_IS_SUPPORT               (0x00000001)
-#define MPI_IOCPAGE2_CAP_FLAGS_IME_SUPPORT              (0x00000002)
-#define MPI_IOCPAGE2_CAP_FLAGS_IM_SUPPORT               (0x00000004)
-#define MPI_IOCPAGE2_CAP_FLAGS_RAID_5_SUPPORT           (0x00000008)
-#define MPI_IOCPAGE2_CAP_FLAGS_RAID_6_SUPPORT           (0x00000010)
-#define MPI_IOCPAGE2_CAP_FLAGS_RAID_10_SUPPORT          (0x00000020)
-#define MPI_IOCPAGE2_CAP_FLAGS_RAID_50_SUPPORT          (0x00000040)
-#define MPI_IOCPAGE2_CAP_FLAGS_RAID_64_BIT_ADDRESSING   (0x10000000)
-#define MPI_IOCPAGE2_CAP_FLAGS_SES_SUPPORT              (0x20000000)
-#define MPI_IOCPAGE2_CAP_FLAGS_SAFTE_SUPPORT            (0x40000000)
-#define MPI_IOCPAGE2_CAP_FLAGS_CROSS_CHANNEL_SUPPORT    (0x80000000)
-
-
-typedef struct _IOC_3_PHYS_DISK
-{
-    U8                          PhysDiskID;             /* 00h */
-    U8                          PhysDiskBus;            /* 01h */
-    U8                          PhysDiskIOC;            /* 02h */
-    U8                          PhysDiskNum;            /* 03h */
-} IOC_3_PHYS_DISK, MPI_POINTER PTR_IOC_3_PHYS_DISK,
-  Ioc3PhysDisk_t, MPI_POINTER pIoc3PhysDisk_t;
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_IOC_PAGE_3_PHYSDISK_MAX
-#define MPI_IOC_PAGE_3_PHYSDISK_MAX         (1)
-#endif
-
-typedef struct _CONFIG_PAGE_IOC_3
-{
-    CONFIG_PAGE_HEADER          Header;                                /* 00h */
-    U8                          NumPhysDisks;                          /* 04h */
-    U8                          Reserved1;                             /* 05h */
-    U16                         Reserved2;                             /* 06h */
-    IOC_3_PHYS_DISK             PhysDisk[MPI_IOC_PAGE_3_PHYSDISK_MAX]; /* 08h */
-} CONFIG_PAGE_IOC_3, MPI_POINTER PTR_CONFIG_PAGE_IOC_3,
-  IOCPage3_t, MPI_POINTER pIOCPage3_t;
-
-#define MPI_IOCPAGE3_PAGEVERSION                        (0x00)
-
-
-typedef struct _IOC_4_SEP
-{
-    U8                          SEPTargetID;            /* 00h */
-    U8                          SEPBus;                 /* 01h */
-    U16                         Reserved;               /* 02h */
-} IOC_4_SEP, MPI_POINTER PTR_IOC_4_SEP,
-  Ioc4Sep_t, MPI_POINTER pIoc4Sep_t;
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_IOC_PAGE_4_SEP_MAX
-#define MPI_IOC_PAGE_4_SEP_MAX              (1)
-#endif
-
-typedef struct _CONFIG_PAGE_IOC_4
-{
-    CONFIG_PAGE_HEADER          Header;                         /* 00h */
-    U8                          ActiveSEP;                      /* 04h */
-    U8                          MaxSEP;                         /* 05h */
-    U16                         Reserved1;                      /* 06h */
-    IOC_4_SEP                   SEP[MPI_IOC_PAGE_4_SEP_MAX];    /* 08h */
-} CONFIG_PAGE_IOC_4, MPI_POINTER PTR_CONFIG_PAGE_IOC_4,
-  IOCPage4_t, MPI_POINTER pIOCPage4_t;
-
-#define MPI_IOCPAGE4_PAGEVERSION                        (0x00)
-
-
-typedef struct _IOC_5_HOT_SPARE
-{
-    U8                          PhysDiskNum;            /* 00h */
-    U8                          Reserved;               /* 01h */
-    U8                          HotSparePool;           /* 02h */
-    U8                          Flags;                   /* 03h */
-} IOC_5_HOT_SPARE, MPI_POINTER PTR_IOC_5_HOT_SPARE,
-  Ioc5HotSpare_t, MPI_POINTER pIoc5HotSpare_t;
-
-/* IOC Page 5 HotSpare Flags */
-#define MPI_IOC_PAGE_5_HOT_SPARE_ACTIVE                 (0x01)
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_IOC_PAGE_5_HOT_SPARE_MAX
-#define MPI_IOC_PAGE_5_HOT_SPARE_MAX        (1)
-#endif
-
-typedef struct _CONFIG_PAGE_IOC_5
-{
-    CONFIG_PAGE_HEADER          Header;                         /* 00h */
-    U32                         Reserved1;                      /* 04h */
-    U8                          NumHotSpares;                   /* 08h */
-    U8                          Reserved2;                      /* 09h */
-    U16                         Reserved3;                      /* 0Ah */
-    IOC_5_HOT_SPARE             HotSpare[MPI_IOC_PAGE_5_HOT_SPARE_MAX]; /* 0Ch */
-} CONFIG_PAGE_IOC_5, MPI_POINTER PTR_CONFIG_PAGE_IOC_5,
-  IOCPage5_t, MPI_POINTER pIOCPage5_t;
-
-#define MPI_IOCPAGE5_PAGEVERSION                        (0x00)
-
-typedef struct _CONFIG_PAGE_IOC_6
-{
-    CONFIG_PAGE_HEADER          Header;                         /* 00h */
-    U32                         CapabilitiesFlags;              /* 04h */
-    U8                          MaxDrivesIS;                    /* 08h */
-    U8                          MaxDrivesIM;                    /* 09h */
-    U8                          MaxDrivesIME;                   /* 0Ah */
-    U8                          Reserved1;                      /* 0Bh */
-    U8                          MinDrivesIS;                    /* 0Ch */
-    U8                          MinDrivesIM;                    /* 0Dh */
-    U8                          MinDrivesIME;                   /* 0Eh */
-    U8                          Reserved2;                      /* 0Fh */
-    U8                          MaxGlobalHotSpares;             /* 10h */
-    U8                          Reserved3;                      /* 11h */
-    U16                         Reserved4;                      /* 12h */
-    U32                         Reserved5;                      /* 14h */
-    U32                         SupportedStripeSizeMapIS;       /* 18h */
-    U32                         SupportedStripeSizeMapIME;      /* 1Ch */
-    U32                         Reserved6;                      /* 20h */
-    U8                          MetadataSize;                   /* 24h */
-    U8                          Reserved7;                      /* 25h */
-    U16                         Reserved8;                      /* 26h */
-    U16                         MaxBadBlockTableEntries;        /* 28h */
-    U16                         Reserved9;                      /* 2Ah */
-    U16                         IRNvsramUsage;                  /* 2Ch */
-    U16                         Reserved10;                     /* 2Eh */
-    U32                         IRNvsramVersion;                /* 30h */
-    U32                         Reserved11;                     /* 34h */
-    U32                         Reserved12;                     /* 38h */
-} CONFIG_PAGE_IOC_6, MPI_POINTER PTR_CONFIG_PAGE_IOC_6,
-  IOCPage6_t, MPI_POINTER pIOCPage6_t;
-
-#define MPI_IOCPAGE6_PAGEVERSION                        (0x01)
-
-/* IOC Page 6 Capabilities Flags */
-
-#define MPI_IOCPAGE6_CAP_FLAGS_SSD_SUPPORT              (0x00000020)
-#define MPI_IOCPAGE6_CAP_FLAGS_MULTIPORT_DRIVE_SUPPORT  (0x00000010)
-#define MPI_IOCPAGE6_CAP_FLAGS_DISABLE_SMART_POLLING    (0x00000008)
-
-#define MPI_IOCPAGE6_CAP_FLAGS_MASK_METADATA_SIZE       (0x00000006)
-#define MPI_IOCPAGE6_CAP_FLAGS_64MB_METADATA_SIZE       (0x00000000)
-#define MPI_IOCPAGE6_CAP_FLAGS_512MB_METADATA_SIZE      (0x00000002)
-
-#define MPI_IOCPAGE6_CAP_FLAGS_GLOBAL_HOT_SPARE         (0x00000001)
-
-
-/****************************************************************************
-*   BIOS Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_BIOS_1
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     BiosOptions;                /* 04h */
-    U32                     IOCSettings;                /* 08h */
-    U32                     Reserved1;                  /* 0Ch */
-    U32                     DeviceSettings;             /* 10h */
-    U16                     NumberOfDevices;            /* 14h */
-    U8                      ExpanderSpinup;             /* 16h */
-    U8                      Reserved2;                  /* 17h */
-    U16                     IOTimeoutBlockDevicesNonRM; /* 18h */
-    U16                     IOTimeoutSequential;        /* 1Ah */
-    U16                     IOTimeoutOther;             /* 1Ch */
-    U16                     IOTimeoutBlockDevicesRM;    /* 1Eh */
-} CONFIG_PAGE_BIOS_1, MPI_POINTER PTR_CONFIG_PAGE_BIOS_1,
-  BIOSPage1_t, MPI_POINTER pBIOSPage1_t;
-
-#define MPI_BIOSPAGE1_PAGEVERSION                       (0x03)
-
-/* values for the BiosOptions field */
-#define MPI_BIOSPAGE1_OPTIONS_SPI_ENABLE                (0x00000400)
-#define MPI_BIOSPAGE1_OPTIONS_FC_ENABLE                 (0x00000200)
-#define MPI_BIOSPAGE1_OPTIONS_SAS_ENABLE                (0x00000100)
-
-#define MPI_BIOSPAGE1_OPTIONS_SCAN_HIGH_TO_LOW          (0x00000002)
-#define MPI_BIOSPAGE1_OPTIONS_SCAN_LOW_TO_HIGH          (0x00000000)
-
-#define MPI_BIOSPAGE1_OPTIONS_DISABLE_BIOS              (0x00000001)
-
-/* values for the IOCSettings field */
-#define MPI_BIOSPAGE1_IOCSET_MASK_INITIAL_SPINUP_DELAY  (0x0F000000)
-#define MPI_BIOSPAGE1_IOCSET_SHIFT_INITIAL_SPINUP_DELAY (24)
-
-#define MPI_BIOSPAGE1_IOCSET_MASK_PORT_ENABLE_DELAY     (0x00F00000)
-#define MPI_BIOSPAGE1_IOCSET_SHIFT_PORT_ENABLE_DELAY    (20)
-
-#define MPI_BIOSPAGE1_IOCSET_AUTO_PORT_ENABLE           (0x00080000)
-#define MPI_BIOSPAGE1_IOCSET_DIRECT_ATTACH_SPINUP_MODE  (0x00040000)
-
-#define MPI_BIOSPAGE1_IOCSET_MASK_BOOT_PREFERENCE       (0x00030000)
-#define MPI_BIOSPAGE1_IOCSET_ENCLOSURE_SLOT_BOOT        (0x00000000)
-#define MPI_BIOSPAGE1_IOCSET_SAS_ADDRESS_BOOT           (0x00010000)
-
-#define MPI_BIOSPAGE1_IOCSET_MASK_MAX_TARGET_SPIN_UP    (0x0000F000)
-#define MPI_BIOSPAGE1_IOCSET_SHIFT_MAX_TARGET_SPIN_UP   (12)
-
-#define MPI_BIOSPAGE1_IOCSET_MASK_SPINUP_DELAY          (0x00000F00)
-#define MPI_BIOSPAGE1_IOCSET_SHIFT_SPINUP_DELAY         (8)
-
-#define MPI_BIOSPAGE1_IOCSET_MASK_RM_SETTING            (0x000000C0)
-#define MPI_BIOSPAGE1_IOCSET_NONE_RM_SETTING            (0x00000000)
-#define MPI_BIOSPAGE1_IOCSET_BOOT_RM_SETTING            (0x00000040)
-#define MPI_BIOSPAGE1_IOCSET_MEDIA_RM_SETTING           (0x00000080)
-
-#define MPI_BIOSPAGE1_IOCSET_MASK_ADAPTER_SUPPORT       (0x00000030)
-#define MPI_BIOSPAGE1_IOCSET_NO_SUPPORT                 (0x00000000)
-#define MPI_BIOSPAGE1_IOCSET_BIOS_SUPPORT               (0x00000010)
-#define MPI_BIOSPAGE1_IOCSET_OS_SUPPORT                 (0x00000020)
-#define MPI_BIOSPAGE1_IOCSET_ALL_SUPPORT                (0x00000030)
-
-#define MPI_BIOSPAGE1_IOCSET_ALTERNATE_CHS              (0x00000008)
-
-/* values for the DeviceSettings field */
-#define MPI_BIOSPAGE1_DEVSET_DISABLE_SMART_POLLING      (0x00000010)
-#define MPI_BIOSPAGE1_DEVSET_DISABLE_SEQ_LUN            (0x00000008)
-#define MPI_BIOSPAGE1_DEVSET_DISABLE_RM_LUN             (0x00000004)
-#define MPI_BIOSPAGE1_DEVSET_DISABLE_NON_RM_LUN         (0x00000002)
-#define MPI_BIOSPAGE1_DEVSET_DISABLE_OTHER_LUN          (0x00000001)
-
-/* defines for the ExpanderSpinup field */
-#define MPI_BIOSPAGE1_EXPSPINUP_MASK_MAX_TARGET         (0xF0)
-#define MPI_BIOSPAGE1_EXPSPINUP_SHIFT_MAX_TARGET        (4)
-#define MPI_BIOSPAGE1_EXPSPINUP_MASK_DELAY              (0x0F)
-
-typedef struct _MPI_BOOT_DEVICE_ADAPTER_ORDER
-{
-    U32         Reserved1;                              /* 00h */
-    U32         Reserved2;                              /* 04h */
-    U32         Reserved3;                              /* 08h */
-    U32         Reserved4;                              /* 0Ch */
-    U32         Reserved5;                              /* 10h */
-    U32         Reserved6;                              /* 14h */
-    U32         Reserved7;                              /* 18h */
-    U32         Reserved8;                              /* 1Ch */
-    U32         Reserved9;                              /* 20h */
-    U32         Reserved10;                             /* 24h */
-    U32         Reserved11;                             /* 28h */
-    U32         Reserved12;                             /* 2Ch */
-    U32         Reserved13;                             /* 30h */
-    U32         Reserved14;                             /* 34h */
-    U32         Reserved15;                             /* 38h */
-    U32         Reserved16;                             /* 3Ch */
-    U32         Reserved17;                             /* 40h */
-} MPI_BOOT_DEVICE_ADAPTER_ORDER, MPI_POINTER PTR_MPI_BOOT_DEVICE_ADAPTER_ORDER;
-
-typedef struct _MPI_BOOT_DEVICE_ADAPTER_NUMBER
-{
-    U8          TargetID;                               /* 00h */
-    U8          Bus;                                    /* 01h */
-    U8          AdapterNumber;                          /* 02h */
-    U8          Reserved1;                              /* 03h */
-    U32         Reserved2;                              /* 04h */
-    U32         Reserved3;                              /* 08h */
-    U32         Reserved4;                              /* 0Ch */
-    U8          LUN[8];                                 /* 10h */
-    U32         Reserved5;                              /* 18h */
-    U32         Reserved6;                              /* 1Ch */
-    U32         Reserved7;                              /* 20h */
-    U32         Reserved8;                              /* 24h */
-    U32         Reserved9;                              /* 28h */
-    U32         Reserved10;                             /* 2Ch */
-    U32         Reserved11;                             /* 30h */
-    U32         Reserved12;                             /* 34h */
-    U32         Reserved13;                             /* 38h */
-    U32         Reserved14;                             /* 3Ch */
-    U32         Reserved15;                             /* 40h */
-} MPI_BOOT_DEVICE_ADAPTER_NUMBER, MPI_POINTER PTR_MPI_BOOT_DEVICE_ADAPTER_NUMBER;
-
-typedef struct _MPI_BOOT_DEVICE_PCI_ADDRESS
-{
-    U8          TargetID;                               /* 00h */
-    U8          Bus;                                    /* 01h */
-    U16         PCIAddress;                             /* 02h */
-    U32         Reserved1;                              /* 04h */
-    U32         Reserved2;                              /* 08h */
-    U32         Reserved3;                              /* 0Ch */
-    U8          LUN[8];                                 /* 10h */
-    U32         Reserved4;                              /* 18h */
-    U32         Reserved5;                              /* 1Ch */
-    U32         Reserved6;                              /* 20h */
-    U32         Reserved7;                              /* 24h */
-    U32         Reserved8;                              /* 28h */
-    U32         Reserved9;                              /* 2Ch */
-    U32         Reserved10;                             /* 30h */
-    U32         Reserved11;                             /* 34h */
-    U32         Reserved12;                             /* 38h */
-    U32         Reserved13;                             /* 3Ch */
-    U32         Reserved14;                             /* 40h */
-} MPI_BOOT_DEVICE_PCI_ADDRESS, MPI_POINTER PTR_MPI_BOOT_DEVICE_PCI_ADDRESS;
-
-typedef struct _MPI_BOOT_DEVICE_SLOT_NUMBER
-{
-    U8          TargetID;                               /* 00h */
-    U8          Bus;                                    /* 01h */
-    U8          PCISlotNumber;                          /* 02h */
-    U8          Reserved1;                              /* 03h */
-    U32         Reserved2;                              /* 04h */
-    U32         Reserved3;                              /* 08h */
-    U32         Reserved4;                              /* 0Ch */
-    U8          LUN[8];                                 /* 10h */
-    U32         Reserved5;                              /* 18h */
-    U32         Reserved6;                              /* 1Ch */
-    U32         Reserved7;                              /* 20h */
-    U32         Reserved8;                              /* 24h */
-    U32         Reserved9;                              /* 28h */
-    U32         Reserved10;                             /* 2Ch */
-    U32         Reserved11;                             /* 30h */
-    U32         Reserved12;                             /* 34h */
-    U32         Reserved13;                             /* 38h */
-    U32         Reserved14;                             /* 3Ch */
-    U32         Reserved15;                             /* 40h */
-} MPI_BOOT_DEVICE_PCI_SLOT_NUMBER, MPI_POINTER PTR_MPI_BOOT_DEVICE_PCI_SLOT_NUMBER;
-
-typedef struct _MPI_BOOT_DEVICE_FC_WWN
-{
-    U64         WWPN;                                   /* 00h */
-    U32         Reserved1;                              /* 08h */
-    U32         Reserved2;                              /* 0Ch */
-    U8          LUN[8];                                 /* 10h */
-    U32         Reserved3;                              /* 18h */
-    U32         Reserved4;                              /* 1Ch */
-    U32         Reserved5;                              /* 20h */
-    U32         Reserved6;                              /* 24h */
-    U32         Reserved7;                              /* 28h */
-    U32         Reserved8;                              /* 2Ch */
-    U32         Reserved9;                              /* 30h */
-    U32         Reserved10;                             /* 34h */
-    U32         Reserved11;                             /* 38h */
-    U32         Reserved12;                             /* 3Ch */
-    U32         Reserved13;                             /* 40h */
-} MPI_BOOT_DEVICE_FC_WWN, MPI_POINTER PTR_MPI_BOOT_DEVICE_FC_WWN;
-
-typedef struct _MPI_BOOT_DEVICE_SAS_WWN
-{
-    U64         SASAddress;                             /* 00h */
-    U32         Reserved1;                              /* 08h */
-    U32         Reserved2;                              /* 0Ch */
-    U8          LUN[8];                                 /* 10h */
-    U32         Reserved3;                              /* 18h */
-    U32         Reserved4;                              /* 1Ch */
-    U32         Reserved5;                              /* 20h */
-    U32         Reserved6;                              /* 24h */
-    U32         Reserved7;                              /* 28h */
-    U32         Reserved8;                              /* 2Ch */
-    U32         Reserved9;                              /* 30h */
-    U32         Reserved10;                             /* 34h */
-    U32         Reserved11;                             /* 38h */
-    U32         Reserved12;                             /* 3Ch */
-    U32         Reserved13;                             /* 40h */
-} MPI_BOOT_DEVICE_SAS_WWN, MPI_POINTER PTR_MPI_BOOT_DEVICE_SAS_WWN;
-
-typedef struct _MPI_BOOT_DEVICE_ENCLOSURE_SLOT
-{
-    U64         EnclosureLogicalID;                     /* 00h */
-    U32         Reserved1;                              /* 08h */
-    U32         Reserved2;                              /* 0Ch */
-    U8          LUN[8];                                 /* 10h */
-    U16         SlotNumber;                             /* 18h */
-    U16         Reserved3;                              /* 1Ah */
-    U32         Reserved4;                              /* 1Ch */
-    U32         Reserved5;                              /* 20h */
-    U32         Reserved6;                              /* 24h */
-    U32         Reserved7;                              /* 28h */
-    U32         Reserved8;                              /* 2Ch */
-    U32         Reserved9;                              /* 30h */
-    U32         Reserved10;                             /* 34h */
-    U32         Reserved11;                             /* 38h */
-    U32         Reserved12;                             /* 3Ch */
-    U32         Reserved13;                             /* 40h */
-} MPI_BOOT_DEVICE_ENCLOSURE_SLOT,
-  MPI_POINTER PTR_MPI_BOOT_DEVICE_ENCLOSURE_SLOT;
-
-typedef union _MPI_BIOSPAGE2_BOOT_DEVICE
-{
-    MPI_BOOT_DEVICE_ADAPTER_ORDER   AdapterOrder;
-    MPI_BOOT_DEVICE_ADAPTER_NUMBER  AdapterNumber;
-    MPI_BOOT_DEVICE_PCI_ADDRESS     PCIAddress;
-    MPI_BOOT_DEVICE_PCI_SLOT_NUMBER PCISlotNumber;
-    MPI_BOOT_DEVICE_FC_WWN          FcWwn;
-    MPI_BOOT_DEVICE_SAS_WWN         SasWwn;
-    MPI_BOOT_DEVICE_ENCLOSURE_SLOT  EnclosureSlot;
-} MPI_BIOSPAGE2_BOOT_DEVICE, MPI_POINTER PTR_MPI_BIOSPAGE2_BOOT_DEVICE;
-
-typedef struct _CONFIG_PAGE_BIOS_2
-{
-    CONFIG_PAGE_HEADER          Header;                 /* 00h */
-    U32                         Reserved1;              /* 04h */
-    U32                         Reserved2;              /* 08h */
-    U32                         Reserved3;              /* 0Ch */
-    U32                         Reserved4;              /* 10h */
-    U32                         Reserved5;              /* 14h */
-    U32                         Reserved6;              /* 18h */
-    U8                          BootDeviceForm;         /* 1Ch */
-    U8                          PrevBootDeviceForm;     /* 1Ch */
-    U16                         Reserved8;              /* 1Eh */
-    MPI_BIOSPAGE2_BOOT_DEVICE   BootDevice;             /* 20h */
-} CONFIG_PAGE_BIOS_2, MPI_POINTER PTR_CONFIG_PAGE_BIOS_2,
-  BIOSPage2_t, MPI_POINTER pBIOSPage2_t;
-
-#define MPI_BIOSPAGE2_PAGEVERSION                       (0x02)
-
-#define MPI_BIOSPAGE2_FORM_MASK                         (0x0F)
-#define MPI_BIOSPAGE2_FORM_ADAPTER_ORDER                (0x00)
-#define MPI_BIOSPAGE2_FORM_ADAPTER_NUMBER               (0x01)
-#define MPI_BIOSPAGE2_FORM_PCI_ADDRESS                  (0x02)
-#define MPI_BIOSPAGE2_FORM_PCI_SLOT_NUMBER              (0x03)
-#define MPI_BIOSPAGE2_FORM_FC_WWN                       (0x04)
-#define MPI_BIOSPAGE2_FORM_SAS_WWN                      (0x05)
-#define MPI_BIOSPAGE2_FORM_ENCLOSURE_SLOT               (0x06)
-
-typedef struct _CONFIG_PAGE_BIOS_4
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U64                     ReassignmentBaseWWID;       /* 04h */
-} CONFIG_PAGE_BIOS_4, MPI_POINTER PTR_CONFIG_PAGE_BIOS_4,
-  BIOSPage4_t, MPI_POINTER pBIOSPage4_t;
-
-#define MPI_BIOSPAGE4_PAGEVERSION                       (0x00)
-
-
-/****************************************************************************
-*   SCSI Port Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_SCSI_PORT_0
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Capabilities;               /* 04h */
-    U32                     PhysicalInterface;          /* 08h */
-} CONFIG_PAGE_SCSI_PORT_0, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_0,
-  SCSIPortPage0_t, MPI_POINTER pSCSIPortPage0_t;
-
-#define MPI_SCSIPORTPAGE0_PAGEVERSION                   (0x02)
-
-#define MPI_SCSIPORTPAGE0_CAP_IU                        (0x00000001)
-#define MPI_SCSIPORTPAGE0_CAP_DT                        (0x00000002)
-#define MPI_SCSIPORTPAGE0_CAP_QAS                       (0x00000004)
-#define MPI_SCSIPORTPAGE0_CAP_MIN_SYNC_PERIOD_MASK      (0x0000FF00)
-#define MPI_SCSIPORTPAGE0_SYNC_ASYNC                    (0x00)
-#define MPI_SCSIPORTPAGE0_SYNC_5                        (0x32)
-#define MPI_SCSIPORTPAGE0_SYNC_10                       (0x19)
-#define MPI_SCSIPORTPAGE0_SYNC_20                       (0x0C)
-#define MPI_SCSIPORTPAGE0_SYNC_33_33                    (0x0B)
-#define MPI_SCSIPORTPAGE0_SYNC_40                       (0x0A)
-#define MPI_SCSIPORTPAGE0_SYNC_80                       (0x09)
-#define MPI_SCSIPORTPAGE0_SYNC_160                      (0x08)
-#define MPI_SCSIPORTPAGE0_SYNC_UNKNOWN                  (0xFF)
-
-#define MPI_SCSIPORTPAGE0_CAP_SHIFT_MIN_SYNC_PERIOD     (8)
-#define MPI_SCSIPORTPAGE0_CAP_GET_MIN_SYNC_PERIOD(Cap)      \
-    (  ((Cap) & MPI_SCSIPORTPAGE0_CAP_MIN_SYNC_PERIOD_MASK) \
-    >> MPI_SCSIPORTPAGE0_CAP_SHIFT_MIN_SYNC_PERIOD          \
-    )
-#define MPI_SCSIPORTPAGE0_CAP_MAX_SYNC_OFFSET_MASK      (0x00FF0000)
-#define MPI_SCSIPORTPAGE0_CAP_SHIFT_MAX_SYNC_OFFSET     (16)
-#define MPI_SCSIPORTPAGE0_CAP_GET_MAX_SYNC_OFFSET(Cap)      \
-    (  ((Cap) & MPI_SCSIPORTPAGE0_CAP_MAX_SYNC_OFFSET_MASK) \
-    >> MPI_SCSIPORTPAGE0_CAP_SHIFT_MAX_SYNC_OFFSET          \
-    )
-#define MPI_SCSIPORTPAGE0_CAP_IDP                       (0x08000000)
-#define MPI_SCSIPORTPAGE0_CAP_WIDE                      (0x20000000)
-#define MPI_SCSIPORTPAGE0_CAP_AIP                       (0x80000000)
-
-#define MPI_SCSIPORTPAGE0_PHY_SIGNAL_TYPE_MASK          (0x00000003)
-#define MPI_SCSIPORTPAGE0_PHY_SIGNAL_HVD                (0x01)
-#define MPI_SCSIPORTPAGE0_PHY_SIGNAL_SE                 (0x02)
-#define MPI_SCSIPORTPAGE0_PHY_SIGNAL_LVD                (0x03)
-#define MPI_SCSIPORTPAGE0_PHY_MASK_CONNECTED_ID         (0xFF000000)
-#define MPI_SCSIPORTPAGE0_PHY_SHIFT_CONNECTED_ID        (24)
-#define MPI_SCSIPORTPAGE0_PHY_BUS_FREE_CONNECTED_ID     (0xFE)
-#define MPI_SCSIPORTPAGE0_PHY_UNKNOWN_CONNECTED_ID      (0xFF)
-
-
-typedef struct _CONFIG_PAGE_SCSI_PORT_1
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Configuration;              /* 04h */
-    U32                     OnBusTimerValue;            /* 08h */
-    U8                      TargetConfig;               /* 0Ch */
-    U8                      Reserved1;                  /* 0Dh */
-    U16                     IDConfig;                   /* 0Eh */
-} CONFIG_PAGE_SCSI_PORT_1, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_1,
-  SCSIPortPage1_t, MPI_POINTER pSCSIPortPage1_t;
-
-#define MPI_SCSIPORTPAGE1_PAGEVERSION                   (0x03)
-
-/* Configuration values */
-#define MPI_SCSIPORTPAGE1_CFG_PORT_SCSI_ID_MASK         (0x000000FF)
-#define MPI_SCSIPORTPAGE1_CFG_PORT_RESPONSE_ID_MASK     (0xFFFF0000)
-#define MPI_SCSIPORTPAGE1_CFG_SHIFT_PORT_RESPONSE_ID    (16)
-
-/* TargetConfig values */
-#define MPI_SCSIPORTPAGE1_TARGCONFIG_TARG_ONLY        (0x01)
-#define MPI_SCSIPORTPAGE1_TARGCONFIG_INIT_TARG        (0x02)
-
-
-typedef struct _MPI_DEVICE_INFO
-{
-    U8      Timeout;                                    /* 00h */
-    U8      SyncFactor;                                 /* 01h */
-    U16     DeviceFlags;                                /* 02h */
-} MPI_DEVICE_INFO, MPI_POINTER PTR_MPI_DEVICE_INFO,
-  MpiDeviceInfo_t, MPI_POINTER pMpiDeviceInfo_t;
-
-typedef struct _CONFIG_PAGE_SCSI_PORT_2
-{
-    CONFIG_PAGE_HEADER  Header;                         /* 00h */
-    U32                 PortFlags;                      /* 04h */
-    U32                 PortSettings;                   /* 08h */
-    MPI_DEVICE_INFO     DeviceSettings[16];             /* 0Ch */
-} CONFIG_PAGE_SCSI_PORT_2, MPI_POINTER PTR_CONFIG_PAGE_SCSI_PORT_2,
-  SCSIPortPage2_t, MPI_POINTER pSCSIPortPage2_t;
-
-#define MPI_SCSIPORTPAGE2_PAGEVERSION                       (0x02)
-
-/* PortFlags values */
-#define MPI_SCSIPORTPAGE2_PORT_FLAGS_SCAN_HIGH_TO_LOW       (0x00000001)
-#define MPI_SCSIPORTPAGE2_PORT_FLAGS_AVOID_SCSI_RESET       (0x00000004)
-#define MPI_SCSIPORTPAGE2_PORT_FLAGS_ALTERNATE_CHS          (0x00000008)
-#define MPI_SCSIPORTPAGE2_PORT_FLAGS_TERMINATION_DISABLE    (0x00000010)
-
-#define MPI_SCSIPORTPAGE2_PORT_FLAGS_DV_MASK                (0x00000060)
-#define MPI_SCSIPORTPAGE2_PORT_FLAGS_FULL_DV                (0x00000000)
-#define MPI_SCSIPORTPAGE2_PORT_FLAGS_BASIC_DV_ONLY          (0x00000020)
-#define MPI_SCSIPORTPAGE2_PORT_FLAGS_OFF_DV                 (0x00000060)
-
-
-/* PortSettings values */
-#define MPI_SCSIPORTPAGE2_PORT_HOST_ID_MASK                 (0x0000000F)
-#define MPI_SCSIPORTPAGE2_PORT_MASK_INIT_HBA                (0x00000030)
-#define MPI_SCSIPORTPAGE2_PORT_DISABLE_INIT_HBA             (0x00000000)
-#define MPI_SCSIPORTPAGE2_PORT_BIOS_INIT_HBA                (0x00000010)
-#define MPI_SCSIPORTPAGE2_PORT_OS_INIT_HBA                  (0x00000020)
-#define MPI_SCSIPORTPAGE2_PORT_BIOS_OS_INIT_HBA             (0x00000030)
-#define MPI_SCSIPORTPAGE2_PORT_REMOVABLE_MEDIA              (0x000000C0)
-#define MPI_SCSIPORTPAGE2_PORT_RM_NONE                      (0x00000000)
-#define MPI_SCSIPORTPAGE2_PORT_RM_BOOT_ONLY                 (0x00000040)
-#define MPI_SCSIPORTPAGE2_PORT_RM_WITH_MEDIA                (0x00000080)
-#define MPI_SCSIPORTPAGE2_PORT_SPINUP_DELAY_MASK            (0x00000F00)
-#define MPI_SCSIPORTPAGE2_PORT_SHIFT_SPINUP_DELAY           (8)
-#define MPI_SCSIPORTPAGE2_PORT_MASK_NEGO_MASTER_SETTINGS    (0x00003000)
-#define MPI_SCSIPORTPAGE2_PORT_NEGO_MASTER_SETTINGS         (0x00000000)
-#define MPI_SCSIPORTPAGE2_PORT_NONE_MASTER_SETTINGS         (0x00001000)
-#define MPI_SCSIPORTPAGE2_PORT_ALL_MASTER_SETTINGS          (0x00003000)
-
-#define MPI_SCSIPORTPAGE2_DEVICE_DISCONNECT_ENABLE          (0x0001)
-#define MPI_SCSIPORTPAGE2_DEVICE_ID_SCAN_ENABLE             (0x0002)
-#define MPI_SCSIPORTPAGE2_DEVICE_LUN_SCAN_ENABLE            (0x0004)
-#define MPI_SCSIPORTPAGE2_DEVICE_TAG_QUEUE_ENABLE           (0x0008)
-#define MPI_SCSIPORTPAGE2_DEVICE_WIDE_DISABLE               (0x0010)
-#define MPI_SCSIPORTPAGE2_DEVICE_BOOT_CHOICE                (0x0020)
-
-
-/****************************************************************************
-*   SCSI Target Device Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_SCSI_DEVICE_0
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     NegotiatedParameters;       /* 04h */
-    U32                     Information;                /* 08h */
-} CONFIG_PAGE_SCSI_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_0,
-  SCSIDevicePage0_t, MPI_POINTER pSCSIDevicePage0_t;
-
-#define MPI_SCSIDEVPAGE0_PAGEVERSION                    (0x04)
-
-#define MPI_SCSIDEVPAGE0_NP_IU                          (0x00000001)
-#define MPI_SCSIDEVPAGE0_NP_DT                          (0x00000002)
-#define MPI_SCSIDEVPAGE0_NP_QAS                         (0x00000004)
-#define MPI_SCSIDEVPAGE0_NP_HOLD_MCS                    (0x00000008)
-#define MPI_SCSIDEVPAGE0_NP_WR_FLOW                     (0x00000010)
-#define MPI_SCSIDEVPAGE0_NP_RD_STRM                     (0x00000020)
-#define MPI_SCSIDEVPAGE0_NP_RTI                         (0x00000040)
-#define MPI_SCSIDEVPAGE0_NP_PCOMP_EN                    (0x00000080)
-#define MPI_SCSIDEVPAGE0_NP_NEG_SYNC_PERIOD_MASK        (0x0000FF00)
-#define MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_PERIOD           (8)
-#define MPI_SCSIDEVPAGE0_NP_NEG_SYNC_OFFSET_MASK        (0x00FF0000)
-#define MPI_SCSIDEVPAGE0_NP_SHIFT_SYNC_OFFSET           (16)
-#define MPI_SCSIDEVPAGE0_NP_IDP                         (0x08000000)
-#define MPI_SCSIDEVPAGE0_NP_WIDE                        (0x20000000)
-#define MPI_SCSIDEVPAGE0_NP_AIP                         (0x80000000)
-
-#define MPI_SCSIDEVPAGE0_INFO_PARAMS_NEGOTIATED         (0x00000001)
-#define MPI_SCSIDEVPAGE0_INFO_SDTR_REJECTED             (0x00000002)
-#define MPI_SCSIDEVPAGE0_INFO_WDTR_REJECTED             (0x00000004)
-#define MPI_SCSIDEVPAGE0_INFO_PPR_REJECTED              (0x00000008)
-
-
-typedef struct _CONFIG_PAGE_SCSI_DEVICE_1
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     RequestedParameters;        /* 04h */
-    U32                     Reserved;                   /* 08h */
-    U32                     Configuration;              /* 0Ch */
-} CONFIG_PAGE_SCSI_DEVICE_1, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_1,
-  SCSIDevicePage1_t, MPI_POINTER pSCSIDevicePage1_t;
-
-#define MPI_SCSIDEVPAGE1_PAGEVERSION                    (0x05)
-
-#define MPI_SCSIDEVPAGE1_RP_IU                          (0x00000001)
-#define MPI_SCSIDEVPAGE1_RP_DT                          (0x00000002)
-#define MPI_SCSIDEVPAGE1_RP_QAS                         (0x00000004)
-#define MPI_SCSIDEVPAGE1_RP_HOLD_MCS                    (0x00000008)
-#define MPI_SCSIDEVPAGE1_RP_WR_FLOW                     (0x00000010)
-#define MPI_SCSIDEVPAGE1_RP_RD_STRM                     (0x00000020)
-#define MPI_SCSIDEVPAGE1_RP_RTI                         (0x00000040)
-#define MPI_SCSIDEVPAGE1_RP_PCOMP_EN                    (0x00000080)
-#define MPI_SCSIDEVPAGE1_RP_MIN_SYNC_PERIOD_MASK        (0x0000FF00)
-#define MPI_SCSIDEVPAGE1_RP_SHIFT_MIN_SYNC_PERIOD       (8)
-#define MPI_SCSIDEVPAGE1_RP_MAX_SYNC_OFFSET_MASK        (0x00FF0000)
-#define MPI_SCSIDEVPAGE1_RP_SHIFT_MAX_SYNC_OFFSET       (16)
-#define MPI_SCSIDEVPAGE1_RP_IDP                         (0x08000000)
-#define MPI_SCSIDEVPAGE1_RP_WIDE                        (0x20000000)
-#define MPI_SCSIDEVPAGE1_RP_AIP                         (0x80000000)
-
-#define MPI_SCSIDEVPAGE1_CONF_WDTR_DISALLOWED           (0x00000002)
-#define MPI_SCSIDEVPAGE1_CONF_SDTR_DISALLOWED           (0x00000004)
-#define MPI_SCSIDEVPAGE1_CONF_EXTENDED_PARAMS_ENABLE    (0x00000008)
-#define MPI_SCSIDEVPAGE1_CONF_FORCE_PPR_MSG             (0x00000010)
-
-
-typedef struct _CONFIG_PAGE_SCSI_DEVICE_2
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     DomainValidation;           /* 04h */
-    U32                     ParityPipeSelect;           /* 08h */
-    U32                     DataPipeSelect;             /* 0Ch */
-} CONFIG_PAGE_SCSI_DEVICE_2, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_2,
-  SCSIDevicePage2_t, MPI_POINTER pSCSIDevicePage2_t;
-
-#define MPI_SCSIDEVPAGE2_PAGEVERSION                    (0x01)
-
-#define MPI_SCSIDEVPAGE2_DV_ISI_ENABLE                  (0x00000010)
-#define MPI_SCSIDEVPAGE2_DV_SECONDARY_DRIVER_ENABLE     (0x00000020)
-#define MPI_SCSIDEVPAGE2_DV_SLEW_RATE_CTRL              (0x00000380)
-#define MPI_SCSIDEVPAGE2_DV_PRIM_DRIVE_STR_CTRL         (0x00001C00)
-#define MPI_SCSIDEVPAGE2_DV_SECOND_DRIVE_STR_CTRL       (0x0000E000)
-#define MPI_SCSIDEVPAGE2_DV_XCLKH_ST                    (0x10000000)
-#define MPI_SCSIDEVPAGE2_DV_XCLKS_ST                    (0x20000000)
-#define MPI_SCSIDEVPAGE2_DV_XCLKH_DT                    (0x40000000)
-#define MPI_SCSIDEVPAGE2_DV_XCLKS_DT                    (0x80000000)
-
-#define MPI_SCSIDEVPAGE2_PPS_PPS_MASK                   (0x00000003)
-
-#define MPI_SCSIDEVPAGE2_DPS_BIT_0_PL_SELECT_MASK       (0x00000003)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_1_PL_SELECT_MASK       (0x0000000C)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_2_PL_SELECT_MASK       (0x00000030)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_3_PL_SELECT_MASK       (0x000000C0)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_4_PL_SELECT_MASK       (0x00000300)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_5_PL_SELECT_MASK       (0x00000C00)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_6_PL_SELECT_MASK       (0x00003000)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_7_PL_SELECT_MASK       (0x0000C000)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_8_PL_SELECT_MASK       (0x00030000)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_9_PL_SELECT_MASK       (0x000C0000)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_10_PL_SELECT_MASK      (0x00300000)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_11_PL_SELECT_MASK      (0x00C00000)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_12_PL_SELECT_MASK      (0x03000000)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_13_PL_SELECT_MASK      (0x0C000000)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_14_PL_SELECT_MASK      (0x30000000)
-#define MPI_SCSIDEVPAGE2_DPS_BIT_15_PL_SELECT_MASK      (0xC0000000)
-
-
-typedef struct _CONFIG_PAGE_SCSI_DEVICE_3
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U16                     MsgRejectCount;             /* 04h */
-    U16                     PhaseErrorCount;            /* 06h */
-    U16                     ParityErrorCount;           /* 08h */
-    U16                     Reserved;                   /* 0Ah */
-} CONFIG_PAGE_SCSI_DEVICE_3, MPI_POINTER PTR_CONFIG_PAGE_SCSI_DEVICE_3,
-  SCSIDevicePage3_t, MPI_POINTER pSCSIDevicePage3_t;
-
-#define MPI_SCSIDEVPAGE3_PAGEVERSION                    (0x00)
-
-#define MPI_SCSIDEVPAGE3_MAX_COUNTER                    (0xFFFE)
-#define MPI_SCSIDEVPAGE3_UNSUPPORTED_COUNTER            (0xFFFF)
-
-
-/****************************************************************************
-*   FC Port Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_FC_PORT_0
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Flags;                      /* 04h */
-    U8                      MPIPortNumber;              /* 08h */
-    U8                      LinkType;                   /* 09h */
-    U8                      PortState;                  /* 0Ah */
-    U8                      Reserved;                   /* 0Bh */
-    U32                     PortIdentifier;             /* 0Ch */
-    U64                     WWNN;                       /* 10h */
-    U64                     WWPN;                       /* 18h */
-    U32                     SupportedServiceClass;      /* 20h */
-    U32                     SupportedSpeeds;            /* 24h */
-    U32                     CurrentSpeed;               /* 28h */
-    U32                     MaxFrameSize;               /* 2Ch */
-    U64                     FabricWWNN;                 /* 30h */
-    U64                     FabricWWPN;                 /* 38h */
-    U32                     DiscoveredPortsCount;       /* 40h */
-    U32                     MaxInitiators;              /* 44h */
-    U8                      MaxAliasesSupported;        /* 48h */
-    U8                      MaxHardAliasesSupported;    /* 49h */
-    U8                      NumCurrentAliases;          /* 4Ah */
-    U8                      Reserved1;                  /* 4Bh */
-} CONFIG_PAGE_FC_PORT_0, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_0,
-  FCPortPage0_t, MPI_POINTER pFCPortPage0_t;
-
-#define MPI_FCPORTPAGE0_PAGEVERSION                     (0x02)
-
-#define MPI_FCPORTPAGE0_FLAGS_PROT_MASK                 (0x0000000F)
-#define MPI_FCPORTPAGE0_FLAGS_PROT_FCP_INIT             (MPI_PORTFACTS_PROTOCOL_INITIATOR)
-#define MPI_FCPORTPAGE0_FLAGS_PROT_FCP_TARG             (MPI_PORTFACTS_PROTOCOL_TARGET)
-#define MPI_FCPORTPAGE0_FLAGS_PROT_LAN                  (MPI_PORTFACTS_PROTOCOL_LAN)
-#define MPI_FCPORTPAGE0_FLAGS_PROT_LOGBUSADDR           (MPI_PORTFACTS_PROTOCOL_LOGBUSADDR)
-
-#define MPI_FCPORTPAGE0_FLAGS_ALIAS_ALPA_SUPPORTED      (0x00000010)
-#define MPI_FCPORTPAGE0_FLAGS_ALIAS_WWN_SUPPORTED       (0x00000020)
-#define MPI_FCPORTPAGE0_FLAGS_FABRIC_WWN_VALID          (0x00000040)
-
-#define MPI_FCPORTPAGE0_FLAGS_ATTACH_TYPE_MASK          (0x00000F00)
-#define MPI_FCPORTPAGE0_FLAGS_ATTACH_NO_INIT            (0x00000000)
-#define MPI_FCPORTPAGE0_FLAGS_ATTACH_POINT_TO_POINT     (0x00000100)
-#define MPI_FCPORTPAGE0_FLAGS_ATTACH_PRIVATE_LOOP       (0x00000200)
-#define MPI_FCPORTPAGE0_FLAGS_ATTACH_FABRIC_DIRECT      (0x00000400)
-#define MPI_FCPORTPAGE0_FLAGS_ATTACH_PUBLIC_LOOP        (0x00000800)
-
-#define MPI_FCPORTPAGE0_LTYPE_RESERVED                  (0x00)
-#define MPI_FCPORTPAGE0_LTYPE_OTHER                     (0x01)
-#define MPI_FCPORTPAGE0_LTYPE_UNKNOWN                   (0x02)
-#define MPI_FCPORTPAGE0_LTYPE_COPPER                    (0x03)
-#define MPI_FCPORTPAGE0_LTYPE_SINGLE_1300               (0x04)
-#define MPI_FCPORTPAGE0_LTYPE_SINGLE_1500               (0x05)
-#define MPI_FCPORTPAGE0_LTYPE_50_LASER_MULTI            (0x06)
-#define MPI_FCPORTPAGE0_LTYPE_50_LED_MULTI              (0x07)
-#define MPI_FCPORTPAGE0_LTYPE_62_LASER_MULTI            (0x08)
-#define MPI_FCPORTPAGE0_LTYPE_62_LED_MULTI              (0x09)
-#define MPI_FCPORTPAGE0_LTYPE_MULTI_LONG_WAVE           (0x0A)
-#define MPI_FCPORTPAGE0_LTYPE_MULTI_SHORT_WAVE          (0x0B)
-#define MPI_FCPORTPAGE0_LTYPE_LASER_SHORT_WAVE          (0x0C)
-#define MPI_FCPORTPAGE0_LTYPE_LED_SHORT_WAVE            (0x0D)
-#define MPI_FCPORTPAGE0_LTYPE_1300_LONG_WAVE            (0x0E)
-#define MPI_FCPORTPAGE0_LTYPE_1500_LONG_WAVE            (0x0F)
-
-#define MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN               (0x01)      /*(SNIA)HBA_PORTSTATE_UNKNOWN       1 Unknown */
-#define MPI_FCPORTPAGE0_PORTSTATE_ONLINE                (0x02)      /*(SNIA)HBA_PORTSTATE_ONLINE        2 Operational */
-#define MPI_FCPORTPAGE0_PORTSTATE_OFFLINE               (0x03)      /*(SNIA)HBA_PORTSTATE_OFFLINE       3 User Offline */
-#define MPI_FCPORTPAGE0_PORTSTATE_BYPASSED              (0x04)      /*(SNIA)HBA_PORTSTATE_BYPASSED      4 Bypassed */
-#define MPI_FCPORTPAGE0_PORTSTATE_DIAGNOST              (0x05)      /*(SNIA)HBA_PORTSTATE_DIAGNOSTICS   5 In diagnostics mode */
-#define MPI_FCPORTPAGE0_PORTSTATE_LINKDOWN              (0x06)      /*(SNIA)HBA_PORTSTATE_LINKDOWN      6 Link Down */
-#define MPI_FCPORTPAGE0_PORTSTATE_ERROR                 (0x07)      /*(SNIA)HBA_PORTSTATE_ERROR         7 Port Error */
-#define MPI_FCPORTPAGE0_PORTSTATE_LOOPBACK              (0x08)      /*(SNIA)HBA_PORTSTATE_LOOPBACK      8 Loopback */
-
-#define MPI_FCPORTPAGE0_SUPPORT_CLASS_1                 (0x00000001)
-#define MPI_FCPORTPAGE0_SUPPORT_CLASS_2                 (0x00000002)
-#define MPI_FCPORTPAGE0_SUPPORT_CLASS_3                 (0x00000004)
-
-#define MPI_FCPORTPAGE0_SUPPORT_SPEED_UKNOWN            (0x00000000) /* (SNIA)HBA_PORTSPEED_UNKNOWN 0   Unknown - transceiver incapable of reporting */
-#define MPI_FCPORTPAGE0_SUPPORT_1GBIT_SPEED             (0x00000001) /* (SNIA)HBA_PORTSPEED_1GBIT   1   1 GBit/sec */
-#define MPI_FCPORTPAGE0_SUPPORT_2GBIT_SPEED             (0x00000002) /* (SNIA)HBA_PORTSPEED_2GBIT   2   2 GBit/sec */
-#define MPI_FCPORTPAGE0_SUPPORT_10GBIT_SPEED            (0x00000004) /* (SNIA)HBA_PORTSPEED_10GBIT  4  10 GBit/sec */
-#define MPI_FCPORTPAGE0_SUPPORT_4GBIT_SPEED             (0x00000008) /* (SNIA)HBA_PORTSPEED_4GBIT   8   4 GBit/sec */
-
-#define MPI_FCPORTPAGE0_CURRENT_SPEED_UKNOWN            MPI_FCPORTPAGE0_SUPPORT_SPEED_UKNOWN
-#define MPI_FCPORTPAGE0_CURRENT_SPEED_1GBIT             MPI_FCPORTPAGE0_SUPPORT_1GBIT_SPEED
-#define MPI_FCPORTPAGE0_CURRENT_SPEED_2GBIT             MPI_FCPORTPAGE0_SUPPORT_2GBIT_SPEED
-#define MPI_FCPORTPAGE0_CURRENT_SPEED_10GBIT            MPI_FCPORTPAGE0_SUPPORT_10GBIT_SPEED
-#define MPI_FCPORTPAGE0_CURRENT_SPEED_4GBIT             MPI_FCPORTPAGE0_SUPPORT_4GBIT_SPEED
-#define MPI_FCPORTPAGE0_CURRENT_SPEED_NOT_NEGOTIATED    (0x00008000)        /* (SNIA)HBA_PORTSPEED_NOT_NEGOTIATED (1<<15) Speed not established */
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_1
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Flags;                      /* 04h */
-    U64                     NoSEEPROMWWNN;              /* 08h */
-    U64                     NoSEEPROMWWPN;              /* 10h */
-    U8                      HardALPA;                   /* 18h */
-    U8                      LinkConfig;                 /* 19h */
-    U8                      TopologyConfig;             /* 1Ah */
-    U8                      AltConnector;               /* 1Bh */
-    U8                      NumRequestedAliases;        /* 1Ch */
-    U8                      RR_TOV;                     /* 1Dh */
-    U8                      InitiatorDeviceTimeout;     /* 1Eh */
-    U8                      InitiatorIoPendTimeout;     /* 1Fh */
-} CONFIG_PAGE_FC_PORT_1, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_1,
-  FCPortPage1_t, MPI_POINTER pFCPortPage1_t;
-
-#define MPI_FCPORTPAGE1_PAGEVERSION                     (0x06)
-
-#define MPI_FCPORTPAGE1_FLAGS_EXT_FCP_STATUS_EN         (0x08000000)
-#define MPI_FCPORTPAGE1_FLAGS_IMMEDIATE_ERROR_REPLY     (0x04000000)
-#define MPI_FCPORTPAGE1_FLAGS_FORCE_USE_NOSEEPROM_WWNS  (0x02000000)
-#define MPI_FCPORTPAGE1_FLAGS_VERBOSE_RESCAN_EVENTS     (0x01000000)
-#define MPI_FCPORTPAGE1_FLAGS_TARGET_MODE_OXID          (0x00800000)
-#define MPI_FCPORTPAGE1_FLAGS_PORT_OFFLINE              (0x00400000)
-#define MPI_FCPORTPAGE1_FLAGS_SOFT_ALPA_FALLBACK        (0x00200000)
-#define MPI_FCPORTPAGE1_FLAGS_TARGET_LARGE_CDB_ENABLE   (0x00000080)
-#define MPI_FCPORTPAGE1_FLAGS_MASK_RR_TOV_UNITS         (0x00000070)
-#define MPI_FCPORTPAGE1_FLAGS_SUPPRESS_PROT_REG         (0x00000008)
-#define MPI_FCPORTPAGE1_FLAGS_PLOGI_ON_LOGO             (0x00000004)
-#define MPI_FCPORTPAGE1_FLAGS_MAINTAIN_LOGINS           (0x00000002)
-#define MPI_FCPORTPAGE1_FLAGS_SORT_BY_DID               (0x00000001)
-#define MPI_FCPORTPAGE1_FLAGS_SORT_BY_WWN               (0x00000000)
-
-#define MPI_FCPORTPAGE1_FLAGS_PROT_MASK                 (0xF0000000)
-#define MPI_FCPORTPAGE1_FLAGS_PROT_SHIFT                (28)
-#define MPI_FCPORTPAGE1_FLAGS_PROT_FCP_INIT             ((U32)MPI_PORTFACTS_PROTOCOL_INITIATOR << MPI_FCPORTPAGE1_FLAGS_PROT_SHIFT)
-#define MPI_FCPORTPAGE1_FLAGS_PROT_FCP_TARG             ((U32)MPI_PORTFACTS_PROTOCOL_TARGET << MPI_FCPORTPAGE1_FLAGS_PROT_SHIFT)
-#define MPI_FCPORTPAGE1_FLAGS_PROT_LAN                  ((U32)MPI_PORTFACTS_PROTOCOL_LAN << MPI_FCPORTPAGE1_FLAGS_PROT_SHIFT)
-#define MPI_FCPORTPAGE1_FLAGS_PROT_LOGBUSADDR           ((U32)MPI_PORTFACTS_PROTOCOL_LOGBUSADDR << MPI_FCPORTPAGE1_FLAGS_PROT_SHIFT)
-
-#define MPI_FCPORTPAGE1_FLAGS_NONE_RR_TOV_UNITS         (0x00000000)
-#define MPI_FCPORTPAGE1_FLAGS_THOUSANDTH_RR_TOV_UNITS   (0x00000010)
-#define MPI_FCPORTPAGE1_FLAGS_TENTH_RR_TOV_UNITS        (0x00000030)
-#define MPI_FCPORTPAGE1_FLAGS_TEN_RR_TOV_UNITS          (0x00000050)
-
-#define MPI_FCPORTPAGE1_HARD_ALPA_NOT_USED              (0xFF)
-
-#define MPI_FCPORTPAGE1_LCONFIG_SPEED_MASK              (0x0F)
-#define MPI_FCPORTPAGE1_LCONFIG_SPEED_1GIG              (0x00)
-#define MPI_FCPORTPAGE1_LCONFIG_SPEED_2GIG              (0x01)
-#define MPI_FCPORTPAGE1_LCONFIG_SPEED_4GIG              (0x02)
-#define MPI_FCPORTPAGE1_LCONFIG_SPEED_10GIG             (0x03)
-#define MPI_FCPORTPAGE1_LCONFIG_SPEED_AUTO              (0x0F)
-
-#define MPI_FCPORTPAGE1_TOPOLOGY_MASK                   (0x0F)
-#define MPI_FCPORTPAGE1_TOPOLOGY_NLPORT                 (0x01)
-#define MPI_FCPORTPAGE1_TOPOLOGY_NPORT                  (0x02)
-#define MPI_FCPORTPAGE1_TOPOLOGY_AUTO                   (0x0F)
-
-#define MPI_FCPORTPAGE1_ALT_CONN_UNKNOWN                (0x00)
-
-#define MPI_FCPORTPAGE1_INITIATOR_DEV_TIMEOUT_MASK      (0x7F)
-#define MPI_FCPORTPAGE1_INITIATOR_DEV_UNIT_16           (0x80)
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_2
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U8                      NumberActive;               /* 04h */
-    U8                      ALPA[127];                  /* 05h */
-} CONFIG_PAGE_FC_PORT_2, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_2,
-  FCPortPage2_t, MPI_POINTER pFCPortPage2_t;
-
-#define MPI_FCPORTPAGE2_PAGEVERSION                     (0x01)
-
-
-typedef struct _WWN_FORMAT
-{
-    U64                     WWNN;                       /* 00h */
-    U64                     WWPN;                       /* 08h */
-} WWN_FORMAT, MPI_POINTER PTR_WWN_FORMAT,
-  WWNFormat, MPI_POINTER pWWNFormat;
-
-typedef union _FC_PORT_PERSISTENT_PHYSICAL_ID
-{
-    WWN_FORMAT              WWN;
-    U32                     Did;
-} FC_PORT_PERSISTENT_PHYSICAL_ID, MPI_POINTER PTR_FC_PORT_PERSISTENT_PHYSICAL_ID,
-  PersistentPhysicalId_t, MPI_POINTER pPersistentPhysicalId_t;
-
-typedef struct _FC_PORT_PERSISTENT
-{
-    FC_PORT_PERSISTENT_PHYSICAL_ID  PhysicalIdentifier; /* 00h */
-    U8                              TargetID;           /* 10h */
-    U8                              Bus;                /* 11h */
-    U16                             Flags;              /* 12h */
-} FC_PORT_PERSISTENT, MPI_POINTER PTR_FC_PORT_PERSISTENT,
-  PersistentData_t, MPI_POINTER pPersistentData_t;
-
-#define MPI_PERSISTENT_FLAGS_SHIFT                      (16)
-#define MPI_PERSISTENT_FLAGS_ENTRY_VALID                (0x0001)
-#define MPI_PERSISTENT_FLAGS_SCAN_ID                    (0x0002)
-#define MPI_PERSISTENT_FLAGS_SCAN_LUNS                  (0x0004)
-#define MPI_PERSISTENT_FLAGS_BOOT_DEVICE                (0x0008)
-#define MPI_PERSISTENT_FLAGS_BY_DID                     (0x0080)
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_FC_PORT_PAGE_3_ENTRY_MAX
-#define MPI_FC_PORT_PAGE_3_ENTRY_MAX        (1)
-#endif
-
-typedef struct _CONFIG_PAGE_FC_PORT_3
-{
-    CONFIG_PAGE_HEADER      Header;                                 /* 00h */
-    FC_PORT_PERSISTENT      Entry[MPI_FC_PORT_PAGE_3_ENTRY_MAX];    /* 04h */
-} CONFIG_PAGE_FC_PORT_3, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_3,
-  FCPortPage3_t, MPI_POINTER pFCPortPage3_t;
-
-#define MPI_FCPORTPAGE3_PAGEVERSION                     (0x01)
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_4
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     PortFlags;                  /* 04h */
-    U32                     PortSettings;               /* 08h */
-} CONFIG_PAGE_FC_PORT_4, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_4,
-  FCPortPage4_t, MPI_POINTER pFCPortPage4_t;
-
-#define MPI_FCPORTPAGE4_PAGEVERSION                     (0x00)
-
-#define MPI_FCPORTPAGE4_PORT_FLAGS_ALTERNATE_CHS        (0x00000008)
-
-#define MPI_FCPORTPAGE4_PORT_MASK_INIT_HBA              (0x00000030)
-#define MPI_FCPORTPAGE4_PORT_DISABLE_INIT_HBA           (0x00000000)
-#define MPI_FCPORTPAGE4_PORT_BIOS_INIT_HBA              (0x00000010)
-#define MPI_FCPORTPAGE4_PORT_OS_INIT_HBA                (0x00000020)
-#define MPI_FCPORTPAGE4_PORT_BIOS_OS_INIT_HBA           (0x00000030)
-#define MPI_FCPORTPAGE4_PORT_REMOVABLE_MEDIA            (0x000000C0)
-#define MPI_FCPORTPAGE4_PORT_SPINUP_DELAY_MASK          (0x00000F00)
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_5_ALIAS_INFO
-{
-    U8      Flags;                                      /* 00h */
-    U8      AliasAlpa;                                  /* 01h */
-    U16     Reserved;                                   /* 02h */
-    U64     AliasWWNN;                                  /* 04h */
-    U64     AliasWWPN;                                  /* 0Ch */
-} CONFIG_PAGE_FC_PORT_5_ALIAS_INFO,
-  MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_5_ALIAS_INFO,
-  FcPortPage5AliasInfo_t, MPI_POINTER pFcPortPage5AliasInfo_t;
-
-typedef struct _CONFIG_PAGE_FC_PORT_5
-{
-    CONFIG_PAGE_HEADER                  Header;         /* 00h */
-    CONFIG_PAGE_FC_PORT_5_ALIAS_INFO    AliasInfo;      /* 04h */
-} CONFIG_PAGE_FC_PORT_5, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_5,
-  FCPortPage5_t, MPI_POINTER pFCPortPage5_t;
-
-#define MPI_FCPORTPAGE5_PAGEVERSION                     (0x02)
-
-#define MPI_FCPORTPAGE5_FLAGS_ALPA_ACQUIRED             (0x01)
-#define MPI_FCPORTPAGE5_FLAGS_HARD_ALPA                 (0x02)
-#define MPI_FCPORTPAGE5_FLAGS_HARD_WWNN                 (0x04)
-#define MPI_FCPORTPAGE5_FLAGS_HARD_WWPN                 (0x08)
-#define MPI_FCPORTPAGE5_FLAGS_DISABLE                   (0x10)
-
-typedef struct _CONFIG_PAGE_FC_PORT_6
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Reserved;                   /* 04h */
-    U64                     TimeSinceReset;             /* 08h */
-    U64                     TxFrames;                   /* 10h */
-    U64                     RxFrames;                   /* 18h */
-    U64                     TxWords;                    /* 20h */
-    U64                     RxWords;                    /* 28h */
-    U64                     LipCount;                   /* 30h */
-    U64                     NosCount;                   /* 38h */
-    U64                     ErrorFrames;                /* 40h */
-    U64                     DumpedFrames;               /* 48h */
-    U64                     LinkFailureCount;           /* 50h */
-    U64                     LossOfSyncCount;            /* 58h */
-    U64                     LossOfSignalCount;          /* 60h */
-    U64                     PrimativeSeqErrCount;       /* 68h */
-    U64                     InvalidTxWordCount;         /* 70h */
-    U64                     InvalidCrcCount;            /* 78h */
-    U64                     FcpInitiatorIoCount;        /* 80h */
-} CONFIG_PAGE_FC_PORT_6, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_6,
-  FCPortPage6_t, MPI_POINTER pFCPortPage6_t;
-
-#define MPI_FCPORTPAGE6_PAGEVERSION                     (0x00)
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_7
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Reserved;                   /* 04h */
-    U8                      PortSymbolicName[256];      /* 08h */
-} CONFIG_PAGE_FC_PORT_7, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_7,
-  FCPortPage7_t, MPI_POINTER pFCPortPage7_t;
-
-#define MPI_FCPORTPAGE7_PAGEVERSION                     (0x00)
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_8
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     BitVector[8];               /* 04h */
-} CONFIG_PAGE_FC_PORT_8, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_8,
-  FCPortPage8_t, MPI_POINTER pFCPortPage8_t;
-
-#define MPI_FCPORTPAGE8_PAGEVERSION                     (0x00)
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_9
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U32                     Reserved;                   /* 04h */
-    U64                     GlobalWWPN;                 /* 08h */
-    U64                     GlobalWWNN;                 /* 10h */
-    U32                     UnitType;                   /* 18h */
-    U32                     PhysicalPortNumber;         /* 1Ch */
-    U32                     NumAttachedNodes;           /* 20h */
-    U16                     IPVersion;                  /* 24h */
-    U16                     UDPPortNumber;              /* 26h */
-    U8                      IPAddress[16];              /* 28h */
-    U16                     Reserved1;                  /* 38h */
-    U16                     TopologyDiscoveryFlags;     /* 3Ah */
-} CONFIG_PAGE_FC_PORT_9, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_9,
-  FCPortPage9_t, MPI_POINTER pFCPortPage9_t;
-
-#define MPI_FCPORTPAGE9_PAGEVERSION                     (0x00)
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA
-{
-    U8                      Id;                         /* 10h */
-    U8                      ExtId;                      /* 11h */
-    U8                      Connector;                  /* 12h */
-    U8                      Transceiver[8];             /* 13h */
-    U8                      Encoding;                   /* 1Bh */
-    U8                      BitRate_100mbs;             /* 1Ch */
-    U8                      Reserved1;                  /* 1Dh */
-    U8                      Length9u_km;                /* 1Eh */
-    U8                      Length9u_100m;              /* 1Fh */
-    U8                      Length50u_10m;              /* 20h */
-    U8                      Length62p5u_10m;            /* 21h */
-    U8                      LengthCopper_m;             /* 22h */
-    U8                      Reseverved2;                /* 22h */
-    U8                      VendorName[16];             /* 24h */
-    U8                      Reserved3;                  /* 34h */
-    U8                      VendorOUI[3];               /* 35h */
-    U8                      VendorPN[16];               /* 38h */
-    U8                      VendorRev[4];               /* 48h */
-    U16                     Wavelength;                 /* 4Ch */
-    U8                      Reserved4;                  /* 4Eh */
-    U8                      CC_BASE;                    /* 4Fh */
-} CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA,
-  MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA,
-  FCPortPage10BaseSfpData_t, MPI_POINTER pFCPortPage10BaseSfpData_t;
-
-#define MPI_FCPORT10_BASE_ID_UNKNOWN        (0x00)
-#define MPI_FCPORT10_BASE_ID_GBIC           (0x01)
-#define MPI_FCPORT10_BASE_ID_FIXED          (0x02)
-#define MPI_FCPORT10_BASE_ID_SFP            (0x03)
-#define MPI_FCPORT10_BASE_ID_SFP_MIN        (0x04)
-#define MPI_FCPORT10_BASE_ID_SFP_MAX        (0x7F)
-#define MPI_FCPORT10_BASE_ID_VEND_SPEC_MASK (0x80)
-
-#define MPI_FCPORT10_BASE_EXTID_UNKNOWN     (0x00)
-#define MPI_FCPORT10_BASE_EXTID_MODDEF1     (0x01)
-#define MPI_FCPORT10_BASE_EXTID_MODDEF2     (0x02)
-#define MPI_FCPORT10_BASE_EXTID_MODDEF3     (0x03)
-#define MPI_FCPORT10_BASE_EXTID_SEEPROM     (0x04)
-#define MPI_FCPORT10_BASE_EXTID_MODDEF5     (0x05)
-#define MPI_FCPORT10_BASE_EXTID_MODDEF6     (0x06)
-#define MPI_FCPORT10_BASE_EXTID_MODDEF7     (0x07)
-#define MPI_FCPORT10_BASE_EXTID_VNDSPC_MASK (0x80)
-
-#define MPI_FCPORT10_BASE_CONN_UNKNOWN      (0x00)
-#define MPI_FCPORT10_BASE_CONN_SC           (0x01)
-#define MPI_FCPORT10_BASE_CONN_COPPER1      (0x02)
-#define MPI_FCPORT10_BASE_CONN_COPPER2      (0x03)
-#define MPI_FCPORT10_BASE_CONN_BNC_TNC      (0x04)
-#define MPI_FCPORT10_BASE_CONN_COAXIAL      (0x05)
-#define MPI_FCPORT10_BASE_CONN_FIBERJACK    (0x06)
-#define MPI_FCPORT10_BASE_CONN_LC           (0x07)
-#define MPI_FCPORT10_BASE_CONN_MT_RJ        (0x08)
-#define MPI_FCPORT10_BASE_CONN_MU           (0x09)
-#define MPI_FCPORT10_BASE_CONN_SG           (0x0A)
-#define MPI_FCPORT10_BASE_CONN_OPT_PIGT     (0x0B)
-#define MPI_FCPORT10_BASE_CONN_RSV1_MIN     (0x0C)
-#define MPI_FCPORT10_BASE_CONN_RSV1_MAX     (0x1F)
-#define MPI_FCPORT10_BASE_CONN_HSSDC_II     (0x20)
-#define MPI_FCPORT10_BASE_CONN_CPR_PIGT     (0x21)
-#define MPI_FCPORT10_BASE_CONN_RSV2_MIN     (0x22)
-#define MPI_FCPORT10_BASE_CONN_RSV2_MAX     (0x7F)
-#define MPI_FCPORT10_BASE_CONN_VNDSPC_MASK  (0x80)
-
-#define MPI_FCPORT10_BASE_ENCODE_UNSPEC     (0x00)
-#define MPI_FCPORT10_BASE_ENCODE_8B10B      (0x01)
-#define MPI_FCPORT10_BASE_ENCODE_4B5B       (0x02)
-#define MPI_FCPORT10_BASE_ENCODE_NRZ        (0x03)
-#define MPI_FCPORT10_BASE_ENCODE_MANCHESTER (0x04)
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA
-{
-    U8                      Options[2];                 /* 50h */
-    U8                      BitRateMax;                 /* 52h */
-    U8                      BitRateMin;                 /* 53h */
-    U8                      VendorSN[16];               /* 54h */
-    U8                      DateCode[8];                /* 64h */
-    U8                      DiagMonitoringType;         /* 6Ch */
-    U8                      EnhancedOptions;            /* 6Dh */
-    U8                      SFF8472Compliance;          /* 6Eh */
-    U8                      CC_EXT;                     /* 6Fh */
-} CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA,
-  MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA,
-  FCPortPage10ExtendedSfpData_t, MPI_POINTER pFCPortPage10ExtendedSfpData_t;
-
-#define MPI_FCPORT10_EXT_OPTION1_RATESEL    (0x20)
-#define MPI_FCPORT10_EXT_OPTION1_TX_DISABLE (0x10)
-#define MPI_FCPORT10_EXT_OPTION1_TX_FAULT   (0x08)
-#define MPI_FCPORT10_EXT_OPTION1_LOS_INVERT (0x04)
-#define MPI_FCPORT10_EXT_OPTION1_LOS        (0x02)
-
-
-typedef struct _CONFIG_PAGE_FC_PORT_10
-{
-    CONFIG_PAGE_HEADER                          Header;             /* 00h */
-    U8                                          Flags;              /* 04h */
-    U8                                          Reserved1;          /* 05h */
-    U16                                         Reserved2;          /* 06h */
-    U32                                         HwConfig1;          /* 08h */
-    U32                                         HwConfig2;          /* 0Ch */
-    CONFIG_PAGE_FC_PORT_10_BASE_SFP_DATA        Base;               /* 10h */
-    CONFIG_PAGE_FC_PORT_10_EXTENDED_SFP_DATA    Extended;           /* 50h */
-    U8                                          VendorSpecific[32]; /* 70h */
-} CONFIG_PAGE_FC_PORT_10, MPI_POINTER PTR_CONFIG_PAGE_FC_PORT_10,
-  FCPortPage10_t, MPI_POINTER pFCPortPage10_t;
-
-#define MPI_FCPORTPAGE10_PAGEVERSION                    (0x01)
-
-/* standard MODDEF pin definitions (from GBIC spec.) */
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF_MASK              (0x00000007)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF2                  (0x00000001)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF1                  (0x00000002)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF0                  (0x00000004)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF_NOGBIC            (0x00000007)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF_CPR_IEEE_CX       (0x00000006)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF_COPPER            (0x00000005)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF_OPTICAL_LW        (0x00000004)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF_SEEPROM           (0x00000003)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF_SW_OPTICAL        (0x00000002)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF_LX_IEEE_OPT_LW    (0x00000001)
-#define MPI_FCPORTPAGE10_FLAGS_MODDEF_SX_IEEE_OPT_SW    (0x00000000)
-
-#define MPI_FCPORTPAGE10_FLAGS_CC_BASE_OK               (0x00000010)
-#define MPI_FCPORTPAGE10_FLAGS_CC_EXT_OK                (0x00000020)
-
-
-/****************************************************************************
-*   FC Device Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_FC_DEVICE_0
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    U64                     WWNN;                       /* 04h */
-    U64                     WWPN;                       /* 0Ch */
-    U32                     PortIdentifier;             /* 14h */
-    U8                      Protocol;                   /* 18h */
-    U8                      Flags;                      /* 19h */
-    U16                     BBCredit;                   /* 1Ah */
-    U16                     MaxRxFrameSize;             /* 1Ch */
-    U8                      ADISCHardALPA;              /* 1Eh */
-    U8                      PortNumber;                 /* 1Fh */
-    U8                      FcPhLowestVersion;          /* 20h */
-    U8                      FcPhHighestVersion;         /* 21h */
-    U8                      CurrentTargetID;            /* 22h */
-    U8                      CurrentBus;                 /* 23h */
-} CONFIG_PAGE_FC_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_FC_DEVICE_0,
-  FCDevicePage0_t, MPI_POINTER pFCDevicePage0_t;
-
-#define MPI_FC_DEVICE_PAGE0_PAGEVERSION                 (0x03)
-
-#define MPI_FC_DEVICE_PAGE0_FLAGS_TARGETID_BUS_VALID    (0x01)
-#define MPI_FC_DEVICE_PAGE0_FLAGS_PLOGI_INVALID         (0x02)
-#define MPI_FC_DEVICE_PAGE0_FLAGS_PRLI_INVALID          (0x04)
-
-#define MPI_FC_DEVICE_PAGE0_PROT_IP                     (0x01)
-#define MPI_FC_DEVICE_PAGE0_PROT_FCP_TARGET             (0x02)
-#define MPI_FC_DEVICE_PAGE0_PROT_FCP_INITIATOR          (0x04)
-#define MPI_FC_DEVICE_PAGE0_PROT_FCP_RETRY              (0x08)
-
-#define MPI_FC_DEVICE_PAGE0_PGAD_PORT_MASK      (MPI_FC_DEVICE_PGAD_PORT_MASK)
-#define MPI_FC_DEVICE_PAGE0_PGAD_FORM_MASK      (MPI_FC_DEVICE_PGAD_FORM_MASK)
-#define MPI_FC_DEVICE_PAGE0_PGAD_FORM_NEXT_DID  (MPI_FC_DEVICE_PGAD_FORM_NEXT_DID)
-#define MPI_FC_DEVICE_PAGE0_PGAD_FORM_BUS_TID   (MPI_FC_DEVICE_PGAD_FORM_BUS_TID)
-#define MPI_FC_DEVICE_PAGE0_PGAD_DID_MASK       (MPI_FC_DEVICE_PGAD_ND_DID_MASK)
-#define MPI_FC_DEVICE_PAGE0_PGAD_BUS_MASK       (MPI_FC_DEVICE_PGAD_BT_BUS_MASK)
-#define MPI_FC_DEVICE_PAGE0_PGAD_BUS_SHIFT      (MPI_FC_DEVICE_PGAD_BT_BUS_SHIFT)
-#define MPI_FC_DEVICE_PAGE0_PGAD_TID_MASK       (MPI_FC_DEVICE_PGAD_BT_TID_MASK)
-
-#define MPI_FC_DEVICE_PAGE0_HARD_ALPA_UNKNOWN   (0xFF)
-
-/****************************************************************************
-*   RAID Volume Config Pages
-****************************************************************************/
-
-typedef struct _RAID_VOL0_PHYS_DISK
-{
-    U16                         Reserved;               /* 00h */
-    U8                          PhysDiskMap;            /* 02h */
-    U8                          PhysDiskNum;            /* 03h */
-} RAID_VOL0_PHYS_DISK, MPI_POINTER PTR_RAID_VOL0_PHYS_DISK,
-  RaidVol0PhysDisk_t, MPI_POINTER pRaidVol0PhysDisk_t;
-
-#define MPI_RAIDVOL0_PHYSDISK_PRIMARY                   (0x01)
-#define MPI_RAIDVOL0_PHYSDISK_SECONDARY                 (0x02)
-
-typedef struct _RAID_VOL0_STATUS
-{
-    U8                          Flags;                  /* 00h */
-    U8                          State;                  /* 01h */
-    U16                         Reserved;               /* 02h */
-} RAID_VOL0_STATUS, MPI_POINTER PTR_RAID_VOL0_STATUS,
-  RaidVol0Status_t, MPI_POINTER pRaidVol0Status_t;
-
-/* RAID Volume Page 0 VolumeStatus defines */
-#define MPI_RAIDVOL0_STATUS_FLAG_ENABLED                (0x01)
-#define MPI_RAIDVOL0_STATUS_FLAG_QUIESCED               (0x02)
-#define MPI_RAIDVOL0_STATUS_FLAG_RESYNC_IN_PROGRESS     (0x04)
-#define MPI_RAIDVOL0_STATUS_FLAG_VOLUME_INACTIVE        (0x08)
-#define MPI_RAIDVOL0_STATUS_FLAG_BAD_BLOCK_TABLE_FULL   (0x10)
-
-#define MPI_RAIDVOL0_STATUS_STATE_OPTIMAL               (0x00)
-#define MPI_RAIDVOL0_STATUS_STATE_DEGRADED              (0x01)
-#define MPI_RAIDVOL0_STATUS_STATE_FAILED                (0x02)
-#define MPI_RAIDVOL0_STATUS_STATE_MISSING               (0x03)
-
-typedef struct _RAID_VOL0_SETTINGS
-{
-    U16                         Settings;       /* 00h */
-    U8                          HotSparePool;   /* 01h */ /* MPI_RAID_HOT_SPARE_POOL_ */
-    U8                          Reserved;       /* 02h */
-} RAID_VOL0_SETTINGS, MPI_POINTER PTR_RAID_VOL0_SETTINGS,
-  RaidVol0Settings, MPI_POINTER pRaidVol0Settings;
-
-/* RAID Volume Page 0 VolumeSettings defines */
-#define MPI_RAIDVOL0_SETTING_WRITE_CACHING_ENABLE       (0x0001)
-#define MPI_RAIDVOL0_SETTING_OFFLINE_ON_SMART           (0x0002)
-#define MPI_RAIDVOL0_SETTING_AUTO_CONFIGURE             (0x0004)
-#define MPI_RAIDVOL0_SETTING_PRIORITY_RESYNC            (0x0008)
-#define MPI_RAIDVOL0_SETTING_FAST_DATA_SCRUBBING_0102   (0x0020) /* obsolete */
-
-#define MPI_RAIDVOL0_SETTING_MASK_METADATA_SIZE         (0x00C0)
-#define MPI_RAIDVOL0_SETTING_64MB_METADATA_SIZE         (0x0000)
-#define MPI_RAIDVOL0_SETTING_512MB_METADATA_SIZE        (0x0040)
-
-#define MPI_RAIDVOL0_SETTING_USE_PRODUCT_ID_SUFFIX      (0x0010)
-#define MPI_RAIDVOL0_SETTING_USE_DEFAULTS               (0x8000)
-
-/* RAID Volume Page 0 HotSparePool defines, also used in RAID Physical Disk */
-#define MPI_RAID_HOT_SPARE_POOL_0                       (0x01)
-#define MPI_RAID_HOT_SPARE_POOL_1                       (0x02)
-#define MPI_RAID_HOT_SPARE_POOL_2                       (0x04)
-#define MPI_RAID_HOT_SPARE_POOL_3                       (0x08)
-#define MPI_RAID_HOT_SPARE_POOL_4                       (0x10)
-#define MPI_RAID_HOT_SPARE_POOL_5                       (0x20)
-#define MPI_RAID_HOT_SPARE_POOL_6                       (0x40)
-#define MPI_RAID_HOT_SPARE_POOL_7                       (0x80)
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX
-#define MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX        (1)
-#endif
-
-typedef struct _CONFIG_PAGE_RAID_VOL_0
-{
-    CONFIG_PAGE_HEADER      Header;         /* 00h */
-    U8                      VolumeID;       /* 04h */
-    U8                      VolumeBus;      /* 05h */
-    U8                      VolumeIOC;      /* 06h */
-    U8                      VolumeType;     /* 07h */ /* MPI_RAID_VOL_TYPE_ */
-    RAID_VOL0_STATUS        VolumeStatus;   /* 08h */
-    RAID_VOL0_SETTINGS      VolumeSettings; /* 0Ch */
-    U32                     MaxLBA;         /* 10h */
-    U32                     MaxLBAHigh;     /* 14h */
-    U32                     StripeSize;     /* 18h */
-    U32                     Reserved2;      /* 1Ch */
-    U32                     Reserved3;      /* 20h */
-    U8                      NumPhysDisks;   /* 24h */
-    U8                      DataScrubRate;  /* 25h */
-    U8                      ResyncRate;     /* 26h */
-    U8                      InactiveStatus; /* 27h */
-    RAID_VOL0_PHYS_DISK     PhysDisk[MPI_RAID_VOL_PAGE_0_PHYSDISK_MAX];/* 28h */
-} CONFIG_PAGE_RAID_VOL_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_0,
-  RaidVolumePage0_t, MPI_POINTER pRaidVolumePage0_t;
-
-#define MPI_RAIDVOLPAGE0_PAGEVERSION                    (0x07)
-
-/* values for RAID Volume Page 0 InactiveStatus field */
-#define MPI_RAIDVOLPAGE0_UNKNOWN_INACTIVE               (0x00)
-#define MPI_RAIDVOLPAGE0_STALE_METADATA_INACTIVE        (0x01)
-#define MPI_RAIDVOLPAGE0_FOREIGN_VOLUME_INACTIVE        (0x02)
-#define MPI_RAIDVOLPAGE0_INSUFFICIENT_RESOURCE_INACTIVE (0x03)
-#define MPI_RAIDVOLPAGE0_CLONE_VOLUME_INACTIVE          (0x04)
-#define MPI_RAIDVOLPAGE0_INSUFFICIENT_METADATA_INACTIVE (0x05)
-#define MPI_RAIDVOLPAGE0_PREVIOUSLY_DELETED             (0x06)
-
-
-typedef struct _CONFIG_PAGE_RAID_VOL_1
-{
-    CONFIG_PAGE_HEADER      Header;         /* 00h */
-    U8                      VolumeID;       /* 04h */
-    U8                      VolumeBus;      /* 05h */
-    U8                      VolumeIOC;      /* 06h */
-    U8                      Reserved0;      /* 07h */
-    U8                      GUID[24];       /* 08h */
-    U8                      Name[32];       /* 20h */
-    U64                     WWID;           /* 40h */
-    U32                     Reserved1;      /* 48h */
-    U32                     Reserved2;      /* 4Ch */
-} CONFIG_PAGE_RAID_VOL_1, MPI_POINTER PTR_CONFIG_PAGE_RAID_VOL_1,
-  RaidVolumePage1_t, MPI_POINTER pRaidVolumePage1_t;
-
-#define MPI_RAIDVOLPAGE1_PAGEVERSION                    (0x01)
-
-
-/****************************************************************************
-*   RAID Physical Disk Config Pages
-****************************************************************************/
-
-typedef struct _RAID_PHYS_DISK0_ERROR_DATA
-{
-    U8                      ErrorCdbByte;               /* 00h */
-    U8                      ErrorSenseKey;              /* 01h */
-    U16                     Reserved;                   /* 02h */
-    U16                     ErrorCount;                 /* 04h */
-    U8                      ErrorASC;                   /* 06h */
-    U8                      ErrorASCQ;                  /* 07h */
-    U16                     SmartCount;                 /* 08h */
-    U8                      SmartASC;                   /* 0Ah */
-    U8                      SmartASCQ;                  /* 0Bh */
-} RAID_PHYS_DISK0_ERROR_DATA, MPI_POINTER PTR_RAID_PHYS_DISK0_ERROR_DATA,
-  RaidPhysDisk0ErrorData_t, MPI_POINTER pRaidPhysDisk0ErrorData_t;
-
-typedef struct _RAID_PHYS_DISK_INQUIRY_DATA
-{
-    U8                          VendorID[8];            /* 00h */
-    U8                          ProductID[16];          /* 08h */
-    U8                          ProductRevLevel[4];     /* 18h */
-    U8                          Info[32];               /* 1Ch */
-} RAID_PHYS_DISK0_INQUIRY_DATA, MPI_POINTER PTR_RAID_PHYS_DISK0_INQUIRY_DATA,
-  RaidPhysDisk0InquiryData, MPI_POINTER pRaidPhysDisk0InquiryData;
-
-typedef struct _RAID_PHYS_DISK0_SETTINGS
-{
-    U8              SepID;              /* 00h */
-    U8              SepBus;             /* 01h */
-    U8              HotSparePool;       /* 02h */ /* MPI_RAID_HOT_SPARE_POOL_ */
-    U8              PhysDiskSettings;   /* 03h */
-} RAID_PHYS_DISK0_SETTINGS, MPI_POINTER PTR_RAID_PHYS_DISK0_SETTINGS,
-  RaidPhysDiskSettings_t, MPI_POINTER pRaidPhysDiskSettings_t;
-
-typedef struct _RAID_PHYS_DISK0_STATUS
-{
-    U8                              Flags;              /* 00h */
-    U8                              State;              /* 01h */
-    U16                             Reserved;           /* 02h */
-} RAID_PHYS_DISK0_STATUS, MPI_POINTER PTR_RAID_PHYS_DISK0_STATUS,
-  RaidPhysDiskStatus_t, MPI_POINTER pRaidPhysDiskStatus_t;
-
-/* RAID Physical Disk PhysDiskStatus flags */
-
-#define MPI_PHYSDISK0_STATUS_FLAG_OUT_OF_SYNC           (0x01)
-#define MPI_PHYSDISK0_STATUS_FLAG_QUIESCED              (0x02)
-#define MPI_PHYSDISK0_STATUS_FLAG_INACTIVE_VOLUME       (0x04)
-#define MPI_PHYSDISK0_STATUS_FLAG_OPTIMAL_PREVIOUS      (0x00)
-#define MPI_PHYSDISK0_STATUS_FLAG_NOT_OPTIMAL_PREVIOUS  (0x08)
-
-#define MPI_PHYSDISK0_STATUS_ONLINE                     (0x00)
-#define MPI_PHYSDISK0_STATUS_MISSING                    (0x01)
-#define MPI_PHYSDISK0_STATUS_NOT_COMPATIBLE             (0x02)
-#define MPI_PHYSDISK0_STATUS_FAILED                     (0x03)
-#define MPI_PHYSDISK0_STATUS_INITIALIZING               (0x04)
-#define MPI_PHYSDISK0_STATUS_OFFLINE_REQUESTED          (0x05)
-#define MPI_PHYSDISK0_STATUS_FAILED_REQUESTED           (0x06)
-#define MPI_PHYSDISK0_STATUS_OTHER_OFFLINE              (0xFF)
-
-typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_0
-{
-    CONFIG_PAGE_HEADER              Header;             /* 00h */
-    U8                              PhysDiskID;         /* 04h */
-    U8                              PhysDiskBus;        /* 05h */
-    U8                              PhysDiskIOC;        /* 06h */
-    U8                              PhysDiskNum;        /* 07h */
-    RAID_PHYS_DISK0_SETTINGS        PhysDiskSettings;   /* 08h */
-    U32                             Reserved1;          /* 0Ch */
-    U8                              ExtDiskIdentifier[8]; /* 10h */
-    U8                              DiskIdentifier[16]; /* 18h */
-    RAID_PHYS_DISK0_INQUIRY_DATA    InquiryData;        /* 28h */
-    RAID_PHYS_DISK0_STATUS          PhysDiskStatus;     /* 64h */
-    U32                             MaxLBA;             /* 68h */
-    RAID_PHYS_DISK0_ERROR_DATA      ErrorData;          /* 6Ch */
-} CONFIG_PAGE_RAID_PHYS_DISK_0, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_0,
-  RaidPhysDiskPage0_t, MPI_POINTER pRaidPhysDiskPage0_t;
-
-#define MPI_RAIDPHYSDISKPAGE0_PAGEVERSION           (0x02)
-
-
-typedef struct _RAID_PHYS_DISK1_PATH
-{
-    U8                              PhysDiskID;         /* 00h */
-    U8                              PhysDiskBus;        /* 01h */
-    U16                             Reserved1;          /* 02h */
-    U64                             WWID;               /* 04h */
-    U64                             OwnerWWID;          /* 0Ch */
-    U8                              OwnerIdentifier;    /* 14h */
-    U8                              Reserved2;          /* 15h */
-    U16                             Flags;              /* 16h */
-} RAID_PHYS_DISK1_PATH, MPI_POINTER PTR_RAID_PHYS_DISK1_PATH,
-  RaidPhysDisk1Path_t, MPI_POINTER pRaidPhysDisk1Path_t;
-
-/* RAID Physical Disk Page 1 Flags field defines */
-#define MPI_RAID_PHYSDISK1_FLAG_BROKEN          (0x0002)
-#define MPI_RAID_PHYSDISK1_FLAG_INVALID         (0x0001)
-
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength or NumPhysDiskPaths at runtime.
- */
-#ifndef MPI_RAID_PHYS_DISK1_PATH_MAX
-#define MPI_RAID_PHYS_DISK1_PATH_MAX    (1)
-#endif
-
-typedef struct _CONFIG_PAGE_RAID_PHYS_DISK_1
-{
-    CONFIG_PAGE_HEADER              Header;             /* 00h */
-    U8                              NumPhysDiskPaths;   /* 04h */
-    U8                              PhysDiskNum;        /* 05h */
-    U16                             Reserved2;          /* 06h */
-    U32                             Reserved1;          /* 08h */
-    RAID_PHYS_DISK1_PATH            Path[MPI_RAID_PHYS_DISK1_PATH_MAX];/* 0Ch */
-} CONFIG_PAGE_RAID_PHYS_DISK_1, MPI_POINTER PTR_CONFIG_PAGE_RAID_PHYS_DISK_1,
-  RaidPhysDiskPage1_t, MPI_POINTER pRaidPhysDiskPage1_t;
-
-#define MPI_RAIDPHYSDISKPAGE1_PAGEVERSION       (0x00)
-
-
-/****************************************************************************
-*   LAN Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_LAN_0
-{
-    ConfigPageHeader_t      Header;                     /* 00h */
-    U16                     TxRxModes;                  /* 04h */
-    U16                     Reserved;                   /* 06h */
-    U32                     PacketPrePad;               /* 08h */
-} CONFIG_PAGE_LAN_0, MPI_POINTER PTR_CONFIG_PAGE_LAN_0,
-  LANPage0_t, MPI_POINTER pLANPage0_t;
-
-#define MPI_LAN_PAGE0_PAGEVERSION                       (0x01)
-
-#define MPI_LAN_PAGE0_RETURN_LOOPBACK                   (0x0000)
-#define MPI_LAN_PAGE0_SUPPRESS_LOOPBACK                 (0x0001)
-#define MPI_LAN_PAGE0_LOOPBACK_MASK                     (0x0001)
-
-typedef struct _CONFIG_PAGE_LAN_1
-{
-    ConfigPageHeader_t      Header;                     /* 00h */
-    U16                     Reserved;                   /* 04h */
-    U8                      CurrentDeviceState;         /* 06h */
-    U8                      Reserved1;                  /* 07h */
-    U32                     MinPacketSize;              /* 08h */
-    U32                     MaxPacketSize;              /* 0Ch */
-    U32                     HardwareAddressLow;         /* 10h */
-    U32                     HardwareAddressHigh;        /* 14h */
-    U32                     MaxWireSpeedLow;            /* 18h */
-    U32                     MaxWireSpeedHigh;           /* 1Ch */
-    U32                     BucketsRemaining;           /* 20h */
-    U32                     MaxReplySize;               /* 24h */
-    U32                     NegWireSpeedLow;            /* 28h */
-    U32                     NegWireSpeedHigh;           /* 2Ch */
-} CONFIG_PAGE_LAN_1, MPI_POINTER PTR_CONFIG_PAGE_LAN_1,
-  LANPage1_t, MPI_POINTER pLANPage1_t;
-
-#define MPI_LAN_PAGE1_PAGEVERSION                       (0x03)
-
-#define MPI_LAN_PAGE1_DEV_STATE_RESET                   (0x00)
-#define MPI_LAN_PAGE1_DEV_STATE_OPERATIONAL             (0x01)
-
-
-/****************************************************************************
-*   Inband Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_INBAND_0
-{
-    CONFIG_PAGE_HEADER      Header;                     /* 00h */
-    MPI_VERSION_FORMAT      InbandVersion;              /* 04h */
-    U16                     MaximumBuffers;             /* 08h */
-    U16                     Reserved1;                  /* 0Ah */
-} CONFIG_PAGE_INBAND_0, MPI_POINTER PTR_CONFIG_PAGE_INBAND_0,
-  InbandPage0_t, MPI_POINTER pInbandPage0_t;
-
-#define MPI_INBAND_PAGEVERSION          (0x00)
-
-
-
-/****************************************************************************
-*   SAS IO Unit Config Pages
-****************************************************************************/
-
-typedef struct _MPI_SAS_IO_UNIT0_PHY_DATA
-{
-    U8          Port;                   /* 00h */
-    U8          PortFlags;              /* 01h */
-    U8          PhyFlags;               /* 02h */
-    U8          NegotiatedLinkRate;     /* 03h */
-    U32         ControllerPhyDeviceInfo;/* 04h */
-    U16         AttachedDeviceHandle;   /* 08h */
-    U16         ControllerDevHandle;    /* 0Ah */
-    U32         DiscoveryStatus;        /* 0Ch */
-} MPI_SAS_IO_UNIT0_PHY_DATA, MPI_POINTER PTR_MPI_SAS_IO_UNIT0_PHY_DATA,
-  SasIOUnit0PhyData, MPI_POINTER pSasIOUnit0PhyData;
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_SAS_IOUNIT0_PHY_MAX
-#define MPI_SAS_IOUNIT0_PHY_MAX         (1)
-#endif
-
-typedef struct _CONFIG_PAGE_SAS_IO_UNIT_0
-{
-    CONFIG_EXTENDED_PAGE_HEADER     Header;                             /* 00h */
-    U16                             NvdataVersionDefault;               /* 08h */
-    U16                             NvdataVersionPersistent;            /* 0Ah */
-    U8                              NumPhys;                            /* 0Ch */
-    U8                              Reserved2;                          /* 0Dh */
-    U16                             Reserved3;                          /* 0Eh */
-    MPI_SAS_IO_UNIT0_PHY_DATA       PhyData[MPI_SAS_IOUNIT0_PHY_MAX];   /* 10h */
-} CONFIG_PAGE_SAS_IO_UNIT_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_0,
-  SasIOUnitPage0_t, MPI_POINTER pSasIOUnitPage0_t;
-
-#define MPI_SASIOUNITPAGE0_PAGEVERSION      (0x04)
-
-/* values for SAS IO Unit Page 0 PortFlags */
-#define MPI_SAS_IOUNIT0_PORT_FLAGS_DISCOVERY_IN_PROGRESS    (0x08)
-#define MPI_SAS_IOUNIT0_PORT_FLAGS_0_TARGET_IOC_NUM         (0x00)
-#define MPI_SAS_IOUNIT0_PORT_FLAGS_1_TARGET_IOC_NUM         (0x04)
-#define MPI_SAS_IOUNIT0_PORT_FLAGS_AUTO_PORT_CONFIG         (0x01)
-
-/* values for SAS IO Unit Page 0 PhyFlags */
-#define MPI_SAS_IOUNIT0_PHY_FLAGS_PHY_DISABLED              (0x04)
-#define MPI_SAS_IOUNIT0_PHY_FLAGS_TX_INVERT                 (0x02)
-#define MPI_SAS_IOUNIT0_PHY_FLAGS_RX_INVERT                 (0x01)
-
-/* values for SAS IO Unit Page 0 NegotiatedLinkRate */
-#define MPI_SAS_IOUNIT0_RATE_UNKNOWN                        (0x00)
-#define MPI_SAS_IOUNIT0_RATE_PHY_DISABLED                   (0x01)
-#define MPI_SAS_IOUNIT0_RATE_FAILED_SPEED_NEGOTIATION       (0x02)
-#define MPI_SAS_IOUNIT0_RATE_SATA_OOB_COMPLETE              (0x03)
-#define MPI_SAS_IOUNIT0_RATE_1_5                            (0x08)
-#define MPI_SAS_IOUNIT0_RATE_3_0                            (0x09)
-#define MPI_SAS_IOUNIT0_RATE_6_0                            (0x0A)
-
-/* see mpi_sas.h for values for SAS IO Unit Page 0 ControllerPhyDeviceInfo values */
-
-/* values for SAS IO Unit Page 0 DiscoveryStatus */
-#define MPI_SAS_IOUNIT0_DS_LOOP_DETECTED                    (0x00000001)
-#define MPI_SAS_IOUNIT0_DS_UNADDRESSABLE_DEVICE             (0x00000002)
-#define MPI_SAS_IOUNIT0_DS_MULTIPLE_PORTS                   (0x00000004)
-#define MPI_SAS_IOUNIT0_DS_EXPANDER_ERR                     (0x00000008)
-#define MPI_SAS_IOUNIT0_DS_SMP_TIMEOUT                      (0x00000010)
-#define MPI_SAS_IOUNIT0_DS_OUT_ROUTE_ENTRIES                (0x00000020)
-#define MPI_SAS_IOUNIT0_DS_INDEX_NOT_EXIST                  (0x00000040)
-#define MPI_SAS_IOUNIT0_DS_SMP_FUNCTION_FAILED              (0x00000080)
-#define MPI_SAS_IOUNIT0_DS_SMP_CRC_ERROR                    (0x00000100)
-#define MPI_SAS_IOUNIT0_DS_SUBTRACTIVE_LINK                 (0x00000200)
-#define MPI_SAS_IOUNIT0_DS_TABLE_LINK                       (0x00000400)
-#define MPI_SAS_IOUNIT0_DS_UNSUPPORTED_DEVICE               (0x00000800)
-#define MPI_SAS_IOUNIT0_DS_MAX_SATA_TARGETS                 (0x00001000)
-#define MPI_SAS_IOUNIT0_DS_MULTI_PORT_DOMAIN                (0x00002000)
-
-
-typedef struct _MPI_SAS_IO_UNIT1_PHY_DATA
-{
-    U8          Port;                       /* 00h */
-    U8          PortFlags;                  /* 01h */
-    U8          PhyFlags;                   /* 02h */
-    U8          MaxMinLinkRate;             /* 03h */
-    U32         ControllerPhyDeviceInfo;    /* 04h */
-    U16         MaxTargetPortConnectTime;   /* 08h */
-    U16         Reserved1;                  /* 0Ah */
-} MPI_SAS_IO_UNIT1_PHY_DATA, MPI_POINTER PTR_MPI_SAS_IO_UNIT1_PHY_DATA,
-  SasIOUnit1PhyData, MPI_POINTER pSasIOUnit1PhyData;
-
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check Header.PageLength at runtime.
- */
-#ifndef MPI_SAS_IOUNIT1_PHY_MAX
-#define MPI_SAS_IOUNIT1_PHY_MAX         (1)
-#endif
-
-typedef struct _CONFIG_PAGE_SAS_IO_UNIT_1
-{
-    CONFIG_EXTENDED_PAGE_HEADER Header;                             /* 00h */
-    U16                         ControlFlags;                       /* 08h */
-    U16                         MaxNumSATATargets;                  /* 0Ah */
-    U16                         AdditionalControlFlags;             /* 0Ch */
-    U16                         Reserved1;                          /* 0Eh */
-    U8                          NumPhys;                            /* 10h */
-    U8                          SATAMaxQDepth;                      /* 11h */
-    U8                          ReportDeviceMissingDelay;           /* 12h */
-    U8                          IODeviceMissingDelay;               /* 13h */
-    MPI_SAS_IO_UNIT1_PHY_DATA   PhyData[MPI_SAS_IOUNIT1_PHY_MAX];   /* 14h */
-} CONFIG_PAGE_SAS_IO_UNIT_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_1,
-  SasIOUnitPage1_t, MPI_POINTER pSasIOUnitPage1_t;
-
-#define MPI_SASIOUNITPAGE1_PAGEVERSION      (0x07)
-
-/* values for SAS IO Unit Page 1 ControlFlags */
-#define MPI_SAS_IOUNIT1_CONTROL_DEVICE_SELF_TEST            (0x8000)
-#define MPI_SAS_IOUNIT1_CONTROL_SATA_3_0_MAX                (0x4000)
-#define MPI_SAS_IOUNIT1_CONTROL_SATA_1_5_MAX                (0x2000)
-#define MPI_SAS_IOUNIT1_CONTROL_SATA_SW_PRESERVE            (0x1000)
-#define MPI_SAS_IOUNIT1_CONTROL_DISABLE_SAS_HASH            (0x0800)
-
-#define MPI_SAS_IOUNIT1_CONTROL_MASK_DEV_SUPPORT            (0x0600)
-#define MPI_SAS_IOUNIT1_CONTROL_SHIFT_DEV_SUPPORT           (9)
-#define MPI_SAS_IOUNIT1_CONTROL_DEV_SUPPORT_BOTH            (0x00)
-#define MPI_SAS_IOUNIT1_CONTROL_DEV_SAS_SUPPORT             (0x01)
-#define MPI_SAS_IOUNIT1_CONTROL_DEV_SATA_SUPPORT            (0x02)
-
-#define MPI_SAS_IOUNIT1_CONTROL_POSTPONE_SATA_INIT          (0x0100)
-#define MPI_SAS_IOUNIT1_CONTROL_SATA_48BIT_LBA_REQUIRED     (0x0080)
-#define MPI_SAS_IOUNIT1_CONTROL_SATA_SMART_REQUIRED         (0x0040)
-#define MPI_SAS_IOUNIT1_CONTROL_SATA_NCQ_REQUIRED           (0x0020)
-#define MPI_SAS_IOUNIT1_CONTROL_SATA_FUA_REQUIRED           (0x0010)
-#define MPI_SAS_IOUNIT1_CONTROL_PHY_ENABLE_ORDER_HIGH       (0x0008)
-#define MPI_SAS_IOUNIT1_CONTROL_SUBTRACTIVE_ILLEGAL         (0x0004)
-#define MPI_SAS_IOUNIT1_CONTROL_FIRST_LVL_DISC_ONLY         (0x0002)
-#define MPI_SAS_IOUNIT1_CONTROL_CLEAR_AFFILIATION           (0x0001)
-
-/* values for SAS IO Unit Page 1 AdditionalControlFlags */
-#define MPI_SAS_IOUNIT1_ACONTROL_MULTI_PORT_DOMAIN_ILLEGAL          (0x0080)
-#define MPI_SAS_IOUNIT1_ACONTROL_SATA_ASYNCHROUNOUS_NOTIFICATION    (0x0040)
-#define MPI_SAS_IOUNIT1_ACONTROL_HIDE_NONZERO_ATTACHED_PHY_IDENT    (0x0020)
-#define MPI_SAS_IOUNIT1_ACONTROL_PORT_ENABLE_ONLY_SATA_LINK_RESET   (0x0010)
-#define MPI_SAS_IOUNIT1_ACONTROL_OTHER_AFFILIATION_SATA_LINK_RESET  (0x0008)
-#define MPI_SAS_IOUNIT1_ACONTROL_SELF_AFFILIATION_SATA_LINK_RESET   (0x0004)
-#define MPI_SAS_IOUNIT1_ACONTROL_NO_AFFILIATION_SATA_LINK_RESET     (0x0002)
-#define MPI_SAS_IOUNIT1_ACONTROL_ALLOW_TABLE_TO_TABLE               (0x0001)
-
-/* defines for SAS IO Unit Page 1 ReportDeviceMissingDelay */
-#define MPI_SAS_IOUNIT1_REPORT_MISSING_TIMEOUT_MASK         (0x7F)
-#define MPI_SAS_IOUNIT1_REPORT_MISSING_UNIT_16              (0x80)
-
-/* values for SAS IO Unit Page 1 PortFlags */
-#define MPI_SAS_IOUNIT1_PORT_FLAGS_0_TARGET_IOC_NUM         (0x00)
-#define MPI_SAS_IOUNIT1_PORT_FLAGS_1_TARGET_IOC_NUM         (0x04)
-#define MPI_SAS_IOUNIT1_PORT_FLAGS_AUTO_PORT_CONFIG         (0x01)
-
-/* values for SAS IO Unit Page 0 PhyFlags */
-#define MPI_SAS_IOUNIT1_PHY_FLAGS_PHY_DISABLE               (0x04)
-#define MPI_SAS_IOUNIT1_PHY_FLAGS_TX_INVERT                 (0x02)
-#define MPI_SAS_IOUNIT1_PHY_FLAGS_RX_INVERT                 (0x01)
-
-/* values for SAS IO Unit Page 0 MaxMinLinkRate */
-#define MPI_SAS_IOUNIT1_MAX_RATE_MASK                       (0xF0)
-#define MPI_SAS_IOUNIT1_MAX_RATE_1_5                        (0x80)
-#define MPI_SAS_IOUNIT1_MAX_RATE_3_0                        (0x90)
-#define MPI_SAS_IOUNIT1_MIN_RATE_MASK                       (0x0F)
-#define MPI_SAS_IOUNIT1_MIN_RATE_1_5                        (0x08)
-#define MPI_SAS_IOUNIT1_MIN_RATE_3_0                        (0x09)
-
-/* see mpi_sas.h for values for SAS IO Unit Page 1 ControllerPhyDeviceInfo values */
-
-
-typedef struct _CONFIG_PAGE_SAS_IO_UNIT_2
-{
-    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U8                                  NumDevsPerEnclosure;    /* 08h */
-    U8                                  BootDeviceWaitTime;     /* 09h */
-    U16                                 Reserved2;              /* 0Ah */
-    U16                                 MaxPersistentIDs;       /* 0Ch */
-    U16                                 NumPersistentIDsUsed;   /* 0Eh */
-    U8                                  Status;                 /* 10h */
-    U8                                  Flags;                  /* 11h */
-    U16                                 MaxNumPhysicalMappedIDs;/* 12h */
-} CONFIG_PAGE_SAS_IO_UNIT_2, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_2,
-  SasIOUnitPage2_t, MPI_POINTER pSasIOUnitPage2_t;
-
-#define MPI_SASIOUNITPAGE2_PAGEVERSION      (0x07)
-
-/* values for SAS IO Unit Page 2 Status field */
-#define MPI_SAS_IOUNIT2_STATUS_DEVICE_LIMIT_EXCEEDED        (0x08)
-#define MPI_SAS_IOUNIT2_STATUS_ENCLOSURE_DEVICES_UNMAPPED   (0x04)
-#define MPI_SAS_IOUNIT2_STATUS_DISABLED_PERSISTENT_MAPPINGS (0x02)
-#define MPI_SAS_IOUNIT2_STATUS_FULL_PERSISTENT_MAPPINGS     (0x01)
-
-/* values for SAS IO Unit Page 2 Flags field */
-#define MPI_SAS_IOUNIT2_FLAGS_DISABLE_PERSISTENT_MAPPINGS   (0x01)
-/* Physical Mapping Modes */
-#define MPI_SAS_IOUNIT2_FLAGS_MASK_PHYS_MAP_MODE            (0x0E)
-#define MPI_SAS_IOUNIT2_FLAGS_SHIFT_PHYS_MAP_MODE           (1)
-#define MPI_SAS_IOUNIT2_FLAGS_NO_PHYS_MAP                   (0x00)
-#define MPI_SAS_IOUNIT2_FLAGS_DIRECT_ATTACH_PHYS_MAP        (0x01)
-#define MPI_SAS_IOUNIT2_FLAGS_ENCLOSURE_SLOT_PHYS_MAP       (0x02)
-#define MPI_SAS_IOUNIT2_FLAGS_HOST_ASSIGNED_PHYS_MAP        (0x07)
-
-#define MPI_SAS_IOUNIT2_FLAGS_RESERVE_ID_0_FOR_BOOT         (0x10)
-#define MPI_SAS_IOUNIT2_FLAGS_DA_STARTING_SLOT              (0x20)
-
-
-typedef struct _CONFIG_PAGE_SAS_IO_UNIT_3
-{
-    CONFIG_EXTENDED_PAGE_HEADER Header;                         /* 00h */
-    U32                         Reserved1;                      /* 08h */
-    U32                         MaxInvalidDwordCount;           /* 0Ch */
-    U32                         InvalidDwordCountTime;          /* 10h */
-    U32                         MaxRunningDisparityErrorCount;  /* 14h */
-    U32                         RunningDisparityErrorTime;      /* 18h */
-    U32                         MaxLossDwordSynchCount;         /* 1Ch */
-    U32                         LossDwordSynchCountTime;        /* 20h */
-    U32                         MaxPhyResetProblemCount;        /* 24h */
-    U32                         PhyResetProblemTime;            /* 28h */
-} CONFIG_PAGE_SAS_IO_UNIT_3, MPI_POINTER PTR_CONFIG_PAGE_SAS_IO_UNIT_3,
-  SasIOUnitPage3_t, MPI_POINTER pSasIOUnitPage3_t;
-
-#define MPI_SASIOUNITPAGE3_PAGEVERSION      (0x00)
-
-
-/****************************************************************************
-*   SAS Expander Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_SAS_EXPANDER_0
-{
-    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U8                                  PhysicalPort;           /* 08h */
-    U8                                  Reserved1;              /* 09h */
-    U16                                 EnclosureHandle;        /* 0Ah */
-    U64                                 SASAddress;             /* 0Ch */
-    U32                                 DiscoveryStatus;        /* 14h */
-    U16                                 DevHandle;              /* 18h */
-    U16                                 ParentDevHandle;        /* 1Ah */
-    U16                                 ExpanderChangeCount;    /* 1Ch */
-    U16                                 ExpanderRouteIndexes;   /* 1Eh */
-    U8                                  NumPhys;                /* 20h */
-    U8                                  SASLevel;               /* 21h */
-    U8                                  Flags;                  /* 22h */
-    U8                                  Reserved3;              /* 23h */
-} CONFIG_PAGE_SAS_EXPANDER_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_EXPANDER_0,
-  SasExpanderPage0_t, MPI_POINTER pSasExpanderPage0_t;
-
-#define MPI_SASEXPANDER0_PAGEVERSION        (0x03)
-
-/* values for SAS Expander Page 0 DiscoveryStatus field */
-#define MPI_SAS_EXPANDER0_DS_LOOP_DETECTED              (0x00000001)
-#define MPI_SAS_EXPANDER0_DS_UNADDRESSABLE_DEVICE       (0x00000002)
-#define MPI_SAS_EXPANDER0_DS_MULTIPLE_PORTS             (0x00000004)
-#define MPI_SAS_EXPANDER0_DS_EXPANDER_ERR               (0x00000008)
-#define MPI_SAS_EXPANDER0_DS_SMP_TIMEOUT                (0x00000010)
-#define MPI_SAS_EXPANDER0_DS_OUT_ROUTE_ENTRIES          (0x00000020)
-#define MPI_SAS_EXPANDER0_DS_INDEX_NOT_EXIST            (0x00000040)
-#define MPI_SAS_EXPANDER0_DS_SMP_FUNCTION_FAILED        (0x00000080)
-#define MPI_SAS_EXPANDER0_DS_SMP_CRC_ERROR              (0x00000100)
-#define MPI_SAS_EXPANDER0_DS_SUBTRACTIVE_LINK           (0x00000200)
-#define MPI_SAS_EXPANDER0_DS_TABLE_LINK                 (0x00000400)
-#define MPI_SAS_EXPANDER0_DS_UNSUPPORTED_DEVICE         (0x00000800)
-
-/* values for SAS Expander Page 0 Flags field */
-#define MPI_SAS_EXPANDER0_FLAGS_CONNECTOR_END_DEVICE    (0x04)
-#define MPI_SAS_EXPANDER0_FLAGS_ROUTE_TABLE_CONFIG      (0x02)
-#define MPI_SAS_EXPANDER0_FLAGS_CONFIG_IN_PROGRESS      (0x01)
-
-
-typedef struct _CONFIG_PAGE_SAS_EXPANDER_1
-{
-    CONFIG_EXTENDED_PAGE_HEADER Header;                 /* 00h */
-    U8                          PhysicalPort;           /* 08h */
-    U8                          Reserved1;              /* 09h */
-    U16                         Reserved2;              /* 0Ah */
-    U8                          NumPhys;                /* 0Ch */
-    U8                          Phy;                    /* 0Dh */
-    U16                         NumTableEntriesProgrammed; /* 0Eh */
-    U8                          ProgrammedLinkRate;     /* 10h */
-    U8                          HwLinkRate;             /* 11h */
-    U16                         AttachedDevHandle;      /* 12h */
-    U32                         PhyInfo;                /* 14h */
-    U32                         AttachedDeviceInfo;     /* 18h */
-    U16                         OwnerDevHandle;         /* 1Ch */
-    U8                          ChangeCount;            /* 1Eh */
-    U8                          NegotiatedLinkRate;     /* 1Fh */
-    U8                          PhyIdentifier;          /* 20h */
-    U8                          AttachedPhyIdentifier;  /* 21h */
-    U8                          Reserved3;              /* 22h */
-    U8                          DiscoveryInfo;          /* 23h */
-    U32                         Reserved4;              /* 24h */
-} CONFIG_PAGE_SAS_EXPANDER_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_EXPANDER_1,
-  SasExpanderPage1_t, MPI_POINTER pSasExpanderPage1_t;
-
-#define MPI_SASEXPANDER1_PAGEVERSION        (0x01)
-
-/* use MPI_SAS_PHY0_PRATE_ defines for ProgrammedLinkRate */
-
-/* use MPI_SAS_PHY0_HWRATE_ defines for HwLinkRate */
-
-/* use MPI_SAS_PHY0_PHYINFO_ defines for PhyInfo */
-
-/* see mpi_sas.h for values for SAS Expander Page 1 AttachedDeviceInfo values */
-
-/* values for SAS Expander Page 1 DiscoveryInfo field */
-#define MPI_SAS_EXPANDER1_DISCINFO_BAD_PHY_DISABLED     (0x04)
-#define MPI_SAS_EXPANDER1_DISCINFO_LINK_STATUS_CHANGE   (0x02)
-#define MPI_SAS_EXPANDER1_DISCINFO_NO_ROUTING_ENTRIES   (0x01)
-
-/* values for SAS Expander Page 1 NegotiatedLinkRate field */
-#define MPI_SAS_EXPANDER1_NEG_RATE_UNKNOWN              (0x00)
-#define MPI_SAS_EXPANDER1_NEG_RATE_PHY_DISABLED         (0x01)
-#define MPI_SAS_EXPANDER1_NEG_RATE_FAILED_NEGOTIATION   (0x02)
-#define MPI_SAS_EXPANDER1_NEG_RATE_SATA_OOB_COMPLETE    (0x03)
-#define MPI_SAS_EXPANDER1_NEG_RATE_1_5                  (0x08)
-#define MPI_SAS_EXPANDER1_NEG_RATE_3_0                  (0x09)
-
-
-/****************************************************************************
-*   SAS Device Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_SAS_DEVICE_0
-{
-    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U16                                 Slot;                   /* 08h */
-    U16                                 EnclosureHandle;        /* 0Ah */
-    U64                                 SASAddress;             /* 0Ch */
-    U16                                 ParentDevHandle;        /* 14h */
-    U8                                  PhyNum;                 /* 16h */
-    U8                                  AccessStatus;           /* 17h */
-    U16                                 DevHandle;              /* 18h */
-    U8                                  TargetID;               /* 1Ah */
-    U8                                  Bus;                    /* 1Bh */
-    U32                                 DeviceInfo;             /* 1Ch */
-    U16                                 Flags;                  /* 20h */
-    U8                                  PhysicalPort;           /* 22h */
-    U8                                  Reserved2;              /* 23h */
-} CONFIG_PAGE_SAS_DEVICE_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_0,
-  SasDevicePage0_t, MPI_POINTER pSasDevicePage0_t;
-
-#define MPI_SASDEVICE0_PAGEVERSION          (0x05)
-
-/* values for SAS Device Page 0 AccessStatus field */
-#define MPI_SAS_DEVICE0_ASTATUS_NO_ERRORS                   (0x00)
-#define MPI_SAS_DEVICE0_ASTATUS_SATA_INIT_FAILED            (0x01)
-#define MPI_SAS_DEVICE0_ASTATUS_SATA_CAPABILITY_FAILED      (0x02)
-#define MPI_SAS_DEVICE0_ASTATUS_SATA_AFFILIATION_CONFLICT   (0x03)
-#define MPI_SAS_DEVICE0_ASTATUS_SATA_NEEDS_INITIALIZATION   (0x04)
-/* specific values for SATA Init failures */
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_UNKNOWN                 (0x10)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_AFFILIATION_CONFLICT    (0x11)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_DIAG                    (0x12)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_IDENTIFICATION          (0x13)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_CHECK_POWER             (0x14)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_PIO_SN                  (0x15)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_MDMA_SN                 (0x16)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_UDMA_SN                 (0x17)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_ZONING_VIOLATION        (0x18)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_NOT_ADDRESSABLE         (0x19)
-#define MPI_SAS_DEVICE0_ASTATUS_SIF_MAX                     (0x1F)
-
-/* values for SAS Device Page 0 Flags field */
-#define MPI_SAS_DEVICE0_FLAGS_SATA_ASYNCHRONOUS_NOTIFY      (0x0400)
-#define MPI_SAS_DEVICE0_FLAGS_SATA_SW_PRESERVE              (0x0200)
-#define MPI_SAS_DEVICE0_FLAGS_UNSUPPORTED_DEVICE            (0x0100)
-#define MPI_SAS_DEVICE0_FLAGS_SATA_48BIT_LBA_SUPPORTED      (0x0080)
-#define MPI_SAS_DEVICE0_FLAGS_SATA_SMART_SUPPORTED          (0x0040)
-#define MPI_SAS_DEVICE0_FLAGS_SATA_NCQ_SUPPORTED            (0x0020)
-#define MPI_SAS_DEVICE0_FLAGS_SATA_FUA_SUPPORTED            (0x0010)
-#define MPI_SAS_DEVICE0_FLAGS_PORT_SELECTOR_ATTACH          (0x0008)
-#define MPI_SAS_DEVICE0_FLAGS_MAPPING_PERSISTENT            (0x0004)
-#define MPI_SAS_DEVICE0_FLAGS_DEVICE_MAPPED                 (0x0002)
-#define MPI_SAS_DEVICE0_FLAGS_DEVICE_PRESENT                (0x0001)
-
-/* see mpi_sas.h for values for SAS Device Page 0 DeviceInfo values */
-
-
-typedef struct _CONFIG_PAGE_SAS_DEVICE_1
-{
-    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U32                                 Reserved1;              /* 08h */
-    U64                                 SASAddress;             /* 0Ch */
-    U32                                 Reserved2;              /* 14h */
-    U16                                 DevHandle;              /* 18h */
-    U8                                  TargetID;               /* 1Ah */
-    U8                                  Bus;                    /* 1Bh */
-    U8                                  InitialRegDeviceFIS[20];/* 1Ch */
-} CONFIG_PAGE_SAS_DEVICE_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_1,
-  SasDevicePage1_t, MPI_POINTER pSasDevicePage1_t;
-
-#define MPI_SASDEVICE1_PAGEVERSION          (0x00)
-
-
-typedef struct _CONFIG_PAGE_SAS_DEVICE_2
-{
-    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U64                                 PhysicalIdentifier;     /* 08h */
-    U32                                 EnclosureMapping;       /* 10h */
-} CONFIG_PAGE_SAS_DEVICE_2, MPI_POINTER PTR_CONFIG_PAGE_SAS_DEVICE_2,
-  SasDevicePage2_t, MPI_POINTER pSasDevicePage2_t;
-
-#define MPI_SASDEVICE2_PAGEVERSION          (0x01)
-
-/* defines for SAS Device Page 2 EnclosureMapping field */
-#define MPI_SASDEVICE2_ENC_MAP_MASK_MISSING_COUNT       (0x0000000F)
-#define MPI_SASDEVICE2_ENC_MAP_SHIFT_MISSING_COUNT      (0)
-#define MPI_SASDEVICE2_ENC_MAP_MASK_NUM_SLOTS           (0x000007F0)
-#define MPI_SASDEVICE2_ENC_MAP_SHIFT_NUM_SLOTS          (4)
-#define MPI_SASDEVICE2_ENC_MAP_MASK_START_INDEX         (0x001FF800)
-#define MPI_SASDEVICE2_ENC_MAP_SHIFT_START_INDEX        (11)
-
-
-/****************************************************************************
-*   SAS PHY Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_SAS_PHY_0
-{
-    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U16                                 OwnerDevHandle;         /* 08h */
-    U16                                 Reserved1;              /* 0Ah */
-    U64                                 SASAddress;             /* 0Ch */
-    U16                                 AttachedDevHandle;      /* 14h */
-    U8                                  AttachedPhyIdentifier;  /* 16h */
-    U8                                  Reserved2;              /* 17h */
-    U32                                 AttachedDeviceInfo;     /* 18h */
-    U8                                  ProgrammedLinkRate;     /* 1Ch */
-    U8                                  HwLinkRate;             /* 1Dh */
-    U8                                  ChangeCount;            /* 1Eh */
-    U8                                  Flags;                  /* 1Fh */
-    U32                                 PhyInfo;                /* 20h */
-} CONFIG_PAGE_SAS_PHY_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_PHY_0,
-  SasPhyPage0_t, MPI_POINTER pSasPhyPage0_t;
-
-#define MPI_SASPHY0_PAGEVERSION             (0x01)
-
-/* values for SAS PHY Page 0 ProgrammedLinkRate field */
-#define MPI_SAS_PHY0_PRATE_MAX_RATE_MASK                        (0xF0)
-#define MPI_SAS_PHY0_PRATE_MAX_RATE_NOT_PROGRAMMABLE            (0x00)
-#define MPI_SAS_PHY0_PRATE_MAX_RATE_1_5                         (0x80)
-#define MPI_SAS_PHY0_PRATE_MAX_RATE_3_0                         (0x90)
-#define MPI_SAS_PHY0_PRATE_MIN_RATE_MASK                        (0x0F)
-#define MPI_SAS_PHY0_PRATE_MIN_RATE_NOT_PROGRAMMABLE            (0x00)
-#define MPI_SAS_PHY0_PRATE_MIN_RATE_1_5                         (0x08)
-#define MPI_SAS_PHY0_PRATE_MIN_RATE_3_0                         (0x09)
-
-/* values for SAS PHY Page 0 HwLinkRate field */
-#define MPI_SAS_PHY0_HWRATE_MAX_RATE_MASK                       (0xF0)
-#define MPI_SAS_PHY0_HWRATE_MAX_RATE_1_5                        (0x80)
-#define MPI_SAS_PHY0_HWRATE_MAX_RATE_3_0                        (0x90)
-#define MPI_SAS_PHY0_HWRATE_MIN_RATE_MASK                       (0x0F)
-#define MPI_SAS_PHY0_HWRATE_MIN_RATE_1_5                        (0x08)
-#define MPI_SAS_PHY0_HWRATE_MIN_RATE_3_0                        (0x09)
-
-/* values for SAS PHY Page 0 Flags field */
-#define MPI_SAS_PHY0_FLAGS_SGPIO_DIRECT_ATTACH_ENC              (0x01)
-
-/* values for SAS PHY Page 0 PhyInfo field */
-#define MPI_SAS_PHY0_PHYINFO_PHY_VACANT                         (0x80000000)
-#define MPI_SAS_PHY0_PHYINFO_SATA_PORT_ACTIVE                   (0x00004000)
-#define MPI_SAS_PHY0_PHYINFO_SATA_PORT_SELECTOR                 (0x00002000)
-#define MPI_SAS_PHY0_PHYINFO_VIRTUAL_PHY                        (0x00001000)
-
-#define MPI_SAS_PHY0_PHYINFO_MASK_PARTIAL_PATHWAY_TIME          (0x00000F00)
-#define MPI_SAS_PHY0_PHYINFO_SHIFT_PARTIAL_PATHWAY_TIME         (8)
-
-#define MPI_SAS_PHY0_PHYINFO_MASK_ROUTING_ATTRIBUTE             (0x000000F0)
-#define MPI_SAS_PHY0_PHYINFO_DIRECT_ROUTING                     (0x00000000)
-#define MPI_SAS_PHY0_PHYINFO_SUBTRACTIVE_ROUTING                (0x00000010)
-#define MPI_SAS_PHY0_PHYINFO_TABLE_ROUTING                      (0x00000020)
-
-#define MPI_SAS_PHY0_PHYINFO_MASK_LINK_RATE                     (0x0000000F)
-#define MPI_SAS_PHY0_PHYINFO_UNKNOWN_LINK_RATE                  (0x00000000)
-#define MPI_SAS_PHY0_PHYINFO_PHY_DISABLED                       (0x00000001)
-#define MPI_SAS_PHY0_PHYINFO_NEGOTIATION_FAILED                 (0x00000002)
-#define MPI_SAS_PHY0_PHYINFO_SATA_OOB_COMPLETE                  (0x00000003)
-#define MPI_SAS_PHY0_PHYINFO_RATE_1_5                           (0x00000008)
-#define MPI_SAS_PHY0_PHYINFO_RATE_3_0                           (0x00000009)
-
-
-typedef struct _CONFIG_PAGE_SAS_PHY_1
-{
-    CONFIG_EXTENDED_PAGE_HEADER Header;                     /* 00h */
-    U32                         Reserved1;                  /* 08h */
-    U32                         InvalidDwordCount;          /* 0Ch */
-    U32                         RunningDisparityErrorCount; /* 10h */
-    U32                         LossDwordSynchCount;        /* 14h */
-    U32                         PhyResetProblemCount;       /* 18h */
-} CONFIG_PAGE_SAS_PHY_1, MPI_POINTER PTR_CONFIG_PAGE_SAS_PHY_1,
-  SasPhyPage1_t, MPI_POINTER pSasPhyPage1_t;
-
-#define MPI_SASPHY1_PAGEVERSION             (0x00)
-
-
-/****************************************************************************
-*   SAS Enclosure Config Pages
-****************************************************************************/
-
-typedef struct _CONFIG_PAGE_SAS_ENCLOSURE_0
-{
-    CONFIG_EXTENDED_PAGE_HEADER         Header;                 /* 00h */
-    U32                                 Reserved1;              /* 08h */
-    U64                                 EnclosureLogicalID;     /* 0Ch */
-    U16                                 Flags;                  /* 14h */
-    U16                                 EnclosureHandle;        /* 16h */
-    U16                                 NumSlots;               /* 18h */
-    U16                                 StartSlot;              /* 1Ah */
-    U8                                  StartTargetID;          /* 1Ch */
-    U8                                  StartBus;               /* 1Dh */
-    U8                                  SEPTargetID;            /* 1Eh */
-    U8                                  SEPBus;                 /* 1Fh */
-    U32                                 Reserved2;              /* 20h */
-    U32                                 Reserved3;              /* 24h */
-} CONFIG_PAGE_SAS_ENCLOSURE_0, MPI_POINTER PTR_CONFIG_PAGE_SAS_ENCLOSURE_0,
-  SasEnclosurePage0_t, MPI_POINTER pSasEnclosurePage0_t;
-
-#define MPI_SASENCLOSURE0_PAGEVERSION       (0x01)
-
-/* values for SAS Enclosure Page 0 Flags field */
-#define MPI_SAS_ENCLS0_FLAGS_SEP_BUS_ID_VALID       (0x0020)
-#define MPI_SAS_ENCLS0_FLAGS_START_BUS_ID_VALID     (0x0010)
-
-#define MPI_SAS_ENCLS0_FLAGS_MNG_MASK               (0x000F)
-#define MPI_SAS_ENCLS0_FLAGS_MNG_UNKNOWN            (0x0000)
-#define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_SES            (0x0001)
-#define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_SGPIO          (0x0002)
-#define MPI_SAS_ENCLS0_FLAGS_MNG_EXP_SGPIO          (0x0003)
-#define MPI_SAS_ENCLS0_FLAGS_MNG_SES_ENCLOSURE      (0x0004)
-#define MPI_SAS_ENCLS0_FLAGS_MNG_IOC_GPIO           (0x0005)
-
-
-/****************************************************************************
-*   Log Config Pages
-****************************************************************************/
-/*
- * Host code (drivers, BIOS, utilities, etc.) should leave this define set to
- * one and check NumLogEntries at runtime.
- */
-#ifndef MPI_LOG_0_NUM_LOG_ENTRIES
-#define MPI_LOG_0_NUM_LOG_ENTRIES        (1)
-#endif
-
-#define MPI_LOG_0_LOG_DATA_LENGTH        (0x1C)
-
-typedef struct _MPI_LOG_0_ENTRY
-{
-    U32         TimeStamp;                          /* 00h */
-    U32         Reserved1;                          /* 04h */
-    U16         LogSequence;                        /* 08h */
-    U16         LogEntryQualifier;                  /* 0Ah */
-    U8          LogData[MPI_LOG_0_LOG_DATA_LENGTH]; /* 0Ch */
-} MPI_LOG_0_ENTRY, MPI_POINTER PTR_MPI_LOG_0_ENTRY,
-  MpiLog0Entry_t, MPI_POINTER pMpiLog0Entry_t;
-
-/* values for Log Page 0 LogEntry LogEntryQualifier field */
-#define MPI_LOG_0_ENTRY_QUAL_ENTRY_UNUSED           (0x0000)
-#define MPI_LOG_0_ENTRY_QUAL_POWER_ON_RESET         (0x0001)
-
-typedef struct _CONFIG_PAGE_LOG_0
-{
-    CONFIG_EXTENDED_PAGE_HEADER Header;                     /* 00h */
-    U32                         Reserved1;                  /* 08h */
-    U32                         Reserved2;                  /* 0Ch */
-    U16                         NumLogEntries;              /* 10h */
-    U16                         Reserved3;                  /* 12h */
-    MPI_LOG_0_ENTRY             LogEntry[MPI_LOG_0_NUM_LOG_ENTRIES]; /* 14h */
-} CONFIG_PAGE_LOG_0, MPI_POINTER PTR_CONFIG_PAGE_LOG_0,
-  LogPage0_t, MPI_POINTER pLogPage0_t;
-
-#define MPI_LOG_0_PAGEVERSION               (0x01)
-
-
-#endif
-
diff --git a/include.new/dev/mpt/mpilib/mpi_fc.h b/include.new/dev/mpt/mpilib/mpi_fc.h
deleted file mode 100644
index 3975cec..0000000
--- a/include.new/dev/mpt/mpilib/mpi_fc.h
+++ /dev/null
@@ -1,394 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_fc.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * 
- *           Name:  mpi_fc.h
- *          Title:  MPI Fibre Channel messages and structures
- *  Creation Date:  June 12, 2000
- *
- *    mpi_fc.h Version:  01.05.01
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  05-08-00  00.10.01  Original release for 0.10 spec dated 4/26/2000.
- *  06-06-00  01.00.01  Update version number for 1.0 release.
- *  06-12-00  01.00.02  Added _MSG_FC_ABORT_REPLY structure.
- *  11-02-00  01.01.01  Original release for post 1.0 work
- *  12-04-00  01.01.02  Added messages for Common Transport Send and
- *                      Primitive Send.
- *  01-09-01  01.01.03  Modifed some of the new flags to have an MPI prefix
- *                      and modified the FcPrimitiveSend flags.
- *  01-25-01  01.01.04  Move InitiatorIndex in LinkServiceRsp reply to a larger
- *                      field.
- *                      Added FC_ABORT_TYPE_CT_SEND_REQUEST and
- *                      FC_ABORT_TYPE_EXLINKSEND_REQUEST for FcAbort request.
- *                      Added MPI_FC_PRIM_SEND_FLAGS_STOP_SEND.
- *  02-20-01  01.01.05  Started using MPI_POINTER.
- *  03-27-01  01.01.06  Added Flags field to MSG_LINK_SERVICE_BUFFER_POST_REPLY
- *                      and defined MPI_LS_BUF_POST_REPLY_FLAG_NO_RSP_NEEDED.
- *                      Added MPI_FC_PRIM_SEND_FLAGS_RESET_LINK define.
- *                      Added structure offset comments.
- *  04-09-01  01.01.07  Added RspLength field to MSG_LINK_SERVICE_RSP_REQUEST.
- *  08-08-01  01.02.01  Original release for v1.2 work.
- *  09-28-01  01.02.02  Change name of reserved field in
- *                      MSG_LINK_SERVICE_RSP_REPLY.
- *  05-31-02  01.02.03  Adding AliasIndex to FC Direct Access requests.
- *  01-16-04  01.02.04  Added define for MPI_FC_PRIM_SEND_FLAGS_ML_RESET_LINK.
- *  05-11-04  01.03.01  Original release for MPI v1.3.
- *  08-19-04  01.05.01  Original release for MPI v1.5.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_FC_H
-#define MPI_FC_H
-
-
-/*****************************************************************************
-*
-*        F C    D i r e c t    A c c e s s     M e s s a g e s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/* Link Service Buffer Post messages                                        */
-/****************************************************************************/
-
-typedef struct _MSG_LINK_SERVICE_BUFFER_POST_REQUEST
-{
-    U8                      BufferPostFlags;    /* 00h */
-    U8                      BufferCount;        /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved;           /* 04h */
-    U8                      Reserved1;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    SGE_TRANS_SIMPLE_UNION  SGL;
-} MSG_LINK_SERVICE_BUFFER_POST_REQUEST,
- MPI_POINTER PTR_MSG_LINK_SERVICE_BUFFER_POST_REQUEST,
-  LinkServiceBufferPostRequest_t, MPI_POINTER pLinkServiceBufferPostRequest_t;
-
-#define LINK_SERVICE_BUFFER_POST_FLAGS_PORT_MASK (0x01)
-
-typedef struct _WWNFORMAT
-{
-    U32                     PortNameHigh;       /* 00h */
-    U32                     PortNameLow;        /* 04h */
-    U32                     NodeNameHigh;       /* 08h */
-    U32                     NodeNameLow;        /* 0Ch */
-} WWNFORMAT,
-  WwnFormat_t;
-
-/* Link Service Buffer Post Reply */
-typedef struct _MSG_LINK_SERVICE_BUFFER_POST_REPLY
-{
-    U8                      Flags;              /* 00h */
-    U8                      Reserved;           /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved1;          /* 04h */
-    U8                      PortNumber;         /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved2;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     TransferLength;     /* 14h */
-    U32                     TransactionContext; /* 18h */
-    U32                     Rctl_Did;           /* 1Ch */
-    U32                     Csctl_Sid;          /* 20h */
-    U32                     Type_Fctl;          /* 24h */
-    U16                     SeqCnt;             /* 28h */
-    U8                      Dfctl;              /* 2Ah */
-    U8                      SeqId;              /* 2Bh */
-    U16                     Rxid;               /* 2Ch */
-    U16                     Oxid;               /* 2Eh */
-    U32                     Parameter;          /* 30h */
-    WWNFORMAT               Wwn;                /* 34h */
-} MSG_LINK_SERVICE_BUFFER_POST_REPLY, MPI_POINTER PTR_MSG_LINK_SERVICE_BUFFER_POST_REPLY,
-  LinkServiceBufferPostReply_t, MPI_POINTER pLinkServiceBufferPostReply_t;
-
-#define MPI_LS_BUF_POST_REPLY_FLAG_NO_RSP_NEEDED    (0x80)
-
-#define MPI_FC_DID_MASK                             (0x00FFFFFF)
-#define MPI_FC_DID_SHIFT                            (0)
-#define MPI_FC_RCTL_MASK                            (0xFF000000)
-#define MPI_FC_RCTL_SHIFT                           (24)
-#define MPI_FC_SID_MASK                             (0x00FFFFFF)
-#define MPI_FC_SID_SHIFT                            (0)
-#define MPI_FC_CSCTL_MASK                           (0xFF000000)
-#define MPI_FC_CSCTL_SHIFT                          (24)
-#define MPI_FC_FCTL_MASK                            (0x00FFFFFF)
-#define MPI_FC_FCTL_SHIFT                           (0)
-#define MPI_FC_TYPE_MASK                            (0xFF000000)
-#define MPI_FC_TYPE_SHIFT                           (24)
-
-/* obsolete name for the above */
-#define FCP_TARGET_DID_MASK                         (0x00FFFFFF)
-#define FCP_TARGET_DID_SHIFT                        (0)
-#define FCP_TARGET_RCTL_MASK                        (0xFF000000)
-#define FCP_TARGET_RCTL_SHIFT                       (24)
-#define FCP_TARGET_SID_MASK                         (0x00FFFFFF)
-#define FCP_TARGET_SID_SHIFT                        (0)
-#define FCP_TARGET_CSCTL_MASK                       (0xFF000000)
-#define FCP_TARGET_CSCTL_SHIFT                      (24)
-#define FCP_TARGET_FCTL_MASK                        (0x00FFFFFF)
-#define FCP_TARGET_FCTL_SHIFT                       (0)
-#define FCP_TARGET_TYPE_MASK                        (0xFF000000)
-#define FCP_TARGET_TYPE_SHIFT                       (24)
-
-
-/****************************************************************************/
-/* Link Service Response messages                                           */
-/****************************************************************************/
-
-typedef struct _MSG_LINK_SERVICE_RSP_REQUEST
-{
-    U8                      RspFlags;           /* 00h */
-    U8                      RspLength;          /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved1;          /* 04h */
-    U8                      Reserved2;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U32                     Rctl_Did;           /* 0Ch */
-    U32                     Csctl_Sid;          /* 10h */
-    U32                     Type_Fctl;          /* 14h */
-    U16                     SeqCnt;             /* 18h */
-    U8                      Dfctl;              /* 1Ah */
-    U8                      SeqId;              /* 1Bh */
-    U16                     Rxid;               /* 1Ch */
-    U16                     Oxid;               /* 1Eh */
-    U32                     Parameter;          /* 20h */
-    SGE_SIMPLE_UNION        SGL;                /* 24h */
-} MSG_LINK_SERVICE_RSP_REQUEST, MPI_POINTER PTR_MSG_LINK_SERVICE_RSP_REQUEST,
-  LinkServiceRspRequest_t, MPI_POINTER pLinkServiceRspRequest_t;
-
-#define LINK_SERVICE_RSP_FLAGS_IMMEDIATE        (0x80)
-#define LINK_SERVICE_RSP_FLAGS_PORT_MASK        (0x01)
-
-
-/* Link Service Response Reply  */
-typedef struct _MSG_LINK_SERVICE_RSP_REPLY
-{
-    U16                     Reserved;           /* 00h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved1;          /* 04h */
-    U8                      Reserved_0100_InitiatorIndex; /* 06h */ /* obsolete InitiatorIndex */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved3;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     InitiatorIndex;     /* 14h */
-} MSG_LINK_SERVICE_RSP_REPLY, MPI_POINTER PTR_MSG_LINK_SERVICE_RSP_REPLY,
-  LinkServiceRspReply_t, MPI_POINTER pLinkServiceRspReply_t;
-
-
-/****************************************************************************/
-/* Extended Link Service Send messages                                      */
-/****************************************************************************/
-
-typedef struct _MSG_EXLINK_SERVICE_SEND_REQUEST
-{
-    U8                      SendFlags;          /* 00h */
-    U8                      AliasIndex;         /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U32                     MsgFlags_Did;       /* 04h */
-    U32                     MsgContext;         /* 08h */
-    U32                     ElsCommandCode;     /* 0Ch */
-    SGE_SIMPLE_UNION        SGL;                /* 10h */
-} MSG_EXLINK_SERVICE_SEND_REQUEST, MPI_POINTER PTR_MSG_EXLINK_SERVICE_SEND_REQUEST,
-  ExLinkServiceSendRequest_t, MPI_POINTER pExLinkServiceSendRequest_t;
-
-#define EX_LINK_SERVICE_SEND_DID_MASK           (0x00FFFFFF)
-#define EX_LINK_SERVICE_SEND_DID_SHIFT          (0)
-#define EX_LINK_SERVICE_SEND_MSGFLAGS_MASK      (0xFF000000)
-#define EX_LINK_SERVICE_SEND_MSGFLAGS_SHIFT     (24)
-
-
-/* Extended Link Service Send Reply */
-typedef struct _MSG_EXLINK_SERVICE_SEND_REPLY
-{
-    U8                      Reserved;           /* 00h */
-    U8                      AliasIndex;         /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved1;          /* 04h */
-    U8                      Reserved2;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved3;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     ResponseLength;     /* 14h */
-} MSG_EXLINK_SERVICE_SEND_REPLY, MPI_POINTER PTR_MSG_EXLINK_SERVICE_SEND_REPLY,
-  ExLinkServiceSendReply_t, MPI_POINTER pExLinkServiceSendReply_t;
-
-/****************************************************************************/
-/* FC Abort messages                                                        */
-/****************************************************************************/
-
-typedef struct _MSG_FC_ABORT_REQUEST
-{
-    U8                      AbortFlags;                 /* 00h */
-    U8                      AbortType;                  /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     TransactionContextToAbort;  /* 0Ch */
-} MSG_FC_ABORT_REQUEST, MPI_POINTER PTR_MSG_FC_ABORT_REQUEST,
-  FcAbortRequest_t, MPI_POINTER pFcAbortRequest_t;
-
-#define FC_ABORT_FLAG_PORT_MASK                 (0x01)
-
-#define FC_ABORT_TYPE_ALL_FC_BUFFERS            (0x00)
-#define FC_ABORT_TYPE_EXACT_FC_BUFFER           (0x01)
-#define FC_ABORT_TYPE_CT_SEND_REQUEST           (0x02)
-#define FC_ABORT_TYPE_EXLINKSEND_REQUEST        (0x03)
-
-/* FC Abort Reply */
-typedef struct _MSG_FC_ABORT_REPLY
-{
-    U16                     Reserved;           /* 00h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved1;          /* 04h */
-    U8                      Reserved2;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved3;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-} MSG_FC_ABORT_REPLY, MPI_POINTER PTR_MSG_FC_ABORT_REPLY,
-  FcAbortReply_t, MPI_POINTER pFcAbortReply_t;
-
-
-/****************************************************************************/
-/* FC Common Transport Send messages                                        */
-/****************************************************************************/
-
-typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REQUEST
-{
-    U8                      SendFlags;          /* 00h */
-    U8                      AliasIndex;         /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U32                     MsgFlags_Did;       /* 04h */
-    U32                     MsgContext;         /* 08h */
-    U16                     CTCommandCode;      /* 0Ch */
-    U8                      FsType;             /* 0Eh */
-    U8                      Reserved1;          /* 0Fh */
-    SGE_SIMPLE_UNION        SGL;                /* 10h */
-} MSG_FC_COMMON_TRANSPORT_SEND_REQUEST,
- MPI_POINTER PTR_MSG_FC_COMMON_TRANSPORT_SEND_REQUEST,
-  FcCommonTransportSendRequest_t, MPI_POINTER pFcCommonTransportSendRequest_t;
-
-#define MPI_FC_CT_SEND_DID_MASK                 (0x00FFFFFF)
-#define MPI_FC_CT_SEND_DID_SHIFT                (0)
-#define MPI_FC_CT_SEND_MSGFLAGS_MASK            (0xFF000000)
-#define MPI_FC_CT_SEND_MSGFLAGS_SHIFT           (24)
-
-
-/* FC Common Transport Send Reply */
-typedef struct _MSG_FC_COMMON_TRANSPORT_SEND_REPLY
-{
-    U8                      Reserved;           /* 00h */
-    U8                      AliasIndex;         /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved1;          /* 04h */
-    U8                      Reserved2;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved3;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     ResponseLength;     /* 14h */
-} MSG_FC_COMMON_TRANSPORT_SEND_REPLY, MPI_POINTER PTR_MSG_FC_COMMON_TRANSPORT_SEND_REPLY,
-  FcCommonTransportSendReply_t, MPI_POINTER pFcCommonTransportSendReply_t;
-
-
-/****************************************************************************/
-/* FC Primitive Send messages                                               */
-/****************************************************************************/
-
-typedef struct _MSG_FC_PRIMITIVE_SEND_REQUEST
-{
-    U8                      SendFlags;          /* 00h */
-    U8                      Reserved;           /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved1;          /* 04h */
-    U8                      Reserved2;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      FcPrimitive[4];     /* 0Ch */
-} MSG_FC_PRIMITIVE_SEND_REQUEST, MPI_POINTER PTR_MSG_FC_PRIMITIVE_SEND_REQUEST,
-  FcPrimitiveSendRequest_t, MPI_POINTER pFcPrimitiveSendRequest_t;
-
-#define MPI_FC_PRIM_SEND_FLAGS_PORT_MASK       (0x01)
-#define MPI_FC_PRIM_SEND_FLAGS_ML_RESET_LINK   (0x02)
-#define MPI_FC_PRIM_SEND_FLAGS_RESET_LINK      (0x04)
-#define MPI_FC_PRIM_SEND_FLAGS_STOP_SEND       (0x08)
-#define MPI_FC_PRIM_SEND_FLAGS_SEND_ONCE       (0x10)
-#define MPI_FC_PRIM_SEND_FLAGS_SEND_AROUND     (0x20)
-#define MPI_FC_PRIM_SEND_FLAGS_UNTIL_FULL      (0x40)
-#define MPI_FC_PRIM_SEND_FLAGS_FOREVER         (0x80)
-
-/* FC Primitive Send Reply */
-typedef struct _MSG_FC_PRIMITIVE_SEND_REPLY
-{
-    U8                      SendFlags;          /* 00h */
-    U8                      Reserved;           /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved1;          /* 04h */
-    U8                      Reserved2;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved3;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-} MSG_FC_PRIMITIVE_SEND_REPLY, MPI_POINTER PTR_MSG_FC_PRIMITIVE_SEND_REPLY,
-  FcPrimitiveSendReply_t, MPI_POINTER pFcPrimitiveSendReply_t;
-
-#endif
-
diff --git a/include.new/dev/mpt/mpilib/mpi_init.h b/include.new/dev/mpt/mpilib/mpi_init.h
deleted file mode 100644
index 8172018..0000000
--- a/include.new/dev/mpt/mpilib/mpi_init.h
+++ /dev/null
@@ -1,607 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_init.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *           Name:  mpi_init.h
- *          Title:  MPI initiator mode messages and structures
- *  Creation Date:  June 8, 2000
- *
- *    mpi_init.h Version:  01.05.09
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  05-08-00  00.10.01  Original release for 0.10 spec dated 4/26/2000.
- *  05-24-00  00.10.02  Added SenseBufferLength to _MSG_SCSI_IO_REPLY.
- *  06-06-00  01.00.01  Update version number for 1.0 release.
- *  06-08-00  01.00.02  Added MPI_SCSI_RSP_INFO_ definitions.
- *  11-02-00  01.01.01  Original release for post 1.0 work.
- *  12-04-00  01.01.02  Added MPI_SCSIIO_CONTROL_NO_DISCONNECT.
- *  02-20-01  01.01.03  Started using MPI_POINTER.
- *  03-27-01  01.01.04  Added structure offset comments.
- *  04-10-01  01.01.05  Added new MsgFlag for MSG_SCSI_TASK_MGMT.
- *  08-08-01  01.02.01  Original release for v1.2 work.
- *  08-29-01  01.02.02  Added MPI_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET.
- *                      Added MPI_SCSI_STATE_QUEUE_TAG_REJECTED for
- *                      MSG_SCSI_IO_REPLY.
- *  09-28-01  01.02.03  Added structures and defines for SCSI Enclosure
- *                      Processor messages.
- *  10-04-01  01.02.04  Added defines for SEP request Action field.
- *  05-31-02  01.02.05  Added MPI_SCSIIO_MSGFLGS_CMD_DETERMINES_DATA_DIR define
- *                      for SCSI IO requests.
- *  11-15-02  01.02.06  Added special extended SCSI Status defines for FCP.
- *  06-26-03  01.02.07  Added MPI_SCSI_STATUS_FCPEXT_UNASSIGNED define.
- *  05-11-04  01.03.01  Original release for MPI v1.3.
- *  08-19-04  01.05.01  Added MsgFlags defines for EEDP to SCSI IO request.
- *                      Added new word to MSG_SCSI_IO_REPLY to add TaskTag field
- *                      and a reserved U16.
- *                      Added new MSG_SCSI_IO32_REQUEST structure.
- *                      Added a TaskType of Clear Task Set to SCSI
- *                      Task Management request.
- *  12-07-04  01.05.02  Added support for Task Management Query Task.
- *  01-15-05  01.05.03  Modified SCSI Enclosure Processor Request to support
- *                      WWID addressing.
- *  03-11-05  01.05.04  Removed EEDP flags from SCSI IO Request.
- *                      Removed SCSI IO 32 Request.
- *                      Modified SCSI Enclosure Processor Request and Reply to
- *                      support Enclosure/Slot addressing rather than WWID
- *                      addressing.
- *  06-24-05  01.05.05  Added SCSI IO 32 structures and defines.
- *                      Added four new defines for SEP SlotStatus.
- *  08-03-05  01.05.06  Fixed some MPI_SCSIIO32_MSGFLGS_ defines to make them
- *                      unique in the first 32 characters.
- *  03-27-06  01.05.07  Added Task Management type of Clear ACA.
- *  10-11-06  01.05.08  Shortened define for Task Management type of Clear ACA.
- *  02-28-07  01.05.09  Defined two new MsgFlags bits for SCSI Task Management
- *                      Request: Do Not Send Task IU and Soft Reset Option.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_INIT_H
-#define MPI_INIT_H
-
-
-/*****************************************************************************
-*
-*               S C S I    I n i t i a t o r    M e s s a g e s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/*  SCSI IO messages and associated structures                              */
-/****************************************************************************/
-
-typedef struct _MSG_SCSI_IO_REQUEST
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      CDBLength;          /* 04h */
-    U8                      SenseBufferLength;  /* 05h */
-    U8                      Reserved;           /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      LUN[8];             /* 0Ch */
-    U32                     Control;            /* 14h */
-    U8                      CDB[16];            /* 18h */
-    U32                     DataLength;         /* 28h */
-    U32                     SenseBufferLowAddr; /* 2Ch */
-    SGE_IO_UNION            SGL;                /* 30h */
-} MSG_SCSI_IO_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO_REQUEST,
-  SCSIIORequest_t, MPI_POINTER pSCSIIORequest_t;
-
-
-/* SCSI IO MsgFlags bits */
-
-#define MPI_SCSIIO_MSGFLGS_SENSE_WIDTH              (0x01)
-#define MPI_SCSIIO_MSGFLGS_SENSE_WIDTH_32           (0x00)
-#define MPI_SCSIIO_MSGFLGS_SENSE_WIDTH_64           (0x01)
-
-#define MPI_SCSIIO_MSGFLGS_SENSE_LOCATION           (0x02)
-#define MPI_SCSIIO_MSGFLGS_SENSE_LOC_HOST           (0x00)
-#define MPI_SCSIIO_MSGFLGS_SENSE_LOC_IOC            (0x02)
-
-#define MPI_SCSIIO_MSGFLGS_CMD_DETERMINES_DATA_DIR  (0x04)
-
-/* SCSI IO LUN fields */
-
-#define MPI_SCSIIO_LUN_FIRST_LEVEL_ADDRESSING   (0x0000FFFF)
-#define MPI_SCSIIO_LUN_SECOND_LEVEL_ADDRESSING  (0xFFFF0000)
-#define MPI_SCSIIO_LUN_THIRD_LEVEL_ADDRESSING   (0x0000FFFF)
-#define MPI_SCSIIO_LUN_FOURTH_LEVEL_ADDRESSING  (0xFFFF0000)
-#define MPI_SCSIIO_LUN_LEVEL_1_WORD             (0xFF00)
-#define MPI_SCSIIO_LUN_LEVEL_1_DWORD            (0x0000FF00)
-
-/* SCSI IO Control bits */
-
-#define MPI_SCSIIO_CONTROL_DATADIRECTION_MASK   (0x03000000)
-#define MPI_SCSIIO_CONTROL_NODATATRANSFER       (0x00000000)
-#define MPI_SCSIIO_CONTROL_WRITE                (0x01000000)
-#define MPI_SCSIIO_CONTROL_READ                 (0x02000000)
-
-#define MPI_SCSIIO_CONTROL_ADDCDBLEN_MASK       (0x3C000000)
-#define MPI_SCSIIO_CONTROL_ADDCDBLEN_SHIFT      (26)
-
-#define MPI_SCSIIO_CONTROL_TASKATTRIBUTE_MASK   (0x00000700)
-#define MPI_SCSIIO_CONTROL_SIMPLEQ              (0x00000000)
-#define MPI_SCSIIO_CONTROL_HEADOFQ              (0x00000100)
-#define MPI_SCSIIO_CONTROL_ORDEREDQ             (0x00000200)
-#define MPI_SCSIIO_CONTROL_ACAQ                 (0x00000400)
-#define MPI_SCSIIO_CONTROL_UNTAGGED             (0x00000500)
-#define MPI_SCSIIO_CONTROL_NO_DISCONNECT        (0x00000700)
-
-#define MPI_SCSIIO_CONTROL_TASKMANAGE_MASK      (0x00FF0000)
-#define MPI_SCSIIO_CONTROL_OBSOLETE             (0x00800000)
-#define MPI_SCSIIO_CONTROL_CLEAR_ACA_RSV        (0x00400000)
-#define MPI_SCSIIO_CONTROL_TARGET_RESET         (0x00200000)
-#define MPI_SCSIIO_CONTROL_LUN_RESET_RSV        (0x00100000)
-#define MPI_SCSIIO_CONTROL_RESERVED             (0x00080000)
-#define MPI_SCSIIO_CONTROL_CLR_TASK_SET_RSV     (0x00040000)
-#define MPI_SCSIIO_CONTROL_ABORT_TASK_SET       (0x00020000)
-#define MPI_SCSIIO_CONTROL_RESERVED2            (0x00010000)
-
-
-/* SCSI IO reply structure */
-typedef struct _MSG_SCSI_IO_REPLY
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      CDBLength;          /* 04h */
-    U8                      SenseBufferLength;  /* 05h */
-    U8                      Reserved;           /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      SCSIStatus;         /* 0Ch */
-    U8                      SCSIState;          /* 0Dh */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     TransferCount;      /* 14h */
-    U32                     SenseCount;         /* 18h */
-    U32                     ResponseInfo;       /* 1Ch */
-    U16                     TaskTag;            /* 20h */
-    U16                     Reserved1;          /* 22h */
-} MSG_SCSI_IO_REPLY, MPI_POINTER PTR_MSG_SCSI_IO_REPLY,
-  SCSIIOReply_t, MPI_POINTER pSCSIIOReply_t;
-
-
-/* SCSI IO Reply SCSIStatus values (SAM-2 status codes) */
-
-#define MPI_SCSI_STATUS_SUCCESS                 (0x00)
-#define MPI_SCSI_STATUS_CHECK_CONDITION         (0x02)
-#define MPI_SCSI_STATUS_CONDITION_MET           (0x04)
-#define MPI_SCSI_STATUS_BUSY                    (0x08)
-#define MPI_SCSI_STATUS_INTERMEDIATE            (0x10)
-#define MPI_SCSI_STATUS_INTERMEDIATE_CONDMET    (0x14)
-#define MPI_SCSI_STATUS_RESERVATION_CONFLICT    (0x18)
-#define MPI_SCSI_STATUS_COMMAND_TERMINATED      (0x22)
-#define MPI_SCSI_STATUS_TASK_SET_FULL           (0x28)
-#define MPI_SCSI_STATUS_ACA_ACTIVE              (0x30)
-
-#define MPI_SCSI_STATUS_FCPEXT_DEVICE_LOGGED_OUT    (0x80)
-#define MPI_SCSI_STATUS_FCPEXT_NO_LINK              (0x81)
-#define MPI_SCSI_STATUS_FCPEXT_UNASSIGNED           (0x82)
-
-
-/* SCSI IO Reply SCSIState values */
-
-#define MPI_SCSI_STATE_AUTOSENSE_VALID          (0x01)
-#define MPI_SCSI_STATE_AUTOSENSE_FAILED         (0x02)
-#define MPI_SCSI_STATE_NO_SCSI_STATUS           (0x04)
-#define MPI_SCSI_STATE_TERMINATED               (0x08)
-#define MPI_SCSI_STATE_RESPONSE_INFO_VALID      (0x10)
-#define MPI_SCSI_STATE_QUEUE_TAG_REJECTED       (0x20)
-
-/* SCSI IO Reply ResponseInfo values */
-/* (FCP-1 RSP_CODE values and SPI-3 Packetized Failure codes) */
-
-#define MPI_SCSI_RSP_INFO_FUNCTION_COMPLETE     (0x00000000)
-#define MPI_SCSI_RSP_INFO_FCP_BURST_LEN_ERROR   (0x01000000)
-#define MPI_SCSI_RSP_INFO_CMND_FIELDS_INVALID   (0x02000000)
-#define MPI_SCSI_RSP_INFO_FCP_DATA_RO_ERROR     (0x03000000)
-#define MPI_SCSI_RSP_INFO_TASK_MGMT_UNSUPPORTED (0x04000000)
-#define MPI_SCSI_RSP_INFO_TASK_MGMT_FAILED      (0x05000000)
-#define MPI_SCSI_RSP_INFO_SPI_LQ_INVALID_TYPE   (0x06000000)
-
-#define MPI_SCSI_TASKTAG_UNKNOWN                (0xFFFF)
-
-
-/****************************************************************************/
-/*  SCSI IO 32 messages and associated structures                           */
-/****************************************************************************/
-
-typedef struct
-{
-    U8                      CDB[20];                    /* 00h */
-    U32                     PrimaryReferenceTag;        /* 14h */
-    U16                     PrimaryApplicationTag;      /* 18h */
-    U16                     PrimaryApplicationTagMask;  /* 1Ah */
-    U32                     TransferLength;             /* 1Ch */
-} MPI_SCSI_IO32_CDB_EEDP32, MPI_POINTER PTR_MPI_SCSI_IO32_CDB_EEDP32,
-  MpiScsiIo32CdbEedp32_t, MPI_POINTER pMpiScsiIo32CdbEedp32_t;
-
-typedef struct
-{
-    U8                      CDB[16];                    /* 00h */
-    U32                     DataLength;                 /* 10h */
-    U32                     PrimaryReferenceTag;        /* 14h */
-    U16                     PrimaryApplicationTag;      /* 18h */
-    U16                     PrimaryApplicationTagMask;  /* 1Ah */
-    U32                     TransferLength;             /* 1Ch */
-} MPI_SCSI_IO32_CDB_EEDP16, MPI_POINTER PTR_MPI_SCSI_IO32_CDB_EEDP16,
-  MpiScsiIo32CdbEedp16_t, MPI_POINTER pMpiScsiIo32CdbEedp16_t;
-
-typedef union
-{
-    U8                       CDB32[32];
-    MPI_SCSI_IO32_CDB_EEDP32 EEDP32;
-    MPI_SCSI_IO32_CDB_EEDP16 EEDP16;
-    SGE_SIMPLE_UNION         SGE;
-} MPI_SCSI_IO32_CDB_UNION, MPI_POINTER PTR_MPI_SCSI_IO32_CDB_UNION,
-  MpiScsiIo32Cdb_t, MPI_POINTER pMpiScsiIo32Cdb_t;
-
-typedef struct
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U16                     Reserved1;          /* 02h */
-    U32                     Reserved2;          /* 04h */
-} MPI_SCSI_IO32_BUS_TARGET_ID_FORM, MPI_POINTER PTR_MPI_SCSI_IO32_BUS_TARGET_ID_FORM,
-  MpiScsiIo32BusTargetIdForm_t, MPI_POINTER pMpiScsiIo32BusTargetIdForm_t;
-
-typedef union
-{
-    MPI_SCSI_IO32_BUS_TARGET_ID_FORM    SCSIID;
-    U64                                 WWID;
-} MPI_SCSI_IO32_ADDRESS, MPI_POINTER PTR_MPI_SCSI_IO32_ADDRESS,
-  MpiScsiIo32Address_t, MPI_POINTER pMpiScsiIo32Address_t;
-
-typedef struct _MSG_SCSI_IO32_REQUEST
-{
-    U8                          Port;                           /* 00h */
-    U8                          Reserved1;                      /* 01h */
-    U8                          ChainOffset;                    /* 02h */
-    U8                          Function;                       /* 03h */
-    U8                          CDBLength;                      /* 04h */
-    U8                          SenseBufferLength;              /* 05h */
-    U8                          Flags;                          /* 06h */
-    U8                          MsgFlags;                       /* 07h */
-    U32                         MsgContext;                     /* 08h */
-    U8                          LUN[8];                         /* 0Ch */
-    U32                         Control;                        /* 14h */
-    MPI_SCSI_IO32_CDB_UNION     CDB;                            /* 18h */
-    U32                         DataLength;                     /* 38h */
-    U32                         BidirectionalDataLength;        /* 3Ch */
-    U32                         SecondaryReferenceTag;          /* 40h */
-    U16                         SecondaryApplicationTag;        /* 44h */
-    U16                         Reserved2;                      /* 46h */
-    U16                         EEDPFlags;                      /* 48h */
-    U16                         ApplicationTagTranslationMask;  /* 4Ah */
-    U32                         EEDPBlockSize;                  /* 4Ch */
-    MPI_SCSI_IO32_ADDRESS       DeviceAddress;                  /* 50h */
-    U8                          SGLOffset0;                     /* 58h */
-    U8                          SGLOffset1;                     /* 59h */
-    U8                          SGLOffset2;                     /* 5Ah */
-    U8                          SGLOffset3;                     /* 5Bh */
-    U32                         Reserved3;                      /* 5Ch */
-    U32                         Reserved4;                      /* 60h */
-    U32                         SenseBufferLowAddr;             /* 64h */
-    SGE_IO_UNION                SGL;                            /* 68h */
-} MSG_SCSI_IO32_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO32_REQUEST,
-  SCSIIO32Request_t, MPI_POINTER pSCSIIO32Request_t;
-
-/* SCSI IO 32 MsgFlags bits */
-#define MPI_SCSIIO32_MSGFLGS_SENSE_WIDTH                (0x01)
-#define MPI_SCSIIO32_MSGFLGS_32_SENSE_WIDTH             (0x00)
-#define MPI_SCSIIO32_MSGFLGS_64_SENSE_WIDTH             (0x01)
-
-#define MPI_SCSIIO32_MSGFLGS_SENSE_LOCATION             (0x02)
-#define MPI_SCSIIO32_MSGFLGS_SENSE_LOC_HOST             (0x00)
-#define MPI_SCSIIO32_MSGFLGS_SENSE_LOC_IOC              (0x02)
-
-#define MPI_SCSIIO32_MSGFLGS_CMD_DETERMINES_DATA_DIR    (0x04)
-#define MPI_SCSIIO32_MSGFLGS_SGL_OFFSETS_CHAINS         (0x08)
-#define MPI_SCSIIO32_MSGFLGS_MULTICAST                  (0x10)
-#define MPI_SCSIIO32_MSGFLGS_BIDIRECTIONAL              (0x20)
-#define MPI_SCSIIO32_MSGFLGS_LARGE_CDB                  (0x40)
-
-/* SCSI IO 32 Flags bits */
-#define MPI_SCSIIO32_FLAGS_FORM_MASK                    (0x03)
-#define MPI_SCSIIO32_FLAGS_FORM_SCSIID                  (0x00)
-#define MPI_SCSIIO32_FLAGS_FORM_WWID                    (0x01)
-
-/* SCSI IO 32 LUN fields */
-#define MPI_SCSIIO32_LUN_FIRST_LEVEL_ADDRESSING     (0x0000FFFF)
-#define MPI_SCSIIO32_LUN_SECOND_LEVEL_ADDRESSING    (0xFFFF0000)
-#define MPI_SCSIIO32_LUN_THIRD_LEVEL_ADDRESSING     (0x0000FFFF)
-#define MPI_SCSIIO32_LUN_FOURTH_LEVEL_ADDRESSING    (0xFFFF0000)
-#define MPI_SCSIIO32_LUN_LEVEL_1_WORD               (0xFF00)
-#define MPI_SCSIIO32_LUN_LEVEL_1_DWORD              (0x0000FF00)
-
-/* SCSI IO 32 Control bits */
-#define MPI_SCSIIO32_CONTROL_DATADIRECTION_MASK     (0x03000000)
-#define MPI_SCSIIO32_CONTROL_NODATATRANSFER         (0x00000000)
-#define MPI_SCSIIO32_CONTROL_WRITE                  (0x01000000)
-#define MPI_SCSIIO32_CONTROL_READ                   (0x02000000)
-#define MPI_SCSIIO32_CONTROL_BIDIRECTIONAL          (0x03000000)
-
-#define MPI_SCSIIO32_CONTROL_ADDCDBLEN_MASK         (0xFC000000)
-#define MPI_SCSIIO32_CONTROL_ADDCDBLEN_SHIFT        (26)
-
-#define MPI_SCSIIO32_CONTROL_TASKATTRIBUTE_MASK     (0x00000700)
-#define MPI_SCSIIO32_CONTROL_SIMPLEQ                (0x00000000)
-#define MPI_SCSIIO32_CONTROL_HEADOFQ                (0x00000100)
-#define MPI_SCSIIO32_CONTROL_ORDEREDQ               (0x00000200)
-#define MPI_SCSIIO32_CONTROL_ACAQ                   (0x00000400)
-#define MPI_SCSIIO32_CONTROL_UNTAGGED               (0x00000500)
-#define MPI_SCSIIO32_CONTROL_NO_DISCONNECT          (0x00000700)
-
-#define MPI_SCSIIO32_CONTROL_TASKMANAGE_MASK        (0x00FF0000)
-#define MPI_SCSIIO32_CONTROL_OBSOLETE               (0x00800000)
-#define MPI_SCSIIO32_CONTROL_CLEAR_ACA_RSV          (0x00400000)
-#define MPI_SCSIIO32_CONTROL_TARGET_RESET           (0x00200000)
-#define MPI_SCSIIO32_CONTROL_LUN_RESET_RSV          (0x00100000)
-#define MPI_SCSIIO32_CONTROL_RESERVED               (0x00080000)
-#define MPI_SCSIIO32_CONTROL_CLR_TASK_SET_RSV       (0x00040000)
-#define MPI_SCSIIO32_CONTROL_ABORT_TASK_SET         (0x00020000)
-#define MPI_SCSIIO32_CONTROL_RESERVED2              (0x00010000)
-
-/* SCSI IO 32 EEDPFlags */
-#define MPI_SCSIIO32_EEDPFLAGS_MASK_OP              (0x0007)
-#define MPI_SCSIIO32_EEDPFLAGS_NOOP_OP              (0x0000)
-#define MPI_SCSIIO32_EEDPFLAGS_CHK_OP               (0x0001)
-#define MPI_SCSIIO32_EEDPFLAGS_STRIP_OP             (0x0002)
-#define MPI_SCSIIO32_EEDPFLAGS_CHKRM_OP             (0x0003)
-#define MPI_SCSIIO32_EEDPFLAGS_INSERT_OP            (0x0004)
-#define MPI_SCSIIO32_EEDPFLAGS_REPLACE_OP           (0x0006)
-#define MPI_SCSIIO32_EEDPFLAGS_CHKREGEN_OP          (0x0007)
-
-#define MPI_SCSIIO32_EEDPFLAGS_PASS_REF_TAG         (0x0008)
-#define MPI_SCSIIO32_EEDPFLAGS_8_9THS_MODE          (0x0010)
-
-#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_MASK         (0x0700)
-#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_GUARD        (0x0100)
-#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_REFTAG       (0x0200)
-#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_LBATAG       (0x0400)
-#define MPI_SCSIIO32_EEDPFLAGS_T10_CHK_SHIFT        (8)
-
-#define MPI_SCSIIO32_EEDPFLAGS_INC_SEC_APPTAG       (0x1000)
-#define MPI_SCSIIO32_EEDPFLAGS_INC_PRI_APPTAG       (0x2000)
-#define MPI_SCSIIO32_EEDPFLAGS_INC_SEC_REFTAG       (0x4000)
-#define MPI_SCSIIO32_EEDPFLAGS_INC_PRI_REFTAG       (0x8000)
-
-
-/* SCSIIO32 IO reply structure */
-typedef struct _MSG_SCSIIO32_IO_REPLY
-{
-    U8                      Port;                       /* 00h */
-    U8                      Reserved1;                  /* 01h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      CDBLength;                  /* 04h */
-    U8                      SenseBufferLength;          /* 05h */
-    U8                      Flags;                      /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U8                      SCSIStatus;                 /* 0Ch */
-    U8                      SCSIState;                  /* 0Dh */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-    U32                     TransferCount;              /* 14h */
-    U32                     SenseCount;                 /* 18h */
-    U32                     ResponseInfo;               /* 1Ch */
-    U16                     TaskTag;                    /* 20h */
-    U16                     Reserved2;                  /* 22h */
-    U32                     BidirectionalTransferCount; /* 24h */
-} MSG_SCSIIO32_IO_REPLY, MPI_POINTER PTR_MSG_SCSIIO32_IO_REPLY,
-  SCSIIO32Reply_t, MPI_POINTER pSCSIIO32Reply_t;
-
-
-/****************************************************************************/
-/*  SCSI Task Management messages                                           */
-/****************************************************************************/
-
-typedef struct _MSG_SCSI_TASK_MGMT
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      Reserved;           /* 04h */
-    U8                      TaskType;           /* 05h */
-    U8                      Reserved1;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      LUN[8];             /* 0Ch */
-    U32                     Reserved2[7];       /* 14h */
-    U32                     TaskMsgContext;     /* 30h */
-} MSG_SCSI_TASK_MGMT, MPI_POINTER PTR_SCSI_TASK_MGMT,
-  SCSITaskMgmt_t, MPI_POINTER pSCSITaskMgmt_t;
-
-/* TaskType values */
-
-#define MPI_SCSITASKMGMT_TASKTYPE_ABORT_TASK            (0x01)
-#define MPI_SCSITASKMGMT_TASKTYPE_ABRT_TASK_SET         (0x02)
-#define MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET          (0x03)
-#define MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS             (0x04)
-#define MPI_SCSITASKMGMT_TASKTYPE_LOGICAL_UNIT_RESET    (0x05)
-#define MPI_SCSITASKMGMT_TASKTYPE_CLEAR_TASK_SET        (0x06)
-#define MPI_SCSITASKMGMT_TASKTYPE_QUERY_TASK            (0x07)
-#define MPI_SCSITASKMGMT_TASKTYPE_CLR_ACA               (0x08)
-
-/* MsgFlags bits */
-#define MPI_SCSITASKMGMT_MSGFLAGS_DO_NOT_SEND_TASK_IU   (0x01)
-
-#define MPI_SCSITASKMGMT_MSGFLAGS_TARGET_RESET_OPTION   (0x00)
-#define MPI_SCSITASKMGMT_MSGFLAGS_LIP_RESET_OPTION      (0x02)
-#define MPI_SCSITASKMGMT_MSGFLAGS_LIPRESET_RESET_OPTION (0x04)
-
-#define MPI_SCSITASKMGMT_MSGFLAGS_SOFT_RESET_OPTION     (0x08)
-
-/* SCSI Task Management Reply */
-typedef struct _MSG_SCSI_TASK_MGMT_REPLY
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      ResponseCode;       /* 04h */
-    U8                      TaskType;           /* 05h */
-    U8                      Reserved1;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      Reserved2[2];       /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     TerminationCount;   /* 14h */
-} MSG_SCSI_TASK_MGMT_REPLY, MPI_POINTER PTR_MSG_SCSI_TASK_MGMT_REPLY,
-  SCSITaskMgmtReply_t, MPI_POINTER pSCSITaskMgmtReply_t;
-
-/* ResponseCode values */
-#define MPI_SCSITASKMGMT_RSP_TM_COMPLETE                (0x00)
-#define MPI_SCSITASKMGMT_RSP_INVALID_FRAME              (0x02)
-#define MPI_SCSITASKMGMT_RSP_TM_NOT_SUPPORTED           (0x04)
-#define MPI_SCSITASKMGMT_RSP_TM_FAILED                  (0x05)
-#define MPI_SCSITASKMGMT_RSP_TM_SUCCEEDED               (0x08)
-#define MPI_SCSITASKMGMT_RSP_TM_INVALID_LUN             (0x09)
-#define MPI_SCSITASKMGMT_RSP_IO_QUEUED_ON_IOC           (0x80)
-
-
-/****************************************************************************/
-/*  SCSI Enclosure Processor messages                                       */
-/****************************************************************************/
-
-typedef struct _MSG_SEP_REQUEST
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      Action;             /* 04h */
-    U8                      Flags;              /* 05h */
-    U8                      Reserved1;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U32                     SlotStatus;         /* 0Ch */
-    U32                     Reserved2;          /* 10h */
-    U32                     Reserved3;          /* 14h */
-    U32                     Reserved4;          /* 18h */
-    U16                     Slot;               /* 1Ch */
-    U16                     EnclosureHandle;    /* 1Eh */
-} MSG_SEP_REQUEST, MPI_POINTER PTR_MSG_SEP_REQUEST,
-  SEPRequest_t, MPI_POINTER pSEPRequest_t;
-
-/* Action defines */
-#define MPI_SEP_REQ_ACTION_WRITE_STATUS                 (0x00)
-#define MPI_SEP_REQ_ACTION_READ_STATUS                  (0x01)
-
-/* Flags defines */
-#define MPI_SEP_REQ_FLAGS_ENCLOSURE_SLOT_ADDRESS        (0x01)
-#define MPI_SEP_REQ_FLAGS_BUS_TARGETID_ADDRESS          (0x00)
-
-/* SlotStatus bits for MSG_SEP_REQUEST */
-#define MPI_SEP_REQ_SLOTSTATUS_NO_ERROR                 (0x00000001)
-#define MPI_SEP_REQ_SLOTSTATUS_DEV_FAULTY               (0x00000002)
-#define MPI_SEP_REQ_SLOTSTATUS_DEV_REBUILDING           (0x00000004)
-#define MPI_SEP_REQ_SLOTSTATUS_IN_FAILED_ARRAY          (0x00000008)
-#define MPI_SEP_REQ_SLOTSTATUS_IN_CRITICAL_ARRAY        (0x00000010)
-#define MPI_SEP_REQ_SLOTSTATUS_PARITY_CHECK             (0x00000020)
-#define MPI_SEP_REQ_SLOTSTATUS_PREDICTED_FAULT          (0x00000040)
-#define MPI_SEP_REQ_SLOTSTATUS_UNCONFIGURED             (0x00000080)
-#define MPI_SEP_REQ_SLOTSTATUS_HOT_SPARE                (0x00000100)
-#define MPI_SEP_REQ_SLOTSTATUS_REBUILD_STOPPED          (0x00000200)
-#define MPI_SEP_REQ_SLOTSTATUS_REQ_CONSISTENCY_CHECK    (0x00001000)
-#define MPI_SEP_REQ_SLOTSTATUS_DISABLE                  (0x00002000)
-#define MPI_SEP_REQ_SLOTSTATUS_REQ_RESERVED_DEVICE      (0x00004000)
-#define MPI_SEP_REQ_SLOTSTATUS_IDENTIFY_REQUEST         (0x00020000)
-#define MPI_SEP_REQ_SLOTSTATUS_REQUEST_REMOVE           (0x00040000)
-#define MPI_SEP_REQ_SLOTSTATUS_REQUEST_INSERT           (0x00080000)
-#define MPI_SEP_REQ_SLOTSTATUS_DO_NOT_MOVE              (0x00400000)
-#define MPI_SEP_REQ_SLOTSTATUS_ACTIVE                   (0x00800000)
-#define MPI_SEP_REQ_SLOTSTATUS_B_ENABLE_BYPASS          (0x04000000)
-#define MPI_SEP_REQ_SLOTSTATUS_A_ENABLE_BYPASS          (0x08000000)
-#define MPI_SEP_REQ_SLOTSTATUS_DEV_OFF                  (0x10000000)
-#define MPI_SEP_REQ_SLOTSTATUS_SWAP_RESET               (0x80000000)
-
-
-typedef struct _MSG_SEP_REPLY
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      Action;             /* 04h */
-    U8                      Reserved1;          /* 05h */
-    U8                      Reserved2;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved3;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     SlotStatus;         /* 14h */
-    U32                     Reserved4;          /* 18h */
-    U16                     Slot;               /* 1Ch */
-    U16                     EnclosureHandle;    /* 1Eh */
-} MSG_SEP_REPLY, MPI_POINTER PTR_MSG_SEP_REPLY,
-  SEPReply_t, MPI_POINTER pSEPReply_t;
-
-/* SlotStatus bits for MSG_SEP_REPLY */
-#define MPI_SEP_REPLY_SLOTSTATUS_NO_ERROR               (0x00000001)
-#define MPI_SEP_REPLY_SLOTSTATUS_DEV_FAULTY             (0x00000002)
-#define MPI_SEP_REPLY_SLOTSTATUS_DEV_REBUILDING         (0x00000004)
-#define MPI_SEP_REPLY_SLOTSTATUS_IN_FAILED_ARRAY        (0x00000008)
-#define MPI_SEP_REPLY_SLOTSTATUS_IN_CRITICAL_ARRAY      (0x00000010)
-#define MPI_SEP_REPLY_SLOTSTATUS_PARITY_CHECK           (0x00000020)
-#define MPI_SEP_REPLY_SLOTSTATUS_PREDICTED_FAULT        (0x00000040)
-#define MPI_SEP_REPLY_SLOTSTATUS_UNCONFIGURED           (0x00000080)
-#define MPI_SEP_REPLY_SLOTSTATUS_HOT_SPARE              (0x00000100)
-#define MPI_SEP_REPLY_SLOTSTATUS_REBUILD_STOPPED        (0x00000200)
-#define MPI_SEP_REPLY_SLOTSTATUS_CONSISTENCY_CHECK      (0x00001000)
-#define MPI_SEP_REPLY_SLOTSTATUS_DISABLE                (0x00002000)
-#define MPI_SEP_REPLY_SLOTSTATUS_RESERVED_DEVICE        (0x00004000)
-#define MPI_SEP_REPLY_SLOTSTATUS_REPORT                 (0x00010000)
-#define MPI_SEP_REPLY_SLOTSTATUS_IDENTIFY_REQUEST       (0x00020000)
-#define MPI_SEP_REPLY_SLOTSTATUS_REMOVE_READY           (0x00040000)
-#define MPI_SEP_REPLY_SLOTSTATUS_INSERT_READY           (0x00080000)
-#define MPI_SEP_REPLY_SLOTSTATUS_DO_NOT_REMOVE          (0x00400000)
-#define MPI_SEP_REPLY_SLOTSTATUS_ACTIVE                 (0x00800000)
-#define MPI_SEP_REPLY_SLOTSTATUS_B_BYPASS_ENABLED       (0x01000000)
-#define MPI_SEP_REPLY_SLOTSTATUS_A_BYPASS_ENABLED       (0x02000000)
-#define MPI_SEP_REPLY_SLOTSTATUS_B_ENABLE_BYPASS        (0x04000000)
-#define MPI_SEP_REPLY_SLOTSTATUS_A_ENABLE_BYPASS        (0x08000000)
-#define MPI_SEP_REPLY_SLOTSTATUS_DEV_OFF                (0x10000000)
-#define MPI_SEP_REPLY_SLOTSTATUS_FAULT_SENSED           (0x40000000)
-#define MPI_SEP_REPLY_SLOTSTATUS_SWAPPED                (0x80000000)
-
-#endif
diff --git a/include.new/dev/mpt/mpilib/mpi_ioc.h b/include.new/dev/mpt/mpilib/mpi_ioc.h
deleted file mode 100644
index 51b9593..0000000
--- a/include.new/dev/mpt/mpilib/mpi_ioc.h
+++ /dev/null
@@ -1,1234 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_ioc.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *           Name:  mpi_ioc.h
- *          Title:  MPI IOC, Port, Event, FW Download, and FW Upload messages
- *  Creation Date:  August 11, 2000
- *
- *    mpi_ioc.h Version:  01.05.16
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  05-08-00  00.10.01  Original release for 0.10 spec dated 4/26/2000.
- *  05-24-00  00.10.02  Added _MSG_IOC_INIT_REPLY structure.
- *  06-06-00  01.00.01  Added CurReplyFrameSize field to _MSG_IOC_FACTS_REPLY.
- *  06-12-00  01.00.02  Added _MSG_PORT_ENABLE_REPLY structure.
- *                      Added _MSG_EVENT_ACK_REPLY structure.
- *                      Added _MSG_FW_DOWNLOAD_REPLY structure.
- *                      Added _MSG_TOOLBOX_REPLY structure.
- *  06-30-00  01.00.03  Added MaxLanBuckets to _PORT_FACT_REPLY structure.
- *  07-27-00  01.00.04  Added _EVENT_DATA structure definitions for _SCSI,
- *                      _LINK_STATUS, _LOOP_STATE and _LOGOUT.
- *  08-11-00  01.00.05  Switched positions of MsgLength and Function fields in
- *                      _MSG_EVENT_ACK_REPLY structure to match specification.
- *  11-02-00  01.01.01  Original release for post 1.0 work.
- *                      Added a value for Manufacturer to WhoInit.
- *  12-04-00  01.01.02  Modified IOCFacts reply, added FWUpload messages, and
- *                      removed toolbox message.
- *  01-09-01  01.01.03  Added event enabled and disabled defines.
- *                      Added structures for FwHeader and DataHeader.
- *                      Added ImageType to FwUpload reply.
- *  02-20-01  01.01.04  Started using MPI_POINTER.
- *  02-27-01  01.01.05  Added event for RAID status change and its event data.
- *                      Added IocNumber field to MSG_IOC_FACTS_REPLY.
- *  03-27-01  01.01.06  Added defines for ProductId field of MPI_FW_HEADER.
- *                      Added structure offset comments.
- *  04-09-01  01.01.07  Added structure EVENT_DATA_EVENT_CHANGE.
- *  08-08-01  01.02.01  Original release for v1.2 work.
- *                      New format for FWVersion and ProductId in
- *                      MSG_IOC_FACTS_REPLY and MPI_FW_HEADER.
- *  08-31-01  01.02.02  Addded event MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE and
- *                      related structure and defines.
- *                      Added event MPI_EVENT_ON_BUS_TIMER_EXPIRED.
- *                      Added MPI_IOCINIT_FLAGS_DISCARD_FW_IMAGE.
- *                      Replaced a reserved field in MSG_IOC_FACTS_REPLY with
- *                      IOCExceptions and changed DataImageSize to reserved.
- *                      Added MPI_FW_DOWNLOAD_ITYPE_NVSTORE_DATA and
- *                      MPI_FW_UPLOAD_ITYPE_NVDATA.
- *  09-28-01  01.02.03  Modified Event Data for Integrated RAID.
- *  11-01-01  01.02.04  Added defines for MPI_EXT_IMAGE_HEADER ImageType field.
- *  03-14-02  01.02.05  Added HeaderVersion field to MSG_IOC_FACTS_REPLY.
- *  05-31-02  01.02.06  Added define for
- *                      MPI_IOCFACTS_EXCEPT_RAID_CONFIG_INVALID.
- *                      Added AliasIndex to EVENT_DATA_LOGOUT structure.
- *  04-01-03  01.02.07  Added defines for MPI_FW_HEADER_SIGNATURE_.
- *  06-26-03  01.02.08  Added new values to the product family defines.
- *  04-29-04  01.02.09  Added IOCCapabilities field to MSG_IOC_FACTS_REPLY and
- *                      added related defines.
- *  05-11-04  01.03.01  Original release for MPI v1.3.
- *  08-19-04  01.05.01  Added four new fields to MSG_IOC_INIT.
- *                      Added three new fields to MSG_IOC_FACTS_REPLY.
- *                      Defined four new bits for the IOCCapabilities field of
- *                      the IOCFacts reply.
- *                      Added two new PortTypes for the PortFacts reply.
- *                      Added six new events along with their EventData
- *                      structures.
- *                      Added a new MsgFlag to the FwDownload request to
- *                      indicate last segment.
- *                      Defined a new image type of boot loader.
- *                      Added FW family codes for SAS product families.
- *  10-05-04  01.05.02  Added ReplyFifoHostSignalingAddr field to
- *                      MSG_IOC_FACTS_REPLY.
- *  12-07-04  01.05.03  Added more defines for SAS Discovery Error event.
- *  12-09-04  01.05.04  Added Unsupported device to SAS Device event.
- *  01-15-05  01.05.05  Added event data for SAS SES Event.
- *  02-09-05  01.05.06  Added MPI_FW_UPLOAD_ITYPE_FW_BACKUP define.
- *  02-22-05  01.05.07  Added Host Page Buffer Persistent flag to IOC Facts
- *                      Reply and IOC Init Request.
- *  03-11-05  01.05.08  Added family code for 1068E family.
- *                      Removed IOCFacts Reply EEDP Capability bit.
- *  06-24-05  01.05.09  Added 5 new IOCFacts Reply IOCCapabilities bits.
- *                      Added Max SATA Targets to SAS Discovery Error event.
- *  08-30-05  01.05.10  Added 4 new events and their event data structures.
- *                      Added new ReasonCode value for SAS Device Status Change
- *                      event.
- *                      Added new family code for FC949E.
- *  03-27-06  01.05.11  Added MPI_IOCFACTS_CAPABILITY_TLR.
- *                      Added additional Reason Codes and more event data fields
- *                      to EVENT_DATA_SAS_DEVICE_STATUS_CHANGE.
- *                      Added EVENT_DATA_SAS_BROADCAST_PRIMITIVE structure and
- *                      new event.
- *                      Added MPI_EVENT_SAS_SMP_ERROR and event data structure.
- *                      Added MPI_EVENT_SAS_INIT_DEVICE_STATUS_CHANGE and event
- *                      data structure.
- *                      Added MPI_EVENT_SAS_INIT_TABLE_OVERFLOW and event
- *                      data structure.
- *                      Added MPI_EXT_IMAGE_TYPE_INITIALIZATION.
- *  10-11-06  01.05.12  Added MPI_IOCFACTS_EXCEPT_METADATA_UNSUPPORTED.
- *                      Added MaxInitiators field to PortFacts reply.
- *                      Added SAS Device Status Change ReasonCode for
- *                      asynchronous notificaiton.
- *                      Added MPI_EVENT_SAS_EXPANDER_STATUS_CHANGE and event
- *                      data structure.
- *                      Added new ImageType values for FWDownload and FWUpload
- *                      requests.
- *  02-28-07  01.05.13  Added MPI_EVENT_PRIMITIVE_ASYNCHRONOUS_EVENT for SAS
- *                      Broadcast Event Data (replacing _RESERVED2).
- *                      For Discovery Error Event Data DiscoveryStatus field,
- *                      replaced _MULTPL_PATHS with _UNSUPPORTED_DEVICE and
- *                      added _MULTI_PORT_DOMAIN.
- *  05-24-07  01.05.14  Added Common Boot Block type to FWDownload Request.
- *                      Added Common Boot Block type to FWUpload Request.
- *  08-07-07  01.05.15  Added MPI_EVENT_SAS_INIT_RC_REMOVED define.
- *                      Added MPI_EVENT_IR2_RC_DUAL_PORT_ADDED and
- *                      MPI_EVENT_IR2_RC_DUAL_PORT_REMOVED for IR2 event data.
- *                      Added SASAddress field to SAS Initiator Device Table
- *                      Overflow event data structure.
- *  03-28-08  01.05.16  Added two new ReasonCode values to SAS Device Status
- *                      Change Event data to indicate completion of internally
- *                      generated task management.
- *                      Added MPI_EVENT_DSCVRY_ERR_DS_SATA_INIT_FAILURE define.
- *                      Added MPI_EVENT_SAS_INIT_RC_INACCESSIBLE define.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_IOC_H
-#define MPI_IOC_H
-
-
-/*****************************************************************************
-*
-*               I O C    M e s s a g e s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/*  IOCInit message                                                         */
-/****************************************************************************/
-
-typedef struct _MSG_IOC_INIT
-{
-    U8                      WhoInit;                    /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Flags;                      /* 04h */
-    U8                      MaxDevices;                 /* 05h */
-    U8                      MaxBuses;                   /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     ReplyFrameSize;             /* 0Ch */
-    U8                      Reserved1[2];               /* 0Eh */
-    U32                     HostMfaHighAddr;            /* 10h */
-    U32                     SenseBufferHighAddr;        /* 14h */
-    U32                     ReplyFifoHostSignalingAddr; /* 18h */
-    SGE_SIMPLE_UNION        HostPageBufferSGE;          /* 1Ch */
-    U16                     MsgVersion;                 /* 28h */
-    U16                     HeaderVersion;              /* 2Ah */
-} MSG_IOC_INIT, MPI_POINTER PTR_MSG_IOC_INIT,
-  IOCInit_t, MPI_POINTER pIOCInit_t;
-
-/* WhoInit values */
-#define MPI_WHOINIT_NO_ONE                              (0x00)
-#define MPI_WHOINIT_SYSTEM_BIOS                         (0x01)
-#define MPI_WHOINIT_ROM_BIOS                            (0x02)
-#define MPI_WHOINIT_PCI_PEER                            (0x03)
-#define MPI_WHOINIT_HOST_DRIVER                         (0x04)
-#define MPI_WHOINIT_MANUFACTURER                        (0x05)
-
-/* Flags values */
-#define MPI_IOCINIT_FLAGS_HOST_PAGE_BUFFER_PERSISTENT   (0x04)
-#define MPI_IOCINIT_FLAGS_REPLY_FIFO_HOST_SIGNAL        (0x02)
-#define MPI_IOCINIT_FLAGS_DISCARD_FW_IMAGE              (0x01)
-
-/* MsgVersion */
-#define MPI_IOCINIT_MSGVERSION_MAJOR_MASK               (0xFF00)
-#define MPI_IOCINIT_MSGVERSION_MAJOR_SHIFT              (8)
-#define MPI_IOCINIT_MSGVERSION_MINOR_MASK               (0x00FF)
-#define MPI_IOCINIT_MSGVERSION_MINOR_SHIFT              (0)
-
-/* HeaderVersion */
-#define MPI_IOCINIT_HEADERVERSION_UNIT_MASK             (0xFF00)
-#define MPI_IOCINIT_HEADERVERSION_UNIT_SHIFT            (8)
-#define MPI_IOCINIT_HEADERVERSION_DEV_MASK              (0x00FF)
-#define MPI_IOCINIT_HEADERVERSION_DEV_SHIFT             (0)
-
-
-typedef struct _MSG_IOC_INIT_REPLY
-{
-    U8                      WhoInit;                    /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Flags;                      /* 04h */
-    U8                      MaxDevices;                 /* 05h */
-    U8                      MaxBuses;                   /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved2;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-} MSG_IOC_INIT_REPLY, MPI_POINTER PTR_MSG_IOC_INIT_REPLY,
-  IOCInitReply_t, MPI_POINTER pIOCInitReply_t;
-
-
-
-/****************************************************************************/
-/*  IOC Facts message                                                       */
-/****************************************************************************/
-
-typedef struct _MSG_IOC_FACTS
-{
-    U8                      Reserved[2];                /* 00h */
-    U8                      ChainOffset;                /* 01h */
-    U8                      Function;                   /* 02h */
-    U8                      Reserved1[3];               /* 03h */
-    U8                      MsgFlags;                   /* 04h */
-    U32                     MsgContext;                 /* 08h */
-} MSG_IOC_FACTS, MPI_POINTER PTR_IOC_FACTS,
-  IOCFacts_t, MPI_POINTER pIOCFacts_t;
-
-typedef struct _MPI_FW_VERSION_STRUCT
-{
-    U8                      Dev;                        /* 00h */
-    U8                      Unit;                       /* 01h */
-    U8                      Minor;                      /* 02h */
-    U8                      Major;                      /* 03h */
-} MPI_FW_VERSION_STRUCT;
-
-typedef union _MPI_FW_VERSION
-{
-    MPI_FW_VERSION_STRUCT   Struct;
-    U32                     Word;
-} MPI_FW_VERSION;
-
-/* IOC Facts Reply */
-typedef struct _MSG_IOC_FACTS_REPLY
-{
-    U16                     MsgVersion;                 /* 00h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     HeaderVersion;              /* 04h */
-    U8                      IOCNumber;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     IOCExceptions;              /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-    U8                      MaxChainDepth;              /* 14h */
-    U8                      WhoInit;                    /* 15h */
-    U8                      BlockSize;                  /* 16h */
-    U8                      Flags;                      /* 17h */
-    U16                     ReplyQueueDepth;            /* 18h */
-    U16                     RequestFrameSize;           /* 1Ah */
-    U16                     Reserved_0101_FWVersion;    /* 1Ch */ /* obsolete 16-bit FWVersion */
-    U16                     ProductID;                  /* 1Eh */
-    U32                     CurrentHostMfaHighAddr;     /* 20h */
-    U16                     GlobalCredits;              /* 24h */
-    U8                      NumberOfPorts;              /* 26h */
-    U8                      EventState;                 /* 27h */
-    U32                     CurrentSenseBufferHighAddr; /* 28h */
-    U16                     CurReplyFrameSize;          /* 2Ch */
-    U8                      MaxDevices;                 /* 2Eh */
-    U8                      MaxBuses;                   /* 2Fh */
-    U32                     FWImageSize;                /* 30h */
-    U32                     IOCCapabilities;            /* 34h */
-    MPI_FW_VERSION          FWVersion;                  /* 38h */
-    U16                     HighPriorityQueueDepth;     /* 3Ch */
-    U16                     Reserved2;                  /* 3Eh */
-    SGE_SIMPLE_UNION        HostPageBufferSGE;          /* 40h */
-    U32                     ReplyFifoHostSignalingAddr; /* 4Ch */
-} MSG_IOC_FACTS_REPLY, MPI_POINTER PTR_MSG_IOC_FACTS_REPLY,
-  IOCFactsReply_t, MPI_POINTER pIOCFactsReply_t;
-
-#define MPI_IOCFACTS_MSGVERSION_MAJOR_MASK              (0xFF00)
-#define MPI_IOCFACTS_MSGVERSION_MAJOR_SHIFT             (8)
-#define MPI_IOCFACTS_MSGVERSION_MINOR_MASK              (0x00FF)
-#define MPI_IOCFACTS_MSGVERSION_MINOR_SHIFT             (0)
-
-#define MPI_IOCFACTS_HDRVERSION_UNIT_MASK               (0xFF00)
-#define MPI_IOCFACTS_HDRVERSION_UNIT_SHIFT              (8)
-#define MPI_IOCFACTS_HDRVERSION_DEV_MASK                (0x00FF)
-#define MPI_IOCFACTS_HDRVERSION_DEV_SHIFT               (0)
-
-#define MPI_IOCFACTS_EXCEPT_CONFIG_CHECKSUM_FAIL        (0x0001)
-#define MPI_IOCFACTS_EXCEPT_RAID_CONFIG_INVALID         (0x0002)
-#define MPI_IOCFACTS_EXCEPT_FW_CHECKSUM_FAIL            (0x0004)
-#define MPI_IOCFACTS_EXCEPT_PERSISTENT_TABLE_FULL       (0x0008)
-#define MPI_IOCFACTS_EXCEPT_METADATA_UNSUPPORTED        (0x0010)
-
-#define MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT             (0x01)
-#define MPI_IOCFACTS_FLAGS_REPLY_FIFO_HOST_SIGNAL       (0x02)
-#define MPI_IOCFACTS_FLAGS_HOST_PAGE_BUFFER_PERSISTENT  (0x04)
-
-#define MPI_IOCFACTS_EVENTSTATE_DISABLED                (0x00)
-#define MPI_IOCFACTS_EVENTSTATE_ENABLED                 (0x01)
-
-#define MPI_IOCFACTS_CAPABILITY_HIGH_PRI_Q              (0x00000001)
-#define MPI_IOCFACTS_CAPABILITY_REPLY_HOST_SIGNAL       (0x00000002)
-#define MPI_IOCFACTS_CAPABILITY_QUEUE_FULL_HANDLING     (0x00000004)
-#define MPI_IOCFACTS_CAPABILITY_DIAG_TRACE_BUFFER       (0x00000008)
-#define MPI_IOCFACTS_CAPABILITY_SNAPSHOT_BUFFER         (0x00000010)
-#define MPI_IOCFACTS_CAPABILITY_EXTENDED_BUFFER         (0x00000020)
-#define MPI_IOCFACTS_CAPABILITY_EEDP                    (0x00000040)
-#define MPI_IOCFACTS_CAPABILITY_BIDIRECTIONAL           (0x00000080)
-#define MPI_IOCFACTS_CAPABILITY_MULTICAST               (0x00000100)
-#define MPI_IOCFACTS_CAPABILITY_SCSIIO32                (0x00000200)
-#define MPI_IOCFACTS_CAPABILITY_NO_SCSIIO16             (0x00000400)
-#define MPI_IOCFACTS_CAPABILITY_TLR                     (0x00000800)
-
-
-/*****************************************************************************
-*
-*               P o r t    M e s s a g e s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/*  Port Facts message and Reply                                            */
-/****************************************************************************/
-
-typedef struct _MSG_PORT_FACTS
-{
-     U8                     Reserved[2];                /* 00h */
-     U8                     ChainOffset;                /* 02h */
-     U8                     Function;                   /* 03h */
-     U8                     Reserved1[2];               /* 04h */
-     U8                     PortNumber;                 /* 06h */
-     U8                     MsgFlags;                   /* 07h */
-     U32                    MsgContext;                 /* 08h */
-} MSG_PORT_FACTS, MPI_POINTER PTR_MSG_PORT_FACTS,
-  PortFacts_t, MPI_POINTER pPortFacts_t;
-
-typedef struct _MSG_PORT_FACTS_REPLY
-{
-     U16                    Reserved;                   /* 00h */
-     U8                     MsgLength;                  /* 02h */
-     U8                     Function;                   /* 03h */
-     U16                    Reserved1;                  /* 04h */
-     U8                     PortNumber;                 /* 06h */
-     U8                     MsgFlags;                   /* 07h */
-     U32                    MsgContext;                 /* 08h */
-     U16                    Reserved2;                  /* 0Ch */
-     U16                    IOCStatus;                  /* 0Eh */
-     U32                    IOCLogInfo;                 /* 10h */
-     U8                     Reserved3;                  /* 14h */
-     U8                     PortType;                   /* 15h */
-     U16                    MaxDevices;                 /* 16h */
-     U16                    PortSCSIID;                 /* 18h */
-     U16                    ProtocolFlags;              /* 1Ah */
-     U16                    MaxPostedCmdBuffers;        /* 1Ch */
-     U16                    MaxPersistentIDs;           /* 1Eh */
-     U16                    MaxLanBuckets;              /* 20h */
-     U8                     MaxInitiators;              /* 22h */
-     U8                     Reserved4;                  /* 23h */
-     U32                    Reserved5;                  /* 24h */
-} MSG_PORT_FACTS_REPLY, MPI_POINTER PTR_MSG_PORT_FACTS_REPLY,
-  PortFactsReply_t, MPI_POINTER pPortFactsReply_t;
-
-
-/* PortTypes values */
-
-#define MPI_PORTFACTS_PORTTYPE_INACTIVE         (0x00)
-#define MPI_PORTFACTS_PORTTYPE_SCSI             (0x01)
-#define MPI_PORTFACTS_PORTTYPE_FC               (0x10)
-#define MPI_PORTFACTS_PORTTYPE_ISCSI            (0x20)
-#define MPI_PORTFACTS_PORTTYPE_SAS              (0x30)
-
-/* ProtocolFlags values */
-
-#define MPI_PORTFACTS_PROTOCOL_LOGBUSADDR       (0x01)
-#define MPI_PORTFACTS_PROTOCOL_LAN              (0x02)
-#define MPI_PORTFACTS_PROTOCOL_TARGET           (0x04)
-#define MPI_PORTFACTS_PROTOCOL_INITIATOR        (0x08)
-
-
-/****************************************************************************/
-/*  Port Enable Message                                                     */
-/****************************************************************************/
-
-typedef struct _MSG_PORT_ENABLE
-{
-    U8                      Reserved[2];                /* 00h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Reserved1[2];               /* 04h */
-    U8                      PortNumber;                 /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-} MSG_PORT_ENABLE, MPI_POINTER PTR_MSG_PORT_ENABLE,
-  PortEnable_t, MPI_POINTER pPortEnable_t;
-
-typedef struct _MSG_PORT_ENABLE_REPLY
-{
-    U8                      Reserved[2];                /* 00h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Reserved1[2];               /* 04h */
-    U8                      PortNumber;                 /* 05h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved2;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-} MSG_PORT_ENABLE_REPLY, MPI_POINTER PTR_MSG_PORT_ENABLE_REPLY,
-  PortEnableReply_t, MPI_POINTER pPortEnableReply_t;
-
-
-/*****************************************************************************
-*
-*               E v e n t    M e s s a g e s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/*  Event Notification messages                                             */
-/****************************************************************************/
-
-typedef struct _MSG_EVENT_NOTIFY
-{
-    U8                      Switch;                     /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Reserved1[3];               /* 04h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-} MSG_EVENT_NOTIFY, MPI_POINTER PTR_MSG_EVENT_NOTIFY,
-  EventNotification_t, MPI_POINTER pEventNotification_t;
-
-/* Event Notification Reply */
-
-typedef struct _MSG_EVENT_NOTIFY_REPLY
-{
-     U16                    EventDataLength;            /* 00h */
-     U8                     MsgLength;                  /* 02h */
-     U8                     Function;                   /* 03h */
-     U8                     Reserved1[2];               /* 04h */
-     U8                     AckRequired;                /* 06h */
-     U8                     MsgFlags;                   /* 07h */
-     U32                    MsgContext;                 /* 08h */
-     U8                     Reserved2[2];               /* 0Ch */
-     U16                    IOCStatus;                  /* 0Eh */
-     U32                    IOCLogInfo;                 /* 10h */
-     U32                    Event;                      /* 14h */
-     U32                    EventContext;               /* 18h */
-     U32                    Data[1];                    /* 1Ch */
-} MSG_EVENT_NOTIFY_REPLY, MPI_POINTER PTR_MSG_EVENT_NOTIFY_REPLY,
-  EventNotificationReply_t, MPI_POINTER pEventNotificationReply_t;
-
-/* Event Acknowledge */
-
-typedef struct _MSG_EVENT_ACK
-{
-    U8                      Reserved[2];                /* 00h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Reserved1[3];               /* 04h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     Event;                      /* 0Ch */
-    U32                     EventContext;               /* 10h */
-} MSG_EVENT_ACK, MPI_POINTER PTR_MSG_EVENT_ACK,
-  EventAck_t, MPI_POINTER pEventAck_t;
-
-typedef struct _MSG_EVENT_ACK_REPLY
-{
-    U8                      Reserved[2];                /* 00h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Reserved1[3];               /* 04h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved2;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-} MSG_EVENT_ACK_REPLY, MPI_POINTER PTR_MSG_EVENT_ACK_REPLY,
-  EventAckReply_t, MPI_POINTER pEventAckReply_t;
-
-/* Switch */
-
-#define MPI_EVENT_NOTIFICATION_SWITCH_OFF   (0x00)
-#define MPI_EVENT_NOTIFICATION_SWITCH_ON    (0x01)
-
-/* Event */
-
-#define MPI_EVENT_NONE                          (0x00000000)
-#define MPI_EVENT_LOG_DATA                      (0x00000001)
-#define MPI_EVENT_STATE_CHANGE                  (0x00000002)
-#define MPI_EVENT_UNIT_ATTENTION                (0x00000003)
-#define MPI_EVENT_IOC_BUS_RESET                 (0x00000004)
-#define MPI_EVENT_EXT_BUS_RESET                 (0x00000005)
-#define MPI_EVENT_RESCAN                        (0x00000006)
-#define MPI_EVENT_LINK_STATUS_CHANGE            (0x00000007)
-#define MPI_EVENT_LOOP_STATE_CHANGE             (0x00000008)
-#define MPI_EVENT_LOGOUT                        (0x00000009)
-#define MPI_EVENT_EVENT_CHANGE                  (0x0000000A)
-#define MPI_EVENT_INTEGRATED_RAID               (0x0000000B)
-#define MPI_EVENT_SCSI_DEVICE_STATUS_CHANGE     (0x0000000C)
-#define MPI_EVENT_ON_BUS_TIMER_EXPIRED          (0x0000000D)
-#define MPI_EVENT_QUEUE_FULL                    (0x0000000E)
-#define MPI_EVENT_SAS_DEVICE_STATUS_CHANGE      (0x0000000F)
-#define MPI_EVENT_SAS_SES                       (0x00000010)
-#define MPI_EVENT_PERSISTENT_TABLE_FULL         (0x00000011)
-#define MPI_EVENT_SAS_PHY_LINK_STATUS           (0x00000012)
-#define MPI_EVENT_SAS_DISCOVERY_ERROR           (0x00000013)
-#define MPI_EVENT_IR_RESYNC_UPDATE              (0x00000014)
-#define MPI_EVENT_IR2                           (0x00000015)
-#define MPI_EVENT_SAS_DISCOVERY                 (0x00000016)
-#define MPI_EVENT_SAS_BROADCAST_PRIMITIVE       (0x00000017)
-#define MPI_EVENT_SAS_INIT_DEVICE_STATUS_CHANGE (0x00000018)
-#define MPI_EVENT_SAS_INIT_TABLE_OVERFLOW       (0x00000019)
-#define MPI_EVENT_SAS_SMP_ERROR                 (0x0000001A)
-#define MPI_EVENT_SAS_EXPANDER_STATUS_CHANGE    (0x0000001B)
-#define MPI_EVENT_LOG_ENTRY_ADDED               (0x00000021)
-
-/* AckRequired field values */
-
-#define MPI_EVENT_NOTIFICATION_ACK_NOT_REQUIRED (0x00)
-#define MPI_EVENT_NOTIFICATION_ACK_REQUIRED     (0x01)
-
-/* EventChange Event data */
-
-typedef struct _EVENT_DATA_EVENT_CHANGE
-{
-    U8                      EventState;                 /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U16                     Reserved1;                  /* 02h */
-} EVENT_DATA_EVENT_CHANGE, MPI_POINTER PTR_EVENT_DATA_EVENT_CHANGE,
-  EventDataEventChange_t, MPI_POINTER pEventDataEventChange_t;
-
-/* LogEntryAdded Event data */
-
-/* this structure matches MPI_LOG_0_ENTRY in mpi_cnfg.h */
-#define MPI_EVENT_DATA_LOG_ENTRY_DATA_LENGTH    (0x1C)
-typedef struct _EVENT_DATA_LOG_ENTRY
-{
-    U32         TimeStamp;                          /* 00h */
-    U32         Reserved1;                          /* 04h */
-    U16         LogSequence;                        /* 08h */
-    U16         LogEntryQualifier;                  /* 0Ah */
-    U8          LogData[MPI_EVENT_DATA_LOG_ENTRY_DATA_LENGTH]; /* 0Ch */
-} EVENT_DATA_LOG_ENTRY, MPI_POINTER PTR_EVENT_DATA_LOG_ENTRY,
-  MpiEventDataLogEntry_t, MPI_POINTER pMpiEventDataLogEntry_t;
-
-typedef struct _EVENT_DATA_LOG_ENTRY_ADDED
-{
-    U16                     LogSequence;            /* 00h */
-    U16                     Reserved1;              /* 02h */
-    U32                     Reserved2;              /* 04h */
-    EVENT_DATA_LOG_ENTRY    LogEntry;               /* 08h */
-} EVENT_DATA_LOG_ENTRY_ADDED, MPI_POINTER PTR_EVENT_DATA_LOG_ENTRY_ADDED,
-  MpiEventDataLogEntryAdded_t, MPI_POINTER pMpiEventDataLogEntryAdded_t;
-
-/* SCSI Event data for Port, Bus and Device forms */
-
-typedef struct _EVENT_DATA_SCSI
-{
-    U8                      TargetID;                   /* 00h */
-    U8                      BusPort;                    /* 01h */
-    U16                     Reserved;                   /* 02h */
-} EVENT_DATA_SCSI, MPI_POINTER PTR_EVENT_DATA_SCSI,
-  EventDataScsi_t, MPI_POINTER pEventDataScsi_t;
-
-/* SCSI Device Status Change Event data */
-
-typedef struct _EVENT_DATA_SCSI_DEVICE_STATUS_CHANGE
-{
-    U8                      TargetID;                   /* 00h */
-    U8                      Bus;                        /* 01h */
-    U8                      ReasonCode;                 /* 02h */
-    U8                      LUN;                        /* 03h */
-    U8                      ASC;                        /* 04h */
-    U8                      ASCQ;                       /* 05h */
-    U16                     Reserved;                   /* 06h */
-} EVENT_DATA_SCSI_DEVICE_STATUS_CHANGE,
-  MPI_POINTER PTR_EVENT_DATA_SCSI_DEVICE_STATUS_CHANGE,
-  MpiEventDataScsiDeviceStatusChange_t,
-  MPI_POINTER pMpiEventDataScsiDeviceStatusChange_t;
-
-/* MPI SCSI Device Status Change Event data ReasonCode values */
-#define MPI_EVENT_SCSI_DEV_STAT_RC_ADDED                (0x03)
-#define MPI_EVENT_SCSI_DEV_STAT_RC_NOT_RESPONDING       (0x04)
-#define MPI_EVENT_SCSI_DEV_STAT_RC_SMART_DATA           (0x05)
-
-/* SAS Device Status Change Event data */
-
-typedef struct _EVENT_DATA_SAS_DEVICE_STATUS_CHANGE
-{
-    U8                      TargetID;                   /* 00h */
-    U8                      Bus;                        /* 01h */
-    U8                      ReasonCode;                 /* 02h */
-    U8                      Reserved;                   /* 03h */
-    U8                      ASC;                        /* 04h */
-    U8                      ASCQ;                       /* 05h */
-    U16                     DevHandle;                  /* 06h */
-    U32                     DeviceInfo;                 /* 08h */
-    U16                     ParentDevHandle;            /* 0Ch */
-    U8                      PhyNum;                     /* 0Eh */
-    U8                      Reserved1;                  /* 0Fh */
-    U64                     SASAddress;                 /* 10h */
-    U8                      LUN[8];                     /* 18h */
-    U16                     TaskTag;                    /* 20h */
-    U16                     Reserved2;                  /* 22h */
-} EVENT_DATA_SAS_DEVICE_STATUS_CHANGE,
-  MPI_POINTER PTR_EVENT_DATA_SAS_DEVICE_STATUS_CHANGE,
-  MpiEventDataSasDeviceStatusChange_t,
-  MPI_POINTER pMpiEventDataSasDeviceStatusChange_t;
-
-/* MPI SAS Device Status Change Event data ReasonCode values */
-#define MPI_EVENT_SAS_DEV_STAT_RC_ADDED                     (0x03)
-#define MPI_EVENT_SAS_DEV_STAT_RC_NOT_RESPONDING            (0x04)
-#define MPI_EVENT_SAS_DEV_STAT_RC_SMART_DATA                (0x05)
-#define MPI_EVENT_SAS_DEV_STAT_RC_NO_PERSIST_ADDED          (0x06)
-#define MPI_EVENT_SAS_DEV_STAT_RC_UNSUPPORTED               (0x07)
-#define MPI_EVENT_SAS_DEV_STAT_RC_INTERNAL_DEVICE_RESET     (0x08)
-#define MPI_EVENT_SAS_DEV_STAT_RC_TASK_ABORT_INTERNAL       (0x09)
-#define MPI_EVENT_SAS_DEV_STAT_RC_ABORT_TASK_SET_INTERNAL   (0x0A)
-#define MPI_EVENT_SAS_DEV_STAT_RC_CLEAR_TASK_SET_INTERNAL   (0x0B)
-#define MPI_EVENT_SAS_DEV_STAT_RC_QUERY_TASK_INTERNAL       (0x0C)
-#define MPI_EVENT_SAS_DEV_STAT_RC_ASYNC_NOTIFICATION        (0x0D)
-#define MPI_EVENT_SAS_DEV_STAT_RC_CMPL_INTERNAL_DEV_RESET   (0x0E)
-#define MPI_EVENT_SAS_DEV_STAT_RC_CMPL_TASK_ABORT_INTERNAL  (0x0F)
-
-
-/* SCSI Event data for Queue Full event */
-
-typedef struct _EVENT_DATA_QUEUE_FULL
-{
-    U8                      TargetID;                   /* 00h */
-    U8                      Bus;                        /* 01h */
-    U16                     CurrentDepth;               /* 02h */
-} EVENT_DATA_QUEUE_FULL, MPI_POINTER PTR_EVENT_DATA_QUEUE_FULL,
-  EventDataQueueFull_t, MPI_POINTER pEventDataQueueFull_t;
-
-/* MPI Integrated RAID Event data */
-
-typedef struct _EVENT_DATA_RAID
-{
-    U8                      VolumeID;                   /* 00h */
-    U8                      VolumeBus;                  /* 01h */
-    U8                      ReasonCode;                 /* 02h */
-    U8                      PhysDiskNum;                /* 03h */
-    U8                      ASC;                        /* 04h */
-    U8                      ASCQ;                       /* 05h */
-    U16                     Reserved;                   /* 06h */
-    U32                     SettingsStatus;             /* 08h */
-} EVENT_DATA_RAID, MPI_POINTER PTR_EVENT_DATA_RAID,
-  MpiEventDataRaid_t, MPI_POINTER pMpiEventDataRaid_t;
-
-/* MPI Integrated RAID Event data ReasonCode values */
-#define MPI_EVENT_RAID_RC_VOLUME_CREATED                (0x00)
-#define MPI_EVENT_RAID_RC_VOLUME_DELETED                (0x01)
-#define MPI_EVENT_RAID_RC_VOLUME_SETTINGS_CHANGED       (0x02)
-#define MPI_EVENT_RAID_RC_VOLUME_STATUS_CHANGED         (0x03)
-#define MPI_EVENT_RAID_RC_VOLUME_PHYSDISK_CHANGED       (0x04)
-#define MPI_EVENT_RAID_RC_PHYSDISK_CREATED              (0x05)
-#define MPI_EVENT_RAID_RC_PHYSDISK_DELETED              (0x06)
-#define MPI_EVENT_RAID_RC_PHYSDISK_SETTINGS_CHANGED     (0x07)
-#define MPI_EVENT_RAID_RC_PHYSDISK_STATUS_CHANGED       (0x08)
-#define MPI_EVENT_RAID_RC_DOMAIN_VAL_NEEDED             (0x09)
-#define MPI_EVENT_RAID_RC_SMART_DATA                    (0x0A)
-#define MPI_EVENT_RAID_RC_REPLACE_ACTION_STARTED        (0x0B)
-
-
-/* MPI Integrated RAID Resync Update Event data */
-
-typedef struct _MPI_EVENT_DATA_IR_RESYNC_UPDATE
-{
-    U8                      VolumeID;                   /* 00h */
-    U8                      VolumeBus;                  /* 01h */
-    U8                      ResyncComplete;             /* 02h */
-    U8                      Reserved1;                  /* 03h */
-    U32                     Reserved2;                  /* 04h */
-} MPI_EVENT_DATA_IR_RESYNC_UPDATE,
-  MPI_POINTER PTR_MPI_EVENT_DATA_IR_RESYNC_UPDATE,
-  MpiEventDataIrResyncUpdate_t, MPI_POINTER pMpiEventDataIrResyncUpdate_t;
-
-/* MPI IR2 Event data */
-
-/* MPI_LD_STATE or MPI_PD_STATE */
-typedef struct _IR2_STATE_CHANGED
-{
-    U16                 PreviousState;  /* 00h */
-    U16                 NewState;       /* 02h */
-} IR2_STATE_CHANGED, MPI_POINTER PTR_IR2_STATE_CHANGED;
-
-typedef struct _IR2_PD_INFO
-{
-    U16                 DeviceHandle;           /* 00h */
-    U8                  TruncEnclosureHandle;   /* 02h */
-    U8                  TruncatedSlot;          /* 03h */
-} IR2_PD_INFO, MPI_POINTER PTR_IR2_PD_INFO;
-
-typedef union _MPI_IR2_RC_EVENT_DATA
-{
-    IR2_STATE_CHANGED   StateChanged;
-    U32                 Lba;
-    IR2_PD_INFO         PdInfo;
-} MPI_IR2_RC_EVENT_DATA, MPI_POINTER PTR_MPI_IR2_RC_EVENT_DATA;
-
-typedef struct _MPI_EVENT_DATA_IR2
-{
-    U8                      TargetID;             /* 00h */
-    U8                      Bus;                  /* 01h */
-    U8                      ReasonCode;           /* 02h */
-    U8                      PhysDiskNum;          /* 03h */
-    MPI_IR2_RC_EVENT_DATA   IR2EventData;         /* 04h */
-} MPI_EVENT_DATA_IR2, MPI_POINTER PTR_MPI_EVENT_DATA_IR2,
-  MpiEventDataIR2_t, MPI_POINTER pMpiEventDataIR2_t;
-
-/* MPI IR2 Event data ReasonCode values */
-#define MPI_EVENT_IR2_RC_LD_STATE_CHANGED           (0x01)
-#define MPI_EVENT_IR2_RC_PD_STATE_CHANGED           (0x02)
-#define MPI_EVENT_IR2_RC_BAD_BLOCK_TABLE_FULL       (0x03)
-#define MPI_EVENT_IR2_RC_PD_INSERTED                (0x04)
-#define MPI_EVENT_IR2_RC_PD_REMOVED                 (0x05)
-#define MPI_EVENT_IR2_RC_FOREIGN_CFG_DETECTED       (0x06)
-#define MPI_EVENT_IR2_RC_REBUILD_MEDIUM_ERROR       (0x07)
-#define MPI_EVENT_IR2_RC_DUAL_PORT_ADDED            (0x08)
-#define MPI_EVENT_IR2_RC_DUAL_PORT_REMOVED          (0x09)
-
-/* defines for logical disk states */
-#define MPI_LD_STATE_OPTIMAL                        (0x00)
-#define MPI_LD_STATE_DEGRADED                       (0x01)
-#define MPI_LD_STATE_FAILED                         (0x02)
-#define MPI_LD_STATE_MISSING                        (0x03)
-#define MPI_LD_STATE_OFFLINE                        (0x04)
-
-/* defines for physical disk states */
-#define MPI_PD_STATE_ONLINE                         (0x00)
-#define MPI_PD_STATE_MISSING                        (0x01)
-#define MPI_PD_STATE_NOT_COMPATIBLE                 (0x02)
-#define MPI_PD_STATE_FAILED                         (0x03)
-#define MPI_PD_STATE_INITIALIZING                   (0x04)
-#define MPI_PD_STATE_OFFLINE_AT_HOST_REQUEST        (0x05)
-#define MPI_PD_STATE_FAILED_AT_HOST_REQUEST         (0x06)
-#define MPI_PD_STATE_OFFLINE_FOR_ANOTHER_REASON     (0xFF)
-
-/* MPI Link Status Change Event data */
-
-typedef struct _EVENT_DATA_LINK_STATUS
-{
-    U8                      State;                      /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U16                     Reserved1;                  /* 02h */
-    U8                      Reserved2;                  /* 04h */
-    U8                      Port;                       /* 05h */
-    U16                     Reserved3;                  /* 06h */
-} EVENT_DATA_LINK_STATUS, MPI_POINTER PTR_EVENT_DATA_LINK_STATUS,
-  EventDataLinkStatus_t, MPI_POINTER pEventDataLinkStatus_t;
-
-#define MPI_EVENT_LINK_STATUS_FAILURE       (0x00000000)
-#define MPI_EVENT_LINK_STATUS_ACTIVE        (0x00000001)
-
-/* MPI Loop State Change Event data */
-
-typedef struct _EVENT_DATA_LOOP_STATE
-{
-    U8                      Character4;                 /* 00h */
-    U8                      Character3;                 /* 01h */
-    U8                      Type;                       /* 02h */
-    U8                      Reserved;                   /* 03h */
-    U8                      Reserved1;                  /* 04h */
-    U8                      Port;                       /* 05h */
-    U16                     Reserved2;                  /* 06h */
-} EVENT_DATA_LOOP_STATE, MPI_POINTER PTR_EVENT_DATA_LOOP_STATE,
-  EventDataLoopState_t, MPI_POINTER pEventDataLoopState_t;
-
-#define MPI_EVENT_LOOP_STATE_CHANGE_LIP     (0x0001)
-#define MPI_EVENT_LOOP_STATE_CHANGE_LPE     (0x0002)
-#define MPI_EVENT_LOOP_STATE_CHANGE_LPB     (0x0003)
-
-/* MPI LOGOUT Event data */
-
-typedef struct _EVENT_DATA_LOGOUT
-{
-    U32                     NPortID;                    /* 00h */
-    U8                      AliasIndex;                 /* 04h */
-    U8                      Port;                       /* 05h */
-    U16                     Reserved1;                  /* 06h */
-} EVENT_DATA_LOGOUT, MPI_POINTER PTR_EVENT_DATA_LOGOUT,
-  EventDataLogout_t, MPI_POINTER pEventDataLogout_t;
-
-#define MPI_EVENT_LOGOUT_ALL_ALIASES        (0xFF)
-
-/* SAS SES Event data */
-
-typedef struct _EVENT_DATA_SAS_SES
-{
-    U8                      PhyNum;                     /* 00h */
-    U8                      Port;                       /* 01h */
-    U8                      PortWidth;                  /* 02h */
-    U8                      Reserved1;                  /* 04h */
-} EVENT_DATA_SAS_SES, MPI_POINTER PTR_EVENT_DATA_SAS_SES,
-  MpiEventDataSasSes_t, MPI_POINTER pMpiEventDataSasSes_t;
-
-/* SAS Broadcast Primitive Event data */
-
-typedef struct _EVENT_DATA_SAS_BROADCAST_PRIMITIVE
-{
-    U8                      PhyNum;                     /* 00h */
-    U8                      Port;                       /* 01h */
-    U8                      PortWidth;                  /* 02h */
-    U8                      Primitive;                  /* 04h */
-} EVENT_DATA_SAS_BROADCAST_PRIMITIVE,
-  MPI_POINTER PTR_EVENT_DATA_SAS_BROADCAST_PRIMITIVE,
-  MpiEventDataSasBroadcastPrimitive_t,
-  MPI_POINTER pMpiEventDataSasBroadcastPrimitive_t;
-
-#define MPI_EVENT_PRIMITIVE_CHANGE              (0x01)
-#define MPI_EVENT_PRIMITIVE_EXPANDER            (0x03)
-#define MPI_EVENT_PRIMITIVE_ASYNCHRONOUS_EVENT  (0x04)
-#define MPI_EVENT_PRIMITIVE_RESERVED3           (0x05)
-#define MPI_EVENT_PRIMITIVE_RESERVED4           (0x06)
-#define MPI_EVENT_PRIMITIVE_CHANGE0_RESERVED    (0x07)
-#define MPI_EVENT_PRIMITIVE_CHANGE1_RESERVED    (0x08)
-
-/* SAS Phy Link Status Event data */
-
-typedef struct _EVENT_DATA_SAS_PHY_LINK_STATUS
-{
-    U8                      PhyNum;                     /* 00h */
-    U8                      LinkRates;                  /* 01h */
-    U16                     DevHandle;                  /* 02h */
-    U64                     SASAddress;                 /* 04h */
-} EVENT_DATA_SAS_PHY_LINK_STATUS, MPI_POINTER PTR_EVENT_DATA_SAS_PHY_LINK_STATUS,
-  MpiEventDataSasPhyLinkStatus_t, MPI_POINTER pMpiEventDataSasPhyLinkStatus_t;
-
-/* defines for the LinkRates field of the SAS PHY Link Status event */
-#define MPI_EVENT_SAS_PLS_LR_CURRENT_MASK                   (0xF0)
-#define MPI_EVENT_SAS_PLS_LR_CURRENT_SHIFT                  (4)
-#define MPI_EVENT_SAS_PLS_LR_PREVIOUS_MASK                  (0x0F)
-#define MPI_EVENT_SAS_PLS_LR_PREVIOUS_SHIFT                 (0)
-#define MPI_EVENT_SAS_PLS_LR_RATE_UNKNOWN                   (0x00)
-#define MPI_EVENT_SAS_PLS_LR_RATE_PHY_DISABLED              (0x01)
-#define MPI_EVENT_SAS_PLS_LR_RATE_FAILED_SPEED_NEGOTIATION  (0x02)
-#define MPI_EVENT_SAS_PLS_LR_RATE_SATA_OOB_COMPLETE         (0x03)
-#define MPI_EVENT_SAS_PLS_LR_RATE_1_5                       (0x08)
-#define MPI_EVENT_SAS_PLS_LR_RATE_3_0                       (0x09)
-#define MPI_EVENT_SAS_PLS_LR_RATE_6_0                       (0x0A)
-
-/* SAS Discovery Event data */
-
-typedef struct _EVENT_DATA_SAS_DISCOVERY
-{
-    U32                     DiscoveryStatus;            /* 00h */
-    U32                     Reserved1;                  /* 04h */
-} EVENT_DATA_SAS_DISCOVERY, MPI_POINTER PTR_EVENT_DATA_SAS_DISCOVERY,
-  EventDataSasDiscovery_t, MPI_POINTER pEventDataSasDiscovery_t;
-
-#define MPI_EVENT_SAS_DSCVRY_COMPLETE                       (0x00000000)
-#define MPI_EVENT_SAS_DSCVRY_IN_PROGRESS                    (0x00000001)
-#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK                  (0xFFFF0000)
-#define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT                 (16)
-
-/* SAS Discovery Errror Event data */
-
-typedef struct _EVENT_DATA_DISCOVERY_ERROR
-{
-    U32                     DiscoveryStatus;            /* 00h */
-    U8                      Port;                       /* 04h */
-    U8                      Reserved1;                  /* 05h */
-    U16                     Reserved2;                  /* 06h */
-} EVENT_DATA_DISCOVERY_ERROR, MPI_POINTER PTR_EVENT_DATA_DISCOVERY_ERROR,
-  EventDataDiscoveryError_t, MPI_POINTER pEventDataDiscoveryError_t;
-
-#define MPI_EVENT_DSCVRY_ERR_DS_LOOP_DETECTED               (0x00000001)
-#define MPI_EVENT_DSCVRY_ERR_DS_UNADDRESSABLE_DEVICE        (0x00000002)
-#define MPI_EVENT_DSCVRY_ERR_DS_MULTIPLE_PORTS              (0x00000004)
-#define MPI_EVENT_DSCVRY_ERR_DS_EXPANDER_ERR                (0x00000008)
-#define MPI_EVENT_DSCVRY_ERR_DS_SMP_TIMEOUT                 (0x00000010)
-#define MPI_EVENT_DSCVRY_ERR_DS_OUT_ROUTE_ENTRIES           (0x00000020)
-#define MPI_EVENT_DSCVRY_ERR_DS_INDEX_NOT_EXIST             (0x00000040)
-#define MPI_EVENT_DSCVRY_ERR_DS_SMP_FUNCTION_FAILED         (0x00000080)
-#define MPI_EVENT_DSCVRY_ERR_DS_SMP_CRC_ERROR               (0x00000100)
-#define MPI_EVENT_DSCVRY_ERR_DS_MULTPL_SUBTRACTIVE          (0x00000200)
-#define MPI_EVENT_DSCVRY_ERR_DS_TABLE_TO_TABLE              (0x00000400)
-#define MPI_EVENT_DSCVRY_ERR_DS_UNSUPPORTED_DEVICE          (0x00000800)
-#define MPI_EVENT_DSCVRY_ERR_DS_MAX_SATA_TARGETS            (0x00001000)
-#define MPI_EVENT_DSCVRY_ERR_DS_MULTI_PORT_DOMAIN           (0x00002000)
-#define MPI_EVENT_DSCVRY_ERR_DS_SATA_INIT_FAILURE           (0x00004000)
-
-/* SAS SMP Error Event data */
-
-typedef struct _EVENT_DATA_SAS_SMP_ERROR
-{
-    U8                      Status;                     /* 00h */
-    U8                      Port;                       /* 01h */
-    U8                      SMPFunctionResult;          /* 02h */
-    U8                      Reserved1;                  /* 03h */
-    U64                     SASAddress;                 /* 04h */
-} EVENT_DATA_SAS_SMP_ERROR, MPI_POINTER PTR_EVENT_DATA_SAS_SMP_ERROR,
-  MpiEventDataSasSmpError_t, MPI_POINTER pMpiEventDataSasSmpError_t;
-
-/* defines for the Status field of the SAS SMP Error event */
-#define MPI_EVENT_SAS_SMP_FUNCTION_RESULT_VALID         (0x00)
-#define MPI_EVENT_SAS_SMP_CRC_ERROR                     (0x01)
-#define MPI_EVENT_SAS_SMP_TIMEOUT                       (0x02)
-#define MPI_EVENT_SAS_SMP_NO_DESTINATION                (0x03)
-#define MPI_EVENT_SAS_SMP_BAD_DESTINATION               (0x04)
-
-/* SAS Initiator Device Status Change Event data */
-
-typedef struct _EVENT_DATA_SAS_INIT_DEV_STATUS_CHANGE
-{
-    U8                      ReasonCode;                 /* 00h */
-    U8                      Port;                       /* 01h */
-    U16                     DevHandle;                  /* 02h */
-    U64                     SASAddress;                 /* 04h */
-} EVENT_DATA_SAS_INIT_DEV_STATUS_CHANGE,
-  MPI_POINTER PTR_EVENT_DATA_SAS_INIT_DEV_STATUS_CHANGE,
-  MpiEventDataSasInitDevStatusChange_t,
-  MPI_POINTER pMpiEventDataSasInitDevStatusChange_t;
-
-/* defines for the ReasonCode field of the SAS Initiator Device Status Change event */
-#define MPI_EVENT_SAS_INIT_RC_ADDED                 (0x01)
-#define MPI_EVENT_SAS_INIT_RC_REMOVED               (0x02)
-#define MPI_EVENT_SAS_INIT_RC_INACCESSIBLE          (0x03)
-
-/* SAS Initiator Device Table Overflow Event data */
-
-typedef struct _EVENT_DATA_SAS_INIT_TABLE_OVERFLOW
-{
-    U8                      MaxInit;                    /* 00h */
-    U8                      CurrentInit;                /* 01h */
-    U16                     Reserved1;                  /* 02h */
-    U64                     SASAddress;                 /* 04h */
-} EVENT_DATA_SAS_INIT_TABLE_OVERFLOW,
-  MPI_POINTER PTR_EVENT_DATA_SAS_INIT_TABLE_OVERFLOW,
-  MpiEventDataSasInitTableOverflow_t,
-  MPI_POINTER pMpiEventDataSasInitTableOverflow_t;
-
-/* SAS Expander Status Change Event data */
-
-typedef struct _EVENT_DATA_SAS_EXPANDER_STATUS_CHANGE
-{
-    U8                      ReasonCode;             /* 00h */
-    U8                      Reserved1;              /* 01h */
-    U16                     Reserved2;              /* 02h */
-    U8                      PhysicalPort;           /* 04h */
-    U8                      Reserved3;              /* 05h */
-    U16                     EnclosureHandle;        /* 06h */
-    U64                     SASAddress;             /* 08h */
-    U32                     DiscoveryStatus;        /* 10h */
-    U16                     DevHandle;              /* 14h */
-    U16                     ParentDevHandle;        /* 16h */
-    U16                     ExpanderChangeCount;    /* 18h */
-    U16                     ExpanderRouteIndexes;   /* 1Ah */
-    U8                      NumPhys;                /* 1Ch */
-    U8                      SASLevel;               /* 1Dh */
-    U8                      Flags;                  /* 1Eh */
-    U8                      Reserved4;              /* 1Fh */
-} EVENT_DATA_SAS_EXPANDER_STATUS_CHANGE,
-  MPI_POINTER PTR_EVENT_DATA_SAS_EXPANDER_STATUS_CHANGE,
-  MpiEventDataSasExpanderStatusChange_t,
-  MPI_POINTER pMpiEventDataSasExpanderStatusChange_t;
-
-/* values for ReasonCode field of SAS Expander Status Change Event data */
-#define MPI_EVENT_SAS_EXP_RC_ADDED                      (0x00)
-#define MPI_EVENT_SAS_EXP_RC_NOT_RESPONDING             (0x01)
-
-/* values for DiscoveryStatus field of SAS Expander Status Change Event data */
-#define MPI_EVENT_SAS_EXP_DS_LOOP_DETECTED              (0x00000001)
-#define MPI_EVENT_SAS_EXP_DS_UNADDRESSABLE_DEVICE       (0x00000002)
-#define MPI_EVENT_SAS_EXP_DS_MULTIPLE_PORTS             (0x00000004)
-#define MPI_EVENT_SAS_EXP_DS_EXPANDER_ERR               (0x00000008)
-#define MPI_EVENT_SAS_EXP_DS_SMP_TIMEOUT                (0x00000010)
-#define MPI_EVENT_SAS_EXP_DS_OUT_ROUTE_ENTRIES          (0x00000020)
-#define MPI_EVENT_SAS_EXP_DS_INDEX_NOT_EXIST            (0x00000040)
-#define MPI_EVENT_SAS_EXP_DS_SMP_FUNCTION_FAILED        (0x00000080)
-#define MPI_EVENT_SAS_EXP_DS_SMP_CRC_ERROR              (0x00000100)
-#define MPI_EVENT_SAS_EXP_DS_SUBTRACTIVE_LINK           (0x00000200)
-#define MPI_EVENT_SAS_EXP_DS_TABLE_LINK                 (0x00000400)
-#define MPI_EVENT_SAS_EXP_DS_UNSUPPORTED_DEVICE         (0x00000800)
-
-/* values for Flags field of SAS Expander Status Change Event data */
-#define MPI_EVENT_SAS_EXP_FLAGS_ROUTE_TABLE_CONFIG      (0x02)
-#define MPI_EVENT_SAS_EXP_FLAGS_CONFIG_IN_PROGRESS      (0x01)
-
-
-
-/*****************************************************************************
-*
-*               F i r m w a r e    L o a d    M e s s a g e s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/*  Firmware Download message and associated structures                     */
-/****************************************************************************/
-
-typedef struct _MSG_FW_DOWNLOAD
-{
-    U8                      ImageType;                  /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Reserved1[3];               /* 04h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    SGE_MPI_UNION           SGL;                        /* 0Ch */
-} MSG_FW_DOWNLOAD, MPI_POINTER PTR_MSG_FW_DOWNLOAD,
-  FWDownload_t, MPI_POINTER pFWDownload_t;
-
-#define MPI_FW_DOWNLOAD_MSGFLGS_LAST_SEGMENT    (0x01)
-
-#define MPI_FW_DOWNLOAD_ITYPE_RESERVED          (0x00)
-#define MPI_FW_DOWNLOAD_ITYPE_FW                (0x01)
-#define MPI_FW_DOWNLOAD_ITYPE_BIOS              (0x02)
-#define MPI_FW_DOWNLOAD_ITYPE_NVDATA            (0x03)
-#define MPI_FW_DOWNLOAD_ITYPE_BOOTLOADER        (0x04)
-#define MPI_FW_DOWNLOAD_ITYPE_MANUFACTURING     (0x06)
-#define MPI_FW_DOWNLOAD_ITYPE_CONFIG_1          (0x07)
-#define MPI_FW_DOWNLOAD_ITYPE_CONFIG_2          (0x08)
-#define MPI_FW_DOWNLOAD_ITYPE_MEGARAID          (0x09)
-#define MPI_FW_DOWNLOAD_ITYPE_COMMON_BOOT_BLOCK (0x0B)
-
-
-typedef struct _FWDownloadTCSGE
-{
-    U8                      Reserved;                   /* 00h */
-    U8                      ContextSize;                /* 01h */
-    U8                      DetailsLength;              /* 02h */
-    U8                      Flags;                      /* 03h */
-    U32                     Reserved_0100_Checksum;     /* 04h */ /* obsolete Checksum */
-    U32                     ImageOffset;                /* 08h */
-    U32                     ImageSize;                  /* 0Ch */
-} FW_DOWNLOAD_TCSGE, MPI_POINTER PTR_FW_DOWNLOAD_TCSGE,
-  FWDownloadTCSGE_t, MPI_POINTER pFWDownloadTCSGE_t;
-
-/* Firmware Download reply */
-typedef struct _MSG_FW_DOWNLOAD_REPLY
-{
-    U8                      ImageType;                  /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Reserved1[3];               /* 04h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved2;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-} MSG_FW_DOWNLOAD_REPLY, MPI_POINTER PTR_MSG_FW_DOWNLOAD_REPLY,
-  FWDownloadReply_t, MPI_POINTER pFWDownloadReply_t;
-
-
-/****************************************************************************/
-/*  Firmware Upload message and associated structures                       */
-/****************************************************************************/
-
-typedef struct _MSG_FW_UPLOAD
-{
-    U8                      ImageType;                  /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Reserved1[3];               /* 04h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    SGE_MPI_UNION           SGL;                        /* 0Ch */
-} MSG_FW_UPLOAD, MPI_POINTER PTR_MSG_FW_UPLOAD,
-  FWUpload_t, MPI_POINTER pFWUpload_t;
-
-#define MPI_FW_UPLOAD_ITYPE_FW_IOC_MEM          (0x00)
-#define MPI_FW_UPLOAD_ITYPE_FW_FLASH            (0x01)
-#define MPI_FW_UPLOAD_ITYPE_BIOS_FLASH          (0x02)
-#define MPI_FW_UPLOAD_ITYPE_NVDATA              (0x03)
-#define MPI_FW_UPLOAD_ITYPE_BOOTLOADER          (0x04)
-#define MPI_FW_UPLOAD_ITYPE_FW_BACKUP           (0x05)
-#define MPI_FW_UPLOAD_ITYPE_MANUFACTURING       (0x06)
-#define MPI_FW_UPLOAD_ITYPE_CONFIG_1            (0x07)
-#define MPI_FW_UPLOAD_ITYPE_CONFIG_2            (0x08)
-#define MPI_FW_UPLOAD_ITYPE_MEGARAID            (0x09)
-#define MPI_FW_UPLOAD_ITYPE_COMPLETE            (0x0A)
-#define MPI_FW_UPLOAD_ITYPE_COMMON_BOOT_BLOCK   (0x0B)
-
-typedef struct _FWUploadTCSGE
-{
-    U8                      Reserved;                   /* 00h */
-    U8                      ContextSize;                /* 01h */
-    U8                      DetailsLength;              /* 02h */
-    U8                      Flags;                      /* 03h */
-    U32                     Reserved1;                  /* 04h */
-    U32                     ImageOffset;                /* 08h */
-    U32                     ImageSize;                  /* 0Ch */
-} FW_UPLOAD_TCSGE, MPI_POINTER PTR_FW_UPLOAD_TCSGE,
-  FWUploadTCSGE_t, MPI_POINTER pFWUploadTCSGE_t;
-
-/* Firmware Upload reply */
-typedef struct _MSG_FW_UPLOAD_REPLY
-{
-    U8                      ImageType;                  /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      Reserved1[3];               /* 04h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved2;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-    U32                     ActualImageSize;            /* 14h */
-} MSG_FW_UPLOAD_REPLY, MPI_POINTER PTR_MSG_FW_UPLOAD_REPLY,
-  FWUploadReply_t, MPI_POINTER pFWUploadReply_t;
-
-
-typedef struct _MPI_FW_HEADER
-{
-    U32                     ArmBranchInstruction0;      /* 00h */
-    U32                     Signature0;                 /* 04h */
-    U32                     Signature1;                 /* 08h */
-    U32                     Signature2;                 /* 0Ch */
-    U32                     ArmBranchInstruction1;      /* 10h */
-    U32                     ArmBranchInstruction2;      /* 14h */
-    U32                     Reserved;                   /* 18h */
-    U32                     Checksum;                   /* 1Ch */
-    U16                     VendorId;                   /* 20h */
-    U16                     ProductId;                  /* 22h */
-    MPI_FW_VERSION          FWVersion;                  /* 24h */
-    U32                     SeqCodeVersion;             /* 28h */
-    U32                     ImageSize;                  /* 2Ch */
-    U32                     NextImageHeaderOffset;      /* 30h */
-    U32                     LoadStartAddress;           /* 34h */
-    U32                     IopResetVectorValue;        /* 38h */
-    U32                     IopResetRegAddr;            /* 3Ch */
-    U32                     VersionNameWhat;            /* 40h */
-    U8                      VersionName[32];            /* 44h */
-    U32                     VendorNameWhat;             /* 64h */
-    U8                      VendorName[32];             /* 68h */
-} MPI_FW_HEADER, MPI_POINTER PTR_MPI_FW_HEADER,
-  MpiFwHeader_t, MPI_POINTER pMpiFwHeader_t;
-
-#define MPI_FW_HEADER_WHAT_SIGNATURE        (0x29232840)
-
-/* defines for using the ProductId field */
-#define MPI_FW_HEADER_PID_TYPE_MASK             (0xF000)
-#define MPI_FW_HEADER_PID_TYPE_SCSI             (0x0000)
-#define MPI_FW_HEADER_PID_TYPE_FC               (0x1000)
-#define MPI_FW_HEADER_PID_TYPE_SAS              (0x2000)
-
-#define MPI_FW_HEADER_SIGNATURE_0               (0x5AEAA55A)
-#define MPI_FW_HEADER_SIGNATURE_1               (0xA55AEAA5)
-#define MPI_FW_HEADER_SIGNATURE_2               (0x5AA55AEA)
-
-#define MPI_FW_HEADER_PID_PROD_MASK                     (0x0F00)
-#define MPI_FW_HEADER_PID_PROD_INITIATOR_SCSI           (0x0100)
-#define MPI_FW_HEADER_PID_PROD_TARGET_INITIATOR_SCSI    (0x0200)
-#define MPI_FW_HEADER_PID_PROD_TARGET_SCSI              (0x0300)
-#define MPI_FW_HEADER_PID_PROD_IM_SCSI                  (0x0400)
-#define MPI_FW_HEADER_PID_PROD_IS_SCSI                  (0x0500)
-#define MPI_FW_HEADER_PID_PROD_CTX_SCSI                 (0x0600)
-#define MPI_FW_HEADER_PID_PROD_IR_SCSI                  (0x0700)
-
-#define MPI_FW_HEADER_PID_FAMILY_MASK           (0x00FF)
-/* SCSI */
-#define MPI_FW_HEADER_PID_FAMILY_1030A0_SCSI    (0x0001)
-#define MPI_FW_HEADER_PID_FAMILY_1030B0_SCSI    (0x0002)
-#define MPI_FW_HEADER_PID_FAMILY_1030B1_SCSI    (0x0003)
-#define MPI_FW_HEADER_PID_FAMILY_1030C0_SCSI    (0x0004)
-#define MPI_FW_HEADER_PID_FAMILY_1020A0_SCSI    (0x0005)
-#define MPI_FW_HEADER_PID_FAMILY_1020B0_SCSI    (0x0006)
-#define MPI_FW_HEADER_PID_FAMILY_1020B1_SCSI    (0x0007)
-#define MPI_FW_HEADER_PID_FAMILY_1020C0_SCSI    (0x0008)
-#define MPI_FW_HEADER_PID_FAMILY_1035A0_SCSI    (0x0009)
-#define MPI_FW_HEADER_PID_FAMILY_1035B0_SCSI    (0x000A)
-#define MPI_FW_HEADER_PID_FAMILY_1030TA0_SCSI   (0x000B)
-#define MPI_FW_HEADER_PID_FAMILY_1020TA0_SCSI   (0x000C)
-/* Fibre Channel */
-#define MPI_FW_HEADER_PID_FAMILY_909_FC         (0x0000)
-#define MPI_FW_HEADER_PID_FAMILY_919_FC         (0x0001) /* 919 and 929     */
-#define MPI_FW_HEADER_PID_FAMILY_919X_FC        (0x0002) /* 919X and 929X   */
-#define MPI_FW_HEADER_PID_FAMILY_919XL_FC       (0x0003) /* 919XL and 929XL */
-#define MPI_FW_HEADER_PID_FAMILY_939X_FC        (0x0004) /* 939X and 949X   */
-#define MPI_FW_HEADER_PID_FAMILY_959_FC         (0x0005)
-#define MPI_FW_HEADER_PID_FAMILY_949E_FC        (0x0006)
-/* SAS */
-#define MPI_FW_HEADER_PID_FAMILY_1064_SAS       (0x0001)
-#define MPI_FW_HEADER_PID_FAMILY_1068_SAS       (0x0002)
-#define MPI_FW_HEADER_PID_FAMILY_1078_SAS       (0x0003)
-#define MPI_FW_HEADER_PID_FAMILY_106xE_SAS      (0x0004) /* 1068E, 1066E, and 1064E */
-
-typedef struct _MPI_EXT_IMAGE_HEADER
-{
-    U8                      ImageType;                  /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U16                     Reserved1;                  /* 02h */
-    U32                     Checksum;                   /* 04h */
-    U32                     ImageSize;                  /* 08h */
-    U32                     NextImageHeaderOffset;      /* 0Ch */
-    U32                     LoadStartAddress;           /* 10h */
-    U32                     Reserved2;                  /* 14h */
-} MPI_EXT_IMAGE_HEADER, MPI_POINTER PTR_MPI_EXT_IMAGE_HEADER,
-  MpiExtImageHeader_t, MPI_POINTER pMpiExtImageHeader_t;
-
-/* defines for the ImageType field */
-#define MPI_EXT_IMAGE_TYPE_UNSPECIFIED          (0x00)
-#define MPI_EXT_IMAGE_TYPE_FW                   (0x01)
-#define MPI_EXT_IMAGE_TYPE_NVDATA               (0x03)
-#define MPI_EXT_IMAGE_TYPE_BOOTLOADER           (0x04)
-#define MPI_EXT_IMAGE_TYPE_INITIALIZATION       (0x05)
-
-#endif
diff --git a/include.new/dev/mpt/mpilib/mpi_lan.h b/include.new/dev/mpt/mpilib/mpi_lan.h
deleted file mode 100644
index cc8626e..0000000
--- a/include.new/dev/mpt/mpilib/mpi_lan.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_lan.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * 
- *           Name:  mpi_lan.h
- *          Title:  MPI LAN messages and structures
- *  Creation Date:  June 30, 2000
- *
- *    mpi_lan.h Version:  01.05.01
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  05-08-00  00.10.01  Original release for 0.10 spec dated 4/26/2000.
- *  05-24-00  00.10.02  Added LANStatus field to _MSG_LAN_SEND_REPLY.
- *                      Added LANStatus field to _MSG_LAN_RECEIVE_POST_REPLY.
- *                      Moved ListCount field in _MSG_LAN_RECEIVE_POST_REPLY.
- *  06-06-00  01.00.01  Update version number for 1.0 release.
- *  06-12-00  01.00.02  Added MPI_ to BUCKETSTATUS_ definitions.
- *  06-22-00  01.00.03  Major changes to match new LAN definition in 1.0 spec.
- *  06-30-00  01.00.04  Added Context Reply definitions per revised proposal.
- *                      Changed transaction context usage to bucket/buffer.
- *  07-05-00  01.00.05  Removed LAN_RECEIVE_POST_BUCKET_CONTEXT_MASK definition
- *                      to lan private header file
- *  11-02-00  01.01.01  Original release for post 1.0 work
- *  02-20-01  01.01.02  Started using MPI_POINTER.
- *  03-27-01  01.01.03  Added structure offset comments.
- *  08-08-01  01.02.01  Original release for v1.2 work.
- *  05-11-04  01.03.01  Original release for MPI v1.3.
- *  08-19-04  01.05.01  Original release for MPI v1.5.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_LAN_H
-#define MPI_LAN_H
-
-
-/******************************************************************************
-*
-*               L A N    M e s s a g e s
-*
-*******************************************************************************/
-
-/* LANSend messages */
-
-typedef struct _MSG_LAN_SEND_REQUEST
-{
-    U16                     Reserved;           /* 00h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved2;          /* 04h */
-    U8                      PortNumber;         /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    SGE_MPI_UNION           SG_List[1];         /* 0Ch */
-} MSG_LAN_SEND_REQUEST, MPI_POINTER PTR_MSG_LAN_SEND_REQUEST,
-  LANSendRequest_t, MPI_POINTER pLANSendRequest_t;
-
-
-typedef struct _MSG_LAN_SEND_REPLY
-{
-    U16                     Reserved;           /* 00h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      Reserved2;          /* 04h */
-    U8                      NumberOfContexts;   /* 05h */
-    U8                      PortNumber;         /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved3;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     BufferContext;      /* 14h */
-} MSG_LAN_SEND_REPLY, MPI_POINTER PTR_MSG_LAN_SEND_REPLY,
-  LANSendReply_t, MPI_POINTER pLANSendReply_t;
-
-
-/* LANReceivePost */
-
-typedef struct _MSG_LAN_RECEIVE_POST_REQUEST
-{
-    U16                     Reserved;           /* 00h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved2;          /* 04h */
-    U8                      PortNumber;         /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U32                     BucketCount;        /* 0Ch */
-    SGE_MPI_UNION           SG_List[1];         /* 10h */
-} MSG_LAN_RECEIVE_POST_REQUEST, MPI_POINTER PTR_MSG_LAN_RECEIVE_POST_REQUEST,
-  LANReceivePostRequest_t, MPI_POINTER pLANReceivePostRequest_t;
-
-
-typedef struct _MSG_LAN_RECEIVE_POST_REPLY
-{
-    U16                     Reserved;           /* 00h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      Reserved2;          /* 04h */
-    U8                      NumberOfContexts;   /* 05h */
-    U8                      PortNumber;         /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved3;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     BucketsRemaining;   /* 14h */
-    U32                     PacketOffset;       /* 18h */
-    U32                     PacketLength;       /* 1Ch */
-    U32                     BucketContext[1];   /* 20h */
-} MSG_LAN_RECEIVE_POST_REPLY, MPI_POINTER PTR_MSG_LAN_RECEIVE_POST_REPLY,
-  LANReceivePostReply_t, MPI_POINTER pLANReceivePostReply_t;
-
-
-/* LANReset */
-
-typedef struct _MSG_LAN_RESET_REQUEST
-{
-    U16                     Reserved;           /* 00h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved2;          /* 04h */
-    U8                      PortNumber;         /* 05h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-} MSG_LAN_RESET_REQUEST, MPI_POINTER PTR_MSG_LAN_RESET_REQUEST,
-  LANResetRequest_t, MPI_POINTER pLANResetRequest_t;
-
-
-typedef struct _MSG_LAN_RESET_REPLY
-{
-    U16                     Reserved;           /* 00h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved2;          /* 04h */
-    U8                      PortNumber;         /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved3;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-} MSG_LAN_RESET_REPLY, MPI_POINTER PTR_MSG_LAN_RESET_REPLY,
-  LANResetReply_t, MPI_POINTER pLANResetReply_t;
-
-
-/****************************************************************************/
-/* LAN Context Reply defines and macros                                     */
-/****************************************************************************/
-
-#define LAN_REPLY_PACKET_LENGTH_MASK            (0x0000FFFF)
-#define LAN_REPLY_PACKET_LENGTH_SHIFT           (0)
-#define LAN_REPLY_BUCKET_CONTEXT_MASK           (0x07FF0000)
-#define LAN_REPLY_BUCKET_CONTEXT_SHIFT          (16)
-#define LAN_REPLY_BUFFER_CONTEXT_MASK           (0x07FFFFFF)
-#define LAN_REPLY_BUFFER_CONTEXT_SHIFT          (0)
-#define LAN_REPLY_FORM_MASK                     (0x18000000)
-#define LAN_REPLY_FORM_RECEIVE_SINGLE           (0x00)
-#define LAN_REPLY_FORM_RECEIVE_MULTIPLE         (0x01)
-#define LAN_REPLY_FORM_SEND_SINGLE              (0x02)
-#define LAN_REPLY_FORM_MESSAGE_CONTEXT          (0x03)
-#define LAN_REPLY_FORM_SHIFT                    (27)
-
-#define GET_LAN_PACKET_LENGTH(x)    (((x) & LAN_REPLY_PACKET_LENGTH_MASK)   \
-                                        >> LAN_REPLY_PACKET_LENGTH_SHIFT)
-
-#define SET_LAN_PACKET_LENGTH(x, lth)                                       \
-            ((x) = ((x) & ~LAN_REPLY_PACKET_LENGTH_MASK) |                  \
-                            (((lth) << LAN_REPLY_PACKET_LENGTH_SHIFT) &     \
-                                        LAN_REPLY_PACKET_LENGTH_MASK))
-
-#define GET_LAN_BUCKET_CONTEXT(x)   (((x) & LAN_REPLY_BUCKET_CONTEXT_MASK)  \
-                                        >> LAN_REPLY_BUCKET_CONTEXT_SHIFT)
-
-#define SET_LAN_BUCKET_CONTEXT(x, ctx)                                      \
-            ((x) = ((x) & ~LAN_REPLY_BUCKET_CONTEXT_MASK) |                 \
-                            (((ctx) << LAN_REPLY_BUCKET_CONTEXT_SHIFT) &    \
-                                        LAN_REPLY_BUCKET_CONTEXT_MASK))
-
-#define GET_LAN_BUFFER_CONTEXT(x)   (((x) & LAN_REPLY_BUFFER_CONTEXT_MASK)  \
-                                        >> LAN_REPLY_BUFFER_CONTEXT_SHIFT)
-
-#define SET_LAN_BUFFER_CONTEXT(x, ctx)                                      \
-            ((x) = ((x) & ~LAN_REPLY_BUFFER_CONTEXT_MASK) |                 \
-                            (((ctx) << LAN_REPLY_BUFFER_CONTEXT_SHIFT) &    \
-                                        LAN_REPLY_BUFFER_CONTEXT_MASK))
-
-#define GET_LAN_FORM(x)             (((x) & LAN_REPLY_FORM_MASK)            \
-                                        >> LAN_REPLY_FORM_SHIFT)
-
-#define SET_LAN_FORM(x, frm)                                                \
-            ((x) = ((x) & ~LAN_REPLY_FORM_MASK) |                           \
-                            (((frm) << LAN_REPLY_FORM_SHIFT) &              \
-                                        LAN_REPLY_FORM_MASK))
-
-
-/****************************************************************************/
-/* LAN Current Device State defines                                         */
-/****************************************************************************/
-
-#define MPI_LAN_DEVICE_STATE_RESET                     (0x00)
-#define MPI_LAN_DEVICE_STATE_OPERATIONAL               (0x01)
-
-
-/****************************************************************************/
-/* LAN Loopback defines                                                     */
-/****************************************************************************/
-
-#define MPI_LAN_TX_MODES_ENABLE_LOOPBACK_SUPPRESSION   (0x01)
-
-#endif
-
diff --git a/include.new/dev/mpt/mpilib/mpi_log_fc.h b/include.new/dev/mpt/mpilib/mpi_log_fc.h
deleted file mode 100644
index 61dee86..0000000
--- a/include.new/dev/mpt/mpilib/mpi_log_fc.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_log_fc.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  NAME:           fc_log.h
- *  SUMMARY:        MPI IocLogInfo definitions for the SYMFC9xx chips
- *  DESCRIPTION:    Contains the enumerated list of values that may be returned
- *                  in the IOCLogInfo field of a MPI Default Reply Message.
- *
- *  CREATION DATE:  6/02/2000
- *  ID:             $Id: fc_log.h,v 4.6 2001/07/26 14:41:33 sschremm Exp $
- */
-
-
-/*
- * MpiIocLogInfo_t enum
- *
- * These 32 bit values are used in the IOCLogInfo field of the MPI reply
- * messages.
- * The value is 0xabcccccc where
- *          a = The type of log info as per the MPI spec. Since these codes are
- *              all for Fibre Channel this value will always be 2.
- *          b = Specifies a subclass of the firmware where
- *                  0 = FCP Initiator
- *                  1 = FCP Target
- *                  2 = LAN
- *                  3 = MPI Message Layer
- *                  4 = FC Link
- *                  5 = Context Manager
- *                  6 = Invalid Field Offset
- *                  7 = State Change Info
- *                  all others are reserved for future use
- *          c = A specific value within the subclass.
- *
- * NOTE: Any new values should be added to the end of each subclass so that the
- *       codes remain consistent across firmware releases.
- */
-typedef enum _MpiIocLogInfoFc
-{
-    MPI_IOCLOGINFO_FC_INIT_BASE                     = 0x20000000,
-    MPI_IOCLOGINFO_FC_INIT_ERROR_OUT_OF_ORDER_FRAME = 0x20000001, /* received an out of order frame - unsupported */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_START_OF_FRAME = 0x20000002, /* Bad Rx Frame, bad start of frame primative */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_BAD_END_OF_FRAME   = 0x20000003, /* Bad Rx Frame, bad end of frame primative */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_OVER_RUN           = 0x20000004, /* Bad Rx Frame, overrun */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OTHER           = 0x20000005, /* Other errors caught by IOC which require retries */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_SUBPROC_DEAD       = 0x20000006, /* Main processor could not initialize sub-processor */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_RX_OVERRUN         = 0x20000007, /* Scatter Gather overrun  */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_RX_BAD_STATUS      = 0x20000008, /* Receiver detected context mismatch via invalid header */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_RX_UNEXPECTED_FRAME= 0x20000009, /* CtxMgr detected unsupported frame type  */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_LINK_FAILURE       = 0x2000000A, /* Link failure occurred  */
-    MPI_IOCLOGINFO_FC_INIT_ERROR_TX_TIMEOUT         = 0x2000000B, /* Transmitter timeout error */
-
-    MPI_IOCLOGINFO_FC_TARGET_BASE                   = 0x21000000,
-    MPI_IOCLOGINFO_FC_TARGET_NO_PDISC               = 0x21000001, /* not sent because we are waiting for a PDISC from the initiator */
-    MPI_IOCLOGINFO_FC_TARGET_NO_LOGIN               = 0x21000002, /* not sent because we are not logged in to the remote node */
-    MPI_IOCLOGINFO_FC_TARGET_DOAR_KILLED_BY_LIP     = 0x21000003, /* Data Out, Auto Response, not sent due to a LIP */
-    MPI_IOCLOGINFO_FC_TARGET_DIAR_KILLED_BY_LIP     = 0x21000004, /* Data In, Auto Response, not sent due to a LIP */
-    MPI_IOCLOGINFO_FC_TARGET_DIAR_MISSING_DATA      = 0x21000005, /* Data In, Auto Response, missing data frames */
-    MPI_IOCLOGINFO_FC_TARGET_DONR_KILLED_BY_LIP     = 0x21000006, /* Data Out, No Response, not sent due to a LIP */
-    MPI_IOCLOGINFO_FC_TARGET_WRSP_KILLED_BY_LIP     = 0x21000007, /* Auto-response after a write not sent due to a LIP */
-    MPI_IOCLOGINFO_FC_TARGET_DINR_KILLED_BY_LIP     = 0x21000008, /* Data In, No Response, not completed due to a LIP */
-    MPI_IOCLOGINFO_FC_TARGET_DINR_MISSING_DATA      = 0x21000009, /* Data In, No Response, missing data frames */
-    MPI_IOCLOGINFO_FC_TARGET_MRSP_KILLED_BY_LIP     = 0x2100000a, /* Manual Response not sent due to a LIP */
-    MPI_IOCLOGINFO_FC_TARGET_NO_CLASS_3             = 0x2100000b, /* not sent because remote node does not support Class 3 */
-    MPI_IOCLOGINFO_FC_TARGET_LOGIN_NOT_VALID        = 0x2100000c, /* not sent because login to remote node not validated */
-    MPI_IOCLOGINFO_FC_TARGET_FROM_OUTBOUND          = 0x2100000e, /* cleared from the outbound queue after a logout */
-    MPI_IOCLOGINFO_FC_TARGET_WAITING_FOR_DATA_IN    = 0x2100000f, /* cleared waiting for data after a logout */
-
-    MPI_IOCLOGINFO_FC_LAN_BASE                      = 0x22000000,
-    MPI_IOCLOGINFO_FC_LAN_TRANS_SGL_MISSING         = 0x22000001, /* Transaction Context Sgl Missing */
-    MPI_IOCLOGINFO_FC_LAN_TRANS_WRONG_PLACE         = 0x22000002, /* Transaction Context found before an EOB */
-    MPI_IOCLOGINFO_FC_LAN_TRANS_RES_BITS_SET        = 0x22000003, /* Transaction Context value has reserved bits set */
-    MPI_IOCLOGINFO_FC_LAN_WRONG_SGL_FLAG            = 0x22000004, /* Invalid SGL Flags */
-
-    MPI_IOCLOGINFO_FC_MSG_BASE                      = 0x23000000,
-
-    MPI_IOCLOGINFO_FC_LINK_BASE                     = 0x24000000,
-    MPI_IOCLOGINFO_FC_LINK_LOOP_INIT_TIMEOUT        = 0x24000001, /* Loop initialization timed out */
-    MPI_IOCLOGINFO_FC_LINK_ALREADY_INITIALIZED      = 0x24000002, /* Another system controller already initialized the loop */
-    MPI_IOCLOGINFO_FC_LINK_LINK_NOT_ESTABLISHED     = 0x24000003, /* Not synchronized to signal or still negotiating (possible cable problem) */
-    MPI_IOCLOGINFO_FC_LINK_CRC_ERROR                = 0x24000004, /* CRC check detected error on received frame */
-
-    MPI_IOCLOGINFO_FC_CTX_BASE                      = 0x25000000,
-
-    MPI_IOCLOGINFO_FC_INVALID_FIELD_BYTE_OFFSET     = 0x26000000, /* The lower 24 bits give the byte offset of the field in the request message that is invalid */
-    MPI_IOCLOGINFO_FC_INVALID_FIELD_MAX_OFFSET      = 0x26ffffff,
-
-    MPI_IOCLOGINFO_FC_STATE_CHANGE                  = 0x27000000  /* The lower 24 bits give additional information concerning state change */
-
-} MpiIocLogInfoFc_t;
diff --git a/include.new/dev/mpt/mpilib/mpi_log_sas.h b/include.new/dev/mpt/mpilib/mpi_log_sas.h
deleted file mode 100644
index c20f89e..0000000
--- a/include.new/dev/mpt/mpilib/mpi_log_sas.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_log_sas.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/***************************************************************************
- *                                                                         *
- * Description                                                             *
- * ------------                                                            *
- * This include file contains SAS firmware interface IOC Log Info codes    *
- *                                                                         *
- *-------------------------------------------------------------------------*
- */
-
-#ifndef IOPI_IOCLOGINFO_H_INCLUDED
-#define IOPI_IOCLOGINFO_H_INCLUDED
-
-#define SAS_LOGINFO_NEXUS_LOSS		0x31170000
-#define SAS_LOGINFO_MASK		0xFFFF0000
-
-/****************************************************************************/
-/*  IOC LOGINFO defines, 0x00000000 - 0x0FFFFFFF                            */
-/*  Format:                                                                 */
-/*      Bits 31-28: MPI_IOCLOGINFO_TYPE_SAS (3)                             */
-/*      Bits 27-24: IOC_LOGINFO_ORIGINATOR: 0=IOP, 1=PL, 2=IR               */
-/*      Bits 23-16: LOGINFO_CODE                                            */
-/*      Bits 15-0:  LOGINFO_CODE Specific                                   */
-/****************************************************************************/
-
-/****************************************************************************/
-/* IOC_LOGINFO_ORIGINATOR defines                                           */
-/****************************************************************************/
-#define IOC_LOGINFO_ORIGINATOR_IOP                      (0x00000000)
-#define IOC_LOGINFO_ORIGINATOR_PL                       (0x01000000)
-#define IOC_LOGINFO_ORIGINATOR_IR                       (0x02000000)
-
-#define IOC_LOGINFO_ORIGINATOR_MASK                     (0x0F000000)
-
-/****************************************************************************/
-/* LOGINFO_CODE defines                                                     */
-/****************************************************************************/
-#define IOC_LOGINFO_CODE_MASK                           (0x00FF0000)
-#define IOC_LOGINFO_CODE_SHIFT                          (16)
-
-/****************************************************************************/
-/* IOP LOGINFO_CODE defines, valid if IOC_LOGINFO_ORIGINATOR = IOP          */
-/****************************************************************************/
-#define IOP_LOGINFO_CODE_INVALID_SAS_ADDRESS                 (0x00010000)
-#define IOP_LOGINFO_CODE_UNUSED2                             (0x00020000)
-#define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE                 (0x00030000)
-#define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_RT              (0x00030100) /* Route Table Entry not found */
-#define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_PN              (0x00030200) /* Invalid Page Number */
-#define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_FORM            (0x00030300) /* Invalid FORM */
-#define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_PT              (0x00030400) /* Invalid Page Type */
-#define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_DNM             (0x00030500) /* Device Not Mapped */
-#define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_PERSIST         (0x00030600) /* Persistent Page not found */
-#define IOP_LOGINFO_CODE_CONFIG_INVALID_PAGE_DEFAULT         (0x00030700) /* Default Page not found */
-
-#define IOP_LOGINFO_CODE_FWUPLOAD_NO_FLASH_AVAILABLE         (0x0003E000) /* Tried to upload from flash, but there is none */
-#define IOP_LOGINFO_CODE_FWUPLOAD_UNKNOWN_IMAGE_TYPE         (0x0003E001) /* ImageType field contents were invalid */
-#define IOP_LOGINFO_CODE_FWUPLOAD_WRONG_IMAGE_SIZE           (0x0003E002) /* ImageSize field in TCSGE was bad/offset in MfgPg 4 was wrong */
-#define IOP_LOGINFO_CODE_FWUPLOAD_ENTIRE_FLASH_UPLOAD_FAILED (0x0003E003) /* Error occured while attempting to upload the entire flash */
-#define IOP_LOGINFO_CODE_FWUPLOAD_REGION_UPLOAD_FAILED       (0x0003E004) /* Error occured while attempting to upload single flash region */
-#define IOP_LOGINFO_CODE_FWUPLOAD_DMA_FAILURE                (0x0003E005) /* Problem occured while DMAing FW to host memory */
-
-#define IOP_LOGINFO_CODE_DIAG_MSG_ERROR                      (0x00040000) /* Error handling diag msg - or'd with diag status */
-
-#define IOP_LOGINFO_CODE_TASK_TERMINATED                     (0x00050000)
-
-#define IOP_LOGINFO_CODE_ENCL_MGMT_READ_ACTION_ERR0R         (0x00060001) /* Read Action not supported for SEP msg */
-#define IOP_LOGINFO_CODE_ENCL_MGMT_INVALID_BUS_ID_ERR0R      (0x00060002) /* Invalid Bus/ID in SEP msg */
-
-#define IOP_LOGINFO_CODE_TARGET_ASSIST_TERMINATED            (0x00070001)
-#define IOP_LOGINFO_CODE_TARGET_STATUS_SEND_TERMINATED       (0x00070002)
-#define IOP_LOGINFO_CODE_TARGET_MODE_ABORT_ALL_IO            (0x00070003)
-#define IOP_LOGINFO_CODE_TARGET_MODE_ABORT_EXACT_IO          (0x00070004)
-#define IOP_LOGINFO_CODE_TARGET_MODE_ABORT_EXACT_IO_REQ      (0x00070005)
-
-#define IOP_LOGINFO_CODE_LOG_TIMESTAMP_EVENT                 (0x00080000)
-
-/****************************************************************************/
-/* PL LOGINFO_CODE defines, valid if IOC_LOGINFO_ORIGINATOR = PL            */
-/****************************************************************************/
-#define PL_LOGINFO_CODE_OPEN_FAILURE                         (0x00010000) /* see SUB_CODE_OPEN_FAIL_ below */
-
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_NO_DEST_TIME_OUT       (0x00000001)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_PATHWAY_BLOCKED        (0x00000002)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RES_CONTINUE0          (0x00000003)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RES_CONTINUE1          (0x00000004)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RES_INITIALIZE0        (0x00000005)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RES_INITIALIZE1        (0x00000006)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RES_STOP0              (0x00000007)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RES_STOP1              (0x00000008)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RETRY                  (0x00000009)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_BREAK                  (0x0000000A)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_UNUSED_0B              (0x0000000B)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_OPEN_TIMEOUT_EXP       (0x0000000C)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_UNUSED_0D              (0x0000000D)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_DVTBLE_ACCSS_FAIL      (0x0000000E)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_BAD_DEST               (0x00000011)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RATE_NOT_SUPP          (0x00000012)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_PROT_NOT_SUPP          (0x00000013)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RESERVED_ABANDON0      (0x00000014)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RESERVED_ABANDON1      (0x00000015)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RESERVED_ABANDON2      (0x00000016)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_RESERVED_ABANDON3      (0x00000017)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_STP_RESOURCES_BSY      (0x00000018)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_WRONG_DESTINATION      (0x00000019)
-
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_PATH_BLOCKED           (0x0000001B) /* Retry Timeout */
-#define PL_LOGINFO_SUB_CODE_OPEN_FAIL_AWT_MAXED              (0x0000001C) /* Retry Timeout */
-
-
-
-#define PL_LOGINFO_CODE_INVALID_SGL                          (0x00020000)
-#define PL_LOGINFO_CODE_WRONG_REL_OFF_OR_FRAME_LENGTH        (0x00030000)
-#define PL_LOGINFO_CODE_FRAME_XFER_ERROR                     (0x00040000)
-#define PL_LOGINFO_CODE_TX_FM_CONNECTED_LOW                  (0x00050000)
-#define PL_LOGINFO_CODE_SATA_NON_NCQ_RW_ERR_BIT_SET          (0x00060000)
-#define PL_LOGINFO_CODE_SATA_READ_LOG_RECEIVE_DATA_ERR       (0x00070000)
-#define PL_LOGINFO_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR      (0x00080000)
-#define PL_LOGINFO_CODE_SATA_ERR_IN_RCV_SET_DEV_BIT_FIS      (0x00090000)
-#define PL_LOGINFO_CODE_RX_FM_INVALID_MESSAGE                (0x000A0000)
-#define PL_LOGINFO_CODE_RX_CTX_MESSAGE_VALID_ERROR           (0x000B0000)
-#define PL_LOGINFO_CODE_RX_FM_CURRENT_FRAME_ERROR            (0x000C0000)
-#define PL_LOGINFO_CODE_SATA_LINK_DOWN                       (0x000D0000)
-#define PL_LOGINFO_CODE_DISCOVERY_SATA_INIT_W_IOS            (0x000E0000)
-#define PL_LOGINFO_CODE_CONFIG_INVALID_PAGE                  (0x000F0000)
-#define PL_LOGINFO_CODE_CONFIG_PL_NOT_INITIALIZED            (0x000F0001) /* PL not yet initialized, can't do config page req. */
-#define PL_LOGINFO_CODE_CONFIG_INVALID_PAGE_PT               (0x000F0100) /* Invalid Page Type */
-#define PL_LOGINFO_CODE_CONFIG_INVALID_PAGE_NUM_PHYS         (0x000F0200) /* Invalid Number of Phys */
-#define PL_LOGINFO_CODE_CONFIG_INVALID_PAGE_NOT_IMP          (0x000F0300) /* Case Not Handled */
-#define PL_LOGINFO_CODE_CONFIG_INVALID_PAGE_NO_DEV           (0x000F0400) /* No Device Found */
-#define PL_LOGINFO_CODE_CONFIG_INVALID_PAGE_FORM             (0x000F0500) /* Invalid FORM */
-#define PL_LOGINFO_CODE_CONFIG_INVALID_PAGE_PHY              (0x000F0600) /* Invalid Phy */
-#define PL_LOGINFO_CODE_CONFIG_INVALID_PAGE_NO_OWNER         (0x000F0700) /* No Owner Found */
-#define PL_LOGINFO_CODE_DSCVRY_SATA_INIT_TIMEOUT             (0x00100000)
-#define PL_LOGINFO_CODE_RESET                                (0x00110000) /* See Sub-Codes below (PL_LOGINFO_SUB_CODE) */
-#define PL_LOGINFO_CODE_ABORT                                (0x00120000) /* See Sub-Codes below  (PL_LOGINFO_SUB_CODE)*/
-#define PL_LOGINFO_CODE_IO_NOT_YET_EXECUTED                  (0x00130000)
-#define PL_LOGINFO_CODE_IO_EXECUTED                          (0x00140000)
-#define PL_LOGINFO_CODE_PERS_RESV_OUT_NOT_AFFIL_OWNER        (0x00150000)
-#define PL_LOGINFO_CODE_OPEN_TXDMA_ABORT                     (0x00160000)
-#define PL_LOGINFO_CODE_IO_DEVICE_MISSING_DELAY_RETRY        (0x00170000)
-#define PL_LOGINFO_CODE_IO_CANCELLED_DUE_TO_R_ERR            (0x00180000)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE                     (0x00000100)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_NO_DEST_TIMEOUT     (0x00000101)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_SATA_NEG_RATE_2HI   (0x00000102)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_RATE_NOT_SUPPORTED  (0x00000103)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_BREAK               (0x00000104)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_ZONE_VIOLATION      (0x00000114)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_ABANDON0            (0x00000114) /* Open Reject (Zone Violation) - available on SAS-2 devices */
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_ABANDON1            (0x00000115)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_ABANDON2            (0x00000116)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_ABANDON3            (0x00000117)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_ORR_TIMEOUT         (0x0000011A) /* Open Reject (Retry) Timeout */
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_PATH_BLOCKED        (0x0000011B)
-#define PL_LOGINFO_SUB_CODE_OPEN_FAILURE_AWT_MAXED           (0x0000011C) /* Arbitration Wait Timer Maxed */
-
-#define PL_LOGINFO_SUB_CODE_TARGET_BUS_RESET                 (0x00000120)
-#define PL_LOGINFO_SUB_CODE_TRANSPORT_LAYER                  (0x00000130)  /* Leave lower nibble (1-f) reserved. */
-#define PL_LOGINFO_SUB_CODE_PORT_LAYER                       (0x00000140)  /* Leave lower nibble (1-f) reserved. */
-
-
-#define PL_LOGINFO_SUB_CODE_INVALID_SGL                      (0x00000200)
-#define PL_LOGINFO_SUB_CODE_WRONG_REL_OFF_OR_FRAME_LENGTH    (0x00000300)
-#define PL_LOGINFO_SUB_CODE_FRAME_XFER_ERROR                 (0x00000400) /* Bits 0-3 encode Transport Status Register (offset 0x08) */
-                                                                          /* Bit 0 is Status Bit 0: FrameXferErr */
-                                                                          /* Bit 1 & 2 are Status Bits 16 and 17: FrameXmitErrStatus */
-                                                                          /* Bit 3 is Status Bit 18 WriteDataLenghtGTDataLengthErr */
-
-#define PL_LOGINFO_SUB_CODE_TX_FM_CONNECTED_LOW              (0x00000500)
-#define PL_LOGINFO_SUB_CODE_SATA_NON_NCQ_RW_ERR_BIT_SET      (0x00000600)
-#define PL_LOGINFO_SUB_CODE_SATA_READ_LOG_RECEIVE_DATA_ERR   (0x00000700)
-#define PL_LOGINFO_SUB_CODE_SATA_NCQ_FAIL_ALL_CMDS_AFTR_ERR  (0x00000800)
-#define PL_LOGINFO_SUB_CODE_SATA_ERR_IN_RCV_SET_DEV_BIT_FIS  (0x00000900)
-#define PL_LOGINFO_SUB_CODE_RX_FM_INVALID_MESSAGE            (0x00000A00)
-#define PL_LOGINFO_SUB_CODE_RX_CTX_MESSAGE_VALID_ERROR       (0x00000B00)
-#define PL_LOGINFO_SUB_CODE_RX_FM_CURRENT_FRAME_ERROR        (0x00000C00)
-#define PL_LOGINFO_SUB_CODE_SATA_LINK_DOWN                   (0x00000D00)
-#define PL_LOGINFO_SUB_CODE_DISCOVERY_SATA_INIT_W_IOS        (0x00000E00)
-#define PL_LOGINFO_SUB_CODE_DISCOVERY_REMOTE_SEP_RESET       (0x00000E01)
-#define PL_LOGINFO_SUB_CODE_SECOND_OPEN                      (0x00000F00)
-#define PL_LOGINFO_SUB_CODE_DSCVRY_SATA_INIT_TIMEOUT         (0x00001000)
-#define PL_LOGINFO_SUB_CODE_BREAK_ON_SATA_CONNECTION  		 (0x00002000) /* not currently used in mainline */
-#define PL_LOGINFO_SUB_CODE_BREAK_ON_STUCK_LINK              (0x00003000)
-#define PL_LOGINFO_SUB_CODE_BREAK_ON_STUCK_LINK_AIP          (0x00004000)
-#define PL_LOGINFO_SUB_CODE_BREAK_ON_INCOMPLETE_BREAK_RCVD   (0x00005000)
-
-#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_FRAME_FAILURE          (0x00200000) /* Can't get SMP Frame */
-#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_READ_ERROR             (0x00200010) /* Error occured on SMP Read */
-#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_WRITE_ERROR            (0x00200020) /* Error occured on SMP Write */
-#define PL_LOGINFO_CODE_ENCL_MGMT_NOT_SUPPORTED_ON_ENCL      (0x00200040) /* Encl Mgmt services not available for this WWID */
-#define PL_LOGINFO_CODE_ENCL_MGMT_ADDR_MODE_NOT_SUPPORTED    (0x00200050) /* Address Mode not suppored */
-#define PL_LOGINFO_CODE_ENCL_MGMT_BAD_SLOT_NUM               (0x00200060) /* Invalid Slot Number in SEP Msg */
-#define PL_LOGINFO_CODE_ENCL_MGMT_SGPIO_NOT_PRESENT          (0x00200070) /* SGPIO not present/enabled */
-#define PL_LOGINFO_CODE_ENCL_MGMT_GPIO_NOT_CONFIGURED        (0x00200080) /* GPIO not configured */
-#define PL_LOGINFO_CODE_ENCL_MGMT_GPIO_FRAME_ERROR           (0x00200090) /* GPIO can't allocate a frame */
-#define PL_LOGINFO_CODE_ENCL_MGMT_GPIO_CONFIG_PAGE_ERROR     (0x002000A0) /* GPIO failed config page request */
-#define PL_LOGINFO_CODE_ENCL_MGMT_SES_FRAME_ALLOC_ERROR      (0x002000B0) /* Can't get frame for SES command */
-#define PL_LOGINFO_CODE_ENCL_MGMT_SES_IO_ERROR               (0x002000C0) /* I/O execution error */
-#define PL_LOGINFO_CODE_ENCL_MGMT_SES_RETRIES_EXHAUSTED      (0x002000D0) /* SEP I/O retries exhausted */
-#define PL_LOGINFO_CODE_ENCL_MGMT_SMP_FRAME_ALLOC_ERROR      (0x002000E0) /* Can't get frame for SMP command */
-
-#define PL_LOGINFO_DA_SEP_NOT_PRESENT                        (0x00200100) /* SEP not present when msg received */
-#define PL_LOGINFO_DA_SEP_SINGLE_THREAD_ERROR                (0x00200101) /* Can only accept 1 msg at a time */
-#define PL_LOGINFO_DA_SEP_ISTWI_INTR_IN_IDLE_STATE           (0x00200102) /* ISTWI interrupt recvd. while IDLE */
-#define PL_LOGINFO_DA_SEP_RECEIVED_NACK_FROM_SLAVE           (0x00200103) /* SEP NACK'd, it is busy */
-#define PL_LOGINFO_DA_SEP_DID_NOT_RECEIVE_ACK                (0x00200104) /* SEP didn't rcv. ACK (Last Rcvd Bit = 1) */
-#define PL_LOGINFO_DA_SEP_BAD_STATUS_HDR_CHKSUM              (0x00200105) /* SEP stopped or sent bad chksum in Hdr */
-#define PL_LOGINFO_DA_SEP_STOP_ON_DATA                       (0x00200106) /* SEP stopped while transfering data */
-#define PL_LOGINFO_DA_SEP_STOP_ON_SENSE_DATA                 (0x00200107) /* SEP stopped while transfering sense data */
-#define PL_LOGINFO_DA_SEP_UNSUPPORTED_SCSI_STATUS_1          (0x00200108) /* SEP returned unknown scsi status */
-#define PL_LOGINFO_DA_SEP_UNSUPPORTED_SCSI_STATUS_2          (0x00200109) /* SEP returned unknown scsi status */
-#define PL_LOGINFO_DA_SEP_CHKSUM_ERROR_AFTER_STOP            (0x0020010A) /* SEP returned bad chksum after STOP */
-#define PL_LOGINFO_DA_SEP_CHKSUM_ERROR_AFTER_STOP_GETDATA    (0x0020010B) /* SEP returned bad chksum after STOP while gettin data*/
-#define PL_LOGINFO_DA_SEP_UNSUPPORTED_COMMAND                (0x0020010C) /* SEP doesn't support CDB opcode f/w location 1 */
-#define PL_LOGINFO_DA_SEP_UNSUPPORTED_COMMAND_2              (0x0020010D) /* SEP doesn't support CDB opcode f/w location 2 */
-#define PL_LOGINFO_DA_SEP_UNSUPPORTED_COMMAND_3              (0x0020010E) /* SEP doesn't support CDB opcode f/w location 3 */
-
-
-/****************************************************************************/
-/* IR LOGINFO_CODE defines, valid if IOC_LOGINFO_ORIGINATOR = IR            */
-/****************************************************************************/
-#define IR_LOGINFO_RAID_ACTION_ERROR                           (0x00010000)
-#define IR_LOGINFO_CODE_UNUSED2                                (0x00020000)
-
-/* Amount of information passed down for Create Volume is too large */
-#define IR_LOGINFO_VOLUME_CREATE_INVALID_LENGTH                (0x00010001)
-/* Creation of duplicate volume attempted (Bus/Target ID checked) */
-#define IR_LOGINFO_VOLUME_CREATE_DUPLICATE                     (0x00010002)
-/* Creation failed due to maximum number of supported volumes exceeded */
-#define IR_LOGINFO_VOLUME_CREATE_NO_SLOTS                      (0x00010003)
-/* Creation failed due to DMA error in trying to read from host */
-#define IR_LOGINFO_VOLUME_CREATE_DMA_ERROR                     (0x00010004)
-/* Creation failed due to invalid volume type passed down */
-#define IR_LOGINFO_VOLUME_CREATE_INVALID_VOLUME_TYPE           (0x00010005)
-/* Creation failed due to error reading MFG Page 4 */
-#define IR_LOGINFO_VOLUME_MFG_PAGE4_ERROR                      (0x00010006)
-/* Creation failed when trying to create internal structures */
-#define IR_LOGINFO_VOLUME_INTERNAL_CONFIG_STRUCTURE_ERROR      (0x00010007)
-
-/* Activation failed due to trying to activate an already active volume */
-#define IR_LOGINFO_VOLUME_ACTIVATING_AN_ACTIVE_VOLUME          (0x00010010)
-/* Activation failed due to trying to active unsupported volume type  */
-#define IR_LOGINFO_VOLUME_ACTIVATING_INVALID_VOLUME_TYPE       (0x00010011)
-/* Activation failed due to trying to active too many volumes  */
-#define IR_LOGINFO_VOLUME_ACTIVATING_TOO_MANY_VOLUMES          (0x00010012)
-/* Activation failed due to Volume ID in use already */
-#define IR_LOGINFO_VOLUME_ACTIVATING_VOLUME_ID_IN_USE          (0x00010013)
-/* Activation failed call to activateVolume returned failure */
-#define IR_LOGINFO_VOLUME_ACTIVATE_VOLUME_FAILED               (0x00010014)
-/* Activation failed trying to import the volume */
-#define IR_LOGINFO_VOLUME_ACTIVATING_IMPORT_VOLUME_FAILED      (0x00010015)
-/* Activation failed trying to import the volume */
-#define IR_LOGINFO_VOLUME_ACTIVATING_TOO_MANY_PHYS_DISKS       (0x00010016)
-
-/* Phys Disk failed, too many phys disks */
-#define IR_LOGINFO_PHYSDISK_CREATE_TOO_MANY_DISKS              (0x00010020)
-/* Amount of information passed down for Create Pnysdisk is too large */
-#define IR_LOGINFO_PHYSDISK_CREATE_INVALID_LENGTH              (0x00010021)
-/* Creation failed due to DMA error in trying to read from host */
-#define IR_LOGINFO_PHYSDISK_CREATE_DMA_ERROR                   (0x00010022)
-/* Creation failed due to invalid Bus TargetID passed down */
-#define IR_LOGINFO_PHYSDISK_CREATE_BUS_TID_INVALID             (0x00010023)
-/* Creation failed due to error in creating RAID Phys Disk Config Page */
-#define IR_LOGINFO_PHYSDISK_CREATE_CONFIG_PAGE_ERROR           (0x00010024)
-
-
-/* Compatibility Error : IR Disabled */
-#define IR_LOGINFO_COMPAT_ERROR_RAID_DISABLED                  (0x00010030)
-/* Compatibility Error : Inquiry Comand failed */
-#define IR_LOGINFO_COMPAT_ERROR_INQUIRY_FAILED                 (0x00010031)
-/* Compatibility Error : Device not direct access device */
-#define IR_LOGINFO_COMPAT_ERROR_NOT_DIRECT_ACCESS              (0x00010032)
-/* Compatibility Error : Removable device found */
-#define IR_LOGINFO_COMPAT_ERROR_REMOVABLE_FOUND                (0x00010033)
-/* Compatibility Error : Device SCSI Version not 2 or higher */
-#define IR_LOGINFO_COMPAT_ERROR_NEED_SCSI_2_OR_HIGHER          (0x00010034)
-/* Compatibility Error : SATA device, 48 BIT LBA not supported */
-#define IR_LOGINFO_COMPAT_ERROR_SATA_48BIT_LBA_NOT_SUPPORTED   (0x00010035)
-/* Compatibility Error : Device does not have 512 byte block sizes */
-#define IR_LOGINFO_COMPAT_ERROR_DEVICE_NOT_512_BYTE_BLOCK      (0x00010036)
-/* Compatibility Error : Volume Type check failed */
-#define IR_LOGINFO_COMPAT_ERROR_VOLUME_TYPE_CHECK_FAILED       (0x00010037)
-/* Compatibility Error : Volume Type is unsupported by FW */
-#define IR_LOGINFO_COMPAT_ERROR_UNSUPPORTED_VOLUME_TYPE        (0x00010038)
-/* Compatibility Error : Disk drive too small for use in volume */
-#define IR_LOGINFO_COMPAT_ERROR_DISK_TOO_SMALL                 (0x00010039)
-/* Compatibility Error : Phys disk for Create Volume not found */
-#define IR_LOGINFO_COMPAT_ERROR_PHYS_DISK_NOT_FOUND            (0x0001003A)
-/* Compatibility Error : membership count error, too many or too few disks for volume type */
-#define IR_LOGINFO_COMPAT_ERROR_MEMBERSHIP_COUNT               (0x0001003B)
-/* Compatibility Error : Disk stripe sizes must be 64KB */
-#define IR_LOGINFO_COMPAT_ERROR_NON_64K_STRIPE_SIZE            (0x0001003C)
-/* Compatibility Error : IME size limited to < 2TB */
-#define IR_LOGINFO_COMPAT_ERROR_IME_VOL_NOT_CURRENTLY_SUPPORTED (0x0001003D)
-
-/* Device Firmware Update: DFU can only be started once */
-#define IR_LOGINFO_DEV_FW_UPDATE_ERR_DFU_IN_PROGRESS            (0x00010050)
-/* Device Firmware Update: Volume must be Optimal/Active/non-Quiesced */
-#define IR_LOGINFO_DEV_FW_UPDATE_ERR_DEVICE_IN_INVALID_STATE    (0x00010051)
-/* Device Firmware Update: DFU Timeout cannot be zero */
-#define IR_LOGINFO_DEV_FW_UPDATE_ERR_INVALID_TIMEOUT            (0x00010052)
-/* Device Firmware Update: CREATE TIMER FAILED */
-#define IR_LOGINFO_DEV_FW_UPDATE_ERR_NO_TIMERS                  (0x00010053)
-/* Device Firmware Update: Failed to read SAS_IO_UNIT_PG_1 */
-#define IR_LOGINFO_DEV_FW_UPDATE_ERR_READING_CFG_PAGE           (0x00010054)
-/* Device Firmware Update: Invalid SAS_IO_UNIT_PG_1 value(s) */
-#define IR_LOGINFO_DEV_FW_UPDATE_ERR_PORT_IO_TIMEOUTS_REQUIRED  (0x00010055)
-/* Device Firmware Update: Unable to allocate memory for page */
-#define IR_LOGINFO_DEV_FW_UPDATE_ERR_ALLOC_CFG_PAGE             (0x00010056)
-/* Device Firmware Update:  */
-//#define IR_LOGINFO_DEV_FW_UPDATE_ERR_                         (0x00010054)
-
-
-/****************************************************************************/
-/* Defines for convenience                                                  */
-/****************************************************************************/
-#define IOC_LOGINFO_PREFIX_IOP                          ((MPI_IOCLOGINFO_TYPE_SAS << MPI_IOCLOGINFO_TYPE_SHIFT) | IOC_LOGINFO_ORIGINATOR_IOP)
-#define IOC_LOGINFO_PREFIX_PL                           ((MPI_IOCLOGINFO_TYPE_SAS << MPI_IOCLOGINFO_TYPE_SHIFT) | IOC_LOGINFO_ORIGINATOR_PL)
-#define IOC_LOGINFO_PREFIX_IR                           ((MPI_IOCLOGINFO_TYPE_SAS << MPI_IOCLOGINFO_TYPE_SHIFT) | IOC_LOGINFO_ORIGINATOR_IR)
-
-#endif /* end of file */
-
diff --git a/include.new/dev/mpt/mpilib/mpi_raid.h b/include.new/dev/mpt/mpilib/mpi_raid.h
deleted file mode 100644
index 73e08bc..0000000
--- a/include.new/dev/mpt/mpilib/mpi_raid.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_raid.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2005, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *           Name:  mpi_raid.h
- *          Title:  MPI RAID message and structures
- *  Creation Date:  February 27, 2001
- *
- *    mpi_raid.h Version:  01.05.05
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  02-27-01  01.01.01  Original release for this file.
- *  03-27-01  01.01.02  Added structure offset comments.
- *  08-08-01  01.02.01  Original release for v1.2 work.
- *  09-28-01  01.02.02  Major rework for MPI v1.2 Integrated RAID changes.
- *  10-04-01  01.02.03  Added ActionData defines for
- *                      MPI_RAID_ACTION_DELETE_VOLUME action.
- *  11-01-01  01.02.04  Added define for MPI_RAID_ACTION_ADATA_DO_NOT_SYNC.
- *  03-14-02  01.02.05  Added define for MPI_RAID_ACTION_ADATA_LOW_LEVEL_INIT.
- *  05-07-02  01.02.06  Added define for MPI_RAID_ACTION_ACTIVATE_VOLUME,
- *                      MPI_RAID_ACTION_INACTIVATE_VOLUME, and
- *                      MPI_RAID_ACTION_ADATA_INACTIVATE_ALL.
- *  07-12-02  01.02.07  Added structures for Mailbox request and reply.
- *  11-15-02  01.02.08  Added missing MsgContext field to MSG_MAILBOX_REQUEST.
- *  04-01-03  01.02.09  New action data option flag for
- *                      MPI_RAID_ACTION_DELETE_VOLUME.
- *  05-11-04  01.03.01  Original release for MPI v1.3.
- *  08-19-04  01.05.01  Original release for MPI v1.5.
- *  01-15-05  01.05.02  Added defines for the two new RAID Actions for
- *                      _SET_RESYNC_RATE and _SET_DATA_SCRUB_RATE.
- *  02-28-07  01.05.03  Added new RAID Action, Device FW Update Mode, and
- *                      associated defines.
- *  08-07-07  01.05.04  Added Disable Full Rebuild bit to the ActionDataWord
- *                      for the RAID Action MPI_RAID_ACTION_DISABLE_VOLUME.
- *  01-15-08  01.05.05  Added define for MPI_RAID_ACTION_SET_VOLUME_NAME.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_RAID_H
-#define MPI_RAID_H
-
-
-/******************************************************************************
-*
-*        R A I D    M e s s a g e s
-*
-*******************************************************************************/
-
-
-/****************************************************************************/
-/* RAID Action Request                                                      */
-/****************************************************************************/
-
-typedef struct _MSG_RAID_ACTION
-{
-    U8                      Action;             /* 00h */
-    U8                      Reserved1;          /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      VolumeID;           /* 04h */
-    U8                      VolumeBus;          /* 05h */
-    U8                      PhysDiskNum;        /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U32                     Reserved2;          /* 0Ch */
-    U32                     ActionDataWord;     /* 10h */
-    SGE_SIMPLE_UNION        ActionDataSGE;      /* 14h */
-} MSG_RAID_ACTION_REQUEST, MPI_POINTER PTR_MSG_RAID_ACTION_REQUEST,
-  MpiRaidActionRequest_t , MPI_POINTER pMpiRaidActionRequest_t;
-
-
-/* RAID Action request Action values */
-
-#define MPI_RAID_ACTION_STATUS                      (0x00)
-#define MPI_RAID_ACTION_INDICATOR_STRUCT            (0x01)
-#define MPI_RAID_ACTION_CREATE_VOLUME               (0x02)
-#define MPI_RAID_ACTION_DELETE_VOLUME               (0x03)
-#define MPI_RAID_ACTION_DISABLE_VOLUME              (0x04)
-#define MPI_RAID_ACTION_ENABLE_VOLUME               (0x05)
-#define MPI_RAID_ACTION_QUIESCE_PHYS_IO             (0x06)
-#define MPI_RAID_ACTION_ENABLE_PHYS_IO              (0x07)
-#define MPI_RAID_ACTION_CHANGE_VOLUME_SETTINGS      (0x08)
-#define MPI_RAID_ACTION_PHYSDISK_OFFLINE            (0x0A)
-#define MPI_RAID_ACTION_PHYSDISK_ONLINE             (0x0B)
-#define MPI_RAID_ACTION_CHANGE_PHYSDISK_SETTINGS    (0x0C)
-#define MPI_RAID_ACTION_CREATE_PHYSDISK             (0x0D)
-#define MPI_RAID_ACTION_DELETE_PHYSDISK             (0x0E)
-#define MPI_RAID_ACTION_FAIL_PHYSDISK               (0x0F)
-#define MPI_RAID_ACTION_REPLACE_PHYSDISK            (0x10)
-#define MPI_RAID_ACTION_ACTIVATE_VOLUME             (0x11)
-#define MPI_RAID_ACTION_INACTIVATE_VOLUME           (0x12)
-#define MPI_RAID_ACTION_SET_RESYNC_RATE             (0x13)
-#define MPI_RAID_ACTION_SET_DATA_SCRUB_RATE         (0x14)
-#define MPI_RAID_ACTION_DEVICE_FW_UPDATE_MODE       (0x15)
-#define MPI_RAID_ACTION_SET_VOLUME_NAME             (0x16)
-
-/* ActionDataWord defines for use with MPI_RAID_ACTION_CREATE_VOLUME action */
-#define MPI_RAID_ACTION_ADATA_DO_NOT_SYNC           (0x00000001)
-#define MPI_RAID_ACTION_ADATA_LOW_LEVEL_INIT        (0x00000002)
-
-/* ActionDataWord defines for use with MPI_RAID_ACTION_DELETE_VOLUME action */
-#define MPI_RAID_ACTION_ADATA_KEEP_PHYS_DISKS       (0x00000000)
-#define MPI_RAID_ACTION_ADATA_DEL_PHYS_DISKS        (0x00000001)
-
-#define MPI_RAID_ACTION_ADATA_KEEP_LBA0             (0x00000000)
-#define MPI_RAID_ACTION_ADATA_ZERO_LBA0             (0x00000002)
-
-/* ActionDataWord defines for use with MPI_RAID_ACTION_DISABLE_VOLUME action */
-#define MPI_RAID_ACTION_ADATA_DISABLE_FULL_REBUILD  (0x00000001)
-
-/* ActionDataWord defines for use with MPI_RAID_ACTION_ACTIVATE_VOLUME action */
-#define MPI_RAID_ACTION_ADATA_INACTIVATE_ALL        (0x00000001)
-
-/* ActionDataWord defines for use with MPI_RAID_ACTION_SET_RESYNC_RATE action */
-#define MPI_RAID_ACTION_ADATA_RESYNC_RATE_MASK      (0x000000FF)
-
-/* ActionDataWord defines for use with MPI_RAID_ACTION_SET_DATA_SCRUB_RATE action */
-#define MPI_RAID_ACTION_ADATA_DATA_SCRUB_RATE_MASK  (0x000000FF)
-
-/* ActionDataWord defines for use with MPI_RAID_ACTION_DEVICE_FW_UPDATE_MODE action */
-#define MPI_RAID_ACTION_ADATA_ENABLE_FW_UPDATE          (0x00000001)
-#define MPI_RAID_ACTION_ADATA_MASK_FW_UPDATE_TIMEOUT    (0x0000FF00)
-#define MPI_RAID_ACTION_ADATA_SHIFT_FW_UPDATE_TIMEOUT   (8)
-
-
-/* RAID Action reply message */
-
-typedef struct _MSG_RAID_ACTION_REPLY
-{
-    U8                      Action;             /* 00h */
-    U8                      Reserved;           /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      VolumeID;           /* 04h */
-    U8                      VolumeBus;          /* 05h */
-    U8                      PhysDiskNum;        /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     ActionStatus;       /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     VolumeStatus;       /* 14h */
-    U32                     ActionData;         /* 18h */
-} MSG_RAID_ACTION_REPLY, MPI_POINTER PTR_MSG_RAID_ACTION_REPLY,
-  MpiRaidActionReply_t, MPI_POINTER pMpiRaidActionReply_t;
-
-
-/* RAID Volume reply ActionStatus values */
-
-#define MPI_RAID_ACTION_ASTATUS_SUCCESS             (0x0000)
-#define MPI_RAID_ACTION_ASTATUS_INVALID_ACTION      (0x0001)
-#define MPI_RAID_ACTION_ASTATUS_FAILURE             (0x0002)
-#define MPI_RAID_ACTION_ASTATUS_IN_PROGRESS         (0x0003)
-
-
-/* RAID Volume reply RAID Volume Indicator structure */
-
-typedef struct _MPI_RAID_VOL_INDICATOR
-{
-    U64                     TotalBlocks;        /* 00h */
-    U64                     BlocksRemaining;    /* 08h */
-} MPI_RAID_VOL_INDICATOR, MPI_POINTER PTR_MPI_RAID_VOL_INDICATOR,
-  MpiRaidVolIndicator_t, MPI_POINTER pMpiRaidVolIndicator_t;
-
-
-/****************************************************************************/
-/* SCSI IO RAID Passthrough Request                                         */
-/****************************************************************************/
-
-typedef struct _MSG_SCSI_IO_RAID_PT_REQUEST
-{
-    U8                      PhysDiskNum;        /* 00h */
-    U8                      Reserved1;          /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      CDBLength;          /* 04h */
-    U8                      SenseBufferLength;  /* 05h */
-    U8                      Reserved2;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      LUN[8];             /* 0Ch */
-    U32                     Control;            /* 14h */
-    U8                      CDB[16];            /* 18h */
-    U32                     DataLength;         /* 28h */
-    U32                     SenseBufferLowAddr; /* 2Ch */
-    SGE_IO_UNION            SGL;                /* 30h */
-} MSG_SCSI_IO_RAID_PT_REQUEST, MPI_POINTER PTR_MSG_SCSI_IO_RAID_PT_REQUEST,
-  SCSIIORaidPassthroughRequest_t, MPI_POINTER pSCSIIORaidPassthroughRequest_t;
-
-
-/* SCSI IO RAID Passthrough reply structure */
-
-typedef struct _MSG_SCSI_IO_RAID_PT_REPLY
-{
-    U8                      PhysDiskNum;        /* 00h */
-    U8                      Reserved1;          /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U8                      CDBLength;          /* 04h */
-    U8                      SenseBufferLength;  /* 05h */
-    U8                      Reserved2;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      SCSIStatus;         /* 0Ch */
-    U8                      SCSIState;          /* 0Dh */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     TransferCount;      /* 14h */
-    U32                     SenseCount;         /* 18h */
-    U32                     ResponseInfo;       /* 1Ch */
-} MSG_SCSI_IO_RAID_PT_REPLY, MPI_POINTER PTR_MSG_SCSI_IO_RAID_PT_REPLY,
-  SCSIIORaidPassthroughReply_t, MPI_POINTER pSCSIIORaidPassthroughReply_t;
-
-
-/****************************************************************************/
-/* Mailbox reqeust structure */
-/****************************************************************************/
-
-typedef struct _MSG_MAILBOX_REQUEST
-{
-    U16                     Reserved1;
-    U8                      ChainOffset;
-    U8                      Function;
-    U16                     Reserved2;
-    U8                      Reserved3;
-    U8                      MsgFlags;
-    U32                     MsgContext;
-    U8                      Command[10];
-    U16                     Reserved4;
-    SGE_IO_UNION            SGL;
-} MSG_MAILBOX_REQUEST, MPI_POINTER PTR_MSG_MAILBOX_REQUEST,
-  MailboxRequest_t, MPI_POINTER pMailboxRequest_t;
-
-
-/* Mailbox reply structure */
-typedef struct _MSG_MAILBOX_REPLY
-{
-    U16                     Reserved1;          /* 00h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     Reserved2;          /* 04h */
-    U8                      Reserved3;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     MailboxStatus;      /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     Reserved4;          /* 14h */
-} MSG_MAILBOX_REPLY, MPI_POINTER PTR_MSG_MAILBOX_REPLY,
-  MailboxReply_t, MPI_POINTER pMailboxReply_t;
-
-#endif
-
-
-
diff --git a/include.new/dev/mpt/mpilib/mpi_sas.h b/include.new/dev/mpt/mpilib/mpi_sas.h
deleted file mode 100644
index fcdc93d..0000000
--- a/include.new/dev/mpt/mpilib/mpi_sas.h
+++ /dev/null
@@ -1,305 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_sas.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *           Name:  mpi_sas.h
- *          Title:  MPI Serial Attached SCSI structures and definitions
- *  Creation Date:  August 19, 2004
- *
- *    mpi_sas.h Version:  01.05.05
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  08-19-04  01.05.01  Original release.
- *  08-30-05  01.05.02  Added DeviceInfo bit for SEP.
- *                      Added PrimFlags and Primitive field to SAS IO Unit
- *                      Control request, and added a new operation code.
- *  03-27-06  01.05.03  Added Force Full Discovery, Transmit Port Select Signal,
- *                      and Remove Device operations to SAS IO Unit Control.
- *                      Added DevHandle field to SAS IO Unit Control request and
- *                      reply.
- *  10-11-06  01.05.04  Fixed the name of a define for Operation field of SAS IO
- *                      Unit Control request.
- *  01-15-08  01.05.05  Added support for MPI_SAS_OP_SET_IOC_PARAMETER,
- *                      including adding IOCParameter and IOCParameter value
- *                      fields to SAS IO Unit Control Request.
- *                      Added MPI_SAS_DEVICE_INFO_PRODUCT_SPECIFIC define.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_SAS_H
-#define MPI_SAS_H
-
-
-/*
- * Values for SASStatus.
- */
-#define MPI_SASSTATUS_SUCCESS                           (0x00)
-#define MPI_SASSTATUS_UNKNOWN_ERROR                     (0x01)
-#define MPI_SASSTATUS_INVALID_FRAME                     (0x02)
-#define MPI_SASSTATUS_UTC_BAD_DEST                      (0x03)
-#define MPI_SASSTATUS_UTC_BREAK_RECEIVED                (0x04)
-#define MPI_SASSTATUS_UTC_CONNECT_RATE_NOT_SUPPORTED    (0x05)
-#define MPI_SASSTATUS_UTC_PORT_LAYER_REQUEST            (0x06)
-#define MPI_SASSTATUS_UTC_PROTOCOL_NOT_SUPPORTED        (0x07)
-#define MPI_SASSTATUS_UTC_STP_RESOURCES_BUSY            (0x08)
-#define MPI_SASSTATUS_UTC_WRONG_DESTINATION             (0x09)
-#define MPI_SASSTATUS_SHORT_INFORMATION_UNIT            (0x0A)
-#define MPI_SASSTATUS_LONG_INFORMATION_UNIT             (0x0B)
-#define MPI_SASSTATUS_XFER_RDY_INCORRECT_WRITE_DATA     (0x0C)
-#define MPI_SASSTATUS_XFER_RDY_REQUEST_OFFSET_ERROR     (0x0D)
-#define MPI_SASSTATUS_XFER_RDY_NOT_EXPECTED             (0x0E)
-#define MPI_SASSTATUS_DATA_INCORRECT_DATA_LENGTH        (0x0F)
-#define MPI_SASSTATUS_DATA_TOO_MUCH_READ_DATA           (0x10)
-#define MPI_SASSTATUS_DATA_OFFSET_ERROR                 (0x11)
-#define MPI_SASSTATUS_SDSF_NAK_RECEIVED                 (0x12)
-#define MPI_SASSTATUS_SDSF_CONNECTION_FAILED            (0x13)
-#define MPI_SASSTATUS_INITIATOR_RESPONSE_TIMEOUT        (0x14)
-
-
-/*
- * Values for the SAS DeviceInfo field used in SAS Device Status Change Event
- * data and SAS IO Unit Configuration pages.
- */
-#define MPI_SAS_DEVICE_INFO_PRODUCT_SPECIFIC    (0xF0000000)
-
-#define MPI_SAS_DEVICE_INFO_SEP                 (0x00004000)
-#define MPI_SAS_DEVICE_INFO_ATAPI_DEVICE        (0x00002000)
-#define MPI_SAS_DEVICE_INFO_LSI_DEVICE          (0x00001000)
-#define MPI_SAS_DEVICE_INFO_DIRECT_ATTACH       (0x00000800)
-#define MPI_SAS_DEVICE_INFO_SSP_TARGET          (0x00000400)
-#define MPI_SAS_DEVICE_INFO_STP_TARGET          (0x00000200)
-#define MPI_SAS_DEVICE_INFO_SMP_TARGET          (0x00000100)
-#define MPI_SAS_DEVICE_INFO_SATA_DEVICE         (0x00000080)
-#define MPI_SAS_DEVICE_INFO_SSP_INITIATOR       (0x00000040)
-#define MPI_SAS_DEVICE_INFO_STP_INITIATOR       (0x00000020)
-#define MPI_SAS_DEVICE_INFO_SMP_INITIATOR       (0x00000010)
-#define MPI_SAS_DEVICE_INFO_SATA_HOST           (0x00000008)
-
-#define MPI_SAS_DEVICE_INFO_MASK_DEVICE_TYPE    (0x00000007)
-#define MPI_SAS_DEVICE_INFO_NO_DEVICE           (0x00000000)
-#define MPI_SAS_DEVICE_INFO_END_DEVICE          (0x00000001)
-#define MPI_SAS_DEVICE_INFO_EDGE_EXPANDER       (0x00000002)
-#define MPI_SAS_DEVICE_INFO_FANOUT_EXPANDER     (0x00000003)
-
-
-
-/*****************************************************************************
-*
-*        S e r i a l    A t t a c h e d    S C S I     M e s s a g e s
-*
-*****************************************************************************/
-
-/****************************************************************************/
-/* Serial Management Protocol Passthrough Request                           */
-/****************************************************************************/
-
-typedef struct _MSG_SMP_PASSTHROUGH_REQUEST
-{
-    U8                      PassthroughFlags;   /* 00h */
-    U8                      PhysicalPort;       /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     RequestDataLength;  /* 04h */
-    U8                      ConnectionRate;     /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U32                     Reserved1;          /* 0Ch */
-    U64                     SASAddress;         /* 10h */
-    U32                     Reserved2;          /* 18h */
-    U32                     Reserved3;          /* 1Ch */
-    SGE_SIMPLE_UNION        SGL;                /* 20h */
-} MSG_SMP_PASSTHROUGH_REQUEST, MPI_POINTER PTR_MSG_SMP_PASSTHROUGH_REQUEST,
-  SmpPassthroughRequest_t, MPI_POINTER pSmpPassthroughRequest_t;
-
-/* values for PassthroughFlags field */
-#define MPI_SMP_PT_REQ_PT_FLAGS_IMMEDIATE       (0x80)
-
-/* values for ConnectionRate field */
-#define MPI_SMP_PT_REQ_CONNECT_RATE_NEGOTIATED  (0x00)
-#define MPI_SMP_PT_REQ_CONNECT_RATE_1_5         (0x08)
-#define MPI_SMP_PT_REQ_CONNECT_RATE_3_0         (0x09)
-
-
-/* Serial Management Protocol Passthrough Reply */
-typedef struct _MSG_SMP_PASSTHROUGH_REPLY
-{
-    U8                      PassthroughFlags;   /* 00h */
-    U8                      PhysicalPort;       /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     ResponseDataLength; /* 04h */
-    U8                      Reserved1;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      Reserved2;          /* 0Ch */
-    U8                      SASStatus;          /* 0Dh */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U32                     Reserved3;          /* 14h */
-    U8                      ResponseData[4];    /* 18h */
-} MSG_SMP_PASSTHROUGH_REPLY, MPI_POINTER PTR_MSG_SMP_PASSTHROUGH_REPLY,
-  SmpPassthroughReply_t, MPI_POINTER pSmpPassthroughReply_t;
-
-#define MPI_SMP_PT_REPLY_PT_FLAGS_IMMEDIATE     (0x80)
-
-
-/****************************************************************************/
-/* SATA Passthrough Request                                                 */
-/****************************************************************************/
-
-typedef struct _MSG_SATA_PASSTHROUGH_REQUEST
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     PassthroughFlags;   /* 04h */
-    U8                      ConnectionRate;     /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U32                     Reserved1;          /* 0Ch */
-    U32                     Reserved2;          /* 10h */
-    U32                     Reserved3;          /* 14h */
-    U32                     DataLength;         /* 18h */
-    U8                      CommandFIS[20];     /* 1Ch */
-    SGE_SIMPLE_UNION        SGL;                /* 30h */
-} MSG_SATA_PASSTHROUGH_REQUEST, MPI_POINTER PTR_MSG_SATA_PASSTHROUGH_REQUEST,
-  SataPassthroughRequest_t, MPI_POINTER pSataPassthroughRequest_t;
-
-/* values for PassthroughFlags field */
-#define MPI_SATA_PT_REQ_PT_FLAGS_RESET_DEVICE   (0x0200)
-#define MPI_SATA_PT_REQ_PT_FLAGS_EXECUTE_DIAG   (0x0100)
-#define MPI_SATA_PT_REQ_PT_FLAGS_DMA_QUEUED     (0x0080)
-#define MPI_SATA_PT_REQ_PT_FLAGS_PACKET_COMMAND (0x0040)
-#define MPI_SATA_PT_REQ_PT_FLAGS_DMA            (0x0020)
-#define MPI_SATA_PT_REQ_PT_FLAGS_PIO            (0x0010)
-#define MPI_SATA_PT_REQ_PT_FLAGS_UNSPECIFIED_VU (0x0004)
-#define MPI_SATA_PT_REQ_PT_FLAGS_WRITE          (0x0002)
-#define MPI_SATA_PT_REQ_PT_FLAGS_READ           (0x0001)
-
-/* values for ConnectionRate field */
-#define MPI_SATA_PT_REQ_CONNECT_RATE_NEGOTIATED (0x00)
-#define MPI_SATA_PT_REQ_CONNECT_RATE_1_5        (0x08)
-#define MPI_SATA_PT_REQ_CONNECT_RATE_3_0        (0x09)
-
-
-/* SATA Passthrough Reply */
-typedef struct _MSG_SATA_PASSTHROUGH_REPLY
-{
-    U8                      TargetID;           /* 00h */
-    U8                      Bus;                /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     PassthroughFlags;   /* 04h */
-    U8                      Reserved1;          /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      Reserved2;          /* 0Ch */
-    U8                      SASStatus;          /* 0Dh */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-    U8                      StatusFIS[20];      /* 14h */
-    U32                     StatusControlRegisters; /* 28h */
-    U32                     TransferCount;      /* 2Ch */
-} MSG_SATA_PASSTHROUGH_REPLY, MPI_POINTER PTR_MSG_SATA_PASSTHROUGH_REPLY,
-  SataPassthroughReply_t, MPI_POINTER pSataPassthroughReply_t;
-
-
-
-
-/****************************************************************************/
-/* SAS IO Unit Control Request                                              */
-/****************************************************************************/
-
-typedef struct _MSG_SAS_IOUNIT_CONTROL_REQUEST
-{
-    U8                      Operation;          /* 00h */
-    U8                      Reserved1;          /* 01h */
-    U8                      ChainOffset;        /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     DevHandle;          /* 04h */
-    U8                      IOCParameter;       /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U8                      TargetID;           /* 0Ch */
-    U8                      Bus;                /* 0Dh */
-    U8                      PhyNum;             /* 0Eh */
-    U8                      PrimFlags;          /* 0Fh */
-    U32                     Primitive;          /* 10h */
-    U64                     SASAddress;         /* 14h */
-    U32                     IOCParameterValue;  /* 1Ch */
-} MSG_SAS_IOUNIT_CONTROL_REQUEST, MPI_POINTER PTR_MSG_SAS_IOUNIT_CONTROL_REQUEST,
-  SasIoUnitControlRequest_t, MPI_POINTER pSasIoUnitControlRequest_t;
-
-/* values for the Operation field */
-#define MPI_SAS_OP_CLEAR_NOT_PRESENT            (0x01)
-#define MPI_SAS_OP_CLEAR_ALL_PERSISTENT         (0x02)
-#define MPI_SAS_OP_PHY_LINK_RESET               (0x06)
-#define MPI_SAS_OP_PHY_HARD_RESET               (0x07)
-#define MPI_SAS_OP_PHY_CLEAR_ERROR_LOG          (0x08)
-#define MPI_SAS_OP_MAP_CURRENT                  (0x09)
-#define MPI_SAS_OP_SEND_PRIMITIVE               (0x0A)
-#define MPI_SAS_OP_FORCE_FULL_DISCOVERY         (0x0B)
-#define MPI_SAS_OP_TRANSMIT_PORT_SELECT_SIGNAL  (0x0C)
-#define MPI_SAS_OP_TRANSMIT_REMOVE_DEVICE       (0x0D)  /* obsolete name */
-#define MPI_SAS_OP_REMOVE_DEVICE                (0x0D)
-#define MPI_SAS_OP_SET_IOC_PARAMETER            (0x0E)
-#define MPI_SAS_OP_PRODUCT_SPECIFIC_MIN         (0x80)
-
-/* values for the PrimFlags field */
-#define MPI_SAS_PRIMFLAGS_SINGLE                (0x08)
-#define MPI_SAS_PRIMFLAGS_TRIPLE                (0x02)
-#define MPI_SAS_PRIMFLAGS_REDUNDANT             (0x01)
-
-
-/* SAS IO Unit Control Reply */
-typedef struct _MSG_SAS_IOUNIT_CONTROL_REPLY
-{
-    U8                      Operation;          /* 00h */
-    U8                      Reserved1;          /* 01h */
-    U8                      MsgLength;          /* 02h */
-    U8                      Function;           /* 03h */
-    U16                     DevHandle;          /* 04h */
-    U8                      IOCParameter;       /* 06h */
-    U8                      MsgFlags;           /* 07h */
-    U32                     MsgContext;         /* 08h */
-    U16                     Reserved4;          /* 0Ch */
-    U16                     IOCStatus;          /* 0Eh */
-    U32                     IOCLogInfo;         /* 10h */
-} MSG_SAS_IOUNIT_CONTROL_REPLY, MPI_POINTER PTR_MSG_SAS_IOUNIT_CONTROL_REPLY,
-  SasIoUnitControlReply_t, MPI_POINTER pSasIoUnitControlReply_t;
-
-#endif
-
-
diff --git a/include.new/dev/mpt/mpilib/mpi_targ.h b/include.new/dev/mpt/mpilib/mpi_targ.h
deleted file mode 100644
index 3fd2dce..0000000
--- a/include.new/dev/mpt/mpilib/mpi_targ.h
+++ /dev/null
@@ -1,677 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_targ.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *           Name:  mpi_targ.h
- *          Title:  MPI Target mode messages and structures
- *  Creation Date:  June 22, 2000
- *
- *    mpi_targ.h Version:  01.05.06
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  05-08-00  00.10.01  Original release for 0.10 spec dated 4/26/2000.
- *  06-06-00  01.00.01  Update version number for 1.0 release.
- *  06-22-00  01.00.02  Added _MSG_TARGET_CMD_BUFFER_POST_REPLY structure.
- *                      Corrected DECSRIPTOR typo to DESCRIPTOR.
- *  11-02-00  01.01.01  Original release for post 1.0 work
- *                      Modified target mode to use IoIndex instead of
- *                      HostIndex and IocIndex. Added Alias.
- *  01-09-01  01.01.02  Added defines for TARGET_ASSIST_FLAGS_REPOST_CMD_BUFFER
- *                      and TARGET_STATUS_SEND_FLAGS_REPOST_CMD_BUFFER.
- *  02-20-01  01.01.03  Started using MPI_POINTER.
- *                      Added structures for MPI_TARGET_SCSI_SPI_CMD_BUFFER and
- *                      MPI_TARGET_FCP_CMD_BUFFER.
- *  03-27-01  01.01.04  Added structure offset comments.
- *  08-08-01  01.02.01  Original release for v1.2 work.
- *  09-28-01  01.02.02  Added structure for MPI_TARGET_SCSI_SPI_STATUS_IU.
- *                      Added PriorityReason field to some replies and
- *                      defined more PriorityReason codes.
- *                      Added some defines for to support previous version
- *                      of MPI.
- *  10-04-01  01.02.03  Added PriorityReason to MSG_TARGET_ERROR_REPLY.
- *  11-01-01  01.02.04  Added define for TARGET_STATUS_SEND_FLAGS_HIGH_PRIORITY.
- *  03-14-02  01.02.05  Modified MPI_TARGET_FCP_RSP_BUFFER to get the proper
- *                      byte ordering.
- *  05-31-02  01.02.06  Modified TARGET_MODE_REPLY_ALIAS_MASK to only include
- *                      one bit.
- *                      Added AliasIndex field to MPI_TARGET_FCP_CMD_BUFFER.
- *  09-16-02  01.02.07  Added flags for confirmed completion.
- *                      Added PRIORITY_REASON_TARGET_BUSY.
- *  11-15-02  01.02.08  Added AliasID field to MPI_TARGET_SCSI_SPI_CMD_BUFFER.
- *  04-01-03  01.02.09  Added OptionalOxid field to MPI_TARGET_FCP_CMD_BUFFER.
- *  05-11-04  01.03.01  Original release for MPI v1.3.
- *  08-19-04  01.05.01  Added new request message structures for
- *                      MSG_TARGET_CMD_BUF_POST_BASE_REQUEST,
- *                      MSG_TARGET_CMD_BUF_POST_LIST_REQUEST, and
- *                      MSG_TARGET_ASSIST_EXT_REQUEST.
- *                      Added new structures for SAS SSP Command buffer, SSP
- *                      Task buffer, and SSP Status IU.
- *  10-05-04  01.05.02  MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY added.
- *  02-22-05  01.05.03  Changed a comment.
- *  03-11-05  01.05.04  Removed TargetAssistExtended Request.
- *  06-24-05  01.05.05  Added TargetAssistExtended structures and defines.
- *  03-27-06  01.05.06  Added a comment.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_TARG_H
-#define MPI_TARG_H
-
-
-/******************************************************************************
-*
-*        S C S I    T a r g e t    M e s s a g e s
-*
-*******************************************************************************/
-
-typedef struct _CMD_BUFFER_DESCRIPTOR
-{
-    U16                     IoIndex;                    /* 00h */
-    U16                     Reserved;                   /* 02h */
-    union                                               /* 04h */
-    {
-        U32                 PhysicalAddress32;
-        U64                 PhysicalAddress64;
-    } u;
-} CMD_BUFFER_DESCRIPTOR, MPI_POINTER PTR_CMD_BUFFER_DESCRIPTOR,
-  CmdBufferDescriptor_t, MPI_POINTER pCmdBufferDescriptor_t;
-
-
-/****************************************************************************/
-/* Target Command Buffer Post Request                                       */
-/****************************************************************************/
-
-typedef struct _MSG_TARGET_CMD_BUFFER_POST_REQUEST
-{
-    U8                      BufferPostFlags;            /* 00h */
-    U8                      BufferCount;                /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      BufferLength;               /* 04h */
-    U8                      Reserved;                   /* 05h */
-    U8                      Reserved1;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    CMD_BUFFER_DESCRIPTOR   Buffer[1];                  /* 0Ch */
-} MSG_TARGET_CMD_BUFFER_POST_REQUEST, MPI_POINTER PTR_MSG_TARGET_CMD_BUFFER_POST_REQUEST,
-  TargetCmdBufferPostRequest_t, MPI_POINTER pTargetCmdBufferPostRequest_t;
-
-#define CMD_BUFFER_POST_FLAGS_PORT_MASK         (0x01)
-#define CMD_BUFFER_POST_FLAGS_ADDR_MODE_MASK    (0x80)
-#define CMD_BUFFER_POST_FLAGS_ADDR_MODE_32      (0)
-#define CMD_BUFFER_POST_FLAGS_ADDR_MODE_64      (1)
-#define CMD_BUFFER_POST_FLAGS_64_BIT_ADDR       (0x80)
-
-#define CMD_BUFFER_POST_IO_INDEX_MASK           (0x00003FFF)
-#define CMD_BUFFER_POST_IO_INDEX_MASK_0100      (0x000003FF) /* obsolete */
-
-
-typedef struct _MSG_TARGET_CMD_BUFFER_POST_REPLY
-{
-    U8                      BufferPostFlags;            /* 00h */
-    U8                      BufferCount;                /* 01h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U8                      BufferLength;               /* 04h */
-    U8                      Reserved;                   /* 05h */
-    U8                      Reserved1;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved2;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-} MSG_TARGET_CMD_BUFFER_POST_REPLY, MPI_POINTER PTR_MSG_TARGET_CMD_BUFFER_POST_REPLY,
-  TargetCmdBufferPostReply_t, MPI_POINTER pTargetCmdBufferPostReply_t;
-
-/* the following structure is obsolete as of MPI v1.2 */
-typedef struct _MSG_PRIORITY_CMD_RECEIVED_REPLY
-{
-    U16                     Reserved;                   /* 00h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U8                      PriorityReason;             /* 0Ch */
-    U8                      Reserved3;                  /* 0Dh */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-    U32                     ReplyWord;                  /* 14h */
-} MSG_PRIORITY_CMD_RECEIVED_REPLY, MPI_POINTER PTR_MSG_PRIORITY_CMD_RECEIVED_REPLY,
-  PriorityCommandReceivedReply_t, MPI_POINTER pPriorityCommandReceivedReply_t;
-
-
-typedef struct _MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY
-{
-    U16                     Reserved;                   /* 00h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U8                      PriorityReason;             /* 0Ch */
-    U8                      Reserved3;                  /* 0Dh */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-    U32                     ReplyWord;                  /* 14h */
-} MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY,
-  MPI_POINTER PTR_MSG_TARGET_CMD_BUFFER_POST_ERROR_REPLY,
-  TargetCmdBufferPostErrorReply_t, MPI_POINTER pTargetCmdBufferPostErrorReply_t;
-
-#define PRIORITY_REASON_NO_DISCONNECT           (0x00)
-#define PRIORITY_REASON_SCSI_TASK_MANAGEMENT    (0x01)
-#define PRIORITY_REASON_CMD_PARITY_ERR          (0x02)
-#define PRIORITY_REASON_MSG_OUT_PARITY_ERR      (0x03)
-#define PRIORITY_REASON_LQ_CRC_ERR              (0x04)
-#define PRIORITY_REASON_CMD_CRC_ERR             (0x05)
-#define PRIORITY_REASON_PROTOCOL_ERR            (0x06)
-#define PRIORITY_REASON_DATA_OUT_PARITY_ERR     (0x07)
-#define PRIORITY_REASON_DATA_OUT_CRC_ERR        (0x08)
-#define PRIORITY_REASON_TARGET_BUSY             (0x09)
-#define PRIORITY_REASON_UNKNOWN                 (0xFF)
-
-
-/****************************************************************************/
-/* Target Command Buffer Post Base Request                                  */
-/****************************************************************************/
-
-typedef struct _MSG_TARGET_CMD_BUF_POST_BASE_REQUEST
-{
-    U8                      BufferPostFlags;            /* 00h */
-    U8                      PortNumber;                 /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     TotalCmdBuffers;            /* 04h */
-    U8                      Reserved;                   /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     Reserved1;                  /* 0Ch */
-    U16                     CmdBufferLength;            /* 10h */
-    U16                     NextCmdBufferOffset;        /* 12h */
-    U32                     BaseAddressLow;             /* 14h */
-    U32                     BaseAddressHigh;            /* 18h */
-} MSG_TARGET_CMD_BUF_POST_BASE_REQUEST,
-  MPI_POINTER PTR__MSG_TARGET_CMD_BUF_POST_BASE_REQUEST,
-  TargetCmdBufferPostBaseRequest_t,
-  MPI_POINTER pTargetCmdBufferPostBaseRequest_t;
-
-#define CMD_BUFFER_POST_BASE_FLAGS_AUTO_POST_ALL    (0x01)
-
-
-typedef struct _MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY
-{
-    U16                     Reserved;                   /* 00h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved3;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-} MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY,
-  MPI_POINTER PTR_MSG_TARGET_CMD_BUFFER_POST_BASE_LIST_REPLY,
-  TargetCmdBufferPostBaseListReply_t,
-  MPI_POINTER pTargetCmdBufferPostBaseListReply_t;
-
-
-/****************************************************************************/
-/* Target Command Buffer Post List Request                                  */
-/****************************************************************************/
-
-typedef struct _MSG_TARGET_CMD_BUF_POST_LIST_REQUEST
-{
-    U8                      Reserved;                   /* 00h */
-    U8                      PortNumber;                 /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     CmdBufferCount;             /* 04h */
-    U8                      Reserved1;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     Reserved2;                  /* 0Ch */
-    U16                     IoIndex[2];                 /* 10h */
-} MSG_TARGET_CMD_BUF_POST_LIST_REQUEST,
-  MPI_POINTER PTR_MSG_TARGET_CMD_BUF_POST_LIST_REQUEST,
-  TargetCmdBufferPostListRequest_t,
-  MPI_POINTER pTargetCmdBufferPostListRequest_t;
-
-
-/****************************************************************************/
-/* Command Buffer Formats (with 16 byte CDB)                                */
-/****************************************************************************/
-
-typedef struct _MPI_TARGET_FCP_CMD_BUFFER
-{
-    U8      FcpLun[8];                                  /* 00h */
-    U8      FcpCntl[4];                                 /* 08h */
-    U8      FcpCdb[16];                                 /* 0Ch */
-    U32     FcpDl;                                      /* 1Ch */
-    U8      AliasIndex;                                 /* 20h */
-    U8      Reserved1;                                  /* 21h */
-    U16     OptionalOxid;                               /* 22h */
-} MPI_TARGET_FCP_CMD_BUFFER, MPI_POINTER PTR_MPI_TARGET_FCP_CMD_BUFFER,
-  MpiTargetFcpCmdBuffer, MPI_POINTER pMpiTargetFcpCmdBuffer;
-
-
-typedef struct _MPI_TARGET_SCSI_SPI_CMD_BUFFER
-{
-    /* SPI L_Q information unit */
-    U8      L_QType;                                    /* 00h */
-    U8      Reserved;                                   /* 01h */
-    U16     Tag;                                        /* 02h */
-    U8      LogicalUnitNumber[8];                       /* 04h */
-    U32     DataLength;                                 /* 0Ch */
-    /* SPI command information unit */
-    U8      ReservedFirstByteOfCommandIU;               /* 10h */
-    U8      TaskAttribute;                              /* 11h */
-    U8      TaskManagementFlags;                        /* 12h */
-    U8      AdditionalCDBLength;                        /* 13h */
-    U8      CDB[16];                                    /* 14h */
-    /* Alias ID */
-    U8      AliasID;                                    /* 24h */
-    U8      Reserved1;                                  /* 25h */
-    U16     Reserved2;                                  /* 26h */
-} MPI_TARGET_SCSI_SPI_CMD_BUFFER,
-  MPI_POINTER PTR_MPI_TARGET_SCSI_SPI_CMD_BUFFER,
-  MpiTargetScsiSpiCmdBuffer, MPI_POINTER pMpiTargetScsiSpiCmdBuffer;
-
-
-typedef struct _MPI_TARGET_SSP_CMD_BUFFER
-{
-    U8      FrameType;                                  /* 00h */
-    U8      Reserved1;                                  /* 01h */
-    U16     Reserved2;                                  /* 02h */
-    U16     InitiatorTag;                               /* 04h */
-    U16     DevHandle;                                  /* 06h */
-    /* COMMAND information unit starts here */
-    U8      LogicalUnitNumber[8];                       /* 08h */
-    U8      Reserved3;                                  /* 10h */
-    U8      TaskAttribute; /* lower 3 bits */           /* 11h */
-    U8      Reserved4;                                  /* 12h */
-    U8      AdditionalCDBLength; /* upper 5 bits */     /* 13h */
-    U8      CDB[16];                                    /* 14h */
-    /* Additional CDB bytes extend past the CDB field */
-} MPI_TARGET_SSP_CMD_BUFFER, MPI_POINTER PTR_MPI_TARGET_SSP_CMD_BUFFER,
-  MpiTargetSspCmdBuffer, MPI_POINTER pMpiTargetSspCmdBuffer;
-
-typedef struct _MPI_TARGET_SSP_TASK_BUFFER
-{
-    U8      FrameType;                                  /* 00h */
-    U8      Reserved1;                                  /* 01h */
-    U16     Reserved2;                                  /* 02h */
-    U16     InitiatorTag;                               /* 04h */
-    U16     DevHandle;                                  /* 06h */
-    /* TASK information unit starts here */
-    U8      LogicalUnitNumber[8];                       /* 08h */
-    U8      Reserved3;                                  /* 10h */
-    U8      Reserved4;                                  /* 11h */
-    U8      TaskManagementFunction;                     /* 12h */
-    U8      Reserved5;                                  /* 13h */
-    U16     ManagedTaskTag;                             /* 14h */
-    U16     Reserved6;                                  /* 16h */
-    U32     Reserved7;                                  /* 18h */
-    U32     Reserved8;                                  /* 1Ch */
-    U32     Reserved9;                                  /* 20h */
-} MPI_TARGET_SSP_TASK_BUFFER, MPI_POINTER PTR_MPI_TARGET_SSP_TASK_BUFFER,
-  MpiTargetSspTaskBuffer, MPI_POINTER pMpiTargetSspTaskBuffer;
-
-
-/****************************************************************************/
-/* Target Assist Request                                                    */
-/****************************************************************************/
-
-typedef struct _MSG_TARGET_ASSIST_REQUEST
-{
-    U8                      StatusCode;                 /* 00h */
-    U8                      TargetAssistFlags;          /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     QueueTag;                   /* 04h */
-    U8                      Reserved;                   /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     ReplyWord;                  /* 0Ch */
-    U8                      LUN[8];                     /* 10h */
-    U32                     RelativeOffset;             /* 18h */
-    U32                     DataLength;                 /* 1Ch */
-    SGE_IO_UNION            SGL[1];                     /* 20h */
-} MSG_TARGET_ASSIST_REQUEST, MPI_POINTER PTR_MSG_TARGET_ASSIST_REQUEST,
-  TargetAssistRequest_t, MPI_POINTER pTargetAssistRequest_t;
-
-#define TARGET_ASSIST_FLAGS_DATA_DIRECTION          (0x01)
-#define TARGET_ASSIST_FLAGS_AUTO_STATUS             (0x02)
-#define TARGET_ASSIST_FLAGS_HIGH_PRIORITY           (0x04)
-#define TARGET_ASSIST_FLAGS_CONFIRMED               (0x08)
-#define TARGET_ASSIST_FLAGS_REPOST_CMD_BUFFER       (0x80)
-
-/* Standard Target Mode Reply message */
-typedef struct _MSG_TARGET_ERROR_REPLY
-{
-    U16                     Reserved;                   /* 00h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U8                      PriorityReason;             /* 0Ch */
-    U8                      Reserved3;                  /* 0Dh */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-    U32                     ReplyWord;                  /* 14h */
-    U32                     TransferCount;              /* 18h */
-} MSG_TARGET_ERROR_REPLY, MPI_POINTER PTR_MSG_TARGET_ERROR_REPLY,
-  TargetErrorReply_t, MPI_POINTER pTargetErrorReply_t;
-
-
-/****************************************************************************/
-/* Target Assist Extended Request                                           */
-/****************************************************************************/
-
-typedef struct _MSG_TARGET_ASSIST_EXT_REQUEST
-{
-    U8                      StatusCode;                     /* 00h */
-    U8                      TargetAssistFlags;              /* 01h */
-    U8                      ChainOffset;                    /* 02h */
-    U8                      Function;                       /* 03h */
-    U16                     QueueTag;                       /* 04h */
-    U8                      Reserved1;                      /* 06h */
-    U8                      MsgFlags;                       /* 07h */
-    U32                     MsgContext;                     /* 08h */
-    U32                     ReplyWord;                      /* 0Ch */
-    U8                      LUN[8];                         /* 10h */
-    U32                     RelativeOffset;                 /* 18h */
-    U32                     Reserved2;                      /* 1Ch */
-    U32                     Reserved3;                      /* 20h */
-    U32                     PrimaryReferenceTag;            /* 24h */
-    U16                     PrimaryApplicationTag;          /* 28h */
-    U16                     PrimaryApplicationTagMask;      /* 2Ah */
-    U32                     Reserved4;                      /* 2Ch */
-    U32                     DataLength;                     /* 30h */
-    U32                     BidirectionalDataLength;        /* 34h */
-    U32                     SecondaryReferenceTag;          /* 38h */
-    U16                     SecondaryApplicationTag;        /* 3Ch */
-    U16                     Reserved5;                      /* 3Eh */
-    U16                     EEDPFlags;                      /* 40h */
-    U16                     ApplicationTagTranslationMask;  /* 42h */
-    U32                     EEDPBlockSize;                  /* 44h */
-    U8                      SGLOffset0;                     /* 48h */
-    U8                      SGLOffset1;                     /* 49h */
-    U8                      SGLOffset2;                     /* 4Ah */
-    U8                      SGLOffset3;                     /* 4Bh */
-    U32                     Reserved6;                      /* 4Ch */
-    SGE_IO_UNION            SGL[1];                         /* 50h */
-} MSG_TARGET_ASSIST_EXT_REQUEST, MPI_POINTER PTR_MSG_TARGET_ASSIST_EXT_REQUEST,
-  TargetAssistExtRequest_t, MPI_POINTER pTargetAssistExtRequest_t;
-
-/* see the defines after MSG_TARGET_ASSIST_REQUEST for TargetAssistFlags */
-
-/* defines for the MsgFlags field */
-#define TARGET_ASSIST_EXT_MSGFLAGS_BIDIRECTIONAL        (0x20)
-#define TARGET_ASSIST_EXT_MSGFLAGS_MULTICAST            (0x10)
-#define TARGET_ASSIST_EXT_MSGFLAGS_SGL_OFFSET_CHAINS    (0x08)
-
-/* defines for the EEDPFlags field */
-#define TARGET_ASSIST_EXT_EEDP_MASK_OP          (0x0007)
-#define TARGET_ASSIST_EXT_EEDP_NOOP_OP          (0x0000)
-#define TARGET_ASSIST_EXT_EEDP_CHK_OP           (0x0001)
-#define TARGET_ASSIST_EXT_EEDP_STRIP_OP         (0x0002)
-#define TARGET_ASSIST_EXT_EEDP_CHKRM_OP         (0x0003)
-#define TARGET_ASSIST_EXT_EEDP_INSERT_OP        (0x0004)
-#define TARGET_ASSIST_EXT_EEDP_REPLACE_OP       (0x0006)
-#define TARGET_ASSIST_EXT_EEDP_CHKREGEN_OP      (0x0007)
-
-#define TARGET_ASSIST_EXT_EEDP_PASS_REF_TAG     (0x0008)
-
-#define TARGET_ASSIST_EXT_EEDP_T10_CHK_MASK     (0x0700)
-#define TARGET_ASSIST_EXT_EEDP_T10_CHK_GUARD    (0x0100)
-#define TARGET_ASSIST_EXT_EEDP_T10_CHK_APPTAG   (0x0200)
-#define TARGET_ASSIST_EXT_EEDP_T10_CHK_REFTAG   (0x0400)
-#define TARGET_ASSIST_EXT_EEDP_T10_CHK_SHIFT    (8)
-
-#define TARGET_ASSIST_EXT_EEDP_INC_SEC_APPTAG   (0x1000)
-#define TARGET_ASSIST_EXT_EEDP_INC_PRI_APPTAG   (0x2000)
-#define TARGET_ASSIST_EXT_EEDP_INC_SEC_REFTAG   (0x4000)
-#define TARGET_ASSIST_EXT_EEDP_INC_PRI_REFTAG   (0x8000)
-
-
-/****************************************************************************/
-/* Target Status Send Request                                               */
-/****************************************************************************/
-
-typedef struct _MSG_TARGET_STATUS_SEND_REQUEST
-{
-    U8                      StatusCode;                 /* 00h */
-    U8                      StatusFlags;                /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     QueueTag;                   /* 04h */
-    U8                      Reserved;                   /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     ReplyWord;                  /* 0Ch */
-    U8                      LUN[8];                     /* 10h */
-    SGE_SIMPLE_UNION        StatusDataSGE;              /* 18h */
-} MSG_TARGET_STATUS_SEND_REQUEST, MPI_POINTER PTR_MSG_TARGET_STATUS_SEND_REQUEST,
-  TargetStatusSendRequest_t, MPI_POINTER pTargetStatusSendRequest_t;
-
-#define TARGET_STATUS_SEND_FLAGS_AUTO_GOOD_STATUS   (0x01)
-#define TARGET_STATUS_SEND_FLAGS_HIGH_PRIORITY      (0x04)
-#define TARGET_STATUS_SEND_FLAGS_CONFIRMED          (0x08)
-#define TARGET_STATUS_SEND_FLAGS_REPOST_CMD_BUFFER  (0x80)
-
-/*
- * NOTE: FCP_RSP data is big-endian. When used on a little-endian system, this
- * structure properly orders the bytes.
- */
-typedef struct _MPI_TARGET_FCP_RSP_BUFFER
-{
-    U8      Reserved0[8];                               /* 00h */
-    U8      Reserved1[2];                               /* 08h */
-    U8      FcpFlags;                                   /* 0Ah */
-    U8      FcpStatus;                                  /* 0Bh */
-    U32     FcpResid;                                   /* 0Ch */
-    U32     FcpSenseLength;                             /* 10h */
-    U32     FcpResponseLength;                          /* 14h */
-    U8      FcpResponseData[8];                         /* 18h */
-    U8      FcpSenseData[32]; /* Pad to 64 bytes */     /* 20h */
-} MPI_TARGET_FCP_RSP_BUFFER, MPI_POINTER PTR_MPI_TARGET_FCP_RSP_BUFFER,
-  MpiTargetFcpRspBuffer, MPI_POINTER pMpiTargetFcpRspBuffer;
-
-/*
- * NOTE: The SPI status IU is big-endian. When used on a little-endian system,
- * this structure properly orders the bytes.
- */
-typedef struct _MPI_TARGET_SCSI_SPI_STATUS_IU
-{
-    U8      Reserved0;                                  /* 00h */
-    U8      Reserved1;                                  /* 01h */
-    U8      Valid;                                      /* 02h */
-    U8      Status;                                     /* 03h */
-    U32     SenseDataListLength;                        /* 04h */
-    U32     PktFailuresListLength;                      /* 08h */
-    U8      SenseData[52]; /* Pad the IU to 64 bytes */ /* 0Ch */
-} MPI_TARGET_SCSI_SPI_STATUS_IU, MPI_POINTER PTR_MPI_TARGET_SCSI_SPI_STATUS_IU,
-  TargetScsiSpiStatusIU_t, MPI_POINTER pTargetScsiSpiStatusIU_t;
-
-/*
- * NOTE: The SSP status IU is big-endian. When used on a little-endian system,
- * this structure properly orders the bytes.
- */
-typedef struct _MPI_TARGET_SSP_RSP_IU
-{
-    U32     Reserved0[6]; /* reserved for SSP header */ /* 00h */
-    /* start of RESPONSE information unit */
-    U32     Reserved1;                                  /* 18h */
-    U32     Reserved2;                                  /* 1Ch */
-    U16     Reserved3;                                  /* 20h */
-    U8      DataPres; /* lower 2 bits */                /* 22h */
-    U8      Status;                                     /* 23h */
-    U32     Reserved4;                                  /* 24h */
-    U32     SenseDataLength;                            /* 28h */
-    U32     ResponseDataLength;                         /* 2Ch */
-    U8      ResponseSenseData[4];                       /* 30h */
-} MPI_TARGET_SSP_RSP_IU, MPI_POINTER PTR_MPI_TARGET_SSP_RSP_IU,
-  MpiTargetSspRspIu_t, MPI_POINTER pMpiTargetSspRspIu_t;
-
-
-/****************************************************************************/
-/* Target Mode Abort Request                                                */
-/****************************************************************************/
-
-typedef struct _MSG_TARGET_MODE_ABORT_REQUEST
-{
-    U8                      AbortType;                  /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     ReplyWord;                  /* 0Ch */
-    U32                     MsgContextToAbort;          /* 10h */
-} MSG_TARGET_MODE_ABORT, MPI_POINTER PTR_MSG_TARGET_MODE_ABORT,
-  TargetModeAbort_t, MPI_POINTER pTargetModeAbort_t;
-
-#define TARGET_MODE_ABORT_TYPE_ALL_CMD_BUFFERS      (0x00)
-#define TARGET_MODE_ABORT_TYPE_ALL_IO               (0x01)
-#define TARGET_MODE_ABORT_TYPE_EXACT_IO             (0x02)
-#define TARGET_MODE_ABORT_TYPE_EXACT_IO_REQUEST     (0x03)
-
-/* Target Mode Abort Reply */
-
-typedef struct _MSG_TARGET_MODE_ABORT_REPLY
-{
-    U16                     Reserved;                   /* 00h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved3;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-    U32                     AbortCount;                 /* 14h */
-} MSG_TARGET_MODE_ABORT_REPLY, MPI_POINTER PTR_MSG_TARGET_MODE_ABORT_REPLY,
-  TargetModeAbortReply_t, MPI_POINTER pTargetModeAbortReply_t;
-
-
-/****************************************************************************/
-/* Target Mode Context Reply                                                */
-/****************************************************************************/
-
-#define TARGET_MODE_REPLY_IO_INDEX_MASK         (0x00003FFF)
-#define TARGET_MODE_REPLY_IO_INDEX_SHIFT        (0)
-#define TARGET_MODE_REPLY_INITIATOR_INDEX_MASK  (0x03FFC000)
-#define TARGET_MODE_REPLY_INITIATOR_INDEX_SHIFT (14)
-#define TARGET_MODE_REPLY_ALIAS_MASK            (0x04000000)
-#define TARGET_MODE_REPLY_ALIAS_SHIFT           (26)
-#define TARGET_MODE_REPLY_PORT_MASK             (0x10000000)
-#define TARGET_MODE_REPLY_PORT_SHIFT            (28)
-
-
-#define GET_IO_INDEX(x)     (((x) & TARGET_MODE_REPLY_IO_INDEX_MASK)           \
-                                    >> TARGET_MODE_REPLY_IO_INDEX_SHIFT)
-
-#define SET_IO_INDEX(t, i)                                                     \
-            ((t) = ((t) & ~TARGET_MODE_REPLY_IO_INDEX_MASK) |                  \
-                              (((i) << TARGET_MODE_REPLY_IO_INDEX_SHIFT) &     \
-                                             TARGET_MODE_REPLY_IO_INDEX_MASK))
-
-#define GET_INITIATOR_INDEX(x) (((x) & TARGET_MODE_REPLY_INITIATOR_INDEX_MASK) \
-                                   >> TARGET_MODE_REPLY_INITIATOR_INDEX_SHIFT)
-
-#define SET_INITIATOR_INDEX(t, ii)                                             \
-        ((t) = ((t) & ~TARGET_MODE_REPLY_INITIATOR_INDEX_MASK) |               \
-                        (((ii) << TARGET_MODE_REPLY_INITIATOR_INDEX_SHIFT) &   \
-                                      TARGET_MODE_REPLY_INITIATOR_INDEX_MASK))
-
-#define GET_ALIAS(x) (((x) & TARGET_MODE_REPLY_ALIAS_MASK)                     \
-                                               >> TARGET_MODE_REPLY_ALIAS_SHIFT)
-
-#define SET_ALIAS(t, a)  ((t) = ((t) & ~TARGET_MODE_REPLY_ALIAS_MASK) |        \
-                                    (((a) << TARGET_MODE_REPLY_ALIAS_SHIFT) &  \
-                                                 TARGET_MODE_REPLY_ALIAS_MASK))
-
-#define GET_PORT(x) (((x) & TARGET_MODE_REPLY_PORT_MASK)                       \
-                                               >> TARGET_MODE_REPLY_PORT_SHIFT)
-
-#define SET_PORT(t, p)  ((t) = ((t) & ~TARGET_MODE_REPLY_PORT_MASK) |          \
-                                    (((p) << TARGET_MODE_REPLY_PORT_SHIFT) &   \
-                                                  TARGET_MODE_REPLY_PORT_MASK))
-
-/* the following obsolete values are for MPI v1.0 support */
-#define TARGET_MODE_REPLY_0100_MASK_HOST_INDEX       (0x000003FF)
-#define TARGET_MODE_REPLY_0100_SHIFT_HOST_INDEX      (0)
-#define TARGET_MODE_REPLY_0100_MASK_IOC_INDEX        (0x001FF800)
-#define TARGET_MODE_REPLY_0100_SHIFT_IOC_INDEX       (11)
-#define TARGET_MODE_REPLY_0100_PORT_MASK             (0x00400000)
-#define TARGET_MODE_REPLY_0100_PORT_SHIFT            (22)
-#define TARGET_MODE_REPLY_0100_MASK_INITIATOR_INDEX  (0x1F800000)
-#define TARGET_MODE_REPLY_0100_SHIFT_INITIATOR_INDEX (23)
-
-#define GET_HOST_INDEX_0100(x) (((x) & TARGET_MODE_REPLY_0100_MASK_HOST_INDEX) \
-                                  >> TARGET_MODE_REPLY_0100_SHIFT_HOST_INDEX)
-
-#define SET_HOST_INDEX_0100(t, hi)                                             \
-            ((t) = ((t) & ~TARGET_MODE_REPLY_0100_MASK_HOST_INDEX) |           \
-                         (((hi) << TARGET_MODE_REPLY_0100_SHIFT_HOST_INDEX) &  \
-                                      TARGET_MODE_REPLY_0100_MASK_HOST_INDEX))
-
-#define GET_IOC_INDEX_0100(x)   (((x) & TARGET_MODE_REPLY_0100_MASK_IOC_INDEX) \
-                                  >> TARGET_MODE_REPLY_0100_SHIFT_IOC_INDEX)
-
-#define SET_IOC_INDEX_0100(t, ii)                                              \
-            ((t) = ((t) & ~TARGET_MODE_REPLY_0100_MASK_IOC_INDEX) |            \
-                        (((ii) << TARGET_MODE_REPLY_0100_SHIFT_IOC_INDEX) &    \
-                                     TARGET_MODE_REPLY_0100_MASK_IOC_INDEX))
-
-#define GET_INITIATOR_INDEX_0100(x)                                            \
-            (((x) & TARGET_MODE_REPLY_0100_MASK_INITIATOR_INDEX)               \
-                              >> TARGET_MODE_REPLY_0100_SHIFT_INITIATOR_INDEX)
-
-#define SET_INITIATOR_INDEX_0100(t, ii)                                        \
-        ((t) = ((t) & ~TARGET_MODE_REPLY_0100_MASK_INITIATOR_INDEX) |          \
-                   (((ii) << TARGET_MODE_REPLY_0100_SHIFT_INITIATOR_INDEX) &   \
-                                TARGET_MODE_REPLY_0100_MASK_INITIATOR_INDEX))
-
-
-#endif
-
diff --git a/include.new/dev/mpt/mpilib/mpi_tool.h b/include.new/dev/mpt/mpilib/mpi_tool.h
deleted file mode 100644
index 271d937..0000000
--- a/include.new/dev/mpt/mpilib/mpi_tool.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_tool.h 233425 2012-03-24 16:23:21Z marius $ */
-/*-
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- *           Name:  mpi_tool.h
- *          Title:  MPI Toolbox structures and definitions
- *  Creation Date:  July 30, 2001
- *
- *    mpi_tool.h Version:  01.05.03
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  08-08-01  01.02.01  Original release.
- *  08-29-01  01.02.02  Added DIAG_DATA_UPLOAD_HEADER and related defines.
- *  01-16-04  01.02.03  Added defines and structures for new tools
- *.                     MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL and
- *                      MPI_TOOLBOX_FC_MANAGEMENT_TOOL.
- *  04-29-04  01.02.04  Added message structures for Diagnostic Buffer Post and
- *                      Diagnostic Release requests and replies.
- *  05-11-04  01.03.01  Original release for MPI v1.3.
- *  08-19-04  01.05.01  Original release for MPI v1.5.
- *  10-06-04  01.05.02  Added define for MPI_DIAG_BUF_TYPE_COUNT.
- *  02-09-05  01.05.03  Added frame size option to FC management tool.
- *                      Added Beacon tool to the Toolbox.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_TOOL_H
-#define MPI_TOOL_H
-
-#define MPI_TOOLBOX_CLEAN_TOOL                      (0x00)
-#define MPI_TOOLBOX_MEMORY_MOVE_TOOL                (0x01)
-#define MPI_TOOLBOX_DIAG_DATA_UPLOAD_TOOL           (0x02)
-#define MPI_TOOLBOX_ISTWI_READ_WRITE_TOOL           (0x03)
-#define MPI_TOOLBOX_FC_MANAGEMENT_TOOL              (0x04)
-#define MPI_TOOLBOX_BEACON_TOOL                     (0x05)
-
-
-/****************************************************************************/
-/* Toolbox reply                                                            */
-/****************************************************************************/
-
-typedef struct _MSG_TOOLBOX_REPLY
-{
-    U8                      Tool;                       /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved3;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-} MSG_TOOLBOX_REPLY, MPI_POINTER PTR_MSG_TOOLBOX_REPLY,
-  ToolboxReply_t, MPI_POINTER pToolboxReply_t;
-
-
-/****************************************************************************/
-/* Toolbox Clean Tool request                                               */
-/****************************************************************************/
-
-typedef struct _MSG_TOOLBOX_CLEAN_REQUEST
-{
-    U8                      Tool;                       /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     Flags;                      /* 0Ch */
-} MSG_TOOLBOX_CLEAN_REQUEST, MPI_POINTER PTR_MSG_TOOLBOX_CLEAN_REQUEST,
-  ToolboxCleanRequest_t, MPI_POINTER pToolboxCleanRequest_t;
-
-#define MPI_TOOLBOX_CLEAN_NVSRAM                    (0x00000001)
-#define MPI_TOOLBOX_CLEAN_SEEPROM                   (0x00000002)
-#define MPI_TOOLBOX_CLEAN_FLASH                     (0x00000004)
-#define MPI_TOOLBOX_CLEAN_BOOTLOADER                (0x04000000)
-#define MPI_TOOLBOX_CLEAN_FW_BACKUP                 (0x08000000)
-#define MPI_TOOLBOX_CLEAN_FW_CURRENT                (0x10000000)
-#define MPI_TOOLBOX_CLEAN_OTHER_PERSIST_PAGES       (0x20000000)
-#define MPI_TOOLBOX_CLEAN_PERSIST_MANUFACT_PAGES    (0x40000000)
-#define MPI_TOOLBOX_CLEAN_BOOT_SERVICES             (0x80000000)
-
-
-/****************************************************************************/
-/* Toolbox Memory Move request                                              */
-/****************************************************************************/
-
-typedef struct _MSG_TOOLBOX_MEM_MOVE_REQUEST
-{
-    U8                      Tool;                       /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    SGE_SIMPLE_UNION        SGL;                        /* 0Ch */
-} MSG_TOOLBOX_MEM_MOVE_REQUEST, MPI_POINTER PTR_MSG_TOOLBOX_MEM_MOVE_REQUEST,
-  ToolboxMemMoveRequest_t, MPI_POINTER pToolboxMemMoveRequest_t;
-
-
-/****************************************************************************/
-/* Toolbox Diagnostic Data Upload request                                   */
-/****************************************************************************/
-
-typedef struct _MSG_TOOLBOX_DIAG_DATA_UPLOAD_REQUEST
-{
-    U8                      Tool;                       /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     Flags;                      /* 0Ch */
-    U32                     Reserved3;                  /* 10h */
-    SGE_SIMPLE_UNION        SGL;                        /* 14h */
-} MSG_TOOLBOX_DIAG_DATA_UPLOAD_REQUEST, MPI_POINTER PTR_MSG_TOOLBOX_DIAG_DATA_UPLOAD_REQUEST,
-  ToolboxDiagDataUploadRequest_t, MPI_POINTER pToolboxDiagDataUploadRequest_t;
-
-typedef struct _DIAG_DATA_UPLOAD_HEADER
-{
-    U32                     DiagDataLength;             /* 00h */
-    U8                      FormatCode;                 /* 04h */
-    U8                      Reserved;                   /* 05h */
-    U16                     Reserved1;                  /* 06h */
-} DIAG_DATA_UPLOAD_HEADER, MPI_POINTER PTR_DIAG_DATA_UPLOAD_HEADER,
-  DiagDataUploadHeader_t, MPI_POINTER pDiagDataUploadHeader_t;
-
-#define MPI_TB_DIAG_FORMAT_SCSI_PRINTF_1            (0x01)
-#define MPI_TB_DIAG_FORMAT_SCSI_2                   (0x02)
-#define MPI_TB_DIAG_FORMAT_SCSI_3                   (0x03)
-#define MPI_TB_DIAG_FORMAT_FC_TRACE_1               (0x04)
-
-
-/****************************************************************************/
-/* Toolbox ISTWI Read Write request                                         */
-/****************************************************************************/
-
-typedef struct _MSG_TOOLBOX_ISTWI_READ_WRITE_REQUEST
-{
-    U8                      Tool;                       /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U8                      Flags;                      /* 0Ch */
-    U8                      BusNum;                     /* 0Dh */
-    U16                     Reserved3;                  /* 0Eh */
-    U8                      NumAddressBytes;            /* 10h */
-    U8                      Reserved4;                  /* 11h */
-    U16                     DataLength;                 /* 12h */
-    U8                      DeviceAddr;                 /* 14h */
-    U8                      Addr1;                      /* 15h */
-    U8                      Addr2;                      /* 16h */
-    U8                      Addr3;                      /* 17h */
-    U32                     Reserved5;                  /* 18h */
-    SGE_SIMPLE_UNION        SGL;                        /* 1Ch */
-} MSG_TOOLBOX_ISTWI_READ_WRITE_REQUEST, MPI_POINTER PTR_MSG_TOOLBOX_ISTWI_READ_WRITE_REQUEST,
-  ToolboxIstwiReadWriteRequest_t, MPI_POINTER pToolboxIstwiReadWriteRequest_t;
-
-#define MPI_TB_ISTWI_FLAGS_WRITE                    (0x00)
-#define MPI_TB_ISTWI_FLAGS_READ                     (0x01)
-
-
-/****************************************************************************/
-/* Toolbox FC Management request                                            */
-/****************************************************************************/
-
-/* ActionInfo for Bus and TargetId */
-typedef struct _MPI_TB_FC_MANAGE_BUS_TID_AI
-{
-    U16                     Reserved;                   /* 00h */
-    U8                      Bus;                        /* 02h */
-    U8                      TargetId;                   /* 03h */
-} MPI_TB_FC_MANAGE_BUS_TID_AI, MPI_POINTER PTR_MPI_TB_FC_MANAGE_BUS_TID_AI,
-  MpiTbFcManageBusTidAi_t, MPI_POINTER pMpiTbFcManageBusTidAi_t;
-
-/* ActionInfo for port identifier */
-typedef struct _MPI_TB_FC_MANAGE_PID_AI
-{
-    U32                     PortIdentifier;             /* 00h */
-} MPI_TB_FC_MANAGE_PID_AI, MPI_POINTER PTR_MPI_TB_FC_MANAGE_PID_AI,
-  MpiTbFcManagePidAi_t, MPI_POINTER pMpiTbFcManagePidAi_t;
-
-/* ActionInfo for set max frame size */
-typedef struct _MPI_TB_FC_MANAGE_FRAME_SIZE_AI
-{
-    U16                     FrameSize;                  /* 00h */
-    U8                      PortNum;                    /* 02h */
-    U8                      Reserved1;                  /* 03h */
-} MPI_TB_FC_MANAGE_FRAME_SIZE_AI, MPI_POINTER PTR_MPI_TB_FC_MANAGE_FRAME_SIZE_AI,
-  MpiTbFcManageFrameSizeAi_t, MPI_POINTER pMpiTbFcManageFrameSizeAi_t;
-
-/* union of ActionInfo */
-typedef union _MPI_TB_FC_MANAGE_AI_UNION
-{
-    MPI_TB_FC_MANAGE_BUS_TID_AI     BusTid;
-    MPI_TB_FC_MANAGE_PID_AI         Port;
-    MPI_TB_FC_MANAGE_FRAME_SIZE_AI  FrameSize;
-} MPI_TB_FC_MANAGE_AI_UNION, MPI_POINTER PTR_MPI_TB_FC_MANAGE_AI_UNION,
-  MpiTbFcManageAiUnion_t, MPI_POINTER pMpiTbFcManageAiUnion_t;
-
-typedef struct _MSG_TOOLBOX_FC_MANAGE_REQUEST
-{
-    U8                          Tool;                   /* 00h */
-    U8                          Reserved;               /* 01h */
-    U8                          ChainOffset;            /* 02h */
-    U8                          Function;               /* 03h */
-    U16                         Reserved1;              /* 04h */
-    U8                          Reserved2;              /* 06h */
-    U8                          MsgFlags;               /* 07h */
-    U32                         MsgContext;             /* 08h */
-    U8                          Action;                 /* 0Ch */
-    U8                          Reserved3;              /* 0Dh */
-    U16                         Reserved4;              /* 0Eh */
-    MPI_TB_FC_MANAGE_AI_UNION   ActionInfo;             /* 10h */
-} MSG_TOOLBOX_FC_MANAGE_REQUEST, MPI_POINTER PTR_MSG_TOOLBOX_FC_MANAGE_REQUEST,
-  ToolboxFcManageRequest_t, MPI_POINTER pToolboxFcManageRequest_t;
-
-/* defines for the Action field */
-#define MPI_TB_FC_MANAGE_ACTION_DISC_ALL            (0x00)
-#define MPI_TB_FC_MANAGE_ACTION_DISC_PID            (0x01)
-#define MPI_TB_FC_MANAGE_ACTION_DISC_BUS_TID        (0x02)
-#define MPI_TB_FC_MANAGE_ACTION_SET_MAX_FRAME_SIZE  (0x03)
-
-
-/****************************************************************************/
-/* Toolbox Beacon Tool request                                               */
-/****************************************************************************/
-
-typedef struct _MSG_TOOLBOX_BEACON_REQUEST
-{
-    U8                      Tool;                       /* 00h */
-    U8                      Reserved;                   /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U8                      ConnectNum;                 /* 0Ch */
-    U8                      PortNum;                    /* 0Dh */
-    U8                      Reserved3;                  /* 0Eh */
-    U8                      Flags;                      /* 0Fh */
-} MSG_TOOLBOX_BEACON_REQUEST, MPI_POINTER PTR_MSG_TOOLBOX_BEACON_REQUEST,
-  ToolboxBeaconRequest_t, MPI_POINTER pToolboxBeaconRequest_t;
-
-#define MPI_TOOLBOX_FLAGS_BEACON_MODE_OFF       (0x00)
-#define MPI_TOOLBOX_FLAGS_BEACON_MODE_ON        (0x01)
-
-
-/****************************************************************************/
-/* Diagnostic Buffer Post request                                           */
-/****************************************************************************/
-
-typedef struct _MSG_DIAG_BUFFER_POST_REQUEST
-{
-    U8                      TraceLevel;                 /* 00h */
-    U8                      BufferType;                 /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved1;                  /* 04h */
-    U8                      Reserved2;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U32                     ExtendedType;               /* 0Ch */
-    U32                     BufferLength;               /* 10h */
-    U32                     ProductSpecific[4];         /* 14h */
-    U32                     Reserved3;                  /* 24h */
-    U64                     BufferAddress;              /* 28h */
-} MSG_DIAG_BUFFER_POST_REQUEST, MPI_POINTER PTR_MSG_DIAG_BUFFER_POST_REQUEST,
-  DiagBufferPostRequest_t, MPI_POINTER pDiagBufferPostRequest_t;
-
-#define MPI_DIAG_BUF_TYPE_TRACE                     (0x00)
-#define MPI_DIAG_BUF_TYPE_SNAPSHOT                  (0x01)
-#define MPI_DIAG_BUF_TYPE_EXTENDED                  (0x02)
-/* count of the number of buffer types */
-#define MPI_DIAG_BUF_TYPE_COUNT                     (0x03)
-
-#define MPI_DIAG_EXTENDED_QTAG                      (0x00000001)
-
-
-/* Diagnostic Buffer Post reply */
-typedef struct _MSG_DIAG_BUFFER_POST_REPLY
-{
-    U8                      Reserved1;                  /* 00h */
-    U8                      BufferType;                 /* 01h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved2;                  /* 04h */
-    U8                      Reserved3;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved4;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-    U32                     TransferLength;             /* 14h */
-} MSG_DIAG_BUFFER_POST_REPLY, MPI_POINTER PTR_MSG_DIAG_BUFFER_POST_REPLY,
-  DiagBufferPostReply_t, MPI_POINTER pDiagBufferPostReply_t;
-
-
-/****************************************************************************/
-/* Diagnostic Release request                                               */
-/****************************************************************************/
-
-typedef struct _MSG_DIAG_RELEASE_REQUEST
-{
-    U8                      Reserved1;                  /* 00h */
-    U8                      BufferType;                 /* 01h */
-    U8                      ChainOffset;                /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved2;                  /* 04h */
-    U8                      Reserved3;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-} MSG_DIAG_RELEASE_REQUEST, MPI_POINTER PTR_MSG_DIAG_RELEASE_REQUEST,
-  DiagReleaseRequest_t, MPI_POINTER pDiagReleaseRequest_t;
-
-
-/* Diagnostic Release reply */
-typedef struct _MSG_DIAG_RELEASE_REPLY
-{
-    U8                      Reserved1;                  /* 00h */
-    U8                      BufferType;                 /* 01h */
-    U8                      MsgLength;                  /* 02h */
-    U8                      Function;                   /* 03h */
-    U16                     Reserved2;                  /* 04h */
-    U8                      Reserved3;                  /* 06h */
-    U8                      MsgFlags;                   /* 07h */
-    U32                     MsgContext;                 /* 08h */
-    U16                     Reserved4;                  /* 0Ch */
-    U16                     IOCStatus;                  /* 0Eh */
-    U32                     IOCLogInfo;                 /* 10h */
-} MSG_DIAG_RELEASE_REPLY, MPI_POINTER PTR_MSG_DIAG_RELEASE_REPLY,
-  DiagReleaseReply_t, MPI_POINTER pDiagReleaseReply_t;
-
-
-#endif
diff --git a/include.new/dev/mpt/mpilib/mpi_type.h b/include.new/dev/mpt/mpilib/mpi_type.h
deleted file mode 100644
index 1a5d2c3..0000000
--- a/include.new/dev/mpt/mpilib/mpi_type.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/mpt/mpilib/mpi_type.h 233425 2012-03-24 16:23:21Z marius $ */
-/*
- * Copyright (c) 2000-2010, LSI Logic Corporation and its contributors.
- * 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 at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon including
- *    a substantially similar Disclaimer requirement for further binary
- *    redistribution.
- * 3. Neither the name of the LSI Logic Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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 THE COPYRIGHT
- * OWNER OR CONTRIBUTOR IS ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * 
- *           Name:  mpi_type.h
- *          Title:  MPI Basic type definitions
- *  Creation Date:  June 6, 2000
- *
- *    mpi_type.h Version:  01.05.02
- *
- *  Version History
- *  ---------------
- *
- *  Date      Version   Description
- *  --------  --------  ------------------------------------------------------
- *  05-08-00  00.10.01  Original release for 0.10 spec dated 4/26/2000.
- *  06-06-00  01.00.01  Update version number for 1.0 release.
- *  11-02-00  01.01.01  Original release for post 1.0 work
- *  02-20-01  01.01.02  Added define and ifdef for MPI_POINTER.
- *  08-08-01  01.02.01  Original release for v1.2 work.
- *  05-11-04  01.03.01  Original release for MPI v1.3.
- *  08-19-04  01.05.01  Original release for MPI v1.5.
- *  08-30-05  01.05.02  Added PowerPC option to #ifdef's.
- *  --------------------------------------------------------------------------
- */
-
-#ifndef MPI_TYPE_H
-#define MPI_TYPE_H
-
-
-/*******************************************************************************
- * Define MPI_POINTER if it hasn't already been defined. By default MPI_POINTER
- * is defined to be a near pointer. MPI_POINTER can be defined as a far pointer
- * by defining MPI_POINTER as "far *" before this header file is included.
- */
-#ifndef MPI_POINTER
-#define MPI_POINTER     *
-#endif
-
-
-/*****************************************************************************
-*
-*               B a s i c    T y p e s
-*
-*****************************************************************************/
-
-typedef signed   char   S8;
-typedef unsigned char   U8;
-typedef signed   short  S16;
-typedef unsigned short  U16;
-
-#ifdef	__FreeBSD__
-
-typedef int32_t  S32;
-typedef uint32_t U32;
-
-#else
-
-#if defined(__unix__) || defined(__arm) || defined(ALPHA) || defined(__PPC__) || defined(__ppc)
-
-    typedef signed   int   S32;
-    typedef unsigned int   U32;
-
-#else
-
-    typedef signed   long  S32;
-    typedef unsigned long  U32;
-
-#endif
-#endif
-
-
-typedef struct _S64
-{
-    U32          Low;
-    S32          High;
-} S64;
-
-typedef struct _U64
-{
-    U32          Low;
-    U32          High;
-} U64;
-
-
-/****************************************************************************/
-/*  Pointers                                                                */
-/****************************************************************************/
-
-typedef S8      *PS8;
-typedef U8      *PU8;
-typedef S16     *PS16;
-typedef U16     *PU16;
-typedef S32     *PS32;
-typedef U32     *PU32;
-typedef S64     *PS64;
-typedef U64     *PU64;
-
-
-#endif
-
diff --git a/include.new/dev/nvme/nvme.h b/include.new/dev/nvme/nvme.h
deleted file mode 100644
index 5bb98aa..0000000
--- a/include.new/dev/nvme/nvme.h
+++ /dev/null
@@ -1,879 +0,0 @@
-/*-
- * Copyright (C) 2012-2013 Intel Corporation
- * 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.
- *
- * 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: releng/10.2/sys/dev/nvme/nvme.h 256152 2013-10-08 15:47:22Z jimharris $
- */
-
-#ifndef __NVME_H__
-#define __NVME_H__
-
-#ifdef _KERNEL
-#include <sys/types.h>
-#endif
-
-#include <sys/param.h>
-
-#define	NVME_PASSTHROUGH_CMD		_IOWR('n', 0, struct nvme_pt_command)
-#define	NVME_RESET_CONTROLLER		_IO('n', 1)
-
-#define	NVME_IO_TEST			_IOWR('n', 100, struct nvme_io_test)
-#define	NVME_BIO_TEST			_IOWR('n', 101, struct nvme_io_test)
-
-/*
- * Use to mark a command to apply to all namespaces, or to retrieve global
- *  log pages.
- */
-#define NVME_GLOBAL_NAMESPACE_TAG	((uint32_t)0xFFFFFFFF)
-
-#define NVME_MAX_XFER_SIZE		MAXPHYS
-
-union cap_lo_register {
-	uint32_t	raw;
-	struct {
-		/** maximum queue entries supported */
-		uint32_t mqes		: 16;
-
-		/** contiguous queues required */
-		uint32_t cqr		: 1;
-
-		/** arbitration mechanism supported */
-		uint32_t ams		: 2;
-
-		uint32_t reserved1	: 5;
-
-		/** timeout */
-		uint32_t to		: 8;
-	} bits __packed;
-} __packed;
-
-union cap_hi_register {
-	uint32_t	raw;
-	struct {
-		/** doorbell stride */
-		uint32_t dstrd		: 4;
-
-		uint32_t reserved3	: 1;
-
-		/** command sets supported */
-		uint32_t css_nvm	: 1;
-
-		uint32_t css_reserved	: 3;
-		uint32_t reserved2	: 7;
-
-		/** memory page size minimum */
-		uint32_t mpsmin		: 4;
-
-		/** memory page size maximum */
-		uint32_t mpsmax		: 4;
-
-		uint32_t reserved1	: 8;
-	} bits __packed;
-} __packed;
-
-union cc_register {
-	uint32_t	raw;
-	struct {
-		/** enable */
-		uint32_t en		: 1;
-
-		uint32_t reserved1	: 3;
-
-		/** i/o command set selected */
-		uint32_t css		: 3;
-
-		/** memory page size */
-		uint32_t mps		: 4;
-
-		/** arbitration mechanism selected */
-		uint32_t ams		: 3;
-
-		/** shutdown notification */
-		uint32_t shn		: 2;
-
-		/** i/o submission queue entry size */
-		uint32_t iosqes		: 4;
-
-		/** i/o completion queue entry size */
-		uint32_t iocqes		: 4;
-
-		uint32_t reserved2	: 8;
-	} bits __packed;
-} __packed;
-
-enum shn_value {
-	NVME_SHN_NORMAL		= 0x1,
-	NVME_SHN_ABRUPT		= 0x2,
-};
-
-union csts_register {
-	uint32_t	raw;
-	struct {
-		/** ready */
-		uint32_t rdy		: 1;
-
-		/** controller fatal status */
-		uint32_t cfs		: 1;
-
-		/** shutdown status */
-		uint32_t shst		: 2;
-
-		uint32_t reserved1	: 28;
-	} bits __packed;
-} __packed;
-
-enum shst_value {
-	NVME_SHST_NORMAL	= 0x0,
-	NVME_SHST_OCCURRING	= 0x1,
-	NVME_SHST_COMPLETE	= 0x2,
-};
-
-union aqa_register {
-	uint32_t	raw;
-	struct {
-		/** admin submission queue size */
-		uint32_t asqs		: 12;
-
-		uint32_t reserved1	: 4;
-
-		/** admin completion queue size */
-		uint32_t acqs		: 12;
-
-		uint32_t reserved2	: 4;
-	} bits __packed;
-} __packed;
-
-struct nvme_registers
-{
-	/** controller capabilities */
-	union cap_lo_register	cap_lo;
-	union cap_hi_register	cap_hi;
-
-	uint32_t		vs;	/* version */
-	uint32_t		intms;	/* interrupt mask set */
-	uint32_t		intmc;	/* interrupt mask clear */
-
-	/** controller configuration */
-	union cc_register	cc;
-
-	uint32_t		reserved1;
-
-	/** controller status */
-	union csts_register	csts;
-
-	uint32_t		reserved2;
-
-	/** admin queue attributes */
-	union aqa_register	aqa;
-
-	uint64_t		asq;	/* admin submission queue base addr */
-	uint64_t		acq;	/* admin completion queue base addr */
-	uint32_t		reserved3[0x3f2];
-
-	struct {
-	    uint32_t		sq_tdbl; /* submission queue tail doorbell */
-	    uint32_t		cq_hdbl; /* completion queue head doorbell */
-	} doorbell[1] __packed;
-} __packed;
-
-struct nvme_command
-{
-	/* dword 0 */
-	uint16_t opc	:  8;	/* opcode */
-	uint16_t fuse	:  2;	/* fused operation */
-	uint16_t rsvd1	:  6;
-	uint16_t cid;		/* command identifier */
-
-	/* dword 1 */
-	uint32_t nsid;		/* namespace identifier */
-
-	/* dword 2-3 */
-	uint32_t rsvd2;
-	uint32_t rsvd3;
-
-	/* dword 4-5 */
-	uint64_t mptr;		/* metadata pointer */
-
-	/* dword 6-7 */
-	uint64_t prp1;		/* prp entry 1 */
-
-	/* dword 8-9 */
-	uint64_t prp2;		/* prp entry 2 */
-
-	/* dword 10-15 */
-	uint32_t cdw10;		/* command-specific */
-	uint32_t cdw11;		/* command-specific */
-	uint32_t cdw12;		/* command-specific */
-	uint32_t cdw13;		/* command-specific */
-	uint32_t cdw14;		/* command-specific */
-	uint32_t cdw15;		/* command-specific */
-} __packed;
-
-struct nvme_status {
-
-	uint16_t p	:  1;	/* phase tag */
-	uint16_t sc	:  8;	/* status code */
-	uint16_t sct	:  3;	/* status code type */
-	uint16_t rsvd2	:  2;
-	uint16_t m	:  1;	/* more */
-	uint16_t dnr	:  1;	/* do not retry */
-} __packed;
-
-struct nvme_completion {
-
-	/* dword 0 */
-	uint32_t		cdw0;	/* command-specific */
-
-	/* dword 1 */
-	uint32_t		rsvd1;
-
-	/* dword 2 */
-	uint16_t		sqhd;	/* submission queue head pointer */
-	uint16_t		sqid;	/* submission queue identifier */
-
-	/* dword 3 */
-	uint16_t		cid;	/* command identifier */
-	struct nvme_status	status;
-} __packed;
-
-struct nvme_dsm_range {
-
-	uint32_t attributes;
-	uint32_t length;
-	uint64_t starting_lba;
-} __packed;
-
-/* status code types */
-enum nvme_status_code_type {
-	NVME_SCT_GENERIC		= 0x0,
-	NVME_SCT_COMMAND_SPECIFIC	= 0x1,
-	NVME_SCT_MEDIA_ERROR		= 0x2,
-	/* 0x3-0x6 - reserved */
-	NVME_SCT_VENDOR_SPECIFIC	= 0x7,
-};
-
-/* generic command status codes */
-enum nvme_generic_command_status_code {
-	NVME_SC_SUCCESS				= 0x00,
-	NVME_SC_INVALID_OPCODE			= 0x01,
-	NVME_SC_INVALID_FIELD			= 0x02,
-	NVME_SC_COMMAND_ID_CONFLICT		= 0x03,
-	NVME_SC_DATA_TRANSFER_ERROR		= 0x04,
-	NVME_SC_ABORTED_POWER_LOSS		= 0x05,
-	NVME_SC_INTERNAL_DEVICE_ERROR		= 0x06,
-	NVME_SC_ABORTED_BY_REQUEST		= 0x07,
-	NVME_SC_ABORTED_SQ_DELETION		= 0x08,
-	NVME_SC_ABORTED_FAILED_FUSED		= 0x09,
-	NVME_SC_ABORTED_MISSING_FUSED		= 0x0a,
-	NVME_SC_INVALID_NAMESPACE_OR_FORMAT	= 0x0b,
-	NVME_SC_COMMAND_SEQUENCE_ERROR		= 0x0c,
-
-	NVME_SC_LBA_OUT_OF_RANGE		= 0x80,
-	NVME_SC_CAPACITY_EXCEEDED		= 0x81,
-	NVME_SC_NAMESPACE_NOT_READY		= 0x82,
-};
-
-/* command specific status codes */
-enum nvme_command_specific_status_code {
-	NVME_SC_COMPLETION_QUEUE_INVALID	= 0x00,
-	NVME_SC_INVALID_QUEUE_IDENTIFIER	= 0x01,
-	NVME_SC_MAXIMUM_QUEUE_SIZE_EXCEEDED	= 0x02,
-	NVME_SC_ABORT_COMMAND_LIMIT_EXCEEDED	= 0x03,
-	/* 0x04 - reserved */
-	NVME_SC_ASYNC_EVENT_REQUEST_LIMIT_EXCEEDED = 0x05,
-	NVME_SC_INVALID_FIRMWARE_SLOT		= 0x06,
-	NVME_SC_INVALID_FIRMWARE_IMAGE		= 0x07,
-	NVME_SC_INVALID_INTERRUPT_VECTOR	= 0x08,
-	NVME_SC_INVALID_LOG_PAGE		= 0x09,
-	NVME_SC_INVALID_FORMAT			= 0x0a,
-	NVME_SC_FIRMWARE_REQUIRES_RESET		= 0x0b,
-
-	NVME_SC_CONFLICTING_ATTRIBUTES		= 0x80,
-	NVME_SC_INVALID_PROTECTION_INFO		= 0x81,
-	NVME_SC_ATTEMPTED_WRITE_TO_RO_PAGE	= 0x82,
-};
-
-/* media error status codes */
-enum nvme_media_error_status_code {
-	NVME_SC_WRITE_FAULTS			= 0x80,
-	NVME_SC_UNRECOVERED_READ_ERROR		= 0x81,
-	NVME_SC_GUARD_CHECK_ERROR		= 0x82,
-	NVME_SC_APPLICATION_TAG_CHECK_ERROR	= 0x83,
-	NVME_SC_REFERENCE_TAG_CHECK_ERROR	= 0x84,
-	NVME_SC_COMPARE_FAILURE			= 0x85,
-	NVME_SC_ACCESS_DENIED			= 0x86,
-};
-
-/* admin opcodes */
-enum nvme_admin_opcode {
-	NVME_OPC_DELETE_IO_SQ			= 0x00,
-	NVME_OPC_CREATE_IO_SQ			= 0x01,
-	NVME_OPC_GET_LOG_PAGE			= 0x02,
-	/* 0x03 - reserved */
-	NVME_OPC_DELETE_IO_CQ			= 0x04,
-	NVME_OPC_CREATE_IO_CQ			= 0x05,
-	NVME_OPC_IDENTIFY			= 0x06,
-	/* 0x07 - reserved */
-	NVME_OPC_ABORT				= 0x08,
-	NVME_OPC_SET_FEATURES			= 0x09,
-	NVME_OPC_GET_FEATURES			= 0x0a,
-	/* 0x0b - reserved */
-	NVME_OPC_ASYNC_EVENT_REQUEST		= 0x0c,
-	/* 0x0d-0x0f - reserved */
-	NVME_OPC_FIRMWARE_ACTIVATE		= 0x10,
-	NVME_OPC_FIRMWARE_IMAGE_DOWNLOAD	= 0x11,
-
-	NVME_OPC_FORMAT_NVM			= 0x80,
-	NVME_OPC_SECURITY_SEND			= 0x81,
-	NVME_OPC_SECURITY_RECEIVE		= 0x82,
-};
-
-/* nvme nvm opcodes */
-enum nvme_nvm_opcode {
-	NVME_OPC_FLUSH				= 0x00,
-	NVME_OPC_WRITE				= 0x01,
-	NVME_OPC_READ				= 0x02,
-	/* 0x03 - reserved */
-	NVME_OPC_WRITE_UNCORRECTABLE		= 0x04,
-	NVME_OPC_COMPARE			= 0x05,
-	/* 0x06-0x07 - reserved */
-	NVME_OPC_DATASET_MANAGEMENT		= 0x09,
-};
-
-enum nvme_feature {
-	/* 0x00 - reserved */
-	NVME_FEAT_ARBITRATION			= 0x01,
-	NVME_FEAT_POWER_MANAGEMENT		= 0x02,
-	NVME_FEAT_LBA_RANGE_TYPE		= 0x03,
-	NVME_FEAT_TEMPERATURE_THRESHOLD		= 0x04,
-	NVME_FEAT_ERROR_RECOVERY		= 0x05,
-	NVME_FEAT_VOLATILE_WRITE_CACHE		= 0x06,
-	NVME_FEAT_NUMBER_OF_QUEUES		= 0x07,
-	NVME_FEAT_INTERRUPT_COALESCING		= 0x08,
-	NVME_FEAT_INTERRUPT_VECTOR_CONFIGURATION = 0x09,
-	NVME_FEAT_WRITE_ATOMICITY		= 0x0A,
-	NVME_FEAT_ASYNC_EVENT_CONFIGURATION	= 0x0B,
-	/* 0x0C-0x7F - reserved */
-	NVME_FEAT_SOFTWARE_PROGRESS_MARKER	= 0x80,
-	/* 0x81-0xBF - command set specific (reserved) */
-	/* 0xC0-0xFF - vendor specific */
-};
-
-enum nvme_dsm_attribute {
-	NVME_DSM_ATTR_INTEGRAL_READ		= 0x1,
-	NVME_DSM_ATTR_INTEGRAL_WRITE		= 0x2,
-	NVME_DSM_ATTR_DEALLOCATE		= 0x4,
-};
-
-enum nvme_activate_action {
-	NVME_AA_REPLACE_NO_ACTIVATE		= 0x0,
-	NVME_AA_REPLACE_ACTIVATE		= 0x1,
-	NVME_AA_ACTIVATE			= 0x2,
-};
-
-#define NVME_SERIAL_NUMBER_LENGTH	20
-#define NVME_MODEL_NUMBER_LENGTH	40
-#define NVME_FIRMWARE_REVISION_LENGTH	8
-
-struct nvme_controller_data {
-
-	/* bytes 0-255: controller capabilities and features */
-
-	/** pci vendor id */
-	uint16_t		vid;
-
-	/** pci subsystem vendor id */
-	uint16_t		ssvid;
-
-	/** serial number */
-	uint8_t			sn[NVME_SERIAL_NUMBER_LENGTH];
-
-	/** model number */
-	uint8_t			mn[NVME_MODEL_NUMBER_LENGTH];
-
-	/** firmware revision */
-	uint8_t			fr[NVME_FIRMWARE_REVISION_LENGTH];
-
-	/** recommended arbitration burst */
-	uint8_t			rab;
-
-	/** ieee oui identifier */
-	uint8_t			ieee[3];
-
-	/** multi-interface capabilities */
-	uint8_t			mic;
-
-	/** maximum data transfer size */
-	uint8_t			mdts;
-
-	uint8_t			reserved1[178];
-
-	/* bytes 256-511: admin command set attributes */
-
-	/** optional admin command support */
-	struct {
-		/* supports security send/receive commands */
-		uint16_t	security  : 1;
-
-		/* supports format nvm command */
-		uint16_t	format    : 1;
-
-		/* supports firmware activate/download commands */
-		uint16_t	firmware  : 1;
-
-		uint16_t	oacs_rsvd : 13;
-	} __packed oacs;
-
-	/** abort command limit */
-	uint8_t			acl;
-
-	/** asynchronous event request limit */
-	uint8_t			aerl;
-
-	/** firmware updates */
-	struct {
-		/* first slot is read-only */
-		uint8_t		slot1_ro  : 1;
-
-		/* number of firmware slots */
-		uint8_t		num_slots : 3;
-
-		uint8_t		frmw_rsvd : 4;
-	} __packed frmw;
-
-	/** log page attributes */
-	struct {
-		/* per namespace smart/health log page */
-		uint8_t		ns_smart : 1;
-
-		uint8_t		lpa_rsvd : 7;
-	} __packed lpa;
-
-	/** error log page entries */
-	uint8_t			elpe;
-
-	/** number of power states supported */
-	uint8_t			npss;
-
-	/** admin vendor specific command configuration */
-	struct {
-		/* admin vendor specific commands use spec format */
-		uint8_t		spec_format : 1;
-
-		uint8_t		avscc_rsvd  : 7;
-	} __packed avscc;
-
-	uint8_t			reserved2[247];
-
-	/* bytes 512-703: nvm command set attributes */
-
-	/** submission queue entry size */
-	struct {
-		uint8_t		min : 4;
-		uint8_t		max : 4;
-	} __packed sqes;
-
-	/** completion queue entry size */
-	struct {
-		uint8_t		min : 4;
-		uint8_t		max : 4;
-	} __packed cqes;
-
-	uint8_t			reserved3[2];
-
-	/** number of namespaces */
-	uint32_t		nn;
-
-	/** optional nvm command support */
-	struct {
-		uint16_t	compare : 1;
-		uint16_t	write_unc : 1;
-		uint16_t	dsm: 1;
-		uint16_t	reserved: 13;
-	} __packed oncs;
-
-	/** fused operation support */
-	uint16_t		fuses;
-
-	/** format nvm attributes */
-	uint8_t			fna;
-
-	/** volatile write cache */
-	struct {
-		uint8_t		present : 1;
-		uint8_t		reserved : 7;
-	} __packed vwc;
-
-	/* TODO: flesh out remaining nvm command set attributes */
-	uint8_t			reserved4[178];
-
-	/* bytes 704-2047: i/o command set attributes */
-	uint8_t			reserved5[1344];
-
-	/* bytes 2048-3071: power state descriptors */
-	uint8_t			reserved6[1024];
-
-	/* bytes 3072-4095: vendor specific */
-	uint8_t			vs[1024];
-} __packed __aligned(4);
-
-struct nvme_namespace_data {
-
-	/** namespace size */
-	uint64_t		nsze;
-
-	/** namespace capacity */
-	uint64_t		ncap;
-
-	/** namespace utilization */
-	uint64_t		nuse;
-
-	/** namespace features */
-	struct {
-		/** thin provisioning */
-		uint8_t		thin_prov : 1;
-		uint8_t		reserved1 : 7;
-	} __packed nsfeat;
-
-	/** number of lba formats */
-	uint8_t			nlbaf;
-
-	/** formatted lba size */
-	struct {
-		uint8_t		format    : 4;
-		uint8_t		extended  : 1;
-		uint8_t		reserved2 : 3;
-	} __packed flbas;
-
-	/** metadata capabilities */
-	struct {
-		/* metadata can be transferred as part of data prp list */
-		uint8_t		extended  : 1;
-
-		/* metadata can be transferred with separate metadata pointer */
-		uint8_t		pointer   : 1;
-
-		uint8_t		reserved3 : 6;
-	} __packed mc;
-
-	/** end-to-end data protection capabilities */
-	struct {
-		/* protection information type 1 */
-		uint8_t		pit1     : 1;
-
-		/* protection information type 2 */
-		uint8_t		pit2     : 1;
-
-		/* protection information type 3 */
-		uint8_t		pit3     : 1;
-
-		/* first eight bytes of metadata */
-		uint8_t		md_start : 1;
-
-		/* last eight bytes of metadata */
-		uint8_t		md_end   : 1;
-	} __packed dpc;
-
-	/** end-to-end data protection type settings */
-	struct {
-		/* protection information type */
-		uint8_t		pit       : 3;
-
-		/* 1 == protection info transferred at start of metadata */
-		/* 0 == protection info transferred at end of metadata */
-		uint8_t		md_start  : 1;
-
-		uint8_t		reserved4 : 4;
-	} __packed dps;
-
-	uint8_t			reserved5[98];
-
-	/** lba format support */
-	struct {
-		/** metadata size */
-		uint32_t	ms	  : 16;
-
-		/** lba data size */
-		uint32_t	lbads	  : 8;
-
-		/** relative performance */
-		uint32_t	rp	  : 2;
-
-		uint32_t	reserved6 : 6;
-	} __packed lbaf[16];
-
-	uint8_t			reserved6[192];
-
-	uint8_t			vendor_specific[3712];
-} __packed __aligned(4);
-
-enum nvme_log_page {
-
-	/* 0x00 - reserved */
-	NVME_LOG_ERROR			= 0x01,
-	NVME_LOG_HEALTH_INFORMATION	= 0x02,
-	NVME_LOG_FIRMWARE_SLOT		= 0x03,
-	/* 0x04-0x7F - reserved */
-	/* 0x80-0xBF - I/O command set specific */
-	/* 0xC0-0xFF - vendor specific */
-};
-
-struct nvme_error_information_entry {
-
-	uint64_t		error_count;
-	uint16_t		sqid;
-	uint16_t		cid;
-	struct nvme_status	status;
-	uint16_t		error_location;
-	uint64_t		lba;
-	uint32_t		nsid;
-	uint8_t			vendor_specific;
-	uint8_t			reserved[35];
-} __packed __aligned(4);
-
-union nvme_critical_warning_state {
-
-	uint8_t		raw;
-
-	struct {
-		uint8_t	available_spare		: 1;
-		uint8_t	temperature		: 1;
-		uint8_t	device_reliability	: 1;
-		uint8_t	read_only		: 1;
-		uint8_t	volatile_memory_backup	: 1;
-		uint8_t	reserved		: 3;
-	} __packed bits;
-} __packed;
-
-struct nvme_health_information_page {
-
-	union nvme_critical_warning_state	critical_warning;
-
-	uint16_t		temperature;
-	uint8_t			available_spare;
-	uint8_t			available_spare_threshold;
-	uint8_t			percentage_used;
-
-	uint8_t			reserved[26];
-
-	/*
-	 * Note that the following are 128-bit values, but are
-	 *  defined as an array of 2 64-bit values.
-	 */
-	/* Data Units Read is always in 512-byte units. */
-	uint64_t		data_units_read[2];
-	/* Data Units Written is always in 512-byte units. */
-	uint64_t		data_units_written[2];
-	/* For NVM command set, this includes Compare commands. */
-	uint64_t		host_read_commands[2];
-	uint64_t		host_write_commands[2];
-	/* Controller Busy Time is reported in minutes. */
-	uint64_t		controller_busy_time[2];
-	uint64_t		power_cycles[2];
-	uint64_t		power_on_hours[2];
-	uint64_t		unsafe_shutdowns[2];
-	uint64_t		media_errors[2];
-	uint64_t		num_error_info_log_entries[2];
-
-	uint8_t			reserved2[320];
-} __packed __aligned(4);
-
-struct nvme_firmware_page {
-
-	struct {
-		uint8_t	slot		: 3; /* slot for current FW */
-		uint8_t	reserved	: 5;
-	} __packed afi;
-
-	uint8_t			reserved[7];
-	uint64_t		revision[7]; /* revisions for 7 slots */
-	uint8_t			reserved2[448];
-} __packed __aligned(4);
-
-#define NVME_TEST_MAX_THREADS	128
-
-struct nvme_io_test {
-
-	enum nvme_nvm_opcode	opc;
-	uint32_t		size;
-	uint32_t		time;	/* in seconds */
-	uint32_t		num_threads;
-	uint32_t		flags;
-	uint64_t		io_completed[NVME_TEST_MAX_THREADS];
-};
-
-enum nvme_io_test_flags {
-
-	/*
-	 * Specifies whether dev_refthread/dev_relthread should be
-	 *  called during NVME_BIO_TEST.  Ignored for other test
-	 *  types.
-	 */
-	NVME_TEST_FLAG_REFTHREAD =	0x1,
-};
-
-struct nvme_pt_command {
-
-	/*
-	 * cmd is used to specify a passthrough command to a controller or
-	 *  namespace.
-	 *
-	 * The following fields from cmd may be specified by the caller:
-	 *	* opc  (opcode)
-	 *	* nsid (namespace id) - for admin commands only
-	 *	* cdw10-cdw15
-	 *
-	 * Remaining fields must be set to 0 by the caller.
-	 */
-	struct nvme_command	cmd;
-
-	/*
-	 * cpl returns completion status for the passthrough command
-	 *  specified by cmd.
-	 *
-	 * The following fields will be filled out by the driver, for
-	 *  consumption by the caller:
-	 *	* cdw0
-	 *	* status (except for phase)
-	 *
-	 * Remaining fields will be set to 0 by the driver.
-	 */
-	struct nvme_completion	cpl;
-
-	/* buf is the data buffer associated with this passthrough command. */
-	void *			buf;
-
-	/*
-	 * len is the length of the data buffer associated with this
-	 *  passthrough command.
-	 */
-	uint32_t		len;
-
-	/*
-	 * is_read = 1 if the passthrough command will read data into the
-	 *  supplied buffer from the controller.
-	 *
-	 * is_read = 0 if the passthrough command will write data from the
-	 *  supplied buffer to the controller.
-	 */
-	uint32_t		is_read;
-
-	/*
-	 * driver_lock is used by the driver only.  It must be set to 0
-	 *  by the caller.
-	 */
-	struct mtx *		driver_lock;
-};
-
-#define nvme_completion_is_error(cpl)					\
-	((cpl)->status.sc != 0 || (cpl)->status.sct != 0)
-
-void	nvme_strvis(uint8_t *dst, const uint8_t *src, int dstlen, int srclen);
-
-#ifdef _KERNEL
-
-struct bio;
-
-struct nvme_namespace;
-struct nvme_controller;
-struct nvme_consumer;
-
-typedef void (*nvme_cb_fn_t)(void *, const struct nvme_completion *);
-
-typedef void *(*nvme_cons_ns_fn_t)(struct nvme_namespace *, void *);
-typedef void *(*nvme_cons_ctrlr_fn_t)(struct nvme_controller *);
-typedef void (*nvme_cons_async_fn_t)(void *, const struct nvme_completion *,
-				     uint32_t, void *, uint32_t);
-typedef void (*nvme_cons_fail_fn_t)(void *);
-
-enum nvme_namespace_flags {
-	NVME_NS_DEALLOCATE_SUPPORTED	= 0x1,
-	NVME_NS_FLUSH_SUPPORTED		= 0x2,
-};
-
-int	nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr,
-				   struct nvme_pt_command *pt,
-				   uint32_t nsid, int is_user_buffer,
-				   int is_admin_cmd);
-
-/* Admin functions */
-void	nvme_ctrlr_cmd_set_feature(struct nvme_controller *ctrlr,
-				   uint8_t feature, uint32_t cdw11,
-				   void *payload, uint32_t payload_size,
-				   nvme_cb_fn_t cb_fn, void *cb_arg);
-void	nvme_ctrlr_cmd_get_feature(struct nvme_controller *ctrlr,
-				   uint8_t feature, uint32_t cdw11,
-				   void *payload, uint32_t payload_size,
-				   nvme_cb_fn_t cb_fn, void *cb_arg);
-void	nvme_ctrlr_cmd_get_log_page(struct nvme_controller *ctrlr,
-				    uint8_t log_page, uint32_t nsid,
-				    void *payload, uint32_t payload_size,
-				    nvme_cb_fn_t cb_fn, void *cb_arg);
-
-/* NVM I/O functions */
-int	nvme_ns_cmd_write(struct nvme_namespace *ns, void *payload,
-			  uint64_t lba, uint32_t lba_count, nvme_cb_fn_t cb_fn,
-			  void *cb_arg);
-int	nvme_ns_cmd_write_bio(struct nvme_namespace *ns, struct bio *bp,
-			      nvme_cb_fn_t cb_fn, void *cb_arg);
-int	nvme_ns_cmd_read(struct nvme_namespace *ns, void *payload,
-			 uint64_t lba, uint32_t lba_count, nvme_cb_fn_t cb_fn,
-			 void *cb_arg);
-int	nvme_ns_cmd_read_bio(struct nvme_namespace *ns, struct bio *bp,
-			      nvme_cb_fn_t cb_fn, void *cb_arg);
-int	nvme_ns_cmd_deallocate(struct nvme_namespace *ns, void *payload,
-			       uint8_t num_ranges, nvme_cb_fn_t cb_fn,
-			       void *cb_arg);
-int	nvme_ns_cmd_flush(struct nvme_namespace *ns, nvme_cb_fn_t cb_fn,
-			  void *cb_arg);
-
-/* Registration functions */
-struct nvme_consumer *	nvme_register_consumer(nvme_cons_ns_fn_t    ns_fn,
-					       nvme_cons_ctrlr_fn_t ctrlr_fn,
-					       nvme_cons_async_fn_t async_fn,
-					       nvme_cons_fail_fn_t  fail_fn);
-void		nvme_unregister_consumer(struct nvme_consumer *consumer);
-
-/* Controller helper functions */
-device_t	nvme_ctrlr_get_device(struct nvme_controller *ctrlr);
-const struct nvme_controller_data *
-		nvme_ctrlr_get_data(struct nvme_controller *ctrlr);
-
-/* Namespace helper functions */
-uint32_t	nvme_ns_get_max_io_xfer_size(struct nvme_namespace *ns);
-uint32_t	nvme_ns_get_sector_size(struct nvme_namespace *ns);
-uint64_t	nvme_ns_get_num_sectors(struct nvme_namespace *ns);
-uint64_t	nvme_ns_get_size(struct nvme_namespace *ns);
-uint32_t	nvme_ns_get_flags(struct nvme_namespace *ns);
-const char *	nvme_ns_get_serial_number(struct nvme_namespace *ns);
-const char *	nvme_ns_get_model_number(struct nvme_namespace *ns);
-const struct nvme_namespace_data *
-		nvme_ns_get_data(struct nvme_namespace *ns);
-
-int	nvme_ns_bio_process(struct nvme_namespace *ns, struct bio *bp,
-			    nvme_cb_fn_t cb_fn);
-
-#endif /* _KERNEL */
-
-#endif /* __NVME_H__ */
diff --git a/include.new/dev/nvme/nvme_private.h b/include.new/dev/nvme/nvme_private.h
deleted file mode 100644
index 541421e..0000000
--- a/include.new/dev/nvme/nvme_private.h
+++ /dev/null
@@ -1,533 +0,0 @@
-/*-
- * Copyright (C) 2012-2014 Intel Corporation
- * 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.
- *
- * 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: releng/10.2/sys/dev/nvme/nvme_private.h 282926 2015-05-14 21:30:36Z jimharris $
- */
-
-#ifndef __NVME_PRIVATE_H__
-#define __NVME_PRIVATE_H__
-
-#include <sys/param.h>
-#include <sys/bio.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/rman.h>
-#include <sys/systm.h>
-#include <sys/taskqueue.h>
-
-#include <vm/uma.h>
-
-#include <machine/bus.h>
-
-#include "nvme.h"
-
-#define DEVICE2SOFTC(dev) ((struct nvme_controller *) device_get_softc(dev))
-
-MALLOC_DECLARE(M_NVME);
-
-#define IDT32_PCI_ID		0x80d0111d /* 32 channel board */
-#define IDT8_PCI_ID		0x80d2111d /* 8 channel board */
-
-/*
- * For commands requiring more than 2 PRP entries, one PRP will be
- *  embedded in the command (prp1), and the rest of the PRP entries
- *  will be in a list pointed to by the command (prp2).  This means
- *  that real max number of PRP entries we support is 32+1, which
- *  results in a max xfer size of 32*PAGE_SIZE.
- */
-#define NVME_MAX_PRP_LIST_ENTRIES	(NVME_MAX_XFER_SIZE / PAGE_SIZE)
-
-#define NVME_ADMIN_TRACKERS	(16)
-#define NVME_ADMIN_ENTRIES	(128)
-/* min and max are defined in admin queue attributes section of spec */
-#define NVME_MIN_ADMIN_ENTRIES	(2)
-#define NVME_MAX_ADMIN_ENTRIES	(4096)
-
-/*
- * NVME_IO_ENTRIES defines the size of an I/O qpair's submission and completion
- *  queues, while NVME_IO_TRACKERS defines the maximum number of I/O that we
- *  will allow outstanding on an I/O qpair at any time.  The only advantage in
- *  having IO_ENTRIES > IO_TRACKERS is for debugging purposes - when dumping
- *  the contents of the submission and completion queues, it will show a longer
- *  history of data.
- */
-#define NVME_IO_ENTRIES		(256)
-#define NVME_IO_TRACKERS	(128)
-#define NVME_MIN_IO_TRACKERS	(4)
-#define NVME_MAX_IO_TRACKERS	(1024)
-
-/*
- * NVME_MAX_IO_ENTRIES is not defined, since it is specified in CC.MQES
- *  for each controller.
- */
-
-#define NVME_INT_COAL_TIME	(0)	/* disabled */
-#define NVME_INT_COAL_THRESHOLD (0)	/* 0-based */
-
-#define NVME_MAX_NAMESPACES	(16)
-#define NVME_MAX_CONSUMERS	(2)
-#define NVME_MAX_ASYNC_EVENTS	(8)
-
-#define NVME_DEFAULT_TIMEOUT_PERIOD	(30)    /* in seconds */
-#define NVME_MIN_TIMEOUT_PERIOD		(5)
-#define NVME_MAX_TIMEOUT_PERIOD		(120)
-
-#define NVME_DEFAULT_RETRY_COUNT	(4)
-
-/* Maximum log page size to fetch for AERs. */
-#define NVME_MAX_AER_LOG_SIZE		(4096)
-
-/*
- * Define CACHE_LINE_SIZE here for older FreeBSD versions that do not define
- *  it.
- */
-#ifndef CACHE_LINE_SIZE
-#define CACHE_LINE_SIZE		(64)
-#endif
-
-/*
- * Use presence of the BIO_UNMAPPED flag to determine whether unmapped I/O
- *  support and the bus_dmamap_load_bio API are available on the target
- *  kernel.  This will ease porting back to earlier stable branches at a
- *  later point.
- */
-#ifdef BIO_UNMAPPED
-#define NVME_UNMAPPED_BIO_SUPPORT
-#endif
-
-extern uma_zone_t	nvme_request_zone;
-extern int32_t		nvme_retry_count;
-
-struct nvme_completion_poll_status {
-
-	struct nvme_completion	cpl;
-	boolean_t		done;
-};
-
-#define NVME_REQUEST_VADDR	1
-#define NVME_REQUEST_NULL	2 /* For requests with no payload. */
-#define NVME_REQUEST_UIO	3
-#ifdef NVME_UNMAPPED_BIO_SUPPORT
-#define NVME_REQUEST_BIO	4
-#endif
-
-struct nvme_request {
-
-	struct nvme_command		cmd;
-	struct nvme_qpair		*qpair;
-	union {
-		void			*payload;
-		struct bio		*bio;
-	} u;
-	uint32_t			type;
-	uint32_t			payload_size;
-	boolean_t			timeout;
-	nvme_cb_fn_t			cb_fn;
-	void				*cb_arg;
-	int32_t				retries;
-	STAILQ_ENTRY(nvme_request)	stailq;
-};
-
-struct nvme_async_event_request {
-
-	struct nvme_controller		*ctrlr;
-	struct nvme_request		*req;
-	struct nvme_completion		cpl;
-	uint32_t			log_page_id;
-	uint32_t			log_page_size;
-	uint8_t				log_page_buffer[NVME_MAX_AER_LOG_SIZE];
-};
-
-struct nvme_tracker {
-
-	TAILQ_ENTRY(nvme_tracker)	tailq;
-	struct nvme_request		*req;
-	struct nvme_qpair		*qpair;
-	struct callout			timer;
-	bus_dmamap_t			payload_dma_map;
-	uint16_t			cid;
-
-	uint64_t			prp[NVME_MAX_PRP_LIST_ENTRIES];
-	bus_addr_t			prp_bus_addr;
-	bus_dmamap_t			prp_dma_map;
-};
-
-struct nvme_qpair {
-
-	struct nvme_controller	*ctrlr;
-	uint32_t		id;
-	uint32_t		phase;
-
-	uint16_t		vector;
-	int			rid;
-	struct resource		*res;
-	void 			*tag;
-
-	uint32_t		num_entries;
-	uint32_t		num_trackers;
-	uint32_t		sq_tdbl_off;
-	uint32_t		cq_hdbl_off;
-
-	uint32_t		sq_head;
-	uint32_t		sq_tail;
-	uint32_t		cq_head;
-
-	int64_t			num_cmds;
-	int64_t			num_intr_handler_calls;
-
-	struct nvme_command	*cmd;
-	struct nvme_completion	*cpl;
-
-	bus_dma_tag_t		dma_tag;
-	bus_dma_tag_t		dma_tag_payload;
-
-	bus_dmamap_t		cmd_dma_map;
-	uint64_t		cmd_bus_addr;
-
-	bus_dmamap_t		cpl_dma_map;
-	uint64_t		cpl_bus_addr;
-
-	TAILQ_HEAD(, nvme_tracker)	free_tr;
-	TAILQ_HEAD(, nvme_tracker)	outstanding_tr;
-	STAILQ_HEAD(, nvme_request)	queued_req;
-
-	struct nvme_tracker	**act_tr;
-
-	boolean_t		is_enabled;
-
-	struct mtx		lock __aligned(CACHE_LINE_SIZE);
-
-} __aligned(CACHE_LINE_SIZE);
-
-struct nvme_namespace {
-
-	struct nvme_controller		*ctrlr;
-	struct nvme_namespace_data	data;
-	uint16_t			id;
-	uint16_t			flags;
-	struct cdev			*cdev;
-	void				*cons_cookie[NVME_MAX_CONSUMERS];
-	uint32_t			stripesize;
-	struct mtx			lock;
-};
-
-/*
- * One of these per allocated PCI device.
- */
-struct nvme_controller {
-
-	device_t		dev;
-
-	struct mtx		lock;
-
-	uint32_t		ready_timeout_in_ms;
-
-	bus_space_tag_t		bus_tag;
-	bus_space_handle_t	bus_handle;
-	int			resource_id;
-	struct resource		*resource;
-
-	/*
-	 * The NVMe spec allows for the MSI-X table to be placed in BAR 4/5,
-	 *  separate from the control registers which are in BAR 0/1.  These
-	 *  members track the mapping of BAR 4/5 for that reason.
-	 */
-	int			bar4_resource_id;
-	struct resource		*bar4_resource;
-
-	uint32_t		msix_enabled;
-	uint32_t		force_intx;
-	uint32_t		enable_aborts;
-
-	uint32_t		num_io_queues;
-	boolean_t		per_cpu_io_queues;
-
-	/* Fields for tracking progress during controller initialization. */
-	struct intr_config_hook	config_hook;
-	uint32_t		ns_identified;
-	uint32_t		queues_created;
-
-	struct task		reset_task;
-	struct task		fail_req_task;
-	struct taskqueue	*taskqueue;
-
-	struct resource		*msi_res[MAXCPU + 1];
-
-	/* For shared legacy interrupt. */
-	int			rid;
-	struct resource		*res;
-	void			*tag;
-
-	bus_dma_tag_t		hw_desc_tag;
-	bus_dmamap_t		hw_desc_map;
-
-	/** maximum i/o size in bytes */
-	uint32_t		max_xfer_size;
-
-	/** minimum page size supported by this controller in bytes */
-	uint32_t		min_page_size;
-
-	/** interrupt coalescing time period (in microseconds) */
-	uint32_t		int_coal_time;
-
-	/** interrupt coalescing threshold */
-	uint32_t		int_coal_threshold;
-
-	/** timeout period in seconds */
-	uint32_t		timeout_period;
-
-	struct nvme_qpair	adminq;
-	struct nvme_qpair	*ioq;
-
-	struct nvme_registers		*regs;
-
-	struct nvme_controller_data	cdata;
-	struct nvme_namespace		ns[NVME_MAX_NAMESPACES];
-
-	struct cdev			*cdev;
-
-	/** bit mask of warning types currently enabled for async events */
-	union nvme_critical_warning_state	async_event_config;
-
-	uint32_t			num_aers;
-	struct nvme_async_event_request	aer[NVME_MAX_ASYNC_EVENTS];
-
-	void				*cons_cookie[NVME_MAX_CONSUMERS];
-
-	uint32_t			is_resetting;
-	uint32_t			is_initialized;
-	uint32_t			notification_sent;
-
-	boolean_t			is_failed;
-	STAILQ_HEAD(, nvme_request)	fail_req;
-};
-
-#define nvme_mmio_offsetof(reg)						       \
-	offsetof(struct nvme_registers, reg)
-
-#define nvme_mmio_read_4(sc, reg)					       \
-	bus_space_read_4((sc)->bus_tag, (sc)->bus_handle,		       \
-	    nvme_mmio_offsetof(reg))
-
-#define nvme_mmio_write_4(sc, reg, val)					       \
-	bus_space_write_4((sc)->bus_tag, (sc)->bus_handle,		       \
-	    nvme_mmio_offsetof(reg), val)
-
-#define nvme_mmio_write_8(sc, reg, val) \
-	do {								       \
-		bus_space_write_4((sc)->bus_tag, (sc)->bus_handle,	       \
-		    nvme_mmio_offsetof(reg), val & 0xFFFFFFFF); 	       \
-		bus_space_write_4((sc)->bus_tag, (sc)->bus_handle,	       \
-		    nvme_mmio_offsetof(reg)+4,				       \
-		    (val & 0xFFFFFFFF00000000UL) >> 32);		       \
-	} while (0);
-
-#if __FreeBSD_version < 800054
-#define wmb()	__asm volatile("sfence" ::: "memory")
-#define mb()	__asm volatile("mfence" ::: "memory")
-#endif
-
-#define nvme_printf(ctrlr, fmt, args...)	\
-    device_printf(ctrlr->dev, fmt, ##args)
-
-void	nvme_ns_test(struct nvme_namespace *ns, u_long cmd, caddr_t arg);
-
-void	nvme_ctrlr_cmd_identify_controller(struct nvme_controller *ctrlr,
-					   void *payload,
-					   nvme_cb_fn_t cb_fn, void *cb_arg);
-void	nvme_ctrlr_cmd_identify_namespace(struct nvme_controller *ctrlr,
-					  uint16_t nsid, void *payload,
-					  nvme_cb_fn_t cb_fn, void *cb_arg);
-void	nvme_ctrlr_cmd_set_interrupt_coalescing(struct nvme_controller *ctrlr,
-						uint32_t microseconds,
-						uint32_t threshold,
-						nvme_cb_fn_t cb_fn,
-						void *cb_arg);
-void	nvme_ctrlr_cmd_get_error_page(struct nvme_controller *ctrlr,
-				      struct nvme_error_information_entry *payload,
-				      uint32_t num_entries, /* 0 = max */
-				      nvme_cb_fn_t cb_fn,
-				      void *cb_arg);
-void	nvme_ctrlr_cmd_get_health_information_page(struct nvme_controller *ctrlr,
-						   uint32_t nsid,
-						   struct nvme_health_information_page *payload,
-						   nvme_cb_fn_t cb_fn,
-						   void *cb_arg);
-void	nvme_ctrlr_cmd_get_firmware_page(struct nvme_controller *ctrlr,
-					 struct nvme_firmware_page *payload,
-					 nvme_cb_fn_t cb_fn,
-					 void *cb_arg);
-void	nvme_ctrlr_cmd_create_io_cq(struct nvme_controller *ctrlr,
-				    struct nvme_qpair *io_que, uint16_t vector,
-				    nvme_cb_fn_t cb_fn, void *cb_arg);
-void	nvme_ctrlr_cmd_create_io_sq(struct nvme_controller *ctrlr,
-				    struct nvme_qpair *io_que,
-				    nvme_cb_fn_t cb_fn, void *cb_arg);
-void	nvme_ctrlr_cmd_delete_io_cq(struct nvme_controller *ctrlr,
-				    struct nvme_qpair *io_que,
-				    nvme_cb_fn_t cb_fn, void *cb_arg);
-void	nvme_ctrlr_cmd_delete_io_sq(struct nvme_controller *ctrlr,
-				    struct nvme_qpair *io_que,
-				    nvme_cb_fn_t cb_fn, void *cb_arg);
-void	nvme_ctrlr_cmd_set_num_queues(struct nvme_controller *ctrlr,
-				      uint32_t num_queues, nvme_cb_fn_t cb_fn,
-				      void *cb_arg);
-void	nvme_ctrlr_cmd_set_async_event_config(struct nvme_controller *ctrlr,
-					      union nvme_critical_warning_state state,
-					      nvme_cb_fn_t cb_fn, void *cb_arg);
-void	nvme_ctrlr_cmd_abort(struct nvme_controller *ctrlr, uint16_t cid,
-			     uint16_t sqid, nvme_cb_fn_t cb_fn, void *cb_arg);
-
-void	nvme_completion_poll_cb(void *arg, const struct nvme_completion *cpl);
-
-int	nvme_ctrlr_construct(struct nvme_controller *ctrlr, device_t dev);
-void	nvme_ctrlr_destruct(struct nvme_controller *ctrlr, device_t dev);
-void	nvme_ctrlr_shutdown(struct nvme_controller *ctrlr);
-int	nvme_ctrlr_hw_reset(struct nvme_controller *ctrlr);
-void	nvme_ctrlr_reset(struct nvme_controller *ctrlr);
-/* ctrlr defined as void * to allow use with config_intrhook. */
-void	nvme_ctrlr_start_config_hook(void *ctrlr_arg);
-void	nvme_ctrlr_submit_admin_request(struct nvme_controller *ctrlr,
-					struct nvme_request *req);
-void	nvme_ctrlr_submit_io_request(struct nvme_controller *ctrlr,
-				     struct nvme_request *req);
-void	nvme_ctrlr_post_failed_request(struct nvme_controller *ctrlr,
-				       struct nvme_request *req);
-
-void	nvme_qpair_construct(struct nvme_qpair *qpair, uint32_t id,
-			     uint16_t vector, uint32_t num_entries,
-			     uint32_t num_trackers,
-			     struct nvme_controller *ctrlr);
-void	nvme_qpair_submit_tracker(struct nvme_qpair *qpair,
-				  struct nvme_tracker *tr);
-void	nvme_qpair_process_completions(struct nvme_qpair *qpair);
-void	nvme_qpair_submit_request(struct nvme_qpair *qpair,
-				  struct nvme_request *req);
-void	nvme_qpair_reset(struct nvme_qpair *qpair);
-void	nvme_qpair_fail(struct nvme_qpair *qpair);
-void	nvme_qpair_manual_complete_request(struct nvme_qpair *qpair,
-					   struct nvme_request *req,
-					   uint32_t sct, uint32_t sc,
-					   boolean_t print_on_error);
-
-void	nvme_admin_qpair_enable(struct nvme_qpair *qpair);
-void	nvme_admin_qpair_disable(struct nvme_qpair *qpair);
-void	nvme_admin_qpair_destroy(struct nvme_qpair *qpair);
-
-void	nvme_io_qpair_enable(struct nvme_qpair *qpair);
-void	nvme_io_qpair_disable(struct nvme_qpair *qpair);
-void	nvme_io_qpair_destroy(struct nvme_qpair *qpair);
-
-int	nvme_ns_construct(struct nvme_namespace *ns, uint16_t id,
-			  struct nvme_controller *ctrlr);
-void	nvme_ns_destruct(struct nvme_namespace *ns);
-
-void	nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr);
-
-void	nvme_dump_command(struct nvme_command *cmd);
-void	nvme_dump_completion(struct nvme_completion *cpl);
-
-static __inline void
-nvme_single_map(void *arg, bus_dma_segment_t *seg, int nseg, int error)
-{
-	uint64_t *bus_addr = (uint64_t *)arg;
-
-	if (error != 0)
-		printf("nvme_single_map err %d\n", error);
-	*bus_addr = seg[0].ds_addr;
-}
-
-static __inline struct nvme_request *
-_nvme_allocate_request(nvme_cb_fn_t cb_fn, void *cb_arg)
-{
-	struct nvme_request *req;
-
-	req = uma_zalloc(nvme_request_zone, M_NOWAIT | M_ZERO);
-	if (req != NULL) {
-		req->cb_fn = cb_fn;
-		req->cb_arg = cb_arg;
-		req->timeout = TRUE;
-	}
-	return (req);
-}
-
-static __inline struct nvme_request *
-nvme_allocate_request_vaddr(void *payload, uint32_t payload_size,
-    nvme_cb_fn_t cb_fn, void *cb_arg)
-{
-	struct nvme_request *req;
-
-	req = _nvme_allocate_request(cb_fn, cb_arg);
-	if (req != NULL) {
-		req->type = NVME_REQUEST_VADDR;
-		req->u.payload = payload;
-		req->payload_size = payload_size;
-	}
-	return (req);
-}
-
-static __inline struct nvme_request *
-nvme_allocate_request_null(nvme_cb_fn_t cb_fn, void *cb_arg)
-{
-	struct nvme_request *req;
-
-	req = _nvme_allocate_request(cb_fn, cb_arg);
-	if (req != NULL)
-		req->type = NVME_REQUEST_NULL;
-	return (req);
-}
-
-static __inline struct nvme_request *
-nvme_allocate_request_bio(struct bio *bio, nvme_cb_fn_t cb_fn, void *cb_arg)
-{
-	struct nvme_request *req;
-
-	req = _nvme_allocate_request(cb_fn, cb_arg);
-	if (req != NULL) {
-#ifdef NVME_UNMAPPED_BIO_SUPPORT
-		req->type = NVME_REQUEST_BIO;
-		req->u.bio = bio;
-#else
-		req->type = NVME_REQUEST_VADDR;
-		req->u.payload = bio->bio_data;
-		req->payload_size = bio->bio_bcount;
-#endif
-	}
-	return (req);
-}
-
-#define nvme_free_request(req)	uma_zfree(nvme_request_zone, req)
-
-void	nvme_notify_async_consumers(struct nvme_controller *ctrlr,
-				    const struct nvme_completion *async_cpl,
-				    uint32_t log_page_id, void *log_page_buffer,
-				    uint32_t log_page_size);
-void	nvme_notify_fail_consumers(struct nvme_controller *ctrlr);
-void	nvme_notify_new_controller(struct nvme_controller *ctrlr);
-
-#endif /* __NVME_PRIVATE_H__ */
diff --git a/include.new/dev/ofw/ofw_bus.h b/include.new/dev/ofw/ofw_bus.h
deleted file mode 100644
index 9c3f88e..0000000
--- a/include.new/dev/ofw/ofw_bus.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2001, 2003 by Thomas Moestl <tmm@FreeBSD.org>
- * Copyright (c) 2004 by Marius Strobl <marius@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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: releng/10.2/sys/dev/ofw/ofw_bus.h 266128 2014-05-15 14:26:11Z ian $
- */
-
-#ifndef	_DEV_OFW_OFW_BUS_H_
-#define	_DEV_OFW_OFW_BUS_H_
-
-#include <sys/bus.h>
-
-#include <dev/ofw/openfirm.h>
-
-#include "ofw_bus_if.h"
-
-static __inline const char *
-ofw_bus_get_compat(device_t dev)
-{
-
-	return (OFW_BUS_GET_COMPAT(device_get_parent(dev), dev));
-}
-
-static __inline const char *
-ofw_bus_get_model(device_t dev)
-{
-
-	return (OFW_BUS_GET_MODEL(device_get_parent(dev), dev));
-}
-
-static __inline const char *
-ofw_bus_get_name(device_t dev)
-{
-
-	return (OFW_BUS_GET_NAME(device_get_parent(dev), dev));
-}
-
-static __inline phandle_t
-ofw_bus_get_node(device_t dev)
-{
-
-	return (OFW_BUS_GET_NODE(device_get_parent(dev), dev));
-}
-
-static __inline const char *
-ofw_bus_get_type(device_t dev)
-{
-
-	return (OFW_BUS_GET_TYPE(device_get_parent(dev), dev));
-}
-
-static __inline int
-ofw_bus_map_intr(device_t dev, phandle_t iparent, int icells, pcell_t *intr)
-{
-	return (OFW_BUS_MAP_INTR(dev, dev, iparent, icells, intr));
-}
-
-#endif /* !_DEV_OFW_OFW_BUS_H_ */
diff --git a/include.new/dev/ofw/ofw_bus_subr.h b/include.new/dev/ofw/ofw_bus_subr.h
deleted file mode 100644
index 1181879..0000000
--- a/include.new/dev/ofw/ofw_bus_subr.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 2005 Marius Strobl <marius@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,
- *    without modification, immediately at the beginning of the file.
- * 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.
- *
- * 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: releng/10.2/sys/dev/ofw/ofw_bus_subr.h 283334 2015-05-23 22:36:41Z ian $
- */
-
-#ifndef	_DEV_OFW_OFW_BUS_SUBR_H_
-#define	_DEV_OFW_OFW_BUS_SUBR_H_
-
-#include <sys/bus.h>
-
-#include <dev/ofw/openfirm.h>
-
-#include "ofw_bus_if.h"
-
-#define	ORIP_NOINT	-1
-#define	ORIR_NOTFOUND	0xffffffff
-
-struct ofw_bus_iinfo {
-	uint8_t			*opi_imap;
-	uint8_t			*opi_imapmsk;
-	int			opi_imapsz;
-	pcell_t			opi_addrc;
-};
-
-struct ofw_compat_data {
-	const char	*ocd_str;
-	uintptr_t	 ocd_data;
-};
-
-/* Generic implementation of ofw_bus_if.m methods and helper routines */
-int	ofw_bus_gen_setup_devinfo(struct ofw_bus_devinfo *, phandle_t);
-void	ofw_bus_gen_destroy_devinfo(struct ofw_bus_devinfo *);
-
-ofw_bus_get_compat_t	ofw_bus_gen_get_compat;
-ofw_bus_get_model_t	ofw_bus_gen_get_model;
-ofw_bus_get_name_t	ofw_bus_gen_get_name;
-ofw_bus_get_node_t	ofw_bus_gen_get_node;
-ofw_bus_get_type_t	ofw_bus_gen_get_type;
-
-/* Helper method to report interesting OF properties in pnpinfo */
-bus_child_pnpinfo_str_t	ofw_bus_gen_child_pnpinfo_str;
-
-/* Routines for processing firmware interrupt maps */
-void	ofw_bus_setup_iinfo(phandle_t, struct ofw_bus_iinfo *, int);
-int	ofw_bus_lookup_imap(phandle_t, struct ofw_bus_iinfo *, void *, int,
-	    void *, int, void *, int, phandle_t *);
-int	ofw_bus_search_intrmap(void *, int, void *, int, void *, int, void *,
-	    void *, void *, int, phandle_t *);
-
-/* Routines for parsing device-tree data into resource lists. */
-int ofw_bus_reg_to_rl(device_t, phandle_t, pcell_t, pcell_t,
-    struct resource_list *);
-int ofw_bus_intr_to_rl(device_t, phandle_t, struct resource_list *);
-
-/* Helper to get device status property */
-const char *ofw_bus_get_status(device_t dev);
-int ofw_bus_status_okay(device_t dev);
-
-/* Helper to get node's interrupt parent */
-void	ofw_bus_find_iparent(phandle_t);
-
-/* Helper routine for checking compat prop */
-int ofw_bus_is_compatible(device_t, const char *);
-int ofw_bus_is_compatible_strict(device_t, const char *);
-
-/* 
- * Helper routine to search a list of compat properties.  The table is
- * terminated by an entry with a NULL compat-string pointer; a pointer to that
- * table entry is returned if none of the compat strings match for the device,
- * giving you control over the not-found value.  Will not return NULL unless the
- * provided table pointer is NULL.
- */
-const struct ofw_compat_data *
-    ofw_bus_search_compatible(device_t, const struct ofw_compat_data *);
-
-/* Helper routine for checking existence of a prop */
-int ofw_bus_has_prop(device_t, const char *);
-
-#endif /* !_DEV_OFW_OFW_BUS_SUBR_H_ */
diff --git a/include.new/dev/ofw/ofw_pci.h b/include.new/dev/ofw/ofw_pci.h
deleted file mode 100644
index 2308edc..0000000
--- a/include.new/dev/ofw/ofw_pci.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- *	from: NetBSD: ofw_pci.h,v 1.5 2003/10/22 09:04:39 mjl Exp
- *
- * $FreeBSD: releng/10.2/sys/dev/ofw/ofw_pci.h 204520 2010-03-01 16:52:11Z joel $
- */
-
-#ifndef _DEV_OFW_OFW_PCI_H_
-#define	_DEV_OFW_OFW_PCI_H_
-
-/*
- * PCI Bus Binding to:
- *
- * IEEE Std 1275-1994
- * Standard for Boot (Initialization Configuration) Firmware
- *
- * Revision 2.1
- */
-
-/*
- * Section 2.2.1. Physical Address Formats
- *
- * A PCI physical address is represented by 3 address cells:
- *
- *	phys.hi cell:	npt000ss bbbbbbbb dddddfff rrrrrrrr
- *	phys.mid cell:	hhhhhhhh hhhhhhhh hhhhhhhh hhhhhhhh
- *	phys.lo cell:	llllllll llllllll llllllll llllllll
- *
- *	n	nonrelocatable
- *	p	prefetchable
- *	t	aliased below 1MB (memory) or 64k (i/o)
- *	ss	space code
- *	b	bus number
- *	d	device number
- *	f	function number
- *	r	register number
- *	h	high 32-bits of PCI address
- *	l	low 32-bits of PCI address
- */
-
-#define	OFW_PCI_PHYS_HI_NONRELOCATABLE	0x80000000
-#define	OFW_PCI_PHYS_HI_PREFETCHABLE	0x40000000
-#define	OFW_PCI_PHYS_HI_ALIASED		0x20000000
-#define	OFW_PCI_PHYS_HI_SPACEMASK	0x03000000
-#define	OFW_PCI_PHYS_HI_BUSMASK		0x00ff0000
-#define	OFW_PCI_PHYS_HI_BUSSHIFT	16
-#define	OFW_PCI_PHYS_HI_DEVICEMASK	0x0000f800
-#define	OFW_PCI_PHYS_HI_DEVICESHIFT	11
-#define	OFW_PCI_PHYS_HI_FUNCTIONMASK	0x00000700
-#define	OFW_PCI_PHYS_HI_FUNCTIONSHIFT	8
-#define	OFW_PCI_PHYS_HI_REGISTERMASK	0x000000ff
-
-#define	OFW_PCI_PHYS_HI_SPACE_CONFIG	0x00000000
-#define	OFW_PCI_PHYS_HI_SPACE_IO	0x01000000
-#define	OFW_PCI_PHYS_HI_SPACE_MEM32	0x02000000
-#define	OFW_PCI_PHYS_HI_SPACE_MEM64	0x03000000
-
-#define OFW_PCI_PHYS_HI_BUS(hi) \
-	(((hi) & OFW_PCI_PHYS_HI_BUSMASK) >> OFW_PCI_PHYS_HI_BUSSHIFT)
-#define OFW_PCI_PHYS_HI_DEVICE(hi) \
-	(((hi) & OFW_PCI_PHYS_HI_DEVICEMASK) >> OFW_PCI_PHYS_HI_DEVICESHIFT)
-#define OFW_PCI_PHYS_HI_FUNCTION(hi) \
-	(((hi) & OFW_PCI_PHYS_HI_FUNCTIONMASK) >> OFW_PCI_PHYS_HI_FUNCTIONSHIFT)
-
-/*
- * This has the 3 32bit cell values, plus 2 more to make up a 64-bit size.
- */
-struct ofw_pci_register {
-	uint32_t	phys_hi;
-	uint32_t	phys_mid;
-	uint32_t	phys_lo;
-	uint32_t	size_hi;
-	uint32_t	size_lo;
-};
-
-#endif /* _DEV_OFW_OFW_PCI_H_ */
diff --git a/include.new/dev/ofw/ofwvar.h b/include.new/dev/ofw/ofwvar.h
deleted file mode 100644
index 5e2757d..0000000
--- a/include.new/dev/ofw/ofwvar.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 2005 Peter Grehan
- * Copyright (c) 2008 Nathan Whitehorn
- * 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.
- *
- * 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: releng/10.2/sys/dev/ofw/ofwvar.h 194138 2009-06-14 00:05:38Z marius $
- */
-
-#ifndef _DEV_OFW_OFWVAR_H_
-#define	_DEV_OFW_OFWVAR_H_
-
-/*
- * An Open Firmware client implementation is declared with a kernel object and
- * an associated method table, similar to a device driver.
- *
- * e.g.
- *
- * static ofw_method_t fdt_methods[] = {
- *	OFWMETHOD(ofw_init,		fdt_init),
- *	OFWMETHOD(ofw_finddevice,	fdt_finddevice),
- *  ...
- *	OFWMETHOD(ofw_nextprop,		fdt_nextprop),
- *	{ 0, 0 }
- * };
- *
- * static ofw_def_t ofw_fdt = {
- *	"ofw_fdt",
- *	fdt_methods,
- *	sizeof(fdt_softc),	// or 0 if no softc
- * };
- *
- * OFW_DEF(ofw_fdt);
- */
-
-#include <sys/kobj.h>
-
-struct ofw_kobj {
-	/*
-	 * An OFW instance is a kernel object.
-	 */
-	KOBJ_FIELDS;
-
-	/*
-	 * Utility elements that an instance may use
-	 */
-	struct mtx	ofw_mtx;	/* available for instance use */
-	void		*ofw_iptr;	/* instance data pointer */
-
-	/*
-	 * Opaque data that can be overlaid with an instance-private
-	 * structure.  OFW code can test that this is large enough at
-	 * compile time with a sizeof() test againt it's softc.  There
-	 * is also a run-time test when the MMU kernel object is
-	 * registered.
-	 */
-#define	OFW_OPAQUESZ	64
-	u_int		ofw_opaque[OFW_OPAQUESZ];
-};
-
-typedef struct ofw_kobj		*ofw_t;
-typedef struct kobj_class	ofw_def_t;
-
-#define	ofw_method_t	kobj_method_t
-#define	OFWMETHOD	KOBJMETHOD
-
-#define	OFW_DEF(name)	DATA_SET(ofw_set, name)
-
-#endif /* _DEV_OFW_OFWVAR_H_ */
diff --git a/include.new/dev/ofw/openfirm.h b/include.new/dev/ofw/openfirm.h
deleted file mode 100644
index 3d6e56f..0000000
--- a/include.new/dev/ofw/openfirm.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*	$NetBSD: openfirm.h,v 1.1 1998/05/15 10:16:00 tsubai Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996 Wolfgang Solfrank.
- * Copyright (C) 1995, 1996 TooLs GmbH.
- * 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
- */
-/*
- * Copyright (C) 2000 Benno Rice.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY Benno Rice ``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 TOOLS GMBH 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: releng/10.2/sys/dev/ofw/openfirm.h 273655 2014-10-26 01:58:18Z ian $
- */
-
-#ifndef _DEV_OPENFIRM_H_
-#define _DEV_OPENFIRM_H_
-
-#include <sys/types.h>
-
-/*
- * Prototypes for Open Firmware Interface Routines
- */
-
-typedef uint32_t	ihandle_t;
-typedef uint32_t	phandle_t;
-typedef uint32_t	pcell_t;
-
-#ifdef _KERNEL
-#include <sys/malloc.h>
-
-#include <machine/ofw_machdep.h>
-
-MALLOC_DECLARE(M_OFWPROP);
-
-/*
- * Open Firmware interface initialization.  OF_install installs the named
- * interface as the Open Firmware access mechanism, OF_init initializes it.
- */
-
-boolean_t	OF_install(char *name, int prio);
-int		OF_init(void *cookie);
-
-/*
- * Known Open Firmware interface names
- */
-
-#define	OFW_STD_DIRECT	"ofw_std"	/* Standard OF interface */
-#define	OFW_STD_REAL	"ofw_real"	/* Real-mode OF interface */
-#define	OFW_STD_32BIT	"ofw_32bit"	/* 32-bit OF interface */
-#define	OFW_FDT		"ofw_fdt"	/* Flattened Device Tree */
-
-/* Generic functions */
-int		OF_test(const char *name);
-void		OF_printf(const char *fmt, ...);
-
-/* Device tree functions */
-phandle_t	OF_peer(phandle_t node);
-phandle_t	OF_child(phandle_t node);
-phandle_t	OF_parent(phandle_t node);
-ssize_t		OF_getproplen(phandle_t node, const char *propname);
-ssize_t		OF_getprop(phandle_t node, const char *propname, void *buf,
-		    size_t len);
-ssize_t		OF_getencprop(phandle_t node, const char *prop, pcell_t *buf,
-		    size_t len); /* Same as getprop, but maintains endianness */
-int		OF_hasprop(phandle_t node, const char *propname);
-ssize_t		OF_searchprop(phandle_t node, const char *propname, void *buf,
-		    size_t len);
-ssize_t		OF_searchencprop(phandle_t node, const char *propname,
-		    void *buf, size_t len);
-ssize_t		OF_getprop_alloc(phandle_t node, const char *propname,
-		    int elsz, void **buf);
-ssize_t		OF_getencprop_alloc(phandle_t node, const char *propname,
-		    int elsz, void **buf);
-int		OF_nextprop(phandle_t node, const char *propname, char *buf,
-		    size_t len);
-int		OF_setprop(phandle_t node, const char *name, const void *buf,
-		    size_t len);
-ssize_t		OF_canon(const char *path, char *buf, size_t len);
-phandle_t	OF_finddevice(const char *path);
-ssize_t		OF_package_to_path(phandle_t node, char *buf, size_t len);
-
-/*
- * Some OF implementations (IBM, FDT) have a concept of effective phandles
- * used for device-tree cross-references. Given one of these, returns the
- * real phandle. If one can't be found (or running on OF implementations
- * without this property), returns its input.
- */
-phandle_t	OF_node_from_xref(phandle_t xref);
-phandle_t	OF_xref_from_node(phandle_t node);
-
-/*
- * When properties contain references to other nodes using xref handles it is
- * often necessary to use interfaces provided by the driver for the referenced
- * instance.  These routines allow a driver that provides such an interface to
- * register its association with an xref handle, and for other drivers to obtain
- * the device_t associated with an xref handle.
- */
-device_t	OF_device_from_xref(phandle_t xref);
-phandle_t	OF_xref_from_device(device_t dev);
-int		OF_device_register_xref(phandle_t xref, device_t dev);
-
-/* Device I/O functions */
-ihandle_t	OF_open(const char *path);
-void		OF_close(ihandle_t instance);
-ssize_t		OF_read(ihandle_t instance, void *buf, size_t len);
-ssize_t		OF_write(ihandle_t instance, const void *buf, size_t len);
-int		OF_seek(ihandle_t instance, uint64_t where);
-
-phandle_t	OF_instance_to_package(ihandle_t instance);
-ssize_t		OF_instance_to_path(ihandle_t instance, char *buf, size_t len);
-int		OF_call_method(const char *method, ihandle_t instance,
-		    int nargs, int nreturns, ...);
-
-/* Memory functions */
-void		*OF_claim(void *virtrequest, size_t size, u_int align);
-void		OF_release(void *virt, size_t size);
-
-/* Control transfer functions */
-void		OF_enter(void);
-void		OF_exit(void) __attribute__((noreturn));
-
-/* User interface functions */
-int		OF_interpret(const char *cmd, int nreturns, ...);
-
-#endif /* _KERNEL */
-#endif /* _DEV_OPENFIRM_H_ */
diff --git a/include.new/dev/ofw/openfirmio.h b/include.new/dev/ofw/openfirmio.h
deleted file mode 100644
index f44554f..0000000
--- a/include.new/dev/ofw/openfirmio.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: openfirmio.h,v 1.4 2002/09/06 13:23:19 gehenna Exp $ */
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- *	@(#)openpromio.h	8.1 (Berkeley) 6/11/93
- *
- * $FreeBSD: releng/10.2/sys/dev/ofw/openfirmio.h 146400 2005-05-19 15:22:16Z marius $
- */
-
-#ifndef _DEV_OFW_OPENFIRMIO_H_
-#define _DEV_OFW_OPENFIRMIO_H_
-
-#include <dev/ofw/openfirm.h>
-
-struct ofiocdesc {
-	phandle_t	of_nodeid;	/* passed or returned node id */
-	int		of_namelen;	/* length of of_name */
-	const char	*of_name;	/* pointer to field name */
-	int		of_buflen;	/* length of of_buf (value-result) */
-	char		*of_buf;	/* pointer to field value */
-};
-
-#define	OFIOC_BASE	'O'
-
-/* Get openprom field. */
-#define	OFIOCGET	_IOWR(OFIOC_BASE, 1, struct ofiocdesc)
-/* Set openprom field. */
-#define	OFIOCSET	_IOWR(OFIOC_BASE, 2, struct ofiocdesc)
-/* Get next property. */
-#define	OFIOCNEXTPROP	_IOWR(OFIOC_BASE, 3, struct ofiocdesc)
-/* Get options node. */
-#define	OFIOCGETOPTNODE	_IOR(OFIOC_BASE, 4, phandle_t)
-/* Get next node of node. */
-#define	OFIOCGETNEXT	_IOWR(OFIOC_BASE, 5, phandle_t)
-/* Get first child of node. */
-#define	OFIOCGETCHILD	_IOWR(OFIOC_BASE, 6, phandle_t)
-/* Find a specific device. */
-#define	OFIOCFINDDEVICE	_IOWR(OFIOC_BASE, 7, struct ofiocdesc)
-/* Retrieve the size of a property. */
-#define	OFIOCGETPROPLEN	_IOWR(OFIOC_BASE, 8, struct ofiocdesc)
-
-/* Maximum accepted name length. */
-#define	OFIOCMAXNAME	8191
-/* Maximum accepted value length (maximum of nvramrc property). */
-#define	OFIOCMAXVALUE	8192
-
-#endif /* _DEV_OFW_OPENFIRMIO_H_ */
diff --git a/include.new/dev/ofw/openpromio.h b/include.new/dev/ofw/openpromio.h
deleted file mode 100644
index 12c7890..0000000
--- a/include.new/dev/ofw/openpromio.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2003 Jake Burkholder.
- * 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.
- *
- * 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: releng/10.2/sys/dev/ofw/openpromio.h 116551 2003-06-19 01:40:11Z jake $
- */
-
-#ifndef	_DEV_OFW_OPENPROMIO_H_
-#define	_DEV_OFW_OPENPROMIO_H_
-
-#include <sys/ioccom.h>
-
-struct openpromio {
-	uint32_t	oprom_size;
-	char		oprom_array[];
-};
-
-#define	OPROMNEXT	_IO('O', 1)
-#define	OPROMCHILD	_IO('O', 2)
-#define	OPROMGETPROP	_IO('O', 3)
-#define	OPROMNXTPROP	_IO('O', 4)
-
-#define	OPROMMAXPARAM	4096
-
-#endif
diff --git a/include.new/dev/pbio/pbioio.h b/include.new/dev/pbio/pbioio.h
deleted file mode 100644
index 0da5bec..0000000
--- a/include.new/dev/pbio/pbioio.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- *  Copyright (c) 2000-2004
- *          Diomidis D. Spinellis, Athens, Greece
- *      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 as
- *     the first lines of this file unmodified.
- *  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.
- *
- *  THIS SOFTWARE IS PROVIDED BY Diomidis D. Spinellis ``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 Diomidis D. Spinellis 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: releng/10.2/sys/dev/pbio/pbioio.h 139749 2005-01-06 01:43:34Z imp $
- *
- */
-
-/*
- * Definitions needed to access the pbio device (ioctls etc)
- */
-#ifndef SYS_PBIO_H
-#define SYS_PBIO_H
-
-#ifndef KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/*
- * ioctls
- */
-#define PBIO_SETDIFF	_IOW('p', 0x01, int)
-#define PBIO_SETIPACE	_IOW('p', 0x02, int)
-#define PBIO_SETOPACE	_IOW('p', 0x03, int)
-#define PBIO_GETDIFF	_IOR('p', 0x81, int)
-#define PBIO_GETIPACE	_IOR('p', 0x82, int)
-#define PBIO_GETOPACE	_IOR('p', 0x83, int)
-
-#endif
diff --git a/include.new/dev/pci/pcireg.h b/include.new/dev/pci/pcireg.h
deleted file mode 100644
index 63bd48b..0000000
--- a/include.new/dev/pci/pcireg.h
+++ /dev/null
@@ -1,922 +0,0 @@
-/*-
- * Copyright (c) 1997, Stefan Esser <se@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/dev/pci/pcireg.h 279470 2015-03-01 04:22:06Z rstone $
- *
- */
-
-/*
- * PCIM_xxx: mask to locate subfield in register
- * PCIR_xxx: config register offset
- * PCIC_xxx: device class
- * PCIS_xxx: device subclass
- * PCIP_xxx: device programming interface
- * PCIV_xxx: PCI vendor ID (only required to fixup ancient devices)
- * PCID_xxx: device ID
- * PCIY_xxx: capability identification number
- * PCIZ_xxx: extended capability identification number
- */
-
-/* some PCI bus constants */
-#define	PCI_DOMAINMAX	65535	/* highest supported domain number */
-#define	PCI_BUSMAX	255	/* highest supported bus number */
-#define	PCI_SLOTMAX	31	/* highest supported slot number */
-#define	PCI_FUNCMAX	7	/* highest supported function number */
-#define	PCI_REGMAX	255	/* highest supported config register addr. */
-#define	PCIE_REGMAX	4095	/* highest supported config register addr. */
-#define	PCI_MAXHDRTYPE	2
-
-#define	PCIE_ARI_SLOTMAX 0
-#define	PCIE_ARI_FUNCMAX 255
-
-#define	PCI_RID_BUS_SHIFT	8
-#define	PCI_RID_SLOT_SHIFT	3
-#define	PCI_RID_FUNC_SHIFT	0
-
-#define PCI_RID(bus, slot, func) \
-    ((((bus) & PCI_BUSMAX) << PCI_RID_BUS_SHIFT) | \
-    (((slot) & PCI_SLOTMAX) << PCI_RID_SLOT_SHIFT) | \
-    (((func) & PCI_FUNCMAX) << PCI_RID_FUNC_SHIFT))
-
-#define PCI_ARI_RID(bus, func) \
-    ((((bus) & PCI_BUSMAX) << PCI_RID_BUS_SHIFT) | \
-    (((func) & PCIE_ARI_FUNCMAX) << PCI_RID_FUNC_SHIFT))
-
-#define PCI_RID2BUS(rid) (((rid) >> PCI_RID_BUS_SHIFT) & PCI_BUSMAX)
-#define PCI_RID2SLOT(rid) (((rid) >> PCI_RID_SLOT_SHIFT) & PCI_SLOTMAX)
-#define PCI_RID2FUNC(rid) (((rid) >> PCI_RID_FUNC_SHIFT) & PCI_FUNCMAX)
-
-#define PCIE_ARI_SLOT(func) (((func) >> PCI_RID_SLOT_SHIFT) & PCI_SLOTMAX)
-#define PCIE_ARI_FUNC(func) (((func) >> PCI_RID_FUNC_SHIFT) & PCI_FUNCMAX)
-
-/* PCI config header registers for all devices */
-
-#define	PCIR_DEVVENDOR	0x00
-#define	PCIR_VENDOR	0x00
-#define	PCIR_DEVICE	0x02
-#define	PCIR_COMMAND	0x04
-#define	PCIM_CMD_PORTEN		0x0001
-#define	PCIM_CMD_MEMEN		0x0002
-#define	PCIM_CMD_BUSMASTEREN	0x0004
-#define	PCIM_CMD_SPECIALEN	0x0008
-#define	PCIM_CMD_MWRICEN	0x0010
-#define	PCIM_CMD_PERRESPEN	0x0040
-#define	PCIM_CMD_SERRESPEN	0x0100
-#define	PCIM_CMD_BACKTOBACK	0x0200
-#define	PCIM_CMD_INTxDIS	0x0400
-#define	PCIR_STATUS	0x06
-#define	PCIM_STATUS_INTxSTATE	0x0008
-#define	PCIM_STATUS_CAPPRESENT	0x0010
-#define	PCIM_STATUS_66CAPABLE	0x0020
-#define	PCIM_STATUS_BACKTOBACK	0x0080
-#define	PCIM_STATUS_MDPERR	0x0100
-#define	PCIM_STATUS_SEL_FAST	0x0000
-#define	PCIM_STATUS_SEL_MEDIMUM	0x0200
-#define	PCIM_STATUS_SEL_SLOW	0x0400
-#define	PCIM_STATUS_SEL_MASK	0x0600
-#define	PCIM_STATUS_STABORT	0x0800
-#define	PCIM_STATUS_RTABORT	0x1000
-#define	PCIM_STATUS_RMABORT	0x2000
-#define	PCIM_STATUS_SERR	0x4000
-#define	PCIM_STATUS_PERR	0x8000
-#define	PCIR_REVID	0x08
-#define	PCIR_PROGIF	0x09
-#define	PCIR_SUBCLASS	0x0a
-#define	PCIR_CLASS	0x0b
-#define	PCIR_CACHELNSZ	0x0c
-#define	PCIR_LATTIMER	0x0d
-#define	PCIR_HDRTYPE	0x0e
-#define	PCIM_HDRTYPE		0x7f
-#define	PCIM_HDRTYPE_NORMAL	0x00
-#define	PCIM_HDRTYPE_BRIDGE	0x01
-#define	PCIM_HDRTYPE_CARDBUS	0x02
-#define	PCIM_MFDEV		0x80
-#define	PCIR_BIST	0x0f
-
-/* Capability Register Offsets */
-
-#define	PCICAP_ID	0x0
-#define	PCICAP_NEXTPTR	0x1
-
-/* Capability Identification Numbers */
-
-#define	PCIY_PMG	0x01	/* PCI Power Management */
-#define	PCIY_AGP	0x02	/* AGP */
-#define	PCIY_VPD	0x03	/* Vital Product Data */
-#define	PCIY_SLOTID	0x04	/* Slot Identification */
-#define	PCIY_MSI	0x05	/* Message Signaled Interrupts */
-#define	PCIY_CHSWP	0x06	/* CompactPCI Hot Swap */
-#define	PCIY_PCIX	0x07	/* PCI-X */
-#define	PCIY_HT		0x08	/* HyperTransport */
-#define	PCIY_VENDOR	0x09	/* Vendor Unique */
-#define	PCIY_DEBUG	0x0a	/* Debug port */
-#define	PCIY_CRES	0x0b	/* CompactPCI central resource control */
-#define	PCIY_HOTPLUG	0x0c	/* PCI Hot-Plug */
-#define	PCIY_SUBVENDOR	0x0d	/* PCI-PCI bridge subvendor ID */
-#define	PCIY_AGP8X	0x0e	/* AGP 8x */
-#define	PCIY_SECDEV	0x0f	/* Secure Device */
-#define	PCIY_EXPRESS	0x10	/* PCI Express */
-#define	PCIY_MSIX	0x11	/* MSI-X */
-#define	PCIY_SATA	0x12	/* SATA */
-#define	PCIY_PCIAF	0x13	/* PCI Advanced Features */
-
-/* Extended Capability Register Fields */
-
-#define	PCIR_EXTCAP	0x100
-#define	PCIM_EXTCAP_ID		0x0000ffff
-#define	PCIM_EXTCAP_VER		0x000f0000
-#define	PCIM_EXTCAP_NEXTPTR	0xfff00000
-#define	PCI_EXTCAP_ID(ecap)	((ecap) & PCIM_EXTCAP_ID)
-#define	PCI_EXTCAP_VER(ecap)	(((ecap) & PCIM_EXTCAP_VER) >> 16)
-#define	PCI_EXTCAP_NEXTPTR(ecap) (((ecap) & PCIM_EXTCAP_NEXTPTR) >> 20)
-
-/* Extended Capability Identification Numbers */
-
-#define	PCIZ_AER	0x0001	/* Advanced Error Reporting */
-#define	PCIZ_VC		0x0002	/* Virtual Channel if MFVC Ext Cap not set */
-#define	PCIZ_SERNUM	0x0003	/* Device Serial Number */
-#define	PCIZ_PWRBDGT	0x0004	/* Power Budgeting */
-#define	PCIZ_RCLINK_DCL	0x0005	/* Root Complex Link Declaration */
-#define	PCIZ_RCLINK_CTL	0x0006	/* Root Complex Internal Link Control */
-#define	PCIZ_RCEC_ASSOC	0x0007	/* Root Complex Event Collector Association */
-#define	PCIZ_MFVC	0x0008	/* Multi-Function Virtual Channel */
-#define	PCIZ_VC2	0x0009	/* Virtual Channel if MFVC Ext Cap set */
-#define	PCIZ_RCRB	0x000a	/* RCRB Header */
-#define	PCIZ_VENDOR	0x000b	/* Vendor Unique */
-#define	PCIZ_CAC	0x000c	/* Configuration Access Correction -- obsolete */
-#define	PCIZ_ACS	0x000d	/* Access Control Services */
-#define	PCIZ_ARI	0x000e	/* Alternative Routing-ID Interpretation */
-#define	PCIZ_ATS	0x000f	/* Address Translation Services */
-#define	PCIZ_SRIOV	0x0010	/* Single Root IO Virtualization */
-#define	PCIZ_MRIOV	0x0011	/* Multiple Root IO Virtualization */
-#define	PCIZ_MULTICAST	0x0012	/* Multicast */
-#define	PCIZ_PAGE_REQ	0x0013	/* Page Request */
-#define	PCIZ_AMD	0x0014	/* Reserved for AMD */
-#define	PCIZ_RESIZE_BAR	0x0015	/* Resizable BAR */
-#define	PCIZ_DPA	0x0016	/* Dynamic Power Allocation */
-#define	PCIZ_TPH_REQ	0x0017	/* TPH Requester */
-#define	PCIZ_LTR	0x0018	/* Latency Tolerance Reporting */
-#define	PCIZ_SEC_PCIE	0x0019	/* Secondary PCI Express */
-#define	PCIZ_PMUX	0x001a	/* Protocol Multiplexing */
-#define	PCIZ_PASID	0x001b	/* Process Address Space ID */
-#define	PCIZ_LN_REQ	0x001c	/* LN Requester */
-#define	PCIZ_DPC	0x001d	/* Downstream Porto Containment */
-#define	PCIZ_L1PM	0x001e	/* L1 PM Substates */
-
-/* config registers for header type 0 devices */
-
-#define	PCIR_BARS	0x10
-#define	PCIR_BAR(x)		(PCIR_BARS + (x) * 4)
-#define	PCIR_MAX_BAR_0		5
-#define	PCI_RID2BAR(rid)	(((rid) - PCIR_BARS) / 4)
-#define	PCI_BAR_IO(x)		(((x) & PCIM_BAR_SPACE) == PCIM_BAR_IO_SPACE)
-#define	PCI_BAR_MEM(x)		(((x) & PCIM_BAR_SPACE) == PCIM_BAR_MEM_SPACE)
-#define	PCIM_BAR_SPACE		0x00000001
-#define	PCIM_BAR_MEM_SPACE	0
-#define	PCIM_BAR_IO_SPACE	1
-#define	PCIM_BAR_MEM_TYPE	0x00000006
-#define	PCIM_BAR_MEM_32		0
-#define	PCIM_BAR_MEM_1MB	2	/* Locate below 1MB in PCI <= 2.1 */
-#define	PCIM_BAR_MEM_64		4
-#define	PCIM_BAR_MEM_PREFETCH	0x00000008
-#define	PCIM_BAR_MEM_BASE	0xfffffffffffffff0ULL
-#define	PCIM_BAR_IO_RESERVED	0x00000002
-#define	PCIM_BAR_IO_BASE	0xfffffffc
-#define	PCIR_CIS	0x28
-#define	PCIM_CIS_ASI_MASK	0x00000007
-#define	PCIM_CIS_ASI_CONFIG	0
-#define	PCIM_CIS_ASI_BAR0	1
-#define	PCIM_CIS_ASI_BAR1	2
-#define	PCIM_CIS_ASI_BAR2	3
-#define	PCIM_CIS_ASI_BAR3	4
-#define	PCIM_CIS_ASI_BAR4	5
-#define	PCIM_CIS_ASI_BAR5	6
-#define	PCIM_CIS_ASI_ROM	7
-#define	PCIM_CIS_ADDR_MASK	0x0ffffff8
-#define	PCIM_CIS_ROM_MASK	0xf0000000
-#define	PCIM_CIS_CONFIG_MASK	0xff
-#define	PCIR_SUBVEND_0	0x2c
-#define	PCIR_SUBDEV_0	0x2e
-#define	PCIR_BIOS	0x30
-#define	PCIM_BIOS_ENABLE	0x01
-#define	PCIM_BIOS_ADDR_MASK	0xfffff800
-#define	PCIR_CAP_PTR	0x34
-#define	PCIR_INTLINE	0x3c
-#define	PCIR_INTPIN	0x3d
-#define	PCIR_MINGNT	0x3e
-#define	PCIR_MAXLAT	0x3f
-
-/* config registers for header type 1 (PCI-to-PCI bridge) devices */
-
-#define	PCIR_MAX_BAR_1	1
-#define	PCIR_SECSTAT_1	0x1e
-
-#define	PCIR_PRIBUS_1	0x18
-#define	PCIR_SECBUS_1	0x19
-#define	PCIR_SUBBUS_1	0x1a
-#define	PCIR_SECLAT_1	0x1b
-
-#define	PCIR_IOBASEL_1	0x1c
-#define	PCIR_IOLIMITL_1	0x1d
-#define	PCIR_IOBASEH_1	0x30
-#define	PCIR_IOLIMITH_1	0x32
-#define	PCIM_BRIO_16		0x0
-#define	PCIM_BRIO_32		0x1
-#define	PCIM_BRIO_MASK		0xf
-
-#define	PCIR_MEMBASE_1	0x20
-#define	PCIR_MEMLIMIT_1	0x22
-
-#define	PCIR_PMBASEL_1	0x24
-#define	PCIR_PMLIMITL_1	0x26
-#define	PCIR_PMBASEH_1	0x28
-#define	PCIR_PMLIMITH_1	0x2c
-#define	PCIM_BRPM_32		0x0
-#define	PCIM_BRPM_64		0x1
-#define	PCIM_BRPM_MASK		0xf
-
-#define	PCIR_BIOS_1	0x38
-#define	PCIR_BRIDGECTL_1 0x3e
-
-/* config registers for header type 2 (CardBus) devices */
-
-#define	PCIR_MAX_BAR_2	0
-#define	PCIR_CAP_PTR_2	0x14
-#define	PCIR_SECSTAT_2	0x16
-
-#define	PCIR_PRIBUS_2	0x18
-#define	PCIR_SECBUS_2	0x19
-#define	PCIR_SUBBUS_2	0x1a
-#define	PCIR_SECLAT_2	0x1b
-
-#define	PCIR_MEMBASE0_2	0x1c
-#define	PCIR_MEMLIMIT0_2 0x20
-#define	PCIR_MEMBASE1_2	0x24
-#define	PCIR_MEMLIMIT1_2 0x28
-#define	PCIR_IOBASE0_2	0x2c
-#define	PCIR_IOLIMIT0_2	0x30
-#define	PCIR_IOBASE1_2	0x34
-#define	PCIR_IOLIMIT1_2	0x38
-
-#define	PCIR_BRIDGECTL_2 0x3e
-
-#define	PCIR_SUBVEND_2	0x40
-#define	PCIR_SUBDEV_2	0x42
-
-#define	PCIR_PCCARDIF_2	0x44
-
-/* PCI device class, subclass and programming interface definitions */
-
-#define	PCIC_OLD	0x00
-#define	PCIS_OLD_NONVGA		0x00
-#define	PCIS_OLD_VGA		0x01
-
-#define	PCIC_STORAGE	0x01
-#define	PCIS_STORAGE_SCSI	0x00
-#define	PCIS_STORAGE_IDE	0x01
-#define	PCIP_STORAGE_IDE_MODEPRIM	0x01
-#define	PCIP_STORAGE_IDE_PROGINDPRIM	0x02
-#define	PCIP_STORAGE_IDE_MODESEC	0x04
-#define	PCIP_STORAGE_IDE_PROGINDSEC	0x08
-#define	PCIP_STORAGE_IDE_MASTERDEV	0x80
-#define	PCIS_STORAGE_FLOPPY	0x02
-#define	PCIS_STORAGE_IPI	0x03
-#define	PCIS_STORAGE_RAID	0x04
-#define	PCIS_STORAGE_ATA_ADMA	0x05
-#define	PCIS_STORAGE_SATA	0x06
-#define	PCIP_STORAGE_SATA_AHCI_1_0	0x01
-#define	PCIS_STORAGE_SAS	0x07
-#define	PCIS_STORAGE_NVM	0x08
-#define	PCIP_STORAGE_NVM_NVMHCI_1_0	0x01
-#define	PCIP_STORAGE_NVM_ENTERPRISE_NVMHCI_1_0	0x02
-#define	PCIS_STORAGE_OTHER	0x80
-
-#define	PCIC_NETWORK	0x02
-#define	PCIS_NETWORK_ETHERNET	0x00
-#define	PCIS_NETWORK_TOKENRING	0x01
-#define	PCIS_NETWORK_FDDI	0x02
-#define	PCIS_NETWORK_ATM	0x03
-#define	PCIS_NETWORK_ISDN	0x04
-#define	PCIS_NETWORK_WORLDFIP	0x05
-#define	PCIS_NETWORK_PICMG	0x06
-#define	PCIS_NETWORK_OTHER	0x80
-
-#define	PCIC_DISPLAY	0x03
-#define	PCIS_DISPLAY_VGA	0x00
-#define	PCIS_DISPLAY_XGA	0x01
-#define	PCIS_DISPLAY_3D		0x02
-#define	PCIS_DISPLAY_OTHER	0x80
-
-#define	PCIC_MULTIMEDIA	0x04
-#define	PCIS_MULTIMEDIA_VIDEO	0x00
-#define	PCIS_MULTIMEDIA_AUDIO	0x01
-#define	PCIS_MULTIMEDIA_TELE	0x02
-#define	PCIS_MULTIMEDIA_HDA	0x03
-#define	PCIS_MULTIMEDIA_OTHER	0x80
-
-#define	PCIC_MEMORY	0x05
-#define	PCIS_MEMORY_RAM		0x00
-#define	PCIS_MEMORY_FLASH	0x01
-#define	PCIS_MEMORY_OTHER	0x80
-
-#define	PCIC_BRIDGE	0x06
-#define	PCIS_BRIDGE_HOST	0x00
-#define	PCIS_BRIDGE_ISA		0x01
-#define	PCIS_BRIDGE_EISA	0x02
-#define	PCIS_BRIDGE_MCA		0x03
-#define	PCIS_BRIDGE_PCI		0x04
-#define	PCIP_BRIDGE_PCI_SUBTRACTIVE	0x01
-#define	PCIS_BRIDGE_PCMCIA	0x05
-#define	PCIS_BRIDGE_NUBUS	0x06
-#define	PCIS_BRIDGE_CARDBUS	0x07
-#define	PCIS_BRIDGE_RACEWAY	0x08
-#define	PCIS_BRIDGE_PCI_TRANSPARENT 0x09
-#define	PCIS_BRIDGE_INFINIBAND	0x0a
-#define	PCIS_BRIDGE_OTHER	0x80
-
-#define	PCIC_SIMPLECOMM	0x07
-#define	PCIS_SIMPLECOMM_UART	0x00
-#define	PCIP_SIMPLECOMM_UART_8250	0x00
-#define	PCIP_SIMPLECOMM_UART_16450A	0x01
-#define	PCIP_SIMPLECOMM_UART_16550A	0x02
-#define	PCIP_SIMPLECOMM_UART_16650A	0x03
-#define	PCIP_SIMPLECOMM_UART_16750A	0x04
-#define	PCIP_SIMPLECOMM_UART_16850A	0x05
-#define	PCIP_SIMPLECOMM_UART_16950A	0x06
-#define	PCIS_SIMPLECOMM_PAR	0x01
-#define	PCIS_SIMPLECOMM_MULSER	0x02
-#define	PCIS_SIMPLECOMM_MODEM	0x03
-#define	PCIS_SIMPLECOMM_GPIB	0x04
-#define	PCIS_SIMPLECOMM_SMART_CARD 0x05
-#define	PCIS_SIMPLECOMM_OTHER	0x80
-
-#define	PCIC_BASEPERIPH	0x08
-#define	PCIS_BASEPERIPH_PIC	0x00
-#define	PCIP_BASEPERIPH_PIC_8259A	0x00
-#define	PCIP_BASEPERIPH_PIC_ISA		0x01
-#define	PCIP_BASEPERIPH_PIC_EISA	0x02
-#define	PCIP_BASEPERIPH_PIC_IO_APIC	0x10
-#define	PCIP_BASEPERIPH_PIC_IOX_APIC	0x20
-#define	PCIS_BASEPERIPH_DMA	0x01
-#define	PCIS_BASEPERIPH_TIMER	0x02
-#define	PCIS_BASEPERIPH_RTC	0x03
-#define	PCIS_BASEPERIPH_PCIHOT	0x04
-#define	PCIS_BASEPERIPH_SDHC	0x05
-#define	PCIS_BASEPERIPH_IOMMU	0x06
-#define	PCIS_BASEPERIPH_OTHER	0x80
-
-#define	PCIC_INPUTDEV	0x09
-#define	PCIS_INPUTDEV_KEYBOARD	0x00
-#define	PCIS_INPUTDEV_DIGITIZER	0x01
-#define	PCIS_INPUTDEV_MOUSE	0x02
-#define	PCIS_INPUTDEV_SCANNER	0x03
-#define	PCIS_INPUTDEV_GAMEPORT	0x04
-#define	PCIS_INPUTDEV_OTHER	0x80
-
-#define	PCIC_DOCKING	0x0a
-#define	PCIS_DOCKING_GENERIC	0x00
-#define	PCIS_DOCKING_OTHER	0x80
-
-#define	PCIC_PROCESSOR	0x0b
-#define	PCIS_PROCESSOR_386	0x00
-#define	PCIS_PROCESSOR_486	0x01
-#define	PCIS_PROCESSOR_PENTIUM	0x02
-#define	PCIS_PROCESSOR_ALPHA	0x10
-#define	PCIS_PROCESSOR_POWERPC	0x20
-#define	PCIS_PROCESSOR_MIPS	0x30
-#define	PCIS_PROCESSOR_COPROC	0x40
-
-#define	PCIC_SERIALBUS	0x0c
-#define	PCIS_SERIALBUS_FW	0x00
-#define	PCIS_SERIALBUS_ACCESS	0x01
-#define	PCIS_SERIALBUS_SSA	0x02
-#define	PCIS_SERIALBUS_USB	0x03
-#define	PCIP_SERIALBUS_USB_UHCI		0x00
-#define	PCIP_SERIALBUS_USB_OHCI		0x10
-#define	PCIP_SERIALBUS_USB_EHCI		0x20
-#define	PCIP_SERIALBUS_USB_XHCI		0x30
-#define	PCIP_SERIALBUS_USB_DEVICE	0xfe
-#define	PCIS_SERIALBUS_FC	0x04
-#define	PCIS_SERIALBUS_SMBUS	0x05
-#define	PCIS_SERIALBUS_INFINIBAND 0x06
-#define	PCIS_SERIALBUS_IPMI	0x07
-#define	PCIP_SERIALBUS_IPMI_SMIC	0x00
-#define	PCIP_SERIALBUS_IPMI_KCS		0x01
-#define	PCIP_SERIALBUS_IPMI_BT		0x02
-#define	PCIS_SERIALBUS_SERCOS	0x08
-#define	PCIS_SERIALBUS_CANBUS	0x09
-
-#define	PCIC_WIRELESS	0x0d
-#define	PCIS_WIRELESS_IRDA	0x00
-#define	PCIS_WIRELESS_IR	0x01
-#define	PCIS_WIRELESS_RF	0x10
-#define	PCIS_WIRELESS_BLUETOOTH	0x11
-#define	PCIS_WIRELESS_BROADBAND	0x12
-#define	PCIS_WIRELESS_80211A	0x20
-#define	PCIS_WIRELESS_80211B	0x21
-#define	PCIS_WIRELESS_OTHER	0x80
-
-#define	PCIC_INTELLIIO	0x0e
-#define	PCIS_INTELLIIO_I2O	0x00
-
-#define	PCIC_SATCOM	0x0f
-#define	PCIS_SATCOM_TV		0x01
-#define	PCIS_SATCOM_AUDIO	0x02
-#define	PCIS_SATCOM_VOICE	0x03
-#define	PCIS_SATCOM_DATA	0x04
-
-#define	PCIC_CRYPTO	0x10
-#define	PCIS_CRYPTO_NETCOMP	0x00
-#define	PCIS_CRYPTO_ENTERTAIN	0x10
-#define	PCIS_CRYPTO_OTHER	0x80
-
-#define	PCIC_DASP	0x11
-#define	PCIS_DASP_DPIO		0x00
-#define	PCIS_DASP_PERFCNTRS	0x01
-#define	PCIS_DASP_COMM_SYNC	0x10
-#define	PCIS_DASP_MGMT_CARD	0x20
-#define	PCIS_DASP_OTHER		0x80
-
-#define	PCIC_OTHER	0xff
-
-/* Bridge Control Values. */
-#define	PCIB_BCR_PERR_ENABLE		0x0001
-#define	PCIB_BCR_SERR_ENABLE		0x0002
-#define	PCIB_BCR_ISA_ENABLE		0x0004
-#define	PCIB_BCR_VGA_ENABLE		0x0008
-#define	PCIB_BCR_MASTER_ABORT_MODE	0x0020
-#define	PCIB_BCR_SECBUS_RESET		0x0040
-#define	PCIB_BCR_SECBUS_BACKTOBACK	0x0080
-#define	PCIB_BCR_PRI_DISCARD_TIMEOUT	0x0100
-#define	PCIB_BCR_SEC_DISCARD_TIMEOUT	0x0200
-#define	PCIB_BCR_DISCARD_TIMER_STATUS	0x0400
-#define	PCIB_BCR_DISCARD_TIMER_SERREN	0x0800
-
-/* PCI power manangement */
-#define	PCIR_POWER_CAP		0x2
-#define	PCIM_PCAP_SPEC			0x0007
-#define	PCIM_PCAP_PMEREQCLK		0x0008
-#define	PCIM_PCAP_DEVSPECINIT		0x0020
-#define	PCIM_PCAP_AUXPWR_0		0x0000
-#define	PCIM_PCAP_AUXPWR_55		0x0040
-#define	PCIM_PCAP_AUXPWR_100		0x0080
-#define	PCIM_PCAP_AUXPWR_160		0x00c0
-#define	PCIM_PCAP_AUXPWR_220		0x0100
-#define	PCIM_PCAP_AUXPWR_270		0x0140
-#define	PCIM_PCAP_AUXPWR_320		0x0180
-#define	PCIM_PCAP_AUXPWR_375		0x01c0
-#define	PCIM_PCAP_AUXPWRMASK		0x01c0
-#define	PCIM_PCAP_D1SUPP		0x0200
-#define	PCIM_PCAP_D2SUPP		0x0400
-#define	PCIM_PCAP_D0PME			0x0800
-#define	PCIM_PCAP_D1PME			0x1000
-#define	PCIM_PCAP_D2PME			0x2000
-#define	PCIM_PCAP_D3PME_HOT		0x4000
-#define	PCIM_PCAP_D3PME_COLD		0x8000
-
-#define	PCIR_POWER_STATUS	0x4
-#define	PCIM_PSTAT_D0			0x0000
-#define	PCIM_PSTAT_D1			0x0001
-#define	PCIM_PSTAT_D2			0x0002
-#define	PCIM_PSTAT_D3			0x0003
-#define	PCIM_PSTAT_DMASK		0x0003
-#define	PCIM_PSTAT_NOSOFTRESET		0x0008
-#define	PCIM_PSTAT_PMEENABLE		0x0100
-#define	PCIM_PSTAT_D0POWER		0x0000
-#define	PCIM_PSTAT_D1POWER		0x0200
-#define	PCIM_PSTAT_D2POWER		0x0400
-#define	PCIM_PSTAT_D3POWER		0x0600
-#define	PCIM_PSTAT_D0HEAT		0x0800
-#define	PCIM_PSTAT_D1HEAT		0x0a00
-#define	PCIM_PSTAT_D2HEAT		0x0c00
-#define	PCIM_PSTAT_D3HEAT		0x0e00
-#define	PCIM_PSTAT_DATASELMASK		0x1e00
-#define	PCIM_PSTAT_DATAUNKN		0x0000
-#define	PCIM_PSTAT_DATADIV10		0x2000
-#define	PCIM_PSTAT_DATADIV100		0x4000
-#define	PCIM_PSTAT_DATADIV1000		0x6000
-#define	PCIM_PSTAT_DATADIVMASK		0x6000
-#define	PCIM_PSTAT_PME			0x8000
-
-#define	PCIR_POWER_BSE		0x6
-#define	PCIM_PMCSR_BSE_D3B3		0x00
-#define	PCIM_PMCSR_BSE_D3B2		0x40
-#define	PCIM_PMCSR_BSE_BPCCE		0x80
-
-#define	PCIR_POWER_DATA		0x7
-
-/* VPD capability registers */
-#define	PCIR_VPD_ADDR		0x2
-#define	PCIR_VPD_DATA		0x4
-
-/* PCI Message Signalled Interrupts (MSI) */
-#define	PCIR_MSI_CTRL		0x2
-#define	PCIM_MSICTRL_VECTOR		0x0100
-#define	PCIM_MSICTRL_64BIT		0x0080
-#define	PCIM_MSICTRL_MME_MASK		0x0070
-#define	PCIM_MSICTRL_MME_1		0x0000
-#define	PCIM_MSICTRL_MME_2		0x0010
-#define	PCIM_MSICTRL_MME_4		0x0020
-#define	PCIM_MSICTRL_MME_8		0x0030
-#define	PCIM_MSICTRL_MME_16		0x0040
-#define	PCIM_MSICTRL_MME_32		0x0050
-#define	PCIM_MSICTRL_MMC_MASK		0x000E
-#define	PCIM_MSICTRL_MMC_1		0x0000
-#define	PCIM_MSICTRL_MMC_2		0x0002
-#define	PCIM_MSICTRL_MMC_4		0x0004
-#define	PCIM_MSICTRL_MMC_8		0x0006
-#define	PCIM_MSICTRL_MMC_16		0x0008
-#define	PCIM_MSICTRL_MMC_32		0x000A
-#define	PCIM_MSICTRL_MSI_ENABLE		0x0001
-#define	PCIR_MSI_ADDR		0x4
-#define	PCIR_MSI_ADDR_HIGH	0x8
-#define	PCIR_MSI_DATA		0x8
-#define	PCIR_MSI_DATA_64BIT	0xc
-#define	PCIR_MSI_MASK		0x10
-#define	PCIR_MSI_PENDING	0x14
-
-/* PCI-X definitions */
-
-/* For header type 0 devices */
-#define	PCIXR_COMMAND		0x2
-#define	PCIXM_COMMAND_DPERR_E		0x0001	/* Data Parity Error Recovery */
-#define	PCIXM_COMMAND_ERO		0x0002	/* Enable Relaxed Ordering */
-#define	PCIXM_COMMAND_MAX_READ		0x000c	/* Maximum Burst Read Count */
-#define	PCIXM_COMMAND_MAX_READ_512	0x0000
-#define	PCIXM_COMMAND_MAX_READ_1024	0x0004
-#define	PCIXM_COMMAND_MAX_READ_2048	0x0008
-#define	PCIXM_COMMAND_MAX_READ_4096	0x000c
-#define	PCIXM_COMMAND_MAX_SPLITS 	0x0070	/* Maximum Split Transactions */
-#define	PCIXM_COMMAND_MAX_SPLITS_1	0x0000
-#define	PCIXM_COMMAND_MAX_SPLITS_2	0x0010
-#define	PCIXM_COMMAND_MAX_SPLITS_3	0x0020
-#define	PCIXM_COMMAND_MAX_SPLITS_4	0x0030
-#define	PCIXM_COMMAND_MAX_SPLITS_8	0x0040
-#define	PCIXM_COMMAND_MAX_SPLITS_12	0x0050
-#define	PCIXM_COMMAND_MAX_SPLITS_16	0x0060
-#define	PCIXM_COMMAND_MAX_SPLITS_32	0x0070
-#define	PCIXM_COMMAND_VERSION		0x3000
-#define	PCIXR_STATUS		0x4
-#define	PCIXM_STATUS_DEVFN		0x000000FF
-#define	PCIXM_STATUS_BUS		0x0000FF00
-#define	PCIXM_STATUS_64BIT		0x00010000
-#define	PCIXM_STATUS_133CAP		0x00020000
-#define	PCIXM_STATUS_SC_DISCARDED	0x00040000
-#define	PCIXM_STATUS_UNEXP_SC		0x00080000
-#define	PCIXM_STATUS_COMPLEX_DEV	0x00100000
-#define	PCIXM_STATUS_MAX_READ		0x00600000
-#define	PCIXM_STATUS_MAX_READ_512	0x00000000
-#define	PCIXM_STATUS_MAX_READ_1024	0x00200000
-#define	PCIXM_STATUS_MAX_READ_2048	0x00400000
-#define	PCIXM_STATUS_MAX_READ_4096	0x00600000
-#define	PCIXM_STATUS_MAX_SPLITS		0x03800000
-#define	PCIXM_STATUS_MAX_SPLITS_1	0x00000000
-#define	PCIXM_STATUS_MAX_SPLITS_2	0x00800000
-#define	PCIXM_STATUS_MAX_SPLITS_3	0x01000000
-#define	PCIXM_STATUS_MAX_SPLITS_4	0x01800000
-#define	PCIXM_STATUS_MAX_SPLITS_8	0x02000000
-#define	PCIXM_STATUS_MAX_SPLITS_12	0x02800000
-#define	PCIXM_STATUS_MAX_SPLITS_16	0x03000000
-#define	PCIXM_STATUS_MAX_SPLITS_32	0x03800000
-#define	PCIXM_STATUS_MAX_CUM_READ	0x1C000000
-#define	PCIXM_STATUS_RCVD_SC_ERR	0x20000000
-#define	PCIXM_STATUS_266CAP		0x40000000
-#define	PCIXM_STATUS_533CAP		0x80000000
-
-/* For header type 1 devices (PCI-X bridges) */
-#define	PCIXR_SEC_STATUS	0x2
-#define	PCIXM_SEC_STATUS_64BIT		0x0001
-#define	PCIXM_SEC_STATUS_133CAP		0x0002
-#define	PCIXM_SEC_STATUS_SC_DISC	0x0004
-#define	PCIXM_SEC_STATUS_UNEXP_SC	0x0008
-#define	PCIXM_SEC_STATUS_SC_OVERRUN	0x0010
-#define	PCIXM_SEC_STATUS_SR_DELAYED	0x0020
-#define	PCIXM_SEC_STATUS_BUS_MODE	0x03c0
-#define	PCIXM_SEC_STATUS_VERSION	0x3000
-#define	PCIXM_SEC_STATUS_266CAP		0x4000
-#define	PCIXM_SEC_STATUS_533CAP		0x8000
-#define	PCIXR_BRIDGE_STATUS	0x4
-#define	PCIXM_BRIDGE_STATUS_DEVFN	0x000000FF
-#define	PCIXM_BRIDGE_STATUS_BUS		0x0000FF00
-#define	PCIXM_BRIDGE_STATUS_64BIT	0x00010000
-#define	PCIXM_BRIDGE_STATUS_133CAP	0x00020000
-#define	PCIXM_BRIDGE_STATUS_SC_DISCARDED 0x00040000
-#define	PCIXM_BRIDGE_STATUS_UNEXP_SC	0x00080000
-#define	PCIXM_BRIDGE_STATUS_SC_OVERRUN	0x00100000
-#define	PCIXM_BRIDGE_STATUS_SR_DELAYED	0x00200000
-#define	PCIXM_BRIDGE_STATUS_DEVID_MSGCAP 0x20000000
-#define	PCIXM_BRIDGE_STATUS_266CAP	0x40000000
-#define	PCIXM_BRIDGE_STATUS_533CAP	0x80000000
-
-/* HT (HyperTransport) Capability definitions */
-#define	PCIR_HT_COMMAND		0x2
-#define	PCIM_HTCMD_CAP_MASK		0xf800	/* Capability type. */
-#define	PCIM_HTCAP_SLAVE		0x0000	/* 000xx */
-#define	PCIM_HTCAP_HOST			0x2000	/* 001xx */
-#define	PCIM_HTCAP_SWITCH		0x4000	/* 01000 */
-#define	PCIM_HTCAP_INTERRUPT		0x8000	/* 10000 */
-#define	PCIM_HTCAP_REVISION_ID		0x8800	/* 10001 */
-#define	PCIM_HTCAP_UNITID_CLUMPING	0x9000	/* 10010 */
-#define	PCIM_HTCAP_EXT_CONFIG_SPACE	0x9800	/* 10011 */
-#define	PCIM_HTCAP_ADDRESS_MAPPING	0xa000	/* 10100 */
-#define	PCIM_HTCAP_MSI_MAPPING		0xa800	/* 10101 */
-#define	PCIM_HTCAP_DIRECT_ROUTE		0xb000	/* 10110 */
-#define	PCIM_HTCAP_VCSET		0xb800	/* 10111 */
-#define	PCIM_HTCAP_RETRY_MODE		0xc000	/* 11000 */
-#define	PCIM_HTCAP_X86_ENCODING		0xc800	/* 11001 */
-#define	PCIM_HTCAP_GEN3			0xd000	/* 11010 */
-#define	PCIM_HTCAP_FLE			0xd800	/* 11011 */
-#define	PCIM_HTCAP_PM			0xe000	/* 11100 */
-#define	PCIM_HTCAP_HIGH_NODE_COUNT	0xe800	/* 11101 */
-
-/* HT MSI Mapping Capability definitions. */
-#define	PCIM_HTCMD_MSI_ENABLE		0x0001
-#define	PCIM_HTCMD_MSI_FIXED		0x0002
-#define	PCIR_HTMSI_ADDRESS_LO	0x4
-#define	PCIR_HTMSI_ADDRESS_HI	0x8
-
-/* PCI Vendor capability definitions */
-#define	PCIR_VENDOR_LENGTH	0x2
-#define	PCIR_VENDOR_DATA	0x3
-
-/* PCI EHCI Debug Port definitions */
-#define	PCIR_DEBUG_PORT		0x2
-#define	PCIM_DEBUG_PORT_OFFSET		0x1FFF
-#define	PCIM_DEBUG_PORT_BAR		0xe000
-
-/* PCI-PCI Bridge Subvendor definitions */
-#define	PCIR_SUBVENDCAP_ID	0x4
-
-/* PCI Express definitions */
-#define	PCIER_FLAGS		0x2
-#define	PCIEM_FLAGS_VERSION		0x000F
-#define	PCIEM_FLAGS_TYPE		0x00F0
-#define	PCIEM_TYPE_ENDPOINT		0x0000
-#define	PCIEM_TYPE_LEGACY_ENDPOINT	0x0010
-#define	PCIEM_TYPE_ROOT_PORT		0x0040
-#define	PCIEM_TYPE_UPSTREAM_PORT	0x0050
-#define	PCIEM_TYPE_DOWNSTREAM_PORT	0x0060
-#define	PCIEM_TYPE_PCI_BRIDGE		0x0070
-#define	PCIEM_TYPE_PCIE_BRIDGE		0x0080
-#define	PCIEM_TYPE_ROOT_INT_EP		0x0090
-#define	PCIEM_TYPE_ROOT_EC		0x00a0
-#define	PCIEM_FLAGS_SLOT		0x0100
-#define	PCIEM_FLAGS_IRQ			0x3e00
-#define	PCIER_DEVICE_CAP	0x4
-#define	PCIEM_CAP_MAX_PAYLOAD		0x00000007
-#define	PCIEM_CAP_PHANTHOM_FUNCS	0x00000018
-#define	PCIEM_CAP_EXT_TAG_FIELD		0x00000020
-#define	PCIEM_CAP_L0S_LATENCY		0x000001c0
-#define	PCIEM_CAP_L1_LATENCY		0x00000e00
-#define	PCIEM_CAP_ROLE_ERR_RPT		0x00008000
-#define	PCIEM_CAP_SLOT_PWR_LIM_VAL	0x03fc0000
-#define	PCIEM_CAP_SLOT_PWR_LIM_SCALE	0x0c000000
-#define	PCIEM_CAP_FLR			0x10000000
-#define	PCIER_DEVICE_CTL	0x8
-#define	PCIEM_CTL_COR_ENABLE		0x0001
-#define	PCIEM_CTL_NFER_ENABLE		0x0002
-#define	PCIEM_CTL_FER_ENABLE		0x0004
-#define	PCIEM_CTL_URR_ENABLE		0x0008
-#define	PCIEM_CTL_RELAXED_ORD_ENABLE	0x0010
-#define	PCIEM_CTL_MAX_PAYLOAD		0x00e0
-#define	PCIEM_CTL_EXT_TAG_FIELD		0x0100
-#define	PCIEM_CTL_PHANTHOM_FUNCS	0x0200
-#define	PCIEM_CTL_AUX_POWER_PM		0x0400
-#define	PCIEM_CTL_NOSNOOP_ENABLE	0x0800
-#define	PCIEM_CTL_MAX_READ_REQUEST	0x7000
-#define	PCIEM_CTL_BRDG_CFG_RETRY	0x8000	/* PCI-E - PCI/PCI-X bridges */
-#define	PCIEM_CTL_INITIATE_FLR		0x8000	/* FLR capable endpoints */
-#define	PCIER_DEVICE_STA	0xa
-#define	PCIEM_STA_CORRECTABLE_ERROR	0x0001
-#define	PCIEM_STA_NON_FATAL_ERROR	0x0002
-#define	PCIEM_STA_FATAL_ERROR		0x0004
-#define	PCIEM_STA_UNSUPPORTED_REQ	0x0008
-#define	PCIEM_STA_AUX_POWER		0x0010
-#define	PCIEM_STA_TRANSACTION_PND	0x0020
-#define	PCIER_LINK_CAP		0xc
-#define	PCIEM_LINK_CAP_MAX_SPEED	0x0000000f
-#define	PCIEM_LINK_CAP_MAX_WIDTH	0x000003f0
-#define	PCIEM_LINK_CAP_ASPM		0x00000c00
-#define	PCIEM_LINK_CAP_L0S_EXIT		0x00007000
-#define	PCIEM_LINK_CAP_L1_EXIT		0x00038000
-#define	PCIEM_LINK_CAP_CLOCK_PM		0x00040000
-#define	PCIEM_LINK_CAP_SURPRISE_DOWN	0x00080000
-#define	PCIEM_LINK_CAP_DL_ACTIVE	0x00100000
-#define	PCIEM_LINK_CAP_LINK_BW_NOTIFY	0x00200000
-#define	PCIEM_LINK_CAP_ASPM_COMPLIANCE	0x00400000
-#define	PCIEM_LINK_CAP_PORT		0xff000000
-#define	PCIER_LINK_CTL		0x10
-#define	PCIEM_LINK_CTL_ASPMC_DIS	0x0000
-#define	PCIEM_LINK_CTL_ASPMC_L0S	0x0001
-#define	PCIEM_LINK_CTL_ASPMC_L1		0x0002
-#define	PCIEM_LINK_CTL_ASPMC		0x0003
-#define	PCIEM_LINK_CTL_RCB		0x0008
-#define	PCIEM_LINK_CTL_LINK_DIS		0x0010
-#define	PCIEM_LINK_CTL_RETRAIN_LINK	0x0020
-#define	PCIEM_LINK_CTL_COMMON_CLOCK	0x0040
-#define	PCIEM_LINK_CTL_EXTENDED_SYNC	0x0080
-#define	PCIEM_LINK_CTL_ECPM		0x0100
-#define	PCIEM_LINK_CTL_HAWD		0x0200
-#define	PCIEM_LINK_CTL_LBMIE		0x0400
-#define	PCIEM_LINK_CTL_LABIE		0x0800
-#define	PCIER_LINK_STA		0x12
-#define	PCIEM_LINK_STA_SPEED		0x000f
-#define	PCIEM_LINK_STA_WIDTH		0x03f0
-#define	PCIEM_LINK_STA_TRAINING_ERROR	0x0400
-#define	PCIEM_LINK_STA_TRAINING		0x0800
-#define	PCIEM_LINK_STA_SLOT_CLOCK	0x1000
-#define	PCIEM_LINK_STA_DL_ACTIVE	0x2000
-#define	PCIEM_LINK_STA_LINK_BW_MGMT	0x4000
-#define	PCIEM_LINK_STA_LINK_AUTO_BW	0x8000
-#define	PCIER_SLOT_CAP		0x14
-#define	PCIEM_SLOT_CAP_APB		0x00000001
-#define	PCIEM_SLOT_CAP_PCP		0x00000002
-#define	PCIEM_SLOT_CAP_MRLSP		0x00000004
-#define	PCIEM_SLOT_CAP_AIP		0x00000008
-#define	PCIEM_SLOT_CAP_PIP		0x00000010
-#define	PCIEM_SLOT_CAP_HPS		0x00000020
-#define	PCIEM_SLOT_CAP_HPC		0x00000040
-#define	PCIEM_SLOT_CAP_SPLV		0x00007f80
-#define	PCIEM_SLOT_CAP_SPLS		0x00018000
-#define	PCIEM_SLOT_CAP_EIP		0x00020000
-#define	PCIEM_SLOT_CAP_NCCS		0x00040000
-#define	PCIEM_SLOT_CAP_PSN		0xfff80000
-#define	PCIER_SLOT_CTL		0x18
-#define	PCIEM_SLOT_CTL_ABPE		0x0001
-#define	PCIEM_SLOT_CTL_PFDE		0x0002
-#define	PCIEM_SLOT_CTL_MRLSCE		0x0004
-#define	PCIEM_SLOT_CTL_PDCE		0x0008
-#define	PCIEM_SLOT_CTL_CCIE		0x0010
-#define	PCIEM_SLOT_CTL_HPIE		0x0020
-#define	PCIEM_SLOT_CTL_AIC		0x00c0
-#define	PCIEM_SLOT_CTL_PIC		0x0300
-#define	PCIEM_SLOT_CTL_PCC		0x0400
-#define	PCIEM_SLOT_CTL_EIC		0x0800
-#define	PCIEM_SLOT_CTL_DLLSCE		0x1000
-#define	PCIER_SLOT_STA		0x1a
-#define	PCIEM_SLOT_STA_ABP		0x0001
-#define	PCIEM_SLOT_STA_PFD		0x0002
-#define	PCIEM_SLOT_STA_MRLSC		0x0004
-#define	PCIEM_SLOT_STA_PDC		0x0008
-#define	PCIEM_SLOT_STA_CC		0x0010
-#define	PCIEM_SLOT_STA_MRLSS		0x0020
-#define	PCIEM_SLOT_STA_PDS		0x0040
-#define	PCIEM_SLOT_STA_EIS		0x0080
-#define	PCIEM_SLOT_STA_DLLSC		0x0100
-#define	PCIER_ROOT_CTL		0x1c
-#define	PCIEM_ROOT_CTL_SERR_CORR	0x0001
-#define	PCIEM_ROOT_CTL_SERR_NONFATAL	0x0002
-#define	PCIEM_ROOT_CTL_SERR_FATAL	0x0004
-#define	PCIEM_ROOT_CTL_PME		0x0008
-#define	PCIEM_ROOT_CTL_CRS_VIS		0x0010
-#define	PCIER_ROOT_CAP		0x1e
-#define	PCIEM_ROOT_CAP_CRS_VIS		0x0001
-#define	PCIER_ROOT_STA		0x20
-#define	PCIEM_ROOT_STA_PME_REQID_MASK	0x0000ffff
-#define	PCIEM_ROOT_STA_PME_STATUS	0x00010000
-#define	PCIEM_ROOT_STA_PME_PEND		0x00020000
-#define	PCIER_DEVICE_CAP2	0x24
-#define	PCIEM_CAP2_ARI		0x20
-#define	PCIER_DEVICE_CTL2	0x28
-#define	PCIEM_CTL2_COMP_TIMEOUT_VAL	0x000f
-#define	PCIEM_CTL2_COMP_TIMEOUT_DIS	0x0010
-#define	PCIEM_CTL2_ARI			0x0020
-#define	PCIEM_CTL2_ATOMIC_REQ_ENABLE	0x0040
-#define	PCIEM_CTL2_ATOMIC_EGR_BLOCK	0x0080
-#define	PCIEM_CTL2_ID_ORDERED_REQ_EN	0x0100
-#define	PCIEM_CTL2_ID_ORDERED_CMP_EN	0x0200
-#define	PCIEM_CTL2_LTR_ENABLE		0x0400
-#define	PCIEM_CTL2_OBFF			0x6000
-#define	PCIEM_OBFF_DISABLE		0x0000
-#define	PCIEM_OBFF_MSGA_ENABLE		0x2000
-#define	PCIEM_OBFF_MSGB_ENABLE		0x4000
-#define	PCIEM_OBFF_WAKE_ENABLE		0x6000
-#define	PCIEM_CTL2_END2END_TLP		0x8000
-#define	PCIER_DEVICE_STA2	0x2a
-#define	PCIER_LINK_CAP2		0x2c
-#define	PCIER_LINK_CTL2		0x30
-#define	PCIER_LINK_STA2		0x32
-#define	PCIER_SLOT_CAP2		0x34
-#define	PCIER_SLOT_CTL2		0x38
-#define	PCIER_SLOT_STA2		0x3a
-
-/* MSI-X definitions */
-#define	PCIR_MSIX_CTRL		0x2
-#define	PCIM_MSIXCTRL_MSIX_ENABLE	0x8000
-#define	PCIM_MSIXCTRL_FUNCTION_MASK	0x4000
-#define	PCIM_MSIXCTRL_TABLE_SIZE	0x07FF
-#define	PCIR_MSIX_TABLE		0x4
-#define	PCIR_MSIX_PBA		0x8
-#define	PCIM_MSIX_BIR_MASK		0x7
-#define	PCIM_MSIX_BIR_BAR_10		0
-#define	PCIM_MSIX_BIR_BAR_14		1
-#define	PCIM_MSIX_BIR_BAR_18		2
-#define	PCIM_MSIX_BIR_BAR_1C		3
-#define	PCIM_MSIX_BIR_BAR_20		4
-#define	PCIM_MSIX_BIR_BAR_24		5
-#define	PCIM_MSIX_VCTRL_MASK		0x1
-
-/* PCI Advanced Features definitions */
-#define	PCIR_PCIAF_CAP		0x3
-#define	PCIM_PCIAFCAP_TP	0x01
-#define	PCIM_PCIAFCAP_FLR	0x02
-#define	PCIR_PCIAF_CTRL		0x4
-#define	PCIR_PCIAFCTRL_FLR	0x01
-#define	PCIR_PCIAF_STATUS	0x5
-#define	PCIR_PCIAFSTATUS_TP	0x01
-
-/* Advanced Error Reporting */
-#define	PCIR_AER_UC_STATUS	0x04
-#define	PCIM_AER_UC_TRAINING_ERROR	0x00000001
-#define	PCIM_AER_UC_DL_PROTOCOL_ERROR	0x00000010
-#define	PCIM_AER_UC_SURPRISE_LINK_DOWN	0x00000020
-#define	PCIM_AER_UC_POISONED_TLP	0x00001000
-#define	PCIM_AER_UC_FC_PROTOCOL_ERROR	0x00002000
-#define	PCIM_AER_UC_COMPLETION_TIMEOUT	0x00004000
-#define	PCIM_AER_UC_COMPLETER_ABORT	0x00008000
-#define	PCIM_AER_UC_UNEXPECTED_COMPLETION 0x00010000
-#define	PCIM_AER_UC_RECEIVER_OVERFLOW	0x00020000
-#define	PCIM_AER_UC_MALFORMED_TLP	0x00040000
-#define	PCIM_AER_UC_ECRC_ERROR		0x00080000
-#define	PCIM_AER_UC_UNSUPPORTED_REQUEST	0x00100000
-#define	PCIM_AER_UC_ACS_VIOLATION	0x00200000
-#define	PCIM_AER_UC_INTERNAL_ERROR	0x00400000
-#define	PCIM_AER_UC_MC_BLOCKED_TLP	0x00800000
-#define	PCIM_AER_UC_ATOMIC_EGRESS_BLK	0x01000000
-#define	PCIM_AER_UC_TLP_PREFIX_BLOCKED	0x02000000
-#define	PCIR_AER_UC_MASK	0x08	/* Shares bits with UC_STATUS */
-#define	PCIR_AER_UC_SEVERITY	0x0c	/* Shares bits with UC_STATUS */
-#define	PCIR_AER_COR_STATUS	0x10
-#define	PCIM_AER_COR_RECEIVER_ERROR	0x00000001
-#define	PCIM_AER_COR_BAD_TLP		0x00000040
-#define	PCIM_AER_COR_BAD_DLLP		0x00000080
-#define	PCIM_AER_COR_REPLAY_ROLLOVER	0x00000100
-#define	PCIM_AER_COR_REPLAY_TIMEOUT	0x00001000
-#define	PCIM_AER_COR_ADVISORY_NF_ERROR	0x00002000
-#define	PCIM_AER_COR_INTERNAL_ERROR	0x00004000
-#define	PCIM_AER_COR_HEADER_LOG_OVFLOW	0x00008000
-#define	PCIR_AER_COR_MASK	0x14	/* Shares bits with COR_STATUS */
-#define	PCIR_AER_CAP_CONTROL	0x18
-#define	PCIM_AER_FIRST_ERROR_PTR	0x0000001f
-#define	PCIM_AER_ECRC_GEN_CAPABLE	0x00000020
-#define	PCIM_AER_ECRC_GEN_ENABLE	0x00000040
-#define	PCIM_AER_ECRC_CHECK_CAPABLE	0x00000080
-#define	PCIM_AER_ECRC_CHECK_ENABLE	0x00000100
-#define	PCIM_AER_MULT_HDR_CAPABLE	0x00000200
-#define	PCIM_AER_MULT_HDR_ENABLE	0x00000400
-#define	PCIM_AER_TLP_PREFIX_LOG_PRESENT	0x00000800
-#define	PCIR_AER_HEADER_LOG	0x1c
-#define	PCIR_AER_ROOTERR_CMD	0x2c	/* Only for root complex ports */
-#define	PCIM_AER_ROOTERR_COR_ENABLE	0x00000001
-#define	PCIM_AER_ROOTERR_NF_ENABLE	0x00000002
-#define	PCIM_AER_ROOTERR_F_ENABLE	0x00000004
-#define	PCIR_AER_ROOTERR_STATUS	0x30	/* Only for root complex ports */
-#define	PCIM_AER_ROOTERR_COR_ERR	0x00000001
-#define	PCIM_AER_ROOTERR_MULTI_COR_ERR	0x00000002
-#define	PCIM_AER_ROOTERR_UC_ERR		0x00000004
-#define	PCIM_AER_ROOTERR_MULTI_UC_ERR	0x00000008
-#define	PCIM_AER_ROOTERR_FIRST_UC_FATAL	0x00000010
-#define	PCIM_AER_ROOTERR_NF_ERR		0x00000020
-#define	PCIM_AER_ROOTERR_F_ERR		0x00000040
-#define	PCIM_AER_ROOTERR_INT_MESSAGE	0xf8000000
-#define	PCIR_AER_COR_SOURCE_ID	0x34	/* Only for root complex ports */
-#define	PCIR_AER_ERR_SOURCE_ID	0x36	/* Only for root complex ports */
-#define	PCIR_AER_TLP_PREFIX_LOG	0x38	/* Only for TLP prefix functions */
-
-/* Virtual Channel definitions */
-#define	PCIR_VC_CAP1		0x04
-#define	PCIM_VC_CAP1_EXT_COUNT		0x00000007
-#define	PCIM_VC_CAP1_LOWPRI_EXT_COUNT	0x00000070
-#define	PCIR_VC_CAP2		0x08
-#define	PCIR_VC_CONTROL		0x0C
-#define	PCIR_VC_STATUS		0x0E
-#define	PCIR_VC_RESOURCE_CAP(n)	(0x10 + (n) * 0x0C)
-#define	PCIR_VC_RESOURCE_CTL(n)	(0x14 + (n) * 0x0C)
-#define	PCIR_VC_RESOURCE_STA(n)	(0x18 + (n) * 0x0C)
-
-/* Serial Number definitions */
-#define	PCIR_SERIAL_LOW		0x04
-#define	PCIR_SERIAL_HIGH	0x08
-
diff --git a/include.new/dev/ppbus/lpt.h b/include.new/dev/ppbus/lpt.h
deleted file mode 100644
index 736e6aa..0000000
--- a/include.new/dev/ppbus/lpt.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Copyright (c) 1997, 1999 Nicolas Souchu
- * 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.
- *
- * 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.
- *
- * Distantly from :
- *	@(#)lptreg.h      1.1 (Berkeley) 12/19/90
- *	Id: lptreg.h,v 1.6 1997/02/22 09:36:52 peter Exp
- *	From Id: nlpt.h,v 1.3 1999/01/10 12:04:54 nsouch Exp
- *
- * $FreeBSD: releng/10.2/sys/dev/ppbus/lpt.h 185003 2008-11-16 17:42:02Z jhb $
- */
-
-/*
- * AT Parallel Port (for lineprinter)
- * Interface port and bit definitions
- * Written by William Jolitz 12/18/90
- * Copyright (C) William Jolitz 1990
- */
-
-#ifndef __LPT_H
-#define	__LPT_H
-
-/* machine independent definitions, it shall only depend on the ppbus
- * parallel port model */
-
-					/* PIN */
-#define	LPS_NERR		0x08	/* 15  printer no error */
-#define	LPS_SEL			0x10	/* 13  printer selected */
-#define	LPS_OUT			0x20	/* 12  printer out of paper */
-#define	LPS_NACK		0x40	/* 10  printer no ack of data */
-#define	LPS_NBSY		0x80	/* 11  printer busy */
-
-#define	LPC_STB			0x01	/*  1  strobe data to printer */
-#define	LPC_AUTOL		0x02	/* 14  automatic linefeed */
-#define	LPC_NINIT		0x04	/* 16  initialize printer */
-#define	LPC_SEL			0x08	/* 17  printer selected */
-#define	LPC_ENA			0x10	/*  -  enable IRQ */
-
-#endif
diff --git a/include.new/dev/ppbus/lptio.h b/include.new/dev/ppbus/lptio.h
deleted file mode 100644
index 16feb13..0000000
--- a/include.new/dev/ppbus/lptio.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-
- *  Copyright (C) 1994 Geoffrey M. Rehmet
- *
- *  This program is free software; you may redistribute it and/or
- *  modify it, provided that it retain the above copyright notice
- *  and the following disclaimer.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
- *
- * $FreeBSD: releng/10.2/sys/dev/ppbus/lptio.h 139749 2005-01-06 01:43:34Z imp $
- */
-
-#ifndef	_DEV_PPBUS_LPT_H_
-#define	_DEV_PPBUS_LPT_H_
-
-#include <sys/ioccom.h>
-
-#define	LPT_IRQ		_IOW('p', 1, long)	/* set interrupt status */
-
-#endif /* !_DEV_PPBUS_LPT_H_ */
diff --git a/include.new/dev/ppbus/ppb_1284.h b/include.new/dev/ppbus/ppb_1284.h
deleted file mode 100644
index 9719e1b..0000000
--- a/include.new/dev/ppbus/ppb_1284.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * Copyright (c) 1997 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/ppbus/ppb_1284.h 55957 2000-01-14 08:03:15Z nsouch $
- *
- */
-#ifndef __1284_H
-#define __1284_H
-
-/*
- * IEEE1284 signals
- */
-
-/* host driven signals */
-
-#define nHostClk	STROBE
-#define Write		STROBE
-
-#define nHostBusy	AUTOFEED
-#define nHostAck	AUTOFEED
-#define DStrb		AUTOFEED
-
-#define nReveseRequest	nINIT
-
-#define nActive1284	SELECTIN
-#define AStrb		SELECTIN
-
-/* peripheral driven signals */
-
-#define nDataAvail	nFAULT
-#define nPeriphRequest	nFAULT
-
-#define Xflag		SELECT
-
-#define AckDataReq	PERROR
-#define nAckReverse	PERROR
-
-#define nPtrBusy	nBUSY
-#define nPeriphAck	nBUSY
-#define Wait		nBUSY
-
-#define PtrClk		nACK
-#define PeriphClk	nACK
-#define Intr		nACK
-
-/* request mode values */
-#define NIBBLE_1284_NORMAL	0x0
-#define NIBBLE_1284_REQUEST_ID	0x4
-#define BYTE_1284_NORMAL	0x1
-#define BYTE_1284_REQUEST_ID	0x5
-#define ECP_1284_NORMAL		0x10
-#define ECP_1284_REQUEST_ID	0x14
-#define ECP_1284_RLE		0x30
-#define ECP_1284_RLE_REQUEST_ID	0x34
-#define EPP_1284_NORMAL		0x40
-#define EXT_LINK_1284_NORMAL	0x80
-
-/* ieee1284 mode options */
-#define PPB_REQUEST_ID		0x1
-#define PPB_USE_RLE		0x2
-#define PPB_EXTENSIBILITY_LINK	0x4
-
-/* ieee1284 errors */
-#define PPB_NO_ERROR		0
-#define PPB_MODE_UNSUPPORTED	1	/* mode not supported by peripheral */
-#define PPB_NOT_IEEE1284	2	/* not an IEEE1284 compliant periph. */
-#define PPB_TIMEOUT		3	/* timeout */
-#define PPB_INVALID_MODE	4	/* current mode is incorrect */
-
-/* ieee1284 host side states */
-#define PPB_ERROR			0
-#define PPB_FORWARD_IDLE		1
-#define PPB_NEGOCIATION			2
-#define PPB_SETUP			3
-#define PPB_ECP_FORWARD_IDLE		4
-#define PPB_FWD_TO_REVERSE		5
-#define PPB_REVERSE_IDLE		6
-#define PPB_REVERSE_TRANSFER		7
-#define PPB_REVERSE_TO_FWD		8
-#define PPB_EPP_IDLE			9
-#define PPB_TERMINATION			10
-
-/* peripheral side states */
-#define PPB_PERIPHERAL_NEGOCIATION	11
-#define PPB_PERIPHERAL_IDLE		12
-#define PPB_PERIPHERAL_TRANSFER		13
-#define PPB_PERIPHERAL_TERMINATION	14
-
-extern int nibble_1284_inbyte(device_t, char *);
-extern int byte_1284_inbyte(device_t, char *);
-extern int spp_1284_read(device_t, int, char *, int, int *);
-
-extern int ppb_1284_negociate(device_t, int, int);
-extern int ppb_1284_terminate(device_t);
-extern int ppb_1284_read_id(device_t, int, char *, int, int *);
-extern int ppb_1284_read(device_t, int, char *, int, int *);
-extern int ppb_1284_get_state(device_t bus);
-extern int ppb_1284_set_state(device_t bus, int state);
-
-extern int ppb_peripheral_terminate(device_t, int);
-extern int ppb_peripheral_negociate(device_t, int, int);
-extern int byte_peripheral_write(device_t, char *, int, int *);
-
-#endif
diff --git a/include.new/dev/ppbus/ppb_msq.h b/include.new/dev/ppbus/ppb_msq.h
deleted file mode 100644
index bd1b81e..0000000
--- a/include.new/dev/ppbus/ppb_msq.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * Copyright (c) 1998 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/ppbus/ppb_msq.h 106696 2002-11-09 12:55:07Z alfred $
- *
- */
-#ifndef __PPB_MSQ_H
-#define __PPB_MSQ_H
-
-/*
- * Basic definitions
- */
-
-/* microsequence parameter descriptor */
-#define MS_INS_MASK	0x00ff	/* mask to retrieve the instruction position < 256	XXX */
-#define MS_ARG_MASK	0x0f00	/* mask to retrieve the argument number */
-#define MS_TYP_MASK	0xf000	/* mask to retrieve the type of the param */
-
-/* offset of each mask (see above) */
-#define MS_INS_OFFSET	0
-#define MS_ARG_OFFSET	8
-#define MS_TYP_OFFSET	12
-
-/* list of parameter types */
-#define MS_TYP_INT	0x0	/* integer */
-#define MS_TYP_CHA	0x1	/* character */
-#define MS_TYP_PTR	0x2	/* void pointer */
-#define MS_TYP_FUN	0x3	/* function pointer */
-
-#define MS_PARAM(ins,arg,typ) \
-	(((ins<<MS_INS_OFFSET) & MS_INS_MASK) | \
-	 ((arg<<MS_ARG_OFFSET) & MS_ARG_MASK) | \
-	 ((typ<<MS_TYP_OFFSET) & MS_TYP_MASK))
-
-#define MS_INS(param) ((param & MS_INS_MASK) >> MS_INS_OFFSET)
-#define MS_ARG(param) ((param & MS_ARG_MASK) >> MS_ARG_OFFSET)
-#define MS_TYP(param) ((param & MS_TYP_MASK) >> MS_TYP_OFFSET)
-
-/* microsequence opcodes - do not change! */
-#define MS_OP_GET       0	/* get <ptr>, <len>			*/
-#define MS_OP_PUT       1	/* put <ptr>, <len>			*/
-
-#define MS_OP_RFETCH	2	/* rfetch <reg>, <mask>, <ptr>		*/
-#define MS_OP_RSET	3	/* rset <reg>, <mask>, <mask>		*/
-#define MS_OP_RASSERT	4	/* rassert <reg>, <mask>		*/
-#define MS_OP_DELAY     5	/* delay <val>				*/
-#define MS_OP_SET       6	/* set <val>				*/
-#define MS_OP_DBRA      7	/* dbra <offset>			*/
-#define MS_OP_BRSET     8	/* brset <mask>, <offset>		*/
-#define MS_OP_BRCLEAR   9	/* brclear <mask>, <offset>		*/
-#define MS_OP_RET       10	/* ret <retcode>			*/
-#define MS_OP_C_CALL	11	/* c_call <function>, <parameter>	*/
-#define MS_OP_PTR	12	/* ptr <pointer>			*/
-#define MS_OP_ADELAY	13	/* adelay <val>				*/
-#define MS_OP_BRSTAT	14	/* brstat <mask>, <mask>, <offset>	*/
-#define MS_OP_SUBRET	15	/* subret <code>			*/
-#define MS_OP_CALL	16	/* call <microsequence>			*/
-#define MS_OP_RASSERT_P	17	/* rassert_p <iter>, <reg>		*/
-#define MS_OP_RFETCH_P	18	/* rfetch_p <iter>, <reg>, <mask>	*/
-#define MS_OP_TRIG	19	/* trigger <reg>, <len>, <array>	*/
-
-/* common masks */
-#define MS_CLEAR_ALL	0x0
-#define MS_ASSERT_NONE	0x0
-#define MS_ASSERT_ALL	0xff
-#define MS_FETCH_ALL	0xff
-
-/* undefined parameter value */
-#define MS_NULL		0
-#define MS_UNKNOWN	MS_NULL
-
-/* predifined parameters */
-#define MS_ACCUM	-1	/* use accum previously set by MS_OP_SET */
-
-/* these are register numbers according to our PC-like parallel port model */
-#define MS_REG_DTR	0x0
-#define MS_REG_STR	0x1
-#define MS_REG_CTR	0x2
-#define MS_REG_EPP_A	0x3
-#define MS_REG_EPP_D	0x4
-
-/*
- * Microsequence macro abstraction level
- */
-
-/* register operations */
-#define MS_RSET(reg,assert,clear) { MS_OP_RSET, {{ (reg) }, { (assert) }, { (clear) }}}
-#define MS_RASSERT(reg,byte)	  { MS_OP_RASSERT, { { (reg) }, { (byte) }}}
-#define MS_RCLR(reg,clear)	  { MS_OP_RSET, {{ (reg) }, { MS_ASSERT_NONE }, { (clear) }}}
-
-#define MS_RFETCH(reg,mask,ptr) { MS_OP_RFETCH, {{ (reg) }, { (mask) }, { (ptr) }}}
-
-/* trigger the port with array[char, delay,...] */
-#define MS_TRIG(reg,len,array)	{ MS_OP_TRIG, {{ (reg) }, { (len) }, { (array) }}}
-
-/* assert/fetch from/to ptr */
-#define MS_RASSERT_P(n,reg)	  { MS_OP_RASSERT_P, {{ (n) }, { (reg) }}}
-#define MS_RFETCH_P(n,reg,mask)	  { MS_OP_RFETCH_P, {{ (n) }, { (reg) }, { (mask) }}}
-
-/* ptr manipulation */
-#define MS_PTR(ptr)	{ MS_OP_PTR, {{ (ptr) }}}
-
-#define MS_DASS(byte) MS_RASSERT(MS_REG_DTR,byte)
-#define MS_SASS(byte) MS_RASSERT(MS_REG_STR,byte)
-#define MS_CASS(byte) MS_RASSERT(MS_REG_CTR,byte)
-
-#define MS_SET(accum)		{ MS_OP_SET, {{ (accum) }}}
-#define MS_BRSET(mask,offset)	{ MS_OP_BRSET, {{ (mask) }, { (offset) }}}
-#define MS_DBRA(offset)		{ MS_OP_DBRA, {{ (offset) }}}
-#define MS_BRCLEAR(mask,offset)	{ MS_OP_BRCLEAR, {{ (mask) }, { (offset) }}}
-#define MS_BRSTAT(mask_set,mask_clr,offset) \
-		{ MS_OP_BRSTAT, {{ mask_set }, { mask_clr }, { (offset) }}}
-
-/* C function or submicrosequence call */
-#define MS_C_CALL(function,parameter) \
-		{ MS_OP_C_CALL, {{ (function) }, { (parameter) }}}
-#define MS_CALL(microseq) { MS_OP_CALL, {{ (microseq) }}}
-
-/* mode dependent read/write operations
- * ppb_MS_xxx_init() call required otherwise default is
- * IEEE1284 operating mode */
-#define MS_PUT(ptr,len) { MS_OP_PUT, {{ (ptr) }, { (len) }}}
-#define MS_GET(ptr,len) { MS_OP_GET, {{ (ptr) }, { (len) }}}
-
-/* delay in microseconds */
-#define MS_DELAY(udelay) { MS_OP_DELAY, {{ (udelay) }}}
-
-/* asynchroneous delay in ms */
-#define MS_ADELAY(mdelay) { MS_OP_ADELAY, {{ (mdelay) }}}
-
-/* return from submicrosequence execution or microseqence execution */
-#define MS_SUBRET(code)	{ MS_OP_SUBRET,	{{ (code) }}}
-#define MS_RET(code)	{ MS_OP_RET, {{ (code) }}}
-
-/*
- * Function abstraction level
- */
-
-#define ppb_MS_GET_init(bus,dev,body) ppb_MS_init(bus, dev, body, MS_OP_GET)
-
-#define ppb_MS_PUT_init(bus,dev,body) ppb_MS_init(bus, dev, body, MS_OP_PUT)
-
-extern int ppb_MS_init(
-		device_t,			/* ppbus bus */
-		device_t,			/* ppbus device */
-		struct ppb_microseq *,		/* loop msq to assign */
-		int opcode			/* MS_OP_GET, MS_OP_PUT */
-		);
-
-extern int ppb_MS_init_msq(
-		struct ppb_microseq *,
-		int,				/* number of parameters */
-		...				/* descriptor, value, ... */
-		);
-
-extern int ppb_MS_exec(
-		device_t,			/* ppbus bus */
-		device_t,			/* ppbus device */
-		int,				/* microseq opcode */
-		union ppb_insarg,		/* param1 */
-		union ppb_insarg,		/* param2 */
-		union ppb_insarg,		/* param3 */
-		int *				/* returned value */
-		);
-
-extern int ppb_MS_loop(
-		device_t,			/* ppbus bus */
-		device_t,			/* ppbus device */
-		struct ppb_microseq *,		/* prologue msq of loop */
-		struct ppb_microseq *,		/* body msq of loop */
-		struct ppb_microseq *,		/* epilogue msq of loop */
-		int,				/* number of iter */
-		int *				/* returned value */
-		);
-
-extern int ppb_MS_microseq(
-		device_t,			/* ppbus bus */
-		device_t,			/* ppbus device */
-		struct ppb_microseq *,		/* msq to execute */
-		int *				/* returned value */
-		);
-
-#endif
diff --git a/include.new/dev/ppbus/ppbconf.h b/include.new/dev/ppbus/ppbconf.h
deleted file mode 100644
index d2c1521..0000000
--- a/include.new/dev/ppbus/ppbconf.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/ppbus/ppbconf.h 188093 2009-02-03 19:49:21Z jhb $
- *
- */
-#ifndef __PPBCONF_H
-#define __PPBCONF_H
-
-#define n(flags) (~(flags) & (flags))
-
-/*
- * Parallel Port Chipset control bits.
- */
-#define STROBE		0x01
-#define AUTOFEED	0x02
-#define nINIT		0x04
-#define SELECTIN	0x08
-#define IRQENABLE	0x10
-#define PCD		0x20
-
-#define nSTROBE		n(STROBE)
-#define nAUTOFEED	n(AUTOFEED)
-#define INIT		n(nINIT)
-#define nSELECTIN	n(SELECTIN)
-#define nPCD		n(PCD)
-
-/*
- * Parallel Port Chipset status bits.
- */
-#define TIMEOUT		0x01
-#define nFAULT		0x08
-#define SELECT		0x10
-#define PERROR		0x20
-#define nACK		0x40
-#define nBUSY		0x80
-
-#ifdef _KERNEL
-#include <sys/queue.h>
-
-/*
- * Parallel Port Bus sleep/wakeup queue.
- */
-#define PPBPRI	(PZERO+8)
-
-/*
- * Parallel Port Chipset mode masks.
- * NIBBLE mode is supposed to be available under each other modes.
- */
-#define PPB_COMPATIBLE	0x0	/* Centronics compatible mode */
-
-#define PPB_NIBBLE	0x1	/* reverse 4 bit mode */
-#define PPB_PS2		0x2	/* PS/2 byte mode */
-#define PPB_EPP		0x4	/* EPP mode, 32 bit */
-#define PPB_ECP		0x8	/* ECP mode */
-
-/* mode aliases */
-#define PPB_SPP		PPB_NIBBLE|PPB_PS2
-#define PPB_BYTE	PPB_PS2
-
-#define PPB_MASK		0x0f
-#define PPB_OPTIONS_MASK	0xf0
-
-#define PPB_IS_EPP(mode) (mode & PPB_EPP)
-#define PPB_IN_EPP_MODE(bus) (PPB_IS_EPP (ppb_get_mode (bus)))
-#define PPB_IN_NIBBLE_MODE(bus) (ppb_get_mode (bus) & PPB_NIBBLE)
-#define PPB_IN_PS2_MODE(bus) (ppb_get_mode (bus) & PPB_PS2)
-
-/*
- * Structure to store status information.
- */
-struct ppb_status {
-	unsigned char status;
-
-	unsigned int timeout:1;
-	unsigned int error:1;
-	unsigned int select:1;
-	unsigned int paper_end:1;
-	unsigned int ack:1;
-	unsigned int busy:1;
-};
-
-/* Parallel port bus I/O opcodes */
-#define PPB_OUTSB_EPP	1
-#define PPB_OUTSW_EPP	2
-#define PPB_OUTSL_EPP	3
-#define PPB_INSB_EPP	4
-#define PPB_INSW_EPP	5
-#define PPB_INSL_EPP	6
-#define PPB_RDTR	7
-#define PPB_RSTR	8
-#define PPB_RCTR	9
-#define PPB_REPP_A	10
-#define PPB_REPP_D	11
-#define PPB_RECR	12
-#define PPB_RFIFO	13
-#define PPB_WDTR	14
-#define PPB_WSTR	15
-#define PPB_WCTR	16
-#define PPB_WEPP_A	17
-#define PPB_WEPP_D	18
-#define PPB_WECR	19
-#define PPB_WFIFO	20
-
-/*
- * How tsleep() is called in ppb_request_bus().
- */
-#define PPB_DONTWAIT	0
-#define PPB_NOINTR	0
-#define PPB_WAIT	0x1
-#define PPB_INTR	0x2
-#define PPB_POLL	0x4
-#define PPB_FOREVER	-1
-
-/*
- * Microsequence stuff.
- */
-#define PPB_MS_MAXLEN	64		/* XXX according to MS_INS_MASK */
-#define PPB_MS_MAXARGS	3		/* according to MS_ARG_MASK */
-
-/* maximum number of mode dependent
- * submicrosequences for in/out operations
- */
-#define PPB_MAX_XFER	6
-
-union ppb_insarg {
-	int	i;
-	void	*p;
-	char	*c;
-	int	(* f)(void *, char *);
-};
-
-struct ppb_microseq {
-	int			opcode;			/* microins. opcode */
-	union ppb_insarg	arg[PPB_MS_MAXARGS];	/* arguments */
-};
-
-/* microseqences used for GET/PUT operations */
-struct ppb_xfer {
-	struct ppb_microseq *loop;		/* the loop microsequence */
-};
-
-/*
- * Parallel Port Bus Device structure.
- */
-struct ppb_data;			/* see below */
-
-struct ppb_context {
-	int valid;			/* 1 if the struct is valid */
-	int mode;			/* XXX chipset operating mode */
-
-	struct microseq *curpc;		/* pc in curmsq */
-	struct microseq *curmsq;	/* currently executed microseqence */
-};
-
-/*
- * List of IVARS available to ppb device drivers
- */
-#define PPBUS_IVAR_MODE 0
-
-/* other fields are reserved to the ppbus internals */
-
-struct ppb_device {
-
-	const char *name;		/* name of the device */
-
-	u_int flags;			/* flags */
-
-	struct ppb_context ctx;		/* context of the device */
-
-					/* mode dependent get msq. If NULL,
-					 * IEEE1284 code is used */
-	struct ppb_xfer
-		get_xfer[PPB_MAX_XFER];
-
-					/* mode dependent put msq. If NULL,
-					 * IEEE1284 code is used */
-	struct ppb_xfer
-		put_xfer[PPB_MAX_XFER];
-
-	driver_intr_t *intr_hook;
-	void *intr_arg;
-};
-
-/* EPP standards */
-#define EPP_1_9		0x0			/* default */
-#define EPP_1_7		0x1
-
-/* Parallel Port Chipset IVARS */		/* elsewhere XXX */
-#define PPC_IVAR_EPP_PROTO	0
-#define PPC_IVAR_LOCK		1
-#define PPC_IVAR_INTR_HANDLER	2
-
-/*
- * Maximum size of the PnP info string
- */
-#define PPB_PnP_STRING_SIZE	256			/* XXX */
-
-/*
- * Parallel Port Bus structure.
- */
-struct ppb_data {
-
-#define PPB_PnP_PRINTER	0
-#define PPB_PnP_MODEM	1
-#define PPB_PnP_NET	2
-#define PPB_PnP_HDC	3
-#define PPB_PnP_PCMCIA	4
-#define PPB_PnP_MEDIA	5
-#define PPB_PnP_FDC	6
-#define PPB_PnP_PORTS	7
-#define PPB_PnP_SCANNER	8
-#define PPB_PnP_DIGICAM	9
-#define PPB_PnP_UNKNOWN	10
-	int class_id;		/* not a PnP device if class_id < 0 */
-
-	int state;		/* current IEEE1284 state */
-	int error;		/* last IEEE1284 error */
-
-	int mode;		/* IEEE 1284-1994 mode
-				 * NIBBLE, PS2, EPP or ECP */
-
-	device_t ppb_owner;	/* device which owns the bus */
-
-	struct mtx *ppc_lock;	/* lock of parent device */
-	struct resource *ppc_irq_res;
-};
-
-struct callout;
-
-typedef int (*ppc_intr_handler)(void *);
-
-extern int ppb_attach_device(device_t);
-extern int ppb_request_bus(device_t, device_t, int);
-extern int ppb_release_bus(device_t, device_t);
-
-/* bus related functions */
-extern void ppb_lock(device_t);
-extern void ppb_unlock(device_t);
-extern void _ppb_assert_locked(device_t, const char *, int);
-extern void ppb_init_callout(device_t, struct callout *, int);
-extern int ppb_sleep(device_t, void *, int, const char *, int);
-extern int ppb_get_status(device_t, struct ppb_status *);
-extern int ppb_poll_bus(device_t, int, char, char, int);
-extern int ppb_reset_epp_timeout(device_t);
-extern int ppb_ecp_sync(device_t);
-extern int ppb_get_epp_protocol(device_t);
-extern int ppb_set_mode(device_t, int);		/* returns old mode */
-extern int ppb_get_mode(device_t);		/* returns current mode */
-extern int ppb_write(device_t, char *, int, int);
-
-#ifdef INVARIANTS
-#define ppb_assert_locked(dev)	_ppb_assert_locked(dev, __FILE__, __LINE__)
-#else
-#define ppb_assert_locked(dev)
-#endif
-#endif /* _KERNEL */
-
-#endif /* !__PPBCONF_H */
diff --git a/include.new/dev/ppbus/ppbio.h b/include.new/dev/ppbus/ppbio.h
deleted file mode 100644
index a23479b..0000000
--- a/include.new/dev/ppbus/ppbio.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 1999 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/ppbus/ppbio.h 55939 2000-01-14 00:18:06Z nsouch $
- *
- */
-
-#ifndef __PPBIO_H
-#define __PPBIO_H
-
-/*
- * Set of ppbus i/o routines callable from ppbus device drivers
- */
-
-#define ppb_outsb_epp(dev,buf,cnt)					    \
-		(PPBUS_IO(device_get_parent(dev), PPB_OUTSB_EPP, buf, cnt, 0))
-#define ppb_outsw_epp(dev,buf,cnt)					    \
-		(PPBUS_IO(device_get_parent(dev), PPB_OUTSW_EPP, buf, cnt, 0))
-#define ppb_outsl_epp(dev,buf,cnt)					    \
-		(PPBUS_IO(device_get_parent(dev), PPB_OUTSL_EPP, buf, cnt, 0))
-
-#define ppb_insb_epp(dev,buf,cnt)					    \
-		(PPBUS_IO(device_get_parent(dev), PPB_INSB_EPP, buf, cnt, 0))
-#define ppb_insw_epp(dev,buf,cnt)					    \
-		(PPBUS_IO(device_get_parent(dev), PPB_INSW_EPP, buf, cnt, 0))
-#define ppb_insl_epp(dev,buf,cnt)					    \
-		(PPBUS_IO(device_get_parent(dev), PPB_INSL_EPP, buf, cnt, 0))
-
-#define ppb_repp_A(dev) 						    \
-		(PPBUS_IO(device_get_parent(dev), PPB_REPP_A, 0, 0, 0))
-#define ppb_repp_D(dev) 						    \
-		(PPBUS_IO(device_get_parent(dev), PPB_REPP_D, 0, 0, 0))
-#define ppb_recr(dev)						    	    \
-		(PPBUS_IO(device_get_parent(dev), PPB_RECR, 0, 0, 0))
-#define ppb_rfifo(dev)							    \
-		(PPBUS_IO(device_get_parent(dev), PPB_RFIFO, 0, 0, 0))
-
-#define ppb_wepp_A(dev,byte)						    \
-		(PPBUS_IO(device_get_parent(dev), PPB_WEPP_A, 0, 0, byte))
-#define ppb_wepp_D(dev,byte)						    \
-		(PPBUS_IO(device_get_parent(dev), PPB_WEPP_D, 0, 0, byte))
-#define ppb_wecr(dev,byte)						    \
-		(PPBUS_IO(device_get_parent(dev), PPB_WECR, 0, 0, byte))
-#define ppb_wfifo(dev,byte)						    \
-		(PPBUS_IO(device_get_parent(dev), PPB_WFIFO, 0, 0, byte))
-
-#define ppb_rdtr(dev)							    \
-		(PPBUS_IO(device_get_parent(dev), PPB_RDTR, 0, 0, 0))
-#define ppb_rstr(dev)							    \
-		(PPBUS_IO(device_get_parent(dev), PPB_RSTR, 0, 0, 0))
-#define ppb_rctr(dev)							    \
-		(PPBUS_IO(device_get_parent(dev), PPB_RCTR, 0, 0, 0))
-
-#define ppb_wdtr(dev,byte)						    \
-		(PPBUS_IO(device_get_parent(dev), PPB_WDTR, 0, 0, byte))
-#define ppb_wstr(dev,byte)						    \
-		(PPBUS_IO(device_get_parent(dev), PPB_WSTR, 0, 0, byte))
-#define ppb_wctr(dev,byte)						    \
-		(PPBUS_IO(device_get_parent(dev), PPB_WCTR, 0, 0, byte))
-
-#endif
diff --git a/include.new/dev/ppbus/ppi.h b/include.new/dev/ppbus/ppi.h
deleted file mode 100644
index 0227ad7..0000000
--- a/include.new/dev/ppbus/ppi.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1997 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/ppbus/ppi.h 185003 2008-11-16 17:42:02Z jhb $
- *
- */
-#ifndef __PPI_H
-#define	__PPI_H
-
-#ifndef _KERNEL
-# include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-#define	PPIGDATA	_IOR('P', 10, u_int8_t)
-#define	PPIGSTATUS	_IOR('P', 11, u_int8_t)
-#define	PPIGCTRL	_IOR('P', 12, u_int8_t)
-#define	PPIGEPPD	_IOR('P', 13, u_int8_t)
-#define	PPIGECR		_IOR('P', 14, u_int8_t)
-#define	PPIGFIFO	_IOR('P', 15, u_int8_t)
-
-#define	PPISDATA	_IOW('P', 16, u_int8_t)
-#define	PPISSTATUS	_IOW('P', 17, u_int8_t)
-#define	PPISCTRL	_IOW('P', 18, u_int8_t)
-#define	PPISEPPD	_IOW('P', 19, u_int8_t)
-#define	PPISECR		_IOW('P', 20, u_int8_t)
-#define	PPISFIFO	_IOW('P', 21, u_int8_t)
-
-#define	PPIGEPPA	_IOR('P', 22, u_int8_t)
-#define	PPISEPPA	_IOR('P', 23, u_int8_t)
-
-#endif
diff --git a/include.new/dev/ppbus/vpoio.h b/include.new/dev/ppbus/vpoio.h
deleted file mode 100644
index 7f09fa0..0000000
--- a/include.new/dev/ppbus/vpoio.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1998 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/ppbus/vpoio.h 185003 2008-11-16 17:42:02Z jhb $
- *
- */
-#ifndef __VP0IO_H
-#define __VP0IO_H
-
-/*
- * The ZIP drive cannot act as an initiator.
- */
-#define VP0_INITIATOR	0x7
-
-#define VP0_ESELECT_TIMEOUT	1
-#define VP0_ECMD_TIMEOUT	2
-#define VP0_ECONNECT		3
-#define VP0_ESTATUS_TIMEOUT	4
-#define VP0_EDATA_OVERFLOW	5
-#define VP0_EDISCONNECT		6
-#define VP0_EPPDATA_TIMEOUT	7
-#define VP0_ENEGOCIATE		8
-#define VP0_ENOPORT		9
-#define VP0_EINITFAILED		10
-#define VP0_EINTR		12
-
-#define VP0_EOTHER		13
-
-#define VP0_OPENNINGS	1
-
-/*
- * Data structure used during microsequence execution
- * when characters are received in nibble mode
- */
-struct vpo_nibble {
-	char h;			/* most significant nibble */
-	char l;			/* less significant nibble */
-};
-
-/* Mode found during initialisation */
-#define VP0_MODE_UNDEFINED	0x0
-#define VP0_MODE_NIBBLE		0x1
-#define VP0_MODE_PS2		0x2
-#define VP0_MODE_EPP		0x3
-
-struct vpoio_data {
-	int vpo_mode_found;		/* Mode found during init */
-
-	struct vpo_nibble vpo_nibble;
-
-	/* each device must have its own nibble inbyte microsequence */
-	struct ppb_microseq *vpo_nibble_inbyte_msq;
-
-	device_t vpo_dev;
-};
-
-int vpoio_probe(device_t dev, struct vpoio_data *vpo);
-
-int vpoio_attach(struct vpoio_data *vpo);
-int vpoio_reset_bus(struct vpoio_data *vpo);
-
-int vpoio_do_scsi(struct vpoio_data *vpo, int host, int target, char *command,
-		int clen, char *buffer, int blen, int *result, int *count,
-		int *ret);
-
-int imm_probe(device_t dev, struct vpoio_data *vpo);
-
-int imm_attach(struct vpoio_data *vpo);
-int imm_reset_bus(struct vpoio_data *vpo);
-
-int imm_do_scsi(struct vpoio_data *vpo, int host, int target, char *command,
-		int clen, char *buffer, int blen, int *result, int *count,
-		int *ret);
-
-#endif
diff --git a/include.new/dev/smbus/smb.h b/include.new/dev/smbus/smb.h
deleted file mode 100644
index fce9680..0000000
--- a/include.new/dev/smbus/smb.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 1998 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/smbus/smb.h 162234 2006-09-11 20:52:41Z jhb $
- *
- */
-#ifndef __SMB_H
-#define __SMB_H
-
-#include <sys/ioccom.h>
-
-struct smbcmd {
-	char cmd;
-	int count;
-	u_char slave;
-	union {
-		char byte;
-		short word;
-
-		char *byte_ptr;
-		short *word_ptr;
-
-		struct {
-			short sdata;
-			short *rdata;
-		} process;
-	} data;
-};
-
-/*
- * SMBus spec 2.0 says block transfers may be at most 32 bytes.
- */
-#define SMB_MAXBLOCKSIZE	32
-
-#define SMB_QUICK_WRITE	_IOW('i', 1, struct smbcmd)
-#define SMB_QUICK_READ	_IOW('i', 2, struct smbcmd)
-#define SMB_SENDB	_IOW('i', 3, struct smbcmd)
-#define SMB_RECVB	_IOWR('i', 4, struct smbcmd)
-#define SMB_WRITEB	_IOW('i', 5, struct smbcmd)
-#define SMB_WRITEW	_IOW('i', 6, struct smbcmd)
-#define SMB_READB	_IOW('i', 7, struct smbcmd)
-#define SMB_READW	_IOW('i', 8, struct smbcmd)
-#define SMB_PCALL	_IOW('i', 9, struct smbcmd)
-#define SMB_BWRITE	_IOW('i', 10, struct smbcmd)
-#define SMB_OLD_BREAD	_IOW('i', 11, struct smbcmd)
-#define SMB_BREAD	_IOWR('i', 11, struct smbcmd)
-
-#endif
diff --git a/include.new/dev/smbus/smbconf.h b/include.new/dev/smbus/smbconf.h
deleted file mode 100644
index bd1fe10..0000000
--- a/include.new/dev/smbus/smbconf.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 1998 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/smbus/smbconf.h 162234 2006-09-11 20:52:41Z jhb $
- */
-#ifndef __SMBONF_H
-#define __SMBONF_H
-
-#include <sys/queue.h>
-
-#define SMBPRI (PZERO+8)		/* XXX sleep/wakeup queue priority */
-
-#define n(flags) (~(flags) & (flags))
-
-/*
- * How tsleep() is called in smb_request_bus().
- */
-#define SMB_DONTWAIT	0
-#define SMB_NOINTR	0
-#define SMB_WAIT	0x1
-#define SMB_INTR	0x2
-
-/*
- * callback index
- */
-#define SMB_REQUEST_BUS	0x1
-#define SMB_RELEASE_BUS	0x2
-
-/*
- * SMB bus errors
- */
-#define SMB_ENOERR	0x0
-#define SMB_EBUSERR	0x1
-#define SMB_ENOTSUPP	0x2
-#define SMB_ENOACK	0x4
-#define SMB_ECOLLI	0x8
-#define SMB_EABORT	0x10
-#define SMB_ETIMEOUT	0x20
-#define SMB_EBUSY	0x40
-#define	SMB_EINVAL	0x100
-
-/*
- * How Quick command is executed
- */
-#define SMB_QWRITE	0x0
-#define SMB_QREAD	0x1
-
-/*
- * ivars codes
- */
-#define SMBUS_IVAR_ADDR	0x1	/* slave address of the device */
-
-int	smbus_request_bus(device_t, device_t, int);
-int	smbus_release_bus(device_t, device_t);
-device_t smbus_alloc_bus(device_t);
-int	smbus_error(int error);
-
-void	smbus_intr(device_t, u_char, char low, char high, int error);
-
-u_char	smbus_get_addr(device_t);
-
-extern driver_t smbus_driver;
-extern devclass_t smbus_devclass;
-
-#define smbus_quick(bus,slave,how) \
-	(SMBUS_QUICK(device_get_parent(bus), slave, how))
-#define smbus_sendb(bus,slave,byte) \
-	(SMBUS_SENDB(device_get_parent(bus), slave, byte))
-#define smbus_recvb(bus,slave,byte) \
-	(SMBUS_RECVB(device_get_parent(bus), slave, byte))
-#define smbus_writeb(bus,slave,cmd,byte) \
-	(SMBUS_WRITEB(device_get_parent(bus), slave, cmd, byte))
-#define smbus_writew(bus,slave,cmd,word) \
-	(SMBUS_WRITEW(device_get_parent(bus), slave, cmd, word))
-#define smbus_readb(bus,slave,cmd,byte) \
-	(SMBUS_READB(device_get_parent(bus), slave, cmd, byte))
-#define smbus_readw(bus,slave,cmd,word) \
-	(SMBUS_READW(device_get_parent(bus), slave, cmd, word))
-#define smbus_pcall(bus,slave,cmd,sdata,rdata) \
-	(SMBUS_PCALL(device_get_parent(bus), slave, cmd, sdata, rdata))
-#define smbus_bwrite(bus,slave,cmd,count,buf) \
-	(SMBUS_BWRITE(device_get_parent(bus), slave, cmd, count, buf))
-#define smbus_bread(bus,slave,cmd,count,buf) \
-	(SMBUS_BREAD(device_get_parent(bus), slave, cmd, count, buf))
-
-#define SMBUS_MODVER	1
-#define SMBUS_MINVER	1
-#define SMBUS_MAXVER	1
-#define SMBUS_PREFVER	SMBUS_MODVER
-
-#endif
diff --git a/include.new/dev/smbus/smbus.h b/include.new/dev/smbus/smbus.h
deleted file mode 100644
index 01a7312..0000000
--- a/include.new/dev/smbus/smbus.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 1998 Nicolas Souchu
- * 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.
- *
- * 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: releng/10.2/sys/dev/smbus/smbus.h 189580 2009-03-09 13:30:00Z imp $
- *
- */
-#ifndef __SMBUS_H
-#define __SMBUS_H
-
-struct smbus_softc {
-	device_t owner;		/* smbus owner device structure */
-	struct mtx lock;
-};
-
-void smbus_generic_intr(device_t dev, u_char devaddr, char low, char high, int err);
-
-#endif
diff --git a/include.new/dev/speaker/speaker.h b/include.new/dev/speaker/speaker.h
deleted file mode 100644
index bb063af..0000000
--- a/include.new/dev/speaker/speaker.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * speaker.h -- interface definitions for speaker ioctl()
- *
- * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
- *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
- *
- * $FreeBSD: releng/10.2/sys/dev/speaker/speaker.h 152306 2005-11-11 09:57:32Z ru $
- */
-
-#ifndef	_DEV_SPEAKER_SPEAKER_H_
-#define	_DEV_SPEAKER_SPEAKER_H_
-
-#include <sys/ioccom.h>
-
-#define SPKRTONE        _IOW('S', 1, tone_t)    /* emit tone */
-#define SPKRTUNE        _IO('S', 2)             /* emit tone sequence*/
-
-typedef struct
-{
-    int	frequency;	/* in hertz */
-    int duration;	/* in 1/100ths of a second */
-} tone_t;
-
-/*
- * Strings written to the speaker device are interpreted as tunes and played;
- * see the spkr(4) man page for details.
- */
-
-#endif /* !_DEV_SPEAKER_SPEAKER_H_ */
diff --git a/include.new/dev/usb/dsbr100io.h b/include.new/dev/usb/dsbr100io.h
deleted file mode 100644
index 31e6682..0000000
--- a/include.new/dev/usb/dsbr100io.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2001 M. Warner Losh
- * 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.
- *
- * 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.
- *
- * This code is based on ugen.c and ulpt.c developed by Lennart Augustsson.
- * This code includes software developed by the NetBSD Foundation, Inc. and
- * its contributors.
- */
-
-/*  $FreeBSD: src/sys/dev/usb/dsbr100io.h,v 1.2 2005/01/06 01:36:28 imp Exp $ */
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#include <sys/ioccom.h>
-#endif
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#define FM_SET_FREQ	_IOWR('U', 200, int)
-#define FM_GET_FREQ	_IOWR('U', 201, int)
-#define FM_START	_IOWR('U', 202, int)
-#define FM_STOP		_IOWR('U', 203, int)
-#define FM_GET_STAT	_IOWR('U', 204, int)
-#else
-#define FM_SET_FREQ		0x1
-#define FM_GET_FREQ		0x2
-#define FM_START		0x3
-#define FM_STOP			0x4
-#define FM_GET_STAT		0x5
-#endif
diff --git a/include.new/dev/usb/ehcireg.h b/include.new/dev/usb/ehcireg.h
deleted file mode 100644
index ff5442f..0000000
--- a/include.new/dev/usb/ehcireg.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*	$NetBSD: ehcireg.h,v 1.18 2004/10/22 10:38:17 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/ehcireg.h,v 1.7.2.1 2006/01/26 01:43:13 iedowse Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net).
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*
- * The EHCI 0.96 spec can be found at
- * http://developer.intel.com/technology/usb/download/ehci-r096.pdf
- * and the USB 2.0 spec at
- * http://www.usb.org/developers/data/usb_20.zip
- */
-
-#ifndef _DEV_PCI_EHCIREG_H_
-#define _DEV_PCI_EHCIREG_H_
-
-/*** PCI config registers ***/
-
-#define PCI_CBMEM		0x10	/* configuration base MEM */
-
-#define PCI_INTERFACE_EHCI	0x20
-
-#define PCI_USBREV		0x60	/* RO USB protocol revision */
-#define  PCI_USBREV_MASK	0xff
-#define  PCI_USBREV_PRE_1_0	0x00
-#define  PCI_USBREV_1_0		0x10
-#define  PCI_USBREV_1_1		0x11
-#define  PCI_USBREV_2_0		0x20
-
-#define PCI_EHCI_FLADJ		0x61	/*RW Frame len adj, SOF=59488+6*fladj */
-
-#define PCI_EHCI_PORTWAKECAP	0x62	/* RW Port wake caps (opt)  */
-
-/* EHCI Extended Capabilities */
-#define EHCI_EC_LEGSUP		0x01
-
-#define EHCI_EECP_NEXT(x)	(((x) >> 8) & 0xff)
-#define EHCI_EECP_ID(x)		((x) & 0xff)
-
-/* Legacy support extended capability */
-#define EHCI_LEGSUP_LEGSUP	0x01
-#define  EHCI_LEGSUP_OSOWNED	0x01000000 /* OS owned semaphore */
-#define  EHCI_LEGSUP_BIOSOWNED	0x00010000 /* BIOS owned semaphore */
-#define EHCI_LEGSUP_USBLEGCTLSTS 0x04
-
-/*** EHCI capability registers ***/
-
-#define EHCI_CAPLENGTH		0x00	/*RO Capability register length field */
-/* reserved			0x01 */
-#define EHCI_HCIVERSION		0x02	/* RO Interface version number */
-
-#define EHCI_HCSPARAMS		0x04	/* RO Structural parameters */
-#define  EHCI_HCS_DEBUGPORT(x)	(((x) >> 20) & 0xf)
-#define  EHCI_HCS_P_INDICATOR(x) ((x) & 0x10000)
-#define  EHCI_HCS_N_CC(x)	(((x) >> 12) & 0xf) /* # of companion ctlrs */
-#define  EHCI_HCS_N_PCC(x)	(((x) >> 8) & 0xf) /* # of ports per comp. */
-#define  EHCI_HCS_PPC(x)	((x) & 0x10) /* port power control */
-#define  EHCI_HCS_N_PORTS(x)	((x) & 0xf) /* # of ports */
-
-#define EHCI_HCCPARAMS		0x08	/* RO Capability parameters */
-#define  EHCI_HCC_EECP(x)	(((x) >> 8) & 0xff) /* extended ports caps */
-#define  EHCI_HCC_IST(x)	(((x) >> 4) & 0xf) /* isoc sched threshold */
-#define  EHCI_HCC_ASPC(x)	((x) & 0x4) /* async sched park cap */
-#define  EHCI_HCC_PFLF(x)	((x) & 0x2) /* prog frame list flag */
-#define  EHCI_HCC_64BIT(x)	((x) & 0x1) /* 64 bit address cap */
-
-#define EHCI_HCSP_PORTROUTE	0x0c	/*RO Companion port route description */
-
-/* EHCI operational registers.  Offset given by EHCI_CAPLENGTH register */
-#define EHCI_USBCMD		0x00	/* RO, RW, WO Command register */
-#define  EHCI_CMD_ITC_M		0x00ff0000 /* RW interrupt threshold ctrl */
-#define   EHCI_CMD_ITC_1	0x00010000
-#define   EHCI_CMD_ITC_2	0x00020000
-#define   EHCI_CMD_ITC_4	0x00040000
-#define   EHCI_CMD_ITC_8	0x00080000
-#define   EHCI_CMD_ITC_16	0x00100000
-#define   EHCI_CMD_ITC_32	0x00200000
-#define   EHCI_CMD_ITC_64	0x00400000
-#define  EHCI_CMD_ASPME		0x00000800 /* RW/RO async park enable */
-#define  EHCI_CMD_ASPMC		0x00000300 /* RW/RO async park count */
-#define  EHCI_CMD_LHCR		0x00000080 /* RW light host ctrl reset */
-#define  EHCI_CMD_IAAD		0x00000040 /* RW intr on async adv door bell */
-#define  EHCI_CMD_ASE		0x00000020 /* RW async sched enable */
-#define  EHCI_CMD_PSE		0x00000010 /* RW periodic sched enable */
-#define  EHCI_CMD_FLS_M		0x0000000c /* RW/RO frame list size */
-#define  EHCI_CMD_FLS(x)	(((x) >> 2) & 3) /* RW/RO frame list size */
-#define  EHCI_CMD_HCRESET	0x00000002 /* RW reset */
-#define  EHCI_CMD_RS		0x00000001 /* RW run/stop */
-
-#define EHCI_USBSTS		0x04	/* RO, RW, RWC Status register */
-#define  EHCI_STS_ASS		0x00008000 /* RO async sched status */
-#define  EHCI_STS_PSS		0x00004000 /* RO periodic sched status */
-#define  EHCI_STS_REC		0x00002000 /* RO reclamation */
-#define  EHCI_STS_HCH		0x00001000 /* RO host controller halted */
-#define  EHCI_STS_IAA		0x00000020 /* RWC interrupt on async adv */
-#define  EHCI_STS_HSE		0x00000010 /* RWC host system error */
-#define  EHCI_STS_FLR		0x00000008 /* RWC frame list rollover */
-#define  EHCI_STS_PCD		0x00000004 /* RWC port change detect */
-#define  EHCI_STS_ERRINT	0x00000002 /* RWC error interrupt */
-#define  EHCI_STS_INT		0x00000001 /* RWC interrupt */
-#define  EHCI_STS_INTRS(x)	((x) & 0x3f)
-
-#define EHCI_NORMAL_INTRS (EHCI_STS_IAA | EHCI_STS_HSE | EHCI_STS_PCD | EHCI_STS_ERRINT | EHCI_STS_INT)
-
-#define EHCI_USBINTR		0x08	/* RW Interrupt register */
-#define EHCI_INTR_IAAE		0x00000020 /* interrupt on async advance ena */
-#define EHCI_INTR_HSEE		0x00000010 /* host system error ena */
-#define EHCI_INTR_FLRE		0x00000008 /* frame list rollover ena */
-#define EHCI_INTR_PCIE		0x00000004 /* port change ena */
-#define EHCI_INTR_UEIE		0x00000002 /* USB error intr ena */
-#define EHCI_INTR_UIE		0x00000001 /* USB intr ena */
-
-#define EHCI_FRINDEX		0x0c	/* RW Frame Index register */
-
-#define EHCI_CTRLDSSEGMENT	0x10	/* RW Control Data Structure Segment */
-
-#define EHCI_PERIODICLISTBASE	0x14	/* RW Periodic List Base */
-#define EHCI_ASYNCLISTADDR	0x18	/* RW Async List Base */
-
-#define EHCI_CONFIGFLAG		0x40	/* RW Configure Flag register */
-#define  EHCI_CONF_CF		0x00000001 /* RW configure flag */
-
-#define EHCI_PORTSC(n)		(0x40+4*(n)) /* RO, RW, RWC Port Status reg */
-#define  EHCI_PS_WKOC_E		0x00400000 /* RW wake on over current ena */
-#define  EHCI_PS_WKDSCNNT_E	0x00200000 /* RW wake on disconnect ena */
-#define  EHCI_PS_WKCNNT_E	0x00100000 /* RW wake on connect ena */
-#define  EHCI_PS_PTC		0x000f0000 /* RW port test control */
-#define  EHCI_PS_PIC		0x0000c000 /* RW port indicator control */
-#define  EHCI_PS_PO		0x00002000 /* RW port owner */
-#define  EHCI_PS_PP		0x00001000 /* RW,RO port power */
-#define  EHCI_PS_LS		0x00000c00 /* RO line status */
-#define  EHCI_PS_IS_LOWSPEED(x)	(((x) & EHCI_PS_LS) == 0x00000400)
-#define  EHCI_PS_PR		0x00000100 /* RW port reset */
-#define  EHCI_PS_SUSP		0x00000080 /* RW suspend */
-#define  EHCI_PS_FPR		0x00000040 /* RW force port resume */
-#define  EHCI_PS_OCC		0x00000020 /* RWC over current change */
-#define  EHCI_PS_OCA		0x00000010 /* RO over current active */
-#define  EHCI_PS_PEC		0x00000008 /* RWC port enable change */
-#define  EHCI_PS_PE		0x00000004 /* RW port enable */
-#define  EHCI_PS_CSC		0x00000002 /* RWC connect status change */
-#define  EHCI_PS_CS		0x00000001 /* RO connect status */
-#define  EHCI_PS_CLEAR		(EHCI_PS_OCC|EHCI_PS_PEC|EHCI_PS_CSC)
-
-#define EHCI_PORT_RESET_COMPLETE 2 /* ms */
-
-#define EHCI_FLALIGN_ALIGN	0x1000
-
-/* No data structure may cross a page boundary. */
-#define EHCI_PAGE_SIZE 0x1000
-#define EHCI_PAGE(x) ((x) &~ 0xfff)
-#define EHCI_PAGE_OFFSET(x) ((x) & 0xfff)
-#if defined(__FreeBSD__)
-#define EHCI_PAGE_MASK(x) ((x) & 0xfff)
-#endif
-
-typedef uint32_t ehci_link_t;
-#define EHCI_LINK_TERMINATE	0x00000001
-#define EHCI_LINK_TYPE(x)	((x) & 0x00000006)
-#define  EHCI_LINK_ITD		0x0
-#define  EHCI_LINK_QH		0x2
-#define  EHCI_LINK_SITD		0x4
-#define  EHCI_LINK_FSTN		0x6
-#define EHCI_LINK_ADDR(x)	((x) &~ 0x1f)
-
-typedef uint32_t ehci_physaddr_t;
-
-/* Isochronous Transfer Descriptor */
-typedef struct {
-	ehci_link_t	itd_next;
-	/* XXX many more */
-} ehci_itd_t;
-#define EHCI_ITD_ALIGN 32
-
-/* Split Transaction Isochronous Transfer Descriptor */
-typedef struct {
-	ehci_link_t	sitd_next;
-	/* XXX many more */
-} ehci_sitd_t;
-#define EHCI_SITD_ALIGN 32
-
-/* Queue Element Transfer Descriptor */
-#define EHCI_QTD_NBUFFERS 5
-typedef struct {
-	ehci_link_t	qtd_next;
-	ehci_link_t	qtd_altnext;
-	uint32_t	qtd_status;
-#define EHCI_QTD_GET_STATUS(x)	(((x) >>  0) & 0xff)
-#define EHCI_QTD_SET_STATUS(x) ((x) <<  0)
-#define  EHCI_QTD_ACTIVE	0x80
-#define  EHCI_QTD_HALTED	0x40
-#define  EHCI_QTD_BUFERR	0x20
-#define  EHCI_QTD_BABBLE	0x10
-#define  EHCI_QTD_XACTERR	0x08
-#define  EHCI_QTD_MISSEDMICRO	0x04
-#define  EHCI_QTD_SPLITXSTATE	0x02
-#define  EHCI_QTD_PINGSTATE	0x01
-#define  EHCI_QTD_STATERRS	0x7c
-#define EHCI_QTD_GET_PID(x)	(((x) >>  8) & 0x3)
-#define EHCI_QTD_SET_PID(x)	((x) <<  8)
-#define  EHCI_QTD_PID_OUT	0x0
-#define  EHCI_QTD_PID_IN	0x1
-#define  EHCI_QTD_PID_SETUP	0x2
-#define EHCI_QTD_GET_CERR(x)	(((x) >> 10) &  0x3)
-#define EHCI_QTD_SET_CERR(x)	((x) << 10)
-#define EHCI_QTD_GET_C_PAGE(x)	(((x) >> 12) &  0x7)
-#define EHCI_QTD_SET_C_PAGE(x)	((x) << 12)
-#define EHCI_QTD_GET_IOC(x)	(((x) >> 15) &  0x1)
-#define EHCI_QTD_IOC		0x00008000
-#define EHCI_QTD_GET_BYTES(x)	(((x) >> 16) &  0x7fff)
-#define EHCI_QTD_SET_BYTES(x)	((x) << 16)
-#define EHCI_QTD_GET_TOGGLE(x)	(((x) >> 31) &  0x1)
-#define	EHCI_QTD_SET_TOGGLE(x)	((x) << 31)
-#define EHCI_QTD_TOGGLE_MASK	0x80000000
-	ehci_physaddr_t	qtd_buffer[EHCI_QTD_NBUFFERS];
-	ehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS];
-} ehci_qtd_t;
-#define EHCI_QTD_ALIGN 32
-
-/* Queue Head */
-typedef struct {
-	ehci_link_t	qh_link;
-	uint32_t	qh_endp;
-#define EHCI_QH_GET_ADDR(x)	(((x) >>  0) & 0x7f) /* endpoint addr */
-#define EHCI_QH_SET_ADDR(x)	(x)
-#define EHCI_QH_ADDRMASK	0x0000007f
-#define EHCI_QH_GET_INACT(x)	(((x) >>  7) & 0x01) /* inactivate on next */
-#define EHCI_QH_INACT		0x00000080
-#define EHCI_QH_GET_ENDPT(x)	(((x) >>  8) & 0x0f) /* endpoint no */
-#define EHCI_QH_SET_ENDPT(x)	((x) <<  8)
-#define EHCI_QH_GET_EPS(x)	(((x) >> 12) & 0x03) /* endpoint speed */
-#define EHCI_QH_SET_EPS(x)	((x) << 12)
-#define  EHCI_QH_SPEED_FULL	0x0
-#define  EHCI_QH_SPEED_LOW	0x1
-#define  EHCI_QH_SPEED_HIGH	0x2
-#define EHCI_QH_GET_DTC(x)	(((x) >> 14) & 0x01) /* data toggle control */
-#define EHCI_QH_DTC		0x00004000
-#define EHCI_QH_GET_HRECL(x)	(((x) >> 15) & 0x01) /* head of reclamation */
-#define EHCI_QH_HRECL		0x00008000
-#define EHCI_QH_GET_MPL(x)	(((x) >> 16) & 0x7ff) /* max packet len */
-#define EHCI_QH_SET_MPL(x)	((x) << 16)
-#define EHCI_QH_MPLMASK		0x07ff0000
-#define EHCI_QH_GET_CTL(x)	(((x) >> 27) & 0x01) /* control endpoint */
-#define EHCI_QH_CTL		0x08000000
-#define EHCI_QH_GET_NRL(x)	(((x) >> 28) & 0x0f) /* NAK reload */
-#define EHCI_QH_SET_NRL(x)	((x) << 28)
-	uint32_t	qh_endphub;
-#define EHCI_QH_GET_SMASK(x)	(((x) >>  0) & 0xff) /* intr sched mask */
-#define EHCI_QH_SET_SMASK(x)	((x) <<  0)
-#define EHCI_QH_GET_CMASK(x)	(((x) >>  8) & 0xff) /* split completion mask */
-#define EHCI_QH_SET_CMASK(x)	((x) <<  8)
-#define EHCI_QH_GET_HUBA(x)	(((x) >> 16) & 0x7f) /* hub address */
-#define EHCI_QH_SET_HUBA(x)	((x) << 16)
-#define EHCI_QH_GET_PORT(x)	(((x) >> 23) & 0x7f) /* hub port */
-#define EHCI_QH_SET_PORT(x)	((x) << 23)
-#define EHCI_QH_GET_MULT(x)	(((x) >> 30) & 0x03) /* pipe multiplier */
-#define EHCI_QH_SET_MULT(x)	((x) << 30)
-	ehci_link_t	qh_curqtd;
-	ehci_qtd_t	qh_qtd;
-} ehci_qh_t;
-#define EHCI_QH_ALIGN 32
-
-/* Periodic Frame Span Traversal Node */
-typedef struct {
-	ehci_link_t	fstn_link;
-	ehci_link_t	fstn_back;
-} ehci_fstn_t;
-#define EHCI_FSTN_ALIGN 32
-
-#endif /* _DEV_PCI_EHCIREG_H_ */
diff --git a/include.new/dev/usb/ehcivar.h b/include.new/dev/usb/ehcivar.h
deleted file mode 100644
index 6fdd0f7..0000000
--- a/include.new/dev/usb/ehcivar.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*	$NetBSD: ehcivar.h,v 1.19 2005/04/29 15:04:29 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/ehcivar.h,v 1.9.2.1 2006/01/26 01:43:13 iedowse Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net).
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-typedef struct ehci_soft_qtd {
-	ehci_qtd_t qtd;
-	struct ehci_soft_qtd *nextqtd; /* mirrors nextqtd in TD */
-	ehci_physaddr_t physaddr;
-	usbd_xfer_handle xfer;
-	LIST_ENTRY(ehci_soft_qtd) hnext;
-	u_int16_t len;
-} ehci_soft_qtd_t;
-#define EHCI_SQTD_SIZE ((sizeof (struct ehci_soft_qtd) + EHCI_QTD_ALIGN - 1) / EHCI_QTD_ALIGN * EHCI_QTD_ALIGN)
-#define EHCI_SQTD_CHUNK (EHCI_PAGE_SIZE / EHCI_SQTD_SIZE)
-
-typedef struct ehci_soft_qh {
-	ehci_qh_t qh;
-	struct ehci_soft_qh *next;
-	struct ehci_soft_qh *prev;
-	struct ehci_soft_qtd *sqtd;
-	ehci_physaddr_t physaddr;
-	int islot;		/* Interrupt list slot. */
-} ehci_soft_qh_t;
-#define EHCI_SQH_SIZE ((sizeof (struct ehci_soft_qh) + EHCI_QH_ALIGN - 1) / EHCI_QH_ALIGN * EHCI_QH_ALIGN)
-#define EHCI_SQH_CHUNK (EHCI_PAGE_SIZE / EHCI_SQH_SIZE)
-
-struct ehci_xfer {
-	struct usbd_xfer xfer;
-	struct usb_task	abort_task;
-	LIST_ENTRY(ehci_xfer) inext; /* list of active xfers */
-	ehci_soft_qtd_t *sqtdstart;
-	ehci_soft_qtd_t *sqtdend;
-	uint32_t ehci_xfer_flags;
-#ifdef DIAGNOSTIC
-	int isdone;
-#endif
-};
-#define EHCI_XFER_ABORTING	0x0001	/* xfer is aborting. */
-#define EHCI_XFER_ABORTWAIT	0x0002	/* abort completion is being awaited. */
-
-#define EXFER(xfer) ((struct ehci_xfer *)(xfer))
-
-/*
- * Information about an entry in the interrupt list.
- */
-struct ehci_soft_islot {
-	ehci_soft_qh_t *sqh;		/* Queue Head. */
-};
-
-#define EHCI_FRAMELIST_MAXCOUNT	1024
-#define EHCI_IPOLLRATES		8	/* Poll rates (1ms, 2, 4, 8 ... 128) */
-#define EHCI_INTRQHS		((1 << EHCI_IPOLLRATES) - 1)
-#define EHCI_MAX_POLLRATE	(1 << (EHCI_IPOLLRATES - 1))
-#define EHCI_IQHIDX(lev, pos)	\
-    ((((pos) & ((1 << (lev)) - 1)) | (1 << (lev))) - 1)
-#define EHCI_ILEV_IVAL(lev)	(1 << (lev))
-
-#define EHCI_HASH_SIZE 128
-#define EHCI_COMPANION_MAX 8
-
-#define EHCI_SCFLG_DONEINIT	0x0001	/* ehci_init() has been called. */
-#define EHCI_SCFLG_LOSTINTRBUG	0x0002	/* workaround for VIA / ATI chipsets */
-
-typedef struct ehci_softc {
-	struct usbd_bus sc_bus;		/* base device */
-	int sc_flags;
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	bus_size_t sc_size;
-#if defined(__FreeBSD__)
-	void *ih;
-
-	struct resource *io_res;
-	struct resource *irq_res;
-#endif
-	u_int sc_offs;			/* offset to operational regs */
-
-	char sc_vendor[32];		/* vendor string for root hub */
-	int sc_id_vendor;		/* vendor ID for root hub */
-
-	uint32_t sc_cmd;		/* shadow of cmd reg during suspend */
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-	void *sc_powerhook;		/* cookie from power hook */
-	void *sc_shutdownhook;		/* cookie from shutdown hook */
-#endif
-
-	u_int sc_ncomp;
-	u_int sc_npcomp;
-	struct usbd_bus *sc_comps[EHCI_COMPANION_MAX];
-
-	usb_dma_t sc_fldma;
-	ehci_link_t *sc_flist;
-	u_int sc_flsize;
-#ifndef __FreeBSD__
-	u_int sc_rand;			/* XXX need proper intr scheduling */
-#endif
-
-	struct ehci_soft_islot sc_islots[EHCI_INTRQHS];
-
-	LIST_HEAD(, ehci_xfer) sc_intrhead;
-
-	ehci_soft_qh_t *sc_freeqhs;
-	ehci_soft_qtd_t *sc_freeqtds;
-
-	int sc_noport;
-	u_int8_t sc_addr;		/* device address */
-	u_int8_t sc_conf;		/* device configuration */
-	usbd_xfer_handle sc_intrxfer;
-	char sc_isreset;
-#ifdef USB_USE_SOFTINTR
-	char sc_softwake;
-#endif /* USB_USE_SOFTINTR */
-
-	uint32_t sc_eintrs;
-	ehci_soft_qh_t *sc_async_head;
-
-	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
-
-	struct lock sc_doorbell_lock;
-
-	usb_callout_t sc_tmo_pcd;
-	usb_callout_t sc_tmo_intrlist;
-
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-	device_ptr_t sc_child;		/* /dev/usb# device */
-#endif
-	char sc_dying;
-#if defined(__NetBSD__)
-	struct usb_dma_reserve sc_dma_reserve;
-#endif
-} ehci_softc_t;
-
-#define EREAD1(sc, a) bus_space_read_1((sc)->iot, (sc)->ioh, (a))
-#define EREAD2(sc, a) bus_space_read_2((sc)->iot, (sc)->ioh, (a))
-#define EREAD4(sc, a) bus_space_read_4((sc)->iot, (sc)->ioh, (a))
-#define EWRITE1(sc, a, x) bus_space_write_1((sc)->iot, (sc)->ioh, (a), (x))
-#define EWRITE2(sc, a, x) bus_space_write_2((sc)->iot, (sc)->ioh, (a), (x))
-#define EWRITE4(sc, a, x) bus_space_write_4((sc)->iot, (sc)->ioh, (a), (x))
-#define EOREAD1(sc, a) bus_space_read_1((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a))
-#define EOREAD2(sc, a) bus_space_read_2((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a))
-#define EOREAD4(sc, a) bus_space_read_4((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a))
-#define EOWRITE1(sc, a, x) bus_space_write_1((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a), (x))
-#define EOWRITE2(sc, a, x) bus_space_write_2((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a), (x))
-#define EOWRITE4(sc, a, x) bus_space_write_4((sc)->iot, (sc)->ioh, (sc)->sc_offs+(a), (x))
-
-usbd_status	ehci_init(ehci_softc_t *);
-int		ehci_intr(void *);
-int		ehci_detach(ehci_softc_t *, int);
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-int		ehci_activate(device_ptr_t, enum devact);
-#endif
-void		ehci_power(int state, void *priv);
-void		ehci_shutdown(void *v);
-
-#define MS_TO_TICKS(ms) ((ms) * hz / 1000)
-
diff --git a/include.new/dev/usb/hid.h b/include.new/dev/usb/hid.h
deleted file mode 100644
index a8e9d28..0000000
--- a/include.new/dev/usb/hid.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$NetBSD: hid.h,v 1.6 2000/06/01 14:28:57 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/hid.h,v 1.13 2005/01/06 01:43:27 imp Exp $ */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-enum hid_kind {
-	hid_input, hid_output, hid_feature, hid_collection, hid_endcollection
-};
-
-struct hid_location {
-	uint32_t size;
-	uint32_t count;
-	uint32_t pos;
-};
-
-struct hid_item {
-	/* Global */
-	int32_t _usage_page;
-	int32_t logical_minimum;
-	int32_t logical_maximum;
-	int32_t physical_minimum;
-	int32_t physical_maximum;
-	int32_t unit_exponent;
-	int32_t unit;
-	int32_t report_ID;
-	/* Local */
-	int32_t usage;
-	int32_t usage_minimum;
-	int32_t usage_maximum;
-	int32_t designator_index;
-	int32_t designator_minimum;
-	int32_t designator_maximum;
-	int32_t string_index;
-	int32_t string_minimum;
-	int32_t string_maximum;
-	int32_t set_delimiter;
-	/* Misc */
-	int32_t collection;
-	int collevel;
-	enum hid_kind kind;
-	uint32_t flags;
-	/* Location */
-	struct hid_location loc;
-	/* */
-	struct hid_item *next;
-};
-
-struct hid_data *hid_start_parse(void *d, int len, int kindset);
-void hid_end_parse(struct hid_data *s);
-int hid_get_item(struct hid_data *s, struct hid_item *h);
-int hid_report_size(void *buf, int len, enum hid_kind k, u_int8_t *id);
-int hid_locate(void *desc, int size, uint32_t usage,
-		    enum hid_kind kind, struct hid_location *loc,
-		    uint32_t *flags);
-u_long hid_get_data(u_char *buf, struct hid_location *loc);
-int hid_is_collection(void *desc, int size, uint32_t usage);
diff --git a/include.new/dev/usb/if_auereg.h b/include.new/dev/usb/if_auereg.h
deleted file mode 100644
index 77f508a..0000000
--- a/include.new/dev/usb/if_auereg.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999
- *	Bill Paul <wpaul@ee.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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/dev/usb/if_auereg.h,v 1.22 2005/06/10 16:49:15 brooks Exp $
- */
-
-/*
- * Register definitions for ADMtek Pegasus AN986 USB to Ethernet
- * chip. The Pegasus uses a total of four USB endpoints: the control
- * endpoint (0), a bulk read endpoint for receiving packets (1),
- * a bulk write endpoint for sending packets (2) and an interrupt
- * endpoint for passing RX and TX status (3). Endpoint 0 is used
- * to read and write the ethernet module's registers. All registers
- * are 8 bits wide.
- *
- * Packet transfer is done in 64 byte chunks. The last chunk in a
- * transfer is denoted by having a length less that 64 bytes. For
- * the RX case, the data includes an optional RX status word.
- */
-
-#define AUE_UR_READREG		0xF0
-#define AUE_UR_WRITEREG		0xF1
-
-#define AUE_CONFIG_NO		1
-#define AUE_IFACE_IDX		0
-
-/*
- * Note that while the ADMtek technically has four
- * endpoints, the control endpoint (endpoint 0) is
- * regarded as special by the USB code and drivers
- * don't have direct access to it. (We access it
- * using usbd_do_request() when reading/writing
- * registers.) Consequently, our endpoint indexes
- * don't match those in the ADMtek Pegasus manual:
- * we consider the RX data endpoint to be index 0
- * and work up from there.
- */
-#define AUE_ENDPT_RX		0x0
-#define AUE_ENDPT_TX		0x1
-#define AUE_ENDPT_INTR		0x2
-#define AUE_ENDPT_MAX		0x3
-
-#define AUE_INTR_PKTLEN		0x8
-
-#define AUE_CTL0		0x00
-#define AUE_CTL1		0x01
-#define AUE_CTL2		0x02
-#define AUE_MAR0		0x08
-#define AUE_MAR1		0x09
-#define AUE_MAR2		0x0A
-#define AUE_MAR3		0x0B
-#define AUE_MAR4		0x0C
-#define AUE_MAR5		0x0D
-#define AUE_MAR6		0x0E
-#define AUE_MAR7		0x0F
-#define AUE_MAR			AUE_MAR0
-#define AUE_PAR0		0x10
-#define AUE_PAR1		0x11
-#define AUE_PAR2		0x12
-#define AUE_PAR3		0x13
-#define AUE_PAR4		0x14
-#define AUE_PAR5		0x15
-#define AUE_PAR			AUE_PAR0
-#define AUE_PAUSE0		0x18
-#define AUE_PAUSE1		0x19
-#define AUE_PAUSE		AUE_PAUSE0
-#define AUE_RX_FLOWCTL_CNT	0x1A
-#define AUE_RX_FLOWCTL_FIFO	0x1B
-#define AUE_REG_1D		0x1D
-#define AUE_EE_REG		0x20
-#define AUE_EE_DATA0		0x21
-#define AUE_EE_DATA1		0x22
-#define AUE_EE_DATA		AUE_EE_DATA0
-#define AUE_EE_CTL		0x23
-#define AUE_PHY_ADDR		0x25
-#define AUE_PHY_DATA0		0x26
-#define AUE_PHY_DATA1		0x27
-#define AUE_PHY_DATA		AUE_PHY_DATA0
-#define AUE_PHY_CTL		0x28
-#define AUE_USB_STS		0x2A
-#define AUE_TXSTAT0		0x2B
-#define AUE_TXSTAT1		0x2C
-#define AUE_TXSTAT		AUE_TXSTAT0
-#define AUE_RXSTAT		0x2D
-#define AUE_PKTLOST0		0x2E
-#define AUE_PKTLOST1		0x2F
-#define AUE_PKTLOST		AUE_PKTLOST0
-
-#define AUE_REG_7B		0x7B
-#define AUE_GPIO0		0x7E
-#define AUE_GPIO1		0x7F
-#define AUE_REG_81		0x81
-
-#define AUE_CTL0_INCLUDE_RXCRC	0x01
-#define AUE_CTL0_ALLMULTI	0x02
-#define AUE_CTL0_STOP_BACKOFF	0x04
-#define AUE_CTL0_RXSTAT_APPEND	0x08
-#define AUE_CTL0_WAKEON_ENB	0x10
-#define AUE_CTL0_RXPAUSE_ENB	0x20
-#define AUE_CTL0_RX_ENB		0x40
-#define AUE_CTL0_TX_ENB		0x80
-
-#define AUE_CTL1_HOMELAN	0x04
-#define AUE_CTL1_RESETMAC	0x08
-#define AUE_CTL1_SPEEDSEL	0x10	/* 0 = 10mbps, 1 = 100mbps */
-#define AUE_CTL1_DUPLEX		0x20	/* 0 = half, 1 = full */
-#define AUE_CTL1_DELAYHOME	0x40
-
-#define AUE_CTL2_EP3_CLR	0x01	/* reading EP3 clrs status regs */
-#define AUE_CTL2_RX_BADFRAMES	0x02
-#define AUE_CTL2_RX_PROMISC	0x04
-#define AUE_CTL2_LOOPBACK	0x08
-#define AUE_CTL2_EEPROMWR_ENB	0x10
-#define AUE_CTL2_EEPROM_LOAD	0x20
-
-#define AUE_EECTL_WRITE		0x01
-#define AUE_EECTL_READ		0x02
-#define AUE_EECTL_DONE		0x04
-
-#define AUE_PHYCTL_PHYREG	0x1F
-#define AUE_PHYCTL_WRITE	0x20
-#define AUE_PHYCTL_READ		0x40
-#define AUE_PHYCTL_DONE		0x80
-
-#define AUE_USBSTS_SUSPEND	0x01
-#define AUE_USBSTS_RESUME	0x02
-
-#define AUE_TXSTAT0_JABTIMO	0x04
-#define AUE_TXSTAT0_CARLOSS	0x08
-#define AUE_TXSTAT0_NOCARRIER	0x10
-#define AUE_TXSTAT0_LATECOLL	0x20
-#define AUE_TXSTAT0_EXCESSCOLL	0x40
-#define AUE_TXSTAT0_UNDERRUN	0x80
-
-#define AUE_TXSTAT1_PKTCNT	0x0F
-#define AUE_TXSTAT1_FIFO_EMPTY	0x40
-#define AUE_TXSTAT1_FIFO_FULL	0x80
-
-#define AUE_RXSTAT_OVERRUN	0x01
-#define AUE_RXSTAT_PAUSE	0x02
-
-#define AUE_GPIO_IN0		0x01
-#define AUE_GPIO_OUT0		0x02
-#define AUE_GPIO_SEL0		0x04
-#define AUE_GPIO_IN1		0x08
-#define AUE_GPIO_OUT1		0x10
-#define AUE_GPIO_SEL1		0x20
-
-struct aue_intrpkt {
-	u_int8_t		aue_txstat0;
-	u_int8_t		aue_txstat1;
-	u_int8_t		aue_rxstat;
-	u_int8_t		aue_rxlostpkt0;
-	u_int8_t		aue_rxlostpkt1;
-	u_int8_t		aue_wakeupstat;
-	u_int8_t		aue_rsvd;
-};
-
-struct aue_rxpkt {
-	u_int16_t		aue_pktlen;
-	u_int8_t		aue_rxstat;
-};
-
-#define AUE_RXSTAT_MCAST	0x01
-#define AUE_RXSTAT_GIANT	0x02
-#define AUE_RXSTAT_RUNT		0x04
-#define AUE_RXSTAT_CRCERR	0x08
-#define AUE_RXSTAT_DRIBBLE	0x10
-#define AUE_RXSTAT_MASK		0x1E
-
-#define AUE_INC(x, y)		(x) = (x + 1) % y
-
-struct aue_softc {
-#if defined(__FreeBSD__)
-#define GET_MII(sc) (device_get_softc((sc)->aue_miibus))
-#elif defined(__NetBSD__)
-#define GET_MII(sc) (&(sc)->aue_mii)
-#elif defined(__OpenBSD__)
-#define GET_MII(sc) (&(sc)->aue_mii)
-#endif
-	struct ifnet		*aue_ifp;
-	device_t		aue_dev;
-	device_t		aue_miibus;
-	usbd_device_handle	aue_udev;
-	usbd_interface_handle	aue_iface;
-	u_int16_t		aue_vendor;
-	u_int16_t		aue_product;
-	int			aue_ed[AUE_ENDPT_MAX];
-	usbd_pipe_handle	aue_ep[AUE_ENDPT_MAX];
-	int			aue_unit;
-	u_int8_t		aue_link;
-	int			aue_if_flags;
-	struct ue_cdata		aue_cdata;
-	struct callout_handle	aue_stat_ch;
-#if __FreeBSD_version >= 500000
-	struct mtx		aue_mtx;
-#endif
-	u_int16_t		aue_flags;
-	char			aue_dying;
-	struct timeval		aue_rx_notice;
-	struct usb_qdat		aue_qdat;
-};
-
-#if 0
-#define	AUE_LOCK(_sc)		mtx_lock(&(_sc)->aue_mtx)
-#define	AUE_UNLOCK(_sc)		mtx_unlock(&(_sc)->aue_mtx)
-#else
-#define	AUE_LOCK(_sc)
-#define	AUE_UNLOCK(_sc)
-#endif
-
-#define AUE_TIMEOUT		1000
-#define AUE_MIN_FRAMELEN	60
-#define AUE_INTR_INTERVAL	100 /* ms */
diff --git a/include.new/dev/usb/if_axereg.h b/include.new/dev/usb/if_axereg.h
deleted file mode 100644
index dd66900..0000000
--- a/include.new/dev/usb/if_axereg.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999, 2000-2003
- *	Bill Paul <wpaul@windriver.com>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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/dev/usb/if_axereg.h,v 1.8 2005/06/10 16:49:15 brooks Exp $
- */
-
-/*
- * Definitions for the ASIX Electronics AX88172 to ethernet controller.
- */
-
-
-/*
- * Vendor specific commands
- * ASIX conveniently doesn't document the 'set NODEID' command in their
- * datasheet (thanks a lot guys).
- * To make handling these commands easier, I added some extra data
- * which is decided by the axe_cmd() routine. Commands are encoded
- * in 16 bites, with the format: LDCC. L and D are both nibbles in
- * the high byte. L represents the data length (0 to 15) and D
- * represents the direction (0 for vendor read, 1 for vendor write).
- * CC is the command byte, as specified in the manual.
- */
-
-#define AXE_CMD_DIR(x)	(((x) & 0x0F00) >> 8)
-#define AXE_CMD_LEN(x)	(((x) & 0xF000) >> 12)
-#define AXE_CMD_CMD(x)	((x) & 0x00FF)
-
-#define AXE_CMD_READ_RXTX_SRAM			0x2002
-#define AXE_CMD_WRITE_RX_SRAM			0x0103
-#define AXE_CMD_WRITE_TX_SRAM			0x0104
-#define AXE_CMD_MII_OPMODE_SW			0x0106
-#define AXE_CMD_MII_READ_REG			0x2007
-#define AXE_CMD_MII_WRITE_REG			0x2108
-#define AXE_CMD_MII_READ_OPMODE			0x1009
-#define AXE_CMD_MII_OPMODE_HW			0x010A
-#define AXE_CMD_SROM_READ			0x200B
-#define AXE_CMD_SROM_WRITE			0x010C
-#define AXE_CMD_SROM_WR_ENABLE			0x010D
-#define AXE_CMD_SROM_WR_DISABLE			0x010E
-#define AXE_CMD_RXCTL_READ			0x200F
-#define AXE_CMD_RXCTL_WRITE			0x0110
-#define AXE_CMD_READ_IPG012			0x3011
-#define AXE_CMD_WRITE_IPG0			0x0112
-#define AXE_CMD_WRITE_IPG1			0x0113
-#define AXE_CMD_WRITE_IPG2			0x0114
-#define AXE_CMD_READ_MCAST			0x8015
-#define AXE_CMD_WRITE_MCAST			0x8116
-#define AXE_CMD_READ_NODEID			0x6017
-#define AXE_CMD_WRITE_NODEID			0x6118
-#define AXE_CMD_READ_PHYID			0x2019
-#define AXE_CMD_READ_MEDIA			0x101A
-#define AXE_CMD_WRITE_MEDIA			0x011B
-#define AXE_CMD_READ_MONITOR_MODE		0x101C
-#define AXE_CMD_WRITE_MONITOR_MODE		0x011D
-#define AXE_CMD_READ_GPIO			0x101E
-#define AXE_CMD_WRITE_GPIO			0x011F
-
-#define AXE_RXCMD_PROMISC			0x0001
-#define AXE_RXCMD_ALLMULTI			0x0002
-#define AXE_RXCMD_UNICAST			0x0004
-#define AXE_RXCMD_BROADCAST			0x0008
-#define AXE_RXCMD_MULTICAST			0x0010
-#define AXE_RXCMD_ENABLE			0x0080
-
-#define AXE_NOPHY				0xE0
-
-#define AXE_TIMEOUT		1000
-#define AXE_MIN_FRAMELEN	60
-#define AXE_RX_FRAMES		1
-#define AXE_TX_FRAMES		1
-
-#define AXE_CTL_READ		0x01
-#define AXE_CTL_WRITE		0x02
-
-#define AXE_CONFIG_NO		1
-#define AXE_IFACE_IDX		0
-
-/*
- * The interrupt endpoint is currently unused
- * by the ASIX part.
- */
-#define AXE_ENDPT_RX		0x0
-#define AXE_ENDPT_TX		0x1
-#define AXE_ENDPT_INTR		0x2
-#define AXE_ENDPT_MAX		0x3
-
-struct axe_type {
-	u_int16_t		axe_vid;
-	u_int16_t		axe_did;
-};
-
-#define AXE_INC(x, y)		(x) = (x + 1) % y
-
-struct axe_softc {
-#if defined(__FreeBSD__)
-#define GET_MII(sc) (device_get_softc((sc)->axe_miibus))
-#elif defined(__NetBSD__)
-#define GET_MII(sc) (&(sc)->axe_mii)
-#elif defined(__OpenBSD__)
-#define GET_MII(sc) (&(sc)->axe_mii)
-#endif
-	struct ifnet		*axe_ifp;
-	device_t		axe_miibus;
-	device_t		axe_dev;
-	usbd_device_handle	axe_udev;
-	usbd_interface_handle	axe_iface;
-	int			axe_ed[AXE_ENDPT_MAX];
-	usbd_pipe_handle	axe_ep[AXE_ENDPT_MAX];
-	int			axe_unit;
-	int			axe_if_flags;
-	struct ue_cdata		axe_cdata;
-	struct callout_handle	axe_stat_ch;
-#if __FreeBSD_version >= 500000
-	struct mtx		axe_mtx;
-#endif
-	char			axe_dying;
-	int			axe_link;
-	unsigned char		axe_ipgs[3];
-	unsigned char 		axe_phyaddrs[2];
-	struct timeval		axe_rx_notice;
-	struct usb_qdat		axe_qdat;
-};
-
-#if 0
-#define	AXE_LOCK(_sc)		mtx_lock(&(_sc)->axe_mtx)
-#define	AXE_UNLOCK(_sc)		mtx_unlock(&(_sc)->axe_mtx)
-#else
-#define	AXE_LOCK(_sc)
-#define	AXE_UNLOCK(_sc)
-#endif
diff --git a/include.new/dev/usb/if_cdcereg.h b/include.new/dev/usb/if_cdcereg.h
deleted file mode 100644
index 458c0ac..0000000
--- a/include.new/dev/usb/if_cdcereg.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Craig Boston
- * 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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul, THE VOICES IN HIS HEAD OR
- * THE 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/dev/usb/if_cdcereg.h,v 1.5.2.1 2005/12/29 05:30:39 sobomax Exp $
- */
-
-#ifndef _USB_IF_CDCEREG_H_
-#define _USB_IF_CDCEREG_H_
-
-struct cdce_type {
-	struct usb_devno	 cdce_dev;
-	u_int16_t		 cdce_flags;
-#define CDCE_ZAURUS	1
-#define CDCE_NO_UNION	2
-};
-
-struct cdce_softc {
-	struct ifnet		 *cdce_ifp;
-#define GET_IFP(sc) ((sc)->cdce_ifp)
-	struct ifmedia		 cdce_ifmedia;
-
-	usbd_device_handle	 cdce_udev;
-	usbd_interface_handle	 cdce_data_iface;
-	int			 cdce_bulkin_no;
-	usbd_pipe_handle	 cdce_bulkin_pipe;
-	int			 cdce_bulkout_no;
-	usbd_pipe_handle	 cdce_bulkout_pipe;
-	char			 cdce_dying;
-	device_t		 cdce_dev;
-	int			 cdce_unit;
-
-	struct ue_cdata		 cdce_cdata;
-	struct timeval		 cdce_rx_notice;
-	int			 cdce_rxeof_errors;
-
-	u_int16_t		 cdce_flags;
-
-	struct mtx		 cdce_mtx;
-
-	struct usb_qdat		 q;
-
-	char			 devinfo[1024];
-};
-
-/* We are still under Giant */
-#if 0
-#define CDCE_LOCK(_sc)           mtx_lock(&(_sc)->cdce_mtx)
-#define CDCE_UNLOCK(_sc)         mtx_unlock(&(_sc)->cdce_mtx)
-#else
-#define CDCE_LOCK(_sc)
-#define CDCE_UNLOCK(_sc)
-#endif
-
-#endif /* _USB_IF_CDCEREG_H_ */
diff --git a/include.new/dev/usb/if_cuereg.h b/include.new/dev/usb/if_cuereg.h
deleted file mode 100644
index f7227f0..0000000
--- a/include.new/dev/usb/if_cuereg.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999, 2000
- *	Bill Paul <wpaul@ee.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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/dev/usb/if_cuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $
- */
-
-/*
- * Definitions for the CATC Netmate II USB to ethernet controller.
- */
-
-
-/*
- * Vendor specific control commands.
- */
-#define CUE_CMD_RESET				0xF4
-#define CUE_CMD_GET_MACADDR			0xF2
-#define CUE_CMD_WRITEREG			0xFA
-#define CUE_CMD_READREG				0xFB
-#define CUE_CMD_READSRAM			0xF1
-#define CUE_CMD_WRITESRAM			0xFC
-
-/*
- * Internal registers
- */
-#define CUE_TX_BUFCNT				0x20
-#define CUE_RX_BUFCNT				0x21
-#define CUE_ADVANCED_OPMODES			0x22
-#define CUE_TX_BUFPKTS				0x23
-#define CUE_RX_BUFPKTS				0x24
-#define CUE_RX_MAXCHAIN				0x25
-
-#define CUE_ETHCTL				0x60
-#define CUE_ETHSTS				0x61
-#define CUE_PAR5				0x62
-#define CUE_PAR4				0x63
-#define CUE_PAR3				0x64
-#define CUE_PAR2				0x65
-#define CUE_PAR1				0x66
-#define CUE_PAR0				0x67
-
-/* Error counters, all 16 bits wide. */
-#define CUE_TX_SINGLECOLL			0x69
-#define CUE_TX_MULTICOLL			0x6B
-#define CUE_TX_EXCESSCOLL			0x6D
-#define CUE_RX_FRAMEERR				0x6F
-
-#define CUE_LEDCTL				0x81
-
-/* Advenced operating mode register */
-#define CUE_AOP_SRAMWAITS			0x03
-#define CUE_AOP_EMBED_RXLEN			0x08
-#define CUE_AOP_RXCOMBINE			0x10
-#define CUE_AOP_TXCOMBINE			0x20
-#define CUE_AOP_EVEN_PKT_READS			0x40
-#define CUE_AOP_LOOPBK				0x80
-
-/* Ethernet control register */
-#define CUE_ETHCTL_RX_ON			0x01
-#define CUE_ETHCTL_LINK_POLARITY		0x02
-#define CUE_ETHCTL_LINK_FORCE_OK		0x04
-#define CUE_ETHCTL_MCAST_ON			0x08
-#define CUE_ETHCTL_PROMISC			0x10
-
-/* Ethernet status register */
-#define CUE_ETHSTS_NO_CARRIER			0x01
-#define CUE_ETHSTS_LATECOLL			0x02
-#define CUE_ETHSTS_EXCESSCOLL			0x04
-#define CUE_ETHSTS_TXBUF_AVAIL			0x08
-#define CUE_ETHSTS_BAD_POLARITY			0x10
-#define CUE_ETHSTS_LINK_OK			0x20
-
-/* LED control register */
-#define CUE_LEDCTL_BLINK_1X			0x00
-#define CUE_LEDCTL_BLINK_2X			0x01
-#define CUE_LEDCTL_BLINK_QUARTER_ON		0x02
-#define CUE_LEDCTL_BLINK_QUARTER_OFF		0x03
-#define CUE_LEDCTL_OFF				0x04
-#define CUE_LEDCTL_FOLLOW_LINK			0x08
-
-/*
- * Address in ASIC's internal SRAM where the
- * multicast hash table lives. The table is 64 bytes long,
- * giving us a 512-bit table. We have to set the bit that
- * corresponds to the broadcast address in order to enable
- * reception of broadcast frames.
- */
-#define CUE_MCAST_TABLE_ADDR			0xFA80
-#define CUE_MCAST_TABLE_LEN			64
-
-#define CUE_TIMEOUT		1000
-#define CUE_MIN_FRAMELEN	60
-#define CUE_RX_FRAMES		1
-#define CUE_TX_FRAMES		1
-
-#define CUE_CTL_READ		0x01
-#define CUE_CTL_WRITE		0x02
-
-#define CUE_CONFIG_NO		1
-
-/*
- * The interrupt endpoint is currently unused
- * by the KLSI part.
- */
-#define CUE_ENDPT_RX		0x0
-#define CUE_ENDPT_TX		0x1
-#define CUE_ENDPT_INTR		0x2
-#define CUE_ENDPT_MAX		0x3
-
-struct cue_type {
-	u_int16_t		cue_vid;
-	u_int16_t		cue_did;
-};
-
-#define CUE_INC(x, y)		(x) = (x + 1) % y
-
-struct cue_softc {
-	struct ifnet		*cue_ifp;
-	device_t		cue_dev;
-	usbd_device_handle	cue_udev;
-	usbd_interface_handle	cue_iface;
-	int			cue_ed[CUE_ENDPT_MAX];
-	usbd_pipe_handle	cue_ep[CUE_ENDPT_MAX];
-	int			cue_unit;
-	u_int8_t		cue_mctab[CUE_MCAST_TABLE_LEN];
-	int			cue_if_flags;
-	u_int16_t		cue_rxfilt;
-	struct ue_cdata		cue_cdata;
-	struct callout_handle	cue_stat_ch;
-#if __FreeBSD_version >= 500000
-	struct mtx		cue_mtx;
-#endif
-	char			cue_dying;
-	struct timeval		cue_rx_notice;
-	struct usb_qdat		cue_qdat;
-};
-
-#if 0
-#define	CUE_LOCK(_sc)		mtx_lock(&(_sc)->cue_mtx)
-#define	CUE_UNLOCK(_sc)		mtx_unlock(&(_sc)->cue_mtx)
-#else
-#define	CUE_LOCK(_sc)
-#define	CUE_UNLOCK(_sc)
-#endif
diff --git a/include.new/dev/usb/if_kuereg.h b/include.new/dev/usb/if_kuereg.h
deleted file mode 100644
index 14daa24..0000000
--- a/include.new/dev/usb/if_kuereg.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999, 2000
- *	Bill Paul <wpaul@ee.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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/dev/usb/if_kuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $
- */
-
-/*
- * Definitions for the KLSI KL5KUSB101B USB to ethernet controller.
- * The KLSI part is controlled via vendor control requests, the structure
- * of which depend a bit on the firmware running on the internal
- * microcontroller. The one exception is the 'send scan data' command,
- * which is used to load the firmware.
- */
-
-#define KUE_CMD_GET_ETHER_DESCRIPTOR		0x00
-#define KUE_CMD_SET_MCAST_FILTERS		0x01
-#define KUE_CMD_SET_PKT_FILTER			0x02
-#define KUE_CMD_GET_ETHERSTATS			0x03
-#define KUE_CMD_GET_GPIO			0x04
-#define KUE_CMD_SET_GPIO			0x05
-#define KUE_CMD_SET_MAC				0x06
-#define KUE_CMD_GET_MAC				0x07
-#define KUE_CMD_SET_URB_SIZE			0x08
-#define KUE_CMD_SET_SOFS			0x09
-#define KUE_CMD_SET_EVEN_PKTS			0x0A
-#define KUE_CMD_SEND_SCAN			0xFF
-
-struct kue_ether_desc {
-	u_int8_t		kue_len;
-	u_int8_t		kue_rsvd0;
-	u_int8_t		kue_rsvd1;
-	u_int8_t		kue_macaddr[ETHER_ADDR_LEN];
-	u_int8_t		kue_etherstats[4];
-	u_int8_t		kue_maxseg[2];
-	u_int8_t		kue_mcastfilt[2];
-	u_int8_t		kue_rsvd2;
-};
-
-#define KUE_ETHERSTATS(x)	\
-	(*(uint32_t *)&(x)->kue_desc.kue_etherstats)
-#define KUE_MAXSEG(x)		\
-	(*(u_int16_t *)&(x)->kue_desc.kue_maxseg)
-#define KUE_MCFILTCNT(x)	\
-	((*(u_int16_t *)&(x)->kue_desc.kue_mcastfilt) & 0x7FFF)
-#define KUE_MCFILT(x, y)	\
-	(char *)&(sc->kue_mcfilters[y * ETHER_ADDR_LEN])
-
-#define KUE_STAT_TX_OK			0x00000001
-#define KUE_STAT_RX_OK			0x00000002
-#define KUE_STAT_TX_ERR			0x00000004
-#define KUE_STAT_RX_ERR			0x00000008
-#define KUE_STAT_RX_NOBUF		0x00000010
-#define KUE_STAT_TX_UCAST_BYTES		0x00000020
-#define KUE_STAT_TX_UCAST_FRAMES	0x00000040
-#define KUE_STAT_TX_MCAST_BYTES		0x00000080
-#define KUE_STAT_TX_MCAST_FRAMES	0x00000100
-#define KUE_STAT_TX_BCAST_BYTES		0x00000200
-#define KUE_STAT_TX_BCAST_FRAMES	0x00000400
-#define KUE_STAT_RX_UCAST_BYTES		0x00000800
-#define KUE_STAT_RX_UCAST_FRAMES	0x00001000
-#define KUE_STAT_RX_MCAST_BYTES		0x00002000
-#define KUE_STAT_RX_MCAST_FRAMES	0x00004000
-#define KUE_STAT_RX_BCAST_BYTES		0x00008000
-#define KUE_STAT_RX_BCAST_FRAMES	0x00010000
-#define KUE_STAT_RX_CRCERR		0x00020000
-#define KUE_STAT_TX_QUEUE_LENGTH	0x00040000
-#define KUE_STAT_RX_ALIGNERR		0x00080000
-#define KUE_STAT_TX_SINGLECOLL		0x00100000
-#define KUE_STAT_TX_MULTICOLL		0x00200000
-#define KUE_STAT_TX_DEFERRED		0x00400000
-#define KUE_STAT_TX_MAXCOLLS		0x00800000
-#define KUE_STAT_RX_OVERRUN		0x01000000
-#define KUE_STAT_TX_UNDERRUN		0x02000000
-#define KUE_STAT_TX_SQE_ERR		0x04000000
-#define KUE_STAT_TX_CARRLOSS		0x08000000
-#define KUE_STAT_RX_LATECOLL		0x10000000
-
-#define KUE_RXFILT_PROMISC		0x0001
-#define KUE_RXFILT_ALLMULTI		0x0002
-#define KUE_RXFILT_UNICAST		0x0004
-#define KUE_RXFILT_BROADCAST		0x0008
-#define KUE_RXFILT_MULTICAST		0x0010
-
-#define KUE_TIMEOUT		1000
-#define KUE_MIN_FRAMELEN	60
-
-#define KUE_CTL_READ		0x01
-#define KUE_CTL_WRITE		0x02
-
-#define KUE_CONFIG_NO		1
-#define KUE_IFACE_IDX		0
-
-/*
- * The interrupt endpoint is currently unused
- * by the KLSI part.
- */
-#define KUE_ENDPT_RX		0x0
-#define KUE_ENDPT_TX		0x1
-#define KUE_ENDPT_INTR		0x2
-#define KUE_ENDPT_MAX		0x3
-
-struct kue_type {
-	u_int16_t		kue_vid;
-	u_int16_t		kue_did;
-};
-
-#define KUE_INC(x, y)		(x) = (x + 1) % y
-
-struct kue_softc {
-	struct ifnet		*kue_ifp;
-	device_t		kue_dev;
-	usbd_device_handle	kue_udev;
-	usbd_interface_handle	kue_iface;
-	struct kue_ether_desc	kue_desc;
-	int			kue_ed[KUE_ENDPT_MAX];
-	usbd_pipe_handle	kue_ep[KUE_ENDPT_MAX];
-	int			kue_unit;
-	int			kue_if_flags;
-	u_int16_t		kue_rxfilt;
-	u_int8_t		*kue_mcfilters;
-	struct ue_cdata		kue_cdata;
-#if __FreeBSD_version >= 500000
-	struct mtx		kue_mtx;
-#endif
-	char			kue_dying;
-	struct timeval		kue_rx_notice;
-	struct usb_qdat		kue_qdat;
-};
-
-#if 0
-#define	KUE_LOCK(_sc)		mtx_lock(&(_sc)->kue_mtx)
-#define	KUE_UNLOCK(_sc)		mtx_unlock(&(_sc)->kue_mtx)
-#else
-#define	KUE_LOCK(_sc)
-#define	KUE_UNLOCK(_sc)
-#endif
diff --git a/include.new/dev/usb/if_ruereg.h b/include.new/dev/usb/if_ruereg.h
deleted file mode 100644
index 8fcaf57..0000000
--- a/include.new/dev/usb/if_ruereg.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*-
- * Copyright (c) 2001-2003, Shunsuke Akiyama <akiyama@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.
- *
- * 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/dev/usb/if_ruereg.h,v 1.6 2005/06/10 16:49:15 brooks Exp $
- */
-
-#ifndef _IF_RUEREG_H_
-#define _IF_RUEREG_H_
-
-#define RUE_INTR_PIPE		1	/* Use INTR PIPE */
-
-#define RUE_CONFIG_NO		1
-#define RUE_IFACE_IDX		0
-
-#define RUE_ENDPT_RX		0x0
-#define RUE_ENDPT_TX		0x1
-#define RUE_ENDPT_INTR		0x2
-#define RUE_ENDPT_MAX		0x3
-
-#define RUE_INTR_PKTLEN		0x8
-
-#define RUE_TIMEOUT		1000
-#define	ETHER_ALIGN		2
-#define RUE_MIN_FRAMELEN	60
-#define	RUE_INTR_INTERVAL	100	/* ms */
-
-/*
- * Registers
- */
-
-#define RUE_IDR0		0x0120
-#define RUE_IDR1		0x0121
-#define RUE_IDR2		0x0122
-#define RUE_IDR3		0x0123
-#define RUE_IDR4		0x0124
-#define RUE_IDR5		0x0125
-
-#define RUE_MAR0		0x0126
-#define RUE_MAR1		0x0127
-#define RUE_MAR2		0x0128
-#define RUE_MAR3		0x0129
-#define RUE_MAR4		0x012A
-#define RUE_MAR5		0x012B
-#define RUE_MAR6		0x012C
-#define RUE_MAR7		0x012D
-
-#define RUE_CR			0x012E		/* B, R/W */
-#define RUE_CR_SOFT_RST		0x10
-#define RUE_CR_RE		0x08
-#define RUE_CR_TE		0x04
-#define RUE_CR_EP3CLREN		0x02
-
-#define RUE_TCR			0x012F		/* B, R/W */
-#define RUE_TCR_TXRR1		0x80
-#define RUE_TCR_TXRR0		0x40
-#define RUE_TCR_IFG1		0x10
-#define RUE_TCR_IFG0		0x08
-#define RUE_TCR_NOCRC		0x01
-#define RUE_TCR_CONFIG		(RUE_TCR_TXRR1|RUE_TCR_TXRR0|RUE_TCR_IFG1|RUE_TCR_IFG0)
-
-#define RUE_RCR			0x0130		/* W, R/W */
-#define RUE_RCR_TAIL		0x80
-#define RUE_RCR_AER		0x40
-#define RUE_RCR_AR		0x20
-#define RUE_RCR_AM		0x10
-#define RUE_RCR_AB		0x08
-#define RUE_RCR_AD		0x04
-#define RUE_RCR_AAM		0x02
-#define RUE_RCR_AAP		0x01
-#define RUE_RCR_CONFIG		(RUE_RCR_TAIL|RUE_RCR_AD)
-
-#define RUE_TSR			0x0132
-#define RUE_RSR			0x0133
-#define RUE_CON0		0x0135
-#define RUE_CON1		0x0136
-#define RUE_MSR			0x0137
-#define RUE_PHYADD		0x0138
-#define RUE_PHYDAT		0x0139
-
-#define RUE_PHYCNT		0x013B		/* B, R/W */
-#define RUE_PHYCNT_PHYOWN	0x40
-#define RUE_PHYCNT_RWCR		0x20
-
-#define RUE_GPPC		0x013D
-#define RUE_WAKECNT		0x013E
-
-#define RUE_BMCR		0x0140
-#define RUE_BMCR_SPD_SET	0x2000
-#define RUE_BMCR_DUPLEX		0x0100
-
-#define RUE_BMSR		0x0142
-
-#define RUE_ANAR		0x0144		/* W, R/W */
-#define RUE_ANAR_PAUSE		0x0400
-
-#define RUE_ANLP		0x0146		/* W, R/O */
-#define RUE_ANLP_PAUSE		0x0400
-
-#define RUE_AER			0x0148
-
-#define RUE_NWAYT		0x014A
-#define RUE_CSCR		0x014C
-
-#define RUE_CRC0		0x014E
-#define RUE_CRC1		0x0150
-#define RUE_CRC2		0x0152
-#define RUE_CRC3		0x0154
-#define RUE_CRC4		0x0156
-
-#define RUE_BYTEMASK0		0x0158
-#define RUE_BYTEMASK1		0x0160
-#define RUE_BYTEMASK2		0x0168
-#define RUE_BYTEMASK3		0x0170
-#define RUE_BYTEMASK4		0x0178
-
-#define RUE_PHY1		0x0180
-#define RUE_PHY2		0x0184
-
-#define RUE_TW1			0x0186
-
-#define RUE_REG_MIN		0x0120
-#define RUE_REG_MAX		0x0189
-
-/*
- * EEPROM address declarations
- */
-
-#define RUE_EEPROM_BASE		0x1200
-
-#define RUE_EEPROM_IDR0		(RUE_EEPROM_BASE + 0x02)
-#define RUE_EEPROM_IDR1		(RUE_EEPROM_BASE + 0x03)
-#define RUE_EEPROM_IDR2		(RUE_EEPROM_BASE + 0x03)
-#define RUE_EEPROM_IDR3		(RUE_EEPROM_BASE + 0x03)
-#define RUE_EEPROM_IDR4		(RUE_EEPROM_BASE + 0x03)
-#define RUE_EEPROM_IDR5		(RUE_EEPROM_BASE + 0x03)
-
-#define RUE_EEPROM_INTERVAL	(RUE_EEPROM_BASE + 0x17)
-
-struct rue_intrpkt {
-	u_int8_t		rue_tsr;
-	u_int8_t		rue_rsr;
-	u_int8_t		rue_gep_msr;
-	u_int8_t		rue_waksr;
-	u_int8_t		rue_txok_cnt;
-	u_int8_t		rue_rxlost_cnt;
-	u_int8_t		rue_crcerr_cnt;
-	u_int8_t		rue_col_cnt;
-};
-
-struct rue_rxpkt {
-	u_int16_t		rue_pktlen : 12;
-	u_int16_t		rue_rxstat : 4;
-};
-
-#define RUE_RXSTAT_VALID	0x01
-#define RUE_RXSTAT_RUNT		0x02
-#define RUE_RXSTAT_PMATCH	0x04
-#define RUE_RXSTAT_MCAST	0x08
-
-#define RUE_RXSTAT_MASK		RUE_RXSTAT_VALID
-
-struct rue_type {
-	u_int16_t		rue_vid;
-	u_int16_t		rue_did;
-};
-
-struct rue_softc {
-	struct ifnet		*rue_ifp;
-	device_t		rue_dev;
-	device_t		rue_miibus;
-	usbd_device_handle	rue_udev;
-	usbd_interface_handle	rue_iface;
-	struct rue_type		*rue_info;
-	int			rue_ed[RUE_ENDPT_MAX];
-	usbd_pipe_handle	rue_ep[RUE_ENDPT_MAX];
-	int			rue_unit;
-	u_int8_t		rue_link;
-	int			rue_if_flags;
-	struct ue_cdata		rue_cdata;
-	struct callout_handle	rue_stat_ch;
-#if __FreeBSD_version >= 500000
-	struct mtx		rue_mtx;
-#endif
-	char			rue_dying;
-	struct timeval		rue_rx_notice;
-	struct usb_qdat		rue_qdat;
-};
-
-#if defined(__FreeBSD__)
-#define GET_MII(sc)	(device_get_softc((sc)->rue_miibus))
-#elif defined(__NetBSD__)
-#define GET_MII(sc)	(&(sc)->rue_mii)
-#elif defined(__OpenBSD__)
-#define GET_MII(sc)	(&(sc)->rue_mii)
-#endif
-
-#if 0
-#define RUE_LOCK(_sc)		mtx_lock(&(_sc)->rue_mtx)
-#define RUE_UNLOCK(_sc)		mtx_unlock(&(_sc)->rue_mtx)
-#else
-#define RUE_LOCK(_sc)
-#define RUE_UNLOCK(_sc)
-#endif
-
-#endif /* _IF_RUEREG_H_ */
diff --git a/include.new/dev/usb/if_udavreg.h b/include.new/dev/usb/if_udavreg.h
deleted file mode 100644
index 2d511e2..0000000
--- a/include.new/dev/usb/if_udavreg.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*	$NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $	*/
-/*	$nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/if_udavreg.h,v 1.5 2005/06/10 16:49:15 brooks Exp $	*/
-/*-
- * Copyright (c) 2003
- *     Shingo WATANABE <nabe@nabechan.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. Neither the name of the author nor the names of any co-contributors
- *    may 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.
- *
- */
-
-#define	UDAV_IFACE_INDEX	0
-#define	UDAV_CONFIG_NO		1
-
-#define	UDAV_TX_TIMEOUT		1000
-#define	UDAV_TIMEOUT		10000
-
-#define	ETHER_ALIGN		2
-
-
-/* Packet length */
-#define	UDAV_MIN_FRAME_LEN	60
-
-/* Request */
-#define	UDAV_REQ_REG_READ	0x00 /* Read from register(s) */
-#define	UDAV_REQ_REG_WRITE	0x01 /* Write to register(s) */
-#define	UDAV_REQ_REG_WRITE1	0x03 /* Write to a register */
-
-#define	UDAV_REQ_MEM_READ	0x02 /* Read from memory */
-#define	UDAV_REQ_MEM_WRITE	0x05 /* Write to memory */
-#define	UDAV_REQ_MEM_WRITE1	0x07 /* Write a byte to memory */
-
-/* Registers */
-#define	UDAV_NCR		0x00 /* Network Control Register */
-#define	 UDAV_NCR_EXT_PHY	(1<<7) /* Select External PHY */
-#define	 UDAV_NCR_WAKEEN	(1<<6) /* Wakeup Event Enable */
-#define	 UDAV_NCR_FCOL		(1<<4) /* Force Collision Mode */
-#define	 UDAV_NCR_FDX		(1<<3) /* Full-Duplex Mode (RO on Int. PHY) */
-#define	 UDAV_NCR_LBK1		(1<<2) /* Lookback Mode */
-#define	 UDAV_NCR_LBK0		(1<<1) /* Lookback Mode */
-#define	 UDAV_NCR_RST		(1<<0) /* Software reset */
-
-#define	UDAV_RCR		0x05 /* RX Control Register */
-#define	 UDAV_RCR_WTDIS		(1<<6) /* Watchdog Timer Disable */
-#define	 UDAV_RCR_DIS_LONG	(1<<5) /* Discard Long Packet(over 1522Byte) */
-#define	 UDAV_RCR_DIS_CRC	(1<<4) /* Discard CRC Error Packet */
-#define	 UDAV_RCR_ALL		(1<<3) /* Pass All Multicast */
-#define	 UDAV_RCR_RUNT		(1<<2) /* Pass Runt Packet */
-#define	 UDAV_RCR_PRMSC		(1<<1) /* Promiscuous Mode */
-#define	 UDAV_RCR_RXEN		(1<<0) /* RX Enable */
-
-#define	UDAV_RSR		0x06 /* RX Status Register */
-#define	 UDAV_RSR_RF		(1<<7) /* Runt Frame */
-#define	 UDAV_RSR_MF		(1<<6) /* Multicast Frame */
-#define	 UDAV_RSR_LCS		(1<<5) /* Late Collision Seen */
-#define	 UDAV_RSR_RWTO		(1<<4) /* Receive Watchdog Time-Out */
-#define	 UDAV_RSR_PLE		(1<<3) /* Physical Layer Error */
-#define	 UDAV_RSR_AE		(1<<2) /* Alignment Error */
-#define	 UDAV_RSR_CE		(1<<1) /* CRC Error */
-#define	 UDAV_RSR_FOE		(1<<0) /* FIFO Overflow Error */
-#define	 UDAV_RSR_ERR		(UDAV_RSR_RF | UDAV_RSR_LCS | UDAV_RSR_RWTO |\
-				UDAV_RSR_PLE | UDAV_RSR_AE | UDAV_RSR_CE |\
-				UDAV_RSR_FOE)
-
-#define	UDAV_EPCR		0x0b /* EEPROM & PHY Control Register */
-#define	 UDAV_EPCR_REEP		(1<<5) /* Reload EEPROM */
-#define	 UDAV_EPCR_WEP		(1<<4) /* Write EEPROM enable */
-#define	 UDAV_EPCR_EPOS		(1<<3) /* EEPROM or PHY Operation Select */
-#define	 UDAV_EPCR_ERPRR	(1<<2) /* EEPROM/PHY Register Read Command */
-#define	 UDAV_EPCR_ERPRW	(1<<1) /* EEPROM/PHY Register Write Command */
-#define	 UDAV_EPCR_ERRE		(1<<0) /* EEPROM/PHY Access Status */
-
-#define	UDAV_EPAR		0x0c /* EEPROM & PHY Control Register */
-#define	 UDAV_EPAR_PHY_ADR1	(1<<7) /* PHY Address bit 1 */
-#define	 UDAV_EPAR_PHY_ADR0	(1<<6) /* PHY Address bit 0 */
-#define	 UDAV_EPAR_EROA		(1<<0) /* EEPROM Word/PHY Register Address */
-#define	 UDAV_EPAR_EROA_MASK	(0x1f) /* [5:0] */
-
-#define	UDAV_EPDRL		0x0d /* EEPROM & PHY Data Register */
-#define	UDAV_EPDRH		0x0e /* EEPROM & PHY Data Register */
-
-#define	UDAV_PAR0		0x10 /* Ethernet Address, load from EEPROM */
-#define	UDAV_PAR1		0x11 /* Ethernet Address, load from EEPROM */
-#define	UDAV_PAR2		0x12 /* Ethernet Address, load from EEPROM */
-#define	UDAV_PAR3		0x13 /* Ethernet Address, load from EEPROM */
-#define	UDAV_PAR4		0x14 /* Ethernet Address, load from EEPROM */
-#define	UDAV_PAR5		0x15 /* Ethernet Address, load from EEPROM */
-#define	UDAV_PAR		UDAV_PAR0
-
-#define	UDAV_MAR0		0x16 /* Multicast Register */
-#define	UDAV_MAR1		0x17 /* Multicast Register */
-#define	UDAV_MAR2		0x18 /* Multicast Register */
-#define	UDAV_MAR3		0x19 /* Multicast Register */
-#define	UDAV_MAR4		0x1a /* Multicast Register */
-#define	UDAV_MAR5		0x1b /* Multicast Register */
-#define	UDAV_MAR6		0x1c /* Multicast Register */
-#define	UDAV_MAR7		0x1d /* Multicast Register */
-#define	UDAV_MAR		UDAV_MAR0
-
-#define	UDAV_GPCR		0x1e /* General purpose control register */
-#define	 UDAV_GPCR_GEP_CNTL6	(1<<6) /* General purpose control 6 */
-#define	 UDAV_GPCR_GEP_CNTL5	(1<<5) /* General purpose control 5 */
-#define	 UDAV_GPCR_GEP_CNTL4	(1<<4) /* General purpose control 4 */
-#define	 UDAV_GPCR_GEP_CNTL3	(1<<3) /* General purpose control 3 */
-#define	 UDAV_GPCR_GEP_CNTL2	(1<<2) /* General purpose control 2 */
-#define	 UDAV_GPCR_GEP_CNTL1	(1<<1) /* General purpose control 1 */
-#define	 UDAV_GPCR_GEP_CNTL0	(1<<0) /* General purpose control 0 */
-
-#define	UDAV_GPR		0x1f /* General purpose register */
-#define	 UDAV_GPR_GEPIO6	(1<<6) /* General purpose 6 */
-#define	 UDAV_GPR_GEPIO5	(1<<5) /* General purpose 5 */
-#define	 UDAV_GPR_GEPIO4	(1<<4) /* General purpose 4 */
-#define	 UDAV_GPR_GEPIO3	(1<<3) /* General purpose 3 */
-#define	 UDAV_GPR_GEPIO2	(1<<2) /* General purpose 2 */
-#define	 UDAV_GPR_GEPIO1	(1<<1) /* General purpose 1 */
-#define	 UDAV_GPR_GEPIO0	(1<<0) /* General purpose 0 */
-
-#if defined(__FreeBSD__)
-#define	GET_IFP(sc)		((sc)->sc_ifp)
-#elif defined(__OpenBSD__)
-#define	GET_IFP(sc)		(&(sc)->sc_ac.ac_if)
-#elif defined(__NetBSD__)
-#define	GET_IFP(sc)		(&(sc)->sc_ec.ec_if)
-#endif
-#if defined(__FreeBSD__)
-#define GET_MII(sc)	(device_get_softc((sc)->sc_miibus))
-#else
-#define	GET_MII(sc)		(&(sc)->sc_mii)
-#endif
-
-#if defined(__FreeBSD__)
-#if 0
-#define UDAV_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
-#define UDAV_UNLOCK(_sc)	mtx_unlock(&(_sc)->sc_mtx)
-#else
-#define UDAV_LOCK(_sc)
-#define UDAV_UNLOCK(_sc)
-#endif
-#endif
-
-struct udav_softc {
-#if defined(__FreeBSD__)
-	struct ifnet		*sc_ifp;
-#endif
-	USBBASEDEVICE		sc_dev;	/* base device */
-	usbd_device_handle	sc_udev;
-
-	/* USB */
-	usbd_interface_handle	sc_ctl_iface;
-	/* int			sc_ctl_iface_no; */
-	int			sc_bulkin_no; /* bulk in endpoint */
-	int			sc_bulkout_no; /* bulk out endpoint */
-	int			sc_intrin_no; /* intr in endpoint */
-	usbd_pipe_handle	sc_pipe_rx;
-	usbd_pipe_handle	sc_pipe_tx;
-	usbd_pipe_handle	sc_pipe_intr;
-	usb_callout_t		sc_stat_ch;
-	u_int			sc_rx_errs;
-	/* u_int		sc_intr_errs; */
-	struct timeval		sc_rx_notice;
-
-	/* Ethernet */
-
-#if defined(__FreeBSD__)
-	device_t		sc_miibus ;
-	struct mtx		sc_mtx ;
-	struct usb_qdat		sc_qdat;
-#elif defined(__NetBSD__)
-	struct ethercom		sc_ec; /* ethernet common */
-	struct mii_data		sc_mii;
-#endif
-	struct lock		sc_mii_lock;
-	int			sc_link;
-#define	sc_media udav_mii.mii_media
-#if NRND > 0
-	rndsource_element_t	rnd_source;
-#endif
-	struct ue_cdata		sc_cdata;
-
-	int                     sc_attached;
-	int			sc_dying;
-        int                     sc_refcnt;
-
-	struct usb_task		sc_tick_task;
-	struct usb_task		sc_stop_task;
-
-	u_int16_t		sc_flags;
-};
diff --git a/include.new/dev/usb/if_uralreg.h b/include.new/dev/usb/if_uralreg.h
deleted file mode 100644
index 504ab47..0000000
--- a/include.new/dev/usb/if_uralreg.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*	$FreeBSD: src/sys/dev/usb/if_uralreg.h,v 1.1.2.1 2006/01/29 14:16:36 damien Exp $	*/
-
-/*-
- * Copyright (c) 2005, 2006
- *	Damien Bergamini <damien.bergamini@free.fr>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define RAL_RX_DESC_SIZE	(sizeof (struct ural_rx_desc))
-#define RAL_TX_DESC_SIZE	(sizeof (struct ural_tx_desc))
-
-#define RAL_CONFIG_NO	1
-#define RAL_IFACE_INDEX 0
-
-#define RAL_VENDOR_REQUEST	0x01
-#define RAL_WRITE_MAC		0x02
-#define RAL_READ_MAC		0x03
-#define RAL_WRITE_MULTI_MAC	0x06
-#define RAL_READ_MULTI_MAC	0x07
-#define RAL_READ_EEPROM		0x09
-
-/*
- * MAC registers.
- */
-#define RAL_MAC_CSR0	0x0400	/* ASIC Version */
-#define RAL_MAC_CSR1	0x0402	/* System control */
-#define RAL_MAC_CSR2	0x0404	/* MAC addr0 */
-#define RAL_MAC_CSR3	0x0406	/* MAC addr1 */
-#define RAL_MAC_CSR4	0x0408	/* MAC addr2 */
-#define RAL_MAC_CSR5	0x040a	/* BSSID0 */
-#define RAL_MAC_CSR6	0x040c	/* BSSID1 */
-#define RAL_MAC_CSR7	0x040e	/* BSSID2 */
-#define RAL_MAC_CSR8	0x0410	/* Max frame length */
-#define RAL_MAC_CSR9	0x0412	/* Timer control */
-#define RAL_MAC_CSR10	0x0414	/* Slot time */
-#define RAL_MAC_CSR11	0x0416	/* IFS */
-#define RAL_MAC_CSR12	0x0418	/* EIFS */
-#define RAL_MAC_CSR13	0x041a	/* Power mode0 */
-#define RAL_MAC_CSR14	0x041c	/* Power mode1 */
-#define RAL_MAC_CSR15	0x041e	/* Power saving transition0 */
-#define RAL_MAC_CSR16	0x0420	/* Power saving transition1 */
-#define RAL_MAC_CSR17	0x0422	/* Power state control */
-#define RAL_MAC_CSR18	0x0424	/* Auto wake-up control */
-#define RAL_MAC_CSR19	0x0426	/* GPIO control */
-#define RAL_MAC_CSR20	0x0428	/* LED control0 */
-#define RAL_MAC_CSR22	0x042c	/* XXX not documented */
-
-/*
- * Tx/Rx Registers.
- */
-#define RAL_TXRX_CSR0	0x0440	/* Security control */
-#define RAL_TXRX_CSR2	0x0444	/* Rx control */
-#define RAL_TXRX_CSR5	0x044a	/* CCK Tx BBP ID0 */
-#define RAL_TXRX_CSR6	0x044c	/* CCK Tx BBP ID1 */
-#define RAL_TXRX_CSR7	0x044e	/* OFDM Tx BBP ID0 */
-#define RAL_TXRX_CSR8	0x0450	/* OFDM Tx BBP ID1 */
-#define RAL_TXRX_CSR10	0x0454	/* Auto responder control */
-#define RAL_TXRX_CSR11	0x0456	/* Auto responder basic rate */
-#define RAL_TXRX_CSR18	0x0464	/* Beacon interval */
-#define RAL_TXRX_CSR19	0x0466	/* Beacon/sync control */
-#define RAL_TXRX_CSR20	0x0468	/* Beacon alignment */
-#define RAL_TXRX_CSR21	0x046a	/* XXX not documented */
-
-/*
- * Security registers.
- */
-#define RAL_SEC_CSR0	0x0480	/* Shared key 0, word 0 */
-
-/*
- * PHY registers.
- */
-#define RAL_PHY_CSR2	0x04c4	/* Tx MAC configuration */
-#define RAL_PHY_CSR4	0x04c8	/* Interface configuration */
-#define RAL_PHY_CSR5	0x04ca	/* BBP Pre-Tx CCK */
-#define RAL_PHY_CSR6	0x04cc	/* BBP Pre-Tx OFDM */
-#define RAL_PHY_CSR7	0x04ce	/* BBP serial control */
-#define RAL_PHY_CSR8	0x04d0	/* BBP serial status */
-#define RAL_PHY_CSR9	0x04d2	/* RF serial control0 */
-#define RAL_PHY_CSR10	0x04d4	/* RF serial control1 */
-
-/*
- * Statistics registers.
- */
-#define RAL_STA_CSR0	0x04e0	/* FCS error */
-
-
-#define RAL_DISABLE_RX		(1 << 0)
-#define RAL_DROP_CRC		(1 << 1)
-#define RAL_DROP_PHY		(1 << 2)
-#define RAL_DROP_CTL		(1 << 3)
-#define RAL_DROP_NOT_TO_ME	(1 << 4)
-#define RAL_DROP_TODS		(1 << 5)
-#define RAL_DROP_BAD_VERSION	(1 << 6)
-#define RAL_DROP_MULTICAST	(1 << 9)
-#define RAL_DROP_BROADCAST	(1 << 10)
-
-#define RAL_SHORT_PREAMBLE	(1 << 2)
-
-#define RAL_RESET_ASIC	(1 << 0)
-#define RAL_RESET_BBP	(1 << 1)
-#define RAL_HOST_READY	(1 << 2)
-
-#define RAL_ENABLE_TSF			(1 << 0)
-#define RAL_ENABLE_TSF_SYNC(x)		(((x) & 0x3) << 1)
-#define RAL_ENABLE_TBCN			(1 << 3)
-#define RAL_ENABLE_BEACON_GENERATOR	(1 << 4)
-
-#define RAL_RF_AWAKE	(3 << 7)
-#define RAL_BBP_AWAKE	(3 << 5)
-
-#define RAL_BBP_WRITE	(1 << 15)
-#define RAL_BBP_BUSY	(1 << 0)
-
-#define RAL_RF1_AUTOTUNE	0x08000
-#define RAL_RF3_AUTOTUNE	0x00040
-
-#define RAL_RF_2522	0x00
-#define RAL_RF_2523	0x01
-#define RAL_RF_2524	0x02
-#define RAL_RF_2525	0x03
-#define RAL_RF_2525E	0x04
-#define RAL_RF_2526	0x05
-/* dual-band RF */
-#define RAL_RF_5222	0x10
-
-#define RAL_BBP_VERSION	0
-#define RAL_BBP_TX	2
-#define RAL_BBP_RX	14
-
-#define RAL_BBP_ANTA		0x00
-#define RAL_BBP_DIVERSITY	0x01
-#define RAL_BBP_ANTB		0x02
-#define RAL_BBP_ANTMASK		0x03
-#define RAL_BBP_FLIPIQ		0x04
-
-#define RAL_JAPAN_FILTER	0x08
-
-struct ural_tx_desc {
-	uint32_t	flags;
-#define RAL_TX_RETRY(x)		((x) << 4)
-#define RAL_TX_MORE_FRAG	(1 << 8)
-#define RAL_TX_ACK		(1 << 9)
-#define RAL_TX_TIMESTAMP	(1 << 10)
-#define RAL_TX_OFDM		(1 << 11)
-#define RAL_TX_NEWSEQ		(1 << 12)
-
-#define RAL_TX_IFS_MASK		0x00006000
-#define RAL_TX_IFS_BACKOFF	(0 << 13)
-#define RAL_TX_IFS_SIFS		(1 << 13)
-#define RAL_TX_IFS_NEWBACKOFF	(2 << 13)
-#define RAL_TX_IFS_NONE		(3 << 13)
-
-	uint16_t	wme;
-#define RAL_LOGCWMAX(x)		(((x) & 0xf) << 12)
-#define RAL_LOGCWMIN(x)		(((x) & 0xf) << 8)
-#define RAL_AIFSN(x)		(((x) & 0x3) << 6)
-#define RAL_IVOFFSET(x)		(((x) & 0x3f))
-
-	uint16_t	reserved1;
-	uint8_t		plcp_signal;
-	uint8_t		plcp_service;
-#define RAL_PLCP_LENGEXT	0x80
-
-	uint8_t		plcp_length_lo;
-	uint8_t		plcp_length_hi;
-	uint32_t	iv;
-	uint32_t	eiv;
-} __packed;
-
-struct ural_rx_desc {
-	uint32_t	flags;
-#define RAL_RX_CRC_ERROR	(1 << 5)
-#define RAL_RX_OFDM		(1 << 6)
-#define RAL_RX_PHY_ERROR	(1 << 7)
-
-	uint8_t		rssi;
-	uint8_t		rate;
-	uint16_t	reserved;
-
-	uint32_t	iv;
-	uint32_t	eiv;
-} __packed;
-
-#define RAL_RF_LOBUSY	(1 << 15)
-#define RAL_RF_BUSY	(1 << 31)
-#define RAL_RF_20BIT	(20 << 24)
-
-#define RAL_RF1	0
-#define RAL_RF2	2
-#define RAL_RF3	1
-#define RAL_RF4	3
-
-#define RAL_EEPROM_ADDRESS	0x0004
-#define RAL_EEPROM_TXPOWER	0x003c
-#define RAL_EEPROM_CONFIG0	0x0016
-#define RAL_EEPROM_BBP_BASE	0x001c
diff --git a/include.new/dev/usb/if_uralvar.h b/include.new/dev/usb/if_uralvar.h
deleted file mode 100644
index 14fd78d..0000000
--- a/include.new/dev/usb/if_uralvar.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*	$FreeBSD: src/sys/dev/usb/if_uralvar.h,v 1.3.2.3 2006/01/29 14:16:36 damien Exp $	*/
-
-/*-
- * Copyright (c) 2005, 2006
- *	Damien Bergamini <damien.bergamini@free.fr>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#define RAL_RX_LIST_COUNT	1
-#define RAL_TX_LIST_COUNT	1
-
-struct ural_rx_radiotap_header {
-	struct ieee80211_radiotap_header wr_ihdr;
-	uint8_t		wr_flags;
-	uint8_t		wr_rate;
-	uint16_t	wr_chan_freq;
-	uint16_t	wr_chan_flags;
-	uint8_t		wr_antenna;
-	uint8_t		wr_antsignal;
-};
-
-#define RAL_RX_RADIOTAP_PRESENT						\
-	((1 << IEEE80211_RADIOTAP_FLAGS) |				\
-	 (1 << IEEE80211_RADIOTAP_RATE) |				\
-	 (1 << IEEE80211_RADIOTAP_CHANNEL) |				\
-	 (1 << IEEE80211_RADIOTAP_ANTENNA) |				\
-	 (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL))
-
-struct ural_tx_radiotap_header {
-	struct ieee80211_radiotap_header wt_ihdr;
-	uint8_t		wt_flags;
-	uint8_t		wt_rate;
-	uint16_t	wt_chan_freq;
-	uint16_t	wt_chan_flags;
-	uint8_t		wt_antenna;
-};
-
-#define RAL_TX_RADIOTAP_PRESENT						\
-	((1 << IEEE80211_RADIOTAP_FLAGS) |				\
-	 (1 << IEEE80211_RADIOTAP_RATE) |				\
-	 (1 << IEEE80211_RADIOTAP_CHANNEL) |				\
-	 (1 << IEEE80211_RADIOTAP_ANTENNA))
-
-struct ural_softc;
-
-struct ural_tx_data {
-	struct ural_softc	*sc;
-	usbd_xfer_handle	xfer;
-	uint8_t			*buf;
-	struct mbuf		*m;
-	struct ieee80211_node	*ni;
-};
-
-struct ural_rx_data {
-	struct ural_softc	*sc;
-	usbd_xfer_handle	xfer;
-	uint8_t			*buf;
-	struct mbuf		*m;
-};
-
-struct ural_amrr {
-	int	txcnt;
-	int	retrycnt;
-	int	success;
-	int	success_threshold;
-	int	recovery;
-};
-
-struct ural_softc {
-	struct ifnet			*sc_ifp;
-	struct ieee80211com		sc_ic;
-	int				(*sc_newstate)(struct ieee80211com *,
-					    enum ieee80211_state, int);
-	USBBASEDEVICE			sc_dev;
-	usbd_device_handle		sc_udev;
-	usbd_interface_handle		sc_iface;
-
-	int				sc_rx_no;
-	int				sc_tx_no;
-
-	uint32_t			asic_rev;
-	uint8_t				rf_rev;
-
-	usbd_xfer_handle		amrr_xfer;
-
-	usbd_pipe_handle		sc_rx_pipeh;
-	usbd_pipe_handle		sc_tx_pipeh;
-
-	enum ieee80211_state		sc_state;
-	struct usb_task			sc_task;
-
-	struct ural_amrr		amrr;
-
-	struct ural_rx_data		rx_data[RAL_RX_LIST_COUNT];
-	struct ural_tx_data		tx_data[RAL_TX_LIST_COUNT];
-	int				tx_queued;
-
-	struct ieee80211_beacon_offsets	sc_bo;
-
-	struct mtx			sc_mtx;
-
-	struct callout			scan_ch;
-	struct callout			amrr_ch;
-
-	int				sc_tx_timer;
-
-	uint16_t			sta[11];
-	uint32_t			rf_regs[4];
-	uint8_t				txpow[14];
-
-	struct {
-		uint8_t			val;
-		uint8_t			reg;
-	} __packed			bbp_prom[16];
-
-	int				led_mode;
-	int				hw_radio;
-	int				rx_ant;
-	int				tx_ant;
-	int				nb_ant;
-
-	struct bpf_if			*sc_drvbpf;
-
-	union {
-		struct ural_rx_radiotap_header th;
-		uint8_t	pad[64];
-	}				sc_rxtapu;
-#define sc_rxtap	sc_rxtapu.th
-	int				sc_rxtap_len;
-
-	union {
-		struct ural_tx_radiotap_header th;
-		uint8_t	pad[64];
-	}				sc_txtapu;
-#define sc_txtap	sc_txtapu.th
-	int				sc_txtap_len;
-};
-
-#if 0
-#define RAL_LOCK(sc)	mtx_lock(&(sc)->sc_mtx)
-#define RAL_UNLOCK(sc)	mtx_unlock(&(sc)->sc_mtx)
-#else
-#define RAL_LOCK(sc)	do { ((sc) = (sc)); mtx_lock(&Giant); } while (0)
-#define RAL_UNLOCK(sc)	mtx_unlock(&Giant)
-#endif
diff --git a/include.new/dev/usb/kue_fw.h b/include.new/dev/usb/kue_fw.h
deleted file mode 100644
index d70acf3..0000000
--- a/include.new/dev/usb/kue_fw.h
+++ /dev/null
@@ -1,685 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999, 2000
- *	Bill Paul <wpaul@ee.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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/dev/usb/kue_fw.h,v 1.3 2005/01/06 01:43:27 imp Exp $
- */
-
-/*
- * This file contains the firmware needed to make the KLSI chip work,
- * along with a few constants related to the QT Engine microcontroller
- * embedded in the KLSI part.
- *
- * Firmware is loaded using the vendor-specific 'send scan data'
- * command (0xFF). The basic operation is that we must load the
- * firmware, then issue some trigger commands to fix it up and start
- * it running. There are three transfers: load the binary code,
- * load the 'fixup' (data segment?), then issue a command to
- * start the code firmware running. The data itself is prefixed by
- * a 16-bit signature word, a 16-bit length value, a type byte
- * and an interrupt (command) byte. The code segment is of type
- * 0x02 (replacement interrupt vector data) and the fixup segment
- * is of type 0x03 (replacement interrupt fixup data). The interrupt
- * code is 0x64 (load new code). The length word is the total length
- * of the segment minus 7. I precomputed the values and stuck them
- * into the appropriate locations within the segments to save some
- * work in the driver.
- */
-
-/* QT controller data block types. */
-/* Write data into specific memory location. */
-#define KUE_QTBTYPE_WRITE_DATA		0x00
-/* Write data into interrupt vector location */
-#define KUE_QTBTYPE_WRITE_INTVEC	0x01
-/* Replace interrupt vector with this data */
-#define KUE_QTBTYPE_REPL_INTVEC		0x02
-/* Fixup interrupt vector code with this data */
-#define KUE_QTBTYPE_FIXUP_INTVEC	0x03
-/* Force jump to location */
-#define KUE_QTBTYPE_JUMP		0x04
-/* Force call to location */
-#define KUE_QTBTYPE_CALL		0x05
-/* Force interrupt call */
-#define KUE_QTBTYPE_CALLINTR		0x06
-/*
- * Cause data to be written using the specified QT engine
- * interrupt, from starting location in memory for a specified
- * number of bytes.
- */
-#define KUE_QTBTYPE_WRITE_WITH_INTR	0x07
-/* Cause data from stream to be written using specified QT interrupt. */
-#define KUE_QTBTYPE_WRITE_STR_WITH_INTR	0x08
-/* Cause data to be written to config locations. */
-/* Addresses assume 0xc000 offset. */
-#define KUE_QTBTYPE_WRITE_CONFIG	0x09
-
-#define KUE_QTINTR_LOAD_CODE		0x64
-#define KUE_QTINTR_TRIGGER_CODE		0x3B
-#define KUE_QTINTR_LOAD_CODE_HIGH	0x9C
-
-/* Firmware code segment */
-Static unsigned char kue_code_seg[] =
-{
-    /******************************************/
-    /* NOTE: B6/C3 is data header signature   */
-    /*       0xAA/0xBB is data length = total */
-    /*       bytes - 7, 0xCC is type, 0xDD is */
-    /*       interrupt to use.                */
-    /******************************************/
-    0xB6, 0xC3, 0xf7, 0x0e, 0x02, 0x64,
-    0x9f, 0xcf, 0xbc, 0x08, 0xe7, 0x57, 0x00, 0x00,
-    0x9a, 0x08, 0x97, 0xc1, 0xe7, 0x67, 0xff, 0x1f,
-    0x28, 0xc0, 0xe7, 0x87, 0x00, 0x04, 0x24, 0xc0,
-    0xe7, 0x67, 0xff, 0xf9, 0x22, 0xc0, 0x97, 0xcf,
-    0xe7, 0x09, 0xa2, 0xc0, 0x94, 0x08, 0xd7, 0x09,
-    0x00, 0xc0, 0xe7, 0x59, 0xba, 0x08, 0x94, 0x08,
-    0x03, 0xc1, 0xe7, 0x67, 0xff, 0xf7, 0x24, 0xc0,
-    0xe7, 0x05, 0x00, 0xc0, 0xa7, 0xcf, 0x92, 0x08,
-    0xe7, 0x57, 0x00, 0x00, 0x8e, 0x08, 0xa7, 0xa1,
-    0x8e, 0x08, 0x97, 0xcf, 0xe7, 0x57, 0x00, 0x00,
-    0xf2, 0x09, 0x0a, 0xc0, 0xe7, 0x57, 0x00, 0x00,
-    0xa4, 0xc0, 0xa7, 0xc0, 0x56, 0x08, 0x9f, 0xaf,
-    0x70, 0x09, 0xe7, 0x07, 0x00, 0x00, 0xf2, 0x09,
-    0xe7, 0x57, 0xff, 0xff, 0x90, 0x08, 0x9f, 0xa0,
-    0x40, 0x00, 0xe7, 0x59, 0x90, 0x08, 0x94, 0x08,
-    0x9f, 0xa0, 0x40, 0x00, 0xc8, 0x09, 0xa2, 0x08,
-    0x08, 0x62, 0x9f, 0xa1, 0x14, 0x0a, 0xe7, 0x57,
-    0x00, 0x00, 0x52, 0x08, 0xa7, 0xc0, 0x56, 0x08,
-    0x9f, 0xaf, 0x04, 0x00, 0xe7, 0x57, 0x00, 0x00,
-    0x8e, 0x08, 0xa7, 0xc1, 0x56, 0x08, 0xc0, 0x09,
-    0xa8, 0x08, 0x00, 0x60, 0x05, 0xc4, 0xc0, 0x59,
-    0x94, 0x08, 0x02, 0xc0, 0x9f, 0xaf, 0xee, 0x00,
-    0xe7, 0x59, 0xae, 0x08, 0x94, 0x08, 0x02, 0xc1,
-    0x9f, 0xaf, 0xf6, 0x00, 0x9f, 0xaf, 0x9e, 0x03,
-    0xef, 0x57, 0x00, 0x00, 0xf0, 0x09, 0x9f, 0xa1,
-    0xde, 0x01, 0xe7, 0x57, 0x00, 0x00, 0x78, 0x08,
-    0x9f, 0xa0, 0xe4, 0x03, 0x9f, 0xaf, 0x2c, 0x04,
-    0xa7, 0xcf, 0x56, 0x08, 0x48, 0x02, 0xe7, 0x09,
-    0x94, 0x08, 0xa8, 0x08, 0xc8, 0x37, 0x04, 0x00,
-    0x9f, 0xaf, 0x68, 0x04, 0x97, 0xcf, 0xe7, 0x57,
-    0x00, 0x00, 0xa6, 0x08, 0x97, 0xc0, 0xd7, 0x09,
-    0x00, 0xc0, 0xc1, 0xdf, 0xc8, 0x09, 0x9c, 0x08,
-    0x08, 0x62, 0x1d, 0xc0, 0x27, 0x04, 0x9c, 0x08,
-    0x10, 0x94, 0xf0, 0x07, 0xee, 0x09, 0x02, 0x00,
-    0xc1, 0x07, 0x01, 0x00, 0x70, 0x00, 0x04, 0x00,
-    0xf0, 0x07, 0x44, 0x01, 0x06, 0x00, 0x50, 0xaf,
-    0xe7, 0x09, 0x94, 0x08, 0xae, 0x08, 0xe7, 0x17,
-    0x14, 0x00, 0xae, 0x08, 0xe7, 0x67, 0xff, 0x07,
-    0xae, 0x08, 0xe7, 0x07, 0xff, 0xff, 0xa8, 0x08,
-    0xe7, 0x07, 0x00, 0x00, 0xa6, 0x08, 0xe7, 0x05,
-    0x00, 0xc0, 0x97, 0xcf, 0xd7, 0x09, 0x00, 0xc0,
-    0xc1, 0xdf, 0x48, 0x02, 0xd0, 0x09, 0x9c, 0x08,
-    0x27, 0x02, 0x9c, 0x08, 0xe7, 0x09, 0x20, 0xc0,
-    0xee, 0x09, 0xe7, 0xd0, 0xee, 0x09, 0xe7, 0x05,
-    0x00, 0xc0, 0x97, 0xcf, 0x48, 0x02, 0xc8, 0x37,
-    0x04, 0x00, 0x00, 0x0c, 0x0c, 0x00, 0x00, 0x60,
-    0x21, 0xc0, 0xc0, 0x37, 0x3e, 0x00, 0x23, 0xc9,
-    0xc0, 0x57, 0xb4, 0x05, 0x1b, 0xc8, 0xc0, 0x17,
-    0x3f, 0x00, 0xc0, 0x67, 0xc0, 0xff, 0x30, 0x00,
-    0x08, 0x00, 0xf0, 0x07, 0x00, 0x00, 0x04, 0x00,
-    0x00, 0x02, 0xc0, 0x17, 0x4c, 0x00, 0x30, 0x00,
-    0x06, 0x00, 0xf0, 0x07, 0xbe, 0x01, 0x0a, 0x00,
-    0x48, 0x02, 0xc1, 0x07, 0x02, 0x00, 0xd7, 0x09,
-    0x00, 0xc0, 0xc1, 0xdf, 0x51, 0xaf, 0xe7, 0x05,
-    0x00, 0xc0, 0x97, 0xcf, 0x9f, 0xaf, 0x68, 0x04,
-    0x9f, 0xaf, 0xe4, 0x03, 0x97, 0xcf, 0x9f, 0xaf,
-    0xe4, 0x03, 0xc9, 0x37, 0x04, 0x00, 0xc1, 0xdf,
-    0xc8, 0x09, 0x70, 0x08, 0x50, 0x02, 0x67, 0x02,
-    0x70, 0x08, 0xd1, 0x07, 0x00, 0x00, 0xc0, 0xdf,
-    0x9f, 0xaf, 0xde, 0x01, 0x97, 0xcf, 0xe7, 0x57,
-    0x00, 0x00, 0xaa, 0x08, 0x97, 0xc1, 0xe7, 0x57,
-    0x01, 0x00, 0x7a, 0x08, 0x97, 0xc0, 0xc8, 0x09,
-    0x6e, 0x08, 0x08, 0x62, 0x97, 0xc0, 0x00, 0x02,
-    0xc0, 0x17, 0x0e, 0x00, 0x27, 0x00, 0x34, 0x01,
-    0x27, 0x0c, 0x0c, 0x00, 0x36, 0x01, 0xef, 0x57,
-    0x00, 0x00, 0xf0, 0x09, 0x9f, 0xc0, 0xbe, 0x02,
-    0xe7, 0x57, 0x00, 0x00, 0xb0, 0x08, 0x97, 0xc1,
-    0xe7, 0x07, 0x09, 0x00, 0x12, 0xc0, 0xe7, 0x77,
-    0x00, 0x08, 0x20, 0xc0, 0x9f, 0xc1, 0xb6, 0x02,
-    0xe7, 0x57, 0x09, 0x00, 0x12, 0xc0, 0x77, 0xc9,
-    0xd7, 0x09, 0x00, 0xc0, 0xc1, 0xdf, 0xe7, 0x77,
-    0x00, 0x08, 0x20, 0xc0, 0x2f, 0xc1, 0xe7, 0x07,
-    0x00, 0x00, 0x42, 0xc0, 0xe7, 0x07, 0x05, 0x00,
-    0x90, 0xc0, 0xc8, 0x07, 0x0a, 0x00, 0xe7, 0x77,
-    0x04, 0x00, 0x20, 0xc0, 0x09, 0xc1, 0x08, 0xda,
-    0x7a, 0xc1, 0xe7, 0x07, 0x00, 0x01, 0x42, 0xc0,
-    0xe7, 0x07, 0x04, 0x00, 0x90, 0xc0, 0x1a, 0xcf,
-    0xe7, 0x07, 0x01, 0x00, 0x7a, 0x08, 0x00, 0xd8,
-    0x27, 0x50, 0x34, 0x01, 0x17, 0xc1, 0xe7, 0x77,
-    0x02, 0x00, 0x20, 0xc0, 0x79, 0xc1, 0x27, 0x50,
-    0x34, 0x01, 0x10, 0xc1, 0xe7, 0x77, 0x02, 0x00,
-    0x20, 0xc0, 0x79, 0xc0, 0x9f, 0xaf, 0xd8, 0x02,
-    0xe7, 0x05, 0x00, 0xc0, 0x00, 0x60, 0x9f, 0xc0,
-    0xde, 0x01, 0x97, 0xcf, 0xe7, 0x07, 0x01, 0x00,
-    0xb8, 0x08, 0x06, 0xcf, 0xe7, 0x07, 0x30, 0x0e,
-    0x02, 0x00, 0xe7, 0x07, 0x50, 0xc3, 0x12, 0xc0,
-    0xe7, 0x05, 0x00, 0xc0, 0x97, 0xcf, 0xe7, 0x07,
-    0x01, 0x00, 0xb8, 0x08, 0x97, 0xcf, 0xe7, 0x07,
-    0x50, 0xc3, 0x12, 0xc0, 0xe7, 0x07, 0x30, 0x0e,
-    0x02, 0x00, 0xe7, 0x07, 0x01, 0x00, 0x7a, 0x08,
-    0xe7, 0x07, 0x05, 0x00, 0x90, 0xc0, 0x97, 0xcf,
-    0xe7, 0x07, 0x00, 0x01, 0x42, 0xc0, 0xe7, 0x07,
-    0x04, 0x00, 0x90, 0xc0, 0xe7, 0x07, 0x00, 0x00,
-    0x7a, 0x08, 0xe7, 0x57, 0x0f, 0x00, 0xb2, 0x08,
-    0x13, 0xc1, 0x9f, 0xaf, 0x2e, 0x08, 0xca, 0x09,
-    0xac, 0x08, 0xf2, 0x17, 0x01, 0x00, 0x5c, 0x00,
-    0xf2, 0x27, 0x00, 0x00, 0x5e, 0x00, 0xe7, 0x07,
-    0x00, 0x00, 0xb2, 0x08, 0xe7, 0x07, 0x01, 0x00,
-    0xb4, 0x08, 0xc0, 0x07, 0xff, 0xff, 0x97, 0xcf,
-    0x9f, 0xaf, 0x4c, 0x03, 0xc0, 0x69, 0xb4, 0x08,
-    0x57, 0x00, 0x9f, 0xde, 0x33, 0x00, 0xc1, 0x05,
-    0x27, 0xd8, 0xb2, 0x08, 0x27, 0xd2, 0xb4, 0x08,
-    0xe7, 0x87, 0x01, 0x00, 0xb4, 0x08, 0xe7, 0x67,
-    0xff, 0x03, 0xb4, 0x08, 0x00, 0x60, 0x97, 0xc0,
-    0xe7, 0x07, 0x01, 0x00, 0xb0, 0x08, 0x27, 0x00,
-    0x12, 0xc0, 0x97, 0xcf, 0xc0, 0x09, 0xb6, 0x08,
-    0x00, 0xd2, 0x02, 0xc3, 0xc0, 0x97, 0x05, 0x80,
-    0x27, 0x00, 0xb6, 0x08, 0xc0, 0x99, 0x82, 0x08,
-    0xc0, 0x99, 0xa2, 0xc0, 0x97, 0xcf, 0xe7, 0x07,
-    0x00, 0x00, 0xb0, 0x08, 0xc0, 0xdf, 0x97, 0xcf,
-    0xc8, 0x09, 0x72, 0x08, 0x08, 0x62, 0x02, 0xc0,
-    0x10, 0x64, 0x07, 0xc1, 0xe7, 0x07, 0x00, 0x00,
-    0x64, 0x08, 0xe7, 0x07, 0xc8, 0x05, 0x24, 0x00,
-    0x97, 0xcf, 0x27, 0x04, 0x72, 0x08, 0xc8, 0x17,
-    0x0e, 0x00, 0x27, 0x02, 0x64, 0x08, 0xe7, 0x07,
-    0xd6, 0x05, 0x24, 0x00, 0x97, 0xcf, 0xd7, 0x09,
-    0x00, 0xc0, 0xc1, 0xdf, 0xe7, 0x57, 0x00, 0x00,
-    0x62, 0x08, 0x13, 0xc1, 0x9f, 0xaf, 0x70, 0x03,
-    0xe7, 0x57, 0x00, 0x00, 0x64, 0x08, 0x13, 0xc0,
-    0xe7, 0x09, 0x64, 0x08, 0x30, 0x01, 0xe7, 0x07,
-    0xf2, 0x05, 0x32, 0x01, 0xe7, 0x07, 0x10, 0x00,
-    0x96, 0xc0, 0xe7, 0x09, 0x64, 0x08, 0x62, 0x08,
-    0x04, 0xcf, 0xe7, 0x57, 0x00, 0x00, 0x64, 0x08,
-    0x02, 0xc1, 0x9f, 0xaf, 0x70, 0x03, 0xe7, 0x05,
-    0x00, 0xc0, 0x97, 0xcf, 0xd7, 0x09, 0x00, 0xc0,
-    0xc1, 0xdf, 0xc8, 0x09, 0x72, 0x08, 0x27, 0x02,
-    0x78, 0x08, 0x08, 0x62, 0x03, 0xc1, 0xe7, 0x05,
-    0x00, 0xc0, 0x97, 0xcf, 0x27, 0x04, 0x72, 0x08,
-    0xe7, 0x05, 0x00, 0xc0, 0xf0, 0x07, 0x40, 0x00,
-    0x08, 0x00, 0xf0, 0x07, 0x00, 0x00, 0x04, 0x00,
-    0x00, 0x02, 0xc0, 0x17, 0x0c, 0x00, 0x30, 0x00,
-    0x06, 0x00, 0xf0, 0x07, 0x64, 0x01, 0x0a, 0x00,
-    0xc8, 0x17, 0x04, 0x00, 0xc1, 0x07, 0x02, 0x00,
-    0x51, 0xaf, 0x97, 0xcf, 0xe7, 0x57, 0x00, 0x00,
-    0x6a, 0x08, 0x97, 0xc0, 0xc1, 0xdf, 0xc8, 0x09,
-    0x6a, 0x08, 0x27, 0x04, 0x6a, 0x08, 0x27, 0x52,
-    0x6c, 0x08, 0x03, 0xc1, 0xe7, 0x07, 0x6a, 0x08,
-    0x6c, 0x08, 0xc0, 0xdf, 0x17, 0x02, 0xc8, 0x17,
-    0x0e, 0x00, 0x9f, 0xaf, 0x16, 0x05, 0xc8, 0x05,
-    0x00, 0x60, 0x03, 0xc0, 0x9f, 0xaf, 0x80, 0x04,
-    0x97, 0xcf, 0x9f, 0xaf, 0x68, 0x04, 0x97, 0xcf,
-    0xd7, 0x09, 0x00, 0xc0, 0xc1, 0xdf, 0x08, 0x62,
-    0x1c, 0xc0, 0xd0, 0x09, 0x72, 0x08, 0x27, 0x02,
-    0x72, 0x08, 0xe7, 0x05, 0x00, 0xc0, 0x97, 0xcf,
-    0x97, 0x02, 0xca, 0x09, 0xac, 0x08, 0xf2, 0x17,
-    0x01, 0x00, 0x04, 0x00, 0xf2, 0x27, 0x00, 0x00,
-    0x06, 0x00, 0xca, 0x17, 0x2c, 0x00, 0xf8, 0x77,
-    0x01, 0x00, 0x0e, 0x00, 0x06, 0xc0, 0xca, 0xd9,
-    0xf8, 0x57, 0xff, 0x00, 0x0e, 0x00, 0x01, 0xc1,
-    0xca, 0xd9, 0x22, 0x1c, 0x0c, 0x00, 0xe2, 0x27,
-    0x00, 0x00, 0xe2, 0x17, 0x01, 0x00, 0xe2, 0x27,
-    0x00, 0x00, 0xca, 0x05, 0x00, 0x0c, 0x0c, 0x00,
-    0xc0, 0x17, 0x41, 0x00, 0xc0, 0x67, 0xc0, 0xff,
-    0x30, 0x00, 0x08, 0x00, 0x00, 0x02, 0xc0, 0x17,
-    0x0c, 0x00, 0x30, 0x00, 0x06, 0x00, 0xf0, 0x07,
-    0xdc, 0x00, 0x0a, 0x00, 0xf0, 0x07, 0x00, 0x00,
-    0x04, 0x00, 0x00, 0x0c, 0x08, 0x00, 0x40, 0xd1,
-    0x01, 0x00, 0xc0, 0x19, 0xa6, 0x08, 0xc0, 0x59,
-    0x98, 0x08, 0x04, 0xc9, 0x49, 0xaf, 0x9f, 0xaf,
-    0xee, 0x00, 0x4a, 0xaf, 0x67, 0x10, 0xa6, 0x08,
-    0xc8, 0x17, 0x04, 0x00, 0xc1, 0x07, 0x01, 0x00,
-    0xd7, 0x09, 0x00, 0xc0, 0xc1, 0xdf, 0x50, 0xaf,
-    0xe7, 0x05, 0x00, 0xc0, 0x97, 0xcf, 0xc0, 0x07,
-    0x01, 0x00, 0xc1, 0x09, 0x7c, 0x08, 0xc1, 0x77,
-    0x01, 0x00, 0x97, 0xc1, 0xd8, 0x77, 0x01, 0x00,
-    0x12, 0xc0, 0xc9, 0x07, 0x4c, 0x08, 0x9f, 0xaf,
-    0x64, 0x05, 0x04, 0xc1, 0xc1, 0x77, 0x08, 0x00,
-    0x13, 0xc0, 0x97, 0xcf, 0xc1, 0x77, 0x02, 0x00,
-    0x97, 0xc1, 0xc1, 0x77, 0x10, 0x00, 0x0c, 0xc0,
-    0x9f, 0xaf, 0x86, 0x05, 0x97, 0xcf, 0xc1, 0x77,
-    0x04, 0x00, 0x06, 0xc0, 0xc9, 0x07, 0x7e, 0x08,
-    0x9f, 0xaf, 0x64, 0x05, 0x97, 0xc0, 0x00, 0xcf,
-    0x00, 0x90, 0x97, 0xcf, 0x50, 0x54, 0x97, 0xc1,
-    0x70, 0x5c, 0x02, 0x00, 0x02, 0x00, 0x97, 0xc1,
-    0x70, 0x5c, 0x04, 0x00, 0x04, 0x00, 0x97, 0xcf,
-    0xc0, 0x00, 0x60, 0x00, 0x30, 0x00, 0x18, 0x00,
-    0x0c, 0x00, 0x06, 0x00, 0x00, 0x00, 0xcb, 0x09,
-    0x88, 0x08, 0xcc, 0x09, 0x8a, 0x08, 0x0b, 0x53,
-    0x11, 0xc0, 0xc9, 0x02, 0xca, 0x07, 0x78, 0x05,
-    0x9f, 0xaf, 0x64, 0x05, 0x97, 0xc0, 0x0a, 0xc8,
-    0x82, 0x08, 0x0a, 0xcf, 0x82, 0x08, 0x9f, 0xaf,
-    0x64, 0x05, 0x97, 0xc0, 0x05, 0xc2, 0x89, 0x30,
-    0x82, 0x60, 0x78, 0xc1, 0x00, 0x90, 0x97, 0xcf,
-    0x89, 0x10, 0x09, 0x53, 0x79, 0xc2, 0x89, 0x30,
-    0x82, 0x08, 0x7a, 0xcf, 0xc0, 0xdf, 0x97, 0xcf,
-    0xe7, 0x09, 0x96, 0xc0, 0x66, 0x08, 0xe7, 0x09,
-    0x98, 0xc0, 0x68, 0x08, 0x0f, 0xcf, 0xe7, 0x09,
-    0x96, 0xc0, 0x66, 0x08, 0xe7, 0x09, 0x98, 0xc0,
-    0x68, 0x08, 0xe7, 0x09, 0x64, 0x08, 0x30, 0x01,
-    0xe7, 0x07, 0xf2, 0x05, 0x32, 0x01, 0xe7, 0x07,
-    0x10, 0x00, 0x96, 0xc0, 0xd7, 0x09, 0x00, 0xc0,
-    0x17, 0x02, 0xc8, 0x09, 0x62, 0x08, 0xc8, 0x37,
-    0x0e, 0x00, 0xe7, 0x57, 0x04, 0x00, 0x68, 0x08,
-    0x3d, 0xc0, 0xe7, 0x87, 0x00, 0x08, 0x24, 0xc0,
-    0xe7, 0x09, 0x94, 0x08, 0xba, 0x08, 0xe7, 0x17,
-    0x64, 0x00, 0xba, 0x08, 0xe7, 0x67, 0xff, 0x07,
-    0xba, 0x08, 0xe7, 0x77, 0x2a, 0x00, 0x66, 0x08,
-    0x30, 0xc0, 0x97, 0x02, 0xca, 0x09, 0xac, 0x08,
-    0xe7, 0x77, 0x20, 0x00, 0x66, 0x08, 0x0e, 0xc0,
-    0xf2, 0x17, 0x01, 0x00, 0x10, 0x00, 0xf2, 0x27,
-    0x00, 0x00, 0x12, 0x00, 0xe7, 0x77, 0x0a, 0x00,
-    0x66, 0x08, 0xca, 0x05, 0x1e, 0xc0, 0x97, 0x02,
-    0xca, 0x09, 0xac, 0x08, 0xf2, 0x17, 0x01, 0x00,
-    0x0c, 0x00, 0xf2, 0x27, 0x00, 0x00, 0x0e, 0x00,
-    0xe7, 0x77, 0x02, 0x00, 0x66, 0x08, 0x07, 0xc0,
-    0xf2, 0x17, 0x01, 0x00, 0x44, 0x00, 0xf2, 0x27,
-    0x00, 0x00, 0x46, 0x00, 0x06, 0xcf, 0xf2, 0x17,
-    0x01, 0x00, 0x60, 0x00, 0xf2, 0x27, 0x00, 0x00,
-    0x62, 0x00, 0xca, 0x05, 0x9f, 0xaf, 0x68, 0x04,
-    0x0f, 0xcf, 0x57, 0x02, 0x09, 0x02, 0xf1, 0x09,
-    0x68, 0x08, 0x0c, 0x00, 0xf1, 0xda, 0x0c, 0x00,
-    0xc8, 0x09, 0x6c, 0x08, 0x50, 0x02, 0x67, 0x02,
-    0x6c, 0x08, 0xd1, 0x07, 0x00, 0x00, 0xc9, 0x05,
-    0xe7, 0x09, 0x64, 0x08, 0x62, 0x08, 0xe7, 0x57,
-    0x00, 0x00, 0x62, 0x08, 0x02, 0xc0, 0x9f, 0xaf,
-    0x70, 0x03, 0xc8, 0x05, 0xe7, 0x05, 0x00, 0xc0,
-    0xc0, 0xdf, 0x97, 0xcf, 0xd7, 0x09, 0x00, 0xc0,
-    0x17, 0x00, 0x17, 0x02, 0x97, 0x02, 0xc0, 0x09,
-    0x92, 0xc0, 0xe7, 0x87, 0x00, 0x08, 0x24, 0xc0,
-    0xe7, 0x09, 0x94, 0x08, 0xba, 0x08, 0xe7, 0x17,
-    0x64, 0x00, 0xba, 0x08, 0xe7, 0x67, 0xff, 0x07,
-    0xba, 0x08, 0xe7, 0x07, 0x04, 0x00, 0x90, 0xc0,
-    0xca, 0x09, 0xac, 0x08, 0xe7, 0x07, 0x00, 0x00,
-    0x7a, 0x08, 0xe7, 0x07, 0x66, 0x03, 0x02, 0x00,
-    0xc0, 0x77, 0x02, 0x00, 0x10, 0xc0, 0xef, 0x57,
-    0x00, 0x00, 0xf0, 0x09, 0x04, 0xc0, 0x9f, 0xaf,
-    0xd8, 0x02, 0x9f, 0xcf, 0x12, 0x08, 0xf2, 0x17,
-    0x01, 0x00, 0x50, 0x00, 0xf2, 0x27, 0x00, 0x00,
-    0x52, 0x00, 0x9f, 0xcf, 0x12, 0x08, 0xef, 0x57,
-    0x00, 0x00, 0xf0, 0x09, 0x08, 0xc0, 0xe7, 0x57,
-    0x00, 0x00, 0xb8, 0x08, 0xe7, 0x07, 0x00, 0x00,
-    0xb8, 0x08, 0x0a, 0xc0, 0x03, 0xcf, 0xc0, 0x77,
-    0x10, 0x00, 0x06, 0xc0, 0xf2, 0x17, 0x01, 0x00,
-    0x58, 0x00, 0xf2, 0x27, 0x00, 0x00, 0x5a, 0x00,
-    0xc0, 0x77, 0x80, 0x00, 0x06, 0xc0, 0xf2, 0x17,
-    0x01, 0x00, 0x70, 0x00, 0xf2, 0x27, 0x00, 0x00,
-    0x72, 0x00, 0xc0, 0x77, 0x08, 0x00, 0x1d, 0xc1,
-    0xf2, 0x17, 0x01, 0x00, 0x08, 0x00, 0xf2, 0x27,
-    0x00, 0x00, 0x0a, 0x00, 0xc0, 0x77, 0x00, 0x02,
-    0x06, 0xc0, 0xf2, 0x17, 0x01, 0x00, 0x64, 0x00,
-    0xf2, 0x27, 0x00, 0x00, 0x66, 0x00, 0xc0, 0x77,
-    0x40, 0x00, 0x06, 0xc0, 0xf2, 0x17, 0x01, 0x00,
-    0x5c, 0x00, 0xf2, 0x27, 0x00, 0x00, 0x5e, 0x00,
-    0xc0, 0x77, 0x01, 0x00, 0x01, 0xc0, 0x37, 0xcf,
-    0x36, 0xcf, 0xf2, 0x17, 0x01, 0x00, 0x00, 0x00,
-    0xf2, 0x27, 0x00, 0x00, 0x02, 0x00, 0xef, 0x57,
-    0x00, 0x00, 0xf0, 0x09, 0x18, 0xc0, 0xe7, 0x57,
-    0x01, 0x00, 0xb2, 0x08, 0x0e, 0xc2, 0x07, 0xc8,
-    0xf2, 0x17, 0x01, 0x00, 0x50, 0x00, 0xf2, 0x27,
-    0x00, 0x00, 0x52, 0x00, 0x06, 0xcf, 0xf2, 0x17,
-    0x01, 0x00, 0x54, 0x00, 0xf2, 0x27, 0x00, 0x00,
-    0x56, 0x00, 0xe7, 0x07, 0x00, 0x00, 0xb2, 0x08,
-    0xe7, 0x07, 0x01, 0x00, 0xb4, 0x08, 0xc8, 0x09,
-    0x34, 0x01, 0xca, 0x17, 0x14, 0x00, 0xd8, 0x77,
-    0x01, 0x00, 0x05, 0xc0, 0xca, 0xd9, 0xd8, 0x57,
-    0xff, 0x00, 0x01, 0xc0, 0xca, 0xd9, 0xe2, 0x19,
-    0x94, 0xc0, 0xe2, 0x27, 0x00, 0x00, 0xe2, 0x17,
-    0x01, 0x00, 0xe2, 0x27, 0x00, 0x00, 0x9f, 0xaf,
-    0x2e, 0x08, 0x9f, 0xaf, 0xde, 0x01, 0xe7, 0x57,
-    0x00, 0x00, 0xaa, 0x08, 0x9f, 0xa1, 0xf0, 0x0b,
-    0xca, 0x05, 0xc8, 0x05, 0xc0, 0x05, 0xe7, 0x05,
-    0x00, 0xc0, 0xc0, 0xdf, 0x97, 0xcf, 0xc8, 0x09,
-    0x6e, 0x08, 0x08, 0x62, 0x97, 0xc0, 0x27, 0x04,
-    0x6e, 0x08, 0x27, 0x52, 0x70, 0x08, 0x03, 0xc1,
-    0xe7, 0x07, 0x6e, 0x08, 0x70, 0x08, 0x9f, 0xaf,
-    0x68, 0x04, 0x97, 0xcf, 0xff, 0xff, 0xff, 0xff,
-    0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0xff, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x33, 0xcc,
-    0x00, 0x00, 0x00, 0x00, 0xe7, 0x57, 0x00, 0x80,
-    0xb2, 0x00, 0x06, 0xc2, 0xe7, 0x07, 0x52, 0x0e,
-    0x12, 0x00, 0xe7, 0x07, 0x98, 0x0e, 0xb2, 0x00,
-    0xe7, 0x07, 0xa4, 0x09, 0xf2, 0x02, 0xc8, 0x09,
-    0xb4, 0x00, 0xf8, 0x07, 0x02, 0x00, 0x0d, 0x00,
-    0xd7, 0x09, 0x0e, 0xc0, 0xe7, 0x07, 0x00, 0x00,
-    0x0e, 0xc0, 0xc8, 0x09, 0xdc, 0x00, 0xf0, 0x07,
-    0xff, 0xff, 0x09, 0x00, 0xf0, 0x07, 0xfb, 0x13,
-    0x0b, 0x00, 0xe7, 0x09, 0xc0, 0x00, 0x58, 0x08,
-    0xe7, 0x09, 0xbe, 0x00, 0x54, 0x08, 0xe7, 0x09,
-    0x10, 0x00, 0x92, 0x08, 0xc8, 0x07, 0xb4, 0x09,
-    0x9f, 0xaf, 0x8c, 0x09, 0x9f, 0xaf, 0xe2, 0x0b,
-    0xc0, 0x07, 0x80, 0x01, 0x44, 0xaf, 0x27, 0x00,
-    0x88, 0x08, 0x27, 0x00, 0x8a, 0x08, 0x27, 0x00,
-    0x8c, 0x08, 0xc0, 0x07, 0x74, 0x00, 0x44, 0xaf,
-    0x27, 0x00, 0xac, 0x08, 0x08, 0x00, 0x00, 0x90,
-    0xc1, 0x07, 0x1d, 0x00, 0x20, 0x00, 0x20, 0x00,
-    0x01, 0xda, 0x7c, 0xc1, 0x9f, 0xaf, 0x8a, 0x0b,
-    0xc0, 0x07, 0x4c, 0x00, 0x48, 0xaf, 0x27, 0x00,
-    0x56, 0x08, 0x9f, 0xaf, 0x72, 0x0c, 0xe7, 0x07,
-    0x00, 0x80, 0x96, 0x08, 0xef, 0x57, 0x00, 0x00,
-    0xf0, 0x09, 0x03, 0xc0, 0xe7, 0x07, 0x01, 0x00,
-    0x1c, 0xc0, 0xe7, 0x05, 0x0e, 0xc0, 0x97, 0xcf,
-    0x49, 0xaf, 0xe7, 0x87, 0x43, 0x00, 0x0e, 0xc0,
-    0xe7, 0x07, 0xff, 0xff, 0x94, 0x08, 0x9f, 0xaf,
-    0x8a, 0x0c, 0xc0, 0x07, 0x01, 0x00, 0x60, 0xaf,
-    0x4a, 0xaf, 0x97, 0xcf, 0x00, 0x08, 0x09, 0x08,
-    0x11, 0x08, 0x00, 0xda, 0x7c, 0xc1, 0x97, 0xcf,
-    0x67, 0x04, 0xcc, 0x02, 0xc0, 0xdf, 0x51, 0x94,
-    0xb1, 0xaf, 0x06, 0x00, 0xc1, 0xdf, 0xc9, 0x09,
-    0xcc, 0x02, 0x49, 0x62, 0x75, 0xc1, 0xc0, 0xdf,
-    0xa7, 0xcf, 0xd6, 0x02, 0x0e, 0x00, 0x24, 0x00,
-    0xd6, 0x05, 0x22, 0x00, 0xc4, 0x06, 0xd0, 0x00,
-    0xf0, 0x0b, 0xaa, 0x00, 0x0e, 0x0a, 0xbe, 0x00,
-    0x2c, 0x0c, 0x10, 0x00, 0x20, 0x00, 0x04, 0x00,
-    0xc4, 0x05, 0x02, 0x00, 0x66, 0x03, 0x06, 0x00,
-    0x00, 0x00, 0x24, 0xc0, 0x04, 0x04, 0x28, 0xc0,
-    0xfe, 0xfb, 0x1e, 0xc0, 0x00, 0x04, 0x22, 0xc0,
-    0xff, 0xf0, 0xc0, 0x00, 0x60, 0x0b, 0x00, 0x00,
-    0x00, 0x00, 0xff, 0xff, 0x34, 0x0a, 0x3e, 0x0a,
-    0x9e, 0x0a, 0xa8, 0x0a, 0xce, 0x0a, 0xd2, 0x0a,
-    0xd6, 0x0a, 0x00, 0x0b, 0x10, 0x0b, 0x1e, 0x0b,
-    0x20, 0x0b, 0x28, 0x0b, 0x28, 0x0b, 0x27, 0x02,
-    0xa2, 0x08, 0x97, 0xcf, 0xe7, 0x07, 0x00, 0x00,
-    0xa2, 0x08, 0x0a, 0x0e, 0x01, 0x00, 0xca, 0x57,
-    0x0e, 0x00, 0x9f, 0xc3, 0x2a, 0x0b, 0xca, 0x37,
-    0x00, 0x00, 0x9f, 0xc2, 0x2a, 0x0b, 0x0a, 0xd2,
-    0xb2, 0xcf, 0xf4, 0x09, 0xc8, 0x09, 0xde, 0x00,
-    0x07, 0x06, 0x9f, 0xcf, 0x3c, 0x0b, 0xf0, 0x57,
-    0x80, 0x01, 0x06, 0x00, 0x9f, 0xc8, 0x2a, 0x0b,
-    0x27, 0x0c, 0x02, 0x00, 0x86, 0x08, 0xc0, 0x09,
-    0x88, 0x08, 0x27, 0x00, 0x8a, 0x08, 0xe7, 0x07,
-    0x00, 0x00, 0x84, 0x08, 0x27, 0x00, 0x5c, 0x08,
-    0x00, 0x1c, 0x06, 0x00, 0x27, 0x00, 0x8c, 0x08,
-    0x41, 0x90, 0x67, 0x50, 0x86, 0x08, 0x0d, 0xc0,
-    0x67, 0x00, 0x5a, 0x08, 0x27, 0x0c, 0x06, 0x00,
-    0x5e, 0x08, 0xe7, 0x07, 0x8a, 0x0a, 0x60, 0x08,
-    0xc8, 0x07, 0x5a, 0x08, 0x41, 0x90, 0x51, 0xaf,
-    0x97, 0xcf, 0x9f, 0xaf, 0xac, 0x0e, 0xe7, 0x09,
-    0x8c, 0x08, 0x8a, 0x08, 0xe7, 0x09, 0x86, 0x08,
-    0x84, 0x08, 0x59, 0xaf, 0x97, 0xcf, 0x27, 0x0c,
-    0x02, 0x00, 0x7c, 0x08, 0x59, 0xaf, 0x97, 0xcf,
-    0x09, 0x0c, 0x02, 0x00, 0x09, 0xda, 0x49, 0xd2,
-    0xc9, 0x19, 0xac, 0x08, 0xc8, 0x07, 0x5a, 0x08,
-    0xe0, 0x07, 0x00, 0x00, 0x60, 0x02, 0xe0, 0x07,
-    0x04, 0x00, 0xd0, 0x07, 0x9a, 0x0a, 0x48, 0xdb,
-    0x41, 0x90, 0x50, 0xaf, 0x97, 0xcf, 0x59, 0xaf,
-    0x97, 0xcf, 0x59, 0xaf, 0x97, 0xcf, 0xf0, 0x57,
-    0x06, 0x00, 0x06, 0x00, 0x26, 0xc1, 0xe7, 0x07,
-    0x7e, 0x08, 0x5c, 0x08, 0x41, 0x90, 0x67, 0x00,
-    0x5a, 0x08, 0x27, 0x0c, 0x06, 0x00, 0x5e, 0x08,
-    0xe7, 0x07, 0x5c, 0x0b, 0x60, 0x08, 0xc8, 0x07,
-    0x5a, 0x08, 0x41, 0x90, 0x51, 0xaf, 0x97, 0xcf,
-    0x07, 0x0c, 0x06, 0x00, 0xc7, 0x57, 0x06, 0x00,
-    0x10, 0xc1, 0xc8, 0x07, 0x7e, 0x08, 0x16, 0xcf,
-    0x00, 0x0c, 0x02, 0x00, 0x00, 0xda, 0x40, 0xd1,
-    0x27, 0x00, 0x98, 0x08, 0x1f, 0xcf, 0x1e, 0xcf,
-    0x27, 0x0c, 0x02, 0x00, 0xa4, 0x08, 0x1a, 0xcf,
-    0x00, 0xcf, 0x27, 0x02, 0x20, 0x01, 0xe7, 0x07,
-    0x08, 0x00, 0x22, 0x01, 0xe7, 0x07, 0x13, 0x00,
-    0xb0, 0xc0, 0x97, 0xcf, 0x41, 0x90, 0x67, 0x00,
-    0x5a, 0x08, 0xe7, 0x01, 0x5e, 0x08, 0x27, 0x02,
-    0x5c, 0x08, 0xe7, 0x07, 0x5c, 0x0b, 0x60, 0x08,
-    0xc8, 0x07, 0x5a, 0x08, 0xc1, 0x07, 0x00, 0x80,
-    0x50, 0xaf, 0x97, 0xcf, 0x59, 0xaf, 0x97, 0xcf,
-    0x00, 0x60, 0x05, 0xc0, 0xe7, 0x07, 0x00, 0x00,
-    0x9a, 0x08, 0xa7, 0xcf, 0x58, 0x08, 0x9f, 0xaf,
-    0xe2, 0x0b, 0xe7, 0x07, 0x01, 0x00, 0x9a, 0x08,
-    0x49, 0xaf, 0xd7, 0x09, 0x00, 0xc0, 0x07, 0xaf,
-    0xe7, 0x05, 0x00, 0xc0, 0x4a, 0xaf, 0xa7, 0xcf,
-    0x58, 0x08, 0xc0, 0x07, 0x40, 0x00, 0x44, 0xaf,
-    0x27, 0x00, 0xa0, 0x08, 0x08, 0x00, 0xc0, 0x07,
-    0x20, 0x00, 0x20, 0x94, 0x00, 0xda, 0x7d, 0xc1,
-    0xc0, 0x07, 0xfe, 0x7f, 0x44, 0xaf, 0x40, 0x00,
-    0x41, 0x90, 0xc0, 0x37, 0x08, 0x00, 0xdf, 0xde,
-    0x50, 0x06, 0xc0, 0x57, 0x10, 0x00, 0x02, 0xc2,
-    0xc0, 0x07, 0x10, 0x00, 0x27, 0x00, 0x76, 0x08,
-    0x41, 0x90, 0x9f, 0xde, 0x40, 0x06, 0x44, 0xaf,
-    0x27, 0x00, 0x74, 0x08, 0xc0, 0x09, 0x76, 0x08,
-    0x41, 0x90, 0x00, 0xd2, 0x00, 0xd8, 0x9f, 0xde,
-    0x08, 0x00, 0x44, 0xaf, 0x27, 0x00, 0x9e, 0x08,
-    0x97, 0xcf, 0xe7, 0x87, 0x00, 0x84, 0x28, 0xc0,
-    0xe7, 0x67, 0xff, 0xf3, 0x24, 0xc0, 0x97, 0xcf,
-    0xe7, 0x87, 0x01, 0x00, 0xaa, 0x08, 0xe7, 0x57,
-    0x00, 0x00, 0x7a, 0x08, 0x97, 0xc1, 0x9f, 0xaf,
-    0xe2, 0x0b, 0xe7, 0x87, 0x00, 0x06, 0x22, 0xc0,
-    0xe7, 0x07, 0x00, 0x00, 0x90, 0xc0, 0xe7, 0x67,
-    0xfe, 0xff, 0x3e, 0xc0, 0xe7, 0x07, 0x2e, 0x00,
-    0x0a, 0xc0, 0xe7, 0x87, 0x01, 0x00, 0x3e, 0xc0,
-    0xe7, 0x07, 0xff, 0xff, 0x94, 0x08, 0x9f, 0xaf,
-    0xf0, 0x0c, 0x97, 0xcf, 0x17, 0x00, 0xa7, 0xaf,
-    0x54, 0x08, 0xc0, 0x05, 0x27, 0x00, 0x52, 0x08,
-    0xe7, 0x87, 0x01, 0x00, 0xaa, 0x08, 0x9f, 0xaf,
-    0xe2, 0x0b, 0xe7, 0x07, 0x0c, 0x00, 0x40, 0xc0,
-    0x9f, 0xaf, 0xf0, 0x0c, 0xe7, 0x07, 0x00, 0x00,
-    0x78, 0x08, 0x00, 0x90, 0xe7, 0x09, 0x88, 0x08,
-    0x8a, 0x08, 0x27, 0x00, 0x84, 0x08, 0x27, 0x00,
-    0x7c, 0x08, 0x9f, 0xaf, 0x8a, 0x0c, 0xe7, 0x07,
-    0x00, 0x00, 0xb2, 0x02, 0xe7, 0x07, 0x00, 0x00,
-    0xb4, 0x02, 0xc0, 0x07, 0x06, 0x00, 0xc8, 0x09,
-    0xde, 0x00, 0xc8, 0x17, 0x03, 0x00, 0xc9, 0x07,
-    0x7e, 0x08, 0x29, 0x0a, 0x00, 0xda, 0x7d, 0xc1,
-    0x97, 0xcf, 0xd7, 0x09, 0x00, 0xc0, 0xc1, 0xdf,
-    0x00, 0x90, 0x27, 0x00, 0x6a, 0x08, 0xe7, 0x07,
-    0x6a, 0x08, 0x6c, 0x08, 0x27, 0x00, 0x6e, 0x08,
-    0xe7, 0x07, 0x6e, 0x08, 0x70, 0x08, 0x27, 0x00,
-    0x78, 0x08, 0x27, 0x00, 0x62, 0x08, 0x27, 0x00,
-    0x64, 0x08, 0xc8, 0x09, 0x74, 0x08, 0xc1, 0x09,
-    0x76, 0x08, 0xc9, 0x07, 0x72, 0x08, 0x11, 0x02,
-    0x09, 0x02, 0xc8, 0x17, 0x40, 0x06, 0x01, 0xda,
-    0x7a, 0xc1, 0x51, 0x94, 0xc8, 0x09, 0x9e, 0x08,
-    0xc9, 0x07, 0x9c, 0x08, 0xc1, 0x09, 0x76, 0x08,
-    0x01, 0xd2, 0x01, 0xd8, 0x11, 0x02, 0x09, 0x02,
-    0xc8, 0x17, 0x08, 0x00, 0x01, 0xda, 0x7a, 0xc1,
-    0x51, 0x94, 0xe7, 0x05, 0x00, 0xc0, 0x97, 0xcf,
-    0xe7, 0x57, 0x00, 0x00, 0x52, 0x08, 0x97, 0xc0,
-    0x9f, 0xaf, 0x04, 0x00, 0xe7, 0x09, 0x94, 0x08,
-    0x90, 0x08, 0xe7, 0x57, 0xff, 0xff, 0x90, 0x08,
-    0x04, 0xc1, 0xe7, 0x07, 0xf0, 0x0c, 0x8e, 0x08,
-    0x97, 0xcf, 0xe7, 0x17, 0x32, 0x00, 0x90, 0x08,
-    0xe7, 0x67, 0xff, 0x07, 0x90, 0x08, 0xe7, 0x07,
-    0x26, 0x0d, 0x8e, 0x08, 0x97, 0xcf, 0xd7, 0x09,
-    0x00, 0xc0, 0xc1, 0xdf, 0xe7, 0x57, 0x00, 0x00,
-    0x96, 0x08, 0x23, 0xc0, 0xe7, 0x07, 0x00, 0x80,
-    0x80, 0xc0, 0xe7, 0x07, 0x04, 0x00, 0x90, 0xc0,
-    0xe7, 0x07, 0x00, 0x00, 0x80, 0xc0, 0xe7, 0x07,
-    0x00, 0x80, 0x80, 0xc0, 0xc0, 0x07, 0x00, 0x00,
-    0xc0, 0x07, 0x00, 0x00, 0xc0, 0x07, 0x00, 0x00,
-    0xe7, 0x07, 0x00, 0x00, 0x80, 0xc0, 0xe7, 0x07,
-    0x00, 0x80, 0x80, 0xc0, 0xe7, 0x07, 0x00, 0x80,
-    0x40, 0xc0, 0xc0, 0x07, 0x00, 0x00, 0xe7, 0x07,
-    0x00, 0x00, 0x40, 0xc0, 0xe7, 0x07, 0x00, 0x00,
-    0x80, 0xc0, 0xef, 0x57, 0x00, 0x00, 0xf1, 0x09,
-    0x9f, 0xa0, 0xc0, 0x0d, 0xe7, 0x07, 0x04, 0x00,
-    0x90, 0xc0, 0xe7, 0x07, 0x00, 0x02, 0x40, 0xc0,
-    0xe7, 0x07, 0x0c, 0x02, 0x40, 0xc0, 0xe7, 0x07,
-    0x00, 0x00, 0x96, 0x08, 0xe7, 0x07, 0x00, 0x00,
-    0x8e, 0x08, 0xe7, 0x07, 0x00, 0x00, 0xaa, 0x08,
-    0xd7, 0x09, 0x00, 0xc0, 0xc1, 0xdf, 0x9f, 0xaf,
-    0x9e, 0x03, 0xe7, 0x05, 0x00, 0xc0, 0x9f, 0xaf,
-    0xde, 0x01, 0xe7, 0x05, 0x00, 0xc0, 0x97, 0xcf,
-    0x9f, 0xaf, 0xde, 0x0d, 0xef, 0x77, 0x00, 0x00,
-    0xf1, 0x09, 0x97, 0xc1, 0x9f, 0xaf, 0xde, 0x0d,
-    0xef, 0x77, 0x00, 0x00, 0xf1, 0x09, 0x97, 0xc1,
-    0xef, 0x07, 0x01, 0x00, 0xf1, 0x09, 0xe7, 0x87,
-    0x00, 0x08, 0x1e, 0xc0, 0xe7, 0x87, 0x00, 0x08,
-    0x22, 0xc0, 0xe7, 0x67, 0xff, 0xf7, 0x22, 0xc0,
-    0xe7, 0x77, 0x00, 0x08, 0x20, 0xc0, 0x11, 0xc0,
-    0xe7, 0x67, 0xff, 0xf7, 0x1e, 0xc0, 0xe7, 0x87,
-    0x00, 0x08, 0x22, 0xc0, 0xe7, 0x67, 0xff, 0xf7,
-    0x22, 0xc0, 0xe7, 0x77, 0x00, 0x08, 0x20, 0xc0,
-    0x04, 0xc1, 0xe7, 0x87, 0x00, 0x08, 0x22, 0xc0,
-    0x97, 0xcf, 0xe7, 0x07, 0x01, 0x01, 0xf0, 0x09,
-    0xef, 0x57, 0x18, 0x00, 0xfe, 0xff, 0x97, 0xc2,
-    0xef, 0x07, 0x00, 0x00, 0xf0, 0x09, 0x97, 0xcf,
-    0xd7, 0x09, 0x00, 0xc0, 0x17, 0x00, 0x17, 0x02,
-    0x97, 0x02, 0xe7, 0x57, 0x00, 0x00, 0x7a, 0x08,
-    0x06, 0xc0, 0xc0, 0x09, 0x92, 0xc0, 0xc0, 0x77,
-    0x09, 0x02, 0x9f, 0xc1, 0xea, 0x06, 0x9f, 0xcf,
-    0x20, 0x08, 0xd7, 0x09, 0x0e, 0xc0, 0xe7, 0x07,
-    0x00, 0x00, 0x0e, 0xc0, 0x9f, 0xaf, 0x66, 0x0e,
-    0xe7, 0x05, 0x0e, 0xc0, 0x97, 0xcf, 0xd7, 0x09,
-    0x00, 0xc0, 0x17, 0x02, 0xc8, 0x09, 0xb0, 0xc0,
-    0xe7, 0x67, 0xfe, 0x7f, 0xb0, 0xc0, 0xc8, 0x77,
-    0x00, 0x20, 0x9f, 0xc1, 0x64, 0xeb, 0xe7, 0x57,
-    0x00, 0x00, 0xc8, 0x02, 0x9f, 0xc1, 0x80, 0xeb,
-    0xc8, 0x99, 0xca, 0x02, 0xc8, 0x67, 0x04, 0x00,
-    0x9f, 0xc1, 0x96, 0xeb, 0x9f, 0xcf, 0x4c, 0xeb,
-    0xe7, 0x07, 0x00, 0x00, 0xa6, 0xc0, 0xe7, 0x09,
-    0xb0, 0xc0, 0xc8, 0x02, 0xe7, 0x07, 0x03, 0x00,
-    0xb0, 0xc0, 0x97, 0xcf, 0xc0, 0x09, 0x86, 0x08,
-    0xc0, 0x37, 0x01, 0x00, 0x97, 0xc9, 0xc9, 0x09,
-    0x88, 0x08, 0x02, 0x00, 0x41, 0x90, 0x48, 0x02,
-    0xc9, 0x17, 0x06, 0x00, 0x9f, 0xaf, 0x64, 0x05,
-    0x9f, 0xa2, 0xd6, 0x0e, 0x02, 0xda, 0x77, 0xc1,
-    0x41, 0x60, 0x71, 0xc1, 0x97, 0xcf, 0x17, 0x02,
-    0x57, 0x02, 0x43, 0x04, 0x21, 0x04, 0xe0, 0x00,
-    0x43, 0x04, 0x21, 0x04, 0xe0, 0x00, 0x43, 0x04,
-    0x21, 0x04, 0xe0, 0x00, 0xc1, 0x07, 0x01, 0x00,
-    0xc9, 0x05, 0xc8, 0x05, 0x97, 0xcf,
-    0,    0
-};
-
-/* Firmware fixup (data?) segment */
-Static unsigned char kue_fix_seg[] =
-{
-    /******************************************/
-    /* NOTE: B6/C3 is data header signature   */
-    /*       0xAA/0xBB is data length = total */
-    /*       bytes - 7, 0xCC is type, 0xDD is */
-    /*       interrupt to use.                */
-    /******************************************/
-    0xB6, 0xC3, 0xc9, 0x02, 0x03, 0x64,
-    0x02, 0x00, 0x08, 0x00, 0x24, 0x00, 0x2e, 0x00,
-    0x2c, 0x00, 0x3e, 0x00, 0x44, 0x00, 0x48, 0x00,
-    0x50, 0x00, 0x5c, 0x00, 0x60, 0x00, 0x66, 0x00,
-    0x6c, 0x00, 0x70, 0x00, 0x76, 0x00, 0x74, 0x00,
-    0x7a, 0x00, 0x7e, 0x00, 0x84, 0x00, 0x8a, 0x00,
-    0x8e, 0x00, 0x92, 0x00, 0x98, 0x00, 0x9c, 0x00,
-    0xa0, 0x00, 0xa8, 0x00, 0xae, 0x00, 0xb4, 0x00,
-    0xb2, 0x00, 0xba, 0x00, 0xbe, 0x00, 0xc4, 0x00,
-    0xc8, 0x00, 0xce, 0x00, 0xd2, 0x00, 0xd6, 0x00,
-    0xda, 0x00, 0xe2, 0x00, 0xe0, 0x00, 0xea, 0x00,
-    0xf2, 0x00, 0xfe, 0x00, 0x06, 0x01, 0x0c, 0x01,
-    0x1a, 0x01, 0x24, 0x01, 0x22, 0x01, 0x2a, 0x01,
-    0x30, 0x01, 0x36, 0x01, 0x3c, 0x01, 0x4e, 0x01,
-    0x52, 0x01, 0x58, 0x01, 0x5c, 0x01, 0x9c, 0x01,
-    0xb6, 0x01, 0xba, 0x01, 0xc0, 0x01, 0xca, 0x01,
-    0xd0, 0x01, 0xda, 0x01, 0xe2, 0x01, 0xea, 0x01,
-    0xf0, 0x01, 0x0a, 0x02, 0x0e, 0x02, 0x14, 0x02,
-    0x26, 0x02, 0x6c, 0x02, 0x8e, 0x02, 0x98, 0x02,
-    0xa0, 0x02, 0xa6, 0x02, 0xba, 0x02, 0xc6, 0x02,
-    0xce, 0x02, 0xe8, 0x02, 0xee, 0x02, 0xf4, 0x02,
-    0xf8, 0x02, 0x0a, 0x03, 0x10, 0x03, 0x1a, 0x03,
-    0x1e, 0x03, 0x2a, 0x03, 0x2e, 0x03, 0x34, 0x03,
-    0x3a, 0x03, 0x44, 0x03, 0x4e, 0x03, 0x5a, 0x03,
-    0x5e, 0x03, 0x6a, 0x03, 0x72, 0x03, 0x80, 0x03,
-    0x84, 0x03, 0x8c, 0x03, 0x94, 0x03, 0x98, 0x03,
-    0xa8, 0x03, 0xae, 0x03, 0xb4, 0x03, 0xba, 0x03,
-    0xce, 0x03, 0xcc, 0x03, 0xd6, 0x03, 0xdc, 0x03,
-    0xec, 0x03, 0xf0, 0x03, 0xfe, 0x03, 0x1c, 0x04,
-    0x30, 0x04, 0x38, 0x04, 0x3c, 0x04, 0x40, 0x04,
-    0x48, 0x04, 0x46, 0x04, 0x54, 0x04, 0x5e, 0x04,
-    0x64, 0x04, 0x74, 0x04, 0x78, 0x04, 0x84, 0x04,
-    0xd8, 0x04, 0xec, 0x04, 0xf0, 0x04, 0xf8, 0x04,
-    0xfe, 0x04, 0x1c, 0x05, 0x2c, 0x05, 0x30, 0x05,
-    0x4a, 0x05, 0x56, 0x05, 0x5a, 0x05, 0x88, 0x05,
-    0x8c, 0x05, 0x96, 0x05, 0x9a, 0x05, 0xa8, 0x05,
-    0xcc, 0x05, 0xd2, 0x05, 0xda, 0x05, 0xe0, 0x05,
-    0xe4, 0x05, 0xfc, 0x05, 0x06, 0x06, 0x14, 0x06,
-    0x12, 0x06, 0x1a, 0x06, 0x20, 0x06, 0x26, 0x06,
-    0x2e, 0x06, 0x34, 0x06, 0x48, 0x06, 0x52, 0x06,
-    0x64, 0x06, 0x86, 0x06, 0x90, 0x06, 0x9a, 0x06,
-    0xa0, 0x06, 0xac, 0x06, 0xaa, 0x06, 0xb2, 0x06,
-    0xb8, 0x06, 0xdc, 0x06, 0xda, 0x06, 0xe2, 0x06,
-    0xe8, 0x06, 0xf2, 0x06, 0xf8, 0x06, 0xfc, 0x06,
-    0x0a, 0x07, 0x10, 0x07, 0x14, 0x07, 0x24, 0x07,
-    0x2a, 0x07, 0x32, 0x07, 0x38, 0x07, 0xb2, 0x07,
-    0xba, 0x07, 0xde, 0x07, 0xe4, 0x07, 0x10, 0x08,
-    0x14, 0x08, 0x1a, 0x08, 0x1e, 0x08, 0x30, 0x08,
-    0x38, 0x08, 0x3c, 0x08, 0x44, 0x08, 0x42, 0x08,
-    0x48, 0x08, 0xc6, 0x08, 0xcc, 0x08, 0xd2, 0x08,
-    0xfe, 0x08, 0x04, 0x09, 0x0a, 0x09, 0x0e, 0x09,
-    0x12, 0x09, 0x16, 0x09, 0x20, 0x09, 0x24, 0x09,
-    0x28, 0x09, 0x32, 0x09, 0x46, 0x09, 0x4a, 0x09,
-    0x50, 0x09, 0x54, 0x09, 0x5a, 0x09, 0x60, 0x09,
-    0x7c, 0x09, 0x80, 0x09, 0xb8, 0x09, 0xbc, 0x09,
-    0xc0, 0x09, 0xc4, 0x09, 0xc8, 0x09, 0xcc, 0x09,
-    0xd0, 0x09, 0xd4, 0x09, 0xec, 0x09, 0xf4, 0x09,
-    0xf6, 0x09, 0xf8, 0x09, 0xfa, 0x09, 0xfc, 0x09,
-    0xfe, 0x09, 0x00, 0x0a, 0x02, 0x0a, 0x04, 0x0a,
-    0x06, 0x0a, 0x08, 0x0a, 0x0a, 0x0a, 0x0c, 0x0a,
-    0x10, 0x0a, 0x18, 0x0a, 0x24, 0x0a, 0x2c, 0x0a,
-    0x32, 0x0a, 0x3c, 0x0a, 0x46, 0x0a, 0x4c, 0x0a,
-    0x50, 0x0a, 0x54, 0x0a, 0x5a, 0x0a, 0x5e, 0x0a,
-    0x66, 0x0a, 0x6c, 0x0a, 0x72, 0x0a, 0x78, 0x0a,
-    0x7e, 0x0a, 0x7c, 0x0a, 0x82, 0x0a, 0x8c, 0x0a,
-    0x92, 0x0a, 0x90, 0x0a, 0x98, 0x0a, 0x96, 0x0a,
-    0xa2, 0x0a, 0xb2, 0x0a, 0xb6, 0x0a, 0xc4, 0x0a,
-    0xe2, 0x0a, 0xe0, 0x0a, 0xe8, 0x0a, 0xee, 0x0a,
-    0xf4, 0x0a, 0xf2, 0x0a, 0xf8, 0x0a, 0x0c, 0x0b,
-    0x1a, 0x0b, 0x24, 0x0b, 0x40, 0x0b, 0x44, 0x0b,
-    0x48, 0x0b, 0x4e, 0x0b, 0x4c, 0x0b, 0x52, 0x0b,
-    0x68, 0x0b, 0x6c, 0x0b, 0x70, 0x0b, 0x76, 0x0b,
-    0x88, 0x0b, 0x92, 0x0b, 0xbe, 0x0b, 0xca, 0x0b,
-    0xce, 0x0b, 0xde, 0x0b, 0xf4, 0x0b, 0xfa, 0x0b,
-    0x00, 0x0c, 0x24, 0x0c, 0x28, 0x0c, 0x30, 0x0c,
-    0x36, 0x0c, 0x3c, 0x0c, 0x40, 0x0c, 0x4a, 0x0c,
-    0x50, 0x0c, 0x58, 0x0c, 0x56, 0x0c, 0x5c, 0x0c,
-    0x60, 0x0c, 0x64, 0x0c, 0x80, 0x0c, 0x94, 0x0c,
-    0x9a, 0x0c, 0x98, 0x0c, 0x9e, 0x0c, 0xa4, 0x0c,
-    0xa2, 0x0c, 0xa8, 0x0c, 0xac, 0x0c, 0xb0, 0x0c,
-    0xb4, 0x0c, 0xb8, 0x0c, 0xbc, 0x0c, 0xce, 0x0c,
-    0xd2, 0x0c, 0xd6, 0x0c, 0xf4, 0x0c, 0xfa, 0x0c,
-    0x00, 0x0d, 0xfe, 0x0c, 0x06, 0x0d, 0x0e, 0x0d,
-    0x0c, 0x0d, 0x16, 0x0d, 0x1c, 0x0d, 0x22, 0x0d,
-    0x20, 0x0d, 0x30, 0x0d, 0x7e, 0x0d, 0x82, 0x0d,
-    0x9a, 0x0d, 0xa0, 0x0d, 0xa6, 0x0d, 0xb0, 0x0d,
-    0xb8, 0x0d, 0xc2, 0x0d, 0xc8, 0x0d, 0xce, 0x0d,
-    0xd4, 0x0d, 0xdc, 0x0d, 0x1e, 0x0e, 0x2c, 0x0e,
-    0x3e, 0x0e, 0x4c, 0x0e, 0x50, 0x0e, 0x5e, 0x0e,
-    0xae, 0x0e, 0xb8, 0x0e, 0xc6, 0x0e, 0xca, 0x0e,
-    0,    0
-};
-
-/* Fixup command. */
-#define KUE_TRIGCMD_OFFSET	5
-Static unsigned char kue_trig_seg[] = {
-0xb6, 0xc3, 0x01, 0x00, 0x06, 0x64, 0x00, 0x00
-};
diff --git a/include.new/dev/usb/ohcireg.h b/include.new/dev/usb/ohcireg.h
deleted file mode 100644
index 60bf29d..0000000
--- a/include.new/dev/usb/ohcireg.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/*	$NetBSD: ohcireg.h,v 1.17 2000/04/01 09:27:35 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.22 2005/01/06 01:43:28 imp Exp $	*/
-
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _DEV_PCI_OHCIREG_H_
-#define _DEV_PCI_OHCIREG_H_
-
-/*** PCI config registers ***/
-
-#define PCI_CBMEM		0x10	/* configuration base memory */
-
-#define PCI_INTERFACE_OHCI	0x10
-
-/*** OHCI registers */
-
-#define OHCI_REVISION		0x00	/* OHCI revision # */
-#define  OHCI_REV_LO(rev)	((rev)&0xf)
-#define  OHCI_REV_HI(rev)	(((rev)>>4)&0xf)
-#define  OHCI_REV_LEGACY(rev)	((rev) & 0x100)
-
-#define OHCI_CONTROL		0x04
-#define  OHCI_CBSR_MASK		0x00000003 /* Control/Bulk Service Ratio */
-#define  OHCI_RATIO_1_1		0x00000000
-#define  OHCI_RATIO_1_2		0x00000001
-#define  OHCI_RATIO_1_3		0x00000002
-#define  OHCI_RATIO_1_4		0x00000003
-#define  OHCI_PLE		0x00000004 /* Periodic List Enable */
-#define  OHCI_IE		0x00000008 /* Isochronous Enable */
-#define  OHCI_CLE		0x00000010 /* Control List Enable */
-#define  OHCI_BLE		0x00000020 /* Bulk List Enable */
-#define  OHCI_HCFS_MASK		0x000000c0 /* HostControllerFunctionalState */
-#define  OHCI_HCFS_RESET	0x00000000
-#define  OHCI_HCFS_RESUME	0x00000040
-#define  OHCI_HCFS_OPERATIONAL	0x00000080
-#define  OHCI_HCFS_SUSPEND	0x000000c0
-#define  OHCI_IR		0x00000100 /* Interrupt Routing */
-#define  OHCI_RWC		0x00000200 /* Remote Wakeup Connected */
-#define  OHCI_RWE		0x00000400 /* Remote Wakeup Enabled */
-#define OHCI_COMMAND_STATUS	0x08
-#define  OHCI_HCR		0x00000001 /* Host Controller Reset */
-#define  OHCI_CLF		0x00000002 /* Control List Filled */
-#define  OHCI_BLF		0x00000004 /* Bulk List Filled */
-#define  OHCI_OCR		0x00000008 /* Ownership Change Request */
-#define  OHCI_SOC_MASK		0x00030000 /* Scheduling Overrun Count */
-#define OHCI_INTERRUPT_STATUS	0x0c
-#define  OHCI_SO		0x00000001 /* Scheduling Overrun */
-#define  OHCI_WDH		0x00000002 /* Writeback Done Head */
-#define  OHCI_SF		0x00000004 /* Start of Frame */
-#define  OHCI_RD		0x00000008 /* Resume Detected */
-#define  OHCI_UE		0x00000010 /* Unrecoverable Error */
-#define  OHCI_FNO		0x00000020 /* Frame Number Overflow */
-#define  OHCI_RHSC		0x00000040 /* Root Hub Status Change */
-#define  OHCI_OC		0x40000000 /* Ownership Change */
-#define  OHCI_MIE		0x80000000 /* Master Interrupt Enable */
-#define OHCI_INTERRUPT_ENABLE	0x10
-#define OHCI_INTERRUPT_DISABLE	0x14
-#define OHCI_HCCA		0x18
-#define OHCI_PERIOD_CURRENT_ED	0x1c
-#define OHCI_CONTROL_HEAD_ED	0x20
-#define OHCI_CONTROL_CURRENT_ED	0x24
-#define OHCI_BULK_HEAD_ED	0x28
-#define OHCI_BULK_CURRENT_ED	0x2c
-#define OHCI_DONE_HEAD		0x30
-#define OHCI_FM_INTERVAL	0x34
-#define  OHCI_GET_IVAL(s)	((s) & 0x3fff)
-#define  OHCI_GET_FSMPS(s)	(((s) >> 16) & 0x7fff)
-#define  OHCI_FIT		0x80000000
-#define OHCI_FM_REMAINING	0x38
-#define OHCI_FM_NUMBER		0x3c
-#define OHCI_PERIODIC_START	0x40
-#define OHCI_LS_THRESHOLD	0x44
-#define OHCI_RH_DESCRIPTOR_A	0x48
-#define  OHCI_GET_NDP(s)	((s) & 0xff)
-#define  OHCI_PSM		0x0100     /* Power Switching Mode */
-#define  OHCI_NPS		0x0200	   /* No Power Switching */
-#define  OHCI_DT		0x0400     /* Device Type */
-#define  OHCI_OCPM		0x0800     /* Overcurrent Protection Mode */
-#define  OHCI_NOCP		0x1000     /* No Overcurrent Protection */
-#define  OHCI_GET_POTPGT(s)	((s) >> 24)
-#define OHCI_RH_DESCRIPTOR_B	0x4c
-#define OHCI_RH_STATUS		0x50
-#define  OHCI_LPS		0x00000001 /* Local Power Status */
-#define  OHCI_OCI		0x00000002 /* OverCurrent Indicator */
-#define  OHCI_DRWE		0x00008000 /* Device Remote Wakeup Enable */
-#define  OHCI_LPSC		0x00010000 /* Local Power Status Change */
-#define  OHCI_CCIC		0x00020000 /* OverCurrent Indicator Change */
-#define  OHCI_CRWE		0x80000000 /* Clear Remote Wakeup Enable */
-#define OHCI_RH_PORT_STATUS(n)	(0x50 + (n)*4) /* 1 based indexing */
-
-#define OHCI_LES (OHCI_PLE | OHCI_IE | OHCI_CLE | OHCI_BLE)
-#define OHCI_ALL_INTRS (OHCI_SO | OHCI_WDH | OHCI_SF | OHCI_RD | OHCI_UE | \
-                        OHCI_FNO | OHCI_RHSC | OHCI_OC)
-#define OHCI_NORMAL_INTRS (OHCI_WDH | OHCI_RD | OHCI_UE | OHCI_RHSC)
-
-#define OHCI_FSMPS(i) (((i-210)*6/7) << 16)
-#define OHCI_PERIODIC(i) ((i)*9/10)
-
-typedef uint32_t ohci_physaddr_t;
-
-#define OHCI_NO_INTRS 32
-struct ohci_hcca {
-	ohci_physaddr_t	hcca_interrupt_table[OHCI_NO_INTRS];
-	uint32_t	hcca_frame_number;
-	ohci_physaddr_t	hcca_done_head;
-#define OHCI_DONE_INTRS 1
-};
-#define OHCI_HCCA_SIZE 256
-#define OHCI_HCCA_ALIGN 256
-
-#define OHCI_PAGE_SIZE 0x1000
-#define OHCI_PAGE(x) ((x) &~ 0xfff)
-#define OHCI_PAGE_OFFSET(x) ((x) & 0xfff)
-#define OHCI_PAGE_MASK(x) ((x) & 0xfff)
-
-typedef struct {
-	uint32_t	ed_flags;
-#define OHCI_ED_GET_FA(s)	((s) & 0x7f)
-#define OHCI_ED_ADDRMASK	0x0000007f
-#define OHCI_ED_SET_FA(s)	(s)
-#define OHCI_ED_GET_EN(s)	(((s) >> 7) & 0xf)
-#define OHCI_ED_SET_EN(s)	((s) << 7)
-#define OHCI_ED_DIR_MASK	0x00001800
-#define  OHCI_ED_DIR_TD		0x00000000
-#define  OHCI_ED_DIR_OUT	0x00000800
-#define  OHCI_ED_DIR_IN		0x00001000
-#define OHCI_ED_SPEED		0x00002000
-#define OHCI_ED_SKIP		0x00004000
-#define OHCI_ED_FORMAT_GEN	0x00000000
-#define OHCI_ED_FORMAT_ISO	0x00008000
-#define OHCI_ED_GET_MAXP(s)	(((s) >> 16) & 0x07ff)
-#define OHCI_ED_SET_MAXP(s)	((s) << 16)
-#define OHCI_ED_MAXPMASK	(0x7ff << 16)
-	ohci_physaddr_t	ed_tailp;
-	ohci_physaddr_t	ed_headp;
-#define OHCI_HALTED		0x00000001
-#define OHCI_TOGGLECARRY	0x00000002
-#define OHCI_HEADMASK		0xfffffffc
-	ohci_physaddr_t	ed_nexted;
-} ohci_ed_t;
-/* #define OHCI_ED_SIZE 16 */
-#define OHCI_ED_ALIGN 16
-
-typedef struct {
-	uint32_t	td_flags;
-#define OHCI_TD_R		0x00040000		/* Buffer Rounding  */
-#define OHCI_TD_DP_MASK		0x00180000		/* Direction / PID */
-#define  OHCI_TD_SETUP		0x00000000
-#define  OHCI_TD_OUT		0x00080000
-#define  OHCI_TD_IN		0x00100000
-#define OHCI_TD_GET_DI(x)	(((x) >> 21) & 7)	/* Delay Interrupt */
-#define OHCI_TD_SET_DI(x)	((x) << 21)
-#define  OHCI_TD_NOINTR		0x00e00000
-#define  OHCI_TD_INTR_MASK	0x00e00000
-#define OHCI_TD_TOGGLE_CARRY	0x00000000
-#define OHCI_TD_TOGGLE_0	0x02000000
-#define OHCI_TD_TOGGLE_1	0x03000000
-#define OHCI_TD_TOGGLE_MASK	0x03000000
-#define OHCI_TD_GET_EC(x)	(((x) >> 26) & 3)	/* Error Count */
-#define OHCI_TD_GET_CC(x)	((x) >> 28)		/* Condition Code */
-#define  OHCI_TD_NOCC		0xf0000000
-	ohci_physaddr_t	td_cbp;		/* Current Buffer Pointer */
-	ohci_physaddr_t td_nexttd;	/* Next TD */
-	ohci_physaddr_t td_be;		/* Buffer End */
-} ohci_td_t;
-/* #define OHCI_TD_SIZE 16 */
-#define OHCI_TD_ALIGN 16
-
-#define OHCI_ITD_NOFFSET 8
-typedef struct {
-	uint32_t	itd_flags;
-#define OHCI_ITD_GET_SF(x)	((x) & 0x0000ffff)
-#define OHCI_ITD_SET_SF(x)	((x) & 0xffff)
-#define OHCI_ITD_GET_DI(x)	(((x) >> 21) & 7)	/* Delay Interrupt */
-#define OHCI_ITD_SET_DI(x)	((x) << 21)
-#define  OHCI_ITD_NOINTR	0x00e00000
-#define OHCI_ITD_GET_FC(x)	((((x) >> 24) & 7)+1)	/* Frame Count */
-#define OHCI_ITD_SET_FC(x)	(((x)-1) << 24)
-#define OHCI_ITD_GET_CC(x)	((x) >> 28)		/* Condition Code */
-#define  OHCI_ITD_NOCC		0xf0000000
-	ohci_physaddr_t	itd_bp0;			/* Buffer Page 0 */
-	ohci_physaddr_t	itd_nextitd;			/* Next ITD */
-	ohci_physaddr_t	itd_be;				/* Buffer End */
-	u_int16_t	itd_offset[OHCI_ITD_NOFFSET];	/* Buffer offsets */
-#define itd_pswn itd_offset				/* Packet Status Word*/
-#define OHCI_ITD_PAGE_SELECT	0x00001000
-#define OHCI_ITD_MK_OFFS(len)	(0xe000 | ((len) & 0x1fff))
-#define OHCI_ITD_PSW_LENGTH(x)	((x) & 0xfff)		/* Transfer length */
-#define OHCI_ITD_PSW_GET_CC(x)	((x) >> 12)		/* Condition Code */
-} ohci_itd_t;
-/* #define OHCI_ITD_SIZE 32 */
-#define OHCI_ITD_ALIGN 32
-
-
-#define OHCI_CC_NO_ERROR		0
-#define OHCI_CC_CRC			1
-#define OHCI_CC_BIT_STUFFING		2
-#define OHCI_CC_DATA_TOGGLE_MISMATCH	3
-#define OHCI_CC_STALL			4
-#define OHCI_CC_DEVICE_NOT_RESPONDING	5
-#define OHCI_CC_PID_CHECK_FAILURE	6
-#define OHCI_CC_UNEXPECTED_PID		7
-#define OHCI_CC_DATA_OVERRUN		8
-#define OHCI_CC_DATA_UNDERRUN		9
-#define OHCI_CC_BUFFER_OVERRUN		12
-#define OHCI_CC_BUFFER_UNDERRUN		13
-#define OHCI_CC_NOT_ACCESSED		15
-
-/* Some delay needed when changing certain registers. */
-#define OHCI_ENABLE_POWER_DELAY	5
-#define OHCI_READ_DESC_DELAY	5
-
-#endif /* _DEV_PCI_OHCIREG_H_ */
diff --git a/include.new/dev/usb/ohcivar.h b/include.new/dev/usb/ohcivar.h
deleted file mode 100644
index adcdaa7..0000000
--- a/include.new/dev/usb/ohcivar.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*	$NetBSD: ohcivar.h,v 1.30 2001/12/31 12:20:35 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/ohcivar.h,v 1.40.2.1 2005/12/04 05:52:23 iedowse Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-typedef struct ohci_soft_ed {
-	ohci_ed_t ed;
-	struct ohci_soft_ed *next;
-	ohci_physaddr_t physaddr;
-} ohci_soft_ed_t;
-#define OHCI_SED_SIZE ((sizeof (struct ohci_soft_ed) + OHCI_ED_ALIGN - 1) / OHCI_ED_ALIGN * OHCI_ED_ALIGN)
-#define OHCI_SED_CHUNK	(PAGE_SIZE / OHCI_SED_SIZE)
-
-typedef struct ohci_soft_td {
-	ohci_td_t td;
-	struct ohci_soft_td *nexttd; /* mirrors nexttd in TD */
-	struct ohci_soft_td *dnext; /* next in done list */
-	ohci_physaddr_t physaddr;
-	LIST_ENTRY(ohci_soft_td) hnext;
-	usbd_xfer_handle xfer;
-	u_int16_t len;
-	u_int16_t flags;
-#define OHCI_CALL_DONE	0x0001
-#define OHCI_ADD_LEN	0x0002
-} ohci_soft_td_t;
-#define OHCI_STD_SIZE ((sizeof (struct ohci_soft_td) + OHCI_TD_ALIGN - 1) / OHCI_TD_ALIGN * OHCI_TD_ALIGN)
-#define OHCI_STD_CHUNK (PAGE_SIZE / OHCI_STD_SIZE)
-
-typedef struct ohci_soft_itd {
-	ohci_itd_t itd;
-	struct ohci_soft_itd *nextitd; /* mirrors nexttd in ITD */
-	struct ohci_soft_itd *dnext; /* next in done list */
-	ohci_physaddr_t physaddr;
-	LIST_ENTRY(ohci_soft_itd) hnext;
-	usbd_xfer_handle xfer;
-	u_int16_t flags;
-#define	OHCI_ITD_ACTIVE	0x0010		/* Hardware op in progress */
-#define	OHCI_ITD_INTFIN	0x0020		/* Hw completion interrupt seen.*/
-#ifdef DIAGNOSTIC
-	char isdone;
-#endif
-} ohci_soft_itd_t;
-#define OHCI_SITD_SIZE ((sizeof (struct ohci_soft_itd) + OHCI_ITD_ALIGN - 1) / OHCI_ITD_ALIGN * OHCI_ITD_ALIGN)
-#define OHCI_SITD_CHUNK (PAGE_SIZE / OHCI_SITD_SIZE)
-
-#define OHCI_NO_EDS (2*OHCI_NO_INTRS-1)
-
-#define OHCI_HASH_SIZE 128
-
-#define OHCI_SCFLG_DONEINIT	0x0001	/* ohci_init() done. */
-
-typedef struct ohci_softc {
-	struct usbd_bus sc_bus;		/* base device */
-	int sc_flags;
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	bus_size_t sc_size;
-
-#if defined(__FreeBSD__)
-	void *ih;
-
-	struct resource *io_res;
-	struct resource *irq_res;
-#endif
-
-	usb_dma_t sc_hccadma;
-	struct ohci_hcca *sc_hcca;
-	ohci_soft_ed_t *sc_eds[OHCI_NO_EDS];
-	u_int sc_bws[OHCI_NO_INTRS];
-
-	uint32_t sc_eintrs;		/* enabled interrupts */
-
-	ohci_soft_ed_t *sc_isoc_head;
-	ohci_soft_ed_t *sc_ctrl_head;
-	ohci_soft_ed_t *sc_bulk_head;
-
-	LIST_HEAD(, ohci_soft_td)  sc_hash_tds[OHCI_HASH_SIZE];
-	LIST_HEAD(, ohci_soft_itd) sc_hash_itds[OHCI_HASH_SIZE];
-
-	int sc_noport;
-	u_int8_t sc_addr;		/* device address */
-	u_int8_t sc_conf;		/* device configuration */
-
-#ifdef USB_USE_SOFTINTR
-	char sc_softwake;
-#endif /* USB_USE_SOFTINTR */
-
-	ohci_soft_ed_t *sc_freeeds;
-	ohci_soft_td_t *sc_freetds;
-	ohci_soft_itd_t *sc_freeitds;
-
-	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
-
-	usbd_xfer_handle sc_intrxfer;
-
-	ohci_soft_itd_t *sc_sidone;
-	ohci_soft_td_t  *sc_sdone;
-
-	char sc_vendor[16];
-	int sc_id_vendor;
-
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-	void *sc_powerhook;		/* cookie from power hook */
-	void *sc_shutdownhook;		/* cookie from shutdown hook */
-#endif
-	uint32_t sc_control;		/* Preserved during suspend/standby */
-	uint32_t sc_intre;
-
-	u_int sc_overrun_cnt;
-	struct timeval sc_overrun_ntc;
-
-	usb_callout_t sc_tmo_rhsc;
-
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-	device_ptr_t sc_child;
-#endif
-	char sc_dying;
-} ohci_softc_t;
-
-struct ohci_xfer {
-	struct usbd_xfer xfer;
-	struct usb_task	abort_task;
-	uint32_t ohci_xfer_flags;
-};
-#define OHCI_ISOC_DIRTY  0x01
-#define OHCI_XFER_ABORTING	0x02	/* xfer is aborting. */
-#define OHCI_XFER_ABORTWAIT	0x04	/* abort completion is being awaited. */
-
-#define OXFER(xfer) ((struct ohci_xfer *)(xfer))
-
-usbd_status	ohci_init(ohci_softc_t *);
-int		ohci_intr(void *);
-int	 	ohci_detach(ohci_softc_t *, int);
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-int		ohci_activate(device_ptr_t, enum devact);
-#endif
-
-#define MS_TO_TICKS(ms) ((ms) * hz / 1000)
-
-void		ohci_shutdown(void *v);
-void		ohci_power(int state, void *priv);
diff --git a/include.new/dev/usb/rio500_usb.h b/include.new/dev/usb/rio500_usb.h
deleted file mode 100644
index 14e111a..0000000
--- a/include.new/dev/usb/rio500_usb.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
-    ----------------------------------------------------------------------
-
-    Copyright (C) 2000  Cesar Miquel  (miquel@df.uba.ar)
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted under any licence of your choise which
-    meets the open source licence definiton
-    http://www.opensource.org/opd.html such as the GNU licence or the
-    BSD licence.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    General Public License or the BSD license for more details.
-
-    ----------------------------------------------------------------------
-
-    Modified for FreeBSD by Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
-
-    ---------------------------------------------------------------------- */
-
-/*  $FreeBSD: src/sys/dev/usb/rio500_usb.h,v 1.2 2005/01/06 01:43:28 imp Exp $ */
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#include <sys/ioccom.h>
-#ifndef USB_VENDOR_DIAMOND
-#define USB_VENDOR_DIAMOND 0x841
-#endif
-#ifndef USB_PRODUCT_DIAMOND_RIO500USB
-#define USB_PRODUCT_DIAMOND_RIO500USB 0x1
-#endif
-#endif
-
-struct RioCommand
-{
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-  u_int16_t  length;
-#else
-  short length;
-#endif
-  int   request;
-  int   requesttype;
-  int   value;
-  int   index;
-  void *buffer;
-  int  timeout;
-};
-
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#define RIO_SEND_COMMAND	_IOWR('U', 200, struct RioCommand)
-#define RIO_RECV_COMMAND	_IOWR('U', 201, struct RioCommand)
-#else
-#define RIO_SEND_COMMAND			0x1
-#define RIO_RECV_COMMAND			0x2
-#endif
-
-#define RIO_DIR_OUT               	        0x0
-#define RIO_DIR_IN				0x1
diff --git a/include.new/dev/usb/ubser.h b/include.new/dev/usb/ubser.h
deleted file mode 100644
index 4f6e3da..0000000
--- a/include.new/dev/usb/ubser.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2003 Bernd Walter <ticso@freebsd.org>
- *
- * $URL: https://devel.bwct.de/svn/projects/ubser/ubser.h $
- * $Date: 2006/10/27 01:15:33 $
- * $Author: reddawg $
- * $Rev: 1127 $
- *
- * 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.
- *
- * 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/dev/usb/ubser.h,v 1.3 2005/03/17 22:47:18 ticso Exp $
- */
-
-#ifndef UBSER_H
-#define UBSER_H
-
-#define MAX_SER	32
-
-/* Vendor Interface Requests */
-#define VENDOR_GET_NUMSER		0x01
-#define VENDOR_SET_BREAK		0x02
-#define VENDOR_CLEAR_BREAK		0x03
-
-#endif /* UBSER_H */
diff --git a/include.new/dev/usb/ucomvar.h b/include.new/dev/usb/ucomvar.h
deleted file mode 100644
index 00dcd1e..0000000
--- a/include.new/dev/usb/ucomvar.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*	$NetBSD: ucomvar.h,v 1.9 2001/01/23 21:56:17 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/ucomvar.h,v 1.7 2005/01/06 01:43:28 imp Exp $	*/
-
-/*-
- * Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.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.
- *
- * 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.
- */
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/* Module interface related macros */
-#define UCOM_MODVER	1
-
-#define UCOM_MINVER	1
-#define UCOM_PREFVER	UCOM_MODVER
-#define UCOM_MAXVER	1
-
-/* Macros to clear/set/test flags. */
-#define SET(t, f)	(t) |= (f)
-#define CLR(t, f)	(t) &= ~((unsigned)(f))
-#define ISSET(t, f)	((t) & (f))
-
-#define UCOM_CALLOUT_MASK	0x80
-
-#define UCOMUNIT_MASK		0x3ff7f
-#define UCOMDIALOUT_MASK	0x80000
-#define UCOMCALLUNIT_MASK	0x40000
-
-#define UCOMUNIT(x)		(minor(x) & UCOMUNIT_MASK)
-#define UCOMDIALOUT(x)		(minor(x) & UCOMDIALOUT_MASK)
-#define UCOMCALLUNIT(x)		(minor(x) & UCOMCALLUNIT_MASK)
-
-#define UCOM_UNK_PORTNO		-1	/* XXX */
-
-struct ucom_softc;
-
-struct ucom_callback {
-	void (*ucom_get_status)(void *, int, u_char *, u_char *);
-	void (*ucom_set)(void *, int, int, int);
-#define UCOM_SET_DTR 1
-#define UCOM_SET_RTS 2
-#define UCOM_SET_BREAK 3
-	int (*ucom_param)(void *, int, struct termios *);
-	int (*ucom_ioctl)(void *, int, u_long, caddr_t, int, usb_proc_ptr);
-	int (*ucom_open)(void *, int);
-	void (*ucom_close)(void *, int);
-	void (*ucom_read)(void *, int, u_char **, uint32_t *);
-	void (*ucom_write)(void *, int, u_char *, u_char *, uint32_t *);
-};
-
-/* line status register */
-#define ULSR_RCV_FIFO	0x80
-#define ULSR_TSRE	0x40	/* Transmitter empty: byte sent */
-#define ULSR_TXRDY	0x20	/* Transmitter buffer empty */
-#define ULSR_BI		0x10	/* Break detected */
-#define ULSR_FE		0x08	/* Framing error: bad stop bit */
-#define ULSR_PE		0x04	/* Parity error */
-#define ULSR_OE		0x02	/* Overrun, lost incoming byte */
-#define ULSR_RXRDY	0x01	/* Byte ready in Receive Buffer */
-#define ULSR_RCV_MASK	0x1f	/* Mask for incoming data or error */
-
-/* ucom state declarations */
-#define UCS_RXSTOP	0x0001	/* Rx stopped */
-#define UCS_RTS_IFLOW	0x0008	/* use RTS input flow control */
-
-struct ucom_softc {
-	USBBASEDEVICE		sc_dev;		/* base device */
-	usbd_device_handle	sc_udev;	/* USB device */
-	usbd_interface_handle	sc_iface;	/* data interface */
-
-	int			sc_bulkin_no;	/* bulk in endpoint address */
-	usbd_pipe_handle	sc_bulkin_pipe;	/* bulk in pipe */
-	usbd_xfer_handle	sc_ixfer;	/* read request */
-	u_char			*sc_ibuf;	/* read buffer */
-	u_int			sc_ibufsize;	/* read buffer size */
-	u_int			sc_ibufsizepad;	/* read buffer size padded */
-
-	int			sc_bulkout_no;	/* bulk out endpoint address */
-	usbd_pipe_handle	sc_bulkout_pipe;/* bulk out pipe */
-	usbd_xfer_handle	sc_oxfer;	/* write request */
-	u_char			*sc_obuf;	/* write buffer */
-	u_int			sc_obufsize;	/* write buffer size */
-	u_int			sc_opkthdrlen;	/* header length of
-						   output packet */
-
-	struct ucom_callback	*sc_callback;
-	void			*sc_parent;
-	int			sc_portno;
-
-	struct tty		*sc_tty;	/* our tty */
-
-	int			sc_state;
-
-	int			sc_poll;
-
-	u_char			sc_lsr;
-	u_char			sc_msr;
-	u_char			sc_mcr;
-
-	u_char			sc_dying;	/* disconnecting */
-
-};
-
-extern devclass_t ucom_devclass;
-
-int ucom_attach(struct ucom_softc *);
-int ucom_detach(struct ucom_softc *);
-void ucom_status_change(struct ucom_softc *);
diff --git a/include.new/dev/usb/udbp.h b/include.new/dev/usb/udbp.h
deleted file mode 100644
index 9f86afb..0000000
--- a/include.new/dev/usb/udbp.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1996-2000 Whistle Communications, Inc.
- * All rights reserved.
- *
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- *
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * This file was derived from src/sys/netgraph/ng_sample.h, revision 1.1
- * written by Julian Elischer, Whistle Communications.
- *
- * $FreeBSD: src/sys/dev/usb/udbp.h,v 1.4 2005/01/06 01:43:28 imp Exp $
- */
-
-#ifndef _NETGRAPH_UDBP_H_
-#define _NETGRAPH_UDBP_H_
-
-/* Node type name. This should be unique among all netgraph node types */
-#define NG_UDBP_NODE_TYPE	"udbp"
-
-/* Node type cookie. Should also be unique. This value MUST change whenever
-   an incompatible change is made to this header file, to insure consistency.
-   The de facto method for generating cookies is to take the output of the
-   date command: date -u +'%s' */
-#define NGM_UDBP_COOKIE		944609300
-
-
-#define NG_UDBP_HOOK_NAME	"data"
-
-/* Netgraph commands understood by this node type */
-enum {
-	NGM_UDBP_SET_FLAG = 1,
-	NGM_UDBP_GET_STATUS,
-};
-
-/* This structure is returned by the NGM_UDBP_GET_STATUS command */
-struct ngudbpstat {
-	u_int   packets_in;	/* packets in from downstream */
-	u_int   packets_out;	/* packets out towards downstream */
-};
-
-/*
- * This is used to define the 'parse type' for a struct ngudbpstat, which
- * is bascially a description of how to convert a binary struct ngudbpstat
- * to an ASCII string and back.  See ng_parse.h for more info.
- *
- * This needs to be kept in sync with the above structure definition
- */
-#define NG_UDBP_STATS_TYPE_INFO	{				\
-	  { "packets_in",	&ng_parse_int32_type	},	\
-	  { "packets_out",	&ng_parse_int32_type	},	\
-	  { NULL },						\
-}
-
-#endif /* _NETGRAPH_UDBP_H_ */
diff --git a/include.new/dev/usb/ufm_ioctl.h b/include.new/dev/usb/ufm_ioctl.h
deleted file mode 100644
index 717688b..0000000
--- a/include.new/dev/usb/ufm_ioctl.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/ufm_ioctl.h 246115 2013-01-30 10:59:42Z hselasky $ */
-/*-
- * Copyright (c) 2001 M. Warner Losh
- * 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.
- *
- * 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.
- *
- * This code is based on ugen.c and ulpt.c developed by Lennart Augustsson.
- * This code includes software developed by the NetBSD Foundation, Inc. and
- * its contributors.
- */
-
-#ifndef _UFM_IOCTL_H_
-#define	_UFM_IOCTL_H_
-
-#include <sys/ioccom.h>
-
-#define	FM_SET_FREQ	_IOWR('U', 200, int)
-#define	FM_GET_FREQ	_IOWR('U', 201, int)
-#define	FM_START	_IOWR('U', 202, int)
-#define	FM_STOP		_IOWR('U', 203, int)
-#define	FM_GET_STAT	_IOWR('U', 204, int)
-
-#endif			/* _UFM_IOCTL_H_ */
diff --git a/include.new/dev/usb/uftdiio.h b/include.new/dev/usb/uftdiio.h
deleted file mode 100644
index 72c2ee3..0000000
--- a/include.new/dev/usb/uftdiio.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright 2008-2012 - Symmetricom, Inc.
- * 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.
- *
- * 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: releng/10.2/sys/dev/usb/uftdiio.h 265047 2014-04-28 12:46:23Z ian $ 
- */
-
-/*
- * FTDI USB serial converter chip ioctl commands.
- */
-
-#ifndef _USB_UFTDIIO_H_
-#define _USB_UFTDIIO_H_
-
-#include <sys/ioccom.h>
-
-enum uftdi_bitmodes
-{
-	UFTDI_BITMODE_ASYNC = 0,
-	UFTDI_BITMODE_MPSSE = 1,
-	UFTDI_BITMODE_SYNC = 2,
-	UFTDI_BITMODE_CPU_EMUL = 3,
-	UFTDI_BITMODE_FAST_SERIAL = 4,
-	UFTDI_BITMODE_CBUS = 5,
-	UFTDI_BITMODE_NONE = 0xff,
-};
-
-/*
- * For UFTDIIOC_SET_BITMODE:
- *   mode   = One of the uftdi_bitmodes enum values.
- *   iomask = Mask of bits enabled for bitbang output.
- *
- * For UFTDIIOC_GET_BITMODE:
- *   mode   = Unused.
- *   iomask = Returned snapshot of bitbang pin states at time of call.
- */
-struct uftdi_bitmode
-{
-	uint8_t mode;
-	uint8_t iomask;
-};
-
-#define	UFTDIIOC_RESET_IO	_IO('c', 0)	/* Reset config, flush fifos.*/
-#define	UFTDIIOC_RESET_RX	_IO('c', 1)	/* Flush input fifo. */
-#define	UFTDIIOC_RESET_TX	_IO('c', 2)	/* Flush output fifo. */
-#define	UFTDIIOC_SET_BITMODE	_IOW('c', 3, struct uftdi_bitmode)
-#define	UFTDIIOC_GET_BITMODE	_IOR('c', 4, struct uftdi_bitmode)
-#define	UFTDIIOC_SET_ERROR_CHAR	_IOW('c', 5, int)	/* -1 to disable */
-#define	UFTDIIOC_SET_EVENT_CHAR	_IOW('c', 6, int)	/* -1 to disable */
-#define	UFTDIIOC_SET_LATENCY	_IOW('c', 7, int)	/* 1-255 ms */
-#define	UFTDIIOC_GET_LATENCY	_IOR('c', 8, int)
-#define	UFTDIIOC_GET_HWREV	_IOR('c', 9, int)
-
-#endif
diff --git a/include.new/dev/usb/uftdireg.h b/include.new/dev/usb/uftdireg.h
deleted file mode 100644
index 11bab9c..0000000
--- a/include.new/dev/usb/uftdireg.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/*	$NetBSD: uftdireg.h,v 1.6 2002/07/11 21:14:28 augustss Exp $ */
-/*	$FreeBSD: src/sys/dev/usb/uftdireg.h,v 1.2 2004/07/01 17:16:20 brooks Exp $	*/
-
-/*
- * Definitions for the FTDI USB Single Port Serial Converter -
- * known as FTDI_SIO (Serial Input/Output application of the chipset)
- *
- * The device is based on the FTDI FT8U100AX chip. It has a DB25 on one side,
- * USB on the other.
- *
- * Thanx to FTDI (http://www.ftdi.co.uk) for so kindly providing details
- * of the protocol required to talk to the device and ongoing assistence
- * during development.
- *
- * Bill Ryder - bryder@sgi.com of Silicon Graphics, Inc. is the original
- * author of this file.
- */
-/* Modified by Lennart Augustsson */
-
-/* Vendor Request Interface */
-#define FTDI_SIO_RESET 		0 /* Reset the port */
-#define FTDI_SIO_MODEM_CTRL 	1 /* Set the modem control register */
-#define FTDI_SIO_SET_FLOW_CTRL	2 /* Set flow control register */
-#define FTDI_SIO_SET_BAUD_RATE	3 /* Set baud rate */
-#define FTDI_SIO_SET_DATA	4 /* Set the data characteristics of the port */
-#define FTDI_SIO_GET_STATUS	5 /* Retrieve current value of status reg */
-#define FTDI_SIO_SET_EVENT_CHAR	6 /* Set the event character */
-#define FTDI_SIO_SET_ERROR_CHAR	7 /* Set the error character */
-
-/* Port Identifier Table */
-#define FTDI_PIT_DEFAULT 	0 /* SIOA */
-#define FTDI_PIT_SIOA		1 /* SIOA */
-#define FTDI_PIT_SIOB		2 /* SIOB */
-#define FTDI_PIT_PARALLEL	3 /* Parallel */
-
-enum uftdi_type {
-	UFTDI_TYPE_SIO,
-	UFTDI_TYPE_8U232AM
-};
-
-/*
- * BmRequestType:  0100 0000B
- * bRequest:       FTDI_SIO_RESET
- * wValue:         Control Value
- *                   0 = Reset SIO
- *                   1 = Purge RX buffer
- *                   2 = Purge TX buffer
- * wIndex:         Port
- * wLength:        0
- * Data:           None
- *
- * The Reset SIO command has this effect:
- *
- *    Sets flow control set to 'none'
- *    Event char = 0x0d
- *    Event trigger = disabled
- *    Purge RX buffer
- *    Purge TX buffer
- *    Clear DTR
- *    Clear RTS
- *    baud and data format not reset
- *
- * The Purge RX and TX buffer commands affect nothing except the buffers
- *
- */
-/* FTDI_SIO_RESET */
-#define FTDI_SIO_RESET_SIO 0
-#define FTDI_SIO_RESET_PURGE_RX 1
-#define FTDI_SIO_RESET_PURGE_TX 2
-
-
-/*
- * BmRequestType:  0100 0000B
- * bRequest:       FTDI_SIO_SET_BAUDRATE
- * wValue:         BaudRate value - see below
- * wIndex:         Port
- * wLength:        0
- * Data:           None
- */
-/* FTDI_SIO_SET_BAUDRATE */
-enum {
-	ftdi_sio_b300 = 0,
-	ftdi_sio_b600 = 1,
-	ftdi_sio_b1200 = 2,
-	ftdi_sio_b2400 = 3,
-	ftdi_sio_b4800 = 4,
-	ftdi_sio_b9600 = 5,
-	ftdi_sio_b19200 = 6,
-	ftdi_sio_b38400 = 7,
-	ftdi_sio_b57600 = 8,
-	ftdi_sio_b115200 = 9
-};
-
-enum {
-	ftdi_8u232am_b300 = 0x2710,
-	ftdi_8u232am_b600 = 0x1388,
-	ftdi_8u232am_b1200 = 0x09c4,
-	ftdi_8u232am_b2400 = 0x04e2,
-	ftdi_8u232am_b4800 = 0x0271,
-	ftdi_8u232am_b9600 = 0x4138,
-	ftdi_8u232am_b19200 = 0x809c,
-	ftdi_8u232am_b38400 = 0xc04e,
-	ftdi_8u232am_b57600 = 0x0034,
-	ftdi_8u232am_b115200 = 0x001a,
-	ftdi_8u232am_b230400 = 0x000d,
-	ftdi_8u232am_b460800 = 0x4006,
-	ftdi_8u232am_b921600 = 0x8003,
-	ftdi_8u232am_b2000000 = 0x0001,	/* special case for 2M baud */
-	ftdi_8u232am_b3000000 = 0x0000,	/* special case for 3M baud */
-};
-
-/*
- * BmRequestType:  0100 0000B
- * bRequest:       FTDI_SIO_SET_DATA
- * wValue:         Data characteristics (see below)
- * wIndex:         Port
- * wLength:        0
- * Data:           No
- *
- * Data characteristics
- *
- *   B0..7   Number of data bits
- *   B8..10  Parity
- *           0 = None
- *           1 = Odd
- *           2 = Even
- *           3 = Mark
- *           4 = Space
- *   B11..13 Stop Bits
- *           0 = 1
- *           1 = 1.5
- *           2 = 2
- *   B14..15 Reserved
- *
- */
-/* FTDI_SIO_SET_DATA */
-#define FTDI_SIO_SET_DATA_BITS(n) (n)
-#define FTDI_SIO_SET_DATA_PARITY_NONE (0x0 << 8)
-#define FTDI_SIO_SET_DATA_PARITY_ODD (0x1 << 8)
-#define FTDI_SIO_SET_DATA_PARITY_EVEN (0x2 << 8)
-#define FTDI_SIO_SET_DATA_PARITY_MARK (0x3 << 8)
-#define FTDI_SIO_SET_DATA_PARITY_SPACE (0x4 << 8)
-#define FTDI_SIO_SET_DATA_STOP_BITS_1 (0x0 << 11)
-#define FTDI_SIO_SET_DATA_STOP_BITS_15 (0x1 << 11)
-#define FTDI_SIO_SET_DATA_STOP_BITS_2 (0x2 << 11)
-#define FTDI_SIO_SET_BREAK (0x1 << 14)
-
-
-/*
- * BmRequestType:   0100 0000B
- * bRequest:        FTDI_SIO_MODEM_CTRL
- * wValue:          ControlValue (see below)
- * wIndex:          Port
- * wLength:         0
- * Data:            None
- *
- * NOTE: If the device is in RTS/CTS flow control, the RTS set by this
- * command will be IGNORED without an error being returned
- * Also - you can not set DTR and RTS with one control message
- *
- * ControlValue
- * B0    DTR state
- *          0 = reset
- *          1 = set
- * B1    RTS state
- *          0 = reset
- *          1 = set
- * B2..7 Reserved
- * B8    DTR state enable
- *          0 = ignore
- *          1 = use DTR state
- * B9    RTS state enable
- *          0 = ignore
- *          1 = use RTS state
- * B10..15 Reserved
- */
-/* FTDI_SIO_MODEM_CTRL */
-#define FTDI_SIO_SET_DTR_MASK 0x1
-#define FTDI_SIO_SET_DTR_HIGH (1 | ( FTDI_SIO_SET_DTR_MASK  << 8))
-#define FTDI_SIO_SET_DTR_LOW  (0 | ( FTDI_SIO_SET_DTR_MASK  << 8))
-#define FTDI_SIO_SET_RTS_MASK 0x2
-#define FTDI_SIO_SET_RTS_HIGH (2 | ( FTDI_SIO_SET_RTS_MASK << 8))
-#define FTDI_SIO_SET_RTS_LOW (0 | ( FTDI_SIO_SET_RTS_MASK << 8))
-
-
-/*
- *   BmRequestType:  0100 0000b
- *   bRequest:       FTDI_SIO_SET_FLOW_CTRL
- *   wValue:         Xoff/Xon
- *   wIndex:         Protocol/Port - hIndex is protocl / lIndex is port
- *   wLength:        0
- *   Data:           None
- *
- * hIndex protocol is:
- *   B0 Output handshaking using RTS/CTS
- *       0 = disabled
- *       1 = enabled
- *   B1 Output handshaking using DTR/DSR
- *       0 = disabled
- *       1 = enabled
- *   B2 Xon/Xoff handshaking
- *       0 = disabled
- *       1 = enabled
- *
- * A value of zero in the hIndex field disables handshaking
- *
- * If Xon/Xoff handshaking is specified, the hValue field should contain the
- * XOFF character and the lValue field contains the XON character.
- */
-/* FTDI_SIO_SET_FLOW_CTRL */
-#define FTDI_SIO_DISABLE_FLOW_CTRL 0x0
-#define FTDI_SIO_RTS_CTS_HS 0x1
-#define FTDI_SIO_DTR_DSR_HS 0x2
-#define FTDI_SIO_XON_XOFF_HS 0x4
-
-
-/*
- *  BmRequestType:   0100 0000b
- *  bRequest:        FTDI_SIO_SET_EVENT_CHAR
- *  wValue:          Event Char
- *  wIndex:          Port
- *  wLength:         0
- *  Data:            None
- *
- * wValue:
- *   B0..7   Event Character
- *   B8      Event Character Processing
- *             0 = disabled
- *             1 = enabled
- *   B9..15  Reserved
- *
- * FTDI_SIO_SET_EVENT_CHAR
- *
- * Set the special event character for the specified communications port.
- * If the device sees this character it will immediately return the
- * data read so far - rather than wait 40ms or until 62 bytes are read
- * which is what normally happens.
- */
-
-
-
-/*
- *  BmRequestType:  0100 0000b
- *  bRequest:       FTDI_SIO_SET_ERROR_CHAR
- *  wValue:         Error Char
- *  wIndex:         Port
- *  wLength:        0
- *  Data:           None
- *
- *  Error Char
- *  B0..7  Error Character
- *  B8     Error Character Processing
- *           0 = disabled
- *           1 = enabled
- *  B9..15 Reserved
- *
- *
- * FTDI_SIO_SET_ERROR_CHAR
- * Set the parity error replacement character for the specified communications
- * port.
- */
-
-
-/*
- *   BmRequestType:   1100 0000b
- *   bRequest:        FTDI_SIO_GET_MODEM_STATUS
- *   wValue:          zero
- *   wIndex:          Port
- *   wLength:         1
- *   Data:            Status
- *
- * One byte of data is returned
- * B0..3 0
- * B4    CTS
- *         0 = inactive
- *         1 = active
- * B5    DSR
- *         0 = inactive
- *         1 = active
- * B6    Ring Indicator (RI)
- *         0 = inactive
- *         1 = active
- * B7    Receive Line Signal Detect (RLSD)
- *         0 = inactive
- *         1 = active
- *
- * FTDI_SIO_GET_MODEM_STATUS
- * Retrieve the current value of the modem status register.
- */
-#define FTDI_SIO_CTS_MASK 0x10
-#define FTDI_SIO_DSR_MASK 0x20
-#define FTDI_SIO_RI_MASK  0x40
-#define FTDI_SIO_RLSD_MASK 0x80
-
-
-
-/*
- *
- * DATA FORMAT
- *
- * IN Endpoint
- *
- * The device reserves the first two bytes of data on this endpoint to contain
- * the current values of the modem and line status registers. In the absence of
- * data, the device generates a message consisting of these two status bytes
- * every 40 ms.
- *
- * Byte 0: Modem Status
- *   NOTE: 4 upper bits have same layout as the MSR register in a 16550
- *
- * Offset	Description
- * B0..3	Port
- * B4		Clear to Send (CTS)
- * B5		Data Set Ready (DSR)
- * B6		Ring Indicator (RI)
- * B7		Receive Line Signal Detect (RLSD)
- *
- * Byte 1: Line Status
- *   NOTE: same layout as the LSR register in a 16550
- *
- * Offset	Description
- * B0	Data Ready (DR)
- * B1	Overrun Error (OE)
- * B2	Parity Error (PE)
- * B3	Framing Error (FE)
- * B4	Break Interrupt (BI)
- * B5	Transmitter Holding Register (THRE)
- * B6	Transmitter Empty (TEMT)
- * B7	Error in RCVR FIFO
- *
- *
- * OUT Endpoint
- *
- * This device reserves the first bytes of data on this endpoint contain the
- * length and port identifier of the message. For the FTDI USB Serial converter
- * the port identifier is always 1.
- *
- * Byte 0: Port & length
- *
- * Offset	Description
- * B0..1	Port
- * B2..7	Length of message - (not including Byte 0)
- *
- */
-#define FTDI_PORT_MASK 0x0f
-#define FTDI_MSR_MASK 0xf0
-#define FTDI_GET_MSR(p) (((p)[0]) & FTDI_MSR_MASK)
-#define FTDI_GET_LSR(p) ((p)[1])
-#define FTDI_LSR_MASK (~0x60) /* interesting bits */
-#define FTDI_OUT_TAG(len, port) (((len) << 2) | (port))
diff --git a/include.new/dev/usb/ugraphire_rdesc.h b/include.new/dev/usb/ugraphire_rdesc.h
deleted file mode 100644
index 465ad38..0000000
--- a/include.new/dev/usb/ugraphire_rdesc.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*	$NetBSD: usb/ugraphire_rdesc.h,v 1.1 2000/12/29 01:47:49 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/ugraphire_rdesc.h,v 1.2.2.1 2006/01/20 22:55:45 mux Exp $ */
-/*-
- * Copyright (c) 2000 Nick Hibma <n_hibma@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.
- *
- * 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.
- */
-
-static const uByte uhid_graphire_report_descr[] = {
-    0x05, 0x0d,                    /*  USAGE_PAGE (Digitizers)		*/
-    0x09, 0x01,                    /*  USAGE (Digitizer)		*/
-    0xa1, 0x01,                    /*  COLLECTION (Application)		*/
-    0x85, 0x02,                    /*    REPORT_ID (2)			*/
-    0x05, 0x0d,                    /*    USAGE_PAGE (Digitizers)	*/
-    0x09, 0x01,                    /*    USAGE (Digitizer)		*/
-    0xa1, 0x00,                    /*    COLLECTION (Physical)		*/
-    0x15, 0x00,                    /*      LOGICAL_MINIMUM (0)		*/
-    0x25, 0x01,                    /*      LOGICAL_MAXIMUM (1)		*/
-    0x09, 0x33,                    /*      USAGE (Touch)		*/
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/
-    0x09, 0x44,                    /*      USAGE (Barrel Switch)	*/
-    0x95, 0x02,                    /*      REPORT_COUNT (2)		*/
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/
-    0x09, 0x00,                    /*      USAGE (Undefined)		*/
-    0x95, 0x02,                    /*      REPORT_COUNT (2)		*/
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/
-    0x81, 0x03,                    /*      INPUT (Cnst,Var,Abs)		*/
-    0x09, 0x3c,                    /*      USAGE (Invert)		*/
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/
-    0x09, 0x38,                    /*      USAGE (Transducer Index)	*/
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/
-    0x09, 0x32,                    /*      USAGE (In Range)		*/
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/
-    0x75, 0x01,                    /*      REPORT_SIZE (1)		*/
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/
-    0x05, 0x01,                    /*      USAGE_PAGE (Generic Desktop)	*/
-    0x09, 0x30,                    /*      USAGE (X)			*/
-    0x15, 0x00,                    /*      LOGICAL_MINIMUM (0)		*/
-    0x26, 0xde, 0x27,              /*      LOGICAL_MAXIMUM (10206)	*/
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/
-    0x75, 0x10,                    /*      REPORT_SIZE (16)		*/
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/
-    0x09, 0x31,                    /*      USAGE (Y)			*/
-    0x26, 0xfe, 0x1c,              /*      LOGICAL_MAXIMUM (7422)	*/
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/
-    0x75, 0x10,                    /*      REPORT_SIZE (16)		*/
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/
-    0x05, 0x0d,                    /*      USAGE_PAGE (Digitizers)	*/
-    0x09, 0x30,                    /*      USAGE (Tip Pressure)		*/
-    0x26, 0xff, 0x01,              /*      LOGICAL_MAXIMUM (511)	*/
-    0x95, 0x01,                    /*      REPORT_COUNT (1)		*/
-    0x75, 0x10,                    /*      REPORT_SIZE (16)		*/
-    0x81, 0x02,                    /*      INPUT (Data,Var,Abs)		*/
-    0xc0,                          /*    END_COLLECTION			*/
-    0x05, 0x0d,                    /*    USAGE_PAGE (Digitizers)	*/
-    0x09, 0x00,                    /*    USAGE (Undefined)		*/
-    0x85, 0x02,                    /*    REPORT_ID (2)			*/
-    0x95, 0x01,                    /*    REPORT_COUNT (1)		*/
-    0xb1, 0x02,                    /*    FEATURE (Data,Var,Abs)		*/
-    0x09, 0x00,                    /*    USAGE (Undefined)		*/
-    0x85, 0x03,                    /*    REPORT_ID (3)			*/
-    0x95, 0x01,                    /*    REPORT_COUNT (1)		*/
-    0xb1, 0x02,                    /*    FEATURE (Data,Var,Abs)		*/
-    0xc0,                          /*  END_COLLECTION			*/
-};
-
-static const uByte uhid_graphire3_4x5_report_descr[] = {
-    0x05, 0x01,                    /* USAGE_PAGE (Generic Desktop)	*/
-    0x09, 0x02,                    /* USAGE (Mouse)			*/
-    0xa1, 0x01,                    /* COLLECTION (Application)		*/
-    0x85, 0x01,                    /*   REPORT_ID (1)			*/
-    0x09, 0x01,                    /*   USAGE (Pointer)			*/
-    0xa1, 0x00,                    /*   COLLECTION (Physical)		*/
-    0x05, 0x09,                    /*     USAGE_PAGE (Button)		*/
-    0x19, 0x01,                    /*     USAGE_MINIMUM (Button 1)	*/
-    0x29, 0x03,                    /*     USAGE_MAXIMUM (Button 3)	*/
-    0x15, 0x00,                    /*     LOGICAL_MINIMUM (0)		*/
-    0x25, 0x01,                    /*     LOGICAL_MAXIMUM (1)		*/
-    0x95, 0x03,                    /*     REPORT_COUNT (3)		*/
-    0x75, 0x01,                    /*     REPORT_SIZE (1)		*/
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/
-    0x95, 0x01,                    /*     REPORT_COUNT (1)		*/
-    0x75, 0x05,                    /*     REPORT_SIZE (5)		*/
-    0x81, 0x01,                    /*     INPUT (Cnst,Ary,Abs)		*/
-    0x05, 0x01,                    /*     USAGE_PAGE (Generic Desktop)	*/
-    0x09, 0x30,                    /*     USAGE (X)			*/
-    0x09, 0x31,                    /*     USAGE (Y)			*/
-    0x09, 0x38,                    /*     USAGE (Wheel)			*/
-    0x15, 0x81,                    /*     LOGICAL_MINIMUM (-127)	*/
-    0x25, 0x7f,                    /*     LOGICAL_MAXIMUM (127)		*/
-    0x75, 0x08,                    /*     REPORT_SIZE (8)		*/
-    0x95, 0x03,                    /*     REPORT_COUNT (3)		*/
-    0x81, 0x06,                    /*     INPUT (Data,Var,Rel)		*/
-    0xc0,                          /*   END_COLLECTION			*/
-    0xc0,                          /* END_COLLECTION			*/
-    0x05, 0x0d,                    /* USAGE_PAGE (Digitizers)		*/
-    0x09, 0x01,                    /* USAGE (Pointer)			*/
-    0xa1, 0x01,                    /* COLLECTION (Applicaption)		*/
-    0x85, 0x02,                    /*   REPORT_ID (2)			*/
-    0x05, 0x0d,                    /*   USAGE_PAGE (Digitizers)		*/
-    0x09, 0x01,                    /*   USAGE (Digitizer)		*/
-    0xa1, 0x00,                    /*   COLLECTION (Physical)		*/
-    0x09, 0x33,                    /*     USAGE (Touch)			*/
-    0x09, 0x44,                    /*     USAGE (Barrel Switch)		*/
-    0x09, 0x44,                    /*     USAGE (Barrel Switch)		*/
-    0x15, 0x00,                    /*     LOGICAL_MINIMUM (0)		*/
-    0x25, 0x01,                    /*     LOGICAL_MAXIMUM (1)		*/
-    0x75, 0x01,                    /*     REPORT_SIZE (1)		*/
-    0x95, 0x03,                    /*     REPORT_COUNT (3)		*/
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/
-    0x75, 0x01,                    /*     REPORT_SIZE (1)		*/
-    0x95, 0x02,                    /*     REPORT_COUNT (2)		*/
-    0x81, 0x01,                    /*     INPUT (Cnst,Ary,Abs)		*/
-    0x09, 0x3c,                    /*     USAGE (Invert)		*/
-    0x09, 0x38,                    /*     USAGE (Transducer Index)	*/
-    0x09, 0x32,                    /*     USAGE (In Range)		*/
-    0x75, 0x01,                    /*     REPORT_SIZE (1)		*/
-    0x95, 0x03,                    /*     REPORT_COUNT (3)		*/
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/
-    0x05, 0x01,                    /*     USAGE_PAGE (Generic Desktop)	*/
-    0x09, 0x30,                    /*     USAGE (X)			*/
-    0x15, 0x00,                    /*     LOGICAL_MINIMUM (0)		*/
-    0x26, 0xde, 0x27,              /*     LOGICAL_MAXIMUM (10206)	*/
-    0x75, 0x10,                    /*     REPORT_SIZE (16)		*/
-    0x95, 0x01,                    /*     REPORT_COUNT (1)		*/
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/
-    0x09, 0x31,                    /*     USAGE (Y)			*/
-    0x26, 0xfe, 0x1c,              /*     LOGICAL_MAXIMUM (7422)	*/
-    0x75, 0x10,                    /*     REPORT_SIZE (16)		*/
-    0x95, 0x01,                    /*     REPORT_COUNT (1)		*/
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/
-    0x05, 0x0d,                    /*     USAGE_PAGE (Digitizers)	*/
-    0x09, 0x30,                    /*     USAGE (Tip Pressure)		*/
-    0x26, 0xff, 0x01,              /*     LOGICAL_MAXIMUM (511)		*/
-    0x75, 0x10,                    /*     REPORT_SIZE (16)		*/
-    0x95, 0x01,                    /*     REPORT_COUNT (1)		*/
-    0x81, 0x02,                    /*     INPUT (Data,Var,Abs)		*/
-    0xc0,                          /*   END_COLLECTION			*/
-    0x05, 0x0d,                    /*   USAGE_PAGE (Digitizers)		*/
-    0x09, 0x00,                    /*   USAGE (Undefined)		*/
-    0x85, 0x02,                    /*   REPORT_ID (2)			*/
-    0x95, 0x01,                    /*   REPORT_COUNT (1)		*/
-    0xb1, 0x02,                    /*   FEATURE (Data,Var,Abs)		*/
-    0x09, 0x00,                    /*   USAGE (Undefined)		*/
-    0x85, 0x03,                    /*   REPORT_ID (3)			*/
-    0x95, 0x01,                    /*   REPORT_COUNT (1)		*/
-    0xb1, 0x02,                    /*   FEATURE (Data,Var,Abs)		*/
-    0xc0                           /* END_COLLECTION			*/
-};
diff --git a/include.new/dev/usb/uhcireg.h b/include.new/dev/usb/uhcireg.h
deleted file mode 100644
index da55973..0000000
--- a/include.new/dev/usb/uhcireg.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*	$NetBSD: uhcireg.h,v 1.15 2002/02/11 11:41:30 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/uhcireg.h,v 1.22 2005/01/06 01:43:28 imp Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _DEV_PCI_UHCIREG_H_
-#define _DEV_PCI_UHCIREG_H_
-
-/*** PCI config registers ***/
-
-#define PCI_USBREV		0x60	/* USB protocol revision */
-#define  PCI_USBREV_MASK	0xff
-#define  PCI_USBREV_PRE_1_0	0x00
-#define  PCI_USBREV_1_0		0x10
-#define  PCI_USBREV_1_1		0x11
-
-#define PCI_LEGSUP		0xc0	/* Legacy Support register */
-#define  PCI_LEGSUP_USBPIRQDEN	0x2000	/* USB PIRQ D Enable */
-
-#define PCI_CBIO		0x20	/* configuration base IO */
-
-#define PCI_INTERFACE_UHCI	0x00
-
-/*** UHCI registers ***/
-
-#define UHCI_CMD		0x00
-#define  UHCI_CMD_RS		0x0001
-#define  UHCI_CMD_HCRESET	0x0002
-#define  UHCI_CMD_GRESET	0x0004
-#define  UHCI_CMD_EGSM		0x0008
-#define  UHCI_CMD_FGR		0x0010
-#define  UHCI_CMD_SWDBG		0x0020
-#define  UHCI_CMD_CF		0x0040
-#define  UHCI_CMD_MAXP		0x0080
-
-#define UHCI_STS		0x02
-#define  UHCI_STS_USBINT	0x0001
-#define  UHCI_STS_USBEI		0x0002
-#define  UHCI_STS_RD		0x0004
-#define  UHCI_STS_HSE		0x0008
-#define  UHCI_STS_HCPE		0x0010
-#define  UHCI_STS_HCH		0x0020
-#define  UHCI_STS_ALLINTRS	0x003f
-
-#define UHCI_INTR		0x04
-#define  UHCI_INTR_TOCRCIE	0x0001
-#define  UHCI_INTR_RIE		0x0002
-#define  UHCI_INTR_IOCE		0x0004
-#define  UHCI_INTR_SPIE		0x0008
-
-#define UHCI_FRNUM		0x06
-#define  UHCI_FRNUM_MASK	0x03ff
-
-#define UHCI_FLBASEADDR		0x08
-
-#define UHCI_SOF		0x0c
-#define  UHCI_SOF_MASK		0x7f
-
-#define UHCI_PORTSC1      	0x010
-#define UHCI_PORTSC2      	0x012
-#define UHCI_PORTSC_CCS		0x0001
-#define UHCI_PORTSC_CSC		0x0002
-#define UHCI_PORTSC_PE		0x0004
-#define UHCI_PORTSC_POEDC	0x0008
-#define UHCI_PORTSC_LS		0x0030
-#define UHCI_PORTSC_LS_SHIFT	4
-#define UHCI_PORTSC_RD		0x0040
-#define UHCI_PORTSC_LSDA	0x0100
-#define UHCI_PORTSC_PR		0x0200
-#define UHCI_PORTSC_OCI		0x0400
-#define UHCI_PORTSC_OCIC	0x0800
-#define UHCI_PORTSC_SUSP	0x1000
-
-#define URWMASK(x) \
-  ((x) & (UHCI_PORTSC_SUSP | UHCI_PORTSC_PR | UHCI_PORTSC_RD | UHCI_PORTSC_PE))
-
-#define UHCI_FRAMELIST_COUNT	1024
-#define UHCI_FRAMELIST_ALIGN	4096
-
-#define UHCI_TD_ALIGN		16
-#define UHCI_QH_ALIGN		16
-
-typedef uint32_t uhci_physaddr_t;
-#define UHCI_PTR_T		0x00000001
-#define UHCI_PTR_TD		0x00000000
-#define UHCI_PTR_QH		0x00000002
-#define UHCI_PTR_VF		0x00000004
-
-/*
- * Wait this long after a QH has been removed.  This gives that HC a
- * chance to stop looking at it before it's recycled.
- */
-#define UHCI_QH_REMOVE_DELAY	5
-
-/*
- * The Queue Heads and Transfer Descriptors are accessed
- * by both the CPU and the USB controller which run
- * concurrently.  This means that they have to be accessed
- * with great care.  As long as the data structures are
- * not linked into the controller's frame list they cannot
- * be accessed by it and anything goes.  As soon as a
- * TD is accessible by the controller it "owns" the td_status
- * field; it will not be written by the CPU.  Similarly
- * the controller "owns" the qh_elink field.
- */
-
-typedef struct {
-	uhci_physaddr_t td_link;
-	uint32_t td_status;
-#define UHCI_TD_GET_ACTLEN(s)	(((s) + 1) & 0x3ff)
-#define UHCI_TD_ZERO_ACTLEN(t)	((t) | 0x3ff)
-#define UHCI_TD_BITSTUFF	0x00020000
-#define UHCI_TD_CRCTO		0x00040000
-#define UHCI_TD_NAK		0x00080000
-#define UHCI_TD_BABBLE		0x00100000
-#define UHCI_TD_DBUFFER		0x00200000
-#define UHCI_TD_STALLED		0x00400000
-#define UHCI_TD_ACTIVE		0x00800000
-#define UHCI_TD_IOC		0x01000000
-#define UHCI_TD_IOS		0x02000000
-#define UHCI_TD_LS		0x04000000
-#define UHCI_TD_GET_ERRCNT(s)	(((s) >> 27) & 3)
-#define UHCI_TD_SET_ERRCNT(n)	((n) << 27)
-#define UHCI_TD_SPD		0x20000000
-	uint32_t td_token;
-#define UHCI_TD_PID_IN		0x00000069
-#define UHCI_TD_PID_OUT		0x000000e1
-#define UHCI_TD_PID_SETUP	0x0000002d
-#define UHCI_TD_GET_PID(s)	((s) & 0xff)
-#define UHCI_TD_SET_DEVADDR(a)	((a) << 8)
-#define UHCI_TD_GET_DEVADDR(s)	(((s) >> 8) & 0x7f)
-#define UHCI_TD_SET_ENDPT(e)	(((e)&0xf) << 15)
-#define UHCI_TD_GET_ENDPT(s)	(((s) >> 15) & 0xf)
-#define UHCI_TD_SET_DT(t)	((t) << 19)
-#define UHCI_TD_GET_DT(s)	(((s) >> 19) & 1)
-#define UHCI_TD_SET_MAXLEN(l)	(((l)-1) << 21)
-#define UHCI_TD_GET_MAXLEN(s)	((((s) >> 21) + 1) & 0x7ff)
-#define UHCI_TD_MAXLEN_MASK	0xffe00000
-	uint32_t td_buffer;
-} uhci_td_t;
-
-#define UHCI_TD_ERROR (UHCI_TD_BITSTUFF|UHCI_TD_CRCTO|UHCI_TD_BABBLE|UHCI_TD_DBUFFER|UHCI_TD_STALLED)
-
-#define UHCI_TD_SETUP(len, endp, dev) (UHCI_TD_SET_MAXLEN(len) | \
-     UHCI_TD_SET_ENDPT(endp) | UHCI_TD_SET_DEVADDR(dev) | UHCI_TD_PID_SETUP)
-#define UHCI_TD_OUT(len, endp, dev, dt) (UHCI_TD_SET_MAXLEN(len) | \
-     UHCI_TD_SET_ENDPT(endp) | UHCI_TD_SET_DEVADDR(dev) | \
-     UHCI_TD_PID_OUT | UHCI_TD_SET_DT(dt))
-#define UHCI_TD_IN(len, endp, dev, dt) (UHCI_TD_SET_MAXLEN(len) | \
-     UHCI_TD_SET_ENDPT(endp) | UHCI_TD_SET_DEVADDR(dev) | UHCI_TD_PID_IN | \
-     UHCI_TD_SET_DT(dt))
-
-typedef struct {
-	uhci_physaddr_t qh_hlink;
-	uhci_physaddr_t qh_elink;
-} uhci_qh_t;
-
-#endif /* _DEV_PCI_UHCIREG_H_ */
diff --git a/include.new/dev/usb/uhcivar.h b/include.new/dev/usb/uhcivar.h
deleted file mode 100644
index 0d96567..0000000
--- a/include.new/dev/usb/uhcivar.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*	$NetBSD: uhcivar.h,v 1.33 2002/02/11 11:41:30 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.40 2005/03/19 19:08:46 iedowse Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*
- * To avoid having 1024 TDs for each isochronous transfer we introduce
- * a virtual frame list.  Every UHCI_VFRAMELIST_COUNT entries in the real
- * frame list points to a non-active TD.  These, in turn, form the
- * starts of the virtual frame list.  This also has the advantage that it
- * simplifies linking in/out of TDs/QHs in the schedule.
- * Furthermore, initially each of the inactive TDs point to an inactive
- * QH that forms the start of the interrupt traffic for that slot.
- * Each of these QHs point to the same QH that is the start of control
- * traffic.  This QH points at another QH which is the start of the
- * bulk traffic.
- *
- * UHCI_VFRAMELIST_COUNT should be a power of 2 and <= UHCI_FRAMELIST_COUNT.
- */
-#define UHCI_VFRAMELIST_COUNT 128
-
-typedef struct uhci_soft_qh uhci_soft_qh_t;
-typedef struct uhci_soft_td uhci_soft_td_t;
-
-typedef union {
-	struct uhci_soft_qh *sqh;
-	struct uhci_soft_td *std;
-} uhci_soft_td_qh_t;
-
-/*
- * An interrupt info struct contains the information needed to
- * execute a requested routine when the controller generates an
- * interrupt.  Since we cannot know which transfer generated
- * the interrupt all structs are linked together so they can be
- * searched at interrupt time.
- */
-typedef struct uhci_intr_info {
-	struct uhci_softc *sc;
-	usbd_xfer_handle xfer;
-	uhci_soft_td_t *stdstart;
-	uhci_soft_td_t *stdend;
-	LIST_ENTRY(uhci_intr_info) list;
-#ifdef DIAGNOSTIC
-	int isdone;
-#endif
-} uhci_intr_info_t;
-
-struct uhci_xfer {
-	struct usbd_xfer xfer;
-	uhci_intr_info_t iinfo;
-	struct usb_task	abort_task;
-	int curframe;
-	uint32_t uhci_xfer_flags;
-};
-
-#define UHCI_XFER_ABORTING	0x0001	/* xfer is aborting. */
-#define UHCI_XFER_ABORTWAIT	0x0002	/* abort completion is being awaited. */
-
-#define UXFER(xfer) ((struct uhci_xfer *)(xfer))
-
-/*
- * Extra information that we need for a TD.
- */
-struct uhci_soft_td {
-	uhci_td_t td;			/* The real TD, must be first */
-	uhci_soft_td_qh_t link; 	/* soft version of the td_link field */
-	uhci_physaddr_t physaddr;	/* TD's physical address. */
-};
-/*
- * Make the size such that it is a multiple of UHCI_TD_ALIGN.  This way
- * we can pack a number of soft TD together and have the real TD well
- * aligned.
- * NOTE: Minimum size is 32 bytes.
- */
-#define UHCI_STD_SIZE ((sizeof (struct uhci_soft_td) + UHCI_TD_ALIGN - 1) / UHCI_TD_ALIGN * UHCI_TD_ALIGN)
-#define UHCI_STD_CHUNK (PAGE_SIZE / UHCI_STD_SIZE)
-
-/*
- * Extra information that we need for a QH.
- */
-struct uhci_soft_qh {
-	uhci_qh_t qh;			/* The real QH, must be first */
-	uhci_soft_qh_t *hlink;		/* soft version of qh_hlink */
-	uhci_soft_td_t *elink;		/* soft version of qh_elink */
-	uhci_physaddr_t physaddr;	/* QH's physical address. */
-	int pos;			/* Timeslot position */
-};
-/* See comment about UHCI_STD_SIZE. */
-#define UHCI_SQH_SIZE ((sizeof (struct uhci_soft_qh) + UHCI_QH_ALIGN - 1) / UHCI_QH_ALIGN * UHCI_QH_ALIGN)
-#define UHCI_SQH_CHUNK (PAGE_SIZE / UHCI_SQH_SIZE)
-
-/*
- * Information about an entry in the virtual frame list.
- */
-struct uhci_vframe {
-	uhci_soft_td_t *htd;		/* pointer to dummy TD */
-	uhci_soft_td_t *etd;		/* pointer to last TD */
-	uhci_soft_qh_t *hqh;		/* pointer to dummy QH */
-	uhci_soft_qh_t *eqh;		/* pointer to last QH */
-	u_int bandwidth;		/* max bandwidth used by this frame */
-};
-
-#define UHCI_SCFLG_DONEINIT	0x0001	/* uhci_init() done */
-
-typedef struct uhci_softc {
-	struct usbd_bus sc_bus;		/* base device */
-	int sc_flags;
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	bus_size_t sc_size;
-#if defined(__FreeBSD__)
-	void *ih;
-
-	struct resource *io_res;
-	struct resource *irq_res;
-#endif
-
-	uhci_physaddr_t *sc_pframes;
-	usb_dma_t sc_dma;
-	struct uhci_vframe sc_vframes[UHCI_VFRAMELIST_COUNT];
-
-	uhci_soft_qh_t *sc_lctl_start;	/* dummy QH for low speed control */
-	uhci_soft_qh_t *sc_lctl_end;	/* last control QH */
-	uhci_soft_qh_t *sc_hctl_start;	/* dummy QH for high speed control */
-	uhci_soft_qh_t *sc_hctl_end;	/* last control QH */
-	uhci_soft_qh_t *sc_bulk_start;	/* dummy QH for bulk */
-	uhci_soft_qh_t *sc_bulk_end;	/* last bulk transfer */
-	uhci_soft_qh_t *sc_last_qh;	/* dummy QH at the end */
-	uint32_t sc_loops;		/* number of QHs that wants looping */
-
-	uhci_soft_td_t *sc_freetds;	/* TD free list */
-	uhci_soft_qh_t *sc_freeqhs;	/* QH free list */
-
-	SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
-
-	u_int8_t sc_addr;		/* device address */
-	u_int8_t sc_conf;		/* device configuration */
-
-	u_int8_t sc_saved_sof;
-	u_int16_t sc_saved_frnum;
-
-#ifdef USB_USE_SOFTINTR
-	char sc_softwake;
-#endif /* USB_USE_SOFTINTR */
-
-	char sc_isreset;
-	char sc_suspend;
-	char sc_dying;
-
-	LIST_HEAD(, uhci_intr_info) sc_intrhead;
-
-	/* Info for the root hub interrupt channel. */
-	int sc_ival;			/* time between root hub intrs */
-	usbd_xfer_handle sc_intr_xfer;	/* root hub interrupt transfer */
-	usb_callout_t sc_poll_handle;
-
-	char sc_vendor[16];		/* vendor string for root hub */
-	int sc_id_vendor;		/* vendor ID for root hub */
-
-#if defined(__NetBSD__)
-	void *sc_powerhook;		/* cookie from power hook */
-	void *sc_shutdownhook;		/* cookie from shutdown hook */
-#endif
-
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-	device_ptr_t sc_child;		/* /dev/usb# device */
-#endif
-} uhci_softc_t;
-
-usbd_status	uhci_init(uhci_softc_t *);
-int		uhci_intr(void *);
-int		uhci_detach(uhci_softc_t *, int);
-#if defined(__NetBSD__) || defined(__OpenBSD__)
-int		uhci_activate(device_ptr_t, enum devact);
-#endif
-
-void		uhci_shutdown(void *v);
-void		uhci_power(int state, void *priv);
-
diff --git a/include.new/dev/usb/uled_ioctl.h b/include.new/dev/usb/uled_ioctl.h
deleted file mode 100644
index 7124d85..0000000
--- a/include.new/dev/usb/uled_ioctl.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2014 Kevin Lo
- * 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.
- *
- * 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: releng/10.2/sys/dev/usb/uled_ioctl.h 273882 2014-10-31 07:33:56Z hselasky $
- */
-
-#ifndef _ULED_IOCTL_H_
-#define _ULED_IOCTL_H_
-
-#include <sys/ioccom.h>
-
-struct uled_color {
-	uint8_t	red;
-	uint8_t	green;
-	uint8_t	blue;
-};
-
-#define	ULED_GET_COLOR	_IOR('U', 205, struct uled_color)
-#define	ULED_SET_COLOR	_IOW('U', 206, struct uled_color)
-
-#endif	/* _ULED_IOCTL_H_ */
diff --git a/include.new/dev/usb/usb.h b/include.new/dev/usb/usb.h
deleted file mode 100644
index 09b0a08..0000000
--- a/include.new/dev/usb/usb.h
+++ /dev/null
@@ -1,801 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb.h 282509 2015-05-05 19:59:15Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
- * Copyright (c) 1998 Lennart Augustsson. 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.
- *
- * 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.
- */
-
-/*
- * This file contains standard definitions for the following USB
- * protocol versions:
- *
- * USB v1.0
- * USB v1.1
- * USB v2.0
- * USB v3.0
- */
-
-#ifndef _USB_STANDARD_H_
-#define	_USB_STANDARD_H_
-
-#if defined(_KERNEL)
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include "opt_usb.h"
-#endif
-
-/* Declare parent SYSCTL USB node. */
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_hw_usb);
-#endif
-
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <sys/malloc.h>
-#endif
-
-MALLOC_DECLARE(M_USB);
-MALLOC_DECLARE(M_USBDEV);
-MALLOC_DECLARE(M_USBHC);
-#endif /* _KERNEL */
-
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <dev/usb/usb_endian.h>
-#include <dev/usb/usb_freebsd.h>
-#endif
-
-#define	USB_STACK_VERSION 2000		/* 2.0 */
-
-/* Definition of some hardcoded USB constants. */
-
-#define	USB_MAX_IPACKET		8	/* initial USB packet size */
-#define	USB_EP_MAX (2*16)		/* hardcoded */
-#define	USB_ROOT_HUB_ADDR 1		/* index */
-#define	USB_MIN_DEVICES 2		/* unused + root HUB */
-#define	USB_UNCONFIG_INDEX 0xFF		/* internal use only */
-#define	USB_IFACE_INDEX_ANY 0xFF	/* internal use only */
-#define	USB_START_ADDR 0		/* default USB device BUS address
-					 * after USB bus reset */
-#define	USB_CONTROL_ENDPOINT 0		/* default control endpoint */
-
-#define	USB_FRAMES_PER_SECOND_FS 1000	/* full speed */
-#define	USB_FRAMES_PER_SECOND_HS 8000	/* high speed */
-
-#define	USB_FS_BYTES_PER_HS_UFRAME 188	/* bytes */
-#define	USB_HS_MICRO_FRAMES_MAX 8	/* units */
-
-#define	USB_ISOC_TIME_MAX 128		/* ms */
-
-/*
- * Minimum time a device needs to be powered down to go through a
- * power cycle. These values are not in the USB specification.
- */
-#define	USB_POWER_DOWN_TIME	200	/* ms */
-#define	USB_PORT_POWER_DOWN_TIME	100	/* ms */
-
-/* Definition of software USB power modes */
-#define	USB_POWER_MODE_OFF 0		/* turn off device */
-#define	USB_POWER_MODE_ON 1		/* always on */
-#define	USB_POWER_MODE_SAVE 2		/* automatic suspend and resume */
-#define	USB_POWER_MODE_SUSPEND 3	/* force suspend */
-#define	USB_POWER_MODE_RESUME 4		/* force resume */
-
-/* These are the values from the USB specification. */
-#define	USB_PORT_RESET_DELAY_SPEC	10	/* ms */
-#define	USB_PORT_ROOT_RESET_DELAY_SPEC	50	/* ms */
-#define	USB_PORT_RESET_RECOVERY_SPEC	10	/* ms */
-#define	USB_PORT_POWERUP_DELAY_SPEC	100	/* ms */
-#define	USB_PORT_RESUME_DELAY_SPEC	20	/* ms */
-#define	USB_SET_ADDRESS_SETTLE_SPEC	2	/* ms */
-#define	USB_RESUME_DELAY_SPEC		(20*5)	/* ms */
-#define	USB_RESUME_WAIT_SPEC		10	/* ms */
-#define	USB_RESUME_RECOVERY_SPEC	10	/* ms */
-#define	USB_EXTRA_POWER_UP_TIME_SPEC	0	/* ms */
-
-/* Allow for marginal and non-conforming devices. */
-#define	USB_PORT_RESET_DELAY		50	/* ms */
-#define	USB_PORT_ROOT_RESET_DELAY	250	/* ms */
-#define	USB_PORT_RESET_RECOVERY		250	/* ms */
-#define	USB_PORT_POWERUP_DELAY		300	/* ms */
-#define	USB_PORT_RESUME_DELAY		(20*2)	/* ms */
-#define	USB_SET_ADDRESS_SETTLE		10	/* ms */
-#define	USB_RESUME_DELAY		(50*5)	/* ms */
-#define	USB_RESUME_WAIT			50	/* ms */
-#define	USB_RESUME_RECOVERY		50	/* ms */
-#define	USB_EXTRA_POWER_UP_TIME		20	/* ms */
-
-#define	USB_MIN_POWER		100	/* mA */
-#define	USB_MAX_POWER		500	/* mA */
-
-#define	USB_BUS_RESET_DELAY	100	/* ms */
-
-/*
- * USB record layout in memory:
- *
- * - USB config 0
- *   - USB interfaces
- *     - USB alternative interfaces
- *       - USB endpoints
- *
- * - USB config 1
- *   - USB interfaces
- *     - USB alternative interfaces
- *       - USB endpoints
- */
-
-/* Declaration of USB records */
-
-struct usb_device_request {
-	uByte	bmRequestType;
-	uByte	bRequest;
-	uWord	wValue;
-	uWord	wIndex;
-	uWord	wLength;
-} __packed;
-typedef struct usb_device_request usb_device_request_t;
-
-#define	UT_WRITE		0x00
-#define	UT_READ			0x80
-#define	UT_STANDARD		0x00
-#define	UT_CLASS		0x20
-#define	UT_VENDOR		0x40
-#define	UT_DEVICE		0x00
-#define	UT_INTERFACE		0x01
-#define	UT_ENDPOINT		0x02
-#define	UT_OTHER		0x03
-
-#define	UT_READ_DEVICE		(UT_READ  | UT_STANDARD | UT_DEVICE)
-#define	UT_READ_INTERFACE	(UT_READ  | UT_STANDARD | UT_INTERFACE)
-#define	UT_READ_ENDPOINT	(UT_READ  | UT_STANDARD | UT_ENDPOINT)
-#define	UT_WRITE_DEVICE		(UT_WRITE | UT_STANDARD | UT_DEVICE)
-#define	UT_WRITE_INTERFACE	(UT_WRITE | UT_STANDARD | UT_INTERFACE)
-#define	UT_WRITE_ENDPOINT	(UT_WRITE | UT_STANDARD | UT_ENDPOINT)
-#define	UT_READ_CLASS_DEVICE	(UT_READ  | UT_CLASS | UT_DEVICE)
-#define	UT_READ_CLASS_INTERFACE	(UT_READ  | UT_CLASS | UT_INTERFACE)
-#define	UT_READ_CLASS_OTHER	(UT_READ  | UT_CLASS | UT_OTHER)
-#define	UT_READ_CLASS_ENDPOINT	(UT_READ  | UT_CLASS | UT_ENDPOINT)
-#define	UT_WRITE_CLASS_DEVICE	(UT_WRITE | UT_CLASS | UT_DEVICE)
-#define	UT_WRITE_CLASS_INTERFACE (UT_WRITE | UT_CLASS | UT_INTERFACE)
-#define	UT_WRITE_CLASS_OTHER	(UT_WRITE | UT_CLASS | UT_OTHER)
-#define	UT_WRITE_CLASS_ENDPOINT	(UT_WRITE | UT_CLASS | UT_ENDPOINT)
-#define	UT_READ_VENDOR_DEVICE	(UT_READ  | UT_VENDOR | UT_DEVICE)
-#define	UT_READ_VENDOR_INTERFACE (UT_READ  | UT_VENDOR | UT_INTERFACE)
-#define	UT_READ_VENDOR_OTHER	(UT_READ  | UT_VENDOR | UT_OTHER)
-#define	UT_READ_VENDOR_ENDPOINT	(UT_READ  | UT_VENDOR | UT_ENDPOINT)
-#define	UT_WRITE_VENDOR_DEVICE	(UT_WRITE | UT_VENDOR | UT_DEVICE)
-#define	UT_WRITE_VENDOR_INTERFACE (UT_WRITE | UT_VENDOR | UT_INTERFACE)
-#define	UT_WRITE_VENDOR_OTHER	(UT_WRITE | UT_VENDOR | UT_OTHER)
-#define	UT_WRITE_VENDOR_ENDPOINT (UT_WRITE | UT_VENDOR | UT_ENDPOINT)
-
-/* Requests */
-#define	UR_GET_STATUS		0x00
-#define	UR_CLEAR_FEATURE	0x01
-#define	UR_SET_FEATURE		0x03
-#define	UR_SET_ADDRESS		0x05
-#define	UR_GET_DESCRIPTOR	0x06
-#define	UDESC_DEVICE		0x01
-#define	UDESC_CONFIG		0x02
-#define	UDESC_STRING		0x03
-#define	USB_LANGUAGE_TABLE	0x00	/* language ID string index */
-#define	UDESC_INTERFACE		0x04
-#define	UDESC_ENDPOINT		0x05
-#define	UDESC_DEVICE_QUALIFIER	0x06
-#define	UDESC_OTHER_SPEED_CONFIGURATION 0x07
-#define	UDESC_INTERFACE_POWER	0x08
-#define	UDESC_OTG		0x09
-#define	UDESC_DEBUG		0x0A
-#define	UDESC_IFACE_ASSOC	0x0B	/* interface association */
-#define	UDESC_BOS		0x0F	/* binary object store */
-#define	UDESC_DEVICE_CAPABILITY	0x10
-#define	UDESC_CS_DEVICE		0x21	/* class specific */
-#define	UDESC_CS_CONFIG		0x22
-#define	UDESC_CS_STRING		0x23
-#define	UDESC_CS_INTERFACE	0x24
-#define	UDESC_CS_ENDPOINT	0x25
-#define	UDESC_HUB		0x29
-#define	UDESC_SS_HUB		0x2A	/* super speed */
-#define	UDESC_ENDPOINT_SS_COMP	0x30	/* super speed */
-#define	UR_SET_DESCRIPTOR	0x07
-#define	UR_GET_CONFIG		0x08
-#define	UR_SET_CONFIG		0x09
-#define	UR_GET_INTERFACE	0x0a
-#define	UR_SET_INTERFACE	0x0b
-#define	UR_SYNCH_FRAME		0x0c
-#define	UR_SET_SEL		0x30
-#define	UR_ISOCH_DELAY		0x31
-
-/* HUB specific request */
-#define	UR_GET_BUS_STATE	0x02
-#define	UR_CLEAR_TT_BUFFER	0x08
-#define	UR_RESET_TT		0x09
-#define	UR_GET_TT_STATE		0x0a
-#define	UR_STOP_TT		0x0b
-#define	UR_SET_AND_TEST		0x0c	/* USB 2.0 only */
-#define	UR_SET_HUB_DEPTH	0x0c	/* USB 3.0 only */
-#define	USB_SS_HUB_DEPTH_MAX	5
-#define	UR_GET_PORT_ERR_COUNT	0x0d
-
-/* Feature numbers */
-#define	UF_ENDPOINT_HALT	0
-#define	UF_DEVICE_REMOTE_WAKEUP	1
-#define	UF_TEST_MODE		2
-#define	UF_U1_ENABLE		0x30
-#define	UF_U2_ENABLE		0x31
-#define	UF_LTM_ENABLE		0x32
-
-/* HUB specific features */
-#define	UHF_C_HUB_LOCAL_POWER	0
-#define	UHF_C_HUB_OVER_CURRENT	1
-#define	UHF_PORT_CONNECTION	0
-#define	UHF_PORT_ENABLE		1
-#define	UHF_PORT_SUSPEND	2
-#define	UHF_PORT_OVER_CURRENT	3
-#define	UHF_PORT_RESET		4
-#define	UHF_PORT_LINK_STATE	5
-#define	UHF_PORT_POWER		8
-#define	UHF_PORT_LOW_SPEED	9
-#define	UHF_PORT_L1		10
-#define	UHF_C_PORT_CONNECTION	16
-#define	UHF_C_PORT_ENABLE	17
-#define	UHF_C_PORT_SUSPEND	18
-#define	UHF_C_PORT_OVER_CURRENT	19
-#define	UHF_C_PORT_RESET	20
-#define	UHF_PORT_TEST		21
-#define	UHF_PORT_INDICATOR	22
-#define	UHF_C_PORT_L1		23
-
-/* SuperSpeed HUB specific features */
-#define	UHF_PORT_U1_TIMEOUT	23
-#define	UHF_PORT_U2_TIMEOUT	24
-#define	UHF_C_PORT_LINK_STATE	25
-#define	UHF_C_PORT_CONFIG_ERROR	26
-#define	UHF_PORT_REMOTE_WAKE_MASK	27
-#define	UHF_BH_PORT_RESET	28
-#define	UHF_C_BH_PORT_RESET	29
-#define	UHF_FORCE_LINKPM_ACCEPT	30
-
-struct usb_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDescriptorSubtype;
-} __packed;
-typedef struct usb_descriptor usb_descriptor_t;
-
-struct usb_device_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uWord	bcdUSB;
-#define	UD_USB_2_0		0x0200
-#define	UD_USB_3_0		0x0300
-#define	UD_IS_USB2(d) ((d)->bcdUSB[1] == 0x02)
-#define	UD_IS_USB3(d) ((d)->bcdUSB[1] == 0x03)
-	uByte	bDeviceClass;
-	uByte	bDeviceSubClass;
-	uByte	bDeviceProtocol;
-	uByte	bMaxPacketSize;
-	/* The fields below are not part of the initial descriptor. */
-	uWord	idVendor;
-	uWord	idProduct;
-	uWord	bcdDevice;
-	uByte	iManufacturer;
-	uByte	iProduct;
-	uByte	iSerialNumber;
-	uByte	bNumConfigurations;
-} __packed;
-typedef struct usb_device_descriptor usb_device_descriptor_t;
-
-/* Binary Device Object Store (BOS) */
-struct usb_bos_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uWord	wTotalLength;
-	uByte	bNumDeviceCaps;
-} __packed;
-typedef struct usb_bos_descriptor usb_bos_descriptor_t;
-
-/* Binary Device Object Store Capability */
-struct usb_bos_cap_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDevCapabilityType;
-#define	USB_DEVCAP_RESERVED	0x00
-#define	USB_DEVCAP_WUSB		0x01
-#define	USB_DEVCAP_USB2EXT	0x02
-#define	USB_DEVCAP_SUPER_SPEED	0x03
-#define	USB_DEVCAP_CONTAINER_ID	0x04
-	/* data ... */
-} __packed;
-typedef struct usb_bos_cap_descriptor usb_bos_cap_descriptor_t;
-
-struct usb_devcap_usb2ext_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDevCapabilityType;
-	uDWord	bmAttributes;
-#define	USB_V2EXT_LPM (1U << 1)
-#define	USB_V2EXT_BESL_SUPPORTED (1U << 2)
-#define	USB_V2EXT_BESL_BASELINE_VALID (1U << 3)
-#define	USB_V2EXT_BESL_DEEP_VALID (1U << 4)
-#define	USB_V2EXT_BESL_BASELINE_GET(x) (((x) >> 8) & 0xF)
-#define	USB_V2EXT_BESL_DEEP_GET(x) (((x) >> 12) & 0xF)
-} __packed;
-typedef struct usb_devcap_usb2ext_descriptor usb_devcap_usb2ext_descriptor_t;
-
-struct usb_devcap_ss_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDevCapabilityType;
-	uByte	bmAttributes;
-	uWord	wSpeedsSupported;
-	uByte	bFunctionalitySupport;
-	uByte	bU1DevExitLat;
-	uWord	wU2DevExitLat;
-} __packed;
-typedef struct usb_devcap_ss_descriptor usb_devcap_ss_descriptor_t;
-
-struct usb_devcap_container_id_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDevCapabilityType;
-	uByte	bReserved;
-	uByte	bContainerID;
-} __packed;
-typedef struct usb_devcap_container_id_descriptor
-		usb_devcap_container_id_descriptor_t;
-
-/* Device class codes */
-#define	UDCLASS_IN_INTERFACE	0x00
-#define	UDCLASS_COMM		0x02
-#define	UDCLASS_HUB		0x09
-#define	UDSUBCLASS_HUB		0x00
-#define	UDPROTO_FSHUB		0x00
-#define	UDPROTO_HSHUBSTT	0x01
-#define	UDPROTO_HSHUBMTT	0x02
-#define	UDPROTO_SSHUB		0x03
-#define	UDCLASS_DIAGNOSTIC	0xdc
-#define	UDCLASS_WIRELESS	0xe0
-#define	UDSUBCLASS_RF		0x01
-#define	UDPROTO_BLUETOOTH	0x01
-#define	UDCLASS_VENDOR		0xff
-
-struct usb_config_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uWord	wTotalLength;
-	uByte	bNumInterface;
-	uByte	bConfigurationValue;
-#define	USB_UNCONFIG_NO 0
-	uByte	iConfiguration;
-	uByte	bmAttributes;
-#define	UC_BUS_POWERED		0x80
-#define	UC_SELF_POWERED		0x40
-#define	UC_REMOTE_WAKEUP	0x20
-	uByte	bMaxPower;		/* max current in 2 mA units */
-#define	UC_POWER_FACTOR 2
-} __packed;
-typedef struct usb_config_descriptor usb_config_descriptor_t;
-
-struct usb_interface_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bInterfaceNumber;
-	uByte	bAlternateSetting;
-	uByte	bNumEndpoints;
-	uByte	bInterfaceClass;
-	uByte	bInterfaceSubClass;
-	uByte	bInterfaceProtocol;
-	uByte	iInterface;
-} __packed;
-typedef struct usb_interface_descriptor usb_interface_descriptor_t;
-
-struct usb_interface_assoc_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bFirstInterface;
-	uByte	bInterfaceCount;
-	uByte	bFunctionClass;
-	uByte	bFunctionSubClass;
-	uByte	bFunctionProtocol;
-	uByte	iFunction;
-} __packed;
-typedef struct usb_interface_assoc_descriptor usb_interface_assoc_descriptor_t;
-
-/* Interface class codes */
-#define	UICLASS_UNSPEC		0x00
-#define	UICLASS_AUDIO		0x01	/* audio */
-#define	UISUBCLASS_AUDIOCONTROL	1
-#define	UISUBCLASS_AUDIOSTREAM		2
-#define	UISUBCLASS_MIDISTREAM		3
-
-#define	UICLASS_CDC		0x02	/* communication */
-#define	UISUBCLASS_DIRECT_LINE_CONTROL_MODEL	1
-#define	UISUBCLASS_ABSTRACT_CONTROL_MODEL	2
-#define	UISUBCLASS_TELEPHONE_CONTROL_MODEL	3
-#define	UISUBCLASS_MULTICHANNEL_CONTROL_MODEL	4
-#define	UISUBCLASS_CAPI_CONTROLMODEL		5
-#define	UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL 6
-#define	UISUBCLASS_ATM_NETWORKING_CONTROL_MODEL 7
-#define	UISUBCLASS_WIRELESS_HANDSET_CM 8
-#define	UISUBCLASS_DEVICE_MGMT 9
-#define	UISUBCLASS_MOBILE_DIRECT_LINE_MODEL 10
-#define	UISUBCLASS_OBEX 11
-#define	UISUBCLASS_ETHERNET_EMULATION_MODEL 12
-#define	UISUBCLASS_NETWORK_CONTROL_MODEL 13
-
-#define	UIPROTO_CDC_AT			1
-
-#define	UICLASS_HID		0x03
-#define	UISUBCLASS_BOOT		1
-#define	UIPROTO_BOOT_KEYBOARD	1
-#define	UIPROTO_MOUSE		2
-
-#define	UICLASS_PHYSICAL	0x05
-#define	UICLASS_IMAGE		0x06
-#define	UISUBCLASS_SIC		1	/* still image class */
-#define	UICLASS_PRINTER		0x07
-#define	UISUBCLASS_PRINTER	1
-#define	UIPROTO_PRINTER_UNI	1
-#define	UIPROTO_PRINTER_BI	2
-#define	UIPROTO_PRINTER_1284	3
-
-#define	UICLASS_MASS		0x08
-#define	UISUBCLASS_RBC		1
-#define	UISUBCLASS_SFF8020I	2
-#define	UISUBCLASS_QIC157	3
-#define	UISUBCLASS_UFI		4
-#define	UISUBCLASS_SFF8070I	5
-#define	UISUBCLASS_SCSI		6
-#define	UIPROTO_MASS_CBI_I	0
-#define	UIPROTO_MASS_CBI	1
-#define	UIPROTO_MASS_BBB_OLD	2	/* Not in the spec anymore */
-#define	UIPROTO_MASS_BBB	80	/* 'P' for the Iomega Zip drive */
-
-#define	UICLASS_HUB		0x09
-#define	UISUBCLASS_HUB		0
-#define	UIPROTO_FSHUB		0
-#define	UIPROTO_HSHUBSTT	0	/* Yes, same as previous */
-#define	UIPROTO_HSHUBMTT	1
-
-#define	UICLASS_CDC_DATA	0x0a
-#define	UISUBCLASS_DATA		0x00
-#define	UIPROTO_DATA_ISDNBRI		0x30	/* Physical iface */
-#define	UIPROTO_DATA_HDLC		0x31	/* HDLC */
-#define	UIPROTO_DATA_TRANSPARENT	0x32	/* Transparent */
-#define	UIPROTO_DATA_Q921M		0x50	/* Management for Q921 */
-#define	UIPROTO_DATA_Q921		0x51	/* Data for Q921 */
-#define	UIPROTO_DATA_Q921TM		0x52	/* TEI multiplexer for Q921 */
-#define	UIPROTO_DATA_V42BIS		0x90	/* Data compression */
-#define	UIPROTO_DATA_Q931		0x91	/* Euro-ISDN */
-#define	UIPROTO_DATA_V120		0x92	/* V.24 rate adaption */
-#define	UIPROTO_DATA_CAPI		0x93	/* CAPI 2.0 commands */
-#define	UIPROTO_DATA_HOST_BASED		0xfd	/* Host based driver */
-#define	UIPROTO_DATA_PUF		0xfe	/* see Prot. Unit Func. Desc. */
-#define	UIPROTO_DATA_VENDOR		0xff	/* Vendor specific */
-#define	UIPROTO_DATA_NCM		0x01	/* Network Control Model */
-
-#define	UICLASS_SMARTCARD	0x0b
-#define	UICLASS_FIRM_UPD	0x0c
-#define	UICLASS_SECURITY	0x0d
-#define	UICLASS_DIAGNOSTIC	0xdc
-#define	UICLASS_WIRELESS	0xe0
-#define	UISUBCLASS_RF			0x01
-#define	UIPROTO_BLUETOOTH		0x01
-#define	UIPROTO_RNDIS			0x03
-
-#define	UICLASS_IAD		0xEF	/* Interface Association Descriptor */
-#define	UISUBCLASS_SYNC			0x01
-#define	UIPROTO_ACTIVESYNC		0x01
-
-#define	UICLASS_APPL_SPEC	0xfe
-#define	UISUBCLASS_FIRMWARE_DOWNLOAD	1
-#define	UISUBCLASS_IRDA			2
-#define	UIPROTO_IRDA			0
-
-#define	UICLASS_VENDOR		0xff
-#define	UISUBCLASS_XBOX360_CONTROLLER	0x5d
-#define	UIPROTO_XBOX360_GAMEPAD	0x01
-
-struct usb_endpoint_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bEndpointAddress;
-#define	UE_GET_DIR(a)	((a) & 0x80)
-#define	UE_SET_DIR(a,d)	((a) | (((d)&1) << 7))
-#define	UE_DIR_IN	0x80		/* IN-token endpoint, fixed */
-#define	UE_DIR_OUT	0x00		/* OUT-token endpoint, fixed */
-#define	UE_DIR_RX	0xfd		/* for internal use only! */
-#define	UE_DIR_TX	0xfe		/* for internal use only! */
-#define	UE_DIR_ANY	0xff		/* for internal use only! */
-#define	UE_ADDR		0x0f
-#define	UE_ADDR_ANY	0xff		/* for internal use only! */
-#define	UE_GET_ADDR(a)	((a) & UE_ADDR)
-	uByte	bmAttributes;
-#define	UE_XFERTYPE	0x03
-#define	UE_CONTROL	0x00
-#define	UE_ISOCHRONOUS	0x01
-#define	UE_BULK	0x02
-#define	UE_INTERRUPT	0x03
-#define	UE_BULK_INTR	0xfe		/* for internal use only! */
-#define	UE_TYPE_ANY	0xff		/* for internal use only! */
-#define	UE_GET_XFERTYPE(a)	((a) & UE_XFERTYPE)
-#define	UE_ISO_TYPE	0x0c
-#define	UE_ISO_ASYNC	0x04
-#define	UE_ISO_ADAPT	0x08
-#define	UE_ISO_SYNC	0x0c
-#define	UE_GET_ISO_TYPE(a)	((a) & UE_ISO_TYPE)
-#define	UE_ISO_USAGE	0x30
-#define	UE_ISO_USAGE_DATA	0x00
-#define	UE_ISO_USAGE_FEEDBACK	0x10
-#define	UE_ISO_USAGE_IMPLICT_FB	0x20
-#define	UE_GET_ISO_USAGE(a)	((a) & UE_ISO_USAGE)
-	uWord	wMaxPacketSize;
-#define	UE_ZERO_MPS 0xFFFF		/* for internal use only */
-	uByte	bInterval;
-} __packed;
-typedef struct usb_endpoint_descriptor usb_endpoint_descriptor_t;
-
-struct usb_endpoint_ss_comp_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bMaxBurst;
-	uByte	bmAttributes;
-#define	UE_GET_BULK_STREAMS(x) ((x) & 0x0F)
-#define	UE_GET_SS_ISO_MULT(x) ((x) & 0x03)
-	uWord	wBytesPerInterval;
-} __packed;
-typedef struct usb_endpoint_ss_comp_descriptor
-		usb_endpoint_ss_comp_descriptor_t;
-
-struct usb_string_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uWord	bString[126];
-	uByte	bUnused;
-} __packed;
-typedef struct usb_string_descriptor usb_string_descriptor_t;
-
-#define	USB_MAKE_STRING_DESC(m,name)	\
-static const struct {			\
-  uByte bLength;			\
-  uByte bDescriptorType;		\
-  uByte bData[sizeof((uint8_t []){m})];	\
-} __packed name = {			\
-  .bLength = sizeof(name),		\
-  .bDescriptorType = UDESC_STRING,	\
-  .bData = { m },			\
-}
-
-struct usb_string_lang {
-	uByte bLength;
-	uByte bDescriptorType;
-	uByte bData[2];
-} __packed;
-typedef struct usb_string_lang usb_string_lang_t;
-
-struct usb_hub_descriptor {
-	uByte	bDescLength;
-	uByte	bDescriptorType;
-	uByte	bNbrPorts;
-	uWord	wHubCharacteristics;
-#define	UHD_PWR			0x0003
-#define	UHD_PWR_GANGED		0x0000
-#define	UHD_PWR_INDIVIDUAL	0x0001
-#define	UHD_PWR_NO_SWITCH	0x0002
-#define	UHD_COMPOUND		0x0004
-#define	UHD_OC			0x0018
-#define	UHD_OC_GLOBAL		0x0000
-#define	UHD_OC_INDIVIDUAL	0x0008
-#define	UHD_OC_NONE		0x0010
-#define	UHD_TT_THINK		0x0060
-#define	UHD_TT_THINK_8		0x0000
-#define	UHD_TT_THINK_16		0x0020
-#define	UHD_TT_THINK_24		0x0040
-#define	UHD_TT_THINK_32		0x0060
-#define	UHD_PORT_IND		0x0080
-	uByte	bPwrOn2PwrGood;		/* delay in 2 ms units */
-#define	UHD_PWRON_FACTOR 2
-	uByte	bHubContrCurrent;
-	uByte	DeviceRemovable[32];	/* max 255 ports */
-#define	UHD_NOT_REMOV(desc, i) \
-    (((desc)->DeviceRemovable[(i)/8] >> ((i) % 8)) & 1)
-	uByte	PortPowerCtrlMask[1];	/* deprecated */
-} __packed;
-typedef struct usb_hub_descriptor usb_hub_descriptor_t;
-
-struct usb_hub_ss_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bNbrPorts;
-	uWord	wHubCharacteristics;
-	uByte	bPwrOn2PwrGood;		/* delay in 2 ms units */
-	uByte	bHubContrCurrent;
-	uByte	bHubHdrDecLat;
-	uWord	wHubDelay;
-	uByte	DeviceRemovable[32];	/* max 255 ports */
-} __packed;
-typedef struct usb_hub_ss_descriptor usb_hub_ss_descriptor_t;
-
-/* minimum HUB descriptor (8-ports maximum) */
-struct usb_hub_descriptor_min {
-	uByte	bDescLength;
-	uByte	bDescriptorType;
-	uByte	bNbrPorts;
-	uWord	wHubCharacteristics;
-	uByte	bPwrOn2PwrGood;
-	uByte	bHubContrCurrent;
-	uByte	DeviceRemovable[1];
-	uByte	PortPowerCtrlMask[1];
-} __packed;
-typedef struct usb_hub_descriptor_min usb_hub_descriptor_min_t;
-
-struct usb_device_qualifier {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uWord	bcdUSB;
-	uByte	bDeviceClass;
-	uByte	bDeviceSubClass;
-	uByte	bDeviceProtocol;
-	uByte	bMaxPacketSize0;
-	uByte	bNumConfigurations;
-	uByte	bReserved;
-} __packed;
-typedef struct usb_device_qualifier usb_device_qualifier_t;
-
-struct usb_otg_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bmAttributes;
-#define	UOTG_SRP	0x01
-#define	UOTG_HNP	0x02
-} __packed;
-typedef struct usb_otg_descriptor usb_otg_descriptor_t;
-
-/* OTG feature selectors */
-#define	UOTG_B_HNP_ENABLE	3
-#define	UOTG_A_HNP_SUPPORT	4
-#define	UOTG_A_ALT_HNP_SUPPORT	5
-
-struct usb_status {
-	uWord	wStatus;
-/* Device status flags */
-#define	UDS_SELF_POWERED		0x0001
-#define	UDS_REMOTE_WAKEUP		0x0002
-/* Endpoint status flags */
-#define	UES_HALT			0x0001
-} __packed;
-typedef struct usb_status usb_status_t;
-
-struct usb_hub_status {
-	uWord	wHubStatus;
-#define	UHS_LOCAL_POWER			0x0001
-#define	UHS_OVER_CURRENT		0x0002
-	uWord	wHubChange;
-} __packed;
-typedef struct usb_hub_status usb_hub_status_t;
-
-struct usb_port_status {
-	uWord	wPortStatus;
-#define	UPS_CURRENT_CONNECT_STATUS	0x0001
-#define	UPS_PORT_ENABLED		0x0002
-#define	UPS_SUSPEND			0x0004
-#define	UPS_OVERCURRENT_INDICATOR	0x0008
-#define	UPS_RESET			0x0010
-#define	UPS_PORT_L1			0x0020	/* USB 2.0 only */
-/* The link-state bits are valid for Super-Speed USB HUBs */
-#define	UPS_PORT_LINK_STATE_GET(x)	(((x) >> 5) & 0xF)
-#define	UPS_PORT_LINK_STATE_SET(x)	(((x) & 0xF) << 5)
-#define	UPS_PORT_LS_U0		0x00
-#define	UPS_PORT_LS_U1		0x01
-#define	UPS_PORT_LS_U2		0x02
-#define	UPS_PORT_LS_U3		0x03
-#define	UPS_PORT_LS_SS_DIS	0x04
-#define	UPS_PORT_LS_RX_DET	0x05
-#define	UPS_PORT_LS_SS_INA	0x06
-#define	UPS_PORT_LS_POLL	0x07
-#define	UPS_PORT_LS_RECOVER	0x08
-#define	UPS_PORT_LS_HOT_RST	0x09
-#define	UPS_PORT_LS_COMP_MODE	0x0A
-#define	UPS_PORT_LS_LOOPBACK	0x0B
-#define	UPS_PORT_LS_RESUME	0x0F
-#define	UPS_PORT_POWER			0x0100
-#define	UPS_PORT_POWER_SS		0x0200	/* super-speed only */
-#define	UPS_LOW_SPEED			0x0200
-#define	UPS_HIGH_SPEED			0x0400
-#define	UPS_OTHER_SPEED			0x0600	/* currently FreeBSD specific */
-#define	UPS_PORT_TEST			0x0800
-#define	UPS_PORT_INDICATOR		0x1000
-#define	UPS_PORT_MODE_DEVICE		0x8000	/* currently FreeBSD specific */
-	uWord	wPortChange;
-#define	UPS_C_CONNECT_STATUS		0x0001
-#define	UPS_C_PORT_ENABLED		0x0002
-#define	UPS_C_SUSPEND			0x0004
-#define	UPS_C_OVERCURRENT_INDICATOR	0x0008
-#define	UPS_C_PORT_RESET		0x0010
-#define	UPS_C_PORT_L1			0x0020	/* USB 2.0 only */
-#define	UPS_C_BH_PORT_RESET		0x0020	/* USB 3.0 only */
-#define	UPS_C_PORT_LINK_STATE		0x0040
-#define	UPS_C_PORT_CONFIG_ERROR		0x0080
-} __packed;
-typedef struct usb_port_status usb_port_status_t;
-
-/*
- * The "USB_SPEED" macros defines all the supported USB speeds.
- */
-enum usb_dev_speed {
-	USB_SPEED_VARIABLE,
-	USB_SPEED_LOW,
-	USB_SPEED_FULL,
-	USB_SPEED_HIGH,
-	USB_SPEED_SUPER,
-};
-#define	USB_SPEED_MAX	(USB_SPEED_SUPER+1)
-
-/*
- * The "USB_REV" macros defines all the supported USB revisions.
- */
-enum usb_revision {
-	USB_REV_UNKNOWN,
-	USB_REV_PRE_1_0,
-	USB_REV_1_0,
-	USB_REV_1_1,
-	USB_REV_2_0,
-	USB_REV_2_5,
-	USB_REV_3_0
-};
-#define	USB_REV_MAX	(USB_REV_3_0+1)
-
-/*
- * Supported host controller modes.
- */
-enum usb_hc_mode {
-	USB_MODE_HOST,		/* initiates transfers */
-	USB_MODE_DEVICE,	/* bus transfer target */
-	USB_MODE_DUAL		/* can be host or device */
-};
-#define	USB_MODE_MAX	(USB_MODE_DUAL+1)
-
-/*
- * The "USB_STATE" enums define all the supported device states.
- */
-enum usb_dev_state {
-	USB_STATE_DETACHED,
-	USB_STATE_ATTACHED,
-	USB_STATE_POWERED,
-	USB_STATE_ADDRESSED,
-	USB_STATE_CONFIGURED,
-};
-#define	USB_STATE_MAX	(USB_STATE_CONFIGURED+1)
-
-/*
- * The "USB_EP_MODE" macros define all the currently supported
- * endpoint modes.
- */
-enum usb_ep_mode {
-	USB_EP_MODE_DEFAULT,
-	USB_EP_MODE_STREAMS,	/* USB3.0 specific */
-	USB_EP_MODE_HW_MASS_STORAGE,
-	USB_EP_MODE_HW_SERIAL,
-	USB_EP_MODE_HW_ETHERNET_CDC,
-	USB_EP_MODE_HW_ETHERNET_NCM,
-	USB_EP_MODE_MAX
-};
-#endif					/* _USB_STANDARD_H_ */
diff --git a/include.new/dev/usb/usb_bus.h b/include.new/dev/usb/usb_bus.h
deleted file mode 100644
index 2584f88..0000000
--- a/include.new/dev/usb/usb_bus.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_bus.h 278289 2015-02-05 21:18:44Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_BUS_H_
-#define	_USB_BUS_H_
-
-struct usb_fs_privdata;
-
-/*
- * The following structure defines the USB explore message sent to the USB
- * explore process.
- */
-
-struct usb_bus_msg {
-	struct usb_proc_msg hdr;
-	struct usb_bus *bus;
-};
-
-/*
- * The following structure defines the USB statistics structure.
- */
-struct usb_bus_stat {
-	uint32_t uds_requests[4];
-};
-
-/*
- * The following structure defines an USB BUS. There is one USB BUS
- * for every Host or Device controller.
- */
-struct usb_bus {
-	struct usb_bus_stat stats_err;
-	struct usb_bus_stat stats_ok;
-#if USB_HAVE_ROOT_MOUNT_HOLD
-	struct root_hold_token *bus_roothold;
-#endif
-
-#if USB_HAVE_PER_BUS_PROCESS
-#define	USB_BUS_GIANT_PROC(bus) (&(bus)->giant_callback_proc)
-#define	USB_BUS_NON_GIANT_PROC(bus) (&(bus)->non_giant_callback_proc)
-#define	USB_BUS_EXPLORE_PROC(bus) (&(bus)->explore_proc)
-#define	USB_BUS_CONTROL_XFER_PROC(bus) (&(bus)->control_xfer_proc)
-
-	/*
-	 * There are two callback processes. One for Giant locked
-	 * callbacks. One for non-Giant locked callbacks. This should
-	 * avoid congestion and reduce response time in most cases.
-	 */
-	struct usb_process giant_callback_proc;
-	struct usb_process non_giant_callback_proc;
-
-	/* Explore process */
-	struct usb_process explore_proc;
-
-	/* Control request process */
-	struct usb_process control_xfer_proc;
-#endif
-
-	struct usb_bus_msg explore_msg[2];
-	struct usb_bus_msg detach_msg[2];
-	struct usb_bus_msg attach_msg[2];
-	struct usb_bus_msg suspend_msg[2];
-	struct usb_bus_msg resume_msg[2];
-	struct usb_bus_msg reset_msg[2];
-	struct usb_bus_msg shutdown_msg[2];
-#if USB_HAVE_UGEN
-	struct usb_bus_msg cleanup_msg[2];
-	LIST_HEAD(,usb_fs_privdata) pd_cleanup_list;
-#endif
-	/*
-	 * This mutex protects the USB hardware:
-	 */
-	struct mtx bus_mtx;
-	struct mtx bus_spin_lock;
-	struct usb_xfer_queue intr_q;
-	struct usb_callout power_wdog;	/* power management */
-
-	device_t parent;
-	device_t bdev;			/* filled by HC driver */
-
-#if USB_HAVE_BUSDMA
-	struct usb_dma_parent_tag dma_parent_tag[1];
-	struct usb_dma_tag dma_tags[USB_BUS_DMA_TAG_MAX];
-#endif
-	struct usb_bus_methods *methods;	/* filled by HC driver */
-	struct usb_device **devices;
-
-	struct ifnet *ifp;	/* only for USB Packet Filter */
-
-	usb_power_mask_t hw_power_state;	/* see USB_HW_POWER_XXX */
-	usb_size_t uframe_usage[USB_HS_MICRO_FRAMES_MAX];
-
-	uint16_t isoc_time_last;	/* in milliseconds */
-
-	uint8_t	alloc_failed;		/* Set if memory allocation failed. */
-	uint8_t	driver_added_refcount;	/* Current driver generation count */
-	enum usb_revision usbrev;	/* USB revision. See "USB_REV_XXX". */
-
-	uint8_t	devices_max;		/* maximum number of USB devices */
-	uint8_t	do_probe;		/* set if USB should be re-probed */
-	uint8_t no_explore;		/* don't explore USB ports */
-	uint8_t dma_bits;		/* number of DMA address lines */
-};
-
-#endif					/* _USB_BUS_H_ */
diff --git a/include.new/dev/usb/usb_busdma.h b/include.new/dev/usb/usb_busdma.h
deleted file mode 100644
index b6701f1..0000000
--- a/include.new/dev/usb/usb_busdma.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_busdma.h 278278 2015-02-05 20:03:02Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_BUSDMA_H_
-#define	_USB_BUSDMA_H_
-
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <sys/uio.h>
-#include <sys/mbuf.h>
-
-#include <machine/bus.h>
-#endif
-
-/* defines */
-
-#define	USB_PAGE_SIZE PAGE_SIZE		/* use system PAGE_SIZE */
-
-#if (__FreeBSD_version >= 700020)
-#define	USB_GET_DMA_TAG(dev) bus_get_dma_tag(dev)
-#else
-#define	USB_GET_DMA_TAG(dev) NULL	/* XXX */
-#endif
-
-/* structure prototypes */
-
-struct usb_xfer_root;
-struct usb_dma_parent_tag;
-struct usb_dma_tag;
-
-/*
- * The following typedef defines the USB DMA load done callback.
- */
-
-typedef void (usb_dma_callback_t)(struct usb_dma_parent_tag *udpt);
-
-/*
- * The following structure defines physical and non kernel virtual
- * address of a memory page having size USB_PAGE_SIZE.
- */
-struct usb_page {
-#if USB_HAVE_BUSDMA
-	bus_addr_t physaddr;
-	void   *buffer;			/* non Kernel Virtual Address */
-#endif
-};
-
-/*
- * The following structure is used when needing the kernel virtual
- * pointer and the physical address belonging to an offset in an USB
- * page cache.
- */
-struct usb_page_search {
-	void   *buffer;
-#if USB_HAVE_BUSDMA
-	bus_addr_t physaddr;
-#endif
-	usb_size_t length;
-};
-
-/*
- * The following structure is used to keep information about a DMA
- * memory allocation.
- */
-struct usb_page_cache {
-
-#if USB_HAVE_BUSDMA
-	bus_dma_tag_t tag;
-	bus_dmamap_t map;
-	struct usb_page *page_start;
-#endif
-	struct usb_dma_parent_tag *tag_parent;	/* always set */
-	void   *buffer;			/* virtual buffer pointer */
-#if USB_HAVE_BUSDMA
-	usb_size_t page_offset_buf;
-	usb_size_t page_offset_end;
-	uint8_t	isread:1;		/* set if we are currently reading
-					 * from the memory. Else write. */
-	uint8_t	ismultiseg:1;		/* set if we can have multiple
-					 * segments */
-#endif
-};
-
-/*
- * The following structure describes the parent USB DMA tag.
- */
-#if USB_HAVE_BUSDMA
-struct usb_dma_parent_tag {
-	struct cv cv[1];		/* internal condition variable */
-	bus_dma_tag_t tag;		/* always set */
-
-	struct mtx *mtx;		/* private mutex, always set */
-	usb_dma_callback_t *func;	/* load complete callback function */
-	struct usb_dma_tag *utag_first;/* pointer to first USB DMA tag */
-	uint8_t	dma_error;		/* set if DMA load operation failed */
-	uint8_t	dma_bits;		/* number of DMA address lines */
-	uint8_t	utag_max;		/* number of USB DMA tags */
-};
-#else
-struct usb_dma_parent_tag {};		/* empty struct */
-#endif
-
-/*
- * The following structure describes an USB DMA tag.
- */
-#if USB_HAVE_BUSDMA
-struct usb_dma_tag {
-	struct usb_dma_parent_tag *tag_parent;
-	bus_dma_tag_t tag;
-	usb_size_t align;
-	usb_size_t size;
-};
-#else
-struct usb_dma_tag {};			/* empty struct */
-#endif
-
-/* function prototypes */
-
-int	usb_uiomove(struct usb_page_cache *pc, struct uio *uio,
-	    usb_frlength_t pc_offset, usb_frlength_t len);
-struct usb_dma_tag *usb_dma_tag_find(struct usb_dma_parent_tag *udpt,
-	    usb_size_t size, usb_size_t align);
-uint8_t	usb_pc_alloc_mem(struct usb_page_cache *pc, struct usb_page *pg,
-	    usb_size_t size, usb_size_t align);
-uint8_t	usb_pc_dmamap_create(struct usb_page_cache *pc, usb_size_t size);
-uint8_t	usb_pc_load_mem(struct usb_page_cache *pc, usb_size_t size,
-	    uint8_t sync);
-void	usb_bdma_done_event(struct usb_dma_parent_tag *udpt);
-void	usb_bdma_post_sync(struct usb_xfer *xfer);
-void	usb_bdma_pre_sync(struct usb_xfer *xfer);
-void	usb_bdma_work_loop(struct usb_xfer_queue *pq);
-void	usb_dma_tag_setup(struct usb_dma_parent_tag *udpt,
-	    struct usb_dma_tag *udt, bus_dma_tag_t dmat, struct mtx *mtx,
-	    usb_dma_callback_t *func, uint8_t ndmabits, uint8_t nudt);
-void	usb_dma_tag_unsetup(struct usb_dma_parent_tag *udpt);
-void	usb_pc_cpu_flush(struct usb_page_cache *pc);
-void	usb_pc_cpu_invalidate(struct usb_page_cache *pc);
-void	usb_pc_dmamap_destroy(struct usb_page_cache *pc);
-void	usb_pc_free_mem(struct usb_page_cache *pc);
-
-#endif					/* _USB_BUSDMA_H_ */
diff --git a/include.new/dev/usb/usb_cdc.h b/include.new/dev/usb/usb_cdc.h
deleted file mode 100644
index 0a4bce8..0000000
--- a/include.new/dev/usb/usb_cdc.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*	$NetBSD: usbcdc.h,v 1.9 2004/10/23 13:24:24 augustss Exp $	*/
-/*	$FreeBSD: releng/10.2/sys/dev/usb/usb_cdc.h 213809 2010-10-13 22:04:55Z hselasky $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _USB_CDC_H_
-#define	_USB_CDC_H_
-
-#define	UDESCSUB_CDC_HEADER	0
-#define	UDESCSUB_CDC_CM		1	/* Call Management */
-#define	UDESCSUB_CDC_ACM	2	/* Abstract Control Model */
-#define	UDESCSUB_CDC_DLM	3	/* Direct Line Management */
-#define	UDESCSUB_CDC_TRF	4	/* Telephone Ringer */
-#define	UDESCSUB_CDC_TCLSR	5	/* Telephone Call */
-#define	UDESCSUB_CDC_UNION	6
-#define	UDESCSUB_CDC_CS		7	/* Country Selection */
-#define	UDESCSUB_CDC_TOM	8	/* Telephone Operational Modes */
-#define	UDESCSUB_CDC_USBT	9	/* USB Terminal */
-#define	UDESCSUB_CDC_NCT	10
-#define	UDESCSUB_CDC_PUF	11
-#define	UDESCSUB_CDC_EUF	12
-#define	UDESCSUB_CDC_MCMF	13
-#define	UDESCSUB_CDC_CCMF	14
-#define	UDESCSUB_CDC_ENF	15
-#define	UDESCSUB_CDC_ANF	16
-
-struct usb_cdc_header_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDescriptorSubtype;
-	uWord	bcdCDC;
-} __packed;
-
-struct usb_cdc_cm_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDescriptorSubtype;
-	uByte	bmCapabilities;
-#define	USB_CDC_CM_DOES_CM		0x01
-#define	USB_CDC_CM_OVER_DATA		0x02
-	uByte	bDataInterface;
-} __packed;
-
-struct usb_cdc_acm_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDescriptorSubtype;
-	uByte	bmCapabilities;
-#define	USB_CDC_ACM_HAS_FEATURE		0x01
-#define	USB_CDC_ACM_HAS_LINE		0x02
-#define	USB_CDC_ACM_HAS_BREAK		0x04
-#define	USB_CDC_ACM_HAS_NETWORK_CONN	0x08
-} __packed;
-
-struct usb_cdc_union_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDescriptorSubtype;
-	uByte	bMasterInterface;
-	uByte	bSlaveInterface[1];
-} __packed;
-
-struct usb_cdc_ethernet_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDescriptorSubtype;
-	uByte	iMacAddress;
-	uDWord	bmEthernetStatistics;
-	uWord	wMaxSegmentSize;
-	uWord	wNumberMCFilters;
-	uByte	bNumberPowerFilters;
-} __packed;
-
-#define	UCDC_SEND_ENCAPSULATED_COMMAND	0x00
-#define	UCDC_GET_ENCAPSULATED_RESPONSE	0x01
-#define	UCDC_SET_COMM_FEATURE		0x02
-#define	UCDC_GET_COMM_FEATURE		0x03
-#define	UCDC_ABSTRACT_STATE		0x01
-#define	UCDC_COUNTRY_SETTING		0x02
-#define	UCDC_CLEAR_COMM_FEATURE		0x04
-#define	UCDC_SET_LINE_CODING		0x20
-#define	UCDC_GET_LINE_CODING		0x21
-#define	UCDC_SET_CONTROL_LINE_STATE	0x22
-#define	UCDC_LINE_DTR			0x0001
-#define	UCDC_LINE_RTS			0x0002
-#define	UCDC_SEND_BREAK			0x23
-#define	UCDC_BREAK_ON			0xffff
-#define	UCDC_BREAK_OFF			0x0000
-
-struct usb_cdc_abstract_state {
-	uWord	wState;
-#define	UCDC_IDLE_SETTING		0x0001
-#define	UCDC_DATA_MULTIPLEXED		0x0002
-} __packed;
-
-#define	UCDC_ABSTRACT_STATE_LENGTH	2
-
-struct usb_cdc_line_state {
-	uDWord	dwDTERate;
-	uByte	bCharFormat;
-#define	UCDC_STOP_BIT_1			0
-#define	UCDC_STOP_BIT_1_5		1
-#define	UCDC_STOP_BIT_2			2
-	uByte	bParityType;
-#define	UCDC_PARITY_NONE		0
-#define	UCDC_PARITY_ODD			1
-#define	UCDC_PARITY_EVEN		2
-#define	UCDC_PARITY_MARK		3
-#define	UCDC_PARITY_SPACE		4
-	uByte	bDataBits;
-} __packed;
-
-#define	UCDC_LINE_STATE_LENGTH		7
-
-struct usb_cdc_notification {
-	uByte	bmRequestType;
-#define	UCDC_NOTIFICATION		0xa1
-	uByte	bNotification;
-#define	UCDC_N_NETWORK_CONNECTION	0x00
-#define	UCDC_N_RESPONSE_AVAILABLE	0x01
-#define	UCDC_N_AUX_JACK_HOOK_STATE	0x08
-#define	UCDC_N_RING_DETECT		0x09
-#define	UCDC_N_SERIAL_STATE		0x20
-#define	UCDC_N_CALL_STATE_CHANGED	0x28
-#define	UCDC_N_LINE_STATE_CHANGED	0x29
-#define	UCDC_N_CONNECTION_SPEED_CHANGE	0x2a
-	uWord	wValue;
-	uWord	wIndex;
-	uWord	wLength;
-	uByte	data[16];
-} __packed;
-
-#define	UCDC_NOTIFICATION_LENGTH	8
-
-/*
- * Bits set in the SERIAL STATE notifcation (first byte of data)
- */
-
-#define	UCDC_N_SERIAL_OVERRUN		0x40
-#define	UCDC_N_SERIAL_PARITY		0x20
-#define	UCDC_N_SERIAL_FRAMING		0x10
-#define	UCDC_N_SERIAL_RI		0x08
-#define	UCDC_N_SERIAL_BREAK		0x04
-#define	UCDC_N_SERIAL_DSR		0x02
-#define	UCDC_N_SERIAL_DCD		0x01
-
-/* Serial state bit masks */
-#define	UCDC_MDM_RXCARRIER		0x01
-#define	UCDC_MDM_TXCARRIER		0x02
-#define	UCDC_MDM_BREAK			0x04
-#define	UCDC_MDM_RING			0x08
-#define	UCDC_MDM_FRAMING_ERR		0x10
-#define	UCDC_MDM_PARITY_ERR		0x20
-#define	UCDC_MDM_OVERRUN_ERR		0x40
-
-/*
- * Network Control Model, NCM16 + NCM32, protocol definitions
- */
-struct usb_ncm16_hdr {
-	uDWord	dwSignature;
-	uWord	wHeaderLength;
-	uWord	wSequence;
-	uWord	wBlockLength;
-	uWord	wDptIndex;
-} __packed;
-
-struct usb_ncm16_dp {
-	uWord	wFrameIndex;
-	uWord	wFrameLength;
-} __packed;
-
-struct usb_ncm16_dpt {
-	uDWord	dwSignature;
-	uWord	wLength;
-	uWord	wNextNdpIndex;
-	struct usb_ncm16_dp dp[0];
-} __packed;
-
-struct usb_ncm32_hdr {
-	uDWord	dwSignature;
-	uWord	wHeaderLength;
-	uWord	wSequence;
-	uDWord	dwBlockLength;
-	uDWord	dwDptIndex;
-} __packed;
-
-struct usb_ncm32_dp {
-	uDWord	dwFrameIndex;
-	uDWord	dwFrameLength;
-} __packed;
-
-struct usb_ncm32_dpt {
-	uDWord	dwSignature;
-	uWord	wLength;
-	uWord	wReserved6;
-	uDWord	dwNextNdpIndex;
-	uDWord	dwReserved12;
-	struct usb_ncm32_dp dp[0];
-} __packed;
-
-/* Communications interface class specific descriptors */
-
-#define	UCDC_NCM_FUNC_DESC_SUBTYPE	0x1A
-
-struct usb_ncm_func_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uByte	bDescriptorSubtype;
-	uByte	bcdNcmVersion[2];
-	uByte	bmNetworkCapabilities;
-#define	UCDC_NCM_CAP_FILTER	0x01
-#define	UCDC_NCM_CAP_MAC_ADDR	0x02
-#define	UCDC_NCM_CAP_ENCAP	0x04
-#define	UCDC_NCM_CAP_MAX_DATA	0x08
-#define	UCDC_NCM_CAP_CRCMODE	0x10
-#define	UCDC_NCM_CAP_MAX_DGRAM	0x20
-} __packed;
-
-/* Communications interface specific class request codes */
-
-#define	UCDC_NCM_SET_ETHERNET_MULTICAST_FILTERS			0x40
-#define	UCDC_NCM_SET_ETHERNET_POWER_MGMT_PATTERN_FILTER		0x41
-#define	UCDC_NCM_GET_ETHERNET_POWER_MGMT_PATTERN_FILTER		0x42
-#define	UCDC_NCM_SET_ETHERNET_PACKET_FILTER			0x43
-#define	UCDC_NCM_GET_ETHERNET_STATISTIC				0x44
-#define	UCDC_NCM_GET_NTB_PARAMETERS				0x80
-#define	UCDC_NCM_GET_NET_ADDRESS				0x81
-#define	UCDC_NCM_SET_NET_ADDRESS				0x82
-#define	UCDC_NCM_GET_NTB_FORMAT					0x83
-#define	UCDC_NCM_SET_NTB_FORMAT					0x84
-#define	UCDC_NCM_GET_NTB_INPUT_SIZE				0x85
-#define	UCDC_NCM_SET_NTB_INPUT_SIZE				0x86
-#define	UCDC_NCM_GET_MAX_DATAGRAM_SIZE				0x87
-#define	UCDC_NCM_SET_MAX_DATAGRAM_SIZE				0x88
-#define	UCDC_NCM_GET_CRC_MODE					0x89
-#define	UCDC_NCM_SET_CRC_MODE					0x8A
-
-struct usb_ncm_parameters {
-	uWord	wLength;
-	uWord	bmNtbFormatsSupported;
-#define	UCDC_NCM_FORMAT_NTB16	0x0001
-#define	UCDC_NCM_FORMAT_NTB32	0x0002
-	uDWord	dwNtbInMaxSize;
-	uWord	wNdpInDivisor;
-	uWord	wNdpInPayloadRemainder;
-	uWord	wNdpInAlignment;
-	uWord	wReserved14;
-	uDWord	dwNtbOutMaxSize;
-	uWord	wNdpOutDivisor;
-	uWord	wNdpOutPayloadRemainder;
-	uWord	wNdpOutAlignment;
-	uWord	wNtbOutMaxDatagrams;
-} __packed;
-
-/* Communications interface specific class notification codes */
-#define	UCDC_NCM_NOTIF_NETWORK_CONNECTION	0x00
-#define	UCDC_NCM_NOTIF_RESPONSE_AVAILABLE	0x01
-#define	UCDC_NCM_NOTIF_CONNECTION_SPEED_CHANGE	0x2A
-
-#endif					/* _USB_CDC_H_ */
diff --git a/include.new/dev/usb/usb_compat_linux.h b/include.new/dev/usb/usb_compat_linux.h
deleted file mode 100644
index 17fb124..0000000
--- a/include.new/dev/usb/usb_compat_linux.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_compat_linux.h 198776 2009-11-01 21:48:18Z thompsa $ */
-/*-
- * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved.
- * Copyright (c) 2007 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_COMPAT_LINUX_H
-#define	_USB_COMPAT_LINUX_H
-
-struct usb_device;
-struct usb_interface;
-struct usb_driver;
-struct urb;
-
-typedef void *pm_message_t;
-typedef void (usb_complete_t)(struct urb *);
-
-#define	USB_MAX_FULL_SPEED_ISOC_FRAMES (60 * 1)
-#define	USB_MAX_HIGH_SPEED_ISOC_FRAMES (60 * 8)
-
-#define	USB_DEVICE_ID_MATCH_DEVICE \
-	(USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT)
-
-#define	USB_DEVICE(vend,prod) \
-	.match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = (vend), \
-	.idProduct = (prod)
-
-/* The "usb_driver" structure holds the Linux USB device driver
- * callbacks, and a pointer to device ID's which this entry should
- * match against. Usually this entry is exposed to the USB emulation
- * layer using the "USB_DRIVER_EXPORT()" macro, which is defined
- * below.
- */
-struct usb_driver {
-	const char *name;
-
-	int     (*probe) (struct usb_interface *intf,
-	    	const	struct usb_device_id *id);
-
-	void    (*disconnect) (struct usb_interface *intf);
-
-	int     (*ioctl) (struct usb_interface *intf, unsigned int code,
-	    	void  *buf);
-
-	int     (*suspend) (struct usb_interface *intf, pm_message_t message);
-	int     (*resume) (struct usb_interface *intf);
-
-	const struct usb_device_id *id_table;
-
-	void    (*shutdown) (struct usb_interface *intf);
-
-	LIST_ENTRY(usb_driver) linux_driver_list;
-};
-
-#define	USB_DRIVER_EXPORT(id,p_usb_drv) \
-  SYSINIT(id,SI_SUB_KLD,SI_ORDER_FIRST,usb_linux_register,p_usb_drv); \
-  SYSUNINIT(id,SI_SUB_KLD,SI_ORDER_ANY,usb_linux_deregister,p_usb_drv)
-
-#define	USB_DT_ENDPOINT_SIZE		7
-#define	USB_DT_ENDPOINT_AUDIO_SIZE	9
-
-/*
- * Endpoints
- */
-#define	USB_ENDPOINT_NUMBER_MASK	0x0f	/* in bEndpointAddress */
-#define	USB_ENDPOINT_DIR_MASK		0x80
-
-#define	USB_ENDPOINT_XFERTYPE_MASK	0x03	/* in bmAttributes */
-#define	USB_ENDPOINT_XFER_CONTROL	0
-#define	USB_ENDPOINT_XFER_ISOC		1
-#define	USB_ENDPOINT_XFER_BULK		2
-#define	USB_ENDPOINT_XFER_INT		3
-#define	USB_ENDPOINT_MAX_ADJUSTABLE	0x80
-
-/* CONTROL REQUEST SUPPORT */
-
-/*
- * Definition of direction mask for
- * "bEndpointAddress" and "bmRequestType":
- */
-#define	USB_DIR_MASK			0x80
-#define	USB_DIR_OUT			0x00	/* write to USB device */
-#define	USB_DIR_IN			0x80	/* read from USB device */
-
-/*
- * Definition of type mask for
- * "bmRequestType":
- */
-#define	USB_TYPE_MASK			(0x03 << 5)
-#define	USB_TYPE_STANDARD		(0x00 << 5)
-#define	USB_TYPE_CLASS			(0x01 << 5)
-#define	USB_TYPE_VENDOR			(0x02 << 5)
-#define	USB_TYPE_RESERVED		(0x03 << 5)
-
-/*
- * Definition of receiver mask for
- * "bmRequestType":
- */
-#define	USB_RECIP_MASK			0x1f
-#define	USB_RECIP_DEVICE		0x00
-#define	USB_RECIP_INTERFACE		0x01
-#define	USB_RECIP_ENDPOINT		0x02
-#define	USB_RECIP_OTHER			0x03
-
-/*
- * Definition of standard request values for
- * "bRequest":
- */
-#define	USB_REQ_GET_STATUS		0x00
-#define	USB_REQ_CLEAR_FEATURE		0x01
-#define	USB_REQ_SET_FEATURE		0x03
-#define	USB_REQ_SET_ADDRESS		0x05
-#define	USB_REQ_GET_DESCRIPTOR		0x06
-#define	USB_REQ_SET_DESCRIPTOR		0x07
-#define	USB_REQ_GET_CONFIGURATION	0x08
-#define	USB_REQ_SET_CONFIGURATION	0x09
-#define	USB_REQ_GET_INTERFACE		0x0A
-#define	USB_REQ_SET_INTERFACE		0x0B
-#define	USB_REQ_SYNCH_FRAME		0x0C
-
-#define	USB_REQ_SET_ENCRYPTION		0x0D	/* Wireless USB */
-#define	USB_REQ_GET_ENCRYPTION		0x0E
-#define	USB_REQ_SET_HANDSHAKE		0x0F
-#define	USB_REQ_GET_HANDSHAKE		0x10
-#define	USB_REQ_SET_CONNECTION		0x11
-#define	USB_REQ_SET_SECURITY_DATA	0x12
-#define	USB_REQ_GET_SECURITY_DATA	0x13
-#define	USB_REQ_SET_WUSB_DATA		0x14
-#define	USB_REQ_LOOPBACK_DATA_WRITE	0x15
-#define	USB_REQ_LOOPBACK_DATA_READ	0x16
-#define	USB_REQ_SET_INTERFACE_DS	0x17
-
-/*
- * USB feature flags are written using USB_REQ_{CLEAR,SET}_FEATURE, and
- * are read as a bit array returned by USB_REQ_GET_STATUS.  (So there
- * are at most sixteen features of each type.)
- */
-#define	USB_DEVICE_SELF_POWERED		0	/* (read only) */
-#define	USB_DEVICE_REMOTE_WAKEUP	1	/* dev may initiate wakeup */
-#define	USB_DEVICE_TEST_MODE		2	/* (wired high speed only) */
-#define	USB_DEVICE_BATTERY		2	/* (wireless) */
-#define	USB_DEVICE_B_HNP_ENABLE		3	/* (otg) dev may initiate HNP */
-#define	USB_DEVICE_WUSB_DEVICE		3	/* (wireless) */
-#define	USB_DEVICE_A_HNP_SUPPORT	4	/* (otg) RH port supports HNP */
-#define	USB_DEVICE_A_ALT_HNP_SUPPORT	5	/* (otg) other RH port does */
-#define	USB_DEVICE_DEBUG_MODE		6	/* (special devices only) */
-
-#define	USB_ENDPOINT_HALT		0	/* IN/OUT will STALL */
-
-#define	PIPE_ISOCHRONOUS		0x01	/* UE_ISOCHRONOUS */
-#define	PIPE_INTERRUPT			0x03	/* UE_INTERRUPT */
-#define	PIPE_CONTROL			0x00	/* UE_CONTROL */
-#define	PIPE_BULK			0x02	/* UE_BULK */
-
-/* Whenever Linux references an USB endpoint:
- * a) to initialize "urb->endpoint"
- * b) second argument passed to "usb_control_msg()"
- *
- * Then it uses one of the following macros. The "endpoint" argument
- * is the physical endpoint value masked by 0xF. The "dev" argument
- * is a pointer to "struct usb_device".
- */
-#define	usb_sndctrlpipe(dev,endpoint) \
-  usb_find_host_endpoint(dev, PIPE_CONTROL, (endpoint) | USB_DIR_OUT)
-
-#define	usb_rcvctrlpipe(dev,endpoint) \
-  usb_find_host_endpoint(dev, PIPE_CONTROL, (endpoint) | USB_DIR_IN)
-
-#define	usb_sndisocpipe(dev,endpoint) \
-  usb_find_host_endpoint(dev, PIPE_ISOCHRONOUS, (endpoint) | USB_DIR_OUT)
-
-#define	usb_rcvisocpipe(dev,endpoint) \
-  usb_find_host_endpoint(dev, PIPE_ISOCHRONOUS, (endpoint) | USB_DIR_IN)
-
-#define	usb_sndbulkpipe(dev,endpoint) \
-  usb_find_host_endpoint(dev, PIPE_BULK, (endpoint) | USB_DIR_OUT)
-
-#define	usb_rcvbulkpipe(dev,endpoint) \
-  usb_find_host_endpoint(dev, PIPE_BULK, (endpoint) | USB_DIR_IN)
-
-#define	usb_sndintpipe(dev,endpoint) \
-  usb_find_host_endpoint(dev, PIPE_INTERRUPT, (endpoint) | USB_DIR_OUT)
-
-#define	usb_rcvintpipe(dev,endpoint) \
-  usb_find_host_endpoint(dev, PIPE_INTERRUPT, (endpoint) | USB_DIR_IN)
-
-/*
- * The following structure is used to extend "struct urb" when we are
- * dealing with an isochronous endpoint. It contains information about
- * the data offset and data length of an isochronous packet.
- * The "actual_length" field is updated before the "complete"
- * callback in the "urb" structure is called.
- */
-struct usb_iso_packet_descriptor {
-	uint32_t offset;		/* depreciated buffer offset (the
-					 * packets are usually back to back) */
-	uint16_t length;		/* expected length */
-	uint16_t actual_length;
-	 int16_t status;		/* transfer status */
-};
-
-/*
- * The following structure holds various information about an USB
- * transfer. This structure is used for all kinds of USB transfers.
- *
- * URB is short for USB Request Block.
- */
-struct urb {
-	TAILQ_ENTRY(urb) bsd_urb_list;
-	struct cv cv_wait;
-
-	struct usb_device *dev;		/* (in) pointer to associated device */
-	struct usb_host_endpoint *endpoint;	/* (in) pipe pointer */
-	uint8_t *setup_packet;		/* (in) setup packet (control only) */
-	uint8_t *bsd_data_ptr;
-	void   *transfer_buffer;	/* (in) associated data buffer */
-	void   *context;		/* (in) context for completion */
-	usb_complete_t *complete;	/* (in) completion routine */
-
-	usb_size_t transfer_buffer_length;/* (in) data buffer length */
-	usb_size_t bsd_length_rem;
-	usb_size_t actual_length;	/* (return) actual transfer length */
-	usb_timeout_t timeout;		/* FreeBSD specific */
-
-	uint16_t transfer_flags;	/* (in) */
-#define	URB_SHORT_NOT_OK	0x0001	/* report short transfers like errors */
-#define	URB_ISO_ASAP		0x0002	/* ignore "start_frame" field */
-#define	URB_ZERO_PACKET		0x0004	/* the USB transfer ends with a short
-					 * packet */
-#define	URB_NO_TRANSFER_DMA_MAP 0x0008	/* "transfer_dma" is valid on submit */
-#define	URB_WAIT_WAKEUP		0x0010	/* custom flags */
-#define	URB_IS_SLEEPING		0x0020	/* custom flags */
-
-	usb_frcount_t start_frame;	/* (modify) start frame (ISO) */
-	usb_frcount_t number_of_packets;	/* (in) number of ISO packets */
-	uint16_t interval;		/* (modify) transfer interval
-					 * (INT/ISO) */
-	uint16_t error_count;		/* (return) number of ISO errors */
-	int16_t	status;			/* (return) status */
-
-	uint8_t	setup_dma;		/* (in) not used on FreeBSD */
-	uint8_t	transfer_dma;		/* (in) not used on FreeBSD */
-	uint8_t	bsd_isread;
-	uint8_t kill_count;		/* FreeBSD specific */
-
-	struct usb_iso_packet_descriptor iso_frame_desc[];	/* (in) ISO ONLY */
-};
-
-/* various prototypes */
-
-int	usb_submit_urb(struct urb *urb, uint16_t mem_flags);
-int	usb_unlink_urb(struct urb *urb);
-int	usb_clear_halt(struct usb_device *dev, struct usb_host_endpoint *uhe);
-int	usb_control_msg(struct usb_device *dev, struct usb_host_endpoint *ep,
-	    uint8_t request, uint8_t requesttype, uint16_t value,
-	    uint16_t index, void *data, uint16_t size, usb_timeout_t timeout);
-int	usb_set_interface(struct usb_device *dev, uint8_t ifnum,
-	    uint8_t alternate);
-int	usb_setup_endpoint(struct usb_device *dev,
-	    struct usb_host_endpoint *uhe, usb_frlength_t bufsize);
-
-struct usb_host_endpoint *usb_find_host_endpoint(struct usb_device *dev,
-	    uint8_t type, uint8_t ep);
-struct urb *usb_alloc_urb(uint16_t iso_packets, uint16_t mem_flags);
-struct usb_host_interface *usb_altnum_to_altsetting(
-	    const struct usb_interface *intf, uint8_t alt_index);
-struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, uint8_t iface_no);
-
-void   *usb_buffer_alloc(struct usb_device *dev, usb_size_t size,
-	    uint16_t mem_flags, uint8_t *dma_addr);
-void   *usbd_get_intfdata(struct usb_interface *intf);
-
-void	usb_buffer_free(struct usb_device *dev, usb_size_t size, void *addr, uint8_t dma_addr);
-void	usb_free_urb(struct urb *urb);
-void	usb_init_urb(struct urb *urb);
-void	usb_kill_urb(struct urb *urb);
-void	usb_set_intfdata(struct usb_interface *intf, void *data);
-void	usb_linux_register(void *arg);
-void	usb_linux_deregister(void *arg);
-
-void	usb_fill_bulk_urb(struct urb *, struct usb_device *,
-	    struct usb_host_endpoint *, void *, int, usb_complete_t, void *);
-int	usb_bulk_msg(struct usb_device *, struct usb_host_endpoint *,
-	    void *, int, uint16_t *, usb_timeout_t);
-
-#define	interface_to_usbdev(intf) (intf)->linux_udev
-#define	interface_to_bsddev(intf) (intf)->linux_udev
-
-#endif					/* _USB_COMPAT_LINUX_H */
diff --git a/include.new/dev/usb/usb_controller.h b/include.new/dev/usb/usb_controller.h
deleted file mode 100644
index 7372646..0000000
--- a/include.new/dev/usb/usb_controller.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_controller.h 259603 2013-12-19 07:13:59Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_CONTROLLER_H_
-#define	_USB_CONTROLLER_H_
-
-/* defines */
-
-#define	USB_BUS_DMA_TAG_MAX 8
-
-/* structure prototypes  */
-
-struct usb_bus;
-struct usb_page;
-struct usb_endpoint;
-struct usb_page_cache;
-struct usb_setup_params;
-struct usb_hw_ep_profile;
-struct usb_fs_isoc_schedule;
-struct usb_endpoint_descriptor;
-
-/* typedefs */
-
-typedef void (usb_bus_mem_sub_cb_t)(struct usb_bus *bus, struct usb_page_cache *pc, struct usb_page *pg, usb_size_t size, usb_size_t align);
-typedef void (usb_bus_mem_cb_t)(struct usb_bus *bus, usb_bus_mem_sub_cb_t *scb);
-
-/*
- * The following structure is used to define all the USB BUS
- * callbacks.
- */
-struct usb_bus_methods {
-
-	/* USB Device and Host mode - Mandatory */
-
-	usb_handle_req_t *roothub_exec;
-
-	void    (*endpoint_init) (struct usb_device *,
-		    struct usb_endpoint_descriptor *, struct usb_endpoint *);
-	void    (*xfer_setup) (struct usb_setup_params *);
-	void    (*xfer_unsetup) (struct usb_xfer *);
-	void    (*get_dma_delay) (struct usb_device *, uint32_t *);
-	void    (*device_suspend) (struct usb_device *);
-	void    (*device_resume) (struct usb_device *);
-	void    (*set_hw_power) (struct usb_bus *);
-	void    (*set_hw_power_sleep) (struct usb_bus *, uint32_t);
-	/*
-	 * The following flag is set if one or more control transfers are
-	 * active:
-	 */
-#define	USB_HW_POWER_CONTROL	0x01
-	/*
-	 * The following flag is set if one or more bulk transfers are
-	 * active:
-	 */
-#define	USB_HW_POWER_BULK	0x02
-	/*
-	 * The following flag is set if one or more interrupt transfers are
-	 * active:
-	 */
-#define	USB_HW_POWER_INTERRUPT	0x04
-	/*
-	 * The following flag is set if one or more isochronous transfers
-	 * are active:
-	 */
-#define	USB_HW_POWER_ISOC	0x08
-	/*
-	 * The following flag is set if one or more non-root-HUB devices 
-	 * are present on the given USB bus:
-	 */
-#define	USB_HW_POWER_NON_ROOT_HUB 0x10
-	/*
-	 * The following flag is set if we are suspending
-	 */
-#define	USB_HW_POWER_SUSPEND 0x20
-	/*
-	 * The following flag is set if we are resuming
-	 */
-#define	USB_HW_POWER_RESUME 0x40
-	/*
-	 * The following flag is set if we are shutting down
-	 */
-#define	USB_HW_POWER_SHUTDOWN 0x60
-
-	/* USB Device mode only - Mandatory */
-
-	void    (*get_hw_ep_profile) (struct usb_device *udev, const struct usb_hw_ep_profile **ppf, uint8_t ep_addr);
-	void    (*xfer_stall) (struct usb_xfer *xfer);
-	void    (*set_stall) (struct usb_device *udev, struct usb_endpoint *ep, uint8_t *did_stall);
-
-	/* USB Device mode mandatory. USB Host mode optional. */
-
-	void    (*clear_stall) (struct usb_device *udev, struct usb_endpoint *ep);
-
-	/* Optional transfer polling support */
-
-	void	(*xfer_poll) (struct usb_bus *);
-
-	/* Optional fixed power mode support */
-
-	void	(*get_power_mode) (struct usb_device *udev, int8_t *pmode);
-
-	/* Optional endpoint uninit */
-
-	void    (*endpoint_uninit) (struct usb_device *, struct usb_endpoint *);
-
-	/* Optional device init */
-
-	usb_error_t	(*device_init) (struct usb_device *);
-
-	/* Optional device uninit */
-
-	void	(*device_uninit) (struct usb_device *);
-
-	/* Optional for device and host mode */
-
-	void	(*start_dma_delay) (struct usb_xfer *);
-
-	void	(*device_state_change) (struct usb_device *);
-
-	/* Optional for host mode */
-
-	usb_error_t	(*set_address) (struct usb_device *, struct mtx *, uint16_t);
-
-	/* Optional for device and host mode */
-
-	usb_error_t	(*set_endpoint_mode) (struct usb_device *, struct usb_endpoint *, uint8_t);
-};
-
-/*
- * The following structure is used to define all the USB pipe
- * callbacks.
- */
-struct usb_pipe_methods {
-
-	/* Mandatory USB Device and Host mode callbacks: */
-
-	void	(*open)(struct usb_xfer *);
-	void	(*close)(struct usb_xfer *);
-
-	void	(*enter)(struct usb_xfer *);
-	void	(*start)(struct usb_xfer *);
-
-	/* Optional */
-
-	void   *info;
-};
-
-/*
- * The following structure keeps information about what a hardware USB
- * endpoint supports.
- */
-struct usb_hw_ep_profile {
-	uint16_t max_in_frame_size;	/* IN-token direction */
-	uint16_t max_out_frame_size;	/* OUT-token direction */
-	uint8_t	is_simplex:1;
-	uint8_t	support_multi_buffer:1;
-	uint8_t	support_bulk:1;
-	uint8_t	support_control:1;
-	uint8_t	support_interrupt:1;
-	uint8_t	support_isochronous:1;
-	uint8_t	support_in:1;		/* IN-token is supported */
-	uint8_t	support_out:1;		/* OUT-token is supported */
-};
-
-/* prototypes */
-
-void	usb_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb);
-uint8_t	usb_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat, usb_bus_mem_cb_t *cb);
-void	usb_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb);
-uint16_t usb_isoc_time_expand(struct usb_bus *bus, uint16_t isoc_time_curr);
-void	usb_bus_reset_async_locked(struct usb_bus *bus);
-#if USB_HAVE_TT_SUPPORT
-uint8_t	usbd_fs_isoc_schedule_alloc_slot(struct usb_xfer *isoc_xfer, uint16_t isoc_time);
-#endif
-
-#endif					/* _USB_CONTROLLER_H_ */
diff --git a/include.new/dev/usb/usb_core.h b/include.new/dev/usb/usb_core.h
deleted file mode 100644
index 6466c1d..0000000
--- a/include.new/dev/usb/usb_core.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_core.h 278507 2015-02-10 13:16:53Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-/*
- * Including this file is mandatory for all USB related c-files in the kernel.
- */
-
-#ifndef _USB_CORE_H_
-#define	_USB_CORE_H_
-
-/*
- * The following macro will tell if an USB transfer is currently
- * receiving or transferring data.
- */
-#define	USB_GET_DATA_ISREAD(xfer) ((xfer)->flags_int.usb_mode == \
-	USB_MODE_DEVICE ? (((xfer)->endpointno & UE_DIR_IN) ? 0 : 1) : \
-	(((xfer)->endpointno & UE_DIR_IN) ? 1 : 0))
-
-/* macros */
-
-#define	USB_BUS_LOCK(_b)		mtx_lock(&(_b)->bus_mtx)
-#define	USB_BUS_UNLOCK(_b)		mtx_unlock(&(_b)->bus_mtx)
-#define	USB_BUS_LOCK_ASSERT(_b, _t)	mtx_assert(&(_b)->bus_mtx, _t)
-#define	USB_BUS_SPIN_LOCK(_b)		mtx_lock_spin(&(_b)->bus_spin_lock)
-#define	USB_BUS_SPIN_UNLOCK(_b)		mtx_unlock_spin(&(_b)->bus_spin_lock)
-#define	USB_BUS_SPIN_LOCK_ASSERT(_b, _t)	mtx_assert(&(_b)->bus_spin_lock, _t)
-#define	USB_XFER_LOCK(_x)		mtx_lock((_x)->xroot->xfer_mtx)
-#define	USB_XFER_UNLOCK(_x)		mtx_unlock((_x)->xroot->xfer_mtx)
-#define	USB_XFER_LOCK_ASSERT(_x, _t)	mtx_assert((_x)->xroot->xfer_mtx, _t)
-
-/* helper for converting pointers to integers */
-#define	USB_P2U(ptr) \
-  (((const uint8_t *)(ptr)) - ((const uint8_t *)0))
-
-/* helper for computing offsets */
-#define	USB_ADD_BYTES(ptr,size) \
-  ((void *)(USB_P2U(ptr) + (size)))
-
-/* debug macro */
-#define	USB_ASSERT KASSERT
-
-/* structure prototypes */
-
-struct file;
-struct usb_bus;
-struct usb_device;
-struct usb_device_request;
-struct usb_page;
-struct usb_page_cache;
-struct usb_xfer;
-struct usb_xfer_root;
-struct usb_string_lang;
-
-/* typedefs */
-
-/* structures */
-
-/*
- * The following structure defines a set of internal USB transfer
- * flags.
- */
-struct usb_xfer_flags_int {
-
-	enum usb_hc_mode usb_mode;	/* shadow copy of "udev->usb_mode" */
-	uint16_t control_rem;		/* remainder in bytes */
-
-	uint8_t	open:1;			/* set if USB pipe has been opened */
-	uint8_t	transferring:1;		/* set if an USB transfer is in
-					 * progress */
-	uint8_t	did_dma_delay:1;	/* set if we waited for HW DMA */
-	uint8_t	did_close:1;		/* set if we closed the USB transfer */
-	uint8_t	draining:1;		/* set if we are draining an USB
-					 * transfer */
-	uint8_t	started:1;		/* keeps track of started or stopped */
-	uint8_t	bandwidth_reclaimed:1;
-	uint8_t	control_xfr:1;		/* set if control transfer */
-	uint8_t	control_hdr:1;		/* set if control header should be
-					 * sent */
-	uint8_t	control_act:1;		/* set if control transfer is active */
-	uint8_t	control_stall:1;	/* set if control transfer should be stalled */
-	uint8_t control_did_data:1;	/* set if control DATA has been transferred */
-
-	uint8_t	short_frames_ok:1;	/* filtered version */
-	uint8_t	short_xfer_ok:1;	/* filtered version */
-#if USB_HAVE_BUSDMA
-	uint8_t	bdma_enable:1;		/* filtered version (only set if
-					 * hardware supports DMA) */
-	uint8_t	bdma_no_post_sync:1;	/* set if the USB callback wrapper
-					 * should not do the BUS-DMA post sync
-					 * operation */
-	uint8_t	bdma_setup:1;		/* set if BUS-DMA has been setup */
-#endif
-	uint8_t	isochronous_xfr:1;	/* set if isochronous transfer */
-	uint8_t	curr_dma_set:1;		/* used by USB HC/DC driver */
-	uint8_t	can_cancel_immed:1;	/* set if USB transfer can be
-					 * cancelled immediately */
-	uint8_t	doing_callback:1;	/* set if executing the callback */
-	uint8_t maxp_was_clamped:1;	/* set if the max packet size 
-					 * was outside its allowed range */
-};
-
-/*
- * The following structure defines an USB transfer.
- */
-struct usb_xfer {
-	struct usb_callout timeout_handle;
-	TAILQ_ENTRY(usb_xfer) wait_entry;	/* used at various places */
-
-	struct usb_page_cache *buf_fixup;	/* fixup buffer(s) */
-	struct usb_xfer_queue *wait_queue;	/* pointer to queue that we
-						 * are waiting on */
-	struct usb_page *dma_page_ptr;
-	struct usb_endpoint *endpoint;	/* our USB endpoint */
-	struct usb_xfer_root *xroot;	/* used by HC driver */
-	void   *qh_start[2];		/* used by HC driver */
-	void   *td_start[2];		/* used by HC driver */
-	void   *td_transfer_first;	/* used by HC driver */
-	void   *td_transfer_last;	/* used by HC driver */
-	void   *td_transfer_cache;	/* used by HC driver */
-	void   *priv_sc;		/* device driver data pointer 1 */
-	void   *priv_fifo;		/* device driver data pointer 2 */
-	void   *local_buffer;
-	usb_frlength_t *frlengths;
-	struct usb_page_cache *frbuffers;
-	usb_callback_t *callback;
-
-	usb_frlength_t max_hc_frame_size;
-	usb_frlength_t max_data_length;
-	usb_frlength_t sumlen;		/* sum of all lengths in bytes */
-	usb_frlength_t actlen;		/* actual length in bytes */
-	usb_timeout_t timeout;		/* milliseconds */
-
-	usb_frcount_t max_frame_count;	/* initial value of "nframes" after
-					 * setup */
-	usb_frcount_t nframes;		/* number of USB frames to transfer */
-	usb_frcount_t aframes;		/* actual number of USB frames
-					 * transferred */
-	usb_stream_t stream_id;		/* USB3.0 specific field */
-
-	uint16_t max_packet_size;
-	uint16_t max_frame_size;
-	uint16_t qh_pos;
-	uint16_t isoc_time_complete;	/* in ms */
-	usb_timeout_t interval;	/* milliseconds */
-
-	uint8_t	address;		/* physical USB address */
-	uint8_t	endpointno;		/* physical USB endpoint */
-	uint8_t	max_packet_count;
-	uint8_t	usb_state;
-	uint8_t fps_shift;		/* down shift of FPS, 0..3 */
-
-	usb_error_t error;
-
-	struct usb_xfer_flags flags;
-	struct usb_xfer_flags_int flags_int;
-};
-
-/* external variables */
-
-extern struct mtx usb_ref_lock;
-extern const struct usb_string_lang usb_string_lang_en;
-
-/* typedefs */
-
-typedef struct malloc_type *usb_malloc_type;
-
-/* prototypes */
-
-#endif					/* _USB_CORE_H_ */
diff --git a/include.new/dev/usb/usb_debug.h b/include.new/dev/usb/usb_debug.h
deleted file mode 100644
index 5d11ce3..0000000
--- a/include.new/dev/usb/usb_debug.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_debug.h 250205 2013-05-03 10:13:29Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-/* This file contains various factored out debug macros. */
-
-#ifndef _USB_DEBUG_H_
-#define	_USB_DEBUG_H_
-
-/* Declare global USB debug variable. */
-extern int usb_debug;
-
-/* Check if USB debugging is enabled. */
-#ifdef USB_DEBUG_VAR
-#ifdef USB_DEBUG
-#define	DPRINTFN(n,fmt,...) do {		\
-  if ((USB_DEBUG_VAR) >= (n)) {			\
-    printf("%s: " fmt,				\
-	   __FUNCTION__ ,##__VA_ARGS__);	\
-  }						\
-} while (0)
-#define	DPRINTF(...)	DPRINTFN(1, __VA_ARGS__)
-#else
-#define	DPRINTF(...) do { } while (0)
-#define	DPRINTFN(...) do { } while (0)
-#endif
-#endif
-
-struct usb_interface;
-struct usb_device;
-struct usb_endpoint;
-struct usb_xfer;
-
-void	usb_dump_iface(struct usb_interface *iface);
-void	usb_dump_device(struct usb_device *udev);
-void	usb_dump_queue(struct usb_endpoint *ep);
-void	usb_dump_endpoint(struct usb_endpoint *ep);
-void	usb_dump_xfer(struct usb_xfer *xfer);
-
-#ifdef USB_DEBUG
-extern unsigned int usb_port_reset_delay;
-extern unsigned int usb_port_root_reset_delay;
-extern unsigned int usb_port_reset_recovery;
-extern unsigned int usb_port_powerup_delay;
-extern unsigned int usb_port_resume_delay;
-extern unsigned int usb_set_address_settle;
-extern unsigned int usb_resume_delay;
-extern unsigned int usb_resume_wait;
-extern unsigned int usb_resume_recovery;
-extern unsigned int usb_extra_power_up_time;
-#else
-#define usb_port_reset_delay		USB_PORT_RESET_DELAY
-#define usb_port_root_reset_delay	USB_PORT_ROOT_RESET_DELAY
-#define usb_port_reset_recovery		USB_PORT_RESET_RECOVERY
-#define usb_port_powerup_delay		USB_PORT_POWERUP_DELAY
-#define usb_port_resume_delay		USB_PORT_RESUME_DELAY
-#define usb_set_address_settle		USB_SET_ADDRESS_SETTLE
-#define usb_resume_delay		USB_RESUME_DELAY
-#define usb_resume_wait			USB_RESUME_WAIT
-#define usb_resume_recovery		USB_RESUME_RECOVERY
-#define usb_extra_power_up_time		USB_EXTRA_POWER_UP_TIME
-#endif
-
-#endif					/* _USB_DEBUG_H_ */
diff --git a/include.new/dev/usb/usb_dev.h b/include.new/dev/usb/usb_dev.h
deleted file mode 100644
index dda00d8..0000000
--- a/include.new/dev/usb/usb_dev.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_dev.h 246759 2013-02-13 12:35:17Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_DEV_H_
-#define	_USB_DEV_H_
-
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <sys/file.h>
-#include <sys/selinfo.h>
-#include <sys/poll.h>
-#include <sys/signalvar.h>
-#include <sys/proc.h>
-#endif
-
-struct usb_fifo;
-struct usb_mbuf;
-
-struct usb_symlink {
-	TAILQ_ENTRY(usb_symlink) sym_entry;
-	char	src_path[32];		/* Source path - including terminating
-					 * zero */
-	char	dst_path[32];		/* Destination path - including
-					 * terminating zero */
-	uint8_t	src_len;		/* String length */
-	uint8_t	dst_len;		/* String length */
-};
-
-/*
- * Private per-device information.
- */
-struct usb_cdev_privdata {
-	struct usb_bus		*bus;
-	struct usb_device	*udev;
-	struct usb_interface	*iface;
-	int			bus_index;	/* bus index */
-	int			dev_index;	/* device index */
-	int			ep_addr;	/* endpoint address */
-	int			fflags;
-	uint8_t			fifo_index;	/* FIFO index */
-};
-
-/*
- * The following structure defines a minimum re-implementation of the
- * ifqueue structure in the kernel.
- */
-struct usb_ifqueue {
-	struct usb_mbuf *ifq_head;
-	struct usb_mbuf *ifq_tail;
-
-	usb_size_t ifq_len;
-	usb_size_t ifq_maxlen;
-};
-
-/*
- * Private per-device and per-thread reference information
- */
-struct usb_cdev_refdata {
-	struct usb_fifo		*rxfifo;
-	struct usb_fifo		*txfifo;
-	uint8_t			is_read;	/* location has read access */
-	uint8_t			is_write;	/* location has write access */
-	uint8_t			is_uref;	/* USB refcount decr. needed */
-	uint8_t			is_usbfs;	/* USB-FS is active */
-	uint8_t			do_unlock;	/* USB enum unlock needed */
-};
-
-struct usb_fs_privdata {
-	int bus_index;
-	int dev_index;
-	int ep_addr;
-	int mode;
-	int fifo_index;
-	struct cdev *cdev;
-
-	LIST_ENTRY(usb_fs_privdata) pd_next;
-};
-
-/*
- * Most of the fields in the "usb_fifo" structure are used by the
- * generic USB access layer.
- */
-struct usb_fifo {
-	struct usb_ifqueue free_q;
-	struct usb_ifqueue used_q;
-	struct selinfo selinfo;
-	struct cv cv_io;
-	struct cv cv_drain;
-	struct usb_fifo_methods *methods;
-	struct usb_symlink *symlink[2];/* our symlinks */
-	struct proc *async_p;		/* process that wants SIGIO */
-	struct usb_fs_endpoint *fs_ep_ptr;
-	struct usb_device *udev;
-	struct usb_xfer *xfer[2];
-	struct usb_xfer **fs_xfer;
-	struct mtx *priv_mtx;		/* client data */
-	/* set if FIFO is opened by a FILE: */
-	struct usb_cdev_privdata *curr_cpd;
-	void   *priv_sc0;		/* client data */
-	void   *priv_sc1;		/* client data */
-	void   *queue_data;
-	usb_timeout_t timeout;		/* timeout in milliseconds */
-	usb_frlength_t bufsize;		/* BULK and INTERRUPT buffer size */
-	usb_frcount_t nframes;		/* for isochronous mode */
-	uint16_t dev_ep_index;		/* our device endpoint index */
-	uint8_t	flag_sleeping;		/* set if FIFO is sleeping */
-	uint8_t	flag_iscomplete;	/* set if a USB transfer is complete */
-	uint8_t	flag_iserror;		/* set if FIFO error happened */
-	uint8_t	flag_isselect;		/* set if FIFO is selected */
-	uint8_t	flag_flushing;		/* set if FIFO is flushing data */
-	uint8_t	flag_short;		/* set if short_ok or force_short
-					 * transfer flags should be set */
-	uint8_t	flag_stall;		/* set if clear stall should be run */
-	uint8_t	flag_write_defrag;	/* set to defrag written data */
-	uint8_t	flag_have_fragment;	/* set if defragging */
-	uint8_t	iface_index;		/* set to the interface we belong to */
-	uint8_t	fifo_index;		/* set to the FIFO index in "struct
-					 * usb_device" */
-	uint8_t	fs_ep_max;
-	uint8_t	fifo_zlp;		/* zero length packet count */
-	uint8_t	refcount;
-#define	USB_FIFO_REF_MAX 0xFF
-};
-
-extern struct cdevsw usb_devsw;
-
-int	usb_fifo_wait(struct usb_fifo *fifo);
-void	usb_fifo_signal(struct usb_fifo *fifo);
-uint8_t	usb_fifo_opened(struct usb_fifo *fifo);
-struct usb_symlink *usb_alloc_symlink(const char *target);
-void	usb_free_symlink(struct usb_symlink *ps);
-int	usb_read_symlink(uint8_t *user_ptr, uint32_t startentry,
-	    uint32_t user_len);
-
-#endif					/* _USB_DEV_H_ */
diff --git a/include.new/dev/usb/usb_device.h b/include.new/dev/usb/usb_device.h
deleted file mode 100644
index 8971f58..0000000
--- a/include.new/dev/usb/usb_device.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_device.h 278289 2015-02-05 21:18:44Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_DEVICE_H_
-#define	_USB_DEVICE_H_
-
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <dev/usb/usb_core.h>
-#include <dev/usb/usb_busdma.h>
-#include <dev/usb/usb_transfer.h>
-#endif
-
-struct usb_bus_methods;
-struct usb_config_descriptor;
-struct usb_device;		/* linux compat */
-struct usb_fs_privdata;
-struct usb_hw_ep_profile;
-struct usb_symlink;		/* UGEN */
-
-#define	USB_CTRL_XFER_MAX 2
-
-/* "usb_config_parse()" commands */
-
-#define	USB_CFG_ALLOC 0
-#define	USB_CFG_FREE 1
-#define	USB_CFG_INIT 2
-
-/* "usb_unconfigure()" flags */
-
-#define	USB_UNCFG_FLAG_NONE 0x00
-#define	USB_UNCFG_FLAG_FREE_EP0	0x02		/* endpoint zero is freed */
-
-struct usb_udev_msg {
-	struct usb_proc_msg hdr;
-	struct usb_device *udev;
-};
-
-/* The following four structures makes up a tree, where we have the
- * leaf structure, "usb_host_endpoint", first, and the root structure,
- * "usb_device", last. The four structures below mirror the structure
- * of the USB descriptors belonging to an USB configuration. Please
- * refer to the USB specification for a definition of "endpoints" and
- * "interfaces".
- */
-struct usb_host_endpoint {
-	struct usb_endpoint_descriptor desc;
-	TAILQ_HEAD(, urb) bsd_urb_list;
-	struct usb_xfer *bsd_xfer[2];
-	uint8_t *extra;			/* Extra descriptors */
-	usb_frlength_t fbsd_buf_size;
-	uint16_t extralen;
-	uint8_t	bsd_iface_index;
-} __aligned(USB_HOST_ALIGN);
-
-struct usb_host_interface {
-	struct usb_interface_descriptor desc;
-	/* the following array has size "desc.bNumEndpoint" */
-	struct usb_host_endpoint *endpoint;
-	const char *string;		/* iInterface string, if present */
-	uint8_t *extra;			/* Extra descriptors */
-	uint16_t extralen;
-	uint8_t	bsd_iface_index;
-} __aligned(USB_HOST_ALIGN);
-
-/*
- * The following structure defines the USB device flags.
- */
-struct usb_device_flags {
-	enum usb_hc_mode usb_mode;	/* host or device mode */
-	uint8_t	self_powered:1;		/* set if USB device is self powered */
-	uint8_t	no_strings:1;		/* set if USB device does not support
-					 * strings */
-	uint8_t	remote_wakeup:1;	/* set if remote wakeup is enabled */
-	uint8_t	uq_bus_powered:1;	/* set if BUS powered quirk is present */
-
-	/*
-	 * NOTE: Although the flags below will reach the same value
-	 * over time, but the instant values may differ, and
-	 * consequently the flags cannot be merged into one!
-	 */
-	uint8_t peer_suspended:1;	/* set if peer is suspended */
-	uint8_t self_suspended:1;	/* set if self is suspended */
-};
-
-/*
- * The following structure is used for power-save purposes. The data
- * in this structure is protected by the USB BUS lock.
- */
-struct usb_power_save {
-	usb_ticks_t last_xfer_time;	/* copy of "ticks" */
-	usb_size_t type_refs[4];	/* transfer reference count */
-	usb_size_t read_refs;		/* data read references */
-	usb_size_t write_refs;		/* data write references */
-};
-
-/*
- * The following structure is used when trying to allocate hardware
- * endpoints for an USB configuration in USB device side mode.
- */
-struct usb_hw_ep_scratch_sub {
-	const struct usb_hw_ep_profile *pf;
-	uint16_t max_frame_size;
-	uint8_t	hw_endpoint_out;
-	uint8_t	hw_endpoint_in;
-	uint8_t	needs_ep_type;
-	uint8_t	needs_in:1;
-	uint8_t	needs_out:1;
-};
-
-/*
- * The following structure is used when trying to allocate hardware
- * endpoints for an USB configuration in USB device side mode.
- */
-struct usb_hw_ep_scratch {
-	struct usb_hw_ep_scratch_sub ep[USB_EP_MAX];
-	struct usb_hw_ep_scratch_sub *ep_max;
-	struct usb_config_descriptor *cd;
-	struct usb_device *udev;
-	struct usb_bus_methods *methods;
-	uint8_t	bmOutAlloc[(USB_EP_MAX + 15) / 16];
-	uint8_t	bmInAlloc[(USB_EP_MAX + 15) / 16];
-};
-
-/*
- * The following structure is used when generating USB descriptors
- * from USB templates.
- */
-struct usb_temp_setup {
-	void   *buf;
-	usb_size_t size;
-	enum usb_dev_speed	usb_speed;
-	uint8_t	self_powered;
-	uint8_t	bNumEndpoints;
-	uint8_t	bInterfaceNumber;
-	uint8_t	bAlternateSetting;
-	uint8_t	bConfigurationValue;
-	usb_error_t err;
-};
-
-/* 
- * The scratch area for USB devices. Access to this structure is
- * protected by the enumeration SX lock.
- */
-union usb_device_scratch {
-	struct usb_hw_ep_scratch hw_ep_scratch[1];
-	struct usb_temp_setup temp_setup[1];
-	struct {
-		struct usb_xfer dummy;
-		struct usb_setup_params parm;
-	} xfer_setup[1];
-	uint8_t	data[255];
-};
-
-/*
- * The following structure defines an USB device. There exists one of
- * these structures for every USB device.
- */
-struct usb_device {
-	/* generic clear stall message */
-	struct usb_udev_msg cs_msg[2];
-	struct sx enum_sx;
-	struct sx sr_sx;
-	struct mtx device_mtx;
-	struct cv ctrlreq_cv;
-	struct cv ref_cv;
-#if (USB_HAVE_FIXED_IFACE == 0)
-	struct usb_interface *ifaces;
-#else
-	struct usb_interface ifaces[USB_IFACE_MAX];
-#endif
-	struct usb_endpoint ctrl_ep;	/* Control Endpoint 0 */
-#if (USB_HAVE_FIXED_ENDPOINT == 0)
-	struct usb_endpoint *endpoints;
-#else
-	struct usb_endpoint endpoints[USB_MAX_EP_UNITS];
-#endif
-	struct usb_power_save pwr_save;/* power save data */
-	struct usb_bus *bus;		/* our USB BUS */
-	device_t parent_dev;		/* parent device */
-	struct usb_device *parent_hub;
-	struct usb_device *parent_hs_hub;	/* high-speed parent HUB */
-	struct usb_config_descriptor *cdesc;	/* full config descr */
-	struct usb_hub *hub;		/* only if this is a hub */
-	struct usb_xfer *ctrl_xfer[USB_CTRL_XFER_MAX];
-	struct usb_temp_data *usb_template_ptr;
-	struct usb_endpoint *ep_curr;	/* current clear stall endpoint */
-#if USB_HAVE_UGEN
-	struct usb_fifo *fifo[USB_FIFO_MAX];
-	struct usb_symlink *ugen_symlink;	/* our generic symlink */
-	struct usb_fs_privdata *ctrl_dev;	/* Control Endpoint 0 device node */
-	LIST_HEAD(,usb_fs_privdata) pd_list;
-	char	ugen_name[20];		/* name of ugenX.X device */
-#endif
-	usb_ticks_t plugtime;		/* copy of "ticks" */
-
-	enum usb_dev_state state;
-	enum usb_dev_speed speed;
-	uint16_t refcount;
-#define	USB_DEV_REF_MAX 0xffff
-
-	uint16_t power;			/* mA the device uses */
-	uint16_t langid;		/* language for strings */
-	uint16_t autoQuirk[USB_MAX_AUTO_QUIRK];		/* dynamic quirks */
-
-	uint8_t	address;		/* device addess */
-	uint8_t	device_index;		/* device index in "bus->devices" */
-	uint8_t	controller_slot_id;	/* controller specific value */
-	uint8_t next_config_index;	/* used by USB_RE_ENUM_SET_CONFIG */
-	uint8_t	curr_config_index;	/* current configuration index */
-	uint8_t	curr_config_no;		/* current configuration number */
-	uint8_t	depth;			/* distance from root HUB */
-	uint8_t	port_index;		/* parent HUB port index */
-	uint8_t	port_no;		/* parent HUB port number */
-	uint8_t	hs_hub_addr;		/* high-speed HUB address */
-	uint8_t	hs_port_no;		/* high-speed HUB port number */
-	uint8_t	driver_added_refcount;	/* our driver added generation count */
-	uint8_t	power_mode;		/* see USB_POWER_XXX */
-	uint8_t re_enumerate_wait;	/* set if re-enum. is in progress */
-#define	USB_RE_ENUM_DONE	0
-#define	USB_RE_ENUM_START	1
-#define	USB_RE_ENUM_PWR_OFF	2
-#define	USB_RE_ENUM_SET_CONFIG	3
-	uint8_t ifaces_max;		/* number of interfaces present */
-	uint8_t endpoints_max;		/* number of endpoints present */
-
-	/* the "flags" field is write-protected by "bus->mtx" */
-
-	struct usb_device_flags flags;
-
-	struct usb_endpoint_descriptor ctrl_ep_desc;	/* for endpoint 0 */
-	struct usb_endpoint_ss_comp_descriptor ctrl_ep_comp_desc;	/* for endpoint 0 */
-	struct usb_device_descriptor ddesc;	/* device descriptor */
-
-	char	*serial;		/* serial number, can be NULL */
-	char	*manufacturer;		/* manufacturer string, can be NULL */
-	char	*product;		/* product string, can be NULL */
-
-#if USB_HAVE_COMPAT_LINUX
-	/* Linux compat */
-	struct usb_device_descriptor descriptor;
-	struct usb_host_endpoint ep0;
-	struct usb_interface *linux_iface_start;
-	struct usb_interface *linux_iface_end;
-	struct usb_host_endpoint *linux_endpoint_start;
-	struct usb_host_endpoint *linux_endpoint_end;
-	uint16_t devnum;
-#endif
-
-	uint32_t clear_stall_errors;	/* number of clear-stall failures */
-
-	union usb_device_scratch scratch;
-
-#if (USB_HAVE_FIXED_CONFIG != 0)
-	uint32_t config_data[(USB_CONFIG_MAX + 3) / 4];
-#endif
-};
-
-/* globals */
-
-extern int usb_template;
-
-/* function prototypes */
-
-const char *usb_statestr(enum usb_dev_state state);
-struct usb_device *usb_alloc_device(device_t parent_dev, struct usb_bus *bus,
-		    struct usb_device *parent_hub, uint8_t depth,
-		    uint8_t port_index, uint8_t port_no,
-		    enum usb_dev_speed speed, enum usb_hc_mode mode);
-#if USB_HAVE_UGEN
-struct usb_fs_privdata *usb_make_dev(struct usb_device *, const char *,
-		    int, int, int, uid_t, gid_t, int);
-void	usb_destroy_dev(struct usb_fs_privdata *);
-void	usb_destroy_dev_sync(struct usb_fs_privdata *);
-#endif
-usb_error_t	usb_probe_and_attach(struct usb_device *udev,
-		    uint8_t iface_index);
-void		usb_detach_device(struct usb_device *, uint8_t, uint8_t);
-usb_error_t	usb_reset_iface_endpoints(struct usb_device *udev,
-		    uint8_t iface_index);
-usb_error_t	usbd_set_config_index(struct usb_device *udev, uint8_t index);
-usb_error_t	usbd_set_endpoint_stall(struct usb_device *udev,
-		    struct usb_endpoint *ep, uint8_t do_stall);
-usb_error_t	usb_suspend_resume(struct usb_device *udev,
-		    uint8_t do_suspend);
-void	usb_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len);
-void	usb_free_device(struct usb_device *, uint8_t);
-void	usb_linux_free_device(struct usb_device *dev);
-uint8_t	usb_peer_can_wakeup(struct usb_device *udev);
-struct usb_endpoint *usb_endpoint_foreach(struct usb_device *udev, struct usb_endpoint *ep);
-void	usb_set_device_state(struct usb_device *, enum usb_dev_state);
-enum usb_dev_state usb_get_device_state(struct usb_device *);
-
-uint8_t	usbd_enum_lock(struct usb_device *);
-void	usbd_enum_unlock(struct usb_device *);
-void	usbd_sr_lock(struct usb_device *);
-void	usbd_sr_unlock(struct usb_device *);
-uint8_t usbd_enum_is_locked(struct usb_device *);
-
-#if USB_HAVE_TT_SUPPORT
-void	uhub_tt_buffer_reset_async_locked(struct usb_device *, struct usb_endpoint *);
-#endif
-
-uint8_t uhub_count_active_host_ports(struct usb_device *, enum usb_dev_speed);
-
-#endif					/* _USB_DEVICE_H_ */
diff --git a/include.new/dev/usb/usb_dynamic.h b/include.new/dev/usb/usb_dynamic.h
deleted file mode 100644
index f6511cf..0000000
--- a/include.new/dev/usb/usb_dynamic.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_dynamic.h 225469 2011-09-10 15:55:36Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_DYNAMIC_H_
-#define	_USB_DYNAMIC_H_
-
-/* prototypes */
-
-struct usb_device;
-struct usbd_lookup_info;
-struct usb_device_request;
-
-/* typedefs */
-
-typedef usb_error_t	(usb_temp_setup_by_index_t)(struct usb_device *udev,
-			    uint16_t index);
-typedef uint8_t		(usb_test_quirk_t)(const struct usbd_lookup_info *info,
-			    uint16_t quirk);
-typedef int		(usb_quirk_ioctl_t)(unsigned long cmd, caddr_t data,
-			    int fflag, struct thread *td);
-typedef void		(usb_temp_unsetup_t)(struct usb_device *udev);
-
-/* global function pointers */
-
-extern usb_handle_req_t *usb_temp_get_desc_p;
-extern usb_temp_setup_by_index_t *usb_temp_setup_by_index_p;
-extern usb_temp_unsetup_t *usb_temp_unsetup_p;
-extern usb_test_quirk_t *usb_test_quirk_p;
-extern usb_quirk_ioctl_t *usb_quirk_ioctl_p;
-extern devclass_t usb_devclass_ptr;
-
-/* function prototypes */
-
-void	usb_temp_unload(void *);
-void	usb_quirk_unload(void *);
-void	usb_bus_unload(void *);
-
-#endif					/* _USB_DYNAMIC_H_ */
diff --git a/include.new/dev/usb/usb_endian.h b/include.new/dev/usb/usb_endian.h
deleted file mode 100644
index d9beab4..0000000
--- a/include.new/dev/usb/usb_endian.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_endian.h 246122 2013-01-30 15:26:04Z hselasky $ */
-/*
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_ENDIAN_H_
-#define	_USB_ENDIAN_H_
-
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <sys/stdint.h>
-#include <sys/endian.h>
-#endif
-
-/*
- * Declare the basic USB record types. USB records have an alignment
- * of 1 byte and are always packed.
- */
-typedef uint8_t uByte;
-typedef uint8_t uWord[2];
-typedef uint8_t uDWord[4];
-typedef uint8_t uQWord[8];
-
-/*
- * Define a set of macros that can get and set data independent of
- * CPU endianness and CPU alignment requirements:
- */
-#define	UGETB(w)			\
-  ((w)[0])
-
-#define	UGETW(w)			\
-  ((w)[0] |				\
-  (((uint16_t)((w)[1])) << 8))
-
-#define	UGETDW(w)			\
-  ((w)[0] |				\
-  (((uint16_t)((w)[1])) << 8) |		\
-  (((uint32_t)((w)[2])) << 16) |	\
-  (((uint32_t)((w)[3])) << 24))
-
-#define	UGETQW(w)			\
-  ((w)[0] |				\
-  (((uint16_t)((w)[1])) << 8) |		\
-  (((uint32_t)((w)[2])) << 16) |	\
-  (((uint32_t)((w)[3])) << 24) |	\
-  (((uint64_t)((w)[4])) << 32) |	\
-  (((uint64_t)((w)[5])) << 40) |	\
-  (((uint64_t)((w)[6])) << 48) |	\
-  (((uint64_t)((w)[7])) << 56))
-
-#define	USETB(w,v) do {			\
-  (w)[0] = (uint8_t)(v);		\
-} while (0)
-
-#define	USETW(w,v) do {			\
-  (w)[0] = (uint8_t)(v);		\
-  (w)[1] = (uint8_t)((v) >> 8);		\
-} while (0)
-
-#define	USETDW(w,v) do {		\
-  (w)[0] = (uint8_t)(v);		\
-  (w)[1] = (uint8_t)((v) >> 8);		\
-  (w)[2] = (uint8_t)((v) >> 16);	\
-  (w)[3] = (uint8_t)((v) >> 24);	\
-} while (0)
-
-#define	USETQW(w,v) do {		\
-  (w)[0] = (uint8_t)(v);		\
-  (w)[1] = (uint8_t)((v) >> 8);		\
-  (w)[2] = (uint8_t)((v) >> 16);	\
-  (w)[3] = (uint8_t)((v) >> 24);	\
-  (w)[4] = (uint8_t)((v) >> 32);	\
-  (w)[5] = (uint8_t)((v) >> 40);	\
-  (w)[6] = (uint8_t)((v) >> 48);	\
-  (w)[7] = (uint8_t)((v) >> 56);	\
-} while (0)
-
-#define	USETW2(w,b1,b0) do {		\
-  (w)[0] = (uint8_t)(b0);		\
-  (w)[1] = (uint8_t)(b1);		\
-} while (0)
-
-#define	USETW4(w,b3,b2,b1,b0) do {	\
-  (w)[0] = (uint8_t)(b0);		\
-  (w)[1] = (uint8_t)(b1);		\
-  (w)[2] = (uint8_t)(b2);		\
-  (w)[3] = (uint8_t)(b3);		\
-} while (0)
-
-#define	USETW8(w,b7,b6,b5,b4,b3,b2,b1,b0) do {	\
-  (w)[0] = (uint8_t)(b0);		\
-  (w)[1] = (uint8_t)(b1);		\
-  (w)[2] = (uint8_t)(b2);		\
-  (w)[3] = (uint8_t)(b3);		\
-  (w)[4] = (uint8_t)(b4);		\
-  (w)[5] = (uint8_t)(b5);		\
-  (w)[6] = (uint8_t)(b6);		\
-  (w)[7] = (uint8_t)(b7);		\
-} while (0)
-
-#endif					/* _USB_ENDIAN_H_ */
diff --git a/include.new/dev/usb/usb_ethersubr.h b/include.new/dev/usb/usb_ethersubr.h
deleted file mode 100644
index a69a12c..0000000
--- a/include.new/dev/usb/usb_ethersubr.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999, 2000
- *	Bill Paul <wpaul@ee.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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/dev/usb/usb_ethersubr.h,v 1.10 2005/03/25 13:22:58 sobomax Exp $
- */
-
-#ifndef _USB_ETHERSUBR_H_
-#define _USB_ETHERSUBR_H_
-
-#include <sys/bus.h>
-#include <sys/module.h>
-
-#include <dev/usb/usbdi.h>
-
-#define UE_TX_LIST_CNT		1
-#define UE_RX_LIST_CNT		1
-#define UE_BUFSZ		1536
-
-struct usb_qdat {
-	struct ifnet		*ifp;
-	void (*if_rxstart)	(struct ifnet *);
-};
-
-struct ue_chain {
-	void			*ue_sc;
-	usbd_xfer_handle	ue_xfer;
-	char			*ue_buf;
-	struct mbuf		*ue_mbuf;
-	int			ue_idx;
-};
-
-struct ue_cdata {
-	struct ue_chain		ue_tx_chain[UE_TX_LIST_CNT];
-	struct ue_chain		ue_rx_chain[UE_RX_LIST_CNT];
-	void			*ue_ibuf;
-	int			ue_tx_prod;
-	int			ue_tx_cons;
-	int			ue_tx_cnt;
-	int			ue_rx_prod;
-};
-
-void usb_register_netisr	(void);
-void usb_ether_input		(struct mbuf *);
-void usb_tx_done		(struct mbuf *);
-struct mbuf *usb_ether_newbuf	(void);
-int usb_ether_rx_list_init	(void *, struct ue_cdata *,
-    usbd_device_handle);
-int usb_ether_tx_list_init	(void *, struct ue_cdata *,
-    usbd_device_handle);
-void usb_ether_rx_list_free	(struct ue_cdata *);
-void usb_ether_tx_list_free	(struct ue_cdata *);
-
-#endif /* _USB_ETHERSUBR_H_ */
diff --git a/include.new/dev/usb/usb_freebsd.h b/include.new/dev/usb/usb_freebsd.h
deleted file mode 100644
index 64806b6..0000000
--- a/include.new/dev/usb/usb_freebsd.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_freebsd.h 277364 2015-01-19 07:06:15Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-/*
- * Including this file is mandatory for all USB related c-files in the kernel.
- */
-
-#ifndef _USB_FREEBSD_H_
-#define	_USB_FREEBSD_H_
-
-/* Default USB configuration */
-#define	USB_HAVE_UGEN 1
-#define	USB_HAVE_DEVCTL 1
-#define	USB_HAVE_BUSDMA 1
-#define	USB_HAVE_COMPAT_LINUX 1
-#define	USB_HAVE_USER_IO 1
-#define	USB_HAVE_MBUF 1
-#define	USB_HAVE_TT_SUPPORT 1
-#define	USB_HAVE_POWERD 1
-#define	USB_HAVE_MSCTEST 1
-#define	USB_HAVE_PF 1
-#define	USB_HAVE_ROOT_MOUNT_HOLD 1
-#define	USB_HAVE_ID_SECTION 1
-#define	USB_HAVE_PER_BUS_PROCESS 1
-#define	USB_HAVE_FIXED_ENDPOINT 0
-#define	USB_HAVE_FIXED_IFACE 0
-#define	USB_HAVE_FIXED_CONFIG 0
-#define	USB_HAVE_FIXED_PORT 0
-#define	USB_HAVE_DISABLE_ENUM 1
-
-/* define zero ticks callout value */
-#define	USB_CALLOUT_ZERO_TICKS 1
-
-#define	USB_TD_GET_PROC(td) (td)->td_proc
-#define	USB_PROC_GET_GID(td) (td)->p_pgid
-
-#if (!defined(USB_HOST_ALIGN)) || (USB_HOST_ALIGN <= 0)
-/* Use default value. */
-#undef USB_HOST_ALIGN
-#if defined(__arm__) || defined(__mips__) || defined(__powerpc__)
-#define USB_HOST_ALIGN	32		/* Arm and MIPS need at least this much, if not more */
-#else
-#define	USB_HOST_ALIGN    8		/* bytes, must be power of two */
-#endif
-#endif
-/* Sanity check for USB_HOST_ALIGN: Verify power of two. */
-#if ((-USB_HOST_ALIGN) & USB_HOST_ALIGN) != USB_HOST_ALIGN
-#error "USB_HOST_ALIGN is not power of two."
-#endif
-#define	USB_FS_ISOC_UFRAME_MAX 4	/* exclusive unit */
-#define	USB_BUS_MAX 256			/* units */
-#define	USB_MAX_DEVICES 128		/* units */
-#define	USB_CONFIG_MAX 65535		/* bytes */
-#define	USB_IFACE_MAX 32		/* units */
-#define	USB_FIFO_MAX 128		/* units */
-#define	USB_MAX_EP_STREAMS 8		/* units */
-#define	USB_MAX_EP_UNITS 32		/* units */
-#define	USB_MAX_PORTS 255		/* units */
-
-#define	USB_MAX_FS_ISOC_FRAMES_PER_XFER (120)	/* units */
-#define	USB_MAX_HS_ISOC_FRAMES_PER_XFER (8*120)	/* units */
-
-#define	USB_HUB_MAX_DEPTH	5
-#define	USB_EP0_BUFSIZE		1024	/* bytes */
-#define	USB_CS_RESET_LIMIT	20	/* failures = 20 * 50 ms = 1sec */
-
-#define	USB_MAX_AUTO_QUIRK	8	/* maximum number of dynamic quirks */
-
-typedef uint32_t usb_timeout_t;		/* milliseconds */
-typedef uint32_t usb_frlength_t;	/* bytes */
-typedef uint32_t usb_frcount_t;		/* units */
-typedef uint32_t usb_size_t;		/* bytes */
-typedef uint32_t usb_ticks_t;		/* system defined */
-typedef uint16_t usb_power_mask_t;	/* see "USB_HW_POWER_XXX" */
-typedef uint16_t usb_stream_t;		/* stream ID */
-
-#endif	/* _USB_FREEBSD_H_ */
diff --git a/include.new/dev/usb/usb_freebsd_loader.h b/include.new/dev/usb/usb_freebsd_loader.h
deleted file mode 100644
index 6d05ffe..0000000
--- a/include.new/dev/usb/usb_freebsd_loader.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_freebsd_loader.h 277364 2015-01-19 07:06:15Z hselasky $ */
-/*-
- * Copyright (c) 2013 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-/*
- * Including this file is mandatory for all USB related c-files in the loader.
- */
-
-#ifndef _USB_FREEBSD_LOADER_H_
-#define	_USB_FREEBSD_LOADER_H_
-
-/* Default USB configuration */
-#define	USB_HAVE_UGEN 0
-#define	USB_HAVE_DEVCTL 0
-#define	USB_HAVE_BUSDMA 1
-#define	USB_HAVE_COMPAT_LINUX 0
-#define	USB_HAVE_USER_IO 0
-#define	USB_HAVE_MBUF 0
-#define	USB_HAVE_TT_SUPPORT 1
-#define	USB_HAVE_POWERD 1
-#define	USB_HAVE_MSCTEST 0
-#define	USB_HAVE_PF 0
-#define	USB_HAVE_ROOT_MOUNT_HOLD 0
-#define	USB_HAVE_ID_SECTION 0
-#define	USB_HAVE_PER_BUS_PROCESS 0
-#define	USB_HAVE_FIXED_ENDPOINT 0
-#define	USB_HAVE_FIXED_IFACE 0
-#define	USB_HAVE_FIXED_CONFIG 0
-#define	USB_HAVE_FIXED_PORT 0
-#define	USB_HAVE_DISABLE_ENUM 0
-
-#define	USB_CALLOUT_ZERO_TICKS 1
-
-#define	USB_TD_GET_PROC(td) (td)->td_proc
-#define	USB_PROC_GET_GID(td) (td)->p_pgid
-
-#if (!defined(USB_HOST_ALIGN)) || (USB_HOST_ALIGN <= 0)
-/* Use default value. */
-#undef USB_HOST_ALIGN
-#define	USB_HOST_ALIGN    8		/* bytes, must be power of two */
-#endif
-/* Sanity check for USB_HOST_ALIGN: Verify power of two. */
-#if ((-USB_HOST_ALIGN) & USB_HOST_ALIGN) != USB_HOST_ALIGN
-#error "USB_HOST_ALIGN is not power of two."
-#endif
-#define	USB_FS_ISOC_UFRAME_MAX 4	/* exclusive unit */
-#define	USB_BUS_MAX 256			/* units */
-#define	USB_MAX_DEVICES 128		/* units */
-#define	USB_CONFIG_MAX 65535		/* bytes */
-#define	USB_IFACE_MAX 32		/* units */
-#define	USB_FIFO_MAX 128		/* units */
-#define	USB_MAX_EP_UNITS 32		/* units */
-#define	USB_MAX_EP_STREAMS 8		/* units */
-#define	USB_MAX_PORTS 255		/* units */
-
-#define	USB_MAX_FS_ISOC_FRAMES_PER_XFER (120)	/* units */
-#define	USB_MAX_HS_ISOC_FRAMES_PER_XFER (8*120)	/* units */
-
-#define	USB_HUB_MAX_DEPTH	5
-#define	USB_EP0_BUFSIZE		1024	/* bytes */
-#define	USB_CS_RESET_LIMIT	20	/* failures = 20 * 50 ms = 1sec */
-
-#define	USB_MAX_AUTO_QUIRK	8	/* maximum number of dynamic quirks */
-
-typedef uint32_t usb_timeout_t;		/* milliseconds */
-typedef uint32_t usb_frlength_t;	/* bytes */
-typedef uint32_t usb_frcount_t;		/* units */
-typedef uint32_t usb_size_t;		/* bytes */
-typedef uint32_t usb_ticks_t;		/* system defined */
-typedef uint16_t usb_power_mask_t;	/* see "USB_HW_POWER_XXX" */
-typedef uint16_t usb_stream_t;		/* stream ID */
-
-#endif					/* _USB_FREEBSD_LOADER_H_ */
diff --git a/include.new/dev/usb/usb_generic.h b/include.new/dev/usb/usb_generic.h
deleted file mode 100644
index 7e689df..0000000
--- a/include.new/dev/usb/usb_generic.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_generic.h 196219 2009-08-14 20:03:53Z jhb $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_GENERIC_H_
-#define	_USB_GENERIC_H_
-
-extern struct usb_fifo_methods usb_ugen_methods;
-int	ugen_do_request(struct usb_fifo *f, struct usb_ctl_request *ur);
-
-#endif					/* _USB_GENERIC_H_ */
diff --git a/include.new/dev/usb/usb_hub.h b/include.new/dev/usb/usb_hub.h
deleted file mode 100644
index c268c57..0000000
--- a/include.new/dev/usb/usb_hub.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_hub.h 267347 2014-06-11 05:39:08Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_HUB_H_
-#define	_USB_HUB_H_
-
-/*
- * The following structure defines an USB port. 
- */
-struct usb_port {
-	uint8_t	restartcnt;
-#define	USB_RESTART_MAX 5
-	uint8_t	device_index;		/* zero means not valid */
-	enum usb_hc_mode usb_mode;	/* host or device mode */
-#if USB_HAVE_TT_SUPPORT
-	struct usb_device_request req_reset_tt __aligned(4);
-#endif
-};
-
-/*
- * The following structure defines an USB HUB.
- */
-struct usb_hub {
-	struct usb_device *hubudev;	/* the HUB device */
-	usb_error_t (*explore) (struct usb_device *hub);
-	void   *hubsoftc;
-#if USB_HAVE_TT_SUPPORT
-	struct usb_udev_msg tt_msg[2];
-#endif
-	usb_size_t uframe_usage[USB_HS_MICRO_FRAMES_MAX];
-	uint16_t portpower;		/* mA per USB port */
-	uint8_t	isoc_last_time;
-	uint8_t	nports;
-#if (USB_HAVE_FIXED_PORT == 0)
-	struct usb_port ports[0];
-#else
-	struct usb_port ports[USB_MAX_PORTS];
-#endif
-};
-
-/* function prototypes */
-
-void	usb_hs_bandwidth_alloc(struct usb_xfer *xfer);
-void	usb_hs_bandwidth_free(struct usb_xfer *xfer);
-void	usb_bus_port_set_device(struct usb_bus *bus, struct usb_port *up,
-	    struct usb_device *udev, uint8_t device_index);
-struct usb_device *usb_bus_port_get_device(struct usb_bus *bus,
-	    struct usb_port *up);
-void	usb_needs_explore(struct usb_bus *bus, uint8_t do_probe);
-void	usb_needs_explore_all(void);
-void	usb_bus_power_update(struct usb_bus *bus);
-void	usb_bus_powerd(struct usb_bus *bus);
-void	uhub_root_intr(struct usb_bus *, const uint8_t *, uint8_t);
-usb_error_t uhub_query_info(struct usb_device *, uint8_t *, uint8_t *);
-void	uhub_explore_handle_re_enumerate(struct usb_device *);
-
-#endif					/* _USB_HUB_H_ */
diff --git a/include.new/dev/usb/usb_ioctl.h b/include.new/dev/usb/usb_ioctl.h
deleted file mode 100644
index 66928c2..0000000
--- a/include.new/dev/usb/usb_ioctl.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_ioctl.h 269922 2014-08-13 08:21:52Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
- * Copyright (c) 1998 Lennart Augustsson. 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.
- *
- * 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.
- */
-
-#ifndef _USB_IOCTL_H_
-#define	_USB_IOCTL_H_
-
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <sys/ioccom.h>
-#include <sys/cdefs.h>
-
-/* Building "kdump" depends on these includes */
-
-#include <dev/usb/usb_endian.h>
-#include <dev/usb/usb.h>
-#endif
-
-#define	USB_DEVICE_NAME "usbctl"
-#define	USB_DEVICE_DIR "usb"
-#define	USB_GENERIC_NAME "ugen"
-#define	USB_TEMPLATE_SYSCTL "hw.usb.template"	/* integer type */
-
-/*
- * Align IOCTL structures to hide differences when running 32-bit
- * programs under 64-bit kernels:
- */
-#ifdef COMPAT_32BIT
-#define	USB_IOCTL_STRUCT_ALIGN(n) __aligned(n)
-#else
-#define	USB_IOCTL_STRUCT_ALIGN(n)
-#endif
-
-/* Definition of valid template sysctl values */
-
-enum {
-	USB_TEMP_MSC,		/* USB Mass Storage */
-	USB_TEMP_CDCE,		/* USB CDC Ethernet */
-	USB_TEMP_MTP,		/* Message Transfer Protocol */
-	USB_TEMP_MODEM,		/* USB CDC Modem */
-	USB_TEMP_AUDIO,		/* USB Audio */
-	USB_TEMP_KBD,		/* USB Keyboard */
-	USB_TEMP_MOUSE,		/* USB Mouse */
-	USB_TEMP_PHONE,		/* USB Phone */
-	USB_TEMP_MAX,
-};
-
-struct usb_read_dir {
-#ifdef COMPAT_32BIT
-	uint64_t urd_data;
-#else
-	void   *urd_data;
-#endif
-	uint32_t urd_startentry;
-	uint32_t urd_maxlen;
-} USB_IOCTL_STRUCT_ALIGN(8);
-
-struct usb_ctl_request {
-#ifdef COMPAT_32BIT
-	uint64_t ucr_data;
-#else
-	void   *ucr_data;
-#endif
-	uint16_t ucr_flags;
-	uint16_t ucr_actlen;		/* actual length transferred */
-	uint8_t	ucr_addr;		/* zero - currently not used */
-	struct usb_device_request ucr_request;
-} USB_IOCTL_STRUCT_ALIGN(8);
-
-struct usb_alt_interface {
-	uint8_t	uai_interface_index;
-	uint8_t	uai_alt_index;
-} USB_IOCTL_STRUCT_ALIGN(1);
-
-struct usb_gen_descriptor {
-#ifdef COMPAT_32BIT
-	uint64_t ugd_data;
-#else
-	void   *ugd_data;
-#endif
-	uint16_t ugd_lang_id;
-	uint16_t ugd_maxlen;
-	uint16_t ugd_actlen;
-	uint16_t ugd_offset;
-	uint8_t	ugd_config_index;
-	uint8_t	ugd_string_index;
-	uint8_t	ugd_iface_index;
-	uint8_t	ugd_altif_index;
-	uint8_t	ugd_endpt_index;
-	uint8_t	ugd_report_type;
-	uint8_t	reserved[8];
-} USB_IOCTL_STRUCT_ALIGN(8);
-
-struct usb_device_info {
-	uint16_t udi_productNo;
-	uint16_t udi_vendorNo;
-	uint16_t udi_releaseNo;
-	uint16_t udi_power;		/* power consumption in mA, 0 if
-					 * selfpowered */
-	uint8_t	udi_bus;
-	uint8_t	udi_addr;		/* device address */
-	uint8_t	udi_index;		/* device index */
-	uint8_t	udi_class;
-	uint8_t	udi_subclass;
-	uint8_t	udi_protocol;
-	uint8_t	udi_config_no;		/* current config number */
-	uint8_t	udi_config_index;	/* current config index */
-	uint8_t	udi_speed;		/* see "USB_SPEED_XXX" */
-	uint8_t	udi_mode;		/* see "USB_MODE_XXX" */
-	uint8_t	udi_nports;
-	uint8_t	udi_hubaddr;		/* parent HUB address */
-	uint8_t	udi_hubindex;		/* parent HUB device index */
-	uint8_t	udi_hubport;		/* parent HUB port */
-	uint8_t	udi_power_mode;		/* see "USB_POWER_MODE_XXX" */
-	uint8_t	udi_suspended;		/* set if device is suspended */
-	uint8_t	udi_reserved[16];	/* leave space for the future */
-	char	udi_product[128];
-	char	udi_vendor[128];
-	char	udi_serial[64];
-	char	udi_release[8];
-} USB_IOCTL_STRUCT_ALIGN(2);
-
-#define	USB_DEVICE_PORT_PATH_MAX 32
-
-struct usb_device_port_path {
-	uint8_t udp_bus;		/* which bus we are on */
-	uint8_t udp_index;		/* which device index */
-	uint8_t udp_port_level;		/* how many levels: 0, 1, 2 ... */
-	uint8_t udp_port_no[USB_DEVICE_PORT_PATH_MAX];
-} USB_IOCTL_STRUCT_ALIGN(1);
-
-struct usb_device_stats {
-	uint32_t uds_requests_ok[4];	/* Indexed by transfer type UE_XXX */
-	uint32_t uds_requests_fail[4];	/* Indexed by transfer type UE_XXX */
-} USB_IOCTL_STRUCT_ALIGN(4);
-
-struct usb_fs_start {
-	uint8_t	ep_index;
-} USB_IOCTL_STRUCT_ALIGN(1);
-
-struct usb_fs_stop {
-	uint8_t	ep_index;
-} USB_IOCTL_STRUCT_ALIGN(1);
-
-struct usb_fs_complete {
-	uint8_t	ep_index;
-} USB_IOCTL_STRUCT_ALIGN(1);
-
-/* This structure is used for all endpoint types */
-struct usb_fs_endpoint {
-	/*
-	 * NOTE: isochronous USB transfer only use one buffer, but can have
-	 * multiple frame lengths !
-	 */
-#ifdef COMPAT_32BIT
-	uint64_t ppBuffer;
-	uint64_t pLength;
-#else
-	void  **ppBuffer;		/* pointer to userland buffers */
-	uint32_t *pLength;		/* pointer to frame lengths, updated
-					 * to actual length */
-#endif
-	uint32_t nFrames;		/* number of frames */
-	uint32_t aFrames;		/* actual number of frames */
-	uint16_t flags;
-	/* a single short frame will terminate */
-#define	USB_FS_FLAG_SINGLE_SHORT_OK 0x0001
-	/* multiple short frames are allowed */
-#define	USB_FS_FLAG_MULTI_SHORT_OK 0x0002
-	/* all frame(s) transmitted are short terminated */
-#define	USB_FS_FLAG_FORCE_SHORT 0x0004
-	/* will do a clear-stall before xfer */
-#define	USB_FS_FLAG_CLEAR_STALL 0x0008
-	uint16_t timeout;		/* in milliseconds */
-	/* isocronous completion time in milliseconds - used for echo cancel */
-	uint16_t isoc_time_complete;
-	/* timeout value for no timeout */
-#define	USB_FS_TIMEOUT_NONE 0
-	int	status;			/* see USB_ERR_XXX */
-} USB_IOCTL_STRUCT_ALIGN(8);
-
-struct usb_fs_init {
-	/* userland pointer to endpoints structure */
-#ifdef COMPAT_32BIT
-	uint64_t pEndpoints;
-#else
-	struct usb_fs_endpoint *pEndpoints;
-#endif
-	/* maximum number of endpoints */
-	uint8_t	ep_index_max;
-} USB_IOCTL_STRUCT_ALIGN(8);
-
-struct usb_fs_uninit {
-	uint8_t	dummy;			/* zero */
-} USB_IOCTL_STRUCT_ALIGN(1);
-
-struct usb_fs_open {
-#define	USB_FS_MAX_BUFSIZE (1 << 18)
-	uint32_t max_bufsize;
-#define	USB_FS_MAX_FRAMES		(1U << 12)
-#define	USB_FS_MAX_FRAMES_PRE_SCALE	(1U << 31)	/* for ISOCHRONOUS transfers */
-	uint32_t max_frames;		/* read and write */
-	uint16_t max_packet_length;	/* read only */
-	uint8_t	dev_index;		/* currently unused */
-	uint8_t	ep_index;
-	uint8_t	ep_no;			/* bEndpointNumber */
-} USB_IOCTL_STRUCT_ALIGN(4);
-
-struct usb_fs_open_stream {
-	struct usb_fs_open fs_open;
-	uint16_t stream_id;		/* stream ID */
-} USB_IOCTL_STRUCT_ALIGN(4);
-
-struct usb_fs_close {
-	uint8_t	ep_index;
-} USB_IOCTL_STRUCT_ALIGN(1);
-
-struct usb_fs_clear_stall_sync {
-	uint8_t	ep_index;
-} USB_IOCTL_STRUCT_ALIGN(1);
-
-struct usb_gen_quirk {
-	uint16_t index;			/* Quirk Index */
-	uint16_t vid;			/* Vendor ID */
-	uint16_t pid;			/* Product ID */
-	uint16_t bcdDeviceLow;		/* Low Device Revision */
-	uint16_t bcdDeviceHigh;		/* High Device Revision */
-	uint16_t reserved[2];
-	/*
-	 * String version of quirk including terminating zero. See
-	 * UQ_XXX in "usb_quirk.h".
-	 */
-	char	quirkname[64 - 14];
-} USB_IOCTL_STRUCT_ALIGN(2);
-
-/* USB controller */
-#define	USB_REQUEST		_IOWR('U', 1, struct usb_ctl_request)
-#define	USB_SETDEBUG		_IOW ('U', 2, int)
-#define	USB_DISCOVER		_IO  ('U', 3)
-#define	USB_DEVICEINFO		_IOWR('U', 4, struct usb_device_info)
-#define	USB_DEVICESTATS		_IOR ('U', 5, struct usb_device_stats)
-#define	USB_DEVICEENUMERATE	_IOW ('U', 6, int)
-
-/* Generic HID device */
-#define	USB_GET_REPORT_DESC	_IOWR('U', 21, struct usb_gen_descriptor)
-#define	USB_SET_IMMED		_IOW ('U', 22, int)
-#define	USB_GET_REPORT		_IOWR('U', 23, struct usb_gen_descriptor)
-#define	USB_SET_REPORT		_IOW ('U', 24, struct usb_gen_descriptor)
-#define	USB_GET_REPORT_ID	_IOR ('U', 25, int)
-
-/* Generic USB device */
-#define	USB_GET_CONFIG		_IOR ('U', 100, int)
-#define	USB_SET_CONFIG		_IOW ('U', 101, int)
-#define	USB_GET_ALTINTERFACE	_IOWR('U', 102, struct usb_alt_interface)
-#define	USB_SET_ALTINTERFACE	_IOWR('U', 103, struct usb_alt_interface)
-#define	USB_GET_DEVICE_DESC	_IOR ('U', 105, struct usb_device_descriptor)
-#define	USB_GET_CONFIG_DESC	_IOR ('U', 106, struct usb_config_descriptor)
-#define	USB_GET_RX_INTERFACE_DESC _IOR ('U', 107, struct usb_interface_descriptor)
-#define	USB_GET_RX_ENDPOINT_DESC _IOR ('U', 108, struct usb_endpoint_descriptor)
-#define	USB_GET_FULL_DESC	_IOWR('U', 109, struct usb_gen_descriptor)
-#define	USB_GET_STRING_DESC	_IOWR('U', 110, struct usb_gen_descriptor)
-#define	USB_DO_REQUEST		_IOWR('U', 111, struct usb_ctl_request)
-#define	USB_GET_DEVICEINFO	_IOR ('U', 112, struct usb_device_info)
-#define	USB_SET_RX_SHORT_XFER	_IOW ('U', 113, int)
-#define	USB_SET_RX_TIMEOUT	_IOW ('U', 114, int)
-#define	USB_GET_RX_FRAME_SIZE	_IOR ('U', 115, int)
-#define	USB_GET_RX_BUFFER_SIZE	_IOR ('U', 117, int)
-#define	USB_SET_RX_BUFFER_SIZE	_IOW ('U', 118, int)
-#define	USB_SET_RX_STALL_FLAG	_IOW ('U', 119, int)
-#define	USB_SET_TX_STALL_FLAG	_IOW ('U', 120, int)
-#define	USB_GET_IFACE_DRIVER	_IOWR('U', 121, struct usb_gen_descriptor)
-#define	USB_CLAIM_INTERFACE	_IOW ('U', 122, int)
-#define	USB_RELEASE_INTERFACE	_IOW ('U', 123, int)
-#define	USB_IFACE_DRIVER_ACTIVE	_IOW ('U', 124, int)
-#define	USB_IFACE_DRIVER_DETACH	_IOW ('U', 125, int)
-#define	USB_GET_PLUGTIME	_IOR ('U', 126, uint32_t)
-#define	USB_READ_DIR		_IOW ('U', 127, struct usb_read_dir)
-/* 128 - 133 unused */
-#define	USB_GET_DEV_PORT_PATH	_IOR ('U', 134, struct usb_device_port_path)
-#define	USB_GET_POWER_USAGE	_IOR ('U', 135, int)
-#define	USB_SET_TX_FORCE_SHORT	_IOW ('U', 136, int)
-#define	USB_SET_TX_TIMEOUT	_IOW ('U', 137, int)
-#define	USB_GET_TX_FRAME_SIZE	_IOR ('U', 138, int)
-#define	USB_GET_TX_BUFFER_SIZE	_IOR ('U', 139, int)
-#define	USB_SET_TX_BUFFER_SIZE	_IOW ('U', 140, int)
-#define	USB_GET_TX_INTERFACE_DESC _IOR ('U', 141, struct usb_interface_descriptor)
-#define	USB_GET_TX_ENDPOINT_DESC _IOR ('U', 142, struct usb_endpoint_descriptor)
-#define	USB_SET_PORT_ENABLE	_IOW ('U', 143, int)
-#define	USB_SET_PORT_DISABLE	_IOW ('U', 144, int)
-#define	USB_SET_POWER_MODE	_IOW ('U', 145, int)
-#define	USB_GET_POWER_MODE	_IOR ('U', 146, int)
-#define	USB_SET_TEMPLATE	_IOW ('U', 147, int)
-#define	USB_GET_TEMPLATE	_IOR ('U', 148, int)
-
-/* Modem device */
-#define	USB_GET_CM_OVER_DATA	_IOR ('U', 180, int)
-#define	USB_SET_CM_OVER_DATA	_IOW ('U', 181, int)
-
-/* GPIO control */
-#define	USB_GET_GPIO		_IOR ('U', 182, int)
-#define	USB_SET_GPIO		_IOW ('U', 183, int)
-
-/* USB file system interface */
-#define	USB_FS_START		_IOW ('U', 192, struct usb_fs_start)
-#define	USB_FS_STOP		_IOW ('U', 193, struct usb_fs_stop)
-#define	USB_FS_COMPLETE		_IOR ('U', 194, struct usb_fs_complete)
-#define	USB_FS_INIT		_IOW ('U', 195, struct usb_fs_init)
-#define	USB_FS_UNINIT		_IOW ('U', 196, struct usb_fs_uninit)
-#define	USB_FS_OPEN		_IOWR('U', 197, struct usb_fs_open)
-#define	USB_FS_CLOSE		_IOW ('U', 198, struct usb_fs_close)
-#define	USB_FS_CLEAR_STALL_SYNC _IOW ('U', 199, struct usb_fs_clear_stall_sync)
-#define	USB_FS_OPEN_STREAM	_IOWR('U', 200, struct usb_fs_open_stream)
-
-/* USB quirk system interface */
-#define	USB_DEV_QUIRK_GET	_IOWR('Q', 0, struct usb_gen_quirk)
-#define	USB_QUIRK_NAME_GET	_IOWR('Q', 1, struct usb_gen_quirk)
-#define	USB_DEV_QUIRK_ADD	_IOW ('Q', 2, struct usb_gen_quirk)
-#define	USB_DEV_QUIRK_REMOVE	_IOW ('Q', 3, struct usb_gen_quirk)
-
-#endif					/* _USB_IOCTL_H_ */
diff --git a/include.new/dev/usb/usb_mbuf.h b/include.new/dev/usb/usb_mbuf.h
deleted file mode 100644
index ddcd3ea..0000000
--- a/include.new/dev/usb/usb_mbuf.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_mbuf.h 196219 2009-08-14 20:03:53Z jhb $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_MBUF_H_
-#define	_USB_MBUF_H_
-
-/*
- * The following structure defines a minimum re-implementation of the
- * mbuf system in the kernel.
- */
-struct usb_mbuf {
-	uint8_t *cur_data_ptr;
-	uint8_t *min_data_ptr;
-	struct usb_mbuf *usb_nextpkt;
-	struct usb_mbuf *usb_next;
-
-	usb_size_t cur_data_len;
-	usb_size_t max_data_len;
-	uint8_t last_packet:1;
-	uint8_t unused:7;
-};
-
-#define	USB_IF_ENQUEUE(ifq, m) do {		\
-    (m)->usb_nextpkt = NULL;			\
-    if ((ifq)->ifq_tail == NULL)		\
-        (ifq)->ifq_head = (m);			\
-    else					\
-        (ifq)->ifq_tail->usb_nextpkt = (m);	\
-    (ifq)->ifq_tail = (m);			\
-    (ifq)->ifq_len++;				\
-  } while (0)
-
-#define	USB_IF_DEQUEUE(ifq, m) do {				\
-    (m) = (ifq)->ifq_head;					\
-    if (m) {							\
-        if (((ifq)->ifq_head = (m)->usb_nextpkt) == NULL) {	\
-	     (ifq)->ifq_tail = NULL;				\
-	}							\
-	(m)->usb_nextpkt = NULL;				\
-	(ifq)->ifq_len--;					\
-    }								\
-  } while (0)
-
-#define	USB_IF_PREPEND(ifq, m) do {		\
-      (m)->usb_nextpkt = (ifq)->ifq_head;	\
-      if ((ifq)->ifq_tail == NULL) {		\
-	  (ifq)->ifq_tail = (m);		\
-      }						\
-      (ifq)->ifq_head = (m);			\
-      (ifq)->ifq_len++;				\
-  } while (0)
-
-#define	USB_IF_QFULL(ifq)   ((ifq)->ifq_len >= (ifq)->ifq_maxlen)
-#define	USB_IF_QLEN(ifq)    ((ifq)->ifq_len)
-#define	USB_IF_POLL(ifq, m) ((m) = (ifq)->ifq_head)
-
-#define	USB_MBUF_RESET(m) do {			\
-    (m)->cur_data_ptr = (m)->min_data_ptr;	\
-    (m)->cur_data_len = (m)->max_data_len;	\
-    (m)->last_packet = 0;			\
-  } while (0)
-
-/* prototypes */
-void   *usb_alloc_mbufs(struct malloc_type *type, struct usb_ifqueue *ifq,
-	    usb_size_t block_size, uint16_t nblocks);
-
-#endif					/* _USB_MBUF_H_ */
diff --git a/include.new/dev/usb/usb_mem.h b/include.new/dev/usb/usb_mem.h
deleted file mode 100644
index e92fbe9..0000000
--- a/include.new/dev/usb/usb_mem.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: usb_mem.h,v 1.18 2002/05/28 17:45:17 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.21 2005/01/06 01:43:29 imp Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-typedef struct usb_dma_block {
-	bus_dma_tag_t tag;
-	bus_dmamap_t map;
-#ifdef __FreeBSD__
-	void *kaddr;
-#else
-        caddr_t kaddr;
-#endif
-        bus_dma_segment_t segs[1];
-        int nsegs;
-        size_t size;
-        size_t align;
-	int fullblock;
-	LIST_ENTRY(usb_dma_block) next;
-} usb_dma_block_t;
-
-#ifdef __FreeBSD__
-#define DMAADDR(dma, o) ((dma)->block->segs[0].ds_addr + (dma)->offs + (o))
-#else
-#define DMAADDR(dma, o) (((char *)(dma)->block->map->dm_segs[0].ds_addr) + (dma)->offs + (o))
-#endif
-#define KERNADDR(dma, o) \
-	((void *)((char *)((dma)->block->kaddr) + (dma)->offs + (o)))
-
-usbd_status	usb_allocmem(usbd_bus_handle,size_t,size_t, usb_dma_t *);
-void		usb_freemem(usbd_bus_handle, usb_dma_t *);
diff --git a/include.new/dev/usb/usb_msctest.h b/include.new/dev/usb/usb_msctest.h
deleted file mode 100644
index 980b023..0000000
--- a/include.new/dev/usb/usb_msctest.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_msctest.h 283173 2015-05-21 06:47:20Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_MSCTEST_H_
-#define	_USB_MSCTEST_H_
-
-enum {
-	MSC_EJECT_STOPUNIT,
-	MSC_EJECT_REZERO,
-	MSC_EJECT_ZTESTOR,
-	MSC_EJECT_CMOTECH,
-	MSC_EJECT_HUAWEI,
-	MSC_EJECT_HUAWEI2,
-	MSC_EJECT_TCT,
-};
-
-int usb_iface_is_cdrom(struct usb_device *udev,
-	    uint8_t iface_index);
-usb_error_t usb_msc_eject(struct usb_device *udev,
-	    uint8_t iface_index, int method);
-usb_error_t usb_msc_auto_quirk(struct usb_device *udev,
-	    uint8_t iface_index);
-usb_error_t usb_dymo_eject(struct usb_device *udev,
-	    uint8_t iface_index);
-
-#endif					/* _USB_MSCTEST_H_ */
diff --git a/include.new/dev/usb/usb_pci.h b/include.new/dev/usb/usb_pci.h
deleted file mode 100644
index 8abbc27..0000000
--- a/include.new/dev/usb/usb_pci.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_pci.h 246122 2013-01-30 15:26:04Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_PCI_H_
-#define	_USB_PCI_H_
-
-/*
- * We don't want the following files included everywhere, that's why
- * they are in a separate file.
- */
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-
-#include <sys/rman.h>
-#endif
-
-#endif					/* _USB_PCI_H_ */
diff --git a/include.new/dev/usb/usb_pf.h b/include.new/dev/usb/usb_pf.h
deleted file mode 100644
index bfe80b1..0000000
--- a/include.new/dev/usb/usb_pf.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/dev/usb/usb_pf.h 220301 2011-04-03 20:03:45Z hselasky $
- */
-
-#ifndef _DEV_USB_PF_H
-#define	_DEV_USB_PF_H
-
-struct usbpf_pkthdr {
-	uint32_t	up_totlen;	/* Total length including all headers */
-	uint32_t	up_busunit;	/* Host controller unit number */
-	uint8_t		up_address;	/* USB device index */
-	uint8_t		up_mode;	/* Mode of transfer */
-#define	USBPF_MODE_HOST		0
-#define	USBPF_MODE_DEVICE	1
-	uint8_t		up_type;	/* points SUBMIT / DONE */
-	uint8_t		up_xfertype;	/* Transfer type, see USB2.0 spec. */
-	uint32_t	up_flags;	/* Transfer flags */
-#define	USBPF_FLAG_FORCE_SHORT_XFER	(1 << 0)
-#define	USBPF_FLAG_SHORT_XFER_OK	(1 << 1)
-#define	USBPF_FLAG_SHORT_FRAMES_OK	(1 << 2)
-#define	USBPF_FLAG_PIPE_BOF		(1 << 3)
-#define	USBPF_FLAG_PROXY_BUFFER		(1 << 4)
-#define	USBPF_FLAG_EXT_BUFFER		(1 << 5)
-#define	USBPF_FLAG_MANUAL_STATUS	(1 << 6)
-#define	USBPF_FLAG_NO_PIPE_OK		(1 << 7)
-#define	USBPF_FLAG_STALL_PIPE		(1 << 8)
-	uint32_t	up_status;	/* Transfer status */
-#define	USBPF_STATUS_OPEN		(1 << 0)
-#define	USBPF_STATUS_TRANSFERRING	(1 << 1)
-#define	USBPF_STATUS_DID_DMA_DELAY	(1 << 2)
-#define	USBPF_STATUS_DID_CLOSE		(1 << 3)
-#define	USBPF_STATUS_DRAINING		(1 << 4)
-#define	USBPF_STATUS_STARTED		(1 << 5)
-#define	USBPF_STATUS_BW_RECLAIMED	(1 << 6)
-#define	USBPF_STATUS_CONTROL_XFR	(1 << 7)
-#define	USBPF_STATUS_CONTROL_HDR	(1 << 8)
-#define	USBPF_STATUS_CONTROL_ACT	(1 << 9)
-#define	USBPF_STATUS_CONTROL_STALL	(1 << 10)
-#define	USBPF_STATUS_SHORT_FRAMES_OK	(1 << 11)
-#define	USBPF_STATUS_SHORT_XFER_OK	(1 << 12)
-#define	USBPF_STATUS_BDMA_ENABLE	(1 << 13)
-#define	USBPF_STATUS_BDMA_NO_POST_SYNC	(1 << 14)
-#define	USBPF_STATUS_BDMA_SETUP		(1 << 15)
-#define	USBPF_STATUS_ISOCHRONOUS_XFR	(1 << 16)
-#define	USBPF_STATUS_CURR_DMA_SET	(1 << 17)
-#define	USBPF_STATUS_CAN_CANCEL_IMMED	(1 << 18)
-#define	USBPF_STATUS_DOING_CALLBACK	(1 << 19)
-	uint32_t	up_error;	/* USB error, see USB_ERR_XXX */
-	uint32_t	up_interval;	/* For interrupt and isoc (ms) */
-	uint32_t	up_frames;	/* Number of following frames */
-	uint32_t	up_packet_size;	/* Packet size used */
-	uint32_t	up_packet_count;	/* Packet count used */
-	uint32_t	up_endpoint;	/* USB endpoint / stream ID */
-	uint8_t		up_speed;	/* USB speed, see USB_SPEED_XXX */
-	/* sizeof(struct usbpf_pkthdr) == 128 bytes */
-	uint8_t		up_reserved[83];
-};
-
-struct usbpf_framehdr {
-	/*
-	 * The frame length field excludes length of frame header and
-	 * any alignment.
-	 */
-	uint32_t length;
-#define	USBPF_FRAME_ALIGN(x)		(((x) + 3) & ~3)
-	uint32_t flags;
-#define	USBPF_FRAMEFLAG_READ		(1 << 0)
-#define	USBPF_FRAMEFLAG_DATA_FOLLOWS	(1 << 1)
-};
-
-#define	USBPF_HDR_LEN		128	/* bytes */
-#define	USBPF_FRAME_HDR_LEN	8	/* bytes */
-
-extern uint8_t usbpf_pkthdr_size_ok[
-    (sizeof(struct usbpf_pkthdr) == USBPF_HDR_LEN) ? 1 : -1];
-extern uint8_t usbpf_framehdr_size_ok[
-    (sizeof(struct usbpf_framehdr) == USBPF_FRAME_HDR_LEN) ? 1 : -1];
-
-#define	USBPF_XFERTAP_SUBMIT	0
-#define	USBPF_XFERTAP_DONE	1
-
-#ifdef _KERNEL
-void	usbpf_attach(struct usb_bus *);
-void	usbpf_detach(struct usb_bus *);
-void	usbpf_xfertap(struct usb_xfer *, int);
-#endif
-
-#endif
diff --git a/include.new/dev/usb/usb_port.h b/include.new/dev/usb/usb_port.h
deleted file mode 100644
index 8e93d1a..0000000
--- a/include.new/dev/usb/usb_port.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/*	$OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ */
-/*	$NetBSD: usb_port.h,v 1.54 2002/03/28 21:49:19 ichiro Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/usb_port.h,v 1.74 2005/01/20 05:03:28 imp Exp $       */
-
-/* Also already merged from NetBSD:
- *	$NetBSD: usb_port.h,v 1.57 2002/09/27 20:42:01 thorpej Exp $
- *	$NetBSD: usb_port.h,v 1.58 2002/10/01 01:25:26 thorpej Exp $
- */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _USB_PORT_H
-#define _USB_PORT_H
-
-/*
- * Macro's to cope with the differences between operating systems.
- */
-
-#if defined(__NetBSD__)
-/*
- * NetBSD
- */
-
-#include "opt_usbverbose.h"
-
-#define USB_USE_SOFTINTR
-
-#ifdef USB_DEBUG
-#define Static
-#else
-#define Static static
-#endif
-
-#define SCSI_MODE_SENSE		MODE_SENSE
-
-typedef struct proc *usb_proc_ptr;
-
-typedef struct device *device_ptr_t;
-#define USBBASEDEVICE struct device
-#define USBDEV(bdev) (&(bdev))
-#define USBDEVNAME(bdev) ((bdev).dv_xname)
-#define USBDEVUNIT(bdev) ((bdev).dv_unit)
-#define USBDEVPTRNAME(bdevptr) ((bdevptr)->dv_xname)
-#define USBGETSOFTC(d) ((void *)(d))
-
-#define DECLARE_USB_DMA_T \
-	struct usb_dma_block; \
-	typedef struct { \
-		struct usb_dma_block *block; \
-		u_int offs; \
-	} usb_dma_t
-
-typedef struct callout usb_callout_t;
-#define usb_callout_init(h)	callout_init(&(h))
-#define	usb_callout(h, t, f, d)	callout_reset(&(h), (t), (f), (d))
-#define	usb_uncallout(h, f, d)	callout_stop(&(h))
-
-#define usb_kthread_create1	kthread_create1
-#define usb_kthread_create	kthread_create
-
-typedef int usb_malloc_type;
-
-#define Ether_ifattach ether_ifattach
-#define IF_INPUT(ifp, m) (*(ifp)->if_input)((ifp), (m))
-
-#define logprintf printf
-
-#define	USB_DNAME(dname)	dname
-#define USB_DECLARE_DRIVER(dname)  \
-int __CONCAT(dname,_match)(struct device *, struct cfdata *, void *); \
-void __CONCAT(dname,_attach)(struct device *, struct device *, void *); \
-int __CONCAT(dname,_detach)(struct device *, int); \
-int __CONCAT(dname,_activate)(struct device *, enum devact); \
-\
-extern struct cfdriver __CONCAT(dname,_cd); \
-\
-CFATTACH_DECL(USB_DNAME(dname), \
-    sizeof(struct ___CONCAT(dname,_softc)), \
-    ___CONCAT(dname,_match), \
-    ___CONCAT(dname,_attach), \
-    ___CONCAT(dname,_detach), \
-    ___CONCAT(dname,_activate))
-
-#define USB_MATCH(dname) \
-int __CONCAT(dname,_match)(struct device *parent, struct cfdata *match, void *aux)
-
-#define USB_MATCH_START(dname, uaa) \
-	struct usb_attach_arg *uaa = aux
-
-#define USB_ATTACH(dname) \
-void __CONCAT(dname,_attach)(struct device *parent, struct device *self, void *aux)
-
-#define USB_ATTACH_START(dname, sc, uaa) \
-	struct __CONCAT(dname,_softc) *sc = \
-		(struct __CONCAT(dname,_softc) *)self; \
-	struct usb_attach_arg *uaa = aux
-
-/* Returns from attach */
-#define USB_ATTACH_ERROR_RETURN	return
-#define USB_ATTACH_SUCCESS_RETURN	return
-
-#define USB_ATTACH_SETUP
-	printf("\n%s: %s\n", USBDEVNAME(sc->sc_dev), devinfo);
-
-#define USB_DETACH(dname) \
-int __CONCAT(dname,_detach)(struct device *self, int flags)
-
-#define USB_DETACH_START(dname, sc) \
-	struct __CONCAT(dname,_softc) *sc = \
-		(struct __CONCAT(dname,_softc) *)self
-
-#define USB_GET_SC_OPEN(dname, unit, sc) \
-	if (unit >= __CONCAT(dname,_cd).cd_ndevs) \
-		return (ENXIO); \
-	sc = __CONCAT(dname,_cd).cd_devs[unit]; \
-	if (sc == NULL) \
-		return (ENXIO)
-
-#define USB_GET_SC(dname, unit, sc) \
-	sc = __CONCAT(dname,_cd).cd_devs[unit]
-
-#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \
-	(config_found_sm(parent, args, print, sub))
-
-#elif defined(__OpenBSD__)
-/*
- * OpenBSD
- */
-#define Static
-
-typedef struct proc *usb_proc_ptr;
-
-#define UCOMBUSCF_PORTNO		-1
-#define UCOMBUSCF_PORTNO_DEFAULT	-1
-
-#define SCSI_MODE_SENSE		MODE_SENSE
-#define XS_STS_DONE		ITSDONE
-#define XS_CTL_POLL		SCSI_POLL
-#define XS_CTL_DATA_IN		SCSI_DATA_IN
-#define XS_CTL_DATA_OUT		SCSI_DATA_OUT
-#define scsipi_adapter		scsi_adapter
-#define scsipi_cmd		scsi_cmd
-#define scsipi_device		scsi_device
-#define scsipi_done		scsi_done
-#define scsipi_link		scsi_link
-#define scsipi_minphys		scsi_minphys
-#define scsipi_sense		scsi_sense
-#define scsipi_xfer		scsi_xfer
-#define xs_control		flags
-#define xs_status		status
-
-#define	memcpy(d, s, l)		bcopy((s),(d),(l))
-#define	memset(d, v, l)		bzero((d),(l))
-#define bswap32(x)		swap32(x)
-#define bswap16(x)		swap16(x)
-
-/*
- * The UHCI/OHCI controllers are little endian, so on big endian machines
- * the data strored in memory needs to be swapped.
- */
-
-#if defined(letoh32)
-#define le32toh(x) letoh32(x)
-#define le16toh(x) letoh16(x)
-#endif
-
-#define usb_kthread_create1	kthread_create
-#define usb_kthread_create	kthread_create_deferred
-
-#define	config_pending_incr()
-#define	config_pending_decr()
-
-typedef int usb_malloc_type;
-
-#define Ether_ifattach(ifp, eaddr) ether_ifattach(ifp)
-#define if_deactivate(x)
-#define IF_INPUT(ifp, m) do {						\
-	struct ether_header *eh;					\
-									\
-	eh = mtod(m, struct ether_header *);				\
-	m_adj(m, sizeof(struct ether_header));				\
-	ether_input((ifp), (eh), (m));					\
-} while (0)
-
-#define	usbpoll			usbselect
-#define	uhidpoll		uhidselect
-#define	ugenpoll		ugenselect
-#define	uriopoll		urioselect
-#define uscannerpoll		uscannerselect
-
-#define powerhook_establish(fn, sc) (fn)
-#define powerhook_disestablish(hdl)
-#define PWR_RESUME 0
-
-#define logprintf printf
-
-#define swap_bytes_change_sign16_le swap_bytes_change_sign16
-#define change_sign16_swap_bytes_le change_sign16_swap_bytes
-#define change_sign16_le change_sign16
-
-#define realloc usb_realloc
-void *usb_realloc(void *, u_int, int, int);
-
-extern int cold;
-
-typedef struct device *device_ptr_t;
-#define USBBASEDEVICE struct device
-#define USBDEV(bdev) (&(bdev))
-#define USBDEVNAME(bdev) ((bdev).dv_xname)
-#define USBDEVUNIT(bdev) ((bdev).dv_unit)
-#define USBDEVPTRNAME(bdevptr) ((bdevptr)->dv_xname)
-#define USBGETSOFTC(d) ((void *)(d))
-
-#define DECLARE_USB_DMA_T \
-	struct usb_dma_block; \
-	typedef struct { \
-		struct usb_dma_block *block; \
-		u_int offs; \
-	} usb_dma_t
-
-typedef char usb_callout_t;
-#define usb_callout_init(h)
-#define usb_callout(h, t, f, d) timeout((f), (d), (t))
-#define usb_uncallout(h, f, d) untimeout((f), (d))
-
-#define USB_DECLARE_DRIVER(dname)  \
-int __CONCAT(dname,_match)(struct device *, void *, void *); \
-void __CONCAT(dname,_attach)(struct device *, struct device *, void *); \
-int __CONCAT(dname,_detach)(struct device *, int); \
-int __CONCAT(dname,_activate)(struct device *, enum devact); \
-\
-struct cfdriver __CONCAT(dname,_cd) = { \
-	NULL, #dname, DV_DULL \
-}; \
-\
-const struct cfattach __CONCAT(dname,_ca) = { \
-	sizeof(struct __CONCAT(dname,_softc)), \
-	__CONCAT(dname,_match), \
-	__CONCAT(dname,_attach), \
-	__CONCAT(dname,_detach), \
-	__CONCAT(dname,_activate), \
-}
-
-#define USB_MATCH(dname) \
-int \
-__CONCAT(dname,_match)(parent, match, aux) \
-	struct device *parent; \
-	void *match; \
-	void *aux;
-
-#define USB_MATCH_START(dname, uaa) \
-	struct usb_attach_arg *uaa = aux
-
-#define USB_ATTACH(dname) \
-void \
-__CONCAT(dname,_attach)(parent, self, aux) \
-	struct device *parent; \
-	struct device *self; \
-	void *aux;
-
-#define USB_ATTACH_START(dname, sc, uaa) \
-	struct __CONCAT(dname,_softc) *sc = \
-		(struct __CONCAT(dname,_softc) *)self; \
-	struct usb_attach_arg *uaa = aux
-
-/* Returns from attach */
-#define USB_ATTACH_ERROR_RETURN	return
-#define USB_ATTACH_SUCCESS_RETURN	return
-
-#define USB_ATTACH_SETUP
-	printf("\n%s: %s\n", USBDEVNAME(sc->sc_dev), devinfo);
-
-#define USB_DETACH(dname) \
-int \
-__CONCAT(dname,_detach)(self, flags) \
-	struct device *self; \
-	int flags;
-
-#define USB_DETACH_START(dname, sc) \
-	struct __CONCAT(dname,_softc) *sc = \
-		(struct __CONCAT(dname,_softc) *)self
-
-#define USB_GET_SC_OPEN(dname, unit, sc) \
-	if (unit >= __CONCAT(dname,_cd).cd_ndevs) \
-		return (ENXIO); \
-	sc = __CONCAT(dname,_cd).cd_devs[unit]; \
-	if (sc == NULL) \
-		return (ENXIO)
-
-#define USB_GET_SC(dname, unit, sc) \
-	sc = __CONCAT(dname,_cd).cd_devs[unit]
-
-#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \
-	(config_found_sm(parent, args, print, sub))
-
-#elif defined(__FreeBSD__)
-/*
- * FreeBSD
- */
-
-#include "opt_usb.h"
-
-#if defined(_KERNEL)
-#include <sys/malloc.h>
-
-MALLOC_DECLARE(M_USB);
-MALLOC_DECLARE(M_USBDEV);
-MALLOC_DECLARE(M_USBHC);
-
-#endif
-
-/* We don't use the soft interrupt code in FreeBSD. */
-#if 0
-#define USB_USE_SOFTINTR
-#endif
-
-#define Static static
-
-#define device_ptr_t device_t
-#define USBBASEDEVICE device_t
-#define USBDEV(bdev) (bdev)
-#define USBDEVNAME(bdev) device_get_nameunit(bdev)
-#define USBDEVUNIT(bdev) device_get_unit(bdev)
-#define USBDEVPTRNAME(bdev) device_get_nameunit(bdev)
-#define USBDEVUNIT(bdev) device_get_unit(bdev)
-#define USBGETSOFTC(bdev) (device_get_softc(bdev))
-
-#define DECLARE_USB_DMA_T \
-	struct usb_dma_block; \
-	typedef struct { \
-		struct usb_dma_block *block; \
-		u_int offs; \
-		u_int len; \
-	} usb_dma_t
-
-#if __FreeBSD_version >= 500000
-typedef struct thread *usb_proc_ptr;
-
-#define uio_procp uio_td
-
-#define usb_kthread_create1(f, s, p, a0, a1) \
-		kthread_create((f), (s), (p), RFHIGHPID, 0, (a0), (a1))
-#define usb_kthread_create2(f, s, p, a0) \
-		kthread_create((f), (s), (p), RFHIGHPID, 0, (a0))
-#define usb_kthread_create	kthread_create
-
-#define	config_pending_incr()
-#define	config_pending_decr()
-
-typedef struct callout usb_callout_t;
-#define usb_callout_init(h)     callout_init(&(h), 0)
-#define usb_callout(h, t, f, d) callout_reset(&(h), (t), (f), (d))
-#define usb_uncallout(h, f, d)  callout_stop(&(h))
-#define usb_uncallout_drain(h, f, d)  callout_drain(&(h))
-#else
-typedef struct proc *usb_proc_ptr;
-
-#define	PROC_LOCK(p)
-#define	PROC_UNLOCK(p)
-
-#define usb_kthread_create1(f, s, p, a0, a1) \
-		kthread_create((f), (s), (p), (a0), (a1))
-#define usb_kthread_create2(f, s, p, a0) \
-		kthread_create((f), (s), (p), (a0))
-#define usb_kthread_create	kthread_create
-
-#define	config_pending_incr()
-#define	config_pending_decr()
-
-typedef struct callout usb_callout_t;
-#define usb_callout_init(h)     callout_init(&(h))
-#define usb_callout(h, t, f, d) callout_reset(&(h), (t), (f), (d))
-#define usb_uncallout(h, f, d)  callout_stop(&(h))
-
-#define	BUS_DMA_COHERENT	0
-#define	ETHER_ALIGN		2
-#define	BPF_MTAP(ifp, m)	if ((ifp)->if_bpf) bpf_mtap((ifp), (m));
-#endif
-
-#define clalloc(p, s, x) (clist_alloc_cblocks((p), (s), (s)), 0)
-#define clfree(p) clist_free_cblocks((p))
-
-#define PWR_RESUME 0
-#define PWR_SUSPEND 1
-
-#define config_detach(dev, flag) \
-	do { \
-		device_detach(dev); \
-		free(device_get_ivars(dev), M_USB); \
-		device_delete_child(device_get_parent(dev), dev); \
-	} while (0);
-
-typedef struct malloc_type *usb_malloc_type;
-
-#define USB_DECLARE_DRIVER_INIT(dname, init...) \
-Static device_probe_t __CONCAT(dname,_match); \
-Static device_attach_t __CONCAT(dname,_attach); \
-Static device_detach_t __CONCAT(dname,_detach); \
-\
-Static devclass_t __CONCAT(dname,_devclass); \
-\
-Static device_method_t __CONCAT(dname,_methods)[] = { \
-        DEVMETHOD(device_probe, __CONCAT(dname,_match)), \
-        DEVMETHOD(device_attach, __CONCAT(dname,_attach)), \
-        DEVMETHOD(device_detach, __CONCAT(dname,_detach)), \
-	init, \
-        {0,0} \
-}; \
-\
-Static driver_t __CONCAT(dname,_driver) = { \
-        #dname, \
-        __CONCAT(dname,_methods), \
-        sizeof(struct __CONCAT(dname,_softc)) \
-}; \
-MODULE_DEPEND(dname, usb, 1, 1, 1)
-
-
-#define METHODS_NONE			{0,0}
-#define USB_DECLARE_DRIVER(dname)	USB_DECLARE_DRIVER_INIT(dname, METHODS_NONE)
-
-#define USB_MATCH(dname) \
-Static int \
-__CONCAT(dname,_match)(device_t self)
-
-#define USB_MATCH_START(dname, uaa) \
-        struct usb_attach_arg *uaa = device_get_ivars(self)
-
-#define USB_MATCH_SETUP \
-	sc->sc_dev = self
-
-#define USB_ATTACH(dname) \
-Static int \
-__CONCAT(dname,_attach)(device_t self)
-
-#define USB_ATTACH_START(dname, sc, uaa) \
-        struct __CONCAT(dname,_softc) *sc = device_get_softc(self); \
-        struct usb_attach_arg *uaa = device_get_ivars(self)
-
-/* Returns from attach */
-#define USB_ATTACH_ERROR_RETURN	return ENXIO
-#define USB_ATTACH_SUCCESS_RETURN	return 0
-
-#define USB_ATTACH_SETUP \
-	do { \
-		sc->sc_dev = self; \
-		device_set_desc_copy(self, devinfo); \
-		device_printf(self, "%s\n", devinfo); \
-	} while (0);
-
-#define USB_DETACH(dname) \
-Static int \
-__CONCAT(dname,_detach)(device_t self)
-
-#define USB_DETACH_START(dname, sc) \
-	struct __CONCAT(dname,_softc) *sc = device_get_softc(self)
-
-#define USB_GET_SC_OPEN(dname, unit, sc) \
-	sc = devclass_get_softc(__CONCAT(dname,_devclass), unit); \
-	if (sc == NULL) \
-		return (ENXIO)
-
-#define USB_GET_SC(dname, unit, sc) \
-	sc = devclass_get_softc(__CONCAT(dname,_devclass), unit)
-
-#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \
-	(device_probe_and_attach((bdev)) == 0 ? (bdev) : 0)
-
-/* conversion from one type of queue to the other */
-#define SIMPLEQ_REMOVE_HEAD	STAILQ_REMOVE_HEAD
-#define SIMPLEQ_INSERT_HEAD	STAILQ_INSERT_HEAD
-#define SIMPLEQ_INSERT_TAIL	STAILQ_INSERT_TAIL
-#define SIMPLEQ_NEXT		STAILQ_NEXT
-#define SIMPLEQ_FIRST		STAILQ_FIRST
-#define SIMPLEQ_HEAD		STAILQ_HEAD
-#define SIMPLEQ_EMPTY		STAILQ_EMPTY
-#define SIMPLEQ_FOREACH		STAILQ_FOREACH
-#define SIMPLEQ_INIT		STAILQ_INIT
-#define SIMPLEQ_HEAD_INITIALIZER	STAILQ_HEAD_INITIALIZER
-#define SIMPLEQ_ENTRY		STAILQ_ENTRY
-
-#include <sys/syslog.h>
-/*
-#define logprintf(args...)	log(LOG_DEBUG, args)
-*/
-#define logprintf		printf
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_hw_usb);
-#endif
-
-#endif /* __FreeBSD__ */
-
-#endif /* _USB_PORT_H */
-
diff --git a/include.new/dev/usb/usb_process.h b/include.new/dev/usb/usb_process.h
deleted file mode 100644
index dcf65b9..0000000
--- a/include.new/dev/usb/usb_process.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_process.h 263799 2014-03-27 06:59:56Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_PROCESS_H_
-#define	_USB_PROCESS_H_
-
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <sys/interrupt.h>
-#include <sys/priority.h>
-#include <sys/runq.h>
-#endif
-
-/* defines */
-#define	USB_PRI_HIGH	PI_SWI(SWI_NET)
-#define	USB_PRI_MED	PI_SWI(SWI_CAMBIO)
-
-#define	USB_PROC_WAIT_TIMEOUT 2
-#define	USB_PROC_WAIT_DRAIN   1
-#define	USB_PROC_WAIT_NORMAL  0
-
-/* structure prototypes */
-
-struct usb_proc_msg;
-struct usb_device;
-
-/*
- * The following structure defines the USB process.
- */
-struct usb_process {
-	TAILQ_HEAD(, usb_proc_msg) up_qhead;
-	struct cv up_cv;
-	struct cv up_drain;
-
-#if (__FreeBSD_version >= 800000)
-	struct thread *up_ptr;
-#else
-	struct proc *up_ptr;
-#endif
-	struct thread *up_curtd;
-	struct mtx *up_mtx;
-
-	usb_size_t up_msg_num;
-
-	uint8_t	up_prio;
-	uint8_t	up_gone;
-	uint8_t	up_msleep;
-	uint8_t	up_csleep;
-	uint8_t	up_dsleep;
-};
-
-/* prototypes */
-
-uint8_t	usb_proc_is_gone(struct usb_process *up);
-int	usb_proc_create(struct usb_process *up, struct mtx *p_mtx,
-	    const char *pmesg, uint8_t prio);
-void	usb_proc_drain(struct usb_process *up);
-void	usb_proc_mwait(struct usb_process *up, void *pm0, void *pm1);
-void	usb_proc_free(struct usb_process *up);
-void   *usb_proc_msignal(struct usb_process *up, void *pm0, void *pm1);
-void	usb_proc_rewakeup(struct usb_process *up);
-int	usb_proc_is_called_from(struct usb_process *up);
-
-void	usb_proc_explore_mwait(struct usb_device *, void *, void *);
-void   *usb_proc_explore_msignal(struct usb_device *, void *, void *);
-void	usb_proc_explore_lock(struct usb_device *);
-void	usb_proc_explore_unlock(struct usb_device *);
-
-#endif					/* _USB_PROCESS_H_ */
diff --git a/include.new/dev/usb/usb_quirks.h b/include.new/dev/usb/usb_quirks.h
deleted file mode 100644
index 497fe83..0000000
--- a/include.new/dev/usb/usb_quirks.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: usb_quirks.h,v 1.20 2001/04/15 09:38:01 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.17.2.3 2006/02/15 22:51:08 iedowse Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-struct usbd_quirks {
-	uint32_t uq_flags;	/* Device problems: */
-#define UQ_NO_SET_PROTO	0x0001	/* cannot handle SET PROTOCOL. */
-#define UQ_SWAP_UNICODE	0x0002	/* has some Unicode strings swapped. */
-#define UQ_MS_REVZ	0x0004	/* mouse has Z-axis reversed */
-#define UQ_NO_STRINGS	0x0008	/* string descriptors are broken. */
-#define UQ_BAD_ADC	0x0010	/* bad audio spec version number. */
-#define UQ_BUS_POWERED	0x0020	/* device is bus powered, despite claim */
-#define UQ_BAD_AUDIO	0x0040	/* device claims audio class, but isn't */
-#define UQ_SPUR_BUT_UP	0x0080	/* spurious mouse button up events */
-#define UQ_AU_NO_XU	0x0100	/* audio device has broken extension unit */
-#define UQ_POWER_CLAIM	0x0200	/* hub lies about power status */
-#define UQ_AU_NO_FRAC	0x0400	/* don't adjust for fractional samples */
-#define UQ_AU_INP_ASYNC	0x0800	/* input is async despite claim of adaptive */
-#define UQ_ASSUME_CM_OVER_DATA 0x1000 /* modem device breaks on cm over data */
-#define UQ_BROKEN_BIDIR	0x2000	/* printer has broken bidir mode */
-#define UQ_HID_IGNORE	0x8000	/* device should be ignored by hid class */
-					
-};
-
-extern const struct usbd_quirks usbd_no_quirk;
-
-const struct usbd_quirks *usbd_find_quirk(usb_device_descriptor_t *);
diff --git a/include.new/dev/usb/usb_request.h b/include.new/dev/usb/usb_request.h
deleted file mode 100644
index 3e386e7..0000000
--- a/include.new/dev/usb/usb_request.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_request.h 250207 2013-05-03 11:10:04Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_REQUEST_H_
-#define	_USB_REQUEST_H_
-
-struct usb_process;
-
-usb_error_t usbd_req_clear_hub_feature(struct usb_device *udev,
-		    struct mtx *mtx, uint16_t sel);
-usb_error_t usbd_req_clear_port_feature(struct usb_device *udev,
-		    struct mtx *mtx, uint8_t port, uint16_t sel);
-usb_error_t usbd_req_get_alt_interface_no(struct usb_device *udev,
-		    struct mtx *mtx, uint8_t *alt_iface_no,
-		    uint8_t iface_index);
-usb_error_t usbd_req_get_config(struct usb_device *udev, struct mtx *mtx,
-		    uint8_t *pconf);
-usb_error_t usbd_req_get_descriptor_ptr(struct usb_device *udev,
-		    struct usb_config_descriptor **ppcd, uint16_t wValue);
-usb_error_t usbd_req_get_config_desc(struct usb_device *udev, struct mtx *mtx,
-		    struct usb_config_descriptor *d, uint8_t conf_index);
-usb_error_t usbd_req_get_config_desc_full(struct usb_device *udev,
-		    struct mtx *mtx, struct usb_config_descriptor **ppcd,
-		    uint8_t conf_index);
-usb_error_t usbd_req_get_desc(struct usb_device *udev, struct mtx *mtx,
-		    uint16_t *actlen, void *desc, uint16_t min_len,
-		    uint16_t max_len, uint16_t id, uint8_t type,
-		    uint8_t index, uint8_t retries);
-usb_error_t usbd_req_get_device_desc(struct usb_device *udev, struct mtx *mtx,
-		    struct usb_device_descriptor *d);
-usb_error_t usbd_req_get_device_status(struct usb_device *udev,
-		    struct mtx *mtx, struct usb_status *st);
-usb_error_t usbd_req_get_hub_descriptor(struct usb_device *udev,
-		    struct mtx *mtx, struct usb_hub_descriptor *hd,
-		    uint8_t nports);
-usb_error_t usbd_req_get_ss_hub_descriptor(struct usb_device *udev,
-		    struct mtx *mtx, struct usb_hub_ss_descriptor *hd,
-		    uint8_t nports);
-usb_error_t usbd_req_get_hub_status(struct usb_device *udev, struct mtx *mtx,
-		    struct usb_hub_status *st);
-usb_error_t usbd_req_get_port_status(struct usb_device *udev, struct mtx *mtx,
-		    struct usb_port_status *ps, uint8_t port);
-usb_error_t usbd_req_reset_port(struct usb_device *udev, struct mtx *mtx,
-		    uint8_t port);
-usb_error_t usbd_req_warm_reset_port(struct usb_device *udev,
-		    struct mtx *mtx, uint8_t port);
-usb_error_t usbd_req_set_address(struct usb_device *udev, struct mtx *mtx,
-		    uint16_t addr);
-usb_error_t usbd_req_set_hub_feature(struct usb_device *udev, struct mtx *mtx,
-		    uint16_t sel);
-usb_error_t usbd_req_set_port_feature(struct usb_device *udev,
-		    struct mtx *mtx, uint8_t port, uint16_t sel);
-usb_error_t usbd_setup_device_desc(struct usb_device *udev, struct mtx *mtx);
-usb_error_t usbd_req_re_enumerate(struct usb_device *udev, struct mtx *mtx);
-usb_error_t usbd_req_clear_device_feature(struct usb_device *udev,
-		    struct mtx *mtx, uint16_t sel);
-usb_error_t usbd_req_set_device_feature(struct usb_device *udev,
-		    struct mtx *mtx, uint16_t sel);
-usb_error_t usbd_req_set_hub_u1_timeout(struct usb_device *udev,
-		    struct mtx *mtx, uint8_t port, uint8_t timeout);
-usb_error_t usbd_req_set_hub_u2_timeout(struct usb_device *udev,
-		    struct mtx *mtx, uint8_t port, uint8_t timeout);
-usb_error_t usbd_req_set_hub_depth(struct usb_device *udev,
-		    struct mtx *mtx, uint16_t depth);
-usb_error_t usbd_req_reset_tt(struct usb_device *udev, struct mtx *mtx,
-		    uint8_t port);
-usb_error_t usbd_req_clear_tt_buffer(struct usb_device *udev, struct mtx *mtx,
-		    uint8_t port, uint8_t addr, uint8_t type, uint8_t endpoint);
-usb_error_t usbd_req_set_port_link_state(struct usb_device *udev,
-		    struct mtx *mtx, uint8_t port, uint8_t link_state);
-usb_error_t usbd_req_set_lpm_info(struct usb_device *udev, struct mtx *mtx,
-		    uint8_t port, uint8_t besl, uint8_t addr, uint8_t rwe);
-
-void *	usbd_alloc_config_desc(struct usb_device *, uint32_t);
-void	usbd_free_config_desc(struct usb_device *, void *);
-
-#endif					/* _USB_REQUEST_H_ */
diff --git a/include.new/dev/usb/usb_transfer.h b/include.new/dev/usb/usb_transfer.h
deleted file mode 100644
index e278731..0000000
--- a/include.new/dev/usb/usb_transfer.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_transfer.h 228056 2011-11-28 09:54:41Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_TRANSFER_H_
-#define	_USB_TRANSFER_H_
-
-/*
- * Definition of internal USB transfer states:
- * ===========================================
- *
- * The main reason there are many USB states is that we are allowed to
- * cancel USB transfers, then start the USB transfer again and that
- * this state transaction cannot always be done in a single atomic
- * operation without blocking the calling thread. One reason for this
- * is that the USB hardware sometimes needs to wait for DMA
- * controllers to finish which is done asynchronously and grows the
- * statemachine.
- *
- * When extending the following statemachine there are basically two
- * things you should think about: Which states should be executed or
- * modified in case of USB transfer stop and which states should be
- * executed or modified in case of USB transfer start. Also respect
- * the "can_cancel_immed" flag which basically tells if you can go
- * directly from a wait state to the cancelling states.
- */
-
-enum {
-	/* XFER start execute state */
-
-	/* USB_ST_SETUP = 0 (already defined) */
-
-	/* XFER transferred execute state */
-
-	/* USB_ST_TRANSFERRED = 1 (already defined) */
-
-	/* XFER error execute state */
-
-	/* USB_ST_ERROR = 2 (already defined) */
-
-	/* XFER restart after error execute state */
-
-	USB_ST_RESTART = 8,
-
-	/* XFER transfer idle state */
-
-	USB_ST_WAIT_SETUP,
-
-	/* Other XFER execute states */
-
-	USB_ST_PIPE_OPEN = 16,
-	USB_ST_PIPE_OPEN_ERROR,
-	USB_ST_PIPE_OPEN_RESTART,
-
-	USB_ST_BDMA_LOAD,
-	USB_ST_BDMA_LOAD_ERROR,
-	USB_ST_BDMA_LOAD_RESTART,
-
-	USB_ST_IVAL_DLY,
-	USB_ST_IVAL_DLY_ERROR,
-	USB_ST_IVAL_DLY_RESTART,
-
-	USB_ST_PIPE_STALL,
-	USB_ST_PIPE_STALL_ERROR,
-	USB_ST_PIPE_STALL_RESTART,
-
-	USB_ST_ENTER,
-	USB_ST_ENTER_ERROR,
-	USB_ST_ENTER_RESTART,
-
-	USB_ST_START,
-	USB_ST_START_ERROR,
-	USB_ST_START_RESTART,
-
-	USB_ST_PIPE_CLOSE,
-	USB_ST_PIPE_CLOSE_ERROR,
-	USB_ST_PIPE_CLOSE_RESTART,
-
-	USB_ST_BDMA_DLY,
-	USB_ST_BDMA_DLY_ERROR,
-	USB_ST_BDMA_DLY_RESTART,
-
-	/* XFER transfer wait states */
-
-	USB_ST_WAIT_PIPE_OPEN = 64,
-	USB_ST_WAIT_PIPE_OPEN_ERROR,
-	USB_ST_WAIT_PIPE_OPEN_RESTART,
-
-	USB_ST_WAIT_BDMA_LOAD,
-	USB_ST_WAIT_BDMA_LOAD_ERROR,
-	USB_ST_WAIT_BDMA_LOAD_RESTART,
-
-	USB_ST_WAIT_IVAL_DLY,
-	USB_ST_WAIT_IVAL_DLY_ERROR,
-	USB_ST_WAIT_IVAL_DLY_RESTART,
-
-	USB_ST_WAIT_PIPE_STALL,
-	USB_ST_WAIT_PIPE_STALL_ERROR,
-	USB_ST_WAIT_PIPE_STALL_RESTART,
-
-	USB_ST_WAIT_ENTER,
-	USB_ST_WAIT_ENTER_ERROR,
-	USB_ST_WAIT_ENTER_RESTART,
-
-	USB_ST_WAIT_START,
-	USB_ST_WAIT_START_ERROR,
-	USB_ST_WAIT_START_RESTART,
-
-	USB_ST_WAIT_PIPE_CLOSE,
-	USB_ST_WAIT_PIPE_CLOSE_ERROR,
-	USB_ST_WAIT_PIPE_CLOSE_RESTART,
-
-	USB_ST_WAIT_BDMA_DLY,
-	USB_ST_WAIT_BDMA_DLY_ERROR,
-	USB_ST_WAIT_BDMA_DLY_RESTART,
-
-	USB_ST_WAIT_TRANSFERRED,
-	USB_ST_WAIT_TRANSFERRED_ERROR,
-	USB_ST_WAIT_TRANSFERRED_RESTART,
-};
-
-/*
- * The following structure defines the messages that is used to signal
- * the "done_p" USB process.
- */
-struct usb_done_msg {
-	struct usb_proc_msg hdr;
-	struct usb_xfer_root *xroot;
-};
-
-#define	USB_DMATAG_TO_XROOT(dpt)				\
-  ((struct usb_xfer_root *)(					\
-   ((uint8_t *)(dpt)) -						\
-   ((uint8_t *)&((struct usb_xfer_root *)0)->dma_parent_tag)))
-
-/*
- * The following structure is used to keep information about memory
- * that should be automatically freed at the moment all USB transfers
- * have been freed.
- */
-struct usb_xfer_root {
-	struct usb_dma_parent_tag dma_parent_tag;
-#if USB_HAVE_BUSDMA
-	struct usb_xfer_queue dma_q;
-#endif
-	struct usb_xfer_queue done_q;
-	struct usb_done_msg done_m[2];
-	struct cv cv_drain;
-
-	struct usb_process *done_p;	/* pointer to callback process */
-	void   *memory_base;
-	struct mtx *xfer_mtx;	/* cannot be changed during operation */
-#if USB_HAVE_BUSDMA
-	struct usb_page_cache *dma_page_cache_start;
-	struct usb_page_cache *dma_page_cache_end;
-#endif
-	struct usb_page_cache *xfer_page_cache_start;
-	struct usb_page_cache *xfer_page_cache_end;
-	struct usb_bus *bus;		/* pointer to USB bus (cached) */
-	struct usb_device *udev;	/* pointer to USB device */
-
-	usb_size_t memory_size;
-	usb_size_t setup_refcount;
-#if USB_HAVE_BUSDMA
-	usb_frcount_t dma_nframes;	/* number of page caches to load */
-	usb_frcount_t dma_currframe;	/* currect page cache number */
-	usb_frlength_t dma_frlength_0;	/* length of page cache zero */
-	uint8_t	dma_error;		/* set if virtual memory could not be
-					 * loaded */
-#endif
-	uint8_t	done_sleep;		/* set if done thread is sleeping */
-};
-
-/*
- * The following structure is used when setting up an array of USB
- * transfers.
- */
-struct usb_setup_params {
-	struct usb_dma_tag *dma_tag_p;
-	struct usb_page *dma_page_ptr;
-	struct usb_page_cache *dma_page_cache_ptr;	/* these will be
-							 * auto-freed */
-	struct usb_page_cache *xfer_page_cache_ptr;	/* these will not be
-							 * auto-freed */
-	struct usb_device *udev;
-	struct usb_xfer *curr_xfer;
-	const struct usb_config *curr_setup;
-	const struct usb_pipe_methods *methods;
-	void   *buf;
-	usb_frlength_t *xfer_length_ptr;
-
-	usb_size_t size[7];
-	usb_frlength_t bufsize;
-	usb_frlength_t bufsize_max;
-
-	uint32_t hc_max_frame_size;
-	uint16_t hc_max_packet_size;
-	uint8_t	hc_max_packet_count;
-	enum usb_dev_speed speed;
-	uint8_t	dma_tag_max;
-	usb_error_t err;
-};
-
-/* function prototypes */
-
-uint8_t	usbd_transfer_setup_sub_malloc(struct usb_setup_params *parm,
-	    struct usb_page_cache **ppc, usb_size_t size, usb_size_t align,
-	    usb_size_t count);
-void	usb_dma_delay_done_cb(struct usb_xfer *);
-void	usb_command_wrapper(struct usb_xfer_queue *pq,
-	    struct usb_xfer *xfer);
-void	usbd_pipe_enter(struct usb_xfer *xfer);
-void	usbd_pipe_start(struct usb_xfer_queue *pq);
-void	usbd_transfer_dequeue(struct usb_xfer *xfer);
-void	usbd_transfer_done(struct usb_xfer *xfer, usb_error_t error);
-void	usbd_transfer_enqueue(struct usb_xfer_queue *pq,
-	    struct usb_xfer *xfer);
-void	usbd_transfer_setup_sub(struct usb_setup_params *parm);
-void	usbd_ctrl_transfer_setup(struct usb_device *udev);
-void	usbd_clear_stall_locked(struct usb_device *udev,
-	    struct usb_endpoint *ep);
-void	usbd_clear_data_toggle(struct usb_device *udev,
-	    struct usb_endpoint *ep);
-usb_callback_t usbd_do_request_callback;
-usb_callback_t usb_handle_request_callback;
-usb_callback_t usb_do_clear_stall_callback;
-void	usbd_transfer_timeout_ms(struct usb_xfer *xfer,
-	    void (*cb) (void *arg), usb_timeout_t ms);
-usb_timeout_t usbd_get_dma_delay(struct usb_device *udev);
-void	usbd_transfer_power_ref(struct usb_xfer *xfer, int val);
-
-#endif					/* _USB_TRANSFER_H_ */
diff --git a/include.new/dev/usb/usb_util.h b/include.new/dev/usb/usb_util.h
deleted file mode 100644
index 9681d76..0000000
--- a/include.new/dev/usb/usb_util.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usb_util.h 227701 2011-11-19 10:11:50Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _USB_UTIL_H_
-#define	_USB_UTIL_H_
-
-uint8_t	usb_make_str_desc(void *ptr, uint16_t max_len, const char *s);
-void	usb_printbcd(char *p, uint16_t p_len, uint16_t bcd);
-void	usb_trim_spaces(char *p);
-
-#endif					/* _USB_UTIL_H_ */
diff --git a/include.new/dev/usb/usbcdc.h b/include.new/dev/usb/usbcdc.h
deleted file mode 100644
index ea0b05f..0000000
--- a/include.new/dev/usb/usbcdc.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*	$NetBSD: usbcdc.h,v 1.9 2004/10/23 13:24:24 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.12 2005/03/01 06:35:04 sobomax Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _USBCDC_H_
-#define _USBCDC_H_
-
-#define UDESCSUB_CDC_HEADER	0
-#define UDESCSUB_CDC_CM		1 /* Call Management */
-#define UDESCSUB_CDC_ACM	2 /* Abstract Control Model */
-#define UDESCSUB_CDC_DLM	3 /* Direct Line Management */
-#define UDESCSUB_CDC_TRF	4 /* Telephone Ringer */
-#define UDESCSUB_CDC_TCLSR	5 /* Telephone Call ... */
-#define UDESCSUB_CDC_UNION	6
-#define UDESCSUB_CDC_CS		7 /* Country Selection */
-#define UDESCSUB_CDC_TOM	8 /* Telephone Operational Modes */
-#define UDESCSUB_CDC_USBT	9 /* USB Terminal */
-#define UDESCSUB_CDC_NCT	10
-#define UDESCSUB_CDC_PUF	11
-#define UDESCSUB_CDC_EUF	12
-#define UDESCSUB_CDC_MCMF	13
-#define UDESCSUB_CDC_CCMF	14
-#define UDESCSUB_CDC_ENF	15
-#define UDESCSUB_CDC_ANF	16
-
-typedef struct {
-	uByte		bLength;
-	uByte		bDescriptorType;
-	uByte		bDescriptorSubtype;
-	uWord		bcdCDC;
-} UPACKED usb_cdc_header_descriptor_t;
-
-typedef struct {
-	uByte		bLength;
-	uByte		bDescriptorType;
-	uByte		bDescriptorSubtype;
-	uByte		bmCapabilities;
-#define USB_CDC_CM_DOES_CM		0x01
-#define USB_CDC_CM_OVER_DATA		0x02
-	uByte		bDataInterface;
-} UPACKED usb_cdc_cm_descriptor_t;
-
-typedef struct {
-	uByte		bLength;
-	uByte		bDescriptorType;
-	uByte		bDescriptorSubtype;
-	uByte		bmCapabilities;
-#define USB_CDC_ACM_HAS_FEATURE		0x01
-#define USB_CDC_ACM_HAS_LINE		0x02
-#define USB_CDC_ACM_HAS_BREAK		0x04
-#define USB_CDC_ACM_HAS_NETWORK_CONN	0x08
-} UPACKED usb_cdc_acm_descriptor_t;
-
-typedef struct {
-	uByte		bLength;
-	uByte		bDescriptorType;
-	uByte		bDescriptorSubtype;
-	uByte		bMasterInterface;
-	uByte		bSlaveInterface[1];
-} UPACKED usb_cdc_union_descriptor_t;
-
-typedef struct {
-	uByte		bLength;
-	uByte		bDescriptorType;
-	uByte		bDescriptorSubtype;
-	uByte		iMacAddress;
-	uDWord		bmEthernetStatistics;
-	uWord		wMaxSegmentSize;
-	uWord		wNumberMCFikters;
-	uByte		bNumberPowerFilters;
-} UPACKED usb_cdc_ethernet_descriptor_t;
-
-#define UCDC_SEND_ENCAPSULATED_COMMAND	0x00
-#define UCDC_GET_ENCAPSULATED_RESPONSE	0x01
-#define UCDC_SET_COMM_FEATURE		0x02
-#define UCDC_GET_COMM_FEATURE		0x03
-#define  UCDC_ABSTRACT_STATE		0x01
-#define  UCDC_COUNTRY_SETTING		0x02
-#define UCDC_CLEAR_COMM_FEATURE		0x04
-#define UCDC_SET_LINE_CODING		0x20
-#define UCDC_GET_LINE_CODING		0x21
-#define UCDC_SET_CONTROL_LINE_STATE	0x22
-#define  UCDC_LINE_DTR			0x0001
-#define  UCDC_LINE_RTS			0x0002
-#define UCDC_SEND_BREAK			0x23
-#define  UCDC_BREAK_ON			0xffff
-#define  UCDC_BREAK_OFF			0x0000
-
-typedef struct {
-	uWord	wState;
-#define UCDC_IDLE_SETTING		0x0001
-#define UCDC_DATA_MULTIPLEXED		0x0002
-} UPACKED usb_cdc_abstract_state_t;
-#define UCDC_ABSTRACT_STATE_LENGTH 2
-
-typedef struct {
-	uDWord	dwDTERate;
-	uByte	bCharFormat;
-#define UCDC_STOP_BIT_1			0
-#define UCDC_STOP_BIT_1_5		1
-#define UCDC_STOP_BIT_2			2
-	uByte	bParityType;
-#define UCDC_PARITY_NONE		0
-#define UCDC_PARITY_ODD			1
-#define UCDC_PARITY_EVEN		2
-#define UCDC_PARITY_MARK		3
-#define UCDC_PARITY_SPACE		4
-	uByte	bDataBits;
-} UPACKED usb_cdc_line_state_t;
-#define UCDC_LINE_STATE_LENGTH 7
-
-typedef struct {
-	uByte	bmRequestType;
-#define UCDC_NOTIFICATION		0xa1
-	uByte	bNotification;
-#define UCDC_N_NETWORK_CONNECTION	0x00
-#define UCDC_N_RESPONSE_AVAILABLE	0x01
-#define UCDC_N_AUX_JACK_HOOK_STATE	0x08
-#define UCDC_N_RING_DETECT		0x09
-#define UCDC_N_SERIAL_STATE		0x20
-#define UCDC_N_CALL_STATE_CHANGED	0x28
-#define UCDC_N_LINE_STATE_CHANGED	0x29
-#define UCDC_N_CONNECTION_SPEED_CHANGE	0x2a
-	uWord	wValue;
-	uWord	wIndex;
-	uWord	wLength;
-	uByte	data[16];
-} UPACKED usb_cdc_notification_t;
-#define UCDC_NOTIFICATION_LENGTH 8
-
-/*
- * Bits set in the SERIAL STATE notifcation (first byte of data)
- */
-
-#define UCDC_N_SERIAL_OVERRUN		0x40
-#define UCDC_N_SERIAL_PARITY		0x20
-#define UCDC_N_SERIAL_FRAMING		0x10
-#define UCDC_N_SERIAL_RI		0x08
-#define UCDC_N_SERIAL_BREAK		0x04
-#define UCDC_N_SERIAL_DSR		0x02
-#define UCDC_N_SERIAL_DCD		0x01
-
-/* Serial state bit masks */
-#define UCDC_MDM_RXCARRIER	0x01
-#define UCDC_MDM_TXCARRIER	0x02
-#define UCDC_MDM_BREAK		0x04
-#define UCDC_MDM_RING		0x08
-#define UCDC_MDM_FRAMING_ERR	0x10
-#define UCDC_MDM_PARITY_ERR	0x20
-#define UCDC_MDM_OVERRUN_ERR	0x40
-
-#endif /* _USBCDC_H_ */
diff --git a/include.new/dev/usb/usbdi.h b/include.new/dev/usb/usbdi.h
deleted file mode 100644
index a758e81..0000000
--- a/include.new/dev/usb/usbdi.h
+++ /dev/null
@@ -1,622 +0,0 @@
-/*-
- * Copyright (c) 2009 Andrew Thompson
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/dev/usb/usbdi.h 267347 2014-06-11 05:39:08Z hselasky $
- */
-#ifndef _USB_USBDI_H_
-#define _USB_USBDI_H_
-
-struct usb_fifo;
-struct usb_xfer;
-struct usb_device;
-struct usb_attach_arg;
-struct usb_interface;
-struct usb_endpoint;
-struct usb_page_cache;
-struct usb_page_search;
-struct usb_process;
-struct usb_proc_msg;
-struct usb_mbuf;
-struct usb_fs_privdata;
-struct mbuf;
-
-typedef enum {	/* keep in sync with usb_errstr_table */
-	USB_ERR_NORMAL_COMPLETION = 0,
-	USB_ERR_PENDING_REQUESTS,	/* 1 */
-	USB_ERR_NOT_STARTED,		/* 2 */
-	USB_ERR_INVAL,			/* 3 */
-	USB_ERR_NOMEM,			/* 4 */
-	USB_ERR_CANCELLED,		/* 5 */
-	USB_ERR_BAD_ADDRESS,		/* 6 */
-	USB_ERR_BAD_BUFSIZE,		/* 7 */
-	USB_ERR_BAD_FLAG,		/* 8 */
-	USB_ERR_NO_CALLBACK,		/* 9 */
-	USB_ERR_IN_USE,			/* 10 */
-	USB_ERR_NO_ADDR,		/* 11 */
-	USB_ERR_NO_PIPE,		/* 12 */
-	USB_ERR_ZERO_NFRAMES,		/* 13 */
-	USB_ERR_ZERO_MAXP,		/* 14 */
-	USB_ERR_SET_ADDR_FAILED,	/* 15 */
-	USB_ERR_NO_POWER,		/* 16 */
-	USB_ERR_TOO_DEEP,		/* 17 */
-	USB_ERR_IOERROR,		/* 18 */
-	USB_ERR_NOT_CONFIGURED,		/* 19 */
-	USB_ERR_TIMEOUT,		/* 20 */
-	USB_ERR_SHORT_XFER,		/* 21 */
-	USB_ERR_STALLED,		/* 22 */
-	USB_ERR_INTERRUPTED,		/* 23 */
-	USB_ERR_DMA_LOAD_FAILED,	/* 24 */
-	USB_ERR_BAD_CONTEXT,		/* 25 */
-	USB_ERR_NO_ROOT_HUB,		/* 26 */
-	USB_ERR_NO_INTR_THREAD,		/* 27 */
-	USB_ERR_NOT_LOCKED,		/* 28 */
-	USB_ERR_MAX
-} usb_error_t;
-
-/*
- * Flags for transfers
- */
-#define	USB_FORCE_SHORT_XFER	0x0001	/* force a short transmit last */
-#define	USB_SHORT_XFER_OK	0x0004	/* allow short reads */
-#define	USB_DELAY_STATUS_STAGE	0x0010	/* insert delay before STATUS stage */
-#define	USB_USER_DATA_PTR	0x0020	/* internal flag */
-#define	USB_MULTI_SHORT_OK	0x0040	/* allow multiple short frames */
-#define	USB_MANUAL_STATUS	0x0080	/* manual ctrl status */
-
-#define	USB_NO_TIMEOUT 0
-#define	USB_DEFAULT_TIMEOUT 5000	/* 5000 ms = 5 seconds */
-
-#if defined(_KERNEL)
-/* typedefs */
-
-typedef void (usb_callback_t)(struct usb_xfer *, usb_error_t);
-typedef void (usb_proc_callback_t)(struct usb_proc_msg *);
-typedef usb_error_t (usb_handle_req_t)(struct usb_device *,
-    struct usb_device_request *, const void **, uint16_t *);
-
-typedef int (usb_fifo_open_t)(struct usb_fifo *fifo, int fflags);
-typedef void (usb_fifo_close_t)(struct usb_fifo *fifo, int fflags);
-typedef int (usb_fifo_ioctl_t)(struct usb_fifo *fifo, u_long cmd, void *addr, int fflags);
-typedef void (usb_fifo_cmd_t)(struct usb_fifo *fifo);
-typedef void (usb_fifo_filter_t)(struct usb_fifo *fifo, struct usb_mbuf *m);
-
-
-/* USB events */
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <sys/eventhandler.h>
-#endif
-typedef void (*usb_dev_configured_t)(void *, struct usb_device *,
-    struct usb_attach_arg *);
-EVENTHANDLER_DECLARE(usb_dev_configured, usb_dev_configured_t);
-
-/*
- * The following macros are used used to convert milliseconds into
- * HZ. We use 1024 instead of 1000 milliseconds per second to save a
- * full division.
- */
-#define	USB_MS_HZ 1024
-
-#define	USB_MS_TO_TICKS(ms) \
-  (((uint32_t)((((uint32_t)(ms)) * ((uint32_t)(hz))) + USB_MS_HZ - 1)) / USB_MS_HZ)
-
-/*
- * Common queue structure for USB transfers.
- */
-struct usb_xfer_queue {
-	TAILQ_HEAD(, usb_xfer) head;
-	struct usb_xfer *curr;		/* current USB transfer processed */
-	void    (*command) (struct usb_xfer_queue *pq);
-	uint8_t	recurse_1:1;
-	uint8_t	recurse_2:1;
-};
-
-/*
- * The following structure defines an USB endpoint
- * USB endpoint.
- */
-struct usb_endpoint {
-	/* queue of USB transfers */
-	struct usb_xfer_queue endpoint_q[USB_MAX_EP_STREAMS];
-
-	struct usb_endpoint_descriptor *edesc;
-	struct usb_endpoint_ss_comp_descriptor *ecomp;
-	struct usb_pipe_methods *methods;	/* set by HC driver */
-
-	uint16_t isoc_next;
-
-	uint8_t	toggle_next:1;		/* next data toggle value */
-	uint8_t	is_stalled:1;		/* set if endpoint is stalled */
-	uint8_t	is_synced:1;		/* set if we a synchronised */
-	uint8_t	unused:5;
-	uint8_t	iface_index;		/* not used by "default endpoint" */
-
-	uint8_t refcount_alloc;		/* allocation refcount */
-	uint8_t refcount_bw;		/* bandwidth refcount */
-#define	USB_EP_REF_MAX 0x3f
-
-	/* High-Speed resource allocation (valid if "refcount_bw" > 0) */
-
-	uint8_t	usb_smask;		/* USB start mask */
-	uint8_t	usb_cmask;		/* USB complete mask */
-	uint8_t	usb_uframe;		/* USB microframe */
-
-	/* USB endpoint mode, see USB_EP_MODE_XXX */
-
-	uint8_t ep_mode;
-};
-
-/*
- * The following structure defines an USB interface.
- */
-struct usb_interface {
-	struct usb_interface_descriptor *idesc;
-	device_t subdev;
-	uint8_t	alt_index;
-	uint8_t	parent_iface_index;
-
-	/* Linux compat */
-	struct usb_host_interface *altsetting;
-	struct usb_host_interface *cur_altsetting;
-	struct usb_device *linux_udev;
-	void   *bsd_priv_sc;		/* device specific information */
-	char   *pnpinfo;		/* additional PnP-info for this interface */
-	uint8_t	num_altsetting;		/* number of alternate settings */
-	uint8_t	bsd_iface_index;
-};
-
-/*
- * The following structure defines a set of USB transfer flags.
- */
-struct usb_xfer_flags {
-	uint8_t	force_short_xfer:1;	/* force a short transmit transfer
-					 * last */
-	uint8_t	short_xfer_ok:1;	/* allow short receive transfers */
-	uint8_t	short_frames_ok:1;	/* allow short frames */
-	uint8_t	pipe_bof:1;		/* block pipe on failure */
-	uint8_t	proxy_buffer:1;		/* makes buffer size a factor of
-					 * "max_frame_size" */
-	uint8_t	ext_buffer:1;		/* uses external DMA buffer */
-	uint8_t	manual_status:1;	/* non automatic status stage on
-					 * control transfers */
-	uint8_t	no_pipe_ok:1;		/* set if "USB_ERR_NO_PIPE" error can
-					 * be ignored */
-	uint8_t	stall_pipe:1;		/* set if the endpoint belonging to
-					 * this USB transfer should be stalled
-					 * before starting this transfer! */
-	uint8_t pre_scale_frames:1;	/* "usb_config->frames" is
-					 * assumed to give the
-					 * buffering time in
-					 * milliseconds and is
-					 * converted into the nearest
-					 * number of frames when the
-					 * USB transfer is setup. This
-					 * option only has effect for
-					 * ISOCHRONOUS transfers.
-					 */
-};
-
-/*
- * The following structure define an USB configuration, that basically
- * is used when setting up an USB transfer.
- */
-struct usb_config {
-	usb_callback_t *callback;	/* USB transfer callback */
-	usb_frlength_t bufsize;	/* total pipe buffer size in bytes */
-	usb_frcount_t frames;		/* maximum number of USB frames */
-	usb_timeout_t interval;	/* interval in milliseconds */
-#define	USB_DEFAULT_INTERVAL	0
-	usb_timeout_t timeout;		/* transfer timeout in milliseconds */
-	struct usb_xfer_flags flags;	/* transfer flags */
-	usb_stream_t stream_id;		/* USB3.0 specific */
-	enum usb_hc_mode usb_mode;	/* host or device mode */
-	uint8_t	type;			/* pipe type */
-	uint8_t	endpoint;		/* pipe number */
-	uint8_t	direction;		/* pipe direction */
-	uint8_t	ep_index;		/* pipe index match to use */
-	uint8_t	if_index;		/* "ifaces" index to use */
-};
-
-/*
- * Use these macro when defining USB device ID arrays if you want to
- * have your driver module automatically loaded in host, device or
- * both modes respectivly:
- */
-#if USB_HAVE_ID_SECTION
-#define	STRUCT_USB_HOST_ID \
-    struct usb_device_id __section("usb_host_id")
-#define	STRUCT_USB_DEVICE_ID \
-    struct usb_device_id __section("usb_device_id")
-#define	STRUCT_USB_DUAL_ID \
-    struct usb_device_id __section("usb_dual_id")
-#else
-#define	STRUCT_USB_HOST_ID \
-    struct usb_device_id
-#define	STRUCT_USB_DEVICE_ID \
-    struct usb_device_id
-#define	STRUCT_USB_DUAL_ID \
-    struct usb_device_id
-#endif			/* USB_HAVE_ID_SECTION */
-
-/*
- * The following structure is used when looking up an USB driver for
- * an USB device. It is inspired by the Linux structure called
- * "usb_device_id".
- */
-struct usb_device_id {
-
-	/* Hook for driver specific information */
-	unsigned long driver_info;
-
-	/* Used for product specific matches; the BCD range is inclusive */
-	uint16_t idVendor;
-	uint16_t idProduct;
-	uint16_t bcdDevice_lo;
-	uint16_t bcdDevice_hi;
-
-	/* Used for device class matches */
-	uint8_t	bDeviceClass;
-	uint8_t	bDeviceSubClass;
-	uint8_t	bDeviceProtocol;
-
-	/* Used for interface class matches */
-	uint8_t	bInterfaceClass;
-	uint8_t	bInterfaceSubClass;
-	uint8_t	bInterfaceProtocol;
-
-	/* Select which fields to match against */
-	uint8_t	match_flag_vendor:1;
-	uint8_t	match_flag_product:1;
-	uint8_t	match_flag_dev_lo:1;
-	uint8_t	match_flag_dev_hi:1;
-
-	uint8_t	match_flag_dev_class:1;
-	uint8_t	match_flag_dev_subclass:1;
-	uint8_t	match_flag_dev_protocol:1;
-	uint8_t	match_flag_int_class:1;
-
-	uint8_t	match_flag_int_subclass:1;
-	uint8_t	match_flag_int_protocol:1;
-	uint8_t match_flag_unused:6;
-
-#if USB_HAVE_COMPAT_LINUX
-	/* which fields to match against */
-	uint16_t match_flags;
-#define	USB_DEVICE_ID_MATCH_VENDOR		0x0001
-#define	USB_DEVICE_ID_MATCH_PRODUCT		0x0002
-#define	USB_DEVICE_ID_MATCH_DEV_LO		0x0004
-#define	USB_DEVICE_ID_MATCH_DEV_HI		0x0008
-#define	USB_DEVICE_ID_MATCH_DEV_CLASS		0x0010
-#define	USB_DEVICE_ID_MATCH_DEV_SUBCLASS	0x0020
-#define	USB_DEVICE_ID_MATCH_DEV_PROTOCOL	0x0040
-#define	USB_DEVICE_ID_MATCH_INT_CLASS		0x0080
-#define	USB_DEVICE_ID_MATCH_INT_SUBCLASS	0x0100
-#define	USB_DEVICE_ID_MATCH_INT_PROTOCOL	0x0200
-#endif
-} __aligned(32);
-
-/* check that the size of the structure above is correct */
-extern char usb_device_id_assert[(sizeof(struct usb_device_id) == 32) ? 1 : -1];
-
-#define	USB_VENDOR(vend)			\
-  .match_flag_vendor = 1, .idVendor = (vend)
-
-#define	USB_PRODUCT(prod)			\
-  .match_flag_product = 1, .idProduct = (prod)
-
-#define	USB_VP(vend,prod)			\
-  USB_VENDOR(vend), USB_PRODUCT(prod)
-
-#define	USB_VPI(vend,prod,info)			\
-  USB_VENDOR(vend), USB_PRODUCT(prod), USB_DRIVER_INFO(info)
-
-#define	USB_DEV_BCD_GTEQ(lo)	/* greater than or equal */ \
-  .match_flag_dev_lo = 1, .bcdDevice_lo = (lo)
-
-#define	USB_DEV_BCD_LTEQ(hi)	/* less than or equal */ \
-  .match_flag_dev_hi = 1, .bcdDevice_hi = (hi)
-
-#define	USB_DEV_CLASS(dc)			\
-  .match_flag_dev_class = 1, .bDeviceClass = (dc)
-
-#define	USB_DEV_SUBCLASS(dsc)			\
-  .match_flag_dev_subclass = 1, .bDeviceSubClass = (dsc)
-
-#define	USB_DEV_PROTOCOL(dp)			\
-  .match_flag_dev_protocol = 1, .bDeviceProtocol = (dp)
-
-#define	USB_IFACE_CLASS(ic)			\
-  .match_flag_int_class = 1, .bInterfaceClass = (ic)
-
-#define	USB_IFACE_SUBCLASS(isc)			\
-  .match_flag_int_subclass = 1, .bInterfaceSubClass = (isc)
-
-#define	USB_IFACE_PROTOCOL(ip)			\
-  .match_flag_int_protocol = 1, .bInterfaceProtocol = (ip)
-
-#define	USB_IF_CSI(class,subclass,info)			\
-  USB_IFACE_CLASS(class), USB_IFACE_SUBCLASS(subclass), USB_DRIVER_INFO(info)
-
-#define	USB_DRIVER_INFO(n)			\
-  .driver_info = (n)
-
-#define	USB_GET_DRIVER_INFO(did)		\
-  (did)->driver_info
-
-/*
- * The following structure keeps information that is used to match
- * against an array of "usb_device_id" elements.
- */
-struct usbd_lookup_info {
-	uint16_t idVendor;
-	uint16_t idProduct;
-	uint16_t bcdDevice;
-	uint8_t	bDeviceClass;
-	uint8_t	bDeviceSubClass;
-	uint8_t	bDeviceProtocol;
-	uint8_t	bInterfaceClass;
-	uint8_t	bInterfaceSubClass;
-	uint8_t	bInterfaceProtocol;
-	uint8_t	bIfaceIndex;
-	uint8_t	bIfaceNum;
-	uint8_t	bConfigIndex;
-	uint8_t	bConfigNum;
-};
-
-/* Structure used by probe and attach */
-
-struct usb_attach_arg {
-	struct usbd_lookup_info info;
-	device_t temp_dev;		/* for internal use */
-	unsigned long driver_info;	/* for internal use */
-	void *driver_ivar;
-	struct usb_device *device;	/* current device */
-	struct usb_interface *iface;	/* current interface */
-	enum usb_hc_mode usb_mode;	/* host or device mode */
-	uint8_t	port;
-	uint8_t dev_state;
-#define UAA_DEV_READY		0
-#define UAA_DEV_DISABLED	1
-#define UAA_DEV_EJECTING	2
-};
-
-/*
- * The following is a wrapper for the callout structure to ease
- * porting the code to other platforms.
- */
-struct usb_callout {
-	struct callout co;
-};
-#define	usb_callout_init_mtx(c,m,f) callout_init_mtx(&(c)->co,m,f)
-#define	usb_callout_reset(c,t,f,d) callout_reset(&(c)->co,t,f,d)
-#define	usb_callout_stop(c) callout_stop(&(c)->co)
-#define	usb_callout_drain(c) callout_drain(&(c)->co)
-#define	usb_callout_pending(c) callout_pending(&(c)->co)
-
-/* USB transfer states */
-
-#define	USB_ST_SETUP       0
-#define	USB_ST_TRANSFERRED 1
-#define	USB_ST_ERROR       2
-
-/* USB handle request states */
-#define	USB_HR_NOT_COMPLETE	0
-#define	USB_HR_COMPLETE_OK	1
-#define	USB_HR_COMPLETE_ERR	2
-
-/*
- * The following macro will return the current state of an USB
- * transfer like defined by the "USB_ST_XXX" enums.
- */
-#define	USB_GET_STATE(xfer) (usbd_xfer_state(xfer))
-
-/*
- * The following structure defines the USB process message header.
- */
-struct usb_proc_msg {
-	TAILQ_ENTRY(usb_proc_msg) pm_qentry;
-	usb_proc_callback_t *pm_callback;
-	usb_size_t pm_num;
-};
-
-#define	USB_FIFO_TX 0
-#define	USB_FIFO_RX 1
-
-/*
- * Locking note for the following functions.  All the
- * "usb_fifo_cmd_t" and "usb_fifo_filter_t" functions are called
- * locked. The others are called unlocked.
- */
-struct usb_fifo_methods {
-	usb_fifo_open_t *f_open;
-	usb_fifo_close_t *f_close;
-	usb_fifo_ioctl_t *f_ioctl;
-	/*
-	 * NOTE: The post-ioctl callback is called after the USB reference
-	 * gets locked in the IOCTL handler:
-	 */
-	usb_fifo_ioctl_t *f_ioctl_post;
-	usb_fifo_cmd_t *f_start_read;
-	usb_fifo_cmd_t *f_stop_read;
-	usb_fifo_cmd_t *f_start_write;
-	usb_fifo_cmd_t *f_stop_write;
-	usb_fifo_filter_t *f_filter_read;
-	usb_fifo_filter_t *f_filter_write;
-	const char *basename[4];
-	const char *postfix[4];
-};
-
-struct usb_fifo_sc {
-	struct usb_fifo *fp[2];
-	struct usb_fs_privdata *dev;
-};
-
-const char *usbd_errstr(usb_error_t error);
-void	*usbd_find_descriptor(struct usb_device *udev, void *id,
-	    uint8_t iface_index, uint8_t type, uint8_t type_mask,
-	    uint8_t subtype, uint8_t subtype_mask);
-struct usb_config_descriptor *usbd_get_config_descriptor(
-	    struct usb_device *udev);
-struct usb_device_descriptor *usbd_get_device_descriptor(
-	    struct usb_device *udev);
-struct usb_interface *usbd_get_iface(struct usb_device *udev,
-	    uint8_t iface_index);
-struct usb_interface_descriptor *usbd_get_interface_descriptor(
-	    struct usb_interface *iface);
-struct usb_endpoint *usbd_get_endpoint(struct usb_device *udev, uint8_t iface_index,
-		    const struct usb_config *setup);
-struct usb_endpoint *usbd_get_ep_by_addr(struct usb_device *udev, uint8_t ea_val);
-usb_error_t	usbd_interface_count(struct usb_device *udev, uint8_t *count);
-enum usb_hc_mode usbd_get_mode(struct usb_device *udev);
-enum usb_dev_speed usbd_get_speed(struct usb_device *udev);
-void	device_set_usb_desc(device_t dev);
-void	usb_pause_mtx(struct mtx *mtx, int _ticks);
-usb_error_t	usbd_set_pnpinfo(struct usb_device *udev,
-			uint8_t iface_index, const char *pnpinfo);
-usb_error_t	usbd_add_dynamic_quirk(struct usb_device *udev,
-			uint16_t quirk);
-usb_error_t	usbd_set_endpoint_mode(struct usb_device *udev,
-			struct usb_endpoint *ep, uint8_t ep_mode);
-uint8_t		usbd_get_endpoint_mode(struct usb_device *udev,
-			struct usb_endpoint *ep);
-
-const struct usb_device_id *usbd_lookup_id_by_info(
-	    const struct usb_device_id *id, usb_size_t sizeof_id,
-	    const struct usbd_lookup_info *info);
-int	usbd_lookup_id_by_uaa(const struct usb_device_id *id,
-	    usb_size_t sizeof_id, struct usb_attach_arg *uaa);
-
-usb_error_t usbd_do_request_flags(struct usb_device *udev, struct mtx *mtx,
-		    struct usb_device_request *req, void *data, uint16_t flags,
-		    uint16_t *actlen, usb_timeout_t timeout);
-#define	usbd_do_request(u,m,r,d) \
-  usbd_do_request_flags(u,m,r,d,0,NULL,USB_DEFAULT_TIMEOUT)
-
-uint8_t	usbd_clear_stall_callback(struct usb_xfer *xfer1,
-	    struct usb_xfer *xfer2);
-uint8_t	usbd_get_interface_altindex(struct usb_interface *iface);
-usb_error_t usbd_set_alt_interface_index(struct usb_device *udev,
-	    uint8_t iface_index, uint8_t alt_index);
-uint32_t usbd_get_isoc_fps(struct usb_device *udev);
-usb_error_t usbd_transfer_setup(struct usb_device *udev,
-	    const uint8_t *ifaces, struct usb_xfer **pxfer,
-	    const struct usb_config *setup_start, uint16_t n_setup,
-	    void *priv_sc, struct mtx *priv_mtx);
-void	usbd_transfer_submit(struct usb_xfer *xfer);
-void	usbd_transfer_clear_stall(struct usb_xfer *xfer);
-void	usbd_transfer_drain(struct usb_xfer *xfer);
-uint8_t	usbd_transfer_pending(struct usb_xfer *xfer);
-void	usbd_transfer_start(struct usb_xfer *xfer);
-void	usbd_transfer_stop(struct usb_xfer *xfer);
-void	usbd_transfer_unsetup(struct usb_xfer **pxfer, uint16_t n_setup);
-void	usbd_transfer_poll(struct usb_xfer **ppxfer, uint16_t max);
-void	usbd_set_parent_iface(struct usb_device *udev, uint8_t iface_index,
-	    uint8_t parent_index);
-uint8_t	usbd_get_bus_index(struct usb_device *udev);
-uint8_t	usbd_get_device_index(struct usb_device *udev);
-void	usbd_set_power_mode(struct usb_device *udev, uint8_t power_mode);
-uint8_t	usbd_filter_power_mode(struct usb_device *udev, uint8_t power_mode);
-uint8_t	usbd_device_attached(struct usb_device *udev);
-
-usb_frlength_t
-	usbd_xfer_old_frame_length(struct usb_xfer *xfer, usb_frcount_t frindex);
-void	usbd_xfer_status(struct usb_xfer *xfer, int *actlen, int *sumlen,
-	    int *aframes, int *nframes);
-struct usb_page_cache *usbd_xfer_get_frame(struct usb_xfer *, usb_frcount_t);
-void	*usbd_xfer_get_frame_buffer(struct usb_xfer *, usb_frcount_t);
-void	*usbd_xfer_softc(struct usb_xfer *xfer);
-void	*usbd_xfer_get_priv(struct usb_xfer *xfer);
-void	usbd_xfer_set_priv(struct usb_xfer *xfer, void *);
-void	usbd_xfer_set_interval(struct usb_xfer *xfer, int);
-uint8_t	usbd_xfer_state(struct usb_xfer *xfer);
-void	usbd_xfer_set_frame_data(struct usb_xfer *xfer, usb_frcount_t frindex,
-	    void *ptr, usb_frlength_t len);
-void	usbd_xfer_frame_data(struct usb_xfer *xfer, usb_frcount_t frindex,
-	    void **ptr, int *len);
-void	usbd_xfer_set_frame_offset(struct usb_xfer *xfer, usb_frlength_t offset,
-	    usb_frcount_t frindex);
-usb_frlength_t usbd_xfer_max_len(struct usb_xfer *xfer);
-usb_frlength_t usbd_xfer_max_framelen(struct usb_xfer *xfer);
-usb_frcount_t usbd_xfer_max_frames(struct usb_xfer *xfer);
-uint8_t	usbd_xfer_get_fps_shift(struct usb_xfer *xfer);
-usb_frlength_t usbd_xfer_frame_len(struct usb_xfer *xfer,
-	    usb_frcount_t frindex);
-void	usbd_xfer_set_frame_len(struct usb_xfer *xfer, usb_frcount_t frindex,
-	    usb_frlength_t len);
-void	usbd_xfer_set_timeout(struct usb_xfer *xfer, int timeout);
-void	usbd_xfer_set_frames(struct usb_xfer *xfer, usb_frcount_t n);
-void	usbd_xfer_set_stall(struct usb_xfer *xfer);
-int	usbd_xfer_is_stalled(struct usb_xfer *xfer);
-void	usbd_xfer_set_flag(struct usb_xfer *xfer, int flag);
-void	usbd_xfer_clr_flag(struct usb_xfer *xfer, int flag);
-uint16_t usbd_xfer_get_timestamp(struct usb_xfer *xfer);
-uint8_t usbd_xfer_maxp_was_clamped(struct usb_xfer *xfer);
-
-void	usbd_copy_in(struct usb_page_cache *cache, usb_frlength_t offset,
-	    const void *ptr, usb_frlength_t len);
-int	usbd_copy_in_user(struct usb_page_cache *cache, usb_frlength_t offset,
-	    const void *ptr, usb_frlength_t len);
-void	usbd_copy_out(struct usb_page_cache *cache, usb_frlength_t offset,
-	    void *ptr, usb_frlength_t len);
-int	usbd_copy_out_user(struct usb_page_cache *cache, usb_frlength_t offset,
-	    void *ptr, usb_frlength_t len);
-void	usbd_get_page(struct usb_page_cache *pc, usb_frlength_t offset,
-	    struct usb_page_search *res);
-void	usbd_m_copy_in(struct usb_page_cache *cache, usb_frlength_t dst_offset,
-	    struct mbuf *m, usb_size_t src_offset, usb_frlength_t src_len);
-void	usbd_frame_zero(struct usb_page_cache *cache, usb_frlength_t offset,
-	    usb_frlength_t len);
-void	usbd_start_re_enumerate(struct usb_device *udev);
-usb_error_t
-	usbd_start_set_config(struct usb_device *, uint8_t);
-
-int	usb_fifo_attach(struct usb_device *udev, void *priv_sc,
-	    struct mtx *priv_mtx, struct usb_fifo_methods *pm,
-	    struct usb_fifo_sc *f_sc, uint16_t unit, int16_t subunit,
-	    uint8_t iface_index, uid_t uid, gid_t gid, int mode);
-void	usb_fifo_detach(struct usb_fifo_sc *f_sc);
-int	usb_fifo_alloc_buffer(struct usb_fifo *f, uint32_t bufsize,
-	    uint16_t nbuf);
-void	usb_fifo_free_buffer(struct usb_fifo *f);
-uint32_t usb_fifo_put_bytes_max(struct usb_fifo *fifo);
-void	usb_fifo_put_data(struct usb_fifo *fifo, struct usb_page_cache *pc,
-	    usb_frlength_t offset, usb_frlength_t len, uint8_t what);
-void	usb_fifo_put_data_linear(struct usb_fifo *fifo, void *ptr,
-	    usb_size_t len, uint8_t what);
-uint8_t	usb_fifo_put_data_buffer(struct usb_fifo *f, void *ptr, usb_size_t len);
-void	usb_fifo_put_data_error(struct usb_fifo *fifo);
-uint8_t	usb_fifo_get_data(struct usb_fifo *fifo, struct usb_page_cache *pc,
-	    usb_frlength_t offset, usb_frlength_t len, usb_frlength_t *actlen,
-	    uint8_t what);
-uint8_t	usb_fifo_get_data_linear(struct usb_fifo *fifo, void *ptr,
-	    usb_size_t len, usb_size_t *actlen, uint8_t what);
-uint8_t	usb_fifo_get_data_buffer(struct usb_fifo *f, void **pptr,
-	    usb_size_t *plen);
-void	usb_fifo_reset(struct usb_fifo *f);
-void	usb_fifo_wakeup(struct usb_fifo *f);
-void	usb_fifo_get_data_error(struct usb_fifo *fifo);
-void	*usb_fifo_softc(struct usb_fifo *fifo);
-void	usb_fifo_set_close_zlp(struct usb_fifo *, uint8_t);
-void	usb_fifo_set_write_defrag(struct usb_fifo *, uint8_t);
-void	usb_fifo_free(struct usb_fifo *f);
-#endif /* _KERNEL */
-#endif /* _USB_USBDI_H_ */
diff --git a/include.new/dev/usb/usbdi_util.h b/include.new/dev/usb/usbdi_util.h
deleted file mode 100644
index b3745b2..0000000
--- a/include.new/dev/usb/usbdi_util.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 2009 Andrew Thompson
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/dev/usb/usbdi_util.h 213435 2010-10-04 23:18:05Z hselasky $
- */
-#ifndef _USB_USBDI_UTIL_H_
-#define _USB_USBDI_UTIL_H_
-
-struct cv;
-
-/* structures */
-
-struct usb_idesc_parse_state {
-	struct usb_descriptor *desc;
-	uint8_t iface_index;		/* current interface index */
-	uint8_t iface_no_last;
-	uint8_t iface_index_alt;	/* current alternate setting */
-};
-
-/* prototypes */
-
-usb_error_t usbd_do_request_proc(struct usb_device *udev, struct usb_process *pproc,
-		    struct usb_device_request *req, void *data, uint16_t flags,
-		    uint16_t *actlen, usb_timeout_t timeout);
-
-struct usb_descriptor *usb_desc_foreach(struct usb_config_descriptor *cd,
-	    struct usb_descriptor *desc);
-struct usb_interface_descriptor *usb_idesc_foreach(
-	    struct usb_config_descriptor *cd,
-	    struct usb_idesc_parse_state *ps);
-struct usb_endpoint_descriptor *usb_edesc_foreach(
-	    struct usb_config_descriptor *cd,
-	    struct usb_endpoint_descriptor *ped);
-struct usb_endpoint_ss_comp_descriptor *usb_ed_comp_foreach(
-	    struct usb_config_descriptor *cd,
-	    struct usb_endpoint_ss_comp_descriptor *ped);
-uint8_t usbd_get_no_descriptors(struct usb_config_descriptor *cd,
-	    uint8_t type);
-uint8_t usbd_get_no_alts(struct usb_config_descriptor *cd,
-	    struct usb_interface_descriptor *id);
-
-usb_error_t usbd_req_get_report(struct usb_device *udev, struct mtx *mtx,
-		    void *data, uint16_t len, uint8_t iface_index, uint8_t type,
-		    uint8_t id);
-usb_error_t usbd_req_get_report_descriptor(struct usb_device *udev,
-		    struct mtx *mtx, void *d, uint16_t size,
-		    uint8_t iface_index);
-usb_error_t usbd_req_get_string_any(struct usb_device *udev, struct mtx *mtx,
-		    char *buf, uint16_t len, uint8_t string_index);
-usb_error_t usbd_req_get_string_desc(struct usb_device *udev, struct mtx *mtx,
-		    void *sdesc, uint16_t max_len, uint16_t lang_id,
-		    uint8_t string_index);
-usb_error_t usbd_req_set_config(struct usb_device *udev, struct mtx *mtx,
-		    uint8_t conf);
-usb_error_t usbd_req_set_alt_interface_no(struct usb_device *udev,
-		    struct mtx *mtx, uint8_t iface_index, uint8_t alt_no);
-usb_error_t usbd_req_set_idle(struct usb_device *udev, struct mtx *mtx,
-		    uint8_t iface_index, uint8_t duration, uint8_t id);
-usb_error_t usbd_req_set_protocol(struct usb_device *udev, struct mtx *mtx,
-		    uint8_t iface_index, uint16_t report);
-usb_error_t usbd_req_set_report(struct usb_device *udev, struct mtx *mtx,
-		    void *data, uint16_t len, uint8_t iface_index,
-		    uint8_t type, uint8_t id);
-
-/* The following functions will not return NULL strings. */
-
-const char *usb_get_manufacturer(struct usb_device *);
-const char *usb_get_product(struct usb_device *);
-const char *usb_get_serial(struct usb_device *);
-
-#endif /* _USB_USBDI_UTIL_H_ */
diff --git a/include.new/dev/usb/usbdivar.h b/include.new/dev/usb/usbdivar.h
deleted file mode 100644
index 217bcde..0000000
--- a/include.new/dev/usb/usbdivar.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*	$NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $	*/
-/*	$FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.43.2.1 2006/03/01 01:59:05 iedowse Exp $	*/
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Lennart Augustsson (lennart@augustsson.net) at
- * Carlstedt Research & Technology.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#if defined(__NetBSD__)
-#include <sys/callout.h>
-#endif
-
-/* From usb_mem.h */
-DECLARE_USB_DMA_T;
-
-struct usbd_xfer;
-struct usbd_pipe;
-
-struct usbd_endpoint {
-	usb_endpoint_descriptor_t *edesc;
-	int			refcnt;
-	int			savedtoggle;
-};
-
-struct usbd_bus_methods {
-	usbd_status	      (*open_pipe)(struct usbd_pipe *pipe);
-	void		      (*soft_intr)(void *);
-	void		      (*do_poll)(struct usbd_bus *);
-	usbd_status	      (*allocm)(struct usbd_bus *, usb_dma_t *,
-					uint32_t bufsize);
-	void		      (*freem)(struct usbd_bus *, usb_dma_t *);
-	struct usbd_xfer *    (*allocx)(struct usbd_bus *);
-	void		      (*freex)(struct usbd_bus *, struct usbd_xfer *);
-};
-
-struct usbd_pipe_methods {
-	usbd_status	      (*transfer)(usbd_xfer_handle xfer);
-	usbd_status	      (*start)(usbd_xfer_handle xfer);
-	void		      (*abort)(usbd_xfer_handle xfer);
-	void		      (*close)(usbd_pipe_handle pipe);
-	void		      (*cleartoggle)(usbd_pipe_handle pipe);
-	void		      (*done)(usbd_xfer_handle xfer);
-};
-
-struct usbd_tt {
-	struct usbd_hub		*hub;
-};
-
-struct usbd_port {
-	usb_port_status_t	status;
-	u_int16_t		power;	/* mA of current on port */
-	u_int8_t		portno;
-	u_int8_t		restartcnt;
-#define USBD_RESTART_MAX 5
-	struct usbd_device     *device;	/* Connected device */
-	struct usbd_device     *parent;	/* The ports hub */
-	struct usbd_tt	       *tt; /* Transaction translator (if any) */
-};
-
-struct usbd_hub {
-	usbd_status	      (*explore)(usbd_device_handle hub);
-	void		       *hubsoftc;
-	usb_hub_descriptor_t	hubdesc;
-	struct usbd_port        ports[1];
-};
-
-struct usb_softc;
-
-/*****/
-
-struct usbd_bus {
-	/* Filled by HC driver */
-	USBBASEDEVICE		bdev; /* base device, host adapter */
-	struct usbd_bus_methods	*methods;
-	uint32_t		pipe_size; /* size of a pipe struct */
-	/* Filled by usb driver */
-	struct usbd_device     *root_hub;
-	usbd_device_handle	devices[USB_MAX_DEVICES];
-	char			needs_explore;/* a hub a signalled a change */
-	char			use_polling;
-	struct usb_softc       *usbctl;
-	struct usb_device_stats	stats;
-	int 			intr_context;
-	u_int			no_intrs;
-	int			usbrev;	/* USB revision */
-#define USBREV_UNKNOWN	0
-#define USBREV_PRE_1_0	1
-#define USBREV_1_0	2
-#define USBREV_1_1	3
-#define USBREV_2_0	4
-#define USBREV_STR { "unknown", "pre 1.0", "1.0", "1.1", "2.0" }
-
-#ifdef USB_USE_SOFTINTR
-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
-	void		       *soft; /* soft interrupt cookie */
-#else
-	struct callout		softi;
-#endif
-#endif
-
-	bus_dma_tag_t		dmatag;	/* DMA tag */
-};
-
-struct usbd_device {
-	struct usbd_bus	       *bus;           /* our controller */
-	struct usbd_pipe       *default_pipe;  /* pipe 0 */
-	u_int8_t		address;       /* device addess */
-	u_int8_t		config;	       /* current configuration # */
-	u_int8_t		depth;         /* distance from root hub */
-	u_int8_t		speed;         /* low/full/high speed */
-	u_int8_t		self_powered;  /* flag for self powered */
-	u_int16_t		power;         /* mA the device uses */
-	int16_t			langid;	       /* language for strings */
-#define USBD_NOLANG (-1)
-	usb_event_cookie_t	cookie;	       /* unique connection id */
-	struct usbd_port       *powersrc;      /* upstream hub port, or 0 */
-	struct usbd_device     *myhub;	       /* upstream hub */
-	struct usbd_port       *myhsport;      /* closest high speed port */
-	struct usbd_endpoint	def_ep;	       /* for pipe 0 */
-	usb_endpoint_descriptor_t def_ep_desc; /* for pipe 0 */
-	struct usbd_interface  *ifaces;        /* array of all interfaces */
-	usb_device_descriptor_t ddesc;         /* device descriptor */
-	usb_config_descriptor_t *cdesc;	       /* full config descr */
-	const struct usbd_quirks     *quirks;  /* device quirks, always set */
-	struct usbd_hub	       *hub;           /* only if this is a hub */
-	device_ptr_t	       *subdevs;       /* sub-devices, 0 terminated */
-	uint8_t		       *ifacenums;     /* sub-device interfacenumbers */
-};
-
-struct usbd_interface {
-	struct usbd_device     *device;
-	usb_interface_descriptor_t *idesc;
-	int			index;
-	int			altindex;
-	struct usbd_endpoint   *endpoints;
-	void		       *priv;
-	LIST_HEAD(, usbd_pipe)	pipes;
-};
-
-struct usbd_pipe {
-	struct usbd_interface  *iface;
-	struct usbd_device     *device;
-	struct usbd_endpoint   *endpoint;
-	int			refcnt;
-	char			running;
-	char			aborting;
-	SIMPLEQ_HEAD(, usbd_xfer) queue;
-	LIST_ENTRY(usbd_pipe)	next;
-
-	usbd_xfer_handle	intrxfer; /* used for repeating requests */
-	char			repeat;
-	int			interval;
-
-	/* Filled by HC driver. */
-	struct usbd_pipe_methods *methods;
-};
-
-struct usbd_xfer {
-	struct usbd_pipe       *pipe;
-	void		       *priv;
-	void		       *buffer;
-	uint32_t		length;
-	uint32_t		actlen;
-	u_int16_t		flags;
-	uint32_t		timeout;
-	usbd_status		status;
-	usbd_callback		callback;
-	__volatile char		done;
-#ifdef DIAGNOSTIC
-	uint32_t		busy_free;
-#define XFER_FREE 0x46524545
-#define XFER_BUSY 0x42555359
-#define XFER_ONQU 0x4f4e5155
-#endif
-
-	/* For control pipe */
-	usb_device_request_t	request;
-
-	/* For isoc */
-	u_int16_t		*frlengths;
-	int			nframes;
-
-	/* For memory allocation */
-	struct usbd_device     *device;
-	usb_dma_t		dmabuf;
-
-	int			rqflags;
-#define URQ_REQUEST	0x01
-#define URQ_AUTO_DMABUF	0x10
-#define URQ_DEV_DMABUF	0x20
-
-	SIMPLEQ_ENTRY(usbd_xfer) next;
-
-	void		       *hcpriv; /* private use by the HC driver */
-
-	usb_callout_t		timeout_handle;
-};
-
-void usbd_init(void);
-void usbd_finish(void);
-
-#ifdef USB_DEBUG
-void usbd_dump_iface(struct usbd_interface *iface);
-void usbd_dump_device(struct usbd_device *dev);
-void usbd_dump_endpoint(struct usbd_endpoint *endp);
-void usbd_dump_queue(usbd_pipe_handle pipe);
-void usbd_dump_pipe(usbd_pipe_handle pipe);
-#endif
-
-/* Routines from usb_subr.c */
-int		usbctlprint(void *, const char *);
-void		usb_delay_ms(usbd_bus_handle, u_int);
-usbd_status	usbd_reset_port(usbd_device_handle dev,
-				int port, usb_port_status_t *ps);
-usbd_status	usbd_setup_pipe(usbd_device_handle dev,
-				usbd_interface_handle iface,
-				struct usbd_endpoint *, int,
-				usbd_pipe_handle *pipe);
-usbd_status	usbd_new_device(device_ptr_t parent,
-				usbd_bus_handle bus, int depth,
-				int lowspeed, int port,
-				struct usbd_port *);
-void		usbd_remove_device(usbd_device_handle, struct usbd_port *);
-int		usbd_printBCD(char *cp, int bcd);
-usbd_status	usbd_fill_iface_data(usbd_device_handle dev, int i, int a);
-void		usb_free_device(usbd_device_handle);
-
-usbd_status	usb_insert_transfer(usbd_xfer_handle xfer);
-void		usb_transfer_complete(usbd_xfer_handle xfer);
-void		usb_disconnect_port(struct usbd_port *up, device_ptr_t);
-
-/* Routines from usb.c */
-void		usb_needs_explore(usbd_device_handle);
-void		usb_schedsoftintr(struct usbd_bus *);
-
-/*
- * XXX This check is extremely bogus. Bad Bad Bad.
- */
-#if defined(DIAGNOSTIC) && 0
-#define SPLUSBCHECK \
-	do { int _s = splusb(), _su = splusb(); \
-             if (!cold && _s != _su) printf("SPLUSBCHECK failed 0x%x!=0x%x, %s:%d\n", \
-				   _s, _su, __FILE__, __LINE__); \
-	     splx(_s); \
-        } while (0)
-#else
-#define SPLUSBCHECK
-#endif
-
-/* Locator stuff. */
-
-#if defined(__NetBSD__)
-#include "locators.h"
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
-/* XXX these values are used to statically bind some elements in the USB tree
- * to specific driver instances. This should be somehow emulated in FreeBSD
- * but can be done later on.
- * The values are copied from the files.usb file in the NetBSD sources.
- */
-#define UHUBCF_PORT_DEFAULT -1
-#define UHUBCF_CONFIGURATION_DEFAULT -1
-#define UHUBCF_INTERFACE_DEFAULT -1
-#define UHUBCF_VENDOR_DEFAULT -1
-#define UHUBCF_PRODUCT_DEFAULT -1
-#define UHUBCF_RELEASE_DEFAULT -1
-#endif
-
-#if defined (__OpenBSD__)
-#define	UHUBCF_PORT		0
-#define	UHUBCF_CONFIGURATION	1
-#define	UHUBCF_INTERFACE	2
-#define	UHUBCF_VENDOR		3
-#define	UHUBCF_PRODUCT		4
-#define	UHUBCF_RELEASE		5
-#endif
-
-#define	uhubcf_port		cf_loc[UHUBCF_PORT]
-#define	uhubcf_configuration	cf_loc[UHUBCF_CONFIGURATION]
-#define	uhubcf_interface	cf_loc[UHUBCF_INTERFACE]
-#define	uhubcf_vendor		cf_loc[UHUBCF_VENDOR]
-#define	uhubcf_product		cf_loc[UHUBCF_PRODUCT]
-#define	uhubcf_release		cf_loc[UHUBCF_RELEASE]
-#define	UHUB_UNK_PORT		UHUBCF_PORT_DEFAULT /* wildcarded 'port' */
-#define	UHUB_UNK_CONFIGURATION	UHUBCF_CONFIGURATION_DEFAULT /* wildcarded 'configuration' */
-#define	UHUB_UNK_INTERFACE	UHUBCF_INTERFACE_DEFAULT /* wildcarded 'interface' */
-#define	UHUB_UNK_VENDOR		UHUBCF_VENDOR_DEFAULT /* wildcarded 'vendor' */
-#define	UHUB_UNK_PRODUCT	UHUBCF_PRODUCT_DEFAULT /* wildcarded 'product' */
-#define	UHUB_UNK_RELEASE	UHUBCF_RELEASE_DEFAULT /* wildcarded 'release' */
-
diff --git a/include.new/dev/usb/usbhid.h b/include.new/dev/usb/usbhid.h
deleted file mode 100644
index 1b30164..0000000
--- a/include.new/dev/usb/usbhid.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/dev/usb/usbhid.h 246122 2013-01-30 15:26:04Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
- * Copyright (c) 1998 Lennart Augustsson. 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.
- *
- * 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.
- */
-
-#ifndef _USB_HID_H_
-#define	_USB_HID_H_
-
-#ifndef USB_GLOBAL_INCLUDE_FILE
-#include <dev/usb/usb_endian.h>
-#endif
-
-#define	UR_GET_HID_DESCRIPTOR	0x06
-#define	UDESC_HID		0x21
-#define	UDESC_REPORT		0x22
-#define	UDESC_PHYSICAL		0x23
-#define	UR_SET_HID_DESCRIPTOR	0x07
-#define	UR_GET_REPORT		0x01
-#define	UR_SET_REPORT		0x09
-#define	UR_GET_IDLE		0x02
-#define	UR_SET_IDLE		0x0a
-#define	UR_GET_PROTOCOL		0x03
-#define	UR_SET_PROTOCOL		0x0b
-
-struct usb_hid_descriptor {
-	uByte	bLength;
-	uByte	bDescriptorType;
-	uWord	bcdHID;
-	uByte	bCountryCode;
-	uByte	bNumDescriptors;
-	struct {
-		uByte	bDescriptorType;
-		uWord	wDescriptorLength;
-	}	descrs[1];
-} __packed;
-
-#define	USB_HID_DESCRIPTOR_SIZE(n) (9+((n)*3))
-
-/* Usage pages */
-#define	HUP_UNDEFINED		0x0000
-#define	HUP_GENERIC_DESKTOP	0x0001
-#define	HUP_SIMULATION		0x0002
-#define	HUP_VR_CONTROLS		0x0003
-#define	HUP_SPORTS_CONTROLS	0x0004
-#define	HUP_GAMING_CONTROLS	0x0005
-#define	HUP_KEYBOARD		0x0007
-#define	HUP_LEDS		0x0008
-#define	HUP_BUTTON		0x0009
-#define	HUP_ORDINALS		0x000a
-#define	HUP_TELEPHONY		0x000b
-#define	HUP_CONSUMER		0x000c
-#define	HUP_DIGITIZERS		0x000d
-#define	HUP_PHYSICAL_IFACE	0x000e
-#define	HUP_UNICODE		0x0010
-#define	HUP_ALPHANUM_DISPLAY	0x0014
-#define	HUP_MONITOR		0x0080
-#define	HUP_MONITOR_ENUM_VAL	0x0081
-#define	HUP_VESA_VC		0x0082
-#define	HUP_VESA_CMD		0x0083
-#define	HUP_POWER		0x0084
-#define	HUP_BATTERY_SYSTEM	0x0085
-#define	HUP_BARCODE_SCANNER	0x008b
-#define	HUP_SCALE		0x008c
-#define	HUP_CAMERA_CONTROL	0x0090
-#define	HUP_ARCADE		0x0091
-#define	HUP_MICROSOFT		0xff00
-
-/* Usages, generic desktop */
-#define	HUG_POINTER		0x0001
-#define	HUG_MOUSE		0x0002
-#define	HUG_JOYSTICK		0x0004
-#define	HUG_GAME_PAD		0x0005
-#define	HUG_KEYBOARD		0x0006
-#define	HUG_KEYPAD		0x0007
-#define	HUG_X			0x0030
-#define	HUG_Y			0x0031
-#define	HUG_Z			0x0032
-#define	HUG_RX			0x0033
-#define	HUG_RY			0x0034
-#define	HUG_RZ			0x0035
-#define	HUG_SLIDER		0x0036
-#define	HUG_DIAL		0x0037
-#define	HUG_WHEEL		0x0038
-#define	HUG_HAT_SWITCH		0x0039
-#define	HUG_COUNTED_BUFFER	0x003a
-#define	HUG_BYTE_COUNT		0x003b
-#define	HUG_MOTION_WAKEUP	0x003c
-#define	HUG_VX			0x0040
-#define	HUG_VY			0x0041
-#define	HUG_VZ			0x0042
-#define	HUG_VBRX		0x0043
-#define	HUG_VBRY		0x0044
-#define	HUG_VBRZ		0x0045
-#define	HUG_VNO			0x0046
-#define	HUG_TWHEEL		0x0048	/* M$ Wireless Intellimouse Wheel */
-#define	HUG_SYSTEM_CONTROL	0x0080
-#define	HUG_SYSTEM_POWER_DOWN	0x0081
-#define	HUG_SYSTEM_SLEEP	0x0082
-#define	HUG_SYSTEM_WAKEUP	0x0083
-#define	HUG_SYSTEM_CONTEXT_MENU	0x0084
-#define	HUG_SYSTEM_MAIN_MENU	0x0085
-#define	HUG_SYSTEM_APP_MENU	0x0086
-#define	HUG_SYSTEM_MENU_HELP	0x0087
-#define	HUG_SYSTEM_MENU_EXIT	0x0088
-#define	HUG_SYSTEM_MENU_SELECT	0x0089
-#define	HUG_SYSTEM_MENU_RIGHT	0x008a
-#define	HUG_SYSTEM_MENU_LEFT	0x008b
-#define	HUG_SYSTEM_MENU_UP	0x008c
-#define	HUG_SYSTEM_MENU_DOWN	0x008d
-#define	HUG_APPLE_EJECT		0x00b8
-
-/* Usages Digitizers */
-#define	HUD_UNDEFINED		0x0000
-#define	HUD_TIP_PRESSURE	0x0030
-#define	HUD_BARREL_PRESSURE	0x0031
-#define	HUD_IN_RANGE		0x0032
-#define	HUD_TOUCH		0x0033
-#define	HUD_UNTOUCH		0x0034
-#define	HUD_TAP			0x0035
-#define	HUD_QUALITY		0x0036
-#define	HUD_DATA_VALID		0x0037
-#define	HUD_TRANSDUCER_INDEX	0x0038
-#define	HUD_TABLET_FKEYS	0x0039
-#define	HUD_PROGRAM_CHANGE_KEYS	0x003a
-#define	HUD_BATTERY_STRENGTH	0x003b
-#define	HUD_INVERT		0x003c
-#define	HUD_X_TILT		0x003d
-#define	HUD_Y_TILT		0x003e
-#define	HUD_AZIMUTH		0x003f
-#define	HUD_ALTITUDE		0x0040
-#define	HUD_TWIST		0x0041
-#define	HUD_TIP_SWITCH		0x0042
-#define	HUD_SEC_TIP_SWITCH	0x0043
-#define	HUD_BARREL_SWITCH	0x0044
-#define	HUD_ERASER		0x0045
-#define	HUD_TABLET_PICK		0x0046
-
-/* Usages, Consumer */
-#define	HUC_AC_PAN		0x0238
-
-#define	HID_USAGE2(p,u) (((p) << 16) | (u))
-
-#define	UHID_INPUT_REPORT 0x01
-#define	UHID_OUTPUT_REPORT 0x02
-#define	UHID_FEATURE_REPORT 0x03
-
-/* Bits in the input/output/feature items */
-#define	HIO_CONST	0x001
-#define	HIO_VARIABLE	0x002
-#define	HIO_RELATIVE	0x004
-#define	HIO_WRAP	0x008
-#define	HIO_NONLINEAR	0x010
-#define	HIO_NOPREF	0x020
-#define	HIO_NULLSTATE	0x040
-#define	HIO_VOLATILE	0x080
-#define	HIO_BUFBYTES	0x100
-
-#ifdef _KERNEL
-struct usb_config_descriptor;
-
-enum hid_kind {
-	hid_input, hid_output, hid_feature, hid_collection, hid_endcollection
-};
-
-struct hid_location {
-	uint32_t size;
-	uint32_t count;
-	uint32_t pos;
-};
-
-struct hid_item {
-	/* Global */
-	int32_t	_usage_page;
-	int32_t	logical_minimum;
-	int32_t	logical_maximum;
-	int32_t	physical_minimum;
-	int32_t	physical_maximum;
-	int32_t	unit_exponent;
-	int32_t	unit;
-	int32_t	report_ID;
-	/* Local */
-	int32_t	usage;
-	int32_t	usage_minimum;
-	int32_t	usage_maximum;
-	int32_t	designator_index;
-	int32_t	designator_minimum;
-	int32_t	designator_maximum;
-	int32_t	string_index;
-	int32_t	string_minimum;
-	int32_t	string_maximum;
-	int32_t	set_delimiter;
-	/* Misc */
-	int32_t	collection;
-	int	collevel;
-	enum hid_kind kind;
-	uint32_t flags;
-	/* Location */
-	struct hid_location loc;
-};
-
-/* prototypes from "usb_hid.c" */
-
-struct hid_data *hid_start_parse(const void *d, usb_size_t len, int kindset);
-void	hid_end_parse(struct hid_data *s);
-int	hid_get_item(struct hid_data *s, struct hid_item *h);
-int	hid_report_size(const void *buf, usb_size_t len, enum hid_kind k,
-	    uint8_t *id);
-int	hid_locate(const void *desc, usb_size_t size, int32_t usage,
-	    enum hid_kind kind, uint8_t index, struct hid_location *loc,
-	    uint32_t *flags, uint8_t *id);
-int32_t hid_get_data(const uint8_t *buf, usb_size_t len,
-	    struct hid_location *loc);
-uint32_t hid_get_data_unsigned(const uint8_t *buf, usb_size_t len,
-	    struct hid_location *loc);
-void hid_put_data_unsigned(uint8_t *buf, usb_size_t len,
-	    struct hid_location *loc, unsigned int value);
-int	hid_is_collection(const void *desc, usb_size_t size, int32_t usage);
-struct usb_hid_descriptor *hid_get_descriptor_from_usb(
-	    struct usb_config_descriptor *cd,
-	    struct usb_interface_descriptor *id);
-usb_error_t usbd_req_get_hid_desc(struct usb_device *udev, struct mtx *mtx,
-	    void **descp, uint16_t *sizep, struct malloc_type *mem,
-	    uint8_t iface_index);
-int	hid_is_mouse(const void *d_ptr, uint16_t d_len);
-int	hid_is_keyboard(const void *d_ptr, uint16_t d_len);
-#endif					/* _KERNEL */
-#endif					/* _USB_HID_H_ */
diff --git a/include.new/dev/usb/uxb360gp_rdesc.h b/include.new/dev/usb/uxb360gp_rdesc.h
deleted file mode 100644
index 0857f37..0000000
--- a/include.new/dev/usb/uxb360gp_rdesc.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * Copyright (c) 2005 Ed Schouten <ed@fxq.nl>
- * 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.
- *
- * 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/dev/usb/uxb360gp_rdesc.h,v 1.2.2.1 2006/01/20 22:47:49 mux Exp $
- */
-
-/*
- * The descriptor has no output report format, thus preventing you from
- * controlling the LEDs and the built-in rumblers.
- */
-static const uByte uhid_xb360gp_report_descr[] = {
-    0x05, 0x01,		/* USAGE PAGE (Generic Desktop)		*/
-    0x09, 0x05,		/* USAGE (Gamepad)			*/
-    0xa1, 0x01,		/* COLLECTION (Application)		*/
-    /* Unused */
-    0x75, 0x08,		/*  REPORT SIZE (8)			*/
-    0x95, 0x01,		/*  REPORT COUNT (1)			*/
-    0x81, 0x01,		/*  INPUT (Constant)			*/
-    /* Byte count */
-    0x75, 0x08,		/*  REPORT SIZE (8)			*/
-    0x95, 0x01,		/*  REPORT COUNT (1)			*/
-    0x05, 0x01,		/*  USAGE PAGE (Generic Desktop)	*/
-    0x09, 0x3b,		/*  USAGE (Byte Count)			*/
-    0x81, 0x01,		/*  INPUT (Constant)			*/
-    /* D-Pad */
-    0x05, 0x01,		/*  USAGE PAGE (Generic Desktop)	*/
-    0x09, 0x01,		/*  USAGE (Pointer)			*/
-    0xa1, 0x00,		/*  COLLECTION (Physical)		*/
-    0x75, 0x01,		/*   REPORT SIZE (1)			*/
-    0x15, 0x00,		/*   LOGICAL MINIMUM (0)		*/
-    0x25, 0x01,		/*   LOGICAL MAXIMUM (1)		*/
-    0x35, 0x00,		/*   PHYSICAL MINIMUM (0)		*/
-    0x45, 0x01,		/*   PHYSICAL MAXIMUM (1)		*/
-    0x95, 0x04,		/*   REPORT COUNT (4)			*/
-    0x05, 0x01,		/*   USAGE PAGE (Generic Desktop)	*/
-    0x09, 0x90,		/*   USAGE (D-Pad Up)			*/
-    0x09, 0x91,		/*   USAGE (D-Pad Down)			*/
-    0x09, 0x93,		/*   USAGE (D-Pad Left)			*/
-    0x09, 0x92,		/*   USAGE (D-Pad Right)		*/
-    0x81, 0x02,		/*   INPUT (Data, Variable, Absolute)	*/
-    0xc0,		/*  END COLLECTION			*/
-    /* Buttons 5-11 */
-    0x75, 0x01,		/*  REPORT SIZE (1)			*/
-    0x15, 0x00,		/*  LOGICAL MINIMUM (0)			*/
-    0x25, 0x01,		/*  LOGICAL MAXIMUM (1)			*/
-    0x35, 0x00,		/*  PHYSICAL MINIMUM (0)		*/
-    0x45, 0x01,		/*  PHYSICAL MAXIMUM (1)		*/
-    0x95, 0x07,		/*  REPORT COUNT (7)			*/
-    0x05, 0x09,		/*  USAGE PAGE (Button)			*/
-    0x09, 0x08,		/*  USAGE (Button 8)			*/
-    0x09, 0x07,		/*  USAGE (Button 7)			*/
-    0x09, 0x09,		/*  USAGE (Button 9)			*/
-    0x09, 0x0a,		/*  USAGE (Button 10)			*/
-    0x09, 0x05,		/*  USAGE (Button 5)			*/
-    0x09, 0x06,		/*  USAGE (Button 6)			*/
-    0x09, 0x0b,		/*  USAGE (Button 11)			*/
-    0x81, 0x02,		/*  INPUT (Data, Variable, Absolute)	*/
-    /* Unused */
-    0x75, 0x01,		/*  REPORT SIZE (1)			*/
-    0x95, 0x01,		/*  REPORT COUNT (1)			*/
-    0x81, 0x01,		/*  INPUT (Constant)			*/
-    /* Buttons 1-4 */
-    0x75, 0x01,		/*  REPORT SIZE (1)			*/
-    0x15, 0x00,		/*  LOGICAL MINIMUM (0)			*/
-    0x25, 0x01,		/*  LOGICAL MAXIMUM (1)			*/
-    0x35, 0x00,		/*  PHYSICAL MINIMUM (0)		*/
-    0x45, 0x01,		/*  PHYSICAL MAXIMUM (1)		*/
-    0x95, 0x04,		/*  REPORT COUNT (4)			*/
-    0x05, 0x09,		/*  USAGE PAGE (Button)			*/
-    0x19, 0x01,		/*  USAGE MINIMUM (Button 1)		*/
-    0x29, 0x04,		/*  USAGE MAXIMUM (Button 4)		*/
-    0x81, 0x02,		/*  INPUT (Data, Variable, Absolute)	*/
-    /* Triggers */
-    0x75, 0x08,		/*  REPORT SIZE (8)			*/
-    0x15, 0x00,		/*  LOGICAL MINIMUM (0)			*/
-    0x26, 0xff, 0x00,	/*  LOGICAL MAXIMUM (255)		*/
-    0x35, 0x00,		/*  PHYSICAL MINIMUM (0)		*/
-    0x46, 0xff, 0x00,	/*  PHYSICAL MAXIMUM (255)		*/
-    0x95, 0x02,		/*  REPORT SIZE (2)			*/
-    0x05, 0x01,		/*  USAGE PAGE (Generic Desktop)	*/
-    0x09, 0x32,		/*  USAGE (Z)				*/
-    0x09, 0x35,		/*  USAGE (Rz)				*/
-    0x81, 0x02,		/*  INPUT (Data, Variable, Absolute)	*/
-    /* Sticks */
-    0x75, 0x10,		/*  REPORT SIZE (16)			*/
-    0x16, 0x00, 0x80,	/*  LOGICAL MINIMUM (-32768)		*/
-    0x26, 0xff, 0x7f,	/*  LOGICAL MAXIMUM (32767)		*/
-    0x36, 0x00, 0x80,	/*  PHYSICAL MINIMUM (-32768)		*/
-    0x46, 0xff, 0x7f,	/*  PHYSICAL MAXIMUM (32767)		*/
-    0x95, 0x04,		/*  REPORT COUNT (4)			*/
-    0x05, 0x01,		/*  USAGE PAGE (Generic Desktop)	*/
-    0x09, 0x30,		/*  USAGE (X)				*/
-    0x09, 0x31,		/*  USAGE (Y)				*/
-    0x09, 0x33,		/*  USAGE (Rx)				*/
-    0x09, 0x34,		/*  USAGE (Ry)				*/
-    0x81, 0x02,		/*  INPUT (Data, Variable, Absolute)	*/
-    /* Unused */
-    0x75, 0x30,		/*  REPORT SIZE (48)			*/
-    0x95, 0x01,		/*  REPORT COUNT (1)			*/
-    0x81, 0x01,		/*  INPUT (Constant)			*/
-    0xc0,		/* END COLLECTION			*/
-};
diff --git a/include.new/dev/utopia/idtphy.h b/include.new/dev/utopia/idtphy.h
deleted file mode 100644
index ad9a234..0000000
--- a/include.new/dev/utopia/idtphy.h
+++ /dev/null
@@ -1,761 +0,0 @@
-/*-
- * Copyright (c) 2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/dev/utopia/idtphy.h 139749 2005-01-06 01:43:34Z imp $
- *
- * Register definitions for the following chips:
- *	IDT 77105
- *	IDT 77155
- */
-#ifndef _DEV_UTOPIA_IDTPHY_H
-#define	_DEV_UTOPIA_IDTPHY_H
-
-#define	IDTPHY_REGO_MCR		0x00
-#define	IDTPHY_REGN_MCR		"Master Control Register"
-#define	IDTPHY_REGX_MCR		"\020\010UPLO\7DREC\6ECEI\5TDPC\4DRIC\3HALTTX\2BYTEM\1EI"
-#define	IDTPHY_REGM_MCR_UPL0	0x80
-#define	IDTPHY_REGM_MCR_DREC	0x40
-#define	IDTPHY_REGM_MCR_ECEI	0x20
-#define	IDTPHY_REGM_MCR_TDPC	0x10
-#define	IDTPHY_REGM_MCR_DRIC	0x08
-#define	IDTPHY_REGM_MCR_HALTTX	0x04
-#define	IDTPHY_REGM_MCR_BYTEM	0x02
-#define	IDTPHY_REGM_MCR_EI	0x01
-
-#define	IDTPHY_REGO_ISTAT	0x01
-#define	IDTPHY_REGN_ISTAT	"Interrupt Status"
-#define	IDTPHY_REGX_ISTAT	"\020\7GOOD\6HECE\5SCRE\4TPE\3RSCC\2RSE\1RFO"
-#define	IDTPHY_REGM_ISTAT_GOOD	0x40	/* good signal bit */
-#define	IDTPHY_REGM_ISTAT_HECE	0x20	/* HEC error */
-#define	IDTPHY_REGM_ISTAT_SCRE	0x10	/* short cell received error */
-#define	IDTPHY_REGM_ISTAT_TPE	0x08	/* transmit parity error */
-#define	IDTPHY_REGM_ISTAT_RSCC	0x04	/* receive signal condition change */
-#define	IDTPHY_REGM_ISTAT_RSE	0x02	/* receive symbol error */
-#define	IDTPHY_REGM_ISTAT_RFO	0x01	/* read FIFO overrun */
-
-#define	IDTPHY_REGO_DIAG	0x02
-#define	IDTPHY_REGN_DIAG	"Diagnostic Control"
-#define	IDTPHY_REGX_DIAG	"\020\010FTD\7ROS\6MULTI\5RFLUSH\4ITPE\3IHECE\11\3\0NORM\11\3\2PLOOP\11\3\3LLOOP"
-#define	IDTPHY_REGM_DIAG_FTD	0x80	/* Force TxClav Deassert */
-#define	IDTPHY_REGM_DIAG_ROS	0x40	/* RxClav Operation Select */
-#define	IDTPHY_REGM_DIAG_MULTI	0x20	/* Multi-phy operation */
-#define	IDTPHY_REGM_DIAG_RFLUSH	0x10	/* clear receive Fifo */
-#define	IDTPHY_REGM_DIAG_ITPE	0x08	/* insert transmit payload error */
-#define	IDTPHY_REGM_DIAG_IHECE	0x04	/* insert transmit HEC error */
-#define	IDTPHY_REGM_DIAG_LOOP	0x03	/* loopback mode */
-#define	IDTPHY_REGM_DIAG_LOOP_NONE	0x00	/* normal */
-#define	IDTPHY_REGM_DIAG_LOOP_PHY	0x02	/* PHY loopback */
-#define	IDTPHY_REGM_DIAG_LOOP_LINE	0x03	/* Line loopback */
-
-#define	IDTPHY_REGO_LHEC	0x03
-#define	IDTPHY_REGN_LHEC	"LED Driver and HEC Status/Control"
-#define	IDTPHY_REGX_LHEC	"\020\7DRHEC\6DTHEC\11\x18\0CYC1\11\x18\1CYC2\11\x18\2CYC4\11\x18\3CYC8\3FIFOE\2TXLED\1RXLED"
-#define	IDTPHY_REGM_LHEC_DRHEC	0x40	/* disable receive HEC */
-#define	IDTPHY_REGM_LHEC_DTHEC	0x20	/* disable transmit HEC */
-#define	IDTPHY_REGM_LHEC_RXREF	0x18	/* RxRef pulse width */
-#define	IDTPHY_REGM_LHEC_RXREF1	0x00	/* 1 pulse */
-#define	IDTPHY_REGM_LHEC_RXREF2	0x08	/* 2 pulse */
-#define	IDTPHY_REGM_LHEC_RXREF4	0x10	/* 4 pulse */
-#define	IDTPHY_REGM_LHEC_RXREF8	0x18	/* 8 pulse */
-#define	IDTPHY_REGM_LHEC_FIFOE	0x04	/* Fifo empty */
-#define	IDTPHY_REGM_LHEC_TXLED	0x02	/* Tx LED status */
-#define	IDTPHY_REGM_LHEC_RXLED	0x01	/* Rx LED status */
-
-#define	IDTPHY_REGO_CNT		0x04	/* +0x05 */
-#define	IDTPHY_REGN_CNT		"Counter"
-
-#define	IDTPHY_REGO_CNTS	0x06
-#define	IDTPHY_REGN_CNTS	"Counter select"
-#define	IDTPHY_REGX_CNTS	"\020\4SEC\3TX\2RX\1HECE"
-#define	IDTPHY_REGM_CNTS_SEC	0x08	/* symbol error counter */
-#define	IDTPHY_REGM_CNTS_TX	0x04	/* Tx cells */
-#define	IDTPHY_REGM_CNTS_RX	0x02	/* Rx cells */
-#define	IDTPHY_REGM_CNTS_HECE	0x01	/* HEC errors */
-
-#define	IDTPHY_PRINT_77105					\
-	{ /* 00 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_MCR,		\
-	  IDTPHY_REGN_MCR,	IDTPHY_REGX_MCR },		\
-	{ /* 01 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_ISTAT,		\
-	  IDTPHY_REGN_ISTAT,	IDTPHY_REGX_ISTAT },		\
-	{ /* 02 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_DIAG,		\
-	  IDTPHY_REGN_DIAG,	IDTPHY_REGX_DIAG },		\
-	{ /* 03 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_LHEC,		\
-	  IDTPHY_REGN_LHEC,	IDTPHY_REGX_LHEC },		\
-	{ /* 04, 05 */						\
-	  UTP_REGT_INT16,	IDTPHY_REGO_CNT,		\
-	  IDTPHY_REGN_CNT,	NULL },				\
-	{ /* 06 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_CNTS,		\
-	  IDTPHY_REGN_CNTS,	IDTPHY_REGX_CNTS }
-
-#define	IDTPHY_REGO_MRID	0x00
-#define	IDTPHY_REGN_MRID	"Master Reset & ID"
-#define	IDTPHY_REGM_MRID_RESET	0x80	/* software reset */
-#define	IDTPHY_REGM_MRID_TYPE	0x70	/* type */
-#define	IDTPHY_REGM_MRID_155	0x30	/* idt77155 type */
-#define	IDTPHY_REGM_MRID_ID	0x0f	/* revision */
-#define	IDTPHY_REGX_MRID	\
-	    "\020\010mstReset\12\x70\12type\12\xf\12id"
-
-#define	IDTPHY_REGO_CONF	0x01
-#define	IDTPHY_REGN_CONF	"Configuration"
-#define	IDTPHY_REGM_CONF_AFEBE	0x40	/* autoFEBE */
-#define	IDTPHY_REGM_CONF_ALRDI	0x20	/* autoLRDI */
-#define	IDTPHY_REGM_CONF_APRDI	0x10	/* autoPRDI */
-#define	IDTPHY_REGM_CONF_TCAIN	0x08	/* TCAInv */
-#define	IDTPHY_REGM_CONF_RCAIN	0x04	/* RCAInv */
-#define	IDTPHY_REGM_CONF_RXDIN	0x02	/* RXDInv */
-#define	IDTPHY_REGM_CONF_RESV	0x81
-#define	IDTPHY_REGX_CONF	\
-	    "\020\07autoFEBE\6autoLRDI\5autoPRDI\4TCAInv\3RCAInv\2RXDInv"
-
-#define	IDTPHY_REGO_INT		0x02
-#define	IDTPHY_REGN_INT		"Interrupt"
-#define	IDTPHY_REGM_INT_TXOOLI	0x80	/* txOOLInt */
-#define	IDTPHY_REGM_INT_RXLOCI	0x40	/* rxLOCInt */
-#define	IDTPHY_REGM_INT_RXOOLI	0x20	/* rxOOLInt */
-#define	IDTPHY_REGM_INT_TXCDI	0x10	/* txCDi */
-#define	IDTPHY_REGM_INT_RXCDI	0x08	/* rxCDi */
-#define	IDTPHY_REGM_INT_RXPOHI	0x04	/* rxPOHi */
-#define	IDTPHY_REGM_INT_RXLOHI	0x02	/* rxLOHi */
-#define	IDTPHY_REGM_INT_RXSOHI	0x01	/* rxSOHi */
-#define	IDTPHY_REGX_INT		\
-	    "\020\10txOOLInt\7rxLOCInt\6rxOOLInt\5txCDi\4rxCDi\3rxPOHi" \
-	    "\2rxLOHi\1rxSOHi"
-
-#define	IDTPHY_REGO_MCM		0x04
-#define	IDTPHY_REGN_MCM		"Master Clock Monitor"
-#define	IDTPHY_REGM_MCM_RRCLK	0x08	/* rrclkReg */
-#define	IDTPHY_REGM_MCM_TRCLK	0x04	/* trclkReg */
-#define	IDTPHY_REGM_MCM_RCLK	0x02	/* rclkReg */
-#define	IDTPHY_REGM_MCM_TCLK	0x01	/* tclkReg */
-#define	IDTPHY_REGM_MCM_RESV	0xf0
-#define	IDTPHY_REGX_MCM		\
-	    "\020\4rrclkReg\3trclkReg\2rclkReg\1tclkReg"
-
-#define	IDTPHY_REGO_MCTL	0x05
-#define	IDTPHY_REGN_MCTL	"Master Control"
-#define	IDTPHY_REGM_MCTL_LOCI	0x80	/* rxLOCIEn */
-#define	IDTPHY_REGM_MCTL_LOC	0x40	/* LOC */
-#define	IDTPHY_REGM_MCTL_FIXP	0x20	/* txFixptr */
-#define	IDTPHY_REGM_MCTL_LLOOP	0x04	/* txLLoop */
-#define	IDTPHY_REGM_MCTL_DLOOP	0x02	/* rxDLoop */
-#define	IDTPHY_REGM_MCTL_TLOOP	0x01	/* rxLoopT */
-#define	IDTPHY_REGM_MCTL_RESV	0x18
-#define	IDTPHY_REGX_MCTL	\
-	    "\020\10rxLOCIEn\7LOC\6txFixptr\3txLLoop\2rxDLoop\1rxLoopT"
-
-#define	IDTPHY_REGO_TXC		0x06
-#define	IDTPHY_REGN_TXC		"Transmit Clock Synthesis C/S"
-#define	IDTPHY_REGM_TXC_TXOOL	0x08	/* txOOL */
-#define	IDTPHY_REGM_TXC_TXOOLI	0x02	/* txOOLIEn */
-#define	IDTPHY_REGM_TXC_TXREF	0x01	/* txrefSel */
-#define	IDTPHY_REGM_TXC_RESV	0xf4
-#define	IDTPHY_REGX_TXC		\
-	    "\020\4txOOL\2txOOLIEn\1txrefSel"
-
-#define	IDTPHY_REGO_RXC		0x07
-#define	IDTPHY_REGN_RXC		"Receive Clock/Data Recovery C/S"
-#define	IDTPHY_REGM_RXC_RXOOL	0x08	/* rxOOL */
-#define	IDTPHY_REGM_RXC_RXOOLI	0x02	/* rxOOLIEn */
-#define	IDTPHY_REGM_RXC_RXREF	0x01	/* rxrefSel */
-#define	IDTPHY_REGM_RXC_RESV	0xf4
-#define	IDTPHY_REGX_RXC		\
-	    "\020\4rxOOL\2rxOOLIEn\1rxrefSel"
-
-#define	IDTPHY_REGO_RSOC	0x10
-#define	IDTPHY_REGN_RSOC	"Receive Overhead Control"
-#define	IDTPHY_REGM_RSOC_DSCR	0x40	/* scrDis */
-#define	IDTPHY_REGM_RSOC_FOOF	0x20	/* frcOOF */
-#define	IDTPHY_REGM_RSOC_B1IE	0x08	/* B1ErrIEn */
-#define	IDTPHY_REGM_RSOC_LOSI	0x04	/* LOSIEn */
-#define	IDTPHY_REGM_RSOC_LOFI	0x02	/* LOFIEn */
-#define	IDTPHY_REGM_RSOC_OOFI	0x01	/* OOFIEn */
-#define	IDTPHY_REGM_RSOC_RESV	0x90
-#define	IDTPHY_REGX_RSOC	\
-	    "\020\7scrDis\6frcOOF\4B1ErrIEn\3LOSIEn\2LOFIEn\1OOFIEn"
-
-#define	IDTPHY_REGO_RSOS	0x11
-#define	IDTPHY_REGN_RSOS	"Receive Overhead Status"
-#define	IDTPHY_REGM_RSOS_C1INT	0x80	/* C1Int */
-#define	IDTPHY_REGM_RSOS_B1INT	0x40	/* B1ErrInt */
-#define	IDTPHY_REGM_RSOS_LOSI	0x20	/* LOSInt */
-#define	IDTPHY_REGM_RSOS_LOFI	0x10	/* LOFInt */
-#define	IDTPHY_REGM_RSOS_OOFI	0x08	/* OOFInt */
-#define	IDTPHY_REGM_RSOS_LOS	0x04	/* LOS */
-#define	IDTPHY_REGM_RSOS_LOF	0x02	/* LOF */
-#define	IDTPHY_REGM_RSOS_OOF	0x01	/* OOF */
-#define	IDTPHY_REGX_RSOS	\
-	    "\020\10C1Int\7B1ErrInt\6LOSInt\5LOFInt\4OOFint\3LOS\2LOF\1OOF"
-
-#define	IDTPHY_REGO_BIPC	0x12	/* + 0x13 LE */
-#define	IDTPHY_REGN_BIPC	"Receive Section BIP Errors"
-
-#define	IDTPHY_REGO_TSOC	0x14
-#define	IDTPHY_REGN_TSOC	"Transmit Overhead Control"
-#define	IDTPHY_REGM_TSOC_DSCR	0x40	/* scrDis */
-#define	IDTPHY_REGM_TSOC_LAISI	0x01	/* LAISIns */
-#define	IDTPHY_REGM_TSOC_RESV	0xbe
-#define	IDTPHY_REGX_TSOC	\
-	    "\020\7scrDis\1LAISIns"
-
-#define	IDTPHY_REGO_TSOC2	0x15
-#define	IDTPHY_REGN_TSOC2	"Transmit Overhead Control 2"
-#define	IDTPHY_REGM_TSOC2_LOSI	0x04	/* LOSIns */
-#define	IDTPHY_REGM_TSOC2_B1INV	0x02	/* B1Inv */
-#define	IDTPHY_REGM_TSOC2_IFE	0x01	/* frErrIns */
-#define	IDTPHY_REGM_TSOC2_RESV	0xf8
-#define	IDTPHY_REGX_TSOC2	\
-	    "\020\3LOSIns\2B1Inv\1frErrIns"
-
-#define	IDTPHY_REGO_RLOS	0x18
-#define	IDTPHY_REGN_RLOS	"Receive Line Overhead Status"
-#define	IDTPHY_REGM_RLOS_B2W	0x80	/* B2Word */
-#define	IDTPHY_REGM_RLOS_LAIS	0x02	/* LAIS */
-#define	IDTPHY_REGM_RLOS_LRDI	0x01	/* LRDI */
-#define	IDTPHY_REGM_RLOS_RESV	0x7c
-#define	IDTPHY_REGX_RLOS	\
-	    "\020\10B2Word\2LAIS\1LRDI"
-
-#define	IDTPHY_REGO_RLOI	0x19
-#define	IDTPHY_REGN_RLOI	"Receive Line Overhead Interrupt"
-#define	IDTPHY_REGM_RLOI_LFEBEE	0x80	/* LFEBEIEn */
-#define	IDTPHY_REGM_RLOI_B2EE	0x40	/* B2ErrIEn */
-#define	IDTPHY_REGM_RLOI_LAISE	0x20	/* LAISIEn */
-#define	IDTPHY_REGM_RLOI_LRDIE	0x10	/* LRDIIEn */
-#define	IDTPHY_REGM_RLOI_LFEBEI	0x08	/* LFEBEInt */
-#define	IDTPHY_REGM_RLOI_B2EI	0x04	/* B2ErrInt */
-#define	IDTPHY_REGM_RLOI_LAISI	0x02	/* LAISInt */
-#define	IDTPHY_REGM_RLOI_LRDII	0x01	/* LRDIInt */
-#define	IDTPHY_REGX_RLOI	\
-	    "\020\10LFEBEIEn\7B2ErrIEn\6LAISIEn\5LRDIIEn\4LFEBEInt\3B2ErrInt" \
-	    "\2LAISInt\1LRDIInt"
-
-#define	IDTPHY_REGO_B2EC	0x1a	/* + 0x1b, 0x1c, 20bit LE */
-#define	IDTPHY_REGN_B2EC	"B2 Errors"
-
-#define	IDTPHY_REGO_FEBEC	0x1d	/* + 0x1e, 0x1f, 20bit LE */
-#define	IDTPHY_REGN_FEBEC	"Line FEBE Errors"
-
-#define	IDTPHY_REGO_TLOS	0x20
-#define	IDTPHY_REGN_TLOS	"Transmit Line Overhead Status"
-#define	IDTPHY_REGM_TLOS_LRDI	0x01	/* LRDI */
-#define	IDTPHY_REGM_TLOS_RESV	0xfe
-#define	IDTPHY_REGX_TLOS	\
-	    "\020\1LRDI"
-
-#define	IDTPHY_REGO_TLOC	0x21
-#define	IDTPHY_REGN_TLOC	"Transmit Line Overhead Control"
-#define	IDTPHY_REGM_TLOC_B2INV	0x01	/* B2Inv */
-#define	IDTPHY_REGM_TLOC_RESV	0xfe
-#define	IDTPHY_REGX_TLOC	\
-	    "\020\1B2Inv"
-
-#define	IDTPHY_REGO_TK1		0x24
-#define	IDTPHY_REGN_TK1		"Transmit K1"
-
-#define	IDTPHY_REGO_TK2		0x25
-#define	IDTPHY_REGN_TK2		"Transmit K2"
-
-#define	IDTPHY_REGO_RK1		0x26
-#define	IDTPHY_REGN_RK1		"Receive K1"
-
-#define	IDTPHY_REGO_RK2		0x27
-#define	IDTPHY_REGN_RK2		"Receive K2"
-
-#define	IDTPHY_REGO_RPOS	0x30
-#define	IDTPHY_REGN_RPOS	"Receive Path Overhead Status"
-#define	IDTPHY_REGM_RPOS_LOP	0x20	/* LOP */
-#define	IDTPHY_REGM_RPOS_PAIS	0x08	/* PAIS */
-#define	IDTPHY_REGM_RPOS_PRDI	0x04	/* PRDI */
-#define	IDTPHY_REGM_RPOS_RESV	0xd3
-#define	IDTPHY_REGX_RPOS	\
-	    "\020\6LOP\4PAIS\3PRDI"
-
-#define	IDTPHY_REGO_RPOI	0x31
-#define	IDTPHY_REGN_RPOI	"Receive Path Overhead Interrupt"
-#define	IDTPHY_REGM_RPOI_C2I	0x80	/* C2Int */
-#define	IDTPHY_REGM_RPOI_LOPI	0x20	/* LOPInt */
-#define	IDTPHY_REGM_RPOI_PAISI	0x08	/* PAISInt */
-#define	IDTPHY_REGM_RPOI_PRDII	0x04	/* PRDIInt */
-#define	IDTPHY_REGM_RPOI_B3EI	0x02	/* B3ErrInt */
-#define	IDTPHY_REGM_RPOI_PFEBEI	0x01	/* PFEBEInt */
-#define	IDTPHY_REGM_RPOI_RESV	0x50
-#define	IDTPHY_REGX_RPOI	\
-	    "\020\10C2Int\6LOPInt\4PAISInt\3PRDIInt\2B3ErrInt\1PFEBEInt"
-
-#define	IDTPHY_REGO_RPIE	0x33
-#define	IDTPHY_REGN_RPIE	"Receive Path Interrupt Enable"
-#define	IDTPHY_REGM_RPIE_C2E	0x80	/* C2IEn */
-#define	IDTPHY_REGM_RPIE_LOPE	0x20	/* LOPIEn */
-#define	IDTPHY_REGM_RPIE_PAISE	0x08	/* PAISIEn */
-#define	IDTPHY_REGM_RPIE_PRDIE	0x04	/* PRDIIEn */
-#define	IDTPHY_REGM_RPIE_B3EE	0x02	/* B3ErrIEn */
-#define	IDTPHY_REGM_RPIE_PFEBEE	0x01	/* PFEBEIEn */
-#define	IDTPHY_REGM_RPIE_RESV	0x50
-#define	IDTPHY_REGX_RPIE	\
-	    "\020\10CSIEn\6LOPIEn\4PAISIEn\3PRDIIEn\2B3ErrIEn\1PFEBEIEn"
-
-#define	IDTPHY_REGO_RC2		0x37
-#define	IDTPHY_REGN_RC2		"Receive C2"
-
-#define	IDTPHY_REGO_B3EC	0x38	/* + 0x39, LE, 16bit */
-#define	IDTPHY_REGN_B3EC	"B3 Errors"
-
-#define	IDTPHY_REGO_PFEBEC	0x3a	/* + 0x3b, LE, 16bit */
-#define	IDTPHY_REGN_PFEBEC	"Path FEBE Errors"
-
-#define	IDTPHY_REGO_RPEC	0x3d
-#define	IDTPHY_REGN_RPEC	"Receive Path BIP Error Control"
-#define	IDTPHY_REGM_RPEC_B3C	0x20	/* blkBIP */
-#define	IDTPHY_REGM_RPEC_RESV	0xdf
-#define	IDTPHY_REGX_RPEC	\
-	    "\020\6blkBIP"
-
-#define	IDTPHY_REGO_TPOC	0x40
-#define	IDTPHY_REGN_TPOC	"Transmit Path Control"
-#define	IDTPHY_REGM_TPOC_B3INV	0x02	/* B3Inv */
-#define	IDTPHY_REGM_TPOC_PAISI	0x01	/* PAISIns */
-#define	IDTPHY_REGM_TPOC_RESC	0xfc
-#define	IDTPHY_REGX_TPOC	\
-	   "\020\2B3Inv\1PAISIns"
-
-#define	IDTPHY_REGO_TPTC	0x41
-#define	IDTPHY_REGN_TPTC	"Transmit Pointer Control"
-#define	IDTPHY_REGM_TPTC_FPTR	0x40	/* frcPtr */
-#define	IDTPHY_REGM_TPTC_STUFF	0x20	/* stuffCtl */
-#define	IDTPHY_REGM_TPTC_PTR	0x10	/* Ptr */
-#define	IDTPHY_REGM_TPTC_NDF	0x08	/* NDF */
-#define	IDTPHY_REGM_TPTC_DECP	0x04	/* decPtr */
-#define	IDTPHY_REGM_TPTC_INCP	0x02	/* incPtr */
-#define	IDTPHY_REGM_TPTC_RESV	0x81
-#define	IDTPHY_REGX_TPTC	\
-	    "\020\7frcPtr\6stuffCtl\5Ptr\4NDF\3decPtr\2incPtr"
-
-#define	IDTPHY_REGO_PTRL	0x45
-#define	IDTPHY_REGN_PTRL	"Transmit Pointer LSB"
-#define	IDTPHY_REGX_PTRL	\
-	    "\020\12\xff\20arbPtr"
-
-#define	IDTPHY_REGO_PTRM	0x46
-#define	IDTPHY_REGN_PTRM	"Transmit Pointer MSB"
-#define	IDTPHY_REGM_PTRM_NDF	0xf0	/* NDFVal */
-#define	IDTPHY_REGS_PTRM_NDF	4
-#define	IDTPHY_REGM_PTRM_SS	0x0c	/* ssBit */
-#define	IDTPHY_REGM_PTRM_SONET	0x00
-#define	IDTPHY_REGM_PTRM_SDH	0x08
-#define	IDTPHY_REGM_PTRM_PTR	0x03
-#define	IDTPHY_REGX_PTRM	\
-	    "\020\12\xf0\20NDFVal\12\xc\20ssBit\12\x3\20arbPtr"
-
-#define	IDTPHY_REGO_TC2		0x48
-#define	IDTPHY_REGN_TC2		"Transmit C2"
-
-#define	IDTPHY_REGO_TPOC2	0x49
-#define	IDTPHY_REGN_TPOC2	"Transmit Path Control 2"
-#define	IDTPHY_REGM_TPOC2_FEBE	0xf0	/* PFEBEIns */
-#define	IDTPHY_REGS_TPOC2_FEBE	4
-#define	IDTPHY_REGM_TPOC2_PRDII	0x08	/* PRDIIns */
-#define	IDTPHY_REGM_TPOC2_G1	0x07	/* G1Ins */
-#define	IDTPHY_REGX_TPOC2	\
-	    "\020\12\xf0\20PFEBEIns\4PRDIIns\12\x7\20G1Ins"
-
-#define	IDTPHY_REGO_RCC		0x50
-#define	IDTPHY_REGN_RCC		"Receive Cell Control"
-#define	IDTPHY_REGM_RCC_OCD	0x80	/* OCD */
-#define	IDTPHY_REGM_RCC_PARTY	0x40	/* parity */
-#define	IDTPHY_REGM_RCC_PASS	0x20	/* pass */
-#define	IDTPHY_REGM_RCC_DCOR	0x10	/* corDis */
-#define	IDTPHY_REGM_RCC_DHEC	0x08	/* HECdis */
-#define	IDTPHY_REGM_RCC_ADD	0x04	/* csetAdd */
-#define	IDTPHY_REGM_RCC_DSCR	0x02	/* scrDis */
-#define	IDTPHY_REGM_RCC_RFIFO	0x01	/* rxFIFOrst */
-#define	IDTPHY_REGX_RCC		\
-	    "\020\10OCD\7parity\6pass\5corDis\4HECdis\3csetAdd" \
-	    "\2scrDis\1rxFIFOrst"
-
-#define	IDTPHY_REGO_RCI		0x51
-#define	IDTPHY_REGN_RCI		"Receive Cell Interrupt"
-#define	IDTPHY_REGM_RCI_OCDE	0x80	/* OCDIEn */
-#define	IDTPHY_REGM_RCI_HECE	0x40	/* HECIEn */
-#define	IDTPHY_REGM_RCI_OVFE	0x20	/* ovfIEn */
-#define	IDTPHY_REGM_RCI_OCDI	0x10	/* OCDInt */
-#define	IDTPHY_REGM_RCI_CORI	0x08	/* corInt */
-#define	IDTPHY_REGM_RCI_UCORI	0x04	/* uncorInt */
-#define	IDTPHY_REGM_RCI_OVFI	0x02	/* ovfInt */
-#define	IDTPHY_REGM_RCI_RESV	0x01
-#define	IDTPHY_REGX_RCI		\
-	    "\020\10OCDIEn\7HECIEn\6ovfIEn\5OCDInt\4corInt\3uncorInt\2ovfInt"
-
-#define	IDTPHY_REGO_CMH		0x52
-#define	IDTPHY_REGN_CMH		"Receive Cell Match Header"
-#define	IDTPHY_REGM_CMH_GFC	0xf0	/* GFC */
-#define	IDTPHY_REGS_CMH_GFC	4
-#define	IDTPHY_REGM_CMH_PTI	0x0e	/* PTI */
-#define	IDTPHY_REGS_CMH_PTI	1
-#define	IDTPHY_REGM_CMH_CLP	0x01	/* CLP */
-#define	IDTPHY_REGX_CMH		\
-	    "\020\12\xf0\20GFC\12\xe\20PTI\12\x1\20CLP"
-
-#define	IDTPHY_REGO_CMHM	0x53
-#define	IDTPHY_REGN_CMHM	"Receive Cell Match Header Mask"
-#define	IDTPHY_REGM_CMHM_GFC	0xf0	/* mskGFC */
-#define	IDTPHY_REGS_CMHM_GFC	4
-#define	IDTPHY_REGM_CMHM_PTI	0x0e	/* mskPTI */
-#define	IDTPHY_REGS_CMHM_PTI	1
-#define	IDTPHY_REGM_CMHM_CLP	0x01	/* mskCLP */
-#define	IDTPHY_REGX_CMHM	\
-	    "\020\12\xf0\20mskGFC\12\xe\20mskPTI\12\x1\20mskCLP"
-
-#define	IDTPHY_REGO_CEC		0x54
-#define	IDTPHY_REGN_CEC		"Correctable Errors"
-
-#define	IDTPHY_REGO_UEC		0x55
-#define	IDTPHY_REGN_UEC		"Uncorrectable Errors"
-
-#define	IDTPHY_REGO_RCCNT	0x56	/* +0x57, 0x58, LE, 19bit */
-#define	IDTPHY_REGN_RCCNT	"Receive Cells"
-
-#define	IDTPHY_REGO_RCCF	0x59
-#define	IDTPHY_REGN_RCCF	"Receive Cell Configuration"
-#define	IDTPHY_REGM_RCCF_GFCE	0xf0	/* GFCen */
-#define	IDTPHY_REGS_RCCF_GFCE	4
-#define	IDTPHY_REGM_RCCF_FIXS	0x08	/* FixSen */
-#define	IDTPHY_REGM_RCCF_RCAL	0x04	/* RCAlevel */
-#define	IDTPHY_REGM_RCCF_HECF	0x03	/* HECftr */
-#define	IDTPHY_REGX_RCCF	\
-	    "\020\12\xf0\20GFCen\4FixSen\3RCAlevel\12\x3\20HECftr"
-
-#define	IDTPHY_REGO_RXID	0x5a
-#define	IDTPHY_REGN_RXID	"Receive ID Address"
-#define	IDTPHY_REGM_RXID_ID	0x03	/* IDAddr */
-#define	IDTPHY_REGM_RXID_RESV	0xfc
-#define	IDTPHY_REGX_RXID	\
-	    "\020\12\x3\20IDAddr"
-
-#define	IDTPHY_REGO_TCC		0x60
-#define	IDTPHY_REGN_TCC		"Transmit Cell Control"
-#define	IDTPHY_REGM_TCC_FIFOE	0x80	/* fovrIEn */
-#define	IDTPHY_REGM_TCC_SOCI	0x40	/* socInt */
-#define	IDTPHY_REGM_TCC_FIFOI	0x20	/* fovrInt */
-#define	IDTPHY_REGM_TCC_HECINV	0x10	/* HECInv */
-#define	IDTPHY_REGM_TCC_HECDIS	0x08	/* HECDis */
-#define	IDTPHY_REGM_TCC_ADD	0x04	/* csetAdd */
-#define	IDTPHY_REGM_TCC_DSCR	0x02	/* scrDis */
-#define	IDTPHY_REGM_TCC_FIFOR	0x01	/* txFIFOrst */
-#define	IDTPHY_REGX_TCC		\
-	    "\020\10fovrIEn\7socInt\6fovrInt\5HECInv\4HECDis\3csetAdd" \
-	    "\2scrDis\1txFIFOrst"
-
-#define	IDTPHY_REGO_TCHP	0x61
-#define	IDTPHY_REGN_TCHP	"Transmit Idle Cell Header"
-#define	IDTPHY_REGM_TCHP_GFC	0xf0	/* GFCtx */
-#define	IDTPHY_REGS_TCHP_GFC	4
-#define	IDTPHY_REGM_TCHP_PTI	0x0e	/* PTItx */
-#define	IDTPHY_REGS_TCHP_PTI	1
-#define	IDTPHY_REGM_TCHP_CLP	0x01	/* CLPtx */
-#define	IDTPHY_REGX_TCHP	\
-	    "\020\12\xf0\20GFCtx\12\xe\20PTItx\12\x1\20CLPtx"
-
-#define	IDTPHY_REGO_TPLD	0x62
-#define	IDTPHY_REGN_TPLD	"Transmit Idle Cell Payload"
-
-#define	IDTPHY_REGO_TCC2	0x63
-#define	IDTPHY_REGN_TCC2	"Transmit Cell Configuration 2"
-#define	IDTPHY_REGM_TCC2_PARITY	0x80	/* parity */
-#define	IDTPHY_REGM_TCC2_PARE	0x40	/* parIEn */
-#define	IDTPHY_REGM_TCC2_PARI	0x10	/* parInt */
-#define	IDTPHY_REGM_TCC2_FIFO	0x0c	/* FIFOdpth */
-#define	IDTPHY_REGS_TCC2_FIFO	2
-#define	IDTPHY_REGM_TCC2_TCAL	0x02	/* TCAlevel */
-#define	IDTPHY_REGM_TCC2_RESV	0x01
-#define	IDTPHY_REGX_TCC2	\
-	    "\020\10parity\7parIEn\5parInt\12\xc\20FIFOdpth\2TCAlevel"
-
-#define	IDTPHY_REGO_TXCNT	0x64	/* +65,66 LE 19bit */
-#define	IDTPHY_REGN_TXCNT	"Transmit Cells"
-
-#define	IDTPHY_REGO_TCC3	0x67
-#define	IDTPHY_REGN_TCC3	"Transmit Cell Configuration 3"
-#define	IDTPHY_REGM_TCC3_GFCE	0xf0	/* txGFCen */
-#define	IDTPHY_REGS_TCC3_GFCE	4
-#define	IDTPHY_REGM_TCC3_FIXE	0x08	/* txFixSen */
-#define	IDTPHY_REGM_TCC3_H4ID	0x04	/* H4InsDis */
-#define	IDTPHY_REGM_TCC3_FIXB	0x03	/* fixByte */
-#define	IDTPHY_REGM_TCC3_FIX00	0x00	/* 0x00 */
-#define	IDTPHY_REGM_TCC3_FIX55	0x01	/* 0x55 */
-#define	IDTPHY_REGM_TCC3_FIXAA	0x02	/* 0xAA */
-#define	IDTPHY_REGM_TCC3_FIXFF	0x03	/* 0xFF */
-#define	IDTPHY_REGX_TCC3	\
-	    "\020\12\xf0\20txGFCen\4txFixSen\3H4InsDis" \
-	    "\11\x3\x0FIX00\11\x3\x1FIX55\11\x3\x2FIXAA\11\x3\x3FIXFF"
-
-#define	IDTPHY_REGO_TXID	0x68
-#define	IDTPHY_REGN_TXID	"Transmit ID Address"
-#define	IDTPHY_REGM_TXID_ID	0x03	/* txIDAddr */
-#define	IDTPHY_REGM_TXID_RESV	0xfc
-#define	IDTPHY_REGX_TXID	\
-	    "\020\12\x3\20txIDAddr"
-
-#define	IDTPHY_REGO_RBER	0x70
-#define	IDTPHY_REGN_RBER	"Receive BER S/C"
-#define	IDTPHY_REGM_RBER_FAILE	0x08	/* FailIEn */
-#define	IDTPHY_REGM_RBER_WARNE	0x04	/* WarnIEn */
-#define	IDTPHY_REGM_RBER_FAIL	0x02	/* BERfail */
-#define	IDTPHY_REGM_RBER_WARN	0x01	/* BERwarn */
-#define	IDTPHY_REGM_RBER_RESV	0xf0
-#define	IDTPHY_REGX_RBER	\
-	    "\020\4FailIEn\3WarnIEn\2BERfail\1BERwarn"
-
-#define	IDTPHY_REGO_BFTH	0x71
-#define	IDTPHY_REGN_BFTH	"Receive BER Fail Threshold"
-
-#define	IDTPHY_REGO_BFWIN	0x72
-#define	IDTPHY_REGN_BFWIN	"Receive BER Fail Window"
-
-#define	IDTPHY_REGO_BFDEN	0x73	/* +74, 16bit LE */
-#define	IDTPHY_REGN_BFDEN	"Receive BER Fail Denominator"
-
-#define	IDTPHY_REGO_BWTH	0x75
-#define	IDTPHY_REGN_BWTH	"Receive BER Warn Threshold"
-
-#define	IDTPHY_REGO_BWWIN	0x76
-#define	IDTPHY_REGN_BWWIN	"Receive BER Warn Window"
-
-#define	IDTPHY_REGO_BWDEN	0x77	/* +78, 16bit LE */
-#define	IDTPHY_REGN_BWDEN	"Receive BER Warn Denomiator"
-
-#define	IDTPHY_REGO_OPEC	0x7f
-#define	IDTPHY_REGN_OPEC	"Output PECL Control"
-#define	IDTPHY_REGM_OPEC_TXC	0x04	/* pcctl_tc */
-#define	IDTPHY_REGM_OPEC_TXD	0x02	/* pcctl_td */
-#define	IDTPHY_REGM_OPEC_RXDO	0x01	/* pcctl_r */
-#define	IDTPHY_REGM_OPEC_RESV	0xf8
-#define	IDTPHY_REGX_OPEC	\
-	    "\020\3pctl_tc\2pcctl_td\1pcctl_r"
-
-#define	IDTPHY_PRINT_77155					\
-	{ /* 00 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_MRID,		\
-	  IDTPHY_REGN_MRID,	IDTPHY_REGX_MRID },		\
-	{ /* 01 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_CONF,		\
-	  IDTPHY_REGN_CONF,	IDTPHY_REGX_CONF },		\
-	{ /* 02 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_INT,		\
-	  IDTPHY_REGN_INT,	IDTPHY_REGX_INT },		\
-	  /* 03 unused */					\
-	{ /* 04 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_MCM,		\
-	  IDTPHY_REGN_MCM,	IDTPHY_REGX_MCM },		\
-	{ /* 05 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_MCTL,		\
-	  IDTPHY_REGN_MCTL,	IDTPHY_REGX_MCTL },		\
-	{ /* 06 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TXC,		\
-	  IDTPHY_REGN_TXC,	IDTPHY_REGX_TXC },		\
-	{ /* 07 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RXC,		\
-	  IDTPHY_REGN_RXC,	IDTPHY_REGX_RXC },		\
-	  /* 08-0f unused */					\
-	{ /* 10 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RSOC,		\
-	  IDTPHY_REGN_RSOC,	IDTPHY_REGX_RSOC },		\
-	{ /* 11 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RSOS,		\
-	  IDTPHY_REGN_RSOS,	IDTPHY_REGX_RSOS },		\
-	{ /* 12, 13 */						\
-	  UTP_REGT_INT16,	IDTPHY_REGO_BIPC,		\
-	  IDTPHY_REGN_BIPC,	NULL },				\
-	{ /* 14 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TSOC,		\
-	  IDTPHY_REGN_TSOC,	IDTPHY_REGX_TSOC },		\
-	{ /* 15 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TSOC2,		\
-	  IDTPHY_REGN_TSOC2,	IDTPHY_REGX_TSOC2 },		\
-	  /* 16, 17 unused */					\
-	{ /* 18 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RLOS,		\
-	  IDTPHY_REGN_RLOS,	IDTPHY_REGX_RLOS },		\
-	{ /* 19 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RLOI,		\
-	  IDTPHY_REGN_RLOI,	IDTPHY_REGX_RLOI },		\
-	{ /* 1a-1c */						\
-	  UTP_REGT_INT20,	IDTPHY_REGO_B2EC,		\
-	  IDTPHY_REGN_B2EC,	NULL },				\
-	{ /* 1d-1f */						\
-	  UTP_REGT_INT20,	IDTPHY_REGO_FEBEC,		\
-	  IDTPHY_REGN_FEBEC,	NULL },				\
-	{ /* 20 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TLOS,		\
-	  IDTPHY_REGN_TLOS,	IDTPHY_REGX_TLOS },		\
-	{ /* 21 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TLOC,		\
-	  IDTPHY_REGN_TLOC,	IDTPHY_REGX_TLOC },		\
-	  /* 22, 23 unused */					\
-	{ /* 24 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_TK1,		\
-	  IDTPHY_REGN_TK1,	NULL },				\
-	{ /* 25 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_TK2,		\
-	  IDTPHY_REGN_TK2,	NULL },				\
-	{ /* 26 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_RK1,		\
-	  IDTPHY_REGN_RK1,	NULL },				\
-	{ /* 27 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_RK2,		\
-	  IDTPHY_REGN_RK2,	NULL },				\
-	  /* 28-2f unused */					\
-	{ /* 30 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RPOS,		\
-	  IDTPHY_REGN_RPOS,	IDTPHY_REGX_RPOS },		\
-	{ /* 31 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RPOI,		\
-	  IDTPHY_REGN_RPOI,	IDTPHY_REGX_RPOI },		\
-	  /* 32 unused */					\
-	{ /* 33 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RPIE,		\
-	  IDTPHY_REGN_RPIE,	IDTPHY_REGX_RPIE },		\
-	  /* 34-36 unused */					\
-	{ /* 37 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_RC2,		\
-	  IDTPHY_REGN_RC2,	NULL },				\
-	{ /* 38-39 */						\
-	  UTP_REGT_INT16,	IDTPHY_REGO_B3EC,		\
-	  IDTPHY_REGN_B3EC,	NULL },				\
-	{ /* 3a-3b */						\
-	  UTP_REGT_INT16,	IDTPHY_REGO_PFEBEC,		\
-	  IDTPHY_REGN_PFEBEC,	NULL },				\
-	  /* 3c unused */					\
-	{ /* 3d */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RPEC,		\
-	  IDTPHY_REGN_RPEC,	IDTPHY_REGX_RPEC },		\
-	  /* 3e, 3f unused */					\
-	{ /* 40 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TPOC,		\
-	  IDTPHY_REGN_TPOC,	IDTPHY_REGX_TPOC },		\
-	{ /* 41 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TPTC,		\
-	  IDTPHY_REGN_TPTC,	IDTPHY_REGX_TPTC },		\
-	  /* 42-44 unused */					\
-	{ /* 45 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_PTRL,		\
-	  IDTPHY_REGN_PTRL,	IDTPHY_REGX_PTRL },		\
-	{ /* 46 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_PTRM,		\
-	  IDTPHY_REGN_PTRM,	IDTPHY_REGX_PTRM },		\
-	  /* 47 unused */					\
-	{ /* 48 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_TC2,		\
-	  IDTPHY_REGN_TC2,	NULL },				\
-	{ /* 49 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TPOC2,		\
-	  IDTPHY_REGN_TPOC2,	IDTPHY_REGX_TPOC2 },		\
-	  /* 4a-4f unused */					\
-	{ /* 50 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RCC,		\
-	  IDTPHY_REGN_RCC,	IDTPHY_REGX_RCC },		\
-	{ /* 51 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RCI,		\
-	  IDTPHY_REGN_RCI,	IDTPHY_REGX_RCI },		\
-	{ /* 52 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_CMH,		\
-	  IDTPHY_REGN_CMH,	IDTPHY_REGX_CMH },		\
-	{ /* 53 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_CMHM,		\
-	  IDTPHY_REGN_CMHM,	IDTPHY_REGX_CMHM },		\
-	{ /* 54 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_CEC,		\
-	  IDTPHY_REGN_CEC,	NULL },				\
-	{ /* 55 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_UEC,		\
-	  IDTPHY_REGN_UEC,	NULL },				\
-	{ /* 56-58 */						\
-	  UTP_REGT_INT19,	IDTPHY_REGO_RCCNT,		\
-	  IDTPHY_REGN_RCCNT,	NULL },				\
-	{ /* 59 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RCCF,		\
-	  IDTPHY_REGN_RCCF,	IDTPHY_REGX_RCCF },		\
-	{ /* 5a */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RXID,		\
-	  IDTPHY_REGN_RXID,	IDTPHY_REGX_RXID },		\
-	  /* 5b-5f unused */					\
-	{ /* 60 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TCC,		\
-	  IDTPHY_REGN_TCC,	IDTPHY_REGX_TCC },		\
-	{ /* 61 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TCHP,		\
-	  IDTPHY_REGN_TCHP,	IDTPHY_REGX_TCHP },		\
-	{ /* 62 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_TPLD,		\
-	  IDTPHY_REGN_TPLD,	NULL },				\
-	{ /* 63 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TCC2,		\
-	  IDTPHY_REGN_TCC2,	IDTPHY_REGX_TCC2 },		\
-	{ /* 64-66 */						\
-	  UTP_REGT_INT19,	IDTPHY_REGO_TXCNT,		\
-	  IDTPHY_REGN_TXCNT,	NULL },				\
-	{ /* 67 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TCC3,		\
-	  IDTPHY_REGN_TCC3,	IDTPHY_REGX_TCC3 },		\
-	{ /* 68 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_TXID,		\
-	  IDTPHY_REGN_TXID,	IDTPHY_REGX_TXID },		\
-	  /* 69-6f unused */					\
-	{ /* 70 */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_RBER,		\
-	  IDTPHY_REGN_RBER,	IDTPHY_REGX_RBER },		\
-	{ /* 71 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_BFTH,		\
-	  IDTPHY_REGN_BFTH,	NULL },				\
-	{ /* 72 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_BFWIN,		\
-	  IDTPHY_REGN_BFWIN,	NULL },				\
-	{ /* 73,74 */						\
-	  UTP_REGT_INT16,	IDTPHY_REGO_BFDEN,		\
-	  IDTPHY_REGN_BFDEN,	NULL },				\
-	{ /* 75 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_BWTH,		\
-	  IDTPHY_REGN_BWTH,	NULL },				\
-	{ /* 76 */						\
-	  UTP_REGT_INT8,	IDTPHY_REGO_BWWIN,		\
-	  IDTPHY_REGN_BWWIN,	NULL },				\
-	{ /* 77,78 */						\
-	  UTP_REGT_INT16,	IDTPHY_REGO_BWDEN,		\
-	  IDTPHY_REGN_BWDEN,	NULL },				\
-	  /* 79-7e unused */					\
-	{ /* 7f */						\
-	  UTP_REGT_BITS,	IDTPHY_REGO_OPEC,		\
-	  IDTPHY_REGN_OPEC,	IDTPHY_REGX_OPEC }
-
-
-#endif	/* _DEV_UTOPIA_IDTPHY_H */
diff --git a/include.new/dev/utopia/suni.h b/include.new/dev/utopia/suni.h
deleted file mode 100644
index 3a6f2ab..0000000
--- a/include.new/dev/utopia/suni.h
+++ /dev/null
@@ -1,1515 +0,0 @@
-/*-
- * Copyright (c) 2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/dev/utopia/suni.h 139749 2005-01-06 01:43:34Z imp $
- *
- * Register definitions for the following chips:
- *	PMC-Sierra PMC-5346 (S/UNI-LITE)
- *	PMC-Sierra PMC-5350 (S/UNI-ULTRA)
- *	PMC-Sierra PMC-5355 (S/UNI-622)
- *
- * All definitions ending with _ULTRA are for the ULTRA chip only, all
- * definitions ending with _LITE are for the LITE chip only. Some registers
- * are only in the ULTRA and the definitions are not suffixed. All other
- * definitions are for all chips.
- */
-#ifndef _DEV_UTOPIA_SUNI_H
-#define	_DEV_UTOPIA_SUNI_H
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_MRESET 	"Master Reset and Identity/Load Meters"
-#define	SUNI_REGO_MRESET		0x00
-#define	SUNI_REGM_MRESET_RESET		0x80
-#define	SUNI_REGM_MRESET_TYPE		0x70
-#define	SUNI_REGM_MRESET_TYPE_622	0x10
-#define	SUNI_REGM_MRESET_TYPE_LITE	0x30
-#define	SUNI_REGM_MRESET_TYPE_ULTRA	0x70
-#define	SUNI_REGM_MRESET_TIP_ULTRA	0x08
-#define	SUNI_REGM_MRESET_ID_ULTRA	0x07
-#define	SUNI_REGM_MRESET_ID_LITE	0x0f
-#define	SUNI_REGM_MRESET_ID_622		0x0f
-#define	SUNI_REGX_MRESET_ULTRA	"\020\10RESET\12\x70\12TYPE\4TIP\12\7\12ID"
-#define	SUNI_REGX_MRESET_LITE	"\020\10RESET\12\x70\12TYPE\12\xf\12ID"
-#define	SUNI_REGX_MRESET_622	"\020\10RESET\12\x70\12TYPE\12\xf\12ID"
-
-/* lite, ultra */
-#define	SUNI_REGN_MCONFIG "Master Configuration"
-#define	SUNI_REGO_MCONFIG		0x01
-#define	SUNI_REGM_MCONFIG_AUTOFEBE	0x40
-#define	SUNI_REGM_MCONFIG_AUTOLRDI	0x20
-#define	SUNI_REGM_MCONFIG_AUTOPRDI	0x10
-#define	SUNI_REGM_MCONFIG_TCAINV	0x08
-#define	SUNI_REGM_MCONFIG_RCAINV	0x04
-#define	SUNI_REGM_MCONFIG_RXDINV_LITE	0x02
-#define	SUNI_REGM_MCONFIG_TFP_IN_ULTRA	0x01
-#define	SUNI_REGM_MCONFIG_RESERVED	0x00
-#define	SUNI_REGX_MCONFIG_LITE "\020\7AUTOFEBE\6AUTOLRDI\5AUTOPRDI\4TCAINV\3RCAINV\2RXDINV"
-#define	SUNI_REGX_MCONFIG_ULTRA "\020\7AUTOFEBE\6AUTOLRDI\5AUTOPRDI\4TCAINV\3RCAINV\1TFPI_IN"
-
-/* 622 */
-#define	SUNI_REGM_MCONFIG_TPTBEN_622	0x80
-#define	SUNI_REGM_MCONFIG_TSTBEN_622	0x40
-#define	SUNI_REGM_MCONFIG_SDH_C1_622	0x20
-#define	SUNI_REGM_MCONFIG_FIXPTR_622	0x10
-#define	SUNI_REGM_MCONFIG_TMODE_622	0x0C
-#define	SUNI_REGM_MCONFIG_TMODE_STS1_BYTE	0x00
-#define	SUNI_REGM_MCONFIG_TMODE_STS3c		0x04
-#define	SUNI_REGM_MCONFIG_TMODE_STS1_BIT	0x08
-#define	SUNI_REGM_MCONFIG_TMODE_STS12c		0x0C
-#define	SUNI_REGM_MCONFIG_RMODE_622	0x03
-#define	SUNI_REGM_MCONFIG_RMODE_STS1_BYTE	0x00
-#define	SUNI_REGM_MCONFIG_RMODE_STS3c		0x01
-#define	SUNI_REGM_MCONFIG_RMODE_STS1_BIT	0x02
-#define	SUNI_REGM_MCONFIG_RMODE_STS12c		0x03
-#define	SUNI_REGX_MCONFIG_622	"\020\10TPTBEN\7TSTBEN\6SDH_C1\5FIXPTR\11\x0C\0x00XSTS1BYTE\11\0x0C\0x04XSTS3c\11\0x0C\0x08XSTS1BIT\11\0x0C\0x0CXSTS12c\11\0x03\0x00RSTS1BYTE\11\0x03\0x01RSTS3c\11\0x03\0x02RSTS1BIT\11\0x03\0x03RSTS12c"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_MISTATUS "Master Interrupt Status"
-#define	SUNI_REGO_MISTATUS		0x02
-#define	SUNI_REGM_MISTATUS_CSUI_ULTRA	0x80
-#define	SUNI_REGM_MISTATUS_TROOLI_LITE	0x80
-#define	SUNI_REGM_MISTATUS_SUNII_622	0x80
-#define	SUNI_REGM_MISTATUS_LCDI		0x40
-#define	SUNI_REGM_MISTATUS_STBI_622	0x40
-#define	SUNI_REGM_MISTATUS_CRUI_ULTRA	0x20
-#define	SUNI_REGM_MISTATUS_RDOOLI_LITE	0x20
-#define	SUNI_REGM_MISTATUS_RESERVED_622	0x20
-#define	SUNI_REGM_MISTATUS_TACPI	0x10
-#define	SUNI_REGM_MISTATUS_RACPI	0x08
-#define	SUNI_REGM_MISTATUS_RPOPI	0x04
-#define	SUNI_REGM_MISTATUS_RLOPI	0x02
-#define	SUNI_REGM_MISTATUS_RSOPI	0x01
-#define	SUNI_REGX_MISTATUS_LITE "\020\10TROOLI\7LCDI\6RDOOLI\5TACPI\4RACPI\3RPOPI\2RLOPI\1RSOPI"
-#define	SUNI_REGX_MISTATUS_ULTRA "\020\10CSUI\7LCDI\6CRUI\5TACPI\4RACPI\3RPOPI\2RLOPI\1RSOPI"
-#define	SUNI_REGX_MISTATUS_622	"\020\10S/UNII\7STBI\5TACPI\4RACPI\3RPOPI\2RLOPI\1RSOPI"
-
-/* ultra */
-#define	SUNI_REGN_MMCTRL	"Master Mode Control"
-#define	SUNI_REGO_MMCTRL		0x03
-#define	SUNI_REGM_MMCTRL_51		0x02
-#define	SUNI_REGM_MMCTRL_155		0x03
-#define	SUNI_REGX_MMCTRL	"\020\11\3\00251MBIT\11\3\003155MBIT"
-
-/* 622 */
-#define	SUNI_REGN_PISO		"PISO Interrupt"
-#define	SUNI_REGO_PISO			0x03
-#define	SUNI_REGM_PISO_PAEE		0x02
-#define	SUNI_REGM_PISO_PAEI		0x01
-#define	SUNI_REGX_PISO		"\020\2PAEE\1PAEI"
-
-/* ultra/lite */
-#define	SUNI_REGN_MCLKM		"Master Clock Monitor"
-#define	SUNI_REGO_MCLKM			0x04
-#define	SUNI_REGM_MCLKM_RFCLKA		0x10	/* ultra */
-#define	SUNI_REGM_MCLKM_TFCLKA		0x08	/* ultra */
-#define	SUNI_REGM_MCLKM_RRCLKA		0x08	/* lite */
-#define	SUNI_REGM_MCLKM_REFCLKA		0x04	/* ultra */
-#define	SUNI_REGM_MCLKM_TRCLKA		0x04	/* lite */
-#define	SUNI_REGM_MCLKM_RCLKA		0x02
-#define	SUNI_REGM_MCLKM_TCLKA		0x01
-#define	SUNI_REGX_MCLKM_LITE	"\020\4RRCLKA\3TRCLKA\2RCLKA\1TCLKA"
-#define	SUNI_REGX_MCLKM_ULTRA	"\020\5RFCLKA\4TFCLKA\3REFCLKA\2RCLKA\1TCLKA"
-
-/* 622 */
-#define	SUNI_REGN_MCTRLM	"Master Control/Monitor"
-#define	SUNI_REGO_MCTRLM		0x04
-#define	SUNI_REGM_MCTRLM_TCAINV		0x80
-#define	SUNI_REGM_MCTRLM_RCAINV		0x40
-#define	SUNI_REGM_MCTRLM_LLE		0x20
-#define	SUNI_REGM_MCTRLM_DLE		0x10
-#define	SUNI_REGM_MCTRLM_LOOPT		0x08
-#define	SUNI_REGM_MCTRLM_DPLE		0x04
-#define	SUNI_REGM_MCTRLM_PICLKA		0x02
-#define	SUNI_REGM_MCTRLM_TCLKA		0x01
-#define	SUNI_REGX_MCTRLM	"\020\10TCAINV\7RCAINV\6LLE\5DLE\4LOOPT\3DPLE\2PICLKA\1TCLKA"
-
-/* ultra/lite */
-#define	SUNI_REGN_MCTRL		"Master Control"
-#define	SUNI_REGO_MCTRL			0x05
-#define	SUNI_REGM_MCTRL_LCDE		0x80
-#define	SUNI_REGM_MCTRL_LCDV		0x40
-#define	SUNI_REGM_MCTRL_FIXPTR		0x20
-#define	SUNI_REGM_MCTRL_TPLE		0x10	/* ultra */
-#define	SUNI_REGM_MCTRL_PDLE		0x08	/* ultra */
-#define	SUNI_REGM_MCTRL_LLE		0x04
-#define	SUNI_REGM_MCTRL_SDLE		0x02	/* ultra */
-#define	SUNI_REGM_MCTRL_DLE		0x02	/* lite */
-#define	SUNI_REGM_MCTRL_LOOPT		0x01
-#define	SUNI_REGX_MCTRL_ULTRA	"\020\10LCDE\7LCDV\6FIXPTR\5TPLE\4PDLE\3LLE\2SDLE\1LOOPT"
-#define	SUNI_REGX_MCTRL_LITE	"\020\10LCDE\7LCDV\6FIXPTR\3LLE\2DLE\1LOOPT"
-
-/* 622 */
-#define	SUNI_REGN_MALARM	"Master Auto Alarm"
-#define	SUNI_REGO_MALARM		0x05
-#define	SUNI_REGM_MALARM_AUTOFEBE	0x04
-#define	SUNI_REGM_MALARM_AUTOLRDI	0x02
-#define	SUNI_REGM_MALARM_AUTOPRDI	0x01
-#define	SUNI_REGX_MALARM	"\020\4AUTOFEBE\2AUTOLRDI\1AUTOPRDI"
-
-/* ultra/lite */
-#define	SUNI_REGN_CLKSYN	"Clock Synthesis Control and Status"
-#define	SUNI_REGO_CLKSYN		0x06
-#define	SUNI_REGM_CLKSYN_TROOLI		0x20	/* ultra */
-#define	SUNI_REGM_CLKSYN_TROOLV		0x08
-#define	SUNI_REGM_CLKSYN_TROOLE		0x02
-#define	SUNI_REGM_CLKSYN_TREFSEL	0x01	/* lite */
-#define	SUNI_REGM_CLKSYN_RESERVED	0x00
-#define	SUNI_REGX_CLKSYN_ULTRA	"\020\6TROOLI\4TROOLV\2TROOLE"
-#define	SUNI_REGX_CLKSYN_LITE	"\020\4TROOLV\2TROOLE\1TREFSEL"
-
-/* 622 */
-#define	SUNI_REGN_POUT	"Parallel Output Port"
-#define	SUNI_REGO_POUT			0x06
-#define	SUNI_REGM_POUT_POP		0x3f
-#define	SUNI_REGX_POUT	"\020\12\x3f\12POP"
-
-/* ultra/lite */
-#define	SUNI_REGN_CLKREC "Clock Recovery Control and Status"
-#define	SUNI_REGO_CLKREC_LITE		0x07
-#define	SUNI_REGO_CLKREC_ULTRA		0x08
-#define	SUNI_REGM_CLKREC_RROOLI		0x40	/* ultra */
-#define	SUNI_REGM_CLKREC_RDOOLI		0x20	/* ultra */
-#define	SUNI_REGM_CLKREC_RROOLV		0x10
-#define	SUNI_REGM_CLKREC_RDOOLV		0x08
-#define	SUNI_REGM_CLKREC_RROOLE		0x04	/* ultra */
-#define	SUNI_REGM_CLKREC_RDOOLE		0x02
-#define	SUNI_REGM_CLKREC_RREFSEL	0x01	/* lite */
-#define	SUNI_REGM_CLKREC_RESERVED	0x00
-#define	SUNI_REGX_CLKREC_ULTRA "\020\7RROOLI\6RDOOLI\5RROOLV\4RDOOLV\3RROOLE\2RDOOLE"
-#define	SUNI_REGX_CLKREC_LITE "\020\5RROOLV\4RDOOLV\2RDOOLE\1RREFSEL"
-
-/* 622 */
-#define	SUNI_REGN_PIN	"Parallel Input Port"
-#define	SUNI_REGO_PIN			0x07
-
-/* 622 */
-#define	SUNI_REGN_PINV	"Parallel Input Port Value"
-#define	SUNI_REGO_PINV			0x08
-#define	SUNI_REGM_PINV_PIPV		0x0f
-#define	SUNI_REGX_PINV	"\020\12\0x0f\12PIPIV"
-
-/* ultra */
-#define	SUNI_REGN_CLKRECCFG	"Clock Recovery Configuration"
-#define	SUNI_REGO_CLKRECCFG		0x09
-#define	SUNI_REGM_CLKRECCFG_RESERVED	0x07
-#define	SUNI_REGX_CLKRECCFG	"\020"
-
-/* 622 */
-#define	SUNI_REGN_PINE	"Parallel Input Port Enable"
-#define	SUNI_REGO_PINE			0x09
-
-/* ultra */
-#define	SUNI_REGN_LTXCFG1 "Line Transmitter Configuration 1"
-#define	SUNI_REGO_LTXCFG1		0x0A
-#define	SUNI_REGM_LTXCFG1_VREFSEL	0x80
-#define	SUNI_REGM_LTXCFG1_OEN		0x20
-#define	SUNI_REGM_LTXCFG1_OTQ		0x10
-#define	SUNI_REGM_LTXCFG1_RESERVED	0x0C
-#define	SUNI_REGX_LTXCFG1 "\020\10VREFSEL\6OEN\5OTQ"
-
-/* 622 */
-#define	SUNI_REGN_XC1	"Transmit C1"
-#define	SUNI_REGO_XC1			0x0A
-
-/* ultra */
-#define	SUNI_REGN_LTXCFG2 "Line Transmitter Configuration 2"
-#define	SUNI_REGO_LTXCFG2		0x0B
-#define	SUNI_REGM_LTXCFG2_RESERVED	0xFF
-#define	SUNI_REGX_LTXCFG2 "\020"
-
-/* 622 */
-#define	SUNI_REGN_APSCS	"APS Control/Status"
-#define	SUNI_REGO_APSCS			0x0B
-#define	SUNI_REGM_APSCS_PSBFE		0x80
-#define	SUNI_REGM_APSCS_COAPSE		0x40
-#define	SUNI_REGM_APSCS_Z1E		0x20
-#define	SUNI_REGM_APSCS_Zi1		0x10
-#define	SUNI_REGM_APSCS_PSBFI		0x08
-#define	SUNI_REGM_APSCS_COAPSI		0x04
-#define	SUNI_REGM_APSCS_RESERVED	0x02
-#define	SUNI_REGM_APSCS_PSBFV		0x01
-#define	SUNI_REGX_APSCS	"\020\10PSBFE\7COAPSE\6Z1E\5Z1I\4PSBFI\3COAPSI\1PSBFV"
-
-/* ultra */
-#define	SUNI_REGN_LRXCFG "Line Receiver Configuration"
-#define	SUNI_REGO_LRXCFG		0x0C
-#define	SUNI_REGM_LRXCFG_RESERVED	0x01
-#define	SUNI_REGX_LRXCFG "\020"
-
-/* 622 */
-#define	SUNI_REGN_RK1	"Receive K1"
-#define	SUNI_REGO_RK1			0x0C
-
-/* 622 */
-#define	SUNI_REGN_RK2	"Receive K2"
-#define	SUNI_REGO_RK2			0x0D
-
-/* 622 */
-#define	SUNI_REGN_RZ1	"Receive Z1"
-#define	SUNI_REGO_RZ1			0x0E
-
-/* 622 */
-#define	SUNI_REGN_XZ1	"Transmit Z1"
-#define	SUNI_REGO_XZ1			0x0F
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RSOPCIE "RSOP Control/Interrupt Enable"
-#define	SUNI_REGO_RSOPCIE		0x10
-#define	SUNI_REGO_RSOPCIE_BIPWORD_622	0x80
-#define	SUNI_REGM_RSOPCIE_DDS		0x40
-#define	SUNI_REGM_RSOPCIE_FOOF		0x20
-#define	SUNI_REGM_RSOPCIE_RESV		0x10
-#define	SUNI_REGM_RSOPCIE_ALGO2_622	0x10
-#define	SUNI_REGM_RSOPCIE_BIPEE		0x08
-#define	SUNI_REGM_RSOPCIE_LOSE		0x04
-#define	SUNI_REGM_RSOPCIE_LOFE		0x02
-#define	SUNI_REGM_RSOPCIE_OOFE		0x01
-#define	SUNI_REGX_RSOPCIE	"\020\7DDS\6FOOF\4BIPEE\3LOSE\2LOFE\1OOFE"
-#define	SUNI_REGX_RSOPCIE_622	"\020\10BIPWORD\7DDS\6FOOF\5ALGO2\4BIPEE\3LOSE\2LOFE\1OOFE"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RSOPSIS "RSOP Status/Interrupt Status"
-#define	SUNI_REGO_RSOPSIS		0x11
-#define	SUNI_REGM_RSOPSIS_BIPEI		0x40
-#define	SUNI_REGM_RSOPSIS_LOSI		0x20
-#define	SUNI_REGM_RSOPSIS_LOFI		0x10
-#define	SUNI_REGM_RSOPSIS_OOFI		0x08
-#define	SUNI_REGM_RSOPSIS_LOSV		0x04
-#define	SUNI_REGM_RSOPSIS_LOFV		0x02
-#define	SUNI_REGM_RSOPSIS_OOFV		0x01
-#define	SUNI_REGX_RSOPSIS "\020\7BIPEI\6LOSI\5LOFI\4OOFI\3LOSV\2LOFV\1OOFV"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RSOP_BIP8 "RSOP Section BIP-8"
-#define	SUNI_REGO_RSOP_BIP8		0x12	/* +0x13 */
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TSOPCTRL "TSOP Control"
-#define	SUNI_REGO_TSOPCTRL		0x14
-#define	SUNI_REGM_TSOPCTRL_DS		0x40
-#define	SUNI_REGM_TSOPCTRL_LAIS		0x01
-#define	SUNI_REGM_TSOPCTRL_RESERVED	0x00
-#define	SUNI_REGX_TSOPCTRL "\020\7DS\1LAIS"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TSOPDIAG "TSOP Diagnostics"
-#define	SUNI_REGO_TSOPDIAG		0x15
-#define	SUNI_REGM_TSOPDIAG_DLOS		0x04
-#define	SUNI_REGM_TSOPDIAG_DBIP8	0x02
-#define	SUNI_REGM_TSOPDIAG_DFP		0x01
-#define	SUNI_REGX_TSOPDIAG "\020\3DLOS\2DBIP8\1DFP"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RLOPCTRL "RLOP Control/Status"
-#define	SUNI_REGO_RLOPCTRL		0x18
-#define	SUNI_REGO_RLOPCTRL_BIPWORD	0x80
-#define	SUNI_REGO_RLOPCTRL_ALLONES_622	0x40
-#define	SUNI_REGO_RLOPCTRL_AISDET_622	0x20
-#define	SUNI_REGO_RLOPCTRL_LRDIDET_622	0x10
-#define	SUNI_REGO_RLOPCTRL_BIPWORDO_622	0x08
-#define	SUNI_REGO_RLOPCTRL_LAISV	0x02
-#define	SUNI_REGO_RLOPCTRL_RDIV		0x01
-#define	SUNI_REGO_RLOPCTRL_RESERVED	0x00
-#define	SUNI_REGX_RLOPCTRL	"\020\10BIPWORD\2LAISV\1RDIV"
-#define	SUNI_REGX_RLOPCTRL_622	"\020\10BIPWORD\7ALLONES\6AISDET\5LRDIDET\4BIPWORDO\2LAISV\1RDIV"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RLOPINTR "RLOP Interrupt Enable/Interrupt Status"
-#define	SUNI_REGO_RLOPINTR		0x19
-#define	SUNI_REGO_RLOPINTR_FEBEE	0x80
-#define	SUNI_REGO_RLOPINTR_BIPEE	0x40
-#define	SUNI_REGO_RLOPINTR_LAISE	0x20
-#define	SUNI_REGO_RLOPINTR_RDIE		0x10
-#define	SUNI_REGO_RLOPINTR_FEBEI	0x08
-#define	SUNI_REGO_RLOPINTR_BIPEI	0x04
-#define	SUNI_REGO_RLOPINTR_LAISI	0x02
-#define	SUNI_REGO_RLOPINTR_RDII		0x01
-#define	SUNI_REGX_RLOPINTR "\020\10FEBEE\7BIPEE\6LAISE\5DRIE\4FEBEI\3BIPEI\2LAISI\1RDII"
-
-/* lite, ultra */
-#define	SUNI_REGN_RLOPBIP8_24 "RLOP Line BIP-8/24"
-#define	SUNI_REGO_RLOPBIP8_24		0x1A	/* +1B,1C */
-#define	SUNI_REGM_RLOPBIP8_24		0x0F
-
-/* 622 */
-#define	SUNI_REGN_RLOPBIP8_24_96 "RLOP Line BIP-8/24/96"
-#define	SUNI_REGO_RLOPBIP8_24_96	0x1A	/* +1B,1C */
-#define	SUNI_REGM_RLOPBIP8_24_96	0x0F
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RLOPFEBE "RLOP Line FEBE"
-#define	SUNI_REGO_RLOPFEBE		0x1D	/* +1E,1F */
-#define	SUNI_REGM_RLOPFEBE		0x0F
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TLOPCTRL "TLOP Control"
-#define	SUNI_REGO_TLOPCTRL		0x20
-#define	SUNI_REGM_TLOPCTRL_APSREG_622	0x20
-#define	SUNI_REGM_TLOPCTRL_RDI		0x01
-#define	SUNI_REGM_TLOPCTRL_RESERVED	0x00
-#define	SUNI_REGX_TLOPCTRL	"\020\1RDI"
-#define	SUNI_REGX_TLOPCTRL_622	"\020\6APSREG\1LRDI"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TLOPDIAG "TLOP Diagnostics"
-#define	SUNI_REGO_TLOPDIAG		0x21
-#define	SUNI_REGM_TLOPDIAG_DBIP		0x01
-#define	SUNI_REGX_TLOPDIAG "\020\1DBIP"
-
-/* 622 */
-#define	SUNI_REGN_TLOP_XK1	"TLOP Transmit K1"
-#define	SUNI_REGO_TLOP_XK1		0x22
-
-/* 622 */
-#define	SUNI_REGN_TLOP_XK2	"TLOP Transmit K2"
-#define	SUNI_REGO_TLOP_XK2		0x23
-
-/* 622 */
-#define	SUNI_REGN_SSTBCTRL	"SSTB Control"
-#define	SUNI_REGO_SSTBCTRL		0x28
-#define	SUNI_REGM_SSTBCTRL_RRAMACC	0x40
-#define	SUNI_REGM_SSTBCTRL_RTIUIE	0x20
-#define	SUNI_REGM_SSTBCTRL_RTIMIE	0x10
-#define	SUNI_REGM_SSTBCTRL_PER5		0x08
-#define	SUNI_REGM_SSTBCTRL_TNULL	0x04
-#define	SUNI_REGM_SSTBCTRL_NOSYNC	0x02
-#define	SUNI_REGM_SSTBCTRL_LEN16	0x01
-#define	SUNI_REGX_SSTBCTRL	"\020\7RRAMACC\6RTIUIE\5RTIMIE\4PER5\3TNULL\2NOSYNC\1LEN16"
-
-/* 622 */
-#define	SUNI_REGN_SSTBSTIS	"SSTB Section Trace Identifier Status"
-#define	SUNI_REGO_SSTBSTIS		0x29
-#define	SUNI_REGM_SSTBSTIS_BUSY		0x80
-#define	SUNI_REGM_SSTBSTIS_RTIUI	0x08
-#define	SUNI_REGM_SSTBSTIS_RTIUV	0x04
-#define	SUNI_REGM_SSTBSTIS_RTIMI	0x02
-#define	SUNI_REGM_SSTBSTIS_RTIMV	0x01
-#define	SUNI_REGX_SSTBSTIS	"\020\10BUSY\4RTIUI\3RTIUV\2RTIMI\1RTIMV"
-
-/* 622 */
-#define	SUNI_REGN_SSTBIAR	"SSTB Indirect Address Register"
-#define	SUNI_REGO_SSTBIAR		0x2A
-#define	SUNI_REGM_SSTBIAR_RWB		0x80
-#define	SUNI_REGM_SSTBIAR_A		0x7F
-#define	SUNI_REGX_SSTBIAR	"\020\10RWB\12\x7f\20"
-
-/* 622 */
-#define	SUNI_REGN_SSTBIDR	"SSTB Indirect Data Register"
-#define	SUNI_REGO_SSTBIDR		0x2B
-
-#if 0	/* see chip errata */
-/* 622 */
-#define	SUNI_REGN_SSTBECSM	"SSTB Expected Clock Synchronization Message"
-#define	SUNI_REGO_SSTBECSM		0x2C
-#endif
-
-/* 622 */
-#define	SUNI_REGN_SSTBCSMS	"SSTB Clock Synchronisation Message Status"
-#define	SUNI_REGO_SSTBCSMS		0x2D
-#define	SUNI_REGM_SSTBCSMS_RCSMUIE	0x80
-#define	SUNI_REGM_SSTBCSMS_RCSMMIE	0x40
-#define	SUNI_REGM_SSTBCSMS_RCSMUI	0x08
-#define	SUNI_REGM_SSTBCSMS_RCSMUV	0x04
-#define	SUNI_REGM_SSTBCSMS_RCSMMI	0x02
-#define	SUNI_REGM_SSTBCSMS_RCSMMV	0x01
-#define	SUNI_REGX_SSTBCSMS	"\020\10RCSMUIE\7RCSMMIE\4RCSMUI\3RCSMUV\2RCSMMI\1RCSMMV"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RPOPCTRL	"RPOP Status/Control"
-#define	SUNI_REGO_RPOPCTRL		0x30
-#define	SUNI_REGM_RPOPCTRL_LOP		0x20
-#define	SUNI_REGM_RPOPCTRL_PAIS		0x08
-#define	SUNI_REGM_RPOPCTRL_PRDI		0x04
-#define	SUNI_REGM_RPOPCTRL_NEWPTRI_622	0x02
-#define	SUNI_REGM_RPOPCTRL_NEWPTRE_622	0x01
-#define	SUNI_REGM_RPOPCTRL_RESERVED	0x00
-#define	SUNI_REGX_RPOPCTRL	"\020\6LOP\4PAIS\3PRDI"
-#define	SUNI_REGX_RPOPCTRL_622	"\020\6LOP\4PAIS\3PRDI\2NEWPTRI\1NEWPTRE"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RPOPISTAT	"RPOP Interrupt Status"
-#define	SUNI_REGO_RPOPISTAT		0x31
-#define	SUNI_REGM_RPOPISTAT_PSLI	0x80
-#define	SUNI_REGM_RPOPISTAT_LOPI	0x20
-#define	SUNI_REGM_RPOPISTAT_PAISI	0x08
-#define	SUNI_REGM_RPOPISTAT_PRDII	0x04
-#define	SUNI_REGM_RPOPISTAT_BIPEI	0x02
-#define	SUNI_REGM_RPOPISTAT_FEBEI	0x01
-#define	SUNI_REGX_RPOPISTAT	"\02010PSLI\6LOPI\4PAISI\3PRDII\2BIPEI\1FEBEI"
-
-/* 622 */
-#define	SUNI_REGN_RPOPPIS	"RPOP Pointer Interrupt Status"
-#define	SUNI_REGO_RPOPPIS		0x32
-#define	SUNI_REGM_RPOPPIS_ILLJREQI	0x80
-#define	SUNI_REGM_RPOPPIS_DISCOPAI	0x20
-#define	SUNI_REGM_RPOPPIS_INVNDFI	0x10
-#define	SUNI_REGM_RPOPPIS_ILLPTRI	0x08
-#define	SUNI_REGM_RPOPPIS_NSEI		0x04
-#define	SUNI_REGM_RPOPPIS_PSEI		0x02
-#define	SUNI_REGM_RPOPPIS_NDFI		0x01
-#define	SUNI_REGX_RPOPPIS	"\020\10ILLJREQI\6DISCOPAI\5INVNDFI\4ILLPTRI\3NSEI\2PSEI\1NDFI"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RPOPIEN	"RPOP Interrupt Enable"
-#define	SUNI_REGO_RPOPIEN		0x33
-#define	SUNI_REGM_RPOPIEN_PSLE		0x80
-#define	SUNI_REGM_RPOPIEN_LOPE		0x20
-#define	SUNI_REGM_RPOPIEN_PAISE		0x08
-#define	SUNI_REGM_RPOPIEN_PRDIE		0x04
-#define	SUNI_REGM_RPOPIEN_BIPEE		0x02
-#define	SUNI_REGM_RPOPIEN_FEBEE		0x01
-#define	SUNI_REGM_RPOPIEN_RESERVED	0x00
-#define	SUNI_REGX_RPOPIEN	"\02010PSLE\6LOPE\4PAISE\3PRDIE\2BIPEE\1FEBEE"
-
-/* 622 */
-#define	SUNI_REGN_RPOPPIE	"RPOP Pointer Interrupt Enable"
-#define	SUNI_REGO_RPOPPIE		0x34
-#define	SUNI_REGM_RPOPPIE_ILLJREQE	0x80
-#define	SUNI_REGM_RPOPPIE_DISCOPAE	0x20
-#define	SUNI_REGM_RPOPPIE_INVNDFE	0x10
-#define	SUNI_REGM_RPOPPIE_ILLPTRE	0x08
-#define	SUNI_REGM_RPOPPIE_NSEE		0x04
-#define	SUNI_REGM_RPOPPIE_PSEE		0x02
-#define	SUNI_REGM_RPOPPIE_NDFE		0x01
-#define	SUNI_REGX_RPOPPIE	"\020\10ILLJREQE\6DISCOPAE\5INVNDFE\4ILLPTRE\3NSEE\2PSEE\1NDFE"
-
-/* 622 */
-#define	SUNI_REGN_RPOPPTR	"RPOP Pointer"
-#define	SUNI_REGO_RPOPPTR		0x35	/* +36 */
-#define	SUNI_REGM_RPOPPTR_RDI10		0x20
-#define	SUNI_REGM_RPOPPTR_S		0x0c
-#define	SUNI_REGS_RPOPPTR_S		2
-#define	SUNI_REGM_RPOPPTR		0x03
-#define	SUNI_REGS_RPOPPTR		0
-#define	SUNI_REGX_RPOPPTR		"\020\6RDI10\12\xc\20S"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RPOPPSL "RPOP Path Signal Label"
-#define	SUNI_REGO_RPOPPSL		0x37
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RPOPBIP8 "RPOP Path BIP-8"
-#define	SUNI_REGO_RPOPBIP8		0x38	/* +39 */
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RPOPFEBE "RPOP Path FEBE"
-#define	SUNI_REGO_RPOPFEBE		0x3A	/* +3B */
-
-/* 622 */
-#define	SUNI_REGN_RPOPRDI	"RPOP RDI"
-#define	SUNI_REGO_RPOPRDI		0x3C
-#define	SUNI_REGM_RPOPRDI_BLKFEBE	0x10
-#define	SUNI_REGM_RPOPRDI_ARDIE		0x02
-#define	SUNI_REGM_RPOPRDI_ARDIV		0x01
-#define	SUNI_REGM_RPOPRDI_RESERVED	0x00
-#define	SUNI_REGX_RPOPRDI	"\020\5BLKFEBE\2ARDIE\1ARDIV"
-
-/* lite, ultra */
-#define	SUNI_REGN_RPOPBIP8CFG 	"RPOP Path BIP-8 Configuration"
-#define	SUNI_REGO_RPOPBIP8CFG		0x3D
-#define	SUNI_REGM_RPOPBIP8CFG_BLKBIP	0x20
-#define	SUNI_REGM_RPOPBIP8CFG_RESERVED	0x00
-#define	SUNI_REGX_RPOPBIP8CFG 	"\020\6BLKBIP"
-
-/* 622 */
-#define	SUNI_REGN_RPOPRING	"RPOP Ring Control"
-#define	SUNI_REGO_RPOPRING		0x3D
-#define	SUNI_REGM_RPOPRING_SOS		0x80
-#define	SUNI_REGM_RPOPRING_ENSS		0x40
-#define	SUNI_REGM_RPOPRING_BLKBIP	0x20
-#define	SUNI_REGM_RPOPRING_DISFS	0x10
-#define	SUNI_REGM_RPOPRING_BLKBIPO	0x08
-#define	SUNI_REGM_RPOPRING_RESERVED	0x00
-#define	SUNI_REGX_RPOPRING	"\020\10SOS\7ENSS\6BLKBIP\5DISFS\4BLKBIPO"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TPOPCTRL	"TPOP Control/Diagnostic"
-#define	SUNI_REGO_TPOPCTRL		0x40
-#define	SUNI_REGM_TPOPCTRL_EXCFS	0x80	/* 622 */
-#define	SUNI_REGM_TPOPCTRL_DB3		0x02
-#define	SUNI_REGM_TPOPCTRL_PAIS		0x01
-#define	SUNI_REGM_TPOPCTRL_RESERVED	0x00
-#define	SUNI_REGX_TPOPCTRL	"\020\2DB3\1PAIS"
-#define	SUNI_REGX_TPOPCTRL_622	"\020\4EXCFS\2DB3\1PAIS"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TPOPPTRC "TPOP Pointer Control"
-#define	SUNI_REGO_TPOPPTRC		0x41
-#define	SUNI_REGM_TPOPPTRC_FTPTR	0x40
-#define	SUNI_REGM_TPOPPTRC_SOS		0x20
-#define	SUNI_REGM_TPOPPTRC_PLD		0x10
-#define	SUNI_REGM_TPOPPTRC_NDF		0x08
-#define	SUNI_REGM_TPOPPTRC_NSE		0x04
-#define	SUNI_REGM_TPOPPTRC_PSE		0x02
-#define	SUNI_REGM_TPOPPTRC_RESERVED	0x00
-#define	SUNI_REGX_TPOPPTRC "\020\7FTPTR\6SOS\5PLD\4NDF\3NSE\2PSE"
-
-/* 622 */
-#define	SUNI_REGN_TPOPCP	"TPOP Current Pointer"
-#define	SUNI_REGO_TPOPCP		0x43	/* +44 */
-#define	SUNI_REGM_TPOPCP		0x03
-#define	SUNI_REGS_TPOPCP		0
-#define	SUNI_REGX_TPOPCP	"\020"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TPOPAPTR 	"TPOP Arbitrary Pointer"
-#define	SUNI_REGO_TPOPAPTR		0x45	/* +46 */
-#define	SUNI_REGM_TPOPAPTR_NDF		0xF0
-#define	SUNI_REGS_TPOPAPTR_NDF		4
-#define	SUNI_REGM_TPOPAPTR_S		0x0C
-#define	SUNI_REGS_TPOPAPTR_S		2
-#define	SUNI_REGM_TPOPAPTR		0x03
-#define	SUNI_REGS_TPOPAPTR		0
-#define	SUNI_REGX_TPOPAPTR	"\020\12\x0C\12S\12\xF0\12NDF"
-
-#define	SUNI_REGM_SONET			0
-#define	SUNI_REGM_SDH			2
-
-/* 622 */
-#define	SUNI_REGN_TPOPPT	"TPOP Path Trace"
-#define	SUNI_REGO_TPOPPT		0x47
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TPOPPSL	"TPOP Path Signal Label"
-#define	SUNI_REGO_TPOPPSL		0x48
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TPOPSTATUS "TPOP Path Status"
-#define	SUNI_REGO_TPOPSTATUS		0x49
-#define	SUNI_REGM_TPOPSTATUS_FEBE	0xF0
-#define	SUNI_REGS_TPOPSTATUS_FEBE	4
-#define	SUNI_REGM_TPOPSTATUS_PRDI	0x08
-#define	SUNI_REGM_TPOPSTATUS_G1		0x07
-#define	SUNI_REGS_TPOPSTATUS_G1		0
-#define	SUNI_REGX_TPOPSTATUS "\020\12\xF0\12FEBE\4PRDI\12\x7\12G"
-
-/* 622 */
-#define	SUNI_REGN_TPOPPUC	"TPOP Path User Channel"
-#define	SUNI_REGO_TPOPPUC		0x4A
-
-/* 622 */
-#define	SUNI_REGN_TPOPPG1	"TPOP Path Grow #1"
-#define	SUNI_REGO_TPOPPG1		0x4B
-
-/* 622 */
-#define	SUNI_REGN_TPOPPG2	"TPOP Path Grow #2"
-#define	SUNI_REGO_TPOPPG2		0x4C
-
-/* 622 */
-#define	SUNI_REGN_TPOPPG3	"TPOP Path Grow #3"
-#define	SUNI_REGO_TPOPPG3		0x4D
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_RACPCTRL	"RACP Control/Status"
-#define	SUNI_REGO_RACPCTRL		0x50
-#define	SUNI_REGM_RACPCTRL_OOCDV	0x80
-#define	SUNI_REGM_RACPCTRL_FSEN		0x80
-#define	SUNI_REGM_RACPCTRL_RXPTYP	0x40
-#define	SUNI_REGM_RACPCTRL_PASS		0x20
-#define	SUNI_REGM_RACPCTRL_DISCOR	0x10
-#define	SUNI_REGM_RACPCTRL_HCSPASS	0x08
-#define	SUNI_REGM_RACPCTRL_HCSADD	0x04
-#define	SUNI_REGM_RACPCTRL_DDSCR	0x02
-#define	SUNI_REGM_RACPCTRL_FIFORST	0x01
-#define	SUNI_REGX_RACPCTRL	"\020\10OOCDV\7RXPTYP\6PASS\5DISCO\4HCSPASS\3HCSADD\2DDSCR\1FIFORST"
-#define	SUNI_REGX_RACPCTRL_622	"\020\10FSEN\7RXPTYP\6PASS\5DISCO\4HCSPASS\3HCSADD\2DDSCR\1FIFORST"
-
-/* lite, ultra */
-#define	SUNI_REGN_RACPINTR "RACP Interrupt Enable/Status"
-#define	SUNI_REGO_RACPINTR		0x51
-#define	SUNI_REGM_RACPINTR_OOCDE	0x80
-#define	SUNI_REGM_RACPINTR_HCSE		0x40
-#define	SUNI_REGM_RACPINTR_FIFOE	0x20
-#define	SUNI_REGM_RACPINTR_OOCDI	0x10
-#define	SUNI_REGM_RACPINTR_CHCSI	0x08
-#define	SUNI_REGM_RACPINTR_UHCSI	0x04
-#define	SUNI_REGM_RACPINTR_FOVRI	0x02
-#define	SUNI_REGX_RACPINTR "\020\10OOCDE\7HCSE\6FIFOE\5OOCDI\4CHCSI\3UHCSI\2FOVRI"
-
-/* 622 */
-#define	SUNI_REGN_RACPIS	"RACP Interrupt Status"
-#define	SUNI_REGO_RACPIS		0x51
-#define	SUNI_REGM_RACPIS_OCDV		0x80
-#define	SUNI_REGM_RACPIS_LCDV		0x40
-#define	SUNI_REGM_RACPIS_OCDI		0x20
-#define	SUNI_REGM_RACPIS_LCDI		0x10
-#define	SUNI_REGM_RACPIS_CHCSI		0x08
-#define	SUNI_REGM_RACPIS_UHCSI		0x04
-#define	SUNI_REGM_RACPIS_FOVRI		0x02
-#define	SUNI_REGM_RACPIS_FUDRI		0x01
-#define	SUNI_REGX_RACPIS	"\020\10OCDV\7LCDV\6OCDI\5LCDI\4CHCSI\3UHCSI\2FOVRI\1FUDRI"
-
-/* lite, ultra */
-#define	SUNI_REGN_RACPPATTERN "RACP Match Header Pattern"
-#define	SUNI_REGO_RACPPATTERN		0x52
-#define	SUNI_REGM_RACPPATTERN_GFC	0xF0
-#define	SUNI_REGS_RACPPATTERN_GFC	4
-#define	SUNI_REGM_RACPPATTERN_PTI	0x0E
-#define	SUNI_REGS_RACPPATTERN_PTI	1
-#define	SUNI_REGM_RACPPATTERN_CLP	0x01
-#define	SUNI_REGS_RACPPATTERN_CLP	0
-#define	SUNI_REGX_RACPPATTERN "\020\12\xF0\12GFC\12\x0E\12PTI\1CLP"
-
-/* 622 */
-#define	SUNI_REGN_RACPIEC	"RACP Interrupt Enable/Control"
-#define	SUNI_REGO_RACPIEC		0x52
-#define	SUNI_REGM_RACPIEC_OCDE		0x80
-#define	SUNI_REGM_RACPIEC_LCDE		0x40
-#define	SUNI_REGM_RACPIEC_HCSE		0x20
-#define	SUNI_REGM_RACPIEC_FIFOE		0x10
-#define	SUNI_REGM_RACPIEC_LCDDROP	0x08
-#define	SUNI_REGM_RACPIEC_RCALEVEL0	0x04
-#define	SUNI_REGM_RACPIEC_HCSFTR	0x03
-#define	SUNI_REGX_RACPIEC	"\020\10OCDE\7LCDE\6HCSE\5FIFOE\4LCDDROP\3RCALEVEL0\12\0x3\12HCSFTR"
-
-/* lite, ultra */
-#define	SUNI_REGN_RACPMASK "RACP Match Header Mask"
-#define	SUNI_REGO_RACPMASK		0x53
-#define	SUNI_REGM_RACPMASK_MGFC		0xF0
-#define	SUNI_REGS_RACPMASK_MGFC		4
-#define	SUNI_REGM_RACPMASK_MPTI		0x0E
-#define	SUNI_REGS_RACPMASK_MPTI		1
-#define	SUNI_REGM_RACPMASK_MCLP		0x01
-#define	SUNI_REGS_RACPMASK_MCLP		0
-#define	SUNI_REGX_RACPMASK "\020\12\xF0\12MGFC\12\x0E\12MPTI\1MCLP"
-
-/* 622 */
-#define	SUNI_REGO_RACPPATTERN_622	0x53
-
-/* lite, ultra */
-#define	SUNI_REGN_RACPCHCS "RACP Correctable HCS Error Count"
-#define	SUNI_REGO_RACPCHCS		0x54
-
-/* 622 */
-#define	SUNI_REGO_RACPMASK_622		0x54
-
-/* lite, ultra */
-#define	SUNI_REGN_RACPUHCS "RACP Uncorrectable HCS Error Count"
-#define	SUNI_REGO_RACPUHCS		0x55
-
-/* 622 */
-#define	SUNI_REGO_RACPCHCS_622		0x55	/* +56 */
-#define	SUNI_REGM_RACPCHCS_622		0x0f
-
-/* lite, ultra */
-#define	SUNI_REGN_RACPCNT "RACP Receive Cell Counter"
-#define	SUNI_REGO_RACPCNT		0x56	/* +57,58 */
-#define	SUNI_REGM_RACPCNT		0x07
-
-/* 622 */
-#define	SUNI_REGO_RACPUHCS_622		0x57	/* +58 */
-#define	SUNI_REGM_RACPUHCS_622		0x0f
-
-/* 622 */
-#define	SUNI_REGO_RACPCNT_622		0x59	/* +5A,5B */
-#define	SUNI_REGM_RACPCNT_622		0x1F
-
-/* lite, ultra */
-#define	SUNI_REGN_RACPCFG "RACP Configuration"
-#define	SUNI_REGO_RACPCFG		0x59
-#define	SUNI_REGM_RACPCFG_RGFCE		0xF0
-#define	SUNI_REGS_RACPCFG_RGFCE		4
-#define	SUNI_REGM_RACPCFG_FSEN		0x08
-#define	SUNI_REGM_RACPCFG_LEVEL0	0x04
-#define	SUNI_REGM_RACPCFG_HCSFTR	0x03
-#define	SUNI_REGS_RACPCFG_HCSFTR	0
-#define	SUNI_REGX_RACPCFG "\020\12\xF0\20RGFCE\4FSEN\3RCALEVEL0\12\x03\12HCSFTR"
-
-/* 622 */
-#define	SUNI_REGN_RACPGFC	"RACP GFC Control/Misc. Control"
-#define	SUNI_REGO_RACPGFC		0x5C
-#define	SUNI_REGM_RACPGFC_CDDIS		0x80
-#define	SUNI_REGM_RACPGFC_RXBYTEPRTY	0x40
-#define	SUNI_REGM_RACPGFC_RGFCE		0x0f
-#define	SUNI_REGX_RACPGFC	"\020\10CDDIS\7RXBYTEPRTY\12\xf\20"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TACPCTRL "TACP Control/Status"
-#define	SUNI_REGO_TACPCTRL		0x60
-#define	SUNI_REGM_TACPCTRL_FIFOE	0x80
-#define	SUNI_REGM_TACPCTRL_TSOCI	0x40
-#define	SUNI_REGM_TACPCTRL_FOVRI	0x20
-#define	SUNI_REGM_TACPCTRL_DHCS		0x10
-#define	SUNI_REGM_TACPCTRL_HCSB		0x08	/* ultra, 622 */
-#define	SUNI_REGM_TACPCTRL_HCSADD	0x04
-#define	SUNI_REGM_TACPCTRL_DSCR		0x02
-#define	SUNI_REGM_TACPCTRL_FIFORST	0x01
-#define	SUNI_REGX_TACPCTRL_LITE		"\020\10FIFOE\7TSOCI\6FOVRI\5DHCS\3HCSADD\2DSCR\1FIFORST"
-#define	SUNI_REGX_TACPCTRL_ULTRA	"\020\10FIFOE\7TSOCI\6FOVRI\5DHCS\4HCSB\3HCSADD\2DSCR\1FIFORST"
-#define	SUNI_REGX_TACPCTRL_622		"\020\10FIFOE\7TSOCI\6FOVRI\5DHCS\4HCSB\3HCSADD\2DSCR\1FIFORST"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TACPIDLEH 	"TACP Idle/Unassigned Cell Header Pattern"
-#define	SUNI_REGO_TACPIDLEH		0x61
-#define	SUNI_REGM_TACPIDLEH_GFC		0xF0
-#define	SUNI_REGS_TACPIDLEH_GFC		4
-#define	SUNI_REGM_TACPIDLEH_PTI		0x0E
-#define	SUNI_REGS_TACPIDLEH_PTI		1
-#define	SUNI_REGM_TACPIDLEH_CLP		0x01
-#define	SUNI_REGS_TACPIDLEH_CLP		0
-#define	SUNI_REGX_TACPIDLEH 	"\020\12\xF0\20GFC\12\x0E\20PTI\12\x01\20CLP"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TACPIDLEP "TACP Idle/Unassigned Cell Payload Octet Pattern"
-#define	SUNI_REGO_TACPIDLEP		0x62
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TACPFIFOC		"TACP FIFO Control"
-#define	SUNI_REGO_TACPFIFOC		0x63
-#define	SUNI_REGM_TACPFIFOC_TXPTYP	0x80
-#define	SUNI_REGM_TACPFIFOC_TXPRTYE	0x40
-#define	SUNI_REGM_TACPFIFOC_TXPRTYI	0x10
-#define	SUNI_REGM_TACPFIFOC_TXPRTYI_622	0x30
-#define	SUNI_REGS_TACPFIFOC_TXPRTYI_622	4
-#define	SUNI_REGM_TACPFIFOC_FIFODP	0x0C
-#define	SUNI_REGS_TACPFIFOC_FIFODP	2
-#define	SUNI_REGM_TACPFIFOC_TCALEVEL0	0x02
-#define	SUNI_REGM_TACPFIFOC_HCSCTLEB	0x01
-#define	SUNI_REGM_TACPFIFOC_RESERVED	0x00
-#define	SUNI_REGX_TACPFIFOC		"\020\10TXPTYP\7TXPRTYE\5TXPRTYI\12\x0C\20FIFODP\2TCALEVEL0"
-#define	SUNI_REGX_TACPFIFOC_622		"\020\10TXPTYP\7TXPRTYE\12\x30\12TXPRTYI\12\x0C\20FIFODP\2TCALEVEL0\1HCSCTLEB"
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_TACPCNT "TACP Transmit Cell Counter"
-#define	SUNI_REGO_TACPCNT		0x64	/* +65,66 */
-#define	SUNI_REGM_TACPCNT		0x07
-#define	SUNI_REGM_TACPCNT_622		0x1F
-
-/* lite, ultra */
-#define	SUNI_REGN_TACPCFG "TACP Configuration"
-#define	SUNI_REGO_TACPCFG		0x67
-#define	SUNI_REGM_TACPCFG_TGFCE		0xF0
-#define	SUNI_REGS_TACPCFG_TGFCE		4
-#define	SUNI_REGM_TACPCFG_FSEN		0x08
-#define	SUNI_REGM_TACPCFG_H4INSB	0x04
-#define	SUNI_REGM_TACPCFG_FIXBYTE	0x03
-#define	SUNI_REGS_TACPCFG_FIXBYTE	0
-#define	SUNI_REGX_TACPCFG "\020\12\xF0\20TGFCE\4FSEN\3H4INSB\12\x03\20FIXBYTE"
-
-/* 622 */
-#define	SUNI_REGN_TACPGFC	"TACP Fixed Stuff/GFC"
-#define	SUNI_REGO_TACPGFC		0x67
-#define	SUNI_REGO_TACPGFC_TGFCE		0xf0
-#define	SUNI_REGS_TACPGFC_TGFCE		4
-#define	SUNI_REGO_TACPGFC_FSEN		0x08
-#define	SUNI_REGO_TACPGFC_TXBYTEPRTY	0x04
-#define	SUNI_REGO_TACPGFC_FIXBYTE	0x03
-#define	SUNI_REGS_TACPGFC_FIXBYTE	0
-#define	SUNI_REGX_TACPGFC	"\020\12\xf0\20TGFCE\4FSEN\3TXBYTEPRTY\12\x3\20FIXBYTE"
-
-/* 622 */
-#define	SUNI_REGN_SPTBCTRL	"SPTB Control"
-#define	SUNI_REGO_SPTBCTRL		0x68
-#define	SUNI_REGO_SPTBCTRL_RRAMACC	0x40
-#define	SUNI_REGO_SPTBCTRL_RTIUIE	0x20
-#define	SUNI_REGO_SPTBCTRL_RTIMIE	0x10
-#define	SUNI_REGO_SPTBCTRL_PER5		0x08
-#define	SUNI_REGO_SPTBCTRL_TNULL	0x04
-#define	SUNI_REGO_SPTBCTRL_NOSYNC	0x02
-#define	SUNI_REGO_SPTBCTRL_LEN16	0x01
-#define	SUNI_REGX_SPTBCTRL	"\020\7RRAMACC\6RTIUIE\5RTIMIE\4PER5\3TNULL\2NOSYNC\1LEN16"
-
-/* 622 */
-#define	SUNI_REGN_SPTBPTIS	"SPTB Path Trace Identifier Status"
-#define	SUNI_REGO_SPTBPTIS		0x69
-#define	SUNI_REGM_SPTBPTIS_BUSY		0x80
-#define	SUNI_REGM_SPTBPTIS_RTIUI	0x08
-#define	SUNI_REGM_SPTBPTIS_RTIUV	0x04
-#define	SUNI_REGM_SPTBPTIS_RTIMI	0x02
-#define	SUNI_REGM_SPTBPTIS_RTIMV	0x01
-#define	SUNI_REGX_SPTBPTIS	"\020\10BUSY\4RTIUI\3RTIUV\2RTIMI\1RTIMV"
-
-/* 622 */
-#define	SUNI_REGN_SPTBIAR	"SPTB Indirect Address Register"
-#define	SUNI_REGO_SPTBIAR		0x6A
-#define	SUNI_REGM_SPTBIAR_RWB		0x80
-#define	SUNI_REGM_SPTBIAR_A		0x7f
-#define	SUNI_REGX_SPTBIAR	"\020\10RWB\12\x7f\20A"
-
-/* 622 */
-#define	SUNI_REGN_SPTBIDR	"SPTB Indirect Data Register"
-#define	SUNI_REGO_SPTBIDR		0x6B
-
-/* 622 */
-#define	SUNI_REGN_SPTBEPSL	"SPTB Expected Path Signal Label"
-#define	SUNI_REGO_SPTBEPSL		0x6C
-
-/* 622 */
-#define	SUNI_REGN_SPTBPSLS	"SPTB Path Signal Label Status"
-#define	SUNI_REGO_SPTBPSLS		0x6D
-#define	SUNI_REGM_SPTBPSLS_RPSLUIE	0x80
-#define	SUNI_REGM_SPTBPSLS_RPSLMIE	0x40
-#define	SUNI_REGM_SPTBPSLS_RPSLUI	0x08
-#define	SUNI_REGM_SPTBPSLS_RPSLUV	0x04
-#define	SUNI_REGM_SPTBPSLS_RPSLMI	0x02
-#define	SUNI_REGM_SPTBPSLS_RPSLMV	0x01
-#define	SUNI_REGX_SPTBPSLS	"\020\10RPSLUIE\7RPSLMIE\4RPSLUI\3RPSLUV\2RPSLMI\1RPSLMV"
-
-/* ultra */
-#define	SUNI_REGN_POPCCTRL "POPC Control"
-#define	SUNI_REGO_POPCCTRL		0x68
-#define	SUNI_REGM_POPCCTRL_PDAT		0xC0
-#define	SUNI_REGS_POPCCTRL_PDAT		6
-#define	SUNI_REGM_POPCCTRL_TOGGLE	0x30
-#define	SUNI_REGS_POPCCTRL_TOGGLE	4
-#define	SUNI_REGM_POPCCTRL_TRAFFIC	0x02
-#define	SUNI_REGM_POPCCTRL_ALARM	0x01
-#define	SUNI_REGX_POPCCTRL "\020\12\xC0\20PDAT\12\x30\20TOGGLE\2TRAFFIC\1ALARM"
-
-/* ultra */
-#define	SUNI_REGN_POPCSTROBE0 "POPC Strobe Rate 0"
-#define	SUNI_REGO_POPCSTROBE0		0x69
-
-/* ultra */
-#define	SUNI_REGN_POPCSTROBE1 "POPC Strobe Rate 1"
-#define	SUNI_REGO_POPCSTROBE1		0x6A
-
-/* 622 */
-#define	SUNI_REGN_BERMCTRL	"BERM Control"
-#define	SUNI_REGO_BERMCTRL		0x70
-#define	SUNI_REGM_BERMCTRL_BERTEN	0x80
-#define	SUNI_REGM_BERMCTRL_BERIE	0x01
-#define	SUNI_REGX_BERMCTRL	"\020\10BERTEN\1BERIE"
-
-/* 622 */
-#define	SUNI_REGN_BERMINT	"BERM Interrupt"
-#define	SUNI_REGO_BERMINT		0x71
-#define	SUNI_REGM_BERMINT_TST		0xf0
-#define	SUNI_REGS_BERMINT_TST		4
-#define	SUNI_REGM_BERMINT_BERI		0x01
-#define	SUNI_REGX_BERMINT	"\020\12\xf0\20BERM_TST\1BERI"
-
-/* 622 */
-#define	SUNI_REGN_BERMLAP	"BERM Line BIP Accumulation Period"
-#define	SUNI_REGO_BERMLAP		0x72	/* +73 */
-
-/* 622 */
-#define	SUNI_REGN_BERMLT	"BERM Line BIP Threshold"
-#define	SUNI_REGO_BERMLT		0x74	/* +75 */
-
-/* lite, ultra, 622 */
-#define	SUNI_REGN_MTEST "Master Test"
-#define	SUNI_REGO_MTEST			0x80
-#define	SUNI_REGM_MTEST_DS27_53_622	0x80
-#define	SUNI_REGM_MTEST_BYPASS_ULTRA	0x40
-#define	SUNI_REGM_MTEST_PMCATST_ULTRA	0x20
-#define	SUNI_REGM_MTEST_PMCTST		0x10
-#define	SUNI_REGM_MTEST_DBCTRL		0x08
-#define	SUNI_REGM_MTEST_IOTST		0x04
-#define	SUNI_REGM_MTEST_HIZDATA		0x02
-#define	SUNI_REGM_MTEST_HIZIO		0x01
-#define	SUNI_REGX_MTEST_LITE	"\020\5PMCTST\4DBCTRL\3IOTST\2HIZDATA\1HIZIO"
-#define	SUNI_REGX_MTEST_ULTRA	"\020\7BYPASS\6PMCATST\5PMCTST\4DBCTRL\3IOTST\2HIZDATA\1HIZIO"
-#define	SUNI_REGX_MTEST_622	"\020\10DS27_53\5PMCTST\4DBCTRL\3IOTST\2HIZDATA\1HIZIO"
-
-/*
- * Printing support
- */
-#define	SUNI_PRINT_LITE							\
-	{ /* 00 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MRESET, 			\
-	  SUNI_REGN_MRESET,	SUNI_REGX_MRESET_LITE },		\
-	{ /* 01 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MCONFIG,			\
-	  SUNI_REGN_MCONFIG,	SUNI_REGX_MCONFIG_LITE },		\
-	{ /* 02 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MISTATUS,			\
-	  SUNI_REGN_MISTATUS,	SUNI_REGX_MISTATUS_LITE },		\
-	  /* 03 unused */						\
-	{ /* 04 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MCLKM,			\
-	  SUNI_REGN_MCLKM,	SUNI_REGX_MCLKM_LITE },			\
-	{ /* 05 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MCTRL,			\
-	  SUNI_REGN_MCTRL,	SUNI_REGX_MCTRL_LITE },			\
-	{ /* 06 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_CLKSYN,			\
-	  SUNI_REGN_CLKSYN,	SUNI_REGX_CLKSYN_LITE },		\
-	{ /* 07 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_CLKREC_LITE,			\
-	  SUNI_REGN_CLKREC,	SUNI_REGX_CLKREC_LITE },		\
-	  /* 08-0F unused */						\
-	{ /* 10 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RSOPCIE,			\
-	  SUNI_REGN_RSOPCIE,	SUNI_REGX_RSOPCIE },			\
-	{ /* 11 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RSOPSIS,			\
-	  SUNI_REGN_RSOPSIS,	SUNI_REGX_RSOPSIS },			\
-	{ /* 12, 13 */							\
-	  UTP_REGT_INT16,	SUNI_REGO_RSOP_BIP8,			\
-	  SUNI_REGN_RSOP_BIP8,	NULL },					\
-	{ /* 14 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TSOPCTRL,			\
-	  SUNI_REGN_TSOPCTRL,	SUNI_REGX_TSOPCTRL },			\
-	{ /* 15 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TSOPDIAG,			\
-	  SUNI_REGN_TSOPDIAG,	SUNI_REGX_TSOPDIAG },			\
-	  /* 16-17 unused */						\
-	{ /* 18 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RLOPCTRL,			\
-	  SUNI_REGN_RLOPCTRL,	SUNI_REGX_RLOPCTRL },			\
-	{ /* 19 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RLOPINTR,			\
-	  SUNI_REGN_RLOPINTR,	SUNI_REGX_RLOPINTR },			\
-	{ /* 1A, 1B, 1C */						\
-	  UTP_REGT_INT20,	SUNI_REGO_RLOPBIP8_24,			\
-	  SUNI_REGN_RLOPBIP8_24, NULL },				\
-	{ /* 1D, 1E, 1F */						\
-	  UTP_REGT_INT20,	SUNI_REGO_RLOPFEBE,			\
-	  SUNI_REGN_RLOPFEBE,	NULL },					\
-	{ /* 20 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TLOPCTRL,			\
-	  SUNI_REGN_TLOPCTRL,	SUNI_REGX_TLOPCTRL },			\
-	{ /* 21 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TLOPDIAG,			\
-	  SUNI_REGN_TLOPDIAG,	SUNI_REGX_TLOPDIAG },			\
-	  /* 22-2F unused */						\
-	{ /* 30 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPCTRL,			\
-	  SUNI_REGN_RPOPCTRL,	SUNI_REGX_RPOPCTRL },			\
-	{ /* 31 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPISTAT,			\
-	  SUNI_REGN_RPOPISTAT,	SUNI_REGX_RPOPISTAT },			\
-	  /* 32 unused */						\
-	{ /* 33 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPIEN,			\
-	  SUNI_REGN_RPOPIEN,	SUNI_REGX_RPOPIEN },			\
-	  /* 34-36 unused */						\
-	{ /* 37 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RPOPPSL,			\
-	  SUNI_REGN_RPOPPSL,	NULL },					\
-	{ /* 38, 39 */							\
-	  UTP_REGT_INT16,	SUNI_REGO_RPOPBIP8,			\
-	  SUNI_REGN_RPOPBIP8,	NULL },					\
-	{ /* 3A, 3B */							\
-	  UTP_REGT_INT16,	SUNI_REGO_RPOPFEBE,			\
-	  SUNI_REGN_RPOPFEBE,	NULL },					\
-	  /* 3C unused */						\
-	{ /* 3D */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPBIP8CFG,			\
-	  SUNI_REGN_RPOPBIP8CFG, SUNI_REGX_RPOPBIP8CFG },		\
-	  /* 3E-3F unused */						\
-	{ /* 40 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TPOPCTRL,			\
-	  SUNI_REGN_TPOPCTRL,	SUNI_REGX_TPOPCTRL },			\
-	{ /* 41 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TPOPPTRC,			\
-	  SUNI_REGN_TPOPPTRC,	SUNI_REGX_TPOPPTRC },			\
-	  /* 42-44 unused */						\
-	{ /* 45, 46 */							\
-	  UTP_REGT_INT10BITS,	SUNI_REGO_TPOPAPTR,			\
-	  SUNI_REGN_TPOPAPTR,	SUNI_REGX_TPOPAPTR },			\
-	  /* 47 unused */						\
-	{ /* 48 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TPOPPSL,			\
-	  SUNI_REGN_TPOPPSL,	NULL },					\
-	{ /* 49 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TPOPSTATUS,			\
-	  SUNI_REGN_TPOPSTATUS,	SUNI_REGX_TPOPSTATUS },			\
-	  /* 4A-4F unused */						\
-	{ /* 50 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPCTRL,			\
-	  SUNI_REGN_RACPCTRL,	SUNI_REGX_RACPCTRL },			\
-	{ /* 51 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPINTR,			\
-	  SUNI_REGN_RACPINTR,	SUNI_REGX_RACPINTR },			\
-	{ /* 52 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPPATTERN,			\
-	  SUNI_REGN_RACPPATTERN, SUNI_REGX_RACPPATTERN },		\
-	{ /* 53 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPMASK,			\
-	  SUNI_REGN_RACPMASK,	SUNI_REGX_RACPMASK },			\
-	{ /* 54 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RACPCHCS,			\
-	  SUNI_REGN_RACPCHCS,	NULL },					\
-	{ /* 55 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RACPUHCS,			\
-	  SUNI_REGN_RACPUHCS,	NULL },					\
-	{ /* 56, 57, 58 */						\
-	  UTP_REGT_INT19,	SUNI_REGO_RACPCNT,			\
-	  SUNI_REGN_RACPCNT,	NULL },					\
-	{ /* 59 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPCFG,			\
-	  SUNI_REGN_RACPCFG,	SUNI_REGX_RACPCFG },			\
-	  /* 5A-5F unused */						\
-	{ /* 60 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPCTRL,			\
-	  SUNI_REGN_TACPCTRL,	SUNI_REGX_TACPCTRL_LITE },		\
-	{ /* 61 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPIDLEH,			\
-	  SUNI_REGN_TACPIDLEH,	SUNI_REGX_TACPIDLEH },			\
-	{ /* 62 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TACPIDLEP,			\
-	  SUNI_REGN_TACPIDLEP,	NULL },					\
-	{ /* 63 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPFIFOC,			\
-	  SUNI_REGN_TACPFIFOC,	SUNI_REGX_TACPFIFOC },			\
-	{ /* 64, 65, 66 */						\
-	  UTP_REGT_INT19,	SUNI_REGO_TACPCNT,			\
-	  SUNI_REGN_TACPCNT,	NULL },					\
-	{ /* 67 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPGFC,			\
-	  SUNI_REGN_TACPGFC,	SUNI_REGX_TACPGFC },			\
-	  /* 68-7f unused */						\
-	{ /* 80 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MTEST,			\
-	  SUNI_REGN_MTEST,	SUNI_REGX_MTEST_LITE }
-
-#define	SUNI_PRINT_ULTRA						\
-	{ /* 00 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MRESET, 			\
-	  SUNI_REGN_MRESET,	SUNI_REGX_MRESET_ULTRA },		\
-	{ /* 01 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MCONFIG,			\
-	  SUNI_REGN_MCONFIG,	SUNI_REGX_MCONFIG_ULTRA },		\
-	{ /* 02 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MISTATUS,			\
-	  SUNI_REGN_MISTATUS,	SUNI_REGX_MISTATUS_ULTRA },		\
-	{ /* 03 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MMCTRL,			\
-	  SUNI_REGN_MMCTRL,	SUNI_REGX_MMCTRL },			\
-	{ /* 04 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MCLKM,			\
-	  SUNI_REGN_MCLKM,	SUNI_REGX_MCLKM_ULTRA },		\
-	{ /* 05 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MCTRL,			\
-	  SUNI_REGN_MCTRL,	SUNI_REGX_MCTRL_ULTRA },		\
-	{ /* 06 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_CLKSYN,			\
-	  SUNI_REGN_CLKSYN,	SUNI_REGX_CLKSYN_ULTRA },		\
-	  /* 07 unused */						\
-	{ /* 08 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_CLKREC_ULTRA,			\
-	  SUNI_REGN_CLKREC,	SUNI_REGX_CLKREC_ULTRA },		\
-	{ /* 09 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_CLKRECCFG,			\
-	  SUNI_REGN_CLKRECCFG,	SUNI_REGX_CLKRECCFG },			\
-	{ /* 0A */							\
-	  UTP_REGT_BITS,	SUNI_REGO_LTXCFG1,			\
-	  SUNI_REGN_LTXCFG1,	SUNI_REGX_LTXCFG1 },			\
-	{ /* 0B */							\
-	  UTP_REGT_BITS,	SUNI_REGO_LTXCFG2,			\
-	  SUNI_REGN_LTXCFG2,	SUNI_REGX_LTXCFG2 },			\
-	{ /* 0C */							\
-	  UTP_REGT_BITS,	SUNI_REGO_LRXCFG,			\
-	  SUNI_REGN_LRXCFG,	SUNI_REGX_LRXCFG },			\
-	  /* 0D-0F unused */						\
-	{ /* 10 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RSOPCIE,			\
-	  SUNI_REGN_RSOPCIE,	SUNI_REGX_RSOPCIE },			\
-	{ /* 11 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RSOPSIS,			\
-	  SUNI_REGN_RSOPSIS,	SUNI_REGX_RSOPSIS },			\
-	{ /* 12, 13 */							\
-	  UTP_REGT_INT16,	SUNI_REGO_RSOP_BIP8,			\
-	  SUNI_REGN_RSOP_BIP8,	NULL },					\
-	{ /* 14 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TSOPCTRL,			\
-	  SUNI_REGN_TSOPCTRL,	SUNI_REGX_TSOPCTRL },			\
-	{ /* 15 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TSOPDIAG,			\
-	  SUNI_REGN_TSOPDIAG,	SUNI_REGX_TSOPDIAG },			\
-	  /* 16-17 unused */						\
-	{ /* 18 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RLOPCTRL,			\
-	  SUNI_REGN_RLOPCTRL,	SUNI_REGX_RLOPCTRL },			\
-	{ /* 19 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RLOPINTR,			\
-	  SUNI_REGN_RLOPINTR,	SUNI_REGX_RLOPINTR },			\
-	{ /* 1A, 1B, 1C */						\
-	  UTP_REGT_INT20,	SUNI_REGO_RLOPBIP8_24,			\
-	  SUNI_REGN_RLOPBIP8_24, NULL },				\
-	{ /* 1D, 1E, 1F */						\
-	  UTP_REGT_INT20,	SUNI_REGO_RLOPFEBE,			\
-	  SUNI_REGN_RLOPFEBE,	NULL },					\
-	{ /* 20 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TLOPCTRL,			\
-	  SUNI_REGN_TLOPCTRL,	SUNI_REGX_TLOPCTRL },			\
-	{ /* 21 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TLOPDIAG,			\
-	  SUNI_REGN_TLOPDIAG,	SUNI_REGX_TLOPDIAG },			\
-	  /* 22-2F unused */						\
-	{ /* 30 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPCTRL,			\
-	  SUNI_REGN_RPOPCTRL,	SUNI_REGX_RPOPCTRL },			\
-	{ /* 31 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPISTAT,			\
-	  SUNI_REGN_RPOPISTAT,	SUNI_REGX_RPOPISTAT },			\
-	  /* 32 unused */						\
-	{ /* 33 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPIEN,			\
-	  SUNI_REGN_RPOPIEN,	SUNI_REGX_RPOPIEN },			\
-	  /* 34-36 unused */						\
-	{ /* 37 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RPOPPSL,			\
-	  SUNI_REGN_RPOPPSL,	NULL },					\
-	{ /* 38, 39 */							\
-	  UTP_REGT_INT16,	SUNI_REGO_RPOPBIP8,			\
-	  SUNI_REGN_RPOPBIP8,	NULL },					\
-	{ /* 3A, 3B */							\
-	  UTP_REGT_INT16,	SUNI_REGO_RPOPFEBE,			\
-	  SUNI_REGN_RPOPFEBE,	NULL },					\
-	  /* 3C unused */						\
-	{ /* 3D */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPBIP8CFG,			\
-	  SUNI_REGN_RPOPBIP8CFG, SUNI_REGX_RPOPBIP8CFG },		\
-	  /* 3E-3F unused */						\
-	{ /* 40 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TPOPCTRL,			\
-	  SUNI_REGN_TPOPCTRL,	SUNI_REGX_TPOPCTRL },			\
-	{ /* 41 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TPOPPTRC,			\
-	  SUNI_REGN_TPOPPTRC,	SUNI_REGX_TPOPPTRC },			\
-	  /* 42-44 unused */						\
-	{ /* 45, 46 */							\
-	  UTP_REGT_INT10BITS,	SUNI_REGO_TPOPAPTR,			\
-	  SUNI_REGN_TPOPAPTR,	SUNI_REGX_TPOPAPTR },			\
-	  /* 47 unused */						\
-	{ /* 48 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TPOPPSL,			\
-	  SUNI_REGN_TPOPPSL,	NULL },					\
-	{ /* 49 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TPOPSTATUS,			\
-	  SUNI_REGN_TPOPSTATUS,	SUNI_REGX_TPOPSTATUS },			\
-	  /* 4A-4F unused */						\
-	{ /* 50 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPCTRL,			\
-	  SUNI_REGN_RACPCTRL,	SUNI_REGX_RACPCTRL },			\
-	{ /* 51 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPINTR,			\
-	  SUNI_REGN_RACPINTR,	SUNI_REGX_RACPINTR },			\
-	{ /* 52 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPPATTERN,			\
-	  SUNI_REGN_RACPPATTERN, SUNI_REGX_RACPPATTERN },		\
-	{ /* 53 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPMASK,			\
-	  SUNI_REGN_RACPMASK,	SUNI_REGX_RACPMASK },			\
-	{ /* 54 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RACPCHCS,			\
-	  SUNI_REGN_RACPCHCS,	NULL },					\
-	{ /* 55 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RACPUHCS,			\
-	  SUNI_REGN_RACPUHCS,	NULL },					\
-	{ /* 56, 57, 58 */						\
-	  UTP_REGT_INT19,	SUNI_REGO_RACPCNT,			\
-	  SUNI_REGN_RACPCNT,	NULL },					\
-	{ /* 59 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPCFG,			\
-	  SUNI_REGN_RACPCFG,	SUNI_REGX_RACPCFG },			\
-	  /* 5A-5F unused */						\
-	{ /* 60 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPCTRL,			\
-	  SUNI_REGN_TACPCTRL,	SUNI_REGX_TACPCTRL_ULTRA },		\
-	{ /* 61 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPIDLEH,			\
-	  SUNI_REGN_TACPIDLEH,	SUNI_REGX_TACPIDLEH },			\
-	{ /* 62 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TACPIDLEP,			\
-	  SUNI_REGN_TACPIDLEP,	NULL },					\
-	{ /* 63 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPFIFOC,			\
-	  SUNI_REGN_TACPFIFOC,	SUNI_REGX_TACPFIFOC },			\
-	{ /* 64, 65, 66 */						\
-	  UTP_REGT_INT19,	SUNI_REGO_TACPCNT,			\
-	  SUNI_REGN_TACPCNT,	NULL },					\
-	{ /* 67 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPGFC,			\
-	  SUNI_REGN_TACPGFC,	SUNI_REGX_TACPGFC },			\
-	{ /* 68 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_POPCCTRL,			\
-	  SUNI_REGN_POPCCTRL,	SUNI_REGX_POPCCTRL },			\
-	{ /* 69 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_POPCSTROBE0,			\
-	  SUNI_REGN_POPCSTROBE0, NULL },				\
-	{ /* 6A */							\
-	  UTP_REGT_INT8,	SUNI_REGO_POPCSTROBE1,			\
-	  SUNI_REGN_POPCSTROBE1, NULL },				\
-	  /* 6B-7f unused */						\
-	{ /* 80 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MTEST,			\
-	  SUNI_REGN_MTEST,	SUNI_REGX_MTEST_ULTRA }
-
-#define	SUNI_PRINT_622 							\
-	{ /* 00 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MRESET, 			\
-	  SUNI_REGN_MRESET,	SUNI_REGX_MRESET_622 },			\
-	{ /* 01 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MCONFIG,			\
-	  SUNI_REGN_MCONFIG,	SUNI_REGX_MCONFIG_622 },		\
-	{ /* 02 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MISTATUS,			\
-	  SUNI_REGN_MISTATUS,	SUNI_REGX_MISTATUS_622 },		\
-	{ /* 03 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_PISO, 			\
-	  SUNI_REGN_PISO,	SUNI_REGX_PISO },			\
-	{ /* 04 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MCTRLM, 			\
-	  SUNI_REGN_MCTRLM,	SUNI_REGX_MCTRLM },			\
-	{ /* 05 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MALARM,			\
-	  SUNI_REGN_MALARM,	SUNI_REGX_MALARM },			\
-	{ /* 06 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_POUT,				\
-	  SUNI_REGN_POUT,	SUNI_REGX_POUT },			\
-	{ /* 07 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_PIN,				\
-	  SUNI_REGN_PIN,	NULL },					\
-	{ /* 08 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_PINV,				\
-	  SUNI_REGN_PINV,	SUNI_REGX_PINV },			\
-	{ /* 09 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_PINE,				\
-	  SUNI_REGN_PINE,	NULL },					\
-	{ /* 0A */							\
-	  UTP_REGT_INT8,	SUNI_REGO_XC1,				\
-	  SUNI_REGN_XC1,	NULL },					\
-	{ /* 0B */							\
-	  UTP_REGT_BITS,	SUNI_REGO_APSCS,			\
-	  SUNI_REGN_APSCS,	SUNI_REGX_APSCS },			\
-	{ /* 0C */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RK1,				\
-	  SUNI_REGN_RK1,	NULL },					\
-	{ /* 0D */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RK2,				\
-	  SUNI_REGN_RK2,	NULL },					\
-	{ /* 0E */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RZ1,				\
-	  SUNI_REGN_RZ1,	NULL },					\
-	{ /* 0F */							\
-	  UTP_REGT_INT8,	SUNI_REGO_XZ1,				\
-	  SUNI_REGN_XZ1,	NULL },					\
-	{ /* 10 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RSOPCIE,			\
-	  SUNI_REGN_RSOPCIE,	SUNI_REGX_RSOPCIE_622 },		\
-	{ /* 11 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RSOPSIS,			\
-	  SUNI_REGN_RSOPSIS,	SUNI_REGX_RSOPSIS },			\
-	{ /* 12, 13 */							\
-	  UTP_REGT_INT16,	SUNI_REGO_RSOP_BIP8,			\
-	  SUNI_REGN_RSOP_BIP8,	NULL },					\
-	{ /* 14 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TSOPCTRL,			\
-	  SUNI_REGN_TSOPCTRL,	SUNI_REGX_TSOPCTRL },			\
-	{ /* 15 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TSOPDIAG,			\
-	  SUNI_REGN_TSOPDIAG,	SUNI_REGX_TSOPDIAG },			\
-	  /* 16-17 unused */						\
-	{ /* 18 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RLOPCTRL,			\
-	  SUNI_REGN_RLOPCTRL,	SUNI_REGX_RLOPCTRL_622 },		\
-	{ /* 19 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RLOPINTR,			\
-	  SUNI_REGN_RLOPINTR,	SUNI_REGX_RLOPINTR },			\
-	{ /* 1A, 1B, 1C */						\
-	  UTP_REGT_INT20,	SUNI_REGO_RLOPBIP8_24_96,		\
-	  SUNI_REGN_RLOPBIP8_24_96, NULL },				\
-	{ /* 1D, 1E, 1F */						\
-	  UTP_REGT_INT20,	SUNI_REGO_RLOPFEBE,			\
-	  SUNI_REGN_RLOPFEBE,	NULL },					\
-	{ /* 20 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TLOPCTRL,			\
-	  SUNI_REGN_TLOPCTRL,	SUNI_REGX_TLOPCTRL_622 },		\
-	{ /* 21 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TLOPDIAG,			\
-	  SUNI_REGN_TLOPDIAG,	SUNI_REGX_TLOPDIAG },			\
-	{ /* 22 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TLOP_XK1,			\
-	  SUNI_REGN_TLOP_XK1,	NULL },					\
-	{ /* 23 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TLOP_XK2,			\
-	  SUNI_REGN_TLOP_XK2,	NULL },					\
-	  /* 24-27 unused */						\
-	{ /* 28 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_SSTBCTRL,			\
-	  SUNI_REGN_SSTBCTRL,	SUNI_REGX_SSTBCTRL },			\
-	{ /* 29 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_SSTBSTIS,			\
-	  SUNI_REGN_SSTBSTIS,	SUNI_REGX_SSTBSTIS },			\
-	{ /* 2A */							\
-	  UTP_REGT_BITS,	SUNI_REGO_SSTBIAR,			\
-	  SUNI_REGN_SSTBIAR,	SUNI_REGX_SSTBIAR },			\
-	{ /* 2B */							\
-	  UTP_REGT_INT8,	SUNI_REGO_SSTBIDR,			\
-	  SUNI_REGN_SSTBIDR,	NULL },					\
-	  /* 2C unused (see chip errata) */				\
-	{ /* 2D */							\
-	  UTP_REGT_BITS,	SUNI_REGO_SSTBCSMS,			\
-	  SUNI_REGN_SSTBCSMS,	SUNI_REGX_SSTBCSMS },			\
-	  /* 2E-2F unused */						\
-	{ /* 30 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPCTRL,			\
-	  SUNI_REGN_RPOPCTRL,	SUNI_REGX_RPOPCTRL_622 },		\
-	{ /* 31 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPISTAT,			\
-	  SUNI_REGN_RPOPISTAT,	SUNI_REGX_RPOPISTAT },			\
-	{ /* 32 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPPIS,			\
-	  SUNI_REGN_RPOPPIS,	SUNI_REGX_RPOPPIS },			\
-	{ /* 33 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPIEN,			\
-	  SUNI_REGN_RPOPIEN,	SUNI_REGX_RPOPIEN },			\
-	{ /* 34 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPPIE,			\
-	  SUNI_REGN_RPOPPIE,	SUNI_REGX_RPOPPIE },			\
-	{ /* 35, 36 */							\
-	  UTP_REGT_INT10BITS,	SUNI_REGO_RPOPPTR,			\
-	  SUNI_REGN_RPOPPTR,	SUNI_REGX_RPOPPTR },			\
-	{ /* 37 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_RPOPPSL,			\
-	  SUNI_REGN_RPOPPSL,	NULL },					\
-	{ /* 38, 39 */							\
-	  UTP_REGT_INT16,	SUNI_REGO_RPOPBIP8,			\
-	  SUNI_REGN_RPOPBIP8,	NULL },					\
-	{ /* 3A, 3B */							\
-	  UTP_REGT_INT16,	SUNI_REGO_RPOPFEBE,			\
-	  SUNI_REGN_RPOPFEBE,	NULL },					\
-	{ /* 3C */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPRDI,			\
-	  SUNI_REGN_RPOPRDI,	SUNI_REGX_RPOPRDI },			\
-	{ /* 3D */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RPOPRING,			\
-	  SUNI_REGN_RPOPRING,	SUNI_REGX_RPOPRING },			\
-	  /* 3E-3F unused */						\
-	{ /* 40 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TPOPCTRL,			\
-	  SUNI_REGN_TPOPCTRL,	SUNI_REGX_TPOPCTRL_622 },		\
-	{ /* 41 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TPOPPTRC,			\
-	  SUNI_REGN_TPOPPTRC,	SUNI_REGX_TPOPPTRC },			\
-	  /* 42 unused */						\
-	{ /* 43, 44 */							\
-	  UTP_REGT_INT10BITS,	SUNI_REGO_TPOPCP,			\
-	  SUNI_REGN_TPOPCP,	SUNI_REGX_TPOPCP },			\
-	{ /* 45, 46 */							\
-	  UTP_REGT_INT10BITS,	SUNI_REGO_TPOPAPTR,			\
-	  SUNI_REGN_TPOPAPTR,	SUNI_REGX_TPOPAPTR },			\
-	{ /* 47 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TPOPPT,			\
-	  SUNI_REGN_TPOPPT,	NULL },					\
-	{ /* 48 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TPOPPSL,			\
-	  SUNI_REGN_TPOPPSL,	NULL },					\
-	{ /* 49 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TPOPSTATUS,			\
-	  SUNI_REGN_TPOPSTATUS,	SUNI_REGX_TPOPSTATUS },			\
-	{ /* 4A */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TPOPPUC,			\
-	  SUNI_REGN_TPOPPUC,	NULL },					\
-	{ /* 4B */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TPOPPG1,			\
-	  SUNI_REGN_TPOPPG1,	NULL },					\
-	{ /* 4C */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TPOPPG2,			\
-	  SUNI_REGN_TPOPPG2,	NULL },					\
-	{ /* 4D */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TPOPPG3,			\
-	  SUNI_REGN_TPOPPG3,	NULL },					\
-	  /* 4E-4F unused */						\
-	{ /* 50 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPCTRL,			\
-	  SUNI_REGN_RACPCTRL,	SUNI_REGX_RACPCTRL_622 },		\
-	{ /* 51 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPIS,			\
-	  SUNI_REGN_RACPIS,	SUNI_REGX_RACPIS },			\
-	{ /* 52 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPIEC,			\
-	  SUNI_REGN_RACPIEC,	SUNI_REGX_RACPIEC },			\
-	{ /* 53 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPPATTERN_622,		\
-	  SUNI_REGN_RACPPATTERN, SUNI_REGX_RACPPATTERN },		\
-	{ /* 54 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPMASK_622,			\
-	  SUNI_REGN_RACPMASK,	SUNI_REGX_RACPMASK },			\
-	{ /* 55, 56 */							\
-	  UTP_REGT_INT12,	SUNI_REGO_RACPCHCS_622,			\
-	  SUNI_REGN_RACPCHCS,	NULL },					\
-	{ /* 57, 58 */							\
-	  UTP_REGT_INT12,	SUNI_REGO_RACPUHCS_622,			\
-	  SUNI_REGN_RACPUHCS,	NULL },					\
-	{ /* 59, 5A, 5B */						\
-	  UTP_REGT_INT21,	SUNI_REGO_RACPCNT_622,			\
-	  SUNI_REGN_RACPCNT,	NULL },					\
-	{ /* 5C */							\
-	  UTP_REGT_BITS,	SUNI_REGO_RACPGFC,			\
-	  SUNI_REGN_RACPGFC,	SUNI_REGX_RACPGFC },			\
-	  /* 5D-5F unused */						\
-	{ /* 60 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPCTRL,			\
-	  SUNI_REGN_TACPCTRL,	SUNI_REGX_TACPCTRL_622 },		\
-	{ /* 61 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPIDLEH,			\
-	  SUNI_REGN_TACPIDLEH,	SUNI_REGX_TACPIDLEH },			\
-	{ /* 62 */							\
-	  UTP_REGT_INT8,	SUNI_REGO_TACPIDLEP,			\
-	  SUNI_REGN_TACPIDLEP,	NULL },					\
-	{ /* 63 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPFIFOC,			\
-	  SUNI_REGN_TACPFIFOC,	SUNI_REGX_TACPFIFOC_622 },		\
-	{ /* 64, 65, 66 */						\
-	  UTP_REGT_INT21,	SUNI_REGO_TACPCNT,			\
-	  SUNI_REGN_TACPCNT,	NULL },					\
-	{ /* 67 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_TACPGFC,			\
-	  SUNI_REGN_TACPGFC,	SUNI_REGX_TACPGFC },			\
-	{ /* 68 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_SPTBCTRL,			\
-	  SUNI_REGN_SPTBCTRL,	SUNI_REGX_SPTBCTRL },			\
-	{ /* 69 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_SPTBPTIS,			\
-	  SUNI_REGN_SPTBPTIS,	SUNI_REGX_SPTBPTIS },			\
-	{ /* 6A */							\
-	  UTP_REGT_BITS,	SUNI_REGO_SPTBIAR,			\
-	  SUNI_REGN_SPTBIAR,	SUNI_REGX_SPTBIAR },			\
-	{ /* 6B */							\
-	  UTP_REGT_INT8,	SUNI_REGO_SPTBIDR,			\
-	  SUNI_REGN_SPTBIDR,	NULL },					\
-	{ /* 6C */							\
-	  UTP_REGT_INT8,	SUNI_REGO_SPTBEPSL,			\
-	  SUNI_REGN_SPTBEPSL,	NULL },					\
-	{ /* 6D */							\
-	  UTP_REGT_BITS,	SUNI_REGO_SPTBPSLS,			\
-	  SUNI_REGN_SPTBPSLS,	SUNI_REGX_SPTBPSLS },			\
-	  /* 6E-6F unused */						\
-	{ /* 70 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_BERMCTRL,			\
-	  SUNI_REGN_BERMCTRL,	SUNI_REGX_BERMCTRL },			\
-	{ /* 71 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_BERMINT,			\
-	  SUNI_REGN_BERMINT,	SUNI_REGX_BERMINT },			\
-	{ /* 72, 73 */							\
-	  UTP_REGT_INT16,	SUNI_REGO_BERMLAP,			\
-	  SUNI_REGN_BERMLAP,	NULL },					\
-	{ /* 74, 75 */							\
-	  UTP_REGT_INT16,	SUNI_REGO_BERMLT,			\
-	  SUNI_REGN_BERMLT,	NULL },					\
-	  /* 76-7f unused */						\
-	{ /* 80 */							\
-	  UTP_REGT_BITS,	SUNI_REGO_MTEST,			\
-	  SUNI_REGN_MTEST,	SUNI_REGX_MTEST_622 }
-
-#endif /* _DEV_UTOPIA_SUNI_H */
diff --git a/include.new/dev/utopia/utopia.h b/include.new/dev/utopia/utopia.h
deleted file mode 100644
index ff33155..0000000
--- a/include.new/dev/utopia/utopia.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * Copyright (c) 2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/dev/utopia/utopia.h 142384 2005-02-24 16:56:36Z harti $
- */
-#ifndef _DEV_UTOPIA_UTOPIA_H
-#define	_DEV_UTOPIA_UTOPIA_H
-
-/* Structure for user-level register formatting */
-struct utopia_print {
-	uint8_t		type;	/* register type */
-	uint8_t		reg;	/* register number */
-	const char	*name;	/* register name */
-	const char	*fmt;	/* format for printing */
-};
-
-/*
- * Types of registers
- */
-#define	UTP_REGT_BITS		0x0	/* use printb to print */
-#define	UTP_REGT_INT8		0x1	/* 8 bit hex number */
-#define	UTP_REGT_INT10BITS	0x2	/* 10 bit hex number + 6 bit printb */
-#define	UTP_REGT_INT12		0x3	/* 12 bit LE hex */
-#define	UTP_REGT_INT16		0x4	/* 16 bit LE hex */
-#define	UTP_REGT_INT19		0x5	/* 19 bit LE hex */
-#define	UTP_REGT_INT20		0x6	/* 20 bit LE hex */
-#define	UTP_REGT_INT21		0x7	/* 21 bit LE hex */
-#define	UTP_REGT_INT18		0x8	/* 18 bit LE hex */
-
-/* number of additional registers per type */
-#define	UTP_REG_ADD	0, 0, 1, 1, 1, 2, 2, 2, 2
-
-/* flags field */
-#define	UTP_FL_NORESET		0x0001	/* cannot write MRESET register */
-#define	UTP_FL_POLL_CARRIER	0x0002	/* need to poll for carrier */
-
-/* state field */
-#define	UTP_ST_ACTIVE		0x0001	/* registers accessible */
-#define	UTP_ST_SDH		0x0002	/* SDH or SONET */
-#define	UTP_ST_UNASS		0x0004	/* produce unassigned cells */
-#define	UTP_ST_NOSCRAMB		0x0008	/* no scrambling */
-#define	UTP_ST_DETACH		0x0010	/* detaching */
-#define	UTP_ST_ATTACHED		0x0020	/* successful attached */
-
-/* carrier field */
-#define	UTP_CARR_UNKNOWN	0
-#define	UTP_CARR_OK		1
-#define	UTP_CARR_LOST		2
-
-/* loopback field */
-#define	UTP_LOOP_NONE		0x0000
-#define	UTP_LOOP_TIME		0x0001	/* timing source loopback */
-#define	UTP_LOOP_DIAG		0x0002	/* diagnostic loopback */
-#define	UTP_LOOP_LINE		0x0004	/* serial line loopback */
-#define	UTP_LOOP_PARAL		0x0008	/* parallel diagnostic loopback */
-#define	UTP_LOOP_TWIST		0x0010	/* twisted pair diagnostic loopback */
-#define	UTP_LOOP_PATH		0x0020	/* diagnostic path loopback */
-
-/* type */
-#define	UTP_TYPE_UNKNOWN	0
-#define	UTP_TYPE_SUNI_LITE	1
-#define	UTP_TYPE_SUNI_ULTRA	2
-#define	UTP_TYPE_SUNI_622	3
-#define	UTP_TYPE_IDT77105	4
-#define	UTP_TYPE_IDT77155	5
-#define	UTP_TYPE_CX28250	6
-
-/*
- * Statistics. These structures are versioned.
- */
-struct utopia_stats1 {
-	uint32_t	version;	/* version of this statistics struct */
-	uint32_t	fill;
-
-	uint64_t	rx_sbip;	/* rx section BIP errors */
-	uint64_t	rx_lbip;	/* rx line BIP errors */
-	uint64_t	rx_lfebe;	/* rx line far end block errors */
-	uint64_t	rx_pbip;	/* rx path BIP errors */
-	uint64_t	rx_pfebe;	/* rx path far end block errors */
-	uint64_t	rx_cells;	/* received cells */
-	uint64_t	rx_corr;	/* correctable cell errors */
-	uint64_t	rx_uncorr;	/* uncorrectable cell errors */
-	uint64_t	rx_symerr;	/* symbol errors */
-
-	uint64_t	tx_cells;	/* transmitted cells */
-};
-
-#ifdef _KERNEL
-
-#include <sys/queue.h>
-
-/*
- * These must be implemented by the card driver
- */
-struct utopia_methods {
-	/* read at most n PHY registers starting at reg into val */
-	int	(*readregs)(struct ifatm *, u_int reg, uint8_t *val, u_int *n);
-
-	/* change the bits given by mask to them in val in register reg */
-	int	(*writereg)(struct ifatm *, u_int reg, u_int mask, u_int val);
-};
-
-/*
- * Public state
- */
-struct utopia {
-	struct ifatm	*ifatm;		/* driver data */
-	struct ifmedia	*media;		/* driver supplied */
-	struct mtx	*lock;		/* driver supplied */
-	const struct utopia_methods *methods;
-	LIST_ENTRY(utopia) link;	/* list of these structures */
-	u_int		flags;		/* flags set by the driver */
-	u_int		state;		/* current state */
-	u_int		carrier;	/* carrier state */
-	u_int		loopback;	/* loopback mode */
-	const struct utopia_chip *chip;	/* chip operations */
-	struct utopia_stats1 stats;	/* statistics */
-};
-
-struct utopia_chip {
-	/* type and name of the chip */
-	u_int	type;
-	const char *const name;
-
-	/* number of registers */
-	u_int	nregs;
-
-	/* reset chip to known state */
-	int	(*reset)(struct utopia *);
-
-	/* set SONET/SDH mode */
-	int	(*set_sdh)(struct utopia *, int sdh);
-
-	/* set idle/unassigned cells */
-	int	(*set_unass)(struct utopia *, int unass);
-
-	/* enable/disable scrambling */
-	int	(*set_noscramb)(struct utopia *, int noscramb);
-
-	/* update carrier status */
-	int	(*update_carrier)(struct utopia *);
-
-	/* set loopback mode */
-	int	(*set_loopback)(struct utopia *, u_int mode);
-
-	/* handle interrupt */
-	void	(*intr)(struct utopia *);
-
-	/* update statistics */
-	void	(*update_stats)(struct utopia *);
-};
-
-/*
- * These are implemented in the common utopia code
- */
-int utopia_attach(struct utopia *, struct ifatm *, struct ifmedia *,
-    struct mtx *, struct sysctl_ctx_list *, struct sysctl_oid_list *,
-    const struct utopia_methods *);
-void utopia_detach(struct utopia *);
-
-int utopia_start(struct utopia *);
-void utopia_stop(struct utopia *);
-
-void utopia_init_media(struct utopia *);
-void utopia_reset_media(struct utopia *);
-
-#define	utopia_reset(S)			((S)->chip->reset((S)))
-#define	utopia_set_sdh(S, SDH)		((S)->chip->set_sdh((S), (SDH)))
-#define	utopia_set_unass(S, U)		((S)->chip->set_unass((S), (U)))
-#define	utopia_set_noscramb(S, N)	((S)->chip->set_noscramb((S), (N)))
-#define	utopia_update_carrier(S)	((S)->chip->update_carrier((S)))
-#define	utopia_update_stats(S)		((S)->chip->update_stats((S)))
-#define	utopia_set_loopback(S, L)	((S)->chip->set_loopback((S), (L)))
-#define	utopia_intr(S)			((S)->chip->intr((S)))
-
-#endif /* _KERNEL */
-
-#endif	/* _DEV_UTOPIA_UTOPIA_H */
diff --git a/include.new/dev/utopia/utopia_priv.h b/include.new/dev/utopia/utopia_priv.h
deleted file mode 100644
index 1f325c3..0000000
--- a/include.new/dev/utopia/utopia_priv.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2005
- *	Hartmut Brandt.
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/dev/utopia/utopia_priv.h 142384 2005-02-24 16:56:36Z harti $
- *
- * Private include file for the interface between chip files and
- * the utopia main stuff.
- */
-
-#ifndef _DEV_UTOPIA_UTOPIA_PRIV_H
-#define	_DEV_UTOPIA_UTOPIA_PRIV_H
-
-#define UTP_READREGS(UTOPIA, REG, VALP, NP)				\
-    (UTOPIA)->methods->readregs((UTOPIA)->ifatm, REG, VALP, NP)
-#define UTP_WRITEREG(UTOPIA, REG, MASK, VAL)			\
-    (UTOPIA)->methods->writereg((UTOPIA)->ifatm, REG, MASK, VAL)
-
-uint32_t utopia_update(struct utopia *, u_int, u_int, uint32_t);
-void utopia_check_carrier(struct utopia *, u_int);
-
-#endif	/* _DEV_UTOPIA_UTOPIA_PRIV_H */
diff --git a/include.new/dev/vkbd/vkbd_var.h b/include.new/dev/vkbd/vkbd_var.h
deleted file mode 100644
index 4a060ef..0000000
--- a/include.new/dev/vkbd/vkbd_var.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * vkbd_var.h
- *
- * Copyright (c) 2004 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: vkbd_var.h,v 1.4 2004/08/17 17:43:14 max Exp $
- * $FreeBSD: releng/10.2/sys/dev/vkbd/vkbd_var.h 139749 2005-01-06 01:43:34Z imp $
- */
-
-#ifndef _VKBD_VAR_H_
-#define _VKBD_VAR_H_
-
-#define	VKBD_Q_SIZE	64	/* vkbd input queue size */
-
-struct vkbd_status
-{
-	int	mode;		/* keyboard mode */
-	int	leds;		/* keyboard LEDs */
-	int	lock;		/* keyboard lock key state */
-	int	delay;		/* keyboard delay */
-	int	rate;		/* keyboard rate */
-	int	reserved[3];
-};
-
-typedef struct vkbd_status	vkbd_status_t;
-typedef struct vkbd_status *	vkbd_status_p;
-
-#endif /* ndef _VKBD_VAR_H_ */
-
diff --git a/include.new/dev/wi/if_wavelan_ieee.h b/include.new/dev/wi/if_wavelan_ieee.h
deleted file mode 100644
index 02970ed..0000000
--- a/include.new/dev/wi/if_wavelan_ieee.h
+++ /dev/null
@@ -1,753 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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: releng/10.2/sys/dev/wi/if_wavelan_ieee.h 192492 2009-05-20 22:28:55Z imp $
- */
-
-#ifndef _IF_WAVELAN_IEEE_H
-#define _IF_WAVELAN_IEEE_H
-
-/*
- * This header defines a simple command interface to the FreeBSD
- * WaveLAN/IEEE driver (wi) driver, which is used to set certain
- * device-specific parameters which can't be easily managed through
- * ifconfig(8). No, sysctl(2) is not the answer. I said a _simple_
- * interface, didn't I.
- */
-
-#ifndef SIOCSWAVELAN
-#define SIOCSWAVELAN	SIOCSIFGENERIC
-#endif
-
-#ifndef SIOCGWAVELAN
-#define SIOCGWAVELAN	SIOCGIFGENERIC
-#endif
-
-/*
- * Technically I don't think there's a limit to a record
- * length. The largest record is the one that contains the CIS
- * data, which is 240 words long, so 256 should be a safe
- * value.
- */
-#define WI_MAX_DATALEN	512
-
-#if 0
-struct wi_req {
-	u_int16_t	wi_len;
-	u_int16_t	wi_type;
-	u_int16_t	wi_val[WI_MAX_DATALEN];
-};
-#endif
-
-/*
- * Private LTV records (interpreted only by the driver). This is
- * a minor kludge to allow reading the interface statistics from
- * the driver.
- */
-#define WI_RID_IFACE_STATS	0x0100
-#define WI_RID_MGMT_XMIT	0x0200
-#define WI_RID_ZERO_CACHE	0x0300
-#define WI_RID_READ_CACHE	0x0400
-#define WI_RID_FWDOWNLOAD	0x0500
-#define WI_RID_MONITOR_MODE	0x0600
-#define WI_RID_MIF		0x0700
-#define	WI_RID_SCAN_APS		0x0800
-#define	WI_RID_READ_APS		0x0900
-
-struct wi_80211_hdr {
-	u_int16_t		frame_ctl;
-	u_int16_t		dur_id;
-	u_int8_t		addr1[6];
-	u_int8_t		addr2[6];
-	u_int8_t		addr3[6];
-	u_int16_t		seq_ctl;
-	u_int8_t		addr4[6];
-};
-
-#define WI_FCTL_VERS		0x0002
-#define WI_FCTL_FTYPE		0x000C
-#define WI_FCTL_STYPE		0x00F0
-#define WI_FCTL_TODS		0x0100
-#define WI_FCTL_FROMDS		0x0200
-#define WI_FCTL_MOREFRAGS	0x0400
-#define WI_FCTL_RETRY		0x0800
-#define WI_FCTL_PM		0x1000
-#define WI_FCTL_MOREDATA	0x2000
-#define WI_FCTL_WEP		0x4000
-#define WI_FCTL_ORDER		0x8000
-
-#define WI_FTYPE_MGMT		0x0000
-#define WI_FTYPE_CTL		0x0004
-#define WI_FTYPE_DATA		0x0008
-
-#define WI_STYPE_MGMT_ASREQ	0x0000	/* association request */
-#define WI_STYPE_MGMT_ASRESP	0x0010	/* association response */
-#define WI_STYPE_MGMT_REASREQ	0x0020	/* reassociation request */
-#define WI_STYPE_MGMT_REASRESP	0x0030	/* reassociation response */
-#define WI_STYPE_MGMT_PROBEREQ	0x0040	/* probe request */
-#define WI_STYPE_MGMT_PROBERESP	0x0050	/* probe response */
-#define WI_STYPE_MGMT_BEACON	0x0080	/* beacon */
-#define WI_STYPE_MGMT_ATIM	0x0090	/* announcement traffic ind msg */
-#define WI_STYPE_MGMT_DISAS	0x00A0	/* disassociation */
-#define WI_STYPE_MGMT_AUTH	0x00B0	/* authentication */
-#define WI_STYPE_MGMT_DEAUTH	0x00C0	/* deauthentication */
-
-#define WI_STYPE_CTL_PSPOLL     0x00A0
-#define WI_STYPE_CTL_RTS        0x00B0
-#define WI_STYPE_CTL_CTS        0x00C0
-#define WI_STYPE_CTL_ACK        0x00D0
-#define WI_STYPE_CTL_CFEND      0x00E0
-#define WI_STYPE_CTL_CFENDACK   0x00F0
-
-struct wi_mgmt_hdr {
-	u_int16_t		frame_ctl;
-	u_int16_t		duration;
-	u_int8_t		dst_addr[6];
-	u_int8_t		src_addr[6];
-	u_int8_t		bssid[6];
-	u_int16_t		seq_ctl;
-};
-
-/* 
- * Lucent/wavelan IEEE signal strength cache
- *
- * driver keeps cache of last
- * MAXWICACHE packets to arrive including signal strength info.
- * daemons may read this via ioctl
- *
- * Each entry in the wi_sigcache has a unique macsrc.
- */
-struct wi_sigcache {
-	char	macsrc[6];	/* unique MAC address for entry */
-	int	ipsrc;		/* ip address associated with packet */
-	int	signal;		/* signal strength of the packet */
-	int	noise;		/* noise value */
-	int	quality;	/* quality of the packet */
-};
-
-/*
- * Firmware downloading API.  We support downloading into RAM and into
- * flash.  We copy the entire .hex file for both the primary and secondary
- * firmware into the kernel, which is minorly gross, but matches the
- * format of the compiled in firmware.
- */
-struct wi_fwdownload {
-	int	type;		/* What type of download. */
-#define WI_FW_RAM	1
-#define WI_FW_FLASH	2
-	size_t	pri_len;	/* Primary firmware length */
-	size_t	sec_len;	/* Secondary firmware length */
-	caddr_t	pri_data;	/* Pointer (user) to primary data */
-	caddr_t sec_data;	/* Pointer (user) to secondary data */
-};
-
-struct wi_counters {
-	uint32_t		wi_tx_unicast_frames;
-	uint32_t		wi_tx_multicast_frames;
-	uint32_t		wi_tx_fragments;
-	uint32_t		wi_tx_unicast_octets;
-	uint32_t		wi_tx_multicast_octets;
-	uint32_t		wi_tx_deferred_xmits;
-	uint32_t		wi_tx_single_retries;
-	uint32_t		wi_tx_multi_retries;
-	uint32_t		wi_tx_retry_limit;
-	uint32_t		wi_tx_discards;
-	uint32_t		wi_rx_unicast_frames;
-	uint32_t		wi_rx_multicast_frames;
-	uint32_t		wi_rx_fragments;
-	uint32_t		wi_rx_unicast_octets;
-	uint32_t		wi_rx_multicast_octets;
-	uint32_t		wi_rx_fcs_errors;
-	uint32_t		wi_rx_discards_nobuf;
-	uint32_t		wi_tx_discards_wrong_sa;
-	uint32_t		wi_rx_WEP_cant_decrypt;
-	uint32_t		wi_rx_msg_in_msg_frags;
-	uint32_t		wi_rx_msg_in_bad_msg_frags;
-};
-
-/*
- * Network parameters, static configuration entities.
- */
-#define WI_RID_PORTTYPE		0xFC00 /* Connection control characteristics */
-#define WI_RID_MAC_NODE		0xFC01 /* MAC address of this station */
-#define WI_RID_DESIRED_SSID	0xFC02 /* Service Set ID for connection */
-#define WI_RID_OWN_CHNL		0xFC03 /* Comm channel for BSS creation */
-#define WI_RID_OWN_SSID		0xFC04 /* IBSS creation ID */
-#define WI_RID_OWN_ATIM_WIN	0xFC05 /* ATIM window time for IBSS creation */
-#define WI_RID_SYSTEM_SCALE	0xFC06 /* scale that specifies AP density */
-#define WI_RID_MAX_DATALEN	0xFC07 /* Max len of MAC frame body data */
-#define WI_RID_MAC_WDS		0xFC08 /* MAC addr of corresponding WDS node */
-#define WI_RID_PM_ENABLED	0xFC09 /* ESS power management enable */
-#define WI_RID_PM_EPS		0xFC0A /* PM EPS/PS mode */
-#define WI_RID_MCAST_RX		0xFC0B /* ESS PM mcast reception */
-#define WI_RID_MAX_SLEEP	0xFC0C /* max sleep time for ESS PM */
-#define WI_RID_HOLDOVER		0xFC0D /* holdover time for ESS PM */
-#define WI_RID_NODENAME		0xFC0E /* ID name of this node for diag */
-#define WI_RID_DTIM_PERIOD	0xFC10 /* beacon interval between DTIMs */
-#define WI_RID_WDS_ADDR1	0xFC11 /* port 1 MAC of WDS link node */
-#define WI_RID_WDS_ADDR2	0xFC12 /* port 1 MAC of WDS link node */
-#define WI_RID_WDS_ADDR3	0xFC13 /* port 1 MAC of WDS link node */
-#define WI_RID_WDS_ADDR4	0xFC14 /* port 1 MAC of WDS link node */
-#define WI_RID_WDS_ADDR5	0xFC15 /* port 1 MAC of WDS link node */
-#define WI_RID_WDS_ADDR6	0xFC16 /* port 1 MAC of WDS link node */
-#define WI_RID_MCAST_PM_BUF	0xFC17 /* PM buffering of mcast */
-#define WI_RID_ENCRYPTION	0xFC20 /* enable/disable WEP */
-#define WI_RID_AUTHTYPE		0xFC21 /* specify authentication type */
-#define WI_RID_P2_TX_CRYPT_KEY	0xFC23
-#define WI_RID_P2_CRYPT_KEY0	0xFC24
-#define WI_RID_P2_CRYPT_KEY1	0xFC25
-#define WI_RID_MICROWAVE_OVEN	0xFC25
-#define WI_RID_P2_CRYPT_KEY2	0xFC26
-#define WI_RID_P2_CRYPT_KEY3	0xFC27
-#define WI_RID_P2_ENCRYPTION	0xFC28
-#define WI_RID_ALT_RETRY_CNT	0xFC32
-#define	 PRIVACY_INVOKED	0x01
-#define	 EXCLUDE_UNENCRYPTED	0x02
-#define	 HOST_ENCRYPT		0x10
-#define	 IV_EVERY_FRAME		0x00	/* IV = Initialization Vector */
-#define	 IV_EVERY10_FRAME	0x20	/* every 10 frame IV reuse */
-#define	 IV_EVERY50_FRAME	0x40	/* every 50 frame IV reuse */
-#define	 IV_EVERY100_FRAME	0x60	/* every 100 frame IV reuse */
-#define	 HOST_DECRYPT		0x80
-#define WI_RID_WEP_MAPTABLE	0xFC29
-#define WI_RID_CNFAUTHMODE	0xFC2A
-#define WI_RID_ROAMING_MODE	0xFC2D
-#define WI_RID_OWN_BEACON_INT	0xFC33 /* beacon xmit time for BSS creation */
-#define	WI_RID_ENH_SECURITY	0xFC43 /* enhanced security (AP mode) */
-#define WI_RID_CNF_DBM_ADJUST	0xFC46
-#define WI_RID_DBM_ADJUST	0xFC46 /* RSSI - WI_RID_DBM_ADJUST ~ dBm */
-#define	WI_RID_WPA_DATA		0xFC48 /* WPA IE */
-#define WI_RID_BASIC_RATE	0xFCB3
-#define WI_RID_SUPPORT_RATE	0xFCB4
-#define	WI_RID_WPA_HANDLING	0xFCBB /* WPA handling procedures */
-
-/*
- * Network parameters, dynamic configuration entities
- */
-#define WI_RID_MCAST_LIST	0xFC80 /* list of multicast addrs */
-#define WI_RID_CREATE_IBSS	0xFC81 /* create IBSS */
-#define WI_RID_FRAG_THRESH	0xFC82 /* frag len, unicast msg xmit */
-#define WI_RID_RTS_THRESH	0xFC83 /* frame len for RTS/CTS handshake */
-#define WI_RID_TX_RATE		0xFC84 /* data rate for message xmit
- 					* 0 == Fixed 1mbps
- 					* 1 == Fixed 2mbps
- 					* 2 == auto fallback
-					*/
-#define WI_RID_PROMISC		0xFC85 /* enable promisc mode */
-#define WI_RID_FRAG_THRESH0	0xFC90
-#define WI_RID_FRAG_THRESH1	0xFC91
-#define WI_RID_FRAG_THRESH2	0xFC92
-#define WI_RID_FRAG_THRESH3	0xFC93
-#define WI_RID_FRAG_THRESH4	0xFC94
-#define WI_RID_FRAG_THRESH5	0xFC95
-#define WI_RID_FRAG_THRESH6	0xFC96
-#define WI_RID_RTS_THRESH0	0xFC97
-#define WI_RID_RTS_THRESH1	0xFC98
-#define WI_RID_RTS_THRESH2	0xFC99
-#define WI_RID_RTS_THRESH3	0xFC9A
-#define WI_RID_RTS_THRESH4	0xFC9B
-#define WI_RID_RTS_THRESH5	0xFC9C
-#define WI_RID_RTS_THRESH6	0xFC9D
-#define WI_RID_TX_RATE0		0xFC9E
-#define WI_RID_TX_RATE1		0xFC9F
-#define WI_RID_TX_RATE2		0xFCA0
-#define WI_RID_TX_RATE3		0xFCA1
-#define WI_RID_TX_RATE4		0xFCA2
-#define WI_RID_TX_RATE5		0xFCA3
-#define WI_RID_TX_RATE6		0xFCA4
-#define WI_RID_DEFLT_CRYPT_KEYS	0xFCB0
-#define WI_RID_TX_CRYPT_KEY	0xFCB1
-#define WI_RID_TICK_TIME	0xFCE0
-
-struct wi_key {
-	u_int16_t		wi_keylen;
-	u_int8_t		wi_keydat[14];
-};
-
-#define WI_NLTV_KEYS 4
-struct wi_ltv_keys {
-	u_int16_t		wi_len;
-	u_int16_t		wi_type;
-	struct wi_key		wi_keys[WI_NLTV_KEYS];
-};
-
-/*
- * NIC information
- */
-#define WI_RID_DNLD_BUF		0xFD01
-#define WI_RID_MEMSZ		0xFD02 /* memory size info (XXX Lucent) */
-					/* Looks like on lucnet pri firm too */
-#define	WI_RID_PRI_IDENTITY	0xFD02 /* primary funcs firmware ident (PRISM2) */
-#define WI_RID_PRI_SUP_RANGE	0xFD03 /* primary supplier compatibility */
-#define WI_RID_CIF_ACT_RANGE	0xFD04 /* controller sup. compatibility */
-#define WI_RID_SERIALNO		0xFD0A /* card serial number */
-#define WI_RID_CARD_ID		0xFD0B /* card identification */
-#define WI_RID_MFI_SUP_RANGE	0xFD0C /* modem supplier compatibility */
-#define WI_RID_CFI_SUP_RANGE	0xFD0D /* controller sup. compatibility */
-#define WI_RID_CHANNEL_LIST	0xFD10 /* allowd comm. frequencies. */
-#define WI_RID_REG_DOMAINS	0xFD11 /* list of intendted regulatory doms */
-#define WI_RID_TEMP_TYPE	0xFD12 /* hw temp range code */
-#define WI_RID_CIS		0xFD13 /* PC card info struct */
-#define WI_RID_STA_IDENTITY	0xFD20 /* station funcs firmware ident */
-#define WI_RID_STA_SUP_RANGE	0xFD21 /* station supplier compat */
-#define WI_RID_MFI_ACT_RANGE	0xFD22
-#define WI_RID_SYMBOL_IDENTITY	0xFD24
-#define WI_RID_CFI_ACT_RANGE	0xFD33
-#define WI_RID_COMMQUAL		0xFD43
-#define WI_RID_SCALETHRESH	0xFD46
-#define WI_RID_PCF		0xFD87
-
-/*
- * MAC information
- */
-#define WI_RID_PORT_STAT	0xFD40 /* actual MAC port con control stat */
-#define WI_RID_CURRENT_SSID	0xFD41 /* ID of actually connected SS */
-#define WI_RID_CURRENT_BSSID	0xFD42 /* ID of actually connected BSS */
-#define WI_RID_COMMS_QUALITY	0xFD43 /* quality of BSS connection */
-#define WI_RID_CUR_TX_RATE	0xFD44 /* current TX rate */
-#define WI_RID_CUR_BEACON_INT	0xFD45 /* current beacon interval */
-#define WI_RID_CUR_SCALE_THRESH	0xFD46 /* actual system scane thresh setting */
-#define WI_RID_PROT_RESP_TIME	0xFD47 /* time to wait for resp to req msg */
-#define WI_RID_SHORT_RTR_LIM	0xFD48 /* max tx attempts for short frames */
-#define WI_RID_LONG_RTS_LIM	0xFD49 /* max tx attempts for long frames */
-#define WI_RID_MAX_TX_LIFE	0xFD4A /* max tx frame handling duration */
-#define WI_RID_MAX_RX_LIFE	0xFD4B /* max rx frame handling duration */
-#define WI_RID_CF_POLL		0xFD4C /* contention free pollable ind */
-#define WI_RID_AUTH_ALGS	0xFD4D /* auth algorithms available */
-#define WI_RID_AUTH_TYPE	0xFD4E /* availanle auth types */
-#define WI_RID_WEP_AVAIL	0xFD4F /* WEP privacy option available */
-#define WI_RID_DBM_COMMS_QUAL	0xFD51 /* CommQuality normalized to dBm */
-#define WI_RID_CUR_TX_RATE1	0xFD80
-#define WI_RID_CUR_TX_RATE2	0xFD81
-#define WI_RID_CUR_TX_RATE3	0xFD82
-#define WI_RID_CUR_TX_RATE4	0xFD83
-#define WI_RID_CUR_TX_RATE5	0xFD84
-#define WI_RID_CUR_TX_RATE6	0xFD85
-#define WI_RID_OWN_MAC		0xFD86 /* unique local MAC addr */
-#define WI_RID_PCI_INFO		0xFD87 /* point coordination func cap */
-
-/*
- * Scan Information
- */
-#define	WI_RID_BCAST_SCAN_REQ	0xFCAB /* Broadcast Scan request (Symbol) */
-#define	 BSCAN_5SEC		0x01
-#define	 BSCAN_ONETIME		0x02
-#define	 BSCAN_PASSIVE		0x40
-#define	 BSCAN_BCAST		0x80
-#define WI_RID_SCAN_REQ		0xFCE1 /* Scan request (STA only) */
-#define WI_RID_JOIN_REQ		0xFCE2 /* Join request (STA only) */
-#define	WI_RID_AUTH_STATION	0xFCE3 /* Authenticates Station (AP) */
-#define	WI_RID_CHANNEL_REQ	0xFCE4 /* Channel Information Request (AP) */
-#define WI_RID_SCAN_RESULTS	0xFD88 /* Scan Results Table */
-
-struct wi_apinfo {
-	int			scanreason;	/* ScanReason */
-	char			bssid[6];	/* BSSID (mac address) */
-	int			channel;	/* Channel */
-	int			signal;		/* Signal level */
-	int			noise;		/* Average Noise Level*/
-	int			quality;	/* Quality */
-	int			namelen;	/* Length of SSID string */
-	char			name[32];	/* SSID string */
-	int			capinfo;	/* Capability info. */ 
-	int			interval;	/* BSS Beacon Interval */
-	int			rate;		/* Data Rate */
-};
-
-/*
- * Modem information
- */
-#define WI_RID_PHY_TYPE		0xFDC0 /* phys layer type indication */
-#define WI_RID_CURRENT_CHAN	0xFDC1 /* current frequency */
-#define WI_RID_PWR_STATE	0xFDC2 /* pwr consumption status */
-#define WI_RID_CCA_MODE		0xFDC3 /* clear chan assess mode indication */
-#define WI_RID_CCA_TIME		0xFDC4 /* clear chan assess time */
-#define WI_RID_MAC_PROC_DELAY	0xFDC5 /* MAC processing delay time */
-#define WI_RID_DATA_RATES	0xFDC6 /* supported data rates */
-
-/*
- * bsd-airtools v0.2 - source-mods v0.2 [common.h]
- * by h1kari - (c) Dachb0den Labs 2001
- */
-
-/*
- * Copyright (c) 2001 Dachb0den Labs.
- *      David Hulton <h1kari@dachb0den.com>.  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 David Hulton.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY David Hulton 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 David Hulton OR THE VOICES IN HIS HEAD
- * 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.
- */
-
-/*
- * standard hermes recieve frame used by wavelan/prism2 cards
- */
-struct wi_rx_frame {
-	/*
-	 * hermes prefix header. supplies information on the current status of
-	 * the network and various other statistics gathered from the
-	 * management/control frames as used internally.
-	 */
-	u_int16_t	wi_status;
-	u_int16_t	wi_ts0;
-	u_int16_t	wi_ts1;
-	u_int8_t	wi_silence;
-	u_int8_t	wi_signal;
-	u_int8_t	wi_rate;
-	u_int8_t	wi_rx_flow;
-	u_int16_t	wi_rsvd0;
-	u_int16_t	wi_rsvd1;
-	/*
-	 * standard 80211 frame header. all packets have to use this header as
-	 * per the AN9900 from intersil, even management/control. for
-	 * management packets, they just threw the header into the data field,
-	 * but for control packets the headers are lost in translation and
-	 * therefore not all control packet info can be displayed.
-	 */
-	u_int16_t	wi_frame_ctl;
-	u_int16_t	wi_id;
-	u_int8_t	wi_addr1[6];
-	u_int8_t	wi_addr2[6];
-	u_int8_t	wi_addr3[6];
-	u_int16_t	wi_seq_ctl;
-	u_int8_t	wi_addr4[6];
-	u_int16_t	wi_dat_len;
-	/*
-	 * another wierdity with the drivers. they append a 802.3 header which
-	 * is somewhat redundant, since all the same data is provided in the
-	 * 802.11 header.
-	 */
-	u_int8_t	wi_dst_addr[6];
-	u_int8_t	wi_src_addr[6];
-	u_int16_t	wi_len;
-};
-#define WI_DATA_HDRLEN		0x3C
-#define WI_MGMT_HDRLEN		0x3C
-#define WI_CTL_HDRLEN		0x3C
-
-
-/*
- * all data packets have a snap (sub-network access protocol) header that
- * isn't entirely definied, but added for ethernet compatibility.
- */
-struct wi_snap_frame {
-	u_int16_t	wi_dat[3];
-	u_int16_t	wi_type;
-};
-
-
-/*
- * management frame headers
- * note: all management frames consist of a static header and variable length
- * fields.
- */
-
-/*
- * variable length field structure
- */
-struct wi_mgmt_var_hdr {
-	u_int8_t	wi_code;
-	u_int8_t	wi_len;
-	u_int8_t	wi_data[256];
-};
-
-/*
- * management beacon frame prefix
- */
-struct wi_mgmt_beacon_hdr {
-	uint32_t	wi_ts0;
-	uint32_t	wi_ts1;
-	u_int16_t	wi_interval;
-	u_int16_t	wi_capinfo;
-};
-
-/*
- * ibss announcement traffic indication message (atim) frame
- * note: no parameters
- */
-
-/*
- * management disassociation frame
- */
-struct wi_mgmt_disas_hdr {
-	u_int16_t	wi_reason;
-};
-
-/*
- * management association request frame prefix
- */
-struct wi_mgmt_asreq_hdr {
-	u_int16_t	wi_capinfo;
-	u_int16_t	wi_interval;
-};
-
-/*
- * management association response frame prefix
- */
-struct wi_mgmt_asresp_hdr {
-	u_int16_t	wi_capinfo;
-	u_int16_t	wi_status;
-	u_int16_t	wi_aid;
-};
-
-/*
- * management reassociation request frame prefix
- */
-struct wi_mgmt_reasreq_hdr {
-	u_int16_t	wi_capinfo;
-	u_int16_t	wi_interval;
-	u_int8_t	wi_currap[6];
-};
-
-/*
- * management reassociation response frame prefix
- */
-struct wi_mgmt_reasresp_hdr {
-	u_int16_t	wi_capinfo;
-	u_int16_t	wi_status;
-	u_int16_t	wi_aid;
-};
-
-/*
- * management probe request frame prefix
- * note: no static parameters, only variable length
- */
-
-/*
- * management probe response frame prefix
- */
-struct wi_mgmt_proberesp_hdr {
-	uint32_t	wi_ts0;
-	uint32_t	wi_ts1;
-	u_int16_t	wi_interval;
-	u_int16_t	wi_capinfo;
-};
-
-/*
- * management authentication frame prefix
- */
-struct wi_mgmt_auth_hdr {
-	u_int16_t	wi_algo;
-	u_int16_t	wi_seq;
-	u_int16_t	wi_status;
-};
-
-/*
- * management deauthentication frame
- */
-struct wi_mgmt_deauth_hdr {
-	u_int16_t	wi_reason;
-};
-
-
-/*
- * rid configuration register definitions
- */
-#define WI_RID_SCAN_REQ		0xFCE1 /* scan request information */
-#define WI_RID_SCAN_RES		0xFD88 /* scan result information */
-
-#define WI_RID_PROCFRAME	0x3137 /* Return full frame information */
-#define WI_RID_PRISM2		0x3138 /* tell if we're a prism2 card or not */
-
-
-/*
- * 802.11 definitions
- */
-#define WI_STAT_BADCRC		0x0001
-#define WI_STAT_UNDECRYPTABLE	0x0002
-#define WI_STAT_ERRSTAT		0x0003
-#define WI_STAT_MAC_PORT	0x0700
-#define WI_STAT_1042		0x2000
-#define WI_STAT_TUNNEL		0x4000
-#define WI_STAT_WMP_MSG		0x6000
-#define WI_RXSTAT_MSG_TYPE	0xE000
-
-#define WI_FCTL_OPT_MASK	0xFF00
-#define WI_AID_SET		0xC000
-#define WI_AID_MASK		0x3FFF
-#define WI_SCTL_FRAGNUM_MASK	0x000F
-#define WI_SCTL_SEQNUM_MASK	0xFFF0
-
-#define WI_STAT_UNSPEC_FAIL	1
-#define WI_STAT_CAPINFO_FAIL	10
-#define WI_STAT_REAS_DENY	11
-#define WI_STAT_ASSOC_DENY	12
-#define WI_STAT_ALGO_FAIL	13
-#define WI_STAT_SEQ_FAIL	14
-#define WI_STAT_CHAL_FAIL	15
-#define WI_STAT_TOUT_FAIL	16
-#define WI_STAT_OVERL_DENY	17
-#define WI_STAT_RATE_DENY	18
-
-#define WI_FTYPE_MGMT		0x0000
-#define WI_FTYPE_CTL		0x0004
-#define WI_FTYPE_DATA		0x0008
-
-#define WI_FCTL_VERS		0x0002
-#define WI_FCTL_FTYPE		0x000C
-#define WI_FCTL_STYPE		0x00F0
-#define WI_FCTL_TODS		0x0100
-#define WI_FCTL_FROMDS		0x0200
-#define WI_FCTL_MOREFRAGS	0x0400
-#define WI_FCTL_RETRY		0x0800
-#define WI_FCTL_PM		0x1000
-#define WI_FCTL_MOREDATA	0x2000
-#define WI_FCTL_WEP		0x4000
-#define WI_FCTL_ORDER		0x8000
-
-#define WI_FCS_LEN		0x4 /* checksum length */
-
-
-/*
- * management definitions
- */
-#define WI_STYPE_MGMT_ASREQ	0x0000
-#define WI_STYPE_MGMT_ASRESP	0x0010
-#define WI_STYPE_MGMT_REASREQ	0x0020
-#define WI_STYPE_MGMT_REASRESP	0x0030
-#define WI_STYPE_MGMT_PROBEREQ	0x0040
-#define WI_STYPE_MGMT_PROBERESP	0x0050
-#define WI_STYPE_MGMT_BEACON	0x0080
-#define WI_STYPE_MGMT_ATIM	0x0090
-#define WI_STYPE_MGMT_DISAS	0x00A0
-#define WI_STYPE_MGMT_AUTH	0x00B0
-#define WI_STYPE_MGMT_DEAUTH	0x00C0
-
-#define WI_CAPINFO_ESS		0x01
-#define WI_CAPINFO_IBSS		0x02
-#define WI_CAPINFO_CFPOLL	0x04
-#define WI_CAPINFO_CFPOLLREQ	0x08
-#define WI_CAPINFO_PRIV		0x10
-
-#define WI_REASON_UNSPEC	1
-#define WI_REASON_AUTH_INVALID	2
-#define WI_REASON_DEAUTH_LEAVE	3
-#define WI_REASON_DISAS_INACT	4
-#define WI_REASON_DISAS_OVERL	5
-#define WI_REASON_CLASS2	6
-#define WI_REASON_CLASS3	7
-#define WI_REASON_DISAS_LEAVE	8
-#define WI_REASON_NOAUTH	9
-
-#define WI_VAR_SSID		0
-#define WI_VAR_SRATES		1
-#define WI_VAR_FH		2
-#define WI_VAR_DS		3
-#define WI_VAR_CF		4
-#define WI_VAR_TIM		5
-#define WI_VAR_IBSS		6
-#define WI_VAR_CHAL		16
-
-#define WI_VAR_SRATES_MASK	0x7F
-
-
-/*
- * control definitions
- */
-#define WI_STYPE_CTL_PSPOLL	0x00A0
-#define WI_STYPE_CTL_RTS	0x00B0
-#define WI_STYPE_CTL_CTS	0x00C0
-#define WI_STYPE_CTL_ACK	0x00D0
-#define WI_STYPE_CTL_CFEND	0x00E0
-#define WI_STYPE_CTL_CFENDCFACK	0x00F0
-
-
-/*
- * ap scanning structures
- */
-struct wi_scan_res {
-	u_int16_t	wi_chan;
-	u_int16_t	wi_noise;
-	u_int16_t	wi_signal;
-	u_int8_t	wi_bssid[6];
-	u_int16_t	wi_interval;
-	u_int16_t	wi_capinfo;
-	u_int16_t	wi_ssid_len;
-	u_int8_t	wi_ssid[32];
-	u_int8_t	wi_srates[10];
-	u_int8_t	wi_rate;
-	u_int8_t	wi_rsvd;
-};
-#define WI_WAVELAN_RES_SIZE	50
-
-struct wi_scan_p2_hdr {
-	u_int16_t	wi_rsvd;
-	u_int16_t	wi_reason;
-};
-#define WI_PRISM2_RES_SIZE	62
-
-
-/*
- * prism2 debug mode definitions
- */
-#define SIOCSPRISM2DEBUG	_IOW('i', 137, struct ifreq)
-#define SIOCGPRISM2DEBUG	_IOWR('i', 138, struct ifreq)
-
-#define WI_DEBUG_RESET		0x00
-#define WI_DEBUG_INIT		0x01
-#define WI_DEBUG_SLEEP		0x02
-#define WI_DEBUG_WAKE		0x03
-#define WI_DEBUG_CHAN		0x08
-#define WI_DEBUG_DELAYSUPP	0x09
-#define WI_DEBUG_TXSUPP		0x0A
-#define WI_DEBUG_MONITOR	0x0B
-#define WI_DEBUG_LEDTEST	0x0C
-#define WI_DEBUG_CONTTX		0x0E
-#define WI_DEBUG_STOPTEST	0x0F
-#define WI_DEBUG_CONTRX		0x10
-#define WI_DEBUG_SIGSTATE	0x11
-#define WI_DEBUG_CALENABLE	0x13
-#define WI_DEBUG_CONFBITS	0x15
-
-#endif
diff --git a/include.new/dev/wi/if_wireg.h b/include.new/dev/wi/if_wireg.h
deleted file mode 100644
index f7867dc..0000000
--- a/include.new/dev/wi/if_wireg.h
+++ /dev/null
@@ -1,724 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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: releng/10.2/sys/dev/wi/if_wireg.h 192468 2009-05-20 20:00:40Z sam $
- */
-
-#define WI_DELAY	5
-#define WI_TIMEOUT	(500000/WI_DELAY)	/* 500 ms */
-
-#define WI_PORT0	(0 << 8)
-#define WI_PORT1	(1 << 8)
-#define WI_PORT2	(2 << 8)
-#define WI_PORT3	(3 << 8)
-#define WI_PORT4	(4 << 8)
-#define WI_PORT5	(5 << 8)
-
-#define WI_PCI_LMEMRES	0x10	/* PCI Memory (native PCI implementations) */
-#define WI_PCI_LOCALRES	0x14	/* The PLX chip's local registers */
-#define WI_PCI_MEMRES	0x18	/* The PCCard's attribute memory */
-#define WI_PCI_IORES	0x1C	/* The PCCard's I/O space */
-
-#define WI_LOCAL_INTCSR		0x4c
-#define WI_LOCAL_INTEN		0x40
-#define WI_HFA384X_SWSUPPORT0_OFF	0x28
-#define WI_PRISM2STA_MAGIC		0x4A2D
-#define WI_PCICOR_OFF		0x26
-#define WI_PCICOR_RESET		0x0080
-
-/* Default port: 0 (only 0 exists on stations) */
-#define WI_DEFAULT_PORT	WI_PORT0
-
-/* Default network name: ANY */
-/*
- * [sommerfeld 1999/07/15] Changed from "ANY" to ""; according to Bill Fenner,
- * ANY is used in MS driver user interfaces, while "" is used over the
- * wire..
- */
-#define WI_DEFAULT_NETNAME	""
-
-#define WI_DEFAULT_AP_DENSITY	1
-
-#define WI_DEFAULT_RTS_THRESH	2347
-
-#define WI_DEFAULT_DATALEN	2304
-
-#define WI_DEFAULT_CREATE_IBSS	0
-
-#define WI_DEFAULT_PM_ENABLED	0
-
-#define WI_DEFAULT_MAX_SLEEP	100
-
-#define WI_DEFAULT_ROAMING	1
-
-#define WI_DEFAULT_AUTHTYPE	1
-
-#ifdef __NetBSD__
-#define OS_STRING_NAME	"NetBSD"
-#endif
-#ifdef __FreeBSD__
-#define OS_STRING_NAME	"FreeBSD"
-#endif
-#ifdef __OpenBSD__
-#define OS_STRING_NAME	"OpenBSD"
-#endif
-
-#define WI_DEFAULT_NODENAME	OS_STRING_NAME " WaveLAN/IEEE node"
-
-#define WI_DEFAULT_IBSS		OS_STRING_NAME " IBSS"
-
-#define WI_BUS_PCCARD		0	/* pccard device */
-#define WI_BUS_PCI_PLX		1	/* PCI card w/ PLX PCI/PCMICA bridge */
-#define WI_BUS_PCI_NATIVE	2	/* native PCI device (Prism 2.5) */
-
-/*
- * register space access macros
- */
-#define CSR_WRITE_4(sc, reg, val)				\
-	bus_space_write_4((sc)->wi_btag, (sc)->wi_bhandle, 	\
-	    (sc)->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg)*2 : (reg), val)
-#define CSR_WRITE_2(sc, reg, val)				\
-	bus_space_write_2((sc)->wi_btag, (sc)->wi_bhandle,	\
- 	    (sc)->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg)*2 : (reg), val)
-#define CSR_WRITE_1(sc, reg, val)				\
-	bus_space_write_1((sc)->wi_btag, (sc)->wi_bhandle,	\
- 	    (sc)->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg)*2 : (reg), val)
-
-#define CSR_READ_4(sc, reg)					\
-	bus_space_read_4((sc)->wi_btag, (sc)->wi_bhandle,	\
- 	    (sc)->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg)*2 : (reg))
-#define CSR_READ_2(sc, reg)					\
-	bus_space_read_2((sc)->wi_btag, (sc)->wi_bhandle,	\
- 	    (sc)->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg)*2 : (reg))
-#define CSR_READ_1(sc, reg)					\
-	bus_space_read_1((sc)->wi_btag, (sc)->wi_bhandle,	\
- 	    (sc)->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg)*2 : (reg))
-
-#define CSM_WRITE_1(sc, off, val)	\
-	bus_space_write_1((sc)->wi_bmemtag, (sc)->wi_bmemhandle, off, val)
-
-#define CSM_READ_1(sc, off)		\
-	bus_space_read_1((sc)->wi_bmemtag, (sc)->wi_bmemhandle, off)
-
-#define CSR_WRITE_STREAM_2(sc, reg, val)	\
-	bus_space_write_stream_2(sc->wi_btag, sc->wi_bhandle,	\
-	    (sc->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg) * 2 : (reg)), val)
-#define CSR_WRITE_MULTI_STREAM_2(sc, reg, val, count)	\
-	bus_space_write_multi_stream_2(sc->wi_btag, sc->wi_bhandle,	\
-	    (sc->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg) * 2 : (reg)), val, count)
-#define CSR_READ_STREAM_2(sc, reg)		\
-	bus_space_read_stream_2(sc->wi_btag, sc->wi_bhandle,	\
-	    (sc->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg) * 2 : (reg)))
-#define CSR_READ_MULTI_STREAM_2(sc, reg, buf, count)		\
-	bus_space_read_multi_stream_2(sc->wi_btag, sc->wi_bhandle,	\
-	    (sc->wi_bus_type == WI_BUS_PCI_NATIVE ? (reg) * 2 : (reg)), buf, count)
-
-/*
- * The WaveLAN/IEEE cards contain an 802.11 MAC controller which Lucent
- * calls 'Hermes.' In typical fashion, getting documentation about this
- * controller is about as easy as squeezing blood from a stone. Here
- * is more or less what I know:
- *
- * - The Hermes controller is firmware driven, and the host interacts
- *   with the Hermes via a firmware interface, which can change.
- *
- * - The Hermes is described in a document called: "Hermes Firmware
- *   WaveLAN/IEEE Station Functions," document #010245, which of course
- *   Lucent will not release without an NDA.
- *
- * - Lucent has created a library called HCF (Hardware Control Functions)
- *   though which it wants developers to interact with the card. The HCF
- *   is needlessly complex, ill conceived and badly documented. Actually,
- *   the comments in the HCP code itself aren't bad, but the publically
- *   available manual that comes with it is awful, probably due largely to
- *   the fact that it has been emasculated in order to hide information
- *   that Lucent wants to keep proprietary. The purpose of the HCF seems
- *   to be to insulate the driver programmer from the Hermes itself so that
- *   Lucent has an excuse not to release programming in for it.
- *
- * - Lucent only makes available documentation and code for 'HCF Light'
- *   which is a stripped down version of HCF with certain features not
- *   implemented, most notably support for 802.11 frames.
- *
- * - The HCF code which I have seen blows goats. Whoever decided to
- *   use a 132 column format should be shot.
- *
- * Rather than actually use the Lucent HCF library, I have stripped all
- * the useful information from it and used it to create a driver in the
- * usual BSD form. Note: I don't want to hear anybody whining about the
- * fact that the Lucent code is GPLed and mine isn't. I did not actually
- * put any of Lucent's code in this driver: I only used it as a reference
- * to obtain information about the underlying hardware. The Hermes
- * programming interface is not GPLed, so bite me.
- */
-
-/*
- * Size of Hermes & Prism2 I/O space.
- */
-#define WI_IOSIZ		0x40
-
-/*
- * Hermes & Prism2 register definitions 
- */
-
-/* Hermes command/status registers. */
-#define WI_COMMAND		0x00
-#define WI_PARAM0		0x02
-#define WI_PARAM1		0x04
-#define WI_PARAM2		0x06
-#define WI_STATUS		0x08
-#define WI_RESP0		0x0A
-#define WI_RESP1		0x0C
-#define WI_RESP2		0x0E
-
-/* Command register values. */
-#define WI_CMD_BUSY		0x8000 /* busy bit */
-#define WI_CMD_INI		0x0000 /* initialize */
-#define WI_CMD_ENABLE		0x0001 /* enable */
-#define WI_CMD_DISABLE		0x0002 /* disable */
-#define WI_CMD_DIAG		0x0003
-#define WI_CMD_ALLOC_MEM	0x000A /* allocate NIC memory */
-#define WI_CMD_TX		0x000B /* transmit */
-#define WI_CMD_NOTIFY		0x0010
-#define WI_CMD_INQUIRE		0x0011
-#define WI_CMD_ACCESS		0x0021
-#define WI_CMD_ACCESS_WRITE	0x0121
-#define WI_CMD_PROGRAM		0x0022
-#define WI_CMD_READEE		0x0030	/* symbol only */
-#define WI_CMD_READMIF		0x0030	/* prism2 */
-#define WI_CMD_WRITEMIF		0x0031	/* prism2 */
-#define WI_CMD_DEBUG		0x0038	/* Various test commands */
-
-#define WI_CMD_CODE_MASK	0x003F
-
-/*
- * Various cmd test stuff.
- */
-#define WI_TEST_MONITOR		0x0B
-#define WI_TEST_STOP		0x0F
-#define WI_TEST_CFG_BITS	0x15
-#define WI_TEST_CFG_BIT_ALC	0x08
-
-/*
- * Reclaim qualifier bit, applicable to the
- * TX and INQUIRE commands.
- */
-#define WI_RECLAIM		0x0100 /* reclaim NIC memory */
-
-/*
- * ACCESS command qualifier bits.
- */
-#define WI_ACCESS_READ		0x0000
-#define WI_ACCESS_WRITE		0x0100
-
-/*
- * PROGRAM command qualifier bits.
- */
-#define WI_PROGRAM_DISABLE	0x0000
-#define WI_PROGRAM_ENABLE_RAM	0x0100
-#define WI_PROGRAM_ENABLE_NVRAM	0x0200
-#define WI_PROGRAM_NVRAM	0x0300
-
-/* Status register values */
-#define WI_STAT_CMD_CODE	0x003F
-#define WI_STAT_DIAG_ERR	0x0100
-#define WI_STAT_INQ_ERR		0x0500
-#define WI_STAT_CMD_RESULT	0x7F00
-
-/* memory handle management registers */
-#define WI_INFO_FID		0x10
-#define WI_RX_FID		0x20
-#define WI_ALLOC_FID		0x22
-#define WI_TX_CMP_FID		0x24
-
-/*
- * Buffer Access Path (BAP) registers.
- * These are I/O channels. I believe you can use each one for
- * any desired purpose independently of the other. In general
- * though, we use BAP1 for reading and writing LTV records and
- * reading received data frames, and BAP0 for writing transmit
- * frames. This is a convention though, not a rule.
- */
-#define WI_SEL0			0x18
-#define WI_SEL1			0x1A
-#define WI_OFF0			0x1C
-#define WI_OFF1			0x1E
-#define WI_DATA0		0x36
-#define WI_DATA1		0x38
-#define WI_BAP0			WI_DATA0
-#define WI_BAP1			WI_DATA1
-
-#define WI_OFF_BUSY		0x8000
-#define WI_OFF_ERR		0x4000
-#define WI_OFF_DATAOFF		0x0FFF
-
-/* Event registers */
-#define WI_EVENT_STAT		0x30	/* Event status */
-#define WI_INT_EN		0x32	/* Interrupt enable/disable */
-#define WI_EVENT_ACK		0x34	/* Ack event */
-
-/* Events */
-#define WI_EV_TICK		0x8000	/* aux timer tick */
-#define WI_EV_RES		0x4000	/* controller h/w error (time out) */
-#define WI_EV_INFO_DROP		0x2000	/* no RAM to build unsolicited frame */
-#define WI_EV_NO_CARD		0x0800	/* card removed (hunh?) */
-#define WI_EV_DUIF_RX		0x0400	/* wavelan management packet received */
-#define WI_EV_INFO		0x0080	/* async info frame */
-#define WI_EV_CMD		0x0010	/* command completed */
-#define WI_EV_ALLOC		0x0008	/* async alloc/reclaim completed */
-#define WI_EV_TX_EXC		0x0004	/* async xmit completed with failure */
-#define WI_EV_TX		0x0002	/* async xmit completed succesfully */
-#define WI_EV_RX		0x0001	/* async rx completed */
-
-/* Host software registers */
-#define WI_SW0			0x28
-#define WI_SW1			0x2A
-#define WI_SW2			0x2C
-#define WI_SW3			0x2E 	/* does not appear in Prism2 */
-
-#define WI_CNTL			0x14
-
-#define WI_CNTL_AUX_ENA		0xC000
-#define WI_CNTL_AUX_ENA_STAT	0xC000
-#define WI_CNTL_AUX_DIS_STAT	0x0000
-#define WI_CNTL_AUX_ENA_CNTL	0x8000
-#define WI_CNTL_AUX_DIS_CNTL	0x4000
-
-#define WI_AUX_PAGE		0x3A
-#define WI_AUX_OFFSET		0x3C
-#define WI_AUX_DATA		0x3E
-
-#define WI_AUX_PGSZ		128
-#define WI_AUX_KEY0		0xfe01
-#define WI_AUX_KEY1		0xdc23
-#define WI_AUX_KEY2		0xba45
-
-#define WI_COR			0x40	/* only for Symbol */
-#define WI_COR_RESET		0x0080
-#define WI_COR_IOMODE		0x0041
-
-#define WI_HCR			0x42	/* only for Symbol */
-#define WI_HCR_4WIRE		0x0010
-#define WI_HCR_RUN		0x0007
-#define WI_HCR_HOLD		0x000f
-#define WI_HCR_EEHOLD		0x00ce
-
-#define WI_COR_OFFSET	0x3e0	/* OK for PCI, default COR for Prism PC Card */
-#define WI_COR_VALUE	0x41
-
-/*
- * One form of communication with the Hermes is with what Lucent calls
- * LTV records, where LTV stands for Length, Type and Value. The length
- * and type are 16 bits and are in native byte order. The value is in
- * multiples of 16 bits and is in little endian byte order.
- */
-struct wi_lt_hdr {
-	u_int16_t		wi_len;
-	u_int16_t		wi_type;
-	/* value is vary depends on resource id */
-};
-
-/*
- * Download buffer location and length (0xFD01).
- */
-struct wi_dnld_buf {
-	u_int16_t		wi_buf_pg; /* page addr of intermediate dl buf*/
-	u_int16_t		wi_buf_off; /* offset of idb */
-	u_int16_t		wi_buf_len; /* len of idb */
-};
-
-/*
- * Mem sizes (0xFD02).
- */
-struct wi_memsz {
-	u_int16_t		wi_mem_ram;
-	u_int16_t		wi_mem_nvram;
-};
-
-/*
- * NIC Identification (0xFD0B, 0xFD20)
- */
-struct wi_ver {
-	u_int16_t		wi_ver[4];
-};
-
-/* define card ident */
-#define	WI_NIC_LUCENT_ID	0x0001
-#define	WI_NIC_LUCENT_STR	"Lucent Technologies, WaveLAN/IEEE"
-
-#define	WI_NIC_SONY_ID		0x0002
-#define	WI_NIC_SONY_STR		"Sony WaveLAN/IEEE"
-
-#define	WI_NIC_LUCENT_EMB_ID	0x0005
-#define	WI_NIC_LUCENT_EMB_STR	"Lucent Embedded WaveLAN/IEEE"
-
-#define	WI_NIC_EVB2_ID		0x8000
-#define	WI_NIC_EVB2_STR		"RF:PRISM2 MAC:HFA3841"
-
-#define	WI_NIC_HWB3763_ID	0x8001
-#define	WI_NIC_HWB3763_STR	"RF:PRISM2 MAC:HFA3841 CARD:HWB3763 rev.B"
-
-#define	WI_NIC_HWB3163_ID	0x8002
-#define	WI_NIC_HWB3163_STR	"RF:PRISM2 MAC:HFA3841 CARD:HWB3163 rev.A"
-
-#define	WI_NIC_HWB3163B_ID	0x8003
-#define	WI_NIC_HWB3163B_STR	"RF:PRISM2 MAC:HFA3841 CARD:HWB3163 rev.B"
-
-#define	WI_NIC_EVB3_ID		0x8004
-#define	WI_NIC_EVB3_STR		"RF:PRISM2 MAC:HFA3842 CARD:HFA3842 EVAL"
-
-#define	WI_NIC_HWB1153_ID	0x8007
-#define	WI_NIC_HWB1153_STR	"RF:PRISM1 MAC:HFA3841 CARD:HWB1153"
-
-#define	WI_NIC_P2_SST_ID	0x8008	/* Prism2 with SST flush */
-#define	WI_NIC_P2_SST_STR	"RF:PRISM2 MAC:HFA3841 CARD:HWB3163-SST-flash"
-
-#define	WI_NIC_EVB2_SST_ID	0x8009
-#define	WI_NIC_EVB2_SST_STR	"RF:PRISM2 MAC:HFA3841 CARD:HWB3163-SST-flash"
-
-#define	WI_NIC_3842_EVA_ID	0x800A	/* 3842 Evaluation Board */
-#define	WI_NIC_3842_EVA_STR	"RF:PRISM2 MAC:HFA3842 CARD:HFA3842 EVAL"
-
-#define	WI_NIC_3842_PCMCIA_AMD_ID	0x800B	/* Prism2.5 PCMCIA */
-#define	WI_NIC_3842_PCMCIA_SST_ID	0x800C
-#define	WI_NIC_3842_PCMCIA_ATL_ID	0x800D
-#define	WI_NIC_3842_PCMCIA_ATS_ID	0x800E
-#define	WI_NIC_3842_PCMCIA_STR		"RF:PRISM2.5 MAC:ISL3873"
-
-#define	WI_NIC_3842_MINI_AMD_ID		0x8012	/* Prism2.5 Mini-PCI */
-#define	WI_NIC_3842_MINI_SST_ID		0x8013
-#define	WI_NIC_3842_MINI_ATL_ID		0x8014
-#define	WI_NIC_3842_MINI_ATS_ID		0x8015
-#define	WI_NIC_3842_MINI_STR		"RF:PRISM2.5 MAC:ISL3874A(Mini-PCI)"
-
-#define	WI_NIC_3842_PCI_AMD_ID		0x8016	/* Prism2.5 PCI-bridge */
-#define	WI_NIC_3842_PCI_SST_ID		0x8017
-#define	WI_NIC_3842_PCI_ATL_ID		0x8018
-#define	WI_NIC_3842_PCI_ATS_ID		0x8019
-#define	WI_NIC_3842_PCI_STR		"RF:PRISM2.5 MAC:ISL3874A(PCI-bridge)"
-
-#define	WI_NIC_P3_PCMCIA_AMD_ID		0x801A	/* Prism3 PCMCIA */
-#define	WI_NIC_P3_PCMCIA_SST_ID		0x801B
-#define	WI_NIC_P3_PCMCIA_ATL_ID		0x801C
-#define	WI_NIC_P3_PCMCIA_ATS_ID		0x801D
-#define	WI_NIC_P3_PCMCIA_STR		"RF:PRISM3(PCMCIA)"
-
-#define WI_NIC_P3_USB_AMD_ID		0x801E
-#define WI_NIC_P3_USB_SST_ID		0x801F
-#define	WI_NIC_P3_USB_ATL_ID		0x8020
-
-#define	WI_NIC_P3_MINI_AMD_ID		0x8021	/* Prism3 Mini-PCI */
-#define	WI_NIC_P3_MINI_SST_ID		0x8022
-#define	WI_NIC_P3_MINI_ATL_ID		0x8023
-#define	WI_NIC_P3_MINI_ATS_ID		0x8024
-#define	WI_NIC_P3_MINI_STR		"RF:PRISM3(Mini-PCI)"
-
-/*
- * List of intended regulatory domains (0xFD11).
- */
-struct wi_ltv_domains {
-	u_int16_t		wi_len;
-	u_int16_t		wi_type;
-	u_int16_t		wi_num_dom;
-	u_int8_t		wi_domains[10];
-};
-
-/*
- * CIS struct (0xFD13).
- */
-struct wi_cis {
-	u_int16_t		wi_cis[240];
-};
-
-/*
- * Communications quality (0xFD43).
- */
-struct wi_commqual {
-	u_int16_t		wi_coms_qual;
-	u_int16_t		wi_sig_lvl;
-	u_int16_t		wi_noise_lvl;
-};
-
-/*
- * Actual system scale thresholds (0xFC06, 0xFD46).
- */
-struct wi_scalethresh {
-	u_int16_t		wi_energy_detect;
-	u_int16_t		wi_carrier_detect;
-	u_int16_t		wi_defer;
-	u_int16_t		wi_cell_search;
-	u_int16_t		wi_out_of_range;
-	u_int16_t		wi_delta_snr;
-};
-
-/*
- * PCF info struct (0xFD87).
- */
-struct wi_pcf {
-	u_int16_t		wi_medium_occupancy_limit;
-	u_int16_t		wi_cfp_period;
-	u_int16_t		wi_cfp_max_duration;
-};
-
-/*
- * Connection control characteristics. (0xFC00)
- * 0 == IBSS (802.11 compliant mode) (Only PRISM2)
- * 1 == Basic Service Set (BSS)
- * 2 == Wireless Distribudion System (WDS)
- * 3 == Pseudo IBSS 
- *	(Only PRISM2; not 802.11 compliant mode, testing use only)
- * 6 == HOST AP (Only PRISM2)
- */
-#define	WI_PORTTYPE_IBSS	0x0
-#define WI_PORTTYPE_BSS		0x1
-#define WI_PORTTYPE_WDS		0x2
-#define WI_PORTTYPE_ADHOC	0x3
-#define WI_PORTTYPE_APSILENT	0x5
-#define	WI_PORTTYPE_HOSTAP	0x6
-
-/*
- * Mac addresses. (0xFC01, 0xFC08)
- */
-struct wi_macaddr {
-	u_int8_t		wi_mac_addr[6];
-};
-
-/*
- * Station set identification (SSID). (0xFC02, 0xFC04)
- */
-struct wi_ssid {
-	u_int16_t		wi_len;
-	u_int8_t		wi_ssid[32];
-};
-
-/*
- * Set our station name. (0xFC0E)
- */
-struct wi_nodename {
-	u_int16_t		wi_nodelen;
-	u_int8_t		wi_nodename[32];
-};
-
-/*
- * Multicast addresses to be put in filter. We're
- * allowed up to 16 addresses in the filter. (0xFC80)
- */
-struct wi_mcast {
-	struct ether_addr	wi_mcast[16];
-};
-
-/*
- * Join request. (0xFCE2)
- */
-struct wi_joinreq {
-	struct ether_addr	wi_bssid;
-	u_int16_t		wi_chan;
-};
-
-/*
- * supported rates. (0xFCB4)
- */
-#define WI_SUPPRATES_1M		0x0001
-#define WI_SUPPRATES_2M		0x0002
-#define WI_SUPPRATES_5M		0x0004
-#define WI_SUPPRATES_11M	0x0008
-#define	WI_RATES_BITS	"\20\0011M\0022M\0035.5M\00411M"
-
-/*
- * Information frame types.
- */
-#define WI_INFO_NOTIFY		0xF000	/* Handover address */
-#define WI_INFO_COUNTERS	0xF100	/* Statistics counters */
-#define WI_INFO_SCAN_RESULTS	0xF101	/* Scan results */
-#define WI_INFO_HOST_SCAN_RESULTS	0xF104	/* Scan results */
-#define WI_INFO_LINK_STAT	0xF200	/* Link status */
-#define	WI_INFO_LINK_STAT_CONNECTED	1
-#define	WI_INFO_LINK_STAT_DISCONNECTED	2
-#define	WI_INFO_LINK_STAT_AP_CHG	3	/* AP Change */
-#define	WI_INFO_LINK_STAT_AP_OOR	4	/* AP Out Of Range */
-#define	WI_INFO_LINK_STAT_AP_INR	5	/* AP In Range */
-#define	WI_INFO_LINK_STAT_ASSOC_FAILED	6
-#define WI_INFO_ASSOC_STAT	0xF201	/* Association status */
-#define	WI_INFO_AUTH_REQUEST	0xF202	/* Authentication Request (AP) */
-#define	WI_INFO_POWERSAVE_COUNT	0xF203	/* PowerSave User Count (AP) */
-
-struct wi_assoc {
-	u_int16_t		wi_assoc_stat;	/* Association Status */
-#define	ASSOC		1
-#define	REASSOC		2
-#define	DISASSOC	3	
-#define	ASSOCFAIL	4
-#define	AUTHFAIL	5
-	u_int8_t		wi_assoc_sta[6];	/* Station Address */
-	u_int8_t		wi_assoc_osta[6];	/* OLD Station Address */
-	u_int16_t		wi_assoc_reason;	/* Reason */
-	u_int16_t		wi_assoc_reserve;	/* Reserved */
-};
-
-/*
- * Scan Results of Prism2 chip
- */
-
-struct wi_scan_header {
-	u_int16_t		wi_reserve;	/* future use */
-	u_int16_t		wi_reason;	/* The reason this scan was initiated
-						   1: Host initiated
-						   2: Firmware initiated
-						   3: Inquiry request from host */
-};
-
-struct wi_scan_data_p2 {
-	u_int16_t		wi_chid;	/* BSS Channel ID from Probe Res.(PR)*/
-	u_int16_t		wi_noise;	/* Average Noise Level of the PR */
-	u_int16_t		wi_signal;	/* Signal Level on the PR */
-	u_int8_t		wi_bssid[6];	/* MACaddress of BSS responder from PR */
-	u_int16_t		wi_interval;	/* BSS beacon interval */
-	u_int16_t		wi_capinfo;	/* BSS Capability Information
-						   IEEE Std 802.11(1997) ,see 7.3.1.4 */
-	u_int16_t		wi_namelen;	/* Length of SSID strings */
-	u_int8_t		wi_name[32];	/* SSID strings */
-	u_int16_t		wi_suprate[5];	/* Supported Rates element from the PR
-						   IEEE Std 802.11(1997) ,see 7.3.2.2 */
-	u_int16_t		wi_rate;	/* Data rate of the PR */
-#define	WI_APRATE_1		0x0A		/* 1 Mbps */
-#define	WI_APRATE_2		0x14		/* 2 Mbps */
-#define	WI_APRATE_5		0x37		/* 5.5 Mbps */
-#define	WI_APRATE_11		0x6E		/* 11 Mbps */
-};
-
-/*
- * Scan Results of Lucent chip
- */
-struct wi_scan_data {
-	u_int16_t		wi_chid;	/* BSS Channel ID from PR */
-	u_int16_t		wi_noise;	/* Average Noise Level of the PR */
-	u_int16_t		wi_signal;	/* Signal Level on the PR */
-	u_int8_t		wi_bssid[6];	/* MACaddress of BSS responder from PR */
-	u_int16_t		wi_interval;	/* BSS beacon interval */
-	u_int16_t		wi_capinfo;	/* BSS Capability Information
-						   IEEE Std 802.11(1997) ,see 7.3.1.4 */
-	u_int16_t		wi_namelen;	/* Length of SSID strings */
-	u_int8_t		wi_name[32];	/* SSID strings */
-};
-
-/*
- * transmit/receive frame structure
- */
-struct wi_frame {
-	u_int16_t		wi_status;	/* 0x00 */
-	u_int16_t		wi_rx_tstamp1;	/* 0x02 */
-	u_int16_t		wi_rx_tstamp0;	/* 0x04 */
-	u_int8_t		wi_rx_silence;	/* 0x06 */
-	u_int8_t		wi_rx_signal;	/* 0x07 */
-	u_int8_t		wi_rx_rate;	/* 0x08 */
-	u_int8_t		wi_rx_flow;	/* 0x09 */
-	u_int8_t		wi_tx_rtry;	/* 0x0a */ /* Prism2 AP Only */
-	u_int8_t		wi_tx_rate;	/* 0x0b */ /* Prism2 AP Only */
-	u_int16_t		wi_tx_ctl;	/* 0x0c */
-	struct ieee80211_frame_addr4 wi_whdr;	/* 0x0e */
-	u_int16_t		wi_dat_len;	/* 0x2c */
-	struct ether_header	wi_ehdr;	/* 0x2e */
-} __attribute__((__packed__));
-
-/* Tx Status Field */
-#define	WI_TXSTAT_RET_ERR	0x0001
-#define	WI_TXSTAT_AGED_ERR	0x0002
-#define	WI_TXSTAT_DISCONNECT	0x0004
-#define	WI_TXSTAT_FORM_ERR	0x0008
-
-/* Rx Status Field */
-#define WI_STAT_BADCRC		0x0001
-#define WI_STAT_UNDECRYPTABLE	0x0002
-#define WI_STAT_ERRSTAT		0x0003
-#define WI_STAT_MAC_PORT	0x0700
-#define	WI_STAT_PCF		0x1000
-#define WI_RXSTAT_MSG_TYPE	0xE000
-#define  WI_STAT_1042		0x2000	/* RFC1042 encoded */
-#define  WI_STAT_TUNNEL		0x4000	/* Bridge-tunnel encoded */
-#define  WI_STAT_WMP_MSG	0x6000	/* WaveLAN-II management protocol */
-#define	 WI_STAT_MGMT		0x8000	/* 802.11b management frames */
-
-#define WI_ENC_TX_E_II		0x0E
-
-#define WI_ENC_TX_1042		0x00
-#define WI_ENC_TX_TUNNEL	0xF8
-
-/* TxControl Field (enhanced) */
-#define	WI_TXCNTL_TX_OK		0x0002
-#define	WI_TXCNTL_TX_EX		0x0004
-#define	WI_TXCNTL_STRUCT_TYPE	0x0018
-#define	 WI_ENC_TX_802_3	0x00
-#define	 WI_ENC_TX_802_11	0x08
-#define	WI_TXCNTL_ALTRTRY	0x0020
-#define	WI_TXCNTL_NOCRYPT	0x0080
-
-/*
- * HFA3861/3863 (BBP) Control Registers
- */
-#define WI_HFA386X_CR_A_D_TEST_MODES2 0x1A
-#define WI_HFA386X_CR_MANUAL_TX_POWER 0x3E
-
-#ifdef IEEE80211_RADIOTAP_F_CFP
-/*
- * Radio capture format for Prism.
- */
-#define WI_RX_RADIOTAP_PRESENT \
-	((1 << IEEE80211_RADIOTAP_TSFT) | \
-	 (1 << IEEE80211_RADIOTAP_FLAGS) | \
-	 (1 << IEEE80211_RADIOTAP_RATE) | \
-	 (1 << IEEE80211_RADIOTAP_CHANNEL) | \
-	 (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) | \
-	 (1 << IEEE80211_RADIOTAP_DB_ANTNOISE))
-
-struct wi_rx_radiotap_header {
-	struct ieee80211_radiotap_header wr_ihdr;
-	u_int64_t	wr_tsf;
-	u_int8_t	wr_flags;
-	u_int8_t	wr_rate;
-	u_int16_t	wr_chan_freq;
-	u_int16_t	wr_chan_flags;
-	u_int8_t	wr_antsignal;
-	u_int8_t	wr_antnoise;
-};
-
-#define WI_TX_RADIOTAP_PRESENT \
-	((1 << IEEE80211_RADIOTAP_FLAGS) | \
-	 (1 << IEEE80211_RADIOTAP_RATE) | \
-	 (1 << IEEE80211_RADIOTAP_CHANNEL))
-
-struct wi_tx_radiotap_header {
-	struct ieee80211_radiotap_header wt_ihdr;
-	u_int8_t	wt_flags;
-	u_int8_t	wt_rate;
-	u_int16_t	wt_chan_freq;
-	u_int16_t	wt_chan_flags;
-};
-#endif /* IEEE80211_RADIOTAP_F_CFP */
diff --git a/include.new/dev/wi/if_wivar.h b/include.new/dev/wi/if_wivar.h
deleted file mode 100644
index 7443bed..0000000
--- a/include.new/dev/wi/if_wivar.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * Copyright (c) 2002
- *	M Warner Losh <imp@freebsd.org>.  All rights reserved.
- * Copyright (c) 1997, 1998, 1999
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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: releng/10.2/sys/dev/wi/if_wivar.h 194023 2009-06-11 17:14:28Z avg $
- */
-
-/*
- * Encryption controls. We can enable or disable encryption as
- * well as specify up to 4 encryption keys. We can also specify
- * which of the four keys will be used for transmit encryption.
- */
-#define WI_RID_ENCRYPTION	0xFC20
-#define WI_RID_AUTHTYPE		0xFC21
-#define WI_RID_DEFLT_CRYPT_KEYS	0xFCB0
-#define WI_RID_TX_CRYPT_KEY	0xFCB1
-#define WI_RID_WEP_AVAIL	0xFD4F
-#define WI_RID_P2_TX_CRYPT_KEY	0xFC23
-#define WI_RID_P2_CRYPT_KEY0	0xFC24
-#define WI_RID_P2_CRYPT_KEY1	0xFC25
-#define WI_RID_MICROWAVE_OVEN	0xFC25
-#define WI_RID_P2_CRYPT_KEY2	0xFC26
-#define WI_RID_P2_CRYPT_KEY3	0xFC27
-#define WI_RID_P2_ENCRYPTION	0xFC28
-#define WI_RID_ROAMING_MODE	0xFC2D
-#define WI_RID_CUR_TX_RATE	0xFD44 /* current TX rate */
-
-#define	WI_MAX_AID		256	/* max stations for ap operation */
-
-struct wi_vap {
-	struct ieee80211vap	wv_vap;
-	struct ieee80211_beacon_offsets	wv_bo;
-
-	void		(*wv_recv_mgmt)(struct ieee80211_node *, struct mbuf *,
-			    int, int, int);
-	int		(*wv_newstate)(struct ieee80211vap *,
-			    enum ieee80211_state, int);
-};
-#define	WI_VAP(vap)		((struct wi_vap *)(vap))
-
-struct wi_softc	{
-	struct ifnet		*sc_ifp;
-	device_t		sc_dev;
-	struct mtx		sc_mtx;
-	struct callout		sc_watchdog;
-	int			sc_unit;
-	int			wi_gone;
-	int			sc_enabled;
-	int			sc_reset;
-	int			sc_firmware_type;
-#define WI_NOTYPE	0
-#define	WI_LUCENT	1
-#define	WI_INTERSIL	2
-#define	WI_SYMBOL	3
-	int			sc_pri_firmware_ver;	/* Primary firmware */
-	int			sc_sta_firmware_ver;	/* Station firmware */
-	unsigned int		sc_nic_id;		/* Type of NIC */
-	char *			sc_nic_name;
-
-	int			wi_bus_type;	/* Bus attachment type */
-	struct resource *	local;
-	int			local_rid;
-	struct resource *	iobase;
-	int			iobase_rid;
-	struct resource *	irq;
-	int			irq_rid;
-	struct resource *	mem;
-	int			mem_rid;
-	bus_space_handle_t	wi_localhandle;
-	bus_space_tag_t		wi_localtag;
-	bus_space_handle_t	wi_bhandle;
-	bus_space_tag_t		wi_btag;
-	bus_space_handle_t	wi_bmemhandle;
-	bus_space_tag_t		wi_bmemtag;
-	void *			wi_intrhand;
-	struct ieee80211_channel *wi_channel;
-	int			wi_io_addr;
-	int			wi_cmd_count;
-
-	int			sc_flags;
-	int			sc_if_flags;
-	int			sc_bap_id;
-	int			sc_bap_off;
-
-	int			sc_porttype;
-	u_int16_t		sc_portnum;
-	u_int16_t		sc_encryption;
-	u_int16_t		sc_monitor_port;
-
-	/* RSSI interpretation */
-	u_int16_t		sc_min_rssi;	/* clamp sc_min_rssi < RSSI */
-	u_int16_t		sc_max_rssi;	/* clamp RSSI < sc_max_rssi */
-	u_int16_t		sc_dbm_offset;	/* dBm ~ RSSI - sc_dbm_offset */
-
-	int			sc_buflen;		/* TX buffer size */
-	int			sc_ntxbuf;
-#define	WI_NTXBUF	3
-	struct {
-		int		d_fid;
-		int		d_len;
-	}			sc_txd[WI_NTXBUF];	/* TX buffers */
-	int			sc_txnext;		/* index of next TX */
-	int			sc_txcur;		/* index of current TX*/
-	int			sc_tx_timer;
-
-	struct wi_counters	sc_stats;
-	u_int16_t		sc_ibss_port;
-
-	struct timeval		sc_last_syn;
-	int			sc_false_syns;
-
-	u_int16_t		sc_txbuf[IEEE80211_MAX_LEN/2];
-
-	struct wi_tx_radiotap_header sc_tx_th;
-	struct wi_rx_radiotap_header sc_rx_th;
-};
-
-/* maximum consecutive false change-of-BSSID indications */
-#define	WI_MAX_FALSE_SYNS		10	
-
-#define	WI_FLAGS_HAS_ENHSECURITY	0x0001
-#define	WI_FLAGS_HAS_WPASUPPORT		0x0002
-#define	WI_FLAGS_HAS_ROAMING		0x0020
-#define	WI_FLAGS_HAS_FRAGTHR		0x0200
-#define	WI_FLAGS_HAS_DBMADJUST		0x0400
-
-struct wi_card_ident {
-	u_int16_t	card_id;
-	char		*card_name;
-	u_int8_t	firm_type;
-};
-
-#define	WI_PRISM_MIN_RSSI	0x1b
-#define	WI_PRISM_MAX_RSSI	0x9a
-#define	WI_PRISM_DBM_OFFSET	100 /* XXX */
-
-#define	WI_LUCENT_MIN_RSSI	47
-#define	WI_LUCENT_MAX_RSSI	138
-#define	WI_LUCENT_DBM_OFFSET	149
-
-#define	WI_RSSI_TO_DBM(sc, rssi) (MIN((sc)->sc_max_rssi, \
-    MAX((sc)->sc_min_rssi, (rssi))) - (sc)->sc_dbm_offset)
-
-#define	WI_LOCK(_sc) 		mtx_lock(&(_sc)->sc_mtx)
-#define	WI_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
-#define	WI_LOCK_ASSERT(_sc)	mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
-
-int	wi_attach(device_t);
-int	wi_detach(device_t);
-int	wi_shutdown(device_t);
-int	wi_alloc(device_t, int);
-void	wi_free(device_t);
-extern devclass_t wi_devclass;
-void	wi_init(void *);
-void	wi_intr(void *);
-int	wi_mgmt_xmit(struct wi_softc *, caddr_t, int);
-void	wi_stop(struct wi_softc *, int);
diff --git a/include.new/dev/wi/spectrum24t_cf.h b/include.new/dev/wi/spectrum24t_cf.h
deleted file mode 100644
index 374fefe..0000000
--- a/include.new/dev/wi/spectrum24t_cf.h
+++ /dev/null
@@ -1,4327 +0,0 @@
-/*	$NetBSD$	*/
-/* $FreeBSD: src/sys/dev/wi/spectrum24t_cf.h,v 1.2 2005/01/06 01:43:33 imp Exp $ */
-
-/*-
- * Copyright (c) 2001 Symbol Technologies Inc. -- http://www.symbol.com
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted provided
- * that the following conditions are met:
- * 1. Redistribution of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistribution 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 ``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 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.
- */ 
-
-/*
- * Firmware for Symbol Wireless Networker Spectrum24t CF card.
- * Automatically generated from EPRIMSYM and ESECSYM:
- *	T3.10-04,F3.10-04,01/17/2002
- */
-
-#ifndef _FIRMWARE_WI_SPECTRUM24T_CF_H_
-#define _FIRMWARE_WI_SPECTRUM24T_CF_H_
-
-const u_int8_t spectrum24t_primsym[] = {
-0x46,0x49,0x4c,0x45,0x3a,0x20,0x45,0x50,0x52,0x49,0x4d,0x53,0x59,0x4d,0x2c,0x54,
-0x33,0x2e,0x31,0x30,0x2d,0x30,0x34,0x2c,0x46,0x33,0x2e,0x31,0x30,0x2d,0x30,0x34,
-0x2c,0x30,0x31,0x2f,0x31,0x37,0x2f,0x32,0x30,0x30,0x32,0x20,0x50,0x52,0x49,0x4d,
-0x41,0x52,0x59,0x20,0x33,0x20,0x37,0x32,0x20,0x33,0x36,0x20,0x34,0x30,0x0a,0x1a,
-0xfe,0x17,0x7e,0x00,0x02,0x00,0xff,0xff,0x00,0x00,0x7e,0x00,0xfe,0x0f,0x00,0x64,
-0x90,0xff,0x00,0xf7,0x20,0xfe,0x00,0x64,0x91,0xff,0x01,0xf7,0x20,0xfe,0x00,0x64,
-0x92,0xff,0x02,0xf7,0x20,0xfe,0x00,0x64,0x93,0xff,0x03,0xf7,0x20,0xfe,0x00,0x64,
-0x94,0xff,0x04,0xf7,0x20,0xfe,0x00,0x64,0x95,0xff,0x05,0xf7,0x20,0xfe,0x00,0x64,
-0x96,0xff,0x06,0xf7,0x20,0xfe,0x00,0x64,0x97,0xff,0x07,0x04,0x30,0x44,0x04,0xa8,
-0xff,0xff,0x11,0x03,0x00,0x60,0xf6,0x78,0xff,0xff,0x87,0xff,0x8a,0xff,0x98,0xff,
-0x20,0xfe,0x44,0x41,0x00,0x64,0x64,0x40,0x10,0x2b,0x04,0x64,0x40,0x51,0x00,0x64,
-0x40,0x50,0x00,0x64,0x40,0x40,0x99,0xff,0x08,0x60,0x2a,0x62,0x04,0x60,0xff,0x64,
-0xa2,0xdb,0x04,0x60,0xff,0xe5,0xff,0xff,0xff,0xff,0x98,0xff,0x08,0x60,0x28,0x62,
-0x28,0x60,0x10,0x64,0xa2,0xdb,0x28,0x60,0x31,0x40,0x04,0x26,0xa8,0x60,0x99,0xff,
-0x10,0xe4,0xff,0xff,0xff,0xff,0x98,0xff,0x55,0x60,0xfc,0xe0,0xa0,0xfe,0xa1,0xfe,
-0xa2,0xfe,0xa3,0xfe,0xa4,0xfe,0xa5,0xfe,0xa6,0xfe,0xa7,0xfe,0xa8,0xfe,0xa9,0xfe,
-0xaa,0xfe,0xab,0xfe,0xac,0xfe,0xad,0xfe,0xae,0xfe,0xaf,0xfe,0xb0,0xfe,0xb1,0xfe,
-0xb2,0xfe,0xb3,0xfe,0xb4,0xfe,0xb5,0xfe,0xb6,0xfe,0xb7,0xfe,0xb8,0xfe,0xb9,0xfe,
-0xba,0xfe,0xbb,0xfe,0xbc,0xfe,0xbd,0xfe,0xbe,0xfe,0xbf,0xfe,0x99,0xff,0x18,0xec,
-0x0e,0xe3,0x12,0xe3,0x1d,0xe3,0x22,0xe3,0x2a,0xe3,0x32,0xe3,0x3a,0xe3,0x10,0xed,
-0x42,0xe3,0x4a,0xe3,0x52,0xe3,0x5a,0xe3,0x62,0xe3,0x68,0xe3,0x70,0xe3,0x7a,0xe3,
-0x04,0xee,0x82,0xe3,0x8a,0xe3,0x92,0xe3,0x9a,0xe3,0xa2,0xe3,0xaa,0xe3,0xb2,0xe3,
-0xba,0xe3,0x21,0x60,0x7d,0xe7,0x68,0x60,0x7d,0xe7,0x10,0x60,0x7d,0xe7,0x7d,0xe7,
-0xf0,0x60,0x7d,0xe7,0xa5,0x60,0x7d,0xe7,0x7d,0xe7,0x36,0x60,0x7d,0xe7,0x6d,0x60,
-0x7d,0xe7,0x98,0x60,0x7d,0xe7,0x39,0x60,0x7d,0xe7,0x3f,0x60,0x7d,0xe7,0x42,0x60,
-0x7d,0xe7,0x0c,0x60,0x7d,0xe7,0xc2,0x60,0x7d,0xe7,0x7d,0xe7,0xa5,0x60,0x7d,0xe7,
-0x7d,0xe7,0x36,0x60,0x7d,0xe7,0x01,0x60,0x7d,0xe7,0xad,0x60,0x7d,0xe7,0x7d,0xe7,
-0x37,0x60,0x7d,0xe7,0x42,0x60,0x7d,0xe7,0x0e,0x60,0x7d,0xe7,0xc2,0x60,0x7d,0xe7,
-0x07,0x60,0x80,0xe7,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0x80,0xe7,0xff,0xff,0xff,0xff,0x06,0xe3,0xff,0xff,0x98,0xff,0x30,0x44,
-0x00,0xa8,0xff,0xff,0x09,0x02,0x08,0x60,0x00,0x64,0xc8,0x81,0x3e,0x63,0x00,0x64,
-0x59,0xdb,0xfe,0x1f,0x04,0x60,0x41,0x76,0x00,0x60,0x3e,0x63,0xff,0x60,0xfe,0x61,
-0xfc,0x60,0x00,0x66,0x09,0x60,0xc2,0x64,0x58,0xd0,0x59,0xd9,0xfd,0x1f,0x05,0x60,
-0x08,0x63,0x08,0x60,0xfe,0x61,0xfc,0x60,0x00,0x66,0x0a,0x60,0x02,0x64,0x58,0xd0,
-0x59,0xd9,0xfd,0x1f,0x58,0x4f,0x2e,0x00,0x58,0x4f,0x14,0x00,0x30,0x44,0x00,0xa8,
-0x00,0x64,0x03,0x03,0x0f,0xfb,0xd4,0xfe,0x00,0x00,0x63,0xff,0xff,0xff,0x65,0xff,
-0xff,0xff,0x58,0x4f,0x41,0x00,0x01,0x60,0x9c,0x78,0xff,0xff,0x98,0xff,0x00,0xe1,
-0xa1,0xff,0xfc,0x00,0x00,0x60,0x7c,0x63,0x0e,0x60,0x80,0x64,0xe0,0x87,0x15,0xfb,
-0x04,0x61,0x60,0x46,0xdc,0x84,0x00,0xfa,0xcd,0x81,0x01,0xfc,0xfa,0x02,0x00,0x64,
-0x00,0xfa,0x80,0x60,0x00,0x65,0xb7,0x83,0x01,0xfc,0x15,0xf5,0x3c,0x63,0x01,0xfc,
-0x2f,0x58,0xff,0xff,0x00,0x60,0x7e,0x63,0xfe,0x60,0x00,0x65,0x45,0x4b,0xdc,0x60,
-0xfe,0x61,0xfc,0x60,0x00,0x65,0x0f,0x60,0x0c,0x64,0x65,0x46,0x58,0xd0,0x2b,0x46,
-0x59,0xd8,0xfb,0x1f,0x7e,0x63,0x40,0xa1,0x40,0xa1,0x65,0x46,0x58,0xd0,0x2b,0x46,
-0x59,0xd8,0xfb,0x1f,0x7e,0x63,0x40,0xa1,0x40,0xa1,0x65,0x46,0x58,0xd0,0x2b,0x46,
-0x59,0xd8,0xfb,0x1f,0x2f,0x58,0xff,0xff,0x04,0xee,0x0d,0x60,0x26,0x63,0x0e,0x60,
-0x0a,0x65,0xbd,0xd1,0xff,0xff,0x64,0x48,0x64,0x47,0x00,0x7f,0x60,0x41,0x80,0xbc,
-0x60,0x4a,0xff,0xff,0xff,0xff,0x01,0x16,0xfe,0x00,0xff,0xff,0xff,0xff,0xd7,0x80,
-0xff,0xff,0xef,0x02,0x68,0x40,0x99,0xff,0x3e,0x44,0xfc,0xb4,0x01,0xbc,0x00,0x7f,
-0x40,0x5e,0x98,0xff,0x0d,0x63,0x01,0x60,0x58,0x4e,0x70,0x78,0xff,0xff,0x99,0xff,
-0x3e,0x44,0xfc,0xb4,0x00,0x7f,0x40,0x5e,0x98,0xff,0x0d,0x63,0x01,0x60,0x58,0x4e,
-0x70,0x78,0xff,0xff,0x00,0xee,0x88,0xec,0x00,0xed,0x2f,0x58,0xff,0xff,0xff,0xff,
-0xfe,0x1f,0x2e,0x58,0xff,0xff,0x98,0xff,0x00,0xe1,0x30,0x44,0x01,0xa8,0x02,0xa8,
-0x05,0x03,0x05,0x03,0x83,0xff,0x8d,0xff,0x00,0x64,0x40,0x40,0x43,0xe1,0x00,0x60,
-0x91,0x65,0x78,0x44,0xc4,0x98,0xff,0xff,0x98,0xff,0x88,0xe2,0x00,0xe1,0x30,0x44,
-0x02,0xa8,0x01,0xa8,0x0b,0x03,0x06,0x03,0x85,0xff,0x88,0xff,0xeb,0x60,0x19,0xe2,
-0x00,0x60,0x90,0xe2,0x40,0xe1,0x04,0x60,0x00,0x71,0x8d,0xe2,0x01,0x60,0x3e,0x65,
-0x78,0x44,0xc4,0x98,0xff,0xff,0x0a,0xe1,0xa3,0xff,0xae,0xff,0xff,0xff,0xff,0xff,
-0xae,0xff,0x01,0x60,0x63,0x65,0x78,0x44,0xc4,0x98,0xff,0xff,0xaa,0xff,0x08,0x60,
-0x14,0x64,0xa0,0xd1,0x04,0x60,0x41,0x76,0x3f,0x60,0xff,0x64,0xa0,0x83,0x08,0x60,
-0x14,0x64,0xa0,0xdd,0x64,0x44,0x80,0x2b,0x1d,0x00,0x50,0xfe,0x08,0x60,0x02,0x64,
-0xa0,0xd1,0xfe,0x60,0x01,0x64,0xd0,0x80,0x08,0x60,0x04,0x64,0xa0,0xd1,0xdc,0x60,
-0x23,0x64,0xd0,0x80,0x08,0x60,0x06,0x64,0xa0,0xd1,0xba,0x60,0x45,0x64,0xd0,0x80,
-0x63,0x47,0x01,0x01,0x07,0x00,0xc0,0xbf,0x60,0x43,0x08,0x60,0x14,0x64,0xa0,0xdd,
-0x04,0x60,0x01,0x76,0x41,0x00,0xab,0xff,0xff,0xff,0xff,0xff,0xab,0xff,0x3c,0x00,
-0xa9,0xff,0x77,0x44,0x60,0x57,0x40,0x4a,0x2a,0x44,0x10,0xb0,0x20,0x44,0x04,0x03,
-0xfd,0xb4,0x01,0xb0,0x40,0x40,0x01,0x02,0x2f,0x00,0xfe,0xb4,0x40,0x40,0xa8,0xff,
-0x20,0x44,0x02,0xb0,0x60,0x41,0x08,0x60,0x00,0x64,0xa0,0xd1,0x61,0x44,0x03,0x03,
-0x01,0xbc,0x40,0x40,0x1e,0x00,0x02,0xbc,0x40,0x40,0x64,0x44,0x3f,0xb4,0x0b,0xa8,
-0xff,0xff,0x06,0x02,0x64,0x44,0x80,0xb0,0xff,0xff,0x02,0x03,0x01,0x64,0x13,0xfb,
-0x0f,0xf9,0x08,0x60,0x02,0x64,0xa0,0xd1,0x10,0xf9,0x08,0x60,0x04,0x64,0xa0,0xd1,
-0xd4,0xfe,0x11,0xf9,0x08,0x60,0x06,0x64,0xa0,0xd1,0x12,0xf9,0xae,0xff,0xff,0xff,
-0xae,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xa1,0xff,0xff,0xff,0xba,0x3f,0x75,0x44,
-0x01,0x26,0x08,0xf7,0xff,0xff,0xff,0xff,0x02,0x26,0x09,0xf7,0xff,0xff,0xff,0xff,
-0x04,0x26,0x0a,0xf7,0xff,0xff,0xff,0xff,0x08,0x26,0x0b,0xf7,0xff,0xff,0xff,0xff,
-0x40,0x26,0xa7,0xff,0xe9,0x00,0x0f,0x60,0xfe,0x65,0x08,0x60,0x1c,0x64,0xa0,0xd3,
-0xff,0xff,0x24,0x86,0x80,0x67,0x60,0x5c,0x08,0x60,0x1c,0x64,0xa0,0xd9,0x08,0x60,
-0x18,0x64,0xa0,0xd3,0x15,0xf3,0x40,0x45,0xfc,0x2b,0x02,0x00,0x40,0x45,0x05,0x00,
-0x02,0x60,0x58,0x4f,0xb2,0x78,0xff,0xff,0x07,0x02,0x58,0x4f,0x4a,0x00,0x04,0x05,
-0x66,0x50,0x65,0x52,0x61,0x51,0x0a,0x00,0x40,0x67,0x26,0x45,0xb4,0x84,0x40,0x46,
-0x15,0xf5,0x06,0xf0,0x80,0x60,0x64,0x50,0x20,0x52,0x7e,0x71,0x99,0xff,0xac,0xff,
-0x98,0xff,0x26,0x5c,0x08,0x60,0x1c,0x64,0xa0,0xd9,0xb6,0x00,0x0f,0x60,0xfe,0x65,
-0x08,0x60,0x1e,0x64,0xa0,0xd3,0xff,0xff,0x24,0x86,0x80,0x67,0x60,0x5c,0x08,0x60,
-0x1e,0x64,0xa0,0xd9,0x08,0x60,0x1a,0x64,0xa0,0xd3,0x15,0xf3,0x40,0x45,0xfc,0x2b,
-0x02,0x00,0x40,0x45,0x03,0x00,0x58,0x4f,0x3c,0x00,0x08,0x02,0x58,0x4f,0x19,0x00,
-0x8e,0xff,0x04,0x05,0x66,0x50,0x65,0x52,0x61,0x51,0x0a,0x00,0x40,0x67,0x26,0x45,
-0xb4,0x84,0x40,0x46,0x15,0xf5,0x06,0xf0,0x80,0x60,0x64,0x50,0x20,0x52,0x7e,0x71,
-0x8d,0xff,0x99,0xff,0xad,0xff,0x98,0xff,0x26,0x5c,0x08,0x60,0x1e,0x64,0xa0,0xd9,
-0xcc,0x00,0x25,0x46,0x26,0x41,0x44,0x63,0x01,0xf2,0xff,0xff,0xff,0xb5,0xd5,0x81,
-0xff,0xff,0x07,0x04,0x00,0xf2,0x04,0x63,0x00,0xa8,0x60,0x46,0xf5,0x02,0x42,0xfe,
-0x0e,0x00,0x61,0x44,0xc5,0x81,0x63,0x45,0xc5,0x81,0x60,0x45,0x00,0x64,0xd4,0x84,
-0x01,0xf2,0xf0,0x85,0xf0,0x80,0x65,0x44,0xf8,0x85,0xff,0xff,0x02,0xfe,0x2f,0x58,
-0xff,0xff,0x25,0x44,0x1a,0xf1,0x1b,0xf1,0xd0,0x80,0xd0,0x80,0x0e,0x04,0x08,0x06,
-0x1c,0xf1,0x1d,0xf1,0xd0,0x80,0xd0,0x80,0x08,0x04,0x02,0x06,0x48,0xfe,0x05,0x00,
-0x25,0x46,0x01,0xf0,0x03,0x67,0xa0,0x85,0x94,0x80,0x2f,0x58,0xff,0xff,0x84,0xe2,
-0x04,0x60,0x00,0x71,0x8d,0xe2,0x1e,0xf3,0x14,0xf3,0x00,0xbd,0xcc,0x83,0x08,0x03,
-0x14,0xfd,0x06,0x02,0x65,0x44,0x14,0xfb,0x89,0xff,0x80,0x60,0x00,0x75,0x88,0xff,
-0xa1,0xff,0xff,0xff,0xbc,0x3f,0x7f,0x67,0x01,0x61,0x23,0x58,0xff,0xff,0x0f,0xf3,
-0x10,0xf1,0x40,0x44,0x44,0x45,0x11,0xf1,0x12,0xf1,0x44,0x46,0x44,0x47,0x3f,0xb4,
-0x0b,0xa8,0xff,0xff,0x06,0x02,0x24,0x44,0x80,0xb0,0xff,0xff,0x02,0x03,0x00,0x67,
-0x08,0x00,0x24,0x44,0x3f,0xb4,0xe0,0x85,0x09,0x60,0x00,0x64,0x44,0xd7,0x58,0x43,
-0xff,0xff,0x61,0x43,0x60,0x45,0x24,0x44,0x3f,0xb4,0xb4,0x9c,0xff,0x27,0x01,0x00,
-0x03,0x00,0x08,0x60,0x0a,0x64,0xa0,0xdd,0x08,0x60,0x08,0x64,0xa0,0xd9,0x10,0x75,
-0xa1,0xff,0xff,0xff,0xbe,0x3f,0xb4,0xfe,0xff,0xff,0xd1,0x05,0xb5,0xfe,0xb6,0xfe,
-0xb7,0xfe,0xf6,0x00,0x08,0x60,0x28,0x62,0x12,0x60,0x34,0x64,0xa2,0xdb,0x24,0x45,
-0x01,0x27,0x3d,0x00,0x7f,0x60,0xc0,0x64,0xa4,0x80,0x7f,0x67,0x02,0x61,0x40,0x02,
-0x20,0x44,0x20,0xb0,0xdf,0xb4,0x1b,0x03,0x40,0x40,0xfc,0x60,0x00,0x66,0x00,0x60,
-0x16,0x64,0x60,0x41,0x08,0x63,0x58,0xd0,0x59,0xd9,0xfd,0x1f,0x00,0x60,0x26,0x64,
-0x60,0x41,0x08,0x63,0x58,0xd0,0x59,0xd9,0xfd,0x1f,0x02,0x64,0x40,0x50,0x63,0xff,
-0xff,0xff,0x65,0xff,0xff,0xff,0x04,0x64,0x40,0x50,0x67,0xff,0xff,0xff,0xfc,0x60,
-0x00,0x66,0x17,0x60,0xfe,0x63,0xbd,0xd0,0xc0,0x60,0xde,0x64,0xd0,0x80,0xdb,0x83,
-0x0e,0x02,0x20,0x44,0x10,0xbc,0x40,0x40,0x02,0x64,0x40,0x50,0x63,0xff,0xff,0xff,
-0x65,0xff,0xff,0xff,0x00,0x64,0x40,0x50,0x0c,0x60,0x01,0x78,0xff,0xff,0x08,0x60,
-0x00,0x64,0xc8,0x81,0x3e,0x63,0x00,0x64,0x59,0xdb,0xfe,0x1f,0x04,0x60,0x41,0x76,
-0x23,0x58,0xff,0xff,0x7e,0x60,0xc0,0x64,0x24,0x45,0xa4,0x80,0x7f,0x67,0x02,0x61,
-0x23,0x02,0x25,0x45,0xfc,0x2b,0x1e,0x00,0x0c,0x60,0x70,0x63,0x0e,0x61,0x24,0x44,
-0x01,0x27,0x10,0x00,0xbd,0xd3,0xa3,0xd1,0xd4,0x80,0xcd,0x81,0x08,0x24,0x64,0x58,
-0x08,0xa3,0xf8,0x02,0x04,0x61,0x15,0xf5,0x00,0x64,0x22,0xfa,0x25,0x44,0x5a,0xda,
-0x00,0x67,0x0a,0x00,0xbd,0xd3,0xbe,0xd1,0xd4,0x80,0xcd,0x81,0x08,0x24,0x64,0x58,
-0x08,0xa3,0xf8,0x02,0x7f,0x67,0x04,0x61,0x23,0x58,0xff,0xff,0xbf,0xd3,0xff,0xff,
-0x62,0x43,0xbf,0xd1,0xf8,0xa3,0xa3,0xd1,0x64,0x43,0x60,0x41,0x15,0xf5,0xe8,0x84,
-0xdc,0x84,0x22,0xfa,0x5a,0xd8,0x62,0x44,0xbd,0xd1,0xc9,0x81,0x58,0xd8,0xfc,0x02,
-0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,0x22,0xf2,0xbf,0xd1,0xff,0xff,
-0x62,0x43,0xcc,0x84,0xe0,0x85,0x0b,0x06,0xbf,0xd1,0x64,0x41,0xd5,0x80,0x64,0x43,
-0x01,0x06,0x65,0x41,0x46,0x64,0x58,0xd0,0xc9,0x81,0xbd,0xd9,0xfc,0x02,0x00,0x67,
-0x00,0x61,0x23,0x58,0xff,0xff,0xfc,0x60,0x00,0x64,0x40,0x4b,0x4b,0xd3,0x15,0xf5,
-0x60,0x41,0xd8,0x84,0xe8,0x84,0x22,0xfa,0x25,0x44,0x23,0xfa,0xbf,0xd3,0x66,0x45,
-0x48,0x63,0xc8,0x84,0x2b,0x46,0x58,0xd0,0x65,0x46,0xc9,0x81,0xbd,0xd8,0xfa,0x02,
-0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x00,0x64,0x40,0x45,0x02,0x60,0x00,0x64,
-0x40,0x46,0x77,0x60,0xfc,0xe0,0x99,0xff,0x00,0xec,0x02,0xe3,0xd8,0xe3,0x0a,0xe1,
-0x2f,0x60,0xfe,0x62,0x04,0x60,0x58,0x4e,0x7b,0x78,0xff,0xff,0x25,0x44,0x60,0x47,
-0x01,0xb4,0xe0,0x85,0xa0,0x7e,0xb4,0x84,0x04,0x60,0x58,0x4e,0xa4,0x78,0xff,0xff,
-0x25,0x44,0x04,0x60,0x58,0x4e,0xa4,0x78,0xff,0xff,0x08,0x61,0x61,0x5c,0x5a,0xd1,
-0xff,0xff,0x64,0x47,0x04,0x60,0x58,0x4e,0xa4,0x78,0xff,0xff,0x2c,0x02,0x64,0x44,
-0x04,0x60,0x58,0x4e,0xa4,0x78,0xff,0xff,0x26,0x02,0xcd,0x81,0xff,0xff,0xef,0x02,
-0x04,0x60,0x58,0x4e,0x89,0x78,0xff,0xff,0x03,0x60,0xe8,0x7a,0x2d,0xe2,0xa1,0xff,
-0xff,0xff,0x24,0xe2,0x04,0x60,0x58,0x4e,0x7b,0x78,0xff,0xff,0xa1,0x7e,0x04,0x60,
-0x58,0x4e,0xa4,0x78,0xff,0xff,0xf0,0x02,0x04,0x60,0x58,0x4e,0x97,0x78,0xff,0xff,
-0x04,0x60,0x58,0x4e,0x89,0x78,0xff,0xff,0x26,0x45,0x25,0x44,0x10,0xa4,0xd4,0x80,
-0x40,0x45,0xb8,0x02,0x28,0xe2,0xff,0x60,0xff,0x64,0xa2,0xdb,0x55,0x60,0xfc,0xe0,
-0x98,0xff,0x8d,0xe2,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x77,0x60,0xfc,0xe0,
-0x99,0xff,0x00,0xec,0x02,0xe3,0xd8,0xe3,0x04,0x60,0x58,0x4e,0x97,0x78,0xff,0xff,
-0x04,0x60,0x58,0x4e,0x7b,0x78,0xff,0xff,0xa0,0x7e,0x04,0x60,0x58,0x4e,0xa4,0x78,
-0xff,0xff,0x00,0x7e,0x04,0x60,0x58,0x4e,0xa4,0x78,0xff,0xff,0x04,0x60,0x58,0x4e,
-0x7b,0x78,0xff,0xff,0xa1,0x7e,0x04,0x60,0x58,0x4e,0xa4,0x78,0xff,0xff,0x2f,0x60,
-0xfe,0x62,0x01,0x60,0x00,0x61,0x61,0x5c,0x04,0x60,0x58,0x4e,0xc7,0x78,0xff,0xff,
-0x60,0x47,0x60,0x45,0x04,0x60,0x58,0x4e,0xc7,0x78,0xff,0xff,0xb4,0x84,0xcd,0x81,
-0x5a,0xdb,0xf2,0x02,0x04,0x60,0x58,0x4e,0x89,0x78,0xff,0xff,0xff,0xff,0x04,0x60,
-0x58,0x4e,0x97,0x78,0xff,0xff,0x55,0x60,0xfc,0xe0,0x98,0xff,0x00,0x67,0x00,0x61,
-0x23,0x58,0xff,0xff,0x01,0x60,0x02,0xe3,0xff,0xff,0xff,0xff,0x01,0xec,0xff,0xff,
-0xff,0xff,0x01,0x60,0x06,0xe3,0xff,0xff,0xff,0xff,0x00,0xec,0x2e,0x58,0xff,0xff,
-0x01,0x60,0x06,0xe3,0xff,0xff,0xff,0xff,0x01,0xec,0xff,0xff,0xff,0xff,0x01,0x60,
-0x02,0xe3,0xff,0xff,0xff,0xff,0x00,0xec,0x2e,0x58,0xff,0xff,0x09,0x63,0x01,0xec,
-0xff,0xff,0xff,0xff,0x3f,0x40,0x08,0x26,0x04,0x00,0x00,0xec,0xcf,0x83,0xff,0xff,
-0xf6,0x02,0x2e,0x58,0xff,0xff,0x0e,0x63,0x60,0x40,0x80,0x2a,0x03,0x00,0x01,0x60,
-0x02,0xe3,0x02,0x00,0x01,0x60,0x06,0xe3,0x01,0xec,0xe0,0x84,0xff,0xff,0xff,0xff,
-0xff,0xff,0x00,0xec,0xf1,0x1f,0x01,0x60,0x02,0xe3,0xff,0xff,0xff,0xff,0x3f,0x40,
-0x08,0x26,0x08,0x00,0x01,0xec,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xec,
-0x00,0x64,0x01,0x00,0x01,0x64,0x00,0xbc,0x2e,0x58,0xff,0xff,0x0e,0x63,0xe0,0x84,
-0x3f,0x40,0x08,0x26,0xdc,0x84,0x01,0xec,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0x00,0xec,0xf5,0x1f,0xff,0xff,0x01,0x60,0x06,0xe3,0xff,0xff,0x01,0xec,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xec,0x01,0x60,0x02,0xe3,0x00,0x7f,0x2e,0x58,
-0xff,0xff,0xff,0x00,0xff,0x00,0xff,0x00,0x74,0x01,0xff,0x00,0x85,0x01,0xff,0x00,
-0x18,0x02,0xe8,0x01,0xd9,0x01,0xa7,0x01,0xd4,0x01,0xdc,0x01,0xc8,0x02,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0a,0x00,
-0x00,0x00,0x13,0x03,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,
-0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,
-0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,
-0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,
-0xdc,0x02,0xdc,0x02,0x63,0x03,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,
-0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,
-0xdc,0x02,0x37,0x04,0xd5,0x03,0xdc,0x02,0xda,0x03,0xdc,0x02,0xdc,0x02,0xdc,0x02,
-0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,0xdc,0x02,
-0xdc,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x7e,0x00,0x08,0x11,0x00,0xf8,0x7f,0x00,0xfe,0x07,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
-0xff,0xff,0xff,0xff,0x00,0x00,0xc1,0xc0,0x81,0xc1,0x40,0x01,0x01,0xc3,0xc0,0x03,
-0x80,0x02,0x41,0xc2,0x01,0xc6,0xc0,0x06,0x80,0x07,0x41,0xc7,0x00,0x05,0xc1,0xc5,
-0x81,0xc4,0x40,0x04,0x01,0xcc,0xc0,0x0c,0x80,0x0d,0x41,0xcd,0x00,0x0f,0xc1,0xcf,
-0x81,0xce,0x40,0x0e,0x00,0x0a,0xc1,0xca,0x81,0xcb,0x40,0x0b,0x01,0xc9,0xc0,0x09,
-0x80,0x08,0x41,0xc8,0x01,0xd8,0xc0,0x18,0x80,0x19,0x41,0xd9,0x00,0x1b,0xc1,0xdb,
-0x81,0xda,0x40,0x1a,0x00,0x1e,0xc1,0xde,0x81,0xdf,0x40,0x1f,0x01,0xdd,0xc0,0x1d,
-0x80,0x1c,0x41,0xdc,0x00,0x14,0xc1,0xd4,0x81,0xd5,0x40,0x15,0x01,0xd7,0xc0,0x17,
-0x80,0x16,0x41,0xd6,0x01,0xd2,0xc0,0x12,0x80,0x13,0x41,0xd3,0x00,0x11,0xc1,0xd1,
-0x81,0xd0,0x40,0x10,0x01,0xf0,0xc0,0x30,0x80,0x31,0x41,0xf1,0x00,0x33,0xc1,0xf3,
-0x81,0xf2,0x40,0x32,0x00,0x36,0xc1,0xf6,0x81,0xf7,0x40,0x37,0x01,0xf5,0xc0,0x35,
-0x80,0x34,0x41,0xf4,0x00,0x3c,0xc1,0xfc,0x81,0xfd,0x40,0x3d,0x01,0xff,0xc0,0x3f,
-0x80,0x3e,0x41,0xfe,0x01,0xfa,0xc0,0x3a,0x80,0x3b,0x41,0xfb,0x00,0x39,0xc1,0xf9,
-0x81,0xf8,0x40,0x38,0x00,0x28,0xc1,0xe8,0x81,0xe9,0x40,0x29,0x01,0xeb,0xc0,0x2b,
-0x80,0x2a,0x41,0xea,0x01,0xee,0xc0,0x2e,0x80,0x2f,0x41,0xef,0x00,0x2d,0xc1,0xed,
-0x81,0xec,0x40,0x2c,0x01,0xe4,0xc0,0x24,0x80,0x25,0x41,0xe5,0x00,0x27,0xc1,0xe7,
-0x81,0xe6,0x40,0x26,0x00,0x22,0xc1,0xe2,0x81,0xe3,0x40,0x23,0x01,0xe1,0xc0,0x21,
-0x80,0x20,0x41,0xe0,0x01,0xa0,0xc0,0x60,0x80,0x61,0x41,0xa1,0x00,0x63,0xc1,0xa3,
-0x81,0xa2,0x40,0x62,0x00,0x66,0xc1,0xa6,0x81,0xa7,0x40,0x67,0x01,0xa5,0xc0,0x65,
-0x80,0x64,0x41,0xa4,0x00,0x6c,0xc1,0xac,0x81,0xad,0x40,0x6d,0x01,0xaf,0xc0,0x6f,
-0x80,0x6e,0x41,0xae,0x01,0xaa,0xc0,0x6a,0x80,0x6b,0x41,0xab,0x00,0x69,0xc1,0xa9,
-0x81,0xa8,0x40,0x68,0x00,0x78,0xc1,0xb8,0x81,0xb9,0x40,0x79,0x01,0xbb,0xc0,0x7b,
-0x80,0x7a,0x41,0xba,0x01,0xbe,0xc0,0x7e,0x80,0x7f,0x41,0xbf,0x00,0x7d,0xc1,0xbd,
-0x81,0xbc,0x40,0x7c,0x01,0xb4,0xc0,0x74,0x80,0x75,0x41,0xb5,0x00,0x77,0xc1,0xb7,
-0x81,0xb6,0x40,0x76,0x00,0x72,0xc1,0xb2,0x81,0xb3,0x40,0x73,0x01,0xb1,0xc0,0x71,
-0x80,0x70,0x41,0xb0,0x00,0x50,0xc1,0x90,0x81,0x91,0x40,0x51,0x01,0x93,0xc0,0x53,
-0x80,0x52,0x41,0x92,0x01,0x96,0xc0,0x56,0x80,0x57,0x41,0x97,0x00,0x55,0xc1,0x95,
-0x81,0x94,0x40,0x54,0x01,0x9c,0xc0,0x5c,0x80,0x5d,0x41,0x9d,0x00,0x5f,0xc1,0x9f,
-0x81,0x9e,0x40,0x5e,0x00,0x5a,0xc1,0x9a,0x81,0x9b,0x40,0x5b,0x01,0x99,0xc0,0x59,
-0x80,0x58,0x41,0x98,0x01,0x88,0xc0,0x48,0x80,0x49,0x41,0x89,0x00,0x4b,0xc1,0x8b,
-0x81,0x8a,0x40,0x4a,0x00,0x4e,0xc1,0x8e,0x81,0x8f,0x40,0x4f,0x01,0x8d,0xc0,0x4d,
-0x80,0x4c,0x41,0x8c,0x00,0x44,0xc1,0x84,0x81,0x85,0x40,0x45,0x01,0x87,0xc0,0x47,
-0x80,0x46,0x41,0x86,0x01,0x82,0xc0,0x42,0x80,0x43,0x41,0x83,0x00,0x41,0xc1,0x81,
-0x81,0x80,0x40,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x63,0x03,0xff,0xff,0xbc,0x03,0x8b,0x03,0xdc,0x10,0x0e,0x00,0xfe,0xff,0xbc,0x03,
-0x8b,0x03,0xda,0x10,0x02,0x00,0x00,0xfd,0xbc,0x03,0x8b,0x03,0x8e,0x10,0x02,0x00,
-0x01,0xfd,0xbc,0x03,0x8b,0x03,0x90,0x10,0x06,0x00,0x02,0xfd,0xbc,0x03,0x8b,0x03,
-0xaa,0x10,0x08,0x00,0x03,0xfd,0xbc,0x03,0x8b,0x03,0xb2,0x10,0x0a,0x00,0x04,0xfd,
-0xbc,0x03,0x8b,0x03,0xc6,0x10,0x0a,0x00,0x05,0xfd,0xbc,0x03,0x8b,0x03,0xea,0x10,
-0x0c,0x00,0x06,0xfd,0xbc,0x03,0x8b,0x03,0xf8,0x10,0x0c,0x00,0x0a,0xfd,0xbc,0x03,
-0x8b,0x03,0x96,0x10,0x0c,0x00,0x0b,0xfd,0xbc,0x03,0x8b,0x03,0xa2,0x10,0x08,0x00,
-0x0c,0xfd,0xbc,0x03,0x8b,0x03,0xbc,0x10,0x0a,0x00,0x0d,0xfd,0xbc,0x03,0x8b,0x03,
-0xd0,0x10,0x0a,0x00,0xe0,0xfc,0x8f,0x03,0xa5,0x03,0x3c,0x00,0x02,0x00,0x09,0x00,
-0x06,0x00,0x74,0x01,0x0e,0x00,0x18,0x02,0x10,0x00,0xe8,0x01,0x12,0x00,0xd9,0x01,
-0x14,0x00,0xa7,0x01,0x16,0x00,0xd4,0x01,0x18,0x00,0xdc,0x01,0x1a,0x00,0xc8,0x02,
-0x0a,0x00,0x85,0x01,0x00,0x01,0x80,0x00,0x00,0x02,0x01,0x04,0x38,0x06,0x80,0x08,
-0x03,0x0a,0x04,0x0c,0x04,0x0e,0x00,0x10,0x00,0x12,0xc8,0x14,0x13,0x16,0x00,0x18,
-0x00,0x1a,0x00,0x1c,0x5c,0x1e,0xc1,0x20,0x1e,0x22,0x54,0x24,0x07,0x26,0x6a,0x28,
-0x12,0x2a,0x00,0x2c,0x00,0x2e,0x1c,0x30,0x20,0x32,0x82,0x34,0x08,0x36,0x7a,0x38,
-0xca,0x3a,0x24,0x3c,0xd6,0x3e,0x00,0x40,0x00,0x42,0x00,0x44,0x7f,0x46,0x8b,0x48,
-0x0f,0x4a,0x06,0x4c,0x0a,0x4e,0x0f,0x50,0x20,0x52,0x20,0x54,0x10,0x56,0x10,0x58,
-0x20,0x5a,0xee,0x5c,0x1a,0x5e,0x26,0x60,0x5b,0x62,0x00,0x04,0x00,0x2c,0x0c,0x2e,
-0x01,0x2c,0x10,0x2e,0x02,0x2c,0x14,0x2e,0x03,0x2c,0x18,0x2e,0x04,0x2c,0x1c,0x2e,
-0x05,0x2c,0x20,0x2e,0x06,0x2c,0x24,0x2e,0x07,0x2c,0x28,0x2e,0x08,0x2c,0x2e,0x2e,
-0x09,0x2c,0x34,0x2e,0x0a,0x2c,0x38,0x2e,0x0b,0x2c,0x3c,0x2e,0x0c,0x2c,0x3f,0x2e,
-0x0d,0x2c,0x43,0x2e,0x0e,0x2c,0x46,0x2e,0x0f,0x2c,0x48,0x2e,0x10,0x2c,0x4b,0x2e,
-0x11,0x2c,0x50,0x2e,0x12,0x2c,0x55,0x2e,0x13,0x2c,0x5a,0x2e,0x14,0x2c,0x63,0x2e,
-0x15,0x2c,0x6d,0x2e,0x16,0x2c,0x76,0x2e,0x17,0x2c,0x7f,0x2e,0x18,0x2c,0x7f,0x2e,
-0x19,0x2c,0x7f,0x2e,0x1a,0x2c,0x7f,0x2e,0x1b,0x2c,0x7f,0x2e,0x1c,0x2c,0x7f,0x2e,
-0x1d,0x2c,0x7f,0x2e,0x1e,0x2c,0x7f,0x2e,0x1f,0x2c,0x7f,0x2e,0xff,0xff,0x0e,0xf1,
-0x02,0x60,0x5f,0x64,0xc0,0x98,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0e,0xf1,
-0x02,0x60,0x2c,0x64,0xc0,0x98,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x45,0xff,
-0x0e,0xf1,0x02,0x60,0x15,0x64,0xc0,0x98,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0xf7,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x47,0xff,
-0x0e,0xf1,0x02,0x60,0x15,0x64,0xc0,0x98,0xff,0xff,0xff,0xff,0xff,0xff,0x40,0xff,
-0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x41,0xff,
-0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x42,0xff,
-0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x43,0xff,
-0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x44,0xff,
-0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x45,0xff,
-0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x0d,0xf7,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xfe,0x0f,0x7e,0x00,
-0x0a,0x01,0xff,0xff,0x47,0xff,0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xb0,0xfe,0xb1,0xfe,0xb2,0xfe,0xb3,0xfe,0xff,0x00,0xff,0xff,
-0xff,0xff,0xff,0xff,0x0e,0xf1,0x03,0x60,0x0c,0x64,0xc0,0x98,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xb8,0xfe,0xb9,0xfe,0xba,0xfe,0xbb,0xfe,0xff,0x00,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0x20,0x4e,0x60,0x00,0x00,0x00,0x00,0x40,0x39,0x39,0x53,0x41,0x30,0x31,
-0x30,0x30,0x30,0x30,0x30,0x30,0x00,0x80,0x01,0x00,0x00,0x00,0x00,0x00,0x17,0x00,
-0x02,0x00,0x02,0x00,0x01,0x00,0x00,0x00,0x03,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
-0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x02,0x00,0x01,0x00,
-0x01,0x00,0x01,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00,
-0x50,0x72,0x69,0x6d,0x61,0x72,0x79,0x20,0x46,0x27,0x73,0x20,0x20,0x00,0x46,0x33,
-0x2e,0x31,0x30,0x2d,0x30,0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x31,0x2f,0x31,
-0x37,0x2f,0x32,0x30,0x30,0x32,0x00,0x00,0x00,0x00,0x01,0x80,0xff,0xff,0xff,0xff,
-0xdc,0x10,0x7e,0x00,0x0e,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x96,0x10,0x7e,0x00,
-0x0c,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x26,0x0e,0x7e,0x00,0x02,0x00,0x00,0x00,
-0x06,0x00,0x00,0x00,0xbc,0x10,0x7e,0x00,0x0a,0x00,0x00,0x00,0x07,0x00,0x00,0x00,
-0xd0,0x10,0x7e,0x00,0x0a,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0xa2,0x10,0x7e,0x00,
-0x08,0x00,0x00,0x00,0xfe,0x17,0x7e,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0xf8,0x7f,0x00,0xfe,0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,
-0x08,0x11,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x00,0x01,0x00,0x17,0x00,0x02,0x00,
-0x02,0x00,0x01,0x00,0x06,0x00,0x02,0x00,0x00,0x00,0x03,0x00,0x02,0x00,0x01,0x00,
-0x01,0x00,0x06,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
-0x7f,0xff
-};
-
-const u_int8_t spectrum24t_secsym[] = {
-0x46,0x49,0x4c,0x45,0x3a,0x20,0x45,0x53,0x45,0x43,0x53,0x59,0x4d,0x2c,0x54,0x33,
-0x2e,0x31,0x30,0x2d,0x30,0x34,0x2c,0x46,0x33,0x2e,0x31,0x30,0x2d,0x30,0x34,0x2c,
-0x30,0x31,0x2f,0x31,0x37,0x2f,0x32,0x30,0x30,0x32,0x20,0x53,0x45,0x43,0x4f,0x4e,
-0x44,0x41,0x52,0x59,0x20,0x32,0x32,0x20,0x32,0x34,0x30,0x20,0x31,0x32,0x20,0x35,
-0x34,0x20,0x0a,0x1a,0xfe,0x17,0x7e,0x00,0xf2,0x0f,0xde,0xc0,0xce,0xd0,0x0a,0x60,
-0x04,0x63,0xa3,0xd3,0x06,0xa3,0xdc,0x80,0x00,0xa8,0x0b,0x03,0xfa,0x02,0xf6,0xa3,
-0x18,0x60,0x00,0x64,0xbd,0xdb,0x00,0x60,0x7e,0x64,0xbd,0xdb,0xd0,0x60,0xce,0x64,
-0xa3,0xdb,0x0c,0x60,0x23,0x78,0xff,0xff,0x7f,0x60,0xc0,0x64,0x24,0x45,0xa4,0x80,
-0x7f,0x67,0x02,0x61,0x02,0x03,0x23,0x58,0xff,0xff,0x02,0x64,0x40,0x50,0x61,0xff,
-0xff,0xff,0x99,0xff,0x88,0xec,0x0e,0xe3,0x12,0xe3,0x1d,0xe3,0x22,0xe3,0x2a,0xe3,
-0x32,0xe3,0x3a,0xe3,0x80,0xed,0x42,0xe3,0x4a,0xe3,0x52,0xe3,0x5a,0xe3,0x62,0xe3,
-0x68,0xe3,0x70,0xe3,0x7a,0xe3,0x00,0xee,0x82,0xe3,0x8a,0xe3,0x92,0xe3,0x9a,0xe3,
-0xa2,0xe3,0xaa,0xe3,0xb2,0xe3,0xba,0xe3,0x01,0x60,0x14,0xe3,0x01,0x60,0x19,0xe3,
-0x01,0x60,0x20,0xe3,0x01,0x60,0x28,0xe3,0x21,0x60,0x7d,0xe7,0x68,0x60,0x7d,0xe7,
-0x10,0x60,0x7d,0xe7,0x7d,0xe7,0xf0,0x60,0x7d,0xe7,0xa5,0x60,0x7d,0xe7,0x7d,0xe7,
-0x36,0x60,0x7d,0xe7,0x6d,0x60,0x7d,0xe7,0x98,0x60,0x7d,0xe7,0x39,0x60,0x7d,0xe7,
-0x3f,0x60,0x7d,0xe7,0x42,0x60,0x7d,0xe7,0x0c,0x60,0x7d,0xe7,0xc2,0x60,0x7d,0xe7,
-0x7d,0xe7,0xa5,0x60,0x7d,0xe7,0x7d,0xe7,0x36,0x60,0x7d,0xe7,0x01,0x60,0x7d,0xe7,
-0xad,0x60,0x7d,0xe7,0x7d,0xe7,0x37,0x60,0x7d,0xe7,0x42,0x60,0x7d,0xe7,0x0e,0x60,
-0x7d,0xe7,0xc2,0x60,0x7d,0xe7,0x07,0x60,0x80,0xe7,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x80,0xe7,0xff,0xff,0xff,0xff,0x06,0xe3,
-0xff,0xff,0x98,0xff,0x73,0x60,0xeb,0x78,0xff,0xff,0x04,0xee,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0x00,0x69,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x16,
-0xfe,0x00,0x68,0x5e,0x00,0x7f,0x1f,0xfb,0x88,0xec,0x00,0xee,0xff,0xff,0xff,0xff,
-0x04,0xee,0xff,0xff,0xff,0xff,0x00,0xee,0xb0,0xfe,0xb1,0xfe,0xb2,0xfe,0xb3,0xfe,
-0xb8,0xfe,0xb9,0xfe,0xba,0xfe,0x10,0x64,0x40,0x40,0x00,0x64,0x40,0x41,0x40,0x42,
-0x40,0x54,0x40,0x55,0x40,0x5e,0x40,0x5a,0x40,0x5b,0x1d,0x60,0x8c,0x62,0xa2,0xd1,
-0x12,0x60,0x34,0x64,0xd0,0x80,0xff,0xff,0x20,0x02,0x1d,0x60,0x8e,0x62,0xa2,0xd1,
-0x55,0x60,0xaa,0x64,0xd0,0x80,0xff,0xff,0x18,0x02,0x1e,0x60,0x50,0x62,0xa2,0xd3,
-0xff,0xff,0x01,0xa4,0xa2,0xdb,0x08,0x60,0x2e,0x64,0xa0,0xd3,0xff,0xff,0x00,0xa4,
-0xe1,0xa0,0x17,0x03,0xe0,0x85,0x15,0x07,0x1e,0x60,0x52,0x62,0xff,0xff,0xc6,0x82,
-0xa2,0xd3,0xff,0xff,0x01,0xa4,0xa2,0xdb,0x0c,0x00,0x1e,0x60,0x50,0x62,0x00,0x64,
-0xa2,0xdb,0x1e,0x60,0x52,0x63,0x00,0x64,0x20,0x61,0xbd,0xdb,0xff,0xa1,0xff,0xff,
-0xfc,0x02,0x01,0x60,0x88,0x63,0x00,0x60,0x3e,0x61,0xfe,0x60,0x00,0x66,0x7f,0x60,
-0xfe,0x64,0x58,0xd0,0x59,0xd9,0xfd,0x1f,0x0f,0x60,0xce,0x63,0x0e,0x60,0x7e,0x61,
-0xfe,0x60,0x00,0x66,0x85,0x60,0x08,0x64,0x58,0xd0,0x59,0xd9,0xfd,0x1f,0x4a,0x60,
-0x8a,0x63,0x1e,0x60,0x90,0x61,0x00,0x64,0x59,0xdb,0xfe,0x1f,0x01,0x63,0x7f,0xfd,
-0x00,0x60,0x2a,0x63,0x0c,0x60,0x40,0x61,0x0e,0x60,0x7e,0x64,0x58,0xd1,0x59,0xd9,
-0xfd,0x1f,0x15,0x60,0xf8,0x61,0xa1,0xd3,0xff,0xff,0xe0,0x83,0xcb,0x83,0x59,0xd1,
-0x59,0xd3,0xa4,0xdb,0xfc,0x1f,0x00,0x60,0xfe,0x63,0xfe,0x60,0x00,0x65,0x45,0x4b,
-0xdb,0x60,0xfe,0x61,0xfe,0x60,0x00,0x65,0x81,0x60,0x88,0x64,0x65,0x46,0x58,0xd0,
-0x2b,0x46,0x59,0xd8,0xfb,0x1f,0x01,0x60,0xbe,0x63,0xdd,0x60,0x4e,0x61,0x82,0x60,
-0xd8,0x64,0x65,0x46,0x58,0xd0,0x2b,0x46,0x59,0xd8,0xfb,0x1f,0x00,0x60,0x0e,0x63,
-0xdf,0x60,0x1e,0x61,0x84,0x60,0xa8,0x64,0x65,0x46,0x58,0xd0,0x2b,0x46,0x59,0xd8,
-0xfb,0x1f,0x69,0x60,0x1e,0x64,0x7f,0xa4,0xe0,0x87,0x00,0x7f,0x1a,0xfb,0x0d,0x60,
-0x22,0x62,0x08,0x60,0x00,0x65,0xa2,0xd3,0xff,0xff,0xd4,0x80,0xff,0xff,0x0b,0x06,
-0xe0,0x84,0xe0,0x84,0xe0,0x84,0xcc,0x84,0x1d,0xfb,0x65,0x44,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0x1c,0xfb,0x65,0x44,0x80,0xa4,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xcc,0x84,
-0x1b,0xfb,0x1b,0xf1,0x1a,0xf3,0xff,0xff,0x9e,0xfb,0x7c,0x63,0x60,0x46,0x01,0xfc,
-0xdc,0x84,0xd0,0x80,0x00,0xfa,0xfa,0x04,0x9f,0xfb,0x1c,0xf3,0x60,0x46,0x00,0xa8,
-0x1d,0xf1,0x09,0x03,0x00,0xfa,0x01,0xfc,0x60,0x46,0x01,0xfc,0xdc,0x84,0xd0,0x80,
-0x00,0xfa,0xfa,0x04,0x9f,0xfb,0x00,0x64,0x00,0xfa,0x63,0x44,0x80,0x7f,0x01,0xfa,
-0x1b,0xf3,0x1a,0xf1,0xdc,0x84,0x50,0x93,0x33,0x44,0xfd,0xfb,0x00,0x60,0x7c,0x61,
-0x19,0x60,0x58,0x4f,0xa2,0x78,0xff,0xff,0x46,0x45,0x19,0x60,0x58,0x4f,0xc4,0x78,
-0xff,0xff,0x1e,0x60,0x9e,0x62,0x66,0x44,0xa2,0xdb,0x1f,0xf1,0x01,0x65,0x64,0x40,
-0x10,0x2a,0x07,0x00,0xeb,0x60,0x19,0xe2,0x01,0x60,0x76,0x63,0x20,0x64,0xc5,0xfb,
-0x07,0x00,0xeb,0x60,0x19,0xe2,0x00,0x65,0x01,0x60,0x18,0x63,0x14,0x64,0xc2,0xfb,
-0x17,0x60,0x34,0x62,0xa2,0xdd,0x17,0x60,0x7e,0x62,0x65,0x44,0xa2,0xdb,0x00,0x60,
-0x30,0xe2,0x00,0x60,0x50,0xe2,0x00,0x60,0x79,0xe2,0x01,0x60,0x90,0xe2,0x01,0x60,
-0xd0,0xe2,0x01,0x60,0xf9,0xe2,0xb4,0xf3,0xb5,0xf1,0x60,0x45,0xc4,0x84,0xc0,0x84,
-0x24,0xfb,0x01,0x60,0x30,0x64,0xc0,0x84,0x25,0xfb,0x60,0x45,0xa0,0xa4,0x29,0xfb,
-0x01,0x60,0x60,0x64,0xc0,0x84,0x2d,0xfb,0xa0,0xa4,0x31,0xfb,0x00,0x60,0xf8,0x64,
-0xc0,0x84,0x26,0xfb,0xa0,0xa4,0x2a,0xfb,0x01,0x60,0x10,0x64,0xc0,0x84,0x2e,0xfb,
-0xa0,0xa4,0x32,0xfb,0x00,0x60,0xd5,0x64,0xc0,0x84,0x27,0xfb,0xa0,0xa4,0x2b,0xfb,
-0x00,0x60,0xde,0x64,0xc0,0x84,0x2f,0xfb,0xa0,0xa4,0x33,0xfb,0x00,0x60,0xcb,0x64,
-0xc0,0x84,0x28,0xfb,0xa0,0xa4,0x2c,0xfb,0x00,0x60,0xcf,0x64,0xc0,0x84,0x30,0xfb,
-0xa0,0xa4,0x34,0xfb,0xb5,0xf3,0x24,0xf1,0xc4,0x84,0x35,0xfb,0xc0,0x84,0x37,0xfb,
-0x00,0x64,0x40,0x50,0x63,0xff,0x00,0x64,0x40,0x54,0x40,0x55,0x40,0x41,0x40,0x42,
-0x40,0x5e,0xd1,0xfe,0x82,0xff,0x92,0xff,0x98,0xff,0x00,0x64,0x40,0x52,0x17,0x60,
-0x3a,0x65,0x1f,0xf3,0xa5,0xd1,0x60,0x40,0x10,0x2a,0xff,0xff,0x20,0x26,0x03,0x00,
-0x13,0x60,0x98,0x62,0x02,0x00,0x14,0x60,0x7a,0x62,0x64,0x44,0x3e,0x7f,0xa2,0xdb,
-0x1f,0xf3,0xff,0xff,0x17,0x60,0x5c,0x65,0xa5,0xd1,0x60,0x40,0x20,0x26,0x05,0x00,
-0x13,0x60,0xa6,0x62,0x64,0x44,0x4c,0x7f,0x04,0x00,0x14,0x60,0x82,0x62,0x64,0x44,
-0x46,0x7f,0xa2,0xdb,0x00,0x64,0x40,0x41,0x40,0x46,0x40,0x47,0x00,0xe1,0x11,0x60,
-0x8e,0x63,0x0e,0x60,0xac,0x64,0xa0,0xdd,0x00,0x60,0x13,0x66,0x3c,0x64,0x01,0xfa,
-0x0a,0x64,0x20,0xfa,0x87,0xff,0x97,0xff,0x08,0x60,0x28,0x62,0x23,0x60,0x45,0x64,
-0xa2,0xdb,0x66,0xff,0xff,0xff,0x65,0xff,0xff,0xff,0x64,0xff,0xff,0xff,0x62,0xff,
-0xff,0xff,0x61,0xff,0xff,0xff,0x3c,0x60,0xa6,0x65,0x0c,0x64,0xa5,0xdb,0x0e,0x60,
-0x5a,0x64,0x97,0xfb,0xff,0xff,0x2d,0xff,0x08,0x60,0x00,0x64,0xc8,0x81,0x3e,0x63,
-0x00,0x64,0x59,0xdb,0xfe,0x1f,0x04,0x60,0x41,0x76,0x10,0x60,0x5f,0x78,0xff,0xff,
-0x10,0x75,0x01,0x60,0x03,0xe8,0x99,0xff,0x08,0x60,0x2a,0x62,0x04,0x60,0xff,0x64,
-0xa2,0xdb,0x04,0x60,0xff,0xe5,0xff,0xff,0xff,0xff,0x10,0x60,0xdc,0xe0,0xff,0xff,
-0xff,0xff,0x98,0xff,0x30,0x60,0x7f,0x78,0xff,0xff,0xa1,0xff,0xff,0xff,0xfd,0x00,
-0x98,0xff,0x30,0x44,0x02,0xa8,0x00,0xe1,0x07,0x02,0x62,0xff,0x63,0xff,0x64,0xff,
-0x65,0xff,0x66,0xff,0xa1,0xff,0xff,0xff,0x82,0xff,0x91,0xff,0x99,0xff,0x88,0xff,
-0x6c,0x40,0x41,0xff,0xc4,0xe2,0x43,0xff,0x40,0x49,0x08,0xe1,0x10,0x60,0x81,0x78,
-0xff,0xff,0x98,0xff,0x30,0x44,0x02,0xa8,0x00,0xe1,0x02,0x02,0xa1,0xff,0xff,0xff,
-0x00,0x64,0xdc,0xfb,0x82,0xff,0x92,0xff,0x98,0xff,0x88,0xff,0x72,0x44,0x60,0x52,
-0x03,0x04,0x01,0x64,0x40,0x40,0x05,0x00,0xdc,0x80,0xff,0xff,0x02,0x02,0x01,0x64,
-0x40,0x40,0x48,0xe2,0xe2,0xf3,0xff,0xff,0x60,0x40,0x00,0x3a,0x09,0x00,0x67,0x60,
-0x84,0x65,0xa5,0xd1,0xff,0xff,0x64,0x40,0x00,0x3a,0x02,0x00,0x64,0xe2,0x01,0x70,
-0x6d,0xe2,0xbc,0xff,0xb5,0xff,0xff,0x64,0x40,0x4b,0x00,0x64,0x40,0x4d,0x40,0x47,
-0xd7,0xfb,0x22,0xfb,0x00,0xe1,0x08,0x64,0x40,0x4c,0x26,0x44,0x02,0xb4,0x40,0x46,
-0x65,0xf3,0xff,0xff,0x60,0x40,0x04,0x26,0x02,0x00,0x00,0x3a,0x03,0x00,0x68,0xe2,
-0xc8,0xe2,0x68,0x00,0xb4,0xf1,0x02,0x64,0x64,0x56,0x60,0x54,0xcd,0xe2,0xc4,0xe2,
-0x6c,0x40,0x07,0x60,0x80,0xe8,0x44,0xe2,0x64,0xe2,0x46,0xff,0x47,0xff,0x67,0x60,
-0x5c,0x62,0x01,0x64,0xa2,0xdb,0x9c,0xfe,0xff,0xff,0x0b,0x04,0xcf,0xf3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0x06,0x02,0x01,0x64,0x40,0xfb,0x26,0x44,0xfd,0xb4,0x40,0x46,
-0x05,0xff,0x27,0x44,0x06,0x22,0x06,0x00,0xf9,0xb4,0x40,0x47,0x02,0x64,0x21,0xfb,
-0xc0,0xfe,0x03,0x00,0x20,0x64,0x21,0xfb,0xc0,0xfe,0x99,0xff,0x3d,0x44,0xf7,0xb4,
-0x40,0x5d,0x98,0xff,0x99,0xff,0x3c,0x44,0x7f,0xb4,0x10,0xbc,0x40,0x5c,0x3e,0x44,
-0x7c,0xb4,0x08,0xbc,0x40,0x5e,0x98,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0x99,0xff,0x3d,0x44,0x10,0xbc,0x00,0x7f,0x40,0x5d,0x98,0xff,0xbc,0xff,
-0xff,0xff,0xb5,0xff,0xff,0xff,0x99,0xff,0x07,0x60,0x80,0xe9,0x98,0xff,0xff,0xff,
-0xff,0xff,0x80,0xe9,0xff,0xff,0xff,0xff,0xb7,0xff,0xb4,0xff,0x99,0xff,0x3e,0x44,
-0x02,0xbc,0x00,0x7f,0x40,0x5e,0x98,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0x46,0xff,0x47,0xff,0x0e,0x60,0xac,0x64,0xa0,0xd7,0xff,0xff,0xff,0xff,0x98,0xff,
-0x30,0x44,0x02,0xa8,0x00,0xe1,0x0f,0x03,0x83,0xff,0x8d,0xff,0x00,0x64,0x40,0x40,
-0x40,0x44,0x40,0x43,0x40,0x42,0x40,0x41,0x1a,0x60,0xcc,0x64,0x40,0x4e,0x3c,0x60,
-0x6a,0x64,0x40,0x4d,0xe3,0xe1,0x19,0x60,0x56,0x78,0xff,0xff,0x98,0xff,0x30,0x44,
-0x02,0xa8,0x00,0xe1,0x02,0x02,0xa1,0xff,0xff,0xff,0x84,0xff,0x88,0xff,0x98,0xff,
-0x99,0xff,0xf2,0xe6,0xda,0xe6,0x98,0xff,0x1b,0x60,0x20,0x64,0x40,0x40,0xa8,0xf3,
-0x80,0xfb,0x0a,0x64,0x40,0x4b,0x1e,0x60,0x98,0x65,0xb8,0xf3,0xff,0xff,0xa5,0xdb,
-0x01,0x64,0x8c,0xfb,0x00,0x64,0x8e,0xfb,0x8d,0xfb,0x40,0x5c,0x1b,0x60,0x20,0x78,
-0xff,0xff,0x98,0xff,0x88,0xe2,0x30,0x44,0x00,0xe1,0x02,0xa8,0x85,0xff,0x02,0x02,
-0xa1,0xff,0xff,0xff,0x88,0xff,0x99,0xff,0x00,0x60,0x00,0xeb,0xff,0xff,0xff,0xff,
-0x00,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0x4f,0x60,0xf3,0xea,0x4f,0x60,0x36,0xeb,
-0x43,0x60,0x40,0xea,0x43,0x60,0xe4,0xeb,0x44,0x60,0x52,0xea,0x44,0x60,0x34,0xeb,
-0x45,0x60,0x7d,0xea,0x45,0x60,0x58,0xeb,0x47,0x60,0x8b,0xea,0x47,0x60,0xd0,0xeb,
-0x48,0x60,0x47,0xea,0x48,0x60,0xc3,0xeb,0x49,0x60,0xa0,0xea,0x49,0x60,0xfd,0xeb,
-0x4a,0x60,0xb2,0xea,0x4a,0x60,0x34,0xeb,0x4b,0x60,0xc1,0xea,0x4b,0x60,0x58,0xeb,
-0x4c,0x60,0xd7,0xea,0x4c,0x60,0xc0,0xeb,0x4d,0x60,0xeb,0xea,0x4d,0x60,0xd0,0xeb,
-0x4e,0x60,0xa0,0xea,0x4e,0x60,0x91,0xeb,0x40,0x60,0xf0,0xea,0x40,0x60,0xfc,0xeb,
-0x41,0x60,0x24,0xea,0x41,0x60,0xa2,0xeb,0x42,0x60,0x20,0xea,0x42,0x60,0x20,0xeb,
-0x3a,0x5c,0x80,0x2b,0x12,0x00,0x8b,0xff,0x74,0x40,0x88,0xff,0x3a,0x5c,0x80,0x2b,
-0x09,0x00,0x8b,0xff,0x74,0x40,0x88,0xff,0x3a,0x5c,0x80,0x2b,0x03,0x00,0x8b,0xff,
-0x74,0x40,0x88,0xff,0x8b,0xff,0x74,0x40,0x88,0xff,0x3a,0x5c,0x80,0x2b,0xff,0xff,
-0x31,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0x00,0x60,0x00,0xea,0x3a,0x5c,0x80,0x27,
-0x06,0x00,0x31,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0x00,0x60,0x00,0xea,0x67,0x60,
-0xcc,0x64,0x3a,0x5c,0xa0,0xd9,0xff,0xff,0x30,0x60,0x00,0xea,0xff,0xff,0xff,0xff,
-0x67,0x60,0xcc,0x64,0x3a,0x5c,0xa0,0xd9,0x3a,0x5c,0x40,0x27,0xfc,0x00,0xa0,0xd9,
-0x00,0x60,0x00,0xeb,0xa0,0x60,0x00,0xeb,0xc0,0x60,0x00,0xeb,0x30,0x60,0x00,0xeb,
-0x67,0x60,0xce,0x64,0x3b,0x5c,0xa0,0xd9,0x3b,0x5c,0x40,0x27,0xfc,0x00,0xa0,0xd9,
-0x67,0x60,0xcc,0x64,0x3a,0x5c,0xa0,0xd9,0x98,0xff,0xc0,0x60,0x00,0xeb,0x00,0x64,
-0x3e,0xfb,0x40,0xfb,0xff,0xff,0x67,0x60,0x4c,0x62,0x00,0x64,0xa2,0xdb,0x0a,0x64,
-0x40,0x48,0x03,0x60,0xe8,0x64,0x40,0x4b,0x67,0x60,0x4a,0x62,0x05,0x60,0xdc,0x64,
-0xa2,0xdb,0x1e,0x64,0x40,0x4c,0x69,0xe1,0x04,0x60,0x00,0x71,0x8d,0xe2,0x00,0x64,
-0x40,0x40,0xf8,0x60,0x89,0x78,0xff,0xff,0xa2,0xff,0x98,0xff,0x30,0x44,0x02,0xa8,
-0x00,0xe1,0x28,0x03,0x86,0xff,0x88,0xff,0x18,0x60,0xc6,0x65,0x64,0x64,0xa5,0xdb,
-0xff,0xff,0x00,0x64,0x40,0x46,0x58,0xfb,0x28,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,
-0x28,0x60,0x58,0x4f,0x87,0x78,0xff,0xff,0x29,0x60,0x58,0x4f,0x0f,0x78,0xff,0xff,
-0x28,0x60,0x58,0x4f,0x3b,0x78,0xff,0xff,0x27,0x60,0x58,0x4f,0xe8,0x78,0xff,0xff,
-0x27,0x60,0x58,0x4f,0xd1,0x78,0xff,0xff,0x27,0x60,0x58,0x4f,0xff,0x78,0xff,0xff,
-0x13,0xe1,0xa3,0xff,0x3d,0x60,0x2f,0x78,0xff,0xff,0x0f,0x4e,0x01,0x60,0xe4,0x61,
-0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,0x58,0x4f,0xa2,0x78,0xff,0xff,0xa3,0xff,
-0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,0xc4,0x78,0xff,0xff,0x08,0xfe,0x0e,0x4f,
-0x66,0x44,0x15,0xfb,0x07,0xe1,0xa3,0xff,0x04,0x60,0x41,0x76,0x00,0x60,0x00,0x7c,
-0x08,0x60,0x14,0x64,0xa0,0xd9,0xae,0xff,0x30,0x60,0x7f,0x78,0xff,0xff,0xa1,0xff,
-0xff,0xff,0x2c,0x45,0xb8,0x3f,0x41,0xff,0x30,0x44,0x20,0xb4,0x34,0x91,0x9f,0xfe,
-0xff,0xff,0x43,0x05,0x29,0x44,0x05,0x22,0xf2,0x00,0x04,0x26,0x3a,0x00,0x01,0x2a,
-0xee,0x00,0x44,0xff,0xc8,0x74,0xcd,0xe2,0x0c,0xe1,0x29,0x44,0xfe,0xb4,0x40,0x49,
-0x24,0x41,0xe1,0x81,0x00,0x60,0xc8,0x65,0xc5,0x94,0x0c,0xe1,0xe0,0x00,0x1a,0xff,
-0xde,0x00,0xdd,0x00,0x41,0xff,0x40,0x64,0xa0,0xfb,0x3e,0x44,0x01,0x26,0xd7,0x00,
-0x08,0x00,0xc4,0xe2,0x41,0x64,0xa0,0xfb,0x3e,0x44,0x01,0x2a,0x02,0x00,0x62,0xff,
-0x09,0x00,0x01,0x64,0xdc,0xfb,0x67,0x60,0x56,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x1a,0xff,0x67,0x60,0xc8,0x62,0x01,0x64,0xa2,0xdb,0x08,0xe1,0x00,0x64,
-0x40,0x49,0x72,0x52,0x32,0x7b,0x4d,0xe2,0x44,0xff,0xb9,0x00,0xb8,0x00,0xb7,0x00,
-0xb6,0x00,0x29,0x44,0xfb,0xb4,0x40,0x49,0xb6,0x00,0x65,0xf3,0xff,0xff,0xff,0xff,
-0x04,0x2a,0x04,0x00,0xbf,0xfe,0x10,0x60,0xb3,0x78,0xff,0xff,0x99,0xf1,0x99,0xff,
-0x64,0x40,0x02,0x3b,0x03,0x00,0x11,0x60,0x5f,0x78,0xff,0xff,0x03,0x60,0xe8,0x74,
-0xcd,0xe2,0x04,0xe1,0xa1,0xff,0xff,0xff,0x3c,0x44,0x6f,0xb4,0x40,0x5c,0x00,0x6b,
-0x3e,0x44,0x74,0xb4,0x04,0xbc,0x40,0x5e,0xff,0xff,0xff,0xff,0x02,0xbd,0x45,0x5e,
-0xff,0xff,0xff,0xff,0x40,0x5e,0x00,0xe1,0x00,0x7c,0x15,0x60,0x22,0x62,0x58,0x4f,
-0x18,0x00,0x58,0x4f,0x16,0x00,0x58,0x4f,0x14,0x00,0x58,0x4f,0x12,0x00,0x01,0x7c,
-0x58,0x4f,0x0f,0x00,0x58,0x4f,0x0d,0x00,0x3d,0x44,0x7f,0xb4,0x40,0x5d,0xff,0xff,
-0xff,0xff,0x80,0xbc,0x40,0x5d,0xbf,0xfe,0x2d,0xff,0x08,0xe1,0x10,0x60,0x81,0x78,
-0xff,0xff,0x02,0x65,0xa2,0xd3,0x02,0xa2,0x60,0x47,0xe0,0x84,0xe0,0x84,0xe0,0x84,
-0xe0,0x81,0x06,0x63,0xe1,0x81,0x3d,0x44,0x80,0xb4,0x10,0xbc,0x02,0x24,0x04,0xbc,
-0x40,0x5d,0xff,0xff,0x34,0x9d,0xf6,0x1f,0xff,0xff,0xff,0xff,0x40,0x5d,0xa2,0xd3,
-0x02,0xa2,0x60,0x47,0x60,0x41,0x0e,0x63,0xe1,0x81,0x3d,0x44,0x80,0xb4,0x10,0xbc,
-0x02,0x24,0x04,0xbc,0x40,0x5d,0xff,0xff,0x34,0x9d,0xf6,0x1f,0xff,0xff,0xff,0xff,
-0x40,0x5d,0xa2,0xd3,0x02,0xa2,0x60,0x47,0x60,0x41,0x0e,0x63,0xe1,0x81,0x3d,0x44,
-0x80,0xb4,0x10,0xbc,0x02,0x24,0x04,0xbc,0x40,0x5d,0xff,0xff,0x34,0x9d,0xf6,0x1f,
-0xff,0xff,0xff,0xff,0x40,0x5d,0x64,0x40,0x01,0x26,0x08,0x00,0x3c,0x44,0x5f,0xb4,
-0x20,0x65,0x34,0x9c,0xff,0xff,0xff,0xff,0x40,0x5c,0x05,0x00,0x01,0x65,0x34,0x9d,
-0xff,0xff,0xff,0xff,0x40,0x5d,0x2f,0x58,0xff,0xff,0x99,0xf1,0x00,0xe1,0x64,0x44,
-0x00,0x7f,0xe0,0x85,0xc4,0x84,0xe0,0x85,0x3c,0x44,0x6f,0xb4,0x40,0x5c,0x00,0x6b,
-0x3e,0x44,0x74,0xb4,0x40,0x5e,0x01,0x7c,0x15,0x60,0x46,0x62,0xc6,0x82,0x58,0x4f,
-0xa0,0x00,0x01,0x60,0xf4,0x64,0x60,0x54,0xcd,0xe2,0x32,0x44,0x08,0x2b,0xfd,0x00,
-0x3c,0x44,0x7f,0xb4,0x10,0xbc,0x40,0x5c,0x62,0xff,0x01,0x7c,0x08,0x60,0x2a,0x64,
-0xa0,0xd9,0x9a,0xf3,0xbf,0xfe,0x60,0x40,0x05,0x36,0x2d,0xff,0x07,0x36,0xd8,0xfe,
-0x08,0xe1,0x10,0x60,0x81,0x78,0xff,0xff,0xdc,0xf3,0xff,0xff,0x60,0x40,0x00,0x36,
-0x03,0x00,0x0e,0x60,0x8b,0x78,0xff,0xff,0x00,0x64,0xa0,0xfb,0x0a,0x64,0x40,0x4c,
-0x19,0xff,0x20,0x44,0x01,0x2a,0x04,0x00,0x00,0x64,0x40,0x40,0xa1,0xf3,0x09,0x00,
-0x1a,0xe1,0x00,0x64,0xd0,0xfb,0x31,0x44,0x01,0x26,0x1b,0xe1,0xa1,0xff,0xff,0xff,
-0xb9,0x3f,0x72,0x45,0xdc,0x84,0xa1,0xfb,0x60,0x55,0x65,0x52,0x11,0x64,0xa0,0xfb,
-0xa2,0xf3,0x06,0x04,0xdc,0x84,0xa2,0xfb,0xa3,0xf3,0x02,0x04,0xdc,0x84,0xa3,0xfb,
-0x4b,0xf3,0xff,0xff,0xfe,0xa0,0x65,0xf3,0xe3,0x04,0x60,0x40,0x02,0x2a,0xe0,0x00,
-0x99,0xff,0x3d,0x44,0x7f,0xb4,0x00,0x7f,0x40,0x5d,0x80,0xbc,0xff,0xff,0xff,0xff,
-0x40,0x5d,0x98,0xff,0x00,0x64,0x4b,0xfb,0xd3,0x00,0x22,0xf1,0x43,0xff,0x64,0x40,
-0x07,0x26,0x03,0x00,0x12,0x60,0x2e,0x78,0xff,0xff,0x6c,0x40,0x03,0xe1,0x00,0x6b,
-0x99,0xff,0x3e,0x44,0x01,0xbc,0x00,0x7f,0x40,0x5e,0xdd,0xf1,0x3d,0x44,0xe7,0xb4,
-0x40,0x5d,0x3e,0x44,0xed,0xb4,0xb0,0x84,0x40,0x5e,0x3d,0x44,0x08,0xbc,0x40,0x5d,
-0x98,0xff,0x05,0x64,0xcc,0x84,0xff,0xff,0xfd,0x02,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x99,0xff,0x3e,0x44,0x77,0xb4,0x80,0xbc,
-0x40,0x5e,0x98,0xff,0x3c,0x46,0x1c,0xf0,0x53,0xf3,0x64,0x41,0x08,0xb1,0x60,0x45,
-0x03,0x22,0x00,0x61,0xb5,0x85,0x2b,0x5c,0xd1,0x80,0x1f,0xf1,0x0b,0x03,0x41,0x4b,
-0x38,0x64,0x65,0x40,0x08,0x2a,0x80,0x64,0x60,0x48,0x88,0x6a,0xff,0xff,0xff,0xff,
-0x01,0x16,0xfe,0x00,0x7f,0xf1,0x10,0x64,0x64,0x40,0x0e,0x36,0xb4,0x85,0x65,0x48,
-0x8a,0x6a,0xff,0xff,0xff,0xff,0x01,0x16,0xfe,0x00,0x4b,0xf3,0xff,0xff,0x00,0xa0,
-0xff,0xff,0x0a,0x03,0x99,0xff,0x3d,0x44,0x7f,0xb4,0x00,0x7f,0x40,0x5d,0x80,0xbd,
-0x00,0x64,0x4b,0xfb,0x45,0x5d,0x98,0xff,0x22,0xf1,0x23,0xf3,0x64,0x45,0x00,0xbc,
-0x00,0x64,0x4d,0x03,0x00,0x61,0x23,0xfb,0x5e,0xf1,0xa4,0xf3,0x64,0x40,0x04,0x2a,
-0x06,0x00,0x60,0x45,0x73,0x44,0xd4,0x84,0xe7,0xa0,0x0d,0x0e,0x0c,0x04,0x28,0x60,
-0xda,0x63,0x72,0x45,0x65,0x44,0xd4,0xfb,0x04,0x05,0x65,0x44,0xdc,0x80,0xff,0xff,
-0x05,0x02,0x01,0x64,0x40,0x40,0x11,0x60,0x8e,0x78,0xff,0xff,0xff,0x60,0xf0,0x64,
-0xd4,0x80,0x20,0xa4,0xf8,0x04,0xd4,0x80,0xff,0xff,0xf5,0x07,0x02,0xfe,0xbd,0xd3,
-0xff,0xff,0x44,0x8a,0x02,0x24,0xdd,0x81,0x02,0x24,0xdd,0x81,0xbd,0xd3,0xa1,0xf1,
-0x61,0x45,0xc0,0x84,0x00,0x61,0x02,0x24,0x01,0xb9,0xc4,0x84,0x60,0x55,0x2a,0x52,
-0xa1,0xfb,0x02,0x24,0x01,0xb9,0xbd,0xd3,0xa2,0xf1,0x61,0x45,0xc0,0x84,0x00,0x61,
-0x02,0x24,0x01,0xb9,0xc4,0x84,0xa2,0xfb,0x02,0x24,0x01,0xb9,0xbd,0xd3,0xa3,0xf1,
-0x61,0x45,0xc0,0x84,0xc4,0x84,0xa3,0xfb,0x22,0xf3,0xff,0xff,0x60,0x45,0x65,0x40,
-0x01,0x2a,0x07,0x00,0x3c,0x44,0x40,0x42,0x22,0xf3,0xff,0xff,0xfe,0xb4,0x22,0xfb,
-0x06,0x00,0x11,0x60,0x8e,0x78,0xff,0xff,0x11,0x60,0x8e,0x78,0xff,0xff,0x07,0x64,
-0xa0,0xfb,0x22,0x46,0x0f,0xf0,0xff,0xff,0x64,0x40,0x01,0x2a,0x03,0x00,0x16,0x60,
-0x40,0x78,0xff,0xff,0x15,0x60,0x3b,0x78,0xff,0xff,0x27,0x44,0x04,0x2a,0x09,0x00,
-0xfb,0xb4,0x40,0x47,0x3c,0x46,0x02,0x64,0x21,0xfb,0xc0,0xfe,0x11,0x60,0x8e,0x78,
-0xff,0xff,0x27,0x44,0x02,0x2a,0x08,0x00,0xfd,0xb4,0x40,0x47,0x06,0x64,0x21,0xfb,
-0xc0,0xfe,0x11,0x60,0x8e,0x78,0xff,0xff,0x02,0x0a,0x00,0x64,0x60,0x50,0x11,0x60,
-0x8e,0x78,0xff,0xff,0x01,0x60,0x2c,0x74,0xcd,0xe2,0x46,0xff,0x47,0xff,0x01,0x64,
-0x57,0xfb,0x83,0xe1,0x00,0x65,0x26,0x44,0x02,0x26,0x09,0x00,0x3e,0x44,0x34,0x81,
-0xff,0xff,0x05,0x03,0x45,0x5e,0x26,0x44,0x02,0xbc,0x40,0x46,0xd1,0xfe,0x0c,0x64,
-0x40,0x4c,0x19,0xff,0xa1,0xff,0x4c,0x4e,0x01,0x25,0x00,0x00,0x01,0x64,0xd0,0xfb,
-0x4b,0x74,0xcd,0xe2,0xf0,0x60,0x00,0x78,0x00,0x61,0x46,0xff,0x47,0xff,0x11,0x60,
-0x8e,0x78,0xff,0xff,0x99,0xff,0x3e,0x44,0xfd,0xb4,0x40,0x5e,0x98,0xff,0xb5,0xff,
-0xbc,0xff,0x46,0xff,0xb7,0xff,0xb4,0xff,0xff,0xff,0xff,0xff,0x84,0x60,0x1d,0x7d,
-0xb5,0xff,0xff,0xff,0x99,0xff,0x07,0x60,0x80,0xe9,0x98,0xff,0xff,0xff,0xff,0xff,
-0x80,0xe9,0xff,0xff,0xff,0xff,0xb7,0xff,0xb4,0xff,0xff,0xff,0x99,0xff,0x3e,0x44,
-0x02,0xbc,0x00,0x7f,0x40,0x5e,0x98,0xff,0xff,0xff,0xff,0xff,0x46,0xff,0x47,0xff,
-0x26,0x43,0x04,0x2a,0x50,0x00,0xfb,0xb3,0x43,0x46,0x04,0xbb,0x2a,0x44,0x23,0xfa,
-0x20,0x44,0xe8,0x80,0x00,0x64,0x40,0x40,0xa1,0xf3,0x05,0x04,0x72,0x45,0xdc,0x84,
-0xa1,0xfb,0x60,0x55,0x65,0x52,0x24,0xfa,0xa2,0xf3,0x02,0x04,0xdc,0x84,0xa2,0xfb,
-0x27,0xfa,0xa3,0xf3,0x02,0x04,0xdc,0x84,0xa3,0xfb,0x28,0xfa,0x2a,0x44,0xdc,0x80,
-0xff,0xff,0x01,0x02,0x58,0x80,0xf4,0xb3,0x32,0x40,0x01,0x2a,0x08,0x00,0x04,0xbb,
-0x0f,0xfc,0x01,0x5d,0xdc,0xfe,0x05,0xff,0x11,0x60,0x8e,0x78,0xff,0xff,0x2d,0x44,
-0x0c,0x26,0x0d,0x00,0xcf,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0x04,0x03,0x26,0x44,
-0x02,0xbc,0x40,0x46,0x36,0x00,0x0f,0xfc,0x01,0x5d,0xdc,0xfe,0x05,0xff,0x27,0x44,
-0x04,0x2a,0x09,0x00,0xfb,0xb4,0x40,0x47,0x2d,0x44,0x58,0x36,0x37,0x00,0x02,0x64,
-0x21,0xfb,0xc0,0xfe,0x26,0x00,0x02,0x2a,0x24,0x00,0xfd,0xb4,0x40,0x47,0x06,0x64,
-0x21,0xfb,0xc0,0xfe,0x1e,0x00,0x2a,0x44,0xdc,0x80,0xff,0xff,0x01,0x02,0x58,0x80,
-0x27,0x44,0x80,0x2a,0x13,0x00,0x7f,0xb4,0x40,0x47,0x27,0x44,0x04,0x2a,0x06,0x00,
-0xfb,0xb4,0x40,0x47,0x02,0x64,0x21,0xfb,0xc0,0xfe,0x08,0x00,0x27,0x44,0x02,0x2a,
-0x05,0x00,0xfd,0xb4,0x40,0x47,0x06,0x64,0x21,0xfb,0xc0,0xfe,0x11,0x60,0x8e,0x78,
-0xff,0xff,0x26,0x44,0x80,0x2a,0x07,0x00,0x20,0xf1,0x70,0x44,0xd0,0x80,0xff,0xff,
-0x02,0x05,0x64,0xe2,0x64,0x50,0x11,0x60,0x8e,0x78,0xff,0xff,0x06,0x64,0xa0,0xfb,
-0x22,0x46,0x29,0xf0,0xf7,0x60,0xff,0x64,0xa0,0x84,0xa2,0xda,0x04,0x64,0x03,0xfa,
-0x00,0xf2,0xff,0xff,0x04,0xfa,0x01,0x64,0x21,0xfb,0xc0,0xfe,0x11,0x60,0x8e,0x78,
-0xff,0xff,0x04,0x64,0xa0,0xfb,0x46,0xff,0x47,0xff,0x0a,0x64,0x40,0x4c,0x19,0xff,
-0x03,0xe1,0x29,0xf2,0xff,0xff,0x0c,0xb4,0xff,0xff,0x08,0x3a,0x0f,0x00,0x17,0x60,
-0xea,0x64,0xa0,0xd3,0xff,0xff,0xe8,0x84,0xe0,0x84,0x60,0x45,0x17,0x60,0xee,0x64,
-0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0xff,0xff,0xa1,0xff,0xff,0xff,
-0xb9,0x3f,0x00,0x6b,0x99,0xff,0x3e,0x44,0x01,0xbc,0x00,0x7f,0x40,0x5e,0xdd,0xf1,
-0x3d,0x44,0xe7,0xb4,0x40,0x5d,0x3e,0x44,0xed,0xb4,0xb0,0x84,0x40,0x5e,0x3d,0x44,
-0x08,0xbc,0x40,0x5d,0x98,0xff,0x05,0x64,0xcc,0x84,0xff,0xff,0xfd,0x02,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x99,0xff,0x3e,0x44,
-0x77,0xb4,0x80,0xbc,0x40,0x5e,0x98,0xff,0x22,0xf2,0x08,0x63,0xff,0xff,0x08,0x2a,
-0x00,0x63,0x28,0x44,0x04,0x26,0x0a,0x00,0x25,0x44,0x06,0xfa,0x60,0x46,0x01,0xf2,
-0xff,0xff,0x61,0x5e,0x03,0x2b,0x01,0xfa,0x21,0x46,0x0d,0x00,0x28,0x44,0xb4,0x36,
-0x0a,0x00,0x08,0x63,0x3c,0x46,0x1c,0xf2,0x53,0xf3,0x60,0x40,0xf0,0x27,0x7e,0x00,
-0x5c,0x07,0x08,0x2a,0x00,0x63,0x21,0x46,0x60,0x45,0x1b,0x00,0x20,0xf2,0xff,0xff,
-0x00,0x7f,0xf6,0xa0,0x00,0x65,0x07,0x03,0xec,0xa0,0x01,0x65,0x04,0x03,0xc9,0xa0,
-0x02,0x65,0x01,0x03,0x03,0x65,0x29,0xf2,0xff,0xff,0x0c,0xb4,0xff,0xff,0x00,0x36,
-0x08,0x00,0x59,0x60,0x68,0x62,0xa2,0xd3,0xff,0xff,0xd4,0x80,0xff,0xff,0x01,0x05,
-0x60,0x45,0x45,0x45,0x65,0x40,0x03,0x22,0x00,0x63,0xb7,0x85,0x2b,0x5c,0xd3,0x80,
-0xff,0xff,0x0b,0x03,0x43,0x4b,0x38,0x64,0x65,0x40,0x08,0x2a,0x80,0x64,0x60,0x48,
-0x88,0x6a,0xff,0xff,0xff,0xff,0x01,0x16,0xfe,0x00,0x7f,0xf1,0x00,0x64,0x64,0x40,
-0x0e,0x36,0x10,0x64,0xb4,0x85,0x65,0x48,0x8a,0x6a,0xff,0xff,0xff,0xff,0x01,0x16,
-0xfe,0x00,0x4b,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0x0a,0x03,0x99,0xff,0x3d,0x44,
-0x7f,0xb4,0x00,0x7f,0x40,0x5d,0x80,0xbd,0x00,0x64,0x4b,0xfb,0x45,0x5d,0x98,0xff,
-0x2a,0x44,0x23,0xfa,0x20,0x44,0xe8,0x80,0x00,0x64,0x40,0x40,0xa1,0xf3,0x05,0x04,
-0x72,0x45,0xdc,0x84,0xa1,0xfb,0x60,0x55,0x65,0x52,0x24,0xfa,0xa2,0xf3,0x02,0x04,
-0xdc,0x84,0xa2,0xfb,0x27,0xfa,0xa3,0xf3,0x02,0x04,0xdc,0x84,0xa3,0xfb,0x28,0xfa,
-0x2a,0x44,0xdc,0x80,0xff,0xff,0x01,0x02,0x58,0x80,0x08,0x29,0x09,0x00,0x22,0xf1,
-0xff,0xff,0x64,0x40,0x07,0x2e,0x04,0x00,0x43,0xff,0x10,0x64,0x21,0xfb,0xc0,0xfe,
-0x2d,0x44,0x08,0x22,0x03,0x00,0x0d,0xb0,0x0c,0x3a,0x0a,0x00,0x26,0x43,0x84,0xbb,
-0xf4,0xb3,0x21,0x46,0x0f,0xfc,0x00,0x64,0x40,0x46,0x01,0x5d,0xdc,0xfe,0x05,0xff,
-0x09,0x64,0xa0,0xfb,0x28,0x44,0xb4,0x3a,0x0b,0x00,0x27,0x44,0x06,0x22,0x05,0x00,
-0xf9,0xb4,0x40,0x47,0x02,0x64,0x21,0xfb,0xc0,0xfe,0x17,0x60,0x32,0x78,0xff,0xff,
-0xa4,0x36,0x0a,0x00,0x04,0x26,0x0b,0x00,0x27,0x44,0x06,0x22,0x05,0x00,0xf9,0xb4,
-0x40,0x47,0x02,0x64,0x21,0xfb,0xc0,0xfe,0x16,0x60,0xeb,0x78,0xff,0xff,0x28,0x44,
-0xd4,0x3a,0x5b,0x00,0x48,0xe2,0x1c,0x42,0x22,0x46,0x1c,0xf2,0xff,0xff,0x07,0xb4,
-0xfc,0xa0,0x03,0x64,0x01,0x02,0x1c,0xfa,0x27,0xf0,0x01,0x60,0x00,0x64,0xc0,0x84,
-0x27,0xfa,0x26,0xf0,0xff,0x60,0x00,0x64,0xa0,0x84,0x26,0xfa,0x59,0x60,0xec,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x53,0xf3,0x00,0x7c,0x60,0x43,0xe0,0x84,0xe0,0x84,0x60,0x45,
-0x59,0x60,0xf0,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,
-0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x18,0x60,0xbc,0x65,0xe3,0x83,
-0xc7,0x82,0xa2,0xd9,0x27,0x44,0xf8,0xb4,0x40,0x44,0x29,0xf0,0xf7,0x60,0xff,0x64,
-0xa0,0x84,0xa2,0xda,0x0b,0xf2,0x03,0xfa,0xff,0xff,0x0c,0xf2,0x04,0xfa,0x34,0xf2,
-0xff,0xff,0xdc,0x84,0x34,0xfa,0x14,0xf2,0x0f,0xb5,0x0f,0xb4,0xcc,0x84,0x94,0x80,
-0x29,0xf0,0x04,0x02,0xfb,0x60,0xff,0x64,0xa0,0x84,0x03,0x00,0x04,0x64,0x60,0x47,
-0xb0,0x84,0x29,0xfa,0x00,0x64,0x15,0xfa,0x3f,0x00,0xc4,0x3a,0x1d,0x00,0x27,0x44,
-0xfd,0xb4,0x40,0x47,0x48,0xe2,0x5a,0x60,0x2e,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x5a,0x60,
-0xbe,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x20,0x00,0x28,0x44,0x04,0x2a,0x0b,0x00,0x32,0x44,
-0x04,0x2a,0x08,0x00,0x22,0xf3,0xff,0xff,0xff,0xff,0x02,0x2a,0x03,0x00,0x17,0x60,
-0x98,0x78,0xff,0xff,0x04,0x26,0x08,0x00,0x68,0x3a,0x06,0x00,0x32,0x44,0x00,0x2b,
-0x03,0x00,0x15,0x60,0x36,0x78,0xff,0xff,0x11,0x60,0x8e,0x78,0xff,0xff,0x0a,0x64,
-0xa0,0xfb,0x11,0x60,0x8e,0x78,0xff,0xff,0x1c,0x42,0x22,0x46,0x53,0xf3,0xff,0xff,
-0x40,0x45,0x29,0xf2,0xff,0xff,0xff,0xff,0x04,0x2b,0x61,0x00,0x16,0xf2,0xff,0xff,
-0x40,0x43,0x21,0xf2,0x25,0x40,0x02,0x36,0xe0,0x84,0x55,0xf3,0x60,0x41,0x60,0x45,
-0x23,0x60,0x58,0x4f,0x58,0x78,0xff,0xff,0xae,0x81,0xff,0xff,0x0d,0x03,0xdc,0x84,
-0x03,0x65,0xd5,0x80,0x25,0x40,0x03,0x3a,0x07,0x00,0x06,0x07,0x23,0x5c,0x60,0x41,
-0x00,0x64,0x80,0x7f,0x30,0x83,0x61,0x44,0x40,0x44,0x0f,0x64,0x14,0xf0,0x34,0xf2,
-0xa0,0x81,0x0f,0xb4,0xc9,0x85,0xd4,0x80,0x24,0x44,0x0f,0x02,0x1f,0xf2,0x25,0x40,
-0x02,0x36,0xe0,0x84,0x55,0xf3,0x60,0x41,0x60,0x45,0x23,0x60,0x58,0x4f,0x58,0x78,
-0xff,0xff,0xae,0x81,0xff,0xff,0x01,0x03,0xdc,0x84,0xc0,0x65,0xc4,0x85,0x59,0x60,
-0x68,0x61,0xa1,0xd1,0x25,0x44,0xd0,0x80,0xff,0xff,0x01,0x04,0x64,0x44,0x2b,0x5c,
-0x08,0x26,0x0a,0x00,0x00,0x36,0x25,0xf1,0x01,0x36,0x26,0xf1,0x02,0x36,0x27,0xf1,
-0x03,0x36,0x28,0xf1,0x65,0x44,0x0a,0x00,0x00,0x36,0x29,0xf1,0x01,0x36,0x2a,0xf1,
-0x02,0x36,0x2b,0xf1,0x03,0x36,0x2c,0xf1,0x65,0x44,0xa0,0xa4,0xc0,0x84,0xb5,0xf1,
-0xc0,0x84,0xc0,0x84,0x2a,0xfa,0x27,0x44,0x40,0xbc,0x40,0x47,0x44,0x00,0x17,0xf2,
-0x1f,0xf2,0x40,0x43,0x25,0x40,0x02,0x36,0xe0,0x84,0x55,0xf3,0x60,0x41,0x60,0x45,
-0x23,0x60,0x58,0x4f,0x58,0x78,0xff,0xff,0xae,0x81,0xff,0xff,0x0d,0x03,0xdc,0x84,
-0x03,0x65,0xd5,0x80,0x25,0x40,0x03,0x3a,0x07,0x00,0x06,0x07,0x23,0x5c,0x60,0x41,
-0x00,0x64,0x80,0x7f,0x30,0x83,0x61,0x44,0x40,0x44,0x56,0x64,0xa0,0xd2,0x00,0x7c,
-0x60,0x40,0x01,0x26,0x1c,0x00,0x59,0x60,0x68,0x61,0xa1,0xd1,0x25,0x44,0xd0,0x80,
-0xff,0xff,0x01,0x04,0x64,0x44,0x2b,0x5c,0x08,0x26,0x09,0x00,0x00,0x36,0x25,0xf1,
-0x01,0x36,0x26,0xf1,0x02,0x36,0x27,0xf1,0x03,0x36,0x28,0xf1,0x08,0x00,0x00,0x36,
-0x29,0xf1,0x01,0x36,0x2a,0xf1,0x02,0x36,0x2b,0xf1,0x03,0x36,0x2c,0xf1,0x2a,0xf8,
-0x27,0x44,0xbf,0xb4,0x40,0x47,0x22,0x46,0x29,0xf0,0x6b,0x44,0x64,0x40,0x40,0x27,
-0x80,0xbc,0x60,0x4b,0xf3,0x60,0x58,0x4f,0xba,0x78,0xff,0xff,0xbc,0xff,0x22,0x46,
-0x2b,0xf2,0xff,0xff,0xff,0xff,0x01,0x26,0x0e,0x00,0x27,0x44,0x04,0xbc,0x40,0x47,
-0x35,0xf3,0xb4,0xff,0x60,0x5b,0x4d,0xe2,0x84,0x60,0x1d,0x7d,0x8e,0x60,0x00,0x6b,
-0x13,0x60,0x9b,0x78,0xff,0xff,0xb5,0xff,0xbc,0xff,0x46,0xff,0x47,0xff,0xb7,0xff,
-0xb4,0xff,0x00,0x6b,0x99,0xff,0x3e,0x44,0x7c,0xb4,0x08,0xbc,0x40,0x5e,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x99,0xff,
-0x3d,0x44,0x10,0xbc,0x00,0x7f,0x40,0x5d,0x98,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xb7,0xff,
-0xb4,0xff,0xff,0xff,0xff,0xff,0x84,0x60,0x1d,0x7d,0x99,0xff,0x3e,0x44,0x02,0xbc,
-0x00,0x7f,0x40,0x5e,0x98,0xff,0xff,0xff,0x46,0xff,0x47,0xff,0x13,0x60,0x88,0x78,
-0xff,0xff,0x0e,0x64,0xa0,0xfb,0x00,0x60,0x13,0x66,0x46,0x42,0x10,0x60,0x00,0x7c,
-0x3c,0x46,0x29,0xf2,0x22,0x46,0xa0,0x84,0xb4,0xbc,0x29,0xfa,0x59,0x60,0x68,0x61,
-0xa1,0xd1,0x53,0xf3,0xff,0xff,0xd0,0x80,0xff,0xff,0x01,0x06,0x64,0x44,0x40,0x45,
-0x3c,0x46,0x2b,0xf2,0x2c,0xf0,0x60,0x43,0x2d,0xf2,0x22,0x46,0x2b,0xfc,0x2c,0xf8,
-0x2d,0xfa,0x3c,0x46,0x2e,0xf2,0x2f,0xf0,0x60,0x43,0x30,0xf2,0x22,0x46,0x2e,0xfc,
-0x2f,0xf8,0x30,0xfa,0x3c,0x46,0x29,0xf2,0xff,0xff,0xff,0xff,0x04,0x2b,0x13,0x00,
-0x21,0xf2,0x53,0xf1,0xff,0xff,0x64,0x40,0x02,0x36,0xe0,0x84,0x55,0xf3,0x60,0x41,
-0x60,0x45,0x23,0x60,0x58,0x4f,0x58,0x78,0xff,0xff,0xae,0x81,0xff,0xff,0x01,0x03,
-0xdc,0x84,0x40,0x44,0x12,0x00,0x1f,0xf2,0x53,0xf1,0xff,0xff,0x64,0x40,0x02,0x36,
-0xe0,0x84,0x55,0xf3,0x60,0x41,0x60,0x45,0x23,0x60,0x58,0x4f,0x58,0x78,0xff,0xff,
-0xae,0x81,0xff,0xff,0x01,0x03,0xdc,0x84,0x40,0x44,0x00,0x64,0x40,0x43,0x25,0x44,
-0x00,0x3a,0x0b,0x00,0x2b,0x5c,0x08,0x26,0x04,0x00,0x2d,0xf1,0x25,0xf1,0x64,0x43,
-0x2b,0x00,0x31,0xf1,0x29,0xf1,0x64,0x43,0x24,0x00,0x01,0x3a,0x0b,0x00,0x2b,0x5c,
-0x08,0x26,0x04,0x00,0x2e,0xf1,0x26,0xf1,0x64,0x43,0x1e,0x00,0x32,0xf1,0x2a,0xf1,
-0x64,0x43,0x17,0x00,0x02,0x3a,0x0b,0x00,0x2b,0x5c,0x08,0x26,0x04,0x00,0x2f,0xf1,
-0x27,0xf1,0x64,0x43,0x11,0x00,0x33,0xf1,0x2b,0xf1,0x64,0x43,0x0a,0x00,0x2b,0x5c,
-0x08,0x26,0x04,0x00,0x30,0xf1,0x28,0xf1,0x64,0x43,0x06,0x00,0x34,0xf1,0x2c,0xf1,
-0x64,0x43,0xa0,0xa3,0x60,0x65,0x02,0x00,0xc0,0x65,0xd7,0x83,0xb5,0xf3,0xff,0xff,
-0xc0,0x84,0xc0,0x84,0xc4,0x84,0x24,0x45,0xc4,0x84,0x22,0x46,0x2a,0xfa,0x63,0x44,
-0xb5,0xf1,0xff,0xff,0xd0,0x84,0xff,0xff,0x40,0x44,0xf3,0x60,0x58,0x4f,0xba,0x78,
-0xff,0xff,0xbc,0xff,0x27,0x44,0x02,0xbc,0x40,0x47,0x35,0xf3,0xb4,0xff,0x60,0x5b,
-0x4d,0xe2,0x13,0x60,0x9b,0x78,0xff,0xff,0x0d,0x64,0xa0,0xfb,0x00,0x64,0x40,0x43,
-0x2b,0x44,0x08,0x26,0x0f,0x00,0x25,0x44,0x00,0x36,0x25,0xf1,0x01,0x36,0x26,0xf1,
-0x02,0x36,0x27,0xf1,0xfd,0xa0,0xff,0xff,0x15,0x02,0x28,0xf1,0x80,0x60,0x00,0x64,
-0x40,0x43,0x10,0x00,0x25,0x44,0x00,0x36,0x29,0xf1,0x01,0x36,0x2a,0xf1,0x02,0x36,
-0x2b,0xf1,0xfd,0xa0,0xff,0xff,0x04,0x02,0x2c,0xf1,0x80,0x60,0x00,0x64,0x40,0x43,
-0x60,0x65,0x01,0x00,0xc0,0x65,0x00,0x60,0x13,0x66,0x20,0xf3,0x46,0x42,0xd0,0x83,
-0xff,0xff,0x02,0x28,0x00,0x63,0x2a,0xfc,0x64,0x44,0xb5,0xf1,0xd4,0x84,0xd0,0x84,
-0xff,0xff,0x40,0x44,0xd4,0x64,0x29,0xfa,0x21,0x46,0x2e,0xf2,0x2f,0xf0,0x60,0x43,
-0x30,0xf2,0x22,0x46,0x2b,0xfc,0x2c,0xf8,0x2d,0xfa,0xf3,0x60,0x58,0x4f,0xba,0x78,
-0xff,0xff,0xbc,0xff,0x5c,0x00,0x0f,0x64,0xa0,0xfb,0x5a,0x60,0xba,0x64,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x00,0x64,0x40,0x43,0x00,0x60,0x13,0x66,0x46,0x42,0xc4,0x64,0x29,0xfa,
-0x21,0x46,0x2e,0xf2,0x2f,0xf0,0x60,0x43,0x30,0xf2,0x22,0x46,0x2b,0xfc,0x2c,0xf8,
-0x2d,0xfa,0x2b,0x44,0x08,0x26,0x0f,0x00,0x25,0x44,0x00,0x36,0x25,0xf1,0x01,0x36,
-0x26,0xf1,0x02,0x36,0x27,0xf1,0xfd,0xa0,0xff,0xff,0x15,0x02,0x28,0xf1,0x80,0x60,
-0x00,0x64,0x40,0x43,0x10,0x00,0x25,0x44,0x00,0x36,0x29,0xf1,0x01,0x36,0x2a,0xf1,
-0x02,0x36,0x2b,0xf1,0xfd,0xa0,0xff,0xff,0x04,0x02,0x2c,0xf1,0x80,0x60,0x00,0x64,
-0x40,0x43,0x60,0x65,0x01,0x00,0xc0,0x65,0x20,0xf3,0x22,0x46,0xd0,0x84,0x2a,0xfa,
-0x64,0x44,0xb5,0xf1,0xd4,0x84,0xd0,0x84,0xff,0xff,0x40,0x44,0xf3,0x60,0x58,0x4f,
-0xba,0x78,0xff,0xff,0xbc,0xff,0x5a,0x60,0x32,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0xb4,0xff,
-0xff,0xff,0xff,0xff,0x84,0x60,0x1d,0x7d,0x8e,0x60,0x00,0x6b,0x11,0x60,0x8e,0x78,
-0xff,0xff,0x10,0x64,0xa0,0xfb,0xbc,0xff,0x00,0x60,0x13,0x66,0x46,0x42,0xf3,0x60,
-0x58,0x4f,0xba,0x78,0xff,0xff,0x11,0x60,0x8e,0x78,0xff,0xff,0xff,0x00,0x00,0xe0,
-0x7f,0x00,0x1a,0x0e,0xd8,0xf1,0x01,0x64,0xd0,0x80,0xcf,0xfb,0x1a,0x03,0xd7,0xfb,
-0x17,0x60,0xe4,0x65,0xa5,0xd3,0x41,0x4d,0xdc,0x84,0xa5,0xdb,0x26,0x44,0x02,0x26,
-0x17,0x00,0x3e,0x45,0x35,0x81,0xff,0xff,0x0f,0x02,0x5b,0x60,0x06,0x64,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0xf3,0x60,0x8e,0x78,0xff,0xff,0x41,0x5e,0x02,0x64,0x40,0x46,0xd1,0xfe,
-0x21,0x46,0x46,0x45,0x4c,0xe2,0x0e,0x64,0x40,0x4c,0x19,0xff,0x03,0xe1,0x26,0x44,
-0x02,0xb4,0x12,0xbc,0x40,0x46,0x2e,0x44,0x20,0xfa,0x17,0x60,0x7a,0x62,0xa2,0xd1,
-0xff,0xff,0x64,0x40,0x01,0x2a,0x12,0x00,0x66,0x69,0xff,0xff,0xff,0xff,0x01,0x16,
-0xfe,0x00,0x68,0x44,0x00,0x7f,0x60,0x45,0x7c,0x69,0xff,0xff,0xff,0xff,0x01,0x16,
-0xfe,0x00,0x68,0x44,0x00,0x7f,0x60,0x47,0xb4,0x84,0x0f,0x00,0x00,0x65,0x7c,0x69,
-0xff,0xff,0xff,0xff,0x01,0x16,0xfe,0x00,0x68,0x44,0xdf,0xf1,0x00,0x7f,0xd0,0x80,
-0xff,0xff,0x01,0x04,0x64,0x44,0x60,0x47,0xb4,0x84,0x25,0xfa,0x20,0xf2,0xff,0xff,
-0xff,0xb4,0x0a,0x36,0x00,0x7f,0x14,0x36,0x01,0x7f,0x37,0x36,0x02,0x7f,0x6e,0x36,
-0x03,0x7f,0x26,0xfa,0x00,0x7c,0x22,0xf8,0x35,0xf1,0x01,0x64,0x57,0xfb,0x2e,0x44,
-0xa1,0xff,0x6c,0x43,0x21,0xfc,0x7e,0x69,0xc3,0x94,0xcd,0xe2,0x9c,0xfe,0xff,0xff,
-0x0e,0x04,0x67,0x60,0x5e,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x01,0x64,
-0xcf,0xfb,0x27,0x44,0x80,0xbc,0x40,0x47,0xf3,0x60,0x94,0x78,0xff,0xff,0xdc,0xf1,
-0xff,0xff,0x64,0x40,0x00,0x36,0x03,0x00,0x0e,0x60,0x8b,0x78,0xff,0xff,0x00,0x7c,
-0xcf,0xf9,0x40,0x45,0x6e,0x36,0x35,0x00,0x37,0x36,0x26,0x00,0x14,0x36,0x1f,0x00,
-0x0a,0x36,0x17,0x00,0x5a,0x60,0xfa,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x21,0x63,0xa0,0xfd,
-0x27,0x44,0x80,0xbc,0x40,0x47,0x07,0x60,0xd0,0x74,0xcd,0xe2,0xf3,0x60,0x94,0x78,
-0xff,0xff,0xa1,0xff,0x4c,0x48,0xeb,0x83,0xeb,0x83,0xeb,0x83,0x20,0x00,0xa1,0xff,
-0x4c,0x48,0xeb,0x83,0xeb,0x83,0x1b,0x00,0xa1,0xff,0x4c,0x48,0xe3,0x85,0xc7,0x85,
-0xe3,0x83,0xe3,0x83,0xe3,0x83,0xc7,0x83,0xeb,0x83,0xeb,0x83,0xeb,0x83,0xeb,0x83,
-0x0e,0x00,0xe3,0x85,0xc7,0x85,0xe3,0x83,0xe3,0x83,0xe3,0x83,0xa1,0xff,0x4c,0x48,
-0xc7,0x83,0xeb,0x83,0xeb,0x83,0xeb,0x83,0xff,0xff,0x80,0x27,0xcf,0x83,0x1f,0xfc,
-0xfc,0xa3,0x48,0xf3,0x43,0x43,0xa1,0xff,0x4c,0x4e,0x1c,0x7c,0xd0,0x9c,0xd3,0x80,
-0x20,0x44,0x0f,0x04,0x5a,0x60,0xfe,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x27,0x44,0x80,0xbc,0x40,0x47,0x07,0x60,0xd0,0x74,0xcd,0xe2,0xf3,0x60,0x94,0x78,
-0xff,0xff,0xe8,0x84,0x52,0x4a,0x01,0x05,0x70,0x80,0x52,0x63,0x28,0x44,0xbd,0xda,
-0xff,0xff,0xa1,0xff,0x6c,0x45,0x2e,0x44,0x80,0x2b,0x20,0xfb,0xbd,0xda,0x65,0x44,
-0xbd,0xf1,0xbd,0xda,0x50,0xfe,0xff,0xff,0x01,0x2a,0x04,0x00,0x26,0x44,0x20,0xbc,
-0x40,0x46,0x01,0x00,0xd0,0x80,0xa1,0xff,0x6c,0x44,0xbe,0xf1,0xbd,0xda,0xc4,0x85,
-0xd0,0x80,0x00,0x61,0x28,0x44,0x04,0x2a,0x03,0x00,0x40,0x27,0xd1,0x00,0x01,0x61,
-0xbf,0xf1,0xff,0xff,0xa1,0xff,0x6c,0x44,0xbd,0xda,0xc4,0x85,0xd0,0x80,0x32,0x44,
-0x01,0x2a,0x27,0x00,0x28,0x44,0xd4,0x36,0x02,0x00,0xc4,0x3a,0x06,0x00,0x00,0x64,
-0x38,0xfa,0x08,0x64,0xf2,0x60,0xbb,0x78,0x40,0x4c,0xa1,0xff,0x6c,0x44,0xbd,0xda,
-0xff,0xff,0xa1,0xff,0x6c,0x44,0xbd,0xda,0x20,0x61,0x28,0x44,0x03,0x2b,0x00,0x61,
-0x60,0x40,0x40,0x27,0x02,0xb9,0x41,0x4e,0xa1,0xff,0x6c,0x44,0xbd,0xda,0x28,0x44,
-0xb4,0x36,0xe5,0x00,0xa4,0x36,0xe3,0x00,0xe4,0x36,0xe1,0x00,0xf1,0x60,0xb9,0x78,
-0xff,0xff,0x61,0x40,0x01,0x22,0x31,0x00,0xa1,0xff,0x6c,0x44,0xbd,0xda,0x28,0x44,
-0xd4,0x3a,0x02,0x00,0x48,0x61,0x08,0x00,0xc4,0x36,0x05,0x00,0x28,0x44,0xb4,0x3a,
-0x03,0x00,0x4d,0x61,0x01,0x00,0x49,0x61,0x41,0x4d,0x46,0x4e,0x08,0x64,0x40,0x4c,
-0x05,0x01,0x00,0x65,0x2d,0x44,0x04,0x2a,0x0a,0x00,0x0d,0x00,0x2d,0x44,0x49,0x36,
-0x05,0x00,0x48,0x3a,0x07,0x00,0x10,0x65,0x27,0x40,0x40,0x26,0x30,0x65,0xf2,0x60,
-0xbe,0x78,0x35,0x8d,0x30,0x65,0xa1,0xff,0x6c,0x44,0xbd,0xda,0xff,0xff,0xa1,0xff,
-0x6c,0x44,0xbd,0xda,0xf2,0x60,0xbb,0x78,0x35,0x8d,0x45,0x4e,0x23,0x44,0xe8,0xa5,
-0xff,0xff,0x05,0x05,0x60,0x43,0xfa,0xa3,0xf3,0x60,0xa8,0x78,0xff,0xff,0xa1,0xff,
-0x6c,0x44,0xbd,0xda,0xff,0xff,0xa1,0xff,0x6c,0x44,0xbd,0xda,0xff,0xff,0xa1,0xff,
-0x6c,0x44,0xbd,0xda,0x26,0x41,0x20,0x26,0x1d,0x00,0x2d,0x44,0x22,0x01,0x32,0x40,
-0x02,0x2a,0x03,0x00,0x50,0xbc,0x40,0x4d,0x1e,0x00,0x01,0x64,0xcf,0xfb,0x18,0x60,
-0xc8,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x27,0x44,0x06,0x22,0x06,0x00,
-0xf9,0xb4,0x40,0x47,0x02,0x64,0x21,0xfb,0xc0,0xfe,0x48,0xe2,0x27,0x44,0x80,0xbc,
-0x40,0x47,0x09,0x00,0x2e,0x44,0x03,0xa4,0xef,0xb1,0x08,0x24,0x40,0xb9,0x41,0x46,
-0x02,0x00,0x70,0xbc,0x40,0x4d,0xa1,0xff,0x6c,0x44,0xbd,0xda,0x20,0x61,0x28,0x44,
-0x03,0x2b,0x00,0x61,0x60,0x40,0x40,0x2b,0x0d,0x00,0xbf,0x60,0xff,0x65,0x43,0xf3,
-0x02,0xb9,0x80,0xb0,0x28,0x44,0x06,0x03,0xa4,0x84,0x40,0x48,0x29,0xfa,0x04,0x64,
-0x22,0xfa,0x02,0xa9,0x23,0x44,0xe8,0xa4,0x41,0x4e,0x20,0x26,0xfa,0xa4,0x28,0x40,
-0x40,0x27,0xf8,0xa4,0x40,0x43,0x38,0xfa,0xff,0xff,0xa1,0xff,0x6c,0x44,0xbd,0xda,
-0x23,0x44,0x80,0x2b,0x03,0x00,0x14,0x64,0x40,0x43,0x38,0xfa,0x23,0x47,0x3f,0xfa,
-0x08,0x65,0x45,0x4c,0x21,0xf2,0x70,0x45,0xd4,0x80,0xff,0xff,0x02,0x06,0x64,0xe2,
-0x60,0x50,0xa1,0xff,0x6c,0x44,0xbd,0xda,0x2e,0x44,0x22,0x26,0x05,0x00,0x23,0x41,
-0xa1,0xff,0x6c,0x44,0x34,0xfa,0x54,0x00,0xa1,0xff,0x6c,0x44,0xbd,0xda,0x2e,0x40,
-0x20,0x2a,0x12,0x00,0xa1,0xff,0x6c,0x44,0xbd,0xda,0xff,0xff,0xa1,0xff,0x6c,0x44,
-0xbd,0xda,0x2e,0x40,0x02,0x26,0x05,0x00,0x23,0x41,0xa1,0xff,0x6c,0x44,0x37,0xfa,
-0x3f,0x00,0xa1,0xff,0x6c,0x44,0x37,0xfa,0x32,0x44,0x01,0x2a,0x1a,0x00,0x00,0xf4,
-0x02,0x62,0x46,0x45,0xa1,0xff,0xda,0x82,0x6c,0x44,0xa2,0xda,0xff,0xff,0xa1,0xff,
-0xda,0x82,0x6c,0x44,0xa2,0xda,0x23,0x41,0x04,0xa1,0x78,0x7c,0x01,0x65,0x61,0x43,
-0xd1,0x80,0x46,0x45,0x02,0x07,0x04,0xa1,0x37,0x00,0x64,0x43,0xd1,0x81,0x7c,0x7c,
-0x3b,0x00,0xcf,0xf3,0x48,0xf1,0x00,0xa0,0x23,0x44,0x04,0x02,0x00,0xa0,0xd0,0x80,
-0x01,0x03,0x05,0x04,0x60,0x43,0x0c,0xa3,0xf3,0x60,0xa8,0x78,0xff,0xff,0xa1,0xff,
-0x6c,0x44,0xff,0xff,0x1a,0xfa,0xff,0xff,0xa1,0xff,0x6c,0x44,0xff,0xff,0x1b,0xfa,
-0xb0,0xff,0x01,0x5d,0xdc,0xfe,0x05,0xff,0x3e,0xf3,0x23,0x41,0x04,0xbc,0x3e,0xfb,
-0x7c,0x7c,0x01,0x65,0x25,0x44,0xd5,0x80,0x61,0x43,0x45,0x04,0x35,0x03,0xdc,0xf3,
-0xff,0xff,0xff,0xff,0x00,0x36,0x03,0x00,0x0e,0x60,0x8b,0x78,0xff,0xff,0x00,0xf4,
-0x02,0x62,0xd1,0x80,0x46,0x45,0x06,0x07,0x61,0x40,0x01,0x26,0x01,0xa1,0x61,0x5c,
-0x00,0x61,0x02,0x00,0x64,0x43,0xd1,0x81,0xa1,0xff,0xec,0x44,0x5a,0xda,0xfc,0x1d,
-0xe2,0x1e,0x23,0x00,0xa1,0xff,0xd5,0x80,0x61,0x43,0x37,0x04,0x16,0x03,0x00,0xf4,
-0x02,0x62,0xd1,0x80,0x46,0x45,0x07,0x07,0xec,0x44,0x61,0x40,0x01,0x26,0x01,0xa1,
-0x61,0x5c,0x00,0x61,0x05,0x00,0x64,0x43,0xec,0x44,0xd1,0x81,0x01,0x00,0xec,0x44,
-0x7a,0xda,0xfd,0x1d,0xe8,0x1e,0x0a,0x00,0xa1,0xff,0xb6,0xff,0x6c,0x44,0x00,0xf4,
-0x02,0xfa,0x02,0x7c,0x46,0x45,0xb7,0xff,0x06,0x00,0xa1,0xff,0xb6,0xff,0x00,0x64,
-0x6c,0x44,0x5a,0xda,0xb7,0xff,0x64,0x41,0x28,0x44,0x40,0x2b,0x1d,0x00,0xb1,0xff,
-0x32,0x44,0x01,0x26,0x19,0x00,0xa1,0xff,0x6c,0x44,0xff,0xff,0x3c,0xfb,0xff,0xff,
-0xa1,0xff,0x6c,0x44,0xff,0xff,0x3d,0xfb,0x0f,0x00,0x6c,0x44,0x64,0x41,0x28,0x40,
-0x40,0x2b,0x0d,0x00,0xb1,0xff,0x32,0x40,0x01,0x26,0x09,0x00,0x3c,0xfb,0xff,0xff,
-0xa1,0xff,0x6c,0x44,0xff,0xff,0x3d,0xfb,0x21,0x46,0xa1,0xff,0x6c,0x40,0x21,0x46,
-0x6a,0x43,0xa1,0xff,0x6c,0x40,0x24,0xf1,0xff,0xff,0x64,0x54,0xcd,0xe2,0x19,0xff,
-0x01,0x16,0xfe,0x00,0x68,0x44,0x60,0x40,0x10,0x2a,0x04,0x00,0x22,0xf2,0xff,0xff,
-0x08,0xbc,0x22,0xfa,0x32,0x44,0x03,0x22,0x20,0x00,0x47,0xff,0x26,0x44,0xfd,0xb4,
-0x84,0xbc,0x63,0x40,0x40,0x27,0x08,0x00,0x0d,0x63,0x07,0x15,0x06,0x15,0x05,0x15,
-0x04,0x15,0xff,0xa3,0x02,0x15,0xf9,0x02,0x7f,0xb4,0x40,0x46,0x6c,0x40,0x28,0x44,
-0x40,0x2b,0x08,0x00,0x32,0x44,0x01,0x2a,0x05,0x00,0x23,0x44,0x08,0xa4,0x38,0xfa,
-0x60,0x47,0x3f,0xfa,0xf3,0x60,0x74,0x78,0xff,0xff,0x63,0x40,0x40,0x2b,0x05,0x00,
-0xd2,0xf3,0xff,0xff,0x01,0xa4,0xd2,0xfb,0x08,0x00,0x0d,0x64,0x4b,0x15,0x4a,0x15,
-0x49,0x15,0x48,0x15,0xff,0xa4,0x46,0x15,0xf9,0x02,0x48,0xe2,0xcf,0xf3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0x73,0x02,0x27,0x44,0x06,0x22,0x05,0x00,0xf9,0xb4,0x40,0x47,
-0x02,0x64,0x21,0xfb,0xc0,0xfe,0x20,0xf2,0xff,0xff,0xff,0xb4,0x0a,0x36,0x00,0x7f,
-0x14,0x36,0x01,0x7f,0x37,0x36,0x02,0x7f,0x6e,0x36,0x03,0x7f,0x26,0xfa,0x5a,0x60,
-0xd2,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x26,0xf2,0xff,0xff,0x60,0x47,0x00,0x7f,0xe0,0x84,
-0xe0,0x84,0x60,0x45,0x5a,0x60,0xd6,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x28,0x40,
-0x04,0x26,0x3c,0x00,0x28,0x40,0x40,0x2b,0x39,0x00,0x26,0x44,0x04,0xbc,0xfd,0xb4,
-0x40,0x46,0x34,0x00,0x6c,0x40,0x2d,0x44,0x20,0x2a,0x18,0x00,0xb5,0xf3,0xff,0xff,
-0xf7,0xa4,0x60,0x54,0xcd,0xe2,0x5d,0x2a,0x05,0x00,0x70,0x44,0x00,0xbc,0xff,0xff,
-0x0d,0x02,0x05,0x00,0x59,0x2a,0x03,0x00,0x27,0x40,0x02,0x2a,0x07,0x00,0x47,0xff,
-0xb5,0xff,0x00,0x64,0xd7,0xfb,0x13,0x60,0xbb,0x78,0xff,0xff,0xcf,0xf3,0xff,0xff,
-0x00,0xa0,0x26,0x44,0x03,0x03,0x84,0xbc,0x40,0x46,0x10,0x00,0x84,0xbc,0x2d,0x40,
-0x0c,0x22,0x02,0x00,0x40,0x46,0x0a,0x00,0xfd,0xb4,0x40,0x46,0x25,0x44,0x06,0xfa,
-0x60,0x46,0x01,0xf2,0xff,0xff,0x61,0x5e,0x03,0x2b,0x01,0xfa,0x21,0x46,0x08,0x29,
-0x09,0x00,0x22,0xf1,0xff,0xff,0x64,0x40,0x07,0x2e,0x04,0x00,0x43,0xff,0x10,0x64,
-0x21,0xfb,0xc0,0xfe,0x00,0x64,0xd7,0xfb,0x47,0xff,0x12,0x60,0xe4,0x78,0xff,0xff,
-0xa1,0xff,0x6c,0x43,0x63,0x54,0xcd,0xe2,0x0e,0x64,0x01,0x00,0x0c,0x64,0x40,0x4c,
-0x19,0xff,0x00,0x64,0x40,0x4a,0xd7,0xfb,0x08,0x64,0x40,0x4c,0x27,0x44,0x06,0x22,
-0x06,0x00,0xf9,0xb4,0x40,0x47,0x02,0x64,0x21,0xfb,0xc0,0xfe,0x48,0xe2,0x82,0xe1,
-0xa1,0xff,0xd4,0x00,0x00,0x60,0x18,0x63,0xa1,0xff,0xec,0x44,0xff,0xff,0xfc,0x1d,
-0x04,0x1e,0xb6,0xff,0xa1,0xff,0x6c,0x44,0xb7,0xff,0x08,0x64,0x40,0x4c,0x19,0xff,
-0x27,0x44,0x80,0xbc,0x40,0x47,0xc2,0x00,0x01,0x64,0xd0,0xfb,0x24,0x44,0x60,0x48,
-0x90,0x6a,0x60,0x47,0x23,0x41,0xe1,0x81,0xff,0xff,0x01,0x16,0xfe,0x00,0x60,0x48,
-0x8e,0x6a,0x00,0x64,0x02,0x24,0x80,0x64,0x69,0x83,0xde,0xf1,0x25,0x45,0x02,0x2a,
-0x03,0x00,0x64,0x40,0x01,0x2a,0x04,0xbc,0x01,0x16,0xfe,0x00,0x60,0x48,0x8c,0x6a,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x01,0x16,0xfe,0x00,0x02,0xe1,0x08,0x64,
-0x40,0x4c,0x29,0x44,0x01,0xbc,0x40,0x49,0x19,0xff,0x52,0x63,0x22,0x46,0xbd,0xd0,
-0x22,0xf3,0x43,0xff,0x60,0x40,0x07,0x22,0x03,0x00,0x10,0x64,0x21,0xfb,0xc0,0xfe,
-0x01,0xe1,0x28,0xf2,0x44,0x48,0x60,0x40,0x01,0x2a,0x03,0x00,0x40,0x67,0xb0,0x84,
-0x60,0x5c,0x99,0xff,0x07,0x60,0x00,0xe8,0x98,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0x80,0xe8,0xff,0xff,0xff,0xff,0xff,0xff,0x64,0x4d,
-0x64,0x47,0x60,0x4d,0xff,0xff,0xff,0xff,0xa1,0xff,0xb5,0xff,0xbb,0xff,0x32,0x64,
-0xa0,0xfb,0xff,0xff,0xa1,0xff,0xbd,0xd2,0xff,0xff,0x60,0x4d,0x60,0x47,0x60,0x4d,
-0x26,0x44,0x02,0xb4,0x40,0x46,0x20,0x61,0x28,0x44,0x80,0x36,0x04,0x00,0x50,0x3a,
-0x03,0x00,0x00,0x65,0xb5,0x81,0x04,0xb9,0x41,0x4e,0xa1,0xff,0xbd,0xd2,0xff,0xff,
-0x60,0x4d,0x60,0x47,0x60,0x4d,0xa1,0xff,0xbd,0xd2,0xff,0xff,0x60,0x4d,0x60,0x47,
-0x60,0x4d,0xa1,0xff,0xbd,0xd2,0xff,0xff,0x60,0x4c,0x28,0x44,0xc4,0x36,0x13,0x00,
-0xd4,0x36,0x11,0x00,0xa1,0xff,0xbd,0xd2,0xff,0xff,0x60,0x4c,0xa1,0xff,0xbd,0xd2,
-0xff,0xff,0x60,0x4c,0xa1,0xff,0xbd,0xd2,0xff,0xff,0x60,0x4c,0x28,0x44,0xb4,0x36,
-0x02,0x00,0xa4,0x3a,0x03,0x00,0xf5,0x60,0x03,0x78,0xff,0xff,0xa1,0xff,0xbd,0xd2,
-0xff,0xff,0x60,0x4c,0xff,0x65,0xa1,0xff,0xbd,0xd2,0xff,0xff,0x60,0x4c,0x2e,0x41,
-0x28,0x44,0x03,0x2b,0xdf,0xb1,0x60,0x40,0x40,0x27,0x02,0xb9,0xa1,0xff,0xbd,0xd2,
-0xff,0xff,0x60,0x4c,0x23,0x44,0xcc,0x84,0xdc,0x84,0x03,0x03,0x03,0x02,0x08,0xb9,
-0x01,0x00,0x10,0xb9,0xbd,0xd0,0x41,0x4e,0xa1,0xff,0xff,0xff,0x64,0x4c,0x2e,0x44,
-0x22,0x22,0x30,0x00,0x20,0x2a,0x0f,0x00,0xa1,0xff,0xbd,0xd2,0xff,0xff,0x60,0x4c,
-0xa1,0xff,0xbd,0xd2,0xff,0xff,0x60,0x4c,0xa1,0xff,0xbd,0xd2,0xff,0xff,0x60,0x4c,
-0x2e,0x44,0x02,0x2a,0x1f,0x00,0xa1,0xff,0xff,0xff,0x38,0xf3,0x39,0xf3,0x60,0x4c,
-0x60,0x43,0x03,0xf0,0x04,0xf4,0x01,0xf2,0x64,0x42,0x04,0xa4,0xd0,0x81,0xa1,0xff,
-0x63,0x4c,0x23,0x43,0x2e,0x44,0x10,0x2a,0x06,0x00,0xa2,0xd2,0xff,0xff,0xa1,0xff,
-0xff,0xff,0x60,0x4f,0x63,0x00,0xe2,0xd2,0xff,0xff,0xa1,0xff,0xda,0x82,0xc9,0x81,
-0x60,0x4e,0x51,0x00,0x18,0x22,0x0a,0x00,0x10,0x26,0x03,0x00,0xf5,0x60,0x03,0x78,
-0xff,0xff,0x03,0xf0,0x04,0xf4,0x00,0x61,0x64,0x42,0x4b,0x00,0x04,0x2a,0x32,0x00,
-0x00,0xf4,0x01,0xf2,0xff,0x65,0xa4,0x81,0xa1,0xff,0x02,0xfe,0xff,0xff,0x10,0x25,
-0x42,0xfe,0x72,0x45,0x28,0x40,0x50,0x3a,0x00,0x00,0x65,0x4c,0x23,0x43,0xa1,0xf3,
-0x04,0x04,0xdc,0x84,0xa1,0xfb,0x60,0x55,0x65,0x52,0xa1,0xff,0xff,0xff,0x60,0x4c,
-0xa2,0xf3,0x03,0x04,0xdc,0x84,0xa2,0xfb,0xff,0xff,0xa1,0xff,0xff,0xff,0x60,0x4c,
-0xa3,0xf3,0x03,0x04,0xdc,0x84,0xa3,0xfb,0xff,0xff,0xa1,0xff,0x0c,0x62,0x60,0x4c,
-0xf8,0xa3,0x2e,0x44,0xfb,0xb4,0x40,0x4e,0x65,0x44,0xdc,0x80,0xff,0xff,0x01,0x02,
-0x58,0x80,0x0c,0x00,0x23,0x43,0x03,0xf0,0x04,0xf4,0x01,0xf2,0x64,0x42,0x04,0xa4,
-0xd0,0x81,0x04,0x00,0x00,0xf4,0x01,0xf2,0x04,0x62,0xa4,0x81,0xa1,0xff,0xe2,0xd2,
-0xda,0x82,0xc9,0x81,0x60,0x4c,0xfa,0x1c,0xf5,0x1d,0x08,0x1e,0x02,0x02,0x00,0xf4,
-0x04,0x62,0xa2,0xd2,0xff,0xff,0xa1,0xff,0xff,0xff,0x60,0x4d,0x28,0x44,0x40,0x2b,
-0x04,0x00,0xa1,0xff,0x60,0x4e,0xa1,0xff,0x60,0x4c,0xa1,0xff,0xc3,0x60,0x33,0x64,
-0x60,0x4e,0xa1,0xff,0xff,0xff,0x62,0x5c,0x02,0xe1,0x08,0x64,0x40,0x4c,0x19,0xff,
-0x61,0x40,0x7f,0x26,0x02,0x00,0x00,0xf4,0x04,0x7c,0x66,0x44,0x22,0x46,0x0b,0xf8,
-0x0c,0xfa,0x34,0x64,0xa0,0xfb,0x6a,0x40,0x40,0x26,0x02,0x00,0xfc,0x0b,0x02,0x00,
-0x07,0x60,0x80,0xe8,0x24,0xf3,0xff,0xff,0x60,0x54,0xcd,0xe2,0x03,0x64,0xcc,0x84,
-0xff,0xff,0xfd,0x02,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0x99,0xff,0x3e,0x44,0x7d,0xb4,0x08,0xbc,0x40,0x5e,0x98,0xff,0x05,0x64,
-0xcc,0x84,0xff,0xff,0xfd,0x02,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0x99,0xff,0x3d,0x44,0xf7,0xb4,0x40,0x5d,0x98,0xff,0x00,0x60,
-0x00,0x6b,0x99,0xff,0x3d,0x44,0x10,0xbc,0x40,0x5d,0x3e,0x44,0xfe,0xb4,0x40,0x5e,
-0x98,0xff,0xbc,0xff,0x28,0x44,0x40,0x2b,0x3e,0x00,0x99,0xff,0x3a,0x44,0x98,0xff,
-0x10,0x2b,0xfb,0x00,0x99,0xff,0x00,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0xff,0xff,
-0x3a,0x5c,0x80,0x2b,0x12,0x00,0x8b,0xff,0x74,0x40,0x88,0xff,0x3a,0x5c,0x80,0x2b,
-0x09,0x00,0x8b,0xff,0x74,0x40,0x88,0xff,0x3a,0x5c,0x80,0x2b,0x03,0x00,0x8b,0xff,
-0x74,0x40,0x88,0xff,0x8b,0xff,0x74,0x40,0x88,0xff,0x3a,0x5c,0x80,0x2b,0xff,0xff,
-0x31,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0x00,0x60,0x00,0xea,0x3a,0x5c,0x80,0x27,
-0x06,0x00,0x31,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0x00,0x60,0x00,0xea,0x00,0x64,
-0xdb,0xfb,0x67,0x60,0xcc,0x64,0x3a,0x5c,0xa0,0xd9,0xff,0xff,0x30,0x60,0x00,0xea,
-0xff,0xff,0xff,0xff,0x98,0xff,0xff,0xff,0xb7,0xff,0xb4,0xff,0xff,0xff,0xff,0xff,
-0x84,0x60,0x1d,0x7d,0xb5,0xff,0xff,0xff,0x99,0xff,0x07,0x60,0x80,0xe9,0x98,0xff,
-0xff,0xff,0xff,0xff,0x80,0xe9,0xff,0xff,0xff,0xff,0xb7,0xff,0xb4,0xff,0xff,0xff,
-0x99,0xff,0x3e,0x44,0x02,0xbc,0x00,0x7f,0x40,0x5e,0x98,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0x46,0xff,0x47,0xff,0x2f,0x58,0xff,0xff,0x01,0x64,0x3f,0xfb,
-0xff,0xff,0x00,0xea,0x99,0xff,0x3b,0x44,0x40,0x27,0xfd,0x00,0x98,0xff,0x00,0xeb,
-0x40,0xf3,0xff,0xff,0x60,0x40,0x01,0x2a,0x03,0x00,0x18,0x60,0x17,0x78,0xff,0xff,
-0x1b,0xf2,0x41,0xf1,0x60,0x40,0xc0,0x27,0x07,0x00,0x64,0x40,0x01,0x2a,0x16,0x00,
-0x67,0x60,0x8e,0x63,0x00,0x65,0x77,0x00,0xc0,0x2b,0x07,0x00,0x64,0x40,0x08,0x2a,
-0x0d,0x00,0x67,0x60,0xb8,0x63,0x30,0x65,0x6e,0x00,0x40,0x2b,0x0c,0x00,0x64,0x40,
-0x02,0x2a,0x04,0x00,0x67,0x60,0x9c,0x63,0x10,0x65,0x65,0x00,0x20,0x60,0x00,0xea,
-0xf6,0x60,0xeb,0x78,0xff,0xff,0x64,0x40,0x04,0x2a,0xf8,0x00,0x67,0x60,0xaa,0x63,
-0x95,0xf3,0xd6,0xf3,0x00,0xa0,0x00,0xa0,0x55,0x03,0x54,0x03,0x19,0x60,0x2a,0x65,
-0x30,0xf2,0x2f,0xf0,0x60,0x41,0x64,0x43,0xeb,0x83,0x00,0x7f,0xe0,0x84,0x44,0xd1,
-0x61,0x47,0x93,0x83,0x00,0x7f,0xe0,0x84,0x44,0xd1,0xeb,0x83,0x93,0x83,0x0f,0x60,
-0xf0,0x65,0xa7,0x85,0x44,0x60,0x4e,0x63,0xc7,0x83,0x02,0x65,0xbd,0xd3,0xff,0xff,
-0x60,0x40,0x80,0x2b,0x0e,0x00,0x5c,0x61,0xa1,0xd0,0xbd,0xd3,0x50,0xfe,0x59,0xd0,
-0xd0,0x80,0xbd,0xd3,0x59,0xd0,0xd0,0x80,0xbd,0xd3,0xff,0xff,0xd0,0x80,0xff,0xff,
-0x1f,0x01,0x65,0x44,0xff,0xa5,0xff,0xff,0xe9,0x02,0x54,0x60,0x4e,0x63,0x7e,0x65,
-0xbd,0xd3,0xff,0xff,0x60,0x40,0x80,0x2b,0x0e,0x00,0x5c,0x61,0xa1,0xd0,0xbd,0xd3,
-0x50,0xfe,0x59,0xd0,0xd0,0x80,0xbd,0xd3,0x59,0xd0,0xd0,0x80,0xbd,0xd3,0xff,0xff,
-0xd0,0x80,0xff,0xff,0x05,0x01,0x65,0x44,0xff,0xa5,0xff,0xff,0xe9,0x02,0x0a,0x00,
-0xf8,0xa3,0xa3,0xd3,0xff,0xff,0xe0,0x84,0xe8,0x85,0x3d,0x60,0x4c,0x64,0xc4,0x83,
-0x67,0x44,0xd9,0xfb,0x20,0x65,0x22,0xf2,0xff,0xff,0xb4,0x84,0x22,0xfa,0x1a,0xf0,
-0x99,0xff,0x64,0x44,0xe0,0x7f,0x40,0x5b,0x64,0x47,0xe1,0x7f,0x40,0x5b,0x1b,0xf0,
-0xff,0xff,0x64,0x44,0xe2,0x7f,0x40,0x5b,0x60,0x47,0x60,0x41,0xd9,0xf3,0xd9,0xf9,
-0x45,0xf1,0x90,0x84,0x00,0x37,0x13,0x00,0x63,0x42,0x02,0x63,0x64,0x40,0x07,0x3a,
-0x0a,0x63,0x5a,0xd3,0xdd,0x81,0x60,0x45,0x61,0x5f,0x40,0x5b,0x65,0x47,0xdd,0x81,
-0x61,0x5f,0x40,0x5b,0xf6,0x1f,0x5a,0xd3,0xdd,0x81,0x61,0x5f,0x40,0x5b,0x98,0xff,
-0xa0,0x60,0x00,0xeb,0xc0,0x60,0x00,0xeb,0x64,0x40,0x07,0x3a,0x03,0x00,0x80,0x60,
-0x07,0xeb,0x02,0x00,0x80,0x60,0x0f,0xeb,0x33,0x60,0x00,0xeb,0x00,0x64,0x3f,0xfb,
-0x38,0xf2,0x00,0xf4,0xff,0xff,0x28,0x87,0x04,0x64,0x40,0x49,0x46,0x4a,0xb3,0xff,
-0x02,0x64,0x9c,0xfb,0x99,0xff,0x30,0x44,0x02,0xbc,0x40,0x51,0x98,0xff,0xf8,0x60,
-0x89,0x78,0xff,0xff,0x40,0xf3,0x2a,0x46,0x60,0x40,0x01,0x26,0x65,0x00,0x29,0x43,
-0x27,0x44,0x00,0xa8,0x60,0x41,0xa3,0xd2,0x1b,0x03,0x99,0xff,0x3b,0x40,0x80,0x2b,
-0xfd,0x00,0x98,0xff,0x60,0x57,0xff,0xff,0x77,0x5f,0xc9,0x81,0x60,0x57,0xff,0xff,
-0x77,0x5f,0xbd,0xda,0x01,0x0f,0x25,0x00,0x0b,0x03,0xa3,0xd2,0x7f,0x26,0xf2,0x00,
-0x00,0xf2,0x04,0x63,0x00,0xa8,0x40,0x4a,0x60,0x46,0x3b,0x03,0xa3,0xd2,0xea,0x00,
-0x3d,0x46,0x38,0xf2,0x2a,0x46,0x60,0x40,0x01,0x2a,0x1f,0x00,0x63,0x40,0x7f,0x26,
-0x05,0x00,0x00,0xf2,0x04,0x63,0x00,0xa8,0x60,0x46,0x2b,0x03,0x46,0x4a,0x01,0x0f,
-0x11,0x00,0xa3,0xd2,0xff,0xff,0x60,0x57,0xff,0xff,0x77,0x5f,0x60,0x47,0xa3,0xda,
-0x0c,0x00,0xe6,0x03,0x63,0x40,0x7f,0x26,0x05,0x00,0x00,0xf2,0x04,0x63,0x00,0xa8,
-0x40,0x4a,0x17,0x03,0x43,0x49,0x41,0x47,0x11,0x00,0x00,0x64,0x9c,0xfb,0x99,0xff,
-0x30,0x44,0xfd,0xb4,0x40,0x51,0x98,0xff,0x3e,0xf3,0x00,0x7c,0x02,0xbc,0x3e,0xfb,
-0x3d,0x46,0x0f,0xf2,0x44,0x47,0x60,0x40,0x04,0x26,0x0b,0x00,0xf8,0x60,0x89,0x78,
-0xff,0xff,0x3d,0x46,0x0f,0xf0,0xff,0x60,0xf7,0x65,0x64,0x43,0x17,0x60,0xe5,0x78,
-0xff,0xff,0x17,0x60,0xa6,0x78,0xff,0xff,0x18,0x60,0x17,0x78,0xff,0xff,0x4c,0x2f,
-0x7e,0x00,0x18,0x09,0x3d,0x46,0x0f,0xf0,0x3c,0xf3,0x64,0x43,0x60,0x45,0x1b,0xf2,
-0x41,0xf1,0x60,0x40,0xc0,0x23,0x01,0x64,0xc0,0x2b,0x01,0x00,0x08,0x64,0x80,0x2b,
-0x01,0x00,0x04,0x64,0x40,0x2b,0x01,0x00,0x02,0x64,0xa0,0x84,0x0f,0x22,0x2d,0x00,
-0x65,0x44,0x63,0x5c,0x80,0x2a,0x29,0x00,0x99,0xff,0x3b,0x40,0x80,0x2b,0xfd,0x00,
-0x98,0xff,0x60,0x57,0xff,0xff,0x77,0x5f,0x60,0x57,0xff,0xff,0x77,0x5f,0x99,0xff,
-0x3b,0x40,0x80,0x2b,0xfd,0x00,0x98,0xff,0x3d,0xf3,0xff,0xff,0x60,0x57,0xff,0xff,
-0x77,0x5f,0x60,0x57,0xff,0xff,0x77,0x5f,0xff,0xff,0xff,0x60,0xf7,0x65,0x0b,0x14,
-0x0a,0x14,0x09,0x14,0x08,0x14,0x07,0x14,0x06,0x14,0x05,0x14,0x04,0x14,0x03,0x14,
-0x02,0x14,0xa7,0x83,0x01,0x00,0x08,0xbb,0x0f,0xfc,0x0f,0xf0,0x80,0x60,0x00,0x63,
-0xb3,0x9c,0x0f,0xf8,0x00,0x64,0x9c,0xfb,0x99,0xff,0x30,0x44,0xfd,0xb4,0x40,0x51,
-0x98,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x20,0x60,0x00,0xea,0x00,0xeb,
-0xa0,0x60,0x00,0xeb,0x30,0x60,0x00,0xeb,0x3e,0xf3,0xff,0xff,0xf9,0xb4,0x3e,0xfb,
-0xf8,0x60,0xd7,0x78,0xff,0xff,0x00,0x64,0x9c,0xfb,0x99,0xff,0x30,0x44,0xfd,0xb4,
-0x40,0x51,0x98,0xff,0x00,0xeb,0xa0,0x60,0x00,0xeb,0x30,0x60,0x00,0xeb,0x20,0x60,
-0x00,0xea,0x00,0x64,0x3e,0xf3,0xff,0xff,0xf9,0xb4,0x3e,0xfb,0x40,0xfb,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0x99,0xff,0x3a,0x44,0x3b,0x44,0x98,0xff,0x3d,0x46,
-0x0f,0xf0,0x80,0x60,0x00,0x63,0xb3,0x83,0xff,0x60,0x7f,0x7c,0xa3,0x83,0x0f,0xfc,
-0xf8,0x60,0xd7,0x78,0xff,0xff,0xa9,0xff,0x77,0x44,0x60,0x57,0x40,0x4a,0x01,0x2a,
-0x31,0x00,0x24,0x44,0x00,0xa8,0x24,0x46,0x09,0xf2,0x2c,0x03,0x00,0xa8,0x40,0x44,
-0x13,0x03,0x60,0x46,0x60,0x5c,0x08,0x60,0x20,0x64,0xa0,0xd9,0x64,0x44,0x3a,0x44,
-0x01,0x26,0x02,0x00,0x01,0x75,0x03,0x00,0x3b,0x44,0x01,0xbc,0x40,0x5b,0x0e,0xf2,
-0xff,0xff,0x01,0xbc,0x0e,0xfa,0x0a,0xf4,0x08,0xf2,0x2d,0x45,0xd4,0x80,0x0e,0xf2,
-0x02,0x03,0xd2,0xfe,0x0f,0x00,0x02,0xbc,0x0e,0xfa,0xd0,0xfe,0x5a,0x60,0x70,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x2a,0x44,0x08,0x2a,0x1c,0x00,0x23,0x44,0x00,0xa8,0xff,0xff,
-0x18,0x03,0x3c,0x60,0x40,0x64,0x40,0x47,0x58,0x4f,0x53,0x00,0x46,0x43,0x11,0x02,
-0x0e,0xf2,0x66,0x43,0x60,0x5c,0x08,0x60,0x22,0x64,0xa0,0xdd,0x64,0x44,0x01,0xbc,
-0x0e,0xfa,0x3a,0x44,0x01,0x26,0x02,0x00,0x08,0x75,0x03,0x00,0x3b,0x44,0x08,0xbc,
-0x40,0x5b,0x2a,0x44,0x06,0x22,0x4b,0x00,0x22,0x44,0x00,0xa8,0x60,0x46,0x0e,0xf2,
-0x46,0x03,0x01,0xb0,0x02,0xbc,0x03,0x02,0x00,0x64,0x40,0x42,0x40,0x00,0x0e,0xfa,
-0xd0,0xfe,0x3c,0x60,0x46,0x64,0x40,0x47,0x58,0x4f,0x2b,0x00,0x46,0x42,0x37,0x02,
-0x22,0xf2,0x66,0x43,0x00,0xa8,0x0e,0xf2,0x12,0x02,0x01,0xbc,0x40,0x2a,0xe9,0x00,
-0xf7,0xb4,0x0e,0xfa,0xff,0xff,0x08,0x60,0x24,0x64,0xa0,0xdd,0x3a,0x44,0x01,0x26,
-0x02,0x00,0x02,0x75,0x24,0x00,0x3b,0x44,0x02,0xbc,0x40,0x5b,0x20,0x00,0x01,0xbc,
-0x80,0x2a,0xd7,0x00,0xf7,0xb4,0x0e,0xfa,0xff,0xff,0x08,0x60,0x24,0x64,0xa0,0xdd,
-0x3a,0x44,0x01,0x26,0x02,0x00,0x04,0x75,0x12,0x00,0x3b,0x44,0x04,0xbc,0x40,0x5b,
-0x0e,0x00,0x27,0x42,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,0x0e,0xf2,0x04,0x03,
-0x05,0xb0,0x09,0xf2,0xf9,0x02,0x01,0x00,0x08,0xfe,0x2f,0x58,0xff,0xff,0x2a,0x44,
-0x80,0x2a,0x1f,0x00,0x21,0x44,0x00,0xa8,0x60,0x46,0x0e,0xf2,0x1a,0x03,0x02,0xbc,
-0x0e,0xfa,0xd0,0xfe,0x3c,0x60,0x70,0x64,0x40,0x47,0x58,0x4f,0xe2,0x00,0x46,0x41,
-0x10,0x02,0x0e,0xf2,0x66,0x43,0x01,0xbc,0x0e,0xfa,0xff,0xff,0x08,0x60,0x10,0x64,
-0xa0,0xdd,0x3a,0x44,0x01,0x26,0x02,0x00,0x80,0x75,0x03,0x00,0x3b,0x44,0x80,0xbc,
-0x40,0x5b,0x34,0x40,0xff,0x26,0x3b,0xff,0x2a,0x44,0x0c,0xf7,0xff,0xff,0xff,0xff,
-0x3a,0x44,0x02,0x2a,0x09,0x00,0x3b,0x44,0x00,0xa0,0xff,0xff,0x01,0x03,0x60,0x55,
-0x00,0x64,0x40,0x5a,0x40,0x5b,0x3d,0x00,0x00,0x64,0x40,0x4a,0x35,0x40,0x01,0x2a,
-0x19,0x00,0x24,0x41,0x00,0xb9,0x40,0x55,0x2c,0x02,0x0d,0x47,0x58,0x4f,0xb1,0x00,
-0x28,0x02,0x0e,0xf2,0x46,0x44,0x01,0xbc,0x0e,0xfa,0x66,0x5c,0x08,0x60,0x20,0x64,
-0xa0,0xd9,0x3a,0x44,0x01,0x26,0x02,0x00,0x01,0x75,0x03,0x00,0x3b,0x44,0x01,0xbc,
-0x40,0x5b,0x17,0x00,0x35,0x40,0x04,0x2a,0x07,0x00,0x23,0x41,0x00,0xb9,0x40,0x55,
-0x10,0x02,0x18,0x60,0x7d,0x78,0xff,0xff,0x35,0x40,0x02,0x2a,0x07,0x00,0x22,0x41,
-0x00,0xb9,0x40,0x55,0x06,0x02,0x18,0x60,0xa5,0x78,0xff,0xff,0x35,0x40,0x08,0x26,
-0x03,0x00,0x34,0x40,0x08,0x2a,0x05,0x00,0x21,0x41,0x00,0xb9,0x40,0x55,0x40,0x54,
-0x99,0x03,0x00,0x00,0xa1,0xff,0xff,0xff,0xba,0x3f,0x19,0x60,0x68,0x61,0x27,0x42,
-0xa2,0xd3,0x0e,0x4c,0x41,0x4e,0x40,0x45,0x60,0x46,0x00,0xa8,0x09,0xf2,0x06,0x03,
-0x40,0x4b,0x1a,0x60,0x5e,0x78,0xff,0xff,0x2b,0x44,0xf5,0x00,0x0c,0x4e,0x2e,0x58,
-0xff,0xff,0x25,0x46,0x08,0xf0,0x27,0x43,0xa4,0xd5,0xbd,0xd3,0x46,0x45,0x63,0x45,
-0x64,0x43,0x60,0x41,0x00,0xa8,0x00,0x64,0xa3,0xdb,0xbe,0xdb,0x04,0x02,0x65,0x43,
-0x25,0x44,0xbf,0xdb,0x05,0x00,0x61,0x44,0x0a,0xfa,0x61,0x46,0x25,0x44,0x09,0xfa,
-0x25,0x44,0x27,0x43,0x08,0xfe,0x05,0x03,0x60,0x46,0x09,0xf2,0x08,0xfc,0x00,0xa8,
-0xfa,0x00,0x66,0x44,0xa5,0xdb,0x2e,0x58,0xff,0xff,0x28,0x41,0x58,0x4f,0x0e,0x00,
-0x2e,0x58,0xff,0xff,0x28,0x41,0x40,0xa1,0x58,0x4f,0x08,0x00,0x05,0x03,0x28,0x41,
-0x58,0x4f,0x26,0x00,0x58,0x4f,0x56,0x00,0x2e,0x58,0xff,0xff,0x9e,0xf3,0x7c,0x63,
-0x00,0xbe,0x40,0x45,0x1b,0x03,0x00,0x65,0x65,0x44,0xdc,0x85,0x84,0xa1,0x00,0xf2,
-0x06,0x06,0x01,0xfc,0x00,0xa8,0x60,0x46,0xf7,0x02,0x40,0x45,0x0f,0x00,0x33,0x44,
-0x54,0x93,0x33,0x44,0xfd,0xfb,0x80,0x60,0x7c,0x64,0x01,0xfa,0x00,0x64,0x00,0xf0,
-0x00,0xfa,0xd0,0x80,0x9e,0xf9,0x02,0x02,0x9f,0xf9,0x08,0xfe,0x2f,0x58,0xff,0xff,
-0x66,0x43,0x25,0x46,0x05,0xfc,0x06,0xfc,0x61,0x44,0x02,0xfa,0x01,0xf0,0x03,0x67,
-0xb0,0x84,0x00,0xf0,0x3c,0x7e,0x01,0xfa,0x04,0x64,0x03,0xfa,0x04,0xf8,0x00,0x64,
-0x23,0xfa,0x0c,0x61,0x10,0x63,0x59,0xda,0xfe,0x1f,0x2f,0x58,0xff,0xff,0x05,0x4c,
-0x7c,0x61,0x58,0x4f,0xc3,0x00,0x80,0x63,0x13,0x03,0x2c,0x46,0xbf,0xd0,0x25,0x46,
-0xff,0xd8,0x2c,0x46,0xfb,0x1d,0x25,0x46,0x00,0x64,0xd0,0x80,0x09,0xfa,0x0a,0xfa,
-0x05,0x03,0x64,0x46,0x01,0xf0,0x08,0x67,0xc0,0x84,0x01,0xfa,0x58,0x4f,0x02,0x00,
-0x2e,0x58,0xff,0xff,0x27,0x43,0x00,0xbb,0x25,0x46,0x12,0x03,0xbe,0xd3,0x08,0xfc,
-0x00,0xa8,0xff,0xff,0x03,0x02,0x25,0x44,0xa3,0xdb,0x04,0x00,0x0a,0xfa,0x60,0x46,
-0x25,0x44,0x09,0xfa,0xbe,0xdb,0x04,0xa3,0xa3,0xd3,0xff,0xff,0xdc,0x84,0xa3,0xdb,
-0x2f,0x58,0xff,0xff,0x07,0x4c,0x58,0x4f,0x28,0x00,0x0c,0x47,0x58,0x4f,0xe2,0x00,
-0x2e,0x58,0xff,0xff,0x07,0x4c,0x58,0x4f,0x20,0x00,0x0c,0x47,0x58,0x4f,0x5e,0x00,
-0x2e,0x58,0xff,0xff,0x07,0x4c,0x58,0x4f,0x18,0x00,0x0c,0x47,0x27,0x44,0x00,0xbe,
-0x08,0xf0,0x11,0x03,0x09,0xf2,0x25,0x43,0x09,0xfc,0x63,0x46,0x27,0x43,0x0a,0xfc,
-0x09,0xfa,0x08,0xf8,0x00,0xa8,0x66,0x43,0x03,0x02,0x64,0x44,0x58,0xdd,0x03,0x00,
-0x60,0x46,0x25,0x44,0x0a,0xfa,0x2e,0x58,0xff,0xff,0x25,0x46,0x08,0xf2,0x09,0xf0,
-0x00,0xa8,0x40,0x47,0x1d,0x03,0x0a,0xf2,0x64,0x43,0x00,0xbb,0x27,0x42,0xda,0x82,
-0x08,0x24,0xa2,0xdb,0x00,0xa8,0xca,0x82,0x02,0x02,0xa2,0xdd,0x02,0x00,0x60,0x46,
-0x09,0xfc,0x00,0xbb,0x63,0x46,0x08,0x28,0x0a,0xfa,0x25,0x46,0x00,0x64,0x09,0xfa,
-0x0a,0xfa,0x08,0xfa,0x27,0x42,0x04,0xa2,0xa2,0xd3,0xff,0xff,0xcc,0x84,0xa2,0xdb,
-0x2f,0x58,0xff,0xff,0x25,0x46,0x01,0xf2,0x00,0xf2,0xff,0xff,0x03,0x23,0x11,0x00,
-0x00,0xa8,0x60,0x46,0x0c,0x03,0x01,0xf0,0x78,0x67,0xa0,0x80,0xf8,0x67,0x07,0x03,
-0xc0,0x84,0x01,0xfa,0x25,0x46,0x00,0x64,0x00,0xfa,0x25,0x44,0x05,0xfa,0x58,0x4f,
-0xc4,0x00,0x58,0x4f,0x27,0x00,0xd1,0xfe,0x2e,0x58,0xff,0xff,0x27,0x43,0x00,0xbb,
-0x25,0x46,0x10,0x03,0xa3,0xd3,0x08,0xfc,0x00,0xa8,0x09,0xfa,0x03,0x02,0x25,0x44,
-0xbe,0xdb,0x04,0x00,0x60,0x46,0x25,0x44,0x0a,0xfa,0x25,0x46,0x00,0x64,0x0a,0xfa,
-0x25,0x44,0xa3,0xdb,0x2f,0x58,0xff,0xff,0x9f,0xf3,0x05,0xf0,0x00,0xbe,0x9f,0xf9,
-0x25,0x44,0x02,0x02,0x9e,0xfb,0x01,0x00,0x00,0xfa,0x25,0x46,0x7c,0x64,0x01,0xfa,
-0x2f,0x58,0xff,0xff,0x9f,0xf3,0x00,0x61,0x00,0xbe,0x25,0x44,0x02,0x03,0x00,0xfa,
-0x01,0x00,0x9e,0xfb,0x60,0x46,0x00,0xf2,0x66,0x43,0x00,0xbe,0xdd,0x81,0xfb,0x02,
-0x9f,0xfd,0x33,0x45,0x45,0x93,0x33,0x44,0xfd,0xfb,0x2f,0x58,0xff,0xff,0x25,0x46,
-0x05,0xf0,0x06,0xf2,0x05,0xfa,0xd0,0x80,0x64,0x43,0x0e,0x03,0x60,0x46,0x01,0xf0,
-0x80,0x67,0xb0,0x84,0x01,0xfa,0x00,0xf0,0x00,0x64,0x00,0xfa,0x64,0x46,0x05,0xfc,
-0x46,0x45,0x58,0x4f,0xd7,0x00,0xd1,0xfe,0x2e,0x58,0xff,0xff,0x00,0x66,0x46,0x45,
-0x29,0x43,0xfc,0xa3,0x66,0x44,0xbd,0xdb,0x25,0x44,0xbd,0xdb,0x00,0x64,0xbd,0xdb,
-0x03,0x61,0x1a,0x65,0x3c,0x60,0x80,0x63,0x43,0x49,0xa3,0xd3,0x06,0xa3,0x00,0xa8,
-0xcd,0x81,0x04,0x02,0xf9,0x02,0x19,0x60,0x56,0x78,0xff,0xff,0x01,0x26,0xe6,0x00,
-0xd4,0x80,0x60,0x45,0xe3,0x05,0xf6,0xa3,0xbd,0xd1,0xbd,0xd1,0x44,0x47,0x44,0x48,
-0x44,0x45,0x13,0x60,0x1a,0x64,0x44,0xd7,0xff,0xff,0xff,0xff,0x9e,0xf3,0x33,0x41,
-0x00,0xa8,0x40,0x45,0x0f,0x03,0x60,0x46,0x80,0x60,0x7c,0x64,0x01,0xfa,0x4d,0x93,
-0x33,0x44,0xfd,0xfb,0x00,0x64,0x00,0xf0,0x00,0xfa,0xd0,0x80,0x9e,0xf9,0x02,0x02,
-0x9f,0xf9,0x08,0xfe,0x2f,0x58,0xff,0xff,0xa2,0xfe,0xff,0xff,0x12,0x05,0xa0,0xfe,
-0xff,0xff,0x07,0x05,0xa3,0xfe,0xff,0xff,0x07,0x05,0xa1,0xfe,0xff,0xff,0x0a,0x04,
-0x18,0x00,0x20,0x58,0xff,0xff,0xff,0xff,0x65,0xf3,0xff,0xff,0x80,0xbc,0x65,0xfb,
-0x10,0x00,0xff,0xff,0xff,0xff,0x0a,0x00,0x99,0xff,0x30,0x44,0x50,0xbc,0x40,0x51,
-0x98,0xff,0x99,0xff,0x30,0x44,0x7d,0xb4,0x40,0x51,0x98,0xff,0xa1,0xff,0xff,0xff,
-0xbb,0x3f,0x3c,0x44,0xac,0x84,0x8b,0xf3,0xf9,0x02,0x02,0xa8,0x00,0x64,0x09,0x02,
-0x8b,0xfb,0x8c,0xfb,0x8d,0xfb,0xca,0xfe,0x00,0x64,0x8e,0xfb,0x1b,0x60,0x20,0x78,
-0xff,0xff,0x8b,0xf3,0x8c,0xf3,0x02,0xa8,0x02,0xa8,0x0a,0x02,0x00,0x64,0x8d,0xfb,
-0x8b,0xfb,0x8c,0xfb,0x00,0x64,0x8e,0xfb,0xca,0xfe,0x1b,0x60,0xd8,0x78,0xff,0xff,
-0x8d,0xf1,0x00,0x64,0x64,0x41,0x02,0x02,0x8c,0xfb,0xca,0xfe,0x61,0x44,0x01,0xa8,
-0xff,0xff,0x09,0x02,0x3c,0x60,0x76,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,
-0x14,0x02,0xfe,0xb4,0x8d,0xfb,0x95,0xf3,0xff,0xff,0x60,0x40,0x01,0x26,0x10,0x00,
-0x8c,0xf3,0x8e,0xf3,0x01,0xa8,0x02,0xb0,0x01,0x02,0x0a,0x03,0x3c,0x60,0x2e,0x62,
-0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,0x67,0x03,0x1b,0x60,0xef,0x78,0xff,0xff,
-0x3c,0x60,0x2e,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,0x74,0x02,0xcb,0xf3,
-0xff,0xff,0xfd,0xa0,0x6d,0xf3,0x44,0x02,0x02,0xb0,0x67,0xf1,0x06,0x02,0x64,0x43,
-0x00,0xbb,0xff,0xff,0x02,0x03,0x63,0x44,0x08,0x00,0xfd,0xb4,0x6d,0xfb,0x3c,0x60,
-0x28,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,0x00,0xbc,0x67,0xfb,0x44,0x03,
-0x60,0x46,0x2b,0xf2,0xff,0xff,0x01,0xb0,0x6d,0xf3,0x04,0x03,0x01,0xb0,0xff,0xff,
-0x19,0x02,0x16,0x00,0xfe,0xb4,0x6d,0xfb,0x69,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,
-0x0f,0x03,0x19,0xf2,0xff,0xff,0x00,0xbc,0xff,0xff,0x0c,0x03,0xa0,0xd3,0xff,0xff,
-0x02,0xb0,0xff,0xff,0x07,0x03,0x69,0x60,0x58,0x4e,0x9b,0x78,0xff,0xff,0x02,0x03,
-0x09,0xf2,0xdb,0x00,0x0d,0xf2,0xff,0xff,0x00,0x7f,0x0d,0xfa,0x09,0xf2,0x67,0xfb,
-0x00,0xbc,0xff,0xff,0x30,0x02,0x6d,0xf3,0xff,0xff,0xfe,0xb4,0x6d,0xfb,0x2b,0x00,
-0x3c,0x60,0x28,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,0x0d,0x03,0x13,0xf3,
-0x95,0xf3,0x00,0xa8,0x00,0xa0,0x1f,0x03,0x1e,0x03,0x22,0xf0,0x10,0x64,0xb0,0x84,
-0xa2,0xda,0x1e,0x60,0xc5,0x78,0xff,0xff,0x00,0x64,0x40,0x5c,0x65,0xf3,0xff,0xff,
-0xcb,0xf1,0x80,0x2a,0x0d,0x00,0x7f,0xb4,0x65,0xfb,0x64,0x40,0x04,0x3a,0x08,0x00,
-0x29,0x44,0x2a,0x37,0x05,0x00,0x74,0xf3,0xff,0xff,0x04,0xbc,0x74,0xfb,0xc9,0xfe,
-0x1b,0x60,0x20,0x78,0xff,0xff,0x65,0xf3,0xff,0xff,0xff,0xff,0x80,0x26,0x13,0x00,
-0x02,0x26,0x0f,0x00,0x68,0x60,0xcc,0x62,0x90,0x60,0x62,0x64,0xa2,0xdb,0x3c,0x60,
-0x9a,0x62,0x08,0x64,0xa2,0xdb,0x00,0x64,0x5a,0xdb,0x2d,0xff,0x1b,0x60,0x2a,0x78,
-0xff,0xff,0x80,0xbc,0x65,0xfb,0xcb,0xf3,0x0e,0xf0,0xfc,0xa0,0xfd,0xa0,0x01,0x03,
-0x17,0x02,0x60,0x41,0x02,0x65,0x64,0x44,0x40,0x49,0x2a,0x37,0x11,0x00,0x18,0x37,
-0x0f,0x00,0xff,0x37,0x02,0x00,0xfd,0x3b,0x06,0x00,0x61,0x44,0xfd,0xa0,0x01,0x65,
-0x02,0x03,0x00,0x64,0x66,0xfb,0x74,0xf3,0xff,0xff,0xb4,0x84,0x74,0xfb,0xc9,0xfe,
-0x29,0xf2,0x66,0xf1,0x60,0x40,0xb0,0x36,0x06,0x00,0x00,0x36,0x04,0x00,0x20,0x36,
-0x02,0x00,0xb0,0x84,0x29,0xfa,0xf7,0x60,0x0d,0x78,0xff,0xff,0x1a,0xee,0x7f,0x00,
-0x86,0x02,0x67,0x60,0x4e,0x62,0x00,0x64,0xa2,0xdb,0x29,0xf0,0xff,0xff,0x64,0x40,
-0x40,0x27,0x03,0x00,0x1c,0x60,0x32,0x78,0xff,0xff,0x3e,0xf3,0xff,0xff,0xff,0xff,
-0x04,0x2a,0x19,0x00,0x46,0x5c,0x67,0x60,0x58,0x62,0x01,0x64,0xa2,0xdb,0xf7,0x60,
-0x2e,0x64,0x40,0x44,0x99,0xff,0x30,0x44,0x41,0xbc,0x40,0x51,0x98,0xff,0xa1,0xff,
-0xff,0xff,0xbb,0x3f,0x99,0xff,0x30,0x44,0xfe,0xb4,0x40,0x51,0x98,0xff,0x67,0x60,
-0x58,0x62,0x00,0x64,0xa2,0xdb,0x42,0xf3,0x00,0x65,0x60,0x41,0xd6,0xf3,0x95,0xf3,
-0x00,0xa0,0x00,0xa0,0x09,0x03,0x23,0xf2,0x04,0x03,0x60,0x45,0x00,0x7f,0x60,0x41,
-0x03,0x00,0xff,0xff,0xff,0x36,0x03,0x61,0x44,0xf1,0x98,0xff,0x64,0x40,0x08,0x26,
-0x02,0x00,0x00,0x64,0x14,0x00,0x07,0xf2,0xff,0xff,0x00,0xa0,0xff,0xff,0x06,0x03,
-0x1a,0xf2,0x38,0xfb,0xff,0xff,0x1b,0xf2,0x39,0xfb,0x15,0x00,0x38,0xf3,0x39,0xf1,
-0xdc,0x84,0x38,0xfb,0x1a,0xfa,0x64,0x44,0x02,0x24,0xdc,0x84,0xff,0xb4,0x60,0x5c,
-0x02,0xfe,0x61,0x44,0x03,0xb4,0xf8,0x84,0xf8,0x84,0xf8,0x84,0xb0,0x84,0x39,0xfb,
-0x1b,0xfa,0x01,0x64,0x07,0xfa,0x61,0x5c,0x41,0xf3,0x64,0x40,0x03,0x26,0x06,0x00,
-0x60,0x40,0x01,0x2a,0x15,0x00,0x67,0x60,0x90,0x63,0x30,0x00,0x64,0x40,0x03,0x2a,
-0x06,0x00,0x60,0x40,0x08,0x2a,0x0c,0x00,0x67,0x60,0xba,0x63,0x27,0x00,0x64,0x40,
-0x01,0x2a,0x0e,0x00,0x60,0x40,0x02,0x2a,0x03,0x00,0x67,0x60,0x9e,0x63,0x1e,0x00,
-0x46,0x5c,0x22,0xf0,0x04,0x64,0xb0,0x84,0xa2,0xda,0x1e,0x60,0xc5,0x78,0xff,0xff,
-0x60,0x40,0x04,0x2a,0xf5,0x00,0x65,0x47,0x00,0x36,0x0e,0x00,0x00,0x7f,0xe0,0x84,
-0x60,0x45,0xe0,0x84,0xe0,0x81,0xc4,0x85,0xc5,0x85,0x3d,0x60,0x4e,0x64,0xc4,0x83,
-0x02,0x61,0x67,0x44,0xda,0xfb,0x02,0x00,0x67,0x60,0xac,0x63,0x00,0x60,0x00,0xea,
-0xff,0xff,0xff,0xff,0x00,0x60,0x00,0xeb,0xff,0xff,0xff,0xff,0x38,0xf1,0xe0,0x7f,
-0x64,0x5e,0x99,0xff,0x40,0x5a,0x64,0x47,0xe1,0x7f,0x40,0x5a,0x39,0xf3,0xff,0xff,
-0xe2,0x7f,0x40,0x5a,0x61,0x5c,0xda,0xf3,0xda,0xf9,0xd0,0x80,0xbd,0xd3,0x30,0x03,
-0x60,0x45,0xe3,0x7f,0x40,0x5a,0x65,0x47,0xe4,0x7f,0xbd,0xd3,0x40,0x5a,0x60,0x45,
-0xe5,0x7f,0x40,0x5a,0x65,0x47,0xe6,0x7f,0xbd,0xd3,0x40,0x5a,0x60,0x45,0x45,0xf1,
-0xe7,0x7f,0x40,0x5a,0x64,0x40,0x0f,0x3a,0x61,0x00,0x65,0x47,0xe8,0x7f,0xbd,0xd3,
-0x40,0x5a,0x60,0x45,0xe9,0x7f,0x40,0x5a,0x65,0x47,0xea,0x7f,0xbd,0xd3,0x40,0x5a,
-0x60,0x45,0xeb,0x7f,0x40,0x5a,0x65,0x47,0xec,0x7f,0xbd,0xd3,0x40,0x5a,0x60,0x45,
-0xed,0x7f,0x40,0x5a,0x65,0x47,0xee,0x7f,0xbd,0xd3,0x40,0x5a,0xef,0x7f,0x40,0x5a,
-0x20,0x60,0x00,0xeb,0x67,0x60,0xc8,0x62,0xa2,0xd3,0xff,0xff,0xff,0xff,0x01,0x2a,
-0x3d,0x00,0x00,0x64,0xa2,0xdb,0x00,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0xff,0xff,
-0x3a,0x5c,0x80,0x2b,0x12,0x00,0x8b,0xff,0x74,0x40,0x88,0xff,0x3a,0x5c,0x80,0x2b,
-0x09,0x00,0x8b,0xff,0x74,0x40,0x88,0xff,0x3a,0x5c,0x80,0x2b,0x03,0x00,0x8b,0xff,
-0x74,0x40,0x88,0xff,0x8b,0xff,0x74,0x40,0x88,0xff,0x3a,0x5c,0x80,0x2b,0xff,0xff,
-0x31,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0x00,0x60,0x00,0xea,0x3a,0x5c,0x80,0x27,
-0x09,0x00,0x31,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0x00,0x60,0x00,0xea,0x3a,0x5c,
-0x80,0x2b,0xf7,0x00,0x00,0x64,0xdb,0xfb,0x67,0x60,0xcc,0x64,0x3a,0x5c,0xa0,0xd9,
-0xff,0xff,0x30,0x60,0x00,0xea,0xff,0xff,0xff,0xff,0xff,0xff,0x3a,0x40,0x40,0x27,
-0xfd,0x00,0x67,0x60,0x5c,0x62,0x00,0x64,0xa2,0xdb,0x45,0xf1,0x80,0x60,0x00,0x64,
-0xb0,0x84,0x40,0x5a,0x98,0xff,0x33,0x60,0x00,0xea,0x3f,0xf3,0xff,0xff,0x01,0xbc,
-0x3f,0xfb,0x1c,0x60,0x32,0x78,0xff,0xff,0x64,0x38,0x7e,0x00,0xe8,0x06,0x19,0xf2,
-0xff,0xff,0x00,0xb8,0x1d,0xf2,0x06,0x03,0x60,0x47,0x00,0x7f,0x53,0xfb,0x51,0xfb,
-0x60,0x5c,0x07,0x00,0x50,0xf3,0x51,0xf1,0xff,0xff,0x52,0xfb,0x53,0xf9,0x00,0x64,
-0x54,0xfb,0x95,0xf3,0xff,0xff,0x00,0xbc,0xff,0xff,0x06,0x02,0x29,0xf2,0xff,0xff,
-0x0c,0xb4,0xff,0xff,0x00,0x3a,0x02,0x00,0x13,0xf0,0x53,0xf9,0x64,0x44,0x00,0xa0,
-0x01,0x63,0x04,0x03,0xff,0xa0,0x02,0x63,0x01,0x03,0x0b,0x63,0x55,0xfd,0x46,0x5c,
-0x22,0xf2,0xff,0xff,0x60,0x40,0x10,0x26,0x40,0x00,0x21,0xf2,0x16,0xf2,0x60,0x45,
-0x45,0x4c,0xc4,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,0x21,0xfa,0x17,0xf0,0x2c,0x44,
-0xc0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,0x1f,0xfa,0x95,0xf3,0x29,0xf0,0x00,0xbc,
-0x00,0x64,0x03,0x02,0x64,0x40,0x80,0x3a,0x01,0xbc,0x4f,0xfb,0x95,0xf3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0x06,0x03,0x27,0xf2,0xff,0xff,0x00,0xa0,0xff,0xff,0x19,0x03,
-0x1c,0x00,0xa6,0xf3,0x56,0x63,0x02,0xa8,0x29,0xf2,0x13,0x03,0x29,0xf0,0x60,0x47,
-0x64,0x40,0x08,0x2a,0x0e,0x00,0x03,0xa8,0x03,0x2e,0x0b,0x00,0x03,0xb0,0x03,0x22,
-0x62,0x63,0x81,0xf1,0xbd,0xd8,0xff,0xff,0x82,0xf1,0xbd,0xd8,0xff,0xff,0x83,0xf1,
-0xa3,0xd8,0x4c,0xf3,0x34,0xfa,0x10,0xa4,0x4c,0xfb,0x29,0xf2,0xcb,0xf3,0x60,0x40,
-0x08,0x3a,0x76,0x00,0xfd,0xa0,0xfc,0xa0,0x05,0x03,0x95,0xf3,0x03,0x03,0x60,0x40,
-0x00,0x36,0x6e,0x00,0x14,0xf2,0x21,0xf0,0xcc,0x84,0x60,0x41,0x04,0x03,0x00,0x64,
-0xcd,0x81,0xc0,0x84,0xfd,0x02,0x1f,0xf0,0x53,0xf1,0xc0,0x84,0x55,0xf1,0x64,0x41,
-0x02,0x36,0xe0,0x84,0x64,0x45,0x00,0x62,0x11,0x61,0xe0,0x84,0xcd,0x81,0xfd,0x04,
-0x01,0x00,0xe0,0x84,0xf2,0x82,0xff,0xff,0x02,0x24,0xc6,0x82,0x02,0x28,0xd6,0x82,
-0xe2,0x80,0xcd,0x81,0x02,0x28,0x01,0xbc,0xf4,0x02,0x01,0x2a,0xc6,0x82,0x14,0xf0,
-0x60,0x43,0x00,0x60,0xaf,0x65,0x00,0x64,0x64,0x41,0xcd,0x81,0xc4,0x84,0xfd,0x02,
-0x63,0x45,0xc4,0x84,0x40,0x48,0x60,0x45,0x68,0x60,0xcc,0x62,0x80,0x60,0x10,0x64,
-0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x28,0x44,0x70,0x45,0xc4,0x85,
-0x02,0x60,0x58,0x64,0xc4,0x84,0xa4,0xf1,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,
-0xe8,0x84,0xe8,0x84,0xc0,0x84,0x60,0x41,0x73,0x45,0xd4,0x80,0xe1,0xf1,0x0d,0x0d,
-0x64,0x44,0x00,0x36,0x38,0x00,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,0x61,0x45,
-0xc4,0x84,0x73,0x45,0xd4,0x80,0xff,0xff,0x2e,0x0e,0x68,0x60,0xcc,0x62,0x80,0x60,
-0x20,0x64,0xa2,0xdb,0xcb,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x0a,0x02,0x00,0x64,
-0x40,0x5c,0x22,0xf0,0x10,0x64,0xb0,0x84,0xa2,0xda,0x1b,0x60,0x20,0x78,0xff,0xff,
-0x26,0x00,0xe2,0xf3,0x28,0x45,0x60,0x40,0x00,0x3a,0x15,0x00,0x07,0x60,0xd0,0x64,
-0xc4,0x84,0x70,0x45,0xd4,0x80,0xff,0xff,0x0e,0x04,0x60,0x50,0x60,0x45,0x68,0x60,
-0xcc,0x62,0x80,0x60,0x30,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,
-0x01,0x64,0xe4,0xfb,0x0c,0x00,0x28,0x44,0x68,0xfb,0x60,0x45,0x68,0x60,0xcc,0x62,
-0x80,0x60,0x10,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x67,0x60,
-0x4e,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0x00,0x64,0x08,0x03,0xa2,0xdb,0x67,0x60,
-0x5a,0x62,0xa2,0xd1,0x1e,0x60,0x9a,0x62,0xa2,0xd9,0x2a,0x00,0x1e,0x60,0x98,0x64,
-0xa0,0xd1,0x95,0xf3,0x64,0x41,0x00,0xa0,0x29,0xf2,0x0b,0x02,0x60,0x40,0x80,0x3a,
-0x08,0x00,0x71,0xf3,0xdd,0x81,0xf6,0xa0,0xec,0xa0,0x03,0x04,0xdd,0x81,0x01,0x04,
-0xdd,0x81,0x25,0xf2,0xff,0xff,0x60,0x47,0x60,0x43,0xff,0xb3,0x61,0x40,0xff,0x22,
-0x04,0x00,0x23,0x60,0x58,0x4f,0x4a,0x78,0xff,0xff,0x1e,0x60,0x9a,0x64,0xa0,0xdd,
-0xb8,0xf1,0x23,0x60,0x58,0x4f,0x49,0x78,0xff,0xff,0x1e,0x60,0x9c,0x64,0xa0,0xdd,
-0x29,0xf2,0xff,0xff,0x60,0x45,0x68,0x60,0xcc,0x62,0x90,0x60,0x60,0x64,0xa2,0xdb,
-0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x22,0xf0,0xff,0x60,0xef,0x64,0xa0,0x84,
-0xa2,0xda,0x8e,0xf3,0x46,0x5c,0xfd,0xb4,0x01,0xbc,0x8e,0xfb,0x66,0x44,0xe0,0xfb,
-0x20,0x60,0x19,0x78,0xff,0xff,0x00,0x64,0x68,0xfb,0xe0,0xfb,0x68,0x60,0xcc,0x62,
-0x90,0x60,0x61,0x64,0xa2,0xdb,0x46,0x5c,0x8e,0xf3,0x3c,0x46,0x4e,0xf1,0xfe,0xb4,
-0x8e,0xfb,0x01,0x65,0x32,0x40,0x04,0x2b,0x64,0x45,0x02,0x22,0x03,0x00,0x1e,0x60,
-0xed,0x78,0xff,0xff,0x65,0x40,0x01,0x26,0x09,0x00,0x5a,0x60,0x5a,0x64,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1e,0x60,0xc5,0x78,0xff,0xff,0x27,0xf0,0x01,0x60,
-0x00,0x64,0xc0,0x84,0x27,0xfa,0x29,0xf0,0x00,0x60,0x0c,0x64,0xa0,0x84,0x04,0x36,
-0x02,0x00,0x0c,0x3a,0x03,0x00,0x1e,0x60,0xc5,0x78,0xff,0xff,0x60,0x41,0x61,0x40,
-0x08,0x36,0x67,0x00,0x29,0xf0,0x00,0x60,0xf0,0x64,0xa0,0x84,0xff,0xff,0x00,0x3a,
-0x07,0x00,0x5a,0x60,0x1e,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x56,0x00,
-0x20,0x3a,0x07,0x00,0x5a,0x60,0x1e,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x4d,0x00,0x40,0x3a,0x07,0x00,0x5a,0x60,0x26,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x44,0x00,0xb0,0x3a,0x07,0x00,0x5a,0x60,0x1c,0x64,0xa0,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x3b,0x00,0x80,0x3a,0x16,0x00,0x68,0x60,0xcc,0x62,0x90,0x60,
-0x31,0x64,0xa2,0xdb,0x71,0xf3,0xff,0xff,0xdc,0x84,0x71,0xfb,0x80,0xf3,0xff,0xff,
-0xfd,0xa4,0x60,0x47,0x01,0xbc,0x6e,0xfb,0x5a,0x60,0x14,0x64,0xa0,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x23,0x00,0xa0,0x3a,0x07,0x00,0x5a,0x60,0x24,0x64,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1a,0x00,0x50,0x3a,0x07,0x00,0x5a,0x60,0x2a,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x11,0x00,0x10,0x3a,0x07,0x00,0x5a,0x60,
-0x20,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x08,0x00,0x30,0x3a,0x06,0x00,
-0x5a,0x60,0x20,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1e,0x60,0xc5,0x78,
-0xff,0xff,0x19,0xf2,0x0e,0x65,0x00,0xbc,0xc4,0x83,0x14,0x03,0xa3,0xd3,0xff,0xff,
-0x60,0x40,0x14,0x3a,0xdc,0x84,0xa3,0xdb,0x14,0x3a,0x0c,0x00,0x60,0x47,0x00,0x7f,
-0xfd,0xa0,0xff,0xff,0x07,0x07,0x19,0xf0,0x1f,0x60,0x58,0x4e,0xd5,0x78,0xff,0xff,
-0x00,0x64,0xa3,0xdb,0x14,0xf2,0x28,0xf2,0x60,0x41,0x60,0x45,0x1e,0x63,0x60,0x47,
-0x18,0x63,0x04,0xa3,0x63,0x45,0x00,0x63,0xcd,0x81,0xc7,0x83,0xfd,0x02,0x38,0xf0,
-0xff,0xff,0xc3,0x83,0x2b,0xf2,0xff,0xff,0xff,0xff,0x01,0x2a,0x31,0x00,0x3d,0x60,
-0x1c,0x64,0xa0,0xd3,0xff,0xff,0x01,0xbc,0xa2,0xdb,0x5a,0x60,0x00,0x64,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x51,0xf3,0xff,0xff,0xe0,0x84,0xe0,0x84,0x60,0x45,0x5a,0x60,0x04,0x64,
-0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x5a,0x60,0x42,0x64,0xa0,0xd3,0x63,0x45,0xc4,0x84,
-0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x32,0x00,
-0x59,0x60,0xec,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,
-0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x53,0xf3,0xff,0xff,0xe0,0x84,0xe0,0x84,
-0x60,0x45,0x59,0x60,0xf0,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x18,0x60,0xbc,0x65,
-0x53,0xf3,0xff,0xff,0xe0,0x84,0xc4,0x82,0x00,0x64,0xa2,0xdb,0x5a,0x60,0x42,0x64,
-0xa0,0xd3,0x63,0x45,0xc4,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0xcb,0xf3,0x3c,0x46,0xfd,0xa0,0xfc,0xa0,0x01,0x03,0x13,0x00,
-0x22,0xf2,0xff,0xff,0x60,0x40,0x10,0x2a,0x0e,0x00,0x8c,0xf1,0x00,0x64,0x40,0x5c,
-0x13,0xfb,0xe0,0xfb,0x64,0x40,0x02,0x36,0x03,0x00,0x1b,0x60,0x20,0x78,0xff,0xff,
-0x1b,0x60,0x2d,0x78,0xff,0xff,0x3c,0x60,0x7c,0x62,0x3c,0x60,0x4c,0x64,0xa2,0xdb,
-0x3c,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xce,0xfe,0x1b,0x60,
-0x3d,0x78,0xff,0xff,0x67,0x60,0x4e,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,
-0x03,0x03,0x1f,0x60,0xa1,0x78,0xff,0xff,0x0f,0xf0,0xb7,0xf1,0x64,0x41,0x01,0x2a,
-0xb6,0xf1,0x95,0xf3,0xff,0xff,0x60,0x40,0xff,0x26,0x1d,0xf0,0x26,0xf2,0xff,0xff,
-0xdc,0x84,0x26,0xfa,0x15,0xf2,0xff,0xff,0xdc,0x84,0xd0,0x80,0x15,0xfa,0x03,0x04,
-0x1f,0x60,0xa6,0x78,0xff,0xff,0x13,0xf3,0xff,0xff,0x00,0xa8,0xff,0xff,0x05,0x03,
-0x22,0xf0,0x10,0x64,0xb0,0x84,0xa2,0xda,0xad,0x00,0x95,0xf3,0xff,0xff,0x00,0xbc,
-0x29,0xf2,0x02,0x02,0x0c,0xb4,0x00,0x36,0x7d,0x00,0x19,0xf2,0xff,0xff,0x00,0xbc,
-0x0e,0xa4,0x4f,0x03,0x60,0x43,0xa3,0xd1,0x01,0x60,0x01,0x64,0xc0,0x84,0xa3,0xdb,
-0x60,0x45,0x00,0x7f,0xec,0xa0,0xff,0xff,0x0c,0x04,0x65,0x47,0x00,0x7f,0xf9,0xa0,
-0xff,0xff,0x05,0x04,0x19,0xf0,0x1f,0x60,0x58,0x4e,0xbe,0x78,0xff,0xff,0x00,0x64,
-0xa3,0xdb,0x0d,0xf2,0xff,0xff,0x01,0xa4,0x0d,0xfa,0x00,0x7f,0xfe,0xa0,0xff,0xff,
-0x15,0x04,0x1f,0x60,0x58,0x4e,0xec,0x78,0xff,0xff,0x1d,0xf2,0xff,0xff,0x00,0x7e,
-0x60,0x47,0x53,0xfb,0x0b,0x63,0x60,0x40,0x00,0x36,0x01,0x63,0x60,0x40,0x01,0x36,
-0x02,0x63,0x55,0xfd,0x0d,0xf2,0xff,0xff,0x00,0x7e,0x0d,0xfa,0x0d,0xf2,0xff,0xff,
-0x60,0x47,0x01,0xa4,0x60,0x47,0x0d,0xfa,0x60,0x47,0x00,0x7f,0xfd,0xa0,0xff,0xff,
-0x39,0x04,0x69,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0x04,0x03,0x69,0x60,0x58,0x4e,
-0xcc,0x78,0xff,0xff,0x22,0xf0,0x10,0x64,0xb0,0x84,0xa2,0xda,0x1e,0x60,0xc5,0x78,
-0xff,0xff,0x54,0xf3,0xff,0xff,0xdc,0x84,0xfe,0xa0,0x54,0xfb,0x23,0x04,0x00,0x64,
-0x54,0xfb,0x53,0xf3,0x52,0xf3,0x60,0x41,0xff,0xa0,0xe8,0x84,0x1b,0x03,0xff,0xa1,
-0x60,0x45,0x59,0x60,0x6a,0x63,0xa3,0xd3,0xff,0xff,0xa4,0x80,0x65,0x44,0xf4,0x03,
-0x52,0xfb,0x61,0x43,0x53,0xfd,0x63,0x44,0x00,0x3a,0x02,0x00,0x01,0x63,0x09,0x00,
-0x01,0x3a,0x02,0x00,0x02,0x63,0x05,0x00,0x02,0x3a,0x02,0x00,0x0b,0x63,0x01,0x00,
-0x0b,0x63,0x55,0xfd,0x29,0xf0,0x08,0x67,0xb0,0x84,0xa2,0xda,0x00,0x64,0x4f,0xfb,
-0xf8,0x60,0x50,0x78,0xff,0xff,0xa0,0xf0,0x7f,0x00,0x72,0x00,0x29,0xf0,0xff,0xff,
-0x64,0x40,0x40,0x2b,0x31,0x00,0x3e,0xf3,0xff,0xff,0x60,0x40,0x04,0x2a,0x18,0x00,
-0x67,0x60,0x58,0x62,0x01,0x64,0xa2,0xdb,0xf8,0x60,0x69,0x64,0x40,0x44,0x99,0xff,
-0x30,0x44,0x41,0xbc,0x40,0x51,0x98,0xff,0xa1,0xff,0xff,0xff,0xbb,0x3f,0x99,0xff,
-0x30,0x44,0xfe,0xb4,0x40,0x51,0x98,0xff,0x67,0x60,0x58,0x62,0x00,0x64,0xa2,0xdb,
-0x99,0xff,0x3a,0x44,0x98,0xff,0x8f,0x2b,0x0f,0x00,0x50,0x27,0x0d,0x00,0x67,0x60,
-0x5c,0x62,0x00,0x64,0xa2,0xdb,0x45,0xf1,0x80,0x60,0x00,0x64,0xb0,0x84,0x99,0xff,
-0x40,0x5a,0x98,0xff,0x33,0x60,0x00,0xea,0x1c,0x60,0xa0,0x78,0xff,0xff,0x4c,0x3f,
-0x7e,0x00,0xa8,0x07,0x29,0xf2,0xff,0xff,0x60,0x40,0x08,0x3a,0x06,0x00,0x5a,0x60,
-0x5a,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1e,0x60,0x98,0x65,0xb8,0xf3,
-0xff,0xff,0xa5,0xdb,0x22,0xf0,0x01,0x64,0xb0,0x84,0xa2,0xda,0x1e,0x60,0xc5,0x78,
-0xff,0xff,0xff,0x00,0x64,0x44,0x08,0xa4,0xa0,0xd3,0xff,0xff,0x60,0x41,0x60,0x47,
-0x00,0x7f,0x60,0x45,0x61,0x44,0x00,0x7f,0xe8,0x84,0xa4,0x80,0x00,0xa0,0x02,0x02,
-0x06,0x03,0xfa,0x00,0x60,0x41,0x65,0x47,0x61,0x45,0xb4,0x84,0xa2,0xdb,0x2e,0x58,
-0xff,0xff,0x64,0x44,0x08,0xa4,0xa0,0xd3,0xff,0xff,0x60,0x41,0x60,0x47,0x00,0x7f,
-0x60,0x45,0x61,0x44,0x00,0x7f,0xe0,0x84,0xa4,0x80,0xf0,0xa0,0x02,0x02,0x06,0x03,
-0xfa,0x00,0x60,0x41,0x65,0x47,0x61,0x45,0xb4,0x84,0xa2,0xdb,0x2e,0x58,0xff,0xff,
-0x19,0xf2,0xff,0xff,0x08,0xa4,0xa0,0xd3,0xff,0xff,0x60,0x47,0x00,0x7f,0x60,0x45,
-0x1d,0xf2,0xff,0xff,0x40,0x4d,0x60,0x47,0x00,0x7f,0x60,0x41,0x2d,0x44,0x00,0x7f,
-0xcd,0x81,0xe8,0x84,0x07,0x0e,0xa4,0x80,0xff,0xff,0xfa,0x03,0x60,0x45,0x61,0x47,
-0xb4,0x84,0x1d,0xfa,0x2e,0x58,0xff,0xff,0x22,0x60,0x6b,0x78,0xff,0xff,0x99,0xff,
-0x30,0x44,0xff,0xff,0x98,0xff,0x80,0x2a,0x03,0x00,0x47,0xff,0x21,0x58,0xff,0xff,
-0x47,0xff,0xa1,0xff,0xff,0xff,0xbb,0x3f,0xff,0xff,0x99,0xff,0x32,0x44,0x98,0xff,
-0x10,0x26,0x57,0x00,0x64,0xe2,0x45,0xff,0x47,0xff,0x53,0x0a,0x99,0xff,0x32,0x44,
-0x98,0xff,0x10,0x26,0x4e,0x00,0x04,0x27,0x04,0x00,0xb5,0xf3,0xff,0xff,0x60,0x54,
-0xcd,0xe2,0x20,0x60,0x3a,0x64,0x40,0x42,0xc4,0xe2,0x99,0xff,0x30,0x44,0x04,0xbc,
-0x1d,0xb4,0x40,0x51,0x98,0xff,0xa1,0xff,0xff,0xff,0xbb,0x3f,0x99,0xff,0x32,0x44,
-0x98,0xff,0x10,0x26,0x36,0x00,0x64,0xe2,0x45,0xff,0x47,0xff,0x32,0x0a,0x99,0xff,
-0x32,0x44,0x98,0xff,0x10,0x26,0x2d,0x00,0xd0,0xf3,0x4f,0xf3,0x00,0xa0,0xff,0xff,
-0xea,0x02,0x01,0x3a,0x63,0x00,0x99,0xff,0x3e,0x44,0xfc,0xb4,0x40,0x5e,0x02,0xbc,
-0xff,0xff,0xff,0xff,0x40,0x5e,0x98,0xff,0x20,0x60,0x64,0x64,0x40,0x42,0x99,0xff,
-0x30,0x44,0x44,0xbc,0x5d,0xb4,0x40,0x51,0x98,0xff,0xa1,0xff,0xff,0xff,0xbb,0x3f,
-0x99,0xff,0x32,0x44,0x98,0xff,0x10,0x26,0x0c,0x00,0x64,0xe2,0x45,0xff,0x47,0xff,
-0x08,0x0a,0x99,0xff,0x32,0x44,0x98,0xff,0x10,0x26,0x03,0x00,0x21,0x60,0x3b,0x78,
-0xff,0xff,0x20,0x60,0x84,0x64,0x40,0x40,0x20,0x60,0xb2,0x64,0x40,0x41,0x99,0xff,
-0x30,0x44,0xe0,0xbc,0xf9,0xb4,0x40,0x51,0x98,0xff,0xa1,0xff,0xff,0xff,0xbb,0x3f,
-0x28,0x60,0x60,0x62,0xa2,0xd3,0x13,0xf3,0x00,0xa0,0x00,0xa0,0x13,0x03,0x67,0x60,
-0xc8,0x62,0x01,0x64,0xa2,0xdb,0x22,0xf0,0x01,0x64,0xb0,0x84,0xa2,0xda,0x99,0xff,
-0x30,0x44,0x59,0xb4,0x40,0x51,0x98,0xff,0x1b,0x60,0x20,0x64,0x40,0x40,0x1e,0x60,
-0xc5,0x78,0xff,0xff,0x13,0x03,0x67,0x60,0xc8,0x62,0x01,0x64,0xa2,0xdb,0x22,0xf0,
-0x10,0x64,0xb0,0x84,0xa2,0xda,0x99,0xff,0x30,0x44,0x59,0xb4,0x40,0x51,0x98,0xff,
-0x1b,0x60,0x20,0x64,0x40,0x40,0x1e,0x60,0xc5,0x78,0xff,0xff,0x21,0x60,0x1d,0x64,
-0x40,0x40,0x20,0x60,0xe2,0x64,0x40,0x42,0x99,0xff,0x30,0x44,0x44,0xbc,0x5d,0xb4,
-0x40,0x51,0x98,0xff,0x99,0xff,0x32,0x44,0x98,0xff,0x10,0x26,0xb2,0x00,0xd0,0xf3,
-0x64,0xe2,0x00,0xa0,0x45,0xff,0x47,0xff,0x16,0x02,0xab,0x0a,0x99,0xff,0x32,0x44,
-0x98,0xff,0x10,0x26,0xa6,0x00,0x1e,0x60,0x9a,0x65,0xa5,0xd3,0xff,0xff,0x01,0xa8,
-0xff,0xff,0x09,0x02,0x99,0xff,0x3e,0x44,0xfc,0xb4,0x40,0x5e,0x02,0xbc,0xff,0xff,
-0xff,0xff,0x40,0x5e,0x98,0xff,0xa1,0xff,0xff,0xff,0xbb,0x3f,0xd0,0xf3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0xf8,0x02,0x99,0xff,0x32,0x44,0x98,0xff,0x10,0x26,0x89,0x00,
-0x64,0xe2,0x45,0xff,0x47,0xff,0x29,0x0a,0x99,0xff,0x32,0x44,0x98,0xff,0x10,0x26,
-0x24,0x00,0x13,0xf3,0xff,0xff,0x00,0xa8,0xff,0xff,0x13,0x03,0x67,0x60,0xc8,0x62,
-0x01,0x64,0xa2,0xdb,0x22,0xf0,0x10,0x64,0xb0,0x84,0xa2,0xda,0x99,0xff,0x30,0x44,
-0x59,0xb4,0x40,0x51,0x98,0xff,0x1b,0x60,0x20,0x64,0x40,0x40,0x1e,0x60,0xc5,0x78,
-0xff,0xff,0x1e,0x60,0x9a,0x65,0xa5,0xd3,0xff,0xff,0x00,0xa8,0xcc,0x84,0x27,0x03,
-0xa5,0xdb,0x25,0x03,0x20,0x60,0xcf,0x78,0xff,0xff,0x20,0x60,0x75,0x78,0xff,0xff,
-0x1e,0x00,0x28,0x60,0x60,0x62,0xa2,0xd3,0x13,0xf3,0x00,0xa0,0x00,0xa0,0x13,0x03,
-0x67,0x60,0xc8,0x62,0x01,0x64,0xa2,0xdb,0x22,0xf0,0x01,0x64,0xb0,0x84,0xa2,0xda,
-0x99,0xff,0x30,0x44,0x59,0xb4,0x40,0x51,0x98,0xff,0x1b,0x60,0x20,0x64,0x40,0x40,
-0x1e,0x60,0xc5,0x78,0xff,0xff,0xc2,0x02,0x20,0x60,0xcf,0x78,0xff,0xff,0x13,0xf3,
-0xff,0xff,0x00,0xa8,0xff,0xff,0x13,0x03,0x67,0x60,0xc8,0x62,0x01,0x64,0xa2,0xdb,
-0x22,0xf0,0x10,0x64,0xb0,0x84,0xa2,0xda,0x99,0xff,0x30,0x44,0x59,0xb4,0x40,0x51,
-0x98,0xff,0x1b,0x60,0x20,0x64,0x40,0x40,0x1e,0x60,0xc5,0x78,0xff,0xff,0x29,0xf2,
-0xff,0xff,0x60,0x40,0x40,0x2b,0x25,0x00,0x3e,0xf3,0xff,0xff,0x60,0x40,0x04,0x26,
-0x0b,0x00,0x99,0xff,0x3a,0x5c,0x98,0xff,0x64,0x40,0x40,0x27,0x09,0x00,0x64,0x40,
-0x0f,0x2b,0x02,0x00,0x33,0x60,0x00,0xea,0x98,0xff,0x20,0x60,0xb2,0x78,0xff,0xff,
-0x99,0xff,0x3a,0x5c,0x98,0xff,0x64,0x40,0x10,0x2b,0xf6,0x00,0xdb,0xf3,0xff,0xff,
-0xff,0xff,0x01,0x26,0x06,0x00,0x8b,0xff,0x74,0x40,0x74,0x40,0x88,0xff,0x01,0x64,
-0xdb,0xfb,0x21,0xf3,0xff,0xff,0xc4,0xb4,0x21,0xfb,0x21,0x60,0x9d,0x64,0x40,0x40,
-0x01,0x64,0x22,0xfb,0x99,0xff,0x30,0x44,0x40,0xbc,0x59,0xb4,0x40,0x51,0x98,0xff,
-0xe2,0xf1,0x68,0x60,0xcc,0x62,0x80,0x60,0x70,0x64,0xa2,0xdb,0x64,0x40,0x01,0x26,
-0xff,0xff,0xa0,0xfe,0x1a,0xff,0x00,0x64,0x68,0xfb,0xff,0xff,0xa1,0xff,0xff,0xff,
-0xbb,0x3f,0x95,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0x07,0x02,0x13,0xf3,0xff,0xff,
-0x00,0xa0,0x00,0x64,0x02,0x03,0x13,0xfb,0xe3,0x00,0x28,0x60,0x60,0x62,0xa2,0xd3,
-0xff,0xff,0x00,0xa0,0x00,0x64,0x02,0x03,0xa2,0xdb,0xda,0x00,0x21,0xf3,0xff,0xff,
-0xff,0xff,0x01,0x2a,0x0d,0x00,0xfe,0xb4,0x21,0xfb,0x01,0x64,0x4e,0xfb,0x1e,0x60,
-0x98,0x65,0xb8,0xf3,0xff,0xff,0xa5,0xdb,0xff,0xff,0x22,0x60,0x3c,0x78,0xff,0xff,
-0x02,0x2a,0x62,0x00,0x27,0xf2,0xff,0xff,0xdc,0x84,0x27,0xfa,0x5a,0x60,0x46,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x17,0x60,0xea,0x64,0xa0,0xd3,0xff,0xff,0xe8,0x84,0xe0,0x84,
-0x60,0x45,0x18,0x60,0x56,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x53,0xf3,0xff,0xff,0xe0,0x84,0x60,0x45,0x18,0x60,0xbc,0x64,0xc4,0x84,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x53,0xf3,0xff,0xff,0xe0,0x84,0xe0,0x84,0x60,0x45,
-0x5a,0x60,0x4a,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,
-0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x21,0xf3,0xff,0xff,0xfd,0xb4,
-0x21,0xfb,0x02,0x64,0x4e,0xfb,0x29,0xf2,0xff,0xff,0x0c,0xb4,0xff,0xff,0x00,0x36,
-0x5e,0x00,0x95,0xf1,0x00,0x63,0xd3,0x80,0xff,0xff,0x04,0x02,0xb9,0xf1,0xff,0xff,
-0x64,0x45,0x09,0x00,0x25,0xf2,0xff,0xff,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,
-0x0f,0xb4,0xff,0xff,0x60,0x45,0x1e,0x60,0x98,0x63,0xa3,0xd3,0xff,0xff,0xd4,0x80,
-0xdc,0x84,0x45,0x03,0xa3,0xdb,0x43,0x00,0x10,0x2a,0x07,0x00,0x21,0xf3,0x2b,0xf0,
-0xef,0xb4,0x21,0xfb,0x20,0x60,0x19,0x78,0xff,0xff,0x21,0xf3,0xff,0xff,0xdf,0xb4,
-0x21,0xfb,0x2b,0xf0,0x02,0x64,0x64,0x40,0x01,0x26,0x01,0x64,0x4e,0xfb,0x2f,0x00,
-0x00,0x63,0x95,0xf3,0x68,0xfd,0x00,0xbc,0xff,0xff,0x29,0x02,0x28,0x0a,0x70,0x44,
-0xac,0x80,0xff,0xff,0x24,0x02,0x32,0x40,0x02,0x27,0x21,0x00,0x1e,0x60,0x9c,0x65,
-0xa5,0xd3,0xff,0xff,0x00,0xa8,0xff,0xff,0x1a,0x03,0x22,0x60,0x5d,0x64,0x40,0x42,
-0x99,0xff,0x30,0x44,0x04,0xbc,0x1d,0xb4,0x40,0x51,0x98,0xff,0xa1,0xff,0xff,0xff,
-0xbb,0x3f,0x0d,0x0a,0x70,0x44,0xac,0x80,0xff,0xff,0x09,0x02,0x1e,0x60,0x9c,0x65,
-0xa5,0xd3,0xff,0xff,0xcc,0x84,0xa5,0xdb,0xff,0xff,0xf0,0x02,0x00,0x00,0x99,0xff,
-0x30,0x44,0x59,0xb4,0x40,0x51,0x98,0xff,0x1b,0x60,0x20,0x64,0x40,0x40,0x1d,0x60,
-0x96,0x78,0xff,0xff,0xa4,0xe2,0xff,0xff,0xa4,0xe2,0x73,0x44,0xa4,0xfb,0x80,0xf3,
-0x60,0x45,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xc4,0x93,0x00,0x60,0x01,0x71,
-0x95,0xf1,0xcb,0xf3,0x64,0x40,0x00,0x36,0x05,0x00,0x8a,0xff,0x80,0x60,0x00,0x75,
-0x88,0xff,0x03,0x00,0xfc,0xa0,0xff,0xff,0x18,0x02,0xe1,0xf3,0x80,0xf1,0x00,0xa0,
-0x60,0x45,0x13,0x03,0x67,0x60,0x7c,0x62,0x64,0x41,0xd5,0x84,0xdc,0x84,0xa2,0xdb,
-0x00,0x64,0xe2,0xfb,0x99,0xff,0x3c,0x44,0x00,0x7f,0xbf,0xb4,0x40,0x5c,0x98,0xff,
-0x68,0x60,0xcc,0x62,0x80,0x60,0x60,0x64,0xa2,0xdb,0xe4,0xf3,0xe3,0xf1,0x00,0xa0,
-0xff,0xff,0x03,0x03,0x64,0x50,0x00,0x64,0xe4,0xfb,0x5e,0xf3,0xff,0xff,0x60,0x41,
-0xfd,0xb4,0xa2,0xdb,0x61,0x44,0x01,0xb0,0x02,0xb0,0x0a,0x03,0x09,0x02,0x3c,0x60,
-0xae,0x62,0x28,0x60,0xce,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,
-0x16,0x60,0x42,0x62,0xa2,0xd3,0xff,0xff,0xfc,0xa0,0x01,0x64,0x02,0x02,0x75,0xfb,
-0xc9,0xfe,0x73,0x44,0x60,0x45,0x68,0x60,0xcc,0x62,0x90,0x60,0x10,0x64,0xa2,0xdb,
-0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0xcb,0xf3,0x62,0xf3,0xfc,0xa0,0x00,0xa0,
-0x69,0x02,0x17,0x02,0x64,0xf3,0xff,0xff,0x00,0xa0,0xcc,0x84,0x12,0x03,0x64,0xfb,
-0x60,0x45,0x68,0x60,0xcc,0x62,0x80,0x60,0x40,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,
-0x65,0x44,0xa2,0xdb,0x57,0x02,0x63,0xf3,0x64,0xfb,0x67,0x60,0x8a,0x62,0x01,0x64,
-0xa2,0xdb,0x67,0x60,0x8a,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0x00,0x64,0x4a,0x03,
-0xa2,0xdb,0x67,0x60,0x84,0x65,0x67,0x60,0x82,0x63,0xa5,0xd1,0xa3,0xd3,0x64,0x40,
-0x00,0x36,0x40,0x03,0xcc,0x84,0xa3,0xdb,0x60,0x45,0x68,0x60,0xcc,0x62,0x80,0x60,
-0x50,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x33,0x02,0x64,0x44,
-0xa3,0xdb,0x67,0x60,0x86,0x63,0x67,0x60,0x8c,0x65,0xbd,0xd3,0xa3,0xdb,0xc4,0xa0,
-0xff,0xff,0x11,0x04,0xc4,0xa4,0xa3,0xdb,0xa5,0xdb,0xf0,0x60,0x00,0x64,0x60,0x50,
-0x60,0x45,0x68,0x60,0xcc,0x62,0x80,0x60,0x32,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,
-0x65,0x44,0xa2,0xdb,0x17,0x00,0x60,0x47,0xe0,0x84,0xe0,0x84,0x70,0x45,0xd4,0x80,
-0xff,0xff,0x10,0x04,0x60,0x50,0x60,0x45,0x68,0x60,0xcc,0x62,0x80,0x60,0x32,0x64,
-0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x67,0x60,0x8c,0x65,0x00,0x64,
-0xa3,0xdb,0xa5,0xdb,0x1b,0x60,0x2a,0x78,0xff,0xff,0x64,0x41,0x40,0x60,0x0b,0x65,
-0x2b,0x44,0x00,0x63,0xe8,0x80,0xf8,0x84,0x02,0x24,0x94,0x84,0xf3,0x83,0xcd,0x81,
-0xff,0xff,0xf8,0x02,0x2f,0x58,0x40,0x4b,0x00,0x62,0x01,0x64,0xd4,0x80,0xe0,0x84,
-0x1b,0x03,0xd4,0x80,0xe0,0x84,0x16,0x03,0x61,0x44,0x11,0x61,0xe0,0x84,0xcd,0x81,
-0xfd,0x04,0x01,0x00,0xe0,0x84,0xf2,0x82,0xff,0xff,0x02,0x24,0xc6,0x82,0x02,0x28,
-0xd6,0x82,0xe2,0x80,0xcd,0x81,0x02,0x28,0x01,0xbc,0xf4,0x02,0x01,0x2a,0xc6,0x82,
-0x2f,0x58,0xff,0xff,0xe9,0x81,0xf2,0x82,0x61,0x44,0xfa,0x00,0x12,0xf1,0x7f,0x00,
-0xda,0x00,0xa1,0xff,0xff,0xff,0xbc,0x3f,0x40,0xf3,0xff,0xff,0x60,0x40,0x01,0x2a,
-0x03,0x00,0x18,0x60,0x17,0x78,0xff,0xff,0x3d,0x46,0x29,0xf0,0xff,0xff,0x64,0x40,
-0x40,0x2b,0x27,0x00,0x3e,0xf3,0xff,0xff,0x60,0x40,0x02,0x26,0x1a,0x00,0x0f,0xf2,
-0xff,0xff,0x60,0x40,0x04,0x2a,0x00,0x00,0x99,0xff,0x3b,0x44,0x98,0xff,0xff,0xff,
-0x0f,0x2b,0x05,0x00,0x40,0x27,0xf8,0x00,0xf5,0x60,0xbc,0x78,0xff,0xff,0x9c,0xf3,
-0xff,0xff,0xff,0xff,0x02,0x26,0xd5,0x00,0x67,0x60,0xca,0x62,0x01,0x64,0xa2,0xdb,
-0xd0,0x00,0x0f,0xf2,0xff,0xff,0x60,0x40,0x04,0x2a,0xcb,0x00,0x17,0x60,0xa6,0x78,
-0xff,0xff,0x0f,0xf2,0xff,0xff,0x08,0xbc,0x0f,0xfa,0x3c,0x60,0x64,0x62,0xa2,0xd3,
-0xff,0xff,0x00,0xa8,0x60,0x46,0x01,0x02,0xbc,0x00,0x0f,0xf0,0xff,0xff,0xff,0xff,
-0x64,0x40,0x00,0x3a,0x04,0x00,0x0f,0xf0,0x70,0x64,0xb0,0x84,0xa2,0xda,0x67,0x60,
-0x62,0x62,0x00,0x64,0xa2,0xdb,0x40,0xfb,0x3e,0xf3,0xff,0xff,0xf9,0xb4,0x3e,0xfb,
-0x3d,0x46,0x0f,0xf0,0x04,0x64,0xb0,0x84,0xa2,0xda,0xcb,0xfe,0x40,0xff,0xbc,0xfe,
-0x29,0xf2,0xff,0xff,0xff,0xff,0x40,0x2b,0x9c,0x00,0x67,0x60,0x58,0x64,0xa0,0xd3,
-0xff,0xff,0xff,0xa0,0xff,0xff,0x95,0x02,0x04,0xff,0x93,0x00,0xf4,0x46,0x7e,0x00,
-0x00,0x10,0x7f,0xf1,0x10,0x60,0xdc,0xe0,0x43,0x45,0x65,0xf3,0x44,0x46,0x60,0x40,
-0x02,0x2a,0x03,0x00,0x23,0x60,0xc8,0x78,0xff,0xff,0x01,0x64,0x65,0xfb,0x99,0xff,
-0x00,0x6b,0x3e,0x44,0x70,0xb4,0x40,0x5e,0x3d,0x44,0xf7,0xb4,0x90,0xbc,0x40,0x5d,
-0x3c,0x44,0x6f,0xb4,0x40,0x5c,0x98,0xff,0x20,0x44,0x60,0xbc,0x40,0x40,0x01,0x64,
-0x60,0x47,0x99,0xfb,0x05,0x64,0x9a,0xfb,0xff,0xff,0xdf,0xfe,0x19,0xff,0x23,0x60,
-0xa6,0x64,0x9b,0xfb,0xf8,0x60,0x89,0x78,0xff,0xff,0x1f,0xf3,0xff,0xff,0xff,0xff,
-0x20,0x26,0x05,0x00,0x13,0x60,0x5a,0x63,0x14,0x60,0x3e,0x65,0x04,0x00,0x14,0x60,
-0x3e,0x63,0x15,0x60,0x22,0x65,0x80,0xe1,0x02,0x00,0x01,0x16,0xfe,0x00,0xbd,0xd1,
-0xff,0xff,0x64,0x48,0x64,0x47,0x00,0x7f,0x60,0x41,0x80,0xbc,0x60,0x4a,0xff,0xff,
-0xff,0xff,0xa1,0xff,0xff,0xff,0xd7,0x80,0xff,0xff,0xef,0x02,0x68,0x40,0x67,0x60,
-0x80,0x62,0xa2,0xd3,0x00,0x7c,0xa2,0xd9,0x60,0x40,0x01,0x2a,0x09,0x00,0x40,0x65,
-0xa4,0x85,0x99,0xff,0x3c,0x44,0xbf,0xb4,0xb4,0x84,0x00,0x7f,0x40,0x5c,0x98,0xff,
-0x20,0x44,0x60,0xbc,0x40,0x40,0x80,0xe1,0x14,0x60,0x7a,0x63,0xa3,0xd1,0x67,0x60,
-0x70,0x62,0xa2,0xd3,0xff,0xff,0xd0,0x80,0xa2,0xd9,0x16,0x03,0x01,0x64,0xd8,0xfb,
-0xd7,0xf3,0xff,0xff,0xff,0xff,0x01,0x26,0xfb,0x00,0x64,0x48,0x64,0x47,0x00,0x7f,
-0x80,0xbc,0x60,0x4a,0xff,0xff,0xff,0xff,0xa1,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0x68,0x40,0x00,0x64,0xd8,0xfb,0x66,0x60,0xd4,0x62,0x17,0x60,0x52,0x7c,
-0xa2,0xd3,0x99,0xff,0xe0,0x84,0x40,0xd1,0x00,0x63,0x64,0x40,0x01,0x26,0x10,0x63,
-0xdd,0xfd,0x00,0x65,0x64,0x40,0x02,0x26,0x04,0x65,0x3c,0x44,0xfb,0xb4,0xb4,0x84,
-0x40,0x5c,0x98,0xff,0x26,0x44,0x7f,0xfb,0x02,0x7f,0x99,0xfb,0x05,0x64,0x9a,0xfb,
-0xff,0xff,0xdf,0xfe,0x19,0xff,0x24,0x60,0x28,0x64,0x9b,0xfb,0x9c,0xf3,0x69,0x65,
-0xb4,0x84,0x99,0xff,0x40,0x51,0x98,0xff,0xf8,0x60,0x89,0x78,0xff,0xff,0x65,0xf3,
-0xff,0xff,0x02,0xbc,0x65,0xfb,0x25,0x43,0x24,0x60,0x9d,0x78,0xff,0xff,0x20,0x44,
-0x43,0x45,0x20,0xbc,0x40,0x40,0x65,0xf3,0xff,0xff,0x60,0x40,0x80,0x2a,0x03,0x00,
-0x24,0x60,0x55,0x78,0xff,0xff,0x00,0xee,0x04,0xbc,0x65,0xfb,0xff,0xff,0xdf,0xfe,
-0x19,0xff,0xff,0xff,0x99,0xff,0x00,0x6b,0x3c,0x44,0x40,0xb4,0x80,0xbc,0x40,0x5c,
-0x00,0xed,0x04,0xee,0xff,0xff,0xff,0xff,0x00,0xee,0x98,0xff,0x00,0x64,0x65,0xfb,
-0x55,0x60,0xfc,0xe0,0xff,0xff,0xff,0xff,0x25,0x43,0x24,0x60,0x9d,0x78,0xff,0xff,
-0x24,0x60,0x9d,0x78,0xff,0xff,0x20,0x44,0x20,0xbc,0x40,0x40,0x24,0x60,0x9d,0x78,
-0xff,0xff,0x99,0xff,0x3c,0x44,0x7f,0xb4,0x10,0xbc,0x40,0x5c,0x98,0xff,0x99,0xff,
-0x3d,0x44,0x10,0xbc,0x00,0x7f,0x40,0x5d,0x98,0xff,0x99,0xff,0x3e,0x44,0x02,0xbc,
-0x00,0x7f,0x40,0x5e,0x98,0xff,0x24,0x60,0x9d,0x78,0xff,0xff,0x20,0x44,0x20,0xbc,
-0x40,0x40,0x80,0xe1,0x01,0x64,0xd8,0xfb,0xd7,0xf3,0xff,0xff,0xff,0xff,0x01,0x26,
-0xfb,0x00,0x64,0x47,0x3f,0xb4,0xe0,0x85,0x64,0x44,0x80,0x2b,0x09,0x00,0x00,0x7f,
-0x60,0x48,0x65,0x44,0x80,0xbc,0x60,0x4a,0xff,0xff,0xff,0xff,0x0b,0x16,0xfe,0x00,
-0x65,0x49,0xff,0xff,0xff,0xff,0xa1,0xff,0x00,0x64,0x68,0x5e,0x60,0x5c,0x08,0x60,
-0x0a,0x64,0xa0,0xd9,0x00,0x64,0xd8,0xfb,0x9c,0xf3,0x69,0x65,0xb4,0x84,0x99,0xff,
-0x40,0x51,0x98,0xff,0x00,0x64,0xbf,0xdb,0x20,0x44,0x20,0x2a,0x07,0x00,0x07,0xb4,
-0x04,0x36,0xc3,0xfe,0x06,0x36,0xcc,0xfe,0x07,0x36,0xd8,0xfe,0x20,0x44,0xd8,0xb4,
-0x40,0x40,0x20,0x44,0x40,0x2a,0x08,0x00,0x9f,0xfe,0xff,0xff,0x24,0x05,0xbf,0xb4,
-0x40,0x40,0x9b,0xf7,0xff,0xff,0xff,0xff,0x3c,0x60,0x8e,0x62,0xa2,0xd3,0xda,0x83,
-0x00,0xa8,0x02,0x61,0x1b,0x02,0xdb,0x82,0x5a,0xd3,0xda,0x83,0x00,0xa8,0x02,0x61,
-0x15,0x02,0xdb,0x82,0x5a,0xd3,0xda,0x83,0x00,0xa8,0x04,0x61,0x0f,0x02,0xdb,0x82,
-0x5a,0xd3,0xda,0x83,0x00,0xa8,0x06,0x61,0x09,0x02,0xdb,0x82,0x5a,0xd3,0xda,0x83,
-0x00,0xa8,0x07,0x61,0x03,0x02,0xf8,0x60,0x89,0x78,0xff,0xff,0xa3,0xd1,0x40,0x44,
-0x62,0x43,0x20,0x44,0x07,0xb5,0xd4,0x85,0x35,0x80,0x24,0x45,0x13,0x60,0x32,0x64,
-0x44,0xd7,0xff,0xff,0xff,0xff,0x80,0xe1,0x43,0x45,0x20,0x44,0x20,0xbc,0x40,0x40,
-0x64,0x43,0xbd,0xd3,0xbd,0xd1,0xff,0xff,0x10,0x2b,0x01,0x00,0x0b,0x00,0x01,0x16,
-0xfe,0x00,0x64,0x49,0xff,0xff,0xff,0xff,0xff,0xff,0xa1,0xff,0xff,0xff,0x68,0x44,
-0x00,0x7f,0xa3,0xdb,0x25,0x43,0x98,0x00,0x80,0xe1,0x43,0x45,0x20,0x44,0x20,0xbc,
-0x40,0x40,0x64,0x43,0xbd,0xd3,0xbd,0xd1,0x40,0x44,0x10,0x2b,0x01,0x00,0x1a,0x00,
-0xa3,0xd3,0xff,0xff,0x01,0x16,0xfe,0x00,0x60,0x48,0x64,0x44,0x00,0x7f,0x60,0x4a,
-0xff,0xff,0xff,0xff,0xff,0xff,0xa1,0xff,0xff,0xff,0x68,0x40,0x01,0x16,0xfe,0x00,
-0x64,0x49,0xff,0xff,0xff,0xff,0xff,0xff,0xa1,0xff,0xff,0xff,0x68,0x45,0xd4,0x80,
-0xff,0xff,0xe8,0x02,0x25,0x43,0xd7,0x00,0x3c,0x60,0xac,0x61,0xa1,0xd3,0x00,0x63,
-0x00,0xa8,0x59,0xd1,0x31,0x02,0x59,0xd3,0x00,0x63,0x00,0xa8,0x59,0xd1,0x2c,0x02,
-0x59,0xd3,0x00,0x63,0x00,0xa8,0x59,0xd1,0x27,0x02,0x59,0xd3,0x00,0x63,0x00,0xa8,
-0x59,0xd1,0x22,0x02,0x59,0xd3,0x00,0x63,0x00,0xa8,0x59,0xd1,0x1d,0x02,0x59,0xd3,
-0x00,0x63,0x00,0xa8,0x59,0xd1,0x18,0x02,0x59,0xd3,0x00,0x63,0x00,0xa8,0x59,0xd1,
-0x13,0x02,0x59,0xd3,0x00,0x63,0x00,0xa8,0x59,0xd1,0x0e,0x02,0x59,0xd3,0x00,0x63,
-0x00,0xa8,0x59,0xd1,0x09,0x02,0xf8,0x60,0x89,0x78,0xff,0xff,0x27,0x60,0xb5,0x78,
-0xff,0xff,0x27,0x60,0x8f,0x78,0xff,0xff,0x49,0xdd,0x60,0x40,0x02,0x36,0xf9,0x00,
-0x03,0x36,0xf4,0x00,0x01,0x36,0x28,0x00,0x05,0x3a,0xbe,0x00,0xa4,0xd3,0x5a,0xd3,
-0x9c,0x85,0xa4,0x84,0xa2,0xdb,0xb8,0x00,0x84,0xe2,0x04,0x60,0x00,0x71,0x1e,0xf3,
-0x14,0xf3,0x00,0xbd,0xcc,0x84,0x08,0x03,0x14,0xfb,0x06,0x02,0x65,0x44,0x14,0xfb,
-0x8a,0xff,0x80,0x60,0x00,0x75,0x88,0xff,0x73,0x44,0xce,0xfb,0x1e,0x60,0x92,0x62,
-0xa2,0xd3,0xff,0xff,0x01,0xa4,0xa2,0xdb,0x0a,0x02,0x1e,0x60,0x94,0x62,0xa2,0xd3,
-0xff,0xff,0x01,0xa4,0xa2,0xdb,0x03,0x00,0x27,0x60,0x88,0x78,0xff,0xff,0x66,0x60,
-0xb4,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xcc,0x84,0x06,0x03,0xa2,0xdb,0x04,0x02,
-0x3a,0x44,0x02,0xbc,0x40,0x5a,0x3b,0xff,0x6e,0xf3,0xff,0xff,0x60,0x47,0xff,0x23,
-0x05,0x00,0xcc,0x84,0x60,0x47,0xff,0x22,0x00,0x64,0x6e,0xfb,0xa4,0xf3,0xff,0xff,
-0x10,0xa4,0xa4,0xfb,0x68,0xf3,0x10,0xa5,0x00,0xa0,0x73,0x41,0x49,0x03,0xd5,0x80,
-0xff,0xff,0x27,0x03,0x70,0x45,0xc4,0x85,0x02,0x60,0x58,0x64,0xc4,0x84,0xa4,0xf1,
-0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0x40,0x4d,0xc0,0x84,
-0x60,0x41,0x73,0x45,0xd4,0x80,0xe1,0xf1,0x14,0x0d,0x64,0x44,0x00,0x36,0x30,0x00,
-0xe0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,0x61,0x45,0xc4,0x84,0x73,0x45,0xd4,0x80,
-0xff,0xff,0x07,0x0d,0x67,0x60,0x7c,0x62,0xa2,0xd3,0xff,0xff,0xfe,0xa0,0xff,0xff,
-0x1f,0x02,0xcb,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x06,0x02,0x01,0x64,0x13,0xfb,
-0x00,0x64,0x68,0xfb,0xc0,0xfe,0x14,0x00,0xe3,0xf1,0x2d,0x44,0xc0,0x84,0x70,0x45,
-0xd4,0x80,0xff,0xff,0x0d,0x04,0x60,0x50,0x60,0x45,0x68,0x60,0xcc,0x62,0x80,0x60,
-0x31,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x01,0x64,0xe4,0xfb,
-0x66,0x60,0xb2,0x64,0xa0,0xd3,0xff,0xff,0x00,0xa0,0xcc,0x84,0x12,0x03,0xa2,0xdb,
-0x10,0x02,0xe0,0xf3,0x76,0xf3,0x60,0x45,0x77,0xf3,0xd4,0x80,0xd4,0x80,0x01,0x03,
-0x08,0x02,0x28,0x60,0x60,0x62,0x80,0x64,0xa2,0xdb,0xff,0xff,0xc0,0xfe,0x00,0x64,
-0xa2,0xdb,0x3d,0x60,0x1a,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x0c,0x03,
-0xcc,0x84,0xa2,0xdb,0x09,0x02,0x3d,0x60,0x16,0x63,0xbd,0xd1,0x18,0x60,0xc8,0x64,
-0xa0,0xd3,0xff,0xff,0xd0,0x84,0xa3,0xdb,0x32,0x44,0x01,0x2a,0x30,0x00,0x68,0x60,
-0xd4,0x62,0xa2,0xd3,0xff,0xff,0xff,0xa0,0xff,0xff,0x3b,0x02,0x68,0x60,0xda,0x61,
-0xa1,0xd3,0xff,0xff,0xcc,0x84,0xff,0xff,0xa1,0xdb,0x33,0x02,0x20,0x40,0x40,0x2a,
-0x03,0x00,0x01,0x64,0xa1,0xdb,0x2d,0x00,0xff,0x64,0xa1,0xdb,0x7f,0xf3,0xff,0xff,
-0x01,0xa4,0x7f,0xfb,0xf2,0xa0,0xff,0xff,0x02,0x06,0x01,0x64,0x7f,0xfb,0x60,0x41,
-0x20,0x44,0x40,0xbc,0x40,0x40,0x24,0x60,0xbd,0x64,0x9b,0xfb,0x61,0x44,0x02,0x7f,
-0x99,0xfb,0x05,0x64,0x9a,0xfb,0xff,0xff,0xdf,0xfe,0x19,0xff,0x12,0x00,0x95,0xf3,
-0x65,0xf3,0x00,0xa0,0xff,0xff,0x0d,0x03,0x02,0x2a,0x0b,0x00,0x16,0x60,0xbc,0x62,
-0xa2,0xd3,0x7f,0xf1,0xff,0xff,0xd0,0x80,0xff,0xff,0x03,0x03,0x20,0x40,0x40,0x2a,
-0xd8,0x00,0x67,0x60,0x7c,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xcc,0x84,0x31,0x03,
-0xa2,0xdb,0x2f,0x02,0x01,0x64,0xe2,0xfb,0x99,0xff,0x3c,0x44,0x40,0xbc,0x00,0x7f,
-0x40,0x5c,0x98,0xff,0x68,0x60,0xcc,0x62,0x80,0x60,0x61,0x64,0xa2,0xdb,0x22,0xf3,
-0xff,0xff,0x01,0xb4,0xff,0xff,0x06,0x03,0x67,0x60,0x8e,0x64,0xa0,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0xe1,0xf3,0xe3,0xf1,0x60,0x47,0xe0,0x84,0xe0,0x84,0xc0,0x84,
-0x70,0x45,0xd4,0x80,0xff,0xff,0x0d,0x04,0x60,0x50,0x60,0x45,0x68,0x60,0xcc,0x62,
-0x80,0x60,0x31,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x00,0x64,
-0xe4,0xfb,0x67,0x60,0x7e,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xcc,0x84,0x16,0x03,
-0xa2,0xdb,0x14,0x02,0x00,0x64,0xe2,0xfb,0x99,0xff,0x3c,0x44,0xbf,0xb4,0x00,0x7f,
-0x40,0x5c,0x98,0xff,0x68,0x60,0xcc,0x62,0x80,0x60,0x60,0x64,0xa2,0xdb,0x67,0x60,
-0x7c,0x63,0xe1,0xf3,0x80,0xf3,0x60,0x45,0xd4,0x84,0xa3,0xdb,0x67,0x60,0x8c,0x62,
-0xa2,0xd3,0xff,0xff,0x00,0xa0,0xcc,0x84,0x10,0x03,0xa2,0xdb,0x04,0x60,0x00,0x65,
-0x70,0x44,0xc4,0x84,0x60,0x50,0x60,0x45,0x68,0x60,0xcc,0x62,0x80,0x60,0x32,0x64,
-0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0xe1,0xf3,0xff,0xff,0x00,0xa0,
-0xff,0xff,0x31,0x02,0x28,0x44,0xcc,0x84,0x40,0x48,0x2d,0x02,0x67,0x60,0x50,0x62,
-0xa2,0xd3,0xff,0xff,0xff,0xff,0x03,0x22,0x03,0x00,0x01,0x2a,0x1a,0x00,0x07,0x00,
-0x67,0x60,0x4c,0x62,0xa2,0xd3,0xff,0xff,0x01,0xac,0xa2,0xdb,0x12,0x03,0x99,0xff,
-0x3c,0x44,0x40,0xbc,0x00,0x7f,0x40,0x5c,0x98,0xff,0xcb,0xf3,0x0a,0x65,0xfc,0xa0,
-0xfd,0xa0,0x10,0x03,0x0f,0x03,0xfb,0xa0,0xff,0xff,0x0c,0x03,0x01,0x60,0xf4,0x65,
-0x09,0x00,0x99,0xff,0x3c,0x44,0xbf,0xb4,0x40,0x5c,0x67,0x60,0x4a,0x62,0xa2,0xd3,
-0x98,0xff,0x60,0x45,0x45,0x48,0x2b,0x44,0xcc,0x84,0x40,0x4b,0x40,0x02,0x03,0x60,
-0xe8,0x64,0x40,0x4b,0x2c,0x44,0xcc,0x84,0x40,0x4c,0x05,0x02,0x1e,0x64,0x4b,0xf3,
-0x40,0x4c,0xdc,0x84,0x4b,0xfb,0xcb,0xf3,0xff,0xff,0xfc,0xa0,0xfd,0xa0,0x07,0x03,
-0x06,0x03,0xfb,0xa0,0xff,0xff,0x03,0x03,0x05,0x60,0xdc,0x64,0x24,0x00,0x5a,0x60,
-0x74,0x63,0xa3,0xd1,0x59,0x60,0xec,0x62,0xa2,0xd3,0xff,0xff,0xc0,0x83,0x67,0x60,
-0x44,0x62,0xa2,0xd1,0xa2,0xdd,0xd3,0x84,0xff,0xff,0xfe,0x27,0x13,0x00,0x01,0x27,
-0x0f,0x00,0xc0,0x26,0x0b,0x00,0x30,0x26,0x07,0x00,0x0f,0x26,0x03,0x00,0x03,0x60,
-0xde,0x64,0x09,0x00,0xf0,0x64,0x07,0x00,0x73,0x64,0x05,0x00,0x38,0x64,0x03,0x00,
-0x1e,0x64,0x01,0x00,0x0f,0x64,0x60,0x5c,0x67,0x60,0x4a,0x62,0xa2,0xd9,0x01,0x60,
-0x3a,0x61,0xa1,0xd3,0x61,0x43,0x00,0xa8,0x60,0x41,0x03,0x02,0xf8,0x60,0x89,0x78,
-0xff,0xff,0x59,0xd3,0x00,0x66,0x00,0xa8,0xcc,0x84,0x02,0x03,0xa1,0xdb,0xf6,0x00,
-0x49,0xd3,0xa3,0xdb,0x00,0xa8,0x60,0x43,0x5b,0xd3,0x06,0x03,0x00,0xa8,0xcc,0x84,
-0x02,0x02,0x01,0x66,0x01,0x00,0xa3,0xdb,0x06,0xa1,0xa1,0xd3,0x59,0xd1,0x60,0x45,
-0xa5,0xd3,0x59,0xd1,0xb0,0x84,0xa5,0xdb,0x64,0x47,0x06,0x36,0xcd,0xfe,0x07,0x37,
-0xd9,0xfe,0x66,0x40,0x00,0x3a,0xd3,0x00,0xf8,0x60,0x89,0x78,0xff,0xff,0x01,0x60,
-0x3a,0x61,0x00,0x64,0xa1,0xdb,0x25,0x60,0x2d,0x78,0xff,0xff,0x27,0x60,0x94,0x64,
-0x40,0x41,0x44,0x42,0x24,0x00,0x01,0x60,0x3a,0x66,0xa6,0xd3,0x04,0xa1,0x60,0x43,
-0xa1,0xd3,0xc9,0x81,0x60,0x45,0x00,0xbb,0xa1,0xdb,0xbe,0xd3,0x09,0x03,0xd4,0x84,
-0x9c,0x84,0xdc,0x84,0xff,0xff,0x04,0x0e,0xa3,0xd1,0x63,0x46,0x64,0x43,0xf2,0x00,
-0x9c,0x84,0xdc,0x85,0x49,0xdd,0x61,0x44,0x00,0xbb,0xa6,0xdb,0x02,0x03,0x65,0x44,
-0xbe,0xdb,0x25,0x60,0x2d,0x78,0xff,0xff,0x25,0x60,0x2d,0x64,0x40,0x41,0x01,0x60,
-0x3a,0x66,0xa6,0xd3,0xff,0xff,0x00,0xa8,0xd0,0x80,0x10,0x03,0x02,0x03,0x60,0x46,
-0xf8,0x00,0x58,0xd3,0xa4,0xd3,0x60,0x45,0x00,0x63,0xa4,0xdd,0x58,0xd3,0x02,0xa8,
-0xc4,0x83,0x01,0x03,0xa2,0xdd,0x62,0x44,0xc8,0x84,0xa6,0xdb,0x21,0x58,0x22,0x41,
-0x28,0x60,0xaa,0x63,0x00,0x64,0xa3,0xdb,0x06,0xa3,0x1f,0x60,0x1a,0x64,0xbd,0xdb,
-0xbd,0xdb,0x06,0x64,0xa3,0xdb,0x1f,0x60,0x18,0x62,0x58,0x60,0xd2,0x64,0xa2,0xdb,
-0x1e,0x60,0xea,0x62,0x52,0x60,0x85,0x64,0xa2,0xdb,0x2f,0x58,0xff,0xff,0x28,0x60,
-0x92,0x63,0x00,0x64,0xa3,0xdb,0x06,0xa3,0x1f,0x60,0x12,0x64,0xbd,0xdb,0xbd,0xdb,
-0x06,0x64,0xa3,0xdb,0x1f,0x60,0x10,0x62,0x5c,0x60,0x14,0x64,0xa2,0xdb,0x1e,0x60,
-0xea,0x62,0x52,0x60,0x85,0x64,0xa2,0xdb,0x2f,0x58,0xff,0xff,0x00,0x60,0x7a,0x66,
-0x32,0x64,0x61,0xfb,0x1e,0x60,0x92,0x64,0xa0,0xd3,0x03,0xfa,0x0f,0x4e,0x00,0x60,
-0x3c,0x61,0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,0x58,0x4f,0xa2,0x78,0xff,0xff,
-0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,0xc4,0x78,0xff,0xff,0x08,0xfe,
-0x0e,0x4f,0x66,0x44,0x7b,0xfb,0x00,0x64,0x28,0xfa,0x01,0x60,0x48,0x64,0x29,0xfa,
-0x00,0x64,0x38,0xfa,0x28,0x60,0x9e,0x63,0x00,0x64,0xa3,0xdb,0x06,0xa3,0x1f,0x60,
-0x16,0x64,0xbd,0xdb,0x02,0x64,0xbd,0xdb,0x06,0x64,0xa3,0xdb,0x1f,0x60,0x14,0x62,
-0x64,0x60,0x3f,0x64,0xa2,0xdb,0x1e,0x60,0xf0,0x62,0x64,0x60,0x4a,0x64,0xa2,0xdb,
-0x2f,0x58,0xff,0xff,0x0f,0x4e,0x00,0x60,0x48,0x61,0x41,0x4d,0x40,0xa1,0xa2,0xff,
-0x19,0x60,0x58,0x4f,0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,
-0x58,0x4f,0xc4,0x78,0xff,0xff,0x08,0xfe,0x0e,0x4f,0x66,0x44,0x7a,0xfb,0x08,0x64,
-0x28,0xfa,0xff,0x60,0xff,0x64,0x2b,0xfa,0x2c,0xfa,0x2d,0xfa,0xff,0xff,0x31,0xfa,
-0x32,0xfa,0x33,0xfa,0x12,0x60,0x20,0x64,0x0e,0xfa,0x28,0x60,0x62,0x63,0x00,0x64,
-0xa3,0xdb,0x06,0xa3,0x1e,0x60,0xf6,0x64,0xbd,0xdb,0x04,0x64,0xbd,0xdb,0x06,0x64,
-0xa3,0xdb,0x1e,0x60,0xf4,0x62,0x56,0x60,0x3d,0x64,0xa2,0xdb,0x28,0x60,0x6e,0x63,
-0x00,0x64,0xa3,0xdb,0x06,0xa3,0x1e,0x60,0xfa,0x64,0xbd,0xdb,0x08,0x64,0xbd,0xdb,
-0x06,0x64,0xa3,0xdb,0x1e,0x60,0xf8,0x62,0x56,0x60,0x48,0x64,0xa2,0xdb,0x1e,0x60,
-0xe8,0x62,0x56,0x60,0x2d,0x64,0xa2,0xdb,0x2f,0x58,0xff,0xff,0x28,0x60,0x7a,0x63,
-0x00,0x64,0xa3,0xdb,0x06,0xa3,0x1f,0x60,0x0a,0x64,0xbd,0xdb,0xbd,0xdb,0x06,0x64,
-0xa3,0xdb,0x1f,0x60,0x08,0x62,0x52,0x60,0x9f,0x64,0xa2,0xdb,0x1e,0x60,0xea,0x62,
-0x52,0x60,0x85,0x64,0xa2,0xdb,0x2f,0x58,0xff,0xff,0x00,0x64,0x40,0x40,0x0f,0x4e,
-0x00,0x60,0x6c,0x61,0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,0x58,0x4f,0xa2,0x78,
-0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,0xc4,0x78,0xff,0xff,
-0x08,0xfe,0x0e,0x4f,0x66,0x44,0x79,0xfb,0x0f,0x4e,0x00,0x60,0x6c,0x61,0x41,0x4d,
-0x40,0xa1,0xa2,0xff,0x19,0x60,0x58,0x4f,0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,
-0x2d,0x41,0x19,0x60,0x58,0x4f,0xc4,0x78,0xff,0xff,0x08,0xfe,0x0e,0x4f,0x66,0x44,
-0x78,0xfb,0x0f,0x4e,0x00,0x60,0x3c,0x61,0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,
-0x58,0x4f,0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,
-0xc4,0x78,0xff,0xff,0x08,0xfe,0x0e,0x4f,0x66,0x44,0x77,0xfb,0x08,0x64,0x28,0xfa,
-0xf0,0x60,0x20,0x64,0x0e,0xfa,0x00,0x64,0x38,0xfa,0x00,0x60,0x90,0x64,0x29,0xfa,
-0x0f,0x4e,0x00,0x60,0xab,0x61,0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,0x58,0x4f,
-0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,0xc4,0x78,
-0xff,0xff,0x08,0xfe,0x0e,0x4f,0x66,0x44,0x76,0xfb,0x08,0x64,0x28,0xfa,0x18,0x60,
-0x20,0x64,0x0e,0xfa,0x00,0x60,0x80,0x64,0x29,0xfa,0x00,0x64,0x19,0xfa,0x1e,0x60,
-0xec,0x62,0x43,0x60,0x6e,0x64,0xa2,0xdb,0x2f,0x58,0xff,0xff,0x1e,0x60,0xe4,0x62,
-0x2c,0x60,0x33,0x64,0xa2,0xdb,0x28,0x60,0xb6,0x62,0x00,0x64,0xa2,0xdb,0x06,0xa2,
-0x1e,0x60,0xfe,0x64,0xa2,0xdb,0x06,0x64,0x5a,0xdb,0x5a,0xdb,0x28,0x60,0xc2,0x62,
-0x00,0x64,0xa2,0xdb,0x06,0xa2,0x1f,0x60,0x02,0x64,0xa2,0xdb,0x06,0x64,0x5a,0xdb,
-0x5a,0xdb,0x28,0x60,0xce,0x62,0x00,0x64,0xa2,0xdb,0x06,0xa2,0x1f,0x60,0x06,0x64,
-0xa2,0xdb,0x06,0x64,0x5a,0xdb,0x5a,0xdb,0xab,0xf1,0x28,0x60,0xd2,0x62,0xa2,0xd9,
-0x1e,0x60,0xfc,0x62,0x2d,0x60,0x2a,0x64,0xa2,0xdb,0x1f,0x60,0x00,0x62,0x2d,0x60,
-0x35,0x64,0xa2,0xdb,0x1f,0x60,0x04,0x62,0x2d,0x60,0x40,0x64,0xa2,0xdb,0x1e,0x60,
-0xb2,0x62,0x00,0x60,0x02,0x64,0xa2,0xdb,0x29,0x60,0x53,0x64,0x5a,0xdb,0xcf,0xfe,
-0x2f,0x58,0xff,0xff,0x1e,0x60,0xb0,0x62,0x00,0x64,0xa2,0xdb,0x03,0x64,0x5e,0xfb,
-0x2d,0x60,0x58,0x4e,0x1e,0x78,0xff,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0xff,0x60,
-0x8f,0x64,0xa0,0x84,0xa2,0xdb,0xac,0xf1,0x28,0x60,0xc6,0x62,0xa2,0xd9,0x3c,0x60,
-0xb6,0x62,0x28,0x60,0xc2,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,
-0x1e,0x60,0xb2,0x62,0x00,0x60,0x74,0x64,0xa2,0xdb,0x29,0x60,0x7c,0x64,0x5a,0xdb,
-0xcf,0xfe,0x2f,0x58,0xff,0xff,0x67,0x60,0x76,0x62,0xa2,0xd3,0xff,0xff,0x60,0x40,
-0x02,0x2a,0x03,0x00,0x2b,0x60,0x0f,0x78,0xff,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,
-0x00,0x60,0x04,0x64,0xa0,0x80,0x9c,0x84,0x05,0x03,0xa0,0x84,0xa2,0xdb,0x2c,0x60,
-0x33,0x78,0xff,0xff,0x00,0x60,0x40,0x64,0xa0,0x80,0x9c,0x84,0x03,0x03,0xa0,0x84,
-0xa2,0xdb,0xd6,0x00,0x00,0x60,0x20,0x64,0xa0,0x80,0x9c,0x84,0x0e,0x03,0xa0,0x84,
-0xa2,0xdb,0x01,0x65,0x2e,0x60,0x58,0x4e,0xd4,0x78,0xff,0xff,0xff,0x60,0xf7,0x65,
-0x5e,0xf3,0xff,0xff,0xa4,0x84,0xa2,0xdb,0xc3,0x00,0x00,0x60,0x10,0x64,0xa0,0x80,
-0x9c,0x84,0xc7,0x03,0xa0,0x84,0xa2,0xdb,0x1e,0x60,0x92,0x63,0xa3,0xd1,0x66,0x60,
-0xf0,0x65,0xa5,0xd3,0xff,0xff,0xd0,0x80,0xff,0xff,0x1e,0x0d,0xad,0xf3,0xff,0xff,
-0xc0,0x84,0xa5,0xdb,0x66,0x60,0xee,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x66,0x60,0xfc,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xf8,0xa0,0xff,0xff,0x01,0x04,
-0x08,0x64,0xa2,0xdb,0x67,0x60,0x02,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xf8,0xa0,
-0xff,0xff,0x01,0x04,0x08,0x64,0xa2,0xdb,0x66,0x60,0xf2,0x65,0xa5,0xd1,0x58,0xf3,
-0xff,0xff,0xd0,0x80,0x60,0x41,0x0d,0x06,0xa5,0xdb,0x66,0x60,0xf8,0x63,0x66,0x60,
-0xf6,0x65,0xa5,0xd1,0x61,0x44,0xd0,0x84,0xff,0xff,0x01,0x05,0x00,0x64,0xa3,0xdb,
-0x16,0x00,0x66,0x60,0xf8,0x63,0xa3,0xd1,0x58,0xf3,0xff,0xff,0xd0,0x80,0x60,0x41,
-0x0e,0x05,0xa5,0xdb,0x66,0x60,0xf6,0x65,0xa5,0xd1,0x61,0x44,0xd0,0x84,0xff,0xff,
-0x01,0x05,0x00,0x64,0xa3,0xdb,0x66,0x60,0xfa,0x62,0x01,0x64,0xa2,0xdb,0x66,0x60,
-0xfa,0x63,0xbd,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x2e,0x03,0xbd,0xd3,0xa3,0xd1,
-0xff,0xff,0xd0,0x80,0xff,0xff,0x28,0x06,0x66,0x60,0xee,0x62,0xa2,0xd3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0x21,0x03,0x61,0x60,0xc8,0x62,0x06,0x64,0xa2,0xdb,0x66,0x60,
-0xfa,0x63,0x00,0x64,0xbd,0xdb,0xbd,0xdb,0xa3,0xd3,0xff,0xff,0xe0,0x84,0xf8,0xa0,
-0xff,0xff,0x01,0x04,0x08,0x64,0xa3,0xdb,0x66,0x60,0xf6,0x62,0xa2,0xd3,0xff,0xff,
-0xe8,0x84,0xe8,0x84,0xc4,0xfb,0x66,0x60,0xe8,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x2b,0x60,0x5e,0x78,0xff,0xff,0x67,0x60,0x00,0x63,0xbd,0xd3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0x49,0x03,0xbd,0xd3,0xa3,0xd1,0xff,0xff,0xd0,0x80,0xff,0xff,
-0x43,0x06,0x66,0x60,0xee,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x3c,0x03,
-0x66,0x60,0xf4,0x63,0xbd,0xd1,0xa3,0xd3,0xff,0xff,0xe8,0x84,0xe8,0x85,0x64,0x44,
-0xd4,0x85,0x58,0xf3,0x01,0x05,0x00,0x65,0xd4,0x80,0xff,0xff,0x10,0x06,0x66,0x60,
-0xf6,0x65,0xa5,0xd3,0xff,0xff,0xe8,0x84,0xc2,0xf3,0xe8,0x85,0x58,0xf3,0xc4,0x85,
-0xd4,0x80,0xff,0xff,0x21,0x05,0x61,0x60,0xc8,0x62,0x08,0x64,0xa2,0xdb,0x67,0x60,
-0x00,0x63,0x00,0x64,0xbd,0xdb,0xbd,0xdb,0xa3,0xd3,0xff,0xff,0xe0,0x84,0xf8,0xa0,
-0xff,0xff,0x01,0x04,0x08,0x64,0xa3,0xdb,0x66,0x60,0xf6,0x62,0xa2,0xd3,0xff,0xff,
-0xe8,0x84,0xe8,0x84,0xc4,0xfb,0x66,0x60,0xea,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x2b,0x60,0x5e,0x78,0xff,0xff,0xc2,0xf3,0x58,0xf1,0xff,0xff,0xd0,0x80,
-0xff,0xff,0x0d,0x04,0x61,0x60,0xc8,0x62,0x06,0x64,0xa2,0xdb,0x59,0x60,0xb6,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x2b,0x60,0x5e,0x78,0xff,0xff,0x59,0x60,
-0x9c,0x62,0xa2,0xd1,0xc3,0xf3,0xff,0xff,0xd0,0x80,0xff,0xff,0x0d,0x07,0x61,0x60,
-0xc8,0x62,0x02,0x64,0xa2,0xdb,0x59,0x60,0xb6,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x2b,0x60,0x5e,0x78,0xff,0xff,0x66,0x60,0xba,0x62,0xa2,0xd3,0xff,0xff,
-0x00,0xa0,0x60,0x45,0x0b,0x03,0x1e,0x60,0x94,0x62,0xa2,0xd3,0xff,0xff,0xd4,0x80,
-0xff,0xff,0x35,0x04,0x66,0x60,0xba,0x62,0x00,0x64,0xa2,0xdb,0x66,0x60,0xb8,0x62,
-0xa2,0xd3,0xff,0xff,0xff,0xa0,0xff,0xff,0x2a,0x02,0x66,0x60,0xbc,0x62,0xa2,0xd1,
-0x66,0x60,0xbe,0x63,0xa3,0xd3,0xff,0xff,0xd0,0x84,0xfe,0xa0,0xff,0xff,0x1f,0x04,
-0xe0,0x84,0xe0,0x84,0xd0,0x80,0xff,0xff,0x1a,0x04,0x66,0x60,0xbc,0x62,0x64,0x44,
-0x01,0xa4,0xa2,0xdb,0x1e,0x60,0x94,0x62,0x66,0x60,0xba,0x63,0xa2,0xd3,0xff,0xff,
-0x03,0xa4,0xa3,0xdb,0x61,0x60,0xc8,0x62,0x04,0x64,0xa2,0xdb,0x59,0x60,0xb8,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x2b,0x60,0x5e,0x78,0xff,0xff,0x66,0x60,
-0xb6,0x62,0xa2,0xd1,0x1e,0x60,0x94,0x62,0xa2,0xd3,0xff,0xff,0xd0,0x80,0xff,0xff,
-0x0d,0x04,0x61,0x60,0xc8,0x62,0x04,0x64,0xa2,0xdb,0x59,0x60,0xba,0x64,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x2b,0x60,0x5e,0x78,0xff,0xff,0x67,0x60,0x76,0x62,
-0xa2,0xd3,0xff,0xff,0x60,0x40,0x03,0x22,0x11,0x00,0x60,0x45,0xfd,0xb4,0xa2,0xdb,
-0x20,0x44,0xb4,0x84,0x40,0x40,0x61,0x60,0xc8,0x62,0x10,0x64,0xa2,0xdb,0x59,0x60,
-0xbc,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x37,0x00,0x1e,0x60,0xb2,0x62,
-0x00,0x60,0x64,0x64,0xa2,0xdb,0x2b,0x60,0x32,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0x00,0x60,0x04,0x64,0xa0,0x80,0x9c,0x84,
-0x05,0x03,0xa0,0x84,0xa2,0xdb,0x2c,0x60,0x33,0x78,0xff,0xff,0x00,0x60,0x40,0x64,
-0xa0,0x80,0x9c,0x84,0x05,0x03,0xa0,0x84,0xa2,0xdb,0x29,0x60,0xb5,0x78,0xff,0xff,
-0x00,0x60,0x20,0x64,0xa0,0x80,0x9c,0x84,0xe2,0x03,0xa0,0x84,0xa2,0xdb,0x01,0x65,
-0x2e,0x60,0x58,0x4e,0xd4,0x78,0xff,0xff,0xff,0x60,0xf7,0x65,0x5e,0xf3,0xff,0xff,
-0xa4,0x84,0xa2,0xdb,0x29,0x60,0xb5,0x78,0xff,0xff,0xad,0xf1,0x28,0x60,0xc6,0x62,
-0xa2,0xd9,0x2b,0x60,0x68,0x64,0x7c,0xfb,0x2c,0x60,0x68,0x78,0xff,0xff,0x3c,0x60,
-0xb2,0x62,0x28,0x60,0xce,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,
-0x1e,0x60,0xb0,0x62,0xa2,0xd1,0xff,0x60,0xdf,0x64,0xa0,0x84,0xa2,0xdb,0x1e,0x60,
-0x92,0x65,0xf4,0x56,0x7e,0x00,0x00,0x10,0x66,0x60,0xee,0x63,0x00,0x64,0xbd,0xdb,
-0xa5,0xd3,0xa3,0xdb,0x61,0x60,0xc8,0x62,0xa2,0xd3,0xff,0xff,0xf0,0xa0,0xfc,0xa0,
-0x08,0x03,0x13,0x02,0x66,0x60,0xb8,0x62,0xa2,0xd3,0xff,0xff,0xff,0xa0,0xff,0xff,
-0x0c,0x03,0x3c,0x60,0xb2,0x62,0x28,0x60,0xc2,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,
-0xff,0xff,0x1d,0xff,0x29,0x60,0x5d,0x78,0xff,0xff,0x88,0xf1,0x27,0x60,0xe0,0x63,
-0xd3,0x80,0xc4,0xf1,0x25,0x03,0x00,0x64,0xc4,0xfb,0x66,0x60,0xf4,0x65,0x58,0xf3,
-0xa5,0xdb,0xa3,0xd3,0xc0,0x85,0xd4,0x80,0x5b,0xd3,0x1a,0x04,0x60,0x43,0x63,0x42,
-0x06,0x65,0x46,0xd3,0x5a,0xd3,0x40,0x48,0x5a,0xd3,0x40,0x4c,0x40,0x4d,0x81,0xf3,
-0x28,0x45,0xd4,0x80,0x5a,0xd3,0x09,0x02,0x2c,0x45,0xd4,0x80,0x5a,0xd3,0x05,0x02,
-0x2d,0x45,0xd4,0x80,0x63,0x42,0x01,0x02,0x03,0x00,0x2c,0x60,0x2a,0x78,0xff,0xff,
-0xc2,0xf1,0x58,0xf3,0xff,0xff,0xd0,0x80,0xff,0xff,0x14,0x06,0x59,0x60,0x9c,0x62,
-0xa2,0xd3,0xc3,0xf1,0xff,0xff,0xd0,0x80,0xff,0xff,0x0c,0x05,0x3c,0x60,0xb2,0x62,
-0x28,0x60,0xc2,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x29,0x60,
-0x5d,0x78,0xff,0xff,0x1e,0x60,0xb2,0x62,0x00,0x60,0x74,0x64,0xa2,0xdb,0x2b,0x60,
-0xeb,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,
-0x00,0x60,0x04,0x64,0xa0,0x80,0x9c,0x84,0x05,0x03,0xa0,0x84,0xa2,0xdb,0x2c,0x60,
-0x33,0x78,0xff,0xff,0x00,0x60,0x40,0x64,0xa0,0x80,0x9c,0x84,0x05,0x03,0xa0,0x84,
-0xa2,0xdb,0x2b,0x60,0x9b,0x78,0xff,0xff,0x00,0x60,0x20,0x64,0xa0,0x80,0x9c,0x84,
-0x10,0x03,0xa0,0x84,0xa2,0xdb,0x01,0x65,0x2e,0x60,0x58,0x4e,0xd4,0x78,0xff,0xff,
-0xff,0x60,0xf7,0x65,0x5e,0xf3,0xff,0xff,0xa4,0x84,0xa2,0xdb,0x2b,0x60,0x9b,0x78,
-0xff,0xff,0x00,0x60,0x10,0x64,0xa0,0x80,0x9c,0x84,0xcd,0x03,0xa0,0x84,0xa2,0xdb,
-0x3c,0x60,0xb2,0x62,0x28,0x60,0xce,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,
-0x1d,0xff,0x2b,0x60,0x5e,0x78,0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x00,0x60,
-0x20,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x3c,0x60,0xb2,0x62,0x28,0x60,
-0xb6,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x3c,0x60,0xb2,0x62,
-0x28,0x60,0xc2,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x3c,0x60,
-0xb2,0x62,0x28,0x60,0xce,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,
-0x1e,0x60,0xb0,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x00,0x64,0x5e,0xfb,0x1e,0x60,
-0xa8,0x62,0xa2,0xd1,0x08,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0x1e,0x60,
-0xb2,0x62,0x00,0x60,0x02,0x64,0xa2,0xdb,0x29,0x60,0x53,0x64,0x5a,0xdb,0xcf,0xfe,
-0x2f,0x58,0xff,0xff,0x1e,0x60,0xb2,0x62,0x80,0x60,0x00,0x64,0xa2,0xdb,0x2c,0x60,
-0x71,0x64,0x5a,0xdb,0xcf,0xfe,0x8c,0xf3,0xff,0xff,0xff,0xa0,0x02,0x64,0x2a,0x02,
-0x8c,0xfb,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0x7f,0x60,0xff,0x64,0xa0,0x84,0xa2,0xdb,
-0x1e,0x60,0xb2,0x62,0x80,0x60,0x00,0x64,0xa2,0xdb,0x2c,0x60,0x8a,0x64,0x5a,0xdb,
-0xcf,0xfe,0xc1,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0x7f,0x60,
-0xff,0x64,0xa0,0x84,0xa2,0xdb,0x8c,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0xf2,0x02,
-0x1e,0x60,0xb0,0x62,0xa2,0xd1,0x7f,0x60,0xff,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,
-0xa1,0x84,0x5a,0xdb,0x20,0x44,0x40,0x2a,0x10,0x00,0x20,0xbc,0x40,0x40,0x11,0x60,
-0x48,0x65,0x2f,0x60,0x58,0x4e,0x23,0x78,0xff,0xff,0x3a,0x60,0x58,0x4e,0x14,0x78,
-0xff,0xff,0x2f,0x60,0x58,0x4e,0x42,0x78,0xff,0xff,0x59,0x60,0x20,0x64,0x5b,0xfb,
-0x1e,0x60,0xb0,0x62,0xa2,0xd1,0xef,0x60,0xff,0x64,0xa0,0x84,0xa2,0xdb,0x0f,0x4e,
-0x52,0x60,0x58,0x4f,0xaa,0x78,0xff,0xff,0x0e,0x4f,0x1e,0x60,0xb2,0x62,0x10,0x60,
-0x00,0x64,0xa2,0xdb,0x2c,0x60,0xce,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,
-0x20,0x44,0x20,0x2a,0x10,0x00,0xdf,0xb4,0x40,0x40,0x01,0x60,0x48,0x65,0x2f,0x60,
-0x58,0x4e,0x23,0x78,0xff,0xff,0x3a,0x60,0x58,0x4e,0x14,0x78,0xff,0xff,0x2f,0x60,
-0x58,0x4e,0x42,0x78,0xff,0xff,0x3c,0x60,0xb6,0x62,0x28,0x60,0xc2,0x64,0xa2,0xdb,
-0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0xef,0x60,
-0xef,0x64,0xa0,0x84,0xa2,0xdb,0x01,0x64,0x8c,0xfb,0xff,0xff,0xc1,0xfe,0x7c,0xf7,
-0xff,0xff,0xff,0xff,0x59,0xf1,0x28,0x44,0xd0,0x84,0x0f,0xa4,0x03,0x0e,0xe8,0x84,
-0xe8,0x84,0x04,0x00,0xe2,0xa4,0xe8,0x84,0xe8,0x87,0xf0,0xbf,0xc0,0x84,0xa2,0xdb,
-0x2e,0x58,0xff,0xff,0x5a,0xf1,0x28,0x44,0xd0,0x84,0x1f,0xa4,0x06,0x0e,0xe8,0x84,
-0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0x07,0x00,0xc2,0xa4,0xe8,0x84,0xe8,0x84,
-0xe8,0x84,0xe8,0x84,0xe8,0x87,0xf8,0xbf,0xc0,0x84,0xa2,0xdb,0x2e,0x58,0xff,0xff,
-0x5a,0xf1,0x59,0xf3,0x64,0x45,0xd4,0x84,0x80,0x65,0xc4,0x87,0x01,0x05,0x00,0x64,
-0xff,0xb4,0x58,0xfb,0x2e,0x58,0xff,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0x00,0x60,
-0x08,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,
-0xb0,0x62,0xa2,0xd1,0x00,0x60,0x10,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,
-0x2f,0x58,0xff,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0x00,0x60,0x20,0x64,0xb0,0x84,
-0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x2e,0x60,0xc1,0x78,0xff,0xff,
-0xcb,0xf3,0xff,0xff,0x60,0x40,0x03,0x36,0x2e,0x00,0x1e,0x60,0xb2,0x62,0xa2,0xd3,
-0xff,0xff,0x60,0x40,0x40,0x22,0xf1,0x00,0x66,0x60,0xb8,0x62,0xa2,0xd3,0xff,0xff,
-0xff,0xa0,0xff,0xff,0x11,0x02,0x26,0x46,0x00,0xf4,0x57,0x60,0x58,0x4e,0x59,0x78,
-0xff,0xff,0x66,0x60,0xbe,0x62,0xa2,0xd9,0x66,0x60,0xbc,0x63,0xa3,0xd3,0xff,0xff,
-0xd0,0x80,0xff,0xff,0x01,0x06,0xa3,0xd9,0x58,0x60,0x58,0x4e,0x6c,0x78,0xff,0xff,
-0x65,0x44,0x00,0xa0,0xff,0xff,0x01,0x03,0xe1,0xfb,0x00,0x65,0x2e,0x60,0x58,0x4e,
-0xd4,0x78,0xff,0xff,0x09,0x00,0x6d,0xf3,0xff,0xff,0x04,0xb4,0x04,0xbc,0x03,0x03,
-0x2e,0x60,0xc1,0x78,0xff,0xff,0x6d,0xfb,0x26,0x46,0x20,0xf2,0xa0,0x65,0x01,0x37,
-0x50,0x65,0x02,0x37,0x1e,0x65,0x03,0x37,0x0f,0x65,0x28,0x60,0xda,0x63,0x00,0xf4,
-0x02,0xf2,0xff,0xff,0xd4,0x84,0xbd,0xdb,0x03,0xf2,0x01,0x05,0xcc,0x84,0xbd,0xdb,
-0x04,0xf2,0x01,0x05,0xcc,0x84,0xbd,0xdb,0x05,0xf2,0x01,0x05,0xcc,0x84,0xa3,0xdb,
-0xfa,0xa3,0x26,0x46,0x00,0x60,0x00,0x65,0xa3,0xd3,0x23,0xf0,0x00,0x61,0xd0,0x84,
-0xf1,0x81,0xd4,0x84,0xf1,0x81,0xbd,0xdb,0xa3,0xd3,0x03,0xb1,0x03,0xa9,0x24,0xf0,
-0x42,0xfe,0x01,0x03,0xcc,0x84,0xf1,0x81,0xd0,0x84,0xf1,0x81,0xbd,0xdb,0xa3,0xd3,
-0x03,0xb1,0x03,0xa9,0x27,0xf0,0x42,0xfe,0x01,0x03,0xcc,0x84,0xf1,0x81,0xd0,0x84,
-0xf1,0x81,0xbd,0xdb,0xa3,0xd3,0x03,0xb1,0x03,0xa9,0x28,0xf0,0x01,0x03,0xcc,0x84,
-0xd0,0x84,0xa3,0xdb,0x60,0x45,0x68,0x60,0xcc,0x62,0x90,0x60,0x92,0x64,0xa2,0xdb,
-0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x5e,0xf3,0xcb,0xf3,0x04,0xb0,0xff,0xff,
-0x35,0x03,0x03,0x3a,0x35,0x00,0x73,0xf3,0xff,0xff,0x60,0x40,0x04,0x26,0x30,0x00,
-0xa3,0xd3,0x4b,0xd1,0x4b,0xd3,0xc0,0x9c,0xc0,0x84,0x4b,0xd1,0x00,0xa0,0x03,0xa0,
-0x01,0x03,0x1f,0x02,0x80,0x60,0x00,0x65,0x64,0x44,0xa4,0x85,0xe8,0x84,0xb4,0x84,
-0xe8,0x84,0xb4,0x84,0xa3,0xdb,0x60,0x45,0xfa,0x64,0xd4,0x80,0xff,0x60,0x06,0x64,
-0xd4,0x80,0x14,0x07,0x13,0x04,0x66,0x60,0xa0,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x4d,0xf3,0xff,0xff,0x60,0x40,0x00,0x3a,0x03,0x00,0x01,0x64,0x4d,0xfb,
-0x07,0x00,0x66,0x60,0x9a,0x62,0x10,0x64,0xa2,0xdb,0x06,0x00,0x00,0x64,0x4d,0xfb,
-0x01,0x64,0x23,0xfb,0xff,0xff,0x1a,0xff,0x5e,0xf3,0xff,0xff,0x04,0xb0,0x08,0xb0,
-0x06,0x03,0x7e,0x02,0x5f,0xf3,0xff,0xff,0xff,0xa4,0x5f,0xfb,0x7b,0x02,0x26,0x46,
-0x00,0xf4,0x02,0xf2,0x5a,0xd2,0x40,0x48,0x40,0x4c,0x5a,0xd2,0x5a,0xd2,0x40,0x4d,
-0x60,0x41,0x5a,0xd0,0x80,0xf9,0x40,0x63,0xad,0x80,0xf0,0xa3,0x09,0x02,0x3c,0x03,
-0x2d,0x41,0x2c,0x44,0x40,0x4d,0x28,0x44,0x40,0x4c,0x00,0x64,0x40,0x48,0xf4,0x00,
-0xd1,0x80,0x01,0x02,0x31,0x04,0x10,0xa3,0x80,0x60,0x00,0x65,0xa5,0x80,0xcf,0x83,
-0x08,0x02,0x28,0x44,0x60,0x88,0x2c,0x44,0x70,0x8c,0x2d,0x44,0x70,0x8d,0xf1,0x81,
-0xf5,0x00,0xe7,0xa3,0x64,0x44,0x00,0xa0,0x00,0x62,0x02,0x02,0x00,0x61,0x1c,0x00,
-0xe0,0x84,0xde,0x82,0xfd,0x04,0x42,0xfe,0xf8,0x84,0x62,0x45,0xc7,0x83,0x60,0x45,
-0x02,0xfe,0xd5,0x84,0x02,0x05,0x01,0x05,0x61,0x44,0xcf,0x83,0x60,0x41,0x08,0x03,
-0x28,0x44,0x60,0x88,0x2c,0x44,0x70,0x8c,0x2d,0x44,0x70,0x8d,0xf1,0x81,0xf1,0x00,
-0xce,0x82,0xe9,0x81,0xfd,0x02,0xf1,0x81,0x02,0xf2,0xff,0xff,0x60,0x47,0xe8,0x84,
-0xe8,0x84,0x5a,0xd2,0x3f,0xb5,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0xb4,0x84,0x61,0x45,0xd4,0x84,0xc0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0x60,0x53,0x80,0xf3,0x60,0x41,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,
-0x60,0x45,0x61,0x44,0xd4,0x84,0xa4,0xfb,0x04,0x60,0x00,0x71,0x60,0x45,0x68,0x60,
-0xcc,0x62,0x90,0x60,0x95,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,
-0x05,0x64,0x5f,0xfb,0x5e,0xf3,0x26,0x46,0x0c,0xbc,0xa2,0xdb,0xff,0x60,0x00,0x65,
-0x25,0xf2,0xff,0xff,0x24,0x88,0x60,0x47,0x24,0x8c,0x2c,0x60,0x58,0x4e,0xf8,0x78,
-0xff,0xff,0x0c,0x48,0x2d,0x60,0x58,0x4e,0x08,0x78,0xff,0xff,0x2d,0x60,0x58,0x4e,
-0x1e,0x78,0xff,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0x00,0x60,0x40,0x64,0xb0,0x84,
-0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x3c,0x60,0xb2,0x62,0x28,0x60,0xce,0x64,0xa2,0xdb,
-0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0xff,0x60,
-0xdf,0x64,0xa0,0x84,0xa2,0xdb,0x26,0x46,0x2f,0x58,0xff,0xff,0x65,0x44,0x00,0xa0,
-0x40,0x48,0x13,0x03,0x66,0x60,0x2a,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xf6,0xa0,
-0xa2,0xdb,0x0f,0x04,0x00,0x64,0xa2,0xdb,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x00,0x60,
-0x40,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x66,0x60,0x2a,0x62,0x00,0x64,
-0xa2,0xdb,0x66,0x60,0x2c,0x62,0xa2,0xd3,0x28,0x45,0xc4,0x84,0xa2,0xdb,0x66,0x60,
-0x2e,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xce,0xa0,0xa2,0xdb,0x14,0x06,0x32,0x64,
-0xa2,0xdb,0x66,0x60,0x30,0x62,0xa2,0xd1,0x66,0x60,0x32,0x64,0xc0,0x82,0xa2,0xd1,
-0x66,0x60,0x2c,0x62,0xa2,0xd3,0xff,0xff,0xd0,0x84,0xa2,0xdb,0xe0,0x85,0x59,0x60,
-0x9c,0x62,0x65,0x44,0xa2,0xdb,0x66,0x60,0x30,0x62,0xa2,0xd1,0x66,0x60,0x32,0x64,
-0xc0,0x82,0x28,0x44,0xa2,0xdb,0x66,0x60,0x30,0x62,0x64,0x44,0x9e,0xa0,0x02,0xa4,
-0x01,0x02,0x00,0x64,0xa2,0xdb,0x2e,0x58,0xff,0xff,0x7b,0xf5,0xff,0xff,0x81,0xf1,
-0x2b,0xf8,0x31,0xf8,0xff,0xff,0x82,0xf1,0x2c,0xf8,0x32,0xf8,0xff,0xff,0x83,0xf1,
-0x2d,0xf8,0x33,0xf8,0xff,0xff,0xbd,0xf1,0x2e,0xf8,0xbe,0xf1,0xff,0xff,0x2f,0xf8,
-0xbf,0xf1,0x30,0xf8,0xff,0xff,0x00,0x64,0x22,0xfa,0x06,0x60,0x20,0x64,0x0e,0xfa,
-0x65,0x44,0x29,0xfa,0x2e,0x58,0xff,0xff,0x66,0x60,0xcc,0x62,0x2e,0x44,0xa2,0xdb,
-0x1e,0x60,0xb0,0x62,0x00,0x64,0xa2,0xdb,0x3c,0x60,0x82,0x62,0x3c,0x60,0x2e,0x64,
-0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xc1,0xfe,
-0x1e,0x60,0xb2,0x62,0x00,0x60,0x01,0x64,0xa2,0xdb,0x2f,0x60,0x61,0x64,0x5a,0xdb,
-0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0xff,0x60,0xfe,0x61,
-0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,0x66,0x60,0xcc,0x62,0xa2,0xd3,
-0xff,0xff,0x40,0x4e,0x2e,0x58,0xff,0xff,0x27,0x42,0xa2,0xd3,0xa2,0xd1,0xac,0x86,
-0x0e,0xf2,0x57,0x03,0x60,0x40,0x02,0x2a,0x54,0x00,0x0b,0xf2,0xff,0xff,0x00,0xa4,
-0x44,0x45,0x39,0x02,0x21,0x44,0xf7,0xa0,0xff,0xff,0x35,0x07,0x5c,0x81,0x22,0x44,
-0x00,0x7c,0xd0,0x80,0xff,0xff,0x01,0x02,0x46,0x42,0x48,0xf3,0xff,0xff,0x60,0x41,
-0x02,0xfa,0x40,0xa1,0x7c,0x63,0x84,0xa1,0x00,0xf2,0x03,0x06,0x01,0xfc,0x60,0x46,
-0xfa,0x00,0x80,0x60,0x7c,0x64,0x01,0xfa,0x66,0x43,0x25,0x46,0x05,0xfc,0x06,0xfc,
-0x01,0xf0,0x03,0x67,0xb0,0x84,0x00,0xf0,0x3c,0x7e,0x01,0xfa,0x04,0x64,0x03,0xfa,
-0x04,0xf8,0x00,0x64,0x0b,0xfa,0x0c,0xfa,0xff,0xff,0x0e,0xfa,0x0f,0xfa,0x3c,0x60,
-0x88,0x62,0x3c,0x60,0x64,0x64,0xa2,0xdb,0x25,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0xb9,0x00,0x0f,0x4e,0x44,0x45,0x64,0x46,0x3c,0x60,0x88,0x62,
-0x00,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,
-0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,0xa3,0xff,0xd1,0xfe,0x0e,0x4f,
-0xa3,0x00,0x2f,0x58,0xff,0xff,0x3c,0x60,0x6a,0x64,0x40,0x47,0x58,0x4f,0x9c,0x00,
-0x3c,0x60,0x46,0x64,0x40,0x47,0x58,0x4f,0x08,0x00,0x3c,0x60,0x70,0x64,0x40,0x47,
-0x58,0x4f,0x03,0x00,0x30,0x60,0x7f,0x78,0xff,0xff,0x27,0x42,0xa2,0xd3,0xa2,0xd1,
-0xac,0x86,0x0e,0xf2,0x46,0x03,0x60,0x40,0x02,0x2a,0x43,0x00,0x95,0xf3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0x28,0x03,0x3c,0x60,0x46,0x64,0x27,0x45,0xd4,0x80,0xff,0xff,
-0x22,0x02,0x00,0x64,0x13,0xfb,0x22,0xf2,0xff,0xff,0xff,0xff,0x10,0x26,0x0f,0x00,
-0x1c,0xf2,0xff,0xff,0x03,0xb4,0xff,0xff,0x00,0x36,0x15,0x00,0x01,0x36,0x13,0x00,
-0x02,0x36,0x05,0x00,0x22,0xf2,0xff,0xff,0x00,0xa8,0xff,0xff,0x0c,0x03,0x3c,0x60,
-0x88,0x62,0x3c,0x60,0x40,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0x16,0x00,0x0f,0x4e,0x44,0x45,0x64,0x46,0x3c,0x60,0x88,0x62,
-0x00,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,
-0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,0xa3,0xff,0xd1,0xfe,0x0e,0x4f,
-0xb4,0x00,0x2f,0x58,0xff,0xff,0x02,0x64,0x01,0x00,0x01,0x64,0x40,0x55,0x3b,0xff,
-0x48,0x00,0xb2,0xfe,0xff,0xff,0xf9,0x05,0xb3,0xfe,0xff,0xff,0xf4,0x05,0xb0,0xfe,
-0xff,0xff,0x91,0x05,0xb1,0xfe,0xff,0xff,0x26,0x05,0x3b,0x00,0x48,0xf1,0x0f,0x4e,
-0x64,0x41,0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,0x58,0x4f,0xa2,0x78,0xff,0xff,
-0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,0xc4,0x78,0xff,0xff,0x08,0xfe,
-0x0e,0x4f,0x26,0x03,0x3c,0x60,0x88,0x62,0x3c,0x60,0x64,0x64,0xa2,0xdb,0x66,0x44,
-0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x22,0x41,0x00,0xb9,0x21,0x44,
-0x08,0x24,0x46,0x42,0x5c,0x81,0x3e,0x41,0x22,0x44,0x00,0xb9,0xac,0x86,0x09,0x02,
-0xd5,0x03,0x31,0x40,0x01,0x2a,0x05,0x00,0x09,0xf0,0x02,0x5e,0x44,0x42,0x21,0x44,
-0x4c,0x81,0x96,0xf3,0x21,0x45,0xd4,0x80,0xff,0xff,0xc8,0x07,0x58,0x4f,0x04,0x00,
-0x00,0x00,0xa1,0xff,0xff,0xff,0xbe,0x3f,0x3c,0x60,0x34,0x62,0xa2,0xd3,0xff,0xff,
-0x00,0xa8,0x60,0x46,0x40,0x03,0x46,0x48,0x03,0x60,0x3c,0x64,0x01,0xfa,0x02,0xf0,
-0x0f,0x4e,0x64,0x41,0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,0x58,0x4f,0xa2,0x78,
-0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,0xc4,0x78,0xff,0xff,
-0x08,0xfe,0x0e,0x4f,0x76,0x03,0x3c,0x60,0x88,0x62,0x3c,0x60,0x3a,0x64,0xa2,0xdb,
-0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x00,0xf2,0x00,0x63,
-0x00,0xfc,0x05,0xf0,0x06,0xfc,0x66,0x43,0x05,0xfc,0x28,0x46,0x00,0xfa,0x04,0xfa,
-0x04,0x64,0x03,0xfa,0x05,0xf8,0x06,0xf8,0x08,0x64,0x0e,0xfa,0x3c,0x60,0x88,0x62,
-0x3c,0x60,0x40,0x64,0xa2,0xdb,0x28,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0xd1,0xfe,0x4b,0x00,0x20,0x44,0x01,0x2a,0x4b,0x00,0x02,0x2a,0x22,0x00,
-0x0f,0x4e,0x00,0x60,0x3c,0x61,0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,0x58,0x4f,
-0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,0xc4,0x78,
-0xff,0xff,0x08,0xfe,0x0e,0x4f,0x35,0x03,0x3c,0x60,0x88,0x62,0x3c,0x60,0x3a,0x64,
-0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x20,0x44,
-0xfd,0xb4,0x40,0x40,0x91,0xf1,0x0f,0x4e,0x64,0x41,0x41,0x4d,0x40,0xa1,0xa2,0xff,
-0x19,0x60,0x58,0x4f,0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,
-0x58,0x4f,0xc4,0x78,0xff,0xff,0x08,0xfe,0x0e,0x4f,0x13,0x03,0x3c,0x60,0x88,0x62,
-0x3c,0x60,0x40,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0x08,0x64,0x0e,0xfa,0x20,0x44,0xfe,0xb4,0x40,0x40,0x04,0x64,0x40,0x55,
-0x3b,0xff,0x2f,0x58,0xff,0xff,0xb8,0xfe,0xff,0xff,0x02,0x24,0x97,0xf7,0xff,0xff,
-0xff,0xff,0xba,0xfe,0xff,0xff,0x05,0x05,0xb9,0xfe,0xbb,0xfe,0x30,0x60,0x7f,0x78,
-0xff,0xff,0x36,0x44,0x00,0x7f,0xfc,0xa0,0x60,0x45,0x05,0x05,0x0e,0x60,0xd4,0x64,
-0x44,0xd7,0xff,0xff,0xff,0xff,0x30,0x60,0x7f,0x78,0xff,0xff,0x7f,0x60,0xc0,0x64,
-0x24,0x45,0xa4,0x80,0x7f,0x67,0x02,0x61,0x13,0x02,0x20,0x44,0x01,0x2a,0x03,0x00,
-0x7f,0x67,0x07,0x61,0x0d,0x00,0x48,0xf1,0x25,0x44,0x64,0x45,0x91,0xfb,0xd4,0x80,
-0x7f,0x67,0x05,0x61,0x05,0x07,0x20,0x44,0x03,0xbc,0x40,0x40,0xd1,0xfe,0x00,0x67,
-0x23,0x58,0xff,0xff,0x24,0x44,0x36,0x60,0x58,0x4f,0x2b,0x78,0xff,0xff,0x03,0x61,
-0x03,0x03,0x31,0x60,0xfa,0x78,0xff,0xff,0x24,0x44,0x40,0xb0,0xff,0xff,0x48,0x03,
-0x25,0x46,0x66,0x5c,0xd1,0xf9,0x0e,0xf0,0xff,0xff,0x64,0x40,0x08,0x2a,0x1f,0x00,
-0x3c,0x60,0x3a,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,0x18,0x03,0x0f,0x4e,
-0x46,0x45,0x3c,0x60,0x88,0x62,0x00,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,
-0x5a,0xdb,0xff,0xff,0x2b,0xff,0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,
-0xa3,0xff,0xd1,0xfe,0x0e,0x4f,0x0e,0xf2,0xff,0xff,0xf7,0xb4,0x0e,0xfa,0xd1,0xf5,
-0x22,0xf0,0xff,0x60,0xef,0x64,0xa0,0x84,0xa2,0xda,0x00,0x64,0x1c,0xfa,0x3c,0x60,
-0x88,0x62,0x3c,0x60,0x46,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0x0e,0xf2,0xff,0xff,0x02,0xbc,0x0e,0xfa,0x3c,0x60,0x46,0x64,
-0x40,0x47,0x2f,0x60,0x58,0x4f,0xe3,0x78,0xff,0xff,0x32,0x60,0xf0,0x78,0xff,0xff,
-0x59,0x60,0xe4,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,
-0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x25,0x46,0x3c,0x60,0x28,0x65,0x08,0xf2,
-0xff,0xff,0xd4,0x80,0x03,0x61,0x40,0x03,0x3c,0x60,0x88,0x62,0x00,0x64,0xa2,0xdb,
-0x25,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x28,0xf0,0xfd,0x7f,
-0x04,0x7e,0x64,0x40,0x02,0x26,0x40,0xbc,0x0e,0xf0,0x64,0x40,0x04,0x26,0x80,0xbc,
-0xc0,0x22,0xff,0x7f,0x64,0x40,0x08,0x26,0x08,0xbc,0x0e,0xfa,0x3f,0xf0,0xff,0xff,
-0x28,0xf2,0x38,0xf2,0x60,0x41,0x08,0x2a,0x64,0x47,0x38,0xfa,0x60,0x45,0x49,0xf3,
-0x00,0x63,0xd4,0x80,0x22,0xfc,0x01,0x04,0x07,0x00,0x22,0xf0,0x08,0x64,0xb0,0x84,
-0xa2,0xda,0x32,0x60,0x08,0x78,0xff,0xff,0x39,0x60,0x58,0x4f,0x90,0x78,0xff,0xff,
-0x05,0x04,0x22,0xf0,0x04,0x64,0xb0,0x84,0xa2,0xda,0x14,0x00,0x32,0x60,0x58,0x4f,
-0xf5,0x78,0xff,0xff,0x05,0x61,0x03,0x04,0x32,0x60,0xf2,0x78,0xff,0xff,0x25,0x46,
-0xcb,0xf3,0x95,0xf3,0xfe,0xa0,0x00,0xa0,0x05,0x07,0x04,0x02,0x22,0xf0,0x04,0x64,
-0xb0,0x84,0xa2,0xda,0x24,0x44,0x01,0x2b,0x3a,0x00,0x02,0x27,0x38,0x00,0x3c,0x60,
-0x3a,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,0x46,0x48,0x10,0x63,0x25,0x46,
-0xbf,0xd0,0x28,0x46,0xff,0xd8,0x25,0x46,0xfb,0x1d,0x64,0x44,0x00,0xa8,0x28,0x44,
-0x03,0x02,0x28,0x46,0x05,0xfa,0x06,0xfa,0x16,0x63,0x6a,0x61,0x25,0x46,0xa3,0xd0,
-0x28,0x46,0xc9,0x81,0xbd,0xd8,0xfa,0x02,0x0e,0xf0,0xff,0x60,0xfc,0x64,0xa0,0x84,
-0x0e,0xfa,0x00,0x64,0x0f,0xfa,0x00,0x64,0x25,0x46,0x00,0xfa,0x66,0x44,0x05,0xfa,
-0x3c,0x60,0x88,0x62,0x3c,0x60,0x34,0x64,0xa2,0xdb,0x25,0x44,0x5a,0xdb,0x0a,0x64,
-0x5a,0xdb,0xff,0xff,0x2b,0xff,0xd1,0xfe,0x00,0x64,0x0e,0xfa,0x28,0x46,0x0e,0xf0,
-0xff,0x60,0xfb,0x64,0xa0,0x84,0x0e,0xfa,0x22,0xf2,0x66,0x43,0x00,0xa8,0x60,0x5c,
-0x08,0x60,0x0a,0x64,0xa0,0xdd,0x64,0x44,0x69,0x02,0x95,0xf3,0xff,0xff,0x00,0xa0,
-0xff,0xff,0x44,0x03,0x26,0x44,0x0a,0x36,0x00,0x63,0x14,0x36,0x01,0x63,0x37,0x36,
-0x02,0x63,0x6e,0x36,0x03,0x63,0x13,0xfc,0x26,0x44,0xff,0x27,0x06,0x00,0x26,0xf2,
-0x26,0xf2,0x60,0x45,0x60,0x47,0xd4,0x84,0x01,0x00,0x60,0x47,0xff,0x65,0xa4,0x84,
-0x1d,0xfa,0x00,0x64,0x15,0xfa,0x27,0xf2,0xff,0xff,0x00,0xa0,0xff,0xff,0x15,0x02,
-0x1e,0x60,0x98,0x65,0x25,0xf2,0xff,0xff,0x0f,0xb4,0xb8,0xf1,0x00,0x7f,0xd0,0x80,
-0x60,0x5c,0x06,0x05,0x67,0x60,0x6e,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0xa5,0xd9,0x64,0x40,0x00,0x3a,0xb8,0xf9,0x11,0x00,0x29,0xf0,0x08,0x67,0xb0,0x84,
-0xa2,0xda,0x1e,0x65,0x29,0xf2,0xff,0xff,0x60,0x40,0x03,0x2b,0x18,0x65,0x65,0x44,
-0x04,0xa4,0x64,0x40,0x40,0x27,0x08,0xa4,0x21,0xfa,0x08,0x00,0x3a,0x60,0x58,0x4e,
-0x14,0x78,0xff,0xff,0x3a,0x60,0x58,0x4e,0x72,0x78,0xff,0xff,0x95,0xf3,0xff,0xff,
-0x00,0xa0,0x47,0xf3,0x03,0x03,0x24,0x47,0x0f,0xb4,0x02,0x00,0xe8,0x84,0xe8,0x84,
-0x1c,0xfa,0x3c,0x60,0x88,0x62,0x3c,0x60,0x28,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,
-0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xc1,0xfe,0x0c,0x00,0x3c,0x60,0x88,0x62,
-0x3c,0x60,0x46,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0xd3,0xfe,0x0e,0xf0,0x24,0x44,0x02,0x27,0x02,0x00,0x01,0x27,0x22,0x00,
-0x64,0x40,0x08,0x2a,0x1f,0x00,0x3c,0x60,0x3a,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,
-0x60,0x46,0x18,0x03,0x0f,0x4e,0x46,0x45,0x3c,0x60,0x88,0x62,0x00,0x64,0xa2,0xdb,
-0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xa2,0xff,0x1a,0x60,
-0x58,0x4f,0x9e,0x78,0xff,0xff,0xa3,0xff,0xd1,0xfe,0x0e,0x4f,0x0e,0xf2,0xff,0xff,
-0xf7,0xb4,0x0e,0xfa,0x00,0x67,0x01,0x00,0x7f,0x67,0x23,0x58,0xff,0xff,0x0f,0x4e,
-0x25,0x46,0x38,0xf2,0x05,0x48,0x00,0xa8,0x60,0x41,0x66,0x44,0x0a,0x03,0x00,0xf2,
-0x42,0xfe,0xac,0x86,0x01,0xf2,0x1e,0x03,0x7f,0xb5,0xd5,0x81,0x66,0x44,0xf7,0x07,
-0x25,0x46,0x05,0xf0,0x06,0xfa,0x05,0xfa,0xd0,0x80,0x64,0x43,0x12,0x03,0x60,0x46,
-0x01,0xf0,0x80,0x67,0xb0,0x84,0x01,0xfa,0x00,0xf0,0x00,0x64,0x00,0xfa,0x64,0x46,
-0x05,0xfc,0x46,0x45,0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,0xa3,0xff,
-0x08,0x45,0x02,0xfe,0x2e,0x58,0xff,0xff,0x20,0x44,0x40,0xb0,0x7f,0x67,0x02,0x61,
-0x03,0x03,0x34,0x60,0x2d,0x78,0xff,0xff,0x00,0x64,0x24,0x45,0x80,0x26,0x01,0x64,
-0x95,0xfb,0x59,0x60,0x54,0x62,0xa2,0xd3,0xff,0xff,0x01,0xa4,0xa2,0xdb,0x4a,0xf1,
-0x43,0xf1,0x64,0x40,0x01,0x2a,0x08,0x00,0x64,0x40,0x01,0x2a,0x05,0x00,0x1e,0x60,
-0xa0,0x63,0x09,0x60,0x2b,0x64,0x19,0x00,0xc7,0xf1,0x1e,0x60,0xa0,0x63,0x64,0x45,
-0x80,0x27,0x19,0x00,0x64,0x44,0x00,0xac,0xff,0xff,0x0d,0x02,0x02,0x60,0x52,0x64,
-0xbd,0xdb,0x03,0x60,0x1c,0x64,0xbd,0xdb,0x7f,0x60,0xff,0x64,0xbd,0xdb,0x7f,0x60,
-0xff,0x64,0xbd,0xdb,0x07,0x00,0xe8,0x84,0xe0,0x84,0xbd,0xdb,0xbd,0xdb,0xbd,0xdb,
-0xff,0xff,0xbd,0xdb,0x36,0x00,0x80,0x67,0x94,0x81,0x61,0x44,0xe8,0x84,0xe8,0x84,
-0xe8,0x84,0xe8,0x84,0xe0,0x84,0xbd,0xdb,0x61,0x44,0xe8,0x84,0xe8,0x84,0xe8,0x84,
-0xe0,0x84,0xbd,0xdb,0x0d,0x60,0x18,0x65,0x61,0x44,0xd4,0x80,0xff,0xff,0x01,0x06,
-0x65,0x44,0xe0,0x85,0xc4,0x85,0xe0,0x84,0xf4,0x66,0x7e,0x00,0x00,0x10,0xe0,0x84,
-0xe0,0x84,0xc4,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe0,0x84,
-0xbd,0xdb,0x06,0x60,0x8c,0x65,0x61,0x44,0xd4,0x80,0xff,0xff,0x01,0x06,0x65,0x44,
-0xe0,0x85,0xc4,0x85,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xc4,0x84,0xe8,0x84,0xe8,0x84,
-0xe8,0x84,0xe8,0x84,0xe0,0x84,0xbd,0xdb,0x1e,0x60,0xa0,0x63,0x04,0x61,0xbd,0xd1,
-0x90,0x65,0x64,0x44,0xd4,0x80,0x65,0x44,0x01,0x05,0xbf,0xdb,0x09,0x60,0x2b,0x65,
-0x64,0x44,0xd4,0x80,0xcd,0x81,0x02,0x06,0x65,0x44,0xbf,0xdb,0xf0,0x02,0x00,0x61,
-0x41,0x56,0xc7,0xfe,0x30,0x60,0x7f,0x78,0xff,0xff,0x36,0x47,0xff,0x23,0x06,0x00,
-0x00,0x7f,0x60,0x41,0x7f,0x67,0x34,0x60,0x2d,0x78,0xff,0xff,0x99,0xff,0x00,0x60,
-0x00,0xeb,0x00,0x60,0x00,0xea,0x98,0xff,0x20,0x44,0x80,0xbc,0x40,0x40,0x59,0x60,
-0x6a,0x63,0xc9,0xf3,0xa3,0xdb,0x00,0x63,0x60,0x40,0x01,0x26,0x09,0x00,0x01,0xa3,
-0x60,0x40,0x02,0x26,0x05,0x00,0x01,0xa3,0x60,0x40,0x04,0x26,0x01,0x00,0x01,0xa3,
-0x60,0x41,0x17,0x60,0xde,0x65,0xa5,0xdd,0x61,0x44,0x08,0x2a,0x03,0x00,0x03,0x63,
-0x08,0x64,0x0c,0x00,0x04,0x2a,0x03,0x00,0x02,0x63,0x04,0x64,0x07,0x00,0x02,0x2a,
-0x03,0x00,0x01,0x63,0x02,0x64,0x02,0x00,0x00,0x63,0x01,0x64,0x50,0xfb,0x51,0xfd,
-0x95,0xf3,0xff,0xff,0x00,0xa0,0x00,0x64,0x2d,0x03,0xa1,0xfb,0xa2,0xfb,0xa3,0xfb,
-0xff,0xff,0x80,0xf3,0x88,0xff,0x00,0x75,0x00,0x72,0xe0,0x84,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0x60,0x53,0xed,0xe2,0xbf,0xf3,0xff,0xff,0xff,0xb4,0x60,0x52,0x8a,0xff,
-0xbd,0xf1,0x81,0xf9,0xbe,0xf1,0xff,0xff,0x82,0xf9,0xbf,0xf1,0x83,0xf9,0x17,0x60,
-0xdc,0x63,0xa3,0xd3,0x00,0x65,0x60,0x40,0x02,0x26,0x01,0x65,0x60,0x40,0x04,0x26,
-0x02,0x65,0x60,0x40,0x08,0x26,0x03,0x65,0x59,0x60,0x68,0x62,0x65,0x44,0xa2,0xdb,
-0x00,0x67,0x10,0x00,0xc9,0xf3,0x00,0x65,0x60,0x40,0x02,0x26,0x01,0x65,0x60,0x40,
-0x04,0x26,0x02,0x65,0x60,0x40,0x08,0x26,0x03,0x65,0x59,0x60,0x68,0x62,0x65,0x44,
-0xa2,0xdb,0x00,0x67,0x23,0x58,0xff,0xff,0x7f,0x60,0xc0,0x64,0x24,0x45,0xa4,0x80,
-0x7f,0x67,0x02,0x61,0x3a,0x02,0x59,0x60,0x56,0x62,0xa2,0xd3,0xff,0xff,0x01,0xa4,
-0xa2,0xdb,0xff,0x60,0xfe,0x64,0x32,0x45,0x24,0x92,0x02,0x61,0x41,0x56,0xc7,0xfe,
-0x30,0x60,0x7f,0x78,0xff,0xff,0x94,0xf1,0x20,0x44,0x64,0x40,0xff,0x26,0x24,0x00,
-0x7f,0xb4,0x40,0x40,0x00,0x64,0x40,0x5e,0x3c,0x60,0x64,0x62,0xa2,0xd3,0xff,0xff,
-0x00,0xa8,0x60,0x46,0x0f,0xf2,0x18,0x03,0x00,0xa8,0xff,0xff,0x15,0x03,0x0f,0x4e,
-0x46,0x45,0x3c,0x60,0x88,0x62,0x00,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,
-0x5a,0xdb,0xff,0xff,0x2b,0xff,0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,
-0xa3,0xff,0xd1,0xfe,0x0e,0x4f,0xe0,0x00,0x00,0x67,0x23,0x58,0xff,0xff,0x00,0x61,
-0x00,0x7c,0x08,0x60,0x0a,0x64,0xa0,0xd9,0x00,0x67,0x23,0x58,0xff,0xff,0x25,0x44,
-0xa0,0xd1,0x08,0x60,0x0a,0x64,0xa0,0xd9,0x00,0x67,0x23,0x58,0xff,0xff,0x7f,0x60,
-0xc0,0x64,0x24,0x45,0xa4,0x80,0x02,0x61,0x25,0x02,0x25,0x45,0x12,0x60,0xfc,0x63,
-0x05,0x61,0xbd,0xd3,0xbd,0xd1,0xd4,0x80,0xbd,0xd3,0xcd,0x81,0x02,0x03,0x19,0x03,
-0xf8,0x00,0x40,0x4c,0x0f,0x4e,0x64,0x41,0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,
-0x58,0x4f,0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,
-0xc4,0x78,0xff,0xff,0x08,0xfe,0x0e,0x4f,0x01,0x03,0x2c,0x58,0x0c,0x61,0x05,0x67,
-0x02,0x00,0x04,0x61,0x7f,0x67,0x23,0x58,0xff,0xff,0x03,0x4e,0x0c,0x60,0x6e,0x62,
-0xa2,0xd7,0x58,0x43,0xff,0xff,0x0e,0x43,0x41,0x47,0x7e,0x60,0xc0,0x64,0x24,0x45,
-0xa4,0x80,0x02,0x61,0x26,0x02,0x25,0x45,0xfc,0x2b,0x22,0x00,0x0e,0x60,0xd8,0x63,
-0x6a,0x61,0x24,0x44,0x01,0x27,0x11,0x00,0xbd,0xd3,0xa3,0xd1,0xd4,0x80,0xcd,0x81,
-0x08,0x24,0x64,0x58,0x08,0xa3,0xf8,0x02,0x15,0xf5,0x22,0xf2,0xff,0xff,0x00,0xa8,
-0x00,0x61,0x01,0x02,0x04,0x61,0x00,0x67,0x0d,0x00,0x27,0x40,0x04,0x3a,0xfb,0x00,
-0xbd,0xd3,0xbe,0xd1,0xd4,0x80,0xcd,0x81,0x08,0x24,0x64,0x58,0x08,0xa3,0xf5,0x02,
-0x04,0x61,0x7f,0x67,0x23,0x58,0xff,0xff,0x4b,0xd3,0x15,0xf5,0x60,0x41,0x22,0xf0,
-0xe9,0x85,0x64,0x44,0xff,0x22,0xdc,0x84,0xc4,0x84,0x22,0xfa,0x64,0x44,0xc2,0x82,
-0x00,0xa8,0xc2,0x84,0x08,0x24,0xd8,0x84,0xbf,0xd1,0xd8,0x85,0x64,0x43,0x58,0x4f,
-0x61,0x00,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x67,0x60,0x6a,0x62,0x01,0x64,
-0xa2,0xdb,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x00,0x60,0x80,0x64,0xb0,0x84,0xa2,0xdb,
-0xff,0xff,0xcf,0xfe,0x05,0x00,0x01,0x64,0x90,0xfb,0x01,0x67,0x85,0xfb,0xff,0xff,
-0x15,0xf5,0xff,0xff,0x22,0xf2,0xbf,0xd1,0xff,0xff,0x62,0x43,0xcc,0x84,0xe0,0x85,
-0x09,0x06,0xbf,0xd1,0x64,0x41,0xd5,0x80,0x64,0x43,0x01,0x06,0x65,0x41,0x48,0x65,
-0x58,0x4f,0x55,0x00,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x58,0x60,0x5a,0x63,
-0xa3,0xd3,0x15,0xf5,0x60,0x41,0xe8,0x84,0xdc,0x84,0x22,0xfa,0xfc,0x60,0x80,0x64,
-0x5a,0xda,0xda,0x85,0x04,0xa3,0x58,0x4f,0x25,0x00,0x00,0x67,0x00,0x61,0x23,0x58,
-0xff,0xff,0x15,0xf5,0x22,0xf2,0xbf,0xd1,0xff,0xff,0x62,0x43,0xcc,0x84,0xe0,0x81,
-0x15,0x06,0xbf,0xd1,0x64,0x45,0xd5,0x80,0x64,0x43,0xfc,0xa3,0x04,0x06,0x65,0x41,
-0xe9,0x84,0xdc,0x84,0x22,0xfa,0x44,0x65,0x04,0xa1,0x58,0x4f,0x28,0x00,0x58,0x60,
-0x5a,0x62,0xa2,0xd3,0xff,0xff,0xcc,0x84,0xe0,0x84,0xa2,0xdb,0x00,0x67,0x00,0x61,
-0x23,0x58,0xff,0xff,0x41,0x4d,0x00,0xa1,0x80,0x64,0x17,0x03,0x65,0x42,0xd4,0x85,
-0x2d,0x41,0x55,0x8d,0xff,0xff,0x02,0x04,0x65,0x41,0x02,0x00,0x00,0x64,0x40,0x4d,
-0xca,0x84,0xbd,0xd1,0xc9,0x81,0x58,0xd8,0xfc,0x02,0x2d,0x41,0x00,0xa1,0xd8,0x85,
-0x04,0x03,0x00,0xf4,0x7c,0x65,0x04,0x62,0xeb,0x00,0x2f,0x58,0xff,0xff,0x41,0x4d,
-0x01,0xf2,0x65,0x42,0x7f,0xb5,0x2d,0x41,0x00,0xa1,0x55,0x8d,0x0e,0x03,0x02,0x04,
-0x65,0x41,0x02,0x00,0x00,0x64,0x40,0x4d,0xca,0x84,0x58,0xd0,0xc9,0x81,0xbd,0xd9,
-0xfc,0x02,0x00,0xf4,0x01,0xf2,0x04,0x62,0xed,0x00,0x2f,0x58,0xff,0xff,0x66,0x44,
-0x93,0xfb,0x8a,0xf1,0x02,0x64,0xc0,0x84,0xe8,0x84,0x22,0xfa,0xf1,0x60,0x01,0x64,
-0x23,0xfa,0x5a,0x8d,0x89,0xf1,0x27,0x60,0xe0,0x63,0x44,0x4b,0x43,0x4c,0x2b,0x45,
-0xd7,0x80,0xbe,0xd1,0x0b,0x05,0x2d,0x45,0x64,0x43,0x44,0x61,0x35,0x60,0x58,0x4f,
-0x5d,0x78,0xff,0xff,0x45,0x4d,0x2c,0x43,0x04,0xa3,0xf0,0x00,0x93,0xf1,0x3c,0x60,
-0x88,0x62,0x3c,0x60,0x70,0x64,0xa2,0xdb,0x5a,0xd9,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0x08,0x65,0x45,0x55,0x3b,0xff,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,
-0x66,0x44,0x92,0xfb,0xc6,0xfe,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x66,0x44,
-0x93,0xfb,0x72,0xf1,0x01,0x60,0x00,0x64,0xc0,0x81,0x28,0x60,0xe2,0x63,0x00,0x64,
-0x40,0x4b,0xf1,0x60,0x02,0x64,0x23,0xfa,0xda,0x85,0xa3,0xd3,0xff,0xff,0xff,0xff,
-0x01,0x2a,0x0b,0x00,0x41,0x4c,0x10,0x61,0x35,0x60,0x58,0x4f,0x5d,0x78,0xff,0xff,
-0x2b,0x44,0xdc,0x84,0x40,0x4b,0x2c,0x41,0xf0,0xa3,0xcd,0x81,0x10,0xa3,0xed,0x02,
-0x93,0xf1,0xff,0xff,0x64,0x46,0x2b,0x44,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xdc,0x84,
-0x22,0xfa,0x3c,0x60,0x88,0x62,0x3c,0x60,0x70,0x64,0xa2,0xdb,0x5a,0xd9,0x0a,0x64,
-0x5a,0xdb,0xff,0xff,0x2b,0xff,0x08,0x65,0x45,0x55,0x3b,0xff,0x00,0x67,0x00,0x61,
-0x23,0x58,0xff,0xff,0x66,0x44,0x93,0xfb,0x3d,0x60,0x4c,0x64,0xa0,0xd1,0x02,0x64,
-0xc0,0x84,0xe8,0x84,0x22,0xfa,0xf1,0x60,0x04,0x64,0x23,0xfa,0xda,0x85,0x3d,0x60,
-0x4e,0x63,0x64,0x41,0x35,0x60,0x58,0x4f,0x5d,0x78,0xff,0xff,0x93,0xf1,0x3c,0x60,
-0x88,0x62,0x3c,0x60,0x70,0x64,0xa2,0xdb,0x5a,0xd9,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0x08,0x65,0x45,0x55,0x3b,0xff,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,
-0x25,0x44,0x1a,0xf1,0x1b,0xf1,0xd0,0x80,0xd0,0x80,0x0e,0x04,0x08,0x06,0x1c,0xf1,
-0x1d,0xf1,0xd0,0x80,0xd0,0x80,0x08,0x04,0x02,0x06,0x48,0xfe,0x05,0x00,0x25,0x46,
-0x01,0xf0,0x03,0x67,0xa0,0x85,0x94,0x80,0x2f,0x58,0xff,0xff,0x15,0xf5,0x00,0x60,
-0xf1,0x64,0x22,0xfa,0x25,0x44,0x23,0xfa,0x01,0x60,0xa8,0x64,0x40,0x4d,0x46,0x4c,
-0xfc,0x60,0x00,0x64,0x40,0x4b,0xfe,0x60,0x00,0x64,0x36,0x63,0x46,0x61,0xc8,0x84,
-0x2b,0x46,0x58,0xd0,0x2c,0x46,0x59,0xd8,0xfb,0x1f,0x2d,0x41,0x00,0xb9,0x84,0xa1,
-0x08,0x03,0x04,0x24,0x00,0x61,0x41,0x4d,0x00,0xf4,0x02,0x61,0x7a,0x63,0x46,0x4c,
-0xef,0x00,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0xfc,0x60,0x00,0x64,0x40,0x4b,
-0x4b,0xd3,0x15,0xf5,0x60,0x41,0xd8,0x84,0xe8,0x84,0x22,0xfa,0x25,0x44,0x23,0xfa,
-0xbf,0xd3,0x66,0x45,0x48,0x63,0xc8,0x84,0x2b,0x46,0x58,0xd0,0x65,0x46,0xc9,0x81,
-0xbd,0xd8,0xfa,0x02,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0xfc,0x60,0x00,0x64,
-0x40,0x4b,0x4b,0xd3,0x15,0xf5,0x60,0x41,0x22,0xf0,0xe9,0x85,0x64,0x44,0xff,0x22,
-0xdc,0x84,0xc4,0x84,0x22,0xfa,0x64,0x44,0xc2,0x82,0x00,0xa8,0xc2,0x84,0x08,0x24,
-0xd8,0x84,0xbf,0xd1,0xc9,0x83,0x64,0x41,0xc9,0x81,0x66,0x45,0x2b,0x46,0x59,0xd0,
-0x65,0x46,0x58,0xd8,0xfb,0x1f,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,
-0x02,0x64,0x22,0xfa,0xfc,0xa3,0xa3,0xd3,0x25,0x43,0xa0,0xd3,0x23,0xfc,0xdc,0x84,
-0x24,0xfa,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,0x02,0x64,0x22,0xfa,
-0x25,0x44,0x23,0xfa,0x65,0xf3,0xff,0xff,0x02,0xb4,0x01,0x64,0x08,0x24,0x02,0x64,
-0x24,0xfa,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,0x02,0x64,0x22,0xfa,
-0x25,0x44,0x23,0xfa,0x50,0xf3,0x24,0xfa,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,
-0x15,0xf5,0x04,0x64,0x22,0xfa,0x25,0x44,0x23,0xfa,0x58,0xf3,0x24,0xfa,0xff,0xff,
-0x59,0xf3,0x5a,0xf1,0x80,0x65,0xc4,0x87,0x00,0x7f,0x25,0xfa,0x64,0x44,0xc4,0x87,
-0x00,0x7f,0x26,0xfa,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,0x24,0xf0,
-0x17,0x60,0xc6,0x65,0x22,0xf2,0xa5,0xd9,0x02,0xa8,0x64,0x41,0x0f,0x02,0x00,0xb9,
-0xff,0xff,0x0c,0x03,0x16,0x60,0xbc,0x62,0xa2,0xd9,0x7f,0xf3,0xff,0xff,0xd0,0x80,
-0xff,0xff,0x04,0x02,0x01,0x63,0x08,0x60,0x2a,0x64,0xa0,0xdd,0x00,0x67,0x00,0x61,
-0x23,0x58,0xff,0xff,0x15,0xf5,0x20,0x63,0x17,0x60,0x0e,0x61,0x46,0x64,0x58,0xd0,
-0x59,0xd9,0xfd,0x1f,0x24,0xf0,0x20,0x64,0xd0,0x81,0x17,0x60,0x12,0x64,0x0d,0x06,
-0xc0,0x83,0x01,0x2a,0x06,0x00,0xcf,0x83,0xa3,0xd3,0xcd,0x81,0x00,0x7f,0xbd,0xdb,
-0x04,0x03,0x00,0x64,0xc9,0x81,0xbd,0xdb,0xfd,0x02,0x00,0x67,0x00,0x61,0x23,0x58,
-0xff,0xff,0x15,0xf5,0x22,0xf2,0x24,0xf0,0x02,0xa8,0x59,0x60,0x1e,0x62,0x09,0x02,
-0xa2,0xd9,0x64,0x41,0x32,0x44,0x02,0xb5,0x00,0xb9,0xd4,0x84,0x08,0x28,0x02,0xbc,
-0x40,0x52,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,0x22,0xf2,0x24,0xf0,
-0x02,0xa8,0x01,0x60,0x92,0x65,0x37,0x02,0xa5,0xd9,0x17,0x60,0xd4,0x62,0x00,0x61,
-0x00,0x64,0x01,0x65,0x64,0x40,0x01,0x2a,0x02,0x00,0x01,0xa1,0x02,0x7e,0x64,0x40,
-0x02,0x2a,0x09,0x00,0x01,0xa1,0xa5,0x80,0xff,0xff,0x02,0x03,0x04,0x7e,0x03,0x00,
-0x04,0x7f,0xa2,0xdb,0x02,0xa2,0x64,0x40,0x04,0x2a,0x09,0x00,0x01,0xa1,0xa5,0x80,
-0xff,0xff,0x02,0x03,0x0b,0x7e,0x03,0x00,0x0b,0x7f,0xa2,0xdb,0x02,0xa2,0x64,0x40,
-0x08,0x2a,0x08,0x00,0x01,0xa1,0xa5,0x80,0xff,0xff,0x02,0x03,0x16,0x7e,0x02,0x00,
-0x16,0x7f,0xa2,0xdb,0xa5,0x80,0xff,0xff,0x02,0x03,0x00,0x7f,0xa2,0xdb,0x17,0x60,
-0xd2,0x62,0x61,0x43,0xa2,0xdd,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x59,0x60,
-0xa6,0x63,0x00,0x60,0xd5,0x61,0x00,0x64,0xcd,0x81,0xbd,0xdb,0xfd,0x02,0x00,0x67,
-0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,0x24,0xf0,0x3d,0x60,0x20,0x62,0xa2,0xd9,
-0x17,0x60,0x06,0x62,0xa2,0xd9,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,
-0x24,0xf0,0x66,0x60,0xb4,0x65,0x03,0x60,0xe8,0x64,0x64,0x40,0x00,0x36,0x03,0x00,
-0xa5,0xdb,0x01,0x64,0x40,0x5a,0x17,0x60,0x74,0x64,0xa0,0xd9,0x00,0x67,0x00,0x61,
-0x23,0x58,0xff,0xff,0x15,0xf5,0x24,0xf2,0x99,0xff,0x40,0x5b,0x98,0xff,0x00,0x67,
-0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,0x24,0xf2,0x99,0xff,0x40,0x5a,0x98,0xff,
-0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x01,0x65,0x67,0x60,0x8e,0x61,0x0b,0x00,
-0x02,0x65,0x67,0x60,0x9c,0x61,0x07,0x00,0x04,0x65,0x67,0x60,0xaa,0x61,0x03,0x00,
-0x08,0x65,0x67,0x60,0xb8,0x61,0x41,0xf3,0xff,0xff,0xb4,0x84,0x41,0xfb,0x15,0xf5,
-0x46,0x64,0x00,0x60,0x0c,0x63,0x58,0xd0,0x59,0xd9,0xfd,0x1f,0x22,0xf2,0xff,0xff,
-0xf8,0xa0,0x0f,0x64,0x01,0x03,0x07,0x64,0x45,0xfb,0x67,0x44,0xd9,0xfb,0xda,0xfb,
-0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,0x02,0x64,0x22,0xfa,0x25,0x44,
-0x23,0xfa,0x43,0xf3,0x83,0xb4,0x24,0xfa,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,
-0xbc,0xf3,0xff,0xff,0x00,0xa4,0xff,0xff,0x16,0x03,0x15,0xf5,0x43,0xf3,0x24,0xf2,
-0x60,0x41,0x83,0xb5,0xff,0x60,0x7c,0x7c,0xa1,0x81,0xb5,0x84,0x43,0xfb,0xff,0xff,
-0x01,0x2a,0x09,0x00,0x1e,0x60,0xa0,0x63,0x09,0x60,0x2b,0x64,0xbd,0xdb,0xbd,0xdb,
-0xbd,0xdb,0xff,0xff,0xbd,0xdb,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,
-0x22,0xf2,0x24,0xf0,0x02,0xa8,0xff,0xff,0x05,0x02,0x00,0x64,0x64,0x40,0x00,0x3a,
-0x03,0x64,0xd5,0xfb,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x66,0x60,0xd8,0x62,
-0x01,0x64,0xa2,0xdb,0x17,0x60,0x06,0x62,0x05,0x64,0xa2,0xdb,0x01,0x60,0x7a,0x63,
-0x66,0x60,0xda,0x65,0x03,0x61,0xbd,0xd1,0x00,0x7f,0x64,0x5e,0xa5,0xdb,0xda,0x85,
-0x64,0x47,0x00,0x7f,0xa5,0xdb,0xcd,0x81,0xda,0x85,0xf5,0x02,0x00,0x67,0x00,0x61,
-0x23,0x58,0xff,0xff,0x15,0xf5,0x22,0xf2,0x24,0xf0,0x02,0xa8,0x1f,0xf3,0x14,0x02,
-0x60,0x40,0x10,0x2a,0x11,0x00,0x17,0x60,0x7e,0x62,0xa2,0xd9,0x00,0x64,0x64,0x40,
-0x01,0x26,0x20,0x64,0xc5,0xfb,0x16,0x60,0x42,0x62,0xa2,0xd3,0xff,0xff,0x03,0xa8,
-0xff,0xff,0x02,0x02,0xc5,0xf3,0x47,0xfb,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,
-0x15,0xf5,0x19,0x60,0x2a,0x65,0x26,0xf2,0x25,0xf0,0x60,0x41,0x64,0x43,0xeb,0x83,
-0x00,0x7f,0xe0,0x84,0x44,0xd1,0x61,0x47,0x93,0x83,0x00,0x7f,0xe0,0x84,0x44,0xd1,
-0xeb,0x83,0x93,0x83,0x0f,0x60,0xf0,0x65,0xa7,0x85,0x02,0x61,0x44,0x60,0x4e,0x63,
-0xc7,0x83,0xa3,0xd3,0xff,0xff,0x60,0x40,0x80,0x2b,0x13,0x00,0x65,0x44,0xff,0xa1,
-0x08,0xa5,0xf4,0x02,0x00,0x65,0x7e,0x61,0x54,0x60,0x4e,0x63,0xc7,0x83,0xa3,0xd3,
-0xff,0xff,0x60,0x40,0x80,0x2b,0x05,0x00,0x65,0x44,0xff,0xa1,0x08,0xa5,0xf4,0x02,
-0x2e,0x00,0x2d,0xf0,0xff,0xff,0x64,0x47,0x00,0x7f,0xe0,0x84,0x60,0x45,0xe0,0x84,
-0xe0,0x81,0xc4,0x85,0xc5,0x85,0x80,0x67,0xb4,0x84,0xbd,0xdb,0x24,0xf2,0xbd,0xdb,
-0xff,0xff,0x25,0xf2,0xbd,0xdb,0x26,0xf0,0xff,0xff,0xa3,0xd9,0x3d,0x60,0x4e,0x63,
-0x27,0xf2,0xc7,0x83,0xbd,0xdb,0x28,0xf2,0xbd,0xdb,0xff,0xff,0x29,0xf2,0xbd,0xdb,
-0x2a,0xf2,0xff,0xff,0xbd,0xdb,0x2b,0xf2,0xbd,0xdb,0xff,0xff,0x2c,0xf2,0xbd,0xdb,
-0x2d,0xf2,0xff,0xff,0xbd,0xdb,0x41,0xf3,0x04,0x65,0xb4,0x84,0x41,0xfb,0x00,0x67,
-0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,0x19,0x60,0x2a,0x65,0x26,0xf2,0x25,0xf0,
-0x60,0x41,0x64,0x43,0xeb,0x83,0x00,0x7f,0xe0,0x84,0x44,0xd1,0x61,0x47,0x93,0x83,
-0x00,0x7f,0xe0,0x84,0x44,0xd1,0xeb,0x83,0x93,0x83,0x0f,0x60,0xf0,0x65,0xa7,0x85,
-0x02,0x61,0x44,0x60,0x4e,0x63,0xc7,0x83,0xa3,0xd3,0x02,0xa3,0x60,0x40,0x80,0x2b,
-0x0d,0x00,0x24,0xf0,0xbd,0xd3,0x50,0xfe,0x25,0xf0,0xd0,0x80,0xbd,0xd3,0x26,0xf0,
-0xd0,0x80,0xa3,0xd3,0xff,0xff,0xd0,0x80,0xff,0xff,0x20,0x01,0x65,0x44,0xff,0xa1,
-0x08,0xa5,0xe7,0x02,0x00,0x65,0x7e,0x61,0x54,0x60,0x4e,0x63,0xc7,0x83,0xa3,0xd3,
-0x02,0xa3,0x60,0x40,0x80,0x2b,0x0d,0x00,0x24,0xf0,0xbd,0xd3,0x50,0xfe,0x25,0xf0,
-0xd0,0x80,0xbd,0xd3,0x26,0xf0,0xd0,0x80,0xa3,0xd3,0xff,0xff,0xd0,0x80,0xff,0xff,
-0x05,0x01,0x65,0x44,0xff,0xa1,0x08,0xa5,0xe7,0x02,0x06,0x00,0xfa,0xa3,0xa3,0xd3,
-0xff,0xff,0xe0,0x84,0xe8,0x84,0xa3,0xdb,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,
-0x66,0x44,0x93,0xfb,0x00,0x60,0x92,0x64,0x22,0xfa,0xf1,0x60,0x03,0x64,0x23,0xfa,
-0x48,0x65,0x38,0x64,0x40,0x4c,0x1d,0x60,0x90,0x63,0xbd,0xd3,0xff,0xff,0x00,0xa0,
-0xbd,0xd1,0x12,0x03,0x43,0x48,0x60,0x43,0x64,0x41,0xbd,0xd3,0xa5,0xda,0x2c,0x44,
-0xc8,0x84,0x40,0x4c,0x04,0x02,0x00,0xf4,0x78,0x64,0x40,0x4c,0x02,0x62,0xcd,0x81,
-0xda,0x85,0xf3,0x02,0x28,0x43,0xe9,0x00,0x93,0xf1,0x3c,0x60,0x88,0x62,0x3c,0x60,
-0x70,0x64,0xa2,0xdb,0x5a,0xd9,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x08,0x65,
-0x45,0x55,0x3b,0xff,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x1f,0xf3,0x15,0xf5,
-0x24,0xf0,0x60,0x40,0x20,0x2a,0x13,0x00,0x64,0x47,0x00,0x7f,0xfe,0xa4,0x82,0xa0,
-0x60,0x45,0x0d,0x05,0x14,0x60,0x3e,0x62,0x46,0xd9,0x67,0x60,0x72,0x62,0xa2,0xd3,
-0x64,0x40,0x12,0x37,0x01,0xbc,0x64,0x40,0x14,0x37,0x02,0xbc,0xa2,0xdb,0x00,0x67,
-0x00,0x61,0x23,0x58,0xff,0xff,0x28,0x60,0xda,0x63,0x00,0x64,0xbd,0xdb,0xbd,0xdb,
-0xff,0xff,0xbd,0xdb,0xbd,0xdb,0x01,0x64,0x23,0xfb,0xff,0xff,0x1a,0xff,0x23,0xf3,
-0xff,0xff,0x00,0xa0,0xff,0xff,0xfb,0x02,0x15,0xf5,0x05,0x64,0x22,0xfa,0x25,0x44,
-0x23,0xfa,0xd4,0xf3,0x24,0xfa,0xff,0xff,0xa1,0xf3,0x25,0xfa,0xa2,0xf3,0xff,0xff,
-0x26,0xfa,0xa3,0xfb,0x27,0xfa,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x15,0xf5,
-0x22,0xf2,0xff,0xff,0xfb,0xa0,0x28,0x60,0xda,0x63,0x0b,0x02,0x24,0xf2,0xbd,0xdb,
-0x25,0xf2,0xff,0xff,0xbd,0xdb,0xbd,0xdb,0xbd,0xdb,0x01,0x64,0x23,0xfb,0xff,0xff,
-0x1a,0xff,0x00,0x67,0x00,0x61,0x23,0x58,0xff,0xff,0x38,0xf2,0xff,0xff,0xff,0xa0,
-0x02,0x64,0x03,0x02,0x38,0xfa,0x60,0x47,0x3f,0xfa,0x28,0xf2,0xff,0xff,0x08,0xb0,
-0x60,0x47,0x07,0xb5,0x20,0x02,0xa6,0xf3,0x71,0x02,0x02,0xa8,0x01,0xa8,0x1c,0x02,
-0x39,0xf0,0x2b,0xf8,0x3a,0xf0,0xff,0xff,0x2c,0xf8,0x3b,0xf0,0x2d,0xf8,0xff,0xff,
-0x81,0xf1,0x2e,0xf8,0x82,0xf1,0xff,0xff,0x2f,0xf8,0x83,0xf1,0x30,0xf8,0xff,0xff,
-0x3c,0xf0,0x31,0xf8,0x3d,0xf0,0xff,0xff,0x32,0xf8,0x3e,0xf0,0x85,0xf3,0xff,0xff,
-0x33,0xf8,0x08,0xbc,0x29,0xfa,0x52,0x00,0x50,0xfe,0x3c,0xf0,0xbd,0xf3,0x2e,0xf8,
-0xd0,0x80,0x3d,0xf0,0xbe,0xf3,0x2f,0xf8,0xd0,0x80,0x3e,0xf0,0xbf,0xf3,0x30,0xf8,
-0xd0,0x80,0x85,0xf3,0x07,0x01,0x90,0xf3,0x60,0x41,0x04,0xb0,0x61,0x44,0x02,0x02,
-0x42,0xfe,0x3d,0x00,0x4a,0xf1,0x43,0xf1,0x64,0x40,0x01,0x2a,0x0f,0x00,0x28,0xf0,
-0x64,0x40,0x01,0x2a,0x0b,0x00,0x64,0x40,0x81,0x26,0x08,0x00,0x38,0xf2,0x60,0x5c,
-0x00,0xa8,0x64,0x44,0x03,0x03,0x60,0x47,0x40,0xbc,0x60,0x47,0x08,0xbc,0x29,0xfa,
-0x90,0xf3,0xff,0xff,0x04,0xb0,0x39,0xf0,0x21,0x02,0x02,0xb0,0x39,0xf0,0x0f,0x03,
-0x2b,0xf8,0x3a,0xf0,0xff,0xff,0x2c,0xf8,0x3b,0xf0,0x2d,0xf8,0xff,0xff,0x81,0xf1,
-0x31,0xf8,0x82,0xf1,0xff,0xff,0x32,0xf8,0x83,0xf1,0x33,0xf8,0x0f,0x00,0x31,0xf8,
-0x3a,0xf0,0xff,0xff,0x32,0xf8,0x3b,0xf0,0x33,0xf8,0xff,0xff,0x81,0xf1,0x2b,0xf8,
-0x82,0xf1,0xff,0xff,0x2c,0xf8,0x83,0xf1,0x2d,0xf8,0x00,0x00,0x02,0xfe,0x2f,0x58,
-0xff,0xff,0x00,0x64,0x15,0xfa,0x16,0xfa,0x1c,0xfa,0xff,0xff,0x07,0xfa,0x19,0xfa,
-0x1e,0x60,0xa0,0x65,0x95,0xf1,0x51,0xf3,0x64,0x40,0x01,0x2a,0x02,0x00,0x13,0xf2,
-0xff,0xff,0xe0,0x84,0x44,0xd1,0xca,0xf9,0x1e,0x63,0x29,0xf0,0x73,0x60,0xff,0x64,
-0xa0,0x84,0x03,0x2b,0x18,0x63,0x29,0xfa,0x04,0xa3,0x64,0x40,0x40,0x27,0x08,0xa3,
-0x43,0x4b,0x21,0xfc,0x56,0x61,0x64,0x40,0x01,0x27,0x62,0x61,0x38,0xf0,0xa1,0xd2,
-0x44,0x4d,0x60,0x40,0x01,0x26,0x22,0x00,0xca,0xf1,0xc3,0x81,0xd1,0x80,0x63,0x45,
-0x20,0x06,0x64,0x43,0xd7,0x85,0x45,0x4c,0xc8,0xf1,0x0f,0xf2,0xd3,0x80,0x01,0x65,
-0x01,0x05,0x00,0x65,0xb4,0x84,0x0f,0xfa,0x00,0x63,0x2d,0x44,0x2c,0x45,0x60,0x41,
-0xd4,0x84,0xdf,0x83,0xfc,0x07,0x14,0xfc,0x61,0x44,0x17,0xfa,0x29,0xf0,0x04,0x64,
-0x60,0x47,0xb0,0x84,0x29,0xfa,0x2c,0x43,0x16,0xfc,0x0f,0x00,0x2d,0x44,0x17,0xfa,
-0x0a,0x00,0x2d,0x44,0x17,0xfa,0x2b,0x45,0xc8,0xf1,0xc4,0x81,0xd1,0x80,0x0f,0xf2,
-0x01,0x04,0x01,0xbc,0x0f,0xfa,0x01,0x64,0x14,0xfa,0x2e,0x58,0xff,0xff,0xcb,0xf3,
-0x2b,0xf2,0xfd,0xa0,0xff,0xff,0x4c,0x02,0x60,0x40,0x01,0x26,0x39,0x00,0x2b,0xf2,
-0xff,0xff,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,0xe1,0x81,0x5a,0xd2,
-0xf0,0x85,0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,0xe1,0x81,
-0x5a,0xd2,0xf0,0x85,0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,
-0xe1,0x81,0xf0,0x84,0x0e,0x4c,0x3a,0x60,0x58,0x4e,0xc5,0x78,0xff,0xff,0x0c,0x4e,
-0x14,0x03,0x19,0xfc,0x0a,0xa3,0x3c,0x64,0xa3,0xdb,0xfe,0xa3,0xa3,0xd3,0xff,0xff,
-0xff,0xff,0x01,0x26,0x00,0x7f,0x02,0x26,0x01,0x7f,0x04,0x26,0x02,0x7f,0x08,0x26,
-0x03,0x7f,0x1d,0xfa,0x00,0x64,0x0d,0xfa,0x13,0x00,0x19,0xfc,0x50,0xf3,0xf1,0x00,
-0x17,0x60,0xdc,0x64,0xa0,0xd1,0x39,0x60,0xe2,0x64,0x19,0xfa,0x64,0x44,0x08,0x26,
-0x03,0x7f,0x04,0x26,0x02,0x7f,0x02,0x26,0x01,0x7f,0x01,0x26,0x00,0x7f,0xe9,0x00,
-0x2e,0x58,0xff,0xff,0x28,0x60,0xe2,0x65,0x00,0x7f,0xe0,0x84,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0x44,0xd3,0x62,0x43,0x60,0x40,0x01,0x2a,0x10,0x00,0x02,0xa3,0x2b,0xf2,
-0x50,0xfe,0xbd,0xd1,0x2c,0xf2,0xd0,0x80,0xbd,0xd1,0x2d,0xf2,0xd0,0x80,0xbd,0xd1,
-0xff,0xff,0xd0,0x80,0xff,0xff,0x02,0x02,0xf8,0xa3,0x1e,0x00,0x72,0xf1,0x38,0x60,
-0xe2,0x63,0x64,0x41,0xff,0x22,0x17,0x00,0xbd,0xd1,0x2b,0xf2,0x50,0xfe,0x64,0x40,
-0x01,0x26,0x04,0x00,0xcd,0x81,0x0e,0xa3,0xf7,0x02,0x0d,0x00,0xbd,0xd1,0x2c,0xf2,
-0xd0,0x80,0xbd,0xd1,0x2d,0xf2,0xd0,0x80,0xbd,0xd1,0xff,0xff,0xd0,0x80,0xcd,0x81,
-0xe3,0x01,0x08,0xa3,0xe9,0x02,0x00,0x63,0x00,0xbb,0x2e,0x58,0xff,0xff,0x0f,0xf3,
-0x2c,0x65,0x60,0x47,0xff,0xb4,0xd4,0x80,0xff,0xff,0x04,0x28,0x06,0x00,0xe0,0x85,
-0x15,0x60,0xa0,0x64,0x44,0xd7,0xff,0xff,0xff,0xff,0xff,0x67,0x23,0x58,0xff,0xff,
-0x3b,0x60,0x2d,0x64,0x97,0xfb,0xff,0xff,0x2d,0xff,0x30,0x60,0x7f,0x78,0xff,0xff,
-0x10,0xf3,0x7f,0xfb,0x02,0x7f,0x99,0xfb,0x02,0x60,0xee,0x64,0x98,0xfb,0x07,0x64,
-0x9a,0xfb,0x3b,0x60,0x2d,0x64,0x97,0xfb,0xdf,0xfe,0x00,0x64,0x19,0xff,0x30,0x60,
-0x7f,0x78,0xff,0xff,0x00,0x67,0x23,0x58,0xff,0xff,0x68,0x60,0xdc,0x61,0x11,0xf3,
-0xff,0xff,0xa1,0xdb,0x68,0x60,0xd2,0x61,0x10,0xf3,0xff,0xff,0xa1,0xdb,0x68,0x60,
-0xd4,0x61,0xff,0xff,0x02,0x36,0x06,0x00,0x03,0x36,0x06,0x00,0x04,0x36,0x13,0x00,
-0x00,0x64,0x16,0x00,0x00,0x64,0x14,0x00,0x16,0x60,0xb6,0x63,0xbd,0xd3,0x81,0xfb,
-0xbd,0xd3,0xff,0xff,0x82,0xfb,0xa3,0xd3,0x83,0xfb,0x68,0x60,0xda,0x62,0xff,0x64,
-0xa2,0xdb,0x01,0x64,0x05,0x00,0x68,0x60,0xda,0x62,0xff,0x64,0xa2,0xdb,0x01,0x64,
-0xa1,0xdb,0x00,0x60,0x01,0x64,0x32,0x45,0x34,0x92,0x00,0x67,0x23,0x58,0xff,0xff,
-0x00,0x60,0x02,0xe8,0x3c,0x60,0x6b,0x63,0x0e,0x60,0xac,0x64,0xa0,0xdd,0xff,0xff,
-0x62,0xff,0xff,0xff,0x1a,0xff,0x00,0x67,0x23,0x58,0xff,0xff,0x99,0xff,0x3e,0x44,
-0xfc,0xb4,0x00,0x7f,0x40,0x5e,0x98,0xff,0xbc,0xff,0x0d,0x63,0x58,0x4f,0xf4,0x76,
-0x7e,0x00,0x00,0x10,0x46,0x00,0x99,0xff,0x3d,0x44,0xf7,0xb4,0x40,0x5d,0x98,0xff,
-0x0d,0x63,0x58,0x4f,0x3e,0x00,0x99,0xff,0x3e,0x44,0x77,0xb4,0x08,0xbc,0x00,0x7f,
-0x40,0x5e,0x98,0xff,0x0d,0x63,0x58,0x4f,0x34,0x00,0x99,0xff,0x3c,0x44,0x10,0xbc,
-0x00,0x7f,0x40,0x5c,0x98,0xff,0x99,0xff,0x3d,0x44,0xef,0xb4,0x40,0x5d,0x98,0xff,
-0xb5,0xff,0xff,0xff,0x6c,0x40,0x11,0x60,0x03,0xe8,0x01,0x60,0x03,0xe8,0xff,0xff,
-0xff,0xff,0xff,0xff,0x0e,0x60,0x00,0x6b,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0x46,0xff,0x47,0xff,0xf9,0x60,0xfe,0x64,0x32,0x45,0x24,0x92,0x99,0xff,0x35,0x47,
-0xff,0xb4,0x60,0x5c,0x08,0x60,0x0e,0x64,0xa0,0xd9,0x64,0x44,0x98,0xff,0x11,0x60,
-0x8e,0x63,0x0e,0x60,0xac,0x64,0xa0,0xdd,0xff,0xff,0x62,0xff,0x00,0x67,0x23,0x58,
-0xff,0xff,0xff,0xff,0xfe,0x1f,0x2f,0x58,0xff,0xff,0x99,0xff,0x1e,0x65,0x3d,0x44,
-0xe1,0x81,0xf9,0xb4,0x02,0x24,0x04,0xbc,0x00,0x7f,0x40,0x5d,0x02,0x63,0xff,0xff,
-0xfe,0x1f,0x02,0xbc,0x40,0x5d,0xf4,0x1f,0x98,0xff,0x99,0xff,0x10,0xf3,0xff,0xff,
-0x60,0x47,0x60,0x45,0x60,0x47,0xa4,0x81,0x65,0x44,0xff,0xad,0x04,0x60,0xff,0xe5,
-0x3c,0x44,0x04,0x60,0xff,0xe5,0xa4,0x85,0xb5,0x84,0x00,0x7f,0x40,0x5c,0x04,0x60,
-0xff,0xe5,0x3c,0x44,0x04,0x60,0xff,0xe5,0x00,0x7f,0x60,0x5c,0x08,0x60,0x0a,0x64,
-0xa0,0xd9,0x11,0xf3,0xff,0xff,0x60,0x47,0x60,0x45,0x60,0x47,0xa4,0x81,0x65,0x44,
-0xff,0xad,0x3d,0x44,0xa4,0x85,0xb5,0x84,0x00,0x7f,0x40,0x5d,0x3d,0x44,0x00,0x7f,
-0x60,0x5c,0x08,0x60,0x0c,0x64,0xa0,0xd9,0x12,0xf3,0xff,0xff,0x60,0x47,0x60,0x45,
-0x60,0x47,0xa4,0x81,0x65,0x44,0xff,0xad,0x04,0x60,0xff,0xe5,0x3e,0x44,0x04,0x60,
-0xff,0xe5,0xa4,0x85,0xb5,0x84,0x00,0x7f,0x40,0x5e,0x00,0x6b,0x04,0x60,0xff,0xe5,
-0x3e,0x44,0x04,0x60,0xff,0xe5,0x00,0x7f,0x60,0x5c,0x08,0x60,0x0e,0x64,0xa0,0xd9,
-0x98,0xff,0x00,0x67,0x23,0x58,0xff,0xff,0x10,0xf1,0x3c,0x60,0xa8,0x62,0xa2,0xd9,
-0xca,0x82,0x22,0x64,0xa2,0xdb,0x3b,0x60,0x13,0x78,0xff,0xff,0x10,0xf1,0xff,0xff,
-0x7f,0xf9,0x3c,0x60,0xa6,0x62,0x08,0x64,0xa2,0xdb,0x3b,0x60,0x13,0x78,0xff,0xff,
-0x10,0xf1,0x3c,0x60,0xa8,0x62,0xa2,0xd9,0xca,0x82,0x1e,0x64,0xa2,0xdb,0x3b,0x60,
-0x13,0x78,0xff,0xff,0x3c,0x60,0xa6,0x62,0x02,0x64,0xa2,0xdb,0x3b,0x60,0x13,0x78,
-0xff,0xff,0x01,0x65,0x01,0x00,0x00,0x65,0x10,0xf1,0x15,0x60,0x46,0x63,0xbd,0xd9,
-0x11,0xf1,0xbd,0xd9,0xff,0xff,0x12,0xf1,0xa3,0xd9,0x65,0x40,0x01,0x2a,0x06,0x00,
-0x00,0x64,0x10,0xfb,0xff,0xff,0x3b,0x60,0x1b,0x78,0xff,0xff,0x00,0x67,0x23,0x58,
-0xff,0xff,0x10,0xf1,0x67,0x60,0x50,0x62,0xa2,0xd9,0x00,0x67,0x23,0x58,0xff,0xff,
-0x00,0x67,0x23,0x58,0xff,0xff,0x08,0xe1,0xa1,0xff,0xff,0xff,0x43,0xff,0x01,0xe1,
-0x99,0xff,0x3c,0x44,0x7f,0xb4,0x10,0xbc,0x40,0x5c,0x98,0xff,0x99,0xff,0x3d,0x44,
-0xef,0xb4,0x40,0x5d,0x98,0xff,0x0d,0x63,0x58,0x4f,0x76,0x00,0x99,0xff,0x3e,0x44,
-0x77,0xb4,0x80,0xbc,0x00,0x7f,0x40,0x5e,0x98,0xff,0x0d,0x63,0x58,0x4f,0x6c,0x00,
-0xff,0x6d,0x99,0xff,0x3e,0x44,0xfc,0xb4,0x01,0xbc,0x00,0x7f,0x40,0x5e,0x01,0x60,
-0x00,0x6b,0x98,0xff,0x0d,0x63,0x58,0x4f,0x5f,0x00,0x99,0xff,0x3d,0x44,0xf7,0xb4,
-0x40,0x5d,0x98,0xff,0x99,0xff,0x3d,0x44,0x08,0xbc,0x00,0x7f,0x40,0x5d,0x98,0xff,
-0x10,0xf3,0xff,0xff,0x60,0x5c,0x99,0xff,0x07,0x60,0x00,0xe8,0x98,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x80,0xe8,0xff,0xff,0xff,0xff,
-0xff,0xff,0x64,0x4d,0xa1,0xff,0x64,0x47,0x60,0x4d,0xff,0xff,0xff,0xff,0xa1,0xff,
-0xbb,0xff,0x64,0x44,0xa1,0xff,0x60,0x4d,0xa1,0xff,0x60,0x47,0x60,0x4d,0x64,0x44,
-0xa1,0xff,0x60,0x4d,0xa1,0xff,0x60,0x47,0x60,0x4d,0x64,0x44,0xa1,0xff,0x60,0x4d,
-0xa1,0xff,0x60,0x47,0x60,0x4d,0x11,0xf3,0xff,0xff,0x00,0xa8,0x60,0x43,0x05,0x02,
-0x64,0x44,0xa1,0xff,0xff,0xff,0x60,0x4c,0xfc,0x00,0x63,0x46,0x43,0x4f,0x3f,0xf2,
-0xff,0xff,0x60,0x47,0x60,0x5c,0xff,0x65,0x2f,0x46,0x64,0x43,0x00,0xf4,0x01,0xf2,
-0x04,0x62,0xa4,0x81,0xe2,0xd2,0xff,0xff,0xa1,0xff,0xda,0x82,0xc9,0x81,0x60,0x4c,
-0xf9,0x1c,0xf4,0x1d,0xf1,0x1e,0x02,0x02,0x00,0xf4,0x04,0x62,0xa2,0xd2,0xff,0xff,
-0xa1,0xff,0xff,0xff,0x60,0x4d,0xe8,0x00,0xff,0xff,0xfe,0x1f,0x2f,0x58,0xff,0xff,
-0x6a,0x60,0x0c,0x78,0xff,0xff,0x1e,0x60,0xa8,0x62,0xa2,0xd1,0x80,0x60,0x00,0x64,
-0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0x2b,0x00,0x74,0xf3,0x60,0xf1,0x00,0xa0,0xb0,0x84,
-0x0c,0x03,0x60,0xfb,0x1e,0x60,0xd4,0x62,0xa2,0xd1,0x00,0x60,0x20,0x64,0xb0,0x84,
-0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x00,0x64,0x74,0xfb,0x75,0xf3,0xff,0xff,0x00,0xa0,
-0x00,0x64,0x15,0x03,0x75,0xfb,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x00,0x60,0x02,0x64,
-0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x0a,0x00,0xab,0xfe,0xff,0xff,0xd0,0x05,
-0xaa,0xfe,0xff,0xff,0xd0,0x05,0xa9,0xfe,0xff,0xff,0xd6,0x05,0xff,0xff,0xa1,0xff,
-0xff,0xff,0xbd,0x3f,0x0e,0x57,0x67,0x60,0xca,0x62,0xa2,0xd3,0xff,0xff,0xff,0xff,
-0x01,0x26,0x0c,0x65,0x45,0x48,0x0f,0x4e,0x00,0x60,0x06,0x61,0x41,0x4d,0x40,0xa1,
-0xa2,0xff,0x19,0x60,0x58,0x4f,0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,
-0x19,0x60,0x58,0x4f,0xc4,0x78,0xff,0xff,0x08,0xfe,0x0e,0x4f,0x15,0x03,0x02,0x64,
-0x22,0xfa,0xf2,0x60,0x00,0x64,0x5a,0xda,0x28,0x44,0x5a,0xda,0x08,0x65,0x3c,0x60,
-0x82,0x62,0x3c,0x60,0x70,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0x45,0x54,0x3b,0xff,0x37,0x58,0xff,0xff,0x92,0xf3,0x15,0x61,
-0x00,0xa8,0x60,0x46,0x15,0x02,0x0f,0x4e,0x00,0x60,0x2e,0x61,0x41,0x4d,0x40,0xa1,
-0xa2,0xff,0x19,0x60,0x58,0x4f,0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,
-0x19,0x60,0x58,0x4f,0xc4,0x78,0xff,0xff,0x08,0xfe,0x0e,0x4f,0x21,0x03,0x15,0x61,
-0x00,0x64,0x92,0xfb,0x58,0x60,0x2e,0x63,0x16,0x64,0x22,0xfa,0xf1,0x60,0x00,0x64,
-0x23,0xfa,0x48,0x65,0x00,0x64,0xa3,0xd1,0xbd,0xdb,0xa5,0xd8,0xcd,0x81,0xda,0x85,
-0xfa,0x02,0x3c,0x60,0x82,0x62,0x3c,0x60,0x70,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,
-0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x08,0x65,0x45,0x54,0x3b,0xff,0xa6,0xfe,
-0x8e,0x00,0xa6,0xfe,0xff,0xff,0xc2,0x05,0xa7,0xfe,0xff,0xff,0x08,0x05,0xa5,0xfe,
-0xff,0xff,0x1f,0x05,0xa4,0xfe,0xff,0xff,0x01,0x05,0x81,0x00,0x80,0x00,0x36,0x45,
-0x0e,0x60,0xd0,0x64,0x44,0xd7,0xff,0xff,0xff,0xff,0x94,0xf3,0xff,0xff,0x01,0xb0,
-0x00,0x64,0x0f,0x03,0x94,0xfb,0x31,0x44,0xfe,0xb4,0x40,0x51,0x1e,0x60,0xe0,0x62,
-0xa2,0xd1,0x00,0x60,0x20,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0x3d,0x60,0x2f,0x78,
-0xff,0xff,0x3e,0x60,0x8d,0x78,0xff,0xff,0x16,0x60,0xb6,0x63,0xbd,0xd3,0xbd,0xd1,
-0xbd,0xd1,0xb0,0x84,0xb0,0x84,0xff,0xff,0x0b,0x02,0x8c,0xfb,0x31,0x44,0xfe,0xb4,
-0x40,0x51,0x0d,0x7c,0x08,0x60,0x0a,0x64,0xa0,0xd9,0x3e,0x60,0x8d,0x78,0xff,0xff,
-0x0f,0xf3,0x94,0xf1,0x60,0x47,0x07,0xb4,0x01,0x61,0x03,0x03,0xcc,0x84,0xe1,0x81,
-0xfd,0x02,0xa1,0x80,0xb1,0x83,0x03,0x03,0x3e,0x60,0x8d,0x78,0xff,0xff,0x94,0xfd,
-0x31,0x44,0x01,0xbc,0x40,0x51,0xd1,0xfe,0x1f,0xf3,0xff,0xff,0xff,0xff,0x20,0x26,
-0x18,0x00,0x17,0x60,0x7c,0x62,0xa2,0xd3,0xff,0xff,0x60,0x40,0x01,0x3a,0x03,0x00,
-0xe4,0x65,0xbb,0x63,0x0b,0x00,0x60,0x40,0x02,0x3a,0x03,0x00,0xe0,0x65,0xb9,0x63,
-0x05,0x00,0xb8,0x63,0xe6,0x65,0x60,0x40,0x03,0x36,0xe4,0x65,0x13,0x60,0x6c,0x62,
-0x15,0x00,0x17,0x60,0x7c,0x62,0xa2,0xd3,0xff,0xff,0x60,0x40,0x01,0x3a,0x03,0x00,
-0xe4,0x65,0xcb,0x63,0x0b,0x00,0x60,0x40,0x02,0x3a,0x03,0x00,0xe0,0x65,0xc9,0x63,
-0x05,0x00,0xc8,0x63,0xe6,0x65,0x60,0x40,0x03,0x36,0xe4,0x65,0x67,0x60,0x72,0x62,
-0xa2,0xd3,0xff,0xff,0x14,0x60,0x4e,0x62,0x60,0x41,0x01,0x26,0x03,0x00,0x65,0x5e,
-0x12,0x7f,0xa2,0xdb,0x61,0x40,0x02,0x26,0x03,0x00,0x63,0x5e,0x14,0x7f,0x5a,0xdb,
-0x00,0x64,0x65,0xfb,0x17,0x60,0x44,0x62,0xa2,0xd3,0xff,0xff,0xfc,0xa0,0xff,0xff,
-0x01,0x06,0x04,0x64,0xa2,0xdb,0x3e,0x60,0x58,0x4e,0xae,0x78,0xff,0xff,0x95,0xf3,
-0xff,0xff,0x00,0xa0,0xff,0xff,0x26,0x03,0x00,0x60,0x08,0x63,0x01,0x60,0x78,0x61,
-0x16,0x60,0xb4,0x64,0x58,0xd1,0x59,0xd9,0xfd,0x1f,0x00,0x60,0x72,0x63,0x16,0x60,
-0x40,0x61,0x16,0x60,0xbe,0x64,0x58,0xd1,0x59,0xd9,0xfd,0x1f,0x00,0x60,0x1a,0x63,
-0x01,0x60,0x00,0x61,0x00,0x64,0x59,0xdb,0xfe,0x1f,0x00,0x60,0xfa,0x64,0xe3,0xfb,
-0xc0,0xf1,0x3c,0x60,0xa2,0x62,0xa2,0xd9,0xca,0x82,0x1e,0x64,0xa2,0xdb,0xff,0xff,
-0x2d,0xff,0x1b,0x00,0x0d,0x60,0xac,0x64,0xe3,0xfb,0x32,0x40,0x01,0x26,0x0f,0x00,
-0x16,0x60,0xbc,0x62,0xa2,0xd3,0xa5,0xf3,0x60,0x41,0x00,0x36,0x04,0x00,0xcd,0x81,
-0xe8,0x84,0xfd,0x02,0x04,0x05,0xc0,0xf1,0x16,0x60,0xbc,0x62,0xa2,0xd9,0x0f,0x4e,
-0x42,0x60,0x58,0x4f,0x60,0x78,0xff,0xff,0x0e,0x4f,0xda,0xfe,0x3d,0x60,0x2f,0x78,
-0xff,0xff,0x66,0x44,0x00,0xa8,0x0e,0x57,0x17,0x03,0x00,0x64,0x40,0x46,0xcb,0xfe,
-0x0f,0x4e,0x46,0x45,0x3c,0x60,0x82,0x62,0x00,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,
-0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,
-0xff,0xff,0xa3,0xff,0xd1,0xfe,0x0e,0x4f,0x37,0x58,0xff,0xff,0x1f,0xf3,0xff,0xff,
-0xff,0xff,0x10,0x2a,0x34,0x00,0x17,0x60,0x44,0x62,0xa2,0xd3,0xff,0xff,0x60,0x45,
-0xd5,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0x19,0x03,0x17,0x60,0x80,0x62,0xa2,0xd3,
-0xff,0xff,0x60,0x45,0x17,0x60,0x48,0x63,0xff,0x60,0xff,0x61,0xbd,0xd3,0xdd,0x81,
-0xd4,0x80,0x61,0x44,0x03,0x06,0xfc,0xa0,0xff,0xff,0xf8,0x02,0x17,0x60,0x44,0x62,
-0xa2,0xd3,0x61,0x45,0xd4,0x80,0xff,0xff,0x01,0x06,0x60,0x45,0x66,0x60,0xd4,0x62,
-0x65,0x44,0xa2,0xdb,0xe0,0x85,0x17,0x60,0x3a,0x64,0x44,0xd3,0xff,0xff,0x13,0x60,
-0x98,0x62,0x3e,0x7f,0xa2,0xdb,0x14,0x60,0x7a,0x62,0x3e,0x7f,0xa2,0xdb,0x2e,0x58,
-0xff,0xff,0x3c,0x60,0x4c,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,0x0e,0xf2,
-0x62,0x03,0x60,0x47,0xfd,0x37,0x3a,0x00,0xff,0x36,0x17,0x00,0xf0,0x36,0x0a,0x00,
-0xff,0xb5,0x1e,0x60,0xaa,0x62,0x46,0xd1,0x00,0x60,0x01,0x64,0xb0,0x84,0xa2,0xdb,
-0xff,0xff,0xcf,0xfe,0x3c,0x60,0x82,0x62,0x00,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,
-0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xdc,0x00,0x0f,0x4e,0x46,0x45,0x3c,0x60,
-0x82,0x62,0x00,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,0xa3,0xff,0xd1,0xfe,
-0x0e,0x4f,0x59,0x60,0xe8,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,
-0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0xbb,0x00,0x3c,0x60,0x82,0x62,
-0x3c,0x60,0x46,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0xd3,0xfe,0x59,0x60,0xe8,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0xa2,0x00,0xac,0xfe,
-0xff,0xff,0x0c,0x05,0xad,0xfe,0xff,0xff,0x12,0x05,0xae,0xfe,0xff,0xff,0x99,0x05,
-0xaf,0xfe,0xff,0xff,0x3a,0x05,0x3d,0x60,0x2f,0x78,0xff,0xff,0x1e,0x60,0xa8,0x62,
-0xa2,0xd1,0x20,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0xf4,0x00,0x1e,0x60,
-0xf4,0x65,0x0a,0x61,0x07,0x00,0xa2,0xdd,0x58,0x4f,0x64,0x58,0xff,0xff,0x00,0xb9,
-0xff,0xff,0x08,0x03,0x00,0x63,0xa5,0xd1,0x5a,0xd3,0xda,0x85,0x00,0xa8,0xcd,0x81,
-0xf2,0x02,0xf8,0x02,0xe0,0x00,0x1e,0x60,0xa6,0x62,0x1e,0x60,0xde,0x65,0x3f,0x60,
-0x8b,0x63,0x00,0x64,0x5a,0xdb,0xd6,0x80,0xff,0xff,0x04,0x03,0x5a,0xdb,0x5a,0xdb,
-0x5a,0xdd,0xf9,0x00,0x1e,0x60,0xf2,0x65,0x00,0x64,0x5a,0xdb,0xd6,0x80,0xff,0xff,
-0x02,0x03,0x5a,0xdd,0xfb,0x00,0x2f,0x58,0xff,0xff,0x1e,0x60,0xaa,0x64,0x40,0x41,
-0x1e,0x60,0xa8,0x63,0xa3,0xd1,0x00,0x64,0xd0,0x80,0x09,0x61,0x08,0x03,0xbd,0xdb,
-0xa3,0xd3,0xff,0xff,0xb0,0x84,0xcd,0x81,0xa3,0xdb,0x06,0xa3,0xf9,0x02,0x1e,0x60,
-0xe0,0x63,0xa3,0xd1,0x00,0x64,0xd0,0x80,0x0a,0x61,0x16,0x03,0xbd,0xdb,0x64,0x44,
-0xfe,0xa3,0x02,0xa3,0xcd,0x81,0xe8,0x84,0xe3,0x03,0x02,0x05,0xe1,0x03,0xf9,0x00,
-0x40,0x42,0xa3,0xd3,0x43,0x44,0x00,0xa8,0x41,0x43,0x02,0x03,0x58,0x4f,0x60,0x58,
-0x22,0x44,0x23,0x41,0x24,0x43,0xed,0x00,0x21,0x43,0x1e,0x60,0xe0,0x65,0xd7,0x80,
-0xbd,0xd1,0xbd,0xd3,0x01,0x02,0x8f,0x00,0xa0,0x84,0xbd,0xd1,0x43,0x41,0xf7,0x03,
-0x3f,0x60,0x90,0x64,0x64,0x58,0x40,0x4f,0x29,0xf2,0xff,0xff,0x60,0x40,0x08,0x26,
-0x03,0x00,0x40,0x60,0x2e,0x78,0xff,0xff,0x60,0x40,0x18,0x36,0x17,0x00,0x0c,0x60,
-0x44,0x64,0xa0,0xd7,0x58,0x4f,0xff,0xff,0x0f,0xf0,0xbd,0xf1,0x64,0x44,0x60,0x22,
-0x10,0x00,0x31,0xf2,0x32,0xf2,0xd0,0x80,0xbe,0xf1,0x0b,0x02,0xd0,0x80,0x33,0xf2,
-0x08,0x02,0xbf,0xf1,0xff,0xff,0xd0,0x80,0x0f,0xf0,0x03,0x02,0x41,0x60,0x76,0x78,
-0xff,0xff,0x00,0xf4,0xaa,0x60,0xaa,0x65,0x02,0xf2,0x03,0xf0,0xd4,0x80,0x03,0x64,
-0x16,0x02,0xd0,0x80,0x00,0x64,0x04,0xf0,0x12,0x02,0xd0,0x80,0xf8,0x7f,0x06,0x02,
-0x26,0x46,0x22,0xf0,0x20,0x67,0xb0,0x84,0xa2,0xda,0x09,0x00,0xd0,0x80,0xff,0xff,
-0x06,0x02,0x26,0x46,0x22,0xf0,0x40,0x67,0xb0,0x84,0xa2,0xda,0x00,0x00,0x26,0x46,
-0x0f,0xf2,0x81,0xf1,0x29,0xf2,0x60,0x40,0x20,0x2a,0x11,0x00,0x5c,0x63,0x60,0x40,
-0x02,0x2b,0x62,0x63,0xbd,0xd2,0xbd,0xd2,0xd0,0x80,0x82,0xf1,0x5c,0x02,0xd0,0x80,
-0xa3,0xd2,0x83,0xf1,0x58,0x02,0xd0,0x80,0xff,0xff,0x55,0x02,0x00,0x00,0x64,0x60,
-0x58,0x4f,0x5a,0x78,0xff,0xff,0x41,0x60,0x4c,0x78,0xff,0xff,0x26,0x46,0x29,0xf2,
-0xff,0xff,0xff,0xff,0x0c,0x26,0x47,0x00,0x95,0xf1,0x00,0x63,0xd3,0x80,0xff,0xff,
-0xf2,0x02,0x60,0x40,0xb0,0x3a,0x07,0x00,0x5a,0x60,0xa8,0x64,0xa0,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x23,0x00,0x10,0x3a,0x07,0x00,0x5a,0x60,0xac,0x64,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1a,0x00,0x30,0x3a,0x07,0x00,0x5a,0x60,0xac,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x11,0x00,0xc0,0x3a,0x07,0x00,0x5a,0x60,
-0xae,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x08,0x00,0xa0,0x3a,0x1e,0x00,
-0x5a,0x60,0xb0,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x0c,0x60,0x48,0x64,
-0xa0,0xd7,0x58,0x4f,0xff,0xff,0x2d,0x00,0xcb,0xf3,0xff,0xff,0x60,0x40,0x03,0x3a,
-0x0a,0x00,0x68,0x60,0x58,0x4e,0x89,0x78,0xff,0xff,0x26,0x46,0x04,0x02,0x41,0x60,
-0x58,0x4e,0x8c,0x78,0xff,0xff,0x41,0x60,0x76,0x78,0xff,0xff,0x50,0x3a,0x0c,0x00,
-0x5a,0x60,0xb6,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x0c,0x60,0x50,0x64,
-0xa0,0xd7,0x58,0x4f,0xff,0xff,0x0d,0x00,0x40,0x3a,0x0e,0x00,0x5a,0x60,0xb2,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x0c,0x60,0x4a,0x64,0xa0,0xd7,0x58,0x4f,
-0xff,0xff,0x41,0x60,0x72,0x78,0xff,0xff,0x90,0x3a,0x10,0x00,0x41,0x60,0x58,0x4e,
-0x7d,0x78,0xff,0xff,0x0c,0x60,0x52,0x64,0xa0,0xd7,0x58,0x4f,0xff,0xff,0x5a,0x60,
-0xa4,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0xeb,0x00,0x80,0x3a,0x6e,0x00,
-0xcb,0xf3,0x20,0x40,0x40,0x26,0x32,0x00,0xfd,0xa0,0xfc,0xa0,0x01,0x03,0x29,0x02,
-0x81,0xf1,0x31,0xf2,0x32,0xf2,0xd0,0x80,0x82,0xf1,0xae,0x02,0xd0,0x80,0x33,0xf2,
-0x83,0xf1,0xaa,0x02,0xd0,0x80,0x70,0xf3,0xa7,0x02,0xdc,0x84,0xcb,0xf1,0x70,0xfb,
-0x00,0x64,0x71,0xfb,0x0a,0x60,0x02,0x64,0x6e,0xfb,0x64,0x40,0x03,0x36,0x50,0x00,
-0x5a,0x60,0x9c,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x0c,0x60,0x4c,0x64,
-0xa0,0xd7,0x58,0x4f,0xff,0xff,0x0c,0x60,0x4e,0x64,0xa0,0xd7,0x58,0x4f,0xff,0xff,
-0x3d,0x00,0xd5,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x08,0x04,0x0c,0x60,0x50,0x64,
-0xa0,0xd7,0x58,0x4f,0xff,0xff,0x41,0x60,0x72,0x78,0xff,0xff,0x16,0x60,0x42,0x62,
-0xa2,0xd3,0xff,0xff,0xfc,0xa0,0x81,0xf3,0x29,0x02,0x00,0xa0,0x31,0xf0,0x13,0x03,
-0xd0,0x80,0x82,0xf3,0x32,0xf0,0x0f,0x02,0xd0,0x80,0x83,0xf3,0x33,0xf0,0x0b,0x02,
-0xd0,0x80,0x70,0xf3,0x08,0x02,0xdc,0x84,0x70,0xfb,0x00,0x64,0x71,0xfb,0x0a,0x60,
-0x02,0x64,0x6e,0xfb,0x13,0x00,0x59,0x60,0x20,0x64,0xa0,0xd3,0xff,0xff,0x60,0x40,
-0xff,0x22,0x0c,0x00,0x68,0x60,0x58,0x4e,0x89,0x78,0xff,0xff,0x07,0x02,0x0f,0x4e,
-0x26,0x46,0x67,0x60,0x58,0x4f,0x13,0x78,0xff,0xff,0x0e,0x4f,0x26,0x46,0x56,0x00,
-0x29,0xf0,0x3d,0x60,0x0e,0x65,0x0a,0x64,0x64,0x40,0x10,0x2b,0xa5,0xdb,0x68,0x60,
-0xcc,0x62,0x90,0x60,0x30,0x64,0xa2,0xdb,0x41,0x60,0x58,0x4e,0x7d,0x78,0xff,0xff,
-0xa4,0xf3,0x5e,0xf1,0x60,0x45,0x73,0x44,0x64,0x40,0x04,0x2a,0x04,0x00,0xd4,0x84,
-0xe7,0xa0,0x96,0x0e,0x95,0x04,0x5a,0x60,0x9c,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x0c,0x60,0x4c,0x64,0xa0,0xd7,0x58,0x4f,0xff,0xff,0x0c,0x60,0x4e,0x64,
-0xa0,0xd7,0x58,0x4f,0xff,0xff,0xd2,0x00,0x66,0x60,0xd8,0x62,0xa2,0xd3,0xff,0xff,
-0x81,0xa0,0xff,0xa0,0x23,0x03,0x0f,0x02,0x41,0x60,0x58,0x4e,0xee,0x78,0xff,0xff,
-0xff,0xa1,0x26,0x46,0x1b,0x02,0x66,0x60,0xd8,0x62,0x7f,0x64,0xa2,0xdb,0xba,0xff,
-0xff,0xff,0xaf,0xff,0x13,0x00,0x3c,0x60,0x82,0x62,0x3c,0x60,0x6a,0x64,0xa2,0xdb,
-0x26,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x00,0x64,0x40,0x46,
-0xd2,0xfe,0x08,0x00,0x66,0x44,0x00,0xbc,0xff,0xff,0x04,0x03,0x3e,0x60,0x58,0x4e,
-0x91,0x78,0xff,0xff,0x56,0xf7,0xff,0xff,0xff,0xff,0x76,0xf3,0x3c,0x45,0xd4,0x80,
-0x28,0x60,0x60,0x62,0x07,0x02,0x80,0x64,0xa2,0xdb,0xff,0xff,0xc0,0xfe,0x00,0x64,
-0xa2,0xdb,0x71,0xfb,0x2e,0x58,0xff,0xff,0x26,0x46,0x28,0x60,0xda,0x63,0x00,0xf4,
-0x02,0xf2,0xbd,0xdb,0xff,0xff,0x03,0xf2,0xbd,0xdb,0x04,0xf2,0xff,0xff,0xbd,0xdb,
-0x05,0xf2,0xa3,0xdb,0xfa,0xa3,0x26,0x46,0x00,0x60,0x00,0x65,0xa3,0xd3,0x23,0xf0,
-0x00,0x61,0xd0,0x84,0xf1,0x81,0xd4,0x84,0xf1,0x81,0xbd,0xdb,0xa3,0xd3,0x03,0xb1,
-0x03,0xa9,0x24,0xf0,0x42,0xfe,0x01,0x03,0xcc,0x84,0xf1,0x81,0xd0,0x84,0xf1,0x81,
-0xbd,0xdb,0xa3,0xd3,0x03,0xb1,0x03,0xa9,0x27,0xf0,0x42,0xfe,0x01,0x03,0xcc,0x84,
-0xf1,0x81,0xd0,0x84,0xf1,0x81,0xbd,0xdb,0xa3,0xd3,0x03,0xb1,0x03,0xa9,0x28,0xf0,
-0x01,0x03,0xcc,0x84,0xd0,0x84,0xa3,0xdb,0x26,0x0e,0x28,0x60,0xda,0x63,0xbd,0xd3,
-0x00,0x65,0x00,0x61,0xd4,0x84,0xbd,0xd3,0xf1,0x81,0x01,0xa9,0x42,0xfe,0x01,0x03,
-0xcc,0x84,0xf1,0x81,0x01,0x65,0xd4,0x84,0xf1,0x81,0xbd,0xd3,0x03,0xb1,0x03,0xa9,
-0x42,0xfe,0x01,0x03,0xcc,0x84,0xf1,0x81,0x00,0x65,0xd4,0x84,0xf1,0x81,0xa3,0xd3,
-0x03,0xb1,0x03,0xa9,0x42,0xfe,0x01,0x03,0xcc,0x84,0xd4,0x84,0x04,0x0e,0x66,0x60,
-0x9a,0x62,0x01,0x64,0xa2,0xdb,0x26,0x46,0x2e,0x58,0xff,0xff,0x66,0x60,0xd6,0x62,
-0x2e,0x44,0xa2,0xdb,0x00,0x64,0x38,0xf2,0x40,0x48,0x40,0x4c,0xa0,0xa0,0xff,0xff,
-0x43,0x04,0x00,0xf4,0x01,0xf2,0x04,0x63,0x60,0x41,0x66,0x60,0xe6,0x62,0x00,0x64,
-0xa2,0xdb,0x42,0x60,0x58,0x4e,0x44,0x78,0xff,0xff,0x36,0x03,0xff,0x65,0xd4,0x80,
-0xff,0xff,0xf7,0x02,0x00,0x64,0xdc,0x84,0x40,0x4d,0x42,0x60,0x58,0x4e,0x44,0x78,
-0xff,0xff,0x2a,0x03,0xff,0x65,0xd4,0x80,0x60,0x42,0x2d,0x44,0xf4,0x03,0xfa,0xa0,
-0xff,0xff,0xe3,0x04,0x06,0x64,0x40,0x4d,0x66,0x60,0xda,0x65,0x62,0x44,0x05,0x00,
-0x42,0x60,0x58,0x4e,0x44,0x78,0xff,0xff,0x17,0x03,0xa5,0xd1,0xda,0x85,0xd0,0x80,
-0xff,0xff,0xdc,0x02,0x2d,0x44,0xcc,0x84,0x40,0x4d,0xf2,0x02,0x06,0x64,0x40,0x4d,
-0x66,0x60,0xda,0x65,0x66,0x60,0xe6,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xf0,0xa0,
-0xa2,0xdb,0xe6,0x02,0x01,0x61,0x01,0x00,0x00,0x61,0x66,0x60,0xd6,0x62,0xa2,0xd3,
-0xff,0xff,0x40,0x4e,0x2e,0x58,0xff,0xff,0x2c,0x44,0xcc,0x84,0x40,0x4c,0x11,0x0e,
-0xcd,0x81,0xff,0xff,0x05,0x0d,0x00,0xf4,0x01,0xf2,0x04,0x63,0xcc,0x84,0x60,0x41,
-0x28,0x44,0x01,0xac,0x40,0x48,0x07,0x02,0xbd,0xd2,0x01,0xb8,0x60,0x47,0x00,0x7f,
-0x05,0x00,0xdc,0x84,0x03,0x00,0xa3,0xd2,0xff,0xff,0x00,0x7f,0x2e,0x58,0xff,0xff,
-0x01,0x64,0xcb,0xfb,0x1e,0x60,0xc8,0x62,0x00,0x64,0xa2,0xdb,0x00,0x60,0x08,0x63,
-0x01,0x60,0x78,0x61,0x16,0x60,0xb4,0x64,0x58,0xd1,0x59,0xd9,0xfd,0x1f,0x00,0x60,
-0x72,0x63,0x16,0x60,0x40,0x61,0x16,0x60,0xbe,0x64,0x58,0xd1,0x59,0xd9,0xfd,0x1f,
-0xd5,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0x14,0x03,0x18,0x60,0xd0,0x63,0x17,0x60,
-0x82,0x61,0x13,0x64,0xbd,0xd1,0xa1,0xd9,0xff,0xa4,0x02,0xa1,0xfb,0x02,0x1f,0x60,
-0x38,0x63,0x0a,0xa3,0x05,0x64,0xa3,0xdb,0x0c,0xa3,0xa3,0xdb,0x04,0xa3,0xa3,0xdb,
-0x25,0x00,0x1f,0x60,0x56,0x62,0x00,0x64,0xa2,0xdb,0x1f,0x60,0x1c,0x63,0xa5,0xf3,
-0x01,0x61,0x60,0x45,0x65,0x44,0xe8,0x85,0x05,0x64,0x02,0x28,0x00,0x64,0xbd,0xdb,
-0x00,0xa0,0xff,0xff,0x0d,0x03,0x1f,0x60,0x56,0x62,0xa2,0xd3,0xff,0xff,0x01,0xa4,
-0xa2,0xdb,0xff,0xa0,0xff,0xff,0x04,0x02,0x1f,0x60,0x54,0x62,0x61,0x44,0xa2,0xdb,
-0xdd,0x81,0xff,0xff,0x61,0x44,0xf2,0xa0,0xff,0xff,0xe4,0x06,0x59,0x60,0x1e,0x61,
-0x16,0x60,0x42,0x64,0x20,0x63,0x58,0xd1,0x59,0xd9,0xfd,0x1f,0xa8,0xf1,0x80,0xf9,
-0x1f,0xf1,0x66,0x60,0xf6,0x65,0x0a,0x64,0x64,0x40,0x10,0x2a,0x04,0x64,0xa5,0xdb,
-0x32,0x40,0x01,0x26,0x07,0x00,0x00,0x60,0x1a,0x63,0x01,0x60,0x00,0x61,0x00,0x64,
-0x59,0xdb,0xfe,0x1f,0x40,0x40,0xc0,0xf3,0xff,0xff,0x40,0x4a,0x1e,0x60,0xc8,0x62,
-0x00,0x64,0xa2,0xdb,0xde,0xfe,0xff,0xff,0x0b,0x04,0x1e,0x60,0xca,0x62,0x40,0x60,
-0x00,0x64,0xa2,0xdb,0x42,0x60,0xd6,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,
-0x3c,0x60,0xa2,0x62,0x2a,0x44,0xa2,0xdb,0xca,0x82,0x08,0x64,0xa2,0xdb,0xff,0xff,
-0x2d,0xff,0x1e,0x60,0xca,0x62,0x20,0x60,0x00,0x64,0xa2,0xdb,0x42,0x60,0xfc,0x64,
-0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc8,0x62,0x00,0x64,0xa2,0xdb,
-0xbe,0xfe,0x1e,0x60,0xa8,0x62,0xa2,0xd1,0x40,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,
-0xcf,0xfe,0x61,0x60,0xc8,0x62,0x0c,0x64,0xa2,0xdb,0x64,0x60,0x58,0x62,0x01,0x64,
-0xa2,0xdb,0xd5,0xf1,0x03,0x64,0x64,0x40,0x00,0x3a,0xd5,0xfb,0x95,0xf3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0x02,0x02,0x00,0x64,0x62,0xfb,0x67,0x60,0x74,0x62,0xa2,0xd3,
-0xff,0xff,0x60,0x40,0x00,0x3a,0x2b,0x00,0x01,0x64,0xa2,0xdb,0x12,0x60,0x34,0x65,
-0x72,0x44,0xb4,0x83,0x00,0x7f,0x60,0x5c,0x10,0x61,0x40,0x60,0x0b,0x65,0x63,0x44,
-0x00,0x63,0xe8,0x80,0xf8,0x84,0x02,0x24,0x94,0x84,0xf3,0x83,0xcd,0x81,0xff,0xff,
-0xf8,0x02,0x60,0x47,0x60,0x45,0x00,0x7f,0x39,0xfb,0x65,0x44,0x00,0x7e,0xb0,0x84,
-0x38,0xfb,0x66,0x60,0xaa,0x63,0xbd,0xf3,0xff,0xff,0x02,0xbc,0xbd,0xdb,0x39,0xf3,
-0xbe,0xf1,0x60,0x47,0x00,0x7e,0xb0,0x84,0xbd,0xdb,0x38,0xf3,0xa3,0xdb,0x0f,0x4e,
-0x5c,0x60,0x58,0x4f,0x1f,0x78,0xff,0xff,0x0e,0x4f,0x0f,0x4e,0x58,0x60,0x58,0x4f,
-0xdd,0x78,0xff,0xff,0x0e,0x4f,0x0f,0x4e,0x5e,0x60,0x58,0x4f,0x53,0x78,0xff,0xff,
-0x0e,0x4f,0x0f,0x4e,0x44,0x60,0x58,0x4f,0x1e,0x78,0xff,0xff,0x0e,0x4f,0x1e,0x60,
-0xc8,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc8,0x62,
-0x00,0x64,0xa2,0xdb,0x02,0x64,0x8b,0xfb,0xff,0xff,0xc1,0xfe,0x1e,0x60,0xe0,0x62,
-0xa2,0xd1,0x00,0x60,0xf4,0x86,0x7e,0x00,0x00,0x10,0x1f,0x64,0xb0,0x84,0xa2,0xdb,
-0xcf,0xfe,0x1e,0x60,0xc8,0x62,0xa2,0xd1,0x00,0x60,0x08,0x64,0xb0,0x84,0xa2,0xdb,
-0xff,0xff,0xcf,0xfe,0x1e,0x60,0xca,0x62,0x00,0x60,0x08,0x64,0xa2,0xdb,0x43,0x60,
-0x92,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x8b,0xf3,0x00,0x65,0xd4,0x80,
-0xff,0xff,0x0b,0x03,0x1e,0x60,0xca,0x62,0x80,0x60,0x00,0x64,0xa2,0xdb,0x43,0x60,
-0x92,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc8,0x62,0x00,0x64,
-0xa2,0xdb,0xde,0xfe,0xff,0xff,0x0b,0x04,0x1e,0x60,0xca,0x62,0x20,0x60,0x00,0x64,
-0xa2,0xdb,0x43,0x60,0xb4,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x3c,0x60,
-0xa2,0x62,0xca,0x82,0x06,0x64,0xa2,0xdb,0xff,0xff,0x2d,0xff,0x1e,0x60,0xc8,0x62,
-0x00,0x64,0xa2,0xdb,0x5a,0xdb,0xbe,0xfe,0x3c,0x60,0x28,0x61,0x43,0x60,0x58,0x4e,
-0xef,0x78,0xff,0xff,0x3c,0x60,0x2e,0x61,0x43,0x60,0x58,0x4e,0xef,0x78,0xff,0xff,
-0x3c,0x60,0x46,0x61,0x43,0x60,0x58,0x4e,0xef,0x78,0xff,0xff,0x3c,0x60,0x6a,0x61,
-0x43,0x60,0x58,0x4e,0xef,0x78,0xff,0xff,0x3c,0x60,0x4c,0x61,0x43,0x60,0x58,0x4e,
-0xef,0x78,0xff,0xff,0x3c,0x60,0x76,0x61,0x43,0x60,0x58,0x4e,0xef,0x78,0xff,0xff,
-0xc5,0xfe,0x01,0x64,0xcb,0xfb,0x02,0x65,0x3d,0x60,0x58,0x4e,0x32,0x78,0xff,0xff,
-0x2f,0x58,0xff,0xff,0xa1,0xd3,0x0e,0x57,0x00,0xa8,0x60,0x46,0x28,0x03,0x09,0xf0,
-0x0e,0xf2,0x44,0x4c,0x20,0xb0,0x01,0xb0,0x0b,0x03,0x3c,0x60,0x82,0x62,0x00,0x64,
-0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x15,0x00,
-0x14,0x02,0x0f,0x4e,0x46,0x45,0x3c,0x60,0x82,0x62,0x00,0x64,0xa2,0xdb,0x66,0x44,
-0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xa2,0xff,0x1a,0x60,0x58,0x4f,
-0x9e,0x78,0xff,0xff,0xa3,0xff,0xd1,0xfe,0x0e,0x4f,0x2c,0x44,0xd5,0x00,0x37,0x58,
-0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x1e,0x60,0xc2,0x62,0xa2,0xd1,
-0x00,0x60,0x02,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x1e,0x60,0xc4,0x62,
-0x00,0x60,0x02,0x64,0xa2,0xdb,0x44,0x60,0x36,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x16,0x60,0x42,0x62,0xa2,0xd3,
-0xff,0xff,0x03,0xa8,0x04,0xa8,0x02,0x03,0x04,0x03,0x06,0x00,0x45,0x60,0x25,0x78,
-0xff,0xff,0x45,0x60,0x6b,0x78,0xff,0xff,0x02,0x64,0xcb,0xfb,0x00,0x64,0x81,0xfb,
-0x82,0xfb,0x83,0xfb,0x66,0x60,0xc0,0x62,0x01,0x64,0xa2,0xdb,0x16,0x60,0x44,0x64,
-0x5b,0xfb,0x0f,0x4e,0x52,0x60,0x58,0x4f,0xaa,0x78,0xff,0xff,0x0e,0x4f,0x1e,0x60,
-0xc4,0x62,0x10,0x60,0x00,0x64,0xa2,0xdb,0x44,0x60,0x67,0x64,0x5a,0xdb,0xcf,0xfe,
-0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x59,0x60,0xb4,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x88,0xf1,0x27,0x60,0xe0,0x63,0xd3,0x80,
-0xff,0xff,0x03,0x03,0x4b,0x60,0x47,0x78,0xff,0xff,0xc0,0xf3,0xc6,0xf3,0x40,0x4a,
-0x00,0xa8,0xff,0xff,0x03,0x03,0x45,0x60,0x6b,0x78,0xff,0xff,0x3e,0x60,0x58,0x4e,
-0xae,0x78,0xff,0xff,0x02,0x64,0xcb,0xfb,0x64,0x60,0x58,0x62,0xa2,0xd3,0xff,0xff,
-0x9d,0xa0,0x01,0xa4,0x03,0x05,0xec,0xa0,0xa2,0xdb,0x18,0x06,0xa9,0xf1,0x28,0x60,
-0x7e,0x64,0xa0,0xd9,0x3c,0x60,0xb2,0x62,0x28,0x60,0x7a,0x64,0xa2,0xdb,0x02,0x64,
-0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xc4,0x62,0x00,0x60,0x04,0x64,0xa2,0xdb,
-0x44,0x60,0xc7,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0xe1,0xf3,0xff,0xff,
-0x00,0xa0,0x60,0x5c,0x17,0x03,0x28,0x60,0x7e,0x64,0xa0,0xd9,0x3c,0x60,0xb2,0x62,
-0x28,0x60,0x7a,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,
-0xc4,0x62,0x00,0x60,0x04,0x64,0xa2,0xdb,0x44,0x60,0xc7,0x64,0x5a,0xdb,0xcf,0xfe,
-0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0xd5,0xf3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0x18,0x03,0x66,0x60,0xc2,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,
-0x88,0xa0,0xa2,0xdb,0x10,0x04,0x00,0x64,0xa2,0xdb,0x03,0x64,0xd5,0xfb,0x0a,0x65,
-0x3d,0x60,0x58,0x4e,0x32,0x78,0xff,0xff,0x1f,0x60,0x1c,0x63,0x0e,0x64,0x00,0x7c,
-0xcc,0x84,0xbd,0xd9,0xfd,0x02,0x67,0x60,0x76,0x65,0xa5,0xd3,0xff,0xff,0x60,0x40,
-0x03,0x22,0x33,0x00,0x01,0x2a,0x0c,0x00,0x1e,0x60,0x92,0x63,0xa3,0xd1,0x66,0x60,
-0xf0,0x65,0xad,0xf3,0xa5,0xd3,0x60,0x45,0xc4,0x84,0xd0,0x80,0xff,0xff,0x25,0x0d,
-0x67,0x60,0x76,0x65,0xa5,0xd3,0xff,0xff,0x60,0x45,0xfd,0xb4,0xa2,0xdb,0x20,0x44,
-0xb4,0x84,0x40,0x40,0x59,0x60,0xbc,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x0f,0x4e,0x52,0x60,0x58,0x4f,0xaa,0x78,0xff,0xff,0x0e,0x4f,0x1e,0x60,0xc4,0x62,
-0x10,0x60,0x00,0x64,0xa2,0xdb,0x45,0x60,0x1e,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x44,0x60,0x49,0x78,0xff,0xff,
-0x05,0x64,0xcb,0xfb,0xc5,0xf3,0x47,0xfb,0x00,0x64,0xc0,0xf1,0x85,0xfb,0x44,0x4a,
-0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0xde,0xfe,0xff,0xff,0x0b,0x04,0x1e,0x60,
-0xc4,0x62,0x40,0x60,0x00,0x64,0xa2,0xdb,0x45,0x60,0x2d,0x64,0x5a,0xdb,0xcf,0xfe,
-0x2f,0x58,0xff,0xff,0x3c,0x60,0xa2,0x62,0x2a,0x44,0xa2,0xdb,0xca,0x82,0x1e,0x64,
-0xa2,0xdb,0xff,0xff,0x2d,0xff,0x1e,0x60,0xc4,0x62,0x20,0x60,0x00,0x64,0xa2,0xdb,
-0x45,0x60,0x53,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,
-0x00,0x64,0xa2,0xdb,0xbe,0xfe,0x1e,0x60,0xa8,0x62,0xa2,0xd1,0x40,0x60,0x00,0x64,
-0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0x01,0x64,0x8c,0xfb,0x02,0x64,0x90,0xfb,0x01,0x65,
-0x3d,0x60,0x58,0x4e,0x32,0x78,0xff,0xff,0x2f,0x58,0xff,0xff,0xd5,0xf3,0xff,0xff,
-0xfd,0xa0,0xff,0xff,0x05,0x05,0x0c,0x60,0x50,0x62,0x67,0x60,0x13,0x64,0xa2,0xdb,
-0x0c,0x60,0x48,0x62,0x67,0x60,0xd6,0x64,0xa2,0xdb,0x59,0x60,0x74,0x62,0x28,0x60,
-0xe2,0x64,0xa2,0xdb,0x77,0xf5,0x00,0x64,0x22,0xfa,0x38,0xfa,0x08,0x64,0x28,0xfa,
-0x18,0x60,0x20,0x64,0x0e,0xfa,0x90,0x64,0x29,0xfa,0x66,0x60,0xa4,0x62,0x12,0x60,
-0x34,0x65,0x72,0x44,0xb4,0x84,0xa2,0xdb,0xc0,0xf3,0x7f,0xfb,0x66,0x60,0x96,0x63,
-0x00,0x64,0xbd,0xdb,0xbd,0xdb,0xa3,0xdb,0xff,0xff,0x71,0xfb,0x70,0xfb,0x81,0xfb,
-0xff,0xff,0x82,0xfb,0x83,0xfb,0xff,0xff,0xc5,0xf3,0x47,0xfb,0x16,0x60,0xbe,0x64,
-0xa0,0xd3,0x86,0xfb,0x66,0x60,0xa2,0x63,0x06,0x64,0xa3,0xdb,0x01,0x64,0x73,0xfb,
-0x39,0x60,0xf2,0x62,0x00,0x64,0xa2,0xdb,0x5e,0xfb,0x68,0x60,0xcc,0x62,0x90,0x60,
-0x90,0x64,0xa2,0xdb,0x66,0x60,0xa6,0x63,0x02,0x64,0xcb,0xfb,0xa3,0xdb,0x28,0x60,
-0xd2,0x63,0x39,0x60,0xb2,0x7c,0x10,0x65,0x00,0x64,0x47,0xdb,0xd3,0x80,0x47,0xdb,
-0xfc,0x04,0x16,0x60,0x44,0x64,0x5b,0xfb,0x0f,0x4e,0x52,0x60,0x58,0x4f,0xaa,0x78,
-0xff,0xff,0x0e,0x4f,0x1e,0x60,0xc4,0x62,0x10,0x60,0x00,0x64,0xa2,0xdb,0x45,0x60,
-0xda,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,
-0xa2,0xdb,0x59,0x60,0xb4,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x39,0x60,
-0xf2,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x09,0x03,0x4b,0x60,0x58,0x4e,
-0x2b,0x78,0xff,0xff,0x04,0x02,0x46,0x60,0x97,0x78,0xff,0xff,0xd2,0x00,0x59,0x60,
-0x20,0x62,0xa2,0xd3,0x01,0x63,0x60,0x40,0x00,0x3a,0x6e,0xfd,0x0a,0x61,0x66,0x60,
-0xa4,0x62,0x40,0x60,0x0b,0x65,0xa2,0xd3,0x00,0x63,0xe8,0x80,0xf8,0x84,0x02,0x24,
-0x94,0x84,0xf3,0x83,0xcd,0x81,0xff,0xff,0xf8,0x02,0xa2,0xdb,0x64,0xa3,0x28,0x60,
-0x7e,0x62,0xa2,0xdd,0x3c,0x60,0xb2,0x62,0x28,0x60,0x7a,0x64,0xa2,0xdb,0x02,0x64,
-0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xc4,0x62,0x00,0x60,0x04,0x64,0xa2,0xdb,
-0x46,0x60,0x23,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,
-0x00,0x64,0xa2,0xdb,0x00,0x64,0x6e,0xfb,0x39,0x60,0xf2,0x62,0xa2,0xd3,0xff,0xff,
-0x00,0xa0,0x60,0x45,0x67,0x02,0x66,0x60,0xa2,0x62,0xa2,0xd3,0xff,0xff,0xcc,0x84,
-0xa2,0xdb,0xbc,0x02,0x59,0x60,0x20,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,
-0x10,0x03,0x66,0x60,0xa8,0x62,0xa2,0xd1,0x73,0xf3,0xff,0xff,0xfd,0xa0,0xfe,0xa0,
-0x2e,0x03,0x07,0x03,0x64,0x44,0x00,0x3a,0x2a,0x00,0x65,0x44,0x00,0xa0,0xff,0xff,
-0x26,0x03,0x16,0x60,0x88,0x62,0xa2,0xd1,0x04,0x7f,0x64,0x40,0xff,0x26,0x08,0x7f,
-0x60,0x43,0x28,0x60,0x7e,0x62,0xa2,0xdd,0x3c,0x60,0xb2,0x62,0x28,0x60,0x7a,0x64,
-0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xc4,0x62,0x00,0x60,
-0x04,0x64,0xa2,0xdb,0x46,0x60,0x6d,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,
-0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x45,0x60,0x93,0x78,0xff,0xff,0x66,0x60,
-0xaa,0x63,0xbd,0xd3,0x81,0xfb,0xbd,0xd3,0xff,0xff,0x82,0xfb,0xa3,0xd3,0xff,0xff,
-0xdc,0x84,0xa3,0xdb,0x83,0xfb,0xff,0xff,0xc1,0xf3,0x86,0xfb,0x73,0xf3,0xff,0xff,
-0x04,0xbc,0x73,0xfb,0x04,0x64,0x5e,0xfb,0x68,0x60,0xcc,0x62,0x90,0x60,0x91,0x64,
-0xa2,0xdb,0x66,0x60,0x9e,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x47,0x60,
-0x1a,0x78,0xff,0xff,0x39,0x60,0xf2,0x63,0xbd,0xd1,0x81,0xf9,0xbd,0xd1,0xff,0xff,
-0x82,0xf9,0xbd,0xd1,0x83,0xf9,0x08,0xa3,0xbd,0xd1,0x80,0xf9,0xff,0xff,0xbd,0xd1,
-0xbd,0xd1,0x59,0x60,0x20,0x65,0xa5,0xd9,0x02,0xa2,0x62,0x45,0x64,0x41,0xdd,0x81,
-0xe9,0x81,0xbd,0xd1,0xa5,0xd9,0xda,0x82,0xcd,0x81,0x62,0x45,0xfa,0x02,0x3a,0x60,
-0x26,0x63,0xbd,0xd3,0x00,0x61,0x60,0x45,0xbd,0xd3,0xff,0xff,0x7f,0xb4,0x02,0x36,
-0x01,0xb9,0x04,0x36,0x02,0xb9,0x0b,0x36,0x04,0xb9,0x16,0x36,0x08,0xb9,0x65,0x44,
-0xcc,0x84,0x60,0x45,0xf1,0x02,0xc9,0xf1,0x61,0x44,0xa0,0x84,0xc9,0xfb,0x00,0x61,
-0x60,0x45,0x3a,0x60,0x28,0x63,0x65,0x40,0x01,0x2a,0x03,0x00,0x02,0x64,0xbd,0xdb,
-0xdd,0x81,0x65,0x40,0x02,0x2a,0x03,0x00,0x04,0x64,0xbd,0xdb,0xdd,0x81,0x65,0x40,
-0x04,0x2a,0x03,0x00,0x0b,0x64,0xbd,0xdb,0xdd,0x81,0x65,0x40,0x08,0x2a,0x03,0x00,
-0x16,0x64,0xbd,0xdb,0xdd,0x81,0x3a,0x60,0x26,0x63,0x61,0x44,0xbd,0xdb,0x17,0x60,
-0xd2,0x65,0x61,0x44,0xa5,0xdb,0xda,0x82,0x62,0x45,0xbd,0xd3,0xbd,0xd1,0x60,0x47,
-0xb0,0x87,0xa5,0xda,0xda,0x85,0xcd,0x81,0xcd,0x81,0x01,0x03,0xf6,0x02,0x3a,0x60,
-0x32,0x63,0xbd,0xd1,0x17,0x60,0xdc,0x62,0xa2,0xd3,0xff,0xff,0xa0,0x84,0xa2,0xdb,
-0x60,0x45,0xbd,0xd3,0x7f,0xfb,0xff,0xff,0xbd,0xd3,0x86,0xfb,0x65,0x44,0x00,0x65,
-0x60,0x40,0x02,0x26,0x01,0x65,0x60,0x40,0x04,0x26,0x02,0x65,0x60,0x40,0x08,0x26,
-0x03,0x65,0x59,0x60,0x68,0x62,0x65,0x44,0xa2,0xdb,0x16,0x60,0x88,0x63,0xa3,0xd1,
-0x17,0x60,0x06,0x63,0xa3,0xd9,0x86,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0x02,0x02,
-0xa3,0xdb,0x05,0x00,0xfd,0xa0,0xff,0xff,0x02,0x05,0x03,0x64,0x86,0xfb,0xff,0x60,
-0xff,0x64,0x62,0xfb,0x76,0xf5,0x66,0x60,0x58,0x4e,0x3a,0x78,0xff,0xff,0x17,0x60,
-0xdc,0x62,0xa2,0xd3,0xff,0xff,0xff,0xff,0x01,0x2a,0x02,0x00,0x00,0x64,0x09,0x00,
-0x02,0x2a,0x02,0x00,0x01,0x64,0x05,0x00,0x04,0x2a,0x02,0x00,0x02,0x64,0x01,0x00,
-0x03,0x64,0x13,0xfa,0x77,0xf5,0x13,0xfa,0xff,0xff,0xbd,0xf1,0x2e,0xf8,0xbe,0xf1,
-0xff,0xff,0x2f,0xf8,0xbf,0xf1,0x30,0xf8,0xff,0xff,0x81,0xf1,0x31,0xf8,0x82,0xf1,
-0xff,0xff,0x32,0xf8,0x83,0xf1,0x33,0xf8,0x66,0x60,0xa6,0x63,0x03,0x64,0xcb,0xfb,
-0xa3,0xdb,0x00,0x64,0x7f,0xf1,0x85,0xfb,0x44,0x4a,0x1e,0x60,0xc2,0x62,0x00,0x64,
-0xa2,0xdb,0xde,0xfe,0xff,0xff,0x0b,0x04,0x1e,0x60,0xc4,0x62,0x40,0x60,0x00,0x64,
-0xa2,0xdb,0x47,0x60,0x62,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x3c,0x60,
-0xa2,0x62,0x2a,0x44,0xa2,0xdb,0xca,0x82,0x1e,0x64,0xa2,0xdb,0xff,0xff,0x2d,0xff,
-0x1e,0x60,0xc4,0x62,0x20,0x60,0x00,0x64,0xa2,0xdb,0x47,0x60,0x88,0x64,0x5a,0xdb,
-0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0xbe,0xfe,
-0x1e,0x60,0xa8,0x62,0xa2,0xd1,0x40,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,
-0x01,0x64,0x8c,0xfb,0x02,0x64,0x90,0xfb,0x68,0x60,0xcc,0x62,0x90,0x60,0x70,0x64,
-0xa2,0xdb,0x20,0x44,0x10,0x26,0x05,0x00,0x01,0x65,0x3d,0x60,0x58,0x4e,0x32,0x78,
-0xff,0xff,0x20,0x44,0xef,0xb4,0x40,0x40,0x1e,0x60,0xd4,0x62,0xa2,0xd1,0x00,0x60,
-0x80,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x1e,0x60,0xc4,0x62,0x00,0x60,
-0x02,0x64,0xa2,0xdb,0x47,0x60,0xbd,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,
-0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x3d,0x60,0x1c,0x62,0xa2,0xd3,0x10,0x61,
-0x00,0x63,0x60,0x45,0xe0,0x84,0xa2,0xdb,0x65,0x44,0x01,0x26,0xdf,0x83,0xcd,0x81,
-0xe8,0x84,0xfb,0x02,0x63,0x44,0xfc,0xa0,0xff,0xff,0x0d,0x04,0x3d,0x60,0x1e,0x62,
-0x32,0x64,0xa2,0xdb,0x62,0xf3,0xff,0xff,0x60,0x40,0x00,0x36,0x13,0x00,0x17,0x60,
-0x06,0x62,0x00,0x64,0xa2,0xdb,0x3d,0x60,0x1e,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,
-0xcc,0x84,0x08,0x03,0xa2,0xdb,0x06,0x02,0x3d,0x60,0x20,0x62,0xa2,0xd1,0x17,0x60,
-0x06,0x62,0xa2,0xd9,0x65,0xf1,0x00,0x64,0x6a,0xfb,0x6b,0xfb,0xff,0xff,0x6d,0xfb,
-0x6f,0xfb,0x64,0x40,0x02,0x26,0x03,0x00,0x4a,0x60,0xfc,0x78,0xff,0xff,0x1e,0x60,
-0xd4,0x62,0xa2,0xd1,0x00,0x60,0x08,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,
-0x66,0x60,0xb2,0x65,0x86,0xf3,0xa4,0xf1,0xa5,0xdb,0xff,0xff,0xff,0x22,0x06,0x00,
-0xe0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xc0,0x84,0x6c,0xfb,0x5e,0xf3,0xff,0xff,
-0x04,0xb0,0xff,0xff,0x15,0x03,0x02,0x64,0x8c,0xfb,0x1e,0x60,0xc2,0x62,0xa2,0xd1,
-0x7f,0x60,0xff,0x64,0xa0,0x84,0xa2,0xdb,0x1e,0x60,0xc4,0x62,0x80,0x60,0x00,0x64,
-0xa2,0xdb,0x48,0x60,0x30,0x64,0x5a,0xdb,0xcf,0xfe,0xc1,0xfe,0x2f,0x58,0xff,0xff,
-0x49,0x60,0xcc,0x78,0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x7f,0x60,0xff,0x64,
-0xa0,0x84,0xa2,0xdb,0x8c,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0xef,0x02,0x1e,0x60,
-0xc2,0x62,0xa2,0xd1,0x7f,0x60,0xff,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,
-0x5a,0xdb,0x6e,0xf3,0x60,0x40,0x02,0x26,0x32,0x00,0x76,0xf5,0x80,0x64,0x29,0xfa,
-0x00,0x63,0x38,0xf2,0x22,0xfc,0x17,0xfa,0x1c,0x64,0x21,0xfa,0x15,0xfc,0x16,0xfc,
-0x01,0x64,0x14,0xfa,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x3c,0x60,0x82,0x62,
-0x3c,0x60,0x2e,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0xc1,0xfe,0x1e,0x60,0xc4,0x62,0x00,0x60,0x01,0x64,0xa2,0xdb,0x48,0x60,
-0x72,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,
-0xff,0x60,0xfe,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,0x86,0xf3,
-0xff,0xff,0x00,0xa0,0xff,0xff,0x2f,0x03,0x3c,0x60,0x28,0x62,0xa2,0xd3,0xff,0xff,
-0x00,0xa8,0x60,0x46,0x25,0x03,0x40,0x48,0x00,0x64,0x40,0x4c,0x3c,0x60,0x2a,0x62,
-0xa2,0xd3,0x28,0x45,0xd4,0x80,0x60,0x46,0x23,0x03,0x2b,0xf2,0xff,0xff,0xff,0xff,
-0x01,0x2a,0x14,0x00,0x09,0xf2,0xff,0xff,0x40,0x4d,0x3c,0x60,0x82,0x62,0x3c,0x60,
-0x28,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0e,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,
-0x01,0x64,0x40,0x4c,0x2d,0x44,0x00,0xbc,0x60,0x46,0xe0,0x03,0x0a,0xf2,0xe1,0x00,
-0x49,0x60,0x99,0x78,0xff,0xff,0x01,0x64,0x6d,0xfb,0x49,0x60,0xc2,0x78,0xff,0xff,
-0x2c,0x44,0x01,0x2a,0x11,0x00,0x28,0x46,0x2b,0xf2,0xff,0xff,0xff,0xff,0x01,0x2a,
-0x0b,0x00,0x3c,0x60,0x82,0x62,0x3c,0x60,0x28,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,
-0x0e,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x3c,0x60,0x28,0x62,0xa2,0xd3,0xff,0xff,
-0x00,0xa8,0x60,0x46,0x2b,0xf2,0xff,0xff,0xff,0xff,0x01,0x2a,0x31,0x00,0x4b,0x60,
-0x58,0x4e,0x03,0x78,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x3c,0x60,
-0x82,0x62,0x3c,0x60,0x2e,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0xc1,0xfe,0x1e,0x60,0xc4,0x62,0x00,0x60,0x01,0x64,0xa2,0xdb,
-0x48,0x60,0xf3,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,
-0xa2,0xd1,0xff,0x60,0xfe,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,
-0x77,0xf5,0x22,0xf2,0xff,0xff,0xff,0xff,0x0f,0x26,0x02,0x00,0x01,0x64,0x6d,0xfb,
-0x01,0x64,0x6f,0xfb,0x3c,0x60,0x28,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,
-0x40,0x48,0x00,0xbc,0x60,0x46,0x03,0x02,0x49,0x60,0x99,0x78,0xff,0xff,0x6c,0xf3,
-0xa4,0xf1,0xff,0xff,0xd0,0x80,0xff,0xff,0x7f,0x0e,0x2b,0xf2,0xff,0xff,0x01,0xb0,
-0x19,0xf2,0x77,0x02,0x00,0xbc,0x60,0x43,0x6b,0x03,0xa3,0xd3,0xff,0xff,0xff,0xff,
-0x02,0x2a,0x63,0x00,0x69,0x60,0x58,0x4e,0x9b,0x78,0xff,0xff,0x6a,0x03,0x69,0x60,
-0x58,0x4e,0xb5,0x78,0xff,0xff,0x65,0x03,0x66,0x44,0x69,0xfb,0x4b,0x60,0x58,0x4e,
-0x0a,0x78,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x3c,0x60,0x82,0x62,
-0x3c,0x60,0x2e,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0xc1,0xfe,0x1e,0x60,0xc4,0x62,0x00,0x60,0x01,0x64,0xa2,0xdb,0x49,0x60,
-0x52,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,
-0xff,0x60,0xfe,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,0x77,0xf5,
-0x22,0xf2,0x69,0xf5,0x0f,0xb0,0x46,0x48,0x07,0x02,0x69,0x60,0x58,0x4e,0xb9,0x78,
-0xff,0xff,0x00,0x64,0x15,0xfa,0x21,0x00,0x69,0x60,0x58,0x4e,0xcc,0x78,0xff,0xff,
-0x15,0xf2,0xff,0xff,0x01,0xa4,0xe7,0xa0,0x15,0xfa,0x23,0x04,0x66,0x60,0xb0,0x62,
-0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x09,0xf2,0xff,0xff,0x40,0x48,0x3c,0x60,
-0x82,0x62,0x3c,0x60,0x4c,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0xce,0xfe,0x28,0x44,0x83,0x00,0x01,0x64,0x6f,0xfb,0x09,0x00,
-0x69,0x60,0x58,0x4e,0x9b,0x78,0xff,0xff,0x04,0x03,0x69,0x60,0x58,0x4e,0xb9,0x78,
-0xff,0xff,0x28,0x46,0x09,0xf2,0xf0,0x00,0x6c,0xf3,0xa4,0xf1,0xff,0xff,0xd0,0x84,
-0xff,0xff,0x23,0x0e,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0x60,0x40,0xff,0x22,
-0x01,0x64,0x60,0x43,0x28,0x60,0x7e,0x62,0xa2,0xdd,0x3c,0x60,0xb2,0x62,0x28,0x60,
-0x7a,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xc4,0x62,
-0x00,0x60,0x04,0x64,0xa2,0xdb,0x49,0x60,0xbe,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x6d,0xf3,0xff,0xff,0x02,0xbc,
-0x6d,0xfb,0x00,0x64,0x6a,0xfb,0x01,0x64,0x8c,0xfb,0xff,0xff,0xc1,0xfe,0x66,0x60,
-0x9a,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x3c,0x03,0x10,0xb4,0x20,0x45,
-0xb4,0x84,0x40,0x40,0x66,0x60,0x9c,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x8c,0xf3,0xff,0xff,0x00,0xa0,0x02,0x64,0x2a,0x03,0x8c,0xfb,0x1e,0x60,0xc2,0x62,
-0xa2,0xd1,0x7f,0x60,0xff,0x64,0xa0,0x84,0xa2,0xdb,0x1e,0x60,0xc4,0x62,0x80,0x60,
-0x00,0x64,0xa2,0xdb,0x49,0x60,0xf6,0x64,0x5a,0xdb,0xcf,0xfe,0xc1,0xfe,0x2f,0x58,
-0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x7f,0x60,0xff,0x64,0xa0,0x84,0xa2,0xdb,
-0x8c,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0xf2,0x02,0x1e,0x60,0xc2,0x62,0xa2,0xd1,
-0x7f,0x60,0xff,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,0x45,0x60,
-0x93,0x78,0xff,0xff,0x67,0x60,0x76,0x65,0xa5,0xd3,0xff,0xff,0x60,0x40,0x03,0x22,
-0x3d,0x00,0x01,0x2a,0x0c,0x00,0x1e,0x60,0x92,0x63,0xa3,0xd1,0x66,0x60,0xf0,0x65,
-0xad,0xf3,0xa5,0xd3,0x60,0x45,0xc4,0x84,0xd0,0x80,0xff,0xff,0x26,0x0d,0x67,0x60,
-0x76,0x65,0xa5,0xd3,0xff,0xff,0x60,0x45,0xfd,0xb4,0xa2,0xdb,0x20,0x44,0xb4,0x84,
-0x40,0x40,0x59,0x60,0xbc,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x0c,0x60,
-0x50,0x62,0x56,0x60,0x53,0x64,0xa2,0xdb,0x0f,0x4e,0x52,0x60,0x58,0x4f,0xaa,0x78,
-0xff,0xff,0x0e,0x4f,0x1e,0x60,0xc4,0x62,0x10,0x60,0x00,0x64,0xa2,0xdb,0x4a,0x60,
-0x4a,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,
-0xa2,0xdb,0x0c,0x60,0x50,0x62,0x67,0x60,0x13,0x64,0xa2,0xdb,0x71,0xf3,0x70,0xf3,
-0x9c,0xa0,0xff,0xff,0x7f,0x04,0x64,0x64,0x71,0xfb,0x66,0x60,0xa8,0x62,0xa2,0xd3,
-0xff,0xff,0x00,0xa0,0xff,0xff,0x76,0x02,0xcb,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,
-0x44,0x02,0x8c,0xf3,0xff,0xff,0xff,0xa0,0x02,0x64,0x2a,0x02,0x8c,0xfb,0x1e,0x60,
-0xc2,0x62,0xa2,0xd1,0x7f,0x60,0xff,0x64,0xa0,0x84,0xa2,0xdb,0x1e,0x60,0xc4,0x62,
-0x80,0x60,0x00,0x64,0xa2,0xdb,0x4a,0x60,0x7f,0x64,0x5a,0xdb,0xcf,0xfe,0xc1,0xfe,
-0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x7f,0x60,0xff,0x64,0xa0,0x84,
-0xa2,0xdb,0x8c,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0xf2,0x02,0x1e,0x60,0xc2,0x62,
-0xa2,0xd1,0x7f,0x60,0xff,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,
-0x68,0x60,0xcc,0x62,0x90,0x60,0x71,0x64,0xa2,0xdb,0x66,0x60,0xa6,0x64,0xa0,0xd3,
-0xff,0xff,0xfd,0xa0,0xff,0xff,0x09,0x02,0x02,0x64,0xa2,0xdb,0x00,0x64,0x70,0xfb,
-0x02,0x65,0x3d,0x60,0x58,0x4e,0x32,0x78,0xff,0xff,0x66,0x60,0x96,0x65,0xa5,0xd1,
-0x01,0x60,0xf4,0x64,0x64,0x43,0xdf,0x83,0xd0,0x80,0xa5,0xdd,0x48,0x05,0x66,0x60,
-0x98,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0x00,0x64,0xa5,0xdb,0x40,0x03,0xd5,0xf3,
-0x03,0x7c,0x00,0xa0,0xff,0xff,0x13,0x03,0xd5,0xf9,0x0a,0x65,0x3d,0x60,0x58,0x4e,
-0x32,0x78,0xff,0xff,0x0c,0x60,0x50,0x62,0x56,0x60,0x53,0x64,0xa2,0xdb,0x1f,0x60,
-0x1c,0x63,0x0e,0x64,0x00,0x7c,0xbd,0xd9,0xcc,0x84,0xff,0xff,0xfc,0x02,0x45,0x60,
-0x93,0x78,0xff,0xff,0xfd,0xa0,0xff,0xff,0x22,0x04,0x66,0x60,0x96,0x62,0x00,0x64,
-0xa2,0xdb,0x70,0xfb,0x66,0x60,0x98,0x62,0x01,0x64,0xa2,0xdb,0x66,0x60,0xa6,0x64,
-0xa0,0xd3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x12,0x03,0x03,0x64,0xa2,0xdb,0x03,0x64,
-0xcb,0xfb,0x01,0x64,0x8c,0xfb,0xff,0xff,0xc1,0xfe,0x68,0x60,0xcc,0x62,0x90,0x60,
-0x70,0x64,0xa2,0xdb,0x01,0x65,0x3d,0x60,0x58,0x4e,0x32,0x78,0xff,0xff,0x69,0x60,
-0x58,0x4e,0x58,0x78,0xff,0xff,0x47,0x60,0xb2,0x78,0xff,0xff,0x77,0xf5,0xff,0x60,
-0xff,0x64,0x2b,0xfa,0x2c,0xfa,0x2d,0xfa,0x0b,0x00,0x77,0xf1,0x2b,0xf2,0x2c,0xf2,
-0x60,0x43,0x64,0x46,0x2c,0xfa,0x2b,0xfc,0x28,0x46,0x2d,0xf2,0x64,0x46,0x2d,0xfa,
-0x90,0x64,0x29,0xfa,0x47,0xf3,0xff,0xff,0xe8,0x84,0xe8,0x84,0x1c,0xfa,0x00,0x63,
-0x38,0xf2,0x22,0xfc,0xff,0xff,0x19,0xfc,0x16,0xfc,0x17,0xfa,0x1c,0x64,0x21,0xfa,
-0x0e,0x64,0x15,0xfa,0x01,0x64,0x14,0xfa,0x2e,0x58,0xff,0xff,0x3a,0x60,0x02,0x62,
-0xa2,0xd3,0x43,0xf1,0x60,0x41,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0x90,0x84,
-0x01,0xb4,0xc5,0xf1,0x0d,0x02,0x61,0x44,0x90,0x84,0x20,0xb4,0xff,0xff,0x08,0x03,
-0x64,0x44,0x20,0x2a,0x04,0x00,0x00,0x64,0x47,0xfb,0x00,0xbc,0x01,0x00,0x01,0xbc,
-0x2e,0x58,0xff,0xff,0x4c,0x60,0x3f,0x78,0xff,0xff,0x78,0xf5,0x51,0x60,0x58,0x4e,
-0x28,0x78,0xff,0xff,0x51,0x60,0x58,0x4e,0xb2,0x78,0xff,0xff,0x85,0xf1,0x10,0x67,
-0xa0,0x84,0xb0,0xbc,0x29,0xfa,0x51,0x60,0x58,0x4e,0xa3,0x78,0xff,0xff,0x06,0x63,
-0x38,0xfc,0x00,0x64,0x22,0xfa,0x3a,0x60,0x58,0x4e,0x14,0x78,0xff,0xff,0x66,0x45,
-0x00,0xf4,0x04,0x61,0x7d,0xf1,0x00,0x64,0x64,0x40,0x02,0x26,0x01,0x64,0xa1,0xda,
-0x01,0x63,0x59,0xdc,0x00,0x64,0x59,0xda,0xa7,0xf1,0x28,0x60,0x7e,0x62,0xa2,0xd9,
-0x3c,0x60,0x82,0x62,0x3c,0x60,0x2e,0x64,0xa2,0xdb,0xf4,0x96,0x7e,0x00,0x00,0x10,
-0x65,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xc1,0xfe,0x01,0x64,
-0x5d,0xfb,0x3c,0x60,0xb2,0x62,0x28,0x60,0x7a,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,
-0xff,0xff,0x1d,0xff,0x1e,0x60,0xc4,0x62,0x00,0x60,0x0c,0x64,0xa2,0xdb,0x4b,0x60,
-0x97,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,
-0x00,0x60,0x08,0x64,0xa0,0x80,0x9c,0x84,0x2e,0x03,0xa0,0x84,0xa2,0xdb,0x3c,0x60,
-0xb2,0x62,0x28,0x60,0x7a,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,
-0x00,0x64,0x5d,0xfb,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x26,0x46,
-0x38,0xf2,0x00,0xf4,0x04,0xf2,0x60,0x41,0x00,0xa8,0xff,0xff,0x03,0x03,0x4c,0x60,
-0x30,0x78,0xff,0xff,0x7d,0xf3,0xff,0xff,0x02,0xb4,0x03,0xf2,0x03,0x02,0x4c,0x60,
-0x02,0x78,0xff,0xff,0x02,0xa8,0x88,0x65,0x38,0x02,0xd5,0x80,0xff,0xff,0x04,0x05,
-0x4c,0x60,0x30,0x78,0xff,0xff,0x43,0x00,0x26,0x46,0x51,0x60,0x58,0x4e,0x28,0x78,
-0xff,0xff,0xff,0x7f,0x00,0x7e,0x0e,0xfa,0x08,0x64,0x28,0xfa,0x85,0xf1,0x10,0x67,
-0xa0,0x84,0xb0,0xbd,0x40,0x67,0xb4,0x84,0x29,0xfa,0x2b,0xf0,0x2e,0xf2,0xff,0xff,
-0x2e,0xf8,0x2b,0xfa,0x2c,0xf0,0xff,0xff,0x2f,0xf2,0x2f,0xf8,0x2c,0xfa,0xff,0xff,
-0x2d,0xf0,0x30,0xf2,0x30,0xf8,0xff,0xff,0x2d,0xfa,0x00,0x64,0x22,0xfa,0x3a,0x60,
-0x58,0x4e,0x14,0x78,0xff,0xff,0x66,0x45,0x00,0xf4,0x04,0x61,0x01,0x64,0xa1,0xda,
-0x03,0x63,0x59,0xdc,0x4b,0x60,0x71,0x78,0xff,0xff,0x04,0xa8,0xff,0xff,0x2e,0x02,
-0x26,0x46,0x3e,0x60,0x58,0x4e,0x91,0x78,0xff,0xff,0x20,0x44,0x08,0xb0,0xff,0xff,
-0x03,0x03,0x4c,0x60,0xde,0x78,0xff,0xff,0x4f,0x60,0xbb,0x78,0xff,0xff,0x00,0x60,
-0x04,0x64,0xa0,0x80,0x9c,0x84,0x17,0x03,0xa0,0x84,0xa2,0xdb,0x00,0x64,0x5d,0xfb,
-0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x51,0x60,0x58,0x4e,0xc1,0x78,
-0xff,0xff,0x20,0x44,0x08,0xb0,0xff,0xff,0x03,0x03,0x4c,0x60,0xde,0x78,0xff,0xff,
-0x4f,0x60,0xbb,0x78,0xff,0xff,0x4b,0x60,0x95,0x78,0xff,0xff,0x26,0x46,0x3e,0x60,
-0x58,0x4e,0x91,0x78,0xff,0xff,0x20,0x44,0x08,0xb0,0xff,0xff,0x03,0x03,0x4c,0x60,
-0x59,0x78,0xff,0xff,0x4e,0x60,0xac,0x78,0xff,0xff,0xa7,0xf1,0x28,0x60,0x7e,0x62,
-0xa2,0xd9,0x79,0xf5,0x51,0x60,0x58,0x4e,0xb2,0x78,0xff,0xff,0x00,0x60,0xb8,0x63,
-0x27,0x60,0xde,0x64,0xa3,0xdb,0x61,0x60,0xbc,0x63,0xbd,0xd3,0xbd,0xd1,0xff,0xff,
-0xb0,0x84,0xa3,0xd1,0xff,0xff,0xb0,0x83,0x61,0x60,0xba,0x62,0xa2,0xdd,0x00,0x60,
-0xb8,0x63,0x01,0x60,0x10,0x65,0xa3,0xd3,0xa5,0xd1,0x04,0xa4,0xa3,0xdb,0xd0,0x80,
-0xa0,0xd3,0x07,0x07,0x40,0x47,0x52,0x60,0x58,0x4e,0x11,0x78,0xff,0xff,0xef,0x02,
-0x0c,0x00,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x66,0x60,0xc2,0x65,
-0x00,0x64,0xa5,0xdb,0x44,0x60,0x83,0x78,0xff,0xff,0x27,0x43,0x3c,0xa3,0xa3,0xd1,
-0x67,0x60,0x48,0x63,0xc9,0xf3,0xa3,0xd9,0xa0,0x84,0xd0,0x80,0xff,0xff,0xd7,0x02,
-0x27,0x43,0x40,0xa3,0xa3,0xd3,0xff,0xff,0x01,0xa0,0x60,0x41,0x05,0x02,0x3e,0x60,
-0x58,0x4e,0xae,0x78,0xff,0xff,0x0d,0x00,0x17,0x60,0x46,0x62,0xa2,0xd3,0xff,0xff,
-0x60,0x45,0xd5,0x84,0x60,0x45,0x01,0x0d,0x00,0x65,0x3e,0x60,0x58,0x4e,0xd6,0x78,
-0xff,0xff,0xcb,0xf3,0xe1,0xf3,0xfc,0xa0,0x00,0xa0,0x05,0x03,0x04,0x03,0x67,0x60,
-0x80,0x62,0x01,0x64,0xa2,0xdb,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0xde,0xfe,
-0xff,0xff,0x0b,0x04,0x1e,0x60,0xc4,0x62,0x40,0x60,0x00,0x64,0xa2,0xdb,0x4c,0x60,
-0x77,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x27,0xd1,0x3c,0x60,0xa2,0x62,
-0xa2,0xd9,0xca,0x82,0x1e,0x64,0xa2,0xdb,0xff,0xff,0x2d,0xff,0x1e,0x60,0xc4,0x62,
-0x20,0x60,0x00,0x64,0xa2,0xdb,0x4c,0x60,0xcb,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0xbe,0xfe,0x1e,0x60,0xa8,0x62,
-0xa2,0xd1,0x40,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0x20,0x44,0x08,0xbc,
-0x40,0x40,0x4b,0x60,0x4a,0x78,0xff,0xff,0x79,0xf5,0x51,0x60,0x58,0x4e,0x28,0x78,
-0xff,0xff,0x00,0x64,0x29,0xfa,0x51,0x60,0x58,0x4e,0xa3,0x78,0xff,0xff,0xff,0xff,
-0x47,0xf1,0x00,0xf4,0x04,0x62,0x00,0x60,0x01,0x64,0xb0,0x84,0xa2,0xda,0x0f,0x63,
-0x04,0x61,0x59,0xdc,0x50,0x60,0x58,0x4e,0xef,0x78,0xff,0xff,0x79,0xf5,0x2d,0x44,
-0x08,0xa4,0x38,0xfa,0x00,0x64,0x22,0xfa,0x3a,0x60,0x58,0x4e,0x14,0x78,0xff,0xff,
-0x3c,0x60,0x82,0x62,0x3c,0x60,0x2e,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,
-0x5a,0xdb,0xff,0xff,0x2b,0xff,0xc1,0xfe,0x06,0x64,0x5d,0xfb,0x3c,0x60,0xb2,0x62,
-0x28,0x60,0x7a,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,
-0xc4,0x62,0x00,0x60,0x1c,0x64,0xa2,0xdb,0x4d,0x60,0x24,0x64,0x5a,0xdb,0xcf,0xfe,
-0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x00,0x60,0x08,0x64,0xa0,0x80,
-0x9c,0x84,0x21,0x03,0xa0,0x84,0xa2,0xdb,0x3c,0x60,0xb2,0x62,0x28,0x60,0x7a,0x64,
-0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x00,0x63,0x5d,0xfd,0x1e,0x60,
-0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x26,0x46,0x00,0xf4,0x03,0xf2,0xff,0xff,
-0x00,0xb8,0xff,0xff,0x3d,0x03,0x26,0x46,0x3e,0x60,0x58,0x4e,0x91,0x78,0xff,0xff,
-0x4c,0x60,0x59,0x78,0xff,0xff,0x00,0x60,0x10,0x64,0xa0,0x80,0x9c,0x84,0x1a,0x03,
-0xa0,0x84,0xa2,0xdb,0x3c,0x60,0xb2,0x62,0x28,0x60,0x7a,0x64,0xa2,0xdb,0x03,0x64,
-0x4a,0xdb,0xff,0xff,0x1d,0xff,0x26,0x46,0x3e,0x60,0x58,0x4e,0x91,0x78,0xff,0xff,
-0x00,0x64,0x5d,0xfb,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x4c,0x60,
-0xd8,0x78,0xff,0xff,0x00,0x60,0x04,0x64,0xa0,0x80,0x9c,0x84,0x10,0x03,0xa0,0x84,
-0xa2,0xdb,0x00,0x64,0x5d,0xfb,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,
-0x51,0x60,0x58,0x4e,0xc1,0x78,0xff,0xff,0x4c,0x60,0x59,0x78,0xff,0xff,0xa0,0x00,
-0x1e,0x60,0xda,0x62,0xa2,0xd1,0x00,0x60,0x08,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,
-0xcf,0xfe,0x51,0x60,0x58,0x4e,0x3d,0x78,0xff,0xff,0x51,0x60,0x58,0x4e,0x54,0x78,
-0xff,0xff,0x5a,0x60,0x58,0x4e,0xdb,0x78,0xff,0xff,0x52,0x60,0x58,0x4e,0x48,0x78,
-0xff,0xff,0x51,0x60,0x58,0x4e,0xd4,0x78,0xff,0xff,0x27,0x43,0x11,0x61,0x10,0x65,
-0xc7,0x83,0x59,0x60,0x1e,0x64,0xbd,0xd1,0xcd,0x81,0x58,0xd9,0xfc,0x02,0x26,0x46,
-0x3e,0x60,0x58,0x4e,0x91,0x78,0xff,0xff,0x01,0x64,0x8c,0xfb,0xff,0xff,0xc1,0xfe,
-0x01,0x64,0x90,0xfb,0x01,0x67,0x85,0xfb,0x04,0x64,0xcb,0xfb,0x01,0x65,0x3d,0x60,
-0x58,0x4e,0x32,0x78,0xff,0xff,0x52,0x60,0x58,0x4e,0x74,0x78,0xff,0xff,0x1e,0x60,
-0xb0,0x62,0xa2,0xd1,0x00,0x60,0x02,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,
-0x1e,0x60,0xd4,0x62,0xa2,0xd1,0x00,0x60,0x80,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,
-0xcf,0xfe,0x0c,0x64,0x5d,0xfb,0x1e,0x60,0xc4,0x62,0x00,0x60,0xf0,0x64,0xa2,0xdb,
-0x4d,0x60,0xe0,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,
-0xa2,0xd1,0x00,0x60,0x80,0x64,0xa0,0x80,0x9c,0x84,0x07,0x03,0xa0,0x84,0xa2,0xdb,
-0x61,0x60,0xc8,0x62,0x0e,0x64,0xa2,0xdb,0x17,0x00,0x00,0x60,0x40,0x64,0xa0,0x80,
-0x9c,0x84,0x07,0x03,0xa0,0x84,0xa2,0xdb,0x61,0x60,0xc8,0x62,0x00,0x64,0xa2,0xdb,
-0x0b,0x00,0x00,0x60,0x10,0x64,0xa0,0x80,0x9c,0x84,0x49,0x03,0xa0,0x84,0xa2,0xdb,
-0x61,0x60,0xc8,0x62,0x0a,0x64,0xa2,0xdb,0x5e,0xf3,0xff,0xff,0x01,0xb0,0xff,0xff,
-0x14,0x03,0x1e,0x60,0xb0,0x62,0xa2,0xd1,0x00,0x60,0x04,0x64,0xb0,0x84,0xa2,0xdb,
-0xff,0xff,0xcf,0xfe,0x1e,0x60,0xc4,0x62,0x08,0x60,0x00,0x64,0xa2,0xdb,0x4e,0x60,
-0x1f,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,
-0xa2,0xdb,0x5a,0xdb,0x00,0x64,0x5d,0xfb,0x1e,0x60,0x92,0x62,0xa2,0xd1,0x61,0x60,
-0xd2,0x62,0xa2,0xd9,0x1e,0x60,0x94,0x62,0xa2,0xd1,0x61,0x60,0xd4,0x62,0xa2,0xd9,
-0x4e,0x60,0x58,0x4e,0x5d,0x78,0xff,0xff,0x02,0x64,0x8c,0xfb,0xff,0xff,0xc1,0xfe,
-0x02,0x65,0x3d,0x60,0x58,0x4e,0x32,0x78,0xff,0xff,0x66,0x60,0xc2,0x65,0x64,0x60,
-0x58,0x62,0x00,0x64,0xa2,0xdb,0xa5,0xdb,0x44,0x60,0x83,0x78,0xff,0xff,0x00,0x60,
-0x20,0x64,0xa0,0x80,0x9c,0x84,0x0a,0x03,0xa0,0x84,0xa2,0xdb,0x00,0x63,0x5d,0xfd,
-0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x1b,0x00,0x4d,0x60,0xde,0x78,
-0xff,0xff,0x2f,0x58,0xff,0xff,0x3c,0x60,0xb2,0x62,0x28,0x60,0x7a,0x64,0xa2,0xdb,
-0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x00,0x64,0x5d,0xfb,0x1e,0x60,0xc2,0x62,
-0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x01,0x64,0x8c,0xfb,0xff,0xff,0xc1,0xfe,0x2e,0x58,
-0xff,0xff,0x02,0x64,0x8c,0xfb,0x47,0xf3,0x46,0xfb,0x00,0x60,0xfe,0x65,0x00,0x60,
-0xfc,0x63,0xa5,0xd3,0xa3,0xdb,0xa7,0xf1,0x28,0x60,0x7e,0x62,0xa2,0xd9,0x8c,0xf3,
-0x00,0x65,0xd4,0x80,0xff,0xff,0x0c,0x03,0x1e,0x60,0xc4,0x62,0x80,0x60,0x00,0x64,
-0xa2,0xdb,0x4e,0x60,0x81,0x64,0x5a,0xdb,0xcf,0xfe,0xc1,0xfe,0x2f,0x58,0xff,0xff,
-0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x00,0x60,0xb8,0x63,0x27,0x60,
-0xde,0x64,0xa3,0xdb,0x64,0x60,0x5a,0x62,0x00,0x64,0xa2,0xdb,0x61,0x60,0xbc,0x63,
-0xbd,0xd3,0xbd,0xd1,0xff,0xff,0xb0,0x84,0xa3,0xd1,0xff,0xff,0xb0,0x83,0x61,0x60,
-0xba,0x62,0xa2,0xdd,0x00,0x60,0xb8,0x63,0x01,0x60,0x10,0x65,0xa3,0xd3,0xff,0xff,
-0x02,0xa4,0xa0,0xd1,0xff,0xff,0x64,0x41,0xa5,0xd1,0x02,0xa4,0xa3,0xdb,0xd0,0x80,
-0xa0,0xd3,0x49,0x07,0x40,0x47,0xc4,0xf1,0x58,0xf3,0xff,0xff,0xc0,0x85,0xd5,0x80,
-0x60,0x45,0x0e,0x05,0x61,0x60,0xc8,0x62,0xa2,0xd3,0x1f,0xf1,0xfc,0xa0,0x65,0x44,
-0x3a,0x02,0x64,0x40,0x10,0x2a,0x37,0x00,0x03,0xa5,0xd5,0x80,0x34,0x04,0x07,0x00,
-0x61,0x60,0xc8,0x62,0xa2,0xd3,0xff,0xff,0xfc,0xa0,0xff,0xff,0x13,0x02,0x66,0x60,
-0xbe,0x62,0xa2,0xd1,0x27,0x44,0x3e,0xa4,0xa0,0xd3,0xff,0xff,0x60,0x41,0x02,0xa4,
-0xd0,0x80,0xff,0xff,0xc7,0x07,0xe1,0x85,0xc5,0x85,0x64,0x44,0xe0,0x84,0xd4,0x80,
-0xff,0xff,0xc0,0x04,0x52,0x60,0x58,0x4e,0x11,0x78,0xff,0xff,0xbb,0x02,0x27,0x44,
-0x06,0xa4,0x60,0x41,0xa1,0xd1,0x81,0xf3,0xff,0xff,0xd0,0x80,0x82,0xf1,0x59,0xd3,
-0x68,0x02,0xd0,0x80,0x83,0xf3,0x59,0xd1,0x64,0x02,0xd0,0x80,0xff,0xff,0x61,0x02,
-0x4e,0x60,0xac,0x78,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0xde,0xfe,
-0xff,0xff,0x0b,0x04,0x1e,0x60,0xc4,0x62,0x40,0x60,0x00,0x64,0xa2,0xdb,0x4f,0x60,
-0x05,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x46,0xf3,0x47,0xfb,0x00,0x60,
-0xfc,0x63,0xa3,0xd1,0x3c,0x60,0xa2,0x62,0xa2,0xd9,0xca,0x82,0x1e,0x64,0xa2,0xdb,
-0xff,0xff,0x2d,0xff,0x1e,0x60,0xc4,0x62,0x20,0x60,0x00,0x64,0xa2,0xdb,0x4f,0x60,
-0x2f,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,
-0xa2,0xdb,0xbe,0xfe,0x1e,0x60,0xa8,0x62,0xa2,0xd1,0x40,0x60,0x00,0x64,0xb0,0x84,
-0xa2,0xdb,0xcf,0xfe,0x64,0x60,0x5a,0x62,0xa2,0xd3,0xff,0xff,0xff,0xa0,0xff,0xff,
-0x10,0x02,0x3c,0x60,0x28,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,0x60,0x46,0x09,0x02,
-0x1e,0x60,0xda,0x62,0xa2,0xd1,0x00,0x60,0x08,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,
-0xcf,0xfe,0x01,0x63,0x8c,0xfd,0xff,0xff,0xc1,0xfe,0x1e,0x60,0xb0,0x62,0xa2,0xd1,
-0x00,0x60,0x02,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x4d,0x60,0xd3,0x78,
-0xff,0xff,0x27,0x43,0x3c,0xa3,0xa3,0xd1,0xc9,0xf3,0xff,0xff,0xa0,0x84,0xd0,0x80,
-0xff,0xff,0x03,0x03,0x4e,0x60,0xac,0x78,0xff,0xff,0x27,0x43,0x40,0xa3,0xa3,0xd3,
-0xff,0xff,0x01,0xa0,0x60,0x41,0x05,0x02,0x3e,0x60,0x58,0x4e,0xae,0x78,0xff,0xff,
-0x0d,0x00,0x17,0x60,0x46,0x62,0xa2,0xd3,0xff,0xff,0x60,0x45,0xd5,0x84,0x60,0x45,
-0x01,0x0d,0x00,0x65,0x3e,0x60,0x58,0x4e,0xd6,0x78,0xff,0xff,0x1e,0x60,0xc2,0x62,
-0x00,0x64,0xa2,0xdb,0xde,0xfe,0xff,0xff,0x0b,0x04,0x1e,0x60,0xc4,0x62,0x40,0x60,
-0x00,0x64,0xa2,0xdb,0x4f,0x60,0x6f,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,
-0x27,0xd1,0x3c,0x60,0xa2,0x62,0xa2,0xd9,0xca,0x82,0x1e,0x64,0xa2,0xdb,0xff,0xff,
-0x2d,0xff,0x1e,0x60,0xc4,0x62,0x20,0x60,0x00,0x64,0xa2,0xdb,0x4f,0x60,0xae,0x64,
-0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,
-0xbe,0xfe,0x1e,0x60,0xa8,0x62,0xa2,0xd1,0x40,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,
-0xcf,0xfe,0x79,0xf5,0x51,0x60,0x58,0x4e,0x28,0x78,0xff,0xff,0x00,0x60,0x20,0x64,
-0x29,0xfa,0x51,0x60,0x58,0x4e,0xa3,0x78,0xff,0xff,0x51,0x60,0x58,0x4e,0xb2,0x78,
-0xff,0xff,0x00,0xf4,0x04,0x61,0x47,0xf1,0x01,0x64,0xb0,0x84,0xa1,0xda,0x0f,0x64,
-0x59,0xda,0x81,0xf1,0xff,0xff,0x59,0xd8,0x82,0xf1,0x59,0xd8,0xff,0xff,0x83,0xf1,
-0x59,0xd8,0x50,0x60,0x58,0x4e,0xef,0x78,0xff,0xff,0x79,0xf5,0x2d,0x44,0x0e,0xa4,
-0x38,0xfa,0x00,0x64,0x22,0xfa,0x3a,0x60,0x58,0x4e,0x14,0x78,0xff,0xff,0x3c,0x60,
-0x82,0x62,0x3c,0x60,0x2e,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0xc1,0xfe,0x14,0x64,0x5d,0xfb,0x3c,0x60,0xb2,0x62,0x28,0x60,
-0x7a,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xc4,0x62,
-0x00,0x60,0x1c,0x64,0xa2,0xdb,0x50,0x60,0x0b,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x00,0x60,0x04,0x64,0xa0,0x80,0x9c,0x84,
-0x14,0x03,0xa0,0x84,0xa2,0xdb,0x00,0x64,0x5d,0xfb,0x1e,0x60,0xc2,0x62,0x00,0x64,
-0xa2,0xdb,0x5a,0xdb,0x51,0x60,0x58,0x4e,0xc1,0x78,0xff,0xff,0x64,0x60,0x5a,0x62,
-0x01,0x64,0xa2,0xdb,0x4e,0x60,0xac,0x78,0xff,0xff,0x00,0x60,0x10,0x64,0xa0,0x80,
-0x9c,0x84,0x15,0x03,0xa0,0x84,0xa2,0xdb,0x3c,0x60,0xb2,0x62,0x28,0x60,0x7a,0x64,
-0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x00,0x64,0x5d,0xfb,0x1e,0x60,
-0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x50,0x60,0xad,0x78,0xff,0xff,0x00,0x60,
-0x08,0x64,0xa0,0x80,0x9c,0x84,0x22,0x03,0xa0,0x84,0xa2,0xdb,0x3c,0x60,0xb2,0x62,
-0x28,0x60,0x7a,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x00,0x64,
-0x5d,0xfb,0x1e,0x60,0xc2,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x26,0x46,0x00,0xf4,
-0xff,0xff,0x03,0xf2,0xff,0xff,0x00,0xb8,0xff,0xff,0x09,0x03,0x26,0x46,0x3e,0x60,
-0x58,0x4e,0x91,0x78,0xff,0xff,0x4e,0x60,0xac,0x78,0xff,0xff,0xa0,0x00,0x1e,0x60,
-0xda,0x62,0xa2,0xd1,0x00,0x60,0x08,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,
-0x51,0x60,0x58,0x4e,0x3d,0x78,0xff,0xff,0x51,0x60,0x58,0x4e,0x54,0x78,0xff,0xff,
-0x5a,0x60,0x58,0x4e,0xdb,0x78,0xff,0xff,0x52,0x60,0x58,0x4e,0x48,0x78,0xff,0xff,
-0x51,0x60,0x58,0x4e,0xd4,0x78,0xff,0xff,0x26,0x46,0x3e,0x60,0x58,0x4e,0x91,0x78,
-0xff,0xff,0x03,0x65,0x3d,0x60,0x58,0x4e,0x32,0x78,0xff,0xff,0x52,0x60,0x58,0x4e,
-0x74,0x78,0xff,0xff,0x01,0x63,0x8c,0xfd,0xff,0xff,0xc1,0xfe,0x1e,0x60,0xb0,0x62,
-0xa2,0xd1,0x00,0x60,0x02,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x1e,0x60,
-0xd4,0x62,0xa2,0xd1,0x00,0x60,0x80,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,
-0x4d,0x60,0xd3,0x78,0xff,0xff,0x20,0x44,0xf7,0xb4,0x40,0x40,0x4b,0x60,0x4a,0x78,
-0xff,0xff,0x5d,0xf1,0x29,0xf2,0x64,0x41,0x60,0x40,0xa0,0x3a,0x0d,0x00,0x08,0xb1,
-0xff,0xff,0x31,0x03,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x00,0x60,0x10,0x64,0xb0,0x84,
-0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x27,0x00,0xc0,0x3a,0x0d,0x00,0x04,0xb1,0xff,0xff,
-0x22,0x03,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x00,0x60,0x10,0x64,0xb0,0x84,0xa2,0xdb,
-0xff,0xff,0xcf,0xfe,0x18,0x00,0xb0,0x3a,0x02,0x00,0x01,0x65,0x07,0x00,0x10,0x3a,
-0x02,0x00,0x02,0x65,0x03,0x00,0x30,0x3a,0x0e,0x00,0x10,0x65,0xa5,0x80,0xff,0xff,
-0x0a,0x03,0x1e,0x60,0xc2,0x62,0xa2,0xd1,0x00,0x60,0x08,0x64,0xb0,0x84,0xa2,0xdb,
-0xff,0xff,0xcf,0xfe,0x00,0x66,0x2f,0x58,0xff,0xff,0x27,0x43,0x12,0xa3,0xbf,0xd1,
-0xff,0xff,0x64,0x47,0x59,0xda,0x64,0x41,0xdd,0x81,0xe9,0x81,0x62,0x44,0x04,0x03,
-0xbd,0xd1,0xcd,0x81,0x58,0xd8,0xfc,0x02,0x58,0x8d,0x17,0x60,0xd2,0x63,0xa3,0xd1,
-0x2d,0x44,0xc8,0x84,0x64,0x45,0x64,0x41,0x03,0xa1,0xe9,0x81,0x41,0x4c,0xbd,0xd1,
-0xcd,0x81,0x58,0xd8,0xfc,0x02,0x2d,0xd2,0x2d,0x43,0x60,0x47,0x01,0x7e,0xa3,0xda,
-0x27,0x44,0x10,0xa4,0xa0,0xd3,0xcb,0x83,0x44,0x8d,0xf8,0x84,0x2c,0x41,0x0c,0x04,
-0xbe,0xd2,0xff,0xff,0x60,0x47,0xbe,0xda,0x00,0x7e,0xa3,0xd2,0x60,0x45,0x00,0x7f,
-0xb4,0x84,0xcd,0x81,0xbd,0xda,0xf4,0x02,0x2e,0x58,0xff,0xff,0x67,0x60,0x48,0x62,
-0xa2,0xd3,0xff,0xff,0xff,0xff,0x01,0x2a,0x02,0x00,0x00,0x64,0x09,0x00,0x02,0x2a,
-0x02,0x00,0x01,0x64,0x05,0x00,0x04,0x2a,0x02,0x00,0x02,0x64,0x01,0x00,0x03,0x64,
-0x13,0xfa,0x2e,0x58,0xff,0xff,0xff,0x60,0xff,0x65,0x66,0x60,0xbe,0x63,0x27,0x42,
-0x3e,0xa2,0xa2,0xd3,0x7f,0x7c,0xa3,0xdb,0xd4,0x80,0x01,0x61,0x02,0x02,0x00,0x61,
-0x65,0x5c,0x66,0x60,0xc0,0x62,0x61,0x44,0xa2,0xdb,0x66,0x60,0xbc,0x62,0xa2,0xd9,
-0x2e,0x58,0xff,0xff,0x27,0x42,0x32,0xa2,0x00,0x61,0x00,0x63,0xa2,0xd3,0xff,0xff,
-0x00,0xbc,0xe0,0x84,0x24,0x03,0x04,0x3a,0x02,0x00,0x01,0xb9,0x1e,0x00,0x08,0x3a,
-0x0a,0x00,0x02,0xb9,0x60,0x40,0x01,0x2b,0x18,0x00,0x01,0x65,0xd7,0x80,0xff,0xff,
-0x14,0x05,0x01,0x63,0x12,0x00,0x16,0x3a,0x0a,0x00,0x04,0xb9,0x60,0x40,0x01,0x2b,
-0x0c,0x00,0x02,0x65,0xd7,0x80,0xff,0xff,0x08,0x05,0x02,0x63,0x06,0x00,0x2c,0x3a,
-0x04,0x00,0x08,0xb9,0x60,0x40,0x01,0x27,0x03,0x63,0x02,0xa2,0xd7,0x00,0x59,0x60,
-0x68,0x62,0xa2,0xdd,0xc9,0xf1,0x59,0x60,0x6a,0x63,0xa1,0x84,0xa3,0xdb,0x60,0x40,
-0x08,0x2a,0x03,0x00,0x03,0x63,0x08,0x64,0x0c,0x00,0x04,0x2a,0x03,0x00,0x02,0x63,
-0x04,0x64,0x07,0x00,0x02,0x2a,0x03,0x00,0x01,0x63,0x02,0x64,0x02,0x00,0x00,0x63,
-0x01,0x64,0x50,0xfb,0x51,0xf1,0x61,0x60,0xd0,0x62,0xa2,0xd9,0x51,0xfd,0x2e,0x58,
-0xff,0xff,0x27,0x43,0x06,0xa3,0xbd,0xd1,0x2b,0xf8,0x31,0xf8,0xff,0xff,0xbd,0xd1,
-0x2c,0xf8,0x32,0xf8,0xff,0xff,0xa3,0xd1,0x2d,0xf8,0x33,0xf8,0x2e,0x58,0xff,0xff,
-0xbd,0xf1,0xff,0xff,0x2e,0xf8,0xbe,0xf1,0x2f,0xf8,0xff,0xff,0xbf,0xf1,0x30,0xf8,
-0xf0,0x60,0x20,0x64,0x0e,0xfa,0x08,0x64,0x28,0xfa,0x2e,0x58,0xff,0xff,0x67,0x60,
-0x66,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xff,0xff,0xa2,0xdb,0x28,0x60,0x60,0x62,
-0x01,0x64,0xa2,0xdb,0xff,0xff,0xc0,0xfe,0x28,0x60,0x60,0x62,0x00,0x64,0xa2,0xdb,
-0x2e,0x58,0xff,0xff,0x27,0x43,0x02,0x65,0xc7,0x85,0xa5,0xd3,0xff,0xff,0x60,0x47,
-0x5a,0xfb,0x04,0x65,0xc7,0x85,0xa5,0xd3,0xff,0xff,0x60,0x47,0x59,0xfb,0x0c,0x65,
-0xc7,0x85,0xa5,0xd3,0x80,0xfb,0xf1,0xa4,0xab,0xfb,0xab,0xf1,0x28,0x60,0xd2,0x62,
-0xa2,0xd9,0x3c,0x60,0xd2,0x65,0x04,0xf0,0x3f,0x60,0xff,0x64,0x84,0xf9,0xa0,0x84,
-0x60,0x41,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xa5,0xdb,0x3c,0x60,0xd0,0x65,0x01,0x64,
-0x07,0xb1,0x03,0x00,0xe0,0x84,0xcd,0x81,0xff,0xff,0xfc,0x02,0xa5,0xdb,0x61,0x60,
-0xca,0x63,0x26,0x46,0x31,0xf0,0x81,0xf9,0xbd,0xd9,0xff,0xff,0x32,0xf0,0x82,0xf9,
-0xbd,0xd9,0xff,0xff,0x33,0xf0,0x83,0xf9,0xa3,0xd9,0x2e,0x58,0xff,0xff,0x27,0x44,
-0x0e,0xa4,0xa0,0xd3,0xff,0xff,0x60,0x41,0xe8,0x84,0xe8,0x84,0xe8,0x84,0x43,0xf3,
-0xe8,0x85,0x94,0x84,0x01,0x26,0x26,0x00,0xc5,0xf1,0x1f,0xf3,0x91,0x80,0x20,0x2a,
-0x05,0x00,0x60,0x40,0x10,0x2a,0x1e,0x00,0x20,0xb1,0x61,0x5c,0x47,0xf9,0x61,0x60,
-0xba,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x12,0x03,0x50,0xfe,0x27,0x41,
-0x06,0xa1,0x61,0x60,0xbc,0x63,0xa1,0xd3,0xbd,0xd1,0x59,0xd3,0xd0,0x80,0xbd,0xd1,
-0x59,0xd3,0xd0,0x80,0xbd,0xd1,0xff,0xff,0xd0,0x80,0xff,0xff,0x01,0x01,0x02,0x00,
-0x00,0x64,0x01,0x00,0x01,0x64,0x00,0xbc,0x2e,0x58,0xff,0xff,0x66,0x60,0xfa,0x63,
-0x00,0x64,0xbd,0xdb,0x01,0x64,0xbd,0xdb,0xa3,0xdb,0x67,0x60,0x00,0x63,0x00,0x64,
-0xbd,0xdb,0x01,0x64,0xbd,0xdb,0xa3,0xdb,0x27,0x44,0x02,0xa4,0xa0,0xd1,0x27,0x44,
-0x04,0xa4,0xa0,0xd3,0xff,0xff,0xd0,0x81,0xff,0xff,0x01,0x05,0x00,0x61,0x66,0x60,
-0xf2,0x63,0x61,0x44,0xbd,0xdb,0xa3,0xdb,0x66,0x60,0xf6,0x62,0xa2,0xd1,0xff,0xff,
-0xd1,0x81,0xff,0xff,0x01,0x05,0x00,0x61,0x66,0x60,0xf8,0x62,0x61,0x44,0xa2,0xdb,
-0x2e,0x58,0xff,0xff,0x59,0x60,0x9c,0x62,0x66,0x60,0x2a,0x63,0x00,0x64,0xa2,0xdb,
-0xbd,0xdb,0xff,0xff,0xbd,0xdb,0xbd,0xdb,0xbd,0xdb,0x67,0x60,0x84,0x62,0x00,0x64,
-0xa2,0xdb,0x2e,0x58,0xff,0xff,0x00,0x64,0x5d,0xfb,0x3c,0x60,0xb0,0x63,0x21,0x44,
-0xbd,0xdb,0xff,0xff,0x1d,0xff,0x01,0x64,0xcb,0xfb,0x1e,0x60,0xc2,0x62,0x00,0x64,
-0xa2,0xdb,0x5a,0xdb,0x00,0x60,0x2a,0x63,0x0c,0x60,0x40,0x61,0x0e,0x60,0x7e,0x64,
-0x58,0xd1,0x59,0xd9,0xfd,0x1f,0x2f,0x58,0xff,0xff,0x1e,0x60,0xc2,0x62,0xa2,0xd1,
-0x00,0x60,0x04,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x2f,0x58,0xff,0xff,
-0x7a,0xf5,0xbd,0xf1,0x2e,0xf8,0xff,0xff,0xbe,0xf1,0x2f,0xf8,0xbf,0xf1,0xff,0xff,
-0x30,0xf8,0x1e,0x60,0x92,0x62,0x67,0x60,0x12,0x63,0xa2,0xd3,0xa3,0xdb,0x7f,0xf3,
-0x00,0x65,0x7e,0xfb,0xcb,0xf3,0xe1,0xf3,0xfc,0xa0,0x00,0xa0,0x05,0x03,0x04,0x03,
-0x67,0x60,0x80,0x62,0x01,0x64,0xa2,0xdb,0xcb,0xf3,0x14,0x7c,0xfc,0xa0,0x0f,0x64,
-0x0a,0x03,0xd5,0xf3,0x28,0x7c,0xfd,0xa0,0x60,0x45,0x2d,0x64,0x04,0x04,0x01,0x60,
-0x86,0x64,0x01,0x03,0x78,0x64,0xaf,0xf9,0xb1,0xfb,0x1e,0x60,0xbc,0x62,0x00,0x64,
-0xa2,0xdb,0x20,0x44,0x03,0x26,0x07,0x00,0x00,0x64,0x8a,0xfb,0x27,0x60,0xe0,0x64,
-0x88,0xfb,0x89,0xfb,0x0a,0x00,0x40,0x2a,0x04,0x00,0x18,0x60,0xf6,0x62,0xa2,0xd3,
-0xb1,0xfb,0x3d,0x60,0x4c,0x62,0x00,0x64,0xa2,0xdb,0x65,0x44,0xfd,0xa0,0xff,0xff,
-0x71,0x05,0x20,0x40,0x40,0x26,0x6e,0x00,0x10,0x60,0x00,0x65,0x85,0xf3,0x7a,0xf5,
-0xa4,0x84,0x40,0x7e,0x29,0xfa,0x17,0x60,0xde,0x64,0xa0,0xd1,0x13,0xf8,0xff,0xff,
-0x5b,0xf3,0x00,0xf4,0x60,0x43,0xbd,0xd1,0x04,0x65,0x20,0x40,0x80,0x26,0x00,0x7c,
-0x64,0x47,0xa5,0xda,0x64,0x41,0xdd,0x81,0xe9,0x81,0x62,0x44,0x04,0x03,0xbd,0xd1,
-0xcd,0x81,0x58,0xd8,0xfc,0x02,0x58,0x8d,0x17,0x60,0xd2,0x63,0xa3,0xd1,0x2d,0x44,
-0xc8,0x84,0x64,0x45,0x64,0x41,0x03,0xa1,0xe9,0x81,0x41,0x4c,0xbd,0xd1,0xcd,0x81,
-0x58,0xd8,0xfc,0x02,0x2d,0xd2,0x2d,0x43,0x60,0x47,0x01,0x7e,0x5b,0xf1,0xa3,0xda,
-0xa4,0xd3,0xcb,0x83,0x20,0x40,0x80,0x26,0x00,0x64,0x44,0x8d,0xf8,0x84,0x2c,0x41,
-0x0c,0x04,0xbe,0xd2,0xff,0xff,0x60,0x47,0xbe,0xda,0x00,0x7e,0xa3,0xd2,0x60,0x45,
-0x00,0x7f,0xb4,0x84,0xcd,0x81,0xbd,0xda,0xf4,0x02,0x7a,0xf5,0x2d,0x44,0x04,0xa4,
-0x38,0xfa,0x66,0x60,0xc0,0x62,0xa2,0xd1,0x66,0x60,0xb8,0x62,0xa2,0xd9,0x1f,0x60,
-0x5a,0x63,0xbf,0xf3,0x71,0x5c,0x60,0x47,0xc0,0x84,0x1f,0xb5,0x01,0xb4,0xa3,0xdb,
-0x1f,0x60,0x56,0x62,0xa2,0xd3,0x65,0x41,0x60,0x45,0x61,0x44,0xd4,0x80,0xff,0xff,
-0x02,0x04,0xd4,0x84,0xfb,0x00,0x60,0x45,0x1f,0x60,0x54,0x62,0xa2,0xd3,0xff,0xff,
-0xc4,0x84,0x40,0x4a,0x1f,0x60,0x58,0x62,0x00,0x64,0xa2,0xdb,0x13,0x00,0xd5,0xf3,
-0xff,0xff,0xfd,0xa0,0xfc,0xa0,0x09,0x03,0x05,0x02,0x01,0x60,0x86,0x64,0xb1,0xfb,
-0x03,0x64,0xd5,0xfb,0x54,0x60,0xfb,0x78,0xff,0xff,0x04,0x64,0xd5,0xfb,0x52,0x60,
-0xf4,0xa6,0x7e,0x00,0x00,0x10,0xb3,0x78,0xff,0xff,0xd5,0xf1,0x1f,0x60,0x58,0x62,
-0xa2,0xd3,0xff,0xff,0xf2,0xa0,0xff,0xff,0xe5,0x03,0x01,0xa4,0xa2,0xdb,0x1f,0x60,
-0x5a,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x07,0x03,0x2a,0x44,0xdc,0x84,
-0xf2,0xa0,0xff,0xff,0x08,0x06,0x01,0x64,0x06,0x00,0x2a,0x44,0xcc,0x84,0xff,0xa0,
-0xff,0xff,0x01,0x05,0x0e,0x64,0x40,0x4a,0x1f,0x60,0x1a,0x63,0x20,0x40,0x40,0x26,
-0x0e,0x00,0x64,0x44,0x04,0x36,0x0b,0x00,0x03,0x3a,0x02,0x00,0x1f,0x60,0x36,0x63,
-0x2a,0x44,0xe0,0x85,0x47,0xd3,0xff,0xff,0x01,0xb0,0xff,0xff,0xce,0x03,0x1e,0x60,
-0xbc,0x62,0x00,0x64,0xa2,0xdb,0xde,0xfe,0xff,0xff,0x0b,0x04,0x1e,0x60,0xbe,0x62,
-0x40,0x60,0x00,0x64,0xa2,0xdb,0x53,0x60,0xae,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0x3c,0x60,0xa2,0x62,0x2a,0x44,0xa2,0xdb,0xca,0x82,0x1e,0x64,0xa2,0xdb,
-0xff,0xff,0x2d,0xff,0x1e,0x60,0xbe,0x62,0x20,0x60,0x00,0x64,0xa2,0xdb,0x53,0x60,
-0xd4,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0xbe,0xfe,0x1e,0x60,0xa8,0x62,
-0xa2,0xd1,0x40,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0x02,0x0a,0x00,0x64,
-0x57,0xfb,0x20,0x44,0x40,0x2a,0x09,0x00,0x1e,0x60,0xd4,0x62,0xa2,0xd1,0x00,0x60,
-0x80,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x20,0x44,0x40,0x22,0x03,0x00,
-0x54,0x60,0x72,0x78,0xff,0xff,0xd5,0xf3,0xff,0xff,0xfd,0xa0,0x7a,0xf5,0x7b,0x05,
-0x00,0x64,0x22,0xfa,0x3a,0x60,0x58,0x4e,0x14,0x78,0xff,0xff,0x3c,0x60,0x82,0x62,
-0x3c,0x60,0x2e,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,
-0x2b,0xff,0x1e,0x60,0xbc,0x62,0x00,0x64,0xa2,0xdb,0xaf,0xf1,0x28,0x60,0x66,0x62,
-0xa2,0xd9,0x3c,0x60,0xba,0x62,0x28,0x60,0x62,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,
-0xff,0xff,0x1d,0xff,0xc1,0xfe,0x1e,0x60,0xbe,0x62,0x00,0x60,0x05,0x64,0xa2,0xdb,
-0x54,0x60,0x25,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xbc,0x62,
-0xa2,0xd1,0x00,0x60,0x01,0x64,0xa0,0x80,0x9c,0x84,0x0c,0x03,0xa0,0x84,0xa2,0xdb,
-0x3c,0x60,0xba,0x62,0x28,0x60,0x62,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,
-0x1d,0xff,0x11,0x00,0x67,0x60,0x10,0x62,0xa2,0xd3,0xff,0xff,0x01,0xa4,0xa2,0xdb,
-0x28,0x60,0x60,0x62,0x01,0x64,0xa2,0xdb,0xff,0xff,0xc0,0xfe,0x00,0x64,0xa2,0xdb,
-0x53,0x60,0x7c,0x78,0xff,0xff,0x1e,0x60,0xbc,0x62,0x00,0x64,0xa2,0xdb,0xb1,0xf1,
-0x28,0x60,0x66,0x62,0xa2,0xd9,0x3c,0x60,0xba,0x62,0x28,0x60,0x62,0x64,0xa2,0xdb,
-0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xbe,0x62,0x00,0x60,0x04,0x64,
-0xa2,0xdb,0x54,0x60,0x66,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,
-0xbc,0x62,0x00,0x64,0xa2,0xdb,0x57,0xf3,0xff,0xff,0x00,0xa8,0xff,0xff,0x2e,0x02,
-0x53,0x60,0x7c,0x78,0xff,0xff,0x1e,0x60,0xbc,0x62,0x00,0x64,0xa2,0xdb,0xb1,0xf1,
-0x28,0x60,0x66,0x62,0xa2,0xd9,0x3c,0x60,0xba,0x62,0x28,0x60,0x62,0x64,0xa2,0xdb,
-0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xbe,0x62,0x00,0x60,0x04,0x64,
-0xa2,0xdb,0x54,0x60,0x8e,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,
-0xbc,0x62,0x00,0x64,0xa2,0xdb,0xd5,0xf3,0xff,0xff,0xff,0xa0,0xff,0xff,0x03,0x03,
-0x53,0x60,0x7c,0x78,0xff,0xff,0x52,0x60,0xb3,0x78,0xff,0xff,0xb1,0xf1,0x28,0x60,
-0x66,0x62,0xa2,0xd9,0xb2,0xf1,0x28,0x60,0x72,0x62,0xa2,0xd9,0x3c,0x60,0xba,0x62,
-0x28,0x60,0x62,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x3c,0x60,
-0xbe,0x62,0x28,0x60,0x6e,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,
-0x1e,0x60,0xbe,0x62,0x00,0x60,0x0c,0x64,0xa2,0xdb,0x54,0x60,0xc2,0x64,0x5a,0xdb,
-0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xbc,0x62,0xa2,0xd1,0x00,0x60,0x04,0x64,
-0xa0,0x80,0x9c,0x84,0x0e,0x03,0xa0,0x84,0xa2,0xdb,0x3c,0x60,0xbe,0x62,0x28,0x60,
-0x6e,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x53,0x60,0x7c,0x78,
-0xff,0xff,0x00,0x60,0x08,0x64,0xa0,0x80,0x9c,0x84,0xe3,0x03,0xa0,0x84,0xa2,0xdb,
-0x57,0xf3,0x10,0x0a,0x00,0xa0,0x00,0x64,0x0c,0x02,0x3c,0x60,0xba,0x62,0x28,0x60,
-0x62,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x53,0x60,0x7c,0x78,
-0xff,0xff,0x57,0xfb,0x3c,0x60,0xbe,0x62,0x28,0x60,0x6e,0x64,0xa2,0xdb,0x02,0x64,
-0x4a,0xdb,0xff,0xff,0x1d,0xff,0xc5,0x00,0x1e,0x60,0x92,0x62,0x67,0x60,0x12,0x63,
-0xa2,0xd3,0xa3,0xd1,0xff,0xff,0xd0,0x85,0x67,0x60,0x0e,0x62,0xa2,0xd3,0xff,0xff,
-0xd4,0x80,0xff,0xff,0x02,0x05,0x65,0x44,0xa2,0xdb,0xcb,0xf3,0xe1,0xf3,0xfc,0xa0,
-0x00,0xa0,0x05,0x03,0x04,0x03,0x67,0x60,0x80,0x62,0x41,0x64,0xa2,0xdb,0x1e,0x60,
-0x94,0x62,0x66,0x60,0xb6,0x63,0xa2,0xd3,0xff,0xff,0x0c,0xa4,0xa3,0xdb,0x59,0x60,
-0xb2,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1e,0x60,0xbc,0x62,0x00,0x64,
-0xa2,0xdb,0xde,0xfe,0xff,0xff,0x0b,0x04,0x1e,0x60,0xbe,0x62,0x40,0x60,0x00,0x64,
-0xa2,0xdb,0x55,0x60,0x24,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x7e,0xf1,
-0x3c,0x60,0xa2,0x62,0xa2,0xd9,0xca,0x82,0x1e,0x64,0xa2,0xdb,0xff,0xff,0x2d,0xff,
-0x1e,0x60,0xbe,0x62,0x20,0x60,0x00,0x64,0xa2,0xdb,0x55,0x60,0x4a,0x64,0x5a,0xdb,
-0xcf,0xfe,0x2f,0x58,0xff,0xff,0xbe,0xfe,0x1e,0x60,0xa8,0x62,0xa2,0xd1,0x40,0x60,
-0x00,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0x20,0x44,0x03,0x22,0x08,0x00,0x04,0x65,
-0x3d,0x60,0x58,0x4e,0x32,0x78,0xff,0xff,0x56,0x60,0x1b,0x78,0xff,0xff,0x8a,0xf1,
-0x1f,0x60,0x60,0x63,0xc3,0x85,0x45,0x4d,0x27,0x60,0xe0,0x65,0x89,0xf3,0x45,0x4c,
-0x40,0x48,0x59,0x60,0x8a,0x62,0x28,0x44,0xd4,0x84,0xe8,0x84,0xe8,0x84,0xa2,0xdb,
-0x2d,0x45,0xd7,0x80,0x02,0x65,0x18,0x05,0x47,0xd1,0x02,0x65,0x47,0xd3,0x0a,0x65,
-0xd0,0x81,0x47,0xd3,0x01,0x05,0x00,0x61,0xf2,0xa3,0x01,0xb0,0x61,0x44,0x06,0x03,
-0x2c,0x42,0xa2,0xdb,0x5a,0xdd,0x5a,0x8c,0x44,0xa3,0xea,0x00,0x28,0x42,0x4a,0xdd,
-0x4a,0xdb,0x42,0x48,0x44,0xa3,0xe4,0x00,0x28,0x44,0x88,0xfb,0x88,0xf1,0x27,0x60,
-0xe0,0x63,0x66,0x60,0xb8,0x62,0xa2,0xd3,0xff,0x65,0xff,0xa0,0xff,0xff,0x01,0x03,
-0x00,0x65,0x45,0x4c,0x44,0x48,0x28,0x45,0xd7,0x80,0xa3,0xd1,0x36,0x05,0x5a,0xd3,
-0xff,0xff,0x3e,0xa4,0xa0,0xd3,0xff,0xff,0x60,0x45,0xff,0x64,0xd4,0x85,0x2c,0x44,
-0xa4,0x85,0x64,0x47,0xb4,0x9c,0x63,0x42,0x04,0x65,0x46,0xd3,0x28,0x45,0xd6,0x80,
-0xff,0xff,0x02,0x04,0x04,0xa3,0xe7,0x00,0x62,0x46,0x60,0x41,0x5a,0xd3,0xff,0xff,
-0x3e,0xa4,0xa0,0xd3,0xff,0xff,0x60,0x45,0xff,0x64,0xd4,0x85,0x2c,0x44,0xa4,0x85,
-0x61,0x47,0xb4,0x84,0xd0,0x80,0x66,0x42,0xe7,0x06,0x60,0x41,0xa2,0xd3,0x5a,0xd1,
-0xa3,0xd1,0x64,0x45,0xbd,0xdb,0xa3,0xd3,0x66,0x42,0xa2,0xd9,0x5a,0xdb,0x65,0x44,
-0xa3,0xdb,0x61,0x5c,0xfe,0xa3,0x66,0x42,0xd7,0x00,0x88,0xf3,0x89,0xf1,0x60,0x43,
-0x66,0x60,0xb8,0x62,0xa2,0xd3,0xff,0x65,0xff,0xa0,0xff,0xff,0x01,0x03,0x00,0x65,
-0x45,0x4c,0x44,0x48,0x28,0x45,0xd7,0x80,0xa3,0xd1,0x36,0x05,0x5a,0xd3,0xff,0xff,
-0x3e,0xa4,0xa0,0xd3,0xff,0xff,0x60,0x45,0xff,0x64,0xd4,0x85,0x2c,0x44,0xa4,0x85,
-0x64,0x47,0xb4,0x9c,0x63,0x42,0x04,0x65,0x46,0xd3,0x28,0x45,0xd6,0x80,0xff,0xff,
-0x02,0x04,0x04,0xa3,0xe7,0x00,0x62,0x46,0x60,0x41,0x5a,0xd3,0xff,0xff,0x3e,0xa4,
-0xa0,0xd3,0xff,0xff,0x60,0x45,0xff,0x64,0xd4,0x85,0x2c,0x44,0xa4,0x85,0x61,0x47,
-0xb4,0x84,0xd0,0x80,0x66,0x42,0xe7,0x06,0x60,0x41,0xa2,0xd3,0x5a,0xd1,0xa3,0xd1,
-0x64,0x45,0xbd,0xdb,0xa3,0xd3,0x66,0x42,0xa2,0xd9,0x5a,0xdb,0x65,0x44,0xa3,0xdb,
-0x61,0x5c,0xfe,0xa3,0x66,0x42,0xd7,0x00,0x20,0x44,0x3c,0xb4,0x40,0x40,0x1e,0x60,
-0xa8,0x62,0xa2,0xd1,0x10,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0x1e,0x60,
-0xbc,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x2f,0x58,0xff,0xff,0x3c,0x60,0xb2,0x62,
-0x28,0x60,0x62,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,
-0xbc,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x2f,0x58,0xff,0xff,0x1e,0x60,0xbc,0x62,
-0xa2,0xd1,0x00,0x60,0x04,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0x1e,0x60,0xbc,0x62,0xa2,0xd1,0x00,0x60,0x08,0x64,0xb0,0x84,0xa2,0xdb,
-0xff,0xff,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x20,0x40,0x03,0x26,0x06,0x00,0x1f,0x60,
-0x60,0x63,0x8a,0xf1,0x08,0x60,0x80,0x64,0x23,0x00,0x3d,0x60,0x4c,0x63,0xbd,0xd3,
-0xff,0xff,0x00,0xa0,0x60,0x45,0x15,0x03,0xc7,0x85,0x63,0x5c,0x04,0x64,0xc0,0x81,
-0x31,0xf2,0x50,0xfe,0x59,0xd1,0x32,0xf2,0xd0,0x80,0x59,0xd1,0x33,0xf2,0xd0,0x80,
-0x59,0xd1,0xff,0xff,0xd0,0x80,0xff,0xff,0x76,0x03,0x44,0xa3,0xd7,0x80,0xff,0xff,
-0xec,0x02,0x3d,0x60,0x4e,0x63,0x3d,0x60,0x4c,0x62,0xa2,0xd1,0x1a,0x60,0x90,0x64,
-0xd0,0x80,0xff,0xff,0x68,0x06,0xc3,0x83,0x87,0xfd,0xff,0xff,0x7f,0xf3,0x25,0xf0,
-0xbd,0xdb,0x64,0x44,0x00,0x7f,0xbd,0xdb,0x64,0x47,0x00,0x7f,0xbd,0xdb,0x31,0xf0,
-0xbd,0xd9,0xff,0xff,0x32,0xf0,0xbd,0xd9,0x33,0xf0,0xff,0xff,0xbd,0xd9,0xff,0x60,
-0xff,0x7c,0x38,0xf2,0x00,0xf4,0x05,0xa4,0xa0,0xd8,0x06,0xf0,0xff,0xff,0xbd,0xd9,
-0x07,0xf0,0xbd,0xd9,0x20,0x44,0x03,0xb4,0xff,0xff,0x0a,0x02,0x16,0x60,0x42,0x62,
-0xa2,0xd3,0xff,0xff,0x60,0x40,0x01,0x3a,0x03,0x00,0x64,0x40,0x01,0x2a,0x3b,0x00,
-0x57,0x60,0x58,0x4e,0x59,0x78,0xff,0xff,0xff,0x60,0xfe,0x64,0xd0,0x80,0xff,0xff,
-0x32,0x03,0xd5,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x2d,0x05,0x00,0x36,0x12,0x00,
-0x66,0x60,0xc4,0x64,0xa0,0xd3,0xff,0xff,0x00,0xa0,0x60,0x43,0x0b,0x03,0x58,0x60,
-0x58,0x4e,0xb5,0x78,0xff,0xff,0x17,0x60,0x82,0x64,0xa0,0xd1,0x65,0x44,0xd0,0x80,
-0xff,0xff,0x60,0x02,0x87,0xf3,0xff,0xff,0x3e,0xa4,0x60,0x43,0xbd,0xd9,0x61,0x44,
-0xbd,0xdb,0xff,0x60,0xff,0x64,0xd0,0x80,0xff,0xff,0x04,0x02,0x66,0x60,0xb8,0x62,
-0x00,0x64,0xa2,0xdb,0x87,0xf3,0x10,0x65,0xc4,0x83,0x00,0x64,0x08,0xf0,0xa3,0xdb,
-0x64,0x47,0x60,0x45,0x00,0x3b,0x46,0x00,0xbd,0xdb,0xdc,0x84,0xe8,0x81,0x10,0x64,
-0x58,0xd0,0xcd,0x81,0xbd,0xd9,0xfc,0x02,0xd8,0x83,0x04,0x64,0x40,0x4d,0x07,0x61,
-0x65,0x40,0x01,0x2a,0xbd,0xd0,0xff,0xff,0x64,0x44,0x00,0x7f,0x2d,0xda,0x5a,0x8d,
-0x64,0x47,0x00,0x7f,0x2d,0xda,0xcd,0x81,0x5a,0x8d,0xf4,0x02,0x87,0xf1,0x32,0x63,
-0xc3,0x83,0x04,0x61,0x65,0x40,0x01,0x26,0x02,0xa1,0xa1,0xd2,0xff,0xff,0x01,0xa8,
-0x59,0xd2,0x20,0x02,0x59,0xd0,0xcc,0x84,0xbd,0xd9,0xfc,0x02,0x00,0x64,0xbd,0xdb,
-0x59,0xd2,0x59,0xd0,0x03,0xa8,0x7f,0xf3,0x15,0x02,0x59,0xd0,0xff,0xff,0xd0,0x80,
-0xff,0xff,0x10,0x02,0x87,0xf3,0x32,0x65,0xc4,0x83,0x00,0x61,0xa3,0xd3,0xff,0xff,
-0x60,0x40,0xff,0x22,0x14,0x00,0x80,0x2a,0x10,0x00,0x60,0x40,0x82,0x3a,0x03,0x00,
-0x01,0xb9,0x0b,0x00,0x24,0x00,0x84,0x3a,0x02,0x00,0x02,0xb9,0x06,0x00,0x8b,0x3a,
-0x02,0x00,0x04,0xb9,0x02,0x00,0x96,0x36,0x08,0xb9,0x02,0xa3,0xe7,0x00,0x87,0xf3,
-0x3c,0x65,0xc4,0x82,0x61,0x43,0xa2,0xdd,0x20,0x40,0x03,0x26,0x09,0x00,0x8a,0xf3,
-0xff,0xff,0x44,0xa4,0x8a,0xfb,0x89,0xf3,0xff,0xff,0x04,0xa4,0xa2,0xdb,0x07,0x00,
-0x3d,0x60,0x4c,0x62,0xa2,0xd3,0xff,0xff,0x44,0xa4,0xa2,0xdb,0xff,0xff,0x26,0x46,
-0x2f,0x58,0xff,0xff,0x66,0x60,0xca,0x62,0x2e,0x44,0xa2,0xdb,0x66,0x60,0xce,0x65,
-0x66,0x60,0xc4,0x62,0x00,0x64,0xa2,0xdb,0xa5,0xdb,0x01,0xf2,0x10,0x63,0x00,0x7f,
-0xf4,0xa4,0x60,0x41,0x10,0x63,0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,
-0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,0x60,0x5c,0x63,0x44,
-0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,
-0x01,0xa3,0x00,0x7f,0x60,0x45,0x64,0x44,0xad,0xa8,0x07,0xa8,0x0c,0x03,0x15,0x03,
-0xc9,0x81,0xd5,0x81,0x61,0x44,0x80,0x27,0x03,0x00,0xff,0xa0,0xc7,0x83,0xdb,0x07,
-0x58,0x60,0x61,0x78,0xff,0xff,0x66,0x60,0xcc,0x62,0x5a,0xdd,0x65,0x44,0x5a,0xdb,
-0x61,0x44,0x5a,0xdb,0x58,0x60,0x1e,0x78,0xff,0xff,0x66,0x60,0xc4,0x62,0xa2,0xdd,
-0xd5,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0xe3,0x04,0x17,0x60,0x82,0x61,0x58,0x60,
-0x58,0x4e,0xb5,0x78,0xff,0xff,0x65,0x44,0xa1,0xdb,0x08,0xa1,0xa1,0xdb,0x02,0xa1,
-0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,
-0xa0,0xd2,0x01,0xa3,0x00,0x7f,0xa1,0xdb,0x1f,0x60,0x54,0x61,0x63,0x44,0x01,0x22,
-0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,
-0x00,0x7f,0xa1,0xdb,0x1f,0x60,0x56,0x61,0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,
-0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,0xf2,0xa0,
-0xff,0xff,0x01,0x06,0x0e,0x64,0xa1,0xdb,0x17,0x60,0x80,0x61,0x63,0x44,0x01,0x22,
-0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,
-0x00,0x7f,0xa1,0xdb,0x3e,0x60,0x58,0x4e,0xae,0x78,0xff,0xff,0x1f,0x60,0x56,0x61,
-0xa1,0xd1,0x1f,0x60,0x1c,0x63,0x1f,0x60,0x54,0x62,0xa2,0xd3,0x01,0x61,0x00,0x65,
-0xff,0xa0,0xff,0xff,0x04,0x03,0xe1,0x81,0xcc,0x84,0x02,0xa3,0xf9,0x00,0x64,0x44,
-0x05,0x7c,0xb5,0x85,0xbd,0xd9,0xcc,0x84,0x00,0xa0,0xe1,0x81,0xfa,0x02,0x65,0x44,
-0xa5,0xfb,0x16,0x60,0x42,0x62,0xa2,0xd3,0x01,0x7c,0x04,0xa8,0xd5,0xf9,0x05,0x02,
-0x0c,0x60,0x50,0x62,0x67,0x60,0x13,0x64,0xa2,0xdb,0x0b,0x65,0x3d,0x60,0x58,0x4e,
-0x32,0x78,0xff,0xff,0xff,0x60,0xfe,0x7c,0x58,0x60,0x65,0x78,0xff,0xff,0x45,0x4d,
-0x58,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0xa0,0x60,0x00,0x64,0xd4,0x80,0xff,0xff,
-0x39,0x02,0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,
-0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,0xf8,0x65,0xd4,0x80,0xff,0xff,0x2a,0x02,
-0x58,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0x65,0x5c,0x58,0x60,0x58,0x4e,0xb5,0x78,
-0xff,0xff,0x67,0x41,0x58,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0x2d,0x44,0xf1,0xa0,
-0xff,0xff,0x1c,0x04,0x45,0x4d,0x58,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0x65,0x41,
-0x58,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0x66,0x60,0xc6,0x62,0x65,0x44,0xa2,0xdb,
-0x58,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0x66,0x60,0xc8,0x62,0x65,0x44,0xa2,0xdb,
-0x2d,0x45,0x04,0x00,0xff,0x60,0xff,0x7c,0x64,0x41,0x00,0x65,0x66,0x60,0xca,0x62,
-0xa2,0xd3,0xff,0xff,0x40,0x4e,0x2e,0x58,0xff,0xff,0x66,0x60,0xca,0x62,0x2e,0x44,
-0xa2,0xdb,0x66,0x60,0xcc,0x62,0x5a,0xd3,0x5a,0xd1,0x00,0xa0,0x60,0x43,0x36,0x03,
-0x5a,0xd3,0x64,0x45,0x60,0x41,0x1c,0x00,0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,
-0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,0x60,0x5c,
-0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,
-0xa0,0xd2,0x01,0xa3,0x00,0x7f,0x60,0x45,0x64,0x44,0xae,0xa8,0xff,0xff,0x07,0x03,
-0xc9,0x81,0xd5,0x81,0x61,0x44,0xff,0xa0,0xc7,0x83,0xde,0x07,0x0f,0x00,0xdf,0x83,
-0x58,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0xf8,0x60,0xa0,0x64,0xd4,0x80,0xff,0xff,
-0x05,0x02,0x58,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0x01,0x00,0x00,0x65,0x66,0x60,
-0xca,0x62,0xa2,0xd3,0xff,0xff,0x40,0x4e,0x2e,0x58,0xff,0xff,0x63,0x44,0x01,0x22,
-0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,
-0x00,0x7f,0x60,0x45,0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,
-0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,0x60,0x47,0xb4,0x85,0x2e,0x58,
-0xff,0xff,0x2f,0x58,0xff,0xff,0x1e,0x60,0xda,0x62,0xa2,0xd1,0x00,0x60,0x04,0x64,
-0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x2f,0x58,0xff,0xff,0xbb,0xf1,0x28,0x60,
-0xae,0x62,0xa2,0xd9,0x3c,0x60,0xc2,0x62,0x28,0x60,0xaa,0x64,0xa2,0xdb,0x02,0x64,
-0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xdc,0x62,0x00,0x60,0x0c,0x64,0xa2,0xdb,
-0x58,0x60,0xf5,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xda,0x62,
-0xa2,0xd1,0x00,0x60,0x08,0x64,0xa0,0x80,0x9c,0x84,0x0c,0x03,0xa0,0x84,0xa2,0xdb,
-0x0f,0x47,0x67,0x60,0x42,0x62,0x6f,0x60,0x00,0x64,0xa2,0xdb,0x58,0x4f,0x29,0x00,
-0x07,0x4f,0xd4,0x00,0x1e,0x60,0xda,0x62,0xa2,0xd1,0xff,0x60,0xfb,0x61,0xa1,0x84,
-0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,0xcb,0xf3,0xff,0xff,0xfc,0xa0,0xff,0xff,
-0xc5,0x02,0x17,0x60,0x7a,0x62,0xa2,0xd3,0xff,0xff,0xff,0xff,0x02,0x2a,0xbe,0x00,
-0x0f,0x47,0x67,0x60,0x42,0x62,0x66,0x60,0x00,0x64,0xa2,0xdb,0x58,0x4f,0x09,0x00,
-0x67,0x60,0x42,0x62,0x69,0x60,0x00,0x64,0xa2,0xdb,0x58,0x4f,0x02,0x00,0x07,0x4f,
-0xad,0x00,0x48,0xf1,0x0f,0x4e,0x64,0x41,0x41,0x4d,0x40,0xa1,0xa2,0xff,0x19,0x60,
-0x58,0x4f,0xa2,0x78,0xff,0xff,0xa3,0xff,0x06,0x03,0x2d,0x41,0x19,0x60,0x58,0x4f,
-0xc4,0x78,0xff,0xff,0x08,0xfe,0x0e,0x4f,0x03,0x02,0x5a,0x60,0xd9,0x78,0xff,0xff,
-0x67,0x60,0x42,0x64,0xa0,0xd3,0xff,0xff,0x60,0x47,0xff,0xff,0x66,0x3a,0x59,0x00,
-0x50,0xf1,0x5b,0x60,0x38,0x64,0xa0,0xd9,0x7f,0xf1,0x5b,0x60,0x3a,0x64,0xa0,0xd9,
-0x84,0xf1,0x5b,0x60,0x42,0x64,0xa0,0xd9,0xcb,0xf1,0x5b,0x60,0x44,0x64,0xa0,0xd9,
-0xbd,0xf1,0x5b,0x60,0x46,0x64,0xa0,0xd9,0xc7,0xf1,0x5b,0x60,0x4c,0x64,0xa0,0xd9,
-0xc8,0xf1,0x5b,0x60,0x4e,0x64,0xa0,0xd9,0x5b,0x60,0x3c,0x63,0x81,0xf1,0xbd,0xd9,
-0x81,0xf1,0xff,0xff,0xbd,0xd9,0x81,0xf1,0xa3,0xd9,0x59,0x60,0xa6,0x65,0x5b,0x60,
-0x50,0x64,0x65,0x41,0xd4,0x85,0xfe,0xa1,0x65,0x43,0x0a,0xa3,0x38,0xfc,0x46,0x48,
-0x00,0xf4,0x04,0x63,0x0a,0xa3,0x81,0x60,0x87,0x64,0x02,0xfa,0x67,0x60,0x42,0x64,
-0xa0,0xd3,0xff,0xff,0x03,0xfa,0x65,0x47,0x05,0xfa,0x60,0x47,0x8e,0xa0,0xff,0xff,
-0x09,0x04,0x8e,0xa5,0x72,0x64,0x07,0x00,0x84,0xa0,0xff,0xff,0x03,0x04,0x84,0xa5,
-0x7c,0x64,0x01,0x00,0x00,0x65,0x59,0xd1,0xbd,0xd8,0xfe,0xa4,0xff,0xff,0xfb,0x07,
-0x65,0x44,0x00,0xa0,0x00,0xf4,0x02,0x03,0x04,0x63,0xee,0x00,0x5a,0x60,0x8b,0x78,
-0xff,0xff,0x6e,0x3a,0x00,0x00,0x67,0x3a,0x00,0x00,0x68,0x3a,0x00,0x00,0x69,0x36,
-0x03,0x00,0x5a,0x60,0x4a,0x78,0xff,0xff,0x61,0x60,0xc2,0x63,0x61,0x60,0xc6,0x62,
-0xa2,0xd3,0xa3,0xd1,0x00,0xa0,0xff,0xff,0x56,0x03,0x02,0x60,0x80,0x63,0x64,0x41,
-0x61,0x60,0xd8,0x65,0xc5,0x81,0xfe,0xa1,0xd3,0x85,0x0a,0xa3,0x38,0xfc,0x46,0x48,
-0x00,0xf4,0x81,0x60,0x87,0x64,0x02,0xfa,0x67,0x60,0x42,0x64,0xa0,0xd3,0xff,0xff,
-0x03,0xfa,0x63,0x47,0x05,0xfa,0x04,0x63,0x0a,0xa3,0x65,0x44,0x8e,0xa0,0xff,0xff,
-0x09,0x04,0x8e,0xa5,0x72,0x64,0x08,0x00,0x84,0xa0,0xff,0xff,0x03,0x04,0x84,0xa5,
-0x7c,0x64,0x02,0x00,0x00,0x65,0x40,0x49,0x59,0xd1,0xbd,0xd8,0xfe,0xa4,0xff,0xff,
-0xfb,0x07,0x65,0x44,0x00,0xa0,0xff,0xff,0x03,0x03,0x00,0xf4,0x04,0x63,0xec,0x00,
-0x61,0x60,0xc2,0x62,0x61,0x60,0xd8,0x61,0xfe,0xa1,0xa2,0xd3,0x29,0x45,0x00,0xa0,
-0x7c,0x62,0x4e,0x03,0xd6,0x85,0xd4,0x80,0x60,0x42,0x09,0x06,0x65,0x44,0xd6,0x85,
-0x07,0x00,0x84,0xa0,0xff,0xff,0x03,0x04,0x84,0xa5,0x7c,0x64,0x01,0x00,0x00,0x65,
-0x59,0xd1,0xbd,0xd8,0xfe,0xa4,0xff,0xff,0xfb,0x07,0x65,0x44,0x00,0xa0,0x00,0xf4,
-0x37,0x03,0x04,0x63,0xee,0x00,0x00,0x64,0xd0,0x80,0xff,0xff,0x03,0x02,0x5a,0x60,
-0xc5,0x78,0xff,0xff,0x64,0x45,0x64,0x44,0x0a,0xa4,0x38,0xfa,0x61,0x60,0xd8,0x61,
-0xfe,0xa1,0x46,0x48,0x00,0xf4,0x04,0x63,0x81,0x60,0x87,0x64,0x02,0xfa,0x67,0x60,
-0x42,0x64,0xa0,0xd3,0xff,0xff,0x03,0xfa,0x65,0x47,0x05,0xfa,0x0a,0xa3,0x65,0x44,
-0x8e,0xa0,0xff,0xff,0x09,0x04,0x8e,0xa5,0x72,0x64,0x07,0x00,0x84,0xa0,0xff,0xff,
-0x03,0x04,0x84,0xa5,0x7c,0x64,0x01,0x00,0x00,0x65,0x59,0xd1,0xbd,0xd8,0xfe,0xa4,
-0xff,0xff,0xfb,0x07,0x65,0x44,0x00,0xa0,0x00,0xf4,0x02,0x03,0x04,0x63,0xee,0x00,
-0x5a,0x60,0x8b,0x78,0xff,0xff,0x6a,0x3a,0x00,0x00,0x64,0x3a,0x0f,0x00,0x0a,0x63,
-0x38,0xfc,0x46,0x48,0x00,0xf4,0x81,0x60,0x87,0x64,0x02,0xfa,0x67,0x60,0x42,0x64,
-0xa0,0xd3,0xff,0xff,0x03,0xfa,0x63,0x47,0x05,0xfa,0x2e,0x00,0x6f,0x3a,0x66,0x00,
-0x12,0x63,0x38,0xfc,0xa0,0x60,0x01,0x64,0x31,0xfa,0xf0,0x60,0xf8,0x64,0x32,0xfa,
-0x04,0x60,0xf0,0x64,0x33,0xfa,0xff,0xff,0x81,0xf1,0x2b,0xf8,0x82,0xf1,0xff,0xff,
-0x2c,0xf8,0x83,0xf1,0x2d,0xf8,0x46,0x48,0x00,0xf4,0xaa,0x60,0xaa,0x64,0x02,0xfa,
-0x00,0x60,0x03,0x64,0x03,0xfa,0x00,0x60,0x00,0x64,0x04,0xfa,0x81,0x60,0x87,0x64,
-0x05,0xfa,0x00,0x64,0x0a,0xfa,0x67,0x60,0x42,0x64,0xa0,0xd3,0xff,0xff,0x06,0xfa,
-0x63,0x47,0x08,0xfa,0x28,0x46,0x0d,0x00,0x28,0x46,0x81,0xf1,0x2b,0xf8,0x31,0xf8,
-0xff,0xff,0x82,0xf1,0x2c,0xf8,0x32,0xf8,0xff,0xff,0x83,0xf1,0x2d,0xf8,0x33,0xf8,
-0xff,0xff,0xbd,0xf1,0x2e,0xf8,0xbe,0xf1,0xff,0xff,0x2f,0xf8,0xbf,0xf1,0x30,0xf8,
-0xff,0xff,0x85,0xf3,0xff,0xff,0x08,0xbc,0x43,0xf1,0xff,0xff,0x64,0x40,0x01,0x2a,
-0x03,0x00,0x60,0x47,0x40,0xbc,0x60,0x47,0x29,0xfa,0x00,0x63,0x28,0xfc,0x22,0xfc,
-0x3a,0x60,0x58,0x4e,0x14,0x78,0xff,0xff,0xff,0x64,0x23,0xfa,0xff,0x7f,0x00,0x7e,
-0x0e,0xfa,0x3c,0x60,0x82,0x62,0x3c,0x60,0x28,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,
-0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xc1,0xfe,0x14,0x00,0x0f,0x4e,0x46,0x45,
-0x3c,0x60,0x82,0x62,0x00,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,0xa3,0xff,
-0xd1,0xfe,0x0e,0x4f,0x2f,0x58,0xff,0xff,0x61,0x60,0xc2,0x62,0xa2,0xd1,0x61,0x60,
-0xd8,0x64,0xc0,0x83,0x61,0x60,0xc8,0x62,0xa2,0xd3,0xbd,0xdb,0xf6,0xa0,0x00,0xa0,
-0x01,0x03,0x34,0x02,0x61,0x60,0xd6,0x62,0xa2,0xd3,0xff,0xff,0xff,0xa0,0xff,0xff,
-0x2d,0x03,0x1e,0x60,0x92,0x62,0x61,0x60,0xd2,0x61,0xa2,0xd3,0xa1,0xd1,0xff,0xff,
-0xd0,0x85,0x1e,0x60,0x94,0x62,0x61,0x60,0xd4,0x61,0xa2,0xd3,0xa1,0xd1,0x01,0x05,
-0xff,0xa4,0xd0,0x84,0x65,0x44,0x02,0x02,0xfc,0x23,0x14,0x00,0x61,0x60,0xd2,0x62,
-0xa2,0xd3,0xbd,0xdb,0x61,0x60,0xd4,0x62,0xa2,0xd3,0xbd,0xdb,0x00,0x64,0xbd,0xdb,
-0xbd,0xdb,0xbd,0xdb,0xff,0xff,0xbd,0xdb,0xbd,0xdb,0xbd,0xdb,0xff,0xff,0xbd,0xdb,
-0xbd,0xdb,0x2f,0x00,0x61,0x60,0xd6,0x62,0x02,0x64,0xa2,0xdb,0x1e,0x60,0x92,0x62,
-0xa2,0xd3,0xbd,0xdb,0x1e,0x60,0x94,0x62,0xa2,0xd3,0xbd,0xdb,0x27,0x60,0xe0,0x65,
-0x88,0xf3,0xff,0xff,0xd4,0x84,0xe8,0x84,0xe8,0x84,0xbd,0xdb,0x64,0x60,0x58,0x62,
-0xa2,0xd1,0x00,0x64,0xa2,0xdb,0xbd,0xd9,0x27,0x41,0x06,0xa1,0xa1,0xd1,0xbd,0xd9,
-0x59,0xd1,0xff,0xff,0xbd,0xd9,0x59,0xd1,0xbd,0xd9,0x27,0x41,0x04,0xa1,0xa1,0xd3,
-0xbd,0xdb,0x27,0x41,0x02,0xa1,0xa1,0xd1,0xff,0xff,0xd0,0x84,0xbd,0xdb,0x51,0xf3,
-0xbd,0xdb,0x61,0x60,0xd6,0x62,0xa2,0xd3,0xff,0xff,0xff,0xa0,0xff,0xff,0x05,0x02,
-0x61,0x60,0xc4,0x62,0xa2,0xd3,0xbd,0xdb,0x09,0x00,0x61,0x60,0xc4,0x62,0xa2,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0xff,0xa0,0xbd,0xdb,0x09,0x02,0x00,0x64,0xbd,0xdb,
-0xbd,0xdb,0xbd,0xdb,0xff,0xff,0xbd,0xdb,0xbd,0xdb,0xbd,0xdb,0x20,0x00,0x61,0x60,
-0xca,0x62,0xa2,0xd1,0xbd,0xd9,0x61,0x60,0xcc,0x62,0xa2,0xd1,0xbd,0xd9,0x61,0x60,
-0xce,0x62,0xa2,0xd1,0xbd,0xd9,0xff,0xff,0x59,0xf3,0x80,0x65,0xc4,0x87,0xff,0xb4,
-0xbd,0xdb,0x58,0xf3,0xbd,0xdb,0xf4,0xb6,0x7e,0x00,0x00,0x10,0x61,0x60,0xd0,0x62,
-0xa2,0xd3,0xbd,0xdb,0x59,0x60,0x9c,0x62,0xa2,0xd3,0xbd,0xdb,0x59,0x60,0x9e,0x62,
-0xa2,0xd3,0xbd,0xdb,0x61,0x60,0xc2,0x63,0x02,0x60,0x80,0x65,0xa3,0xd3,0xff,0xff,
-0x28,0xa4,0xd4,0x80,0xff,0xff,0x05,0x04,0x61,0x60,0xc6,0x62,0x01,0x64,0xa2,0xdb,
-0x00,0x64,0xa3,0xdb,0x61,0x60,0xc8,0x62,0xa2,0xd3,0xff,0xff,0xf6,0xa0,0x00,0xa0,
-0x01,0x03,0x0f,0x02,0x61,0x60,0xd6,0x62,0xa2,0xd3,0xff,0xff,0xff,0xa0,0xfe,0xa0,
-0x06,0x03,0x05,0x03,0x01,0x64,0xa2,0xdb,0x5a,0x60,0xdb,0x78,0xff,0xff,0x00,0x64,
-0xa2,0xdb,0x61,0x60,0xc8,0x62,0xa2,0xd1,0xff,0xff,0x64,0x44,0xf4,0xa0,0xff,0xff,
-0x07,0x03,0x59,0x60,0xc0,0x64,0xc0,0x83,0xa3,0xd3,0xff,0xff,0xdc,0x84,0xa3,0xdb,
-0x59,0x60,0xa6,0x62,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x2e,0x58,0xff,0xff,
-0x64,0x60,0x5c,0x62,0xa2,0xd1,0x64,0x60,0x62,0x64,0xc0,0x83,0x64,0x60,0x5e,0x62,
-0xa2,0xd3,0xff,0xff,0x01,0xa4,0xa2,0xdb,0xbd,0xdb,0x1e,0x60,0x92,0x62,0xa2,0xd3,
-0xbd,0xdb,0x1e,0x60,0x94,0x62,0xa2,0xd3,0xbd,0xdb,0x66,0x60,0x24,0x62,0xa2,0xd3,
-0xbd,0xdb,0x66,0x60,0x26,0x62,0xa2,0xd3,0xbd,0xdb,0x66,0x60,0x28,0x62,0xa2,0xd3,
-0xbd,0xdb,0x66,0x60,0x22,0x62,0xa2,0xd3,0xbd,0xdb,0x59,0x60,0x9c,0x62,0xa2,0xd3,
-0xbd,0xdb,0xff,0xff,0x58,0xf3,0xbd,0xdb,0x59,0xf3,0x80,0x65,0xc4,0x87,0xff,0xb4,
-0xbd,0xdb,0x5a,0xf3,0x80,0x65,0xc4,0x87,0xff,0xb4,0xbd,0xdb,0xff,0xff,0x81,0xf3,
-0xbd,0xdb,0x82,0xf3,0xff,0xff,0xbd,0xdb,0x83,0xf3,0xa3,0xdb,0x64,0x60,0x5c,0x63,
-0x01,0x60,0xc0,0x65,0xa3,0xd3,0xff,0xff,0x1c,0xa4,0xd4,0x80,0xff,0xff,0x05,0x04,
-0x64,0x60,0x60,0x62,0x01,0x64,0xa2,0xdb,0x00,0x64,0xa3,0xdb,0x2e,0x58,0xff,0xff,
-0x1e,0x60,0xce,0x62,0xa2,0xd1,0x00,0x60,0x04,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,
-0xcf,0xfe,0x2f,0x58,0xff,0xff,0xba,0xf1,0x28,0x60,0x96,0x62,0xa2,0xd9,0x3c,0x60,
-0xc6,0x62,0x28,0x60,0x92,0x64,0xa2,0xdb,0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,
-0x1e,0x60,0xd0,0x62,0x00,0x60,0x04,0x64,0xa2,0xdb,0x5c,0x60,0x37,0x64,0x5a,0xdb,
-0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xce,0x62,0x00,0x64,0xa2,0xdb,0xcb,0xf3,
-0xff,0xff,0xfc,0xa0,0xff,0xff,0xdf,0x02,0x66,0x60,0x28,0x62,0x0f,0x64,0xa2,0xdb,
-0x17,0x60,0xea,0x64,0xa0,0xd3,0xff,0xff,0x60,0x41,0x02,0xa4,0xff,0xff,0x9c,0xa0,
-0xff,0xff,0x01,0x04,0x00,0x64,0x60,0x45,0x18,0x60,0x56,0x62,0xc6,0x82,0xa2,0xd1,
-0x00,0x63,0xa2,0xdd,0x18,0x60,0x54,0x63,0xa3,0xd3,0xff,0xff,0xd0,0x84,0xa3,0xdb,
-0x17,0x60,0xee,0x62,0xc6,0x82,0xa2,0xd1,0x00,0x63,0xa2,0xdd,0x17,0x60,0xec,0x63,
-0xa3,0xd3,0xff,0xff,0xd0,0x84,0xa3,0xdb,0x17,0x60,0xea,0x63,0x65,0x44,0xa3,0xdb,
-0x61,0x45,0x18,0x60,0xba,0x63,0xa3,0xd1,0x18,0x60,0x56,0x64,0xc4,0x84,0xa0,0xd3,
-0xff,0xff,0x60,0x41,0xc0,0x84,0xa3,0xdb,0x18,0x60,0x54,0x63,0xa3,0xd1,0xff,0xff,
-0xc1,0x84,0xa3,0xdb,0x18,0x60,0x52,0x63,0xa3,0xd1,0x17,0x60,0xee,0x64,0xc4,0x84,
-0xa0,0xd3,0xff,0xff,0x60,0x41,0xc0,0x84,0xa3,0xdb,0x17,0x60,0xec,0x63,0xa3,0xd1,
-0xff,0xff,0xc1,0x84,0xa3,0xdb,0xe2,0xa0,0x00,0x64,0x03,0x05,0x05,0x7c,0xb8,0xf9,
-0x3f,0x00,0x00,0x63,0x18,0x60,0x52,0x64,0xa0,0xdd,0x18,0x60,0xba,0x64,0xa0,0xdd,
-0x18,0x60,0xc6,0x64,0x64,0x63,0xa0,0xdd,0x18,0x60,0x54,0x63,0xa3,0xd3,0xff,0xff,
-0x00,0xbc,0x60,0x41,0x2d,0x03,0x02,0x60,0x8f,0x65,0x17,0x60,0xec,0x62,0xa2,0xd3,
-0xd5,0x80,0xff,0xff,0x03,0x06,0xe9,0x81,0xe8,0x84,0xfa,0x00,0x60,0x5c,0x61,0x44,
-0xe0,0x84,0xe0,0x84,0x60,0x41,0xe0,0x84,0xe0,0x84,0xe0,0x84,0x60,0x45,0xe0,0x84,
-0xc4,0x85,0xc5,0x85,0x00,0x62,0x65,0x44,0x64,0x45,0x11,0x61,0xe0,0x84,0xcd,0x81,
-0xfd,0x04,0x01,0x00,0xe0,0x84,0xf2,0x82,0xff,0xff,0x02,0x24,0xc6,0x82,0x02,0x28,
-0xd6,0x82,0xe2,0x80,0xcd,0x81,0x02,0x28,0x01,0xbc,0xf4,0x02,0x01,0x2a,0xc6,0x82,
-0x60,0x43,0x59,0x60,0x9e,0x62,0xa2,0xdd,0x66,0x60,0x22,0x62,0xa2,0xdd,0x63,0x44,
-0xd3,0xa0,0x01,0x65,0x0e,0x04,0x1f,0xf3,0x59,0xf3,0x60,0x40,0x10,0x2a,0x67,0x00,
-0xec,0xa0,0x67,0x60,0x6c,0x64,0x63,0x04,0xa0,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,
-0x5e,0x03,0x18,0x60,0xbc,0x65,0x51,0xf3,0xff,0xff,0xe0,0x84,0xc4,0x83,0xa3,0xd3,
-0xff,0xff,0xf8,0xa0,0x03,0x65,0x53,0x05,0x18,0x60,0x52,0x64,0xa0,0xd3,0xff,0xff,
-0xe2,0xa0,0x18,0x60,0xba,0x63,0x33,0x04,0xa3,0xd3,0xff,0xff,0x00,0xbc,0x60,0x41,
-0x2f,0x03,0x02,0x60,0x8f,0x65,0x18,0x60,0x52,0x62,0xa2,0xd3,0xd5,0x80,0xff,0xff,
-0x03,0x06,0xe9,0x81,0xe8,0x84,0xfa,0x00,0x60,0x5c,0x61,0x44,0xe0,0x84,0xe0,0x84,
-0x60,0x41,0xe0,0x84,0xe0,0x84,0xe0,0x84,0x60,0x45,0xe0,0x84,0xc4,0x85,0xc5,0x85,
-0x00,0x62,0x65,0x44,0x64,0x45,0x11,0x61,0xe0,0x84,0xcd,0x81,0xfd,0x04,0x01,0x00,
-0xe0,0x84,0xf2,0x82,0xff,0xff,0x02,0x24,0xc6,0x82,0x02,0x28,0xd6,0x82,0xe2,0x80,
-0xcd,0x81,0x02,0x28,0x01,0xbc,0xf4,0x02,0x01,0x2a,0xc6,0x82,0x01,0x00,0x69,0x00,
-0x60,0x43,0x18,0x60,0xc6,0x62,0xa2,0xdd,0x63,0x44,0xd3,0xa0,0x00,0x63,0x18,0x60,
-0x52,0x62,0xa2,0xdd,0x18,0x60,0xba,0x62,0xa2,0xdd,0x5b,0x04,0x18,0x60,0xc6,0x63,
-0xa3,0xd1,0x66,0x60,0x22,0x62,0xa2,0xd9,0x64,0x64,0xa3,0xdb,0x02,0x65,0x05,0x64,
-0xb8,0xfb,0x66,0x60,0x24,0x63,0x65,0x44,0xbd,0xdb,0x51,0xf3,0xa3,0xdb,0x51,0xf3,
-0x50,0xf3,0x60,0x41,0xff,0xa0,0xe8,0x85,0x41,0x03,0xff,0xa1,0x59,0x60,0x6a,0x64,
-0xa0,0xd3,0xff,0xff,0xa4,0x80,0x65,0x44,0xf5,0x03,0x50,0xfb,0x61,0x43,0x66,0x60,
-0x28,0x62,0xa2,0xdd,0x51,0xfd,0x61,0x45,0x00,0x63,0x17,0x60,0xe6,0x62,0xa2,0xdd,
-0x17,0x60,0xe4,0x62,0xa2,0xdd,0x17,0x60,0xec,0x62,0xa2,0xdd,0x18,0x60,0x54,0x62,
-0xa2,0xdd,0x17,0x60,0xe8,0x62,0xa2,0xdd,0x67,0x60,0x6c,0x62,0xa2,0xdd,0x64,0x61,
-0x17,0x60,0xee,0x63,0x00,0x64,0xc9,0x81,0xbd,0xdb,0xfd,0x02,0x64,0x61,0x18,0x60,
-0x56,0x63,0x00,0x64,0xc9,0x81,0xbd,0xdb,0xfd,0x02,0x65,0x41,0xe1,0x85,0x18,0x60,
-0xbc,0x63,0xc7,0x83,0xa3,0xd3,0xff,0xff,0xf8,0xa0,0xff,0xff,0xc0,0x05,0x04,0x61,
-0x18,0x60,0xbc,0x63,0x00,0x64,0xcd,0x81,0xbd,0xdb,0xfd,0x02,0x5e,0x60,0x32,0x78,
-0xff,0xff,0x17,0x60,0xec,0x63,0xa3,0xd3,0xff,0xff,0xe2,0xa0,0x59,0x60,0x9e,0x63,
-0xa3,0xd3,0x1d,0x04,0xdd,0xa0,0xff,0xff,0x23,0x05,0x50,0xf3,0x04,0x65,0xf8,0xa0,
-0xff,0xff,0x32,0x02,0xb8,0xf3,0xff,0xff,0xfd,0xa0,0x03,0x64,0x2d,0x03,0xb8,0xfb,
-0x67,0x60,0x6e,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x25,0x00,0x17,0x60,
-0xe8,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x1e,0x02,0x6f,0x00,0x18,0x60,
-0xc6,0x63,0xa3,0xd3,0xff,0xff,0xdd,0xa0,0x64,0x64,0xa3,0xdb,0x05,0x65,0xef,0x04,
-0x05,0x64,0xb8,0xfb,0x51,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x5f,0x03,0x03,0x60,
-0xe8,0x65,0x17,0x60,0xe4,0x64,0xa0,0xd3,0x59,0xf3,0xd4,0x80,0x06,0x65,0x56,0x04,
-0xf1,0xa0,0xff,0xff,0xdc,0x05,0x52,0x00,0x66,0x60,0x24,0x63,0x65,0x44,0xbd,0xdb,
-0xfa,0xa0,0x51,0xf3,0x15,0x02,0xbd,0xdb,0x60,0x5c,0x08,0x65,0x03,0x61,0x67,0x60,
-0x6c,0x62,0x01,0x64,0xa2,0xdb,0x04,0x00,0xd0,0x80,0xe8,0x85,0x3f,0x03,0xff,0xa1,
-0x59,0x60,0x6a,0x64,0xa0,0xd3,0xff,0xff,0xa4,0x80,0x65,0x44,0xf5,0x03,0x0e,0x00,
-0xbd,0xdb,0x50,0xf3,0x60,0x41,0xf8,0xa0,0xe0,0x85,0x30,0x03,0x01,0xa1,0x59,0x60,
-0x6a,0x64,0xa0,0xd3,0xff,0xff,0xa4,0x80,0x65,0x44,0xf5,0x03,0x50,0xfb,0x61,0x43,
-0x51,0xfd,0x66,0x60,0x28,0x62,0xa2,0xdd,0x00,0x63,0x17,0x60,0xe6,0x62,0xa2,0xdd,
-0x17,0x60,0xe4,0x62,0xa2,0xdd,0x17,0x60,0xec,0x62,0xa2,0xdd,0x18,0x60,0x54,0x62,
-0xa2,0xdd,0x64,0x61,0x17,0x60,0xee,0x63,0x00,0x64,0xc9,0x81,0xbd,0xdb,0xfd,0x02,
-0x64,0x61,0x18,0x60,0x56,0x63,0x00,0x64,0xc9,0x81,0xbd,0xdb,0xfd,0x02,0x04,0x61,
-0x18,0x60,0xbc,0x63,0x00,0x64,0xcd,0x81,0xbd,0xdb,0xfd,0x02,0x00,0x60,0x64,0x65,
-0x17,0x60,0xe6,0x62,0xa2,0xd3,0xff,0xff,0x01,0xa4,0xd4,0x80,0xa2,0xdb,0x09,0x04,
-0x17,0x60,0xe4,0x63,0x00,0x64,0xa2,0xdb,0xa3,0xdb,0x17,0x60,0xe8,0x62,0x01,0x64,
-0xa2,0xdb,0x66,0x60,0x28,0x62,0xa2,0xd3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x04,0x07,
-0x5b,0x60,0x58,0x4e,0xc4,0x78,0xff,0xff,0x5c,0x60,0x1f,0x78,0xff,0xff,0x61,0xf1,
-0x28,0x60,0xa2,0x62,0xa2,0xd9,0x3c,0x60,0xca,0x62,0x28,0x60,0x9e,0x64,0xa2,0xdb,
-0x02,0x64,0x4a,0xdb,0xff,0xff,0x1d,0xff,0x1e,0x60,0xd6,0x62,0x00,0x60,0xfe,0x64,
-0xa2,0xdb,0x5e,0x60,0x6b,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x60,0xf3,
-0x65,0xf3,0x60,0x45,0x60,0x47,0xb4,0x84,0x60,0x45,0x68,0x60,0xcc,0x62,0x10,0x60,
-0x00,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x00,0x60,0x7a,0x66,
-0x00,0x64,0x61,0xfb,0x01,0xf2,0xff,0xff,0x00,0xa0,0xff,0xff,0x1e,0x03,0x1e,0x60,
-0x92,0x64,0xa0,0xd3,0x03,0xf0,0xff,0xff,0xd0,0x84,0x00,0xfa,0x01,0xf2,0x60,0x45,
-0xd4,0x80,0xff,0xff,0x05,0x06,0xd4,0x84,0x01,0xfa,0xfe,0xa0,0xff,0xff,0x0d,0x05,
-0x00,0x64,0x01,0xfa,0x02,0xfa,0x60,0x45,0x68,0x60,0xcc,0x62,0x90,0x60,0x80,0x64,
-0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x62,0xf1,0x17,0x60,0x06,0x64,
-0xa0,0xd3,0xff,0xff,0xd0,0x80,0x60,0x45,0x69,0x03,0x16,0x60,0x42,0x64,0xa0,0xd3,
-0xff,0xff,0xff,0xa0,0xfc,0xa0,0x06,0x03,0x62,0x02,0x86,0xf3,0xff,0xff,0x00,0xa0,
-0xff,0xff,0x5d,0x03,0x65,0x44,0x60,0x45,0x68,0x60,0xcc,0x62,0x60,0x60,0x00,0x64,
-0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x19,0xf2,0xff,0xff,0xdc,0x84,
-0x19,0xfa,0x65,0x44,0xff,0x22,0x4b,0x00,0x12,0xfa,0xcc,0x84,0xfc,0xa0,0x60,0x41,
-0x01,0x06,0x04,0x64,0xe0,0x84,0x60,0x45,0xe0,0x84,0xe0,0x84,0xc4,0x85,0x18,0x60,
-0xf8,0x64,0xc4,0x83,0xbd,0xd3,0xff,0xff,0x14,0xfa,0xbd,0xd3,0xff,0xff,0x15,0xfa,
-0xbd,0xd3,0xff,0xff,0x16,0xfa,0xbd,0xd3,0xff,0xff,0x17,0xfa,0xbd,0xd3,0xff,0xff,
-0x18,0xfa,0x16,0x60,0x42,0x64,0xa0,0xd3,0xff,0xff,0xfc,0xa0,0x61,0x44,0x05,0x02,
-0xfd,0xa0,0x14,0xf2,0x02,0x05,0xfd,0xa4,0x14,0xfa,0xcb,0xf3,0xff,0xff,0xfc,0xa0,
-0x62,0xf3,0x08,0x02,0xff,0xff,0xff,0x26,0x05,0x00,0x01,0x64,0x63,0x60,0x58,0x4e,
-0x03,0x78,0xff,0xff,0x62,0xf3,0xff,0xff,0x60,0x40,0x00,0x3a,0x2f,0x00,0x15,0xf2,
-0x01,0xfa,0x61,0xfb,0x02,0x64,0x02,0xfa,0x08,0x64,0x60,0xfb,0x01,0x64,0x13,0xfa,
-0x05,0xfa,0x04,0xfa,0x10,0x60,0x00,0x64,0x66,0xfb,0x20,0x00,0x24,0x00,0x65,0xf3,
-0xff,0xff,0x02,0xb0,0xff,0xff,0x04,0x02,0x63,0x60,0x58,0x4e,0x7d,0x78,0xff,0xff,
-0xcb,0xf3,0xff,0xff,0xfc,0xa0,0xff,0xff,0x05,0x02,0x00,0x64,0x63,0x60,0x58,0x4e,
-0x03,0x78,0xff,0xff,0x80,0x64,0x60,0xfb,0x32,0x64,0x61,0xfb,0x17,0x60,0x06,0x63,
-0x00,0x64,0x66,0xfb,0x01,0xfa,0x02,0xfa,0xff,0xff,0xa3,0xdb,0x17,0x60,0x06,0x64,
-0xa0,0xd3,0x62,0xfb,0x05,0x00,0x00,0xa0,0xff,0xff,0x02,0x02,0x32,0x64,0x61,0xfb,
-0xff,0xff,0x1e,0x60,0xd4,0x62,0xa2,0xd1,0x00,0x60,0x01,0x64,0xa0,0x84,0xa2,0xdb,
-0x09,0xf8,0x16,0x60,0x42,0x62,0xa2,0xd3,0xff,0xff,0xfc,0xa0,0x62,0xf3,0x03,0x03,
-0x60,0x60,0xa2,0x78,0xff,0xff,0x00,0xa0,0xff,0xff,0x6c,0x03,0x64,0x44,0x80,0x2a,
-0x1d,0x00,0x20,0xf2,0xff,0xff,0xdc,0x84,0x20,0xfa,0x01,0x60,0x5e,0x64,0x20,0x40,
-0x40,0x2a,0x08,0x00,0x18,0x60,0xf6,0x62,0xa2,0xd3,0xff,0xff,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0xe0,0x84,0x01,0xfa,0x01,0x64,0x02,0xfa,0x65,0xf3,0xff,0xff,0xff,0xff,
-0xff,0x26,0x04,0x00,0x63,0x60,0x58,0x4e,0x7d,0x78,0xff,0xff,0x6e,0xf3,0x6f,0xf1,
-0xff,0xff,0x01,0xb4,0xb0,0x84,0xff,0xff,0x19,0x03,0x60,0xf3,0xff,0xff,0x08,0xbc,
-0x60,0xfb,0x62,0x60,0x58,0x4e,0xdc,0x78,0xff,0xff,0x00,0xfa,0x60,0x45,0x68,0x60,
-0xcc,0x62,0x90,0x60,0x21,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,
-0x01,0xf0,0xff,0xff,0xd0,0x80,0xff,0xff,0x01,0x06,0x01,0xfa,0x09,0xf2,0x06,0xf2,
-0x60,0x40,0x08,0x2a,0x28,0x00,0x60,0x40,0xff,0x22,0x02,0x00,0xcc,0x84,0x06,0xfa,
-0x00,0xa0,0xff,0xff,0x13,0x02,0x05,0xf2,0x14,0xf0,0x03,0xa4,0xd0,0x80,0xff,0xff,
-0x01,0x06,0x64,0x44,0x05,0xfa,0x07,0xf2,0xff,0xff,0x60,0x40,0xff,0x22,0x02,0x00,
-0xcc,0x84,0x07,0xfa,0x00,0xa0,0x01,0x64,0x01,0x02,0x05,0xfa,0x86,0xf3,0x01,0xf0,
-0x00,0xfa,0xd0,0x80,0xff,0xff,0x01,0x06,0x01,0xfa,0x60,0xf3,0xff,0xff,0x08,0xbc,
-0x60,0xfb,0x01,0x00,0x56,0x00,0x09,0xf2,0x60,0xf1,0x60,0x40,0x04,0x2a,0x2c,0x00,
-0x64,0x40,0x20,0x2a,0x19,0x00,0x01,0x64,0x05,0xfa,0x04,0xfa,0x62,0x60,0x58,0x4e,
-0xdc,0x78,0xff,0xff,0x00,0xfa,0x60,0x45,0x68,0x60,0xcc,0x62,0x90,0x60,0x22,0x64,
-0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x01,0xf0,0xff,0xff,0xd0,0x80,
-0xff,0xff,0x0d,0x06,0x01,0xfa,0x0b,0x00,0x64,0x40,0x10,0x2a,0x08,0x00,0x14,0x64,
-0x00,0xfa,0x61,0xf1,0xff,0xff,0xd0,0x80,0xff,0xff,0x01,0x06,0x61,0xfb,0x60,0xf3,
-0xff,0xff,0xcf,0xb4,0x08,0xbc,0x60,0xfb,0x09,0xf2,0x60,0xf1,0x60,0x40,0x10,0x2a,
-0x0b,0x00,0x64,0x44,0xbf,0xb4,0x08,0xbc,0x60,0xfb,0x14,0x64,0x61,0xf1,0x00,0xfa,
-0xd0,0x80,0xff,0xff,0x01,0x06,0x61,0xfb,0x09,0xf2,0x18,0xf0,0x60,0x40,0x20,0x2a,
-0x04,0x00,0x01,0x63,0x05,0xfc,0x04,0xfc,0x06,0xf8,0x60,0x40,0x40,0x2a,0x01,0x00,
-0x06,0xf8,0x61,0xf3,0x65,0xf1,0x00,0xa0,0x05,0x64,0x03,0x02,0x64,0x40,0x80,0x26,
-0x61,0xfb,0x01,0xf2,0x61,0xf1,0xff,0xff,0xd0,0x80,0xff,0xff,0x01,0x06,0x61,0xfb,
-0x09,0xf0,0x61,0xf3,0x64,0x40,0x02,0x26,0x03,0x00,0x00,0xa0,0xff,0xff,0x7b,0x02,
-0x62,0xf3,0xff,0xff,0x00,0xa0,0x60,0xf3,0x76,0x03,0x00,0xa0,0xcb,0xf3,0x5d,0x02,
-0xfd,0xa0,0x04,0xf2,0x48,0x02,0x60,0x40,0xff,0x22,0x02,0x00,0xcc,0x84,0x04,0xfa,
-0x60,0x40,0x00,0x36,0x0b,0x00,0x71,0xf3,0xff,0xff,0xfb,0xa0,0x3c,0x60,0x28,0x62,
-0x05,0x05,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x12,0x03,0x05,0xf2,0x65,0xf1,
-0x04,0xfa,0x64,0x40,0xff,0x26,0x04,0x00,0x63,0x60,0x58,0x4e,0x7d,0x78,0xff,0xff,
-0x60,0xf3,0x86,0xf1,0x08,0xbc,0x60,0xfb,0x05,0x64,0xc0,0x84,0x00,0xfa,0x44,0x00,
-0xa4,0xf3,0xff,0xff,0x60,0x41,0x80,0xf3,0xff,0xff,0xe0,0x84,0xe0,0x84,0xe0,0x84,
-0xe0,0x85,0x73,0x44,0xc4,0x84,0x61,0x45,0xd4,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,
-0xe8,0x84,0x60,0x45,0x01,0x60,0xf4,0x64,0xd4,0x80,0x65,0x44,0x05,0x05,0x23,0xf2,
-0xff,0xff,0xdc,0x84,0x23,0xfa,0x32,0x64,0xfa,0xa0,0xff,0xff,0x01,0x05,0x06,0x64,
-0xfb,0xa4,0x00,0xfa,0x21,0x00,0x61,0xf3,0xff,0xff,0x00,0xa0,0x65,0xf3,0x1c,0x02,
-0xfd,0xa0,0xff,0xff,0x04,0x02,0x63,0x60,0x58,0x4e,0xd5,0x78,0xff,0xff,0x32,0x64,
-0x00,0xfa,0x01,0x64,0x05,0xfa,0x04,0xfa,0x0f,0x00,0x61,0xf3,0xff,0xff,0x00,0xa0,
-0x00,0x64,0x0a,0x02,0x60,0xfb,0x63,0x60,0x58,0x4e,0xd5,0x78,0xff,0xff,0x62,0x60,
-0x58,0x4e,0xe8,0x78,0xff,0xff,0x00,0xfa,0x00,0xf2,0x61,0xf1,0xff,0xff,0xd0,0x80,
-0xff,0xff,0x01,0x06,0x61,0xfb,0x62,0x60,0xc8,0x78,0xff,0xff,0x62,0xf3,0xff,0xff,
-0x00,0xa0,0xff,0xff,0x03,0x02,0x61,0x60,0xab,0x78,0xff,0xff,0x64,0x44,0x80,0x2a,
-0x1d,0x00,0x20,0xf2,0xff,0xff,0xdc,0x84,0x20,0xfa,0x01,0x60,0x5e,0x64,0x20,0x40,
-0x40,0x2a,0x08,0x00,0x18,0x60,0xf6,0x62,0xa2,0xd3,0xff,0xff,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0xe0,0x84,0x01,0xfa,0x01,0x64,0x02,0xfa,0x65,0xf3,0xff,0xff,0xff,0xff,
-0xff,0x26,0x04,0x00,0x63,0x60,0x58,0x4e,0x7d,0x78,0xff,0xff,0x09,0xf2,0xff,0xff,
-0xff,0xff,0x04,0x2a,0x62,0x00,0x1c,0xf2,0xff,0xff,0xdc,0x84,0x1c,0xfa,0x00,0x64,
-0x00,0xfa,0x01,0x64,0x08,0xfa,0x06,0xf2,0xff,0xff,0xff,0xff,0xff,0x22,0x03,0x00,
-0xcc,0x84,0x06,0xfa,0x0b,0x02,0x00,0xa0,0xff,0xff,0x07,0x02,0x05,0xf2,0x14,0xf0,
-0x03,0xa4,0xd0,0x80,0xff,0xff,0x01,0x06,0x64,0x44,0x05,0xfa,0x60,0xf3,0xff,0xff,
-0x60,0x40,0x20,0x2a,0x22,0x00,0x01,0x60,0x2c,0x64,0x00,0xfa,0x5b,0x60,0x28,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x13,0xf2,0xff,0xff,0x05,0xfa,0x04,0xfa,0x00,0x64,0x63,0x60,
-0x58,0x4e,0x03,0x78,0xff,0xff,0x00,0xf2,0x01,0xf0,0xff,0xff,0xd0,0x80,0xff,0xff,
-0x18,0x06,0x01,0xfa,0x04,0x64,0x02,0xfa,0x14,0x00,0x60,0x40,0x10,0x2a,0x11,0x00,
-0x5b,0x60,0x2c,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,
-0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x32,0x64,0x00,0xfa,0xff,0xff,0x63,0xf3,
-0x64,0xfb,0x60,0xf3,0x61,0xf1,0xcf,0xb4,0x60,0xfb,0x00,0xf2,0xff,0xff,0xd0,0x80,
-0xff,0xff,0x01,0x06,0x61,0xfb,0x00,0x64,0x0a,0xfa,0x09,0xf2,0xff,0xff,0xff,0xff,
-0x10,0x2a,0x12,0x00,0x1d,0xf2,0xff,0xff,0xdc,0x84,0x1d,0xfa,0x60,0xf3,0x32,0x65,
-0x60,0x40,0x40,0x2a,0x05,0x65,0xbf,0xb4,0x60,0xfb,0x65,0x44,0x61,0xf1,0x00,0xfa,
-0xd0,0x80,0xff,0xff,0x01,0x06,0x61,0xfb,0x09,0xf2,0xff,0xff,0xff,0xff,0x20,0x2a,
-0x38,0x00,0x1a,0xf2,0xff,0xff,0xdc,0x84,0x1a,0xfa,0x5d,0xf3,0xa7,0xf1,0x60,0x40,
-0xff,0x22,0x14,0x7c,0x64,0x44,0x60,0xf1,0x00,0xfa,0x64,0x40,0x01,0x2a,0x09,0x00,
-0x17,0xf2,0x13,0xf0,0x00,0xfa,0xff,0xff,0x05,0xf8,0x04,0xf8,0x18,0xf0,0xff,0xff,
-0x06,0xf8,0x60,0xf1,0xff,0xff,0x64,0x40,0x04,0x2a,0x09,0x00,0x17,0xf2,0x64,0x40,
-0x01,0x2a,0x05,0x64,0x00,0xfa,0x60,0xf3,0xff,0xff,0xfe,0xb4,0x60,0xfb,0x60,0xf3,
-0xff,0xff,0x08,0xbc,0xf9,0xb4,0x60,0xfb,0x00,0xf2,0x01,0xf0,0xff,0xff,0xd0,0x80,
-0xff,0xff,0x01,0x06,0x01,0xfa,0x61,0xf1,0xff,0xff,0xd0,0x80,0xff,0xff,0x01,0x06,
-0x61,0xfb,0x09,0xf2,0xff,0xff,0xff,0xff,0x40,0x22,0x16,0x00,0x1b,0xf2,0xff,0xff,
-0xdc,0x84,0x1b,0xfa,0x18,0xf2,0xff,0xff,0x06,0xfa,0x02,0xf2,0xff,0xff,0xfc,0xa0,
-0x00,0x64,0x03,0x02,0x01,0xfa,0x02,0xfa,0xff,0xff,0x16,0xf2,0x01,0xf0,0x00,0xfa,
-0xd0,0x80,0xff,0xff,0x01,0x06,0x01,0xfa,0x61,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,
-0x05,0x02,0x65,0xf1,0x05,0x64,0x64,0x40,0x80,0x26,0x61,0xfb,0x04,0x00,0x60,0xf3,
-0xff,0xff,0x80,0xb4,0x60,0xfb,0x60,0xf3,0x65,0xf3,0x60,0x45,0x60,0x47,0xb4,0x84,
-0x01,0xf2,0x61,0xf1,0xff,0xff,0xd0,0x80,0xff,0xff,0x01,0x06,0x61,0xfb,0x09,0xf2,
-0x61,0xf1,0x02,0xb0,0x00,0x64,0x06,0x02,0xd0,0x80,0xff,0xff,0x03,0x03,0x62,0x60,
-0xc8,0x78,0xff,0xff,0x62,0xf3,0x60,0xf3,0x00,0xa0,0xff,0xff,0x03,0x02,0x62,0x60,
-0xc6,0x78,0xff,0xff,0x60,0x40,0xff,0x26,0x6d,0x00,0xcb,0xf3,0xff,0xff,0xfc,0xa0,
-0x64,0xf3,0x67,0x02,0x00,0xb8,0xcc,0x84,0x16,0x03,0x64,0xfb,0x60,0x45,0x68,0x60,
-0xcc,0x62,0x80,0x60,0x40,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,
-0x67,0x60,0x84,0x64,0xa0,0xd3,0x07,0x02,0x00,0xa0,0xff,0xff,0x04,0x03,0x67,0x60,
-0x8a,0x62,0x01,0x64,0xa2,0xdb,0x04,0xf2,0xff,0xff,0x00,0xb8,0xcc,0x84,0x01,0x03,
-0x04,0xfa,0x00,0x65,0x64,0xf3,0x63,0xf3,0x00,0xa0,0xff,0xff,0x0d,0x02,0x64,0xfb,
-0x60,0x45,0x60,0x45,0x68,0x60,0xcc,0x62,0x90,0x60,0x05,0x64,0xa2,0xdb,0x68,0x60,
-0xce,0x62,0x65,0x44,0xa2,0xdb,0x01,0x65,0x04,0xf2,0x05,0xf2,0x00,0xa0,0xff,0xff,
-0x02,0x02,0x04,0xfa,0x01,0x65,0x65,0x40,0x00,0x36,0x2d,0x00,0x60,0xf3,0xff,0xff,
-0x08,0xbc,0x60,0xfb,0x00,0x64,0x08,0xfa,0x0a,0xf2,0x15,0xf0,0x60,0x40,0x01,0x26,
-0x0d,0x00,0x66,0x60,0x2a,0x62,0xa2,0xd3,0x37,0x7c,0xfe,0xa0,0xff,0xff,0x06,0x05,
-0x0c,0xf2,0x25,0x7c,0xfe,0xa0,0xff,0xff,0x01,0x05,0x15,0x7c,0x00,0xf8,0x65,0xf3,
-0xff,0xff,0xff,0xff,0xff,0x26,0x04,0x00,0x63,0x60,0x58,0x4e,0x7d,0x78,0xff,0xff,
-0x18,0x60,0xc8,0x62,0xa2,0xd3,0x10,0x7c,0x0b,0xfa,0x0d,0xf8,0x62,0x60,0xbe,0x78,
-0xff,0xff,0x19,0x00,0x2e,0x00,0x80,0xf3,0xff,0xff,0xe0,0x84,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0x73,0x45,0xc4,0x84,0x60,0x53,0x62,0x60,0x58,0x4e,0xe8,0x78,0xff,0xff,
-0x00,0xfa,0xe1,0xf1,0x67,0x60,0x7e,0x65,0x05,0x64,0x64,0x40,0x00,0x3a,0xa5,0xdb,
-0x62,0x60,0xbe,0x78,0xff,0xff,0x61,0xf3,0xff,0xff,0x00,0xa0,0x32,0x64,0x0a,0x02,
-0x61,0xfb,0x65,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x04,0x02,0x63,0x60,0x58,0x4e,
-0xd5,0x78,0xff,0xff,0x13,0xf2,0xff,0xff,0x05,0xfa,0x04,0xfa,0x01,0x64,0x0a,0xfa,
-0x51,0x00,0x61,0xf3,0xff,0xff,0x00,0xa0,0x00,0x64,0x4c,0x02,0x60,0xfb,0x66,0xf3,
-0xff,0xff,0x00,0xa0,0x01,0x64,0x04,0x02,0x63,0x60,0x58,0x4e,0x03,0x78,0xff,0xff,
-0x63,0x60,0x58,0x4e,0xd5,0x78,0xff,0xff,0xcb,0xf3,0xff,0xff,0xfc,0xa0,0xff,0xff,
-0x26,0x02,0x73,0x44,0x80,0xf3,0xff,0xff,0xe0,0x84,0xe0,0x84,0xe0,0x84,0x60,0x8c,
-0xa4,0xf3,0xff,0xff,0x60,0x41,0x73,0x44,0x61,0x45,0xd4,0x80,0xff,0xff,0x03,0x0d,
-0x2c,0x45,0xc4,0x84,0xf9,0x00,0x60,0x53,0x08,0xf2,0xff,0xff,0x00,0xa0,0xff,0xff,
-0x08,0x02,0x13,0xf2,0xff,0xff,0x05,0xfa,0x04,0xfa,0x24,0xf2,0xff,0xff,0xdc,0x84,
-0x24,0xfa,0x62,0x60,0x58,0x4e,0xe8,0x78,0xff,0xff,0x00,0xfa,0x08,0x00,0x32,0x64,
-0x00,0xfa,0x13,0xf2,0xff,0xff,0x05,0xfa,0x04,0xfa,0x01,0x64,0x0a,0xfa,0x65,0xf3,
-0xff,0xff,0x00,0xa0,0xff,0xff,0x06,0x03,0x00,0xf2,0x14,0x65,0xd4,0x80,0x02,0x06,
-0x65,0x44,0x00,0xfa,0x00,0xf2,0x61,0xf1,0xff,0xff,0xd0,0x80,0xff,0xff,0x04,0x06,
-0x61,0xfb,0x02,0x00,0x32,0x64,0x61,0xfb,0x1e,0x60,0x92,0x64,0xa0,0xd3,0x03,0xfa,
-0xff,0xff,0x61,0xf3,0x60,0x45,0x60,0x45,0x68,0x60,0xcc,0x62,0x50,0x60,0x00,0x64,
-0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x5e,0x60,0x53,0x78,0xff,0xff,
-0xa4,0xf1,0x73,0x44,0x64,0x45,0x86,0xf1,0xd4,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,
-0xe8,0x84,0xc0,0x84,0x2e,0x58,0xff,0xff,0xa4,0xf3,0xff,0xff,0x60,0x45,0x73,0x44,
-0xd4,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0xe8,0x84,0x60,0x45,0x01,0x60,0xf4,0x64,
-0xd4,0x80,0x65,0x44,0x05,0x05,0x23,0xf2,0xff,0xff,0xdc,0x84,0x23,0xfa,0x32,0x64,
-0xfa,0xa0,0xff,0xff,0x01,0x05,0x06,0x64,0xfb,0xa4,0x2e,0x58,0xff,0xff,0x60,0x45,
-0x68,0x60,0xcc,0x62,0x20,0x60,0x00,0x64,0xb4,0x84,0xa2,0xdb,0x65,0x44,0x2e,0x43,
-0x11,0xfc,0x10,0x60,0x00,0x65,0x60,0x40,0xff,0x22,0x00,0x65,0x65,0x44,0x66,0xfb,
-0x21,0xf2,0xff,0xff,0xdc,0x84,0x21,0xfa,0x7b,0xf5,0xff,0xff,0x81,0xf1,0x2b,0xf8,
-0x31,0xf8,0xff,0xff,0x82,0xf1,0x2c,0xf8,0x32,0xf8,0xff,0xff,0x83,0xf1,0x2d,0xf8,
-0x33,0xf8,0xff,0xff,0xbd,0xf1,0x2e,0xf8,0xbe,0xf1,0xff,0xff,0x2f,0xf8,0xbf,0xf1,
-0x30,0xf8,0xff,0xff,0x01,0x60,0x48,0x64,0xb4,0x84,0x29,0xfa,0x00,0x63,0x22,0xfc,
-0x2a,0x60,0x20,0x64,0x0e,0xfa,0x3a,0x60,0x58,0x4e,0x14,0x78,0xff,0xff,0x3c,0x60,
-0x82,0x62,0x3c,0x60,0x28,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0xc1,0xfe,0x1e,0x60,0xd6,0x62,0x00,0x60,0x01,0x64,0xa2,0xdb,
-0x63,0x60,0x52,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xd4,0x62,
-0xa2,0xd1,0xff,0x60,0xfe,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,
-0x7b,0xf5,0x22,0xf0,0x00,0x60,0x7a,0x66,0x64,0x44,0x0f,0x22,0x04,0x00,0x22,0xf2,
-0xff,0xff,0xdc,0x84,0x22,0xfa,0x5a,0x60,0x3a,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x11,0xf0,
-0x68,0x60,0xcc,0x62,0x20,0x60,0x02,0x64,0xa2,0xdb,0xff,0xff,0xf4,0xc6,0x7e,0x00,
-0x00,0x10,0x44,0x4e,0x2e,0x58,0xff,0xff,0x1e,0xf2,0xff,0xff,0xdc,0x84,0x1e,0xfa,
-0x68,0x60,0xcc,0x62,0x30,0x60,0x00,0x64,0xa2,0xdb,0x2e,0x43,0x11,0xfc,0x1e,0x60,
-0xd4,0x62,0xa2,0xd1,0xbf,0x60,0xff,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,
-0x5a,0xdb,0xff,0xff,0xde,0xfe,0xff,0xff,0x0b,0x04,0x1e,0x60,0xd6,0x62,0x40,0x60,
-0x00,0x64,0xa2,0xdb,0x63,0x60,0xa1,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,
-0x3c,0x60,0xa2,0x62,0x2a,0x44,0xa2,0xdb,0xca,0x82,0x08,0x64,0xa2,0xdb,0xff,0xff,
-0x2d,0xff,0x1e,0x60,0xd6,0x62,0x20,0x60,0x00,0x64,0xa2,0xdb,0x63,0x60,0xb5,0x64,
-0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,0x1e,0x60,0xd4,0x62,0xa2,0xd1,0x9f,0x60,
-0xff,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,0xff,0xff,0xbe,0xfe,
-0x1e,0x60,0xa8,0x62,0xa2,0xd1,0x40,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,
-0x00,0x60,0x7a,0x66,0x68,0x60,0xcc,0x62,0x30,0x60,0x01,0x64,0xa2,0xdb,0x11,0xf2,
-0xff,0xff,0x40,0x4e,0x2e,0x58,0xff,0xff,0x1f,0xf2,0xff,0xff,0xdc,0x84,0x1f,0xfa,
-0x68,0x60,0xcc,0x62,0x40,0x60,0x00,0x64,0xa2,0xdb,0x2e,0x43,0x11,0xfc,0x1e,0x60,
-0xd4,0x62,0xa2,0xd1,0xbf,0x60,0xff,0x61,0xa1,0x84,0x5a,0xd1,0x4a,0xdb,0xa1,0x84,
-0x5a,0xdb,0xff,0xff,0xde,0xfe,0xff,0xff,0x0b,0x04,0x1e,0x60,0xd6,0x62,0x40,0x60,
-0x00,0x64,0xa2,0xdb,0x63,0x60,0xf9,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,0xff,0xff,
-0x65,0xf3,0xff,0xff,0xff,0xff,0x80,0x26,0x14,0x00,0x3c,0x60,0xa2,0x62,0x2a,0x44,
-0xa2,0xdb,0xca,0x82,0x02,0x64,0xa2,0xdb,0xff,0xff,0x2d,0xff,0x1e,0x60,0xd6,0x62,
-0x20,0x60,0x00,0x64,0xa2,0xdb,0x64,0x60,0x13,0x64,0x5a,0xdb,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0xff,0xff,0x1e,0x60,0xd4,0x62,0xa2,0xd1,0x9f,0x60,0xff,0x61,0xa1,0x84,
-0x5a,0xd1,0x4a,0xdb,0xa1,0x84,0x5a,0xdb,0xff,0xff,0xbe,0xfe,0x1e,0x60,0xa8,0x62,
-0xa2,0xd1,0x40,0x60,0x00,0x64,0xb0,0x84,0xa2,0xdb,0xcf,0xfe,0x5b,0x60,0x24,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x00,0x60,0x7a,0x66,0x68,0x60,0xcc,0x62,0x40,0x60,0x01,0x64,
-0xa2,0xdb,0x11,0xf2,0xff,0xff,0x40,0x4e,0x2e,0x58,0xff,0xff,0x1e,0x60,0xd4,0x62,
-0xa2,0xd1,0x00,0x60,0x02,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x2f,0x58,
-0xff,0xff,0x3c,0x60,0xb2,0x62,0x28,0x60,0x9e,0x64,0xa2,0xdb,0x03,0x64,0x4a,0xdb,
-0xff,0xff,0x1d,0xff,0x1e,0x60,0xd4,0x62,0x00,0x64,0xa2,0xdb,0x5a,0xdb,0x2f,0x58,
-0xff,0xff,0x62,0xf3,0x26,0x46,0x60,0x40,0xff,0x22,0x37,0x00,0x60,0xf3,0x0f,0xf2,
-0x60,0x43,0x29,0xf0,0x60,0x40,0x10,0x2a,0x15,0x00,0x63,0x44,0x60,0x43,0x68,0x60,
-0xcc,0x62,0x00,0x60,0x40,0x64,0xa2,0xdb,0x68,0x60,0xce,0x62,0x63,0x44,0xa2,0xdb,
-0x1e,0x60,0xd4,0x62,0xa2,0xd1,0x00,0x60,0x40,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,
-0xcf,0xfe,0x1b,0x00,0x64,0x40,0x20,0x2b,0x02,0x00,0x40,0xbb,0x01,0x00,0xbf,0xb3,
-0x60,0xfd,0x63,0x44,0x60,0x43,0x68,0x60,0xcc,0x62,0x00,0x60,0x10,0x64,0xa2,0xdb,
-0x68,0x60,0xce,0x62,0x63,0x44,0xa2,0xdb,0x1e,0x60,0xd4,0x62,0xa2,0xd1,0x00,0x60,
-0x10,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x26,0x46,0x2f,0x58,0xff,0xff,
-0x22,0x02,0x2e,0xf2,0xff,0xff,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,
-0xe1,0x81,0x5a,0xd2,0xf0,0x85,0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,
-0xf0,0x84,0xe1,0x81,0x5a,0xd2,0xf0,0x85,0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,
-0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,0x65,0x60,0x58,0x4e,0x92,0x78,0xff,0xff,
-0x65,0x60,0x8f,0x78,0xff,0xff,0x65,0x60,0x81,0x78,0xff,0xff,0xcb,0xf3,0xff,0xff,
-0xfc,0xa0,0xfd,0xa0,0xd5,0x02,0x00,0x64,0x40,0x48,0x26,0x46,0x38,0xf2,0x00,0xf4,
-0x10,0x63,0xf4,0xa4,0x60,0x41,0x00,0x65,0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,
-0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,0x40,0x4c,
-0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,
-0xa0,0xd2,0x01,0xa3,0x00,0x7f,0x60,0x45,0x2c,0x44,0x04,0xa8,0x05,0xa8,0x06,0x03,
-0xc9,0x81,0x2e,0x03,0xd5,0x81,0xc7,0x83,0xce,0x06,0xde,0x00,0x41,0x4c,0x67,0x60,
-0x80,0x61,0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,
-0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,0x59,0xdb,0x63,0x44,0x01,0x22,0x05,0x00,
-0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,
-0x59,0xdb,0x58,0x60,0x58,0x4e,0xb5,0x78,0xff,0xff,0x65,0x44,0x59,0xdb,0x58,0x60,
-0x58,0x4e,0xb5,0x78,0xff,0xff,0x65,0x44,0x59,0xdb,0x2c,0x41,0xf8,0xa1,0xb4,0x00,
-0x65,0x41,0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,
-0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,0x40,0x4c,0x64,0xfb,0x63,0x44,0x01,0x22,
-0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,
-0x00,0x7f,0x63,0xfb,0x62,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,0x49,0x03,0x63,0x44,
-0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,
-0x01,0xa3,0x00,0x7f,0x40,0x4d,0x2c,0x44,0x00,0xb8,0xff,0xff,0x05,0x02,0x2d,0x44,
-0x01,0x2a,0x02,0x00,0x10,0x65,0x45,0x48,0x66,0xf3,0xff,0xff,0x00,0xa0,0xff,0xff,
-0x2f,0x03,0x2d,0x44,0xfe,0xb5,0x3c,0x60,0xd2,0x64,0xa0,0xd3,0xff,0xff,0x00,0x7f,
-0xd4,0x84,0x04,0xa4,0x19,0x04,0x60,0x45,0xd5,0x80,0xfc,0xa5,0x15,0x04,0x3c,0x60,
-0xd0,0x64,0xa0,0xd1,0xc7,0x83,0x63,0x44,0x01,0x22,0x05,0x00,0x01,0xac,0xa0,0xd2,
-0x01,0xa3,0x60,0x47,0x02,0x00,0xa0,0xd2,0x01,0xa3,0x00,0x7f,0xa0,0x80,0xff,0xff,
-0x03,0x03,0x28,0x44,0x20,0xbc,0x40,0x48,0x28,0x44,0xff,0x22,0x09,0x00,0x60,0xf1,
-0xff,0xff,0xb0,0x84,0x60,0xfb,0x60,0x45,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,
-0x68,0x60,0xcc,0x62,0x00,0x60,0x04,0x64,0xa2,0xdb,0x1e,0x60,0xd4,0x62,0xa2,0xd1,
-0x00,0x60,0x04,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x26,0x46,0x2f,0x58,
-0xff,0xff,0x0e,0x48,0x65,0x60,0x58,0x4e,0xfc,0x78,0xff,0xff,0x10,0x03,0x29,0xf2,
-0xa3,0xd1,0x60,0x40,0x10,0x2b,0x03,0x00,0x64,0x44,0x02,0xbc,0x02,0x00,0x64,0x44,
-0xfd,0xb4,0xa3,0xdb,0x0a,0xa3,0x3c,0x64,0xa3,0xdb,0xf6,0xa3,0x50,0x00,0x2c,0x43,
-0xa3,0xd3,0xff,0xff,0x60,0x40,0x01,0x26,0x37,0x00,0x43,0x4c,0x29,0xf0,0x01,0x64,
-0x64,0x40,0x10,0x27,0x03,0x64,0xbd,0xdb,0x2e,0xf2,0xff,0xff,0xbd,0xdb,0x2f,0xf2,
-0xbd,0xdb,0xff,0xff,0x30,0xf2,0xbd,0xdb,0x01,0x60,0x92,0x64,0xa0,0xd3,0xff,0xff,
-0x60,0x40,0x08,0x2a,0x02,0x00,0x08,0x7f,0x0a,0x00,0x04,0x2a,0x02,0x00,0x04,0x7f,
-0x06,0x00,0x02,0x2a,0x02,0x00,0x02,0x7f,0x02,0x00,0x01,0x7f,0x01,0x7e,0x60,0x47,
-0xbd,0xdb,0x3c,0x64,0xbd,0xdb,0x29,0xf0,0x34,0xf2,0x64,0x40,0x08,0x27,0xcc,0x84,
-0xbd,0xdb,0x00,0x64,0xbd,0xdb,0x2c,0x43,0x1a,0x00,0x61,0x44,0xdc,0x84,0xd0,0x80,
-0xff,0xff,0xcb,0x06,0x72,0xfb,0xc9,0x00,0x72,0xf1,0x38,0x60,0xe2,0x63,0x00,0x61,
-0xa3,0xd3,0xff,0xff,0xff,0xff,0x01,0x2a,0xf0,0x00,0x10,0xa3,0x61,0x44,0xf1,0xa0,
-0xdd,0x81,0xf6,0x04,0x00,0x63,0x3d,0x60,0x4a,0x62,0x01,0x64,0xa2,0xdb,0x08,0x4e,
-0x00,0xbb,0x2e,0x58,0xff,0xff,0x28,0x60,0xe2,0x65,0x00,0x7f,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0xe0,0x84,0x44,0xd3,0x62,0x43,0x43,0x4c,0x60,0x40,0x01,0x2a,0x10,0x00,
-0x02,0xa3,0x2e,0xf2,0x50,0xfe,0xbd,0xd1,0x2f,0xf2,0xd0,0x80,0xbd,0xd1,0x30,0xf2,
-0xd0,0x80,0xbd,0xd1,0xff,0xff,0xd0,0x80,0xff,0xff,0x02,0x02,0xf8,0xa3,0x1e,0x00,
-0x72,0xf1,0x38,0x60,0xe2,0x63,0x64,0x41,0xff,0x22,0x17,0x00,0xbd,0xd1,0x2e,0xf2,
-0x50,0xfe,0x64,0x40,0x01,0x26,0x04,0x00,0xcd,0x81,0x0e,0xa3,0xf7,0x02,0x0d,0x00,
-0xbd,0xd1,0x2f,0xf2,0xd0,0x80,0xbd,0xd1,0x30,0xf2,0xd0,0x80,0xbd,0xd1,0xff,0xff,
-0xd0,0x80,0xcd,0x81,0xe3,0x01,0x08,0xa3,0xe9,0x02,0x00,0x63,0x00,0xbb,0x2e,0x58,
-0xff,0xff,0xff,0x60,0xff,0x64,0x2b,0xfa,0x2c,0xfa,0x2d,0xfa,0xff,0xff,0x47,0xf3,
-0xff,0xff,0xe8,0x84,0xe8,0x84,0x01,0x00,0x00,0x64,0x1c,0xfa,0x46,0x4d,0xbd,0xf1,
-0x2e,0xf8,0xbe,0xf1,0xff,0xff,0x2f,0xf8,0xbf,0xf1,0x30,0xf8,0xff,0xff,0x81,0xf1,
-0x31,0xf8,0x82,0xf1,0xff,0xff,0x32,0xf8,0x83,0xf1,0x33,0xf8,0x3b,0x60,0x28,0x63,
-0x80,0xf1,0x00,0x64,0x64,0x5e,0xbd,0xdb,0x64,0x47,0x00,0x7f,0xbd,0xdb,0x43,0xf3,
-0x47,0xf1,0x01,0xb4,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xb0,0x84,0x02,0xbc,
-0xbd,0xdb,0x00,0x64,0xbd,0xdb,0x00,0x64,0xbd,0xdb,0x59,0x60,0x20,0x62,0xa2,0xd3,
-0xda,0x85,0xbd,0xdb,0x60,0x41,0x06,0xa4,0x8f,0xfb,0xa5,0xd1,0xda,0x85,0x64,0x44,
-0x00,0x7f,0xcd,0x81,0xbd,0xdb,0x05,0x03,0x64,0x47,0x00,0x7f,0xcd,0x81,0xbd,0xdb,
-0xf4,0x02,0x01,0x64,0xbd,0xdb,0x8f,0xf1,0x17,0x60,0xd2,0x62,0xa2,0xd3,0xda,0x85,
-0xbd,0xdb,0x43,0x48,0x60,0x41,0x41,0x4c,0xc0,0x84,0x02,0xa4,0x8f,0xfb,0xa5,0xd1,
-0xda,0x85,0x64,0x44,0x00,0x7f,0xcd,0x81,0xbd,0xdb,0x05,0x03,0x64,0x47,0x00,0x7f,
-0xcd,0x81,0xbd,0xdb,0xf4,0x02,0x03,0x64,0xbd,0xdb,0x01,0x64,0xbd,0xdb,0x7f,0xf3,
-0xbd,0xdb,0xff,0xff,0x8f,0xf3,0xff,0xff,0x03,0xa4,0x8f,0xfb,0x06,0x64,0xbd,0xdb,
-0x02,0x64,0xbd,0xdb,0x86,0xf1,0x00,0x64,0x64,0x5e,0xbd,0xdb,0x64,0x47,0x00,0x7f,
-0xbd,0xdb,0x8f,0xf3,0xff,0xff,0x04,0xa4,0x8f,0xfb,0x07,0x64,0xbd,0xdb,0x06,0x64,
-0xbd,0xdb,0x17,0x60,0x82,0x62,0xa2,0xd1,0x00,0x64,0x64,0x5e,0xbd,0xdb,0x64,0x47,
-0x00,0x7f,0xbd,0xdb,0x00,0x64,0xbd,0xdb,0x1f,0x60,0x54,0x62,0xa2,0xd3,0xbd,0xdb,
-0x1f,0x60,0x56,0x62,0xa2,0xd3,0xbd,0xdb,0x00,0x64,0xbd,0xdb,0x8f,0xf3,0xff,0xff,
-0x08,0xa4,0x8f,0xfb,0x00,0x64,0xa3,0xdb,0x17,0x60,0xdc,0x62,0xa2,0xd1,0x28,0x43,
-0x2c,0x41,0xa3,0xd3,0xff,0xff,0x60,0x40,0x02,0x3a,0x04,0x00,0x64,0x40,0x01,0x2a,
-0x14,0x00,0x11,0x00,0x04,0x3a,0x04,0x00,0x64,0x40,0x02,0x2a,0x0e,0x00,0x0b,0x00,
-0x0b,0x3a,0x04,0x00,0x64,0x40,0x04,0x2a,0x08,0x00,0x05,0x00,0x16,0x3a,0x05,0x00,
-0x64,0x40,0x08,0x2a,0x02,0x00,0x80,0xbc,0xa3,0xdb,0xcd,0x81,0xdb,0x83,0xe1,0x02,
-0x8f,0xf3,0xff,0xff,0x60,0x41,0x08,0xa4,0x38,0xfa,0x00,0xf4,0x3b,0x60,0x28,0x63,
-0x01,0xf2,0xff,0xff,0x7c,0x7e,0x01,0xfa,0x0c,0x65,0xbd,0xd3,0xbd,0xd1,0x60,0x47,
-0xb0,0x87,0xa5,0xda,0xda,0x85,0xcd,0x81,0xcd,0x81,0x01,0x03,0xf6,0x02,0x2d,0x46,
-0x2e,0x58,0xff,0xff,0x00,0xf4,0x07,0xf0,0x73,0xf3,0x64,0x40,0x02,0x2a,0x49,0x00,
-0x02,0xbc,0x73,0xfb,0x60,0x45,0x26,0x46,0x2e,0xf2,0xff,0xff,0x60,0x47,0xbd,0xf3,
-0x60,0x5c,0x60,0x47,0x2f,0xf2,0xd0,0x80,0x60,0x47,0xbe,0xf3,0x60,0x5c,0x60,0x47,
-0x10,0x07,0x0b,0x04,0x30,0xf2,0xd0,0x80,0x60,0x47,0x60,0x5c,0xbf,0xf3,0x09,0x07,
-0x04,0x04,0x60,0x47,0xd0,0x80,0xff,0xff,0x04,0x07,0xfe,0x64,0xa4,0x84,0x73,0xfb,
-0xff,0xff,0x31,0xf2,0x32,0xf0,0x33,0xf0,0xb0,0x84,0xb0,0x84,0xff,0xff,0x21,0x03,
-0x3b,0x60,0x28,0x63,0x31,0xf0,0xbd,0xd9,0x32,0xf0,0xff,0xff,0xbd,0xd9,0x33,0xf0,
-0xbd,0xd9,0xff,0xff,0x00,0xf4,0x02,0xf0,0xbd,0xd9,0xff,0xff,0x03,0xf0,0xbd,0xd9,
-0x04,0xf0,0xff,0xff,0xbd,0xd9,0x05,0xf0,0xbd,0xd9,0xff,0xff,0x06,0xf0,0xbd,0xd9,
-0x07,0xf0,0xff,0xff,0xbd,0xd9,0x00,0x64,0x08,0xf0,0xa3,0xdb,0x64,0x47,0x60,0x45,
-0x00,0x3b,0x62,0x00,0xbd,0xdb,0xdc,0x84,0xe8,0x81,0x10,0x64,0x58,0xd0,0xcd,0x81,
-0xbd,0xd9,0xfc,0x02,0xd8,0x83,0x04,0x64,0x40,0x4d,0x09,0x61,0x65,0x40,0x01,0x2a,
-0xbd,0xd0,0xff,0xff,0x64,0x44,0x00,0x7f,0x2d,0xda,0x5a,0x8d,0x64,0x47,0x00,0x7f,
-0x2d,0xda,0xcd,0x81,0x5a,0x8d,0xf4,0x02,0x3b,0x60,0x5c,0x63,0x04,0x61,0x65,0x40,
-0x01,0x26,0x02,0xa1,0xa1,0xd2,0xff,0xff,0x01,0xa8,0x59,0xd2,0x4b,0x02,0xfc,0xa0,
-0xff,0xff,0x48,0x07,0xbd,0xdb,0x59,0xd0,0xcc,0x84,0xbd,0xd9,0xfc,0x02,0x00,0x64,
-0xbd,0xdb,0x3b,0x60,0x6a,0x63,0x59,0xd2,0x59,0xd0,0x03,0xa8,0x7f,0xf3,0x3a,0x02,
-0x59,0xd0,0xff,0xff,0xd0,0x80,0xbd,0xd9,0x35,0x02,0x59,0xd2,0x59,0xd0,0x06,0xa8,
-0x59,0xd0,0x30,0x02,0x59,0xd2,0xff,0xff,0x60,0x47,0xb0,0x84,0xbd,0xdb,0x3b,0x60,
-0x5e,0x63,0x00,0x61,0xa3,0xd3,0xff,0xff,0x60,0x40,0xff,0x22,0x16,0x00,0x80,0x2a,
-0x11,0x00,0x7f,0xb4,0xa3,0xdb,0x60,0x40,0x02,0x3a,0x02,0x00,0x01,0xb9,0x0a,0x00,
-0x04,0x3a,0x02,0x00,0x02,0xb9,0x06,0x00,0x0b,0x3a,0x02,0x00,0x04,0xb9,0x02,0x00,
-0x16,0x36,0x08,0xb9,0x02,0xa3,0xe6,0x00,0x0d,0x00,0x3b,0x60,0x68,0x63,0x61,0x44,
-0xa3,0xdb,0x3b,0x60,0x28,0x63,0x39,0x60,0xf0,0x64,0x23,0x61,0xbd,0xd1,0xcd,0x81,
-0x58,0xd9,0xfc,0x02,0x26,0x46,0x2f,0x58,0xff,0xff,0xcb,0xf3,0x0f,0xf0,0xfd,0xa0,
-0xff,0xff,0x07,0x02,0x64,0x40,0x60,0x26,0x04,0x00,0x68,0x60,0x58,0x4e,0xba,0x78,
-0xff,0xff,0x2f,0x58,0xff,0xff,0xd5,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x4d,0x05,
-0x16,0x60,0x42,0x62,0xa2,0xd3,0x6e,0xf1,0xfc,0xa0,0xff,0xff,0x46,0x02,0x64,0x40,
-0x01,0x2a,0x43,0x00,0x68,0x60,0x58,0x4e,0x86,0x78,0xff,0xff,0x26,0x46,0x3d,0x02,
-0x2e,0xf0,0x2b,0xf8,0x2f,0xf0,0xff,0xff,0x2c,0xf8,0x30,0xf0,0x2d,0xf8,0x66,0x60,
-0x58,0x4e,0x45,0x78,0xff,0xff,0x26,0x46,0x00,0xf0,0x04,0x64,0x03,0xfa,0x04,0xf8,
-0x00,0x64,0x0b,0xfa,0x0c,0xfa,0x0f,0xfa,0xff,0xff,0x85,0xf3,0x38,0xf0,0x50,0xbc,
-0x29,0xfa,0x17,0xf8,0x0c,0x64,0x15,0xfa,0x20,0xf2,0xff,0xff,0x60,0x47,0x00,0x7f,
-0x13,0xfa,0x1c,0x64,0x21,0xfa,0x08,0x64,0x28,0xfa,0x00,0x63,0x22,0xfc,0x16,0xfc,
-0x07,0xfc,0x01,0x64,0x19,0xfc,0x1c,0xfc,0x14,0xfa,0xff,0x67,0x0e,0xfa,0x3c,0x60,
-0x82,0x62,0x3c,0x60,0x2e,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0e,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0xc1,0xfe,0x00,0x66,0x46,0x46,0x2f,0x58,0xff,0xff,0xcb,0xf3,
-0x0f,0xf0,0xfd,0xa0,0x20,0x64,0x47,0x02,0x64,0x40,0x60,0x26,0x10,0x64,0x60,0xf1,
-0xff,0xff,0xb0,0x84,0x60,0xfb,0x60,0x45,0x68,0x60,0xcc,0x62,0x90,0x60,0x50,0x64,
-0xa2,0xdb,0x68,0x60,0xce,0x62,0x65,0x44,0xa2,0xdb,0x1e,0x60,0xd4,0x62,0xa2,0xd1,
-0x00,0x60,0x04,0x64,0xb0,0x84,0xa2,0xdb,0xff,0xff,0xcf,0xfe,0x2e,0xf2,0xff,0xff,
-0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,0xe1,0x81,0x5a,0xd2,0xf0,0x85,
-0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,0xe1,0x81,0x5a,0xd2,
-0xf0,0x85,0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,0xe1,0x81,
-0xf0,0x84,0x65,0x60,0x58,0x4e,0x92,0x78,0xff,0xff,0x29,0xf2,0xff,0xff,0x60,0x40,
-0x10,0x2b,0x09,0x00,0x69,0x60,0x58,0x4e,0xdf,0x78,0xff,0xff,0x04,0x03,0x69,0x60,
-0x58,0x4e,0xf9,0x78,0xff,0xff,0x2f,0x58,0xff,0xff,0x00,0xf4,0x04,0x63,0x06,0x00,
-0x00,0xf4,0x07,0xf0,0x10,0x63,0x64,0x40,0x02,0x2a,0x27,0x00,0xbd,0xd2,0xff,0xff,
-0x60,0x47,0x00,0x3a,0x22,0x00,0x60,0x41,0x00,0x36,0x1d,0x00,0x59,0x60,0x20,0x62,
-0xa2,0xd3,0x61,0x45,0xd4,0x80,0xff,0xff,0x18,0x02,0xda,0x82,0x61,0x40,0xfe,0x22,
-0x08,0x00,0x62,0x45,0xbd,0xd2,0xa5,0xd1,0xda,0x82,0xd0,0x80,0xc9,0x81,0xf6,0x03,
-0x0c,0x00,0x61,0x40,0x00,0x36,0x07,0x00,0x62,0x45,0xa3,0xd2,0xa5,0xd1,0xff,0xff,
-0x90,0x80,0xff,0x26,0x02,0x00,0x00,0x64,0x01,0x00,0x01,0x64,0x01,0xb4,0x2e,0x58,
-0xff,0xff,0x2e,0xf0,0x2b,0xf8,0x2f,0xf0,0xff,0xff,0x2c,0xf8,0x30,0xf0,0x2d,0xf8,
-0xff,0xff,0xbd,0xf1,0x2e,0xf8,0xff,0xff,0xbe,0xf1,0x2f,0xf8,0xbf,0xf1,0xff,0xff,
-0x30,0xf8,0x81,0xf1,0x31,0xf8,0xff,0xff,0x82,0xf1,0x32,0xf8,0x83,0xf1,0xff,0xff,
-0x33,0xf8,0x00,0xf0,0x04,0x64,0x03,0xfa,0x04,0xf8,0x00,0x64,0x0b,0xfa,0x0c,0xfa,
-0x0f,0xfa,0xff,0xff,0x85,0xf3,0xff,0xff,0xb0,0xbc,0x29,0xfa,0x0c,0x64,0x15,0xfa,
-0x20,0xf2,0xff,0xff,0x60,0x47,0x00,0x7f,0x13,0xfa,0x1c,0x64,0x21,0xfa,0x08,0x64,
-0x28,0xfa,0x00,0x63,0x22,0xfc,0x16,0xfc,0x07,0xfc,0x01,0x64,0x19,0xfc,0x1c,0xfc,
-0x14,0xfa,0xff,0x67,0x0e,0xfa,0x38,0xf0,0x06,0x64,0x38,0xfa,0x17,0xfa,0x44,0x48,
-0x00,0xf4,0x01,0xf2,0xff,0xff,0x7c,0x7e,0x01,0xfa,0x02,0xf2,0x00,0x63,0x00,0xa0,
-0x04,0xfc,0x07,0x02,0x03,0xf2,0x00,0x63,0xff,0xa0,0xff,0xff,0x3b,0x03,0x0e,0x63,
-0x39,0x00,0xff,0xa0,0x0d,0x63,0x36,0x02,0x43,0xf3,0xff,0xff,0x60,0x40,0x01,0x2a,
-0x31,0x00,0x03,0xf2,0x0e,0x63,0xff,0xa0,0xff,0xff,0x1c,0x02,0x0a,0x63,0x80,0x60,
-0x10,0x64,0xbd,0xda,0x00,0x60,0x3a,0x61,0x01,0x60,0x02,0x65,0x55,0x60,0xaa,0x64,
-0xcd,0x81,0xbd,0xda,0xc4,0x84,0xfc,0x02,0x00,0xf4,0x04,0x63,0x06,0x61,0xcd,0x81,
-0xbd,0xda,0xc4,0x84,0xfc,0x02,0x26,0x46,0x88,0x64,0x38,0xfa,0x17,0xfa,0x00,0xf4,
-0x00,0x63,0x10,0x00,0xfd,0xa0,0xff,0xff,0x0d,0x02,0x0f,0x63,0x55,0x60,0xaa,0x65,
-0x05,0xf2,0xff,0xff,0xd4,0x80,0x88,0x64,0x05,0x02,0x28,0x45,0xd4,0x80,0xff,0xff,
-0x01,0x02,0x00,0x63,0x03,0xf2,0x04,0xfc,0xdc,0x84,0x03,0xfa,0x26,0x46,0x3c,0x60,
-0x82,0x62,0x3c,0x60,0x2e,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0e,0x64,0x5a,0xdb,
-0xff,0xff,0x2b,0xff,0xc1,0xfe,0x00,0x66,0x46,0x46,0x2e,0x58,0xff,0xff,0x1e,0x60,
-0x92,0x62,0xa2,0xd1,0x59,0x60,0x76,0x64,0xa0,0xd3,0xfa,0x65,0xd0,0x80,0xff,0xff,
-0x37,0x0d,0xc4,0x84,0xa2,0xdb,0x59,0x60,0x74,0x64,0xa0,0xd1,0x39,0x60,0xe2,0x64,
-0x64,0x43,0xd0,0x80,0x28,0x60,0xe2,0x64,0x01,0x07,0x60,0x43,0x10,0x61,0xa3,0xd3,
-0xff,0xff,0xff,0xff,0x01,0x2a,0x1e,0x00,0x0a,0x65,0x46,0xd3,0xff,0xff,0xcc,0x84,
-0xa2,0xdb,0x03,0x02,0x00,0x64,0xa3,0xdb,0x15,0x00,0xfe,0xa2,0xa2,0xd3,0xff,0xff,
-0x60,0x47,0x60,0x40,0x08,0x2a,0x02,0x00,0x08,0x7f,0x0a,0x00,0x04,0x2a,0x02,0x00,
-0x04,0x7f,0x06,0x00,0x02,0x2a,0x02,0x00,0x02,0x7f,0x02,0x00,0x01,0x7f,0x01,0x7e,
-0x60,0x47,0xa2,0xdb,0xcd,0x81,0x10,0xa3,0xda,0x02,0x59,0x60,0x74,0x64,0xa0,0xdd,
-0x2e,0x58,0xff,0xff,0x3a,0x60,0xb0,0x63,0x6b,0xf3,0xff,0xff,0x00,0xbc,0x60,0x41,
-0x10,0x03,0x2b,0xf2,0x50,0xfe,0xbd,0xd1,0x2c,0xf2,0xd0,0x80,0xbd,0xd1,0x2d,0xf2,
-0xd0,0x80,0xbd,0xd1,0xff,0xff,0xd0,0x80,0xff,0xff,0x04,0x03,0xfa,0xa1,0xff,0xff,
-0xf0,0x02,0x01,0xbc,0x2e,0x58,0xff,0xff,0x3a,0x60,0x38,0x63,0x6a,0xf3,0xe6,0x00,
-0x3a,0x60,0xb0,0x65,0x6b,0xf3,0xff,0xff,0xc4,0x83,0x88,0xa0,0x06,0xa4,0x09,0x05,
-0x6b,0xfb,0xff,0xff,0x2b,0xf2,0xbd,0xdb,0x2c,0xf2,0xff,0xff,0xbd,0xdb,0x2d,0xf2,
-0xbd,0xdb,0x2e,0x58,0xff,0xff,0x3a,0x60,0x38,0x65,0x6a,0xf3,0xff,0xff,0xc4,0x83,
-0x88,0xa0,0x06,0xa4,0x09,0x05,0x6a,0xfb,0xff,0xff,0x2b,0xf2,0xbd,0xdb,0x2c,0xf2,
-0xff,0xff,0xbd,0xdb,0x2d,0xf2,0xbd,0xdb,0x2e,0x58,0xff,0xff,0x3a,0x60,0xb0,0x63,
-0x6b,0xf3,0xff,0xff,0x00,0xbc,0x60,0x41,0x10,0x03,0x2e,0xf2,0x50,0xfe,0xbd,0xd1,
-0x2f,0xf2,0xd0,0x80,0xbd,0xd1,0x30,0xf2,0xd0,0x80,0xbd,0xd1,0xff,0xff,0xd0,0x80,
-0xff,0xff,0x04,0x03,0xfa,0xa1,0xff,0xff,0xf0,0x02,0x01,0xbc,0x2e,0x58,0xff,0xff,
-0x3a,0x60,0xb0,0x65,0x6b,0xf3,0xff,0xff,0xc4,0x83,0x88,0xa0,0x06,0xa4,0x09,0x05,
-0x6b,0xfb,0xff,0xff,0x2e,0xf2,0xbd,0xdb,0x2f,0xf2,0xff,0xff,0xbd,0xdb,0x30,0xf2,
-0xbd,0xdb,0x2e,0x58,0xff,0xff,0x3c,0x60,0x64,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa8,
-0x60,0x46,0x03,0x02,0x3d,0x60,0x2f,0x78,0xff,0xff,0x26,0x45,0xd4,0x80,0x0f,0xf0,
-0xf9,0x03,0x64,0x44,0x70,0xb0,0x70,0x2a,0x03,0x00,0x6f,0x60,0x7a,0x78,0xff,0xff,
-0x64,0x40,0x04,0x2a,0x13,0x00,0x67,0x60,0x60,0x62,0x00,0x64,0xa2,0xdb,0x29,0xf2,
-0xff,0xff,0xff,0xff,0x40,0x2b,0x0f,0x00,0x64,0x40,0x80,0x2b,0x07,0x00,0x1b,0xf2,
-0x22,0xf0,0x60,0x47,0xc0,0xb4,0xb0,0x84,0x22,0xfa,0x05,0x00,0x00,0x64,0x40,0x46,
-0x3d,0x60,0x2f,0x78,0xff,0xff,0x32,0x40,0x01,0x2a,0x07,0x00,0x70,0x60,0xb6,0x78,
-0xff,0xff,0x03,0x03,0x6f,0x60,0x7a,0x78,0xff,0xff,0x46,0x46,0x0f,0xf0,0xff,0xff,
-0x64,0x44,0x80,0x26,0x0e,0x00,0x32,0x40,0x01,0x2a,0x08,0x00,0x22,0xf0,0x07,0x60,
-0x01,0x64,0xb0,0x84,0x22,0xfa,0x6f,0x60,0x93,0x78,0xff,0xff,0x6f,0x60,0x7a,0x78,
-0xff,0xff,0x08,0x26,0x2a,0x00,0x5b,0x60,0x22,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x29,0xf2,
-0xff,0xff,0xff,0xff,0x03,0x27,0x06,0x00,0x67,0x60,0x78,0x62,0xa2,0xd3,0xff,0xff,
-0x01,0xa4,0xa2,0xdb,0x32,0x44,0x01,0x2a,0x05,0x00,0x22,0xf0,0x07,0x60,0x02,0x64,
-0xb0,0x84,0x04,0x00,0x02,0x2a,0x06,0x00,0x00,0x60,0x02,0x64,0x22,0xfa,0x6f,0x60,
-0x93,0x78,0xff,0xff,0x6f,0x60,0x7a,0x78,0xff,0xff,0x32,0x40,0x01,0x2a,0x08,0x00,
-0x22,0xf0,0x07,0x60,0x00,0x64,0xb0,0x84,0x22,0xfa,0x6f,0x60,0x93,0x78,0xff,0xff,
-0x29,0xf2,0x0f,0xf0,0x60,0x40,0xa4,0x36,0x08,0x00,0x0c,0xb4,0x04,0x36,0x02,0x00,
-0x0c,0x3a,0x06,0x00,0x6f,0x60,0x7a,0x78,0xff,0xff,0x6f,0x60,0x75,0x78,0xff,0xff,
-0x64,0x40,0x60,0x26,0x03,0x00,0x6b,0x60,0x84,0x78,0xff,0xff,0x95,0xf3,0x29,0xf2,
-0x00,0xbc,0xd3,0xf1,0x20,0x03,0x64,0x40,0x00,0x3a,0x4c,0x00,0x60,0x40,0x40,0x36,
-0x49,0x00,0x80,0x3a,0x15,0x00,0x5c,0x63,0x61,0x60,0xbc,0x61,0xbd,0xd2,0xa1,0xd1,
-0x02,0xa1,0xbd,0xd2,0xd0,0x80,0xa1,0xd1,0x02,0xa1,0x0a,0x02,0xd0,0x80,0xbd,0xd2,
-0xa1,0xd1,0x06,0x02,0xd0,0x80,0xff,0xff,0x03,0x02,0x6d,0x60,0xd3,0x78,0xff,0xff,
-0x6f,0x60,0x7a,0x78,0xff,0xff,0x5c,0x63,0x60,0x40,0x02,0x2b,0x62,0x63,0xbd,0xd2,
-0x81,0xf1,0xbd,0xd2,0xd0,0x80,0x82,0xf1,0x07,0x02,0xd0,0x80,0xbd,0xd2,0x83,0xf1,
-0x03,0x02,0xd0,0x80,0xff,0xff,0x1e,0x03,0xd5,0xf3,0xff,0xff,0xfd,0xa0,0x29,0xf2,
-0x04,0x04,0x60,0x40,0x80,0x36,0x16,0x00,0x12,0x00,0x20,0x40,0x40,0x26,0xf9,0x00,
-0x16,0x60,0x42,0x62,0xa2,0xd3,0x29,0xf2,0xfc,0xa0,0x2b,0xf0,0x08,0x02,0x60,0x40,
-0x80,0x36,0x02,0x00,0x40,0x3a,0x03,0x00,0x64,0x40,0x01,0x26,0x03,0x00,0x6f,0x60,
-0x7a,0x78,0xff,0xff,0x29,0xf2,0xff,0xff,0x0c,0xb4,0x08,0x3a,0x3a,0x00,0x70,0x60,
-0x15,0x78,0xff,0xff,0x17,0x60,0x74,0x64,0xa0,0xd3,0xcb,0xf3,0x00,0xa0,0xfe,0xa0,
-0xee,0x02,0xed,0x03,0x5a,0x60,0x88,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1f,0xf2,0xff,0xff,
-0x60,0x45,0x5a,0x60,0xce,0x64,0xa0,0xd3,0xff,0xff,0xc4,0x84,0xa2,0xdb,0x05,0x04,
-0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x26,0xf2,0xff,0xff,0x60,0x47,
-0x00,0x7f,0xe0,0x84,0xe0,0x84,0x60,0x45,0x5a,0x60,0x8c,0x64,0xc4,0x84,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x0f,0xf2,0xff,0xff,0x60,0x40,0x40,0x26,0x42,0x00,0x32,0x44,0x02,0x26,
-0x3f,0x00,0x58,0x60,0x5a,0x64,0xa0,0xd3,0xff,0xff,0x00,0xa0,0x60,0x41,0x13,0x03,
-0x58,0x60,0x5e,0x63,0x2b,0xf2,0x50,0xfe,0xbd,0xd1,0x2c,0xf2,0xd0,0x80,0xbd,0xd1,
-0x2d,0xf2,0xd0,0x80,0xbd,0xd1,0xff,0xff,0xd0,0x80,0xfa,0xa1,0x04,0x01,0xf2,0x02,
-0x6f,0x60,0x7a,0x78,0xff,0xff,0xcb,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x20,0x02,
-0x2e,0xf2,0xff,0xff,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,0xe1,0x81,
-0x5a,0xd2,0xf0,0x85,0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,
-0xe1,0x81,0x5a,0xd2,0xf0,0x85,0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,
-0xf0,0x84,0xf4,0xd6,0x7e,0x00,0x00,0x10,0xe1,0x81,0xf0,0x84,0x65,0x60,0x58,0x4e,
-0x92,0x78,0xff,0xff,0x00,0x03,0x6f,0x60,0x64,0x78,0xff,0xff,0x32,0x40,0x02,0x26,
-0x2e,0x00,0x29,0xf0,0x43,0xf3,0x64,0x40,0x08,0x2a,0x29,0x00,0x64,0x40,0x40,0x27,
-0x0a,0x00,0x02,0x2a,0x08,0x00,0x38,0xf2,0xff,0xff,0x00,0xa8,0xff,0xff,0x03,0x03,
-0x6f,0x60,0x7a,0x78,0xff,0xff,0x29,0xf0,0x03,0x67,0xa0,0x84,0xff,0xff,0x00,0x37,
-0x62,0x63,0x02,0x37,0x5c,0x63,0x01,0x37,0x56,0x63,0x03,0x37,0x10,0x00,0xbd,0xd2,
-0x81,0xf1,0xbd,0xd2,0xd0,0x80,0x82,0xf1,0x07,0x02,0xd0,0x80,0xbd,0xd2,0x83,0xf1,
-0x03,0x02,0xd0,0x80,0xff,0xff,0x03,0x03,0x6f,0x60,0x7a,0x78,0xff,0xff,0x1e,0x60,
-0x9e,0x62,0xa2,0xd5,0x1e,0x60,0x92,0x62,0xa2,0xd3,0xff,0xff,0x40,0x48,0x09,0xf2,
-0x46,0x4b,0x00,0xbe,0x12,0xf2,0x19,0x03,0x60,0x45,0x28,0x44,0xd4,0x81,0x27,0x60,
-0x10,0x65,0xd5,0x80,0x46,0x45,0xf3,0x04,0x09,0xf2,0x2b,0x46,0x09,0xfa,0x5b,0x60,
-0x18,0x62,0xa2,0xd3,0xff,0xff,0x01,0xa4,0xa2,0xdb,0xa2,0xff,0x1a,0x60,0x58,0x4f,
-0x9e,0x78,0xff,0xff,0xa3,0xff,0x2b,0x46,0xe2,0x00,0x26,0x46,0x34,0xf2,0xff,0xff,
-0x0f,0xb4,0x29,0xf0,0x03,0x02,0x64,0x40,0x04,0x2b,0x67,0x00,0x60,0x40,0x0f,0x26,
-0x7d,0x00,0x5a,0x60,0x74,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,
-0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x26,0xf2,0xff,0xff,0x60,0x47,
-0x00,0x7f,0xe0,0x84,0xe0,0x84,0x60,0x45,0x5a,0x60,0x78,0x64,0xc4,0x84,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x1f,0xf2,0xff,0xff,0x60,0x45,0x5a,0x60,0xce,0x64,0xa0,0xd3,0xff,0xff,
-0xc4,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x1e,0x60,0x92,0x62,0xa2,0xd1,0xff,0xff,0x12,0xf8,0x3c,0x60,0x82,0x62,0x00,0x64,
-0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x00,0x64,
-0x09,0xfa,0x05,0xf2,0x06,0xf2,0x60,0x43,0x05,0xfa,0x60,0x46,0x01,0xf0,0x7f,0x60,
-0xff,0x64,0xa0,0x84,0x01,0xfa,0x00,0x64,0x00,0xf0,0x00,0xfa,0xc0,0x80,0x44,0x45,
-0x08,0x03,0x25,0x46,0x05,0xfc,0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,
-0xa3,0xff,0x26,0x46,0x70,0x60,0x58,0x4e,0x99,0x78,0xff,0xff,0x09,0x02,0x2b,0x46,
-0x26,0x44,0x09,0xfa,0x6f,0x60,0x8e,0x78,0xff,0xff,0x6d,0x60,0xb4,0x78,0xff,0xff,
-0x09,0x45,0x09,0xf0,0x26,0x46,0x09,0xf8,0x2b,0x46,0x26,0x44,0x09,0xfa,0xa2,0xff,
-0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,0xa3,0xff,0x5b,0x60,0x12,0x62,0xa2,0xd3,
-0xff,0xff,0x01,0xa4,0xa2,0xdb,0x6f,0x60,0x8e,0x78,0xff,0xff,0x70,0x60,0x58,0x4e,
-0x99,0x78,0xff,0xff,0x39,0x02,0x5a,0x60,0x74,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x26,0xf2,
-0xff,0xff,0x60,0x47,0x00,0x7f,0xe0,0x84,0xe0,0x84,0x60,0x45,0x5a,0x60,0x78,0x64,
-0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1f,0xf2,0xff,0xff,0x60,0x45,0x5a,0x60,0xce,0x64,
-0xa0,0xd3,0xff,0xff,0xc4,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x5b,0x60,0x16,0x62,0xa2,0xd3,0xff,0xff,0x01,0xa4,0xa2,0xdb,
-0x26,0x46,0x6f,0x60,0x7a,0x78,0xff,0xff,0x34,0xf2,0x26,0x46,0x34,0xf2,0x01,0xa5,
-0xd4,0x80,0x29,0x46,0x6a,0x03,0x01,0xa4,0xd4,0x80,0x26,0x46,0x23,0x02,0x5a,0x60,
-0xe6,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x26,0xf2,0xff,0xff,0x60,0x47,0x00,0x7f,0xe0,0x84,
-0xe0,0x84,0x60,0x45,0x5a,0x60,0xea,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x6f,0x60,
-0x7a,0x78,0xff,0xff,0x29,0x46,0x05,0xf2,0x09,0xf0,0x2b,0x46,0x09,0xf8,0x26,0x46,
-0x05,0xf4,0x29,0x43,0x00,0xfc,0x26,0x46,0x05,0xfa,0x5a,0x60,0x74,0x64,0xa0,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x26,0xf2,0xff,0xff,0x60,0x47,0x00,0x7f,0xe0,0x84,0xe0,0x84,0x60,0x45,
-0x5a,0x60,0x78,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,
-0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1f,0xf2,0xff,0xff,0x60,0x45,
-0x5a,0x60,0xce,0x64,0xa0,0xd3,0xff,0xff,0xc4,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,
-0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x5b,0x60,0x14,0x62,0xa2,0xd3,0xff,0xff,
-0x01,0xa4,0xa2,0xdb,0x6f,0x60,0x7a,0x78,0xff,0xff,0x34,0xfa,0x5a,0x60,0x74,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x26,0xf2,0xff,0xff,0x60,0x47,0x00,0x7f,0xe0,0x84,0xe0,0x84,
-0x60,0x45,0x5a,0x60,0x78,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1f,0xf2,0xff,0xff,
-0x60,0x45,0x5a,0x60,0xce,0x64,0xa0,0xd3,0xff,0xff,0xc4,0x84,0xa2,0xdb,0x05,0x04,
-0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x3c,0x60,0x82,0x62,0x00,0x64,
-0xa2,0xdb,0x26,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0x26,0x46,
-0x7f,0x60,0xff,0x65,0x00,0xf0,0x38,0xf2,0xff,0xff,0x06,0xf4,0x01,0xf2,0x60,0x41,
-0xa4,0x84,0x01,0xfa,0x00,0xf2,0x00,0x63,0x00,0xfc,0x66,0x45,0x26,0x46,0x00,0xfa,
-0x29,0x46,0x65,0x44,0x05,0xfa,0x64,0x45,0x06,0xf0,0x06,0xfa,0x64,0x46,0x65,0x44,
-0x00,0xfa,0x29,0x46,0x38,0xf0,0x61,0x44,0xc0,0x84,0x38,0xfa,0x26,0x46,0x29,0xf0,
-0x00,0xf2,0x06,0x45,0x00,0xa8,0x66,0x44,0x01,0x02,0x05,0xfa,0x64,0x40,0x04,0x2b,
-0x0e,0x00,0x1e,0x60,0x92,0x62,0xa2,0xd3,0x29,0x46,0x12,0xfa,0xa2,0xff,0x1a,0x60,
-0x58,0x4f,0x9e,0x78,0xff,0xff,0xa3,0xff,0x6f,0x60,0x8e,0x78,0xff,0xff,0x29,0x46,
-0x38,0xf2,0x09,0xf0,0x60,0x47,0x3f,0xfa,0x2b,0x46,0x09,0xf8,0x26,0x46,0xff,0x60,
-0xf0,0x65,0x34,0xf2,0x29,0xf0,0xa4,0x84,0x29,0x46,0x34,0xfa,0xf7,0x60,0xff,0x64,
-0x0b,0xfa,0xa0,0x9c,0x29,0xf8,0x00,0x64,0x09,0xfa,0x06,0xf4,0x80,0x67,0x01,0xf2,
-0x60,0x45,0xb4,0x83,0x01,0xfc,0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,
-0xa3,0xff,0x09,0x46,0x29,0x46,0x95,0xf3,0xff,0xff,0x60,0x40,0x01,0x26,0x03,0x00,
-0x6f,0x60,0x51,0x78,0xff,0xff,0x6f,0x60,0x64,0x78,0xff,0xff,0x95,0xf3,0xff,0xff,
-0x60,0x40,0x01,0x26,0x03,0x00,0x6e,0x60,0x7e,0x78,0xff,0xff,0x29,0xf2,0xff,0xff,
-0xff,0xff,0x50,0x3a,0xf0,0x00,0x5c,0x63,0x61,0x60,0xbc,0x61,0xbd,0xd2,0xa1,0xd1,
-0x02,0xa1,0xbd,0xd2,0xd0,0x80,0xa1,0xd1,0x02,0xa1,0xe5,0x02,0xd0,0x80,0xbd,0xd2,
-0xa1,0xd1,0xe1,0x02,0xd0,0x80,0xff,0xff,0xde,0x02,0x26,0x46,0x28,0x60,0xda,0x63,
-0x00,0xf4,0x02,0xf2,0xbd,0xdb,0xff,0xff,0x03,0xf2,0xbd,0xdb,0x04,0xf2,0xff,0xff,
-0xbd,0xdb,0x05,0xf2,0xa3,0xdb,0xfa,0xa3,0x26,0x46,0x00,0x60,0x00,0x65,0xa3,0xd3,
-0x23,0xf0,0x00,0x61,0xd0,0x84,0xf1,0x81,0xd4,0x84,0xf1,0x81,0xbd,0xdb,0xa3,0xd3,
-0x03,0xb1,0x03,0xa9,0x24,0xf0,0x42,0xfe,0x01,0x03,0xcc,0x84,0xf1,0x81,0xd0,0x84,
-0xf1,0x81,0xbd,0xdb,0xa3,0xd3,0x03,0xb1,0x03,0xa9,0x27,0xf0,0x42,0xfe,0x01,0x03,
-0xcc,0x84,0xf1,0x81,0xd0,0x84,0xf1,0x81,0xbd,0xdb,0xa3,0xd3,0x03,0xb1,0x03,0xa9,
-0x28,0xf0,0x01,0x03,0xcc,0x84,0xd0,0x84,0xa3,0xdb,0x01,0x64,0x23,0xfb,0xff,0xff,
-0x1a,0xff,0x67,0x60,0x6a,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0xff,0xff,0x68,0x03,
-0x26,0x46,0x00,0xf4,0x02,0xf2,0x5a,0xd2,0x40,0x47,0x40,0x48,0x5a,0xd2,0x5a,0xd2,
-0x40,0x49,0x60,0x41,0x5a,0xd0,0x80,0xf9,0x40,0x63,0xad,0x80,0xf0,0xa3,0x09,0x02,
-0x3c,0x03,0x29,0x41,0x28,0x44,0x40,0x49,0x27,0x44,0x40,0x48,0x00,0x64,0x40,0x47,
-0xf4,0x00,0xd1,0x80,0x01,0x02,0x31,0x04,0x10,0xa3,0x80,0x60,0x00,0x65,0xa5,0x80,
-0xcf,0x83,0x08,0x02,0x27,0x44,0x60,0x87,0x28,0x44,0x70,0x88,0x29,0x44,0x70,0x89,
-0xf1,0x81,0xf5,0x00,0xe7,0xa3,0x64,0x44,0x00,0xa0,0x00,0x62,0x02,0x02,0x00,0x61,
-0x1c,0x00,0xe0,0x84,0xde,0x82,0xfd,0x04,0x42,0xfe,0xf8,0x84,0x62,0x45,0xc7,0x83,
-0x60,0x45,0x02,0xfe,0xd5,0x84,0x02,0x05,0x01,0x05,0x61,0x44,0xcf,0x83,0x60,0x41,
-0x08,0x03,0x27,0x44,0x60,0x87,0x28,0x44,0x70,0x88,0x29,0x44,0x70,0x89,0xf1,0x81,
-0xf1,0x00,0xce,0x82,0xe9,0x81,0xfd,0x02,0xf1,0x81,0x02,0xf2,0xff,0xff,0x60,0x47,
-0xe8,0x84,0xe8,0x84,0x5a,0xd2,0x3f,0xb5,0xe0,0x84,0xe0,0x84,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0xe0,0x84,0xb4,0x84,0x61,0x45,0xd4,0x84,0xc0,0x84,0xe0,0x84,0xe0,0x84,
-0xe0,0x84,0xe0,0x93,0x67,0x60,0x6a,0x62,0x00,0x64,0xa2,0xdb,0x26,0x46,0x6d,0x00,
-0xcb,0xf3,0xff,0xff,0xfd,0xa0,0xff,0xff,0x68,0x02,0x3d,0x60,0x1c,0x64,0xa0,0xd3,
-0xff,0xff,0x01,0xbc,0xa2,0xdb,0x29,0xf2,0xff,0xff,0x60,0x40,0x10,0x2b,0x09,0x00,
-0x69,0x60,0x58,0x4e,0xdf,0x78,0xff,0xff,0x04,0x03,0x69,0x60,0x58,0x4e,0xf9,0x78,
-0xff,0xff,0x2e,0xf2,0xff,0xff,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,
-0xe1,0x81,0x5a,0xd2,0xf0,0x85,0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,0xe1,0x81,
-0xf0,0x84,0xe1,0x81,0x5a,0xd2,0xf0,0x85,0x94,0x84,0x60,0x41,0xe1,0x81,0xf0,0x84,
-0xe1,0x81,0xf0,0x84,0xe1,0x81,0xf0,0x84,0x65,0x60,0x58,0x4e,0x92,0x78,0xff,0xff,
-0x34,0x03,0x29,0xf2,0x34,0xf0,0x60,0x40,0x08,0x3a,0x61,0x00,0x08,0x2b,0x2a,0x00,
-0x0c,0xa3,0xa3,0xd3,0xff,0xff,0xd0,0x80,0xff,0xff,0x25,0x02,0x5a,0x60,0xe6,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x26,0xf2,0xff,0xff,0x60,0x47,0x00,0x7f,0xe0,0x84,0xe0,0x84,
-0x60,0x45,0x5a,0x60,0xea,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x6f,0x60,0x7a,0x78,
-0xff,0xff,0x69,0x00,0x0c,0xa3,0xa3,0xd9,0x32,0x00,0x67,0x60,0x46,0x65,0x29,0xf2,
-0x34,0xf0,0x60,0x40,0xa4,0x36,0x72,0x00,0x08,0x2b,0x28,0x00,0xa5,0xd3,0xff,0xff,
-0xd0,0x80,0xff,0xff,0x23,0x02,0x5a,0x60,0xe6,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x26,0xf2,
-0xff,0xff,0x60,0x47,0x00,0x7f,0xe0,0x84,0xe0,0x84,0x60,0x45,0x5a,0x60,0xea,0x64,
-0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x6f,0x60,0x7a,0x78,0xff,0xff,0xa5,0xd9,0x29,0xf2,
-0xff,0xff,0xff,0xff,0x0c,0x22,0x42,0x00,0x5a,0x60,0x74,0x64,0xa0,0xd3,0xff,0xff,
-0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,
-0x26,0xf2,0xff,0xff,0x60,0x47,0x00,0x7f,0xe0,0x84,0xe0,0x84,0x60,0x45,0x5a,0x60,
-0x78,0x64,0xc4,0x84,0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,
-0xa2,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x1f,0xf2,0xff,0xff,0x60,0x45,0x5a,0x60,
-0xce,0x64,0xa0,0xd3,0xff,0xff,0xc4,0x84,0xa2,0xdb,0x05,0x04,0xda,0x82,0xa2,0xd3,
-0xff,0xff,0xdc,0x84,0xa2,0xdb,0x46,0x48,0x00,0xf4,0x80,0x60,0x87,0x65,0x66,0x44,
-0xac,0x80,0x05,0xf2,0xff,0xff,0xd4,0x80,0x08,0x03,0x07,0x02,0x6f,0x60,0xc4,0x78,
-0xff,0xff,0x03,0x02,0x6a,0x60,0x0c,0x78,0xff,0xff,0x28,0x46,0x38,0xf2,0x49,0xf1,
-0xff,0xff,0xd0,0x80,0xff,0xff,0x10,0x07,0x78,0x43,0x04,0xa3,0x56,0xfd,0x0c,0x60,
-0x46,0x64,0xa0,0xd7,0xff,0xff,0xff,0xff,0x6a,0x60,0x0c,0x78,0xff,0xff,0x95,0xf3,
-0xff,0xff,0x60,0x40,0x01,0x26,0x19,0x00,0x0f,0x4e,0x46,0x45,0x3c,0x60,0x82,0x62,
-0x00,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,
-0xa2,0xff,0x1a,0x60,0x58,0x4f,0x9e,0x78,0xff,0xff,0xa3,0xff,0xd1,0xfe,0x0e,0x4f,
-0x00,0x64,0x40,0x46,0x6a,0x60,0x0c,0x78,0xff,0xff,0x3c,0x60,0x82,0x62,0x3c,0x60,
-0x6a,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,
-0xd2,0xfe,0x00,0x64,0x40,0x46,0x6a,0x60,0x0c,0x78,0xff,0xff,0x2f,0x58,0xff,0xff,
-0x29,0xf2,0xff,0xff,0x60,0x47,0x56,0x63,0x01,0xb0,0x01,0x26,0x62,0x63,0xbd,0xd0,
-0x39,0xf8,0xbd,0xd0,0xff,0xff,0x3a,0xf8,0xbd,0xd0,0x3b,0xf8,0x02,0xb0,0x5c,0x63,
-0x04,0x03,0x62,0x63,0x03,0xb0,0x02,0x3a,0x6a,0x63,0xbd,0xd0,0x3c,0xf8,0xbd,0xd0,
-0xff,0xff,0x3d,0xf8,0xbd,0xd0,0x3e,0xf8,0x2f,0x58,0xff,0xff,0x06,0x67,0x06,0xf2,
-0x60,0x45,0xd4,0x80,0xff,0xff,0x48,0x02,0x17,0x60,0x7a,0x63,0xa3,0xd3,0x08,0xfe,
-0xff,0xff,0x04,0x26,0x41,0x00,0x07,0x67,0x06,0xfa,0x28,0x46,0x00,0xf0,0x04,0x64,
-0x03,0xfa,0x04,0xf8,0x00,0x64,0x0b,0xfa,0x0c,0xfa,0xff,0xff,0x0f,0xfa,0x2e,0xf2,
-0x2b,0xfa,0xff,0xff,0x2f,0xf2,0x2c,0xfa,0x30,0xf2,0xff,0xff,0x2d,0xfa,0xbd,0xf1,
-0x2e,0xf8,0xff,0xff,0xbe,0xf1,0x2f,0xf8,0xbf,0xf1,0xff,0xff,0x30,0xf8,0x85,0xf3,
-0xff,0xff,0x08,0xbc,0x43,0xf1,0xff,0xff,0x64,0x40,0x01,0x2a,0x03,0x00,0x60,0x47,
-0x40,0xbc,0x60,0x47,0x29,0xfa,0x00,0x63,0x28,0xfc,0x22,0xfc,0x3a,0x60,0x58,0x4e,
-0x14,0x78,0xff,0xff,0xff,0x7f,0x00,0x7e,0x0e,0xfa,0x3c,0x60,0x82,0x62,0x3c,0x60,
-0x28,0x64,0xa2,0xdb,0x66,0x44,0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,
-0xc1,0xfe,0x00,0x64,0x40,0x46,0x48,0xfe,0x6f,0x60,0x5f,0x78,0xff,0xff,0x2b,0xf0,
-0x67,0x44,0xd0,0x80,0x38,0xf2,0x7b,0x02,0xdc,0xa0,0x00,0xf4,0x78,0x04,0x06,0x60,
-0x08,0x65,0x05,0xf2,0x09,0xf0,0xd4,0x80,0x01,0x60,0x00,0x64,0x70,0x02,0xd0,0x80,
-0x67,0x60,0x06,0x63,0x6c,0x02,0x67,0x60,0x0a,0x64,0xa0,0xd3,0xff,0xff,0xdc,0x84,
-0xa2,0xdb,0x12,0xf0,0xbd,0xd3,0x13,0xf0,0xd0,0x80,0xa3,0xd3,0x60,0x02,0xd0,0x80,
-0x00,0xa0,0x5d,0x02,0x5c,0x03,0xbd,0xf3,0x0f,0xfa,0xbe,0xf3,0xff,0xff,0x10,0xfa,
-0xbf,0xf3,0x11,0xfa,0x02,0x60,0x00,0x64,0x09,0xfa,0x14,0x63,0x1e,0x61,0x26,0x65,
-0xa3,0xd2,0xa1,0xd0,0xa1,0xda,0x64,0x44,0xbd,0xda,0xd5,0x80,0xd9,0x81,0xf8,0x02,
-0x26,0x46,0x85,0xf3,0x43,0xf1,0x08,0xbc,0x60,0x47,0x64,0x40,0x01,0x26,0x40,0xbc,
-0x60,0x47,0x29,0xfa,0xff,0x7f,0x00,0x7e,0x0e,0xfa,0x28,0x64,0x38,0xfa,0x00,0x64,
-0x22,0xfa,0x28,0xfa,0xff,0xff,0x81,0xf3,0x2b,0xfa,0x82,0xf3,0xff,0xff,0x2c,0xfa,
-0x83,0xf3,0x2d,0xfa,0xff,0xff,0xbd,0xf3,0x2e,0xfa,0xbe,0xf3,0xff,0xff,0x2f,0xfa,
-0xbf,0xf3,0x30,0xfa,0xff,0xff,0x00,0xf4,0x0f,0xf2,0x10,0xf0,0x60,0x45,0x11,0xf2,
-0x26,0x46,0x33,0xfa,0x64,0x44,0x32,0xfa,0x65,0x44,0x31,0xfa,0x3a,0x60,0x58,0x4e,
-0x14,0x78,0xff,0xff,0x3c,0x60,0x82,0x62,0x3c,0x60,0x28,0x64,0xa2,0xdb,0x66,0x44,
-0x5a,0xdb,0x0a,0x64,0x5a,0xdb,0xff,0xff,0x2b,0xff,0xc1,0xfe,0x67,0x60,0x0c,0x64,
-0xa0,0xd3,0xff,0xff,0xdc,0x84,0xa2,0xdb,0x6f,0x60,0x8e,0x78,0xff,0xff,0x26,0x46,
-0x6b,0x60,0x03,0x78,0xff,0xff,0x1e,0x60,0x9e,0x64,0xa0,0xd5,0x66,0x45,0x09,0xf2,
-0x46,0x4b,0x00,0xbe,0x46,0x49,0x12,0x03,0x30,0xf0,0x65,0x46,0x30,0xf2,0x2f,0xf0,
-0xd0,0x80,0x29,0x46,0xf4,0x02,0x2f,0xf2,0x2e,0xf2,0xd0,0x80,0x65,0x46,0x03,0x02,
-0x2e,0xf0,0xff,0xff,0xd0,0x80,0x29,0x46,0xea,0x02,0x08,0xfe,0x2e,0x58,0xff,0xff,
-0x00,0x64,0x00,0xa0,0x68,0x60,0xd4,0x62,0xa2,0xd3,0x29,0xf0,0x60,0x40,0x00,0x36,
-0x34,0x00,0x01,0x3a,0x07,0x00,0x64,0x44,0x00,0x7f,0x80,0x65,0xd4,0x80,0xff,0xff,
-0x2f,0x03,0x2b,0x00,0x64,0x44,0x0c,0xb4,0xf8,0xa0,0xff,0xff,0x44,0x03,0x64,0x44,
-0x80,0x36,0x26,0x00,0xb4,0x36,0x27,0x00,0xc4,0x36,0x28,0x00,0xd4,0x36,0x29,0x00,
-0x40,0x36,0x2a,0x00,0xe4,0x36,0x2b,0x00,0x00,0x36,0x2c,0x00,0x10,0x36,0x2d,0x00,
-0x20,0x36,0x28,0x00,0x30,0x36,0x29,0x00,0x50,0x36,0x27,0x00,0xa0,0x36,0x28,0x00,
-0xa4,0x36,0x20,0x00,0xb0,0x36,0x24,0x00,0xc0,0x36,0x22,0x00,0x68,0x60,0xd6,0x62,
-0x68,0x60,0xd8,0x63,0x00,0x64,0xa2,0xdb,0xa3,0xdb,0x6a,0x60,0x42,0x78,0xff,0xff,
-0x72,0x60,0xb8,0x78,0xff,0xff,0x71,0x60,0x5a,0x78,0xff,0xff,0x71,0x60,0x98,0x78,
-0xff,0xff,0x71,0x60,0x8b,0x78,0xff,0xff,0x71,0x60,0xa5,0x78,0xff,0xff,0x71,0x60,
-0xfd,0x78,0xff,0xff,0x71,0x60,0x14,0x78,0xff,0xff,0x71,0x60,0x37,0x78,0xff,0xff,
-0x72,0x60,0x1b,0x78,0xff,0xff,0x72,0x60,0x52,0x78,0xff,0xff,0x68,0x60,0xd6,0x62,
-0x68,0x60,0xd8,0x63,0x00,0x64,0xa2,0xdb,0xa3,0xdb,0xff,0xff,0x2b,0xf2,0x81,0xf1,
-0xff,0xff,0xd0,0x80,0x2c,0xf2,0x82,0xf1,0x07,0x02,0xd0,0x80,0x2d,0xf2,0x83,0xf1,
-0x03,0x02,0xd0,0x80,0xff,0xff,0x06,0x03,0x56,0x65,0x73,0x60,0x58,0x4f,0xc2,0x78,
-0xff,0xff,0x04,0x02,0x68,0x60,0xd6,0x62,0x01,0x64,0xa2,0xdb,0x70,0x60,0xf3,0x78,
-0xff,0xff,0x68,0x60,0xd6,0x62,0x68,0x60,0xd8,0x63,0x00,0x64,0xa2,0xdb,0xa3,0xdb,
-0xff,0xff,0x2e,0xf2,0x81,0xf1,0xff,0xff,0xd0,0x80,0x2f,0xf2,0x82,0xf1,0x07,0x02,
-0xd0,0x80,0x30,0xf2,0x83,0xf1,0x03,0x02,0xd0,0x80,0xff,0xff,0x06,0x03,0x5c,0x65,
-0x73,0x60,0x58,0x4f,0xc2,0x78,0xff,0xff,0x04,0x02,0x68,0x60,0xd6,0x62,0x01,0x64,
-0xa2,0xdb,0x70,0x60,0xf3,0x78,0xff,0xff,0x68,0x60,0xd6,0x62,0x68,0x60,0xd8,0x63,
-0x00,0x64,0xa2,0xdb,0xa3,0xdb,0xff,0xff,0x2b,0xf2,0x81,0xf1,0xff,0xff,0xd0,0x80,
-0x2c,0xf2,0x82,0xf1,0x15,0x02,0xd0,0x80,0x2d,0xf2,0x83,0xf1,0x11,0x02,0xd0,0x80,
-0xff,0xff,0x14,0x03,0x2e,0xf2,0x81,0xf1,0xff,0xff,0xd0,0x80,0x2f,0xf2,0x82,0xf1,
-0x07,0x02,0xd0,0x80,0x30,0xf2,0x83,0xf1,0x03,0x02,0xd0,0x80,0xff,0xff,0x06,0x03,
-0x56,0x65,0x73,0x60,0x58,0x4f,0xc2,0x78,0xff,0xff,0x04,0x02,0x68,0x60,0xd8,0x62,
-0x01,0x64,0xa2,0xdb,0x70,0x60,0xf3,0x78,0xff,0xff,0x68,0x60,0xd8,0x65,0x68,0x60,
-0xd6,0x63,0x00,0x64,0x01,0x61,0xa3,0xd1,0xa5,0xdb,0xd1,0x80,0xa3,0xdb,0x70,0x60,
-0xf3,0x78,0xff,0xff,0x68,0x60,0xd8,0x65,0x68,0x60,0xd6,0x63,0x00,0x64,0x01,0x61,
-0xa5,0xd1,0xa3,0xdb,0xd1,0x80,0xa5,0xdb,0x70,0x60,0xf3,0x78,0xff,0xff,0x68,0x60,
-0xd6,0x62,0x68,0x60,0xd8,0x63,0x00,0x64,0xa2,0xdb,0xa3,0xdb,0x46,0x4a,0x2b,0xf2,
-0x81,0xf1,0xff,0xff,0xd0,0x80,0x2c,0xf2,0x82,0xf1,0x0c,0x02,0xd0,0x80,0x2d,0xf2,
-0x83,0xf1,0x08,0x02,0xd0,0x80,0xff,0xff,0x05,0x02,0x68,0x60,0xd6,0x62,0x01,0x64,
-0xa2,0xdb,0x0c,0x00,0x2b,0xf0,0xff,0x60,0xff,0x64,0xd0,0x80,0x2c,0xf0,0x33,0x02,
-0xd0,0x80,0x2d,0xf0,0x30,0x02,0xd0,0x80,0xff,0xff,0x2d,0x02,0x38,0xf2,0xff,0xff,
-0xfe,0xa0,0xff,0xff,0x28,0x04,0x00,0xf4,0x02,0xf0,0x16,0x60,0x44,0x62,0xa2,0xd1,
-0x64,0x47,0xd0,0x80,0xff,0xff,0x1f,0x02,0x60,0x41,0xe9,0x81,0x06,0x63,0x0c,0x03,
-0x16,0x60,0x46,0x64,0x60,0x45,0xbd,0xd0,0xa5,0xd3,0xff,0xff,0xd0,0x80,0x65,0x44,
-0x12,0x02,0xcd,0x81,0x02,0xa4,0xf6,0x02,0x02,0xf0,0xff,0xff,0x64,0x40,0x01,0x27,
-0x02,0x00,0x48,0xfe,0x08,0x00,0xa3,0xd0,0xa0,0xd1,0x64,0x44,0x00,0x7f,0x60,0x45,
-0x64,0x44,0x00,0x7f,0xd4,0x80,0x2a,0x46,0x70,0x60,0xf3,0x78,0xff,0xff,0x68,0x60,
-0xd6,0x62,0x68,0x60,0xd8,0x63,0x00,0x64,0xa2,0xdb,0xa3,0xdb,0xff,0xff,0x2e,0xf2,
-0x81,0xf1,0xff,0xff,0xd0,0x80,0x2f,0xf2,0x82,0xf1,0x07,0x02,0xd0,0x80,0x30,0xf2,
-0x83,0xf1,0x03,0x02,0xd0,0x80,0xff,0xff,0x05,0x03,0x5c,0x65,0x73,0x60,0x58,0x4f,
-0xc2,0x78,0xff,0xff,0x70,0x60,0xf3,0x78,0xff,0xff,0x68,0x60,0xd6,0x62,0x68,0x60,
-0xd8,0x63,0x00,0x64,0xa2,0xdb,0xa3,0xdb,0xff,0xff,0x2b,0xf2,0x81,0xf1,0xff,0xff,
-0xd0,0x80,0x2c,0xf2,0x82,0xf1,0x07,0x02,0xd0,0x80,0x2d,0xf2,0x83,0xf1,0x03,0x02,
-0xd0,0x80,0xff,0xff,0x1a,0x03,0x56,0x65,0x73,0x60,0x58,0x4f,0xc2,0x78,0xff,0xff,
-0x14,0x03,0x2e,0xf2,0x81,0xf1,0xff,0xff,0xd0,0x80,0x2f,0xf2,0x82,0xf1,0x07,0x02,
-0xd0,0x80,0x30,0xf2,0x83,0xf1,0x03,0x02,0xd0,0x80,0xff,0xff,0x06,0x03,0x5c,0x65,
-0x73,0x60,0x58,0x4f,0xc2,0x78,0xff,0xff,0x04,0x00,0x68,0x60,0xd6,0x62,0x01,0x64,
-0xa2,0xdb,0x70,0x60,0xf3,0x78,0xff,0xff,0x68,0x60,0xd6,0x62,0x68,0x60,0xd8,0x63,
-0x00,0x64,0xa2,0xdb,0xa3,0xdb,0x29,0xf2,0xff,0xff,0xff,0xff,0x01,0x2b,0x3a,0x00,
-0x2b,0xf2,0x81,0xf1,0xff,0xff,0xd0,0x80,0x2c,0xf2,0x82,0xf1,0x07,0x02,0xd0,0x80,
-0x2d,0xf2,0x83,0xf1,0x03,0x02,0xd0,0x80,0xff,0xff,0x40,0x03,0x68,0x60,0xdc,0x62,
-0xa2,0xd3,0xff,0xff,0xff,0xa0,0xff,0xff,0x42,0x02,0x68,0x60,0xde,0x62,0xa2,0xd3,
-0xff,0xff,0x00,0xa0,0x40,0x47,0x1e,0x03,0x56,0x65,0x68,0x60,0xe0,0x61,0x65,0x43,
-0x50,0xfe,0xbd,0xd2,0xa1,0xd1,0x02,0xa1,0xd0,0x80,0xbd,0xd2,0xa1,0xd1,0x02,0xa1,
-0xd0,0x80,0xa3,0xd2,0xa1,0xd1,0x02,0xa1,0xd0,0x80,0xff,0xff,0x1f,0x01,0x27,0x44,
-0xcc,0x84,0x40,0x47,0xec,0x02,0x29,0xf2,0xff,0xff,0xff,0xff,0x01,0x27,0x02,0x00,
-0x08,0xfe,0x1d,0x00,0x2e,0xf2,0x81,0xf1,0xff,0xff,0xd0,0x80,0x2f,0xf2,0x82,0xf1,
-0x07,0x02,0xd0,0x80,0x30,0xf2,0x83,0xf1,0x03,0x02,0xd0,0x80,0xff,0xff,0x06,0x03,
-0x5c,0x65,0x73,0x60,0x58,0x4f,0xc2,0x78,0xff,0xff,0x09,0x02,0x2b,0xf2,0xff,0xff,
-0xff,0xff,0x01,0x26,0x04,0x00,0x68,0x60,0xd6,0x62,0x01,0x64,0xa2,0xdb,0x70,0x60,
-0xf3,0x78,0xff,0xff,0x68,0x60,0xd6,0x62,0x68,0x60,0xd8,0x63,0x00,0x64,0xa2,0xdb,
-0xa3,0xdb,0x38,0xf2,0x46,0x4a,0x60,0x41,0x68,0x60,0xd4,0x62,0xa2,0xd3,0xff,0xff,
-0xff,0xff,0x02,0x36,0x07,0x00,0x68,0x60,0xd2,0x62,0xa2,0xd3,0xff,0xff,0xff,0xff,
-0x04,0x36,0x07,0x00,0x61,0x44,0xf2,0xa0,0xff,0xff,0x06,0x05,0x73,0x60,0xbe,0x78,
-0xff,0xff,0x73,0x60,0x15,0x78,0xff,0xff,0x2e,0xf2,0x81,0xf1,0xff,0xff,0xd0,0x80,
-0x2f,0xf2,0x82,0xf1,0x07,0x02,0xd0,0x80,0x30,0xf2,0x83,0xf1,0x03,0x02,0xd0,0x80,
-0xff,0xff,0xef,0x03,0x68,0x60,0xd4,0x62,0xa2,0xd3,0xff,0xff,0xfe,0xa0,0xff,0xff,
-0xe5,0x02,0x68,0x60,0xdc,0x62,0xa2,0xd3,0xff,0xff,0xff,0xa0,0xff,0xff,0xde,0x02,
-0x68,0x60,0xde,0x62,0xa2,0xd3,0xff,0xff,0x00,0xa0,0x40,0x47,0x22,0x03,0x5c,0x65,
-0x68,0x60,0xe0,0x61,0x65,0x43,0x50,0xfe,0xbd,0xd2,0xa1,0xd1,0x02,0xa1,0xd0,0x80,
-0xbd,0xd2,0xa1,0xd1,0x02,0xa1,0xd0,0x80,0xa3,0xd2,0xa1,0xd1,0x02,0xa1,0xd0,0x80,
-0xff,0xff,0xc4,0x01,0x27,0x44,0xcc,0x84,0x40,0x47,0xec,0x02,0x0a,0x00,0x68,0x60,
-0xd4,0x62,0xa2,0xd3,0xff,0xff,0xff,0xff,0x02,0x3a,0x03,0x00,0x73,0x60,0xbe,0x78,
-0xff,0xff,0x38,0xf2,0x00,0xf4,0x08,0xf0,0xf2,0xa0,0xff,0xff,0x03,0x05,0x73,0x60,
-0xbe,0x78,0xff,0xff,0x68,0x60,0xd2,0x62,0xa2,0xd3,0xff,0xff,0xff,0xff,0x04,0x36,
-0x1b,0x00,0x16,0x60,0x44,0x62,0x64,0x47,0x00,0xa0,0xff,0xff,0x3c,0x06,0xe0,0xa0,
-0xff,0xff,0x39,0x07,0xa2,0xdb,0x12,0x63,0x60,0x41,0x16,0x60,0x46,0x64,0xbd,0xd0,
-0xa0,0xd9,0xcd,0x81,0x02,0xa4,0xfb,0x02,0x08,0xf0,0xff,0xff,0x64,0x40,0x01,0x2b,
-0x2a,0x00,0xa3,0xd0,0xa0,0xd9,0x27,0x00,0x16,0x60,0x44,0x62,0x64,0x47,0xa2,0xd1,
-0xff,0xff,0xd0,0x80,0xff,0xff,0x6c,0x02,0x60,0x41,0xe9,0x81,0x12,0x63,0x0c,0x03,
-0x16,0x60,0x46,0x64,0x60,0x45,0xbd,0xd0,0xa5,0xd3,0xff,0xff,0xd0,0x80,0x65,0x44,
-0x5f,0x02,0xcd,0x81,0x02,0xa4,0xf6,0x02,0x08,0xf0,0xff,0xff,0x64,0x40,0x01,0x2b,
-0x0a,0x00,0xa3,0xd0,0xa0,0xd1,0x64,0x44,0x00,0x7f,0x60,0x45,0x64,0x44,0x00,0x7f,
-0xd4,0x80,0xff,0xff,0x4d,0x02,0x08,0xf2,0x12,0x65,0x00,0x7e,0x60,0x47,0xc4,0x81,
-0x61,0x45,0x01,0x26,0x04,0x00,0xa1,0xd2,0xf4,0xe6,0x7e,0x00,0xda,0x01,0xff,0xff,
-0x60,0x47,0x02,0x00,0x01,0xa1,0xa1,0xd2,0xff,0xff,0x00,0x7f,0x02,0xa4,0xc4,0x81,
-0x02,0xa1,0x01,0x26,0x02,0x00,0xa1,0xd2,0x04,0x00,0xff,0xa1,0xa1,0xd2,0xff,0xff,
-0x60,0x47,0x7f,0xf1,0x00,0x7f,0xd0,0x80,0xff,0xff,0x2d,0x02,0x68,0x60,0xd4,0x62,
-0xa2,0xd3,0xff,0xff,0xfe,0xa0,0xff,0xff,0x19,0x02,0x68,0x60,0xde,0x62,0xa2,0xd3,
-0xff,0xff,0xf6,0xa0,0x60,0x41,0x12,0x05,0x01,0xa4,0xa2,0xdb,0xe1,0x81,0xe1,0x85,
-0xc5,0x85,0x68,0x60,0xe0,0x64,0xc4,0x81,0x2a,0x46,0x5c,0x63,0xbd,0xd2,0xa1,0xdb,
-0xbd,0xd2,0x02,0xa1,0xa1,0xdb,0xa3,0xd2,0x02,0xa1,0xa1,0xdb,0x68,0x60,0xd4,0x62,
-0x02,0x64,0xa2,0xdb,0x2a,0x46,0xff,0xff,0x2e,0xf0,0x81,0xf9,0x2f,0xf0,0xff,0xff,
-0x82,0xf9,0x30,0xf0,0x83,0xf9,0x2a,0x46,0x70,0x60,0xf3,0x78,0xff,0xff,0x68,0x60,
-0xdc,0x62,0xa2,0xd3,0xff,0xff,0xff,0xa0,0xff,0xff,0x1d,0x02,0x68,0x60,0xde,0x62,
-0xa2,0xd3,0xff,0xff,0xff,0xa0,0x40,0x47,0x16,0x04,0x68,0x60,0xe0,0x61,0x65,0x43,
-0x50,0xfe,0xbd,0xd2,0xa1,0xd1,0x02,0xa1,0xd0,0x80,0xbd,0xd2,0xa1,0xd1,0x02,0xa1,
-0xd0,0x80,0xa3,0xd2,0xa1,0xd1,0x02,0xa1,0xd0,0x80,0xff,0xff,0x06,0x01,0x27,0x44,
-0xcc,0x84,0x40,0x47,0xec,0x02,0x08,0xfe,0x01,0x00,0x48,0xfe,0x2f,0x58,0xff,0xff,
-0x99,0xff,0x08,0x60,0x2a,0x62,0x05,0x60,0xff,0x64,0xa2,0xdb,0x05,0x60,0xff,0xe5,
-0xff,0xff,0xff,0xff,0x98,0xff,0xe0,0x60,0x00,0x63,0xfe,0x60,0x00,0x66,0x0c,0x60,
-0x7b,0x64,0xa3,0xd0,0xcc,0x84,0xbd,0xd8,0xfc,0x02,0x99,0xff,0x08,0x60,0x2a,0x62,
-0x04,0x60,0xff,0x64,0xa2,0xdb,0x04,0x60,0xff,0xe5,0xff,0xff,0xff,0xff,0x98,0xff,
-0x0c,0x60,0x87,0x78,0xff,0xff,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
-0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x02,0x00,0x01,0x00,
-0x01,0x00,0x01,0x00,0x21,0x00,0x02,0x00,0x02,0x00,0x01,0x00,0x00,0x00,0x04,0x00,
-0x01,0x00,0x01,0x00,0x01,0x00,0x02,0x00,0x10,0x20,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x02,0x00,0x02,0x00,0x00,0x00,
-0x53,0x65,0x63,0x6f,0x6e,0x64,0x61,0x72,0x79,0x20,0x46,0x27,0x73,0x00,0x0f,0x01,
-0x00,0x18,0x7e,0x00,0xce,0xd0,0x0c,0x01,0x38,0x81,0x7f,0x00,0x02,0x00,0x0e,0x01,
-0xfa,0x8d,0x7f,0x00,0x02,0x00,0x10,0x01,0x00,0x80,0x7f,0x00,0xda,0x14,0x0a,0x01,
-0xc2,0x8d,0x7f,0x00,0x02,0x00,0x0b,0x01,0x0c,0x8e,0x7f,0x00,0x24,0x00,0x08,0x01,
-0xe8,0x8d,0x7f,0x00,0x12,0x00,0x09,0x01,0xe6,0x8d,0x7f,0x00,0x02,0x00,0x04,0x01,
-0x0a,0x81,0x7f,0x00,0x02,0x00,0x05,0x01,0x46,0x8d,0x7f,0x00,0x02,0x00,0x05,0x01,
-0x40,0x81,0x7f,0x00,0x02,0x00,0x02,0x00,0x00,0x80,0x7f,0x00,0xfa,0x0f,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x0f,0x00,0x00,0x00,0x00,0x00,0x70,0x09,
-0x34,0x09,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x1b,0x00,0x1b,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x27,
-0xe0,0x27,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x07,0x01,0x00,0x64,0x00,0x64,0x00,
-0xe8,0x03,0x10,0x27,0x14,0x00,0x88,0x13,0x88,0x13,0x2f,0x00,0x14,0x00,0x04,0x00,
-0x0f,0x00,0x02,0x00,0x02,0x00,0x14,0x00,0x0a,0x00,0x0f,0x00,0x0f,0x00,0x05,0x00,
-0x0a,0x00,0x64,0x00,0x88,0x13,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,
-0x05,0x00,0x08,0x00,0x23,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x2b,0x09,
-0x03,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1f,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xff,0x10,0x60,0xa3,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x41,0xff,0x10,0x60,0xa4,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xc4,0xe2,0x10,0x60,0xab,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x10,0x60,0x85,0x78,0x43,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x44,0xff,0x08,0xe1,0x10,0x60,
-0xc6,0x78,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x44,0xe2,0x10,0x60,0xc8,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x46,0xff,0x10,0x60,0xc9,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x10,0x60,0xca,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x12,0x60,0xd8,0x78,0x4c,0x4e,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x12,0x60,0x9f,0x78,0x4c,0xe2,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x11,0x60,0xcf,0x78,0x43,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x11,0x60,0xab,0x78,0xa1,0xf3,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x12,0x60,0xbc,0x78,0x46,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x11,0x60,0x8e,0x78,0x47,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x42,0xff,0x19,0x60,0x56,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x43,0xff,0x19,0x60,0x56,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x44,0xff,0x19,0x60,0x56,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x45,0xff,0x1a,0x60,0xd4,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x07,0xf7,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x83,0x7c,0x08,0x60,0x12,0x64,0x80,0x29,
-0xa0,0xd9,0x47,0xff,0x19,0x60,0x0c,0x78,0xff,0xff,0x40,0xff,0x24,0x58,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x41,0xff,0x21,0x58,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xc4,0xe2,0x22,0x58,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x20,0x60,0x08,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x22,0x60,0x76,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x45,0xff,0x21,0x58,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x1b,0x60,0x08,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x20,0x60,0x0b,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xf8,0x60,0x8c,0x78,0x40,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xf6,0x60,0xa0,0x78,0x41,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xf8,0x60,0xf5,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0x25,0x60,0x2d,0x78,0x43,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xf8,0x60,0xf5,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0x24,0x60,0xb2,0x78,0x45,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0x25,0x60,0x75,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0xf8,0x60,0xf5,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0xff,0xff,0x3d,0x60,0x25,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3f,0x60,0x47,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x79,0x3d,0x60,0x2e,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x24,0xe2,0x3d,0x60,0x2e,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x3d,0x60,0xa1,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x44,0xe2,0x3d,0x60,0x2e,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x84,0xe2,0x3d,0x60,0x2e,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x47,0xff,0x3d,0x60,0x2e,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x30,0x60,0x37,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x31,0x60,0x19,0x78,0xff,0xff,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x28,0xe2,0x30,0x60,0x7f,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x44,0xff,0x30,0x60,0x7f,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x45,0xff,0x30,0x60,0x7f,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x46,0xff,0x30,0x60,0x7f,0x78,
-0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x87,0x7c,0x08,0x60,0x12,0x64,0x80,0x29,
-0xa0,0xd9,0x47,0xff,0x30,0x60,0x7f,0x78,0x93,0x6f,0xa6,0x6f,0xcc,0x3f,0xb3,0x50,
-0xe4,0x67,0xbf,0x64,0x4e,0x2d,0x53,0x56,0x38,0x68,0xd0,0x58,0xa4,0x6f,0xa4,0x6f,
-0xa4,0x6f,0xa4,0x6f,0xa4,0x6f,0xa4,0x6f,0xa4,0x6f,0xa4,0x6f,0xa4,0x6f,0xa4,0x6f,
-0xa4,0x6f,0xa4,0x6f,0x8e,0x11,0x00,0x0a,0x10,0x01,0x68,0xa4,0xb0,0x01,0x84,0x01,
-0x30,0x33,0x31,0x33,0x44,0x44,0x30,0x33,0x31,0x33,0x30,0x33,0x31,0x33,0x32,0x33,
-0x32,0x33,0x90,0x00,0x78,0x04,0xae,0xe4,0xcc,0x3d,0xb5,0x3d,0xb0,0x33,0x46,0x34,
-0x03,0xfc,0xe7,0x34,0xe1,0x36,0xc6,0x17,0x02,0x00,0x04,0xfc,0xe7,0x34,0x13,0x35,
-0xe4,0x16,0x22,0x00,0x07,0xfc,0xe7,0x34,0x13,0x35,0x92,0x00,0x02,0x00,0x0e,0xfc,
-0xe7,0x34,0xfd,0x36,0x10,0x17,0x22,0x00,0x00,0xfc,0xe7,0x34,0x13,0x35,0xc0,0x16,
-0x02,0x00,0x01,0xfc,0xe7,0x34,0x04,0x35,0xb6,0x16,0x06,0x00,0x02,0xfc,0xe7,0x34,
-0x04,0x35,0xc2,0x16,0x22,0x00,0x05,0xfc,0xe7,0x34,0x13,0x35,0xbe,0x16,0x02,0x00,
-0x09,0xfc,0xe7,0x34,0x7e,0x37,0x06,0x17,0x02,0x00,0x0a,0xfc,0xe7,0x34,0x13,0x35,
-0x08,0x17,0x02,0x00,0x0b,0xfc,0xe7,0x34,0x13,0x35,0x0a,0x17,0x02,0x00,0x0c,0xfc,
-0xe7,0x34,0x13,0x35,0x0c,0x17,0x02,0x00,0x0f,0xfc,0xe7,0x34,0x13,0x35,0x5e,0x17,
-0x02,0x00,0x19,0xfd,0xe7,0x34,0x13,0x35,0x70,0x17,0x02,0x00,0xb0,0xfc,0xe7,0x34,
-0x13,0x35,0xbe,0x01,0x02,0x00,0x1a,0xfd,0xe7,0x34,0x13,0x35,0x3a,0x17,0x02,0x00,
-0x8e,0xfc,0xe7,0x34,0x13,0x35,0x44,0x17,0x02,0x00,0xa8,0xfc,0xe7,0x34,0x13,0x35,
-0x46,0x17,0x02,0x00,0xb3,0xfc,0xe7,0x34,0x13,0x35,0xdc,0x17,0x02,0x00,0xb4,0xfc,
-0xe7,0x34,0x30,0x37,0x92,0x01,0x02,0x00,0xa9,0xfc,0xe7,0x34,0xcf,0x34,0xd4,0x66,
-0x02,0x00,0xad,0xfc,0xe7,0x34,0x13,0x35,0x6a,0x00,0x02,0x00,0xaa,0xfc,0xe7,0x34,
-0x13,0x35,0xc2,0x01,0x02,0x00,0xab,0xfc,0xe7,0x34,0x13,0x35,0x76,0x67,0x02,0x00,
-0xac,0xfc,0xe7,0x34,0x13,0x35,0xf6,0x18,0x02,0x00,0xaf,0xfc,0xcf,0x34,0x39,0x39,
-0x00,0x00,0x02,0x00,0x0d,0xfc,0xe7,0x34,0x13,0x35,0x0e,0x17,0x02,0x00,0x19,0xfc,
-0xe7,0x34,0x13,0x35,0xa6,0x01,0x02,0x00,0x20,0xfc,0xe7,0x34,0x13,0x35,0xb4,0x61,
-0x06,0x00,0x21,0xfc,0xe7,0x34,0x00,0x35,0xbc,0x61,0x06,0x00,0x24,0xfc,0x13,0x35,
-0xaf,0x37,0x00,0x00,0x0e,0x00,0x25,0xfc,0x13,0x35,0xb3,0x37,0x00,0x00,0x0e,0x00,
-0x26,0xfc,0x13,0x35,0xb7,0x37,0x00,0x00,0x0e,0x00,0x27,0xfc,0x13,0x35,0xbb,0x37,
-0x00,0x00,0x0e,0x00,0x23,0xfc,0xe7,0x34,0x13,0x35,0x84,0x00,0x02,0x00,0x28,0xfc,
-0xd7,0x37,0xe3,0x37,0x00,0x00,0x06,0x00,0x2a,0xfc,0xe7,0x34,0x13,0x35,0xfa,0x00,
-0x02,0x00,0x2b,0xfc,0xe7,0x34,0xe3,0x34,0x78,0x01,0x02,0x00,0x2c,0xfc,0xe7,0x34,
-0x11,0x38,0xd8,0x66,0x02,0x00,0x2d,0xfc,0xe7,0x34,0x02,0x38,0xaa,0x01,0x02,0x00,
-0x2e,0xfc,0xe7,0x34,0x13,0x35,0xa8,0x66,0x02,0x00,0x3a,0xfc,0xe7,0x34,0x13,0x35,
-0x06,0x67,0x04,0x00,0x80,0xfc,0x29,0x35,0x3c,0x35,0x5e,0x58,0xc0,0x00,0x81,0xfc,
-0xe7,0x34,0x13,0x35,0x8c,0x01,0x02,0x00,0x82,0xfc,0xe7,0x34,0x13,0x35,0x8e,0x01,
-0x02,0x00,0x83,0xfc,0xe7,0x34,0x13,0x35,0x90,0x01,0x02,0x00,0x84,0xfc,0xe7,0x34,
-0x30,0x37,0x92,0x01,0x02,0x00,0x85,0xfc,0xe7,0x34,0x1c,0x37,0x1e,0x59,0x02,0x00,
-0x87,0xfc,0xe7,0x34,0x13,0x35,0x7c,0x17,0x02,0x00,0x88,0xfc,0xe7,0x34,0x13,0x35,
-0x7a,0x17,0x02,0x00,0x89,0xfc,0xe7,0x34,0x13,0x35,0x34,0x17,0x02,0x00,0x8a,0xfc,
-0xe7,0x34,0x13,0x35,0xdc,0x17,0x02,0x00,0x8b,0xfc,0xe7,0x34,0x13,0x35,0x00,0x01,
-0x02,0x00,0x8c,0xfc,0xe7,0x34,0x2d,0x38,0x7e,0x17,0x02,0x00,0xa5,0xfc,0xe7,0x34,
-0x8a,0x37,0x74,0x17,0x02,0x00,0xa6,0xfc,0xcf,0x34,0x72,0x37,0x00,0x00,0x02,0x00,
-0x18,0xfc,0xe7,0x34,0x13,0x35,0xbc,0x16,0x02,0x00,0xae,0xfc,0xe7,0x34,0x13,0x35,
-0xbc,0x01,0x02,0x00,0x2f,0xfc,0xe7,0x34,0x13,0x35,0xac,0x01,0x02,0x00,0x30,0xfc,
-0xcf,0x34,0x4b,0x38,0x00,0x00,0x14,0x00,0x31,0xfc,0xcf,0x34,0xae,0x38,0x00,0x00,
-0x06,0x00,0x10,0xfd,0xe7,0x34,0xe3,0x34,0x4a,0x01,0x02,0x00,0x11,0xfd,0x81,0x36,
-0xe3,0x34,0x4c,0xe8,0x0c,0x00,0x12,0xfd,0x81,0x36,0xe3,0x34,0x5a,0xe8,0x02,0x00,
-0x13,0xfd,0x41,0x36,0xe3,0x34,0x00,0x04,0xe0,0x01,0x14,0xfd,0xe7,0x34,0xe3,0x34,
-0x38,0x17,0x02,0x00,0x15,0xfd,0xe7,0x34,0xe3,0x34,0x82,0x17,0x24,0x00,0x16,0xfd,
-0xe7,0x34,0xe3,0x34,0x60,0x17,0x10,0x00,0x17,0xfd,0xe7,0x34,0xe3,0x34,0x5c,0x17,
-0x02,0x00,0x18,0xfd,0xe7,0x34,0xe3,0x34,0x76,0x17,0x04,0x00,0x1b,0xfd,0xe7,0x34,
-0xe3,0x34,0x72,0x17,0x02,0x00,0x1c,0xfd,0xe7,0x34,0xe3,0x34,0x3e,0x00,0x02,0x00,
-0x24,0xfd,0xe7,0x34,0xe3,0x34,0xaa,0x17,0x0c,0x00,0x25,0xfd,0xe7,0x34,0xe3,0x34,
-0xb8,0x17,0x0c,0x00,0x26,0xfd,0x81,0x36,0xe3,0x34,0x74,0xe8,0x20,0x00,0x27,0xfd,
-0x81,0x36,0xe3,0x34,0x94,0xe8,0x38,0x00,0x45,0xfd,0xe7,0x34,0xe3,0x34,0x00,0x01,
-0x02,0x00,0x47,0xfd,0xe7,0x34,0xe3,0x34,0x4e,0x01,0x02,0x00,0x48,0xfd,0xa2,0x36,
-0xe3,0x34,0x6c,0x01,0x02,0x00,0x49,0xfd,0xa2,0x36,0xe3,0x34,0x6e,0x01,0x02,0x00,
-0x4a,0xfd,0xe7,0x34,0xe3,0x34,0xe0,0x17,0x02,0x00,0x4b,0xfd,0xe7,0x34,0xe3,0x34,
-0xe2,0x17,0x02,0x00,0x4d,0xfd,0x81,0x36,0xe3,0x34,0x5c,0xe8,0x04,0x00,0x50,0xfd,
-0xe7,0x34,0xe3,0x34,0xb2,0x59,0x12,0x00,0x4f,0xfd,0x81,0x36,0xe3,0x34,0x58,0xe8,
-0x02,0x00,0xc0,0xfd,0x81,0x36,0xe3,0x34,0x60,0xe8,0x02,0x00,0xc1,0xfd,0xe7,0x34,
-0xe3,0x34,0xfe,0x00,0x02,0x00,0xc2,0xfd,0xb0,0x36,0xe3,0x34,0x00,0x00,0x02,0x00,
-0xc3,0xfd,0x81,0x36,0xe3,0x34,0x62,0xe8,0x02,0x00,0xc6,0xfd,0xe7,0x34,0xe3,0x34,
-0xd2,0x17,0x0a,0x00,0x20,0xfd,0x68,0x36,0xe3,0x34,0x3a,0xe8,0x08,0x00,0x21,0xfd,
-0x68,0x36,0xe3,0x34,0x42,0xe8,0x0a,0x00,0x22,0xfd,0x68,0x36,0xe3,0x34,0x1c,0xe8,
-0x0a,0x00,0x23,0xfd,0x68,0x36,0xe3,0x34,0x30,0xe8,0x0a,0x00,0x40,0xfd,0xe7,0x34,
-0xe3,0x34,0x96,0x01,0x02,0x00,0x41,0xfd,0xe7,0x34,0xe3,0x34,0x20,0x59,0x22,0x00,
-0x42,0xfd,0xe7,0x34,0x0e,0x35,0x02,0x01,0x06,0x00,0x43,0xfd,0xcb,0x36,0xe3,0x34,
-0x00,0x00,0x06,0x00,0x44,0xfd,0xc0,0x36,0xe3,0x34,0xa0,0x00,0x02,0x00,0x46,0xfd,
-0xe7,0x34,0xe3,0x34,0x84,0x01,0x0c,0x00,0x4c,0xfd,0xe7,0x34,0xe3,0x34,0xca,0x18,
-0x02,0x00,0x8d,0xfc,0xe7,0x34,0xe3,0x34,0x8e,0x00,0x02,0x00,0x8f,0xfc,0xe7,0x34,
-0xe3,0x34,0x80,0x17,0x02,0x00,0xa7,0xfc,0xe7,0x34,0xe3,0x34,0xc6,0x66,0x04,0x00,
-0xfe,0xff,0x81,0x36,0xe3,0x34,0x64,0xe8,0x02,0x00,0xff,0xff,0x81,0x36,0xe3,0x34,
-0x66,0xe8,0x0e,0x00,0x00,0xf1,0x2a,0x00,0xc3,0x35,0x01,0xf1,0x80,0x08,0x92,0x35,
-0x02,0xf1,0x80,0x08,0xca,0x35,0x03,0xf1,0x96,0x00,0x03,0x39,0x04,0xf1,0x90,0x1a,
-0x05,0x36,0xd8,0x1a,0x91,0x19,0x96,0x19,0x5e,0x1a,0xb3,0x1a,0x0e,0x1a,0x6d,0x19,
-0x16,0x1a,0x1e,0x1a,0xdb,0x19,0x59,0x19,0xca,0x1a,0xca,0x1a,0x30,0x24,0x5c,0x24,
-0x59,0x24,0x7a,0x23,0x5c,0x24,0x5c,0x24,0x00,0x00,0x62,0x24,0x62,0x24,0x62,0x24,
-0x00,0x00,0x00,0x00,0xec,0x24,0x05,0x25,0x7b,0x23,0x00,0x00,0x77,0x24,0x00,0x00,
-0x00,0x00,0x9b,0x16,0x00,0x02,0x48,0x04,0x48,0x06,0x80,0x08,0x03,0x0a,0x04,0x0c,
-0x04,0x0e,0x00,0x10,0xe4,0x12,0xbb,0x14,0x1b,0x16,0x00,0x18,0x00,0x1a,0x00,0x1c,
-0x5c,0x1e,0xc1,0x20,0x20,0x22,0x74,0x24,0x07,0x26,0x0a,0x28,0x16,0x2a,0x00,0x2c,
-0x00,0x2e,0x1c,0x30,0x20,0x32,0x98,0x34,0x08,0x36,0x7a,0x38,0x0a,0x3a,0x24,0x3c,
-0xb2,0x3e,0x00,0x40,0x00,0x42,0x00,0x44,0x0c,0x46,0x26,0x48,0x5b,0x4a,0x7f,0x4c,
-0x29,0x4e,0x0f,0x50,0x20,0x52,0x20,0x54,0x10,0x56,0x10,0x58,0x10,0x5a,0x10,0x5c,
-0x1e,0x5e,0x1a,0x60,0x18,0x62,0x00,0x2c,0x0c,0x2e,0x01,0x2c,0x10,0x2e,0x02,0x2c,
-0x14,0x2e,0x03,0x2c,0x18,0x2e,0x04,0x2c,0x1c,0x2e,0x05,0x2c,0x20,0x2e,0x06,0x2c,
-0x24,0x2e,0x07,0x2c,0x28,0x2e,0x08,0x2c,0x2e,0x2e,0x09,0x2c,0x34,0x2e,0x0a,0x2c,
-0x38,0x2e,0x0b,0x2c,0x3c,0x2e,0x0c,0x2c,0x3f,0x2e,0x0d,0x2c,0x43,0x2e,0x0e,0x2c,
-0x46,0x2e,0x0f,0x2c,0x48,0x2e,0x10,0x2c,0x4b,0x2e,0x11,0x2c,0x50,0x2e,0x12,0x2c,
-0x55,0x2e,0x13,0x2c,0x5a,0x2e,0x14,0x2c,0x63,0x2e,0x15,0x2c,0x6d,0x2e,0x16,0x2c,
-0x76,0x2e,0x17,0x2c,0x7f,0x2e,0x18,0x2c,0x7f,0x2e,0x19,0x2c,0x7f,0x2e,0x1a,0x2c,
-0x7f,0x2e,0x1b,0x2c,0x7f,0x2e,0x1c,0x2c,0x7f,0x2e,0x1d,0x2c,0x7f,0x2e,0x1e,0x2c,
-0x7f,0x2e,0x1f,0x2c,0x7f,0x2e,0x00,0x02,0x01,0x04,0x38,0x06,0x80,0x08,0x03,0x0a,
-0x04,0x0c,0x04,0x0e,0x00,0x10,0xa2,0x12,0xc8,0x14,0x1b,0x16,0x00,0x18,0x00,0x1a,
-0x00,0x1c,0x5c,0x1e,0xc1,0x20,0x1e,0x22,0x54,0x24,0x07,0x26,0x6a,0x28,0x12,0x2a,
-0x00,0x2c,0x00,0x2e,0x1c,0x30,0x20,0x32,0x82,0x34,0x08,0x36,0x7a,0x38,0xca,0x3a,
-0x24,0x3c,0xb6,0x3e,0x00,0x40,0x00,0x42,0x00,0x44,0x7f,0x46,0x8b,0x48,0x0f,0x4a,
-0x06,0x4c,0x0a,0x4e,0x0f,0x50,0x20,0x52,0x20,0x54,0x10,0x56,0x10,0x58,0x20,0x5a,
-0xee,0x5c,0x1a,0x5e,0x26,0x60,0x5b,0x62,0x00,0x04,0x00,0x2c,0x0c,0x2e,0x01,0x2c,
-0x10,0x2e,0x02,0x2c,0x14,0x2e,0x03,0x2c,0x18,0x2e,0x04,0x2c,0x1c,0x2e,0x05,0x2c,
-0x20,0x2e,0x06,0x2c,0x24,0x2e,0x07,0x2c,0x28,0x2e,0x08,0x2c,0x2e,0x2e,0x09,0x2c,
-0x34,0x2e,0x0a,0x2c,0x38,0x2e,0x0b,0x2c,0x3c,0x2e,0x0c,0x2c,0x3f,0x2e,0x0d,0x2c,
-0x43,0x2e,0x0e,0x2c,0x46,0x2e,0x0f,0x2c,0x48,0x2e,0x10,0x2c,0x4b,0x2e,0x11,0x2c,
-0x50,0x2e,0x12,0x2c,0x55,0x2e,0x13,0x2c,0x5a,0x2e,0x14,0x2c,0x63,0x2e,0x15,0x2c,
-0x6d,0x2e,0x16,0x2c,0x76,0x2e,0x17,0x2c,0x7f,0x2e,0x18,0x2c,0x7f,0x2e,0x19,0x2c,
-0x7f,0x2e,0x1a,0x2c,0x7f,0x2e,0x1b,0x2c,0x7f,0x2e,0x1c,0x2c,0x7f,0x2e,0x1d,0x2c,
-0x7f,0x2e,0x1e,0x2c,0x7f,0x2e,0x1f,0x2c,0x7f,0x2e,0x00,0x00,0x04,0x00,0x65,0x00,
-0x00,0x00,0x00,0x00,0x67,0x00,0x00,0x00,0x00,0x00,0xb0,0x00,0x00,0x00,0x5c,0x00,
-0x32,0x00,0x00,0x00,0x04,0x00,0x65,0x00,0x00,0x00,0x00,0x00,0xb0,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x7e,0x00,0x5a,0x00,0x00,0x00,0x7e,0x00,0x6e,0x00,
-0x00,0x00,0x80,0x00,0x02,0x00,0x00,0x00,0x80,0x00,0x16,0x00,0x00,0x00,0x80,0x00,
-0x2a,0x00,0x00,0x00,0x80,0x00,0x3e,0x00,0x00,0x00,0x80,0x00,0x52,0x00,0x00,0x00,
-0x80,0x00,0x66,0x00,0x00,0x00,0x80,0x00,0x7a,0x00,0x00,0x00,0x82,0x00,0x0e,0x00,
-0x00,0x00,0x82,0x00,0x22,0x00,0x00,0x00,0x82,0x00,0x36,0x00,0x00,0x00,0x82,0x00,
-0x4a,0x00,0x00,0x00,0x82,0x00,0x7a,0x00,0x10,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,
-0x10,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,0x1b,0x3b,0x10,0x3b,0x10,0x3b,0x30,0x3b,
-0x10,0x3b,0x10,0x3b,0x63,0x3b,0x71,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,
-0x10,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,
-0x10,0x3b,0x10,0x3b,0x10,0x3b,0x10,0x3b,0xd5,0x3b,0x24,0x3c,0x49,0x3c,0x42,0x3c,
-0x2e,0x3c,0x38,0x3c,0x10,0x3b,0x10,0x3b,0x10,0x3b,0x4b,0x3c,0x61,0x3c,0x68,0x3c,
-0x12,0x00,0x02,0x00,0x72,0x0e,0x04,0x00,0x8b,0x0e,0x06,0x00,0x39,0x0f,0x08,0x00,
-0x50,0x0f,0x0a,0x00,0x73,0x0f,0x0c,0x00,0x2e,0x10,0x12,0x00,0x3f,0x18,0x1a,0x00,
-0x75,0x25,0x00,0x09,0x16,0x0c,0x02,0x09,0x22,0x33,0x04,0x09,0x2f,0x34,0x06,0x09,
-0x72,0x34,0x14,0x09,0x34,0x31,0x16,0x09,0x50,0x31,0x42,0x09,0xb0,0x34,0x22,0x09,
-0x82,0x34,0x64,0x09,0x7a,0x34,0x70,0x09,0x02,0x3b,0x03,0x00,0x00,0x00,0x53,0x70,
-0x65,0x63,0x74,0x72,0x75,0x6d,0x32,0x34,0x2f,0x48,0x44,0x52,0x20,0x20,0x20,0x20,
-0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x14,0x00,
-0x6e,0x6f,0x6e,0x2d,0x73,0x70,0x65,0x63,0x69,0x66,0x69,0x65,0x64,0x20,0x53,0x53,
-0x49,0x44,0x20,0x21,0x21,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-0x00,0x00,0x01,0x00,0x01,0x00,0x64,0x00,0x64,0x00,0x00,0x00,0x50,0x72,0x69,0x73,
-0x6d,0x20,0x20,0x49,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x01,0x00,0x05,0x00,0x03,0x00,0x00,0x00,0x53,0x70,0x65,0x63,
-0x74,0x72,0x75,0x6d,0x32,0x34,0x2f,0x48,0x44,0x52,0x20,0x20,0x20,0x20,0x20,0x20,
-0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x14,0x00,0x6e,0x6f,
-0x6e,0x2d,0x73,0x70,0x65,0x63,0x69,0x66,0x69,0x65,0x64,0x20,0x53,0x53,0x49,0x44,
-0x20,0x21,0x21,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,
-0x01,0x00,0x01,0x00,0x64,0x00,0x64,0x00,0x00,0x00,0x50,0x72,0x69,0x73,0x6d,0x20,
-0x20,0x49,0x00,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x00,0x00,0x80,0x01,0x2c,0x00,
-0x01,0x00,0xb6,0x00,0xc0,0x00,0xd4,0x00,0xee,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,
-0x12,0x00,0x0f,0x00,0x0c,0x00,0x07,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x01,0x00,
-0x03,0x00,0x03,0x00,0x7f,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00,0x00,0x00,0x2a,0x1b,
-0x20,0x1d,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x00,0x20,0x20,0x53,0x74,0x61,0x6e,
-0x64,0x61,0x72,0x64,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x46,0x33,0x2e,0x31,0x30,0x2d,0x30,0x34,0x00,0x00,0x00,0x00,0x00,0x00,
-0x30,0x31,0x2f,0x31,0x37,0x2f,0x32,0x30,0x30,0x32,0x00,0x00,0x00,0x00,0x01,0x00,
-0x04,0x00,0x82,0x84,0x8b,0x96,0x00,0x00,0x00,0x00,0x04,0x00,0x02,0x04,0x0b,0x16,
-0x00,0x00,0x00,0x00,0x0f,0x00,0x00,0x00,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x60,0x1f,0xe0,0x27,0x3f,0x3f,0x49,0x6e,0x74,0x27,0x6c,0x2d,
-0x73,0x65,0x61,0x72,0x63,0x68,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
-0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x7d,0x00,
-0x04,0x00,0xfa,0x00,0xc8,0x00,0xf4,0x01,0x05,0x00,0x07,0x00,0xfa,0x00,0xc8,0x00,
-0x2c,0x01,0x05,0x00,0x0a,0x00,0xfa,0x00,0x32,0x00,0x64,0x00,0x05,0x00,0x0a,0x00,
-0xfa,0x00,0x32,0x00,0x32,0x00,0x05,0x00,0x0a,0x00,0xfa,0x00,0x19,0x00,0x19,0x00,
-0x05,0x00,0x35,0x44,0x5d,0x65,0xf7,0x98,0xd9,0x6e,0x42,0xf7,0xb8,0x74,0xdc,0x15,
-0xfc,0xf8,0x82,0x05,0x79,0xf3,0x09,0x59,0x97,0x30,0xee,0x53,0x7b,0x83,0x15,0x46,
-0xbd,0x2c,0xd1,0x91,0x43,0x08,0x1e,0x7f,0xc9,0x60,0x53,0x68,0xf4,0xd2,0x88,0x06,
-0x22,0x14,0x39,0x09,0xf5,0x9f,0x05,0x27,0x74,0xfe,0xec,0x75,0x1f,0x42,0xf2,0x0c,
-0xae,0xb0,0x1b,0xfd,0xb5,0x76,0x03,0x39,0xfa,0x8f,0x7f,0x00,0xe0,0x04,0x35,0x2a,
-0x7f,0x42,0x2f,0x45,0xd9,0xd4,0x49,0xe6,0xf8,0xd9,0x86,0xee,0x78,0x42,0xca,0x54,
-0x39,0x10,0x17,0x89,0x15,0xfc,0xcd,0x61,0x9c,0x76,0xdc,0xbe,0x02,0x0a,0x46,0xb6,
-0xea,0xad,0x47,0xaa,0x89,0x11,0x97,0xf1,0x0b,0xec,0x22,0x6d,0xf3,0x33,0xd3,0xef,
-0x02,0x6f,0x58,0xb8,0x73,0x50,0x2a,0x8b,0xe8,0x3a,0x53,0xa8,0xe9,0x09,0xbf,0xbc,
-0x57,0x47,0x83,0xdb,0x5e,0xb1,0x62,0x82,0x5c,0xb2,0x71,0x5f,0x23,0x67,0xfd,0xcb,
-0xe0,0xd1,0x0d,0xe8,0xab,0x44,0x33,0x0f,0x4c,0x76,0x92,0x32,0x65,0xb1,0x7e,0xca,
-0xed,0x21,0x5e,0x45,0xba,0x92,0xa4,0x67,0x67,0x9e,0x23,0x33,0x8e,0x6a,0xa1,0xe9,
-0x94,0x3a,0x39,0xef,0x34,0xb3,0x65,0x96,0x3b,0x6e,0x46,0xbd,0xd0,0xc3,0x22,0x87,
-0x54,0xad,0xbc,0x89,0xd6,0x3a,0x3a,0x99,0xe0,0x89,0x0e,0xcf,0xfe,0xa3,0x0a,0x1a,
-0x68,0x6f,0xcb,0xd7,0xa6,0x25,0xd1,0x25,0x4d,0xc0,0x86,0xd8,0x9b,0xf7,0xe2,0xd5,
-0xf7,0xa3,0x0c,0x33,0xe3,0x83,0x87,0xff,0x4c,0x9d,0xd6,0xd6,0x89,0x9a,0x0c,0x38,
-0xa0,0xe8,0xef,0x52,0x1b,0x0e,0xbb,0x52,0xbc,0x9f,0xde,0xbf,0x1a,0xc8,0xf0,0xd0,
-0xd9,0x54,0xc2,0x6c,0x53,0xa8,0x1b,0xc4,0x17,0x42,0x1d,0x51,0x2e,0xc8,0x8e,0xe7,
-0x63,0x5c,0x00,0xd6,0xc5,0x0d,0xcd,0xeb,0xab,0x59,0x13,0xf3,0x02,0x82,0x0c,0x2c,
-0x36,0x3c,0xe7,0x21,0xb8,0xf9,0x57,0x67,0xdd,0xae,0x1d,0x6e,0x39,0x06,0xe2,0xd2,
-0x16,0x1f,0x8e,0x2c,0xec,0x5f,0x71,0xf1,0x01,0x8b,0x6b,0x52,0x72,0x04,0x49,0xa8,
-0x8b,0xa7,0x27,0xe3,0x3c,0xfa,0x55,0x45,0x94,0x54,0xcc,0x68,0xc9,0xf9,0x35,0xa8,
-0xa5,0x8c,0xa2,0x5c,0xb8,0x7f,0x24,0xe5,0x6e,0x15,0xe4,0xdd,0x97,0xf2,0xe8,0x84,
-0xf9,0xcf,0x92,0x98,0x70,0x25,0x24,0xf3,0x6a,0x39,0x15,0x11,0xa0,0x40,0xa2,0x99,
-0x58,0x7a,0xa2,0x9b,0x2a,0xb2,0x74,0xa4,0x7d,0x2d,0x7e,0x5e,0x0e,0xf5,0x59,0x37,
-0xf6,0x50,0x9f,0x06,0xf3,0x0d,0x03,0x87,0xcc,0x18,0xb5,0xca,0x44,0xf1,0x57,0x55,
-0xe2,0x5f,0x8c,0x82,0x6c,0x1e,0xb2,0x83,0x40,0x0f,0xef,0x6d,0x61,0x34,0x9d,0x8f,
-0x68,0x59,0xcb,0x22,0x9b,0x29,0x55,0x1a,0x87,0x3f,0x64,0x22,0x4a,0xbd,0x6c,0x7c,
-0x0e,0xc3,0x89,0x5d,0x2a,0x86,0xa2,0xb6,0xf5,0xa3,0xd8,0x36,0x90,0x08,0x95,0xee,
-0xca,0xb4,0x95,0xcc,0xa1,0x8b,0x98,0xc7,0x48,0xfd,0xa7,0xce,0xd6,0xc5,0x3b,0x7a,
-0x2e,0x3a,0x0e,0xf8,0x11,0x63,0xef,0xb5,0xd1,0x10,0xed,0x67,0xb7,0x25,0x26,0x23,
-0x2d,0xdb,0x8b,0xf8,0x50,0x8d,0xd1,0x2c,0x32,0x14,0xe5,0x92,0xd8,0x88,0x31,0x82,
-0x7c,0xa1,0x6e,0x59,0xf1,0x54,0xb7,0x6f,0xfa,0x00,0xe4,0x59,0xe8,0x59,0xec,0x59,
-0xf0,0x59,0xf4,0x59,0x00,0x5a,0x04,0x5a,0x08,0x5a,0x14,0x5a,0x18,0x5a,0x3e,0x5a,
-0x42,0x5a,0x46,0x5a,0x4a,0x5a,0x4e,0x5a,0x5a,0xda,0x3e,0x67,0x3e,0x67,0x3e,0x67,
-0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x5c,0xda,0x5e,0x5a,
-0x3e,0xe7,0x3e,0xe7,0x62,0x5a,0x66,0x5a,0x3e,0x67,0x70,0x5a,0x74,0x5a,0x78,0x5a,
-0x7c,0x5a,0x88,0x5a,0x8c,0x5a,0x90,0x5a,0x9c,0x5a,0xa0,0x5a,0xca,0x5a,0xce,0x5a,
-0xd2,0x5a,0xd6,0x5a,0xda,0x5a,0xe6,0x5a,0x3e,0x67,0x3e,0xe7,0xfa,0x5a,0xfe,0xda,
-0x00,0xdb,0x02,0xdb,0x04,0xdb,0x06,0x5b,0x3e,0xe7,0x0a,0x5b,0x0e,0xdb,0x10,0xdb,
-0x12,0xdb,0x14,0xdb,0x16,0xdb,0x18,0xdb,0x3e,0xe7,0x3e,0xe7,0x1a,0xdb,0x1c,0xdb,
-0x1e,0xdb,0x20,0xdb,0x24,0x5b,0x28,0x5b,0x2c,0x5b,0x30,0x5b,0x34,0xdb,0x36,0xdb,
-0x8e,0x59,0x92,0x59,0x9c,0xd9,0x9e,0xd9,0x3e,0xe7,0x88,0xd9,0x8a,0xd9,0x8c,0xd9,
-0xa6,0xd9,0xa8,0xd9,0xaa,0xd9,0xb4,0xd9,0xb6,0xd9,0xbe,0xd9,0xa0,0xd9,0xa2,0xd9,
-0xa4,0xd9,0xc0,0xd9,0xc2,0xd9,0xc4,0xd9,0xc6,0xd9,0xc8,0xd9,0xca,0xd9,0xd0,0xd9,
-0xd2,0xd9,0xd4,0xd9,0xd6,0xd9,0xd8,0xd9,0xda,0xd9,0xdc,0xd9,0xde,0xd9,0xe0,0xd9,
-0xe2,0xd9,0x6c,0xd9,0x6e,0xd9,0x46,0xd9,0x4a,0xd9,0x4c,0xd9,0x4e,0xd9,0x50,0xd9,
-0x3e,0xe7,0x38,0x97,0x3e,0xe7,0x08,0x81,0x50,0x9e,0x5a,0xd9,0x5c,0xd9,0x3e,0xe7,
-0x5e,0xd9,0x70,0xd9,0x72,0xd9,0x3e,0xe7,0x78,0xd9,0x7a,0xd9,0x7c,0xd9,0x7e,0xd9,
-0x80,0xd9,0x82,0xd9,0x84,0xd9,0x86,0xd9,0x3a,0x5a,0x1c,0xda,0x1e,0xda,0x20,0xda,
-0x22,0xda,0x24,0xda,0x26,0x5a,0x2a,0x5a,0x2e,0x5a,0x32,0x5a,0x36,0x5a,0xc6,0x5a,
-0xa8,0xda,0xaa,0xda,0xac,0xda,0xae,0xda,0xb0,0xda,0xb2,0x5a,0xb6,0x5a,0xba,0x5a,
-0xbe,0x5a,0xc2,0x5a,0xea,0x5a,0xee,0x5a,0xac,0xd9,0xae,0xd9,0xcc,0xd9,0xce,0xd9,
-0x3e,0x67,0x42,0xd9,0x44,0xd9,0x38,0xdf,0x3e,0xe7,0x48,0xd9,0xa0,0x80,0x3e,0xe7,
-0x3e,0xe7,0x60,0xd9,0x6a,0xda,0x3e,0xe7,0xb0,0xd9,0x3a,0xdf,0x64,0xd9,0x22,0xdb,
-0x62,0xd9,0x66,0xd9,0x6c,0x5a,0x90,0x81,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,
-0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,
-0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,
-0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0x3e,0x67,0xbe,0xe6,
-0xbc,0xe6,0xb8,0xd9,0xba,0xd9,0xce,0x98,0x5c,0xe4,0x60,0xe4,0x54,0xd9,0x56,0xd9,
-0xf8,0x59,0xfc,0x59,0x0c,0x5a,0x10,0x5a,0x52,0x5a,0x56,0x5a,0x80,0x5a,0x84,0x5a,
-0x94,0x5a,0x98,0x5a,0xde,0x5a,0xe2,0x5a,0xf2,0x5a,0xf6,0x5a,0x92,0x1e,0x68,0x59,
-0x6a,0x59,0xc2,0xe1,0xc6,0xe1,0xfa,0x81,0x2c,0xbc,0x32,0xbc,0x38,0xbc,0x44,0xbc,
-0x4a,0xbc,0x68,0xbc,0x6e,0xbc,0xcc,0x98,0xb0,0x80,0xb2,0x80,0xb4,0x80,0x11,0x00,
-0x00,0x00,0x00,0x00,0xb6,0x16,0x06,0x00,0x01,0x00,0xb4,0x61,0x06,0x00,0x01,0x00,
-0xbc,0x61,0x06,0x00,0x01,0x00,0x60,0x17,0x10,0x00,0x01,0x00,0x82,0x17,0x24,0x00,
-0x01,0x00,0xaa,0x17,0x0e,0x00,0x01,0x00,0xc4,0x16,0x20,0x00,0x01,0x00,0x50,0x5b,
-0xe8,0x03,0x14,0x00,0x3c,0x5f,0x78,0x00,0x14,0x00,0x62,0x64,0xc0,0x01,0x10,0x00,
-0xd8,0x61,0x80,0x02,0x10,0x00,0x2a,0x67,0x38,0x00,0x07,0x00,0xa6,0x59,0x99,0x01,
-0x01,0x00,0xaa,0x17,0x0e,0x00,0x01,0x00,0xb8,0x17,0x0e,0x00,0x01,0x00,0x02,0x01,
-0x06,0x00,0x01,0x00,0x16,0x67,0x00,0x00,0x00,0x00,0x34,0x12,0xaa,0x55,0xe8,0x59,
-0x02,0x00,0xec,0x59,0x02,0x00,0xf0,0x59,0x02,0x00,0xf4,0x59,0x02,0x00,0x00,0x5a,
-0x02,0x00,0x04,0x5a,0x02,0x00,0x08,0x5a,0x02,0x00,0x42,0x5a,0x02,0x00,0x5a,0x5a,
-0x01,0x00,0x70,0x5a,0x02,0x00,0x74,0x5a,0x02,0x00,0x78,0x5a,0x02,0x00,0x7c,0x5a,
-0x02,0x00,0x88,0x5a,0x02,0x00,0x8c,0x5a,0x02,0x00,0x90,0x5a,0x02,0x00,0x9c,0x5a,
-0x02,0x00,0xce,0x5a,0x02,0x00,0x9c,0x59,0x01,0x00,0x9e,0x59,0x01,0x00,0x3e,0x67,
-0x01,0x00,0x8a,0x59,0x01,0x00,0xa6,0x59,0x01,0x00,0xb4,0x59,0x01,0x00,0xb6,0x59,
-0x01,0x00,0xc0,0x59,0x01,0x00,0xc2,0x59,0x01,0x00,0xc4,0x59,0x01,0x00,0xc6,0x59,
-0x01,0x00,0xc8,0x59,0x01,0x00,0xca,0x59,0x01,0x00,0x6c,0x59,0x01,0x00,0x46,0x59,
-0x01,0x00,0x3e,0x67,0x01,0x00,0x38,0x17,0x01,0x00,0xfe,0x00,0x01,0x00,0xa0,0x00,
-0x01,0x00,0xf8,0x59,0x02,0x00,0xfc,0x59,0x02,0x00,0x0c,0x5a,0x02,0x00,0x10,0x5a,
-0x02,0x00,0x80,0x5a,0x02,0x00,0x84,0x5a,0x02,0x00,0x94,0x5a,0x02,0x00,0x98,0x5a,
-0x02,0x00,0xcc,0x18,0x01,0x00,0xb0,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0xff,0xff,
-0xff,0xff,0x66,0xe8,0x7e,0x00,0x0e,0x00,0x00,0x00,0x01,0x01,0x00,0x00,0x40,0x8d,
-0x7f,0x00,0x06,0x00,0x00,0x00,0x08,0x01,0x00,0x00,0xe8,0x8d,0x7f,0x00,0x12,0x00,
-0x00,0x00,0x09,0x01,0x00,0x00,0xe6,0x8d,0x7f,0x00,0x02,0x00,0x00,0x00,0x0a,0x01,
-0x00,0x00,0xc2,0x8d,0x7f,0x00,0x02,0x00,0x00,0x00,0x0b,0x01,0x00,0x00,0x0c,0x8e,
-0x7f,0x00,0x24,0x00,0x00,0x00,0x03,0x01,0x00,0x00,0x4c,0xe8,0x7e,0x00,0x0c,0x00,
-0x00,0x00,0x04,0x01,0x00,0x00,0x0a,0x81,0x7f,0x00,0x02,0x00,0x00,0x00,0x05,0x01,
-0x00,0x00,0x46,0x8d,0x7f,0x00,0x02,0x00,0x00,0x00,0x05,0x01,0x00,0x00,0x40,0x81,
-0x7f,0x00,0x02,0x00,0x00,0x00,0x05,0x01,0x00,0x00,0x50,0x8e,0x7f,0x00,0x02,0x00,
-0x00,0x00,0x06,0x01,0x00,0x00,0x58,0xe8,0x7e,0x00,0x02,0x00,0x00,0x00,0x07,0x01,
-0x00,0x00,0x5a,0xe8,0x7e,0x00,0x02,0x00,0x00,0x00,0x06,0x00,0x00,0x00,0x26,0xe8,
-0x7e,0x00,0x0a,0x00,0x00,0x00,0x09,0x00,0x00,0x00,0xbe,0x8d,0x7f,0x00,0x02,0x00,
-0x00,0x00,0x0a,0x00,0x00,0x00,0xc0,0x8d,0x7f,0x00,0x02,0x00,0x00,0x00,0x0c,0x01,
-0x00,0x00,0x38,0x81,0x7f,0x00,0x02,0x00,0x00,0x00,0x0d,0x01,0x00,0x00,0xc4,0x8d,
-0x7f,0x00,0x02,0x00,0x00,0x00,0x0e,0x01,0x00,0x00,0xfa,0x8d,0x7f,0x00,0x02,0x00,
-0x00,0x00,0x11,0x01,0x00,0x00,0xfc,0x8d,0x7f,0x00,0x02,0x00,0x00,0x00,0x00,0x18,
-0x7e,0x00,0xce,0xd0,0x00,0x00,0x01,0x00,0x00,0x00,0x05,0x00,0x01,0x00,0x21,0x00,
-0x02,0x00,0x02,0x00,0x01,0x00,0x06,0x00,0x02,0x00,0x00,0x00,0x04,0x00,0x02,0x00,
-0x01,0x00,0x01,0x00,0x06,0x00,0x02,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
-0x01,0x00,0x06,0x00,0x02,0x00,0x01,0x00,0x02,0x00,0x01,0x00,0x01,0x00,0x01,0x00,
-0x5a,0xd7
-};
-
-#endif /* _FIRMWARE_WI_SPECTRUM24T_CF_H_ */
diff --git a/include.new/devinfo.h b/include.new/devinfo.h
deleted file mode 100644
index 144b23e..0000000
--- a/include.new/devinfo.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * Copyright (c) 2000 Michael Smith
- * Copyright (c) 2000 BSDi
- * 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.
- *
- * 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: releng/10.2/lib/libdevinfo/devinfo.h 218505 2011-02-10 04:53:09Z imp $
- */
-
-#ifndef _DEVINFO_H_INCLUDED
-#define _DEVINFO_H_INCLUDED
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/bus.h>
-
-typedef __uintptr_t	devinfo_handle_t;
-#define DEVINFO_ROOT_DEVICE	((devinfo_handle_t)0)
-
-typedef enum device_state devinfo_state_t;
-
-struct devinfo_dev {
-	devinfo_handle_t	dd_handle;	/* device handle */
-	devinfo_handle_t	dd_parent;	/* parent handle */
-
-	char			*dd_name;	/* name of device */
-	char			*dd_desc;	/* device description */
-	char			*dd_drivername;	/* name of attached driver*/
-	char			*dd_pnpinfo;	/* pnp info from parent bus */
-	char			*dd_location;	/* Where bus thinks dev at */
-	uint32_t		dd_devflags;	/* API flags */
-	uint16_t		dd_flags;	/* internal dev flags */
-	devinfo_state_t		dd_state;	/* attacement state of dev */
-};
-
-struct devinfo_rman {
-	devinfo_handle_t	dm_handle;	/* resource manager handle */
-
-	unsigned long		dm_start;	/* resource start */
-	unsigned long		dm_size;	/* resource size */
-    
-	char			*dm_desc;	/* resource description */
-};
-
-struct devinfo_res {
-	devinfo_handle_t	dr_handle;	/* resource handle */
-	devinfo_handle_t	dr_rman;	/* resource manager handle */
-	devinfo_handle_t	dr_device;	/* owning device */
-
-	unsigned long		dr_start;	/* region start */
-	unsigned long		dr_size;	/* region size */
-	/* XXX add flags */
-};
-
-__BEGIN_DECLS
-
-/*
- * Acquire a coherent copy of the kernel's device and resource tables.
- * This must return success (zero) before any other interfaces will
- * function.  Sets errno on failure.
- */
-extern int	devinfo_init(void);
-
-/*
- * Release the storage associated with the internal copy of the device
- * and resource tables. devinfo_init must be called before any attempt
- * is made to use any other interfaces.
- */
-extern void	devinfo_free(void);
-
-/*
- * Find a device/resource/resource manager by its handle.
- */
-extern struct devinfo_dev
-	*devinfo_handle_to_device(devinfo_handle_t handle);
-extern struct devinfo_res
-	*devinfo_handle_to_resource(devinfo_handle_t handle);
-extern struct devinfo_rman
-	*devinfo_handle_to_rman(devinfo_handle_t handle);
-
-/*
- * Iterate over the children of a device, calling (fn) on each.  If
- * (fn) returns nonzero, abort the scan and return.
- */
-extern int
-	devinfo_foreach_device_child(struct devinfo_dev *parent, 
-	    int (* fn)(struct devinfo_dev *child, void *arg), 
-	    void *arg);
-
-/*
- * Iterate over all the resources owned by a device, calling (fn) on each.
- * If (fn) returns nonzero, abort the scan and return.
- */
-extern int
-	devinfo_foreach_device_resource(struct devinfo_dev *dev,
-	    int (* fn)(struct devinfo_dev *dev, 
-	    struct devinfo_res *res, void *arg),
-	    void *arg);
-
-/*
- * Iterate over all the resources owned by a resource manager, calling (fn)
- * on each.  If (fn) returns nonzero, abort the scan and return.
- */
-extern int
-	devinfo_foreach_rman_resource(struct devinfo_rman *rman,
-	    int (* fn)(struct devinfo_res *res, void *arg),
-	    void *arg);
-
-/*
- * Iterate over all the resource managers, calling (fn) on each.  If (fn)
- * returns nonzero, abort the scan and return.
- */
-extern int
-	devinfo_foreach_rman(int (* fn)(struct devinfo_rman *rman, void *arg),
-	    void *arg);
-
-__END_DECLS
-
-#endif /* ! _DEVINFO_H_INCLUDED */
diff --git a/include.new/devstat.h b/include.new/devstat.h
deleted file mode 100644
index ed02386..0000000
--- a/include.new/devstat.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 1997, 1998 Kenneth D. Merry.
- * 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: releng/10.2/lib/libdevstat/devstat.h 244270 2012-12-15 18:19:48Z trociny $
- */
-
-#ifndef _DEVSTAT_H
-#define _DEVSTAT_H
-#include <sys/cdefs.h>
-#include <sys/devicestat.h>
-#include <sys/resource.h>
-
-#include <kvm.h>
-
-/*
- * Bumped every time we change the userland API.  Hopefully this doesn't
- * happen very often!  This should be bumped every time we have to
- * increment SHLIB_MAJOR in the libdevstat Makefile (for non-backwards
- * compatible API changes) and should also be bumped every time we make
- * backwards-compatible API changes, so application writers have a way to 
- * determine when a particular feature is available.
- */
-#define	DEVSTAT_USER_API_VER	6
-
-#define DEVSTAT_ERRBUF_SIZE  2048 /* size of the devstat library error string */
-
-extern char devstat_errbuf[];
-
-typedef enum {
-	DEVSTAT_MATCH_NONE	= 0x00,
-	DEVSTAT_MATCH_TYPE	= 0x01,
-	DEVSTAT_MATCH_IF	= 0x02,
-	DEVSTAT_MATCH_PASS	= 0x04
-} devstat_match_flags;
-
-typedef enum {
-	DSM_NONE,
-	DSM_TOTAL_BYTES,
-	DSM_TOTAL_BYTES_READ,
-	DSM_TOTAL_BYTES_WRITE,
-	DSM_TOTAL_TRANSFERS,
-	DSM_TOTAL_TRANSFERS_READ,
-	DSM_TOTAL_TRANSFERS_WRITE,
-	DSM_TOTAL_TRANSFERS_OTHER,
-	DSM_TOTAL_BLOCKS,
-	DSM_TOTAL_BLOCKS_READ,
-	DSM_TOTAL_BLOCKS_WRITE,
-	DSM_KB_PER_TRANSFER,
-	DSM_KB_PER_TRANSFER_READ,
-	DSM_KB_PER_TRANSFER_WRITE,
-	DSM_TRANSFERS_PER_SECOND,
-	DSM_TRANSFERS_PER_SECOND_READ,
-	DSM_TRANSFERS_PER_SECOND_WRITE,
-	DSM_TRANSFERS_PER_SECOND_OTHER,
-	DSM_MB_PER_SECOND,
-	DSM_MB_PER_SECOND_READ,
-	DSM_MB_PER_SECOND_WRITE,
-	DSM_BLOCKS_PER_SECOND,
-	DSM_BLOCKS_PER_SECOND_READ,
-	DSM_BLOCKS_PER_SECOND_WRITE,
-	DSM_MS_PER_TRANSACTION,
-	DSM_MS_PER_TRANSACTION_READ,
-	DSM_MS_PER_TRANSACTION_WRITE,
-	DSM_SKIP,
-	DSM_TOTAL_BYTES_FREE,
-	DSM_TOTAL_TRANSFERS_FREE,
-	DSM_TOTAL_BLOCKS_FREE,
-	DSM_KB_PER_TRANSFER_FREE,
-	DSM_MB_PER_SECOND_FREE,
-	DSM_TRANSFERS_PER_SECOND_FREE,
-	DSM_BLOCKS_PER_SECOND_FREE,
-	DSM_MS_PER_TRANSACTION_OTHER,
-	DSM_MS_PER_TRANSACTION_FREE,
-	DSM_BUSY_PCT,
-	DSM_QUEUE_LENGTH,
-	DSM_TOTAL_DURATION,
-	DSM_TOTAL_DURATION_READ,
-	DSM_TOTAL_DURATION_WRITE,
-	DSM_TOTAL_DURATION_FREE,
-	DSM_TOTAL_DURATION_OTHER,
-	DSM_TOTAL_BUSY_TIME,
-	DSM_MAX
-} devstat_metric;
-
-struct devstat_match {
-	devstat_match_flags	match_fields;
-	devstat_type_flags	device_type;
-	int			num_match_categories;
-};
-
-struct devstat_match_table {
-	const char *		match_str;
-	devstat_type_flags	type;
-	devstat_match_flags	match_field;
-};
-
-struct device_selection {
-	uint32_t	device_number;
-	char		device_name[DEVSTAT_NAME_LEN];
-	int		unit_number;
-	int		selected;
-	u_int64_t	bytes;
-	int		position;
-};
-
-struct devinfo {
-	struct devstat	*devices;
-	u_int8_t	*mem_ptr;
-	long		generation;
-	int		numdevs;
-};
-
-struct statinfo {
-	long		cp_time[CPUSTATES];
-	long		tk_nin;
-	long		tk_nout;
-	struct devinfo	*dinfo;
-	long double 	snap_time;
-};
-
-typedef enum {
-	DS_SELECT_ADD,
-	DS_SELECT_ONLY,
-	DS_SELECT_REMOVE,
-	DS_SELECT_ADDONLY
-} devstat_select_mode;
-
-__BEGIN_DECLS
-
-int devstat_getnumdevs(kvm_t *kd);
-long devstat_getgeneration(kvm_t *kd);
-int devstat_getversion(kvm_t *kd);
-int devstat_checkversion(kvm_t *kd);
-int devstat_getdevs(kvm_t *kd, struct statinfo *stats);
-int devstat_selectdevs(struct device_selection **dev_select, int *num_selected,
-		       int *num_selections, long *select_generation, 
-		       long current_generation, struct devstat *devices,
-		       int numdevs, struct devstat_match *matches,
-		       int num_matches, char **dev_selections,
-		       int num_dev_selections, devstat_select_mode select_mode,
-		       int maxshowdevs, int perf_select);
-int devstat_buildmatch(char *match_str, struct devstat_match **matches,
-		       int *num_matches);
-int devstat_compute_statistics(struct devstat *current,
-			       struct devstat *previous,
-			       long double etime, ...);
-long double devstat_compute_etime(struct bintime *cur_time,
-				  struct bintime *prev_time);
-__END_DECLS
-
-#endif /* _DEVSTAT_H  */
diff --git a/include.new/dialog.h b/include.new/dialog.h
deleted file mode 100644
index 5580a2d..0000000
--- a/include.new/dialog.h
+++ /dev/null
@@ -1,907 +0,0 @@
-/*
- *  $Id: dialog.h 103 2016-01-12 05:32:24Z reddawg $
- *
- *  dialog.h -- common declarations for all dialog modules
- *
- *  Copyright 2000-2012,2013	Thomas E. Dickey
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License, version 2.1
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to
- *	Free Software Foundation, Inc.
- *	51 Franklin St., Fifth Floor
- *	Boston, MA 02110, USA.
- *
- *  An earlier version of this program lists as authors
- *	Savio Lam (lam836@cs.cuhk.hk)
- */
-
-#ifndef DIALOG_H_included
-#define DIALOG_H_included 1
-/* *INDENT-OFF* */
-
-#include <dlg_config.h>
-
-#ifdef __hpux
-#define __HP_CURSES_COMPAT	/* workaround for getattrs, etc. */
-#endif
-
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <signal.h>	/* fork() etc. */
-#include <math.h>	/* sqrt() */
-
-/* header conflict with Solaris xpg4 versus <sys/regset.h> */
-#if defined(ERR) && (ERR == 13)
-#undef ERR
-#endif
-
-#if defined(HAVE_NCURSESW_NCURSES_H)
-#include <ncursesw/ncurses.h>
-#elif defined(HAVE_NCURSES_NCURSES_H)
-#include <ncurses/ncurses.h>
-#elif defined(HAVE_NCURSES_CURSES_H)
-#include <ncurses/curses.h>
-#elif defined(HAVE_NCURSES_H)
-#include <ncurses.h>
-#else
-#include <curses.h>
-#if defined(HAVE_UNCTRL_H)
-#include <unctrl.h> /* most curses.h headers include this, some do not */
-#endif
-#endif
-
-/* Solaris xpg4 renames these */
-#ifndef KEY_MAX
-#ifdef __KEY_MAX
-#define KEY_MAX __KEY_MAX
-#endif
-#endif
-
-#ifndef KEY_MIN
-#ifdef __KEY_MIN
-#define KEY_MIN __KEY_MIN
-#endif
-#endif
-
-/* possible conflicts with <term.h> which may be included in <curses.h> */
-#ifdef color_names
-#undef color_names
-#endif
-
-#ifdef buttons
-#undef buttons
-#endif
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <langinfo.h>
-#define _(s) dgettext(PACKAGE, s)
-#else
-#undef _
-#define _(s) s
-#endif
-
-#ifndef GCC_PRINTFLIKE
-#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
-#endif
-
-#ifndef GCC_NORETURN
-#define GCC_NORETURN /*nothing*/
-#endif
-
-#ifndef GCC_UNUSED
-#define GCC_UNUSED /*nothing*/
-#endif
-
-#ifndef HAVE_WGET_WCH
-#undef USE_WIDE_CURSES
-#endif
-
-/*
- * FIXME: a configure check would be useful
- */
-#ifdef __hpux
-#undef ACS_UARROW
-#undef ACS_DARROW
-#undef ACS_BLOCK
-#endif
-
-/*
- * Change these if you want
- */
-#define USE_SHADOW TRUE
-#define USE_COLORS TRUE
-
-#ifdef HAVE_COLOR
-#define SCOLS	(COLS - (dialog_state.use_shadow ? 2 : 0))
-#define SLINES	(LINES - (dialog_state.use_shadow ? 1 : 0))
-#else
-#define SCOLS	COLS
-#define SLINES	LINES
-#endif
-
-#define DLG_EXIT_ESC		255
-#define DLG_EXIT_UNKNOWN	-2	/* never return this (internal use) */
-#define DLG_EXIT_ERROR		-1	/* the shell sees this as 255 */
-#define DLG_EXIT_OK		0
-#define DLG_EXIT_CANCEL		1
-#define DLG_EXIT_HELP		2
-#define DLG_EXIT_EXTRA		3
-#define DLG_EXIT_ITEM_HELP	4	/* actually DLG_EXIT_HELP */
-
-#define DLG_CTRL(n)	((n) & 0x1f)	/* CTRL is preferred, but conflicts */
-
-#define CHR_HELP	DLG_CTRL('E')
-#define CHR_BACKSPACE	DLG_CTRL('H')
-#define CHR_REPAINT	DLG_CTRL('L')
-#define CHR_KILL	DLG_CTRL('U')
-#define CHR_LITERAL	DLG_CTRL('V')
-#define CHR_DELETE	127
-#define CHR_NEXT	DLG_CTRL('N')
-#define CHR_PREVIOUS	DLG_CTRL('P')
-#define CHR_TRACE	DLG_CTRL('T')
-
-#define ESC		27
-#define TAB		DLG_CTRL('I')
-
-#define MARGIN 1
-#define GUTTER 2
-#define SHADOW_ROWS 1
-#define SHADOW_COLS 2
-#define ARROWS_COL  5
-
-#define MAX_LEN 2048
-#define BUF_SIZE (10L*1024)
-
-#undef  MIN
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-
-#undef  MAX
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-
-#define DEFAULT_SEPARATE_STR "\t"
-#define DEFAULT_ASPECT_RATIO 9
-/* how many spaces is a tab long (default)? */
-#define TAB_LEN 8
-#define WTIMEOUT_VAL        10	/* minimum amount of time needed for curses */
-
-#ifndef A_CHARTEXT
-#define A_CHARTEXT 0xff
-#endif
-
-#define CharOf(ch)  ((ch) & 0xff)
-
-#ifndef ACS_ULCORNER
-#define ACS_ULCORNER '+'
-#endif
-#ifndef ACS_LLCORNER
-#define ACS_LLCORNER '+'
-#endif
-#ifndef ACS_URCORNER
-#define ACS_URCORNER '+'
-#endif
-#ifndef ACS_LRCORNER
-#define ACS_LRCORNER '+'
-#endif
-#ifndef ACS_HLINE
-#define ACS_HLINE '-'
-#endif
-#ifndef ACS_VLINE
-#define ACS_VLINE '|'
-#endif
-#ifndef ACS_LTEE
-#define ACS_LTEE '+'
-#endif
-#ifndef ACS_RTEE
-#define ACS_RTEE '+'
-#endif
-#ifndef ACS_UARROW
-#define ACS_UARROW '^'
-#endif
-#ifndef ACS_DARROW
-#define ACS_DARROW 'v'
-#endif
-#ifndef ACS_BLOCK
-#define ACS_BLOCK '#'
-#endif
-
-/* these definitions may work for antique versions of curses */
-#ifndef HAVE_GETBEGYX
-#undef  getbegyx
-#define getbegyx(win,y,x)	(y = (win)?(win)->_begy:ERR, x = (win)?(win)->_begx:ERR)
-#endif
-
-#ifndef HAVE_GETMAXYX
-#undef  getmaxyx
-#define getmaxyx(win,y,x)	(y = (win)?(win)->_maxy:ERR, x = (win)?(win)->_maxx:ERR)
-#endif
-
-#ifndef HAVE_GETPARYX
-#undef  getparyx
-#define getparyx(win,y,x)	(y = (win)?(win)->_pary:ERR, x = (win)?(win)->_parx:ERR)
-#endif
-
-#if !defined(HAVE_WGETPARENT) && defined(HAVE_WINDOW__PARENT)
-#undef  wgetparent
-#define wgetparent(win)		((win) ? (win)->_parent : 0)
-#endif
-
-#if !defined(HAVE_WSYNCUP)
-#undef wsyncup
-#define wsyncup(win) /* nothing */
-#endif
-
-#if !defined(HAVE_WCURSYNCUP)
-#undef wcursyncup
-#define wcursyncup(win) /* nothing */
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* these definitions may be needed for bleeding-edge curses implementations */
-#if !(defined(HAVE_GETBEGX) && defined(HAVE_GETBEGY))
-#undef getbegx
-#undef getbegy
-#define getbegx(win) dlg_getbegx(win)
-#define getbegy(win) dlg_getbegy(win)
-extern int dlg_getbegx(WINDOW * /*win*/);
-extern int dlg_getbegy(WINDOW * /*win*/);
-#endif
-
-#if !(defined(HAVE_GETCURX) && defined(HAVE_GETCURY))
-#undef getcurx
-#undef getcury
-#define getcurx(win) dlg_getcurx(win)
-#define getcury(win) dlg_getcury(win)
-extern int dlg_getcurx(WINDOW * /*win*/);
-extern int dlg_getcury(WINDOW * /*win*/);
-#endif
-
-#if !(defined(HAVE_GETMAXX) && defined(HAVE_GETMAXY))
-#undef getmaxx
-#undef getmaxy
-#define getmaxx(win) dlg_getmaxx(win)
-#define getmaxy(win) dlg_getmaxy(win)
-extern int dlg_getmaxx(WINDOW * /*win*/);
-extern int dlg_getmaxy(WINDOW * /*win*/);
-#endif
-
-#if !(defined(HAVE_GETPARX) && defined(HAVE_GETPARY))
-#undef getparx
-#undef getpary
-#define getparx(win) dlg_getparx(win)
-#define getpary(win) dlg_getpary(win)
-extern int dlg_getparx(WINDOW * /*win*/);
-extern int dlg_getpary(WINDOW * /*win*/);
-#endif
-
-#if !(defined(HAVE_WGETPARENT) && defined(HAVE_WINDOW__PARENT))
-#undef wgetparent
-#define wgetparent(win) dlg_wgetparent(win)
-extern WINDOW * dlg_wgetparent(WINDOW * /*win*/);
-#endif
-
-/*
- * This is a list of "old" names, which should be helpful in updating
- * applications that use libdialog.  Starting with 2003/11/26, all exported
- * symbols from libdialog have "dlg_" prefix, or "dialog_" prefix or "_dialog"
- * suffix (or suffix "_dialog", e.g., init_dialog).
- */
-#ifdef __DIALOG_OLD_NAMES__
-#define color_table                       dlg_color_table
-#define attr_clear(win,h,w,a)             dlg_attr_clear(win,h,w,a)
-#define auto_size(t,s,h,w,xl,mc)          dlg_auto_size(t,s,h,w,xl,mc)
-#define auto_sizefile(t,f,h,w,xl,mc)      dlg_auto_sizefile(t,f,h,w,xl,mc)
-#define beeping()                         dlg_beeping()
-#define box_x_ordinate(w)                 dlg_box_x_ordinate(w)
-#define box_y_ordinate(h)                 dlg_box_y_ordinate(h)
-#define calc_listh(h,lh,in)               dlg_calc_listh(h,lh,in)
-#define calc_listw(in,items,group)        dlg_calc_listw(in,items,group)
-#define color_setup()                     dlg_color_setup()
-#define create_rc(f)                      dlg_create_rc(f)
-#define ctl_size(h,w)                     dlg_ctl_size(h,w)
-#define del_window(win)                   dlg_del_window(win)
-#define dialog_clear()                    dlg_clear()
-#define draw_bottom_box(win)              dlg_draw_bottom_box(win)
-#define draw_box(win,y,x,h,w,xc,bc)       dlg_draw_box(win,y,x,h,w,xc,bc)
-#define draw_shadow(win,h,w,y,x)          dlg_draw_shadow(win,h,w,y,x)
-#define draw_title(win,t)                 dlg_draw_title(win,t)
-#define exiterr                           dlg_exiterr
-#define killall_bg(n)                     dlg_killall_bg(n)
-#define mouse_bigregion(y,x)              dlg_mouse_bigregion(y,x)
-#define mouse_free_regions()              dlg_mouse_free_regions()
-#define mouse_mkbigregion(y,x,h,w,n,ix,iy,m) dlg_mouse_mkbigregion(y,x,h,w,n,ix,iy,m)
-#define mouse_mkregion(y,x,h,w,n)         dlg_mouse_mkregion(y,x,h,w,n)
-#define mouse_region(y,x)                 dlg_mouse_region(y,x)
-#define mouse_setbase(x,y)                dlg_mouse_setbase(x,y)
-#define mouse_setcode(c)                  dlg_mouse_setcode(c)
-#define mouse_wgetch(w,c)                 dlg_mouse_wgetch(w,c)
-#define new_window(h,w,y,x)               dlg_new_window(h,w,y,x)
-#define parse_rc()                        dlg_parse_rc()
-#define print_autowrap(win,s,h,w)         dlg_print_autowrap(win,s,h,w)
-#define print_size(h,w)                   dlg_print_size(h,w)
-#define put_backtitle()                   dlg_put_backtitle()
-#define strclone(cprompt)                 dlg_strclone(cprompt)
-#define sub_window(win,h,w,y,x)           dlg_sub_window(win,h,w,y,x)
-#define tab_correct_str(s)                dlg_tab_correct_str(s)
-#endif
-
-/*
- * Attribute names
- */
-#define DIALOG_ATR(n)                 dlg_color_table[n].atr
-
-#define screen_attr                   DIALOG_ATR(0)
-#define shadow_attr                   DIALOG_ATR(1)
-#define dialog_attr                   DIALOG_ATR(2)
-#define title_attr                    DIALOG_ATR(3)
-#define border_attr                   DIALOG_ATR(4)
-#define button_active_attr            DIALOG_ATR(5)
-#define button_inactive_attr          DIALOG_ATR(6)
-#define button_key_active_attr        DIALOG_ATR(7)
-#define button_key_inactive_attr      DIALOG_ATR(8)
-#define button_label_active_attr      DIALOG_ATR(9)
-#define button_label_inactive_attr    DIALOG_ATR(10)
-#define inputbox_attr                 DIALOG_ATR(11)
-#define inputbox_border_attr          DIALOG_ATR(12)
-#define searchbox_attr                DIALOG_ATR(13)
-#define searchbox_title_attr          DIALOG_ATR(14)
-#define searchbox_border_attr         DIALOG_ATR(15)
-#define position_indicator_attr       DIALOG_ATR(16)
-#define menubox_attr                  DIALOG_ATR(17)
-#define menubox_border_attr           DIALOG_ATR(18)
-#define item_attr                     DIALOG_ATR(19)
-#define item_selected_attr            DIALOG_ATR(20)
-#define tag_attr                      DIALOG_ATR(21)
-#define tag_selected_attr             DIALOG_ATR(22)
-#define tag_key_attr                  DIALOG_ATR(23)
-#define tag_key_selected_attr         DIALOG_ATR(24)
-#define check_attr                    DIALOG_ATR(25)
-#define check_selected_attr           DIALOG_ATR(26)
-#define uarrow_attr                   DIALOG_ATR(27)
-#define darrow_attr                   DIALOG_ATR(28)
-#define itemhelp_attr                 DIALOG_ATR(29)
-#define form_active_text_attr         DIALOG_ATR(30)
-#define form_text_attr                DIALOG_ATR(31)
-#define form_item_readonly_attr       DIALOG_ATR(32)
-#define gauge_attr                    DIALOG_ATR(33)
-#define border2_attr                  DIALOG_ATR(34)
-#define inputbox_border2_attr         DIALOG_ATR(35)
-#define searchbox_border2_attr        DIALOG_ATR(36)
-#define menubox_border2_attr          DIALOG_ATR(37)
-
-#define DLGK_max (KEY_MAX + 256)
-
-/*
- * Callbacks are used to implement the "background" tailbox.
- */
-struct _dlg_callback;
-
-typedef void (*DIALOG_FREEBACK) (struct _dlg_callback * /* p */);
-
-typedef struct _dlg_callback {
-    struct _dlg_callback *next;
-    FILE *input;
-    WINDOW *win;
-    bool keep_bg;	/* keep in background, on exit */
-    bool bg_task;	/* true if this is background task */
-    bool (*handle_getc)(struct _dlg_callback *p, int ch, int fkey, int *result);
-    bool keep_win;	/* true to not erase window on exit */
-    /* data for dlg_add_callback_ref */
-    struct _dlg_callback **caller;
-    DIALOG_FREEBACK freeback;
-    /* 1.1-20110107 */
-    bool (*handle_input)(struct _dlg_callback *p);
-    bool input_ready;
-} DIALOG_CALLBACK;
-
-typedef struct _dlg_windows {
-    struct _dlg_windows *next;
-    WINDOW *normal;
-    WINDOW *shadow;
-} DIALOG_WINDOWS;
-
-/*
- * Global variables, which are initialized as needed
- */
-typedef struct {
-    DIALOG_CALLBACK *getc_callbacks;
-    DIALOG_CALLBACK *getc_redirect;
-    DIALOG_WINDOWS *all_windows;
-    DIALOG_WINDOWS *all_subwindows;
-    FILE *output;		/* option "--output-fd fd" */
-    FILE *pipe_input;		/* used for gauge widget */
-    FILE *screen_output;	/* newterm(), etc. */
-    bool screen_initialized;
-    bool use_colors;		/* use colors by default? */
-    bool use_scrollbar;		/* option "--scrollbar" */
-    bool use_shadow;		/* shadow dialog boxes by default? */
-    bool visit_items;		/* option "--visit-items" */
-    char *separate_str;		/* option "--separate-widget string" */
-    int aspect_ratio;		/* option "--aspect ratio" */
-    int output_count;		/* # of widgets that may have done output */
-    int tab_len;		/* option "--tab-len n" */
-    /* 1.0-20070227 */
-    FILE *input;		/* option "--input-fd fd" */
-#ifdef HAVE_DLG_TRACE
-    FILE *trace_output;		/* option "--trace file" */
-#endif
-    /* 1.1-20110106 */
-    bool no_mouse;		/* option "--no-mouse" */
-    int visit_cols;		/* option "--visit-items" */
-    /* 1.2-20130922 */
-    bool finish_string;		/* caching optimization for gauge */
-} DIALOG_STATE;
-
-extern DIALOG_STATE dialog_state;
-
-/*
- * Global variables, which dialog resets before each widget
- */
-typedef struct {
-    bool beep_after_signal;	/* option "--beep-after" */
-    bool beep_signal;		/* option "--beep" */
-    bool begin_set;		/* option "--begin y x" was used */
-    bool cant_kill;		/* option "--no-kill" */
-    bool colors;		/* option "--colors" */
-    bool cr_wrap;		/* option "--cr-wrap" */
-    bool defaultno;		/* option "--defaultno" */
-    bool dlg_clear_screen;	/* option "--clear" */
-    bool extra_button;		/* option "--extra-button" */
-    bool help_button;		/* option "--help-button" */
-    bool help_status;		/* option "--help-status" */
-    bool input_menu;		/* menu vs inputmenu widget */
-    bool insecure;		/* option "--insecure" */
-    bool item_help;		/* option "--item-help" */
-    bool keep_window;		/* option "--keep-window" */
-    bool nocancel;		/* option "--no-cancel" */
-    bool nocollapse;		/* option "--no-collapse" */
-    bool print_siz;		/* option "--print-size" */
-    bool separate_output;	/* option "--separate-output" */
-    bool single_quoted;		/* option "--single-quoted" */
-    bool size_err;		/* option "--size-err" */
-    bool tab_correct;		/* option "--tab-correct" */
-    bool trim_whitespace;	/* option "--trim" */
-    char *backtitle;		/* option "--backtitle backtitle" */
-    char *cancel_label;		/* option "--cancel-label string" */
-    char *default_item;		/* option "--default-item string" */
-    char *exit_label;		/* option "--exit-label string" */
-    char *extra_label;		/* option "--extra-label string" */
-    char *help_label;		/* option "--help-label string" */
-    char *input_result;
-    char *no_label;		/* option "--no-label string" */
-    char *ok_label;		/* option "--ok-label string" */
-    char *title;		/* option "--title title" */
-    char *yes_label;		/* option "--yes-label string" */
-    int begin_x;		/* option "--begin y x" (second value) */
-    int begin_y;		/* option "--begin y x" (first value) */
-    int max_input;		/* option "--max-input size" */
-    int scale_factor;		/* RESERVED */
-    int sleep_secs;		/* option "--sleep secs" */
-    int timeout_secs;		/* option "--timeout secs" */
-    unsigned input_length;	/* nonzero if input_result is allocated */
-    /* 1.0-20051207 */
-    unsigned formitem_type;	/* DIALOG_FORMITEM.type in dialog_form() */
-    /* 1.1-20070227 */
-    bool keep_tite;		/* option "--keep-tite" */
-    bool ascii_lines;		/* option "--ascii-lines" */
-    bool no_lines;		/* option "--no-lines" */
-    /* 1.1-20070930 */
-    bool nook;			/* option "--no-ok" */
-    /* 1.1-20080727 */
-    bool quoted;		/* option "--quoted" */
-    char *column_header;	/* RESERVED "--column-header" */
-    char *column_separator;	/* option "--column-separator" */
-    char *output_separator;	/* option "--output-separator" */
-    /* 1.1-20100118 */
-    char *date_format;		/* option "--date-format" */
-    char *time_format;		/* option "--time-format" */
-    /* 1.1-20110629 */
-    char *help_line;		/* option "--hline" */
-    char *help_file;		/* option "--hfile" */
-    bool in_helpfile;		/* flag to prevent recursion in --hfile */
-    bool no_nl_expand;		/* option "--no-nl-expand" */
-    /* 1.1-20120701 */
-    int default_button;		/* option "--default-button" (exit code) */
-    /* 1.1-20121218 */
-    bool no_tags;		/* option "--no-tags" */
-    bool no_items;		/* option "--no-items" */
-    /* 1.2-20130315 */
-    bool last_key;		/* option "--last-key" */
-    /* 1.2-20130902 */
-    bool help_tags;		/* option "--help-tags" */
-} DIALOG_VARS;
-
-#define USE_ITEM_HELP(s)        (dialog_vars.item_help && (s) != 0)
-
-/*
- * Some settings change the number of data items per row which dialog reads
- * from a script.
- */
-#define DLG__NO_ITEMS		(dialog_vars.no_items ? 0 : 1)
-#define DLG__ITEM_HELP          (dialog_vars.item_help ? 1 : 0)
-
-/*
- * These are the total number of data items per row used for each widget type.
- */
-#define CHECKBOX_TAGS           (2 + DLG__ITEM_HELP + DLG__NO_ITEMS)
-#define MENUBOX_TAGS            (1 + DLG__ITEM_HELP + DLG__NO_ITEMS)
-#define FORMBOX_TAGS            (8 + DLG__ITEM_HELP)
-#define MIXEDFORM_TAGS          (1 + FORMBOX_TAGS)
-#define MIXEDGAUGE_TAGS         2
-#define TREEVIEW_TAGS           (3 + DLG__ITEM_HELP + DLG__NO_ITEMS)
-
-extern DIALOG_VARS dialog_vars;
-
-#ifndef HAVE_TYPE_CHTYPE
-#define chtype long
-#endif
-
-#define UCH(ch)			((unsigned char)(ch))
-
-#define assert_ptr(ptr,msg) if ((ptr) == 0) dlg_exiterr("cannot allocate memory in " msg)
-
-#define dlg_malloc(t,n)    (t *) malloc((size_t)(n) * sizeof(t))
-#define dlg_calloc(t,n)    (t *) calloc((size_t)(n), sizeof(t))
-#define dlg_realloc(t,n,p) (t *) realloc((p), (n) * sizeof(t))
-
-/*
- * Table for attribute- and color-values.
- */
-typedef struct {
-    chtype atr;
-#ifdef HAVE_COLOR
-    int fg;
-    int bg;
-    int hilite;
-#endif
-#ifdef HAVE_RC_FILE
-    const char *name;
-    const char *comment;
-#endif
-} DIALOG_COLORS;
-
-extern DIALOG_COLORS dlg_color_table[];
-
-/*
- * Function prototypes
- */
-extern const char *dialog_version(void);
-
-/* widgets, each in separate files */
-extern int dialog_buildlist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, char ** /*items*/, int /*order_mode*/);
-extern int dialog_calendar(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*day*/, int /*month*/, int /*year*/);
-extern int dialog_checklist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, char ** /*items*/, int /*flag*/);
-extern int dialog_dselect(const char * /*title*/, const char * /*path*/, int /*height*/, int /*width*/);
-extern int dialog_editbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/);
-extern int dialog_form(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*form_height*/, int /*item_no*/, char ** /*items*/);
-extern int dialog_fselect(const char * /*title*/, const char * /*path*/, int /*height*/, int /*width*/);
-extern int dialog_gauge(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*percent*/);
-extern int dialog_helpfile(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/);
-extern int dialog_inputbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, const char * /*init*/, const int /*password*/);
-extern int dialog_menu(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*menu_height*/, int /*item_no*/, char ** /*items*/);
-extern int dialog_mixedform(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*form_height*/, int /*item_no*/, char ** /*items*/);
-extern int dialog_mixedgauge(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*percent*/, int /*item_no*/, char ** /*items*/);
-extern int dialog_msgbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*pauseopt*/);
-extern int dialog_pause(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*seconds*/);
-extern int dialog_prgbox(const char * /*title*/, const char * /*cprompt*/, const char * /*command*/, int /*height*/, int /*width*/, int /*pauseopt*/);
-extern int dialog_progressbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/);
-extern int dialog_rangebox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/, int /*min_value*/, int /*max_value*/, int /*default_value*/);
-extern int dialog_tailbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/, int /*bg_task*/);
-extern int dialog_textbox(const char * /*title*/, const char * /*file*/, int /*height*/, int /*width*/);
-extern int dialog_timebox(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*hour*/, int /*minute*/, int /*second*/);
-extern int dialog_treeview(const char * /*title*/, const char * /*subtitle*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, char ** /*items*/, int /*flag*/);
-extern int dialog_yesno(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/);
-
-/* some widgets have alternate entrypoints, to allow list manipulation */
-typedef struct {
-    char *name;
-    char *text;
-    char *help;
-    int state;
-} DIALOG_LISTITEM;
-
-typedef struct {
-    unsigned type;		/* the field type (0=input, 1=password) */
-    char *name;			/* the field label */
-    int name_len;		/* ...its length */
-    int name_y;			/* ...its y-ordinate */
-    int name_x;			/* ...its x-ordinate */
-    bool name_free;		/* ...true if .name can be freed */
-    char *text;			/* the field contents */
-    int text_len;		/* ...its length on the screen */
-    int text_y;			/* ...its y-ordinate */
-    int text_x;			/* ...its x-ordinate */
-    int text_flen;		/* ...its length on screen, or 0 if no input allowed */
-    int text_ilen;		/* ...its limit on amount to be entered */
-    bool text_free;		/* ...true if .text can be freed */
-    char *help;			/* help-message, if any */
-    bool help_free;		/* ...true if .help can be freed */
-} DIALOG_FORMITEM;
-
-typedef	int (DIALOG_INPUTMENU) (DIALOG_LISTITEM * /*items*/, int /*current*/, char * /*newtext*/);
-
-extern int dlg_checklist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, const char * /*states*/, int /*flag*/, int * /*current_item*/);
-extern int dlg_form(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*form_height*/, int /*item_no*/, DIALOG_FORMITEM * /*items*/, int * /*current_item*/);
-extern int dlg_menu(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*menu_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, int * /*current_item*/, DIALOG_INPUTMENU /*rename_menu*/);
-extern int dlg_progressbox(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*pauseopt*/, FILE * /* fp */);
-
-/* argv.c */
-extern char ** dlg_string_to_argv(char * /* blob */);
-extern int dlg_count_argv(char ** /* argv */);
-extern int dlg_eat_argv(int * /* argcp */, char *** /* argvp */, int /* start */, int /* count */);
-
-/* arrows.c */
-extern void dlg_draw_arrows(WINDOW * /*dialog*/, int /*top_arrow*/, int /*bottom_arrow*/, int /*x*/, int /*top*/, int /*bottom*/);
-extern void dlg_draw_arrows2(WINDOW * /*dialog*/, int /*top_arrow*/, int /*bottom_arrow*/, int /*x*/, int /*top*/, int /*bottom*/, chtype /*attr*/, chtype /*borderattr*/);
-extern void dlg_draw_helpline(WINDOW * /*dialog*/, bool /*decorations*/);
-extern void dlg_draw_scrollbar(WINDOW * /*dialog*/, long /* first_data */, long /* this_data */, long /* next_data */, long /* total_data */, int /* left */, int /* right */, int /*top*/, int /*bottom*/, chtype /*attr*/, chtype /*borderattr*/);
-
-/* buildlist.c */
-extern int dlg_buildlist(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, const char * /*states*/, int /*order_mode*/, int * /*current_item*/);
-
-/* buttons.c */
-extern const char ** dlg_exit_label(void);
-extern const char ** dlg_ok_label(void);
-extern const char ** dlg_ok_labels(void);
-extern const char ** dlg_yes_labels(void);
-extern int dlg_button_count(const char ** /*labels*/);
-extern int dlg_button_to_char(const char * /*label*/);
-extern int dlg_button_x_step(const char ** /*labels*/, int /*limit*/, int * /*gap*/, int * /*margin*/, int * /*step*/);
-extern int dlg_char_to_button(int /*ch*/, const char ** /*labels*/);
-extern int dlg_exit_buttoncode(int /*button*/);
-extern int dlg_match_char(int /*ch*/, const char * /*string*/);
-extern int dlg_next_button(const char ** /*labels*/, int /*button*/);
-extern int dlg_next_ok_buttonindex(int /*current*/, int /*extra*/);
-extern int dlg_ok_buttoncode(int /*button*/);
-extern int dlg_prev_button(const char ** /*labels*/, int /*button*/);
-extern int dlg_prev_ok_buttonindex(int /*current*/, int /*extra*/);
-extern int dlg_yes_buttoncode(int /*button*/);
-extern void dlg_button_layout(const char ** /*labels*/, int * /*limit*/);
-extern void dlg_button_sizes(const char ** /*labels*/, int /*vertical*/, int * /*longest*/, int * /*length*/);
-extern void dlg_draw_buttons(WINDOW * /*win*/, int /*y*/, int /*x*/, const char ** /*labels*/, int /*selected*/, int /*vertical*/, int /*limit*/);
-
-/* columns.c */
-extern void dlg_align_columns(char ** /* target */, int  /* per_row */, int /* num_rows */);
-extern void dlg_free_columns(char ** /* target */, int  /* per_row */, int /* num_rows */);
-
-/* editbox.c */
-extern int dlg_editbox(const char * /*title*/, char *** /*list*/, int * /*rows*/, int /*height*/, int /*width*/);
-
-/* formbox.c */
-extern int dlg_default_formitem(DIALOG_FORMITEM * /*items*/);
-extern int dlg_ordinate(const char * /*s*/);
-extern void dlg_free_formitems(DIALOG_FORMITEM * /*items*/);
-
-/* guage.c */
-extern void * dlg_allocate_gauge(const char * /* title */, const char * /* cprompt */, int /* height */, int /* width */, int /* percent */);
-extern void * dlg_reallocate_gauge(void * /* objptr */, const char * /* title */, const char * /* cprompt */, int /* height */, int /* width */, int /* percent */);
-extern void dlg_free_gauge(void * /* objptr */);
-extern void dlg_update_gauge(void * /* objptr */, int /* percent */);
-
-/* inputstr.c */
-extern bool dlg_edit_string(char * /*string*/, int * /*offset*/, int /*key*/, int /*fkey*/, bool /*force*/);
-extern const int * dlg_index_columns(const char * /*string*/);
-extern const int * dlg_index_wchars(const char * /*string*/);
-extern int dlg_count_columns(const char * /*string*/);
-extern int dlg_count_wchars(const char * /*string*/);
-extern int dlg_edit_offset(char * /*string*/, int /*offset*/, int /*x_last*/);
-extern int dlg_find_index(const int * /*list*/, int  /*limit*/, int /*to_find*/);
-extern int dlg_limit_columns(const char * /*string*/, int /*limit*/, int /*offset*/);
-extern void dlg_finish_string(const char * /* string */);
-extern void dlg_show_string(WINDOW * /*win*/, const char * /*string*/, int /*offset*/, chtype /*attr*/, int /*y_base*/, int /*x_base*/, int /*x_last*/, bool /*hidden*/, bool /*force*/);
-
-/* menubox.c */
-extern int dlg_dummy_menutext(DIALOG_LISTITEM * /*items*/, int /*current*/, char * /*newtext*/);
-extern int dlg_renamed_menutext(DIALOG_LISTITEM * /*items*/, int /*current*/, char * /*newtext*/);
-
-/* rc.c */
-#ifdef HAVE_RC_FILE
-extern int dlg_parse_rc(void);
-extern void dlg_create_rc(const char * /*filename*/);
-#endif
-
-/* treeview.c */
-extern int dlg_treeview(const char * /*title*/, const char * /*cprompt*/, int /*height*/, int /*width*/, int /*list_height*/, int /*item_no*/, DIALOG_LISTITEM * /*items*/, const char * /*states*/, int * /*depths*/, int /*flag*/, int * /*current_item*/);
-
-/* ui_getc.c */
-extern int dlg_getc(WINDOW * /*win*/, int * /*fkey*/);
-extern int dlg_getc_callbacks(int /*ch*/, int /*fkey*/, int * /*result*/);
-extern int dlg_last_getc(void);
-extern void dlg_add_last_key(int /*mode*/);
-extern void dlg_add_callback(DIALOG_CALLBACK * /*p*/);
-extern void dlg_add_callback_ref(DIALOG_CALLBACK ** /*p*/, DIALOG_FREEBACK /* cleanup */);
-extern void dlg_flush_getc(void);
-extern void dlg_remove_callback(DIALOG_CALLBACK * /*p*/);
-extern void dlg_killall_bg(int *retval);
-
-/* util.c */
-extern WINDOW * dlg_new_modal_window(WINDOW * /*parent*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-extern WINDOW * dlg_new_window(int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-extern WINDOW * dlg_sub_window(WINDOW * /*win*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-extern bool dlg_need_separator(void);
-extern char * dlg_set_result(const char * /*string*/);
-extern char * dlg_strclone(const char * /*cprompt*/);
-extern char * dlg_strempty(void);
-extern chtype dlg_asciibox(chtype /*ch*/);
-extern chtype dlg_boxchar(chtype /*ch*/);
-extern chtype dlg_get_attrs(WINDOW * /*win*/);
-extern const char * dlg_print_line(WINDOW * /*win*/, chtype * /*attr*/, const char * /*prompt*/, int /*lm*/, int /*rm*/, int * /*x*/);
-extern int dlg_box_x_ordinate(int /*width*/);
-extern int dlg_box_y_ordinate(int /*height*/);
-extern int dlg_calc_list_width(int /*item_no*/, DIALOG_LISTITEM * /*items*/);
-extern int dlg_calc_listw(int /*item_no*/, char ** /*items*/, int /*group*/);
-extern int dlg_check_scrolled(int /* key */, int /* last */, int /* page */, bool * /* show */, int * /* offset */);
-extern int dlg_count_real_columns(const char * /*text*/);
-extern int dlg_default_item(char ** /*items*/, int /*llen*/);
-extern int dlg_default_listitem(DIALOG_LISTITEM * /*items*/);
-extern int dlg_defaultno_button(void);
-extern int dlg_default_button(void);
-extern int dlg_max_input(int /*max_len*/);
-extern int dlg_print_scrolled(WINDOW * /* win */, const char * /* prompt */, int /* offset */, int /* height */, int /* width */, int /* pauseopt */);
-extern void dlg_add_help_formitem(int * /* result */, char ** /* tag */, DIALOG_FORMITEM * /* item */);
-extern void dlg_add_help_listitem(int * /* result */, char ** /* tag */, DIALOG_LISTITEM * /* item */);
-extern void dlg_add_quoted(char * /*string*/);
-extern void dlg_add_result(const char * /*string*/);
-extern void dlg_add_separator(void);
-extern void dlg_add_string(char * /*string*/);
-extern void dlg_attr_clear(WINDOW * /*win*/, int /*height*/, int /*width*/, chtype /*attr*/);
-extern void dlg_auto_size(const char * /*title*/, const char * /*prompt*/, int * /*height*/, int * /*width*/, int /*boxlines*/, int /*mincols*/);
-extern void dlg_auto_sizefile(const char * /*title*/, const char * /*file*/, int * /*height*/, int * /*width*/, int /*boxlines*/, int /*mincols*/);
-extern void dlg_beeping(void);
-extern void dlg_calc_listh(int * /*height*/, int * /*list_height*/, int /*item_no*/);
-extern void dlg_clear(void);
-extern void dlg_clr_result(void);
-extern void dlg_ctl_size(int /*height*/, int /*width*/);
-extern void dlg_del_window(WINDOW * /*win*/);
-extern void dlg_does_output(void);
-extern void dlg_draw_bottom_box(WINDOW * /*win*/);
-extern void dlg_draw_bottom_box2(WINDOW * /*win*/, chtype /*on_left*/, chtype /*on_right*/, chtype /*on_inside*/);
-extern void dlg_draw_box(WINDOW * /*win*/, int /*y*/, int /*x*/, int /*height*/, int /*width*/, chtype /*boxchar*/, chtype /*borderchar*/);
-extern void dlg_draw_box2(WINDOW * /*win*/, int /*y*/, int /*x*/, int /*height*/, int /*width*/, chtype /*boxchar*/, chtype /*borderchar*/, chtype /*borderchar2*/);
-extern void dlg_draw_title(WINDOW *win, const char *title);
-extern void dlg_exit(int /*code*/) GCC_NORETURN;
-extern void dlg_item_help(const char * /*txt*/);
-extern void dlg_print_autowrap(WINDOW * /*win*/, const char * /*prompt*/, int /*height*/, int /*width*/);
-extern void dlg_print_listitem(WINDOW * /*win*/, const char * /*text*/, int /*climit*/, bool /*first*/, int /*selected*/);
-extern void dlg_print_size(int /*height*/, int /*width*/);
-extern void dlg_print_text(WINDOW * /*win*/, const char * /*txt*/, int /*len*/, chtype * /*attr*/);
-extern void dlg_put_backtitle(void);
-extern void dlg_restore_vars(DIALOG_VARS * /* save */);
-extern void dlg_save_vars(DIALOG_VARS * /* save */);
-extern void dlg_set_focus(WINDOW * /*parent*/, WINDOW * /*win*/);
-extern void dlg_tab_correct_str(char * /*prompt*/);
-extern void dlg_trim_string(char * /*src*/);
-extern void end_dialog(void);
-extern void init_dialog(FILE * /*input*/, FILE * /*output*/);
-
-extern void dlg_exiterr(const char *, ...) GCC_NORETURN GCC_PRINTFLIKE(1,2);
-
-#ifdef HAVE_COLOR
-extern chtype dlg_color_pair(int /*foreground*/, int /*background*/);
-extern int dlg_color_count(void);
-extern void dlg_color_setup(void);
-extern void dlg_draw_shadow(WINDOW * /*win*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-#endif
-
-#ifdef HAVE_STRCASECMP
-#define dlg_strcmp(a,b) strcasecmp(a,b)
-#else
-extern int dlg_strcmp(const char * /*a*/, const char * /*b*/);
-#endif
-
-#ifdef HAVE_DLG_TRACE
-#define DLG_TRACE(params) dlg_trace_msg params
-extern void dlg_trace_msg(const char *fmt, ...) GCC_PRINTFLIKE(1,2);
-extern void dlg_trace_win(WINDOW * /*win*/);
-extern void dlg_trace_chr(int /*ch*/, int /*fkey*/);
-extern void dlg_trace(const char * /*fname*/);
-#else
-#define DLG_TRACE(params) /* nothing */
-#define dlg_trace_win(win) /* nothing */
-#define dlg_trace_chr(ch,fkey) /* nothing */
-#define dlg_trace(fname) /* nothing */
-#endif
-
-#ifdef KEY_RESIZE
-extern void dlg_move_window(WINDOW * /*win*/, int /*height*/, int /*width*/, int /*y*/, int /*x*/);
-#endif
-
-/*
- * Normally "enter" means "ok".  Use this macro to handle the explicit
- * check for DLGK_ENTER:
- */
-#define dlg_enter_buttoncode(code) (dialog_vars.nook ? DLG_EXIT_OK : dlg_ok_buttoncode(code))
-
-/*
- * The following stuff is needed for mouse support
- */
-typedef struct mseRegion {
-    int x, y, X, Y, code;
-    int mode, step_x, step_y;
-    struct mseRegion *next;
-} mseRegion;
-
-#if defined(NCURSES_MOUSE_VERSION)
-
-#define	mouse_open() mousemask(BUTTON1_CLICKED, (mmask_t *) 0)
-#define	mouse_close() mousemask(0, (mmask_t *) 0)
-
-extern mseRegion * dlg_mouse_mkregion (int /*y*/, int /*x*/, int /*height*/, int /*width*/, int /*code*/);
-extern void dlg_mouse_free_regions (void);
-extern void dlg_mouse_mkbigregion (int /*y*/, int /*x*/, int /*height*/, int /*width*/, int /*code*/, int /*step_x*/, int /*step_y*/, int /*mode*/);
-extern void dlg_mouse_setbase (int /*x*/, int /*y*/);
-extern void dlg_mouse_setcode (int /*code*/);
-
-#define USE_MOUSE 1
-
-#else
-
-#define	mouse_open() /*nothing*/
-#define	mouse_close() /*nothing*/
-#define dlg_mouse_free_regions() /* nothing */
-#define	dlg_mouse_mkregion(y, x, height, width, code) /*nothing*/
-#define	dlg_mouse_mkbigregion(y, x, height, width, code, step_x, step_y, mode) /*nothing*/
-#define	dlg_mouse_setbase(x, y) /*nothing*/
-#define	dlg_mouse_setcode(c) /*nothing*/
-
-#define USE_MOUSE 0
-
-#endif
-
-extern mseRegion *dlg_mouse_region (int /*y*/, int /*x*/);
-extern mseRegion *dlg_mouse_bigregion (int /*y*/, int /*x*/);
-extern int dlg_mouse_wgetch (WINDOW * /*win*/, int * /*fkey*/);
-extern int dlg_mouse_wgetch_nowait (WINDOW * /*win*/, int * /*fkey*/);
-
-#define mouse_mkbutton(y,x,len,code) dlg_mouse_mkregion(y,x,1,len,code);
-
-/*
- * This is the base for fictitious keys, which activate
- * the buttons.
- *
- * Mouse-generated keys are the following:
- *   -- the first 32 are used as numbers, in addition to '0'-'9'
- *   -- uppercase chars are used to invoke the button (M_EVENT + 'O')
- */
-#define M_EVENT (DLGK_max + 1)
-
-/*
- * The `flag' parameter in checklist is used to select between
- * radiolist and checklist
- */
-#define FLAG_CHECK 1
-#define FLAG_RADIO 0
-
-/*
- * This is used only for debugging (FIXME: should have a separate header).
- */
-#ifdef NO_LEAKS
-extern void _dlg_inputstr_leaks(void);
-#if defined(NCURSES_VERSION) && defined(HAVE__NC_FREE_AND_EXIT)
-extern void _nc_free_and_exit(int);	/* nc_alloc.h normally not installed */
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-/* *INDENT-ON* */
-
-#endif /* DIALOG_H_included */
diff --git a/include.new/digest_asn1.h b/include.new/digest_asn1.h
deleted file mode 100644
index 2f16d45..0000000
--- a/include.new/digest_asn1.h
+++ /dev/null
@@ -1,558 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/digest.asn1 */
-/* Do not edit */
-
-#ifndef __digest_asn1_h__
-#define __digest_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <krb5_asn1.h>
-/*
-DigestTypes ::= BIT STRING {
-  ntlm-v1(0),
-  ntlm-v1-session(1),
-  ntlm-v2(2),
-  digest-md5(3),
-  chap-md5(4),
-  ms-chap-v2(5)
-}
-*/
-
-typedef struct DigestTypes {
-  unsigned int ntlm_v1:1;
-  unsigned int ntlm_v1_session:1;
-  unsigned int ntlm_v2:1;
-  unsigned int digest_md5:1;
-  unsigned int chap_md5:1;
-  unsigned int ms_chap_v2:1;
-  unsigned int _unused6:1;
-  unsigned int _unused7:1;
-  unsigned int _unused8:1;
-  unsigned int _unused9:1;
-  unsigned int _unused10:1;
-  unsigned int _unused11:1;
-  unsigned int _unused12:1;
-  unsigned int _unused13:1;
-  unsigned int _unused14:1;
-  unsigned int _unused15:1;
-  unsigned int _unused16:1;
-  unsigned int _unused17:1;
-  unsigned int _unused18:1;
-  unsigned int _unused19:1;
-  unsigned int _unused20:1;
-  unsigned int _unused21:1;
-  unsigned int _unused22:1;
-  unsigned int _unused23:1;
-  unsigned int _unused24:1;
-  unsigned int _unused25:1;
-  unsigned int _unused26:1;
-  unsigned int _unused27:1;
-  unsigned int _unused28:1;
-  unsigned int _unused29:1;
-  unsigned int _unused30:1;
-  unsigned int _unused31:1;
-} DigestTypes;
-
-
-unsigned DigestTypes2int(DigestTypes);
-DigestTypes int2DigestTypes(unsigned);
-const struct units * asn1_DigestTypes_units(void);
-ASN1EXP int    ASN1CALL decode_DigestTypes(const unsigned char *, size_t, DigestTypes *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestTypes(unsigned char *, size_t, const DigestTypes *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestTypes(const DigestTypes *);
-ASN1EXP int    ASN1CALL copy_DigestTypes  (const DigestTypes *, DigestTypes *);
-ASN1EXP void   ASN1CALL free_DigestTypes  (DigestTypes *);
-
-
-/*
-DigestInit ::= SEQUENCE {
-  type              UTF8String,
-  channel         [0] SEQUENCE {
-    cb-type             UTF8String,
-    cb-binding          UTF8String,
-  } OPTIONAL,
-  hostname        [1]   UTF8String OPTIONAL,
-}
-*/
-
-typedef struct DigestInit {
-  heim_utf8_string type;
-  struct DigestInit_channel {
-    heim_utf8_string cb_type;
-    heim_utf8_string cb_binding;
-  } *channel;
-  heim_utf8_string *hostname;
-} DigestInit;
-
-ASN1EXP int    ASN1CALL decode_DigestInit(const unsigned char *, size_t, DigestInit *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestInit(unsigned char *, size_t, const DigestInit *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestInit(const DigestInit *);
-ASN1EXP int    ASN1CALL copy_DigestInit  (const DigestInit *, DigestInit *);
-ASN1EXP void   ASN1CALL free_DigestInit  (DigestInit *);
-
-
-/*
-DigestInitReply ::= SEQUENCE {
-  nonce             UTF8String,
-  opaque            UTF8String,
-  identifier      [0]   UTF8String OPTIONAL,
-}
-*/
-
-typedef struct DigestInitReply {
-  heim_utf8_string nonce;
-  heim_utf8_string opaque;
-  heim_utf8_string *identifier;
-} DigestInitReply;
-
-ASN1EXP int    ASN1CALL decode_DigestInitReply(const unsigned char *, size_t, DigestInitReply *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestInitReply(unsigned char *, size_t, const DigestInitReply *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestInitReply(const DigestInitReply *);
-ASN1EXP int    ASN1CALL copy_DigestInitReply  (const DigestInitReply *, DigestInitReply *);
-ASN1EXP void   ASN1CALL free_DigestInitReply  (DigestInitReply *);
-
-
-/*
-DigestRequest ::= SEQUENCE {
-  type                    UTF8String,
-  digest                  UTF8String,
-  username                UTF8String,
-  responseData            UTF8String,
-  authid                [0]   UTF8String OPTIONAL,
-  authentication-user   [1] Principal OPTIONAL,
-  realm                 [2]   UTF8String OPTIONAL,
-  method                [3]   UTF8String OPTIONAL,
-  uri                   [4]   UTF8String OPTIONAL,
-  serverNonce             UTF8String,
-  clientNonce           [5]   UTF8String OPTIONAL,
-  nonceCount            [6]   UTF8String OPTIONAL,
-  qop                   [7]   UTF8String OPTIONAL,
-  identifier            [8]   UTF8String OPTIONAL,
-  hostname              [9]   UTF8String OPTIONAL,
-  opaque                  UTF8String,
-}
-*/
-
-typedef struct DigestRequest {
-  heim_utf8_string type;
-  heim_utf8_string digest;
-  heim_utf8_string username;
-  heim_utf8_string responseData;
-  heim_utf8_string *authid;
-  Principal *authentication_user;
-  heim_utf8_string *realm;
-  heim_utf8_string *method;
-  heim_utf8_string *uri;
-  heim_utf8_string serverNonce;
-  heim_utf8_string *clientNonce;
-  heim_utf8_string *nonceCount;
-  heim_utf8_string *qop;
-  heim_utf8_string *identifier;
-  heim_utf8_string *hostname;
-  heim_utf8_string opaque;
-} DigestRequest;
-
-ASN1EXP int    ASN1CALL decode_DigestRequest(const unsigned char *, size_t, DigestRequest *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestRequest(unsigned char *, size_t, const DigestRequest *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestRequest(const DigestRequest *);
-ASN1EXP int    ASN1CALL copy_DigestRequest  (const DigestRequest *, DigestRequest *);
-ASN1EXP void   ASN1CALL free_DigestRequest  (DigestRequest *);
-
-
-/*
-DigestError ::= SEQUENCE {
-  reason            UTF8String,
-  code            INTEGER (-2147483648..2147483647),
-}
-*/
-
-typedef struct DigestError {
-  heim_utf8_string reason;
-  int code;
-} DigestError;
-
-ASN1EXP int    ASN1CALL decode_DigestError(const unsigned char *, size_t, DigestError *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestError(unsigned char *, size_t, const DigestError *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestError(const DigestError *);
-ASN1EXP int    ASN1CALL copy_DigestError  (const DigestError *, DigestError *);
-ASN1EXP void   ASN1CALL free_DigestError  (DigestError *);
-
-
-/*
-DigestResponse ::= SEQUENCE {
-  success         BOOLEAN,
-  rsp             [0]   UTF8String OPTIONAL,
-  tickets         [1] SEQUENCE OF OCTET STRING OPTIONAL,
-  channel         [2] SEQUENCE {
-    cb-type             UTF8String,
-    cb-binding          UTF8String,
-  } OPTIONAL,
-  session-key     [3] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct DigestResponse {
-  int success;
-  heim_utf8_string *rsp;
-  struct DigestResponse_tickets {
-    unsigned int len;
-    heim_octet_string *val;
-  } *tickets;
-  struct DigestResponse_channel {
-    heim_utf8_string cb_type;
-    heim_utf8_string cb_binding;
-  } *channel;
-  heim_octet_string *session_key;
-} DigestResponse;
-
-ASN1EXP int    ASN1CALL decode_DigestResponse(const unsigned char *, size_t, DigestResponse *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestResponse(unsigned char *, size_t, const DigestResponse *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestResponse(const DigestResponse *);
-ASN1EXP int    ASN1CALL copy_DigestResponse  (const DigestResponse *, DigestResponse *);
-ASN1EXP void   ASN1CALL free_DigestResponse  (DigestResponse *);
-
-
-/*
-NTLMInit ::= SEQUENCE {
-  flags           [0] INTEGER (0..2147483647),
-  hostname        [1]   UTF8String OPTIONAL,
-  domain          [1]   UTF8String OPTIONAL,
-}
-*/
-
-typedef struct NTLMInit {
-  unsigned int flags;
-  heim_utf8_string *hostname;
-  heim_utf8_string *domain;
-} NTLMInit;
-
-ASN1EXP int    ASN1CALL decode_NTLMInit(const unsigned char *, size_t, NTLMInit *, size_t *);
-ASN1EXP int    ASN1CALL encode_NTLMInit(unsigned char *, size_t, const NTLMInit *, size_t *);
-ASN1EXP size_t ASN1CALL length_NTLMInit(const NTLMInit *);
-ASN1EXP int    ASN1CALL copy_NTLMInit  (const NTLMInit *, NTLMInit *);
-ASN1EXP void   ASN1CALL free_NTLMInit  (NTLMInit *);
-
-
-/*
-NTLMInitReply ::= SEQUENCE {
-  flags           [0] INTEGER (0..2147483647),
-  opaque          [1] OCTET STRING,
-  targetname      [2]   UTF8String,
-  challange       [3] OCTET STRING,
-  targetinfo      [4] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct NTLMInitReply {
-  unsigned int flags;
-  heim_octet_string opaque;
-  heim_utf8_string targetname;
-  heim_octet_string challange;
-  heim_octet_string *targetinfo;
-} NTLMInitReply;
-
-ASN1EXP int    ASN1CALL decode_NTLMInitReply(const unsigned char *, size_t, NTLMInitReply *, size_t *);
-ASN1EXP int    ASN1CALL encode_NTLMInitReply(unsigned char *, size_t, const NTLMInitReply *, size_t *);
-ASN1EXP size_t ASN1CALL length_NTLMInitReply(const NTLMInitReply *);
-ASN1EXP int    ASN1CALL copy_NTLMInitReply  (const NTLMInitReply *, NTLMInitReply *);
-ASN1EXP void   ASN1CALL free_NTLMInitReply  (NTLMInitReply *);
-
-
-/*
-NTLMRequest ::= SEQUENCE {
-  flags           [0] INTEGER (0..2147483647),
-  opaque          [1] OCTET STRING,
-  username        [2]   UTF8String,
-  targetname      [3]   UTF8String,
-  targetinfo      [4] OCTET STRING OPTIONAL,
-  lm              [5] OCTET STRING,
-  ntlm            [6] OCTET STRING,
-  sessionkey      [7] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct NTLMRequest {
-  unsigned int flags;
-  heim_octet_string opaque;
-  heim_utf8_string username;
-  heim_utf8_string targetname;
-  heim_octet_string *targetinfo;
-  heim_octet_string lm;
-  heim_octet_string ntlm;
-  heim_octet_string *sessionkey;
-} NTLMRequest;
-
-ASN1EXP int    ASN1CALL decode_NTLMRequest(const unsigned char *, size_t, NTLMRequest *, size_t *);
-ASN1EXP int    ASN1CALL encode_NTLMRequest(unsigned char *, size_t, const NTLMRequest *, size_t *);
-ASN1EXP size_t ASN1CALL length_NTLMRequest(const NTLMRequest *);
-ASN1EXP int    ASN1CALL copy_NTLMRequest  (const NTLMRequest *, NTLMRequest *);
-ASN1EXP void   ASN1CALL free_NTLMRequest  (NTLMRequest *);
-
-
-/*
-NTLMResponse ::= SEQUENCE {
-  success         [0] BOOLEAN,
-  flags           [1] INTEGER (0..2147483647),
-  sessionkey      [2] OCTET STRING OPTIONAL,
-  tickets         [3] SEQUENCE OF OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct NTLMResponse {
-  int success;
-  unsigned int flags;
-  heim_octet_string *sessionkey;
-  struct NTLMResponse_tickets {
-    unsigned int len;
-    heim_octet_string *val;
-  } *tickets;
-} NTLMResponse;
-
-ASN1EXP int    ASN1CALL decode_NTLMResponse(const unsigned char *, size_t, NTLMResponse *, size_t *);
-ASN1EXP int    ASN1CALL encode_NTLMResponse(unsigned char *, size_t, const NTLMResponse *, size_t *);
-ASN1EXP size_t ASN1CALL length_NTLMResponse(const NTLMResponse *);
-ASN1EXP int    ASN1CALL copy_NTLMResponse  (const NTLMResponse *, NTLMResponse *);
-ASN1EXP void   ASN1CALL free_NTLMResponse  (NTLMResponse *);
-
-
-/*
-NTLMRequest2 ::= SEQUENCE {
-  loginUserName         [0]   UTF8String,
-  loginDomainName       [1]   UTF8String,
-  flags                 [2] INTEGER (0..2147483647),
-  lmchallenge           [3] OCTET STRING,
-  ntChallengeResponce   [4] OCTET STRING,
-  lmChallengeResponce   [5] OCTET STRING,
-}
-*/
-
-typedef struct NTLMRequest2 {
-  heim_utf8_string loginUserName;
-  heim_utf8_string loginDomainName;
-  unsigned int flags;
-  heim_octet_string lmchallenge;
-  heim_octet_string ntChallengeResponce;
-  heim_octet_string lmChallengeResponce;
-} NTLMRequest2;
-
-ASN1EXP int    ASN1CALL decode_NTLMRequest2(const unsigned char *, size_t, NTLMRequest2 *, size_t *);
-ASN1EXP int    ASN1CALL encode_NTLMRequest2(unsigned char *, size_t, const NTLMRequest2 *, size_t *);
-ASN1EXP size_t ASN1CALL length_NTLMRequest2(const NTLMRequest2 *);
-ASN1EXP int    ASN1CALL copy_NTLMRequest2  (const NTLMRequest2 *, NTLMRequest2 *);
-ASN1EXP void   ASN1CALL free_NTLMRequest2  (NTLMRequest2 *);
-
-
-/*
-NTLMReply ::= SEQUENCE {
-  success         [0] BOOLEAN,
-  flags           [1] INTEGER (0..2147483647),
-  sessionkey      [2] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct NTLMReply {
-  int success;
-  unsigned int flags;
-  heim_octet_string *sessionkey;
-} NTLMReply;
-
-ASN1EXP int    ASN1CALL decode_NTLMReply(const unsigned char *, size_t, NTLMReply *, size_t *);
-ASN1EXP int    ASN1CALL encode_NTLMReply(unsigned char *, size_t, const NTLMReply *, size_t *);
-ASN1EXP size_t ASN1CALL length_NTLMReply(const NTLMReply *);
-ASN1EXP int    ASN1CALL copy_NTLMReply  (const NTLMReply *, NTLMReply *);
-ASN1EXP void   ASN1CALL free_NTLMReply  (NTLMReply *);
-
-
-/*
-DigestReqInner ::= CHOICE {
-  init             [0] DigestInit,
-  digestRequest    [1] DigestRequest,
-  ntlmInit         [2] NTLMInit,
-  ntlmRequest      [3] NTLMRequest,
-  supportedMechs   [4]   NULL,
-}
-*/
-
-typedef struct DigestReqInner {
-  enum {
-    choice_DigestReqInner_init = 1,
-    choice_DigestReqInner_digestRequest,
-    choice_DigestReqInner_ntlmInit,
-    choice_DigestReqInner_ntlmRequest,
-    choice_DigestReqInner_supportedMechs
-  } element;
-  union {
-    DigestInit init;
-    DigestRequest digestRequest;
-    NTLMInit ntlmInit;
-    NTLMRequest ntlmRequest;
-    int supportedMechs;
-  } u;
-} DigestReqInner;
-
-ASN1EXP int    ASN1CALL decode_DigestReqInner(const unsigned char *, size_t, DigestReqInner *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestReqInner(unsigned char *, size_t, const DigestReqInner *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestReqInner(const DigestReqInner *);
-ASN1EXP int    ASN1CALL copy_DigestReqInner  (const DigestReqInner *, DigestReqInner *);
-ASN1EXP void   ASN1CALL free_DigestReqInner  (DigestReqInner *);
-
-
-/*
-DigestREQ ::= [APPLICATION 128] SEQUENCE {
-  apReq           [0] OCTET STRING,
-  innerReq        [1] EncryptedData,
-}
-*/
-
-typedef struct DigestREQ {
-  heim_octet_string apReq;
-  EncryptedData innerReq;
-} DigestREQ;
-
-ASN1EXP int    ASN1CALL decode_DigestREQ(const unsigned char *, size_t, DigestREQ *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestREQ(unsigned char *, size_t, const DigestREQ *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestREQ(const DigestREQ *);
-ASN1EXP int    ASN1CALL copy_DigestREQ  (const DigestREQ *, DigestREQ *);
-ASN1EXP void   ASN1CALL free_DigestREQ  (DigestREQ *);
-
-
-/*
-DigestRepInner ::= CHOICE {
-  error            [0] DigestError,
-  initReply        [1] DigestInitReply,
-  response         [2] DigestResponse,
-  ntlmInitReply    [3] NTLMInitReply,
-  ntlmResponse     [4] NTLMResponse,
-  supportedMechs   [5] DigestTypes,
-  ...,
-}
-*/
-
-typedef struct DigestRepInner {
-  enum {
-    choice_DigestRepInner_asn1_ellipsis = 0,
-    choice_DigestRepInner_error,
-    choice_DigestRepInner_initReply,
-    choice_DigestRepInner_response,
-    choice_DigestRepInner_ntlmInitReply,
-    choice_DigestRepInner_ntlmResponse,
-    choice_DigestRepInner_supportedMechs
-    /* ... */
-  } element;
-  union {
-    DigestError error;
-    DigestInitReply initReply;
-    DigestResponse response;
-    NTLMInitReply ntlmInitReply;
-    NTLMResponse ntlmResponse;
-    DigestTypes supportedMechs;
-    heim_octet_string asn1_ellipsis;
-  } u;
-} DigestRepInner;
-
-ASN1EXP int    ASN1CALL decode_DigestRepInner(const unsigned char *, size_t, DigestRepInner *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestRepInner(unsigned char *, size_t, const DigestRepInner *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestRepInner(const DigestRepInner *);
-ASN1EXP int    ASN1CALL copy_DigestRepInner  (const DigestRepInner *, DigestRepInner *);
-ASN1EXP void   ASN1CALL free_DigestRepInner  (DigestRepInner *);
-
-
-/*
-DigestREP ::= [APPLICATION 129] SEQUENCE {
-  apRep           [0] OCTET STRING,
-  innerRep        [1] EncryptedData,
-}
-*/
-
-typedef struct DigestREP {
-  heim_octet_string apRep;
-  EncryptedData innerRep;
-} DigestREP;
-
-ASN1EXP int    ASN1CALL decode_DigestREP(const unsigned char *, size_t, DigestREP *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestREP(unsigned char *, size_t, const DigestREP *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestREP(const DigestREP *);
-ASN1EXP int    ASN1CALL copy_DigestREP  (const DigestREP *, DigestREP *);
-ASN1EXP void   ASN1CALL free_DigestREP  (DigestREP *);
-
-
-#endif /* __digest_asn1_h__ */
diff --git a/include.new/dirent.h b/include.new/dirent.h
deleted file mode 100644
index 345eb45..0000000
--- a/include.new/dirent.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * Copyright (c) 1989, 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. 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.
- *
- *	@(#)dirent.h	8.2 (Berkeley) 7/28/94
- * $FreeBSD: releng/10.2/include/dirent.h 270002 2014-08-14 20:20:21Z jhb $
- */
-
-#ifndef _DIRENT_H_
-#define _DIRENT_H_
-
-/*
- * The kernel defines the format of directory entries returned by
- * the getdirentries(2) system call.
- */
-#include <sys/cdefs.h>
-#include <sys/dirent.h>
-
-#if __BSD_VISIBLE || __XSI_VISIBLE
-/*
- * XXX this is probably illegal in the __XSI_VISIBLE case, but brings us closer
- * to the specification.
- */
-#define	d_ino		d_fileno	/* backward and XSI compatibility */
-#endif
-
-#if __BSD_VISIBLE
-
-#include <sys/_null.h>
-
-/* definitions for library routines operating on directories. */
-#define	DIRBLKSIZ	1024
-
-struct _dirdesc;
-typedef struct _dirdesc DIR;
-
-/* flags for opendir2 */
-#define DTF_HIDEW	0x0001	/* hide whiteout entries */
-#define DTF_NODUP	0x0002	/* don't return duplicate names */
-#define DTF_REWIND	0x0004	/* rewind after reading union stack */
-#define __DTF_READALL	0x0008	/* everything has been read */
-#define	__DTF_SKIPREAD	0x0010  /* assume internal buffer is populated */
-
-#else /* !__BSD_VISIBLE */
-
-typedef	void *	DIR;
-
-#endif /* __BSD_VISIBLE */
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 700
-int	 alphasort(const struct dirent **, const struct dirent **);
-int	 dirfd(DIR *);
-#endif
-#if __BSD_VISIBLE
-DIR	*__opendir2(const char *, int);
-int	 fdclosedir(DIR *);
-int	 getdents(int, char *, int);
-int	 getdirentries(int, char *, int, long *);
-#endif
-DIR	*opendir(const char *);
-DIR	*fdopendir(int);
-struct dirent *
-	 readdir(DIR *);
-#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500
-int	 readdir_r(DIR *, struct dirent *, struct dirent **);
-#endif
-void	 rewinddir(DIR *);
-#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 700
-int	 scandir(const char *, struct dirent ***,
-	    int (*)(const struct dirent *), int (*)(const struct dirent **,
-	    const struct dirent **));
-#endif
-#if __XSI_VISIBLE
-void	 seekdir(DIR *, long);
-long	 telldir(DIR *);
-#endif
-int	 closedir(DIR *);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_DIRENT_H_ */
diff --git a/include.new/dlfcn.h b/include.new/dlfcn.h
deleted file mode 100644
index 85c1ab1..0000000
--- a/include.new/dlfcn.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	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. 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.
- *
- * $FreeBSD: releng/10.2/include/dlfcn.h 229768 2012-01-07 10:33:01Z kib $
- */
-
-#ifndef _DLFCN_H_
-#define	_DLFCN_H_
-
-#include <sys/_types.h>
-
-/*
- * Modes and flags for dlopen().
- */
-#define	RTLD_LAZY	1	/* Bind function calls lazily. */
-#define	RTLD_NOW	2	/* Bind function calls immediately. */
-#define	RTLD_MODEMASK	0x3
-#define	RTLD_GLOBAL	0x100	/* Make symbols globally available. */
-#define	RTLD_LOCAL	0	/* Opposite of RTLD_GLOBAL, and the default. */
-#define	RTLD_TRACE	0x200	/* Trace loaded objects and exit. */
-#define	RTLD_NODELETE	0x01000	/* Do not remove members. */
-#define	RTLD_NOLOAD	0x02000	/* Do not load if not already loaded. */
-
-/*
- * Request arguments for dlinfo().
- */
-#define	RTLD_DI_LINKMAP		2	/* Obtain link map. */
-#define	RTLD_DI_SERINFO		4	/* Obtain search path info. */
-#define	RTLD_DI_SERINFOSIZE	5	/*  ... query for required space. */
-#define	RTLD_DI_ORIGIN		6	/* Obtain object origin */
-#define	RTLD_DI_MAX		RTLD_DI_ORIGIN
-
-/*
- * Special handle arguments for dlsym()/dlinfo().
- */
-#define	RTLD_NEXT	((void *) -1)	/* Search subsequent objects. */
-#define	RTLD_DEFAULT	((void *) -2)	/* Use default search algorithm. */
-#define	RTLD_SELF	((void *) -3)	/* Search the caller itself. */
-
-#if __BSD_VISIBLE
-
-#ifndef	_SIZE_T_DECLARED
-typedef __size_t        size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-/*
- * Structure filled in by dladdr().
- */
-typedef	struct dl_info {
-	const char	*dli_fname;	/* Pathname of shared object. */
-	void		*dli_fbase;	/* Base address of shared object. */
-	const char	*dli_sname;	/* Name of nearest symbol. */
-	void		*dli_saddr;	/* Address of nearest symbol. */
-} Dl_info;
-
-/*-
- * The actual type declared by this typedef is immaterial, provided that
- * it is a function pointer.  Its purpose is to provide a return type for
- * dlfunc() which can be cast to a function pointer type without depending
- * on behavior undefined by the C standard, which might trigger a compiler
- * diagnostic.  We intentionally declare a unique type signature to force
- * a diagnostic should the application not cast the return value of dlfunc()
- * appropriately.
- */
-struct __dlfunc_arg {
-	int	__dlfunc_dummy;
-};
-
-typedef	void (*dlfunc_t)(struct __dlfunc_arg);
-
-/*
- * Structures, returned by the RTLD_DI_SERINFO dlinfo() request.
- */
-typedef struct dl_serpath {
-	char *		dls_name;	/* single search path entry */
-	unsigned int	dls_flags;	/* path information */
-} Dl_serpath;
-
-typedef struct  dl_serinfo {
-        size_t		dls_size;       /* total buffer size */
-        unsigned int	dls_cnt;        /* number of path entries */
-        Dl_serpath	dls_serpath[1]; /* there may be more than one */
-} Dl_serinfo;
-
-#endif /* __BSD_VISIBLE */
-
-__BEGIN_DECLS
-/* XSI functions first. */
-int	 dlclose(void *);
-char	*dlerror(void);
-void	*dlopen(const char *, int);
-void	*dlsym(void * __restrict, const char * __restrict);
-
-#if __BSD_VISIBLE
-void	*fdlopen(int, int);
-int	 dladdr(const void * __restrict, Dl_info * __restrict);
-dlfunc_t dlfunc(void * __restrict, const char * __restrict);
-int	 dlinfo(void * __restrict, int, void * __restrict);
-void	 dllockinit(void *_context,
-	    void *(*_lock_create)(void *_context),
-	    void (*_rlock_acquire)(void *_lock),
-	    void (*_wlock_acquire)(void *_lock),
-	    void (*_lock_release)(void *_lock),
-	    void (*_lock_destroy)(void *_lock),
-	    void (*_context_destroy)(void *_context));
-void	*dlvsym(void * __restrict, const char * __restrict,
-	    const char * __restrict);
-#endif /* __BSD_VISIBLE */
-__END_DECLS
-
-#endif /* !_DLFCN_H_ */
diff --git a/include.new/dlg_colors.h b/include.new/dlg_colors.h
deleted file mode 100644
index c047f72..0000000
--- a/include.new/dlg_colors.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- *  $Id: dlg_colors.h,v 1.17 2011/10/14 21:19:59 tom Exp $
- *
- *  colors.h -- color attribute definitions
- *
- *  Copyright 2000-2007,2011	Thomas E. Dickey
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License, version 2.1
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to
- *	Free Software Foundation, Inc.
- *	51 Franklin St., Fifth Floor
- *	Boston, MA 02110, USA.
- *
- *  An earlier version of this program lists as authors
- *	Savio Lam (lam836@cs.cuhk.hk)
- */
-
-#ifndef COLORS_H_included
-#define COLORS_H_included 1
-
-#include <dialog.h>
-
-/*
- *   Default color definitions (DLGC means "Dialog Color")
- *
- *   DLGC_FG_xxx = foreground for "xxx"
- *   DLGC_BG_xxx = background for "xxx"
- *   DLGC_HL_xxx = highlight for "xxx"
- */
-#define DLGC_FG_SCREEN                 COLOR_CYAN
-#define DLGC_BG_SCREEN                 COLOR_BLUE
-#define DLGC_HL_SCREEN                 TRUE
-
-#define DLGC_FG_SHADOW                 COLOR_BLACK
-#define DLGC_BG_SHADOW                 COLOR_BLACK
-#define DLGC_HL_SHADOW                 TRUE
-
-#define DLGC_FG_DIALOG                 COLOR_BLACK
-#define DLGC_BG_DIALOG                 COLOR_WHITE
-#define DLGC_HL_DIALOG                 FALSE
-
-#define DLGC_FG_TITLE                  COLOR_BLUE
-#define DLGC_BG_TITLE                  COLOR_WHITE
-#define DLGC_HL_TITLE                  TRUE
-
-#define DLGC_FG_BORDER                 COLOR_WHITE
-#define DLGC_BG_BORDER                 COLOR_WHITE
-#define DLGC_HL_BORDER                 TRUE
-
-#define DLGC_FG_BORDER2                DLGC_FG_DIALOG
-#define DLGC_BG_BORDER2                DLGC_BG_DIALOG
-#define DLGC_HL_BORDER2                DLGC_HL_DIALOG
-
-#define DLGC_FG_BUTTON_ACTIVE          COLOR_WHITE
-#define DLGC_BG_BUTTON_ACTIVE          COLOR_BLUE
-#define DLGC_HL_BUTTON_ACTIVE          TRUE
-
-#define DLGC_FG_BUTTON_INACTIVE        COLOR_BLACK
-#define DLGC_BG_BUTTON_INACTIVE        COLOR_WHITE
-#define DLGC_HL_BUTTON_INACTIVE        FALSE
-
-#define DLGC_FG_BUTTON_KEY_ACTIVE      COLOR_WHITE
-#define DLGC_BG_BUTTON_KEY_ACTIVE      COLOR_BLUE
-#define DLGC_HL_BUTTON_KEY_ACTIVE      TRUE
-
-#define DLGC_FG_BUTTON_KEY_INACTIVE    COLOR_RED
-#define DLGC_BG_BUTTON_KEY_INACTIVE    COLOR_WHITE
-#define DLGC_HL_BUTTON_KEY_INACTIVE    FALSE
-
-#define DLGC_FG_BUTTON_LABEL_ACTIVE    COLOR_YELLOW
-#define DLGC_BG_BUTTON_LABEL_ACTIVE    COLOR_BLUE
-#define DLGC_HL_BUTTON_LABEL_ACTIVE    TRUE
-
-#define DLGC_FG_BUTTON_LABEL_INACTIVE  COLOR_BLACK
-#define DLGC_BG_BUTTON_LABEL_INACTIVE  COLOR_WHITE
-#define DLGC_HL_BUTTON_LABEL_INACTIVE  TRUE
-
-#define DLGC_FG_FORM_ITEM_READONLY     COLOR_CYAN
-#define DLGC_BG_FORM_ITEM_READONLY     COLOR_WHITE
-#define DLGC_HL_FORM_ITEM_READONLY     TRUE
-
-#define DLGC_FG_INPUTBOX               COLOR_BLACK
-#define DLGC_BG_INPUTBOX               COLOR_WHITE
-#define DLGC_HL_INPUTBOX               FALSE
-
-#define DLGC_FG_INPUTBOX_BORDER        COLOR_BLACK
-#define DLGC_BG_INPUTBOX_BORDER        COLOR_WHITE
-#define DLGC_HL_INPUTBOX_BORDER        FALSE
-
-#define DLGC_FG_INPUTBOX_BORDER2       DLGC_FG_INPUTBOX
-#define DLGC_BG_INPUTBOX_BORDER2       DLGC_BG_INPUTBOX
-#define DLGC_HL_INPUTBOX_BORDER2       DLGC_HL_INPUTBOX
-
-#define DLGC_FG_SEARCHBOX              COLOR_BLACK
-#define DLGC_BG_SEARCHBOX              COLOR_WHITE
-#define DLGC_HL_SEARCHBOX              FALSE
-
-#define DLGC_FG_SEARCHBOX_TITLE        COLOR_BLUE
-#define DLGC_BG_SEARCHBOX_TITLE        COLOR_WHITE
-#define DLGC_HL_SEARCHBOX_TITLE        TRUE
-
-#define DLGC_FG_SEARCHBOX_BORDER       COLOR_WHITE
-#define DLGC_BG_SEARCHBOX_BORDER       COLOR_WHITE
-#define DLGC_HL_SEARCHBOX_BORDER       TRUE
-
-#define DLGC_FG_SEARCHBOX_BORDER2      DLGC_FG_SEARCHBOX
-#define DLGC_BG_SEARCHBOX_BORDER2      DLGC_BG_SEARCHBOX
-#define DLGC_HL_SEARCHBOX_BORDER2      DLGC_HL_SEARCHBOX
-
-#define DLGC_FG_POSITION_INDICATOR     COLOR_BLUE
-#define DLGC_BG_POSITION_INDICATOR     COLOR_WHITE
-#define DLGC_HL_POSITION_INDICATOR     TRUE
-
-#define DLGC_FG_MENUBOX                COLOR_BLACK
-#define DLGC_BG_MENUBOX                COLOR_WHITE
-#define DLGC_HL_MENUBOX                FALSE
-
-#define DLGC_FG_MENUBOX_BORDER         COLOR_WHITE
-#define DLGC_BG_MENUBOX_BORDER         COLOR_WHITE
-#define DLGC_HL_MENUBOX_BORDER         TRUE
-
-#define DLGC_FG_MENUBOX_BORDER2        DLGC_FG_MENUBOX
-#define DLGC_BG_MENUBOX_BORDER2        DLGC_BG_MENUBOX
-#define DLGC_HL_MENUBOX_BORDER2        DLGC_HL_MENUBOX
-
-#define DLGC_FG_ITEM                   COLOR_BLACK
-#define DLGC_BG_ITEM                   COLOR_WHITE
-#define DLGC_HL_ITEM                   FALSE
-
-#define DLGC_FG_ITEM_SELECTED          COLOR_WHITE
-#define DLGC_BG_ITEM_SELECTED          COLOR_BLUE
-#define DLGC_HL_ITEM_SELECTED          TRUE
-
-#define DLGC_FG_TAG                    COLOR_BLUE
-#define DLGC_BG_TAG                    COLOR_WHITE
-#define DLGC_HL_TAG                    TRUE
-
-#define DLGC_FG_TAG_SELECTED           COLOR_YELLOW
-#define DLGC_BG_TAG_SELECTED           COLOR_BLUE
-#define DLGC_HL_TAG_SELECTED           TRUE
-
-#define DLGC_FG_TAG_KEY                COLOR_RED
-#define DLGC_BG_TAG_KEY                COLOR_WHITE
-#define DLGC_HL_TAG_KEY                FALSE
-
-#define DLGC_FG_TAG_KEY_SELECTED       COLOR_RED
-#define DLGC_BG_TAG_KEY_SELECTED       COLOR_BLUE
-#define DLGC_HL_TAG_KEY_SELECTED       TRUE
-
-#define DLGC_FG_CHECK                  COLOR_BLACK
-#define DLGC_BG_CHECK                  COLOR_WHITE
-#define DLGC_HL_CHECK                  FALSE
-
-#define DLGC_FG_CHECK_SELECTED         COLOR_WHITE
-#define DLGC_BG_CHECK_SELECTED         COLOR_BLUE
-#define DLGC_HL_CHECK_SELECTED         TRUE
-
-#define DLGC_FG_UARROW                 COLOR_GREEN
-#define DLGC_BG_UARROW                 COLOR_WHITE
-#define DLGC_HL_UARROW                 TRUE
-
-#define DLGC_FG_DARROW                 COLOR_GREEN
-#define DLGC_BG_DARROW                 COLOR_WHITE
-#define DLGC_HL_DARROW                 TRUE
-
-#define DLGC_FG_ITEMHELP               COLOR_WHITE
-#define DLGC_BG_ITEMHELP               COLOR_BLACK
-#define DLGC_HL_ITEMHELP               FALSE
-
-#define DLGC_FG_FORM_ACTIVE_TEXT       COLOR_WHITE
-#define DLGC_BG_FORM_ACTIVE_TEXT       COLOR_BLUE
-#define DLGC_HL_FORM_ACTIVE_TEXT       TRUE
-
-#define DLGC_FG_FORM_TEXT              COLOR_WHITE
-#define DLGC_BG_FORM_TEXT              COLOR_CYAN
-#define DLGC_HL_FORM_TEXT              TRUE
-
-#define DLGC_FG_GAUGE                  COLOR_BLUE
-#define DLGC_BG_GAUGE                  COLOR_WHITE
-#define DLGC_HL_GAUGE                  TRUE
-
-/* End of default color definitions */
-
-/*
- * Global variables
- */
-
-typedef struct {
-    const char *name;
-    int value;
-} color_names_st;
-
-#endif /* COLORS_H_included */
diff --git a/include.new/dlg_config.h b/include.new/dlg_config.h
deleted file mode 100644
index 842bdfb..0000000
--- a/include.new/dlg_config.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* dlg_config.h.  Generated automatically by configure.  */
-/*
- * The configure script expands this as a set of definitions
- *
- * $FreeBSD: releng/10.2/gnu/lib/libdialog/dlg_config.h 255852 2013-09-24 14:52:43Z dteske $
- */
-
-#define CURSES_WACS_ARRAY _nc_wacs
-#define CURSES_WACS_SYMBOLS 1
-#define DIALOG_PATCHDATE 20130923
-#define DIALOG_VERSION "1.2"
-#define HAVE_ALLOCA 1
-#define HAVE_BTOWC 1
-#define HAVE_COLOR 1
-#define HAVE_DIRENT_H 1
-#define HAVE_DLG_FORMBOX 1
-#define HAVE_DLG_GAUGE 1
-#define HAVE_DLG_MIXEDFORM 1
-#define HAVE_DLG_TAILBOX 1
-#define HAVE_DLG_TRACE 1
-#define HAVE_FEOF_UNLOCKED 1
-#define HAVE_FLUSHINP 1
-#define HAVE_FSEEKO 1
-#define HAVE_GETATTRS 1
-#define HAVE_GETBEGX 1
-#define HAVE_GETBEGY 1
-#define HAVE_GETBEGYX 1
-#define HAVE_GETCURX 1
-#define HAVE_GETCURY 1
-#define HAVE_GETCWD 1
-#define HAVE_GETEGID 1
-#define HAVE_GETEUID 1
-#define HAVE_GETGID 1
-#define HAVE_GETMAXX 1
-#define HAVE_GETMAXY 1
-#define HAVE_GETMAXYX 1
-#define HAVE_GETPAGESIZE 1
-#define HAVE_GETPARX 1
-#define HAVE_GETPARY 1
-#define HAVE_GETPARYX 1
-#define HAVE_GETUID 1
-#define HAVE_ICONV 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_LANGINFO_CODESET 1
-#define HAVE_LC_MESSAGES 1
-#define HAVE_LIBNCURSESW 1
-#define HAVE_LIMITS_H 1
-#define HAVE_LOCALE_H 1
-#define HAVE_MBLEN 1
-#define HAVE_MBRLEN 1
-#define HAVE_MBRTOWC 1
-#define HAVE_MBSTATE_T 1
-#define HAVE_MBTOWC 1
-#define HAVE_MEMORY_H 1
-#define HAVE_MIXEDGAUGE 1
-#define HAVE_MMAP 1
-#define HAVE_MUNMAP 1
-#define HAVE_NL_TYPES_H 1
-#define HAVE_PUTENV 1
-#define HAVE_RC_FILE 1
-#define HAVE_SEARCH_H 1
-#define HAVE_SETENV 1
-#define HAVE_SETLOCALE 1
-#define HAVE_STDDEF_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STPCPY 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRCHR 1
-#define HAVE_STRDUP 1
-#define HAVE_STRFTIME 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRTOUL 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_SYS_WAIT_H 1
-#define HAVE_TERM_H 1
-#define HAVE_TSEARCH 1
-#define HAVE_TYPE_CHTYPE 1
-#define HAVE_UNCTRL_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_USE_DEFAULT_COLORS 1
-#define HAVE_WAITPID 1
-#define HAVE_WCHGAT 1
-#define HAVE_WCSRTOMBS 1
-#define HAVE_WCSTOMBS 1
-#define HAVE_WCTOB 1
-#define HAVE_WCTOMB 1
-#define HAVE_WCURSYNCUP 1
-#define HAVE_WGETPARENT 1
-#define HAVE_WHIPTAIL 1
-#define HAVE_WSYNCUP 1
-#define HAVE_XDIALOG 1
-#define HAVE_XDIALOG2 1
-#define HAVE__NC_FREE_AND_EXIT 1
-#define ICONV_CONST const
-#define MIXEDCASE_FILENAMES 1
-#define NCURSES 1
-#define NEED_WCHAR_H 1
-#define PACKAGE "dialog"
-#define RETSIGTYPE void
-#define STDC_HEADERS 1
-#define SYSTEM_NAME "freebsd10.0"
-#define TIME_WITH_SYS_TIME 1
-#define TYPE_CHTYPE_IS_SCALAR 1
-#define USE_WIDE_CURSES 1
diff --git a/include.new/dlg_keys.h b/include.new/dlg_keys.h
deleted file mode 100644
index 789f39a..0000000
--- a/include.new/dlg_keys.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *  $Id: dlg_keys.h,v 1.32 2012/12/21 21:54:30 tom Exp $
- *
- *  dlg_keys.h -- runtime binding support for dialog
- *
- *  Copyright 2005-2011,2012 Thomas E.  Dickey
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License, version 2.1
- *  as published by the Free Software Foundation.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this program; if not, write to
- *	Free Software Foundation, Inc.
- *	51 Franklin St., Fifth Floor
- *	Boston, MA 02110, USA.
- */
-
-#ifndef DLG_KEYS_H_included
-#define DLG_KEYS_H_included 1
-/* *INDENT-OFF* */
-
-#include <dialog.h>
-
-#ifdef USE_WIDE_CURSES
-#include <wctype.h>
-#define dlg_toupper(ch) towupper((wint_t)ch)
-#define dlg_isupper(ch) iswupper((wint_t)ch)
-#else
-#define dlg_toupper(ch) (((ch) > 0 && (ch) <= 255) ? toupper(ch) : (ch))
-#define dlg_isupper(ch) (isalpha(ch) && isupper(ch))
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    int is_function_key;
-    int	curses_key;
-    int dialog_key;
-} DLG_KEYS_BINDING;
-
-#define DLG_KEYS_DATA(dialog, curses)  { (curses) >= KEY_MIN, curses, dialog }
-
-#define END_KEYS_BINDING { -1, 0, 0 }
-
-/*
- * Define dialog's internal function-keys past the range used by curses.
- */
-typedef enum {
-    DLGK_MIN = KEY_MAX + 1,
-    /* predefined buttons */
-    DLGK_OK,
-    DLGK_CANCEL,
-    DLGK_EXTRA,
-    DLGK_HELP,
-    DLGK_ESC,
-    /* moving from screen to screen (pages) */
-    DLGK_PAGE_FIRST,
-    DLGK_PAGE_LAST,
-    DLGK_PAGE_NEXT,
-    DLGK_PAGE_PREV,
-    /* moving within a list */
-    DLGK_ITEM_FIRST,
-    DLGK_ITEM_LAST,
-    DLGK_ITEM_NEXT,
-    DLGK_ITEM_PREV,
-    /* moving from field to field (or buttons) */
-    DLGK_FIELD_FIRST,
-    DLGK_FIELD_LAST,
-    DLGK_FIELD_NEXT,
-    DLGK_FIELD_PREV,
-    /* moving from form-field to form-field (or buttons) */
-    DLGK_FORM_FIRST,
-    DLGK_FORM_LAST,
-    DLGK_FORM_NEXT,
-    DLGK_FORM_PREV,
-    /* moving within a grid */
-    DLGK_GRID_UP,
-    DLGK_GRID_DOWN,
-    DLGK_GRID_LEFT,
-    DLGK_GRID_RIGHT,
-    /* delete */
-    DLGK_DELETE_LEFT,
-    DLGK_DELETE_RIGHT,
-    DLGK_DELETE_ALL,
-    /* special */
-    DLGK_ENTER,
-    DLGK_BEGIN,
-    DLGK_FINAL,
-    DLGK_SELECT,
-    DLGK_HELPFILE,
-    DLGK_TRACE
-} DLG_KEYS_ENUM;
-
-#define is_DLGK_MOUSE(code)	((code) >= M_EVENT)
-#define DLGK_MOUSE(code)	((code) + M_EVENT)
-
-#define HELPKEY_BINDINGS \
-	DLG_KEYS_DATA( DLGK_HELPFILE,	   CHR_HELP ), \
-	DLG_KEYS_DATA( DLGK_HELPFILE,	   KEY_F(1) ), \
-	DLG_KEYS_DATA( DLGK_HELPFILE,	   KEY_HELP )
-
-#define ENTERKEY_BINDINGS \
-	DLG_KEYS_DATA( DLGK_ENTER,	   '\n' ), \
-	DLG_KEYS_DATA( DLGK_ENTER,	   '\r' ), \
-	DLG_KEYS_DATA( DLGK_ENTER,	   KEY_ENTER )
-
-/* ^U == 21 */
-#define INPUTSTR_BINDINGS \
-	DLG_KEYS_DATA( DLGK_BEGIN,	   KEY_HOME ), \
-	DLG_KEYS_DATA( DLGK_DELETE_ALL,    CHR_KILL ), \
-	DLG_KEYS_DATA( DLGK_DELETE_LEFT,   CHR_BACKSPACE ), \
-	DLG_KEYS_DATA( DLGK_DELETE_LEFT,   KEY_BACKSPACE ), \
-	DLG_KEYS_DATA( DLGK_DELETE_RIGHT,  CHR_DELETE ), \
-	DLG_KEYS_DATA( DLGK_DELETE_RIGHT,  KEY_DC ), \
-	DLG_KEYS_DATA( DLGK_FINAL,	   KEY_END ), \
-	DLG_KEYS_DATA( DLGK_GRID_LEFT,	   KEY_LEFT ), \
-	DLG_KEYS_DATA( DLGK_GRID_RIGHT,	   KEY_RIGHT )
-
-#define SCROLL_FKEY_BINDINGS \
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	KEY_DOWN ), \
-	DLG_KEYS_DATA( DLGK_GRID_UP,	KEY_UP ), \
-	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	KEY_HOME ), \
-	DLG_KEYS_DATA( DLGK_PAGE_LAST,	KEY_END ), \
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	KEY_NPAGE ), \
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	KEY_PPAGE )
-
-#define SCROLLKEY_BINDINGS \
-	SCROLL_FKEY_BINDINGS, \
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'J' ), \
-	DLG_KEYS_DATA( DLGK_GRID_DOWN,	'j' ), \
-	DLG_KEYS_DATA( DLGK_GRID_UP,	'K' ), \
-	DLG_KEYS_DATA( DLGK_GRID_UP,	'k' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_FIRST,	'g' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_LAST,	'G' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	'F' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_NEXT,	'f' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	'B' ), \
-	DLG_KEYS_DATA( DLGK_PAGE_PREV,	'b' )
-
-#define TRAVERSE_BINDINGS \
-	DLG_KEYS_DATA( DLGK_ENTER,	' ' ), \
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT,	KEY_DOWN ), \
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ), \
-	DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), \
-	DLG_KEYS_DATA( DLGK_FIELD_PREV,	KEY_UP ), \
-	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_BTAB ), \
-	DLG_KEYS_DATA( DLGK_FIELD_PREV, KEY_LEFT )
-
-extern int dlg_lookup_key(WINDOW * /*win*/, int /*curses_key*/, int * /*dialog_key*/);
-extern int dlg_result_key(int /*dialog_key*/, int /*fkey*/, int * /*resultp*/);
-extern void dlg_register_buttons(WINDOW * /*win*/, const char * /*name*/, const char ** /*buttons*/);
-extern void dlg_register_window(WINDOW * /*win*/, const char * /*name*/, DLG_KEYS_BINDING * /*binding*/);
-extern void dlg_unregister_window(WINDOW * /*win*/);
-
-#ifdef HAVE_RC_FILE
-extern int dlg_parse_bindkey(char * /*params*/);
-extern void dlg_dump_keys(FILE * /*fp*/);
-extern void dlg_dump_window_keys(FILE * /*fp*/, WINDOW * /*win*/);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-/* *INDENT-ON* */
-
-#endif /* DLG_KEYS_H_included */
diff --git a/include.new/dpv.h b/include.new/dpv.h
deleted file mode 100644
index d62f1f2..0000000
--- a/include.new/dpv.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*-
- * Copyright (c) 2013-2014 Devin Teske <dteske@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.
- * 
- * 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: releng/10.2/lib/libdpv/dpv.h 274116 2014-11-04 23:46:01Z dteske $
- */
-
-#ifndef _DPV_H_
-#define _DPV_H_
-
-#include <sys/types.h>
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-/* Data to process */
-extern long long dpv_overall_read;
-
-/* Interrupt flag */
-extern int dpv_interrupt;	/* Set to TRUE in interrupt handler */
-extern int dpv_abort;		/* Set to true in callback to abort */
-
-/*
- * Display types for use with display_type member of dpv_config structure
- */
-enum dpv_display {
-	DPV_DISPLAY_LIBDIALOG = 0,	/* Display using dialog(3) (default) */
-	DPV_DISPLAY_STDOUT,		/* Display on stdout */
-	DPV_DISPLAY_DIALOG,		/* Display using spawned dialog(1) */
-	DPV_DISPLAY_XDIALOG,		/* Display using spawned Xdialog(1) */
-};
-
-/*
- * Output types for use with output_type member of dpv_config structure
- */
-enum dpv_output {
-	DPV_OUTPUT_NONE = 0,	/* No output (default) */
-	DPV_OUTPUT_FILE,	/* Read `output' member as file path */
-	DPV_OUTPUT_SHELL,	/* Read `output' member as shell cmd */
-};
-
-/*
- * Activity types for use with status member of dpv_file_node structure.
- * If you set a status other than DPV_STATUS_RUNNING on the current file in the
- * action callback of dpv_config structure, you'll end callbacks for that
- * dpv_file_node.
- */
-enum dpv_status {
-	DPV_STATUS_RUNNING = 0,	/* Running (default) */
-	DPV_STATUS_DONE,	/* Completed */
-	DPV_STATUS_FAILED,	/* Oops, something went wrong */
-};
-
-/*
- * Anatomy of file option; pass an array of these as dpv() file_list argument
- * terminated with a NULL pointer.
- */
-struct dpv_file_node {
-	enum dpv_status		status; /* status of read operation */
-	char			*msg;	/* display instead of "Done/Fail" */
-	char			*name;	/* name of file to read */
-	char			*path;	/* path to file */
-	long long		length;	/* expected size */
-	long long		read;	/* number units read (e.g., bytes) */
-	struct dpv_file_node	*next;	/* pointer to next (end with NULL) */
-};
-
-/*
- * Anatomy of config option to pass as dpv() config argument
- */
-struct dpv_config {
-	enum dpv_display display_type;	/* Display (default TYPE_LIBDIALOG) */
-	enum dpv_output  output_type;	/* Output (default TYPE_NONE) */
-	int	debug;			/* Enable debugging output on stderr */
-	int	display_limit;		/* Files per `page'. Default -1 */
-	int	label_size;		/* Label size. Default 28 */
-	int	pbar_size;		/* Mini-progress size. See dpv(3) */
-	int	dialog_updates_per_second; /* Progress updates/s. Default 16 */
-	int	status_updates_per_second; /* dialog(3) status updates/second.
-	   	                            * Default 2 */
-	uint16_t options;	/* Special options. Default 0 */
-	char	*title;		/* widget title */
-	char	*backtitle;	/* Widget backtitle */
-	char	*aprompt;	/* Prompt append. Default NULL */
-	char	*pprompt;	/* Prompt prefix. Default NULL */
-	char	*msg_done;	/* Progress text. Default `Done' */
-	char	*msg_fail;	/* Progress text. Default `Fail' */
-	char	*msg_pending;	/* Progress text. Default `Pending' */
-	char	*output;	/* Output format string; see dpv(3) */
-	const char *status_solo; /* dialog(3) solo-status format.
-	                          * Default DPV_STATUS_SOLO */
-	const char *status_many; /* dialog(3) many-status format.
-	                          * Default DPV_STATUS_MANY */
-
-	/*
-	 * Function pointer; action to perform data transfer
-	 */
-	int (*action)(struct dpv_file_node *file, int out);
-};
-
-/*
- * Macros for dpv() options bitmask argument
- */
-#define DPV_TEST_MODE		0x0001	/* Test mode (fake reading data) */
-#define DPV_WIDE_MODE		0x0002	/* prefix/append bump dialog width */
-#define DPV_NO_LABELS		0x0004	/* Hide file_node.name labels */
-#define DPV_USE_COLOR		0x0008	/* Override to force color output */
-#define DPV_NO_OVERRUN		0x0010	/* Stop transfers when they hit 100% */
-
-/*
- * Limits (modify with extreme care)
- */
-#define DPV_APROMPT_MAX		4096	/* Buffer size for `-a text' */
-#define DPV_DISPLAY_LIMIT	10	/* Max file progress lines */
-#define DPV_PPROMPT_MAX		4096	/* Buffer size for `-p text' */
-#define DPV_STATUS_FORMAT_MAX	80	/* Buffer size for `-u format' */
-
-/*
- * Extra display information
- */
-#define DPV_STATUS_SOLO		"%'10lli bytes read @ %'9.1f bytes/sec."
-#define DPV_STATUS_MANY		(DPV_STATUS_SOLO " [%i/%i busy/wait]")
-
-/*
- * Strings
- */
-#define DPV_DONE_DEFAULT	"Done"
-#define DPV_FAIL_DEFAULT	"Fail"
-#define DPV_PENDING_DEFAULT	"Pending"
-
-__BEGIN_DECLS
-void	dpv_free(void);
-int	dpv(struct dpv_config *_config, struct dpv_file_node *_file_list);
-__END_DECLS
-
-#endif /* !_DPV_H_ */
diff --git a/include.new/dwarf.h b/include.new/dwarf.h
deleted file mode 100644
index 14a1215..0000000
--- a/include.new/dwarf.h
+++ /dev/null
@@ -1,479 +0,0 @@
-/*-
- * Copyright (c) 2007 John Birrell (jb@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.
- *
- * 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: releng/10.2/lib/libdwarf/dwarf.h 239872 2012-08-29 18:49:41Z dim $
- */
-
-#ifndef	_DWARF_H_
-#define	_DWARF_H_
-
-#define DW_TAG_array_type		0x01
-#define DW_TAG_class_type		0x02
-#define DW_TAG_entry_point		0x03
-#define DW_TAG_enumeration_type		0x04
-#define DW_TAG_formal_parameter		0x05
-#define DW_TAG_imported_declaration	0x08
-#define DW_TAG_label			0x0a
-#define DW_TAG_lexical_block		0x0b
-#define DW_TAG_member			0x0d
-#define DW_TAG_pointer_type		0x0f
-#define DW_TAG_reference_type		0x10
-#define DW_TAG_compile_unit		0x11
-#define DW_TAG_string_type		0x12
-#define DW_TAG_structure_type		0x13
-#define DW_TAG_subroutine_type		0x15
-#define DW_TAG_typedef			0x16
-#define DW_TAG_union_type		0x17
-#define DW_TAG_unspecified_parameters	0x18
-#define DW_TAG_variant			0x19
-#define DW_TAG_common_block		0x1a
-#define DW_TAG_common_inclusion		0x1b
-#define DW_TAG_inheritance		0x1c
-#define DW_TAG_inlined_subroutine	0x1d
-#define DW_TAG_module			0x1e
-#define DW_TAG_ptr_to_member_type	0x1f
-#define DW_TAG_set_type			0x20
-#define DW_TAG_subrange_type		0x21
-#define DW_TAG_with_stmt		0x22
-#define DW_TAG_access_declaration	0x23
-#define DW_TAG_base_type		0x24
-#define DW_TAG_catch_block		0x25
-#define DW_TAG_const_type		0x26
-#define DW_TAG_constant			0x27
-#define DW_TAG_enumerator		0x28
-#define DW_TAG_friend			0x2a
-#define DW_TAG_namelist			0x2b
-#define DW_TAG_namelist_item		0x2c
-#define DW_TAG_packed_type		0x2d
-#define DW_TAG_subprogram		0x2e
-#define DW_TAG_template_type_parameter	0x2f
-#define DW_TAG_template_type_param	0x2f
-#define DW_TAG_template_value_parameter	0x30
-#define DW_TAG_template_value_param	0x30
-#define DW_TAG_thrown_type		0x31
-#define DW_TAG_try_block		0x32
-#define DW_TAG_variant_part		0x33
-#define DW_TAG_variable			0x34
-#define DW_TAG_volatile_type		0x35
-#define DW_TAG_dwarf_procedure          0x36
-#define DW_TAG_restrict_type            0x37
-#define DW_TAG_interface_type           0x38
-#define DW_TAG_namespace                0x39
-#define DW_TAG_imported_module          0x3a
-#define DW_TAG_unspecified_type         0x3b
-#define DW_TAG_partial_unit             0x3c
-#define DW_TAG_imported_unit            0x3d
-#define DW_TAG_condition                0x3f
-#define DW_TAG_shared_type              0x40
-
-#define DW_TAG_lo_user			0x4080
-
-#define DW_TAG_hi_user			0xffff
-
-#define DW_CHILDREN_no			0x00
-#define DW_CHILDREN_yes			0x01
-
-#define DW_AT_sibling			0x01
-#define DW_AT_location			0x02
-#define DW_AT_name			0x03
-#define DW_AT_ordering			0x09
-#define DW_AT_subscr_data		0x0a
-#define DW_AT_byte_size			0x0b
-#define DW_AT_bit_offset		0x0c
-#define DW_AT_bit_size			0x0d
-#define DW_AT_element_list		0x0f
-#define DW_AT_stmt_list			0x10
-#define DW_AT_low_pc			0x11
-#define DW_AT_high_pc			0x12
-#define DW_AT_language			0x13
-#define DW_AT_member			0x14
-#define DW_AT_discr			0x15
-#define DW_AT_discr_value		0x16
-#define DW_AT_visibility		0x17
-#define DW_AT_import			0x18
-#define DW_AT_string_length		0x19
-#define DW_AT_common_reference		0x1a
-#define DW_AT_comp_dir			0x1b
-#define DW_AT_const_value		0x1c
-#define DW_AT_containing_type		0x1d
-#define DW_AT_default_value		0x1e
-#define DW_AT_inline			0x20
-#define DW_AT_is_optional		0x21
-#define DW_AT_lower_bound		0x22
-#define DW_AT_producer			0x25
-#define DW_AT_prototyped		0x27
-#define DW_AT_return_addr		0x2a
-#define DW_AT_start_scope		0x2c
-#define DW_AT_bit_stride		0x2e
-#define DW_AT_stride_size		0x2e
-#define DW_AT_upper_bound		0x2f
-#define DW_AT_abstract_origin		0x31
-#define DW_AT_accessibility		0x32
-#define DW_AT_address_class		0x33
-#define DW_AT_artificial		0x34
-#define DW_AT_base_types		0x35
-#define DW_AT_calling_convention	0x36
-#define DW_AT_count			0x37
-#define DW_AT_data_member_location	0x38
-#define DW_AT_decl_column		0x39
-#define DW_AT_decl_file			0x3a
-#define DW_AT_decl_line			0x3b
-#define DW_AT_declaration		0x3c
-#define DW_AT_discr_list		0x3d
-#define DW_AT_encoding			0x3e
-#define DW_AT_external			0x3f
-#define DW_AT_frame_base		0x40
-#define DW_AT_friend			0x41
-#define DW_AT_identifier_case		0x42
-#define DW_AT_macro_info		0x43
-#define DW_AT_namelist_item		0x44
-#define DW_AT_priority			0x45
-#define DW_AT_segment			0x46
-#define DW_AT_specification		0x47
-#define DW_AT_static_link		0x48
-#define DW_AT_type			0x49
-#define DW_AT_use_location		0x4a
-#define DW_AT_variable_parameter	0x4b
-#define DW_AT_virtuality		0x4c
-#define DW_AT_vtable_elem_location	0x4d
-
-#define DW_AT_lo_user			0x2000
-
-#define DW_AT_hi_user			0x3fff
-
-#define DW_FORM_addr			0x01
-#define DW_FORM_block2			0x03
-#define DW_FORM_block4			0x04
-#define DW_FORM_data2			0x05
-#define DW_FORM_data4			0x06
-#define DW_FORM_data8			0x07
-#define DW_FORM_string			0x08
-#define DW_FORM_block			0x09
-#define DW_FORM_block1			0x0a
-#define DW_FORM_data1			0x0b
-#define DW_FORM_flag			0x0c
-#define DW_FORM_sdata			0x0d
-#define DW_FORM_strp			0x0e
-#define DW_FORM_udata			0x0f
-#define DW_FORM_ref_addr		0x10
-#define DW_FORM_ref1			0x11
-#define DW_FORM_ref2			0x12
-#define DW_FORM_ref4			0x13
-#define DW_FORM_ref8			0x14
-#define DW_FORM_ref_udata		0x15
-#define DW_FORM_indirect		0x16
-#define DW_FORM_flag_present		0x19
-
-#define DW_OP_addr			0x03
-#define DW_OP_deref			0x06
-#define DW_OP_const1u			0x08
-#define DW_OP_const1s			0x09
-#define DW_OP_const2u			0x0a
-#define DW_OP_const2s			0x0b
-#define DW_OP_const4u			0x0c
-#define DW_OP_const4s			0x0d
-#define DW_OP_const8u			0x0e
-#define DW_OP_const8s			0x0f
-#define DW_OP_constu			0x10
-#define DW_OP_consts			0x11
-#define DW_OP_dup			0x12
-#define DW_OP_drop			0x13
-#define DW_OP_over			0x14
-#define DW_OP_pick			0x15
-#define DW_OP_swap			0x16
-#define DW_OP_rot			0x17
-#define DW_OP_xderef			0x18
-#define DW_OP_abs			0x19
-#define DW_OP_and			0x1a
-#define DW_OP_div			0x1b
-#define DW_OP_minus			0x1c
-#define DW_OP_mod			0x1d
-#define DW_OP_mul			0x1e
-#define DW_OP_neg			0x1f
-#define DW_OP_not			0x20
-#define DW_OP_or			0x21
-#define DW_OP_plus			0x22
-#define DW_OP_plus_uconst		0x23
-#define DW_OP_shl			0x24
-#define DW_OP_shr			0x25
-#define DW_OP_shra			0x26
-#define DW_OP_xor			0x27
-#define DW_OP_bra			0x28
-#define DW_OP_eq			0x29
-#define DW_OP_ge			0x2a
-#define DW_OP_gt			0x2b
-#define DW_OP_le			0x2c
-#define DW_OP_lt			0x2d
-#define DW_OP_ne			0x2e
-#define DW_OP_skip			0x2f
-#define DW_OP_lit0			0x30
-#define DW_OP_lit1			0x31
-#define DW_OP_lit2			0x32
-#define DW_OP_lit3			0x33
-#define DW_OP_lit4			0x34
-#define DW_OP_lit5			0x35
-#define DW_OP_lit6			0x36
-#define DW_OP_lit7			0x37
-#define DW_OP_lit8			0x38
-#define DW_OP_lit9			0x39
-#define DW_OP_lit10			0x3a
-#define DW_OP_lit11			0x3b
-#define DW_OP_lit12			0x3c
-#define DW_OP_lit13			0x3d
-#define DW_OP_lit14			0x3e
-#define DW_OP_lit15			0x3f
-#define DW_OP_lit16			0x40
-#define DW_OP_lit17			0x41
-#define DW_OP_lit18			0x42
-#define DW_OP_lit19			0x43
-#define DW_OP_lit20			0x44
-#define DW_OP_lit21			0x45
-#define DW_OP_lit22			0x46
-#define DW_OP_lit23			0x47
-#define DW_OP_lit24			0x48
-#define DW_OP_lit25			0x49
-#define DW_OP_lit26			0x4a
-#define DW_OP_lit27			0x4b
-#define DW_OP_lit28			0x4c
-#define DW_OP_lit29			0x4d
-#define DW_OP_lit30			0x4e
-#define DW_OP_lit31			0x4f
-#define DW_OP_reg0			0x50
-#define DW_OP_reg1			0x51
-#define DW_OP_reg2			0x52
-#define DW_OP_reg3			0x53
-#define DW_OP_reg4			0x54
-#define DW_OP_reg5			0x55
-#define DW_OP_reg6			0x56
-#define DW_OP_reg7			0x57
-#define DW_OP_reg8			0x58
-#define DW_OP_reg9			0x59
-#define DW_OP_reg10			0x5a
-#define DW_OP_reg11			0x5b
-#define DW_OP_reg12			0x5c
-#define DW_OP_reg13			0x5d
-#define DW_OP_reg14			0x5e
-#define DW_OP_reg15			0x5f
-#define DW_OP_reg16			0x60
-#define DW_OP_reg17			0x61
-#define DW_OP_reg18			0x62
-#define DW_OP_reg19			0x63
-#define DW_OP_reg20			0x64
-#define DW_OP_reg21			0x65
-#define DW_OP_reg22			0x66
-#define DW_OP_reg23			0x67
-#define DW_OP_reg24			0x68
-#define DW_OP_reg25			0x69
-#define DW_OP_reg26			0x6a
-#define DW_OP_reg27			0x6b
-#define DW_OP_reg28			0x6c
-#define DW_OP_reg29			0x6d
-#define DW_OP_reg30			0x6e
-#define DW_OP_reg31			0x6f
-#define DW_OP_breg0			0x70
-#define DW_OP_breg1			0x71
-#define DW_OP_breg2			0x72
-#define DW_OP_breg3			0x73
-#define DW_OP_breg4			0x74
-#define DW_OP_breg5			0x75
-#define DW_OP_breg6			0x76
-#define DW_OP_breg7			0x77
-#define DW_OP_breg8			0x78
-#define DW_OP_breg9			0x79
-#define DW_OP_breg10			0x7a
-#define DW_OP_breg11			0x7b
-#define DW_OP_breg12			0x7c
-#define DW_OP_breg13			0x7d
-#define DW_OP_breg14			0x7e
-#define DW_OP_breg15			0x7f
-#define DW_OP_breg16			0x80
-#define DW_OP_breg17			0x81
-#define DW_OP_breg18			0x82
-#define DW_OP_breg19			0x83
-#define DW_OP_breg20			0x84
-#define DW_OP_breg21			0x85
-#define DW_OP_breg22			0x86
-#define DW_OP_breg23			0x87
-#define DW_OP_breg24			0x88
-#define DW_OP_breg25			0x89
-#define DW_OP_breg26			0x8a
-#define DW_OP_breg27			0x8b
-#define DW_OP_breg28			0x8c
-#define DW_OP_breg29			0x8d
-#define DW_OP_breg30			0x8e
-#define DW_OP_breg31			0x8f
-#define DW_OP_regx			0x90
-#define DW_OP_fbreg			0x91
-#define DW_OP_bregx			0x92
-#define DW_OP_piece			0x93
-#define DW_OP_deref_size		0x94
-#define DW_OP_xderef_size		0x95
-#define DW_OP_nop			0x96
-
-#define DW_OP_lo_user		 	0xe0
-
-#define DW_OP_hi_user		 	0xff
-
-#define DW_ATE_address		 	0x1
-#define DW_ATE_boolean		 	0x2
-#define DW_ATE_complex_float	 	0x3
-#define DW_ATE_float		 	0x4
-#define DW_ATE_signed		 	0x5
-#define DW_ATE_signed_char	 	0x6
-#define DW_ATE_unsigned		 	0x7
-#define DW_ATE_unsigned_char	 	0x8
-#define DW_ATE_imaginary_float	 	0x9
-#define DW_ATE_packed_decimal	 	0xa
-#define DW_ATE_numeric_string	 	0xb
-#define DW_ATE_edited		 	0xc
-#define DW_ATE_signed_fixed	 	0xd
-#define DW_ATE_unsigned_fixed	 	0xe
-#define DW_ATE_decimal_float	 	0xf
-
-#define DW_ATE_lo_user		 	0x80
-
-#define DW_ATE_hi_user		 	0xff
-
-#define DW_ACCESS_public		0x01
-#define DW_ACCESS_protected	 	0x02
-#define DW_ACCESS_private	 	0x03
-
-#define DW_VIS_local		 	0x01
-#define DW_VIS_exported		 	0x02
-#define DW_VIS_qualified		0x03
-
-#define DW_VIRTUALITY_none	 	0x00
-#define DW_VIRTUALITY_virtual	 	0x01
-#define DW_VIRTUALITY_pure_virtual 	0x02
-
-#define DW_LANG_C89		 	0x0001
-#define DW_LANG_C		 	0x0002
-#define DW_LANG_Ada83		 	0x0003
-#define DW_LANG_C_plus_plus	 	0x0004
-#define DW_LANG_Cobol74		 	0x0005
-#define DW_LANG_Cobol85		 	0x0006
-#define DW_LANG_Fortran77	 	0x0007
-#define DW_LANG_Fortran90	 	0x0008
-#define DW_LANG_Pascal83		0x0009
-#define DW_LANG_Modula2		 	0x000a
-#define DW_LANG_Java		 	0x000b
-#define DW_LANG_C99		 	0x000c
-#define DW_LANG_Ada95		 	0x000d
-#define DW_LANG_Fortran95	 	0x000e
-#define DW_LANG_PLI		 	0x000f
-#define DW_LANG_ObjC		 	0x0010
-#define DW_LANG_ObjC_plus_plus	 	0x0011
-#define DW_LANG_UPC		 	0x0012
-#define DW_LANG_D		 	0x0013
-
-#define DW_LANG_lo_user		 	0x8000
-
-#define DW_LANG_hi_user		 	0xffff
-
-#define DW_ID_case_sensitive	 	0x00
-#define DW_ID_up_case		 	0x01
-#define DW_ID_down_case		 	0x02
-#define DW_ID_case_insensitive	 	0x03
-
-#define DW_CC_normal		 	0x01
-#define DW_CC_program		 	0x02
-#define DW_CC_nocall		 	0x03
-
-#define DW_CC_lo_user		 	0x40
-
-#define DW_CC_hi_user		 	0xff
-
-#define DW_INL_not_inlined	 	0x00
-#define DW_INL_inlined		 	0x01
-#define DW_INL_declared_not_inlined 	0x02
-#define DW_INL_declared_inlined	 	0x03
-
-#define DW_ORD_row_major		0x00
-#define DW_ORD_col_major		0x01
-
-#define DW_DSC_label		 	0x00
-#define DW_DSC_range		 	0x01
-
-#define DW_LNS_copy		 	0x01
-#define DW_LNS_advance_pc	 	0x02
-#define DW_LNS_advance_line	 	0x03
-#define DW_LNS_set_file		 	0x04
-#define DW_LNS_set_column	 	0x05
-#define DW_LNS_negate_stmt	 	0x06
-#define DW_LNS_set_basic_block	 	0x07
-#define DW_LNS_const_add_pc	 	0x08
-#define DW_LNS_fixed_advance_pc	 	0x09
-#define DW_LNS_set_prologue_end	 	0x0a
-#define DW_LNS_set_epilogue_begin 	0x0b
-#define DW_LNS_set_isa		 	0x0c
-
-#define DW_LNE_end_sequence	 	0x01
-#define DW_LNE_set_address	 	0x02
-#define DW_LNE_define_file	 	0x03
-
-#define DW_LNE_lo_user		 	0x80
-
-#define DW_LNE_hi_user		 	0xff
-
-#define DW_MACINFO_define	 	0x01
-#define DW_MACINFO_undef		0x02
-#define DW_MACINFO_start_file	 	0x03
-#define DW_MACINFO_end_file	 	0x04
-#define DW_MACINFO_vendor_ext	 	0xff
-
-#define DW_CFA_advance_loc		0x40
-#define DW_CFA_offset	 		0x80
-#define DW_CFA_restore	 		0xc0
-#define DW_CFA_extended			0
-
-#define DW_CFA_nop	 		0x00
-#define DW_CFA_set_loc	 		0x01
-#define DW_CFA_advance_loc1 		0x02
-#define DW_CFA_advance_loc2 		0x03
-#define DW_CFA_advance_loc4 		0x04
-#define DW_CFA_offset_extended 		0x05
-#define DW_CFA_restore_extended 	0x06
-#define DW_CFA_undefined		0x07
-#define DW_CFA_same_value 		0x08
-#define DW_CFA_register	 		0x09
-#define DW_CFA_remember_state 		0x0a
-#define DW_CFA_restore_state 		0x0b
-#define DW_CFA_def_cfa	 		0x0c
-#define DW_CFA_def_cfa_register 	0x0d
-#define DW_CFA_def_cfa_offset 		0x0e
-#define DW_CFA_def_cfa_expression 	0x0f
-#define DW_CFA_expression 		0x10
-#define DW_CFA_cfa_offset_extended_sf 	0x11
-#define DW_CFA_def_cfa_sf 		0x12
-#define DW_CFA_def_cfa_offset_sf 	0x13
-#define DW_CFA_val_offset		0x14
-#define DW_CFA_val_offset_sf 		0x15
-#define DW_CFA_val_expression 		0x16
-
-#define DW_CFA_lo_user	 		0x1c
-
-#define DW_CFA_high_user	 	0x3f
-
-#endif /* !_DWARF_H_ */
diff --git a/include.new/edit/readline/history.h b/include.new/edit/readline/history.h
deleted file mode 100644
index 1fa3465..0000000
--- a/include.new/edit/readline/history.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * Copyright (c) 2011 David E. O'Brien
- * 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. Neither the name of the author nor the names of contributors
- *    may 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 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.
- *
- * $FreeBSD: releng/10.2/lib/libedit/edit/readline/history.h 220370 2011-04-05 18:41:01Z obrien $
- */
-
-#include <edit/readline/readline.h>
diff --git a/include.new/edit/readline/readline.h b/include.new/edit/readline/readline.h
deleted file mode 100644
index 1269c23..0000000
--- a/include.new/edit/readline/readline.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*	$NetBSD: readline.h,v 1.31 2010/08/04 20:29:18 christos Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jaromir Dolecek.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libedit/edit/readline/readline.h 228114 2011-11-29 04:50:57Z fjoe $
- */
-#ifndef _READLINE_H_
-#define _READLINE_H_
-
-#include <sys/types.h>
-#include <stdio.h>
-
-/* list of readline stuff supported by editline library's readline wrapper */
-
-/* typedefs */
-typedef int	  Function(const char *, int);
-typedef void	  VFunction(void);
-typedef void	  VCPFunction(char *);
-typedef char	 *CPFunction(const char *, int);
-typedef char	**CPPFunction(const char *, int, int);
-typedef char     *rl_compentry_func_t(const char *, int);
-typedef int	  rl_command_func_t(int, int);
-
-/* only supports length */
-typedef struct {
-	int length;
-} HISTORY_STATE;
-
-typedef void *histdata_t;
-
-typedef struct _hist_entry {
-	const char	*line;
-	histdata_t 	 data;
-} HIST_ENTRY;
-
-typedef struct _keymap_entry {
-	char type;
-#define ISFUNC	0
-#define ISKMAP	1
-#define ISMACR	2
-	Function *function;
-} KEYMAP_ENTRY;
-
-#define KEYMAP_SIZE	256
-
-typedef KEYMAP_ENTRY KEYMAP_ENTRY_ARRAY[KEYMAP_SIZE];
-typedef KEYMAP_ENTRY *Keymap;
-
-#define control_character_threshold	0x20
-#define control_character_bit		0x40
-
-#ifndef CTRL
-#include <sys/ioctl.h>
-#if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
-#include <sys/ttydefaults.h>
-#endif
-#ifndef CTRL
-#define CTRL(c)		((c) & 037)
-#endif
-#endif
-#ifndef UNCTRL
-#define UNCTRL(c)	(((c) - 'a' + 'A')|control_character_bit)
-#endif
-
-#define RUBOUT		0x7f
-#define ABORT_CHAR	CTRL('G')
-#define RL_READLINE_VERSION 	0x0402
-#define RL_PROMPT_START_IGNORE	'\1'
-#define RL_PROMPT_END_IGNORE	'\2'
-
-/* global variables used by readline enabled applications */
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern const char	*rl_library_version;
-extern int 		rl_readline_version; 
-extern char		*rl_readline_name;
-extern FILE		*rl_instream;
-extern FILE		*rl_outstream;
-extern char		*rl_line_buffer;
-extern int		 rl_point, rl_end;
-extern int		 history_base, history_length;
-extern int		 max_input_history;
-extern char		*rl_basic_word_break_characters;
-extern char		*rl_completer_word_break_characters;
-extern char		*rl_completer_quote_characters;
-extern Function		*rl_completion_entry_function;
-extern CPPFunction	*rl_attempted_completion_function;
-extern int		 rl_attempted_completion_over;
-extern int		rl_completion_type;
-extern int		rl_completion_query_items;
-extern char		*rl_special_prefixes;
-extern int		rl_completion_append_character;
-extern int		rl_inhibit_completion;
-extern Function		*rl_pre_input_hook;
-extern Function		*rl_startup_hook;
-extern char		*rl_terminal_name;
-extern int		rl_already_prompted;
-extern char		*rl_prompt;
-/*
- * The following is not implemented
- */
-extern KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
-			emacs_meta_keymap,
-			emacs_ctlx_keymap;
-extern int		rl_filename_completion_desired;
-extern int		rl_ignore_completion_duplicates;
-extern int		(*rl_getc_function)(FILE *);
-extern VFunction	*rl_redisplay_function;
-extern VFunction	*rl_completion_display_matches_hook;
-extern VFunction	*rl_prep_term_function;
-extern VFunction	*rl_deprep_term_function;
-extern int		readline_echoing_p;
-extern int		_rl_print_completions_horizontally;
-
-/* supported functions */
-char		*readline(const char *);
-int		 rl_initialize(void);
-
-void		 using_history(void);
-int		 add_history(const char *);
-void		 clear_history(void);
-void		 stifle_history(int);
-int		 unstifle_history(void);
-int		 history_is_stifled(void);
-int		 where_history(void);
-HIST_ENTRY	*current_history(void);
-HIST_ENTRY	*history_get(int);
-HIST_ENTRY	*remove_history(int);
-/*###152 [lint] syntax error 'histdata_t' [249]%%%*/
-HIST_ENTRY	*replace_history_entry(int, const char *, histdata_t);
-int		 history_total_bytes(void);
-int		 history_set_pos(int);
-HIST_ENTRY	*previous_history(void);
-HIST_ENTRY	*next_history(void);
-int		 history_search(const char *, int);
-int		 history_search_prefix(const char *, int);
-int		 history_search_pos(const char *, int, int);
-int		 read_history(const char *);
-int		 write_history(const char *);
-int		 history_truncate_file (const char *, int);
-int		 history_expand(char *, char **);
-char	       **history_tokenize(const char *);
-const char	*get_history_event(const char *, int *, int);
-char		*history_arg_extract(int, int, const char *);
-
-char		*tilde_expand(char *);
-char		*filename_completion_function(const char *, int);
-char		*username_completion_function(const char *, int);
-int		 rl_complete(int, int);
-int		 rl_read_key(void);
-char	       **completion_matches(const char *, CPFunction *);
-void		 rl_display_match_list(char **, int, int);
-
-int		 rl_insert(int, int);
-int		 rl_insert_text(const char *);
-void		 rl_reset_terminal(const char *);
-int		 rl_bind_key(int, rl_command_func_t *);
-int		 rl_newline(int, int);
-void		 rl_callback_read_char(void);
-void		 rl_callback_handler_install(const char *, VCPFunction *);
-void		 rl_callback_handler_remove(void);
-void		 rl_redisplay(void);
-int		 rl_get_previous_history(int, int);
-void		 rl_prep_terminal(int);
-void		 rl_deprep_terminal(void);
-int		 rl_read_init_file(const char *);
-int		 rl_parse_and_bind(const char *);
-int		 rl_variable_bind(const char *, const char *);
-void		 rl_stuff_char(int);
-int		 rl_add_defun(const char *, Function *, int);
-HISTORY_STATE	*history_get_history_state(void);
-void		 rl_get_screen_size(int *, int *);
-void		 rl_set_screen_size(int, int);
-char 		*rl_filename_completion_function (const char *, int);
-int		 _rl_abort_internal(void);
-char 	       **rl_completion_matches(const char *, rl_compentry_func_t *);
-void		 rl_forced_update_display(void);
-int		 rl_set_prompt(const char *);
-int		 rl_on_new_line(void);
-
-/*
- * The following are not implemented
- */
-int		 rl_kill_text(int, int);
-Keymap		 rl_get_keymap(void);
-void		 rl_set_keymap(Keymap);
-Keymap		 rl_make_bare_keymap(void);
-int		 rl_generic_bind(int, const char *, const char *, Keymap);
-int		 rl_bind_key_in_map(int, rl_command_func_t *, Keymap);
-void		 rl_cleanup_after_signal(void);
-void		 rl_free_line_state(void);
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _READLINE_H_ */
diff --git a/include.new/edit/readline/tilde.h b/include.new/edit/readline/tilde.h
deleted file mode 100644
index 4bb029c..0000000
--- a/include.new/edit/readline/tilde.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*-
- * Copyright (c) 2011 David E. O'Brien
- * 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. Neither the name of the author nor the names of contributors
- *    may 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 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.
- *
- * $FreeBSD: releng/10.2/lib/libedit/edit/readline/tilde.h 234690 2012-04-26 00:51:43Z obrien $
- */
-
-#include <edit/readline/readline.h>
diff --git a/include.new/elf-hints.h b/include.new/elf-hints.h
deleted file mode 100644
index 9ee93bd..0000000
--- a/include.new/elf-hints.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1997 John D. Polstra.
- * 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.
- *
- * 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: releng/10.2/include/elf-hints.h 76224 2001-05-02 23:56:21Z obrien $
- */
-
-#ifndef	_ELF_HINTS_H_
-#define	_ELF_HINTS_H_
-
-/*
- * Hints file produced by ldconfig.
- */
-struct elfhints_hdr {
-	uint32_t	magic;		/* Magic number */
-	uint32_t	version;	/* File version (1) */
-	uint32_t	strtab;		/* Offset of string table in file */
-	uint32_t	strsize;	/* Size of string table */
-	uint32_t	dirlist;	/* Offset of directory list in
-					   string table */
-	uint32_t	dirlistlen;	/* strlen(dirlist) */
-	uint32_t	spare[26];	/* Room for expansion */
-};
-
-#define ELFHINTS_MAGIC	0x746e6845
-
-#define _PATH_ELF_HINTS	"/var/run/ld-elf.so.hints"
-
-#endif /* !_ELF_HINTS_H_ */
diff --git a/include.new/elf.h b/include.new/elf.h
deleted file mode 100644
index 05aa427..0000000
--- a/include.new/elf.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2001 David E. O'Brien.
- * 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.
- *
- * 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: releng/10.2/include/elf.h 174044 2007-11-28 22:09:12Z jb $
- */
-
-/*
- * This is a Solaris compatibility header
- */
-
-#ifndef	_ELF_H_
-#define	_ELF_H_
-
-#include <sys/types.h>
-#include <machine/elf.h>
-#include <sys/elf32.h>
-#include <sys/elf64.h>
-
-#endif /* !_ELF_H_ */
diff --git a/include.new/emmintrin.h b/include.new/emmintrin.h
deleted file mode 100644
index 2869063..0000000
--- a/include.new/emmintrin.h
+++ /dev/null
@@ -1,1491 +0,0 @@
-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-   This file is part of GCC.
-
-   GCC is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GCC is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you include this header file into source
-   files compiled by GCC, this header file does not by itself cause
-   the resulting executable to be covered by the GNU General Public
-   License.  This exception does not however invalidate any other
-   reasons why the executable file might be covered by the GNU General
-   Public License.  */
-
-/* Implemented from the specification included in the Intel C++ Compiler
-   User Guide and Reference, version 8.0.  */
-
-#ifndef _EMMINTRIN_H_INCLUDED
-#define _EMMINTRIN_H_INCLUDED
-
-#ifdef __SSE2__
-#include <xmmintrin.h>
-
-/* SSE2 */
-typedef double __v2df __attribute__ ((mode (V2DF)));
-typedef int __v2di __attribute__ ((mode (V2DI)));
-typedef int __v4si __attribute__ ((mode (V4SI)));
-typedef int __v8hi __attribute__ ((mode (V8HI)));
-typedef int __v16qi __attribute__ ((mode (V16QI)));
-
-/* Create a selector for use with the SHUFPD instruction.  */
-#define _MM_SHUFFLE2(fp1,fp0) \
- (((fp1) << 1) | (fp0))
-
-#define __m128i __v2di
-#define __m128d __v2df
-
-/* Create a vector with element 0 as *P and the rest zero.  */
-static __inline __m128d
-_mm_load_sd (double const *__P)
-{
-  return (__m128d) __builtin_ia32_loadsd (__P);
-}
-
-/* Create a vector with all two elements equal to *P.  */
-static __inline __m128d
-_mm_load1_pd (double const *__P)
-{
-  __v2df __tmp = __builtin_ia32_loadsd (__P);
-  return (__m128d) __builtin_ia32_shufpd (__tmp, __tmp, _MM_SHUFFLE2 (0,0));
-}
-
-static __inline __m128d
-_mm_load_pd1 (double const *__P)
-{
-  return _mm_load1_pd (__P);
-}
-
-/* Load two DPFP values from P.  The address must be 16-byte aligned.  */
-static __inline __m128d
-_mm_load_pd (double const *__P)
-{
-  return (__m128d) __builtin_ia32_loadapd (__P);
-}
-
-/* Load two DPFP values from P.  The address need not be 16-byte aligned.  */
-static __inline __m128d
-_mm_loadu_pd (double const *__P)
-{
-  return (__m128d) __builtin_ia32_loadupd (__P);
-}
-
-/* Load two DPFP values in reverse order.  The address must be aligned.  */
-static __inline __m128d
-_mm_loadr_pd (double const *__P)
-{
-  __v2df __tmp = __builtin_ia32_loadapd (__P);
-  return (__m128d) __builtin_ia32_shufpd (__tmp, __tmp, _MM_SHUFFLE2 (0,1));
-}
-
-/* Create a vector with element 0 as F and the rest zero.  */
-static __inline __m128d
-_mm_set_sd (double __F)
-{
-  return (__m128d) __builtin_ia32_loadsd (&__F);
-}
-
-/* Create a vector with all two elements equal to F.  */
-static __inline __m128d
-_mm_set1_pd (double __F)
-{
-  __v2df __tmp = __builtin_ia32_loadsd (&__F);
-  return (__m128d) __builtin_ia32_shufpd (__tmp, __tmp, _MM_SHUFFLE2 (0,0));
-}
-
-static __inline __m128d
-_mm_set_pd1 (double __F)
-{
-  return _mm_set1_pd (__F);
-}
-
-/* Create the vector [Z Y].  */
-static __inline __m128d
-_mm_set_pd (double __Z, double __Y)
-{
-  return (__v2df) {__Y, __Z};
-}
-
-/* Create the vector [Y Z].  */
-static __inline __m128d
-_mm_setr_pd (double __Z, double __Y)
-{
-  return _mm_set_pd (__Y, __Z);
-}
-
-/* Create a vector of zeros.  */
-static __inline __m128d
-_mm_setzero_pd (void)
-{
-  return (__m128d) __builtin_ia32_setzeropd ();
-}
-
-/* Stores the lower DPFP value.  */
-static __inline void
-_mm_store_sd (double *__P, __m128d __A)
-{
-  __builtin_ia32_storesd (__P, (__v2df)__A);
-}
-
-/* Store the lower DPFP value across two words.  */
-static __inline void
-_mm_store1_pd (double *__P, __m128d __A)
-{
-  __v2df __va = (__v2df)__A;
-  __v2df __tmp = __builtin_ia32_shufpd (__va, __va, _MM_SHUFFLE2 (0,0));
-  __builtin_ia32_storeapd (__P, __tmp);
-}
-
-static __inline void
-_mm_store_pd1 (double *__P, __m128d __A)
-{
-  _mm_store1_pd (__P, __A);
-}
-
-/* Store two DPFP values.  The address must be 16-byte aligned.  */
-static __inline void
-_mm_store_pd (double *__P, __m128d __A)
-{
-  __builtin_ia32_storeapd (__P, (__v2df)__A);
-}
-
-/* Store two DPFP values.  The address need not be 16-byte aligned.  */
-static __inline void
-_mm_storeu_pd (double *__P, __m128d __A)
-{
-  __builtin_ia32_storeupd (__P, (__v2df)__A);
-}
-
-/* Store two DPFP values in reverse order.  The address must be aligned.  */
-static __inline void
-_mm_storer_pd (double *__P, __m128d __A)
-{
-  __v2df __va = (__v2df)__A;
-  __v2df __tmp = __builtin_ia32_shufpd (__va, __va, _MM_SHUFFLE2 (0,1));
-  __builtin_ia32_storeapd (__P, __tmp);
-}
-
-/* Sets the low DPFP value of A from the low value of B.  */
-static __inline __m128d
-_mm_move_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d) __builtin_ia32_movsd ((__v2df)__A, (__v2df)__B);
-}
-
-
-static __inline __m128d
-_mm_add_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_addpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_add_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_addsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_sub_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_subpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_sub_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_subsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_mul_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_mulpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_mul_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_mulsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_div_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_divpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_div_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_divsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_sqrt_pd (__m128d __A)
-{
-  return (__m128d)__builtin_ia32_sqrtpd ((__v2df)__A);
-}
-
-/* Return pair {sqrt (A[0), B[1]}.  */
-static __inline __m128d
-_mm_sqrt_sd (__m128d __A, __m128d __B)
-{
-  __v2df __tmp = __builtin_ia32_movsd ((__v2df)__A, (__v2df)__B);
-  return (__m128d)__builtin_ia32_sqrtsd ((__v2df)__tmp);
-}
-
-static __inline __m128d
-_mm_min_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_minpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_min_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_minsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_max_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_maxpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_max_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_maxsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_and_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_andpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_andnot_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_andnpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_or_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_orpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_xor_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_xorpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpeq_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpeqpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmplt_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpltpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmple_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmplepd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpgt_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpgtpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpge_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpgepd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpneq_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpneqpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpnlt_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpnltpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpnle_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpnlepd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpngt_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpngtpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpnge_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpngepd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpord_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpordpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpunord_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpunordpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpeq_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpeqsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmplt_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpltsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmple_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmplesd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpgt_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d) __builtin_ia32_movsd ((__v2df) __A,
-					 (__v2df)
-					 __builtin_ia32_cmpltsd ((__v2df) __B,
-								 (__v2df)
-								 __A));
-}
-
-static __inline __m128d
-_mm_cmpge_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d) __builtin_ia32_movsd ((__v2df) __A,
-					 (__v2df)
-					 __builtin_ia32_cmplesd ((__v2df) __B,
-								 (__v2df)
-								 __A));
-}
-
-static __inline __m128d
-_mm_cmpneq_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpneqsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpnlt_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpnltsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpnle_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpnlesd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpngt_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d) __builtin_ia32_movsd ((__v2df) __A,
-					 (__v2df)
-					 __builtin_ia32_cmpnltsd ((__v2df) __B,
-								  (__v2df)
-								  __A));
-}
-
-static __inline __m128d
-_mm_cmpnge_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d) __builtin_ia32_movsd ((__v2df) __A,
-					 (__v2df)
-					 __builtin_ia32_cmpnlesd ((__v2df) __B,
-								  (__v2df)
-								  __A));
-}
-
-static __inline __m128d
-_mm_cmpord_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpordsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_cmpunord_sd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_cmpunordsd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_comieq_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_comisdeq ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_comilt_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_comisdlt ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_comile_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_comisdle ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_comigt_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_comisdgt ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_comige_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_comisdge ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_comineq_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_comisdneq ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_ucomieq_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_ucomisdeq ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_ucomilt_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_ucomisdlt ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_ucomile_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_ucomisdle ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_ucomigt_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_ucomisdgt ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_ucomige_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_ucomisdge ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_ucomineq_sd (__m128d __A, __m128d __B)
-{
-  return __builtin_ia32_ucomisdneq ((__v2df)__A, (__v2df)__B);
-}
-
-/* Create a vector with element 0 as *P and the rest zero.  */
-
-static __inline __m128i
-_mm_load_si128 (__m128i const *__P)
-{
-  return (__m128i) __builtin_ia32_loaddqa ((char const *)__P);
-}
-
-static __inline __m128i
-_mm_loadu_si128 (__m128i const *__P)
-{
-  return (__m128i) __builtin_ia32_loaddqu ((char const *)__P);
-}
-
-static __inline __m128i
-_mm_loadl_epi64 (__m128i const *__P)
-{
-  return (__m128i) __builtin_ia32_movq2dq (*(unsigned long long *)__P);
-}
-
-static __inline void
-_mm_store_si128 (__m128i *__P, __m128i __B)
-{
-  __builtin_ia32_storedqa ((char *)__P, (__v16qi)__B);
-}
-
-static __inline void
-_mm_storeu_si128 (__m128i *__P, __m128i __B)
-{
-  __builtin_ia32_storedqu ((char *)__P, (__v16qi)__B);
-}
-
-static __inline void
-_mm_storel_epi64 (__m128i *__P, __m128i __B)
-{
-  *(long long *)__P = __builtin_ia32_movdq2q ((__v2di)__B);
-}
-
-static __inline __m64
-_mm_movepi64_pi64 (__m128i __B)
-{
-  return (__m64) __builtin_ia32_movdq2q ((__v2di)__B);
-}
-
-static __inline __m128i
-_mm_move_epi64 (__m128i __A)
-{
-  return (__m128i) __builtin_ia32_movq ((__v2di)__A);
-}
-
-/* Create a vector of zeros.  */
-static __inline __m128i
-_mm_setzero_si128 (void)
-{
-  return (__m128i) __builtin_ia32_setzero128 ();
-}
-
-static __inline __m128i
-_mm_set_epi64 (__m64 __A,  __m64 __B)
-{
-  __v2di __tmp = (__v2di)__builtin_ia32_movq2dq ((unsigned long long)__A);
-  __v2di __tmp2 = (__v2di)__builtin_ia32_movq2dq ((unsigned long long)__B);
-  return (__m128i)__builtin_ia32_punpcklqdq128 (__tmp2, __tmp);
-}
-
-/* Create the vector [Z Y X W].  */
-static __inline __m128i
-_mm_set_epi32 (int __Z, int __Y, int __X, int __W)
-{
-  union {
-    int __a[4];
-    __m128i __v;
-  } __u;
-
-  __u.__a[0] = __W;
-  __u.__a[1] = __X;
-  __u.__a[2] = __Y;
-  __u.__a[3] = __Z;
-
-  return __u.__v;
-}
-
-#ifdef __x86_64__
-/* Create the vector [Z Y].  */
-static __inline __m128i
-_mm_set_epi64x (long long __Z, long long __Y)
-{
-  union {
-    long __a[2];
-    __m128i __v;
-  } __u;
-
-  __u.__a[0] = __Y;
-  __u.__a[1] = __Z;
-
-  return __u.__v;
-}
-#endif
-
-/* Create the vector [S T U V Z Y X W].  */
-static __inline __m128i
-_mm_set_epi16 (short __Z, short __Y, short __X, short __W,
-	       short __V, short __U, short __T, short __S)
-{
-  union {
-    short __a[8];
-    __m128i __v;
-  } __u;
-
-  __u.__a[0] = __S;
-  __u.__a[1] = __T;
-  __u.__a[2] = __U;
-  __u.__a[3] = __V;
-  __u.__a[4] = __W;
-  __u.__a[5] = __X;
-  __u.__a[6] = __Y;
-  __u.__a[7] = __Z;
-
-  return __u.__v;
-}
-
-/* Create the vector [S T U V Z Y X W].  */
-static __inline __m128i
-_mm_set_epi8 (char __Z, char __Y, char __X, char __W,
-	      char __V, char __U, char __T, char __S,
-	      char __Z1, char __Y1, char __X1, char __W1,
-	      char __V1, char __U1, char __T1, char __S1)
-{
-  union {
-    char __a[16];
-    __m128i __v;
-  } __u;
-
-  __u.__a[0] = __S1;
-  __u.__a[1] = __T1;
-  __u.__a[2] = __U1;
-  __u.__a[3] = __V1;
-  __u.__a[4] = __W1;
-  __u.__a[5] = __X1;
-  __u.__a[6] = __Y1;
-  __u.__a[7] = __Z1;
-  __u.__a[8] = __S;
-  __u.__a[9] = __T;
-  __u.__a[10] = __U;
-  __u.__a[11] = __V;
-  __u.__a[12] = __W;
-  __u.__a[13] = __X;
-  __u.__a[14] = __Y;
-  __u.__a[15] = __Z;
-
-  return __u.__v;
-}
-
-static __inline __m128i
-_mm_set1_epi64 (__m64 __A)
-{
-  __v2di __tmp = (__v2di)__builtin_ia32_movq2dq ((unsigned long long)__A);
-  return (__m128i)__builtin_ia32_punpcklqdq128 (__tmp, __tmp);
-}
-
-static __inline __m128i
-_mm_set1_epi32 (int __A)
-{
-  __v4si __tmp = (__v4si)__builtin_ia32_loadd (&__A);
-  return (__m128i) __builtin_ia32_pshufd ((__v4si)__tmp, _MM_SHUFFLE (0,0,0,0));
-}
-
-#ifdef __x86_64__
-static __inline __m128i
-_mm_set1_epi64x (long long __A)
-{
-  __v2di __tmp = (__v2di)__builtin_ia32_movq2dq ((unsigned long long)__A);
-  return (__m128i) __builtin_ia32_shufpd ((__v2df)__tmp, (__v2df)__tmp, _MM_SHUFFLE2 (0,0));
-}
-#endif
-
-static __inline __m128i
-_mm_set1_epi16 (short __A)
-{
-  int __Acopy = (unsigned short)__A;
-  __v4si __tmp = (__v4si)__builtin_ia32_loadd (&__Acopy);
-  __tmp = (__v4si)__builtin_ia32_punpcklwd128 ((__v8hi)__tmp, (__v8hi)__tmp);
-  return (__m128i) __builtin_ia32_pshufd ((__v4si)__tmp, _MM_SHUFFLE (0,0,0,0));
-}
-
-static __inline __m128i
-_mm_set1_epi8 (char __A)
-{
-  int __Acopy = (unsigned char)__A;
-  __v4si __tmp = (__v4si)__builtin_ia32_loadd (&__Acopy);
-  __tmp = (__v4si)__builtin_ia32_punpcklbw128 ((__v16qi)__tmp, (__v16qi)__tmp);
-  __tmp = (__v4si)__builtin_ia32_punpcklbw128 ((__v16qi)__tmp, (__v16qi)__tmp);
-  return (__m128i) __builtin_ia32_pshufd ((__v4si)__tmp, _MM_SHUFFLE (0,0,0,0));
-}
-
-static __inline __m128i
-_mm_setr_epi64 (__m64 __A,  __m64 __B)
-{
-  __v2di __tmp = (__v2di)__builtin_ia32_movq2dq ((unsigned long long)__A);
-  __v2di __tmp2 = (__v2di)__builtin_ia32_movq2dq ((unsigned long long)__B);
-  return (__m128i)__builtin_ia32_punpcklqdq128 (__tmp, __tmp2);
-}
-
-/* Create the vector [Z Y X W].  */
-static __inline __m128i
-_mm_setr_epi32 (int __W, int __X, int __Y, int __Z)
-{
-  union {
-    int __a[4];
-    __m128i __v;
-  } __u;
-
-  __u.__a[0] = __W;
-  __u.__a[1] = __X;
-  __u.__a[2] = __Y;
-  __u.__a[3] = __Z;
-
-  return __u.__v;
-}
-/* Create the vector [S T U V Z Y X W].  */
-static __inline __m128i
-_mm_setr_epi16 (short __S, short __T, short __U, short __V,
-	        short __W, short __X, short __Y, short __Z)
-{
-  union {
-    short __a[8];
-    __m128i __v;
-  } __u;
-
-  __u.__a[0] = __S;
-  __u.__a[1] = __T;
-  __u.__a[2] = __U;
-  __u.__a[3] = __V;
-  __u.__a[4] = __W;
-  __u.__a[5] = __X;
-  __u.__a[6] = __Y;
-  __u.__a[7] = __Z;
-
-  return __u.__v;
-}
-
-/* Create the vector [S T U V Z Y X W].  */
-static __inline __m128i
-_mm_setr_epi8 (char __S1, char __T1, char __U1, char __V1,
-	       char __W1, char __X1, char __Y1, char __Z1,
-	       char __S, char __T, char __U, char __V,
-	       char __W, char __X, char __Y, char __Z)
-{
-  union {
-    char __a[16];
-    __m128i __v;
-  } __u;
-
-  __u.__a[0] = __S1;
-  __u.__a[1] = __T1;
-  __u.__a[2] = __U1;
-  __u.__a[3] = __V1;
-  __u.__a[4] = __W1;
-  __u.__a[5] = __X1;
-  __u.__a[6] = __Y1;
-  __u.__a[7] = __Z1;
-  __u.__a[8] = __S;
-  __u.__a[9] = __T;
-  __u.__a[10] = __U;
-  __u.__a[11] = __V;
-  __u.__a[12] = __W;
-  __u.__a[13] = __X;
-  __u.__a[14] = __Y;
-  __u.__a[15] = __Z;
-
-  return __u.__v;
-}
-
-static __inline __m128d
-_mm_cvtepi32_pd (__m128i __A)
-{
-  return (__m128d)__builtin_ia32_cvtdq2pd ((__v4si) __A);
-}
-
-static __inline __m128
-_mm_cvtepi32_ps (__m128i __A)
-{
-  return (__m128)__builtin_ia32_cvtdq2ps ((__v4si) __A);
-}
-
-static __inline __m128i
-_mm_cvtpd_epi32 (__m128d __A)
-{
-  return (__m128i)__builtin_ia32_cvtpd2dq ((__v2df) __A);
-}
-
-static __inline __m64
-_mm_cvtpd_pi32 (__m128d __A)
-{
-  return (__m64)__builtin_ia32_cvtpd2pi ((__v2df) __A);
-}
-
-static __inline __m128
-_mm_cvtpd_ps (__m128d __A)
-{
-  return (__m128)__builtin_ia32_cvtpd2ps ((__v2df) __A);
-}
-
-static __inline __m128i
-_mm_cvttpd_epi32 (__m128d __A)
-{
-  return (__m128i)__builtin_ia32_cvttpd2dq ((__v2df) __A);
-}
-
-static __inline __m64
-_mm_cvttpd_pi32 (__m128d __A)
-{
-  return (__m64)__builtin_ia32_cvttpd2pi ((__v2df) __A);
-}
-
-static __inline __m128d
-_mm_cvtpi32_pd (__m64 __A)
-{
-  return (__m128d)__builtin_ia32_cvtpi2pd ((__v2si) __A);
-}
-
-static __inline __m128i
-_mm_cvtps_epi32 (__m128 __A)
-{
-  return (__m128i)__builtin_ia32_cvtps2dq ((__v4sf) __A);
-}
-
-static __inline __m128i
-_mm_cvttps_epi32 (__m128 __A)
-{
-  return (__m128i)__builtin_ia32_cvttps2dq ((__v4sf) __A);
-}
-
-static __inline __m128d
-_mm_cvtps_pd (__m128 __A)
-{
-  return (__m128d)__builtin_ia32_cvtps2pd ((__v4sf) __A);
-}
-
-static __inline int
-_mm_cvtsd_si32 (__m128d __A)
-{
-  return __builtin_ia32_cvtsd2si ((__v2df) __A);
-}
-
-#ifdef __x86_64__
-static __inline long long
-_mm_cvtsd_si64x (__m128d __A)
-{
-  return __builtin_ia32_cvtsd2si64 ((__v2df) __A);
-}
-#endif
-
-static __inline int
-_mm_cvttsd_si32 (__m128d __A)
-{
-  return __builtin_ia32_cvttsd2si ((__v2df) __A);
-}
-
-#ifdef __x86_64__
-static __inline long long
-_mm_cvttsd_si64x (__m128d __A)
-{
-  return __builtin_ia32_cvttsd2si64 ((__v2df) __A);
-}
-#endif
-
-static __inline __m128
-_mm_cvtsd_ss (__m128 __A, __m128d __B)
-{
-  return (__m128)__builtin_ia32_cvtsd2ss ((__v4sf) __A, (__v2df) __B);
-}
-
-static __inline __m128d
-_mm_cvtsi32_sd (__m128d __A, int __B)
-{
-  return (__m128d)__builtin_ia32_cvtsi2sd ((__v2df) __A, __B);
-}
-
-#ifdef __x86_64__
-static __inline __m128d
-_mm_cvtsi64x_sd (__m128d __A, long long __B)
-{
-  return (__m128d)__builtin_ia32_cvtsi642sd ((__v2df) __A, __B);
-}
-#endif
-
-static __inline __m128d
-_mm_cvtss_sd (__m128d __A, __m128 __B)
-{
-  return (__m128d)__builtin_ia32_cvtss2sd ((__v2df) __A, (__v4sf)__B);
-}
-
-#define _mm_shuffle_pd(__A, __B, __C) ((__m128d)__builtin_ia32_shufpd ((__v2df)__A, (__v2df)__B, (__C)))
-
-static __inline __m128d
-_mm_unpackhi_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_unpckhpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_unpacklo_pd (__m128d __A, __m128d __B)
-{
-  return (__m128d)__builtin_ia32_unpcklpd ((__v2df)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_loadh_pd (__m128d __A, double const *__B)
-{
-  return (__m128d)__builtin_ia32_loadhpd ((__v2df)__A, (__v2si *)__B);
-}
-
-static __inline void
-_mm_storeh_pd (double *__A, __m128d __B)
-{
-  __builtin_ia32_storehpd ((__v2si *)__A, (__v2df)__B);
-}
-
-static __inline __m128d
-_mm_loadl_pd (__m128d __A, double const *__B)
-{
-  return (__m128d)__builtin_ia32_loadlpd ((__v2df)__A, (__v2si *)__B);
-}
-
-static __inline void
-_mm_storel_pd (double *__A, __m128d __B)
-{
-  __builtin_ia32_storelpd ((__v2si *)__A, (__v2df)__B);
-}
-
-static __inline int
-_mm_movemask_pd (__m128d __A)
-{
-  return __builtin_ia32_movmskpd ((__v2df)__A);
-}
-
-static __inline __m128i
-_mm_packs_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_packsswb128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_packs_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_packssdw128 ((__v4si)__A, (__v4si)__B);
-}
-
-static __inline __m128i
-_mm_packus_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_packuswb128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_unpackhi_epi8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_punpckhbw128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_unpackhi_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_punpckhwd128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_unpackhi_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_punpckhdq128 ((__v4si)__A, (__v4si)__B);
-}
-
-static __inline __m128i
-_mm_unpackhi_epi64 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_punpckhqdq128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_unpacklo_epi8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_punpcklbw128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_unpacklo_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_punpcklwd128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_unpacklo_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_punpckldq128 ((__v4si)__A, (__v4si)__B);
-}
-
-static __inline __m128i
-_mm_unpacklo_epi64 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_punpcklqdq128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_add_epi8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_paddb128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_add_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_paddw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_add_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_paddd128 ((__v4si)__A, (__v4si)__B);
-}
-
-static __inline __m128i
-_mm_add_epi64 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_paddq128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_adds_epi8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_paddsb128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_adds_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_paddsw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_adds_epu8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_paddusb128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_adds_epu16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_paddusw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_sub_epi8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psubb128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_sub_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psubw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_sub_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psubd128 ((__v4si)__A, (__v4si)__B);
-}
-
-static __inline __m128i
-_mm_sub_epi64 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psubq128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_subs_epi8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psubsb128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_subs_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psubsw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_subs_epu8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psubusb128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_subs_epu16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psubusw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_madd_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pmaddwd128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_mulhi_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pmulhw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_mullo_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pmullw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m64
-_mm_mul_su32 (__m64 __A, __m64 __B)
-{
-  return (__m64)__builtin_ia32_pmuludq ((__v2si)__A, (__v2si)__B);
-}
-
-static __inline __m128i
-_mm_mul_epu32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pmuludq128 ((__v4si)__A, (__v4si)__B);
-}
-
-static __inline __m128i
-_mm_sll_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psllw128 ((__v8hi)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_sll_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pslld128 ((__v4si)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_sll_epi64 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psllq128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_sra_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psraw128 ((__v8hi)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_sra_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psrad128 ((__v4si)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_srl_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psrlw128 ((__v8hi)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_srl_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psrld128 ((__v4si)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_srl_epi64 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psrlq128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_slli_epi16 (__m128i __A, int __B)
-{
-  return (__m128i)__builtin_ia32_psllwi128 ((__v8hi)__A, __B);
-}
-
-static __inline __m128i
-_mm_slli_epi32 (__m128i __A, int __B)
-{
-  return (__m128i)__builtin_ia32_pslldi128 ((__v4si)__A, __B);
-}
-
-static __inline __m128i
-_mm_slli_epi64 (__m128i __A, int __B)
-{
-  return (__m128i)__builtin_ia32_psllqi128 ((__v2di)__A, __B);
-}
-
-static __inline __m128i
-_mm_srai_epi16 (__m128i __A, int __B)
-{
-  return (__m128i)__builtin_ia32_psrawi128 ((__v8hi)__A, __B);
-}
-
-static __inline __m128i
-_mm_srai_epi32 (__m128i __A, int __B)
-{
-  return (__m128i)__builtin_ia32_psradi128 ((__v4si)__A, __B);
-}
-
-#if 0
-static __m128i __attribute__((__always_inline__))
-_mm_srli_si128 (__m128i __A, const int __B)
-{
-  return ((__m128i)__builtin_ia32_psrldqi128 (__A, __B))
-}
-
-static __m128i __attribute__((__always_inline__))
-_mm_srli_si128 (__m128i __A, const int __B)
-{
-  return ((__m128i)__builtin_ia32_pslldqi128 (__A, __B))
-}
-#endif
-#define _mm_srli_si128(__A, __B) ((__m128i)__builtin_ia32_psrldqi128 (__A, __B))
-#define _mm_slli_si128(__A, __B) ((__m128i)__builtin_ia32_pslldqi128 (__A, __B))
-
-static __inline __m128i
-_mm_srli_epi16 (__m128i __A, int __B)
-{
-  return (__m128i)__builtin_ia32_psrlwi128 ((__v8hi)__A, __B);
-}
-
-static __inline __m128i
-_mm_srli_epi32 (__m128i __A, int __B)
-{
-  return (__m128i)__builtin_ia32_psrldi128 ((__v4si)__A, __B);
-}
-
-static __inline __m128i
-_mm_srli_epi64 (__m128i __A, int __B)
-{
-  return (__m128i)__builtin_ia32_psrlqi128 ((__v2di)__A, __B);
-}
-
-static __inline __m128i
-_mm_and_si128 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pand128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_andnot_si128 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pandn128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_or_si128 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_por128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_xor_si128 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pxor128 ((__v2di)__A, (__v2di)__B);
-}
-
-static __inline __m128i
-_mm_cmpeq_epi8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pcmpeqb128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_cmpeq_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pcmpeqw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_cmpeq_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pcmpeqd128 ((__v4si)__A, (__v4si)__B);
-}
-
-static __inline __m128i
-_mm_cmplt_epi8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pcmpgtb128 ((__v16qi)__B, (__v16qi)__A);
-}
-
-static __inline __m128i
-_mm_cmplt_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pcmpgtw128 ((__v8hi)__B, (__v8hi)__A);
-}
-
-static __inline __m128i
-_mm_cmplt_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pcmpgtd128 ((__v4si)__B, (__v4si)__A);
-}
-
-static __inline __m128i
-_mm_cmpgt_epi8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pcmpgtb128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_cmpgt_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pcmpgtw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_cmpgt_epi32 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pcmpgtd128 ((__v4si)__A, (__v4si)__B);
-}
-
-#define _mm_extract_epi16(__A, __B) __builtin_ia32_pextrw128 ((__v8hi)__A, __B)
-
-#define _mm_insert_epi16(__A, __B, __C) ((__m128i)__builtin_ia32_pinsrw128 ((__v8hi)__A, __B, __C))
-
-static __inline __m128i
-_mm_max_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pmaxsw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_max_epu8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pmaxub128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_min_epi16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pminsw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_min_epu8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pminub128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline int
-_mm_movemask_epi8 (__m128i __A)
-{
-  return __builtin_ia32_pmovmskb128 ((__v16qi)__A);
-}
-
-static __inline __m128i
-_mm_mulhi_epu16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pmulhuw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-#define _mm_shufflehi_epi16(__A, __B) ((__m128i)__builtin_ia32_pshufhw ((__v8hi)__A, __B))
-#define _mm_shufflelo_epi16(__A, __B) ((__m128i)__builtin_ia32_pshuflw ((__v8hi)__A, __B))
-#define _mm_shuffle_epi32(__A, __B) ((__m128i)__builtin_ia32_pshufd ((__v4si)__A, __B))
-
-static __inline void
-_mm_maskmoveu_si128 (__m128i __A, __m128i __B, char *__C)
-{
-  __builtin_ia32_maskmovdqu ((__v16qi)__A, (__v16qi)__B, __C);
-}
-
-static __inline __m128i
-_mm_avg_epu8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pavgb128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline __m128i
-_mm_avg_epu16 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_pavgw128 ((__v8hi)__A, (__v8hi)__B);
-}
-
-static __inline __m128i
-_mm_sad_epu8 (__m128i __A, __m128i __B)
-{
-  return (__m128i)__builtin_ia32_psadbw128 ((__v16qi)__A, (__v16qi)__B);
-}
-
-static __inline void
-_mm_stream_si32 (int *__A, int __B)
-{
-  __builtin_ia32_movnti (__A, __B);
-}
-
-static __inline void
-_mm_stream_si128 (__m128i *__A, __m128i __B)
-{
-  __builtin_ia32_movntdq ((__v2di *)__A, (__v2di)__B);
-}
-
-static __inline void
-_mm_stream_pd (double *__A, __m128d __B)
-{
-  __builtin_ia32_movntpd (__A, (__v2df)__B);
-}
-
-static __inline __m128i
-_mm_movpi64_epi64 (__m64 __A)
-{
-  return (__m128i)__builtin_ia32_movq2dq ((unsigned long long)__A);
-}
-
-static __inline void
-_mm_clflush (void const *__A)
-{
-  return __builtin_ia32_clflush (__A);
-}
-
-static __inline void
-_mm_lfence (void)
-{
-  __builtin_ia32_lfence ();
-}
-
-static __inline void
-_mm_mfence (void)
-{
-  __builtin_ia32_mfence ();
-}
-
-static __inline __m128i
-_mm_cvtsi32_si128 (int __A)
-{
-  return (__m128i) __builtin_ia32_loadd (&__A);
-}
-
-#ifdef __x86_64__
-static __inline __m128i
-_mm_cvtsi64x_si128 (long long __A)
-{
-  return (__m128i) __builtin_ia32_movq2dq (__A);
-}
-#endif
-
-static __inline int
-_mm_cvtsi128_si32 (__m128i __A)
-{
-  int __tmp;
-  __builtin_ia32_stored (&__tmp, (__v4si)__A);
-  return __tmp;
-}
-
-#ifdef __x86_64__
-static __inline long long
-_mm_cvtsi128_si64x (__m128i __A)
-{
-  return __builtin_ia32_movdq2q ((__v2di)__A);
-}
-#endif
-
-#endif /* __SSE2__  */
-
-#endif /* _EMMINTRIN_H_INCLUDED */
diff --git a/include.new/err.h b/include.new/err.h
deleted file mode 100644
index 95ed509..0000000
--- a/include.new/err.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 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. 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.
- *
- *	@(#)err.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/err.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _ERR_H_
-#define	_ERR_H_
-
-/*
- * Don't use va_list in the err/warn prototypes.   Va_list is typedef'd in two
- * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
- * of them here we may collide with the utility's includes.  It's unreasonable
- * for utilities to have to include one of them to include err.h, so we get
- * __va_list from <sys/_types.h> and use it.
- */
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-__BEGIN_DECLS
-void	err(int, const char *, ...) __dead2 __printf0like(2, 3);
-void	verr(int, const char *, __va_list) __dead2 __printf0like(2, 0);
-void	errc(int, int, const char *, ...) __dead2 __printf0like(3, 4);
-void	verrc(int, int, const char *, __va_list) __dead2
-	    __printf0like(3, 0);
-void	errx(int, const char *, ...) __dead2 __printf0like(2, 3);
-void	verrx(int, const char *, __va_list) __dead2 __printf0like(2, 0);
-void	warn(const char *, ...) __printf0like(1, 2);
-void	vwarn(const char *, __va_list) __printf0like(1, 0);
-void	warnc(int, const char *, ...) __printf0like(2, 3);
-void	vwarnc(int, const char *, __va_list) __printf0like(2, 0);
-void	warnx(const char *, ...) __printflike(1, 2);
-void	vwarnx(const char *, __va_list) __printflike(1, 0);
-void	err_set_file(void *);
-void	err_set_exit(void (*)(int));
-__END_DECLS
-
-#endif /* !_ERR_H_ */
diff --git a/include.new/errno.h b/include.new/errno.h
deleted file mode 100644
index 690ae14..0000000
--- a/include.new/errno.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/errno.h 250250 2013-05-04 19:07:22Z pluknet $
- */
-
-#ifndef _SYS_ERRNO_H_
-#define _SYS_ERRNO_H_
-
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-int *	__error(void);
-__END_DECLS
-#define	errno		(* __error())
-#endif
-
-#define	EPERM		1		/* Operation not permitted */
-#define	ENOENT		2		/* No such file or directory */
-#define	ESRCH		3		/* No such process */
-#define	EINTR		4		/* Interrupted system call */
-#define	EIO		5		/* Input/output error */
-#define	ENXIO		6		/* Device not configured */
-#define	E2BIG		7		/* Argument list too long */
-#define	ENOEXEC		8		/* Exec format error */
-#define	EBADF		9		/* Bad file descriptor */
-#define	ECHILD		10		/* No child processes */
-#define	EDEADLK		11		/* Resource deadlock avoided */
-					/* 11 was EAGAIN */
-#define	ENOMEM		12		/* Cannot allocate memory */
-#define	EACCES		13		/* Permission denied */
-#define	EFAULT		14		/* Bad address */
-#ifndef _POSIX_SOURCE
-#define	ENOTBLK		15		/* Block device required */
-#endif
-#define	EBUSY		16		/* Device busy */
-#define	EEXIST		17		/* File exists */
-#define	EXDEV		18		/* Cross-device link */
-#define	ENODEV		19		/* Operation not supported by device */
-#define	ENOTDIR		20		/* Not a directory */
-#define	EISDIR		21		/* Is a directory */
-#define	EINVAL		22		/* Invalid argument */
-#define	ENFILE		23		/* Too many open files in system */
-#define	EMFILE		24		/* Too many open files */
-#define	ENOTTY		25		/* Inappropriate ioctl for device */
-#ifndef _POSIX_SOURCE
-#define	ETXTBSY		26		/* Text file busy */
-#endif
-#define	EFBIG		27		/* File too large */
-#define	ENOSPC		28		/* No space left on device */
-#define	ESPIPE		29		/* Illegal seek */
-#define	EROFS		30		/* Read-only filesystem */
-#define	EMLINK		31		/* Too many links */
-#define	EPIPE		32		/* Broken pipe */
-
-/* math software */
-#define	EDOM		33		/* Numerical argument out of domain */
-#define	ERANGE		34		/* Result too large */
-
-/* non-blocking and interrupt i/o */
-#define	EAGAIN		35		/* Resource temporarily unavailable */
-#ifndef _POSIX_SOURCE
-#define	EWOULDBLOCK	EAGAIN		/* Operation would block */
-#define	EINPROGRESS	36		/* Operation now in progress */
-#define	EALREADY	37		/* Operation already in progress */
-
-/* ipc/network software -- argument errors */
-#define	ENOTSOCK	38		/* Socket operation on non-socket */
-#define	EDESTADDRREQ	39		/* Destination address required */
-#define	EMSGSIZE	40		/* Message too long */
-#define	EPROTOTYPE	41		/* Protocol wrong type for socket */
-#define	ENOPROTOOPT	42		/* Protocol not available */
-#define	EPROTONOSUPPORT	43		/* Protocol not supported */
-#define	ESOCKTNOSUPPORT	44		/* Socket type not supported */
-#define	EOPNOTSUPP	45		/* Operation not supported */
-#define	ENOTSUP		EOPNOTSUPP	/* Operation not supported */
-#define	EPFNOSUPPORT	46		/* Protocol family not supported */
-#define	EAFNOSUPPORT	47		/* Address family not supported by protocol family */
-#define	EADDRINUSE	48		/* Address already in use */
-#define	EADDRNOTAVAIL	49		/* Can't assign requested address */
-
-/* ipc/network software -- operational errors */
-#define	ENETDOWN	50		/* Network is down */
-#define	ENETUNREACH	51		/* Network is unreachable */
-#define	ENETRESET	52		/* Network dropped connection on reset */
-#define	ECONNABORTED	53		/* Software caused connection abort */
-#define	ECONNRESET	54		/* Connection reset by peer */
-#define	ENOBUFS		55		/* No buffer space available */
-#define	EISCONN		56		/* Socket is already connected */
-#define	ENOTCONN	57		/* Socket is not connected */
-#define	ESHUTDOWN	58		/* Can't send after socket shutdown */
-#define	ETOOMANYREFS	59		/* Too many references: can't splice */
-#define	ETIMEDOUT	60		/* Operation timed out */
-#define	ECONNREFUSED	61		/* Connection refused */
-
-#define	ELOOP		62		/* Too many levels of symbolic links */
-#endif /* _POSIX_SOURCE */
-#define	ENAMETOOLONG	63		/* File name too long */
-
-/* should be rearranged */
-#ifndef _POSIX_SOURCE
-#define	EHOSTDOWN	64		/* Host is down */
-#define	EHOSTUNREACH	65		/* No route to host */
-#endif /* _POSIX_SOURCE */
-#define	ENOTEMPTY	66		/* Directory not empty */
-
-/* quotas & mush */
-#ifndef _POSIX_SOURCE
-#define	EPROCLIM	67		/* Too many processes */
-#define	EUSERS		68		/* Too many users */
-#define	EDQUOT		69		/* Disc quota exceeded */
-
-/* Network File System */
-#define	ESTALE		70		/* Stale NFS file handle */
-#define	EREMOTE		71		/* Too many levels of remote in path */
-#define	EBADRPC		72		/* RPC struct is bad */
-#define	ERPCMISMATCH	73		/* RPC version wrong */
-#define	EPROGUNAVAIL	74		/* RPC prog. not avail */
-#define	EPROGMISMATCH	75		/* Program version wrong */
-#define	EPROCUNAVAIL	76		/* Bad procedure for program */
-#endif /* _POSIX_SOURCE */
-
-#define	ENOLCK		77		/* No locks available */
-#define	ENOSYS		78		/* Function not implemented */
-
-#ifndef _POSIX_SOURCE
-#define	EFTYPE		79		/* Inappropriate file type or format */
-#define	EAUTH		80		/* Authentication error */
-#define	ENEEDAUTH	81		/* Need authenticator */
-#define	EIDRM		82		/* Identifier removed */
-#define	ENOMSG		83		/* No message of desired type */
-#define	EOVERFLOW	84		/* Value too large to be stored in data type */
-#define	ECANCELED	85		/* Operation canceled */
-#define	EILSEQ		86		/* Illegal byte sequence */
-#define	ENOATTR		87		/* Attribute not found */
-
-#define	EDOOFUS		88		/* Programming error */
-#endif /* _POSIX_SOURCE */
-
-#define	EBADMSG		89		/* Bad message */
-#define	EMULTIHOP	90		/* Multihop attempted */
-#define	ENOLINK		91		/* Link has been severed */
-#define	EPROTO		92		/* Protocol error */
-
-#ifndef _POSIX_SOURCE
-#define	ENOTCAPABLE	93		/* Capabilities insufficient */
-#define	ECAPMODE	94		/* Not permitted in capability mode */
-#define	ENOTRECOVERABLE	95		/* State not recoverable */
-#define	EOWNERDEAD	96		/* Previous owner died */
-#endif /* _POSIX_SOURCE */
-
-#ifndef _POSIX_SOURCE
-#define	ELAST		96		/* Must be equal largest errno */
-#endif /* _POSIX_SOURCE */
-
-#ifdef _KERNEL
-/* pseudo-errors returned inside kernel to modify return to process */
-#define	ERESTART	(-1)		/* restart syscall */
-#define	EJUSTRETURN	(-2)		/* don't modify regs, just return */
-#define	ENOIOCTL	(-3)		/* ioctl not handled by this layer */
-#define	EDIRIOCTL	(-4)		/* do direct ioctl in GEOM */
-#endif
-
-#endif
diff --git a/include.new/eti.h b/include.new/eti.h
deleted file mode 100644
index 836f8a9..0000000
--- a/include.new/eti.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- ****************************************************************************/
-
-/* $Id: eti.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef NCURSES_ETI_H_incl
-#define NCURSES_ETI_H_incl 1
-
-#define	E_OK			(0)
-#define	E_SYSTEM_ERROR	 	(-1)
-#define	E_BAD_ARGUMENT	 	(-2)
-#define	E_POSTED	 	(-3)
-#define	E_CONNECTED	 	(-4)
-#define	E_BAD_STATE	 	(-5)
-#define	E_NO_ROOM	 	(-6)
-#define	E_NOT_POSTED		(-7)
-#define	E_UNKNOWN_COMMAND	(-8)
-#define	E_NO_MATCH		(-9)
-#define	E_NOT_SELECTABLE	(-10)
-#define	E_NOT_CONNECTED	        (-11)
-#define	E_REQUEST_DENIED	(-12)
-#define	E_INVALID_FIELD	        (-13)
-#define	E_CURRENT		(-14)
-
-#endif
diff --git a/include.new/execinfo.h b/include.new/execinfo.h
deleted file mode 100644
index bb1f1bd..0000000
--- a/include.new/execinfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$NetBSD: execinfo.h,v 1.2 2012/06/09 21:22:17 christos Exp $	*/
-/*	$FreeBSD: releng/10.2/contrib/libexecinfo/execinfo.h 255177 2013-09-03 13:38:41Z emaste $ */
-
-/*-
- * Copyright (c) 2012 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-#ifndef _EXECINFO_H_
-#define _EXECINFO_H_
-
-#include <stddef.h>
-
-__BEGIN_DECLS
-size_t backtrace(void **, size_t);
-char **backtrace_symbols(void *const *, size_t);
-int backtrace_symbols_fd(void *const *, size_t, int);
-char **backtrace_symbols_fmt(void *const *, size_t, const char *);
-int backtrace_symbols_fd_fmt(void *const *, size_t, int, const char *);
-__END_DECLS
-
-#endif /* _EXECINFO_H_ */
diff --git a/include.new/fcntl.h b/include.new/fcntl.h
deleted file mode 100644
index ac800b1..0000000
--- a/include.new/fcntl.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*-
- * Copyright (c) 1983, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/fcntl.h 273840 2014-10-29 22:55:16Z jilles $
- */
-
-#ifndef _SYS_FCNTL_H_
-#define	_SYS_FCNTL_H_
-
-/*
- * This file includes the definitions for open and fcntl
- * described by POSIX for <fcntl.h>; it also includes
- * related kernel definitions.
- */
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-/*
- * File status flags: these are used by open(2), fcntl(2).
- * They are also used (indirectly) in the kernel file structure f_flags,
- * which is a superset of the open/fcntl flags.  Open flags and f_flags
- * are inter-convertible using OFLAGS(fflags) and FFLAGS(oflags).
- * Open/fcntl flags begin with O_; kernel-internal flags begin with F.
- */
-/* open-only flags */
-#define	O_RDONLY	0x0000		/* open for reading only */
-#define	O_WRONLY	0x0001		/* open for writing only */
-#define	O_RDWR		0x0002		/* open for reading and writing */
-#define	O_ACCMODE	0x0003		/* mask for above modes */
-
-/*
- * Kernel encoding of open mode; separate read and write bits that are
- * independently testable: 1 greater than the above.
- *
- * XXX
- * FREAD and FWRITE are excluded from the #ifdef _KERNEL so that TIOCFLUSH,
- * which was documented to use FREAD/FWRITE, continues to work.
- */
-#if __BSD_VISIBLE
-#define	FREAD		0x0001
-#define	FWRITE		0x0002
-#endif
-#define	O_NONBLOCK	0x0004		/* no delay */
-#define	O_APPEND	0x0008		/* set append mode */
-#if __BSD_VISIBLE
-#define	O_SHLOCK	0x0010		/* open with shared file lock */
-#define	O_EXLOCK	0x0020		/* open with exclusive file lock */
-#define	O_ASYNC		0x0040		/* signal pgrp when data ready */
-#define	O_FSYNC		0x0080		/* synchronous writes */
-#endif
-#define	O_SYNC		0x0080		/* POSIX synonym for O_FSYNC */
-#if __POSIX_VISIBLE >= 200809
-#define	O_NOFOLLOW	0x0100		/* don't follow symlinks */
-#endif
-#define	O_CREAT		0x0200		/* create if nonexistent */
-#define	O_TRUNC		0x0400		/* truncate to zero length */
-#define	O_EXCL		0x0800		/* error if already exists */
-#ifdef _KERNEL
-#define	FHASLOCK	0x4000		/* descriptor holds advisory lock */
-#endif
-
-/* Defined by POSIX 1003.1; BSD default, but must be distinct from O_RDONLY. */
-#define	O_NOCTTY	0x8000		/* don't assign controlling terminal */
-
-#if __BSD_VISIBLE
-/* Attempt to bypass buffer cache */
-#define	O_DIRECT	0x00010000
-#endif
-
-#if __POSIX_VISIBLE >= 200809
-#define	O_DIRECTORY	0x00020000	/* Fail if not directory */
-#define	O_EXEC		0x00040000	/* Open for execute only */
-#endif
-#ifdef	_KERNEL
-#define	FEXEC		O_EXEC
-#endif
-
-#if __POSIX_VISIBLE >= 200809
-/* Defined by POSIX 1003.1-2008; BSD default, but reserve for future use. */
-#define	O_TTY_INIT	0x00080000	/* Restore default termios attributes */
-
-#define	O_CLOEXEC	0x00100000
-#endif
-
-/*
- * XXX missing O_DSYNC, O_RSYNC.
- */
-
-#ifdef _KERNEL
-/* convert from open() flags to/from fflags; convert O_RD/WR to FREAD/FWRITE */
-#define	FFLAGS(oflags)	((oflags) & O_EXEC ? (oflags) : (oflags) + 1)
-#define	OFLAGS(fflags)	((fflags) & O_EXEC ? (fflags) : (fflags) - 1)
-
-/* bits to save after open */
-#define	FMASK	(FREAD|FWRITE|FAPPEND|FASYNC|FFSYNC|FNONBLOCK|O_DIRECT|FEXEC)
-/* bits settable by fcntl(F_SETFL, ...) */
-#define	FCNTLFLAGS	(FAPPEND|FASYNC|FFSYNC|FNONBLOCK|FRDAHEAD|O_DIRECT)
-
-#if defined(COMPAT_FREEBSD7) || defined(COMPAT_FREEBSD6) || \
-    defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4)
-/*
- * Set by shm_open(3) in older libc's to get automatic MAP_ASYNC
- * behavior for POSIX shared memory objects (which are otherwise
- * implemented as plain files).
- */
-#define	FPOSIXSHM	O_NOFOLLOW
-#undef FCNTLFLAGS
-#define	FCNTLFLAGS	(FAPPEND|FASYNC|FFSYNC|FNONBLOCK|FPOSIXSHM|FRDAHEAD| \
-			 O_DIRECT)
-#endif
-#endif
-
-/*
- * The O_* flags used to have only F* names, which were used in the kernel
- * and by fcntl.  We retain the F* names for the kernel f_flag field
- * and for backward compatibility for fcntl.  These flags are deprecated.
- */
-#if __BSD_VISIBLE
-#define	FAPPEND		O_APPEND	/* kernel/compat */
-#define	FASYNC		O_ASYNC		/* kernel/compat */
-#define	FFSYNC		O_FSYNC		/* kernel */
-#define	FNONBLOCK	O_NONBLOCK	/* kernel */
-#define	FNDELAY		O_NONBLOCK	/* compat */
-#define	O_NDELAY	O_NONBLOCK	/* compat */
-#endif
-
-/*
- * We are out of bits in f_flag (which is a short).  However,
- * the flag bits not set in FMASK are only meaningful in the
- * initial open syscall.  Those bits can thus be given a
- * different meaning for fcntl(2).
- */
-#if __BSD_VISIBLE
-/* Read ahead */
-#define	FRDAHEAD	O_CREAT
-#endif
-
-#if __POSIX_VISIBLE >= 200809
-/*
- * Magic value that specify the use of the current working directory
- * to determine the target of relative file paths in the openat() and
- * similar syscalls.
- */
-#define	AT_FDCWD		-100
-
-/*
- * Miscellaneous flags for the *at() syscalls.
- */
-#define	AT_EACCESS		0x100	/* Check access using effective user and group ID */
-#define	AT_SYMLINK_NOFOLLOW	0x200   /* Do not follow symbolic links */
-#define	AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic link */
-#define	AT_REMOVEDIR		0x800	/* Remove directory instead of file */
-#endif
-
-/*
- * Constants used for fcntl(2)
- */
-
-/* command values */
-#define	F_DUPFD		0		/* duplicate file descriptor */
-#define	F_GETFD		1		/* get file descriptor flags */
-#define	F_SETFD		2		/* set file descriptor flags */
-#define	F_GETFL		3		/* get file status flags */
-#define	F_SETFL		4		/* set file status flags */
-#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-#define	F_GETOWN	5		/* get SIGIO/SIGURG proc/pgrp */
-#define	F_SETOWN	6		/* set SIGIO/SIGURG proc/pgrp */
-#endif
-#if __BSD_VISIBLE
-#define	F_OGETLK	7		/* get record locking information */
-#define	F_OSETLK	8		/* set record locking information */
-#define	F_OSETLKW	9		/* F_SETLK; wait if blocked */
-#define	F_DUP2FD	10		/* duplicate file descriptor to arg */
-#endif
-#define	F_GETLK		11		/* get record locking information */
-#define	F_SETLK		12		/* set record locking information */
-#define	F_SETLKW	13		/* F_SETLK; wait if blocked */
-#if __BSD_VISIBLE
-#define	F_SETLK_REMOTE	14		/* debugging support for remote locks */
-#define	F_READAHEAD	15		/* read ahead */
-#define	F_RDAHEAD	16		/* Darwin compatible read ahead */
-#endif
-#if __POSIX_VISIBLE >= 200809
-#define	F_DUPFD_CLOEXEC	17		/* Like F_DUPFD, but FD_CLOEXEC is set */
-#endif
-#if __BSD_VISIBLE
-#define	F_DUP2FD_CLOEXEC 18		/* Like F_DUP2FD, but FD_CLOEXEC is set */
-#endif
-
-/* file descriptor flags (F_GETFD, F_SETFD) */
-#define	FD_CLOEXEC	1		/* close-on-exec flag */
-
-/* record locking flags (F_GETLK, F_SETLK, F_SETLKW) */
-#define	F_RDLCK		1		/* shared or read lock */
-#define	F_UNLCK		2		/* unlock */
-#define	F_WRLCK		3		/* exclusive or write lock */
-#if __BSD_VISIBLE
-#define	F_UNLCKSYS	4		/* purge locks for a given system ID */ 
-#define	F_CANCEL	5		/* cancel an async lock request */
-#endif
-#ifdef _KERNEL
-#define	F_WAIT		0x010		/* Wait until lock is granted */
-#define	F_FLOCK		0x020	 	/* Use flock(2) semantics for lock */
-#define	F_POSIX		0x040	 	/* Use POSIX semantics for lock */
-#define	F_REMOTE	0x080		/* Lock owner is remote NFS client */
-#define	F_NOINTR	0x100		/* Ignore signals when waiting */
-#endif
-
-/*
- * Advisory file segment locking data type -
- * information passed to system by user
- */
-struct flock {
-	off_t	l_start;	/* starting offset */
-	off_t	l_len;		/* len = 0 means until end of file */
-	pid_t	l_pid;		/* lock owner */
-	short	l_type;		/* lock type: read/write, etc. */
-	short	l_whence;	/* type of l_start */
-	int	l_sysid;	/* remote system id or zero for local */
-};
-
-#if __BSD_VISIBLE
-/*
- * Old advisory file segment locking data type,
- * before adding l_sysid.
- */
-struct __oflock {
-	off_t	l_start;	/* starting offset */
-	off_t	l_len;		/* len = 0 means until end of file */
-	pid_t	l_pid;		/* lock owner */
-	short	l_type;		/* lock type: read/write, etc. */
-	short	l_whence;	/* type of l_start */
-};
-#endif
-
-#if __BSD_VISIBLE
-/* lock operations for flock(2) */
-#define	LOCK_SH		0x01		/* shared file lock */
-#define	LOCK_EX		0x02		/* exclusive file lock */
-#define	LOCK_NB		0x04		/* don't block when locking */
-#define	LOCK_UN		0x08		/* unlock file */
-#endif
-
-#if __POSIX_VISIBLE >= 200112
-/*
- * Advice to posix_fadvise
- */
-#define	POSIX_FADV_NORMAL	0	/* no special treatment */
-#define	POSIX_FADV_RANDOM	1	/* expect random page references */
-#define	POSIX_FADV_SEQUENTIAL	2	/* expect sequential page references */
-#define	POSIX_FADV_WILLNEED	3	/* will need these pages */
-#define	POSIX_FADV_DONTNEED	4	/* dont need these pages */
-#define	POSIX_FADV_NOREUSE	5	/* access data only once */
-#endif
-
-#ifndef _KERNEL
-__BEGIN_DECLS
-int	open(const char *, int, ...);
-int	creat(const char *, mode_t);
-int	fcntl(int, int, ...);
-#if __BSD_VISIBLE
-int	flock(int, int);
-#endif
-#if __POSIX_VISIBLE >= 200809
-int	openat(int, const char *, int, ...);
-#endif
-#if __POSIX_VISIBLE >= 200112
-int	posix_fadvise(int, off_t, off_t, int);
-int	posix_fallocate(int, off_t, off_t);
-#endif
-__END_DECLS
-#endif
-
-#endif /* !_SYS_FCNTL_H_ */
diff --git a/include.new/fenv.h b/include.new/fenv.h
deleted file mode 100644
index 54ac14f..0000000
--- a/include.new/fenv.h
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * Copyright (c) 2004-2005 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/msun/x86/fenv.h 249724 2013-04-21 13:31:55Z kib $
- */
-
-#ifndef	_FENV_H_
-#define	_FENV_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef	__fenv_static
-#define	__fenv_static	static
-#endif
-
-typedef	__uint16_t	fexcept_t;
-
-/* Exception flags */
-#define	FE_INVALID	0x01
-#define	FE_DENORMAL	0x02
-#define	FE_DIVBYZERO	0x04
-#define	FE_OVERFLOW	0x08
-#define	FE_UNDERFLOW	0x10
-#define	FE_INEXACT	0x20
-#define	FE_ALL_EXCEPT	(FE_DIVBYZERO | FE_DENORMAL | FE_INEXACT | \
-			 FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
-
-/* Rounding modes */
-#define	FE_TONEAREST	0x0000
-#define	FE_DOWNWARD	0x0400
-#define	FE_UPWARD	0x0800
-#define	FE_TOWARDZERO	0x0c00
-#define	_ROUND_MASK	(FE_TONEAREST | FE_DOWNWARD | \
-			 FE_UPWARD | FE_TOWARDZERO)
-
-/*
- * As compared to the x87 control word, the SSE unit's control word
- * has the rounding control bits offset by 3 and the exception mask
- * bits offset by 7.
- */
-#define	_SSE_ROUND_SHIFT	3
-#define	_SSE_EMASK_SHIFT	7
-
-#ifdef __i386__
-/*
- * To preserve binary compatibility with FreeBSD 5.3, we pack the
- * mxcsr into some reserved fields, rather than changing sizeof(fenv_t).
- */
-typedef struct {
-	__uint16_t	__control;
-	__uint16_t      __mxcsr_hi;
-	__uint16_t	__status;
-	__uint16_t      __mxcsr_lo;
-	__uint32_t	__tag;
-	char		__other[16];
-} fenv_t;
-#else /* __amd64__ */
-typedef struct {
-	struct {
-		__uint32_t	__control;
-		__uint32_t	__status;
-		__uint32_t	__tag;
-		char		__other[16];
-	} __x87;
-	__uint32_t		__mxcsr;
-} fenv_t;
-#endif /* __i386__ */
-
-__BEGIN_DECLS
-
-/* Default floating-point environment */
-extern const fenv_t	__fe_dfl_env;
-#define	FE_DFL_ENV	(&__fe_dfl_env)
-
-#define	__fldcw(__cw)		__asm __volatile("fldcw %0" : : "m" (__cw))
-#define	__fldenv(__env)		__asm __volatile("fldenv %0" : : "m" (__env))
-#define	__fldenvx(__env)	__asm __volatile("fldenv %0" : : "m" (__env)  \
-				: "st", "st(1)", "st(2)", "st(3)", "st(4)",   \
-				"st(5)", "st(6)", "st(7)")
-#define	__fnclex()		__asm __volatile("fnclex")
-#define	__fnstenv(__env)	__asm __volatile("fnstenv %0" : "=m" (*(__env)))
-#define	__fnstcw(__cw)		__asm __volatile("fnstcw %0" : "=m" (*(__cw)))
-#define	__fnstsw(__sw)		__asm __volatile("fnstsw %0" : "=am" (*(__sw)))
-#define	__fwait()		__asm __volatile("fwait")
-#define	__ldmxcsr(__csr)	__asm __volatile("ldmxcsr %0" : : "m" (__csr))
-#define	__stmxcsr(__csr)	__asm __volatile("stmxcsr %0" : "=m" (*(__csr)))
-
-int fegetenv(fenv_t *__envp);
-int feholdexcept(fenv_t *__envp);
-int fesetexceptflag(const fexcept_t *__flagp, int __excepts);
-int feraiseexcept(int __excepts);
-int feupdateenv(const fenv_t *__envp);
-
-__fenv_static inline int
-fegetround(void)
-{
-	__uint16_t __control;
-
-	/*
-	 * We assume that the x87 and the SSE unit agree on the
-	 * rounding mode.  Reading the control word on the x87 turns
-	 * out to be about 5 times faster than reading it on the SSE
-	 * unit on an Opteron 244.
-	 */
-	__fnstcw(&__control);
-	return (__control & _ROUND_MASK);
-}
-
-#if __BSD_VISIBLE
-
-int feenableexcept(int __mask);
-int fedisableexcept(int __mask);
-
-/* We currently provide no external definition of fegetexcept(). */
-static inline int
-fegetexcept(void)
-{
-	__uint16_t __control;
-
-	/*
-	 * We assume that the masks for the x87 and the SSE unit are
-	 * the same.
-	 */
-	__fnstcw(&__control);
-	return (~__control & FE_ALL_EXCEPT);
-}
-
-#endif /* __BSD_VISIBLE */
-
-#ifdef __i386__
-
-/* After testing for SSE support once, we cache the result in __has_sse. */
-enum __sse_support { __SSE_YES, __SSE_NO, __SSE_UNK };
-extern enum __sse_support __has_sse;
-int __test_sse(void);
-#ifdef __SSE__
-#define	__HAS_SSE()	1
-#else
-#define	__HAS_SSE()	(__has_sse == __SSE_YES ||			\
-			 (__has_sse == __SSE_UNK && __test_sse()))
-#endif
-
-#define	__get_mxcsr(env)	(((env).__mxcsr_hi << 16) |	\
-				 ((env).__mxcsr_lo))
-#define	__set_mxcsr(env, x)	do {				\
-	(env).__mxcsr_hi = (__uint32_t)(x) >> 16;		\
-	(env).__mxcsr_lo = (__uint16_t)(x);			\
-} while (0)
-
-__fenv_static inline int
-feclearexcept(int __excepts)
-{
-	fenv_t __env;
-	__uint32_t __mxcsr;
-
-	if (__excepts == FE_ALL_EXCEPT) {
-		__fnclex();
-	} else {
-		__fnstenv(&__env);
-		__env.__status &= ~__excepts;
-		__fldenv(__env);
-	}
-	if (__HAS_SSE()) {
-		__stmxcsr(&__mxcsr);
-		__mxcsr &= ~__excepts;
-		__ldmxcsr(__mxcsr);
-	}
-	return (0);
-}
-
-__fenv_static inline int
-fegetexceptflag(fexcept_t *__flagp, int __excepts)
-{
-	__uint32_t __mxcsr;
-	__uint16_t __status;
-
-	__fnstsw(&__status);
-	if (__HAS_SSE())
-		__stmxcsr(&__mxcsr);
-	else
-		__mxcsr = 0;
-	*__flagp = (__mxcsr | __status) & __excepts;
-	return (0);
-}
-
-__fenv_static inline int
-fetestexcept(int __excepts)
-{
-	__uint32_t __mxcsr;
-	__uint16_t __status;
-
-	__fnstsw(&__status);
-	if (__HAS_SSE())
-		__stmxcsr(&__mxcsr);
-	else
-		__mxcsr = 0;
-	return ((__status | __mxcsr) & __excepts);
-}
-
-__fenv_static inline int
-fesetround(int __round)
-{
-	__uint32_t __mxcsr;
-	__uint16_t __control;
-
-	if (__round & ~_ROUND_MASK)
-		return (-1);
-
-	__fnstcw(&__control);
-	__control &= ~_ROUND_MASK;
-	__control |= __round;
-	__fldcw(__control);
-
-	if (__HAS_SSE()) {
-		__stmxcsr(&__mxcsr);
-		__mxcsr &= ~(_ROUND_MASK << _SSE_ROUND_SHIFT);
-		__mxcsr |= __round << _SSE_ROUND_SHIFT;
-		__ldmxcsr(__mxcsr);
-	}
-
-	return (0);
-}
-
-__fenv_static inline int
-fesetenv(const fenv_t *__envp)
-{
-	fenv_t __env = *__envp;
-	__uint32_t __mxcsr;
-
-	__mxcsr = __get_mxcsr(__env);
-	__set_mxcsr(__env, 0xffffffff);
-	/*
-	 * XXX Using fldenvx() instead of fldenv() tells the compiler that this
-	 * instruction clobbers the i387 register stack.  This happens because
-	 * we restore the tag word from the saved environment.  Normally, this
-	 * would happen anyway and we wouldn't care, because the ABI allows
-	 * function calls to clobber the i387 regs.  However, fesetenv() is
-	 * inlined, so we need to be more careful.
-	 */
-	__fldenvx(__env);
-	if (__HAS_SSE())
-		__ldmxcsr(__mxcsr);
-	return (0);
-}
-
-#else /* __amd64__ */
-
-__fenv_static inline int
-feclearexcept(int __excepts)
-{
-	fenv_t __env;
-
-	if (__excepts == FE_ALL_EXCEPT) {
-		__fnclex();
-	} else {
-		__fnstenv(&__env.__x87);
-		__env.__x87.__status &= ~__excepts;
-		__fldenv(__env.__x87);
-	}
-	__stmxcsr(&__env.__mxcsr);
-	__env.__mxcsr &= ~__excepts;
-	__ldmxcsr(__env.__mxcsr);
-	return (0);
-}
-
-__fenv_static inline int
-fegetexceptflag(fexcept_t *__flagp, int __excepts)
-{
-	__uint32_t __mxcsr;
-	__uint16_t __status;
-
-	__stmxcsr(&__mxcsr);
-	__fnstsw(&__status);
-	*__flagp = (__mxcsr | __status) & __excepts;
-	return (0);
-}
-
-__fenv_static inline int
-fetestexcept(int __excepts)
-{
-	__uint32_t __mxcsr;
-	__uint16_t __status;
-
-	__stmxcsr(&__mxcsr);
-	__fnstsw(&__status);
-	return ((__status | __mxcsr) & __excepts);
-}
-
-__fenv_static inline int
-fesetround(int __round)
-{
-	__uint32_t __mxcsr;
-	__uint16_t __control;
-
-	if (__round & ~_ROUND_MASK)
-		return (-1);
-
-	__fnstcw(&__control);
-	__control &= ~_ROUND_MASK;
-	__control |= __round;
-	__fldcw(__control);
-
-	__stmxcsr(&__mxcsr);
-	__mxcsr &= ~(_ROUND_MASK << _SSE_ROUND_SHIFT);
-	__mxcsr |= __round << _SSE_ROUND_SHIFT;
-	__ldmxcsr(__mxcsr);
-
-	return (0);
-}
-
-__fenv_static inline int
-fesetenv(const fenv_t *__envp)
-{
-
-	/*
-	 * XXX Using fldenvx() instead of fldenv() tells the compiler that this
-	 * instruction clobbers the i387 register stack.  This happens because
-	 * we restore the tag word from the saved environment.  Normally, this
-	 * would happen anyway and we wouldn't care, because the ABI allows
-	 * function calls to clobber the i387 regs.  However, fesetenv() is
-	 * inlined, so we need to be more careful.
-	 */
-	__fldenvx(__envp->__x87);
-	__ldmxcsr(__envp->__mxcsr);
-	return (0);
-}
-
-#endif /* __i386__ */
-
-__END_DECLS
-
-#endif	/* !_FENV_H_ */
diff --git a/include.new/fetch.h b/include.new/fetch.h
deleted file mode 100644
index 1a30de6..0000000
--- a/include.new/fetch.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * Copyright (c) 1998-2004 Dag-Erling Smørgrav
- * 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
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/lib/libfetch/fetch.h 268900 2014-07-20 00:29:41Z bapt $
- */
-
-#ifndef _FETCH_H_INCLUDED
-#define _FETCH_H_INCLUDED
-
-#define _LIBFETCH_VER "libfetch/2.0"
-
-#define URL_SCHEMELEN 16
-#define URL_USERLEN 256
-#define URL_PWDLEN 256
-
-struct url {
-	char		 scheme[URL_SCHEMELEN+1];
-	char		 user[URL_USERLEN+1];
-	char		 pwd[URL_PWDLEN+1];
-	char		 host[MAXHOSTNAMELEN+1];
-	int		 port;
-	char		*doc;
-	off_t		 offset;
-	size_t		 length;
-	time_t		 ims_time;
-};
-
-struct url_stat {
-	off_t		 size;
-	time_t		 atime;
-	time_t		 mtime;
-};
-
-struct url_ent {
-	char		 name[PATH_MAX];
-	struct url_stat	 stat;
-};
-
-/* Recognized schemes */
-#define SCHEME_FTP	"ftp"
-#define SCHEME_HTTP	"http"
-#define SCHEME_HTTPS	"https"
-#define SCHEME_FILE	"file"
-
-/* Error codes */
-#define	FETCH_ABORT	 1
-#define	FETCH_AUTH	 2
-#define	FETCH_DOWN	 3
-#define	FETCH_EXISTS	 4
-#define	FETCH_FULL	 5
-#define	FETCH_INFO	 6
-#define	FETCH_MEMORY	 7
-#define	FETCH_MOVED	 8
-#define	FETCH_NETWORK	 9
-#define	FETCH_OK	10
-#define	FETCH_PROTO	11
-#define	FETCH_RESOLV	12
-#define	FETCH_SERVER	13
-#define	FETCH_TEMP	14
-#define	FETCH_TIMEOUT	15
-#define	FETCH_UNAVAIL	16
-#define	FETCH_UNKNOWN	17
-#define	FETCH_URL	18
-#define	FETCH_VERBOSE	19
-
-__BEGIN_DECLS
-
-/* FILE-specific functions */
-FILE		*fetchXGetFile(struct url *, struct url_stat *, const char *);
-FILE		*fetchGetFile(struct url *, const char *);
-FILE		*fetchPutFile(struct url *, const char *);
-int		 fetchStatFile(struct url *, struct url_stat *, const char *);
-struct url_ent	*fetchListFile(struct url *, const char *);
-
-/* HTTP-specific functions */
-FILE		*fetchXGetHTTP(struct url *, struct url_stat *, const char *);
-FILE		*fetchGetHTTP(struct url *, const char *);
-FILE		*fetchPutHTTP(struct url *, const char *);
-int		 fetchStatHTTP(struct url *, struct url_stat *, const char *);
-struct url_ent	*fetchListHTTP(struct url *, const char *);
-FILE		*fetchReqHTTP(struct url *, const char *, const char *,
-		    const char *, const char *);
-
-/* FTP-specific functions */
-FILE		*fetchXGetFTP(struct url *, struct url_stat *, const char *);
-FILE		*fetchGetFTP(struct url *, const char *);
-FILE		*fetchPutFTP(struct url *, const char *);
-int		 fetchStatFTP(struct url *, struct url_stat *, const char *);
-struct url_ent	*fetchListFTP(struct url *, const char *);
-
-/* Generic functions */
-FILE		*fetchXGetURL(const char *, struct url_stat *, const char *);
-FILE		*fetchGetURL(const char *, const char *);
-FILE		*fetchPutURL(const char *, const char *);
-int		 fetchStatURL(const char *, struct url_stat *, const char *);
-struct url_ent	*fetchListURL(const char *, const char *);
-FILE		*fetchXGet(struct url *, struct url_stat *, const char *);
-FILE		*fetchGet(struct url *, const char *);
-FILE		*fetchPut(struct url *, const char *);
-int		 fetchStat(struct url *, struct url_stat *, const char *);
-struct url_ent	*fetchList(struct url *, const char *);
-
-/* URL parsing */
-struct url	*fetchMakeURL(const char *, const char *, int,
-		     const char *, const char *, const char *);
-struct url	*fetchParseURL(const char *);
-void		 fetchFreeURL(struct url *);
-
-__END_DECLS
-
-/* Authentication */
-typedef int (*auth_t)(struct url *);
-extern auth_t		 fetchAuthMethod;
-
-/* Last error code */
-extern int		 fetchLastErrCode;
-#define MAXERRSTRING 256
-extern char		 fetchLastErrString[MAXERRSTRING];
-
-/* I/O timeout */
-extern int		 fetchTimeout;
-
-/* Restart interrupted syscalls */
-extern int		 fetchRestartCalls;
-
-/* Extra verbosity */
-extern int		 fetchDebug;
-
-#endif
diff --git a/include.new/figpar.h b/include.new/figpar.h
deleted file mode 100644
index fa76010..0000000
--- a/include.new/figpar.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 2002-2014 Devin Teske <dteske@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.
- * 
- * 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: releng/10.2/lib/libfigpar/figpar.h 274116 2014-11-04 23:46:01Z dteske $
- */
-
-#ifndef _FIGPAR_H_
-#define _FIGPAR_H_
-
-#include <sys/types.h>
-
-/*
- * Union for storing various types of data in a single common container.
- */
-union fp_cfgvalue {
-	void		*data;		/* Pointer to NUL-terminated string */
-	char		*str;		/* Pointer to NUL-terminated string */
-	char		**strarray;	/* Pointer to an array of strings */
-	int32_t		num;		/* Signed 32-bit integer value */
-	uint32_t	u_num;		/* Unsigned 32-bit integer value */ 
-	uint32_t	boolean:1;	/* Boolean integer value (0 or 1) */
-};
-
-/*
- * Option types (based on above cfgvalue union)
- */
-enum fp_cfgtype {
-	FP_TYPE_NONE		= 0x0000, /* for directives with no value */
-	FP_TYPE_BOOL		= 0x0001, /* boolean */
-	FP_TYPE_INT		= 0x0002, /* signed 32 bit integer */
-	FP_TYPE_UINT		= 0x0004, /* unsigned 32 bit integer */
-	FP_TYPE_STR		= 0x0008, /* string pointer */
-	FP_TYPE_STRARRAY	= 0x0010, /* string array pointer */
-	FP_TYPE_DATA1		= 0x0020, /* void data type-1 (whatever) */
-	FP_TYPE_DATA2		= 0x0040, /* void data type-2 (whatever) */
-	FP_TYPE_DATA3		= 0x0080, /* void data type-3 (whatever) */
-	FP_TYPE_RESERVED1	= 0x0100, /* reserved data type-1 (future) */
-	FP_TYPE_RESERVED2	= 0x0200, /* reserved data type-2 (future) */
-	FP_TYPE_RESERVED3	= 0x0400, /* reserved data type-3 (future) */
-};
-
-/*
- * Options to parse_config() for processing_options bitmask
- */
-#define FP_BREAK_ON_EQUALS	0x0001	/* stop reading directive at `=' */
-#define FP_BREAK_ON_SEMICOLON	0x0002	/* `;' starts a new line */
-#define FP_CASE_SENSITIVE	0x0004	/* directives are case sensitive */
-#define FP_REQUIRE_EQUALS	0x0008	/* assignment directives only */
-#define FP_STRICT_EQUALS	0x0010	/* `=' must be part of directive */
-
-/*
- * Anatomy of a config file option
- */
-struct fp_config {
-	enum fp_cfgtype		type;		/* Option value type */
-	const char		*directive;	/* config file keyword */
-	union fp_cfgvalue	value;		/* NB: set by action */
-
-	/*
-	 * Function pointer; action to be taken when the directive is found
-	 */
-	int (*action)(struct fp_config *option, uint32_t line, char *directive,
-	    char *value);
-};
-extern struct fp_config fp_dummy_config;
-
-__BEGIN_DECLS
-int			 parse_config(struct fp_config _options[],
-			    const char *_path,
-			    int (*_unknown)(struct fp_config *_option,
-			    uint32_t _line, char *_directive, char *_value),
-			    uint16_t _processing_options);
-struct fp_config	*get_config_option(struct fp_config _options[],
-			    const char *_directive);
-__END_DECLS
-
-#endif /* _FIGPAR_H_ */
diff --git a/include.new/float.h b/include.new/float.h
deleted file mode 100644
index ceda02b..0000000
--- a/include.new/float.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/float.h 232491 2012-03-04 14:00:32Z tijl $ */
-
-#include <x86/float.h>
diff --git a/include.new/floatingpoint.h b/include.new/floatingpoint.h
deleted file mode 100644
index 990963d..0000000
--- a/include.new/floatingpoint.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 1993 Andrew Moore, Talke Studio
- * 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.
- *
- *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD: releng/10.2/sys/i386/include/floatingpoint.h 144544 2005-04-02 17:31:42Z netchild $
- */
-
-#ifndef _FLOATINGPOINT_H_
-#define _FLOATINGPOINT_H_
-
-#include <sys/cdefs.h>
-#include <machine/ieeefp.h>
-
-#endif /* !_FLOATINGPOINT_H_ */
diff --git a/include.new/fmtmsg.h b/include.new/fmtmsg.h
deleted file mode 100644
index 3355ffc..0000000
--- a/include.new/fmtmsg.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/include/fmtmsg.h 236629 2012-06-05 19:42:57Z ed $
- */
-
-#ifndef _FMTMSG_H_
-#define	_FMTMSG_H_
-
-/* Source of condition is... */
-#define	MM_HARD		0x0001	/* ...hardware. */
-#define	MM_SOFT		0x0002	/* ...software. */
-#define	MM_FIRM		0x0004	/* ...firmware. */
-
-/* Condition detected by... */
-#define	MM_APPL		0x0010	/* ...application. */
-#define	MM_UTIL		0x0020	/* ...utility. */
-#define	MM_OPSYS	0x0040	/* ...operating system. */
-
-/* Display on... */
-#define	MM_PRINT	0x0100	/* ...standard error. */
-#define	MM_CONSOLE	0x0200	/* ...system console. */
-
-#define	MM_RECOVER	0x1000	/* Recoverable error. */
-#define	MM_NRECOV	0x2000	/* Non-recoverable error. */
-
-/* Severity levels. */
-#define	MM_NOSEV	0	/* No severity level provided. */
-#define	MM_HALT		1	/* Error causing application to halt. */
-#define	MM_ERROR	2	/* Non-fault fault. */
-#define	MM_WARNING	3	/* Unusual non-error condition. */
-#define	MM_INFO		4	/* Informative message. */
-
-/* Null options. */
-#define	MM_NULLLBL	(char *)0
-#define	MM_NULLSEV	0
-#define	MM_NULLMC	0L
-#define	MM_NULLTXT	(char *)0
-#define	MM_NULLACT	(char *)0
-#define	MM_NULLTAG	(char *)0
-
-/* Return values. */
-#define	MM_OK		0	/* Success. */
-#define	MM_NOMSG	1	/* Failed to output to stderr. */
-#define	MM_NOCON	2	/* Failed to output to console. */
-#define	MM_NOTOK	3	/* Failed to output anything. */
-
-int	fmtmsg(long, const char *, int, const char *, const char *,
-	    const char *);
-
-#endif /* !_FMTMSG_H_ */
diff --git a/include.new/fnmatch.h b/include.new/fnmatch.h
deleted file mode 100644
index 79816a0..0000000
--- a/include.new/fnmatch.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1992, 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. 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.
- *
- * $FreeBSD: releng/10.2/include/fnmatch.h 203964 2010-02-16 19:39:50Z imp $
- *	@(#)fnmatch.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef	_FNMATCH_H_
-#define	_FNMATCH_H_
-
-#include <sys/cdefs.h>
-
-#define	FNM_NOMATCH	1	/* Match failed. */
-
-#define	FNM_NOESCAPE	0x01	/* Disable backslash escaping. */
-#define	FNM_PATHNAME	0x02	/* Slash must be matched by slash. */
-#define	FNM_PERIOD	0x04	/* Period must be matched by period. */
-
-#if __XSI_VISIBLE
-#define	FNM_NOSYS	(-1)	/* Reserved. */
-#endif
-
-#if __BSD_VISIBLE
-#define	FNM_LEADING_DIR	0x08	/* Ignore /<tail> after Imatch. */
-#define	FNM_CASEFOLD	0x10	/* Case insensitive search. */
-#define	FNM_IGNORECASE	FNM_CASEFOLD
-#define	FNM_FILE_NAME	FNM_PATHNAME
-#endif
-
-__BEGIN_DECLS
-int	 fnmatch(const char *, const char *, int);
-__END_DECLS
-
-#endif /* !_FNMATCH_H_ */
diff --git a/include.new/form.h b/include.new/form.h
deleted file mode 100644
index 0ab4f2f..0000000
--- a/include.new/form.h
+++ /dev/null
@@ -1,403 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- ****************************************************************************/
-
-/* $Id: form.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef FORM_H
-#define FORM_H
-
-#include <curses.h>
-#include <eti.h>
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
-#ifndef FORM_PRIV_H
-typedef void *FIELD_CELL;
-#endif
-
-#ifndef NCURSES_FIELD_INTERNALS
-#define NCURSES_FIELD_INTERNALS /* nothing */
-#endif
-
-typedef int Form_Options;
-typedef int Field_Options;
-
-	/**********
-	*  _PAGE  *
-	**********/
-
-typedef struct {
-  short pmin;		/* index of first field on page			*/
-  short pmax;		/* index of last field on page			*/
-  short smin;		/* index of top leftmost field on page		*/
-  short smax;		/* index of bottom rightmost field on page	*/
-} _PAGE;
-
-	/**********
-	*  FIELD  *
-	**********/
-
-typedef struct fieldnode {
-  unsigned short	status;		/* flags			*/
-  short			rows;		/* size in rows			*/
-  short			cols;		/* size in cols			*/
-  short			frow;		/* first row			*/
-  short			fcol;		/* first col			*/
-  int			drows;		/* dynamic rows			*/
-  int			dcols;		/* dynamic cols			*/
-  int			maxgrow;	/* maximum field growth		*/
-  int			nrow;		/* off-screen rows		*/
-  short			nbuf;		/* additional buffers		*/
-  short			just;		/* justification		*/
-  short			page;		/* page on form			*/
-  short			index;		/* into form -> field		*/
-  int			pad;		/* pad character		*/
-  chtype		fore;		/* foreground attribute		*/
-  chtype		back;		/* background attribute		*/
-  Field_Options		opts;		/* options			*/
-  struct fieldnode *	snext;		/* sorted order pointer		*/
-  struct fieldnode *	sprev;		/* sorted order pointer		*/
-  struct fieldnode *	link;		/* linked field chain		*/
-  struct formnode *	form;		/* containing form		*/
-  struct typenode *	type;		/* field type			*/
-  void *		arg;		/* argument for type		*/
-  FIELD_CELL *		buf;		/* field buffers		*/
-  void *		usrptr;		/* user pointer			*/
-  /*
-   * The wide-character configuration requires extra information.  Because
-   * there are existing applications that manipulate the members of FIELD
-   * directly, we cannot make the struct opaque.  Offsets of members up to
-   * this point are the same in the narrow- and wide-character configuration.
-   * But note that the type of buf depends on the configuration, and is made
-   * opaque for that reason.
-   */
-  NCURSES_FIELD_INTERNALS
-} FIELD;
-
-	/**************
-	*  FIELDTYPE  *
-	**************/
-
-typedef struct typenode {
-  unsigned short	status;			/* flags		*/
-  long			ref;			/* reference count	*/
-  struct typenode *	left;			/* ptr to operand for | */
-  struct typenode *	right;			/* ptr to operand for | */
-
-  void* (*makearg)(va_list *);			/* make fieldtype arg	*/
-  void* (*copyarg)(const void *);		/* copy fieldtype arg	*/
-  void	(*freearg)(void *);			/* free fieldtype arg	*/
-
-  bool	(*fcheck)(FIELD *,const void *);	/* field validation	*/
-  bool	(*ccheck)(int,const void *);		/* character validation */
-
-  bool	(*next)(FIELD *,const void *);		/* enumerate next value */
-  bool	(*prev)(FIELD *,const void *);		/* enumerate prev value */
-
-} FIELDTYPE;
-
-	/*********
-	*  FORM  *
-	*********/
-
-typedef struct formnode {
-  unsigned short	status;		/* flags			*/
-  short			rows;		/* size in rows			*/
-  short			cols;		/* size in cols			*/
-  int			currow;		/* current row in field window	*/
-  int			curcol;		/* current col in field window	*/
-  int			toprow;		/* in scrollable field window	*/
-  int			begincol;	/* in horiz. scrollable field	*/
-  short			maxfield;	/* number of fields		*/
-  short			maxpage;	/* number of pages		*/
-  short			curpage;	/* index into page		*/
-  Form_Options		opts;		/* options			*/
-  WINDOW *		win;		/* window			*/
-  WINDOW *		sub;		/* subwindow			*/
-  WINDOW *		w;		/* window for current field	*/
-  FIELD **		field;		/* field [maxfield]		*/
-  FIELD *		current;	/* current field		*/
-  _PAGE *		page;		/* page [maxpage]		*/
-  void *		usrptr;		/* user pointer			*/
-
-  void			(*forminit)(struct formnode *);
-  void			(*formterm)(struct formnode *);
-  void			(*fieldinit)(struct formnode *);
-  void			(*fieldterm)(struct formnode *);
-
-} FORM;
-
-typedef void (*Form_Hook)(FORM *);
-
-	/***************************
-	*  miscellaneous #defines  *
-	***************************/
-
-/* field justification */
-#define NO_JUSTIFICATION	(0)
-#define JUSTIFY_LEFT		(1)
-#define JUSTIFY_CENTER		(2)
-#define JUSTIFY_RIGHT		(3)
-
-/* field options */
-#define O_VISIBLE		(0x0001U)
-#define O_ACTIVE		(0x0002U)
-#define O_PUBLIC		(0x0004U)
-#define O_EDIT			(0x0008U)
-#define O_WRAP			(0x0010U)
-#define O_BLANK			(0x0020U)
-#define O_AUTOSKIP		(0x0040U)
-#define O_NULLOK		(0x0080U)
-#define O_PASSOK		(0x0100U)
-#define O_STATIC		(0x0200U)
-
-/* form options */
-#define O_NL_OVERLOAD		(0x0001U)
-#define O_BS_OVERLOAD		(0x0002U)
-
-/* form driver commands */
-#define REQ_NEXT_PAGE	 (KEY_MAX + 1)	/* move to next page		*/
-#define REQ_PREV_PAGE	 (KEY_MAX + 2)	/* move to previous page	*/
-#define REQ_FIRST_PAGE	 (KEY_MAX + 3)	/* move to first page		*/
-#define REQ_LAST_PAGE	 (KEY_MAX + 4)	/* move to last page		*/
-
-#define REQ_NEXT_FIELD	 (KEY_MAX + 5)	/* move to next field		*/
-#define REQ_PREV_FIELD	 (KEY_MAX + 6)	/* move to previous field	*/
-#define REQ_FIRST_FIELD	 (KEY_MAX + 7)	/* move to first field		*/
-#define REQ_LAST_FIELD	 (KEY_MAX + 8)	/* move to last field		*/
-#define REQ_SNEXT_FIELD	 (KEY_MAX + 9)	/* move to sorted next field	*/
-#define REQ_SPREV_FIELD	 (KEY_MAX + 10)	/* move to sorted prev field	*/
-#define REQ_SFIRST_FIELD (KEY_MAX + 11)	/* move to sorted first field	*/
-#define REQ_SLAST_FIELD	 (KEY_MAX + 12)	/* move to sorted last field	*/
-#define REQ_LEFT_FIELD	 (KEY_MAX + 13)	/* move to left to field	*/
-#define REQ_RIGHT_FIELD	 (KEY_MAX + 14)	/* move to right to field	*/
-#define REQ_UP_FIELD	 (KEY_MAX + 15)	/* move to up to field		*/
-#define REQ_DOWN_FIELD	 (KEY_MAX + 16)	/* move to down to field	*/
-
-#define REQ_NEXT_CHAR	 (KEY_MAX + 17)	/* move to next char in field	*/
-#define REQ_PREV_CHAR	 (KEY_MAX + 18)	/* move to prev char in field	*/
-#define REQ_NEXT_LINE	 (KEY_MAX + 19)	/* move to next line in field	*/
-#define REQ_PREV_LINE	 (KEY_MAX + 20)	/* move to prev line in field	*/
-#define REQ_NEXT_WORD	 (KEY_MAX + 21)	/* move to next word in field	*/
-#define REQ_PREV_WORD	 (KEY_MAX + 22)	/* move to prev word in field	*/
-#define REQ_BEG_FIELD	 (KEY_MAX + 23)	/* move to first char in field	*/
-#define REQ_END_FIELD	 (KEY_MAX + 24)	/* move after last char in fld	*/
-#define REQ_BEG_LINE	 (KEY_MAX + 25)	/* move to beginning of line	*/
-#define REQ_END_LINE	 (KEY_MAX + 26)	/* move after last char in line	*/
-#define REQ_LEFT_CHAR	 (KEY_MAX + 27)	/* move left in field		*/
-#define REQ_RIGHT_CHAR	 (KEY_MAX + 28)	/* move right in field		*/
-#define REQ_UP_CHAR	 (KEY_MAX + 29)	/* move up in field		*/
-#define REQ_DOWN_CHAR	 (KEY_MAX + 30)	/* move down in field		*/
-
-#define REQ_NEW_LINE	 (KEY_MAX + 31)	/* insert/overlay new line	*/
-#define REQ_INS_CHAR	 (KEY_MAX + 32)	/* insert blank char at cursor	*/
-#define REQ_INS_LINE	 (KEY_MAX + 33)	/* insert blank line at cursor	*/
-#define REQ_DEL_CHAR	 (KEY_MAX + 34)	/* delete char at cursor	*/
-#define REQ_DEL_PREV	 (KEY_MAX + 35)	/* delete char before cursor	*/
-#define REQ_DEL_LINE	 (KEY_MAX + 36)	/* delete line at cursor	*/
-#define REQ_DEL_WORD	 (KEY_MAX + 37)	/* delete word at cursor	*/
-#define REQ_CLR_EOL	 (KEY_MAX + 38)	/* clear to end of line		*/
-#define REQ_CLR_EOF	 (KEY_MAX + 39)	/* clear to end of field	*/
-#define REQ_CLR_FIELD	 (KEY_MAX + 40)	/* clear entire field		*/
-#define REQ_OVL_MODE	 (KEY_MAX + 41)	/* begin overlay mode		*/
-#define REQ_INS_MODE	 (KEY_MAX + 42)	/* begin insert mode		*/
-#define REQ_SCR_FLINE	 (KEY_MAX + 43)	/* scroll field forward a line	*/
-#define REQ_SCR_BLINE	 (KEY_MAX + 44)	/* scroll field backward a line	*/
-#define REQ_SCR_FPAGE	 (KEY_MAX + 45)	/* scroll field forward a page	*/
-#define REQ_SCR_BPAGE	 (KEY_MAX + 46)	/* scroll field backward a page	*/
-#define REQ_SCR_FHPAGE	 (KEY_MAX + 47) /* scroll field forward	 half page */
-#define REQ_SCR_BHPAGE	 (KEY_MAX + 48) /* scroll field backward half page */
-#define REQ_SCR_FCHAR	 (KEY_MAX + 49) /* horizontal scroll char	*/
-#define REQ_SCR_BCHAR	 (KEY_MAX + 50) /* horizontal scroll char	*/
-#define REQ_SCR_HFLINE	 (KEY_MAX + 51) /* horizontal scroll line	*/
-#define REQ_SCR_HBLINE	 (KEY_MAX + 52) /* horizontal scroll line	*/
-#define REQ_SCR_HFHALF	 (KEY_MAX + 53) /* horizontal scroll half line	*/
-#define REQ_SCR_HBHALF	 (KEY_MAX + 54) /* horizontal scroll half line	*/
-
-#define REQ_VALIDATION	 (KEY_MAX + 55)	/* validate field		*/
-#define REQ_NEXT_CHOICE	 (KEY_MAX + 56)	/* display next field choice	*/
-#define REQ_PREV_CHOICE	 (KEY_MAX + 57)	/* display prev field choice	*/
-
-#define MIN_FORM_COMMAND (KEY_MAX + 1)	/* used by form_driver		*/
-#define MAX_FORM_COMMAND (KEY_MAX + 57)	/* used by form_driver		*/
-
-#if defined(MAX_COMMAND)
-#  if (MAX_FORM_COMMAND > MAX_COMMAND)
-#    error Something is wrong -- MAX_FORM_COMMAND is greater than MAX_COMMAND
-#  elif (MAX_COMMAND != (KEY_MAX + 128))
-#    error Something is wrong -- MAX_COMMAND is already inconsistently defined.
-#  endif
-#else
-#  define MAX_COMMAND (KEY_MAX + 128)
-#endif
-
-	/*************************
-	*  standard field types  *
-	*************************/
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALPHA;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ALNUM;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_ENUM;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_INTEGER;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_NUMERIC;
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_REGEXP;
-
-	/************************************
-	*  built-in additional field types  *
-	*  They are not defined in SVr4     *
-	************************************/
-extern NCURSES_EXPORT_VAR(FIELDTYPE *) TYPE_IPV4;      /* Internet IP Version 4 address */
-
-	/***********************
-	*   Default objects    *
-	***********************/
-extern NCURSES_EXPORT_VAR(FORM *)	_nc_Default_Form;
-extern NCURSES_EXPORT_VAR(FIELD *)	_nc_Default_Field;
-
-
-	/***********************
-	*  FIELDTYPE routines  *
-	***********************/
-extern NCURSES_EXPORT(FIELDTYPE *) new_fieldtype (
-		    bool (* const field_check)(FIELD *,const void *),
-		    bool (* const char_check)(int,const void *));
-extern NCURSES_EXPORT(FIELDTYPE *) link_fieldtype(
-		    FIELDTYPE *, FIELDTYPE *);
-
-extern NCURSES_EXPORT(int)	free_fieldtype (FIELDTYPE *);
-extern NCURSES_EXPORT(int)	set_fieldtype_arg (FIELDTYPE *,
-		    void * (* const make_arg)(va_list *),
-		    void * (* const copy_arg)(const void *),
-		    void (* const free_arg)(void *));
-extern NCURSES_EXPORT(int)	 set_fieldtype_choice (FIELDTYPE *,
-		    bool (* const next_choice)(FIELD *,const void *),
-	      	    bool (* const prev_choice)(FIELD *,const void *));
-
-	/*******************
-	*  FIELD routines  *
-	*******************/
-extern NCURSES_EXPORT(FIELD *)	new_field (int,int,int,int,int,int);
-extern NCURSES_EXPORT(FIELD *)	dup_field (FIELD *,int,int);
-extern NCURSES_EXPORT(FIELD *)	link_field (FIELD *,int,int);
-
-extern NCURSES_EXPORT(int)	free_field (FIELD *);
-extern NCURSES_EXPORT(int)	field_info (const FIELD *,int *,int *,int *,int *,int *,int *);
-extern NCURSES_EXPORT(int)	dynamic_field_info (const FIELD *,int *,int *,int *);
-extern NCURSES_EXPORT(int)	set_max_field ( FIELD *,int);
-extern NCURSES_EXPORT(int)	move_field (FIELD *,int,int);
-extern NCURSES_EXPORT(int)	set_field_type (FIELD *,FIELDTYPE *,...);
-extern NCURSES_EXPORT(int)	set_new_page (FIELD *,bool);
-extern NCURSES_EXPORT(int)	set_field_just (FIELD *,int);
-extern NCURSES_EXPORT(int)	field_just (const FIELD *);
-extern NCURSES_EXPORT(int)	set_field_fore (FIELD *,chtype);
-extern NCURSES_EXPORT(int)	set_field_back (FIELD *,chtype);
-extern NCURSES_EXPORT(int)	set_field_pad (FIELD *,int);
-extern NCURSES_EXPORT(int)	field_pad (const FIELD *);
-extern NCURSES_EXPORT(int)	set_field_buffer (FIELD *,int,const char *);
-extern NCURSES_EXPORT(int)	set_field_status (FIELD *,bool);
-extern NCURSES_EXPORT(int)	set_field_userptr (FIELD *, void *);
-extern NCURSES_EXPORT(int)	set_field_opts (FIELD *,Field_Options);
-extern NCURSES_EXPORT(int)	field_opts_on (FIELD *,Field_Options);
-extern NCURSES_EXPORT(int)	field_opts_off (FIELD *,Field_Options);
-
-extern NCURSES_EXPORT(chtype)	field_fore (const FIELD *);
-extern NCURSES_EXPORT(chtype)	field_back (const FIELD *);
-
-extern NCURSES_EXPORT(bool)	new_page (const FIELD *);
-extern NCURSES_EXPORT(bool)	field_status (const FIELD *);
-
-extern NCURSES_EXPORT(void *)	field_arg (const FIELD *);
-
-extern NCURSES_EXPORT(void *)	field_userptr (const FIELD *);
-
-extern NCURSES_EXPORT(FIELDTYPE *)	field_type (const FIELD *);
-
-extern NCURSES_EXPORT(char *)	field_buffer (const FIELD *,int);
-
-extern NCURSES_EXPORT(Field_Options)	field_opts (const FIELD *);
-
-	/******************
-	*  FORM routines  *
-	******************/
-
-extern NCURSES_EXPORT(FORM *)	new_form (FIELD **);
-
-extern NCURSES_EXPORT(FIELD **)	form_fields (const FORM *);
-extern NCURSES_EXPORT(FIELD *)	current_field (const FORM *);
-
-extern NCURSES_EXPORT(WINDOW *)	form_win (const FORM *);
-extern NCURSES_EXPORT(WINDOW *)	form_sub (const FORM *);
-
-extern NCURSES_EXPORT(Form_Hook)	form_init (const FORM *);
-extern NCURSES_EXPORT(Form_Hook)	form_term (const FORM *);
-extern NCURSES_EXPORT(Form_Hook)	field_init (const FORM *);
-extern NCURSES_EXPORT(Form_Hook)	field_term (const FORM *);
-
-extern NCURSES_EXPORT(int)	free_form (FORM *);
-extern NCURSES_EXPORT(int)	set_form_fields (FORM *,FIELD **);
-extern NCURSES_EXPORT(int)	field_count (const FORM *);
-extern NCURSES_EXPORT(int)	set_form_win (FORM *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_form_sub (FORM *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_current_field (FORM *,FIELD *);
-extern NCURSES_EXPORT(int)	field_index (const FIELD *);
-extern NCURSES_EXPORT(int)	set_form_page (FORM *,int);
-extern NCURSES_EXPORT(int)	form_page (const FORM *);
-extern NCURSES_EXPORT(int)	scale_form (const FORM *,int *,int *);
-extern NCURSES_EXPORT(int)	set_form_init (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	set_form_term (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	set_field_init (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	set_field_term (FORM *,Form_Hook);
-extern NCURSES_EXPORT(int)	post_form (FORM *);
-extern NCURSES_EXPORT(int)	unpost_form (FORM *);
-extern NCURSES_EXPORT(int)	pos_form_cursor (FORM *);
-extern NCURSES_EXPORT(int)	form_driver (FORM *,int);
-extern NCURSES_EXPORT(int)	set_form_userptr (FORM *,void *);
-extern NCURSES_EXPORT(int)	set_form_opts (FORM *,Form_Options);
-extern NCURSES_EXPORT(int)	form_opts_on (FORM *,Form_Options);
-extern NCURSES_EXPORT(int)	form_opts_off (FORM *,Form_Options);
-extern NCURSES_EXPORT(int)	form_request_by_name (const char *);
-
-extern NCURSES_EXPORT(const char *)	form_request_name (int);
-
-extern NCURSES_EXPORT(void *)	form_userptr (const FORM *);
-
-extern NCURSES_EXPORT(Form_Options)	form_opts (const FORM *);
-
-extern NCURSES_EXPORT(bool)	data_ahead (const FORM *);
-extern NCURSES_EXPORT(bool)	data_behind (const FORM *);
-
-#ifdef __cplusplus
-  }
-#endif
-
-#endif	/* FORM_H */
diff --git a/include.new/fs/devfs/devfs.h b/include.new/fs/devfs/devfs.h
deleted file mode 100644
index ac6eb4c..0000000
--- a/include.new/fs/devfs/devfs.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 2000
- *	Poul-Henning Kamp.  All rights reserved.
- * Copyright (c) 2002
- *	Dima Dorfman.  All rights reserved.
- *
- * This code is derived from software donated to Berkeley by
- * Jan-Simon Pendry.
- *
- * 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. 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.
- *
- *	@(#)kernfs.h	8.6 (Berkeley) 3/29/95
- * From: FreeBSD: src/sys/miscfs/kernfs/kernfs.h 1.14
- *
- * $FreeBSD: releng/10.2/sys/fs/devfs/devfs.h 231265 2012-02-09 10:09:12Z mm $
- */
-
-#ifndef _FS_DEVFS_DEVFS_H_
-#define	_FS_DEVFS_DEVFS_H_
-
-#define	DEVFS_MAGIC	0xdb0a087a
-
-/*
- * Identifiers.  The ruleset and rule numbers are 16-bit values.  The
- * "rule ID" is a combination of the ruleset and rule number; it
- * should be able to univocally describe a rule in the system.  In
- * this implementation, the upper 16 bits of the rule ID is the
- * ruleset number; the lower 16 bits, the rule number within the
- * aforementioned ruleset.
- */
-typedef uint16_t devfs_rnum;
-typedef uint16_t devfs_rsnum;
-typedef uint32_t devfs_rid;
-
-/*
- * Identifier manipulators.
- */
-#define	rid2rsn(rid)	((rid) >> 16)
-#define	rid2rn(rid)	((rid) & 0xffff)
-#define	mkrid(rsn, rn)	((rn) | ((rsn) << 16))
-
-/*
- * Plain DEVFS rule.  This gets shared between kernel and userland
- * verbatim, so it shouldn't contain any pointers or other kernel- or
- * userland-specific values.
- */
-struct devfs_rule {
-	uint32_t dr_magic;			/* Magic number. */
-	devfs_rid dr_id;			/* Identifier. */
-
-	/*
-	 * Conditions under which this rule should be applied.  These
-	 * are ANDed together since OR can be simulated by using
-	 * multiple rules.  dr_icond determines which of the other
-	 * variables we should process.
-	 */
-	int	dr_icond;
-#define	DRC_DSWFLAGS	0x001
-#define	DRC_PATHPTRN	0x002
-	int	dr_dswflags;			/* cdevsw flags to match. */
-#define	DEVFS_MAXPTRNLEN	200
-	char	dr_pathptrn[DEVFS_MAXPTRNLEN];	/* Pattern to match path. */
-
-	/*
-	 * Things to change.  dr_iacts determines which of the other
-	 * variables we should process.
-	 */
-	int	dr_iacts;
-#define	DRA_BACTS	0x001
-#define	DRA_UID		0x002
-#define	DRA_GID		0x004
-#define	DRA_MODE	0x008
-#define	DRA_INCSET	0x010
-	int	dr_bacts;			/* Boolean (on/off) action. */
-#define	DRB_HIDE	0x001			/* Hide entry (DE_WHITEOUT). */
-#define	DRB_UNHIDE	0x002			/* Unhide entry. */
-	uid_t	dr_uid;
-	gid_t	dr_gid;
-	mode_t	dr_mode;
-	devfs_rsnum dr_incset;			/* Included ruleset. */
-};
-
-/*
- * Rule-related ioctls.
- */
-#define	DEVFSIO_RADD		_IOWR('D', 0, struct devfs_rule)
-#define	DEVFSIO_RDEL		_IOW('D', 1, devfs_rid)
-#define	DEVFSIO_RAPPLY		_IOW('D', 2, struct devfs_rule)
-#define	DEVFSIO_RAPPLYID	_IOW('D', 3, devfs_rid)
-#define	DEVFSIO_RGETNEXT       	_IOWR('D', 4, struct devfs_rule)
-
-#define	DEVFSIO_SUSE		_IOW('D', 10, devfs_rsnum)
-#define	DEVFSIO_SAPPLY		_IOW('D', 11, devfs_rsnum)
-#define	DEVFSIO_SGETNEXT	_IOWR('D', 12, devfs_rsnum)
-
-/* XXX: DEVFSIO_RS_GET_INFO for refcount, active if any, etc. */
-
-#ifdef _KERNEL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_DEVFS);
-#endif
-
-struct componentname;
-
-TAILQ_HEAD(devfs_dlist_head, devfs_dirent);
-
-struct devfs_dirent {
-	struct cdev_priv	*de_cdp;
-	int			de_inode;
-	int			de_flags;
-#define	DE_WHITEOUT	0x01
-#define	DE_DOT		0x02
-#define	DE_DOTDOT	0x04
-#define	DE_DOOMED	0x08
-#define	DE_COVERED	0x10
-#define	DE_USER		0x20
-	int			de_holdcnt;
-	struct dirent 		*de_dirent;
-	TAILQ_ENTRY(devfs_dirent) de_list;
-	struct devfs_dlist_head	de_dlist;
-	struct devfs_dirent	*de_dir;
-	int			de_links;
-	mode_t			de_mode;
-	uid_t			de_uid;
-	gid_t			de_gid;
-	struct label		*de_label;
-	struct timespec 	de_atime;
-	struct timespec 	de_mtime;
-	struct timespec 	de_ctime;
-	struct vnode 		*de_vnode;
-	char 			*de_symlink;
-};
-
-struct devfs_mount {
-	u_int			dm_idx;
-	struct mount		*dm_mount;
-	struct devfs_dirent	*dm_rootdir;
-	unsigned		dm_generation;
-	int			dm_holdcnt;
-	struct sx		dm_lock;
-	devfs_rsnum		dm_ruleset;
-};
-
-#define DEVFS_ROOTINO 2
-
-extern unsigned devfs_rule_depth;
-
-#define VFSTODEVFS(mp)	((struct devfs_mount *)((mp)->mnt_data))
-
-#define DEVFS_DE_HOLD(de)	((de)->de_holdcnt++)
-#define DEVFS_DE_DROP(de)	(--(de)->de_holdcnt == 0)
-
-#define DEVFS_DMP_HOLD(dmp)	((dmp)->dm_holdcnt++)
-#define DEVFS_DMP_DROP(dmp)	(--(dmp)->dm_holdcnt == 0)
-
-#define	DEVFS_DEL_VNLOCKED	0x01
-#define	DEVFS_DEL_NORECURSE	0x02
-
-void	devfs_rules_apply(struct devfs_mount *, struct devfs_dirent *);
-void	devfs_rules_cleanup(struct devfs_mount *);
-int	devfs_rules_ioctl(struct devfs_mount *, u_long, caddr_t,
-	    struct thread *);
-void	devfs_ruleset_set(devfs_rsnum rsnum, struct devfs_mount *dm);
-void	devfs_ruleset_apply(struct devfs_mount *dm);
-int	devfs_allocv(struct devfs_dirent *, struct mount *, int,
-	    struct vnode **);
-char	*devfs_fqpn(char *, struct devfs_mount *, struct devfs_dirent *,
-	    struct componentname *);
-void	devfs_delete(struct devfs_mount *, struct devfs_dirent *, int);
-void	devfs_dirent_free(struct devfs_dirent *);
-void	devfs_populate(struct devfs_mount *);
-void	devfs_cleanup(struct devfs_mount *);
-void	devfs_unmount_final(struct devfs_mount *);
-struct devfs_dirent	*devfs_newdirent(char *, int);
-struct devfs_dirent	*devfs_parent_dirent(struct devfs_dirent *);
-struct devfs_dirent	*devfs_vmkdir(struct devfs_mount *, char *, int,
-			    struct devfs_dirent *, u_int);
-struct devfs_dirent	*devfs_find(struct devfs_dirent *, const char *, int,
-			    int);
-
-#endif /* _KERNEL */
-
-#endif /* !_FS_DEVFS_DEVFS_H_ */
diff --git a/include.new/fs/devfs/devfs_int.h b/include.new/fs/devfs/devfs_int.h
deleted file mode 100644
index e730390..0000000
--- a/include.new/fs/devfs/devfs_int.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp.  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. 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.
- *
- * $FreeBSD: releng/10.2/sys/fs/devfs/devfs_int.h 278283 2015-02-05 20:49:13Z hselasky $
- */
-
-/*
- * This file documents a private interface and it SHALL only be used
- * by kern/kern_conf.c and fs/devfs/...
- */
-
-#ifndef _FS_DEVFS_DEVFS_INT_H_
-#define	_FS_DEVFS_DEVFS_INT_H_
-
-#include <sys/queue.h>
-
-#ifdef _KERNEL
-
-struct devfs_dirent;
-struct devfs_mount;
-
-struct cdev_privdata {
-	struct file		*cdpd_fp;
-	void			*cdpd_data;
-	void			(*cdpd_dtr)(void *);
-	LIST_ENTRY(cdev_privdata) cdpd_list;
-};
-
-struct cdev_priv {
-	struct cdev		cdp_c;
-	TAILQ_ENTRY(cdev_priv)	cdp_list;
-
-	u_int			cdp_inode;
-
-	u_int			cdp_flags;
-#define CDP_ACTIVE		(1 << 0)
-#define CDP_SCHED_DTR		(1 << 1)
-#define	CDP_UNREF_DTR		(1 << 2)
-
-	u_int			cdp_inuse;
-	u_int			cdp_maxdirent;
-	struct devfs_dirent	**cdp_dirents;
-	struct devfs_dirent	*cdp_dirent0;
-
-	TAILQ_ENTRY(cdev_priv)	cdp_dtr_list;
-	void			(*cdp_dtr_cb)(void *);
-	void			*cdp_dtr_cb_arg;
-
-	LIST_HEAD(, cdev_privdata) cdp_fdpriv;
-};
-
-#define	cdev2priv(c)	__containerof(c, struct cdev_priv, cdp_c)
-
-struct cdev	*devfs_alloc(int);
-int	devfs_dev_exists(const char *);
-void	devfs_free(struct cdev *);
-void	devfs_create(struct cdev *);
-void	devfs_destroy(struct cdev *);
-void	devfs_destroy_cdevpriv(struct cdev_privdata *);
-
-int	devfs_dir_find(const char *);
-void	devfs_dir_ref_de(struct devfs_mount *, struct devfs_dirent *);
-void	devfs_dir_unref_de(struct devfs_mount *, struct devfs_dirent *);
-int	devfs_pathpath(const char *, const char *);
-
-extern struct unrhdr *devfs_inos;
-extern struct mtx devmtx;
-extern struct mtx devfs_de_interlock;
-extern struct sx clone_drain_lock;
-extern struct mtx cdevpriv_mtx;
-extern TAILQ_HEAD(cdev_priv_list, cdev_priv) cdevp_list;
-
-#endif /* _KERNEL */
-
-#endif /* !_FS_DEVFS_DEVFS_INT_H_ */
diff --git a/include.new/fs/fdescfs/fdesc.h b/include.new/fs/fdescfs/fdesc.h
deleted file mode 100644
index ac02c95..0000000
--- a/include.new/fs/fdescfs/fdesc.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software donated to Berkeley by
- * Jan-Simon Pendry.
- *
- * 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.
- * 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.
- *
- *	@(#)fdesc.h	8.5 (Berkeley) 1/21/94
- *
- * $FreeBSD: releng/10.2/sys/fs/fdescfs/fdesc.h 191990 2009-05-11 15:33:26Z attilio $
- */
-
-#ifdef _KERNEL
-/* Private mount flags for fdescfs. */
-#define FMNT_UNMOUNTF 0x01
-struct fdescmount {
-	struct vnode	*f_root;	/* Root node */
-	int flags;
-};
-
-#define FD_ROOT		1
-#define FD_DESC		3
-
-typedef enum {
-	Froot,
-	Fdesc
-} fdntype;
-
-struct fdescnode {
-	LIST_ENTRY(fdescnode) fd_hash;	/* Hash list */
-	struct vnode	*fd_vnode;	/* Back ptr to vnode */
-	fdntype		fd_type;	/* Type of this node */
-	unsigned	fd_fd;		/* Fd to be dup'ed */
-	int		fd_ix;		/* filesystem index */
-};
-
-extern struct mtx fdesc_hashmtx;
-#define VFSTOFDESC(mp)	((struct fdescmount *)((mp)->mnt_data))
-#define	VTOFDESC(vp) ((struct fdescnode *)(vp)->v_data)
-
-extern vfs_init_t fdesc_init;
-extern vfs_uninit_t fdesc_uninit;
-extern int fdesc_allocvp(fdntype, unsigned, int, struct mount *,
-    struct vnode **);
-#endif /* _KERNEL */
diff --git a/include.new/fs/fifofs/fifo.h b/include.new/fs/fifofs/fifo.h
deleted file mode 100644
index 6d62759..0000000
--- a/include.new/fs/fifofs/fifo.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- *
- *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $FreeBSD: src/sys/fs/fifofs/fifo.h,v 1.20 2005/01/06 18:10:38 imp Exp $
- */
-
-/*
- * Prototypes for fifo operations on vnodes.
- */
-int	fifo_vnoperate(struct vop_generic_args *);
-int	fifo_printinfo(struct vnode *);
-
diff --git a/include.new/fs/msdosfs/bootsect.h b/include.new/fs/msdosfs/bootsect.h
deleted file mode 100644
index 20487ef..0000000
--- a/include.new/fs/msdosfs/bootsect.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/fs/msdosfs/bootsect.h 203827 2010-02-13 12:41:07Z kib $ */
-/*	$NetBSD: bootsect.h,v 1.9 1997/11/17 15:36:17 ws Exp $	*/
-
-/*-
- * Written by Paul Popelka (paulp@uts.amdahl.com)
- *
- * You can do anything you want with this software, just don't say you wrote
- * it, and don't remove this notice.
- *
- * This software is provided "as is".
- *
- * The author supplies this software to be publicly redistributed on the
- * understanding that the author is not responsible for the correct
- * functioning of this software in any circumstances and is not liable for
- * any damages caused by this software.
- *
- * October 1992
- */
-#ifndef _FS_MSDOSFS_BOOTSECT_H_
-#define	_FS_MSDOSFS_BOOTSECT_H_
-
-/*
- * Format of a boot sector.  This is the first sector on a DOS floppy disk
- * or the fist sector of a partition on a hard disk.  But, it is not the
- * first sector of a partitioned hard disk.
- */
-struct bootsector33 {
-	u_int8_t	bsJump[3];		/* jump inst E9xxxx or EBxx90 */
-	int8_t		bsOemName[8];		/* OEM name and version */
-	int8_t		bsBPB[19];		/* BIOS parameter block */
-	int8_t		bsDriveNumber;		/* drive number (0x80) */
-	int8_t		bsBootCode[479];	/* pad so struct is 512b */
-	u_int8_t	bsBootSectSig0;
-	u_int8_t	bsBootSectSig1;
-#define	BOOTSIG0	0x55
-#define	BOOTSIG1	0xaa
-};
-
-struct extboot {
-	int8_t		exDriveNumber;		/* drive number (0x80) */
-	int8_t		exReserved1;		/* reserved */
-	int8_t		exBootSignature;	/* ext. boot signature (0x29) */
-#define	EXBOOTSIG	0x29
-	int8_t		exVolumeID[4];		/* volume ID number */
-	int8_t		exVolumeLabel[11];	/* volume label */
-	int8_t		exFileSysType[8];	/* fs type (FAT12 or FAT16) */
-};
-
-struct bootsector50 {
-	u_int8_t	bsJump[3];		/* jump inst E9xxxx or EBxx90 */
-	int8_t		bsOemName[8];		/* OEM name and version */
-	int8_t		bsBPB[25];		/* BIOS parameter block */
-	int8_t		bsExt[26];		/* Bootsector Extension */
-	int8_t		bsBootCode[448];	/* pad so structure is 512b */
-	u_int8_t	bsBootSectSig0;
-	u_int8_t	bsBootSectSig1;
-#define	BOOTSIG0	0x55
-#define	BOOTSIG1	0xaa
-};
-
-struct bootsector710 {
-	u_int8_t	bsJump[3];		/* jump inst E9xxxx or EBxx90 */
-	int8_t		bsOEMName[8];		/* OEM name and version */
-	int8_t		bsBPB[53];		/* BIOS parameter block */
-	int8_t		bsExt[26];		/* Bootsector Extension */
-	int8_t		bsBootCode[420];	/* pad so structure is 512b */
-	u_int8_t	bsBootSectSig0;
-	u_int8_t	bsBootSectSig1;
-#define	BOOTSIG0	0x55
-#define	BOOTSIG1	0xaa
-};
-
-union bootsector {
-	struct bootsector33 bs33;
-	struct bootsector50 bs50;
-	struct bootsector710 bs710;
-};
-
-#if 0
-/*
- * Shorthand for fields in the bpb.
- */
-#define	bsBytesPerSec	bsBPB.bpbBytesPerSec
-#define	bsSectPerClust	bsBPB.bpbSectPerClust
-#define	bsResSectors	bsBPB.bpbResSectors
-#define	bsFATS		bsBPB.bpbFATS
-#define	bsRootDirEnts	bsBPB.bpbRootDirEnts
-#define	bsSectors	bsBPB.bpbSectors
-#define	bsMedia		bsBPB.bpbMedia
-#define	bsFATsecs	bsBPB.bpbFATsecs
-#define	bsSectPerTrack	bsBPB.bpbSectPerTrack
-#define	bsHeads		bsBPB.bpbHeads
-#define	bsHiddenSecs	bsBPB.bpbHiddenSecs
-#define	bsHugeSectors	bsBPB.bpbHugeSectors
-#endif
-
-#endif /* !_FS_MSDOSFS_BOOTSECT_H_ */
diff --git a/include.new/fs/msdosfs/bpb.h b/include.new/fs/msdosfs/bpb.h
deleted file mode 100644
index 9efa224..0000000
--- a/include.new/fs/msdosfs/bpb.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/fs/msdosfs/bpb.h 203827 2010-02-13 12:41:07Z kib $ */
-/*	$NetBSD: bpb.h,v 1.7 1997/11/17 15:36:24 ws Exp $	*/
-
-/*-
- * Written by Paul Popelka (paulp@uts.amdahl.com)
- *
- * You can do anything you want with this software, just don't say you wrote
- * it, and don't remove this notice.
- *
- * This software is provided "as is".
- *
- * The author supplies this software to be publicly redistributed on the
- * understanding that the author is not responsible for the correct
- * functioning of this software in any circumstances and is not liable for
- * any damages caused by this software.
- *
- * October 1992
- */
-
-#ifndef _FS_MSDOSFS_BPB_H_
-#define	_FS_MSDOSFS_BPB_H_
-
-/*
- * BIOS Parameter Block (BPB) for DOS 3.3
- */
-struct bpb33 {
-	u_int16_t	bpbBytesPerSec;	/* bytes per sector */
-	u_int8_t	bpbSecPerClust;	/* sectors per cluster */
-	u_int16_t	bpbResSectors;	/* number of reserved sectors */
-	u_int8_t	bpbFATs;	/* number of FATs */
-	u_int16_t	bpbRootDirEnts;	/* number of root directory entries */
-	u_int16_t	bpbSectors;	/* total number of sectors */
-	u_int8_t	bpbMedia;	/* media descriptor */
-	u_int16_t	bpbFATsecs;	/* number of sectors per FAT */
-	u_int16_t	bpbSecPerTrack;	/* sectors per track */
-	u_int16_t	bpbHeads;	/* number of heads */
-	u_int16_t	bpbHiddenSecs;	/* number of hidden sectors */
-};
-
-/*
- * BPB for DOS 5.0 The difference is bpbHiddenSecs is a short for DOS 3.3,
- * and bpbHugeSectors is not in the 3.3 bpb.
- */
-struct bpb50 {
-	u_int16_t	bpbBytesPerSec;	/* bytes per sector */
-	u_int8_t	bpbSecPerClust;	/* sectors per cluster */
-	u_int16_t	bpbResSectors;	/* number of reserved sectors */
-	u_int8_t	bpbFATs;	/* number of FATs */
-	u_int16_t	bpbRootDirEnts;	/* number of root directory entries */
-	u_int16_t	bpbSectors;	/* total number of sectors */
-	u_int8_t	bpbMedia;	/* media descriptor */
-	u_int16_t	bpbFATsecs;	/* number of sectors per FAT */
-	u_int16_t	bpbSecPerTrack;	/* sectors per track */
-	u_int16_t	bpbHeads;	/* number of heads */
-	uint32_t	bpbHiddenSecs;	/* # of hidden sectors */
-	uint32_t	bpbHugeSectors;	/* # of sectors if bpbSectors == 0 */
-};
-
-/*
- * BPB for DOS 7.10 (FAT32).  This one has a few extensions to bpb50.
- */
-struct bpb710 {
-	u_int16_t	bpbBytesPerSec;	/* bytes per sector */
-	u_int8_t	bpbSecPerClust;	/* sectors per cluster */
-	u_int16_t	bpbResSectors;	/* number of reserved sectors */
-	u_int8_t	bpbFATs;	/* number of FATs */
-	u_int16_t	bpbRootDirEnts;	/* number of root directory entries */
-	u_int16_t	bpbSectors;	/* total number of sectors */
-	u_int8_t	bpbMedia;	/* media descriptor */
-	u_int16_t	bpbFATsecs;	/* number of sectors per FAT */
-	u_int16_t	bpbSecPerTrack;	/* sectors per track */
-	u_int16_t	bpbHeads;	/* number of heads */
-	uint32_t	bpbHiddenSecs;	/* # of hidden sectors */
-	uint32_t	bpbHugeSectors;	/* # of sectors if bpbSectors == 0 */
-	uint32_t	bpbBigFATsecs;	/* like bpbFATsecs for FAT32 */
-	u_int16_t	bpbExtFlags;	/* extended flags: */
-#define	FATNUM		0xf		/* mask for numbering active FAT */
-#define	FATMIRROR	0x80		/* FAT is mirrored (like it always was) */
-	u_int16_t	bpbFSVers;	/* filesystem version */
-#define	FSVERS		0		/* currently only 0 is understood */
-	uint32_t	bpbRootClust;	/* start cluster for root directory */
-	u_int16_t	bpbFSInfo;	/* filesystem info structure sector */
-	u_int16_t	bpbBackup;	/* backup boot sector */
-	u_int8_t	bpbReserved[12]; /* reserved for future expansion */
-};
-
-/*
- * The following structures represent how the bpb's look on disk.  shorts
- * and longs are just character arrays of the appropriate length.  This is
- * because the compiler forces shorts and longs to align on word or
- * halfword boundaries.
- */
-
-#include <sys/endian.h>
-
-#define	getushort(x)	le16dec(x)
-#define	getulong(x)	le32dec(x)
-#define	putushort(p, v)	le16enc(p, v)
-#define	putulong(p, v)	le32enc(p, v)
-
-/*
- * BIOS Parameter Block (BPB) for DOS 3.3
- */
-struct byte_bpb33 {
-	int8_t bpbBytesPerSec[2];	/* bytes per sector */
-	int8_t bpbSecPerClust;		/* sectors per cluster */
-	int8_t bpbResSectors[2];	/* number of reserved sectors */
-	int8_t bpbFATs;			/* number of FATs */
-	int8_t bpbRootDirEnts[2];	/* number of root directory entries */
-	int8_t bpbSectors[2];		/* total number of sectors */
-	int8_t bpbMedia;		/* media descriptor */
-	int8_t bpbFATsecs[2];		/* number of sectors per FAT */
-	int8_t bpbSecPerTrack[2];	/* sectors per track */
-	int8_t bpbHeads[2];		/* number of heads */
-	int8_t bpbHiddenSecs[2];	/* number of hidden sectors */
-};
-
-/*
- * BPB for DOS 5.0 The difference is bpbHiddenSecs is a short for DOS 3.3,
- * and bpbHugeSectors is not in the 3.3 bpb.
- */
-struct byte_bpb50 {
-	int8_t bpbBytesPerSec[2];	/* bytes per sector */
-	int8_t bpbSecPerClust;		/* sectors per cluster */
-	int8_t bpbResSectors[2];	/* number of reserved sectors */
-	int8_t bpbFATs;			/* number of FATs */
-	int8_t bpbRootDirEnts[2];	/* number of root directory entries */
-	int8_t bpbSectors[2];		/* total number of sectors */
-	int8_t bpbMedia;		/* media descriptor */
-	int8_t bpbFATsecs[2];		/* number of sectors per FAT */
-	int8_t bpbSecPerTrack[2];	/* sectors per track */
-	int8_t bpbHeads[2];		/* number of heads */
-	int8_t bpbHiddenSecs[4];	/* number of hidden sectors */
-	int8_t bpbHugeSectors[4];	/* # of sectors if bpbSectors == 0 */
-};
-
-/*
- * BPB for DOS 7.10 (FAT32).  This one has a few extensions to bpb50.
- */
-struct byte_bpb710 {
-	u_int8_t bpbBytesPerSec[2];	/* bytes per sector */
-	u_int8_t bpbSecPerClust;	/* sectors per cluster */
-	u_int8_t bpbResSectors[2];	/* number of reserved sectors */
-	u_int8_t bpbFATs;		/* number of FATs */
-	u_int8_t bpbRootDirEnts[2];	/* number of root directory entries */
-	u_int8_t bpbSectors[2];		/* total number of sectors */
-	u_int8_t bpbMedia;		/* media descriptor */
-	u_int8_t bpbFATsecs[2];		/* number of sectors per FAT */
-	u_int8_t bpbSecPerTrack[2];	/* sectors per track */
-	u_int8_t bpbHeads[2];		/* number of heads */
-	u_int8_t bpbHiddenSecs[4];	/* # of hidden sectors */
-	u_int8_t bpbHugeSectors[4];	/* # of sectors if bpbSectors == 0 */
-	u_int8_t bpbBigFATsecs[4];	/* like bpbFATsecs for FAT32 */
-	u_int8_t bpbExtFlags[2];	/* extended flags: */
-	u_int8_t bpbFSVers[2];		/* filesystem version */
-	u_int8_t bpbRootClust[4];	/* start cluster for root directory */
-	u_int8_t bpbFSInfo[2];		/* filesystem info structure sector */
-	u_int8_t bpbBackup[2];		/* backup boot sector */
-	u_int8_t bpbReserved[12];	/* reserved for future expansion */
-};
-
-/*
- * FAT32 FSInfo block.
- */
-struct fsinfo {
-	u_int8_t fsisig1[4];
-	u_int8_t fsifill1[480];
-	u_int8_t fsisig2[4];
-	u_int8_t fsinfree[4];
-	u_int8_t fsinxtfree[4];
-	u_int8_t fsifill2[12];
-	u_int8_t fsisig3[4];
-};
-#endif /* !_FS_MSDOSFS_BPB_H_ */
diff --git a/include.new/fs/msdosfs/denode.h b/include.new/fs/msdosfs/denode.h
deleted file mode 100644
index 4ef67fa..0000000
--- a/include.new/fs/msdosfs/denode.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/fs/msdosfs/denode.h 234605 2012-04-23 13:21:28Z trasz $ */
-/*	$NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $	*/
-
-/*-
- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
- * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
- * All rights reserved.
- * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
- *
- * 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
- */
-/*-
- * Written by Paul Popelka (paulp@uts.amdahl.com)
- *
- * You can do anything you want with this software, just don't say you wrote
- * it, and don't remove this notice.
- *
- * This software is provided "as is".
- *
- * The author supplies this software to be publicly redistributed on the
- * understanding that the author is not responsible for the correct
- * functioning of this software in any circumstances and is not liable for
- * any damages caused by this software.
- *
- * October 1992
- */
-
-/*
- * This is the pc filesystem specific portion of the vnode structure.
- *
- * To describe a file uniquely the de_dirclust, de_diroffset, and
- * de_StartCluster fields are used.
- *
- * de_dirclust contains the cluster number of the directory cluster
- *	containing the entry for a file or directory.
- * de_diroffset is the index into the cluster for the entry describing
- *	a file or directory.
- * de_StartCluster is the number of the first cluster of the file or directory.
- *
- * Now to describe the quirks of the pc filesystem.
- * - Clusters 0 and 1 are reserved.
- * - The first allocatable cluster is 2.
- * - The root directory is of fixed size and all blocks that make it up
- *   are contiguous.
- * - Cluster 0 refers to the root directory when it is found in the
- *   startcluster field of a directory entry that points to another directory.
- * - Cluster 0 implies a 0 length file when found in the start cluster field
- *   of a directory entry that points to a file.
- * - You can't use the cluster number 0 to derive the address of the root
- *   directory.
- * - Multiple directory entries can point to a directory. The entry in the
- *   parent directory points to a child directory.  Any directories in the
- *   child directory contain a ".." entry that points back to the parent.
- *   The child directory itself contains a "." entry that points to itself.
- * - The root directory does not contain a "." or ".." entry.
- * - Directory entries for directories are never changed once they are created
- *   (except when removed).  The size stays 0, and the last modification time
- *   is never changed.  This is because so many directory entries can point to
- *   the physical clusters that make up a directory.  It would lead to an
- *   update nightmare.
- * - The length field in a directory entry pointing to a directory contains 0
- *   (always).  The only way to find the end of a directory is to follow the
- *   cluster chain until the "last cluster" marker is found.
- *
- * My extensions to make this house of cards work.  These apply only to the in
- * memory copy of the directory entry.
- * - A reference count for each denode will be kept since dos doesn't keep such
- *   things.
- */
-
-/*
- * Internal pseudo-offset for (nonexistent) directory entry for the root
- * dir in the root dir
- */
-#define	MSDOSFSROOT_OFS	0x1fffffff
-
-/*
- * The fat cache structure. fc_fsrcn is the filesystem relative cluster
- * number that corresponds to the file relative cluster number in this
- * structure (fc_frcn).
- */
-struct fatcache {
-	u_long fc_frcn;		/* file relative cluster number */
-	u_long fc_fsrcn;	/* filesystem relative cluster number */
-};
-
-/*
- * The fat entry cache as it stands helps make extending files a "quick"
- * operation by avoiding having to scan the fat to discover the last
- * cluster of the file. The cache also helps sequential reads by
- * remembering the last cluster read from the file.  This also prevents us
- * from having to rescan the fat to find the next cluster to read.  This
- * cache is probably pretty worthless if a file is opened by multiple
- * processes.
- */
-#define	FC_SIZE		3	/* number of entries in the cache */
-#define	FC_LASTMAP	0	/* entry the last call to pcbmap() resolved
-				 * to */
-#define	FC_LASTFC	1	/* entry for the last cluster in the file */
-#define	FC_NEXTTOLASTFC	2	/* entry for a close to the last cluster in
-				 * the file */
-
-#define	FCE_EMPTY	0xffffffff	/* doesn't represent an actual cluster # */
-
-/*
- * Set a slot in the fat cache.
- */
-#define	fc_setcache(dep, slot, frcn, fsrcn) \
-	(dep)->de_fc[(slot)].fc_frcn = (frcn); \
-	(dep)->de_fc[(slot)].fc_fsrcn = (fsrcn);
-
-/*
- * This is the in memory variant of a dos directory entry.  It is usually
- * contained within a vnode.
- */
-struct denode {
-	struct vnode *de_vnode;	/* addr of vnode we are part of */
-	u_long de_flag;		/* flag bits */
-	u_long de_dirclust;	/* cluster of the directory file containing this entry */
-	u_long de_diroffset;	/* offset of this entry in the directory cluster */
-	u_long de_fndoffset;	/* offset of found dir entry */
-	int de_fndcnt;		/* number of slots before de_fndoffset */
-	long de_refcnt;		/* reference count */
-	struct msdosfsmount *de_pmp;	/* addr of our mount struct */
-	u_char de_Name[12];	/* name, from DOS directory entry */
-	u_char de_Attributes;	/* attributes, from directory entry */
-	u_char de_LowerCase;	/* NT VFAT lower case flags */
-	u_char de_CHun;		/* Hundredth of second of CTime*/
-	u_short de_CTime;	/* creation time */
-	u_short de_CDate;	/* creation date */
-	u_short de_ADate;	/* access date */
-	u_short de_MTime;	/* modification time */
-	u_short de_MDate;	/* modification date */
-	u_long de_StartCluster; /* starting cluster of file */
-	u_long de_FileSize;	/* size of file in bytes */
-	struct fatcache de_fc[FC_SIZE];	/* fat cache */
-	u_quad_t de_modrev;	/* Revision level for lease. */
-	u_int64_t de_inode;	/* Inode number (really byte offset of direntry) */
-};
-
-/*
- * Values for the de_flag field of the denode.
- */
-#define	DE_UPDATE	0x0004	/* Modification time update request */
-#define	DE_CREATE	0x0008	/* Creation time update */
-#define	DE_ACCESS	0x0010	/* Access time update */
-#define	DE_MODIFIED	0x0020	/* Denode has been modified */
-#define	DE_RENAME	0x0040	/* Denode is in the process of being renamed */
-
-
-/*
- * Transfer directory entries between internal and external form.
- * dep is a struct denode * (internal form),
- * dp is a struct direntry * (external form).
- */
-#define DE_INTERNALIZE32(dep, dp)			\
-	 ((dep)->de_StartCluster |= getushort((dp)->deHighClust) << 16)
-#define DE_INTERNALIZE(dep, dp)				\
-	(bcopy((dp)->deName, (dep)->de_Name, 11),	\
-	 (dep)->de_Attributes = (dp)->deAttributes,	\
-	 (dep)->de_LowerCase = (dp)->deLowerCase,	\
-	 (dep)->de_CHun = (dp)->deCHundredth,		\
-	 (dep)->de_CTime = getushort((dp)->deCTime),	\
-	 (dep)->de_CDate = getushort((dp)->deCDate),	\
-	 (dep)->de_ADate = getushort((dp)->deADate),	\
-	 (dep)->de_MTime = getushort((dp)->deMTime),	\
-	 (dep)->de_MDate = getushort((dp)->deMDate),	\
-	 (dep)->de_StartCluster = getushort((dp)->deStartCluster), \
-	 (dep)->de_FileSize = getulong((dp)->deFileSize), \
-	 (FAT32((dep)->de_pmp) ? DE_INTERNALIZE32((dep), (dp)) : 0))
-
-#define DE_EXTERNALIZE(dp, dep)				\
-	(bcopy((dep)->de_Name, (dp)->deName, 11),	\
-	 (dp)->deAttributes = (dep)->de_Attributes,	\
-	 (dp)->deLowerCase = (dep)->de_LowerCase,	\
-	 (dp)->deCHundredth = (dep)->de_CHun,		\
-	 putushort((dp)->deCTime, (dep)->de_CTime),	\
-	 putushort((dp)->deCDate, (dep)->de_CDate),	\
-	 putushort((dp)->deADate, (dep)->de_ADate),	\
-	 putushort((dp)->deMTime, (dep)->de_MTime),	\
-	 putushort((dp)->deMDate, (dep)->de_MDate),	\
-	 putushort((dp)->deStartCluster, (dep)->de_StartCluster), \
-	 putulong((dp)->deFileSize,			\
-	     ((dep)->de_Attributes & ATTR_DIRECTORY) ? 0 : (dep)->de_FileSize), \
-	 putushort((dp)->deHighClust, (dep)->de_StartCluster >> 16))
-
-#ifdef _KERNEL
-
-#define	VTODE(vp)	((struct denode *)(vp)->v_data)
-#define	DETOV(de)	((de)->de_vnode)
-
-#define	DETIMES(dep, acc, mod, cre) do {				\
-	if ((dep)->de_flag & DE_UPDATE) {				\
-		(dep)->de_flag |= DE_MODIFIED;				\
-		timespec2fattime((mod), 0, &(dep)->de_MDate,		\
-		    &(dep)->de_MTime, NULL);				\
-		(dep)->de_Attributes |= ATTR_ARCHIVE;			\
-	}								\
-	if ((dep)->de_pmp->pm_flags & MSDOSFSMNT_NOWIN95) {		\
-		(dep)->de_flag &= ~(DE_UPDATE | DE_CREATE | DE_ACCESS);	\
-		break;							\
-	}								\
-	if ((dep)->de_flag & DE_ACCESS) {				\
-		u_int16_t adate;					\
-									\
-		timespec2fattime((acc), 0, &adate, NULL, NULL);		\
-		if (adate != (dep)->de_ADate) {				\
-			(dep)->de_flag |= DE_MODIFIED;			\
-			(dep)->de_ADate = adate;			\
-		}							\
-	}								\
-	if ((dep)->de_flag & DE_CREATE) {				\
-		timespec2fattime((cre), 0, &(dep)->de_CDate,		\
-		    &(dep)->de_CTime, &(dep)->de_CHun);			\
-		(dep)->de_flag |= DE_MODIFIED;				\
-	}								\
-	(dep)->de_flag &= ~(DE_UPDATE | DE_CREATE | DE_ACCESS);		\
-} while (0)
-
-/*
- * This overlays the fid structure (see mount.h)
- */
-struct defid {
-	u_short defid_len;	/* length of structure */
-	u_short defid_pad;	/* force long alignment */
-
-	uint32_t defid_dirclust; /* cluster this dir entry came from */
-	uint32_t defid_dirofs;	/* offset of entry within the cluster */
-#if 0
-	uint32_t defid_gen;	/* generation number */
-#endif
-};
-
-extern struct vop_vector msdosfs_vnodeops;
-
-int msdosfs_lookup(struct vop_cachedlookup_args *);
-int msdosfs_inactive(struct vop_inactive_args *);
-int msdosfs_reclaim(struct vop_reclaim_args *);
-
-/*
- * Internal service routine prototypes.
- */
-int deget(struct msdosfsmount *, u_long, u_long, struct denode **);
-int uniqdosname(struct denode *, struct componentname *, u_char *);
-int findwin95(struct denode *);
-
-int readep(struct msdosfsmount *pmp, u_long dirclu, u_long dirofs,  struct buf **bpp, struct direntry **epp);
-int readde(struct denode *dep, struct buf **bpp, struct direntry **epp);
-int deextend(struct denode *dep, u_long length, struct ucred *cred);
-int fillinusemap(struct msdosfsmount *pmp);
-void reinsert(struct denode *dep);
-int dosdirempty(struct denode *dep);
-int createde(struct denode *dep, struct denode *ddep, struct denode **depp, struct componentname *cnp);
-int deupdat(struct denode *dep, int waitfor);
-int removede(struct denode *pdep, struct denode *dep);
-int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred);
-int doscheckpath( struct denode *source, struct denode *target);
-#endif	/* _KERNEL */
diff --git a/include.new/fs/msdosfs/direntry.h b/include.new/fs/msdosfs/direntry.h
deleted file mode 100644
index 062e36c..0000000
--- a/include.new/fs/msdosfs/direntry.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/fs/msdosfs/direntry.h 203827 2010-02-13 12:41:07Z kib $ */
-/*	$NetBSD: direntry.h,v 1.14 1997/11/17 15:36:32 ws Exp $	*/
-
-/*-
- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
- * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
- * All rights reserved.
- * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
- *
- * 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
- */
-/*-
- * Written by Paul Popelka (paulp@uts.amdahl.com)
- *
- * You can do anything you want with this software, just don't say you wrote
- * it, and don't remove this notice.
- *
- * This software is provided "as is".
- *
- * The author supplies this software to be publicly redistributed on the
- * understanding that the author is not responsible for the correct
- * functioning of this software in any circumstances and is not liable for
- * any damages caused by this software.
- *
- * October 1992
- */
-#ifndef _FS_MSDOSFS_DIRENTRY_H_
-#define	_FS_MSDOSFS_DIRENTRY_H_
-
-/*
- * Structure of a dos directory entry.
- */
-struct direntry {
-	u_int8_t	deName[11];	/* filename, blank filled */
-#define	SLOT_EMPTY	0x00		/* slot has never been used */
-#define	SLOT_E5		0x05		/* the real value is 0xe5 */
-#define	SLOT_DELETED	0xe5		/* file in this slot deleted */
-	u_int8_t	deAttributes;	/* file attributes */
-#define	ATTR_NORMAL	0x00		/* normal file */
-#define	ATTR_READONLY	0x01		/* file is readonly */
-#define	ATTR_HIDDEN	0x02		/* file is hidden */
-#define	ATTR_SYSTEM	0x04		/* file is a system file */
-#define	ATTR_VOLUME	0x08		/* entry is a volume label */
-#define	ATTR_DIRECTORY	0x10		/* entry is a directory name */
-#define	ATTR_ARCHIVE	0x20		/* file is new or modified */
-	u_int8_t	deLowerCase;	/* NT VFAT lower case flags */
-#define	LCASE_BASE	0x08		/* filename base in lower case */
-#define	LCASE_EXT	0x10		/* filename extension in lower case */
-	u_int8_t	deCHundredth;	/* hundredth of seconds in CTime */
-	u_int8_t	deCTime[2];	/* create time */
-	u_int8_t	deCDate[2];	/* create date */
-	u_int8_t	deADate[2];	/* access date */
-	u_int8_t	deHighClust[2];	/* high bytes of cluster number */
-	u_int8_t	deMTime[2];	/* last update time */
-	u_int8_t	deMDate[2];	/* last update date */
-	u_int8_t	deStartCluster[2]; /* starting cluster of file */
-	u_int8_t	deFileSize[4];	/* size of file in bytes */
-};
-
-/*
- * Structure of a Win95 long name directory entry
- */
-struct winentry {
-	u_int8_t	weCnt;
-#define	WIN_LAST	0x40
-#define	WIN_CNT		0x3f
-	u_int8_t	wePart1[10];
-	u_int8_t	weAttributes;
-#define	ATTR_WIN95	0x0f
-	u_int8_t	weReserved1;
-	u_int8_t	weChksum;
-	u_int8_t	wePart2[12];
-	u_int16_t	weReserved2;
-	u_int8_t	wePart3[4];
-};
-#define	WIN_CHARS	13	/* Number of chars per winentry */
-
-/*
- * Maximum number of winentries for a filename.
- */
-#define	WIN_MAXSUBENTRIES 20
-
-/*
- * Maximum filename length in Win95
- * Note: Must be < sizeof(dirent.d_name)
- */
-#define	WIN_MAXLEN	255
-
-/*
- * This is the format of the contents of the deTime field in the direntry
- * structure.
- * We don't use bitfields because we don't know how compilers for
- * arbitrary machines will lay them out.
- */
-#define DT_2SECONDS_MASK	0x1F	/* seconds divided by 2 */
-#define DT_2SECONDS_SHIFT	0
-#define DT_MINUTES_MASK		0x7E0	/* minutes */
-#define DT_MINUTES_SHIFT	5
-#define DT_HOURS_MASK		0xF800	/* hours */
-#define DT_HOURS_SHIFT		11
-
-/*
- * This is the format of the contents of the deDate field in the direntry
- * structure.
- */
-#define DD_DAY_MASK		0x1F	/* day of month */
-#define DD_DAY_SHIFT		0
-#define DD_MONTH_MASK		0x1E0	/* month */
-#define DD_MONTH_SHIFT		5
-#define DD_YEAR_MASK		0xFE00	/* year - 1980 */
-#define DD_YEAR_SHIFT		9
-
-#ifdef _KERNEL
-struct mbnambuf {
-	size_t	nb_len;
-	int	nb_last_id;
-	char	nb_buf[WIN_MAXLEN + 1];
-};
-
-struct dirent;
-struct msdosfsmount;
-
-char	*mbnambuf_flush(struct mbnambuf *nbp, struct dirent *dp);
-void	mbnambuf_init(struct mbnambuf *nbp);
-void	mbnambuf_write(struct mbnambuf *nbp, char *name, int id);
-int	dos2unixfn(u_char dn[11], u_char *un, int lower,
-	    struct msdosfsmount *pmp);
-int	unix2dosfn(const u_char *un, u_char dn[12], size_t unlen, u_int gen,
-	    struct msdosfsmount *pmp);
-int	unix2winfn(const u_char *un, size_t unlen, struct winentry *wep, int cnt,
-	    int chksum, struct msdosfsmount *pmp);
-int	winChkName(struct mbnambuf *nbp, const u_char *un, size_t unlen,
-	    int chksum, struct msdosfsmount *pmp);
-int	win2unixfn(struct mbnambuf *nbp, struct winentry *wep, int chksum,
-	    struct msdosfsmount *pmp);
-u_int8_t winChksum(u_int8_t *name);
-int	winSlotCnt(const u_char *un, size_t unlen, struct msdosfsmount *pmp);
-size_t	winLenFixup(const u_char *un, size_t unlen);
-#endif	/* _KERNEL */
-#endif	/* !_FS_MSDOSFS_DIRENTRY_H_ */
diff --git a/include.new/fs/msdosfs/fat.h b/include.new/fs/msdosfs/fat.h
deleted file mode 100644
index 04b70e3..0000000
--- a/include.new/fs/msdosfs/fat.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/fs/msdosfs/fat.h 139776 2005-01-06 18:10:42Z imp $ */
-/*	$NetBSD: fat.h,v 1.12 1997/11/17 15:36:36 ws Exp $	*/
-
-/*-
- * Copyright (C) 1994, 1997 Wolfgang Solfrank.
- * Copyright (C) 1994, 1997 TooLs GmbH.
- * All rights reserved.
- * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
- *
- * 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
- */
-/*-
- * Written by Paul Popelka (paulp@uts.amdahl.com)
- *
- * You can do anything you want with this software, just don't say you wrote
- * it, and don't remove this notice.
- *
- * This software is provided "as is".
- *
- * The author supplies this software to be publicly redistributed on the
- * understanding that the author is not responsible for the correct
- * functioning of this software in any circumstances and is not liable for
- * any damages caused by this software.
- *
- * October 1992
- */
-
-/*
- * Some useful cluster numbers.
- */
-#define	MSDOSFSROOT	0		/* cluster 0 means the root dir */
-#define	CLUST_FREE	0		/* cluster 0 also means a free cluster */
-#define	MSDOSFSFREE	CLUST_FREE
-#define	CLUST_FIRST	2		/* first legal cluster number */
-#define	CLUST_RSRVD	0xfffffff6	/* reserved cluster range */
-#define	CLUST_BAD	0xfffffff7	/* a cluster with a defect */
-#define	CLUST_EOFS	0xfffffff8	/* start of eof cluster range */
-#define	CLUST_EOFE	0xffffffff	/* end of eof cluster range */
-
-#define	FAT12_MASK	0x00000fff	/* mask for 12 bit cluster numbers */
-#define	FAT16_MASK	0x0000ffff	/* mask for 16 bit cluster numbers */
-#define	FAT32_MASK	0x0fffffff	/* mask for FAT32 cluster numbers */
-
-/*
- * MSDOSFS:
- * Return true if filesystem uses 12 bit fats. Microsoft Programmer's
- * Reference says if the maximum cluster number in a filesystem is greater
- * than 4078 ((CLUST_RSRVS - CLUST_FIRST) & FAT12_MASK) then we've got a
- * 16 bit fat filesystem. While mounting, the result of this test is stored
- * in pm_fatentrysize.
- */
-#define	FAT12(pmp)	(pmp->pm_fatmask == FAT12_MASK)
-#define	FAT16(pmp)	(pmp->pm_fatmask == FAT16_MASK)
-#define	FAT32(pmp)	(pmp->pm_fatmask == FAT32_MASK)
-
-#define	MSDOSFSEOF(pmp, cn)	((((cn) | ~(pmp)->pm_fatmask) & CLUST_EOFS) == CLUST_EOFS)
-
-#ifdef _KERNEL
-/*
- * These are the values for the function argument to the function
- * fatentry().
- */
-#define	FAT_GET		0x0001	/* get a fat entry */
-#define	FAT_SET		0x0002	/* set a fat entry */
-#define	FAT_GET_AND_SET	(FAT_GET | FAT_SET)
-
-/*
- * Flags to extendfile:
- */
-#define	DE_CLEAR	1	/* Zero out the blocks allocated */
-
-int pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int* sp);
-int clusterfree(struct msdosfsmount *pmp, u_long cn, u_long *oldcnp);
-int clusteralloc(struct msdosfsmount *pmp, u_long start, u_long count, u_long fillwith, u_long *retcluster, u_long *got);
-int fatentry(int function, struct msdosfsmount *pmp, u_long cluster, u_long *oldcontents, u_long newcontents);
-int freeclusterchain(struct msdosfsmount *pmp, u_long startchain);
-int extendfile(struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags);
-void fc_purge(struct denode *dep, u_int frcn);
-int markvoldirty(struct msdosfsmount *pmp, int dirty);
-
-#endif	/* _KERNEL */
diff --git a/include.new/fs/msdosfs/msdosfsmount.h b/include.new/fs/msdosfs/msdosfsmount.h
deleted file mode 100644
index 87c1e7a..0000000
--- a/include.new/fs/msdosfs/msdosfsmount.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/fs/msdosfs/msdosfsmount.h 281095 2015-04-05 01:03:11Z kib $ */
-/*	$NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $	*/
-
-/*-
- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
- * Copyright (C) 1994, 1995, 1997 TooLs GmbH.
- * All rights reserved.
- * Original code by Paul Popelka (paulp@uts.amdahl.com) (see below).
- *
- * 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
- */
-/*-
- * Written by Paul Popelka (paulp@uts.amdahl.com)
- *
- * You can do anything you want with this software, just don't say you wrote
- * it, and don't remove this notice.
- *
- * This software is provided "as is".
- *
- * The author supplies this software to be publicly redistributed on the
- * understanding that the author is not responsible for the correct
- * functioning of this software in any circumstances and is not liable for
- * any damages caused by this software.
- *
- * October 1992
- */
-
-#ifndef _MSDOSFS_MSDOSFSMOUNT_H_
-#define	_MSDOSFS_MSDOSFSMOUNT_H_
-
-#ifdef _KERNEL
-
-#include <sys/types.h>
-#include <sys/lock.h>
-#include <sys/lockmgr.h>
-#include <sys/tree.h>
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_MSDOSFSMNT);
-#endif
-
-struct msdosfs_fileno;
-
-/*
- * Layout of the mount control block for a msdos filesystem.
- */
-struct msdosfsmount {
-	struct mount *pm_mountp;/* vfs mount struct for this fs */
-	struct g_consumer *pm_cp;
-	struct bufobj *pm_bo;
-	uid_t pm_uid;		/* uid to set as owner of the files */
-	gid_t pm_gid;		/* gid to set as owner of the files */
-	mode_t pm_mask;		/* mask to and with file protection bits 
-				   for files */
-	mode_t pm_dirmask;	/* mask to and with file protection bits
-				   for directories */
-	struct vnode *pm_devvp;	/* vnode for character device mounted */
-	struct cdev *pm_dev;	/* character device mounted */
-	struct bpb50 pm_bpb;	/* BIOS parameter blk for this fs */
-	u_long pm_BlkPerSec;	/* How many DEV_BSIZE blocks fit inside a physical sector */
-	u_long pm_FATsecs;	/* actual number of fat sectors */
-	u_long pm_fatblk;	/* block # of first FAT */
-	u_long pm_rootdirblk;	/* block # (cluster # for FAT32) of root directory number */
-	u_long pm_rootdirsize;	/* size in blocks (not clusters) */
-	u_long pm_firstcluster;	/* block number of first cluster */
-	u_long pm_maxcluster;	/* maximum cluster number */
-	u_long pm_freeclustercount;	/* number of free clusters */
-	u_long pm_cnshift;	/* shift file offset right this amount to get a cluster number */
-	u_long pm_crbomask;	/* and a file offset with this mask to get cluster rel offset */
-	u_long pm_bnshift;	/* shift file offset right this amount to get a block number */
-	u_long pm_bpcluster;	/* bytes per cluster */
-	u_long pm_fmod;		/* ~0 if fs is modified, this can rollover to 0	*/
-	u_long pm_fatblocksize;	/* size of fat blocks in bytes */
-	u_long pm_fatblocksec;	/* size of fat blocks in sectors */
-	u_long pm_fatsize;	/* size of fat in bytes */
-	uint32_t pm_fatmask;	/* mask to use for fat numbers */
-	u_long pm_fsinfo;	/* fsinfo block number */
-	u_long pm_nxtfree;	/* next place to search for a free cluster */
-	u_int pm_fatmult;	/* these 2 values are used in fat */
-	u_int pm_fatdiv;	/*	offset computation */
-	u_int pm_curfat;	/* current fat for FAT32 (0 otherwise) */
-	u_int *pm_inusemap;	/* ptr to bitmap of in-use clusters */
-	uint64_t pm_flags;	/* see below */
-	void *pm_u2w;	/* Local->Unicode iconv handle */
-	void *pm_w2u;	/* Unicode->Local iconv handle */
-	void *pm_u2d;	/* Unicode->DOS iconv handle */
-	void *pm_d2u;	/* DOS->Local iconv handle */
-	uint32_t pm_nfileno;	/* next 32-bit fileno */
-	RB_HEAD(msdosfs_filenotree, msdosfs_fileno)
-	    pm_filenos; /* 64<->32-bit fileno mapping */
-	struct lock pm_fatlock;	/* lockmgr protecting allocations and rb tree */
-};
-
-/*
- * A 64-bit file number and the 32-bit file number to which it is mapped,
- * in a red-black tree node.
- */
-struct msdosfs_fileno {
-	RB_ENTRY(msdosfs_fileno)	mf_tree;
-	uint32_t			mf_fileno32;
-	uint64_t			mf_fileno64;
-};
-
-/* Byte offset in FAT on filesystem pmp, cluster cn */
-#define	FATOFS(pmp, cn)	((cn) * (pmp)->pm_fatmult / (pmp)->pm_fatdiv)
-
-
-#define	VFSTOMSDOSFS(mp)	((struct msdosfsmount *)mp->mnt_data)
-
-/* Number of bits in one pm_inusemap item: */
-#define	N_INUSEBITS	(8 * sizeof(u_int))
-
-/*
- * Shorthand for fields in the bpb contained in the msdosfsmount structure.
- */
-#define	pm_BytesPerSec	pm_bpb.bpbBytesPerSec
-#define	pm_ResSectors	pm_bpb.bpbResSectors
-#define	pm_FATs		pm_bpb.bpbFATs
-#define	pm_RootDirEnts	pm_bpb.bpbRootDirEnts
-#define	pm_Sectors	pm_bpb.bpbSectors
-#define	pm_Media	pm_bpb.bpbMedia
-#define	pm_SecPerTrack	pm_bpb.bpbSecPerTrack
-#define	pm_Heads	pm_bpb.bpbHeads
-#define	pm_HiddenSects	pm_bpb.bpbHiddenSecs
-#define	pm_HugeSectors	pm_bpb.bpbHugeSectors
-
-/*
- * Convert pointer to buffer -> pointer to direntry
- */
-#define	bptoep(pmp, bp, dirofs) \
-	((struct direntry *)(((bp)->b_data)	\
-	 + ((dirofs) & (pmp)->pm_crbomask)))
-
-/*
- * Convert block number to cluster number
- */
-#define	de_bn2cn(pmp, bn) \
-	((bn) >> ((pmp)->pm_cnshift - (pmp)->pm_bnshift))
-
-/*
- * Convert cluster number to block number
- */
-#define	de_cn2bn(pmp, cn) \
-	((cn) << ((pmp)->pm_cnshift - (pmp)->pm_bnshift))
-
-/*
- * Convert file offset to cluster number
- */
-#define de_cluster(pmp, off) \
-	((off) >> (pmp)->pm_cnshift)
-
-/*
- * Clusters required to hold size bytes
- */
-#define	de_clcount(pmp, size) \
-	(((size) + (pmp)->pm_bpcluster - 1) >> (pmp)->pm_cnshift)
-
-/*
- * Convert file offset to block number
- */
-#define de_blk(pmp, off) \
-	(de_cn2bn(pmp, de_cluster((pmp), (off))))
-
-/*
- * Convert cluster number to file offset
- */
-#define	de_cn2off(pmp, cn) \
-	((cn) << (pmp)->pm_cnshift)
-
-/*
- * Convert block number to file offset
- */
-#define	de_bn2off(pmp, bn) \
-	((bn) << (pmp)->pm_bnshift)
-/*
- * Map a cluster number into a filesystem relative block number.
- */
-#define	cntobn(pmp, cn) \
-	(de_cn2bn((pmp), (cn)-CLUST_FIRST) + (pmp)->pm_firstcluster)
-
-/*
- * Calculate block number for directory entry in root dir, offset dirofs
- */
-#define	roottobn(pmp, dirofs) \
-	(de_blk((pmp), (dirofs)) + (pmp)->pm_rootdirblk)
-
-/*
- * Calculate block number for directory entry at cluster dirclu, offset
- * dirofs
- */
-#define	detobn(pmp, dirclu, dirofs) \
-	((dirclu) == MSDOSFSROOT \
-	 ? roottobn((pmp), (dirofs)) \
-	 : cntobn((pmp), (dirclu)))
-
-void msdosfs_fileno_init(struct mount *);
-void msdosfs_fileno_free(struct mount *);
-uint32_t msdosfs_fileno_map(struct mount *, uint64_t);
-
-#define	MSDOSFS_LOCK_MP(pmp) \
-	lockmgr(&(pmp)->pm_fatlock, LK_EXCLUSIVE, NULL)
-#define	MSDOSFS_UNLOCK_MP(pmp) \
-	lockmgr(&(pmp)->pm_fatlock, LK_RELEASE, NULL)
-#define	MSDOSFS_ASSERT_MP_LOCKED(pmp) \
-	lockmgr_assert(&(pmp)->pm_fatlock, KA_XLOCKED)
-
-#endif /* _KERNEL */
-
-/*
- *  Arguments to mount MSDOS filesystems.
- */
-struct msdosfs_args {
-	char	*fspec;		/* blocks special holding the fs to mount */
-	struct	oexport_args export;	/* network export information */
-	uid_t	uid;		/* uid that owns msdosfs files */
-	gid_t	gid;		/* gid that owns msdosfs files */
-	mode_t	mask;		/* file mask to be applied for msdosfs perms */
-	int	flags;		/* see below */
-	int	unused1;	/* unused, was version number */
-	u_int16_t unused2[128];	/* no longer used, was Local->Unicode table */
-	char	*cs_win;	/* Windows(Unicode) Charset */
-	char	*cs_dos;	/* DOS Charset */
-	char	*cs_local;	/* Local Charset */
-	mode_t	dirmask;	/* dir  mask to be applied for msdosfs perms */
-};
-
-/*
- * Msdosfs mount options:
- */
-#define	MSDOSFSMNT_SHORTNAME	1	/* Force old DOS short names only */
-#define	MSDOSFSMNT_LONGNAME	2	/* Force Win'95 long names */
-#define	MSDOSFSMNT_NOWIN95	4	/* Completely ignore Win95 entries */
-#define	MSDOSFSMNT_KICONV	0x10    /* Use libiconv to convert chars */
-/* All flags above: */
-#define	MSDOSFSMNT_MNTOPT \
-	(MSDOSFSMNT_SHORTNAME|MSDOSFSMNT_LONGNAME|MSDOSFSMNT_NOWIN95 \
-	 |MSDOSFSMNT_KICONV)
-#define	MSDOSFSMNT_RONLY	0x80000000	/* mounted read-only	*/
-#define	MSDOSFSMNT_WAITONFAT	0x40000000	/* mounted synchronous	*/
-#define	MSDOSFS_FATMIRROR	0x20000000	/* FAT is mirrored */
-#define	MSDOSFS_LARGEFS		0x10000000	/* perform fileno mapping */
-#define	MSDOSFS_FSIMOD		0x01000000
-
-#endif /* !_MSDOSFS_MSDOSFSMOUNT_H_ */
diff --git a/include.new/fs/nandfs/bmap.h b/include.new/fs/nandfs/bmap.h
deleted file mode 100644
index c776c01..0000000
--- a/include.new/fs/nandfs/bmap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2012 Semihalf
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/fs/nandfs/bmap.h 235537 2012-05-17 10:11:18Z gber $
- */
-
-#ifndef _BMAP_H
-#define _BMAP_H
-
-#include "nandfs_fs.h"
-
-int bmap_lookup(struct nandfs_node *, nandfs_lbn_t, nandfs_daddr_t *);
-int bmap_insert_block(struct nandfs_node *, nandfs_lbn_t, nandfs_daddr_t);
-int bmap_truncate_mapping(struct nandfs_node *, nandfs_lbn_t, nandfs_lbn_t);
-int bmap_dirty_meta(struct nandfs_node *, nandfs_lbn_t, int);
-
-nandfs_lbn_t get_maxfilesize(struct nandfs_device *);
-
-#endif /* _BMAP_H */
diff --git a/include.new/fs/nandfs/nandfs.h b/include.new/fs/nandfs/nandfs.h
deleted file mode 100644
index 455814c..0000000
--- a/include.new/fs/nandfs/nandfs.h
+++ /dev/null
@@ -1,310 +0,0 @@
-/*-
- * Copyright (c) 2010-2012 Semihalf
- * Copyright (c) 2008, 2009 Reinoud Zandijk
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- *
- * From: NetBSD: nilfs.h,v 1.1 2009/07/18 16:31:42 reinoud
- *
- * $FreeBSD: releng/10.2/sys/fs/nandfs/nandfs.h 235537 2012-05-17 10:11:18Z gber $
- */
-
-#ifndef _FS_NANDFS_NANDFS_H_
-#define _FS_NANDFS_NANDFS_H_
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/condvar.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-
-#include <sys/queue.h>
-#include <sys/uio.h>
-#include <sys/mutex.h>
-
-#include <sys/disk.h>
-#include <sys/kthread.h>
-#include "nandfs_fs.h"
-
-MALLOC_DECLARE(M_NANDFSTEMP);
-
-/* Debug categories */
-#define	NANDFS_DEBUG_VOLUMES		0x000001
-#define	NANDFS_DEBUG_BLOCK		0x000004
-#define	NANDFS_DEBUG_LOCKING		0x000008
-#define	NANDFS_DEBUG_NODE		0x000010
-#define	NANDFS_DEBUG_LOOKUP		0x000020
-#define	NANDFS_DEBUG_READDIR		0x000040
-#define	NANDFS_DEBUG_TRANSLATE		0x000080
-#define	NANDFS_DEBUG_STRATEGY		0x000100
-#define	NANDFS_DEBUG_READ		0x000200
-#define	NANDFS_DEBUG_WRITE		0x000400
-#define	NANDFS_DEBUG_IFILE		0x000800
-#define	NANDFS_DEBUG_ATTR		0x001000
-#define	NANDFS_DEBUG_EXTATTR		0x002000
-#define	NANDFS_DEBUG_ALLOC		0x004000
-#define	NANDFS_DEBUG_CPFILE		0x008000
-#define	NANDFS_DEBUG_DIRHASH		0x010000
-#define	NANDFS_DEBUG_NOTIMPL		0x020000
-#define	NANDFS_DEBUG_SHEDULE		0x040000
-#define	NANDFS_DEBUG_SEG		0x080000
-#define	NANDFS_DEBUG_SYNC		0x100000
-#define	NANDFS_DEBUG_PARANOIA		0x200000
-#define	NANDFS_DEBUG_VNCALL		0x400000
-#define	NANDFS_DEBUG_BUF		0x1000000
-#define	NANDFS_DEBUG_BMAP		0x2000000
-#define	NANDFS_DEBUG_DAT		0x4000000
-#define	NANDFS_DEBUG_GENERIC		0x8000000
-#define	NANDFS_DEBUG_CLEAN		0x10000000
-
-extern int nandfs_verbose;
-
-#define	DPRINTF(name, arg) { \
-		if (nandfs_verbose & NANDFS_DEBUG_##name) {\
-			printf arg;\
-		};\
-	}
-#define	DPRINTFIF(name, cond, arg) { \
-		if (nandfs_verbose & NANDFS_DEBUG_##name) { \
-			if (cond) printf arg;\
-		};\
-	}
-
-#define	VFSTONANDFS(mp)    ((struct nandfsmount *)((mp)->mnt_data))
-#define	VTON(vp) ((struct nandfs_node *)(vp)->v_data)
-#define	NTOV(xp) ((xp)->nn_vnode)
-
-int nandfs_init(struct vfsconf *);
-int nandfs_uninit(struct vfsconf *);
-
-extern struct vop_vector nandfs_vnodeops;
-extern struct vop_vector nandfs_system_vnodeops;
-
-struct nandfs_node;
-
-/* Structure and derivatives */
-struct nandfs_mdt {
-	uint32_t	entries_per_block;
-	uint32_t	entries_per_group;
-	uint32_t	blocks_per_group;
-	uint32_t	groups_per_desc_block;	/* desc is super group */
-	uint32_t	blocks_per_desc_block;	/* desc is super group */
-};
-
-struct nandfs_segment {
-	LIST_ENTRY(nandfs_segment) seg_link;
-
-	struct nandfs_device	*fsdev;
-
-	TAILQ_HEAD(, buf)	 segsum;
-	TAILQ_HEAD(, buf)	 data;
-
-	uint64_t		 seg_num;
-	uint64_t		 seg_next;
-	uint64_t		 start_block;
-	uint32_t		 num_blocks;
-
-	uint32_t		 nblocks;
-	uint32_t		 nbinfos;
-	uint32_t		 segsum_blocks;
-	uint32_t		 segsum_bytes;
-	uint32_t		 bytes_left;
-	char			*current_off;
-};
-
-struct nandfs_seginfo {
-	LIST_HEAD( ,nandfs_segment)	seg_list;
-	struct nandfs_segment		*curseg;
-	struct nandfs_device		*fsdev;
-	uint32_t			blocks;
-	uint8_t				reiterate;
-};
-
-#define	NANDFS_FSSTOR_FAILED	1
-struct nandfs_fsarea {
-	int	offset;
-	int	flags;
-	int	last_used;
-};
-
-extern int nandfs_cleaner_enable;
-extern int nandfs_cleaner_interval;
-extern int nandfs_cleaner_segments;
-
-struct nandfs_device {
-	struct vnode		*nd_devvp;
-	struct g_consumer	*nd_gconsumer;
-
-	struct thread		*nd_syncer;
-	struct thread		*nd_cleaner;
-	int			nd_syncer_exit;
-	int			nd_cleaner_exit;
-
-	int			nd_is_nand;
-
-	struct nandfs_fsarea	nd_fsarea[NANDFS_NFSAREAS];
-	int			nd_last_fsarea;
-
-	STAILQ_HEAD(nandfs_mnts, nandfsmount)	nd_mounts;
-	SLIST_ENTRY(nandfs_device)		nd_next_device;
-
-	/* FS structures */
-	struct nandfs_fsdata		nd_fsdata;
-	struct nandfs_super_block	nd_super;
-	struct nandfs_segment_summary	nd_last_segsum;
-	struct nandfs_super_root	nd_super_root;
-	struct nandfs_node	*nd_dat_node;
-	struct nandfs_node	*nd_cp_node;
-	struct nandfs_node	*nd_su_node;
-	struct nandfs_node	*nd_gc_node;
-
-	struct nandfs_mdt	nd_dat_mdt;
-	struct nandfs_mdt	nd_ifile_mdt;
-
-	struct timespec		nd_ts;
-
-	/* Synchronization */
-	struct mtx		nd_mutex;
-	struct mtx		nd_sync_mtx;
-	struct cv		nd_sync_cv;
-	struct mtx		nd_clean_mtx;
-	struct cv		nd_clean_cv;
-	struct lock		nd_seg_const;
-
-	struct nandfs_seginfo	*nd_seginfo;
-
-	/* FS geometry */
-	uint64_t		nd_devsize;
-	uint64_t		nd_maxfilesize;
-	uint32_t		nd_blocksize;
-	uint32_t		nd_erasesize;
-
-	uint32_t		nd_devblocksize;
-
-	/* Segment usage */
-	uint64_t		nd_clean_segs;
-	uint64_t		*nd_free_base;
-	uint64_t		nd_free_count;
-	uint64_t		nd_dirty_bufs;
-
-	/* Running values */
-	uint64_t		nd_seg_sequence;
-	uint64_t		nd_seg_num;
-	uint64_t		nd_next_seg_num;
-	uint64_t		nd_last_pseg;
-	uint64_t		nd_last_cno;
-	uint64_t		nd_last_ino;
-	uint64_t		nd_fakevblk;
-
-	int			nd_mount_state;
-	int			nd_refcnt;
-	int			nd_syncing;
-	int			nd_cleaning;
-};
-
-extern SLIST_HEAD(_nandfs_devices, nandfs_device) nandfs_devices;
-
-#define	NANDFS_FORCE_SYNCER	0x1
-#define	NANDFS_UMOUNT		0x2
-
-#define	SYNCER_UMOUNT		0x0
-#define	SYNCER_VFS_SYNC		0x1
-#define	SYNCER_BDFLUSH		0x2
-#define	SYNCER_FFORCE		0x3
-#define	SYNCER_FSYNC		0x4
-#define	SYNCER_ROUPD		0x5
-
-static __inline int
-nandfs_writelockflags(struct nandfs_device *fsdev, int flags)
-{
-	int error = 0;
-
-	if (lockstatus(&fsdev->nd_seg_const) != LK_EXCLUSIVE)
-		error = lockmgr(&fsdev->nd_seg_const, flags | LK_SHARED, NULL);
-
-	return (error);
-}
-
-static __inline void
-nandfs_writeunlock(struct nandfs_device *fsdev)
-{
-
-	if (lockstatus(&fsdev->nd_seg_const) != LK_EXCLUSIVE)
-		lockmgr(&(fsdev)->nd_seg_const, LK_RELEASE, NULL);
-}
-
-#define NANDFS_WRITELOCKFLAGS(fsdev, flags)	nandfs_writelockflags(fsdev, flags)
-
-#define NANDFS_WRITELOCK(fsdev) NANDFS_WRITELOCKFLAGS(fsdev, 0)
-
-#define NANDFS_WRITEUNLOCK(fsdev) nandfs_writeunlock(fsdev)
-
-#define NANDFS_WRITEASSERT(fsdev) lockmgr_assert(&(fsdev)->nd_seg_const, KA_LOCKED)
-
-/* Specific mountpoint; head or a checkpoint/snapshot */
-struct nandfsmount {
-	STAILQ_ENTRY(nandfsmount) nm_next_mount;
-
-	struct mount		*nm_vfs_mountp;
-	struct nandfs_device	*nm_nandfsdev;
-	struct nandfs_args	nm_mount_args;
-	struct nandfs_node	*nm_ifile_node;
-
-	uint8_t			nm_flags;
-	int8_t			nm_ronly;
-};
-
-struct nandfs_node {
-	struct vnode			*nn_vnode;
-	struct nandfsmount		*nn_nmp;
-	struct nandfs_device		*nn_nandfsdev;
-	struct lockf			*nn_lockf;
-
-	uint64_t			nn_ino;
-	struct nandfs_inode		nn_inode;
-
-	uint64_t			nn_diroff;
-	uint32_t			nn_flags;
-};
-
-#define	IN_ACCESS	0x0001	/* Inode access time update request  */
-#define	IN_CHANGE	0x0002	/* Inode change time update request  */
-#define	IN_UPDATE	0x0004	/* Inode was written to; update mtime*/
-#define	IN_MODIFIED	0x0008	/* node has been modified */
-#define	IN_RENAME	0x0010	/* node is being renamed. */
-
-/* File permissions. */
-#define	IEXEC		0000100	/* Executable. */
-#define	IWRITE		0000200	/* Writeable. */
-#define	IREAD		0000400	/* Readable. */
-#define	ISVTX		0001000	/* Sticky bit. */
-#define	ISGID		0002000	/* Set-gid. */
-#define	ISUID		0004000	/* Set-uid. */
-
-#define	PRINT_NODE_FLAGS \
-	"\10\1IN_ACCESS\2IN_CHANGE\3IN_UPDATE\4IN_MODIFIED\5IN_RENAME"
-
-#define	NANDFS_GATHER(x) ((x)->b_flags |= B_00800000)
-#define	NANDFS_UNGATHER(x) ((x)->b_flags &= ~B_00800000)
-#define	NANDFS_ISGATHERED(x) ((x)->b_flags & B_00800000)
-
-#endif /* !_FS_NANDFS_NANDFS_H_ */
diff --git a/include.new/fs/nandfs/nandfs_fs.h b/include.new/fs/nandfs/nandfs_fs.h
deleted file mode 100644
index cf61d38..0000000
--- a/include.new/fs/nandfs/nandfs_fs.h
+++ /dev/null
@@ -1,565 +0,0 @@
-/*-
- * Copyright (c) 2010-2012 Semihalf
- * Copyright (c) 2008, 2009 Reinoud Zandijk
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- *
- * Original definitions written by Koji Sato <koji@osrg.net>
- *                    and Ryusuke Konishi <ryusuke@osrg.net>
- * From: NetBSD: nandfs_fs.h,v 1.1 2009/07/18 16:31:42 reinoud
- *
- * $FreeBSD: releng/10.2/sys/fs/nandfs/nandfs_fs.h 235537 2012-05-17 10:11:18Z gber $
- */
-
-#ifndef _NANDFS_FS_H
-#define _NANDFS_FS_H
-
-#include <sys/uuid.h>
-
-#define	MNINDIR(fsdev)	((fsdev)->nd_blocksize / sizeof(nandfs_daddr_t))
-
-/*
- * Inode structure. There are a few dedicated inode numbers that are
- * defined here first.
- */
-#define	NANDFS_WHT_INO		1	/* Whiteout ino			*/
-#define	NANDFS_ROOT_INO		2	/* Root file inode		*/
-#define	NANDFS_DAT_INO		3	/* DAT file			*/
-#define	NANDFS_CPFILE_INO	4	/* checkpoint file		*/
-#define	NANDFS_SUFILE_INO	5	/* segment usage file		*/
-#define	NANDFS_IFILE_INO	6	/* ifile			*/
-#define	NANDFS_GC_INO		7	/* Cleanerd node		*/
-#define	NANDFS_ATIME_INO	8	/* Atime file (reserved)	*/
-#define	NANDFS_XATTR_INO	9	/* Xattribute file (reserved)	*/
-#define	NANDFS_SKETCH_INO	10	/* Sketch file (obsolete)	*/
-#define	NANDFS_USER_INO		11	/* First user's file inode number */
-
-#define	NANDFS_SYS_NODE(ino) \
-	(((ino) >= NANDFS_DAT_INO) && ((ino) <= NANDFS_GC_INO))
-
-#define	NDADDR		12		/* Direct addresses in inode. */
-#define	NIADDR		3		/* Indirect addresses in inode. */
-
-typedef	int64_t		nandfs_daddr_t;
-typedef	int64_t		nandfs_lbn_t;
-
-struct nandfs_inode {
-	uint64_t	i_blocks;	/* 0: size in device blocks		*/
-	uint64_t	i_size;		/* 8: size in bytes			*/
-	uint64_t	i_ctime;	/* 16: creation time in seconds		*/
-	uint64_t	i_mtime;	/* 24: modification time in seconds part*/
-	uint32_t	i_ctime_nsec;	/* 32: creation time nanoseconds part	*/
-	uint32_t	i_mtime_nsec;	/* 36: modification time in nanoseconds	*/
-	uint32_t	i_uid;		/* 40: user id				*/
-	uint32_t	i_gid;		/* 44: group id				*/
-	uint16_t	i_mode;		/* 48: file mode			*/
-	uint16_t	i_links_count;	/* 50: number of references to the inode*/
-	uint32_t	i_flags;	/* 52: NANDFS_*_FL flags		*/
-	nandfs_daddr_t	i_special;	/* 56: special				*/
-	nandfs_daddr_t	i_db[NDADDR];	/* 64: Direct disk blocks.		*/
-	nandfs_daddr_t	i_ib[NIADDR];	/* 160: Indirect disk blocks.		*/
-	uint64_t	i_xattr;	/* 184: reserved for extended attributes*/
-	uint32_t	i_generation;	/* 192: file generation for NFS		*/
-	uint32_t	i_pad[15];	/* 196: make it 64 bits aligned		*/
-};
-
-#ifdef _KERNEL
-CTASSERT(sizeof(struct nandfs_inode) == 256);
-#endif
-
-/*
- * Each checkpoint/snapshot has a super root.
- *
- * The super root holds the inodes of the three system files: `dat', `cp' and
- * 'su' files. All other FS state is defined by those.
- *
- * It is CRC checksum'ed and time stamped.
- */
-
-struct nandfs_super_root {
-	uint32_t	sr_sum;		/* check-sum				*/
-	uint16_t	sr_bytes;	/* byte count of this structure		*/
-	uint16_t	sr_flags;	/* reserved for flags			*/
-	uint64_t	sr_nongc_ctime;	/* timestamp, not for cleaner(?)	*/
-	struct nandfs_inode sr_dat;	/* DAT, virt->phys translation inode	*/
-	struct nandfs_inode sr_cpfile;	/* CP, checkpoints inode		*/
-	struct nandfs_inode sr_sufile;	/* SU, segment usage inode		*/
-};
-
-#define	NANDFS_SR_MDT_OFFSET(inode_size, i)			\
-	((uint32_t)&((struct nandfs_super_root *)0)->sr_dat +	\
-	(inode_size) * (i))
-
-#define	NANDFS_SR_DAT_OFFSET(inode_size)	NANDFS_SR_MDT_OFFSET(inode_size, 0)
-#define	NANDFS_SR_CPFILE_OFFSET(inode_size)	NANDFS_SR_MDT_OFFSET(inode_size, 1)
-#define	NANDFS_SR_SUFILE_OFFSET(inode_size)	NANDFS_SR_MDT_OFFSET(inode_size, 2)
-#define	NANDFS_SR_BYTES			(sizeof(struct nandfs_super_root))
-
-/*
- * The superblock describes the basic structure and mount history. It also
- * records some sizes of structures found on the disc for sanity checks.
- *
- * The superblock is stored at two places: NANDFS_SB_OFFSET_BYTES and
- * NANDFS_SB2_OFFSET_BYTES.
- */
-
-/* File system states stored on media in superblock's sbp->s_state */
-#define	NANDFS_VALID_FS		0x0001	/* cleanly unmounted and all is ok  */
-#define	NANDFS_ERROR_FS		0x0002	/* there were errors detected, fsck */
-#define	NANDFS_RESIZE_FS	0x0004	/* resize required, XXX unknown flag*/
-#define	NANDFS_MOUNT_STATE_BITS	"\20\1VALID_FS\2ERROR_FS\3RESIZE_FS"
-
-/*
- * Brief description of control structures:
- *
- * NANDFS_NFSAREAS first blocks contain fsdata and some amount of super blocks.
- * Simple round-robin policy is used in order to choose which block will
- * contain new super block.
- *
- * Simple case with 2 blocks:
- * 1: fsdata sblock1 [sblock3 [sblock5 ..]]
- * 2: fsdata sblock2 [sblock4 [sblock6 ..]]
- */
-struct nandfs_fsdata {
-	uint16_t	f_magic;
-	uint16_t	f_bytes;
-
-	uint32_t	f_sum;		/* checksum of fsdata		*/
-	uint32_t	f_rev_level;	/* major disk format revision	*/
-
-	uint64_t	f_ctime;	/* creation time (execution time
-					   of newfs)			*/
-	/* Block size represented as: blocksize = 1 << (f_log_block_size + 10)	*/
-	uint32_t	f_log_block_size;
-
-	uint16_t	f_inode_size;		/* size of an inode		*/
-	uint16_t	f_dat_entry_size;	/* size of a dat entry		*/
-	uint16_t	f_checkpoint_size;	/* size of a checkpoint		*/
-	uint16_t	f_segment_usage_size;	/* size of a segment usage	*/
-
-	uint16_t	f_sbbytes;		/* byte count of CRC calculation
-						   for super blocks. s_reserved
-						   is excluded!			*/
-
-	uint16_t	f_errors;		/* behaviour on detecting errors	*/
-
-	uint32_t	f_erasesize;
-	uint64_t	f_nsegments;		/* number of segm. in filesystem	*/
-	nandfs_daddr_t	f_first_data_block;	/* 1st seg disk block number		*/
-	uint32_t	f_blocks_per_segment;	/* number of blocks per segment		*/
-	uint32_t	f_r_segments_percentage;	/* reserved segments percentage		*/
-
-	struct uuid	f_uuid;			/* 128-bit uuid for volume		*/
-	char		f_volume_name[16];	/* volume name				*/
-	uint32_t	f_pad[104];
-} __packed;
-
-#ifdef _KERNEL
-CTASSERT(sizeof(struct nandfs_fsdata) == 512);
-#endif
-
-struct nandfs_super_block {
-	uint16_t	s_magic;		/* magic value for identification */
-
-	uint32_t	s_sum;			/* check sum of super block       */
-
-	uint64_t	s_last_cno;		/* last checkpoint number         */
-	uint64_t	s_last_pseg;		/* addr part. segm. written last  */
-	uint64_t	s_last_seq;		/* seq.number of seg written last */
-	uint64_t	s_free_blocks_count;	/* free blocks count              */
-
-	uint64_t	s_mtime;		/* mount time                     */
-	uint64_t	s_wtime;		/* write time                     */
-	uint16_t	s_state;		/* file system state              */
-
-	char		s_last_mounted[64];	/* directory where last mounted   */
-
-	uint32_t	s_c_interval;		/* commit interval of segment     */
-	uint32_t	s_c_block_max;		/* threshold of data amount for
-						   the segment construction */
-	uint32_t	s_reserved[32];		/* padding to end of the block    */
-} __packed;
-
-#ifdef _KERNEL
-CTASSERT(sizeof(struct nandfs_super_block) == 256);
-#endif
-
-#define	NANDFS_FSDATA_MAGIC	0xf8da
-#define	NANDFS_SUPER_MAGIC	0x8008
-
-#define	NANDFS_NFSAREAS		4
-#define	NANDFS_DATA_OFFSET_BYTES(esize)	(NANDFS_NFSAREAS * (esize))
-
-#define	NANDFS_SBLOCK_OFFSET_BYTES (sizeof(struct nandfs_fsdata))
-
-#define	NANDFS_DEF_BLOCKSIZE	4096
-#define	NANDFS_MIN_BLOCKSIZE	512
-
-#define	NANDFS_DEF_ERASESIZE	(2 << 16)
-
-#define	NANDFS_MIN_SEGSIZE	NANDFS_DEF_ERASESIZE
-
-#define	NANDFS_CURRENT_REV	9	/* current major revision */
-
-#define	NANDFS_FSDATA_CRC_BYTES offsetof(struct nandfs_fsdata, f_pad)
-/* Bytes count of super_block for CRC-calculation */
-#define	NANDFS_SB_BYTES  offsetof(struct nandfs_super_block, s_reserved)
-
-/* Maximal count of links to a file */
-#define	NANDFS_LINK_MAX		32000
-
-/*
- * Structure of a directory entry.
- *
- * Note that they can't span blocks; the rec_len fills out.
- */
-
-#define	NANDFS_NAME_LEN 255
-struct nandfs_dir_entry {
-	uint64_t	inode;			/* inode number */
-	uint16_t	rec_len;		/* directory entry length */
-	uint8_t		name_len;		/* name length */
-	uint8_t		file_type;
-	char		name[NANDFS_NAME_LEN];	/* file name */
-	char		pad;
-};
-
-/*
- * NANDFS_DIR_PAD defines the directory entries boundaries
- *
- * NOTE: It must be a multiple of 8
- */
-#define	NANDFS_DIR_PAD			8
-#define	NANDFS_DIR_ROUND		(NANDFS_DIR_PAD - 1)
-#define	NANDFS_DIR_NAME_OFFSET		(offsetof(struct nandfs_dir_entry, name))
-#define	NANDFS_DIR_REC_LEN(name_len)					\
-	(((name_len) + NANDFS_DIR_NAME_OFFSET + NANDFS_DIR_ROUND)	\
-	& ~NANDFS_DIR_ROUND)
-#define	NANDFS_DIR_NAME_LEN(name_len)	\
-	(NANDFS_DIR_REC_LEN(name_len) - NANDFS_DIR_NAME_OFFSET)
-
-/*
- * NiLFS/NANDFS devides the disc into fixed length segments. Each segment is
- * filled with one or more partial segments of variable lengths.
- *
- * Each partial segment has a segment summary header followed by updates of
- * files and optionally a super root.
- */
-
-/*
- * Virtual to physical block translation information. For data blocks it maps
- * logical block number bi_blkoff to virtual block nr bi_vblocknr. For non
- * datablocks it is the virtual block number assigned to an indirect block
- * and has no bi_blkoff. The physical block number is the next
- * available data block in the partial segment after all the binfo's.
- */
-struct nandfs_binfo_v {
-	uint64_t	bi_ino;		/* file's inode			     */
-	uint64_t	bi_vblocknr;	/* assigned virtual block number     */
-	uint64_t	bi_blkoff;	/* for file's logical block number   */
-};
-
-/*
- * DAT allocation. For data blocks just the logical block number that maps on
- * the next available data block in the partial segment after the binfo's.
- */
-struct nandfs_binfo_dat {
-	uint64_t	bi_ino;
-	uint64_t	bi_blkoff;	/* DAT file's logical block number */
-	uint8_t		bi_level;	/* whether this is meta block */
-	uint8_t		bi_pad[7];
-};
-
-#ifdef _KERNEL
-CTASSERT(sizeof(struct nandfs_binfo_v) == sizeof(struct nandfs_binfo_dat));
-#endif
-
-/* Convenience union for both types of binfo's */
-union nandfs_binfo {
-	struct nandfs_binfo_v bi_v;
-	struct nandfs_binfo_dat bi_dat;
-};
-
-/* Indirect buffers path */
-struct nandfs_indir {
-	nandfs_daddr_t	in_lbn;
-	int		in_off;
-};
-
-/* The (partial) segment summary */
-struct nandfs_segment_summary {
-	uint32_t	ss_datasum;	/* CRC of complete data block        */
-	uint32_t	ss_sumsum;	/* CRC of segment summary only       */
-	uint32_t	ss_magic;	/* magic to identify segment summary */
-	uint16_t	ss_bytes;	/* size of segment summary structure */
-	uint16_t	ss_flags;	/* NANDFS_SS_* flags                  */
-	uint64_t	ss_seq;		/* sequence number of this segm. sum */
-	uint64_t	ss_create;	/* creation timestamp in seconds     */
-	uint64_t	ss_next;	/* blocknumber of next segment       */
-	uint32_t	ss_nblocks;	/* number of blocks used by summary  */
-	uint32_t	ss_nbinfos;	/* number of binfo structures	     */
-	uint32_t	ss_sumbytes;	/* total size of segment summary     */
-	uint32_t	ss_pad;
-	/* stream of binfo structures */
-};
-
-#define	NANDFS_SEGSUM_MAGIC	0x8e680011	/* segment summary magic number */
-
-/* Segment summary flags */
-#define	NANDFS_SS_LOGBGN	0x0001	/* begins a logical segment */
-#define	NANDFS_SS_LOGEND	0x0002	/* ends a logical segment */
-#define	NANDFS_SS_SR		0x0004	/* has super root */
-#define	NANDFS_SS_SYNDT		0x0008	/* includes data only updates */
-#define	NANDFS_SS_GC		0x0010	/* segment written for cleaner operation */
-#define	NANDFS_SS_FLAG_BITS	"\20\1LOGBGN\2LOGEND\3SR\4SYNDT\5GC"
-
-/* Segment summary constrains */
-#define	NANDFS_SEG_MIN_BLOCKS	16	/* minimum number of blocks in a
-					   full segment */
-#define	NANDFS_PSEG_MIN_BLOCKS	2	/* minimum number of blocks in a
-					   partial segment */
-#define	NANDFS_MIN_NRSVSEGS	8	/* minimum number of reserved
-					   segments */
-
-/*
- * Structure of DAT/inode file.
- *
- * A DAT file is devided into groups. The maximum number of groups is the
- * number of block group descriptors that fit into one block; this descriptor
- * only gives the number of free entries in the associated group.
- *
- * Each group has a block sized bitmap indicating if an entry is taken or
- * empty. Each bit stands for a DAT entry.
- *
- * The inode file has exactly the same format only the entries are inode
- * entries.
- */
-
-struct nandfs_block_group_desc {
-	uint32_t	bg_nfrees;	/* num. free entries in block group  */
-};
-
-/* DAT entry in a super root's DAT file */
-struct nandfs_dat_entry {
-	uint64_t	de_blocknr;	/* block number                      */
-	uint64_t	de_start;	/* valid from checkpoint             */
-	uint64_t	de_end;		/* valid till checkpoint             */
-	uint64_t	de_rsv;		/* reserved for future use           */
-};
-
-/*
- * Structure of CP file.
- *
- * A snapshot is just a checkpoint only it's protected against removal by the
- * cleaner. The snapshots are kept on a double linked list of checkpoints.
- */
-struct nandfs_snapshot_list {
-	uint64_t	ssl_next;	/* checkpoint nr. forward */
-	uint64_t	ssl_prev;	/* checkpoint nr. back    */
-};
-
-/* Checkpoint entry structure */
-struct nandfs_checkpoint {
-	uint32_t	cp_flags;		/* NANDFS_CHECKPOINT_* flags          */
-	uint32_t	cp_checkpoints_count;	/* ZERO, not used anymore?           */
-	struct nandfs_snapshot_list cp_snapshot_list; /* list of snapshots   */
-	uint64_t	cp_cno;			/* checkpoint number                 */
-	uint64_t	cp_create;		/* creation timestamp                */
-	uint64_t	cp_nblk_inc;		/* number of blocks incremented      */
-	uint64_t	cp_blocks_count;	/* reserved (might be deleted)       */
-	struct nandfs_inode cp_ifile_inode;	/* inode file inode          */
-};
-
-/* Checkpoint flags */
-#define	NANDFS_CHECKPOINT_SNAPSHOT	1
-#define	NANDFS_CHECKPOINT_INVALID	2
-#define	NANDFS_CHECKPOINT_SKETCH	4
-#define	NANDFS_CHECKPOINT_MINOR		8
-#define	NANDFS_CHECKPOINT_BITS		"\20\1SNAPSHOT\2INVALID\3SKETCH\4MINOR"
-
-/* Header of the checkpoint file */
-struct nandfs_cpfile_header {
-	uint64_t	ch_ncheckpoints;	/* number of checkpoints             */
-	uint64_t	ch_nsnapshots;	/* number of snapshots               */
-	struct nandfs_snapshot_list ch_snapshot_list;	/* snapshot list     */
-};
-
-#define	NANDFS_CPFILE_FIRST_CHECKPOINT_OFFSET		\
-	((sizeof(struct nandfs_cpfile_header) +		\
-	sizeof(struct nandfs_checkpoint) - 1) /		\
-	sizeof(struct nandfs_checkpoint))
-
-
-#define NANDFS_NOSEGMENT        0xffffffff
-
-/*
- * Structure of SU file.
- *
- * The segment usage file sums up how each of the segments are used. They are
- * indexed by their segment number.
- */
-
-/* Segment usage entry */
-struct nandfs_segment_usage {
-	uint64_t	su_lastmod;	/* last modified timestamp           */
-	uint32_t	su_nblocks;	/* number of blocks in segment       */
-	uint32_t	su_flags;	/* NANDFS_SEGMENT_USAGE_* flags       */
-};
-
-/* Segment usage flag */
-#define	NANDFS_SEGMENT_USAGE_ACTIVE	1
-#define	NANDFS_SEGMENT_USAGE_DIRTY	2
-#define	NANDFS_SEGMENT_USAGE_ERROR	4
-#define	NANDFS_SEGMENT_USAGE_GC		8
-#define	NANDFS_SEGMENT_USAGE_BITS	"\20\1ACTIVE\2DIRTY\3ERROR"
-
-/* Header of the segment usage file */
-struct nandfs_sufile_header {
-	uint64_t	sh_ncleansegs;	/* number of segments marked clean   */
-	uint64_t	sh_ndirtysegs;	/* number of segments marked dirty   */
-	uint64_t	sh_last_alloc;	/* last allocated segment number     */
-};
-
-#define	NANDFS_SUFILE_FIRST_SEGMENT_USAGE_OFFSET	\
-	((sizeof(struct nandfs_sufile_header) +		\
-	sizeof(struct nandfs_segment_usage) - 1) /	\
-	sizeof(struct nandfs_segment_usage))
-
-struct nandfs_seg_stat {
-	uint64_t	nss_nsegs;
-	uint64_t	nss_ncleansegs;
-	uint64_t	nss_ndirtysegs;
-	uint64_t	nss_ctime;
-	uint64_t	nss_nongc_ctime;
-	uint64_t	nss_prot_seq;
-};
-
-enum {
-	NANDFS_CHECKPOINT,
-	NANDFS_SNAPSHOT
-};
-
-#define	NANDFS_CPINFO_MAX		512
-
-struct nandfs_cpinfo {
-	uint32_t	nci_flags;
-	uint32_t	nci_pad;
-	uint64_t	nci_cno;
-	uint64_t	nci_create;
-	uint64_t	nci_nblk_inc;
-	uint64_t	nci_blocks_count;
-	uint64_t	nci_next;
-};
-
-#define	NANDFS_SEGMENTS_MAX	512
-
-struct nandfs_suinfo {
-	uint64_t	nsi_num;
-	uint64_t	nsi_lastmod;
-	uint32_t	nsi_blocks;
-	uint32_t	nsi_flags;
-};
-
-#define	NANDFS_VINFO_MAX	512
-
-struct nandfs_vinfo {
-	uint64_t	nvi_ino;
-	uint64_t	nvi_vblocknr;
-	uint64_t	nvi_start;
-	uint64_t	nvi_end;
-	uint64_t	nvi_blocknr;
-	int		nvi_alive;
-};
-
-struct nandfs_cpmode {
-	uint64_t	ncpm_cno;
-	uint32_t	ncpm_mode;
-	uint32_t	ncpm_pad;
-};
-
-struct nandfs_argv {
-	uint64_t	nv_base;
-	uint32_t	nv_nmembs;
-	uint16_t	nv_size;
-	uint16_t	nv_flags;
-	uint64_t	nv_index;
-};
-
-struct nandfs_cpstat {
-	uint64_t	ncp_cno;
-	uint64_t	ncp_ncps;
-	uint64_t	ncp_nss;
-};
-
-struct nandfs_period {
-	uint64_t	p_start;
-	uint64_t	p_end;
-};
-
-struct nandfs_vdesc {
-	uint64_t	vd_ino;
-	uint64_t	vd_cno;
-	uint64_t	vd_vblocknr;
-	struct nandfs_period	vd_period;
-	uint64_t	vd_blocknr;
-	uint64_t	vd_offset;
-	uint32_t	vd_flags;
-	uint32_t	vd_pad;
-};
-
-struct nandfs_bdesc {
-	uint64_t	bd_ino;
-	uint64_t	bd_oblocknr;
-	uint64_t	bd_blocknr;
-	uint64_t	bd_offset;
-	uint32_t	bd_level;
-	uint32_t	bd_alive;
-};
-
-#ifndef _KERNEL
-#ifndef	MNAMELEN
-#define	MNAMELEN	88
-#endif
-#endif
-
-struct nandfs_fsinfo {
-	struct nandfs_fsdata		fs_fsdata;
-	struct nandfs_super_block	fs_super;
-	char				fs_dev[MNAMELEN];
-};
-
-#define	NANDFS_MAX_MOUNTS	65535
-
-#define	NANDFS_IOCTL_GET_SUSTAT		_IOR('N', 100, struct nandfs_seg_stat)
-#define	NANDFS_IOCTL_CHANGE_CPMODE	_IOWR('N', 101, struct nandfs_cpmode)
-#define	NANDFS_IOCTL_GET_CPINFO		_IOWR('N', 102, struct nandfs_argv)
-#define	NANDFS_IOCTL_DELETE_CP		_IOWR('N', 103, uint64_t[2])
-#define	NANDFS_IOCTL_GET_CPSTAT		_IOR('N', 104, struct nandfs_cpstat)
-#define	NANDFS_IOCTL_GET_SUINFO		_IOWR('N', 105, struct nandfs_argv)
-#define	NANDFS_IOCTL_GET_VINFO		_IOWR('N', 106, struct nandfs_argv)
-#define	NANDFS_IOCTL_GET_BDESCS		_IOWR('N', 107, struct nandfs_argv)
-#define	NANDFS_IOCTL_GET_FSINFO		_IOR('N', 108, struct nandfs_fsinfo)
-#define	NANDFS_IOCTL_MAKE_SNAP		_IOWR('N', 109, uint64_t)
-#define	NANDFS_IOCTL_DELETE_SNAP	_IOWR('N', 110, uint64_t)
-#define	NANDFS_IOCTL_SYNC		_IOWR('N', 111, uint64_t)
-
-#endif /* _NANDFS_FS_H */
diff --git a/include.new/fs/nandfs/nandfs_mount.h b/include.new/fs/nandfs/nandfs_mount.h
deleted file mode 100644
index 1a0a6fc..0000000
--- a/include.new/fs/nandfs/nandfs_mount.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Reinoud Zandijk
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. 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 ``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 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.
- *
- * From: NetBSD: nilfs_mount.h,v 1.1 2009/07/18 16:31:42 reinoud
- *
- * $FreeBSD: releng/10.2/sys/fs/nandfs/nandfs_mount.h 235537 2012-05-17 10:11:18Z gber $
- */
-
-#ifndef _FS_NANDFS_NANDFS_MOUNT_H_
-#define _FS_NANDFS_NANDFS_MOUNT_H_
-
-/*
- * Arguments to mount NANDFS filingsystem.
- */
-
-struct nandfs_args {
-	char		*fspec;		/* mount specifier                   */
-	int64_t		cpno;		/* checkpoint number                 */
-};
-
-#endif /* !_FS_NANDFS_NANDFS_MOUNT_H_ */
-
diff --git a/include.new/fs/nandfs/nandfs_subr.h b/include.new/fs/nandfs/nandfs_subr.h
deleted file mode 100644
index 1ae319b..0000000
--- a/include.new/fs/nandfs/nandfs_subr.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*-
- * Copyright (c) 2010-2012 Semihalf
- * Copyright (c) 2008, 2009 Reinoud Zandijk
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- *
- * From: NetBSD: nilfs_subr.h,v 1.1 2009/07/18 16:31:42 reinoud
- *
- * $FreeBSD: releng/10.2/sys/fs/nandfs/nandfs_subr.h 235537 2012-05-17 10:11:18Z gber $
- */
-
-#ifndef _FS_NANDFS_NANDFS_SUBR_H_
-#define _FS_NANDFS_NANDFS_SUBR_H_
-
-struct nandfs_mdt;
-
-struct nandfs_alloc_request
-{
-	uint64_t	entrynum;
-	struct buf	*bp_desc;
-	struct buf	*bp_bitmap;
-	struct buf	*bp_entry;
-};
-
-/* Segment creation */
-void nandfs_wakeup_wait_sync(struct nandfs_device *, int);
-int nandfs_segment_constructor(struct nandfsmount *, int);
-int nandfs_sync_file(struct vnode *);
-
-/* Basic calculators */
-uint64_t nandfs_get_segnum_of_block(struct nandfs_device *, nandfs_daddr_t);
-void nandfs_get_segment_range(struct nandfs_device *, uint64_t, uint64_t *,
-    uint64_t *);
-void nandfs_calc_mdt_consts(struct nandfs_device *, struct nandfs_mdt *, int);
-
-/* Log reading / volume helpers */
-int nandfs_search_super_root(struct nandfs_device *);
-
-/* Reading */
-int nandfs_dev_bread(struct nandfs_device *, nandfs_daddr_t, struct ucred *,
-    int, struct buf **);
-int nandfs_bread(struct nandfs_node *, nandfs_lbn_t, struct ucred *, int,
-    struct buf **);
-int nandfs_bread_meta(struct nandfs_node *, nandfs_lbn_t, struct ucred *, int,
-    struct buf **);
-int nandfs_bdestroy(struct nandfs_node *, nandfs_daddr_t);
-int nandfs_bcreate(struct nandfs_node *, nandfs_lbn_t, struct ucred *, int,
-    struct buf **);
-int nandfs_bcreate_meta(struct nandfs_node *, nandfs_lbn_t, struct ucred *,
-    int, struct buf **);
-int nandfs_bread_create(struct nandfs_node *, nandfs_lbn_t, struct ucred *,
-    int, struct buf **);
-
-/* vtop operations */
-int nandfs_vtop(struct nandfs_node *, nandfs_daddr_t, nandfs_daddr_t *);
-
-/* Node action implementators */
-int nandfs_vinit(struct vnode *, uint64_t);
-int nandfs_get_node(struct nandfsmount *, uint64_t, struct nandfs_node **);
-int nandfs_get_node_raw(struct nandfs_device *, struct nandfsmount *, uint64_t,
-    struct nandfs_inode *, struct nandfs_node **);
-void nandfs_dispose_node(struct nandfs_node **);
-
-void nandfs_itimes(struct vnode *);
-int nandfs_lookup_name_in_dir(struct vnode *, const char *, int, uint64_t *,
-    int *, uint64_t *);
-int nandfs_create_node(struct vnode *, struct vnode **, struct vattr *,
-    struct componentname *);
-void nandfs_delete_node(struct nandfs_node *);
-
-int nandfs_chsize(struct vnode *, u_quad_t, struct ucred *);
-int nandfs_dir_detach(struct nandfsmount *, struct nandfs_node *,
-    struct nandfs_node *, struct componentname *);
-int nandfs_dir_attach(struct nandfsmount *, struct nandfs_node *,
-    struct nandfs_node *, struct vattr *, struct componentname *);
-
-int nandfs_dirty_buf(struct buf *, int);
-int nandfs_dirty_buf_meta(struct buf *, int);
-int nandfs_fs_full(struct nandfs_device *);
-void nandfs_undirty_buf_fsdev(struct nandfs_device *, struct buf *);
-void nandfs_undirty_buf(struct buf *);
-
-void nandfs_clear_buf(struct buf *);
-void nandfs_buf_set(struct buf *, uint32_t);
-void nandfs_buf_clear(struct buf *, uint32_t);
-int nandfs_buf_check(struct buf *, uint32_t);
-
-int  nandfs_find_free_entry(struct nandfs_mdt *, struct nandfs_node *,
-    struct nandfs_alloc_request *);
-int  nandfs_find_entry(struct nandfs_mdt *, struct nandfs_node *,
-    struct nandfs_alloc_request *);
-int  nandfs_alloc_entry(struct nandfs_mdt *, struct nandfs_alloc_request *);
-void nandfs_abort_entry(struct nandfs_alloc_request *);
-int  nandfs_free_entry(struct nandfs_mdt *, struct nandfs_alloc_request *);
-int nandfs_get_entry_block(struct nandfs_mdt *, struct nandfs_node *,
-    struct nandfs_alloc_request *, uint32_t *, int);
-
-/* inode managment */
-int  nandfs_node_create(struct nandfsmount *, struct nandfs_node **, uint16_t);
-int nandfs_node_destroy(struct nandfs_node *);
-int nandfs_node_update(struct nandfs_node *);
-int nandfs_get_node_entry(struct nandfsmount *, struct nandfs_inode **,
-    uint64_t, struct buf **);
-void nandfs_mdt_trans_blk(struct nandfs_mdt *, uint64_t, uint64_t *,
-    uint64_t *, nandfs_lbn_t *, uint32_t *);
-
-/* vblock management */
-void nandfs_mdt_trans(struct nandfs_mdt *, uint64_t, nandfs_lbn_t *, uint32_t *);
-int nandfs_vblock_alloc(struct nandfs_device *, nandfs_daddr_t *);
-int nandfs_vblock_end(struct nandfs_device *, nandfs_daddr_t);
-int nandfs_vblock_assign(struct nandfs_device *, nandfs_daddr_t,
-    nandfs_lbn_t);
-int nandfs_vblock_free(struct nandfs_device *, nandfs_daddr_t);
-
-/* Checkpoint management */
-int nandfs_get_checkpoint(struct nandfs_device *, struct nandfs_node *,
-    uint64_t);
-int nandfs_set_checkpoint(struct nandfs_device *, struct nandfs_node *,
-    uint64_t, struct nandfs_inode *, uint64_t);
-
-/* Segment management */
-int nandfs_alloc_segment(struct nandfs_device *, uint64_t *);
-int nandfs_update_segment(struct nandfs_device *, uint64_t, uint32_t);
-int nandfs_free_segment(struct nandfs_device *, uint64_t);
-int nandfs_clear_segment(struct nandfs_device *, uint64_t);
-int nandfs_touch_segment(struct nandfs_device *, uint64_t);
-int nandfs_markgc_segment(struct nandfs_device *, uint64_t);
-
-int nandfs_bmap_insert_block(struct nandfs_node *, nandfs_lbn_t, struct buf *);
-int nandfs_bmap_update_block(struct nandfs_node *, struct buf *, nandfs_lbn_t);
-int nandfs_bmap_update_dat(struct nandfs_node *, nandfs_daddr_t, struct buf *);
-int nandfs_bmap_dirty_blocks(struct nandfs_node *, struct buf *, int);
-int nandfs_bmap_truncate_mapping(struct nandfs_node *, nandfs_lbn_t,
-    nandfs_lbn_t);
-int nandfs_bmap_lookup(struct nandfs_node *, nandfs_lbn_t, nandfs_daddr_t *);
-
-/* dirent */
-int nandfs_add_dirent(struct vnode *, uint64_t, char *, long, uint8_t);
-int nandfs_remove_dirent(struct vnode *, struct nandfs_node *,
-    struct componentname *);
-int nandfs_update_dirent(struct vnode *, struct nandfs_node *,
-    struct nandfs_node *);
-int nandfs_init_dir(struct vnode *, uint64_t, uint64_t);
-int nandfs_update_parent_dir(struct vnode *, uint64_t);
-
-void nandfs_vblk_set(struct buf *, nandfs_daddr_t);
-nandfs_daddr_t nandfs_vblk_get(struct buf *);
-
-void nandfs_inode_init(struct nandfs_inode *, uint16_t);
-void nandfs_inode_destroy(struct nandfs_inode *);
-
-/* ioctl */
-int nandfs_get_seg_stat(struct nandfs_device *, struct nandfs_seg_stat *);
-int nandfs_chng_cpmode(struct nandfs_node *, struct nandfs_cpmode *);
-int nandfs_get_cpinfo_ioctl(struct nandfs_node *, struct nandfs_argv *);
-int nandfs_delete_cp(struct nandfs_node *, uint64_t start, uint64_t);
-int nandfs_make_snap(struct nandfs_device *, uint64_t *);
-int nandfs_delete_snap(struct nandfs_device *, uint64_t);
-int nandfs_get_cpstat(struct nandfs_node *, struct nandfs_cpstat *);
-int nandfs_get_segment_info_ioctl(struct nandfs_device *, struct nandfs_argv *);
-int nandfs_get_dat_vinfo_ioctl(struct nandfs_device *, struct nandfs_argv *);
-int nandfs_get_dat_bdescs_ioctl(struct nandfs_device *, struct nandfs_argv *);
-int nandfs_get_fsinfo(struct nandfsmount *, struct nandfs_fsinfo *);
-
-int nandfs_get_cpinfo(struct nandfs_node *, uint64_t, uint16_t,
-    struct nandfs_cpinfo *, uint32_t, uint32_t *);
-
-nandfs_lbn_t nandfs_get_maxfilesize(struct nandfs_device *);
-
-int nandfs_write_superblock(struct nandfs_device *);
-
-extern int nandfs_sync_interval;
-extern int nandfs_max_dirty_segs;
-extern int nandfs_cps_between_sblocks;
-
-struct buf *nandfs_geteblk(int, int);
-
-void nandfs_dirty_bufs_increment(struct nandfs_device *);
-void nandfs_dirty_bufs_decrement(struct nandfs_device *);
-
-int nandfs_start_cleaner(struct nandfs_device *);
-int nandfs_stop_cleaner(struct nandfs_device *);
-
-int nandfs_segsum_valid(struct nandfs_segment_summary *);
-int nandfs_load_segsum(struct nandfs_device *, nandfs_daddr_t,
-    struct nandfs_segment_summary *);
-int nandfs_get_segment_info(struct nandfs_device *, struct nandfs_suinfo *,
-    uint32_t, uint64_t);
-int nandfs_get_segment_info_filter(struct nandfs_device *,
-    struct nandfs_suinfo *, uint32_t, uint64_t, uint64_t *, uint32_t, uint32_t);
-int nandfs_get_dat_vinfo(struct nandfs_device *, struct nandfs_vinfo *,
-    uint32_t);
-int nandfs_get_dat_bdescs(struct nandfs_device *, struct nandfs_bdesc *,
-    uint32_t);
-
-#define	NANDFS_VBLK_ASSIGNED	1
-
-#define	NANDFS_IS_INDIRECT(bp)	((bp)->b_lblkno < 0)
-
-int nandfs_erase(struct nandfs_device *, off_t, size_t);
-
-#define	NANDFS_VOP_ISLOCKED(vp)	nandfs_vop_islocked((vp))
-int nandfs_vop_islocked(struct vnode *vp);
-
-nandfs_daddr_t nandfs_block_to_dblock(struct nandfs_device *, nandfs_lbn_t);
-
-#define DEBUG_MODE
-#if defined(DEBUG_MODE)
-#define	nandfs_error		panic
-#define	nandfs_warning		printf
-#elif defined(TEST_MODE)
-#define	nandfs_error	printf
-#define	nandfs_warning	printf
-#else
-#define	nandfs_error(...)
-#define	nandfs_warning(...)
-#endif
-
-#endif	/* !_FS_NANDFS_NANDFS_SUBR_H_ */
diff --git a/include.new/fs/nfs/nfs.h b/include.new/fs/nfs/nfs.h
deleted file mode 100644
index 0d6ef13..0000000
--- a/include.new/fs/nfs/nfs.h
+++ /dev/null
@@ -1,730 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/fs/nfs/nfs.h 284216 2015-06-10 12:17:19Z rmacklem $
- */
-
-#ifndef _NFS_NFS_H_
-#define	_NFS_NFS_H_
-/*
- * Tunable constants for nfs
- */
-
-#define	NFS_MAXIOVEC	34
-#define	NFS_TICKINTVL	500		/* Desired time for a tick (msec) */
-#define	NFS_HZ		(hz / nfscl_ticks) /* Ticks/sec */
-#define	NFS_TIMEO	(1 * NFS_HZ)	/* Default timeout = 1 second */
-#define	NFS_MINTIMEO	(1 * NFS_HZ)	/* Min timeout to use */
-#define	NFS_MAXTIMEO	(60 * NFS_HZ)	/* Max timeout to backoff to */
-#define	NFS_TCPTIMEO	300		/* TCP timeout */
-#define	NFS_MAXRCVTIMEO	60		/* 1 minute in seconds */
-#define	NFS_MINIDEMTIMEO (5 * NFS_HZ)	/* Min timeout for non-idempotent ops*/
-#define	NFS_MAXREXMIT	100		/* Stop counting after this many */
-#define	NFSV4_CALLBACKTIMEO (2 * NFS_HZ) /* Timeout in ticks */
-#define	NFSV4_CALLBACKRETRY 5		/* Number of retries before failure */
-#define	NFSV4_SLOTS	64		/* Number of slots, fore channel */
-#define	NFSV4_CBSLOTS	8		/* Number of slots, back channel */
-#define	NFSV4_CBRETRYCNT 4		/* # of CBRecall retries upon err */
-#define	NFSV4_UPCALLTIMEO (15 * NFS_HZ)	/* Timeout in ticks for upcalls */
-					/* to gssd or nfsuserd */
-#define	NFSV4_UPCALLRETRY 4		/* Number of retries before failure */
-#define	NFS_MAXWINDOW	1024		/* Max number of outstanding requests */
-#define	NFS_RETRANS	10		/* Num of retrans for soft mounts */
-#define	NFS_RETRANS_TCP	2		/* Num of retrans for TCP soft mounts */
-#define	NFS_MAXGRPS	16		/* Max. size of groups list */
-#define	NFS_TRYLATERDEL	15		/* Maximum delay timeout (sec) */
-#ifndef NFS_REMOVETIMEO
-#define	NFS_REMOVETIMEO 15  /* # sec to wait for delegret in local syscall */
-#endif
-#ifndef NFS_MINATTRTIMO
-#define	NFS_MINATTRTIMO 5		/* Attribute cache timeout in sec */
-#endif
-#ifndef NFS_MAXATTRTIMO
-#define	NFS_MAXATTRTIMO 60
-#endif
-#define	NFS_WSIZE	8192		/* Def. write data size <= 8192 */
-#define	NFS_RSIZE	8192		/* Def. read data size <= 8192 */
-#define	NFS_READDIRSIZE	8192		/* Def. readdir size */
-#define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
-#define	NFS_MAXRAHEAD	16		/* Max. read ahead # blocks */
-#define	NFS_MAXASYNCDAEMON 	64	/* Max. number async_daemons runnable */
-#define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#ifndef	NFSRV_LEASE
-#define	NFSRV_LEASE		120	/* Lease time in seconds for V4 */
-#endif					/* assigned to nfsrv_lease */
-#ifndef NFSRV_STALELEASE
-#define	NFSRV_STALELEASE	(5 * nfsrv_lease)
-#endif
-#ifndef NFSRV_MOULDYLEASE
-#define	NFSRV_MOULDYLEASE	604800	/* One week (in sec) */
-#endif
-#ifndef NFSCLIENTHASHSIZE
-#define	NFSCLIENTHASHSIZE	20	/* Size of server client hash table */
-#endif
-#ifndef NFSLOCKHASHSIZE
-#define	NFSLOCKHASHSIZE		20	/* Size of server nfslock hash table */
-#endif
-#ifndef NFSSESSIONHASHSIZE
-#define	NFSSESSIONHASHSIZE	20	/* Size of server session hash table */
-#endif
-#define	NFSSTATEHASHSIZE	10	/* Size of server stateid hash table */
-#ifndef NFSUSERHASHSIZE
-#define	NFSUSERHASHSIZE		30	/* Size of user id hash table */
-#endif
-#ifndef NFSGROUPHASHSIZE
-#define	NFSGROUPHASHSIZE	5	/* Size of group id hash table */
-#endif
-#ifndef	NFSCLDELEGHIGHWATER
-#define	NFSCLDELEGHIGHWATER	10000	/* limit for client delegations */
-#endif
-#ifndef	NFSCLLAYOUTHIGHWATER
-#define	NFSCLLAYOUTHIGHWATER	10000	/* limit for client pNFS layouts */
-#endif
-#ifndef NFSNOOPEN			/* Inactive open owner (sec) */
-#define	NFSNOOPEN		120
-#endif
-#define	NFSRV_LEASEDELTA	15	/* # of seconds to delay beyond lease */
-#define	NFS_IDMAXSIZE		4	/* max sizeof (in_addr_t) */
-#ifndef NFSRVCACHE_UDPTIMEOUT
-#define	NFSRVCACHE_UDPTIMEOUT	30	/* # of sec to hold cached rpcs(udp) */
-#endif
-#ifndef NFSRVCACHE_UDPHIGHWATER
-#define	NFSRVCACHE_UDPHIGHWATER	500	/* Max # of udp cache entries */
-#endif
-#ifndef NFSRVCACHE_TCPTIMEOUT
-#define	NFSRVCACHE_TCPTIMEOUT	(3600*12) /*#of sec to hold cached rpcs(tcp) */
-#endif
-#ifndef	NFSRVCACHE_FLOODLEVEL
-#define	NFSRVCACHE_FLOODLEVEL	16384	/* Very high water mark for cache */
-#endif
-#ifndef	NFSRV_CLIENTHIGHWATER
-#define	NFSRV_CLIENTHIGHWATER	1000
-#endif
-#ifndef	NFSRV_MAXDUMPLIST
-#define	NFSRV_MAXDUMPLIST	10000
-#endif
-#ifndef NFS_ACCESSCACHESIZE
-#define	NFS_ACCESSCACHESIZE	8
-#endif
-#define	NFSV4_CBPORT	7745		/* Callback port for testing */
-
-/*
- * This macro defines the high water mark for issuing V4 delegations.
- * (It is currently set at a conservative 20% of nfsrv_v4statelimit. This
- *  may want to increase when clients can make more effective use of
- *  delegations.)
- */
-#define	NFSRV_V4DELEGLIMIT(c) (((c) * 5) > nfsrv_v4statelimit)
-
-#define	NFS_READDIRBLKSIZ	DIRBLKSIZ	/* Minimal nm_readdirsize */
-
-/*
- * Oddballs
- */
-#define	NFS_CMPFH(n, f, s) 						\
-    ((n)->n_fhp->nfh_len == (s) && !NFSBCMP((n)->n_fhp->nfh_fh, (caddr_t)(f), (s)))
-#define	NFSRV_CMPFH(nf, ns, f, s) 					\
-	((ns) == (s) && !NFSBCMP((caddr_t)(nf), (caddr_t)(f), (s)))
-#define	NFS_CMPTIME(t1, t2) 						\
-	((t1).tv_sec == (t2).tv_sec && (t1).tv_nsec == (t2).tv_nsec)
-#define	NFS_SETTIME(t) do { 						\
-	(t).tv_sec = time.tv_sec; (t).tv_nsec = 1000 * time.tv_usec; } while (0)
-#define	NFS_SRVMAXDATA(n) 						\
-		(((n)->nd_flag & (ND_NFSV3 | ND_NFSV4)) ? 		\
-		 NFS_SRVMAXIO : NFS_V2MAXDATA)
-#define	NFS64BITSSET	0xffffffffffffffffull
-#define	NFS64BITSMINUS1	0xfffffffffffffffeull
-
-/*
- * Structures for the nfssvc(2) syscall. Not that anyone but nfsd, mount_nfs
- * and nfsloaduser should ever try and use it.
- */
-struct nfsd_addsock_args {
-	int	sock;		/* Socket to serve */
-	caddr_t	name;		/* Client addr for connection based sockets */
-	int	namelen;	/* Length of name */
-};
-
-/*
- * nfsd argument for new krpc.
- */
-struct nfsd_nfsd_args {
-	const char *principal;	/* GSS-API service principal name */
-	int	minthreads;	/* minimum service thread count */
-	int	maxthreads;	/* maximum service thread count */
-};
-
-/*
- * Arguments for use by the callback daemon.
- */
-struct nfsd_nfscbd_args {
-	const char *principal;	/* GSS-API service principal name */
-};
-
-struct nfscbd_args {
-	int	sock;		/* Socket to serve */
-	caddr_t	name;		/* Client addr for connection based sockets */
-	int	namelen;	/* Length of name */
-	u_short	port;		/* Port# for callbacks */
-};
-
-struct nfsd_idargs {
-	int		nid_flag;	/* Flags (see below) */
-	uid_t		nid_uid;	/* user/group id */
-	gid_t		nid_gid;
-	int		nid_usermax;	/* Upper bound on user name cache */
-	int		nid_usertimeout;/* User name timeout (minutes) */
-	u_char		*nid_name;	/* Name */
-	int		nid_namelen;	/* and its length */
-};
-
-struct nfsd_clid {
-	int		nclid_idlen;	/* Length of client id */
-	u_char		nclid_id[NFSV4_OPAQUELIMIT]; /* and name */
-};
-
-struct nfsd_dumplist {
-	int		ndl_size;	/* Number of elements */
-	void		*ndl_list;	/* and the list of elements */
-};
-
-struct nfsd_dumpclients {
-	uint32_t	ndcl_flags;		/* LCL_xxx flags */
-	uint32_t	ndcl_nopenowners;	/* Number of openowners */
-	uint32_t	ndcl_nopens;		/* and opens */
-	uint32_t	ndcl_nlockowners;	/* and of lockowners */
-	uint32_t	ndcl_nlocks;		/* and of locks */
-	uint32_t	ndcl_ndelegs;		/* and of delegations */
-	uint32_t	ndcl_nolddelegs;	/* and old delegations */
-	sa_family_t	ndcl_addrfam;		/* Callback address */
-	union {
-		struct in_addr sin_addr;
-		struct in6_addr sin6_addr;
-	} ndcl_cbaddr;
-	struct nfsd_clid ndcl_clid;	/* and client id */
-};
-
-struct nfsd_dumplocklist {
-	char		*ndllck_fname;	/* File Name */
-	int		ndllck_size;	/* Number of elements */
-	void		*ndllck_list;	/* and the list of elements */
-};
-
-struct nfsd_dumplocks {
-	uint32_t	ndlck_flags;		/* state flags NFSLCK_xxx */
-	nfsv4stateid_t	ndlck_stateid;		/* stateid */
-	u_int64_t	ndlck_first;		/* lock byte range */
-	u_int64_t	ndlck_end;
-	struct nfsd_clid ndlck_owner;		/* Owner of open/lock */
-	sa_family_t	ndlck_addrfam;		/* Callback address */
-	union {
-		struct in_addr sin_addr;
-		struct in6_addr sin6_addr;
-	} ndlck_cbaddr;
-	struct nfsd_clid ndlck_clid;	/* and client id */
-};
-
-/*
- * Structure for referral information.
- */
-struct nfsreferral {
-	u_char		*nfr_srvlist;	/* List of servers */
-	int		nfr_srvcnt;	/* number of servers */
-	vnode_t		nfr_vp;	/* vnode for referral */
-	uint32_t	nfr_dfileno;	/* assigned dir inode# */
-};
-
-/*
- * Flags for lc_flags and opsflags for nfsrv_getclient().
- */
-#define	LCL_NEEDSCONFIRM	0x00000001
-#define	LCL_DONTCLEAN		0x00000002
-#define	LCL_WAKEUPWANTED	0x00000004
-#define	LCL_TCPCALLBACK		0x00000008
-#define	LCL_CALLBACKSON		0x00000010
-#define	LCL_INDEXNOTOK		0x00000020
-#define	LCL_STAMPEDSTABLE	0x00000040
-#define	LCL_EXPIREIT		0x00000080
-#define	LCL_CBDOWN		0x00000100
-#define	LCL_KERBV		0x00000400
-#define	LCL_NAME		0x00000800
-#define	LCL_NEEDSCBNULL		0x00001000
-#define	LCL_GSSINTEGRITY	0x00002000
-#define	LCL_GSSPRIVACY		0x00004000
-#define	LCL_ADMINREVOKED	0x00008000
-#define	LCL_RECLAIMCOMPLETE	0x00010000
-#define	LCL_NFSV41		0x00020000
-
-#define	LCL_GSS		LCL_KERBV	/* Or of all mechs */
-
-/*
- * Bits for flags in nfslock and nfsstate.
- * The access, deny, NFSLCK_READ and NFSLCK_WRITE bits must be defined as
- * below, in the correct order, so the shifts work for tests.
- */
-#define	NFSLCK_READACCESS	0x00000001
-#define	NFSLCK_WRITEACCESS	0x00000002
-#define	NFSLCK_ACCESSBITS	(NFSLCK_READACCESS | NFSLCK_WRITEACCESS)
-#define	NFSLCK_SHIFT		2
-#define	NFSLCK_READDENY		0x00000004
-#define	NFSLCK_WRITEDENY	0x00000008
-#define	NFSLCK_DENYBITS		(NFSLCK_READDENY | NFSLCK_WRITEDENY)
-#define	NFSLCK_SHAREBITS 						\
-    (NFSLCK_READACCESS|NFSLCK_WRITEACCESS|NFSLCK_READDENY|NFSLCK_WRITEDENY)
-#define	NFSLCK_LOCKSHIFT	4
-#define	NFSLCK_READ		0x00000010
-#define	NFSLCK_WRITE		0x00000020
-#define	NFSLCK_BLOCKING		0x00000040
-#define	NFSLCK_RECLAIM		0x00000080
-#define	NFSLCK_OPENTOLOCK	0x00000100
-#define	NFSLCK_TEST		0x00000200
-#define	NFSLCK_LOCK		0x00000400
-#define	NFSLCK_UNLOCK		0x00000800
-#define	NFSLCK_OPEN		0x00001000
-#define	NFSLCK_CLOSE		0x00002000
-#define	NFSLCK_CHECK		0x00004000
-#define	NFSLCK_RELEASE		0x00008000
-#define	NFSLCK_NEEDSCONFIRM	0x00010000
-#define	NFSLCK_CONFIRM		0x00020000
-#define	NFSLCK_DOWNGRADE	0x00040000
-#define	NFSLCK_DELEGREAD	0x00080000
-#define	NFSLCK_DELEGWRITE	0x00100000
-#define	NFSLCK_DELEGCUR		0x00200000
-#define	NFSLCK_DELEGPREV	0x00400000
-#define	NFSLCK_OLDDELEG		0x00800000
-#define	NFSLCK_DELEGRECALL	0x01000000
-#define	NFSLCK_SETATTR		0x02000000
-#define	NFSLCK_DELEGPURGE	0x04000000
-#define	NFSLCK_DELEGRETURN	0x08000000
-#define	NFSLCK_WANTWDELEG	0x10000000
-#define	NFSLCK_WANTRDELEG	0x20000000
-#define	NFSLCK_WANTNODELEG	0x40000000
-#define	NFSLCK_WANTBITS							\
-    (NFSLCK_WANTWDELEG | NFSLCK_WANTRDELEG | NFSLCK_WANTNODELEG)
-
-/* And bits for nid_flag */
-#define	NFSID_INITIALIZE	0x0001
-#define	NFSID_ADDUID		0x0002
-#define	NFSID_DELUID		0x0004
-#define	NFSID_ADDUSERNAME	0x0008
-#define	NFSID_DELUSERNAME	0x0010
-#define	NFSID_ADDGID		0x0020
-#define	NFSID_DELGID		0x0040
-#define	NFSID_ADDGROUPNAME	0x0080
-#define	NFSID_DELGROUPNAME	0x0100
-
-/*
- * fs.nfs sysctl(3) identifiers
- */
-#define	NFS_NFSSTATS	1		/* struct: struct nfsstats */
-
-/*
- * Here is the definition of the attribute bits array and macros that
- * manipulate it.
- * THE MACROS MUST BE MANUALLY MODIFIED IF NFSATTRBIT_MAXWORDS CHANGES!!
- * It is (NFSATTRBIT_MAX + 31) / 32.
- */
-#define	NFSATTRBIT_MAXWORDS	3
-
-typedef struct {
-	uint32_t bits[NFSATTRBIT_MAXWORDS];
-} nfsattrbit_t;
-
-#define	NFSZERO_ATTRBIT(b) do {						\
-	(b)->bits[0] = 0;						\
-	(b)->bits[1] = 0;						\
-	(b)->bits[2] = 0;						\
-} while (0)
-
-#define	NFSSET_ATTRBIT(t, f) do {					\
-	(t)->bits[0] = (f)->bits[0];			 		\
-	(t)->bits[1] = (f)->bits[1];					\
-	(t)->bits[2] = (f)->bits[2];					\
-} while (0)
-
-#define	NFSSETSUPP_ATTRBIT(b) do { 					\
-	(b)->bits[0] = NFSATTRBIT_SUPP0; 				\
-	(b)->bits[1] = (NFSATTRBIT_SUPP1 | NFSATTRBIT_SUPPSETONLY);	\
-	(b)->bits[2] = NFSATTRBIT_SUPP2;				\
-} while (0)
-
-#define	NFSISSET_ATTRBIT(b, p)	((b)->bits[(p) / 32] & (1 << ((p) % 32)))
-#define	NFSSETBIT_ATTRBIT(b, p)	((b)->bits[(p) / 32] |= (1 << ((p) % 32)))
-#define	NFSCLRBIT_ATTRBIT(b, p)	((b)->bits[(p) / 32] &= ~(1 << ((p) % 32)))
-
-#define	NFSCLRALL_ATTRBIT(b, a)	do { 					\
-	(b)->bits[0] &= ~((a)->bits[0]);	 			\
-	(b)->bits[1] &= ~((a)->bits[1]);	 			\
-	(b)->bits[2] &= ~((a)->bits[2]);				\
-} while (0)
-
-#define	NFSCLRNOT_ATTRBIT(b, a)	do { 					\
-	(b)->bits[0] &= ((a)->bits[0]);		 			\
-	(b)->bits[1] &= ((a)->bits[1]);		 			\
-	(b)->bits[2] &= ((a)->bits[2]);		 			\
-} while (0)
-
-#define	NFSCLRNOTFILLABLE_ATTRBIT(b) do { 				\
-	(b)->bits[0] &= NFSATTRBIT_SUPP0;	 			\
-	(b)->bits[1] &= NFSATTRBIT_SUPP1;				\
-	(b)->bits[2] &= NFSATTRBIT_SUPP2;				\
-} while (0)
-
-#define	NFSCLRNOTSETABLE_ATTRBIT(b) do { 				\
-	(b)->bits[0] &= NFSATTRBIT_SETABLE0;	 			\
-	(b)->bits[1] &= NFSATTRBIT_SETABLE1;				\
-	(b)->bits[2] &= NFSATTRBIT_SETABLE2;				\
-} while (0)
-
-#define	NFSNONZERO_ATTRBIT(b)	((b)->bits[0] || (b)->bits[1] || (b)->bits[2])
-#define	NFSEQUAL_ATTRBIT(b, p)	((b)->bits[0] == (p)->bits[0] &&	\
-	(b)->bits[1] == (p)->bits[1] && (b)->bits[2] == (p)->bits[2])
-
-#define	NFSGETATTR_ATTRBIT(b) do { 					\
-	(b)->bits[0] = NFSATTRBIT_GETATTR0;	 			\
-	(b)->bits[1] = NFSATTRBIT_GETATTR1;				\
-	(b)->bits[2] = NFSATTRBIT_GETATTR2;				\
-} while (0)
-
-#define	NFSWCCATTR_ATTRBIT(b) do { 					\
-	(b)->bits[0] = NFSATTRBIT_WCCATTR0;	 			\
-	(b)->bits[1] = NFSATTRBIT_WCCATTR1;				\
-	(b)->bits[2] = NFSATTRBIT_WCCATTR2;				\
-} while (0)
-
-#define	NFSWRITEGETATTR_ATTRBIT(b) do { 				\
-	(b)->bits[0] = NFSATTRBIT_WRITEGETATTR0;			\
-	(b)->bits[1] = NFSATTRBIT_WRITEGETATTR1;			\
-	(b)->bits[2] = NFSATTRBIT_WRITEGETATTR2;			\
-} while (0)
-
-#define	NFSCBGETATTR_ATTRBIT(b, c) do { 				\
-	(c)->bits[0] = ((b)->bits[0] & NFSATTRBIT_CBGETATTR0);		\
-	(c)->bits[1] = ((b)->bits[1] & NFSATTRBIT_CBGETATTR1);		\
-	(c)->bits[2] = ((b)->bits[2] & NFSATTRBIT_CBGETATTR2);		\
-} while (0)
-
-#define	NFSPATHCONF_GETATTRBIT(b) do { 					\
-	(b)->bits[0] = NFSGETATTRBIT_PATHCONF0;		 		\
-	(b)->bits[1] = NFSGETATTRBIT_PATHCONF1;				\
-	(b)->bits[2] = NFSGETATTRBIT_PATHCONF2;				\
-} while (0)
-
-#define	NFSSTATFS_GETATTRBIT(b)	do { 					\
-	(b)->bits[0] = NFSGETATTRBIT_STATFS0;	 			\
-	(b)->bits[1] = NFSGETATTRBIT_STATFS1;				\
-	(b)->bits[2] = NFSGETATTRBIT_STATFS2;				\
-} while (0)
-
-#define	NFSISSETSTATFS_ATTRBIT(b) 					\
-		(((b)->bits[0] & NFSATTRBIT_STATFS0) || 		\
-		 ((b)->bits[1] & NFSATTRBIT_STATFS1) ||			\
-		 ((b)->bits[2] & NFSATTRBIT_STATFS2))
-
-#define	NFSCLRSTATFS_ATTRBIT(b)	do { 					\
-	(b)->bits[0] &= ~NFSATTRBIT_STATFS0;	 			\
-	(b)->bits[1] &= ~NFSATTRBIT_STATFS1;				\
-	(b)->bits[2] &= ~NFSATTRBIT_STATFS2;				\
-} while (0)
-
-#define	NFSREADDIRPLUS_ATTRBIT(b) do { 					\
-	(b)->bits[0] = NFSATTRBIT_READDIRPLUS0;		 		\
-	(b)->bits[1] = NFSATTRBIT_READDIRPLUS1;				\
-	(b)->bits[2] = NFSATTRBIT_READDIRPLUS2;				\
-} while (0)
-
-#define	NFSREFERRAL_ATTRBIT(b) do { 					\
-	(b)->bits[0] = NFSATTRBIT_REFERRAL0;		 		\
-	(b)->bits[1] = NFSATTRBIT_REFERRAL1;				\
-	(b)->bits[2] = NFSATTRBIT_REFERRAL2;				\
-} while (0)
-
-/*
- * Store uid, gid creds that were used when the stateid was acquired.
- * The RPC layer allows NFS_MAXGRPS + 1 groups to go out on the wire,
- * so that's how many gets stored here.
- */
-struct nfscred {
-	uid_t 		nfsc_uid;
-	gid_t		nfsc_groups[NFS_MAXGRPS + 1];
-	int		nfsc_ngroups;
-};
-
-/*
- * Constants that define the file handle for the V4 root directory.
- * (The FSID must never be used by other file systems that are exported.)
- */
-#define	NFSV4ROOT_FSID0		((int32_t) -1)
-#define	NFSV4ROOT_FSID1		((int32_t) -1)
-#define	NFSV4ROOT_REFERRAL	((int32_t) -2)
-#define	NFSV4ROOT_INO		2	/* It's traditional */
-#define	NFSV4ROOT_GEN		1
-
-/*
- * The set of signals the interrupt an I/O in progress for NFSMNT_INT mounts.
- * What should be in this set is open to debate, but I believe that since
- * I/O system calls on ufs are never interrupted by signals the set should
- * be minimal. My reasoning is that many current programs that use signals
- * such as SIGALRM will not expect file I/O system calls to be interrupted
- * by them and break.
- */
-#if defined(_KERNEL) || defined(KERNEL)
-
-struct uio; struct buf; struct vattr; struct nameidata;	/* XXX */
-
-/*
- * Socket errors ignored for connectionless sockets?
- * For now, ignore them all
- */
-#define	NFSIGNORE_SOERROR(s, e) 					\
-		((e) != EINTR && (e) != ERESTART && (e) != EWOULDBLOCK && \
-		((s) & PR_CONNREQUIRED) == 0)
-
-
-/*
- * This structure holds socket information for a connection. Used by the
- * client and the server for callbacks.
- */
-struct nfssockreq {
-	NFSSOCKADDR_T	nr_nam;
-	int		nr_sotype;
-	int		nr_soproto;
-	int		nr_soflags;
-	struct ucred	*nr_cred;
-	int		nr_lock;
-	NFSMUTEX_T	nr_mtx;
-	uint32_t	nr_prog;
-	uint32_t	nr_vers;
-	struct __rpc_client *nr_client;
-	AUTH		*nr_auth;
-};
-
-/*
- * And associated nr_lock bits.
- */
-#define	NFSR_SNDLOCK		0x01
-#define	NFSR_WANTSND		0x02
-#define	NFSR_RCVLOCK		0x04
-#define	NFSR_WANTRCV		0x08
-#define	NFSR_RESERVEDPORT	0x10
-#define	NFSR_LOCALHOST		0x20
-
-/*
- * Queue head for nfsreq's
- */
-TAILQ_HEAD(nfsreqhead, nfsreq);
-
-/* This is the only nfsreq R_xxx flag still used. */
-#define	R_DONTRECOVER	0x00000100	/* don't initiate recovery when this
-					   rpc gets a stale state reply */
-
-/*
- * Network address hash list element
- */
-union nethostaddr {
-	struct in_addr	had_inet;
-	struct in6_addr had_inet6;
-};
-
-/*
- * Structure of list of mechanisms.
- */
-struct nfsgss_mechlist {
-	int	len;
-	const u_char	*str;
-	int	totlen;
-};
-#define	KERBV_MECH	0	/* position in list */
-
-/*
- * This structure is used by the server for describing each request.
- */
-struct nfsrv_descript {
-	mbuf_t			nd_mrep;	/* Request mbuf list */
-	mbuf_t			nd_md;		/* Current dissect mbuf */
-	mbuf_t			nd_mreq;	/* Reply mbuf list */
-	mbuf_t			nd_mb;		/* Current build mbuf */
-	NFSSOCKADDR_T		nd_nam;		/* and socket addr */
-	NFSSOCKADDR_T		nd_nam2;	/* return socket addr */
-	caddr_t			nd_dpos;	/* Current dissect pos */
-	caddr_t			nd_bpos;	/* Current build pos */
-	u_int16_t		nd_procnum;	/* RPC # */
-	uint32_t		nd_flag;	/* nd_flag */
-	uint32_t		nd_repstat;	/* Reply status */
-	int			*nd_errp;	/* Pointer to ret status */
-	uint32_t		nd_retxid;	/* Reply xid */
-	struct nfsrvcache	*nd_rp;		/* Assoc. cache entry */
-	fhandle_t		nd_fh;		/* File handle */
-	struct ucred		*nd_cred;	/* Credentials */
-	uid_t			nd_saveduid;	/* Saved uid */
-	u_int64_t		nd_sockref;	/* Rcv socket ref# */
-	u_int64_t		nd_compref;	/* Compound RPC ref# */
-	time_t			nd_tcpconntime;	/* Time TCP connection est. */
-	nfsquad_t		nd_clientid;	/* Implied clientid */
-	int			nd_gssnamelen;	/* principal name length */
-	char			*nd_gssname;	/* principal name */
-	uint32_t		*nd_slotseq;	/* ptr to slot seq# in req */
-	uint8_t			nd_sessionid[NFSX_V4SESSIONID];	/* Session id */
-	uint32_t		nd_slotid;	/* Slotid for this RPC */
-	SVCXPRT			*nd_xprt;	/* Server RPC handle */
-};
-
-#define	nd_princlen	nd_gssnamelen
-#define	nd_principal	nd_gssname
-
-/* Bits for "nd_flag" */
-#define	ND_DONTSAVEREPLY 	0x00000001
-#define	ND_SAVEREPLY		0x00000002
-#define	ND_NFSV2		0x00000004
-#define	ND_NFSV3		0x00000008
-#define	ND_NFSV4		0x00000010
-#define	ND_KERBV		0x00000020
-#define	ND_GSSINTEGRITY		0x00000040
-#define	ND_GSSPRIVACY		0x00000080
-#define	ND_WINDOWVERF		0x00000100
-#define	ND_GSSINITREPLY		0x00000200
-#define	ND_STREAMSOCK		0x00000400
-#define	ND_PUBLOOKUP		0x00000800
-#define	ND_USEGSSNAME		0x00001000
-#define	ND_SAMETCPCONN		0x00002000
-#define	ND_IMPLIEDCLID		0x00004000
-#define	ND_NOMOREDATA		0x00008000
-#define	ND_V4WCCATTR		0x00010000
-#define	ND_NFSCB		0x00020000
-#define	ND_AUTHNONE		0x00040000
-#define	ND_EXAUTHSYS		0x00080000
-#define	ND_EXGSS		0x00100000
-#define	ND_EXGSSINTEGRITY	0x00200000
-#define	ND_EXGSSPRIVACY		0x00400000
-#define	ND_INCRSEQID		0x00800000
-#define	ND_NFSCL		0x01000000
-#define	ND_NFSV41		0x02000000
-#define	ND_HASSEQUENCE		0x04000000
-#define	ND_CACHETHIS		0x08000000
-#define	ND_LASTOP		0x10000000
-
-/*
- * ND_GSS should be the "or" of all GSS type authentications.
- */
-#define	ND_GSS		(ND_KERBV)
-
-struct nfsv4_opflag {
-	int	retfh;
-	int	needscfh;
-	int	savereply;
-	int	modifyfs;
-	int	lktype;
-	int	needsseq;
-};
-
-/*
- * Flags used to indicate what to do w.r.t. seqid checking.
- */
-#define	NFSRVSEQID_FIRST	0x01
-#define	NFSRVSEQID_LAST		0x02
-#define	NFSRVSEQID_OPEN		0x04
-
-/*
- * assign a doubly linked list to a new head
- * and prepend one list into another.
- */
-#define	LIST_NEWHEAD(nhead, ohead, field) do { 				\
-	if (((nhead)->lh_first = (ohead)->lh_first) != NULL) 		\
-		(ohead)->lh_first->field.le_prev = &(nhead)->lh_first; 	\
-	(ohead)->lh_first = NULL; 					\
-    } while (0)
-
-#define	LIST_PREPEND(head, phead, lelm, field) do {			\
-	if ((head)->lh_first != NULL) {					\
-		(lelm)->field.le_next = (head)->lh_first;		\
-		(lelm)->field.le_next->field.le_prev =			\
-		    &(lelm)->field.le_next;				\
-	}								\
-	(head)->lh_first = (phead)->lh_first;				\
-	(head)->lh_first->field.le_prev = &(head)->lh_first;		\
-    } while (0)
-
-/*
- * File handle structure for client. Malloc'd to the correct length with
- * malloc type M_NFSFH.
- */
-struct nfsfh {
-	u_int16_t	nfh_len;	/* Length of file handle */
-	u_int8_t	nfh_fh[1];	/* and the file handle */
-};
-
-/*
- * File handle structure for server. The NFSRV_MAXFH constant is
- * set in nfsdport.h. I use a 32bit length, so that alignment is
- * preserved.
- */
-struct nfsrvfh {
-	uint32_t	nfsrvfh_len;
-	u_int8_t	nfsrvfh_data[NFSRV_MAXFH];
-};
-
-/*
- * This structure is used for sleep locks on the NFSv4 nfsd threads and
- * NFSv4 client data structures.
- */
-struct nfsv4lock {
-	uint32_t	nfslock_usecnt;
-	u_int8_t	nfslock_lock;
-};
-#define	NFSV4LOCK_LOCK		0x01
-#define	NFSV4LOCK_LOCKWANTED	0x02
-#define	NFSV4LOCK_WANTED	0x04
-
-/*
- * Values for the override argument for nfsvno_accchk().
- */
-#define	NFSACCCHK_NOOVERRIDE		0
-#define	NFSACCCHK_ALLOWROOT		1
-#define	NFSACCCHK_ALLOWOWNER		2
-
-/*
- * and values for the vpislocked argument for nfsvno_accchk().
- */
-#define	NFSACCCHK_VPNOTLOCKED		0
-#define	NFSACCCHK_VPISLOCKED		1
-
-/*
- * Slot for the NFSv4.1 Sequence Op.
- */
-struct nfsslot {
-	int		nfssl_inprog;
-	uint32_t	nfssl_seq;
-	struct mbuf	*nfssl_reply;
-};
-
-#endif	/* _KERNEL */
-
-#endif	/* _NFS_NFS_H */
diff --git a/include.new/fs/nfs/nfs_var.h b/include.new/fs/nfs/nfs_var.h
deleted file mode 100644
index 6efbf03..0000000
--- a/include.new/fs/nfs/nfs_var.h
+++ /dev/null
@@ -1,685 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/fs/nfs/nfs_var.h 269398 2014-08-01 21:10:41Z rmacklem $
- */
-
-/*
- * XXX needs <nfs/rpcv2.h> and <nfs/nfs.h> because of typedefs
- */
-
-struct uio;
-struct ucred;
-struct nfscred;
-NFSPROC_T;
-struct buf;
-struct sockaddr_in;
-struct nfs_dlmount;
-struct file;
-struct nfsmount;
-struct socket;
-struct nfsreq;
-struct nfssockreq;
-struct vattr;
-struct nameidata;
-struct nfsnode;
-struct nfsfh;
-struct sillyrename;
-struct componentname;
-struct nfsd_srvargs;
-struct nfsrv_descript;
-struct nfs_fattr;
-union nethostaddr;
-struct nfsstate;
-struct nfslock;
-struct nfsclient;
-struct nfsdsession;
-struct nfslockconflict;
-struct nfsd_idargs;
-struct nfsd_clid;
-struct nfsusrgrp;
-struct nfsclowner;
-struct nfsclopen;
-struct nfsclopenhead;
-struct nfsclclient;
-struct nfsclsession;
-struct nfscllockowner;
-struct nfscllock;
-struct nfscldeleg;
-struct nfscllayout;
-struct nfscldevinfo;
-struct nfsv4lock;
-struct nfsvattr;
-struct nfs_vattr;
-struct NFSSVCARGS;
-#ifdef __FreeBSD__
-NFS_ACCESS_ARGS;
-NFS_OPEN_ARGS;
-NFS_GETATTR_ARGS;
-NFS_LOOKUP_ARGS;
-NFS_READDIR_ARGS;
-#endif
-
-/* nfs_nfsdstate.c */
-int nfsrv_setclient(struct nfsrv_descript *, struct nfsclient **,
-    nfsquad_t *, nfsquad_t *, NFSPROC_T *);
-int nfsrv_getclient(nfsquad_t, int, struct nfsclient **, struct nfsdsession *,
-    nfsquad_t, uint32_t, struct nfsrv_descript *, NFSPROC_T *);
-int nfsrv_destroyclient(nfsquad_t, NFSPROC_T *);
-int nfsrv_destroysession(struct nfsrv_descript *, uint8_t *);
-int nfsrv_freestateid(struct nfsrv_descript *, nfsv4stateid_t *, NFSPROC_T *);
-int nfsrv_adminrevoke(struct nfsd_clid *, NFSPROC_T *);
-void nfsrv_dumpclients(struct nfsd_dumpclients *, int);
-void nfsrv_dumplocks(vnode_t, struct nfsd_dumplocks *, int, NFSPROC_T *);
-int nfsrv_lockctrl(vnode_t, struct nfsstate **,
-    struct nfslock **, struct nfslockconflict *, nfsquad_t, nfsv4stateid_t *,
-    struct nfsexstuff *, struct nfsrv_descript *, NFSPROC_T *);
-int nfsrv_openctrl(struct nfsrv_descript *, vnode_t,
-    struct nfsstate **, nfsquad_t, nfsv4stateid_t *, nfsv4stateid_t *, 
-    uint32_t *, struct nfsexstuff *, NFSPROC_T *, u_quad_t);
-int nfsrv_opencheck(nfsquad_t, nfsv4stateid_t *, struct nfsstate *,
-    vnode_t, struct nfsrv_descript *, NFSPROC_T *, int);
-int nfsrv_openupdate(vnode_t, struct nfsstate *, nfsquad_t,
-    nfsv4stateid_t *, struct nfsrv_descript *, NFSPROC_T *);
-int nfsrv_delegupdate(struct nfsrv_descript *, nfsquad_t, nfsv4stateid_t *,
-    vnode_t, int, struct ucred *, NFSPROC_T *);
-int nfsrv_releaselckown(struct nfsstate *, nfsquad_t, NFSPROC_T *);
-void nfsrv_zapclient(struct nfsclient *, NFSPROC_T *);
-int nfssvc_idname(struct nfsd_idargs *);
-void nfsrv_servertimer(void);
-int nfsrv_getclientipaddr(struct nfsrv_descript *, struct nfsclient *);
-void nfsrv_setupstable(NFSPROC_T *);
-void nfsrv_updatestable(NFSPROC_T *);
-void nfsrv_writestable(u_char *, int, int, NFSPROC_T *);
-void nfsrv_throwawayopens(NFSPROC_T *);
-int nfsrv_checkremove(vnode_t, int, NFSPROC_T *);
-void nfsd_recalldelegation(vnode_t, NFSPROC_T *);
-void nfsd_disabledelegation(vnode_t, NFSPROC_T *);
-int nfsrv_checksetattr(vnode_t, struct nfsrv_descript *,
-    nfsv4stateid_t *, struct nfsvattr *, nfsattrbit_t *, struct nfsexstuff *,
-    NFSPROC_T *);
-int nfsrv_checkgetattr(struct nfsrv_descript *, vnode_t,
-    struct nfsvattr *, nfsattrbit_t *, struct ucred *, NFSPROC_T *);
-int nfsrv_nfsuserdport(u_short, NFSPROC_T *);
-void nfsrv_nfsuserddelport(void);
-void nfsrv_throwawayallstate(NFSPROC_T *);
-int nfsrv_checksequence(struct nfsrv_descript *, uint32_t, uint32_t *,
-    uint32_t *, int, uint32_t *, NFSPROC_T *);
-int nfsrv_checkreclaimcomplete(struct nfsrv_descript *);
-void nfsrv_cache_session(uint8_t *, uint32_t, int, struct mbuf **);
-
-/* nfs_nfsdserv.c */
-int nfsrvd_access(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_getattr(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_setattr(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_lookup(struct nfsrv_descript *, int,
-    vnode_t, vnode_t *, fhandle_t *, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsrvd_readlink(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_read(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_write(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_create(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_mknod(struct nfsrv_descript *, int,
-    vnode_t, vnode_t *, fhandle_t *, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsrvd_remove(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_rename(struct nfsrv_descript *, int,
-    vnode_t, vnode_t, NFSPROC_T *, struct nfsexstuff *,
-    struct nfsexstuff *);
-int nfsrvd_link(struct nfsrv_descript *, int,
-    vnode_t, vnode_t, NFSPROC_T *, struct nfsexstuff *,
-    struct nfsexstuff *);
-int nfsrvd_symlink(struct nfsrv_descript *, int,
-    vnode_t, vnode_t *, fhandle_t *, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsrvd_mkdir(struct nfsrv_descript *, int,
-    vnode_t, vnode_t *, fhandle_t *, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsrvd_readdir(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_readdirplus(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_commit(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_statfs(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_fsinfo(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_close(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_delegpurge(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_delegreturn(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_getfh(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_lock(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_lockt(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_locku(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_openconfirm(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_opendowngrade(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_renew(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_secinfo(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_setclientid(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_setclientidcfrm(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_verify(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_open(struct nfsrv_descript *, int,
-    vnode_t, vnode_t *, fhandle_t *, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsrvd_openattr(struct nfsrv_descript *, int,
-    vnode_t, vnode_t *, fhandle_t *, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsrvd_releaselckown(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_pathconf(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_exchangeid(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_createsession(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_sequence(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_reclaimcomplete(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_destroyclientid(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_destroysession(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_freestateid(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-int nfsrvd_notsupp(struct nfsrv_descript *, int,
-    vnode_t, NFSPROC_T *, struct nfsexstuff *);
-
-/* nfs_nfsdsocket.c */
-void nfsrvd_rephead(struct nfsrv_descript *);
-void nfsrvd_dorpc(struct nfsrv_descript *, int, u_char *, int, uint32_t,
-    NFSPROC_T *);
-
-/* nfs_nfsdcache.c */
-void nfsrvd_initcache(void);
-int nfsrvd_getcache(struct nfsrv_descript *);
-struct nfsrvcache *nfsrvd_updatecache(struct nfsrv_descript *);
-void nfsrvd_sentcache(struct nfsrvcache *, int, uint32_t);
-void nfsrvd_cleancache(void);
-void nfsrvd_refcache(struct nfsrvcache *);
-void nfsrvd_derefcache(struct nfsrvcache *);
-void nfsrvd_delcache(struct nfsrvcache *);
-void nfsrc_trimcache(uint64_t, uint32_t, int);
-
-/* nfs_commonsubs.c */
-void newnfs_init(void);
-int nfsaddr_match(int, union nethostaddr *, NFSSOCKADDR_T);
-int nfsaddr2_match(NFSSOCKADDR_T, NFSSOCKADDR_T);
-int nfsm_strtom(struct nfsrv_descript *, const char *, int);
-int nfsm_mbufuio(struct nfsrv_descript *, struct uio *, int);
-int nfsm_fhtom(struct nfsrv_descript *, u_int8_t *, int, int);
-int nfsm_advance(struct nfsrv_descript *, int, int);
-void *nfsm_dissct(struct nfsrv_descript *, int, int);
-void newnfs_trimleading(struct nfsrv_descript *);
-void newnfs_trimtrailing(struct nfsrv_descript *, mbuf_t,
-    caddr_t);
-void newnfs_copycred(struct nfscred *, struct ucred *);
-void newnfs_copyincred(struct ucred *, struct nfscred *);
-int nfsrv_dissectacl(struct nfsrv_descript *, NFSACL_T *, int *,
-    int *, NFSPROC_T *);
-int nfsrv_getattrbits(struct nfsrv_descript *, nfsattrbit_t *, int *,
-    int *);
-int nfsv4_loadattr(struct nfsrv_descript *, vnode_t,
-    struct nfsvattr *, struct nfsfh **, fhandle_t *, int,
-    struct nfsv3_pathconf *, struct statfs *, struct nfsstatfs *,
-    struct nfsfsinfo *, NFSACL_T *,
-    int, int *, uint32_t *, uint32_t *, NFSPROC_T *, struct ucred *);
-int nfsv4_lock(struct nfsv4lock *, int, int *, void *, struct mount *);
-void nfsv4_unlock(struct nfsv4lock *, int);
-void nfsv4_relref(struct nfsv4lock *);
-void nfsv4_getref(struct nfsv4lock *, int *, void *, struct mount *);
-int nfsv4_getref_nonblock(struct nfsv4lock *);
-int nfsv4_testlock(struct nfsv4lock *);
-int nfsrv_mtostr(struct nfsrv_descript *, char *, int);
-int nfsrv_checkutf8(u_int8_t *, int);
-int newnfs_sndlock(int *);
-void newnfs_sndunlock(int *);
-int nfsv4_getipaddr(struct nfsrv_descript *, struct sockaddr_storage *,
-    int *);
-int nfsv4_seqsession(uint32_t, uint32_t, uint32_t, struct nfsslot *,
-    struct mbuf **, uint16_t);
-void nfsv4_seqsess_cacherep(uint32_t, struct nfsslot *, int, struct mbuf **);
-void nfsv4_setsequence(struct nfsmount *, struct nfsrv_descript *,
-    struct nfsclsession *, int);
-int nfsv4_sequencelookup(struct nfsmount *, struct nfsclsession *, int *,
-    int *, uint32_t *, uint8_t *);
-void nfsv4_freeslot(struct nfsclsession *, int);
-
-/* nfs_clcomsubs.c */
-void nfsm_uiombuf(struct nfsrv_descript *, struct uio *, int);
-void nfscl_reqstart(struct nfsrv_descript *, int, struct nfsmount *,
-    u_int8_t *, int, uint32_t **, struct nfsclsession *);
-nfsuint64 *nfscl_getcookie(struct nfsnode *, off_t off, int);
-void nfscl_fillsattr(struct nfsrv_descript *, struct vattr *,
-      vnode_t, int, uint32_t);
-u_int8_t *nfscl_getmyip(struct nfsmount *, int *);
-int nfsm_getfh(struct nfsrv_descript *, struct nfsfh **);
-int nfscl_mtofh(struct nfsrv_descript *, struct nfsfh **,
-        struct nfsvattr *, int *);
-int nfscl_postop_attr(struct nfsrv_descript *, struct nfsvattr *, int *,
-    void *);
-int nfscl_wcc_data(struct nfsrv_descript *, vnode_t,
-    struct nfsvattr *, int *, int *, void *);
-int nfsm_loadattr(struct nfsrv_descript *, struct nfsvattr *);
-int nfscl_request(struct nfsrv_descript *, vnode_t,
-         NFSPROC_T *, struct ucred *, void *);
-void nfsm_stateidtom(struct nfsrv_descript *, nfsv4stateid_t *, int);
-
-/* nfs_nfsdsubs.c */
-void nfsd_fhtovp(struct nfsrv_descript *, struct nfsrvfh *, int,
-    vnode_t *, struct nfsexstuff *,
-    mount_t *, int, NFSPROC_T *);
-int nfsd_excred(struct nfsrv_descript *, struct nfsexstuff *, struct ucred *);
-int nfsrv_mtofh(struct nfsrv_descript *, struct nfsrvfh *);
-int nfsrv_putattrbit(struct nfsrv_descript *, nfsattrbit_t *);
-void nfsrv_wcc(struct nfsrv_descript *, int, struct nfsvattr *, int,
-    struct nfsvattr *);
-int nfsv4_fillattr(struct nfsrv_descript *, struct mount *, vnode_t, NFSACL_T *,
-    struct vattr *, fhandle_t *, int, nfsattrbit_t *,
-    struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t);
-void nfsrv_fillattr(struct nfsrv_descript *, struct nfsvattr *);
-void nfsrv_adj(mbuf_t, int, int);
-void nfsrv_postopattr(struct nfsrv_descript *, int, struct nfsvattr *);
-int nfsd_errmap(struct nfsrv_descript *);
-void nfsv4_uidtostr(uid_t, u_char **, int *, NFSPROC_T *);
-int nfsv4_strtouid(struct nfsrv_descript *, u_char *, int, uid_t *,
-    NFSPROC_T *);
-void nfsv4_gidtostr(gid_t, u_char **, int *, NFSPROC_T *);
-int nfsv4_strtogid(struct nfsrv_descript *, u_char *, int, gid_t *,
-    NFSPROC_T *);
-int nfsrv_checkuidgid(struct nfsrv_descript *, struct nfsvattr *);
-void nfsrv_fixattr(struct nfsrv_descript *, vnode_t,
-    struct nfsvattr *, NFSACL_T *, NFSPROC_T *, nfsattrbit_t *,
-    struct nfsexstuff *);
-int nfsrv_errmoved(int);
-int nfsrv_putreferralattr(struct nfsrv_descript *, nfsattrbit_t *,
-    struct nfsreferral *, int, int *);
-int nfsrv_parsename(struct nfsrv_descript *, char *, u_long *,
-    NFSPATHLEN_T *);
-void nfsd_init(void);
-int nfsd_checkrootexp(struct nfsrv_descript *);
-void nfsd_getminorvers(struct nfsrv_descript *, u_char *, u_char **, int *,
-    uint32_t *);
-
-/* nfs_clvfsops.c */
-void nfscl_retopts(struct nfsmount *, char *, size_t);
-
-/* nfs_commonport.c */
-int nfsrv_lookupfilename(struct nameidata *, char *, NFSPROC_T *);
-void nfsrv_object_create(vnode_t, NFSPROC_T *);
-int nfsrv_mallocmget_limit(void);
-int nfsvno_v4rootexport(struct nfsrv_descript *);
-void newnfs_portinit(void);
-struct ucred *newnfs_getcred(void);
-void newnfs_setroot(struct ucred *);
-int nfs_catnap(int, int, const char *);
-struct nfsreferral *nfsv4root_getreferral(vnode_t, vnode_t, uint32_t);
-int nfsvno_pathconf(vnode_t, int, register_t *, struct ucred *,
-    NFSPROC_T *);
-int nfsrv_atroot(vnode_t, long *);
-void newnfs_timer(void *);
-int nfs_supportsnfsv4acls(vnode_t);
-
-/* nfs_commonacl.c */
-int nfsrv_dissectace(struct nfsrv_descript *, struct acl_entry *,
-    int *, int *, NFSPROC_T *);
-int nfsrv_buildacl(struct nfsrv_descript *, NFSACL_T *, enum vtype,
-    NFSPROC_T *);
-int nfsrv_setacl(vnode_t, NFSACL_T *, struct ucred *,
-    NFSPROC_T *);
-int nfsrv_compareacl(NFSACL_T *, NFSACL_T *);
-
-/* nfs_clrpcops.c */
-int nfsrpc_null(vnode_t, struct ucred *, NFSPROC_T *);
-int nfsrpc_access(vnode_t, int, struct ucred *, NFSPROC_T *,
-    struct nfsvattr *, int *);
-int nfsrpc_accessrpc(vnode_t, uint32_t, struct ucred *,
-    NFSPROC_T *, struct nfsvattr *, int *, uint32_t *, void *);
-int nfsrpc_open(vnode_t, int, struct ucred *, NFSPROC_T *);
-int nfsrpc_openrpc(struct nfsmount *, vnode_t, u_int8_t *, int, u_int8_t *, int,
-    uint32_t, struct nfsclopen *, u_int8_t *, int, struct nfscldeleg **, int,
-    uint32_t, struct ucred *, NFSPROC_T *, int, int);
-int nfsrpc_opendowngrade(vnode_t, uint32_t, struct nfsclopen *,
-    struct ucred *, NFSPROC_T *);
-int nfsrpc_close(vnode_t, int, NFSPROC_T *);
-int nfsrpc_closerpc(struct nfsrv_descript *, struct nfsmount *,
-    struct nfsclopen *, struct ucred *, NFSPROC_T *, int);
-int nfsrpc_openconfirm(vnode_t, u_int8_t *, int, struct nfsclopen *,
-    struct ucred *, NFSPROC_T *);
-int nfsrpc_setclient(struct nfsmount *, struct nfsclclient *, int,
-    struct ucred *, NFSPROC_T *);
-int nfsrpc_getattr(vnode_t, struct ucred *, NFSPROC_T *,
-    struct nfsvattr *, void *);
-int nfsrpc_getattrnovp(struct nfsmount *, u_int8_t *, int, int,
-    struct ucred *, NFSPROC_T *, struct nfsvattr *, u_int64_t *, uint32_t *);
-int nfsrpc_setattr(vnode_t, struct vattr *, NFSACL_T *, struct ucred *,
-    NFSPROC_T *, struct nfsvattr *, int *, void *);
-int nfsrpc_lookup(vnode_t, char *, int, struct ucred *, NFSPROC_T *,
-    struct nfsvattr *, struct nfsvattr *, struct nfsfh **, int *, int *,
-    void *);
-int nfsrpc_readlink(vnode_t, struct uio *, struct ucred *,
-    NFSPROC_T *, struct nfsvattr *, int *, void *);
-int nfsrpc_read(vnode_t, struct uio *, struct ucred *, NFSPROC_T *,
-    struct nfsvattr *, int *, void *);
-int nfsrpc_write(vnode_t, struct uio *, int *, int *,
-    struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, void *, int);
-int nfsrpc_mknod(vnode_t, char *, int, struct vattr *, uint32_t,
-    enum vtype, struct ucred *, NFSPROC_T *, struct nfsvattr *,
-    struct nfsvattr *, struct nfsfh **, int *, int *, void *);
-int nfsrpc_create(vnode_t, char *, int, struct vattr *, nfsquad_t,
-    int, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *,
-    struct nfsfh **, int *, int *, void *);
-int nfsrpc_remove(vnode_t, char *, int, vnode_t, struct ucred *, NFSPROC_T *,
-    struct nfsvattr *, int *, void *);
-int nfsrpc_rename(vnode_t, vnode_t, char *, int, vnode_t, vnode_t, char *, int,
-    struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *,
-    int *, int *, void *, void *);
-int nfsrpc_link(vnode_t, vnode_t, char *, int,
-    struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *,
-    int *, int *, void *);
-int nfsrpc_symlink(vnode_t, char *, int, char *, struct vattr *,
-    struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *,
-    struct nfsfh **, int *, int *, void *);
-int nfsrpc_mkdir(vnode_t, char *, int, struct vattr *,
-    struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *,
-    struct nfsfh **, int *, int *, void *);
-int nfsrpc_rmdir(vnode_t, char *, int, struct ucred *, NFSPROC_T *,
-    struct nfsvattr *, int *, void *);
-int nfsrpc_readdir(vnode_t, struct uio *, nfsuint64 *, struct ucred *,
-    NFSPROC_T *, struct nfsvattr *, int *, int *, void *);
-int nfsrpc_readdirplus(vnode_t, struct uio *, nfsuint64 *, 
-    struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, int *, void *);
-int nfsrpc_commit(vnode_t, u_quad_t, int, struct ucred *,
-    NFSPROC_T *, struct nfsvattr *, int *, void *);
-int nfsrpc_advlock(vnode_t, off_t, int, struct flock *, int,
-    struct ucred *, NFSPROC_T *, void *, int);
-int nfsrpc_lockt(struct nfsrv_descript *, vnode_t,
-    struct nfsclclient *, u_int64_t, u_int64_t, struct flock *,
-    struct ucred *, NFSPROC_T *, void *, int);
-int nfsrpc_lock(struct nfsrv_descript *, struct nfsmount *, vnode_t,
-    u_int8_t *, int, struct nfscllockowner *, int, int, u_int64_t,
-    u_int64_t, short, struct ucred *, NFSPROC_T *, int);
-int nfsrpc_statfs(vnode_t, struct nfsstatfs *, struct nfsfsinfo *,
-    struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, void *);
-int nfsrpc_fsinfo(vnode_t, struct nfsfsinfo *, struct ucred *,
-    NFSPROC_T *, struct nfsvattr *, int *, void *);
-int nfsrpc_pathconf(vnode_t, struct nfsv3_pathconf *,
-    struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, void *);
-int nfsrpc_renew(struct nfsclclient *, struct nfsclds *, struct ucred *,
-    NFSPROC_T *);
-int nfsrpc_rellockown(struct nfsmount *, struct nfscllockowner *, uint8_t *,
-    int, struct ucred *, NFSPROC_T *);
-int nfsrpc_getdirpath(struct nfsmount *, u_char *, struct ucred *,
-    NFSPROC_T *);
-int nfsrpc_delegreturn(struct nfscldeleg *, struct ucred *,
-    struct nfsmount *, NFSPROC_T *, int);
-int nfsrpc_getacl(vnode_t, struct ucred *, NFSPROC_T *, NFSACL_T *, void *);
-int nfsrpc_setacl(vnode_t, struct ucred *, NFSPROC_T *, NFSACL_T *, void *);
-int nfsrpc_exchangeid(struct nfsmount *, struct nfsclclient *,
-    struct nfssockreq *, uint32_t, struct nfsclds **, struct ucred *,
-    NFSPROC_T *);
-int nfsrpc_createsession(struct nfsmount *, struct nfsclsession *,
-    struct nfssockreq *, uint32_t, int, struct ucred *, NFSPROC_T *);
-int nfsrpc_destroysession(struct nfsmount *, struct nfsclclient *,
-    struct ucred *, NFSPROC_T *);
-int nfsrpc_destroyclient(struct nfsmount *, struct nfsclclient *,
-    struct ucred *, NFSPROC_T *);
-int nfsrpc_layoutget(struct nfsmount *, uint8_t *, int, int, uint64_t, uint64_t,
-    uint64_t, int, nfsv4stateid_t *, int *, struct nfsclflayouthead *,
-    struct ucred *, NFSPROC_T *, void *);
-int nfsrpc_getdeviceinfo(struct nfsmount *, uint8_t *, int, uint32_t *,
-    struct nfscldevinfo **, struct ucred *, NFSPROC_T *);
-int nfsrpc_layoutcommit(struct nfsmount *, uint8_t *, int, int,
-    uint64_t, uint64_t, uint64_t, nfsv4stateid_t *, int, int, uint8_t *,
-    struct ucred *, NFSPROC_T *, void *);
-int nfsrpc_layoutreturn(struct nfsmount *, uint8_t *, int, int, int, uint32_t,
-    int, uint64_t, uint64_t, nfsv4stateid_t *, int, uint32_t *, struct ucred *,
-    NFSPROC_T *, void *);
-int nfsrpc_reclaimcomplete(struct nfsmount *, struct ucred *, NFSPROC_T *);
-int nfscl_doiods(vnode_t, struct uio *, int *, int *, uint32_t,
-    struct ucred *, NFSPROC_T *);
-int nfscl_findlayoutforio(struct nfscllayout *, uint64_t, uint32_t,
-    struct nfsclflayout **);
-void nfscl_freenfsclds(struct nfsclds *);
-
-/* nfs_clstate.c */
-int nfscl_open(vnode_t, u_int8_t *, int, uint32_t, int,
-    struct ucred *, NFSPROC_T *, struct nfsclowner **, struct nfsclopen **,
-    int *, int *, int);
-int nfscl_getstateid(vnode_t, u_int8_t *, int, uint32_t, int, struct ucred *,
-    NFSPROC_T *, nfsv4stateid_t *, void **);
-void nfscl_ownerrelease(struct nfsclowner *, int, int, int);
-void nfscl_openrelease(struct nfsclopen *, int, int);
-int nfscl_getcl(struct mount *, struct ucred *, NFSPROC_T *, int,
-    struct nfsclclient **);
-struct nfsclclient *nfscl_findcl(struct nfsmount *);
-void nfscl_clientrelease(struct nfsclclient *);
-void nfscl_freelock(struct nfscllock *, int);
-void nfscl_freelockowner(struct nfscllockowner *, int);
-int nfscl_getbytelock(vnode_t, u_int64_t, u_int64_t, short,
-    struct ucred *, NFSPROC_T *, struct nfsclclient *, int, void *, int,
-    u_int8_t *, u_int8_t *, struct nfscllockowner **, int *, int *);
-int nfscl_relbytelock(vnode_t, u_int64_t, u_int64_t,
-    struct ucred *, NFSPROC_T *, int, struct nfsclclient *,
-    void *, int, struct nfscllockowner **, int *);
-int nfscl_checkwritelocked(vnode_t, struct flock *,
-    struct ucred *, NFSPROC_T *, void *, int);
-void nfscl_lockrelease(struct nfscllockowner *, int, int);
-void nfscl_fillclid(u_int64_t, char *, u_int8_t *, u_int16_t);
-void nfscl_filllockowner(void *, u_int8_t *, int);
-void nfscl_freeopen(struct nfsclopen *, int);
-void nfscl_umount(struct nfsmount *, NFSPROC_T *);
-void nfscl_renewthread(struct nfsclclient *, NFSPROC_T *);
-void nfscl_initiate_recovery(struct nfsclclient *);
-int nfscl_hasexpired(struct nfsclclient *, uint32_t, NFSPROC_T *);
-void nfscl_dumpstate(struct nfsmount *, int, int, int, int);
-void nfscl_dupopen(vnode_t, int);
-int nfscl_getclose(vnode_t, struct nfsclclient **);
-int nfscl_doclose(vnode_t, struct nfsclclient **, NFSPROC_T *);
-void nfsrpc_doclose(struct nfsmount *, struct nfsclopen *, NFSPROC_T *);
-int nfscl_deleg(mount_t, struct nfsclclient *, u_int8_t *, int,
-    struct ucred *, NFSPROC_T *, struct nfscldeleg **);
-void nfscl_lockinit(struct nfsv4lock *);
-void nfscl_lockexcl(struct nfsv4lock *, void *);
-void nfscl_lockunlock(struct nfsv4lock *);
-void nfscl_lockderef(struct nfsv4lock *);
-void nfscl_docb(struct nfsrv_descript *, NFSPROC_T *);
-void nfscl_releasealllocks(struct nfsclclient *, vnode_t, NFSPROC_T *, void *,
-    int);
-int nfscl_lockt(vnode_t, struct nfsclclient *, u_int64_t,
-    u_int64_t, struct flock *, NFSPROC_T *, void *, int);
-int nfscl_mustflush(vnode_t);
-int nfscl_nodeleg(vnode_t, int);
-int nfscl_removedeleg(vnode_t, NFSPROC_T *, nfsv4stateid_t *);
-int nfscl_getref(struct nfsmount *);
-void nfscl_relref(struct nfsmount *);
-int nfscl_renamedeleg(vnode_t, nfsv4stateid_t *, int *, vnode_t,
-    nfsv4stateid_t *, int *, NFSPROC_T *);
-void nfscl_reclaimnode(vnode_t);
-void nfscl_newnode(vnode_t);
-void nfscl_delegmodtime(vnode_t);
-void nfscl_deleggetmodtime(vnode_t, struct timespec *);
-int nfscl_tryclose(struct nfsclopen *, struct ucred *,
-    struct nfsmount *, NFSPROC_T *);
-void nfscl_cleanup(NFSPROC_T *);
-int nfscl_layout(struct nfsmount *, vnode_t, u_int8_t *, int, nfsv4stateid_t *,
-    int, struct nfsclflayouthead *, struct nfscllayout **, struct ucred *,
-    NFSPROC_T *);
-struct nfscllayout *nfscl_getlayout(struct nfsclclient *, uint8_t *, int,
-    uint64_t, struct nfsclflayout **, int *);
-void nfscl_rellayout(struct nfscllayout *, int);
-struct nfscldevinfo *nfscl_getdevinfo(struct nfsclclient *, uint8_t *,
-    struct nfscldevinfo *);
-void nfscl_reldevinfo(struct nfscldevinfo *);
-int nfscl_adddevinfo(struct nfsmount *, struct nfscldevinfo *,
-    struct nfsclflayout *);
-void nfscl_freelayout(struct nfscllayout *);
-void nfscl_freeflayout(struct nfsclflayout *);
-void nfscl_freedevinfo(struct nfscldevinfo *);
-int nfscl_layoutcommit(vnode_t, NFSPROC_T *);
-
-/* nfs_clport.c */
-int nfscl_nget(mount_t, vnode_t, struct nfsfh *,
-    struct componentname *, NFSPROC_T *, struct nfsnode **, void *, int);
-NFSPROC_T *nfscl_getparent(NFSPROC_T *);
-void nfscl_start_renewthread(struct nfsclclient *);
-void nfscl_loadsbinfo(struct nfsmount *, struct nfsstatfs *, void *);
-void nfscl_loadfsinfo (struct nfsmount *, struct nfsfsinfo *);
-void nfscl_delegreturn(struct nfscldeleg *, int, struct nfsmount *,
-    struct ucred *, NFSPROC_T *);
-void nfsrvd_cbinit(int);
-int nfscl_checksattr(struct vattr *, struct nfsvattr *);
-int nfscl_ngetreopen(mount_t, u_int8_t *, int, NFSPROC_T *,
-    struct nfsnode **);
-int nfscl_procdoesntexist(u_int8_t *);
-int nfscl_maperr(NFSPROC_T *, int, uid_t, gid_t);
-
-/* nfs_clsubs.c */
-void nfscl_init(void);
-
-/* nfs_clbio.c */
-int ncl_flush(vnode_t, int, struct ucred *, NFSPROC_T *, int, int);
-
-/* nfs_clnode.c */
-void ncl_invalcaches(vnode_t);
-
-/* nfs_nfsdport.c */
-int nfsvno_getattr(vnode_t, struct nfsvattr *, struct ucred *,
-    NFSPROC_T *, int);
-int nfsvno_setattr(vnode_t, struct nfsvattr *, struct ucred *,
-    NFSPROC_T *, struct nfsexstuff *);
-int nfsvno_getfh(vnode_t, fhandle_t *, NFSPROC_T *);
-int nfsvno_accchk(vnode_t, accmode_t, struct ucred *,
-    struct nfsexstuff *, NFSPROC_T *, int, int, uint32_t *);
-int nfsvno_namei(struct nfsrv_descript *, struct nameidata *,
-    vnode_t, int, struct nfsexstuff *, NFSPROC_T *, vnode_t *);
-void nfsvno_setpathbuf(struct nameidata *, char **, u_long **);
-void nfsvno_relpathbuf(struct nameidata *);
-int nfsvno_readlink(vnode_t, struct ucred *, NFSPROC_T *, mbuf_t *,
-    mbuf_t *, int *);
-int nfsvno_read(vnode_t, off_t, int, struct ucred *, NFSPROC_T *,
-    mbuf_t *, mbuf_t *);
-int nfsvno_write(vnode_t, off_t, int, int, int, mbuf_t,
-    char *, struct ucred *, NFSPROC_T *);
-int nfsvno_createsub(struct nfsrv_descript *, struct nameidata *,
-    vnode_t *, struct nfsvattr *, int *, int32_t *, NFSDEV_T, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsvno_mknod(struct nameidata *, struct nfsvattr *, struct ucred *,
-    NFSPROC_T *);
-int nfsvno_mkdir(struct nameidata *,
-    struct nfsvattr *, uid_t, struct ucred *, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsvno_symlink(struct nameidata *, struct nfsvattr *, char *, int, int,
-    uid_t, struct ucred *, NFSPROC_T *, struct nfsexstuff *);
-int nfsvno_getsymlink(struct nfsrv_descript *, struct nfsvattr *,
-    NFSPROC_T *, char **, int *);
-int nfsvno_removesub(struct nameidata *, int, struct ucred *, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsvno_rmdirsub(struct nameidata *, int, struct ucred *, NFSPROC_T *,
-    struct nfsexstuff *);
-int nfsvno_rename(struct nameidata *, struct nameidata *, uint32_t,
-    uint32_t, struct ucred *, NFSPROC_T *);
-int nfsvno_link(struct nameidata *, vnode_t, struct ucred *,
-    NFSPROC_T *, struct nfsexstuff *);
-int nfsvno_fsync(vnode_t, u_int64_t, int, struct ucred *, NFSPROC_T *);
-int nfsvno_statfs(vnode_t, struct statfs *);
-void nfsvno_getfs(struct nfsfsinfo *, int);
-void nfsvno_open(struct nfsrv_descript *, struct nameidata *, nfsquad_t,
-    nfsv4stateid_t *, struct nfsstate *, int *, struct nfsvattr *, int32_t *,
-    int, NFSACL_T *, nfsattrbit_t *, struct ucred *, NFSPROC_T *,
-    struct nfsexstuff *, vnode_t *);
-int nfsvno_updfilerev(vnode_t, struct nfsvattr *, struct ucred *,
-    NFSPROC_T *);
-int nfsvno_fillattr(struct nfsrv_descript *, struct mount *, vnode_t,
-    struct nfsvattr *, fhandle_t *, int, nfsattrbit_t *,
-    struct ucred *, NFSPROC_T *, int, int, int, int, uint64_t);
-int nfsrv_sattr(struct nfsrv_descript *, struct nfsvattr *, nfsattrbit_t *,
-    NFSACL_T *, NFSPROC_T *);
-int nfsv4_sattr(struct nfsrv_descript *, struct nfsvattr *, nfsattrbit_t *,
-    NFSACL_T *, NFSPROC_T *);
-int nfsvno_checkexp(mount_t, NFSSOCKADDR_T, struct nfsexstuff *,
-    struct ucred **);
-int nfsvno_fhtovp(mount_t, fhandle_t *, NFSSOCKADDR_T, int,
-    vnode_t *, struct nfsexstuff *, struct ucred **);
-vnode_t nfsvno_getvp(fhandle_t *);
-int nfsvno_advlock(vnode_t, int, u_int64_t, u_int64_t, NFSPROC_T *);
-int nfsrv_v4rootexport(void *, struct ucred *, NFSPROC_T *);
-int nfsvno_testexp(struct nfsrv_descript *, struct nfsexstuff *);
-uint32_t nfsrv_hashfh(fhandle_t *);
-uint32_t nfsrv_hashsessionid(uint8_t *);
-void nfsrv_backupstable(void);
-
-/* nfs_commonkrpc.c */
-int newnfs_nmcancelreqs(struct nfsmount *);
-void newnfs_set_sigmask(struct thread *, sigset_t *);
-void newnfs_restore_sigmask(struct thread *, sigset_t *);
-int newnfs_msleep(struct thread *, void *, struct mtx *, int, char *, int);
-int newnfs_request(struct nfsrv_descript *, struct nfsmount *,
-    struct nfsclient *, struct nfssockreq *, vnode_t, NFSPROC_T *,
-    struct ucred *, uint32_t, uint32_t, u_char *, int, u_int64_t *,
-    struct nfsclsession *);
-int newnfs_connect(struct nfsmount *, struct nfssockreq *,
-    struct ucred *, NFSPROC_T *, int);
-void newnfs_disconnect(struct nfssockreq *);
-int newnfs_sigintr(struct nfsmount *, NFSPROC_T *);
-
-/* nfs_nfsdkrpc.c */
-int nfsrvd_addsock(struct file *);
-int nfsrvd_nfsd(NFSPROC_T *, struct nfsd_nfsd_args *);
-void nfsrvd_init(int);
-
-/* nfs_clkrpc.c */
-int nfscbd_addsock(struct file *);
-int nfscbd_nfsd(NFSPROC_T *, struct nfsd_nfscbd_args *);
-
diff --git a/include.new/fs/nfs/nfscl.h b/include.new/fs/nfs/nfscl.h
deleted file mode 100644
index 40c3496..0000000
--- a/include.new/fs/nfs/nfscl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2009 Rick Macklem, University of Guelph
- * 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.
- *
- * 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: releng/10.2/sys/fs/nfs/nfscl.h 244042 2012-12-08 22:52:39Z rmacklem $
- */
-
-#ifndef	_NFS_NFSCL_H
-#define	_NFS_NFSCL_H
-
-/*
- * Extra stuff for a NFSv4 nfsnode.
- * MALLOC'd to the correct length for the name and file handle.
- * n4_data has the file handle, followed by the file name.
- * The macro NFS4NODENAME() returns a pointer to the start of the
- * name.
- */
-struct nfsv4node {
-	u_int16_t	n4_fhlen;
-	u_int16_t	n4_namelen;
-	u_int8_t	n4_data[1];
-};
-
-#define	NFS4NODENAME(n)	(&((n)->n4_data[(n)->n4_fhlen]))
-
-/*
- * Just a macro to convert the nfscl_reqstart arguments.
- */
-#define	NFSCL_REQSTART(n, p, v) 					\
-	nfscl_reqstart((n), (p), VFSTONFS((v)->v_mount), 		\
-	    VTONFS(v)->n_fhp->nfh_fh, VTONFS(v)->n_fhp->nfh_len, NULL, NULL)
-
-/*
- * These two macros convert between a lease duration and renew interval.
- * For now, just make the renew interval 1/2 the lease duration.
- * (They should be inverse operators.)
- */
-#define	NFSCL_RENEW(l)	(((l) < 2) ? 1 : ((l) / 2))
-#define	NFSCL_LEASE(r)	((r) * 2)
-
-/*
- * These flag bits are used for the argument to nfscl_fillsattr() to
- * indicate special handling of the attributes.
- */
-#define	NFSSATTR_FULL		0x1
-#define	NFSSATTR_SIZE0		0x2
-#define	NFSSATTR_SIZENEG1	0x4
-#define	NFSSATTR_SIZERDEV	0x8
-
-/* Use this macro for debug printfs. */
-#define	NFSCL_DEBUG(level, ...)	do {					\
-		if (nfscl_debuglevel >= (level))			\
-			printf(__VA_ARGS__);				\
-	} while (0)
-
-#endif	/* _NFS_NFSCL_H */
diff --git a/include.new/fs/nfs/nfsclstate.h b/include.new/fs/nfs/nfsclstate.h
deleted file mode 100644
index 73f90b5..0000000
--- a/include.new/fs/nfs/nfsclstate.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*-
- * Copyright (c) 2009 Rick Macklem, University of Guelph
- * 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.
- *
- * 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: releng/10.2/sys/fs/nfs/nfsclstate.h 269398 2014-08-01 21:10:41Z rmacklem $
- */
-
-#ifndef _NFS_NFSCLSTATE_H_
-#define	_NFS_NFSCLSTATE_H_
-
-/*
- * Definitions for NFS V4 client state handling.
- */
-LIST_HEAD(nfsclopenhead, nfsclopen);
-LIST_HEAD(nfscllockownerhead, nfscllockowner);
-SLIST_HEAD(nfscllockownerfhhead, nfscllockownerfh);
-LIST_HEAD(nfscllockhead, nfscllock);
-LIST_HEAD(nfsclhead, nfsclclient);
-LIST_HEAD(nfsclownerhead, nfsclowner);
-TAILQ_HEAD(nfscldeleghead, nfscldeleg);
-LIST_HEAD(nfscldeleghash, nfscldeleg);
-TAILQ_HEAD(nfscllayouthead, nfscllayout);
-LIST_HEAD(nfscllayouthash, nfscllayout);
-LIST_HEAD(nfsclflayouthead, nfsclflayout);
-LIST_HEAD(nfscldevinfohead, nfscldevinfo);
-LIST_HEAD(nfsclrecalllayouthead, nfsclrecalllayout);
-#define	NFSCLDELEGHASHSIZE	256
-#define	NFSCLDELEGHASH(c, f, l)							\
-	(&((c)->nfsc_deleghash[ncl_hash((f), (l)) % NFSCLDELEGHASHSIZE]))
-#define	NFSCLLAYOUTHASHSIZE	256
-#define	NFSCLLAYOUTHASH(c, f, l)						\
-	(&((c)->nfsc_layouthash[ncl_hash((f), (l)) % NFSCLLAYOUTHASHSIZE]))
-
-/* Structure for NFSv4.1 session stuff. */
-struct nfsclsession {
-	struct mtx	nfsess_mtx;
-	struct nfsslot	nfsess_cbslots[NFSV4_CBSLOTS];
-	nfsquad_t	nfsess_clientid;
-	SVCXPRT		*nfsess_xprt;		/* For backchannel callback */
-	uint32_t	nfsess_slotseq[64];	/* Max for 64bit nm_slots */
-	uint64_t	nfsess_slots;
-	uint32_t	nfsess_sequenceid;
-	uint32_t	nfsess_maxcache;	/* Max size for cached reply. */
-	uint16_t	nfsess_foreslots;
-	uint16_t	nfsess_backslots;
-	uint8_t		nfsess_sessionid[NFSX_V4SESSIONID];
-};
-
-/*
- * This structure holds the session, clientid and related information
- * needed for an NFSv4.1 Meta Data Server (MDS) or Data Server (DS).
- * It is malloc'd to the correct length.
- */
-struct nfsclds {
-	TAILQ_ENTRY(nfsclds)	nfsclds_list;
-	struct nfsclsession	nfsclds_sess;
-	struct mtx		nfsclds_mtx;
-	struct nfssockreq	*nfsclds_sockp;
-	time_t			nfsclds_expire;
-	uint16_t		nfsclds_flags;
-	uint16_t		nfsclds_servownlen;
-	uint8_t			nfsclds_verf[NFSX_VERF];
-	uint8_t			nfsclds_serverown[0];
-};
-
-/*
- * Flags for nfsclds_flags.
- */
-#define	NFSCLDS_HASWRITEVERF	0x0001
-#define	NFSCLDS_MDS		0x0002
-#define	NFSCLDS_DS		0x0004
-
-struct nfsclclient {
-	LIST_ENTRY(nfsclclient) nfsc_list;
-	struct nfsclownerhead	nfsc_owner;
-	struct nfscldeleghead	nfsc_deleg;
-	struct nfscldeleghash	nfsc_deleghash[NFSCLDELEGHASHSIZE];
-	struct nfscllayouthead	nfsc_layout;
-	struct nfscllayouthash	nfsc_layouthash[NFSCLLAYOUTHASHSIZE];
-	struct nfscldevinfohead	nfsc_devinfo;
-	struct nfsv4lock	nfsc_lock;
-	struct proc		*nfsc_renewthread;
-	struct nfsmount		*nfsc_nmp;
-	time_t			nfsc_expire;
-	uint32_t		nfsc_clientidrev;
-	uint32_t		nfsc_rev;
-	uint32_t		nfsc_renew;
-	uint32_t		nfsc_cbident;
-	u_int16_t		nfsc_flags;
-	u_int16_t		nfsc_idlen;
-	u_int8_t		nfsc_id[1];	/* Malloc'd to correct length */
-};
-
-/*
- * Bits for nfsc_flags.
- */
-#define	NFSCLFLAGS_INITED	0x0001
-#define	NFSCLFLAGS_HASCLIENTID	0x0002
-#define	NFSCLFLAGS_RECOVER	0x0004
-#define	NFSCLFLAGS_UMOUNT	0x0008
-#define	NFSCLFLAGS_HASTHREAD	0x0010
-#define	NFSCLFLAGS_AFINET6	0x0020
-#define	NFSCLFLAGS_EXPIREIT	0x0040
-#define	NFSCLFLAGS_FIRSTDELEG	0x0080
-#define	NFSCLFLAGS_GOTDELEG	0x0100
-#define	NFSCLFLAGS_RECVRINPROG	0x0200
-
-struct nfsclowner {
-	LIST_ENTRY(nfsclowner)	nfsow_list;
-	struct nfsclopenhead	nfsow_open;
-	struct nfsclclient	*nfsow_clp;
-	uint32_t		nfsow_seqid;
-	uint32_t		nfsow_defunct;
-	struct nfsv4lock	nfsow_rwlock;
-	u_int8_t		nfsow_owner[NFSV4CL_LOCKNAMELEN];
-};
-
-/*
- * MALLOC'd to the correct length to accommodate the file handle.
- */
-struct nfscldeleg {
-	TAILQ_ENTRY(nfscldeleg)	nfsdl_list;
-	LIST_ENTRY(nfscldeleg)	nfsdl_hash;
-	struct nfsclownerhead	nfsdl_owner;	/* locally issued state */
-	struct nfscllockownerhead nfsdl_lock;
-	nfsv4stateid_t		nfsdl_stateid;
-	struct acl_entry	nfsdl_ace;	/* Delegation ace */
-	struct nfsclclient	*nfsdl_clp;
-	struct nfsv4lock	nfsdl_rwlock;	/* for active I/O ops */
-	struct nfscred		nfsdl_cred;	/* Cred. used for Open */
-	time_t			nfsdl_timestamp; /* used for stale cleanup */
-	u_int64_t		nfsdl_sizelimit; /* Limit for file growth */
-	u_int64_t		nfsdl_size;	/* saved copy of file size */
-	u_int64_t		nfsdl_change;	/* and change attribute */
-	struct timespec		nfsdl_modtime;	/* local modify time */
-	u_int16_t		nfsdl_fhlen;
-	u_int8_t		nfsdl_flags;
-	u_int8_t		nfsdl_fh[1];	/* must be last */
-};
-
-/*
- * nfsdl_flags bits.
- */
-#define	NFSCLDL_READ		0x01
-#define	NFSCLDL_WRITE		0x02
-#define	NFSCLDL_RECALL		0x04
-#define	NFSCLDL_NEEDRECLAIM	0x08
-#define	NFSCLDL_ZAPPED		0x10
-#define	NFSCLDL_MODTIMESET	0x20
-#define	NFSCLDL_DELEGRET	0x40
-
-/*
- * MALLOC'd to the correct length to accommodate the file handle.
- */
-struct nfsclopen {
-	LIST_ENTRY(nfsclopen)	nfso_list;
-	struct nfscllockownerhead nfso_lock;
-	nfsv4stateid_t		nfso_stateid;
-	struct nfsclowner	*nfso_own;
-	struct nfscred		nfso_cred;	/* Cred. used for Open */
-	uint32_t		nfso_mode;
-	uint32_t		nfso_opencnt;
-	u_int16_t		nfso_fhlen;
-	u_int8_t		nfso_posixlock;	/* 1 for POSIX type locking */
-	u_int8_t		nfso_fh[1];	/* must be last */
-};
-
-/*
- * Return values for nfscl_open(). NFSCLOPEN_OK must == 0.
- */
-#define	NFSCLOPEN_OK		0
-#define	NFSCLOPEN_DOOPEN	1
-#define	NFSCLOPEN_DOOPENDOWNGRADE 2
-#define	NFSCLOPEN_SETCRED	3
-
-struct nfscllockowner {
-	LIST_ENTRY(nfscllockowner) nfsl_list;
-	struct nfscllockhead	nfsl_lock;
-	struct nfsclopen	*nfsl_open;
-	NFSPROC_T		*nfsl_inprog;
-	nfsv4stateid_t		nfsl_stateid;
-	int			nfsl_lockflags;
-	uint32_t		nfsl_seqid;
-	struct nfsv4lock	nfsl_rwlock;
-	u_int8_t		nfsl_owner[NFSV4CL_LOCKNAMELEN];
-	u_int8_t		nfsl_openowner[NFSV4CL_LOCKNAMELEN];
-};
-
-/*
- * Byte range entry for the above lock owner.
- */
-struct nfscllock {
-	LIST_ENTRY(nfscllock)	nfslo_list;
-	u_int64_t		nfslo_first;
-	u_int64_t		nfslo_end;
-	short			nfslo_type;
-};
-
-/* This structure is used to collect a list of lockowners to free up. */
-struct nfscllockownerfh {
-	SLIST_ENTRY(nfscllockownerfh)	nfslfh_list;
-	struct nfscllockownerhead	nfslfh_lock;
-	int				nfslfh_len;
-	uint8_t				nfslfh_fh[NFSX_V4FHMAX];
-};
-
-/*
- * MALLOC'd to the correct length to accommodate the file handle.
- */
-struct nfscllayout {
-	TAILQ_ENTRY(nfscllayout)	nfsly_list;
-	LIST_ENTRY(nfscllayout)		nfsly_hash;
-	nfsv4stateid_t			nfsly_stateid;
-	struct nfsv4lock		nfsly_lock;
-	uint64_t			nfsly_filesid[2];
-	uint64_t			nfsly_lastbyte;
-	struct nfsclflayouthead		nfsly_flayread;
-	struct nfsclflayouthead		nfsly_flayrw;
-	struct nfsclrecalllayouthead	nfsly_recall;
-	time_t				nfsly_timestamp;
-	struct nfsclclient		*nfsly_clp;
-	uint16_t			nfsly_flags;
-	uint16_t			nfsly_fhlen;
-	uint8_t				nfsly_fh[1];
-};
-
-/*
- * Flags for nfsly_flags.
- */
-#define	NFSLY_FILES		0x0001
-#define	NFSLY_BLOCK		0x0002
-#define	NFSLY_OBJECT		0x0004
-#define	NFSLY_RECALL		0x0008
-#define	NFSLY_RECALLFILE	0x0010
-#define	NFSLY_RECALLFSID	0x0020
-#define	NFSLY_RECALLALL		0x0040
-#define	NFSLY_RETONCLOSE	0x0080
-#define	NFSLY_WRITTEN		0x0100	/* Has been used to write to a DS. */
-
-/*
- * MALLOC'd to the correct length to accommodate the file handle list.
- * These hang off of nfsly_flayread and nfsly_flayrw, sorted in increasing
- * offset order.
- * The nfsly_flayread list holds the ones with iomode == NFSLAYOUTIOMODE_READ,
- * whereas the nfsly_flayrw holds the ones with iomode == NFSLAYOUTIOMODE_RW.
- */
-struct nfsclflayout {
-	LIST_ENTRY(nfsclflayout)	nfsfl_list;
-	uint8_t				nfsfl_dev[NFSX_V4DEVICEID];
-	uint64_t			nfsfl_off;
-	uint64_t			nfsfl_end;
-	uint64_t			nfsfl_patoff;
-	struct nfscldevinfo		*nfsfl_devp;
-	uint32_t			nfsfl_iomode;
-	uint32_t			nfsfl_util;
-	uint32_t			nfsfl_stripe1;
-	uint16_t			nfsfl_flags;
-	uint16_t			nfsfl_fhcnt;
-	struct nfsfh			*nfsfl_fh[1];	/* FH list for DS */
-};
-
-/*
- * Flags for nfsfl_flags.
- */
-#define	NFSFL_RECALL	0x0001		/* File layout has been recalled */
-
-/*
- * Structure that is used to store a LAYOUTRECALL.
- */
-struct nfsclrecalllayout {
-	LIST_ENTRY(nfsclrecalllayout)	nfsrecly_list;
-	uint64_t			nfsrecly_off;
-	uint64_t			nfsrecly_len;
-	int				nfsrecly_recalltype;
-	uint32_t			nfsrecly_iomode;
-	uint32_t			nfsrecly_stateseqid;
-};
-
-/*
- * Stores the NFSv4.1 Device Info. Malloc'd to the correct length to
- * store the list of network connections and list of indices.
- * nfsdi_data[] is allocated the following way:
- * - nfsdi_addrcnt * struct nfsclds
- * - stripe indices, each stored as one byte, since there can be many
- *   of them. (This implies a limit of 256 on nfsdi_addrcnt, since the
- *   indices select which address.)
- */
-struct nfscldevinfo {
-	LIST_ENTRY(nfscldevinfo)	nfsdi_list;
-	uint8_t				nfsdi_deviceid[NFSX_V4DEVICEID];
-	struct nfsclclient		*nfsdi_clp;
-	uint32_t			nfsdi_refcnt;
-	uint32_t			nfsdi_layoutrefs;
-	uint16_t			nfsdi_stripecnt;
-	uint16_t			nfsdi_addrcnt;
-	struct nfsclds			*nfsdi_data[0];
-};
-
-/* These inline functions return values from nfsdi_data[]. */
-/*
- * Return a pointer to the address at "pos".
- */
-static __inline struct nfsclds **
-nfsfldi_addr(struct nfscldevinfo *ndi, int pos)
-{
-
-	if (pos >= ndi->nfsdi_addrcnt)
-		return (NULL);
-	return (&ndi->nfsdi_data[pos]);
-}
-
-/*
- * Return the Nth ("pos") stripe index.
- */
-static __inline int
-nfsfldi_stripeindex(struct nfscldevinfo *ndi, int pos)
-{
-	uint8_t *valp;
-
-	if (pos >= ndi->nfsdi_stripecnt)
-		return (-1);
-	valp = (uint8_t *)&ndi->nfsdi_data[ndi->nfsdi_addrcnt];
-	valp += pos;
-	return ((int)*valp);
-}
-
-/*
- * Set the Nth ("pos") stripe index to "val".
- */
-static __inline void
-nfsfldi_setstripeindex(struct nfscldevinfo *ndi, int pos, uint8_t val)
-{
-	uint8_t *valp;
-
-	if (pos >= ndi->nfsdi_stripecnt)
-		return;
-	valp = (uint8_t *)&ndi->nfsdi_data[ndi->nfsdi_addrcnt];
-	valp += pos;
-	*valp = val;
-}
-
-/*
- * Macro for incrementing the seqid#.
- */
-#define	NFSCL_INCRSEQID(s, n)	do { 					\
-	    if (((n)->nd_flag & ND_INCRSEQID))				\
-		(s)++; 							\
-	} while (0)
-
-#endif	/* _NFS_NFSCLSTATE_H_ */
diff --git a/include.new/fs/nfs/nfsdport.h b/include.new/fs/nfs/nfsdport.h
deleted file mode 100644
index c093dbb..0000000
--- a/include.new/fs/nfs/nfsdport.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * Copyright (c) 2009 Rick Macklem, University of Guelph
- * 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.
- *
- * 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: releng/10.2/sys/fs/nfs/nfsdport.h 284216 2015-06-10 12:17:19Z rmacklem $
- */
-
-/*
- * These macros handle nfsvattr fields. They look a bit silly here, but
- * are quite different for the Darwin port.
- */
-#define	NFSVNO_ATTRINIT(n)		(VATTR_NULL(&((n)->na_vattr)))
-#define	NFSVNO_SETATTRVAL(n, f, v)	((n)->na_##f = (v))
-#define	NFSVNO_SETACTIVE(n, f)
-#define	NFSVNO_UNSET(n, f)		((n)->na_##f = VNOVAL)
-#define	NFSVNO_NOTSETMODE(n)		((n)->na_mode == ((mode_t)VNOVAL))
-#define	NFSVNO_ISSETMODE(n)		((n)->na_mode != ((mode_t)VNOVAL))
-#define	NFSVNO_NOTSETUID(n)		((n)->na_uid == ((uid_t)VNOVAL))
-#define	NFSVNO_ISSETUID(n)		((n)->na_uid != ((uid_t)VNOVAL))
-#define	NFSVNO_NOTSETGID(n)		((n)->na_gid == ((gid_t)VNOVAL))
-#define	NFSVNO_ISSETGID(n)		((n)->na_gid != ((gid_t)VNOVAL))
-#define	NFSVNO_NOTSETSIZE(n)		((n)->na_size == VNOVAL)
-#define	NFSVNO_ISSETSIZE(n)		((n)->na_size != VNOVAL)
-#define	NFSVNO_NOTSETATIME(n)		((n)->na_atime.tv_sec == VNOVAL)
-#define	NFSVNO_ISSETATIME(n)		((n)->na_atime.tv_sec != VNOVAL)
-#define	NFSVNO_NOTSETMTIME(n)		((n)->na_mtime.tv_sec == VNOVAL)
-#define	NFSVNO_ISSETMTIME(n)		((n)->na_mtime.tv_sec != VNOVAL)
-
-/*
- * This structure acts as a "catch-all" for information that
- * needs to be returned by nfsd_fhtovp().
- */
-struct nfsexstuff {
-	int	nes_exflag;			/* export flags */
-	int	nes_numsecflavor;		/* # of security flavors */
-	int	nes_secflavors[MAXSECFLAVORS];	/* and the flavors */
-};
-
-/*
- * These are NO-OPS for BSD until Isilon upstreams EXITCODE support.
- * EXITCODE is an in-memory ring buffer that holds the routines failing status.
- * This is a valuable tool to use when debugging and analyzing issues.
- * In addition to recording a routine's failing status, it offers
- * logging of routines for call stack tracing.
- * EXITCODE should be used only in routines that return a true errno value, as
- * that value will be formatted to a displayable errno string.  Routines that 
- * return regular int status that are not true errno should not set EXITCODE.
- * If you want to log routine tracing, you can add EXITCODE(0) to any routine.
- * NFS extended the EXITCODE with EXITCODE2 to record either the routine's
- * exit errno status or the nd_repstat.
- */
-#define	NFSEXITCODE(error)
-#define	NFSEXITCODE2(error, nd)
-
-#define	NFSVNO_EXINIT(e)		((e)->nes_exflag = 0)
-#define	NFSVNO_EXPORTED(e)		((e)->nes_exflag & MNT_EXPORTED)
-#define	NFSVNO_EXRDONLY(e)		((e)->nes_exflag & MNT_EXRDONLY)
-#define	NFSVNO_EXPORTANON(e)		((e)->nes_exflag & MNT_EXPORTANON)
-#define	NFSVNO_EXSTRICTACCESS(e)	((e)->nes_exflag & MNT_EXSTRICTACCESS)
-#define	NFSVNO_EXV4ONLY(e)		((e)->nes_exflag & MNT_EXV4ONLY)
-
-#define	NFSVNO_SETEXRDONLY(e)	((e)->nes_exflag = (MNT_EXPORTED|MNT_EXRDONLY))
-
-#define	NFSVNO_CMPFH(f1, f2)						\
-    ((f1)->fh_fsid.val[0] == (f2)->fh_fsid.val[0] &&			\
-     (f1)->fh_fsid.val[1] == (f2)->fh_fsid.val[1] &&			\
-     bcmp(&(f1)->fh_fid, &(f2)->fh_fid, sizeof(struct fid)) == 0)
-
-#define	NFSLOCKHASH(f) 							\
-	(&nfslockhash[nfsrv_hashfh(f) % nfsrv_lockhashsize])
-
-#define	NFSFPVNODE(f)	((struct vnode *)((f)->f_data))
-#define	NFSFPCRED(f)	((f)->f_cred)
-#define	NFSFPFLAG(f)	((f)->f_flag)
-
-#define	NFSNAMEICNDSET(n, c, o, f)	do {				\
-	(n)->cn_cred = (c);						\
-	(n)->cn_nameiop = (o);						\
-	(n)->cn_flags = (f);						\
-    } while (0)
-
-/*
- * A little bit of Darwin vfs kpi.
- */
-#define	vnode_mount(v)	((v)->v_mount)
-#define	vfs_statfs(m)	(&((m)->mnt_stat))
-
-#define	NFSPATHLEN_T	size_t
-
-/*
- * These are set to the minimum and maximum size of a server file
- * handle.
- */
-#define	NFSRV_MINFH	(sizeof (fhandle_t))
-#define	NFSRV_MAXFH	(sizeof (fhandle_t))
-
-/* Use this macro for debug printfs. */
-#define	NFSD_DEBUG(level, ...)	do {					\
-		if (nfsd_debuglevel >= (level))				\
-			printf(__VA_ARGS__);				\
-	} while (0)
-
diff --git a/include.new/fs/nfs/nfskpiport.h b/include.new/fs/nfs/nfskpiport.h
deleted file mode 100644
index e87a4be..0000000
--- a/include.new/fs/nfs/nfskpiport.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 2009 Rick Macklem, University of Guelph
- * 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.
- *
- * 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: releng/10.2/sys/fs/nfs/nfskpiport.h 207785 2010-05-08 14:50:12Z rmacklem $
- */
-
-#ifndef _NFS_NFSKPIPORT_H_
-#define	_NFS_NFSKPIPORT_H_
-/*
- * These definitions are needed since the generic code is now using Darwin8
- * KPI stuff. (I know, seems a bit silly, but I want the code to build on
- * Darwin8 and hopefully subsequent releases from Apple.)
- */
-typedef	struct mount *		mount_t;
-#define	vfs_statfs(m)		(&((m)->mnt_stat))
-#define	vfs_flags(m)		((m)->mnt_flag)
-
-typedef struct vnode *		vnode_t;
-#define	vnode_mount(v)		((v)->v_mount)
-#define	vnode_vtype(v)		((v)->v_type)
-
-typedef struct mbuf *		mbuf_t;
-#define	mbuf_freem(m)		m_freem(m)
-#define	mbuf_data(m)		mtod((m), void *)
-#define	mbuf_len(m)		((m)->m_len)
-#define	mbuf_next(m)		((m)->m_next)
-#define	mbuf_setlen(m, l)	((m)->m_len = (l))
-#define	mbuf_setnext(m, p)	((m)->m_next = (p))
-#define	mbuf_pkthdr_len(m)	((m)->m_pkthdr.len)
-#define	mbuf_pkthdr_setlen(m, l) ((m)->m_pkthdr.len = (l))
-#define	mbuf_pkthdr_setrcvif(m, p) ((m)->m_pkthdr.rcvif = (p))
-
-/*
- * This stuff is needed by Darwin for handling the uio structure.
- */
-#define	CAST_USER_ADDR_T(a)	(a)
-#define	CAST_DOWN(c, a)		((c) (a))
-#define	uio_uio_resid(p)	((p)->uio_resid)
-#define	uio_uio_resid_add(p, v)	((p)->uio_resid += (v))
-#define	uio_uio_resid_set(p, v)	((p)->uio_resid = (v))
-#define	uio_iov_base(p)		((p)->uio_iov->iov_base)
-#define	uio_iov_base_add(p, v)	do {					\
-	char *pp;							\
-	pp = (char *)(p)->uio_iov->iov_base;				\
-	pp += (v);							\
-	(p)->uio_iov->iov_base = (void *)pp;				\
-    } while (0)
-#define	uio_iov_len(p)		((p)->uio_iov->iov_len)
-#define	uio_iov_len_add(p, v)	((p)->uio_iov->iov_len += (v))
-
-#endif	/* _NFS_NFSKPIPORT_H */
diff --git a/include.new/fs/nfs/nfsm_subs.h b/include.new/fs/nfs/nfsm_subs.h
deleted file mode 100644
index 2a08558..0000000
--- a/include.new/fs/nfs/nfsm_subs.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/fs/nfs/nfsm_subs.h 249592 2013-04-17 21:00:22Z ken $
- */
-
-#ifndef _NFS_NFSM_SUBS_H_
-#define	_NFS_NFSM_SUBS_H_
-
-
-/*
- * These macros do strange and peculiar things to mbuf chains for
- * the assistance of the nfs code. To attempt to use them for any
- * other purpose will be dangerous. (they make weird assumptions)
- */
-
-#ifndef APPLE
-/*
- * First define what the actual subs. return
- */
-#define	M_HASCL(m)	((m)->m_flags & M_EXT)
-#define	NFSMINOFF(m) 							\
-		if (M_HASCL(m)) 					\
-			(m)->m_data = (m)->m_ext.ext_buf; 		\
-		else if ((m)->m_flags & M_PKTHDR) 			\
-			(m)->m_data = (m)->m_pktdat; 			\
-				else 					\
-			(m)->m_data = (m)->m_dat
-#define	NFSMSIZ(m)	((M_HASCL(m))?MCLBYTES: 			\
-				(((m)->m_flags & M_PKTHDR)?MHLEN:MLEN))
-#define	NFSM_DATAP(m, s)	(m)->m_data += (s)
-
-/*
- * Now for the macros that do the simple stuff and call the functions
- * for the hard stuff.
- * They use fields in struct nfsrv_descript to handle the mbuf queues.
- * Replace most of the macro with an inline function, to minimize
- * the machine code. The inline functions in lower case can be called
- * directly, bypassing the macro.
- */
-static __inline void *
-nfsm_build(struct nfsrv_descript *nd, int siz)
-{
-	void *retp;
-	struct mbuf *mb2;
-
-	if (siz > M_TRAILINGSPACE(nd->nd_mb)) {
-		NFSMCLGET(mb2, M_NOWAIT);
-		if (siz > MLEN)
-			panic("build > MLEN");
-		mbuf_setlen(mb2, 0);
-		nd->nd_bpos = NFSMTOD(mb2, caddr_t);
-		nd->nd_mb->m_next = mb2;
-		nd->nd_mb = mb2;
-	}
-	retp = (void *)(nd->nd_bpos);
-	nd->nd_mb->m_len += siz;
-	nd->nd_bpos += siz;
-	return (retp);
-}
-
-#define	NFSM_BUILD(a, c, s)	((a) = (c)nfsm_build(nd, (s)))
-
-static __inline void *
-nfsm_dissect(struct nfsrv_descript *nd, int siz)
-{
-	int tt1; 
-	void *retp;
-
-	tt1 = NFSMTOD(nd->nd_md, caddr_t) + nd->nd_md->m_len - nd->nd_dpos; 
-	if (tt1 >= siz) { 
-		retp = (void *)nd->nd_dpos; 
-		nd->nd_dpos += siz; 
-	} else { 
-		retp = nfsm_dissct(nd, siz, M_WAITOK); 
-	}
-	return (retp);
-}
-
-static __inline void *
-nfsm_dissect_nonblock(struct nfsrv_descript *nd, int siz)
-{
-	int tt1; 
-	void *retp;
-
-	tt1 = NFSMTOD(nd->nd_md, caddr_t) + nd->nd_md->m_len - nd->nd_dpos; 
-	if (tt1 >= siz) { 
-		retp = (void *)nd->nd_dpos; 
-		nd->nd_dpos += siz; 
-	} else { 
-		retp = nfsm_dissct(nd, siz, M_NOWAIT); 
-	}
-	return (retp);
-}
-
-#define	NFSM_DISSECT(a, c, s) 						\
-	do {								\
-		(a) = (c)nfsm_dissect(nd, (s));	 			\
-		if ((a) == NULL) { 					\
-			error = EBADRPC; 				\
-			goto nfsmout; 					\
-		}							\
-	} while (0)
-
-#define	NFSM_DISSECT_NONBLOCK(a, c, s) 					\
-	do {								\
-		(a) = (c)nfsm_dissect_nonblock(nd, (s));		\
-		if ((a) == NULL) { 					\
-			error = EBADRPC; 				\
-			goto nfsmout; 					\
-		}							\
-	} while (0)
-#endif	/* !APPLE */
-
-#define	NFSM_STRSIZ(s, m)  						\
-	do {								\
-		tl = (uint32_t *)nfsm_dissect(nd, NFSX_UNSIGNED);	\
-		if (!tl || ((s) = fxdr_unsigned(int32_t, *tl)) > (m)) { \
-			error = EBADRPC; 				\
-			goto nfsmout; 					\
-		}							\
-	} while (0)
-
-#define	NFSM_RNDUP(a)	(((a)+3)&(~0x3))
-
-#endif	/* _NFS_NFSM_SUBS_H_ */
diff --git a/include.new/fs/nfs/nfsport.h b/include.new/fs/nfs/nfsport.h
deleted file mode 100644
index af95576..0000000
--- a/include.new/fs/nfs/nfsport.h
+++ /dev/null
@@ -1,986 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/fs/nfs/nfsport.h 282933 2015-05-14 22:50:07Z rmacklem $
- */
-
-#ifndef _NFS_NFSPORT_H_
-#define	_NFS_NFSPORT_H_
-
-/*
- * In general, I'm not fond of #includes in .h files, but this seems
- * to be the cleanest way to handle #include files for the ports.
- */
-#ifdef _KERNEL
-#include <sys/unistd.h>
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/dirent.h>
-#include <sys/domain.h>
-#include <sys/fcntl.h>
-#include <sys/file.h>
-#include <sys/filedesc.h>
-#include <sys/jail.h>
-#include <sys/kernel.h>
-#include <sys/lockf.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/mount.h>
-#include <sys/namei.h>
-#include <sys/proc.h>
-#include <sys/protosw.h>
-#include <sys/reboot.h>
-#include <sys/resourcevar.h>
-#include <sys/signalvar.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/stat.h>
-#include <sys/syslog.h>
-#include <sys/sysproto.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/vnode.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/acl.h>
-#include <sys/module.h>
-#include <sys/sysent.h>
-#include <sys/syscall.h>
-#include <sys/priv.h>
-#include <sys/kthread.h>
-#include <sys/syscallsubr.h>
-#include <net/if.h>
-#include <net/radix.h>
-#include <net/route.h>
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
-#include <netinet/tcp_fsm.h>
-#include <netinet/tcp_seq.h>
-#include <netinet/tcp_timer.h>
-#include <netinet/tcp_var.h>
-#include <machine/in_cksum.h>
-#include <crypto/des/des.h>
-#include <sys/md5.h>
-#include <rpc/rpc.h>
-#include <rpc/rpcsec_gss.h>
-
-/*
- * For Darwin, these functions should be "static" when built in a kext.
- * (This is always defined as nil otherwise.)
- */
-#define	APPLESTATIC
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/extattr.h>
-#include <ufs/ufs/ufsmount.h>
-#include <vm/uma.h>
-#include <vm/vm.h>
-#include <vm/vm_object.h>
-#include <vm/vm_extern.h>
-#include <nfs/nfssvc.h>
-#include "opt_nfs.h"
-#include "opt_ufs.h"
-
-/*
- * These types must be defined before the nfs includes.
- */
-#define	NFSSOCKADDR_T	struct sockaddr *
-#define	NFSPROC_T	struct thread
-#define	NFSDEV_T	dev_t
-#define	NFSSVCARGS	nfssvc_args
-#define	NFSACL_T	struct acl
-
-/*
- * These should be defined as the types used for the corresponding VOP's
- * argument type.
- */
-#define	NFS_ACCESS_ARGS		struct vop_access_args
-#define	NFS_OPEN_ARGS		struct vop_open_args
-#define	NFS_GETATTR_ARGS	struct vop_getattr_args
-#define	NFS_LOOKUP_ARGS		struct vop_lookup_args
-#define	NFS_READDIR_ARGS	struct vop_readdir_args
-
-/*
- * Allocate mbufs. Must succeed and never set the mbuf ptr to NULL.
- */
-#define	NFSMGET(m)	do { 					\
-		MGET((m), M_WAITOK, MT_DATA); 			\
-		while ((m) == NULL ) { 				\
-			(void) nfs_catnap(PZERO, 0, "nfsmget");	\
-			MGET((m), M_WAITOK, MT_DATA); 		\
-		} 						\
-	} while (0)
-#define	NFSMGETHDR(m)	do { 					\
-		MGETHDR((m), M_WAITOK, MT_DATA);		\
-		while ((m) == NULL ) { 				\
-			(void) nfs_catnap(PZERO, 0, "nfsmget");	\
-			MGETHDR((m), M_WAITOK, MT_DATA); 	\
-		} 						\
-	} while (0)
-#define	NFSMCLGET(m, w)	do { 					\
-		MGET((m), M_WAITOK, MT_DATA); 			\
-		while ((m) == NULL ) { 				\
-			(void) nfs_catnap(PZERO, 0, "nfsmget");	\
-			MGET((m), M_WAITOK, MT_DATA); 		\
-		} 						\
-		MCLGET((m), (w));				\
-	} while (0)
-#define	NFSMCLGETHDR(m, w) do { 				\
-		MGETHDR((m), M_WAITOK, MT_DATA);		\
-		while ((m) == NULL ) { 				\
-			(void) nfs_catnap(PZERO, 0, "nfsmget");	\
-			MGETHDR((m), M_WAITOK, MT_DATA); 	\
-		} 						\
-	} while (0)
-#define	NFSMTOD	mtod
-
-/*
- * Client side constant for size of a lockowner name.
- */
-#define	NFSV4CL_LOCKNAMELEN	12
-
-/*
- * Type for a mutex lock.
- */
-#define	NFSMUTEX_T		struct mtx
-
-#endif	/* _KERNEL */
-
-/*
- * NFSv4 Operation numbers.
- */
-#define	NFSV4OP_ACCESS		3
-#define	NFSV4OP_CLOSE		4
-#define	NFSV4OP_COMMIT		5
-#define	NFSV4OP_CREATE		6
-#define	NFSV4OP_DELEGPURGE	7
-#define	NFSV4OP_DELEGRETURN	8
-#define	NFSV4OP_GETATTR		9
-#define	NFSV4OP_GETFH		10
-#define	NFSV4OP_LINK		11
-#define	NFSV4OP_LOCK		12
-#define	NFSV4OP_LOCKT		13
-#define	NFSV4OP_LOCKU		14
-#define	NFSV4OP_LOOKUP		15
-#define	NFSV4OP_LOOKUPP		16
-#define	NFSV4OP_NVERIFY		17
-#define	NFSV4OP_OPEN		18
-#define	NFSV4OP_OPENATTR	19
-#define	NFSV4OP_OPENCONFIRM	20
-#define	NFSV4OP_OPENDOWNGRADE	21
-#define	NFSV4OP_PUTFH		22
-#define	NFSV4OP_PUTPUBFH	23
-#define	NFSV4OP_PUTROOTFH	24
-#define	NFSV4OP_READ		25
-#define	NFSV4OP_READDIR		26
-#define	NFSV4OP_READLINK	27
-#define	NFSV4OP_REMOVE		28
-#define	NFSV4OP_RENAME		29
-#define	NFSV4OP_RENEW		30
-#define	NFSV4OP_RESTOREFH	31
-#define	NFSV4OP_SAVEFH		32
-#define	NFSV4OP_SECINFO		33
-#define	NFSV4OP_SETATTR		34
-#define	NFSV4OP_SETCLIENTID	35
-#define	NFSV4OP_SETCLIENTIDCFRM	36
-#define	NFSV4OP_VERIFY		37
-#define	NFSV4OP_WRITE		38
-#define	NFSV4OP_RELEASELCKOWN	39
-
-/*
- * Must be one greater than the last Operation#.
- */
-#define	NFSV4OP_NOPS		40
-
-/*
- * Additional Ops for NFSv4.1.
- */
-#define	NFSV4OP_BACKCHANNELCTL	40
-#define	NFSV4OP_BINDCONNTOSESS	41
-#define	NFSV4OP_EXCHANGEID	42
-#define	NFSV4OP_CREATESESSION	43
-#define	NFSV4OP_DESTROYSESSION	44
-#define	NFSV4OP_FREESTATEID	45
-#define	NFSV4OP_GETDIRDELEG	46
-#define	NFSV4OP_GETDEVINFO	47
-#define	NFSV4OP_GETDEVLIST	48
-#define	NFSV4OP_LAYOUTCOMMIT	49
-#define	NFSV4OP_LAYOUTGET	50
-#define	NFSV4OP_LAYOUTRETURN	51
-#define	NFSV4OP_SECINFONONAME	52
-#define	NFSV4OP_SEQUENCE	53
-#define	NFSV4OP_SETSSV		54
-#define	NFSV4OP_TESTSTATEID	55
-#define	NFSV4OP_WANTDELEG	56
-#define	NFSV4OP_DESTROYCLIENTID	57
-#define	NFSV4OP_RECLAIMCOMPL	58
-
-/*
- * Must be one more than last op#.
- */
-#define	NFSV41_NOPS		59
-
-/* Quirky case if the illegal op code */
-#define	NFSV4OP_OPILLEGAL	10044
-
-/*
- * Fake NFSV4OP_xxx used for nfsstat. Start at NFSV4OP_NOPS.
- */
-#define	NFSV4OP_SYMLINK		(NFSV4OP_NOPS)
-#define	NFSV4OP_MKDIR		(NFSV4OP_NOPS + 1)
-#define	NFSV4OP_RMDIR		(NFSV4OP_NOPS + 2)
-#define	NFSV4OP_READDIRPLUS	(NFSV4OP_NOPS + 3)
-#define	NFSV4OP_MKNOD		(NFSV4OP_NOPS + 4)
-#define	NFSV4OP_FSSTAT		(NFSV4OP_NOPS + 5)
-#define	NFSV4OP_FSINFO		(NFSV4OP_NOPS + 6)
-#define	NFSV4OP_PATHCONF	(NFSV4OP_NOPS + 7)
-#define	NFSV4OP_V3CREATE	(NFSV4OP_NOPS + 8)
-
-/*
- * This is the count of the fake operations listed above.
- */
-#define	NFSV4OP_FAKENOPS	9
-
-/*
- * and the Callback OPs
- */
-#define	NFSV4OP_CBGETATTR	3
-#define	NFSV4OP_CBRECALL	4
-
-/*
- * Must be one greater than the last Callback Operation#.
- */
-#define	NFSV4OP_CBNOPS		5
-
-/*
- * Additional Callback Ops for NFSv4.1 only. Not yet in nfsstats.
- */
-#define	NFSV4OP_CBLAYOUTRECALL	5
-#define	NFSV4OP_CBNOTIFY	6
-#define	NFSV4OP_CBPUSHDELEG	7
-#define	NFSV4OP_CBRECALLANY	8
-#define	NFSV4OP_CBRECALLOBJAVAIL 9
-#define	NFSV4OP_CBRECALLSLOT	10
-#define	NFSV4OP_CBSEQUENCE	11
-#define	NFSV4OP_CBWANTCANCELLED	12
-#define	NFSV4OP_CBNOTIFYLOCK	13
-#define	NFSV4OP_CBNOTIFYDEVID	14
-
-/*
- * The lower numbers -> 21 are used by NFSv2 and v3. These define higher
- * numbers used by NFSv4.
- * NFS_V3NPROCS is one greater than the last V3 op and NFS_NPROCS is
- * one greater than the last number.
- */
-#ifndef	NFS_V3NPROCS
-#define	NFS_V3NPROCS		22
-
-#define	NFSPROC_LOOKUPP		22
-#define	NFSPROC_SETCLIENTID	23
-#define	NFSPROC_SETCLIENTIDCFRM	24
-#define	NFSPROC_LOCK		25
-#define	NFSPROC_LOCKU		26
-#define	NFSPROC_OPEN		27
-#define	NFSPROC_CLOSE		28
-#define	NFSPROC_OPENCONFIRM	29
-#define	NFSPROC_LOCKT		30
-#define	NFSPROC_OPENDOWNGRADE	31
-#define	NFSPROC_RENEW		32
-#define	NFSPROC_PUTROOTFH	33
-#define	NFSPROC_RELEASELCKOWN	34
-#define	NFSPROC_DELEGRETURN	35
-#define	NFSPROC_RETDELEGREMOVE	36
-#define	NFSPROC_RETDELEGRENAME1	37
-#define	NFSPROC_RETDELEGRENAME2	38
-#define	NFSPROC_GETACL		39
-#define	NFSPROC_SETACL		40
-
-/*
- * Must be defined as one higher than the last Proc# above.
- */
-#define	NFSV4_NPROCS		41
-
-/* Additional procedures for NFSv4.1. */
-#define	NFSPROC_EXCHANGEID	41
-#define	NFSPROC_CREATESESSION	42
-#define	NFSPROC_DESTROYSESSION	43
-#define	NFSPROC_DESTROYCLIENT	44
-#define	NFSPROC_FREESTATEID	45
-#define	NFSPROC_LAYOUTGET	46
-#define	NFSPROC_GETDEVICEINFO	47
-#define	NFSPROC_LAYOUTCOMMIT	48
-#define	NFSPROC_LAYOUTRETURN	49
-#define	NFSPROC_RECLAIMCOMPL	50
-#define	NFSPROC_WRITEDS		51
-#define	NFSPROC_READDS		52
-#define	NFSPROC_COMMITDS	53
-
-/*
- * Must be defined as one higher than the last NFSv4.1 Proc# above.
- */
-#define	NFSV41_NPROCS		54
-
-#endif	/* NFS_V3NPROCS */
-
-/*
- * Stats structure
- */
-struct ext_nfsstats {
-	int	attrcache_hits;
-	int	attrcache_misses;
-	int	lookupcache_hits;
-	int	lookupcache_misses;
-	int	direofcache_hits;
-	int	direofcache_misses;
-	int	accesscache_hits;
-	int	accesscache_misses;
-	int	biocache_reads;
-	int	read_bios;
-	int	read_physios;
-	int	biocache_writes;
-	int	write_bios;
-	int	write_physios;
-	int	biocache_readlinks;
-	int	readlink_bios;
-	int	biocache_readdirs;
-	int	readdir_bios;
-	int	rpccnt[NFSV4_NPROCS];
-	int	rpcretries;
-	int	srvrpccnt[NFSV4OP_NOPS + NFSV4OP_FAKENOPS];
-	int	srvrpc_errs;
-	int	srv_errs;
-	int	rpcrequests;
-	int	rpctimeouts;
-	int	rpcunexpected;
-	int	rpcinvalid;
-	int	srvcache_inproghits;
-	int	srvcache_idemdonehits;
-	int	srvcache_nonidemdonehits;
-	int	srvcache_misses;
-	int	srvcache_tcppeak;
-	int	srvcache_size;
-	int	srvclients;
-	int	srvopenowners;
-	int	srvopens;
-	int	srvlockowners;
-	int	srvlocks;
-	int	srvdelegates;
-	int	cbrpccnt[NFSV4OP_CBNOPS];
-	int	clopenowners;
-	int	clopens;
-	int	cllockowners;
-	int	cllocks;
-	int	cldelegates;
-	int	cllocalopenowners;
-	int	cllocalopens;
-	int	cllocallockowners;
-	int	cllocallocks;
-};
-
-#ifdef _KERNEL
-/*
- * Define the ext_nfsstats as nfsstats for the kernel code.
- */
-#define nfsstats	ext_nfsstats
-
-/*
- * Define NFS_NPROCS as NFSV4_NPROCS for the experimental kernel code.
- */
-#ifndef	NFS_NPROCS
-#define	NFS_NPROCS		NFSV4_NPROCS
-#endif
-
-#include <fs/nfs/nfskpiport.h>
-#include <fs/nfs/nfsdport.h>
-#include <fs/nfs/rpcv2.h>
-#include <fs/nfs/nfsproto.h>
-#include <fs/nfs/nfs.h>
-#include <fs/nfs/nfsclstate.h>
-#include <fs/nfs/nfs_var.h>
-#include <fs/nfs/nfsm_subs.h>
-#include <fs/nfs/nfsrvcache.h>
-#include <fs/nfs/nfsrvstate.h>
-#include <fs/nfs/xdr_subs.h>
-#include <fs/nfs/nfscl.h>
-#include <nfsclient/nfsargs.h>
-#include <fs/nfsclient/nfsmount.h>
-
-/*
- * Just to keep nfs_var.h happy.
- */
-struct nfs_vattr {
-	int	junk;
-};
-
-struct nfsvattr {
-	struct vattr	na_vattr;
-	nfsattrbit_t	na_suppattr;
-	uint32_t	na_mntonfileno;
-	u_int64_t	na_filesid[2];
-};
-
-#define	na_type		na_vattr.va_type
-#define	na_mode		na_vattr.va_mode
-#define	na_nlink	na_vattr.va_nlink
-#define	na_uid		na_vattr.va_uid
-#define	na_gid		na_vattr.va_gid
-#define	na_fsid		na_vattr.va_fsid
-#define	na_fileid	na_vattr.va_fileid
-#define	na_size		na_vattr.va_size
-#define	na_blocksize	na_vattr.va_blocksize
-#define	na_atime	na_vattr.va_atime
-#define	na_mtime	na_vattr.va_mtime
-#define	na_ctime	na_vattr.va_ctime
-#define	na_gen		na_vattr.va_gen
-#define	na_flags	na_vattr.va_flags
-#define	na_rdev		na_vattr.va_rdev
-#define	na_bytes	na_vattr.va_bytes
-#define	na_filerev	na_vattr.va_filerev
-#define	na_vaflags	na_vattr.va_vaflags
-
-#include <fs/nfsclient/nfsnode.h>
-
-/*
- * This is the header structure used for the lists, etc. (It has the
- * above record in it.
- */
-struct nfsrv_stablefirst {
-	LIST_HEAD(, nfsrv_stable) nsf_head;	/* Head of nfsrv_stable list */
-	time_t		nsf_eograce;	/* Time grace period ends */
-	time_t		*nsf_bootvals;	/* Previous boottime values */
-	struct file	*nsf_fp;	/* File table pointer */
-	u_char		nsf_flags;	/* NFSNSF_ flags */
-	struct nfsf_rec	nsf_rec;	/* and above first record */
-};
-#define	nsf_lease	nsf_rec.lease
-#define	nsf_numboots	nsf_rec.numboots
-
-/* NFSNSF_xxx flags */
-#define	NFSNSF_UPDATEDONE	0x01
-#define	NFSNSF_GRACEOVER	0x02
-#define	NFSNSF_NEEDLOCK		0x04
-#define	NFSNSF_EXPIREDCLIENT	0x08
-#define	NFSNSF_NOOPENS		0x10
-#define	NFSNSF_OK		0x20
-
-/*
- * Maximum number of boot times allowed in record. Although there is
- * really no need for a fixed upper bound, this serves as a sanity check
- * for a corrupted file.
- */
-#define	NFSNSF_MAXNUMBOOTS	10000
-
-/*
- * This structure defines the other records in the file. The
- * nst_client array is actually the size of the client string name.
- */
-struct nfst_rec {
-	u_int16_t	len;
-	u_char		flag;
-	u_char		client[1];
-};
-/* and the values for flag */
-#define	NFSNST_NEWSTATE	0x1
-#define	NFSNST_REVOKE		0x2
-#define	NFSNST_GOTSTATE		0x4
-
-/*
- * This structure is linked onto nfsrv_stablefirst for the duration of
- * reclaim.
- */
-struct nfsrv_stable {
-	LIST_ENTRY(nfsrv_stable) nst_list;
-	struct nfsclient	*nst_clp;
-	struct nfst_rec		nst_rec;
-};
-#define	nst_timestamp	nst_rec.timestamp
-#define	nst_len		nst_rec.len
-#define	nst_flag	nst_rec.flag
-#define	nst_client	nst_rec.client
-
-/*
- * At some point the server will run out of kernel storage for
- * state structures. For FreeBSD5.2, this results in a panic
- * kmem_map is full. It happens at well over 1000000 opens plus
- * locks on a PIII-800 with 256Mbytes, so that is where I've set
- * the limit. If your server panics due to too many opens/locks,
- * decrease the size of NFSRV_V4STATELIMIT. If you find the server
- * returning NFS4ERR_RESOURCE a lot and have lots of memory, try
- * increasing it.
- */
-#define	NFSRV_V4STATELIMIT	500000	/* Max # of Opens + Locks */
-
-/*
- * The type required differs with BSDen (just the second arg).
- */
-void nfsrvd_rcv(struct socket *, void *, int);
-
-/*
- * Macros for handling socket addresses. (Hopefully this makes the code
- * more portable, since I've noticed some 'BSD don't have sockaddrs in
- * mbufs any more.)
- */
-#define	NFSSOCKADDR(a, t)	((t)(a))
-#define	NFSSOCKADDRALLOC(a) 					\
-    do {							\
-	MALLOC((a), struct sockaddr *, sizeof (struct sockaddr), \
-	    M_SONAME, M_WAITOK); 				\
-	NFSBZERO((a), sizeof (struct sockaddr)); 		\
-    } while (0)
-#define	NFSSOCKADDRSIZE(a, s)		((a)->sa_len = (s))
-#define	NFSSOCKADDRFREE(a) 					\
-	do { 							\
-		if (a) 						\
-			FREE((caddr_t)(a), M_SONAME); 		\
-	} while (0)
-
-/*
- * These should be defined as a process or thread structure, as required
- * for signal handling, etc.
- */
-#define	NFSNEWCRED(c)		(crdup(c))
-#define	NFSPROCCRED(p)		((p)->td_ucred)
-#define	NFSFREECRED(c)		(crfree(c))
-#define	NFSUIOPROC(u, p)	((u)->uio_td = NULL)
-#define	NFSPROCP(p)		((p)->td_proc)
-
-/*
- * Define these so that cn_hash and its length is ignored.
- */
-#define	NFSCNHASHZERO(c)
-#define	NFSCNHASH(c, v)
-#define	NCHNAMLEN	9999999
-
-/*
- * These macros are defined to initialize and set the timer routine.
- */
-#define	NFS_TIMERINIT \
-	newnfs_timer(NULL)
-
-/*
- * Handle SMP stuff:
- */
-#define	NFSSTATESPINLOCK	extern struct mtx nfs_state_mutex
-#define	NFSLOCKSTATE()		mtx_lock(&nfs_state_mutex)
-#define	NFSUNLOCKSTATE()	mtx_unlock(&nfs_state_mutex)
-#define	NFSSTATEMUTEXPTR	(&nfs_state_mutex)
-#define	NFSREQSPINLOCK		extern struct mtx nfs_req_mutex
-#define	NFSLOCKREQ()		mtx_lock(&nfs_req_mutex)
-#define	NFSUNLOCKREQ()		mtx_unlock(&nfs_req_mutex)
-#define	NFSSOCKMUTEX		extern struct mtx nfs_slock_mutex
-#define	NFSSOCKMUTEXPTR		(&nfs_slock_mutex)
-#define	NFSLOCKSOCK()		mtx_lock(&nfs_slock_mutex)
-#define	NFSUNLOCKSOCK()		mtx_unlock(&nfs_slock_mutex)
-#define	NFSNAMEIDMUTEX		extern struct mtx nfs_nameid_mutex
-#define	NFSLOCKNAMEID()		mtx_lock(&nfs_nameid_mutex)
-#define	NFSUNLOCKNAMEID()	mtx_unlock(&nfs_nameid_mutex)
-#define	NFSNAMEIDREQUIRED()	mtx_assert(&nfs_nameid_mutex, MA_OWNED)
-#define	NFSCLSTATEMUTEX		extern struct mtx nfs_clstate_mutex
-#define	NFSCLSTATEMUTEXPTR	(&nfs_clstate_mutex)
-#define	NFSLOCKCLSTATE()	mtx_lock(&nfs_clstate_mutex)
-#define	NFSUNLOCKCLSTATE()	mtx_unlock(&nfs_clstate_mutex)
-#define	NFSDLOCKMUTEX		extern struct mtx newnfsd_mtx
-#define	NFSDLOCKMUTEXPTR	(&newnfsd_mtx)
-#define	NFSD_LOCK()		mtx_lock(&newnfsd_mtx)
-#define	NFSD_UNLOCK()		mtx_unlock(&newnfsd_mtx)
-#define	NFSD_LOCK_ASSERT()	mtx_assert(&newnfsd_mtx, MA_OWNED)
-#define	NFSD_UNLOCK_ASSERT()	mtx_assert(&newnfsd_mtx, MA_NOTOWNED)
-#define	NFSV4ROOTLOCKMUTEX	extern struct mtx nfs_v4root_mutex
-#define	NFSV4ROOTLOCKMUTEXPTR	(&nfs_v4root_mutex)
-#define	NFSLOCKV4ROOTMUTEX()	mtx_lock(&nfs_v4root_mutex)
-#define	NFSUNLOCKV4ROOTMUTEX()	mtx_unlock(&nfs_v4root_mutex)
-#define	NFSLOCKNODE(n)		mtx_lock(&((n)->n_mtx))
-#define	NFSUNLOCKNODE(n)	mtx_unlock(&((n)->n_mtx))
-#define	NFSLOCKMNT(m)		mtx_lock(&((m)->nm_mtx))
-#define	NFSUNLOCKMNT(m)		mtx_unlock(&((m)->nm_mtx))
-#define	NFSLOCKREQUEST(r)	mtx_lock(&((r)->r_mtx))
-#define	NFSUNLOCKREQUEST(r)	mtx_unlock(&((r)->r_mtx))
-#define	NFSPROCLISTLOCK()	sx_slock(&allproc_lock)
-#define	NFSPROCLISTUNLOCK()	sx_sunlock(&allproc_lock)
-#define	NFSLOCKSOCKREQ(r)	mtx_lock(&((r)->nr_mtx))
-#define	NFSUNLOCKSOCKREQ(r)	mtx_unlock(&((r)->nr_mtx))
-#define	NFSLOCKDS(d)		mtx_lock(&((d)->nfsclds_mtx))
-#define	NFSUNLOCKDS(d)		mtx_unlock(&((d)->nfsclds_mtx))
-#define	NFSSESSIONMUTEXPTR(s)	(&((s)->mtx))
-#define	NFSLOCKSESSION(s)	mtx_lock(&((s)->mtx))
-#define	NFSUNLOCKSESSION(s)	mtx_unlock(&((s)->mtx))
-
-/*
- * Use these macros to initialize/free a mutex.
- */
-#define	NFSINITSOCKMUTEX(m)	mtx_init((m), "nfssock", NULL, MTX_DEF)
-#define	NFSFREEMUTEX(m)		mtx_destroy((m))
-
-int nfsmsleep(void *, void *, int, const char *, struct timespec *);
-
-/*
- * And weird vm stuff in the nfs server.
- */
-#define	PDIRUNLOCK	0x0
-#define	MAX_COMMIT_COUNT	(1024 * 1024)
-
-/*
- * Define these to handle the type of va_rdev.
- */
-#define	NFSMAKEDEV(m, n)	makedev((m), (n))
-#define	NFSMAJOR(d)		major(d)
-#define	NFSMINOR(d)		minor(d)
-
-/*
- * Define this to be the macro that returns the minimum size required
- * for a directory entry.
- */
-#define	DIRENT_SIZE(dp)		GENERIC_DIRSIZ(dp)
-
-/*
- * The vnode tag for nfsv4root.
- */
-#define	VT_NFSV4ROOT		"nfsv4root"
-
-/*
- * Define whatever it takes to do a vn_rdwr().
- */
-#define	NFSD_RDWR(r, v, b, l, o, s, i, c, a, p) \
-	vn_rdwr((r), (v), (b), (l), (o), (s), (i), (c), NULL, (a), (p))
-
-/*
- * Macros for handling memory for different BSDen.
- * NFSBCOPY(src, dst, len) - copies len bytes, non-overlapping
- * NFSOVBCOPY(src, dst, len) - ditto, but data areas might overlap
- * NFSBCMP(cp1, cp2, len) - compare len bytes, return 0 if same
- * NFSBZERO(cp, len) - set len bytes to 0x0
- */
-#define	NFSBCOPY(s, d, l)	bcopy((s), (d), (l))
-#define	NFSOVBCOPY(s, d, l)	ovbcopy((s), (d), (l))
-#define	NFSBCMP(s, d, l)	bcmp((s), (d), (l))
-#define	NFSBZERO(s, l)		bzero((s), (l))
-
-/*
- * Some queue.h files don't have these dfined in them.
- */
-#define	LIST_END(head)		NULL
-#define	SLIST_END(head)		NULL
-#define	TAILQ_END(head)		NULL
-
-/*
- * This must be defined to be a global variable that increments once
- * per second, but never stops or goes backwards, even when a "date"
- * command changes the TOD clock. It is used for delta times for
- * leases, etc.
- */
-#define	NFSD_MONOSEC		time_uptime
-
-/*
- * Declare the malloc types.
- */
-MALLOC_DECLARE(M_NEWNFSRVCACHE);
-MALLOC_DECLARE(M_NEWNFSDCLIENT);
-MALLOC_DECLARE(M_NEWNFSDSTATE);
-MALLOC_DECLARE(M_NEWNFSDLOCK);
-MALLOC_DECLARE(M_NEWNFSDLOCKFILE);
-MALLOC_DECLARE(M_NEWNFSSTRING);
-MALLOC_DECLARE(M_NEWNFSUSERGROUP);
-MALLOC_DECLARE(M_NEWNFSDREQ);
-MALLOC_DECLARE(M_NEWNFSFH);
-MALLOC_DECLARE(M_NEWNFSCLOWNER);
-MALLOC_DECLARE(M_NEWNFSCLOPEN);
-MALLOC_DECLARE(M_NEWNFSCLDELEG);
-MALLOC_DECLARE(M_NEWNFSCLCLIENT);
-MALLOC_DECLARE(M_NEWNFSCLLOCKOWNER);
-MALLOC_DECLARE(M_NEWNFSCLLOCK);
-MALLOC_DECLARE(M_NEWNFSDIROFF);
-MALLOC_DECLARE(M_NEWNFSV4NODE);
-MALLOC_DECLARE(M_NEWNFSDIRECTIO);
-MALLOC_DECLARE(M_NEWNFSMNT);
-MALLOC_DECLARE(M_NEWNFSDROLLBACK);
-MALLOC_DECLARE(M_NEWNFSLAYOUT);
-MALLOC_DECLARE(M_NEWNFSFLAYOUT);
-MALLOC_DECLARE(M_NEWNFSDEVINFO);
-MALLOC_DECLARE(M_NEWNFSSOCKREQ);
-MALLOC_DECLARE(M_NEWNFSCLDS);
-MALLOC_DECLARE(M_NEWNFSLAYRECALL);
-MALLOC_DECLARE(M_NEWNFSDSESSION);
-#define	M_NFSRVCACHE	M_NEWNFSRVCACHE
-#define	M_NFSDCLIENT	M_NEWNFSDCLIENT
-#define	M_NFSDSTATE	M_NEWNFSDSTATE
-#define	M_NFSDLOCK	M_NEWNFSDLOCK
-#define	M_NFSDLOCKFILE	M_NEWNFSDLOCKFILE
-#define	M_NFSSTRING	M_NEWNFSSTRING
-#define	M_NFSUSERGROUP	M_NEWNFSUSERGROUP
-#define	M_NFSDREQ	M_NEWNFSDREQ
-#define	M_NFSFH		M_NEWNFSFH
-#define	M_NFSCLOWNER	M_NEWNFSCLOWNER
-#define	M_NFSCLOPEN	M_NEWNFSCLOPEN
-#define	M_NFSCLDELEG	M_NEWNFSCLDELEG
-#define	M_NFSCLCLIENT	M_NEWNFSCLCLIENT
-#define	M_NFSCLLOCKOWNER M_NEWNFSCLLOCKOWNER
-#define	M_NFSCLLOCK	M_NEWNFSCLLOCK
-#define	M_NFSDIROFF	M_NEWNFSDIROFF
-#define	M_NFSV4NODE	M_NEWNFSV4NODE
-#define	M_NFSDIRECTIO	M_NEWNFSDIRECTIO
-#define	M_NFSDROLLBACK	M_NEWNFSDROLLBACK
-#define	M_NFSLAYOUT	M_NEWNFSLAYOUT
-#define	M_NFSFLAYOUT	M_NEWNFSFLAYOUT
-#define	M_NFSDEVINFO	M_NEWNFSDEVINFO
-#define	M_NFSSOCKREQ	M_NEWNFSSOCKREQ
-#define	M_NFSCLDS	M_NEWNFSCLDS
-#define	M_NFSLAYRECALL	M_NEWNFSLAYRECALL
-#define	M_NFSDSESSION	M_NEWNFSDSESSION
-
-#define	NFSINT_SIGMASK(set) 						\
-	(SIGISMEMBER(set, SIGINT) || SIGISMEMBER(set, SIGTERM) ||	\
-	 SIGISMEMBER(set, SIGHUP) || SIGISMEMBER(set, SIGKILL) ||	\
-	 SIGISMEMBER(set, SIGQUIT))
-
-/*
- * Convert a quota block count to byte count.
- */
-#define	NFSQUOTABLKTOBYTE(q, b)	(q) *= (b)
-
-/*
- * Define this as the largest file size supported. (It should probably
- * be available via a VFS_xxx Op, but it isn't.
- */
-#define	NFSRV_MAXFILESIZE	((u_int64_t)0x800000000000)
-
-/*
- * Set this macro to index() or strchr(), whichever is supported.
- */
-#define	STRCHR(s, c)		strchr((s), (c))
-
-/*
- * Set the n_time in the client write rpc, as required.
- */
-#define	NFSWRITERPC_SETTIME(w, n, v4)					\
-	do {								\
-		if (w) {						\
-			(n)->n_mtime = (n)->n_vattr.na_vattr.va_mtime; \
-			if (v4)						\
-			    (n)->n_change = (n)->n_vattr.na_vattr.va_filerev; \
-		}							\
-	} while (0)
-
-/*
- * Fake value, just to make the client work.
- */
-#define	NFS_LATTR_NOSHRINK	1
-
-/*
- * Prototypes for functions where the arguments vary for different ports.
- */
-int nfscl_loadattrcache(struct vnode **, struct nfsvattr *, void *, void *,
-    int, int);
-int newnfs_realign(struct mbuf **, int);
-
-/*
- * If the port runs on an SMP box that can enforce Atomic ops with low
- * overheads, define these as atomic increments/decrements. If not,
- * don't worry about it, since these are used for stats that can be
- * "out by one" without disastrous consequences.
- */
-#define	NFSINCRGLOBAL(a)	((a)++)
-
-/*
- * Assorted funky stuff to make things work under Darwin8.
- */
-/*
- * These macros checks for a field in vattr being set.
- */
-#define	NFSATTRISSET(t, v, a)	((v)->a != (t)VNOVAL)
-#define	NFSATTRISSETTIME(v, a)	((v)->a.tv_sec != VNOVAL)
-
-/*
- * Manipulate mount flags.
- */
-#define	NFSSTA_HASWRITEVERF	0x00040000  /* Has write verifier */
-#define	NFSSTA_GOTFSINFO	0x00100000  /* Got the fsinfo */
-#define	NFSSTA_NOLAYOUTCOMMIT	0x04000000  /* Don't do LayoutCommit */
-#define	NFSSTA_SESSPERSIST	0x08000000  /* Has a persistent session */
-#define	NFSSTA_TIMEO		0x10000000  /* Experiencing a timeout */
-#define	NFSSTA_LOCKTIMEO	0x20000000  /* Experiencing a lockd timeout */
-#define	NFSSTA_HASSETFSID	0x40000000  /* Has set the fsid */
-#define	NFSSTA_PNFS		0x80000000  /* pNFS is enabled */
-
-#define	NFSHASNFSV3(n)		((n)->nm_flag & NFSMNT_NFSV3)
-#define	NFSHASNFSV4(n)		((n)->nm_flag & NFSMNT_NFSV4)
-#define	NFSHASNFSV4N(n)		((n)->nm_minorvers > 0)
-#define	NFSHASNFSV3OR4(n)	((n)->nm_flag & (NFSMNT_NFSV3 | NFSMNT_NFSV4))
-#define	NFSHASGOTFSINFO(n)	((n)->nm_state & NFSSTA_GOTFSINFO)
-#define	NFSHASHASSETFSID(n)	((n)->nm_state & NFSSTA_HASSETFSID)
-#define	NFSHASSTRICT3530(n)	((n)->nm_flag & NFSMNT_STRICT3530)
-#define	NFSHASWRITEVERF(n)	((n)->nm_state & NFSSTA_HASWRITEVERF)
-#define	NFSHASINT(n)		((n)->nm_flag & NFSMNT_INT)
-#define	NFSHASSOFT(n)		((n)->nm_flag & NFSMNT_SOFT)
-#define	NFSHASINTORSOFT(n)	((n)->nm_flag & (NFSMNT_INT | NFSMNT_SOFT))
-#define	NFSHASDUMBTIMR(n)	((n)->nm_flag & NFSMNT_DUMBTIMR)
-#define	NFSHASNOCONN(n)		((n)->nm_flag & NFSMNT_MNTD)
-#define	NFSHASKERB(n)		((n)->nm_flag & NFSMNT_KERB)
-#define	NFSHASALLGSSNAME(n)	((n)->nm_flag & NFSMNT_ALLGSSNAME)
-#define	NFSHASINTEGRITY(n)	((n)->nm_flag & NFSMNT_INTEGRITY)
-#define	NFSHASPRIVACY(n)	((n)->nm_flag & NFSMNT_PRIVACY)
-#define	NFSSETWRITEVERF(n)	((n)->nm_state |= NFSSTA_HASWRITEVERF)
-#define	NFSSETHASSETFSID(n)	((n)->nm_state |= NFSSTA_HASSETFSID)
-#define	NFSHASPNFSOPT(n)	((n)->nm_flag & NFSMNT_PNFS)
-#define	NFSHASNOLAYOUTCOMMIT(n)	((n)->nm_state & NFSSTA_NOLAYOUTCOMMIT)
-#define	NFSHASSESSPERSIST(n)	((n)->nm_state & NFSSTA_SESSPERSIST)
-#define	NFSHASPNFS(n)		((n)->nm_state & NFSSTA_PNFS)
-
-/*
- * Gets the stats field out of the mount structure.
- */
-#define	vfs_statfs(m)	(&((m)->mnt_stat))
-
-/*
- * Set boottime.
- */
-#define	NFSSETBOOTTIME(b)	((b) = boottime)
-
-/*
- * The size of directory blocks in the buffer cache.
- * MUST BE in the range of PAGE_SIZE <= NFS_DIRBLKSIZ <= MAXBSIZE!!
- */
-#define	NFS_DIRBLKSIZ	(16 * DIRBLKSIZ) /* Must be a multiple of DIRBLKSIZ */
-
-/*
- * Define these macros to access mnt_flag fields.
- */
-#define	NFSMNT_RDONLY(m)	((m)->mnt_flag & MNT_RDONLY)
-#endif	/* _KERNEL */
-
-/*
- * Define a structure similar to ufs_args for use in exporting the V4 root.
- */
-struct nfsex_args {
-	char	*fspec;
-	struct export_args	export;
-};
-
-/*
- * These export flags should be defined, but there are no bits left.
- * Maybe a separate mnt_exflag field could be added or the mnt_flag
- * field increased to 64 bits?
- */
-#ifndef	MNT_EXSTRICTACCESS
-#define	MNT_EXSTRICTACCESS	0x0
-#endif
-#ifndef MNT_EXV4ONLY
-#define	MNT_EXV4ONLY		0x0
-#endif
-
-#ifdef _KERNEL
-/*
- * Define this to invalidate the attribute cache for the nfs node.
- */
-#define	NFSINVALATTRCACHE(n)	((n)->n_attrstamp = 0)
-
-/* Used for FreeBSD only */
-void nfsd_mntinit(void);
-
-/*
- * Define these for vnode lock/unlock ops.
- *
- * These are good abstractions to macro out, so that they can be added to
- * later, for debugging or stats, etc.
- */
-#define	NFSVOPLOCK(v, f)	vn_lock((v), (f))
-#define	NFSVOPUNLOCK(v, f)	VOP_UNLOCK((v), (f))
-#define	NFSVOPISLOCKED(v)	VOP_ISLOCKED((v))
-
-/*
- * Define ncl_hash().
- */
-#define	ncl_hash(f, l)	(fnv_32_buf((f), (l), FNV1_32_INIT))
-
-int newnfs_iosize(struct nfsmount *);
-
-#ifdef NFS_DEBUG
-
-extern int nfs_debug;
-#define	NFS_DEBUG_ASYNCIO	1 /* asynchronous i/o */
-#define	NFS_DEBUG_WG		2 /* server write gathering */
-#define	NFS_DEBUG_RC		4 /* server request caching */
-
-#define	NFS_DPF(cat, args)					\
-	do {							\
-		if (nfs_debug & NFS_DEBUG_##cat) printf args;	\
-	} while (0)
-
-#else
-
-#define	NFS_DPF(cat, args)
-
-#endif
-
-int newnfs_vncmpf(struct vnode *, void *);
-
-#ifndef NFS_MINDIRATTRTIMO
-#define	NFS_MINDIRATTRTIMO 3		/* VDIR attrib cache timeout in sec */
-#endif
-#ifndef NFS_MAXDIRATTRTIMO
-#define	NFS_MAXDIRATTRTIMO 60
-#endif
-
-/*
- * Nfs outstanding request list element
- */
-struct nfsreq {
-	TAILQ_ENTRY(nfsreq) r_chain;
-	uint32_t	r_flags;	/* flags on request, see below */
-	struct nfsmount *r_nmp;		/* Client mnt ptr */
-	struct mtx	r_mtx;		/* Mutex lock for this structure */
-};
-
-#ifndef NFS_MAXBSIZE
-#define	NFS_MAXBSIZE	MAXBCACHEBUF
-#endif
-
-/*
- * This macro checks to see if issuing of delegations is allowed for this
- * vnode.
- */
-#ifdef VV_DISABLEDELEG
-#define	NFSVNO_DELEGOK(v)						\
-	((v) == NULL || ((v)->v_vflag & VV_DISABLEDELEG) == 0)
-#else
-#define	NFSVNO_DELEGOK(v)	(1)
-#endif
-
-#endif	/* _KERNEL */
-
-#endif	/* _NFS_NFSPORT_H */
diff --git a/include.new/fs/nfs/nfsproto.h b/include.new/fs/nfs/nfsproto.h
deleted file mode 100644
index 826d0b3..0000000
--- a/include.new/fs/nfs/nfsproto.h
+++ /dev/null
@@ -1,1342 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/fs/nfs/nfsproto.h 282271 2015-04-30 12:44:20Z rmacklem $
- */
-
-#ifndef _NFS_NFSPROTO_H_
-#define	_NFS_NFSPROTO_H_
-
-/*
- * nfs definitions as per the Version 2, 3 and 4 specs
- */
-
-/*
- * Constants as defined in the NFS Version 2, 3 and 4 specs.
- * "NFS: Network File System Protocol Specification" RFC1094
- * and in the "NFS: Network File System Version 3 Protocol
- * Specification"
- */
-
-#define	NFS_PORT	2049
-#define	NFS_PROG	100003
-#define	NFS_CALLBCKPROG	0x40000000	/* V4 only */
-#define	NFS_VER2	2
-#define	NFS_VER3	3
-#define	NFS_VER4	4
-#define	NFS_V2MAXDATA	8192
-#define	NFS_MAXDGRAMDATA 16384
-#define	NFS_MAXPATHLEN	1024
-#define	NFS_MAXNAMLEN	255
-#define	NFS_MAXPKTHDR	404
-#define	NFS_MAXPACKET	(NFS_SRVMAXIO + 2048)
-#define	NFS_MINPACKET	20
-#define	NFS_FABLKSIZE	512	/* Size in bytes of a block wrt fa_blocks */
-#define	NFSV4_MINORVERSION	0	/* V4 Minor version */
-#define	NFSV41_MINORVERSION	1	/* V4 Minor version */
-#define	NFSV4_CBVERS		1	/* V4 CB Version */
-#define	NFSV41_CBVERS		4	/* V4.1 CB Version */
-#define	NFSV4_SMALLSTR	50		/* Strings small enough for stack */
-
-/*
- * This value isn't a fixed value in the RFCs.
- * It is the maximum data size supported by NFSv3 or NFSv4 over TCP for
- * the server.  It should be set to the I/O size preferred by ZFS or
- * MAXBSIZE, whichever is greater.
- * ZFS currently prefers 128K.
- * It used to be called NFS_MAXDATA, but has been renamed to clarify that
- * it refers to server side only and doesn't conflict with the NFS_MAXDATA
- * defined in rpcsvc/nfs_prot.h for userland.
- */
-#define	NFS_SRVMAXIO	(128 * 1024)
-
-/* Stat numbers for rpc returns (version 2, 3 and 4) */
-/*
- * These numbers are hard-wired in the RFCs, so they can't be changed.
- * The code currently assumes that the ones < 10000 are the same as
- * sys/errno.h and that sys/errno.h will never go as high as 10000.
- * If the value in sys/errno.h of any entry listed below is changed,
- * the NFS code must be modified to do the mapping between them.
- * (You can ignore NFSERR_WFLUSH, since it is never actually used.)
- */
-#define	NFSERR_OK		0
-#define	NFSERR_PERM		1
-#define	NFSERR_NOENT		2
-#define	NFSERR_IO		5
-#define	NFSERR_NXIO		6
-#define	NFSERR_ACCES		13
-#define	NFSERR_EXIST		17
-#define	NFSERR_XDEV		18	/* Version 3, 4 only */
-#define	NFSERR_NODEV		19
-#define	NFSERR_NOTDIR		20
-#define	NFSERR_ISDIR		21
-#define	NFSERR_INVAL		22	/* Version 3, 4 only */
-#define	NFSERR_FBIG		27
-#define	NFSERR_NOSPC		28
-#define	NFSERR_ROFS		30
-#define	NFSERR_MLINK		31	/* Version 3, 4 only */
-#define	NFSERR_NAMETOL		63
-#define	NFSERR_NOTEMPTY		66
-#define	NFSERR_DQUOT		69
-#define	NFSERR_STALE		70
-#define	NFSERR_REMOTE		71	/* Version 3 only */
-#define	NFSERR_WFLUSH		99	/* Version 2 only */
-#define	NFSERR_BADHANDLE	10001	/* These are Version 3, 4 only */
-#define	NFSERR_NOT_SYNC		10002	/* Version 3 Only */
-#define	NFSERR_BAD_COOKIE	10003
-#define	NFSERR_NOTSUPP		10004
-#define	NFSERR_TOOSMALL		10005
-#define	NFSERR_SERVERFAULT	10006
-#define	NFSERR_BADTYPE		10007
-#define	NFSERR_DELAY		10008	/* Called NFSERR_JUKEBOX for V3 */
-#define	NFSERR_SAME		10009	/* These are Version 4 only */
-#define	NFSERR_DENIED		10010
-#define	NFSERR_EXPIRED		10011
-#define	NFSERR_LOCKED		10012
-#define	NFSERR_GRACE		10013
-#define	NFSERR_FHEXPIRED	10014
-#define	NFSERR_SHAREDENIED	10015
-#define	NFSERR_WRONGSEC		10016
-#define	NFSERR_CLIDINUSE	10017
-#define	NFSERR_RESOURCE		10018
-#define	NFSERR_MOVED		10019
-#define	NFSERR_NOFILEHANDLE	10020
-#define	NFSERR_MINORVERMISMATCH	10021
-#define	NFSERR_STALECLIENTID	10022
-#define	NFSERR_STALESTATEID	10023
-#define	NFSERR_OLDSTATEID	10024
-#define	NFSERR_BADSTATEID	10025
-#define	NFSERR_BADSEQID		10026
-#define	NFSERR_NOTSAME		10027
-#define	NFSERR_LOCKRANGE	10028
-#define	NFSERR_SYMLINK		10029
-#define	NFSERR_RESTOREFH	10030
-#define	NFSERR_LEASEMOVED	10031
-#define	NFSERR_ATTRNOTSUPP	10032
-#define	NFSERR_NOGRACE		10033
-#define	NFSERR_RECLAIMBAD	10034
-#define	NFSERR_RECLAIMCONFLICT	10035
-#define	NFSERR_BADXDR		10036
-#define	NFSERR_LOCKSHELD	10037
-#define	NFSERR_OPENMODE		10038
-#define	NFSERR_BADOWNER		10039
-#define	NFSERR_BADCHAR		10040
-#define	NFSERR_BADNAME		10041
-#define	NFSERR_BADRANGE		10042
-#define	NFSERR_LOCKNOTSUPP	10043
-#define	NFSERR_OPILLEGAL	10044
-#define	NFSERR_DEADLOCK		10045
-#define	NFSERR_FILEOPEN		10046
-#define	NFSERR_ADMINREVOKED	10047
-#define	NFSERR_CBPATHDOWN	10048
-
-/* NFSv4.1 specific errors. */
-#define	NFSERR_BADIOMODE	10049
-#define	NFSERR_BADLAYOUT	10050
-#define	NFSERR_BADSESSIONDIGEST	10051
-#define	NFSERR_BADSESSION	10052
-#define	NFSERR_BADSLOT		10053
-#define	NFSERR_COMPLETEALREADY	10054
-#define	NFSERR_NOTBNDTOSESS	10055
-#define	NFSERR_DELEGALREADYWANT	10056
-#define	NFSERR_BACKCHANBUSY	10057
-#define	NFSERR_LAYOUTTRYLATER	10058
-#define	NFSERR_LAYOUTUNAVAIL	10059
-#define	NFSERR_NOMATCHLAYOUT	10060
-#define	NFSERR_RECALLCONFLICT	10061
-#define	NFSERR_UNKNLAYOUTTYPE	10062
-#define	NFSERR_SEQMISORDERED	10063
-#define	NFSERR_SEQUENCEPOS	10064
-#define	NFSERR_REQTOOBIG	10065
-#define	NFSERR_REPTOOBIG	10066
-#define	NFSERR_REPTOOBIGTOCACHE	10067
-#define	NFSERR_RETRYUNCACHEDREP	10068
-#define	NFSERR_UNSAFECOMPOUND	10069
-#define	NFSERR_TOOMANYOPS	10070
-#define	NFSERR_OPNOTINSESS	10071
-#define	NFSERR_HASHALGUNSUPP	10072
-#define	NFSERR_CLIENTIDBUSY	10074
-#define	NFSERR_PNFSIOHOLE	10075
-#define	NFSERR_SEQFALSERETRY	10076
-#define	NFSERR_BADHIGHSLOT	10077
-#define	NFSERR_DEADSESSION	10078
-#define	NFSERR_ENCRALGUNSUPP	10079
-#define	NFSERR_PNFSNOLAYOUT	10080
-#define	NFSERR_NOTONLYOP	10081
-#define	NFSERR_WRONGCRED	10082
-#define	NFSERR_WRONGTYPE	10083
-#define	NFSERR_DIRDELEGUNAVAIL	10084
-#define	NFSERR_REJECTDELEG	10085
-#define	NFSERR_RETURNCONFLICT	10086
-#define	NFSERR_DELEGREVOKED	10087
-
-#define	NFSERR_STALEWRITEVERF	30001	/* Fake return for nfs_commit() */
-#define	NFSERR_DONTREPLY	30003	/* Don't process request */
-#define	NFSERR_RETVOID		30004	/* Return void, not error */
-#define	NFSERR_REPLYFROMCACHE	30005	/* Reply from recent request cache */
-#define	NFSERR_STALEDONTRECOVER	30006	/* Don't initiate recovery */
-
-#define	NFSERR_RPCERR		0x40000000 /* Mark an RPC layer error */
-#define	NFSERR_AUTHERR		0x80000000 /* Mark an authentication error */
-
-#define	NFSERR_RPCMISMATCH	(NFSERR_RPCERR | RPC_MISMATCH)
-#define	NFSERR_PROGUNAVAIL	(NFSERR_RPCERR | RPC_PROGUNAVAIL)
-#define	NFSERR_PROGMISMATCH	(NFSERR_RPCERR | RPC_PROGMISMATCH)
-#define	NFSERR_PROGNOTV4	(NFSERR_RPCERR | 0xffff)
-#define	NFSERR_PROCUNAVAIL	(NFSERR_RPCERR | RPC_PROCUNAVAIL)
-#define	NFSERR_GARBAGE		(NFSERR_RPCERR | RPC_GARBAGE)
-
-/* Sizes in bytes of various nfs rpc components */
-#define	NFSX_UNSIGNED	4
-#define	NFSX_HYPER	(2 * NFSX_UNSIGNED)
-
-/* specific to NFS Version 2 */
-#define	NFSX_V2FH	32
-#define	NFSX_V2FATTR	68
-#define	NFSX_V2SATTR	32
-#define	NFSX_V2COOKIE	4
-#define	NFSX_V2STATFS	20
-
-/* specific to NFS Version 3 */
-#define	NFSX_V3FHMAX		64	/* max. allowed by protocol */
-#define	NFSX_V3FATTR		84
-#define	NFSX_V3SATTR		60	/* max. all fields filled in */
-#define	NFSX_V3SRVSATTR		(sizeof (struct nfsv3_sattr))
-#define	NFSX_V3POSTOPATTR	(NFSX_V3FATTR + NFSX_UNSIGNED)
-#define	NFSX_V3WCCDATA		(NFSX_V3POSTOPATTR + 8 * NFSX_UNSIGNED)
-#define	NFSX_V3STATFS		52
-#define	NFSX_V3FSINFO		48
-#define	NFSX_V3PATHCONF		24
-
-/* specific to NFS Version 4 */
-#define	NFSX_V4FHMAX		128
-#define	NFSX_V4FSID		(2 * NFSX_HYPER)
-#define	NFSX_V4SPECDATA		(2 * NFSX_UNSIGNED)
-#define	NFSX_V4TIME		(NFSX_HYPER + NFSX_UNSIGNED)
-#define	NFSX_V4SETTIME		(NFSX_UNSIGNED + NFSX_V4TIME)
-#define	NFSX_V4SESSIONID	16
-#define	NFSX_V4DEVICEID		16
-
-/* sizes common to multiple NFS versions */
-#define	NFSX_FHMAX		(NFSX_V4FHMAX)
-#define	NFSX_MYFH		(sizeof (fhandle_t)) /* size this server uses */
-#define	NFSX_VERF 		8
-#define	NFSX_STATEIDOTHER	12
-#define	NFSX_STATEID		(NFSX_UNSIGNED + NFSX_STATEIDOTHER)
-#define	NFSX_GSSH		12
-
-/* variants for multiple versions */
-#define	NFSX_STATFS(v3)		((v3) ? NFSX_V3STATFS : NFSX_V2STATFS)
-
-/* nfs rpc procedure numbers (before version mapping) */
-#define	NFSPROC_NULL		0
-#define	NFSPROC_GETATTR		1
-#define	NFSPROC_SETATTR		2
-#define	NFSPROC_LOOKUP		3
-#define	NFSPROC_ACCESS		4
-#define	NFSPROC_READLINK	5
-#define	NFSPROC_READ		6
-#define	NFSPROC_WRITE		7
-#define	NFSPROC_CREATE		8
-#define	NFSPROC_MKDIR		9
-#define	NFSPROC_SYMLINK		10
-#define	NFSPROC_MKNOD		11
-#define	NFSPROC_REMOVE		12
-#define	NFSPROC_RMDIR		13
-#define	NFSPROC_RENAME		14
-#define	NFSPROC_LINK		15
-#define	NFSPROC_READDIR		16
-#define	NFSPROC_READDIRPLUS	17
-#define	NFSPROC_FSSTAT		18
-#define	NFSPROC_FSINFO		19
-#define	NFSPROC_PATHCONF	20
-#define	NFSPROC_COMMIT		21
-
-/*
- * The lower numbers -> 21 are used by NFSv2 and v3. These define higher
- * numbers used by NFSv4.
- * NFS_V3NPROCS is one greater than the last V3 op and NFS_NPROCS is
- * one greater than the last number.
- */
-#ifndef	NFS_V3NPROCS
-#define	NFS_V3NPROCS		22
-
-#define	NFSPROC_LOOKUPP		22
-#define	NFSPROC_SETCLIENTID	23
-#define	NFSPROC_SETCLIENTIDCFRM	24
-#define	NFSPROC_LOCK		25
-#define	NFSPROC_LOCKU		26
-#define	NFSPROC_OPEN		27
-#define	NFSPROC_CLOSE		28
-#define	NFSPROC_OPENCONFIRM	29
-#define	NFSPROC_LOCKT		30
-#define	NFSPROC_OPENDOWNGRADE	31
-#define	NFSPROC_RENEW		32
-#define	NFSPROC_PUTROOTFH	33
-#define	NFSPROC_RELEASELCKOWN	34
-#define	NFSPROC_DELEGRETURN	35
-#define	NFSPROC_RETDELEGREMOVE	36
-#define	NFSPROC_RETDELEGRENAME1	37
-#define	NFSPROC_RETDELEGRENAME2	38
-#define	NFSPROC_GETACL		39
-#define	NFSPROC_SETACL		40
-
-/*
- * Must be defined as one higher than the last Proc# above.
- */
-#define	NFSV4_NPROCS		41
-
-/* Additional procedures for NFSv4.1. */
-#define	NFSPROC_EXCHANGEID	41
-#define	NFSPROC_CREATESESSION	42
-#define	NFSPROC_DESTROYSESSION	43
-#define	NFSPROC_DESTROYCLIENT	44
-#define	NFSPROC_FREESTATEID	45
-#define	NFSPROC_LAYOUTGET	46
-#define	NFSPROC_GETDEVICEINFO	47
-#define	NFSPROC_LAYOUTCOMMIT	48
-#define	NFSPROC_LAYOUTRETURN	49
-#define	NFSPROC_RECLAIMCOMPL	50
-#define	NFSPROC_WRITEDS		51
-#define	NFSPROC_READDS		52
-#define	NFSPROC_COMMITDS	53
-
-/*
- * Must be defined as one higher than the last NFSv4.1 Proc# above.
- */
-#define	NFSV41_NPROCS		54
-
-#endif	/* NFS_V3NPROCS */
-
-/*
- * Define NFS_NPROCS as NFSV4_NPROCS for the experimental kernel code.
- */
-#ifndef	NFS_NPROCS
-#define	NFS_NPROCS		NFSV4_NPROCS
-#endif
-
-/*
- * NFSPROC_NOOP is a fake op# that can't be the same as any V2/3/4 Procedure
- * or Operation#. Since the NFS V4 Op #s go higher, use NFSV41_NOPS, which
- * is one greater than the highest Op#.
- */
-#define	NFSPROC_NOOP		NFSV41_NOPS
-
-/* Actual Version 2 procedure numbers */
-#define	NFSV2PROC_NULL		0
-#define	NFSV2PROC_GETATTR	1
-#define	NFSV2PROC_SETATTR	2
-#define	NFSV2PROC_NOOP		3
-#define	NFSV2PROC_ROOT		NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_LOOKUP	4
-#define	NFSV2PROC_READLINK	5
-#define	NFSV2PROC_READ		6
-#define	NFSV2PROC_WRITECACHE	NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_WRITE		8
-#define	NFSV2PROC_CREATE	9
-#define	NFSV2PROC_REMOVE	10
-#define	NFSV2PROC_RENAME	11
-#define	NFSV2PROC_LINK		12
-#define	NFSV2PROC_SYMLINK	13
-#define	NFSV2PROC_MKDIR		14
-#define	NFSV2PROC_RMDIR		15
-#define	NFSV2PROC_READDIR	16
-#define	NFSV2PROC_STATFS	17
-
-/*
- * V4 Procedure numbers
- */
-#define	NFSV4PROC_COMPOUND	1
-#define	NFSV4PROC_CBNULL	0
-#define	NFSV4PROC_CBCOMPOUND	1
-
-/*
- * Constants used by the Version 3 and 4 protocols for various RPCs
- */
-#define	NFSV3SATTRTIME_DONTCHANGE	0
-#define	NFSV3SATTRTIME_TOSERVER		1
-#define	NFSV3SATTRTIME_TOCLIENT		2
-
-#define	NFSV4SATTRTIME_TOSERVER		0
-#define	NFSV4SATTRTIME_TOCLIENT		1
-
-#define	NFSV4LOCKT_READ			1
-#define	NFSV4LOCKT_WRITE		2
-#define	NFSV4LOCKT_READW		3
-#define	NFSV4LOCKT_WRITEW		4
-#define	NFSV4LOCKT_RELEASE		5
-
-#define	NFSV4OPEN_NOCREATE		0
-#define	NFSV4OPEN_CREATE		1
-#define	NFSV4OPEN_CLAIMNULL		0
-#define	NFSV4OPEN_CLAIMPREVIOUS		1
-#define	NFSV4OPEN_CLAIMDELEGATECUR	2
-#define	NFSV4OPEN_CLAIMDELEGATEPREV	3
-#define	NFSV4OPEN_CLAIMFH		4
-#define	NFSV4OPEN_CLAIMDELEGATECURFH	5
-#define	NFSV4OPEN_CLAIMDELEGATEPREVFH	6
-#define	NFSV4OPEN_DELEGATENONE		0
-#define	NFSV4OPEN_DELEGATEREAD		1
-#define	NFSV4OPEN_DELEGATEWRITE		2
-#define	NFSV4OPEN_DELEGATENONEEXT	3
-#define	NFSV4OPEN_LIMITSIZE		1
-#define	NFSV4OPEN_LIMITBLOCKS		2
-
-/*
- * Nfs V4 ACE stuff
- */
-#define	NFSV4ACE_ALLOWEDTYPE		0x00000000
-#define	NFSV4ACE_DENIEDTYPE		0x00000001
-#define	NFSV4ACE_AUDITTYPE		0x00000002
-#define	NFSV4ACE_ALARMTYPE		0x00000003
-
-#define	NFSV4ACE_SUPALLOWED		0x00000001
-#define	NFSV4ACE_SUPDENIED		0x00000002
-#define	NFSV4ACE_SUPAUDIT		0x00000004
-#define	NFSV4ACE_SUPALARM		0x00000008
-
-#define	NFSV4ACE_SUPTYPES	(NFSV4ACE_SUPALLOWED | NFSV4ACE_SUPDENIED)
-
-#define	NFSV4ACE_FILEINHERIT		0x00000001
-#define	NFSV4ACE_DIRECTORYINHERIT	0x00000002
-#define	NFSV4ACE_NOPROPAGATEINHERIT	0x00000004
-#define	NFSV4ACE_INHERITONLY		0x00000008
-#define	NFSV4ACE_SUCCESSFULACCESS	0x00000010
-#define	NFSV4ACE_FAILEDACCESS		0x00000020
-#define	NFSV4ACE_IDENTIFIERGROUP	0x00000040
-
-#define	NFSV4ACE_READDATA		0x00000001
-#define	NFSV4ACE_LISTDIRECTORY		0x00000001
-#define	NFSV4ACE_WRITEDATA		0x00000002
-#define	NFSV4ACE_ADDFILE		0x00000002
-#define	NFSV4ACE_APPENDDATA		0x00000004
-#define	NFSV4ACE_ADDSUBDIRECTORY	0x00000004
-#define	NFSV4ACE_READNAMEDATTR		0x00000008
-#define	NFSV4ACE_WRITENAMEDATTR		0x00000010
-#define	NFSV4ACE_EXECUTE		0x00000020
-#define	NFSV4ACE_SEARCH			0x00000020
-#define	NFSV4ACE_DELETECHILD		0x00000040
-#define	NFSV4ACE_READATTRIBUTES		0x00000080
-#define	NFSV4ACE_WRITEATTRIBUTES	0x00000100
-#define	NFSV4ACE_DELETE			0x00010000
-#define	NFSV4ACE_READACL		0x00020000
-#define	NFSV4ACE_WRITEACL		0x00040000
-#define	NFSV4ACE_WRITEOWNER		0x00080000
-#define	NFSV4ACE_SYNCHRONIZE		0x00100000
-
-/*
- * Here are the mappings between mode bits and acl mask bits for
- * directories and other files.
- * (Named attributes have not been included, since named attributes are
- *  not yet supported.)
- * The mailing list seems to indicate that NFSV4ACE_EXECUTE refers to
- * searching a directory, although I can't find a statement of that in
- * the RFC.
- */
-#define	NFSV4ACE_ALLFILESMASK	(NFSV4ACE_READATTRIBUTES | NFSV4ACE_READACL)
-#define	NFSV4ACE_OWNERMASK	(NFSV4ACE_WRITEATTRIBUTES | NFSV4ACE_WRITEACL)
-#define	NFSV4ACE_DIRREADMASK	NFSV4ACE_LISTDIRECTORY
-#define	NFSV4ACE_DIREXECUTEMASK	NFSV4ACE_EXECUTE
-#define	NFSV4ACE_DIRWRITEMASK	(NFSV4ACE_ADDFILE | 			\
-		NFSV4ACE_ADDSUBDIRECTORY | NFSV4ACE_DELETECHILD)
-#define	NFSV4ACE_READMASK	NFSV4ACE_READDATA
-#define	NFSV4ACE_WRITEMASK	(NFSV4ACE_WRITEDATA | NFSV4ACE_APPENDDATA)
-#define	NFSV4ACE_EXECUTEMASK	NFSV4ACE_EXECUTE
-#define	NFSV4ACE_ALLFILEBITS	(NFSV4ACE_READMASK | NFSV4ACE_WRITEMASK | \
-	NFSV4ACE_EXECUTEMASK | NFSV4ACE_SYNCHRONIZE)
-#define	NFSV4ACE_ALLDIRBITS	(NFSV4ACE_DIRREADMASK | 		\
-	NFSV4ACE_DIRWRITEMASK | NFSV4ACE_DIREXECUTEMASK)
-#define	NFSV4ACE_AUDITMASK	0x0
-
-/*
- * These GENERIC masks are not used and are no longer believed to be useful.
- */
-#define	NFSV4ACE_GENERICREAD		0x00120081
-#define	NFSV4ACE_GENERICWRITE		0x00160106
-#define	NFSV4ACE_GENERICEXECUTE		0x001200a0
-
-#define	NFSSTATEID_PUTALLZERO		0
-#define	NFSSTATEID_PUTALLONE		1
-#define	NFSSTATEID_PUTSTATEID		2
-#define	NFSSTATEID_PUTSEQIDZERO		3
-
-/*
- * Bits for share access and deny.
- */
-#define	NFSV4OPEN_ACCESSREAD		0x00000001
-#define	NFSV4OPEN_ACCESSWRITE		0x00000002
-#define	NFSV4OPEN_ACCESSBOTH		0x00000003
-#define	NFSV4OPEN_WANTDELEGMASK		0x0000ff00
-#define	NFSV4OPEN_WANTREADDELEG		0x00000100
-#define	NFSV4OPEN_WANTWRITEDELEG	0x00000200
-#define	NFSV4OPEN_WANTANYDELEG		0x00000300
-#define	NFSV4OPEN_WANTNODELEG		0x00000400
-#define	NFSV4OPEN_WANTCANCEL		0x00000500
-#define	NFSV4OPEN_WANTSIGNALDELEG	0x00010000
-#define	NFSV4OPEN_WANTPUSHDELEG		0x00020000
-
-#define	NFSV4OPEN_DENYNONE		0x00000000
-#define	NFSV4OPEN_DENYREAD		0x00000001
-#define	NFSV4OPEN_DENYWRITE		0x00000002
-#define	NFSV4OPEN_DENYBOTH		0x00000003
-
-/*
- * Delegate_none_ext reply values.
- */
-#define	NFSV4OPEN_NOTWANTED		0
-#define	NFSV4OPEN_CONTENTION		1
-#define	NFSV4OPEN_RESOURCE		2
-#define	NFSV4OPEN_NOTSUPPFTYPE		3
-#define	NFSV4OPEN_NOTSUPPWRITEFTYPE	4
-#define	NFSV4OPEN_NOTSUPPUPGRADE	5
-#define	NFSV4OPEN_NOTSUPPDOWNGRADE	6
-#define	NFSV4OPEN_CANCELLED		7
-#define	NFSV4OPEN_ISDIR			8
-
-/*
- * Open result flags
- * (The first four are in the spec. The rest are used internally.)
- */
-#define	NFSV4OPEN_RESULTCONFIRM		0x00000002
-#define	NFSV4OPEN_LOCKTYPEPOSIX		0x00000004
-#define	NFSV4OPEN_PRESERVEUNLINKED	0x00000008
-#define	NFSV4OPEN_MAYNOTIFYLOCK		0x00000020
-#define	NFSV4OPEN_RFLAGS 						\
-    (NFSV4OPEN_RESULTCONFIRM | NFSV4OPEN_LOCKTYPEPOSIX |		\
-    NFSV4OPEN_PRESERVEUNLINKED | NFSV4OPEN_MAYNOTIFYLOCK)
-#define	NFSV4OPEN_RECALL		0x00010000
-#define	NFSV4OPEN_READDELEGATE		0x00020000
-#define	NFSV4OPEN_WRITEDELEGATE		0x00040000
-#define	NFSV4OPEN_WDRESOURCE		0x00080000
-#define	NFSV4OPEN_WDCONTENTION		0x00100000
-#define	NFSV4OPEN_WDNOTWANTED		0x00200000
-
-/*
- * NFS V4 File Handle types
- */
-#define	NFSV4FHTYPE_PERSISTENT		0x0
-#define	NFSV4FHTYPE_NOEXPIREWITHOPEN	0x1
-#define	NFSV4FHTYPE_VOLATILEANY		0x2
-#define	NFSV4FHTYPE_VOLATILEMIGRATE	0x4
-#define	NFSV4FHTYPE_VOLATILERENAME	0x8
-
-/*
- * Maximum size of V4 opaque strings.
- */
-#define	NFSV4_OPAQUELIMIT	1024
-
-/*
- * These are the same for V3 and V4.
- */
-#define	NFSACCESS_READ			0x01
-#define	NFSACCESS_LOOKUP		0x02
-#define	NFSACCESS_MODIFY		0x04
-#define	NFSACCESS_EXTEND		0x08
-#define	NFSACCESS_DELETE		0x10
-#define	NFSACCESS_EXECUTE		0x20
-
-#define	NFSWRITE_UNSTABLE		0
-#define	NFSWRITE_DATASYNC		1
-#define	NFSWRITE_FILESYNC		2
-
-#define	NFSCREATE_UNCHECKED		0
-#define	NFSCREATE_GUARDED		1
-#define	NFSCREATE_EXCLUSIVE		2
-#define	NFSCREATE_EXCLUSIVE41		3
-
-#define	NFSV3FSINFO_LINK		0x01
-#define	NFSV3FSINFO_SYMLINK		0x02
-#define	NFSV3FSINFO_HOMOGENEOUS		0x08
-#define	NFSV3FSINFO_CANSETTIME		0x10
-
-/* Flags for Exchange ID */
-#define	NFSV4EXCH_SUPPMOVEDREFER	0x00000001
-#define	NFSV4EXCH_SUPPMOVEDMIGR	0x00000002
-#define	NFSV4EXCH_BINDPRINCSTATEID	0x00000100
-#define	NFSV4EXCH_USENONPNFS		0x00010000
-#define	NFSV4EXCH_USEPNFSMDS		0x00020000
-#define	NFSV4EXCH_USEPNFSDS		0x00040000
-#define	NFSV4EXCH_MASKPNFS		0x00070000
-#define	NFSV4EXCH_UPDCONFIRMEDRECA	0x40000000
-#define	NFSV4EXCH_CONFIRMEDR		0x80000000
-
-/* State Protects */
-#define	NFSV4EXCH_SP4NONE		0
-#define	NFSV4EXCH_SP4MACHCRED		1
-#define	NFSV4EXCH_SP4SSV		2
-
-/* Flags for Create Session */
-#define	NFSV4CRSESS_PERSIST		0x00000001
-#define	NFSV4CRSESS_CONNBACKCHAN	0x00000002
-#define	NFSV4CRSESS_CONNRDMA		0x00000004
-
-/* Flags for Sequence */
-#define	NFSV4SEQ_CBPATHDOWN		0x00000001
-#define	NFSV4SEQ_CBGSSCONTEXPIRING	0x00000002
-#define	NFSV4SEQ_CBGSSCONTEXPIRED	0x00000004
-#define	NFSV4SEQ_EXPIREDALLSTATEREVOKED	0x00000008
-#define	NFSV4SEQ_EXPIREDSOMESTATEREVOKED 0x00000010
-#define	NFSV4SEQ_ADMINSTATEREVOKED	0x00000020
-#define	NFSV4SEQ_RECALLABLESTATEREVOKED	0x00000040
-#define	NFSV4SEQ_LEASEMOVED		0x00000080
-#define	NFSV4SEQ_RESTARTRECLAIMNEEDED	0x00000100
-#define	NFSV4SEQ_CBPATHDOWNSESSION	0x00000200
-#define	NFSV4SEQ_BACKCHANNELFAULT	0x00000400
-#define	NFSV4SEQ_DEVIDCHANGED		0x00000800
-#define	NFSV4SEQ_DEVIDDELETED		0x00001000
-
-/* Flags for Layout. */
-#define	NFSLAYOUTRETURN_FILE		1
-#define	NFSLAYOUTRETURN_FSID		2
-#define	NFSLAYOUTRETURN_ALL		3
-
-#define	NFSLAYOUT_NFSV4_1_FILES		0x1
-#define	NFSLAYOUT_OSD2_OBJECTS		0x2
-#define	NFSLAYOUT_BLOCK_VOLUME		0x3
-
-#define	NFSLAYOUTIOMODE_READ		1
-#define	NFSLAYOUTIOMODE_RW		2
-#define	NFSLAYOUTIOMODE_ANY		3
-
-/* Flags for Get Device Info. */
-#define	NFSDEVICEIDNOTIFY_CHANGEBIT	0x1
-#define	NFSDEVICEIDNOTIFY_DELETEBIT	0x2
-
-/* Flags for File Layout. */
-#define	NFSFLAYUTIL_DENSE		0x1
-#define	NFSFLAYUTIL_COMMIT_THRU_MDS	0x2
-
-/* Conversion macros */
-#define	vtonfsv2_mode(t,m) 						\
-		txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : 	\
-				MAKEIMODE((t), (m)))
-#define	vtonfsv34_mode(m)	txdr_unsigned((m) & 07777)
-#define	nfstov_mode(a)		(fxdr_unsigned(u_int16_t, (a))&07777)
-#define	vtonfsv2_type(a)  (((uint32_t)(a)) >= 9 ? txdr_unsigned(NFNON) : \
-		txdr_unsigned(newnfsv2_type[((uint32_t)(a))]))
-#define	vtonfsv34_type(a)  (((uint32_t)(a)) >= 9 ? txdr_unsigned(NFNON) : \
-		txdr_unsigned(nfsv34_type[((uint32_t)(a))]))
-#define	nfsv2tov_type(a)	newnv2tov_type[fxdr_unsigned(uint32_t,(a))&0x7]
-#define	nfsv34tov_type(a)	nv34tov_type[fxdr_unsigned(uint32_t,(a))&0x7]
-#define	vtonfs_dtype(a)	(((uint32_t)(a)) >= 9 ? IFTODT(VTTOIF(VNON)) : \
-			 IFTODT(VTTOIF(a)))
-
-/* File types */
-typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
-	NFSOCK=6, NFFIFO=7, NFATTRDIR=8, NFNAMEDATTR=9 } nfstype;
-
-/* Structs for common parts of the rpc's */
-
-struct nfsv2_time {
-	uint32_t nfsv2_sec;
-	uint32_t nfsv2_usec;
-};
-typedef struct nfsv2_time	nfstime2;
-
-struct nfsv3_time {
-	uint32_t nfsv3_sec;
-	uint32_t nfsv3_nsec;
-};
-typedef struct nfsv3_time	nfstime3;
-
-struct nfsv4_time {
-	uint32_t nfsv4_highsec;
-	uint32_t nfsv4_sec;
-	uint32_t nfsv4_nsec;
-};
-typedef struct nfsv4_time	nfstime4;
-
-/*
- * Quads are defined as arrays of 2 longs to ensure dense packing for the
- * protocol and to facilitate xdr conversion.
- */
-struct nfs_uquad {
-	uint32_t nfsuquad[2];
-};
-typedef	struct nfs_uquad	nfsuint64;
-
-/*
- * Used to convert between two u_longs and a u_quad_t.
- */
-union nfs_quadconvert {
-	uint32_t lval[2];
-	u_quad_t  qval;
-};
-typedef union nfs_quadconvert	nfsquad_t;
-
-/*
- * NFS Version 3 special file number.
- */
-struct nfsv3_spec {
-	uint32_t specdata1;
-	uint32_t specdata2;
-};
-typedef	struct nfsv3_spec	nfsv3spec;
-
-/*
- * File attributes and setable attributes. These structures cover both
- * NFS version 2 and the version 3 protocol. Note that the union is only
- * used so that one pointer can refer to both variants. These structures
- * go out on the wire and must be densely packed, so no quad data types
- * are used. (all fields are longs or u_longs or structures of same)
- * NB: You can't do sizeof(struct nfs_fattr), you must use the
- *     NFSX_FATTR(v3) macro.
- */
-struct nfs_fattr {
-	uint32_t fa_type;
-	uint32_t fa_mode;
-	uint32_t fa_nlink;
-	uint32_t fa_uid;
-	uint32_t fa_gid;
-	union {
-		struct {
-			uint32_t nfsv2fa_size;
-			uint32_t nfsv2fa_blocksize;
-			uint32_t nfsv2fa_rdev;
-			uint32_t nfsv2fa_blocks;
-			uint32_t nfsv2fa_fsid;
-			uint32_t nfsv2fa_fileid;
-			nfstime2  nfsv2fa_atime;
-			nfstime2  nfsv2fa_mtime;
-			nfstime2  nfsv2fa_ctime;
-		} fa_nfsv2;
-		struct {
-			nfsuint64 nfsv3fa_size;
-			nfsuint64 nfsv3fa_used;
-			nfsv3spec nfsv3fa_rdev;
-			nfsuint64 nfsv3fa_fsid;
-			nfsuint64 nfsv3fa_fileid;
-			nfstime3  nfsv3fa_atime;
-			nfstime3  nfsv3fa_mtime;
-			nfstime3  nfsv3fa_ctime;
-		} fa_nfsv3;
-	} fa_un;
-};
-
-/* and some ugly defines for accessing union components */
-#define	fa2_size		fa_un.fa_nfsv2.nfsv2fa_size
-#define	fa2_blocksize		fa_un.fa_nfsv2.nfsv2fa_blocksize
-#define	fa2_rdev		fa_un.fa_nfsv2.nfsv2fa_rdev
-#define	fa2_blocks		fa_un.fa_nfsv2.nfsv2fa_blocks
-#define	fa2_fsid		fa_un.fa_nfsv2.nfsv2fa_fsid
-#define	fa2_fileid		fa_un.fa_nfsv2.nfsv2fa_fileid
-#define	fa2_atime		fa_un.fa_nfsv2.nfsv2fa_atime
-#define	fa2_mtime		fa_un.fa_nfsv2.nfsv2fa_mtime
-#define	fa2_ctime		fa_un.fa_nfsv2.nfsv2fa_ctime
-#define	fa3_size		fa_un.fa_nfsv3.nfsv3fa_size
-#define	fa3_used		fa_un.fa_nfsv3.nfsv3fa_used
-#define	fa3_rdev		fa_un.fa_nfsv3.nfsv3fa_rdev
-#define	fa3_fsid		fa_un.fa_nfsv3.nfsv3fa_fsid
-#define	fa3_fileid		fa_un.fa_nfsv3.nfsv3fa_fileid
-#define	fa3_atime		fa_un.fa_nfsv3.nfsv3fa_atime
-#define	fa3_mtime		fa_un.fa_nfsv3.nfsv3fa_mtime
-#define	fa3_ctime		fa_un.fa_nfsv3.nfsv3fa_ctime
-
-struct nfsv2_sattr {
-	uint32_t sa_mode;
-	uint32_t sa_uid;
-	uint32_t sa_gid;
-	uint32_t sa_size;
-	nfstime2  sa_atime;
-	nfstime2  sa_mtime;
-};
-
-/*
- * NFS Version 3 sattr structure for the new node creation case.
- */
-struct nfsv3_sattr {
-	uint32_t sa_modetrue;
-	uint32_t sa_mode;
-	uint32_t sa_uidfalse;
-	uint32_t sa_gidfalse;
-	uint32_t sa_sizefalse;
-	uint32_t sa_atimetype;
-	nfstime3  sa_atime;
-	uint32_t sa_mtimetype;
-	nfstime3  sa_mtime;
-};
-
-/*
- * The attribute bits used for V4.
- * NFSATTRBIT_xxx defines the attribute# (and its bit position)
- * NFSATTRBM_xxx is a 32bit mask with the correct bit set within the
- *	appropriate 32bit word.
- * NFSATTRBIT_MAX is one greater than the largest NFSATTRBIT_xxx
- */
-#define	NFSATTRBIT_SUPPORTEDATTRS	0
-#define	NFSATTRBIT_TYPE			1
-#define	NFSATTRBIT_FHEXPIRETYPE		2
-#define	NFSATTRBIT_CHANGE		3
-#define	NFSATTRBIT_SIZE			4
-#define	NFSATTRBIT_LINKSUPPORT		5
-#define	NFSATTRBIT_SYMLINKSUPPORT	6
-#define	NFSATTRBIT_NAMEDATTR		7
-#define	NFSATTRBIT_FSID			8
-#define	NFSATTRBIT_UNIQUEHANDLES	9
-#define	NFSATTRBIT_LEASETIME		10
-#define	NFSATTRBIT_RDATTRERROR		11
-#define	NFSATTRBIT_ACL			12
-#define	NFSATTRBIT_ACLSUPPORT		13
-#define	NFSATTRBIT_ARCHIVE		14
-#define	NFSATTRBIT_CANSETTIME		15
-#define	NFSATTRBIT_CASEINSENSITIVE	16
-#define	NFSATTRBIT_CASEPRESERVING	17
-#define	NFSATTRBIT_CHOWNRESTRICTED	18
-#define	NFSATTRBIT_FILEHANDLE		19
-#define	NFSATTRBIT_FILEID		20
-#define	NFSATTRBIT_FILESAVAIL		21
-#define	NFSATTRBIT_FILESFREE		22
-#define	NFSATTRBIT_FILESTOTAL		23
-#define	NFSATTRBIT_FSLOCATIONS		24
-#define	NFSATTRBIT_HIDDEN		25
-#define	NFSATTRBIT_HOMOGENEOUS		26
-#define	NFSATTRBIT_MAXFILESIZE		27
-#define	NFSATTRBIT_MAXLINK		28
-#define	NFSATTRBIT_MAXNAME		29
-#define	NFSATTRBIT_MAXREAD		30
-#define	NFSATTRBIT_MAXWRITE		31
-#define	NFSATTRBIT_MIMETYPE		32
-#define	NFSATTRBIT_MODE			33
-#define	NFSATTRBIT_NOTRUNC		34
-#define	NFSATTRBIT_NUMLINKS		35
-#define	NFSATTRBIT_OWNER		36
-#define	NFSATTRBIT_OWNERGROUP		37
-#define	NFSATTRBIT_QUOTAHARD		38
-#define	NFSATTRBIT_QUOTASOFT		39
-#define	NFSATTRBIT_QUOTAUSED		40
-#define	NFSATTRBIT_RAWDEV		41
-#define	NFSATTRBIT_SPACEAVAIL		42
-#define	NFSATTRBIT_SPACEFREE		43
-#define	NFSATTRBIT_SPACETOTAL		44
-#define	NFSATTRBIT_SPACEUSED		45
-#define	NFSATTRBIT_SYSTEM		46
-#define	NFSATTRBIT_TIMEACCESS		47
-#define	NFSATTRBIT_TIMEACCESSSET	48
-#define	NFSATTRBIT_TIMEBACKUP		49
-#define	NFSATTRBIT_TIMECREATE		50
-#define	NFSATTRBIT_TIMEDELTA		51
-#define	NFSATTRBIT_TIMEMETADATA		52
-#define	NFSATTRBIT_TIMEMODIFY		53
-#define	NFSATTRBIT_TIMEMODIFYSET	54
-#define	NFSATTRBIT_MOUNTEDONFILEID	55
-#define	NFSATTRBIT_DIRNOTIFDELAY	56
-#define	NFSATTRBIT_DIRENTNOTIFDELAY	57
-#define	NFSATTRBIT_DACL			58
-#define	NFSATTRBIT_SACL			59
-#define	NFSATTRBIT_CHANGEPOLICY		60
-#define	NFSATTRBIT_FSSTATUS		61
-#define	NFSATTRBIT_FSLAYOUTTYPE		62
-#define	NFSATTRBIT_LAYOUTHINT		63
-#define	NFSATTRBIT_LAYOUTTYPE		64
-#define	NFSATTRBIT_LAYOUTBLKSIZE	65
-#define	NFSATTRBIT_LAYOUTALIGNMENT	66
-#define	NFSATTRBIT_FSLOCATIONSINFO	67
-#define	NFSATTRBIT_MDSTHRESHOLD		68
-#define	NFSATTRBIT_RETENTIONGET		69
-#define	NFSATTRBIT_RETENTIONSET		70
-#define	NFSATTRBIT_RETENTEVTGET		71
-#define	NFSATTRBIT_RETENTEVTSET		72
-#define	NFSATTRBIT_RETENTIONHOLD	73
-#define	NFSATTRBIT_MODESETMASKED	74
-#define	NFSATTRBIT_SUPPATTREXCLCREAT	75
-#define	NFSATTRBIT_FSCHARSETCAP		76
-
-#define	NFSATTRBM_SUPPORTEDATTRS	0x00000001
-#define	NFSATTRBM_TYPE			0x00000002
-#define	NFSATTRBM_FHEXPIRETYPE		0x00000004
-#define	NFSATTRBM_CHANGE		0x00000008
-#define	NFSATTRBM_SIZE			0x00000010
-#define	NFSATTRBM_LINKSUPPORT		0x00000020
-#define	NFSATTRBM_SYMLINKSUPPORT	0x00000040
-#define	NFSATTRBM_NAMEDATTR		0x00000080
-#define	NFSATTRBM_FSID			0x00000100
-#define	NFSATTRBM_UNIQUEHANDLES		0x00000200
-#define	NFSATTRBM_LEASETIME		0x00000400
-#define	NFSATTRBM_RDATTRERROR		0x00000800
-#define	NFSATTRBM_ACL			0x00001000
-#define	NFSATTRBM_ACLSUPPORT		0x00002000
-#define	NFSATTRBM_ARCHIVE		0x00004000
-#define	NFSATTRBM_CANSETTIME		0x00008000
-#define	NFSATTRBM_CASEINSENSITIVE	0x00010000
-#define	NFSATTRBM_CASEPRESERVING	0x00020000
-#define	NFSATTRBM_CHOWNRESTRICTED	0x00040000
-#define	NFSATTRBM_FILEHANDLE		0x00080000
-#define	NFSATTRBM_FILEID		0x00100000
-#define	NFSATTRBM_FILESAVAIL		0x00200000
-#define	NFSATTRBM_FILESFREE		0x00400000
-#define	NFSATTRBM_FILESTOTAL		0x00800000
-#define	NFSATTRBM_FSLOCATIONS		0x01000000
-#define	NFSATTRBM_HIDDEN		0x02000000
-#define	NFSATTRBM_HOMOGENEOUS		0x04000000
-#define	NFSATTRBM_MAXFILESIZE		0x08000000
-#define	NFSATTRBM_MAXLINK		0x10000000
-#define	NFSATTRBM_MAXNAME		0x20000000
-#define	NFSATTRBM_MAXREAD		0x40000000
-#define	NFSATTRBM_MAXWRITE		0x80000000
-#define	NFSATTRBM_MIMETYPE		0x00000001
-#define	NFSATTRBM_MODE			0x00000002
-#define	NFSATTRBM_NOTRUNC		0x00000004
-#define	NFSATTRBM_NUMLINKS		0x00000008
-#define	NFSATTRBM_OWNER			0x00000010
-#define	NFSATTRBM_OWNERGROUP		0x00000020
-#define	NFSATTRBM_QUOTAHARD		0x00000040
-#define	NFSATTRBM_QUOTASOFT		0x00000080
-#define	NFSATTRBM_QUOTAUSED		0x00000100
-#define	NFSATTRBM_RAWDEV		0x00000200
-#define	NFSATTRBM_SPACEAVAIL		0x00000400
-#define	NFSATTRBM_SPACEFREE		0x00000800
-#define	NFSATTRBM_SPACETOTAL		0x00001000
-#define	NFSATTRBM_SPACEUSED		0x00002000
-#define	NFSATTRBM_SYSTEM		0x00004000
-#define	NFSATTRBM_TIMEACCESS		0x00008000
-#define	NFSATTRBM_TIMEACCESSSET		0x00010000
-#define	NFSATTRBM_TIMEBACKUP		0x00020000
-#define	NFSATTRBM_TIMECREATE		0x00040000
-#define	NFSATTRBM_TIMEDELTA		0x00080000
-#define	NFSATTRBM_TIMEMETADATA		0x00100000
-#define	NFSATTRBM_TIMEMODIFY		0x00200000
-#define	NFSATTRBM_TIMEMODIFYSET		0x00400000
-#define	NFSATTRBM_MOUNTEDONFILEID	0x00800000
-#define	NFSATTRBM_DIRNOTIFDELAY		0x01000000
-#define	NFSATTRBM_DIRENTNOTIFDELAY	0x02000000
-#define	NFSATTRBM_DACL			0x04000000
-#define	NFSATTRBM_SACL			0x08000000
-#define	NFSATTRBM_CHANGEPOLICY		0x10000000
-#define	NFSATTRBM_FSSTATUS		0x20000000
-#define	NFSATTRBM_FSLAYOUTTYPE		0x40000000
-#define	NFSATTRBM_LAYOUTHINT		0x80000000
-#define	NFSATTRBM_LAYOUTTYPE		0x00000001
-#define	NFSATTRBM_LAYOUTBLKSIZE		0x00000002
-#define	NFSATTRBM_LAYOUTALIGNMENT	0x00000004
-#define	NFSATTRBM_FSLOCATIONSINFO	0x00000008
-#define	NFSATTRBM_MDSTHRESHOLD		0x00000010
-#define	NFSATTRBM_RETENTIONGET		0x00000020
-#define	NFSATTRBM_RETENTIONSET		0x00000040
-#define	NFSATTRBM_RETENTEVTGET		0x00000080
-#define	NFSATTRBM_RETENTEVTSET		0x00000100
-#define	NFSATTRBM_RETENTIONHOLD		0x00000200
-#define	NFSATTRBM_MODESETMASKED		0x00000400
-#define	NFSATTRBM_SUPPATTREXCLCREAT	0x00000800
-#define	NFSATTRBM_FSCHARSETCAP		0x00001000
-
-#define	NFSATTRBIT_MAX			77
-
-/*
- * Sets of attributes that are supported, by words in the bitmap.
- */
-/*
- * NFSATTRBIT_SUPPORTED - SUPP0 - bits 0<->31
- *			  SUPP1 - bits 32<->63
- *			  SUPP2 - bits 64<->95
- */
-#define	NFSATTRBIT_SUPP0						\
- 	(NFSATTRBM_SUPPORTEDATTRS |					\
- 	NFSATTRBM_TYPE |						\
- 	NFSATTRBM_FHEXPIRETYPE |					\
- 	NFSATTRBM_CHANGE |						\
- 	NFSATTRBM_SIZE |						\
- 	NFSATTRBM_LINKSUPPORT |						\
- 	NFSATTRBM_SYMLINKSUPPORT |					\
- 	NFSATTRBM_NAMEDATTR |						\
- 	NFSATTRBM_FSID |						\
- 	NFSATTRBM_UNIQUEHANDLES |					\
- 	NFSATTRBM_LEASETIME |						\
- 	NFSATTRBM_RDATTRERROR |						\
- 	NFSATTRBM_ACL |							\
- 	NFSATTRBM_ACLSUPPORT |						\
- 	NFSATTRBM_CANSETTIME |						\
- 	NFSATTRBM_CASEINSENSITIVE |					\
- 	NFSATTRBM_CASEPRESERVING |					\
- 	NFSATTRBM_CHOWNRESTRICTED |					\
- 	NFSATTRBM_FILEHANDLE |						\
- 	NFSATTRBM_FILEID |						\
- 	NFSATTRBM_FILESAVAIL |						\
- 	NFSATTRBM_FILESFREE |						\
- 	NFSATTRBM_FILESTOTAL |						\
-	NFSATTRBM_FSLOCATIONS |						\
- 	NFSATTRBM_HOMOGENEOUS |						\
- 	NFSATTRBM_MAXFILESIZE |						\
- 	NFSATTRBM_MAXLINK |						\
- 	NFSATTRBM_MAXNAME |						\
- 	NFSATTRBM_MAXREAD |						\
- 	NFSATTRBM_MAXWRITE)
-
-/*
- * NFSATTRBIT_S1 - subset of SUPP1 - OR of the following bits:
- */
-#define	NFSATTRBIT_S1							\
- 	(NFSATTRBM_MODE |						\
- 	NFSATTRBM_NOTRUNC |						\
- 	NFSATTRBM_NUMLINKS |						\
- 	NFSATTRBM_OWNER |						\
- 	NFSATTRBM_OWNERGROUP |						\
- 	NFSATTRBM_RAWDEV |						\
- 	NFSATTRBM_SPACEAVAIL |						\
- 	NFSATTRBM_SPACEFREE |						\
- 	NFSATTRBM_SPACETOTAL |						\
- 	NFSATTRBM_SPACEUSED |						\
- 	NFSATTRBM_TIMEACCESS |						\
- 	NFSATTRBM_TIMEDELTA |						\
- 	NFSATTRBM_TIMEMETADATA |					\
- 	NFSATTRBM_TIMEMODIFY |						\
- 	NFSATTRBM_MOUNTEDONFILEID)
-
-#ifdef QUOTA
-/*
- * If QUOTA OR in NFSATTRBIT_QUOTAHARD, NFSATTRBIT_QUOTASOFT and
- * NFSATTRBIT_QUOTAUSED.
- */
-#define	NFSATTRBIT_SUPP1	(NFSATTRBIT_S1 |			\
-				NFSATTRBM_QUOTAHARD |			\
-				NFSATTRBM_QUOTASOFT |			\
-				NFSATTRBM_QUOTAUSED)
-#else
-#define	NFSATTRBIT_SUPP1	NFSATTRBIT_S1
-#endif
-
-#define	NFSATTRBIT_SUPP2	NFSATTRBM_SUPPATTREXCLCREAT
-
-/*
- * NFSATTRBIT_SUPPSETONLY is the OR of NFSATTRBIT_TIMEACCESSSET and
- * NFSATTRBIT_TIMEMODIFYSET.
- */
-#define	NFSATTRBIT_SUPPSETONLY	 (NFSATTRBM_TIMEACCESSSET |		\
-				 NFSATTRBM_TIMEMODIFYSET)
-
-/*
- * NFSATTRBIT_SETABLE - SETABLE0 - bits 0<->31
- *			SETABLE1 - bits 32<->63
- *			SETABLE2 - bits 64<->95
- */
-#define	NFSATTRBIT_SETABLE0						\
-	(NFSATTRBM_SIZE |						\
-	NFSATTRBM_ACL)
-#define	NFSATTRBIT_SETABLE1						\
- 	(NFSATTRBM_MODE |						\
- 	NFSATTRBM_OWNER |						\
- 	NFSATTRBM_OWNERGROUP |						\
- 	NFSATTRBM_TIMEACCESSSET |					\
- 	NFSATTRBM_TIMEMODIFYSET)
-#define	NFSATTRBIT_SETABLE2		0
-
-/*
- * Set of attributes that the getattr vnode op needs.
- * OR of the following bits.
- * NFSATTRBIT_GETATTR0 - bits 0<->31
- */
-#define	NFSATTRBIT_GETATTR0						\
- 	(NFSATTRBM_SUPPORTEDATTRS |					\
- 	NFSATTRBM_TYPE |						\
- 	NFSATTRBM_CHANGE |						\
- 	NFSATTRBM_SIZE |						\
- 	NFSATTRBM_FSID |						\
- 	NFSATTRBM_FILEID |						\
- 	NFSATTRBM_MAXREAD)
-
-/*
- * NFSATTRBIT_GETATTR1 - bits 32<->63
- */
-#define	NFSATTRBIT_GETATTR1						\
- 	(NFSATTRBM_MODE |						\
- 	NFSATTRBM_NUMLINKS |						\
- 	NFSATTRBM_OWNER |						\
- 	NFSATTRBM_OWNERGROUP |						\
- 	NFSATTRBM_RAWDEV |						\
- 	NFSATTRBM_SPACEUSED |						\
- 	NFSATTRBM_TIMEACCESS |						\
- 	NFSATTRBM_TIMEMETADATA |					\
- 	NFSATTRBM_TIMEMODIFY)
-
-/*
- * NFSATTRBIT_GETATTR2 - bits 64<->95
- */
-#define	NFSATTRBIT_GETATTR2		0
-
-/*
- * Subset of the above that the Write RPC gets.
- * OR of the following bits.
- * NFSATTRBIT_WRITEGETATTR0 - bits 0<->31
- */
-#define	NFSATTRBIT_WRITEGETATTR0					\
- 	(NFSATTRBM_SUPPORTEDATTRS |					\
- 	NFSATTRBM_TYPE |						\
- 	NFSATTRBM_CHANGE |						\
- 	NFSATTRBM_SIZE |						\
- 	NFSATTRBM_FSID |						\
- 	NFSATTRBM_FILEID |						\
- 	NFSATTRBM_MAXREAD)
-
-/*
- * NFSATTRBIT_WRITEGETATTR1 - bits 32<->63
- */
-#define	NFSATTRBIT_WRITEGETATTR1					\
- 	(NFSATTRBM_MODE |						\
- 	NFSATTRBM_NUMLINKS |						\
- 	NFSATTRBM_RAWDEV |						\
- 	NFSATTRBM_SPACEUSED |						\
- 	NFSATTRBM_TIMEACCESS |						\
- 	NFSATTRBM_TIMEMETADATA |					\
- 	NFSATTRBM_TIMEMODIFY)
-
-/*
- * NFSATTRBIT_WRITEGETATTR2 - bits 64<->95
- */
-#define	NFSATTRBIT_WRITEGETATTR2	0
-
-/*
- * Set of attributes that the wccattr operation op needs.
- * OR of the following bits.
- * NFSATTRBIT_WCCATTR0 - bits 0<->31
- */
-#define	NFSATTRBIT_WCCATTR0	0
-
-/*
- * NFSATTRBIT_WCCATTR1 - bits 32<->63
- */
-#define	NFSATTRBIT_WCCATTR1						\
- 	(NFSATTRBM_TIMEMODIFY)
-
-/*
- * NFSATTRBIT_WCCATTR2 - bits 64<->95
- */
-#define	NFSATTRBIT_WCCATTR2		0
-
-/*
- * NFSATTRBIT_CBGETATTR0 - bits 0<->31
- */
-#define	NFSATTRBIT_CBGETATTR0	(NFSATTRBM_CHANGE | NFSATTRBM_SIZE)
-
-/*
- * NFSATTRBIT_CBGETATTR1 - bits 32<->63
- */
-#define	NFSATTRBIT_CBGETATTR1		0x0
-
-/*
- * NFSATTRBIT_CBGETATTR2 - bits 64<->95
- */
-#define	NFSATTRBIT_CBGETATTR2		0x0
-
-/*
- * Sets of attributes that require a VFS_STATFS() call to get the
- * values of.
- * NFSATTRBIT_STATFS0 - bits 0<->31
- */
-#define	NFSATTRBIT_STATFS0						\
-	(NFSATTRBM_LINKSUPPORT |					\
-	NFSATTRBM_SYMLINKSUPPORT |					\
-	NFSATTRBM_CANSETTIME |						\
- 	NFSATTRBM_FILESAVAIL |						\
- 	NFSATTRBM_FILESFREE |						\
- 	NFSATTRBM_FILESTOTAL |						\
- 	NFSATTRBM_HOMOGENEOUS |						\
- 	NFSATTRBM_MAXFILESIZE |						\
-	NFSATTRBM_MAXNAME |						\
-	NFSATTRBM_MAXREAD |						\
-	NFSATTRBM_MAXWRITE)
-
-/*
- * NFSATTRBIT_STATFS1 - bits 32<->63
- */
-#define	NFSATTRBIT_STATFS1						\
- 	(NFSATTRBM_QUOTAHARD |						\
- 	NFSATTRBM_QUOTASOFT |						\
- 	NFSATTRBM_QUOTAUSED |						\
- 	NFSATTRBM_SPACEAVAIL |						\
- 	NFSATTRBM_SPACEFREE |						\
- 	NFSATTRBM_SPACETOTAL |						\
- 	NFSATTRBM_SPACEUSED |						\
-	NFSATTRBM_TIMEDELTA)
-
-/*
- * NFSATTRBIT_STATFS2 - bits 64<->95
- */
-#define	NFSATTRBIT_STATFS2		0
-
-/*
- * These are the bits that are needed by the nfs_statfs() call.
- * (The regular getattr bits are or'd in so the vnode gets the correct
- *  type, etc.)
- * NFSGETATTRBIT_STATFS0 - bits 0<->31
- */
-#define	NFSGETATTRBIT_STATFS0	(NFSATTRBIT_GETATTR0 |			\
-				NFSATTRBM_LINKSUPPORT |			\
-				NFSATTRBM_SYMLINKSUPPORT |		\
-				NFSATTRBM_CANSETTIME |			\
-				NFSATTRBM_FILESFREE |			\
-				NFSATTRBM_FILESTOTAL |			\
-				NFSATTRBM_HOMOGENEOUS |			\
-				NFSATTRBM_MAXFILESIZE |			\
-				NFSATTRBM_MAXNAME |			\
-				NFSATTRBM_MAXREAD |			\
-				NFSATTRBM_MAXWRITE)
-
-/*
- * NFSGETATTRBIT_STATFS1 - bits 32<->63
- */
-#define	NFSGETATTRBIT_STATFS1	(NFSATTRBIT_GETATTR1 |			\
-				NFSATTRBM_SPACEAVAIL |			\
-				NFSATTRBM_SPACEFREE |			\
-				NFSATTRBM_SPACETOTAL |			\
-				NFSATTRBM_TIMEDELTA)
-
-/*
- * NFSGETATTRBIT_STATFS2 - bits 64<->95
- */
-#define	NFSGETATTRBIT_STATFS2		0
-
-/*
- * Set of attributes for the equivalent of an nfsv3 pathconf rpc.
- * NFSGETATTRBIT_PATHCONF0 - bits 0<->31
- */
-#define	NFSGETATTRBIT_PATHCONF0	(NFSATTRBIT_GETATTR0 |			\
-			 	NFSATTRBM_CASEINSENSITIVE |		\
-			 	NFSATTRBM_CASEPRESERVING |		\
-			 	NFSATTRBM_CHOWNRESTRICTED |		\
-			 	NFSATTRBM_MAXLINK |			\
-			 	NFSATTRBM_MAXNAME)
-
-/*
- * NFSGETATTRBIT_PATHCONF1 - bits 32<->63
- */
-#define	NFSGETATTRBIT_PATHCONF1	(NFSATTRBIT_GETATTR1 |			\
-				NFSATTRBM_NOTRUNC)
-
-/*
- * NFSGETATTRBIT_PATHCONF2 - bits 64<->95
- */
-#define	NFSGETATTRBIT_PATHCONF2		0
-
-/*
- * Sets of attributes required by readdir and readdirplus.
- * NFSATTRBIT_READDIRPLUS0	(NFSATTRBIT_GETATTR0 | NFSATTRBIT_FILEHANDLE |
- *				 NFSATTRBIT_RDATTRERROR)
- */
-#define	NFSATTRBIT_READDIRPLUS0	(NFSATTRBIT_GETATTR0 | NFSATTRBM_FILEHANDLE | \
-				NFSATTRBM_RDATTRERROR)
-#define	NFSATTRBIT_READDIRPLUS1	NFSATTRBIT_GETATTR1
-#define	NFSATTRBIT_READDIRPLUS2		0
-
-/*
- * Set of attributes supported by Referral vnodes.
- */
-#define	NFSATTRBIT_REFERRAL0	(NFSATTRBM_TYPE | NFSATTRBM_FSID |	\
-	NFSATTRBM_RDATTRERROR | NFSATTRBM_FSLOCATIONS)
-#define	NFSATTRBIT_REFERRAL1	NFSATTRBM_MOUNTEDONFILEID
-#define	NFSATTRBIT_REFERRAL2		0
-
-/*
- * Structure for data handled by the statfs rpc. Since some fields are
- * u_int64_t, this cannot be used for copying data on/off the wire, due
- * to alignment concerns.
- */
-struct nfsstatfs {
-	union {
-		struct {
-			uint32_t nfsv2sf_tsize;
-			uint32_t nfsv2sf_bsize;
-			uint32_t nfsv2sf_blocks;
-			uint32_t nfsv2sf_bfree;
-			uint32_t nfsv2sf_bavail;
-		} sf_nfsv2;
-		struct {
-			u_int64_t nfsv3sf_tbytes;
-			u_int64_t nfsv3sf_fbytes;
-			u_int64_t nfsv3sf_abytes;
-			u_int64_t nfsv3sf_tfiles;
-			u_int64_t nfsv3sf_ffiles;
-			u_int64_t nfsv3sf_afiles;
-			uint32_t nfsv3sf_invarsec;
-		} sf_nfsv3;
-	} sf_un;
-};
-
-#define	sf_tsize	sf_un.sf_nfsv2.nfsv2sf_tsize
-#define	sf_bsize	sf_un.sf_nfsv2.nfsv2sf_bsize
-#define	sf_blocks	sf_un.sf_nfsv2.nfsv2sf_blocks
-#define	sf_bfree	sf_un.sf_nfsv2.nfsv2sf_bfree
-#define	sf_bavail	sf_un.sf_nfsv2.nfsv2sf_bavail
-#define	sf_tbytes	sf_un.sf_nfsv3.nfsv3sf_tbytes
-#define	sf_fbytes	sf_un.sf_nfsv3.nfsv3sf_fbytes
-#define	sf_abytes	sf_un.sf_nfsv3.nfsv3sf_abytes
-#define	sf_tfiles	sf_un.sf_nfsv3.nfsv3sf_tfiles
-#define	sf_ffiles	sf_un.sf_nfsv3.nfsv3sf_ffiles
-#define	sf_afiles	sf_un.sf_nfsv3.nfsv3sf_afiles
-#define	sf_invarsec	sf_un.sf_nfsv3.nfsv3sf_invarsec
-
-/*
- * Now defined using u_int64_t for the 64 bit field(s).
- * (Cannot be used to move data on/off the wire, due to alignment concerns.)
- */
-struct nfsfsinfo {
-	uint32_t fs_rtmax;
-	uint32_t fs_rtpref;
-	uint32_t fs_rtmult;
-	uint32_t fs_wtmax;
-	uint32_t fs_wtpref;
-	uint32_t fs_wtmult;
-	uint32_t fs_dtpref;
-	u_int64_t fs_maxfilesize;
-	struct timespec fs_timedelta;
-	uint32_t fs_properties;
-};
-
-/*
- * Bits for fs_properties
- */
-#define	NFSV3_FSFLINK		0x1
-#define	NFSV3_FSFSYMLINK	0x2
-#define	NFSV3_FSFHOMOGENEOUS	0x4
-#define	NFSV3_FSFCANSETTIME	0x8
-
-/*
- * Yikes, overload fs_rtmult as fs_maxname for V4.
- */
-#define	fs_maxname	fs_rtmult
-
-struct nfsv3_pathconf {
-	uint32_t pc_linkmax;
-	uint32_t pc_namemax;
-	uint32_t pc_notrunc;
-	uint32_t pc_chownrestricted;
-	uint32_t pc_caseinsensitive;
-	uint32_t pc_casepreserving;
-};
-
-/*
- * NFS V4 data structures.
- */
-struct nfsv4stateid {
-	uint32_t	seqid;
-	uint32_t	other[NFSX_STATEIDOTHER / NFSX_UNSIGNED];
-};
-typedef struct nfsv4stateid nfsv4stateid_t;
-
-#endif	/* _NFS_NFSPROTO_H_ */
diff --git a/include.new/fs/nfs/nfsrvcache.h b/include.new/fs/nfs/nfsrvcache.h
deleted file mode 100644
index 5f84fad..0000000
--- a/include.new/fs/nfs/nfsrvcache.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/fs/nfs/nfsrvcache.h 269655 2014-08-07 03:50:30Z kib $
- */
-
-#ifndef _NFS_NFSRVCACHE_H_
-#define	_NFS_NFSRVCACHE_H_
-
-/*
- * Definitions for the server recent request cache
- */
-#define	NFSRVCACHE_MAX_SIZE	2048
-#define	NFSRVCACHE_MIN_SIZE	  64
-
-#define	NFSRVCACHE_HASHSIZE	500
-
-/* Cache table entry. */
-struct nfsrvcache {
-	LIST_ENTRY(nfsrvcache) rc_hash;		/* Hash chain */
-	LIST_ENTRY(nfsrvcache) rc_ahash;	/* ACK hash chain */
-	TAILQ_ENTRY(nfsrvcache)	rc_lru;		/* UDP lru chain */
-	uint32_t	rc_xid;			/* rpc id number */
-	time_t		rc_timestamp;		/* Time done */
-	union {
-		mbuf_t repmb;			/* Reply mbuf list OR */
-		int repstat;			/* Reply status */
-	} rc_un;
-	union {
-		struct {
-			union nethostaddr haddr; /* Host address */
-		} udp;
-		struct {
-			u_int64_t	sockref;
-			uint32_t	len;
-			uint32_t	tcpseq;
-			int16_t		refcnt;
-			u_int16_t	cksum;
-			time_t		cachetime;
-			int		acked;
-		} ot;
-	} rc_un2;
-	u_int16_t	rc_proc;		/* rpc proc number */
-	u_int16_t	rc_flag;		/* Flag bits */
-};
-
-#define	rc_reply	rc_un.repmb
-#define	rc_status	rc_un.repstat
-#define	rc_inet		rc_un2.udp.haddr.had_inet.s_addr
-#define	rc_inet6	rc_un2.udp.haddr.had_inet6
-#define	rc_haddr	rc_un2.udp.haddr
-#define	rc_sockref	rc_un2.ot.sockref
-#define	rc_tcpseq	rc_un2.ot.tcpseq
-#define	rc_refcnt	rc_un2.ot.refcnt
-#define	rc_reqlen	rc_un2.ot.len
-#define	rc_cksum	rc_un2.ot.cksum
-#define	rc_cachetime	rc_un2.ot.cachetime
-#define	rc_acked	rc_un2.ot.acked
-
-/* TCP ACK values */
-#define	RC_NO_SEQ		0
-#define	RC_NO_ACK		1
-#define	RC_ACK			2
-#define	RC_NACK			3
-
-/* Return values */
-#define	RC_DROPIT		0
-#define	RC_REPLY		1
-#define	RC_DOIT			2
-
-/* Flag bits */
-#define	RC_LOCKED	0x0001
-#define	RC_WANTED	0x0002
-#define	RC_REPSTATUS	0x0004
-#define	RC_REPMBUF	0x0008
-#define	RC_UDP		0x0010
-#define	RC_INETIPV6	0x0020
-#define	RC_INPROG	0x0040
-#define	RC_NFSV2	0x0100
-#define	RC_NFSV3	0x0200
-#define	RC_NFSV4	0x0400
-#define	RC_NFSVERS	(RC_NFSV2 | RC_NFSV3 | RC_NFSV4)
-#define	RC_REFCNT	0x0800
-#define	RC_SAMETCPCONN	0x1000
-
-LIST_HEAD(nfsrvhashhead, nfsrvcache);
-
-/* The fine-grained locked cache hash table for TCP. */
-struct nfsrchash_bucket {
-	struct mtx		mtx;
-	struct nfsrvhashhead	tbl;
-};
-
-#endif	/* _NFS_NFSRVCACHE_H_ */
diff --git a/include.new/fs/nfs/nfsrvstate.h b/include.new/fs/nfs/nfsrvstate.h
deleted file mode 100644
index bd901fb..0000000
--- a/include.new/fs/nfs/nfsrvstate.h
+++ /dev/null
@@ -1,297 +0,0 @@
-/*-
- * Copyright (c) 2009 Rick Macklem, University of Guelph
- * 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.
- *
- * 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: releng/10.2/sys/fs/nfs/nfsrvstate.h 284216 2015-06-10 12:17:19Z rmacklem $
- */
-
-#ifndef _NFS_NFSRVSTATE_H_
-#define	_NFS_NFSRVSTATE_H_
-
-/*
- * Definitions for NFS V4 server state handling.
- */
-
-/*
- * List heads for nfsclient, nfsstate and nfslockfile.
- * (Some systems seem to like to dynamically size these things, but I
- *  don't see any point in doing so for these ones.)
- */
-LIST_HEAD(nfsclienthashhead, nfsclient);
-LIST_HEAD(nfsstatehead, nfsstate);
-LIST_HEAD(nfslockhead, nfslock);
-LIST_HEAD(nfslockhashhead, nfslockfile);
-LIST_HEAD(nfssessionhead, nfsdsession);
-LIST_HEAD(nfssessionhashhead, nfsdsession);
-
-/*
- * List head for nfsusrgrp.
- */
-LIST_HEAD(nfsuserhashhead, nfsusrgrp);
-TAILQ_HEAD(nfsuserlruhead, nfsusrgrp);
-
-#define	NFSCLIENTHASH(id)						\
-	(&nfsclienthash[(id).lval[1] % nfsrv_clienthashsize])
-#define	NFSSTATEHASH(clp, id)						\
-	(&((clp)->lc_stateid[(id).other[2] % nfsrv_statehashsize]))
-#define	NFSUSERHASH(id)							\
-	(&nfsuserhash[(id) % NFSUSERHASHSIZE])
-#define	NFSUSERNAMEHASH(p, l)						\
-	(&nfsusernamehash[((l)>=4?(*(p)+*((p)+1)+*((p)+2)+*((p)+3)):*(p)) \
-		% NFSUSERHASHSIZE])
-#define	NFSGROUPHASH(id)						\
-	(&nfsgrouphash[(id) % NFSGROUPHASHSIZE])
-#define	NFSGROUPNAMEHASH(p, l)						\
-	(&nfsgroupnamehash[((l)>=4?(*(p)+*((p)+1)+*((p)+2)+*((p)+3)):*(p)) \
-		% NFSGROUPHASHSIZE])
-
-struct nfssessionhash {
-	struct mtx			mtx;
-	struct nfssessionhashhead	list;
-};
-#define	NFSSESSIONHASH(f) 						\
-	(&nfssessionhash[nfsrv_hashsessionid(f) % nfsrv_sessionhashsize])
-
-/*
- * Client server structure for V4. It is doubly linked into two lists.
- * The first is a hash table based on the clientid and the second is a
- * list of all clients maintained in LRU order.
- * The actual size malloc'd is large enough to accomodate the id string.
- */
-struct nfsclient {
-	LIST_ENTRY(nfsclient) lc_hash;		/* Clientid hash list */
-	struct nfsstatehead *lc_stateid;	/* Stateid hash */
-	struct nfsstatehead lc_open;		/* Open owner list */
-	struct nfsstatehead lc_deleg;		/* Delegations */
-	struct nfsstatehead lc_olddeleg;	/* and old delegations */
-	struct nfssessionhead lc_session;	/* List of NFSv4.1 sessions */
-	time_t		lc_expiry;		/* Expiry time (sec) */
-	time_t		lc_delegtime;		/* Old deleg expiry (sec) */
-	nfsquad_t	lc_clientid;		/* 64 bit clientid */
-	nfsquad_t	lc_confirm;		/* 64 bit confirm value */
-	uint32_t	lc_program;		/* RPC Program # */
-	uint32_t	lc_callback;		/* Callback id */
-	uint32_t	lc_stateindex;		/* Current state index# */
-	uint32_t	lc_statemaxindex;	/* Max state index# */
-	uint32_t	lc_cbref;		/* Cnt of callbacks */
-	uid_t		lc_uid;			/* User credential */
-	gid_t		lc_gid;
-	u_int16_t	lc_idlen;		/* Client ID and len */
-	u_int16_t	lc_namelen;		/* plus GSS principal and len */
-	u_char		*lc_name;
-	struct nfssockreq lc_req;		/* Callback info */
-	uint32_t	lc_flags;		/* LCL_ flag bits */
-	u_char		lc_verf[NFSX_VERF];	 /* client verifier */
-	u_char		lc_id[1];		/* Malloc'd correct size */
-};
-
-#define	CLOPS_CONFIRM		0x0001
-#define	CLOPS_RENEW		0x0002
-#define	CLOPS_RENEWOP		0x0004
-
-/*
- * Structure for an NFSv4.1 session.
- * Locking rules for this structure.
- * To add/delete one of these structures from the lists, you must lock
- * both: NFSLOCKSESSION(session hashhead) and NFSLOCKSTATE() in that order.
- * To traverse the lists looking for one of these, you must hold one
- * of these two locks.
- * The exception is if the thread holds the exclusive root sleep lock.
- * In this case, all other nfsd threads are blocked, so locking the
- * mutexes isn't required.
- * When manipulating sess_refcnt, NFSLOCKSTATE() must be locked.
- * When manipulating the fields withinsess_cbsess except nfsess_xprt,
- * sess_cbsess.nfsess_mtx must be locked.
- * When manipulating sess_slots and sess_cbsess.nfsess_xprt,
- * NFSLOCKSESSION(session hashhead) must be locked.
- */
-struct nfsdsession {
-	uint64_t		sess_refcnt;	/* Reference count. */
-	LIST_ENTRY(nfsdsession)	sess_hash;	/* Hash list of sessions. */
-	LIST_ENTRY(nfsdsession)	sess_list;	/* List of client sessions. */
-	struct nfsslot		sess_slots[NFSV4_SLOTS];
-	struct nfsclient	*sess_clp;	/* Associated clientid. */
-	uint32_t		sess_crflags;
-	uint32_t		sess_cbprogram;
-	uint32_t		sess_maxreq;
-	uint32_t		sess_maxresp;
-	uint32_t		sess_maxrespcached;
-	uint32_t		sess_maxops;
-	uint32_t		sess_maxslots;
-	uint32_t		sess_cbmaxreq;
-	uint32_t		sess_cbmaxresp;
-	uint32_t		sess_cbmaxrespcached;
-	uint32_t		sess_cbmaxops;
-	uint8_t			sess_sessionid[NFSX_V4SESSIONID];
-	struct nfsclsession	sess_cbsess;	/* Callback session. */
-};
-
-/*
- * Nfs state structure. I couldn't resist overloading this one, since
- * it makes cleanup, etc. simpler. These structures are used in four ways:
- * - open_owner structures chained off of nfsclient
- * - open file structures chained off an open_owner structure
- * - lock_owner structures chained off an open file structure
- * - delegated file structures chained off of nfsclient and nfslockfile
- * - the ls_list field is used for the chain it is in
- * - the ls_head structure is used to chain off the sibling structure
- *   (it is a union between an nfsstate and nfslock structure head)
- *    If it is a lockowner stateid, nfslock structures hang off it.
- * For the open file and lockowner cases, it is in the hash table in
- * nfsclient for stateid.
- */
-struct nfsstate {
-	LIST_ENTRY(nfsstate)	ls_hash;	/* Hash list entry */
-	LIST_ENTRY(nfsstate)	ls_list;	/* List of opens/delegs */
-	LIST_ENTRY(nfsstate)	ls_file;	/* Opens/Delegs for a file */
-	union {
-		struct nfsstatehead	open; /* Opens list */
-		struct nfslockhead	lock; /* Locks list */
-	} ls_head;
-	nfsv4stateid_t		ls_stateid;	/* The state id */
-	uint32_t		ls_seq;		/* seq id */
-	uid_t			ls_uid;		/* uid of locker */
-	uint32_t		ls_flags;	/* Type of lock, etc. */
-	union {
-		struct nfsstate	*openowner;	/* Open only */
-		uint32_t	opentolockseq;	/* Lock call only */
-		uint32_t	noopens;	/* Openowner only */
-		struct {
-			u_quad_t	filerev; /* Delegations only */
-			time_t		expiry;
-			time_t		limit;
-			u_int64_t	compref;
-		} deleg;
-	} ls_un;
-	struct nfslockfile	*ls_lfp;	/* Back pointer */
-	struct nfsrvcache	*ls_op;		/* Op cache reference */
-	struct nfsclient	*ls_clp;	/* Back pointer */
-	u_short			ls_ownerlen;	/* Length of ls_owner */
-	u_char			ls_owner[1];	/* malloc'd the correct size */
-};
-#define	ls_lock			ls_head.lock
-#define	ls_open			ls_head.open
-#define	ls_opentolockseq	ls_un.opentolockseq
-#define	ls_openowner		ls_un.openowner
-#define	ls_openstp		ls_un.openowner
-#define	ls_noopens		ls_un.noopens
-#define	ls_filerev		ls_un.deleg.filerev
-#define	ls_delegtime		ls_un.deleg.expiry
-#define	ls_delegtimelimit	ls_un.deleg.limit
-#define	ls_compref		ls_un.deleg.compref
-
-/*
- * Nfs lock structure.
- * This structure is chained off of the nfsstate (the lockowner) and
- * nfslockfile (the file) structures, for the file and owner it
- * refers to. It holds flags and a byte range.
- * It also has back pointers to the associated lock_owner and lockfile.
- */
-struct nfslock {
-	LIST_ENTRY(nfslock)	lo_lckowner;
-	LIST_ENTRY(nfslock)	lo_lckfile;
-	struct nfsstate		*lo_stp;
-	struct nfslockfile	*lo_lfp;
-	u_int64_t		lo_first;
-	u_int64_t		lo_end;
-	uint32_t		lo_flags;
-};
-
-/*
- * Structure used to return a conflicting lock. (Must be large
- * enough for the largest lock owner we can have.)
- */
-struct nfslockconflict {
-	nfsquad_t		cl_clientid;
-	u_int64_t		cl_first;
-	u_int64_t		cl_end;
-	uint32_t		cl_flags;
-	u_short			cl_ownerlen;
-	u_char			cl_owner[NFSV4_OPAQUELIMIT];
-};
-
-/*
- * This structure is used to keep track of local locks that might need
- * to be rolled back.
- */
-struct nfsrollback {
-	LIST_ENTRY(nfsrollback)	rlck_list;
-	uint64_t		rlck_first;
-	uint64_t		rlck_end;
-	int			rlck_type;
-};
-
-/*
- * This structure refers to a file for which lock(s) and/or open(s) exist.
- * Searched via hash table on file handle or found via the back pointer from an
- * open or lock owner.
- */
-struct nfslockfile {
-	LIST_HEAD(, nfsstate)	lf_open;	/* Open list */
-	LIST_HEAD(, nfsstate)	lf_deleg;	/* Delegation list */
-	LIST_HEAD(, nfslock)	lf_lock;	/* Lock list */
-	LIST_HEAD(, nfslock)	lf_locallock;	/* Local lock list */
-	LIST_HEAD(, nfsrollback) lf_rollback;	/* Local lock rollback list */
-	LIST_ENTRY(nfslockfile)	lf_hash;	/* Hash list entry */
-	fhandle_t		lf_fh;		/* The file handle */
-	struct nfsv4lock	lf_locallock_lck; /* serialize local locking */
-	int			lf_usecount;	/* Ref count for locking */
-};
-
-/*
- * This structure is malloc'd an chained off hash lists for user/group
- * names.
- */
-struct nfsusrgrp {
-	TAILQ_ENTRY(nfsusrgrp)	lug_lru;	/* LRU list */
-	LIST_ENTRY(nfsusrgrp)	lug_numhash;	/* Hash by id# */
-	LIST_ENTRY(nfsusrgrp)	lug_namehash;	/* and by name */
-	time_t			lug_expiry;	/* Expiry time in sec */
-	union {
-		uid_t		un_uid;		/* id# */
-		gid_t		un_gid;
-	} lug_un;
-	int			lug_namelen;	/* Name length */
-	u_char			lug_name[1];	/* malloc'd correct length */
-};
-#define	lug_uid		lug_un.un_uid
-#define	lug_gid		lug_un.un_gid
-
-/*
- * These structures are used for the stable storage restart stuff.
- */
-/*
- * Record at beginning of file.
- */
-struct nfsf_rec {
-	uint32_t	lease;			/* Lease duration */
-	uint32_t	numboots;		/* Number of boottimes */
-};
-
-#if defined(_KERNEL) || defined(KERNEL)
-void nfsrv_cleanclient(struct nfsclient *, NFSPROC_T *);
-void nfsrv_freedeleglist(struct nfsstatehead *);
-#endif
-
-#endif	/* _NFS_NFSRVSTATE_H_ */
diff --git a/include.new/fs/nfs/nfsv4_errstr.h b/include.new/fs/nfs/nfsv4_errstr.h
deleted file mode 100644
index 0d99270..0000000
--- a/include.new/fs/nfs/nfsv4_errstr.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 2009 Rick Macklem, University of Guelph
- * 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.
- *
- * 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: releng/10.2/sys/fs/nfs/nfsv4_errstr.h 191783 2009-05-04 15:23:58Z rmacklem $
- */
-
-#ifndef _NFS_NFSV4ERRSTR_H_
-#define	_NFS_NFSV4ERRSTR_H_
-
-/*
- * Defines static storage in the C file, but I can't be bothered creating
- * a library of one function for this, since it is only currently used by
- * mount_newnfs.c.
- */
-static const char *nfsv4_errstr[48] = {
-	"Illegal filehandle",
-	"Undefined NFSv4 err",
-	"READDIR cookie is stale",
-	"operation not supported",
-	"response limit exceeded",
-	"undefined server error",
-	"type invalid for CREATE",
-	"file busy - retry",
-	"nverify says attrs same",
-	"lock unavailable",
-	"lock lease expired",
-	"I/O failed due to lock",
-	"in grace period",
-	"filehandle expired",
-	"share reserve denied",
-	"wrong security flavor",
-	"clientid in use",
-	"resource exhaustion",
-	"filesystem relocated",
-	"current FH is not set",
-	"minor vers not supp",
-	"server has rebooted",
-	"server has rebooted",
-	"state is out of sync",
-	"incorrect stateid",
-	"request is out of seq",
-	"verify - attrs not same",
-	"lock range not supported",
-	"should be file/directory",
-	"no saved filehandle",
-	"some filesystem moved",
-	"recommended attr not sup",
-	"reclaim outside of grace",
-	"reclaim error at server",
-	"conflict on reclaim",
-	"XDR decode failed",
-	"file locks held at CLOSE",
-	"conflict in OPEN and I/O",
-	"owner translation bad",
-	"utf-8 char not supported",
-	"name not supported",
-	"lock range not supported",
-	"no atomic up/downgrade",
-	"undefined operation",
-	"file locking deadlock",
-	"open file blocks op",
-	"lockowner state revoked",
-	"callback path down"
-};
-
-/*
- * Return the error string for the NFS4ERR_xxx. The pointers returned are
- * static and must not be free'd.
- */
-static const char *
-nfsv4_geterrstr(int errval)
-{
-
-	if (errval < NFSERR_BADHANDLE || errval > NFSERR_CBPATHDOWN)
-		return (NULL);
-	return (nfsv4_errstr[errval - NFSERR_BADHANDLE]);
-}
-
-#endif	/* _NFS_NFSV4ERRSTR_H_ */
diff --git a/include.new/fs/nfs/rpcv2.h b/include.new/fs/nfs/rpcv2.h
deleted file mode 100644
index 6167360..0000000
--- a/include.new/fs/nfs/rpcv2.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/fs/nfs/rpcv2.h 191783 2009-05-04 15:23:58Z rmacklem $
- */
-
-#ifndef _NFS_RPCV2_H_
-#define	_NFS_RPCV2_H_
-
-/*
- * Definitions for Sun RPC Version 2, from
- * "RPC: Remote Procedure Call Protocol Specification" RFC1057
- */
-
-/* Version # */
-#define	RPC_VER2		2
-
-/* Authentication flavours */
-#define	RPCAUTH_NULL			0
-#define	RPCAUTH_UNIX			1
-#define	RPCAUTH_SHORT			2
-#define	RPCAUTH_KERB4			4
-#define	RPCAUTH_GSS			6
-#define	RPCAUTH_GSSKRB5			390003
-#define	RPCAUTH_GSSKRB5INTEGRITY	390004
-#define	RPCAUTH_GSSKRB5PRIVACY		390005
-
-#define	RPCAUTH_MAXSIZ		400
-#define	RPCVERF_MAXSIZ	12	/* For Kerb, can actually be 400 */
-
-/*
- * RPCAUTH_UNIX defs.
- */
-#define	RPCAUTHUNIX_MINSIZ	(5 * NFSX_UNSIGNED)
-#define	RPCAUTH_UNIXGIDS 16
-
-/*
- * RPCAUTH_GSS defs.
- */
-#define	RPCAUTHGSS_VERS1	1
-
-#define	RPCAUTHGSS_DATA		0
-#define	RPCAUTHGSS_INIT		1
-#define	RPCAUTHGSS_CONTINIT	2
-#define	RPCAUTHGSS_DESTROY	3
-
-#define	RPCAUTHGSS_SVCNONE	1
-#define	RPCAUTHGSS_SVCINTEGRITY	2
-#define	RPCAUTHGSS_SVCPRIVACY	3
-
-#define	RPCAUTHGSS_MAXSEQ	0x80000000
-
-#define	RPCAUTHGSS_WINDOW	64	/* # of bits in u_int64_t */
-#define	RPCAUTHGSS_SEQWINDOW	(RPCAUTHGSS_WINDOW + 1)
-
-#define	RPCAUTHGSS_MIC		1
-#define	RPCAUTHGSS_WRAP		2
-
-/*
- * Qop values for the types of security services.
- */
-#define	GSS_KERBV_QOP		0
-
-/*
- * Sizes of GSS stuff.
- */
-#define	RPCGSS_KEYSIZ		8
-
-#define	GSSX_AUTHHEAD	(5 * NFSX_UNSIGNED)
-#define	GSSX_MYHANDLE	(sizeof (long) + sizeof (u_int64_t))
-#define	GSSX_RPCHEADER	(13 * NFSX_UNSIGNED + GSSX_MYHANDLE)
-#define	GSSX_MINWRAP	(2 * NFSX_UNSIGNED)
-#define	GSSX_KERBVTOKEN	24
-#define	GSSX_LOCALHANDLE (sizeof (void *))
-
-/*
- * Stuff for the gssd.
- */
-#define	RPCPROG_GSSD		0x20101010
-#define	RPCGSSD_VERS		1
-#define	RPCGSSD_INIT		1
-#define	RPCGSSD_CONTINIT	2
-#define	RPCGSSD_CONTINITDESTROY	3
-#define	RPCGSSD_CLINIT		4
-#define	RPCGSSD_CLINITUID	5
-#define	RPCGSSD_CLCONT		6
-#define	RPCGSSD_CLCONTUID	7
-#define	RPCGSSD_CLINITNAME	8
-#define	RPCGSSD_CLCONTNAME	9
-
-/*
- * Stuff for the nfsuserd
- */
-#define	RPCPROG_NFSUSERD	0x21010101
-#define	RPCNFSUSERD_VERS	1
-#define	RPCNFSUSERD_GETUID	1
-#define	RPCNFSUSERD_GETGID	2
-#define	RPCNFSUSERD_GETUSER	3
-#define	RPCNFSUSERD_GETGROUP	4
-
-/*
- * Some major status codes.
- */
-#if !defined(_GSSAPI_H_) && !defined(GSSAPI_H_) && !defined(_GSSAPI_GSSAPI_H_) && !defined(_RPCSEC_GSS_H)
-#define	 GSS_S_COMPLETE                  0x00000000
-#define	 GSS_S_CONTINUE_NEEDED           0x00000001
-#define	 GSS_S_DUPLICATE_TOKEN           0x00000002
-#define	 GSS_S_OLD_TOKEN                 0x00000004
-#define	 GSS_S_UNSEQ_TOKEN               0x00000008
-#define	 GSS_S_GAP_TOKEN                 0x00000010
-#define	 GSS_S_BAD_MECH                  0x00010000
-#define	 GSS_S_BAD_NAME                  0x00020000
-#define	 GSS_S_BAD_NAMETYPE              0x00030000
-#define	 GSS_S_BAD_BINDINGS              0x00040000
-#define	 GSS_S_BAD_STATUS                0x00050000
-#define	 GSS_S_BAD_MIC                   0x00060000
-#define	 GSS_S_BAD_SIG                   0x00060000
-#define	 GSS_S_NO_CRED                   0x00070000
-#define	 GSS_S_NO_CONTEXT                0x00080000
-#define	 GSS_S_DEFECTIVE_TOKEN           0x00090000
-#define	 GSS_S_DEFECTIVE_CREDENTIAL      0x000a0000
-#define	 GSS_S_CREDENTIALS_EXPIRED       0x000b0000
-#define	 GSS_S_CONTEXT_EXPIRED           0x000c0000
-#define	 GSS_S_FAILURE                   0x000d0000
-#define	 GSS_S_BAD_QOP                   0x000e0000
-#define	 GSS_S_UNAUTHORIZED              0x000f0000
-#define	 GSS_S_UNAVAILABLE               0x00100000
-#define	 GSS_S_DUPLICATE_ELEMENT         0x00110000
-#define	 GSS_S_NAME_NOT_MN               0x00120000
-#define	 GSS_S_CALL_INACCESSIBLE_READ    0x01000000
-#define	 GSS_S_CALL_INACCESSIBLE_WRITE   0x02000000
-#define	 GSS_S_CALL_BAD_STRUCTURE        0x03000000
-#endif	/* _GSSAPI_H_ */
-
-/* Rpc Constants */
-#define	RPC_CALL	0
-#define	RPC_REPLY	1
-#define	RPC_MSGACCEPTED	0
-#define	RPC_MSGDENIED	1
-#define	RPC_PROGUNAVAIL	1
-#define	RPC_PROGMISMATCH	2
-#define	RPC_PROCUNAVAIL	3
-#define	RPC_GARBAGE	4		/* I like this one */
-#define	RPC_MISMATCH	0
-#define	RPC_AUTHERR	1
-
-/* Authentication failures */
-#define	AUTH_BADCRED	1
-#define	AUTH_REJECTCRED	2
-#define	AUTH_BADVERF	3
-#define	AUTH_REJECTVERF	4
-#define	AUTH_TOOWEAK	5		/* Give em wheaties */
-#define	AUTH_PROBCRED	13
-#define	AUTH_CTXCRED	14
-
-/* Sizes of rpc header parts */
-#define	RPC_SIZ		24
-#define	RPC_REPLYSIZ	28
-
-/* RPC Prog definitions */
-#define	RPCPROG_MNT	100005
-#define	RPCMNT_VER1	1
-#define	RPCMNT_VER3	3
-#define	RPCMNT_MOUNT	1
-#define	RPCMNT_DUMP	2
-#define	RPCMNT_UMOUNT	3
-#define	RPCMNT_UMNTALL	4
-#define	RPCMNT_EXPORT	5
-#define	RPCMNT_NAMELEN	255
-#define	RPCMNT_PATHLEN	1024
-#define	RPCPROG_NFS	100003
- 
-/* Structs for common parts of the rpc's */
-struct rpcv2_time {
-	uint32_t rpc_sec;
-	uint32_t rpc_usec;
-};
-
-#endif	/* _NFS_RPCV2_H_ */
diff --git a/include.new/fs/nfs/xdr_subs.h b/include.new/fs/nfs/xdr_subs.h
deleted file mode 100644
index aa87f25..0000000
--- a/include.new/fs/nfs/xdr_subs.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/fs/nfs/xdr_subs.h 191783 2009-05-04 15:23:58Z rmacklem $
- */
-
-#ifndef _NFS_XDR_SUBS_H_
-#define	_NFS_XDR_SUBS_H_
-
-/*
- * Macros used for conversion to/from xdr representation by nfs...
- * These use the MACHINE DEPENDENT routines ntohl, htonl
- * As defined by "XDR: External Data Representation Standard" RFC1014
- *
- * To simplify the implementation, we use ntohl/htonl even on big-endian
- * machines, and count on them being `#define'd away.  Some of these
- * might be slightly more efficient as quad_t copies on a big-endian,
- * but we cannot count on their alignment anyway.
- */
-
-#define	fxdr_unsigned(t, v)	((t)ntohl((int32_t)(v)))
-#define	txdr_unsigned(v)	(htonl((int32_t)(v)))
-
-#define	fxdr_nfsv2time(f, t) do { 					\
-    (t)->tv_sec = ntohl(((struct nfsv2_time *)(f))->nfsv2_sec); 	\
-    if (((struct nfsv2_time *)(f))->nfsv2_usec != 0xffffffff) 		\
-	(t)->tv_nsec = 1000 * ntohl(((struct nfsv2_time *)(f))->nfsv2_usec); \
-    else 								\
-	(t)->tv_nsec = 0; 						\
-    } while (0)
-
-#define	txdr_nfsv2time(f, t) do { 					\
-    ((struct nfsv2_time *)(t))->nfsv2_sec = htonl((f)->tv_sec); 	\
-    if ((f)->tv_nsec != -1) 						\
-	((struct nfsv2_time *)(t))->nfsv2_usec = htonl((f)->tv_nsec / 1000); \
-    else 								\
-	((struct nfsv2_time *)(t))->nfsv2_usec = 0xffffffff; 		\
-    } while (0)
-
-#define	fxdr_nfsv3time(f, t) do { 					\
-	(t)->tv_sec = ntohl(((struct nfsv3_time *)(f))->nfsv3_sec); 	\
-	(t)->tv_nsec = ntohl(((struct nfsv3_time *)(f))->nfsv3_nsec); 	\
-    } while (0)
-
-#define	txdr_nfsv3time(f, t) do { 					\
-	((struct nfsv3_time *)(t))->nfsv3_sec = htonl((f)->tv_sec); 	\
-	((struct nfsv3_time *)(t))->nfsv3_nsec = htonl((f)->tv_nsec); 	\
-    } while (0)
-
-#define	fxdr_nfsv4time(f, t) do { 					\
-	(t)->tv_sec = ntohl(((struct nfsv4_time *)(f))->nfsv4_sec); 	\
-	(t)->tv_nsec = (ntohl(((struct nfsv4_time *)(f))->nfsv4_nsec) % \
-		1000000000); 						\
-    } while (0)
-
-#define	txdr_nfsv4time(f, t) do { 					\
-	((struct nfsv4_time *)(t))->nfsv4_highsec = 0; 			\
-	((struct nfsv4_time *)(t))->nfsv4_sec = htonl((f)->tv_sec); 	\
-	((struct nfsv4_time *)(t))->nfsv4_nsec = htonl((f)->tv_nsec); 	\
-    } while (0)
-
-#define	fxdr_hyper(f) 							\
-        ((((u_quad_t)ntohl(((uint32_t *)(f))[0])) << 32) |		\
-	 (u_quad_t)(ntohl(((uint32_t *)(f))[1])))
-
-#define	txdr_hyper(f, t) do {						\
-	((uint32_t *)(t))[0] = htonl((uint32_t)((f) >> 32));		\
-	((uint32_t *)(t))[1] = htonl((uint32_t)((f) & 0xffffffff));	\
-    } while (0)
-
-#endif	/* _NFS_XDR_SUBS_H_ */
diff --git a/include.new/fs/ntfs/ntfs.h b/include.new/fs/ntfs/ntfs.h
deleted file mode 100644
index 58b7c7c..0000000
--- a/include.new/fs/ntfs/ntfs.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*	$NetBSD: ntfs.h,v 1.9 1999/10/31 19:45:26 jdolecek Exp $	*/
-
-/*-
- * Copyright (c) 1998, 1999 Semen Ustimenko
- * 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.
- *
- * 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/fs/ntfs/ntfs.h,v 1.19 2004/12/06 20:22:16 phk Exp $
- */
-
-/*#define NTFS_DEBUG 1*/
-
-typedef u_int64_t cn_t;
-typedef u_int16_t wchar;
-
-#pragma pack(1)
-#define BBSIZE			1024
-#define	BBOFF			((off_t)(0))
-#define	BBLOCK			((daddr_t)(0))
-#define	NTFS_MFTINO		0
-#define	NTFS_VOLUMEINO		3
-#define	NTFS_ATTRDEFINO		4
-#define	NTFS_ROOTINO		5
-#define	NTFS_BITMAPINO		6
-#define	NTFS_BOOTINO		7
-#define	NTFS_BADCLUSINO		8
-#define	NTFS_UPCASEINO		10
-#define NTFS_MAXFILENAME	255
-
-struct fixuphdr {
-	uint32_t       fh_magic;
-	u_int16_t       fh_foff;
-	u_int16_t       fh_fnum;
-};
-
-#define NTFS_AF_INRUN	0x00000001
-struct attrhdr {
-	uint32_t       a_type;
-	uint32_t       reclen;
-	u_int8_t        a_flag;
-	u_int8_t        a_namelen;
-	u_int8_t        a_nameoff;
-	u_int8_t        reserved1;
-	u_int8_t        a_compression;
-	u_int8_t        reserved2;
-	u_int16_t       a_index;
-};
-#define NTFS_A_STD	0x10
-#define NTFS_A_ATTRLIST	0x20
-#define NTFS_A_NAME	0x30
-#define NTFS_A_VOLUMENAME	0x60
-#define NTFS_A_DATA	0x80
-#define	NTFS_A_INDXROOT	0x90
-#define	NTFS_A_INDX	0xA0
-#define NTFS_A_INDXBITMAP 0xB0
-
-#define NTFS_MAXATTRNAME	255
-struct attr {
-	struct attrhdr  a_hdr;
-	union {
-		struct {
-			u_int16_t       a_datalen;
-			u_int16_t       reserved1;
-			u_int16_t       a_dataoff;
-			u_int16_t       a_indexed;
-		}               a_S_r;
-		struct {
-			cn_t            a_vcnstart;
-			cn_t            a_vcnend;
-			u_int16_t       a_dataoff;
-			u_int16_t       a_compressalg;
-			uint32_t       reserved1;
-			u_int64_t       a_allocated;
-			u_int64_t       a_datalen;
-			u_int64_t       a_initialized;
-		}               a_S_nr;
-	}               a_S;
-};
-#define a_r	a_S.a_S_r
-#define a_nr	a_S.a_S_nr
-
-typedef struct {
-	u_int64_t       t_create;
-	u_int64_t       t_write;
-	u_int64_t       t_mftwrite;
-	u_int64_t       t_access;
-}               ntfs_times_t;
-
-#define NTFS_FFLAG_RDONLY	0x01LL
-#define NTFS_FFLAG_HIDDEN	0x02LL
-#define NTFS_FFLAG_SYSTEM	0x04LL
-#define NTFS_FFLAG_ARCHIVE	0x20LL
-#define NTFS_FFLAG_COMPRESSED	0x0800LL
-#define NTFS_FFLAG_DIR		0x10000000LL
-
-struct attr_name {
-	uint32_t       n_pnumber;	/* Parent ntnode */
-	uint32_t       reserved;
-	ntfs_times_t    n_times;
-	u_int64_t       n_size;
-	u_int64_t       n_attrsz;
-	u_int64_t       n_flag;
-	u_int8_t        n_namelen;
-	u_int8_t        n_nametype;
-	u_int16_t       n_name[1];
-};
-
-#define NTFS_IRFLAG_INDXALLOC	0x00000001
-struct attr_indexroot {
-	uint32_t       ir_unkn1;	/* always 0x30 */
-	uint32_t       ir_unkn2;	/* always 0x1 */
-	uint32_t       ir_size;/* ??? */
-	uint32_t       ir_unkn3;	/* number of cluster */
-	uint32_t       ir_unkn4;	/* always 0x10 */
-	uint32_t       ir_datalen;	/* sizeof simething */
-	uint32_t       ir_allocated;	/* same as above */
-	u_int16_t       ir_flag;/* ?? always 1 */
-	u_int16_t       ir_unkn7;
-};
-
-struct attr_attrlist {
-	uint32_t       al_type;	/* Attribute type */
-	u_int16_t       reclen;		/* length of this entry */
-	u_int8_t        al_namelen;	/* Attribute name len */
-	u_int8_t        al_nameoff;	/* Name offset from entry start */
-	u_int64_t       al_vcnstart;	/* VCN number */
-	uint32_t       al_inumber;	/* Parent ntnode */
-	uint32_t       reserved;
-	u_int16_t       al_index;	/* Attribute index in MFT record */
-	u_int16_t       al_name[1];	/* Name */
-};
-
-#define	NTFS_INDXMAGIC	(uint32_t)(0x58444E49)
-struct attr_indexalloc {
-	struct fixuphdr ia_fixup;
-	u_int64_t       unknown1;
-	cn_t            ia_bufcn;
-	u_int16_t       ia_hdrsize;
-	u_int16_t       unknown2;
-	uint32_t       ia_inuse;
-	uint32_t       ia_allocated;
-};
-
-#define	NTFS_IEFLAG_SUBNODE	0x00000001
-#define	NTFS_IEFLAG_LAST	0x00000002
-
-struct attr_indexentry {
-	uint32_t       ie_number;
-	uint32_t       unknown1;
-	u_int16_t       reclen;
-	u_int16_t       ie_size;
-	uint32_t       ie_flag;/* 1 - has subnodes, 2 - last */
-	uint32_t       ie_fpnumber;
-	uint32_t       unknown2;
-	ntfs_times_t    ie_ftimes;
-	u_int64_t       ie_fallocated;
-	u_int64_t       ie_fsize;
-	u_int64_t       ie_fflag;
-	u_int8_t        ie_fnamelen;
-	u_int8_t        ie_fnametype;
-	wchar           ie_fname[NTFS_MAXFILENAME];
-	/* cn_t		ie_bufcn;	 buffer with subnodes */
-};
-
-#define	NTFS_FILEMAGIC	(uint32_t)(0x454C4946)
-#define	NTFS_FRFLAG_DIR	0x0002
-struct filerec {
-	struct fixuphdr fr_fixup;
-	u_int8_t        reserved[8];
-	u_int16_t       fr_seqnum;	/* Sequence number */
-	u_int16_t       fr_nlink;
-	u_int16_t       fr_attroff;	/* offset to attributes */
-	u_int16_t       fr_flags;	/* 1-nonresident attr, 2-directory */
-	uint32_t       fr_size;/* hdr + attributes */
-	uint32_t       fr_allocated;	/* allocated length of record */
-	u_int64_t       fr_mainrec;	/* main record */
-	u_int16_t       fr_attrnum;	/* maximum attr number + 1 ??? */
-};
-
-#define	NTFS_ATTRNAME_MAXLEN	0x40
-#define	NTFS_ADFLAG_NONRES	0x0080	/* Attrib can be non resident */
-#define	NTFS_ADFLAG_INDEX	0x0002	/* Attrib can be indexed */
-struct attrdef {
-	wchar		ad_name[NTFS_ATTRNAME_MAXLEN];
-	uint32_t	ad_type;
-	uint32_t	reserved1[2];
-	uint32_t	ad_flag;
-	u_int64_t	ad_minlen;
-	u_int64_t	ad_maxlen;	/* -1 for nonlimited */
-};
-
-struct ntvattrdef {
-	char		ad_name[0x40];
-	int		ad_namelen;
-	uint32_t	ad_type;
-};
-
-#define	NTFS_BBID	"NTFS    "
-#define	NTFS_BBIDLEN	8
-struct bootfile {
-	u_int8_t        reserved1[3];	/* asm jmp near ... */
-	u_int8_t        bf_sysid[8];	/* 'NTFS    ' */
-	u_int16_t       bf_bps;		/* bytes per sector */
-	u_int8_t        bf_spc;		/* sectors per cluster */
-	u_int8_t        reserved2[7];	/* unused (zeroed) */
-	u_int8_t        bf_media;	/* media desc. (0xF8) */
-	u_int8_t        reserved3[2];
-	u_int16_t       bf_spt;		/* sectors per track */
-	u_int16_t       bf_heads;	/* number of heads */
-	u_int8_t        reserver4[12];
-	u_int64_t       bf_spv;		/* sectors per volume */
-	cn_t            bf_mftcn;	/* $MFT cluster number */
-	cn_t            bf_mftmirrcn;	/* $MFTMirr cn */
-	u_int8_t        bf_mftrecsz;	/* MFT record size (clust) */
-					/* 0xF6 inducates 1/4 */
-	uint32_t       bf_ibsz;	/* index buffer size */
-	uint32_t       bf_volsn;	/* volume ser. num. */
-};
-
-#define	NTFS_SYSNODESNUM	0x0B
-struct ntfsmount {
-	struct mount   *ntm_mountp;	/* filesystem vfs structure */
-	struct bootfile ntm_bootfile;
-	struct g_consumer *ntm_cp;
-	struct bufobj  *ntm_bo;
-	struct vnode   *ntm_devvp;	/* block device mounted vnode */
-	struct vnode   *ntm_sysvn[NTFS_SYSNODESNUM];
-	uint32_t       ntm_bpmftrec;
-	uid_t           ntm_uid;
-	gid_t           ntm_gid;
-	mode_t          ntm_mode;
-	u_int           ntm_flag;
-	cn_t		ntm_cfree;
-	struct ntvattrdef *ntm_ad;
-	int		ntm_adnum;
- 	wchar *		ntm_82u;	/* 8bit to Unicode */
- 	char **		ntm_u28;	/* Unicode to 8 bit */
-	void *		ntm_ic_l2u;	/* Local to Unicode (iconv) */
-	void *		ntm_ic_u2l;	/* Unicode to Local (iconv) */
-};
-
-#define ntm_mftcn	ntm_bootfile.bf_mftcn
-#define ntm_mftmirrcn	ntm_bootfile.bf_mftmirrcn
-#define	ntm_mftrecsz	ntm_bootfile.bf_mftrecsz
-#define	ntm_spc		ntm_bootfile.bf_spc
-#define	ntm_bps		ntm_bootfile.bf_bps
-
-#pragma pack()
-
-#define	NTFS_NEXTREC(s, type) ((type)(((caddr_t) s) + (s)->reclen))
-
-/* Convert mount ptr to ntfsmount ptr. */
-#define VFSTONTFS(mp)	((struct ntfsmount *)((mp)->mnt_data))
-#define VTONT(v)	FTONT(VTOF(v))
-#define	VTOF(v)		((struct fnode *)((v)->v_data))
-#define	FTOV(f)		((f)->f_vp)
-#define	FTONT(f)	((f)->f_ip)
-#define ntfs_cntobn(cn)	(daddr_t)((cn) * (ntmp->ntm_spc))
-#define ntfs_cntob(cn)	(off_t)((cn) * (ntmp)->ntm_spc * (ntmp)->ntm_bps)
-#define ntfs_btocn(off)	(cn_t)((off) / ((ntmp)->ntm_spc * (ntmp)->ntm_bps))
-#define ntfs_btocl(off)	(cn_t)((off + ntfs_cntob(1) - 1) / ((ntmp)->ntm_spc * (ntmp)->ntm_bps))
-#define ntfs_btocnoff(off)	(off_t)((off) % ((ntmp)->ntm_spc * (ntmp)->ntm_bps))
-#define ntfs_bntob(bn)	(daddr_t)((bn) * (ntmp)->ntm_bps)
-
-#define	ntfs_bpbl	(daddr_t)((ntmp)->ntm_bps)
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_NTFSMNT);
-MALLOC_DECLARE(M_NTFSNTNODE);
-MALLOC_DECLARE(M_NTFSFNODE);
-MALLOC_DECLARE(M_NTFSDIR);
-MALLOC_DECLARE(M_NTFSNTHASH);
-#endif
-
-#if defined(NTFS_DEBUG)
-#define dprintf(a) printf a
-#if NTFS_DEBUG > 1
-#define ddprintf(a) printf a
-#else
-#define ddprintf(a)
-#endif
-#else
-#define dprintf(a)
-#define ddprintf(a)
-#endif
-
-extern struct vop_vector ntfs_vnodeops;
diff --git a/include.new/fs/ntfs/ntfs_compr.h b/include.new/fs/ntfs/ntfs_compr.h
deleted file mode 100644
index 3ede702..0000000
--- a/include.new/fs/ntfs/ntfs_compr.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*	$NetBSD: ntfs_compr.h,v 1.3 1999/07/26 14:02:31 jdolecek Exp $	*/
-
-/*-
- * Copyright (c) 1998, 1999 Semen Ustimenko
- * 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.
- *
- * 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/fs/ntfs/ntfs_compr.h,v 1.6 1999/12/03 20:37:38 semenu Exp $
- */
-
-#define NTFS_COMPBLOCK_SIZE	0x1000
-#define NTFS_COMPUNIT_CL	16
-
-int	ntfs_uncompblock(u_int8_t *, u_int8_t *);
-int	ntfs_uncompunit(struct ntfsmount *, u_int8_t *, u_int8_t *);
diff --git a/include.new/fs/ntfs/ntfs_ihash.h b/include.new/fs/ntfs/ntfs_ihash.h
deleted file mode 100644
index f39053d..0000000
--- a/include.new/fs/ntfs/ntfs_ihash.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: ntfs_ihash.h,v 1.4 1999/09/30 16:56:40 jdolecek Exp $	*/
-
-/*-
- * Copyright (c) 1998, 1999 Semen Ustimenko
- * 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.
- *
- * 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/fs/ntfs/ntfs_ihash.h,v 1.8 2004/06/16 09:47:04 phk Exp $
- */
-
-extern struct lock ntfs_hashlock;
-void ntfs_nthashinit(void);
-void ntfs_nthashdestroy(void);
-struct ntnode   *ntfs_nthashlookup(struct cdev *, ino_t);
-struct ntnode   *ntfs_nthashget(struct cdev *, ino_t);
-void ntfs_nthashins(struct ntnode *);
-void ntfs_nthashrem(register struct ntnode *);
diff --git a/include.new/fs/ntfs/ntfs_inode.h b/include.new/fs/ntfs/ntfs_inode.h
deleted file mode 100644
index e2963d7..0000000
--- a/include.new/fs/ntfs/ntfs_inode.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: ntfs_inode.h,v 1.8 1999/10/31 19:45:26 jdolecek Exp $	*/
-
-/*-
- * Copyright (c) 1998, 1999 Semen Ustimenko
- * 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.
- *
- * 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/fs/ntfs/ntfs_inode.h,v 1.12 2004/06/16 09:47:04 phk Exp $
- */
-
-/* These flags are kept in i_flag. */
-#define	IN_ACCESS	0x0001	/* Access time update request. */
-#define	IN_CHANGE	0x0002	/* Inode change time update request. */
-#define	IN_UPDATE	0x0004	/* Modification time update request. */
-#define	IN_MODIFIED	0x0008	/* Inode has been modified. */
-#define	IN_RENAME	0x0010	/* Inode is being renamed. */
-#define	IN_SHLOCK	0x0020	/* File has shared lock. */
-#define	IN_EXLOCK	0x0040	/* File has exclusive lock. */
-#define	IN_LAZYMOD	0x0080	/* Modified, but don't write yet. */
-#define	IN_HASHED	0x0800	/* Inode is on hash list */
-#define	IN_LOADED	0x8000	/* ntvattrs loaded */
-#define	IN_PRELOADED	0x4000	/* loaded from directory entry */
-
-struct ntnode {
-	struct vnode   *i_devvp;	/* vnode of blk dev we live on */
-	struct cdev *i_dev;		/* Device associated with the inode. */
-
-	LIST_ENTRY(ntnode)	i_hash;
-	struct ntnode  *i_next;
-	struct ntnode **i_prev;
-	struct ntfsmount       *i_mp;
-	ino_t           i_number;
-	uint32_t       i_flag;
-
-	/* locking */
-	struct lock	i_lock;
-	struct mtx	i_interlock;
-	int		i_usecount;
-
-	LIST_HEAD(,fnode)	i_fnlist;
-	LIST_HEAD(,ntvattr)	i_valist;
-
-	long		i_nlink;	/* MFR */
-	ino_t		i_mainrec;	/* MFR */
-	uint32_t	i_frflag;	/* MFR */
-};
-
-#define	FN_PRELOADED	0x0001
-#define	FN_VALID	0x0002
-#define	FN_AATTRNAME	0x0004	/* space allocated for f_attrname */
-struct fnode {
-	LIST_ENTRY(fnode) f_fnlist;
-	struct vnode   *f_vp;		/* Associatied vnode */
-	struct ntnode  *f_ip;		/* Associated ntnode */
-	u_long		f_flag;
-
-	ntfs_times_t	f_times;	/* $NAME/dirinfo */
-	ino_t		f_pnumber;	/* $NAME/dirinfo */
-	uint32_t       f_fflag;	/* $NAME/dirinfo */
-	u_int64_t	f_size;		/* defattr/dirinfo: */
-	u_int64_t	f_allocated;	/* defattr/dirinfo */
-
-	uint32_t	f_attrtype;
-	char	       *f_attrname;
-
-	/* for ntreaddir */
-	uint32_t       f_lastdattr;
-	uint32_t       f_lastdblnum;
-	uint32_t       f_lastdoff;
-	uint32_t       f_lastdnum;
-	caddr_t         f_dirblbuf;
-	uint32_t       f_dirblsz;
-};
-
-/* This overlays the fid structure (see <sys/mount.h>) */
-struct ntfid {
-        u_int16_t ntfid_len;     /* Length of structure. */
-        u_int16_t ntfid_pad;     /* Force 32-bit alignment. */
-        ino_t     ntfid_ino;     /* File number (ino). */
-        int32_t   ntfid_gen;     /* Generation number. */
-};
diff --git a/include.new/fs/ntfs/ntfs_subr.h b/include.new/fs/ntfs/ntfs_subr.h
deleted file mode 100644
index 250ba31..0000000
--- a/include.new/fs/ntfs/ntfs_subr.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*	$NetBSD: ntfs_subr.h,v 1.8 1999/10/10 14:48:37 jdolecek Exp $	*/
-
-/*-
- * Copyright (c) 1998, 1999 Semen Ustimenko
- * 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.
- *
- * 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/fs/ntfs/ntfs_subr.h,v 1.13 2003/09/26 20:26:23 fjoe Exp $
- */
-
-#define	VA_LOADED		0x0001
-#define	VA_PRELOADED		0x0002
-
-struct ntvattr {
-	LIST_ENTRY(ntvattr) 	va_list;
-
-	uint32_t		va_vflag;
-	struct vnode	       *va_vp;
-	struct ntnode 	       *va_ip;
-
-	uint32_t		va_flag;
-	uint32_t		va_type;
-	u_int8_t		va_namelen;
-	char			va_name[NTFS_MAXATTRNAME];
-
-	uint32_t		va_compression;
-	uint32_t		va_compressalg;
-	uint32_t		va_datalen;
-	uint32_t		va_allocated;
-	cn_t	 		va_vcnstart;
-	cn_t	 		va_vcnend;
-	u_int16_t		va_index;
-	union {
-		struct {
-			cn_t *		cn;
-			cn_t *		cl;
-			u_long		cnt;
-		} vrun;
-		caddr_t		datap;
-		struct attr_name *name;
-		struct attr_indexroot *iroot;
-		struct attr_indexalloc *ialloc;
-	} va_d;
-};
-#define	va_vruncn	va_d.vrun.cn
-#define va_vruncl	va_d.vrun.cl
-#define va_vruncnt	va_d.vrun.cnt
-#define va_datap	va_d.datap
-#define va_a_name	va_d.name
-#define va_a_iroot	va_d.iroot
-#define va_a_ialloc	va_d.ialloc
-
-struct componentname;
-struct fnode;
-struct uio;
-
-int ntfs_procfixups( struct ntfsmount *, uint32_t, caddr_t, size_t );
-int ntfs_parserun( cn_t *, cn_t *, u_int8_t *, u_long, u_long *);
-int ntfs_runtocn( cn_t *, struct ntfsmount *, u_int8_t *, u_long, cn_t);
-int ntfs_readntvattr_plain( struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *,size_t *, struct uio *);
-int ntfs_readattr_plain( struct ntfsmount *, struct ntnode *, uint32_t, char *, off_t, size_t, void *,size_t *, struct uio *);
-int ntfs_readattr( struct ntfsmount *, struct ntnode *, uint32_t, char *, off_t, size_t, void *, struct uio *);
-int ntfs_filesize( struct ntfsmount *, struct fnode *, u_int64_t *, u_int64_t *);
-int ntfs_times( struct ntfsmount *, struct ntnode *, ntfs_times_t *);
-struct timespec	ntfs_nttimetounix( u_int64_t );
-int ntfs_ntreaddir( struct ntfsmount *, struct fnode *, uint32_t, struct attr_indexentry **);
-int ntfs_runtovrun( cn_t **, cn_t **, u_long *, u_int8_t *);
-int ntfs_attrtontvattr( struct ntfsmount *, struct ntvattr **, struct attr * );
-void ntfs_freentvattr( struct ntvattr * );
-int ntfs_loadntvattrs( struct ntfsmount *, struct vnode *, caddr_t, struct ntvattr **);
-struct ntvattr * ntfs_findntvattr( struct ntfsmount *, struct ntnode *, uint32_t, cn_t );
-int ntfs_ntlookupfile(struct ntfsmount *, struct vnode *, struct componentname *, struct vnode **);
-int ntfs_isnamepermitted(struct ntfsmount *, struct attr_indexentry * );
-int ntfs_ntvattrrele(struct ntvattr * );
-int ntfs_ntvattrget(struct ntfsmount *, struct ntnode *, uint32_t, const char *, cn_t , struct ntvattr **);
-int ntfs_ntlookup(struct ntfsmount *, ino_t, struct ntnode **);
-int ntfs_ntget(struct ntnode *);
-void ntfs_ntref(struct ntnode *);
-void ntfs_ntrele(struct ntnode *);
-void ntfs_ntput(struct ntnode *);
-int ntfs_loadntnode( struct ntfsmount *, struct ntnode * );
-int ntfs_writentvattr_plain(struct ntfsmount *, struct ntnode *, struct ntvattr *, off_t, size_t, void *, size_t *, struct uio *);
-int ntfs_writeattr_plain(struct ntfsmount *, struct ntnode *, uint32_t, char *, off_t, size_t, void *, size_t *, struct uio *);
-void ntfs_toupper_init(void);
-void ntfs_toupper_destroy(void);
-int ntfs_toupper_use(struct mount *, struct ntfsmount *);
-void ntfs_toupper_unuse(void);
-int ntfs_fget(struct ntfsmount *, struct ntnode *, int, char *, struct fnode **);
-void ntfs_frele(struct fnode *);
-
-int ntfs_u28_init(struct ntfsmount *ntmp, wchar *u2w, char *cs_local, char *cs_ntfs);
-int ntfs_u28_uninit(struct ntfsmount *ntmp);
-int ntfs_82u_init(struct ntfsmount *ntmp, char *cs_local, char *cs_ntfs);
-int ntfs_82u_uninit(struct ntfsmount *ntmp);
-wchar ntfs_u28(struct ntfsmount *ntmp, wchar wc);
-wchar ntfs_82u(struct ntfsmount *ntmp, wchar wc, int *len);
-#define NTFS_U28(ch)		ntfs_u28(ntmp, (ch))
-#define NTFS_82U(ch, len)	ntfs_82u(ntmp, (ch), len)
-#define	NTFS_UASTRCMP(ustr, ustrlen, astr, astrlen)	\
-	ntfs_uastrcmp(ntmp, (ustr), (ustrlen), (astr), (astrlen))
-#define	NTFS_UASTRICMP(ustr, ustrlen, astr, astrlen)	\
-	ntfs_uastricmp(ntmp, (ustr), (ustrlen), (astr), (astrlen))
diff --git a/include.new/fs/ntfs/ntfs_vfsops.h b/include.new/fs/ntfs/ntfs_vfsops.h
deleted file mode 100644
index 0081b91..0000000
--- a/include.new/fs/ntfs/ntfs_vfsops.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: ntfs_vfsops.h,v 1.4 1999/10/10 14:20:33 jdolecek Exp $	*/
-
-/*-
- * Copyright (c) 1998, 1999 Semen Ustimenko (semenu@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.
- *
- * 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/fs/ntfs/ntfs_vfsops.h,v 1.8 2005/02/10 12:09:49 phk Exp $
- */
-#define VG_DONTLOADIN	0x0001	/* Tells ntfs_vgetex to do not call */
-				/* ntfs_loadntnode() on ntnode, even if */
-				/* ntnode not loaded */
-#define	VG_DONTVALIDFN	0x0002	/* Tells ntfs_vgetex to do not validate */
-				/* fnode */
-#define	VG_EXT		0x0004	/* This is not main record */
-
-struct mount;
-struct ntfsmount;
-struct thread;
-struct vnode;
-
-int ntfs_vgetex(struct mount *, ino_t, uint32_t, char *, u_long, u_long,
-		struct thread *, struct vnode **);
diff --git a/include.new/fs/ntfs/ntfsmount.h b/include.new/fs/ntfs/ntfsmount.h
deleted file mode 100644
index bf62f0f..0000000
--- a/include.new/fs/ntfs/ntfsmount.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: ntfsmount.h,v 1.3 1999/07/26 14:02:32 jdolecek Exp $	*/
-
-/*-
- * Copyright (c) 1998, 1999 Semen Ustimenko
- * 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.
- *
- * 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/fs/ntfs/ntfsmount.h,v 1.8 2003/09/26 20:26:23 fjoe Exp $
- */
-
-#define	NTFS_MFLAG_CASEINS	0x00000001
-#define	NTFS_MFLAG_ALLNAMES	0x00000002
-#define	NTFS_MFLAG_KICONV	0x00000004
-
-struct ntfs_args {
-	char	*fspec;			/* block special device to mount */
-	struct	export_args export;	/* network export information */
-	uid_t	uid;			/* uid that owns ntfs files */
-	gid_t	gid;			/* gid that owns ntfs files */
-	mode_t	mode;			/* mask to be applied for ntfs perms */
-	u_long	flag;			/* additional flags */
-	char	*cs_ntfs;		/* NTFS Charset */
-	char	*cs_local;		/* Local Charset */
-};
diff --git a/include.new/fs/nullfs/null.h b/include.new/fs/nullfs/null.h
deleted file mode 100644
index 864bf64..0000000
--- a/include.new/fs/nullfs/null.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software donated to Berkeley by
- * Jan-Simon Pendry.
- *
- * 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.
- * 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.
- *
- *	@(#)null.h	8.3 (Berkeley) 8/20/94
- *
- * $FreeBSD: releng/10.2/sys/fs/nullfs/null.h 250505 2013-05-11 11:17:44Z kib $
- */
-
-#ifndef	FS_NULL_H
-#define	FS_NULL_H
-
-#define	NULLM_CACHE	0x0001
-
-struct null_mount {
-	struct mount	*nullm_vfs;
-	struct vnode	*nullm_rootvp;	/* Reference to root null_node */
-	uint64_t	nullm_flags;
-};
-
-#ifdef _KERNEL
-/*
- * A cache of vnode references
- */
-struct null_node {
-	LIST_ENTRY(null_node)	null_hash;	/* Hash list */
-	struct vnode	        *null_lowervp;	/* VREFed once */
-	struct vnode		*null_vnode;	/* Back pointer */
-	u_int			null_flags;
-};
-
-#define	NULLV_NOUNLOCK	0x0001
-#define	NULLV_DROP	0x0002
-
-#define	MOUNTTONULLMOUNT(mp) ((struct null_mount *)((mp)->mnt_data))
-#define	VTONULL(vp) ((struct null_node *)(vp)->v_data)
-#define	NULLTOV(xp) ((xp)->null_vnode)
-
-int nullfs_init(struct vfsconf *vfsp);
-int nullfs_uninit(struct vfsconf *vfsp);
-int null_nodeget(struct mount *mp, struct vnode *target, struct vnode **vpp);
-struct vnode *null_hashget(struct mount *mp, struct vnode *lowervp);
-void null_hashrem(struct null_node *xp);
-int null_bypass(struct vop_generic_args *ap);
-
-#ifdef DIAGNOSTIC
-struct vnode *null_checkvp(struct vnode *vp, char *fil, int lno);
-#define	NULLVPTOLOWERVP(vp) null_checkvp((vp), __FILE__, __LINE__)
-#else
-#define	NULLVPTOLOWERVP(vp) (VTONULL(vp)->null_lowervp)
-#endif
-
-extern struct vop_vector null_vnodeops;
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_NULLFSNODE);
-#endif
-
-#ifdef NULLFS_DEBUG
-#define NULLFSDEBUG(format, args...) printf(format ,## args)
-#else
-#define NULLFSDEBUG(format, args...)
-#endif /* NULLFS_DEBUG */
-
-#endif /* _KERNEL */
-
-#endif
diff --git a/include.new/fs/nwfs/nwfs.h b/include.new/fs/nwfs/nwfs.h
deleted file mode 100644
index b963342..0000000
--- a/include.new/fs/nwfs/nwfs.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/fs/nwfs/nwfs.h,v 1.9 2005/01/14 08:09:42 phk Exp $
- */
-
-#ifndef _NWFS_H_
-#define _NWFS_H_
-
-#include <netncp/ncp.h>
-#include <fs/nwfs/nwfs_mount.h>
-
-#define NR_OPEN 0
-#define	NW_NSB_DOS	(1 << NW_NS_DOS)
-#define	NW_NSB_MAC	(1 << NW_NS_MAC)
-#define	NW_NSB_NFS	(1 << NW_NS_NFS)
-#define	NW_NSB_FTAM	(1 << NW_NS_FTAM)
-#define	NW_NSB_OS2	(1 << NW_NS_OS2)
-
-#define	NWFSIOC_GETCONN		_IOR('n',1,int)
-#define	NWFSIOC_GETEINFO	_IOR('n',2,struct nw_entry_info)
-#define	NWFSIOC_GETNS		_IOR('n',3,int)
-
-#ifdef _KERNEL
-
-#include <sys/vnode.h>
-#include <sys/mount.h>
-
-struct nwfsnode;
-
-struct nwmount {
-	struct nwfs_args m;
-	struct mount 	*mp;
-	struct ncp_handle *connh;
-	int 		name_space;
-	struct nwnode	*n_root;
-	uint32_t	n_volume;
-	ncpfid		n_rootent;
-	int		n_id;
-};
-
-#define VFSTONWFS(mntp)		((struct nwmount *)((mntp)->mnt_data))
-#define NWFSTOVFS(mnp)		((struct mount *)((mnp)->mount))
-#define VTOVFS(vp)		((vp)->v_mount)
-#define	VTONWFS(vp)		(VFSTONWFS(VTOVFS(vp)))
-#define NWFSTOCONN(nmp)		((nmp)->connh->nh_conn)
-
-int ncp_conn_logged_in(struct nwmount *);
-int nwfs_ioctl(struct vop_ioctl_args *ap);
-int nwfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td);
-int nwfs_vinvalbuf(struct vnode *vp, struct thread *td);
-
-extern struct vop_vector nwfs_vnodeops;
-
-#endif	/* _KERNEL */
-
-#endif /* _NWFS_H_ */
diff --git a/include.new/fs/nwfs/nwfs_mount.h b/include.new/fs/nwfs/nwfs_mount.h
deleted file mode 100644
index 395b2dd..0000000
--- a/include.new/fs/nwfs/nwfs_mount.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/fs/nwfs/nwfs_mount.h,v 1.8 2005/01/06 18:10:39 imp Exp $
- */
-#ifndef _NWFS_MOUNT_H_
-#define	_NWFS_MOUNT_H_
-
-#ifndef _NCP_NCP_NLS_H_
-#include <netncp/ncp_nls.h>
-#endif
-
-#define NWFS_VERMAJ	1
-#define NWFS_VERMIN	3400
-#define NWFS_VERSION	(NWFS_VERMAJ*100000 + NWFS_VERMIN)
-
-/* Values for flags */
-#define NWFS_MOUNT_SOFT		0x0001
-#define WNFS_MOUNT_INTR		0x0002
-#define NWFS_MOUNT_STRONG	0x0004
-#define NWFS_MOUNT_NO_OS2	0x0008
-#define NWFS_MOUNT_NO_NFS	0x0010
-#define NWFS_MOUNT_NO_LONG	0x0020
-#define	NWFS_MOUNT_GET_SYSENT	0x0040	/* special case, look to vfsops :) */
-#define	NWFS_MOUNT_HAVE_NLS	0x0080
-
-#define	NWFS_VOLNAME_LEN	48
-
-
-/* Layout of the mount control block for a netware filesystem. */
-struct nwfs_args {
-	int		connRef;		/* connection reference */
-	char		mount_point[MAXPATHLEN];
-	u_int		flags;
-	u_char		mounted_vol[NWFS_VOLNAME_LEN + 1];
-	u_char		root_path[512+1];
-	int		version;
-	uid_t		uid;
-	gid_t 		gid;
-	mode_t 		file_mode;
-	mode_t 		dir_mode;
-	struct ncp_nlstables nls;
-	int		tz;
-};
-
-#ifdef _KERNEL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_NWFSMNT);
-#endif
-
-#endif
-#endif /* !_NWFS_MOUNT_H_ */
diff --git a/include.new/fs/nwfs/nwfs_node.h b/include.new/fs/nwfs/nwfs_node.h
deleted file mode 100644
index 8a6af90..0000000
--- a/include.new/fs/nwfs/nwfs_node.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/fs/nwfs/nwfs_node.h,v 1.10 2005/01/06 18:10:39 imp Exp $
- */
-#ifndef _NWFS_NODE_H_
-#define _NWFS_NODE_H_
-
-#define	NWFS_ROOT_INO	0x7ffffffd
-
-/* Bits for nwnode.n_flag */
-#define	NFLUSHINPROG	0x0001
-#define	NFLUSHWANT	0x0002		/* they should gone ... */
-#define	NMODIFIED	0x0004		/* bogus, until async IO implemented */
-#define	NREFPARENT	0x0008		/* vnode holds reference to a parent vnode */
-#define	NVOLUME		0x0010		/* vnode references a volume */
-#define	NSHOULDFREE	0x0020		/* vnode should be removed from hash */
-
-struct nwnode {
-	LIST_ENTRY(nwnode)	n_hash;
-	struct vnode 		*n_vnode;
-	struct vattr		n_vattr;
-	struct nwmount		*n_mount;
-	time_t			n_atime;	/* attributes cache time*/
-	time_t			n_ctime;
-	time_t			n_mtime;
-	int			n_flag;
-	ncpfid			n_parent;
-	ncpfid			n_fid;
-	u_long			n_attr;		/* LH */
-	u_long			n_size;
-	u_long			n_dosfid;
-	int 			opened;
-/*	int 			access;*/
-	u_long 			n_origfh;
-	ncp_fh			n_fh;
-	struct nw_search_seq	n_seq;
-	u_char			n_nmlen;
-	u_char			n_name[256];
-};
-
-#define VTONW(vp)	((struct nwnode *)(vp)->v_data)
-#define NWTOV(np)	((struct vnode *)(np)->n_vnode)
-#define	NWCMPF(f1,f2)	((f1)->f_parent == (f2)->f_parent && \
-			 (f1)->f_id == (f2)->f_id)
-#define	NWCMPN(np1,np2)	NWCMPF(&(np1)->n_fid, &(np2)->n_fid)
-#define NWCMPV(vp1,vp2)	NWCMPN(VTONW(vp1),VTONW(vp2))
-
-struct vop_getpages_args;
-struct vop_inactive_args;
-struct vop_putpages_args;
-struct vop_reclaim_args;
-struct ucred;
-struct uio;
-
-void nwfs_hash_init(void);
-void nwfs_hash_free(void);
-int  nwfs_lookupnp(struct nwmount *nmp, ncpfid fid, struct thread *td,
-	struct nwnode **npp);
-int  nwfs_inactive(struct vop_inactive_args *);
-int  nwfs_reclaim(struct vop_reclaim_args *);
-int  nwfs_nget(struct mount *mp, ncpfid fid, struct nw_entry_info *fap,
-	struct vnode *dvp, struct vnode **vpp);
-
-int  nwfs_getpages(struct vop_getpages_args *);
-int  nwfs_putpages(struct vop_putpages_args *);
-int  nwfs_readvnode(struct vnode *vp, struct uio *uiop, struct ucred *cred);
-int  nwfs_writevnode(struct vnode *vp, struct uio *uiop, struct ucred *cred, int ioflag);
-void nwfs_attr_cacheenter(struct vnode *vp, struct nw_entry_info *fi);
-int  nwfs_attr_cachelookup(struct vnode *vp,struct vattr *va);
-
-#define nwfs_attr_cacheremove(vp)	VTONW(vp)->n_atime = 0
-
-#endif /* _NWFS_NODE_H_ */
diff --git a/include.new/fs/nwfs/nwfs_subr.h b/include.new/fs/nwfs/nwfs_subr.h
deleted file mode 100644
index d2f2654..0000000
--- a/include.new/fs/nwfs/nwfs_subr.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/fs/nwfs/nwfs_subr.h,v 1.5 2005/01/06 18:10:39 imp Exp $
- */
-#ifndef _NWFS_SUBR_H_
-#define _NWFS_SUBR_H_
-
-extern int nwfs_debuglevel;
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_NWFSDATA);
-#endif
-
-struct ncp_conn;
-struct ncp_nlstables;
-struct ncp_open_info;
-struct nw_entry_info;
-struct nw_search_info;
-struct nwmount;
-struct thread;
-struct timespec;
-struct ucred;
-struct vattr;
-struct vnode;
-
-int  ncp_initsearch(struct vnode *dvp,struct thread *td, struct ucred *cred);
-int  ncp_search_for_file_or_subdir(struct nwmount *nmp,struct nw_search_seq *seq,
-		struct nw_entry_info *target,
-		struct thread *td, struct ucred *cred);
-int  ncp_lookup(struct vnode *dvp, int len, char *name, struct nw_entry_info *fap,
-		struct thread *td, struct ucred *cred);
-int  ncp_lookup_volume(struct ncp_conn *conn, char *volname, 
-		u_char *volNum, uint32_t *dirEnt,
-		struct thread *td, struct ucred *cred);
-int  ncp_close_file(struct ncp_conn *conn, ncp_fh *fh,
-		struct thread *td, struct ucred *cred);
-int  ncp_open_create_file_or_subdir(struct nwmount *nmp,struct vnode *dvp, int namelen,char *name,
-		int open_create_mode, uint32_t create_attributes,
-		int desired_acc_rights, struct ncp_open_info *nop,
-		struct thread *td, struct ucred *cred);
-int  ncp_DeleteNSEntry(struct nwmount *nmp, 
-		uint32_t dirent, int namelen, char *name,
-		struct thread *td, struct ucred *cred);
-int  ncp_nsrename(struct ncp_conn *conn, int volume, int ns, int oldtype, 
-	struct ncp_nlstables *nt,
-	nwdirent fdir, char *old_name, int oldlen,
-	nwdirent tdir, char *new_name, int newlen,
-	struct thread *td, struct ucred *cred);
-int  ncp_obtain_info(struct nwmount *nmp, uint32_t dirent,
-		int namelen, char *path, struct nw_entry_info *target,
-		struct thread *td, struct ucred *cred);
-int  ncp_modify_file_or_subdir_dos_info(struct nwmount *nmp, struct vnode *vp, 
-		uint32_t info_mask,
-		struct nw_modify_dos_info *info,
-		struct thread *td, struct ucred *cred);
-int  ncp_setattr(struct vnode *,struct vattr *,struct ucred *,struct thread *td);
-int  ncp_get_namespaces(struct ncp_conn *conn, uint32_t volume, int *nsf,
-		struct thread *td, struct ucred *cred);
-int  ncp_get_volume_info_with_number(struct ncp_conn *conn, 
-		int n, struct ncp_volume_info *target,
-		struct thread *td, struct ucred *cred);
-
-void ncp_unix2dostime (struct timespec *tsp, int tz, u_int16_t *ddp, 
-	     u_int16_t *dtp, u_int8_t *dhp);
-void ncp_dos2unixtime (u_int dd, u_int dt, u_int dh, int tz, struct timespec *tsp);
-
-#endif /* !_NWFS_SUBR_H_ */
diff --git a/include.new/fs/portalfs/portal.h b/include.new/fs/portalfs/portal.h
deleted file mode 100644
index f1efaf9..0000000
--- a/include.new/fs/portalfs/portal.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software donated to Berkeley by
- * Jan-Simon Pendry.
- *
- * 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.
- * 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.
- *
- *	@(#)portal.h	8.4 (Berkeley) 1/21/94
- *
- * $FreeBSD: src/sys/fs/portalfs/portal.h,v 1.10 2005/01/06 18:10:40 imp Exp $
- */
-
-struct portal_args {
-	char		*pa_config;	/* Config file */
-	int		pa_socket;	/* Socket to server */
-};
-
-struct portal_cred {
-	int		pcr_flag;		/* File open mode */
-	uid_t		pcr_uid;		/* From ucred */
-	short		pcr_ngroups;		/* From ucred */
-	gid_t		pcr_groups[NGROUPS];	/* From ucred */
-};
-
-#ifdef _KERNEL
-struct portalmount {
-	struct vnode	*pm_root;	/* Root node */
-	struct file	*pm_server;	/* Held reference to server socket */
-};
-
-struct portalnode {
-	int		pt_size;	/* Length of Arg */
-	char		*pt_arg;	/* Arg to send to server */
-	int		pt_fileid;	/* cookie */
-};
-
-#define VFSTOPORTAL(mp)	((struct portalmount *)((mp)->mnt_data))
-#define	VTOPORTAL(vp) ((struct portalnode *)(vp)->v_data)
-
-#define PORTAL_ROOTFILEID	2
-
-extern struct vop_vector portal_vnodeops;
-#endif /* _KERNEL */
diff --git a/include.new/fs/procfs/procfs.h b/include.new/fs/procfs/procfs.h
deleted file mode 100644
index 1d695d1..0000000
--- a/include.new/fs/procfs/procfs.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1993 Jan-Simon Pendry
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jan-Simon Pendry.
- *
- * 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.
- * 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.
- *
- *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
- *
- * From:
- * $FreeBSD: releng/10.2/sys/fs/procfs/procfs.h 197428 2009-09-23 12:08:08Z kib $
- */
-
-#ifdef _KERNEL
-
-int	 procfs_docurproc(PFS_FILL_ARGS);
-int	 procfs_doosrel(PFS_FILL_ARGS);
-int	 procfs_doproccmdline(PFS_FILL_ARGS);
-int	 procfs_doprocctl(PFS_FILL_ARGS);
-int	 procfs_doprocdbregs(PFS_FILL_ARGS);
-int	 procfs_doprocfile(PFS_FILL_ARGS);
-int	 procfs_doprocfpregs(PFS_FILL_ARGS);
-int	 procfs_doprocmap(PFS_FILL_ARGS);
-int	 procfs_doprocmem(PFS_FILL_ARGS);
-int	 procfs_doprocnote(PFS_FILL_ARGS);
-int	 procfs_doprocregs(PFS_FILL_ARGS);
-int	 procfs_doprocrlimit(PFS_FILL_ARGS);
-int	 procfs_doprocstatus(PFS_FILL_ARGS);
-int	 procfs_doproctype(PFS_FILL_ARGS);
-int	 procfs_ioctl(PFS_IOCTL_ARGS);
-int	 procfs_close(PFS_CLOSE_ARGS);
-
-/* Attributes */
-int	 procfs_attr(PFS_ATTR_ARGS);
-
-/* Visibility */
-int	 procfs_notsystem(PFS_VIS_ARGS);
-int	 procfs_candebug(PFS_VIS_ARGS);
-
-#endif /* _KERNEL */
diff --git a/include.new/fs/smbfs/smbfs.h b/include.new/fs/smbfs/smbfs.h
deleted file mode 100644
index d2b7123..0000000
--- a/include.new/fs/smbfs/smbfs.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/fs/smbfs/smbfs.h 250236 2013-05-04 14:03:18Z davide $
- */
-#ifndef _SMBFS_SMBFS_H_
-#define _SMBFS_SMBFS_H_
-
-#define SMBFS_VERMAJ	1
-#define SMBFS_VERMIN	1012
-#define SMBFS_VERSION	(SMBFS_VERMAJ*100000 + SMBFS_VERMIN)
-#define	SMBFS_VFSNAME	"smbfs"
-
-/* Values for flags */
-#define SMBFS_MOUNT_SOFT	0x0001
-#define SMBFS_MOUNT_INTR	0x0002
-#define SMBFS_MOUNT_STRONG	0x0004
-#define	SMBFS_MOUNT_HAVE_NLS	0x0008
-#define	SMBFS_MOUNT_NO_LONG	0x0010
-
-#define	SMBFS_MAXPATHCOMP	256	/* maximum number of path components */
-
-
-/* Layout of the mount control block for an smb file system. */
-struct smbfs_args {
-	int		version;
-	int		dev;
-	u_int		flags;
-	char		mount_point[MAXPATHLEN];
-	u_char		root_path[512+1];
-	uid_t		uid;
-	gid_t 		gid;
-	mode_t 		file_mode;
-	mode_t 		dir_mode;
-	int		caseopt;
-};
-
-#ifdef _KERNEL
-
-#include <sys/_sx.h>
-
-struct smbnode;
-struct smb_share;
-struct u_cred;
-struct vop_ioctl_args;
-struct buf;
-
-struct smbmount {
-	/* struct smbfs_args	sm_args; */
-	uid_t			sm_uid;
-	gid_t 			sm_gid;
-	mode_t 			sm_file_mode;
-	mode_t 			sm_dir_mode;
-	struct mount * 		sm_mp;
-	struct smbnode *	sm_root;
-	struct smb_dev *	sm_dev;
-	struct ucred *		sm_owner;
-	uint64_t		sm_flags;
-	long			sm_nextino;
-	struct smb_share * 	sm_share;
-	struct smbnode *	sm_npstack[SMBFS_MAXPATHCOMP];
-	int			sm_caseopt;
-	int			sm_didrele;
-};
-
-#define VFSTOSMBFS(mp)		((struct smbmount *)((mp)->mnt_data))
-#define SMBFSTOVFS(smp)		((struct mount *)((smp)->sm_mp))
-#define VTOVFS(vp)		((vp)->v_mount)
-#define	VTOSMBFS(vp)		(VFSTOSMBFS(VTOVFS(vp)))
-
-int smbfs_ioctl(struct vop_ioctl_args *ap);
-int smbfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td);
-int smbfs_vinvalbuf(struct vnode *vp, struct thread *td);
-#endif	/* KERNEL */
-
-#endif /* _SMBFS_SMBFS_H_ */
diff --git a/include.new/fs/smbfs/smbfs_node.h b/include.new/fs/smbfs/smbfs_node.h
deleted file mode 100644
index 3cc5e7a..0000000
--- a/include.new/fs/smbfs/smbfs_node.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/fs/smbfs/smbfs_node.h 243396 2012-11-22 08:58:29Z davide $
- */
-#ifndef _FS_SMBFS_NODE_H_
-#define _FS_SMBFS_NODE_H_
-
-#define	SMBFS_ROOT_INO		2	/* just like in UFS */
-
-/* Bits for smbnode.n_flag */
-#define	NFLUSHINPROG		0x0001
-#define	NFLUSHWANT		0x0002	/* they should gone ... */
-#define	NMODIFIED		0x0004	/* bogus, until async IO implemented */
-/*efine	NNEW			0x0008*//* smb/vnode has been allocated */
-#define	NREFPARENT		0x0010	/* node holds parent from recycling */
-#define	NFLUSHWIRE		0x1000	/* pending flush request */
-#define	NOPEN			0x2000	/* file is open */
-#define	NGONE			0x4000	/* file has been removed/renamed */
-
-struct smbfs_fctx;
-
-struct smbnode {
-	int			n_flag;
-	struct vnode *		n_parent;
-	struct vnode *		n_vnode;
-	struct smbmount *	n_mount;
-	time_t			n_attrage;	/* attributes cache time */
-/*	time_t			n_ctime;*/
-	struct timespec		n_mtime;	/* modify time */
-	struct timespec		n_atime;	/* last access time */
-	u_quad_t		n_size;
-	long			n_ino;
-	long			n_parentino;	/* parent inode number */
-	int			n_dosattr;
-	u_int16_t		n_fid;		/* file handle */
-	int			n_rwstate;	/* granted access mode */
-	int			n_rplen;
-	char *			n_rpath;
-	u_char			n_nmlen;
-	u_char *		n_name;
-	struct smbfs_fctx *	n_dirseq;	/* ff context */
-	long			n_dirofs;	/* last ff offset */
-	LIST_ENTRY(smbnode)	n_hash;
-};
-
-struct smbcmp {
-	struct vnode * 		n_parent;
-	int 			n_nmlen;
-	const char *		n_name;
-};
-
-#define VTOSMB(vp)	((struct smbnode *)(vp)->v_data)
-#define SMBTOV(np)	((struct vnode *)(np)->n_vnode)
-
-#define	SMBFS_DNP_SEP(dnp)	((dnp->n_rplen > 1) ? '\\' : '\0')
-
-struct vop_getpages_args;
-struct vop_inactive_args;
-struct vop_putpages_args;
-struct vop_reclaim_args;
-struct ucred;
-struct uio;
-struct smbfattr;
-
-int  smbfs_inactive(struct vop_inactive_args *);
-int  smbfs_reclaim(struct vop_reclaim_args *);
-int smbfs_nget(struct mount *mp, struct vnode *dvp, const char *name, int nmlen,
-	struct smbfattr *fap, struct vnode **vpp);
-uint32_t smbfs_hash(const u_char *name, int nmlen);
-
-int  smbfs_getpages(struct vop_getpages_args *);
-int  smbfs_putpages(struct vop_putpages_args *);
-int  smbfs_readvnode(struct vnode *vp, struct uio *uiop, struct ucred *cred);
-int  smbfs_writevnode(struct vnode *vp, struct uio *uiop, struct ucred *cred, int ioflag);
-void smbfs_attr_cacheenter(struct vnode *vp, struct smbfattr *fap);
-int  smbfs_attr_cachelookup(struct vnode *vp ,struct vattr *va);
-
-#define smbfs_attr_cacheremove(vp)	VTOSMB(vp)->n_attrage = 0
-
-#endif /* _FS_SMBFS_NODE_H_ */
diff --git a/include.new/fs/smbfs/smbfs_subr.h b/include.new/fs/smbfs/smbfs_subr.h
deleted file mode 100644
index d93719b..0000000
--- a/include.new/fs/smbfs/smbfs_subr.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/fs/smbfs/smbfs_subr.h 265243 2014-05-02 21:30:59Z ae $
- */
-#ifndef _FS_SMBFS_SMBFS_SUBR_H_
-#define _FS_SMBFS_SMBFS_SUBR_H_
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_SMBFSDATA);
-MALLOC_DECLARE(M_SMBFSCRED);
-#endif
-
-#define SMBFSERR(format, args...) printf("%s: "format, __func__ ,## args)
-
-#ifdef SMB_VNODE_DEBUG
-#define SMBVDEBUG(format, args...) printf("%s: "format, __func__ ,## args)
-#else
-#define SMBVDEBUG(format, args...)
-#endif
-
-/*
- * Possible lock commands
- */
-#define SMB_LOCK_EXCL		0
-#define	SMB_LOCK_SHARED		1
-#define	SMB_LOCK_RELEASE	2
-
-struct smbmount;
-struct proc;
-struct timespec;
-struct ucred;
-struct vattr;
-struct vnode;
-struct statfs;
-
-struct smbfattr {
-	int		fa_attr;
-	int64_t		fa_size;
-	struct timespec	fa_atime;
-	struct timespec	fa_ctime;
-	struct timespec	fa_mtime;
-	long		fa_ino;
-};
-
-/*
- * Context to perform findfirst/findnext/findclose operations
- */
-#define	SMBFS_RDD_FINDFIRST	0x01
-#define	SMBFS_RDD_EOF		0x02
-#define	SMBFS_RDD_FINDSINGLE	0x04
-#define	SMBFS_RDD_USESEARCH	0x08
-#define	SMBFS_RDD_NOCLOSE	0x10
-#define	SMBFS_RDD_GOTRNAME	0x1000
-
-/*
- * Search context supplied by server
- */
-#define	SMB_SKEYLEN		21			/* search context */
-#define SMB_DENTRYLEN		(SMB_SKEYLEN + 22)	/* entire entry */
-
-struct smbfs_fctx {
-	/*
-	 * Setable values
-	 */
-	int		f_flags;	/* SMBFS_RDD_ */
-	/*
-	 * Return values
-	 */
-	struct smbfattr	f_attr;		/* current attributes */
-	char *		f_name;		/* current file name */
-	int		f_nmlen;	/* name len */
-	/*
-	 * Internal variables
-	 */
-	int		f_limit;	/* maximum number of entries */
-	int		f_attrmask;	/* SMB_FA_ */
-	int		f_wclen;
-	const char *	f_wildcard;
-	struct smbnode*	f_dnp;
-	struct smb_cred*f_scred;
-	struct smb_share *f_ssp;
-	union {
-		struct smb_rq *	uf_rq;
-		struct smb_t2rq * uf_t2;
-	} f_urq;
-	int		f_left;		/* entries left */
-	int		f_ecnt;		/* entries left in the current reponse */
-	int		f_eofs;		/* entry offset in the parameter block */
-	u_char 		f_skey[SMB_SKEYLEN]; /* server side search context */
-	u_char		f_fname[8 + 1 + 3 + 1]; /* common case for 8.3 filenames */
-	u_int16_t	f_Sid;
-	u_int16_t	f_infolevel;
-	int		f_rnamelen;
-	char *		f_rname;	/* resume name/key */
-	int		f_rnameofs;
-};
-
-#define f_rq	f_urq.uf_rq
-#define f_t2	f_urq.uf_t2
-
-/*
- * smb level
- */
-int  smbfs_smb_lock(struct smbnode *np, int op, caddr_t id,
-	off_t start, off_t end,	struct smb_cred *scred);
-int  smbfs_smb_statfs(struct smb_share *ssp, struct statfs *sbp,
-	struct smb_cred *scred);
-int  smbfs_smb_setfsize(struct smbnode *np, int newsize, struct smb_cred *scred);
-
-int  smbfs_smb_query_info(struct smbnode *np, const char *name, int len,
-	struct smbfattr *fap, struct smb_cred *scred);
-int  smbfs_smb_setpattr(struct smbnode *np, u_int16_t attr,
-	struct timespec *mtime, struct smb_cred *scred);
-int  smbfs_smb_setptime2(struct smbnode *np, struct timespec *mtime,
-	struct timespec *atime, int attr, struct smb_cred *scred);
-int  smbfs_smb_setpattrNT(struct smbnode *np, u_int16_t attr,
-	struct timespec *mtime, struct timespec *atime, struct smb_cred *scred);
-
-int  smbfs_smb_setftime(struct smbnode *np, struct timespec *mtime,
-	struct timespec *atime, struct smb_cred *scred);
-int  smbfs_smb_setfattrNT(struct smbnode *np, u_int16_t attr,
-	struct timespec *mtime,	struct timespec *atime, struct smb_cred *scred);
-
-int  smbfs_smb_open(struct smbnode *np, int accmode, struct smb_cred *scred);
-int  smbfs_smb_close(struct smb_share *ssp, u_int16_t fid,
-	 struct timespec *mtime, struct smb_cred *scred);
-int  smbfs_smb_create(struct smbnode *dnp, const char *name, int len,
-	struct smb_cred *scred);
-int  smbfs_smb_delete(struct smbnode *np, struct smb_cred *scred);
-int  smbfs_smb_flush(struct smbnode *np, struct smb_cred *scred);
-int  smbfs_smb_rename(struct smbnode *src, struct smbnode *tdnp,
-	const char *tname, int tnmlen, struct smb_cred *scred);
-int  smbfs_smb_move(struct smbnode *src, struct smbnode *tdnp,
-	const char *tname, int tnmlen, u_int16_t flags, struct smb_cred *scred);
-int  smbfs_smb_mkdir(struct smbnode *dnp, const char *name, int len,
-	struct smb_cred *scred);
-int  smbfs_smb_rmdir(struct smbnode *np, struct smb_cred *scred);
-int  smbfs_findopen(struct smbnode *dnp, const char *wildcard, int wclen,
-	int attr, struct smb_cred *scred, struct smbfs_fctx **ctxpp);
-int  smbfs_findnext(struct smbfs_fctx *ctx, int limit, struct smb_cred *scred);
-int  smbfs_findclose(struct smbfs_fctx *ctx, struct smb_cred *scred);
-int  smbfs_fullpath(struct mbchain *mbp, struct smb_vc *vcp,
-	struct smbnode *dnp, const char *name, int nmlen);
-int  smbfs_smb_lookup(struct smbnode *dnp, const char *name, int nmlen,
-	struct smbfattr *fap, struct smb_cred *scred);
-
-int  smbfs_fname_tolocal(struct smb_vc *vcp, char *name, int *nmlen, int caseopt);
-
-void  smb_time_local2server(struct timespec *tsp, int tzoff, u_long *seconds);
-void  smb_time_server2local(u_long seconds, int tzoff, struct timespec *tsp);
-void  smb_time_NT2local(int64_t nsec, int tzoff, struct timespec *tsp);
-void  smb_time_local2NT(struct timespec *tsp, int tzoff, int64_t *nsec);
-void  smb_time_unix2dos(struct timespec *tsp, int tzoff, u_int16_t *ddp, 
-	     u_int16_t *dtp, u_int8_t *dhp);
-void smb_dos2unixtime (u_int dd, u_int dt, u_int dh, int tzoff, struct timespec *tsp);
-
-void *smbfs_malloc_scred(void);
-void smbfs_free_scred(void *);
-#endif /* !_FS_SMBFS_SMBFS_SUBR_H_ */
diff --git a/include.new/fs/udf/ecma167-udf.h b/include.new/fs/udf/ecma167-udf.h
deleted file mode 100644
index 6e0b7a7..0000000
--- a/include.new/fs/udf/ecma167-udf.h
+++ /dev/null
@@ -1,386 +0,0 @@
-/*-
- * Copyright (c) 2001, 2002 Scott Long <scottl@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.
- *
- * 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: releng/10.2/sys/fs/udf/ecma167-udf.h 188406 2009-02-09 20:42:51Z jhb $
- */
-
-/* ecma167-udf.h */
-/* Structure/definitions/constants a la ECMA 167 rev. 3 */
-
-/* Tag identifiers */
-enum {
-	TAGID_PRI_VOL =		1,
-	TAGID_ANCHOR =		2,
-	TAGID_VOL = 		3,
-	TAGID_IMP_VOL =		4,
-	TAGID_PARTITION =	5,
-	TAGID_LOGVOL =		6,
-	TAGID_UNALLOC_SPACE =	7,
-	TAGID_TERM =		8,
-	TAGID_LOGVOL_INTEGRITY = 9,
-	TAGID_FSD =		256,
-	TAGID_FID =		257,
-	TAGID_FENTRY =		261
-};
-
-/* Descriptor tag [3/7.2] */
-struct desc_tag {
-	uint16_t	id;
-	uint16_t	descriptor_ver;
-	uint8_t		cksum;
-	uint8_t		reserved;
-	uint16_t	serial_num;
-	uint16_t	desc_crc;
-	uint16_t	desc_crc_len;
-	uint32_t	tag_loc;
-} __packed;
-
-/* Recorded Address [4/7.1] */
-struct lb_addr {
-	uint32_t	lb_num;
-	uint16_t	part_num;
-} __packed;
-
-/* Extent Descriptor [3/7.1] */
-struct extent_ad {
-	uint32_t	len;
-	uint32_t	loc;
-} __packed;
-
-/* Short Allocation Descriptor [4/14.14.1] */
-struct short_ad {
-	uint32_t	len;
-	uint32_t	pos;
-} __packed;
-
-/* Long Allocation Descriptor [4/14.14.2] */
-struct long_ad {
-	uint32_t	len;
-	struct lb_addr	loc;
-	uint16_t	ad_flags;
-	uint32_t	ad_id;
-} __packed;
-
-/* Extended Allocation Descriptor [4/14.14.3] */
-struct ext_ad {
-	uint32_t	ex_len;
-	uint32_t	rec_len;
-	uint32_t	inf_len;
-	struct lb_addr	ex_loc;
-	uint8_t		reserved[2];
-} __packed;
-
-union icb {
-	struct short_ad	s_ad;
-	struct long_ad	l_ad;
-	struct ext_ad	e_ad;
-};
-
-/* Character set spec [1/7.2.1] */
-struct charspec {
-	uint8_t		type;
-	uint8_t		inf[63];
-} __packed;
-
-/* Timestamp [1/7.3] */
-struct timestamp {
-	uint16_t	type_tz;
-	uint16_t	year;
-	uint8_t		month;
-	uint8_t		day;
-	uint8_t		hour;
-	uint8_t		minute;
-	uint8_t		second;
-	uint8_t		centisec;
-	uint8_t		hund_usec;
-	uint8_t		usec;
-} __packed;
-
-/* Entity Identifier [1/7.4] */
-#define	UDF_REGID_ID_SIZE	23
-struct regid {
-	uint8_t		flags;
-	uint8_t		id[UDF_REGID_ID_SIZE];
-	uint8_t		id_suffix[8];
-} __packed;
-
-/* ICB Tag [4/14.6] */
-struct icb_tag {
-	uint32_t	prev_num_dirs;
-	uint16_t	strat_type;
-	uint8_t		strat_param[2];
-	uint16_t	max_num_entries;
-	uint8_t		reserved;
-	uint8_t		file_type;
-	struct lb_addr	parent_icb;
-	uint16_t	flags;
-} __packed;
-#define	UDF_ICB_TAG_FLAGS_SETUID	0x40
-#define	UDF_ICB_TAG_FLAGS_SETGID	0x80
-#define	UDF_ICB_TAG_FLAGS_STICKY	0x100
-
-/* Anchor Volume Descriptor Pointer [3/10.2] */
-struct anchor_vdp {
-	struct desc_tag		tag;
-	struct extent_ad	main_vds_ex;
-	struct extent_ad	reserve_vds_ex;
-} __packed;
-
-/* Volume Descriptor Pointer [3/10.3] */
-struct vol_desc_ptr {
-	struct desc_tag		tag;
-	uint32_t		vds_number;
-	struct extent_ad	next_vds_ex;
-} __packed;
-
-/* Primary Volume Descriptor [3/10.1] */
-struct pri_vol_desc {
-	struct desc_tag		tag;
-	uint32_t		seq_num;
-	uint32_t		pdv_num;
-	char			vol_id[32];
-	uint16_t		vds_num;
-	uint16_t		max_vol_seq;
-	uint16_t		ichg_lvl;
-	uint16_t		max_ichg_lvl;
-	uint32_t		charset_list;
-	uint32_t		max_charset_list;
-	char			volset_id[128];
-	struct charspec		desc_charset;
-	struct charspec		explanatory_charset;
-	struct extent_ad	vol_abstract;
-	struct extent_ad	vol_copyright;
-	struct regid		app_id;
-	struct timestamp	time;
-	struct regid		imp_id;
-	uint8_t			imp_use[64];
-	uint32_t		prev_vds_lov;
-	uint16_t		flags;
-	uint8_t			reserved[22];
-} __packed;
-
-/* Logical Volume Descriptor [3/10.6] */
-struct logvol_desc {
-	struct desc_tag		tag;
-	uint32_t		seq_num;
-	struct charspec		desc_charset;
-	char			logvol_id[128];
-	uint32_t		lb_size;
-	struct regid		domain_id;
-	union {
-		struct long_ad	fsd_loc;
-		uint8_t		logvol_content_use[16];
-	} _lvd_use;
-	uint32_t		mt_l; /* Partition map length */
-	uint32_t		n_pm; /* Number of partition maps */
-	struct regid		imp_id;
-	uint8_t			imp_use[128];
-	struct extent_ad	integrity_seq_id;
-	uint8_t			maps[1];
-} __packed;
-
-/* Type 1 Partition Map [3/10.7.2] */
-struct part_map_1 {
-	uint8_t			type;
-	uint8_t			len;
-	uint16_t		vol_seq_num;
-	uint16_t		part_num;
-} __packed;
-
-#define	UDF_PMAP_TYPE1_SIZE	6
-
-/* Type 2 Partition Map [3/10.7.3] */
-struct part_map_2 {
-	uint8_t			type;
-	uint8_t			len;
-	uint8_t			part_id[62];
-} __packed;
-
-#define	UDF_PMAP_TYPE2_SIZE	64
-
-/* Virtual Partition Map [UDF 2.01/2.2.8] */
-struct part_map_virt {
-	uint8_t			type;
-	uint8_t			len;
-	uint8_t			reserved[2];
-	struct regid		id;
-	uint16_t		vol_seq_num;
-	uint16_t		part_num;
-	uint8_t			reserved1[24];
-} __packed;
-
-/* Sparable Partition Map [UDF 2.01/2.2.9] */
-struct part_map_spare {
-	uint8_t			type;
-	uint8_t			len;
-	uint8_t			reserved[2];
-	struct regid		id;
-	uint16_t		vol_seq_num;
-	uint16_t		part_num;
-	uint16_t		packet_len;
-	uint8_t			n_st;	/* Number of Sparing Tables */
-	uint8_t			reserved1;
-	uint32_t		st_size;
-	uint32_t		st_loc[1];
-} __packed;
-
-union udf_pmap {
-	struct part_map_1	pm1;
-	struct part_map_2	pm2;
-	struct part_map_virt	pmv;
-	struct part_map_spare	pms;
-};
-
-/* Sparing Map Entry [UDF 2.01/2.2.11] */
-struct spare_map_entry {
-	uint32_t		org;
-	uint32_t		map;
-} __packed;
-
-/* Sparing Table [UDF 2.01/2.2.11] */
-struct udf_sparing_table {
-	struct desc_tag		tag;
-	struct regid		id;
-	uint16_t		rt_l;	/* Relocation Table len */
-	uint8_t			reserved[2];
-	uint32_t		seq_num;
-	struct spare_map_entry	entries[1];
-} __packed;
-
-/* Partition Descriptor [3/10.5] */
-struct part_desc {
-	struct desc_tag	tag;
-	uint32_t	seq_num;
-	uint16_t	flags;
-	uint16_t	part_num;
-	struct regid	contents;
-	uint8_t		contents_use[128];
-	uint32_t	access_type;
-	uint32_t	start_loc;
-	uint32_t	part_len;
-	struct regid	imp_id;
-	uint8_t		imp_use[128];
-	uint8_t		reserved[156];
-} __packed;
-
-/* File Set Descriptor [4/14.1] */
-struct fileset_desc {
-	struct desc_tag		tag;
-	struct timestamp	time;
-	uint16_t		ichg_lvl;
-	uint16_t		max_ichg_lvl;
-	uint32_t		charset_list;
-	uint32_t		max_charset_list;
-	uint32_t		fileset_num;
-	uint32_t		fileset_desc_num;
-	struct charspec		logvol_id_charset;
-	char			logvol_id[128];
-	struct charspec		fileset_charset;
-	char			fileset_id[32];
-	char			copyright_file_id[32];
-	char			abstract_file_id[32];
-	struct long_ad		rootdir_icb;
-	struct regid		domain_id;
-	struct long_ad		next_ex;
-	struct long_ad		streamdir_icb;
-	uint8_t			reserved[32];
-} __packed;
-
-/* File Identifier Descriptor [4/14.4] */
-struct fileid_desc {
-	struct desc_tag	tag;
-	uint16_t	file_num;
-	uint8_t		file_char;
-	uint8_t		l_fi;	/* Length of file identifier area */
-	struct long_ad	icb;
-	uint16_t	l_iu;	/* Length of implementation use area */
-	uint8_t		data[1];
-} __packed;
-#define	UDF_FID_SIZE	38
-#define	UDF_FILE_CHAR_VIS	(1 << 0) /* Visible */
-#define	UDF_FILE_CHAR_DIR	(1 << 1) /* Directory */
-#define	UDF_FILE_CHAR_DEL	(1 << 2) /* Deleted */
-#define	UDF_FILE_CHAR_PAR	(1 << 3) /* Parent Directory */
-#define	UDF_FILE_CHAR_META	(1 << 4) /* Stream metadata */
-
-/* File Entry [4/14.9] */
-struct file_entry {
-	struct desc_tag		tag;
-	struct icb_tag		icbtag;
-	uint32_t		uid;
-	uint32_t		gid;
-	uint32_t		perm;
-	uint16_t		link_cnt;
-	uint8_t			rec_format;
-	uint8_t			rec_disp_attr;
-	uint32_t		rec_len;
-	uint64_t		inf_len;
-	uint64_t		logblks_rec;
-	struct timestamp	atime;
-	struct timestamp	mtime;
-	struct timestamp	attrtime;
-	uint32_t		ckpoint;
-	struct long_ad		ex_attr_icb;
-	struct regid		imp_id;
-	uint64_t		unique_id;
-	uint32_t		l_ea;	/* Length of extended attribute area */
-	uint32_t		l_ad;	/* Length of allocation descriptors */
-	uint8_t			data[1];
-} __packed;
-#define	UDF_FENTRY_SIZE	176
-#define	UDF_FENTRY_PERM_USER_MASK	0x07
-#define	UDF_FENTRY_PERM_GRP_MASK	0xE0
-#define	UDF_FENTRY_PERM_OWNER_MASK	0x1C00
-
-/* Path Component [4/14.16.1] */
-struct path_component {
-	uint8_t			type;
-	uint8_t			length;
-	uint16_t		version;
-	uint8_t			identifier[1];
-} __packed;
-#define	UDF_PATH_ROOT		2
-#define	UDF_PATH_DOTDOT		3
-#define	UDF_PATH_DOT		4
-#define	UDF_PATH_PATH		5
-
-union dscrptr {
-	struct desc_tag		tag;
-	struct anchor_vdp	avdp;
-	struct vol_desc_ptr	vdp;
-	struct pri_vol_desc	pvd;
-	struct logvol_desc	lvd;
-	struct part_desc	pd;
-	struct fileset_desc	fsd;
-	struct fileid_desc	fid;
-	struct file_entry	fe;
-};
-
-/* Useful defines */
-
-#define	GETICB(ad_type, fentry, offset)	\
-	(struct ad_type *)&fentry->data[offset]
-
-#define	GETICBLEN(ad_type, icb)	le32toh(((struct ad_type *)(icb))->len)
diff --git a/include.new/fs/udf/osta.h b/include.new/fs/udf/osta.h
deleted file mode 100644
index 9dd6329..0000000
--- a/include.new/fs/udf/osta.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Prototypes for the OSTA functions
- *
- * $FreeBSD: releng/10.2/sys/fs/udf/osta.h 162255 2006-09-12 19:02:34Z imp $
- */
-
-/*-
- **********************************************************************
- * OSTA compliant Unicode compression, uncompression routines.
- * Copyright 1995 Micro Design International, Inc.
- * Written by Jason M. Rinn.
- * Micro Design International gives permission for the free use of the
- * following source code.
- */
-
-/*
- * Various routines from the OSTA 2.01 specs.  Copyrights are included with
- * each code segment.  Slight whitespace modifications have been made for
- * formatting purposes.  Typos/bugs have been fixed.
- */
-
-#ifndef UNIX
-#define	UNIX
-#endif
-
-#ifndef MAXLEN
-#define	MAXLEN	255
-#endif
-
-/***********************************************************************
- * The following two typedef's are to remove compiler dependancies.
- * byte needs to be unsigned 8-bit, and unicode_t needs to be
- * unsigned 16-bit.
- */
-typedef unsigned short unicode_t;
-typedef unsigned char byte;
-
-int udf_UncompressUnicode(int, byte *, unicode_t *);
-int udf_UncompressUnicodeByte(int, byte *, byte *);
-int udf_CompressUnicode(int, int, unicode_t *, byte *);
-unsigned short udf_cksum(unsigned char *, int);
-unsigned short udf_unicode_cksum(unsigned short *, int);
-int UDFTransName(unicode_t *, unicode_t *, int);
diff --git a/include.new/fs/udf/udf.h b/include.new/fs/udf/udf.h
deleted file mode 100644
index d7cfcdb..0000000
--- a/include.new/fs/udf/udf.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * Copyright (c) 2001, 2002 Scott Long <scottl@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.
- *
- * 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: releng/10.2/sys/fs/udf/udf.h 189082 2009-02-26 18:58:41Z avg $
- */
-
-#define UDF_HASHTBLSIZE 100
-
-struct udf_node {
-	struct vnode	*i_vnode;
-	struct udf_mnt	*udfmp;
-	ino_t		hash_id;
-	long		diroff;
-	struct file_entry *fentry;
-};
-
-struct udf_mnt {
-	int			im_flags;
-	struct mount		*im_mountp;
-	struct g_consumer	*im_cp;
-	struct bufobj		*im_bo;
-	struct cdev *im_dev;
-	struct vnode		*im_devvp;
-	int			bsize;
-	int			bshift;
-	int			bmask;
-	uint32_t		part_start;
-	uint32_t		part_len;
-	uint64_t		root_id;
-	struct long_ad		root_icb;
-	int			p_sectors;
-	int			s_table_entries;
-	struct udf_sparing_table *s_table;
-	void			*im_d2l;	/* disk->local iconv handle */
-#if 0
-	void			*im_l2d;	/* local->disk iconv handle */
-#endif
-};
-
-struct udf_dirstream {
-	struct udf_node	*node;
-	struct udf_mnt	*udfmp;
-	struct buf	*bp;
-	uint8_t		*data;
-	uint8_t		*buf;
-	int		fsize;
-	int		off;
-	int		this_off;
-	int		offset;
-	int		size;
-	int		error;
-	int		fid_fragment;
-};
-
-struct ifid {
-	u_short	ifid_len;
-	u_short	ifid_pad;
-	int	ifid_ino;
-	long	ifid_start;
-};
-
-#define	VFSTOUDFFS(mp)	((struct udf_mnt *)((mp)->mnt_data))
-#define	VTON(vp)	((struct udf_node *)((vp)->v_data))
-
-/*
- * The block layer refers to things in terms of 512 byte blocks by default.
- * btodb() is expensive, so speed things up.
- * XXX Can the block layer be forced to use a different block size?
- */
-#define	RDSECTOR(devvp, sector, size, bp) \
-	bread(devvp, sector << (udfmp->bshift - DEV_BSHIFT), size, NOCRED, bp)
-
-MALLOC_DECLARE(M_UDFFENTRY);
-
-static __inline int
-udf_readdevblks(struct udf_mnt *udfmp, int sector, int size, struct buf **bp)
-{
-	return (RDSECTOR(udfmp->im_devvp, sector,
-			 (size + udfmp->bmask) & ~udfmp->bmask, bp));
-}
-
-/*
- * Produce a suitable file number from an ICB.  The passed in ICB is expected
- * to be in little endian (meaning that it hasn't been swapped for big
- * endian machines yet).
- * XXX If the fileno resolves to 0, we might be in big trouble.
- * XXX Assumes the ICB is a long_ad.  This struct is compatible with short_ad,
- *     but not ext_ad.
- */
-static __inline ino_t
-udf_getid(struct long_ad *icb)
-{
-	return (le32toh(icb->loc.lb_num));
-}
-
-int udf_allocv(struct mount *, struct vnode **, struct thread *);
-int udf_checktag(struct desc_tag *, uint16_t);
-int udf_vget(struct mount *, ino_t, int, struct vnode **);
-
-extern uma_zone_t udf_zone_trans;
-extern uma_zone_t udf_zone_node;
-extern uma_zone_t udf_zone_ds;
-
-extern struct vop_vector udf_fifoops;
diff --git a/include.new/fs/udf/udf_mount.h b/include.new/fs/udf/udf_mount.h
deleted file mode 100644
index 5cc80b7..0000000
--- a/include.new/fs/udf/udf_mount.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * Copyright (c) 2003 Ryuichiro Imura
- * 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.
- *
- * 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: releng/10.2/sys/fs/udf/udf_mount.h 122102 2003-11-05 06:56:08Z scottl $
- */
-
-#define	UDFMNT_KICONV	0x00000001
diff --git a/include.new/fs/umapfs/umap.h b/include.new/fs/umapfs/umap.h
deleted file mode 100644
index aa1d485..0000000
--- a/include.new/fs/umapfs/umap.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software donated to Berkeley by
- * the UCLA Ficus project.
- *
- * 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.
- * 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.
- *
- *	@(#)umap.h	8.4 (Berkeley) 8/20/94
- *
- * $FreeBSD: src/sys/fs/umapfs/umap.h,v 1.19 2005/01/06 18:10:41 imp Exp $
- */
-
-#define MAPFILEENTRIES 64
-#define GMAPFILEENTRIES 16
-#define NOBODY 32767
-#define NULLGROUP 65534
-
-struct umap_args {
-	char		*target;	/* Target of loopback  */
-	int 		nentries;       /* # of entries in user map array */
-	int 		gnentries;	/* # of entries in group map array */
-	u_long 		(*mapdata)[2];	/* pointer to array of user mappings */
-	u_long 		(*gmapdata)[2];	/* pointer to array of group mappings */
-};
-
-struct umap_mount {
-	struct mount	*umapm_vfs;
-	struct vnode	*umapm_rootvp;	/* Reference to root umap_node */
-	int             info_nentries;  /* number of uid mappings */
-	int		info_gnentries;	/* number of gid mappings */
-	u_long		info_mapdata[MAPFILEENTRIES][2]; /* mapping data for
-	    user mapping in ficus */
-	u_long		info_gmapdata[GMAPFILEENTRIES][2]; /*mapping data for
-	    group mapping in ficus */
-};
-
-#ifdef _KERNEL
-/*
- * A cache of vnode references
- */
-struct umap_node {
-	LIST_ENTRY(umap_node) umap_hash;	/* Hash list */
-	struct vnode	*umap_lowervp;	/* Aliased vnode - VREFed once */
-	struct vnode	*umap_vnode;	/* Back pointer to vnode/umap_node */
-};
-
-extern int umapfs_init(struct vfsconf *vfsp);
-extern int umap_node_create(struct mount *mp, struct vnode *target, struct vnode **vpp);
-extern u_long umap_reverse_findid(u_long id, u_long map[][2], int nentries);
-extern void umap_mapids(struct mount *v_mount, struct ucred *credp);
-
-#define	MOUNTTOUMAPMOUNT(mp) ((struct umap_mount *)((mp)->mnt_data))
-#define	VTOUMAP(vp) ((struct umap_node *)(vp)->v_data)
-#define UMAPTOV(xp) ((xp)->umap_vnode)
-#ifdef DIAGNOSTIC
-extern struct vnode *umap_checkvp(struct vnode *vp, char *fil, int lno);
-#define	UMAPVPTOLOWERVP(vp) umap_checkvp((vp), __FILE__, __LINE__)
-#else
-#define	UMAPVPTOLOWERVP(vp) (VTOUMAP(vp)->umap_lowervp)
-#endif
-
-#endif /* _KERNEL */
diff --git a/include.new/fs/unionfs/union.h b/include.new/fs/unionfs/union.h
deleted file mode 100644
index a34b06e..0000000
--- a/include.new/fs/unionfs/union.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 1994 The Regents of the University of California.
- * Copyright (c) 1994 Jan-Simon Pendry.
- * Copyright (c) 2005, 2006 Masanori Ozawa <ozawa@ongs.co.jp>, ONGS Inc.
- * Copyright (c) 2006 Daichi Goto <daichi@freebsd.org>
- * All rights reserved.
- *
- * This code is derived from software donated to Berkeley by
- * Jan-Simon Pendry.
- *
- * 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.
- * 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.
- *
- *	@(#)union.h	8.9 (Berkeley) 12/10/94
- * $FreeBSD: releng/10.2/sys/fs/unionfs/union.h 185283 2008-11-25 03:18:35Z daichi $
- */
-
-#ifdef _KERNEL
-
-/* copy method of attr from lower to upper */
-typedef enum _unionfs_copymode {
-	UNIONFS_TRADITIONAL = 0,
-	UNIONFS_TRANSPARENT,
-	UNIONFS_MASQUERADE
-} unionfs_copymode;
-
-/* whiteout policy of upper layer */
-typedef enum _unionfs_whitemode {
-       UNIONFS_WHITE_ALWAYS = 0,
-       UNIONFS_WHITE_WHENNEEDED
-} unionfs_whitemode;
-
-struct unionfs_mount {
-	struct vnode   *um_lowervp;	/* VREFed once */
-	struct vnode   *um_uppervp;	/* VREFed once */
-	struct vnode   *um_rootvp;	/* ROOT vnode */
-	unionfs_copymode um_copymode;
-	unionfs_whitemode um_whitemode;
-	uid_t		um_uid;
-	gid_t		um_gid;
-	u_short		um_udir;
-	u_short		um_ufile;
-};
-
-/* unionfs status list */
-struct unionfs_node_status {
-	LIST_ENTRY(unionfs_node_status) uns_list;	/* Status list */
-	pid_t		uns_pid;		/* current process id */
-	int		uns_node_flag;		/* uns flag */
-	int		uns_lower_opencnt;	/* open count of lower */
-	int		uns_upper_opencnt;	/* open count of upper */
-	int		uns_lower_openmode;	/* open mode of lower */
-	int		uns_readdir_status;	/* read status of readdir */
-};
-
-/* union node status flags */
-#define	UNS_OPENL_4_READDIR	0x01	/* open lower layer for readdir */
-
-/* A cache of vnode references */
-struct unionfs_node {
-	struct vnode   *un_lowervp;		/* lower side vnode */
-	struct vnode   *un_uppervp;		/* upper side vnode */
-	struct vnode   *un_dvp;			/* parent unionfs vnode */
-	struct vnode   *un_vnode;		/* Back pointer */
-	LIST_HEAD(, unionfs_node_status) un_unshead;
-						/* unionfs status head */
-	LIST_HEAD(unionfs_node_hashhead, unionfs_node) *un_hashtbl;
-						/* dir vnode hash table */
-	LIST_ENTRY(unionfs_node)   un_hash;	/* hash list entry */
-	u_long		un_hashmask;		/* bit mask */
-	char           *un_path;		/* path */
-	int		un_flag;		/* unionfs node flag */
-};
-
-/*
- * unionfs node flags
- * It needs the vnode with exclusive lock, when changing the un_flag variable.
- */
-#define UNIONFS_OPENEXTL	0x01	/* openextattr (lower) */
-#define UNIONFS_OPENEXTU	0x02	/* openextattr (upper) */
-
-#define	MOUNTTOUNIONFSMOUNT(mp) ((struct unionfs_mount *)((mp)->mnt_data))
-#define	VTOUNIONFS(vp) ((struct unionfs_node *)(vp)->v_data)
-#define	UNIONFSTOV(xp) ((xp)->un_vnode)
-
-int unionfs_init(struct vfsconf *vfsp);
-int unionfs_uninit(struct vfsconf *vfsp);
-int unionfs_nodeget(struct mount *mp, struct vnode *uppervp, struct vnode *lowervp, struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, struct thread *td);
-void unionfs_noderem(struct vnode *vp, struct thread *td);
-void unionfs_get_node_status(struct unionfs_node *unp, struct thread *td, struct unionfs_node_status **unspp);
-void unionfs_tryrem_node_status(struct unionfs_node *unp, struct unionfs_node_status *unsp);
-
-int unionfs_check_rmdir(struct vnode *vp, struct ucred *cred, struct thread *td);
-int unionfs_copyfile(struct unionfs_node *unp, int docopy, struct ucred *cred, struct thread *td);
-void unionfs_create_uppervattr_core(struct unionfs_mount *ump, struct vattr *lva, struct vattr *uva, struct thread *td);
-int unionfs_create_uppervattr(struct unionfs_mount *ump, struct vnode *lvp, struct vattr *uva, struct ucred *cred, struct thread *td);
-int unionfs_mkshadowdir(struct unionfs_mount *ump, struct vnode *duvp, struct unionfs_node *unp, struct componentname *cnp, struct thread *td);
-int unionfs_mkwhiteout(struct vnode *dvp, struct componentname *cnp, struct thread *td, char *path);
-int unionfs_relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, struct componentname *cn, struct thread *td, char *path, int pathlen, u_long nameiop);
-int unionfs_relookup_for_create(struct vnode *dvp, struct componentname *cnp, struct thread *td);
-int unionfs_relookup_for_delete(struct vnode *dvp, struct componentname *cnp, struct thread *td);
-int unionfs_relookup_for_rename(struct vnode *dvp, struct componentname *cnp, struct thread *td);
-
-#ifdef DIAGNOSTIC
-struct vnode   *unionfs_checklowervp(struct vnode *vp, char *fil, int lno);
-struct vnode   *unionfs_checkuppervp(struct vnode *vp, char *fil, int lno);
-#define	UNIONFSVPTOLOWERVP(vp) unionfs_checklowervp((vp), __FILE__, __LINE__)
-#define	UNIONFSVPTOUPPERVP(vp) unionfs_checkuppervp((vp), __FILE__, __LINE__)
-#else
-#define	UNIONFSVPTOLOWERVP(vp) (VTOUNIONFS(vp)->un_lowervp)
-#define	UNIONFSVPTOUPPERVP(vp) (VTOUNIONFS(vp)->un_uppervp)
-#endif
-
-extern struct vop_vector unionfs_vnodeops;
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_UNIONFSNODE);
-MALLOC_DECLARE(M_UNIONFSPATH);
-#endif
-
-#ifdef UNIONFS_DEBUG
-#define UNIONFSDEBUG(format, args...) printf(format ,## args)
-#else
-#define UNIONFSDEBUG(format, args...)
-#endif				/* UNIONFS_DEBUG */
-
-#endif				/* _KERNEL */
diff --git a/include.new/fstab.h b/include.new/fstab.h
deleted file mode 100644
index 57c974e..0000000
--- a/include.new/fstab.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1980, 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. 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.
- *
- *	@(#)fstab.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/fstab.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _FSTAB_H_
-#define _FSTAB_H_
-
-/*
- * File system table, see fstab(5).
- *
- * Used by dump, mount, umount, swapon, fsck, df, ...
- *
- * For ufs fs_spec field is the block special name.  Programs that want to
- * use the character special name must create that name by prepending a 'r'
- * after the right most slash.  Quota files are always named "quotas", so
- * if type is "rq", then use concatenation of fs_file and "quotas" to locate
- * quota file.
- */
-#define	_PATH_FSTAB	"/etc/fstab"
-#define	FSTAB		"/etc/fstab"	/* deprecated */
-
-#define	FSTAB_RW	"rw"		/* read/write device */
-#define	FSTAB_RQ	"rq"		/* read/write with quotas */
-#define	FSTAB_RO	"ro"		/* read-only device */
-#define	FSTAB_SW	"sw"		/* swap device */
-#define	FSTAB_XX	"xx"		/* ignore totally */
-
-struct fstab {
-	char	*fs_spec;		/* block special device name */
-	char	*fs_file;		/* file system path prefix */
-	char	*fs_vfstype;		/* File system type, ufs, nfs */
-	char	*fs_mntops;		/* Mount options ala -o */
-	char	*fs_type;		/* FSTAB_* from fs_mntops */
-	int	fs_freq;		/* dump frequency, in days */
-	int	fs_passno;		/* pass number on parallel fsck */
-};
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-struct fstab *getfsent(void);
-struct fstab *getfsspec(const char *);
-struct fstab *getfsfile(const char *);
-int setfsent(void);
-void endfsent(void);
-void setfstab(const char *);
-const char *getfstab(void);
-__END_DECLS
-
-#endif /* !_FSTAB_H_ */
diff --git a/include.new/ftpio.h b/include.new/ftpio.h
deleted file mode 100644
index 5799d6a..0000000
--- a/include.new/ftpio.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef _FTP_H_INCLUDE
-#define _FTP_H_INCLUDE
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <stdio.h>
-#include <time.h>
-
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * Major Changelog:
- *
- * Jordan K. Hubbard
- * 17 Jan 1996
- *
- * Turned inside out. Now returns xfers as new file ids, not as a special
- * `state' of FTP_t
- *
- * $FreeBSD: src/lib/libftpio/ftpio.h,v 1.17 2002/03/25 13:49:48 phk Exp $
- */
-
-/* Internal housekeeping data structure for FTP sessions */
-typedef struct {
-    enum { init, isopen, quit } con_state;
-    int		fd_ctrl;
-    int		addrtype;
-    char	*host;
-    char	*file;
-    int		error;
-    int		is_binary;
-    int		is_passive;
-    int		is_verbose;
-} *FTP_t;
-
-/* Structure we use to match FTP error codes with readable strings */
-struct ftperr {
-  const int	num;
-  const char	*string;
-};
-
-__BEGIN_DECLS
-extern struct	ftperr ftpErrList[];
-extern int	const ftpErrListLength;
-
-/* Exported routines - deal only with FILE* type */
-extern FILE	*ftpLogin(char *host, char *user, char *passwd,	int port, int verbose, int *retcode);
-extern int	ftpChdir(FILE *fp, char *dir);
-extern int	ftpErrno(FILE *fp);
-extern off_t	ftpGetSize(FILE *fp, char *file);
-extern FILE	*ftpGet(FILE *fp, char *file, off_t *seekto);
-extern FILE	*ftpPut(FILE *fp, char *file);
-extern int	ftpAscii(FILE *fp);
-extern int	ftpBinary(FILE *fp);
-extern int	ftpPassive(FILE *fp, int status);
-extern void	ftpVerbose(FILE *fp, int status);
-extern FILE	*ftpGetURL(char	*url, char *user, char *passwd,	int *retcode);
-extern FILE	*ftpPutURL(char	*url, char *user, char *passwd,	int *retcode);
-extern time_t	ftpGetModtime(FILE *fp, char *s);
-extern const	char *ftpErrString(int error);
-extern FILE	*ftpLoginAf(char *host, int af, char *user, char *passwd,	int port, int verbose, int *retcode);
-extern FILE	*ftpGetURLAf(char *url, int af, char *user, char *passwd, int *retcode);
-extern FILE	*ftpPutURLAf(char *url, int af, char *user, char *passwd, int *retcode);
-__END_DECLS
-
-#endif	/* _FTP_H_INCLUDE */
diff --git a/include.new/fts.h b/include.new/fts.h
deleted file mode 100644
index 8151ba8..0000000
--- a/include.new/fts.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 1989, 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. 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.
- *
- *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD: releng/10.2/include/fts.h 250887 2013-05-21 21:20:10Z ed $
- */
-
-#ifndef	_FTS_H_
-#define	_FTS_H_
-
-#include <sys/_types.h>
-
-typedef struct {
-	struct _ftsent *fts_cur;	/* current node */
-	struct _ftsent *fts_child;	/* linked list of children */
-	struct _ftsent **fts_array;	/* sort array */
-	__dev_t fts_dev;		/* starting device # */
-	char *fts_path;			/* path for this descent */
-	int fts_rfd;			/* fd for root */
-	__size_t fts_pathlen;		/* sizeof(path) */
-	__size_t fts_nitems;		/* elements in the sort array */
-	int (*fts_compar)		/* compare function */
-	    (const struct _ftsent * const *, const struct _ftsent * const *);
-
-#define	FTS_COMFOLLOW	0x001		/* follow command line symlinks */
-#define	FTS_LOGICAL	0x002		/* logical walk */
-#define	FTS_NOCHDIR	0x004		/* don't change directories */
-#define	FTS_NOSTAT	0x008		/* don't get stat info */
-#define	FTS_PHYSICAL	0x010		/* physical walk */
-#define	FTS_SEEDOT	0x020		/* return dot and dot-dot */
-#define	FTS_XDEV	0x040		/* don't cross devices */
-#define	FTS_WHITEOUT	0x080		/* return whiteout information */
-#define	FTS_OPTIONMASK	0x0ff		/* valid user option mask */
-
-#define	FTS_NAMEONLY	0x100		/* (private) child names only */
-#define	FTS_STOP	0x200		/* (private) unrecoverable error */
-	int fts_options;		/* fts_open options, global flags */
-	void *fts_clientptr;		/* thunk for sort function */
-} FTS;
-
-typedef struct _ftsent {
-	struct _ftsent *fts_cycle;	/* cycle node */
-	struct _ftsent *fts_parent;	/* parent directory */
-	struct _ftsent *fts_link;	/* next file in directory */
-	long long fts_number;		/* local numeric value */
-#define	fts_bignum	fts_number	/* XXX non-std, should go away */
-	void *fts_pointer;		/* local address value */
-	char *fts_accpath;		/* access path */
-	char *fts_path;			/* root path */
-	int fts_errno;			/* errno for this node */
-	int fts_symfd;			/* fd for symlink */
-	__size_t fts_pathlen;		/* strlen(fts_path) */
-	__size_t fts_namelen;		/* strlen(fts_name) */
-
-	__ino_t fts_ino;		/* inode */
-	__dev_t fts_dev;		/* device */
-	__nlink_t fts_nlink;		/* link count */
-
-#define	FTS_ROOTPARENTLEVEL	-1
-#define	FTS_ROOTLEVEL		 0
-	long fts_level;			/* depth (-1 to N) */
-
-#define	FTS_D		 1		/* preorder directory */
-#define	FTS_DC		 2		/* directory that causes cycles */
-#define	FTS_DEFAULT	 3		/* none of the above */
-#define	FTS_DNR		 4		/* unreadable directory */
-#define	FTS_DOT		 5		/* dot or dot-dot */
-#define	FTS_DP		 6		/* postorder directory */
-#define	FTS_ERR		 7		/* error; errno is set */
-#define	FTS_F		 8		/* regular file */
-#define	FTS_INIT	 9		/* initialized only */
-#define	FTS_NS		10		/* stat(2) failed */
-#define	FTS_NSOK	11		/* no stat(2) requested */
-#define	FTS_SL		12		/* symbolic link */
-#define	FTS_SLNONE	13		/* symbolic link without target */
-#define	FTS_W		14		/* whiteout object */
-	int fts_info;			/* user status for FTSENT structure */
-
-#define	FTS_DONTCHDIR	 0x01		/* don't chdir .. to the parent */
-#define	FTS_SYMFOLLOW	 0x02		/* followed a symlink to get here */
-#define	FTS_ISW		 0x04		/* this is a whiteout object */
-	unsigned fts_flags;		/* private flags for FTSENT structure */
-
-#define	FTS_AGAIN	 1		/* read node again */
-#define	FTS_FOLLOW	 2		/* follow symbolic link */
-#define	FTS_NOINSTR	 3		/* no instructions */
-#define	FTS_SKIP	 4		/* discard node */
-	int fts_instr;			/* fts_set() instructions */
-
-	struct stat *fts_statp;		/* stat(2) information */
-	char *fts_name;			/* file name */
-	FTS *fts_fts;			/* back pointer to main FTS */
-} FTSENT;
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-FTSENT	*fts_children(FTS *, int);
-int	 fts_close(FTS *);
-void	*fts_get_clientptr(FTS *);
-#define	 fts_get_clientptr(fts)	((fts)->fts_clientptr)
-FTS	*fts_get_stream(FTSENT *);
-#define	 fts_get_stream(ftsent)	((ftsent)->fts_fts)
-FTS	*fts_open(char * const *, int,
-	    int (*)(const FTSENT * const *, const FTSENT * const *));
-FTSENT	*fts_read(FTS *);
-int	 fts_set(FTS *, FTSENT *, int);
-void	 fts_set_clientptr(FTS *, void *);
-__END_DECLS
-
-#endif /* !_FTS_H_ */
diff --git a/include.new/ftw.h b/include.new/ftw.h
deleted file mode 100644
index 4257867..0000000
--- a/include.new/ftw.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*	$OpenBSD: ftw.h,v 1.1 2003/07/21 21:13:18 millert Exp $	*/
-
-/*
- * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- *
- * $FreeBSD: releng/10.2/include/ftw.h 134244 2004-08-24 13:00:55Z tjr $
- */
-
-#ifndef	_FTW_H
-#define	_FTW_H
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-/*
- * Valid flags for the 3rd argument to the function that is passed as the
- * second argument to ftw(3) and nftw(3).  Say it three times fast!
- */
-#define	FTW_F		0	/* File.  */
-#define	FTW_D		1	/* Directory.  */
-#define	FTW_DNR		2	/* Directory without read permission.  */
-#define	FTW_DP		3	/* Directory with subdirectories visited.  */
-#define	FTW_NS		4	/* Unknown type; stat() failed.  */
-#define	FTW_SL		5	/* Symbolic link.  */
-#define	FTW_SLN		6	/* Sym link that names a nonexistent file.  */
-
-/*
- * Flags for use as the 4th argument to nftw(3).  These may be ORed together.
- */
-#define	FTW_PHYS	0x01	/* Physical walk, don't follow sym links.  */
-#define	FTW_MOUNT	0x02	/* The walk does not cross a mount point.  */
-#define	FTW_DEPTH	0x04	/* Subdirs visited before the dir itself. */
-#define	FTW_CHDIR	0x08	/* Change to a directory before reading it. */
-
-struct FTW {
-	int base;
-	int level;
-};
-
-__BEGIN_DECLS
-int	ftw(const char *, int (*)(const char *, const struct stat *, int), int);
-int	nftw(const char *, int (*)(const char *, const struct stat *, int,
-	    struct FTW *), int, int);
-__END_DECLS
-
-#endif	/* !_FTW_H */
diff --git a/include.new/g2c.h b/include.new/g2c.h
deleted file mode 100644
index 71e021d..0000000
--- a/include.new/g2c.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/* g2c.h  --  g77 version of f2c (Standard Fortran to C header file) */
-
-/* This file is generated by the g77 libg2c configuration process from a
-   file named g2c.hin.  This process sets up the appropriate types,
-   defines the appropriate macros, and so on.  The resulting g2c.h file
-   is used to build g77's copy of libf2c, named libg2c, and also can
-   be used when compiling C code produced by f2c to link the resulting
-   object file(s) with those produced by the same version of g77 that
-   produced this file, allowing inter-operability of f2c-compiled and
-   g77-compiled code.  */
-
-/**  barf  [ba:rf]  2.  "He suggested using FORTRAN, and everybody barfed."
-
-	- From The Shogakukan DICTIONARY OF NEW ENGLISH (Second edition) */
-
-#ifndef F2C_INCLUDE
-#define F2C_INCLUDE
-
-/* F2C_INTEGER will normally be `int' but would be `long' on 16-bit systems */
-/* we assume short, float are OK */
-typedef int /* long int */ integer;
-typedef unsigned long int /* long */ uinteger;
-typedef char *address;
-typedef short int shortint;
-typedef float real;
-typedef double doublereal;
-typedef struct { real r, i; } complex;
-typedef struct { doublereal r, i; } doublecomplex;
-typedef int /* long int */ logical;
-typedef short int shortlogical;
-typedef char logical1;
-typedef char integer1;
-typedef long long int /* long long */ longint;		/* system-dependent */
-typedef unsigned long long int /* long long */ ulongint;	/* system-dependent */
-#define qbit_clear(a,b)	((a) & ~((ulongint)1 << (b)))
-#define qbit_set(a,b)	((a) |  ((ulongint)1 << (b)))
-
-#define TRUE_ (1)
-#define FALSE_ (0)
-
-/* Extern is for use with -E */
-#ifndef Extern
-#define Extern extern
-#endif
-
-/* I/O stuff */
-
-#ifdef f2c_i2
-#error "f2c_i2 will not work with g77!!!!"
-/* for -i2 */
-typedef short flag;
-typedef short ftnlen;
-typedef short ftnint;
-#else
-typedef int /* long int */ flag;
-typedef int /* long int */ ftnlen;
-typedef int /* long int */ ftnint;
-#endif
-
-/*external read, write*/
-typedef struct
-{	flag cierr;
-	ftnint ciunit;
-	flag ciend;
-	char *cifmt;
-	ftnint cirec;
-} cilist;
-
-/*internal read, write*/
-typedef struct
-{	flag icierr;
-	char *iciunit;
-	flag iciend;
-	char *icifmt;
-	ftnint icirlen;
-	ftnint icirnum;
-} icilist;
-
-/*open*/
-typedef struct
-{	flag oerr;
-	ftnint ounit;
-	char *ofnm;
-	ftnlen ofnmlen;
-	char *osta;
-	char *oacc;
-	char *ofm;
-	ftnint orl;
-	char *oblnk;
-} olist;
-
-/*close*/
-typedef struct
-{	flag cerr;
-	ftnint cunit;
-	char *csta;
-} cllist;
-
-/*rewind, backspace, endfile*/
-typedef struct
-{	flag aerr;
-	ftnint aunit;
-} alist;
-
-/* inquire */
-typedef struct
-{	flag inerr;
-	ftnint inunit;
-	char *infile;
-	ftnlen infilen;
-	ftnint	*inex;	/*parameters in standard's order*/
-	ftnint	*inopen;
-	ftnint	*innum;
-	ftnint	*innamed;
-	char	*inname;
-	ftnlen	innamlen;
-	char	*inacc;
-	ftnlen	inacclen;
-	char	*inseq;
-	ftnlen	inseqlen;
-	char 	*indir;
-	ftnlen	indirlen;
-	char	*infmt;
-	ftnlen	infmtlen;
-	char	*inform;
-	ftnint	informlen;
-	char	*inunf;
-	ftnlen	inunflen;
-	ftnint	*inrecl;
-	ftnint	*innrec;
-	char	*inblank;
-	ftnlen	inblanklen;
-} inlist;
-
-#define VOID void
-
-union Multitype {	/* for multiple entry points */
-	integer1 g;
-	shortint h;
-	integer i;
-	/* longint j; */
-	real r;
-	doublereal d;
-	complex c;
-	doublecomplex z;
-	};
-
-typedef union Multitype Multitype;
-
-/*typedef long int Long;*/	/* No longer used; formerly in Namelist */
-
-struct Vardesc {	/* for Namelist */
-	char *name;
-	char *addr;
-	ftnlen *dims;
-	int  type;
-	};
-typedef struct Vardesc Vardesc;
-
-struct Namelist {
-	char *name;
-	Vardesc **vars;
-	int nvars;
-	};
-typedef struct Namelist Namelist;
-
-#define abs(x) ((x) >= 0 ? (x) : -(x))
-#define dabs(x) (doublereal)abs(x)
-#define min(a,b) ((a) <= (b) ? (a) : (b))
-#define max(a,b) ((a) >= (b) ? (a) : (b))
-#define dmin(a,b) (doublereal)min(a,b)
-#define dmax(a,b) (doublereal)max(a,b)
-#define bit_test(a,b)	((a) >> (b) & 1)
-#define bit_clear(a,b)	((a) & ~((uinteger)1 << (b)))
-#define bit_set(a,b)	((a) |  ((uinteger)1 << (b)))
-
-/* procedure parameter types for -A and -C++ */
-
-#define F2C_proc_par_types 1
-#ifdef __cplusplus
-typedef int /* Unknown procedure type */ (*U_fp)(...);
-typedef shortint (*J_fp)(...);
-typedef integer (*I_fp)(...);
-typedef real (*R_fp)(...);
-typedef doublereal (*D_fp)(...), (*E_fp)(...);
-typedef /* Complex */ VOID (*C_fp)(...);
-typedef /* Double Complex */ VOID (*Z_fp)(...);
-typedef logical (*L_fp)(...);
-typedef shortlogical (*K_fp)(...);
-typedef /* Character */ VOID (*H_fp)(...);
-typedef /* Subroutine */ int (*S_fp)(...);
-#else
-typedef int /* Unknown procedure type */ (*U_fp)();
-typedef shortint (*J_fp)();
-typedef integer (*I_fp)();
-typedef real (*R_fp)();
-typedef doublereal (*D_fp)(), (*E_fp)();
-typedef /* Complex */ VOID (*C_fp)();
-typedef /* Double Complex */ VOID (*Z_fp)();
-typedef logical (*L_fp)();
-typedef shortlogical (*K_fp)();
-typedef /* Character */ VOID (*H_fp)();
-typedef /* Subroutine */ int (*S_fp)();
-#endif
-/* E_fp is for real functions when -R is not specified */
-typedef VOID C_f;	/* complex function */
-typedef VOID H_f;	/* character function */
-typedef VOID Z_f;	/* double complex function */
-typedef doublereal E_f;	/* real function with -R not specified */
-
-/* undef any lower-case symbols that your C compiler predefines, e.g.: */
-
-#ifndef Skip_f2c_Undefs
-/* (No such symbols should be defined in a strict ANSI C compiler.
-   We can avoid trouble with f2c-translated code by using
-   gcc -ansi [-traditional].) */
-#undef cray
-#undef gcos
-#undef mc68010
-#undef mc68020
-#undef mips
-#undef pdp11
-#undef sgi
-#undef sparc
-#undef sun
-#undef sun2
-#undef sun3
-#undef sun4
-#undef u370
-#undef u3b
-#undef u3b2
-#undef u3b5
-#undef unix
-#undef vax
-#endif
-#endif
diff --git a/include.new/gelf.h b/include.new/gelf.h
deleted file mode 100644
index 7d81e3e..0000000
--- a/include.new/gelf.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 2006 Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/lib/libelf/gelf.h 167315 2007-03-08 04:01:30Z jkoshy $
- */
-
-#ifndef	_GELF_H_
-#define	_GELF_H_
-
-#include <sys/cdefs.h>
-
-#include <libelf.h>
-#include <osreldate.h>
-
-typedef Elf64_Addr	GElf_Addr;	/* Addresses */
-typedef Elf64_Half	GElf_Half;	/* Half words (16 bit) */
-typedef Elf64_Off	GElf_Off;	/* Offsets */
-typedef Elf64_Sword	GElf_Sword;	/* Signed words (32 bit) */
-typedef Elf64_Sxword	GElf_Sxword;	/* Signed long words (64 bit) */
-typedef Elf64_Word	GElf_Word;	/* Unsigned words (32 bit) */
-typedef Elf64_Xword	GElf_Xword;	/* Unsigned long words (64 bit) */
-
-typedef Elf64_Dyn	GElf_Dyn;	/* ".dynamic" section entries */
-typedef Elf64_Ehdr	GElf_Ehdr;	/* ELF header */
-typedef Elf64_Phdr	GElf_Phdr;	/* Program header */
-typedef Elf64_Shdr	GElf_Shdr;	/* Section header */
-typedef Elf64_Sym	GElf_Sym;	/* Symbol table entries */
-typedef Elf64_Rel	GElf_Rel;	/* Relocation entries */
-typedef Elf64_Rela	GElf_Rela;	/* Relocation entries with addend */
-
-#if	__FreeBSD_version >= 700025
-typedef	Elf64_Cap	GElf_Cap;	/* SW/HW capabilities */
-typedef Elf64_Move	GElf_Move;	/* Move entries */
-typedef Elf64_Syminfo	GElf_Syminfo;	/* Symbol information */
-#endif
-
-#define	GELF_M_INFO			ELF64_M_INFO
-#define	GELF_M_SIZE			ELF64_M_SIZE
-#define	GELF_M_SYM			ELF64_M_SYM
-
-#define	GELF_R_INFO			ELF64_R_INFO
-#define	GELF_R_SYM			ELF64_R_SYM
-#define	GELF_R_TYPE			ELF64_R_TYPE
-#define	GELF_R_TYPE_DATA		ELF64_R_TYPE_DATA
-#define	GELF_R_TYPE_ID			ELF64_R_TYPE_ID
-#define	GELF_R_TYPE_INFO		ELF64_R_TYPE_INFO
-
-#define	GELF_ST_BIND			ELF64_ST_BIND
-#define	GELF_ST_INFO			ELF64_ST_INFO
-#define	GELF_ST_TYPE			ELF64_ST_TYPE
-#define	GELF_ST_VISIBILITY		ELF64_ST_VISIBILITY
-
-__BEGIN_DECLS
-long		gelf_checksum(Elf *_elf);
-size_t		gelf_fsize(Elf *_elf, Elf_Type _type, size_t _count,
-			unsigned int _version);
-int		gelf_getclass(Elf *_elf);
-GElf_Dyn	*gelf_getdyn(Elf_Data *_data, int _index, GElf_Dyn *_dst);
-GElf_Ehdr	*gelf_getehdr(Elf *_elf, GElf_Ehdr *_dst);
-GElf_Phdr	*gelf_getphdr(Elf *_elf, int _index, GElf_Phdr *_dst);
-GElf_Rel	*gelf_getrel(Elf_Data *_src, int _index, GElf_Rel *_dst);
-GElf_Rela	*gelf_getrela(Elf_Data *_src, int _index, GElf_Rela *_dst);
-GElf_Shdr	*gelf_getshdr(Elf_Scn *_scn, GElf_Shdr *_dst);
-GElf_Sym	*gelf_getsym(Elf_Data *_src, int _index, GElf_Sym *_dst);
-GElf_Sym	*gelf_getsymshndx(Elf_Data *_src, Elf_Data *_shindexsrc,
-			int _index, GElf_Sym *_dst, Elf32_Word *_shindexdst);
-void *		gelf_newehdr(Elf *_elf, int _class);
-void *		gelf_newphdr(Elf *_elf, size_t _phnum);
-int		gelf_update_dyn(Elf_Data *_dst, int _index, GElf_Dyn *_src);
-int		gelf_update_ehdr(Elf *_elf, GElf_Ehdr *_src);
-int		gelf_update_phdr(Elf *_elf, int _index, GElf_Phdr *_src);
-int		gelf_update_rel(Elf_Data *_dst, int _index, GElf_Rel *_src);
-int		gelf_update_rela(Elf_Data *_dst, int _index, GElf_Rela *_src);
-int		gelf_update_shdr(Elf_Scn *_dst, GElf_Shdr *_src);
-int		gelf_update_sym(Elf_Data *_dst, int _index, GElf_Sym *_src);
-int		gelf_update_symshndx(Elf_Data *_symdst, Elf_Data *_shindexdst,
-			int _index, GElf_Sym *_symsrc, Elf32_Word _shindexsrc);
-Elf_Data 	*gelf_xlatetof(Elf *_elf, Elf_Data *_dst, const Elf_Data *_src, unsigned int _encode);
-Elf_Data 	*gelf_xlatetom(Elf *_elf, Elf_Data *_dst, const Elf_Data *_src, unsigned int _encode);
-
-#if	__FreeBSD_version >= 700025
-GElf_Cap	*gelf_getcap(Elf_Data *_data, int _index, GElf_Cap *_cap);
-GElf_Move	*gelf_getmove(Elf_Data *_src, int _index, GElf_Move *_dst);
-GElf_Syminfo	*gelf_getsyminfo(Elf_Data *_src, int _index, GElf_Syminfo *_dst);
-int		gelf_update_cap(Elf_Data *_dst, int _index, GElf_Cap *_src);
-int		gelf_update_move(Elf_Data *_dst, int _index, GElf_Move *_src);
-int		gelf_update_syminfo(Elf_Data *_dst, int _index, GElf_Syminfo *_src);
-#endif
-__END_DECLS
-
-#endif	/* _GELF_H_ */
diff --git a/include.new/geom/cache/g_cache.h b/include.new/geom/cache/g_cache.h
deleted file mode 100644
index b529e81..0000000
--- a/include.new/geom/cache/g_cache.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 2006 Ruslan Ermilov <ru@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.
- *
- * 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: releng/10.2/sys/geom/cache/g_cache.h 210046 2010-07-14 08:22:00Z ru $
- */
-
-#ifndef	_G_CACHE_H_
-#define	_G_CACHE_H_
-
-#include <sys/endian.h>
-
-#define	G_CACHE_CLASS_NAME	"CACHE"
-#define	G_CACHE_MAGIC		"GEOM::CACHE"
-#define	G_CACHE_VERSION		1
-
-#ifdef _KERNEL
-#define	G_CACHE_TYPE_MANUAL	0
-#define	G_CACHE_TYPE_AUTOMATIC	1
-
-#define	G_CACHE_DEBUG(lvl, ...)	do {					\
-	if (g_cache_debug >= (lvl)) {					\
-		printf("GEOM_CACHE");					\
-		if (g_cache_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_CACHE_LOGREQ(bp, ...)	do {					\
-	if (g_cache_debug >= 2) {					\
-		printf("GEOM_CACHE[2]: ");				\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-#define	G_CACHE_BUCKETS		(1 << 3)
-#define	G_CACHE_BUCKET(bno)	((bno) & (G_CACHE_BUCKETS - 1))
-
-struct g_cache_softc {
-	struct g_geom	*sc_geom;
-	int		sc_type;
-	u_int		sc_bshift;
-	u_int		sc_bsize;
-	off_t		sc_tail;
-	struct mtx	sc_mtx;
-	struct callout	sc_callout;
-	LIST_HEAD(, g_cache_desc) sc_desclist[G_CACHE_BUCKETS];
-	TAILQ_HEAD(, g_cache_desc) sc_usedlist;
-	uma_zone_t	sc_zone;
-
-	u_int		sc_maxent;		/* max entries */
-	u_int		sc_nent;		/* allocated entries */
-	u_int		sc_nused;		/* re-useable entries */
-	u_int		sc_invalid;		/* invalid entries */
-
-	uintmax_t	sc_reads;		/* #reads */
-	uintmax_t	sc_readbytes;		/* bytes read */
-	uintmax_t	sc_cachereads;		/* #reads from cache */
-	uintmax_t	sc_cachereadbytes;	/* bytes read from cache */
-	uintmax_t	sc_cachehits;		/* cache hits */
-	uintmax_t	sc_cachemisses;		/* cache misses */
-	uintmax_t	sc_cachefull;		/* #times a cache was full */
-	uintmax_t	sc_writes;		/* #writes */
-	uintmax_t	sc_wrotebytes;		/* bytes written */
-};
-#define	sc_name	sc_geom->name
-
-struct g_cache_desc {
-	off_t		d_bno;			/* block number */
-	caddr_t		d_data;			/* data area */
-	struct bio	*d_biolist;		/* waiters */
-	time_t		d_atime;		/* access time */
-	int		d_flags;		/* flags */
-#define	D_FLAG_USED	(1 << 0)			/* can be reused */
-#define	D_FLAG_INVALID	(1 << 1)			/* invalid */
-	LIST_ENTRY(g_cache_desc) d_next;	/* list */
-	TAILQ_ENTRY(g_cache_desc) d_used;	/* used list */
-};
-
-#define	G_CACHE_NEXT_BIO1(bp)	(bp)->bio_driver1
-#define	G_CACHE_NEXT_BIO2(bp)	(bp)->bio_driver2
-#define	G_CACHE_DESC1(bp)	(bp)->bio_caller1
-#define	G_CACHE_DESC2(bp)	(bp)->bio_caller2
-
-#endif	/* _KERNEL */
-
-struct g_cache_metadata {
-	char		md_magic[16];		/* Magic value. */
-	uint32_t	md_version;		/* Version number. */
-	char		md_name[16];		/* Cache value. */
-	uint32_t	md_bsize;		/* Cache block size. */
-	uint32_t	md_size;		/* Cache size. */
-	uint64_t	md_provsize;		/* Provider's size. */
-};
-
-static __inline void
-cache_metadata_encode(const struct g_cache_metadata *md, u_char *data)
-{
-
-	bcopy(md->md_magic, data, sizeof(md->md_magic));
-	le32enc(data + 16, md->md_version);
-	bcopy(md->md_name, data + 20, sizeof(md->md_name));
-	le32enc(data + 36, md->md_bsize);
-	le32enc(data + 40, md->md_size);
-	le64enc(data + 44, md->md_provsize);
-}
-
-static __inline void
-cache_metadata_decode(const u_char *data, struct g_cache_metadata *md)
-{
-
-	bcopy(data, md->md_magic, sizeof(md->md_magic));
-	md->md_version = le32dec(data + 16);
-	bcopy(data + 20, md->md_name, sizeof(md->md_name));
-	md->md_bsize = le32dec(data + 36);
-	md->md_size = le32dec(data + 40);
-	md->md_provsize = le64dec(data + 44);
-}
-
-#endif	/* _G_CACHE_H_ */
diff --git a/include.new/geom/concat/g_concat.h b/include.new/geom/concat/g_concat.h
deleted file mode 100644
index 235596a..0000000
--- a/include.new/geom/concat/g_concat.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/concat/g_concat.h 260385 2014-01-07 01:32:23Z scottl $
- */
-
-#ifndef	_G_CONCAT_H_
-#define	_G_CONCAT_H_
-
-#include <sys/endian.h>
-
-#define	G_CONCAT_CLASS_NAME	"CONCAT"
-
-#define	G_CONCAT_MAGIC		"GEOM::CONCAT"
-/*
- * Version history:
- * 1 - Initial version number.
- * 2 - Added 'stop' command to gconcat(8).
- * 3 - Added md_provider field to metadata and '-h' option to gconcat(8).
- * 4 - Added md_provsize field to metadata.
- */
-#define	G_CONCAT_VERSION	4
-
-#ifdef _KERNEL
-#define	G_CONCAT_TYPE_MANUAL	0
-#define	G_CONCAT_TYPE_AUTOMATIC	1
-
-#define	G_CONCAT_DEBUG(lvl, ...)	do {				\
-	if (g_concat_debug >= (lvl)) {					\
-		printf("GEOM_CONCAT");					\
-		if (g_concat_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_CONCAT_LOGREQ(bp, ...)	do {				\
-	if (g_concat_debug >= 2) {					\
-		printf("GEOM_CONCAT[2]: ");				\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-struct g_concat_disk {
-	struct g_consumer	*d_consumer;
-	struct g_concat_softc	*d_softc;
-	off_t			 d_start;
-	off_t			 d_end;
-	int			 d_removed;
-};
-
-struct g_concat_softc {
-	u_int		 sc_type;	/* provider type */
-	struct g_geom	*sc_geom;
-	struct g_provider *sc_provider;
-	uint32_t	 sc_id;		/* concat unique ID */
-
-	struct g_concat_disk *sc_disks;
-	uint16_t	 sc_ndisks;
-	struct mtx	 sc_lock;
-};
-#define	sc_name	sc_geom->name
-#endif	/* _KERNEL */
-
-struct g_concat_metadata {
-	char		md_magic[16];	/* Magic value. */
-	uint32_t	md_version;	/* Version number. */
-	char		md_name[16];	/* Concat name. */
-	uint32_t	md_id;		/* Unique ID. */
-	uint16_t	md_no;		/* Disk number. */
-	uint16_t	md_all;		/* Number of all disks. */
-	char		md_provider[16]; /* Hardcoded provider. */
-	uint64_t	md_provsize;	/* Provider's size. */
-};
-static __inline void
-concat_metadata_encode(const struct g_concat_metadata *md, u_char *data)
-{
-
-	bcopy(md->md_magic, data, sizeof(md->md_magic));
-	le32enc(data + 16, md->md_version);
-	bcopy(md->md_name, data + 20, sizeof(md->md_name));
-	le32enc(data + 36, md->md_id);
-	le16enc(data + 40, md->md_no);
-	le16enc(data + 42, md->md_all);
-	bcopy(md->md_provider, data + 44, sizeof(md->md_provider));
-	le64enc(data + 60, md->md_provsize);
-}
-static __inline void
-concat_metadata_decode(const u_char *data, struct g_concat_metadata *md)
-{
-
-	bcopy(data, md->md_magic, sizeof(md->md_magic));
-	md->md_version = le32dec(data + 16);
-	bcopy(data + 20, md->md_name, sizeof(md->md_name));
-	md->md_id = le32dec(data + 36);
-	md->md_no = le16dec(data + 40);
-	md->md_all = le16dec(data + 42);
-	bcopy(data + 44, md->md_provider, sizeof(md->md_provider));
-	md->md_provsize = le64dec(data + 60);
-}
-#endif	/* _G_CONCAT_H_ */
diff --git a/include.new/geom/eli/g_eli.h b/include.new/geom/eli/g_eli.h
deleted file mode 100644
index c0f3b2a..0000000
--- a/include.new/geom/eli/g_eli.h
+++ /dev/null
@@ -1,626 +0,0 @@
-/*-
- * Copyright (c) 2005-2011 Pawel Jakub Dawidek <pawel@dawidek.net>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/eli/g_eli.h 238116 2012-07-04 17:54:17Z pjd $
- */
-
-#ifndef	_G_ELI_H_
-#define	_G_ELI_H_
-
-#include <sys/endian.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <crypto/sha2/sha2.h>
-#include <opencrypto/cryptodev.h>
-#ifdef _KERNEL
-#include <sys/bio.h>
-#include <sys/libkern.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/queue.h>
-#include <sys/tree.h>
-#include <geom/geom.h>
-#else
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#endif
-#ifndef _OpenSSL_
-#include <sys/md5.h>
-#endif
-
-#define	G_ELI_CLASS_NAME	"ELI"
-#define	G_ELI_MAGIC		"GEOM::ELI"
-#define	G_ELI_SUFFIX		".eli"
-
-/*
- * Version history:
- * 0 - Initial version number.
- * 1 - Added data authentication support (md_aalgo field and
- *     G_ELI_FLAG_AUTH flag).
- * 2 - Added G_ELI_FLAG_READONLY.
- * 3 - Added 'configure' subcommand.
- * 4 - IV is generated from offset converted to little-endian
- *     (the G_ELI_FLAG_NATIVE_BYTE_ORDER flag will be set for older versions).
- * 5 - Added multiple encrypton keys and AES-XTS support.
- * 6 - Fixed usage of multiple keys for authenticated providers (the
- *     G_ELI_FLAG_FIRST_KEY flag will be set for older versions).
- * 7 - Encryption keys are now generated from the Data Key and not from the
- *     IV Key (the G_ELI_FLAG_ENC_IVKEY flag will be set for older versions).
- */
-#define	G_ELI_VERSION_00	0
-#define	G_ELI_VERSION_01	1
-#define	G_ELI_VERSION_02	2
-#define	G_ELI_VERSION_03	3
-#define	G_ELI_VERSION_04	4
-#define	G_ELI_VERSION_05	5
-#define	G_ELI_VERSION_06	6
-#define	G_ELI_VERSION_07	7
-#define	G_ELI_VERSION		G_ELI_VERSION_07
-
-/* ON DISK FLAGS. */
-/* Use random, onetime keys. */
-#define	G_ELI_FLAG_ONETIME		0x00000001
-/* Ask for the passphrase from the kernel, before mounting root. */
-#define	G_ELI_FLAG_BOOT			0x00000002
-/* Detach on last close, if we were open for writing. */
-#define	G_ELI_FLAG_WO_DETACH		0x00000004
-/* Detach on last close. */
-#define	G_ELI_FLAG_RW_DETACH		0x00000008
-/* Provide data authentication. */
-#define	G_ELI_FLAG_AUTH			0x00000010
-/* Provider is read-only, we should deny all write attempts. */
-#define	G_ELI_FLAG_RO			0x00000020
-/* RUNTIME FLAGS. */
-/* Provider was open for writing. */
-#define	G_ELI_FLAG_WOPEN		0x00010000
-/* Destroy device. */
-#define	G_ELI_FLAG_DESTROY		0x00020000
-/* Provider uses native byte-order for IV generation. */
-#define	G_ELI_FLAG_NATIVE_BYTE_ORDER	0x00040000
-/* Provider uses single encryption key. */
-#define	G_ELI_FLAG_SINGLE_KEY		0x00080000
-/* Device suspended. */
-#define	G_ELI_FLAG_SUSPEND		0x00100000
-/* Provider uses first encryption key. */
-#define	G_ELI_FLAG_FIRST_KEY		0x00200000
-/* Provider uses IV-Key for encryption key generation. */
-#define	G_ELI_FLAG_ENC_IVKEY		0x00400000
-
-#define	G_ELI_NEW_BIO	255
-
-#define	SHA512_MDLEN		64
-#define	G_ELI_AUTH_SECKEYLEN	SHA256_DIGEST_LENGTH
-
-#define	G_ELI_MAXMKEYS		2
-#define	G_ELI_MAXKEYLEN		64
-#define	G_ELI_USERKEYLEN	G_ELI_MAXKEYLEN
-#define	G_ELI_DATAKEYLEN	G_ELI_MAXKEYLEN
-#define	G_ELI_AUTHKEYLEN	G_ELI_MAXKEYLEN
-#define	G_ELI_IVKEYLEN		G_ELI_MAXKEYLEN
-#define	G_ELI_SALTLEN		64
-#define	G_ELI_DATAIVKEYLEN	(G_ELI_DATAKEYLEN + G_ELI_IVKEYLEN)
-/* Data-Key, IV-Key, HMAC_SHA512(Derived-Key, Data-Key+IV-Key) */
-#define	G_ELI_MKEYLEN		(G_ELI_DATAIVKEYLEN + SHA512_MDLEN)
-#define	G_ELI_OVERWRITES	5
-/* Switch data encryption key every 2^20 blocks. */
-#define	G_ELI_KEY_SHIFT		20
-
-#ifdef _KERNEL
-extern int g_eli_debug;
-extern u_int g_eli_overwrites;
-extern u_int g_eli_batch;
-
-#define	G_ELI_CRYPTO_UNKNOWN	0
-#define	G_ELI_CRYPTO_HW		1
-#define	G_ELI_CRYPTO_SW		2
-
-#define	G_ELI_DEBUG(lvl, ...)	do {					\
-	if (g_eli_debug >= (lvl)) {					\
-		printf("GEOM_ELI");					\
-		if (g_eli_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_ELI_LOGREQ(lvl, bp, ...)	do {				\
-	if (g_eli_debug >= (lvl)) {					\
-		printf("GEOM_ELI");					\
-		if (g_eli_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-struct g_eli_worker {
-	struct g_eli_softc	*w_softc;
-	struct proc		*w_proc;
-	u_int			 w_number;
-	uint64_t		 w_sid;
-	boolean_t		 w_active;
-	LIST_ENTRY(g_eli_worker) w_next;
-};
-
-struct g_eli_softc {
-	struct g_geom	*sc_geom;
-	u_int		 sc_version;
-	u_int		 sc_crypto;
-	uint8_t		 sc_mkey[G_ELI_DATAIVKEYLEN];
-	uint8_t		 sc_ekey[G_ELI_DATAKEYLEN];
-	TAILQ_HEAD(, g_eli_key) sc_ekeys_queue;
-	RB_HEAD(g_eli_key_tree, g_eli_key) sc_ekeys_tree;
-	struct mtx	 sc_ekeys_lock;
-	uint64_t	 sc_ekeys_total;
-	uint64_t	 sc_ekeys_allocated;
-	u_int		 sc_ealgo;
-	u_int		 sc_ekeylen;
-	uint8_t		 sc_akey[G_ELI_AUTHKEYLEN];
-	u_int		 sc_aalgo;
-	u_int		 sc_akeylen;
-	u_int		 sc_alen;
-	SHA256_CTX	 sc_akeyctx;
-	uint8_t		 sc_ivkey[G_ELI_IVKEYLEN];
-	SHA256_CTX	 sc_ivctx;
-	int		 sc_nkey;
-	uint32_t	 sc_flags;
-	int		 sc_inflight;
-	off_t		 sc_mediasize;
-	size_t		 sc_sectorsize;
-	u_int		 sc_bytes_per_sector;
-	u_int		 sc_data_per_sector;
-	boolean_t	 sc_cpubind;
-
-	/* Only for software cryptography. */
-	struct bio_queue_head sc_queue;
-	struct mtx	 sc_queue_mtx;
-	LIST_HEAD(, g_eli_worker) sc_workers;
-};
-#define	sc_name		 sc_geom->name
-#endif	/* _KERNEL */
-
-struct g_eli_metadata {
-	char		md_magic[16];	/* Magic value. */
-	uint32_t	md_version;	/* Version number. */
-	uint32_t	md_flags;	/* Additional flags. */
-	uint16_t	md_ealgo;	/* Encryption algorithm. */
-	uint16_t	md_keylen;	/* Key length. */
-	uint16_t	md_aalgo;	/* Authentication algorithm. */
-	uint64_t	md_provsize;	/* Provider's size. */
-	uint32_t	md_sectorsize;	/* Sector size. */
-	uint8_t		md_keys;	/* Available keys. */
-	int32_t		md_iterations;	/* Number of iterations for PKCS#5v2. */
-	uint8_t		md_salt[G_ELI_SALTLEN]; /* Salt. */
-			/* Encrypted master key (IV-key, Data-key, HMAC). */
-	uint8_t		md_mkeys[G_ELI_MAXMKEYS * G_ELI_MKEYLEN];
-	u_char		md_hash[16];	/* MD5 hash. */
-} __packed;
-#ifndef _OpenSSL_
-static __inline void
-eli_metadata_encode_v0(struct g_eli_metadata *md, u_char **datap)
-{
-	u_char *p;
-
-	p = *datap;
-	le32enc(p, md->md_flags);	p += sizeof(md->md_flags);
-	le16enc(p, md->md_ealgo);	p += sizeof(md->md_ealgo);
-	le16enc(p, md->md_keylen);	p += sizeof(md->md_keylen);
-	le64enc(p, md->md_provsize);	p += sizeof(md->md_provsize);
-	le32enc(p, md->md_sectorsize);	p += sizeof(md->md_sectorsize);
-	*p = md->md_keys;		p += sizeof(md->md_keys);
-	le32enc(p, md->md_iterations);	p += sizeof(md->md_iterations);
-	bcopy(md->md_salt, p, sizeof(md->md_salt)); p += sizeof(md->md_salt);
-	bcopy(md->md_mkeys, p, sizeof(md->md_mkeys)); p += sizeof(md->md_mkeys);
-	*datap = p;
-}
-static __inline void
-eli_metadata_encode_v1v2v3v4v5v6v7(struct g_eli_metadata *md, u_char **datap)
-{
-	u_char *p;
-
-	p = *datap;
-	le32enc(p, md->md_flags);	p += sizeof(md->md_flags);
-	le16enc(p, md->md_ealgo);	p += sizeof(md->md_ealgo);
-	le16enc(p, md->md_keylen);	p += sizeof(md->md_keylen);
-	le16enc(p, md->md_aalgo);	p += sizeof(md->md_aalgo);
-	le64enc(p, md->md_provsize);	p += sizeof(md->md_provsize);
-	le32enc(p, md->md_sectorsize);	p += sizeof(md->md_sectorsize);
-	*p = md->md_keys;		p += sizeof(md->md_keys);
-	le32enc(p, md->md_iterations);	p += sizeof(md->md_iterations);
-	bcopy(md->md_salt, p, sizeof(md->md_salt)); p += sizeof(md->md_salt);
-	bcopy(md->md_mkeys, p, sizeof(md->md_mkeys)); p += sizeof(md->md_mkeys);
-	*datap = p;
-}
-static __inline void
-eli_metadata_encode(struct g_eli_metadata *md, u_char *data)
-{
-	MD5_CTX ctx;
-	u_char *p;
-
-	p = data;
-	bcopy(md->md_magic, p, sizeof(md->md_magic));
-	p += sizeof(md->md_magic);
-	le32enc(p, md->md_version);
-	p += sizeof(md->md_version);
-	switch (md->md_version) {
-	case G_ELI_VERSION_00:
-		eli_metadata_encode_v0(md, &p);
-		break;
-	case G_ELI_VERSION_01:
-	case G_ELI_VERSION_02:
-	case G_ELI_VERSION_03:
-	case G_ELI_VERSION_04:
-	case G_ELI_VERSION_05:
-	case G_ELI_VERSION_06:
-	case G_ELI_VERSION_07:
-		eli_metadata_encode_v1v2v3v4v5v6v7(md, &p);
-		break;
-	default:
-#ifdef _KERNEL
-		panic("%s: Unsupported version %u.", __func__,
-		    (u_int)md->md_version);
-#else
-		assert(!"Unsupported metadata version.");
-#endif
-	}
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, p - data);
-	MD5Final(md->md_hash, &ctx);
-	bcopy(md->md_hash, p, sizeof(md->md_hash));
-}
-static __inline int
-eli_metadata_decode_v0(const u_char *data, struct g_eli_metadata *md)
-{
-	MD5_CTX ctx;
-	const u_char *p;
-
-	p = data + sizeof(md->md_magic) + sizeof(md->md_version);
-	md->md_flags = le32dec(p);	p += sizeof(md->md_flags);
-	md->md_ealgo = le16dec(p);	p += sizeof(md->md_ealgo);
-	md->md_keylen = le16dec(p);	p += sizeof(md->md_keylen);
-	md->md_provsize = le64dec(p);	p += sizeof(md->md_provsize);
-	md->md_sectorsize = le32dec(p);	p += sizeof(md->md_sectorsize);
-	md->md_keys = *p;		p += sizeof(md->md_keys);
-	md->md_iterations = le32dec(p);	p += sizeof(md->md_iterations);
-	bcopy(p, md->md_salt, sizeof(md->md_salt)); p += sizeof(md->md_salt);
-	bcopy(p, md->md_mkeys, sizeof(md->md_mkeys)); p += sizeof(md->md_mkeys);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, p - data);
-	MD5Final(md->md_hash, &ctx);
-	if (bcmp(md->md_hash, p, 16) != 0)
-		return (EINVAL);
-	return (0);
-}
-
-static __inline int
-eli_metadata_decode_v1v2v3v4v5v6v7(const u_char *data, struct g_eli_metadata *md)
-{
-	MD5_CTX ctx;
-	const u_char *p;
-
-	p = data + sizeof(md->md_magic) + sizeof(md->md_version);
-	md->md_flags = le32dec(p);	p += sizeof(md->md_flags);
-	md->md_ealgo = le16dec(p);	p += sizeof(md->md_ealgo);
-	md->md_keylen = le16dec(p);	p += sizeof(md->md_keylen);
-	md->md_aalgo = le16dec(p);	p += sizeof(md->md_aalgo);
-	md->md_provsize = le64dec(p);	p += sizeof(md->md_provsize);
-	md->md_sectorsize = le32dec(p);	p += sizeof(md->md_sectorsize);
-	md->md_keys = *p;		p += sizeof(md->md_keys);
-	md->md_iterations = le32dec(p);	p += sizeof(md->md_iterations);
-	bcopy(p, md->md_salt, sizeof(md->md_salt)); p += sizeof(md->md_salt);
-	bcopy(p, md->md_mkeys, sizeof(md->md_mkeys)); p += sizeof(md->md_mkeys);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, p - data);
-	MD5Final(md->md_hash, &ctx);
-	if (bcmp(md->md_hash, p, 16) != 0)
-		return (EINVAL);
-	return (0);
-}
-static __inline int
-eli_metadata_decode(const u_char *data, struct g_eli_metadata *md)
-{
-	int error;
-
-	bcopy(data, md->md_magic, sizeof(md->md_magic));
-	if (strcmp(md->md_magic, G_ELI_MAGIC) != 0)
-		return (EINVAL);
-	md->md_version = le32dec(data + sizeof(md->md_magic));
-	switch (md->md_version) {
-	case G_ELI_VERSION_00:
-		error = eli_metadata_decode_v0(data, md);
-		break;
-	case G_ELI_VERSION_01:
-	case G_ELI_VERSION_02:
-	case G_ELI_VERSION_03:
-	case G_ELI_VERSION_04:
-	case G_ELI_VERSION_05:
-	case G_ELI_VERSION_06:
-	case G_ELI_VERSION_07:
-		error = eli_metadata_decode_v1v2v3v4v5v6v7(data, md);
-		break;
-	default:
-		error = EOPNOTSUPP;
-		break;
-	}
-	return (error);
-}
-#endif	/* !_OpenSSL */
-
-static __inline u_int
-g_eli_str2ealgo(const char *name)
-{
-
-	if (strcasecmp("null", name) == 0)
-		return (CRYPTO_NULL_CBC);
-	else if (strcasecmp("null-cbc", name) == 0)
-		return (CRYPTO_NULL_CBC);
-	else if (strcasecmp("aes", name) == 0)
-		return (CRYPTO_AES_XTS);
-	else if (strcasecmp("aes-cbc", name) == 0)
-		return (CRYPTO_AES_CBC);
-	else if (strcasecmp("aes-xts", name) == 0)
-		return (CRYPTO_AES_XTS);
-	else if (strcasecmp("blowfish", name) == 0)
-		return (CRYPTO_BLF_CBC);
-	else if (strcasecmp("blowfish-cbc", name) == 0)
-		return (CRYPTO_BLF_CBC);
-	else if (strcasecmp("camellia", name) == 0)
-		return (CRYPTO_CAMELLIA_CBC);
-	else if (strcasecmp("camellia-cbc", name) == 0)
-		return (CRYPTO_CAMELLIA_CBC);
-	else if (strcasecmp("3des", name) == 0)
-		return (CRYPTO_3DES_CBC);
-	else if (strcasecmp("3des-cbc", name) == 0)
-		return (CRYPTO_3DES_CBC);
-	return (CRYPTO_ALGORITHM_MIN - 1);
-}
-
-static __inline u_int
-g_eli_str2aalgo(const char *name)
-{
-
-	if (strcasecmp("hmac/md5", name) == 0)
-		return (CRYPTO_MD5_HMAC);
-	else if (strcasecmp("hmac/sha1", name) == 0)
-		return (CRYPTO_SHA1_HMAC);
-	else if (strcasecmp("hmac/ripemd160", name) == 0)
-		return (CRYPTO_RIPEMD160_HMAC);
-	else if (strcasecmp("hmac/sha256", name) == 0)
-		return (CRYPTO_SHA2_256_HMAC);
-	else if (strcasecmp("hmac/sha384", name) == 0)
-		return (CRYPTO_SHA2_384_HMAC);
-	else if (strcasecmp("hmac/sha512", name) == 0)
-		return (CRYPTO_SHA2_512_HMAC);
-	return (CRYPTO_ALGORITHM_MIN - 1);
-}
-
-static __inline const char *
-g_eli_algo2str(u_int algo)
-{
-
-	switch (algo) {
-	case CRYPTO_NULL_CBC:
-		return ("NULL");
-	case CRYPTO_AES_CBC:
-		return ("AES-CBC");
-	case CRYPTO_AES_XTS:
-		return ("AES-XTS");
-	case CRYPTO_BLF_CBC:
-		return ("Blowfish-CBC");
-	case CRYPTO_CAMELLIA_CBC:
-		return ("CAMELLIA-CBC");
-	case CRYPTO_3DES_CBC:
-		return ("3DES-CBC");
-	case CRYPTO_MD5_HMAC:
-		return ("HMAC/MD5");
-	case CRYPTO_SHA1_HMAC:
-		return ("HMAC/SHA1");
-	case CRYPTO_RIPEMD160_HMAC:
-		return ("HMAC/RIPEMD160");
-	case CRYPTO_SHA2_256_HMAC:
-		return ("HMAC/SHA256");
-	case CRYPTO_SHA2_384_HMAC:
-		return ("HMAC/SHA384");
-	case CRYPTO_SHA2_512_HMAC:
-		return ("HMAC/SHA512");
-	}
-	return ("unknown");
-}
-
-static __inline void
-eli_metadata_dump(const struct g_eli_metadata *md)
-{
-	static const char hex[] = "0123456789abcdef";
-	char str[sizeof(md->md_mkeys) * 2 + 1];
-	u_int i;
-
-	printf("     magic: %s\n", md->md_magic);
-	printf("   version: %u\n", (u_int)md->md_version);
-	printf("     flags: 0x%x\n", (u_int)md->md_flags);
-	printf("     ealgo: %s\n", g_eli_algo2str(md->md_ealgo));
-	printf("    keylen: %u\n", (u_int)md->md_keylen);
-	if (md->md_flags & G_ELI_FLAG_AUTH)
-		printf("     aalgo: %s\n", g_eli_algo2str(md->md_aalgo));
-	printf("  provsize: %ju\n", (uintmax_t)md->md_provsize);
-	printf("sectorsize: %u\n", (u_int)md->md_sectorsize);
-	printf("      keys: 0x%02x\n", (u_int)md->md_keys);
-	printf("iterations: %u\n", (u_int)md->md_iterations);
-	bzero(str, sizeof(str));
-	for (i = 0; i < sizeof(md->md_salt); i++) {
-		str[i * 2] = hex[md->md_salt[i] >> 4];
-		str[i * 2 + 1] = hex[md->md_salt[i] & 0x0f];
-	}
-	printf("      Salt: %s\n", str);
-	bzero(str, sizeof(str));
-	for (i = 0; i < sizeof(md->md_mkeys); i++) {
-		str[i * 2] = hex[md->md_mkeys[i] >> 4];
-		str[i * 2 + 1] = hex[md->md_mkeys[i] & 0x0f];
-	}
-	printf("Master Key: %s\n", str);
-	bzero(str, sizeof(str));
-	for (i = 0; i < 16; i++) {
-		str[i * 2] = hex[md->md_hash[i] >> 4];
-		str[i * 2 + 1] = hex[md->md_hash[i] & 0x0f];
-	}
-	printf("  MD5 hash: %s\n", str);
-}
-
-static __inline u_int
-g_eli_keylen(u_int algo, u_int keylen)
-{
-
-	switch (algo) {
-	case CRYPTO_NULL_CBC:
-		if (keylen == 0)
-			keylen = 64 * 8;
-		else {
-			if (keylen > 64 * 8)
-				keylen = 0;
-		}
-		return (keylen);
-	case CRYPTO_AES_CBC:
-	case CRYPTO_CAMELLIA_CBC:
-		switch (keylen) {
-		case 0:
-			return (128);
-		case 128:
-		case 192:
-		case 256:
-			return (keylen);
-		default:
-			return (0);
-		}
-	case CRYPTO_AES_XTS:
-		switch (keylen) {
-		case 0:
-			return (128);
-		case 128:
-		case 256:
-			return (keylen);
-		default:
-			return (0);
-		}
-	case CRYPTO_BLF_CBC:
-		if (keylen == 0)
-			return (128);
-		if (keylen < 128 || keylen > 448)
-			return (0);
-		if ((keylen % 32) != 0)
-			return (0);
-		return (keylen);
-	case CRYPTO_3DES_CBC:
-		if (keylen == 0 || keylen == 192)
-			return (192);
-		return (0);
-	default:
-		return (0);
-	}
-}
-
-static __inline u_int
-g_eli_hashlen(u_int algo)
-{
-
-	switch (algo) {
-	case CRYPTO_MD5_HMAC:
-		return (16);
-	case CRYPTO_SHA1_HMAC:
-		return (20);
-	case CRYPTO_RIPEMD160_HMAC:
-		return (20);
-	case CRYPTO_SHA2_256_HMAC:
-		return (32);
-	case CRYPTO_SHA2_384_HMAC:
-		return (48);
-	case CRYPTO_SHA2_512_HMAC:
-		return (64);
-	}
-	return (0);
-}
-
-#ifdef _KERNEL
-int g_eli_read_metadata(struct g_class *mp, struct g_provider *pp,
-    struct g_eli_metadata *md);
-struct g_geom *g_eli_create(struct gctl_req *req, struct g_class *mp,
-    struct g_provider *bpp, const struct g_eli_metadata *md,
-    const u_char *mkey, int nkey);
-int g_eli_destroy(struct g_eli_softc *sc, boolean_t force);
-
-int g_eli_access(struct g_provider *pp, int dr, int dw, int de);
-void g_eli_config(struct gctl_req *req, struct g_class *mp, const char *verb);
-
-void g_eli_read_done(struct bio *bp);
-void g_eli_write_done(struct bio *bp);
-int g_eli_crypto_rerun(struct cryptop *crp);
-void g_eli_crypto_ivgen(struct g_eli_softc *sc, off_t offset, u_char *iv,
-    size_t size);
-
-void g_eli_crypto_read(struct g_eli_softc *sc, struct bio *bp, boolean_t fromworker);
-void g_eli_crypto_run(struct g_eli_worker *wr, struct bio *bp);
-
-void g_eli_auth_read(struct g_eli_softc *sc, struct bio *bp);
-void g_eli_auth_run(struct g_eli_worker *wr, struct bio *bp);
-#endif
-
-void g_eli_mkey_hmac(unsigned char *mkey, const unsigned char *key);
-int g_eli_mkey_decrypt(const struct g_eli_metadata *md,
-    const unsigned char *key, unsigned char *mkey, unsigned *nkeyp);
-int g_eli_mkey_encrypt(unsigned algo, const unsigned char *key, unsigned keylen,
-    unsigned char *mkey);
-#ifdef _KERNEL
-void g_eli_mkey_propagate(struct g_eli_softc *sc, const unsigned char *mkey);
-#endif
-
-int g_eli_crypto_encrypt(u_int algo, u_char *data, size_t datasize,
-    const u_char *key, size_t keysize);
-int g_eli_crypto_decrypt(u_int algo, u_char *data, size_t datasize,
-    const u_char *key, size_t keysize);
-
-struct hmac_ctx {
-	SHA512_CTX	shactx;
-	u_char		k_opad[128];
-};
-
-void g_eli_crypto_hmac_init(struct hmac_ctx *ctx, const uint8_t *hkey,
-    size_t hkeylen);
-void g_eli_crypto_hmac_update(struct hmac_ctx *ctx, const uint8_t *data,
-    size_t datasize);
-void g_eli_crypto_hmac_final(struct hmac_ctx *ctx, uint8_t *md, size_t mdsize);
-void g_eli_crypto_hmac(const uint8_t *hkey, size_t hkeysize,
-    const uint8_t *data, size_t datasize, uint8_t *md, size_t mdsize);
-
-#ifdef _KERNEL
-void g_eli_key_init(struct g_eli_softc *sc);
-void g_eli_key_destroy(struct g_eli_softc *sc);
-uint8_t *g_eli_key_hold(struct g_eli_softc *sc, off_t offset, size_t blocksize);
-void g_eli_key_drop(struct g_eli_softc *sc, uint8_t *rawkey);
-#endif
-#endif	/* !_G_ELI_H_ */
diff --git a/include.new/geom/eli/pkcs5v2.h b/include.new/geom/eli/pkcs5v2.h
deleted file mode 100644
index 437b4f0..0000000
--- a/include.new/geom/eli/pkcs5v2.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2005 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/eli/pkcs5v2.h 155174 2006-02-01 12:06:01Z pjd $
- */
-
-#ifndef _PKCS5V2_H_
-#define	_PKCS5V2_H_
-void pkcs5v2_genkey(uint8_t *key, unsigned keylen, const uint8_t *salt,
-    size_t saltsize, const char *passphrase, u_int iterations);
-#ifndef _KERNEL
-int pkcs5v2_calculate(int usecs);
-#endif
-#endif	/* !_PKCS5V2_H_ */
diff --git a/include.new/geom/gate/g_gate.h b/include.new/geom/gate/g_gate.h
deleted file mode 100644
index 687074a..0000000
--- a/include.new/geom/gate/g_gate.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/*-
- * Copyright (c) 2004-2009 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/gate/g_gate.h 238119 2012-07-04 20:16:28Z pjd $
- */
-
-#ifndef _G_GATE_H_
-#define _G_GATE_H_
-
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/queue.h>
-
-#include <geom/geom.h>
-
-#define	G_GATE_CLASS_NAME	"GATE"
-#define	G_GATE_PROVIDER_NAME	"ggate"
-#define	G_GATE_MOD_NAME		"ggate"
-#define	G_GATE_CTL_NAME		"ggctl"
-
-#define G_GATE_VERSION		3
-
-/*
- * Maximum number of request that can be stored in
- * the queue when there are no workers.
- */
-#define	G_GATE_MAX_QUEUE_SIZE	4096
-
-#define	G_GATE_FLAG_READONLY	0x0001
-#define	G_GATE_FLAG_WRITEONLY	0x0002
-#define	G_GATE_FLAG_DESTROY	0x1000
-#define	G_GATE_USERFLAGS	(G_GATE_FLAG_READONLY | G_GATE_FLAG_WRITEONLY)
-
-/*
- * Pick unit number automatically in /dev/ggate<unit>.
- */
-#define	G_GATE_UNIT_AUTO	(-1)
-/*
- * Full provider name is given, so don't use ggate<unit>.
- */
-#define	G_GATE_NAME_GIVEN	(-2)
-
-#define G_GATE_CMD_CREATE	_IOWR('m', 0, struct g_gate_ctl_create)
-#define G_GATE_CMD_MODIFY	_IOWR('m', 1, struct g_gate_ctl_modify)
-#define G_GATE_CMD_DESTROY	_IOWR('m', 2, struct g_gate_ctl_destroy)
-#define G_GATE_CMD_CANCEL	_IOWR('m', 3, struct g_gate_ctl_cancel)
-#define G_GATE_CMD_START	_IOWR('m', 4, struct g_gate_ctl_io)
-#define G_GATE_CMD_DONE		_IOWR('m', 5, struct g_gate_ctl_io)
-
-#define	G_GATE_INFOSIZE		2048
-
-#ifdef _KERNEL
-/*
- * 'P:' means 'Protected by'.
- */
-struct g_gate_softc {
-	char			*sc_name;		/* P: (read-only) */
-	int			 sc_unit;		/* P: (read-only) */
-	int			 sc_ref;		/* P: g_gate_list_mtx */
-	struct g_provider	*sc_provider;		/* P: (read-only) */
-	uint32_t		 sc_flags;		/* P: sc_queue_mtx */
-
-	struct bio_queue_head	 sc_inqueue;		/* P: sc_queue_mtx */
-	struct bio_queue_head	 sc_outqueue;		/* P: sc_queue_mtx */
-	struct mtx		 sc_queue_mtx;
-	uint32_t		 sc_queue_count;	/* P: sc_queue_mtx */
-	uint32_t		 sc_queue_size;		/* P: (read-only) */
-	u_int			 sc_timeout;		/* P: (read-only) */
-	struct g_consumer	*sc_readcons;		/* P: XXX */
-	off_t			 sc_readoffset;		/* P: XXX */
-	struct callout		 sc_callout;		/* P: (modified only
-							       from callout
-							       thread) */
-	uintptr_t		 sc_seq;		/* P: (modified only
-							       from g_down
-							       thread) */
-	LIST_ENTRY(g_gate_softc) sc_next;		/* P: g_gate_list_mtx */
-	char			 sc_info[G_GATE_INFOSIZE]; /* P: (read-only) */
-};
-
-#define	G_GATE_DEBUG(lvl, ...)	do {					\
-	if (g_gate_debug >= (lvl)) {					\
-		printf("GEOM_GATE");					\
-		if (g_gate_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_GATE_LOGREQ(lvl, bp, ...)	do {				\
-	if (g_gate_debug >= (lvl)) {					\
-		printf("GEOM_GATE");					\
-		if (g_gate_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#endif	/* !_KERNEL */
-
-struct g_gate_ctl_create {
-	u_int	gctl_version;
-	off_t	gctl_mediasize;
-	u_int	gctl_sectorsize;
-	u_int	gctl_flags;
-	u_int	gctl_maxcount;
-	u_int	gctl_timeout;
-	char	gctl_name[NAME_MAX];
-	char	gctl_info[G_GATE_INFOSIZE];
-	char	gctl_readprov[NAME_MAX];
-	off_t	gctl_readoffset;
-	int	gctl_unit;	/* in/out */
-};
-
-#define	GG_MODIFY_MEDIASIZE	0x01
-#define	GG_MODIFY_INFO		0x02
-#define	GG_MODIFY_READPROV	0x04
-#define	GG_MODIFY_READOFFSET	0x08
-struct g_gate_ctl_modify {
-	u_int		gctl_version;
-	int		gctl_unit;
-	uint32_t	gctl_modify;
-	off_t		gctl_mediasize;
-	char		gctl_info[G_GATE_INFOSIZE];
-	char		gctl_readprov[NAME_MAX];
-	off_t		gctl_readoffset;
-};
-
-struct g_gate_ctl_destroy {
-	u_int	gctl_version;
-	int	gctl_unit;
-	int	gctl_force;
-	char	gctl_name[NAME_MAX];
-};
-
-struct g_gate_ctl_cancel {
-	u_int		gctl_version;
-	int		gctl_unit;
-	uintptr_t	gctl_seq;
-	char		gctl_name[NAME_MAX];
-};
-
-struct g_gate_ctl_io {
-	u_int		 gctl_version;
-	int		 gctl_unit;
-	uintptr_t	 gctl_seq;
-	u_int		 gctl_cmd;
-	off_t		 gctl_offset;
-	off_t		 gctl_length;
-	void		*gctl_data;
-	int		 gctl_error;
-};
-#endif	/* !_G_GATE_H_ */
diff --git a/include.new/geom/geom.h b/include.new/geom/geom.h
deleted file mode 100644
index 69872ba..0000000
--- a/include.new/geom/geom.h
+++ /dev/null
@@ -1,416 +0,0 @@
-/*-
- * Copyright (c) 2002 Poul-Henning Kamp
- * Copyright (c) 2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by Poul-Henning Kamp
- * and NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
- *
- * 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 names of the authors 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: releng/10.2/sys/geom/geom.h 271238 2014-09-07 21:30:47Z smh $
- */
-
-#ifndef _GEOM_GEOM_H_
-#define _GEOM_GEOM_H_
-
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/sx.h>
-#include <sys/queue.h>
-#include <sys/ioccom.h>
-#include <sys/conf.h>
-#include <sys/module.h>
-
-struct g_class;
-struct g_geom;
-struct g_consumer;
-struct g_provider;
-struct g_stat;
-struct thread;
-struct bio;
-struct sbuf;
-struct gctl_req;
-struct g_configargs;
-
-typedef int g_config_t (struct g_configargs *ca);
-typedef void g_ctl_req_t (struct gctl_req *, struct g_class *cp, char const *verb);
-typedef int g_ctl_create_geom_t (struct gctl_req *, struct g_class *cp, struct g_provider *pp);
-typedef int g_ctl_destroy_geom_t (struct gctl_req *, struct g_class *cp, struct g_geom *gp);
-typedef int g_ctl_config_geom_t (struct gctl_req *, struct g_geom *gp, const char *verb);
-typedef void g_init_t (struct g_class *mp);
-typedef void g_fini_t (struct g_class *mp);
-typedef struct g_geom * g_taste_t (struct g_class *, struct g_provider *, int flags);
-typedef int g_ioctl_t(struct g_provider *pp, u_long cmd, void *data, int fflag, struct thread *td);
-#define G_TF_NORMAL		0
-#define G_TF_INSIST		1
-#define G_TF_TRANSPARENT	2
-typedef int g_access_t (struct g_provider *, int, int, int);
-/* XXX: not sure about the thread arg */
-typedef void g_orphan_t (struct g_consumer *);
-
-typedef void g_start_t (struct bio *);
-typedef void g_spoiled_t (struct g_consumer *);
-typedef void g_attrchanged_t (struct g_consumer *, const char *attr);
-typedef void g_provgone_t (struct g_provider *);
-typedef void g_dumpconf_t (struct sbuf *, const char *indent, struct g_geom *,
-    struct g_consumer *, struct g_provider *);
-typedef void g_resize_t(struct g_consumer *cp);
-
-/*
- * The g_class structure describes a transformation class.  In other words
- * all BSD disklabel handlers share one g_class, all MBR handlers share
- * one common g_class and so on.
- * Certain operations are instantiated on the class, most notably the
- * taste and config_geom functions.
- */
-struct g_class {
-	const char		*name;
-	u_int			version;
-	u_int			spare0;
-	g_taste_t		*taste;
-	g_config_t		*config;
-	g_ctl_req_t		*ctlreq;
-	g_init_t		*init;
-	g_fini_t		*fini;
-	g_ctl_destroy_geom_t	*destroy_geom;
-	/*
-	 * Default values for geom methods
-	 */
-	g_start_t		*start;
-	g_spoiled_t		*spoiled;
-	g_attrchanged_t		*attrchanged;
-	g_dumpconf_t		*dumpconf;
-	g_access_t		*access;
-	g_orphan_t		*orphan;
-	g_ioctl_t		*ioctl;
-	g_provgone_t		*providergone;
-	g_resize_t		*resize;
-	void			*spare1;
-	void			*spare2;
-	/*
-	 * The remaining elements are private
-	 */
-	LIST_ENTRY(g_class)	class;
-	LIST_HEAD(,g_geom)	geom;
-};
-
-#define G_VERSION_00	0x19950323
-#define G_VERSION_01	0x20041207	/* add fflag to g_ioctl_t */
-#define G_VERSION	G_VERSION_01
-
-/*
- * The g_geom is an instance of a g_class.
- */
-struct g_geom {
-	char			*name;
-	struct g_class		*class;
-	LIST_ENTRY(g_geom)	geom;
-	LIST_HEAD(,g_consumer)	consumer;
-	LIST_HEAD(,g_provider)	provider;
-	TAILQ_ENTRY(g_geom)	geoms;	/* XXX: better name */
-	int			rank;
-	g_start_t		*start;
-	g_spoiled_t		*spoiled;
-	g_attrchanged_t		*attrchanged;
-	g_dumpconf_t		*dumpconf;
-	g_access_t		*access;
-	g_orphan_t		*orphan;
-	g_ioctl_t		*ioctl;
-	g_provgone_t		*providergone;
-	g_resize_t		*resize;
-	void			*spare0;
-	void			*spare1;
-	void			*softc;
-	unsigned		flags;
-#define	G_GEOM_WITHER		1
-#define	G_GEOM_VOLATILE_BIO	2
-};
-
-/*
- * The g_bioq is a queue of struct bio's.
- * XXX: possibly collection point for statistics.
- * XXX: should (possibly) be collapsed with sys/bio.h::bio_queue_head.
- */
-struct g_bioq {
-	TAILQ_HEAD(, bio)	bio_queue;
-	struct mtx		bio_queue_lock;
-	int			bio_queue_length;
-};
-
-/*
- * A g_consumer is an attachment point for a g_provider.  One g_consumer
- * can only be attached to one g_provider, but multiple g_consumers
- * can be attached to one g_provider.
- */
-
-struct g_consumer {
-	struct g_geom		*geom;
-	LIST_ENTRY(g_consumer)	consumer;
-	struct g_provider	*provider;
-	LIST_ENTRY(g_consumer)	consumers;	/* XXX: better name */
-	int			acr, acw, ace;
-	int			flags;
-#define G_CF_SPOILED		0x1
-#define G_CF_ORPHAN		0x4
-#define G_CF_DIRECT_SEND	0x10
-#define G_CF_DIRECT_RECEIVE	0x20
-	struct devstat		*stat;
-	u_int			nstart, nend;
-
-	/* Two fields for the implementing class to use */
-	void			*private;
-	u_int			index;
-};
-
-/*
- * A g_provider is a "logical disk".
- */
-struct g_provider {
-	char			*name;
-	LIST_ENTRY(g_provider)	provider;
-	struct g_geom		*geom;
-	LIST_HEAD(,g_consumer)	consumers;
-	int			acr, acw, ace;
-	int			error;
-	TAILQ_ENTRY(g_provider)	orphan;
-	off_t			mediasize;
-	u_int			sectorsize;
-	u_int			stripesize;
-	u_int			stripeoffset;
-	struct devstat		*stat;
-	u_int			nstart, nend;
-	u_int			flags;
-#define G_PF_WITHER		0x2
-#define G_PF_ORPHAN		0x4
-#define	G_PF_ACCEPT_UNMAPPED	0x8
-#define G_PF_DIRECT_SEND	0x10
-#define G_PF_DIRECT_RECEIVE	0x20
-
-	/* Two fields for the implementing class to use */
-	void			*private;
-	u_int			index;
-};
-
-/*
- * Descriptor of a classifier. We can register a function and
- * an argument, which is called by g_io_request() on bio's
- * that are not previously classified.
- */
-struct g_classifier_hook {
-	TAILQ_ENTRY(g_classifier_hook) link;
-	int			(*func)(void *arg, struct bio *bp);
-	void			*arg;
-};
-
-/* BIO_GETATTR("GEOM::setstate") argument values. */
-#define G_STATE_FAILED		0
-#define G_STATE_REBUILD		1
-#define G_STATE_RESYNC		2
-#define G_STATE_ACTIVE		3
-
-/* geom_dev.c */
-struct cdev;
-void g_dev_print(void);
-void g_dev_physpath_changed(void);
-struct g_provider *g_dev_getprovider(struct cdev *dev);
-
-/* geom_dump.c */
-void g_trace(int level, const char *, ...);
-#	define G_T_TOPOLOGY	1
-#	define G_T_BIO		2
-#	define G_T_ACCESS	4
-
-
-/* geom_event.c */
-typedef void g_event_t(void *, int flag);
-#define EV_CANCEL	1
-int g_post_event(g_event_t *func, void *arg, int flag, ...);
-int g_waitfor_event(g_event_t *func, void *arg, int flag, ...);
-void g_cancel_event(void *ref);
-int g_attr_changed(struct g_provider *pp, const char *attr, int flag);
-int g_media_changed(struct g_provider *pp, int flag);
-int g_media_gone(struct g_provider *pp, int flag);
-void g_orphan_provider(struct g_provider *pp, int error);
-void g_waitidlelock(void);
-
-/* geom_subr.c */
-int g_access(struct g_consumer *cp, int nread, int nwrite, int nexcl);
-int g_attach(struct g_consumer *cp, struct g_provider *pp);
-int g_compare_names(const char *namea, const char *nameb);
-void g_destroy_consumer(struct g_consumer *cp);
-void g_destroy_geom(struct g_geom *pp);
-void g_destroy_provider(struct g_provider *pp);
-void g_detach(struct g_consumer *cp);
-void g_error_provider(struct g_provider *pp, int error);
-struct g_provider *g_provider_by_name(char const *arg);
-int g_getattr__(const char *attr, struct g_consumer *cp, void *var, int len);
-#define g_getattr(a, c, v) g_getattr__((a), (c), (v), sizeof *(v))
-int g_handleattr(struct bio *bp, const char *attribute, const void *val,
-    int len);
-int g_handleattr_int(struct bio *bp, const char *attribute, int val);
-int g_handleattr_off_t(struct bio *bp, const char *attribute, off_t val);
-int g_handleattr_uint16_t(struct bio *bp, const char *attribute, uint16_t val);
-int g_handleattr_str(struct bio *bp, const char *attribute, const char *str);
-struct g_consumer * g_new_consumer(struct g_geom *gp);
-struct g_geom * g_new_geomf(struct g_class *mp, const char *fmt, ...)
-    __printflike(2, 3);
-struct g_provider * g_new_providerf(struct g_geom *gp, const char *fmt, ...)
-    __printflike(2, 3);
-void g_resize_provider(struct g_provider *pp, off_t size);
-int g_retaste(struct g_class *mp);
-void g_spoil(struct g_provider *pp, struct g_consumer *cp);
-int g_std_access(struct g_provider *pp, int dr, int dw, int de);
-void g_std_done(struct bio *bp);
-void g_std_spoiled(struct g_consumer *cp);
-void g_wither_geom(struct g_geom *gp, int error);
-void g_wither_geom_close(struct g_geom *gp, int error);
-void g_wither_provider(struct g_provider *pp, int error);
-
-#if defined(DIAGNOSTIC) || defined(DDB)
-int g_valid_obj(void const *ptr);
-#endif
-#ifdef DIAGNOSTIC
-#define G_VALID_CLASS(foo) \
-    KASSERT(g_valid_obj(foo) == 1, ("%p is not a g_class", foo))
-#define G_VALID_GEOM(foo) \
-    KASSERT(g_valid_obj(foo) == 2, ("%p is not a g_geom", foo))
-#define G_VALID_CONSUMER(foo) \
-    KASSERT(g_valid_obj(foo) == 3, ("%p is not a g_consumer", foo))
-#define G_VALID_PROVIDER(foo) \
-    KASSERT(g_valid_obj(foo) == 4, ("%p is not a g_provider", foo))
-#else
-#define G_VALID_CLASS(foo) do { } while (0)
-#define G_VALID_GEOM(foo) do { } while (0)
-#define G_VALID_CONSUMER(foo) do { } while (0)
-#define G_VALID_PROVIDER(foo) do { } while (0)
-#endif
-
-int g_modevent(module_t, int, void *);
-
-/* geom_io.c */
-struct bio * g_clone_bio(struct bio *);
-struct bio * g_duplicate_bio(struct bio *);
-void g_destroy_bio(struct bio *);
-void g_io_deliver(struct bio *bp, int error);
-int g_io_getattr(const char *attr, struct g_consumer *cp, int *len, void *ptr);
-int g_io_flush(struct g_consumer *cp);
-int g_register_classifier(struct g_classifier_hook *hook);
-void g_unregister_classifier(struct g_classifier_hook *hook);
-void g_io_request(struct bio *bp, struct g_consumer *cp);
-struct bio *g_new_bio(void);
-struct bio *g_alloc_bio(void);
-void * g_read_data(struct g_consumer *cp, off_t offset, off_t length, int *error);
-int g_write_data(struct g_consumer *cp, off_t offset, void *ptr, off_t length);
-int g_delete_data(struct g_consumer *cp, off_t offset, off_t length);
-void g_print_bio(struct bio *bp);
-
-/* geom_kern.c / geom_kernsim.c */
-
-#ifdef _KERNEL
-
-extern struct sx topology_lock;
-
-struct g_kerneldump {
-	off_t		offset;
-	off_t		length;
-	struct dumperinfo di;
-};
-
-MALLOC_DECLARE(M_GEOM);
-
-static __inline void *
-g_malloc(int size, int flags)
-{
-	void *p;
-
-	p = malloc(size, M_GEOM, flags);
-	return (p);
-}
-
-static __inline void
-g_free(void *ptr)
-{
-
-#ifdef DIAGNOSTIC
-	if (sx_xlocked(&topology_lock)) {
-		KASSERT(g_valid_obj(ptr) == 0,
-		    ("g_free(%p) of live object, type %d", ptr,
-		    g_valid_obj(ptr)));
-	}
-#endif
-	free(ptr, M_GEOM);
-}
-
-#define g_topology_lock() 					\
-	do {							\
-		mtx_assert(&Giant, MA_NOTOWNED);		\
-		sx_xlock(&topology_lock);			\
-	} while (0)
-
-#define g_topology_try_lock()	sx_try_xlock(&topology_lock)
-
-#define g_topology_unlock()					\
-	do {							\
-		sx_xunlock(&topology_lock);			\
-	} while (0)
-
-#define g_topology_assert()					\
-	do {							\
-		sx_assert(&topology_lock, SX_XLOCKED);		\
-	} while (0)
-
-#define g_topology_assert_not()					\
-	do {							\
-		sx_assert(&topology_lock, SX_UNLOCKED);		\
-	} while (0)
-
-#define g_topology_sleep(chan, timo)				\
-	sx_sleep(chan, &topology_lock, 0, "gtopol", timo)
-
-#define DECLARE_GEOM_CLASS(class, name) 			\
-	static moduledata_t name##_mod = {			\
-		#name, g_modevent, &class			\
-	};							\
-	DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);
-
-int g_is_geom_thread(struct thread *td);
-
-#endif /* _KERNEL */
-
-/* geom_ctl.c */
-int gctl_set_param(struct gctl_req *req, const char *param, void const *ptr, int len);
-void gctl_set_param_err(struct gctl_req *req, const char *param, void const *ptr, int len);
-void *gctl_get_param(struct gctl_req *req, const char *param, int *len);
-char const *gctl_get_asciiparam(struct gctl_req *req, const char *param);
-void *gctl_get_paraml(struct gctl_req *req, const char *param, int len);
-int gctl_error(struct gctl_req *req, const char *fmt, ...) __printflike(2, 3);
-struct g_class *gctl_get_class(struct gctl_req *req, char const *arg);
-struct g_geom *gctl_get_geom(struct gctl_req *req, struct g_class *mpr, char const *arg);
-struct g_provider *gctl_get_provider(struct gctl_req *req, char const *arg);
-
-#endif /* _GEOM_GEOM_H_ */
diff --git a/include.new/geom/geom_ctl.h b/include.new/geom/geom_ctl.h
deleted file mode 100644
index 0578447..0000000
--- a/include.new/geom/geom_ctl.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 2003 Poul-Henning Kamp
- * 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 names of the authors 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: releng/10.2/sys/geom/geom_ctl.h 115624 2003-06-01 13:47:51Z phk $
- */
-
-#ifndef _GEOM_GEOM_CTL_H_
-#define _GEOM_GEOM_CTL_H_
-
-#include <sys/ioccom.h>
-
-/*
- * Version number.  Used to check consistency between kernel and libgeom.
- */
-#define GCTL_VERSION	2
-
-struct gctl_req_arg {
-	u_int				nlen;
-	char				*name;
-	off_t				offset;
-	int				flag;
-	int				len;
-	void				*value;
-	/* kernel only fields */
-	void				*kvalue;
-};
-
-#define GCTL_PARAM_RD		1	/* Must match VM_PROT_READ */
-#define GCTL_PARAM_WR		2	/* Must match VM_PROT_WRITE */
-#define GCTL_PARAM_RW		(GCTL_PARAM_RD | GCTL_PARAM_WR)
-#define GCTL_PARAM_ASCII	4
-
-/* These are used in the kernel only */
-#define GCTL_PARAM_NAMEKERNEL	8
-#define GCTL_PARAM_VALUEKERNEL	16
-#define GCTL_PARAM_CHANGED	32
-
-struct gctl_req {
-	u_int				version;
-	u_int				serial;
-	u_int				narg;
-	struct gctl_req_arg		*arg;
-	u_int				lerror;
-	char				*error;
-	struct gctl_req_table		*reqt;
-
-	/* kernel only fields */
-	int				nerror;
-	struct sbuf			*serror;
-};
-
-#define GEOM_CTL	_IOW('G', GCTL_VERSION, struct gctl_req)
-
-#define PATH_GEOM_CTL	"geom.ctl"
-
-
-#endif /* _GEOM_GEOM_CTL_H_ */
diff --git a/include.new/geom/geom_disk.h b/include.new/geom/geom_disk.h
deleted file mode 100644
index 31f7415..0000000
--- a/include.new/geom/geom_disk.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * Copyright (c) 2003 Poul-Henning Kamp
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by Poul-Henning Kamp
- * and NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
- *
- * 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 names of the authors 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: releng/10.2/sys/geom/geom_disk.h 271238 2014-09-07 21:30:47Z smh $
- */
-
-#ifndef _GEOM_GEOM_DISK_H_
-#define _GEOM_GEOM_DISK_H_
-
-#ifdef _KERNEL 
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/disk.h>
-
-#define G_DISK_CLASS_NAME	"DISK"
-
-struct disk;
-
-typedef	int	disk_open_t(struct disk *);
-typedef	int	disk_close_t(struct disk *);
-typedef	void	disk_strategy_t(struct bio *bp);
-typedef	int	disk_getattr_t(struct bio *bp);
-typedef	void	disk_gone_t(struct disk *);
-typedef	int	disk_ioctl_t(struct disk *, u_long cmd, void *data,
-			int fflag, struct thread *td);
-		/* NB: disk_ioctl_t SHALL be cast'able to d_ioctl_t */
-
-struct g_geom;
-struct devstat;
-
-struct disk {
-	/* Fields which are private to geom_disk */
-	struct g_geom		*d_geom;
-	struct devstat		*d_devstat;
-	int			d_destroyed;
-
-	/* Shared fields */
-	u_int			d_flags;
-	const char		*d_name;
-	u_int			d_unit;
-	struct bio_queue_head	*d_queue;
-	struct mtx		*d_lock;
-
-	/* Disk methods  */
-	disk_open_t		*d_open;
-	disk_close_t		*d_close;
-	disk_strategy_t		*d_strategy;
-	disk_ioctl_t		*d_ioctl;
-	dumper_t		*d_dump;
-	disk_getattr_t		*d_getattr;
-	disk_gone_t		*d_gone;
-
-	/* Info fields from driver to geom_disk.c. Valid when open */
-	u_int			d_sectorsize;
-	off_t			d_mediasize;
-	u_int			d_fwsectors;
-	u_int			d_fwheads;
-	u_int			d_maxsize;
-	off_t			d_delmaxsize;
-	u_int			d_stripeoffset;
-	u_int			d_stripesize;
-	char			d_ident[DISK_IDENT_SIZE];
-	char			d_descr[DISK_IDENT_SIZE];
-	uint16_t		d_hba_vendor;
-	uint16_t		d_hba_device;
-	uint16_t		d_hba_subvendor;
-	uint16_t		d_hba_subdevice;
-
-	/* Fields private to the driver */
-	void			*d_drv1;
-
-	/* New field - don't use if DISKFLAG_LACKS_ROTRATE is set */
-	uint16_t		d_rotation_rate;
-};
-
-#define DISKFLAG_NEEDSGIANT	0x1
-#define DISKFLAG_OPEN		0x2
-#define DISKFLAG_CANDELETE	0x4
-#define DISKFLAG_CANFLUSHCACHE	0x8
-#define	DISKFLAG_UNMAPPED_BIO	0x10
-#define	DISKFLAG_DIRECT_COMPLETION	0x20
-#define DISKFLAG_LACKS_ROTRATE	0x40
-
-struct disk *disk_alloc(void);
-void disk_create(struct disk *disk, int version);
-void disk_destroy(struct disk *disk);
-void disk_gone(struct disk *disk);
-void disk_attr_changed(struct disk *dp, const char *attr, int flag);
-void disk_media_changed(struct disk *dp, int flag);
-void disk_media_gone(struct disk *dp, int flag);
-int disk_resize(struct disk *dp, int flag);
-
-#define DISK_VERSION_00		0x58561059
-#define DISK_VERSION_01		0x5856105a
-#define DISK_VERSION_02		0x5856105b
-#define DISK_VERSION_03		0x5856105c
-#define DISK_VERSION_04		0x5856105d
-#define DISK_VERSION		DISK_VERSION_04
-
-#endif /* _KERNEL */
-#endif /* _GEOM_GEOM_DISK_H_ */
diff --git a/include.new/geom/geom_int.h b/include.new/geom/geom_int.h
deleted file mode 100644
index 9a5f0d6..0000000
--- a/include.new/geom/geom_int.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 2002 Poul-Henning Kamp
- * Copyright (c) 2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by Poul-Henning Kamp
- * and NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
- *
- * 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 names of the authors 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: releng/10.2/sys/geom/geom_int.h 260479 2014-01-09 11:13:03Z mav $
- */
-
-LIST_HEAD(class_list_head, g_class);
-TAILQ_HEAD(g_tailq_head, g_geom);
-
-extern int g_collectstats;
-#define G_STATS_PROVIDERS	1	/* Collect I/O stats for providers */
-#define G_STATS_CONSUMERS	2	/* Collect I/O stats for consumers */
-
-extern int g_debugflags;
-/*
- * 1	G_T_TOPOLOGY
- * 2	G_T_BIO
- * 4	G_T_ACCESS
- * 8	(unused)
- * 16	Allow footshooting on rank#1 providers
- * 32	G_T_DETAILS
- */
-#define G_F_DISKIOCTL	64
-#define G_F_CTLDUMP	128
-
-/* geom_dump.c */
-void g_confxml(void *, int flag);
-void g_conf_specific(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp);
-void g_conf_printf_escaped(struct sbuf *sb, const char *fmt, ...);
-void g_confdot(void *, int flag);
-void g_conftxt(void *, int flag);
-
-/* geom_event.c */
-void g_event_init(void);
-void g_run_events(void);
-void g_do_wither(void);
-
-/* geom_subr.c */
-extern struct class_list_head g_classes;
-extern char *g_wait_event, *g_wait_sim, *g_wait_up, *g_wait_down;
-void g_wither_washer(void);
-
-/* geom_io.c */
-void g_io_init(void);
-void g_io_schedule_down(struct thread *tp);
-void g_io_schedule_up(struct thread *tp);
-
-/* geom_kern.c / geom_kernsim.c */
-void g_init(void);
-extern int g_shutdown;
-extern int g_notaste;
-
-/* geom_ctl.c */
-void g_ctl_init(void);
diff --git a/include.new/geom/geom_slice.h b/include.new/geom/geom_slice.h
deleted file mode 100644
index cba01cf..0000000
--- a/include.new/geom/geom_slice.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2002 Poul-Henning Kamp
- * Copyright (c) 2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by Poul-Henning Kamp
- * and NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
- *
- * 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 names of the authors 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: releng/10.2/sys/geom/geom_slice.h 243333 2012-11-20 12:32:18Z jh $
- */
-
-#ifndef _GEOM_GEOM_SLICE_H_
-#define _GEOM_GEOM_SLICE_H_
-
-struct g_slice {
-	off_t	offset;
-	off_t	length;
-	u_int	sectorsize;
-	struct	g_provider *provider;
-};
-
-struct g_slice_hot {
-	off_t	offset;
-	off_t	length;
-	int	ract;
-	int	dact;
-	int	wact;
-};
-
-typedef int g_slice_start_t (struct bio *bp);
-
-struct g_slicer {
-	u_int			nslice;
-	u_int			nprovider;
-	struct g_slice		*slices;
-
-	u_int			nhotspot;
-	struct g_slice_hot	*hotspot;
-
-	void			*softc;
-	g_slice_start_t		*start;
-	g_event_t		*hot;
-};
-
-g_dumpconf_t g_slice_dumpconf;
-int g_slice_config(struct g_geom *gp, u_int idx, int how, off_t offset, off_t length, u_int sectorsize, const char *fmt, ...) __printflike(7, 8);
-void g_slice_spoiled(struct g_consumer *cp);
-void g_slice_orphan(struct g_consumer *cp);
-#define G_SLICE_CONFIG_CHECK	0
-#define G_SLICE_CONFIG_SET	1
-#define G_SLICE_CONFIG_FORCE	2
-struct g_geom * g_slice_new(struct g_class *mp, u_int slices, struct g_provider *pp, struct g_consumer **cpp, void *extrap, int extra, g_slice_start_t *start);
-
-int g_slice_conf_hot(struct g_geom *gp, u_int idx, off_t offset, off_t length, int ract, int dact, int wact);
-#define G_SLICE_HOT_ALLOW	1
-#define G_SLICE_HOT_DENY	2
-#define G_SLICE_HOT_START	4
-#define G_SLICE_HOT_CALL	8
-
-int g_slice_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp);
-
-void g_slice_finish_hot(struct bio *bp);
-
-#endif /* _GEOM_GEOM_SLICE_H_ */
diff --git a/include.new/geom/geom_vfs.h b/include.new/geom/geom_vfs.h
deleted file mode 100644
index 1eca8e9..0000000
--- a/include.new/geom/geom_vfs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2004 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/sys/geom/geom_vfs.h 183754 2008-10-10 21:23:50Z attilio $
- */
-
-#ifndef _GEOM_GEOM_VFS_H_
-#define _GEOM_GEOM_VFS_H_
-
-struct vnode;
-struct bufobj;
-struct buf;
-
-extern struct buf_ops *g_vfs_bufops;
-
-void g_vfs_strategy(struct bufobj *bo, struct buf *bp);
-int g_vfs_open(struct vnode *vp, struct g_consumer **cpp, const char *fsname, int wr);
-void g_vfs_close(struct g_consumer *cp);
-
-#endif /* _GEOM_GEOM_VFS_H_ */
diff --git a/include.new/geom/journal/g_journal.h b/include.new/geom/journal/g_journal.h
deleted file mode 100644
index 989289a..0000000
--- a/include.new/geom/journal/g_journal.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/*-
- * Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/journal/g_journal.h 185693 2008-12-06 11:33:10Z trasz $
- */
-
-#ifndef	_G_JOURNAL_H_
-#define	_G_JOURNAL_H_
-
-#include <sys/endian.h>
-#include <sys/md5.h>
-#ifdef _KERNEL
-#include <sys/bio.h>
-#endif
-
-#define	G_JOURNAL_CLASS_NAME	"JOURNAL"
-
-#define	G_JOURNAL_MAGIC		"GEOM::JOURNAL"
-/*
- * Version history:
- * 0 - Initial version number.
- */
-#define	G_JOURNAL_VERSION	0
-
-#ifdef _KERNEL
-extern int g_journal_debug;
-
-#define	GJ_DEBUG(lvl, ...)	do {					\
-	if (g_journal_debug >= (lvl)) {					\
-		printf("GEOM_JOURNAL");					\
-		if (g_journal_debug > 0)				\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	GJ_LOGREQ(lvl, bp, ...)	do {					\
-	if (g_journal_debug >= (lvl)) {					\
-		printf("GEOM_JOURNAL");					\
-		if (g_journal_debug > 0)				\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-#define	JEMPTY(sc)	((sc)->sc_journal_offset -			\
-			 (sc)->sc_jprovider->sectorsize ==		\
-			 (sc)->sc_active.jj_offset &&			\
-			 (sc)->sc_current_count == 0)
-
-#define	GJ_BIO_REGULAR		0x00
-#define	GJ_BIO_READ		0x01
-#define	GJ_BIO_JOURNAL		0x02
-#define	GJ_BIO_COPY		0x03
-#define	GJ_BIO_MASK		0x0f
-
-#if 0
-#define	GJF_BIO_DONT_FREE	0x10
-#define	GJF_BIO_MASK		0xf0
-#endif
-
-#define	GJF_DEVICE_HARDCODED		0x0001
-#define	GJF_DEVICE_DESTROY		0x0010
-#define	GJF_DEVICE_SWITCH		0x0020
-#define	GJF_DEVICE_BEFORE_SWITCH	0x0040
-#define	GJF_DEVICE_CLEAN		0x0080
-#define	GJF_DEVICE_CHECKSUM		0x0100
-
-#define	GJ_HARD_LIMIT		64
-
-/*
- * We keep pointers to journaled data in bio structure and because we
- * need to store two off_t values (offset in data provider and offset in
- * journal), we have to borrow bio_completed field for this.
- */
-#define	bio_joffset	bio_completed
-/*
- * Use bio_caller1 field as a pointer in queue.
- */
-#define	bio_next	bio_caller1
-
-/*
- * There are two such structures maintained inside each journaled device.
- * One describes active part of the journal, were recent requests are stored.
- * The second describes the last consistent part of the journal with requests
- * that are copied to the destination provider.
- */
-struct g_journal_journal {
-	struct bio	*jj_queue;	/* Cached journal entries. */
-	off_t		 jj_offset;	/* Journal's start offset. */
-};
-
-struct g_journal_softc {
-	uint32_t	 sc_id;
-	uint8_t		 sc_type;
-	uint8_t		 sc_orig_type;
-	struct g_geom	*sc_geom;
-	u_int		 sc_flags;
-	struct mtx	 sc_mtx;
-	off_t		 sc_mediasize;
-	u_int		 sc_sectorsize;
-#define	GJ_FLUSH_DATA		0x01
-#define	GJ_FLUSH_JOURNAL	0x02
-	u_int		 sc_bio_flush;
-
-	uint32_t	 sc_journal_id;
-	uint32_t	 sc_journal_next_id;
-	int		 sc_journal_copying;
-	off_t		 sc_journal_offset;
-	off_t		 sc_journal_previous_id;
-
-	struct bio_queue_head sc_back_queue;
-	struct bio_queue_head sc_regular_queue;
-
-	struct bio_queue_head sc_delayed_queue;
-	int		 sc_delayed_count;
-
-	struct bio	*sc_current_queue;
-	int		 sc_current_count;
-
-	struct bio	*sc_flush_queue;
-	int		 sc_flush_count;
-	int		 sc_flush_in_progress;
-
-	struct bio	*sc_copy_queue;
-	int		 sc_copy_in_progress;
-
-	struct g_consumer *sc_dconsumer;
-	struct g_consumer *sc_jconsumer;
-
-	struct g_journal_journal sc_inactive;
-	struct g_journal_journal sc_active;
-
-	off_t		 sc_jstart;	/* Journal space start offset. */
-	off_t		 sc_jend;	/* Journal space end offset. */
-
-	struct callout	 sc_callout;
-	struct proc	*sc_worker;
-
-	struct root_hold_token *sc_rootmount;
-};
-#define	sc_dprovider	sc_dconsumer->provider
-#define	sc_jprovider	sc_jconsumer->provider
-#define	sc_name		sc_dprovider->name
-
-#define	GJQ_INSERT_HEAD(head, bp)	do {				\
-	(bp)->bio_next = (head);					\
-	(head) = (bp);							\
-} while (0)
-#define	GJQ_INSERT_AFTER(head, bp, pbp)	do {				\
-	if ((pbp) == NULL)						\
-		GJQ_INSERT_HEAD(head, bp);				\
-	else {								\
-		(bp)->bio_next = (pbp)->bio_next;			\
-		(pbp)->bio_next = (bp);					\
-	}								\
-} while (0)
-#define	GJQ_FIRST(head)	(head)
-#define	GJQ_REMOVE(head, bp)	do {					\
-	struct bio *_bp;						\
-									\
-	if ((head) == (bp)) {						\
-		(head) = (bp)->bio_next;				\
-		(bp)->bio_next = NULL;					\
-		break;							\
-	}								\
-	for (_bp = (head); _bp->bio_next != NULL; _bp = _bp->bio_next) {\
-		if (_bp->bio_next == (bp))				\
-			break;						\
-	}								\
-	KASSERT(_bp->bio_next != NULL, ("NULL bio_next"));		\
-	KASSERT(_bp->bio_next == (bp), ("bio_next != bp"));		\
-	_bp->bio_next = (bp)->bio_next;					\
-	(bp)->bio_next = NULL;						\
-} while (0)
-#define GJQ_FOREACH(head, bp)						\
-	for ((bp) = (head); (bp) != NULL; (bp) = (bp)->bio_next)
-
-#define	GJ_HEADER_MAGIC	"GJHDR"
-
-struct g_journal_header {
-	char		jh_magic[sizeof(GJ_HEADER_MAGIC)];
-	uint32_t	jh_journal_id;
-	uint32_t	jh_journal_next_id;
-} __packed;
-
-struct g_journal_entry {
-	uint64_t	je_joffset;
-	uint64_t	je_offset;
-	uint64_t	je_length;
-} __packed;
-
-#define	GJ_RECORD_HEADER_MAGIC		"GJRHDR"
-#define	GJ_RECORD_HEADER_NENTRIES	(20)
-#define	GJ_RECORD_MAX_SIZE(sc)	\
-	((sc)->sc_jprovider->sectorsize + GJ_RECORD_HEADER_NENTRIES * MAXPHYS)
-#define	GJ_VALIDATE_OFFSET(offset, sc)	do {				\
-	if ((offset) + GJ_RECORD_MAX_SIZE(sc) >= (sc)->sc_jend) {	\
-		(offset) = (sc)->sc_jstart;				\
-		GJ_DEBUG(2, "Starting from the begining (%s).",		\
-		    (sc)->sc_name);					\
-	}								\
-} while (0)
-
-struct g_journal_record_header {
-	char		jrh_magic[sizeof(GJ_RECORD_HEADER_MAGIC)];
-	uint32_t	jrh_journal_id;
-	uint16_t	jrh_nentries;
-	u_char		jrh_sum[8];
-	struct g_journal_entry jrh_entries[GJ_RECORD_HEADER_NENTRIES];
-} __packed;
-
-typedef int (g_journal_clean_t)(struct mount *mp);
-typedef void (g_journal_dirty_t)(struct g_consumer *cp);
-
-struct g_journal_desc {
-	const char		*jd_fstype;
-	g_journal_clean_t	*jd_clean;
-	g_journal_dirty_t	*jd_dirty;
-};
-
-/* Supported file systems. */
-extern const struct g_journal_desc g_journal_ufs;
-
-#define	GJ_TIMER_START(lvl, bt)	do {					\
-	if (g_journal_debug >= (lvl))					\
-		binuptime(bt);						\
-} while (0)
-#define	GJ_TIMER_STOP(lvl, bt, ...)	do {				\
-	if (g_journal_debug >= (lvl)) {					\
-		struct bintime _bt2;					\
-		struct timeval _tv;					\
-									\
-		binuptime(&_bt2);					\
-		bintime_sub(&_bt2, bt);					\
-		bintime2timeval(&_bt2, &_tv);				\
-		printf("GEOM_JOURNAL");					\
-		if (g_journal_debug > 0)				\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf(": %jd.%06jds\n", (intmax_t)_tv.tv_sec,		\
-		    (intmax_t)_tv.tv_usec);				\
-	}								\
-} while (0)
-#endif	/* _KERNEL */
-
-#define	GJ_TYPE_DATA		0x01
-#define	GJ_TYPE_JOURNAL		0x02
-#define	GJ_TYPE_COMPLETE	(GJ_TYPE_DATA|GJ_TYPE_JOURNAL)
-
-#define	GJ_FLAG_CLEAN		0x01
-#define	GJ_FLAG_CHECKSUM	0x02
-
-struct g_journal_metadata {
-	char		md_magic[16];	/* Magic value. */
-	uint32_t	md_version;	/* Version number. */
-	uint32_t	md_id;		/* Journal unique ID. */
-	uint8_t		md_type;	/* Provider type. */
-	uint64_t	md_jstart;	/* Journal space start offset. */
-	uint64_t	md_jend;	/* Journal space end offset. */
-	uint64_t	md_joffset;	/* Last known consistent journal offset. */
-	uint32_t	md_jid;		/* Last known consistent journal ID. */
-	uint64_t	md_flags;	/* Journal flags. */
-	char		md_provider[16]; /* Hardcoded provider. */
-	uint64_t	md_provsize;	/* Provider's size. */
-	u_char		md_hash[16];	/* MD5 hash. */
-};
-static __inline void
-journal_metadata_encode(struct g_journal_metadata *md, u_char *data)
-{
-	MD5_CTX ctx;
-
-	bcopy(md->md_magic, data, 16);
-	le32enc(data + 16, md->md_version);
-	le32enc(data + 20, md->md_id);
-	*(data + 24) = md->md_type;
-	le64enc(data + 25, md->md_jstart);
-	le64enc(data + 33, md->md_jend);
-	le64enc(data + 41, md->md_joffset);
-	le32enc(data + 49, md->md_jid);
-	le64enc(data + 53, md->md_flags);
-	bcopy(md->md_provider, data + 61, 16);
-	le64enc(data + 77, md->md_provsize);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 85);
-	MD5Final(md->md_hash, &ctx);
-	bcopy(md->md_hash, data + 85, 16);
-}
-static __inline int
-journal_metadata_decode_v0(const u_char *data, struct g_journal_metadata *md)
-{
-	MD5_CTX ctx;
-
-	md->md_id = le32dec(data + 20);
-	md->md_type = *(data + 24);
-	md->md_jstart = le64dec(data + 25);
-	md->md_jend = le64dec(data + 33);
-	md->md_joffset = le64dec(data + 41);
-	md->md_jid = le32dec(data + 49);
-	md->md_flags = le64dec(data + 53);
-	bcopy(data + 61, md->md_provider, 16);
-	md->md_provsize = le64dec(data + 77);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 85);
-	MD5Final(md->md_hash, &ctx);
-	if (bcmp(md->md_hash, data + 85, 16) != 0)
-		return (EINVAL);
-	return (0);
-}
-static __inline int
-journal_metadata_decode(const u_char *data, struct g_journal_metadata *md)
-{
-	int error;
-
-	bcopy(data, md->md_magic, 16);
-	md->md_version = le32dec(data + 16);
-	switch (md->md_version) {
-	case 0:
-		error = journal_metadata_decode_v0(data, md);
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-	return (error);
-}
-
-static __inline void
-journal_metadata_dump(const struct g_journal_metadata *md)
-{
-	static const char hex[] = "0123456789abcdef";
-	char hash[16 * 2 + 1];
-	u_int i;
-
-	printf("     magic: %s\n", md->md_magic);
-	printf("   version: %u\n", (u_int)md->md_version);
-	printf("        id: %u\n", (u_int)md->md_id);
-	printf("      type: %u\n", (u_int)md->md_type);
-	printf("     start: %ju\n", (uintmax_t)md->md_jstart);
-	printf("       end: %ju\n", (uintmax_t)md->md_jend);
-	printf("   joffset: %ju\n", (uintmax_t)md->md_joffset);
-	printf("       jid: %u\n", (u_int)md->md_jid);
-	printf("     flags: %u\n", (u_int)md->md_flags);
-	printf("hcprovider: %s\n", md->md_provider);
-	printf("  provsize: %ju\n", (uintmax_t)md->md_provsize);
-	bzero(hash, sizeof(hash));
-	for (i = 0; i < 16; i++) {
-		hash[i * 2] = hex[md->md_hash[i] >> 4];
-		hash[i * 2 + 1] = hex[md->md_hash[i] & 0x0f];
-	}
-	printf("  MD5 hash: %s\n", hash);
-}
-#endif	/* !_G_JOURNAL_H_ */
diff --git a/include.new/geom/label/g_label.h b/include.new/geom/label/g_label.h
deleted file mode 100644
index 4c43377..0000000
--- a/include.new/geom/label/g_label.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/label/g_label.h 249508 2013-04-15 16:09:24Z ivoras $
- */
-
-#ifndef	_G_LABEL_H_
-#define	_G_LABEL_H_
-
-#include <sys/endian.h>
-#ifdef _KERNEL
-#include <sys/sysctl.h>
-#endif
-
-#define	G_LABEL_CLASS_NAME	"LABEL"
-
-#define	G_LABEL_MAGIC		"GEOM::LABEL"
-/*
- * Version history:
- * 1 - Initial version number.
- * 2 - Added md_provsize field to metadata.
- */
-#define	G_LABEL_VERSION		2
-#define	G_LABEL_DIR		"label"
-
-#ifdef _KERNEL
-extern u_int g_label_debug;
-
-#define	G_LABEL_DEBUG(lvl, ...)	do {					\
-	if (g_label_debug >= (lvl)) {					\
-		printf("GEOM_LABEL");					\
-		if (g_label_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-SYSCTL_DECL(_kern_geom_label);
-
-#define	G_LABEL_INIT(kind, label, descr) 				\
-	SYSCTL_NODE(_kern_geom_label, OID_AUTO, kind, CTLFLAG_RD,	\
-	    NULL, "");							\
-	SYSCTL_INT(_kern_geom_label_##kind, OID_AUTO, enable, 		\
-	    CTLFLAG_RW, &label.ld_enabled, 1, descr);			\
-	TUNABLE_INT("kern.geom.label." __XSTRING(kind) ".enable",	\
-	    &label.ld_enabled)
-
-typedef void g_label_taste_t (struct g_consumer *cp, char *label, size_t size);
-
-struct g_label_desc {
-	g_label_taste_t	*ld_taste;
-	char		*ld_dir;
-	int		 ld_enabled;
-};
-
-/* Supported labels. */
-extern struct g_label_desc g_label_ufs_id;
-extern struct g_label_desc g_label_ufs_volume;
-extern struct g_label_desc g_label_iso9660;
-extern struct g_label_desc g_label_msdosfs;
-extern struct g_label_desc g_label_ext2fs;
-extern struct g_label_desc g_label_reiserfs;
-extern struct g_label_desc g_label_ntfs;
-extern struct g_label_desc g_label_gpt;
-extern struct g_label_desc g_label_gpt_uuid;
-extern struct g_label_desc g_label_disk_ident;
-#endif	/* _KERNEL */
-
-struct g_label_metadata {
-	char		md_magic[16];	/* Magic value. */
-	uint32_t	md_version;	/* Version number. */
-	char		md_label[16];	/* Label. */
-	uint64_t	md_provsize;	/* Provider's size. */
-};
-static __inline void
-label_metadata_encode(const struct g_label_metadata *md, u_char *data)
-{
-
-	bcopy(md->md_magic, data, sizeof(md->md_magic));
-	le32enc(data + 16, md->md_version);
-	bcopy(md->md_label, data + 20, sizeof(md->md_label));
-	le64enc(data + 36, md->md_provsize);
-}
-static __inline void
-label_metadata_decode(const u_char *data, struct g_label_metadata *md)
-{
-
-	bcopy(data, md->md_magic, sizeof(md->md_magic));
-	md->md_version = le32dec(data + 16);
-	bcopy(data + 20, md->md_label, sizeof(md->md_label));
-	md->md_provsize = le64dec(data + 36);
-}
-#endif	/* _G_LABEL_H_ */
diff --git a/include.new/geom/label/g_label_msdosfs.h b/include.new/geom/label/g_label_msdosfs.h
deleted file mode 100644
index ec2bf00..0000000
--- a/include.new/geom/label/g_label_msdosfs.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 2006 Tobias Reifenberger
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/label/g_label_msdosfs.h 162834 2006-09-30 08:16:49Z pjd $
- */
-
-#include <sys/types.h>
-
-/*
- * Conversion macros for little endian encoded unsigned integers
- * in byte streams to the local unsigned integer format.
- */
-#define UINT16BYTES(p) ((uint32_t)((p)[0] + (256*(p)[1])))
-#define UINT32BYTES(p) ((uint32_t)((p)[0] + (256*(p)[1]) +		\
-	    (65536*(p)[2]) + (16777216*(p)[3])))
-
-/*
- * All following structures are according to:
- *
- * Microsoft Extensible Firmware Initiative FAT32 File System Specification
- * FAT: General Overview of On-Disk Format
- * Version 1.03, December 6, 2000
- * Microsoft Corporation
- */
-
-/*
- * FAT boot sector and boot parameter block for
- * FAT12 and FAT16 volumes
- */
-typedef struct fat_bsbpb {
-	/* common fields */
-	uint8_t BS_jmpBoot[3];
-	uint8_t BS_OEMName[8];
-	uint8_t BPB_BytsPerSec[2];
-	uint8_t BPB_SecPerClus;
-	uint8_t BPB_RsvdSecCnt[2];
-	uint8_t BPB_NumFATs;
-	uint8_t BPB_RootEntCnt[2];
-	uint8_t BPB_TotSec16[2];
-	uint8_t BPB_Media;
-	uint8_t BPB_FATSz16[2];
-	uint8_t BPB_SecPerTrack[2];
-	uint8_t BPB_NumHeads[2];
-	uint8_t BPB_HiddSec[4];
-	uint8_t BPB_TotSec32[4];
-	/* FAT12/FAT16 only fields */
-	uint8_t BS_DrvNum;
-	uint8_t BS_Reserved1;
-	uint8_t BS_BootSig;
-	uint8_t BS_VolID[4];
-	uint8_t BS_VolLab[11];
-	uint8_t BS_FilSysType[8];
-} FAT_BSBPB; /* 62 bytes */
-
-/*
- * FAT boot sector and boot parameter block for
- * FAT32 volumes
- */
-typedef struct fat32_bsbpb {
-	/* common fields */
-	uint8_t BS_jmpBoot[3];
-	uint8_t BS_OEMName[8];
-	uint8_t BPB_BytsPerSec[2];
-	uint8_t BPB_SecPerClus;
-	uint8_t BPB_RsvdSecCnt[2];
-	uint8_t BPB_NumFATs;
-	uint8_t BPB_RootEntCnt[2];
-	uint8_t BPB_TotSec16[2];
-	uint8_t BPB_Media;
-	uint8_t BPB_FATSz16[2];
-	uint8_t BPB_SecPerTrack[2];
-	uint8_t BPB_NumHeads[2];
-	uint8_t BPB_HiddSec[4];
-	uint8_t BPB_TotSec32[4];
-	/* FAT32 only fields */
-	uint8_t BPB_FATSz32[4];
-	uint8_t BPB_ExtFlags[2];
-	uint8_t BPB_FSVer[2];
-	uint8_t BPB_RootClus[4];
-	uint8_t BPB_FSInfo[2];
-	uint8_t BPB_BkBootSec[2];
-	uint8_t BPB_Reserved[12];
-	uint8_t BS_DrvNum;
-	uint8_t BS_Reserved1;
-	uint8_t BS_BootSig;
-	uint8_t BS_VolID[4];
-	uint8_t BS_VolLab[11];
-	uint8_t BS_FilSysType[8];
-} FAT32_BSBPB; /* 90 bytes */
-
-/*
- * FAT directory entry structure
- */
-#define	FAT_DES_ATTR_READ_ONLY	0x01
-#define	FAT_DES_ATTR_HIDDEN	0x02
-#define	FAT_DES_ATTR_SYSTEM	0x04
-#define	FAT_DES_ATTR_VOLUME_ID	0x08
-#define	FAT_DES_ATTR_DIRECTORY	0x10
-#define	FAT_DES_ATTR_ARCHIVE	0x20
-#define	FAT_DES_ATTR_LONG_NAME	(FAT_DES_ATTR_READ_ONLY |		\
-				 FAT_DES_ATTR_HIDDEN |			\
-				 FAT_DES_ATTR_SYSTEM |			\
-				 FAT_DES_ATTR_VOLUME_ID)
-
-typedef struct fat_des {
-	uint8_t DIR_Name[11];
-	uint8_t DIR_Attr;
-	uint8_t DIR_NTRes;
-	uint8_t DIR_CrtTimeTenth;
-	uint8_t DIR_CrtTime[2];
-	uint8_t DIR_CrtDate[2];
-	uint8_t DIR_LstAccDate[2];
-	uint8_t DIR_FstClusHI[2];
-	uint8_t DIR_WrtTime[2];
-	uint8_t DIR_WrtDate[2];
-	uint8_t DIR_FstClusLO[2];
-	uint8_t DIR_FileSize[4];
-} FAT_DES;
diff --git a/include.new/geom/mirror/g_mirror.h b/include.new/geom/mirror/g_mirror.h
deleted file mode 100644
index d8c7f9b..0000000
--- a/include.new/geom/mirror/g_mirror.h
+++ /dev/null
@@ -1,498 +0,0 @@
-/*-
- * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/mirror/g_mirror.h 260503 2014-01-10 07:48:36Z ae $
- */
-
-#ifndef	_G_MIRROR_H_
-#define	_G_MIRROR_H_
-
-#include <sys/endian.h>
-#include <sys/md5.h>
-
-#define	G_MIRROR_CLASS_NAME	"MIRROR"
-
-#define	G_MIRROR_MAGIC		"GEOM::MIRROR"
-/*
- * Version history:
- * 0 - Initial version number.
- * 1 - Added 'prefer' balance algorithm.
- * 2 - Added md_genid field to metadata.
- * 3 - Added md_provsize field to metadata.
- * 4 - Added 'no failure synchronization' flag.
- */
-#define	G_MIRROR_VERSION	4
-
-#define	G_MIRROR_BALANCE_NONE		0
-#define	G_MIRROR_BALANCE_ROUND_ROBIN	1
-#define	G_MIRROR_BALANCE_LOAD		2
-#define	G_MIRROR_BALANCE_SPLIT		3
-#define	G_MIRROR_BALANCE_PREFER		4
-#define	G_MIRROR_BALANCE_MIN		G_MIRROR_BALANCE_NONE
-#define	G_MIRROR_BALANCE_MAX		G_MIRROR_BALANCE_PREFER
-
-#define	G_MIRROR_DISK_FLAG_DIRTY		0x0000000000000001ULL
-#define	G_MIRROR_DISK_FLAG_SYNCHRONIZING	0x0000000000000002ULL
-#define	G_MIRROR_DISK_FLAG_FORCE_SYNC		0x0000000000000004ULL
-#define	G_MIRROR_DISK_FLAG_INACTIVE		0x0000000000000008ULL
-#define	G_MIRROR_DISK_FLAG_HARDCODED		0x0000000000000010ULL
-#define	G_MIRROR_DISK_FLAG_BROKEN		0x0000000000000020ULL
-#define	G_MIRROR_DISK_FLAG_CANDELETE		0x0000000000000040ULL
-#define	G_MIRROR_DISK_FLAG_MASK		(G_MIRROR_DISK_FLAG_DIRTY |	\
-					 G_MIRROR_DISK_FLAG_SYNCHRONIZING | \
-					 G_MIRROR_DISK_FLAG_FORCE_SYNC | \
-					 G_MIRROR_DISK_FLAG_INACTIVE | \
-					 G_MIRROR_DISK_FLAG_CANDELETE)
-
-#define	G_MIRROR_DEVICE_FLAG_NOAUTOSYNC	0x0000000000000001ULL
-#define	G_MIRROR_DEVICE_FLAG_NOFAILSYNC	0x0000000000000002ULL
-#define	G_MIRROR_DEVICE_FLAG_MASK	(G_MIRROR_DEVICE_FLAG_NOAUTOSYNC | \
-					 G_MIRROR_DEVICE_FLAG_NOFAILSYNC)
-
-#ifdef _KERNEL
-extern u_int g_mirror_debug;
-
-#define	G_MIRROR_DEBUG(lvl, ...)	do {				\
-	if (g_mirror_debug >= (lvl)) {					\
-		printf("GEOM_MIRROR");					\
-		if (g_mirror_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_MIRROR_LOGREQ(lvl, bp, ...)	do {				\
-	if (g_mirror_debug >= (lvl)) {					\
-		printf("GEOM_MIRROR");					\
-		if (g_mirror_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-#define	G_MIRROR_BIO_FLAG_REGULAR	0x01
-#define	G_MIRROR_BIO_FLAG_SYNC		0x02
-
-/*
- * Informations needed for synchronization.
- */
-struct g_mirror_disk_sync {
-	struct g_consumer *ds_consumer;	/* Consumer connected to our mirror. */
-	off_t		  ds_offset;	/* Offset of next request to send. */
-	off_t		  ds_offset_done; /* Offset of already synchronized
-					   region. */
-	u_int		  ds_syncid;	/* Disk's synchronization ID. */
-	u_int		  ds_inflight;	/* Number of in-flight sync requests. */
-	struct bio	**ds_bios;	/* BIOs for synchronization I/O. */
-};
-
-/*
- * Informations needed for synchronization.
- */
-struct g_mirror_device_sync {
-	struct g_geom	*ds_geom;	/* Synchronization geom. */
-	u_int		 ds_ndisks;	/* Number of disks in SYNCHRONIZING
-					   state. */
-};
-
-#define	G_MIRROR_DISK_STATE_NONE		0
-#define	G_MIRROR_DISK_STATE_NEW			1
-#define	G_MIRROR_DISK_STATE_ACTIVE		2
-#define	G_MIRROR_DISK_STATE_STALE		3
-#define	G_MIRROR_DISK_STATE_SYNCHRONIZING	4
-#define	G_MIRROR_DISK_STATE_DISCONNECTED	5
-#define	G_MIRROR_DISK_STATE_DESTROY		6
-struct g_mirror_disk {
-	uint32_t	 d_id;		/* Disk ID. */
-	struct g_consumer *d_consumer;	/* Consumer. */
-	struct g_mirror_softc	*d_softc; /* Back-pointer to softc. */
-	int		 d_state;	/* Disk state. */
-	u_int		 d_priority;	/* Disk priority. */
-	u_int		 load;		/* Averaged queue length */
-	off_t		 d_last_offset;	/* Last read offset */
-	uint64_t	 d_flags;	/* Additional flags. */
-	u_int		 d_genid;	/* Disk's generation ID. */
-	struct g_mirror_disk_sync d_sync;/* Sync information. */
-	LIST_ENTRY(g_mirror_disk) d_next;
-};
-#define	d_name	d_consumer->provider->name
-
-#define	G_MIRROR_EVENT_DONTWAIT	0x1
-#define	G_MIRROR_EVENT_WAIT	0x2
-#define	G_MIRROR_EVENT_DEVICE	0x4
-#define	G_MIRROR_EVENT_DONE	0x8
-struct g_mirror_event {
-	struct g_mirror_disk	*e_disk;
-	int			 e_state;
-	int			 e_flags;
-	int			 e_error;
-	TAILQ_ENTRY(g_mirror_event) e_next;
-};
-
-#define	G_MIRROR_DEVICE_FLAG_DESTROY	0x0100000000000000ULL
-#define	G_MIRROR_DEVICE_FLAG_WAIT	0x0200000000000000ULL
-#define	G_MIRROR_DEVICE_FLAG_DESTROYING	0x0400000000000000ULL
-#define	G_MIRROR_DEVICE_FLAG_TASTING	0x0800000000000000ULL
-#define	G_MIRROR_DEVICE_FLAG_WIPE	0x1000000000000000ULL
-
-#define	G_MIRROR_DEVICE_STATE_STARTING		0
-#define	G_MIRROR_DEVICE_STATE_RUNNING		1
-
-/* Bump syncid on first write. */
-#define	G_MIRROR_BUMP_SYNCID	0x1
-/* Bump genid immediately. */
-#define	G_MIRROR_BUMP_GENID	0x2
-struct g_mirror_softc {
-	u_int		sc_state;	/* Device state. */
-	uint32_t	sc_slice;	/* Slice size. */
-	uint8_t		sc_balance;	/* Balance algorithm. */
-	uint64_t	sc_mediasize;	/* Device size. */
-	uint32_t	sc_sectorsize;	/* Sector size. */
-	uint64_t	sc_flags;	/* Additional flags. */
-
-	struct g_geom	*sc_geom;
-	struct g_provider *sc_provider;
-
-	uint32_t	sc_id;		/* Mirror unique ID. */
-
-	struct sx	 sc_lock;
-	struct bio_queue_head sc_queue;
-	struct mtx	 sc_queue_mtx;
-	struct proc	*sc_worker;
-	struct bio_queue_head sc_regular_delayed; /* Delayed I/O requests due
-						     collision with sync
-						     requests. */
-	struct bio_queue_head sc_inflight; /* In-flight regular write
-					      requests. */
-	struct bio_queue_head sc_sync_delayed; /* Delayed sync requests due
-						  collision with regular
-						  requests. */
-
-	LIST_HEAD(, g_mirror_disk) sc_disks;
-	u_int		sc_ndisks;	/* Number of disks. */
-	struct g_mirror_disk *sc_hint;
-
-	u_int		sc_genid;	/* Generation ID. */
-	u_int		sc_syncid;	/* Synchronization ID. */
-	int		sc_bump_id;
-	struct g_mirror_device_sync sc_sync;
-	int		sc_idle;	/* DIRTY flags removed. */
-	time_t		sc_last_write;
-	u_int		sc_writes;
-
-	TAILQ_HEAD(, g_mirror_event) sc_events;
-	struct mtx	sc_events_mtx;
-
-	struct callout	sc_callout;
-
-	struct root_hold_token *sc_rootmount;
-
-	struct mtx	 sc_done_mtx;
-};
-#define	sc_name	sc_geom->name
-
-u_int g_mirror_ndisks(struct g_mirror_softc *sc, int state);
-#define	G_MIRROR_DESTROY_SOFT		0
-#define	G_MIRROR_DESTROY_DELAYED	1
-#define	G_MIRROR_DESTROY_HARD		2
-int g_mirror_destroy(struct g_mirror_softc *sc, int how);
-int g_mirror_event_send(void *arg, int state, int flags);
-struct g_mirror_metadata;
-int g_mirror_add_disk(struct g_mirror_softc *sc, struct g_provider *pp,
-    struct g_mirror_metadata *md);
-int g_mirror_read_metadata(struct g_consumer *cp, struct g_mirror_metadata *md);
-void g_mirror_fill_metadata(struct g_mirror_softc *sc,
-    struct g_mirror_disk *disk, struct g_mirror_metadata *md);
-void g_mirror_update_metadata(struct g_mirror_disk *disk);
-
-g_ctl_req_t g_mirror_config;
-#endif	/* _KERNEL */
-
-struct g_mirror_metadata {
-	char		md_magic[16];	/* Magic value. */
-	uint32_t	md_version;	/* Version number. */
-	char		md_name[16];	/* Mirror name. */
-	uint32_t	md_mid;		/* Mirror unique ID. */
-	uint32_t	md_did;		/* Disk unique ID. */
-	uint8_t		md_all;		/* Number of disks in mirror. */
-	uint32_t	md_genid;	/* Generation ID. */
-	uint32_t	md_syncid;	/* Synchronization ID. */
-	uint8_t		md_priority;	/* Disk priority. */
-	uint32_t	md_slice;	/* Slice size. */
-	uint8_t		md_balance;	/* Balance type. */
-	uint64_t	md_mediasize;	/* Size of the smallest
-					   disk in mirror. */
-	uint32_t	md_sectorsize;	/* Sector size. */
-	uint64_t	md_sync_offset;	/* Synchronized offset. */
-	uint64_t	md_mflags;	/* Additional mirror flags. */
-	uint64_t	md_dflags;	/* Additional disk flags. */
-	char		md_provider[16]; /* Hardcoded provider. */
-	uint64_t	md_provsize;	/* Provider's size. */
-	u_char		md_hash[16];	/* MD5 hash. */
-};
-static __inline void
-mirror_metadata_encode(struct g_mirror_metadata *md, u_char *data)
-{
-	MD5_CTX ctx;
-
-	bcopy(md->md_magic, data, 16);
-	le32enc(data + 16, md->md_version);
-	bcopy(md->md_name, data + 20, 16);
-	le32enc(data + 36, md->md_mid);
-	le32enc(data + 40, md->md_did);
-	*(data + 44) = md->md_all;
-	le32enc(data + 45, md->md_genid);
-	le32enc(data + 49, md->md_syncid);
-	*(data + 53) = md->md_priority;
-	le32enc(data + 54, md->md_slice);
-	*(data + 58) = md->md_balance;
-	le64enc(data + 59, md->md_mediasize);
-	le32enc(data + 67, md->md_sectorsize);
-	le64enc(data + 71, md->md_sync_offset);
-	le64enc(data + 79, md->md_mflags);
-	le64enc(data + 87, md->md_dflags);
-	bcopy(md->md_provider, data + 95, 16);
-	le64enc(data + 111, md->md_provsize);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 119);
-	MD5Final(md->md_hash, &ctx);
-	bcopy(md->md_hash, data + 119, 16);
-}
-static __inline int
-mirror_metadata_decode_v0v1(const u_char *data, struct g_mirror_metadata *md)
-{
-	MD5_CTX ctx;
-
-	bcopy(data + 20, md->md_name, 16);
-	md->md_mid = le32dec(data + 36);
-	md->md_did = le32dec(data + 40);
-	md->md_all = *(data + 44);
-	md->md_syncid = le32dec(data + 45);
-	md->md_priority = *(data + 49);
-	md->md_slice = le32dec(data + 50);
-	md->md_balance = *(data + 54);
-	md->md_mediasize = le64dec(data + 55);
-	md->md_sectorsize = le32dec(data + 63);
-	md->md_sync_offset = le64dec(data + 67);
-	md->md_mflags = le64dec(data + 75);
-	md->md_dflags = le64dec(data + 83);
-	bcopy(data + 91, md->md_provider, 16);
-	bcopy(data + 107, md->md_hash, 16);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 107);
-	MD5Final(md->md_hash, &ctx);
-	if (bcmp(md->md_hash, data + 107, 16) != 0)
-		return (EINVAL);
-
-	/* New fields. */
-	md->md_genid = 0;
-	md->md_provsize = 0;
-
-	return (0);
-}
-static __inline int
-mirror_metadata_decode_v2(const u_char *data, struct g_mirror_metadata *md)
-{
-	MD5_CTX ctx;
-
-	bcopy(data + 20, md->md_name, 16);
-	md->md_mid = le32dec(data + 36);
-	md->md_did = le32dec(data + 40);
-	md->md_all = *(data + 44);
-	md->md_genid = le32dec(data + 45);
-	md->md_syncid = le32dec(data + 49);
-	md->md_priority = *(data + 53);
-	md->md_slice = le32dec(data + 54);
-	md->md_balance = *(data + 58);
-	md->md_mediasize = le64dec(data + 59);
-	md->md_sectorsize = le32dec(data + 67);
-	md->md_sync_offset = le64dec(data + 71);
-	md->md_mflags = le64dec(data + 79);
-	md->md_dflags = le64dec(data + 87);
-	bcopy(data + 95, md->md_provider, 16);
-	bcopy(data + 111, md->md_hash, 16);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 111);
-	MD5Final(md->md_hash, &ctx);
-	if (bcmp(md->md_hash, data + 111, 16) != 0)
-		return (EINVAL);
-
-	/* New fields. */
-	md->md_provsize = 0;
-
-	return (0);
-}
-static __inline int
-mirror_metadata_decode_v3v4(const u_char *data, struct g_mirror_metadata *md)
-{
-	MD5_CTX ctx;
-
-	bcopy(data + 20, md->md_name, 16);
-	md->md_mid = le32dec(data + 36);
-	md->md_did = le32dec(data + 40);
-	md->md_all = *(data + 44);
-	md->md_genid = le32dec(data + 45);
-	md->md_syncid = le32dec(data + 49);
-	md->md_priority = *(data + 53);
-	md->md_slice = le32dec(data + 54);
-	md->md_balance = *(data + 58);
-	md->md_mediasize = le64dec(data + 59);
-	md->md_sectorsize = le32dec(data + 67);
-	md->md_sync_offset = le64dec(data + 71);
-	md->md_mflags = le64dec(data + 79);
-	md->md_dflags = le64dec(data + 87);
-	bcopy(data + 95, md->md_provider, 16);
-	md->md_provsize = le64dec(data + 111);
-	bcopy(data + 119, md->md_hash, 16);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 119);
-	MD5Final(md->md_hash, &ctx);
-	if (bcmp(md->md_hash, data + 119, 16) != 0)
-		return (EINVAL);
-	return (0);
-}
-static __inline int
-mirror_metadata_decode(const u_char *data, struct g_mirror_metadata *md)
-{
-	int error;
-
-	bcopy(data, md->md_magic, 16);
-	md->md_version = le32dec(data + 16);
-	switch (md->md_version) {
-	case 0:
-	case 1:
-		error = mirror_metadata_decode_v0v1(data, md);
-		break;
-	case 2:
-		error = mirror_metadata_decode_v2(data, md);
-		break;
-	case 3:
-	case 4:
-		error = mirror_metadata_decode_v3v4(data, md);
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-	return (error);
-}
-
-static __inline const char *
-balance_name(u_int balance)
-{
-	static const char *algorithms[] = {
-		[G_MIRROR_BALANCE_NONE] = "none",
-		[G_MIRROR_BALANCE_ROUND_ROBIN] = "round-robin",
-		[G_MIRROR_BALANCE_LOAD] = "load",
-		[G_MIRROR_BALANCE_SPLIT] = "split",
-		[G_MIRROR_BALANCE_PREFER] = "prefer",
-		[G_MIRROR_BALANCE_MAX + 1] = "unknown"
-	};
-
-	if (balance > G_MIRROR_BALANCE_MAX)
-		balance = G_MIRROR_BALANCE_MAX + 1;
-
-	return (algorithms[balance]);
-}
-
-static __inline int
-balance_id(const char *name)
-{
-	static const char *algorithms[] = {
-		[G_MIRROR_BALANCE_NONE] = "none",
-		[G_MIRROR_BALANCE_ROUND_ROBIN] = "round-robin",
-		[G_MIRROR_BALANCE_LOAD] = "load",
-		[G_MIRROR_BALANCE_SPLIT] = "split",
-		[G_MIRROR_BALANCE_PREFER] = "prefer"
-	};
-	int n;
-
-	for (n = G_MIRROR_BALANCE_MIN; n <= G_MIRROR_BALANCE_MAX; n++) {
-		if (strcmp(name, algorithms[n]) == 0)
-			return (n);
-	}
-	return (-1);
-}
-
-static __inline void
-mirror_metadata_dump(const struct g_mirror_metadata *md)
-{
-	static const char hex[] = "0123456789abcdef";
-	char hash[16 * 2 + 1];
-	u_int i;
-
-	printf("     magic: %s\n", md->md_magic);
-	printf("   version: %u\n", (u_int)md->md_version);
-	printf("      name: %s\n", md->md_name);
-	printf("       mid: %u\n", (u_int)md->md_mid);
-	printf("       did: %u\n", (u_int)md->md_did);
-	printf("       all: %u\n", (u_int)md->md_all);
-	printf("     genid: %u\n", (u_int)md->md_genid);
-	printf("    syncid: %u\n", (u_int)md->md_syncid);
-	printf("  priority: %u\n", (u_int)md->md_priority);
-	printf("     slice: %u\n", (u_int)md->md_slice);
-	printf("   balance: %s\n", balance_name((u_int)md->md_balance));
-	printf(" mediasize: %jd\n", (intmax_t)md->md_mediasize);
-	printf("sectorsize: %u\n", (u_int)md->md_sectorsize);
-	printf("syncoffset: %jd\n", (intmax_t)md->md_sync_offset);
-	printf("    mflags:");
-	if (md->md_mflags == 0)
-		printf(" NONE");
-	else {
-		if ((md->md_mflags & G_MIRROR_DEVICE_FLAG_NOFAILSYNC) != 0)
-			printf(" NOFAILSYNC");
-		if ((md->md_mflags & G_MIRROR_DEVICE_FLAG_NOAUTOSYNC) != 0)
-			printf(" NOAUTOSYNC");
-	}
-	printf("\n");
-	printf("    dflags:");
-	if (md->md_dflags == 0)
-		printf(" NONE");
-	else {
-		if ((md->md_dflags & G_MIRROR_DISK_FLAG_DIRTY) != 0)
-			printf(" DIRTY");
-		if ((md->md_dflags & G_MIRROR_DISK_FLAG_SYNCHRONIZING) != 0)
-			printf(" SYNCHRONIZING");
-		if ((md->md_dflags & G_MIRROR_DISK_FLAG_FORCE_SYNC) != 0)
-			printf(" FORCE_SYNC");
-		if ((md->md_dflags & G_MIRROR_DISK_FLAG_INACTIVE) != 0)
-			printf(" INACTIVE");
-	}
-	printf("\n");
-	printf("hcprovider: %s\n", md->md_provider);
-	printf("  provsize: %ju\n", (uintmax_t)md->md_provsize);
-	bzero(hash, sizeof(hash));
-	for (i = 0; i < 16; i++) {
-		hash[i * 2] = hex[md->md_hash[i] >> 4];
-		hash[i * 2 + 1] = hex[md->md_hash[i] & 0x0f];
-	}
-	printf("  MD5 hash: %s\n", hash);
-}
-#endif	/* !_G_MIRROR_H_ */
diff --git a/include.new/geom/mountver/g_mountver.h b/include.new/geom/mountver/g_mountver.h
deleted file mode 100644
index e231f76..0000000
--- a/include.new/geom/mountver/g_mountver.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 2010 Edward Tomasz Napierala <trasz@FreeBSD.org>
- * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/mountver/g_mountver.h 202437 2010-01-16 09:52:49Z trasz $
- */
-
-#ifndef	_G_MOUNTVER_H_
-#define	_G_MOUNTVER_H_
-
-#define	G_MOUNTVER_CLASS_NAME	"MOUNTVER"
-#define	G_MOUNTVER_VERSION	4
-#define	G_MOUNTVER_SUFFIX	".mountver"
-
-#ifdef _KERNEL
-
-#define	G_MOUNTVER_DEBUG(lvl, ...)	do {				\
-	if (g_mountver_debug >= (lvl)) {				\
-		printf("GEOM_MOUNTVER");				\
-		if (g_mountver_debug > 0)				\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_MOUNTVER_LOGREQ(bp, ...)	do {				\
-	if (g_mountver_debug >= 2) {					\
-		printf("GEOM_MOUNTVER[2]: ");				\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-struct g_mountver_softc {
-	TAILQ_HEAD(, bio)		sc_queue;
-	struct mtx			sc_mtx;
-	char				*sc_provider_name;
-	char				sc_ident[DISK_IDENT_SIZE];
-	int				sc_orphaned;
-	int				sc_access_r;
-	int				sc_access_w;
-	int				sc_access_e;
-};
-#endif	/* _KERNEL */
-
-#endif	/* _G_MOUNTVER_H_ */
diff --git a/include.new/geom/multipath/g_multipath.h b/include.new/geom/multipath/g_multipath.h
deleted file mode 100644
index 2d09923..0000000
--- a/include.new/geom/multipath/g_multipath.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * Copyright (c) 2006-2007 Matthew Jacob <mjacob@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/multipath/g_multipath.h 260478 2014-01-09 11:11:47Z mav $
- */
-/*
- * Based upon work by Pawel Jakub Dawidek <pjd@FreeBSD.org> for all of the
- * fine geom examples, and by Poul Henning Kamp <phk@FreeBSD.org> for GEOM
- * itself, all of which is most gratefully acknowledged.
- */
-
-#ifndef	_G_MULTIPATH_H_
-#define	_G_MULTIPATH_H_
-
-#define	G_MULTIPATH_CLASS_NAME	"MULTIPATH"
-#define	G_MULTIPATH_VERSION	1
-#define	G_MULTIPATH_MAGIC	"GEOM::MULTIPATH"
-
-#include <sys/endian.h>
-
-#ifdef	_KERNEL
-
-struct g_multipath_softc {
-	struct g_provider *	sc_pp;
-	struct g_consumer *	sc_active;
-	struct mtx		sc_mtx;
-	char			sc_name[16];
-	char			sc_uuid[40];
-	off_t			sc_size;
-	int			sc_opened;
-	int			sc_stopping;
-	int			sc_ndisks;
-	int			sc_active_active; /* Active/Active mode */
-};
-#endif	/* _KERNEL */
-
-struct g_multipath_metadata {
-	char		md_magic[16];	/* Magic Value */
-	char 		md_uuid[40];	/* more magic */
-	char		md_name[16];	/* a friendly name */
-	uint32_t	md_version;	/* version */
-	uint32_t	md_sectorsize;	/* sectorsize of provider */
-	uint64_t	md_size;	/* absolute size of provider */
-	uint8_t		md_active_active; /* Active/Active mode */
-};
-
-static __inline void
-multipath_metadata_encode(const struct g_multipath_metadata *, u_char *);
-
-static __inline void
-multipath_metadata_decode(u_char *, struct g_multipath_metadata *);
-
-static __inline void
-multipath_metadata_encode(const struct g_multipath_metadata *md, u_char *data)
-{
-	bcopy(md->md_magic, data, sizeof(md->md_magic));
-	data += sizeof(md->md_magic);
-	bcopy(md->md_uuid, data, sizeof(md->md_uuid));
-	data += sizeof(md->md_uuid);
-	bcopy(md->md_name, data, sizeof(md->md_name));
-	data += sizeof(md->md_name);
-	le32enc(data, md->md_version);
-	data += sizeof(md->md_version);
-	le32enc(data, md->md_sectorsize);
-	data += sizeof(md->md_sectorsize);
-	le64enc(data, md->md_size);
-	data += sizeof(md->md_size);
-	*data = md->md_active_active;
-}
-
-static __inline void
-multipath_metadata_decode(u_char *data, struct g_multipath_metadata *md)
-{
-	bcopy(data, md->md_magic, sizeof(md->md_magic));
-	data += sizeof(md->md_magic);
-	bcopy(data, md->md_uuid, sizeof(md->md_uuid));
-	data += sizeof(md->md_uuid);
-	bcopy(data, md->md_name, sizeof(md->md_name));
-	data += sizeof(md->md_name);
-	md->md_version = le32dec(data);
-	data += sizeof(md->md_version);
-	md->md_sectorsize = le32dec(data);
-	data += sizeof(md->md_sectorsize);
-	md->md_size = le64dec(data);
-	data += sizeof(md->md_size);
-	md->md_active_active = *data;
-}
-#endif	/* _G_MULTIPATH_H_ */
diff --git a/include.new/geom/nop/g_nop.h b/include.new/geom/nop/g_nop.h
deleted file mode 100644
index e93e772..0000000
--- a/include.new/geom/nop/g_nop.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/nop/g_nop.h 260385 2014-01-07 01:32:23Z scottl $
- */
-
-#ifndef	_G_NOP_H_
-#define	_G_NOP_H_
-
-#define	G_NOP_CLASS_NAME	"NOP"
-#define	G_NOP_VERSION		4
-#define	G_NOP_SUFFIX		".nop"
-
-#ifdef _KERNEL
-#define	G_NOP_DEBUG(lvl, ...)	do {					\
-	if (g_nop_debug >= (lvl)) {					\
-		printf("GEOM_NOP");					\
-		if (g_nop_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_NOP_LOGREQ(bp, ...)	G_NOP_LOGREQLVL(2, bp, __VA_ARGS__)
-#define G_NOP_LOGREQLVL(lvl, bp, ...) do {				\
-	if (g_nop_debug >= (lvl)) {					\
-		printf("GEOM_NOP[%d]: ", (lvl));			\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-struct g_nop_softc {
-	int		sc_error;
-	off_t		sc_offset;
-	off_t		sc_explicitsize;
-	u_int		sc_rfailprob;
-	u_int		sc_wfailprob;
-	uintmax_t	sc_reads;
-	uintmax_t	sc_writes;
-	uintmax_t	sc_readbytes;
-	uintmax_t	sc_wrotebytes;
-	struct mtx	sc_lock;
-};
-#endif	/* _KERNEL */
-
-#endif	/* _G_NOP_H_ */
diff --git a/include.new/geom/raid/g_raid.h b/include.new/geom/raid/g_raid.h
deleted file mode 100644
index b156527..0000000
--- a/include.new/geom/raid/g_raid.h
+++ /dev/null
@@ -1,473 +0,0 @@
-/*-
- * Copyright (c) 2010 Alexander Motin <mav@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/raid/g_raid.h 260385 2014-01-07 01:32:23Z scottl $
- */
-
-#ifndef	_G_RAID_H_
-#define	_G_RAID_H_
-
-#include <sys/param.h>
-#include <sys/kobj.h>
-#include <sys/bio.h>
-#include <sys/time.h>
-#ifdef _KERNEL
-#include <sys/sysctl.h>
-#endif
-
-#define	G_RAID_CLASS_NAME	"RAID"
-
-#define	G_RAID_MAGIC		"GEOM::RAID"
-
-#define	G_RAID_VERSION		0
-
-struct g_raid_md_object;
-struct g_raid_tr_object;
-
-#define	G_RAID_DEVICE_FLAG_NOAUTOSYNC	0x0000000000000001ULL
-#define	G_RAID_DEVICE_FLAG_NOFAILSYNC	0x0000000000000002ULL
-#define	G_RAID_DEVICE_FLAG_MASK	(G_RAID_DEVICE_FLAG_NOAUTOSYNC | \
-					 G_RAID_DEVICE_FLAG_NOFAILSYNC)
-
-#ifdef _KERNEL
-extern u_int g_raid_aggressive_spare;
-extern u_int g_raid_debug;
-extern int g_raid_enable;
-extern int g_raid_read_err_thresh;
-extern u_int g_raid_start_timeout;
-extern struct g_class g_raid_class;
-
-#define	G_RAID_DEBUG(lvl, fmt, ...)	do {				\
-	if (g_raid_debug >= (lvl)) {					\
-		if (g_raid_debug > 0) {					\
-			printf("GEOM_RAID[%u]: " fmt "\n",		\
-			    lvl, ## __VA_ARGS__);			\
-		} else {						\
-			printf("GEOM_RAID: " fmt "\n",			\
-			    ## __VA_ARGS__);				\
-		}							\
-	}								\
-} while (0)
-#define	G_RAID_DEBUG1(lvl, sc, fmt, ...)	do {			\
-	if (g_raid_debug >= (lvl)) {					\
-		if (g_raid_debug > 0) {					\
-			printf("GEOM_RAID[%u]: %s: " fmt "\n",		\
-			    lvl, (sc)->sc_name, ## __VA_ARGS__);	\
-		} else {						\
-			printf("GEOM_RAID: %s: " fmt "\n",		\
-			    (sc)->sc_name, ## __VA_ARGS__);		\
-		}							\
-	}								\
-} while (0)
-#define	G_RAID_LOGREQ(lvl, bp, fmt, ...)	do {			\
-	if (g_raid_debug >= (lvl)) {					\
-		if (g_raid_debug > 0) {					\
-			printf("GEOM_RAID[%u]: " fmt " ",		\
-			    lvl, ## __VA_ARGS__);			\
-		} else							\
-			printf("GEOM_RAID: " fmt " ", ## __VA_ARGS__);	\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-/*
- * Flags we use to distinguish I/O initiated by the TR layer to maintain
- * the volume's characteristics, fix subdisks, extra copies of data, etc.
- *
- * G_RAID_BIO_FLAG_SYNC		I/O to update an extra copy of the data
- *				for RAID volumes that maintain extra data
- *				and need to rebuild that data.
- * G_RAID_BIO_FLAG_REMAP	I/O done to try to provoke a subdisk into
- *				doing some desirable action such as bad
- *				block remapping after we detect a bad part
- *				of the disk.
- * G_RAID_BIO_FLAG_LOCKED	I/O holds range lock that should re released.
- *
- * and the following meta item:
- * G_RAID_BIO_FLAG_SPECIAL	And of the I/O flags that need to make it
- *				through the range locking which would
- *				otherwise defer the I/O until after that
- *				range is unlocked.
- */
-#define	G_RAID_BIO_FLAG_SYNC		0x01
-#define	G_RAID_BIO_FLAG_REMAP		0x02
-#define	G_RAID_BIO_FLAG_SPECIAL \
-		(G_RAID_BIO_FLAG_SYNC|G_RAID_BIO_FLAG_REMAP)
-#define	G_RAID_BIO_FLAG_LOCKED		0x80
-
-struct g_raid_lock {
-	off_t			 l_offset;
-	off_t			 l_length;
-	void			*l_callback_arg;
-	int			 l_pending;
-	LIST_ENTRY(g_raid_lock)	 l_next;
-};
-
-#define	G_RAID_EVENT_WAIT	0x01
-#define	G_RAID_EVENT_VOLUME	0x02
-#define	G_RAID_EVENT_SUBDISK	0x04
-#define	G_RAID_EVENT_DISK	0x08
-#define	G_RAID_EVENT_DONE	0x10
-struct g_raid_event {
-	void			*e_tgt;
-	int			 e_event;
-	int			 e_flags;
-	int			 e_error;
-	TAILQ_ENTRY(g_raid_event) e_next;
-};
-#define G_RAID_DISK_S_NONE		0x00	/* State is unknown. */
-#define G_RAID_DISK_S_OFFLINE		0x01	/* Missing disk placeholder. */
-#define G_RAID_DISK_S_DISABLED		0x02	/* Disabled. */
-#define G_RAID_DISK_S_FAILED		0x03	/* Failed. */
-#define G_RAID_DISK_S_STALE_FAILED	0x04	/* Old failed. */
-#define G_RAID_DISK_S_SPARE		0x05	/* Hot-spare. */
-#define G_RAID_DISK_S_STALE		0x06	/* Old disk, unused now. */
-#define G_RAID_DISK_S_ACTIVE		0x07	/* Operational. */
-
-#define G_RAID_DISK_E_DISCONNECTED	0x01
-
-struct g_raid_disk {
-	struct g_raid_softc	*d_softc;	/* Back-pointer to softc. */
-	struct g_consumer	*d_consumer;	/* GEOM disk consumer. */
-	void			*d_md_data;	/* Disk's metadata storage. */
-	struct g_kerneldump	 d_kd;		/* Kernel dumping method/args. */
-	int			 d_candelete;	/* BIO_DELETE supported. */
-	uint64_t		 d_flags;	/* Additional flags. */
-	u_int			 d_state;	/* Disk state. */
-	u_int			 d_load;	/* Disk average load. */
-	off_t			 d_last_offset;	/* Last head offset. */
-	int			 d_read_errs;	/* Count of the read errors */
-	TAILQ_HEAD(, g_raid_subdisk)	 d_subdisks; /* List of subdisks. */
-	TAILQ_ENTRY(g_raid_disk)	 d_next;	/* Next disk in the node. */
-};
-
-#define G_RAID_SUBDISK_S_NONE		0x00	/* Absent. */
-#define G_RAID_SUBDISK_S_FAILED		0x01	/* Failed. */
-#define G_RAID_SUBDISK_S_NEW		0x02	/* Blank. */
-#define G_RAID_SUBDISK_S_REBUILD	0x03	/* Blank + rebuild. */
-#define G_RAID_SUBDISK_S_UNINITIALIZED	0x04	/* Disk of the new volume. */
-#define G_RAID_SUBDISK_S_STALE		0x05	/* Dirty. */
-#define G_RAID_SUBDISK_S_RESYNC		0x06	/* Dirty + check/repair. */
-#define G_RAID_SUBDISK_S_ACTIVE		0x07	/* Usable. */
-
-#define G_RAID_SUBDISK_E_NEW		0x01	/* A new subdisk has arrived */
-#define G_RAID_SUBDISK_E_FAILED		0x02	/* A subdisk failed, but remains in volume */
-#define G_RAID_SUBDISK_E_DISCONNECTED	0x03	/* A subdisk removed from volume. */
-#define G_RAID_SUBDISK_E_FIRST_TR_PRIVATE 0x80	/* translation private events */
-
-#define G_RAID_SUBDISK_POS(sd)						\
-    ((sd)->sd_disk ? ((sd)->sd_disk->d_last_offset - (sd)->sd_offset) : 0)
-#define G_RAID_SUBDISK_TRACK_SIZE	(1 * 1024 * 1024)
-#define G_RAID_SUBDISK_LOAD(sd)						\
-    ((sd)->sd_disk ? ((sd)->sd_disk->d_load) : 0)
-#define G_RAID_SUBDISK_LOAD_SCALE	256
-
-struct g_raid_subdisk {
-	struct g_raid_softc	*sd_softc;	/* Back-pointer to softc. */
-	struct g_raid_disk	*sd_disk;	/* Where this subdisk lives. */
-	struct g_raid_volume	*sd_volume;	/* Volume, sd is a part of. */
-	off_t			 sd_offset;	/* Offset on the disk. */
-	off_t			 sd_size;	/* Size on the disk. */
-	u_int			 sd_pos;	/* Position in volume. */
-	u_int			 sd_state;	/* Subdisk state. */
-	off_t			 sd_rebuild_pos; /* Rebuild position. */
-	int			 sd_recovery;	/* Count of recovery reqs. */
-	TAILQ_ENTRY(g_raid_subdisk)	 sd_next; /* Next subdisk on disk. */
-};
-
-#define G_RAID_MAX_SUBDISKS	16
-#define G_RAID_MAX_VOLUMENAME	32
-
-#define G_RAID_VOLUME_S_STARTING	0x00
-#define G_RAID_VOLUME_S_BROKEN		0x01
-#define G_RAID_VOLUME_S_DEGRADED	0x02
-#define G_RAID_VOLUME_S_SUBOPTIMAL	0x03
-#define G_RAID_VOLUME_S_OPTIMAL		0x04
-#define G_RAID_VOLUME_S_UNSUPPORTED	0x05
-#define G_RAID_VOLUME_S_STOPPED		0x06
-
-#define G_RAID_VOLUME_S_ALIVE(s)			\
-    ((s) == G_RAID_VOLUME_S_DEGRADED ||			\
-     (s) == G_RAID_VOLUME_S_SUBOPTIMAL ||		\
-     (s) == G_RAID_VOLUME_S_OPTIMAL)
-
-#define G_RAID_VOLUME_E_DOWN		0x00
-#define G_RAID_VOLUME_E_UP		0x01
-#define G_RAID_VOLUME_E_START		0x10
-#define G_RAID_VOLUME_E_STARTMD		0x11
-
-#define G_RAID_VOLUME_RL_RAID0		0x00
-#define G_RAID_VOLUME_RL_RAID1		0x01
-#define G_RAID_VOLUME_RL_RAID3		0x03
-#define G_RAID_VOLUME_RL_RAID4		0x04
-#define G_RAID_VOLUME_RL_RAID5		0x05
-#define G_RAID_VOLUME_RL_RAID6		0x06
-#define G_RAID_VOLUME_RL_RAIDMDF	0x07
-#define G_RAID_VOLUME_RL_RAID1E		0x11
-#define G_RAID_VOLUME_RL_SINGLE		0x0f
-#define G_RAID_VOLUME_RL_CONCAT		0x1f
-#define G_RAID_VOLUME_RL_RAID5E		0x15
-#define G_RAID_VOLUME_RL_RAID5EE	0x25
-#define G_RAID_VOLUME_RL_RAID5R		0x35
-#define G_RAID_VOLUME_RL_UNKNOWN	0xff
-
-#define G_RAID_VOLUME_RLQ_NONE		0x00
-#define G_RAID_VOLUME_RLQ_R1SM		0x00
-#define G_RAID_VOLUME_RLQ_R1MM		0x01
-#define G_RAID_VOLUME_RLQ_R3P0		0x00
-#define G_RAID_VOLUME_RLQ_R3PN		0x01
-#define G_RAID_VOLUME_RLQ_R4P0		0x00
-#define G_RAID_VOLUME_RLQ_R4PN		0x01
-#define G_RAID_VOLUME_RLQ_R5RA		0x00
-#define G_RAID_VOLUME_RLQ_R5RS		0x01
-#define G_RAID_VOLUME_RLQ_R5LA		0x02
-#define G_RAID_VOLUME_RLQ_R5LS		0x03
-#define G_RAID_VOLUME_RLQ_R6RA		0x00
-#define G_RAID_VOLUME_RLQ_R6RS		0x01
-#define G_RAID_VOLUME_RLQ_R6LA		0x02
-#define G_RAID_VOLUME_RLQ_R6LS		0x03
-#define G_RAID_VOLUME_RLQ_RMDFRA	0x00
-#define G_RAID_VOLUME_RLQ_RMDFRS	0x01
-#define G_RAID_VOLUME_RLQ_RMDFLA	0x02
-#define G_RAID_VOLUME_RLQ_RMDFLS	0x03
-#define G_RAID_VOLUME_RLQ_R1EA		0x00
-#define G_RAID_VOLUME_RLQ_R1EO		0x01
-#define G_RAID_VOLUME_RLQ_R5ERA		0x00
-#define G_RAID_VOLUME_RLQ_R5ERS		0x01
-#define G_RAID_VOLUME_RLQ_R5ELA		0x02
-#define G_RAID_VOLUME_RLQ_R5ELS		0x03
-#define G_RAID_VOLUME_RLQ_R5EERA	0x00
-#define G_RAID_VOLUME_RLQ_R5EERS	0x01
-#define G_RAID_VOLUME_RLQ_R5EELA	0x02
-#define G_RAID_VOLUME_RLQ_R5EELS	0x03
-#define G_RAID_VOLUME_RLQ_R5RRA		0x00
-#define G_RAID_VOLUME_RLQ_R5RRS		0x01
-#define G_RAID_VOLUME_RLQ_R5RLA		0x02
-#define G_RAID_VOLUME_RLQ_R5RLS		0x03
-#define G_RAID_VOLUME_RLQ_UNKNOWN	0xff
-
-struct g_raid_volume;
-
-struct g_raid_volume {
-	struct g_raid_softc	*v_softc;	/* Back-pointer to softc. */
-	struct g_provider	*v_provider;	/* GEOM provider. */
-	struct g_raid_subdisk	 v_subdisks[G_RAID_MAX_SUBDISKS];
-						/* Subdisks of this volume. */
-	void			*v_md_data;	/* Volume's metadata storage. */
-	struct g_raid_tr_object	*v_tr;		/* Transformation object. */
-	char			 v_name[G_RAID_MAX_VOLUMENAME];
-						/* Volume name. */
-	u_int			 v_state;	/* Volume state. */
-	u_int			 v_raid_level;	/* Array RAID level. */
-	u_int			 v_raid_level_qualifier; /* RAID level det. */
-	u_int			 v_disks_count;	/* Number of disks in array. */
-	u_int			 v_mdf_pdisks;	/* Number of parity disks
-						   in RAIDMDF array. */
-	uint16_t		 v_mdf_polynomial; /* Polynomial for RAIDMDF. */
-	uint8_t			 v_mdf_method;	/* Generation method for RAIDMDF. */
-	u_int			 v_strip_size;	/* Array strip size. */
-	u_int			 v_rotate_parity; /* Rotate RAID5R parity
-						   after numer of stripes. */
-	u_int			 v_sectorsize;	/* Volume sector size. */
-	off_t			 v_mediasize;	/* Volume media size.  */
-	struct bio_queue_head	 v_inflight;	/* In-flight write requests. */
-	struct bio_queue_head	 v_locked;	/* Blocked I/O requests. */
-	LIST_HEAD(, g_raid_lock) v_locks;	 /* List of locked regions. */
-	int			 v_pending_lock; /* writes to locked region */
-	int			 v_dirty;	/* Volume is DIRTY. */
-	struct timeval		 v_last_done;	/* Time of the last I/O. */
-	time_t			 v_last_write;	/* Time of the last write. */
-	u_int			 v_writes;	/* Number of active writes. */
-	struct root_hold_token	*v_rootmount;	/* Root mount delay token. */
-	int			 v_starting;	/* Volume is starting */
-	int			 v_stopping;	/* Volume is stopping */
-	int			 v_provider_open; /* Number of opens. */
-	int			 v_global_id;	/* Global volume ID (rX). */
-	int			 v_read_only;	/* Volume is read-only. */
-	TAILQ_ENTRY(g_raid_volume)	 v_next; /* List of volumes entry. */
-	LIST_ENTRY(g_raid_volume)	 v_global_next; /* Global list entry. */
-};
-
-#define G_RAID_NODE_E_WAKE	0x00
-#define G_RAID_NODE_E_START	0x01
-
-struct g_raid_softc {
-	struct g_raid_md_object	*sc_md;		/* Metadata object. */
-	struct g_geom		*sc_geom;	/* GEOM class instance. */
-	uint64_t		 sc_flags;	/* Additional flags. */
-	TAILQ_HEAD(, g_raid_volume)	 sc_volumes;	/* List of volumes. */
-	TAILQ_HEAD(, g_raid_disk)	 sc_disks;	/* List of disks. */
-	struct sx		 sc_lock;	/* Main node lock. */
-	struct proc		*sc_worker;	/* Worker process. */
-	struct mtx		 sc_queue_mtx;	/* Worker queues lock. */
-	TAILQ_HEAD(, g_raid_event) sc_events;	/* Worker events queue. */
-	struct bio_queue_head	 sc_queue;	/* Worker I/O queue. */
-	int			 sc_stopping;	/* Node is stopping */
-};
-#define	sc_name	sc_geom->name
-
-SYSCTL_DECL(_kern_geom_raid);
-
-/*
- * KOBJ parent class of metadata processing modules.
- */
-struct g_raid_md_class {
-	KOBJ_CLASS_FIELDS;
-	int		 mdc_enable;
-	int		 mdc_priority;
-	LIST_ENTRY(g_raid_md_class) mdc_list;
-};
-
-/*
- * KOBJ instance of metadata processing module.
- */
-struct g_raid_md_object {
-	KOBJ_FIELDS;
-	struct g_raid_md_class	*mdo_class;
-	struct g_raid_softc	*mdo_softc;	/* Back-pointer to softc. */
-};
-
-int g_raid_md_modevent(module_t, int, void *);
-
-#define	G_RAID_MD_DECLARE(name, label)				\
-    static moduledata_t g_raid_md_##name##_mod = {		\
-	"g_raid_md_" __XSTRING(name),				\
-	g_raid_md_modevent,					\
-	&g_raid_md_##name##_class				\
-    };								\
-    DECLARE_MODULE(g_raid_md_##name, g_raid_md_##name##_mod,	\
-	SI_SUB_DRIVERS, SI_ORDER_SECOND);			\
-    MODULE_DEPEND(g_raid_md_##name, geom_raid, 0, 0, 0);	\
-    SYSCTL_NODE(_kern_geom_raid, OID_AUTO, name, CTLFLAG_RD,	\
-	NULL, label " metadata module");			\
-    SYSCTL_INT(_kern_geom_raid_##name, OID_AUTO, enable,	\
-	CTLFLAG_RW, &g_raid_md_##name##_class.mdc_enable, 0,	\
-	"Enable " label " metadata format taste");		\
-    TUNABLE_INT("kern.geom.raid." __XSTRING(name) ".enable",	\
-	&g_raid_md_##name##_class.mdc_enable)
-
-/*
- * KOBJ parent class of data transformation modules.
- */
-struct g_raid_tr_class {
-	KOBJ_CLASS_FIELDS;
-	int		 trc_enable;
-	int		 trc_priority;
-	int		 trc_accept_unmapped;
-	LIST_ENTRY(g_raid_tr_class) trc_list;
-};
-
-/*
- * KOBJ instance of data transformation module.
- */
-struct g_raid_tr_object {
-	KOBJ_FIELDS;
-	struct g_raid_tr_class	*tro_class;
-	struct g_raid_volume 	*tro_volume;	/* Back-pointer to volume. */
-};
-
-int g_raid_tr_modevent(module_t, int, void *);
-
-#define	G_RAID_TR_DECLARE(name, label)				\
-    static moduledata_t g_raid_tr_##name##_mod = {		\
-	"g_raid_tr_" __XSTRING(name),				\
-	g_raid_tr_modevent,					\
-	&g_raid_tr_##name##_class				\
-    };								\
-    DECLARE_MODULE(g_raid_tr_##name, g_raid_tr_##name##_mod,	\
-	SI_SUB_DRIVERS, SI_ORDER_FIRST);			\
-    MODULE_DEPEND(g_raid_tr_##name, geom_raid, 0, 0, 0);	\
-    SYSCTL_NODE(_kern_geom_raid, OID_AUTO, name, CTLFLAG_RD,	\
-	NULL, label " transformation module");			\
-    SYSCTL_INT(_kern_geom_raid_##name, OID_AUTO, enable,	\
-	CTLFLAG_RW, &g_raid_tr_##name##_class.trc_enable, 0,	\
-	"Enable " label " transformation module taste");	\
-    TUNABLE_INT("kern.geom.raid." __XSTRING(name) ".enable",	\
-	&g_raid_tr_##name##_class.trc_enable)
-
-const char * g_raid_volume_level2str(int level, int qual);
-int g_raid_volume_str2level(const char *str, int *level, int *qual);
-const char * g_raid_volume_state2str(int state);
-const char * g_raid_subdisk_state2str(int state);
-const char * g_raid_disk_state2str(int state);
-
-struct g_raid_softc * g_raid_create_node(struct g_class *mp,
-    const char *name, struct g_raid_md_object *md);
-int g_raid_create_node_format(const char *format, struct gctl_req *req,
-    struct g_geom **gp);
-struct g_raid_volume * g_raid_create_volume(struct g_raid_softc *sc,
-    const char *name, int id);
-struct g_raid_disk * g_raid_create_disk(struct g_raid_softc *sc);
-const char * g_raid_get_diskname(struct g_raid_disk *disk);
-void g_raid_get_disk_info(struct g_raid_disk *disk);
-
-int g_raid_start_volume(struct g_raid_volume *vol);
-
-int g_raid_destroy_node(struct g_raid_softc *sc, int worker);
-int g_raid_destroy_volume(struct g_raid_volume *vol);
-int g_raid_destroy_disk(struct g_raid_disk *disk);
-
-void g_raid_iodone(struct bio *bp, int error);
-void g_raid_subdisk_iostart(struct g_raid_subdisk *sd, struct bio *bp);
-int g_raid_subdisk_kerneldump(struct g_raid_subdisk *sd,
-    void *virtual, vm_offset_t physical, off_t offset, size_t length);
-
-struct g_consumer *g_raid_open_consumer(struct g_raid_softc *sc,
-    const char *name);
-void g_raid_kill_consumer(struct g_raid_softc *sc, struct g_consumer *cp);
-
-void g_raid_report_disk_state(struct g_raid_disk *disk);
-void g_raid_change_disk_state(struct g_raid_disk *disk, int state);
-void g_raid_change_subdisk_state(struct g_raid_subdisk *sd, int state);
-void g_raid_change_volume_state(struct g_raid_volume *vol, int state);
-
-void g_raid_write_metadata(struct g_raid_softc *sc, struct g_raid_volume *vol,
-    struct g_raid_subdisk *sd, struct g_raid_disk *disk);
-void g_raid_fail_disk(struct g_raid_softc *sc,
-    struct g_raid_subdisk *sd, struct g_raid_disk *disk);
-
-void g_raid_tr_flush_common(struct g_raid_tr_object *tr, struct bio *bp);
-int g_raid_tr_kerneldump_common(struct g_raid_tr_object *tr,
-    void *virtual, vm_offset_t physical, off_t offset, size_t length);
-
-u_int g_raid_ndisks(struct g_raid_softc *sc, int state);
-u_int g_raid_nsubdisks(struct g_raid_volume *vol, int state);
-u_int g_raid_nopens(struct g_raid_softc *sc);
-struct g_raid_subdisk * g_raid_get_subdisk(struct g_raid_volume *vol,
-    int state);
-#define	G_RAID_DESTROY_SOFT		0
-#define	G_RAID_DESTROY_DELAYED	1
-#define	G_RAID_DESTROY_HARD		2
-int g_raid_destroy(struct g_raid_softc *sc, int how);
-int g_raid_event_send(void *arg, int event, int flags);
-int g_raid_lock_range(struct g_raid_volume *vol, off_t off, off_t len,
-    struct bio *ignore, void *argp);
-int g_raid_unlock_range(struct g_raid_volume *vol, off_t off, off_t len);
-
-g_ctl_req_t g_raid_ctl;
-#endif	/* _KERNEL */
-
-#endif	/* !_G_RAID_H_ */
diff --git a/include.new/geom/raid/md_ddf.h b/include.new/geom/raid/md_ddf.h
deleted file mode 100644
index 66b73f3..0000000
--- a/include.new/geom/raid/md_ddf.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*-
- * Copyright (c) 2012 Alexander Motin <mav@FreeBSD.org>
- * Copyright (c) 2008 Scott Long
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/geom/raid/md_ddf.h 234848 2012-04-30 17:53:02Z mav $
- */
-
-#ifndef MD_DDF_H
-#define MD_DDF_H
-
-/* Definitions from the SNIA DDF spec, rev 1.2/2.0 */
-
-#define	DDF_HEADER_LENGTH		512
-struct ddf_header {
-	uint32_t	Signature;
-#define	DDF_HEADER_SIGNATURE	0xde11de11
-	uint32_t	CRC;
-	uint8_t		DDF_Header_GUID[24];
-	uint8_t		DDF_rev[8];
-	uint32_t	Sequence_Number;
-	uint32_t	TimeStamp;
-	uint8_t		Open_Flag;
-#define	DDF_HEADER_CLOSED	0x00
-#define	DDF_HEADER_OPENED_MASK	0x0f
-#define	DDF_HEADER_OPEN_ANCHOR	0xff
-	uint8_t		Foreign_Flag;
-	uint8_t		Diskgrouping;
-	uint8_t		pad1[13];
-	uint8_t		Header_ext[32];
-	uint64_t	Primary_Header_LBA;
-	uint64_t	Secondary_Header_LBA;
-	uint8_t		Header_Type;
-#define	DDF_HEADER_ANCHOR	0x00
-#define	DDF_HEADER_PRIMARY	0x01
-#define	DDF_HEADER_SECONDARY	0x02
-	uint8_t		pad2[3];
-	uint32_t	WorkSpace_Length;
-	uint64_t	WorkSpace_LBA;
-	uint16_t	Max_PD_Entries;
-	uint16_t	Max_VD_Entries;
-	uint16_t	Max_Partitions;
-	uint16_t	Configuration_Record_Length;
-	uint16_t	Max_Primary_Element_Entries;
-	uint32_t	Max_Mapped_Block_Entries; /* DDF 2.0 */
-	uint8_t		pad3[50];
-	uint32_t	cd_section;	/* Controller_Data_Section */
-	uint32_t	cd_length;	/* Controller_Data_Section_Length */
-	uint32_t	pdr_section;	/* Physical_Drive_Records_Section */
-	uint32_t	pdr_length;	/* Physical_Drive_Records_Length */
-	uint32_t	vdr_section;	/* Virtual_Drive_Records_Section */
-	uint32_t	vdr_length;	/* Virtual_Drive_Records_Length */
-	uint32_t	cr_section;	/* Configuration_Records_Section */
-	uint32_t	cr_length;	/* Configuration_Records_Length */
-	uint32_t	pdd_section;	/* Physical_Drive_Data_Section */
-	uint32_t	pdd_length;	/* Physical_Drive_Data_Length */
-	uint32_t	bbmlog_section;	/* BBM_Log_Section */
-	uint32_t	bbmlog_length;	/* BBM_Log_Section_Length */
-	uint32_t	Diagnostic_Space;
-	uint32_t	Diagnostic_Space_Length;
-	uint32_t	Vendor_Specific_Logs;
-	uint32_t	Vendor_Specific_Logs_Length;
-	uint8_t		pad4[256];
-} __packed;
-
-struct ddf_cd_record {
-	uint32_t	Signature;
-#define	DDF_CONTROLLER_DATA_SIGNATURE	0xad111111
-	uint32_t	CRC;
-	uint8_t		Controller_GUID[24];
-	struct {
-		uint16_t	Vendor_ID;
-		uint16_t	Device_ID;
-		uint16_t	SubVendor_ID;
-		uint16_t	SubDevice_ID;
-	} Controller_Type __packed;
-	uint8_t		Product_ID[16];
-	uint8_t		pad1[8];
-	uint8_t		Controller_Data[448];
-} __packed;
-
-struct ddf_device_scsi {
-	uint8_t		Lun;
-	uint8_t		Id;
-	uint8_t		Channel;
-	uint8_t		Path_Flags;
-#define DDF_DEVICE_SCSI_FLAG_BROKEN	(1 << 7)
-} __packed;
-
-struct ddf_device_sas {
-	uint64_t	Initiator_Path;
-} __packed;
-
-union ddf_pathinfo {
-	struct {
-		struct ddf_device_scsi	Path0;
-		struct ddf_device_scsi	Path1;
-		uint8_t			pad[10];
-	} __packed scsi;
-	struct {
-		struct ddf_device_sas	Path0;
-		struct ddf_device_sas	Path1;
-		uint8_t			Path0_Flags;
-		uint8_t			Path1_Flags;
-#define DDF_DEVICE_SAS_PHY_ID		0x7f
-#define DDF_DEVICE_SAS_FLAG_BROKEN	(1 << 7)
-	} __packed sas;
-} __packed;
-
-struct ddf_pd_entry {
-	uint8_t			PD_GUID[24];
-	uint32_t		PD_Reference;
-	uint16_t		PD_Type;
-#define	DDF_PDE_GUID_FORCE	(1 << 0)
-#define	DDF_PDE_PARTICIPATING	(1 << 1)
-#define	DDF_PDE_GLOBAL_SPARE	(1 << 2)
-#define	DDF_PDE_CONFIG_SPARE	(1 << 3)
-#define	DDF_PDE_FOREIGN		(1 << 4)
-#define	DDF_PDE_LEGACY		(1 << 5)
-#define DDF_PDE_TYPE_MASK	(0x0f << 12)
-#define DDF_PDE_UNKNOWN		(0x00 << 12)
-#define DDF_PDE_SCSI		(0x01 << 12)
-#define DDF_PDE_SAS		(0x02 << 12)
-#define DDF_PDE_SATA		(0x03 << 12)
-#define DDF_PDE_FC		(0x04 << 12)
-	uint16_t		PD_State;
-#define	DDF_PDE_ONLINE		(1 << 0)
-#define	DDF_PDE_FAILED		(1 << 1)
-#define	DDF_PDE_REBUILD		(1 << 2)
-#define	DDF_PDE_TRANSITION	(1 << 3)
-#define	DDF_PDE_PFA		(1 << 4)
-#define	DDF_PDE_UNRECOVERED	(1 << 5)
-#define	DDF_PDE_MISSING		(1 << 6)
-	uint64_t		Configured_Size;
-	union ddf_pathinfo	Path_Information;
-	uint16_t		Block_Size;	/* DDF 2.0 */
-	uint8_t			pad1[4];
-} __packed;
-
-struct ddf_pd_record {
-	uint32_t		Signature;
-#define	DDF_PDR_SIGNATURE	0x22222222
-	uint32_t		CRC;
-	uint16_t		Populated_PDEs;
-	uint16_t		Max_PDE_Supported;
-	uint8_t			pad1[52];
-	struct ddf_pd_entry	entry[0];
-} __packed;
-
-struct ddf_vd_entry {
-	uint8_t			VD_GUID[24];
-	uint16_t		VD_Number;
-	uint8_t			pad1[2];
-	uint16_t		VD_Type;
-#define DDF_VDE_SHARED		(1 << 0)
-#define	DDF_VDE_ENFORCE_GROUP	(1 << 1)
-#define	DDF_VDE_UNICODE_NAME	(1 << 2)
-#define	DDF_VDE_OWNER_ID_VALID	(1 << 3)
-	uint16_t		Controller_GUID_CRC;
-	uint8_t			VD_State;
-#define	DDF_VDE_OPTIMAL		0x00
-#define	DDF_VDE_DEGRADED	0x01
-#define	DDF_VDE_DELETED		0x02
-#define	DDF_VDE_MISSING		0x03
-#define	DDF_VDE_FAILED		0x04
-#define DDF_VDE_PARTIAL		0x05
-#define DDF_VDE_OFFLINE		0x06
-#define	DDF_VDE_STATE_MASK	0x07
-#define	DDF_VDE_MORPH		(1 << 3)
-#define	DDF_VDE_DIRTY		(1 << 4)
-	uint8_t			Init_State;
-#define	DDF_VDE_UNINTIALIZED	0x00
-#define	DDF_VDE_INIT_QUICK	0x01
-#define	DDF_VDE_INIT_FULL	0x02
-#define	DDF_VDE_INIT_MASK	0x03
-#define	DDF_VDE_UACCESS_RW	0x00
-#define	DDF_VDE_UACCESS_RO	0x80
-#define	DDF_VDE_UACCESS_BLOCKED	0xc0
-#define	DDF_VDE_UACCESS_MASK	0xc0
-	uint8_t			Drive_Failures_Remaining;	/* DDF 2.0 */
-	uint8_t			pad2[13];
-	uint8_t			VD_Name[16];
-} __packed;
-
-struct ddf_vd_record {
-	uint32_t		Signature;
-#define	DDF_VD_RECORD_SIGNATURE	0xdddddddd
-	uint32_t		CRC;
-	uint16_t		Populated_VDEs;
-	uint16_t		Max_VDE_Supported;
-	uint8_t			pad1[52];
-	struct ddf_vd_entry	entry[0];
-} __packed;
-
-#define DDF_CR_INVALID		0xffffffff
-
-struct ddf_vdc_record {
-	uint32_t	Signature;
-#define	DDF_VDCR_SIGNATURE	0xeeeeeeee
-	uint32_t	CRC;
-	uint8_t		VD_GUID[24];
-	uint32_t	Timestamp;
-	uint32_t	Sequence_Number;
-	uint8_t		pad1[24];
-	uint16_t	Primary_Element_Count;
-	uint8_t		Stripe_Size;
-	uint8_t		Primary_RAID_Level;
-#define DDF_VDCR_RAID0		0x00
-#define DDF_VDCR_RAID1		0x01
-#define DDF_VDCR_RAID3		0x03
-#define DDF_VDCR_RAID4		0x04
-#define DDF_VDCR_RAID5		0x05
-#define DDF_VDCR_RAID6		0x06
-#define DDF_VDCR_RAID1E		0x11
-#define DDF_VDCR_SINGLE		0x0f
-#define DDF_VDCR_CONCAT		0x1f
-#define DDF_VDCR_RAID5E		0x15
-#define DDF_VDCR_RAID5EE	0x25
-	uint8_t		RLQ;
-	uint8_t		Secondary_Element_Count;
-	uint8_t		Secondary_Element_Seq;
-	uint8_t		Secondary_RAID_Level;
-	uint64_t	Block_Count;
-	uint64_t	VD_Size;
-	uint16_t	Block_Size;			/* DDF 2.0 */
-	uint8_t		Rotate_Parity_count;		/* DDF 2.0 */
-	uint8_t		pad2[5];
-	uint32_t	Associated_Spares[8];
-	uint64_t	Cache_Flags;
-#define DDF_VDCR_CACHE_WB		(1 << 0)
-#define	DDF_VDCR_CACHE_WB_ADAPTIVE	(1 << 1)
-#define	DDF_VDCR_CACHE_RA		(1 << 2)
-#define	DDF_VDCR_CACHE_RA_ADAPTIVE	(1 << 3)
-#define	DDF_VDCR_CACHE_WCACHE_NOBATTERY	(1 << 4)
-#define	DDF_VDCR_CACHE_WCACHE_ALLOW	(1 << 5)
-#define	DDF_VDCR_CACHE_RCACHE_ALLOW	(1 << 6)
-#define	DDF_VDCR_CACHE_VENDOR		(1 << 7)
-	uint8_t		BG_Rate;
-	uint8_t		pad3[3];
-	uint8_t		MDF_Parity_Disks;		/* DDF 2.0 */
-	uint16_t	MDF_Parity_Generator_Polynomial; /* DDF 2.0 */
-	uint8_t		pad4;
-	uint8_t		MDF_Constant_Generation_Method; /* DDF 2.0 */
-	uint8_t		pad5[47];
-	uint8_t		pad6[192];
-	uint8_t		V0[32];
-	uint8_t		V1[32];
-	uint8_t		V2[16];
-	uint8_t		V3[16];
-	uint8_t		Vendor_Scratch[32];
-	uint32_t	Physical_Disk_Sequence[0];
-} __packed;
-
-struct ddf_vuc_record {
-	uint32_t	Signature;
-#define	DDF_VUCR_SIGNATURE	0x88888888
-	uint32_t	CRC;
-	uint8_t		VD_GUID[24];
-} __packed;
-
-struct ddf_sa_entry {
-	uint8_t		VD_GUID[24];
-	uint16_t	Secondary_Element;
-	uint8_t		rsrvd2[6];
-} __packed;
-
-struct ddf_sa_record {
-	uint32_t	Signature;
-#define	DDF_SA_SIGNATURE	0x55555555
-	uint32_t	CRC;
-	uint32_t	Timestamp;
-	uint8_t		pad1[7];
-	uint8_t		Spare_Type;
-#define	DDF_SAR_TYPE_DEDICATED		(1 << 0)
-#define	DDF_SAR_TYPE_REVERTIBLE		(1 << 1)
-#define	DDF_SAR_TYPE_ACTIVE		(1 << 2)
-#define	DDF_SAR_TYPE_ENCL_AFFINITY	(1 << 3)
-	uint16_t	Populated_SAEs;
-	uint16_t	MAX_SAE_Supported;
-	uint8_t		pad2[8];
-	struct ddf_sa_entry	entry[0];
-} __packed;
-
-struct ddf_pdd_record {
-	uint32_t	Signature;
-#define	DDF_PDD_SIGNATURE	0x33333333
-	uint32_t	CRC;
-	uint8_t		PD_GUID[24];
-	uint32_t	PD_Reference;
-	uint8_t		Forced_Ref_Flag;
-#define	DDF_PDD_FORCED_REF	0x01
-	uint8_t		Forced_PD_GUID_Flag;
-#define	DDF_PDD_FORCED_GUID	0x01
-	uint8_t		Vendor_Scratch[32];
-	uint8_t		pad2[442];
-} __packed;
-
-struct ddf_bbm_entry {
-	uint64_t	Defective_Block_Start;
-	uint32_t	Spare_Block_Offset;
-	uint16_t	Remapped_Count;
-	uint8_t	pad[2];
-};
-
-struct ddf_bbm_log {
-	uint32_t	Signature;
-#define	DDF_BBML_SIGNATURE	0xabadb10c
-	uint32_t	CRC;
-	uint32_t	Entry_Count;
-	uint32_t	Spare_Block_Count;
-	uint8_t		pad1[8];
-	uint64_t	First_Spare_LBA;
-	uint64_t	Mapped_Block_Entry[0];
-} __packed;
-
-struct ddf_vendor_log {
-	uint32_t	Signature;
-#define	DDF_VENDOR_LOG_SIGNATURE	0x01dbeef0
-	uint32_t	CRC;
-	uint64_t	Log_Owner;
-	uint8_t		pad1[16];
-} __packed;
-
-#endif
diff --git a/include.new/geom/raid3/g_raid3.h b/include.new/geom/raid3/g_raid3.h
deleted file mode 100644
index a8f01a5..0000000
--- a/include.new/geom/raid3/g_raid3.h
+++ /dev/null
@@ -1,476 +0,0 @@
-/*-
- * Copyright (c) 2004-2006 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/raid3/g_raid3.h 200821 2009-12-21 23:31:03Z mav $
- */
-
-#ifndef	_G_RAID3_H_
-#define	_G_RAID3_H_
-
-#include <sys/endian.h>
-#include <sys/md5.h>
-
-#define	G_RAID3_CLASS_NAME	"RAID3"
-
-#define	G_RAID3_MAGIC		"GEOM::RAID3"
-/*
- * Version history:
- * 0 - Initial version number.
- * 1 - Added 'round-robin reading' algorithm.
- * 2 - Added 'verify reading' algorithm.
- * 3 - Added md_genid field to metadata.
- * 4 - Added md_provsize field to metadata.
- * 5 - Added 'no failure synchronization' flag.
- */
-#define	G_RAID3_VERSION		5
-
-#define	G_RAID3_DISK_FLAG_DIRTY		0x0000000000000001ULL
-#define	G_RAID3_DISK_FLAG_SYNCHRONIZING	0x0000000000000002ULL
-#define	G_RAID3_DISK_FLAG_FORCE_SYNC	0x0000000000000004ULL
-#define	G_RAID3_DISK_FLAG_HARDCODED	0x0000000000000008ULL
-#define	G_RAID3_DISK_FLAG_BROKEN	0x0000000000000010ULL
-#define	G_RAID3_DISK_FLAG_MASK		(G_RAID3_DISK_FLAG_DIRTY |	\
-					 G_RAID3_DISK_FLAG_SYNCHRONIZING | \
-					 G_RAID3_DISK_FLAG_FORCE_SYNC)
-
-#define	G_RAID3_DEVICE_FLAG_NOAUTOSYNC	0x0000000000000001ULL
-#define	G_RAID3_DEVICE_FLAG_ROUND_ROBIN	0x0000000000000002ULL
-#define	G_RAID3_DEVICE_FLAG_VERIFY	0x0000000000000004ULL
-#define	G_RAID3_DEVICE_FLAG_NOFAILSYNC	0x0000000000000008ULL
-#define	G_RAID3_DEVICE_FLAG_MASK	(G_RAID3_DEVICE_FLAG_NOAUTOSYNC | \
-					 G_RAID3_DEVICE_FLAG_ROUND_ROBIN | \
-					 G_RAID3_DEVICE_FLAG_VERIFY | \
-					 G_RAID3_DEVICE_FLAG_NOFAILSYNC)
-
-#ifdef _KERNEL
-extern u_int g_raid3_debug;
-
-#define	G_RAID3_DEBUG(lvl, ...)	do {					\
-	if (g_raid3_debug >= (lvl)) {					\
-		printf("GEOM_RAID3");					\
-		if (g_raid3_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_RAID3_LOGREQ(lvl, bp, ...)	do {				\
-	if (g_raid3_debug >= (lvl)) {					\
-		printf("GEOM_RAID3");					\
-		if (g_raid3_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-#define	G_RAID3_BIO_CFLAG_REGULAR	0x01
-#define	G_RAID3_BIO_CFLAG_SYNC		0x02
-#define	G_RAID3_BIO_CFLAG_PARITY	0x04
-#define	G_RAID3_BIO_CFLAG_NODISK	0x08
-#define	G_RAID3_BIO_CFLAG_REGSYNC	0x10
-#define	G_RAID3_BIO_CFLAG_MASK		(G_RAID3_BIO_CFLAG_REGULAR |	\
-					 G_RAID3_BIO_CFLAG_SYNC |	\
-					 G_RAID3_BIO_CFLAG_PARITY |	\
-					 G_RAID3_BIO_CFLAG_NODISK |	\
-					 G_RAID3_BIO_CFLAG_REGSYNC)
-
-#define	G_RAID3_BIO_PFLAG_DEGRADED	0x01
-#define	G_RAID3_BIO_PFLAG_NOPARITY	0x02
-#define	G_RAID3_BIO_PFLAG_VERIFY	0x04
-#define	G_RAID3_BIO_PFLAG_MASK		(G_RAID3_BIO_PFLAG_DEGRADED |	\
-					 G_RAID3_BIO_PFLAG_NOPARITY |	\
-					 G_RAID3_BIO_PFLAG_VERIFY)
-
-/*
- * Informations needed for synchronization.
- */
-struct g_raid3_disk_sync {
-	struct g_consumer *ds_consumer;	/* Consumer connected to our device. */
-	off_t		  ds_offset;	/* Offset of next request to send. */
-	off_t		  ds_offset_done; /* Offset of already synchronized
-					   region. */
-	off_t		  ds_resync;	/* Resynchronize from this offset. */
-	u_int		  ds_syncid;	/* Disk's synchronization ID. */
-	u_int		  ds_inflight;	/* Number of in-flight sync requests. */
-	struct bio	**ds_bios;	/* BIOs for synchronization I/O. */
-};
-
-/*
- * Informations needed for synchronization.
- */
-struct g_raid3_device_sync {
-	struct g_geom	*ds_geom;	/* Synchronization geom. */
-};
-
-#define	G_RAID3_DISK_STATE_NODISK		0
-#define	G_RAID3_DISK_STATE_NONE			1
-#define	G_RAID3_DISK_STATE_NEW			2
-#define	G_RAID3_DISK_STATE_ACTIVE		3
-#define	G_RAID3_DISK_STATE_STALE		4
-#define	G_RAID3_DISK_STATE_SYNCHRONIZING	5
-#define	G_RAID3_DISK_STATE_DISCONNECTED		6
-#define	G_RAID3_DISK_STATE_DESTROY		7
-struct g_raid3_disk {
-	u_int		 d_no;		/* Disk number. */
-	struct g_consumer *d_consumer;	/* Consumer. */
-	struct g_raid3_softc *d_softc;	/* Back-pointer to softc. */
-	int		 d_state;	/* Disk state. */
-	uint64_t	 d_flags;	/* Additional flags. */
-	u_int		 d_genid;	/* Disk's generation ID. */
-	struct g_raid3_disk_sync d_sync; /* Sync information. */
-	LIST_ENTRY(g_raid3_disk) d_next;
-};
-#define	d_name	d_consumer->provider->name
-
-#define	G_RAID3_EVENT_DONTWAIT	0x1
-#define	G_RAID3_EVENT_WAIT	0x2
-#define	G_RAID3_EVENT_DEVICE	0x4
-#define	G_RAID3_EVENT_DONE	0x8
-struct g_raid3_event {
-	struct g_raid3_disk	*e_disk;
-	int			 e_state;
-	int			 e_flags;
-	int			 e_error;
-	TAILQ_ENTRY(g_raid3_event) e_next;
-};
-
-#define	G_RAID3_DEVICE_FLAG_DESTROY	0x0100000000000000ULL
-#define	G_RAID3_DEVICE_FLAG_WAIT	0x0200000000000000ULL
-#define	G_RAID3_DEVICE_FLAG_DESTROYING	0x0400000000000000ULL
-
-#define	G_RAID3_DEVICE_STATE_STARTING		0
-#define	G_RAID3_DEVICE_STATE_DEGRADED		1
-#define	G_RAID3_DEVICE_STATE_COMPLETE		2
-
-/* Bump syncid on first write. */
-#define	G_RAID3_BUMP_SYNCID	0x1
-/* Bump genid immediately. */
-#define	G_RAID3_BUMP_GENID	0x2
-
-enum g_raid3_zones {
-	G_RAID3_ZONE_64K,
-	G_RAID3_ZONE_16K,
-	G_RAID3_ZONE_4K,
-	G_RAID3_NUM_ZONES
-};
-
-static __inline enum g_raid3_zones
-g_raid3_zone(size_t nbytes) {
-	if (nbytes > 65536)
-		return (G_RAID3_NUM_ZONES);
-	else if (nbytes > 16384)
-		return (G_RAID3_ZONE_64K);
-	else if (nbytes > 4096)
-		return (G_RAID3_ZONE_16K);
-	else
-		return (G_RAID3_ZONE_4K);
-};
-
-struct g_raid3_softc {
-	u_int		sc_state;	/* Device state. */
-	uint64_t	sc_mediasize;	/* Device size. */
-	uint32_t	sc_sectorsize;	/* Sector size. */
-	uint64_t	sc_flags;	/* Additional flags. */
-
-	struct g_geom	*sc_geom;
-	struct g_provider *sc_provider;
-
-	uint32_t	sc_id;		/* Device unique ID. */
-
-	struct sx	 sc_lock;
-	struct bio_queue_head sc_queue;
-	struct mtx	 sc_queue_mtx;
-	struct proc	*sc_worker;
-	struct bio_queue_head sc_regular_delayed; /* Delayed I/O requests due
-						     collision with sync
-						     requests. */
-	struct bio_queue_head sc_inflight; /* In-flight regular write
-					      requests. */
-	struct bio_queue_head sc_sync_delayed; /* Delayed sync requests due
-						  collision with regular
-						  requests. */
-
-	struct g_raid3_disk *sc_disks;
-	u_int		sc_ndisks;	/* Number of disks. */
-	u_int		sc_round_robin;
-	struct g_raid3_disk *sc_syncdisk;
-
-	struct g_raid3_zone {
-		uma_zone_t	sz_zone;
-		size_t		sz_inuse;
-		size_t		sz_max;
-		u_int		sz_requested;
-		u_int		sz_failed;
-	} sc_zones[G_RAID3_NUM_ZONES];
-
-	u_int		sc_genid;	/* Generation ID. */
-	u_int		sc_syncid;	/* Synchronization ID. */
-	int		sc_bump_id;
-	struct g_raid3_device_sync sc_sync;
-	int		sc_idle;	/* DIRTY flags removed. */
-	time_t		sc_last_write;
-	u_int		sc_writes;
-
-	TAILQ_HEAD(, g_raid3_event) sc_events;
-	struct mtx	sc_events_mtx;
-
-	struct callout	sc_callout;
-
-	struct root_hold_token *sc_rootmount;
-};
-#define	sc_name	sc_geom->name
-
-const char *g_raid3_get_diskname(struct g_raid3_disk *disk);
-u_int g_raid3_ndisks(struct g_raid3_softc *sc, int state);
-#define	G_RAID3_DESTROY_SOFT	0
-#define	G_RAID3_DESTROY_DELAYED	1
-#define	G_RAID3_DESTROY_HARD	2
-int g_raid3_destroy(struct g_raid3_softc *sc, int how);
-int g_raid3_event_send(void *arg, int state, int flags);
-struct g_raid3_metadata;
-int g_raid3_add_disk(struct g_raid3_softc *sc, struct g_provider *pp,
-    struct g_raid3_metadata *md);
-int g_raid3_read_metadata(struct g_consumer *cp, struct g_raid3_metadata *md);
-void g_raid3_fill_metadata(struct g_raid3_disk *disk,
-    struct g_raid3_metadata *md);
-int g_raid3_clear_metadata(struct g_raid3_disk *disk);
-void g_raid3_update_metadata(struct g_raid3_disk *disk);
-
-g_ctl_req_t g_raid3_config;
-#endif	/* _KERNEL */
-
-struct g_raid3_metadata {
-	char		md_magic[16];	/* Magic value. */
-	uint32_t	md_version;	/* Version number. */
-	char		md_name[16];	/* Device name. */
-	uint32_t	md_id;		/* Device unique ID. */
-	uint16_t	md_no;		/* Component number. */
-	uint16_t	md_all;		/* Number of disks in device. */
-	uint32_t	md_genid;	/* Generation ID. */
-	uint32_t	md_syncid;	/* Synchronization ID. */
-	uint64_t	md_mediasize;	/* Size of whole device. */
-	uint32_t	md_sectorsize;	/* Sector size. */
-	uint64_t	md_sync_offset;	/* Synchronized offset. */
-	uint64_t	md_mflags;	/* Additional device flags. */
-	uint64_t	md_dflags;	/* Additional disk flags. */
-	char		md_provider[16]; /* Hardcoded provider. */
-	uint64_t	md_provsize;	/* Provider's size. */
-	u_char		md_hash[16];	/* MD5 hash. */
-};
-static __inline void
-raid3_metadata_encode(struct g_raid3_metadata *md, u_char *data)
-{
-	MD5_CTX ctx;
-
-	bcopy(md->md_magic, data, 16);
-	le32enc(data + 16, md->md_version);
-	bcopy(md->md_name, data + 20, 16);
-	le32enc(data + 36, md->md_id);
-	le16enc(data + 40, md->md_no);
-	le16enc(data + 42, md->md_all);
-	le32enc(data + 44, md->md_genid);
-	le32enc(data + 48, md->md_syncid);
-	le64enc(data + 52, md->md_mediasize);
-	le32enc(data + 60, md->md_sectorsize);
-	le64enc(data + 64, md->md_sync_offset);
-	le64enc(data + 72, md->md_mflags);
-	le64enc(data + 80, md->md_dflags);
-	bcopy(md->md_provider, data + 88, 16);
-	le64enc(data + 104, md->md_provsize);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 112);
-	MD5Final(md->md_hash, &ctx);
-	bcopy(md->md_hash, data + 112, 16);
-}
-static __inline int
-raid3_metadata_decode_v0v1v2(const u_char *data, struct g_raid3_metadata *md)
-{
-	MD5_CTX ctx;
-
-	bcopy(data + 20, md->md_name, 16);
-	md->md_id = le32dec(data + 36);
-	md->md_no = le16dec(data + 40);
-	md->md_all = le16dec(data + 42);
-	md->md_syncid = le32dec(data + 44);
-	md->md_mediasize = le64dec(data + 48);
-	md->md_sectorsize = le32dec(data + 56);
-	md->md_sync_offset = le64dec(data + 60);
-	md->md_mflags = le64dec(data + 68);
-	md->md_dflags = le64dec(data + 76);
-	bcopy(data + 84, md->md_provider, 16);
-	bcopy(data + 100, md->md_hash, 16);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 100);
-	MD5Final(md->md_hash, &ctx);
-	if (bcmp(md->md_hash, data + 100, 16) != 0)
-		return (EINVAL);
-
-	/* New fields. */
-	md->md_genid = 0;
-	md->md_provsize = 0;
-
-	return (0);
-}
-static __inline int
-raid3_metadata_decode_v3(const u_char *data, struct g_raid3_metadata *md)
-{
-	MD5_CTX ctx;
-
-	bcopy(data + 20, md->md_name, 16);
-	md->md_id = le32dec(data + 36);
-	md->md_no = le16dec(data + 40);
-	md->md_all = le16dec(data + 42);
-	md->md_genid = le32dec(data + 44);
-	md->md_syncid = le32dec(data + 48);
-	md->md_mediasize = le64dec(data + 52);
-	md->md_sectorsize = le32dec(data + 60);
-	md->md_sync_offset = le64dec(data + 64);
-	md->md_mflags = le64dec(data + 72);
-	md->md_dflags = le64dec(data + 80);
-	bcopy(data + 88, md->md_provider, 16);
-	bcopy(data + 104, md->md_hash, 16);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 104);
-	MD5Final(md->md_hash, &ctx);
-	if (bcmp(md->md_hash, data + 104, 16) != 0)
-		return (EINVAL);
-
-	/* New fields. */
-	md->md_provsize = 0;
-
-	return (0);
-}
-static __inline int
-raid3_metadata_decode_v4v5(const u_char *data, struct g_raid3_metadata *md)
-{
-	MD5_CTX ctx;
-
-	bcopy(data + 20, md->md_name, 16);
-	md->md_id = le32dec(data + 36);
-	md->md_no = le16dec(data + 40);
-	md->md_all = le16dec(data + 42);
-	md->md_genid = le32dec(data + 44);
-	md->md_syncid = le32dec(data + 48);
-	md->md_mediasize = le64dec(data + 52);
-	md->md_sectorsize = le32dec(data + 60);
-	md->md_sync_offset = le64dec(data + 64);
-	md->md_mflags = le64dec(data + 72);
-	md->md_dflags = le64dec(data + 80);
-	bcopy(data + 88, md->md_provider, 16);
-	md->md_provsize = le64dec(data + 104);
-	bcopy(data + 112, md->md_hash, 16);
-	MD5Init(&ctx);
-	MD5Update(&ctx, data, 112);
-	MD5Final(md->md_hash, &ctx);
-	if (bcmp(md->md_hash, data + 112, 16) != 0)
-		return (EINVAL);
-	return (0);
-}
-static __inline int
-raid3_metadata_decode(const u_char *data, struct g_raid3_metadata *md)
-{
-	int error;
-
-	bcopy(data, md->md_magic, 16);
-	md->md_version = le32dec(data + 16);
-	switch (md->md_version) {
-	case 0:
-	case 1:
-	case 2:
-		error = raid3_metadata_decode_v0v1v2(data, md);
-		break;
-	case 3:
-		error = raid3_metadata_decode_v3(data, md);
-		break;
-	case 4:
-	case 5:
-		error = raid3_metadata_decode_v4v5(data, md);
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-	return (error);
-}
-
-static __inline void
-raid3_metadata_dump(const struct g_raid3_metadata *md)
-{
-	static const char hex[] = "0123456789abcdef";
-	char hash[16 * 2 + 1];
-	u_int i;
-
-	printf("     magic: %s\n", md->md_magic);
-	printf("   version: %u\n", (u_int)md->md_version);
-	printf("      name: %s\n", md->md_name);
-	printf("        id: %u\n", (u_int)md->md_id);
-	printf("        no: %u\n", (u_int)md->md_no);
-	printf("       all: %u\n", (u_int)md->md_all);
-	printf("     genid: %u\n", (u_int)md->md_genid);
-	printf("    syncid: %u\n", (u_int)md->md_syncid);
-	printf(" mediasize: %jd\n", (intmax_t)md->md_mediasize);
-	printf("sectorsize: %u\n", (u_int)md->md_sectorsize);
-	printf("syncoffset: %jd\n", (intmax_t)md->md_sync_offset);
-	printf("    mflags:");
-	if (md->md_mflags == 0)
-		printf(" NONE");
-	else {
-		if ((md->md_mflags & G_RAID3_DEVICE_FLAG_NOAUTOSYNC) != 0)
-			printf(" NOAUTOSYNC");
-		if ((md->md_mflags & G_RAID3_DEVICE_FLAG_ROUND_ROBIN) != 0)
-			printf(" ROUND-ROBIN");
-		if ((md->md_mflags & G_RAID3_DEVICE_FLAG_VERIFY) != 0)
-			printf(" VERIFY");
-		if ((md->md_mflags & G_RAID3_DEVICE_FLAG_NOFAILSYNC) != 0)
-			printf(" NOFAILSYNC");
-	}
-	printf("\n");
-	printf("    dflags:");
-	if (md->md_dflags == 0)
-		printf(" NONE");
-	else {
-		if ((md->md_dflags & G_RAID3_DISK_FLAG_DIRTY) != 0)
-			printf(" DIRTY");
-		if ((md->md_dflags & G_RAID3_DISK_FLAG_SYNCHRONIZING) != 0)
-			printf(" SYNCHRONIZING");
-		if ((md->md_dflags & G_RAID3_DISK_FLAG_FORCE_SYNC) != 0)
-			printf(" FORCE_SYNC");
-	}
-	printf("\n");
-	printf("hcprovider: %s\n", md->md_provider);
-	printf("  provsize: %ju\n", (uintmax_t)md->md_provsize);
-	bzero(hash, sizeof(hash));
-	for (i = 0; i < 16; i++) {
-		hash[i * 2] = hex[md->md_hash[i] >> 4];
-		hash[i * 2 + 1] = hex[md->md_hash[i] & 0x0f];
-	}
-	printf("  MD5 hash: %s\n", hash);
-}
-#endif	/* !_G_RAID3_H_ */
diff --git a/include.new/geom/shsec/g_shsec.h b/include.new/geom/shsec/g_shsec.h
deleted file mode 100644
index 6b7a83d..0000000
--- a/include.new/geom/shsec/g_shsec.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 2005 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/shsec/g_shsec.h 155174 2006-02-01 12:06:01Z pjd $
- */
-
-#ifndef	_G_SHSEC_H_
-#define	_G_SHSEC_H_
-
-#include <sys/endian.h>
-
-#define	G_SHSEC_CLASS_NAME	"SHSEC"
-
-#define	G_SHSEC_MAGIC		"GEOM::SHSEC"
-/*
- * Version history:
- * 0 - Initial version number.
- * 1 - Added md_provsize field to metadata.
- */
-#define	G_SHSEC_VERSION	1
-
-#ifdef _KERNEL
-#define	G_SHSEC_BFLAG_FIRST	0x1
-
-#define	G_SHSEC_DEBUG(lvl, ...)	do {					\
-	if (g_shsec_debug >= (lvl)) {					\
-		printf("GEOM_SHSEC");					\
-		if (g_shsec_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_SHSEC_LOGREQ(lvl, bp, ...)	do {				\
-	if (g_shsec_debug >= (lvl)) {					\
-		printf("GEOM_SHSEC");					\
-		if (g_shsec_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-struct g_shsec_softc {
-	u_int		 sc_type;	/* provider type */
-	struct g_geom	*sc_geom;
-	struct g_provider *sc_provider;
-	uint32_t	 sc_id;		/* device unique ID */
-	struct g_consumer **sc_disks;
-	uint16_t	 sc_ndisks;
-};
-#define	sc_name	sc_geom->name
-#endif	/* _KERNEL */
-
-struct g_shsec_metadata {
-	char		md_magic[16];	/* Magic value. */
-	uint32_t	md_version;	/* Version number. */
-	char		md_name[16];	/* Stripe name. */
-	uint32_t	md_id;		/* Unique ID. */
-	uint16_t	md_no;		/* Disk number. */
-	uint16_t	md_all;		/* Number of all disks. */
-	char		md_provider[16]; /* Hardcoded provider. */
-	uint64_t	md_provsize;	/* Provider's size. */
-};
-static __inline void
-shsec_metadata_encode(const struct g_shsec_metadata *md, u_char *data)
-{
-
-	bcopy(md->md_magic, data, sizeof(md->md_magic));
-	le32enc(data + 16, md->md_version);
-	bcopy(md->md_name, data + 20, sizeof(md->md_name));
-	le32enc(data + 36, md->md_id);
-	le16enc(data + 40, md->md_no);
-	le16enc(data + 42, md->md_all);
-	bcopy(md->md_provider, data + 44, sizeof(md->md_provider));
-	le64enc(data + 60, md->md_provsize);
-}
-static __inline void
-shsec_metadata_decode(const u_char *data, struct g_shsec_metadata *md)
-{
-
-	bcopy(data, md->md_magic, sizeof(md->md_magic));
-	md->md_version = le32dec(data + 16);
-	bcopy(data + 20, md->md_name, sizeof(md->md_name));
-	md->md_id = le32dec(data + 36);
-	md->md_no = le16dec(data + 40);
-	md->md_all = le16dec(data + 42);
-	bcopy(data + 44, md->md_provider, sizeof(md->md_provider));
-	md->md_provsize = le64dec(data + 60);
-}
-#endif	/* _G_SHSEC_H_ */
diff --git a/include.new/geom/stripe/g_stripe.h b/include.new/geom/stripe/g_stripe.h
deleted file mode 100644
index d2fc390..0000000
--- a/include.new/geom/stripe/g_stripe.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * Copyright (c) 2004-2005 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/stripe/g_stripe.h 260385 2014-01-07 01:32:23Z scottl $
- */
-
-#ifndef	_G_STRIPE_H_
-#define	_G_STRIPE_H_
-
-#include <sys/endian.h>
-
-#define	G_STRIPE_CLASS_NAME	"STRIPE"
-
-#define	G_STRIPE_MAGIC		"GEOM::STRIPE"
-/*
- * Version history:
- * 0 - Initial version number.
- * 1 - Added 'stop' command for gstripe(8).
- * 2 - Added md_provider field to metadata and '-h' option for gstripe(8).
- * 3 - Added md_provsize field to metadata.
- */
-#define	G_STRIPE_VERSION	3
-
-#ifdef _KERNEL
-#define	G_STRIPE_TYPE_MANUAL	0
-#define	G_STRIPE_TYPE_AUTOMATIC	1
-
-#define	G_STRIPE_DEBUG(lvl, ...)	do {				\
-	if (g_stripe_debug >= (lvl)) {					\
-		printf("GEOM_STRIPE");					\
-		if (g_stripe_debug > 0)					\
-			printf("[%u]", lvl);				\
-		printf(": ");						\
-		printf(__VA_ARGS__);					\
-		printf("\n");						\
-	}								\
-} while (0)
-#define	G_STRIPE_LOGREQ(bp, ...)	do {				\
-	if (g_stripe_debug >= 2) {					\
-		printf("GEOM_STRIPE[2]: ");				\
-		printf(__VA_ARGS__);					\
-		printf(" ");						\
-		g_print_bio(bp);					\
-		printf("\n");						\
-	}								\
-} while (0)
-
-struct g_stripe_softc {
-	u_int		 sc_type;	/* provider type */
-	struct g_geom	*sc_geom;
-	struct g_provider *sc_provider;
-	uint32_t	 sc_id;		/* stripe unique ID */
-	struct g_consumer **sc_disks;
-	uint16_t	 sc_ndisks;
-	uint32_t	 sc_stripesize;
-	uint32_t	 sc_stripebits;
-	struct mtx	 sc_lock;
-};
-#define	sc_name	sc_geom->name
-#endif	/* _KERNEL */
-
-struct g_stripe_metadata {
-	char		md_magic[16];	/* Magic value. */
-	uint32_t	md_version;	/* Version number. */
-	char		md_name[16];	/* Stripe name. */
-	uint32_t	md_id;		/* Unique ID. */
-	uint16_t	md_no;		/* Disk number. */
-	uint16_t	md_all;		/* Number of all disks. */
-	uint32_t	md_stripesize;	/* Stripe size. */
-	char		md_provider[16]; /* Hardcoded provider. */
-	uint64_t	md_provsize;	/* Provider's size. */
-};
-static __inline void
-stripe_metadata_encode(const struct g_stripe_metadata *md, u_char *data)
-{
-
-	bcopy(md->md_magic, data, sizeof(md->md_magic));
-	le32enc(data + 16, md->md_version);
-	bcopy(md->md_name, data + 20, sizeof(md->md_name));
-	le32enc(data + 36, md->md_id);
-	le16enc(data + 40, md->md_no);
-	le16enc(data + 42, md->md_all);
-	le32enc(data + 44, md->md_stripesize);
-	bcopy(md->md_provider, data + 48, sizeof(md->md_provider));
-	le64enc(data + 64, md->md_provsize);
-}
-static __inline void
-stripe_metadata_decode(const u_char *data, struct g_stripe_metadata *md)
-{
-
-	bcopy(data, md->md_magic, sizeof(md->md_magic));
-	md->md_version = le32dec(data + 16);
-	bcopy(data + 20, md->md_name, sizeof(md->md_name));
-	md->md_id = le32dec(data + 36);
-	md->md_no = le16dec(data + 40);
-	md->md_all = le16dec(data + 42);
-	md->md_stripesize = le32dec(data + 44);
-	bcopy(data + 48, md->md_provider, sizeof(md->md_provider));
-	md->md_provsize = le64dec(data + 64);
-}
-
-#endif	/* _G_STRIPE_H_ */
diff --git a/include.new/geom/virstor/binstream.h b/include.new/geom/virstor/binstream.h
deleted file mode 100644
index 5bf6121..0000000
--- a/include.new/geom/virstor/binstream.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 2005 Ivan Voras <ivoras@gmail.com>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/virstor/binstream.h 172302 2007-09-23 07:34:23Z pjd $
- */
-
-// $Id: binstream.h,v 1.1 2006/07/05 10:47:54 ivoras Exp $
-
-
-#ifndef _BIN_STREAM_
-#define _BIN_STREAM_
-
-#ifndef uint8_t
-#define uint8_t unsigned char
-#endif
-
-typedef struct {
-	unsigned char  *data;
-	int		pos;
-}	bin_stream_t;
-
-
-/* "Open" a binary stream for reading */
-void		bs_open   (bin_stream_t * bs, void *data);
-
-/* "Reset" position in binary stream to zero */
-void		bs_reset  (bin_stream_t * bs);
-
-
-/* Write a zero-terminated string; return next position */
-unsigned	bs_write_str(bin_stream_t * bs, char *data);
-
-/* Write an arbitrary buffer; return next position */
-unsigned	bs_write_buf(bin_stream_t * bs, char *data, unsigned data_size);
-
-/* Write a 8bit uint; return next position. */
-unsigned	bs_write_u8(bin_stream_t * bs, uint8_t data);
-
-/* Write a 16bit uint; return next position. */
-unsigned	bs_write_u16(bin_stream_t * bs, uint16_t data);
-
-/* Write a 32bit uint; return next position. */
-unsigned	bs_write_u32(bin_stream_t * bs, uint32_t data);
-
-/* Write a 64bit uint; return next position. */
-unsigned	bs_write_u64(bin_stream_t * bs, uint64_t data);
-
-
-/*
- * Read a null-terminated string from stream into a buffer; buf_size is size
- * of the buffer, including the final \0. Returns buf pointer or NULL if
- * garbage input.
- */
-char           *bs_read_str(bin_stream_t * bs, char *buf, unsigned buf_size);
-
-/* Read an arbitrary buffer. */
-void		bs_read_buf(bin_stream_t * bs, char *buf, unsigned buf_size);
-
-/* Read a 8bit uint * return it */
-uint8_t		bs_read_u8(bin_stream_t * bs);
-
-/* Read a 16bit uint * return it */
-uint16_t	bs_read_u16(bin_stream_t * bs);
-
-/* Read a 8bit uint * return it */
-uint32_t	bs_read_u32(bin_stream_t * bs);
-
-/* Read a 8bit uint * return it */
-uint64_t	bs_read_u64(bin_stream_t * bs);
-
-#endif
diff --git a/include.new/geom/virstor/g_virstor.h b/include.new/geom/virstor/g_virstor.h
deleted file mode 100644
index 0535b8a..0000000
--- a/include.new/geom/virstor/g_virstor.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (c) 2006-2007 Ivan Voras <ivoras@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/virstor/g_virstor.h 172302 2007-09-23 07:34:23Z pjd $
- */
-
-#ifndef _G_VIRSTOR_H_
-#define _G_VIRSTOR_H_
-
-#define	G_VIRSTOR_CLASS_NAME "VIRSTOR"
-
-
-#define VIRSTOR_MAP_ALLOCATED 1
-struct virstor_map_entry {
-	uint16_t	flags;
-	uint16_t	provider_no;
-	uint32_t	provider_chunk;
-};
-
-#define	VIRSTOR_MAP_ENTRY_SIZE (sizeof(struct virstor_map_entry))
-#define	VIRSTOR_MAP_BLOCK_ENTRIES (MAXPHYS / VIRSTOR_MAP_ENTRY_SIZE)
-/* Struct size is guarded by CTASSERT in main source */
-
-#ifdef _KERNEL
-
-#define	LOG_MSG(lvl, ...)       do {					\
-        if (g_virstor_debug >= (lvl)) {					\
-                printf("GEOM_" G_VIRSTOR_CLASS_NAME);			\
-                if (lvl > 0)						\
-                        printf("[%u]", lvl);				\
-                printf(": ");						\
-                printf(__VA_ARGS__);					\
-                printf("\n");						\
-        }								\
-} while (0)
-#define	LOG_MESSAGE LOG_MSG
-
-#define	LOG_REQ(lvl, bp, ...)  do {					\
-        if (g_virstor_debug >= (lvl)) {					\
-                printf("GEOM_" G_VIRSTOR_CLASS_NAME);			\
-                if (lvl > 0)						\
-                        printf("[%u]", lvl);				\
-                printf(": ");						\
-                printf(__VA_ARGS__);					\
-                printf(" ");						\
-                g_print_bio(bp);					\
-                printf("\n");						\
-        }								\
-} while (0)
-#define	LOG_REQUEST LOG_REQ
-
-/* "critical" system announcements (e.g. "geom is up") */
-#define	LVL_ANNOUNCE	0
-/* errors */
-#define	LVL_ERROR	1
-/* warnings */
-#define	LVL_WARNING	2
-/* info, noncritical for system operation (user doesn't have to see it */
-#define	LVL_INFO	5
-/* debug info */
-#define	LVL_DEBUG	10
-/* more debug info */
-#define	LVL_DEBUG2	12
-/* superfluous debug info (large volumes of data) */
-#define	LVL_MOREDEBUG	15
-
-
-/* Component data */
-struct g_virstor_component {
-	struct g_consumer	*gcons;
-	struct g_virstor_softc	*sc;
-	unsigned int		 index;		/* Component index in array */
-	unsigned int		 chunk_count;
-	unsigned int		 chunk_next;
-	unsigned int		 chunk_reserved;
-	unsigned int		 flags;
-};
-
-
-/* Internal geom instance data */
-struct g_virstor_softc {
-	struct g_geom		*geom;
-	struct g_provider	*provider;
-	struct g_virstor_component *components;
-	u_int			 n_components;
-	u_int			 curr_component; /* Component currently used */
-	uint32_t		 id;		/* Unique ID of this geom */
-	off_t			 virsize;	/* Total size of virstor */
-	off_t			 sectorsize;
-	size_t			 chunk_size;
-	size_t			 chunk_count;	/* governs map_size */
-	struct virstor_map_entry *map;
-	size_t			 map_size;	/* (in bytes) */
-	size_t			 map_sectors;	/* Size of map in sectors */
-	size_t			 me_per_sector;	/* # map entries in a sector */
-	STAILQ_HEAD(, g_virstor_bio_q)	 delayed_bio_q;	/* Queue of delayed BIOs */
-	struct mtx		 delayed_bio_q_mtx;
-};
-
-/* "delayed BIOs" Queue element */
-struct g_virstor_bio_q {
-	struct bio		*bio;
-	STAILQ_ENTRY(g_virstor_bio_q) linkage;
-};
-
-
-#endif	/* _KERNEL */
-
-#ifndef _PATH_DEV
-#define _PATH_DEV "/dev/"
-#endif
-
-#endif	/* !_G_VIRSTOR_H_ */
diff --git a/include.new/geom/virstor/g_virstor_md.h b/include.new/geom/virstor/g_virstor_md.h
deleted file mode 100644
index 29a57e1..0000000
--- a/include.new/geom/virstor/g_virstor_md.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 2005 Ivan Voras <ivoras@gmail.com>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/geom/virstor/g_virstor_md.h 172302 2007-09-23 07:34:23Z pjd $
- */
-
-
-#ifndef _G_VIRSTOR_MD_H_
-#define _G_VIRSTOR_MD_H_
-
-/*
- * Metadata declaration
- */
-
-#define	G_VIRSTOR_MAGIC		"GEOM::VIRSTOR"
-#define	G_VIRSTOR_VERSION	1
-
-/* flag: provider is allocated */
-#define	VIRSTOR_PROVIDER_ALLOCATED	1
-/* flag: provider is currently being filled (usually it's the last
- * provider with VIRSTOR_PROVIDER_ALLOCATED flag */
-#define VIRSTOR_PROVIDER_CURRENT	2
-
-struct g_virstor_metadata {
-	/* Data global to the virstor device */
-	char		md_magic[16];		/* Magic value. */
-	uint32_t	md_version;		/* Version number. */
-	char		md_name[16];		/* Device name (e.g. "mydata") */
-	uint32_t	md_id;			/* Unique ID. */
-	uint64_t	md_virsize;		/* Virtual device's size */
-	uint32_t	md_chunk_size;		/* Chunk size in bytes */
-	uint16_t	md_count;		/* Total number of providers */
-
-	/* Data local to this provider */
-	char		provider[16];		/* Hardcoded provider name */
-	uint16_t	no;			/* Provider number/index */
-	uint64_t	provsize;		/* Provider's size */
-	uint32_t	chunk_count;		/* Number of chunks in this pr. */
-	uint32_t	chunk_next;		/* Next chunk to allocate */
-	uint16_t	chunk_reserved;		/* Count of "reserved" chunks */
-	uint16_t	flags;			/* Provider's flags */
-};
-
-void virstor_metadata_encode(struct g_virstor_metadata *md, unsigned char *data);
-void virstor_metadata_decode(unsigned char *data, struct g_virstor_metadata *md);
-
-#endif	/* !_G_VIRSTOR_H_ */
diff --git a/include.new/getarg.h b/include.new/getarg.h
deleted file mode 100644
index 1065c7c..0000000
--- a/include.new/getarg.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1997 - 2002 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef __GETARG_H__
-#define __GETARG_H__
-
-#include <stddef.h>
-
-#ifndef ROKEN_LIB_FUNCTION
-#ifdef _WIN32
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL     __cdecl
-#else
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#endif
-#endif
-
-struct getargs{
-    const char *long_name;
-    char short_name;
-    enum { arg_integer,
-	   arg_string,
-	   arg_flag,
-	   arg_negative_flag,
-	   arg_strings,
-	   arg_double,
-	   arg_collect,
-	   arg_counter
-    } type;
-    void *value;
-    const char *help;
-    const char *arg_help;
-};
-
-enum {
-    ARG_ERR_NO_MATCH  = 1,
-    ARG_ERR_BAD_ARG,
-    ARG_ERR_NO_ARG
-};
-
-typedef struct getarg_strings {
-    int num_strings;
-    char **strings;
-} getarg_strings;
-
-typedef int (*getarg_collect_func)(int short_opt,
-				   int argc,
-				   char **argv,
-				   int *goptind,
-				   int *goptarg,
-				   void *data);
-
-typedef struct getarg_collect_info {
-    getarg_collect_func func;
-    void *data;
-} getarg_collect_info;
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-getarg(struct getargs *args, size_t num_args,
-       int argc, char **argv, int *goptind);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-arg_printusage (struct getargs *args,
-		size_t num_args,
-		const char *progname,
-		const char *extra_string);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-arg_printusage_i18n (struct getargs *args,
-		     size_t num_args,
-		     const char *usage,
-		     const char *progname,
-		     const char *extra_string,
-		     char *(*i18n)(const char *));
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-free_getarg_strings (getarg_strings *);
-
-#endif /* __GETARG_H__ */
diff --git a/include.new/getopt.h b/include.new/getopt.h
deleted file mode 100644
index 1341226..0000000
--- a/include.new/getopt.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $	*/
-/*	$FreeBSD: releng/10.2/include/getopt.h 203963 2010-02-16 19:28:10Z imp $ */
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron and Thomas Klausner.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _GETOPT_H_
-#define _GETOPT_H_
-
-#include <sys/cdefs.h>
-
-/*
- * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
- * getopt() is declared here too for GNU programs.
- */
-#define no_argument        0
-#define required_argument  1
-#define optional_argument  2
-
-struct option {
-	/* name of long option */
-	const char *name;
-	/*
-	 * one of no_argument, required_argument, and optional_argument:
-	 * whether option takes an argument
-	 */
-	int has_arg;
-	/* if not NULL, set *flag to val when option found */
-	int *flag;
-	/* if flag not NULL, value to set *flag to; else return value */
-	int val;
-};
-
-__BEGIN_DECLS
-int	getopt_long(int, char * const *, const char *,
-	const struct option *, int *);
-int	getopt_long_only(int, char * const *, const char *,
-	const struct option *, int *);
-#ifndef _GETOPT_DECLARED
-#define	_GETOPT_DECLARED
-int	 getopt(int, char * const [], const char *);
-
-extern char *optarg;			/* getopt(3) external variables */
-extern int optind, opterr, optopt;
-#endif
-#ifndef _OPTRESET_DECLARED
-#define	_OPTRESET_DECLARED
-extern int optreset;			/* getopt(3) external variable */
-#endif
-__END_DECLS
- 
-#endif /* !_GETOPT_H_ */
diff --git a/include.new/glob.h b/include.new/glob.h
deleted file mode 100644
index 487a24f..0000000
--- a/include.new/glob.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * 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. 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.
- *
- *	@(#)glob.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/glob.h 228754 2011-12-20 22:56:13Z eadler $
- */
-
-#ifndef _GLOB_H_
-#define	_GLOB_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef	_SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-struct stat;
-typedef struct {
-	size_t gl_pathc;	/* Count of total paths so far. */
-	size_t gl_matchc;	/* Count of paths matching pattern. */
-	size_t gl_offs;		/* Reserved at beginning of gl_pathv. */
-	int gl_flags;		/* Copy of flags parameter to glob. */
-	char **gl_pathv;	/* List of paths matching pattern. */
-				/* Copy of errfunc parameter to glob. */
-	int (*gl_errfunc)(const char *, int);
-
-	/*
-	 * Alternate filesystem access methods for glob; replacement
-	 * versions of closedir(3), readdir(3), opendir(3), stat(2)
-	 * and lstat(2).
-	 */
-	void (*gl_closedir)(void *);
-	struct dirent *(*gl_readdir)(void *);
-	void *(*gl_opendir)(const char *);
-	int (*gl_lstat)(const char *, struct stat *);
-	int (*gl_stat)(const char *, struct stat *);
-} glob_t;
-
-#if __POSIX_VISIBLE >= 199209
-/* Believed to have been introduced in 1003.2-1992 */
-#define	GLOB_APPEND	0x0001	/* Append to output from previous call. */
-#define	GLOB_DOOFFS	0x0002	/* Use gl_offs. */
-#define	GLOB_ERR	0x0004	/* Return on error. */
-#define	GLOB_MARK	0x0008	/* Append / to matching directories. */
-#define	GLOB_NOCHECK	0x0010	/* Return pattern itself if nothing matches. */
-#define	GLOB_NOSORT	0x0020	/* Don't sort. */
-#define	GLOB_NOESCAPE	0x2000	/* Disable backslash escaping. */
-
-/* Error values returned by glob(3) */
-#define	GLOB_NOSPACE	(-1)	/* Malloc call failed. */
-#define	GLOB_ABORTED	(-2)	/* Unignored error. */
-#define	GLOB_NOMATCH	(-3)	/* No match and GLOB_NOCHECK was not set. */
-#define	GLOB_NOSYS	(-4)	/* Obsolete: source comptability only. */
-#endif /* __POSIX_VISIBLE >= 199209 */
-
-#if __BSD_VISIBLE
-#define	GLOB_ALTDIRFUNC	0x0040	/* Use alternately specified directory funcs. */
-#define	GLOB_BRACE	0x0080	/* Expand braces ala csh. */
-#define	GLOB_MAGCHAR	0x0100	/* Pattern had globbing characters. */
-#define	GLOB_NOMAGIC	0x0200	/* GLOB_NOCHECK without magic chars (csh). */
-#define	GLOB_QUOTE	0x0400	/* Quote special chars with \. */
-#define	GLOB_TILDE	0x0800	/* Expand tilde names from the passwd file. */
-#define	GLOB_LIMIT	0x1000	/* limit number of returned paths */
-
-/* source compatibility, these are the old names */
-#define GLOB_MAXPATH	GLOB_LIMIT
-#define	GLOB_ABEND	GLOB_ABORTED
-#endif /* __BSD_VISIBLE */
-
-__BEGIN_DECLS
-int	glob(const char * __restrict, int,
-	int (*)(const char *, int), glob_t * __restrict);
-void	globfree(glob_t *);
-__END_DECLS
-
-#endif /* !_GLOB_H_ */
diff --git a/include.new/gnu/posix/regex.h b/include.new/gnu/posix/regex.h
deleted file mode 100644
index 469a22b..0000000
--- a/include.new/gnu/posix/regex.h
+++ /dev/null
@@ -1,582 +0,0 @@
-/* Definitions for data structures and routines for the regular
-   expression library.
-   Copyright (C) 1985,1989-93,1995-98,2000,2001,2002,2003,2005,2006,2008,2011
-   Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#ifndef _REGEX_H
-#define _REGEX_H 1
-
-#include <sys/types.h>
-
-/* Allow the use in C++ code.  */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* The following two types have to be signed and unsigned integer type
-   wide enough to hold a value of a pointer.  For most ANSI compilers
-   ptrdiff_t and size_t should be likely OK.  Still size of these two
-   types is 2 for Microsoft C.  Ugh... */
-typedef long int s_reg_t;
-typedef unsigned long int active_reg_t;
-
-/* The following bits are used to determine the regexp syntax we
-   recognize.  The set/not-set meanings are chosen so that Emacs syntax
-   remains the value 0.  The bits are given in alphabetical order, and
-   the definitions shifted by one from the previous bit; thus, when we
-   add or remove a bit, only one other definition need change.  */
-typedef unsigned long int reg_syntax_t;
-
-#ifdef __USE_GNU
-/* If this bit is not set, then \ inside a bracket expression is literal.
-   If set, then such a \ quotes the following character.  */
-# define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
-
-/* If this bit is not set, then + and ? are operators, and \+ and \? are
-     literals.
-   If set, then \+ and \? are operators and + and ? are literals.  */
-# define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
-
-/* If this bit is set, then character classes are supported.  They are:
-     [:alpha:], [:upper:], [:lower:],  [:digit:], [:alnum:], [:xdigit:],
-     [:space:], [:print:], [:punct:], [:graph:], and [:cntrl:].
-   If not set, then character classes are not supported.  */
-# define RE_CHAR_CLASSES (RE_BK_PLUS_QM << 1)
-
-/* If this bit is set, then ^ and $ are always anchors (outside bracket
-     expressions, of course).
-   If this bit is not set, then it depends:
-	^  is an anchor if it is at the beginning of a regular
-	   expression or after an open-group or an alternation operator;
-	$  is an anchor if it is at the end of a regular expression, or
-	   before a close-group or an alternation operator.
-
-   This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
-   POSIX draft 11.2 says that * etc. in leading positions is undefined.
-   We already implemented a previous draft which made those constructs
-   invalid, though, so we haven't changed the code back.  */
-# define RE_CONTEXT_INDEP_ANCHORS (RE_CHAR_CLASSES << 1)
-
-/* If this bit is set, then special characters are always special
-     regardless of where they are in the pattern.
-   If this bit is not set, then special characters are special only in
-     some contexts; otherwise they are ordinary.  Specifically,
-     * + ? and intervals are only special when not after the beginning,
-     open-group, or alternation operator.  */
-# define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
-
-/* If this bit is set, then *, +, ?, and { cannot be first in an re or
-     immediately after an alternation or begin-group operator.  */
-# define RE_CONTEXT_INVALID_OPS (RE_CONTEXT_INDEP_OPS << 1)
-
-/* If this bit is set, then . matches newline.
-   If not set, then it doesn't.  */
-# define RE_DOT_NEWLINE (RE_CONTEXT_INVALID_OPS << 1)
-
-/* If this bit is set, then . doesn't match NUL.
-   If not set, then it does.  */
-# define RE_DOT_NOT_NULL (RE_DOT_NEWLINE << 1)
-
-/* If this bit is set, nonmatching lists [^...] do not match newline.
-   If not set, they do.  */
-# define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
-
-/* If this bit is set, either \{...\} or {...} defines an
-     interval, depending on RE_NO_BK_BRACES.
-   If not set, \{, \}, {, and } are literals.  */
-# define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
-
-/* If this bit is set, +, ? and | aren't recognized as operators.
-   If not set, they are.  */
-# define RE_LIMITED_OPS (RE_INTERVALS << 1)
-
-/* If this bit is set, newline is an alternation operator.
-   If not set, newline is literal.  */
-# define RE_NEWLINE_ALT (RE_LIMITED_OPS << 1)
-
-/* If this bit is set, then `{...}' defines an interval, and \{ and \}
-     are literals.
-  If not set, then `\{...\}' defines an interval.  */
-# define RE_NO_BK_BRACES (RE_NEWLINE_ALT << 1)
-
-/* If this bit is set, (...) defines a group, and \( and \) are literals.
-   If not set, \(...\) defines a group, and ( and ) are literals.  */
-# define RE_NO_BK_PARENS (RE_NO_BK_BRACES << 1)
-
-/* If this bit is set, then \<digit> matches <digit>.
-   If not set, then \<digit> is a back-reference.  */
-# define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
-
-/* If this bit is set, then | is an alternation operator, and \| is literal.
-   If not set, then \| is an alternation operator, and | is literal.  */
-# define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
-
-/* If this bit is set, then an ending range point collating higher
-     than the starting range point, as in [z-a], is invalid.
-   If not set, then when ending range point collates higher than the
-     starting range point, the range is ignored.  */
-# define RE_NO_EMPTY_RANGES (RE_NO_BK_VBAR << 1)
-
-/* If this bit is set, then an unmatched ) is ordinary.
-   If not set, then an unmatched ) is invalid.  */
-# define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
-
-/* If this bit is set, succeed as soon as we match the whole pattern,
-   without further backtracking.  */
-# define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
-
-/* If this bit is set, do not process the GNU regex operators.
-   If not set, then the GNU regex operators are recognized. */
-# define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
-
-/* If this bit is set, turn on internal regex debugging.
-   If not set, and debugging was on, turn it off.
-   This only works if regex.c is compiled -DDEBUG.
-   We define this bit always, so that all that's needed to turn on
-   debugging is to recompile regex.c; the calling code can always have
-   this bit set, and it won't affect anything in the normal case. */
-# define RE_DEBUG (RE_NO_GNU_OPS << 1)
-
-/* If this bit is set, a syntactically invalid interval is treated as
-   a string of ordinary characters.  For example, the ERE 'a{1' is
-   treated as 'a\{1'.  */
-# define RE_INVALID_INTERVAL_ORD (RE_DEBUG << 1)
-
-/* If this bit is set, then ignore case when matching.
-   If not set, then case is significant.  */
-# define RE_ICASE (RE_INVALID_INTERVAL_ORD << 1)
-
-/* This bit is used internally like RE_CONTEXT_INDEP_ANCHORS but only
-   for ^, because it is difficult to scan the regex backwards to find
-   whether ^ should be special.  */
-# define RE_CARET_ANCHORS_HERE (RE_ICASE << 1)
-
-/* If this bit is set, then \{ cannot be first in an bre or
-   immediately after an alternation or begin-group operator.  */
-# define RE_CONTEXT_INVALID_DUP (RE_CARET_ANCHORS_HERE << 1)
-
-/* If this bit is set, then no_sub will be set to 1 during
-   re_compile_pattern.  */
-# define RE_NO_SUB (RE_CONTEXT_INVALID_DUP << 1)
-#endif
-
-/* This global variable defines the particular regexp syntax to use (for
-   some interfaces).  When a regexp is compiled, the syntax used is
-   stored in the pattern buffer, so changing this does not affect
-   already-compiled regexps.  */
-extern reg_syntax_t re_syntax_options;
-
-#ifdef __USE_GNU
-/* Define combinations of the above bits for the standard possibilities.
-   (The [[[ comments delimit what gets put into the Texinfo file, so
-   don't delete them!)  */
-/* [[[begin syntaxes]]] */
-#define RE_SYNTAX_EMACS 0
-
-#define RE_SYNTAX_AWK							\
-  (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL			\
-   | RE_NO_BK_PARENS              | RE_NO_BK_REFS			\
-   | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES			\
-   | RE_DOT_NEWLINE		  | RE_CONTEXT_INDEP_ANCHORS		\
-   | RE_CHAR_CLASSES							\
-   | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
-
-#define RE_SYNTAX_GNU_AWK						\
-  ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
-    | RE_INVALID_INTERVAL_ORD)						\
-   & ~(RE_DOT_NOT_NULL | RE_CONTEXT_INDEP_OPS				\
-      | RE_CONTEXT_INVALID_OPS ))
-
-#define RE_SYNTAX_POSIX_AWK						\
-  (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS		\
-   | RE_INTERVALS	    | RE_NO_GNU_OPS				\
-   | RE_INVALID_INTERVAL_ORD)
-
-#define RE_SYNTAX_GREP							\
-  (RE_BK_PLUS_QM              | RE_CHAR_CLASSES				\
-   | RE_HAT_LISTS_NOT_NEWLINE | RE_INTERVALS				\
-   | RE_NEWLINE_ALT)
-
-#define RE_SYNTAX_EGREP							\
-  (RE_CHAR_CLASSES        | RE_CONTEXT_INDEP_ANCHORS			\
-   | RE_CONTEXT_INDEP_OPS | RE_HAT_LISTS_NOT_NEWLINE			\
-   | RE_NEWLINE_ALT       | RE_NO_BK_PARENS				\
-   | RE_NO_BK_VBAR)
-
-#define RE_SYNTAX_POSIX_EGREP						\
-  (RE_SYNTAX_EGREP | RE_INTERVALS | RE_NO_BK_BRACES			\
-   | RE_INVALID_INTERVAL_ORD)
-
-/* P1003.2/D11.2, section 4.20.7.1, lines 5078ff.  */
-#define RE_SYNTAX_ED RE_SYNTAX_POSIX_BASIC
-
-#define RE_SYNTAX_SED RE_SYNTAX_POSIX_BASIC
-
-/* Syntax bits common to both basic and extended POSIX regex syntax.  */
-#define _RE_SYNTAX_POSIX_COMMON						\
-  (RE_CHAR_CLASSES | RE_DOT_NEWLINE      | RE_DOT_NOT_NULL		\
-   | RE_INTERVALS  | RE_NO_EMPTY_RANGES)
-
-#define RE_SYNTAX_POSIX_BASIC						\
-  (_RE_SYNTAX_POSIX_COMMON | RE_BK_PLUS_QM | RE_CONTEXT_INVALID_DUP)
-
-/* Differs from ..._POSIX_BASIC only in that RE_BK_PLUS_QM becomes
-   RE_LIMITED_OPS, i.e., \? \+ \| are not recognized.  Actually, this
-   isn't minimal, since other operators, such as \`, aren't disabled.  */
-#define RE_SYNTAX_POSIX_MINIMAL_BASIC					\
-  (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
-
-#define RE_SYNTAX_POSIX_EXTENDED					\
-  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
-   | RE_CONTEXT_INDEP_OPS   | RE_NO_BK_BRACES				\
-   | RE_NO_BK_PARENS        | RE_NO_BK_VBAR				\
-   | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD)
-
-/* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is
-   removed and RE_NO_BK_REFS is added.  */
-#define RE_SYNTAX_POSIX_MINIMAL_EXTENDED				\
-  (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS			\
-   | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES				\
-   | RE_NO_BK_PARENS        | RE_NO_BK_REFS				\
-   | RE_NO_BK_VBAR	    | RE_UNMATCHED_RIGHT_PAREN_ORD)
-/* [[[end syntaxes]]] */
-
-/* Maximum number of duplicates an interval can allow.  Some systems
-   (erroneously) define this in other header files, but we want our
-   value, so remove any previous define.  */
-# ifdef RE_DUP_MAX
-#  undef RE_DUP_MAX
-# endif
-/* If sizeof(int) == 2, then ((1 << 15) - 1) overflows.  */
-# define RE_DUP_MAX (0x7fff)
-#endif
-
-
-/* POSIX `cflags' bits (i.e., information for `regcomp').  */
-
-/* If this bit is set, then use extended regular expression syntax.
-   If not set, then use basic regular expression syntax.  */
-#define REG_EXTENDED 1
-
-/* If this bit is set, then ignore case when matching.
-   If not set, then case is significant.  */
-#define REG_ICASE (REG_EXTENDED << 1)
-
-/* If this bit is set, then anchors do not match at newline
-     characters in the string.
-   If not set, then anchors do match at newlines.  */
-#define REG_NEWLINE (REG_ICASE << 1)
-
-/* If this bit is set, then report only success or fail in regexec.
-   If not set, then returns differ between not matching and errors.  */
-#define REG_NOSUB (REG_NEWLINE << 1)
-
-
-/* POSIX `eflags' bits (i.e., information for regexec).  */
-
-/* If this bit is set, then the beginning-of-line operator doesn't match
-     the beginning of the string (presumably because it's not the
-     beginning of a line).
-   If not set, then the beginning-of-line operator does match the
-     beginning of the string.  */
-#define REG_NOTBOL 1
-
-/* Like REG_NOTBOL, except for the end-of-line.  */
-#define REG_NOTEOL (1 << 1)
-
-/* Use PMATCH[0] to delimit the start and end of the search in the
-   buffer.  */
-#define REG_STARTEND (1 << 2)
-
-
-/* If any error codes are removed, changed, or added, update the
-   `re_error_msg' table in regex.c.  */
-typedef enum
-{
-#if defined _XOPEN_SOURCE || defined __USE_XOPEN2K
-  REG_ENOSYS = -1,	/* This will never happen for this implementation.  */
-#endif
-
-  REG_NOERROR = 0,	/* Success.  */
-  REG_NOMATCH,		/* Didn't find a match (for regexec).  */
-
-  /* POSIX regcomp return error codes.  (In the order listed in the
-     standard.)  */
-  REG_BADPAT,		/* Invalid pattern.  */
-  REG_ECOLLATE,		/* Inalid collating element.  */
-  REG_ECTYPE,		/* Invalid character class name.  */
-  REG_EESCAPE,		/* Trailing backslash.  */
-  REG_ESUBREG,		/* Invalid back reference.  */
-  REG_EBRACK,		/* Unmatched left bracket.  */
-  REG_EPAREN,		/* Parenthesis imbalance.  */
-  REG_EBRACE,		/* Unmatched \{.  */
-  REG_BADBR,		/* Invalid contents of \{\}.  */
-  REG_ERANGE,		/* Invalid range end.  */
-  REG_ESPACE,		/* Ran out of memory.  */
-  REG_BADRPT,		/* No preceding re for repetition op.  */
-
-  /* Error codes we've added.  */
-  REG_EEND,		/* Premature end.  */
-  REG_ESIZE,		/* Compiled pattern bigger than 2^16 bytes.  */
-  REG_ERPAREN		/* Unmatched ) or \); not returned from regcomp.  */
-} reg_errcode_t;
-
-/* This data structure represents a compiled pattern.  Before calling
-   the pattern compiler, the fields `buffer', `allocated', `fastmap',
-   and `translate' can be set.  After the pattern has been compiled,
-   the fields `re_nsub', `not_bol' and `not_eol' are available.  All
-   other fields are private to the regex routines.  */
-
-#ifndef RE_TRANSLATE_TYPE
-# define __RE_TRANSLATE_TYPE unsigned char *
-# ifdef __USE_GNU
-#  define RE_TRANSLATE_TYPE __RE_TRANSLATE_TYPE
-# endif
-#endif
-
-#ifdef __USE_GNU
-# define __REPB_PREFIX(name) name
-#else
-# define __REPB_PREFIX(name) __##name
-#endif
-
-struct re_pattern_buffer
-{
-  /* Space that holds the compiled pattern.  It is declared as
-     `unsigned char *' because its elements are sometimes used as
-     array indexes.  */
-  unsigned char *__REPB_PREFIX(buffer);
-
-  /* Number of bytes to which `buffer' points.  */
-  unsigned long int __REPB_PREFIX(allocated);
-
-  /* Number of bytes actually used in `buffer'.  */
-  unsigned long int __REPB_PREFIX(used);
-
-  /* Syntax setting with which the pattern was compiled.  */
-  reg_syntax_t __REPB_PREFIX(syntax);
-
-  /* Pointer to a fastmap, if any, otherwise zero.  re_search uses the
-     fastmap, if there is one, to skip over impossible starting points
-     for matches.  */
-  char *__REPB_PREFIX(fastmap);
-
-  /* Either a translate table to apply to all characters before
-     comparing them, or zero for no translation.  The translation is
-     applied to a pattern when it is compiled and to a string when it
-     is matched.  */
-  __RE_TRANSLATE_TYPE __REPB_PREFIX(translate);
-
-  /* Number of subexpressions found by the compiler.  */
-  size_t re_nsub;
-
-  /* Zero if this pattern cannot match the empty string, one else.
-     Well, in truth it's used only in `re_search_2', to see whether or
-     not we should use the fastmap, so we don't set this absolutely
-     perfectly; see `re_compile_fastmap' (the `duplicate' case).  */
-  unsigned __REPB_PREFIX(can_be_null) : 1;
-
-  /* If REGS_UNALLOCATED, allocate space in the `regs' structure
-     for `max (RE_NREGS, re_nsub + 1)' groups.
-     If REGS_REALLOCATE, reallocate space if necessary.
-     If REGS_FIXED, use what's there.  */
-#ifdef __USE_GNU
-# define REGS_UNALLOCATED 0
-# define REGS_REALLOCATE 1
-# define REGS_FIXED 2
-#endif
-  unsigned __REPB_PREFIX(regs_allocated) : 2;
-
-  /* Set to zero when `regex_compile' compiles a pattern; set to one
-     by `re_compile_fastmap' if it updates the fastmap.  */
-  unsigned __REPB_PREFIX(fastmap_accurate) : 1;
-
-  /* If set, `re_match_2' does not return information about
-     subexpressions.  */
-  unsigned __REPB_PREFIX(no_sub) : 1;
-
-  /* If set, a beginning-of-line anchor doesn't match at the beginning
-     of the string.  */
-  unsigned __REPB_PREFIX(not_bol) : 1;
-
-  /* Similarly for an end-of-line anchor.  */
-  unsigned __REPB_PREFIX(not_eol) : 1;
-
-  /* If true, an anchor at a newline matches.  */
-  unsigned __REPB_PREFIX(newline_anchor) : 1;
-};
-
-typedef struct re_pattern_buffer regex_t;
-
-/* Type for byte offsets within the string.  POSIX mandates this.  */
-typedef int regoff_t;
-
-
-#ifdef __USE_GNU
-/* This is the structure we store register match data in.  See
-   regex.texinfo for a full description of what registers match.  */
-struct re_registers
-{
-  unsigned num_regs;
-  regoff_t *start;
-  regoff_t *end;
-};
-
-
-/* If `regs_allocated' is REGS_UNALLOCATED in the pattern buffer,
-   `re_match_2' returns information about at least this many registers
-   the first time a `regs' structure is passed.  */
-# ifndef RE_NREGS
-#  define RE_NREGS 30
-# endif
-#endif
-
-
-/* POSIX specification for registers.  Aside from the different names than
-   `re_registers', POSIX uses an array of structures, instead of a
-   structure of arrays.  */
-typedef struct
-{
-  regoff_t rm_so;  /* Byte offset from string's start to substring's start.  */
-  regoff_t rm_eo;  /* Byte offset from string's start to substring's end.  */
-} regmatch_t;
-
-/* Declarations for routines.  */
-
-#ifdef __USE_GNU
-/* Sets the current default syntax to SYNTAX, and return the old syntax.
-   You can also simply assign to the `re_syntax_options' variable.  */
-extern reg_syntax_t re_set_syntax (reg_syntax_t __syntax);
-
-/* Compile the regular expression PATTERN, with length LENGTH
-   and syntax given by the global `re_syntax_options', into the buffer
-   BUFFER.  Return NULL if successful, and an error string if not.
-
-   To free the allocated storage, you must call `regfree' on BUFFER.
-   Note that the translate table must either have been initialised by
-   `regcomp', with a malloc'ed value, or set to NULL before calling
-   `regfree'.  */
-extern const char *re_compile_pattern (const char *__pattern, size_t __length,
-				       struct re_pattern_buffer *__buffer);
-
-
-/* Compile a fastmap for the compiled pattern in BUFFER; used to
-   accelerate searches.  Return 0 if successful and -2 if was an
-   internal error.  */
-extern int re_compile_fastmap (struct re_pattern_buffer *__buffer);
-
-
-/* Search in the string STRING (with length LENGTH) for the pattern
-   compiled into BUFFER.  Start searching at position START, for RANGE
-   characters.  Return the starting position of the match, -1 for no
-   match, or -2 for an internal error.  Also return register
-   information in REGS (if REGS and BUFFER->no_sub are nonzero).  */
-extern int re_search (struct re_pattern_buffer *__buffer, const char *__string,
-		      int __length, int __start, int __range,
-		      struct re_registers *__regs);
-
-
-/* Like `re_search', but search in the concatenation of STRING1 and
-   STRING2.  Also, stop searching at index START + STOP.  */
-extern int re_search_2 (struct re_pattern_buffer *__buffer,
-			const char *__string1, int __length1,
-			const char *__string2, int __length2, int __start,
-			int __range, struct re_registers *__regs, int __stop);
-
-
-/* Like `re_search', but return how many characters in STRING the regexp
-   in BUFFER matched, starting at position START.  */
-extern int re_match (struct re_pattern_buffer *__buffer, const char *__string,
-		     int __length, int __start, struct re_registers *__regs);
-
-
-/* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
-extern int re_match_2 (struct re_pattern_buffer *__buffer,
-		       const char *__string1, int __length1,
-		       const char *__string2, int __length2, int __start,
-		       struct re_registers *__regs, int __stop);
-
-
-/* Set REGS to hold NUM_REGS registers, storing them in STARTS and
-   ENDS.  Subsequent matches using BUFFER and REGS will use this memory
-   for recording register information.  STARTS and ENDS must be
-   allocated with malloc, and must each be at least `NUM_REGS * sizeof
-   (regoff_t)' bytes long.
-
-   If NUM_REGS == 0, then subsequent matches should allocate their own
-   register data.
-
-   Unless this function is called, the first search or match using
-   PATTERN_BUFFER will allocate its own register data, without
-   freeing the old data.  */
-extern void re_set_registers (struct re_pattern_buffer *__buffer,
-			      struct re_registers *__regs,
-			      unsigned int __num_regs,
-			      regoff_t *__starts, regoff_t *__ends);
-#endif	/* Use GNU */
-
-#if defined _REGEX_RE_COMP || (defined _LIBC && defined __USE_BSD)
-# ifndef _CRAY
-/* 4.2 bsd compatibility.  */
-extern char *re_comp (const char *);
-extern int re_exec (const char *);
-# endif
-#endif
-
-/* GCC 2.95 and later have "__restrict"; C99 compilers have
-   "restrict", and "configure" may have defined "restrict".  */
-#ifndef __restrict
-# if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
-#  if defined restrict || 199901L <= __STDC_VERSION__
-#   define __restrict restrict
-#  else
-#   define __restrict
-#  endif
-# endif
-#endif
-/* gcc 3.1 and up support the [restrict] syntax.  */
-#ifndef __restrict_arr
-# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) \
-     && !defined __GNUG__
-#  define __restrict_arr __restrict
-# else
-#  define __restrict_arr
-# endif
-#endif
-
-/* POSIX compatibility.  */
-extern int regcomp (regex_t *__restrict __preg,
-		    const char *__restrict __pattern,
-		    int __cflags);
-
-extern int regexec (const regex_t *__restrict __preg,
-		    const char *__restrict __string, size_t __nmatch,
-		    regmatch_t __pmatch[__restrict_arr],
-		    int __eflags);
-
-extern size_t regerror (int __errcode, const regex_t *__restrict __preg,
-			char *__restrict __errbuf, size_t __errbuf_size);
-
-extern void regfree (regex_t *__preg);
-
-
-#ifdef __cplusplus
-}
-#endif	/* C++ */
-
-#endif /* regex.h */
diff --git a/include.new/gnu/regex.h b/include.new/gnu/regex.h
deleted file mode 100644
index de6b06c..0000000
--- a/include.new/gnu/regex.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $FreeBSD: releng/10.2/gnu/lib/libregex/regex.h 251438 2013-06-05 21:31:06Z jkim $ */
-#ifndef _REGEX_H
-
-#ifndef __USE_GNU
-#define	__USE_GNU
-#endif
-
-#include <gnu/posix/regex.h>
-
-/* Document internal interfaces.  */
-extern reg_syntax_t __re_set_syntax (reg_syntax_t __syntax);
-
-extern const char *__re_compile_pattern (const char *__pattern, size_t __length,
-					struct re_pattern_buffer *__buffer);
-
-extern int __re_compile_fastmap (struct re_pattern_buffer *__buffer);
-
-extern int __re_search (struct re_pattern_buffer *__buffer, const char *__string,
-		       int __length, int __start, int __range,
-		       struct re_registers *__regs);
-
-extern int __re_search_2 (struct re_pattern_buffer *__buffer,
-			 const char *__string1, int __length1,
-			 const char *__string2, int __length2, int __start,
-			 int __range, struct re_registers *__regs, int __stop);
-
-extern int __re_match (struct re_pattern_buffer *__buffer, const char *__string,
-		      int __length, int __start, struct re_registers *__regs);
-
-extern int __re_match_2 (struct re_pattern_buffer *__buffer,
-			const char *__string1, int __length1,
-			const char *__string2, int __length2, int __start,
-			struct re_registers *__regs, int __stop);
-
-extern void __re_set_registers (struct re_pattern_buffer *__buffer,
-			       struct re_registers *__regs,
-			       unsigned int __num_regs,
-			       regoff_t *__starts, regoff_t *__ends);
-
-extern int __regcomp (regex_t *__restrict __preg,
-		     const char *__restrict __pattern,
-		     int __cflags);
-
-extern int __regexec (const regex_t *__restrict __preg,
-		     const char *__restrict __string, size_t __nmatch,
-		     regmatch_t __pmatch[__restrict_arr],
-		     int __eflags);
-
-extern size_t __regerror (int __errcode, const regex_t *__restrict __preg,
-			 char *__restrict __errbuf, size_t __errbuf_size);
-
-extern void __regfree (regex_t *__preg);
-
-#endif	/* _REGEX_H */
diff --git a/include.new/gnuregex.h b/include.new/gnuregex.h
deleted file mode 100644
index ce2316f..0000000
--- a/include.new/gnuregex.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 2004 David E. O'Brien
- * Copyright (c) 2004 Andrey A. Chernov
- * 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.
- *
- * 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: releng/10.2/gnu/lib/libregex/gnuregex.h 126224 2004-02-25 10:56:54Z ache $
- */
-
-#ifdef __GNUC__
-#warning "Use -I/usr/include/gnu and <regex.h> instead of <gnuregex.h>"
-#endif
-#include <gnu/regex.h>
diff --git a/include.new/gpib/gpib.h b/include.new/gpib/gpib.h
deleted file mode 100644
index be7f8ab..0000000
--- a/include.new/gpib/gpib.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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.
- *
- * This file merely redirects to the file in <dev/ieee488/ugpib.h>
- *
- * $FreeBSD: releng/10.2/lib/libgpib/gpib.h 141768 2005-02-12 21:07:09Z phk $
- */
-
-#include <dev/ieee488/ugpib.h>
-
-#define ibcntl	ibcnt
diff --git a/include.new/grp.h b/include.new/grp.h
deleted file mode 100644
index 8ec9eea..0000000
--- a/include.new/grp.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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. 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.
- *
- *	@(#)grp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/include/grp.h 241731 2012-10-19 12:44:22Z brooks $
- */
-
-#ifndef _GRP_H_
-#define	_GRP_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#define	_PATH_GROUP		"/etc/group"
-
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef __size_t	size_t;
-#define _SIZE_T_DECLARED
-#endif
-
-struct group {
-	char	*gr_name;		/* group name */
-	char	*gr_passwd;		/* group password */
-	gid_t	gr_gid;			/* group id */
-	char	**gr_mem;		/* group members */
-};
-
-__BEGIN_DECLS
-#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-void		 endgrent(void);
-struct group	*getgrent(void);
-#endif
-struct group	*getgrgid(gid_t);
-struct group	*getgrnam(const char *);
-#if __BSD_VISIBLE
-const char	*group_from_gid(gid_t, int);
-int		 gid_from_group(const char *, gid_t *);
-int		 pwcache_groupdb(int (*)(int), void (*)(void),
-		    struct group * (*)(const char *),
-		    struct group * (*)(gid_t));
-#endif
-#if __BSD_VISIBLE || __XSI_VISIBLE
-/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */
-int		 setgrent(void);
-#endif
-#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-int		 getgrgid_r(gid_t, struct group *, char *, size_t,
-		    struct group **);
-int		 getgrnam_r(const char *, struct group *, char *, size_t,
-		    struct group **);
-#endif
-#if __BSD_VISIBLE
-int		 getgrent_r(struct group *, char *, size_t, struct group **);
-int		 setgroupent(int);
-#endif
-__END_DECLS
-
-#endif /* !_GRP_H_ */
diff --git a/include.new/gssapi.h b/include.new/gssapi.h
deleted file mode 100644
index 93ef0ec..0000000
--- a/include.new/gssapi.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $FreeBSD: releng/10.2/include/gssapi.h 153838 2005-12-29 14:40:22Z dfr $ */
-#ifdef __GNUC__
-#warning "this file includes <gssapi.h> which is deprecated, use <gssapi/gssapi.h> instead"
-#endif
-#include <gssapi/gssapi.h>
diff --git a/include.new/gssapi/gssapi.h b/include.new/gssapi/gssapi.h
deleted file mode 100644
index 071fc95..0000000
--- a/include.new/gssapi/gssapi.h
+++ /dev/null
@@ -1,876 +0,0 @@
-/*
- * Copyright (C) The Internet Society (2000).  All Rights Reserved.
- *
- * This document and translations of it may be copied and furnished to
- * others, and derivative works that comment on or otherwise explain it
- * or assist in its implementation may be prepared, copied, published
- * and distributed, in whole or in part, without restriction of any
- * kind, provided that the above copyright notice and this paragraph are
- * included on all such copies and derivative works.  However, this
- * document itself may not be modified in any way, such as by removing
- * the copyright notice or references to the Internet Society or other
- * Internet organizations, except as needed for the purpose of
- * developing Internet standards in which case the procedures for
- * copyrights defined in the Internet Standards process must be
- * followed, or as required to translate it into languages other than
- * English.
- *
- * The limited permissions granted above are perpetual and will not be
- * revoked by the Internet Society or its successors or assigns.
- *
- * This document and the information contained herein is provided on an
- * "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
- * TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
- * HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
- * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $FreeBSD: releng/10.2/include/gssapi/gssapi.h 252409 2013-06-30 07:46:22Z hrs $
- */
-
-#ifndef _GSSAPI_GSSAPI_H_
-#define _GSSAPI_GSSAPI_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif
-
-/* Compatibility with Heimdal 1.5.1 */
-#ifndef GSSAPI_CPP_START
-#ifdef __cplusplus
-#define GSSAPI_CPP_START	extern "C" {
-#define GSSAPI_CPP_END		}
-#else
-#define GSSAPI_CPP_START
-#define GSSAPI_CPP_END
-#endif
-#endif
-
-/* Compatibility with Heimdal 1.5.1 */
-#ifndef BUILD_GSSAPI_LIB
-#define GSSAPI_LIB_FUNCTION
-#define GSSAPI_LIB_CALL
-#define GSSAPI_LIB_VARIABLE
-#endif
-
-/* Compatibility with Heimdal 1.5.1 */
-#ifndef GSSAPI_DEPRECATED_FUNCTION
-#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 )))
-#define GSSAPI_DEPRECATED_FUNCTION(X) __attribute__((deprecated))
-#else
-#define GSSAPI_DEPRECATED_FUNCTION(X)
-#endif
-#endif
-
-#if 0
-/*
- * If the platform supports the xom.h header file, it should be
- * included here.
- */
-#include <xom.h>
-#endif
-
-
-/*
- * Now define the three implementation-dependent types.
- */
-typedef struct _gss_ctx_id_t *gss_ctx_id_t;
-typedef struct _gss_cred_id_t *gss_cred_id_t;
-typedef struct _gss_name_t *gss_name_t;
-
-/*
- * The following type must be defined as the smallest natural
- * unsigned integer supported by the platform that has at least
- * 32 bits of precision.
- */
-typedef __uint32_t gss_uint32;
-
-
-#ifdef OM_STRING
-/*
- * We have included the xom.h header file.  Verify that OM_uint32
- * is defined correctly.
- */
-
-#if sizeof(gss_uint32) != sizeof(OM_uint32)
-#error Incompatible definition of OM_uint32 from xom.h
-#endif
-
-typedef OM_object_identifier gss_OID_desc, *gss_OID;
-
-#else
-
-/*
- * We can't use X/Open definitions, so roll our own.
- */
-
-typedef gss_uint32 OM_uint32;
-typedef __uint64_t OM_uint64;
-
-typedef struct gss_OID_desc_struct {
-  OM_uint32 length;
-  void      *elements;
-} gss_OID_desc, *gss_OID;
-
-#endif
-
-typedef struct gss_OID_set_desc_struct  {
-  size_t     count;
-  gss_OID    elements;
-} gss_OID_set_desc, *gss_OID_set;
-
-typedef struct gss_buffer_desc_struct {
-  size_t length;
-  void *value;
-} gss_buffer_desc, *gss_buffer_t;
-
-typedef struct gss_channel_bindings_struct {
-  OM_uint32 initiator_addrtype;
-  gss_buffer_desc initiator_address;
-  OM_uint32 acceptor_addrtype;
-  gss_buffer_desc acceptor_address;
-  gss_buffer_desc application_data;
-} *gss_channel_bindings_t;
-
-/*
- * For now, define a QOP-type as an OM_uint32
- */
-typedef OM_uint32 gss_qop_t;
-
-typedef int gss_cred_usage_t;
-
-/*
- * Flag bits for context-level services.
- */
-#define GSS_C_DELEG_FLAG      1
-#define GSS_C_MUTUAL_FLAG     2
-#define GSS_C_REPLAY_FLAG     4
-#define GSS_C_SEQUENCE_FLAG   8
-#define GSS_C_CONF_FLAG       16
-#define GSS_C_INTEG_FLAG      32
-#define GSS_C_ANON_FLAG       64
-#define GSS_C_PROT_READY_FLAG 128
-#define GSS_C_TRANS_FLAG      256
-
-/*
- * Credential usage options
- */
-#define GSS_C_BOTH     0
-#define GSS_C_INITIATE 1
-#define GSS_C_ACCEPT   2
-
-/*
- * Status code types for gss_display_status
- */
-#define GSS_C_GSS_CODE  1
-#define GSS_C_MECH_CODE 2
-
-/*
- * The constant definitions for channel-bindings address families
- */
-#define GSS_C_AF_UNSPEC     0
-#define GSS_C_AF_LOCAL      1
-#define GSS_C_AF_INET       2
-#define GSS_C_AF_IMPLINK    3
-#define GSS_C_AF_PUP        4
-#define GSS_C_AF_CHAOS      5
-#define GSS_C_AF_NS         6
-#define GSS_C_AF_NBS        7
-#define GSS_C_AF_ECMA       8
-#define GSS_C_AF_DATAKIT    9
-#define GSS_C_AF_CCITT      10
-#define GSS_C_AF_SNA        11
-#define GSS_C_AF_DECnet     12
-#define GSS_C_AF_DLI        13
-#define GSS_C_AF_LAT        14
-#define GSS_C_AF_HYLINK     15
-#define GSS_C_AF_APPLETALK  16
-#define GSS_C_AF_BSC        17
-#define GSS_C_AF_DSS        18
-#define GSS_C_AF_OSI        19
-#define GSS_C_AF_X25        21
-#define GSS_C_AF_NULLADDR   255
-
-/*
- * Various Null values
- */
-#define GSS_C_NO_NAME ((gss_name_t) 0)
-#define GSS_C_NO_BUFFER ((gss_buffer_t) 0)
-#define GSS_C_NO_OID ((gss_OID) 0)
-#define GSS_C_NO_OID_SET ((gss_OID_set) 0)
-#define GSS_C_NO_CONTEXT ((gss_ctx_id_t) 0)
-#define GSS_C_NO_CREDENTIAL ((gss_cred_id_t) 0)
-#define GSS_C_NO_CHANNEL_BINDINGS ((gss_channel_bindings_t) 0)
-#define GSS_C_EMPTY_BUFFER {0, NULL}
-
-/*
- * Some alternate names for a couple of the above
- * values.  These are defined for V1 compatibility.
- */
-#define GSS_C_NULL_OID GSS_C_NO_OID
-#define GSS_C_NULL_OID_SET GSS_C_NO_OID_SET
-
-/*
- * Define the default Quality of Protection for per-message
- * services.  Note that an implementation that offers multiple
- * levels of QOP may define GSS_C_QOP_DEFAULT to be either zero
- * (as done here) to mean "default protection", or to a specific
- * explicit QOP value.  However, a value of 0 should always be
- * interpreted by a GSS-API implementation as a request for the
- * default protection level.
- */
-#define GSS_C_QOP_DEFAULT 0
-
-/*
- * Expiration time of 2^32-1 seconds means infinite lifetime for a
- * credential or security context
- */
-#define GSS_C_INDEFINITE 0xfffffffful
-
-/*
- * The implementation must reserve static storage for a
- * gss_OID_desc object containing the value
- * {10, (void *)"\x2a\x86\x48\x86\xf7\x12"
- * "\x01\x02\x01\x01"},
- * corresponding to an object-identifier value of
- * {iso(1) member-body(2) United States(840) mit(113554)
- * infosys(1) gssapi(2) generic(1) user_name(1)}.  The constant
- * GSS_C_NT_USER_NAME should be initialized to point
- * to that gss_OID_desc.
- */
-extern gss_OID GSS_C_NT_USER_NAME;
-
-/*
- * The implementation must reserve static storage for a
- * gss_OID_desc object containing the value
- * {10, (void *)"\x2a\x86\x48\x86\xf7\x12"
- *              "\x01\x02\x01\x02"},
- * corresponding to an object-identifier value of
- * {iso(1) member-body(2) United States(840) mit(113554)
- * infosys(1) gssapi(2) generic(1) machine_uid_name(2)}.
- * The constant GSS_C_NT_MACHINE_UID_NAME should be
- * initialized to point to that gss_OID_desc.
- */
-extern gss_OID GSS_C_NT_MACHINE_UID_NAME;
-
-/*
- * The implementation must reserve static storage for a
- * gss_OID_desc object containing the value
- * {10, (void *)"\x2a\x86\x48\x86\xf7\x12"
- *              "\x01\x02\x01\x03"},
- * corresponding to an object-identifier value of
- * {iso(1) member-body(2) United States(840) mit(113554)
- * infosys(1) gssapi(2) generic(1) string_uid_name(3)}.
- * The constant GSS_C_NT_STRING_UID_NAME should be
- * initialized to point to that gss_OID_desc.
- */
-extern gss_OID GSS_C_NT_STRING_UID_NAME;
-
-/*
- * The implementation must reserve static storage for a
- * gss_OID_desc object containing the value
- * {6, (void *)"\x2b\x06\x01\x05\x06\x02"},
- * corresponding to an object-identifier value of
- * {iso(1) org(3) dod(6) internet(1) security(5)
- * nametypes(6) gss-host-based-services(2)).  The constant
- * GSS_C_NT_HOSTBASED_SERVICE_X should be initialized to point
- * to that gss_OID_desc.  This is a deprecated OID value, and
- * implementations wishing to support hostbased-service names
- * should instead use the GSS_C_NT_HOSTBASED_SERVICE OID,
- * defined below, to identify such names;
- * GSS_C_NT_HOSTBASED_SERVICE_X should be accepted a synonym
- * for GSS_C_NT_HOSTBASED_SERVICE when presented as an input
- * parameter, but should not be emitted by GSS-API
- * implementations
- */
-extern gss_OID GSS_C_NT_HOSTBASED_SERVICE_X;
-
-/*
- * The implementation must reserve static storage for a
- * gss_OID_desc object containing the value
- * {10, (void *)"\x2a\x86\x48\x86\xf7\x12"
- *              "\x01\x02\x01\x04"}, corresponding to an
- * object-identifier value of {iso(1) member-body(2)
- * Unites States(840) mit(113554) infosys(1) gssapi(2)
- * generic(1) service_name(4)}.  The constant
- * GSS_C_NT_HOSTBASED_SERVICE should be initialized
- * to point to that gss_OID_desc.
- */
-extern gss_OID GSS_C_NT_HOSTBASED_SERVICE;
-
-/*
- * The implementation must reserve static storage for a
- * gss_OID_desc object containing the value
- * {6, (void *)"\x2b\x06\01\x05\x06\x03"},
- * corresponding to an object identifier value of
- * {1(iso), 3(org), 6(dod), 1(internet), 5(security),
- * 6(nametypes), 3(gss-anonymous-name)}.  The constant
- * and GSS_C_NT_ANONYMOUS should be initialized to point
- * to that gss_OID_desc.
- */
-extern gss_OID GSS_C_NT_ANONYMOUS;
-
-
-/*
- * The implementation must reserve static storage for a
- * gss_OID_desc object containing the value
- * {6, (void *)"\x2b\x06\x01\x05\x06\x04"},
- * corresponding to an object-identifier value of
- * {1(iso), 3(org), 6(dod), 1(internet), 5(security),
- * 6(nametypes), 4(gss-api-exported-name)}.  The constant
- * GSS_C_NT_EXPORT_NAME should be initialized to point
- * to that gss_OID_desc.
- */
-extern gss_OID GSS_C_NT_EXPORT_NAME;
-
-/*
- *   This name form shall be represented by the Object Identifier {iso(1)
- *   member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
- *   krb5(2) krb5_name(1)}.  The recommended symbolic name for this type
- *   is "GSS_KRB5_NT_PRINCIPAL_NAME".
- */
-extern gss_OID GSS_KRB5_NT_PRINCIPAL_NAME;
-
-/*
- * This name form shall be represented by the Object Identifier {iso(1)
- * member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
- * generic(1) user_name(1)}.  The recommended symbolic name for this
- * type is "GSS_KRB5_NT_USER_NAME".
- */
-extern gss_OID GSS_KRB5_NT_USER_NAME;
-
-/*
- * This name form shall be represented by the Object Identifier {iso(1)
- * member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
- * generic(1) machine_uid_name(2)}.  The recommended symbolic name for
- * this type is "GSS_KRB5_NT_MACHINE_UID_NAME".
- */
-extern gss_OID GSS_KRB5_NT_MACHINE_UID_NAME;
-
-/*
- * This name form shall be represented by the Object Identifier {iso(1)
- * member-body(2) United States(840) mit(113554) infosys(1) gssapi(2)
- * generic(1) string_uid_name(3)}.  The recommended symbolic name for
- * this type is "GSS_KRB5_NT_STRING_UID_NAME".
- */
-extern gss_OID GSS_KRB5_NT_STRING_UID_NAME;
-
-/* Major status codes */
-
-#define GSS_S_COMPLETE 0
-
-/*
- * Some "helper" definitions to make the status code macros obvious.
- */
-#define GSS_C_CALLING_ERROR_OFFSET 24
-#define GSS_C_ROUTINE_ERROR_OFFSET 16
-#define GSS_C_SUPPLEMENTARY_OFFSET 0
-#define GSS_C_CALLING_ERROR_MASK 0377ul
-#define GSS_C_ROUTINE_ERROR_MASK 0377ul
-#define GSS_C_SUPPLEMENTARY_MASK 0177777ul
-
-/*
- * The macros that test status codes for error conditions.
- * Note that the GSS_ERROR() macro has changed slightly from
- * the V1 GSS-API so that it now evaluates its argument
- * only once.
- */
-#define GSS_CALLING_ERROR(x) \
- (x & (GSS_C_CALLING_ERROR_MASK << GSS_C_CALLING_ERROR_OFFSET))
-#define GSS_ROUTINE_ERROR(x) \
- (x & (GSS_C_ROUTINE_ERROR_MASK << GSS_C_ROUTINE_ERROR_OFFSET))
-#define GSS_SUPPLEMENTARY_INFO(x) \
- (x & (GSS_C_SUPPLEMENTARY_MASK << GSS_C_SUPPLEMENTARY_OFFSET))
-#define GSS_ERROR(x) \
- (x & ((GSS_C_CALLING_ERROR_MASK << GSS_C_CALLING_ERROR_OFFSET) | \
-       (GSS_C_ROUTINE_ERROR_MASK << GSS_C_ROUTINE_ERROR_OFFSET)))
-
-/*
- * Now the actual status code definitions
- */
-
-/*
- * Calling errors:
- */
-#define GSS_S_CALL_INACCESSIBLE_READ \
-(1ul << GSS_C_CALLING_ERROR_OFFSET)
-#define GSS_S_CALL_INACCESSIBLE_WRITE \
-(2ul << GSS_C_CALLING_ERROR_OFFSET)
-#define GSS_S_CALL_BAD_STRUCTURE \
-(3ul << GSS_C_CALLING_ERROR_OFFSET)
-
-/*
- * Routine errors:
- */
-#define GSS_S_BAD_MECH             (1ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_NAME             (2ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_NAMETYPE         (3ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_BINDINGS         (4ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_STATUS           (5ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_SIG              (6ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_MIC		   GSS_S_BAD_SIG
-#define GSS_S_NO_CRED              (7ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_NO_CONTEXT           (8ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_DEFECTIVE_TOKEN      (9ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_DEFECTIVE_CREDENTIAL (10ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_CREDENTIALS_EXPIRED  (11ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_CONTEXT_EXPIRED      (12ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_FAILURE              (13ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_BAD_QOP              (14ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_UNAUTHORIZED         (15ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_UNAVAILABLE          (16ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_DUPLICATE_ELEMENT    (17ul << GSS_C_ROUTINE_ERROR_OFFSET)
-#define GSS_S_NAME_NOT_MN          (18ul << GSS_C_ROUTINE_ERROR_OFFSET)
-
-/*
- * Supplementary info bits:
- */
-#define GSS_S_CONTINUE_NEEDED \
-	 (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 0))
-#define GSS_S_DUPLICATE_TOKEN \
-	 (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 1))
-#define GSS_S_OLD_TOKEN \
-	 (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 2))
-#define GSS_S_UNSEQ_TOKEN \
-	 (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 3))
-#define GSS_S_GAP_TOKEN \
-	 (1ul << (GSS_C_SUPPLEMENTARY_OFFSET + 4))
-
-__BEGIN_DECLS
-
-/*
- * Finally, function prototypes for the GSS-API routines.
- */
-OM_uint32 gss_acquire_cred
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_name_t,       /* desired_name */
-	       OM_uint32,              /* time_req */
-	       const gss_OID_set,      /* desired_mechs */
-	       gss_cred_usage_t,       /* cred_usage */
-	       gss_cred_id_t *,        /* output_cred_handle */
-	       gss_OID_set *,          /* actual_mechs */
-	       OM_uint32 *             /* time_rec */
-	      );
-
-OM_uint32 gss_release_cred
-	      (OM_uint32 *,            /* minor_status */
-	       gss_cred_id_t *         /* cred_handle */
-	      );
-
-OM_uint32 gss_init_sec_context
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_cred_id_t,    /* initiator_cred_handle */
-	       gss_ctx_id_t *,         /* context_handle */
-	       const gss_name_t,       /* target_name */
-	       const gss_OID,          /* mech_type */
-	       OM_uint32,              /* req_flags */
-	       OM_uint32,              /* time_req */
-	       const gss_channel_bindings_t,
-				       /* input_chan_bindings */
-	       const gss_buffer_t,     /* input_token */
-	       gss_OID *,              /* actual_mech_type */
-	       gss_buffer_t,           /* output_token */
-	       OM_uint32 *,            /* ret_flags */
-	       OM_uint32 *             /* time_rec */
-	      );
-
-OM_uint32 gss_accept_sec_context
-	      (OM_uint32 *,            /* minor_status */
-	       gss_ctx_id_t *,         /* context_handle */
-	       const gss_cred_id_t,    /* acceptor_cred_handle */
-	       const gss_buffer_t,     /* input_token_buffer */
-	       const gss_channel_bindings_t,
-				       /* input_chan_bindings */
-	       gss_name_t *,           /* src_name */
-	       gss_OID *,              /* mech_type */
-	       gss_buffer_t,           /* output_token */
-	       OM_uint32 *,            /* ret_flags */
-	       OM_uint32 *,            /* time_rec */
-	       gss_cred_id_t *         /* delegated_cred_handle */
-	      );
-
-OM_uint32 gss_process_context_token
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_ctx_id_t,     /* context_handle */
-	       const gss_buffer_t      /* token_buffer */
-	      );
-
-OM_uint32 gss_delete_sec_context
-	      (OM_uint32 *,            /* minor_status */
-	       gss_ctx_id_t *,         /* context_handle */
-	       gss_buffer_t            /* output_token */
-	      );
-
-OM_uint32 gss_context_time
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_ctx_id_t,     /* context_handle */
-	       OM_uint32 *             /* time_rec */
-	      );
-
-OM_uint32 gss_get_mic
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_ctx_id_t,     /* context_handle */
-	       gss_qop_t,              /* qop_req */
-	       const gss_buffer_t,     /* message_buffer */
-	       gss_buffer_t            /* message_token */
-	      );
-
-OM_uint32 gss_verify_mic
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_ctx_id_t,     /* context_handle */
-	       const gss_buffer_t,     /* message_buffer */
-	       const gss_buffer_t,     /* token_buffer */
-	       gss_qop_t *             /* qop_state */
-	      );
-
-OM_uint32 gss_wrap
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_ctx_id_t,     /* context_handle */
-	       int,                    /* conf_req_flag */
-	       gss_qop_t,              /* qop_req */
-	       const gss_buffer_t,     /* input_message_buffer */
-	       int *,                  /* conf_state */
-	       gss_buffer_t            /* output_message_buffer */
-	      );
-
-OM_uint32 gss_unwrap
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_ctx_id_t,     /* context_handle */
-	       const gss_buffer_t,     /* input_message_buffer */
-	       gss_buffer_t,           /* output_message_buffer */
-	       int *,                  /* conf_state */
-	       gss_qop_t *             /* qop_state */
-	      );
-
-OM_uint32 gss_display_status
-	      (OM_uint32 *,            /* minor_status */
-	       OM_uint32,              /* status_value */
-	       int,                    /* status_type */
-	       const gss_OID,          /* mech_type */
-	       OM_uint32 *,            /* message_context */
-	       gss_buffer_t            /* status_string */
-	      );
-
-OM_uint32 gss_indicate_mechs
-	      (OM_uint32 *,            /* minor_status */
-	       gss_OID_set *           /* mech_set */
-	      );
-
-OM_uint32 gss_compare_name
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_name_t,       /* name1 */
-	       const gss_name_t,       /* name2 */
-	       int *                   /* name_equal */
-	      );
-
-OM_uint32 gss_display_name
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_name_t,       /* input_name */
-	       gss_buffer_t,           /* output_name_buffer */
-	       gss_OID *               /* output_name_type */
-	      );
-
-OM_uint32 gss_import_name
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_buffer_t,     /* input_name_buffer */
-	       const gss_OID,          /* input_name_type */
-	       gss_name_t *            /* output_name */
-	      );
-
-OM_uint32 gss_export_name
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_name_t,       /* input_name */
-	       gss_buffer_t            /* exported_name */
-	      );
-
-OM_uint32 gss_release_name
-	      (OM_uint32 *,            /* minor_status */
-	       gss_name_t *            /* input_name */
-	      );
-
-OM_uint32 gss_release_buffer
-	      (OM_uint32 *,            /* minor_status */
-	       gss_buffer_t            /* buffer */
-	      );
-
-OM_uint32 gss_release_oid_set
-	      (OM_uint32 *,            /* minor_status */
-	       gss_OID_set *           /* set */
-	      );
-
-OM_uint32 gss_inquire_cred
-	      (OM_uint32 *,            /* minor_status */
-	       const gss_cred_id_t,    /* cred_handle */
-	       gss_name_t *,           /* name */
-	       OM_uint32 *,            /* lifetime */
-	       gss_cred_usage_t *,     /* cred_usage */
-	       gss_OID_set *           /* mechanisms */
-	      );
-
-OM_uint32 gss_inquire_context (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_ctx_id_t,     /* context_handle */
-	       gss_name_t *,           /* src_name */
-	       gss_name_t *,           /* targ_name */
-	       OM_uint32 *,            /* lifetime_rec */
-	       gss_OID *,              /* mech_type */
-	       OM_uint32 *,            /* ctx_flags */
-	       int *,                  /* locally_initiated */
-	       int *                   /* open */
-	      );
-
-OM_uint32 gss_wrap_size_limit (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_ctx_id_t,     /* context_handle */
-	       int,                    /* conf_req_flag */
-	       gss_qop_t,              /* qop_req */
-	       OM_uint32,              /* req_output_size */
-	       OM_uint32 *             /* max_input_size */
-	      );
-
-OM_uint32 gss_add_cred (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_cred_id_t,    /* input_cred_handle */
-	       const gss_name_t,       /* desired_name */
-	       const gss_OID,          /* desired_mech */
-	       gss_cred_usage_t,       /* cred_usage */
-	       OM_uint32,              /* initiator_time_req */
-	       OM_uint32,              /* acceptor_time_req */
-	       gss_cred_id_t *,        /* output_cred_handle */
-	       gss_OID_set *,          /* actual_mechs */
-	       OM_uint32 *,            /* initiator_time_rec */
-	       OM_uint32 *             /* acceptor_time_rec */
-	      );
-
-OM_uint32 gss_inquire_cred_by_mech (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_cred_id_t,    /* cred_handle */
-	       const gss_OID,          /* mech_type */
-	       gss_name_t *,           /* name */
-	       OM_uint32 *,            /* initiator_lifetime */
-	       OM_uint32 *,            /* acceptor_lifetime */
-	       gss_cred_usage_t *      /* cred_usage */
-	      );
-
-OM_uint32 gss_export_sec_context (
-	       OM_uint32 *,            /* minor_status */
-	       gss_ctx_id_t *,         /* context_handle */
-	       gss_buffer_t            /* interprocess_token */
-	      );
-
-OM_uint32 gss_import_sec_context (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_buffer_t,     /* interprocess_token */
-	       gss_ctx_id_t *          /* context_handle */
-	      );
-
-OM_uint32 gss_create_empty_oid_set (
-	       OM_uint32 *,            /* minor_status */
-	       gss_OID_set *           /* oid_set */
-	      );
-
-OM_uint32 gss_add_oid_set_member (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_OID,          /* member_oid */
-	       gss_OID_set *           /* oid_set */
-	      );
-
-OM_uint32 gss_test_oid_set_member (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_OID,          /* member */
-	       const gss_OID_set,      /* set */
-	       int *                   /* present */
-	      );
-
-OM_uint32 gss_inquire_names_for_mech (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_OID,          /* mechanism */
-	       gss_OID_set *           /* name_types */
-	      );
-
-OM_uint32 gss_inquire_mechs_for_name (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_name_t,       /* input_name */
-	       gss_OID_set *           /* mech_types */
-	      );
-
-OM_uint32 gss_canonicalize_name (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_name_t,       /* input_name */
-	       const gss_OID,          /* mech_type */
-	       gss_name_t *            /* output_name */
-	      );
-
-OM_uint32 gss_duplicate_name (
-	       OM_uint32 *,            /* minor_status */
-	       const gss_name_t,       /* src_name */
-	       gss_name_t *            /* dest_name */
-	      );
-
-/*
- * The following routines are obsolete variants of gss_get_mic,
- * gss_verify_mic, gss_wrap and gss_unwrap.  They should be
- * provided by GSS-API V2 implementations for backwards
- * compatibility with V1 applications.  Distinct entrypoints
- * (as opposed to #defines) should be provided, both to allow
- * GSS-API V1 applications to link against GSS-API V2 implementations,
- * and to retain the slight parameter type differences between the
- * obsolete versions of these routines and their current forms.
- */
-
-OM_uint32 gss_sign
-	      (OM_uint32 *,       /* minor_status */
-	       gss_ctx_id_t,      /* context_handle */
-	       int,               /* qop_req */
-	       gss_buffer_t,      /* message_buffer */
-	       gss_buffer_t       /* message_token */
-	      );
-
-
-OM_uint32 gss_verify
-	      (OM_uint32 *,       /* minor_status */
-	       gss_ctx_id_t,      /* context_handle */
-	       gss_buffer_t,      /* message_buffer */
-	       gss_buffer_t,      /* token_buffer */
-	       int *              /* qop_state */
-	      );
-
-OM_uint32 gss_seal
-	      (OM_uint32 *,       /* minor_status */
-	       gss_ctx_id_t,      /* context_handle */
-	       int,               /* conf_req_flag */
-	       int,               /* qop_req */
-	       gss_buffer_t,      /* input_message_buffer */
-	       int *,             /* conf_state */
-	       gss_buffer_t       /* output_message_buffer */
-	      );
-
-
-OM_uint32 gss_unseal
-	      (OM_uint32 *,       /* minor_status */
-	       gss_ctx_id_t,      /* context_handle */
-	       gss_buffer_t,      /* input_message_buffer */
-	       gss_buffer_t,      /* output_message_buffer */
-	       int *,             /* conf_state */
-	       int *              /* qop_state */
-	      );
-
-/*
- * Other extensions and helper functions.
- */
-
-int gss_oid_equal
-	      (const gss_OID,	  /* first OID to compare */
-	       const gss_OID	  /* second OID to compare */
-	      );
-
-OM_uint32 gss_release_oid
-	      (OM_uint32 *,	  /* minor status */
-	       gss_OID *	  /* oid to free */
-	      );
-
-OM_uint32 gss_decapsulate_token
-	      (const gss_buffer_t,  /* mechanism independent token */
-	       gss_OID,		 /* desired mechanism */
-	       gss_buffer_t	 /* decapsulated mechanism dependent token */
-	      );
-
-OM_uint32 gss_encapsulate_token
-	      (const gss_buffer_t,  /* mechanism dependent token */
-	       gss_OID,		 /* desired mechanism */
-	       gss_buffer_t	 /* encapsulated mechanism independent token */
-	      );
-
-OM_uint32 gss_duplicate_oid
-              (OM_uint32 *,	/* minor status */
-	       const gss_OID,	/* oid to copy */
-	       gss_OID *	/* result */
-	      );
-
-OM_uint32 gss_oid_to_str
-	      (OM_uint32 *,	/* minor status */
-	       gss_OID,		/* oid to convert */
-	       gss_buffer_t	/* buffer to contain string */
-	      );
-
-typedef struct gss_buffer_set_desc_struct  {
-  size_t	count;
-  gss_buffer_desc *elements;
-} gss_buffer_set_desc, *gss_buffer_set_t;
-
-#define GSS_C_NO_BUFFER_SET ((gss_buffer_set_t) 0)
-
-OM_uint32 gss_create_empty_buffer_set
-	      (OM_uint32 *,		/* minor status */
-	       gss_buffer_set_t *	/* location for new buffer set */
-	      );
-
-OM_uint32 gss_add_buffer_set_member
-	      (OM_uint32 *,		/* minor status */
-	       gss_buffer_t,		/* buffer to add */
-	       gss_buffer_set_t *	/* set to add to */
-	      );
-
-OM_uint32 gss_release_buffer_set
-	      (OM_uint32 *,		/* minor status */
-	       gss_buffer_set_t *	/* set to release */
-	      );
-
-OM_uint32 gss_inquire_sec_context_by_oid
-	      (OM_uint32 *,		/* minor_status */
-	       const gss_ctx_id_t,	/* context_handle */
-	       const gss_OID,		/* desired_object */
-	       gss_buffer_set_t *	/* result */
-	      );
-
-OM_uint32 gss_inquire_cred_by_oid
-	      (OM_uint32 *,		/* minor_status */
-	       const gss_cred_id_t,	/* cred_handle */
-	       const gss_OID,		/* desired_object */
-	       gss_buffer_set_t *	/* result */
-	      );
-
-OM_uint32 gss_set_sec_context_option
-	      (OM_uint32 *,		/* minor status */
-	       gss_ctx_id_t *,		/* context */
-	       const gss_OID,		/* option to set */
-	       const gss_buffer_t	/* option value */
-	      );
-
-OM_uint32 gss_set_cred_option
-	      (OM_uint32 *,		/* minor status */
-	       gss_cred_id_t *,		/* cred */
-	       const gss_OID,		/* option to set */
-	       const gss_buffer_t	/* option value */
-	      );
-
-OM_uint32 gss_pseudo_random
-	      (OM_uint32 *,		/* minor status */
-	       gss_ctx_id_t,		/* context handle */
-	       int prf_key,		/* XXX */
-	       const gss_buffer_t,	/* data to seed generator */
-	       ssize_t,			/* amount of data required */
-	       gss_buffer_t		/* buffer for result */
-	      );
-
-#ifdef _UID_T_DECLARED
-OM_uint32 gss_pname_to_uid
-	      (OM_uint32 *,		/* minor status */
-	       const gss_name_t pname,	/* principal name */
-	       const gss_OID mech,	/* mechanism to query */
-	       uid_t *uidp		/* pointer to UID for result */
-	      );
-#endif
-
-__END_DECLS
-
-#endif /* _GSSAPI_GSSAPI_H_ */
diff --git a/include.new/gssapi/gssapi_krb5.h b/include.new/gssapi/gssapi_krb5.h
deleted file mode 100644
index e7bb4c8..0000000
--- a/include.new/gssapi/gssapi_krb5.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 1997 - 2006 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef GSSAPI_KRB5_H_
-#define GSSAPI_KRB5_H_
-
-#include <gssapi/gssapi.h>
-
-GSSAPI_CPP_START
-
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(x)
-#endif
-
-#ifndef GSSKRB5_FUNCTION_DEPRECATED
-#define GSSKRB5_FUNCTION_DEPRECATED __attribute__((deprecated))
-#endif
-
-
-/*
- * This is for kerberos5 names.
- */
-
-extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_krb5_nt_principal_name_oid_desc;
-#define GSS_KRB5_NT_PRINCIPAL_NAME (&__gss_krb5_nt_principal_name_oid_desc)
-
-#define GSS_KRB5_NT_USER_NAME (&__gss_c_nt_user_name_oid_desc)
-#define GSS_KRB5_NT_MACHINE_UID_NAME (&__gss_c_nt_machine_uid_name_oid_desc)
-#define GSS_KRB5_NT_STRING_UID_NAME (&__gss_c_nt_string_uid_name_oid_desc)
-
-extern gss_OID_desc GSSAPI_LIB_VARIABLE __gss_krb5_mechanism_oid_desc;
-#define GSS_KRB5_MECHANISM (&__gss_krb5_mechanism_oid_desc)
-
-/* for compatibility with MIT api */
-
-#define gss_mech_krb5 GSS_KRB5_MECHANISM
-#define gss_krb5_nt_general_name GSS_KRB5_NT_PRINCIPAL_NAME
-
-/*
- * kerberos mechanism specific functions
- */
-
-struct krb5_keytab_data;
-struct krb5_ccache_data;
-struct Principal;
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gss_krb5_ccache_name(OM_uint32 * /*minor_status*/,
-		     const char * /*name */,
-		     const char ** /*out_name */);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gsskrb5_register_acceptor_identity
-        (const char * /*identity*/);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL krb5_gss_register_acceptor_identity
-	(const char * /*identity*/);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_krb5_copy_ccache
-	(OM_uint32 * /*minor*/,
-	 gss_cred_id_t /*cred*/,
-	 struct krb5_ccache_data * /*out*/);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gss_krb5_import_cred(OM_uint32 * /*minor*/,
-		     struct krb5_ccache_data * /*in*/,
-		     struct Principal * /*keytab_principal*/,
-		     struct krb5_keytab_data * /*keytab*/,
-		     gss_cred_id_t * /*out*/);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL gss_krb5_get_tkt_flags
-	(OM_uint32 * /*minor*/,
-	 gss_ctx_id_t /*context_handle*/,
-	 OM_uint32 * /*tkt_flags*/);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_extract_authz_data_from_sec_context
-	(OM_uint32 * /*minor_status*/,
-	 gss_ctx_id_t /*context_handle*/,
-	 int /*ad_type*/,
-	 gss_buffer_t /*ad_data*/);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_set_dns_canonicalize(int);
-
-struct gsskrb5_send_to_kdc {
-    void *func;
-    void *ptr;
-};
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_set_send_to_kdc(struct gsskrb5_send_to_kdc *)
-    GSSKRB5_FUNCTION_DEPRECATED;
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_set_default_realm(const char *);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_extract_authtime_from_sec_context(OM_uint32 *, gss_ctx_id_t, time_t *);
-
-struct EncryptionKey;
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_extract_service_keyblock(OM_uint32 *minor_status,
-				 gss_ctx_id_t context_handle,
-				 struct EncryptionKey **out);
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_get_initiator_subkey(OM_uint32 *minor_status,
-				 gss_ctx_id_t context_handle,
-				 struct EncryptionKey **out);
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_get_subkey(OM_uint32 *minor_status,
-		   gss_ctx_id_t context_handle,
-		   struct EncryptionKey **out);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_set_time_offset(int);
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_get_time_offset(int *);
-
-struct gsskrb5_krb5_plugin {
-    int type;
-    char *name;
-    void *symbol;
-};
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gsskrb5_plugin_register(struct gsskrb5_krb5_plugin *);
-
-
-/*
- * Lucid - NFSv4 interface to GSS-API KRB5 to expose key material to
- * do GSS content token handling in-kernel.
- */
-
-typedef struct gss_krb5_lucid_key {
-	OM_uint32	type;
-	OM_uint32	length;
-	void *		data;
-} gss_krb5_lucid_key_t;
-
-typedef struct gss_krb5_rfc1964_keydata {
-	OM_uint32		sign_alg;
-	OM_uint32		seal_alg;
-	gss_krb5_lucid_key_t	ctx_key;
-} gss_krb5_rfc1964_keydata_t;
-
-typedef struct gss_krb5_cfx_keydata {
-	OM_uint32		have_acceptor_subkey;
-	gss_krb5_lucid_key_t	ctx_key;
-	gss_krb5_lucid_key_t	acceptor_subkey;
-} gss_krb5_cfx_keydata_t;
-
-typedef struct gss_krb5_lucid_context_v1 {
-	OM_uint32	version;
-	OM_uint32	initiate;
-	OM_uint32	endtime;
-	OM_uint64	send_seq;
-	OM_uint64	recv_seq;
-	OM_uint32	protocol;
-	gss_krb5_rfc1964_keydata_t rfc1964_kd;
-	gss_krb5_cfx_keydata_t	   cfx_kd;
-} gss_krb5_lucid_context_v1_t;
-
-typedef struct gss_krb5_lucid_context_version {
-	OM_uint32	version;	/* Structure version number */
-} gss_krb5_lucid_context_version_t;
-
-/*
- * Function declarations
- */
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gss_krb5_export_lucid_sec_context(OM_uint32 *minor_status,
-				  gss_ctx_id_t *context_handle,
-				  OM_uint32 version,
-				  void **kctx);
-
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gss_krb5_free_lucid_sec_context(OM_uint32 *minor_status,
-				void *kctx);
-
-
-GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
-gss_krb5_set_allowable_enctypes(OM_uint32 *minor_status,
-				gss_cred_id_t cred,
-				OM_uint32 num_enctypes,
-				int32_t *enctypes);
-
-GSSAPI_CPP_END
-
-#endif /* GSSAPI_SPNEGO_H_ */
diff --git a/include.new/hdb-private.h b/include.new/hdb-private.h
deleted file mode 100644
index a47de70..0000000
--- a/include.new/hdb-private.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This is a generated file */
-#ifndef __hdb_private_h__
-#define __hdb_private_h__
-
-#include <stdarg.h>
-
-krb5_error_code
-_hdb_fetch (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	unsigned /*flags*/,
-	hdb_entry */*entry*/);
-
-krb5_error_code
-_hdb_remove (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	hdb_entry */*entry*/);
-
-krb5_error_code
-_hdb_store (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	unsigned /*flags*/,
-	hdb_entry */*entry*/);
-
-#endif /* __hdb_private_h__ */
diff --git a/include.new/hdb-protos.h b/include.new/hdb-protos.h
deleted file mode 100644
index 44a1bdd..0000000
--- a/include.new/hdb-protos.h
+++ /dev/null
@@ -1,416 +0,0 @@
-/* This is a generated file */
-#ifndef __hdb_protos_h__
-#define __hdb_protos_h__
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-krb5_error_code
-hdb_add_master_key (
-	krb5_context /*context*/,
-	krb5_keyblock */*key*/,
-	hdb_master_key */*inout*/);
-
-krb5_error_code
-hdb_check_db_format (
-	krb5_context /*context*/,
-	HDB */*db*/);
-
-krb5_error_code
-hdb_clear_extension (
-	krb5_context /*context*/,
-	hdb_entry */*entry*/,
-	int /*type*/);
-
-krb5_error_code
-hdb_clear_master_key (
-	krb5_context /*context*/,
-	HDB */*db*/);
-
-krb5_error_code
-hdb_create (
-	krb5_context /*context*/,
-	HDB **/*db*/,
-	const char */*filename*/);
-
-krb5_error_code
-hdb_db_create (
-	krb5_context /*context*/,
-	HDB **/*db*/,
-	const char */*filename*/);
-
-const char *
-hdb_db_dir (krb5_context /*context*/);
-
-const char *
-hdb_dbinfo_get_acl_file (
-	krb5_context /*context*/,
-	struct hdb_dbinfo */*dbp*/);
-
-const krb5_config_binding *
-hdb_dbinfo_get_binding (
-	krb5_context /*context*/,
-	struct hdb_dbinfo */*dbp*/);
-
-const char *
-hdb_dbinfo_get_dbname (
-	krb5_context /*context*/,
-	struct hdb_dbinfo */*dbp*/);
-
-const char *
-hdb_dbinfo_get_label (
-	krb5_context /*context*/,
-	struct hdb_dbinfo */*dbp*/);
-
-const char *
-hdb_dbinfo_get_log_file (
-	krb5_context /*context*/,
-	struct hdb_dbinfo */*dbp*/);
-
-const char *
-hdb_dbinfo_get_mkey_file (
-	krb5_context /*context*/,
-	struct hdb_dbinfo */*dbp*/);
-
-struct hdb_dbinfo *
-hdb_dbinfo_get_next (
-	struct hdb_dbinfo */*dbp*/,
-	struct hdb_dbinfo */*dbprevp*/);
-
-const char *
-hdb_dbinfo_get_realm (
-	krb5_context /*context*/,
-	struct hdb_dbinfo */*dbp*/);
-
-const char *
-hdb_default_db (krb5_context /*context*/);
-
-krb5_error_code
-hdb_enctype2key (
-	krb5_context /*context*/,
-	hdb_entry */*e*/,
-	krb5_enctype /*enctype*/,
-	Key **/*key*/);
-
-krb5_error_code
-hdb_entry2string (
-	krb5_context /*context*/,
-	hdb_entry */*ent*/,
-	char **/*str*/);
-
-int
-hdb_entry2value (
-	krb5_context /*context*/,
-	const hdb_entry */*ent*/,
-	krb5_data */*value*/);
-
-int
-hdb_entry_alias2value (
-	krb5_context /*context*/,
-	const hdb_entry_alias */*alias*/,
-	krb5_data */*value*/);
-
-krb5_error_code
-hdb_entry_check_mandatory (
-	krb5_context /*context*/,
-	const hdb_entry */*ent*/);
-
-int
-hdb_entry_clear_password (
-	krb5_context /*context*/,
-	hdb_entry */*entry*/);
-
-krb5_error_code
-hdb_entry_get_ConstrainedDelegACL (
-	const hdb_entry */*entry*/,
-	const HDB_Ext_Constrained_delegation_acl **/*a*/);
-
-krb5_error_code
-hdb_entry_get_aliases (
-	const hdb_entry */*entry*/,
-	const HDB_Ext_Aliases **/*a*/);
-
-int
-hdb_entry_get_password (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	const hdb_entry */*entry*/,
-	char **/*p*/);
-
-krb5_error_code
-hdb_entry_get_pkinit_acl (
-	const hdb_entry */*entry*/,
-	const HDB_Ext_PKINIT_acl **/*a*/);
-
-krb5_error_code
-hdb_entry_get_pkinit_cert (
-	const hdb_entry */*entry*/,
-	const HDB_Ext_PKINIT_cert **/*a*/);
-
-krb5_error_code
-hdb_entry_get_pkinit_hash (
-	const hdb_entry */*entry*/,
-	const HDB_Ext_PKINIT_hash **/*a*/);
-
-krb5_error_code
-hdb_entry_get_pw_change_time (
-	const hdb_entry */*entry*/,
-	time_t */*t*/);
-
-int
-hdb_entry_set_password (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	hdb_entry */*entry*/,
-	const char */*p*/);
-
-krb5_error_code
-hdb_entry_set_pw_change_time (
-	krb5_context /*context*/,
-	hdb_entry */*entry*/,
-	time_t /*t*/);
-
-HDB_extension *
-hdb_find_extension (
-	const hdb_entry */*entry*/,
-	int /*type*/);
-
-krb5_error_code
-hdb_foreach (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	unsigned /*flags*/,
-	hdb_foreach_func_t /*func*/,
-	void */*data*/);
-
-void
-hdb_free_dbinfo (
-	krb5_context /*context*/,
-	struct hdb_dbinfo **/*dbp*/);
-
-void
-hdb_free_entry (
-	krb5_context /*context*/,
-	hdb_entry_ex */*ent*/);
-
-void
-hdb_free_key (Key */*key*/);
-
-void
-hdb_free_keys (
-	krb5_context /*context*/,
-	int /*len*/,
-	Key */*keys*/);
-
-void
-hdb_free_master_key (
-	krb5_context /*context*/,
-	hdb_master_key /*mkey*/);
-
-krb5_error_code
-hdb_generate_key_set (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	Key **/*ret_key_set*/,
-	size_t */*nkeyset*/,
-	int /*no_salt*/);
-
-krb5_error_code
-hdb_generate_key_set_password (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	const char */*password*/,
-	Key **/*keys*/,
-	size_t */*num_keys*/);
-
-int
-hdb_get_dbinfo (
-	krb5_context /*context*/,
-	struct hdb_dbinfo **/*dbp*/);
-
-krb5_error_code
-hdb_init_db (
-	krb5_context /*context*/,
-	HDB */*db*/);
-
-int
-hdb_key2principal (
-	krb5_context /*context*/,
-	krb5_data */*key*/,
-	krb5_principal /*p*/);
-
-krb5_error_code
-hdb_keytab_create (
-	krb5_context /*context*/,
-	HDB ** /*db*/,
-	const char */*arg*/);
-
-krb5_error_code
-hdb_ldap_create (
-	krb5_context /*context*/,
-	HDB ** /*db*/,
-	const char */*arg*/);
-
-krb5_error_code
-hdb_ldapi_create (
-	krb5_context /*context*/,
-	HDB ** /*db*/,
-	const char */*arg*/);
-
-krb5_error_code
-hdb_list_builtin (
-	krb5_context /*context*/,
-	char **/*list*/);
-
-krb5_error_code
-hdb_lock (
-	int /*fd*/,
-	int /*operation*/);
-
-krb5_error_code
-hdb_mdb_create (
-	krb5_context /*context*/,
-	HDB **/*db*/,
-	const char */*filename*/);
-
-krb5_error_code
-hdb_ndbm_create (
-	krb5_context /*context*/,
-	HDB **/*db*/,
-	const char */*filename*/);
-
-krb5_error_code
-hdb_next_enctype2key (
-	krb5_context /*context*/,
-	const hdb_entry */*e*/,
-	krb5_enctype /*enctype*/,
-	Key **/*key*/);
-
-int
-hdb_principal2key (
-	krb5_context /*context*/,
-	krb5_const_principal /*p*/,
-	krb5_data */*key*/);
-
-krb5_error_code
-hdb_print_entry (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	hdb_entry_ex */*entry*/,
-	void */*data*/);
-
-krb5_error_code
-hdb_process_master_key (
-	krb5_context /*context*/,
-	int /*kvno*/,
-	krb5_keyblock */*key*/,
-	krb5_enctype /*etype*/,
-	hdb_master_key */*mkey*/);
-
-krb5_error_code
-hdb_read_master_key (
-	krb5_context /*context*/,
-	const char */*filename*/,
-	hdb_master_key */*mkey*/);
-
-krb5_error_code
-hdb_replace_extension (
-	krb5_context /*context*/,
-	hdb_entry */*entry*/,
-	const HDB_extension */*ext*/);
-
-krb5_error_code
-hdb_seal_key (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	Key */*k*/);
-
-krb5_error_code
-hdb_seal_key_mkey (
-	krb5_context /*context*/,
-	Key */*k*/,
-	hdb_master_key /*mkey*/);
-
-krb5_error_code
-hdb_seal_keys (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	hdb_entry */*ent*/);
-
-krb5_error_code
-hdb_seal_keys_mkey (
-	krb5_context /*context*/,
-	hdb_entry */*ent*/,
-	hdb_master_key /*mkey*/);
-
-krb5_error_code
-hdb_set_master_key (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	krb5_keyblock */*key*/);
-
-krb5_error_code
-hdb_set_master_keyfile (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	const char */*keyfile*/);
-
-krb5_error_code
-hdb_sqlite_create (
-	krb5_context /*context*/,
-	HDB **/*db*/,
-	const char */*argument*/);
-
-krb5_error_code
-hdb_unlock (int /*fd*/);
-
-krb5_error_code
-hdb_unseal_key (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	Key */*k*/);
-
-krb5_error_code
-hdb_unseal_key_mkey (
-	krb5_context /*context*/,
-	Key */*k*/,
-	hdb_master_key /*mkey*/);
-
-krb5_error_code
-hdb_unseal_keys (
-	krb5_context /*context*/,
-	HDB */*db*/,
-	hdb_entry */*ent*/);
-
-krb5_error_code
-hdb_unseal_keys_mkey (
-	krb5_context /*context*/,
-	hdb_entry */*ent*/,
-	hdb_master_key /*mkey*/);
-
-int
-hdb_value2entry (
-	krb5_context /*context*/,
-	krb5_data */*value*/,
-	hdb_entry */*ent*/);
-
-int
-hdb_value2entry_alias (
-	krb5_context /*context*/,
-	krb5_data */*value*/,
-	hdb_entry_alias */*ent*/);
-
-krb5_error_code
-hdb_write_master_key (
-	krb5_context /*context*/,
-	const char */*filename*/,
-	hdb_master_key /*mkey*/);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __hdb_protos_h__ */
diff --git a/include.new/hdb.h b/include.new/hdb.h
deleted file mode 100644
index f164d12..0000000
--- a/include.new/hdb.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 1997 - 2007 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id: hdb.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __HDB_H__
-#define __HDB_H__
-
-#include <krb5.h>
-
-#include <hdb_err.h>
-
-#include <heim_asn1.h>
-#include <hdb_asn1.h>
-
-struct hdb_dbinfo;
-
-enum hdb_lockop{ HDB_RLOCK, HDB_WLOCK };
-
-/* flags for various functions */
-#define HDB_F_DECRYPT		1	/* decrypt keys */
-#define HDB_F_REPLACE		2	/* replace entry */
-#define HDB_F_GET_CLIENT	4	/* fetch client */
-#define HDB_F_GET_SERVER	8	/* fetch server */
-#define HDB_F_GET_KRBTGT	16	/* fetch krbtgt */
-#define HDB_F_GET_ANY		28	/* fetch any of client,server,krbtgt */
-#define HDB_F_CANON		32	/* want canonicalition */
-#define HDB_F_ADMIN_DATA	64	/* want data that kdc don't use  */
-#define HDB_F_KVNO_SPECIFIED	128	/* we want a particular KVNO */
-#define HDB_F_CURRENT_KVNO	256	/* we want the current KVNO */
-/* 512, 1024, 2048 are reserved for kvno operations that is not part of the 1.5 branch */
-#define HDB_F_ALL_KVNOS		2048	/* we want all the keys, live or not */
-#define HDB_F_FOR_AS_REQ	4096	/* fetch is for a AS REQ */
-#define HDB_F_FOR_TGS_REQ	8192	/* fetch is for a TGS REQ */
-
-/* hdb_capability_flags */
-#define HDB_CAP_F_HANDLE_ENTERPRISE_PRINCIPAL 1
-#define HDB_CAP_F_HANDLE_PASSWORDS	2
-#define HDB_CAP_F_PASSWORD_UPDATE_KEYS	4
-
-/* auth status values */
-#define HDB_AUTH_SUCCESS		0
-#define HDB_AUTH_WRONG_PASSWORD		1
-#define HDB_AUTH_INVALID_SIGNATURE	2
-
-/* key usage for master key */
-#define HDB_KU_MKEY	0x484442
-
-typedef struct hdb_master_key_data *hdb_master_key;
-
-/**
- * hdb_entry_ex is a wrapper structure around the hdb_entry structure
- * that allows backends to keep a pointer to the backing store, ie in
- * ->hdb_fetch_kvno(), so that we the kadmin/kpasswd backend gets around to
- * ->hdb_store(), the backend doesn't need to lookup the entry again.
- */
-
-typedef struct hdb_entry_ex {
-    void *ctx;
-    hdb_entry entry;
-    void (*free_entry)(krb5_context, struct hdb_entry_ex *);
-} hdb_entry_ex;
-
-
-/**
- * HDB backend function pointer structure
- *
- * The HDB structure is what the KDC and kadmind framework uses to
- * query the backend database when talking about principals.
- */
-
-typedef struct HDB{
-    void *hdb_db;
-    void *hdb_dbc; /** don't use, only for DB3 */
-    char *hdb_name;
-    int hdb_master_key_set;
-    hdb_master_key hdb_master_key;
-    int hdb_openp;
-    int hdb_capability_flags;
-    /**
-     * Open (or create) the a Kerberos database.
-     *
-     * Open (or create) the a Kerberos database that was resolved with
-     * hdb_create(). The third and fourth flag to the function are the
-     * same as open(), thus passing O_CREAT will create the data base
-     * if it doesn't exists.
-     *
-     * Then done the caller should call hdb_close(), and to release
-     * all resources hdb_destroy().
-     */
-    krb5_error_code (*hdb_open)(krb5_context, struct HDB*, int, mode_t);
-    /**
-     * Close the database for transaction
-     *
-     * Closes the database for further transactions, wont release any
-     * permanant resources. the database can be ->hdb_open-ed again.
-     */
-    krb5_error_code (*hdb_close)(krb5_context, struct HDB*);
-    /**
-     * Free an entry after use.
-     */
-    void	    (*hdb_free)(krb5_context, struct HDB*, hdb_entry_ex*);
-    /**
-     * Fetch an entry from the backend
-     *
-     * Fetch an entry from the backend, flags are what type of entry
-     * should be fetch: client, server, krbtgt.
-     * knvo (if specified and flags HDB_F_KVNO_SPECIFIED set) is the kvno to get
-     */
-    krb5_error_code (*hdb_fetch_kvno)(krb5_context, struct HDB*,
-				      krb5_const_principal, unsigned, krb5_kvno,
-				      hdb_entry_ex*);
-    /**
-     * Store an entry to database
-     */
-    krb5_error_code (*hdb_store)(krb5_context, struct HDB*,
-				 unsigned, hdb_entry_ex*);
-    /**
-     * Remove an entry from the database.
-     */
-    krb5_error_code (*hdb_remove)(krb5_context, struct HDB*,
-				  krb5_const_principal);
-    /**
-     * As part of iteration, fetch one entry
-     */
-    krb5_error_code (*hdb_firstkey)(krb5_context, struct HDB*,
-				    unsigned, hdb_entry_ex*);
-    /**
-     * As part of iteration, fetch next entry
-     */
-    krb5_error_code (*hdb_nextkey)(krb5_context, struct HDB*,
-				   unsigned, hdb_entry_ex*);
-    /**
-     * Lock database
-     *
-     * A lock can only be held by one consumers. Transaction can still
-     * happen on the database while the lock is held, so the entry is
-     * only useful for syncroning creation of the database and renaming of the database.
-     */
-    krb5_error_code (*hdb_lock)(krb5_context, struct HDB*, int);
-    /**
-     * Unlock database
-     */
-    krb5_error_code (*hdb_unlock)(krb5_context, struct HDB*);
-    /**
-     * Rename the data base.
-     *
-     * Assume that the database is not hdb_open'ed and not locked.
-     */
-    krb5_error_code (*hdb_rename)(krb5_context, struct HDB*, const char*);
-    /**
-     * Get an hdb_entry from a classical DB backend
-     *
-     * If the database is a classical DB (ie BDB, NDBM, GDBM, etc)
-     * backend, this function will take a principal key (krb5_data)
-     * and return all data related to principal in the return
-     * krb5_data. The returned encoded entry is of type hdb_entry or
-     * hdb_entry_alias.
-     */
-    krb5_error_code (*hdb__get)(krb5_context, struct HDB*,
-				krb5_data, krb5_data*);
-    /**
-     * Store an hdb_entry from a classical DB backend
-     *
-     * Same discussion as in @ref HDB::hdb__get
-     */
-    krb5_error_code (*hdb__put)(krb5_context, struct HDB*, int,
-				krb5_data, krb5_data);
-    /**
-     * Delete and hdb_entry from a classical DB backend
-     *
-     * Same discussion as in @ref HDB::hdb__get
-     */
-    krb5_error_code (*hdb__del)(krb5_context, struct HDB*, krb5_data);
-    /**
-     * Destroy the handle to the database.
-     *
-     * Destroy the handle to the database, deallocate all memory and
-     * related resources. Does not remove any permanent data. Its the
-     * logical reverse of hdb_create() function that is the entry
-     * point for the module.
-     */
-    krb5_error_code (*hdb_destroy)(krb5_context, struct HDB*);
-    /**
-     * Get the list of realms this backend handles.
-     * This call is optional to support. The returned realms are used
-     * for announcing the realms over bonjour. Free returned array
-     * with krb5_free_host_realm().
-     */
-    krb5_error_code (*hdb_get_realms)(krb5_context, struct HDB *, krb5_realm **);
-    /**
-     * Change password.
-     *
-     * Will update keys for the entry when given password.  The new
-     * keys must be written into the entry and will then later be
-     * ->hdb_store() into the database. The backend will still perform
-     * all other operations, increasing the kvno, and update
-     * modification timestamp.
-     *
-     * The backend needs to call _kadm5_set_keys() and perform password
-     * quality checks.
-     */
-    krb5_error_code (*hdb_password)(krb5_context, struct HDB*, hdb_entry_ex*, const char *, int);
-
-    /**
-     * Auth feedback
-     *
-     * This is a feedback call that allows backends that provides
-     * lockout functionality to register failure and/or successes.
-     *
-     * In case the entry is locked out, the backend should set the
-     * hdb_entry.flags.locked-out flag.
-     */
-    krb5_error_code (*hdb_auth_status)(krb5_context, struct HDB *, hdb_entry_ex *, int);
-    /**
-     * Check if delegation is allowed.
-     */
-    krb5_error_code (*hdb_check_constrained_delegation)(krb5_context, struct HDB *, hdb_entry_ex *, krb5_const_principal);
-
-    /**
-     * Check if this name is an alias for the supplied client for PKINIT userPrinicpalName logins
-     */
-    krb5_error_code (*hdb_check_pkinit_ms_upn_match)(krb5_context, struct HDB *, hdb_entry_ex *, krb5_const_principal);
-
-    /**
-     * Check if s4u2self is allowed from this client to this server
-     */
-    krb5_error_code (*hdb_check_s4u2self)(krb5_context, struct HDB *, hdb_entry_ex *, krb5_const_principal);
-}HDB;
-
-#define HDB_INTERFACE_VERSION	7
-
-struct hdb_so_method {
-    int version;
-    const char *prefix;
-    krb5_error_code (*create)(krb5_context, HDB **, const char *filename);
-};
-
-typedef krb5_error_code (*hdb_foreach_func_t)(krb5_context, HDB*,
-					      hdb_entry_ex*, void*);
-extern krb5_kt_ops hdb_kt_ops;
-
-struct hdb_method {
-    int interface_version;
-    const char *prefix;
-    krb5_error_code (*create)(krb5_context, HDB **, const char *filename);
-};
-
-extern const int hdb_interface_version;
-
-#include <hdb-protos.h>
-
-#endif /* __HDB_H__ */
diff --git a/include.new/hdb_asn1.h b/include.new/hdb_asn1.h
deleted file mode 100644
index 724c91f..0000000
--- a/include.new/hdb_asn1.h
+++ /dev/null
@@ -1,540 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libhdb/../../../crypto/heimdal/lib/hdb/hdb.asn1 */
-/* Do not edit */
-
-#ifndef __hdb_asn1_h__
-#define __hdb_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <krb5_asn1.h>
-enum { HDB_DB_FORMAT = 2 };
-
-enum { hdb_pw_salt = 3 };
-
-enum { hdb_afs3_salt = 10 };
-
-/*
-Salt ::= SEQUENCE {
-  type            [0] INTEGER (0..2147483647),
-  salt            [1] OCTET STRING,
-  opaque          [2] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct Salt {
-  unsigned int type;
-  heim_octet_string salt;
-  heim_octet_string *opaque;
-} Salt;
-
-ASN1EXP int    ASN1CALL decode_Salt(const unsigned char *, size_t, Salt *, size_t *);
-ASN1EXP int    ASN1CALL encode_Salt(unsigned char *, size_t, const Salt *, size_t *);
-ASN1EXP size_t ASN1CALL length_Salt(const Salt *);
-ASN1EXP int    ASN1CALL copy_Salt  (const Salt *, Salt *);
-ASN1EXP void   ASN1CALL free_Salt  (Salt *);
-
-
-/*
-Key ::= SEQUENCE {
-  mkvno           [0] INTEGER (0..2147483647) OPTIONAL,
-  key             [1] EncryptionKey,
-  salt            [2] Salt OPTIONAL,
-}
-*/
-
-typedef struct Key {
-  unsigned int *mkvno;
-  EncryptionKey key;
-  Salt *salt;
-} Key;
-
-ASN1EXP int    ASN1CALL decode_Key(const unsigned char *, size_t, Key *, size_t *);
-ASN1EXP int    ASN1CALL encode_Key(unsigned char *, size_t, const Key *, size_t *);
-ASN1EXP size_t ASN1CALL length_Key(const Key *);
-ASN1EXP int    ASN1CALL copy_Key  (const Key *, Key *);
-ASN1EXP void   ASN1CALL free_Key  (Key *);
-
-
-/*
-Event ::= SEQUENCE {
-  time            [0] KerberosTime,
-  principal       [1] Principal OPTIONAL,
-}
-*/
-
-typedef struct Event {
-  KerberosTime time;
-  Principal *principal;
-} Event;
-
-ASN1EXP int    ASN1CALL decode_Event(const unsigned char *, size_t, Event *, size_t *);
-ASN1EXP int    ASN1CALL encode_Event(unsigned char *, size_t, const Event *, size_t *);
-ASN1EXP size_t ASN1CALL length_Event(const Event *);
-ASN1EXP int    ASN1CALL copy_Event  (const Event *, Event *);
-ASN1EXP void   ASN1CALL free_Event  (Event *);
-
-
-/*
-HDBFlags ::= BIT STRING {
-  initial(0),
-  forwardable(1),
-  proxiable(2),
-  renewable(3),
-  postdate(4),
-  server(5),
-  client(6),
-  invalid(7),
-  require-preauth(8),
-  change-pw(9),
-  require-hwauth(10),
-  ok-as-delegate(11),
-  user-to-user(12),
-  immutable(13),
-  trusted-for-delegation(14),
-  allow-kerberos4(15),
-  allow-digest(16),
-  locked-out(17)
-}
-*/
-
-typedef struct HDBFlags {
-  unsigned int initial:1;
-  unsigned int forwardable:1;
-  unsigned int proxiable:1;
-  unsigned int renewable:1;
-  unsigned int postdate:1;
-  unsigned int server:1;
-  unsigned int client:1;
-  unsigned int invalid:1;
-  unsigned int require_preauth:1;
-  unsigned int change_pw:1;
-  unsigned int require_hwauth:1;
-  unsigned int ok_as_delegate:1;
-  unsigned int user_to_user:1;
-  unsigned int immutable:1;
-  unsigned int trusted_for_delegation:1;
-  unsigned int allow_kerberos4:1;
-  unsigned int allow_digest:1;
-  unsigned int locked_out:1;
-  unsigned int _unused18:1;
-  unsigned int _unused19:1;
-  unsigned int _unused20:1;
-  unsigned int _unused21:1;
-  unsigned int _unused22:1;
-  unsigned int _unused23:1;
-  unsigned int _unused24:1;
-  unsigned int _unused25:1;
-  unsigned int _unused26:1;
-  unsigned int _unused27:1;
-  unsigned int _unused28:1;
-  unsigned int _unused29:1;
-  unsigned int _unused30:1;
-  unsigned int _unused31:1;
-} HDBFlags;
-
-
-unsigned HDBFlags2int(HDBFlags);
-HDBFlags int2HDBFlags(unsigned);
-const struct units * asn1_HDBFlags_units(void);
-ASN1EXP int    ASN1CALL decode_HDBFlags(const unsigned char *, size_t, HDBFlags *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDBFlags(unsigned char *, size_t, const HDBFlags *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDBFlags(const HDBFlags *);
-ASN1EXP int    ASN1CALL copy_HDBFlags  (const HDBFlags *, HDBFlags *);
-ASN1EXP void   ASN1CALL free_HDBFlags  (HDBFlags *);
-
-
-/*
-GENERATION ::= SEQUENCE {
-  time            [0] KerberosTime,
-  usec            [1] INTEGER (0..2147483647),
-  gen             [2] INTEGER (0..2147483647),
-}
-*/
-
-typedef struct GENERATION {
-  KerberosTime time;
-  unsigned int usec;
-  unsigned int gen;
-} GENERATION;
-
-ASN1EXP int    ASN1CALL decode_GENERATION(const unsigned char *, size_t, GENERATION *, size_t *);
-ASN1EXP int    ASN1CALL encode_GENERATION(unsigned char *, size_t, const GENERATION *, size_t *);
-ASN1EXP size_t ASN1CALL length_GENERATION(const GENERATION *);
-ASN1EXP int    ASN1CALL copy_GENERATION  (const GENERATION *, GENERATION *);
-ASN1EXP void   ASN1CALL free_GENERATION  (GENERATION *);
-
-
-/*
-HDB-Ext-PKINIT-acl ::= SEQUENCE OF SEQUENCE {
-  subject         [0]   UTF8String,
-  issuer          [1]   UTF8String OPTIONAL,
-  anchor          [2]   UTF8String OPTIONAL,
-}
-*/
-
-typedef struct HDB_Ext_PKINIT_acl {
-  unsigned int len;
-  struct HDB_Ext_PKINIT_acl_val {
-    heim_utf8_string subject;
-    heim_utf8_string *issuer;
-    heim_utf8_string *anchor;
-  } *val;
-} HDB_Ext_PKINIT_acl;
-
-ASN1EXP int    ASN1CALL decode_HDB_Ext_PKINIT_acl(const unsigned char *, size_t, HDB_Ext_PKINIT_acl *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDB_Ext_PKINIT_acl(unsigned char *, size_t, const HDB_Ext_PKINIT_acl *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDB_Ext_PKINIT_acl(const HDB_Ext_PKINIT_acl *);
-ASN1EXP int    ASN1CALL copy_HDB_Ext_PKINIT_acl  (const HDB_Ext_PKINIT_acl *, HDB_Ext_PKINIT_acl *);
-ASN1EXP void   ASN1CALL free_HDB_Ext_PKINIT_acl  (HDB_Ext_PKINIT_acl *);
-
-
-/*
-HDB-Ext-PKINIT-hash ::= SEQUENCE OF SEQUENCE {
-  digest-type     [0]   OBJECT IDENTIFIER,
-  digest          [1] OCTET STRING,
-}
-*/
-
-typedef struct HDB_Ext_PKINIT_hash {
-  unsigned int len;
-  struct HDB_Ext_PKINIT_hash_val {
-    heim_oid digest_type;
-    heim_octet_string digest;
-  } *val;
-} HDB_Ext_PKINIT_hash;
-
-ASN1EXP int    ASN1CALL decode_HDB_Ext_PKINIT_hash(const unsigned char *, size_t, HDB_Ext_PKINIT_hash *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDB_Ext_PKINIT_hash(unsigned char *, size_t, const HDB_Ext_PKINIT_hash *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDB_Ext_PKINIT_hash(const HDB_Ext_PKINIT_hash *);
-ASN1EXP int    ASN1CALL copy_HDB_Ext_PKINIT_hash  (const HDB_Ext_PKINIT_hash *, HDB_Ext_PKINIT_hash *);
-ASN1EXP void   ASN1CALL free_HDB_Ext_PKINIT_hash  (HDB_Ext_PKINIT_hash *);
-
-
-/*
-HDB-Ext-PKINIT-cert ::= SEQUENCE OF SEQUENCE {
-  cert            [0] OCTET STRING,
-}
-*/
-
-typedef struct HDB_Ext_PKINIT_cert {
-  unsigned int len;
-  struct HDB_Ext_PKINIT_cert_val {
-    heim_octet_string cert;
-  } *val;
-} HDB_Ext_PKINIT_cert;
-
-ASN1EXP int    ASN1CALL decode_HDB_Ext_PKINIT_cert(const unsigned char *, size_t, HDB_Ext_PKINIT_cert *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDB_Ext_PKINIT_cert(unsigned char *, size_t, const HDB_Ext_PKINIT_cert *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDB_Ext_PKINIT_cert(const HDB_Ext_PKINIT_cert *);
-ASN1EXP int    ASN1CALL copy_HDB_Ext_PKINIT_cert  (const HDB_Ext_PKINIT_cert *, HDB_Ext_PKINIT_cert *);
-ASN1EXP void   ASN1CALL free_HDB_Ext_PKINIT_cert  (HDB_Ext_PKINIT_cert *);
-
-
-/*
-HDB-Ext-Constrained-delegation-acl ::= SEQUENCE OF Principal
-*/
-
-typedef struct HDB_Ext_Constrained_delegation_acl {
-  unsigned int len;
-  Principal *val;
-} HDB_Ext_Constrained_delegation_acl;
-
-ASN1EXP int    ASN1CALL decode_HDB_Ext_Constrained_delegation_acl(const unsigned char *, size_t, HDB_Ext_Constrained_delegation_acl *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDB_Ext_Constrained_delegation_acl(unsigned char *, size_t, const HDB_Ext_Constrained_delegation_acl *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDB_Ext_Constrained_delegation_acl(const HDB_Ext_Constrained_delegation_acl *);
-ASN1EXP int    ASN1CALL copy_HDB_Ext_Constrained_delegation_acl  (const HDB_Ext_Constrained_delegation_acl *, HDB_Ext_Constrained_delegation_acl *);
-ASN1EXP void   ASN1CALL free_HDB_Ext_Constrained_delegation_acl  (HDB_Ext_Constrained_delegation_acl *);
-
-
-/*
-HDB-Ext-Lan-Manager-OWF ::= OCTET STRING
-*/
-
-typedef heim_octet_string HDB_Ext_Lan_Manager_OWF;
-
-ASN1EXP int    ASN1CALL decode_HDB_Ext_Lan_Manager_OWF(const unsigned char *, size_t, HDB_Ext_Lan_Manager_OWF *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDB_Ext_Lan_Manager_OWF(unsigned char *, size_t, const HDB_Ext_Lan_Manager_OWF *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDB_Ext_Lan_Manager_OWF(const HDB_Ext_Lan_Manager_OWF *);
-ASN1EXP int    ASN1CALL copy_HDB_Ext_Lan_Manager_OWF  (const HDB_Ext_Lan_Manager_OWF *, HDB_Ext_Lan_Manager_OWF *);
-ASN1EXP void   ASN1CALL free_HDB_Ext_Lan_Manager_OWF  (HDB_Ext_Lan_Manager_OWF *);
-
-
-/*
-HDB-Ext-Password ::= SEQUENCE {
-  mkvno           [0] INTEGER (0..2147483647) OPTIONAL,
-  password        OCTET STRING,
-}
-*/
-
-typedef struct HDB_Ext_Password {
-  unsigned int *mkvno;
-  heim_octet_string password;
-} HDB_Ext_Password;
-
-ASN1EXP int    ASN1CALL decode_HDB_Ext_Password(const unsigned char *, size_t, HDB_Ext_Password *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDB_Ext_Password(unsigned char *, size_t, const HDB_Ext_Password *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDB_Ext_Password(const HDB_Ext_Password *);
-ASN1EXP int    ASN1CALL copy_HDB_Ext_Password  (const HDB_Ext_Password *, HDB_Ext_Password *);
-ASN1EXP void   ASN1CALL free_HDB_Ext_Password  (HDB_Ext_Password *);
-
-
-/*
-HDB-Ext-Aliases ::= SEQUENCE {
-  case-insensitive   [0] BOOLEAN,
-  aliases            [1] SEQUENCE OF Principal,
-}
-*/
-
-typedef struct HDB_Ext_Aliases {
-  int case_insensitive;
-  struct HDB_Ext_Aliases_aliases {
-    unsigned int len;
-    Principal *val;
-  } aliases;
-} HDB_Ext_Aliases;
-
-ASN1EXP int    ASN1CALL decode_HDB_Ext_Aliases(const unsigned char *, size_t, HDB_Ext_Aliases *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDB_Ext_Aliases(unsigned char *, size_t, const HDB_Ext_Aliases *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDB_Ext_Aliases(const HDB_Ext_Aliases *);
-ASN1EXP int    ASN1CALL copy_HDB_Ext_Aliases  (const HDB_Ext_Aliases *, HDB_Ext_Aliases *);
-ASN1EXP void   ASN1CALL free_HDB_Ext_Aliases  (HDB_Ext_Aliases *);
-
-
-/*
-HDB-extension ::= SEQUENCE {
-  mandatory       [0] BOOLEAN,
-  data            [1] CHOICE {
-    pkinit-acl               [0] HDB-Ext-PKINIT-acl,
-    pkinit-cert-hash         [1] HDB-Ext-PKINIT-hash,
-    allowed-to-delegate-to   [2] HDB-Ext-Constrained-delegation-acl,
-    lm-owf                   [4] HDB-Ext-Lan-Manager-OWF,
-    password                 [5] HDB-Ext-Password,
-    aliases                  [6] HDB-Ext-Aliases,
-    last-pw-change           [7] KerberosTime,
-    pkinit-cert              [8] HDB-Ext-PKINIT-cert,
-    ...,
-  },
-  ...,
-}
-*/
-
-typedef struct HDB_extension {
-  int mandatory;
-  struct HDB_extension_data {
-    enum {
-      choice_HDB_extension_data_asn1_ellipsis = 0,
-      choice_HDB_extension_data_pkinit_acl,
-      choice_HDB_extension_data_pkinit_cert_hash,
-      choice_HDB_extension_data_allowed_to_delegate_to,
-      choice_HDB_extension_data_lm_owf,
-      choice_HDB_extension_data_password,
-      choice_HDB_extension_data_aliases,
-      choice_HDB_extension_data_last_pw_change,
-      choice_HDB_extension_data_pkinit_cert
-      /* ... */
-    } element;
-    union {
-      HDB_Ext_PKINIT_acl pkinit_acl;
-      HDB_Ext_PKINIT_hash pkinit_cert_hash;
-      HDB_Ext_Constrained_delegation_acl allowed_to_delegate_to;
-      HDB_Ext_Lan_Manager_OWF lm_owf;
-      HDB_Ext_Password password;
-      HDB_Ext_Aliases aliases;
-      KerberosTime last_pw_change;
-      HDB_Ext_PKINIT_cert pkinit_cert;
-      heim_octet_string asn1_ellipsis;
-    } u;
-  } data;
-} HDB_extension;
-
-ASN1EXP int    ASN1CALL decode_HDB_extension(const unsigned char *, size_t, HDB_extension *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDB_extension(unsigned char *, size_t, const HDB_extension *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDB_extension(const HDB_extension *);
-ASN1EXP int    ASN1CALL copy_HDB_extension  (const HDB_extension *, HDB_extension *);
-ASN1EXP void   ASN1CALL free_HDB_extension  (HDB_extension *);
-
-
-/*
-HDB-extensions ::= SEQUENCE OF HDB-extension
-*/
-
-typedef struct HDB_extensions {
-  unsigned int len;
-  HDB_extension *val;
-} HDB_extensions;
-
-ASN1EXP int    ASN1CALL decode_HDB_extensions(const unsigned char *, size_t, HDB_extensions *, size_t *);
-ASN1EXP int    ASN1CALL encode_HDB_extensions(unsigned char *, size_t, const HDB_extensions *, size_t *);
-ASN1EXP size_t ASN1CALL length_HDB_extensions(const HDB_extensions *);
-ASN1EXP int    ASN1CALL copy_HDB_extensions  (const HDB_extensions *, HDB_extensions *);
-ASN1EXP void   ASN1CALL free_HDB_extensions  (HDB_extensions *);
-
-
-/*
-hdb_keyset ::= SEQUENCE {
-  kvno            [1] INTEGER (0..2147483647),
-  keys            [0] SEQUENCE OF Key,
-}
-*/
-
-typedef struct hdb_keyset {
-  unsigned int kvno;
-  struct hdb_keyset_keys {
-    unsigned int len;
-    Key *val;
-  } keys;
-} hdb_keyset;
-
-ASN1EXP int    ASN1CALL decode_hdb_keyset(const unsigned char *, size_t, hdb_keyset *, size_t *);
-ASN1EXP int    ASN1CALL encode_hdb_keyset(unsigned char *, size_t, const hdb_keyset *, size_t *);
-ASN1EXP size_t ASN1CALL length_hdb_keyset(const hdb_keyset *);
-ASN1EXP int    ASN1CALL copy_hdb_keyset  (const hdb_keyset *, hdb_keyset *);
-ASN1EXP void   ASN1CALL free_hdb_keyset  (hdb_keyset *);
-
-
-/*
-hdb_entry ::= SEQUENCE {
-  principal       [0] Principal OPTIONAL,
-  kvno            [1] INTEGER (0..2147483647),
-  keys            [2] SEQUENCE OF Key,
-  created-by      [3] Event,
-  modified-by     [4] Event OPTIONAL,
-  valid-start     [5] KerberosTime OPTIONAL,
-  valid-end       [6] KerberosTime OPTIONAL,
-  pw-end          [7] KerberosTime OPTIONAL,
-  max-life        [8] INTEGER (0..2147483647) OPTIONAL,
-  max-renew       [9] INTEGER (0..2147483647) OPTIONAL,
-  flags           [10] HDBFlags,
-  etypes          [11] SEQUENCE OF INTEGER (0..2147483647) OPTIONAL,
-  generation      [12] GENERATION OPTIONAL,
-  extensions      [13] HDB-extensions OPTIONAL,
-}
-*/
-
-typedef struct hdb_entry {
-  Principal *principal;
-  unsigned int kvno;
-  struct hdb_entry_keys {
-    unsigned int len;
-    Key *val;
-  } keys;
-  Event created_by;
-  Event *modified_by;
-  KerberosTime *valid_start;
-  KerberosTime *valid_end;
-  KerberosTime *pw_end;
-  unsigned int *max_life;
-  unsigned int *max_renew;
-  HDBFlags flags;
-  struct hdb_entry_etypes {
-    unsigned int len;
-    unsigned int *val;
-  } *etypes;
-  GENERATION *generation;
-  HDB_extensions *extensions;
-} hdb_entry;
-
-ASN1EXP int    ASN1CALL decode_hdb_entry(const unsigned char *, size_t, hdb_entry *, size_t *);
-ASN1EXP int    ASN1CALL encode_hdb_entry(unsigned char *, size_t, const hdb_entry *, size_t *);
-ASN1EXP size_t ASN1CALL length_hdb_entry(const hdb_entry *);
-ASN1EXP int    ASN1CALL copy_hdb_entry  (const hdb_entry *, hdb_entry *);
-ASN1EXP void   ASN1CALL free_hdb_entry  (hdb_entry *);
-
-
-/*
-hdb_entry_alias ::= [APPLICATION 0] SEQUENCE {
-  principal       [0] Principal OPTIONAL,
-}
-*/
-
-typedef struct hdb_entry_alias {
-  Principal *principal;
-} hdb_entry_alias;
-
-ASN1EXP int    ASN1CALL decode_hdb_entry_alias(const unsigned char *, size_t, hdb_entry_alias *, size_t *);
-ASN1EXP int    ASN1CALL encode_hdb_entry_alias(unsigned char *, size_t, const hdb_entry_alias *, size_t *);
-ASN1EXP size_t ASN1CALL length_hdb_entry_alias(const hdb_entry_alias *);
-ASN1EXP int    ASN1CALL copy_hdb_entry_alias  (const hdb_entry_alias *, hdb_entry_alias *);
-ASN1EXP void   ASN1CALL free_hdb_entry_alias  (hdb_entry_alias *);
-
-
-#endif /* __hdb_asn1_h__ */
diff --git a/include.new/hdb_err.h b/include.new/hdb_err.h
deleted file mode 100644
index 6dfb62d..0000000
--- a/include.new/hdb_err.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libhdb/../../../crypto/heimdal/lib/hdb/hdb_err.et */
-/* $Id: hdb_err.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __hdb_err_h__
-#define __hdb_err_h__
-
-struct et_list;
-
-void initialize_hdb_error_table_r(struct et_list **);
-
-void initialize_hdb_error_table(void);
-#define init_hdb_err_tbl initialize_hdb_error_table
-
-typedef enum hdb_error_number{
-	HDB_ERR_UK_SERROR = 36150273,
-	HDB_ERR_UK_RERROR = 36150274,
-	HDB_ERR_NOENTRY = 36150275,
-	HDB_ERR_DB_INUSE = 36150276,
-	HDB_ERR_DB_CHANGED = 36150277,
-	HDB_ERR_RECURSIVELOCK = 36150278,
-	HDB_ERR_NOTLOCKED = 36150279,
-	HDB_ERR_BADLOCKMODE = 36150280,
-	HDB_ERR_CANT_LOCK_DB = 36150281,
-	HDB_ERR_EXISTS = 36150282,
-	HDB_ERR_BADVERSION = 36150283,
-	HDB_ERR_NO_MKEY = 36150284,
-	HDB_ERR_MANDATORY_OPTION = 36150285,
-	HDB_ERR_NO_WRITE_SUPPORT = 36150286,
-	HDB_ERR_NOT_FOUND_HERE = 36150287
-} hdb_error_number;
-
-#define ERROR_TABLE_BASE_hdb 36150272
-
-#define COM_ERR_BINDDOMAIN_hdb "heim_com_err36150272"
-
-#endif /* __hdb_err_h__ */
diff --git a/include.new/heim_asn1.h b/include.new/heim_asn1.h
deleted file mode 100644
index 4eeafc2..0000000
--- a/include.new/heim_asn1.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2003-2005 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-#ifndef __HEIM_ANY_H__
-#define __HEIM_ANY_H__ 1
-
-int	encode_heim_any(unsigned char *, size_t, const heim_any *, size_t *);
-int	decode_heim_any(const unsigned char *, size_t, heim_any *, size_t *);
-void	free_heim_any(heim_any *);
-size_t	length_heim_any(const heim_any *);
-int	copy_heim_any(const heim_any *, heim_any *);
-
-int	encode_heim_any_set(unsigned char *, size_t,
-			    const heim_any_set *, size_t *);
-int	decode_heim_any_set(const unsigned char *, size_t,
-			    heim_any_set *,size_t *);
-void	free_heim_any_set(heim_any_set *);
-size_t	length_heim_any_set(const heim_any_set *);
-int	copy_heim_any_set(const heim_any_set *, heim_any_set *);
-int	heim_any_cmp(const heim_any_set *, const heim_any_set *);
-
-#endif /* __HEIM_ANY_H__ */
diff --git a/include.new/heim_err.h b/include.new/heim_err.h
deleted file mode 100644
index 521f102..0000000
--- a/include.new/heim_err.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/heim_err.et */
-/* $Id: heim_err.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __heim_err_h__
-#define __heim_err_h__
-
-struct et_list;
-
-void initialize_heim_error_table_r(struct et_list **);
-
-void initialize_heim_error_table(void);
-#define init_heim_err_tbl initialize_heim_error_table
-
-typedef enum heim_error_number{
-	HEIM_ERR_LOG_PARSE = -1980176640,
-	HEIM_ERR_V4_PRINC_NO_CONV = -1980176639,
-	HEIM_ERR_SALTTYPE_NOSUPP = -1980176638,
-	HEIM_ERR_NOHOST = -1980176637,
-	HEIM_ERR_OPNOTSUPP = -1980176636,
-	HEIM_ERR_EOF = -1980176635,
-	HEIM_ERR_BAD_MKEY = -1980176634,
-	HEIM_ERR_SERVICE_NOMATCH = -1980176633,
-	HEIM_ERR_NOT_SEEKABLE = -1980176632,
-	HEIM_ERR_TOO_BIG = -1980176631,
-	HEIM_ERR_BAD_HDBENT_ENCODING = -1980176630,
-	HEIM_PKINIT_NO_CERTIFICATE = -1980176576,
-	HEIM_PKINIT_NO_PRIVATE_KEY = -1980176575,
-	HEIM_PKINIT_NO_VALID_CA = -1980176574,
-	HEIM_PKINIT_CERTIFICATE_INVALID = -1980176573,
-	HEIM_PKINIT_PRIVATE_KEY_INVALID = -1980176572,
-	HEIM_EAI_UNKNOWN = -1980176512,
-	HEIM_EAI_ADDRFAMILY = -1980176511,
-	HEIM_EAI_AGAIN = -1980176510,
-	HEIM_EAI_BADFLAGS = -1980176509,
-	HEIM_EAI_FAIL = -1980176508,
-	HEIM_EAI_FAMILY = -1980176507,
-	HEIM_EAI_MEMORY = -1980176506,
-	HEIM_EAI_NODATA = -1980176505,
-	HEIM_EAI_NONAME = -1980176504,
-	HEIM_EAI_SERVICE = -1980176503,
-	HEIM_EAI_SOCKTYPE = -1980176502,
-	HEIM_EAI_SYSTEM = -1980176501
-} heim_error_number;
-
-#define ERROR_TABLE_BASE_heim -1980176640
-
-#define COM_ERR_BINDDOMAIN_heim "heim_com_err-1980176640"
-
-#endif /* __heim_err_h__ */
diff --git a/include.new/heim_threads.h b/include.new/heim_threads.h
deleted file mode 100644
index 8ff677f..0000000
--- a/include.new/heim_threads.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2003 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-/*
- * Provide wrapper macros for thread synchronization primitives so we
- * can use native thread functions for those operating system that
- * supports it.
- *
- * This is so libkrb5.so (or more importantly, libgssapi.so) can have
- * thread support while the program that that dlopen(3)s the library
- * don't need to be linked to libpthread.
- */
-
-#ifndef HEIM_THREADS_H
-#define HEIM_THREADS_H 1
-
-/* assume headers already included */
-
-#if defined(__NetBSD__) && __NetBSD_Version__ >= 106120000 && __NetBSD_Version__< 299001200 && defined(ENABLE_PTHREAD_SUPPORT)
-
-/*
- * NetBSD have a thread lib that we can use that part of libc that
- * works regardless if application are linked to pthreads or not.
- * NetBSD newer then 2.99.11 just use pthread.h, and the same thing
- * will happen.
- */
-#include <threadlib.h>
-
-#define HEIMDAL_MUTEX mutex_t
-#define HEIMDAL_MUTEX_INITIALIZER MUTEX_INITIALIZER
-#define HEIMDAL_MUTEX_init(m) mutex_init(m, NULL)
-#define HEIMDAL_MUTEX_lock(m) mutex_lock(m)
-#define HEIMDAL_MUTEX_unlock(m) mutex_unlock(m)
-#define HEIMDAL_MUTEX_destroy(m) mutex_destroy(m)
-
-#define HEIMDAL_RWLOCK rwlock_t
-#define HEIMDAL_RWLOCK_INITIALIZER RWLOCK_INITIALIZER
-#define	HEIMDAL_RWLOCK_init(l) rwlock_init(l, NULL)
-#define	HEIMDAL_RWLOCK_rdlock(l) rwlock_rdlock(l)
-#define	HEIMDAL_RWLOCK_wrlock(l) rwlock_wrlock(l)
-#define	HEIMDAL_RWLOCK_tryrdlock(l) rwlock_tryrdlock(l)
-#define	HEIMDAL_RWLOCK_trywrlock(l) rwlock_trywrlock(l)
-#define	HEIMDAL_RWLOCK_unlock(l) rwlock_unlock(l)
-#define	HEIMDAL_RWLOCK_destroy(l) rwlock_destroy(l)
-
-#define HEIMDAL_thread_key thread_key_t
-#define HEIMDAL_key_create(k,d,r) do { r = thr_keycreate(k,d); } while(0)
-#define HEIMDAL_setspecific(k,s,r) do { r = thr_setspecific(k,s); } while(0)
-#define HEIMDAL_getspecific(k) thr_getspecific(k)
-#define HEIMDAL_key_delete(k) thr_keydelete(k)
-
-#elif defined(ENABLE_PTHREAD_SUPPORT) && (!defined(__NetBSD__) || __NetBSD_Version__ >= 299001200)
-
-#include <pthread.h>
-
-#define HEIMDAL_MUTEX pthread_mutex_t
-#define HEIMDAL_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER
-#define HEIMDAL_MUTEX_init(m) pthread_mutex_init(m, NULL)
-#define HEIMDAL_MUTEX_lock(m) pthread_mutex_lock(m)
-#define HEIMDAL_MUTEX_unlock(m) pthread_mutex_unlock(m)
-#define HEIMDAL_MUTEX_destroy(m) pthread_mutex_destroy(m)
-
-#define HEIMDAL_RWLOCK rwlock_t
-#define HEIMDAL_RWLOCK_INITIALIZER RWLOCK_INITIALIZER
-#define	HEIMDAL_RWLOCK_init(l) pthread_rwlock_init(l, NULL)
-#define	HEIMDAL_RWLOCK_rdlock(l) pthread_rwlock_rdlock(l)
-#define	HEIMDAL_RWLOCK_wrlock(l) pthread_rwlock_wrlock(l)
-#define	HEIMDAL_RWLOCK_tryrdlock(l) pthread_rwlock_tryrdlock(l)
-#define	HEIMDAL_RWLOCK_trywrlock(l) pthread_rwlock_trywrlock(l)
-#define	HEIMDAL_RWLOCK_unlock(l) pthread_rwlock_unlock(l)
-#define	HEIMDAL_RWLOCK_destroy(l) pthread_rwlock_destroy(l)
-
-#define HEIMDAL_thread_key pthread_key_t
-#define HEIMDAL_key_create(k,d,r) do { r = pthread_key_create(k,d); } while(0)
-#define HEIMDAL_setspecific(k,s,r) do { r = pthread_setspecific(k,s); } while(0)
-#define HEIMDAL_getspecific(k) pthread_getspecific(k)
-#define HEIMDAL_key_delete(k) pthread_key_delete(k)
-
-#elif defined(HEIMDAL_DEBUG_THREADS)
-
-/* no threads support, just do consistency checks */
-#include <stdlib.h>
-
-#define HEIMDAL_MUTEX int
-#define HEIMDAL_MUTEX_INITIALIZER 0
-#define HEIMDAL_MUTEX_init(m)  do { (*(m)) = 0; } while(0)
-#define HEIMDAL_MUTEX_lock(m)  do { if ((*(m))++ != 0) abort(); } while(0)
-#define HEIMDAL_MUTEX_unlock(m) do { if ((*(m))-- != 1) abort(); } while(0)
-#define HEIMDAL_MUTEX_destroy(m) do {if ((*(m)) != 0) abort(); } while(0)
-
-#define HEIMDAL_RWLOCK rwlock_t int
-#define HEIMDAL_RWLOCK_INITIALIZER 0
-#define	HEIMDAL_RWLOCK_init(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_rdlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_wrlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_tryrdlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_trywrlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_unlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_destroy(l) do { } while(0)
-
-#define HEIMDAL_internal_thread_key 1
-
-#else /* no thread support, no debug case */
-
-#define HEIMDAL_MUTEX int
-#define HEIMDAL_MUTEX_INITIALIZER 0
-#define HEIMDAL_MUTEX_init(m)  do { (void)(m); } while(0)
-#define HEIMDAL_MUTEX_lock(m)  do { (void)(m); } while(0)
-#define HEIMDAL_MUTEX_unlock(m) do { (void)(m); } while(0)
-#define HEIMDAL_MUTEX_destroy(m) do { (void)(m); } while(0)
-
-#define HEIMDAL_RWLOCK rwlock_t int
-#define HEIMDAL_RWLOCK_INITIALIZER 0
-#define	HEIMDAL_RWLOCK_init(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_rdlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_wrlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_tryrdlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_trywrlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_unlock(l) do { } while(0)
-#define	HEIMDAL_RWLOCK_destroy(l) do { } while(0)
-
-#define HEIMDAL_internal_thread_key 1
-
-#endif /* no thread support */
-
-#ifdef HEIMDAL_internal_thread_key
-
-typedef struct heim_thread_key {
-    void *value;
-    void (*destructor)(void *);
-} heim_thread_key;
-
-#define HEIMDAL_thread_key heim_thread_key
-#define HEIMDAL_key_create(k,d,r) \
-	do { (k)->value = NULL; (k)->destructor = (d); r = 0; } while(0)
-#define HEIMDAL_setspecific(k,s,r) do { (k).value = s ; r = 0; } while(0)
-#define HEIMDAL_getspecific(k) ((k).value)
-#define HEIMDAL_key_delete(k) do { (*(k).destructor)((k).value); } while(0)
-
-#undef HEIMDAL_internal_thread_key
-#endif /* HEIMDAL_internal_thread_key */
-
-#endif /* HEIM_THREADS_H */
diff --git a/include.new/heimbase.h b/include.new/heimbase.h
deleted file mode 100644
index f1ca231..0000000
--- a/include.new/heimbase.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2010 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- *
- * Portions Copyright (c) 2010 Apple Inc. 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-#ifndef HEIM_BASE_H
-#define HEIM_BASE_H 1
-
-#include <sys/types.h>
-#include <krb5-types.h>
-#include <stdarg.h>
-#include <stdbool.h>
-
-typedef void * heim_object_t;
-typedef unsigned int heim_tid_t;
-typedef heim_object_t heim_bool_t;
-typedef heim_object_t heim_null_t;
-#define HEIM_BASE_ONCE_INIT 0
-typedef long heim_base_once_t; /* XXX arch dependant */
-
-#if !defined(__has_extension)
-#define __has_extension(x) 0
-#endif
-
-#define HEIM_REQUIRE_GNUC(m,n,p) \
-    (((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100) + __GNUC_PATCHLEVEL__) >= \
-     (((m) * 10000) + ((n) * 100) + (p)))
-
-
-#if __has_extension(__builtin_expect) || HEIM_REQUIRE_GNUC(3,0,0)
-#define heim_builtin_expect(_op,_res) __builtin_expect(_op,_res)
-#else
-#define heim_builtin_expect(_op,_res) (_op)
-#endif
-
-
-void *	heim_retain(heim_object_t);
-void	heim_release(heim_object_t);
-
-typedef void (*heim_type_dealloc)(void *);
-
-void *
-heim_alloc(size_t size, const char *name, heim_type_dealloc dealloc);
-
-heim_tid_t
-heim_get_tid(heim_object_t object);
-
-int
-heim_cmp(heim_object_t a, heim_object_t b);
-
-unsigned long
-heim_get_hash(heim_object_t ptr);
-
-void
-heim_base_once_f(heim_base_once_t *, void *, void (*)(void *));
-
-void
-heim_abort(const char *fmt, ...)
-    HEIMDAL_NORETURN_ATTRIBUTE
-    HEIMDAL_PRINTF_ATTRIBUTE((printf, 1, 2));
-
-void
-heim_abortv(const char *fmt, va_list ap)
-    HEIMDAL_NORETURN_ATTRIBUTE
-    HEIMDAL_PRINTF_ATTRIBUTE((printf, 1, 0));
-
-#define heim_assert(e,t) \
-    (heim_builtin_expect(!(e), 0) ? heim_abort(t ":" #e) : (void)0)
-
-/*
- *
- */
-
-heim_null_t
-heim_null_create(void);
-
-heim_bool_t
-heim_bool_create(int);
-
-int
-heim_bool_val(heim_bool_t);
-
-/*
- * Array
- */
-
-typedef struct heim_array_data *heim_array_t;
-
-heim_array_t heim_array_create(void);
-heim_tid_t heim_array_get_type_id(void);
-
-typedef void (*heim_array_iterator_f_t)(heim_object_t, void *);
-
-int	heim_array_append_value(heim_array_t, heim_object_t);
-void	heim_array_iterate_f(heim_array_t, heim_array_iterator_f_t, void *);
-#ifdef __BLOCKS__
-void	heim_array_iterate(heim_array_t, void (^)(heim_object_t));
-#endif
-size_t	heim_array_get_length(heim_array_t);
-heim_object_t
-	heim_array_copy_value(heim_array_t, size_t);
-void	heim_array_delete_value(heim_array_t, size_t);
-#ifdef __BLOCKS__
-void	heim_array_filter(heim_array_t, int (^)(heim_object_t));
-#endif
-
-/*
- * Dict
- */
-
-typedef struct heim_dict_data *heim_dict_t;
-
-heim_dict_t heim_dict_create(size_t size);
-heim_tid_t heim_dict_get_type_id(void);
-
-typedef void (*heim_dict_iterator_f_t)(heim_object_t, heim_object_t, void *);
-
-int	heim_dict_add_value(heim_dict_t, heim_object_t, heim_object_t);
-void	heim_dict_iterate_f(heim_dict_t, heim_dict_iterator_f_t, void *);
-#ifdef __BLOCKS__
-void	heim_dict_iterate(heim_dict_t, void (^)(heim_object_t, heim_object_t));
-#endif
-
-heim_object_t
-	heim_dict_copy_value(heim_dict_t, heim_object_t);
-void	heim_dict_delete_key(heim_dict_t, heim_object_t);
-
-/*
- * String
- */
-
-typedef struct heim_string_data *heim_string_t;
-
-heim_string_t heim_string_create(const char *);
-heim_tid_t heim_string_get_type_id(void);
-const char * heim_string_get_utf8(heim_string_t);
-
-/*
- * Number
- */
-
-typedef struct heim_number_data *heim_number_t;
-
-heim_number_t heim_number_create(int);
-heim_tid_t heim_number_get_type_id(void);
-int heim_number_get_int(heim_number_t);
-
-/*
- *
- */
-
-typedef struct heim_auto_release * heim_auto_release_t;
-
-heim_auto_release_t heim_auto_release_create(void);
-void heim_auto_release_drain(heim_auto_release_t);
-void heim_auto_release(heim_object_t);
-
-#endif /* HEIM_BASE_H */
diff --git a/include.new/heimntlm-protos.h b/include.new/heimntlm-protos.h
deleted file mode 100644
index 5f56536..0000000
--- a/include.new/heimntlm-protos.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* This is a generated file */
-#ifndef __heimntlm_protos_h__
-#define __heimntlm_protos_h__
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int
-heim_ntlm_build_ntlm1_master (
-	void */*key*/,
-	size_t /*len*/,
-	struct ntlm_buf */*session*/,
-	struct ntlm_buf */*master*/);
-
-int
-heim_ntlm_build_ntlm2_master (
-	void */*key*/,
-	size_t /*len*/,
-	struct ntlm_buf */*blob*/,
-	struct ntlm_buf */*session*/,
-	struct ntlm_buf */*master*/);
-
-int
-heim_ntlm_calculate_lm2 (
-	const void */*key*/,
-	size_t /*len*/,
-	const char */*username*/,
-	const char */*target*/,
-	const unsigned char serverchallenge[8],
-	unsigned char ntlmv2[16],
-	struct ntlm_buf */*answer*/);
-
-int
-heim_ntlm_calculate_ntlm1 (
-	void */*key*/,
-	size_t /*len*/,
-	unsigned char challenge[8],
-	struct ntlm_buf */*answer*/);
-
-int
-heim_ntlm_calculate_ntlm2 (
-	const void */*key*/,
-	size_t /*len*/,
-	const char */*username*/,
-	const char */*target*/,
-	const unsigned char serverchallenge[8],
-	const struct ntlm_buf */*infotarget*/,
-	unsigned char ntlmv2[16],
-	struct ntlm_buf */*answer*/);
-
-int
-heim_ntlm_calculate_ntlm2_sess (
-	const unsigned char clnt_nonce[8],
-	const unsigned char svr_chal[8],
-	const unsigned char ntlm_hash[16],
-	struct ntlm_buf */*lm*/,
-	struct ntlm_buf */*ntlm*/);
-
-int
-heim_ntlm_calculate_ntlm2_sess_hash (
-	const unsigned char clnt_nonce[8],
-	const unsigned char svr_chal[8],
-	unsigned char verifier[8]);
-
-int
-heim_ntlm_decode_targetinfo (
-	const struct ntlm_buf */*data*/,
-	int /*ucs2*/,
-	struct ntlm_targetinfo */*ti*/);
-
-int
-heim_ntlm_decode_type1 (
-	const struct ntlm_buf */*buf*/,
-	struct ntlm_type1 */*data*/);
-
-int
-heim_ntlm_decode_type2 (
-	const struct ntlm_buf */*buf*/,
-	struct ntlm_type2 */*type2*/);
-
-int
-heim_ntlm_decode_type3 (
-	const struct ntlm_buf */*buf*/,
-	int /*ucs2*/,
-	struct ntlm_type3 */*type3*/);
-
-void
-heim_ntlm_derive_ntlm2_sess (
-	const unsigned char sessionkey[16],
-	const unsigned char */*clnt_nonce*/,
-	size_t /*clnt_nonce_length*/,
-	const unsigned char svr_chal[8],
-	unsigned char derivedkey[16]);
-
-int
-heim_ntlm_encode_targetinfo (
-	const struct ntlm_targetinfo */*ti*/,
-	int /*ucs2*/,
-	struct ntlm_buf */*data*/);
-
-int
-heim_ntlm_encode_type1 (
-	const struct ntlm_type1 */*type1*/,
-	struct ntlm_buf */*data*/);
-
-int
-heim_ntlm_encode_type2 (
-	const struct ntlm_type2 */*type2*/,
-	struct ntlm_buf */*data*/);
-
-int
-heim_ntlm_encode_type3 (
-	const struct ntlm_type3 */*type3*/,
-	struct ntlm_buf */*data*/);
-
-void
-heim_ntlm_free_buf (struct ntlm_buf */*p*/);
-
-void
-heim_ntlm_free_targetinfo (struct ntlm_targetinfo */*ti*/);
-
-void
-heim_ntlm_free_type1 (struct ntlm_type1 */*data*/);
-
-void
-heim_ntlm_free_type2 (struct ntlm_type2 */*data*/);
-
-void
-heim_ntlm_free_type3 (struct ntlm_type3 */*data*/);
-
-int
-heim_ntlm_keyex_unwrap (
-	struct ntlm_buf */*baseKey*/,
-	struct ntlm_buf */*encryptedSession*/,
-	struct ntlm_buf */*session*/);
-
-int
-heim_ntlm_keyex_wrap (
-	struct ntlm_buf */*base_session*/,
-	struct ntlm_buf */*session*/,
-	struct ntlm_buf */*encryptedSession*/);
-
-int
-heim_ntlm_nt_key (
-	const char */*password*/,
-	struct ntlm_buf */*key*/);
-
-int
-heim_ntlm_ntlmv2_key (
-	const void */*key*/,
-	size_t /*len*/,
-	const char */*username*/,
-	const char */*target*/,
-	unsigned char ntlmv2[16]);
-
-size_t
-heim_ntlm_unparse_flags (
-	uint32_t /*flags*/,
-	char */*s*/,
-	size_t /*len*/);
-
-int
-heim_ntlm_v1_base_session (
-	void */*key*/,
-	size_t /*len*/,
-	struct ntlm_buf */*session*/);
-
-int
-heim_ntlm_v2_base_session (
-	void */*key*/,
-	size_t /*len*/,
-	struct ntlm_buf */*ntlmResponse*/,
-	struct ntlm_buf */*session*/);
-
-int
-heim_ntlm_verify_ntlm2 (
-	const void */*key*/,
-	size_t /*len*/,
-	const char */*username*/,
-	const char */*target*/,
-	time_t /*now*/,
-	const unsigned char serverchallenge[8],
-	const struct ntlm_buf */*answer*/,
-	struct ntlm_buf */*infotarget*/,
-	unsigned char ntlmv2[16]);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __heimntlm_protos_h__ */
diff --git a/include.new/heimntlm.h b/include.new/heimntlm.h
deleted file mode 100644
index 22e2142..0000000
--- a/include.new/heimntlm.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2006 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef HEIM_NTLM_H
-#define HEIM_NTLM_H
-
-/**
- * Buffer for storing data in the NTLM library. When filled in by the
- * library it should be freed with heim_ntlm_free_buf().
- */
-struct ntlm_buf {
-    size_t length; /**< length buffer data */
-    void *data; /**< pointer to the data itself */
-};
-
-#define NTLM_NEG_UNICODE		0x00000001
-#define NTLM_NEG_OEM                    0x00000002
-#define NTLM_NEG_TARGET			0x00000004
-#define NTLM_MBZ9			0x00000008
-
-#define NTLM_NEG_SIGN			0x00000010
-#define NTLM_NEG_SEAL			0x00000020
-#define NTLM_NEG_DATAGRAM               0x00000040
-#define NTLM_NEG_LM_KEY                 0x00000080
-#define NTLM_NEG_NTLM			0x00000200
-#define NTLM_NEG_ANONYMOUS              0x00000800
-
-#define NTLM_MBZ8			0x00000100
-#define NTLM_NEG_NTLM			0x00000200
-#define NTLM_NEG_NT_ONLY		0x00000400
-#define NTLM_MBZ7			0x00000800 /* anon ? */
-
-#define NTLM_OEM_SUPPLIED_DOMAIN	0x00001000
-#define NTLM_OEM_SUPPLIED_WORKSTATION	0x00002000
-#define NTLM_MBZ6			0x00004000 /* local call ? */
-#define NTLM_NEG_ALWAYS_SIGN		0x00008000
-
-#define NTLM_TARGET_DOMAIN		0x00010000
-#define NTLM_TARGET_SERVER		0x00020000
-
-#define NTLM_TARGET_SHARE		0x00040000
-#define NTLM_NEG_NTLM2_SESSION		0x00080000
-#define NTLM_NEG_NTLM2			0x00080000
-
-#define NTLM_NEG_IDENTIFY		0x00100000
-#define NTLM_MBZ5			0x00200000
-#define NTLM_NON_NT_SESSION_KEY		0x00400000
-#define NTLM_NEG_TARGET_INFO		0x00800000
-
-#define NTLM_MBZ4			0x01000000
-#define NTLM_NEG_VERSION		0x02000000
-#define NTLM_MBZ3			0x04000000
-#define NTLM_MBZ2			0x08000000
-
-#define NTLM_MBZ1			0x10000000
-#define NTLM_ENC_128			0x20000000
-#define NTLM_NEG_KEYEX			0x40000000
-#define NTLM_ENC_56			0x80000000
-
-/**
- * Struct for the NTLM target info, the strings is assumed to be in
- * UTF8.  When filled in by the library it should be freed with
- * heim_ntlm_free_targetinfo().
- */
-
-#define NTLM_TI_AV_FLAG_GUEST		0x00000001
-
-struct ntlm_targetinfo {
-    char *servername; /**< */
-    char *domainname; /**< */
-    char *dnsdomainname; /**< */
-    char *dnsservername; /**< */
-    char *dnstreename; /**< */
-    uint32_t avflags; /**< */
-};
-
-/**
- * Struct for the NTLM type1 message info, the strings is assumed to
- * be in UTF8.  When filled in by the library it should be freed with
- * heim_ntlm_free_type1().
- */
-
-struct ntlm_type1 {
-    uint32_t flags; /**< */
-    char *domain; /**< */
-    char *hostname; /**< */
-    uint32_t os[2]; /**< */
-};
-
-/**
- * Struct for the NTLM type2 message info, the strings is assumed to
- * be in UTF8.  When filled in by the library it should be freed with
- * heim_ntlm_free_type2().
- */
-
-struct ntlm_type2 {
-    uint32_t flags; /**< */
-    char *targetname; /**< */
-    struct ntlm_buf targetinfo; /**< */
-    unsigned char challenge[8]; /**< */
-    uint32_t context[2]; /**< */
-    uint32_t os[2]; /**< */
-};
-
-/**
- * Struct for the NTLM type3 message info, the strings is assumed to
- * be in UTF8.  When filled in by the library it should be freed with
- * heim_ntlm_free_type3().
- */
-
-struct ntlm_type3 {
-    uint32_t flags; /**< */
-    char *username; /**< */
-    char *targetname; /**< */
-    struct ntlm_buf lm; /**< */
-    struct ntlm_buf ntlm; /**< */
-    struct ntlm_buf sessionkey; /**< */
-    char *ws; /**< */
-    uint32_t os[2]; /**< */
-};
-
-#include <ntlm_err.h>
-#include <heimntlm-protos.h>
-
-#endif /* NTLM_NTLM_H */
diff --git a/include.new/hesiod.h b/include.new/hesiod.h
deleted file mode 100644
index c7dbeee..0000000
--- a/include.new/hesiod.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$NetBSD: hesiod.h,v 1.3 1999/01/24 23:53:18 lukem Exp $	*/
-/*	$FreeBSD: src/include/hesiod.h,v 1.2 2002/03/23 17:24:53 imp Exp $ */
-
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#ifndef _HESIOD_H_
-#define _HESIOD_H_
-
-	/* Application-visible indication that we have the new interfaces */
-
-#define HESIOD_INTERFACES
-
-	/* Configuration information. */
-
-#ifndef _PATH_HESIOD_CONF			/* Configuration file. */
-#define _PATH_HESIOD_CONF	"/etc/hesiod.conf"
-#endif
-
-#define DEF_RHS		""			/* Defaults if HESIOD_CONF */
-#define DEF_LHS		""			/*    file is not present. */
-
-	/* Error codes (for backwards compatibility) */
-
-#define	HES_ER_UNINIT	-1	/* uninitialized */
-#define	HES_ER_OK	0	/* no error */
-#define	HES_ER_NOTFOUND	1	/* Hesiod name not found by server */
-#define HES_ER_CONFIG	2	/* local problem (no config file?) */
-#define HES_ER_NET	3	/* network problem */
-
-	/* Declaration of routines */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	hesiod_init(void **);
-char  **hesiod_resolve(void *, const char *, const char *);
-void	hesiod_free_list(void *, char **);
-char   *hesiod_to_bind(void *, const char *, const char *);
-void	hesiod_end(void *);
-
-				/* backwards compatibility */
-int	hes_init(void);
-char   *hes_to_bind(const char *, const char *);
-char  **hes_resolve(const char *, const char *);
-int	hes_error(void);
-void	hes_free(char **);
-__END_DECLS
-
-#endif /* ! _HESIOD_H_ */
diff --git a/include.new/hex.h b/include.new/hex.h
deleted file mode 100644
index c266268..0000000
--- a/include.new/hex.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2005 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef _rk_HEX_H_
-#define _rk_HEX_H_ 1
-
-#ifndef ROKEN_LIB_FUNCTION
-#ifdef _WIN32
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL     __cdecl
-#else
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#endif
-#endif
-
-#define hex_encode rk_hex_encode
-#define hex_decode rk_hex_decode
-
-ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL
-	hex_encode(const void *, size_t, char **);
-ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL
-	hex_decode(const char *, void *, size_t);
-
-#endif /* _rk_HEX_H_ */
diff --git a/include.new/histedit.h b/include.new/histedit.h
deleted file mode 100644
index 0655ef1..0000000
--- a/include.new/histedit.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)histedit.h	8.2 (Berkeley) 1/3/94
- *	$NetBSD: histedit.h,v 1.41 2009/09/07 21:24:33 christos Exp $
- * $FreeBSD: releng/10.2/lib/libedit/histedit.h 278411 2015-02-08 22:11:24Z bapt $
- */
-
-/*
- * histedit.h: Line editor and history interface.
- */
-#ifndef _HISTEDIT_H_
-#define	_HISTEDIT_H_
-
-#include <sys/types.h>
-#include <stdio.h>
-
-__BEGIN_DECLS
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * ==== Editing ====
- */
-
-typedef struct editline EditLine;
-
-/*
- * For user-defined function interface
- */
-typedef struct lineinfo {
-	const char	*buffer;
-	const char	*cursor;
-	const char	*lastchar;
-} LineInfo;
-
-/*
- * EditLine editor function return codes.
- * For user-defined function interface
- */
-#define	CC_NORM		0
-#define	CC_NEWLINE	1
-#define	CC_EOF		2
-#define	CC_ARGHACK	3
-#define	CC_REFRESH	4
-#define	CC_CURSOR	5
-#define	CC_ERROR	6
-#define	CC_FATAL	7
-#define	CC_REDISPLAY	8
-#define	CC_REFRESH_BEEP	9
-
-/*
- * Initialization, cleanup, and resetting
- */
-EditLine	*el_init(const char *, FILE *, FILE *, FILE *);
-void		 el_end(EditLine *);
-void		 el_reset(EditLine *);
-
-/*
- * Get a line, a character or push a string back in the input queue
- */
-const char	*el_gets(EditLine *, int *);
-int		 el_getc(EditLine *, char *);
-void		 el_push(EditLine *, const char *);
-
-/*
- * Beep!
- */
-void		 el_beep(EditLine *);
-
-/*
- * High level function internals control
- * Parses argc, argv array and executes builtin editline commands
- */
-int		 el_parse(EditLine *, int, const char **);
-
-/*
- * Low level editline access functions
- */
-int		 el_set(EditLine *, int, ...);
-int		 el_get(EditLine *, int, ...);
-unsigned char	_el_fn_complete(EditLine *, int);
-unsigned char	_el_fn_sh_complete(EditLine *, int);
-
-/*
- * el_set/el_get parameters
- */
-#define	EL_PROMPT	0	/* , el_pfunc_t);		*/
-#define	EL_TERMINAL	1	/* , const char *);		*/
-#define	EL_EDITOR	2	/* , const char *);		*/
-#define	EL_SIGNAL	3	/* , int);			*/
-#define	EL_BIND		4	/* , const char *, ..., NULL);	*/
-#define	EL_TELLTC	5	/* , const char *, ..., NULL);	*/
-#define	EL_SETTC	6	/* , const char *, ..., NULL);	*/
-#define	EL_ECHOTC	7	/* , const char *, ..., NULL);	*/
-#define	EL_SETTY	8	/* , const char *, ..., NULL);	*/
-#define	EL_ADDFN	9	/* , const char *, const char *	*/
-				/* , el_func_t);		*/
-#define	EL_HIST		10	/* , hist_fun_t, const char *);	*/
-#define	EL_EDITMODE	11	/* , int);			*/
-#define	EL_RPROMPT	12	/* , el_pfunc_t);		*/
-#define	EL_GETCFN	13	/* , el_rfunc_t);		*/
-#define	EL_CLIENTDATA	14	/* , void *);			*/
-#define	EL_UNBUFFERED	15	/* , int);			*/
-#define	EL_PREP_TERM    16	/* , int);                      */
-#define	EL_GETTC	17	/* , const char *, ..., NULL);	*/
-#define	EL_GETFP	18	/* , int, FILE **);		*/
-#define	EL_SETFP	19	/* , int, FILE *);		*/
-#define	EL_REFRESH	20	/* , void);			      set     */
-#define	EL_PROMPT_ESC	21	/* , prompt_func, Char);	      set/get */
-#define	EL_RPROMPT_ESC	22	/* , prompt_func, Char);	      set/get */
-#define	EL_RESIZE	23	/* , el_zfunc_t, void *);	      set     */
-
-#define	EL_BUILTIN_GETCFN	(NULL)
-
-/*
- * Source named file or $PWD/.editrc or $HOME/.editrc
- */
-int		el_source(EditLine *, const char *);
-
-/*
- * Must be called when the terminal changes size; If EL_SIGNAL
- * is set this is done automatically otherwise it is the responsibility
- * of the application
- */
-void		 el_resize(EditLine *);
-
-/*
- * User-defined function interface.
- */
-const LineInfo	*el_line(EditLine *);
-int		 el_insertstr(EditLine *, const char *);
-void		 el_deletestr(EditLine *, int);
-
-
-/*
- * ==== History ====
- */
-
-typedef struct history History;
-
-typedef struct HistEvent {
-	int		 num;
-	const char	*str;
-} HistEvent;
-
-/*
- * History access functions.
- */
-History *	history_init(void);
-void		history_end(History *);
-
-int		history(History *, HistEvent *, int, ...);
-
-#define	H_FUNC		 0	/* , UTSL		*/
-#define	H_SETSIZE	 1	/* , const int);	*/
-#define	H_EVENT		 1	/* , const int);	*/
-#define	H_GETSIZE	 2	/* , void);		*/
-#define	H_FIRST		 3	/* , void);		*/
-#define	H_LAST		 4	/* , void);		*/
-#define	H_PREV		 5	/* , void);		*/
-#define	H_NEXT		 6	/* , void);		*/
-#define	H_CURR		 8	/* , const int);	*/
-#define	H_SET		 7	/* , int);		*/
-#define	H_ADD		 9	/* , const char *);	*/
-#define	H_ENTER		10	/* , const char *);	*/
-#define	H_APPEND	11	/* , const char *);	*/
-#define	H_END		12	/* , void);		*/
-#define	H_NEXT_STR	13	/* , const char *);	*/
-#define	H_PREV_STR	14	/* , const char *);	*/
-#define	H_NEXT_EVENT	15	/* , const int);	*/
-#define	H_PREV_EVENT	16	/* , const int);	*/
-#define	H_LOAD		17	/* , const char *);	*/
-#define	H_SAVE		18	/* , const char *);	*/
-#define	H_CLEAR		19	/* , void);		*/
-#define	H_SETUNIQUE	20	/* , int);		*/
-#define	H_GETUNIQUE	21	/* , void);		*/
-#define	H_DEL		22	/* , int);		*/
-#define	H_NEXT_EVDATA	23	/* , const int, histdata_t *);	*/
-#define	H_DELDATA	24	/* , int, histdata_t *);*/
-#define	H_REPLACE	25	/* , const char *, histdata_t);	*/
-#define	H_SAVE_FP	26	/* , FILE*);	*/
-
-
-/*
- * ==== Tokenization ====
- */
-
-typedef struct tokenizer Tokenizer;
-
-/*
- * String tokenization functions, using simplified sh(1) quoting rules
- */
-Tokenizer	*tok_init(const char *);
-void		 tok_end(Tokenizer *);
-void		 tok_reset(Tokenizer *);
-int		 tok_line(Tokenizer *, const LineInfo *,
-		    int *, const char ***, int *, int *);
-int		 tok_str(Tokenizer *, const char *,
-		    int *, const char ***);
-
-__END_DECLS
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _HISTEDIT_H_ */
diff --git a/include.new/hx509-private.h b/include.new/hx509-private.h
deleted file mode 100644
index 60891f2..0000000
--- a/include.new/hx509-private.h
+++ /dev/null
@@ -1,481 +0,0 @@
-/* This is a generated file */
-#ifndef __hx509_private_h__
-#define __hx509_private_h__
-
-#include <stdarg.h>
-
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(x)
-#endif
-
-int
-_hx509_AlgorithmIdentifier_cmp (
-	const AlgorithmIdentifier */*p*/,
-	const AlgorithmIdentifier */*q*/);
-
-int
-_hx509_Certificate_cmp (
-	const Certificate */*p*/,
-	const Certificate */*q*/);
-
-int
-_hx509_Name_to_string (
-	const Name */*n*/,
-	char **/*str*/);
-
-time_t
-_hx509_Time2time_t (const Time */*t*/);
-
-void
-_hx509_abort (
-	const char */*fmt*/,
-	...)
-     __attribute__ ((noreturn, format (printf, 1, 2)));
-
-int
-_hx509_calculate_path (
-	hx509_context /*context*/,
-	int /*flags*/,
-	time_t /*time_now*/,
-	hx509_certs /*anchors*/,
-	unsigned int /*max_depth*/,
-	hx509_cert /*cert*/,
-	hx509_certs /*pool*/,
-	hx509_path */*path*/);
-
-int
-_hx509_cert_assign_key (
-	hx509_cert /*cert*/,
-	hx509_private_key /*private_key*/);
-
-int
-_hx509_cert_get_eku (
-	hx509_context /*context*/,
-	hx509_cert /*cert*/,
-	ExtKeyUsage */*e*/);
-
-int
-_hx509_cert_get_keyusage (
-	hx509_context /*context*/,
-	hx509_cert /*c*/,
-	KeyUsage */*ku*/);
-
-int
-_hx509_cert_get_version (const Certificate */*t*/);
-
-int
-_hx509_cert_is_parent_cmp (
-	const Certificate */*subject*/,
-	const Certificate */*issuer*/,
-	int /*allow_self_signed*/);
-
-int
-_hx509_cert_private_decrypt (
-	hx509_context /*context*/,
-	const heim_octet_string */*ciphertext*/,
-	const heim_oid */*encryption_oid*/,
-	hx509_cert /*p*/,
-	heim_octet_string */*cleartext*/);
-
-hx509_private_key
-_hx509_cert_private_key (hx509_cert /*p*/);
-
-int
-_hx509_cert_private_key_exportable (hx509_cert /*p*/);
-
-void
-_hx509_cert_set_release (
-	hx509_cert /*cert*/,
-	_hx509_cert_release_func /*release*/,
-	void */*ctx*/);
-
-int
-_hx509_cert_to_env (
-	hx509_context /*context*/,
-	hx509_cert /*cert*/,
-	hx509_env */*env*/);
-
-int
-_hx509_certs_keys_add (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	hx509_private_key /*key*/);
-
-void
-_hx509_certs_keys_free (
-	hx509_context /*context*/,
-	hx509_private_key */*keys*/);
-
-int
-_hx509_certs_keys_get (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	hx509_private_key **/*keys*/);
-
-int
-_hx509_check_key_usage (
-	hx509_context /*context*/,
-	hx509_cert /*cert*/,
-	unsigned /*flags*/,
-	int /*req_present*/);
-
-int
-_hx509_collector_alloc (
-	hx509_context /*context*/,
-	hx509_lock /*lock*/,
-	struct hx509_collector **/*collector*/);
-
-int
-_hx509_collector_certs_add (
-	hx509_context /*context*/,
-	struct hx509_collector */*c*/,
-	hx509_cert /*cert*/);
-
-int
-_hx509_collector_collect_certs (
-	hx509_context /*context*/,
-	struct hx509_collector */*c*/,
-	hx509_certs */*ret_certs*/);
-
-int
-_hx509_collector_collect_private_keys (
-	hx509_context /*context*/,
-	struct hx509_collector */*c*/,
-	hx509_private_key **/*keys*/);
-
-void
-_hx509_collector_free (struct hx509_collector */*c*/);
-
-hx509_lock
-_hx509_collector_get_lock (struct hx509_collector */*c*/);
-
-int
-_hx509_collector_private_key_add (
-	hx509_context /*context*/,
-	struct hx509_collector */*c*/,
-	const AlgorithmIdentifier */*alg*/,
-	hx509_private_key /*private_key*/,
-	const heim_octet_string */*key_data*/,
-	const heim_octet_string */*localKeyId*/);
-
-int
-_hx509_create_signature (
-	hx509_context /*context*/,
-	const hx509_private_key /*signer*/,
-	const AlgorithmIdentifier */*alg*/,
-	const heim_octet_string */*data*/,
-	AlgorithmIdentifier */*signatureAlgorithm*/,
-	heim_octet_string */*sig*/);
-
-int
-_hx509_create_signature_bitstring (
-	hx509_context /*context*/,
-	const hx509_private_key /*signer*/,
-	const AlgorithmIdentifier */*alg*/,
-	const heim_octet_string */*data*/,
-	AlgorithmIdentifier */*signatureAlgorithm*/,
-	heim_bit_string */*sig*/);
-
-int
-_hx509_expr_eval (
-	hx509_context /*context*/,
-	hx509_env /*env*/,
-	struct hx_expr */*expr*/);
-
-void
-_hx509_expr_free (struct hx_expr */*expr*/);
-
-struct hx_expr *
-_hx509_expr_parse (const char */*buf*/);
-
-int
-_hx509_find_extension_subject_key_id (
-	const Certificate */*issuer*/,
-	SubjectKeyIdentifier */*si*/);
-
-int
-_hx509_generate_private_key (
-	hx509_context /*context*/,
-	struct hx509_generate_private_context */*ctx*/,
-	hx509_private_key */*private_key*/);
-
-int
-_hx509_generate_private_key_bits (
-	hx509_context /*context*/,
-	struct hx509_generate_private_context */*ctx*/,
-	unsigned long /*bits*/);
-
-void
-_hx509_generate_private_key_free (struct hx509_generate_private_context **/*ctx*/);
-
-int
-_hx509_generate_private_key_init (
-	hx509_context /*context*/,
-	const heim_oid */*oid*/,
-	struct hx509_generate_private_context **/*ctx*/);
-
-int
-_hx509_generate_private_key_is_ca (
-	hx509_context /*context*/,
-	struct hx509_generate_private_context */*ctx*/);
-
-Certificate *
-_hx509_get_cert (hx509_cert /*cert*/);
-
-void
-_hx509_ks_dir_register (hx509_context /*context*/);
-
-void
-_hx509_ks_file_register (hx509_context /*context*/);
-
-void
-_hx509_ks_keychain_register (hx509_context /*context*/);
-
-void
-_hx509_ks_mem_register (hx509_context /*context*/);
-
-void
-_hx509_ks_null_register (hx509_context /*context*/);
-
-void
-_hx509_ks_pkcs11_register (hx509_context /*context*/);
-
-void
-_hx509_ks_pkcs12_register (hx509_context /*context*/);
-
-void
-_hx509_ks_register (
-	hx509_context /*context*/,
-	struct hx509_keyset_ops */*ops*/);
-
-int
-_hx509_lock_find_cert (
-	hx509_lock /*lock*/,
-	const hx509_query */*q*/,
-	hx509_cert */*c*/);
-
-const struct _hx509_password *
-_hx509_lock_get_passwords (hx509_lock /*lock*/);
-
-hx509_certs
-_hx509_lock_unlock_certs (hx509_lock /*lock*/);
-
-struct hx_expr *
-_hx509_make_expr (
-	enum hx_expr_op /*op*/,
-	void */*arg1*/,
-	void */*arg2*/);
-
-int
-_hx509_map_file_os (
-	const char */*fn*/,
-	heim_octet_string */*os*/);
-
-int
-_hx509_match_keys (
-	hx509_cert /*c*/,
-	hx509_private_key /*key*/);
-
-int
-_hx509_name_cmp (
-	const Name */*n1*/,
-	const Name */*n2*/,
-	int */*c*/);
-
-int
-_hx509_name_ds_cmp (
-	const DirectoryString */*ds1*/,
-	const DirectoryString */*ds2*/,
-	int */*diff*/);
-
-int
-_hx509_name_from_Name (
-	const Name */*n*/,
-	hx509_name */*name*/);
-
-int
-_hx509_name_modify (
-	hx509_context /*context*/,
-	Name */*name*/,
-	int /*append*/,
-	const heim_oid */*oid*/,
-	const char */*str*/);
-
-int
-_hx509_path_append (
-	hx509_context /*context*/,
-	hx509_path */*path*/,
-	hx509_cert /*cert*/);
-
-void
-_hx509_path_free (hx509_path */*path*/);
-
-int
-_hx509_pbe_decrypt (
-	hx509_context /*context*/,
-	hx509_lock /*lock*/,
-	const AlgorithmIdentifier */*ai*/,
-	const heim_octet_string */*econtent*/,
-	heim_octet_string */*content*/);
-
-int
-_hx509_pbe_encrypt (
-	hx509_context /*context*/,
-	hx509_lock /*lock*/,
-	const AlgorithmIdentifier */*ai*/,
-	const heim_octet_string */*content*/,
-	heim_octet_string */*econtent*/);
-
-void
-_hx509_pi_printf (
-	int (*/*func*/)(void *, const char *),
-	void */*ctx*/,
-	const char */*fmt*/,
-	...);
-
-int
-_hx509_private_key_export (
-	hx509_context /*context*/,
-	const hx509_private_key /*key*/,
-	hx509_key_format_t /*format*/,
-	heim_octet_string */*data*/);
-
-int
-_hx509_private_key_exportable (hx509_private_key /*key*/);
-
-BIGNUM *
-_hx509_private_key_get_internal (
-	hx509_context /*context*/,
-	hx509_private_key /*key*/,
-	const char */*type*/);
-
-int
-_hx509_private_key_oid (
-	hx509_context /*context*/,
-	const hx509_private_key /*key*/,
-	heim_oid */*data*/);
-
-hx509_private_key
-_hx509_private_key_ref (hx509_private_key /*key*/);
-
-const char *
-_hx509_private_pem_name (hx509_private_key /*key*/);
-
-int
-_hx509_public_encrypt (
-	hx509_context /*context*/,
-	const heim_octet_string */*cleartext*/,
-	const Certificate */*cert*/,
-	heim_oid */*encryption_oid*/,
-	heim_octet_string */*ciphertext*/);
-
-void
-_hx509_query_clear (hx509_query */*q*/);
-
-int
-_hx509_query_match_cert (
-	hx509_context /*context*/,
-	const hx509_query */*q*/,
-	hx509_cert /*cert*/);
-
-void
-_hx509_query_statistic (
-	hx509_context /*context*/,
-	int /*type*/,
-	const hx509_query */*q*/);
-
-int
-_hx509_request_add_dns_name (
-	hx509_context /*context*/,
-	hx509_request /*req*/,
-	const char */*hostname*/);
-
-int
-_hx509_request_add_eku (
-	hx509_context /*context*/,
-	hx509_request /*req*/,
-	const heim_oid */*oid*/);
-
-int
-_hx509_request_add_email (
-	hx509_context /*context*/,
-	hx509_request /*req*/,
-	const char */*email*/);
-
-int
-_hx509_request_parse (
-	hx509_context /*context*/,
-	const char */*path*/,
-	hx509_request */*req*/);
-
-int
-_hx509_request_print (
-	hx509_context /*context*/,
-	hx509_request /*req*/,
-	FILE */*f*/);
-
-int
-_hx509_request_to_pkcs10 (
-	hx509_context /*context*/,
-	const hx509_request /*req*/,
-	const hx509_private_key /*signer*/,
-	heim_octet_string */*request*/);
-
-hx509_revoke_ctx
-_hx509_revoke_ref (hx509_revoke_ctx /*ctx*/);
-
-void
-_hx509_sel_yyerror (const char */*s*/);
-
-int
-_hx509_self_signed_valid (
-	hx509_context /*context*/,
-	const AlgorithmIdentifier */*alg*/);
-
-int
-_hx509_set_cert_attribute (
-	hx509_context /*context*/,
-	hx509_cert /*cert*/,
-	const heim_oid */*oid*/,
-	const heim_octet_string */*attr*/);
-
-int
-_hx509_signature_best_before (
-	hx509_context /*context*/,
-	const AlgorithmIdentifier */*alg*/,
-	time_t /*t*/);
-
-void
-_hx509_unmap_file_os (heim_octet_string */*os*/);
-
-int
-_hx509_unparse_Name (
-	const Name */*aname*/,
-	char **/*str*/);
-
-time_t
-_hx509_verify_get_time (hx509_verify_ctx /*ctx*/);
-
-int
-_hx509_verify_signature (
-	hx509_context /*context*/,
-	const hx509_cert /*cert*/,
-	const AlgorithmIdentifier */*alg*/,
-	const heim_octet_string */*data*/,
-	const heim_octet_string */*sig*/);
-
-int
-_hx509_verify_signature_bitstring (
-	hx509_context /*context*/,
-	const hx509_cert /*signer*/,
-	const AlgorithmIdentifier */*alg*/,
-	const heim_octet_string */*data*/,
-	const heim_bit_string */*sig*/);
-
-int
-_hx509_write_file (
-	const char */*fn*/,
-	const void */*data*/,
-	size_t /*length*/);
-
-#endif /* __hx509_private_h__ */
diff --git a/include.new/hx509-protos.h b/include.new/hx509-protos.h
deleted file mode 100644
index d03c776..0000000
--- a/include.new/hx509-protos.h
+++ /dev/null
@@ -1,1243 +0,0 @@
-/* This is a generated file */
-#ifndef __hx509_protos_h__
-#define __hx509_protos_h__
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef HX509_LIB
-#ifndef HX509_LIB_FUNCTION
-#if defined(_WIN32)
-#define HX509_LIB_FUNCTION __declspec(dllimport)
-#define HX509_LIB_CALL __stdcall
-#define HX509_LIB_VARIABLE __declspec(dllimport)
-#else
-#define HX509_LIB_FUNCTION
-#define HX509_LIB_CALL
-#define HX509_LIB_VARIABLE
-#endif
-#endif
-#endif
-void
-hx509_bitstring_print (
-	const heim_bit_string */*b*/,
-	hx509_vprint_func /*func*/,
-	void */*ctx*/);
-
-int
-hx509_ca_sign (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	hx509_cert /*signer*/,
-	hx509_cert */*certificate*/);
-
-int
-hx509_ca_sign_self (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	hx509_private_key /*signer*/,
-	hx509_cert */*certificate*/);
-
-int
-hx509_ca_tbs_add_crl_dp_uri (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const char */*uri*/,
-	hx509_name /*issuername*/);
-
-int
-hx509_ca_tbs_add_eku (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const heim_oid */*oid*/);
-
-int
-hx509_ca_tbs_add_san_hostname (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const char */*dnsname*/);
-
-int
-hx509_ca_tbs_add_san_jid (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const char */*jid*/);
-
-int
-hx509_ca_tbs_add_san_ms_upn (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const char */*principal*/);
-
-int
-hx509_ca_tbs_add_san_otherName (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const heim_oid */*oid*/,
-	const heim_octet_string */*os*/);
-
-int
-hx509_ca_tbs_add_san_pkinit (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const char */*principal*/);
-
-int
-hx509_ca_tbs_add_san_rfc822name (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const char */*rfc822Name*/);
-
-void
-hx509_ca_tbs_free (hx509_ca_tbs */*tbs*/);
-
-int
-hx509_ca_tbs_init (
-	hx509_context /*context*/,
-	hx509_ca_tbs */*tbs*/);
-
-int
-hx509_ca_tbs_set_ca (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	int /*pathLenConstraint*/);
-
-int
-hx509_ca_tbs_set_domaincontroller (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/);
-
-int
-hx509_ca_tbs_set_notAfter (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	time_t /*t*/);
-
-int
-hx509_ca_tbs_set_notAfter_lifetime (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	time_t /*delta*/);
-
-int
-hx509_ca_tbs_set_notBefore (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	time_t /*t*/);
-
-int
-hx509_ca_tbs_set_proxy (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	int /*pathLenConstraint*/);
-
-int
-hx509_ca_tbs_set_serialnumber (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const heim_integer */*serialNumber*/);
-
-int
-hx509_ca_tbs_set_spki (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const SubjectPublicKeyInfo */*spki*/);
-
-int
-hx509_ca_tbs_set_subject (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	hx509_name /*subject*/);
-
-int
-hx509_ca_tbs_set_template (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	int /*flags*/,
-	hx509_cert /*cert*/);
-
-int
-hx509_ca_tbs_set_unique (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	const heim_bit_string */*subjectUniqueID*/,
-	const heim_bit_string */*issuerUniqueID*/);
-
-int
-hx509_ca_tbs_subject_expand (
-	hx509_context /*context*/,
-	hx509_ca_tbs /*tbs*/,
-	hx509_env /*env*/);
-
-const struct units *
-hx509_ca_tbs_template_units (void);
-
-int
-hx509_cert_binary (
-	hx509_context /*context*/,
-	hx509_cert /*c*/,
-	heim_octet_string */*os*/);
-
-int
-hx509_cert_check_eku (
-	hx509_context /*context*/,
-	hx509_cert /*cert*/,
-	const heim_oid */*eku*/,
-	int /*allow_any_eku*/);
-
-int
-hx509_cert_cmp (
-	hx509_cert /*p*/,
-	hx509_cert /*q*/);
-
-int
-hx509_cert_find_subjectAltName_otherName (
-	hx509_context /*context*/,
-	hx509_cert /*cert*/,
-	const heim_oid */*oid*/,
-	hx509_octet_string_list */*list*/);
-
-void
-hx509_cert_free (hx509_cert /*cert*/);
-
-int
-hx509_cert_get_SPKI (
-	hx509_context /*context*/,
-	hx509_cert /*p*/,
-	SubjectPublicKeyInfo */*spki*/);
-
-int
-hx509_cert_get_SPKI_AlgorithmIdentifier (
-	hx509_context /*context*/,
-	hx509_cert /*p*/,
-	AlgorithmIdentifier */*alg*/);
-
-hx509_cert_attribute
-hx509_cert_get_attribute (
-	hx509_cert /*cert*/,
-	const heim_oid */*oid*/);
-
-int
-hx509_cert_get_base_subject (
-	hx509_context /*context*/,
-	hx509_cert /*c*/,
-	hx509_name */*name*/);
-
-const char *
-hx509_cert_get_friendly_name (hx509_cert /*cert*/);
-
-int
-hx509_cert_get_issuer (
-	hx509_cert /*p*/,
-	hx509_name */*name*/);
-
-int
-hx509_cert_get_issuer_unique_id (
-	hx509_context /*context*/,
-	hx509_cert /*p*/,
-	heim_bit_string */*issuer*/);
-
-time_t
-hx509_cert_get_notAfter (hx509_cert /*p*/);
-
-time_t
-hx509_cert_get_notBefore (hx509_cert /*p*/);
-
-int
-hx509_cert_get_serialnumber (
-	hx509_cert /*p*/,
-	heim_integer */*i*/);
-
-int
-hx509_cert_get_subject (
-	hx509_cert /*p*/,
-	hx509_name */*name*/);
-
-int
-hx509_cert_get_subject_unique_id (
-	hx509_context /*context*/,
-	hx509_cert /*p*/,
-	heim_bit_string */*subject*/);
-
-int
-hx509_cert_have_private_key (hx509_cert /*p*/);
-
-int
-hx509_cert_init (
-	hx509_context /*context*/,
-	const Certificate */*c*/,
-	hx509_cert */*cert*/);
-
-int
-hx509_cert_init_data (
-	hx509_context /*context*/,
-	const void */*ptr*/,
-	size_t /*len*/,
-	hx509_cert */*cert*/);
-
-int
-hx509_cert_keyusage_print (
-	hx509_context /*context*/,
-	hx509_cert /*c*/,
-	char **/*s*/);
-
-int
-hx509_cert_public_encrypt (
-	hx509_context /*context*/,
-	const heim_octet_string */*cleartext*/,
-	const hx509_cert /*p*/,
-	heim_oid */*encryption_oid*/,
-	heim_octet_string */*ciphertext*/);
-
-hx509_cert
-hx509_cert_ref (hx509_cert /*cert*/);
-
-int
-hx509_cert_set_friendly_name (
-	hx509_cert /*cert*/,
-	const char */*name*/);
-
-int
-hx509_certs_add (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	hx509_cert /*cert*/);
-
-int
-hx509_certs_append (
-	hx509_context /*context*/,
-	hx509_certs /*to*/,
-	hx509_lock /*lock*/,
-	const char */*name*/);
-
-int
-hx509_certs_end_seq (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	hx509_cursor /*cursor*/);
-
-int
-hx509_certs_filter (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	const hx509_query */*q*/,
-	hx509_certs */*result*/);
-
-int
-hx509_certs_find (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	const hx509_query */*q*/,
-	hx509_cert */*r*/);
-
-void
-hx509_certs_free (hx509_certs */*certs*/);
-
-int
-hx509_certs_info (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	int (*/*func*/)(void *, const char *),
-	void */*ctx*/);
-
-int
-hx509_certs_init (
-	hx509_context /*context*/,
-	const char */*name*/,
-	int /*flags*/,
-	hx509_lock /*lock*/,
-	hx509_certs */*certs*/);
-
-#ifdef __BLOCKS__
-int
-hx509_certs_iter (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	int (^func)(hx509_cert));
-#endif /* __BLOCKS__ */
-
-int
-hx509_certs_iter_f (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	int (*/*func*/)(hx509_context, void *, hx509_cert),
-	void */*ctx*/);
-
-int
-hx509_certs_merge (
-	hx509_context /*context*/,
-	hx509_certs /*to*/,
-	hx509_certs /*from*/);
-
-int
-hx509_certs_next_cert (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	hx509_cursor /*cursor*/,
-	hx509_cert */*cert*/);
-
-hx509_certs
-hx509_certs_ref (hx509_certs /*certs*/);
-
-int
-hx509_certs_start_seq (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	hx509_cursor */*cursor*/);
-
-int
-hx509_certs_store (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	int /*flags*/,
-	hx509_lock /*lock*/);
-
-int
-hx509_ci_print_names (
-	hx509_context /*context*/,
-	void */*ctx*/,
-	hx509_cert /*c*/);
-
-void
-hx509_clear_error_string (hx509_context /*context*/);
-
-int
-hx509_cms_create_signed (
-	hx509_context /*context*/,
-	int /*flags*/,
-	const heim_oid */*eContentType*/,
-	const void */*data*/,
-	size_t /*length*/,
-	const AlgorithmIdentifier */*digest_alg*/,
-	hx509_certs /*certs*/,
-	hx509_peer_info /*peer*/,
-	hx509_certs /*anchors*/,
-	hx509_certs /*pool*/,
-	heim_octet_string */*signed_data*/);
-
-int
-hx509_cms_create_signed_1 (
-	hx509_context /*context*/,
-	int /*flags*/,
-	const heim_oid */*eContentType*/,
-	const void */*data*/,
-	size_t /*length*/,
-	const AlgorithmIdentifier */*digest_alg*/,
-	hx509_cert /*cert*/,
-	hx509_peer_info /*peer*/,
-	hx509_certs /*anchors*/,
-	hx509_certs /*pool*/,
-	heim_octet_string */*signed_data*/);
-
-int
-hx509_cms_decrypt_encrypted (
-	hx509_context /*context*/,
-	hx509_lock /*lock*/,
-	const void */*data*/,
-	size_t /*length*/,
-	heim_oid */*contentType*/,
-	heim_octet_string */*content*/);
-
-int
-hx509_cms_envelope_1 (
-	hx509_context /*context*/,
-	int /*flags*/,
-	hx509_cert /*cert*/,
-	const void */*data*/,
-	size_t /*length*/,
-	const heim_oid */*encryption_type*/,
-	const heim_oid */*contentType*/,
-	heim_octet_string */*content*/);
-
-int
-hx509_cms_unenvelope (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	int /*flags*/,
-	const void */*data*/,
-	size_t /*length*/,
-	const heim_octet_string */*encryptedContent*/,
-	time_t /*time_now*/,
-	heim_oid */*contentType*/,
-	heim_octet_string */*content*/);
-
-int
-hx509_cms_unwrap_ContentInfo (
-	const heim_octet_string */*in*/,
-	heim_oid */*oid*/,
-	heim_octet_string */*out*/,
-	int */*have_data*/);
-
-int
-hx509_cms_verify_signed (
-	hx509_context /*context*/,
-	hx509_verify_ctx /*ctx*/,
-	unsigned int /*flags*/,
-	const void */*data*/,
-	size_t /*length*/,
-	const heim_octet_string */*signedContent*/,
-	hx509_certs /*pool*/,
-	heim_oid */*contentType*/,
-	heim_octet_string */*content*/,
-	hx509_certs */*signer_certs*/);
-
-int
-hx509_cms_wrap_ContentInfo (
-	const heim_oid */*oid*/,
-	const heim_octet_string */*buf*/,
-	heim_octet_string */*res*/);
-
-void
-hx509_context_free (hx509_context */*context*/);
-
-int
-hx509_context_init (hx509_context */*context*/);
-
-void
-hx509_context_set_missing_revoke (
-	hx509_context /*context*/,
-	int /*flag*/);
-
-int
-hx509_crl_add_revoked_certs (
-	hx509_context /*context*/,
-	hx509_crl /*crl*/,
-	hx509_certs /*certs*/);
-
-int
-hx509_crl_alloc (
-	hx509_context /*context*/,
-	hx509_crl */*crl*/);
-
-void
-hx509_crl_free (
-	hx509_context /*context*/,
-	hx509_crl */*crl*/);
-
-int
-hx509_crl_lifetime (
-	hx509_context /*context*/,
-	hx509_crl /*crl*/,
-	int /*delta*/);
-
-int
-hx509_crl_sign (
-	hx509_context /*context*/,
-	hx509_cert /*signer*/,
-	hx509_crl /*crl*/,
-	heim_octet_string */*os*/);
-
-const AlgorithmIdentifier *
-hx509_crypto_aes128_cbc (void);
-
-const AlgorithmIdentifier *
-hx509_crypto_aes256_cbc (void);
-
-void
-hx509_crypto_allow_weak (hx509_crypto /*crypto*/);
-
-int
-hx509_crypto_available (
-	hx509_context /*context*/,
-	int /*type*/,
-	hx509_cert /*source*/,
-	AlgorithmIdentifier **/*val*/,
-	unsigned int */*plen*/);
-
-int
-hx509_crypto_decrypt (
-	hx509_crypto /*crypto*/,
-	const void */*data*/,
-	const size_t /*length*/,
-	heim_octet_string */*ivec*/,
-	heim_octet_string */*clear*/);
-
-const AlgorithmIdentifier *
-hx509_crypto_des_rsdi_ede3_cbc (void);
-
-void
-hx509_crypto_destroy (hx509_crypto /*crypto*/);
-
-int
-hx509_crypto_encrypt (
-	hx509_crypto /*crypto*/,
-	const void */*data*/,
-	const size_t /*length*/,
-	const heim_octet_string */*ivec*/,
-	heim_octet_string **/*ciphertext*/);
-
-const heim_oid *
-hx509_crypto_enctype_by_name (const char */*name*/);
-
-void
-hx509_crypto_free_algs (
-	AlgorithmIdentifier */*val*/,
-	unsigned int /*len*/);
-
-int
-hx509_crypto_get_params (
-	hx509_context /*context*/,
-	hx509_crypto /*crypto*/,
-	const heim_octet_string */*ivec*/,
-	heim_octet_string */*param*/);
-
-int
-hx509_crypto_init (
-	hx509_context /*context*/,
-	const char */*provider*/,
-	const heim_oid */*enctype*/,
-	hx509_crypto */*crypto*/);
-
-const char *
-hx509_crypto_provider (hx509_crypto /*crypto*/);
-
-int
-hx509_crypto_random_iv (
-	hx509_crypto /*crypto*/,
-	heim_octet_string */*ivec*/);
-
-int
-hx509_crypto_select (
-	const hx509_context /*context*/,
-	int /*type*/,
-	const hx509_private_key /*source*/,
-	hx509_peer_info /*peer*/,
-	AlgorithmIdentifier */*selected*/);
-
-int
-hx509_crypto_set_key_data (
-	hx509_crypto /*crypto*/,
-	const void */*data*/,
-	size_t /*length*/);
-
-int
-hx509_crypto_set_key_name (
-	hx509_crypto /*crypto*/,
-	const char */*name*/);
-
-void
-hx509_crypto_set_padding (
-	hx509_crypto /*crypto*/,
-	int /*padding_type*/);
-
-int
-hx509_crypto_set_params (
-	hx509_context /*context*/,
-	hx509_crypto /*crypto*/,
-	const heim_octet_string */*param*/,
-	heim_octet_string */*ivec*/);
-
-int
-hx509_crypto_set_random_key (
-	hx509_crypto /*crypto*/,
-	heim_octet_string */*key*/);
-
-int
-hx509_env_add (
-	hx509_context /*context*/,
-	hx509_env */*env*/,
-	const char */*key*/,
-	const char */*value*/);
-
-int
-hx509_env_add_binding (
-	hx509_context /*context*/,
-	hx509_env */*env*/,
-	const char */*key*/,
-	hx509_env /*list*/);
-
-const char *
-hx509_env_find (
-	hx509_context /*context*/,
-	hx509_env /*env*/,
-	const char */*key*/);
-
-hx509_env
-hx509_env_find_binding (
-	hx509_context /*context*/,
-	hx509_env /*env*/,
-	const char */*key*/);
-
-void
-hx509_env_free (hx509_env */*env*/);
-
-const char *
-hx509_env_lfind (
-	hx509_context /*context*/,
-	hx509_env /*env*/,
-	const char */*key*/,
-	size_t /*len*/);
-
-void
-hx509_err (
-	hx509_context /*context*/,
-	int /*exit_code*/,
-	int /*error_code*/,
-	const char */*fmt*/,
-	...);
-
-hx509_private_key_ops *
-hx509_find_private_alg (const heim_oid */*oid*/);
-
-void
-hx509_free_error_string (char */*str*/);
-
-void
-hx509_free_octet_string_list (hx509_octet_string_list */*list*/);
-
-int
-hx509_general_name_unparse (
-	GeneralName */*name*/,
-	char **/*str*/);
-
-char *
-hx509_get_error_string (
-	hx509_context /*context*/,
-	int /*error_code*/);
-
-int
-hx509_get_one_cert (
-	hx509_context /*context*/,
-	hx509_certs /*certs*/,
-	hx509_cert */*c*/);
-
-int
-hx509_lock_add_cert (
-	hx509_context /*context*/,
-	hx509_lock /*lock*/,
-	hx509_cert /*cert*/);
-
-int
-hx509_lock_add_certs (
-	hx509_context /*context*/,
-	hx509_lock /*lock*/,
-	hx509_certs /*certs*/);
-
-int
-hx509_lock_add_password (
-	hx509_lock /*lock*/,
-	const char */*password*/);
-
-int
-hx509_lock_command_string (
-	hx509_lock /*lock*/,
-	const char */*string*/);
-
-void
-hx509_lock_free (hx509_lock /*lock*/);
-
-int
-hx509_lock_init (
-	hx509_context /*context*/,
-	hx509_lock */*lock*/);
-
-int
-hx509_lock_prompt (
-	hx509_lock /*lock*/,
-	hx509_prompt */*prompt*/);
-
-void
-hx509_lock_reset_certs (
-	hx509_context /*context*/,
-	hx509_lock /*lock*/);
-
-void
-hx509_lock_reset_passwords (hx509_lock /*lock*/);
-
-void
-hx509_lock_reset_promper (hx509_lock /*lock*/);
-
-int
-hx509_lock_set_prompter (
-	hx509_lock /*lock*/,
-	hx509_prompter_fct /*prompt*/,
-	void */*data*/);
-
-int
-hx509_name_binary (
-	const hx509_name /*name*/,
-	heim_octet_string */*os*/);
-
-int
-hx509_name_cmp (
-	hx509_name /*n1*/,
-	hx509_name /*n2*/);
-
-int
-hx509_name_copy (
-	hx509_context /*context*/,
-	const hx509_name /*from*/,
-	hx509_name */*to*/);
-
-int
-hx509_name_expand (
-	hx509_context /*context*/,
-	hx509_name /*name*/,
-	hx509_env /*env*/);
-
-void
-hx509_name_free (hx509_name */*name*/);
-
-int
-hx509_name_is_null_p (const hx509_name /*name*/);
-
-int
-hx509_name_normalize (
-	hx509_context /*context*/,
-	hx509_name /*name*/);
-
-int
-hx509_name_to_Name (
-	const hx509_name /*from*/,
-	Name */*to*/);
-
-int
-hx509_name_to_string (
-	const hx509_name /*name*/,
-	char **/*str*/);
-
-int
-hx509_ocsp_request (
-	hx509_context /*context*/,
-	hx509_certs /*reqcerts*/,
-	hx509_certs /*pool*/,
-	hx509_cert /*signer*/,
-	const AlgorithmIdentifier */*digest*/,
-	heim_octet_string */*request*/,
-	heim_octet_string */*nonce*/);
-
-int
-hx509_ocsp_verify (
-	hx509_context /*context*/,
-	time_t /*now*/,
-	hx509_cert /*cert*/,
-	int /*flags*/,
-	const void */*data*/,
-	size_t /*length*/,
-	time_t */*expiration*/);
-
-void
-hx509_oid_print (
-	const heim_oid */*oid*/,
-	hx509_vprint_func /*func*/,
-	void */*ctx*/);
-
-int
-hx509_oid_sprint (
-	const heim_oid */*oid*/,
-	char **/*str*/);
-
-int
-hx509_parse_name (
-	hx509_context /*context*/,
-	const char */*str*/,
-	hx509_name */*name*/);
-
-int
-hx509_parse_private_key (
-	hx509_context /*context*/,
-	const AlgorithmIdentifier */*keyai*/,
-	const void */*data*/,
-	size_t /*len*/,
-	hx509_key_format_t /*format*/,
-	hx509_private_key */*private_key*/);
-
-int
-hx509_peer_info_add_cms_alg (
-	hx509_context /*context*/,
-	hx509_peer_info /*peer*/,
-	const AlgorithmIdentifier */*val*/);
-
-int
-hx509_peer_info_alloc (
-	hx509_context /*context*/,
-	hx509_peer_info */*peer*/);
-
-void
-hx509_peer_info_free (hx509_peer_info /*peer*/);
-
-int
-hx509_peer_info_set_cert (
-	hx509_peer_info /*peer*/,
-	hx509_cert /*cert*/);
-
-int
-hx509_peer_info_set_cms_algs (
-	hx509_context /*context*/,
-	hx509_peer_info /*peer*/,
-	const AlgorithmIdentifier */*val*/,
-	size_t /*len*/);
-
-int
-hx509_pem_add_header (
-	hx509_pem_header **/*headers*/,
-	const char */*header*/,
-	const char */*value*/);
-
-const char *
-hx509_pem_find_header (
-	const hx509_pem_header */*h*/,
-	const char */*header*/);
-
-void
-hx509_pem_free_header (hx509_pem_header */*headers*/);
-
-int
-hx509_pem_read (
-	hx509_context /*context*/,
-	FILE */*f*/,
-	hx509_pem_read_func /*func*/,
-	void */*ctx*/);
-
-int
-hx509_pem_write (
-	hx509_context /*context*/,
-	const char */*type*/,
-	hx509_pem_header */*headers*/,
-	FILE */*f*/,
-	const void */*data*/,
-	size_t /*size*/);
-
-int
-hx509_print_cert (
-	hx509_context /*context*/,
-	hx509_cert /*cert*/,
-	FILE */*out*/);
-
-void
-hx509_print_stdout (
-	void */*ctx*/,
-	const char */*fmt*/,
-	va_list /*va*/);
-
-int
-hx509_private_key2SPKI (
-	hx509_context /*context*/,
-	hx509_private_key /*private_key*/,
-	SubjectPublicKeyInfo */*spki*/);
-
-void
-hx509_private_key_assign_rsa (
-	hx509_private_key /*key*/,
-	void */*ptr*/);
-
-int
-hx509_private_key_free (hx509_private_key */*key*/);
-
-int
-hx509_private_key_init (
-	hx509_private_key */*key*/,
-	hx509_private_key_ops */*ops*/,
-	void */*keydata*/);
-
-int
-hx509_private_key_private_decrypt (
-	hx509_context /*context*/,
-	const heim_octet_string */*ciphertext*/,
-	const heim_oid */*encryption_oid*/,
-	hx509_private_key /*p*/,
-	heim_octet_string */*cleartext*/);
-
-int
-hx509_prompt_hidden (hx509_prompt_type /*type*/);
-
-int
-hx509_query_alloc (
-	hx509_context /*context*/,
-	hx509_query **/*q*/);
-
-void
-hx509_query_free (
-	hx509_context /*context*/,
-	hx509_query */*q*/);
-
-int
-hx509_query_match_cmp_func (
-	hx509_query */*q*/,
-	int (*/*func*/)(hx509_context, hx509_cert, void *),
-	void */*ctx*/);
-
-int
-hx509_query_match_eku (
-	hx509_query */*q*/,
-	const heim_oid */*eku*/);
-
-int
-hx509_query_match_expr (
-	hx509_context /*context*/,
-	hx509_query */*q*/,
-	const char */*expr*/);
-
-int
-hx509_query_match_friendly_name (
-	hx509_query */*q*/,
-	const char */*name*/);
-
-int
-hx509_query_match_issuer_serial (
-	hx509_query */*q*/,
-	const Name */*issuer*/,
-	const heim_integer */*serialNumber*/);
-
-void
-hx509_query_match_option (
-	hx509_query */*q*/,
-	hx509_query_option /*option*/);
-
-void
-hx509_query_statistic_file (
-	hx509_context /*context*/,
-	const char */*fn*/);
-
-void
-hx509_query_unparse_stats (
-	hx509_context /*context*/,
-	int /*printtype*/,
-	FILE */*out*/);
-
-void
-hx509_request_free (hx509_request */*req*/);
-
-int
-hx509_request_get_SubjectPublicKeyInfo (
-	hx509_context /*context*/,
-	hx509_request /*req*/,
-	SubjectPublicKeyInfo */*key*/);
-
-int
-hx509_request_get_name (
-	hx509_context /*context*/,
-	hx509_request /*req*/,
-	hx509_name */*name*/);
-
-int
-hx509_request_init (
-	hx509_context /*context*/,
-	hx509_request */*req*/);
-
-int
-hx509_request_set_SubjectPublicKeyInfo (
-	hx509_context /*context*/,
-	hx509_request /*req*/,
-	const SubjectPublicKeyInfo */*key*/);
-
-int
-hx509_request_set_name (
-	hx509_context /*context*/,
-	hx509_request /*req*/,
-	hx509_name /*name*/);
-
-int
-hx509_revoke_add_crl (
-	hx509_context /*context*/,
-	hx509_revoke_ctx /*ctx*/,
-	const char */*path*/);
-
-int
-hx509_revoke_add_ocsp (
-	hx509_context /*context*/,
-	hx509_revoke_ctx /*ctx*/,
-	const char */*path*/);
-
-void
-hx509_revoke_free (hx509_revoke_ctx */*ctx*/);
-
-int
-hx509_revoke_init (
-	hx509_context /*context*/,
-	hx509_revoke_ctx */*ctx*/);
-
-int
-hx509_revoke_ocsp_print (
-	hx509_context /*context*/,
-	const char */*path*/,
-	FILE */*out*/);
-
-int
-hx509_revoke_verify (
-	hx509_context /*context*/,
-	hx509_revoke_ctx /*ctx*/,
-	hx509_certs /*certs*/,
-	time_t /*now*/,
-	hx509_cert /*cert*/,
-	hx509_cert /*parent_cert*/);
-
-void
-hx509_set_error_string (
-	hx509_context /*context*/,
-	int /*flags*/,
-	int /*code*/,
-	const char */*fmt*/,
-	...);
-
-void
-hx509_set_error_stringv (
-	hx509_context /*context*/,
-	int /*flags*/,
-	int /*code*/,
-	const char */*fmt*/,
-	va_list /*ap*/);
-
-const AlgorithmIdentifier *
-hx509_signature_ecPublicKey (void);
-
-const AlgorithmIdentifier *
-hx509_signature_ecdsa_with_sha1 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_ecdsa_with_sha256 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_md5 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_rsa (void);
-
-const AlgorithmIdentifier *
-hx509_signature_rsa_pkcs1_x509 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_rsa_with_md5 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_rsa_with_sha1 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_rsa_with_sha256 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_rsa_with_sha384 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_rsa_with_sha512 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_sha1 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_sha256 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_sha384 (void);
-
-const AlgorithmIdentifier *
-hx509_signature_sha512 (void);
-
-int
-hx509_unparse_der_name (
-	const void */*data*/,
-	size_t /*length*/,
-	char **/*str*/);
-
-int
-hx509_validate_cert (
-	hx509_context /*context*/,
-	hx509_validate_ctx /*ctx*/,
-	hx509_cert /*cert*/);
-
-void
-hx509_validate_ctx_add_flags (
-	hx509_validate_ctx /*ctx*/,
-	int /*flags*/);
-
-void
-hx509_validate_ctx_free (hx509_validate_ctx /*ctx*/);
-
-int
-hx509_validate_ctx_init (
-	hx509_context /*context*/,
-	hx509_validate_ctx */*ctx*/);
-
-void
-hx509_validate_ctx_set_print (
-	hx509_validate_ctx /*ctx*/,
-	hx509_vprint_func /*func*/,
-	void */*c*/);
-
-void
-hx509_verify_attach_anchors (
-	hx509_verify_ctx /*ctx*/,
-	hx509_certs /*set*/);
-
-void
-hx509_verify_attach_revoke (
-	hx509_verify_ctx /*ctx*/,
-	hx509_revoke_ctx /*revoke_ctx*/);
-
-void
-hx509_verify_ctx_f_allow_best_before_signature_algs (
-	hx509_context /*ctx*/,
-	int /*boolean*/);
-
-void
-hx509_verify_ctx_f_allow_default_trustanchors (
-	hx509_verify_ctx /*ctx*/,
-	int /*boolean*/);
-
-void
-hx509_verify_destroy_ctx (hx509_verify_ctx /*ctx*/);
-
-int
-hx509_verify_hostname (
-	hx509_context /*context*/,
-	const hx509_cert /*cert*/,
-	int /*flags*/,
-	hx509_hostname_type /*type*/,
-	const char */*hostname*/,
-	const struct sockaddr */*sa*/,
-	int /*sa_size*/);
-
-int
-hx509_verify_init_ctx (
-	hx509_context /*context*/,
-	hx509_verify_ctx */*ctx*/);
-
-int
-hx509_verify_path (
-	hx509_context /*context*/,
-	hx509_verify_ctx /*ctx*/,
-	hx509_cert /*cert*/,
-	hx509_certs /*pool*/);
-
-void
-hx509_verify_set_max_depth (
-	hx509_verify_ctx /*ctx*/,
-	unsigned int /*max_depth*/);
-
-void
-hx509_verify_set_proxy_certificate (
-	hx509_verify_ctx /*ctx*/,
-	int /*boolean*/);
-
-void
-hx509_verify_set_strict_rfc3280_verification (
-	hx509_verify_ctx /*ctx*/,
-	int /*boolean*/);
-
-void
-hx509_verify_set_time (
-	hx509_verify_ctx /*ctx*/,
-	time_t /*t*/);
-
-int
-hx509_verify_signature (
-	hx509_context /*context*/,
-	const hx509_cert /*signer*/,
-	const AlgorithmIdentifier */*alg*/,
-	const heim_octet_string */*data*/,
-	const heim_octet_string */*sig*/);
-
-void
-hx509_xfree (void */*ptr*/);
-
-int
-yywrap (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __hx509_protos_h__ */
diff --git a/include.new/hx509.h b/include.new/hx509.h
deleted file mode 100644
index 3954b54..0000000
--- a/include.new/hx509.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2004 - 2007 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef HEIMDAL_HX509_H
-#define HEIMDAL_HX509_H 1
-
-#include <rfc2459_asn1.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-typedef struct hx509_cert_attribute_data *hx509_cert_attribute;
-typedef struct hx509_cert_data *hx509_cert;
-typedef struct hx509_certs_data *hx509_certs;
-typedef struct hx509_context_data *hx509_context;
-typedef struct hx509_crypto_data *hx509_crypto;
-typedef struct hx509_lock_data *hx509_lock;
-typedef struct hx509_name_data *hx509_name;
-typedef struct hx509_private_key *hx509_private_key;
-typedef struct hx509_private_key_ops hx509_private_key_ops;
-typedef struct hx509_validate_ctx_data *hx509_validate_ctx;
-typedef struct hx509_verify_ctx_data *hx509_verify_ctx;
-typedef struct hx509_revoke_ctx_data *hx509_revoke_ctx;
-typedef struct hx509_query_data hx509_query;
-typedef void * hx509_cursor;
-typedef struct hx509_request_data *hx509_request;
-typedef struct hx509_error_data *hx509_error;
-typedef struct hx509_peer_info *hx509_peer_info;
-typedef struct hx509_ca_tbs *hx509_ca_tbs;
-typedef struct hx509_env_data *hx509_env;
-typedef struct hx509_crl *hx509_crl;
-
-typedef void (*hx509_vprint_func)(void *, const char *, va_list);
-
-enum {
-    HX509_VHN_F_ALLOW_NO_MATCH = 1
-};
-
-enum {
-    HX509_VALIDATE_F_VALIDATE = 1,
-    HX509_VALIDATE_F_VERBOSE = 2
-};
-
-enum {
-    HX509_CRYPTO_PADDING_PKCS7 = 0,
-    HX509_CRYPTO_PADDING_NONE = 1
-};
-
-enum {
-    HX509_KEY_FORMAT_GUESS = 0,
-    HX509_KEY_FORMAT_DER = 1,
-    HX509_KEY_FORMAT_WIN_BACKUPKEY = 2
-};
-typedef uint32_t hx509_key_format_t;
-
-struct hx509_cert_attribute_data {
-    heim_oid oid;
-    heim_octet_string data;
-};
-
-typedef enum {
-    HX509_PROMPT_TYPE_PASSWORD		= 0x1,	/* password, hidden */
-    HX509_PROMPT_TYPE_QUESTION		= 0x2,	/* question, not hidden */
-    HX509_PROMPT_TYPE_INFO		= 0x4	/* infomation, reply doesn't matter */
-} hx509_prompt_type;
-
-typedef struct hx509_prompt {
-    const char *prompt;
-    hx509_prompt_type type;
-    heim_octet_string reply;
-} hx509_prompt;
-
-typedef int (*hx509_prompter_fct)(void *, const hx509_prompt *);
-
-typedef struct hx509_octet_string_list {
-    size_t len;
-    heim_octet_string *val;
-} hx509_octet_string_list;
-
-typedef struct hx509_pem_header {
-    struct hx509_pem_header *next;
-    char *header;
-    char *value;
-} hx509_pem_header;
-
-typedef int
-(*hx509_pem_read_func)(hx509_context, const char *, const hx509_pem_header *,
-		       const void *, size_t, void *ctx);
-
-/*
- * Options passed to hx509_query_match_option.
- */
-typedef enum {
-    HX509_QUERY_OPTION_PRIVATE_KEY = 1,
-    HX509_QUERY_OPTION_KU_ENCIPHERMENT = 2,
-    HX509_QUERY_OPTION_KU_DIGITALSIGNATURE = 3,
-    HX509_QUERY_OPTION_KU_KEYCERTSIGN = 4,
-    HX509_QUERY_OPTION_END = 0xffff
-} hx509_query_option;
-
-/* flags to hx509_certs_init */
-#define HX509_CERTS_CREATE				0x01
-#define HX509_CERTS_UNPROTECT_ALL			0x02
-
-/* flags to hx509_set_error_string */
-#define HX509_ERROR_APPEND				0x01
-
-/* flags to hx509_cms_unenvelope */
-#define HX509_CMS_UE_DONT_REQUIRE_KU_ENCIPHERMENT	0x01
-#define HX509_CMS_UE_ALLOW_WEAK				0x02
-
-/* flags to hx509_cms_envelope_1 */
-#define HX509_CMS_EV_NO_KU_CHECK			0x01
-#define HX509_CMS_EV_ALLOW_WEAK				0x02
-#define HX509_CMS_EV_ID_NAME				0x04
-
-/* flags to hx509_cms_verify_signed */
-#define HX509_CMS_VS_ALLOW_DATA_OID_MISMATCH		0x01
-#define HX509_CMS_VS_NO_KU_CHECK			0x02
-#define HX509_CMS_VS_ALLOW_ZERO_SIGNER			0x04
-#define HX509_CMS_VS_NO_VALIDATE			0x08
-
-/* selectors passed to hx509_crypto_select and hx509_crypto_available */
-#define HX509_SELECT_ALL 0
-#define HX509_SELECT_DIGEST 1
-#define HX509_SELECT_PUBLIC_SIG 2
-#define HX509_SELECT_PUBLIC_ENC 3
-#define HX509_SELECT_SECRET_ENC 4
-
-/* flags to hx509_ca_tbs_set_template */
-#define HX509_CA_TEMPLATE_SUBJECT 1
-#define HX509_CA_TEMPLATE_SERIAL 2
-#define HX509_CA_TEMPLATE_NOTBEFORE 4
-#define HX509_CA_TEMPLATE_NOTAFTER 8
-#define HX509_CA_TEMPLATE_SPKI 16
-#define HX509_CA_TEMPLATE_KU 32
-#define HX509_CA_TEMPLATE_EKU 64
-
-/* flags hx509_cms_create_signed* */
-#define HX509_CMS_SIGNATURE_DETACHED			0x01
-#define HX509_CMS_SIGNATURE_ID_NAME			0x02
-#define HX509_CMS_SIGNATURE_NO_SIGNER			0x04
-#define HX509_CMS_SIGNATURE_LEAF_ONLY			0x08
-#define HX509_CMS_SIGNATURE_NO_CERTS			0x10
-
-/* hx509_verify_hostname nametype */
-typedef enum  {
-    HX509_HN_HOSTNAME = 0,
-    HX509_HN_DNSSRV
-} hx509_hostname_type;
-
-#include <hx509-protos.h>
-#include <hx509_err.h>
-
-#endif /* HEIMDAL_HX509_H */
diff --git a/include.new/hx509_err.h b/include.new/hx509_err.h
deleted file mode 100644
index b312b14..0000000
--- a/include.new/hx509_err.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libhx509/../../../crypto/heimdal/lib/hx509/hx509_err.et */
-/* $Id$ */
-
-#ifndef __hx509_err_h__
-#define __hx509_err_h__
-
-struct et_list;
-
-void initialize_hx_error_table_r(struct et_list **);
-
-void initialize_hx_error_table(void);
-#define init_hx_err_tbl initialize_hx_error_table
-
-typedef enum hx_error_number{
-	HX509_BAD_TIMEFORMAT = 569856,
-	HX509_EXTENSION_NOT_FOUND = 569857,
-	HX509_NO_PATH = 569858,
-	HX509_PARENT_NOT_CA = 569859,
-	HX509_CA_PATH_TOO_DEEP = 569860,
-	HX509_SIG_ALG_NO_SUPPORTED = 569861,
-	HX509_SIG_ALG_DONT_MATCH_KEY_ALG = 569862,
-	HX509_CERT_USED_BEFORE_TIME = 569863,
-	HX509_CERT_USED_AFTER_TIME = 569864,
-	HX509_PRIVATE_KEY_MISSING = 569865,
-	HX509_ALG_NOT_SUPP = 569866,
-	HX509_ISSUER_NOT_FOUND = 569867,
-	HX509_VERIFY_CONSTRAINTS = 569868,
-	HX509_RANGE = 569869,
-	HX509_NAME_CONSTRAINT_ERROR = 569870,
-	HX509_PATH_TOO_LONG = 569871,
-	HX509_KU_CERT_MISSING = 569872,
-	HX509_CERT_NOT_FOUND = 569873,
-	HX509_UNKNOWN_LOCK_COMMAND = 569874,
-	HX509_PARENT_IS_CA = 569875,
-	HX509_EXTRA_DATA_AFTER_STRUCTURE = 569876,
-	HX509_PROXY_CERT_INVALID = 569877,
-	HX509_PROXY_CERT_NAME_WRONG = 569878,
-	HX509_NAME_MALFORMED = 569879,
-	HX509_CERTIFICATE_MALFORMED = 569880,
-	HX509_CERTIFICATE_MISSING_EKU = 569881,
-	HX509_PROXY_CERTIFICATE_NOT_CANONICALIZED = 569882,
-	HX509_CMS_FAILED_CREATE_SIGATURE = 569888,
-	HX509_CMS_MISSING_SIGNER_DATA = 569889,
-	HX509_CMS_SIGNER_NOT_FOUND = 569890,
-	HX509_CMS_NO_DATA_AVAILABLE = 569891,
-	HX509_CMS_INVALID_DATA = 569892,
-	HX509_CMS_PADDING_ERROR = 569893,
-	HX509_CMS_NO_RECIPIENT_CERTIFICATE = 569894,
-	HX509_CMS_DATA_OID_MISMATCH = 569895,
-	HX509_CRYPTO_INTERNAL_ERROR = 569920,
-	HX509_CRYPTO_EXTERNAL_ERROR = 569921,
-	HX509_CRYPTO_SIGNATURE_MISSING = 569922,
-	HX509_CRYPTO_BAD_SIGNATURE = 569923,
-	HX509_CRYPTO_SIG_NO_CONF = 569924,
-	HX509_CRYPTO_SIG_INVALID_FORMAT = 569925,
-	HX509_CRYPTO_OID_MISMATCH = 569926,
-	HX509_CRYPTO_NO_PROMPTER = 569927,
-	HX509_CRYPTO_SIGNATURE_WITHOUT_SIGNER = 569928,
-	HX509_CRYPTO_RSA_PUBLIC_ENCRYPT = 569929,
-	HX509_CRYPTO_RSA_PRIVATE_ENCRYPT = 569930,
-	HX509_CRYPTO_RSA_PUBLIC_DECRYPT = 569931,
-	HX509_CRYPTO_RSA_PRIVATE_DECRYPT = 569932,
-	HX509_CRYPTO_ALGORITHM_BEST_BEFORE = 569933,
-	HX509_CRYPTO_KEY_FORMAT_UNSUPPORTED = 569934,
-	HX509_CRL_USED_BEFORE_TIME = 569952,
-	HX509_CRL_USED_AFTER_TIME = 569953,
-	HX509_CRL_INVALID_FORMAT = 569954,
-	HX509_CERT_REVOKED = 569955,
-	HX509_REVOKE_STATUS_MISSING = 569956,
-	HX509_CRL_UNKNOWN_EXTENSION = 569957,
-	HX509_REVOKE_WRONG_DATA = 569958,
-	HX509_REVOKE_NOT_SAME_PARENT = 569959,
-	HX509_CERT_NOT_IN_OCSP = 569960,
-	HX509_LOCAL_ATTRIBUTE_MISSING = 569964,
-	HX509_PARSING_KEY_FAILED = 569965,
-	HX509_UNSUPPORTED_OPERATION = 569966,
-	HX509_UNIMPLEMENTED_OPERATION = 569967,
-	HX509_PARSING_NAME_FAILED = 569968,
-	HX509_PKCS11_NO_SLOT = 569984,
-	HX509_PKCS11_NO_TOKEN = 569985,
-	HX509_PKCS11_NO_MECH = 569986,
-	HX509_PKCS11_TOKEN_CONFUSED = 569987,
-	HX509_PKCS11_OPEN_SESSION = 569988,
-	HX509_PKCS11_LOGIN = 569989,
-	HX509_PKCS11_LOAD = 569990
-} hx_error_number;
-
-#define ERROR_TABLE_BASE_hx 569856
-
-#define COM_ERR_BINDDOMAIN_hx "heim_com_err569856"
-
-#endif /* __hx509_err_h__ */
diff --git a/include.new/iconv.h b/include.new/iconv.h
deleted file mode 100644
index a4eab48..0000000
--- a/include.new/iconv.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*	$FreeBSD: releng/10.2/include/iconv.h 282275 2015-04-30 16:08:47Z tijl $	*/
-/*	$NetBSD: iconv.h,v 1.6 2005/02/03 04:39:32 perry Exp $	*/
-
-/*-
- * Copyright (c) 2003 Citrus Project,
- * Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@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.
- *
- * 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.
- *
- */
-
-#ifndef _ICONV_H_
-#define _ICONV_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <wchar.h>
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#ifdef __cplusplus
-typedef	bool	__iconv_bool;
-#elif __STDC_VERSION__ >= 199901L
-typedef	_Bool	__iconv_bool;
-#else
-typedef	int	__iconv_bool;
-#endif
-
-struct __tag_iconv_t;
-typedef	struct __tag_iconv_t	*iconv_t;
-
-__BEGIN_DECLS
-iconv_t	iconv_open(const char *, const char *);
-size_t	iconv(iconv_t, char ** __restrict,
-	      size_t * __restrict, char ** __restrict,
-	      size_t * __restrict);
-int	iconv_close(iconv_t);
-/*
- * non-portable interfaces for iconv
- */
-int	__iconv_get_list(char ***, size_t *, __iconv_bool);
-void	__iconv_free_list(char **, size_t);
-size_t	__iconv(iconv_t, char **, size_t *, char **,
-		     size_t *, __uint32_t, size_t *);
-#define __ICONV_F_HIDE_INVALID	0x0001
-
-/*
- * GNU interfaces for iconv
- */
-typedef struct {
-	void	*spaceholder[64];
-} iconv_allocation_t;
-
-int	 iconv_open_into(const char *, const char *, iconv_allocation_t *);
-void	 iconv_set_relocation_prefix(const char *, const char *);
-
-/*
- * iconvctl() request macros
- */
-#define ICONV_TRIVIALP		0
-#define	ICONV_GET_TRANSLITERATE	1
-#define	ICONV_SET_TRANSLITERATE	2
-#define ICONV_GET_DISCARD_ILSEQ	3
-#define ICONV_SET_DISCARD_ILSEQ	4
-#define ICONV_SET_HOOKS		5
-#define ICONV_SET_FALLBACKS	6
-#define ICONV_GET_ILSEQ_INVALID	128
-#define ICONV_SET_ILSEQ_INVALID	129
-
-typedef void (*iconv_unicode_char_hook) (unsigned int mbr, void *data);
-typedef void (*iconv_wide_char_hook) (wchar_t wc, void *data);
-
-struct iconv_hooks {
-	iconv_unicode_char_hook		 uc_hook;
-	iconv_wide_char_hook		 wc_hook;
-	void				*data;
-};
-
-/*
- * Fallbacks aren't supported but type definitions are provided for
- * source compatibility.
- */
-typedef void (*iconv_unicode_mb_to_uc_fallback) (const char*,
-		size_t, void (*write_replacement) (const unsigned int *,
-		size_t, void*),	void*, void*);
-typedef void (*iconv_unicode_uc_to_mb_fallback) (unsigned int,
-		void (*write_replacement) (const char *, size_t, void*),
-		void*, void*);
-typedef void (*iconv_wchar_mb_to_wc_fallback) (const char*, size_t,
-		void (*write_replacement) (const wchar_t *, size_t, void*),
-		void*, void*);
-typedef void (*iconv_wchar_wc_to_mb_fallback) (wchar_t,
-		void (*write_replacement) (const char *, size_t, void*),
-		void*, void*);
-
-struct iconv_fallbacks {
-	iconv_unicode_mb_to_uc_fallback	 mb_to_uc_fallback;
-	iconv_unicode_uc_to_mb_fallback  uc_to_mb_fallback;
-	iconv_wchar_mb_to_wc_fallback	 mb_to_wc_fallback;
-	iconv_wchar_wc_to_mb_fallback	 wc_to_mb_fallback;
-	void				*data;
-};
-
-
-void		 iconvlist(int (*do_one) (unsigned int, const char * const *,
-		    void *), void *);
-const char	*iconv_canonicalize(const char *);
-int		 iconvctl(iconv_t, int, void *);
-__END_DECLS
-
-#endif /* !_ICONV_H_ */
diff --git a/include.new/ieeefp.h b/include.new/ieeefp.h
deleted file mode 100644
index cf612fe..0000000
--- a/include.new/ieeefp.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*	$NetBSD: ieeefp.h,v 1.4 1998/01/09 08:03:43 perry Exp $	*/
-/* $FreeBSD: releng/10.2/include/ieeefp.h 226607 2011-10-21 06:41:46Z das $ */
-
-/* 
- * Written by J.T. Conklin, Apr 6, 1995
- * Public domain.
- */
-
-#ifndef _IEEEFP_H_
-#define _IEEEFP_H_
-
-#include <sys/cdefs.h>
-#include <machine/ieeefp.h>
-
-#endif /* _IEEEFP_H_ */
diff --git a/include.new/ifaddrs.h b/include.new/ifaddrs.h
deleted file mode 100644
index 28ed4bc..0000000
--- a/include.new/ifaddrs.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*	$FreeBSD: releng/10.2/include/ifaddrs.h 250887 2013-05-21 21:20:10Z ed $	*/
-
-/*
- * Copyright (c) 1995, 1999
- *	Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *	BSDI ifaddrs.h,v 2.5 2000/02/23 14:51:59 dab Exp
- */
-
-#ifndef	_IFADDRS_H_
-#define	_IFADDRS_H_
-
-struct ifaddrs {
-	struct ifaddrs  *ifa_next;
-	char		*ifa_name;
-	unsigned int	 ifa_flags;
-	struct sockaddr	*ifa_addr;
-	struct sockaddr	*ifa_netmask;
-	struct sockaddr	*ifa_dstaddr;
-	void		*ifa_data;
-};
-
-/*
- * This may have been defined in <net/if.h>.  Note that if <net/if.h> is
- * to be included it must be included before this header file.
- */
-#ifndef	ifa_broadaddr
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-#endif
-
-struct ifmaddrs {
-	struct ifmaddrs	*ifma_next;
-	struct sockaddr	*ifma_name;
-	struct sockaddr	*ifma_addr;
-	struct sockaddr	*ifma_lladdr;
-};
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern int getifaddrs(struct ifaddrs **);
-extern void freeifaddrs(struct ifaddrs *);
-extern int getifmaddrs(struct ifmaddrs **);
-extern void freeifmaddrs(struct ifmaddrs *);
-__END_DECLS
-
-#endif
diff --git a/include.new/inttypes.h b/include.new/inttypes.h
deleted file mode 100644
index fa767ee..0000000
--- a/include.new/inttypes.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/include/inttypes.h 264496 2014-04-15 09:41:52Z tijl $
- */
-
-#ifndef _INTTYPES_H_
-#define	_INTTYPES_H_
-
-#include <machine/_inttypes.h>
-#include <sys/stdint.h>
-
-#ifndef	__cplusplus
-#ifndef _WCHAR_T_DECLARED
-typedef	___wchar_t	wchar_t;
-#define	_WCHAR_T_DECLARED
-#endif
-#endif
-
-typedef struct {
-	intmax_t	quot;		/* Quotient. */
-	intmax_t	rem;		/* Remainder. */
-} imaxdiv_t;
-
-__BEGIN_DECLS
-#ifdef _XLOCALE_H_
-#include <xlocale/_inttypes.h>
-#endif
-intmax_t	imaxabs(intmax_t) __pure2;
-imaxdiv_t	imaxdiv(intmax_t, intmax_t) __pure2;
-
-intmax_t	strtoimax(const char * __restrict, char ** __restrict, int);
-uintmax_t	strtoumax(const char * __restrict, char ** __restrict, int);
-intmax_t	wcstoimax(const wchar_t * __restrict,
-		    wchar_t ** __restrict, int);
-uintmax_t	wcstoumax(const wchar_t * __restrict,
-		    wchar_t ** __restrict, int);
-__END_DECLS
-
-#endif /* !_INTTYPES_H_ */
diff --git a/include.new/iso646.h b/include.new/iso646.h
deleted file mode 100644
index c9eca66..0000000
--- a/include.new/iso646.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1998 Alex Nash
- * 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.
- *
- * 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: releng/10.2/include/iso646.h 225801 2011-09-27 16:33:17Z jkim $
- */
-
-#ifndef _ISO646_H_
-#define	_ISO646_H_
-
-#ifndef __cplusplus
-
-#define	and	&&
-#define	and_eq	&=
-#define	bitand	&
-#define	bitor	|
-#define	compl	~
-#define	not	!
-#define	not_eq	!=
-#define	or	||
-#define	or_eq	|=
-#define	xor	^
-#define	xor_eq	^=
-
-#endif /* !__cplusplus */
-
-#endif /* !_ISO646_H_ */
diff --git a/include.new/isofs/cd9660/cd9660_mount.h b/include.new/isofs/cd9660/cd9660_mount.h
deleted file mode 100644
index 7efe648..0000000
--- a/include.new/isofs/cd9660/cd9660_mount.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley
- * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
- * Support code is derived from software contributed to Berkeley
- * by Atsushi Murai (amurai@spec.co.jp).
- *
- * 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.
- * 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.
- *
- *	@(#)cd9660_mount.h	8.1 (Berkeley) 5/24/95
- * $FreeBSD: releng/10.2/sys/fs/cd9660/cd9660_mount.h 213664 2010-10-10 07:05:47Z kib $
- */
-
-/*
- * Arguments to mount ISO 9660 filesystems.
- */
-struct iso_args {
-	char	*fspec;			/* block special device to mount */
-	struct	oexport_args export;	/* network export info */
-	int	flags;			/* mounting flags, see below */
-	int	ssector;		/* starting sector, 0 for 1st session */
-	char	*cs_disk;		/* disk charset for Joliet cs conversion */
-	char	*cs_local;		/* local charset for Joliet cs conversion */
-};
-#define	ISOFSMNT_NORRIP	0x00000001	/* disable Rock Ridge Ext.*/
-#define	ISOFSMNT_GENS	0x00000002	/* enable generation numbers */
-#define	ISOFSMNT_EXTATT	0x00000004	/* enable extended attributes */
-#define ISOFSMNT_NOJOLIET 0x00000008	/* disable Joliet Ext.*/
-#define ISOFSMNT_BROKENJOLIET 0x00000010/* allow broken Joliet disks */
-#define	ISOFSMNT_KICONV 0x00000020	/* Use libiconv to convert chars */
diff --git a/include.new/isofs/cd9660/cd9660_node.h b/include.new/isofs/cd9660/cd9660_node.h
deleted file mode 100644
index f1760e0..0000000
--- a/include.new/isofs/cd9660/cd9660_node.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley
- * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
- * Support code is derived from software contributed to Berkeley
- * by Atsushi Murai (amurai@spec.co.jp).
- *
- * 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.
- * 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.
- *
- *	@(#)cd9660_node.h	8.6 (Berkeley) 5/14/95
- * $FreeBSD: releng/10.2/sys/fs/cd9660/cd9660_node.h 187838 2009-01-28 18:54:56Z jhb $
- */
-
-/*
- * Theoretically, directories can be more than 2Gb in length,
- * however, in practice this seems unlikely. So, we define
- * the type doff_t as a long to keep down the cost of doing
- * lookup on a 32-bit machine. If you are porting to a 64-bit
- * architecture, you should make doff_t the same as off_t.
- */
-#define doff_t	long
-
-typedef	struct	{
-	struct timespec	iso_atime;	/* time of last access */
-	struct timespec	iso_mtime;	/* time of last modification */
-	struct timespec	iso_ctime;	/* time file changed */
-	u_short		iso_mode;	/* files access mode and type */
-	uid_t		iso_uid;	/* owner user id */
-	gid_t		iso_gid;	/* owner group id */
-	short		iso_links;	/* links of file */
-	dev_t		iso_rdev;	/* Major/Minor number for special */
-} ISO_RRIP_INODE;
-
-
-struct iso_node {
-	struct	vnode *i_vnode;	/* vnode associated with this inode */
-	ino_t	i_number;	/* the identity of the inode */
-				/* we use the actual starting block of the file */
-	struct	iso_mnt *i_mnt;	/* filesystem associated with this inode */
-	struct	lockf *i_lockf;	/* head of byte-level lock list */
-	doff_t	i_endoff;	/* end of useful stuff in directory */
-	doff_t	i_diroff;	/* offset in dir, where we found last entry */
-
-	long iso_extent;	/* extent of file */
-	unsigned long i_size;
-	long iso_start;		/* actual start of data of file (may be different */
-				/* from iso_extent, if file has extended attributes) */
-	ISO_RRIP_INODE	inode;
-};
-
-#define	i_forw		i_chain[0]
-#define	i_back		i_chain[1]
-
-#define VTOI(vp) ((struct iso_node *)(vp)->v_data)
-#define ITOV(ip) ((ip)->i_vnode)
-
-#ifdef _KERNEL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_ISOFSMNT);
-MALLOC_DECLARE(M_ISOFSNODE);
-#endif
-
-struct buf;
-struct vop_bmap_args;
-struct vop_cachedlookup_args;
-struct vop_inactive_args;
-struct vop_reclaim_args;
-
-/*
- * Prototypes for ISOFS vnode operations
- */
-int cd9660_lookup(struct vop_cachedlookup_args *);
-int cd9660_inactive(struct vop_inactive_args *);
-int cd9660_reclaim(struct vop_reclaim_args *);
-int cd9660_bmap(struct vop_bmap_args *);
-int cd9660_blkatoff(struct vnode *vp, off_t offset, char **res, struct buf **bpp);
-
-void cd9660_defattr(struct iso_directory_record *,
-			struct iso_node *, struct buf *, enum ISO_FTYPE);
-void cd9660_deftstamp(struct iso_directory_record *,
-			struct iso_node *, struct buf *, enum ISO_FTYPE);
-int cd9660_tstamp_conv7(u_char *, struct timespec *, enum ISO_FTYPE);
-int cd9660_tstamp_conv17(u_char *, struct timespec *);
-
-#endif /* _KERNEL */
diff --git a/include.new/isofs/cd9660/cd9660_rrip.h b/include.new/isofs/cd9660/cd9660_rrip.h
deleted file mode 100644
index 8c521d7..0000000
--- a/include.new/isofs/cd9660/cd9660_rrip.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * Copyright (c) 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley
- * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
- * Support code is derived from software contributed to Berkeley
- * by Atsushi Murai (amurai@spec.co.jp).
- *
- * 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.
- * 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.
- *
- *	@(#)cd9660_rrip.h	8.2 (Berkeley) 12/5/94
- * $FreeBSD: releng/10.2/sys/fs/cd9660/cd9660_rrip.h 166639 2007-02-11 13:54:25Z rodrigc $
- */
-
-typedef struct {
-	char   type			[ISODCL (  0,    1)];
-	u_char length			[ISODCL (  2,    2)]; /* 711 */
-	u_char version			[ISODCL (  3,    3)];
-} ISO_SUSP_HEADER;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	char mode			[ISODCL (  4,   11)]; /* 733 */
-	char links			[ISODCL ( 12,   19)]; /* 733 */
-	char uid			[ISODCL ( 20,   27)]; /* 733 */
-	char gid			[ISODCL ( 28,   35)]; /* 733 */
-} ISO_RRIP_ATTR;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	char dev_t_high			[ISODCL (  4,   11)]; /* 733 */
-	char dev_t_low			[ISODCL ( 12,   19)]; /* 733 */
-} ISO_RRIP_DEVICE;
-
-#define	ISO_SUSP_CFLAG_CONTINUE	0x01
-#define	ISO_SUSP_CFLAG_CURRENT	0x02
-#define	ISO_SUSP_CFLAG_PARENT	0x04
-#define	ISO_SUSP_CFLAG_ROOT	0x08
-#define	ISO_SUSP_CFLAG_VOLROOT	0x10
-#define	ISO_SUSP_CFLAG_HOST	0x20
-
-typedef struct {
-	u_char cflag			[ISODCL (  1,    1)];
-	u_char clen			[ISODCL (  2,    2)];
-	u_char name			[1];			/* XXX */
-} ISO_RRIP_SLINK_COMPONENT;
-#define	ISO_RRIP_SLSIZ	2
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	u_char flags			[ISODCL (  4,	 4)];
-	u_char component		[ISODCL (  5,	 5)];
-} ISO_RRIP_SLINK;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	char flags			[ISODCL (  4,	 4)];
-} ISO_RRIP_ALTNAME;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	char dir_loc			[ISODCL (  4,	 11)]; /* 733 */
-} ISO_RRIP_CLINK;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	char dir_loc			[ISODCL (  4,	 11)]; /* 733 */
-} ISO_RRIP_PLINK;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-} ISO_RRIP_RELDIR;
-
-#define	ISO_SUSP_TSTAMP_FORM17	0x80
-#define	ISO_SUSP_TSTAMP_FORM7	0x00
-#define	ISO_SUSP_TSTAMP_CREAT	0x01
-#define	ISO_SUSP_TSTAMP_MODIFY	0x02
-#define	ISO_SUSP_TSTAMP_ACCESS	0x04
-#define	ISO_SUSP_TSTAMP_ATTR	0x08
-#define	ISO_SUSP_TSTAMP_BACKUP	0x10
-#define	ISO_SUSP_TSTAMP_EXPIRE	0x20
-#define	ISO_SUSP_TSTAMP_EFFECT	0x40
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	u_char flags			[ISODCL (  4,    4)];
-	u_char time			[ISODCL (  5,    5)];
-} ISO_RRIP_TSTAMP;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	u_char flags			[ISODCL (  4,    4)];
-} ISO_RRIP_IDFLAG;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	char len_id			[ISODCL (  4,	 4)];
-	char len_des			[ISODCL (  5,	 5)];
-	char len_src			[ISODCL (  6,	 6)];
-	char version			[ISODCL (  7,	 7)];
-} ISO_RRIP_EXTREF;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	char check			[ISODCL (  4,	 5)];
-	char skip			[ISODCL (  6,	 6)];
-} ISO_RRIP_OFFSET;
-
-typedef struct {
-	ISO_SUSP_HEADER			h;
-	char location			[ISODCL (  4,	11)];
-	char offset			[ISODCL ( 12,	19)];
-	char length			[ISODCL ( 20,	27)];
-} ISO_RRIP_CONT;
diff --git a/include.new/isofs/cd9660/iso.h b/include.new/isofs/cd9660/iso.h
deleted file mode 100644
index ec37fc2..0000000
--- a/include.new/isofs/cd9660/iso.h
+++ /dev/null
@@ -1,359 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley
- * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
- * Support code is derived from software contributed to Berkeley
- * by Atsushi Murai (amurai@spec.co.jp).
- *
- * 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.
- * 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.
- *
- *	@(#)iso.h	8.6 (Berkeley) 5/10/95
- * $FreeBSD: releng/10.2/sys/fs/cd9660/iso.h 253742 2013-07-28 12:29:10Z marius $
- */
-
-#define ISODCL(from, to) (to - from + 1)
-
-struct iso_volume_descriptor {
-	char type[ISODCL(1,1)]; /* 711 */
-	char id[ISODCL(2,6)];
-	char version[ISODCL(7,7)];
-	char unused[ISODCL(8,8)];
-	char type_sierra[ISODCL(9,9)]; /* 711 */
-	char id_sierra[ISODCL(10,14)];
-	char version_sierra[ISODCL(15,15)];
-	char data[ISODCL(16,2048)];
-};
-
-/* volume descriptor types */
-#define ISO_VD_PRIMARY 1
-#define ISO_VD_SUPPLEMENTARY 2
-#define ISO_VD_END 255
-
-#define ISO_STANDARD_ID "CD001"
-#define ISO_ECMA_ID	"CDW01"
-
-#define ISO_SIERRA_ID	"CDROM"
-
-struct iso_primary_descriptor {
-	char type			[ISODCL (  1,	1)]; /* 711 */
-	char id				[ISODCL (  2,	6)];
-	char version			[ISODCL (  7,	7)]; /* 711 */
-	char unused1			[ISODCL (  8,	8)];
-	char system_id			[ISODCL (  9,  40)]; /* achars */
-	char volume_id			[ISODCL ( 41,  72)]; /* dchars */
-	char unused2			[ISODCL ( 73,  80)];
-	char volume_space_size		[ISODCL ( 81,  88)]; /* 733 */
-	char unused3			[ISODCL ( 89, 120)];
-	char volume_set_size		[ISODCL (121, 124)]; /* 723 */
-	char volume_sequence_number	[ISODCL (125, 128)]; /* 723 */
-	char logical_block_size		[ISODCL (129, 132)]; /* 723 */
-	char path_table_size		[ISODCL (133, 140)]; /* 733 */
-	char type_l_path_table		[ISODCL (141, 144)]; /* 731 */
-	char opt_type_l_path_table	[ISODCL (145, 148)]; /* 731 */
-	char type_m_path_table		[ISODCL (149, 152)]; /* 732 */
-	char opt_type_m_path_table	[ISODCL (153, 156)]; /* 732 */
-	char root_directory_record	[ISODCL (157, 190)]; /* 9.1 */
-	char volume_set_id		[ISODCL (191, 318)]; /* dchars */
-	char publisher_id		[ISODCL (319, 446)]; /* achars */
-	char preparer_id		[ISODCL (447, 574)]; /* achars */
-	char application_id		[ISODCL (575, 702)]; /* achars */
-	char copyright_file_id		[ISODCL (703, 739)]; /* 7.5 dchars */
-	char abstract_file_id		[ISODCL (740, 776)]; /* 7.5 dchars */
-	char bibliographic_file_id	[ISODCL (777, 813)]; /* 7.5 dchars */
-	char creation_date		[ISODCL (814, 830)]; /* 8.4.26.1 */
-	char modification_date		[ISODCL (831, 847)]; /* 8.4.26.1 */
-	char expiration_date		[ISODCL (848, 864)]; /* 8.4.26.1 */
-	char effective_date		[ISODCL (865, 881)]; /* 8.4.26.1 */
-	char file_structure_version	[ISODCL (882, 882)]; /* 711 */
-	char unused4			[ISODCL (883, 883)];
-	char application_data		[ISODCL (884, 1395)];
-	char unused5			[ISODCL (1396, 2048)];
-};
-#define ISO_DEFAULT_BLOCK_SIZE		2048
-
-/*
- * Used by Microsoft Joliet extension to ISO9660. Almost the same
- * as PVD, but byte position 8 is a flag, and 89-120 is for escape.
- */
-
-struct iso_supplementary_descriptor {
-      char type                       [ISODCL (  1,   1)]; /* 711 */
-      char id                         [ISODCL (  2,   6)];
-      char version                    [ISODCL (  7,   7)]; /* 711 */
-      char flags                      [ISODCL (  8,   8)]; /* 711? */
-      char system_id                  [ISODCL (  9,  40)]; /* achars */
-      char volume_id                  [ISODCL ( 41,  72)]; /* dchars */
-      char unused2                    [ISODCL ( 73,  80)];
-      char volume_space_size          [ISODCL ( 81,  88)]; /* 733 */
-      char escape                     [ISODCL ( 89, 120)];
-      char volume_set_size            [ISODCL (121, 124)]; /* 723 */
-      char volume_sequence_number     [ISODCL (125, 128)]; /* 723 */
-      char logical_block_size         [ISODCL (129, 132)]; /* 723 */
-      char path_table_size            [ISODCL (133, 140)]; /* 733 */
-      char type_l_path_table          [ISODCL (141, 144)]; /* 731 */
-      char opt_type_l_path_table      [ISODCL (145, 148)]; /* 731 */
-      char type_m_path_table          [ISODCL (149, 152)]; /* 732 */
-      char opt_type_m_path_table      [ISODCL (153, 156)]; /* 732 */
-      char root_directory_record      [ISODCL (157, 190)]; /* 9.1 */
-      char volume_set_id              [ISODCL (191, 318)]; /* dchars */
-      char publisher_id               [ISODCL (319, 446)]; /* achars */
-      char preparer_id                [ISODCL (447, 574)]; /* achars */
-      char application_id             [ISODCL (575, 702)]; /* achars */
-      char copyright_file_id          [ISODCL (703, 739)]; /* 7.5 dchars */
-      char abstract_file_id           [ISODCL (740, 776)]; /* 7.5 dchars */
-      char bibliographic_file_id      [ISODCL (777, 813)]; /* 7.5 dchars */
-      char creation_date              [ISODCL (814, 830)]; /* 8.4.26.1 */
-      char modification_date          [ISODCL (831, 847)]; /* 8.4.26.1 */
-      char expiration_date            [ISODCL (848, 864)]; /* 8.4.26.1 */
-      char effective_date             [ISODCL (865, 881)]; /* 8.4.26.1 */
-      char file_structure_version     [ISODCL (882, 882)]; /* 711 */
-      char unused4                    [ISODCL (883, 883)];
-      char application_data           [ISODCL (884, 1395)];
-      char unused5                    [ISODCL (1396, 2048)];
-};
-
-struct iso_sierra_primary_descriptor {
-	char unknown1			[ISODCL (  1,	8)]; /* 733 */
-	char type			[ISODCL (  9,	9)]; /* 711 */
-	char id				[ISODCL ( 10,  14)];
-	char version			[ISODCL ( 15,  15)]; /* 711 */
-	char unused1			[ISODCL ( 16,  16)];
-	char system_id			[ISODCL ( 17,  48)]; /* achars */
-	char volume_id			[ISODCL ( 49,  80)]; /* dchars */
-	char unused2			[ISODCL ( 81,  88)];
-	char volume_space_size		[ISODCL ( 89,  96)]; /* 733 */
-	char unused3			[ISODCL ( 97, 128)];
-	char volume_set_size		[ISODCL (129, 132)]; /* 723 */
-	char volume_sequence_number	[ISODCL (133, 136)]; /* 723 */
-	char logical_block_size		[ISODCL (137, 140)]; /* 723 */
-	char path_table_size		[ISODCL (141, 148)]; /* 733 */
-	char type_l_path_table		[ISODCL (149, 152)]; /* 731 */
-	char opt_type_l_path_table	[ISODCL (153, 156)]; /* 731 */
-	char unknown2			[ISODCL (157, 160)]; /* 731 */
-	char unknown3			[ISODCL (161, 164)]; /* 731 */
-	char type_m_path_table		[ISODCL (165, 168)]; /* 732 */
-	char opt_type_m_path_table	[ISODCL (169, 172)]; /* 732 */
-	char unknown4			[ISODCL (173, 176)]; /* 732 */
-	char unknown5			[ISODCL (177, 180)]; /* 732 */
-	char root_directory_record	[ISODCL (181, 214)]; /* 9.1 */
-	char volume_set_id		[ISODCL (215, 342)]; /* dchars */
-	char publisher_id		[ISODCL (343, 470)]; /* achars */
-	char preparer_id		[ISODCL (471, 598)]; /* achars */
-	char application_id		[ISODCL (599, 726)]; /* achars */
-	char copyright_id		[ISODCL (727, 790)]; /* achars */
-	char creation_date		[ISODCL (791, 806)]; /* ? */
-	char modification_date		[ISODCL (807, 822)]; /* ? */
-	char expiration_date		[ISODCL (823, 838)]; /* ? */
-	char effective_date		[ISODCL (839, 854)]; /* ? */
-	char file_structure_version	[ISODCL (855, 855)]; /* 711 */
-	char unused4			[ISODCL (856, 2048)];
-};
-
-struct iso_directory_record {
-	char length			[ISODCL (1, 1)]; /* 711 */
-	char ext_attr_length		[ISODCL (2, 2)]; /* 711 */
-	u_char extent			[ISODCL (3, 10)]; /* 733 */
-	u_char size			[ISODCL (11, 18)]; /* 733 */
-	char date			[ISODCL (19, 25)]; /* 7 by 711 */
-	char flags			[ISODCL (26, 26)];
-	char file_unit_size		[ISODCL (27, 27)]; /* 711 */
-	char interleave			[ISODCL (28, 28)]; /* 711 */
-	char volume_sequence_number	[ISODCL (29, 32)]; /* 723 */
-	char name_len			[ISODCL (33, 33)]; /* 711 */
-	char name			[1];			/* XXX */
-};
-/* can't take sizeof(iso_directory_record), because of possible alignment
-   of the last entry (34 instead of 33) */
-#define ISO_DIRECTORY_RECORD_SIZE	33
-
-struct iso_extended_attributes {
-	u_char owner			[ISODCL (1, 4)]; /* 723 */
-	u_char group			[ISODCL (5, 8)]; /* 723 */
-	u_char perm			[ISODCL (9, 10)]; /* 9.5.3 */
-	char ctime			[ISODCL (11, 27)]; /* 8.4.26.1 */
-	char mtime			[ISODCL (28, 44)]; /* 8.4.26.1 */
-	char xtime			[ISODCL (45, 61)]; /* 8.4.26.1 */
-	char ftime			[ISODCL (62, 78)]; /* 8.4.26.1 */
-	char recfmt			[ISODCL (79, 79)]; /* 711 */
-	char recattr			[ISODCL (80, 80)]; /* 711 */
-	u_char reclen			[ISODCL (81, 84)]; /* 723 */
-	char system_id			[ISODCL (85, 116)]; /* achars */
-	char system_use			[ISODCL (117, 180)];
-	char version			[ISODCL (181, 181)]; /* 711 */
-	char len_esc			[ISODCL (182, 182)]; /* 711 */
-	char reserved			[ISODCL (183, 246)];
-	u_char len_au			[ISODCL (247, 250)]; /* 723 */
-};
-
-#ifdef _KERNEL
-
-/* CD-ROM Format type */
-enum ISO_FTYPE	{ ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP,
-		  ISO_FTYPE_JOLIET, ISO_FTYPE_ECMA, ISO_FTYPE_HIGH_SIERRA };
-
-#ifndef	ISOFSMNT_ROOT
-#define	ISOFSMNT_ROOT	0
-#endif
-
-struct iso_mnt {
-	uint64_t im_flags;
-
-	struct mount *im_mountp;
-	struct cdev *im_dev;
-	struct vnode *im_devvp;
-
-	struct g_consumer *im_cp;
-	struct bufobj *im_bo;
-
-	int logical_block_size;
-	int im_bshift;
-	int im_bmask;
-
-	int volume_space_size;
-
-	char root[ISODCL (157, 190)];
-	int root_extent;
-	int root_size;
-	enum ISO_FTYPE	iso_ftype;
-
-	int rr_skip;
-	int rr_skip0;
-
-	int joliet_level;
-
-	void *im_d2l;
-	void *im_l2d;
-};
-
-struct ifid {
-	u_short	ifid_len;
-	u_short	ifid_pad;
-	int	ifid_ino;
-	long	ifid_start;
-};
-
-#define VFSTOISOFS(mp)	((struct iso_mnt *)((mp)->mnt_data))
-
-#define blkoff(imp, loc)	((loc) & (imp)->im_bmask)
-#define lblktosize(imp, blk)	((blk) << (imp)->im_bshift)
-#define lblkno(imp, loc)	((loc) >> (imp)->im_bshift)
-#define blksize(imp, ip, lbn)	((imp)->logical_block_size)
-
-int cd9660_vget_internal(struct mount *, ino_t, int, struct vnode **, int,
-			 struct iso_directory_record *);
-#define cd9660_sysctl ((int (*)(int *, u_int, void *, size_t *, void *, \
-				size_t, struct proc *))eopnotsupp)
-
-extern struct vop_vector cd9660_vnodeops;
-extern struct vop_vector cd9660_fifoops;
-
-int isochar(u_char *, u_char *, int, u_short *, int *, int, void *);
-int isofncmp(u_char *, int, u_char *, int, int, int, void *, void *);
-void isofntrans(u_char *, int, u_char *, u_short *, int, int, int, int, void *);
-ino_t isodirino(struct iso_directory_record *, struct iso_mnt *);
-u_short sgetrune(const char *, size_t, char const **, int, void *);
-
-#endif /* _KERNEL */
-
-/*
- * The isonum_xxx functions are inlined anyway, and could come handy even
- * outside the kernel.  Thus we don't hide them here.
- */
-
-/*
- * 7xy
- *  x -> 1 = 8 bits, 2 = 16 bits, 3 = 32 bits
- *   y -> 1 = little-endian, 2 = big-endian, 3 = both (le then be)
- */
-
-static __inline uint8_t
-isonum_711(const unsigned char *p)
-{
-
-	return (p[0]);
-}
-
-static __inline int8_t
-isonum_712(const unsigned char *p)
-{
-
-	return ((signed char)p[0]);
-}
-
-static __inline uint8_t
-isonum_713(const unsigned char *p)
-{
-
-	return (p[0]);
-}
-
-static __inline uint16_t
-isonum_721(const unsigned char *p)
-{
-
-	return (p[0] | p[1] << 8);
-}
-
-static __inline uint16_t
-isonum_722(const unsigned char *p)
-{
-
-	return (p[1] | p[0] << 8);
-}
-
-static __inline uint16_t
-isonum_723(const unsigned char *p)
-{
-
-	return (p[0] | p[1] << 8);
-}
-
-static __inline uint32_t
-isonum_731(const unsigned char *p)
-{
-
-	return (p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24);
-}
-
-static __inline uint32_t
-isonum_732(const unsigned char *p)
-{
-
-	return (p[3] | p[2] << 8 | p[1] << 16 | p[0] << 24);
-}
-
-static __inline uint32_t
-isonum_733(const unsigned char *p)
-{
-
-	return (p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24);
-}
-
-/*
- * Associated files have a leading '='.
- */
-#define	ASSOCCHAR	'='
diff --git a/include.new/isofs/cd9660/iso_rrip.h b/include.new/isofs/cd9660/iso_rrip.h
deleted file mode 100644
index ce30ea5..0000000
--- a/include.new/isofs/cd9660/iso_rrip.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley
- * by Pace Willisson (pace@blitz.com).  The Rock Ridge Extension
- * Support code is derived from software contributed to Berkeley
- * by Atsushi Murai (amurai@spec.co.jp).
- *
- * 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.
- * 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.
- *
- *	@(#)iso_rrip.h	8.2 (Berkeley) 1/23/94
- * $FreeBSD: releng/10.2/sys/fs/cd9660/iso_rrip.h 166639 2007-02-11 13:54:25Z rodrigc $
- */
-
-
-/*
- *	Analyze function flag (similar to RR field bits)
- */
-#define	ISO_SUSP_ATTR		0x0001
-#define	ISO_SUSP_DEVICE		0x0002
-#define	ISO_SUSP_SLINK		0x0004
-#define	ISO_SUSP_ALTNAME	0x0008
-#define	ISO_SUSP_CLINK		0x0010
-#define	ISO_SUSP_PLINK		0x0020
-#define	ISO_SUSP_RELDIR		0x0040
-#define	ISO_SUSP_TSTAMP		0x0080
-#define	ISO_SUSP_IDFLAG		0x0100
-#define	ISO_SUSP_EXTREF		0x0200
-#define	ISO_SUSP_CONT		0x0400
-#define	ISO_SUSP_OFFSET		0x0800
-#define	ISO_SUSP_STOP		0x1000
-#define	ISO_SUSP_UNKNOWN	0x8000
-
-typedef struct {
-	struct iso_node	*inop;
-	int		fields;		/* interesting fields in this analysis */
-	daddr_t		iso_ce_blk;	/* block of continuation area */
-	off_t		iso_ce_off;	/* offset of continuation area */
-	int		iso_ce_len;	/* length of continuation area */
-	struct iso_mnt	*imp;		/* mount structure */
-	ino_t		*inump;		/* inode number pointer */
-	char		*outbuf;	/* name/symbolic link output area */
-	u_short		*outlen;	/* length of above */
-	u_short		maxlen;		/* maximum length of above */
-	int		cont;		/* continuation of above */
-} ISO_RRIP_ANALYZE;
-
-struct iso_directory_record;
-
-int cd9660_rrip_analyze(struct iso_directory_record *isodir,
-			    struct iso_node *inop, struct iso_mnt *imp);
-int cd9660_rrip_getname(struct iso_directory_record *isodir,
-			    char *outbuf, u_short *outlen,
-			    ino_t *inump, struct iso_mnt *imp);
-int cd9660_rrip_getsymname(struct iso_directory_record *isodir,
-			       char *outbuf, u_short *outlen,
-			       struct iso_mnt *imp);
-int cd9660_rrip_offset(struct iso_directory_record *isodir,
-			   struct iso_mnt *imp);
diff --git a/include.new/jail.h b/include.new/jail.h
deleted file mode 100644
index 2479186..0000000
--- a/include.new/jail.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 2009 James Gritton.
- * 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.
- *
- * 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: releng/10.2/lib/libjail/jail.h 195870 2009-07-25 14:48:57Z jamie $
- */
-
-#ifndef _JAIL_H
-#define _JAIL_H
-
-#define	JP_RAWVALUE	0x01
-#define	JP_BOOL		0x02
-#define	JP_NOBOOL	0x04
-#define	JP_JAILSYS	0x08
-
-#define JAIL_ERRMSGLEN	1024
-
-extern char jail_errmsg[];
-
-struct jailparam {
-	char		*jp_name;
-	void		*jp_value;
-	size_t		 jp_valuelen;
-	size_t		 jp_elemlen;
-	int		 jp_ctltype;
-	int		 jp_structtype;
-	unsigned	 jp_flags;
-};
-
-__BEGIN_DECLS
-extern int jail_getid(const char *name);
-extern char *jail_getname(int jid);
-extern int jail_setv(int flags, ...);
-extern int jail_getv(int flags, ...);
-extern int jailparam_all(struct jailparam **jpp);
-extern int jailparam_init(struct jailparam *jp, const char *name);
-extern int jailparam_import(struct jailparam *jp, const char *value);
-extern int jailparam_import_raw(struct jailparam *jp, void *value,
-	       size_t valuelen);
-extern int jailparam_set(struct jailparam *jp, unsigned njp, int flags);
-extern int jailparam_get(struct jailparam *jp, unsigned njp, int flags);
-extern char *jailparam_export(struct jailparam *jp);
-extern void jailparam_free(struct jailparam *jp, unsigned njp);
-__END_DECLS
-
-#endif /* _JAIL_H  */
-
-
diff --git a/include.new/k524_err.h b/include.new/k524_err.h
deleted file mode 100644
index 9fb90dc..0000000
--- a/include.new/k524_err.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/k524_err.et */
-/* $Id: k524_err.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __k524_err_h__
-#define __k524_err_h__
-
-struct et_list;
-
-void initialize_k524_error_table_r(struct et_list **);
-
-void initialize_k524_error_table(void);
-#define init_k524_err_tbl initialize_k524_error_table
-
-typedef enum k524_error_number{
-	KRB524_BADKEY = -1750206208,
-	KRB524_BADADDR = -1750206207,
-	KRB524_BADPRINC = -1750206206,
-	KRB524_BADREALM = -1750206205,
-	KRB524_V4ERR = -1750206204,
-	KRB524_ENCFULL = -1750206203,
-	KRB524_DECEMPTY = -1750206202,
-	KRB524_NOTRESP = -1750206201
-} k524_error_number;
-
-#define ERROR_TABLE_BASE_k524 -1750206208
-
-#define COM_ERR_BINDDOMAIN_k524 "heim_com_err-1750206208"
-
-#endif /* __k524_err_h__ */
diff --git a/include.new/kadm5/admin.h b/include.new/kadm5/admin.h
deleted file mode 100644
index 04352d0..0000000
--- a/include.new/kadm5/admin.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-/* $Id: admin.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __KADM5_ADMIN_H__
-#define __KADM5_ADMIN_H__
-
-#define KADM5_API_VERSION_1 1
-#define KADM5_API_VERSION_2 2
-
-#ifndef USE_KADM5_API_VERSION
-#define USE_KADM5_API_VERSION KADM5_API_VERSION_2
-#endif
-
-#if USE_KADM5_API_VERSION != KADM5_API_VERSION_2
-#error No support for API versions other than 2
-#endif
-
-#define KADM5_STRUCT_VERSION 0
-
-#include <krb5.h>
-
-#define KRB5_KDB_DISALLOW_POSTDATED	0x00000001
-#define KRB5_KDB_DISALLOW_FORWARDABLE	0x00000002
-#define KRB5_KDB_DISALLOW_TGT_BASED	0x00000004
-#define KRB5_KDB_DISALLOW_RENEWABLE	0x00000008
-#define KRB5_KDB_DISALLOW_PROXIABLE	0x00000010
-#define KRB5_KDB_DISALLOW_DUP_SKEY	0x00000020
-#define KRB5_KDB_DISALLOW_ALL_TIX	0x00000040
-#define KRB5_KDB_REQUIRES_PRE_AUTH	0x00000080
-#define KRB5_KDB_REQUIRES_HW_AUTH	0x00000100
-#define KRB5_KDB_REQUIRES_PWCHANGE	0x00000200
-#define KRB5_KDB_DISALLOW_SVR		0x00001000
-#define KRB5_KDB_PWCHANGE_SERVICE	0x00002000
-#define KRB5_KDB_SUPPORT_DESMD5		0x00004000
-#define KRB5_KDB_NEW_PRINC		0x00008000
-#define KRB5_KDB_OK_AS_DELEGATE		0x00010000
-#define KRB5_KDB_TRUSTED_FOR_DELEGATION	0x00020000
-#define KRB5_KDB_ALLOW_KERBEROS4	0x00040000
-#define KRB5_KDB_ALLOW_DIGEST		0x00080000
-
-#define KADM5_PRINCIPAL		0x000001
-#define KADM5_PRINC_EXPIRE_TIME	0x000002
-#define KADM5_PW_EXPIRATION	0x000004
-#define KADM5_LAST_PWD_CHANGE	0x000008
-#define KADM5_ATTRIBUTES	0x000010
-#define KADM5_MAX_LIFE		0x000020
-#define KADM5_MOD_TIME		0x000040
-#define KADM5_MOD_NAME		0x000080
-#define KADM5_KVNO		0x000100
-#define KADM5_MKVNO		0x000200
-#define KADM5_AUX_ATTRIBUTES	0x000400
-#define KADM5_POLICY		0x000800
-#define KADM5_POLICY_CLR	0x001000
-#define KADM5_MAX_RLIFE		0x002000
-#define KADM5_LAST_SUCCESS	0x004000
-#define KADM5_LAST_FAILED	0x008000
-#define KADM5_FAIL_AUTH_COUNT	0x010000
-#define KADM5_KEY_DATA		0x020000
-#define KADM5_TL_DATA		0x040000
-
-#define KADM5_PRINCIPAL_NORMAL_MASK (~(KADM5_KEY_DATA | KADM5_TL_DATA))
-
-#define KADM5_PW_MAX_LIFE 	0x004000
-#define KADM5_PW_MIN_LIFE	0x008000
-#define KADM5_PW_MIN_LENGTH 	0x010000
-#define KADM5_PW_MIN_CLASSES	0x020000
-#define KADM5_PW_HISTORY_NUM	0x040000
-#define KADM5_REF_COUNT		0x080000
-
-#define KADM5_POLICY_NORMAL_MASK (~0)
-
-#define KADM5_ADMIN_SERVICE	"kadmin/admin"
-#define KADM5_HIST_PRINCIPAL	"kadmin/history"
-#define KADM5_CHANGEPW_SERVICE	"kadmin/changepw"
-
-typedef struct {
-    int16_t key_data_ver;	/* Version */
-    int16_t key_data_kvno;	/* Key Version */
-    int16_t key_data_type[2];	/* Array of types */
-    int16_t key_data_length[2];	/* Array of lengths */
-    void*   key_data_contents[2];/* Array of pointers */
-} krb5_key_data;
-
-typedef struct _krb5_tl_data {
-    struct _krb5_tl_data* tl_data_next;
-    int16_t tl_data_type;
-    int16_t tl_data_length;
-    void*   tl_data_contents;
-} krb5_tl_data;
-
-#define KRB5_TL_LAST_PWD_CHANGE		0x0001
-#define KRB5_TL_MOD_PRINC		0x0002
-#define KRB5_TL_KADM_DATA		0x0003
-#define KRB5_TL_KADM5_E_DATA		0x0004
-#define KRB5_TL_RB1_CHALLENGE		0x0005
-#define KRB5_TL_SECURID_STATE           0x0006
-#define KRB5_TL_PASSWORD           	0x0007
-#define KRB5_TL_EXTENSION           	0x0008
-#define KRB5_TL_PKINIT_ACL           	0x0009
-#define KRB5_TL_ALIASES           	0x000a
-
-typedef struct _kadm5_principal_ent_t {
-    krb5_principal principal;
-
-    krb5_timestamp princ_expire_time;
-    krb5_timestamp last_pwd_change;
-    krb5_timestamp pw_expiration;
-    krb5_deltat max_life;
-    krb5_principal mod_name;
-    krb5_timestamp mod_date;
-    krb5_flags attributes;
-    krb5_kvno kvno;
-    krb5_kvno mkvno;
-
-    char * policy;
-    uint32_t aux_attributes;
-
-    krb5_deltat max_renewable_life;
-    krb5_timestamp last_success;
-    krb5_timestamp last_failed;
-    krb5_kvno fail_auth_count;
-    int16_t n_key_data;
-    int16_t n_tl_data;
-    krb5_tl_data *tl_data;
-    krb5_key_data *key_data;
-} kadm5_principal_ent_rec, *kadm5_principal_ent_t;
-
-typedef struct _kadm5_policy_ent_t {
-    char *policy;
-
-    uint32_t pw_min_life;
-    uint32_t pw_max_life;
-    uint32_t pw_min_length;
-    uint32_t pw_min_classes;
-    uint32_t pw_history_num;
-    uint32_t policy_refcnt;
-} kadm5_policy_ent_rec, *kadm5_policy_ent_t;
-
-#define KADM5_CONFIG_REALM			(1 << 0)
-#define KADM5_CONFIG_PROFILE			(1 << 1)
-#define KADM5_CONFIG_KADMIND_PORT		(1 << 2)
-#define KADM5_CONFIG_ADMIN_SERVER		(1 << 3)
-#define KADM5_CONFIG_DBNAME			(1 << 4)
-#define KADM5_CONFIG_ADBNAME			(1 << 5)
-#define KADM5_CONFIG_ADB_LOCKFILE		(1 << 6)
-#define KADM5_CONFIG_ACL_FILE			(1 << 7)
-#define KADM5_CONFIG_DICT_FILE			(1 << 8)
-#define KADM5_CONFIG_ADMIN_KEYTAB		(1 << 9)
-#define KADM5_CONFIG_MKEY_FROM_KEYBOARD		(1 << 10)
-#define KADM5_CONFIG_STASH_FILE			(1 << 11)
-#define KADM5_CONFIG_MKEY_NAME			(1 << 12)
-#define KADM5_CONFIG_ENCTYPE			(1 << 13)
-#define KADM5_CONFIG_MAX_LIFE			(1 << 14)
-#define KADM5_CONFIG_MAX_RLIFE			(1 << 15)
-#define KADM5_CONFIG_EXPIRATION			(1 << 16)
-#define KADM5_CONFIG_FLAGS			(1 << 17)
-#define KADM5_CONFIG_ENCTYPES			(1 << 18)
-
-#define KADM5_PRIV_GET		(1 << 0)
-#define KADM5_PRIV_ADD 		(1 << 1)
-#define KADM5_PRIV_MODIFY	(1 << 2)
-#define KADM5_PRIV_DELETE	(1 << 3)
-#define KADM5_PRIV_LIST		(1 << 4)
-#define KADM5_PRIV_CPW		(1 << 5)
-#define KADM5_PRIV_ALL		(KADM5_PRIV_GET | KADM5_PRIV_ADD | KADM5_PRIV_MODIFY | KADM5_PRIV_DELETE | KADM5_PRIV_LIST | KADM5_PRIV_CPW)
-
-typedef struct {
-    int XXX;
-}krb5_key_salt_tuple;
-
-typedef struct _kadm5_config_params {
-    uint32_t mask;
-
-    /* Client and server fields */
-    char *realm;
-    int kadmind_port;
-
-    /* client fields */
-    char *admin_server;
-
-    /* server fields */
-    char *dbname;
-    char *acl_file;
-
-    /* server library (database) fields */
-    char *stash_file;
-} kadm5_config_params;
-
-typedef krb5_error_code kadm5_ret_t;
-
-#include "kadm5-protos.h"
-
-#if 0
-/* unimplemented functions */
-kadm5_ret_t
-kadm5_decrypt_key(void *server_handle,
-		  kadm5_principal_ent_t entry, int32_t
-		  ktype, int32_t stype, int32_t
-		  kvno, krb5_keyblock *keyblock,
-		  krb5_keysalt *keysalt, int *kvnop);
-
-kadm5_ret_t
-kadm5_create_policy(void *server_handle,
-		    kadm5_policy_ent_t policy, uint32_t mask);
-
-kadm5_ret_t
-kadm5_delete_policy(void *server_handle, char *policy);
-
-
-kadm5_ret_t
-kadm5_modify_policy(void *server_handle,
-		    kadm5_policy_ent_t policy,
-		    uint32_t mask);
-
-kadm5_ret_t
-kadm5_get_policy(void *server_handle, char *policy, kadm5_policy_ent_t ent);
-
-kadm5_ret_t
-kadm5_get_policies(void *server_handle, char *exp,
-		   char ***pols, int *count);
-
-void
-kadm5_free_policy_ent(kadm5_policy_ent_t policy);
-
-#endif
-
-#endif /* __KADM5_ADMIN_H__ */
diff --git a/include.new/kadm5/kadm5-private.h b/include.new/kadm5/kadm5-private.h
deleted file mode 100644
index ab8d694..0000000
--- a/include.new/kadm5/kadm5-private.h
+++ /dev/null
@@ -1,509 +0,0 @@
-/* This is a generated file */
-#ifndef __kadm5_private_h__
-#define __kadm5_private_h__
-
-#include <stdarg.h>
-
-kadm5_ret_t
-_kadm5_acl_check_permission (
-	kadm5_server_context */*context*/,
-	unsigned /*op*/,
-	krb5_const_principal /*princ*/);
-
-kadm5_ret_t
-_kadm5_acl_init (kadm5_server_context */*context*/);
-
-kadm5_ret_t
-_kadm5_bump_pw_expire (
-	kadm5_server_context */*context*/,
-	hdb_entry */*ent*/);
-
-krb5_error_code
-_kadm5_c_get_cred_cache (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	const char */*server_name*/,
-	const char */*password*/,
-	krb5_prompter_fct /*prompter*/,
-	const char */*keytab*/,
-	krb5_ccache /*ccache*/,
-	krb5_ccache */*ret_cache*/);
-
-kadm5_ret_t
-_kadm5_c_init_context (
-	kadm5_client_context **/*ctx*/,
-	kadm5_config_params */*params*/,
-	krb5_context /*context*/);
-
-kadm5_ret_t
-_kadm5_client_recv (
-	kadm5_client_context */*context*/,
-	krb5_data */*reply*/);
-
-kadm5_ret_t
-_kadm5_client_send (
-	kadm5_client_context */*context*/,
-	krb5_storage */*sp*/);
-
-kadm5_ret_t
-_kadm5_connect (void */*handle*/);
-
-kadm5_ret_t
-_kadm5_error_code (kadm5_ret_t /*code*/);
-
-int
-_kadm5_exists_keys (
-	Key */*keys1*/,
-	int /*len1*/,
-	Key */*keys2*/,
-	int /*len2*/);
-
-void
-_kadm5_free_keys (
-	krb5_context /*context*/,
-	int /*len*/,
-	Key */*keys*/);
-
-void
-_kadm5_init_keys (
-	Key */*keys*/,
-	int /*len*/);
-
-kadm5_ret_t
-_kadm5_marshal_params (
-	krb5_context /*context*/,
-	kadm5_config_params */*params*/,
-	krb5_data */*out*/);
-
-kadm5_ret_t
-_kadm5_privs_to_string (
-	uint32_t /*privs*/,
-	char */*string*/,
-	size_t /*len*/);
-
-HDB *
-_kadm5_s_get_db (void */*server_handle*/);
-
-kadm5_ret_t
-_kadm5_s_init_context (
-	kadm5_server_context **/*ctx*/,
-	kadm5_config_params */*params*/,
-	krb5_context /*context*/);
-
-kadm5_ret_t
-_kadm5_set_keys (
-	kadm5_server_context */*context*/,
-	hdb_entry */*ent*/,
-	const char */*password*/);
-
-kadm5_ret_t
-_kadm5_set_keys2 (
-	kadm5_server_context */*context*/,
-	hdb_entry */*ent*/,
-	int16_t /*n_key_data*/,
-	krb5_key_data */*key_data*/);
-
-kadm5_ret_t
-_kadm5_set_keys3 (
-	kadm5_server_context */*context*/,
-	hdb_entry */*ent*/,
-	int /*n_keys*/,
-	krb5_keyblock */*keyblocks*/);
-
-kadm5_ret_t
-_kadm5_set_keys_randomly (
-	kadm5_server_context */*context*/,
-	hdb_entry */*ent*/,
-	krb5_keyblock **/*new_keys*/,
-	int */*n_keys*/);
-
-kadm5_ret_t
-_kadm5_set_modifier (
-	kadm5_server_context */*context*/,
-	hdb_entry */*ent*/);
-
-kadm5_ret_t
-_kadm5_setup_entry (
-	kadm5_server_context */*context*/,
-	hdb_entry_ex */*ent*/,
-	uint32_t /*mask*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t /*princ_mask*/,
-	kadm5_principal_ent_t /*def*/,
-	uint32_t /*def_mask*/);
-
-kadm5_ret_t
-_kadm5_string_to_privs (
-	const char */*s*/,
-	uint32_t* /*privs*/);
-
-kadm5_ret_t
-_kadm5_unmarshal_params (
-	krb5_context /*context*/,
-	krb5_data */*in*/,
-	kadm5_config_params */*params*/);
-
-kadm5_ret_t
-kadm5_c_chpass_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	const char */*password*/);
-
-kadm5_ret_t
-kadm5_c_chpass_principal_with_key (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	int /*n_key_data*/,
-	krb5_key_data */*key_data*/);
-
-kadm5_ret_t
-kadm5_c_create_principal (
-	void */*server_handle*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t /*mask*/,
-	const char */*password*/);
-
-kadm5_ret_t
-kadm5_c_delete_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/);
-
-kadm5_ret_t
-kadm5_c_destroy (void */*server_handle*/);
-
-kadm5_ret_t
-kadm5_c_flush (void */*server_handle*/);
-
-kadm5_ret_t
-kadm5_c_get_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	kadm5_principal_ent_t /*out*/,
-	uint32_t /*mask*/);
-
-kadm5_ret_t
-kadm5_c_get_principals (
-	void */*server_handle*/,
-	const char */*expression*/,
-	char ***/*princs*/,
-	int */*count*/);
-
-kadm5_ret_t
-kadm5_c_get_privs (
-	void */*server_handle*/,
-	uint32_t */*privs*/);
-
-kadm5_ret_t
-kadm5_c_init_with_creds (
-	const char */*client_name*/,
-	krb5_ccache /*ccache*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_c_init_with_creds_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	krb5_ccache /*ccache*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_c_init_with_password (
-	const char */*client_name*/,
-	const char */*password*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_c_init_with_password_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	const char */*password*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_c_init_with_skey (
-	const char */*client_name*/,
-	const char */*keytab*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_c_init_with_skey_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	const char */*keytab*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_c_modify_principal (
-	void */*server_handle*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t /*mask*/);
-
-kadm5_ret_t
-kadm5_c_randkey_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	krb5_keyblock **/*new_keys*/,
-	int */*n_keys*/);
-
-kadm5_ret_t
-kadm5_c_rename_principal (
-	void */*server_handle*/,
-	krb5_principal /*source*/,
-	krb5_principal /*target*/);
-
-kadm5_ret_t
-kadm5_log_create (
-	kadm5_server_context */*context*/,
-	hdb_entry */*ent*/);
-
-kadm5_ret_t
-kadm5_log_delete (
-	kadm5_server_context */*context*/,
-	krb5_principal /*princ*/);
-
-kadm5_ret_t
-kadm5_log_end (kadm5_server_context */*context*/);
-
-kadm5_ret_t
-kadm5_log_foreach (
-	kadm5_server_context */*context*/,
-	void (*/*func*/)(kadm5_server_context *server_context, uint32_t ver, time_t timestamp, enum kadm_ops op, uint32_t len, krb5_storage *, void *),
-	void */*ctx*/);
-
-kadm5_ret_t
-kadm5_log_get_version (
-	kadm5_server_context */*context*/,
-	uint32_t */*ver*/);
-
-kadm5_ret_t
-kadm5_log_get_version_fd (
-	int /*fd*/,
-	uint32_t */*ver*/);
-
-krb5_storage *
-kadm5_log_goto_end (int /*fd*/);
-
-kadm5_ret_t
-kadm5_log_init (kadm5_server_context */*context*/);
-
-kadm5_ret_t
-kadm5_log_modify (
-	kadm5_server_context */*context*/,
-	hdb_entry */*ent*/,
-	uint32_t /*mask*/);
-
-kadm5_ret_t
-kadm5_log_nop (kadm5_server_context */*context*/);
-
-kadm5_ret_t
-kadm5_log_previous (
-	krb5_context /*context*/,
-	krb5_storage */*sp*/,
-	uint32_t */*ver*/,
-	time_t */*timestamp*/,
-	enum kadm_ops */*op*/,
-	uint32_t */*len*/);
-
-kadm5_ret_t
-kadm5_log_reinit (kadm5_server_context */*context*/);
-
-kadm5_ret_t
-kadm5_log_rename (
-	kadm5_server_context */*context*/,
-	krb5_principal /*source*/,
-	hdb_entry */*ent*/);
-
-kadm5_ret_t
-kadm5_log_replay (
-	kadm5_server_context */*context*/,
-	enum kadm_ops /*op*/,
-	uint32_t /*ver*/,
-	uint32_t /*len*/,
-	krb5_storage */*sp*/);
-
-kadm5_ret_t
-kadm5_log_set_version (
-	kadm5_server_context */*context*/,
-	uint32_t /*vno*/);
-
-const char *
-kadm5_log_signal_socket (krb5_context /*context*/);
-
-kadm5_ret_t
-kadm5_log_signal_socket_info (
-	krb5_context /*context*/,
-	int /*server_end*/,
-	struct addrinfo **/*ret_addrs*/);
-
-kadm5_ret_t
-kadm5_log_truncate (kadm5_server_context */*server_context*/);
-
-kadm5_ret_t
-kadm5_s_chpass_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	const char */*password*/);
-
-kadm5_ret_t
-kadm5_s_chpass_principal_cond (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	const char */*password*/);
-
-kadm5_ret_t
-kadm5_s_chpass_principal_with_key (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	int /*n_key_data*/,
-	krb5_key_data */*key_data*/);
-
-kadm5_ret_t
-kadm5_s_create_principal (
-	void */*server_handle*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t /*mask*/,
-	const char */*password*/);
-
-kadm5_ret_t
-kadm5_s_create_principal_with_key (
-	void */*server_handle*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t /*mask*/);
-
-kadm5_ret_t
-kadm5_s_delete_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/);
-
-kadm5_ret_t
-kadm5_s_destroy (void */*server_handle*/);
-
-kadm5_ret_t
-kadm5_s_flush (void */*server_handle*/);
-
-kadm5_ret_t
-kadm5_s_get_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	kadm5_principal_ent_t /*out*/,
-	uint32_t /*mask*/);
-
-kadm5_ret_t
-kadm5_s_get_principals (
-	void */*server_handle*/,
-	const char */*expression*/,
-	char ***/*princs*/,
-	int */*count*/);
-
-kadm5_ret_t
-kadm5_s_get_privs (
-	void */*server_handle*/,
-	uint32_t */*privs*/);
-
-kadm5_ret_t
-kadm5_s_init_with_creds (
-	const char */*client_name*/,
-	krb5_ccache /*ccache*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_s_init_with_creds_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	krb5_ccache /*ccache*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_s_init_with_password (
-	const char */*client_name*/,
-	const char */*password*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_s_init_with_password_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	const char */*password*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_s_init_with_skey (
-	const char */*client_name*/,
-	const char */*keytab*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_s_init_with_skey_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	const char */*keytab*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_s_modify_principal (
-	void */*server_handle*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t /*mask*/);
-
-kadm5_ret_t
-kadm5_s_randkey_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	krb5_keyblock **/*new_keys*/,
-	int */*n_keys*/);
-
-kadm5_ret_t
-kadm5_s_rename_principal (
-	void */*server_handle*/,
-	krb5_principal /*source*/,
-	krb5_principal /*target*/);
-
-#endif /* __kadm5_private_h__ */
diff --git a/include.new/kadm5/kadm5-protos.h b/include.new/kadm5/kadm5-protos.h
deleted file mode 100644
index eebae95..0000000
--- a/include.new/kadm5/kadm5-protos.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/* This is a generated file */
-#ifndef __kadm5_protos_h__
-#define __kadm5_protos_h__
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-kadm5_ret_t
-kadm5_ad_init_with_password (
-	const char */*client_name*/,
-	const char */*password*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_ad_init_with_password_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	const char */*password*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-krb5_error_code
-kadm5_add_passwd_quality_verifier (
-	krb5_context /*context*/,
-	const char */*check_library*/);
-
-const char *
-kadm5_check_password_quality (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	krb5_data */*pwd_data*/);
-
-kadm5_ret_t
-kadm5_chpass_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	const char */*password*/);
-
-kadm5_ret_t
-kadm5_chpass_principal_with_key (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	int /*n_key_data*/,
-	krb5_key_data */*key_data*/);
-
-kadm5_ret_t
-kadm5_create_principal (
-	void */*server_handle*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t /*mask*/,
-	const char */*password*/);
-
-kadm5_ret_t
-kadm5_delete_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/);
-
-kadm5_ret_t
-kadm5_destroy (void */*server_handle*/);
-
-kadm5_ret_t
-kadm5_flush (void */*server_handle*/);
-
-void
-kadm5_free_key_data (
-	void */*server_handle*/,
-	int16_t */*n_key_data*/,
-	krb5_key_data */*key_data*/);
-
-void
-kadm5_free_name_list (
-	void */*server_handle*/,
-	char **/*names*/,
-	int */*count*/);
-
-void
-kadm5_free_principal_ent (
-	void */*server_handle*/,
-	kadm5_principal_ent_t /*princ*/);
-
-kadm5_ret_t
-kadm5_get_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	kadm5_principal_ent_t /*out*/,
-	uint32_t /*mask*/);
-
-kadm5_ret_t
-kadm5_get_principals (
-	void */*server_handle*/,
-	const char */*expression*/,
-	char ***/*princs*/,
-	int */*count*/);
-
-kadm5_ret_t
-kadm5_get_privs (
-	void */*server_handle*/,
-	uint32_t */*privs*/);
-
-kadm5_ret_t
-kadm5_init_with_creds (
-	const char */*client_name*/,
-	krb5_ccache /*ccache*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_init_with_creds_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	krb5_ccache /*ccache*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_init_with_password (
-	const char */*client_name*/,
-	const char */*password*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_init_with_password_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	const char */*password*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_init_with_skey (
-	const char */*client_name*/,
-	const char */*keytab*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_init_with_skey_ctx (
-	krb5_context /*context*/,
-	const char */*client_name*/,
-	const char */*keytab*/,
-	const char */*service_name*/,
-	kadm5_config_params */*realm_params*/,
-	unsigned long /*struct_version*/,
-	unsigned long /*api_version*/,
-	void **/*server_handle*/);
-
-kadm5_ret_t
-kadm5_modify_principal (
-	void */*server_handle*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t /*mask*/);
-
-kadm5_ret_t
-kadm5_randkey_principal (
-	void */*server_handle*/,
-	krb5_principal /*princ*/,
-	krb5_keyblock **/*new_keys*/,
-	int */*n_keys*/);
-
-kadm5_ret_t
-kadm5_rename_principal (
-	void */*server_handle*/,
-	krb5_principal /*source*/,
-	krb5_principal /*target*/);
-
-kadm5_ret_t
-kadm5_ret_key_data (
-	krb5_storage */*sp*/,
-	krb5_key_data */*key*/);
-
-kadm5_ret_t
-kadm5_ret_principal_ent (
-	krb5_storage */*sp*/,
-	kadm5_principal_ent_t /*princ*/);
-
-kadm5_ret_t
-kadm5_ret_principal_ent_mask (
-	krb5_storage */*sp*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t */*mask*/);
-
-kadm5_ret_t
-kadm5_ret_tl_data (
-	krb5_storage */*sp*/,
-	krb5_tl_data */*tl*/);
-
-void
-kadm5_setup_passwd_quality_check (
-	krb5_context /*context*/,
-	const char */*check_library*/,
-	const char */*check_function*/);
-
-kadm5_ret_t
-kadm5_store_key_data (
-	krb5_storage */*sp*/,
-	krb5_key_data */*key*/);
-
-kadm5_ret_t
-kadm5_store_principal_ent (
-	krb5_storage */*sp*/,
-	kadm5_principal_ent_t /*princ*/);
-
-kadm5_ret_t
-kadm5_store_principal_ent_mask (
-	krb5_storage */*sp*/,
-	kadm5_principal_ent_t /*princ*/,
-	uint32_t /*mask*/);
-
-kadm5_ret_t
-kadm5_store_tl_data (
-	krb5_storage */*sp*/,
-	krb5_tl_data */*tl*/);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __kadm5_protos_h__ */
diff --git a/include.new/kadm5/kadm5-pwcheck.h b/include.new/kadm5/kadm5-pwcheck.h
deleted file mode 100644
index 70cbae5..0000000
--- a/include.new/kadm5/kadm5-pwcheck.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2004 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef KADM5_PWCHECK_H
-#define KADM5_PWCHECK_H 1
-
-
-#define KADM5_PASSWD_VERSION_V0 0
-#define KADM5_PASSWD_VERSION_V1 1
-
-typedef const char* (*kadm5_passwd_quality_check_func_v0)(krb5_context,
-							  krb5_principal,
-							  krb5_data*);
-
-/*
- * The 4th argument, is a tuning parameter for the quality check
- * function, the lib/caller will providing it for the password quality
- * module.
- */
-
-typedef int
-(*kadm5_passwd_quality_check_func)(krb5_context context,
-				   krb5_principal principal,
-				   krb5_data *password,
-				   const char *tuning,
-				   char *message,
-				   size_t length);
-
-struct kadm5_pw_policy_check_func {
-    const char *name;
-    kadm5_passwd_quality_check_func func;
-};
-
-struct kadm5_pw_policy_verifier {
-    const char *name;
-    int version;
-    const char *vendor;
-    const struct kadm5_pw_policy_check_func *funcs;
-};
-
-#endif /* KADM5_PWCHECK_H */
diff --git a/include.new/kadm5/kadm5_err.h b/include.new/kadm5/kadm5_err.h
deleted file mode 100644
index 025b46b..0000000
--- a/include.new/kadm5/kadm5_err.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libkadm5clnt/../../../crypto/heimdal/lib/kadm5/kadm5_err.et */
-/* $Id: kadm5_err.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __kadm5_err_h__
-#define __kadm5_err_h__
-
-struct et_list;
-
-void initialize_kadm5_error_table_r(struct et_list **);
-
-void initialize_kadm5_error_table(void);
-#define init_kadm5_err_tbl initialize_kadm5_error_table
-
-typedef enum kadm5_error_number{
-	KADM5_FAILURE = 43787520,
-	KADM5_AUTH_GET = 43787521,
-	KADM5_AUTH_ADD = 43787522,
-	KADM5_AUTH_MODIFY = 43787523,
-	KADM5_AUTH_DELETE = 43787524,
-	KADM5_AUTH_INSUFFICIENT = 43787525,
-	KADM5_BAD_DB = 43787526,
-	KADM5_DUP = 43787527,
-	KADM5_RPC_ERROR = 43787528,
-	KADM5_NO_SRV = 43787529,
-	KADM5_BAD_HIST_KEY = 43787530,
-	KADM5_NOT_INIT = 43787531,
-	KADM5_UNK_PRINC = 43787532,
-	KADM5_UNK_POLICY = 43787533,
-	KADM5_BAD_MASK = 43787534,
-	KADM5_BAD_CLASS = 43787535,
-	KADM5_BAD_LENGTH = 43787536,
-	KADM5_BAD_POLICY = 43787537,
-	KADM5_BAD_PRINCIPAL = 43787538,
-	KADM5_BAD_AUX_ATTR = 43787539,
-	KADM5_BAD_HISTORY = 43787540,
-	KADM5_BAD_MIN_PASS_LIFE = 43787541,
-	KADM5_PASS_Q_TOOSHORT = 43787542,
-	KADM5_PASS_Q_CLASS = 43787543,
-	KADM5_PASS_Q_DICT = 43787544,
-	KADM5_PASS_REUSE = 43787545,
-	KADM5_PASS_TOOSOON = 43787546,
-	KADM5_POLICY_REF = 43787547,
-	KADM5_INIT = 43787548,
-	KADM5_BAD_PASSWORD = 43787549,
-	KADM5_PROTECT_PRINCIPAL = 43787550,
-	KADM5_BAD_SERVER_HANDLE = 43787551,
-	KADM5_BAD_STRUCT_VERSION = 43787552,
-	KADM5_OLD_STRUCT_VERSION = 43787553,
-	KADM5_NEW_STRUCT_VERSION = 43787554,
-	KADM5_BAD_API_VERSION = 43787555,
-	KADM5_OLD_LIB_API_VERSION = 43787556,
-	KADM5_OLD_SERVER_API_VERSION = 43787557,
-	KADM5_NEW_LIB_API_VERSION = 43787558,
-	KADM5_NEW_SERVER_API_VERSION = 43787559,
-	KADM5_SECURE_PRINC_MISSING = 43787560,
-	KADM5_NO_RENAME_SALT = 43787561,
-	KADM5_BAD_CLIENT_PARAMS = 43787562,
-	KADM5_BAD_SERVER_PARAMS = 43787563,
-	KADM5_AUTH_LIST = 43787564,
-	KADM5_AUTH_CHANGEPW = 43787565,
-	KADM5_BAD_TL_TYPE = 43787566,
-	KADM5_MISSING_CONF_PARAMS = 43787567,
-	KADM5_BAD_SERVER_NAME = 43787568
-} kadm5_error_number;
-
-#define ERROR_TABLE_BASE_kadm5 43787520
-
-#define COM_ERR_BINDDOMAIN_kadm5 "heim_com_err43787520"
-
-#endif /* __kadm5_err_h__ */
diff --git a/include.new/kadm5/private.h b/include.new/kadm5/private.h
deleted file mode 100644
index 189d233..0000000
--- a/include.new/kadm5/private.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1997-2000 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id: private.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __kadm5_privatex_h__
-#define __kadm5_privatex_h__
-
-struct kadm_func {
-    kadm5_ret_t (*chpass_principal) (void *, krb5_principal, const char*);
-    kadm5_ret_t (*create_principal) (void*, kadm5_principal_ent_t,
-				     uint32_t, const char*);
-    kadm5_ret_t (*delete_principal) (void*, krb5_principal);
-    kadm5_ret_t (*destroy) (void*);
-    kadm5_ret_t (*flush) (void*);
-    kadm5_ret_t (*get_principal) (void*, krb5_principal,
-				  kadm5_principal_ent_t, uint32_t);
-    kadm5_ret_t (*get_principals) (void*, const char*, char***, int*);
-    kadm5_ret_t (*get_privs) (void*, uint32_t*);
-    kadm5_ret_t (*modify_principal) (void*, kadm5_principal_ent_t, uint32_t);
-    kadm5_ret_t (*randkey_principal) (void*, krb5_principal,
-				      krb5_keyblock**, int*);
-    kadm5_ret_t (*rename_principal) (void*, krb5_principal, krb5_principal);
-    kadm5_ret_t (*chpass_principal_with_key) (void *, krb5_principal,
-					      int, krb5_key_data *);
-};
-
-/* XXX should be integrated */
-typedef struct kadm5_common_context {
-    krb5_context context;
-    krb5_boolean my_context;
-    struct kadm_func funcs;
-    void *data;
-}kadm5_common_context;
-
-typedef struct kadm5_log_peer {
-    int fd;
-    char *name;
-    krb5_auth_context ac;
-    struct kadm5_log_peer *next;
-} kadm5_log_peer;
-
-typedef struct kadm5_log_context {
-    char *log_file;
-    int log_fd;
-    uint32_t version;
-#ifndef NO_UNIX_SOCKETS
-    struct sockaddr_un socket_name;
-#else
-    struct addrinfo *socket_info;
-#endif
-    krb5_socket_t socket_fd;
-} kadm5_log_context;
-
-typedef struct kadm5_server_context {
-    krb5_context context;
-    krb5_boolean my_context;
-    struct kadm_func funcs;
-    /* */
-    kadm5_config_params config;
-    HDB *db;
-    krb5_principal caller;
-    unsigned acl_flags;
-    kadm5_log_context log_context;
-} kadm5_server_context;
-
-typedef struct kadm5_client_context {
-    krb5_context context;
-    krb5_boolean my_context;
-    struct kadm_func funcs;
-    /* */
-    krb5_auth_context ac;
-    char *realm;
-    char *admin_server;
-    int kadmind_port;
-    int sock;
-    char *client_name;
-    char *service_name;
-    krb5_prompter_fct prompter;
-    const char *keytab;
-    krb5_ccache ccache;
-    kadm5_config_params *realm_params;
-}kadm5_client_context;
-
-typedef struct kadm5_ad_context {
-    krb5_context context;
-    krb5_boolean my_context;
-    struct kadm_func funcs;
-    /* */
-    kadm5_config_params config;
-    krb5_principal caller;
-    krb5_ccache ccache;
-    char *client_name;
-    char *realm;
-    void *ldap_conn;
-    char *base_dn;
-} kadm5_ad_context;
-
-enum kadm_ops {
-    kadm_get,
-    kadm_delete,
-    kadm_create,
-    kadm_rename,
-    kadm_chpass,
-    kadm_modify,
-    kadm_randkey,
-    kadm_get_privs,
-    kadm_get_princs,
-    kadm_chpass_with_key,
-    kadm_nop
-};
-
-#define KADMIN_APPL_VERSION "KADM0.1"
-#define KADMIN_OLD_APPL_VERSION "KADM0.0"
-
-#include "kadm5-private.h"
-
-#endif /* __kadm5_privatex_h__ */
diff --git a/include.new/kafs.h b/include.new/kafs.h
deleted file mode 100644
index b960bc7..0000000
--- a/include.new/kafs.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 1995 - 2001, 2003 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id: kafs.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __KAFS_H
-#define __KAFS_H
-
-/* XXX must include krb5.h or krb.h */
-
-/* sys/ioctl.h must be included manually before kafs.h */
-
-/*
- */
-#define AFSCALL_PIOCTL 20
-#define AFSCALL_SETPAG 21
-
-#ifndef _VICEIOCTL
-#define _VICEIOCTL(id)  ((unsigned int ) _IOW('V', id, struct ViceIoctl))
-#define _AFSCIOCTL(id)  ((unsigned int ) _IOW('C', id, struct ViceIoctl))
-#endif /* _VICEIOCTL */
-
-#define VIOCSETAL		_VICEIOCTL(1)
-#define VIOCGETAL		_VICEIOCTL(2)
-#define VIOCSETTOK		_VICEIOCTL(3)
-#define VIOCGETVOLSTAT		_VICEIOCTL(4)
-#define VIOCSETVOLSTAT		_VICEIOCTL(5)
-#define VIOCFLUSH		_VICEIOCTL(6)
-#define VIOCGETTOK		_VICEIOCTL(8)
-#define VIOCUNLOG		_VICEIOCTL(9)
-#define VIOCCKSERV		_VICEIOCTL(10)
-#define VIOCCKBACK		_VICEIOCTL(11)
-#define VIOCCKCONN		_VICEIOCTL(12)
-#define VIOCWHEREIS		_VICEIOCTL(14)
-#define VIOCACCESS		_VICEIOCTL(20)
-#define VIOCUNPAG		_VICEIOCTL(21)
-#define VIOCGETFID		_VICEIOCTL(22)
-#define VIOCSETCACHESIZE	_VICEIOCTL(24)
-#define VIOCFLUSHCB		_VICEIOCTL(25)
-#define VIOCNEWCELL		_VICEIOCTL(26)
-#define VIOCGETCELL		_VICEIOCTL(27)
-#define VIOC_AFS_DELETE_MT_PT	_VICEIOCTL(28)
-#define VIOC_AFS_STAT_MT_PT	_VICEIOCTL(29)
-#define VIOC_FILE_CELL_NAME	_VICEIOCTL(30)
-#define VIOC_GET_WS_CELL	_VICEIOCTL(31)
-#define VIOC_AFS_MARINER_HOST	_VICEIOCTL(32)
-#define VIOC_GET_PRIMARY_CELL	_VICEIOCTL(33)
-#define VIOC_VENUSLOG		_VICEIOCTL(34)
-#define VIOC_GETCELLSTATUS	_VICEIOCTL(35)
-#define VIOC_SETCELLSTATUS	_VICEIOCTL(36)
-#define VIOC_FLUSHVOLUME	_VICEIOCTL(37)
-#define VIOC_AFS_SYSNAME	_VICEIOCTL(38)
-#define VIOC_EXPORTAFS		_VICEIOCTL(39)
-#define VIOCGETCACHEPARAMS	_VICEIOCTL(40)
-#define VIOC_GCPAGS		_VICEIOCTL(48)
-
-#define VIOCGETTOK2		_AFSCIOCTL(7)
-#define VIOCSETTOK2		_AFSCIOCTL(8)
-
-struct ViceIoctl {
-  caddr_t in, out;
-  unsigned short in_size;
-  unsigned short out_size;
-};
-
-struct ClearToken {
-  int32_t AuthHandle;
-  char HandShakeKey[8];
-  int32_t ViceId;
-  int32_t BeginTimestamp;
-  int32_t EndTimestamp;
-};
-
-/* Use k_hasafs() to probe if the machine supports AFS syscalls.
-   The other functions will generate a SIGSYS if AFS is not supported */
-
-int k_hasafs (void);
-int k_hasafs_recheck (void);
-
-int krb_afslog (const char *cell, const char *realm);
-int krb_afslog_uid (const char *cell, const char *realm, uid_t uid);
-int krb_afslog_home (const char *cell, const char *realm,
-			 const char *homedir);
-int krb_afslog_uid_home (const char *cell, const char *realm, uid_t uid,
-			     const char *homedir);
-
-int krb_realm_of_cell (const char *cell, char **realm);
-
-/* compat */
-#define k_afsklog krb_afslog
-#define k_afsklog_uid krb_afslog_uid
-
-int k_pioctl (char *a_path,
-		  int o_opcode,
-		  struct ViceIoctl *a_paramsP,
-		  int a_followSymlinks);
-int k_unlog (void);
-int k_setpag (void);
-int k_afs_cell_of_file (const char *path, char *cell, int len);
-
-
-
-/* XXX */
-#ifdef KFAILURE
-#define KRB_H_INCLUDED
-#endif
-
-#ifdef KRB5_RECVAUTH_IGNORE_VERSION
-#define KRB5_H_INCLUDED
-#endif
-
-void kafs_set_verbose (void (*kafs_verbose)(void *, const char *), void *);
-int kafs_settoken_rxkad (const char *, struct ClearToken *,
-			     void *ticket, size_t ticket_len);
-#ifdef KRB_H_INCLUDED
-int kafs_settoken (const char*, uid_t, CREDENTIALS*);
-#endif
-#ifdef KRB5_H_INCLUDED
-int kafs_settoken5 (krb5_context, const char*, uid_t, krb5_creds*);
-#endif
-
-
-#ifdef KRB5_H_INCLUDED
-krb5_error_code krb5_afslog_uid (krb5_context context,
-				     krb5_ccache id,
-				     const char *cell,
-				     krb5_const_realm realm,
-				     uid_t uid);
-krb5_error_code krb5_afslog (krb5_context context,
-				 krb5_ccache id,
-				 const char *cell,
-				 krb5_const_realm realm);
-krb5_error_code krb5_afslog_uid_home (krb5_context context,
-					  krb5_ccache id,
-					  const char *cell,
-					  krb5_const_realm realm,
-					  uid_t uid,
-					  const char *homedir);
-
-krb5_error_code krb5_afslog_home (krb5_context context,
-				      krb5_ccache id,
-				      const char *cell,
-				      krb5_const_realm realm,
-				      const char *homedir);
-
-krb5_error_code krb5_realm_of_cell (const char *cell, char **realm);
-
-#endif
-
-
-#define _PATH_VICE		"/usr/vice/etc/"
-#define _PATH_THISCELL 		_PATH_VICE "ThisCell"
-#define _PATH_CELLSERVDB 	_PATH_VICE "CellServDB"
-#define _PATH_THESECELLS	_PATH_VICE "TheseCells"
-
-#define _PATH_ARLA_VICE		"/usr/arla/etc/"
-#define _PATH_ARLA_THISCELL	_PATH_ARLA_VICE "ThisCell"
-#define _PATH_ARLA_CELLSERVDB 	_PATH_ARLA_VICE "CellServDB"
-#define _PATH_ARLA_THESECELLS	_PATH_ARLA_VICE "TheseCells"
-
-#define _PATH_OPENAFS_DEBIAN_VICE		"/etc/openafs/"
-#define _PATH_OPENAFS_DEBIAN_THISCELL		_PATH_OPENAFS_DEBIAN_VICE "ThisCell"
-#define _PATH_OPENAFS_DEBIAN_CELLSERVDB 	_PATH_OPENAFS_DEBIAN_VICE "CellServDB"
-#define _PATH_OPENAFS_DEBIAN_THESECELLS		_PATH_OPENAFS_DEBIAN_VICE "TheseCells"
-
-#define _PATH_OPENAFS_MACOSX_VICE		"/var/db/openafs/etc/"
-#define _PATH_OPENAFS_MACOSX_THISCELL		_PATH_OPENAFS_MACOSX_VICE "ThisCell"
-#define _PATH_OPENAFS_MACOSX_CELLSERVDB		_PATH_OPENAFS_MACOSX_VICE "CellServDB"
-#define _PATH_OPENAFS_MACOSX_THESECELLS		_PATH_OPENAFS_MACOSX_VICE "TheseCells"
-
-#define _PATH_ARLA_DEBIAN_VICE			"/etc/arla/"
-#define _PATH_ARLA_DEBIAN_THISCELL		_PATH_ARLA_DEBIAN_VICE "ThisCell"
-#define _PATH_ARLA_DEBIAN_CELLSERVDB		_PATH_ARLA_DEBIAN_VICE "CellServDB"
-#define _PATH_ARLA_DEBIAN_THESECELLS		_PATH_ARLA_DEBIAN_VICE "TheseCells"
-
-#define _PATH_ARLA_OPENBSD_VICE			"/etc/afs/"
-#define _PATH_ARLA_OPENBSD_THISCELL		_PATH_ARLA_OPENBSD_VICE "ThisCell"
-#define _PATH_ARLA_OPENBSD_CELLSERVDB		_PATH_ARLA_OPENBSD_VICE "CellServDB"
-#define _PATH_ARLA_OPENBSD_THESECELLS		_PATH_ARLA_OPENBSD_VICE "TheseCells"
-
-extern int _kafs_debug;
-
-#endif /* __KAFS_H */
diff --git a/include.new/kdc-protos.h b/include.new/kdc-protos.h
deleted file mode 100644
index a46993b..0000000
--- a/include.new/kdc-protos.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* This is a generated file */
-#ifndef __kdc_protos_h__
-#define __kdc_protos_h__
-
-#include <stdarg.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-krb5_error_code
-kdc_check_flags (
-	krb5_context /*context*/,
-	krb5_kdc_configuration */*config*/,
-	hdb_entry_ex */*client_ex*/,
-	const char */*client_name*/,
-	hdb_entry_ex */*server_ex*/,
-	const char */*server_name*/,
-	krb5_boolean /*is_as_req*/);
-
-void
-kdc_log (
-	krb5_context /*context*/,
-	krb5_kdc_configuration */*config*/,
-	int /*level*/,
-	const char */*fmt*/,
-	...);
-
-char*
-kdc_log_msg (
-	krb5_context /*context*/,
-	krb5_kdc_configuration */*config*/,
-	int /*level*/,
-	const char */*fmt*/,
-	...);
-
-char*
-kdc_log_msg_va (
-	krb5_context /*context*/,
-	krb5_kdc_configuration */*config*/,
-	int /*level*/,
-	const char */*fmt*/,
-	va_list /*ap*/);
-
-void
-kdc_openlog (
-	krb5_context /*context*/,
-	const char */*service*/,
-	krb5_kdc_configuration */*config*/);
-
-krb5_error_code
-krb5_kdc_get_config (
-	krb5_context /*context*/,
-	krb5_kdc_configuration **/*config*/);
-
-krb5_error_code
-krb5_kdc_pk_initialize (
-	krb5_context /*context*/,
-	krb5_kdc_configuration */*config*/,
-	const char */*user_id*/,
-	const char */*anchors*/,
-	char **/*pool*/,
-	char **/*revoke_list*/);
-
-krb5_error_code
-krb5_kdc_pkinit_config (
-	krb5_context /*context*/,
-	krb5_kdc_configuration */*config*/);
-
-int
-krb5_kdc_process_krb5_request (
-	krb5_context /*context*/,
-	krb5_kdc_configuration */*config*/,
-	unsigned char */*buf*/,
-	size_t /*len*/,
-	krb5_data */*reply*/,
-	const char */*from*/,
-	struct sockaddr */*addr*/,
-	int /*datagram_reply*/);
-
-int
-krb5_kdc_process_request (
-	krb5_context /*context*/,
-	krb5_kdc_configuration */*config*/,
-	unsigned char */*buf*/,
-	size_t /*len*/,
-	krb5_data */*reply*/,
-	krb5_boolean */*prependlength*/,
-	const char */*from*/,
-	struct sockaddr */*addr*/,
-	int /*datagram_reply*/);
-
-int
-krb5_kdc_save_request (
-	krb5_context /*context*/,
-	const char */*fn*/,
-	const unsigned char */*buf*/,
-	size_t /*len*/,
-	const krb5_data */*reply*/,
-	const struct sockaddr */*sa*/);
-
-krb5_error_code
-krb5_kdc_set_dbinfo (
-	krb5_context /*context*/,
-	struct krb5_kdc_configuration */*c*/);
-
-void
-krb5_kdc_update_time (struct timeval */*tv*/);
-
-krb5_error_code
-krb5_kdc_windc_init (krb5_context /*context*/);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __kdc_protos_h__ */
diff --git a/include.new/kdc.h b/include.new/kdc.h
deleted file mode 100644
index ab643ec..0000000
--- a/include.new/kdc.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 1997-2003 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- *
- * Copyright (c) 2005 Andrew Bartlett <abartlet@samba.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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/*
- * $Id$
- */
-
-#ifndef __KDC_H__
-#define __KDC_H__
-
-#include <hdb.h>
-#include <krb5.h>
-
-enum krb5_kdc_trpolicy {
-    TRPOLICY_ALWAYS_CHECK,
-    TRPOLICY_ALLOW_PER_PRINCIPAL,
-    TRPOLICY_ALWAYS_HONOUR_REQUEST
-};
-
-typedef struct krb5_kdc_configuration {
-    krb5_boolean require_preauth; /* require preauth for all principals */
-    time_t kdc_warn_pwexpire; /* time before expiration to print a warning */
-
-    struct HDB **db;
-    int num_db;
-
-    krb5_boolean encode_as_rep_as_tgs_rep; /* bug compatibility */
-
-    krb5_boolean tgt_use_strongest_session_key;
-    krb5_boolean preauth_use_strongest_session_key;
-    krb5_boolean svc_use_strongest_session_key;
-    krb5_boolean use_strongest_server_key;
-
-    krb5_boolean check_ticket_addresses;
-    krb5_boolean allow_null_ticket_addresses;
-    krb5_boolean allow_anonymous;
-    enum krb5_kdc_trpolicy trpolicy;
-
-    krb5_boolean enable_pkinit;
-    krb5_boolean pkinit_princ_in_cert;
-    const char *pkinit_kdc_identity;
-    const char *pkinit_kdc_anchors;
-    const char *pkinit_kdc_friendly_name;
-    const char *pkinit_kdc_ocsp_file;
-    char **pkinit_kdc_cert_pool;
-    char **pkinit_kdc_revoke;
-    int pkinit_dh_min_bits;
-    int pkinit_require_binding;
-    int pkinit_allow_proxy_certs;
-
-    krb5_log_facility *logf;
-
-    int enable_digest;
-    int digests_allowed;
-
-    size_t max_datagram_reply_length;
-
-    int enable_kx509;
-    const char *kx509_template;
-    const char *kx509_ca;
-
-} krb5_kdc_configuration;
-
-struct krb5_kdc_service {
-    unsigned int flags;
-#define KS_KRB5		1
-#define KS_NO_LENGTH	2
-    krb5_error_code (*process)(krb5_context context,
-			       krb5_kdc_configuration *config,
-			       krb5_data *req_buffer,
-			       krb5_data *reply,
-			       const char *from,
-			       struct sockaddr *addr,
-			       int datagram_reply,
-			       int *claim);
-};
-
-#include <kdc-protos.h>
-
-#endif
diff --git a/include.new/kenv.h b/include.new/kenv.h
deleted file mode 100644
index a951e91..0000000
--- a/include.new/kenv.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2002 Maxime Henrion <mux@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.
- *
- * 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: releng/10.2/include/kenv.h 152750 2005-11-24 07:20:26Z ru $
- */
-
-#ifndef _KENV_H_
-#define _KENV_H_
-
-#include <sys/cdefs.h>
-#include <sys/kenv.h>
-
-__BEGIN_DECLS
-int kenv(int, const char *, char *, int);
-__END_DECLS
-
-#endif /* !_KENV_H_ */
diff --git a/include.new/krb5-private.h b/include.new/krb5-private.h
deleted file mode 100644
index 956e00e..0000000
--- a/include.new/krb5-private.h
+++ /dev/null
@@ -1,593 +0,0 @@
-/* This is a generated file */
-#ifndef __krb5_private_h__
-#define __krb5_private_h__
-
-#include <stdarg.h>
-
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(x)
-#endif
-
-#ifndef KRB5_DEPRECATED_FUNCTION
-#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 )))
-#define KRB5_DEPRECATED_FUNCTION(X) __attribute__((__deprecated__))
-#else
-#define KRB5_DEPRECATED_FUNCTION(X)
-#endif
-#endif
-
-
-void
-_heim_krb5_ipc_client_clear_target (void);
-
-void
-_heim_krb5_ipc_client_set_target_uid (uid_t /*uid*/);
-
-void
-_krb5_DES3_random_to_key (
-	krb5_context /*context*/,
-	krb5_keyblock */*key*/,
-	const void */*data*/,
-	size_t /*size*/);
-
-krb5_error_code
-_krb5_HMAC_MD5_checksum (
-	krb5_context /*context*/,
-	struct _krb5_key_data */*key*/,
-	const void */*data*/,
-	size_t /*len*/,
-	unsigned /*usage*/,
-	Checksum */*result*/);
-
-krb5_error_code
-_krb5_SP_HMAC_SHA1_checksum (
-	krb5_context /*context*/,
-	struct _krb5_key_data */*key*/,
-	const void */*data*/,
-	size_t /*len*/,
-	unsigned /*usage*/,
-	Checksum */*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_build_authenticator (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_enctype /*enctype*/,
-	krb5_creds */*cred*/,
-	Checksum */*cksum*/,
-	krb5_data */*result*/,
-	krb5_key_usage /*usage*/);
-
-krb5_error_code
-_krb5_cc_allocate (
-	krb5_context /*context*/,
-	const krb5_cc_ops */*ops*/,
-	krb5_ccache */*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_config_copy (
-	krb5_context /*context*/,
-	krb5_config_section */*c*/,
-	krb5_config_section **/*head*/);
-
-KRB5_LIB_FUNCTION const void * KRB5_LIB_CALL
-_krb5_config_get (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	int /*type*/,
-	...);
-
-krb5_config_section *
-_krb5_config_get_entry (
-	krb5_config_section **/*parent*/,
-	const char */*name*/,
-	int /*type*/);
-
-KRB5_LIB_FUNCTION const void * KRB5_LIB_CALL
-_krb5_config_get_next (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	const krb5_config_binding **/*pointer*/,
-	int /*type*/,
-	...);
-
-const void *
-_krb5_config_vget (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	int /*type*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION const void * KRB5_LIB_CALL
-_krb5_config_vget_next (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	const krb5_config_binding **/*pointer*/,
-	int /*type*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_copy_send_to_kdc_func (
-	krb5_context /*context*/,
-	krb5_context /*to*/);
-
-void
-_krb5_crc_init_table (void);
-
-uint32_t
-_krb5_crc_update (
-	const char */*p*/,
-	size_t /*len*/,
-	uint32_t /*res*/);
-
-void KRB5_LIB_FUNCTION
-_krb5_debug (
-	krb5_context /*context*/,
-	int /*level*/,
-	const char */*fmt*/,
-	...)
-     __attribute__((format (printf, 3, 4)));
-
-void
-_krb5_debug_backtrace (krb5_context /*context*/);
-
-krb5_error_code
-_krb5_derive_key (
-	krb5_context /*context*/,
-	struct _krb5_encryption_type */*et*/,
-	struct _krb5_key_data */*key*/,
-	const void */*constant*/,
-	size_t /*len*/);
-
-krb5_error_code
-_krb5_des_checksum (
-	krb5_context /*context*/,
-	const EVP_MD */*evp_md*/,
-	struct _krb5_key_data */*key*/,
-	const void */*data*/,
-	size_t /*len*/,
-	Checksum */*cksum*/);
-
-krb5_error_code
-_krb5_des_verify (
-	krb5_context /*context*/,
-	const EVP_MD */*evp_md*/,
-	struct _krb5_key_data */*key*/,
-	const void */*data*/,
-	size_t /*len*/,
-	Checksum */*C*/);
-
-krb5_error_code
-_krb5_dh_group_ok (
-	krb5_context /*context*/,
-	unsigned long /*bits*/,
-	heim_integer */*p*/,
-	heim_integer */*g*/,
-	heim_integer */*q*/,
-	struct krb5_dh_moduli **/*moduli*/,
-	char **/*name*/);
-
-krb5_error_code
-_krb5_einval (
-	krb5_context /*context*/,
-	const char */*func*/,
-	unsigned long /*argn*/);
-
-krb5_error_code
-_krb5_erase_file (
-	krb5_context /*context*/,
-	const char */*filename*/);
-
-void
-_krb5_evp_cleanup (
-	krb5_context /*context*/,
-	struct _krb5_key_data */*kd*/);
-
-krb5_error_code
-_krb5_evp_encrypt (
-	krb5_context /*context*/,
-	struct _krb5_key_data */*key*/,
-	void */*data*/,
-	size_t /*len*/,
-	krb5_boolean /*encryptp*/,
-	int /*usage*/,
-	void */*ivec*/);
-
-krb5_error_code
-_krb5_evp_encrypt_cts (
-	krb5_context /*context*/,
-	struct _krb5_key_data */*key*/,
-	void */*data*/,
-	size_t /*len*/,
-	krb5_boolean /*encryptp*/,
-	int /*usage*/,
-	void */*ivec*/);
-
-void
-_krb5_evp_schedule (
-	krb5_context /*context*/,
-	struct _krb5_key_type */*kt*/,
-	struct _krb5_key_data */*kd*/);
-
-krb5_error_code
-_krb5_expand_default_cc_name (
-	krb5_context /*context*/,
-	const char */*str*/,
-	char **/*res*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_expand_path_tokens (
-	krb5_context /*context*/,
-	const char */*path_in*/,
-	char **/*ppath_out*/);
-
-int
-_krb5_extract_ticket (
-	krb5_context /*context*/,
-	krb5_kdc_rep */*rep*/,
-	krb5_creds */*creds*/,
-	krb5_keyblock */*key*/,
-	krb5_const_pointer /*keyseed*/,
-	krb5_key_usage /*key_usage*/,
-	krb5_addresses */*addrs*/,
-	unsigned /*nonce*/,
-	unsigned /*flags*/,
-	krb5_decrypt_proc /*decrypt_proc*/,
-	krb5_const_pointer /*decryptarg*/);
-
-struct _krb5_checksum_type *
-_krb5_find_checksum (krb5_cksumtype /*type*/);
-
-struct _krb5_encryption_type *
-_krb5_find_enctype (krb5_enctype /*type*/);
-
-void
-_krb5_free_key_data (
-	krb5_context /*context*/,
-	struct _krb5_key_data */*key*/,
-	struct _krb5_encryption_type */*et*/);
-
-void
-_krb5_free_krbhst_info (krb5_krbhst_info */*hi*/);
-
-void
-_krb5_free_moduli (struct krb5_dh_moduli **/*moduli*/);
-
-krb5_error_code
-_krb5_get_cred_kdc_any (
-	krb5_context /*context*/,
-	krb5_kdc_flags /*flags*/,
-	krb5_ccache /*ccache*/,
-	krb5_creds */*in_creds*/,
-	krb5_principal /*impersonate_principal*/,
-	Ticket */*second_ticket*/,
-	krb5_creds **/*out_creds*/,
-	krb5_creds ***/*ret_tgts*/);
-
-char *
-_krb5_get_default_cc_name_from_registry (krb5_context /*context*/);
-
-char *
-_krb5_get_default_config_config_files_from_registry (void);
-
-krb5_error_code
-_krb5_get_default_principal_local (
-	krb5_context /*context*/,
-	krb5_principal */*princ*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_get_host_realm_int (
-	krb5_context /*context*/,
-	const char */*host*/,
-	krb5_boolean /*use_dns*/,
-	krb5_realm **/*realms*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-_krb5_get_init_creds_opt_free_pkinit (krb5_get_init_creds_opt */*opt*/);
-
-KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL
-_krb5_get_int (
-	void */*buffer*/,
-	unsigned long */*value*/,
-	size_t /*size*/);
-
-krb5_error_code
-_krb5_get_krbtgt (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_realm /*realm*/,
-	krb5_creds **/*cred*/);
-
-krb5_boolean KRB5_LIB_FUNCTION
-_krb5_have_debug (
-	krb5_context /*context*/,
-	int /*level*/);
-
-krb5_boolean
-_krb5_homedir_access (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_init_etype (
-	krb5_context /*context*/,
-	krb5_pdu /*pdu_type*/,
-	unsigned */*len*/,
-	krb5_enctype **/*val*/,
-	const krb5_enctype */*etypes*/);
-
-krb5_error_code
-_krb5_internal_hmac (
-	krb5_context /*context*/,
-	struct _krb5_checksum_type */*cm*/,
-	const void */*data*/,
-	size_t /*len*/,
-	unsigned /*usage*/,
-	struct _krb5_key_data */*keyblock*/,
-	Checksum */*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_kcm_get_initial_ticket (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_principal /*server*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_kcm_get_ticket (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_kdc_flags /*flags*/,
-	krb5_enctype /*enctype*/,
-	krb5_principal /*server*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-_krb5_kcm_is_running (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_kcm_noop (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/);
-
-krb5_error_code KRB5_CALLCONV
-_krb5_kdc_retry (
-	krb5_context /*context*/,
-	krb5_sendto_ctx /*ctx*/,
-	void */*data*/,
-	const krb5_data */*reply*/,
-	int */*action*/);
-
-krb5_error_code
-_krb5_krbhost_info_move (
-	krb5_context /*context*/,
-	krb5_krbhst_info */*from*/,
-	krb5_krbhst_info **/*to*/);
-
-const char *
-_krb5_krbhst_get_realm (krb5_krbhst_handle /*handle*/);
-
-krb5_error_code
-_krb5_kt_principal_not_found (
-	krb5_context /*context*/,
-	krb5_error_code /*ret*/,
-	krb5_keytab /*id*/,
-	krb5_const_principal /*principal*/,
-	krb5_enctype /*enctype*/,
-	int /*kvno*/);
-
-krb5_error_code
-_krb5_load_ccache_plugins (krb5_context /*context*/);
-
-void
-_krb5_load_plugins (
-	krb5_context /*context*/,
-	const char */*name*/,
-	const char **/*paths*/);
-
-krb5_error_code
-_krb5_mk_req_internal (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	const krb5_flags /*ap_req_options*/,
-	krb5_data */*in_data*/,
-	krb5_creds */*in_creds*/,
-	krb5_data */*outbuf*/,
-	krb5_key_usage /*checksum_usage*/,
-	krb5_key_usage /*encrypt_usage*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_n_fold (
-	const void */*str*/,
-	size_t /*len*/,
-	void */*key*/,
-	size_t /*size*/);
-
-krb5_error_code
-_krb5_pac_sign (
-	krb5_context /*context*/,
-	krb5_pac /*p*/,
-	time_t /*authtime*/,
-	krb5_principal /*principal*/,
-	const krb5_keyblock */*server_key*/,
-	const krb5_keyblock */*priv_key*/,
-	krb5_data */*data*/);
-
-krb5_error_code
-_krb5_parse_moduli (
-	krb5_context /*context*/,
-	const char */*file*/,
-	struct krb5_dh_moduli ***/*moduli*/);
-
-krb5_error_code
-_krb5_parse_moduli_line (
-	krb5_context /*context*/,
-	const char */*file*/,
-	int /*lineno*/,
-	char */*p*/,
-	struct krb5_dh_moduli **/*m*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-_krb5_pk_cert_free (struct krb5_pk_cert */*cert*/);
-
-krb5_error_code
-_krb5_pk_kdf (
-	krb5_context /*context*/,
-	const struct AlgorithmIdentifier */*ai*/,
-	const void */*dhdata*/,
-	size_t /*dhsize*/,
-	krb5_const_principal /*client*/,
-	krb5_const_principal /*server*/,
-	krb5_enctype /*enctype*/,
-	const krb5_data */*as_req*/,
-	const krb5_data */*pk_as_rep*/,
-	const Ticket */*ticket*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_pk_load_id (
-	krb5_context /*context*/,
-	struct krb5_pk_identity **/*ret_id*/,
-	const char */*user_id*/,
-	const char */*anchor_id*/,
-	char * const */*chain_list*/,
-	char * const */*revoke_list*/,
-	krb5_prompter_fct /*prompter*/,
-	void */*prompter_data*/,
-	char */*password*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_pk_mk_ContentInfo (
-	krb5_context /*context*/,
-	const krb5_data */*buf*/,
-	const heim_oid */*oid*/,
-	struct ContentInfo */*content_info*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_pk_mk_padata (
-	krb5_context /*context*/,
-	void */*c*/,
-	int /*ic_flags*/,
-	int /*win2k*/,
-	const KDC_REQ_BODY */*req_body*/,
-	unsigned /*nonce*/,
-	METHOD_DATA */*md*/);
-
-krb5_error_code
-_krb5_pk_octetstring2key (
-	krb5_context /*context*/,
-	krb5_enctype /*type*/,
-	const void */*dhdata*/,
-	size_t /*dhsize*/,
-	const heim_octet_string */*c_n*/,
-	const heim_octet_string */*k_n*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_pk_rd_pa_reply (
-	krb5_context /*context*/,
-	const char */*realm*/,
-	void */*c*/,
-	krb5_enctype /*etype*/,
-	const krb5_krbhst_info */*hi*/,
-	unsigned /*nonce*/,
-	const krb5_data */*req_buffer*/,
-	PA_DATA */*pa*/,
-	krb5_keyblock **/*key*/);
-
-krb5_error_code
-_krb5_plugin_find (
-	krb5_context /*context*/,
-	enum krb5_plugin_type /*type*/,
-	const char */*name*/,
-	struct krb5_plugin **/*list*/);
-
-void
-_krb5_plugin_free (struct krb5_plugin */*list*/);
-
-struct krb5_plugin *
-_krb5_plugin_get_next (struct krb5_plugin */*p*/);
-
-void *
-_krb5_plugin_get_symbol (struct krb5_plugin */*p*/);
-
-krb5_error_code
-_krb5_plugin_run_f (
-	krb5_context /*context*/,
-	const char */*module*/,
-	const char */*name*/,
-	int /*min_version*/,
-	int /*flags*/,
-	void */*userctx*/,
-	krb5_error_code (*/*func*/)(krb5_context, const void *, void *, void *));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_principal2principalname (
-	PrincipalName */*p*/,
-	const krb5_principal /*from*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-_krb5_principal_compare_PrincipalName (
-	krb5_context /*context*/,
-	krb5_const_principal /*princ1*/,
-	PrincipalName */*princ2*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_principalname2krb5_principal (
-	krb5_context /*context*/,
-	krb5_principal */*principal*/,
-	const PrincipalName /*from*/,
-	const Realm /*realm*/);
-
-KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL
-_krb5_put_int (
-	void */*buffer*/,
-	unsigned long /*value*/,
-	size_t /*size*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-_krb5_s4u2self_to_checksumdata (
-	krb5_context /*context*/,
-	const PA_S4U2Self */*self*/,
-	krb5_data */*data*/);
-
-int
-_krb5_send_and_recv_tcp (
-	krb5_socket_t /*fd*/,
-	time_t /*tmout*/,
-	const krb5_data */*req*/,
-	krb5_data */*rep*/);
-
-int
-_krb5_set_default_cc_name_to_registry (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/);
-
-void
-_krb5_unload_plugins (
-	krb5_context /*context*/,
-	const char */*name*/);
-
-krb5_error_code
-_krb5_usage2arcfour (
-	krb5_context /*context*/,
-	unsigned */*usage*/);
-
-int
-_krb5_xlock (
-	krb5_context /*context*/,
-	int /*fd*/,
-	krb5_boolean /*exclusive*/,
-	const char */*filename*/);
-
-void
-_krb5_xor (
-	DES_cblock */*key*/,
-	const unsigned char */*b*/);
-
-int
-_krb5_xunlock (
-	krb5_context /*context*/,
-	int /*fd*/);
-
-#undef KRB5_DEPRECATED_FUNCTION
-#define KRB5_DEPRECATED_FUNCTION(X)
-
-#endif /* __krb5_private_h__ */
diff --git a/include.new/krb5-protos.h b/include.new/krb5-protos.h
deleted file mode 100644
index c72e796..0000000
--- a/include.new/krb5-protos.h
+++ /dev/null
@@ -1,4527 +0,0 @@
-/* This is a generated file */
-#ifndef __krb5_protos_h__
-#define __krb5_protos_h__
-
-#include <stdarg.h>
-
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(x)
-#endif
-
-#ifndef KRB5_DEPRECATED_FUNCTION
-#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 )))
-#define KRB5_DEPRECATED_FUNCTION(X) __attribute__((__deprecated__))
-#else
-#define KRB5_DEPRECATED_FUNCTION(X)
-#endif
-#endif
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef KRB5_LIB
-#ifndef KRB5_LIB_FUNCTION
-#if defined(_WIN32)
-#define KRB5_LIB_FUNCTION __declspec(dllimport)
-#define KRB5_LIB_CALL __stdcall
-#define KRB5_LIB_VARIABLE __declspec(dllimport)
-#else
-#define KRB5_LIB_FUNCTION
-#define KRB5_LIB_CALL
-#define KRB5_LIB_VARIABLE
-#endif
-#endif
-#endif
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb524_convert_creds_kdc (
-	krb5_context /*context*/,
-	krb5_creds */*in_cred*/,
-	struct credentials */*v4creds*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb524_convert_creds_kdc_ccache (
-	krb5_context /*context*/,
-	krb5_ccache /*ccache*/,
-	krb5_creds */*in_cred*/,
-	struct credentials */*v4creds*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_abort (
-	krb5_context /*context*/,
-	krb5_error_code /*code*/,
-	const char */*fmt*/,
-	...)
-     __attribute__ ((noreturn, format (printf, 3, 4)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_abortx (
-	krb5_context /*context*/,
-	const char */*fmt*/,
-	...)
-     __attribute__ ((noreturn, format (printf, 2, 3)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_acl_match_file (
-	krb5_context /*context*/,
-	const char */*file*/,
-	const char */*format*/,
-	...);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_acl_match_string (
-	krb5_context /*context*/,
-	const char */*string*/,
-	const char */*format*/,
-	...);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_add_et_list (
-	krb5_context /*context*/,
-	void (*/*func*/)(struct et_list **));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_add_extra_addresses (
-	krb5_context /*context*/,
-	krb5_addresses */*addresses*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_add_ignore_addresses (
-	krb5_context /*context*/,
-	krb5_addresses */*addresses*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_addlog_dest (
-	krb5_context /*context*/,
-	krb5_log_facility */*f*/,
-	const char */*orig*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_addlog_func (
-	krb5_context /*context*/,
-	krb5_log_facility */*fac*/,
-	int /*min*/,
-	int /*max*/,
-	krb5_log_log_func_t /*log_func*/,
-	krb5_log_close_func_t /*close_func*/,
-	void */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_addr2sockaddr (
-	krb5_context /*context*/,
-	const krb5_address */*addr*/,
-	struct sockaddr */*sa*/,
-	krb5_socklen_t */*sa_size*/,
-	int /*port*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_address_compare (
-	krb5_context /*context*/,
-	const krb5_address */*addr1*/,
-	const krb5_address */*addr2*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_address_order (
-	krb5_context /*context*/,
-	const krb5_address */*addr1*/,
-	const krb5_address */*addr2*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_address_prefixlen_boundary (
-	krb5_context /*context*/,
-	const krb5_address */*inaddr*/,
-	unsigned long /*prefixlen*/,
-	krb5_address */*low*/,
-	krb5_address */*high*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_address_search (
-	krb5_context /*context*/,
-	const krb5_address */*addr*/,
-	const krb5_addresses */*addrlist*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_allow_weak_crypto (
-	krb5_context /*context*/,
-	krb5_boolean /*enable*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_aname_to_localname (
-	krb5_context /*context*/,
-	krb5_const_principal /*aname*/,
-	size_t /*lnsize*/,
-	char */*lname*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_anyaddr (
-	krb5_context /*context*/,
-	int /*af*/,
-	struct sockaddr */*sa*/,
-	krb5_socklen_t */*sa_size*/,
-	int /*port*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_appdefault_boolean (
-	krb5_context /*context*/,
-	const char */*appname*/,
-	krb5_const_realm /*realm*/,
-	const char */*option*/,
-	krb5_boolean /*def_val*/,
-	krb5_boolean */*ret_val*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_appdefault_string (
-	krb5_context /*context*/,
-	const char */*appname*/,
-	krb5_const_realm /*realm*/,
-	const char */*option*/,
-	const char */*def_val*/,
-	char **/*ret_val*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_appdefault_time (
-	krb5_context /*context*/,
-	const char */*appname*/,
-	krb5_const_realm /*realm*/,
-	const char */*option*/,
-	time_t /*def_val*/,
-	time_t */*ret_val*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_append_addresses (
-	krb5_context /*context*/,
-	krb5_addresses */*dest*/,
-	const krb5_addresses */*source*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_addflags (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	int32_t /*addflags*/,
-	int32_t */*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_free (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_genaddrs (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_socket_t /*fd*/,
-	int /*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_generatelocalsubkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getaddrs (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_address **/*local_addr*/,
-	krb5_address **/*remote_addr*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getauthenticator (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_authenticator */*authenticator*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getcksumtype (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_cksumtype */*cksumtype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getflags (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	int32_t */*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock **/*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getkeytype (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keytype */*keytype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getlocalseqnumber (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	int32_t */*seqnumber*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getlocalsubkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock **/*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getrcache (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_rcache */*rcache*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getrecvsubkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock **/*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getremoteseqnumber (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	int32_t */*seqnumber*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getremotesubkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock **/*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_getsendsubkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock **/*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_init (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_removeflags (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	int32_t /*removeflags*/,
-	int32_t */*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setaddrs (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_address */*local_addr*/,
-	krb5_address */*remote_addr*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setaddrs_from_fd (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	void */*p_fd*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setcksumtype (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_cksumtype /*cksumtype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setflags (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	int32_t /*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setkeytype (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keytype /*keytype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setlocalseqnumber (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	int32_t /*seqnumber*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setlocalsubkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setrcache (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_rcache /*rcache*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setrecvsubkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setremoteseqnumber (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	int32_t /*seqnumber*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setremotesubkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setsendsubkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_con_setuserkey (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_auth_getremoteseqnumber (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	int32_t */*seqnumber*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_build_ap_req (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	krb5_creds */*cred*/,
-	krb5_flags /*ap_options*/,
-	krb5_data /*authenticator*/,
-	krb5_data */*retdata*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_build_principal (
-	krb5_context /*context*/,
-	krb5_principal */*principal*/,
-	int /*rlen*/,
-	krb5_const_realm /*realm*/,
-	...);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_build_principal_ext (
-	krb5_context /*context*/,
-	krb5_principal */*principal*/,
-	int /*rlen*/,
-	krb5_const_realm /*realm*/,
-	...);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_build_principal_va (
-	krb5_context /*context*/,
-	krb5_principal */*principal*/,
-	int /*rlen*/,
-	krb5_const_realm /*realm*/,
-	va_list /*ap*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_build_principal_va_ext (
-	krb5_context /*context*/,
-	krb5_principal */*principal*/,
-	int /*rlen*/,
-	krb5_const_realm /*realm*/,
-	va_list /*ap*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_block_size (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	size_t */*blocksize*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_checksum_length (
-	krb5_context /*context*/,
-	krb5_cksumtype /*cksumtype*/,
-	size_t */*length*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_decrypt (
-	krb5_context /*context*/,
-	const krb5_keyblock /*key*/,
-	krb5_keyusage /*usage*/,
-	const krb5_data */*ivec*/,
-	krb5_enc_data */*input*/,
-	krb5_data */*output*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_encrypt (
-	krb5_context /*context*/,
-	const krb5_keyblock */*key*/,
-	krb5_keyusage /*usage*/,
-	const krb5_data */*ivec*/,
-	const krb5_data */*input*/,
-	krb5_enc_data */*output*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_encrypt_length (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	size_t /*inputlen*/,
-	size_t */*length*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_enctype_compare (
-	krb5_context /*context*/,
-	krb5_enctype /*e1*/,
-	krb5_enctype /*e2*/,
-	krb5_boolean */*similar*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_get_checksum (
-	krb5_context /*context*/,
-	const krb5_checksum */*cksum*/,
-	krb5_cksumtype */*type*/,
-	krb5_data **/*data*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_c_is_coll_proof_cksum (krb5_cksumtype /*ctype*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_c_is_keyed_cksum (krb5_cksumtype /*ctype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_keylengths (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	size_t */*ilen*/,
-	size_t */*keylen*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_make_checksum (
-	krb5_context /*context*/,
-	krb5_cksumtype /*cksumtype*/,
-	const krb5_keyblock */*key*/,
-	krb5_keyusage /*usage*/,
-	const krb5_data */*input*/,
-	krb5_checksum */*cksum*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_make_random_key (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	krb5_keyblock */*random_key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_prf (
-	krb5_context /*context*/,
-	const krb5_keyblock */*key*/,
-	const krb5_data */*input*/,
-	krb5_data */*output*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_prf_length (
-	krb5_context /*context*/,
-	krb5_enctype /*type*/,
-	size_t */*length*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_random_make_octets (
-	krb5_context /*context*/,
-	krb5_data * /*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_set_checksum (
-	krb5_context /*context*/,
-	krb5_checksum */*cksum*/,
-	krb5_cksumtype /*type*/,
-	const krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_c_valid_cksumtype (krb5_cksumtype /*ctype*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_c_valid_enctype (krb5_enctype /*etype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_c_verify_checksum (
-	krb5_context /*context*/,
-	const krb5_keyblock */*key*/,
-	krb5_keyusage /*usage*/,
-	const krb5_data */*data*/,
-	const krb5_checksum */*cksum*/,
-	krb5_boolean */*valid*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_cache_end_seq_get (
-	krb5_context /*context*/,
-	krb5_cc_cache_cursor /*cursor*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_cache_get_first (
-	krb5_context /*context*/,
-	const char */*type*/,
-	krb5_cc_cache_cursor */*cursor*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_cache_match (
-	krb5_context /*context*/,
-	krb5_principal /*client*/,
-	krb5_ccache */*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_cache_next (
-	krb5_context /*context*/,
-	krb5_cc_cache_cursor /*cursor*/,
-	krb5_ccache */*id*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_cc_clear_mcred (krb5_creds */*mcred*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_close (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_copy_cache (
-	krb5_context /*context*/,
-	const krb5_ccache /*from*/,
-	krb5_ccache /*to*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_copy_creds (
-	krb5_context /*context*/,
-	const krb5_ccache /*from*/,
-	krb5_ccache /*to*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_copy_match_f (
-	krb5_context /*context*/,
-	const krb5_ccache /*from*/,
-	krb5_ccache /*to*/,
-	krb5_boolean (*/*match*/)(krb5_context, void *, const krb5_creds *),
-	void */*matchctx*/,
-	unsigned int */*matched*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_default (
-	krb5_context /*context*/,
-	krb5_ccache */*id*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_cc_default_name (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_destroy (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_end_seq_get (
-	krb5_context /*context*/,
-	const krb5_ccache /*id*/,
-	krb5_cc_cursor */*cursor*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_gen_new (
-	krb5_context /*context*/,
-	const krb5_cc_ops */*ops*/,
-	krb5_ccache */*id*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_get_config (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_const_principal /*principal*/,
-	const char */*name*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_get_flags (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_flags */*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_get_friendly_name (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	char **/*name*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_get_full_name (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	char **/*str*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_get_kdc_offset (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_deltat */*offset*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_get_lifetime (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	time_t */*t*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_cc_get_name (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/);
-
-KRB5_LIB_FUNCTION const krb5_cc_ops * KRB5_LIB_CALL
-krb5_cc_get_ops (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/);
-
-KRB5_LIB_FUNCTION const krb5_cc_ops * KRB5_LIB_CALL
-krb5_cc_get_prefix_ops (
-	krb5_context /*context*/,
-	const char */*prefix*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_get_principal (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_principal */*principal*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_cc_get_type (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_get_version (
-	krb5_context /*context*/,
-	const krb5_ccache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_initialize (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_principal /*primary_principal*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_last_change_time (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_timestamp */*mtime*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_move (
-	krb5_context /*context*/,
-	krb5_ccache /*from*/,
-	krb5_ccache /*to*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_new_unique (
-	krb5_context /*context*/,
-	const char */*type*/,
-	const char */*hint*/,
-	krb5_ccache */*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_next_cred (
-	krb5_context /*context*/,
-	const krb5_ccache /*id*/,
-	krb5_cc_cursor */*cursor*/,
-	krb5_creds */*creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_register (
-	krb5_context /*context*/,
-	const krb5_cc_ops */*ops*/,
-	krb5_boolean /*override*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_remove_cred (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_flags /*which*/,
-	krb5_creds */*cred*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_resolve (
-	krb5_context /*context*/,
-	const char */*name*/,
-	krb5_ccache */*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_retrieve_cred (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_flags /*whichfields*/,
-	const krb5_creds */*mcreds*/,
-	krb5_creds */*creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_set_config (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_const_principal /*principal*/,
-	const char */*name*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_set_default_name (
-	krb5_context /*context*/,
-	const char */*name*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_set_flags (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_flags /*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_set_friendly_name (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	const char */*name*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_set_kdc_offset (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_deltat /*offset*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_start_seq_get (
-	krb5_context /*context*/,
-	const krb5_ccache /*id*/,
-	krb5_cc_cursor */*cursor*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_store_cred (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_creds */*creds*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_cc_support_switch (
-	krb5_context /*context*/,
-	const char */*type*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cc_switch (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cccol_cursor_free (
-	krb5_context /*context*/,
-	krb5_cccol_cursor */*cursor*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cccol_cursor_new (
-	krb5_context /*context*/,
-	krb5_cccol_cursor */*cursor*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cccol_cursor_next (
-	krb5_context /*context*/,
-	krb5_cccol_cursor /*cursor*/,
-	krb5_ccache */*cache*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cccol_last_change_time (
-	krb5_context /*context*/,
-	const char */*type*/,
-	krb5_timestamp */*mtime*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_change_password (
-	krb5_context /*context*/,
-	krb5_creds */*creds*/,
-	const char */*newpw*/,
-	int */*result_code*/,
-	krb5_data */*result_code_string*/,
-	krb5_data */*result_string*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_check_transited (
-	krb5_context /*context*/,
-	krb5_const_realm /*client_realm*/,
-	krb5_const_realm /*server_realm*/,
-	krb5_realm */*realms*/,
-	unsigned int /*num_realms*/,
-	int */*bad_realm*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_check_transited_realms (
-	krb5_context /*context*/,
-	const char *const */*realms*/,
-	unsigned int /*num_realms*/,
-	int */*bad_realm*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_checksum_disable (
-	krb5_context /*context*/,
-	krb5_cksumtype /*type*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_checksum_free (
-	krb5_context /*context*/,
-	krb5_checksum */*cksum*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_checksum_is_collision_proof (
-	krb5_context /*context*/,
-	krb5_cksumtype /*type*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_checksum_is_keyed (
-	krb5_context /*context*/,
-	krb5_cksumtype /*type*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_checksumsize (
-	krb5_context /*context*/,
-	krb5_cksumtype /*type*/,
-	size_t */*size*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cksumtype_to_enctype (
-	krb5_context /*context*/,
-	krb5_cksumtype /*ctype*/,
-	krb5_enctype */*etype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_cksumtype_valid (
-	krb5_context /*context*/,
-	krb5_cksumtype /*ctype*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_clear_error_message (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_clear_error_string (krb5_context /*context*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_closelog (
-	krb5_context /*context*/,
-	krb5_log_facility */*fac*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_compare_creds (
-	krb5_context /*context*/,
-	krb5_flags /*whichfields*/,
-	const krb5_creds * /*mcreds*/,
-	const krb5_creds * /*creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_config_file_free (
-	krb5_context /*context*/,
-	krb5_config_section */*s*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_config_free_strings (char **/*strings*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_config_get_bool (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	...);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_config_get_bool_default (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	krb5_boolean /*def_value*/,
-	...);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_config_get_int (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	...);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_config_get_int_default (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	int /*def_value*/,
-	...);
-
-KRB5_LIB_FUNCTION const krb5_config_binding * KRB5_LIB_CALL
-krb5_config_get_list (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	...);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_config_get_string (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	...);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_config_get_string_default (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	const char */*def_value*/,
-	...);
-
-KRB5_LIB_FUNCTION char** KRB5_LIB_CALL
-krb5_config_get_strings (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	...);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_config_get_time (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	...);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_config_get_time_default (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	int /*def_value*/,
-	...);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_config_parse_file (
-	krb5_context /*context*/,
-	const char */*fname*/,
-	krb5_config_section **/*res*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_config_parse_file_multi (
-	krb5_context /*context*/,
-	const char */*fname*/,
-	krb5_config_section **/*res*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_config_parse_string_multi (
-	krb5_context /*context*/,
-	const char */*string*/,
-	krb5_config_section **/*res*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_config_vget_bool (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_config_vget_bool_default (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	krb5_boolean /*def_value*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_config_vget_int (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_config_vget_int_default (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	int /*def_value*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION const krb5_config_binding * KRB5_LIB_CALL
-krb5_config_vget_list (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_config_vget_string (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_config_vget_string_default (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	const char */*def_value*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION char ** KRB5_LIB_CALL
-krb5_config_vget_strings (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_config_vget_time (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_config_vget_time_default (
-	krb5_context /*context*/,
-	const krb5_config_section */*c*/,
-	int /*def_value*/,
-	va_list /*args*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_address (
-	krb5_context /*context*/,
-	const krb5_address */*inaddr*/,
-	krb5_address */*outaddr*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_addresses (
-	krb5_context /*context*/,
-	const krb5_addresses */*inaddr*/,
-	krb5_addresses */*outaddr*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_checksum (
-	krb5_context /*context*/,
-	const krb5_checksum */*old*/,
-	krb5_checksum **/*new*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_context (
-	krb5_context /*context*/,
-	krb5_context */*out*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_creds (
-	krb5_context /*context*/,
-	const krb5_creds */*incred*/,
-	krb5_creds **/*outcred*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_creds_contents (
-	krb5_context /*context*/,
-	const krb5_creds */*incred*/,
-	krb5_creds */*c*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_data (
-	krb5_context /*context*/,
-	const krb5_data */*indata*/,
-	krb5_data **/*outdata*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_host_realm (
-	krb5_context /*context*/,
-	const krb5_realm */*from*/,
-	krb5_realm **/*to*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_keyblock (
-	krb5_context /*context*/,
-	const krb5_keyblock */*inblock*/,
-	krb5_keyblock **/*to*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_keyblock_contents (
-	krb5_context /*context*/,
-	const krb5_keyblock */*inblock*/,
-	krb5_keyblock */*to*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_principal (
-	krb5_context /*context*/,
-	krb5_const_principal /*inprinc*/,
-	krb5_principal */*outprinc*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_copy_ticket (
-	krb5_context /*context*/,
-	const krb5_ticket */*from*/,
-	krb5_ticket **/*to*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_create_checksum (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	krb5_key_usage /*usage*/,
-	int /*type*/,
-	void */*data*/,
-	size_t /*len*/,
-	Checksum */*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_create_checksum_iov (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	krb5_crypto_iov */*data*/,
-	unsigned int /*num_data*/,
-	krb5_cksumtype */*type*/);
-
-KRB5_LIB_FUNCTION unsigned long KRB5_LIB_CALL
-krb5_creds_get_ticket_flags (krb5_creds */*creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_destroy (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_fx_cf2 (
-	krb5_context /*context*/,
-	const krb5_crypto /*crypto1*/,
-	const krb5_crypto /*crypto2*/,
-	krb5_data */*pepper1*/,
-	krb5_data */*pepper2*/,
-	krb5_enctype /*enctype*/,
-	krb5_keyblock */*res*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_get_checksum_type (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	krb5_cksumtype */*type*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_getblocksize (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	size_t */*blocksize*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_getconfoundersize (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	size_t */*confoundersize*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_getenctype (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	krb5_enctype */*enctype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_getpadsize (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	size_t */*padsize*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_init (
-	krb5_context /*context*/,
-	const krb5_keyblock */*key*/,
-	krb5_enctype /*etype*/,
-	krb5_crypto */*crypto*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_length (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	int /*type*/,
-	size_t */*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_length_iov (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	krb5_crypto_iov */*data*/,
-	unsigned int /*num_data*/);
-
-KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL
-krb5_crypto_overhead (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_prf (
-	krb5_context /*context*/,
-	const krb5_crypto /*crypto*/,
-	const krb5_data */*input*/,
-	krb5_data */*output*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_crypto_prf_length (
-	krb5_context /*context*/,
-	krb5_enctype /*type*/,
-	size_t */*length*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_data_alloc (
-	krb5_data */*p*/,
-	int /*len*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_data_cmp (
-	const krb5_data */*data1*/,
-	const krb5_data */*data2*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_data_copy (
-	krb5_data */*p*/,
-	const void */*data*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_data_ct_cmp (
-	const krb5_data */*data1*/,
-	const krb5_data */*data2*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_data_free (krb5_data */*p*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_data_realloc (
-	krb5_data */*p*/,
-	int /*len*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_data_zero (krb5_data */*p*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decode_Authenticator (
-	krb5_context /*context*/,
-	const void */*data*/,
-	size_t /*length*/,
-	Authenticator */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decode_ETYPE_INFO (
-	krb5_context /*context*/,
-	const void */*data*/,
-	size_t /*length*/,
-	ETYPE_INFO */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decode_ETYPE_INFO2 (
-	krb5_context /*context*/,
-	const void */*data*/,
-	size_t /*length*/,
-	ETYPE_INFO2 */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decode_EncAPRepPart (
-	krb5_context /*context*/,
-	const void */*data*/,
-	size_t /*length*/,
-	EncAPRepPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decode_EncASRepPart (
-	krb5_context /*context*/,
-	const void */*data*/,
-	size_t /*length*/,
-	EncASRepPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decode_EncKrbCredPart (
-	krb5_context /*context*/,
-	const void */*data*/,
-	size_t /*length*/,
-	EncKrbCredPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decode_EncTGSRepPart (
-	krb5_context /*context*/,
-	const void */*data*/,
-	size_t /*length*/,
-	EncTGSRepPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decode_EncTicketPart (
-	krb5_context /*context*/,
-	const void */*data*/,
-	size_t /*length*/,
-	EncTicketPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decode_ap_req (
-	krb5_context /*context*/,
-	const krb5_data */*inbuf*/,
-	krb5_ap_req */*ap_req*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decrypt (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	void */*data*/,
-	size_t /*len*/,
-	krb5_data */*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decrypt_EncryptedData (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	const EncryptedData */*e*/,
-	krb5_data */*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decrypt_iov_ivec (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	krb5_crypto_iov */*data*/,
-	unsigned int /*num_data*/,
-	void */*ivec*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decrypt_ivec (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	void */*data*/,
-	size_t /*len*/,
-	krb5_data */*result*/,
-	void */*ivec*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_decrypt_ticket (
-	krb5_context /*context*/,
-	Ticket */*ticket*/,
-	krb5_keyblock */*key*/,
-	EncTicketPart */*out*/,
-	krb5_flags /*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_derive_key (
-	krb5_context /*context*/,
-	const krb5_keyblock */*key*/,
-	krb5_enctype /*etype*/,
-	const void */*constant*/,
-	size_t /*constant_len*/,
-	krb5_keyblock **/*derived_key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_alloc (
-	krb5_context /*context*/,
-	krb5_digest */*digest*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_digest_free (krb5_digest /*digest*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_get_client_binding (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	char **/*type*/,
-	char **/*binding*/);
-
-KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
-krb5_digest_get_identifier (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/);
-
-KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
-krb5_digest_get_opaque (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/);
-
-KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
-krb5_digest_get_rsp (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/);
-
-KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
-krb5_digest_get_server_nonce (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_get_session_key (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_get_tickets (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	Ticket **/*tickets*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_init_request (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	krb5_realm /*realm*/,
-	krb5_ccache /*ccache*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_probe (
-	krb5_context /*context*/,
-	krb5_realm /*realm*/,
-	krb5_ccache /*ccache*/,
-	unsigned */*flags*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_digest_rep_get_status (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_request (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	krb5_realm /*realm*/,
-	krb5_ccache /*ccache*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_authentication_user (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	krb5_principal /*authentication_user*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_authid (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*authid*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_client_nonce (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*nonce*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_digest (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*dgst*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_hostname (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*hostname*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_identifier (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_method (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*method*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_nonceCount (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*nonce_count*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_opaque (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*opaque*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_qop (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*qop*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_realm (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*realm*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_digest_set_responseData (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*response*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_server_cb (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*type*/,
-	const char */*binding*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_server_nonce (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*nonce*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_type (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*type*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_uri (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*uri*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_digest_set_username (
-	krb5_context /*context*/,
-	krb5_digest /*digest*/,
-	const char */*username*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_domain_x500_decode (
-	krb5_context /*context*/,
-	krb5_data /*tr*/,
-	char ***/*realms*/,
-	unsigned int */*num_realms*/,
-	const char */*client_realm*/,
-	const char */*server_realm*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_domain_x500_encode (
-	char **/*realms*/,
-	unsigned int /*num_realms*/,
-	krb5_data */*encoding*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_eai_to_heim_errno (
-	int /*eai_errno*/,
-	int /*system_error*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encode_Authenticator (
-	krb5_context /*context*/,
-	void */*data*/,
-	size_t /*length*/,
-	Authenticator */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encode_ETYPE_INFO (
-	krb5_context /*context*/,
-	void */*data*/,
-	size_t /*length*/,
-	ETYPE_INFO */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encode_ETYPE_INFO2 (
-	krb5_context /*context*/,
-	void */*data*/,
-	size_t /*length*/,
-	ETYPE_INFO2 */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encode_EncAPRepPart (
-	krb5_context /*context*/,
-	void */*data*/,
-	size_t /*length*/,
-	EncAPRepPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encode_EncASRepPart (
-	krb5_context /*context*/,
-	void */*data*/,
-	size_t /*length*/,
-	EncASRepPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encode_EncKrbCredPart (
-	krb5_context /*context*/,
-	void */*data*/,
-	size_t /*length*/,
-	EncKrbCredPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encode_EncTGSRepPart (
-	krb5_context /*context*/,
-	void */*data*/,
-	size_t /*length*/,
-	EncTGSRepPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encode_EncTicketPart (
-	krb5_context /*context*/,
-	void */*data*/,
-	size_t /*length*/,
-	EncTicketPart */*t*/,
-	size_t */*len*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encrypt (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	const void */*data*/,
-	size_t /*len*/,
-	krb5_data */*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encrypt_EncryptedData (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	void */*data*/,
-	size_t /*len*/,
-	int /*kvno*/,
-	EncryptedData */*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encrypt_iov_ivec (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	krb5_crypto_iov */*data*/,
-	int /*num_data*/,
-	void */*ivec*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_encrypt_ivec (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	const void */*data*/,
-	size_t /*len*/,
-	krb5_data */*result*/,
-	void */*ivec*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_enctype_disable (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_enctype_enable (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_enctype_keybits (
-	krb5_context /*context*/,
-	krb5_enctype /*type*/,
-	size_t */*keybits*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_enctype_keysize (
-	krb5_context /*context*/,
-	krb5_enctype /*type*/,
-	size_t */*keysize*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_enctype_to_keytype (
-	krb5_context /*context*/,
-	krb5_enctype /*etype*/,
-	krb5_keytype */*keytype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_enctype_to_string (
-	krb5_context /*context*/,
-	krb5_enctype /*etype*/,
-	char **/*string*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_enctype_valid (
-	krb5_context /*context*/,
-	krb5_enctype /*etype*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_enctypes_compatible_keys (
-	krb5_context /*context*/,
-	krb5_enctype /*etype1*/,
-	krb5_enctype /*etype2*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-krb5_error_code
-krb5_enomem (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_err (
-	krb5_context /*context*/,
-	int /*eval*/,
-	krb5_error_code /*code*/,
-	const char */*fmt*/,
-	...)
-     __attribute__ ((noreturn, format (printf, 4, 5)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_error_from_rd_error (
-	krb5_context /*context*/,
-	const krb5_error */*error*/,
-	const krb5_creds */*creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_errx (
-	krb5_context /*context*/,
-	int /*eval*/,
-	const char */*fmt*/,
-	...)
-     __attribute__ ((noreturn, format (printf, 3, 4)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_expand_hostname (
-	krb5_context /*context*/,
-	const char */*orig_hostname*/,
-	char **/*new_hostname*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_expand_hostname_realms (
-	krb5_context /*context*/,
-	const char */*orig_hostname*/,
-	char **/*new_hostname*/,
-	char ***/*realms*/);
-
-KRB5_LIB_FUNCTION PA_DATA * KRB5_LIB_CALL
-krb5_find_padata (
-	PA_DATA */*val*/,
-	unsigned /*len*/,
-	int /*type*/,
-	int */*idx*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_format_time (
-	krb5_context /*context*/,
-	time_t /*t*/,
-	char */*s*/,
-	size_t /*len*/,
-	krb5_boolean /*include_time*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_address (
-	krb5_context /*context*/,
-	krb5_address */*address*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_addresses (
-	krb5_context /*context*/,
-	krb5_addresses */*addresses*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_ap_rep_enc_part (
-	krb5_context /*context*/,
-	krb5_ap_rep_enc_part */*val*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_authenticator (
-	krb5_context /*context*/,
-	krb5_authenticator */*authenticator*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_checksum (
-	krb5_context /*context*/,
-	krb5_checksum */*cksum*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_checksum_contents (
-	krb5_context /*context*/,
-	krb5_checksum */*cksum*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_config_files (char **/*filenames*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_context (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_cred_contents (
-	krb5_context /*context*/,
-	krb5_creds */*c*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_creds (
-	krb5_context /*context*/,
-	krb5_creds */*c*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_creds_contents (
-	krb5_context /*context*/,
-	krb5_creds */*c*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_data (
-	krb5_context /*context*/,
-	krb5_data */*p*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_data_contents (
-	krb5_context /*context*/,
-	krb5_data */*data*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_default_realm (
-	krb5_context /*context*/,
-	krb5_realm /*realm*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_error (
-	krb5_context /*context*/,
-	krb5_error */*error*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_error_contents (
-	krb5_context /*context*/,
-	krb5_error */*error*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_error_message (
-	krb5_context /*context*/,
-	const char */*msg*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_error_string (
-	krb5_context /*context*/,
-	char */*str*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_host_realm (
-	krb5_context /*context*/,
-	krb5_realm */*realmlist*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_kdc_rep (
-	krb5_context /*context*/,
-	krb5_kdc_rep */*rep*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_keyblock (
-	krb5_context /*context*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_keyblock_contents (
-	krb5_context /*context*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_krbhst (
-	krb5_context /*context*/,
-	char **/*hostlist*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_principal (
-	krb5_context /*context*/,
-	krb5_principal /*p*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_salt (
-	krb5_context /*context*/,
-	krb5_salt /*salt*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_free_ticket (
-	krb5_context /*context*/,
-	krb5_ticket */*ticket*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_free_unparsed_name (
-	krb5_context /*context*/,
-	char */*str*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_fwd_tgt_creds (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	const char */*hostname*/,
-	krb5_principal /*client*/,
-	krb5_principal /*server*/,
-	krb5_ccache /*ccache*/,
-	int /*forwardable*/,
-	krb5_data */*out_data*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_generate_random_block (
-	void */*buf*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_generate_random_keyblock (
-	krb5_context /*context*/,
-	krb5_enctype /*type*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_generate_seq_number (
-	krb5_context /*context*/,
-	const krb5_keyblock */*key*/,
-	uint32_t */*seqno*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_generate_subkey (
-	krb5_context /*context*/,
-	const krb5_keyblock */*key*/,
-	krb5_keyblock **/*subkey*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_generate_subkey_extended (
-	krb5_context /*context*/,
-	const krb5_keyblock */*key*/,
-	krb5_enctype /*etype*/,
-	krb5_keyblock **/*subkey*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_all_client_addrs (
-	krb5_context /*context*/,
-	krb5_addresses */*res*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_all_server_addrs (
-	krb5_context /*context*/,
-	krb5_addresses */*res*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_cred_from_kdc (
-	krb5_context /*context*/,
-	krb5_ccache /*ccache*/,
-	krb5_creds */*in_creds*/,
-	krb5_creds **/*out_creds*/,
-	krb5_creds ***/*ret_tgts*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_cred_from_kdc_opt (
-	krb5_context /*context*/,
-	krb5_ccache /*ccache*/,
-	krb5_creds */*in_creds*/,
-	krb5_creds **/*out_creds*/,
-	krb5_creds ***/*ret_tgts*/,
-	krb5_flags /*flags*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_credentials (
-	krb5_context /*context*/,
-	krb5_flags /*options*/,
-	krb5_ccache /*ccache*/,
-	krb5_creds */*in_creds*/,
-	krb5_creds **/*out_creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_credentials_with_flags (
-	krb5_context /*context*/,
-	krb5_flags /*options*/,
-	krb5_kdc_flags /*flags*/,
-	krb5_ccache /*ccache*/,
-	krb5_creds */*in_creds*/,
-	krb5_creds **/*out_creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_creds (
-	krb5_context /*context*/,
-	krb5_get_creds_opt /*opt*/,
-	krb5_ccache /*ccache*/,
-	krb5_const_principal /*inprinc*/,
-	krb5_creds **/*out_creds*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_creds_opt_add_options (
-	krb5_context /*context*/,
-	krb5_get_creds_opt /*opt*/,
-	krb5_flags /*options*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_creds_opt_alloc (
-	krb5_context /*context*/,
-	krb5_get_creds_opt */*opt*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_creds_opt_free (
-	krb5_context /*context*/,
-	krb5_get_creds_opt /*opt*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_creds_opt_set_enctype (
-	krb5_context /*context*/,
-	krb5_get_creds_opt /*opt*/,
-	krb5_enctype /*enctype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_creds_opt_set_impersonate (
-	krb5_context /*context*/,
-	krb5_get_creds_opt /*opt*/,
-	krb5_const_principal /*self*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_creds_opt_set_options (
-	krb5_context /*context*/,
-	krb5_get_creds_opt /*opt*/,
-	krb5_flags /*options*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_creds_opt_set_ticket (
-	krb5_context /*context*/,
-	krb5_get_creds_opt /*opt*/,
-	const Ticket */*ticket*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_default_config_files (char ***/*pfilenames*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_default_in_tkt_etypes (
-	krb5_context /*context*/,
-	krb5_pdu /*pdu_type*/,
-	krb5_enctype **/*etypes*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_default_principal (
-	krb5_context /*context*/,
-	krb5_principal */*princ*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_default_realm (
-	krb5_context /*context*/,
-	krb5_realm */*realm*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_default_realms (
-	krb5_context /*context*/,
-	krb5_realm **/*realms*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_get_dns_canonicalize_hostname (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_get_err_text (
-	krb5_context /*context*/,
-	krb5_error_code /*code*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION const char * KRB5_LIB_CALL
-krb5_get_error_message (
-	krb5_context /*context*/,
-	krb5_error_code /*code*/);
-
-KRB5_LIB_FUNCTION char * KRB5_LIB_CALL
-krb5_get_error_string (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_extra_addresses (
-	krb5_context /*context*/,
-	krb5_addresses */*addresses*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_fcache_version (
-	krb5_context /*context*/,
-	int */*version*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_forwarded_creds (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_ccache /*ccache*/,
-	krb5_flags /*flags*/,
-	const char */*hostname*/,
-	krb5_creds */*in_creds*/,
-	krb5_data */*out_data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_host_realm (
-	krb5_context /*context*/,
-	const char */*targethost*/,
-	krb5_realm **/*realms*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_ignore_addresses (
-	krb5_context /*context*/,
-	krb5_addresses */*addresses*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_in_cred (
-	krb5_context /*context*/,
-	krb5_flags /*options*/,
-	const krb5_addresses */*addrs*/,
-	const krb5_enctype */*etypes*/,
-	const krb5_preauthtype */*ptypes*/,
-	const krb5_preauthdata */*preauth*/,
-	krb5_key_proc /*key_proc*/,
-	krb5_const_pointer /*keyseed*/,
-	krb5_decrypt_proc /*decrypt_proc*/,
-	krb5_const_pointer /*decryptarg*/,
-	krb5_creds */*creds*/,
-	krb5_kdc_rep */*ret_as_reply*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_in_tkt (
-	krb5_context /*context*/,
-	krb5_flags /*options*/,
-	const krb5_addresses */*addrs*/,
-	const krb5_enctype */*etypes*/,
-	const krb5_preauthtype */*ptypes*/,
-	krb5_key_proc /*key_proc*/,
-	krb5_const_pointer /*keyseed*/,
-	krb5_decrypt_proc /*decrypt_proc*/,
-	krb5_const_pointer /*decryptarg*/,
-	krb5_creds */*creds*/,
-	krb5_ccache /*ccache*/,
-	krb5_kdc_rep */*ret_as_reply*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_in_tkt_with_keytab (
-	krb5_context /*context*/,
-	krb5_flags /*options*/,
-	krb5_addresses */*addrs*/,
-	const krb5_enctype */*etypes*/,
-	const krb5_preauthtype */*pre_auth_types*/,
-	krb5_keytab /*keytab*/,
-	krb5_ccache /*ccache*/,
-	krb5_creds */*creds*/,
-	krb5_kdc_rep */*ret_as_reply*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_in_tkt_with_password (
-	krb5_context /*context*/,
-	krb5_flags /*options*/,
-	krb5_addresses */*addrs*/,
-	const krb5_enctype */*etypes*/,
-	const krb5_preauthtype */*pre_auth_types*/,
-	const char */*password*/,
-	krb5_ccache /*ccache*/,
-	krb5_creds */*creds*/,
-	krb5_kdc_rep */*ret_as_reply*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_in_tkt_with_skey (
-	krb5_context /*context*/,
-	krb5_flags /*options*/,
-	krb5_addresses */*addrs*/,
-	const krb5_enctype */*etypes*/,
-	const krb5_preauthtype */*pre_auth_types*/,
-	const krb5_keyblock */*key*/,
-	krb5_ccache /*ccache*/,
-	krb5_creds */*creds*/,
-	krb5_kdc_rep */*ret_as_reply*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_keyblock (
-	krb5_context /*context*/,
-	krb5_creds */*creds*/,
-	krb5_principal /*client*/,
-	krb5_keyblock */*keyblock*/,
-	krb5_deltat /*start_time*/,
-	const char */*in_tkt_service*/,
-	krb5_get_init_creds_opt */*options*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_keytab (
-	krb5_context /*context*/,
-	krb5_creds */*creds*/,
-	krb5_principal /*client*/,
-	krb5_keytab /*keytab*/,
-	krb5_deltat /*start_time*/,
-	const char */*in_tkt_service*/,
-	krb5_get_init_creds_opt */*options*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_opt_alloc (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt **/*opt*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_free (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_opt_get_error (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/,
-	KRB_ERROR **/*error*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_init (krb5_get_init_creds_opt */*opt*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_address_list (
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_addresses */*addresses*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_addressless (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_boolean /*addressless*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_anonymous (
-	krb5_get_init_creds_opt */*opt*/,
-	int /*anonymous*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_canonicalize (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_boolean /*req*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_default_flags (
-	krb5_context /*context*/,
-	const char */*appname*/,
-	krb5_const_realm /*realm*/,
-	krb5_get_init_creds_opt */*opt*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_etype_list (
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_enctype */*etype_list*/,
-	int /*etype_list_length*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_forwardable (
-	krb5_get_init_creds_opt */*opt*/,
-	int /*forwardable*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_pa_password (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/,
-	const char */*password*/,
-	krb5_s2k_proc /*key_proc*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_pac_request (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_boolean /*req_pac*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_pkinit (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_principal /*principal*/,
-	const char */*user_id*/,
-	const char */*x509_anchors*/,
-	char * const * /*pool*/,
-	char * const * /*pki_revoke*/,
-	int /*flags*/,
-	krb5_prompter_fct /*prompter*/,
-	void */*prompter_data*/,
-	char */*password*/);
-
-krb5_error_code KRB5_LIB_FUNCTION
-krb5_get_init_creds_opt_set_pkinit_user_certs (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/,
-	struct hx509_certs_data */*certs*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_preauth_list (
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_preauthtype */*preauth_list*/,
-	int /*preauth_list_length*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_process_last_req (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_gic_process_last_req /*func*/,
-	void */*ctx*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_proxiable (
-	krb5_get_init_creds_opt */*opt*/,
-	int /*proxiable*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_renew_life (
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_deltat /*renew_life*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_salt (
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_data */*salt*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_tkt_life (
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_deltat /*tkt_life*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_opt_set_win2k (
-	krb5_context /*context*/,
-	krb5_get_init_creds_opt */*opt*/,
-	krb5_boolean /*req*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_init_creds_password (
-	krb5_context /*context*/,
-	krb5_creds */*creds*/,
-	krb5_principal /*client*/,
-	const char */*password*/,
-	krb5_prompter_fct /*prompter*/,
-	void */*data*/,
-	krb5_deltat /*start_time*/,
-	const char */*in_tkt_service*/,
-	krb5_get_init_creds_opt */*options*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_kdc_cred (
-	krb5_context /*context*/,
-	krb5_ccache /*id*/,
-	krb5_kdc_flags /*flags*/,
-	krb5_addresses */*addresses*/,
-	Ticket */*second_ticket*/,
-	krb5_creds */*in_creds*/,
-	krb5_creds **out_creds );
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_kdc_sec_offset (
-	krb5_context /*context*/,
-	int32_t */*sec*/,
-	int32_t */*usec*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_krb524hst (
-	krb5_context /*context*/,
-	const krb5_realm */*realm*/,
-	char ***/*hostlist*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_krb_admin_hst (
-	krb5_context /*context*/,
-	const krb5_realm */*realm*/,
-	char ***/*hostlist*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_krb_changepw_hst (
-	krb5_context /*context*/,
-	const krb5_realm */*realm*/,
-	char ***/*hostlist*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_krbhst (
-	krb5_context /*context*/,
-	const krb5_realm */*realm*/,
-	char ***/*hostlist*/);
-
-KRB5_LIB_FUNCTION time_t KRB5_LIB_CALL
-krb5_get_max_time_skew (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_permitted_enctypes (
-	krb5_context /*context*/,
-	krb5_enctype **/*etypes*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_pw_salt (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/,
-	krb5_salt */*salt*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_renewed_creds (
-	krb5_context /*context*/,
-	krb5_creds */*creds*/,
-	krb5_const_principal /*client*/,
-	krb5_ccache /*ccache*/,
-	const char */*in_tkt_service*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_server_rcache (
-	krb5_context /*context*/,
-	const krb5_data */*piece*/,
-	krb5_rcache */*id*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_get_use_admin_kdc (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_get_validated_creds (
-	krb5_context /*context*/,
-	krb5_creds */*creds*/,
-	krb5_principal /*client*/,
-	krb5_ccache /*ccache*/,
-	char */*service*/);
-
-KRB5_LIB_FUNCTION krb5_log_facility * KRB5_LIB_CALL
-krb5_get_warn_dest (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL
-krb5_get_wrapped_length (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	size_t /*data_len*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_getportbyname (
-	krb5_context /*context*/,
-	const char */*service*/,
-	const char */*proto*/,
-	int /*default_port*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_h_addr2addr (
-	krb5_context /*context*/,
-	int /*af*/,
-	const char */*haddr*/,
-	krb5_address */*addr*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_h_addr2sockaddr (
-	krb5_context /*context*/,
-	int /*af*/,
-	const char */*addr*/,
-	struct sockaddr */*sa*/,
-	krb5_socklen_t */*sa_size*/,
-	int /*port*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_h_errno_to_heim_errno (int /*eai_errno*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_have_error_string (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_hmac (
-	krb5_context /*context*/,
-	krb5_cksumtype /*cktype*/,
-	const void */*data*/,
-	size_t /*len*/,
-	unsigned /*usage*/,
-	krb5_keyblock */*key*/,
-	Checksum */*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_context (krb5_context */*context*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_init_creds_free (
-	krb5_context /*context*/,
-	krb5_init_creds_context /*ctx*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_creds_get (
-	krb5_context /*context*/,
-	krb5_init_creds_context /*ctx*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_creds_get_creds (
-	krb5_context /*context*/,
-	krb5_init_creds_context /*ctx*/,
-	krb5_creds */*cred*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_creds_get_error (
-	krb5_context /*context*/,
-	krb5_init_creds_context /*ctx*/,
-	KRB_ERROR */*error*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_creds_init (
-	krb5_context /*context*/,
-	krb5_principal /*client*/,
-	krb5_prompter_fct /*prompter*/,
-	void */*prompter_data*/,
-	krb5_deltat /*start_time*/,
-	krb5_get_init_creds_opt */*options*/,
-	krb5_init_creds_context */*rctx*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_creds_set_keyblock (
-	krb5_context /*context*/,
-	krb5_init_creds_context /*ctx*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_creds_set_keytab (
-	krb5_context /*context*/,
-	krb5_init_creds_context /*ctx*/,
-	krb5_keytab /*keytab*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_creds_set_password (
-	krb5_context /*context*/,
-	krb5_init_creds_context /*ctx*/,
-	const char */*password*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_creds_set_service (
-	krb5_context /*context*/,
-	krb5_init_creds_context /*ctx*/,
-	const char */*service*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_init_creds_step (
-	krb5_context /*context*/,
-	krb5_init_creds_context /*ctx*/,
-	krb5_data */*in*/,
-	krb5_data */*out*/,
-	krb5_krbhst_info */*hostinfo*/,
-	unsigned int */*flags*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_init_ets (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_initlog (
-	krb5_context /*context*/,
-	const char */*program*/,
-	krb5_log_facility **/*fac*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_is_config_principal (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_is_thread_safe (void);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kcm_call (
-	krb5_context /*context*/,
-	krb5_storage */*request*/,
-	krb5_storage **/*response_p*/,
-	krb5_data */*response_data_p*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kcm_storage_request (
-	krb5_context /*context*/,
-	uint16_t /*opcode*/,
-	krb5_storage **/*storage_p*/);
-
-KRB5_LIB_FUNCTION const krb5_enctype * KRB5_LIB_CALL
-krb5_kerberos_enctypes (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_enctype KRB5_LIB_CALL
-krb5_keyblock_get_enctype (const krb5_keyblock */*block*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_keyblock_init (
-	krb5_context /*context*/,
-	krb5_enctype /*type*/,
-	const void */*data*/,
-	size_t /*size*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_keyblock_key_proc (
-	krb5_context /*context*/,
-	krb5_keytype /*type*/,
-	krb5_data */*salt*/,
-	krb5_const_pointer /*keyseed*/,
-	krb5_keyblock **/*key*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_keyblock_zero (krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_CALLCONV
-krb5_keytab_key_proc (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	krb5_salt /*salt*/,
-	krb5_const_pointer /*keyseed*/,
-	krb5_keyblock **/*key*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_keytype_to_enctypes (
-	krb5_context /*context*/,
-	krb5_keytype /*keytype*/,
-	unsigned */*len*/,
-	krb5_enctype **/*val*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_keytype_to_enctypes_default (
-	krb5_context /*context*/,
-	krb5_keytype /*keytype*/,
-	unsigned */*len*/,
-	krb5_enctype **/*val*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_keytype_to_string (
-	krb5_context /*context*/,
-	krb5_keytype /*keytype*/,
-	char **/*string*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_krbhst_format_string (
-	krb5_context /*context*/,
-	const krb5_krbhst_info */*host*/,
-	char */*hostname*/,
-	size_t /*hostlen*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_krbhst_free (
-	krb5_context /*context*/,
-	krb5_krbhst_handle /*handle*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_krbhst_get_addrinfo (
-	krb5_context /*context*/,
-	krb5_krbhst_info */*host*/,
-	struct addrinfo **/*ai*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_krbhst_init (
-	krb5_context /*context*/,
-	const char */*realm*/,
-	unsigned int /*type*/,
-	krb5_krbhst_handle */*handle*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_krbhst_init_flags (
-	krb5_context /*context*/,
-	const char */*realm*/,
-	unsigned int /*type*/,
-	int /*flags*/,
-	krb5_krbhst_handle */*handle*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_krbhst_next (
-	krb5_context /*context*/,
-	krb5_krbhst_handle /*handle*/,
-	krb5_krbhst_info **/*host*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_krbhst_next_as_string (
-	krb5_context /*context*/,
-	krb5_krbhst_handle /*handle*/,
-	char */*hostname*/,
-	size_t /*hostlen*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_krbhst_reset (
-	krb5_context /*context*/,
-	krb5_krbhst_handle /*handle*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_add_entry (
-	krb5_context /*context*/,
-	krb5_keytab /*id*/,
-	krb5_keytab_entry */*entry*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_close (
-	krb5_context /*context*/,
-	krb5_keytab /*id*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_kt_compare (
-	krb5_context /*context*/,
-	krb5_keytab_entry */*entry*/,
-	krb5_const_principal /*principal*/,
-	krb5_kvno /*vno*/,
-	krb5_enctype /*enctype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_copy_entry_contents (
-	krb5_context /*context*/,
-	const krb5_keytab_entry */*in*/,
-	krb5_keytab_entry */*out*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_default (
-	krb5_context /*context*/,
-	krb5_keytab */*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_default_modify_name (
-	krb5_context /*context*/,
-	char */*name*/,
-	size_t /*namesize*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_default_name (
-	krb5_context /*context*/,
-	char */*name*/,
-	size_t /*namesize*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_destroy (
-	krb5_context /*context*/,
-	krb5_keytab /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_end_seq_get (
-	krb5_context /*context*/,
-	krb5_keytab /*id*/,
-	krb5_kt_cursor */*cursor*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_free_entry (
-	krb5_context /*context*/,
-	krb5_keytab_entry */*entry*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_get_entry (
-	krb5_context /*context*/,
-	krb5_keytab /*id*/,
-	krb5_const_principal /*principal*/,
-	krb5_kvno /*kvno*/,
-	krb5_enctype /*enctype*/,
-	krb5_keytab_entry */*entry*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_get_full_name (
-	krb5_context /*context*/,
-	krb5_keytab /*keytab*/,
-	char **/*str*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_get_name (
-	krb5_context /*context*/,
-	krb5_keytab /*keytab*/,
-	char */*name*/,
-	size_t /*namesize*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_get_type (
-	krb5_context /*context*/,
-	krb5_keytab /*keytab*/,
-	char */*prefix*/,
-	size_t /*prefixsize*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_kt_have_content (
-	krb5_context /*context*/,
-	krb5_keytab /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_next_entry (
-	krb5_context /*context*/,
-	krb5_keytab /*id*/,
-	krb5_keytab_entry */*entry*/,
-	krb5_kt_cursor */*cursor*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_read_service_key (
-	krb5_context /*context*/,
-	krb5_pointer /*keyprocarg*/,
-	krb5_principal /*principal*/,
-	krb5_kvno /*vno*/,
-	krb5_enctype /*enctype*/,
-	krb5_keyblock **/*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_register (
-	krb5_context /*context*/,
-	const krb5_kt_ops */*ops*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_remove_entry (
-	krb5_context /*context*/,
-	krb5_keytab /*id*/,
-	krb5_keytab_entry */*entry*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_resolve (
-	krb5_context /*context*/,
-	const char */*name*/,
-	krb5_keytab */*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_kt_start_seq_get (
-	krb5_context /*context*/,
-	krb5_keytab /*id*/,
-	krb5_kt_cursor */*cursor*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_kuserok (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	const char */*luser*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_log (
-	krb5_context /*context*/,
-	krb5_log_facility */*fac*/,
-	int /*level*/,
-	const char */*fmt*/,
-	...)
-     __attribute__((format (printf, 4, 5)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_log_msg (
-	krb5_context /*context*/,
-	krb5_log_facility */*fac*/,
-	int /*level*/,
-	char **/*reply*/,
-	const char */*fmt*/,
-	...)
-     __attribute__((format (printf, 5, 6)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_make_addrport (
-	krb5_context /*context*/,
-	krb5_address **/*res*/,
-	const krb5_address */*addr*/,
-	int16_t /*port*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_make_principal (
-	krb5_context /*context*/,
-	krb5_principal */*principal*/,
-	krb5_const_realm /*realm*/,
-	...);
-
-KRB5_LIB_FUNCTION size_t KRB5_LIB_CALL
-krb5_max_sockaddr_size (void);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_mk_error (
-	krb5_context /*context*/,
-	krb5_error_code /*error_code*/,
-	const char */*e_text*/,
-	const krb5_data */*e_data*/,
-	const krb5_principal /*client*/,
-	const krb5_principal /*server*/,
-	time_t */*client_time*/,
-	int */*client_usec*/,
-	krb5_data */*reply*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_mk_priv (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	const krb5_data */*userdata*/,
-	krb5_data */*outbuf*/,
-	krb5_replay_data */*outdata*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_mk_rep (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_data */*outbuf*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_mk_req (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	const krb5_flags /*ap_req_options*/,
-	const char */*service*/,
-	const char */*hostname*/,
-	krb5_data */*in_data*/,
-	krb5_ccache /*ccache*/,
-	krb5_data */*outbuf*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_mk_req_exact (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	const krb5_flags /*ap_req_options*/,
-	const krb5_principal /*server*/,
-	krb5_data */*in_data*/,
-	krb5_ccache /*ccache*/,
-	krb5_data */*outbuf*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_mk_req_extended (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	const krb5_flags /*ap_req_options*/,
-	krb5_data */*in_data*/,
-	krb5_creds */*in_creds*/,
-	krb5_data */*outbuf*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_mk_safe (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	const krb5_data */*userdata*/,
-	krb5_data */*outbuf*/,
-	krb5_replay_data */*outdata*/);
-
-KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL
-krb5_net_read (
-	krb5_context /*context*/,
-	void */*p_fd*/,
-	void */*buf*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL
-krb5_net_write (
-	krb5_context /*context*/,
-	void */*p_fd*/,
-	const void */*buf*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL
-krb5_net_write_block (
-	krb5_context /*context*/,
-	void */*p_fd*/,
-	const void */*buf*/,
-	size_t /*len*/,
-	time_t /*timeout*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_alloc (
-	krb5_context /*context*/,
-	krb5_ntlm */*ntlm*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_free (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_init_get_challange (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	krb5_data */*challange*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_init_get_flags (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	uint32_t */*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_init_get_opaque (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	krb5_data */*opaque*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_init_get_targetinfo (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_init_get_targetname (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	char **/*name*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_init_request (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	krb5_realm /*realm*/,
-	krb5_ccache /*ccache*/,
-	uint32_t /*flags*/,
-	const char */*hostname*/,
-	const char */*domainname*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_rep_get_sessionkey (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_ntlm_rep_get_status (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_req_set_flags (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	uint32_t /*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_req_set_lm (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	void */*hash*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_req_set_ntlm (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	void */*hash*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_req_set_opaque (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	krb5_data */*opaque*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_req_set_session (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	void */*sessionkey*/,
-	size_t /*length*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_req_set_targetname (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	const char */*targetname*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_req_set_username (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	const char */*username*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ntlm_request (
-	krb5_context /*context*/,
-	krb5_ntlm /*ntlm*/,
-	krb5_realm /*realm*/,
-	krb5_ccache /*ccache*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_openlog (
-	krb5_context /*context*/,
-	const char */*program*/,
-	krb5_log_facility **/*fac*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_pac_add_buffer (
-	krb5_context /*context*/,
-	krb5_pac /*p*/,
-	uint32_t /*type*/,
-	const krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_pac_free (
-	krb5_context /*context*/,
-	krb5_pac /*pac*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_pac_get_buffer (
-	krb5_context /*context*/,
-	krb5_pac /*p*/,
-	uint32_t /*type*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_pac_get_types (
-	krb5_context /*context*/,
-	krb5_pac /*p*/,
-	size_t */*len*/,
-	uint32_t **/*types*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_pac_init (
-	krb5_context /*context*/,
-	krb5_pac */*pac*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_pac_parse (
-	krb5_context /*context*/,
-	const void */*ptr*/,
-	size_t /*len*/,
-	krb5_pac */*pac*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_pac_verify (
-	krb5_context /*context*/,
-	const krb5_pac /*pac*/,
-	time_t /*authtime*/,
-	krb5_const_principal /*principal*/,
-	const krb5_keyblock */*server*/,
-	const krb5_keyblock */*privsvr*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_padata_add (
-	krb5_context /*context*/,
-	METHOD_DATA */*md*/,
-	int /*type*/,
-	void */*buf*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_parse_address (
-	krb5_context /*context*/,
-	const char */*string*/,
-	krb5_addresses */*addresses*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_parse_name (
-	krb5_context /*context*/,
-	const char */*name*/,
-	krb5_principal */*principal*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_parse_name_flags (
-	krb5_context /*context*/,
-	const char */*name*/,
-	int /*flags*/,
-	krb5_principal */*principal*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_parse_nametype (
-	krb5_context /*context*/,
-	const char */*str*/,
-	int32_t */*nametype*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_passwd_result_to_string (
-	krb5_context /*context*/,
-	int /*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_CALLCONV
-krb5_password_key_proc (
-	krb5_context /*context*/,
-	krb5_enctype /*type*/,
-	krb5_salt /*salt*/,
-	krb5_const_pointer /*keyseed*/,
-	krb5_keyblock **/*key*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_pk_enterprise_cert (
-	krb5_context /*context*/,
-	const char */*user_id*/,
-	krb5_const_realm /*realm*/,
-	krb5_principal */*principal*/,
-	struct hx509_certs_data **/*res*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_plugin_register (
-	krb5_context /*context*/,
-	enum krb5_plugin_type /*type*/,
-	const char */*name*/,
-	void */*symbol*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_prepend_config_files (
-	const char */*filelist*/,
-	char **/*pq*/,
-	char ***/*ret_pp*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_prepend_config_files_default (
-	const char */*filelist*/,
-	char ***/*pfilenames*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_prepend_error_message (
-	krb5_context /*context*/,
-	krb5_error_code /*ret*/,
-	const char */*fmt*/,
-	...)
-     __attribute__ ((format (printf, 3, 4)));
-
-KRB5_LIB_FUNCTION krb5_realm * KRB5_LIB_CALL
-krb5_princ_realm (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_princ_set_realm (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	krb5_realm */*realm*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_principal_compare (
-	krb5_context /*context*/,
-	krb5_const_principal /*princ1*/,
-	krb5_const_principal /*princ2*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_principal_compare_any_realm (
-	krb5_context /*context*/,
-	krb5_const_principal /*princ1*/,
-	krb5_const_principal /*princ2*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_principal_get_comp_string (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/,
-	unsigned int /*component*/);
-
-KRB5_LIB_FUNCTION unsigned int KRB5_LIB_CALL
-krb5_principal_get_num_comp (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_principal_get_realm (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_principal_get_type (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_principal_is_krbtgt (
-	krb5_context /*context*/,
-	krb5_const_principal /*p*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_principal_match (
-	krb5_context /*context*/,
-	krb5_const_principal /*princ*/,
-	krb5_const_principal /*pattern*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_principal_set_realm (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	krb5_const_realm /*realm*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_principal_set_type (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	int /*type*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_print_address (
-	const krb5_address */*addr*/,
-	char */*str*/,
-	size_t /*len*/,
-	size_t */*ret_len*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_program_setup (
-	krb5_context */*context*/,
-	int /*argc*/,
-	char **/*argv*/,
-	struct getargs */*args*/,
-	int /*num_args*/,
-	void (KRB5_LIB_CALL *usage)(int, struct getargs*, int));
-
-KRB5_LIB_FUNCTION int KRB5_CALLCONV
-krb5_prompter_posix (
-	krb5_context /*context*/,
-	void */*data*/,
-	const char */*name*/,
-	const char */*banner*/,
-	int /*num_prompts*/,
-	krb5_prompt prompts[]);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_random_to_key (
-	krb5_context /*context*/,
-	krb5_enctype /*type*/,
-	const void */*data*/,
-	size_t /*size*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_close (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_default (
-	krb5_context /*context*/,
-	krb5_rcache */*id*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_rc_default_name (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_rc_default_type (krb5_context /*context*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_destroy (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_expunge (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_get_lifespan (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/,
-	krb5_deltat */*auth_lifespan*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_rc_get_name (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/);
-
-KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
-krb5_rc_get_type (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_initialize (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/,
-	krb5_deltat /*auth_lifespan*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_recover (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_resolve (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/,
-	const char */*name*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_resolve_full (
-	krb5_context /*context*/,
-	krb5_rcache */*id*/,
-	const char */*string_name*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_resolve_type (
-	krb5_context /*context*/,
-	krb5_rcache */*id*/,
-	const char */*type*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rc_store (
-	krb5_context /*context*/,
-	krb5_rcache /*id*/,
-	krb5_donot_replay */*rep*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_cred (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_data */*in_data*/,
-	krb5_creds ***/*ret_creds*/,
-	krb5_replay_data */*outdata*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_cred2 (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	krb5_ccache /*ccache*/,
-	krb5_data */*in_data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_error (
-	krb5_context /*context*/,
-	const krb5_data */*msg*/,
-	KRB_ERROR */*result*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_priv (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	const krb5_data */*inbuf*/,
-	krb5_data */*outbuf*/,
-	krb5_replay_data */*outdata*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_rep (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	const krb5_data */*inbuf*/,
-	krb5_ap_rep_enc_part **/*repl*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	const krb5_data */*inbuf*/,
-	krb5_const_principal /*server*/,
-	krb5_keytab /*keytab*/,
-	krb5_flags */*ap_req_options*/,
-	krb5_ticket **/*ticket*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_ctx (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	const krb5_data */*inbuf*/,
-	krb5_const_principal /*server*/,
-	krb5_rd_req_in_ctx /*inctx*/,
-	krb5_rd_req_out_ctx */*outctx*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_in_ctx_alloc (
-	krb5_context /*context*/,
-	krb5_rd_req_in_ctx */*ctx*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_rd_req_in_ctx_free (
-	krb5_context /*context*/,
-	krb5_rd_req_in_ctx /*ctx*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_in_set_keyblock (
-	krb5_context /*context*/,
-	krb5_rd_req_in_ctx /*in*/,
-	krb5_keyblock */*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_in_set_keytab (
-	krb5_context /*context*/,
-	krb5_rd_req_in_ctx /*in*/,
-	krb5_keytab /*keytab*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_in_set_pac_check (
-	krb5_context /*context*/,
-	krb5_rd_req_in_ctx /*in*/,
-	krb5_boolean /*flag*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_rd_req_out_ctx_free (
-	krb5_context /*context*/,
-	krb5_rd_req_out_ctx /*ctx*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_out_get_ap_req_options (
-	krb5_context /*context*/,
-	krb5_rd_req_out_ctx /*out*/,
-	krb5_flags */*ap_req_options*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_out_get_keyblock (
-	krb5_context /*context*/,
-	krb5_rd_req_out_ctx /*out*/,
-	krb5_keyblock **/*keyblock*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_out_get_server (
-	krb5_context /*context*/,
-	krb5_rd_req_out_ctx /*out*/,
-	krb5_principal */*principal*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_out_get_ticket (
-	krb5_context /*context*/,
-	krb5_rd_req_out_ctx /*out*/,
-	krb5_ticket **/*ticket*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_req_with_keyblock (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	const krb5_data */*inbuf*/,
-	krb5_const_principal /*server*/,
-	krb5_keyblock */*keyblock*/,
-	krb5_flags */*ap_req_options*/,
-	krb5_ticket **/*ticket*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_rd_safe (
-	krb5_context /*context*/,
-	krb5_auth_context /*auth_context*/,
-	const krb5_data */*inbuf*/,
-	krb5_data */*outbuf*/,
-	krb5_replay_data */*outdata*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_read_message (
-	krb5_context /*context*/,
-	krb5_pointer /*p_fd*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_read_priv_message (
-	krb5_context /*context*/,
-	krb5_auth_context /*ac*/,
-	krb5_pointer /*p_fd*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_read_safe_message (
-	krb5_context /*context*/,
-	krb5_auth_context /*ac*/,
-	krb5_pointer /*p_fd*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_realm_compare (
-	krb5_context /*context*/,
-	krb5_const_principal /*princ1*/,
-	krb5_const_principal /*princ2*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_recvauth (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	krb5_pointer /*p_fd*/,
-	const char */*appl_version*/,
-	krb5_principal /*server*/,
-	int32_t /*flags*/,
-	krb5_keytab /*keytab*/,
-	krb5_ticket **/*ticket*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_recvauth_match_version (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	krb5_pointer /*p_fd*/,
-	krb5_boolean (*/*match_appl_version*/)(const void *, const char*),
-	const void */*match_data*/,
-	krb5_principal /*server*/,
-	int32_t /*flags*/,
-	krb5_keytab /*keytab*/,
-	krb5_ticket **/*ticket*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_address (
-	krb5_storage */*sp*/,
-	krb5_address */*adr*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_addrs (
-	krb5_storage */*sp*/,
-	krb5_addresses */*adr*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_authdata (
-	krb5_storage */*sp*/,
-	krb5_authdata */*auth*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_creds (
-	krb5_storage */*sp*/,
-	krb5_creds */*creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_creds_tag (
-	krb5_storage */*sp*/,
-	krb5_creds */*creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_data (
-	krb5_storage */*sp*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_int16 (
-	krb5_storage */*sp*/,
-	int16_t */*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_int32 (
-	krb5_storage */*sp*/,
-	int32_t */*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_int8 (
-	krb5_storage */*sp*/,
-	int8_t */*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_keyblock (
-	krb5_storage */*sp*/,
-	krb5_keyblock */*p*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_principal (
-	krb5_storage */*sp*/,
-	krb5_principal */*princ*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_string (
-	krb5_storage */*sp*/,
-	char **/*string*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_stringnl (
-	krb5_storage */*sp*/,
-	char **/*string*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_stringz (
-	krb5_storage */*sp*/,
-	char **/*string*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_times (
-	krb5_storage */*sp*/,
-	krb5_times */*times*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_uint16 (
-	krb5_storage */*sp*/,
-	uint16_t */*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_uint32 (
-	krb5_storage */*sp*/,
-	uint32_t */*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ret_uint8 (
-	krb5_storage */*sp*/,
-	uint8_t */*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_salttype_to_string (
-	krb5_context /*context*/,
-	krb5_enctype /*etype*/,
-	krb5_salttype /*stype*/,
-	char **/*string*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sendauth (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	krb5_pointer /*p_fd*/,
-	const char */*appl_version*/,
-	krb5_principal /*client*/,
-	krb5_principal /*server*/,
-	krb5_flags /*ap_req_options*/,
-	krb5_data */*in_data*/,
-	krb5_creds */*in_creds*/,
-	krb5_ccache /*ccache*/,
-	krb5_error **/*ret_error*/,
-	krb5_ap_rep_enc_part **/*rep_result*/,
-	krb5_creds **/*out_creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sendto (
-	krb5_context /*context*/,
-	const krb5_data */*send_data*/,
-	krb5_krbhst_handle /*handle*/,
-	krb5_data */*receive*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sendto_context (
-	krb5_context /*context*/,
-	krb5_sendto_ctx /*ctx*/,
-	const krb5_data */*send_data*/,
-	const krb5_realm /*realm*/,
-	krb5_data */*receive*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_sendto_ctx_add_flags (
-	krb5_sendto_ctx /*ctx*/,
-	int /*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sendto_ctx_alloc (
-	krb5_context /*context*/,
-	krb5_sendto_ctx */*ctx*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_sendto_ctx_free (
-	krb5_context /*context*/,
-	krb5_sendto_ctx /*ctx*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_sendto_ctx_get_flags (krb5_sendto_ctx /*ctx*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_sendto_ctx_set_func (
-	krb5_sendto_ctx /*ctx*/,
-	krb5_sendto_ctx_func /*func*/,
-	void */*data*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_sendto_ctx_set_type (
-	krb5_sendto_ctx /*ctx*/,
-	int /*type*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sendto_kdc (
-	krb5_context /*context*/,
-	const krb5_data */*send_data*/,
-	const krb5_realm */*realm*/,
-	krb5_data */*receive*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sendto_kdc_flags (
-	krb5_context /*context*/,
-	const krb5_data */*send_data*/,
-	const krb5_realm */*realm*/,
-	krb5_data */*receive*/,
-	int /*flags*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_config_files (
-	krb5_context /*context*/,
-	char **/*filenames*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_default_in_tkt_etypes (
-	krb5_context /*context*/,
-	const krb5_enctype */*etypes*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_default_realm (
-	krb5_context /*context*/,
-	const char */*realm*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_set_dns_canonicalize_hostname (
-	krb5_context /*context*/,
-	krb5_boolean /*flag*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_set_error_message (
-	krb5_context /*context*/,
-	krb5_error_code /*ret*/,
-	const char */*fmt*/,
-	...)
-     __attribute__ ((format (printf, 3, 4)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_error_string (
-	krb5_context /*context*/,
-	const char */*fmt*/,
-	...)
-     __attribute__((format (printf, 2, 3))) KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_extra_addresses (
-	krb5_context /*context*/,
-	const krb5_addresses */*addresses*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_fcache_version (
-	krb5_context /*context*/,
-	int /*version*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_set_home_dir_access (
-	krb5_context /*context*/,
-	krb5_boolean /*allow*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_ignore_addresses (
-	krb5_context /*context*/,
-	const krb5_addresses */*addresses*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_kdc_sec_offset (
-	krb5_context /*context*/,
-	int32_t /*sec*/,
-	int32_t /*usec*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_set_max_time_skew (
-	krb5_context /*context*/,
-	time_t /*t*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_password (
-	krb5_context /*context*/,
-	krb5_creds */*creds*/,
-	const char */*newpw*/,
-	krb5_principal /*targprinc*/,
-	int */*result_code*/,
-	krb5_data */*result_code_string*/,
-	krb5_data */*result_string*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_password_using_ccache (
-	krb5_context /*context*/,
-	krb5_ccache /*ccache*/,
-	const char */*newpw*/,
-	krb5_principal /*targprinc*/,
-	int */*result_code*/,
-	krb5_data */*result_code_string*/,
-	krb5_data */*result_string*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_real_time (
-	krb5_context /*context*/,
-	krb5_timestamp /*sec*/,
-	int32_t /*usec*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_send_to_kdc_func (
-	krb5_context /*context*/,
-	krb5_send_to_kdc_func /*func*/,
-	void */*data*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_set_use_admin_kdc (
-	krb5_context /*context*/,
-	krb5_boolean /*flag*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_set_warn_dest (
-	krb5_context /*context*/,
-	krb5_log_facility */*fac*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sname_to_principal (
-	krb5_context /*context*/,
-	const char */*hostname*/,
-	const char */*sname*/,
-	int32_t /*type*/,
-	krb5_principal */*ret_princ*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sock_to_principal (
-	krb5_context /*context*/,
-	int /*sock*/,
-	const char */*sname*/,
-	int32_t /*type*/,
-	krb5_principal */*ret_princ*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sockaddr2address (
-	krb5_context /*context*/,
-	const struct sockaddr */*sa*/,
-	krb5_address */*addr*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_sockaddr2port (
-	krb5_context /*context*/,
-	const struct sockaddr */*sa*/,
-	int16_t */*port*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_sockaddr_is_loopback (const struct sockaddr */*sa*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_sockaddr_uninteresting (const struct sockaddr */*sa*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_std_usage (
-	int /*code*/,
-	struct getargs */*args*/,
-	int /*num_args*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_storage_clear_flags (
-	krb5_storage */*sp*/,
-	krb5_flags /*flags*/);
-
-KRB5_LIB_FUNCTION krb5_storage * KRB5_LIB_CALL
-krb5_storage_emem (void);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_storage_free (krb5_storage */*sp*/);
-
-KRB5_LIB_FUNCTION krb5_storage * KRB5_LIB_CALL
-krb5_storage_from_data (krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_storage * KRB5_LIB_CALL
-krb5_storage_from_fd (krb5_socket_t /*fd_in*/);
-
-KRB5_LIB_FUNCTION krb5_storage * KRB5_LIB_CALL
-krb5_storage_from_mem (
-	void */*buf*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_storage * KRB5_LIB_CALL
-krb5_storage_from_readonly_mem (
-	const void */*buf*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_flags KRB5_LIB_CALL
-krb5_storage_get_byteorder (krb5_storage */*sp*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_storage_get_eof_code (krb5_storage */*sp*/);
-
-KRB5_LIB_FUNCTION krb5_boolean KRB5_LIB_CALL
-krb5_storage_is_flags (
-	krb5_storage */*sp*/,
-	krb5_flags /*flags*/);
-
-KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL
-krb5_storage_read (
-	krb5_storage */*sp*/,
-	void */*buf*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION off_t KRB5_LIB_CALL
-krb5_storage_seek (
-	krb5_storage */*sp*/,
-	off_t /*offset*/,
-	int /*whence*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_storage_set_byteorder (
-	krb5_storage */*sp*/,
-	krb5_flags /*byteorder*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_storage_set_eof_code (
-	krb5_storage */*sp*/,
-	int /*code*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_storage_set_flags (
-	krb5_storage */*sp*/,
-	krb5_flags /*flags*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_storage_set_max_alloc (
-	krb5_storage */*sp*/,
-	size_t /*size*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_storage_to_data (
-	krb5_storage */*sp*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_storage_truncate (
-	krb5_storage */*sp*/,
-	off_t /*offset*/);
-
-KRB5_LIB_FUNCTION krb5_ssize_t KRB5_LIB_CALL
-krb5_storage_write (
-	krb5_storage */*sp*/,
-	const void */*buf*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_address (
-	krb5_storage */*sp*/,
-	krb5_address /*p*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_addrs (
-	krb5_storage */*sp*/,
-	krb5_addresses /*p*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_authdata (
-	krb5_storage */*sp*/,
-	krb5_authdata /*auth*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_creds (
-	krb5_storage */*sp*/,
-	krb5_creds */*creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_creds_tag (
-	krb5_storage */*sp*/,
-	krb5_creds */*creds*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_data (
-	krb5_storage */*sp*/,
-	krb5_data /*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_int16 (
-	krb5_storage */*sp*/,
-	int16_t /*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_int32 (
-	krb5_storage */*sp*/,
-	int32_t /*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_int8 (
-	krb5_storage */*sp*/,
-	int8_t /*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_keyblock (
-	krb5_storage */*sp*/,
-	krb5_keyblock /*p*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_principal (
-	krb5_storage */*sp*/,
-	krb5_const_principal /*p*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_string (
-	krb5_storage */*sp*/,
-	const char */*s*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_stringnl (
-	krb5_storage */*sp*/,
-	const char */*s*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_stringz (
-	krb5_storage */*sp*/,
-	const char */*s*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_times (
-	krb5_storage */*sp*/,
-	krb5_times /*times*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_uint16 (
-	krb5_storage */*sp*/,
-	uint16_t /*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_uint32 (
-	krb5_storage */*sp*/,
-	uint32_t /*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_store_uint8 (
-	krb5_storage */*sp*/,
-	uint8_t /*value*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_deltat (
-	const char */*string*/,
-	krb5_deltat */*deltat*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_enctype (
-	krb5_context /*context*/,
-	const char */*string*/,
-	krb5_enctype */*etype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_key (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	const char */*password*/,
-	krb5_principal /*principal*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_key_data (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	krb5_data /*password*/,
-	krb5_principal /*principal*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_key_data_salt (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	krb5_data /*password*/,
-	krb5_salt /*salt*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_key_data_salt_opaque (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	krb5_data /*password*/,
-	krb5_salt /*salt*/,
-	krb5_data /*opaque*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_key_derived (
-	krb5_context /*context*/,
-	const void */*str*/,
-	size_t /*len*/,
-	krb5_enctype /*etype*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_key_salt (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	const char */*password*/,
-	krb5_salt /*salt*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_key_salt_opaque (
-	krb5_context /*context*/,
-	krb5_enctype /*enctype*/,
-	const char */*password*/,
-	krb5_salt /*salt*/,
-	krb5_data /*opaque*/,
-	krb5_keyblock */*key*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_keytype (
-	krb5_context /*context*/,
-	const char */*string*/,
-	krb5_keytype */*keytype*/)
-     KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_string_to_salttype (
-	krb5_context /*context*/,
-	krb5_enctype /*etype*/,
-	const char */*string*/,
-	krb5_salttype */*salttype*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ticket_get_authorization_data_type (
-	krb5_context /*context*/,
-	krb5_ticket */*ticket*/,
-	int /*type*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ticket_get_client (
-	krb5_context /*context*/,
-	const krb5_ticket */*ticket*/,
-	krb5_principal */*client*/);
-
-KRB5_LIB_FUNCTION time_t KRB5_LIB_CALL
-krb5_ticket_get_endtime (
-	krb5_context /*context*/,
-	const krb5_ticket */*ticket*/);
-
-KRB5_LIB_FUNCTION unsigned long KRB5_LIB_CALL
-krb5_ticket_get_flags (
-	krb5_context /*context*/,
-	const krb5_ticket */*ticket*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_ticket_get_server (
-	krb5_context /*context*/,
-	const krb5_ticket */*ticket*/,
-	krb5_principal */*server*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_timeofday (
-	krb5_context /*context*/,
-	krb5_timestamp */*timeret*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_unparse_name (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/,
-	char **/*name*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_unparse_name_fixed (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/,
-	char */*name*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_unparse_name_fixed_flags (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/,
-	int /*flags*/,
-	char */*name*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_unparse_name_fixed_short (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/,
-	char */*name*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_unparse_name_flags (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/,
-	int /*flags*/,
-	char **/*name*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_unparse_name_short (
-	krb5_context /*context*/,
-	krb5_const_principal /*principal*/,
-	char **/*name*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_us_timeofday (
-	krb5_context /*context*/,
-	krb5_timestamp */*sec*/,
-	int32_t */*usec*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_vabort (
-	krb5_context /*context*/,
-	krb5_error_code /*code*/,
-	const char */*fmt*/,
-	va_list /*ap*/)
-     __attribute__ ((noreturn, format (printf, 3, 0)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_vabortx (
-	krb5_context /*context*/,
-	const char */*fmt*/,
-	va_list /*ap*/)
-     __attribute__ ((noreturn, format (printf, 2, 0)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verify_ap_req (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	krb5_ap_req */*ap_req*/,
-	krb5_const_principal /*server*/,
-	krb5_keyblock */*keyblock*/,
-	krb5_flags /*flags*/,
-	krb5_flags */*ap_req_options*/,
-	krb5_ticket **/*ticket*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verify_ap_req2 (
-	krb5_context /*context*/,
-	krb5_auth_context */*auth_context*/,
-	krb5_ap_req */*ap_req*/,
-	krb5_const_principal /*server*/,
-	krb5_keyblock */*keyblock*/,
-	krb5_flags /*flags*/,
-	krb5_flags */*ap_req_options*/,
-	krb5_ticket **/*ticket*/,
-	krb5_key_usage /*usage*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verify_authenticator_checksum (
-	krb5_context /*context*/,
-	krb5_auth_context /*ac*/,
-	void */*data*/,
-	size_t /*len*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verify_checksum (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	krb5_key_usage /*usage*/,
-	void */*data*/,
-	size_t /*len*/,
-	Checksum */*cksum*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verify_checksum_iov (
-	krb5_context /*context*/,
-	krb5_crypto /*crypto*/,
-	unsigned /*usage*/,
-	krb5_crypto_iov */*data*/,
-	unsigned int /*num_data*/,
-	krb5_cksumtype */*type*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verify_init_creds (
-	krb5_context /*context*/,
-	krb5_creds */*creds*/,
-	krb5_principal /*ap_req_server*/,
-	krb5_keytab /*ap_req_keytab*/,
-	krb5_ccache */*ccache*/,
-	krb5_verify_init_creds_opt */*options*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_verify_init_creds_opt_init (krb5_verify_init_creds_opt */*options*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_verify_init_creds_opt_set_ap_req_nofail (
-	krb5_verify_init_creds_opt */*options*/,
-	int /*ap_req_nofail*/);
-
-KRB5_LIB_FUNCTION int KRB5_LIB_CALL
-krb5_verify_opt_alloc (
-	krb5_context /*context*/,
-	krb5_verify_opt **/*opt*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_verify_opt_free (krb5_verify_opt */*opt*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_verify_opt_init (krb5_verify_opt */*opt*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_verify_opt_set_ccache (
-	krb5_verify_opt */*opt*/,
-	krb5_ccache /*ccache*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_verify_opt_set_flags (
-	krb5_verify_opt */*opt*/,
-	unsigned int /*flags*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_verify_opt_set_keytab (
-	krb5_verify_opt */*opt*/,
-	krb5_keytab /*keytab*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_verify_opt_set_secure (
-	krb5_verify_opt */*opt*/,
-	krb5_boolean /*secure*/);
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_verify_opt_set_service (
-	krb5_verify_opt */*opt*/,
-	const char */*service*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verify_user (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	krb5_ccache /*ccache*/,
-	const char */*password*/,
-	krb5_boolean /*secure*/,
-	const char */*service*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verify_user_lrealm (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	krb5_ccache /*ccache*/,
-	const char */*password*/,
-	krb5_boolean /*secure*/,
-	const char */*service*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verify_user_opt (
-	krb5_context /*context*/,
-	krb5_principal /*principal*/,
-	const char */*password*/,
-	krb5_verify_opt */*opt*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verr (
-	krb5_context /*context*/,
-	int /*eval*/,
-	krb5_error_code /*code*/,
-	const char */*fmt*/,
-	va_list /*ap*/)
-     __attribute__ ((noreturn, format (printf, 4, 0)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_verrx (
-	krb5_context /*context*/,
-	int /*eval*/,
-	const char */*fmt*/,
-	va_list /*ap*/)
-     __attribute__ ((noreturn, format (printf, 3, 0)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_vlog (
-	krb5_context /*context*/,
-	krb5_log_facility */*fac*/,
-	int /*level*/,
-	const char */*fmt*/,
-	va_list /*ap*/)
-     __attribute__((format (printf, 4, 0)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_vlog_msg (
-	krb5_context /*context*/,
-	krb5_log_facility */*fac*/,
-	char **/*reply*/,
-	int /*level*/,
-	const char */*fmt*/,
-	va_list /*ap*/)
-     __attribute__((format (printf, 5, 0)));
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_vprepend_error_message (
-	krb5_context /*context*/,
-	krb5_error_code /*ret*/,
-	const char */*fmt*/,
-	va_list /*args*/)
-     __attribute__ ((format (printf, 3, 0)));
-
-KRB5_LIB_FUNCTION void KRB5_LIB_CALL
-krb5_vset_error_message (
-	krb5_context /*context*/,
-	krb5_error_code /*ret*/,
-	const char */*fmt*/,
-	va_list /*args*/)
-     __attribute__ ((format (printf, 3, 0)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_vset_error_string (
-	krb5_context /*context*/,
-	const char */*fmt*/,
-	va_list /*args*/)
-     __attribute__ ((format (printf, 2, 0))) KRB5_DEPRECATED_FUNCTION("Use X instead");
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_vwarn (
-	krb5_context /*context*/,
-	krb5_error_code /*code*/,
-	const char */*fmt*/,
-	va_list /*ap*/)
-     __attribute__ ((format (printf, 3, 0)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_vwarnx (
-	krb5_context /*context*/,
-	const char */*fmt*/,
-	va_list /*ap*/)
-     __attribute__ ((format (printf, 2, 0)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_warn (
-	krb5_context /*context*/,
-	krb5_error_code /*code*/,
-	const char */*fmt*/,
-	...)
-     __attribute__ ((format (printf, 3, 4)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_warnx (
-	krb5_context /*context*/,
-	const char */*fmt*/,
-	...)
-     __attribute__ ((format (printf, 2, 3)));
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_write_message (
-	krb5_context /*context*/,
-	krb5_pointer /*p_fd*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_write_priv_message (
-	krb5_context /*context*/,
-	krb5_auth_context /*ac*/,
-	krb5_pointer /*p_fd*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_write_safe_message (
-	krb5_context /*context*/,
-	krb5_auth_context /*ac*/,
-	krb5_pointer /*p_fd*/,
-	krb5_data */*data*/);
-
-KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
-krb5_xfree (void */*ptr*/);
-
-#ifdef __cplusplus
-}
-#endif
-
-#undef KRB5_DEPRECATED_FUNCTION
-
-#endif /* __krb5_protos_h__ */
diff --git a/include.new/krb5-types.h b/include.new/krb5-types.h
deleted file mode 100644
index 747cc73..0000000
--- a/include.new/krb5-types.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * generic krb5-types.h for cross compiling, assume system is posix/sus
- */
-
-/* $FreeBSD: releng/10.2/kerberos5/include/krb5-types.h 233294 2012-03-22 08:48:42Z stas $ */
-
-#ifndef __krb5_types_h__
-#define __krb5_types_h__
-
-#include <inttypes.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-typedef socklen_t krb5_socklen_t;
-#include <unistd.h>
-typedef ssize_t krb5_ssize_t;
-
-#if !defined(__has_extension)
-#define __has_extension(x) 0
-#endif
-
-#define KRB5TYPES_REQUIRE_GNUC(m,n,p) \
-    (((__GNUC__ * 10000) + (__GNUC_MINOR__ * 100) + __GNUC_PATCHLEVEL__) >= \
-     (((m) * 10000) + ((n) * 100) + (p)))
-
-
-#ifndef HEIMDAL_DEPRECATED
-#if __has_extension(deprecated) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_DEPRECATED __attribute__((deprecated))
-#elif defined(_MSC_VER) && (_MSC_VER>1200)
-#define HEIMDAL_DEPRECATED __declspec(deprecated)
-#else
-#define HEIMDAL_DEPRECATED
-#endif
-#endif
-
-#ifndef HEIMDAL_PRINTF_ATTRIBUTE
-#if __has_extension(format) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_PRINTF_ATTRIBUTE(x) __attribute__((format x))
-#else
-#define HEIMDAL_PRINTF_ATTRIBUTE(x)
-#endif
-#endif
-
-#ifndef HEIMDAL_NORETURN_ATTRIBUTE
-#if __has_extension(noreturn) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_NORETURN_ATTRIBUTE __attribute__((noreturn))
-#else
-#define HEIMDAL_NORETURN_ATTRIBUTE
-#endif
-#endif
-
-#ifndef HEIMDAL_UNUSED_ATTRIBUTE
-#if __has_extension(unused) || KRB5TYPES_REQUIRE_GNUC(3,1,0)
-#define HEIMDAL_UNUSED_ATTRIBUTE __attribute__((unused))
-#else
-#define HEIMDAL_UNUSED_ATTRIBUTE
-#endif
-#endif
-
-typedef int krb5_socket_t;
-
-#endif /* __krb5_types_h__ */
diff --git a/include.new/krb5.h b/include.new/krb5.h
deleted file mode 100644
index 1b5fbdf..0000000
--- a/include.new/krb5.h
+++ /dev/null
@@ -1,916 +0,0 @@
-/*
- * Copyright (c) 1997 - 2007 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- *
- * Portions Copyright (c) 2009 Apple Inc. 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id: krb5.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __KRB5_H__
-#define __KRB5_H__
-
-#include <time.h>
-#include <krb5-types.h>
-
-#include <asn1_err.h>
-#include <krb5_err.h>
-#include <heim_err.h>
-#include <k524_err.h>
-
-#include <krb5_asn1.h>
-
-/* name confusion with MIT */
-#ifndef KRB5KDC_ERR_KEY_EXP
-#define KRB5KDC_ERR_KEY_EXP KRB5KDC_ERR_KEY_EXPIRED
-#endif
-
-#ifdef _WIN32
-#define KRB5_CALLCONV __stdcall
-#else
-#define KRB5_CALLCONV
-#endif
-
-/* simple constants */
-
-#ifndef TRUE
-#define TRUE  1
-#define FALSE 0
-#endif
-
-typedef int krb5_boolean;
-
-typedef int32_t krb5_error_code;
-
-typedef int32_t krb5_kvno;
-
-typedef uint32_t krb5_flags;
-
-typedef void *krb5_pointer;
-typedef const void *krb5_const_pointer;
-
-struct krb5_crypto_data;
-typedef struct krb5_crypto_data *krb5_crypto;
-
-struct krb5_get_creds_opt_data;
-typedef struct krb5_get_creds_opt_data *krb5_get_creds_opt;
-
-struct krb5_digest_data;
-typedef struct krb5_digest_data *krb5_digest;
-struct krb5_ntlm_data;
-typedef struct krb5_ntlm_data *krb5_ntlm;
-
-struct krb5_pac_data;
-typedef struct krb5_pac_data *krb5_pac;
-
-typedef struct krb5_rd_req_in_ctx_data *krb5_rd_req_in_ctx;
-typedef struct krb5_rd_req_out_ctx_data *krb5_rd_req_out_ctx;
-
-typedef CKSUMTYPE krb5_cksumtype;
-
-typedef Checksum krb5_checksum;
-
-typedef ENCTYPE krb5_enctype;
-
-typedef struct krb5_get_init_creds_ctx *krb5_init_creds_context;
-
-typedef heim_octet_string krb5_data;
-
-/* PKINIT related forward declarations */
-struct ContentInfo;
-struct krb5_pk_identity;
-struct krb5_pk_cert;
-
-/* krb5_enc_data is a mit compat structure */
-typedef struct krb5_enc_data {
-    krb5_enctype enctype;
-    krb5_kvno kvno;
-    krb5_data ciphertext;
-} krb5_enc_data;
-
-/* alternative names */
-enum {
-    ENCTYPE_NULL		= KRB5_ENCTYPE_NULL,
-    ENCTYPE_DES_CBC_CRC		= KRB5_ENCTYPE_DES_CBC_CRC,
-    ENCTYPE_DES_CBC_MD4		= KRB5_ENCTYPE_DES_CBC_MD4,
-    ENCTYPE_DES_CBC_MD5		= KRB5_ENCTYPE_DES_CBC_MD5,
-    ENCTYPE_DES3_CBC_MD5	= KRB5_ENCTYPE_DES3_CBC_MD5,
-    ENCTYPE_OLD_DES3_CBC_SHA1	= KRB5_ENCTYPE_OLD_DES3_CBC_SHA1,
-    ENCTYPE_SIGN_DSA_GENERATE	= KRB5_ENCTYPE_SIGN_DSA_GENERATE,
-    ENCTYPE_ENCRYPT_RSA_PRIV	= KRB5_ENCTYPE_ENCRYPT_RSA_PRIV,
-    ENCTYPE_ENCRYPT_RSA_PUB	= KRB5_ENCTYPE_ENCRYPT_RSA_PUB,
-    ENCTYPE_DES3_CBC_SHA1	= KRB5_ENCTYPE_DES3_CBC_SHA1,
-    ENCTYPE_AES128_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96,
-    ENCTYPE_AES256_CTS_HMAC_SHA1_96 = KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96,
-    ENCTYPE_ARCFOUR_HMAC	= KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
-    ENCTYPE_ARCFOUR_HMAC_MD5	= KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
-    ENCTYPE_ARCFOUR_HMAC_MD5_56	= KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56,
-    ENCTYPE_ENCTYPE_PK_CROSS	= KRB5_ENCTYPE_ENCTYPE_PK_CROSS,
-    ENCTYPE_DES_CBC_NONE	= KRB5_ENCTYPE_DES_CBC_NONE,
-    ENCTYPE_DES3_CBC_NONE	= KRB5_ENCTYPE_DES3_CBC_NONE,
-    ENCTYPE_DES_CFB64_NONE	= KRB5_ENCTYPE_DES_CFB64_NONE,
-    ENCTYPE_DES_PCBC_NONE	= KRB5_ENCTYPE_DES_PCBC_NONE,
-    ETYPE_NULL			= KRB5_ENCTYPE_NULL,
-    ETYPE_DES_CBC_CRC		= KRB5_ENCTYPE_DES_CBC_CRC,
-    ETYPE_DES_CBC_MD4		= KRB5_ENCTYPE_DES_CBC_MD4,
-    ETYPE_DES_CBC_MD5		= KRB5_ENCTYPE_DES_CBC_MD5,
-    ETYPE_DES3_CBC_MD5		= KRB5_ENCTYPE_DES3_CBC_MD5,
-    ETYPE_OLD_DES3_CBC_SHA1	= KRB5_ENCTYPE_OLD_DES3_CBC_SHA1,
-    ETYPE_SIGN_DSA_GENERATE	= KRB5_ENCTYPE_SIGN_DSA_GENERATE,
-    ETYPE_ENCRYPT_RSA_PRIV	= KRB5_ENCTYPE_ENCRYPT_RSA_PRIV,
-    ETYPE_ENCRYPT_RSA_PUB	= KRB5_ENCTYPE_ENCRYPT_RSA_PUB,
-    ETYPE_DES3_CBC_SHA1		= KRB5_ENCTYPE_DES3_CBC_SHA1,
-    ETYPE_AES128_CTS_HMAC_SHA1_96	= KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96,
-    ETYPE_AES256_CTS_HMAC_SHA1_96	= KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96,
-    ETYPE_ARCFOUR_HMAC_MD5	= KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
-    ETYPE_ARCFOUR_HMAC_MD5_56	= KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56,
-    ETYPE_ENCTYPE_PK_CROSS	= KRB5_ENCTYPE_ENCTYPE_PK_CROSS,
-    ETYPE_ARCFOUR_MD4		= KRB5_ENCTYPE_ARCFOUR_MD4,
-    ETYPE_ARCFOUR_HMAC_OLD	= KRB5_ENCTYPE_ARCFOUR_HMAC_OLD,
-    ETYPE_ARCFOUR_HMAC_OLD_EXP	= KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP,
-    ETYPE_DES_CBC_NONE		= KRB5_ENCTYPE_DES_CBC_NONE,
-    ETYPE_DES3_CBC_NONE		= KRB5_ENCTYPE_DES3_CBC_NONE,
-    ETYPE_DES_CFB64_NONE	= KRB5_ENCTYPE_DES_CFB64_NONE,
-    ETYPE_DES_PCBC_NONE		= KRB5_ENCTYPE_DES_PCBC_NONE,
-    ETYPE_DIGEST_MD5_NONE	= KRB5_ENCTYPE_DIGEST_MD5_NONE,
-    ETYPE_CRAM_MD5_NONE		= KRB5_ENCTYPE_CRAM_MD5_NONE
-
-};
-
-/* PDU types */
-typedef enum krb5_pdu {
-    KRB5_PDU_ERROR = 0,
-    KRB5_PDU_TICKET = 1,
-    KRB5_PDU_AS_REQUEST = 2,
-    KRB5_PDU_AS_REPLY = 3,
-    KRB5_PDU_TGS_REQUEST = 4,
-    KRB5_PDU_TGS_REPLY = 5,
-    KRB5_PDU_AP_REQUEST = 6,
-    KRB5_PDU_AP_REPLY = 7,
-    KRB5_PDU_KRB_SAFE = 8,
-    KRB5_PDU_KRB_PRIV = 9,
-    KRB5_PDU_KRB_CRED = 10,
-    KRB5_PDU_NONE = 11 /* See krb5_get_permitted_enctypes() */
-} krb5_pdu;
-
-typedef PADATA_TYPE krb5_preauthtype;
-
-typedef enum krb5_key_usage {
-    KRB5_KU_PA_ENC_TIMESTAMP = 1,
-    /* AS-REQ PA-ENC-TIMESTAMP padata timestamp, encrypted with the
-       client key (section 5.4.1) */
-    KRB5_KU_TICKET = 2,
-    /* AS-REP Ticket and TGS-REP Ticket (includes tgs session key or
-       application session key), encrypted with the service key
-       (section 5.4.2) */
-    KRB5_KU_AS_REP_ENC_PART = 3,
-    /* AS-REP encrypted part (includes tgs session key or application
-       session key), encrypted with the client key (section 5.4.2) */
-    KRB5_KU_TGS_REQ_AUTH_DAT_SESSION = 4,
-    /* TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the tgs
-       session key (section 5.4.1) */
-    KRB5_KU_TGS_REQ_AUTH_DAT_SUBKEY = 5,
-    /* TGS-REQ KDC-REQ-BODY AuthorizationData, encrypted with the tgs
-          authenticator subkey (section 5.4.1) */
-    KRB5_KU_TGS_REQ_AUTH_CKSUM = 6,
-    /* TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator cksum, keyed
-       with the tgs session key (sections 5.3.2, 5.4.1) */
-    KRB5_KU_TGS_REQ_AUTH = 7,
-    /* TGS-REQ PA-TGS-REQ padata AP-REQ Authenticator (includes tgs
-       authenticator subkey), encrypted with the tgs session key
-       (section 5.3.2) */
-    KRB5_KU_TGS_REP_ENC_PART_SESSION = 8,
-    /* TGS-REP encrypted part (includes application session key),
-       encrypted with the tgs session key (section 5.4.2) */
-    KRB5_KU_TGS_REP_ENC_PART_SUB_KEY = 9,
-    /* TGS-REP encrypted part (includes application session key),
-       encrypted with the tgs authenticator subkey (section 5.4.2) */
-    KRB5_KU_AP_REQ_AUTH_CKSUM = 10,
-    /* AP-REQ Authenticator cksum, keyed with the application session
-       key (section 5.3.2) */
-    KRB5_KU_AP_REQ_AUTH = 11,
-    /* AP-REQ Authenticator (includes application authenticator
-       subkey), encrypted with the application session key (section
-       5.3.2) */
-    KRB5_KU_AP_REQ_ENC_PART = 12,
-    /* AP-REP encrypted part (includes application session subkey),
-       encrypted with the application session key (section 5.5.2) */
-    KRB5_KU_KRB_PRIV = 13,
-    /* KRB-PRIV encrypted part, encrypted with a key chosen by the
-       application (section 5.7.1) */
-    KRB5_KU_KRB_CRED = 14,
-    /* KRB-CRED encrypted part, encrypted with a key chosen by the
-       application (section 5.8.1) */
-    KRB5_KU_KRB_SAFE_CKSUM = 15,
-    /* KRB-SAFE cksum, keyed with a key chosen by the application
-       (section 5.6.1) */
-    KRB5_KU_OTHER_ENCRYPTED = 16,
-    /* Data which is defined in some specification outside of
-       Kerberos to be encrypted using an RFC1510 encryption type. */
-    KRB5_KU_OTHER_CKSUM = 17,
-    /* Data which is defined in some specification outside of
-       Kerberos to be checksummed using an RFC1510 checksum type. */
-    KRB5_KU_KRB_ERROR = 18,
-    /* Krb-error checksum */
-    KRB5_KU_AD_KDC_ISSUED = 19,
-    /* AD-KDCIssued checksum */
-    KRB5_KU_MANDATORY_TICKET_EXTENSION = 20,
-    /* Checksum for Mandatory Ticket Extensions */
-    KRB5_KU_AUTH_DATA_TICKET_EXTENSION = 21,
-    /* Checksum in Authorization Data in Ticket Extensions */
-    KRB5_KU_USAGE_SEAL = 22,
-    /* seal in GSSAPI krb5 mechanism */
-    KRB5_KU_USAGE_SIGN = 23,
-    /* sign in GSSAPI krb5 mechanism */
-    KRB5_KU_USAGE_SEQ = 24,
-    /* SEQ in GSSAPI krb5 mechanism */
-    KRB5_KU_USAGE_ACCEPTOR_SEAL = 22,
-    /* acceptor sign in GSSAPI CFX krb5 mechanism */
-    KRB5_KU_USAGE_ACCEPTOR_SIGN = 23,
-    /* acceptor seal in GSSAPI CFX krb5 mechanism */
-    KRB5_KU_USAGE_INITIATOR_SEAL = 24,
-    /* initiator sign in GSSAPI CFX krb5 mechanism */
-    KRB5_KU_USAGE_INITIATOR_SIGN = 25,
-    /* initiator seal in GSSAPI CFX krb5 mechanism */
-    KRB5_KU_PA_SERVER_REFERRAL_DATA = 22,
-    /* encrypted server referral data */
-    KRB5_KU_SAM_CHECKSUM = 25,
-    /* Checksum for the SAM-CHECKSUM field */
-    KRB5_KU_SAM_ENC_TRACK_ID = 26,
-    /* Encryption of the SAM-TRACK-ID field */
-    KRB5_KU_PA_SERVER_REFERRAL = 26,
-    /* Keyusage for the server referral in a TGS req */
-    KRB5_KU_SAM_ENC_NONCE_SAD = 27,
-    /* Encryption of the SAM-NONCE-OR-SAD field */
-    KRB5_KU_PA_PKINIT_KX = 44,
-    /* Encryption type of the kdc session contribution in pk-init */
-    KRB5_KU_AS_REQ = 56,
-    /* Checksum of over the AS-REQ send by the KDC in PA-REQ-ENC-PA-REP */
-    KRB5_KU_DIGEST_ENCRYPT = -18,
-    /* Encryption key usage used in the digest encryption field */
-    KRB5_KU_DIGEST_OPAQUE = -19,
-    /* Checksum key usage used in the digest opaque field */
-    KRB5_KU_KRB5SIGNEDPATH = -21,
-    /* Checksum key usage on KRB5SignedPath */
-    KRB5_KU_CANONICALIZED_NAMES = -23
-    /* Checksum key usage on PA-CANONICALIZED */
-} krb5_key_usage;
-
-typedef krb5_key_usage krb5_keyusage;
-
-typedef enum krb5_salttype {
-    KRB5_PW_SALT = KRB5_PADATA_PW_SALT,
-    KRB5_AFS3_SALT = KRB5_PADATA_AFS3_SALT
-}krb5_salttype;
-
-typedef struct krb5_salt {
-    krb5_salttype salttype;
-    krb5_data saltvalue;
-} krb5_salt;
-
-typedef ETYPE_INFO krb5_preauthinfo;
-
-typedef struct {
-    krb5_preauthtype type;
-    krb5_preauthinfo info; /* list of preauthinfo for this type */
-} krb5_preauthdata_entry;
-
-typedef struct krb5_preauthdata {
-    unsigned len;
-    krb5_preauthdata_entry *val;
-}krb5_preauthdata;
-
-typedef enum krb5_address_type {
-    KRB5_ADDRESS_INET     =   2,
-    KRB5_ADDRESS_NETBIOS  =  20,
-    KRB5_ADDRESS_INET6    =  24,
-    KRB5_ADDRESS_ADDRPORT = 256,
-    KRB5_ADDRESS_IPPORT   = 257
-} krb5_address_type;
-
-enum {
-  AP_OPTS_USE_SESSION_KEY = 1,
-  AP_OPTS_MUTUAL_REQUIRED = 2,
-  AP_OPTS_USE_SUBKEY = 4		/* library internal */
-};
-
-typedef HostAddress krb5_address;
-
-typedef HostAddresses krb5_addresses;
-
-typedef krb5_enctype krb5_keytype;
-
-enum krb5_keytype_old {
-    KEYTYPE_NULL	= ETYPE_NULL,
-    KEYTYPE_DES		= ETYPE_DES_CBC_CRC,
-    KEYTYPE_DES3	= ETYPE_OLD_DES3_CBC_SHA1,
-    KEYTYPE_AES128	= ETYPE_AES128_CTS_HMAC_SHA1_96,
-    KEYTYPE_AES256	= ETYPE_AES256_CTS_HMAC_SHA1_96,
-    KEYTYPE_ARCFOUR	= ETYPE_ARCFOUR_HMAC_MD5,
-    KEYTYPE_ARCFOUR_56	= ETYPE_ARCFOUR_HMAC_MD5_56
-};
-
-typedef EncryptionKey krb5_keyblock;
-
-typedef AP_REQ krb5_ap_req;
-
-struct krb5_cc_ops;
-
-#ifdef _WIN32
-#define KRB5_USE_PATH_TOKENS 1
-#endif
-
-#ifdef KRB5_USE_PATH_TOKENS
-#define KRB5_DEFAULT_CCFILE_ROOT "%{TEMP}/krb5cc_"
-#else
-#define KRB5_DEFAULT_CCFILE_ROOT "/tmp/krb5cc_"
-#endif
-
-#define KRB5_DEFAULT_CCROOT "FILE:" KRB5_DEFAULT_CCFILE_ROOT
-
-#define KRB5_ACCEPT_NULL_ADDRESSES(C) 					 \
-    krb5_config_get_bool_default((C), NULL, TRUE, 			 \
-				 "libdefaults", "accept_null_addresses", \
-				 NULL)
-
-typedef void *krb5_cc_cursor;
-typedef struct krb5_cccol_cursor_data *krb5_cccol_cursor;
-
-typedef struct krb5_ccache_data {
-    const struct krb5_cc_ops *ops;
-    krb5_data data;
-}krb5_ccache_data;
-
-typedef struct krb5_ccache_data *krb5_ccache;
-
-typedef struct krb5_context_data *krb5_context;
-
-typedef Realm krb5_realm;
-typedef const char *krb5_const_realm; /* stupid language */
-
-#define krb5_realm_length(r) strlen(r)
-#define krb5_realm_data(r) (r)
-
-typedef Principal krb5_principal_data;
-typedef struct Principal *krb5_principal;
-typedef const struct Principal *krb5_const_principal;
-typedef struct Principals *krb5_principals;
-
-typedef time_t krb5_deltat;
-typedef time_t krb5_timestamp;
-
-typedef struct krb5_times {
-  krb5_timestamp authtime;
-  krb5_timestamp starttime;
-  krb5_timestamp endtime;
-  krb5_timestamp renew_till;
-} krb5_times;
-
-typedef union {
-    TicketFlags b;
-    krb5_flags i;
-} krb5_ticket_flags;
-
-/* options for krb5_get_in_tkt() */
-#define KDC_OPT_FORWARDABLE		(1 << 1)
-#define KDC_OPT_FORWARDED		(1 << 2)
-#define KDC_OPT_PROXIABLE		(1 << 3)
-#define KDC_OPT_PROXY			(1 << 4)
-#define KDC_OPT_ALLOW_POSTDATE		(1 << 5)
-#define KDC_OPT_POSTDATED		(1 << 6)
-#define KDC_OPT_RENEWABLE		(1 << 8)
-#define KDC_OPT_REQUEST_ANONYMOUS	(1 << 14)
-#define KDC_OPT_DISABLE_TRANSITED_CHECK	(1 << 26)
-#define KDC_OPT_RENEWABLE_OK		(1 << 27)
-#define KDC_OPT_ENC_TKT_IN_SKEY		(1 << 28)
-#define KDC_OPT_RENEW			(1 << 30)
-#define KDC_OPT_VALIDATE		(1 << 31)
-
-typedef union {
-    KDCOptions b;
-    krb5_flags i;
-} krb5_kdc_flags;
-
-/* flags for krb5_verify_ap_req */
-
-#define KRB5_VERIFY_AP_REQ_IGNORE_INVALID	(1 << 0)
-
-#define KRB5_GC_CACHED			(1U << 0)
-#define KRB5_GC_USER_USER		(1U << 1)
-#define KRB5_GC_EXPIRED_OK		(1U << 2)
-#define KRB5_GC_NO_STORE		(1U << 3)
-#define KRB5_GC_FORWARDABLE		(1U << 4)
-#define KRB5_GC_NO_TRANSIT_CHECK	(1U << 5)
-#define KRB5_GC_CONSTRAINED_DELEGATION	(1U << 6)
-#define KRB5_GC_CANONICALIZE		(1U << 7)
-
-/* constants for compare_creds (and cc_retrieve_cred) */
-#define KRB5_TC_DONT_MATCH_REALM	(1U << 31)
-#define KRB5_TC_MATCH_KEYTYPE		(1U << 30)
-#define KRB5_TC_MATCH_KTYPE		KRB5_TC_MATCH_KEYTYPE    /* MIT name */
-#define KRB5_TC_MATCH_SRV_NAMEONLY	(1 << 29)
-#define KRB5_TC_MATCH_FLAGS_EXACT	(1 << 28)
-#define KRB5_TC_MATCH_FLAGS		(1 << 27)
-#define KRB5_TC_MATCH_TIMES_EXACT	(1 << 26)
-#define KRB5_TC_MATCH_TIMES		(1 << 25)
-#define KRB5_TC_MATCH_AUTHDATA		(1 << 24)
-#define KRB5_TC_MATCH_2ND_TKT		(1 << 23)
-#define KRB5_TC_MATCH_IS_SKEY		(1 << 22)
-
-/* constants for get_flags and set_flags */
-#define KRB5_TC_OPENCLOSE 0x00000001
-#define KRB5_TC_NOTICKET  0x00000002
-
-typedef AuthorizationData krb5_authdata;
-
-typedef KRB_ERROR krb5_error;
-
-typedef struct krb5_creds {
-    krb5_principal client;
-    krb5_principal server;
-    krb5_keyblock session;
-    krb5_times times;
-    krb5_data ticket;
-    krb5_data second_ticket;
-    krb5_authdata authdata;
-    krb5_addresses addresses;
-    krb5_ticket_flags flags;
-} krb5_creds;
-
-typedef struct krb5_cc_cache_cursor_data *krb5_cc_cache_cursor;
-
-#define KRB5_CC_OPS_VERSION 3
-
-typedef struct krb5_cc_ops {
-    int version;
-    const char *prefix;
-    const char* (KRB5_CALLCONV * get_name)(krb5_context, krb5_ccache);
-    krb5_error_code (KRB5_CALLCONV * resolve)(krb5_context, krb5_ccache *, const char *);
-    krb5_error_code (KRB5_CALLCONV * gen_new)(krb5_context, krb5_ccache *);
-    krb5_error_code (KRB5_CALLCONV * init)(krb5_context, krb5_ccache, krb5_principal);
-    krb5_error_code (KRB5_CALLCONV * destroy)(krb5_context, krb5_ccache);
-    krb5_error_code (KRB5_CALLCONV * close)(krb5_context, krb5_ccache);
-    krb5_error_code (KRB5_CALLCONV * store)(krb5_context, krb5_ccache, krb5_creds*);
-    krb5_error_code (KRB5_CALLCONV * retrieve)(krb5_context, krb5_ccache,
-					       krb5_flags, const krb5_creds*, krb5_creds *);
-    krb5_error_code (KRB5_CALLCONV * get_princ)(krb5_context, krb5_ccache, krb5_principal*);
-    krb5_error_code (KRB5_CALLCONV * get_first)(krb5_context, krb5_ccache, krb5_cc_cursor *);
-    krb5_error_code (KRB5_CALLCONV * get_next)(krb5_context, krb5_ccache,
-					       krb5_cc_cursor*, krb5_creds*);
-    krb5_error_code (KRB5_CALLCONV * end_get)(krb5_context, krb5_ccache, krb5_cc_cursor*);
-    krb5_error_code (KRB5_CALLCONV * remove_cred)(krb5_context, krb5_ccache,
-						  krb5_flags, krb5_creds*);
-    krb5_error_code (KRB5_CALLCONV * set_flags)(krb5_context, krb5_ccache, krb5_flags);
-    int (KRB5_CALLCONV * get_version)(krb5_context, krb5_ccache);
-    krb5_error_code (KRB5_CALLCONV * get_cache_first)(krb5_context, krb5_cc_cursor *);
-    krb5_error_code (KRB5_CALLCONV * get_cache_next)(krb5_context, krb5_cc_cursor,
-						     krb5_ccache *);
-    krb5_error_code (KRB5_CALLCONV * end_cache_get)(krb5_context, krb5_cc_cursor);
-    krb5_error_code (KRB5_CALLCONV * move)(krb5_context, krb5_ccache, krb5_ccache);
-    krb5_error_code (KRB5_CALLCONV * get_default_name)(krb5_context, char **);
-    krb5_error_code (KRB5_CALLCONV * set_default)(krb5_context, krb5_ccache);
-    krb5_error_code (KRB5_CALLCONV * lastchange)(krb5_context, krb5_ccache, krb5_timestamp *);
-    krb5_error_code (KRB5_CALLCONV * set_kdc_offset)(krb5_context, krb5_ccache, krb5_deltat);
-    krb5_error_code (KRB5_CALLCONV * get_kdc_offset)(krb5_context, krb5_ccache, krb5_deltat *);
-} krb5_cc_ops;
-
-struct krb5_log_facility;
-
-struct krb5_config_binding {
-    enum { krb5_config_string, krb5_config_list } type;
-    char *name;
-    struct krb5_config_binding *next;
-    union {
-	char *string;
-	struct krb5_config_binding *list;
-	void *generic;
-    } u;
-};
-
-typedef struct krb5_config_binding krb5_config_binding;
-
-typedef krb5_config_binding krb5_config_section;
-
-typedef struct krb5_ticket {
-    EncTicketPart ticket;
-    krb5_principal client;
-    krb5_principal server;
-} krb5_ticket;
-
-typedef Authenticator krb5_authenticator_data;
-
-typedef krb5_authenticator_data *krb5_authenticator;
-
-struct krb5_rcache_data;
-typedef struct krb5_rcache_data *krb5_rcache;
-typedef Authenticator krb5_donot_replay;
-
-#define KRB5_STORAGE_HOST_BYTEORDER			0x01 /* old */
-#define KRB5_STORAGE_PRINCIPAL_WRONG_NUM_COMPONENTS	0x02
-#define KRB5_STORAGE_PRINCIPAL_NO_NAME_TYPE		0x04
-#define KRB5_STORAGE_KEYBLOCK_KEYTYPE_TWICE		0x08
-#define KRB5_STORAGE_BYTEORDER_MASK			0x60
-#define KRB5_STORAGE_BYTEORDER_BE			0x00 /* default */
-#define KRB5_STORAGE_BYTEORDER_LE			0x20
-#define KRB5_STORAGE_BYTEORDER_HOST			0x40
-#define KRB5_STORAGE_CREDS_FLAGS_WRONG_BITORDER		0x80
-
-struct krb5_storage_data;
-typedef struct krb5_storage_data krb5_storage;
-
-typedef struct krb5_keytab_entry {
-    krb5_principal principal;
-    krb5_kvno vno;
-    krb5_keyblock keyblock;
-    uint32_t timestamp;
-    uint32_t flags;
-    krb5_principals aliases;
-} krb5_keytab_entry;
-
-typedef struct krb5_kt_cursor {
-    int fd;
-    krb5_storage *sp;
-    void *data;
-} krb5_kt_cursor;
-
-struct krb5_keytab_data;
-
-typedef struct krb5_keytab_data *krb5_keytab;
-
-#define KRB5_KT_PREFIX_MAX_LEN	30
-
-struct krb5_keytab_data {
-    const char *prefix;
-    krb5_error_code (KRB5_CALLCONV * resolve)(krb5_context, const char*, krb5_keytab);
-    krb5_error_code (KRB5_CALLCONV * get_name)(krb5_context, krb5_keytab, char*, size_t);
-    krb5_error_code (KRB5_CALLCONV * close)(krb5_context, krb5_keytab);
-    krb5_error_code (KRB5_CALLCONV * destroy)(krb5_context, krb5_keytab);
-    krb5_error_code (KRB5_CALLCONV * get)(krb5_context, krb5_keytab, krb5_const_principal,
-					  krb5_kvno, krb5_enctype, krb5_keytab_entry*);
-    krb5_error_code (KRB5_CALLCONV * start_seq_get)(krb5_context, krb5_keytab, krb5_kt_cursor*);
-    krb5_error_code (KRB5_CALLCONV * next_entry)(krb5_context, krb5_keytab,
-						 krb5_keytab_entry*, krb5_kt_cursor*);
-    krb5_error_code (KRB5_CALLCONV * end_seq_get)(krb5_context, krb5_keytab, krb5_kt_cursor*);
-    krb5_error_code (KRB5_CALLCONV * add)(krb5_context, krb5_keytab, krb5_keytab_entry*);
-    krb5_error_code (KRB5_CALLCONV * remove)(krb5_context, krb5_keytab, krb5_keytab_entry*);
-    void *data;
-    int32_t version;
-};
-
-typedef struct krb5_keytab_data krb5_kt_ops;
-
-struct krb5_keytab_key_proc_args {
-    krb5_keytab keytab;
-    krb5_principal principal;
-};
-
-typedef struct krb5_keytab_key_proc_args krb5_keytab_key_proc_args;
-
-typedef struct krb5_replay_data {
-    krb5_timestamp timestamp;
-    int32_t usec;
-    uint32_t seq;
-} krb5_replay_data;
-
-/* flags for krb5_auth_con_setflags */
-enum {
-    KRB5_AUTH_CONTEXT_DO_TIME      		= 1,
-    KRB5_AUTH_CONTEXT_RET_TIME     		= 2,
-    KRB5_AUTH_CONTEXT_DO_SEQUENCE  		= 4,
-    KRB5_AUTH_CONTEXT_RET_SEQUENCE 		= 8,
-    KRB5_AUTH_CONTEXT_PERMIT_ALL   		= 16,
-    KRB5_AUTH_CONTEXT_USE_SUBKEY   		= 32,
-    KRB5_AUTH_CONTEXT_CLEAR_FORWARDED_CRED	= 64
-};
-
-/* flags for krb5_auth_con_genaddrs */
-enum {
-    KRB5_AUTH_CONTEXT_GENERATE_LOCAL_ADDR       = 1,
-    KRB5_AUTH_CONTEXT_GENERATE_LOCAL_FULL_ADDR  = 3,
-    KRB5_AUTH_CONTEXT_GENERATE_REMOTE_ADDR      = 4,
-    KRB5_AUTH_CONTEXT_GENERATE_REMOTE_FULL_ADDR = 12
-};
-
-typedef struct krb5_auth_context_data {
-    unsigned int flags;
-
-    krb5_address *local_address;
-    krb5_address *remote_address;
-    int16_t local_port;
-    int16_t remote_port;
-    krb5_keyblock *keyblock;
-    krb5_keyblock *local_subkey;
-    krb5_keyblock *remote_subkey;
-
-    uint32_t local_seqnumber;
-    uint32_t remote_seqnumber;
-
-    krb5_authenticator authenticator;
-
-    krb5_pointer i_vector;
-
-    krb5_rcache rcache;
-
-    krb5_keytype keytype;	/* ¿requested key type ? */
-    krb5_cksumtype cksumtype;	/* ¡requested checksum type! */
-
-}krb5_auth_context_data, *krb5_auth_context;
-
-typedef struct {
-    KDC_REP kdc_rep;
-    EncKDCRepPart enc_part;
-    KRB_ERROR error;
-} krb5_kdc_rep;
-
-extern const char *heimdal_version, *heimdal_long_version;
-
-typedef void (KRB5_CALLCONV * krb5_log_log_func_t)(const char*, const char*, void*);
-typedef void (KRB5_CALLCONV * krb5_log_close_func_t)(void*);
-
-typedef struct krb5_log_facility {
-    char *program;
-    int len;
-    struct facility *val;
-} krb5_log_facility;
-
-typedef EncAPRepPart krb5_ap_rep_enc_part;
-
-#define KRB5_RECVAUTH_IGNORE_VERSION 1
-
-#define KRB5_SENDAUTH_VERSION "KRB5_SENDAUTH_V1.0"
-
-#define KRB5_TGS_NAME_SIZE (6)
-#define KRB5_TGS_NAME ("krbtgt")
-#define KRB5_WELLKNOWN_NAME ("WELLKNOWN")
-#define KRB5_ANON_NAME ("ANONYMOUS")
-#define KRB5_DIGEST_NAME ("digest")
-
-typedef enum {
-    KRB5_PROMPT_TYPE_PASSWORD		= 0x1,
-    KRB5_PROMPT_TYPE_NEW_PASSWORD	= 0x2,
-    KRB5_PROMPT_TYPE_NEW_PASSWORD_AGAIN = 0x3,
-    KRB5_PROMPT_TYPE_PREAUTH		= 0x4,
-    KRB5_PROMPT_TYPE_INFO		= 0x5
-} krb5_prompt_type;
-
-typedef struct _krb5_prompt {
-    const char *prompt;
-    int hidden;
-    krb5_data *reply;
-    krb5_prompt_type type;
-} krb5_prompt;
-
-typedef int (KRB5_CALLCONV * krb5_prompter_fct)(krb5_context /*context*/,
-						void * /*data*/,
-						const char * /*name*/,
-						const char * /*banner*/,
-						int /*num_prompts*/,
-						krb5_prompt /*prompts*/[]);
-typedef krb5_error_code (KRB5_CALLCONV * krb5_key_proc)(krb5_context /*context*/,
-							krb5_enctype /*type*/,
-							krb5_salt /*salt*/,
-							krb5_const_pointer /*keyseed*/,
-							krb5_keyblock ** /*key*/);
-typedef krb5_error_code (KRB5_CALLCONV * krb5_decrypt_proc)(krb5_context /*context*/,
-							    krb5_keyblock * /*key*/,
-							    krb5_key_usage /*usage*/,
-							    krb5_const_pointer /*decrypt_arg*/,
-							    krb5_kdc_rep * /*dec_rep*/);
-typedef krb5_error_code (KRB5_CALLCONV * krb5_s2k_proc)(krb5_context /*context*/,
-							krb5_enctype /*type*/,
-							krb5_const_pointer /*keyseed*/,
-							krb5_salt /*salt*/,
-							krb5_data * /*s2kparms*/,
-							krb5_keyblock ** /*key*/);
-
-struct _krb5_get_init_creds_opt_private;
-
-struct _krb5_get_init_creds_opt {
-    krb5_flags flags;
-    krb5_deltat tkt_life;
-    krb5_deltat renew_life;
-    int forwardable;
-    int proxiable;
-    int anonymous;
-    krb5_enctype *etype_list;
-    int etype_list_length;
-    krb5_addresses *address_list;
-    /* XXX the next three should not be used, as they may be
-       removed later */
-    krb5_preauthtype *preauth_list;
-    int preauth_list_length;
-    krb5_data *salt;
-    struct _krb5_get_init_creds_opt_private *opt_private;
-};
-
-typedef struct _krb5_get_init_creds_opt krb5_get_init_creds_opt;
-
-#define KRB5_GET_INIT_CREDS_OPT_TKT_LIFE	0x0001
-#define KRB5_GET_INIT_CREDS_OPT_RENEW_LIFE	0x0002
-#define KRB5_GET_INIT_CREDS_OPT_FORWARDABLE	0x0004
-#define KRB5_GET_INIT_CREDS_OPT_PROXIABLE	0x0008
-#define KRB5_GET_INIT_CREDS_OPT_ETYPE_LIST	0x0010
-#define KRB5_GET_INIT_CREDS_OPT_ADDRESS_LIST	0x0020
-#define KRB5_GET_INIT_CREDS_OPT_PREAUTH_LIST	0x0040
-#define KRB5_GET_INIT_CREDS_OPT_SALT		0x0080 /* no supported */
-#define KRB5_GET_INIT_CREDS_OPT_ANONYMOUS	0x0100
-#define KRB5_GET_INIT_CREDS_OPT_DISABLE_TRANSITED_CHECK	0x0200
-
-/* krb5_init_creds_step flags argument */
-#define KRB5_INIT_CREDS_STEP_FLAG_CONTINUE	0x0001
-
-typedef struct _krb5_verify_init_creds_opt {
-    krb5_flags flags;
-    int ap_req_nofail;
-} krb5_verify_init_creds_opt;
-
-#define KRB5_VERIFY_INIT_CREDS_OPT_AP_REQ_NOFAIL	0x0001
-
-typedef struct krb5_verify_opt {
-    unsigned int flags;
-    krb5_ccache ccache;
-    krb5_keytab keytab;
-    krb5_boolean secure;
-    const char *service;
-} krb5_verify_opt;
-
-#define KRB5_VERIFY_LREALMS		1
-#define KRB5_VERIFY_NO_ADDRESSES	2
-
-#define KRB5_KPASSWD_VERS_CHANGEPW      1
-#define KRB5_KPASSWD_VERS_SETPW         0xff80
-
-#define KRB5_KPASSWD_SUCCESS	0
-#define KRB5_KPASSWD_MALFORMED	1
-#define KRB5_KPASSWD_HARDERROR	2
-#define KRB5_KPASSWD_AUTHERROR	3
-#define KRB5_KPASSWD_SOFTERROR	4
-#define KRB5_KPASSWD_ACCESSDENIED 5
-#define KRB5_KPASSWD_BAD_VERSION 6
-#define KRB5_KPASSWD_INITIAL_FLAG_NEEDED 7
-
-#define KPASSWD_PORT 464
-
-/* types for the new krbhst interface */
-struct krb5_krbhst_data;
-typedef struct krb5_krbhst_data *krb5_krbhst_handle;
-
-#define KRB5_KRBHST_KDC		1
-#define KRB5_KRBHST_ADMIN	2
-#define KRB5_KRBHST_CHANGEPW	3
-#define KRB5_KRBHST_KRB524	4
-#define KRB5_KRBHST_KCA		5
-
-typedef struct krb5_krbhst_info {
-    enum { KRB5_KRBHST_UDP,
-	   KRB5_KRBHST_TCP,
-	   KRB5_KRBHST_HTTP } proto;
-    unsigned short port;
-    unsigned short def_port;
-    struct addrinfo *ai;
-    struct krb5_krbhst_info *next;
-    char hostname[1]; /* has to come last */
-} krb5_krbhst_info;
-
-/* flags for krb5_krbhst_init_flags (and krb5_send_to_kdc_flags) */
-enum {
-    KRB5_KRBHST_FLAGS_MASTER      = 1,
-    KRB5_KRBHST_FLAGS_LARGE_MSG	  = 2
-};
-
-typedef krb5_error_code
-(KRB5_CALLCONV * krb5_send_to_kdc_func)(krb5_context, void *, krb5_krbhst_info *, time_t,
-					const krb5_data *, krb5_data *);
-
-/** flags for krb5_parse_name_flags */
-enum {
-    KRB5_PRINCIPAL_PARSE_NO_REALM = 1, /**< Require that there are no realm */
-    KRB5_PRINCIPAL_PARSE_REQUIRE_REALM = 2, /**< Require a realm present */
-    KRB5_PRINCIPAL_PARSE_ENTERPRISE = 4 /**< Parse as a NT-ENTERPRISE name */
-};
-
-/** flags for krb5_unparse_name_flags */
-enum {
-    KRB5_PRINCIPAL_UNPARSE_SHORT = 1, /**< No realm if it is the default realm */
-    KRB5_PRINCIPAL_UNPARSE_NO_REALM = 2, /**< No realm */
-    KRB5_PRINCIPAL_UNPARSE_DISPLAY = 4 /**< No quoting */
-};
-
-typedef struct krb5_sendto_ctx_data *krb5_sendto_ctx;
-
-#define KRB5_SENDTO_DONE	0
-#define KRB5_SENDTO_RESTART	1
-#define KRB5_SENDTO_CONTINUE	2
-
-typedef krb5_error_code
-(KRB5_CALLCONV * krb5_sendto_ctx_func)(krb5_context, krb5_sendto_ctx, void *,
-				       const krb5_data *, int *);
-
-struct krb5_plugin;
-enum krb5_plugin_type {
-    PLUGIN_TYPE_DATA = 1,
-    PLUGIN_TYPE_FUNC
-};
-
-struct credentials; /* this is to keep the compiler happy */
-struct getargs;
-struct sockaddr;
-
-/**
- * Semi private, not stable yet
- */
-
-typedef struct krb5_crypto_iov {
-    unsigned int flags;
-    /* ignored */
-#define KRB5_CRYPTO_TYPE_EMPTY		0
-    /* OUT krb5_crypto_length(KRB5_CRYPTO_TYPE_HEADER) */
-#define KRB5_CRYPTO_TYPE_HEADER		1
-    /* IN and OUT */
-#define KRB5_CRYPTO_TYPE_DATA		2
-    /* IN */
-#define KRB5_CRYPTO_TYPE_SIGN_ONLY	3
-   /* (only for encryption) OUT krb5_crypto_length(KRB5_CRYPTO_TYPE_TRAILER) */
-#define KRB5_CRYPTO_TYPE_PADDING	4
-   /* OUT krb5_crypto_length(KRB5_CRYPTO_TYPE_TRAILER) */
-#define KRB5_CRYPTO_TYPE_TRAILER	5
-   /* OUT krb5_crypto_length(KRB5_CRYPTO_TYPE_CHECKSUM) */
-#define KRB5_CRYPTO_TYPE_CHECKSUM	6
-    krb5_data data;
-} krb5_crypto_iov;
-
-
-/* Glue for MIT */
-
-typedef struct {
-    int32_t lr_type;
-    krb5_timestamp value;
-} krb5_last_req_entry;
-
-typedef krb5_error_code
-(KRB5_CALLCONV * krb5_gic_process_last_req)(krb5_context, krb5_last_req_entry **, void *);
-
-/*
- *
- */
-
-struct hx509_certs_data;
-
-#include <krb5-protos.h>
-
-/* variables */
-
-extern KRB5_LIB_VARIABLE const char *krb5_config_file;
-extern KRB5_LIB_VARIABLE const char *krb5_defkeyname;
-
-
-extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_acc_ops;
-extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_fcc_ops;
-extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_mcc_ops;
-extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_kcm_ops;
-extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_akcm_ops;
-extern KRB5_LIB_VARIABLE const krb5_cc_ops krb5_scc_ops;
-
-extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_fkt_ops;
-extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_wrfkt_ops;
-extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_javakt_ops;
-extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_mkt_ops;
-extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_akf_ops;
-extern KRB5_LIB_VARIABLE const krb5_kt_ops krb5_any_ops;
-
-extern KRB5_LIB_VARIABLE const char *krb5_cc_type_api;
-extern KRB5_LIB_VARIABLE const char *krb5_cc_type_file;
-extern KRB5_LIB_VARIABLE const char *krb5_cc_type_memory;
-extern KRB5_LIB_VARIABLE const char *krb5_cc_type_kcm;
-extern KRB5_LIB_VARIABLE const char *krb5_cc_type_scc;
-
-#endif /* __KRB5_H__ */
-
diff --git a/include.new/krb5/ccache_plugin.h b/include.new/krb5/ccache_plugin.h
deleted file mode 100644
index f6871d6..0000000
--- a/include.new/krb5/ccache_plugin.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2010, Secure Endpoints Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- *
- * - 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
- * COPYRIGHT HOLDER 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.
- *
- **********************************************************************/
-
-#ifndef HEIMDAL_KRB5_CCACHE_PLUGIN_H
-#define HEIMDAL_KRB5_CCACHE_PLUGIN_H 1
-
-#include <krb5.h>
-
-#define KRB5_PLUGIN_CCACHE "ccache_ops"
-
-#endif /* HEIMDAL_KRB5_CCACHE_PLUGIN_H */
diff --git a/include.new/krb5/locate_plugin.h b/include.new/krb5/locate_plugin.h
deleted file mode 100644
index b1b1f0e..0000000
--- a/include.new/krb5/locate_plugin.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2006 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef HEIMDAL_KRB5_LOCATE_PLUGIN_H
-#define HEIMDAL_KRB5_LOCATE_PLUGIN_H 1
-
-#define KRB5_PLUGIN_LOCATE "service_locator"
-
-enum locate_service_type {
-    locate_service_kdc = 1,
-    locate_service_master_kdc,
-    locate_service_kadmin,
-    locate_service_krb524,
-    locate_service_kpasswd
-};
-
-typedef krb5_error_code
-(*krb5plugin_service_locate_lookup) (void *, enum locate_service_type,
-				     const char *, int, int,
-				     int (*)(void *,int,struct sockaddr *),
-				     void *);
-
-
-typedef struct krb5plugin_service_locate_ftable {
-    int			minor_version;
-    krb5_error_code	(*init)(krb5_context, void **);
-    void		(*fini)(void *);
-    krb5plugin_service_locate_lookup lookup;
-} krb5plugin_service_locate_ftable;
-
-#endif /* HEIMDAL_KRB5_LOCATE_PLUGIN_H */
-
diff --git a/include.new/krb5/send_to_kdc_plugin.h b/include.new/krb5/send_to_kdc_plugin.h
deleted file mode 100644
index c729a12..0000000
--- a/include.new/krb5/send_to_kdc_plugin.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2008 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef HEIMDAL_KRB5_SEND_TO_KDC_PLUGIN_H
-#define HEIMDAL_KRB5_SEND_TO_KDC_PLUGIN_H 1
-
-#include <krb5.h>
-
-#define KRB5_PLUGIN_SEND_TO_KDC "send_to_kdc"
-
-typedef krb5_error_code
-(*krb5plugin_send_to_kdc_func)(krb5_context,
-			       void *,
-			       krb5_krbhst_info *,
-			       time_t timeout,
-			       const krb5_data *,
-			       krb5_data *);
-
-typedef struct krb5plugin_send_to_kdc_ftable {
-    int			minor_version;
-    krb5_error_code	(*init)(krb5_context, void **);
-    void		(*fini)(void *);
-    krb5plugin_send_to_kdc_func send_to_kdc;
-} krb5plugin_send_to_kdc_ftable;
-
-#endif /* HEIMDAL_KRB5_SEND_TO_KDC_PLUGIN_H */
diff --git a/include.new/krb5/windc_plugin.h b/include.new/krb5/windc_plugin.h
deleted file mode 100644
index fa4ba43..0000000
--- a/include.new/krb5/windc_plugin.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2006 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef HEIMDAL_KRB5_PAC_PLUGIN_H
-#define HEIMDAL_KRB5_PAC_PLUGIN_H 1
-
-#include <krb5.h>
-
-/*
- * The PAC generate function should allocate a krb5_pac using
- * krb5_pac_init and fill in the PAC structure for the principal using
- * krb5_pac_add_buffer.
- *
- * The PAC verify function should verify all components in the PAC
- * using krb5_pac_get_types and krb5_pac_get_buffer for all types.
- *
- * Check client access function check if the client is authorized.
- */
-
-struct hdb_entry_ex;
-
-typedef krb5_error_code
-(*krb5plugin_windc_pac_generate)(void *, krb5_context,
-				 struct hdb_entry_ex *, krb5_pac *);
-
-typedef krb5_error_code
-(*krb5plugin_windc_pac_verify)(void *, krb5_context,
-			       const krb5_principal, /* new ticket client */
-			       const krb5_principal, /* delegation proxy */
-			       struct hdb_entry_ex *,/* client */
-			       struct hdb_entry_ex *,/* server */
-			       struct hdb_entry_ex *,/* krbtgt */
-			       krb5_pac *);
-
-typedef krb5_error_code
-(*krb5plugin_windc_client_access)(
-	void *, krb5_context,
-	krb5_kdc_configuration *config,
-	hdb_entry_ex *, const char *,
-	hdb_entry_ex *, const char *,
-	KDC_REQ *, krb5_data *);
-
-
-#define KRB5_WINDC_PLUGIN_MINOR			6
-#define KRB5_WINDC_PLUGING_MINOR KRB5_WINDC_PLUGIN_MINOR
-
-typedef struct krb5plugin_windc_ftable {
-    int			minor_version;
-    krb5_error_code	(*init)(krb5_context, void **);
-    void		(*fini)(void *);
-    krb5plugin_windc_pac_generate	pac_generate;
-    krb5plugin_windc_pac_verify		pac_verify;
-    krb5plugin_windc_client_access	client_access;
-} krb5plugin_windc_ftable;
-
-#endif /* HEIMDAL_KRB5_PAC_PLUGIN_H */
-
diff --git a/include.new/krb5_asn1.h b/include.new/krb5_asn1.h
deleted file mode 100644
index cf794aa..0000000
--- a/include.new/krb5_asn1.h
+++ /dev/null
@@ -1,2353 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/krb5.asn1 */
-/* Do not edit */
-
-#ifndef __krb5_asn1_h__
-#define __krb5_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-/*
-NAME-TYPE ::= INTEGER {
-  KRB5_NT_UNKNOWN(0),
-  KRB5_NT_PRINCIPAL(1),
-  KRB5_NT_SRV_INST(2),
-  KRB5_NT_SRV_HST(3),
-  KRB5_NT_SRV_XHST(4),
-  KRB5_NT_UID(5),
-  KRB5_NT_X500_PRINCIPAL(6),
-  KRB5_NT_SMTP_NAME(7),
-  KRB5_NT_ENTERPRISE_PRINCIPAL(10),
-  KRB5_NT_WELLKNOWN(11),
-  KRB5_NT_ENT_PRINCIPAL_AND_ID(-130),
-  KRB5_NT_MS_PRINCIPAL(-128),
-  KRB5_NT_MS_PRINCIPAL_AND_ID(-129),
-  KRB5_NT_NTLM(-1200)
-}
-*/
-
-typedef enum NAME_TYPE {
-  KRB5_NT_UNKNOWN = 0,
-  KRB5_NT_PRINCIPAL = 1,
-  KRB5_NT_SRV_INST = 2,
-  KRB5_NT_SRV_HST = 3,
-  KRB5_NT_SRV_XHST = 4,
-  KRB5_NT_UID = 5,
-  KRB5_NT_X500_PRINCIPAL = 6,
-  KRB5_NT_SMTP_NAME = 7,
-  KRB5_NT_ENTERPRISE_PRINCIPAL = 10,
-  KRB5_NT_WELLKNOWN = 11,
-  KRB5_NT_ENT_PRINCIPAL_AND_ID = -130,
-  KRB5_NT_MS_PRINCIPAL = -128,
-  KRB5_NT_MS_PRINCIPAL_AND_ID = -129,
-  KRB5_NT_NTLM = -1200
-} NAME_TYPE;
-
-ASN1EXP int    ASN1CALL decode_NAME_TYPE(const unsigned char *, size_t, NAME_TYPE *, size_t *);
-ASN1EXP int    ASN1CALL encode_NAME_TYPE(unsigned char *, size_t, const NAME_TYPE *, size_t *);
-ASN1EXP size_t ASN1CALL length_NAME_TYPE(const NAME_TYPE *);
-ASN1EXP int    ASN1CALL copy_NAME_TYPE  (const NAME_TYPE *, NAME_TYPE *);
-ASN1EXP void   ASN1CALL free_NAME_TYPE  (NAME_TYPE *);
-
-
-/*
-MESSAGE-TYPE ::= INTEGER {
-  krb_as_req(10),
-  krb_as_rep(11),
-  krb_tgs_req(12),
-  krb_tgs_rep(13),
-  krb_ap_req(14),
-  krb_ap_rep(15),
-  krb_safe(20),
-  krb_priv(21),
-  krb_cred(22),
-  krb_error(30)
-}
-*/
-
-typedef enum MESSAGE_TYPE {
-  krb_as_req = 10,
-  krb_as_rep = 11,
-  krb_tgs_req = 12,
-  krb_tgs_rep = 13,
-  krb_ap_req = 14,
-  krb_ap_rep = 15,
-  krb_safe = 20,
-  krb_priv = 21,
-  krb_cred = 22,
-  krb_error = 30
-} MESSAGE_TYPE;
-
-/*
-PADATA-TYPE ::= INTEGER {
-  KRB5_PADATA_NONE(0),
-  KRB5_PADATA_TGS_REQ(1),
-  KRB5_PADATA_AP_REQ(1),
-  KRB5_PADATA_ENC_TIMESTAMP(2),
-  KRB5_PADATA_PW_SALT(3),
-  KRB5_PADATA_ENC_UNIX_TIME(5),
-  KRB5_PADATA_SANDIA_SECUREID(6),
-  KRB5_PADATA_SESAME(7),
-  KRB5_PADATA_OSF_DCE(8),
-  KRB5_PADATA_CYBERSAFE_SECUREID(9),
-  KRB5_PADATA_AFS3_SALT(10),
-  KRB5_PADATA_ETYPE_INFO(11),
-  KRB5_PADATA_SAM_CHALLENGE(12),
-  KRB5_PADATA_SAM_RESPONSE(13),
-  KRB5_PADATA_PK_AS_REQ_19(14),
-  KRB5_PADATA_PK_AS_REP_19(15),
-  KRB5_PADATA_PK_AS_REQ_WIN(15),
-  KRB5_PADATA_PK_AS_REQ(16),
-  KRB5_PADATA_PK_AS_REP(17),
-  KRB5_PADATA_PA_PK_OCSP_RESPONSE(18),
-  KRB5_PADATA_ETYPE_INFO2(19),
-  KRB5_PADATA_USE_SPECIFIED_KVNO(20),
-  KRB5_PADATA_SVR_REFERRAL_INFO(20),
-  KRB5_PADATA_SAM_REDIRECT(21),
-  KRB5_PADATA_GET_FROM_TYPED_DATA(22),
-  KRB5_PADATA_SAM_ETYPE_INFO(23),
-  KRB5_PADATA_SERVER_REFERRAL(25),
-  KRB5_PADATA_ALT_PRINC(24),
-  KRB5_PADATA_SAM_CHALLENGE2(30),
-  KRB5_PADATA_SAM_RESPONSE2(31),
-  KRB5_PA_EXTRA_TGT(41),
-  KRB5_PADATA_TD_KRB_PRINCIPAL(102),
-  KRB5_PADATA_PK_TD_TRUSTED_CERTIFIERS(104),
-  KRB5_PADATA_PK_TD_CERTIFICATE_INDEX(105),
-  KRB5_PADATA_TD_APP_DEFINED_ERROR(106),
-  KRB5_PADATA_TD_REQ_NONCE(107),
-  KRB5_PADATA_TD_REQ_SEQ(108),
-  KRB5_PADATA_PA_PAC_REQUEST(128),
-  KRB5_PADATA_FOR_USER(129),
-  KRB5_PADATA_FOR_X509_USER(130),
-  KRB5_PADATA_FOR_CHECK_DUPS(131),
-  KRB5_PADATA_AS_CHECKSUM(132),
-  KRB5_PADATA_PK_AS_09_BINDING(132),
-  KRB5_PADATA_CLIENT_CANONICALIZED(133),
-  KRB5_PADATA_FX_COOKIE(133),
-  KRB5_PADATA_AUTHENTICATION_SET(134),
-  KRB5_PADATA_AUTH_SET_SELECTED(135),
-  KRB5_PADATA_FX_FAST(136),
-  KRB5_PADATA_FX_ERROR(137),
-  KRB5_PADATA_ENCRYPTED_CHALLENGE(138),
-  KRB5_PADATA_OTP_CHALLENGE(141),
-  KRB5_PADATA_OTP_REQUEST(142),
-  KBB5_PADATA_OTP_CONFIRM(143),
-  KRB5_PADATA_OTP_PIN_CHANGE(144),
-  KRB5_PADATA_EPAK_AS_REQ(145),
-  KRB5_PADATA_EPAK_AS_REP(146),
-  KRB5_PADATA_PKINIT_KX(147),
-  KRB5_PADATA_PKU2U_NAME(148),
-  KRB5_PADATA_REQ_ENC_PA_REP(149),
-  KRB5_PADATA_SUPPORTED_ETYPES(165)
-}
-*/
-
-typedef enum PADATA_TYPE {
-  KRB5_PADATA_NONE = 0,
-  KRB5_PADATA_TGS_REQ = 1,
-  KRB5_PADATA_AP_REQ = 1,
-  KRB5_PADATA_ENC_TIMESTAMP = 2,
-  KRB5_PADATA_PW_SALT = 3,
-  KRB5_PADATA_ENC_UNIX_TIME = 5,
-  KRB5_PADATA_SANDIA_SECUREID = 6,
-  KRB5_PADATA_SESAME = 7,
-  KRB5_PADATA_OSF_DCE = 8,
-  KRB5_PADATA_CYBERSAFE_SECUREID = 9,
-  KRB5_PADATA_AFS3_SALT = 10,
-  KRB5_PADATA_ETYPE_INFO = 11,
-  KRB5_PADATA_SAM_CHALLENGE = 12,
-  KRB5_PADATA_SAM_RESPONSE = 13,
-  KRB5_PADATA_PK_AS_REQ_19 = 14,
-  KRB5_PADATA_PK_AS_REP_19 = 15,
-  KRB5_PADATA_PK_AS_REQ_WIN = 15,
-  KRB5_PADATA_PK_AS_REQ = 16,
-  KRB5_PADATA_PK_AS_REP = 17,
-  KRB5_PADATA_PA_PK_OCSP_RESPONSE = 18,
-  KRB5_PADATA_ETYPE_INFO2 = 19,
-  KRB5_PADATA_USE_SPECIFIED_KVNO = 20,
-  KRB5_PADATA_SVR_REFERRAL_INFO = 20,
-  KRB5_PADATA_SAM_REDIRECT = 21,
-  KRB5_PADATA_GET_FROM_TYPED_DATA = 22,
-  KRB5_PADATA_SAM_ETYPE_INFO = 23,
-  KRB5_PADATA_SERVER_REFERRAL = 25,
-  KRB5_PADATA_ALT_PRINC = 24,
-  KRB5_PADATA_SAM_CHALLENGE2 = 30,
-  KRB5_PADATA_SAM_RESPONSE2 = 31,
-  KRB5_PA_EXTRA_TGT = 41,
-  KRB5_PADATA_TD_KRB_PRINCIPAL = 102,
-  KRB5_PADATA_PK_TD_TRUSTED_CERTIFIERS = 104,
-  KRB5_PADATA_PK_TD_CERTIFICATE_INDEX = 105,
-  KRB5_PADATA_TD_APP_DEFINED_ERROR = 106,
-  KRB5_PADATA_TD_REQ_NONCE = 107,
-  KRB5_PADATA_TD_REQ_SEQ = 108,
-  KRB5_PADATA_PA_PAC_REQUEST = 128,
-  KRB5_PADATA_FOR_USER = 129,
-  KRB5_PADATA_FOR_X509_USER = 130,
-  KRB5_PADATA_FOR_CHECK_DUPS = 131,
-  KRB5_PADATA_AS_CHECKSUM = 132,
-  KRB5_PADATA_PK_AS_09_BINDING = 132,
-  KRB5_PADATA_CLIENT_CANONICALIZED = 133,
-  KRB5_PADATA_FX_COOKIE = 133,
-  KRB5_PADATA_AUTHENTICATION_SET = 134,
-  KRB5_PADATA_AUTH_SET_SELECTED = 135,
-  KRB5_PADATA_FX_FAST = 136,
-  KRB5_PADATA_FX_ERROR = 137,
-  KRB5_PADATA_ENCRYPTED_CHALLENGE = 138,
-  KRB5_PADATA_OTP_CHALLENGE = 141,
-  KRB5_PADATA_OTP_REQUEST = 142,
-  KBB5_PADATA_OTP_CONFIRM = 143,
-  KRB5_PADATA_OTP_PIN_CHANGE = 144,
-  KRB5_PADATA_EPAK_AS_REQ = 145,
-  KRB5_PADATA_EPAK_AS_REP = 146,
-  KRB5_PADATA_PKINIT_KX = 147,
-  KRB5_PADATA_PKU2U_NAME = 148,
-  KRB5_PADATA_REQ_ENC_PA_REP = 149,
-  KRB5_PADATA_SUPPORTED_ETYPES = 165
-} PADATA_TYPE;
-
-ASN1EXP int    ASN1CALL decode_PADATA_TYPE(const unsigned char *, size_t, PADATA_TYPE *, size_t *);
-ASN1EXP int    ASN1CALL encode_PADATA_TYPE(unsigned char *, size_t, const PADATA_TYPE *, size_t *);
-ASN1EXP size_t ASN1CALL length_PADATA_TYPE(const PADATA_TYPE *);
-ASN1EXP int    ASN1CALL copy_PADATA_TYPE  (const PADATA_TYPE *, PADATA_TYPE *);
-ASN1EXP void   ASN1CALL free_PADATA_TYPE  (PADATA_TYPE *);
-
-
-/*
-AUTHDATA-TYPE ::= INTEGER {
-  KRB5_AUTHDATA_IF_RELEVANT(1),
-  KRB5_AUTHDATA_INTENDED_FOR_SERVER(2),
-  KRB5_AUTHDATA_INTENDED_FOR_APPLICATION_CLASS(3),
-  KRB5_AUTHDATA_KDC_ISSUED(4),
-  KRB5_AUTHDATA_AND_OR(5),
-  KRB5_AUTHDATA_MANDATORY_TICKET_EXTENSIONS(6),
-  KRB5_AUTHDATA_IN_TICKET_EXTENSIONS(7),
-  KRB5_AUTHDATA_MANDATORY_FOR_KDC(8),
-  KRB5_AUTHDATA_INITIAL_VERIFIED_CAS(9),
-  KRB5_AUTHDATA_OSF_DCE(64),
-  KRB5_AUTHDATA_SESAME(65),
-  KRB5_AUTHDATA_OSF_DCE_PKI_CERTID(66),
-  KRB5_AUTHDATA_WIN2K_PAC(128),
-  KRB5_AUTHDATA_GSS_API_ETYPE_NEGOTIATION(129),
-  KRB5_AUTHDATA_SIGNTICKET_OLDER(-17),
-  KRB5_AUTHDATA_SIGNTICKET_OLD(142),
-  KRB5_AUTHDATA_SIGNTICKET(512)
-}
-*/
-
-typedef enum AUTHDATA_TYPE {
-  KRB5_AUTHDATA_IF_RELEVANT = 1,
-  KRB5_AUTHDATA_INTENDED_FOR_SERVER = 2,
-  KRB5_AUTHDATA_INTENDED_FOR_APPLICATION_CLASS = 3,
-  KRB5_AUTHDATA_KDC_ISSUED = 4,
-  KRB5_AUTHDATA_AND_OR = 5,
-  KRB5_AUTHDATA_MANDATORY_TICKET_EXTENSIONS = 6,
-  KRB5_AUTHDATA_IN_TICKET_EXTENSIONS = 7,
-  KRB5_AUTHDATA_MANDATORY_FOR_KDC = 8,
-  KRB5_AUTHDATA_INITIAL_VERIFIED_CAS = 9,
-  KRB5_AUTHDATA_OSF_DCE = 64,
-  KRB5_AUTHDATA_SESAME = 65,
-  KRB5_AUTHDATA_OSF_DCE_PKI_CERTID = 66,
-  KRB5_AUTHDATA_WIN2K_PAC = 128,
-  KRB5_AUTHDATA_GSS_API_ETYPE_NEGOTIATION = 129,
-  KRB5_AUTHDATA_SIGNTICKET_OLDER = -17,
-  KRB5_AUTHDATA_SIGNTICKET_OLD = 142,
-  KRB5_AUTHDATA_SIGNTICKET = 512
-} AUTHDATA_TYPE;
-
-ASN1EXP int    ASN1CALL decode_AUTHDATA_TYPE(const unsigned char *, size_t, AUTHDATA_TYPE *, size_t *);
-ASN1EXP int    ASN1CALL encode_AUTHDATA_TYPE(unsigned char *, size_t, const AUTHDATA_TYPE *, size_t *);
-ASN1EXP size_t ASN1CALL length_AUTHDATA_TYPE(const AUTHDATA_TYPE *);
-ASN1EXP int    ASN1CALL copy_AUTHDATA_TYPE  (const AUTHDATA_TYPE *, AUTHDATA_TYPE *);
-ASN1EXP void   ASN1CALL free_AUTHDATA_TYPE  (AUTHDATA_TYPE *);
-
-
-/*
-CKSUMTYPE ::= INTEGER {
-  CKSUMTYPE_NONE(0),
-  CKSUMTYPE_CRC32(1),
-  CKSUMTYPE_RSA_MD4(2),
-  CKSUMTYPE_RSA_MD4_DES(3),
-  CKSUMTYPE_DES_MAC(4),
-  CKSUMTYPE_DES_MAC_K(5),
-  CKSUMTYPE_RSA_MD4_DES_K(6),
-  CKSUMTYPE_RSA_MD5(7),
-  CKSUMTYPE_RSA_MD5_DES(8),
-  CKSUMTYPE_RSA_MD5_DES3(9),
-  CKSUMTYPE_SHA1_OTHER(10),
-  CKSUMTYPE_HMAC_SHA1_DES3(12),
-  CKSUMTYPE_SHA1(14),
-  CKSUMTYPE_HMAC_SHA1_96_AES_128(15),
-  CKSUMTYPE_HMAC_SHA1_96_AES_256(16),
-  CKSUMTYPE_GSSAPI(32771),
-  CKSUMTYPE_HMAC_MD5(-138),
-  CKSUMTYPE_HMAC_MD5_ENC(-1138)
-}
-*/
-
-typedef enum CKSUMTYPE {
-  CKSUMTYPE_NONE = 0,
-  CKSUMTYPE_CRC32 = 1,
-  CKSUMTYPE_RSA_MD4 = 2,
-  CKSUMTYPE_RSA_MD4_DES = 3,
-  CKSUMTYPE_DES_MAC = 4,
-  CKSUMTYPE_DES_MAC_K = 5,
-  CKSUMTYPE_RSA_MD4_DES_K = 6,
-  CKSUMTYPE_RSA_MD5 = 7,
-  CKSUMTYPE_RSA_MD5_DES = 8,
-  CKSUMTYPE_RSA_MD5_DES3 = 9,
-  CKSUMTYPE_SHA1_OTHER = 10,
-  CKSUMTYPE_HMAC_SHA1_DES3 = 12,
-  CKSUMTYPE_SHA1 = 14,
-  CKSUMTYPE_HMAC_SHA1_96_AES_128 = 15,
-  CKSUMTYPE_HMAC_SHA1_96_AES_256 = 16,
-  CKSUMTYPE_GSSAPI = 32771,
-  CKSUMTYPE_HMAC_MD5 = -138,
-  CKSUMTYPE_HMAC_MD5_ENC = -1138
-} CKSUMTYPE;
-
-ASN1EXP int    ASN1CALL decode_CKSUMTYPE(const unsigned char *, size_t, CKSUMTYPE *, size_t *);
-ASN1EXP int    ASN1CALL encode_CKSUMTYPE(unsigned char *, size_t, const CKSUMTYPE *, size_t *);
-ASN1EXP size_t ASN1CALL length_CKSUMTYPE(const CKSUMTYPE *);
-ASN1EXP int    ASN1CALL copy_CKSUMTYPE  (const CKSUMTYPE *, CKSUMTYPE *);
-ASN1EXP void   ASN1CALL free_CKSUMTYPE  (CKSUMTYPE *);
-
-
-/*
-ENCTYPE ::= INTEGER {
-  KRB5_ENCTYPE_NULL(0),
-  KRB5_ENCTYPE_DES_CBC_CRC(1),
-  KRB5_ENCTYPE_DES_CBC_MD4(2),
-  KRB5_ENCTYPE_DES_CBC_MD5(3),
-  KRB5_ENCTYPE_DES3_CBC_MD5(5),
-  KRB5_ENCTYPE_OLD_DES3_CBC_SHA1(7),
-  KRB5_ENCTYPE_SIGN_DSA_GENERATE(8),
-  KRB5_ENCTYPE_ENCRYPT_RSA_PRIV(9),
-  KRB5_ENCTYPE_ENCRYPT_RSA_PUB(10),
-  KRB5_ENCTYPE_DES3_CBC_SHA1(16),
-  KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96(17),
-  KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96(18),
-  KRB5_ENCTYPE_ARCFOUR_HMAC_MD5(23),
-  KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56(24),
-  KRB5_ENCTYPE_ENCTYPE_PK_CROSS(48),
-  KRB5_ENCTYPE_ARCFOUR_MD4(-128),
-  KRB5_ENCTYPE_ARCFOUR_HMAC_OLD(-133),
-  KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP(-135),
-  KRB5_ENCTYPE_DES_CBC_NONE(-4096),
-  KRB5_ENCTYPE_DES3_CBC_NONE(-4097),
-  KRB5_ENCTYPE_DES_CFB64_NONE(-4098),
-  KRB5_ENCTYPE_DES_PCBC_NONE(-4099),
-  KRB5_ENCTYPE_DIGEST_MD5_NONE(-4100),
-  KRB5_ENCTYPE_CRAM_MD5_NONE(-4101)
-}
-*/
-
-typedef enum ENCTYPE {
-  KRB5_ENCTYPE_NULL = 0,
-  KRB5_ENCTYPE_DES_CBC_CRC = 1,
-  KRB5_ENCTYPE_DES_CBC_MD4 = 2,
-  KRB5_ENCTYPE_DES_CBC_MD5 = 3,
-  KRB5_ENCTYPE_DES3_CBC_MD5 = 5,
-  KRB5_ENCTYPE_OLD_DES3_CBC_SHA1 = 7,
-  KRB5_ENCTYPE_SIGN_DSA_GENERATE = 8,
-  KRB5_ENCTYPE_ENCRYPT_RSA_PRIV = 9,
-  KRB5_ENCTYPE_ENCRYPT_RSA_PUB = 10,
-  KRB5_ENCTYPE_DES3_CBC_SHA1 = 16,
-  KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 = 17,
-  KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 = 18,
-  KRB5_ENCTYPE_ARCFOUR_HMAC_MD5 = 23,
-  KRB5_ENCTYPE_ARCFOUR_HMAC_MD5_56 = 24,
-  KRB5_ENCTYPE_ENCTYPE_PK_CROSS = 48,
-  KRB5_ENCTYPE_ARCFOUR_MD4 = -128,
-  KRB5_ENCTYPE_ARCFOUR_HMAC_OLD = -133,
-  KRB5_ENCTYPE_ARCFOUR_HMAC_OLD_EXP = -135,
-  KRB5_ENCTYPE_DES_CBC_NONE = -4096,
-  KRB5_ENCTYPE_DES3_CBC_NONE = -4097,
-  KRB5_ENCTYPE_DES_CFB64_NONE = -4098,
-  KRB5_ENCTYPE_DES_PCBC_NONE = -4099,
-  KRB5_ENCTYPE_DIGEST_MD5_NONE = -4100,
-  KRB5_ENCTYPE_CRAM_MD5_NONE = -4101
-} ENCTYPE;
-
-ASN1EXP int    ASN1CALL decode_ENCTYPE(const unsigned char *, size_t, ENCTYPE *, size_t *);
-ASN1EXP int    ASN1CALL encode_ENCTYPE(unsigned char *, size_t, const ENCTYPE *, size_t *);
-ASN1EXP size_t ASN1CALL length_ENCTYPE(const ENCTYPE *);
-ASN1EXP int    ASN1CALL copy_ENCTYPE  (const ENCTYPE *, ENCTYPE *);
-ASN1EXP void   ASN1CALL free_ENCTYPE  (ENCTYPE *);
-
-
-/*
-krb5uint32 ::= INTEGER (0..2147483647)
-*/
-
-typedef unsigned int krb5uint32;
-
-/*
-krb5int32 ::= INTEGER (-2147483648..2147483647)
-*/
-
-typedef int krb5int32;
-
-/*
-KerberosString ::= GeneralString
-*/
-
-typedef heim_general_string KerberosString;
-
-ASN1EXP int    ASN1CALL decode_KerberosString(const unsigned char *, size_t, KerberosString *, size_t *);
-ASN1EXP int    ASN1CALL encode_KerberosString(unsigned char *, size_t, const KerberosString *, size_t *);
-ASN1EXP size_t ASN1CALL length_KerberosString(const KerberosString *);
-ASN1EXP int    ASN1CALL copy_KerberosString  (const KerberosString *, KerberosString *);
-ASN1EXP void   ASN1CALL free_KerberosString  (KerberosString *);
-
-
-/*
-Realm ::= GeneralString
-*/
-
-typedef heim_general_string Realm;
-
-ASN1EXP int    ASN1CALL decode_Realm(const unsigned char *, size_t, Realm *, size_t *);
-ASN1EXP int    ASN1CALL encode_Realm(unsigned char *, size_t, const Realm *, size_t *);
-ASN1EXP size_t ASN1CALL length_Realm(const Realm *);
-ASN1EXP int    ASN1CALL copy_Realm  (const Realm *, Realm *);
-ASN1EXP void   ASN1CALL free_Realm  (Realm *);
-
-
-/*
-PrincipalName ::= SEQUENCE {
-  name-type       [0] NAME-TYPE,
-  name-string     [1] SEQUENCE OF GeneralString,
-}
-*/
-
-typedef struct PrincipalName {
-  NAME_TYPE name_type;
-  struct PrincipalName_name_string {
-    unsigned int len;
-    heim_general_string *val;
-  } name_string;
-} PrincipalName;
-
-ASN1EXP int    ASN1CALL decode_PrincipalName(const unsigned char *, size_t, PrincipalName *, size_t *);
-ASN1EXP int    ASN1CALL encode_PrincipalName(unsigned char *, size_t, const PrincipalName *, size_t *);
-ASN1EXP size_t ASN1CALL length_PrincipalName(const PrincipalName *);
-ASN1EXP int    ASN1CALL copy_PrincipalName  (const PrincipalName *, PrincipalName *);
-ASN1EXP void   ASN1CALL free_PrincipalName  (PrincipalName *);
-
-
-/*
-Principal ::= SEQUENCE {
-  name            [0] PrincipalName,
-  realm           [1] Realm,
-}
-*/
-
-typedef struct Principal {
-  PrincipalName name;
-  Realm realm;
-} Principal;
-
-ASN1EXP int    ASN1CALL decode_Principal(const unsigned char *, size_t, Principal *, size_t *);
-ASN1EXP int    ASN1CALL encode_Principal(unsigned char *, size_t, const Principal *, size_t *);
-ASN1EXP size_t ASN1CALL length_Principal(const Principal *);
-ASN1EXP int    ASN1CALL copy_Principal  (const Principal *, Principal *);
-ASN1EXP void   ASN1CALL free_Principal  (Principal *);
-
-
-/*
-Principals ::= SEQUENCE OF Principal
-*/
-
-typedef struct Principals {
-  unsigned int len;
-  Principal *val;
-} Principals;
-
-ASN1EXP int   ASN1CALL add_Principals  (Principals *, const Principal *);
-ASN1EXP int   ASN1CALL remove_Principals  (Principals *, unsigned int);
-ASN1EXP int    ASN1CALL decode_Principals(const unsigned char *, size_t, Principals *, size_t *);
-ASN1EXP int    ASN1CALL encode_Principals(unsigned char *, size_t, const Principals *, size_t *);
-ASN1EXP size_t ASN1CALL length_Principals(const Principals *);
-ASN1EXP int    ASN1CALL copy_Principals  (const Principals *, Principals *);
-ASN1EXP void   ASN1CALL free_Principals  (Principals *);
-
-
-/*
-HostAddress ::= SEQUENCE {
-  addr-type       [0] krb5int32,
-  address         [1] OCTET STRING,
-}
-*/
-
-typedef struct HostAddress {
-  krb5int32 addr_type;
-  heim_octet_string address;
-} HostAddress;
-
-ASN1EXP int    ASN1CALL decode_HostAddress(const unsigned char *, size_t, HostAddress *, size_t *);
-ASN1EXP int    ASN1CALL encode_HostAddress(unsigned char *, size_t, const HostAddress *, size_t *);
-ASN1EXP size_t ASN1CALL length_HostAddress(const HostAddress *);
-ASN1EXP int    ASN1CALL copy_HostAddress  (const HostAddress *, HostAddress *);
-ASN1EXP void   ASN1CALL free_HostAddress  (HostAddress *);
-
-
-/*
-HostAddresses ::= SEQUENCE OF HostAddress
-*/
-
-typedef struct HostAddresses {
-  unsigned int len;
-  HostAddress *val;
-} HostAddresses;
-
-ASN1EXP int    ASN1CALL decode_HostAddresses(const unsigned char *, size_t, HostAddresses *, size_t *);
-ASN1EXP int    ASN1CALL encode_HostAddresses(unsigned char *, size_t, const HostAddresses *, size_t *);
-ASN1EXP size_t ASN1CALL length_HostAddresses(const HostAddresses *);
-ASN1EXP int    ASN1CALL copy_HostAddresses  (const HostAddresses *, HostAddresses *);
-ASN1EXP void   ASN1CALL free_HostAddresses  (HostAddresses *);
-
-
-/*
-KerberosTime ::= GeneralizedTime
-*/
-
-typedef time_t KerberosTime;
-
-ASN1EXP int    ASN1CALL decode_KerberosTime(const unsigned char *, size_t, KerberosTime *, size_t *);
-ASN1EXP int    ASN1CALL encode_KerberosTime(unsigned char *, size_t, const KerberosTime *, size_t *);
-ASN1EXP size_t ASN1CALL length_KerberosTime(const KerberosTime *);
-ASN1EXP int    ASN1CALL copy_KerberosTime  (const KerberosTime *, KerberosTime *);
-ASN1EXP void   ASN1CALL free_KerberosTime  (KerberosTime *);
-
-
-/*
-AuthorizationDataElement ::= SEQUENCE {
-  ad-type         [0] krb5int32,
-  ad-data         [1] OCTET STRING,
-}
-*/
-
-typedef struct AuthorizationDataElement {
-  krb5int32 ad_type;
-  heim_octet_string ad_data;
-} AuthorizationDataElement;
-
-ASN1EXP int    ASN1CALL decode_AuthorizationDataElement(const unsigned char *, size_t, AuthorizationDataElement *, size_t *);
-ASN1EXP int    ASN1CALL encode_AuthorizationDataElement(unsigned char *, size_t, const AuthorizationDataElement *, size_t *);
-ASN1EXP size_t ASN1CALL length_AuthorizationDataElement(const AuthorizationDataElement *);
-ASN1EXP int    ASN1CALL copy_AuthorizationDataElement  (const AuthorizationDataElement *, AuthorizationDataElement *);
-ASN1EXP void   ASN1CALL free_AuthorizationDataElement  (AuthorizationDataElement *);
-
-
-/*
-AuthorizationData ::= SEQUENCE OF AuthorizationDataElement
-*/
-
-typedef struct AuthorizationData {
-  unsigned int len;
-  AuthorizationDataElement *val;
-} AuthorizationData;
-
-ASN1EXP int   ASN1CALL add_AuthorizationData  (AuthorizationData *, const AuthorizationDataElement *);
-ASN1EXP int   ASN1CALL remove_AuthorizationData  (AuthorizationData *, unsigned int);
-ASN1EXP int    ASN1CALL decode_AuthorizationData(const unsigned char *, size_t, AuthorizationData *, size_t *);
-ASN1EXP int    ASN1CALL encode_AuthorizationData(unsigned char *, size_t, const AuthorizationData *, size_t *);
-ASN1EXP size_t ASN1CALL length_AuthorizationData(const AuthorizationData *);
-ASN1EXP int    ASN1CALL copy_AuthorizationData  (const AuthorizationData *, AuthorizationData *);
-ASN1EXP void   ASN1CALL free_AuthorizationData  (AuthorizationData *);
-
-
-/*
-APOptions ::= BIT STRING {
-  reserved(0),
-  use-session-key(1),
-  mutual-required(2)
-}
-*/
-
-typedef struct APOptions {
-  unsigned int reserved:1;
-  unsigned int use_session_key:1;
-  unsigned int mutual_required:1;
-  unsigned int _unused3:1;
-  unsigned int _unused4:1;
-  unsigned int _unused5:1;
-  unsigned int _unused6:1;
-  unsigned int _unused7:1;
-  unsigned int _unused8:1;
-  unsigned int _unused9:1;
-  unsigned int _unused10:1;
-  unsigned int _unused11:1;
-  unsigned int _unused12:1;
-  unsigned int _unused13:1;
-  unsigned int _unused14:1;
-  unsigned int _unused15:1;
-  unsigned int _unused16:1;
-  unsigned int _unused17:1;
-  unsigned int _unused18:1;
-  unsigned int _unused19:1;
-  unsigned int _unused20:1;
-  unsigned int _unused21:1;
-  unsigned int _unused22:1;
-  unsigned int _unused23:1;
-  unsigned int _unused24:1;
-  unsigned int _unused25:1;
-  unsigned int _unused26:1;
-  unsigned int _unused27:1;
-  unsigned int _unused28:1;
-  unsigned int _unused29:1;
-  unsigned int _unused30:1;
-  unsigned int _unused31:1;
-} APOptions;
-
-
-unsigned APOptions2int(APOptions);
-APOptions int2APOptions(unsigned);
-const struct units * asn1_APOptions_units(void);
-/*
-TicketFlags ::= BIT STRING {
-  reserved(0),
-  forwardable(1),
-  forwarded(2),
-  proxiable(3),
-  proxy(4),
-  may-postdate(5),
-  postdated(6),
-  invalid(7),
-  renewable(8),
-  initial(9),
-  pre-authent(10),
-  hw-authent(11),
-  transited-policy-checked(12),
-  ok-as-delegate(13),
-  anonymous(14),
-  enc-pa-rep(15)
-}
-*/
-
-typedef struct TicketFlags {
-  unsigned int reserved:1;
-  unsigned int forwardable:1;
-  unsigned int forwarded:1;
-  unsigned int proxiable:1;
-  unsigned int proxy:1;
-  unsigned int may_postdate:1;
-  unsigned int postdated:1;
-  unsigned int invalid:1;
-  unsigned int renewable:1;
-  unsigned int initial:1;
-  unsigned int pre_authent:1;
-  unsigned int hw_authent:1;
-  unsigned int transited_policy_checked:1;
-  unsigned int ok_as_delegate:1;
-  unsigned int anonymous:1;
-  unsigned int enc_pa_rep:1;
-  unsigned int _unused16:1;
-  unsigned int _unused17:1;
-  unsigned int _unused18:1;
-  unsigned int _unused19:1;
-  unsigned int _unused20:1;
-  unsigned int _unused21:1;
-  unsigned int _unused22:1;
-  unsigned int _unused23:1;
-  unsigned int _unused24:1;
-  unsigned int _unused25:1;
-  unsigned int _unused26:1;
-  unsigned int _unused27:1;
-  unsigned int _unused28:1;
-  unsigned int _unused29:1;
-  unsigned int _unused30:1;
-  unsigned int _unused31:1;
-} TicketFlags;
-
-
-unsigned TicketFlags2int(TicketFlags);
-TicketFlags int2TicketFlags(unsigned);
-const struct units * asn1_TicketFlags_units(void);
-ASN1EXP int    ASN1CALL decode_TicketFlags(const unsigned char *, size_t, TicketFlags *, size_t *);
-ASN1EXP int    ASN1CALL encode_TicketFlags(unsigned char *, size_t, const TicketFlags *, size_t *);
-ASN1EXP size_t ASN1CALL length_TicketFlags(const TicketFlags *);
-ASN1EXP int    ASN1CALL copy_TicketFlags  (const TicketFlags *, TicketFlags *);
-ASN1EXP void   ASN1CALL free_TicketFlags  (TicketFlags *);
-
-
-/*
-KDCOptions ::= BIT STRING {
-  reserved(0),
-  forwardable(1),
-  forwarded(2),
-  proxiable(3),
-  proxy(4),
-  allow-postdate(5),
-  postdated(6),
-  renewable(8),
-  request-anonymous(14),
-  canonicalize(15),
-  constrained-delegation(16),
-  disable-transited-check(26),
-  renewable-ok(27),
-  enc-tkt-in-skey(28),
-  renew(30),
-  validate(31)
-}
-*/
-
-typedef struct KDCOptions {
-  unsigned int reserved:1;
-  unsigned int forwardable:1;
-  unsigned int forwarded:1;
-  unsigned int proxiable:1;
-  unsigned int proxy:1;
-  unsigned int allow_postdate:1;
-  unsigned int postdated:1;
-  unsigned int _unused7:1;
-  unsigned int renewable:1;
-  unsigned int _unused9:1;
-  unsigned int _unused10:1;
-  unsigned int _unused11:1;
-  unsigned int _unused12:1;
-  unsigned int _unused13:1;
-  unsigned int request_anonymous:1;
-  unsigned int canonicalize:1;
-  unsigned int constrained_delegation:1;
-  unsigned int _unused17:1;
-  unsigned int _unused18:1;
-  unsigned int _unused19:1;
-  unsigned int _unused20:1;
-  unsigned int _unused21:1;
-  unsigned int _unused22:1;
-  unsigned int _unused23:1;
-  unsigned int _unused24:1;
-  unsigned int _unused25:1;
-  unsigned int disable_transited_check:1;
-  unsigned int renewable_ok:1;
-  unsigned int enc_tkt_in_skey:1;
-  unsigned int _unused29:1;
-  unsigned int renew:1;
-  unsigned int validate:1;
-} KDCOptions;
-
-
-unsigned KDCOptions2int(KDCOptions);
-KDCOptions int2KDCOptions(unsigned);
-const struct units * asn1_KDCOptions_units(void);
-ASN1EXP int    ASN1CALL decode_KDCOptions(const unsigned char *, size_t, KDCOptions *, size_t *);
-ASN1EXP int    ASN1CALL encode_KDCOptions(unsigned char *, size_t, const KDCOptions *, size_t *);
-ASN1EXP size_t ASN1CALL length_KDCOptions(const KDCOptions *);
-ASN1EXP int    ASN1CALL copy_KDCOptions  (const KDCOptions *, KDCOptions *);
-ASN1EXP void   ASN1CALL free_KDCOptions  (KDCOptions *);
-
-
-/*
-LR-TYPE ::= INTEGER {
-  LR_NONE(0),
-  LR_INITIAL_TGT(1),
-  LR_INITIAL(2),
-  LR_ISSUE_USE_TGT(3),
-  LR_RENEWAL(4),
-  LR_REQUEST(5),
-  LR_PW_EXPTIME(6),
-  LR_ACCT_EXPTIME(7)
-}
-*/
-
-typedef enum LR_TYPE {
-  LR_NONE = 0,
-  LR_INITIAL_TGT = 1,
-  LR_INITIAL = 2,
-  LR_ISSUE_USE_TGT = 3,
-  LR_RENEWAL = 4,
-  LR_REQUEST = 5,
-  LR_PW_EXPTIME = 6,
-  LR_ACCT_EXPTIME = 7
-} LR_TYPE;
-
-ASN1EXP int    ASN1CALL decode_LR_TYPE(const unsigned char *, size_t, LR_TYPE *, size_t *);
-ASN1EXP int    ASN1CALL encode_LR_TYPE(unsigned char *, size_t, const LR_TYPE *, size_t *);
-ASN1EXP size_t ASN1CALL length_LR_TYPE(const LR_TYPE *);
-ASN1EXP int    ASN1CALL copy_LR_TYPE  (const LR_TYPE *, LR_TYPE *);
-ASN1EXP void   ASN1CALL free_LR_TYPE  (LR_TYPE *);
-
-
-/*
-LastReq ::= SEQUENCE OF SEQUENCE {
-  lr-type         [0] LR-TYPE,
-  lr-value        [1] KerberosTime,
-}
-*/
-
-typedef struct LastReq {
-  unsigned int len;
-  struct LastReq_val {
-    LR_TYPE lr_type;
-    KerberosTime lr_value;
-  } *val;
-} LastReq;
-
-ASN1EXP int    ASN1CALL decode_LastReq(const unsigned char *, size_t, LastReq *, size_t *);
-ASN1EXP int    ASN1CALL encode_LastReq(unsigned char *, size_t, const LastReq *, size_t *);
-ASN1EXP size_t ASN1CALL length_LastReq(const LastReq *);
-ASN1EXP int    ASN1CALL copy_LastReq  (const LastReq *, LastReq *);
-ASN1EXP void   ASN1CALL free_LastReq  (LastReq *);
-
-
-/*
-EncryptedData ::= SEQUENCE {
-  etype           [0] ENCTYPE,
-  kvno            [1] krb5uint32 OPTIONAL,
-  cipher          [2] OCTET STRING,
-}
-*/
-
-typedef struct EncryptedData {
-  ENCTYPE etype;
-  krb5uint32 *kvno;
-  heim_octet_string cipher;
-} EncryptedData;
-
-ASN1EXP int    ASN1CALL decode_EncryptedData(const unsigned char *, size_t, EncryptedData *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncryptedData(unsigned char *, size_t, const EncryptedData *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncryptedData(const EncryptedData *);
-ASN1EXP int    ASN1CALL copy_EncryptedData  (const EncryptedData *, EncryptedData *);
-ASN1EXP void   ASN1CALL free_EncryptedData  (EncryptedData *);
-
-
-/*
-EncryptionKey ::= SEQUENCE {
-  keytype         [0] krb5int32,
-  keyvalue        [1] OCTET STRING,
-}
-*/
-
-typedef struct EncryptionKey {
-  krb5int32 keytype;
-  heim_octet_string keyvalue;
-} EncryptionKey;
-
-ASN1EXP int    ASN1CALL decode_EncryptionKey(const unsigned char *, size_t, EncryptionKey *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncryptionKey(unsigned char *, size_t, const EncryptionKey *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncryptionKey(const EncryptionKey *);
-ASN1EXP int    ASN1CALL copy_EncryptionKey  (const EncryptionKey *, EncryptionKey *);
-ASN1EXP void   ASN1CALL free_EncryptionKey  (EncryptionKey *);
-
-
-/*
-TransitedEncoding ::= SEQUENCE {
-  tr-type         [0] krb5int32,
-  contents        [1] OCTET STRING,
-}
-*/
-
-typedef struct TransitedEncoding {
-  krb5int32 tr_type;
-  heim_octet_string contents;
-} TransitedEncoding;
-
-ASN1EXP int    ASN1CALL decode_TransitedEncoding(const unsigned char *, size_t, TransitedEncoding *, size_t *);
-ASN1EXP int    ASN1CALL encode_TransitedEncoding(unsigned char *, size_t, const TransitedEncoding *, size_t *);
-ASN1EXP size_t ASN1CALL length_TransitedEncoding(const TransitedEncoding *);
-ASN1EXP int    ASN1CALL copy_TransitedEncoding  (const TransitedEncoding *, TransitedEncoding *);
-ASN1EXP void   ASN1CALL free_TransitedEncoding  (TransitedEncoding *);
-
-
-/*
-Ticket ::= [APPLICATION 1] SEQUENCE {
-  tkt-vno         [0] krb5int32,
-  realm           [1] Realm,
-  sname           [2] PrincipalName,
-  enc-part        [3] EncryptedData,
-}
-*/
-
-typedef struct Ticket {
-  krb5int32 tkt_vno;
-  Realm realm;
-  PrincipalName sname;
-  EncryptedData enc_part;
-} Ticket;
-
-ASN1EXP int    ASN1CALL decode_Ticket(const unsigned char *, size_t, Ticket *, size_t *);
-ASN1EXP int    ASN1CALL encode_Ticket(unsigned char *, size_t, const Ticket *, size_t *);
-ASN1EXP size_t ASN1CALL length_Ticket(const Ticket *);
-ASN1EXP int    ASN1CALL copy_Ticket  (const Ticket *, Ticket *);
-ASN1EXP void   ASN1CALL free_Ticket  (Ticket *);
-
-
-/*
-EncTicketPart ::= [APPLICATION 3] SEQUENCE {
-  flags                [0] TicketFlags,
-  key                  [1] EncryptionKey,
-  crealm               [2] Realm,
-  cname                [3] PrincipalName,
-  transited            [4] TransitedEncoding,
-  authtime             [5] KerberosTime,
-  starttime            [6] KerberosTime OPTIONAL,
-  endtime              [7] KerberosTime,
-  renew-till           [8] KerberosTime OPTIONAL,
-  caddr                [9] HostAddresses OPTIONAL,
-  authorization-data   [10] AuthorizationData OPTIONAL,
-}
-*/
-
-typedef struct EncTicketPart {
-  TicketFlags flags;
-  EncryptionKey key;
-  Realm crealm;
-  PrincipalName cname;
-  TransitedEncoding transited;
-  KerberosTime authtime;
-  KerberosTime *starttime;
-  KerberosTime endtime;
-  KerberosTime *renew_till;
-  HostAddresses *caddr;
-  AuthorizationData *authorization_data;
-} EncTicketPart;
-
-ASN1EXP int    ASN1CALL decode_EncTicketPart(const unsigned char *, size_t, EncTicketPart *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncTicketPart(unsigned char *, size_t, const EncTicketPart *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncTicketPart(const EncTicketPart *);
-ASN1EXP int    ASN1CALL copy_EncTicketPart  (const EncTicketPart *, EncTicketPart *);
-ASN1EXP void   ASN1CALL free_EncTicketPart  (EncTicketPart *);
-
-
-/*
-Checksum ::= SEQUENCE {
-  cksumtype       [0] CKSUMTYPE,
-  checksum        [1] OCTET STRING,
-}
-*/
-
-typedef struct Checksum {
-  CKSUMTYPE cksumtype;
-  heim_octet_string checksum;
-} Checksum;
-
-ASN1EXP int    ASN1CALL decode_Checksum(const unsigned char *, size_t, Checksum *, size_t *);
-ASN1EXP int    ASN1CALL encode_Checksum(unsigned char *, size_t, const Checksum *, size_t *);
-ASN1EXP size_t ASN1CALL length_Checksum(const Checksum *);
-ASN1EXP int    ASN1CALL copy_Checksum  (const Checksum *, Checksum *);
-ASN1EXP void   ASN1CALL free_Checksum  (Checksum *);
-
-
-/*
-Authenticator ::= [APPLICATION 2] SEQUENCE {
-  authenticator-vno    [0] krb5int32,
-  crealm               [1] Realm,
-  cname                [2] PrincipalName,
-  cksum                [3] Checksum OPTIONAL,
-  cusec                [4] krb5int32,
-  ctime                [5] KerberosTime,
-  subkey               [6] EncryptionKey OPTIONAL,
-  seq-number           [7] krb5uint32 OPTIONAL,
-  authorization-data   [8] AuthorizationData OPTIONAL,
-}
-*/
-
-typedef struct Authenticator {
-  krb5int32 authenticator_vno;
-  Realm crealm;
-  PrincipalName cname;
-  Checksum *cksum;
-  krb5int32 cusec;
-  KerberosTime ctime;
-  EncryptionKey *subkey;
-  krb5uint32 *seq_number;
-  AuthorizationData *authorization_data;
-} Authenticator;
-
-ASN1EXP int    ASN1CALL decode_Authenticator(const unsigned char *, size_t, Authenticator *, size_t *);
-ASN1EXP int    ASN1CALL encode_Authenticator(unsigned char *, size_t, const Authenticator *, size_t *);
-ASN1EXP size_t ASN1CALL length_Authenticator(const Authenticator *);
-ASN1EXP int    ASN1CALL copy_Authenticator  (const Authenticator *, Authenticator *);
-ASN1EXP void   ASN1CALL free_Authenticator  (Authenticator *);
-
-
-/*
-PA-DATA ::= SEQUENCE {
-  padata-type     [1] PADATA-TYPE,
-  padata-value    [2] OCTET STRING,
-}
-*/
-
-typedef struct PA_DATA {
-  PADATA_TYPE padata_type;
-  heim_octet_string padata_value;
-} PA_DATA;
-
-ASN1EXP int    ASN1CALL decode_PA_DATA(const unsigned char *, size_t, PA_DATA *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_DATA(unsigned char *, size_t, const PA_DATA *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_DATA(const PA_DATA *);
-ASN1EXP int    ASN1CALL copy_PA_DATA  (const PA_DATA *, PA_DATA *);
-ASN1EXP void   ASN1CALL free_PA_DATA  (PA_DATA *);
-
-
-/*
-ETYPE-INFO-ENTRY ::= SEQUENCE {
-  etype           [0] ENCTYPE,
-  salt            [1] OCTET STRING OPTIONAL,
-  salttype        [2] krb5int32 OPTIONAL,
-}
-*/
-
-typedef struct ETYPE_INFO_ENTRY {
-  ENCTYPE etype;
-  heim_octet_string *salt;
-  krb5int32 *salttype;
-} ETYPE_INFO_ENTRY;
-
-ASN1EXP int    ASN1CALL decode_ETYPE_INFO_ENTRY(const unsigned char *, size_t, ETYPE_INFO_ENTRY *, size_t *);
-ASN1EXP int    ASN1CALL encode_ETYPE_INFO_ENTRY(unsigned char *, size_t, const ETYPE_INFO_ENTRY *, size_t *);
-ASN1EXP size_t ASN1CALL length_ETYPE_INFO_ENTRY(const ETYPE_INFO_ENTRY *);
-ASN1EXP int    ASN1CALL copy_ETYPE_INFO_ENTRY  (const ETYPE_INFO_ENTRY *, ETYPE_INFO_ENTRY *);
-ASN1EXP void   ASN1CALL free_ETYPE_INFO_ENTRY  (ETYPE_INFO_ENTRY *);
-
-
-/*
-ETYPE-INFO ::= SEQUENCE OF ETYPE-INFO-ENTRY
-*/
-
-typedef struct ETYPE_INFO {
-  unsigned int len;
-  ETYPE_INFO_ENTRY *val;
-} ETYPE_INFO;
-
-ASN1EXP int   ASN1CALL add_ETYPE_INFO  (ETYPE_INFO *, const ETYPE_INFO_ENTRY *);
-ASN1EXP int   ASN1CALL remove_ETYPE_INFO  (ETYPE_INFO *, unsigned int);
-ASN1EXP int    ASN1CALL decode_ETYPE_INFO(const unsigned char *, size_t, ETYPE_INFO *, size_t *);
-ASN1EXP int    ASN1CALL encode_ETYPE_INFO(unsigned char *, size_t, const ETYPE_INFO *, size_t *);
-ASN1EXP size_t ASN1CALL length_ETYPE_INFO(const ETYPE_INFO *);
-ASN1EXP int    ASN1CALL copy_ETYPE_INFO  (const ETYPE_INFO *, ETYPE_INFO *);
-ASN1EXP void   ASN1CALL free_ETYPE_INFO  (ETYPE_INFO *);
-
-
-/*
-ETYPE-INFO2-ENTRY ::= SEQUENCE {
-  etype           [0] ENCTYPE,
-  salt            [1] KerberosString OPTIONAL,
-  s2kparams       [2] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct ETYPE_INFO2_ENTRY {
-  ENCTYPE etype;
-  KerberosString *salt;
-  heim_octet_string *s2kparams;
-} ETYPE_INFO2_ENTRY;
-
-ASN1EXP int    ASN1CALL decode_ETYPE_INFO2_ENTRY(const unsigned char *, size_t, ETYPE_INFO2_ENTRY *, size_t *);
-ASN1EXP int    ASN1CALL encode_ETYPE_INFO2_ENTRY(unsigned char *, size_t, const ETYPE_INFO2_ENTRY *, size_t *);
-ASN1EXP size_t ASN1CALL length_ETYPE_INFO2_ENTRY(const ETYPE_INFO2_ENTRY *);
-ASN1EXP int    ASN1CALL copy_ETYPE_INFO2_ENTRY  (const ETYPE_INFO2_ENTRY *, ETYPE_INFO2_ENTRY *);
-ASN1EXP void   ASN1CALL free_ETYPE_INFO2_ENTRY  (ETYPE_INFO2_ENTRY *);
-
-
-/*
-ETYPE-INFO2 ::= SEQUENCE OF ETYPE-INFO2-ENTRY
-*/
-
-typedef struct ETYPE_INFO2 {
-  unsigned int len;
-  ETYPE_INFO2_ENTRY *val;
-} ETYPE_INFO2;
-
-ASN1EXP int   ASN1CALL add_ETYPE_INFO2  (ETYPE_INFO2 *, const ETYPE_INFO2_ENTRY *);
-ASN1EXP int   ASN1CALL remove_ETYPE_INFO2  (ETYPE_INFO2 *, unsigned int);
-ASN1EXP int    ASN1CALL decode_ETYPE_INFO2(const unsigned char *, size_t, ETYPE_INFO2 *, size_t *);
-ASN1EXP int    ASN1CALL encode_ETYPE_INFO2(unsigned char *, size_t, const ETYPE_INFO2 *, size_t *);
-ASN1EXP size_t ASN1CALL length_ETYPE_INFO2(const ETYPE_INFO2 *);
-ASN1EXP int    ASN1CALL copy_ETYPE_INFO2  (const ETYPE_INFO2 *, ETYPE_INFO2 *);
-ASN1EXP void   ASN1CALL free_ETYPE_INFO2  (ETYPE_INFO2 *);
-
-
-/*
-METHOD-DATA ::= SEQUENCE OF PA-DATA
-*/
-
-typedef struct METHOD_DATA {
-  unsigned int len;
-  PA_DATA *val;
-} METHOD_DATA;
-
-ASN1EXP int   ASN1CALL add_METHOD_DATA  (METHOD_DATA *, const PA_DATA *);
-ASN1EXP int   ASN1CALL remove_METHOD_DATA  (METHOD_DATA *, unsigned int);
-ASN1EXP int    ASN1CALL decode_METHOD_DATA(const unsigned char *, size_t, METHOD_DATA *, size_t *);
-ASN1EXP int    ASN1CALL encode_METHOD_DATA(unsigned char *, size_t, const METHOD_DATA *, size_t *);
-ASN1EXP size_t ASN1CALL length_METHOD_DATA(const METHOD_DATA *);
-ASN1EXP int    ASN1CALL copy_METHOD_DATA  (const METHOD_DATA *, METHOD_DATA *);
-ASN1EXP void   ASN1CALL free_METHOD_DATA  (METHOD_DATA *);
-
-
-/*
-TypedData ::= SEQUENCE {
-  data-type       [0] krb5int32,
-  data-value      [1] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct TypedData {
-  krb5int32 data_type;
-  heim_octet_string *data_value;
-} TypedData;
-
-ASN1EXP int    ASN1CALL decode_TypedData(const unsigned char *, size_t, TypedData *, size_t *);
-ASN1EXP int    ASN1CALL encode_TypedData(unsigned char *, size_t, const TypedData *, size_t *);
-ASN1EXP size_t ASN1CALL length_TypedData(const TypedData *);
-ASN1EXP int    ASN1CALL copy_TypedData  (const TypedData *, TypedData *);
-ASN1EXP void   ASN1CALL free_TypedData  (TypedData *);
-
-
-/*
-TYPED-DATA ::= SEQUENCE OF TypedData
-*/
-
-typedef struct TYPED_DATA {
-  unsigned int len;
-  TypedData *val;
-} TYPED_DATA;
-
-/*
-KDC-REQ-BODY ::= SEQUENCE {
-  kdc-options              [0] KDCOptions,
-  cname                    [1] PrincipalName OPTIONAL,
-  realm                    [2] Realm,
-  sname                    [3] PrincipalName OPTIONAL,
-  from                     [4] KerberosTime OPTIONAL,
-  till                     [5] KerberosTime OPTIONAL,
-  rtime                    [6] KerberosTime OPTIONAL,
-  nonce                    [7] krb5int32,
-  etype                    [8] SEQUENCE OF ENCTYPE,
-  addresses                [9] HostAddresses OPTIONAL,
-  enc-authorization-data   [10] EncryptedData OPTIONAL,
-  additional-tickets       [11] SEQUENCE OF Ticket OPTIONAL,
-}
-*/
-
-typedef struct KDC_REQ_BODY {
-  KDCOptions kdc_options;
-  PrincipalName *cname;
-  Realm realm;
-  PrincipalName *sname;
-  KerberosTime *from;
-  KerberosTime *till;
-  KerberosTime *rtime;
-  krb5int32 nonce;
-  struct KDC_REQ_BODY_etype {
-    unsigned int len;
-    ENCTYPE *val;
-  } etype;
-  HostAddresses *addresses;
-  EncryptedData *enc_authorization_data;
-  struct KDC_REQ_BODY_additional_tickets {
-    unsigned int len;
-    Ticket *val;
-  } *additional_tickets;
-} KDC_REQ_BODY;
-
-ASN1EXP int    ASN1CALL decode_KDC_REQ_BODY(const unsigned char *, size_t, KDC_REQ_BODY *, size_t *);
-ASN1EXP int    ASN1CALL encode_KDC_REQ_BODY(unsigned char *, size_t, const KDC_REQ_BODY *, size_t *);
-ASN1EXP size_t ASN1CALL length_KDC_REQ_BODY(const KDC_REQ_BODY *);
-ASN1EXP int    ASN1CALL copy_KDC_REQ_BODY  (const KDC_REQ_BODY *, KDC_REQ_BODY *);
-ASN1EXP void   ASN1CALL free_KDC_REQ_BODY  (KDC_REQ_BODY *);
-
-
-/*
-KDC-REQ ::= SEQUENCE {
-  pvno            [1] krb5int32,
-  msg-type        [2] MESSAGE-TYPE,
-  padata          [3] METHOD-DATA OPTIONAL,
-  req-body        [4] KDC-REQ-BODY,
-}
-*/
-
-typedef struct KDC_REQ {
-  krb5int32 pvno;
-  MESSAGE_TYPE msg_type;
-  METHOD_DATA *padata;
-  KDC_REQ_BODY req_body;
-} KDC_REQ;
-
-/*
-AS-REQ ::= [APPLICATION 10] KDC-REQ
-*/
-
-typedef KDC_REQ AS_REQ;
-
-ASN1EXP int    ASN1CALL decode_AS_REQ(const unsigned char *, size_t, AS_REQ *, size_t *);
-ASN1EXP int    ASN1CALL encode_AS_REQ(unsigned char *, size_t, const AS_REQ *, size_t *);
-ASN1EXP size_t ASN1CALL length_AS_REQ(const AS_REQ *);
-ASN1EXP int    ASN1CALL copy_AS_REQ  (const AS_REQ *, AS_REQ *);
-ASN1EXP void   ASN1CALL free_AS_REQ  (AS_REQ *);
-
-
-/*
-TGS-REQ ::= [APPLICATION 12] KDC-REQ
-*/
-
-typedef KDC_REQ TGS_REQ;
-
-ASN1EXP int    ASN1CALL decode_TGS_REQ(const unsigned char *, size_t, TGS_REQ *, size_t *);
-ASN1EXP int    ASN1CALL encode_TGS_REQ(unsigned char *, size_t, const TGS_REQ *, size_t *);
-ASN1EXP size_t ASN1CALL length_TGS_REQ(const TGS_REQ *);
-ASN1EXP int    ASN1CALL copy_TGS_REQ  (const TGS_REQ *, TGS_REQ *);
-ASN1EXP void   ASN1CALL free_TGS_REQ  (TGS_REQ *);
-
-
-/*
-PA-ENC-TS-ENC ::= SEQUENCE {
-  patimestamp     [0] KerberosTime,
-  pausec          [1] krb5int32 OPTIONAL,
-}
-*/
-
-typedef struct PA_ENC_TS_ENC {
-  KerberosTime patimestamp;
-  krb5int32 *pausec;
-} PA_ENC_TS_ENC;
-
-ASN1EXP int    ASN1CALL decode_PA_ENC_TS_ENC(const unsigned char *, size_t, PA_ENC_TS_ENC *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_ENC_TS_ENC(unsigned char *, size_t, const PA_ENC_TS_ENC *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_ENC_TS_ENC(const PA_ENC_TS_ENC *);
-ASN1EXP int    ASN1CALL copy_PA_ENC_TS_ENC  (const PA_ENC_TS_ENC *, PA_ENC_TS_ENC *);
-ASN1EXP void   ASN1CALL free_PA_ENC_TS_ENC  (PA_ENC_TS_ENC *);
-
-
-/*
-PA-PAC-REQUEST ::= SEQUENCE {
-  include-pac     [0] BOOLEAN,
-}
-*/
-
-typedef struct PA_PAC_REQUEST {
-  int include_pac;
-} PA_PAC_REQUEST;
-
-ASN1EXP int    ASN1CALL decode_PA_PAC_REQUEST(const unsigned char *, size_t, PA_PAC_REQUEST *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_PAC_REQUEST(unsigned char *, size_t, const PA_PAC_REQUEST *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_PAC_REQUEST(const PA_PAC_REQUEST *);
-ASN1EXP int    ASN1CALL copy_PA_PAC_REQUEST  (const PA_PAC_REQUEST *, PA_PAC_REQUEST *);
-ASN1EXP void   ASN1CALL free_PA_PAC_REQUEST  (PA_PAC_REQUEST *);
-
-
-/*
-PROV-SRV-LOCATION ::= GeneralString
-*/
-
-typedef heim_general_string PROV_SRV_LOCATION;
-
-/*
-KDC-REP ::= SEQUENCE {
-  pvno            [0] krb5int32,
-  msg-type        [1] MESSAGE-TYPE,
-  padata          [2] METHOD-DATA OPTIONAL,
-  crealm          [3] Realm,
-  cname           [4] PrincipalName,
-  ticket          [5] Ticket,
-  enc-part        [6] EncryptedData,
-}
-*/
-
-typedef struct KDC_REP {
-  krb5int32 pvno;
-  MESSAGE_TYPE msg_type;
-  METHOD_DATA *padata;
-  Realm crealm;
-  PrincipalName cname;
-  Ticket ticket;
-  EncryptedData enc_part;
-} KDC_REP;
-
-ASN1EXP int    ASN1CALL decode_KDC_REP(const unsigned char *, size_t, KDC_REP *, size_t *);
-ASN1EXP int    ASN1CALL encode_KDC_REP(unsigned char *, size_t, const KDC_REP *, size_t *);
-ASN1EXP size_t ASN1CALL length_KDC_REP(const KDC_REP *);
-ASN1EXP int    ASN1CALL copy_KDC_REP  (const KDC_REP *, KDC_REP *);
-ASN1EXP void   ASN1CALL free_KDC_REP  (KDC_REP *);
-
-
-/*
-AS-REP ::= [APPLICATION 11] KDC-REP
-*/
-
-typedef KDC_REP AS_REP;
-
-ASN1EXP int    ASN1CALL decode_AS_REP(const unsigned char *, size_t, AS_REP *, size_t *);
-ASN1EXP int    ASN1CALL encode_AS_REP(unsigned char *, size_t, const AS_REP *, size_t *);
-ASN1EXP size_t ASN1CALL length_AS_REP(const AS_REP *);
-ASN1EXP int    ASN1CALL copy_AS_REP  (const AS_REP *, AS_REP *);
-ASN1EXP void   ASN1CALL free_AS_REP  (AS_REP *);
-
-
-/*
-TGS-REP ::= [APPLICATION 13] KDC-REP
-*/
-
-typedef KDC_REP TGS_REP;
-
-ASN1EXP int    ASN1CALL decode_TGS_REP(const unsigned char *, size_t, TGS_REP *, size_t *);
-ASN1EXP int    ASN1CALL encode_TGS_REP(unsigned char *, size_t, const TGS_REP *, size_t *);
-ASN1EXP size_t ASN1CALL length_TGS_REP(const TGS_REP *);
-ASN1EXP int    ASN1CALL copy_TGS_REP  (const TGS_REP *, TGS_REP *);
-ASN1EXP void   ASN1CALL free_TGS_REP  (TGS_REP *);
-
-
-/*
-EncKDCRepPart ::= SEQUENCE {
-  key                 [0] EncryptionKey,
-  last-req            [1] LastReq,
-  nonce               [2] krb5int32,
-  key-expiration      [3] KerberosTime OPTIONAL,
-  flags               [4] TicketFlags,
-  authtime            [5] KerberosTime,
-  starttime           [6] KerberosTime OPTIONAL,
-  endtime             [7] KerberosTime,
-  renew-till          [8] KerberosTime OPTIONAL,
-  srealm              [9] Realm,
-  sname               [10] PrincipalName,
-  caddr               [11] HostAddresses OPTIONAL,
-  encrypted-pa-data   [12] METHOD-DATA OPTIONAL,
-}
-*/
-
-typedef struct EncKDCRepPart {
-  EncryptionKey key;
-  LastReq last_req;
-  krb5int32 nonce;
-  KerberosTime *key_expiration;
-  TicketFlags flags;
-  KerberosTime authtime;
-  KerberosTime *starttime;
-  KerberosTime endtime;
-  KerberosTime *renew_till;
-  Realm srealm;
-  PrincipalName sname;
-  HostAddresses *caddr;
-  METHOD_DATA *encrypted_pa_data;
-} EncKDCRepPart;
-
-ASN1EXP int    ASN1CALL decode_EncKDCRepPart(const unsigned char *, size_t, EncKDCRepPart *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncKDCRepPart(unsigned char *, size_t, const EncKDCRepPart *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncKDCRepPart(const EncKDCRepPart *);
-ASN1EXP int    ASN1CALL copy_EncKDCRepPart  (const EncKDCRepPart *, EncKDCRepPart *);
-ASN1EXP void   ASN1CALL free_EncKDCRepPart  (EncKDCRepPart *);
-
-
-/*
-EncASRepPart ::= [APPLICATION 25] EncKDCRepPart
-*/
-
-typedef EncKDCRepPart EncASRepPart;
-
-ASN1EXP int    ASN1CALL decode_EncASRepPart(const unsigned char *, size_t, EncASRepPart *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncASRepPart(unsigned char *, size_t, const EncASRepPart *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncASRepPart(const EncASRepPart *);
-ASN1EXP int    ASN1CALL copy_EncASRepPart  (const EncASRepPart *, EncASRepPart *);
-ASN1EXP void   ASN1CALL free_EncASRepPart  (EncASRepPart *);
-
-
-/*
-EncTGSRepPart ::= [APPLICATION 26] EncKDCRepPart
-*/
-
-typedef EncKDCRepPart EncTGSRepPart;
-
-ASN1EXP int    ASN1CALL decode_EncTGSRepPart(const unsigned char *, size_t, EncTGSRepPart *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncTGSRepPart(unsigned char *, size_t, const EncTGSRepPart *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncTGSRepPart(const EncTGSRepPart *);
-ASN1EXP int    ASN1CALL copy_EncTGSRepPart  (const EncTGSRepPart *, EncTGSRepPart *);
-ASN1EXP void   ASN1CALL free_EncTGSRepPart  (EncTGSRepPart *);
-
-
-/*
-AP-REQ ::= [APPLICATION 14] SEQUENCE {
-  pvno            [0] krb5int32,
-  msg-type        [1] MESSAGE-TYPE,
-  ap-options      [2] APOptions,
-  ticket          [3] Ticket,
-  authenticator   [4] EncryptedData,
-}
-*/
-
-typedef struct AP_REQ {
-  krb5int32 pvno;
-  MESSAGE_TYPE msg_type;
-  APOptions ap_options;
-  Ticket ticket;
-  EncryptedData authenticator;
-} AP_REQ;
-
-ASN1EXP int    ASN1CALL decode_AP_REQ(const unsigned char *, size_t, AP_REQ *, size_t *);
-ASN1EXP int    ASN1CALL encode_AP_REQ(unsigned char *, size_t, const AP_REQ *, size_t *);
-ASN1EXP size_t ASN1CALL length_AP_REQ(const AP_REQ *);
-ASN1EXP int    ASN1CALL copy_AP_REQ  (const AP_REQ *, AP_REQ *);
-ASN1EXP void   ASN1CALL free_AP_REQ  (AP_REQ *);
-
-
-/*
-AP-REP ::= [APPLICATION 15] SEQUENCE {
-  pvno            [0] krb5int32,
-  msg-type        [1] MESSAGE-TYPE,
-  enc-part        [2] EncryptedData,
-}
-*/
-
-typedef struct AP_REP {
-  krb5int32 pvno;
-  MESSAGE_TYPE msg_type;
-  EncryptedData enc_part;
-} AP_REP;
-
-ASN1EXP int    ASN1CALL decode_AP_REP(const unsigned char *, size_t, AP_REP *, size_t *);
-ASN1EXP int    ASN1CALL encode_AP_REP(unsigned char *, size_t, const AP_REP *, size_t *);
-ASN1EXP size_t ASN1CALL length_AP_REP(const AP_REP *);
-ASN1EXP int    ASN1CALL copy_AP_REP  (const AP_REP *, AP_REP *);
-ASN1EXP void   ASN1CALL free_AP_REP  (AP_REP *);
-
-
-/*
-EncAPRepPart ::= [APPLICATION 27] SEQUENCE {
-  ctime           [0] KerberosTime,
-  cusec           [1] krb5int32,
-  subkey          [2] EncryptionKey OPTIONAL,
-  seq-number      [3] krb5uint32 OPTIONAL,
-}
-*/
-
-typedef struct EncAPRepPart {
-  KerberosTime ctime;
-  krb5int32 cusec;
-  EncryptionKey *subkey;
-  krb5uint32 *seq_number;
-} EncAPRepPart;
-
-ASN1EXP int    ASN1CALL decode_EncAPRepPart(const unsigned char *, size_t, EncAPRepPart *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncAPRepPart(unsigned char *, size_t, const EncAPRepPart *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncAPRepPart(const EncAPRepPart *);
-ASN1EXP int    ASN1CALL copy_EncAPRepPart  (const EncAPRepPart *, EncAPRepPart *);
-ASN1EXP void   ASN1CALL free_EncAPRepPart  (EncAPRepPart *);
-
-
-/*
-KRB-SAFE-BODY ::= SEQUENCE {
-  user-data       [0] OCTET STRING,
-  timestamp       [1] KerberosTime OPTIONAL,
-  usec            [2] krb5int32 OPTIONAL,
-  seq-number      [3] krb5uint32 OPTIONAL,
-  s-address       [4] HostAddress OPTIONAL,
-  r-address       [5] HostAddress OPTIONAL,
-}
-*/
-
-typedef struct KRB_SAFE_BODY {
-  heim_octet_string user_data;
-  KerberosTime *timestamp;
-  krb5int32 *usec;
-  krb5uint32 *seq_number;
-  HostAddress *s_address;
-  HostAddress *r_address;
-} KRB_SAFE_BODY;
-
-ASN1EXP int    ASN1CALL decode_KRB_SAFE_BODY(const unsigned char *, size_t, KRB_SAFE_BODY *, size_t *);
-ASN1EXP int    ASN1CALL encode_KRB_SAFE_BODY(unsigned char *, size_t, const KRB_SAFE_BODY *, size_t *);
-ASN1EXP size_t ASN1CALL length_KRB_SAFE_BODY(const KRB_SAFE_BODY *);
-ASN1EXP int    ASN1CALL copy_KRB_SAFE_BODY  (const KRB_SAFE_BODY *, KRB_SAFE_BODY *);
-ASN1EXP void   ASN1CALL free_KRB_SAFE_BODY  (KRB_SAFE_BODY *);
-
-
-/*
-KRB-SAFE ::= [APPLICATION 20] SEQUENCE {
-  pvno            [0] krb5int32,
-  msg-type        [1] MESSAGE-TYPE,
-  safe-body       [2] KRB-SAFE-BODY,
-  cksum           [3] Checksum,
-}
-*/
-
-typedef struct KRB_SAFE {
-  krb5int32 pvno;
-  MESSAGE_TYPE msg_type;
-  KRB_SAFE_BODY safe_body;
-  Checksum cksum;
-} KRB_SAFE;
-
-ASN1EXP int    ASN1CALL decode_KRB_SAFE(const unsigned char *, size_t, KRB_SAFE *, size_t *);
-ASN1EXP int    ASN1CALL encode_KRB_SAFE(unsigned char *, size_t, const KRB_SAFE *, size_t *);
-ASN1EXP size_t ASN1CALL length_KRB_SAFE(const KRB_SAFE *);
-ASN1EXP int    ASN1CALL copy_KRB_SAFE  (const KRB_SAFE *, KRB_SAFE *);
-ASN1EXP void   ASN1CALL free_KRB_SAFE  (KRB_SAFE *);
-
-
-/*
-KRB-PRIV ::= [APPLICATION 21] SEQUENCE {
-  pvno            [0] krb5int32,
-  msg-type        [1] MESSAGE-TYPE,
-  enc-part        [3] EncryptedData,
-}
-*/
-
-typedef struct KRB_PRIV {
-  krb5int32 pvno;
-  MESSAGE_TYPE msg_type;
-  EncryptedData enc_part;
-} KRB_PRIV;
-
-ASN1EXP int    ASN1CALL decode_KRB_PRIV(const unsigned char *, size_t, KRB_PRIV *, size_t *);
-ASN1EXP int    ASN1CALL encode_KRB_PRIV(unsigned char *, size_t, const KRB_PRIV *, size_t *);
-ASN1EXP size_t ASN1CALL length_KRB_PRIV(const KRB_PRIV *);
-ASN1EXP int    ASN1CALL copy_KRB_PRIV  (const KRB_PRIV *, KRB_PRIV *);
-ASN1EXP void   ASN1CALL free_KRB_PRIV  (KRB_PRIV *);
-
-
-/*
-EncKrbPrivPart ::= [APPLICATION 28] SEQUENCE {
-  user-data       [0] OCTET STRING,
-  timestamp       [1] KerberosTime OPTIONAL,
-  usec            [2] krb5int32 OPTIONAL,
-  seq-number      [3] krb5uint32 OPTIONAL,
-  s-address       [4] HostAddress OPTIONAL,
-  r-address       [5] HostAddress OPTIONAL,
-}
-*/
-
-typedef struct EncKrbPrivPart {
-  heim_octet_string user_data;
-  KerberosTime *timestamp;
-  krb5int32 *usec;
-  krb5uint32 *seq_number;
-  HostAddress *s_address;
-  HostAddress *r_address;
-} EncKrbPrivPart;
-
-ASN1EXP int    ASN1CALL decode_EncKrbPrivPart(const unsigned char *, size_t, EncKrbPrivPart *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncKrbPrivPart(unsigned char *, size_t, const EncKrbPrivPart *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncKrbPrivPart(const EncKrbPrivPart *);
-ASN1EXP int    ASN1CALL copy_EncKrbPrivPart  (const EncKrbPrivPart *, EncKrbPrivPart *);
-ASN1EXP void   ASN1CALL free_EncKrbPrivPart  (EncKrbPrivPart *);
-
-
-/*
-KRB-CRED ::= [APPLICATION 22] SEQUENCE {
-  pvno            [0] krb5int32,
-  msg-type        [1] MESSAGE-TYPE,
-  tickets         [2] SEQUENCE OF Ticket,
-  enc-part        [3] EncryptedData,
-}
-*/
-
-typedef struct KRB_CRED {
-  krb5int32 pvno;
-  MESSAGE_TYPE msg_type;
-  struct KRB_CRED_tickets {
-    unsigned int len;
-    Ticket *val;
-  } tickets;
-  EncryptedData enc_part;
-} KRB_CRED;
-
-ASN1EXP int    ASN1CALL decode_KRB_CRED(const unsigned char *, size_t, KRB_CRED *, size_t *);
-ASN1EXP int    ASN1CALL encode_KRB_CRED(unsigned char *, size_t, const KRB_CRED *, size_t *);
-ASN1EXP size_t ASN1CALL length_KRB_CRED(const KRB_CRED *);
-ASN1EXP int    ASN1CALL copy_KRB_CRED  (const KRB_CRED *, KRB_CRED *);
-ASN1EXP void   ASN1CALL free_KRB_CRED  (KRB_CRED *);
-
-
-/*
-KrbCredInfo ::= SEQUENCE {
-  key             [0] EncryptionKey,
-  prealm          [1] Realm OPTIONAL,
-  pname           [2] PrincipalName OPTIONAL,
-  flags           [3] TicketFlags OPTIONAL,
-  authtime        [4] KerberosTime OPTIONAL,
-  starttime       [5] KerberosTime OPTIONAL,
-  endtime         [6] KerberosTime OPTIONAL,
-  renew-till      [7] KerberosTime OPTIONAL,
-  srealm          [8] Realm OPTIONAL,
-  sname           [9] PrincipalName OPTIONAL,
-  caddr           [10] HostAddresses OPTIONAL,
-}
-*/
-
-typedef struct KrbCredInfo {
-  EncryptionKey key;
-  Realm *prealm;
-  PrincipalName *pname;
-  TicketFlags *flags;
-  KerberosTime *authtime;
-  KerberosTime *starttime;
-  KerberosTime *endtime;
-  KerberosTime *renew_till;
-  Realm *srealm;
-  PrincipalName *sname;
-  HostAddresses *caddr;
-} KrbCredInfo;
-
-ASN1EXP int    ASN1CALL decode_KrbCredInfo(const unsigned char *, size_t, KrbCredInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_KrbCredInfo(unsigned char *, size_t, const KrbCredInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_KrbCredInfo(const KrbCredInfo *);
-ASN1EXP int    ASN1CALL copy_KrbCredInfo  (const KrbCredInfo *, KrbCredInfo *);
-ASN1EXP void   ASN1CALL free_KrbCredInfo  (KrbCredInfo *);
-
-
-/*
-EncKrbCredPart ::= [APPLICATION 29] SEQUENCE {
-  ticket-info     [0] SEQUENCE OF KrbCredInfo,
-  nonce           [1] krb5int32 OPTIONAL,
-  timestamp       [2] KerberosTime OPTIONAL,
-  usec            [3] krb5int32 OPTIONAL,
-  s-address       [4] HostAddress OPTIONAL,
-  r-address       [5] HostAddress OPTIONAL,
-}
-*/
-
-typedef struct EncKrbCredPart {
-  struct EncKrbCredPart_ticket_info {
-    unsigned int len;
-    KrbCredInfo *val;
-  } ticket_info;
-  krb5int32 *nonce;
-  KerberosTime *timestamp;
-  krb5int32 *usec;
-  HostAddress *s_address;
-  HostAddress *r_address;
-} EncKrbCredPart;
-
-ASN1EXP int    ASN1CALL decode_EncKrbCredPart(const unsigned char *, size_t, EncKrbCredPart *, size_t *);
-ASN1EXP int    ASN1CALL encode_EncKrbCredPart(unsigned char *, size_t, const EncKrbCredPart *, size_t *);
-ASN1EXP size_t ASN1CALL length_EncKrbCredPart(const EncKrbCredPart *);
-ASN1EXP int    ASN1CALL copy_EncKrbCredPart  (const EncKrbCredPart *, EncKrbCredPart *);
-ASN1EXP void   ASN1CALL free_EncKrbCredPart  (EncKrbCredPart *);
-
-
-/*
-KRB-ERROR ::= [APPLICATION 30] SEQUENCE {
-  pvno            [0] krb5int32,
-  msg-type        [1] MESSAGE-TYPE,
-  ctime           [2] KerberosTime OPTIONAL,
-  cusec           [3] krb5int32 OPTIONAL,
-  stime           [4] KerberosTime,
-  susec           [5] krb5int32,
-  error-code      [6] krb5int32,
-  crealm          [7] Realm OPTIONAL,
-  cname           [8] PrincipalName OPTIONAL,
-  realm           [9] Realm,
-  sname           [10] PrincipalName,
-  e-text          [11] GeneralString OPTIONAL,
-  e-data          [12] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct KRB_ERROR {
-  krb5int32 pvno;
-  MESSAGE_TYPE msg_type;
-  KerberosTime *ctime;
-  krb5int32 *cusec;
-  KerberosTime stime;
-  krb5int32 susec;
-  krb5int32 error_code;
-  Realm *crealm;
-  PrincipalName *cname;
-  Realm realm;
-  PrincipalName sname;
-  heim_general_string *e_text;
-  heim_octet_string *e_data;
-} KRB_ERROR;
-
-ASN1EXP int    ASN1CALL decode_KRB_ERROR(const unsigned char *, size_t, KRB_ERROR *, size_t *);
-ASN1EXP int    ASN1CALL encode_KRB_ERROR(unsigned char *, size_t, const KRB_ERROR *, size_t *);
-ASN1EXP size_t ASN1CALL length_KRB_ERROR(const KRB_ERROR *);
-ASN1EXP int    ASN1CALL copy_KRB_ERROR  (const KRB_ERROR *, KRB_ERROR *);
-ASN1EXP void   ASN1CALL free_KRB_ERROR  (KRB_ERROR *);
-
-
-/*
-ChangePasswdDataMS ::= SEQUENCE {
-  newpasswd       [0] OCTET STRING,
-  targname        [1] PrincipalName OPTIONAL,
-  targrealm       [2] Realm OPTIONAL,
-}
-*/
-
-typedef struct ChangePasswdDataMS {
-  heim_octet_string newpasswd;
-  PrincipalName *targname;
-  Realm *targrealm;
-} ChangePasswdDataMS;
-
-ASN1EXP int    ASN1CALL decode_ChangePasswdDataMS(const unsigned char *, size_t, ChangePasswdDataMS *, size_t *);
-ASN1EXP int    ASN1CALL encode_ChangePasswdDataMS(unsigned char *, size_t, const ChangePasswdDataMS *, size_t *);
-ASN1EXP size_t ASN1CALL length_ChangePasswdDataMS(const ChangePasswdDataMS *);
-ASN1EXP int    ASN1CALL copy_ChangePasswdDataMS  (const ChangePasswdDataMS *, ChangePasswdDataMS *);
-ASN1EXP void   ASN1CALL free_ChangePasswdDataMS  (ChangePasswdDataMS *);
-
-
-/*
-EtypeList ::= SEQUENCE OF ENCTYPE
-*/
-
-typedef struct EtypeList {
-  unsigned int len;
-  ENCTYPE *val;
-} EtypeList;
-
-ASN1EXP int    ASN1CALL decode_EtypeList(const unsigned char *, size_t, EtypeList *, size_t *);
-ASN1EXP int    ASN1CALL encode_EtypeList(unsigned char *, size_t, const EtypeList *, size_t *);
-ASN1EXP size_t ASN1CALL length_EtypeList(const EtypeList *);
-ASN1EXP int    ASN1CALL copy_EtypeList  (const EtypeList *, EtypeList *);
-ASN1EXP void   ASN1CALL free_EtypeList  (EtypeList *);
-
-
-enum { krb5_pvno = 5 };
-
-enum { DOMAIN_X500_COMPRESS = 1 };
-
-/*
-AD-IF-RELEVANT ::= AuthorizationData
-*/
-
-typedef AuthorizationData AD_IF_RELEVANT;
-
-ASN1EXP int    ASN1CALL decode_AD_IF_RELEVANT(const unsigned char *, size_t, AD_IF_RELEVANT *, size_t *);
-ASN1EXP int    ASN1CALL encode_AD_IF_RELEVANT(unsigned char *, size_t, const AD_IF_RELEVANT *, size_t *);
-ASN1EXP size_t ASN1CALL length_AD_IF_RELEVANT(const AD_IF_RELEVANT *);
-ASN1EXP int    ASN1CALL copy_AD_IF_RELEVANT  (const AD_IF_RELEVANT *, AD_IF_RELEVANT *);
-ASN1EXP void   ASN1CALL free_AD_IF_RELEVANT  (AD_IF_RELEVANT *);
-
-
-/*
-AD-KDCIssued ::= SEQUENCE {
-  ad-checksum     [0] Checksum,
-  i-realm         [1] Realm OPTIONAL,
-  i-sname         [2] PrincipalName OPTIONAL,
-  elements        [3] AuthorizationData,
-}
-*/
-
-typedef struct AD_KDCIssued {
-  Checksum ad_checksum;
-  Realm *i_realm;
-  PrincipalName *i_sname;
-  AuthorizationData elements;
-} AD_KDCIssued;
-
-ASN1EXP int    ASN1CALL decode_AD_KDCIssued(const unsigned char *, size_t, AD_KDCIssued *, size_t *);
-ASN1EXP int    ASN1CALL encode_AD_KDCIssued(unsigned char *, size_t, const AD_KDCIssued *, size_t *);
-ASN1EXP size_t ASN1CALL length_AD_KDCIssued(const AD_KDCIssued *);
-ASN1EXP int    ASN1CALL copy_AD_KDCIssued  (const AD_KDCIssued *, AD_KDCIssued *);
-ASN1EXP void   ASN1CALL free_AD_KDCIssued  (AD_KDCIssued *);
-
-
-/*
-AD-AND-OR ::= SEQUENCE {
-  condition-count   [0] INTEGER,
-  elements          [1] AuthorizationData,
-}
-*/
-
-typedef struct AD_AND_OR {
-  heim_integer condition_count;
-  AuthorizationData elements;
-} AD_AND_OR;
-
-ASN1EXP int    ASN1CALL decode_AD_AND_OR(const unsigned char *, size_t, AD_AND_OR *, size_t *);
-ASN1EXP int    ASN1CALL encode_AD_AND_OR(unsigned char *, size_t, const AD_AND_OR *, size_t *);
-ASN1EXP size_t ASN1CALL length_AD_AND_OR(const AD_AND_OR *);
-ASN1EXP int    ASN1CALL copy_AD_AND_OR  (const AD_AND_OR *, AD_AND_OR *);
-ASN1EXP void   ASN1CALL free_AD_AND_OR  (AD_AND_OR *);
-
-
-/*
-AD-MANDATORY-FOR-KDC ::= AuthorizationData
-*/
-
-typedef AuthorizationData AD_MANDATORY_FOR_KDC;
-
-/*
-PA-SAM-TYPE ::= INTEGER {
-  PA_SAM_TYPE_ENIGMA(1),
-  PA_SAM_TYPE_DIGI_PATH(2),
-  PA_SAM_TYPE_SKEY_K0(3),
-  PA_SAM_TYPE_SKEY(4),
-  PA_SAM_TYPE_SECURID(5),
-  PA_SAM_TYPE_CRYPTOCARD(6)
-}
-*/
-
-typedef enum PA_SAM_TYPE {
-  PA_SAM_TYPE_ENIGMA = 1,
-  PA_SAM_TYPE_DIGI_PATH = 2,
-  PA_SAM_TYPE_SKEY_K0 = 3,
-  PA_SAM_TYPE_SKEY = 4,
-  PA_SAM_TYPE_SECURID = 5,
-  PA_SAM_TYPE_CRYPTOCARD = 6
-} PA_SAM_TYPE;
-
-/*
-PA-SAM-REDIRECT ::= HostAddresses
-*/
-
-typedef HostAddresses PA_SAM_REDIRECT;
-
-/*
-SAMFlags ::= BIT STRING {
-  use-sad-as-key(0),
-  send-encrypted-sad(1),
-  must-pk-encrypt-sad(2)
-}
-*/
-
-typedef struct SAMFlags {
-  unsigned int use_sad_as_key:1;
-  unsigned int send_encrypted_sad:1;
-  unsigned int must_pk_encrypt_sad:1;
-  unsigned int _unused3:1;
-  unsigned int _unused4:1;
-  unsigned int _unused5:1;
-  unsigned int _unused6:1;
-  unsigned int _unused7:1;
-  unsigned int _unused8:1;
-  unsigned int _unused9:1;
-  unsigned int _unused10:1;
-  unsigned int _unused11:1;
-  unsigned int _unused12:1;
-  unsigned int _unused13:1;
-  unsigned int _unused14:1;
-  unsigned int _unused15:1;
-  unsigned int _unused16:1;
-  unsigned int _unused17:1;
-  unsigned int _unused18:1;
-  unsigned int _unused19:1;
-  unsigned int _unused20:1;
-  unsigned int _unused21:1;
-  unsigned int _unused22:1;
-  unsigned int _unused23:1;
-  unsigned int _unused24:1;
-  unsigned int _unused25:1;
-  unsigned int _unused26:1;
-  unsigned int _unused27:1;
-  unsigned int _unused28:1;
-  unsigned int _unused29:1;
-  unsigned int _unused30:1;
-  unsigned int _unused31:1;
-} SAMFlags;
-
-
-unsigned SAMFlags2int(SAMFlags);
-SAMFlags int2SAMFlags(unsigned);
-const struct units * asn1_SAMFlags_units(void);
-/*
-PA-SAM-CHALLENGE-2-BODY ::= SEQUENCE {
-  sam-type              [0] krb5int32,
-  sam-flags             [1] SAMFlags,
-  sam-type-name         [2] GeneralString OPTIONAL,
-  sam-track-id          [3] GeneralString OPTIONAL,
-  sam-challenge-label   [4] GeneralString OPTIONAL,
-  sam-challenge         [5] GeneralString OPTIONAL,
-  sam-response-prompt   [6] GeneralString OPTIONAL,
-  sam-pk-for-sad        [7] EncryptionKey OPTIONAL,
-  sam-nonce             [8] krb5int32,
-  sam-etype             [9] krb5int32,
-  ...,
-}
-*/
-
-typedef struct PA_SAM_CHALLENGE_2_BODY {
-  krb5int32 sam_type;
-  SAMFlags sam_flags;
-  heim_general_string *sam_type_name;
-  heim_general_string *sam_track_id;
-  heim_general_string *sam_challenge_label;
-  heim_general_string *sam_challenge;
-  heim_general_string *sam_response_prompt;
-  EncryptionKey *sam_pk_for_sad;
-  krb5int32 sam_nonce;
-  krb5int32 sam_etype;
-} PA_SAM_CHALLENGE_2_BODY;
-
-/*
-PA-SAM-CHALLENGE-2 ::= SEQUENCE {
-  sam-body        [0] PA-SAM-CHALLENGE-2-BODY,
-  sam-cksum       [1] SEQUENCE OF Checksum,
-  ...,
-}
-*/
-
-typedef struct PA_SAM_CHALLENGE_2 {
-  PA_SAM_CHALLENGE_2_BODY sam_body;
-  struct PA_SAM_CHALLENGE_2_sam_cksum {
-    unsigned int len;
-    Checksum *val;
-  } sam_cksum;
-} PA_SAM_CHALLENGE_2;
-
-/*
-PA-SAM-RESPONSE-2 ::= SEQUENCE {
-  sam-type               [0] krb5int32,
-  sam-flags              [1] SAMFlags,
-  sam-track-id           [2] GeneralString OPTIONAL,
-  sam-enc-nonce-or-sad   [3] EncryptedData,
-  sam-nonce              [4] krb5int32,
-  ...,
-}
-*/
-
-typedef struct PA_SAM_RESPONSE_2 {
-  krb5int32 sam_type;
-  SAMFlags sam_flags;
-  heim_general_string *sam_track_id;
-  EncryptedData sam_enc_nonce_or_sad;
-  krb5int32 sam_nonce;
-} PA_SAM_RESPONSE_2;
-
-/*
-PA-ENC-SAM-RESPONSE-ENC ::= SEQUENCE {
-  sam-nonce       [0] krb5int32,
-  sam-sad         [1] GeneralString OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct PA_ENC_SAM_RESPONSE_ENC {
-  krb5int32 sam_nonce;
-  heim_general_string *sam_sad;
-} PA_ENC_SAM_RESPONSE_ENC;
-
-/*
-PA-S4U2Self ::= SEQUENCE {
-  name            [0] PrincipalName,
-  realm           [1] Realm,
-  cksum           [2] Checksum,
-  auth            [3] GeneralString,
-}
-*/
-
-typedef struct PA_S4U2Self {
-  PrincipalName name;
-  Realm realm;
-  Checksum cksum;
-  heim_general_string auth;
-} PA_S4U2Self;
-
-ASN1EXP int    ASN1CALL decode_PA_S4U2Self(const unsigned char *, size_t, PA_S4U2Self *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_S4U2Self(unsigned char *, size_t, const PA_S4U2Self *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_S4U2Self(const PA_S4U2Self *);
-ASN1EXP int    ASN1CALL copy_PA_S4U2Self  (const PA_S4U2Self *, PA_S4U2Self *);
-ASN1EXP void   ASN1CALL free_PA_S4U2Self  (PA_S4U2Self *);
-
-
-/*
-KRB5SignedPathData ::= SEQUENCE {
-  client          [0] Principal OPTIONAL,
-  authtime        [1] KerberosTime,
-  delegated       [2] Principals OPTIONAL,
-  method_data     [3] METHOD-DATA OPTIONAL,
-}
-*/
-
-typedef struct KRB5SignedPathData {
-  Principal *client;
-  KerberosTime authtime;
-  Principals *delegated;
-  METHOD_DATA *method_data;
-} KRB5SignedPathData;
-
-ASN1EXP int    ASN1CALL decode_KRB5SignedPathData(const unsigned char *, size_t, KRB5SignedPathData *, size_t *);
-ASN1EXP int    ASN1CALL encode_KRB5SignedPathData(unsigned char *, size_t, const KRB5SignedPathData *, size_t *);
-ASN1EXP size_t ASN1CALL length_KRB5SignedPathData(const KRB5SignedPathData *);
-ASN1EXP int    ASN1CALL copy_KRB5SignedPathData  (const KRB5SignedPathData *, KRB5SignedPathData *);
-ASN1EXP void   ASN1CALL free_KRB5SignedPathData  (KRB5SignedPathData *);
-
-
-/*
-KRB5SignedPath ::= SEQUENCE {
-  etype           [0] ENCTYPE,
-  cksum           [1] Checksum,
-  delegated       [2] Principals OPTIONAL,
-  method_data     [3] METHOD-DATA OPTIONAL,
-}
-*/
-
-typedef struct KRB5SignedPath {
-  ENCTYPE etype;
-  Checksum cksum;
-  Principals *delegated;
-  METHOD_DATA *method_data;
-} KRB5SignedPath;
-
-ASN1EXP int    ASN1CALL decode_KRB5SignedPath(const unsigned char *, size_t, KRB5SignedPath *, size_t *);
-ASN1EXP int    ASN1CALL encode_KRB5SignedPath(unsigned char *, size_t, const KRB5SignedPath *, size_t *);
-ASN1EXP size_t ASN1CALL length_KRB5SignedPath(const KRB5SignedPath *);
-ASN1EXP int    ASN1CALL copy_KRB5SignedPath  (const KRB5SignedPath *, KRB5SignedPath *);
-ASN1EXP void   ASN1CALL free_KRB5SignedPath  (KRB5SignedPath *);
-
-
-/*
-PA-ClientCanonicalizedNames ::= SEQUENCE {
-  requested-name   [0] PrincipalName,
-  mapped-name      [1] PrincipalName,
-}
-*/
-
-typedef struct PA_ClientCanonicalizedNames {
-  PrincipalName requested_name;
-  PrincipalName mapped_name;
-} PA_ClientCanonicalizedNames;
-
-ASN1EXP int    ASN1CALL decode_PA_ClientCanonicalizedNames(const unsigned char *, size_t, PA_ClientCanonicalizedNames *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_ClientCanonicalizedNames(unsigned char *, size_t, const PA_ClientCanonicalizedNames *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_ClientCanonicalizedNames(const PA_ClientCanonicalizedNames *);
-ASN1EXP int    ASN1CALL copy_PA_ClientCanonicalizedNames  (const PA_ClientCanonicalizedNames *, PA_ClientCanonicalizedNames *);
-ASN1EXP void   ASN1CALL free_PA_ClientCanonicalizedNames  (PA_ClientCanonicalizedNames *);
-
-
-/*
-PA-ClientCanonicalized ::= SEQUENCE {
-  names            [0] PA-ClientCanonicalizedNames,
-  canon-checksum   [1] Checksum,
-}
-*/
-
-typedef struct PA_ClientCanonicalized {
-  PA_ClientCanonicalizedNames names;
-  Checksum canon_checksum;
-} PA_ClientCanonicalized;
-
-ASN1EXP int    ASN1CALL decode_PA_ClientCanonicalized(const unsigned char *, size_t, PA_ClientCanonicalized *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_ClientCanonicalized(unsigned char *, size_t, const PA_ClientCanonicalized *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_ClientCanonicalized(const PA_ClientCanonicalized *);
-ASN1EXP int    ASN1CALL copy_PA_ClientCanonicalized  (const PA_ClientCanonicalized *, PA_ClientCanonicalized *);
-ASN1EXP void   ASN1CALL free_PA_ClientCanonicalized  (PA_ClientCanonicalized *);
-
-
-/*
-AD-LoginAlias ::= SEQUENCE {
-  login-alias     [0] PrincipalName,
-  checksum        [1] Checksum,
-}
-*/
-
-typedef struct AD_LoginAlias {
-  PrincipalName login_alias;
-  Checksum checksum;
-} AD_LoginAlias;
-
-ASN1EXP int    ASN1CALL decode_AD_LoginAlias(const unsigned char *, size_t, AD_LoginAlias *, size_t *);
-ASN1EXP int    ASN1CALL encode_AD_LoginAlias(unsigned char *, size_t, const AD_LoginAlias *, size_t *);
-ASN1EXP size_t ASN1CALL length_AD_LoginAlias(const AD_LoginAlias *);
-ASN1EXP int    ASN1CALL copy_AD_LoginAlias  (const AD_LoginAlias *, AD_LoginAlias *);
-ASN1EXP void   ASN1CALL free_AD_LoginAlias  (AD_LoginAlias *);
-
-
-/*
-PA-SvrReferralData ::= SEQUENCE {
-  referred-name    [1] PrincipalName OPTIONAL,
-  referred-realm   [0] Realm,
-}
-*/
-
-typedef struct PA_SvrReferralData {
-  PrincipalName *referred_name;
-  Realm referred_realm;
-} PA_SvrReferralData;
-
-ASN1EXP int    ASN1CALL decode_PA_SvrReferralData(const unsigned char *, size_t, PA_SvrReferralData *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_SvrReferralData(unsigned char *, size_t, const PA_SvrReferralData *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_SvrReferralData(const PA_SvrReferralData *);
-ASN1EXP int    ASN1CALL copy_PA_SvrReferralData  (const PA_SvrReferralData *, PA_SvrReferralData *);
-ASN1EXP void   ASN1CALL free_PA_SvrReferralData  (PA_SvrReferralData *);
-
-
-/*
-PA-SERVER-REFERRAL-DATA ::= EncryptedData
-*/
-
-typedef EncryptedData PA_SERVER_REFERRAL_DATA;
-
-ASN1EXP int    ASN1CALL decode_PA_SERVER_REFERRAL_DATA(const unsigned char *, size_t, PA_SERVER_REFERRAL_DATA *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_SERVER_REFERRAL_DATA(unsigned char *, size_t, const PA_SERVER_REFERRAL_DATA *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_SERVER_REFERRAL_DATA(const PA_SERVER_REFERRAL_DATA *);
-ASN1EXP int    ASN1CALL copy_PA_SERVER_REFERRAL_DATA  (const PA_SERVER_REFERRAL_DATA *, PA_SERVER_REFERRAL_DATA *);
-ASN1EXP void   ASN1CALL free_PA_SERVER_REFERRAL_DATA  (PA_SERVER_REFERRAL_DATA *);
-
-
-/*
-PA-ServerReferralData ::= SEQUENCE {
-  referred-realm             [0] Realm OPTIONAL,
-  true-principal-name        [1] PrincipalName OPTIONAL,
-  requested-principal-name   [2] PrincipalName OPTIONAL,
-  referral-valid-until       [3] KerberosTime OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct PA_ServerReferralData {
-  Realm *referred_realm;
-  PrincipalName *true_principal_name;
-  PrincipalName *requested_principal_name;
-  KerberosTime *referral_valid_until;
-} PA_ServerReferralData;
-
-ASN1EXP int    ASN1CALL decode_PA_ServerReferralData(const unsigned char *, size_t, PA_ServerReferralData *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_ServerReferralData(unsigned char *, size_t, const PA_ServerReferralData *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_ServerReferralData(const PA_ServerReferralData *);
-ASN1EXP int    ASN1CALL copy_PA_ServerReferralData  (const PA_ServerReferralData *, PA_ServerReferralData *);
-ASN1EXP void   ASN1CALL free_PA_ServerReferralData  (PA_ServerReferralData *);
-
-
-/*
-FastOptions ::= BIT STRING {
-  reserved(0),
-  hide-client-names(1),
-  kdc-follow--referrals(16)
-}
-*/
-
-typedef struct FastOptions {
-  unsigned int reserved:1;
-  unsigned int hide_client_names:1;
-  unsigned int _unused2:1;
-  unsigned int _unused3:1;
-  unsigned int _unused4:1;
-  unsigned int _unused5:1;
-  unsigned int _unused6:1;
-  unsigned int _unused7:1;
-  unsigned int _unused8:1;
-  unsigned int _unused9:1;
-  unsigned int _unused10:1;
-  unsigned int _unused11:1;
-  unsigned int _unused12:1;
-  unsigned int _unused13:1;
-  unsigned int _unused14:1;
-  unsigned int _unused15:1;
-  unsigned int kdc_follow__referrals:1;
-  unsigned int _unused17:1;
-  unsigned int _unused18:1;
-  unsigned int _unused19:1;
-  unsigned int _unused20:1;
-  unsigned int _unused21:1;
-  unsigned int _unused22:1;
-  unsigned int _unused23:1;
-  unsigned int _unused24:1;
-  unsigned int _unused25:1;
-  unsigned int _unused26:1;
-  unsigned int _unused27:1;
-  unsigned int _unused28:1;
-  unsigned int _unused29:1;
-  unsigned int _unused30:1;
-  unsigned int _unused31:1;
-} FastOptions;
-
-
-unsigned FastOptions2int(FastOptions);
-FastOptions int2FastOptions(unsigned);
-const struct units * asn1_FastOptions_units(void);
-/*
-KrbFastReq ::= SEQUENCE {
-  fast-options    [0] FastOptions,
-  padata          [1] SEQUENCE OF PA-DATA,
-  req-body        [2] KDC-REQ-BODY,
-  ...,
-}
-*/
-
-typedef struct KrbFastReq {
-  FastOptions fast_options;
-  struct KrbFastReq_padata {
-    unsigned int len;
-    PA_DATA *val;
-  } padata;
-  KDC_REQ_BODY req_body;
-} KrbFastReq;
-
-/*
-KrbFastArmor ::= SEQUENCE {
-  armor-type      [0] krb5int32,
-  armor-value     [1] OCTET STRING,
-  ...,
-}
-*/
-
-typedef struct KrbFastArmor {
-  krb5int32 armor_type;
-  heim_octet_string armor_value;
-} KrbFastArmor;
-
-/*
-KrbFastArmoredReq ::= SEQUENCE {
-  armor           [0] KrbFastArmor OPTIONAL,
-  req-checksum    [1] Checksum,
-  enc-fast-req    [2] EncryptedData,
-}
-*/
-
-typedef struct KrbFastArmoredReq {
-  KrbFastArmor *armor;
-  Checksum req_checksum;
-  EncryptedData enc_fast_req;
-} KrbFastArmoredReq;
-
-/*
-PA-FX-FAST-REQUEST ::= CHOICE {
-  armored-data    [0] KrbFastArmoredReq,
-  ...,
-}
-*/
-
-typedef struct PA_FX_FAST_REQUEST {
-  enum {
-    choice_PA_FX_FAST_REQUEST_asn1_ellipsis = 0,
-    choice_PA_FX_FAST_REQUEST_armored_data
-    /* ... */
-  } element;
-  union {
-    KrbFastArmoredReq armored_data;
-    heim_octet_string asn1_ellipsis;
-  } u;
-} PA_FX_FAST_REQUEST;
-
-/*
-KrbFastFinished ::= SEQUENCE {
-  timestamp         [0] KerberosTime,
-  usec              [1] krb5int32,
-  crealm            [2] Realm,
-  cname             [3] PrincipalName,
-  checksum          [4] Checksum,
-  ticket-checksum   [5] Checksum,
-  ...,
-}
-*/
-
-typedef struct KrbFastFinished {
-  KerberosTime timestamp;
-  krb5int32 usec;
-  Realm crealm;
-  PrincipalName cname;
-  Checksum checksum;
-  Checksum ticket_checksum;
-} KrbFastFinished;
-
-/*
-KrbFastResponse ::= SEQUENCE {
-  padata          [0] SEQUENCE OF PA-DATA,
-  rep-key         [1] EncryptionKey OPTIONAL,
-  finished        [2] KrbFastFinished OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct KrbFastResponse {
-  struct KrbFastResponse_padata {
-    unsigned int len;
-    PA_DATA *val;
-  } padata;
-  EncryptionKey *rep_key;
-  KrbFastFinished *finished;
-} KrbFastResponse;
-
-/*
-KrbFastArmoredRep ::= SEQUENCE {
-  enc-fast-rep    [0] EncryptedData,
-  ...,
-}
-*/
-
-typedef struct KrbFastArmoredRep {
-  EncryptedData enc_fast_rep;
-} KrbFastArmoredRep;
-
-/*
-PA-FX-FAST-REPLY ::= CHOICE {
-  armored-data    [0] KrbFastArmoredRep,
-  ...,
-}
-*/
-
-typedef struct PA_FX_FAST_REPLY {
-  enum {
-    choice_PA_FX_FAST_REPLY_asn1_ellipsis = 0,
-    choice_PA_FX_FAST_REPLY_armored_data
-    /* ... */
-  } element;
-  union {
-    KrbFastArmoredRep armored_data;
-    heim_octet_string asn1_ellipsis;
-  } u;
-} PA_FX_FAST_REPLY;
-
-#endif /* __krb5_asn1_h__ */
diff --git a/include.new/krb5_ccapi.h b/include.new/krb5_ccapi.h
deleted file mode 100644
index 5a7fe6a..0000000
--- a/include.new/krb5_ccapi.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (c) 2004 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef KRB5_CCAPI_H
-#define KRB5_CCAPI_H 1
-
-#include <krb5-types.h>
-
- #ifdef __APPLE__
-#pragma pack(push,2)
-#endif
-
-enum {
-    cc_credentials_v5 = 2
-};
-
-enum {
-    ccapi_version_3 = 3,
-    ccapi_version_4 = 4
-};
-
-enum {
-    ccNoError						= 0,
-
-    ccIteratorEnd					= 201,
-    ccErrBadParam,
-    ccErrNoMem,
-    ccErrInvalidContext,
-    ccErrInvalidCCache,
-
-    ccErrInvalidString,					/* 206 */
-    ccErrInvalidCredentials,
-    ccErrInvalidCCacheIterator,
-    ccErrInvalidCredentialsIterator,
-    ccErrInvalidLock,
-
-    ccErrBadName,					/* 211 */
-    ccErrBadCredentialsVersion,
-    ccErrBadAPIVersion,
-    ccErrContextLocked,
-    ccErrContextUnlocked,
-
-    ccErrCCacheLocked,					/* 216 */
-    ccErrCCacheUnlocked,
-    ccErrBadLockType,
-    ccErrNeverDefault,
-    ccErrCredentialsNotFound,
-
-    ccErrCCacheNotFound,				/* 221 */
-    ccErrContextNotFound,
-    ccErrServerUnavailable,
-    ccErrServerInsecure,
-    ccErrServerCantBecomeUID,
-
-    ccErrTimeOffsetNotSet				/* 226 */
-};
-
-typedef int32_t cc_int32;
-typedef uint32_t cc_uint32;
-typedef struct cc_context_t *cc_context_t;
-typedef struct cc_ccache_t *cc_ccache_t;
-typedef struct cc_ccache_iterator_t *cc_ccache_iterator_t;
-typedef struct cc_credentials_v5_t cc_credentials_v5_t;
-typedef struct cc_credentials_t *cc_credentials_t;
-typedef struct cc_credentials_iterator_t *cc_credentials_iterator_t;
-typedef struct cc_string_t *cc_string_t;
-typedef cc_uint32 cc_time_t;
-
-typedef struct cc_data {
-    cc_uint32 type;
-    cc_uint32 length;
-    void *data;
-} cc_data;
-
-struct cc_credentials_v5_t {
-    char *client;
-    char *server;
-    cc_data keyblock;
-    cc_time_t authtime;
-    cc_time_t starttime;
-    cc_time_t endtime;
-    cc_time_t renew_till;
-    cc_uint32 is_skey;
-    cc_uint32 ticket_flags;
-#define	KRB5_CCAPI_TKT_FLG_FORWARDABLE			0x40000000
-#define	KRB5_CCAPI_TKT_FLG_FORWARDED			0x20000000
-#define	KRB5_CCAPI_TKT_FLG_PROXIABLE			0x10000000
-#define	KRB5_CCAPI_TKT_FLG_PROXY			0x08000000
-#define	KRB5_CCAPI_TKT_FLG_MAY_POSTDATE			0x04000000
-#define	KRB5_CCAPI_TKT_FLG_POSTDATED			0x02000000
-#define	KRB5_CCAPI_TKT_FLG_INVALID			0x01000000
-#define	KRB5_CCAPI_TKT_FLG_RENEWABLE			0x00800000
-#define	KRB5_CCAPI_TKT_FLG_INITIAL			0x00400000
-#define	KRB5_CCAPI_TKT_FLG_PRE_AUTH			0x00200000
-#define	KRB5_CCAPI_TKT_FLG_HW_AUTH			0x00100000
-#define	KRB5_CCAPI_TKT_FLG_TRANSIT_POLICY_CHECKED	0x00080000
-#define	KRB5_CCAPI_TKT_FLG_OK_AS_DELEGATE		0x00040000
-#define	KRB5_CCAPI_TKT_FLG_ANONYMOUS			0x00020000
-    cc_data **addresses;
-    cc_data ticket;
-    cc_data second_ticket;
-    cc_data **authdata;
-};
-
-
-typedef struct cc_string_functions {
-    cc_int32 (*release)(cc_string_t);
-} cc_string_functions;
-
-struct cc_string_t {
-    const char *data;
-    const cc_string_functions *func;
-};
-
-typedef struct cc_credentials_union {
-    cc_int32 version;
-    union {
-	cc_credentials_v5_t* credentials_v5;
-    } credentials;
-} cc_credentials_union;
-
-struct cc_credentials_functions {
-    cc_int32 (*release)(cc_credentials_t);
-    cc_int32 (*compare)(cc_credentials_t, cc_credentials_t, cc_uint32*);
-};
-
-struct cc_credentials_t {
-    const cc_credentials_union* data;
-    const struct cc_credentials_functions* func;
-};
-
-struct cc_credentials_iterator_functions {
-    cc_int32 (*release)(cc_credentials_iterator_t);
-    cc_int32 (*next)(cc_credentials_iterator_t, cc_credentials_t*);
-};
-
-struct cc_credentials_iterator_t {
-    const struct cc_credentials_iterator_functions *func;
-};
-
-struct cc_ccache_iterator_functions {
-    cc_int32 (*release) (cc_ccache_iterator_t);
-    cc_int32 (*next)(cc_ccache_iterator_t, cc_ccache_t*);
-};
-
-struct cc_ccache_iterator_t {
-    const struct cc_ccache_iterator_functions* func;
-};
-
-typedef struct cc_ccache_functions {
-    cc_int32 (*release)(cc_ccache_t);
-    cc_int32 (*destroy)(cc_ccache_t);
-    cc_int32 (*set_default)(cc_ccache_t);
-    cc_int32 (*get_credentials_version)(cc_ccache_t, cc_uint32*);
-    cc_int32 (*get_name)(cc_ccache_t, cc_string_t*);
-    cc_int32 (*get_principal)(cc_ccache_t, cc_uint32, cc_string_t*);
-    cc_int32 (*set_principal)(cc_ccache_t, cc_uint32, const char*);
-    cc_int32 (*store_credentials)(cc_ccache_t, const cc_credentials_union*);
-    cc_int32 (*remove_credentials)(cc_ccache_t, cc_credentials_t);
-    cc_int32 (*new_credentials_iterator)(cc_ccache_t,
-					 cc_credentials_iterator_t*);
-    cc_int32 (*move)(cc_ccache_t, cc_ccache_t);
-    cc_int32 (*lock)(cc_ccache_t, cc_uint32, cc_uint32);
-    cc_int32 (*unlock)(cc_ccache_t);
-    cc_int32 (*get_last_default_time)(cc_ccache_t, cc_time_t*);
-    cc_int32 (*get_change_time)(cc_ccache_t, cc_time_t*);
-    cc_int32 (*compare)(cc_ccache_t, cc_ccache_t, cc_uint32*);
-    cc_int32 (*get_kdc_time_offset)(cc_ccache_t, cc_int32, cc_time_t *);
-    cc_int32 (*set_kdc_time_offset)(cc_ccache_t, cc_int32, cc_time_t);
-    cc_int32 (*clear_kdc_time_offset)(cc_ccache_t, cc_int32);
-} cc_ccache_functions;
-
-struct cc_ccache_t {
-    const cc_ccache_functions *func;
-};
-
-struct  cc_context_functions {
-    cc_int32 (*release)(cc_context_t);
-    cc_int32 (*get_change_time)(cc_context_t, cc_time_t *);
-    cc_int32 (*get_default_ccache_name)(cc_context_t, cc_string_t*);
-    cc_int32 (*open_ccache)(cc_context_t, const char*, cc_ccache_t *);
-    cc_int32 (*open_default_ccache)(cc_context_t, cc_ccache_t*);
-    cc_int32 (*create_ccache)(cc_context_t,const char*, cc_uint32,
-			      const char*, cc_ccache_t*);
-    cc_int32 (*create_default_ccache)(cc_context_t, cc_uint32,
-				      const char*, cc_ccache_t*);
-    cc_int32 (*create_new_ccache)(cc_context_t, cc_uint32,
-				  const char*, cc_ccache_t*);
-    cc_int32 (*new_ccache_iterator)(cc_context_t, cc_ccache_iterator_t*);
-    cc_int32 (*lock)(cc_context_t, cc_uint32, cc_uint32);
-    cc_int32 (*unlock)(cc_context_t);
-    cc_int32 (*compare)(cc_context_t, cc_context_t, cc_uint32*);
-};
-
-struct cc_context_t {
-    const struct cc_context_functions* func;
-};
-
-typedef cc_int32
-(*cc_initialize_func)(cc_context_t*, cc_int32, cc_int32 *, char const **);
-
-#ifdef __APPLE__
-#pragma pack(pop)
-#endif
-
-
-#endif /* KRB5_CCAPI_H */
diff --git a/include.new/krb5_err.h b/include.new/krb5_err.h
deleted file mode 100644
index 2355813..0000000
--- a/include.new/krb5_err.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libkrb5/../../../crypto/heimdal/lib/krb5/krb5_err.et */
-/* $Id: krb5_err.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __krb5_err_h__
-#define __krb5_err_h__
-
-struct et_list;
-
-void initialize_krb5_error_table_r(struct et_list **);
-
-void initialize_krb5_error_table(void);
-#define init_krb5_err_tbl initialize_krb5_error_table
-
-typedef enum krb5_error_number{
-	KRB5KDC_ERR_NONE = -1765328384,
-	KRB5KDC_ERR_NAME_EXP = -1765328383,
-	KRB5KDC_ERR_SERVICE_EXP = -1765328382,
-	KRB5KDC_ERR_BAD_PVNO = -1765328381,
-	KRB5KDC_ERR_C_OLD_MAST_KVNO = -1765328380,
-	KRB5KDC_ERR_S_OLD_MAST_KVNO = -1765328379,
-	KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN = -1765328378,
-	KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN = -1765328377,
-	KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE = -1765328376,
-	KRB5KDC_ERR_NULL_KEY = -1765328375,
-	KRB5KDC_ERR_CANNOT_POSTDATE = -1765328374,
-	KRB5KDC_ERR_NEVER_VALID = -1765328373,
-	KRB5KDC_ERR_POLICY = -1765328372,
-	KRB5KDC_ERR_BADOPTION = -1765328371,
-	KRB5KDC_ERR_ETYPE_NOSUPP = -1765328370,
-	KRB5KDC_ERR_SUMTYPE_NOSUPP = -1765328369,
-	KRB5KDC_ERR_PADATA_TYPE_NOSUPP = -1765328368,
-	KRB5KDC_ERR_TRTYPE_NOSUPP = -1765328367,
-	KRB5KDC_ERR_CLIENT_REVOKED = -1765328366,
-	KRB5KDC_ERR_SERVICE_REVOKED = -1765328365,
-	KRB5KDC_ERR_TGT_REVOKED = -1765328364,
-	KRB5KDC_ERR_CLIENT_NOTYET = -1765328363,
-	KRB5KDC_ERR_SERVICE_NOTYET = -1765328362,
-	KRB5KDC_ERR_KEY_EXPIRED = -1765328361,
-	KRB5KDC_ERR_PREAUTH_FAILED = -1765328360,
-	KRB5KDC_ERR_PREAUTH_REQUIRED = -1765328359,
-	KRB5KDC_ERR_SERVER_NOMATCH = -1765328358,
-	KRB5KDC_ERR_KDC_ERR_MUST_USE_USER2USER = -1765328357,
-	KRB5KDC_ERR_PATH_NOT_ACCEPTED = -1765328356,
-	KRB5KDC_ERR_SVC_UNAVAILABLE = -1765328355,
-	KRB5KRB_AP_ERR_BAD_INTEGRITY = -1765328353,
-	KRB5KRB_AP_ERR_TKT_EXPIRED = -1765328352,
-	KRB5KRB_AP_ERR_TKT_NYV = -1765328351,
-	KRB5KRB_AP_ERR_REPEAT = -1765328350,
-	KRB5KRB_AP_ERR_NOT_US = -1765328349,
-	KRB5KRB_AP_ERR_BADMATCH = -1765328348,
-	KRB5KRB_AP_ERR_SKEW = -1765328347,
-	KRB5KRB_AP_ERR_BADADDR = -1765328346,
-	KRB5KRB_AP_ERR_BADVERSION = -1765328345,
-	KRB5KRB_AP_ERR_MSG_TYPE = -1765328344,
-	KRB5KRB_AP_ERR_MODIFIED = -1765328343,
-	KRB5KRB_AP_ERR_BADORDER = -1765328342,
-	KRB5KRB_AP_ERR_ILL_CR_TKT = -1765328341,
-	KRB5KRB_AP_ERR_BADKEYVER = -1765328340,
-	KRB5KRB_AP_ERR_NOKEY = -1765328339,
-	KRB5KRB_AP_ERR_MUT_FAIL = -1765328338,
-	KRB5KRB_AP_ERR_BADDIRECTION = -1765328337,
-	KRB5KRB_AP_ERR_METHOD = -1765328336,
-	KRB5KRB_AP_ERR_BADSEQ = -1765328335,
-	KRB5KRB_AP_ERR_INAPP_CKSUM = -1765328334,
-	KRB5KRB_AP_PATH_NOT_ACCEPTED = -1765328333,
-	KRB5KRB_ERR_RESPONSE_TOO_BIG = -1765328332,
-	KRB5KRB_ERR_GENERIC = -1765328324,
-	KRB5KRB_ERR_FIELD_TOOLONG = -1765328323,
-	KRB5_KDC_ERR_CLIENT_NOT_TRUSTED = -1765328322,
-	KRB5_KDC_ERR_KDC_NOT_TRUSTED = -1765328321,
-	KRB5_KDC_ERR_INVALID_SIG = -1765328320,
-	KRB5_KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED = -1765328319,
-	KRB5_KDC_ERR_WRONG_REALM = -1765328316,
-	KRB5_AP_ERR_USER_TO_USER_REQUIRED = -1765328315,
-	KRB5_KDC_ERR_CANT_VERIFY_CERTIFICATE = -1765328314,
-	KRB5_KDC_ERR_INVALID_CERTIFICATE = -1765328313,
-	KRB5_KDC_ERR_REVOKED_CERTIFICATE = -1765328312,
-	KRB5_KDC_ERR_REVOCATION_STATUS_UNKNOWN = -1765328311,
-	KRB5_KDC_ERR_REVOCATION_STATUS_UNAVAILABLE = -1765328310,
-	KRB5_KDC_ERR_CLIENT_NAME_MISMATCH = -1765328309,
-	KRB5_KDC_ERR_INCONSISTENT_KEY_PURPOSE = -1765328308,
-	KRB5_KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED = -1765328307,
-	KRB5_KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED = -1765328306,
-	KRB5_KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED = -1765328305,
-	KRB5_KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED = -1765328304,
-	KRB5_KDC_ERR_INVALID_HASH_ALG = -1765328290,
-	KRB5_KDC_ERR_INVALID_ITERATION_COUNT = -1765328289,
-	KRB5_ERR_RCSID = -1765328256,
-	KRB5_LIBOS_BADLOCKFLAG = -1765328255,
-	KRB5_LIBOS_CANTREADPWD = -1765328254,
-	KRB5_LIBOS_BADPWDMATCH = -1765328253,
-	KRB5_LIBOS_PWDINTR = -1765328252,
-	KRB5_PARSE_ILLCHAR = -1765328251,
-	KRB5_PARSE_MALFORMED = -1765328250,
-	KRB5_CONFIG_CANTOPEN = -1765328249,
-	KRB5_CONFIG_BADFORMAT = -1765328248,
-	KRB5_CONFIG_NOTENUFSPACE = -1765328247,
-	KRB5_BADMSGTYPE = -1765328246,
-	KRB5_CC_BADNAME = -1765328245,
-	KRB5_CC_UNKNOWN_TYPE = -1765328244,
-	KRB5_CC_NOTFOUND = -1765328243,
-	KRB5_CC_END = -1765328242,
-	KRB5_NO_TKT_SUPPLIED = -1765328241,
-	KRB5KRB_AP_WRONG_PRINC = -1765328240,
-	KRB5KRB_AP_ERR_TKT_INVALID = -1765328239,
-	KRB5_PRINC_NOMATCH = -1765328238,
-	KRB5_KDCREP_MODIFIED = -1765328237,
-	KRB5_KDCREP_SKEW = -1765328236,
-	KRB5_IN_TKT_REALM_MISMATCH = -1765328235,
-	KRB5_PROG_ETYPE_NOSUPP = -1765328234,
-	KRB5_PROG_KEYTYPE_NOSUPP = -1765328233,
-	KRB5_WRONG_ETYPE = -1765328232,
-	KRB5_PROG_SUMTYPE_NOSUPP = -1765328231,
-	KRB5_REALM_UNKNOWN = -1765328230,
-	KRB5_SERVICE_UNKNOWN = -1765328229,
-	KRB5_KDC_UNREACH = -1765328228,
-	KRB5_NO_LOCALNAME = -1765328227,
-	KRB5_MUTUAL_FAILED = -1765328226,
-	KRB5_RC_TYPE_EXISTS = -1765328225,
-	KRB5_RC_MALLOC = -1765328224,
-	KRB5_RC_TYPE_NOTFOUND = -1765328223,
-	KRB5_RC_UNKNOWN = -1765328222,
-	KRB5_RC_REPLAY = -1765328221,
-	KRB5_RC_IO = -1765328220,
-	KRB5_RC_NOIO = -1765328219,
-	KRB5_RC_PARSE = -1765328218,
-	KRB5_RC_IO_EOF = -1765328217,
-	KRB5_RC_IO_MALLOC = -1765328216,
-	KRB5_RC_IO_PERM = -1765328215,
-	KRB5_RC_IO_IO = -1765328214,
-	KRB5_RC_IO_UNKNOWN = -1765328213,
-	KRB5_RC_IO_SPACE = -1765328212,
-	KRB5_TRANS_CANTOPEN = -1765328211,
-	KRB5_TRANS_BADFORMAT = -1765328210,
-	KRB5_LNAME_CANTOPEN = -1765328209,
-	KRB5_LNAME_NOTRANS = -1765328208,
-	KRB5_LNAME_BADFORMAT = -1765328207,
-	KRB5_CRYPTO_INTERNAL = -1765328206,
-	KRB5_KT_BADNAME = -1765328205,
-	KRB5_KT_UNKNOWN_TYPE = -1765328204,
-	KRB5_KT_NOTFOUND = -1765328203,
-	KRB5_KT_END = -1765328202,
-	KRB5_KT_NOWRITE = -1765328201,
-	KRB5_KT_IOERR = -1765328200,
-	KRB5_NO_TKT_IN_RLM = -1765328199,
-	KRB5DES_BAD_KEYPAR = -1765328198,
-	KRB5DES_WEAK_KEY = -1765328197,
-	KRB5_BAD_ENCTYPE = -1765328196,
-	KRB5_BAD_KEYSIZE = -1765328195,
-	KRB5_BAD_MSIZE = -1765328194,
-	KRB5_CC_TYPE_EXISTS = -1765328193,
-	KRB5_KT_TYPE_EXISTS = -1765328192,
-	KRB5_CC_IO = -1765328191,
-	KRB5_FCC_PERM = -1765328190,
-	KRB5_FCC_NOFILE = -1765328189,
-	KRB5_FCC_INTERNAL = -1765328188,
-	KRB5_CC_WRITE = -1765328187,
-	KRB5_CC_NOMEM = -1765328186,
-	KRB5_CC_FORMAT = -1765328185,
-	KRB5_CC_NOT_KTYPE = -1765328184,
-	KRB5_INVALID_FLAGS = -1765328183,
-	KRB5_NO_2ND_TKT = -1765328182,
-	KRB5_NOCREDS_SUPPLIED = -1765328181,
-	KRB5_SENDAUTH_BADAUTHVERS = -1765328180,
-	KRB5_SENDAUTH_BADAPPLVERS = -1765328179,
-	KRB5_SENDAUTH_BADRESPONSE = -1765328178,
-	KRB5_SENDAUTH_REJECTED = -1765328177,
-	KRB5_PREAUTH_BAD_TYPE = -1765328176,
-	KRB5_PREAUTH_NO_KEY = -1765328175,
-	KRB5_PREAUTH_FAILED = -1765328174,
-	KRB5_RCACHE_BADVNO = -1765328173,
-	KRB5_CCACHE_BADVNO = -1765328172,
-	KRB5_KEYTAB_BADVNO = -1765328171,
-	KRB5_PROG_ATYPE_NOSUPP = -1765328170,
-	KRB5_RC_REQUIRED = -1765328169,
-	KRB5_ERR_BAD_HOSTNAME = -1765328168,
-	KRB5_ERR_HOST_REALM_UNKNOWN = -1765328167,
-	KRB5_SNAME_UNSUPP_NAMETYPE = -1765328166,
-	KRB5KRB_AP_ERR_V4_REPLY = -1765328165,
-	KRB5_REALM_CANT_RESOLVE = -1765328164,
-	KRB5_TKT_NOT_FORWARDABLE = -1765328163,
-	KRB5_FWD_BAD_PRINCIPAL = -1765328162,
-	KRB5_GET_IN_TKT_LOOP = -1765328161,
-	KRB5_CONFIG_NODEFREALM = -1765328160,
-	KRB5_SAM_UNSUPPORTED = -1765328159,
-	KRB5_SAM_INVALID_ETYPE = -1765328158,
-	KRB5_SAM_NO_CHECKSUM = -1765328157,
-	KRB5_SAM_BAD_CHECKSUM = -1765328156,
-	KRB5_OBSOLETE_FN = -1765328146,
-	KRB5_ERR_BAD_S2K_PARAMS = -1765328139,
-	KRB5_ERR_NO_SERVICE = -1765328138,
-	KRB5_CC_NOSUPP = -1765328137,
-	KRB5_DELTAT_BADFORMAT = -1765328136,
-	KRB5_PLUGIN_NO_HANDLE = -1765328135,
-	KRB5_PLUGIN_OP_NOTSUPP = -1765328134
-} krb5_error_number;
-
-#define ERROR_TABLE_BASE_krb5 -1765328384
-
-#define COM_ERR_BINDDOMAIN_krb5 "heim_com_err-1765328384"
-
-#endif /* __krb5_err_h__ */
diff --git a/include.new/kvm.h b/include.new/kvm.h
deleted file mode 100644
index a2d284b..0000000
--- a/include.new/kvm.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- * 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.
- *
- *	@(#)kvm.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/lib/libkvm/kvm.h 262740 2014-03-04 14:49:05Z glebius $
- */
-
-#ifndef _KVM_H_
-#define	_KVM_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <nlist.h>
-
-/* Default version symbol. */
-#define	VRS_SYM		"_version"
-#define	VRS_KEY		"VERSION"
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif
-
-typedef struct __kvm kvm_t;
-
-struct kinfo_proc;
-struct proc;
-
-struct kvm_swap {
-	char	ksw_devname[32];
-	int	ksw_used;
-	int	ksw_total;
-	int	ksw_flags;
-	int	ksw_reserved1;
-	int	ksw_reserved2;
-};
-
-#define SWIF_DEV_PREFIX	0x0002
-
-__BEGIN_DECLS
-int	  kvm_close(kvm_t *);
-int	  kvm_dpcpu_setcpu(kvm_t *, unsigned int);
-char	**kvm_getargv(kvm_t *, const struct kinfo_proc *, int);
-int	  kvm_getcptime(kvm_t *, long *);
-char	**kvm_getenvv(kvm_t *, const struct kinfo_proc *, int);
-char	 *kvm_geterr(kvm_t *);
-char	 *kvm_getfiles(kvm_t *, int, int, int *);
-int	  kvm_getloadavg(kvm_t *, double [], int);
-int	  kvm_getmaxcpu(kvm_t *);
-int	  kvm_getncpus(kvm_t *);
-void	 *kvm_getpcpu(kvm_t *, int);
-uint64_t  kvm_counter_u64_fetch(kvm_t *, u_long);
-struct kinfo_proc *
-	  kvm_getprocs(kvm_t *, int, int, int *);
-int	  kvm_getswapinfo(kvm_t *, struct kvm_swap *, int, int);
-int	  kvm_nlist(kvm_t *, struct nlist *);
-kvm_t	 *kvm_open
-	    (const char *, const char *, const char *, int, const char *);
-kvm_t	 *kvm_openfiles
-	    (const char *, const char *, const char *, int, char *);
-ssize_t	  kvm_read(kvm_t *, unsigned long, void *, size_t);
-ssize_t	  kvm_read_zpcpu(kvm_t *, unsigned long, void *, size_t, int);
-ssize_t	  kvm_write(kvm_t *, unsigned long, const void *, size_t);
-__END_DECLS
-
-#endif /* !_KVM_H_ */
diff --git a/include.new/kx509_asn1.h b/include.new/kx509_asn1.h
deleted file mode 100644
index 04ca95e..0000000
--- a/include.new/kx509_asn1.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/kx509.asn1 */
-/* Do not edit */
-
-#ifndef __kx509_asn1_h__
-#define __kx509_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-/*
-KX509-ERROR-CODE ::= INTEGER {
-  KX509_STATUS_GOOD(0),
-  KX509_STATUS_CLIENT_BAD(1),
-  KX509_STATUS_CLIENT_FIX(2),
-  KX509_STATUS_CLIENT_TEMP(3),
-  KX509_STATUS_SERVER_BAD(4),
-  KX509_STATUS_SERVER_TEMP(5),
-  KX509_STATUS_SERVER_KEY(7)
-}
-*/
-
-typedef enum KX509_ERROR_CODE {
-  KX509_STATUS_GOOD = 0,
-  KX509_STATUS_CLIENT_BAD = 1,
-  KX509_STATUS_CLIENT_FIX = 2,
-  KX509_STATUS_CLIENT_TEMP = 3,
-  KX509_STATUS_SERVER_BAD = 4,
-  KX509_STATUS_SERVER_TEMP = 5,
-  KX509_STATUS_SERVER_KEY = 7
-} KX509_ERROR_CODE;
-
-ASN1EXP int    ASN1CALL decode_KX509_ERROR_CODE(const unsigned char *, size_t, KX509_ERROR_CODE *, size_t *);
-ASN1EXP int    ASN1CALL encode_KX509_ERROR_CODE(unsigned char *, size_t, const KX509_ERROR_CODE *, size_t *);
-ASN1EXP size_t ASN1CALL length_KX509_ERROR_CODE(const KX509_ERROR_CODE *);
-ASN1EXP int    ASN1CALL copy_KX509_ERROR_CODE  (const KX509_ERROR_CODE *, KX509_ERROR_CODE *);
-ASN1EXP void   ASN1CALL free_KX509_ERROR_CODE  (KX509_ERROR_CODE *);
-
-
-/*
-Kx509Request ::= SEQUENCE {
-  authenticator   OCTET STRING,
-  pk-hash         OCTET STRING,
-  pk-key          OCTET STRING,
-}
-*/
-
-typedef struct Kx509Request {
-  heim_octet_string authenticator;
-  heim_octet_string pk_hash;
-  heim_octet_string pk_key;
-} Kx509Request;
-
-ASN1EXP int    ASN1CALL decode_Kx509Request(const unsigned char *, size_t, Kx509Request *, size_t *);
-ASN1EXP int    ASN1CALL encode_Kx509Request(unsigned char *, size_t, const Kx509Request *, size_t *);
-ASN1EXP size_t ASN1CALL length_Kx509Request(const Kx509Request *);
-ASN1EXP int    ASN1CALL copy_Kx509Request  (const Kx509Request *, Kx509Request *);
-ASN1EXP void   ASN1CALL free_Kx509Request  (Kx509Request *);
-
-
-/*
-Kx509Response ::= SEQUENCE {
-  error-code      [0] INTEGER (-2147483648..2147483647) OPTIONAL,
-  hash            [1] OCTET STRING OPTIONAL,
-  certificate     [2] OCTET STRING OPTIONAL,
-  e-text          [3]   VisibleString OPTIONAL,
-}
-*/
-
-typedef struct Kx509Response {
-  int *error_code;
-  heim_octet_string *hash;
-  heim_octet_string *certificate;
-  heim_visible_string *e_text;
-} Kx509Response;
-
-ASN1EXP int    ASN1CALL decode_Kx509Response(const unsigned char *, size_t, Kx509Response *, size_t *);
-ASN1EXP int    ASN1CALL encode_Kx509Response(unsigned char *, size_t, const Kx509Response *, size_t *);
-ASN1EXP size_t ASN1CALL length_Kx509Response(const Kx509Response *);
-ASN1EXP int    ASN1CALL copy_Kx509Response  (const Kx509Response *, Kx509Response *);
-ASN1EXP void   ASN1CALL free_Kx509Response  (Kx509Response *);
-
-
-#endif /* __kx509_asn1_h__ */
diff --git a/include.new/langinfo.h b/include.new/langinfo.h
deleted file mode 100644
index 340225c..0000000
--- a/include.new/langinfo.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@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.
- *
- * 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: releng/10.2/include/langinfo.h 233600 2012-03-28 12:11:54Z theraven $
- */
-
-#ifndef _LANGINFO_H_
-#define	_LANGINFO_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _NL_ITEM_DECLARED
-typedef	__nl_item	nl_item;
-#define	_NL_ITEM_DECLARED
-#endif
-
-#define	CODESET		0	/* codeset name */
-#define	D_T_FMT		1	/* string for formatting date and time */
-#define	D_FMT		2	/* date format string */
-#define	T_FMT		3	/* time format string */
-#define	T_FMT_AMPM	4	/* a.m. or p.m. time formatting string */
-#define	AM_STR		5	/* Ante Meridian affix */
-#define	PM_STR		6	/* Post Meridian affix */
-
-/* week day names */
-#define	DAY_1		7
-#define	DAY_2		8
-#define	DAY_3		9
-#define	DAY_4		10
-#define	DAY_5		11
-#define	DAY_6		12
-#define	DAY_7		13
-
-/* abbreviated week day names */
-#define	ABDAY_1		14
-#define	ABDAY_2		15
-#define	ABDAY_3		16
-#define	ABDAY_4		17
-#define	ABDAY_5		18
-#define	ABDAY_6		19
-#define	ABDAY_7		20
-
-/* month names */
-#define	MON_1		21
-#define	MON_2		22
-#define	MON_3		23
-#define	MON_4		24
-#define	MON_5		25
-#define	MON_6		26
-#define	MON_7		27
-#define	MON_8		28
-#define	MON_9		29
-#define	MON_10		30
-#define	MON_11		31
-#define	MON_12		32
-
-/* abbreviated month names */
-#define	ABMON_1		33
-#define	ABMON_2		34
-#define	ABMON_3		35
-#define	ABMON_4		36
-#define	ABMON_5		37
-#define	ABMON_6		38
-#define	ABMON_7		39
-#define	ABMON_8		40
-#define	ABMON_9		41
-#define	ABMON_10	42
-#define	ABMON_11	43
-#define	ABMON_12	44
-
-#define	ERA		45	/* era description segments */
-#define	ERA_D_FMT	46	/* era date format string */
-#define	ERA_D_T_FMT	47	/* era date and time format string */
-#define	ERA_T_FMT	48	/* era time format string */
-#define	ALT_DIGITS	49	/* alternative symbols for digits */
-
-#define	RADIXCHAR	50	/* radix char */
-#define	THOUSEP		51	/* separator for thousands */
-
-#define	YESEXPR		52	/* affirmative response expression */
-#define	NOEXPR		53	/* negative response expression */
-
-#if __BSD_VISIBLE || __XSI_VISIBLE <= 500
-#define	YESSTR		54	/* affirmative response for yes/no queries */
-#define	NOSTR		55	/* negative response for yes/no queries */
-#endif
-
-#define	CRNCYSTR	56	/* currency symbol */
-
-#if __BSD_VISIBLE
-#define	D_MD_ORDER	57	/* month/day order (local extension) */
-#endif
-
-/* standalone months forms for %OB */
-#define	ALTMON_1	58
-#define	ALTMON_2	59
-#define	ALTMON_3	60
-#define	ALTMON_4	61
-#define	ALTMON_5	62
-#define	ALTMON_6	63
-#define	ALTMON_7	64
-#define	ALTMON_8	65
-#define	ALTMON_9	66
-#define	ALTMON_10	67
-#define	ALTMON_11	68
-#define	ALTMON_12	69
-
-__BEGIN_DECLS
-char	*nl_langinfo(nl_item);
-
-#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
-#include <xlocale/_langinfo.h>
-#endif
-__END_DECLS
-
-#endif /* !_LANGINFO_H_ */
diff --git a/include.new/libatm.h b/include.new/libatm.h
deleted file mode 100644
index bbd7b5d..0000000
--- a/include.new/libatm.h
+++ /dev/null
@@ -1,117 +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: src/lib/libatm/libatm.h,v 1.7 2003/07/29 13:35:03 harti Exp $
- *
- */
-
-/*
- * User Space Library Functions
- * ----------------------------
- *
- * Library functions
- *
- */
-
-#ifndef _HARP_LIBHARP_H
-#define _HARP_LIBHARP_H
-
-/*
- * Start a HARP user-space timer
- *
- *	tp	pointer to timer control block
- *	time	number of seconds for timer to run
- *	fp	pointer to function to call at expiration
- */
-#define HARP_TIMER(tp, time, fp)				\
-{								\
-	(tp)->ht_ticks = (time);				\
-	(tp)->ht_mark = 0;					\
-	(tp)->ht_func = (fp);					\
-	LINK2HEAD((tp), Harp_timer, harp_timer_head, ht_next);	\
-}
-
-/*
- * Cancel a HARP user-space timer
- *
- *	tp	pointer to timer control block
- */
-#define HARP_CANCEL(tp)						\
-{								\
-	UNLINK((tp), Harp_timer, harp_timer_head, ht_next);	\
-}
-
-
-/*
- * HARP user-space timer control block
- */
-struct harp_timer {
-	struct harp_timer	*ht_next;	/* Timer chain */
-	int			ht_ticks;	/* Seconds till exp */
-	int			ht_mark;	/* Processing flag */
-	void	(*ht_func)(struct harp_timer *);	/* Function to call */
-};
-typedef struct harp_timer	Harp_timer;
-
-
-/*
- * Externally-visible variables and functions
- */
-
-/* atm_addr.c */
-extern int		get_hex_atm_addr(const char *, u_char *, int);
-extern char		*format_atm_addr(const Atm_addr *);
-
-/* cache_key.c */
-extern void		scsp_cache_key(const Atm_addr *,
-				const struct in_addr  *, int, char *);
-
-/* ioctl_subr.c */
-extern ssize_t		do_info_ioctl(struct atminfreq *, size_t);
-extern ssize_t		get_vcc_info(const char *, struct air_vcc_rsp **);
-extern int		get_subnet_mask(const char *, struct sockaddr_in *);
-extern int		get_mtu(const char *);
-extern int		verify_nif_name(const char *);
-extern ssize_t		get_cfg_info(const char *, struct air_cfg_rsp **);
-extern ssize_t		get_intf_info(const char *, struct air_int_rsp **);
-extern ssize_t		get_netif_info(const char *, struct air_netif_rsp **);
-
-/* ip_addr.c */
-extern struct sockaddr_in	*get_ip_addr(const char *);
-extern const char		*format_ip_addr(const struct in_addr *);
-
-/* ip_checksum.c */
-extern short		ip_checksum(const char *, int);
-
-/* timer.c */
-extern Harp_timer	*harp_timer_head;
-extern int		harp_timer_exec;
-extern void		timer_proc(void);
-extern int		init_timer(void);
-extern int		block_timer(void);
-extern void		enable_timer(int);
-
-
-#endif	/* _HARP_LIBHARP_H */
diff --git a/include.new/libdisk.h b/include.new/libdisk.h
deleted file mode 100644
index 5c0734f..0000000
--- a/include.new/libdisk.h
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
-* ----------------------------------------------------------------------------
-* "THE BEER-WARE LICENSE" (Revision 42):
-* <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
-* can do whatever you want with this stuff. If we meet some day, and you think
-* this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
-* ----------------------------------------------------------------------------
-*
-* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.62 2004/04/21 23:21:13 grehan Exp $
-*
-*/
-
-/* #define DEBUG 1 */
-/* You can define a particular architecture here if you are debugging. */
-/* #define P_DEBUG p_sparc64 */
-
-#define MAX_NO_DISKS	32
-/* Max # of disks Disk_Names() will return */
-
-#define MAX_SEC_SIZE    2048  /* maximum sector size that is supported */
-#define MIN_SEC_SIZE	512   /* the sector size to end sensing at */
-
-enum platform {
-	p_any,			/* for debugging ! */
-	p_alpha,
-	p_i386,
-	p_pc98,
-	p_sparc64,
-	p_ia64,
-	p_ppc,
-	p_amd64
-};
-extern const enum platform platform;
-
-typedef enum {
-	whole,
-	unknown,
-
-	sun,
-	pc98,
-	mbr,
-	gpt,
-
-	efi,
-	fat,
-	freebsd,
-	extended,
-	part,
-	spare,
-	unused,
-
-	apple
-} chunk_e;
-
-__BEGIN_DECLS
-#ifndef __ia64__
-struct disk {
-	char		*name;
-	u_long		bios_cyl;
-	u_long		bios_hd;
-	u_long		bios_sect;
-#ifdef PC98
-	u_char		*bootipl;
-	size_t		bootipl_size;
-	u_char		*bootmenu;
-	size_t		bootmenu_size;
-#else
-	u_char		*bootmgr;
-	size_t		bootmgr_size;
-#endif
-	u_char		*boot1;
-#if defined(__i386__) || defined(__amd64__) /* the i386 needs extra help... */
-	u_char		*boot2;
-#endif
-	struct chunk	*chunks;
-	u_long		sector_size; /* media sector size, a power of 2 */
-};
-#else	/* !__ia64__ */
-struct disk {
-	char		*name;
-	struct chunk	*chunks;
-	u_long		media_size;
-	u_long		sector_size;
-	u_long		lba_start;
-	u_long		lba_end;
-	u_int		gpt_size;	/* Number of entries */
-};
-#endif
-
-struct chunk {
-	struct chunk	*next;
-	struct chunk	*part;
-	struct disk	*disk;
-	daddr_t		offset;
-	daddr_t		size;
-	daddr_t		end;
-	char		*sname;		/* PC98 field */
-	char		*name;
-	char		*oname;
-	/* Used during Fixup_Names() to avoid renaming more than
-	 * absolutely needed.
-	 */
-	chunk_e		type;
-	int		subtype;
-	u_long		flags;
-	void		(*private_free)(void*);
-	void		*(*private_clone)(void*);
-	void		*private_data;
-	/* For data private to the application, and the management
-	 * thereof.  If the functions are not provided, no storage
-	 * management is done, Cloning will just copy the pointer
-	 * and freeing will just forget it.
-	 */
-};
-
-/*
- * flags:
- *
- * ALIGN	-	This chunk should be aligned
- * IS_ROOT	-	This 'part' is a rootfs, allocate 'a'
- * ACTIVE	-	This is the active slice in the MBR
- * FORCE_ALL	-	Force a dedicated disk for FreeBSD, bypassing
- *			all BIOS geometry considerations
- * AUTO_SIZE	-	This chunk was auto-sized and can fill-out a
- *			following chunk if the following chunk is deleted.
- * NEWFS	-	newfs pending, used to enable auto-resizing on
- *			delete (along with AUTO_SIZE).
- */
-
-#define CHUNK_ALIGN		0x0008
-#define CHUNK_IS_ROOT		0x0010
-#define CHUNK_ACTIVE		0x0020
-#define CHUNK_FORCE_ALL		0x0040	
-#define CHUNK_AUTO_SIZE		0x0080
-#define CHUNK_NEWFS		0x0100
-#define	CHUNK_HAS_INDEX		0x0200
-#define	CHUNK_ITOF(i)		((i & 0xFFFF) << 16)
-#define	CHUNK_FTOI(f)		((f >> 16) & 0xFFFF)
-
-#define DELCHUNK_NORMAL		0x0000
-#define DELCHUNK_RECOVER	0x0001
-
-const char *chunk_name(chunk_e);
-
-const char *
-slice_type_name(int, int);
-/* "chunk_n" for subtypes too */
-
-struct disk *
-Open_Disk(const char *);
-/* Will open the named disk, and return populated tree.  */
-
-void
-Free_Disk(struct disk *);
-/* Free a tree made with Open_Disk() or Clone_Disk() */
-
-void
-Debug_Disk(struct disk *);
-/* Print the content of the tree to stdout */
-
-void
-Set_Bios_Geom(struct disk *, u_long, u_long, u_long);
-/* Set the geometry the bios uses. */
-
-void
-Sanitize_Bios_Geom(struct disk *);
-/* Set the bios geometry to something sane */
-
-int
-Insert_Chunk(struct chunk *, daddr_t, daddr_t, const char *, chunk_e, int,
-	u_long, const char *);
-
-int
-Delete_Chunk2(struct disk *, struct chunk *, int);
-/* Free a chunk of disk_space modified by the passed flags. */
-
-int
-Delete_Chunk(struct disk *, struct chunk *);
-/* Free a chunk of disk_space */
-
-void
-Collapse_Disk(struct disk *);
-/* Experimental, do not use. */
-
-int
-Collapse_Chunk(struct disk *, struct chunk *);
-/* Experimental, do not use. */
-
-int
-Create_Chunk(struct disk *, daddr_t, daddr_t, chunk_e, int, u_long, const char *);
-/* Create a chunk with the specified paramters */
-
-void
-All_FreeBSD(struct disk *, int);
-/*
- * Make one FreeBSD chunk covering the entire disk;
- * if force_all is set, bypass all BIOS geometry
- * considerations.
- */
-
-char *
-CheckRules(const struct disk *);
-/* Return char* to warnings about broken design rules in this disklayout */
-
-char **
-Disk_Names(void);
-/*
- * Return char** with all disk's names (wd0, wd1 ...).  You must free
- * each pointer, as well as the array by hand
- */
-
-#ifdef PC98
-void
-Set_Boot_Mgr(struct disk *, const u_char *, const size_t, const u_char *,
-	const size_t);
-#else
-void
-Set_Boot_Mgr(struct disk *, const u_char *, const size_t);
-#endif
-/*
- * Use this boot-manager on this disk.  Gets written when Write_Disk()
- * is called
- */
-
-int
-Set_Boot_Blocks(struct disk *, const u_char *, const u_char *);
-/*
- * Use these boot-blocks on this disk.  Gets written when Write_Disk()
- * is called. Returns nonzero upon failure.
- */
-
-int
-Write_Disk(const struct disk *);
-/* Write all the MBRs, disklabels, bootblocks and boot managers */
-
-daddr_t
-Next_Cyl_Aligned(const struct disk *, daddr_t);
-/* Round offset up to next cylinder according to the bios-geometry */
-
-daddr_t
-Prev_Cyl_Aligned(const struct disk *, daddr_t);
-/* Round offset down to previous cylinder according to the bios-geometry */
-
-int
-Track_Aligned(const struct disk *, daddr_t);
-/* Check if offset is aligned on a track according to the bios geometry */
-
-daddr_t
-Next_Track_Aligned(const struct disk *, daddr_t);
-/* Round offset up to next track according to the bios-geometry */
-
-daddr_t
-Prev_Track_Aligned(const struct disk *, daddr_t);
-/* Check if offset is aligned on a track according to the bios geometry */
-
-struct chunk *
-Create_Chunk_DWIM(struct disk *, struct chunk *, daddr_t, chunk_e, int,
-	u_long);
-/*
- * This one creates a partition inside the given parent of the given
- * size, and returns a pointer to it.  The first unused chunk big
- * enough is used.
- */
-
-char *
-ShowChunkFlags(struct chunk *);
-/* Return string to show flags. */
-
-/*
- * Implementation details  >>> DO NOT USE <<<
- */
-
-struct disklabel;
-
-void Fill_Disklabel(struct disklabel *, const struct disk *,
-	const struct chunk *);
-void Debug_Chunk(struct chunk *);
-struct chunk *New_Chunk(void);
-void Free_Chunk(struct chunk *);
-struct chunk *Clone_Chunk(const struct chunk *);
-int Add_Chunk(struct disk *, daddr_t, daddr_t, const char *, chunk_e, int,
-	u_long, const char *);
-void *read_block(int, daddr_t, u_long);
-int write_block(int, daddr_t, const void *, u_long);
-struct disklabel *read_disklabel(int, daddr_t, u_long);
-struct disk *Int_Open_Disk(const char *, char *);
-int Fixup_Names(struct disk *);
-int MakeDevChunk(const struct chunk *, const char *);
-__END_DECLS
-
-#define dprintf	printf
-
-/* TODO
- *
- * Need an error string mechanism from the functions instead of warn()
- *
- * Make sure only FreeBSD start at offset==0
- *
- * Collapse must align.
- *
- * Make Write_Disk(struct disk*)
- *
- * Consider booting from OnTrack'ed disks.
- *
- * Get Bios-geom, ST506 & OnTrack from driver (or otherwise)
- *
- * Make Create_DWIM().
- *
- * Make Is_Unchanged(struct disk *d1, struct chunk *c1)
- *
- * don't rename slices unless we have to
- *
- *Sample output from tst01:
- *
- * Debug_Disk(wd0)  flags=0  bios_geom=0/0/0
- * >>        0x3d040          0    1411200    1411199 wd0      0 whole    0 0
- * >>>>      0x3d080          0     960120     960119 wd0s1    3 freebsd  0 8
- * >>>>>>    0x3d100          0      40960      40959 wd0s1a   5 part     0 0
- * >>>>>>    0x3d180      40960     131072     172031 wd0s1b   5 part     0 0
- * >>>>>>    0x3d1c0     172032     409600     581631 wd0s1e   5 part     0 0
- * >>>>>>    0x3d200     581632     378488     960119 wd0s1f   5 part     0 0
- * >>>>      0x3d140     960120       5670     965789 wd0s2    4 extended 0 8
- * >>>>>>    0x3d2c0     960120         63     960182 -        6 unused   0 0
- * >>>>>>    0x3d0c0     960183       5607     965789 wd0s5    2 fat      0 8
- * >>>>      0x3d280     965790       1890     967679 wd0s3    1 foo      -2 8
- * >>>>      0x3d300     967680     443520    1411199 wd0s4    3 freebsd  0 8
- * >>>>>>    0x3d340     967680     443520    1411199 wd0s4a   5 part     0 0
- *
- * ^            ^           ^          ^          ^     ^      ^ ^        ^ ^
- * level    chunkptr      start      size        end  name    type  subtype flags
- *
- * Underlying data structure:
- *
- *	Legend:
- *		<struct chunk> --> part
- *			|
- *			v next
- *
- *	<wd0> --> <wd0s1> --> <wd0s1a>
- *		     |           |
- *		     |           v
- *		     |        <wd0s1b>
- *		     |           |
- *		     |           v
- *		     |        <wd0s1e>
- *		     |           |
- *		     |           v
- *		     |        <wd0s1f>
- *		     |
- *		     v
- *		  <wd0s2> --> <unused>
- *		     |           |
- *		     |           v
- *		     |        <wd0s5>
- *		     |
- *		     v
- *		  <wd0s3>
- *		     |
- *		     v
- *		  <wd0s4> --> <wd0s4a>
- *
- *
- */
diff --git a/include.new/libdwarf.h b/include.new/libdwarf.h
deleted file mode 100644
index a1bf761..0000000
--- a/include.new/libdwarf.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * Copyright (c) 2007 John Birrell (jb@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.
- *
- * 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: releng/10.2/lib/libdwarf/libdwarf.h 221569 2011-05-07 01:05:31Z obrien $
- */
-
-#ifndef	_LIBDWARF_H_
-#define	_LIBDWARF_H_
-
-#include <libelf.h>
-
-typedef int		Dwarf_Bool;
-typedef off_t		Dwarf_Off;
-typedef uint64_t	Dwarf_Unsigned;
-typedef uint16_t	Dwarf_Half;
-typedef uint8_t		Dwarf_Small;
-typedef int64_t		Dwarf_Signed;
-typedef uint64_t	Dwarf_Addr;
-typedef void		*Dwarf_Ptr;
-
-/* Forward definitions. */
-typedef struct _Dwarf_Abbrev	*Dwarf_Abbrev;
-typedef struct _Dwarf_Arange	*Dwarf_Arange;
-typedef struct _Dwarf_Attribute	*Dwarf_Attribute;
-typedef struct _Dwarf_AttrValue	*Dwarf_AttrValue;
-typedef struct _Dwarf_CU	*Dwarf_CU;
-typedef struct _Dwarf_Cie	*Dwarf_Cie;
-typedef struct _Dwarf_Debug	*Dwarf_Debug;
-typedef struct _Dwarf_Die	*Dwarf_Die;
-typedef struct _Dwarf_Fde	*Dwarf_Fde;
-typedef struct _Dwarf_Func	*Dwarf_Func;
-typedef struct _Dwarf_Inlined_Func *Dwarf_Inlined_Func;
-typedef struct _Dwarf_Global	*Dwarf_Global;
-typedef struct _Dwarf_Line	*Dwarf_Line;
-typedef struct _Dwarf_Type	*Dwarf_Type;
-typedef struct _Dwarf_Var	*Dwarf_Var;
-typedef struct _Dwarf_Weak	*Dwarf_Weak;
-
-typedef struct {
-        Dwarf_Small	lr_atom;
-        Dwarf_Unsigned	lr_number;
-	Dwarf_Unsigned	lr_number2;
-	Dwarf_Unsigned	lr_offset;
-} Dwarf_Loc;
-
-typedef struct {
-	Dwarf_Addr      ld_lopc;
-	Dwarf_Addr      ld_hipc;
-	Dwarf_Half      ld_cents;
-	Dwarf_Loc	*ld_s;
-} Dwarf_Locdesc;
-
-/* receiver function for dwarf_function_iterate_inlined_instance() API */
-typedef void (*Dwarf_Inlined_Callback)(Dwarf_Inlined_Func, void *);
-
-/*
- * Error numbers which are specific to this implementation.
- */
-enum {
-	DWARF_E_NONE,			/* No error. */
-	DWARF_E_ERROR,			/* An error! */
-	DWARF_E_NO_ENTRY,		/* No entry. */
-	DWARF_E_ARGUMENT,		/* Invalid argument. */
-	DWARF_E_DEBUG_INFO,		/* Debug info NULL. */
-	DWARF_E_MEMORY,			/* Insufficient memory. */
-	DWARF_E_ELF,			/* ELF error. */
-	DWARF_E_INVALID_CU,		/* Invalid compilation unit data. */
-	DWARF_E_CU_VERSION,		/* Wrong CU version. */
-	DWARF_E_MISSING_ABBREV,		/* Abbrev not found. */
-	DWARF_E_NOT_IMPLEMENTED,	/* Not implemented. */
-	DWARF_E_CU_CURRENT,		/* No current compilation unit. */
-	DWARF_E_BAD_FORM,		/* Wrong form type for attribute value. */
-	DWARF_E_INVALID_EXPR,		/* Invalid DWARF expression. */
-	DWARF_E_NUM			/* Max error number. */
-};
-
-typedef struct _Dwarf_Error {
-	int		err_error;	/* DWARF error. */
-	int		elf_error;	/* ELF error. */
-	const char	*err_func;	/* Function name where error occurred. */
-	int		err_line;	/* Line number where error occurred. */
-	char		err_msg[1024];	/* Formatted error message. */
-} Dwarf_Error;
-
-/*
- * Return values which have to be compatible with other
- * implementations of libdwarf.
- */
-#define DW_DLV_NO_ENTRY		DWARF_E_NO_ENTRY
-#define DW_DLV_OK		DWARF_E_NONE
-#define DW_DLE_DEBUG_INFO_NULL	DWARF_E_DEBUG_INFO
-
-#define DW_DLC_READ        	0	/* read only access */
-
-/* Function prototype definitions. */
-__BEGIN_DECLS
-Dwarf_Abbrev	dwarf_abbrev_find(Dwarf_CU, uint64_t);
-Dwarf_AttrValue dwarf_attrval_find(Dwarf_Die, Dwarf_Half);
-Dwarf_Die	dwarf_die_find(Dwarf_Die, Dwarf_Unsigned);
-const char	*dwarf_errmsg(Dwarf_Error *);
-const char	*get_sht_desc(uint32_t);
-const char	*get_attr_desc(uint32_t);
-const char	*get_form_desc(uint32_t);
-const char	*get_tag_desc(uint32_t);
-int		dwarf_abbrev_add(Dwarf_CU, uint64_t, uint64_t, uint8_t, Dwarf_Abbrev *, Dwarf_Error *);
-int		dwarf_attr(Dwarf_Die, Dwarf_Half, Dwarf_Attribute *, Dwarf_Error *);
-int		dwarf_attr_add(Dwarf_Abbrev, uint64_t, uint64_t, Dwarf_Attribute *, Dwarf_Error *);
-int		dwarf_attrval(Dwarf_Die, Dwarf_Half, Dwarf_AttrValue *, Dwarf_Error *);
-int		dwarf_attrval_add(Dwarf_Die, Dwarf_AttrValue, Dwarf_AttrValue *, Dwarf_Error *);
-int		dwarf_attrval_flag(Dwarf_Die, uint64_t, Dwarf_Bool *, Dwarf_Error *);
-int		dwarf_attrval_signed(Dwarf_Die, uint64_t, Dwarf_Signed *, Dwarf_Error *);
-int		dwarf_attrval_string(Dwarf_Die, uint64_t, const char **, Dwarf_Error *);
-int		dwarf_attrval_unsigned(Dwarf_Die, uint64_t, Dwarf_Unsigned *, Dwarf_Error *);
-int		dwarf_child(Dwarf_Die, Dwarf_Die *, Dwarf_Error *);
-int		dwarf_die_add(Dwarf_CU, int, uint64_t, uint64_t, Dwarf_Abbrev, Dwarf_Die *, Dwarf_Error *);
-int		dwarf_dieoffset(Dwarf_Die, Dwarf_Off *, Dwarf_Error *);
-int		dwarf_elf_init(Elf *, int, Dwarf_Debug *, Dwarf_Error *);
-int		dwarf_errno(Dwarf_Error *);
-int		dwarf_finish(Dwarf_Debug *, Dwarf_Error *);
-int		dwarf_locdesc(Dwarf_Die, uint64_t, Dwarf_Locdesc **, Dwarf_Signed *, Dwarf_Error *);
-int		dwarf_locdesc_free(Dwarf_Locdesc *, Dwarf_Error *);
-int		dwarf_init(int, int, Dwarf_Debug *, Dwarf_Error *);
-int		dwarf_next_cu_header(Dwarf_Debug, Dwarf_Unsigned *, Dwarf_Half *,
-		    Dwarf_Unsigned *, Dwarf_Half *, Dwarf_Unsigned *, Dwarf_Error *);
-int		dwarf_op_num(uint8_t, uint8_t *, int);
-int		dwarf_siblingof(Dwarf_Debug, Dwarf_Die, Dwarf_Die *, Dwarf_Error *);
-int		dwarf_tag(Dwarf_Die, Dwarf_Half *, Dwarf_Error *);
-int		dwarf_whatform(Dwarf_Attribute, Dwarf_Half *, Dwarf_Error *);
-void		dwarf_dealloc(Dwarf_Debug, Dwarf_Ptr, Dwarf_Unsigned);
-void		dwarf_dump(Dwarf_Debug);
-void		dwarf_dump_abbrev(Dwarf_Debug);
-void		dwarf_dump_av(Dwarf_Die, Dwarf_AttrValue);
-void		dwarf_dump_dbgstr(Dwarf_Debug);
-void		dwarf_dump_die(Dwarf_Die);
-void		dwarf_dump_die_at_offset(Dwarf_Debug, Dwarf_Off);
-void		dwarf_dump_info(Dwarf_Debug);
-void		dwarf_dump_shstrtab(Dwarf_Debug);
-void		dwarf_dump_strtab(Dwarf_Debug);
-void		dwarf_dump_symtab(Dwarf_Debug);
-void		dwarf_dump_raw(Dwarf_Debug);
-void		dwarf_dump_tree(Dwarf_Debug);
-Dwarf_Func	dwarf_find_function_by_offset(Dwarf_Debug dbg, Dwarf_Off off);
-Dwarf_Func	dwarf_find_function_by_name(Dwarf_Debug dbg, const char *name);
-int		dwarf_function_get_addr_range(Dwarf_Func f,
-		    Dwarf_Addr *low_pc, Dwarf_Addr *high_pc);
-int		dwarf_function_is_inlined(Dwarf_Func f);
-void		dwarf_function_iterate_inlined_instance(Dwarf_Func func,
-		    Dwarf_Inlined_Callback f, void *data);
-int		dwarf_inlined_function_get_addr_range(Dwarf_Inlined_Func f,
-		    Dwarf_Addr *low_pc, Dwarf_Addr *high_pc);
-
-__END_DECLS
-
-#endif /* !_LIBDWARF_H_ */
diff --git a/include.new/libelf.h b/include.new/libelf.h
deleted file mode 100644
index 3f8bab7..0000000
--- a/include.new/libelf.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*-
- * Copyright (c) 2006 Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/lib/libelf/libelf.h 210345 2010-07-21 12:14:50Z kaiw $
- */
-
-#ifndef	_LIBELF_H_
-#define	_LIBELF_H_
-
-#include <sys/types.h>
-#include <sys/elf32.h>
-#include <sys/elf64.h>
-#include <sys/queue.h>
-
-/* Library private data structures */
-typedef struct _Elf Elf;
-typedef struct _Elf_Scn Elf_Scn;
-
-/* File types */
-typedef enum {
-	ELF_K_NONE = 0,
-	ELF_K_AR,	/* `ar' archives */
-	ELF_K_COFF,	/* COFF files (unsupported) */
-	ELF_K_ELF,	/* ELF files */
-	ELF_K_NUM
-} Elf_Kind;
-
-#define	ELF_K_FIRST	ELF_K_NONE
-#define	ELF_K_LAST	ELF_K_NUM
-
-/* Data types */
-typedef enum {
-	ELF_T_ADDR,
-	ELF_T_BYTE,
-	ELF_T_CAP,
-	ELF_T_DYN,
-	ELF_T_EHDR,
-	ELF_T_HALF,
-	ELF_T_LWORD,
-	ELF_T_MOVE,
-	ELF_T_MOVEP,
-	ELF_T_NOTE,
-	ELF_T_OFF,
-	ELF_T_PHDR,
-	ELF_T_REL,
-	ELF_T_RELA,
-	ELF_T_SHDR,
-	ELF_T_SWORD,
-	ELF_T_SXWORD,
-	ELF_T_SYMINFO,
-	ELF_T_SYM,
-	ELF_T_VDEF,
-	ELF_T_VNEED,
-	ELF_T_WORD,
-	ELF_T_XWORD,
-	ELF_T_GNUHASH,	/* GNU style hash tables. */
-	ELF_T_NUM
-} Elf_Type;
-
-#define	ELF_T_FIRST	ELF_T_ADDR
-#define	ELF_T_LAST	ELF_T_GNUHASH
-
-/* Commands */
-typedef enum {
-	ELF_C_NULL = 0,
-	ELF_C_CLR,
-	ELF_C_FDDONE,
-	ELF_C_FDREAD,
-	ELF_C_RDWR,
-	ELF_C_READ,
-	ELF_C_SET,
-	ELF_C_WRITE,
-	ELF_C_NUM
-} Elf_Cmd;
-
-#define	ELF_C_FIRST	ELF_C_NULL
-#define	ELF_C_LAST	ELF_C_NUM
-
-/*
- * An `Elf_Data' structure describes data in an
- * ELF section.
- */
-typedef struct _Elf_Data {
-	/*
-	 * `Public' members that are part of the ELF(3) API.
-	 */
-	uint64_t	d_align;
-	void		*d_buf;
-	uint64_t	d_off;
-	uint64_t	d_size;
-	Elf_Type	d_type;
-	unsigned int	d_version;
-
-	/*
-	 * Members that are not part of the public API.
-	 */
-	Elf_Scn		*d_scn;		/* containing section */
-	unsigned int	d_flags;
-	STAILQ_ENTRY(_Elf_Data)	d_next;
-} Elf_Data;
-
-/*
- * An `Elf_Arhdr' structure describes an archive
- * header.
- */
-typedef struct {
-	time_t		ar_date;
-	char		*ar_name;	/* archive member name */
-	gid_t		ar_gid;
-	mode_t		ar_mode;
-	char		*ar_rawname;	/* 'raw' member name */
-	size_t		ar_size;
-	uid_t		ar_uid;
-} Elf_Arhdr;
-
-/*
- * An `Elf_Arsym' describes an entry in the archive
- * symbol table.
- */
-typedef struct {
-	off_t		as_off;		/* byte offset to member's header */
-	unsigned long	as_hash;	/* elf_hash() value for name */
-	char		*as_name; 	/* null terminated symbol name */
-} Elf_Arsym;
-
-/*
- * Error numbers.
- */
-
-enum Elf_Error {
-	ELF_E_NONE,	/* No error */
-	ELF_E_ARCHIVE,	/* Malformed ar(1) archive */
-	ELF_E_ARGUMENT,	/* Invalid argument */
-	ELF_E_CLASS,	/* Mismatched ELF class */
-	ELF_E_DATA,	/* Invalid data descriptor */
-	ELF_E_HEADER,	/* Missing or malformed ELF header */
-	ELF_E_IO,	/* I/O error */
-	ELF_E_LAYOUT,	/* Layout constraint violation */
-	ELF_E_MODE,	/* Wrong mode for ELF descriptor */
-	ELF_E_RANGE,	/* Value out of range */
-	ELF_E_RESOURCE,	/* Resource exhaustion */
-	ELF_E_SECTION,	/* Invalid section descriptor */
-	ELF_E_SEQUENCE,	/* API calls out of sequence */
-	ELF_E_UNIMPL,	/* Feature is unimplemented */
-	ELF_E_VERSION,	/* Unknown API version */
-	ELF_E_NUM	/* Max error number */
-};
-
-/*
- * Flags defined by the API.
- */
-
-#define	ELF_F_LAYOUT	0x001U	/* application will layout the file */
-#define	ELF_F_DIRTY	0x002U	/* a section or ELF file is dirty */
-
-__BEGIN_DECLS
-Elf		*elf_begin(int _fd, Elf_Cmd _cmd, Elf *_elf);
-int		elf_cntl(Elf *_elf, Elf_Cmd _cmd);
-int		elf_end(Elf *_elf);
-const char	*elf_errmsg(int _error);
-int		elf_errno(void);
-void		elf_fill(int _fill);
-unsigned int	elf_flagdata(Elf_Data *_data, Elf_Cmd _cmd, unsigned int _flags);
-unsigned int	elf_flagehdr(Elf *_elf, Elf_Cmd _cmd, unsigned int _flags);
-unsigned int	elf_flagelf(Elf *_elf, Elf_Cmd _cmd, unsigned int _flags);
-unsigned int	elf_flagphdr(Elf *_elf, Elf_Cmd _cmd, unsigned int _flags);
-unsigned int	elf_flagscn(Elf_Scn *_scn, Elf_Cmd _cmd, unsigned int _flags);
-unsigned int	elf_flagshdr(Elf_Scn *_scn, Elf_Cmd _cmd, unsigned int _flags);
-Elf_Arhdr	*elf_getarhdr(Elf *_elf);
-Elf_Arsym	*elf_getarsym(Elf *_elf, size_t *_ptr);
-off_t		elf_getbase(Elf *_elf);
-Elf_Data	*elf_getdata(Elf_Scn *, Elf_Data *);
-char		*elf_getident(Elf *_elf, size_t *_ptr);
-int		elf_getphdrnum(Elf *_elf, size_t *_dst);
-int		elf_getphnum(Elf *_elf, size_t *_dst);	/* Deprecated */
-Elf_Scn		*elf_getscn(Elf *_elf, size_t _index);
-int		elf_getshdrnum(Elf *_elf, size_t *_dst);
-int		elf_getshnum(Elf *_elf, size_t *_dst);	/* Deprecated */
-int		elf_getshdrstrndx(Elf *_elf, size_t *_dst);
-int		elf_getshstrndx(Elf *_elf, size_t *_dst); /* Deprecated */
-unsigned long	elf_hash(const char *_name);
-Elf_Kind	elf_kind(Elf *_elf);
-Elf		*elf_memory(char *_image, size_t _size);
-size_t		elf_ndxscn(Elf_Scn *_scn);
-Elf_Data	*elf_newdata(Elf_Scn *_scn);
-Elf_Scn		*elf_newscn(Elf *_elf);
-Elf_Scn		*elf_nextscn(Elf *_elf, Elf_Scn *_scn);
-Elf_Cmd		elf_next(Elf *_elf);
-off_t		elf_rand(Elf *_elf, off_t _off);
-Elf_Data	*elf_rawdata(Elf_Scn *_scn, Elf_Data *_data);
-char		*elf_rawfile(Elf *_elf, size_t *_size);
-int		elf_setshstrndx(Elf *_elf, size_t _shnum);
-char		*elf_strptr(Elf *_elf, size_t _section, size_t _offset);
-off_t		elf_update(Elf *_elf, Elf_Cmd _cmd);
-unsigned int	elf_version(unsigned int _version);
-
-long		elf32_checksum(Elf *_elf);
-size_t		elf32_fsize(Elf_Type _type, size_t _count,
-			unsigned int _version);
-Elf32_Ehdr	*elf32_getehdr(Elf *_elf);
-Elf32_Phdr	*elf32_getphdr(Elf *_elf);
-Elf32_Shdr	*elf32_getshdr(Elf_Scn *_scn);
-Elf32_Ehdr	*elf32_newehdr(Elf *_elf);
-Elf32_Phdr	*elf32_newphdr(Elf *_elf, size_t _count);
-Elf_Data	*elf32_xlatetof(Elf_Data *_dst, const Elf_Data *_src,
-			unsigned int _enc);
-Elf_Data	*elf32_xlatetom(Elf_Data *_dst, const Elf_Data *_src,
-			unsigned int _enc);
-
-long		elf64_checksum(Elf *_elf);
-size_t		elf64_fsize(Elf_Type _type, size_t _count,
-			unsigned int _version);
-Elf64_Ehdr	*elf64_getehdr(Elf *_elf);
-Elf64_Phdr	*elf64_getphdr(Elf *_elf);
-Elf64_Shdr	*elf64_getshdr(Elf_Scn *_scn);
-Elf64_Ehdr	*elf64_newehdr(Elf *_elf);
-Elf64_Phdr	*elf64_newphdr(Elf *_elf, size_t _count);
-Elf_Data	*elf64_xlatetof(Elf_Data *_dst, const Elf_Data *_src,
-			unsigned int _enc);
-Elf_Data	*elf64_xlatetom(Elf_Data *_dst, const Elf_Data *_src,
-			unsigned int _enc);
-
-#if	defined(LIBELF_TEST_HOOKS)
-int		_libelf_get_elf_class(Elf *_elf);
-int		_libelf_get_max_error(void);
-const char	*_libelf_get_no_error_message(void);
-const char	*_libelf_get_unknown_error_message(void);
-void		_libelf_set_elf_class(Elf *_elf, int _class);
-void		_libelf_set_error(int _error);
-#endif	/* LIBELF_TEST_HOOKS */
-__END_DECLS
-
-#endif	/* _LIBELF_H_ */
diff --git a/include.new/libgen.h b/include.new/libgen.h
deleted file mode 100644
index 139c645..0000000
--- a/include.new/libgen.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$OpenBSD: libgen.h,v 1.4 1999/05/28 22:00:22 espie Exp $	*/
-/*	$FreeBSD: releng/10.2/include/libgen.h 197804 2009-10-06 14:05:57Z rwatson $	*/
-
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#ifndef _LIBGEN_H_
-#define _LIBGEN_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-
-char	*basename(const char *);
-char	*basename_r(const char *, char *);
-char	*dirname(const char *);
-#if 0
-char	*regcmp(const char *, ...);
-char	*regex(const char *, const char *, ...);
-
-extern char *__loc1;
-#endif
-
-__END_DECLS
-
-#endif /* _LIBGEN_H_ */
diff --git a/include.new/libgeom.h b/include.new/libgeom.h
deleted file mode 100644
index a3aaa92..0000000
--- a/include.new/libgeom.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*-
- * Copyright (c) 2003 Poul-Henning Kamp
- * 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 names of the authors 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: releng/10.2/lib/libgeom/libgeom.h 253469 2013-07-19 06:42:15Z scottl $
- */
-#ifndef _LIBGEOM_H_
-#define _LIBGEOM_H_
-
-#include <sys/cdefs.h>
-
-#include <sys/queue.h>
-#include <sys/time.h>
-
-#include <geom/geom_ctl.h>
-
-__BEGIN_DECLS
-
-#ifndef DEBUG_LIBGEOM
-#define DEBUG_LIBGEOM 0
-#endif
-
-void geom_stats_close(void);
-void geom_stats_resync(void);
-int geom_stats_open(void);
-void *geom_stats_snapshot_get(void);
-void geom_stats_snapshot_free(void *);
-void geom_stats_snapshot_timestamp(void *, struct timespec *);
-void geom_stats_snapshot_reset(void *);
-struct devstat *geom_stats_snapshot_next(void *);
-
-char *geom_getxml(void);
-
-/* geom_xml2tree.c */
-
-/*
- * These structs are used to build the tree based on the XML.
- * they're named as the kernel variant without the first '_'.
- */
-
-struct gclass;
-struct ggeom;
-struct gconsumer;
-struct gprovider;
-
-LIST_HEAD(gconf, gconfig);
-
-struct gident {
-	void			*lg_id;
-	void			*lg_ptr;
-	enum {	ISCLASS,
-		ISGEOM,
-		ISPROVIDER,
-		ISCONSUMER }	lg_what;
-};
-
-struct gmesh {
-	LIST_HEAD(, gclass)	lg_class;
-	struct gident		*lg_ident;
-};
-
-struct gconfig {
-	LIST_ENTRY(gconfig)	lg_config;
-	char			*lg_name;
-	char			*lg_val;
-};
-
-struct gclass {
-	void			*lg_id;
-	char			*lg_name;
-	LIST_ENTRY(gclass)	lg_class;
-	LIST_HEAD(, ggeom)	lg_geom;
-	struct gconf		lg_config;
-};
-
-struct ggeom {
-	void			*lg_id;
-	struct gclass		*lg_class;
-	char			*lg_name;
-	u_int			lg_rank;
-	LIST_ENTRY(ggeom)	lg_geom;
-	LIST_HEAD(, gconsumer)	lg_consumer;
-	LIST_HEAD(, gprovider)	lg_provider;
-	struct gconf		lg_config;
-};
-
-struct gconsumer {
-	void			*lg_id;
-	struct ggeom		*lg_geom;
-	LIST_ENTRY(gconsumer)	lg_consumer;
-	struct gprovider	*lg_provider;
-	LIST_ENTRY(gconsumer)	lg_consumers;
-	char			*lg_mode;
-	struct gconf		lg_config;
-};
-
-struct gprovider {
-	void			*lg_id;
-	char			*lg_name;
-	struct ggeom		*lg_geom;
-	LIST_ENTRY(gprovider)	lg_provider;
-	LIST_HEAD(, gconsumer)	lg_consumers;
-	char			*lg_mode;
-	off_t			lg_mediasize;
-	u_int			lg_sectorsize;
-	off_t			lg_stripeoffset;
-	off_t			lg_stripesize;
-	struct gconf		lg_config;
-};
-
-struct gident * geom_lookupid(struct gmesh *, const void *);
-int geom_xml2tree(struct gmesh *, char *);
-int geom_gettree(struct gmesh *);
-void geom_deletetree(struct gmesh *);
-
-/* geom_ctl.c */
-
-struct gctl_req;
-
-#ifdef _STDIO_H_			/* limit #include pollution */
-void gctl_dump(struct gctl_req *, FILE *);
-#endif
-void gctl_free(struct gctl_req *);
-struct gctl_req *gctl_get_handle(void);
-const char *gctl_issue(struct gctl_req *);
-void gctl_ro_param(struct gctl_req *, const char *, int, const void *);
-void gctl_rw_param(struct gctl_req *, const char *, int, void *);
-
-/* geom_util.c */
-int g_open(const char *, int);
-int g_close(int);
-off_t g_mediasize(int);
-ssize_t g_sectorsize(int);
-off_t g_stripeoffset(int);
-off_t g_stripesize(int);
-int g_flush(int);
-int g_delete(int, off_t, off_t);
-int g_get_ident(int, char *, size_t);
-int g_get_name(const char *, char *, size_t);
-int g_open_by_ident(const char *, int, char *, size_t);
-char *g_device_path(const char *);
-char *g_providername(int);
-
-__END_DECLS
-
-#endif /* _LIBGEOM_H_ */
diff --git a/include.new/libmilter/mfapi.h b/include.new/libmilter/mfapi.h
deleted file mode 100644
index ace62d9..0000000
--- a/include.new/libmilter/mfapi.h
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * Copyright (c) 1999-2004, 2006, 2008, 2012 Proofpoint, Inc. and its suppliers.
- *	All rights reserved.
- *
- * By using this file, you agree to the terms and conditions set
- * forth in the LICENSE file which can be found at the top level of
- * the sendmail distribution.
- *
- *
- *	$Id: mfapi.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-/*
-**  MFAPI.H -- Global definitions for mail filter library and mail filters.
-*/
-
-#ifndef _LIBMILTER_MFAPI_H
-# define _LIBMILTER_MFAPI_H	1
-
-#ifndef SMFI_VERSION
-# if _FFR_MDS_NEGOTIATE
-#  define SMFI_VERSION	0x01000002	/* libmilter version number */
-
-   /* first libmilter version that has MDS support */
-#  define SMFI_VERSION_MDS	0x01000002
-# else /* _FFR_MDS_NEGOTIATE */
-#  define SMFI_VERSION	0x01000001	/* libmilter version number */
-# endif /* _FFR_MDS_NEGOTIATE */
-#endif /* ! SMFI_VERSION */
-
-#define SM_LM_VRS_MAJOR(v)	(((v) & 0x7f000000) >> 24)
-#define SM_LM_VRS_MINOR(v)	(((v) & 0x007fff00) >> 8)
-#define SM_LM_VRS_PLVL(v)	((v) & 0x0000007f)
-
-# include <sys/types.h>
-# include <sys/socket.h>
-
-#include "libmilter/mfdef.h"
-
-# define LIBMILTER_API		extern
-
-
-/* Only need to export C interface if used by C++ source code */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-#ifndef _SOCK_ADDR
-# define _SOCK_ADDR	struct sockaddr
-#endif /* ! _SOCK_ADDR */
-
-/*
-**  libmilter functions return one of the following to indicate
-**  success/failure(/continue):
-*/
-
-#define MI_SUCCESS	0
-#define MI_FAILURE	(-1)
-#if _FFR_WORKERS_POOL
-# define MI_CONTINUE	1
-#endif /* _FFR_WORKERS_POOL */
-
-/* "forward" declarations */
-typedef struct smfi_str SMFICTX;
-typedef struct smfi_str *SMFICTX_PTR;
-
-typedef struct smfiDesc smfiDesc_str;
-typedef struct smfiDesc	*smfiDesc_ptr;
-
-/*
-**  Type which callbacks should return to indicate message status.
-**  This may take on one of the SMFIS_* values listed below.
-*/
-
-typedef int	sfsistat;
-
-#if defined(__linux__) && defined(__GNUC__) && defined(__cplusplus) && __GNUC_MINOR__ >= 8
-# define SM__P(X)	__PMT(X)
-#else /* __linux__ && __GNUC__ && __cplusplus && _GNUC_MINOR__ >= 8 */
-# define SM__P(X)	__P(X)
-#endif /* __linux__ && __GNUC__ && __cplusplus && _GNUC_MINOR__ >= 8 */
-
-/* Some platforms don't define __P -- do it for them here: */
-#ifndef __P
-# ifdef __STDC__
-#  define __P(X) X
-# else /* __STDC__ */
-#  define __P(X) ()
-# endif /* __STDC__ */
-#endif /* __P */
-
-#if SM_CONF_STDBOOL_H
-# include <stdbool.h>
-#else /* SM_CONF_STDBOOL_H */
-# ifndef __cplusplus
-#  ifndef bool
-#   ifndef __bool_true_false_are_defined
-typedef int	bool;
-#    define false	0
-#    define true	1
-#    define __bool_true_false_are_defined	1
-#   endif /* ! __bool_true_false_are_defined */
-#  endif /* bool */
-# endif /* ! __cplusplus */
-#endif /* SM_CONF_STDBOOL_H */
-
-/*
-**  structure describing one milter
-*/
-
-struct smfiDesc
-{
-	char		*xxfi_name;	/* filter name */
-	int		xxfi_version;	/* version code -- do not change */
-	unsigned long	xxfi_flags;	/* flags */
-
-	/* connection info filter */
-	sfsistat	(*xxfi_connect) SM__P((SMFICTX *, char *, _SOCK_ADDR *));
-
-	/* SMTP HELO command filter */
-	sfsistat	(*xxfi_helo) SM__P((SMFICTX *, char *));
-
-	/* envelope sender filter */
-	sfsistat	(*xxfi_envfrom) SM__P((SMFICTX *, char **));
-
-	/* envelope recipient filter */
-	sfsistat	(*xxfi_envrcpt) SM__P((SMFICTX *, char **));
-
-	/* header filter */
-	sfsistat	(*xxfi_header) SM__P((SMFICTX *, char *, char *));
-
-	/* end of header */
-	sfsistat	(*xxfi_eoh) SM__P((SMFICTX *));
-
-	/* body block */
-	sfsistat	(*xxfi_body) SM__P((SMFICTX *, unsigned char *, size_t));
-
-	/* end of message */
-	sfsistat	(*xxfi_eom) SM__P((SMFICTX *));
-
-	/* message aborted */
-	sfsistat	(*xxfi_abort) SM__P((SMFICTX *));
-
-	/* connection cleanup */
-	sfsistat	(*xxfi_close) SM__P((SMFICTX *));
-
-	/* any unrecognized or unimplemented command filter */
-	sfsistat	(*xxfi_unknown) SM__P((SMFICTX *, const char *));
-
-	/* SMTP DATA command filter */
-	sfsistat	(*xxfi_data) SM__P((SMFICTX *));
-
-	/* negotiation callback */
-	sfsistat	(*xxfi_negotiate) SM__P((SMFICTX *,
-					unsigned long, unsigned long,
-					unsigned long, unsigned long,
-					unsigned long *, unsigned long *,
-					unsigned long *, unsigned long *));
-
-#if 0
-	/* signal handler callback, not yet implemented. */
-	int		(*xxfi_signal) SM__P((int));
-#endif
-
-};
-
-LIBMILTER_API int smfi_opensocket __P((bool));
-LIBMILTER_API int smfi_register __P((struct smfiDesc));
-LIBMILTER_API int smfi_main __P((void));
-LIBMILTER_API int smfi_setbacklog __P((int));
-LIBMILTER_API int smfi_setdbg __P((int));
-LIBMILTER_API int smfi_settimeout __P((int));
-LIBMILTER_API int smfi_setconn __P((char *));
-LIBMILTER_API int smfi_stop __P((void));
-LIBMILTER_API size_t smfi_setmaxdatasize __P((size_t));
-LIBMILTER_API int smfi_version __P((unsigned int *, unsigned int *, unsigned int *));
-
-/*
-**  What the filter might do -- values to be ORed together for
-**  smfiDesc.xxfi_flags.
-*/
-
-#define SMFIF_NONE	0x00000000L	/* no flags */
-#define SMFIF_ADDHDRS	0x00000001L	/* filter may add headers */
-#define SMFIF_CHGBODY	0x00000002L	/* filter may replace body */
-#define SMFIF_MODBODY	SMFIF_CHGBODY	/* backwards compatible */
-#define SMFIF_ADDRCPT	0x00000004L	/* filter may add recipients */
-#define SMFIF_DELRCPT	0x00000008L	/* filter may delete recipients */
-#define SMFIF_CHGHDRS	0x00000010L	/* filter may change/delete headers */
-#define SMFIF_QUARANTINE 0x00000020L	/* filter may quarantine envelope */
-
-/* filter may change "from" (envelope sender) */
-#define SMFIF_CHGFROM	0x00000040L
-#define SMFIF_ADDRCPT_PAR	0x00000080L	/* add recipients incl. args */
-
-/* filter can send set of symbols (macros) that it wants */
-#define SMFIF_SETSYMLIST	0x00000100L
-
-
-/*
-**  Macro "places";
-**  Notes:
-**  - must be coordinated with libmilter/engine.c and sendmail/milter.c
-**  - the order MUST NOT be changed as it would break compatibility between
-**	different versions. It's ok to append new entries however
-**	(hence the list is not sorted by the SMT protocol steps).
-*/
-
-#define SMFIM_NOMACROS	(-1)	/* Do NOT use, internal only */
-#define SMFIM_FIRST	0	/* Do NOT use, internal marker only */
-#define SMFIM_CONNECT	0	/* connect */
-#define SMFIM_HELO	1	/* HELO/EHLO */
-#define SMFIM_ENVFROM	2	/* MAIL From */
-#define SMFIM_ENVRCPT	3	/* RCPT To */
-#define SMFIM_DATA	4	/* DATA */
-#define SMFIM_EOM	5	/* end of message (final dot) */
-#define SMFIM_EOH	6	/* end of header */
-#define SMFIM_LAST	6	/* Do NOT use, internal marker only */
-
-/*
-**  Continue processing message/connection.
-*/
-
-#define SMFIS_CONTINUE	0
-
-/*
-**  Reject the message/connection.
-**  No further routines will be called for this message
-**  (or connection, if returned from a connection-oriented routine).
-*/
-
-#define SMFIS_REJECT	1
-
-/*
-**  Accept the message,
-**  but silently discard the message.
-**  No further routines will be called for this message.
-**  This is only meaningful from message-oriented routines.
-*/
-
-#define SMFIS_DISCARD	2
-
-/*
-**  Accept the message/connection.
-**  No further routines will be called for this message
-**  (or connection, if returned from a connection-oriented routine;
-**  in this case, it causes all messages on this connection
-**  to be accepted without filtering).
-*/
-
-#define SMFIS_ACCEPT	3
-
-/*
-**  Return a temporary failure, i.e.,
-**  the corresponding SMTP command will return a 4xx status code.
-**  In some cases this may prevent further routines from
-**  being called on this message or connection,
-**  although in other cases (e.g., when processing an envelope
-**  recipient) processing of the message will continue.
-*/
-
-#define SMFIS_TEMPFAIL	4
-
-/*
-**  Do not send a reply to the MTA
-*/
-
-#define SMFIS_NOREPLY	7
-
-/*
-**  Skip over rest of same callbacks, e.g., body.
-*/
-
-#define SMFIS_SKIP	8
-
-/* xxfi_negotiate: use all existing protocol options/actions */
-#define SMFIS_ALL_OPTS	10
-
-#if 0
-/*
-**  Filter Routine Details
-*/
-
-/* connection info filter */
-extern sfsistat	xxfi_connect __P((SMFICTX *, char *, _SOCK_ADDR *));
-
-/*
-**  xxfi_connect(ctx, hostname, hostaddr) Invoked on each connection
-**
-**	char *hostname; Host domain name, as determined by a reverse lookup
-**		on the host address.
-**	_SOCK_ADDR *hostaddr; Host address, as determined by a getpeername
-**		call on the SMTP socket.
-*/
-
-/* SMTP HELO command filter */
-extern sfsistat	xxfi_helo __P((SMFICTX *, char *));
-
-/*
-**  xxfi_helo(ctx, helohost) Invoked on SMTP HELO/EHLO command
-**
-**	char *helohost; Value passed to HELO/EHLO command, which should be
-**		the domain name of the sending host (but is, in practice,
-**		anything the sending host wants to send).
-*/
-
-/* envelope sender filter */
-extern sfsistat	xxfi_envfrom __P((SMFICTX *, char **));
-
-/*
-**  xxfi_envfrom(ctx, argv) Invoked on envelope from
-**
-**	char **argv; Null-terminated SMTP command arguments;
-**		argv[0] is guaranteed to be the sender address.
-**		Later arguments are the ESMTP arguments.
-*/
-
-/* envelope recipient filter */
-extern sfsistat	xxfi_envrcpt __P((SMFICTX *, char **));
-
-/*
-**  xxfi_envrcpt(ctx, argv) Invoked on each envelope recipient
-**
-**	char **argv; Null-terminated SMTP command arguments;
-**		argv[0] is guaranteed to be the recipient address.
-**		Later arguments are the ESMTP arguments.
-*/
-
-/* unknown command filter */
-
-extern sfsistat	*xxfi_unknown __P((SMFICTX *, const char *));
-
-/*
-**  xxfi_unknown(ctx, arg) Invoked when SMTP command is not recognized or not
-**  implemented.
-**	const char *arg; Null-terminated SMTP command
-*/
-
-/* header filter */
-extern sfsistat	xxfi_header __P((SMFICTX *, char *, char *));
-
-/*
-**  xxfi_header(ctx, headerf, headerv) Invoked on each message header. The
-**  content of the header may have folded white space (that is, multiple
-**  lines with following white space) included.
-**
-**	char *headerf; Header field name
-**	char *headerv; Header field value
-*/
-
-/* end of header */
-extern sfsistat	xxfi_eoh __P((SMFICTX *));
-
-/*
-**  xxfi_eoh(ctx) Invoked at end of header
-*/
-
-/* body block */
-extern sfsistat	xxfi_body __P((SMFICTX *, unsigned char *, size_t));
-
-/*
-**  xxfi_body(ctx, bodyp, bodylen) Invoked for each body chunk. There may
-**  be multiple body chunks passed to the filter. End-of-lines are
-**  represented as received from SMTP (normally Carriage-Return/Line-Feed).
-**
-**	unsigned char *bodyp; Pointer to body data
-**	size_t bodylen; Length of body data
-*/
-
-/* end of message */
-extern sfsistat	xxfi_eom __P((SMFICTX *));
-
-/*
-**  xxfi_eom(ctx) Invoked at end of message. This routine can perform
-**  special operations such as modifying the message header, body, or
-**  envelope.
-*/
-
-/* message aborted */
-extern sfsistat	xxfi_abort __P((SMFICTX *));
-
-/*
-**  xxfi_abort(ctx) Invoked if message is aborted outside of the control of
-**  the filter, for example, if the SMTP sender issues an RSET command. If
-**  xxfi_abort is called, xxfi_eom will not be called and vice versa.
-*/
-
-/* connection cleanup */
-extern sfsistat	xxfi_close __P((SMFICTX *));
-
-/*
-**  xxfi_close(ctx) Invoked at end of the connection. This is called on
-**  close even if the previous mail transaction was aborted.
-*/
-#endif /* 0 */
-
-/*
-**  Additional information is passed in to the vendor filter routines using
-**  symbols. Symbols correspond closely to sendmail macros. The symbols
-**  defined depend on the context. The value of a symbol is accessed using:
-*/
-
-/* Return the value of a symbol. */
-LIBMILTER_API char * smfi_getsymval __P((SMFICTX *, char *));
-
-/*
-**  Return the value of a symbol.
-**
-**	SMFICTX *ctx; Opaque context structure
-**	char *symname; The name of the symbol to access.
-*/
-
-/*
-**  Vendor filter routines that want to pass additional information back to
-**  the MTA for use in SMTP replies may call smfi_setreply before returning.
-*/
-
-LIBMILTER_API int smfi_setreply __P((SMFICTX *, char *, char *, char *));
-
-/*
-**  Alternatively, smfi_setmlreply can be called if a multi-line SMTP reply
-**  is needed.
-*/
-
-LIBMILTER_API int smfi_setmlreply __P((SMFICTX *, const char *, const char *, ...));
-
-/*
-**  Set the specific reply code to be used in response to the active
-**  command. If not specified, a generic reply code is used.
-**
-**	SMFICTX *ctx; Opaque context structure
-**	char *rcode; The three-digit (RFC 821) SMTP reply code to be
-**		returned, e.g., ``551''.
-**	char *xcode; The extended (RFC 2034) reply code, e.g., ``5.7.6''.
-**	char *message; The text part of the SMTP reply.
-*/
-
-/*
-**  The xxfi_eom routine is called at the end of a message (essentially,
-**  after the final DATA dot). This routine can call some special routines
-**  to modify the envelope, header, or body of the message before the
-**  message is enqueued. These routines must not be called from any vendor
-**  routine other than xxfi_eom.
-*/
-
-LIBMILTER_API int smfi_addheader __P((SMFICTX *, char *, char *));
-
-/*
-**  Add a header to the message. It is not checked for standards
-**  compliance; the mail filter must ensure that no protocols are violated
-**  as a result of adding this header.
-**
-**	SMFICTX *ctx; Opaque context structure
-**	char *headerf; Header field name
-**	char *headerv; Header field value
-*/
-
-LIBMILTER_API int smfi_chgheader __P((SMFICTX *, char *, int, char *));
-
-/*
-**  Change/delete a header in the message.  It is not checked for standards
-**  compliance; the mail filter must ensure that no protocols are violated
-**  as a result of adding this header.
-**
-**	SMFICTX *ctx; Opaque context structure
-**	char *headerf; Header field name
-**	int index; The Nth occurence of header field name
-**	char *headerv; New header field value (empty for delete header)
-*/
-
-LIBMILTER_API int smfi_insheader __P((SMFICTX *, int, char *, char *));
-
-/*
-**  Insert a header into the message.  It is not checked for standards
-**  compliance; the mail filter must ensure that no protocols are violated
-**  as a result of adding this header.
-**
-**	SMFICTX *ctx; Opaque context structure
-**  	int idx; index into the header list where the insertion should happen
-**	char *headerh; Header field name
-**	char *headerv; Header field value
-*/
-
-LIBMILTER_API int smfi_chgfrom __P((SMFICTX *, char *, char *));
-
-/*
-**  Modify envelope sender address
-**
-**	SMFICTX *ctx; Opaque context structure
-**	char *mail; New envelope sender address
-**	char *args; ESMTP arguments
-*/
-
-
-LIBMILTER_API int smfi_addrcpt __P((SMFICTX *, char *));
-
-/*
-**  Add a recipient to the envelope
-**
-**	SMFICTX *ctx; Opaque context structure
-**	char *rcpt; Recipient to be added
-*/
-
-LIBMILTER_API int smfi_addrcpt_par __P((SMFICTX *, char *, char *));
-
-/*
-**  Add a recipient to the envelope
-**
-**	SMFICTX *ctx; Opaque context structure
-**	char *rcpt; Recipient to be added
-**	char *args; ESMTP arguments
-*/
-
-
-LIBMILTER_API int smfi_delrcpt __P((SMFICTX *, char *));
-
-/*
-**  Send a "no-op" up to the MTA to tell it we're still alive, so long
-**  milter-side operations don't time out.
-**
-**	SMFICTX *ctx; Opaque context structure
-*/
-
-LIBMILTER_API int smfi_progress __P((SMFICTX *));
-
-/*
-**  Delete a recipient from the envelope
-**
-**	SMFICTX *ctx; Opaque context structure
-**	char *rcpt; Envelope recipient to be deleted. This should be in
-**		exactly the form passed to xxfi_envrcpt or the address may
-**		not be deleted.
-*/
-
-LIBMILTER_API int smfi_replacebody __P((SMFICTX *, unsigned char *, int));
-
-/*
-**  Replace the body of the message. This routine may be called multiple
-**  times if the body is longer than convenient to send in one call. End of
-**  line should be represented as Carriage-Return/Line Feed.
-**
-**	char *bodyp; Pointer to block of body information to insert
-**	int bodylen; Length of data pointed at by bodyp
-*/
-
-/*
-**  If the message is aborted (for example, if the SMTP sender sends the
-**  envelope but then does a QUIT or RSET before the data is sent),
-**  xxfi_abort is called. This can be used to reset state.
-*/
-
-/*
-**  Quarantine an envelope
-**
-**	SMFICTX *ctx; Opaque context structure
-**	char *reason: explanation
-*/
-
-LIBMILTER_API int smfi_quarantine __P((SMFICTX *ctx, char *reason));
-
-/*
-**  Connection-private data (specific to an SMTP connection) can be
-**  allocated using the smfi_setpriv routine; routines can access private
-**  data using smfi_getpriv.
-*/
-
-LIBMILTER_API int smfi_setpriv __P((SMFICTX *, void *));
-
-/*
-**  Set the private data pointer
-**
-**	SMFICTX *ctx; Opaque context structure
-**	void *privatedata; Pointer to private data area
-*/
-
-LIBMILTER_API void *smfi_getpriv __P((SMFICTX *));
-
-/*
-**  Get the private data pointer
-**
-**	SMFICTX *ctx; Opaque context structure
-**	void *privatedata; Pointer to private data area
-*/
-
-LIBMILTER_API int smfi_setsymlist __P((SMFICTX *, int, char *));
-
-/*
-**  Set list of symbols (macros) to receive
-**
-**	SMFICTX *ctx; Opaque context structure
-**	int where; where in the SMTP dialogue should the macros be sent
-**	char *macros; list of macros (space separated)
-*/
-
-#if _FFR_THREAD_MONITOR
-LIBMILTER_API int smfi_set_max_exec_time __P((unsigned int));
-#endif /* _FFR_THREAD_MONITOR */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _LIBMILTER_MFAPI_H */
diff --git a/include.new/libmilter/mfdef.h b/include.new/libmilter/mfdef.h
deleted file mode 100644
index 3331c93..0000000
--- a/include.new/libmilter/mfdef.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 1999-2007 Proofpoint, Inc. and its suppliers.
- *	All rights reserved.
- *
- * By using this file, you agree to the terms and conditions set
- * forth in the LICENSE file which can be found at the top level of
- * the sendmail distribution.
- *
- *
- *	$Id: mfdef.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-/*
-**  mfdef.h -- Global definitions for mail filter and MTA.
-*/
-
-#ifndef _LIBMILTER_MFDEF_H
-# define _LIBMILTER_MFDEF_H	1
-
-#ifndef SMFI_PROT_VERSION
-# define SMFI_PROT_VERSION	6	/* MTA - libmilter protocol version */
-#endif /* SMFI_PROT_VERSION */
-
-/* Shared protocol constants */
-#define MILTER_LEN_BYTES	4	/* length of 32 bit integer in bytes */
-#define MILTER_OPTLEN	(MILTER_LEN_BYTES * 3) /* length of options */
-#define MILTER_CHUNK_SIZE	65535	/* body chunk size */
-#define MILTER_MAX_DATA_SIZE	65535	/* default milter command data limit */
-
-#if _FFR_MDS_NEGOTIATE
-# define MILTER_MDS_64K	((64 * 1024) - 1)
-# define MILTER_MDS_256K ((256 * 1024) - 1)
-# define MILTER_MDS_1M	((1024 * 1024) - 1)
-#endif /* _FFR_MDS_NEGOTIATE */
-
-/* These apply to SMFIF_* flags */
-#define SMFI_V1_ACTS	0x0000000FL	/* The actions of V1 filter */
-#define SMFI_V2_ACTS	0x0000003FL	/* The actions of V2 filter */
-#define SMFI_CURR_ACTS	0x000001FFL	/* actions of current version */
-
-/* address families */
-#define SMFIA_UNKNOWN		'U'	/* unknown */
-#define SMFIA_UNIX		'L'	/* unix/local */
-#define SMFIA_INET		'4'	/* inet */
-#define SMFIA_INET6		'6'	/* inet6 */
-
-/* commands: don't use anything smaller than ' ' */
-#define SMFIC_ABORT		'A'	/* Abort */
-#define SMFIC_BODY		'B'	/* Body chunk */
-#define SMFIC_CONNECT		'C'	/* Connection information */
-#define SMFIC_MACRO		'D'	/* Define macro */
-#define SMFIC_BODYEOB		'E'	/* final body chunk (End) */
-#define SMFIC_HELO		'H'	/* HELO/EHLO */
-#define SMFIC_QUIT_NC		'K'	/* QUIT but new connection follows */
-#define SMFIC_HEADER		'L'	/* Header */
-#define SMFIC_MAIL		'M'	/* MAIL from */
-#define SMFIC_EOH		'N'	/* EOH */
-#define SMFIC_OPTNEG		'O'	/* Option negotiation */
-#define SMFIC_QUIT		'Q'	/* QUIT */
-#define SMFIC_RCPT		'R'	/* RCPT to */
-#define SMFIC_DATA		'T'	/* DATA */
-#define SMFIC_UNKNOWN		'U'	/* Any unknown command */
-
-/* actions (replies) */
-#define SMFIR_ADDRCPT		'+'	/* add recipient */
-#define SMFIR_DELRCPT		'-'	/* remove recipient */
-#define SMFIR_ADDRCPT_PAR	'2'	/* add recipient (incl. ESMTP args) */
-#define SMFIR_SHUTDOWN		'4'	/* 421: shutdown (internal to MTA) */
-#define SMFIR_ACCEPT		'a'	/* accept */
-#define SMFIR_REPLBODY		'b'	/* replace body (chunk) */
-#define SMFIR_CONTINUE		'c'	/* continue */
-#define SMFIR_DISCARD		'd'	/* discard */
-#define SMFIR_CHGFROM		'e'	/* change envelope sender (from) */
-#define SMFIR_CONN_FAIL		'f'	/* cause a connection failure */
-#define SMFIR_ADDHEADER		'h'	/* add header */
-#define SMFIR_INSHEADER		'i'	/* insert header */
-#define SMFIR_SETSYMLIST	'l'	/* set list of symbols (macros) */
-#define SMFIR_CHGHEADER		'm'	/* change header */
-#define SMFIR_PROGRESS		'p'	/* progress */
-#define SMFIR_QUARANTINE	'q'	/* quarantine */
-#define SMFIR_REJECT		'r'	/* reject */
-#define SMFIR_SKIP		's'	/* skip */
-#define SMFIR_TEMPFAIL		't'	/* tempfail */
-#define SMFIR_REPLYCODE		'y'	/* reply code etc */
-
-/* What the MTA can send/filter wants in protocol */
-#define SMFIP_NOCONNECT 0x00000001L	/* MTA should not send connect info */
-#define SMFIP_NOHELO	0x00000002L	/* MTA should not send HELO info */
-#define SMFIP_NOMAIL	0x00000004L	/* MTA should not send MAIL info */
-#define SMFIP_NORCPT	0x00000008L	/* MTA should not send RCPT info */
-#define SMFIP_NOBODY	0x00000010L	/* MTA should not send body */
-#define SMFIP_NOHDRS	0x00000020L	/* MTA should not send headers */
-#define SMFIP_NOEOH	0x00000040L	/* MTA should not send EOH */
-#define SMFIP_NR_HDR	0x00000080L	/* No reply for headers */
-#define SMFIP_NOHREPL	SMFIP_NR_HDR	/* No reply for headers */
-#define SMFIP_NOUNKNOWN 0x00000100L /* MTA should not send unknown commands */
-#define SMFIP_NODATA    0x00000200L	/* MTA should not send DATA */
-#define SMFIP_SKIP	0x00000400L	/* MTA understands SMFIS_SKIP */
-#define SMFIP_RCPT_REJ	0x00000800L /* MTA should also send rejected RCPTs */
-#define SMFIP_NR_CONN	0x00001000L	/* No reply for connect */
-#define SMFIP_NR_HELO	0x00002000L	/* No reply for HELO */
-#define SMFIP_NR_MAIL	0x00004000L	/* No reply for MAIL */
-#define SMFIP_NR_RCPT	0x00008000L	/* No reply for RCPT */
-#define SMFIP_NR_DATA	0x00010000L	/* No reply for DATA */
-#define SMFIP_NR_UNKN	0x00020000L	/* No reply for UNKN */
-#define SMFIP_NR_EOH	0x00040000L	/* No reply for eoh */
-#define SMFIP_NR_BODY	0x00080000L	/* No reply for body chunk */
-#define SMFIP_HDR_LEADSPC 0x00100000L	/* header value leading space */
-#define SMFIP_MDS_256K	0x10000000L	/* MILTER_MAX_DATA_SIZE=256K */
-#define SMFIP_MDS_1M	0x20000000L	/* MILTER_MAX_DATA_SIZE=1M */
-/* #define SMFIP_	0x40000000L	reserved: see SMFI_INTERNAL*/
-
-#define SMFI_V1_PROT	0x0000003FL	/* The protocol of V1 filter */
-#define SMFI_V2_PROT	0x0000007FL	/* The protocol of V2 filter */
-
-/* all defined protocol bits */
-#define SMFI_CURR_PROT	0x001FFFFFL
-
-/* internal flags: only used between MTA and libmilter */
-#define SMFI_INTERNAL	0x70000000L
-
-#if _FFR_MILTER_CHECK
-# define SMFIP_TEST	0x80000000L
-#endif /* _FFR_MILTER_CHECK */
-
-#endif /* !_LIBMILTER_MFDEF_H */
diff --git a/include.new/libproc.h b/include.new/libproc.h
deleted file mode 100644
index f9225e0..0000000
--- a/include.new/libproc.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * Copyright (c) 2010 The FreeBSD Foundation
- * Copyright (c) 2008 John Birrell (jb@freebsd.org)
- * All rights reserved.
- *
- * Portions of this software were developed by Rui Paulo under sponsorship
- * from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libproc/libproc.h 269754 2014-08-09 15:00:03Z markj $
- */
-
-#ifndef	_LIBPROC_H_
-#define	_LIBPROC_H_
-
-#include <gelf.h>
-#include <rtld_db.h>
-#include <limits.h>
-
-struct proc_handle;
-
-typedef void (*proc_child_func)(void *);
-
-/* Values returned by proc_state(). */
-#define PS_IDLE		1
-#define PS_STOP		2
-#define PS_RUN		3
-#define PS_UNDEAD	4
-#define PS_DEAD		5
-#define PS_LOST		6
-
-/* Reason values for proc_detach(). */
-#define PRELEASE_HANG	1
-#define PRELEASE_KILL	2
-
-typedef struct prmap {
-	uintptr_t	pr_vaddr;	/* Virtual address. */
-	size_t		pr_size;	/* Mapping size in bytes */
-	size_t		pr_offset;	/* Mapping offset in object */
-	char		pr_mapname[PATH_MAX];	/* Mapping filename */
-	uint8_t		pr_mflags;	/* Protection flags */
-#define	MA_READ		0x01
-#define	MA_WRITE	0x02
-#define	MA_EXEC		0x04
-#define	MA_COW		0x08
-#define MA_NEEDS_COPY	0x10
-#define	MA_NOCOREDUMP	0x20
-} prmap_t;
-
-typedef int proc_map_f(void *, const prmap_t *, const char *);
-typedef int proc_sym_f(void *, const GElf_Sym *, const char *);
-
-/* Values for ELF sections */
-#define	PR_SYMTAB	1
-#define PR_DYNSYM	2
-
-/* Values for the 'mask' parameter in the iteration functions */
-#define	BIND_LOCAL	0x0001
-#define BIND_GLOBAL	0x0002
-#define BIND_WEAK	0x0004
-#define BIND_ANY	(BIND_LOCAL|BIND_GLOBAL|BIND_WEAK)
-#define TYPE_NOTYPE	0x0100
-#define TYPE_OBJECT	0x0200
-#define TYPE_FUNC	0x0400
-#define TYPE_SECTION	0x0800
-#define TYPE_FILE	0x1000
-#define TYPE_ANY	(TYPE_NOTYPE|TYPE_OBJECT|TYPE_FUNC|TYPE_SECTION|\
-    			 TYPE_FILE)
-
-typedef enum {
-	REG_PC,
-	REG_SP,
-	REG_RVAL1,
-	REG_RVAL2
-} proc_reg_t;
-
-#define SIG2STR_MAX	8
-
-typedef struct lwpstatus {
-	int pr_why;
-#define PR_REQUESTED	1
-#define PR_FAULTED	2
-#define PR_SYSENTRY	3
-#define PR_SYSEXIT	4
-#define PR_SIGNALLED	5
-	int pr_what;
-#define FLTBPT		-1
-} lwpstatus_t;
-
-/* Function prototype definitions. */
-__BEGIN_DECLS
-
-prmap_t *proc_addr2map(struct proc_handle *, uintptr_t);
-prmap_t *proc_name2map(struct proc_handle *, const char *);
-char	*proc_objname(struct proc_handle *, uintptr_t, char *, size_t);
-prmap_t *proc_obj2map(struct proc_handle *, const char *);
-int	proc_iter_objs(struct proc_handle *, proc_map_f *, void *);
-int	proc_iter_symbyaddr(struct proc_handle *, const char *, int,
-	     int, proc_sym_f *, void *);
-int	proc_addr2sym(struct proc_handle *, uintptr_t, char *, size_t, GElf_Sym *);
-int	proc_attach(pid_t pid, int flags, struct proc_handle **pphdl);
-int	proc_continue(struct proc_handle *);
-int	proc_clearflags(struct proc_handle *, int);
-int	proc_create(const char *, char * const *, proc_child_func *, void *,
-	    struct proc_handle **);
-int	proc_detach(struct proc_handle *, int);
-int	proc_getflags(struct proc_handle *);
-int	proc_name2sym(struct proc_handle *, const char *, const char *, GElf_Sym *);
-int	proc_setflags(struct proc_handle *, int);
-int	proc_state(struct proc_handle *);
-pid_t	proc_getpid(struct proc_handle *);
-int	proc_wstatus(struct proc_handle *);
-int	proc_getwstat(struct proc_handle *);
-char *	proc_signame(int, char *, size_t);
-int	proc_read(struct proc_handle *, void *, size_t, size_t);
-const lwpstatus_t *
-	proc_getlwpstatus(struct proc_handle *);
-void	proc_free(struct proc_handle *);
-rd_agent_t *proc_rdagent(struct proc_handle *);
-void	proc_updatesyms(struct proc_handle *);
-int	proc_bkptset(struct proc_handle *, uintptr_t, unsigned long *);
-int	proc_bkptdel(struct proc_handle *, uintptr_t, unsigned long);
-void	proc_bkptregadj(unsigned long *);
-int	proc_bkptexec(struct proc_handle *, unsigned long);
-int	proc_regget(struct proc_handle *, proc_reg_t, unsigned long *);
-int	proc_regset(struct proc_handle *, proc_reg_t, unsigned long);
-
-__END_DECLS
-
-#endif /* !_LIBPROC_H_ */
diff --git a/include.new/libprocstat.h b/include.new/libprocstat.h
deleted file mode 100644
index 23575a7..0000000
--- a/include.new/libprocstat.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*-
- * Copyright (c) 2009 Stanislav Sedov <stas@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.
- *
- * 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.
- *
- * $FreeBSD: releng/10.2/lib/libprocstat/libprocstat.h 255219 2013-09-05 00:09:56Z pjd $
- */
-
-#ifndef _LIBPROCSTAT_H_
-#define	_LIBPROCSTAT_H_
-
-/*
- * XXX: sys/elf.h conflicts with zfs_context.h. Workaround this by not
- * including conflicting parts when building zfs code.
- */
-#ifndef ZFS
-#include <sys/elf.h>
-#endif
-#include <sys/caprights.h>
-
-/*
- * Vnode types.
- */
-#define	PS_FST_VTYPE_VNON	1
-#define	PS_FST_VTYPE_VREG	2
-#define	PS_FST_VTYPE_VDIR	3
-#define	PS_FST_VTYPE_VBLK	4
-#define	PS_FST_VTYPE_VCHR	5
-#define	PS_FST_VTYPE_VLNK	6
-#define	PS_FST_VTYPE_VSOCK	7
-#define	PS_FST_VTYPE_VFIFO	8
-#define	PS_FST_VTYPE_VBAD	9
-#define	PS_FST_VTYPE_UNKNOWN	255
-
-/*
- * Descriptor types.
- */
-#define	PS_FST_TYPE_VNODE	1
-#define	PS_FST_TYPE_FIFO	2
-#define	PS_FST_TYPE_SOCKET	3
-#define	PS_FST_TYPE_PIPE	4
-#define	PS_FST_TYPE_PTS		5
-#define	PS_FST_TYPE_KQUEUE	6
-#define	PS_FST_TYPE_CRYPTO	7
-#define	PS_FST_TYPE_MQUEUE	8
-#define	PS_FST_TYPE_SHM		9
-#define	PS_FST_TYPE_SEM		10
-#define	PS_FST_TYPE_UNKNOWN	11
-#define	PS_FST_TYPE_NONE	12
-
-/*
- * Special descriptor numbers.
- */
-#define	PS_FST_UFLAG_RDIR	0x0001
-#define	PS_FST_UFLAG_CDIR	0x0002
-#define	PS_FST_UFLAG_JAIL	0x0004
-#define	PS_FST_UFLAG_TRACE	0x0008
-#define	PS_FST_UFLAG_TEXT	0x0010
-#define	PS_FST_UFLAG_MMAP	0x0020
-#define	PS_FST_UFLAG_CTTY	0x0040
-
-/*
- * Descriptor flags.
- */
-#define PS_FST_FFLAG_READ	0x0001
-#define PS_FST_FFLAG_WRITE	0x0002
-#define	PS_FST_FFLAG_NONBLOCK	0x0004
-#define	PS_FST_FFLAG_APPEND	0x0008
-#define	PS_FST_FFLAG_SHLOCK	0x0010
-#define	PS_FST_FFLAG_EXLOCK	0x0020
-#define	PS_FST_FFLAG_ASYNC	0x0040
-#define	PS_FST_FFLAG_SYNC	0x0080
-#define	PS_FST_FFLAG_NOFOLLOW	0x0100
-#define	PS_FST_FFLAG_CREAT	0x0200
-#define	PS_FST_FFLAG_TRUNC	0x0400
-#define	PS_FST_FFLAG_EXCL	0x0800
-#define	PS_FST_FFLAG_DIRECT	0x1000
-#define	PS_FST_FFLAG_EXEC	0x2000
-#define	PS_FST_FFLAG_HASLOCK	0x4000
-
-struct kinfo_kstack;
-struct kinfo_vmentry;
-struct procstat;
-struct rlimit;
-struct filestat {
-	int	fs_type;	/* Descriptor type. */
-	int	fs_flags;	/* filestat specific flags. */
-	int	fs_fflags;	/* Descriptor access flags. */
-	int	fs_uflags;	/* How this file is used. */
-	int	fs_fd;		/* File descriptor number. */
-	int	fs_ref_count;	/* Reference count. */
-	off_t	fs_offset;	/* Seek location. */
-	void	*fs_typedep;	/* Type dependent data. */
-	char	*fs_path;
-	STAILQ_ENTRY(filestat)	next;
-	cap_rights_t	fs_cap_rights;	/* Capability rights, if flag set. */
-};
-struct vnstat {
-	uint64_t	vn_fileid;
-	uint64_t	vn_size;
-	char		*vn_mntdir;
-	uint32_t	vn_dev;
-	uint32_t	vn_fsid;
-	int		vn_type;
-	uint16_t	vn_mode;
-	char		vn_devname[SPECNAMELEN + 1];
-};
-struct ptsstat {
-	uint32_t	dev;
-	char		devname[SPECNAMELEN + 1];
-};
-struct pipestat {
-	size_t		buffer_cnt;
-	uint64_t	addr;
-	uint64_t	peer;
-};
-struct semstat {
-	uint32_t	value;
-	uint16_t	mode;
-};
-struct shmstat {
-	uint64_t	size;
-	uint16_t	mode;
-};
-struct sockstat {
-	uint64_t	inp_ppcb;
-	uint64_t	so_addr;
-	uint64_t	so_pcb;
-	uint64_t	unp_conn;
-	int		dom_family;
-	int		proto;
-	int		so_rcv_sb_state;
-	int		so_snd_sb_state;
-	struct sockaddr_storage	sa_local;	/* Socket address. */
-	struct sockaddr_storage	sa_peer;	/* Peer address. */
-	int		type;
-	char		dname[32];
-};
-
-STAILQ_HEAD(filestat_list, filestat);
-
-__BEGIN_DECLS
-void	procstat_close(struct procstat *procstat);
-void	procstat_freeargv(struct procstat *procstat);
-#ifndef ZFS
-void	procstat_freeauxv(struct procstat *procstat, Elf_Auxinfo *auxv);
-#endif
-void	procstat_freeenvv(struct procstat *procstat);
-void	procstat_freegroups(struct procstat *procstat, gid_t *groups);
-void	procstat_freekstack(struct procstat *procstat,
-    struct kinfo_kstack *kkstp);
-void	procstat_freeprocs(struct procstat *procstat, struct kinfo_proc *p);
-void	procstat_freefiles(struct procstat *procstat,
-    struct filestat_list *head);
-void	procstat_freevmmap(struct procstat *procstat,
-    struct kinfo_vmentry *vmmap);
-struct filestat_list	*procstat_getfiles(struct procstat *procstat,
-    struct kinfo_proc *kp, int mmapped);
-struct kinfo_proc	*procstat_getprocs(struct procstat *procstat,
-    int what, int arg, unsigned int *count);
-int	procstat_get_pipe_info(struct procstat *procstat, struct filestat *fst,
-    struct pipestat *pipe, char *errbuf);
-int	procstat_get_pts_info(struct procstat *procstat, struct filestat *fst,
-    struct ptsstat *pts, char *errbuf);
-int	procstat_get_sem_info(struct procstat *procstat, struct filestat *fst,
-    struct semstat *sem, char *errbuf);
-int	procstat_get_shm_info(struct procstat *procstat, struct filestat *fst,
-    struct shmstat *shm, char *errbuf);
-int	procstat_get_socket_info(struct procstat *procstat, struct filestat *fst,
-    struct sockstat *sock, char *errbuf);
-int	procstat_get_vnode_info(struct procstat *procstat, struct filestat *fst,
-    struct vnstat *vn, char *errbuf);
-char	**procstat_getargv(struct procstat *procstat, struct kinfo_proc *p,
-    size_t nchr);
-#ifndef ZFS
-Elf_Auxinfo	*procstat_getauxv(struct procstat *procstat,
-    struct kinfo_proc *kp, unsigned int *cntp);
-#endif
-char	**procstat_getenvv(struct procstat *procstat, struct kinfo_proc *p,
-    size_t nchr);
-gid_t	*procstat_getgroups(struct procstat *procstat, struct kinfo_proc *kp,
-    unsigned int *count);
-struct kinfo_kstack	*procstat_getkstack(struct procstat *procstat,
-    struct kinfo_proc *kp, unsigned int *count);
-int	procstat_getosrel(struct procstat *procstat, struct kinfo_proc *kp,
-    int *osrelp);
-int	procstat_getpathname(struct procstat *procstat, struct kinfo_proc *kp,
-    char *pathname, size_t maxlen);
-int	procstat_getrlimit(struct procstat *procstat, struct kinfo_proc *kp,
-    int which, struct rlimit* rlimit);
-int	procstat_getumask(struct procstat *procstat, struct kinfo_proc *kp,
-    unsigned short* umask);
-struct kinfo_vmentry	*procstat_getvmmap(struct procstat *procstat,
-    struct kinfo_proc *kp, unsigned int *count);
-struct procstat	*procstat_open_core(const char *filename);
-struct procstat	*procstat_open_sysctl(void);
-struct procstat	*procstat_open_kvm(const char *nlistf, const char *memf);
-__END_DECLS
-
-#endif	/* !_LIBPROCSTAT_H_ */
diff --git a/include.new/libufs.h b/include.new/libufs.h
deleted file mode 100644
index ce9ee35..0000000
--- a/include.new/libufs.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2002 Juli Mallett.  All rights reserved.
- *
- * This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
- * FreeBSD project.  Redistribution and use in source and binary forms, with
- * or without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistribution of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistribution 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/lib/libufs/libufs.h 218601 2011-02-12 12:46:00Z kib $
- */
-
-#ifndef	__LIBUFS_H__
-#define	__LIBUFS_H__
-
-/*
- * libufs structures.
- */
-
-/*
- * userland ufs disk.
- */
-struct uufsd {
-	const char *d_name;	/* disk name */
-	int d_ufs;		/* decimal UFS version */
-	int d_fd;		/* raw device file descriptor */
-	long d_bsize;		/* device bsize */
-	ufs2_daddr_t d_sblock;	/* superblock location */
-	struct csum *d_sbcsum;	/* Superblock summary info */
-	caddr_t d_inoblock;	/* inode block */
-	ino_t d_inomin;		/* low inode */
-	ino_t d_inomax;		/* high inode */
-	union {
-		struct fs d_fs;	/* filesystem information */
-		char d_sb[MAXBSIZE];
-				/* superblock as buffer */
-	} d_sbunion;
-	union {
-		struct cg d_cg;	/* cylinder group */
-		char d_buf[MAXBSIZE];
-				/* cylinder group storage */
-	} d_cgunion;
-	int d_ccg;		/* current cylinder group */
-	int d_lcg;		/* last cylinder group (in d_cg) */
-	const char *d_error;	/* human readable disk error */
-	int d_mine;		/* internal flags */
-#define	d_fs	d_sbunion.d_fs
-#define	d_sb	d_sbunion.d_sb
-#define	d_cg	d_cgunion.d_cg
-};
-
-/*
- * libufs macros (internal, non-exported).
- */
-#ifdef	_LIBUFS
-/*
- * Trace steps through libufs, to be used at entry and erroneous return.
- */
-static inline void
-ERROR(struct uufsd *u, const char *str)
-{
-
-#ifdef	_LIBUFS_DEBUGGING
-	if (str != NULL) {
-		fprintf(stderr, "libufs: %s", str);
-		if (errno != 0)
-			fprintf(stderr, ": %s", strerror(errno));
-		fprintf(stderr, "\n");
-	}
-#endif
-	if (u != NULL)
-		u->d_error = str;
-}
-#endif	/* _LIBUFS */
-
-__BEGIN_DECLS
-
-/*
- * libufs prototypes.
- */
-
-/*
- * block.c
- */
-ssize_t bread(struct uufsd *, ufs2_daddr_t, void *, size_t);
-ssize_t bwrite(struct uufsd *, ufs2_daddr_t, const void *, size_t);
-int berase(struct uufsd *, ufs2_daddr_t, ufs2_daddr_t);
-
-/*
- * cgroup.c
- */
-ufs2_daddr_t cgballoc(struct uufsd *);
-int cgbfree(struct uufsd *, ufs2_daddr_t, long);
-ino_t cgialloc(struct uufsd *);
-int cgread(struct uufsd *);
-int cgread1(struct uufsd *, int);
-int cgwrite(struct uufsd *);
-int cgwrite1(struct uufsd *, int);
-
-/*
- * inode.c
- */
-int getino(struct uufsd *, void **, ino_t, int *);
-int putino(struct uufsd *);
-
-/*
- * sblock.c
- */
-int sbread(struct uufsd *);
-int sbwrite(struct uufsd *, int);
-
-/*
- * type.c
- */
-int ufs_disk_close(struct uufsd *);
-int ufs_disk_fillout(struct uufsd *, const char *);
-int ufs_disk_fillout_blank(struct uufsd *, const char *);
-int ufs_disk_write(struct uufsd *);
-
-/*
- * ffs_subr.c
- */
-void	ffs_clrblock(struct fs *, u_char *, ufs1_daddr_t);
-void	ffs_clusteracct(struct fs *, struct cg *, ufs1_daddr_t, int);
-void	ffs_fragacct(struct fs *, int, int32_t [], int);
-int	ffs_isblock(struct fs *, u_char *, ufs1_daddr_t);
-int	ffs_isfreeblock(struct fs *, u_char *, ufs1_daddr_t);
-void	ffs_setblock(struct fs *, u_char *, ufs1_daddr_t);
-
-__END_DECLS
-
-#endif	/* __LIBUFS_H__ */
diff --git a/include.new/libusb.h b/include.new/libusb.h
deleted file mode 100644
index 2616f5f..0000000
--- a/include.new/libusb.h
+++ /dev/null
@@ -1,494 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libusb/libusb.h 277847 2015-01-28 19:49:53Z hselasky $ */
-/*-
- * Copyright (c) 2009 Sylvestre Gallon. 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.
- *
- * 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.
- */
-
-#ifndef __LIBUSB_H__
-#define	__LIBUSB_H__
-
-#ifndef LIBUSB_GLOBAL_INCLUDE_FILE
-#include <stdint.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#endif
-
-#define	LIBUSB_CALL
-
-#ifdef __cplusplus
-extern	"C" {
-#endif
-#if 0
-}					/* indent fix */
-
-#endif
-
-/* libusb enums */
-
-enum libusb_class_code {
-	LIBUSB_CLASS_PER_INTERFACE = 0,
-	LIBUSB_CLASS_AUDIO = 1,
-	LIBUSB_CLASS_COMM = 2,
-	LIBUSB_CLASS_HID = 3,
-	LIBUSB_CLASS_PTP = 6,
-	LIBUSB_CLASS_IMAGE = 6,
-	LIBUSB_CLASS_PRINTER = 7,
-	LIBUSB_CLASS_MASS_STORAGE = 8,
-	LIBUSB_CLASS_HUB = 9,
-	LIBUSB_CLASS_DATA = 10,
-	LIBUSB_CLASS_SMART_CARD = 11,
-	LIBUSB_CLASS_CONTENT_SECURITY = 13,
-	LIBUSB_CLASS_VIDEO = 14,
-	LIBUSB_CLASS_PERSONAL_HEALTHCARE = 15,
-	LIBUSB_CLASS_DIAGNOSTIC_DEVICE = 0xdc,
-	LIBUSB_CLASS_WIRELESS = 0xe0,
-	LIBUSB_CLASS_APPLICATION = 0xfe,
-	LIBUSB_CLASS_VENDOR_SPEC = 0xff,
-};
-
-enum libusb_descriptor_type {
-	LIBUSB_DT_DEVICE = 0x01,
-	LIBUSB_DT_CONFIG = 0x02,
-	LIBUSB_DT_STRING = 0x03,
-	LIBUSB_DT_INTERFACE = 0x04,
-	LIBUSB_DT_ENDPOINT = 0x05,
-	LIBUSB_DT_HID = 0x21,
-	LIBUSB_DT_REPORT = 0x22,
-	LIBUSB_DT_PHYSICAL = 0x23,
-	LIBUSB_DT_HUB = 0x29,
-	LIBUSB_DT_BOS = 0x0f,
-	LIBUSB_DT_DEVICE_CAPABILITY = 0x10,
-	LIBUSB_DT_SS_ENDPOINT_COMPANION = 0x30,
-};
-
-enum libusb_device_capability_type {
-	LIBUSB_WIRELESS_USB_DEVICE_CAPABILITY = 0x1,
-	LIBUSB_USB_2_0_EXTENSION_DEVICE_CAPABILITY = 0x2,
-	LIBUSB_SS_USB_DEVICE_CAPABILITY = 0x3,
-	LIBUSB_CONTAINER_ID_DEVICE_CAPABILITY = 0x4,
-};
-
-#define	LIBUSB_DT_DEVICE_SIZE		18
-#define	LIBUSB_DT_CONFIG_SIZE		9
-#define	LIBUSB_DT_INTERFACE_SIZE	9
-#define	LIBUSB_DT_ENDPOINT_SIZE		7
-#define	LIBUSB_DT_ENDPOINT_AUDIO_SIZE	9
-#define	LIBUSB_DT_HUB_NONVAR_SIZE	7
-#define	LIBUSB_DT_SS_ENDPOINT_COMPANION_SIZE	6
-#define	LIBUSB_DT_BOS_SIZE		5
-#define	LIBUSB_USB_2_0_EXTENSION_DEVICE_CAPABILITY_SIZE	7
-#define	LIBUSB_SS_USB_DEVICE_CAPABILITY_SIZE	10
-
-#define	LIBUSB_ENDPOINT_ADDRESS_MASK	0x0f
-#define	LIBUSB_ENDPOINT_DIR_MASK	0x80
-
-enum libusb_endpoint_direction {
-	LIBUSB_ENDPOINT_IN = 0x80,
-	LIBUSB_ENDPOINT_OUT = 0x00,
-};
-
-#define	LIBUSB_TRANSFER_TYPE_MASK	0x03
-
-enum libusb_transfer_type {
-	LIBUSB_TRANSFER_TYPE_CONTROL = 0,
-	LIBUSB_TRANSFER_TYPE_ISOCHRONOUS = 1,
-	LIBUSB_TRANSFER_TYPE_BULK = 2,
-	LIBUSB_TRANSFER_TYPE_INTERRUPT = 3,
-};
-
-enum libusb_standard_request {
-	LIBUSB_REQUEST_GET_STATUS = 0x00,
-	LIBUSB_REQUEST_CLEAR_FEATURE = 0x01,
-	LIBUSB_REQUEST_SET_FEATURE = 0x03,
-	LIBUSB_REQUEST_SET_ADDRESS = 0x05,
-	LIBUSB_REQUEST_GET_DESCRIPTOR = 0x06,
-	LIBUSB_REQUEST_SET_DESCRIPTOR = 0x07,
-	LIBUSB_REQUEST_GET_CONFIGURATION = 0x08,
-	LIBUSB_REQUEST_SET_CONFIGURATION = 0x09,
-	LIBUSB_REQUEST_GET_INTERFACE = 0x0A,
-	LIBUSB_REQUEST_SET_INTERFACE = 0x0B,
-	LIBUSB_REQUEST_SYNCH_FRAME = 0x0C,
-	LIBUSB_REQUEST_SET_SEL = 0x30,
-	LIBUSB_REQUEST_SET_ISOCH_DELAY = 0x31,
-};
-
-enum libusb_request_type {
-	LIBUSB_REQUEST_TYPE_STANDARD = (0x00 << 5),
-	LIBUSB_REQUEST_TYPE_CLASS = (0x01 << 5),
-	LIBUSB_REQUEST_TYPE_VENDOR = (0x02 << 5),
-	LIBUSB_REQUEST_TYPE_RESERVED = (0x03 << 5),
-};
-
-enum libusb_request_recipient {
-	LIBUSB_RECIPIENT_DEVICE = 0x00,
-	LIBUSB_RECIPIENT_INTERFACE = 0x01,
-	LIBUSB_RECIPIENT_ENDPOINT = 0x02,
-	LIBUSB_RECIPIENT_OTHER = 0x03,
-};
-
-#define	LIBUSB_ISO_SYNC_TYPE_MASK	0x0C
-
-enum libusb_iso_sync_type {
-	LIBUSB_ISO_SYNC_TYPE_NONE = 0,
-	LIBUSB_ISO_SYNC_TYPE_ASYNC = 1,
-	LIBUSB_ISO_SYNC_TYPE_ADAPTIVE = 2,
-	LIBUSB_ISO_SYNC_TYPE_SYNC = 3,
-};
-
-#define	LIBUSB_ISO_USAGE_TYPE_MASK 0x30
-
-enum libusb_iso_usage_type {
-	LIBUSB_ISO_USAGE_TYPE_DATA = 0,
-	LIBUSB_ISO_USAGE_TYPE_FEEDBACK = 1,
-	LIBUSB_ISO_USAGE_TYPE_IMPLICIT = 2,
-};
-
-enum libusb_error {
-	LIBUSB_SUCCESS = 0,
-	LIBUSB_ERROR_IO = -1,
-	LIBUSB_ERROR_INVALID_PARAM = -2,
-	LIBUSB_ERROR_ACCESS = -3,
-	LIBUSB_ERROR_NO_DEVICE = -4,
-	LIBUSB_ERROR_NOT_FOUND = -5,
-	LIBUSB_ERROR_BUSY = -6,
-	LIBUSB_ERROR_TIMEOUT = -7,
-	LIBUSB_ERROR_OVERFLOW = -8,
-	LIBUSB_ERROR_PIPE = -9,
-	LIBUSB_ERROR_INTERRUPTED = -10,
-	LIBUSB_ERROR_NO_MEM = -11,
-	LIBUSB_ERROR_NOT_SUPPORTED = -12,
-	LIBUSB_ERROR_OTHER = -99,
-};
-
-enum libusb_speed {
-	LIBUSB_SPEED_UNKNOWN = 0,
-	LIBUSB_SPEED_LOW = 1,
-	LIBUSB_SPEED_FULL = 2,
-	LIBUSB_SPEED_HIGH = 3,
-	LIBUSB_SPEED_SUPER = 4,
-};
-
-enum libusb_transfer_status {
-	LIBUSB_TRANSFER_COMPLETED,
-	LIBUSB_TRANSFER_ERROR,
-	LIBUSB_TRANSFER_TIMED_OUT,
-	LIBUSB_TRANSFER_CANCELLED,
-	LIBUSB_TRANSFER_STALL,
-	LIBUSB_TRANSFER_NO_DEVICE,
-	LIBUSB_TRANSFER_OVERFLOW,
-};
-
-enum libusb_transfer_flags {
-	LIBUSB_TRANSFER_SHORT_NOT_OK = 1 << 0,
-	LIBUSB_TRANSFER_FREE_BUFFER = 1 << 1,
-	LIBUSB_TRANSFER_FREE_TRANSFER = 1 << 2,
-};
-
-enum libusb_log_level {
-       LIBUSB_LOG_LEVEL_NONE = 0,
-       LIBUSB_LOG_LEVEL_ERROR,
-       LIBUSB_LOG_LEVEL_WARNING,
-       LIBUSB_LOG_LEVEL_INFO,
-       LIBUSB_LOG_LEVEL_DEBUG
-};
-
-/* XXX */
-/* libusb_set_debug should take parameters from libusb_log_level
- * above according to
- *   http://libusb.sourceforge.net/api-1.0/group__lib.html
- */
-enum libusb_debug_level {
-	LIBUSB_DEBUG_NO=0,
-	LIBUSB_DEBUG_FUNCTION=1,
-	LIBUSB_DEBUG_TRANSFER=2,
-};
-
-/* libusb structures */
-
-struct libusb_context;
-struct libusb_device;
-struct libusb_transfer;
-struct libusb_device_handle;
-
-struct libusb_pollfd {
-	int	fd;
-	short	events;
-};
-
-typedef struct libusb_context libusb_context;
-typedef struct libusb_device libusb_device;
-typedef struct libusb_device_handle libusb_device_handle;
-typedef struct libusb_pollfd libusb_pollfd;
-typedef void (*libusb_pollfd_added_cb) (int fd, short events, void *user_data);
-typedef void (*libusb_pollfd_removed_cb) (int fd, void *user_data);
-
-typedef struct libusb_device_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint16_t bcdUSB;
-	uint8_t	bDeviceClass;
-	uint8_t	bDeviceSubClass;
-	uint8_t	bDeviceProtocol;
-	uint8_t	bMaxPacketSize0;
-	uint16_t idVendor;
-	uint16_t idProduct;
-	uint16_t bcdDevice;
-	uint8_t	iManufacturer;
-	uint8_t	iProduct;
-	uint8_t	iSerialNumber;
-	uint8_t	bNumConfigurations;
-}	libusb_device_descriptor;
-
-typedef struct libusb_endpoint_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint8_t	bEndpointAddress;
-	uint8_t	bmAttributes;
-	uint16_t wMaxPacketSize;
-	uint8_t	bInterval;
-	uint8_t	bRefresh;
-	uint8_t	bSynchAddress;
-	uint8_t *extra;
-	int	extra_length;
-}	libusb_endpoint_descriptor __aligned(sizeof(void *));
-
-typedef struct libusb_ss_endpoint_companion_descriptor {
-	uint8_t bLength;
-	uint8_t bDescriptorType;
-	uint8_t bMaxBurst;
-	uint8_t bmAttributes;
-	uint16_t wBytesPerInterval;
-}	libusb_ss_endpoint_companion_descriptor __aligned(sizeof(void *));
-
-typedef struct libusb_interface_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint8_t	bInterfaceNumber;
-	uint8_t	bAlternateSetting;
-	uint8_t	bNumEndpoints;
-	uint8_t	bInterfaceClass;
-	uint8_t	bInterfaceSubClass;
-	uint8_t	bInterfaceProtocol;
-	uint8_t	iInterface;
-	struct libusb_endpoint_descriptor *endpoint;
-	uint8_t *extra;
-	int	extra_length;
-}	libusb_interface_descriptor __aligned(sizeof(void *));
-
-typedef struct libusb_interface {
-	struct libusb_interface_descriptor *altsetting;
-	int	num_altsetting;
-}	libusb_interface __aligned(sizeof(void *));
-
-typedef struct libusb_config_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint16_t wTotalLength;
-	uint8_t	bNumInterfaces;
-	uint8_t	bConfigurationValue;
-	uint8_t	iConfiguration;
-	uint8_t	bmAttributes;
-	uint8_t	MaxPower;
-	struct libusb_interface *interface;
-	uint8_t *extra;
-	int	extra_length;
-}	libusb_config_descriptor __aligned(sizeof(void *));
-
-typedef struct libusb_usb_2_0_device_capability_descriptor {
-	uint8_t bLength;
-	uint8_t bDescriptorType;
-	uint8_t bDevCapabilityType;
-	uint32_t bmAttributes;
-#define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT  (1 << 1)
-}	libusb_usb_2_0_device_capability_descriptor __aligned(sizeof(void *));
-
-typedef struct libusb_ss_usb_device_capability_descriptor {
-	uint8_t bLength;
-	uint8_t bDescriptorType;
-	uint8_t bDevCapabilityType;
-	uint8_t bmAttributes;
-#define LIBUSB_SS_USB_CAPABILITY_LPM_SUPPORT   (1 << 1)
-	uint16_t wSpeedSupported;
-#define LIBUSB_CAPABILITY_LOW_SPEED_OPERATION  (1)
-#define LIBUSB_CAPABILITY_FULL_SPEED_OPERATION (1 << 1)
-#define LIBUSB_CAPABILITY_HIGH_SPEED_OPERATION (1 << 2)
-#define LIBUSB_CAPABILITY_5GBPS_OPERATION      (1 << 3)
-	uint8_t bFunctionalitySupport;
-	uint8_t bU1DevExitLat;
-	uint16_t wU2DevExitLat;
-}	libusb_ss_usb_device_capability_descriptor __aligned(sizeof(void *));
-
-typedef struct libusb_bos_descriptor {
-	uint8_t bLength;
-	uint8_t bDescriptorType;
-	uint16_t wTotalLength;
-	uint8_t bNumDeviceCapabilities;
-	struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
-	struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
-}	libusb_bos_descriptor __aligned(sizeof(void *));
-
-typedef struct libusb_control_setup {
-	uint8_t	bmRequestType;
-	uint8_t	bRequest;
-	uint16_t wValue;
-	uint16_t wIndex;
-	uint16_t wLength;
-}	libusb_control_setup;
-
-#define	LIBUSB_CONTROL_SETUP_SIZE	8	/* bytes */
-
-typedef struct libusb_iso_packet_descriptor {
-	uint32_t length;
-	uint32_t actual_length;
-	enum libusb_transfer_status status;
-}	libusb_iso_packet_descriptor __aligned(sizeof(void *));
-
-typedef void (*libusb_transfer_cb_fn) (struct libusb_transfer *transfer);
-
-typedef struct libusb_transfer {
-	libusb_device_handle *dev_handle;
-	uint8_t	flags;
-	uint8_t endpoint;
-	uint8_t type;
-	uint32_t timeout;
-	enum libusb_transfer_status status;
-	int	length;
-	int	actual_length;
-	libusb_transfer_cb_fn callback;
-	void   *user_data;
-	uint8_t *buffer;
-	int	num_iso_packets;
-	struct libusb_iso_packet_descriptor iso_packet_desc[0];
-}	libusb_transfer __aligned(sizeof(void *));
-
-/* Library initialisation */
-
-void	libusb_set_debug(libusb_context * ctx, int level);
-const char *libusb_strerror(int code);
-const char *libusb_error_name(int code);
-int	libusb_init(libusb_context ** context);
-void	libusb_exit(struct libusb_context *ctx);
-
-/* Device handling and enumeration */
-
-ssize_t libusb_get_device_list(libusb_context * ctx, libusb_device *** list);
-void	libusb_free_device_list(libusb_device ** list, int unref_devices);
-uint8_t	libusb_get_bus_number(libusb_device * dev);
-int	libusb_get_port_numbers(libusb_device *dev, uint8_t *buf, uint8_t bufsize);
-int	libusb_get_port_path(libusb_context *ctx, libusb_device *dev, uint8_t *buf, uint8_t bufsize);
-uint8_t	libusb_get_device_address(libusb_device * dev);
-enum libusb_speed libusb_get_device_speed(libusb_device * dev);
-int	libusb_clear_halt(libusb_device_handle *devh, uint8_t endpoint);
-int	libusb_get_max_packet_size(libusb_device * dev, uint8_t endpoint);
-int	libusb_get_max_iso_packet_size(libusb_device * dev, uint8_t endpoint);
-libusb_device *libusb_ref_device(libusb_device * dev);
-void	libusb_unref_device(libusb_device * dev);
-int	libusb_open(libusb_device * dev, libusb_device_handle ** devh);
-libusb_device_handle *libusb_open_device_with_vid_pid(libusb_context * ctx, uint16_t vendor_id, uint16_t product_id);
-void	libusb_close(libusb_device_handle * devh);
-libusb_device *libusb_get_device(libusb_device_handle * devh);
-int	libusb_get_configuration(libusb_device_handle * devh, int *config);
-int	libusb_set_configuration(libusb_device_handle * devh, int configuration);
-int	libusb_claim_interface(libusb_device_handle * devh, int interface_number);
-int	libusb_release_interface(libusb_device_handle * devh, int interface_number);
-int	libusb_reset_device(libusb_device_handle * devh);
-int	libusb_check_connected(libusb_device_handle * devh);
-int 	libusb_kernel_driver_active(libusb_device_handle * devh, int interface);
-int	libusb_get_driver_np(libusb_device_handle * devh, int interface, char *name, int namelen);
-int	libusb_get_driver(libusb_device_handle * devh, int interface, char *name, int namelen);
-int 	libusb_detach_kernel_driver_np(libusb_device_handle * devh, int interface);
-int 	libusb_detach_kernel_driver(libusb_device_handle * devh, int interface);
-int 	libusb_attach_kernel_driver(libusb_device_handle * devh, int interface);
-int	libusb_set_interface_alt_setting(libusb_device_handle * devh, int interface_number, int alternate_setting);
-
-/* USB Descriptors */
-
-int	libusb_get_device_descriptor(libusb_device * dev, struct libusb_device_descriptor *desc);
-int	libusb_get_active_config_descriptor(libusb_device * dev, struct libusb_config_descriptor **config);
-int	libusb_get_config_descriptor(libusb_device * dev, uint8_t config_index, struct libusb_config_descriptor **config);
-int	libusb_get_config_descriptor_by_value(libusb_device * dev, uint8_t bConfigurationValue, struct libusb_config_descriptor **config);
-void	libusb_free_config_descriptor(struct libusb_config_descriptor *config);
-int	libusb_get_string_descriptor(libusb_device_handle * devh, uint8_t desc_index, uint16_t langid, unsigned char *data, int length);
-int	libusb_get_string_descriptor_ascii(libusb_device_handle * devh, uint8_t desc_index, uint8_t *data, int length);
-int	libusb_get_descriptor(libusb_device_handle * devh, uint8_t desc_type, uint8_t desc_index, uint8_t *data, int length);
-int	libusb_parse_ss_endpoint_comp(const void *buf, int len, struct libusb_ss_endpoint_companion_descriptor **ep_comp);
-void	libusb_free_ss_endpoint_comp(struct libusb_ss_endpoint_companion_descriptor *ep_comp);
-int	libusb_parse_bos_descriptor(const void *buf, int len, struct libusb_bos_descriptor **bos);
-void	libusb_free_bos_descriptor(struct libusb_bos_descriptor *bos);
-
-/* Asynchronous device I/O */
-
-struct libusb_transfer *libusb_alloc_transfer(int iso_packets);
-void	libusb_free_transfer(struct libusb_transfer *transfer);
-int	libusb_submit_transfer(struct libusb_transfer *transfer);
-int	libusb_cancel_transfer(struct libusb_transfer *transfer);
-uint8_t *libusb_get_iso_packet_buffer(struct libusb_transfer *transfer, uint32_t index);
-uint8_t *libusb_get_iso_packet_buffer_simple(struct libusb_transfer *transfer, uint32_t index);
-void	libusb_set_iso_packet_lengths(struct libusb_transfer *transfer, uint32_t length);
-uint8_t *libusb_control_transfer_get_data(struct libusb_transfer *transfer);
-struct libusb_control_setup *libusb_control_transfer_get_setup(struct libusb_transfer *transfer);
-void	libusb_fill_control_setup(uint8_t *buf, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint16_t wLength);
-void	libusb_fill_control_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t *buf, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
-void	libusb_fill_bulk_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
-void	libusb_fill_interrupt_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
-void	libusb_fill_iso_transfer(struct libusb_transfer *transfer, libusb_device_handle *devh, uint8_t endpoint, uint8_t *buf, int length, int npacket, libusb_transfer_cb_fn callback, void *user_data, uint32_t timeout);
-
-/* Polling and timing */
-
-int	libusb_try_lock_events(libusb_context * ctx);
-void	libusb_lock_events(libusb_context * ctx);
-void	libusb_unlock_events(libusb_context * ctx);
-int	libusb_event_handling_ok(libusb_context * ctx);
-int	libusb_event_handler_active(libusb_context * ctx);
-void	libusb_lock_event_waiters(libusb_context * ctx);
-void	libusb_unlock_event_waiters(libusb_context * ctx);
-int	libusb_wait_for_event(libusb_context * ctx, struct timeval *tv);
-int	libusb_handle_events_timeout_completed(libusb_context * ctx, struct timeval *tv, int *completed);
-int	libusb_handle_events_completed(libusb_context * ctx, int *completed);
-int	libusb_handle_events_timeout(libusb_context * ctx, struct timeval *tv);
-int	libusb_handle_events(libusb_context * ctx);
-int	libusb_handle_events_locked(libusb_context * ctx, struct timeval *tv);
-int	libusb_get_next_timeout(libusb_context * ctx, struct timeval *tv);
-void	libusb_set_pollfd_notifiers(libusb_context * ctx, libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb, void *user_data);
-const struct libusb_pollfd **libusb_get_pollfds(libusb_context * ctx);
-
-/* Synchronous device I/O */
-
-int	libusb_control_transfer(libusb_device_handle * devh, uint8_t bmRequestType, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, uint8_t *data, uint16_t wLength, uint32_t timeout);
-int	libusb_bulk_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout);
-int	libusb_interrupt_transfer(libusb_device_handle * devh, uint8_t endpoint, uint8_t *data, int length, int *transferred, uint32_t timeout);
-
-/* Byte-order */
-
-uint16_t libusb_cpu_to_le16(uint16_t x);
-uint16_t libusb_le16_to_cpu(uint16_t x);
-
-#if 0
-{					/* indent fix */
-#endif
-#ifdef __cplusplus
-}
-
-#endif
-
-#endif					/* __LIBUSB_H__ */
diff --git a/include.new/libusb20.h b/include.new/libusb20.h
deleted file mode 100644
index 0076877..0000000
--- a/include.new/libusb20.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libusb/libusb20.h 250201 2013-05-03 07:44:58Z hselasky $ */
-/*-
- * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
- * Copyright (c) 2007-2008 Daniel Drake.  All rights reserved.
- * Copyright (c) 2001 Johannes Erdfelt.  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.
- *
- * 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.
- */
-
-#ifndef _LIBUSB20_H_
-#define	_LIBUSB20_H_
-
-#ifndef LIBUSB_GLOBAL_INCLUDE_FILE
-#include <stdint.h>
-#endif
-
-#ifdef __cplusplus
-extern	"C" {
-#endif
-#if 0
-};					/* style */
-
-#endif
-
-/** \ingroup misc
- * Error codes. Most libusb20 functions return 0 on success or one of
- * these codes on failure.
- */
-enum libusb20_error {
-	/** Success (no error) */
-	LIBUSB20_SUCCESS = 0,
-
-	/** Input/output error */
-	LIBUSB20_ERROR_IO = -1,
-
-	/** Invalid parameter */
-	LIBUSB20_ERROR_INVALID_PARAM = -2,
-
-	/** Access denied (insufficient permissions) */
-	LIBUSB20_ERROR_ACCESS = -3,
-
-	/** No such device (it may have been disconnected) */
-	LIBUSB20_ERROR_NO_DEVICE = -4,
-
-	/** Entity not found */
-	LIBUSB20_ERROR_NOT_FOUND = -5,
-
-	/** Resource busy */
-	LIBUSB20_ERROR_BUSY = -6,
-
-	/** Operation timed out */
-	LIBUSB20_ERROR_TIMEOUT = -7,
-
-	/** Overflow */
-	LIBUSB20_ERROR_OVERFLOW = -8,
-
-	/** Pipe error */
-	LIBUSB20_ERROR_PIPE = -9,
-
-	/** System call interrupted (perhaps due to signal) */
-	LIBUSB20_ERROR_INTERRUPTED = -10,
-
-	/** Insufficient memory */
-	LIBUSB20_ERROR_NO_MEM = -11,
-
-	/** Operation not supported or unimplemented on this platform */
-	LIBUSB20_ERROR_NOT_SUPPORTED = -12,
-
-	/** Other error */
-	LIBUSB20_ERROR_OTHER = -99,
-};
-
-/** \ingroup asyncio
- * libusb20_tr_get_status() values */
-enum libusb20_transfer_status {
-	/** Transfer completed without error. Note that this does not
-	 * indicate that the entire amount of requested data was
-	 * transferred. */
-	LIBUSB20_TRANSFER_COMPLETED,
-
-	/** Callback code to start transfer */
-	LIBUSB20_TRANSFER_START,
-
-	/** Drain complete callback code */
-	LIBUSB20_TRANSFER_DRAINED,
-
-	/** Transfer failed */
-	LIBUSB20_TRANSFER_ERROR,
-
-	/** Transfer timed out */
-	LIBUSB20_TRANSFER_TIMED_OUT,
-
-	/** Transfer was cancelled */
-	LIBUSB20_TRANSFER_CANCELLED,
-
-	/** For bulk/interrupt endpoints: halt condition detected
-	 * (endpoint stalled). For control endpoints: control request
-	 * not supported. */
-	LIBUSB20_TRANSFER_STALL,
-
-	/** Device was disconnected */
-	LIBUSB20_TRANSFER_NO_DEVICE,
-
-	/** Device sent more data than requested */
-	LIBUSB20_TRANSFER_OVERFLOW,
-};
-
-/** \ingroup asyncio
- * libusb20_tr_set_flags() values */
-enum libusb20_transfer_flags {
-	/** Report a short frame as error */
-	LIBUSB20_TRANSFER_SINGLE_SHORT_NOT_OK = 0x0001,
-
-	/** Multiple short frames are not allowed */
-	LIBUSB20_TRANSFER_MULTI_SHORT_NOT_OK = 0x0002,
-
-	/** All transmitted frames are short terminated */
-	LIBUSB20_TRANSFER_FORCE_SHORT = 0x0004,
-
-	/** Will do a clear-stall before xfer */
-	LIBUSB20_TRANSFER_DO_CLEAR_STALL = 0x0008,
-};
-
-/** \ingroup misc
- * libusb20_dev_get_mode() values
- */
-enum libusb20_device_mode {
-	LIBUSB20_MODE_HOST,		/* default */
-	LIBUSB20_MODE_DEVICE,
-};
-
-/** \ingroup misc
- * libusb20_dev_get_speed() values
- */
-enum {
-	LIBUSB20_SPEED_UNKNOWN,		/* default */
-	LIBUSB20_SPEED_LOW,
-	LIBUSB20_SPEED_FULL,
-	LIBUSB20_SPEED_HIGH,
-	LIBUSB20_SPEED_VARIABLE,
-	LIBUSB20_SPEED_SUPER,
-};
-
-/** \ingroup misc
- * libusb20_dev_set_power() values
- */
-enum {
-	LIBUSB20_POWER_OFF,
-	LIBUSB20_POWER_ON,
-	LIBUSB20_POWER_SAVE,
-	LIBUSB20_POWER_SUSPEND,
-	LIBUSB20_POWER_RESUME,
-};
-
-struct usb_device_info;
-struct libusb20_transfer;
-struct libusb20_backend;
-struct libusb20_backend_methods;
-struct libusb20_device;
-struct libusb20_device_methods;
-struct libusb20_config;
-struct LIBUSB20_CONTROL_SETUP_DECODED;
-struct LIBUSB20_DEVICE_DESC_DECODED;
-
-typedef void (libusb20_tr_callback_t)(struct libusb20_transfer *xfer);
-
-struct libusb20_quirk {
-	uint16_t vid;			/* vendor ID */
-	uint16_t pid;			/* product ID */
-	uint16_t bcdDeviceLow;		/* low revision value, inclusive */
-	uint16_t bcdDeviceHigh;		/* high revision value, inclusive */
-	uint16_t reserved[2];		/* for the future */
-	/* quirk name, UQ_XXX, including terminating zero */
-	char	quirkname[64 - 12];
-};
-
-#define	LIBUSB20_MAX_FRAME_PRE_SCALE	(1U << 31)
-
-/* USB transfer operations */
-int	libusb20_tr_close(struct libusb20_transfer *xfer);
-int	libusb20_tr_open(struct libusb20_transfer *xfer, uint32_t max_buf_size, uint32_t max_frame_count, uint8_t ep_no);
-int	libusb20_tr_open_stream(struct libusb20_transfer *xfer, uint32_t max_buf_size, uint32_t max_frame_count, uint8_t ep_no, uint16_t stream_id);
-struct libusb20_transfer *libusb20_tr_get_pointer(struct libusb20_device *pdev, uint16_t tr_index);
-uint16_t libusb20_tr_get_time_complete(struct libusb20_transfer *xfer);
-uint32_t libusb20_tr_get_actual_frames(struct libusb20_transfer *xfer);
-uint32_t libusb20_tr_get_actual_length(struct libusb20_transfer *xfer);
-uint32_t libusb20_tr_get_max_frames(struct libusb20_transfer *xfer);
-uint32_t libusb20_tr_get_max_packet_length(struct libusb20_transfer *xfer);
-uint32_t libusb20_tr_get_max_total_length(struct libusb20_transfer *xfer);
-uint8_t	libusb20_tr_get_status(struct libusb20_transfer *xfer);
-uint8_t	libusb20_tr_pending(struct libusb20_transfer *xfer);
-void	libusb20_tr_callback_wrapper(struct libusb20_transfer *xfer);
-void	libusb20_tr_clear_stall_sync(struct libusb20_transfer *xfer);
-void	libusb20_tr_drain(struct libusb20_transfer *xfer);
-void	libusb20_tr_set_buffer(struct libusb20_transfer *xfer, void *buffer, uint16_t fr_index);
-void	libusb20_tr_set_callback(struct libusb20_transfer *xfer, libusb20_tr_callback_t *cb);
-void	libusb20_tr_set_flags(struct libusb20_transfer *xfer, uint8_t flags);
-uint32_t libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t fr_index);
-void	libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t fr_index);
-void	libusb20_tr_set_priv_sc0(struct libusb20_transfer *xfer, void *sc0);
-void	libusb20_tr_set_priv_sc1(struct libusb20_transfer *xfer, void *sc1);
-void	libusb20_tr_set_timeout(struct libusb20_transfer *xfer, uint32_t timeout);
-void	libusb20_tr_set_total_frames(struct libusb20_transfer *xfer, uint32_t nFrames);
-void	libusb20_tr_setup_bulk(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint32_t timeout);
-void	libusb20_tr_setup_control(struct libusb20_transfer *xfer, void *psetup, void *pbuf, uint32_t timeout);
-void	libusb20_tr_setup_intr(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint32_t timeout);
-void	libusb20_tr_setup_isoc(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint16_t fr_index);
-uint8_t	libusb20_tr_bulk_intr_sync(struct libusb20_transfer *xfer, void *pbuf, uint32_t length, uint32_t *pactlen, uint32_t timeout);
-void	libusb20_tr_start(struct libusb20_transfer *xfer);
-void	libusb20_tr_stop(struct libusb20_transfer *xfer);
-void	libusb20_tr_submit(struct libusb20_transfer *xfer);
-void   *libusb20_tr_get_priv_sc0(struct libusb20_transfer *xfer);
-void   *libusb20_tr_get_priv_sc1(struct libusb20_transfer *xfer);
-
-
-/* USB device operations */
-
-const char *libusb20_dev_get_backend_name(struct libusb20_device *pdev);
-const char *libusb20_dev_get_desc(struct libusb20_device *pdev);
-int	libusb20_dev_close(struct libusb20_device *pdev);
-int	libusb20_dev_detach_kernel_driver(struct libusb20_device *pdev, uint8_t iface_index);
-int	libusb20_dev_set_config_index(struct libusb20_device *pdev, uint8_t configIndex);
-int	libusb20_dev_get_debug(struct libusb20_device *pdev);
-int	libusb20_dev_get_fd(struct libusb20_device *pdev);
-int	libusb20_dev_kernel_driver_active(struct libusb20_device *pdev, uint8_t iface_index);
-int	libusb20_dev_open(struct libusb20_device *pdev, uint16_t transfer_max);
-int	libusb20_dev_process(struct libusb20_device *pdev);
-int	libusb20_dev_request_sync(struct libusb20_device *pdev, struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags);
-int	libusb20_dev_req_string_sync(struct libusb20_device *pdev, uint8_t index, uint16_t langid, void *ptr, uint16_t len);
-int	libusb20_dev_req_string_simple_sync(struct libusb20_device *pdev, uint8_t index, void *ptr, uint16_t len);
-int	libusb20_dev_reset(struct libusb20_device *pdev);
-int	libusb20_dev_check_connected(struct libusb20_device *pdev);
-int	libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode);
-uint8_t	libusb20_dev_get_power_mode(struct libusb20_device *pdev);
-int	libusb20_dev_get_port_path(struct libusb20_device *pdev, uint8_t *buf, uint8_t bufsize);
-uint16_t	libusb20_dev_get_power_usage(struct libusb20_device *pdev);
-int	libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index);
-int	libusb20_dev_get_info(struct libusb20_device *pdev, struct usb_device_info *pinfo);
-int	libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len);
-
-struct LIBUSB20_DEVICE_DESC_DECODED *libusb20_dev_get_device_desc(struct libusb20_device *pdev);
-struct libusb20_config *libusb20_dev_alloc_config(struct libusb20_device *pdev, uint8_t config_index);
-struct libusb20_device *libusb20_dev_alloc(void);
-uint8_t	libusb20_dev_get_address(struct libusb20_device *pdev);
-uint8_t	libusb20_dev_get_parent_address(struct libusb20_device *pdev);
-uint8_t	libusb20_dev_get_parent_port(struct libusb20_device *pdev);
-uint8_t	libusb20_dev_get_bus_number(struct libusb20_device *pdev);
-uint8_t	libusb20_dev_get_mode(struct libusb20_device *pdev);
-uint8_t	libusb20_dev_get_speed(struct libusb20_device *pdev);
-uint8_t	libusb20_dev_get_config_index(struct libusb20_device *pdev);
-void	libusb20_dev_free(struct libusb20_device *pdev);
-void	libusb20_dev_set_debug(struct libusb20_device *pdev, int debug);
-void	libusb20_dev_wait_process(struct libusb20_device *pdev, int timeout);
-
-/* USB global operations */
-
-int	libusb20_be_get_dev_quirk(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq);
-int	libusb20_be_get_quirk_name(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq);
-int	libusb20_be_add_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
-int	libusb20_be_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq);
-int	libusb20_be_get_template(struct libusb20_backend *pbe, int *ptemp);
-int	libusb20_be_set_template(struct libusb20_backend *pbe, int temp);
-
-/* USB backend operations */
-
-struct libusb20_backend *libusb20_be_alloc(const struct libusb20_backend_methods *methods);
-struct libusb20_backend *libusb20_be_alloc_default(void);
-struct libusb20_backend *libusb20_be_alloc_freebsd(void);
-struct libusb20_backend *libusb20_be_alloc_linux(void);
-struct libusb20_backend *libusb20_be_alloc_ugen20(void);
-struct libusb20_device *libusb20_be_device_foreach(struct libusb20_backend *pbe, struct libusb20_device *pdev);
-void	libusb20_be_dequeue_device(struct libusb20_backend *pbe, struct libusb20_device *pdev);
-void	libusb20_be_enqueue_device(struct libusb20_backend *pbe, struct libusb20_device *pdev);
-void	libusb20_be_free(struct libusb20_backend *pbe);
-
-/* USB debugging */
-
-const char *libusb20_strerror(int);
-const char *libusb20_error_name(int);
-
-#if 0
-{					/* style */
-#endif
-#ifdef __cplusplus
-}
-
-#endif
-
-#endif					/* _LIBUSB20_H_ */
diff --git a/include.new/libusb20_desc.h b/include.new/libusb20_desc.h
deleted file mode 100644
index 1667bdf..0000000
--- a/include.new/libusb20_desc.h
+++ /dev/null
@@ -1,603 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libusb/libusb20_desc.h 277847 2015-01-28 19:49:53Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
- * Copyright (c) 2007-2008 Daniel Drake.  All rights reserved.
- * Copyright (c) 2001 Johannes Erdfelt.  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.
- *
- * 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.
- */
-
-/*
- * NOTE: This file contains the definition of some standard USB
- * structures. All structures which name ends by *DECODED use host byte
- * order.
- */
-
-/*
- * NOTE: This file uses a lot of macros. If you want to see what the
- * macros become when they are expanded then run the following
- * commands from your shell:
- *
- * cpp libusb20_desc.h > temp.h
- * indent temp.h
- * less temp.h
- */
-
-#ifndef _LIBUSB20_DESC_H_
-#define	_LIBUSB20_DESC_H_
-
-#ifndef LIBUSB_GLOBAL_INCLUDE_FILE
-#include <stdint.h>
-#endif
-
-#ifdef __cplusplus
-extern	"C" {
-#endif
-#if 0
-};					/* style */
-
-#endif
-/* basic macros */
-
-#define	LIBUSB20__NOT(...) __VA_ARGS__
-#define	LIBUSB20_NOT(arg) LIBUSB20__NOT(LIBUSB20_YES arg(() LIBUSB20_NO))
-#define	LIBUSB20_YES(...) __VA_ARGS__
-#define	LIBUSB20_NO(...)
-#define	LIBUSB20_END(...) __VA_ARGS__
-#define	LIBUSB20_MAX(a,b) (((a) > (b)) ? (a) : (b))
-#define	LIBUSB20_MIN(a,b) (((a) < (b)) ? (a) : (b))
-
-#define	LIBUSB20_ADD_BYTES(ptr,off) \
-  ((void *)(((const uint8_t *)(ptr)) + (off) - ((const uint8_t *)0)))
-
-/* basic message elements */
-enum {
-	LIBUSB20_ME_INT8,
-	LIBUSB20_ME_INT16,
-	LIBUSB20_ME_INT32,
-	LIBUSB20_ME_INT64,
-	LIBUSB20_ME_STRUCT,
-	LIBUSB20_ME_MAX,		/* used to indicate end */
-};
-
-/* basic message element modifiers */
-enum {
-	LIBUSB20_ME_IS_UNSIGNED = 0x00,
-	LIBUSB20_ME_IS_SIGNED = 0x80,
-	LIBUSB20_ME_MASK = 0x7F,
-};
-
-enum {
-	LIBUSB20_ME_IS_RAW,		/* structure excludes length field
-					 * (hardcoded value) */
-	LIBUSB20_ME_IS_ENCODED,		/* structure includes length field */
-	LIBUSB20_ME_IS_EMPTY,		/* no structure */
-	LIBUSB20_ME_IS_DECODED,		/* structure is recursive */
-};
-
-/* basic helper structures and macros */
-
-#define	LIBUSB20_ME_STRUCT_ALIGN sizeof(void *)
-
-struct libusb20_me_struct {
-	void   *ptr;			/* data pointer */
-	uint16_t len;			/* defaults to zero */
-	uint16_t type;			/* defaults to LIBUSB20_ME_IS_EMPTY */
-} __aligned(LIBUSB20_ME_STRUCT_ALIGN);
-
-struct libusb20_me_format {
-	const uint8_t *format;		/* always set */
-	const char *desc;		/* optionally set */
-	const char *fields;		/* optionally set */
-};
-
-#define	LIBUSB20_ME_STRUCT(n, field, arg, ismeta)		\
-  ismeta ( LIBUSB20_ME_STRUCT, 1, 0, )			\
-  LIBUSB20_NOT(ismeta) ( struct libusb20_me_struct field; )
-
-#define	LIBUSB20_ME_STRUCT_ARRAY(n, field, arg, ismeta)	\
-  ismeta ( LIBUSB20_ME_STRUCT , (arg) & 0xFF,		\
-	   ((arg) / 0x100) & 0xFF, )			\
-  LIBUSB20_NOT(ismeta) ( struct libusb20_me_struct field [arg]; )
-
-#define	LIBUSB20_ME_INTEGER(n, field, ismeta, un, u, bits, a, size)	\
-  ismeta ( LIBUSB20_ME_INT##bits |					\
-	   LIBUSB20_ME_IS_##un##SIGNED ,				\
-	   (size) & 0xFF, ((size) / 0x100) & 0xFF, )		\
-  LIBUSB20_NOT(ismeta) ( u##int##bits##_t				\
-		    __aligned((bits) / 8) field a; )
-
-#define	LIBUSB20_ME_UINT8_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, , 1)
-
-#define	LIBUSB20_ME_UINT8_ARRAY_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 8, [arg], arg)
-
-#define	LIBUSB20_ME_SINT8_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta,,, 8, , 1)
-
-#define	LIBUSB20_ME_SINT8_ARRAY_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta,,, 8, [arg], arg)
-
-#define	LIBUSB20_ME_UINT16_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 16, , 1)
-
-#define	LIBUSB20_ME_UINT16_ARRAY_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 16, [arg], arg)
-
-#define	LIBUSB20_ME_SINT16_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta,,, 16, , 1)
-
-#define	LIBUSB20_ME_SINT16_ARRAY_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta,,, 16, [arg], arg)
-
-#define	LIBUSB20_ME_UINT32_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 32, , 1)
-
-#define	LIBUSB20_ME_UINT32_ARRAY_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 32, [arg], arg)
-
-#define	LIBUSB20_ME_SINT32_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta,,, 32, , 1)
-
-#define	LIBUSB20_ME_SINT32_ARRAY_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta,,, 32, [arg], arg)
-
-#define	LIBUSB20_ME_UINT64_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 64, , 1)
-
-#define	LIBUSB20_ME_UINT64_ARRAY_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta, UN, u, 64, [arg], arg)
-
-#define	LIBUSB20_ME_SINT64_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta,,, 64, , 1)
-
-#define	LIBUSB20_ME_SINT64_ARRAY_T(n, field, arg, ismeta) \
-  LIBUSB20_ME_INTEGER(n, field, ismeta,,, 64, [arg], arg)
-
-#define	LIBUSB20_MAKE_DECODED_FIELD(n, type, field, arg) \
-  LIBUSB20_ME_##type (n, field, arg, LIBUSB20_NO)
-
-#define	LIBUSB20_MAKE_STRUCT(name)			\
-  extern const struct libusb20_me_format			\
-	 name##_FORMAT[1];				\
-  struct name##_DECODED {				\
-    const struct libusb20_me_format *name##_FORMAT;	\
-    name (LIBUSB20_MAKE_DECODED_FIELD,)			\
-  }
-
-#define	LIBUSB20_MAKE_STRUCT_FORMAT(name)		\
-  const struct libusb20_me_format			\
-    name##_FORMAT[1] = {{			\
-      .format = LIBUSB20_MAKE_FORMAT(name),	\
-      .desc = #name,				\
-      .fields = NULL,				\
-  }}
-
-#define	LIBUSB20_MAKE_FORMAT_SUB(n, type, field, arg) \
-  LIBUSB20_ME_##type (n, field, arg, LIBUSB20_YES)
-
-#define	LIBUSB20_MAKE_FORMAT(what) (const uint8_t []) \
-  { what (LIBUSB20_MAKE_FORMAT_SUB, ) LIBUSB20_ME_MAX, 0, 0 }
-
-#define	LIBUSB20_INIT(what, ptr) do {		\
-    memset(ptr, 0, sizeof(*(ptr)));		\
-    (ptr)->what##_FORMAT = what##_FORMAT;	\
-} while (0)
-
-#define	LIBUSB20_DEVICE_DESC(m,n) \
-  m(n, UINT8_T, bLength, ) \
-  m(n, UINT8_T, bDescriptorType, ) \
-  m(n, UINT16_T, bcdUSB, ) \
-  m(n, UINT8_T, bDeviceClass, ) \
-  m(n, UINT8_T, bDeviceSubClass, ) \
-  m(n, UINT8_T, bDeviceProtocol, ) \
-  m(n, UINT8_T, bMaxPacketSize0, ) \
-  m(n, UINT16_T, idVendor, ) \
-  m(n, UINT16_T, idProduct, ) \
-  m(n, UINT16_T, bcdDevice, ) \
-  m(n, UINT8_T, iManufacturer, ) \
-  m(n, UINT8_T, iProduct, ) \
-  m(n, UINT8_T, iSerialNumber, ) \
-  m(n, UINT8_T, bNumConfigurations, ) \
-
-LIBUSB20_MAKE_STRUCT(LIBUSB20_DEVICE_DESC);
-
-#define	LIBUSB20_ENDPOINT_DESC(m,n) \
-  m(n, UINT8_T,  bLength, ) \
-  m(n, UINT8_T,  bDescriptorType, ) \
-  m(n, UINT8_T,  bEndpointAddress, ) \
-  m(n, UINT8_T,  bmAttributes, ) \
-  m(n, UINT16_T, wMaxPacketSize, ) \
-  m(n, UINT8_T,  bInterval, ) \
-  m(n, UINT8_T,  bRefresh, ) \
-  m(n, UINT8_T,  bSynchAddress, ) \
-
-LIBUSB20_MAKE_STRUCT(LIBUSB20_ENDPOINT_DESC);
-
-#define	LIBUSB20_INTERFACE_DESC(m,n) \
-  m(n, UINT8_T,  bLength, ) \
-  m(n, UINT8_T,  bDescriptorType, ) \
-  m(n, UINT8_T,  bInterfaceNumber, ) \
-  m(n, UINT8_T,  bAlternateSetting, ) \
-  m(n, UINT8_T,  bNumEndpoints, ) \
-  m(n, UINT8_T,  bInterfaceClass, ) \
-  m(n, UINT8_T,  bInterfaceSubClass, ) \
-  m(n, UINT8_T,  bInterfaceProtocol, ) \
-  m(n, UINT8_T,  iInterface, ) \
-
-LIBUSB20_MAKE_STRUCT(LIBUSB20_INTERFACE_DESC);
-
-#define	LIBUSB20_CONFIG_DESC(m,n) \
-  m(n, UINT8_T,  bLength, ) \
-  m(n, UINT8_T,  bDescriptorType, ) \
-  m(n, UINT16_T, wTotalLength, ) \
-  m(n, UINT8_T,  bNumInterfaces, ) \
-  m(n, UINT8_T,  bConfigurationValue, ) \
-  m(n, UINT8_T,  iConfiguration, ) \
-  m(n, UINT8_T,  bmAttributes, ) \
-  m(n, UINT8_T,  bMaxPower, ) \
-
-LIBUSB20_MAKE_STRUCT(LIBUSB20_CONFIG_DESC);
-
-#define	LIBUSB20_CONTROL_SETUP(m,n) \
-  m(n, UINT8_T,  bmRequestType, ) \
-  m(n, UINT8_T,  bRequest, ) \
-  m(n, UINT16_T, wValue, ) \
-  m(n, UINT16_T, wIndex, ) \
-  m(n, UINT16_T, wLength, ) \
-
-LIBUSB20_MAKE_STRUCT(LIBUSB20_CONTROL_SETUP);
-
-#define	LIBUSB20_SS_ENDPT_COMP_DESC(m,n) \
-  m(n, UINT8_T,  bLength, ) \
-  m(n, UINT8_T,  bDescriptorType, ) \
-  m(n, UINT8_T,  bMaxBurst, ) \
-  m(n, UINT8_T,  bmAttributes, ) \
-  m(n, UINT16_T, wBytesPerInterval, ) \
-
-LIBUSB20_MAKE_STRUCT(LIBUSB20_SS_ENDPT_COMP_DESC);
-
-#define	LIBUSB20_USB_20_DEVCAP_DESC(m,n) \
-  m(n, UINT8_T,  bLength, ) \
-  m(n, UINT8_T,  bDescriptorType, ) \
-  m(n, UINT8_T,  bDevCapabilityType, ) \
-  m(n, UINT32_T, bmAttributes, ) \
-
-LIBUSB20_MAKE_STRUCT(LIBUSB20_USB_20_DEVCAP_DESC);
-
-#define	LIBUSB20_SS_USB_DEVCAP_DESC(m,n) \
-  m(n, UINT8_T,  bLength, ) \
-  m(n, UINT8_T,  bDescriptorType, ) \
-  m(n, UINT8_T,  bDevCapabilityType, ) \
-  m(n, UINT8_T,  bmAttributes, ) \
-  m(n, UINT16_T, wSpeedSupported, ) \
-  m(n, UINT8_T,  bFunctionalitySupport, ) \
-  m(n, UINT8_T,  bU1DevExitLat, ) \
-  m(n, UINT16_T, wU2DevExitLat, ) \
-
-LIBUSB20_MAKE_STRUCT(LIBUSB20_SS_USB_DEVCAP_DESC);
-
-#define	LIBUSB20_BOS_DESCRIPTOR(m,n) \
-  m(n, UINT8_T,  bLength, ) \
-  m(n, UINT8_T,  bDescriptorType, ) \
-  m(n, UINT16_T, wTotalLength, ) \
-  m(n, UINT8_T,  bNumDeviceCapabilities, ) \
-
-LIBUSB20_MAKE_STRUCT(LIBUSB20_BOS_DESCRIPTOR);
-
-/* standard USB stuff */
-
-/** \ingroup desc
- * Device and/or Interface Class codes */
-enum libusb20_class_code {
-	/** In the context of a \ref LIBUSB20_DEVICE_DESC "device
-	 * descriptor", this bDeviceClass value indicates that each
-	 * interface specifies its own class information and all
-	 * interfaces operate independently.
-	 */
-	LIBUSB20_CLASS_PER_INTERFACE = 0,
-
-	/** Audio class */
-	LIBUSB20_CLASS_AUDIO = 1,
-
-	/** Communications class */
-	LIBUSB20_CLASS_COMM = 2,
-
-	/** Human Interface Device class */
-	LIBUSB20_CLASS_HID = 3,
-
-	/** Printer dclass */
-	LIBUSB20_CLASS_PRINTER = 7,
-
-	/** Picture transfer protocol class */
-	LIBUSB20_CLASS_PTP = 6,
-
-	/** Mass storage class */
-	LIBUSB20_CLASS_MASS_STORAGE = 8,
-
-	/** Hub class */
-	LIBUSB20_CLASS_HUB = 9,
-
-	/** Data class */
-	LIBUSB20_CLASS_DATA = 10,
-
-	/** Class is vendor-specific */
-	LIBUSB20_CLASS_VENDOR_SPEC = 0xff,
-};
-
-/** \ingroup desc
- * Descriptor types as defined by the USB specification. */
-enum libusb20_descriptor_type {
-	/** Device descriptor. See LIBUSB20_DEVICE_DESC. */
-	LIBUSB20_DT_DEVICE = 0x01,
-
-	/** Configuration descriptor. See LIBUSB20_CONFIG_DESC. */
-	LIBUSB20_DT_CONFIG = 0x02,
-
-	/** String descriptor */
-	LIBUSB20_DT_STRING = 0x03,
-
-	/** Interface descriptor. See LIBUSB20_INTERFACE_DESC. */
-	LIBUSB20_DT_INTERFACE = 0x04,
-
-	/** Endpoint descriptor. See LIBUSB20_ENDPOINT_DESC. */
-	LIBUSB20_DT_ENDPOINT = 0x05,
-
-	/** HID descriptor */
-	LIBUSB20_DT_HID = 0x21,
-
-	/** HID report descriptor */
-	LIBUSB20_DT_REPORT = 0x22,
-
-	/** Physical descriptor */
-	LIBUSB20_DT_PHYSICAL = 0x23,
-
-	/** Hub descriptor */
-	LIBUSB20_DT_HUB = 0x29,
-
-	/** Binary Object Store, BOS */
-	LIBUSB20_DT_BOS = 0x0f,
-
-	/** Device Capability */
-	LIBUSB20_DT_DEVICE_CAPABILITY = 0x10,
-
-	/** SuperSpeed endpoint companion */
-	LIBUSB20_DT_SS_ENDPOINT_COMPANION = 0x30,
-};
-
-/** \ingroup desc
- * Device capability types as defined by the USB specification. */
-enum libusb20_device_capability_type {
-	LIBUSB20_WIRELESS_USB_DEVICE_CAPABILITY = 0x1,
-	LIBUSB20_USB_2_0_EXTENSION_DEVICE_CAPABILITY = 0x2,
-	LIBUSB20_SS_USB_DEVICE_CAPABILITY = 0x3,
-	LIBUSB20_CONTAINER_ID_DEVICE_CAPABILITY = 0x4,
-};
-
-/* Descriptor sizes per descriptor type */
-#define	LIBUSB20_DT_DEVICE_SIZE			18
-#define	LIBUSB20_DT_CONFIG_SIZE			9
-#define	LIBUSB20_DT_INTERFACE_SIZE		9
-#define	LIBUSB20_DT_ENDPOINT_SIZE		7
-#define	LIBUSB20_DT_ENDPOINT_AUDIO_SIZE		9	/* Audio extension */
-#define	LIBUSB20_DT_HUB_NONVAR_SIZE		7
-#define	LIBUSB20_DT_SS_ENDPOINT_COMPANION_SIZE	6
-#define	LIBUSB20_DT_BOS_SIZE		5
-#define	LIBUSB20_USB_2_0_EXTENSION_DEVICE_CAPABILITY_SIZE	7
-#define	LIBUSB20_SS_USB_DEVICE_CAPABILITY_SIZE	10
-
-#define	LIBUSB20_ENDPOINT_ADDRESS_MASK	0x0f	/* in bEndpointAddress */
-#define	LIBUSB20_ENDPOINT_DIR_MASK	0x80
-
-/** \ingroup desc
- * Endpoint direction. Values for bit 7 of the
- * \ref LIBUSB20_ENDPOINT_DESC::bEndpointAddress "endpoint address" scheme.
- */
-enum libusb20_endpoint_direction {
-	/** In: device-to-host */
-	LIBUSB20_ENDPOINT_IN = 0x80,
-
-	/** Out: host-to-device */
-	LIBUSB20_ENDPOINT_OUT = 0x00,
-};
-
-#define	LIBUSB20_TRANSFER_TYPE_MASK	0x03	/* in bmAttributes */
-
-/** \ingroup desc
- * Endpoint transfer type. Values for bits 0:1 of the
- * \ref LIBUSB20_ENDPOINT_DESC::bmAttributes "endpoint attributes" field.
- */
-enum libusb20_transfer_type {
-	/** Control endpoint */
-	LIBUSB20_TRANSFER_TYPE_CONTROL = 0,
-
-	/** Isochronous endpoint */
-	LIBUSB20_TRANSFER_TYPE_ISOCHRONOUS = 1,
-
-	/** Bulk endpoint */
-	LIBUSB20_TRANSFER_TYPE_BULK = 2,
-
-	/** Interrupt endpoint */
-	LIBUSB20_TRANSFER_TYPE_INTERRUPT = 3,
-};
-
-/** \ingroup misc
- * Standard requests, as defined in table 9-3 of the USB2 specifications */
-enum libusb20_standard_request {
-	/** Request status of the specific recipient */
-	LIBUSB20_REQUEST_GET_STATUS = 0x00,
-
-	/** Clear or disable a specific feature */
-	LIBUSB20_REQUEST_CLEAR_FEATURE = 0x01,
-
-	/* 0x02 is reserved */
-
-	/** Set or enable a specific feature */
-	LIBUSB20_REQUEST_SET_FEATURE = 0x03,
-
-	/* 0x04 is reserved */
-
-	/** Set device address for all future accesses */
-	LIBUSB20_REQUEST_SET_ADDRESS = 0x05,
-
-	/** Get the specified descriptor */
-	LIBUSB20_REQUEST_GET_DESCRIPTOR = 0x06,
-
-	/** Used to update existing descriptors or add new descriptors */
-	LIBUSB20_REQUEST_SET_DESCRIPTOR = 0x07,
-
-	/** Get the current device configuration value */
-	LIBUSB20_REQUEST_GET_CONFIGURATION = 0x08,
-
-	/** Set device configuration */
-	LIBUSB20_REQUEST_SET_CONFIGURATION = 0x09,
-
-	/** Return the selected alternate setting for the specified
-	 * interface */
-	LIBUSB20_REQUEST_GET_INTERFACE = 0x0A,
-
-	/** Select an alternate interface for the specified interface */
-	LIBUSB20_REQUEST_SET_INTERFACE = 0x0B,
-
-	/** Set then report an endpoint's synchronization frame */
-	LIBUSB20_REQUEST_SYNCH_FRAME = 0x0C,
-
-	/** Set U1 and U2 system exit latency */
-	LIBUSB20_REQUEST_SET_SEL = 0x30,
-
-	/** Set isochronous delay */
-	LIBUSB20_REQUEST_SET_ISOCH_DELAY = 0x31,
-};
-
-/** \ingroup misc
- * Request type bits of the
- * \ref libusb20_control_setup::bmRequestType "bmRequestType" field in
- * control transfers. */
-enum libusb20_request_type {
-	/** Standard */
-	LIBUSB20_REQUEST_TYPE_STANDARD = (0x00 << 5),
-
-	/** Class */
-	LIBUSB20_REQUEST_TYPE_CLASS = (0x01 << 5),
-
-	/** Vendor */
-	LIBUSB20_REQUEST_TYPE_VENDOR = (0x02 << 5),
-
-	/** Reserved */
-	LIBUSB20_REQUEST_TYPE_RESERVED = (0x03 << 5),
-};
-
-/** \ingroup misc
- * Recipient bits of the
- * \ref libusb20_control_setup::bmRequestType "bmRequestType" field in
- * control transfers. Values 4 through 31 are reserved. */
-enum libusb20_request_recipient {
-	/** Device */
-	LIBUSB20_RECIPIENT_DEVICE = 0x00,
-
-	/** Interface */
-	LIBUSB20_RECIPIENT_INTERFACE = 0x01,
-
-	/** Endpoint */
-	LIBUSB20_RECIPIENT_ENDPOINT = 0x02,
-
-	/** Other */
-	LIBUSB20_RECIPIENT_OTHER = 0x03,
-};
-
-#define	LIBUSB20_ISO_SYNC_TYPE_MASK		0x0C
-
-/** \ingroup desc
- * Synchronization type for isochronous endpoints. Values for bits 2:3
- * of the \ref LIBUSB20_ENDPOINT_DESC::bmAttributes "bmAttributes"
- * field in LIBUSB20_ENDPOINT_DESC.
- */
-enum libusb20_iso_sync_type {
-	/** No synchronization */
-	LIBUSB20_ISO_SYNC_TYPE_NONE = 0,
-
-	/** Asynchronous */
-	LIBUSB20_ISO_SYNC_TYPE_ASYNC = 1,
-
-	/** Adaptive */
-	LIBUSB20_ISO_SYNC_TYPE_ADAPTIVE = 2,
-
-	/** Synchronous */
-	LIBUSB20_ISO_SYNC_TYPE_SYNC = 3,
-};
-
-#define	LIBUSB20_ISO_USAGE_TYPE_MASK 0x30
-
-/** \ingroup desc
- * Usage type for isochronous endpoints. Values for bits 4:5 of the
- * \ref LIBUSB20_ENDPOINT_DESC::bmAttributes "bmAttributes" field in
- * LIBUSB20_ENDPOINT_DESC.
- */
-enum libusb20_iso_usage_type {
-	/** Data endpoint */
-	LIBUSB20_ISO_USAGE_TYPE_DATA = 0,
-
-	/** Feedback endpoint */
-	LIBUSB20_ISO_USAGE_TYPE_FEEDBACK = 1,
-
-	/** Implicit feedback Data endpoint */
-	LIBUSB20_ISO_USAGE_TYPE_IMPLICIT = 2,
-};
-
-struct libusb20_endpoint {
-	struct LIBUSB20_ENDPOINT_DESC_DECODED desc;
-	struct libusb20_me_struct extra;
-} __aligned(sizeof(void *));
-
-struct libusb20_interface {
-	struct LIBUSB20_INTERFACE_DESC_DECODED desc;
-	struct libusb20_me_struct extra;
-	struct libusb20_interface *altsetting;
-	struct libusb20_endpoint *endpoints;
-	uint8_t	num_altsetting;
-	uint8_t	num_endpoints;
-} __aligned(sizeof(void *));
-
-struct libusb20_config {
-	struct LIBUSB20_CONFIG_DESC_DECODED desc;
-	struct libusb20_me_struct extra;
-	struct libusb20_interface *interface;
-	uint8_t	num_interface;
-} __aligned(sizeof(void *));
-
-uint8_t	libusb20_me_get_1(const struct libusb20_me_struct *ie, uint16_t offset);
-uint16_t libusb20_me_get_2(const struct libusb20_me_struct *ie, uint16_t offset);
-uint16_t libusb20_me_encode(void *ptr, uint16_t len, const void *pd);
-uint16_t libusb20_me_decode(const void *ptr, uint16_t len, void *pd);
-const uint8_t *libusb20_desc_foreach(const struct libusb20_me_struct *pdesc, const uint8_t *psubdesc);
-struct libusb20_config *libusb20_parse_config_desc(const void *config_desc);
-
-#if 0
-{					/* style */
-#endif
-#ifdef __cplusplus
-}
-
-#endif
-
-#endif					/* _LIBUSB20_DESC_H_ */
diff --git a/include.new/libutil.h b/include.new/libutil.h
deleted file mode 100644
index a6c496b..0000000
--- a/include.new/libutil.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 1996  Peter Wemm <peter@FreeBSD.org>.
- * All rights reserved.
- * Copyright (c) 2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * Portions of this software were developed for the FreeBSD Project by
- * ThinkSec AS and NAI Labs, the Security Research Division of Network
- * Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, is 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: releng/10.2/lib/libutil/libutil.h 247919 2013-03-07 19:00:00Z db $
- */
-
-#ifndef _LIBUTIL_H_
-#define	_LIBUTIL_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/_stdint.h>
-
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _UID_T_DECLARED
-typedef	__uid_t		uid_t;
-#define	_UID_T_DECLARED
-#endif
-
-#define	PROPERTY_MAX_NAME	64
-#define	PROPERTY_MAX_VALUE	512
-
-/* For properties.c. */
-typedef struct _property {
-	struct _property *next;
-	char	*name;
-	char	*value;
-} *properties;
-
-/* Avoid pulling in all the include files for no need. */
-struct in_addr;
-struct pidfh;
-struct sockaddr;
-struct termios;
-struct winsize;
-
-__BEGIN_DECLS
-char	*auth_getval(const char *_name);
-void	clean_environment(const char * const *_white,
-	    const char * const *_more_white);
-int	expand_number(const char *_buf, uint64_t *_num);
-int	extattr_namespace_to_string(int _attrnamespace, char **_string);
-int	extattr_string_to_namespace(const char *_string, int *_attrnamespace);
-int	flopen(const char *_path, int _flags, ...);
-int	forkpty(int *_amaster, char *_name,
-	    struct termios *_termp, struct winsize *_winp);
-void	hexdump(const void *_ptr, int _length, const char *_hdr, int _flags);
-int	humanize_number(char *_buf, size_t _len, int64_t _number,
-	    const char *_suffix, int _scale, int _flags);
-struct kinfo_file *
-	kinfo_getfile(pid_t _pid, int *_cntp);
-struct kinfo_vmentry *
-	kinfo_getvmmap(pid_t _pid, int *_cntp);
-struct kinfo_proc *
-	kinfo_getallproc(int *_cntp);
-struct kinfo_proc *
-	kinfo_getproc(pid_t _pid);
-int	kld_isloaded(const char *_name);
-int	kld_load(const char *_name);
-int	login_tty(int _fd);
-int	openpty(int *_amaster, int *_aslave, char *_name,
-	    struct termios *_termp, struct winsize *_winp);
-int	pidfile_close(struct pidfh *_pfh);
-int	pidfile_fileno(const struct pidfh *_pfh);
-struct pidfh *
-	pidfile_open(const char *_path, mode_t _mode, pid_t *_pidptr);
-int	pidfile_remove(struct pidfh *_pfh);
-int	pidfile_write(struct pidfh *_pfh);
-void	properties_free(properties _list);
-char	*property_find(properties _list, const char *_name);
-properties
-	properties_read(int _fd);
-int	realhostname(char *_host, size_t _hsize, const struct in_addr *_ip);
-int	realhostname_sa(char *_host, size_t _hsize, struct sockaddr *_addr,
-	    int _addrlen);
-int	_secure_path(const char *_path, uid_t _uid, gid_t _gid);
-void	trimdomain(char *_fullhost, int _hostsize);
-const char *
-	uu_lockerr(int _uu_lockresult);
-int	uu_lock(const char *_ttyname);
-int	uu_unlock(const char *_ttyname);
-int	uu_lock_txfr(const char *_ttyname, pid_t _pid);
-
-/*
- * Conditionally prototype the following functions if the include
- * files upon which they depend have been included.
- */
-#ifdef _STDIO_H_
-char	*fparseln(FILE *_fp, size_t *_len, size_t *_lineno,
-	    const char _delim[3], int _flags);
-#endif
-
-#ifdef _PWD_H_
-int	pw_copy(int _ffd, int _tfd, const struct passwd *_pw,
-	    struct passwd *_old_pw);
-struct passwd
-	*pw_dup(const struct passwd *_pw);
-int	pw_edit(int _notsetuid);
-int	pw_equal(const struct passwd *_pw1, const struct passwd *_pw2);
-void	pw_fini(void);
-int	pw_init(const char *_dir, const char *_master);
-char	*pw_make(const struct passwd *_pw);
-char	*pw_make_v7(const struct passwd *_pw);
-int	pw_mkdb(const char *_user);
-int	pw_lock(void);
-struct passwd *
-	pw_scan(const char *_line, int _flags);
-const char *
-	pw_tempname(void);
-int	pw_tmp(int _mfd);
-#endif
-
-#ifdef _GRP_H_
-int 	gr_copy(int __ffd, int _tfd, const struct group *_gr,
-	    struct group *_old_gr);
-struct group *
-	gr_dup(const struct group *_gr);
-struct group *
-	gr_add(const struct group *_gr, const char *_newmember);
-int	gr_equal(const struct group *_gr1, const struct group *_gr2);
-void	gr_fini(void);
-int	gr_init(const char *_dir, const char *_master);
-int	gr_lock(void);
-char	*gr_make(const struct group *_gr);
-int	gr_mkdb(void);
-struct group *
-	gr_scan(const char *_line);
-int	gr_tmp(int _mdf);
-#endif
-
-#ifdef _UFS_UFS_QUOTA_H_
-struct fstab;
-struct quotafile;
-int	quota_check_path(const struct quotafile *_qf, const char *_path);
-void	quota_close(struct quotafile *_qf);
-int	quota_convert(struct quotafile *_qf, int _wordsize);
-const char *
-	quota_fsname(const struct quotafile *_qf);
-int	quota_maxid(struct quotafile *_qf);
-int	quota_off(struct quotafile *_qf);
-int	quota_on(struct quotafile *_qf);
-struct quotafile *
-	quota_open(struct fstab *_fs, int _quotatype, int _openflags);
-const char *
-	quota_qfname(const struct quotafile *_qf);
-int	quota_read(struct quotafile *_qf, struct dqblk *_dqb, int _id);
-int	quota_write_limits(struct quotafile *_qf, struct dqblk *_dqb, int _id);
-int	quota_write_usage(struct quotafile *_qf, struct dqblk *_dqb, int _id);
-#endif
-
-__END_DECLS
-
-/* fparseln(3) */
-#define	FPARSELN_UNESCESC	0x01
-#define	FPARSELN_UNESCCONT	0x02
-#define	FPARSELN_UNESCCOMM	0x04
-#define	FPARSELN_UNESCREST	0x08
-#define	FPARSELN_UNESCALL	0x0f
-
-/* Flags for hexdump(3). */
-#define	HD_COLUMN_MASK		0xff
-#define	HD_DELIM_MASK		0xff00
-#define	HD_OMIT_COUNT		(1 << 16)
-#define	HD_OMIT_HEX		(1 << 17)
-#define	HD_OMIT_CHARS		(1 << 18)
-
-/* Values for humanize_number(3)'s flags parameter. */
-#define	HN_DECIMAL		0x01
-#define	HN_NOSPACE		0x02
-#define	HN_B			0x04
-#define	HN_DIVISOR_1000		0x08
-#define	HN_IEC_PREFIXES		0x10
-
-/* Values for humanize_number(3)'s scale parameter. */
-#define	HN_GETSCALE		0x10
-#define	HN_AUTOSCALE		0x20
-
-/* Return values from realhostname(). */
-#define	HOSTNAME_FOUND		0
-#define	HOSTNAME_INCORRECTNAME	1
-#define	HOSTNAME_INVALIDADDR	2
-#define	HOSTNAME_INVALIDNAME	3
-
-/* Flags for pw_scan(). */
-#define	PWSCAN_MASTER		0x01
-#define	PWSCAN_WARN		0x02
-
-/* Return values from uu_lock(). */
-#define	UU_LOCK_INUSE		1
-#define	UU_LOCK_OK		0
-#define	UU_LOCK_OPEN_ERR	(-1)
-#define	UU_LOCK_READ_ERR	(-2)
-#define	UU_LOCK_CREAT_ERR	(-3)
-#define	UU_LOCK_WRITE_ERR	(-4)
-#define	UU_LOCK_LINK_ERR	(-5)
-#define	UU_LOCK_TRY_ERR		(-6)
-#define	UU_LOCK_OWNER_ERR	(-7)
-
-#endif /* !_LIBUTIL_H_ */
diff --git a/include.new/limits.h b/include.new/limits.h
deleted file mode 100644
index d33e4bb..0000000
--- a/include.new/limits.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * Copyright (c) 1988, 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. 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.
- *
- *	@(#)limits.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: releng/10.2/include/limits.h 219271 2011-03-04 19:28:27Z jilles $
- */
-
-#ifndef _LIMITS_H_
-#define	_LIMITS_H_
-
-#include <sys/cdefs.h>
-
-#if __POSIX_VISIBLE
-#define	_POSIX_ARG_MAX		4096
-#define	_POSIX_LINK_MAX		8
-#define	_POSIX_MAX_CANON	255
-#define	_POSIX_MAX_INPUT	255
-#define	_POSIX_NAME_MAX		14
-#define	_POSIX_PIPE_BUF		512
-#define	_POSIX_SSIZE_MAX	32767
-#define	_POSIX_STREAM_MAX	8
-
-#if __POSIX_VISIBLE >= 200112
-#define	_POSIX_CHILD_MAX	25
-#define	_POSIX_NGROUPS_MAX	8
-#define	_POSIX_OPEN_MAX		20
-#define	_POSIX_PATH_MAX		256
-#define	_POSIX_TZNAME_MAX	6
-#else
-#define	_POSIX_CHILD_MAX	6
-#define	_POSIX_NGROUPS_MAX	0
-#define	_POSIX_OPEN_MAX		16
-#define	_POSIX_PATH_MAX		255
-#define	_POSIX_TZNAME_MAX	3
-#endif
-
-#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
-#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
-#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
-#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
-#define	COLL_WEIGHTS_MAX	    0	/* max weights for order keyword */
-#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
-#define	LINE_MAX		 2048	/* max bytes in an input line */
-#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
-
-#define	_POSIX2_BC_BASE_MAX	99
-#define	_POSIX2_BC_DIM_MAX	2048
-#define	_POSIX2_BC_SCALE_MAX	99
-#define	_POSIX2_BC_STRING_MAX	1000
-#define	_POSIX2_EQUIV_CLASS_MAX	2
-#define	_POSIX2_EXPR_NEST_MAX	32
-#define	_POSIX2_LINE_MAX	2048
-#define	_POSIX2_RE_DUP_MAX	255
-#endif
-
-#if __POSIX_VISIBLE >= 199309
-#define	_POSIX_AIO_LISTIO_MAX	2
-#define	_POSIX_AIO_MAX		1
-#define	_POSIX_DELAYTIMER_MAX	32
-#define	_POSIX_MQ_OPEN_MAX	8
-#define	_POSIX_MQ_PRIO_MAX	32
-#define	_POSIX_RTSIG_MAX	8
-#define	_POSIX_SEM_NSEMS_MAX	256
-#define	_POSIX_SEM_VALUE_MAX	32767
-#define	_POSIX_SIGQUEUE_MAX	32
-#define	_POSIX_TIMER_MAX	32
-
-#define	_POSIX_CLOCKRES_MIN	20000000
-#endif
-
-#if __POSIX_VISIBLE >= 199506
-#define	_POSIX_THREAD_DESTRUCTOR_ITERATIONS 4
-#define	_POSIX_THREAD_KEYS_MAX	128
-#define	_POSIX_THREAD_THREADS_MAX 64
-#endif
-
-#if __POSIX_VISIBLE >= 200112
-#define	_POSIX_HOST_NAME_MAX	255
-#define	_POSIX_LOGIN_NAME_MAX	9
-#define	_POSIX_SS_REPL_MAX	4
-#define	_POSIX_SYMLINK_MAX	255
-#define	_POSIX_SYMLOOP_MAX	8
-#define	_POSIX_TRACE_EVENT_NAME_MAX 30
-#define	_POSIX_TRACE_NAME_MAX	8
-#define	_POSIX_TRACE_SYS_MAX	8
-#define	_POSIX_TRACE_USER_EVENT_MAX 32
-#define	_POSIX_TTY_NAME_MAX	9
-#define	_POSIX2_CHARCLASS_NAME_MAX 14
-#define	_POSIX2_COLL_WEIGHTS_MAX 2
-
-#define	_POSIX_RE_DUP_MAX	_POSIX2_RE_DUP_MAX
-#endif
-
-#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809
-#define	NL_ARGMAX		99	/* max # of position args for printf */
-#define	NL_MSGMAX		32767
-#define	NL_SETMAX		255
-#define	NL_TEXTMAX		2048
-#endif
-
-#if __XSI_VISIBLE
-#define	_XOPEN_IOV_MAX		16
-#define	_XOPEN_NAME_MAX		255
-#define	_XOPEN_PATH_MAX		1024
-#define	PASS_MAX		128	/* _PASSWORD_LEN from <pwd.h> */
-
-#define	NL_LANGMAX		31	/* max LANG name length */
-#define	NL_NMAX			1
-#endif
-
-#define	MB_LEN_MAX		6	/* 31-bit UTF-8 */
-
-#include <sys/limits.h>
-
-#if __POSIX_VISIBLE
-#include <sys/syslimits.h>
-#endif
-
-#endif /* !_LIMITS_H_ */
diff --git a/include.new/link.h b/include.new/link.h
deleted file mode 100644
index 0930407..0000000
--- a/include.new/link.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1993 Paul Kranenburg
- * 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 Paul Kranenburg.
- * 4. 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 ``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 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: releng/10.2/include/link.h 103436 2002-09-17 01:49:00Z peter $
- */
-
-#include <sys/link_elf.h>
diff --git a/include.new/linker_set.h b/include.new/linker_set.h
deleted file mode 100644
index 84c9e40..0000000
--- a/include.new/linker_set.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 1999 John D. Polstra
- * Copyright (c) 1999,2001 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.
- *
- * 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: releng/10.2/sys/sys/linker_set.h 284880 2015-06-26 21:35:36Z hselasky $
- */
-
-#ifndef _SYS_LINKER_SET_H_
-#define _SYS_LINKER_SET_H_
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-/*
- * The following macros are used to declare global sets of objects, which
- * are collected by the linker into a `linker_set' as defined below.
- * For ELF, this is done by constructing a separate segment for each set.
- */
-
-/*
- * Private macros, not to be used outside this header file.
- */
-#ifdef __GNUCLIKE___SECTION
-#define __MAKE_SET(set, sym)						\
-	__GLOBL(__CONCAT(__start_set_,set));				\
-	__GLOBL(__CONCAT(__stop_set_,set));				\
-	static void const * const __set_##set##_sym_##sym 		\
-	__section("set_" #set) __used = &sym
-#else /* !__GNUCLIKE___SECTION */
-#ifndef lint
-#error this file needs to be ported to your compiler
-#endif /* lint */
-#define __MAKE_SET(set, sym)	extern void const * const (__set_##set##_sym_##sym)
-#endif /* __GNUCLIKE___SECTION */
-
-/*
- * Public macros.
- */
-#define TEXT_SET(set, sym)	__MAKE_SET(set, sym)
-#define DATA_SET(set, sym)	__MAKE_SET(set, sym)
-#define BSS_SET(set, sym)	__MAKE_SET(set, sym)
-#define ABS_SET(set, sym)	__MAKE_SET(set, sym)
-#define SET_ENTRY(set, sym)	__MAKE_SET(set, sym)
-
-/*
- * Initialize before referring to a given linker set.
- */
-#define SET_DECLARE(set, ptype)					\
-	extern ptype __weak_symbol *__CONCAT(__start_set_,set);	\
-	extern ptype __weak_symbol *__CONCAT(__stop_set_,set)
-
-#define SET_BEGIN(set)							\
-	(&__CONCAT(__start_set_,set))
-#define SET_LIMIT(set)							\
-	(&__CONCAT(__stop_set_,set))
-
-/*
- * Iterate over all the elements of a set.
- *
- * Sets always contain addresses of things, and "pvar" points to words
- * containing those addresses.  Thus is must be declared as "type **pvar",
- * and the address of each set item is obtained inside the loop by "*pvar".
- */
-#define SET_FOREACH(pvar, set)						\
-	for (pvar = SET_BEGIN(set); pvar < SET_LIMIT(set); pvar++)
-
-#define SET_ITEM(set, i)						\
-	((SET_BEGIN(set))[i])
-
-/*
- * Provide a count of the items in a set.
- */
-#define SET_COUNT(set)							\
-	(SET_LIMIT(set) - SET_BEGIN(set))
-
-#endif	/* _SYS_LINKER_SET_H_ */
diff --git a/include.new/locale.h b/include.new/locale.h
deleted file mode 100644
index 96ce6e5..0000000
--- a/include.new/locale.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1991, 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. 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.
- *
- *	@(#)locale.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/locale.h 232498 2012-03-04 15:31:13Z theraven $
- */
-
-#ifndef _LOCALE_H_
-#define _LOCALE_H_
-
-#include <sys/_null.h>
-
-struct lconv {
-	char	*decimal_point;
-	char	*thousands_sep;
-	char	*grouping;
-	char	*int_curr_symbol;
-	char	*currency_symbol;
-	char	*mon_decimal_point;
-	char	*mon_thousands_sep;
-	char	*mon_grouping;
-	char	*positive_sign;
-	char	*negative_sign;
-	char	int_frac_digits;
-	char	frac_digits;
-	char	p_cs_precedes;
-	char	p_sep_by_space;
-	char	n_cs_precedes;
-	char	n_sep_by_space;
-	char	p_sign_posn;
-	char	n_sign_posn;
-	char	int_p_cs_precedes;
-	char	int_n_cs_precedes;
-	char	int_p_sep_by_space;
-	char	int_n_sep_by_space;
-	char	int_p_sign_posn;
-	char	int_n_sign_posn;
-};
-
-#define	LC_ALL		0
-#define	LC_COLLATE	1
-#define	LC_CTYPE	2
-#define	LC_MONETARY	3
-#define	LC_NUMERIC	4
-#define	LC_TIME		5
-#define	LC_MESSAGES	6
-
-#define	_LC_LAST	7		/* marks end */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-struct lconv	*localeconv(void);
-char		*setlocale(int, const char *);
-
-#if __POSIX_VISIBLE >= 200809
-#include <xlocale/_locale.h>
-#endif
-__END_DECLS
-
-
-#endif /* _LOCALE_H_ */
diff --git a/include.new/login_cap.h b/include.new/login_cap.h
deleted file mode 100644
index f07899a..0000000
--- a/include.new/login_cap.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*-
- * Copyright (c) 1996 by
- * Sean Eric Fagan <sef@kithrup.com>
- * David Nugent <davidn@blaze.net.au>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, is permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice immediately at the beginning of the file, without modification,
- *    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. This work was done expressly for inclusion into FreeBSD.  Other use
- *    is permitted provided this notation is included.
- * 4. Absolutely no warranty of function or purpose is made by the authors.
- * 5. Modifications may be freely made to this file providing the above
- *    conditions are met.
- *
- * Low-level routines relating to the user capabilities database
- *
- *	Was login_cap.h,v 1.9 1997/05/07 20:00:01 eivind Exp
- * $FreeBSD: releng/10.2/lib/libutil/login_cap.h 219304 2011-03-05 12:40:35Z trasz $
- */
-
-#ifndef _LOGIN_CAP_H_
-#define _LOGIN_CAP_H_
-
-#define LOGIN_DEFCLASS		"default"
-#define LOGIN_DEFROOTCLASS	"root"
-#define LOGIN_MECLASS		"me"
-#define LOGIN_DEFSTYLE		"passwd"
-#define LOGIN_DEFSERVICE	"login"
-#define LOGIN_DEFUMASK		022
-#define LOGIN_DEFPRI		0
-#define _PATH_LOGIN_CONF	"/etc/login.conf"
-#define _FILE_LOGIN_CONF	".login_conf"
-#define _PATH_AUTHPROG		"/usr/libexec/login_"
-
-#define LOGIN_SETGROUP		0x0001		/* set group */
-#define LOGIN_SETLOGIN		0x0002		/* set login (via setlogin) */
-#define LOGIN_SETPATH		0x0004		/* set path */
-#define LOGIN_SETPRIORITY	0x0008		/* set priority */
-#define LOGIN_SETRESOURCES	0x0010		/* set resources (cputime, etc.) */
-#define LOGIN_SETUMASK		0x0020		/* set umask, obviously */
-#define LOGIN_SETUSER		0x0040		/* set user (via setuid) */
-#define LOGIN_SETENV		0x0080		/* set user environment */
-#define LOGIN_SETMAC		0x0100		/* set user default MAC label */
-#define LOGIN_SETCPUMASK	0x0200		/* set user cpumask */
-#define LOGIN_SETLOGINCLASS	0x0400		/* set login class in the kernel */
-#define LOGIN_SETALL		0x07ff		/* set everything */
-
-#define BI_AUTH		"authorize"		/* accepted authentication */
-#define BI_REJECT	"reject"		/* rejected authentication */
-#define BI_CHALLENG	"reject challenge"	/* reject with a challenge */
-#define BI_SILENT	"reject silent"		/* reject silently */
-#define BI_REMOVE	"remove"		/* remove file on error */
-#define BI_ROOTOKAY	"authorize root"	/* root authenticated */
-#define BI_SECURE	"authorize secure"	/* okay on non-secure line */
-#define BI_SETENV	"setenv"		/* set environment variable */
-#define BI_VALUE	"value"			/* set local variable */
-
-#define AUTH_OKAY		0x01		/* user authenticated */
-#define AUTH_ROOTOKAY		0x02		/* root login okay */
-#define AUTH_SECURE		0x04		/* secure login */
-#define AUTH_SILENT		0x08		/* silent rejection */
-#define AUTH_CHALLENGE		0x10		/* a chellenge was given */
-
-#define AUTH_ALLOW		(AUTH_OKAY | AUTH_ROOTOKAY | AUTH_SECURE)
-
-typedef struct login_cap {
-    char    *lc_class;
-    char    *lc_cap;
-    char    *lc_style;
-} login_cap_t;
-
-typedef struct login_time {
-    u_short     lt_start;	/* Start time */
-    u_short     lt_end;		/* End time */
-#define LTM_NONE  0x00
-#define LTM_SUN   0x01
-#define LTM_MON   0x02
-#define LTM_TUE   0x04
-#define LTM_WED   0x08
-#define LTM_THU   0x10
-#define LTM_FRI   0x20
-#define LTM_SAT   0x40
-#define LTM_ANY   0x7F
-#define LTM_WK    0x3E
-#define LTM_WD    0x41
-    u_char	 lt_dow;	/* Days of week */
-} login_time_t;
-
-#define LC_MAXTIMES 64
-
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-struct passwd;
-
-void login_close(login_cap_t *);
-login_cap_t *login_getclassbyname(const char *, const struct passwd *);
-login_cap_t *login_getclass(const char *);
-login_cap_t *login_getpwclass(const struct passwd *);
-login_cap_t *login_getuserclass(const struct passwd *);
-
-const char *login_getcapstr(login_cap_t *, const char *, const char *,
-    const char *);
-const char **login_getcaplist(login_cap_t *, const char *, const char *);
-const char *login_getstyle(login_cap_t *, const char *, const char *);
-rlim_t login_getcaptime(login_cap_t *, const char *, rlim_t, rlim_t);
-rlim_t login_getcapnum(login_cap_t *, const char *, rlim_t, rlim_t);
-rlim_t login_getcapsize(login_cap_t *, const char *, rlim_t, rlim_t);
-const char *login_getpath(login_cap_t *, const char *, const char *);
-int login_getcapbool(login_cap_t *, const char *, int);
-const char *login_setcryptfmt(login_cap_t *, const char *, const char *);
-
-int setclasscontext(const char *, unsigned int);
-void setclasscpumask(login_cap_t *);
-int setusercontext(login_cap_t *, const struct passwd *, uid_t, unsigned int);
-void setclassresources(login_cap_t *);
-void setclassenvironment(login_cap_t *, const struct passwd *, int);
-
-/* Most of these functions are deprecated */
-int auth_approve(login_cap_t *, const char *, const char *);
-int auth_check(const char *, const char *, const char *, const char *, int *);
-void auth_env(void);
-char *auth_mkvalue(const char *);
-int auth_response(const char *, const char *, const char *, const char *, int *,
-    const char *, const char *);
-void auth_rmfiles(void);
-int auth_scan(int);
-int auth_script(const char *, ...);
-int auth_script_data(const char *, int, const char *, ...);
-char *auth_valud(const char *);
-int auth_setopt(const char *, const char *);
-void auth_clropts(void);
-
-void auth_checknologin(login_cap_t *);
-int auth_cat(const char *);
-
-int auth_ttyok(login_cap_t *, const char *);
-int auth_hostok(login_cap_t *, const char *, char const *);
-int auth_timeok(login_cap_t *, time_t);
-
-struct tm;
-
-login_time_t parse_lt(const char *);
-int in_lt(const login_time_t *, time_t *);
-int in_ltm(const login_time_t *, struct tm *, time_t *);
-int in_ltms(const login_time_t *, struct tm *, time_t *);
-int in_lts(const login_time_t *, time_t *);
-
-/* helper functions */
-
-int login_strinlist(const char **, char const *, int);
-int login_str2inlist(const char **, const char *, const char *, int);
-login_time_t * login_timelist(login_cap_t *, char const *, int *,
-    login_time_t **);
-int login_ttyok(login_cap_t *, const char *, const char *, const char *);
-int login_hostok(login_cap_t *, const char *, const char *, const char *,
-    const char *);
-
-__END_DECLS
-
-#endif /* _LOGIN_CAP_H_ */
diff --git a/include.new/lwres/context.h b/include.new/lwres/context.h
deleted file mode 100644
index d9de781..0000000
--- a/include.new/lwres/context.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: context.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_CONTEXT_H
-#define LWRES_CONTEXT_H 1
-
-#include <stddef.h>
-
-#include <lwres/lang.h>
-#include <lwres/int.h>
-#include <lwres/result.h>
-
-/*
- * Used to set various options such as timeout, authentication, etc
- */
-typedef struct lwres_context lwres_context_t;
-
-LWRES_LANG_BEGINDECLS
-
-typedef void *(*lwres_malloc_t)(void *arg, size_t length);
-typedef void (*lwres_free_t)(void *arg, void *mem, size_t length);
-
-/*
- * XXXMLG
- *
- * Make the server reload /etc/resolv.conf periodically.
- *
- * Make the server do sortlist/searchlist.
- *
- * Client side can disable the search/sortlist processing.
- *
- * Use an array of addresses/masks and searchlist for client-side, and
- * if added to the client disable the processing on the server.
- *
- * Share /etc/resolv.conf data between contexts.
- */
-
-/*
- * _SERVERMODE
- *	Don't allocate and connect a socket to the server, since the
- *	caller _is_ a server.
- */
-#define LWRES_CONTEXT_SERVERMODE	0x00000001U
-
-lwres_result_t
-lwres_context_create(lwres_context_t **contextp, void *arg,
-		     lwres_malloc_t malloc_function,
-		     lwres_free_t free_function,
-		     unsigned int flags);
-/*
- * Allocate a lwres context.  This is used in all lwres calls.
- *
- * Memory management can be replaced here by passing in two functions.
- * If one is non-NULL, they must both be non-NULL.  "arg" is passed to
- * these functions.
- *
- * Contexts are not thread safe.  Document at the top of the file.
- * XXXMLG
- *
- * If they are NULL, the standard malloc() and free() will be used.
- *
- * Requires:
- *
- *	contextp != NULL && contextp == NULL.
- *
- * Returns:
- *
- *	Returns 0 on success, non-zero on failure.
- */
-
-void
-lwres_context_destroy(lwres_context_t **contextp);
-/*
- * Frees all memory associated with a lwres context.
- *
- * Requires:
- *
- *	contextp != NULL && contextp == NULL.
- */
-
-lwres_uint32_t
-lwres_context_nextserial(lwres_context_t *ctx);
-/*
- * XXXMLG Document
- */
-
-void
-lwres_context_initserial(lwres_context_t *ctx, lwres_uint32_t serial);
-
-void
-lwres_context_freemem(lwres_context_t *ctx, void *mem, size_t len);
-
-void *
-lwres_context_allocmem(lwres_context_t *ctx, size_t len);
-
-int
-lwres_context_getsocket(lwres_context_t *ctx);
-
-lwres_result_t
-lwres_context_send(lwres_context_t *ctx,
-		   void *sendbase, int sendlen);
-
-lwres_result_t
-lwres_context_recv(lwres_context_t *ctx,
-		   void *recvbase, int recvlen,
-		   int *recvd_len);
-
-lwres_result_t
-lwres_context_sendrecv(lwres_context_t *ctx,
-		       void *sendbase, int sendlen,
-		       void *recvbase, int recvlen,
-		       int *recvd_len);
-
-LWRES_LANG_ENDDECLS
-
-#endif /* LWRES_CONTEXT_H */
-
diff --git a/include.new/lwres/int.h b/include.new/lwres/int.h
deleted file mode 100644
index e23874c..0000000
--- a/include.new/lwres/int.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: int.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_INT_H
-#define LWRES_INT_H 1
-
-typedef char				lwres_int8_t;
-typedef unsigned char			lwres_uint8_t;
-typedef short				lwres_int16_t;
-typedef unsigned short			lwres_uint16_t;
-typedef int				lwres_int32_t;
-typedef unsigned int			lwres_uint32_t;
-typedef long long			lwres_int64_t;
-typedef unsigned long long		lwres_uint64_t;
-
-#endif /* LWRES_INT_H */
diff --git a/include.new/lwres/ipv6.h b/include.new/lwres/ipv6.h
deleted file mode 100644
index c1e3efa..0000000
--- a/include.new/lwres/ipv6.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: ipv6.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_IPV6_H
-#define LWRES_IPV6_H 1
-
-/*****
- ***** Module Info
- *****/
-
-/*
- * IPv6 definitions for systems which do not support IPv6.
- */
-
-/***
- *** Imports.
- ***/
-
-#include <lwres/int.h>
-#include <lwres/platform.h>
-
-/***
- *** Types.
- ***/
-
-struct in6_addr {
-        union {
-		lwres_uint8_t	_S6_u8[16];
-		lwres_uint16_t	_S6_u16[8];
-		lwres_uint32_t	_S6_u32[4];
-        } _S6_un;
-};
-#define s6_addr		_S6_un._S6_u8
-#define s6_addr8	_S6_un._S6_u8
-#define s6_addr16	_S6_un._S6_u16
-#define s6_addr32	_S6_un._S6_u32
-
-#define IN6ADDR_ANY_INIT 	{{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }}}
-#define IN6ADDR_LOOPBACK_INIT 	{{{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }}}
-
-LIBLWRES_EXTERNAL_DATA extern const struct in6_addr in6addr_any;
-LIBLWRES_EXTERNAL_DATA extern const struct in6_addr in6addr_loopback;
-
-struct sockaddr_in6 {
-#ifdef LWRES_PLATFORM_HAVESALEN
-	lwres_uint8_t		sin6_len;
-	lwres_uint8_t		sin6_family;
-#else
-	lwres_uint16_t		sin6_family;
-#endif
-	lwres_uint16_t		sin6_port;
-	lwres_uint32_t		sin6_flowinfo;
-	struct in6_addr		sin6_addr;
-	lwres_uint32_t		sin6_scope_id;
-};
-
-#ifdef LWRES_PLATFORM_HAVESALEN
-#define SIN6_LEN 1
-#endif
-
-struct in6_pktinfo {
-	struct in6_addr ipi6_addr;    /* src/dst IPv6 address */
-	unsigned int    ipi6_ifindex; /* send/recv interface index */
-};
-
-/*
- * Unspecified
- */
-#define IN6_IS_ADDR_UNSPECIFIED(a)      \
-        (((a)->s6_addr32[0] == 0) &&    \
-         ((a)->s6_addr32[1] == 0) &&    \
-         ((a)->s6_addr32[2] == 0) &&    \
-         ((a)->s6_addr32[3] == 0))
-
-/*
- * Loopback
- */
-#define IN6_IS_ADDR_LOOPBACK(a)         \
-        (((a)->s6_addr32[0] == 0) &&    \
-         ((a)->s6_addr32[1] == 0) &&    \
-         ((a)->s6_addr32[2] == 0) &&    \
-         ((a)->s6_addr32[3] == htonl(1)))
-
-/*
- * IPv4 compatible
- */
-#define IN6_IS_ADDR_V4COMPAT(a)         \
-        (((a)->s6_addr32[0] == 0) &&    \
-         ((a)->s6_addr32[1] == 0) &&    \
-         ((a)->s6_addr32[2] == 0) &&    \
-         ((a)->s6_addr32[3] != 0) &&    \
-         ((a)->s6_addr32[3] != htonl(1)))
-
-/*
- * Mapped
- */
-#define IN6_IS_ADDR_V4MAPPED(a)               \
-        (((a)->s6_addr32[0] == 0) &&          \
-         ((a)->s6_addr32[1] == 0) &&          \
-         ((a)->s6_addr32[2] == htonl(0x0000ffff)))
-
-#endif /* LWRES_IPV6_H */
diff --git a/include.new/lwres/lang.h b/include.new/lwres/lang.h
deleted file mode 100644
index 512f3c7..0000000
--- a/include.new/lwres/lang.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: lang.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_LANG_H
-#define LWRES_LANG_H 1
-
-#ifdef __cplusplus
-#define LWRES_LANG_BEGINDECLS	extern "C" {
-#define LWRES_LANG_ENDDECLS	}
-#else
-#define LWRES_LANG_BEGINDECLS
-#define LWRES_LANG_ENDDECLS
-#endif
-
-#endif /* LWRES_LANG_H */
diff --git a/include.new/lwres/list.h b/include.new/lwres/list.h
deleted file mode 100644
index 2a30f73..0000000
--- a/include.new/lwres/list.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1997-2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: list.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_LIST_H
-#define LWRES_LIST_H 1
-
-#define LWRES_LIST(type) struct { type *head, *tail; }
-#define LWRES_LIST_INIT(list) \
-	do { (list).head = NULL; (list).tail = NULL; } while (0)
-
-#define LWRES_LINK(type) struct { type *prev, *next; }
-#define LWRES_LINK_INIT(elt, link) \
-	do { \
-		(elt)->link.prev = (void *)(-1); \
-		(elt)->link.next = (void *)(-1); \
-	} while (0)
-#define LWRES_LINK_LINKED(elt, link) \
-	((void *)((elt)->link.prev) != (void *)(-1))
-
-#define LWRES_LIST_HEAD(list) ((list).head)
-#define LWRES_LIST_TAIL(list) ((list).tail)
-#define LWRES_LIST_EMPTY(list) LWRES_TF((list).head == NULL)
-
-#define LWRES_LIST_PREPEND(list, elt, link) \
-	do { \
-		if ((list).head != NULL) \
-			(list).head->link.prev = (elt); \
-		else \
-			(list).tail = (elt); \
-		(elt)->link.prev = NULL; \
-		(elt)->link.next = (list).head; \
-		(list).head = (elt); \
-	} while (0)
-
-#define LWRES_LIST_APPEND(list, elt, link) \
-	do { \
-		if ((list).tail != NULL) \
-			(list).tail->link.next = (elt); \
-		else \
-			(list).head = (elt); \
-		(elt)->link.prev = (list).tail; \
-		(elt)->link.next = NULL; \
-		(list).tail = (elt); \
-	} while (0)
-
-#define LWRES_LIST_UNLINK(list, elt, link) \
-	do { \
-		if ((elt)->link.next != NULL) \
-			(elt)->link.next->link.prev = (elt)->link.prev; \
-		else \
-			(list).tail = (elt)->link.prev; \
-		if ((elt)->link.prev != NULL) \
-			(elt)->link.prev->link.next = (elt)->link.next; \
-		else \
-			(list).head = (elt)->link.next; \
-		(elt)->link.prev = (void *)(-1); \
-		(elt)->link.next = (void *)(-1); \
-	} while (0)
-
-#define LWRES_LIST_PREV(elt, link) ((elt)->link.prev)
-#define LWRES_LIST_NEXT(elt, link) ((elt)->link.next)
-
-#define LWRES_LIST_INSERTBEFORE(list, before, elt, link) \
-	do { \
-		if ((before)->link.prev == NULL) \
-			LWRES_LIST_PREPEND(list, elt, link); \
-		else { \
-			(elt)->link.prev = (before)->link.prev; \
-			(before)->link.prev = (elt); \
-			(elt)->link.prev->link.next = (elt); \
-			(elt)->link.next = (before); \
-		} \
-	} while (0)
-
-#define LWRES_LIST_INSERTAFTER(list, after, elt, link) \
-	do { \
-		if ((after)->link.next == NULL) \
-			LWRES_LIST_APPEND(list, elt, link); \
-		else { \
-			(elt)->link.next = (after)->link.next; \
-			(after)->link.next = (elt); \
-			(elt)->link.next->link.prev = (elt); \
-			(elt)->link.prev = (after); \
-		} \
-	} while (0)
-
-#define LWRES_LIST_APPENDLIST(list1, list2, link) \
-	do { \
-		if (LWRES_LIST_EMPTY(list1)) \
-			(list1) = (list2); \
-		else if (!LWRES_LIST_EMPTY(list2)) { \
-			(list1).tail->link.next = (list2).head; \
-			(list2).head->link.prev = (list1).tail; \
-			(list1).tail = (list2).tail; \
-		} \
-		(list2).head = NULL; \
-		(list2).tail = NULL; \
-	} while (0)
-
-#define LWRES_LIST_ENQUEUE(list, elt, link) LWRES_LIST_APPEND(list, elt, link)
-#define LWRES_LIST_DEQUEUE(list, elt, link) LWRES_LIST_UNLINK(list, elt, link)
-
-#endif /* LWRES_LIST_H */
diff --git a/include.new/lwres/lwbuffer.h b/include.new/lwres/lwbuffer.h
deleted file mode 100644
index 86be23f..0000000
--- a/include.new/lwres/lwbuffer.h
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: lwbuffer.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_LWBUFFER_H
-#define LWRES_LWBUFFER_H 1
-
-/*****
- ***** Module Info
- *****/
-
-/*
- * Buffers
- *
- * A buffer is a region of memory, together with a set of related subregions.
- * Buffers are used for parsing and I/O operations.
- *
- * The 'used region' and the 'available' region are disjoint, and their
- * union is the buffer's region.  The used region extends from the beginning
- * of the buffer region to the last used byte.  The available region
- * extends from one byte greater than the last used byte to the end of the
- * buffer's region.  The size of the used region can be changed using various
- * buffer commands.  Initially, the used region is empty.
- *
- * The used region is further subdivided into two disjoint regions: the
- * 'consumed region' and the 'remaining region'.  The union of these two
- * regions is the used region.  The consumed region extends from the beginning
- * of the used region to the byte before the 'current' offset (if any).  The
- * 'remaining' region the current pointer to the end of the used
- * region.  The size of the consumed region can be changed using various
- * buffer commands.  Initially, the consumed region is empty.
- *
- * The 'active region' is an (optional) subregion of the remaining region.
- * It extends from the current offset to an offset in the remaining region
- * that is selected with lwres_buffer_setactive().  Initially, the active
- * region is empty.  If the current offset advances beyond the chosen offset,
- * the active region will also be empty.
- *
- *  /----- used region -----\/-- available --\
- *  +----------------------------------------+
- *  | consumed  | remaining |                |
- *  +----------------------------------------+
- *  a           b     c     d                e
- *
- * a == base of buffer.
- * b == current pointer.  Can be anywhere between a and d.
- * c == active pointer.  Meaningful between b and d.
- * d == used pointer.
- * e == length of buffer.
- *
- * a-e == entire (length) of buffer.
- * a-d == used region.
- * a-b == consumed region.
- * b-d == remaining region.
- * b-c == optional active region.
- *
- * The following invariants are maintained by all routines:
- *
- *	length > 0
- *
- *	base is a valid pointer to length bytes of memory
- *
- *	0 <= used <= length
- *
- *	0 <= current <= used
- *
- *	0 <= active <= used
- *	(although active < current implies empty active region)
- *
- * MP:
- *	Buffers have no synchronization.  Clients must ensure exclusive
- *	access.
- *
- * Reliability:
- *	No anticipated impact.
- *
- * Resources:
- *	Memory: 1 pointer + 6 unsigned integers per buffer.
- *
- * Security:
- *	No anticipated impact.
- *
- * Standards:
- *	None.
- */
-
-/***
- *** Imports
- ***/
-
-#include <lwres/lang.h>
-#include <lwres/int.h>
-
-LWRES_LANG_BEGINDECLS
-
-/***
- *** Magic numbers
- ***/
-#define LWRES_BUFFER_MAGIC		0x4275663fU	/* Buf?. */
-
-#define LWRES_BUFFER_VALID(b)		((b) != NULL && \
-					 (b)->magic == LWRES_BUFFER_MAGIC)
-
-/*
- * The following macros MUST be used only on valid buffers.  It is the
- * caller's responsibility to ensure this by using the LWRES_BUFFER_VALID
- * check above, or by calling another lwres_buffer_*() function (rather than
- * another macro.)
- */
-
-/*
- * Get the length of the used region of buffer "b"
- */
-#define LWRES_BUFFER_USEDCOUNT(b)	((b)->used)
-
-/*
- * Get the length of the available region of buffer "b"
- */
-#define LWRES_BUFFER_AVAILABLECOUNT(b)	((b)->length - (b)->used)
-
-#define LWRES_BUFFER_REMAINING(b)	((b)->used - (b)->current)
-
-/*
- * Note that the buffer structure is public.  This is principally so buffer
- * operations can be implemented using macros.  Applications are strongly
- * discouraged from directly manipulating the structure.
- */
-
-typedef struct lwres_buffer lwres_buffer_t;
-struct lwres_buffer {
-	unsigned int		magic;
-	unsigned char 	       *base;
-	/* The following integers are byte offsets from 'base'. */
-	unsigned int		length;
-	unsigned int		used;
-	unsigned int 		current;
-	unsigned int 		active;
-};
-
-/***
- *** Functions
- ***/
-
-void
-lwres_buffer_init(lwres_buffer_t *b, void *base, unsigned int length);
-/*
- * Make 'b' refer to the 'length'-byte region starting at base.
- *
- * Requires:
- *
- *	'length' > 0
- *
- *	'base' is a pointer to a sequence of 'length' bytes.
- *
- */
-
-void
-lwres_buffer_invalidate(lwres_buffer_t *b);
-/*
- * Make 'b' an invalid buffer.
- *
- * Requires:
- *	'b' is a valid buffer.
- *
- * Ensures:
- *	If assertion checking is enabled, future attempts to use 'b' without
- *	calling lwres_buffer_init() on it will cause an assertion failure.
- */
-
-void
-lwres_buffer_add(lwres_buffer_t *b, unsigned int n);
-/*
- * Increase the 'used' region of 'b' by 'n' bytes.
- *
- * Requires:
- *
- *	'b' is a valid buffer
- *
- *	used + n <= length
- *
- */
-
-void
-lwres_buffer_subtract(lwres_buffer_t *b, unsigned int n);
-/*
- * Decrease the 'used' region of 'b' by 'n' bytes.
- *
- * Requires:
- *
- *	'b' is a valid buffer
- *
- *	used >= n
- *
- */
-
-void
-lwres_buffer_clear(lwres_buffer_t *b);
-/*
- * Make the used region empty.
- *
- * Requires:
- *
- *	'b' is a valid buffer
- *
- * Ensures:
- *
- *	used = 0
- *
- */
-
-void
-lwres_buffer_first(lwres_buffer_t *b);
-/*
- * Make the consumed region empty.
- *
- * Requires:
- *
- *	'b' is a valid buffer
- *
- * Ensures:
- *
- *	current == 0
- *
- */
-
-void
-lwres_buffer_forward(lwres_buffer_t *b, unsigned int n);
-/*
- * Increase the 'consumed' region of 'b' by 'n' bytes.
- *
- * Requires:
- *
- *	'b' is a valid buffer
- *
- *	current + n <= used
- *
- */
-
-void
-lwres_buffer_back(lwres_buffer_t *b, unsigned int n);
-/*
- * Decrease the 'consumed' region of 'b' by 'n' bytes.
- *
- * Requires:
- *
- *	'b' is a valid buffer
- *
- *	n <= current
- *
- */
-
-lwres_uint8_t
-lwres_buffer_getuint8(lwres_buffer_t *b);
-/*
- * Read an unsigned 8-bit integer from 'b' and return it.
- *
- * Requires:
- *
- *	'b' is a valid buffer.
- *
- *	The length of the available region of 'b' is at least 1.
- *
- * Ensures:
- *
- *	The current pointer in 'b' is advanced by 1.
- *
- * Returns:
- *
- *	A 8-bit unsigned integer.
- */
-
-void
-lwres_buffer_putuint8(lwres_buffer_t *b, lwres_uint8_t val);
-/*
- * Store an unsigned 8-bit integer from 'val' into 'b'.
- *
- * Requires:
- *	'b' is a valid buffer.
- *
- *	The length of the unused region of 'b' is at least 1.
- *
- * Ensures:
- *	The used pointer in 'b' is advanced by 1.
- */
-
-lwres_uint16_t
-lwres_buffer_getuint16(lwres_buffer_t *b);
-/*
- * Read an unsigned 16-bit integer in network byte order from 'b', convert
- * it to host byte order, and return it.
- *
- * Requires:
- *
- *	'b' is a valid buffer.
- *
- *	The length of the available region of 'b' is at least 2.
- *
- * Ensures:
- *
- *	The current pointer in 'b' is advanced by 2.
- *
- * Returns:
- *
- *	A 16-bit unsigned integer.
- */
-
-void
-lwres_buffer_putuint16(lwres_buffer_t *b, lwres_uint16_t val);
-/*
- * Store an unsigned 16-bit integer in host byte order from 'val'
- * into 'b' in network byte order.
- *
- * Requires:
- *	'b' is a valid buffer.
- *
- *	The length of the unused region of 'b' is at least 2.
- *
- * Ensures:
- *	The used pointer in 'b' is advanced by 2.
- */
-
-lwres_uint32_t
-lwres_buffer_getuint32(lwres_buffer_t *b);
-/*
- * Read an unsigned 32-bit integer in network byte order from 'b', convert
- * it to host byte order, and return it.
- *
- * Requires:
- *
- *	'b' is a valid buffer.
- *
- *	The length of the available region of 'b' is at least 2.
- *
- * Ensures:
- *
- *	The current pointer in 'b' is advanced by 2.
- *
- * Returns:
- *
- *	A 32-bit unsigned integer.
- */
-
-void
-lwres_buffer_putuint32(lwres_buffer_t *b, lwres_uint32_t val);
-/*
- * Store an unsigned 32-bit integer in host byte order from 'val'
- * into 'b' in network byte order.
- *
- * Requires:
- *	'b' is a valid buffer.
- *
- *	The length of the unused region of 'b' is at least 4.
- *
- * Ensures:
- *	The used pointer in 'b' is advanced by 4.
- */
-
-void
-lwres_buffer_putmem(lwres_buffer_t *b, const unsigned char *base,
-		    unsigned int length);
-/*
- * Copy 'length' bytes of memory at 'base' into 'b'.
- *
- * Requires:
- *	'b' is a valid buffer.
- *
- *	'base' points to 'length' bytes of valid memory.
- *
- */
-
-void
-lwres_buffer_getmem(lwres_buffer_t *b, unsigned char *base,
-		    unsigned int length);
-/*
- * Copy 'length' bytes of memory from 'b' into 'base'.
- *
- * Requires:
- *	'b' is a valid buffer.
- *
- *	'base' points to at least 'length' bytes of valid memory.
- *
- *	'b' have at least 'length' bytes remaining.
- */
-
-LWRES_LANG_ENDDECLS
-
-#endif /* LWRES_LWBUFFER_H */
diff --git a/include.new/lwres/lwpacket.h b/include.new/lwres/lwpacket.h
deleted file mode 100644
index f0d41e4..0000000
--- a/include.new/lwres/lwpacket.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: lwpacket.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_LWPACKET_H
-#define LWRES_LWPACKET_H 1
-
-#include <lwres/lang.h>
-#include <lwres/lwbuffer.h>
-#include <lwres/result.h>
-
-typedef struct lwres_lwpacket lwres_lwpacket_t;
-
-struct lwres_lwpacket {
-	lwres_uint32_t		length;
-	lwres_uint16_t		version;
-	lwres_uint16_t		pktflags;
-	lwres_uint32_t		serial;
-	lwres_uint32_t		opcode;
-	lwres_uint32_t		result;
-	lwres_uint32_t		recvlength;
-	lwres_uint16_t		authtype;
-	lwres_uint16_t		authlength;
-};
-
-#define LWRES_LWPACKET_LENGTH		(4 * 5 + 2 * 4)
-
-#define LWRES_LWPACKETFLAG_RESPONSE	0x0001U	/* if set, pkt is a response */
-
-
-#define LWRES_LWPACKETVERSION_0		0
-
-/*
- * "length" is the overall packet length, including the entire packet header.
- *
- * "version" specifies the header format.  Currently, there is only one
- * format, LWRES_LWPACKETVERSION_0.
- *
- * "flags" specifies library-defined flags for this packet.  None of these
- * are definable by the caller, but library-defined values can be set by
- * the caller.  For example, one bit in this field indicates if the packet
- * is a request or a response.
- *
- * "serial" is set by the requestor and is returned in all replies.  If two
- * packets from the same source have the same serial number and are from
- * the same source, they are assumed to be duplicates and the latter ones
- * may be dropped.  (The library does not do this by default on replies, but
- * does so on requests.)
- *
- * "opcode" is application defined.  Opcodes between 0x04000000 and 0xffffffff
- * are application defined.  Opcodes between 0x00000000 and 0x03ffffff are
- * reserved for library use.
- *
- * "result" is application defined, and valid only on replies.
- * Results between 0x04000000 and 0xffffffff are application defined.
- * Results between 0x00000000 and 0x03ffffff are reserved for library use.
- * (This is the same reserved range defined in <isc/resultclass.h>, so it
- * would be trivial to map ISC_R_* result codes into packet result codes
- * when appropriate.)
- *
- * "recvlength" is set to the maximum buffer size that the receiver can
- * handle on requests, and the size of the buffer needed to satisfy a request
- * when the buffer is too large for replies.
- *
- * "authtype" is the packet level auth type used.
- * Authtypes between 0x1000 and 0xffff are application defined.  Authtypes
- * between 0x0000 and 0x0fff are reserved for library use.  This is currently
- * unused and MUST be set to zero.
- *
- * "authlen" is the length of the authentication data.  See the specific
- * authtypes for more information on what is contained in this field.  This
- * is currently unused, and MUST be set to zero.
- *
- * The remainder of the packet consists of two regions, one described by
- * "authlen" and one of "length - authlen - sizeof(lwres_lwpacket_t)".
- *
- * That is:
- *
- *	pkt header
- *	authlen bytes of auth information
- *	data bytes
- */
-
-/*
- * Currently defined opcodes:
- *
- *	NOOP.  Success is always returned, with the packet contents echoed.
- *
- *	GETADDRSBYNAME.  Return all known addresses for a given name.
- *		This may return NIS or /etc/hosts info as well as DNS
- *		information.  Flags will be provided to indicate ip4/ip6
- *		addresses are desired.
- *
- *	GETNAMEBYADDR.	Return the hostname for the given address.  Once
- *		again, it will return data from multiple sources.
- */
-
-LWRES_LANG_BEGINDECLS
-
-/* XXXMLG document */
-lwres_result_t
-lwres_lwpacket_renderheader(lwres_buffer_t *b, lwres_lwpacket_t *pkt);
-
-lwres_result_t
-lwres_lwpacket_parseheader(lwres_buffer_t *b, lwres_lwpacket_t *pkt);
-
-LWRES_LANG_ENDDECLS
-
-#endif /* LWRES_LWPACKET_H */
diff --git a/include.new/lwres/lwres.h b/include.new/lwres/lwres.h
deleted file mode 100644
index fd30a25..0000000
--- a/include.new/lwres/lwres.h
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: lwres.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_LWRES_H
-#define LWRES_LWRES_H 1
-
-#include <stdio.h>
-
-#include <lwres/context.h>
-#include <lwres/lang.h>
-#include <lwres/list.h>
-#include <lwres/lwpacket.h>
-#include <lwres/platform.h>
-
-/*
- * Design notes:
- *
- * Each opcode has two structures and three functions which operate on each
- * structure.  For example, using the "no operation/ping" opcode as an
- * example:
- *
- *	lwres_nooprequest_t:
- *
- *		lwres_nooprequest_render() takes a lwres_nooprequest_t and
- *		and renders it into wire format, storing the allocated
- *		buffer information in a passed-in buffer.  When this buffer
- *		is no longer needed, it must be freed by
- *		lwres_context_freemem().  All other memory used by the
- *		caller must be freed manually, including the
- *		lwres_nooprequest_t passed in.
- *
- *		lwres_nooprequest_parse() takes a wire format message and
- *		breaks it out into a lwres_nooprequest_t.  The structure
- *		must be freed via lwres_nooprequest_free() when it is no longer
- *		needed.
- *
- *		lwres_nooprequest_free() releases into the lwres_context_t
- *		any space allocated during parsing.
- *
- *	lwres_noopresponse_t:
- *
- *		The functions used are similar to the three used for
- *		requests, just with different names.
- *
- * Typically, the client will use request_render, response_parse, and
- * response_free, while the daemon will use request_parse, response_render,
- * and request_free.
- *
- * The basic flow of a typical client is:
- *
- *	fill in a request_t, and call the render function.
- *
- *	Transmit the buffer returned to the daemon.
- *
- *	Wait for a response.
- *
- *	When a response is received, parse it into a response_t.
- *
- *	free the request buffer using lwres_context_freemem().
- *
- *	free the response structure and its associated buffer using
- *	response_free().
- */
-
-#define LWRES_UDP_PORT		921
-#define LWRES_RECVLENGTH	16384
-#define LWRES_ADDR_MAXLEN	16	/* changing this breaks ABI */
-#define LWRES_RESOLV_CONF	"/etc/resolv.conf"
-
-/*
- * Flags.
- *
- * 	These flags are only relevant to rrset queries.
- *
- *	TRUSTNOTREQUIRED:  DNSSEC is not required (input)
- *	SECUREDATA: The data was crypto-verified with DNSSEC (output)
- *
- */
-#define LWRES_FLAG_TRUSTNOTREQUIRED	0x00000001U
-#define LWRES_FLAG_SECUREDATA		0x00000002U
-
-/*
- * no-op
- */
-#define LWRES_OPCODE_NOOP		0x00000000U
-
-typedef struct {
-	/* public */
-	lwres_uint16_t			datalength;
-	unsigned char		       *data;
-} lwres_nooprequest_t;
-
-typedef struct {
-	/* public */
-	lwres_uint16_t			datalength;
-	unsigned char		       *data;
-} lwres_noopresponse_t;
-
-/*
- * get addresses by name
- */
-#define LWRES_OPCODE_GETADDRSBYNAME	0x00010001U
-
-typedef struct lwres_addr lwres_addr_t;
-typedef LWRES_LIST(lwres_addr_t) lwres_addrlist_t;
-
-struct lwres_addr {
-	lwres_uint32_t			family;
-	lwres_uint16_t			length;
-	unsigned char			address[LWRES_ADDR_MAXLEN];
-	LWRES_LINK(lwres_addr_t)	link;
-};
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint32_t			addrtypes;
-	lwres_uint16_t			namelen;
-	char			       *name;
-} lwres_gabnrequest_t;
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint16_t			naliases;
-	lwres_uint16_t			naddrs;
-	char			       *realname;
-	char			      **aliases;
-	lwres_uint16_t			realnamelen;
-	lwres_uint16_t		       *aliaslen;
-	lwres_addrlist_t		addrs;
-	/* if base != NULL, it will be freed when this structure is freed. */
-	void			       *base;
-	size_t				baselen;
-} lwres_gabnresponse_t;
-
-/*
- * get name by address
- */
-#define LWRES_OPCODE_GETNAMEBYADDR	0x00010002U
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_addr_t			addr;
-} lwres_gnbarequest_t;
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint16_t			naliases;
-	char			       *realname;
-	char			      **aliases;
-	lwres_uint16_t			realnamelen;
-	lwres_uint16_t		       *aliaslen;
-	/* if base != NULL, it will be freed when this structure is freed. */
-	void			       *base;
-	size_t				baselen;
-} lwres_gnbaresponse_t;
-
-/*
- * get rdata by name
- */
-#define LWRES_OPCODE_GETRDATABYNAME	0x00010003U
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint16_t			rdclass;
-	lwres_uint16_t			rdtype;
-	lwres_uint16_t			namelen;
-	char			       *name;
-} lwres_grbnrequest_t;
-
-typedef struct {
-	/* public */
-	lwres_uint32_t			flags;
-	lwres_uint16_t			rdclass;
-	lwres_uint16_t			rdtype;
-	lwres_uint32_t			ttl;
-	lwres_uint16_t			nrdatas;
-	lwres_uint16_t			nsigs;
-	char			       *realname;
-	lwres_uint16_t			realnamelen;
-	unsigned char		      **rdatas;
-	lwres_uint16_t		       *rdatalen;
-	unsigned char		      **sigs;
-	lwres_uint16_t		       *siglen;
-	/* if base != NULL, it will be freed when this structure is freed. */
-	void			       *base;
-	size_t				baselen;
-} lwres_grbnresponse_t;
-
-#define LWRDATA_VALIDATED	0x00000001
-
-/*
- * resolv.conf data
- */
-
-#define LWRES_CONFMAXNAMESERVERS 3	/* max 3 "nameserver" entries */
-#define LWRES_CONFMAXLWSERVERS 1	/* max 1 "lwserver" entry */
-#define LWRES_CONFMAXSEARCH 8		/* max 8 domains in "search" entry */
-#define LWRES_CONFMAXLINELEN 256	/* max size of a line */
-#define LWRES_CONFMAXSORTLIST 10
-typedef struct {
-	lwres_context_t *lwctx;
-	lwres_addr_t    nameservers[LWRES_CONFMAXNAMESERVERS];
-	lwres_uint8_t	nsnext;		/* index for next free slot */
-
-	lwres_addr_t	lwservers[LWRES_CONFMAXLWSERVERS];
-	lwres_uint8_t	lwnext;		/* index for next free slot */
-
-	char	       *domainname;
-
-	char 	       *search[LWRES_CONFMAXSEARCH];
-	lwres_uint8_t	searchnxt;	/* index for next free slot */
-
-	struct {
-		lwres_addr_t addr;
-		/* mask has a non-zero 'family' and 'length' if set */
-		lwres_addr_t mask;
-	} sortlist[LWRES_CONFMAXSORTLIST];
-	lwres_uint8_t	sortlistnxt;
-
-	lwres_uint8_t	resdebug;      /* non-zero if 'options debug' set */
-	lwres_uint8_t	ndots;	       /* set to n in 'options ndots:n' */
-	lwres_uint8_t	no_tld_query;  /* non-zero if 'options no_tld_query' */
-} lwres_conf_t;
-
-#define LWRES_ADDRTYPE_V4		0x00000001U	/* ipv4 */
-#define LWRES_ADDRTYPE_V6		0x00000002U	/* ipv6 */
-
-#define LWRES_MAX_ALIASES		16		/* max # of aliases */
-#define LWRES_MAX_ADDRS			64		/* max # of addrs */
-
-LWRES_LANG_BEGINDECLS
-
-/*
- * This is in host byte order.
- */
-LIBLWRES_EXTERNAL_DATA extern lwres_uint16_t lwres_udp_port;
-
-LIBLWRES_EXTERNAL_DATA extern const char *lwres_resolv_conf;
-
-lwres_result_t
-lwres_gabnrequest_render(lwres_context_t *ctx, lwres_gabnrequest_t *req,
-			 lwres_lwpacket_t *pkt, lwres_buffer_t *b);
-
-lwres_result_t
-lwres_gabnresponse_render(lwres_context_t *ctx, lwres_gabnresponse_t *req,
-			  lwres_lwpacket_t *pkt, lwres_buffer_t *b);
-
-lwres_result_t
-lwres_gabnrequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
-			lwres_lwpacket_t *pkt, lwres_gabnrequest_t **structp);
-
-lwres_result_t
-lwres_gabnresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
-			 lwres_lwpacket_t *pkt,
-			 lwres_gabnresponse_t **structp);
-
-void
-lwres_gabnrequest_free(lwres_context_t *ctx, lwres_gabnrequest_t **structp);
-/*
- * Frees any dynamically allocated memory for this structure.
- *
- * Requires:
- *
- *	ctx != NULL, and be a context returned via lwres_contextcreate().
- *
- *	structp != NULL && *structp != NULL.
- *
- * Ensures:
- *
- *	*structp == NULL.
- *
- *	All memory allocated by this structure will be returned to the
- *	system via the context's free function.
- */
-
-void
-lwres_gabnresponse_free(lwres_context_t *ctx, lwres_gabnresponse_t **structp);
-/*
- * Frees any dynamically allocated memory for this structure.
- *
- * Requires:
- *
- *	ctx != NULL, and be a context returned via lwres_contextcreate().
- *
- *	structp != NULL && *structp != NULL.
- *
- * Ensures:
- *
- *	*structp == NULL.
- *
- *	All memory allocated by this structure will be returned to the
- *	system via the context's free function.
- */
-
-
-lwres_result_t
-lwres_gnbarequest_render(lwres_context_t *ctx, lwres_gnbarequest_t *req,
-			 lwres_lwpacket_t *pkt, lwres_buffer_t *b);
-
-lwres_result_t
-lwres_gnbaresponse_render(lwres_context_t *ctx, lwres_gnbaresponse_t *req,
-			  lwres_lwpacket_t *pkt, lwres_buffer_t *b);
-
-lwres_result_t
-lwres_gnbarequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
-			lwres_lwpacket_t *pkt, lwres_gnbarequest_t **structp);
-
-lwres_result_t
-lwres_gnbaresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
-			 lwres_lwpacket_t *pkt,
-			 lwres_gnbaresponse_t **structp);
-
-void
-lwres_gnbarequest_free(lwres_context_t *ctx, lwres_gnbarequest_t **structp);
-/*
- * Frees any dynamically allocated memory for this structure.
- *
- * Requires:
- *
- *	ctx != NULL, and be a context returned via lwres_contextcreate().
- *
- *	structp != NULL && *structp != NULL.
- *
- * Ensures:
- *
- *	*structp == NULL.
- *
- *	All memory allocated by this structure will be returned to the
- *	system via the context's free function.
- */
-
-void
-lwres_gnbaresponse_free(lwres_context_t *ctx, lwres_gnbaresponse_t **structp);
-/*
- * Frees any dynamically allocated memory for this structure.
- *
- * Requires:
- *
- *	ctx != NULL, and be a context returned via lwres_contextcreate().
- *
- *	structp != NULL && *structp != NULL.
- *
- * Ensures:
- *
- *	*structp == NULL.
- *
- *	All memory allocated by this structure will be returned to the
- *	system via the context's free function.
- */
-
-lwres_result_t
-lwres_grbnrequest_render(lwres_context_t *ctx, lwres_grbnrequest_t *req,
-			 lwres_lwpacket_t *pkt, lwres_buffer_t *b);
-
-lwres_result_t
-lwres_grbnresponse_render(lwres_context_t *ctx, lwres_grbnresponse_t *req,
-			  lwres_lwpacket_t *pkt, lwres_buffer_t *b);
-
-lwres_result_t
-lwres_grbnrequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
-			lwres_lwpacket_t *pkt, lwres_grbnrequest_t **structp);
-
-lwres_result_t
-lwres_grbnresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
-			 lwres_lwpacket_t *pkt,
-			 lwres_grbnresponse_t **structp);
-
-void
-lwres_grbnrequest_free(lwres_context_t *ctx, lwres_grbnrequest_t **structp);
-/*
- * Frees any dynamically allocated memory for this structure.
- *
- * Requires:
- *
- *	ctx != NULL, and be a context returned via lwres_contextcreate().
- *
- *	structp != NULL && *structp != NULL.
- *
- * Ensures:
- *
- *	*structp == NULL.
- *
- *	All memory allocated by this structure will be returned to the
- *	system via the context's free function.
- */
-
-void
-lwres_grbnresponse_free(lwres_context_t *ctx, lwres_grbnresponse_t **structp);
-/*
- * Frees any dynamically allocated memory for this structure.
- *
- * Requires:
- *
- *	ctx != NULL, and be a context returned via lwres_contextcreate().
- *
- *	structp != NULL && *structp != NULL.
- *
- * Ensures:
- *
- *	*structp == NULL.
- *
- *	All memory allocated by this structure will be returned to the
- *	system via the context's free function.
- */
-
-lwres_result_t
-lwres_nooprequest_render(lwres_context_t *ctx, lwres_nooprequest_t *req,
-			 lwres_lwpacket_t *pkt, lwres_buffer_t *b);
-/*
- * Allocate space and render into wire format a noop request packet.
- *
- * Requires:
- *
- *	ctx != NULL, and be a context returned via lwres_contextcreate().
- *
- *	b != NULL, and points to a lwres_buffer_t.  The contents of the
- *	buffer structure will be initialized to contain the wire-format
- *	noop request packet.
- *
- *	Caller needs to fill in parts of "pkt" before calling:
- *		serial, maxrecv, result.
- *
- * Returns:
- *
- *	Returns 0 on success, non-zero on failure.
- *
- *	On successful return, *b will contain data about the wire-format
- *	packet.  It can be transmitted in any way, including lwres_sendblock().
- */
-
-lwres_result_t
-lwres_noopresponse_render(lwres_context_t *ctx, lwres_noopresponse_t *req,
-			  lwres_lwpacket_t *pkt, lwres_buffer_t *b);
-
-lwres_result_t
-lwres_nooprequest_parse(lwres_context_t *ctx, lwres_buffer_t *b,
-			lwres_lwpacket_t *pkt, lwres_nooprequest_t **structp);
-/*
- * Parse a noop request.  Note that to get here, the lwpacket must have
- * already been parsed and removed by the caller, otherwise it would be
- * pretty hard for it to know this is the right function to call.
- *
- * The function verifies bits of the header, but does not modify it.
- */
-
-lwres_result_t
-lwres_noopresponse_parse(lwres_context_t *ctx, lwres_buffer_t *b,
-			 lwres_lwpacket_t *pkt,
-			 lwres_noopresponse_t **structp);
-
-void
-lwres_nooprequest_free(lwres_context_t *ctx, lwres_nooprequest_t **structp);
-
-void
-lwres_noopresponse_free(lwres_context_t *ctx, lwres_noopresponse_t **structp);
-
-/*
- * Frees any dynamically allocated memory for this structure.
- *
- * Requires:
- *
- *	ctx != NULL, and be a context returned via lwres_contextcreate().
- *
- *	structp != NULL && *structp != NULL.
- *
- * Ensures:
- *
- *	*structp == NULL.
- *
- *	All memory allocated by this structure will be returned to the
- *	system via the context's free function.
- */
-
-lwres_result_t
-lwres_conf_parse(lwres_context_t *ctx, const char *filename);
-/*
- * parses a resolv.conf-format file and stores the results in the structure
- * pointed to by *ctx.
- *
- * Requires:
- *	ctx != NULL
- *	filename != NULL && strlen(filename) > 0
- *
- * Returns:
- *	LWRES_R_SUCCESS on a successful parse.
- *	Anything else on error, although the structure may be partially filled
- *	in.
- */
-
-lwres_result_t
-lwres_conf_print(lwres_context_t *ctx, FILE *fp);
-/*
- * Prints a resolv.conf-format of confdata output to fp.
- *
- * Requires:
- *	ctx != NULL
- */
-
-void
-lwres_conf_init(lwres_context_t *ctx);
-/*
- * sets all internal fields to a default state. Used to initialize a new
- * lwres_conf_t structure (not reset a used on).
- *
- * Requires:
- *	ctx != NULL
- */
-
-void
-lwres_conf_clear(lwres_context_t *ctx);
-/*
- * frees all internally allocated memory in confdata. Uses the memory
- * routines supplied by ctx.
- *
- * Requires:
- *	ctx != NULL
- */
-
-lwres_conf_t *
-lwres_conf_get(lwres_context_t *ctx);
-/*
- * returns a pointer to the current config structure.
- * Be extremely cautions in modifying the contents of this structure; it
- * needs an API to return the various bits of data, walk lists, etc.
- *
- * Requires:
- *	ctx != NULL
- */
-
-/*
- * Helper functions
- */
-
-lwres_result_t
-lwres_data_parse(lwres_buffer_t *b, unsigned char **p, lwres_uint16_t *len);
-
-lwres_result_t
-lwres_string_parse(lwres_buffer_t *b, char **c, lwres_uint16_t *len);
-
-lwres_result_t
-lwres_addr_parse(lwres_buffer_t *b, lwres_addr_t *addr);
-
-lwres_result_t
-lwres_getaddrsbyname(lwres_context_t *ctx, const char *name,
-		     lwres_uint32_t addrtypes, lwres_gabnresponse_t **structp);
-
-lwres_result_t
-lwres_getnamebyaddr(lwres_context_t *ctx, lwres_uint32_t addrtype,
-		    lwres_uint16_t addrlen, const unsigned char *addr,
-		    lwres_gnbaresponse_t **structp);
-
-lwres_result_t
-lwres_getrdatabyname(lwres_context_t *ctx, const char *name,
-		     lwres_uint16_t rdclass, lwres_uint16_t rdtype,
-		     lwres_uint32_t flags, lwres_grbnresponse_t **structp);
-
-LWRES_LANG_ENDDECLS
-
-#endif /* LWRES_LWRES_H */
diff --git a/include.new/lwres/net.h b/include.new/lwres/net.h
deleted file mode 100644
index 0dc458d..0000000
--- a/include.new/lwres/net.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000-2002  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: net.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_NET_H
-#define LWRES_NET_H 1
-
-/*****
- ***** Module Info
- *****/
-
-/*
- * Basic Networking Types
- *
- * This module is responsible for defining the following basic networking
- * types:
- *
- *		struct in_addr
- *		struct in6_addr
- *		struct sockaddr
- *		struct sockaddr_in
- *		struct sockaddr_in6
- *
- * It ensures that the AF_ and PF_ macros are defined.
- *
- * It declares ntoh[sl]() and hton[sl]().
- *
- * It declares lwres_net_aton(), lwres_net_ntop(), and lwres_net_pton().
- *
- * It ensures that INADDR_LOOPBACK, INADDR_ANY and IN6ADDR_ANY_INIT
- * are defined.
- */
-
-/***
- *** Imports.
- ***/
-
-#include <lwres/platform.h>	/* Required for LWRES_PLATFORM_*. */
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>		/* Contractual promise. */
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <sys/un.h>
-
-#include <netinet/in.h>		/* Contractual promise. */
-#include <arpa/inet.h>		/* Contractual promise. */
-#ifdef LWRES_PLATFORM_NEEDNETINETIN6H
-#include <netinet/in6.h>	/* Required on UnixWare. */
-#endif
-#ifdef LWRES_PLATFORM_NEEDNETINET6IN6H
-#include <netinet6/in6.h>	/* Required on BSD/OS for in6_pktinfo. */
-#endif
-#include <net/if.h>	
-
-#include <lwres/lang.h>
-
-#ifndef LWRES_PLATFORM_HAVEIPV6
-#include <lwres/ipv6.h>		/* Contractual promise. */
-#endif
-
-#ifdef LWRES_PLATFORM_HAVEINADDR6
-#define in6_addr in_addr6	/* Required for pre RFC2133 implementations. */
-#endif
-
-/*
- * Required for some pre RFC2133 implementations.
- * IN6ADDR_ANY_INIT and IN6ADDR_LOOPBACK_INIT were added in
- * draft-ietf-ipngwg-bsd-api-04.txt or draft-ietf-ipngwg-bsd-api-05.txt.  
- * If 's6_addr' is defined then assume that there is a union and three
- * levels otherwise assume two levels required.
- */
-#ifndef IN6ADDR_ANY_INIT
-#ifdef s6_addr
-#define IN6ADDR_ANY_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } }
-#else
-#define IN6ADDR_ANY_INIT { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } }
-#endif
-#endif
-
-#ifndef IN6ADDR_LOOPBACK_INIT
-#ifdef s6_addr
-#define IN6ADDR_LOOPBACK_INIT { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } } }
-#else
-#define IN6ADDR_LOOPBACK_INIT { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } }
-#endif
-#endif
-
-#ifndef AF_INET6
-#define AF_INET6 99
-#endif
-
-#ifndef PF_INET6
-#define PF_INET6 AF_INET6
-#endif
-
-#ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK 0x7f000001UL
-#endif
-
-LWRES_LANG_BEGINDECLS
-
-const char *
-lwres_net_ntop(int af, const void *src, char *dst, size_t size);
-
-int
-lwres_net_pton(int af, const char *src, void *dst);
-
-int
-lwres_net_aton(const char *cp, struct in_addr *addr);
-
-LWRES_LANG_ENDDECLS
-
-#endif /* LWRES_NET_H */
diff --git a/include.new/lwres/netdb.h b/include.new/lwres/netdb.h
deleted file mode 100644
index 192867e..0000000
--- a/include.new/lwres/netdb.h
+++ /dev/null
@@ -1,520 +0,0 @@
-/* $FreeBSD: src/lib/bind/lwres/lwres/netdb.h,v 1.1 2004/09/21 19:01:44 des Exp $ */
-
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: netdb.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_NETDB_H
-#define LWRES_NETDB_H 1
-
-#include <stddef.h>	/* Required on FreeBSD (and  others?) for size_t. */
-#include <netdb.h>	/* Contractual provision. */
-
-#include <lwres/lang.h>
-
-/*
- * Define if <netdb.h> does not declare struct addrinfo.
- */
-#undef ISC_LWRES_NEEDADDRINFO
-
-#ifdef ISC_LWRES_NEEDADDRINFO
-struct addrinfo {
-	int		ai_flags;      /* AI_PASSIVE, AI_CANONNAME */
-	int		ai_family;     /* PF_xxx */
-	int		ai_socktype;   /* SOCK_xxx */
-	int		ai_protocol;   /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-	size_t		ai_addrlen;    /* Length of ai_addr */
-	char		*ai_canonname; /* Canonical name for hostname */
-	struct sockaddr	*ai_addr;      /* Binary address */
-	struct addrinfo	*ai_next;      /* Next structure in linked list */
-};
-#endif
-
-/*
- * Undefine all #defines we are interested in as <netdb.h> may or may not have
- * defined them.
- */
-
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (left in extern int h_errno).
- */
-
-#undef	NETDB_INTERNAL
-#undef	NETDB_SUCCESS
-#undef	HOST_NOT_FOUND
-#undef	TRY_AGAIN
-#undef	NO_RECOVERY
-#undef	NO_DATA
-#undef	NO_ADDRESS
-
-#define	NETDB_INTERNAL	-1	/* see errno */
-#define	NETDB_SUCCESS	0	/* no problem */
-#define	HOST_NOT_FOUND	1 /* Authoritative Answer Host not found */
-#define	TRY_AGAIN	2 /* Non-Authoritive Host not found, or SERVERFAIL */
-#define	NO_RECOVERY	3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define	NO_DATA		4 /* Valid name, no data record of requested type */
-#define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
-
-/*
- * Error return codes from getaddrinfo()
- */
-
-#undef	EAI_ADDRFAMILY
-#undef	EAI_AGAIN
-#undef	EAI_BADFLAGS
-#undef	EAI_FAIL
-#undef	EAI_FAMILY
-#undef	EAI_MEMORY
-#undef	EAI_NODATA
-#undef	EAI_NONAME
-#undef	EAI_SERVICE
-#undef	EAI_SOCKTYPE
-#undef	EAI_SYSTEM
-#undef	EAI_BADHINTS
-#undef	EAI_PROTOCOL
-#undef	EAI_MAX
-
-#define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
-#define	EAI_AGAIN	 2	/* temporary failure in name resolution */
-#define	EAI_BADFLAGS	 3	/* invalid value for ai_flags */
-#define	EAI_FAIL	 4	/* non-recoverable failure in name resolution */
-#define	EAI_FAMILY	 5	/* ai_family not supported */
-#define	EAI_MEMORY	 6	/* memory allocation failure */
-#define	EAI_NODATA	 7	/* no address associated with hostname */
-#define	EAI_NONAME	 8	/* hostname nor servname provided, or not known */
-#define	EAI_SERVICE	 9	/* servname not supported for ai_socktype */
-#define	EAI_SOCKTYPE	10	/* ai_socktype not supported */
-#define	EAI_SYSTEM	11	/* system error returned in errno */
-#define EAI_BADHINTS	12
-#define EAI_PROTOCOL	13
-#define EAI_MAX		14
-
-/*
- * Flag values for getaddrinfo()
- */
-#undef	AI_PASSIVE
-#undef	AI_CANONNAME
-#undef	AI_NUMERICHOST
-
-#define	AI_PASSIVE	0x00000001
-#define	AI_CANONNAME	0x00000002
-#define AI_NUMERICHOST	0x00000004
-
-/*
- * Flag values for getipnodebyname()
- */
-#undef AI_V4MAPPED
-#undef AI_ALL
-#undef AI_ADDRCONFIG
-#undef AI_DEFAULT
-
-#define AI_V4MAPPED	0x00000008
-#define AI_ALL		0x00000010
-#define AI_ADDRCONFIG	0x00000020
-#define AI_DEFAULT	(AI_V4MAPPED|AI_ADDRCONFIG)
-
-/*
- * Constants for lwres_getnameinfo()
- */
-#undef	NI_MAXHOST
-#undef	NI_MAXSERV
-
-#define	NI_MAXHOST	1025
-#define	NI_MAXSERV	32
-
-/*
- * Flag values for lwres_getnameinfo()
- */
-#undef	NI_NOFQDN
-#undef	NI_NUMERICHOST
-#undef	NI_NAMEREQD
-#undef	NI_NUMERICSERV
-#undef	NI_DGRAM
-#undef	NI_NUMERICSCOPE
-
-#define	NI_NOFQDN	0x00000001
-#define	NI_NUMERICHOST	0x00000002
-#define	NI_NAMEREQD	0x00000004
-#define	NI_NUMERICSERV	0x00000008
-#define	NI_DGRAM	0x00000010
-#define	NI_NUMERICSCOPE	0x00000020	/*2553bis-00*/
-
-/*
- * Define if <netdb.h> does not declare struct rrsetinfo.
- */
-#define ISC_LWRES_NEEDRRSETINFO 1
-
-#ifdef ISC_LWRES_NEEDRRSETINFO
-/*
- * Structures for getrrsetbyname()
- */
-struct rdatainfo {
-	unsigned int		rdi_length;
-	unsigned char		*rdi_data;
-};
-
-struct rrsetinfo {
-	unsigned int		rri_flags;
-	int			rri_rdclass;
-	int			rri_rdtype;
-	unsigned int		rri_ttl;
-	unsigned int		rri_nrdatas;
-	unsigned int		rri_nsigs;
-	char			*rri_name;
-	struct rdatainfo	*rri_rdatas;
-	struct rdatainfo	*rri_sigs;
-};
-
-/*
- * Flags for getrrsetbyname()
- */
-#define RRSET_VALIDATED		0x00000001
-	/* Set was dnssec validated */
-
-/*
- * Return codes for getrrsetbyname()
- */
-#define ERRSET_SUCCESS		0
-#define ERRSET_NOMEMORY		1
-#define ERRSET_FAIL		2
-#define ERRSET_INVAL		3
-#define	ERRSET_NONAME	 	4
-#define	ERRSET_NODATA	 	5
-#endif
-
-/*
- * Define to map into lwres_ namespace.
- */
-
-#define LWRES_NAMESPACE
-
-#ifdef LWRES_NAMESPACE
-
-/*
- * Use our versions not the ones from the C library.
- */
-
-#ifdef getnameinfo
-#undef getnameinfo
-#endif
-#define getnameinfo lwres_getnameinfo
-
-#ifdef getaddrinfo
-#undef getaddrinfo
-#endif
-#define getaddrinfo lwres_getaddrinfo
-
-#ifdef freeaddrinfo
-#undef freeaddrinfo
-#endif
-#define freeaddrinfo lwres_freeaddrinfo
-
-#ifdef gai_strerror
-#undef gai_strerror
-#endif
-#define gai_strerror lwres_gai_strerror
-
-#ifdef herror
-#undef herror
-#endif
-#define herror lwres_herror
-
-#ifdef hstrerror
-#undef hstrerror
-#endif
-#define hstrerror lwres_hstrerror
-
-#ifdef getipnodebyname
-#undef getipnodebyname
-#endif
-#define getipnodebyname lwres_getipnodebyname
-
-#ifdef getipnodebyaddr
-#undef getipnodebyaddr
-#endif
-#define getipnodebyaddr lwres_getipnodebyaddr
-
-#ifdef freehostent
-#undef freehostent
-#endif
-#define freehostent lwres_freehostent
-
-#ifdef gethostbyname
-#undef gethostbyname
-#endif
-#define gethostbyname lwres_gethostbyname
-
-#ifdef gethostbyname2
-#undef gethostbyname2
-#endif
-#define gethostbyname2 lwres_gethostbyname2
-
-#ifdef gethostbyaddr
-#undef gethostbyaddr
-#endif
-#define gethostbyaddr lwres_gethostbyaddr
-
-#ifdef gethostent
-#undef gethostent
-#endif
-#define gethostent lwres_gethostent
-
-#ifdef sethostent
-#undef sethostent
-#endif
-#define sethostent lwres_sethostent
-
-#ifdef endhostent
-#undef endhostent
-#endif
-#define endhostent lwres_endhostent
-
-/* #define sethostfile lwres_sethostfile */
-
-#ifdef gethostbyname_r
-#undef gethostbyname_r
-#endif
-#define gethostbyname_r lwres_gethostbyname_r
-
-#ifdef gethostbyaddr_r
-#undef gethostbyaddr_r
-#endif
-#define gethostbyaddr_r lwres_gethostbyaddr_r
-
-#ifdef gethostent_r
-#undef gethostent_r
-#endif
-#define gethostent_r lwres_gethostent_r
-
-#ifdef sethostent_r
-#undef sethostent_r
-#endif
-#define sethostent_r lwres_sethostent_r
-
-#ifdef endhostent_r
-#undef endhostent_r
-#endif
-#define endhostent_r lwres_endhostent_r
-
-#ifdef getrrsetbyname
-#undef getrrsetbyname
-#endif
-#define getrrsetbyname lwres_getrrsetbyname
-
-#ifdef freerrset
-#undef freerrset
-#endif
-#define freerrset lwres_freerrset
-
-#ifdef notyet
-#define getservbyname lwres_getservbyname
-#define getservbyport lwres_getservbyport
-#define getservent lwres_getservent
-#define setservent lwres_setservent
-#define endservent lwres_endservent
-
-#define getservbyname_r lwres_getservbyname_r
-#define getservbyport_r lwres_getservbyport_r
-#define getservent_r lwres_getservent_r
-#define setservent_r lwres_setservent_r
-#define endservent_r lwres_endservent_r
-
-#define getprotobyname lwres_getprotobyname
-#define getprotobynumber lwres_getprotobynumber
-#define getprotoent lwres_getprotoent
-#define setprotoent lwres_setprotoent
-#define endprotoent lwres_endprotoent
-
-#define getprotobyname_r lwres_getprotobyname_r
-#define getprotobynumber_r lwres_getprotobynumber_r
-#define getprotoent_r lwres_getprotoent_r
-#define setprotoent_r lwres_setprotoent_r
-#define endprotoent_r lwres_endprotoent_r
-
-#ifdef getnetbyname
-#undef getnetbyname
-#endif
-#define getnetbyname lwres_getnetbyname
-
-#ifdef getnetbyaddr
-#undef getnetbyaddr
-#endif
-#define getnetbyaddr lwres_getnetbyaddr
-
-#ifdef getnetent
-#undef getnetent
-#endif
-#define getnetent lwres_getnetent
-
-#ifdef setnetent
-#undef setnetent
-#endif
-#define setnetent lwres_setnetent
-
-#ifdef endnetent
-#undef endnetent
-#endif
-#define endnetent lwres_endnetent
-
-
-#ifdef getnetbyname_r
-#undef getnetbyname_r
-#endif
-#define getnetbyname_r lwres_getnetbyname_r
-
-#ifdef getnetbyaddr_r
-#undef getnetbyaddr_r
-#endif
-#define getnetbyaddr_r lwres_getnetbyaddr_r
-
-#ifdef getnetent_r
-#undef getnetent_r
-#endif
-#define getnetent_r lwres_getnetent_r
-
-#ifdef setnetent_r
-#undef setnetent_r
-#endif
-#define setnetent_r lwres_setnetent_r
-
-#ifdef endnetent_r
-#undef endnetent_r
-#endif
-#define endnetent_r lwres_endnetent_r
-#endif	/* notyet */
-
-#ifdef h_errno
-#undef h_errno
-#endif
-#define h_errno lwres_h_errno
-
-#endif	/* LWRES_NAMESPACE */
-
-LWRES_LANG_BEGINDECLS
-
-extern int lwres_h_errno;
-
-int		lwres_getaddrinfo(const char *, const char *,
-				 const struct addrinfo *, struct addrinfo **);
-int		lwres_getnameinfo(const struct sockaddr *, size_t, char *,
-				 size_t, char *, size_t, int);
-void		lwres_freeaddrinfo(struct addrinfo *);
-char		*lwres_gai_strerror(int);
-
-struct hostent	*lwres_gethostbyaddr(const char *, int, int);
-struct hostent	*lwres_gethostbyname(const char *);
-struct hostent	*lwres_gethostbyname2(const char *, int);
-struct hostent	*lwres_gethostent(void);
-struct hostent	*lwres_getipnodebyname(const char *, int, int, int *);
-struct hostent	*lwres_getipnodebyaddr(const void *, size_t, int, int *);
-void		lwres_endhostent(void);
-void		lwres_sethostent(int);
-/* void		lwres_sethostfile(const char *); */
-void		lwres_freehostent(struct hostent *);
-
-int		lwres_getrrsetbyname(const char *, unsigned int, unsigned int,
-				     unsigned int, struct rrsetinfo **);
-void		lwres_freerrset(struct rrsetinfo *);
-
-#ifdef notyet
-struct netent	*lwres_getnetbyaddr(unsigned long, int);
-struct netent	*lwres_getnetbyname(const char *);
-struct netent	*lwres_getnetent(void);
-void		lwres_endnetent(void);
-void		lwres_setnetent(int);
-
-struct protoent	*lwres_getprotobyname(const char *);
-struct protoent	*lwres_getprotobynumber(int);
-struct protoent	*lwres_getprotoent(void);
-void		lwres_endprotoent(void);
-void		lwres_setprotoent(int);
-
-struct servent	*lwres_getservbyname(const char *, const char *);
-struct servent	*lwres_getservbyport(int, const char *);
-struct servent	*lwres_getservent(void);
-void		lwres_endservent(void);
-void		lwres_setservent(int);
-#endif /* notyet */
-
-void		lwres_herror(const char *);
-const char	*lwres_hstrerror(int);
-
-
-struct hostent	*lwres_gethostbyaddr_r(const char *, int, int, struct hostent *,
-					char *, int, int *);
-struct hostent	*lwres_gethostbyname_r(const char *, struct hostent *,
-					char *, int, int *);
-struct hostent	*lwres_gethostent_r(struct hostent *, char *, int, int *);
-void		lwres_sethostent_r(int);
-void		lwres_endhostent_r(void);
-
-#ifdef notyet
-struct netent	*lwres_getnetbyname_r(const char *, struct netent *,
-					char *, int);
-struct netent	*lwres_getnetbyaddr_r(long, int, struct netent *,
-					char *, int);
-struct netent	*lwres_getnetent_r(struct netent *, char *, int);
-void		lwres_setnetent_r(int);
-void		lwres_endnetent_r(void);
-
-struct protoent	*lwres_getprotobyname_r(const char *,
-				struct protoent *, char *, int);
-struct protoent	*lwres_getprotobynumber_r(int,
-				struct protoent *, char *, int);
-struct protoent	*lwres_getprotoent_r(struct protoent *, char *, int);
-void		lwres_setprotoent_r(int);
-void		lwres_endprotoent_r(void);
-
-struct servent	*lwres_getservbyname_r(const char *name, const char *,
-					struct servent *, char *, int);
-struct servent	*lwres_getservbyport_r(int port, const char *,
-					struct servent *, char *, int);
-struct servent	*lwres_getservent_r(struct servent *, char *, int);
-void		lwres_setservent_r(int);
-void		lwres_endservent_r(void);
-#endif	/* notyet */
-
-LWRES_LANG_ENDDECLS
-
-#ifdef notyet
-/* This is nec'y to make this include file properly replace the sun version. */
-#ifdef sun
-#ifdef __GNU_LIBRARY__
-#include <rpc/netdb.h>		/* Required. */
-#else /* !__GNU_LIBRARY__ */
-struct rpcent {
-	char	*r_name;	/* name of server for this rpc program */
-	char	**r_aliases;	/* alias list */
-	int	r_number;	/* rpc program number */
-};
-struct rpcent	*lwres_getrpcbyname();
-struct rpcent	*lwres_getrpcbynumber(),
-struct rpcent	*lwres_getrpcent();
-#endif /* __GNU_LIBRARY__ */
-#endif /* sun */
-#endif /* notyet */
-
-/*
- * Tell Emacs to use C mode on this file.
- * Local variables:
- * mode: c
- * End:
- */
-
-#endif /* LWRES_NETDB_H */
diff --git a/include.new/lwres/platform.h b/include.new/lwres/platform.h
deleted file mode 100644
index 4943741..0000000
--- a/include.new/lwres/platform.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $FreeBSD: src/lib/bind/lwres/lwres/platform.h,v 1.1.4.1 2006/01/14 10:13:50 dougb Exp $ */
-
-/*
- * Copyright (C) 2004, 2005  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: platform.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_PLATFORM_H
-#define LWRES_PLATFORM_H 1
-
-/*****
- ***** Platform-dependent defines.
- *****/
-
-/***
- *** Network.
- ***/
-
-/*
- * Define if this system needs the <netinet/in6.h> header file for IPv6.
- */
-#undef LWRES_PLATFORM_NEEDNETINETIN6H
-
-/*
- * Define if this system needs the <netinet6/in6.h> header file for IPv6.
- */
-#undef LWRES_PLATFORM_NEEDNETINET6IN6H
-
-/*
- * If sockaddrs on this system have an sa_len field, LWRES_PLATFORM_HAVESALEN
- * will be defined.
- */
-#define LWRES_PLATFORM_HAVESALEN 1
-
-/*
- * If this system has the IPv6 structure definitions, LWRES_PLATFORM_HAVEIPV6
- * will be defined.
- */
-#define LWRES_PLATFORM_HAVEIPV6 1
-
-/*
- * If this system is missing in6addr_any, LWRES_PLATFORM_NEEDIN6ADDRANY will
- * be defined.
- */
-#undef LWRES_PLATFORM_NEEDIN6ADDRANY
-
-/*
- * If this system is missing in6addr_loopback, 
- * LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK will be defined.
- */
-#undef LWRES_PLATFORM_NEEDIN6ADDRLOOPBACK
-
-/*
- * If this system has in_addr6, rather than in6_addr,
- * LWRES_PLATFORM_HAVEINADDR6 will be defined.
- */
-#undef LWRES_PLATFORM_HAVEINADDR6
-
-/*
- * Defined if unistd.h does not cause fd_set to be delared.
- */
-#undef LWRES_PLATFORM_NEEDSYSSELECTH
-
-/*
- * Used to control how extern data is linked; needed for Win32 platforms.
- */
-#undef LWRES_PLATFORM_USEDECLSPEC
-
-/*
- * Defined this system needs vsnprintf() and snprintf().
- */
-#undef LWRES_PLATFORM_NEEDVSNPRINTF
- 
-/*
- * If this system need a modern sprintf() that returns (int) not (char*).
- */
-#undef LWRES_PLATFORM_NEEDSPRINTF
-
-/*
- * The printf format string modifier to use with lwres_uint64_t values.
- */
-#define LWRES_PLATFORM_QUADFORMAT "ll"
-
-/*! \brief
- * Define if this system needs strtoul.
- */
-#undef ISC_PLATFORM_NEEDSTRTOUL
-
-#ifndef LWRES_PLATFORM_USEDECLSPEC
-#define LIBLWRES_EXTERNAL_DATA
-#else
-#ifdef LIBLWRES_EXPORTS
-#define LIBLWRES_EXTERNAL_DATA __declspec(dllexport)
-#else
-#define LIBLWRES_EXTERNAL_DATA __declspec(dllimport)
-#endif
-#endif
-
-#endif /* LWRES_PLATFORM_H */
diff --git a/include.new/lwres/result.h b/include.new/lwres/result.h
deleted file mode 100644
index 6b92707..0000000
--- a/include.new/lwres/result.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: result.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#ifndef LWRES_RESULT_H
-#define LWRES_RESULT_H 1
-
-typedef unsigned int lwres_result_t;
-
-#define LWRES_R_SUCCESS			0
-#define LWRES_R_NOMEMORY		1
-#define LWRES_R_TIMEOUT			2
-#define LWRES_R_NOTFOUND		3
-#define LWRES_R_UNEXPECTEDEND		4	/* unexpected end of input */
-#define LWRES_R_FAILURE			5	/* generic failure */
-#define LWRES_R_IOERROR			6
-#define LWRES_R_NOTIMPLEMENTED		7
-#define LWRES_R_UNEXPECTED		8
-#define LWRES_R_TRAILINGDATA		9
-#define LWRES_R_INCOMPLETE		10
-#define LWRES_R_RETRY			11
-#define LWRES_R_TYPENOTFOUND		12
-#define LWRES_R_TOOLARGE		13
-
-#endif /* LWRES_RESULT_H */
diff --git a/include.new/lwres/version.h b/include.new/lwres/version.h
deleted file mode 100644
index 73232d2..0000000
--- a/include.new/lwres/version.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: version.h 88 2016-01-12 00:11:29Z reddawg $ */
-
-#include <lwres/platform.h>
-
-LIBLWRES_EXTERNAL_DATA extern const char lwres_version[];
-
-LIBLWRES_EXTERNAL_DATA extern const unsigned int lwres_libinterface;
-LIBLWRES_EXTERNAL_DATA extern const unsigned int lwres_librevision;
-LIBLWRES_EXTERNAL_DATA extern const unsigned int lwres_libage;
diff --git a/include.new/lzma.h b/include.new/lzma.h
deleted file mode 100644
index fb874c3..0000000
--- a/include.new/lzma.h
+++ /dev/null
@@ -1,313 +0,0 @@
-/**
- * \file        api/lzma.h
- * \brief       The public API of liblzma data compression library
- *
- * liblzma is a public domain general-purpose data compression library with
- * a zlib-like API. The native file format is .xz, but also the old .lzma
- * format and raw (no headers) streams are supported. Multiple compression
- * algorithms (filters) are supported. Currently LZMA2 is the primary filter.
- *
- * liblzma is part of XZ Utils <http://tukaani.org/xz/>. XZ Utils includes
- * a gzip-like command line tool named xz and some other tools. XZ Utils
- * is developed and maintained by Lasse Collin.
- *
- * Major parts of liblzma are based on Igor Pavlov's public domain LZMA SDK
- * <http://7-zip.org/sdk.html>.
- *
- * The SHA-256 implementation is based on the public domain code found from
- * 7-Zip <http://7-zip.org/>, which has a modified version of the public
- * domain SHA-256 code found from Crypto++ <http://www.cryptopp.com/>.
- * The SHA-256 code in Crypto++ was written by Kevin Springle and Wei Dai.
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- */
-
-#ifndef LZMA_H
-#define LZMA_H
-
-/*****************************
- * Required standard headers *
- *****************************/
-
-/*
- * liblzma API headers need some standard types and macros. To allow
- * including lzma.h without requiring the application to include other
- * headers first, lzma.h includes the required standard headers unless
- * they already seem to be included already or if LZMA_MANUAL_HEADERS
- * has been defined.
- *
- * Here's what types and macros are needed and from which headers:
- *  - stddef.h: size_t, NULL
- *  - stdint.h: uint8_t, uint32_t, uint64_t, UINT32_C(n), uint64_C(n),
- *    UINT32_MAX, UINT64_MAX
- *
- * However, inttypes.h is a little more portable than stdint.h, although
- * inttypes.h declares some unneeded things compared to plain stdint.h.
- *
- * The hacks below aren't perfect, specifically they assume that inttypes.h
- * exists and that it typedefs at least uint8_t, uint32_t, and uint64_t,
- * and that, in case of incomplete inttypes.h, unsigned int is 32-bit.
- * If the application already takes care of setting up all the types and
- * macros properly (for example by using gnulib's stdint.h or inttypes.h),
- * we try to detect that the macros are already defined and don't include
- * inttypes.h here again. However, you may define LZMA_MANUAL_HEADERS to
- * force this file to never include any system headers.
- *
- * Some could argue that liblzma API should provide all the required types,
- * for example lzma_uint64, LZMA_UINT64_C(n), and LZMA_UINT64_MAX. This was
- * seen as an unnecessary mess, since most systems already provide all the
- * necessary types and macros in the standard headers.
- *
- * Note that liblzma API still has lzma_bool, because using stdbool.h would
- * break C89 and C++ programs on many systems. sizeof(bool) in C99 isn't
- * necessarily the same as sizeof(bool) in C++.
- */
-
-#ifndef LZMA_MANUAL_HEADERS
-	/*
-	 * I suppose this works portably also in C++. Note that in C++,
-	 * we need to get size_t into the global namespace.
-	 */
-#	include <stddef.h>
-
-	/*
-	 * Skip inttypes.h if we already have all the required macros. If we
-	 * have the macros, we assume that we have the matching typedefs too.
-	 */
-#	if !defined(UINT32_C) || !defined(UINT64_C) \
-			|| !defined(UINT32_MAX) || !defined(UINT64_MAX)
-		/*
-		 * MSVC has no C99 support, and thus it cannot be used to
-		 * compile liblzma. The liblzma API has to still be usable
-		 * from MSVC, so we need to define the required standard
-		 * integer types here.
-		 */
-#		if defined(_WIN32) && defined(_MSC_VER)
-			typedef unsigned __int8 uint8_t;
-			typedef unsigned __int32 uint32_t;
-			typedef unsigned __int64 uint64_t;
-#		else
-			/* Use the standard inttypes.h. */
-#			ifdef __cplusplus
-				/*
-				 * C99 sections 7.18.2 and 7.18.4 specify
-				 * that C++ implementations define the limit
-				 * and constant macros only if specifically
-				 * requested. Note that if you want the
-				 * format macros (PRIu64 etc.) too, you need
-				 * to define __STDC_FORMAT_MACROS before
-				 * including lzma.h, since re-including
-				 * inttypes.h with __STDC_FORMAT_MACROS
-				 * defined doesn't necessarily work.
-				 */
-#				ifndef __STDC_LIMIT_MACROS
-#					define __STDC_LIMIT_MACROS 1
-#				endif
-#				ifndef __STDC_CONSTANT_MACROS
-#					define __STDC_CONSTANT_MACROS 1
-#				endif
-#			endif
-
-#			include <inttypes.h>
-#		endif
-
-		/*
-		 * Some old systems have only the typedefs in inttypes.h, and
-		 * lack all the macros. For those systems, we need a few more
-		 * hacks. We assume that unsigned int is 32-bit and unsigned
-		 * long is either 32-bit or 64-bit. If these hacks aren't
-		 * enough, the application has to setup the types manually
-		 * before including lzma.h.
-		 */
-#		ifndef UINT32_C
-#			if defined(_WIN32) && defined(_MSC_VER)
-#				define UINT32_C(n) n ## UI32
-#			else
-#				define UINT32_C(n) n ## U
-#			endif
-#		endif
-
-#		ifndef UINT64_C
-#			if defined(_WIN32) && defined(_MSC_VER)
-#				define UINT64_C(n) n ## UI64
-#			else
-				/* Get ULONG_MAX. */
-#				include <limits.h>
-#				if ULONG_MAX == 4294967295UL
-#					define UINT64_C(n) n ## ULL
-#				else
-#					define UINT64_C(n) n ## UL
-#				endif
-#			endif
-#		endif
-
-#		ifndef UINT32_MAX
-#			define UINT32_MAX (UINT32_C(4294967295))
-#		endif
-
-#		ifndef UINT64_MAX
-#			define UINT64_MAX (UINT64_C(18446744073709551615))
-#		endif
-#	endif
-#endif /* ifdef LZMA_MANUAL_HEADERS */
-
-
-/******************
- * LZMA_API macro *
- ******************/
-
-/*
- * Some systems require that the functions and function pointers are
- * declared specially in the headers. LZMA_API_IMPORT is for importing
- * symbols and LZMA_API_CALL is to specify the calling convention.
- *
- * By default it is assumed that the application will link dynamically
- * against liblzma. #define LZMA_API_STATIC in your application if you
- * want to link against static liblzma. If you don't care about portability
- * to operating systems like Windows, or at least don't care about linking
- * against static liblzma on them, don't worry about LZMA_API_STATIC. That
- * is, most developers will never need to use LZMA_API_STATIC.
- *
- * The GCC variants are a special case on Windows (Cygwin and MinGW).
- * We rely on GCC doing the right thing with its auto-import feature,
- * and thus don't use __declspec(dllimport). This way developers don't
- * need to worry about LZMA_API_STATIC. Also the calling convention is
- * omitted on Cygwin but not on MinGW.
- */
-#ifndef LZMA_API_IMPORT
-#	if !defined(LZMA_API_STATIC) && defined(_WIN32) && !defined(__GNUC__)
-#		define LZMA_API_IMPORT __declspec(dllimport)
-#	else
-#		define LZMA_API_IMPORT
-#	endif
-#endif
-
-#ifndef LZMA_API_CALL
-#	if defined(_WIN32) && !defined(__CYGWIN__)
-#		define LZMA_API_CALL __cdecl
-#	else
-#		define LZMA_API_CALL
-#	endif
-#endif
-
-#ifndef LZMA_API
-#	define LZMA_API(type) LZMA_API_IMPORT type LZMA_API_CALL
-#endif
-
-
-/***********
- * nothrow *
- ***********/
-
-/*
- * None of the functions in liblzma may throw an exception. Even
- * the functions that use callback functions won't throw exceptions,
- * because liblzma would break if a callback function threw an exception.
- */
-#ifndef lzma_nothrow
-#	if defined(__cplusplus)
-#		define lzma_nothrow throw()
-#	elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)
-#		define lzma_nothrow __attribute__((__nothrow__))
-#	else
-#		define lzma_nothrow
-#	endif
-#endif
-
-
-/********************
- * GNU C extensions *
- ********************/
-
-/*
- * GNU C extensions are used conditionally in the public API. It doesn't
- * break anything if these are sometimes enabled and sometimes not, only
- * affects warnings and optimizations.
- */
-#if __GNUC__ >= 3
-#	ifndef lzma_attribute
-#		define lzma_attribute(attr) __attribute__(attr)
-#	endif
-
-	/* warn_unused_result was added in GCC 3.4. */
-#	ifndef lzma_attr_warn_unused_result
-#		if __GNUC__ == 3 && __GNUC_MINOR__ < 4
-#			define lzma_attr_warn_unused_result
-#		endif
-#	endif
-
-#else
-#	ifndef lzma_attribute
-#		define lzma_attribute(attr)
-#	endif
-#endif
-
-
-#ifndef lzma_attr_pure
-#	define lzma_attr_pure lzma_attribute((__pure__))
-#endif
-
-#ifndef lzma_attr_const
-#	define lzma_attr_const lzma_attribute((__const__))
-#endif
-
-#ifndef lzma_attr_warn_unused_result
-#	define lzma_attr_warn_unused_result \
-		lzma_attribute((__warn_unused_result__))
-#endif
-
-
-/**************
- * Subheaders *
- **************/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Subheaders check that this is defined. It is to prevent including
- * them directly from applications.
- */
-#define LZMA_H_INTERNAL 1
-
-/* Basic features */
-#include "lzma/version.h"
-#include "lzma/base.h"
-#include "lzma/vli.h"
-#include "lzma/check.h"
-
-/* Filters */
-#include "lzma/filter.h"
-#include "lzma/bcj.h"
-#include "lzma/delta.h"
-#include "lzma/lzma.h"
-
-/* Container formats */
-#include "lzma/container.h"
-
-/* Advanced features */
-#include "lzma/stream_flags.h"
-#include "lzma/block.h"
-#include "lzma/index.h"
-#include "lzma/index_hash.h"
-
-/* Hardware information */
-#include "lzma/hardware.h"
-
-/*
- * All subheaders included. Undefine LZMA_H_INTERNAL to prevent applications
- * re-including the subheaders.
- */
-#undef LZMA_H_INTERNAL
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ifndef LZMA_H */
diff --git a/include.new/lzma/base.h b/include.new/lzma/base.h
deleted file mode 100644
index 43dde8d..0000000
--- a/include.new/lzma/base.h
+++ /dev/null
@@ -1,601 +0,0 @@
-/**
- * \file        lzma/base.h
- * \brief       Data types and functions used in many places in liblzma API
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Boolean
- *
- * This is here because C89 doesn't have stdbool.h. To set a value for
- * variables having type lzma_bool, you can use
- *   - C99's `true' and `false' from stdbool.h;
- *   - C++'s internal `true' and `false'; or
- *   - integers one (true) and zero (false).
- */
-typedef unsigned char lzma_bool;
-
-
-/**
- * \brief       Type of reserved enumeration variable in structures
- *
- * To avoid breaking library ABI when new features are added, several
- * structures contain extra variables that may be used in future. Since
- * sizeof(enum) can be different than sizeof(int), and sizeof(enum) may
- * even vary depending on the range of enumeration constants, we specify
- * a separate type to be used for reserved enumeration variables. All
- * enumeration constants in liblzma API will be non-negative and less
- * than 128, which should guarantee that the ABI won't break even when
- * new constants are added to existing enumerations.
- */
-typedef enum {
-	LZMA_RESERVED_ENUM      = 0
-} lzma_reserved_enum;
-
-
-/**
- * \brief       Return values used by several functions in liblzma
- *
- * Check the descriptions of specific functions to find out which return
- * values they can return. With some functions the return values may have
- * more specific meanings than described here; those differences are
- * described per-function basis.
- */
-typedef enum {
-	LZMA_OK                 = 0,
-		/**<
-		 * \brief       Operation completed successfully
-		 */
-
-	LZMA_STREAM_END         = 1,
-		/**<
-		 * \brief       End of stream was reached
-		 *
-		 * In encoder, LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, or
-		 * LZMA_FINISH was finished. In decoder, this indicates
-		 * that all the data was successfully decoded.
-		 *
-		 * In all cases, when LZMA_STREAM_END is returned, the last
-		 * output bytes should be picked from strm->next_out.
-		 */
-
-	LZMA_NO_CHECK           = 2,
-		/**<
-		 * \brief       Input stream has no integrity check
-		 *
-		 * This return value can be returned only if the
-		 * LZMA_TELL_NO_CHECK flag was used when initializing
-		 * the decoder. LZMA_NO_CHECK is just a warning, and
-		 * the decoding can be continued normally.
-		 *
-		 * It is possible to call lzma_get_check() immediately after
-		 * lzma_code has returned LZMA_NO_CHECK. The result will
-		 * naturally be LZMA_CHECK_NONE, but the possibility to call
-		 * lzma_get_check() may be convenient in some applications.
-		 */
-
-	LZMA_UNSUPPORTED_CHECK  = 3,
-		/**<
-		 * \brief       Cannot calculate the integrity check
-		 *
-		 * The usage of this return value is different in encoders
-		 * and decoders.
-		 *
-		 * Encoders can return this value only from the initialization
-		 * function. If initialization fails with this value, the
-		 * encoding cannot be done, because there's no way to produce
-		 * output with the correct integrity check.
-		 *
-		 * Decoders can return this value only from lzma_code() and
-		 * only if the LZMA_TELL_UNSUPPORTED_CHECK flag was used when
-		 * initializing the decoder. The decoding can still be
-		 * continued normally even if the check type is unsupported,
-		 * but naturally the check will not be validated, and possible
-		 * errors may go undetected.
-		 *
-		 * With decoder, it is possible to call lzma_get_check()
-		 * immediately after lzma_code() has returned
-		 * LZMA_UNSUPPORTED_CHECK. This way it is possible to find
-		 * out what the unsupported Check ID was.
-		 */
-
-	LZMA_GET_CHECK          = 4,
-		/**<
-		 * \brief       Integrity check type is now available
-		 *
-		 * This value can be returned only by the lzma_code() function
-		 * and only if the decoder was initialized with the
-		 * LZMA_TELL_ANY_CHECK flag. LZMA_GET_CHECK tells the
-		 * application that it may now call lzma_get_check() to find
-		 * out the Check ID. This can be used, for example, to
-		 * implement a decoder that accepts only files that have
-		 * strong enough integrity check.
-		 */
-
-	LZMA_MEM_ERROR          = 5,
-		/**<
-		 * \brief       Cannot allocate memory
-		 *
-		 * Memory allocation failed, or the size of the allocation
-		 * would be greater than SIZE_MAX.
-		 *
-		 * Due to internal implementation reasons, the coding cannot
-		 * be continued even if more memory were made available after
-		 * LZMA_MEM_ERROR.
-		 */
-
-	LZMA_MEMLIMIT_ERROR     = 6,
-		/**
-		 * \brief       Memory usage limit was reached
-		 *
-		 * Decoder would need more memory than allowed by the
-		 * specified memory usage limit. To continue decoding,
-		 * the memory usage limit has to be increased with
-		 * lzma_memlimit_set().
-		 */
-
-	LZMA_FORMAT_ERROR       = 7,
-		/**<
-		 * \brief       File format not recognized
-		 *
-		 * The decoder did not recognize the input as supported file
-		 * format. This error can occur, for example, when trying to
-		 * decode .lzma format file with lzma_stream_decoder,
-		 * because lzma_stream_decoder accepts only the .xz format.
-		 */
-
-	LZMA_OPTIONS_ERROR      = 8,
-		/**<
-		 * \brief       Invalid or unsupported options
-		 *
-		 * Invalid or unsupported options, for example
-		 *  - unsupported filter(s) or filter options; or
-		 *  - reserved bits set in headers (decoder only).
-		 *
-		 * Rebuilding liblzma with more features enabled, or
-		 * upgrading to a newer version of liblzma may help.
-		 */
-
-	LZMA_DATA_ERROR         = 9,
-		/**<
-		 * \brief       Data is corrupt
-		 *
-		 * The usage of this return value is different in encoders
-		 * and decoders. In both encoder and decoder, the coding
-		 * cannot continue after this error.
-		 *
-		 * Encoders return this if size limits of the target file
-		 * format would be exceeded. These limits are huge, thus
-		 * getting this error from an encoder is mostly theoretical.
-		 * For example, the maximum compressed and uncompressed
-		 * size of a .xz Stream is roughly 8 EiB (2^63 bytes).
-		 *
-		 * Decoders return this error if the input data is corrupt.
-		 * This can mean, for example, invalid CRC32 in headers
-		 * or invalid check of uncompressed data.
-		 */
-
-	LZMA_BUF_ERROR          = 10,
-		/**<
-		 * \brief       No progress is possible
-		 *
-		 * This error code is returned when the coder cannot consume
-		 * any new input and produce any new output. The most common
-		 * reason for this error is that the input stream being
-		 * decoded is truncated or corrupt.
-		 *
-		 * This error is not fatal. Coding can be continued normally
-		 * by providing more input and/or more output space, if
-		 * possible.
-		 *
-		 * Typically the first call to lzma_code() that can do no
-		 * progress returns LZMA_OK instead of LZMA_BUF_ERROR. Only
-		 * the second consecutive call doing no progress will return
-		 * LZMA_BUF_ERROR. This is intentional.
-		 *
-		 * With zlib, Z_BUF_ERROR may be returned even if the
-		 * application is doing nothing wrong, so apps will need
-		 * to handle Z_BUF_ERROR specially. The above hack
-		 * guarantees that liblzma never returns LZMA_BUF_ERROR
-		 * to properly written applications unless the input file
-		 * is truncated or corrupt. This should simplify the
-		 * applications a little.
-		 */
-
-	LZMA_PROG_ERROR         = 11,
-		/**<
-		 * \brief       Programming error
-		 *
-		 * This indicates that the arguments given to the function are
-		 * invalid or the internal state of the decoder is corrupt.
-		 *   - Function arguments are invalid or the structures
-		 *     pointed by the argument pointers are invalid
-		 *     e.g. if strm->next_out has been set to NULL and
-		 *     strm->avail_out > 0 when calling lzma_code().
-		 *   - lzma_* functions have been called in wrong order
-		 *     e.g. lzma_code() was called right after lzma_end().
-		 *   - If errors occur randomly, the reason might be flaky
-		 *     hardware.
-		 *
-		 * If you think that your code is correct, this error code
-		 * can be a sign of a bug in liblzma. See the documentation
-		 * how to report bugs.
-		 */
-} lzma_ret;
-
-
-/**
- * \brief       The `action' argument for lzma_code()
- *
- * After the first use of LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, or LZMA_FINISH,
- * the same `action' must is used until lzma_code() returns LZMA_STREAM_END.
- * Also, the amount of input (that is, strm->avail_in) must not be modified
- * by the application until lzma_code() returns LZMA_STREAM_END. Changing the
- * `action' or modifying the amount of input will make lzma_code() return
- * LZMA_PROG_ERROR.
- */
-typedef enum {
-	LZMA_RUN = 0,
-		/**<
-		 * \brief       Continue coding
-		 *
-		 * Encoder: Encode as much input as possible. Some internal
-		 * buffering will probably be done (depends on the filter
-		 * chain in use), which causes latency: the input used won't
-		 * usually be decodeable from the output of the same
-		 * lzma_code() call.
-		 *
-		 * Decoder: Decode as much input as possible and produce as
-		 * much output as possible.
-		 */
-
-	LZMA_SYNC_FLUSH = 1,
-		/**<
-		 * \brief       Make all the input available at output
-		 *
-		 * Normally the encoder introduces some latency.
-		 * LZMA_SYNC_FLUSH forces all the buffered data to be
-		 * available at output without resetting the internal
-		 * state of the encoder. This way it is possible to use
-		 * compressed stream for example for communication over
-		 * network.
-		 *
-		 * Only some filters support LZMA_SYNC_FLUSH. Trying to use
-		 * LZMA_SYNC_FLUSH with filters that don't support it will
-		 * make lzma_code() return LZMA_OPTIONS_ERROR. For example,
-		 * LZMA1 doesn't support LZMA_SYNC_FLUSH but LZMA2 does.
-		 *
-		 * Using LZMA_SYNC_FLUSH very often can dramatically reduce
-		 * the compression ratio. With some filters (for example,
-		 * LZMA2), fine-tuning the compression options may help
-		 * mitigate this problem significantly (for example,
-		 * match finder with LZMA2).
-		 *
-		 * Decoders don't support LZMA_SYNC_FLUSH.
-		 */
-
-	LZMA_FULL_FLUSH = 2,
-		/**<
-		 * \brief       Finish encoding of the current Block
-		 *
-		 * All the input data going to the current Block must have
-		 * been given to the encoder (the last bytes can still be
-		 * pending in* next_in). Call lzma_code() with LZMA_FULL_FLUSH
-		 * until it returns LZMA_STREAM_END. Then continue normally
-		 * with LZMA_RUN or finish the Stream with LZMA_FINISH.
-		 *
-		 * This action is currently supported only by Stream encoder
-		 * and easy encoder (which uses Stream encoder). If there is
-		 * no unfinished Block, no empty Block is created.
-		 */
-
-	LZMA_FINISH = 3
-		/**<
-		 * \brief       Finish the coding operation
-		 *
-		 * All the input data must have been given to the encoder
-		 * (the last bytes can still be pending in next_in).
-		 * Call lzma_code() with LZMA_FINISH until it returns
-		 * LZMA_STREAM_END. Once LZMA_FINISH has been used,
-		 * the amount of input must no longer be changed by
-		 * the application.
-		 *
-		 * When decoding, using LZMA_FINISH is optional unless the
-		 * LZMA_CONCATENATED flag was used when the decoder was
-		 * initialized. When LZMA_CONCATENATED was not used, the only
-		 * effect of LZMA_FINISH is that the amount of input must not
-		 * be changed just like in the encoder.
-		 */
-} lzma_action;
-
-
-/**
- * \brief       Custom functions for memory handling
- *
- * A pointer to lzma_allocator may be passed via lzma_stream structure
- * to liblzma, and some advanced functions take a pointer to lzma_allocator
- * as a separate function argument. The library will use the functions
- * specified in lzma_allocator for memory handling instead of the default
- * malloc() and free(). C++ users should note that the custom memory
- * handling functions must not throw exceptions.
- *
- * liblzma doesn't make an internal copy of lzma_allocator. Thus, it is
- * OK to change these function pointers in the middle of the coding
- * process, but obviously it must be done carefully to make sure that the
- * replacement `free' can deallocate memory allocated by the earlier
- * `alloc' function(s).
- */
-typedef struct {
-	/**
-	 * \brief       Pointer to a custom memory allocation function
-	 *
-	 * If you don't want a custom allocator, but still want
-	 * custom free(), set this to NULL and liblzma will use
-	 * the standard malloc().
-	 *
-	 * \param       opaque  lzma_allocator.opaque (see below)
-	 * \param       nmemb   Number of elements like in calloc(). liblzma
-	 *                      will always set nmemb to 1, so it is safe to
-	 *                      ignore nmemb in a custom allocator if you like.
-	 *                      The nmemb argument exists only for
-	 *                      compatibility with zlib and libbzip2.
-	 * \param       size    Size of an element in bytes.
-	 *                      liblzma never sets this to zero.
-	 *
-	 * \return      Pointer to the beginning of a memory block of
-	 *              `size' bytes, or NULL if allocation fails
-	 *              for some reason. When allocation fails, functions
-	 *              of liblzma return LZMA_MEM_ERROR.
-	 *
-	 * The allocator should not waste time zeroing the allocated buffers.
-	 * This is not only about speed, but also memory usage, since the
-	 * operating system kernel doesn't necessarily allocate the requested
-	 * memory in physical memory until it is actually used. With small
-	 * input files, liblzma may actually need only a fraction of the
-	 * memory that it requested for allocation.
-	 *
-	 * \note        LZMA_MEM_ERROR is also used when the size of the
-	 *              allocation would be greater than SIZE_MAX. Thus,
-	 *              don't assume that the custom allocator must have
-	 *              returned NULL if some function from liblzma
-	 *              returns LZMA_MEM_ERROR.
-	 */
-	void *(LZMA_API_CALL *alloc)(void *opaque, size_t nmemb, size_t size);
-
-	/**
-	 * \brief       Pointer to a custom memory freeing function
-	 *
-	 * If you don't want a custom freeing function, but still
-	 * want a custom allocator, set this to NULL and liblzma
-	 * will use the standard free().
-	 *
-	 * \param       opaque  lzma_allocator.opaque (see below)
-	 * \param       ptr     Pointer returned by lzma_allocator.alloc(),
-	 *                      or when it is set to NULL, a pointer returned
-	 *                      by the standard malloc().
-	 */
-	void (LZMA_API_CALL *free)(void *opaque, void *ptr);
-
-	/**
-	 * \brief       Pointer passed to .alloc() and .free()
-	 *
-	 * opaque is passed as the first argument to lzma_allocator.alloc()
-	 * and lzma_allocator.free(). This intended to ease implementing
-	 * custom memory allocation functions for use with liblzma.
-	 *
-	 * If you don't need this, you should set this to NULL.
-	 */
-	void *opaque;
-
-} lzma_allocator;
-
-
-/**
- * \brief       Internal data structure
- *
- * The contents of this structure is not visible outside the library.
- */
-typedef struct lzma_internal_s lzma_internal;
-
-
-/**
- * \brief       Passing data to and from liblzma
- *
- * The lzma_stream structure is used for
- *  - passing pointers to input and output buffers to liblzma;
- *  - defining custom memory hander functions; and
- *  - holding a pointer to coder-specific internal data structures.
- *
- * Typical usage:
- *
- *  - After allocating lzma_stream (on stack or with malloc()), it must be
- *    initialized to LZMA_STREAM_INIT (see LZMA_STREAM_INIT for details).
- *
- *  - Initialize a coder to the lzma_stream, for example by using
- *    lzma_easy_encoder() or lzma_auto_decoder(). Some notes:
- *      - In contrast to zlib, strm->next_in and strm->next_out are
- *        ignored by all initialization functions, thus it is safe
- *        to not initialize them yet.
- *      - The initialization functions always set strm->total_in and
- *        strm->total_out to zero.
- *      - If the initialization function fails, no memory is left allocated
- *        that would require freeing with lzma_end() even if some memory was
- *        associated with the lzma_stream structure when the initialization
- *        function was called.
- *
- *  - Use lzma_code() to do the actual work.
- *
- *  - Once the coding has been finished, the existing lzma_stream can be
- *    reused. It is OK to reuse lzma_stream with different initialization
- *    function without calling lzma_end() first. Old allocations are
- *    automatically freed.
- *
- *  - Finally, use lzma_end() to free the allocated memory. lzma_end() never
- *    frees the lzma_stream structure itself.
- *
- * Application may modify the values of total_in and total_out as it wants.
- * They are updated by liblzma to match the amount of data read and
- * written, but aren't used for anything else.
- */
-typedef struct {
-	const uint8_t *next_in; /**< Pointer to the next input byte. */
-	size_t avail_in;    /**< Number of available input bytes in next_in. */
-	uint64_t total_in;  /**< Total number of bytes read by liblzma. */
-
-	uint8_t *next_out;  /**< Pointer to the next output position. */
-	size_t avail_out;   /**< Amount of free space in next_out. */
-	uint64_t total_out; /**< Total number of bytes written by liblzma. */
-
-	/**
-	 * \brief       Custom memory allocation functions
-	 *
-	 * In most cases this is NULL which makes liblzma use
-	 * the standard malloc() and free().
-	 */
-	lzma_allocator *allocator;
-
-	/** Internal state is not visible to applications. */
-	lzma_internal *internal;
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. Excluding the initialization of this structure,
-	 * you should not touch these, because the names of these variables
-	 * may change.
-	 */
-	void *reserved_ptr1;
-	void *reserved_ptr2;
-	void *reserved_ptr3;
-	void *reserved_ptr4;
-	uint64_t reserved_int1;
-	uint64_t reserved_int2;
-	size_t reserved_int3;
-	size_t reserved_int4;
-	lzma_reserved_enum reserved_enum1;
-	lzma_reserved_enum reserved_enum2;
-
-} lzma_stream;
-
-
-/**
- * \brief       Initialization for lzma_stream
- *
- * When you declare an instance of lzma_stream, you can immediately
- * initialize it so that initialization functions know that no memory
- * has been allocated yet:
- *
- *     lzma_stream strm = LZMA_STREAM_INIT;
- *
- * If you need to initialize a dynamically allocated lzma_stream, you can use
- * memset(strm_pointer, 0, sizeof(lzma_stream)). Strictly speaking, this
- * violates the C standard since NULL may have different internal
- * representation than zero, but it should be portable enough in practice.
- * Anyway, for maximum portability, you can use something like this:
- *
- *     lzma_stream tmp = LZMA_STREAM_INIT;
- *     *strm = tmp;
- */
-#define LZMA_STREAM_INIT \
-	{ NULL, 0, 0, NULL, 0, 0, NULL, NULL, \
-	NULL, NULL, NULL, NULL, 0, 0, 0, 0, \
-	LZMA_RESERVED_ENUM, LZMA_RESERVED_ENUM }
-
-
-/**
- * \brief       Encode or decode data
- *
- * Once the lzma_stream has been successfully initialized (e.g. with
- * lzma_stream_encoder()), the actual encoding or decoding is done
- * using this function. The application has to update strm->next_in,
- * strm->avail_in, strm->next_out, and strm->avail_out to pass input
- * to and get output from liblzma.
- *
- * See the description of the coder-specific initialization function to find
- * out what `action' values are supported by the coder.
- */
-extern LZMA_API(lzma_ret) lzma_code(lzma_stream *strm, lzma_action action)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Free memory allocated for the coder data structures
- *
- * \param       strm    Pointer to lzma_stream that is at least initialized
- *                      with LZMA_STREAM_INIT.
- *
- * After lzma_end(strm), strm->internal is guaranteed to be NULL. No other
- * members of the lzma_stream structure are touched.
- *
- * \note        zlib indicates an error if application end()s unfinished
- *              stream structure. liblzma doesn't do this, and assumes that
- *              application knows what it is doing.
- */
-extern LZMA_API(void) lzma_end(lzma_stream *strm) lzma_nothrow;
-
-
-/**
- * \brief       Get the memory usage of decoder filter chain
- *
- * This function is currently supported only when *strm has been initialized
- * with a function that takes a memlimit argument. With other functions, you
- * should use e.g. lzma_raw_encoder_memusage() or lzma_raw_decoder_memusage()
- * to estimate the memory requirements.
- *
- * This function is useful e.g. after LZMA_MEMLIMIT_ERROR to find out how big
- * the memory usage limit should have been to decode the input. Note that
- * this may give misleading information if decoding .xz Streams that have
- * multiple Blocks, because each Block can have different memory requirements.
- *
- * \return      How much memory is currently allocated for the filter
- *              decoders. If no filter chain is currently allocated,
- *              some non-zero value is still returned, which is less than
- *              or equal to what any filter chain would indicate as its
- *              memory requirement.
- *
- *              If this function isn't supported by *strm or some other error
- *              occurs, zero is returned.
- */
-extern LZMA_API(uint64_t) lzma_memusage(const lzma_stream *strm)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the current memory usage limit
- *
- * This function is supported only when *strm has been initialized with
- * a function that takes a memlimit argument.
- *
- * \return      On success, the current memory usage limit is returned
- *              (always non-zero). On error, zero is returned.
- */
-extern LZMA_API(uint64_t) lzma_memlimit_get(const lzma_stream *strm)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Set the memory usage limit
- *
- * This function is supported only when *strm has been initialized with
- * a function that takes a memlimit argument.
- *
- * \return      - LZMA_OK: New memory usage limit successfully set.
- *              - LZMA_MEMLIMIT_ERROR: The new limit is too small.
- *                The limit was not changed.
- *              - LZMA_PROG_ERROR: Invalid arguments, e.g. *strm doesn't
- *                support memory usage limit or memlimit was zero.
- */
-extern LZMA_API(lzma_ret) lzma_memlimit_set(
-		lzma_stream *strm, uint64_t memlimit) lzma_nothrow;
diff --git a/include.new/lzma/bcj.h b/include.new/lzma/bcj.h
deleted file mode 100644
index 8e37538..0000000
--- a/include.new/lzma/bcj.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * \file        lzma/bcj.h
- * \brief       Branch/Call/Jump conversion filters
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/* Filter IDs for lzma_filter.id */
-
-#define LZMA_FILTER_X86         LZMA_VLI_C(0x04)
-	/**<
-	 * Filter for x86 binaries
-	 */
-
-#define LZMA_FILTER_POWERPC     LZMA_VLI_C(0x05)
-	/**<
-	 * Filter for Big endian PowerPC binaries
-	 */
-
-#define LZMA_FILTER_IA64        LZMA_VLI_C(0x06)
-	/**<
-	 * Filter for IA-64 (Itanium) binaries.
-	 */
-
-#define LZMA_FILTER_ARM         LZMA_VLI_C(0x07)
-	/**<
-	 * Filter for ARM binaries.
-	 */
-
-#define LZMA_FILTER_ARMTHUMB    LZMA_VLI_C(0x08)
-	/**<
-	 * Filter for ARM-Thumb binaries.
-	 */
-
-#define LZMA_FILTER_SPARC       LZMA_VLI_C(0x09)
-	/**<
-	 * Filter for SPARC binaries.
-	 */
-
-
-/**
- * \brief       Options for BCJ filters
- *
- * The BCJ filters never change the size of the data. Specifying options
- * for them is optional: if pointer to options is NULL, default value is
- * used. You probably never need to specify options to BCJ filters, so just
- * set the options pointer to NULL and be happy.
- *
- * If options with non-default values have been specified when encoding,
- * the same options must also be specified when decoding.
- *
- * \note        At the moment, none of the BCJ filters support
- *              LZMA_SYNC_FLUSH. If LZMA_SYNC_FLUSH is specified,
- *              LZMA_OPTIONS_ERROR will be returned. If there is need,
- *              partial support for LZMA_SYNC_FLUSH can be added in future.
- *              Partial means that flushing would be possible only at
- *              offsets that are multiple of 2, 4, or 16 depending on
- *              the filter, except x86 which cannot be made to support
- *              LZMA_SYNC_FLUSH predictably.
- */
-typedef struct {
-	/**
-	 * \brief       Start offset for conversions
-	 *
-	 * This setting is useful only when the same filter is used
-	 * _separately_ for multiple sections of the same executable file,
-	 * and the sections contain cross-section branch/call/jump
-	 * instructions. In that case it is beneficial to set the start
-	 * offset of the non-first sections so that the relative addresses
-	 * of the cross-section branch/call/jump instructions will use the
-	 * same absolute addresses as in the first section.
-	 *
-	 * When the pointer to options is NULL, the default value (zero)
-	 * is used.
-	 */
-	uint32_t start_offset;
-
-} lzma_options_bcj;
diff --git a/include.new/lzma/block.h b/include.new/lzma/block.h
deleted file mode 100644
index e6710a7..0000000
--- a/include.new/lzma/block.h
+++ /dev/null
@@ -1,533 +0,0 @@
-/**
- * \file        lzma/block.h
- * \brief       .xz Block handling
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Options for the Block and Block Header encoders and decoders
- *
- * Different Block handling functions use different parts of this structure.
- * Some read some members, other functions write, and some do both. Only the
- * members listed for reading need to be initialized when the specified
- * functions are called. The members marked for writing will be assigned
- * new values at some point either by calling the given function or by
- * later calls to lzma_code().
- */
-typedef struct {
-	/**
-	 * \brief       Block format version
-	 *
-	 * To prevent API and ABI breakages if new features are needed in
-	 * the Block field, a version number is used to indicate which
-	 * fields in this structure are in use. For now, version must always
-	 * be zero. With non-zero version, most Block related functions will
-	 * return LZMA_OPTIONS_ERROR.
-	 *
-	 * Read by:
-	 *  - All functions that take pointer to lzma_block as argument,
-	 *    including lzma_block_header_decode().
-	 *
-	 * Written by:
-	 *  - lzma_block_header_decode()
-	 */
-	uint32_t version;
-
-	/**
-	 * \brief       Size of the Block Header field
-	 *
-	 * This is always a multiple of four.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_header_decode()
-	 *  - lzma_block_compressed_size()
-	 *  - lzma_block_unpadded_size()
-	 *  - lzma_block_total_size()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_decode()
-	 *
-	 * Written by:
-	 *  - lzma_block_header_size()
-	 *  - lzma_block_buffer_encode()
-	 */
-	uint32_t header_size;
-#	define LZMA_BLOCK_HEADER_SIZE_MIN 8
-#	define LZMA_BLOCK_HEADER_SIZE_MAX 1024
-
-	/**
-	 * \brief       Type of integrity Check
-	 *
-	 * The Check ID is not stored into the Block Header, thus its value
-	 * must be provided also when decoding.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_header_decode()
-	 *  - lzma_block_compressed_size()
-	 *  - lzma_block_unpadded_size()
-	 *  - lzma_block_total_size()
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 */
-	lzma_check check;
-
-	/**
-	 * \brief       Size of the Compressed Data in bytes
-	 *
-	 * Encoding: If this is not LZMA_VLI_UNKNOWN, Block Header encoder
-	 * will store this value to the Block Header. Block encoder doesn't
-	 * care about this value, but will set it once the encoding has been
-	 * finished.
-	 *
-	 * Decoding: If this is not LZMA_VLI_UNKNOWN, Block decoder will
-	 * verify that the size of the Compressed Data field matches
-	 * compressed_size.
-	 *
-	 * Usually you don't know this value when encoding in streamed mode,
-	 * and thus cannot write this field into the Block Header.
-	 *
-	 * In non-streamed mode you can reserve space for this field before
-	 * encoding the actual Block. After encoding the data, finish the
-	 * Block by encoding the Block Header. Steps in detail:
-	 *
-	 *  - Set compressed_size to some big enough value. If you don't know
-	 *    better, use LZMA_VLI_MAX, but remember that bigger values take
-	 *    more space in Block Header.
-	 *
-	 *  - Call lzma_block_header_size() to see how much space you need to
-	 *    reserve for the Block Header.
-	 *
-	 *  - Encode the Block using lzma_block_encoder() and lzma_code().
-	 *    It sets compressed_size to the correct value.
-	 *
-	 *  - Use lzma_block_header_encode() to encode the Block Header.
-	 *    Because space was reserved in the first step, you don't need
-	 *    to call lzma_block_header_size() anymore, because due to
-	 *    reserving, header_size has to be big enough. If it is "too big",
-	 *    lzma_block_header_encode() will add enough Header Padding to
-	 *    make Block Header to match the size specified by header_size.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_size()
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_compressed_size()
-	 *  - lzma_block_unpadded_size()
-	 *  - lzma_block_total_size()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_decode()
-	 *
-	 * Written by:
-	 *  - lzma_block_header_decode()
-	 *  - lzma_block_compressed_size()
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 */
-	lzma_vli compressed_size;
-
-	/**
-	 * \brief       Uncompressed Size in bytes
-	 *
-	 * This is handled very similarly to compressed_size above.
-	 *
-	 * uncompressed_size is needed by fewer functions than
-	 * compressed_size. This is because uncompressed_size isn't
-	 * needed to validate that Block stays within proper limits.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_size()
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_decode()
-	 *
-	 * Written by:
-	 *  - lzma_block_header_decode()
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 */
-	lzma_vli uncompressed_size;
-
-	/**
-	 * \brief       Array of filters
-	 *
-	 * There can be 1-4 filters. The end of the array is marked with
-	 * .id = LZMA_VLI_UNKNOWN.
-	 *
-	 * Read by:
-	 *  - lzma_block_header_size()
-	 *  - lzma_block_header_encode()
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 *
-	 * Written by:
-	 *  - lzma_block_header_decode(): Note that this does NOT free()
-	 *    the old filter options structures. All unused filters[] will
-	 *    have .id == LZMA_VLI_UNKNOWN and .options == NULL. If
-	 *    decoding fails, all filters[] are guaranteed to be
-	 *    LZMA_VLI_UNKNOWN and NULL.
-	 *
-	 * \note        Because of the array is terminated with
-	 *              .id = LZMA_VLI_UNKNOWN, the actual array must
-	 *              have LZMA_FILTERS_MAX + 1 members or the Block
-	 *              Header decoder will overflow the buffer.
-	 */
-	lzma_filter *filters;
-
-	/**
-	 * \brief       Raw value stored in the Check field
-	 *
-	 * After successful coding, the first lzma_check_size(check) bytes
-	 * of this array contain the raw value stored in the Check field.
-	 *
-	 * Note that CRC32 and CRC64 are stored in little endian byte order.
-	 * Take it into account if you display the Check values to the user.
-	 *
-	 * Written by:
-	 *  - lzma_block_encoder()
-	 *  - lzma_block_decoder()
-	 *  - lzma_block_buffer_encode()
-	 *  - lzma_block_buffer_decode()
-	 */
-	uint8_t raw_check[LZMA_CHECK_SIZE_MAX];
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. You should not touch these, because the names
-	 * of these variables may change. These are and will never be used
-	 * with the currently supported options, so it is safe to leave these
-	 * uninitialized.
-	 */
-	void *reserved_ptr1;
-	void *reserved_ptr2;
-	void *reserved_ptr3;
-	uint32_t reserved_int1;
-	uint32_t reserved_int2;
-	lzma_vli reserved_int3;
-	lzma_vli reserved_int4;
-	lzma_vli reserved_int5;
-	lzma_vli reserved_int6;
-	lzma_vli reserved_int7;
-	lzma_vli reserved_int8;
-	lzma_reserved_enum reserved_enum1;
-	lzma_reserved_enum reserved_enum2;
-	lzma_reserved_enum reserved_enum3;
-	lzma_reserved_enum reserved_enum4;
-	lzma_bool reserved_bool1;
-	lzma_bool reserved_bool2;
-	lzma_bool reserved_bool3;
-	lzma_bool reserved_bool4;
-	lzma_bool reserved_bool5;
-	lzma_bool reserved_bool6;
-	lzma_bool reserved_bool7;
-	lzma_bool reserved_bool8;
-
-} lzma_block;
-
-
-/**
- * \brief       Decode the Block Header Size field
- *
- * To decode Block Header using lzma_block_header_decode(), the size of the
- * Block Header has to be known and stored into lzma_block.header_size.
- * The size can be calculated from the first byte of a Block using this macro.
- * Note that if the first byte is 0x00, it indicates beginning of Index; use
- * this macro only when the byte is not 0x00.
- *
- * There is no encoding macro, because Block Header encoder is enough for that.
- */
-#define lzma_block_header_size_decode(b) (((uint32_t)(b) + 1) * 4)
-
-
-/**
- * \brief       Calculate Block Header Size
- *
- * Calculate the minimum size needed for the Block Header field using the
- * settings specified in the lzma_block structure. Note that it is OK to
- * increase the calculated header_size value as long as it is a multiple of
- * four and doesn't exceed LZMA_BLOCK_HEADER_SIZE_MAX. Increasing header_size
- * just means that lzma_block_header_encode() will add Header Padding.
- *
- * \return      - LZMA_OK: Size calculated successfully and stored to
- *                block->header_size.
- *              - LZMA_OPTIONS_ERROR: Unsupported version, filters or
- *                filter options.
- *              - LZMA_PROG_ERROR: Invalid values like compressed_size == 0.
- *
- * \note        This doesn't check that all the options are valid i.e. this
- *              may return LZMA_OK even if lzma_block_header_encode() or
- *              lzma_block_encoder() would fail. If you want to validate the
- *              filter chain, consider using lzma_memlimit_encoder() which as
- *              a side-effect validates the filter chain.
- */
-extern LZMA_API(lzma_ret) lzma_block_header_size(lzma_block *block)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Encode Block Header
- *
- * The caller must have calculated the size of the Block Header already with
- * lzma_block_header_size(). If a value larger than the one calculated by
- * lzma_block_header_size() is used, the Block Header will be padded to the
- * specified size.
- *
- * \param       out         Beginning of the output buffer. This must be
- *                          at least block->header_size bytes.
- * \param       block       Block options to be encoded.
- *
- * \return      - LZMA_OK: Encoding was successful. block->header_size
- *                bytes were written to output buffer.
- *              - LZMA_OPTIONS_ERROR: Invalid or unsupported options.
- *              - LZMA_PROG_ERROR: Invalid arguments, for example
- *                block->header_size is invalid or block->filters is NULL.
- */
-extern LZMA_API(lzma_ret) lzma_block_header_encode(
-		const lzma_block *block, uint8_t *out)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode Block Header
- *
- * block->version should be set to the highest value supported by the
- * application; currently the only possible version is zero. This function
- * will set version to the lowest value that still supports all the features
- * required by the Block Header.
- *
- * The size of the Block Header must have already been decoded with
- * lzma_block_header_size_decode() macro and stored to block->header_size.
- *
- * The integrity check type from Stream Header must have been stored
- * to block->check.
- *
- * block->filters must have been allocated, but they don't need to be
- * initialized (possible existing filter options are not freed).
- *
- * \param       block       Destination for Block options.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() (and also free()
- *                          if an error occurs).
- * \param       in          Beginning of the input buffer. This must be
- *                          at least block->header_size bytes.
- *
- * \return      - LZMA_OK: Decoding was successful. block->header_size
- *                bytes were read from the input buffer.
- *              - LZMA_OPTIONS_ERROR: The Block Header specifies some
- *                unsupported options such as unsupported filters. This can
- *                happen also if block->version was set to a too low value
- *                compared to what would be required to properly represent
- *                the information stored in the Block Header.
- *              - LZMA_DATA_ERROR: Block Header is corrupt, for example,
- *                the CRC32 doesn't match.
- *              - LZMA_PROG_ERROR: Invalid arguments, for example
- *                block->header_size is invalid or block->filters is NULL.
- */
-extern LZMA_API(lzma_ret) lzma_block_header_decode(lzma_block *block,
-		lzma_allocator *allocator, const uint8_t *in)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Validate and set Compressed Size according to Unpadded Size
- *
- * Block Header stores Compressed Size, but Index has Unpadded Size. If the
- * application has already parsed the Index and is now decoding Blocks,
- * it can calculate Compressed Size from Unpadded Size. This function does
- * exactly that with error checking:
- *
- *  - Compressed Size calculated from Unpadded Size must be positive integer,
- *    that is, Unpadded Size must be big enough that after Block Header and
- *    Check fields there's still at least one byte for Compressed Size.
- *
- *  - If Compressed Size was present in Block Header, the new value
- *    calculated from Unpadded Size is compared against the value
- *    from Block Header.
- *
- * \note        This function must be called _after_ decoding the Block Header
- *              field so that it can properly validate Compressed Size if it
- *              was present in Block Header.
- *
- * \return      - LZMA_OK: block->compressed_size was set successfully.
- *              - LZMA_DATA_ERROR: unpadded_size is too small compared to
- *                block->header_size and lzma_check_size(block->check).
- *              - LZMA_PROG_ERROR: Some values are invalid. For example,
- *                block->header_size must be a multiple of four and
- *                between 8 and 1024 inclusive.
- */
-extern LZMA_API(lzma_ret) lzma_block_compressed_size(
-		lzma_block *block, lzma_vli unpadded_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Calculate Unpadded Size
- *
- * The Index field stores Unpadded Size and Uncompressed Size. The latter
- * can be taken directly from the lzma_block structure after coding a Block,
- * but Unpadded Size needs to be calculated from Block Header Size,
- * Compressed Size, and size of the Check field. This is where this function
- * is needed.
- *
- * \return      Unpadded Size on success, or zero on error.
- */
-extern LZMA_API(lzma_vli) lzma_block_unpadded_size(const lzma_block *block)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Calculate the total encoded size of a Block
- *
- * This is equivalent to lzma_block_unpadded_size() except that the returned
- * value includes the size of the Block Padding field.
- *
- * \return      On success, total encoded size of the Block. On error,
- *              zero is returned.
- */
-extern LZMA_API(lzma_vli) lzma_block_total_size(const lzma_block *block)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Initialize .xz Block encoder
- *
- * Valid actions for lzma_code() are LZMA_RUN, LZMA_SYNC_FLUSH (only if the
- * filter chain supports it), and LZMA_FINISH.
- *
- * \return      - LZMA_OK: All good, continue with lzma_code().
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_UNSUPPORTED_CHECK: block->check specifies a Check ID
- *                that is not supported by this buid of liblzma. Initializing
- *                the encoder failed.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_block_encoder(
-		lzma_stream *strm, lzma_block *block)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .xz Block decoder
- *
- * Valid actions for lzma_code() are LZMA_RUN and LZMA_FINISH. Using
- * LZMA_FINISH is not required. It is supported only for convenience.
- *
- * \return      - LZMA_OK: All good, continue with lzma_code().
- *              - LZMA_UNSUPPORTED_CHECK: Initialization was successful, but
- *                the given Check ID is not supported, thus Check will be
- *                ignored.
- *              - LZMA_PROG_ERROR
- *              - LZMA_MEM_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_block_decoder(
-		lzma_stream *strm, lzma_block *block)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Calculate maximum output size for single-call Block encoding
- *
- * This is equivalent to lzma_stream_buffer_bound() but for .xz Blocks.
- * See the documentation of lzma_stream_buffer_bound().
- */
-extern LZMA_API(size_t) lzma_block_buffer_bound(size_t uncompressed_size)
-		lzma_nothrow;
-
-
-/**
- * \brief       Single-call .xz Block encoder
- *
- * In contrast to the multi-call encoder initialized with
- * lzma_block_encoder(), this function encodes also the Block Header. This
- * is required to make it possible to write appropriate Block Header also
- * in case the data isn't compressible, and different filter chain has to be
- * used to encode the data in uncompressed form using uncompressed chunks
- * of the LZMA2 filter.
- *
- * When the data isn't compressible, header_size, compressed_size, and
- * uncompressed_size are set just like when the data was compressible, but
- * it is possible that header_size is too small to hold the filter chain
- * specified in block->filters, because that isn't necessarily the filter
- * chain that was actually used to encode the data. lzma_block_unpadded_size()
- * still works normally, because it doesn't read the filters array.
- *
- * \param       block       Block options: block->version, block->check,
- *                          and block->filters must have been initialized.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_size     Size of the input buffer
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Not enough output buffer space.
- *              - LZMA_UNSUPPORTED_CHECK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_block_buffer_encode(
-		lzma_block *block, lzma_allocator *allocator,
-		const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Single-call .xz Block decoder
- *
- * This is single-call equivalent of lzma_block_decoder(), and requires that
- * the caller has already decoded Block Header and checked its memory usage.
- *
- * \param       block       Block options just like with lzma_block_decoder().
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_pos      The next byte will be read from in[*in_pos].
- *                          *in_pos is updated only if decoding succeeds.
- * \param       in_size     Size of the input buffer; the first byte that
- *                          won't be read is in[in_size].
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_BUF_ERROR: Output buffer was too small.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_block_buffer_decode(
-		lzma_block *block, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow;
diff --git a/include.new/lzma/check.h b/include.new/lzma/check.h
deleted file mode 100644
index 6a243db..0000000
--- a/include.new/lzma/check.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * \file        lzma/check.h
- * \brief       Integrity checks
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Type of the integrity check (Check ID)
- *
- * The .xz format supports multiple types of checks that are calculated
- * from the uncompressed data. They vary in both speed and ability to
- * detect errors.
- */
-typedef enum {
-	LZMA_CHECK_NONE     = 0,
-		/**<
-		 * No Check is calculated.
-		 *
-		 * Size of the Check field: 0 bytes
-		 */
-
-	LZMA_CHECK_CRC32    = 1,
-		/**<
-		 * CRC32 using the polynomial from the IEEE 802.3 standard
-		 *
-		 * Size of the Check field: 4 bytes
-		 */
-
-	LZMA_CHECK_CRC64    = 4,
-		/**<
-		 * CRC64 using the polynomial from the ECMA-182 standard
-		 *
-		 * Size of the Check field: 8 bytes
-		 */
-
-	LZMA_CHECK_SHA256   = 10
-		/**<
-		 * SHA-256
-		 *
-		 * Size of the Check field: 32 bytes
-		 */
-} lzma_check;
-
-
-/**
- * \brief       Maximum valid Check ID
- *
- * The .xz file format specification specifies 16 Check IDs (0-15). Some
- * of them are only reserved, that is, no actual Check algorithm has been
- * assigned. When decoding, liblzma still accepts unknown Check IDs for
- * future compatibility. If a valid but unsupported Check ID is detected,
- * liblzma can indicate a warning; see the flags LZMA_TELL_NO_CHECK,
- * LZMA_TELL_UNSUPPORTED_CHECK, and LZMA_TELL_ANY_CHECK in container.h.
- */
-#define LZMA_CHECK_ID_MAX 15
-
-
-/**
- * \brief       Test if the given Check ID is supported
- *
- * Return true if the given Check ID is supported by this liblzma build.
- * Otherwise false is returned. It is safe to call this with a value that
- * is not in the range [0, 15]; in that case the return value is always false.
- *
- * You can assume that LZMA_CHECK_NONE and LZMA_CHECK_CRC32 are always
- * supported (even if liblzma is built with limited features).
- */
-extern LZMA_API(lzma_bool) lzma_check_is_supported(lzma_check check)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Get the size of the Check field with the given Check ID
- *
- * Although not all Check IDs have a check algorithm associated, the size of
- * every Check is already frozen. This function returns the size (in bytes) of
- * the Check field with the specified Check ID. The values are:
- * { 0, 4, 4, 4, 8, 8, 8, 16, 16, 16, 32, 32, 32, 64, 64, 64 }
- *
- * If the argument is not in the range [0, 15], UINT32_MAX is returned.
- */
-extern LZMA_API(uint32_t) lzma_check_size(lzma_check check)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Maximum size of a Check field
- */
-#define LZMA_CHECK_SIZE_MAX 64
-
-
-/**
- * \brief       Calculate CRC32
- *
- * Calculate CRC32 using the polynomial from the IEEE 802.3 standard.
- *
- * \param       buf     Pointer to the input buffer
- * \param       size    Size of the input buffer
- * \param       crc     Previously returned CRC value. This is used to
- *                      calculate the CRC of a big buffer in smaller chunks.
- *                      Set to zero when starting a new calculation.
- *
- * \return      Updated CRC value, which can be passed to this function
- *              again to continue CRC calculation.
- */
-extern LZMA_API(uint32_t) lzma_crc32(
-		const uint8_t *buf, size_t size, uint32_t crc)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Calculate CRC64
- *
- * Calculate CRC64 using the polynomial from the ECMA-182 standard.
- *
- * This function is used similarly to lzma_crc32(). See its documentation.
- */
-extern LZMA_API(uint64_t) lzma_crc64(
-		const uint8_t *buf, size_t size, uint64_t crc)
-		lzma_nothrow lzma_attr_pure;
-
-
-/*
- * SHA-256 functions are currently not exported to public API.
- * Contact Lasse Collin if you think it should be.
- */
-
-
-/**
- * \brief       Get the type of the integrity check
- *
- * This function can be called only immediately after lzma_code() has
- * returned LZMA_NO_CHECK, LZMA_UNSUPPORTED_CHECK, or LZMA_GET_CHECK.
- * Calling this function in any other situation has undefined behavior.
- */
-extern LZMA_API(lzma_check) lzma_get_check(const lzma_stream *strm)
-		lzma_nothrow;
diff --git a/include.new/lzma/container.h b/include.new/lzma/container.h
deleted file mode 100644
index 7a9ffc6..0000000
--- a/include.new/lzma/container.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/**
- * \file        lzma/container.h
- * \brief       File formats
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/************
- * Encoding *
- ************/
-
-/**
- * \brief       Default compression preset
- *
- * It's not straightforward to recommend a default preset, because in some
- * cases keeping the resource usage relatively low is more important that
- * getting the maximum compression ratio.
- */
-#define LZMA_PRESET_DEFAULT     UINT32_C(6)
-
-
-/**
- * \brief       Mask for preset level
- *
- * This is useful only if you need to extract the level from the preset
- * variable. That should be rare.
- */
-#define LZMA_PRESET_LEVEL_MASK  UINT32_C(0x1F)
-
-
-/*
- * Preset flags
- *
- * Currently only one flag is defined.
- */
-
-/**
- * \brief       Extreme compression preset
- *
- * This flag modifies the preset to make the encoding significantly slower
- * while improving the compression ratio only marginally. This is useful
- * when you don't mind wasting time to get as small result as possible.
- *
- * This flag doesn't affect the memory usage requirements of the decoder (at
- * least not significantly). The memory usage of the encoder may be increased
- * a little but only at the lowest preset levels (0-3).
- */
-#define LZMA_PRESET_EXTREME       (UINT32_C(1) << 31)
-
-
-/**
- * \brief       Calculate approximate memory usage of easy encoder
- *
- * This function is a wrapper for lzma_raw_encoder_memusage().
- *
- * \param       preset  Compression preset (level and possible flags)
- *
- * \return      Number of bytes of memory required for the given
- *              preset when encoding. If an error occurs, for example
- *              due to unsupported preset, UINT64_MAX is returned.
- */
-extern LZMA_API(uint64_t) lzma_easy_encoder_memusage(uint32_t preset)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Calculate approximate decoder memory usage of a preset
- *
- * This function is a wrapper for lzma_raw_decoder_memusage().
- *
- * \param       preset  Compression preset (level and possible flags)
- *
- * \return      Number of bytes of memory required to decompress a file
- *              that was compressed using the given preset. If an error
- *              occurs, for example due to unsupported preset, UINT64_MAX
- *              is returned.
- */
-extern LZMA_API(uint64_t) lzma_easy_decoder_memusage(uint32_t preset)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Initialize .xz Stream encoder using a preset number
- *
- * This function is intended for those who just want to use the basic features
- * if liblzma (that is, most developers out there).
- *
- * \param       strm    Pointer to lzma_stream that is at least initialized
- *                      with LZMA_STREAM_INIT.
- * \param       preset  Compression preset to use. A preset consist of level
- *                      number and zero or more flags. Usually flags aren't
- *                      used, so preset is simply a number [0, 9] which match
- *                      the options -0 ... -9 of the xz command line tool.
- *                      Additional flags can be be set using bitwise-or with
- *                      the preset level number, e.g. 6 | LZMA_PRESET_EXTREME.
- * \param       check   Integrity check type to use. See check.h for available
- *                      checks. The xz command line tool defaults to
- *                      LZMA_CHECK_CRC64, which is a good choice if you are
- *                      unsure. LZMA_CHECK_CRC32 is good too as long as the
- *                      uncompressed file is not many gigabytes.
- *
- * \return      - LZMA_OK: Initialization succeeded. Use lzma_code() to
- *                encode your data.
- *              - LZMA_MEM_ERROR: Memory allocation failed.
- *              - LZMA_OPTIONS_ERROR: The given compression preset is not
- *                supported by this build of liblzma.
- *              - LZMA_UNSUPPORTED_CHECK: The given check type is not
- *                supported by this liblzma build.
- *              - LZMA_PROG_ERROR: One or more of the parameters have values
- *                that will never be valid. For example, strm == NULL.
- *
- * If initialization fails (return value is not LZMA_OK), all the memory
- * allocated for *strm by liblzma is always freed. Thus, there is no need
- * to call lzma_end() after failed initialization.
- *
- * If initialization succeeds, use lzma_code() to do the actual encoding.
- * Valid values for `action' (the second argument of lzma_code()) are
- * LZMA_RUN, LZMA_SYNC_FLUSH, LZMA_FULL_FLUSH, and LZMA_FINISH. In future,
- * there may be compression levels or flags that don't support LZMA_SYNC_FLUSH.
- */
-extern LZMA_API(lzma_ret) lzma_easy_encoder(
-		lzma_stream *strm, uint32_t preset, lzma_check check)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Single-call .xz Stream encoding using a preset number
- *
- * The maximum required output buffer size can be calculated with
- * lzma_stream_buffer_bound().
- *
- * \param       preset      Compression preset to use. See the description
- *                          in lzma_easy_encoder().
- * \param       check       Type of the integrity check to calculate from
- *                          uncompressed data.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_size     Size of the input buffer
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Not enough output buffer space.
- *              - LZMA_UNSUPPORTED_CHECK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_easy_buffer_encode(
-		uint32_t preset, lzma_check check,
-		lzma_allocator *allocator, const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Initialize .xz Stream encoder using a custom filter chain
- *
- * \param       strm    Pointer to properly prepared lzma_stream
- * \param       filters Array of filters. This must be terminated with
- *                      filters[n].id = LZMA_VLI_UNKNOWN. See filter.h for
- *                      more information.
- * \param       check   Type of the integrity check to calculate from
- *                      uncompressed data.
- *
- * \return      - LZMA_OK: Initialization was successful.
- *              - LZMA_MEM_ERROR
- *              - LZMA_UNSUPPORTED_CHECK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_stream_encoder(lzma_stream *strm,
-		const lzma_filter *filters, lzma_check check)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .lzma encoder (legacy file format)
- *
- * The .lzma format is sometimes called the LZMA_Alone format, which is the
- * reason for the name of this function. The .lzma format supports only the
- * LZMA1 filter. There is no support for integrity checks like CRC32.
- *
- * Use this function if and only if you need to create files readable by
- * legacy LZMA tools such as LZMA Utils 4.32.x. Moving to the .xz format
- * is strongly recommended.
- *
- * The valid action values for lzma_code() are LZMA_RUN and LZMA_FINISH.
- * No kind of flushing is supported, because the file format doesn't make
- * it possible.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_alone_encoder(
-		lzma_stream *strm, const lzma_options_lzma *options)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Calculate output buffer size for single-call Stream encoder
- *
- * When trying to compress uncompressible data, the encoded size will be
- * slightly bigger than the input data. This function calculates how much
- * output buffer space is required to be sure that lzma_stream_buffer_encode()
- * doesn't return LZMA_BUF_ERROR.
- *
- * The calculated value is not exact, but it is guaranteed to be big enough.
- * The actual maximum output space required may be slightly smaller (up to
- * about 100 bytes). This should not be a problem in practice.
- *
- * If the calculated maximum size doesn't fit into size_t or would make the
- * Stream grow past LZMA_VLI_MAX (which should never happen in practice),
- * zero is returned to indicate the error.
- *
- * \note        The limit calculated by this function applies only to
- *              single-call encoding. Multi-call encoding may (and probably
- *              will) have larger maximum expansion when encoding
- *              uncompressible data. Currently there is no function to
- *              calculate the maximum expansion of multi-call encoding.
- */
-extern LZMA_API(size_t) lzma_stream_buffer_bound(size_t uncompressed_size)
-		lzma_nothrow;
-
-
-/**
- * \brief       Single-call .xz Stream encoder
- *
- * \param       filters     Array of filters. This must be terminated with
- *                          filters[n].id = LZMA_VLI_UNKNOWN. See filter.h
- *                          for more information.
- * \param       check       Type of the integrity check to calculate from
- *                          uncompressed data.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_size     Size of the input buffer
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Not enough output buffer space.
- *              - LZMA_UNSUPPORTED_CHECK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_stream_buffer_encode(
-		lzma_filter *filters, lzma_check check,
-		lzma_allocator *allocator, const uint8_t *in, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/************
- * Decoding *
- ************/
-
-/**
- * This flag makes lzma_code() return LZMA_NO_CHECK if the input stream
- * being decoded has no integrity check. Note that when used with
- * lzma_auto_decoder(), all .lzma files will trigger LZMA_NO_CHECK
- * if LZMA_TELL_NO_CHECK is used.
- */
-#define LZMA_TELL_NO_CHECK              UINT32_C(0x01)
-
-
-/**
- * This flag makes lzma_code() return LZMA_UNSUPPORTED_CHECK if the input
- * stream has an integrity check, but the type of the integrity check is not
- * supported by this liblzma version or build. Such files can still be
- * decoded, but the integrity check cannot be verified.
- */
-#define LZMA_TELL_UNSUPPORTED_CHECK     UINT32_C(0x02)
-
-
-/**
- * This flag makes lzma_code() return LZMA_GET_CHECK as soon as the type
- * of the integrity check is known. The type can then be got with
- * lzma_get_check().
- */
-#define LZMA_TELL_ANY_CHECK             UINT32_C(0x04)
-
-
-/**
- * This flag enables decoding of concatenated files with file formats that
- * allow concatenating compressed files as is. From the formats currently
- * supported by liblzma, only the .xz format allows concatenated files.
- * Concatenated files are not allowed with the legacy .lzma format.
- *
- * This flag also affects the usage of the `action' argument for lzma_code().
- * When LZMA_CONCATENATED is used, lzma_code() won't return LZMA_STREAM_END
- * unless LZMA_FINISH is used as `action'. Thus, the application has to set
- * LZMA_FINISH in the same way as it does when encoding.
- *
- * If LZMA_CONCATENATED is not used, the decoders still accept LZMA_FINISH
- * as `action' for lzma_code(), but the usage of LZMA_FINISH isn't required.
- */
-#define LZMA_CONCATENATED               UINT32_C(0x08)
-
-
-/**
- * \brief       Initialize .xz Stream decoder
- *
- * \param       strm        Pointer to properly prepared lzma_stream
- * \param       memlimit    Memory usage limit as bytes. Use UINT64_MAX
- *                          to effectively disable the limiter.
- * \param       flags       Bitwise-or of zero or more of the decoder flags:
- *                          LZMA_TELL_NO_CHECK, LZMA_TELL_UNSUPPORTED_CHECK,
- *                          LZMA_TELL_ANY_CHECK, LZMA_CONCATENATED
- *
- * \return      - LZMA_OK: Initialization was successful.
- *              - LZMA_MEM_ERROR: Cannot allocate memory.
- *              - LZMA_OPTIONS_ERROR: Unsupported flags
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_stream_decoder(
-		lzma_stream *strm, uint64_t memlimit, uint32_t flags)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode .xz Streams and .lzma files with autodetection
- *
- * This decoder autodetects between the .xz and .lzma file formats, and
- * calls lzma_stream_decoder() or lzma_alone_decoder() once the type
- * of the input file has been detected.
- *
- * \param       strm        Pointer to properly prepared lzma_stream
- * \param       memlimit    Memory usage limit as bytes. Use UINT64_MAX
- *                          to effectively disable the limiter.
- * \param       flags       Bitwise-or of flags, or zero for no flags.
- *
- * \return      - LZMA_OK: Initialization was successful.
- *              - LZMA_MEM_ERROR: Cannot allocate memory.
- *              - LZMA_OPTIONS_ERROR: Unsupported flags
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_auto_decoder(
-		lzma_stream *strm, uint64_t memlimit, uint32_t flags)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .lzma decoder (legacy file format)
- *
- * Valid `action' arguments to lzma_code() are LZMA_RUN and LZMA_FINISH.
- * There is no need to use LZMA_FINISH, but allowing it may simplify
- * certain types of applications.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_alone_decoder(
-		lzma_stream *strm, uint64_t memlimit)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Single-call .xz Stream decoder
- *
- * \param       memlimit    Pointer to how much memory the decoder is allowed
- *                          to allocate. The value pointed by this pointer is
- *                          modified if and only if LZMA_MEMLIMIT_ERROR is
- *                          returned.
- * \param       flags       Bitwise-or of zero or more of the decoder flags:
- *                          LZMA_TELL_NO_CHECK, LZMA_TELL_UNSUPPORTED_CHECK,
- *                          LZMA_CONCATENATED. Note that LZMA_TELL_ANY_CHECK
- *                          is not allowed and will return LZMA_PROG_ERROR.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_pos      The next byte will be read from in[*in_pos].
- *                          *in_pos is updated only if decoding succeeds.
- * \param       in_size     Size of the input buffer; the first byte that
- *                          won't be read is in[in_size].
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if decoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_FORMAT_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_NO_CHECK: This can be returned only if using
- *                the LZMA_TELL_NO_CHECK flag.
- *              - LZMA_UNSUPPORTED_CHECK: This can be returned only if using
- *                the LZMA_TELL_UNSUPPORTED_CHECK flag.
- *              - LZMA_MEM_ERROR
- *              - LZMA_MEMLIMIT_ERROR: Memory usage limit was reached.
- *                The minimum required memlimit value was stored to *memlimit.
- *              - LZMA_BUF_ERROR: Output buffer was too small.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_stream_buffer_decode(
-		uint64_t *memlimit, uint32_t flags, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
diff --git a/include.new/lzma/delta.h b/include.new/lzma/delta.h
deleted file mode 100644
index 592fc4f..0000000
--- a/include.new/lzma/delta.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * \file        lzma/delta.h
- * \brief       Delta filter
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Filter ID
- *
- * Filter ID of the Delta filter. This is used as lzma_filter.id.
- */
-#define LZMA_FILTER_DELTA       LZMA_VLI_C(0x03)
-
-
-/**
- * \brief       Type of the delta calculation
- *
- * Currently only byte-wise delta is supported. Other possible types could
- * be, for example, delta of 16/32/64-bit little/big endian integers, but
- * these are not currently planned since byte-wise delta is almost as good.
- */
-typedef enum {
-	LZMA_DELTA_TYPE_BYTE
-} lzma_delta_type;
-
-
-/**
- * \brief       Options for the Delta filter
- *
- * These options are needed by both encoder and decoder.
- */
-typedef struct {
-	/** For now, this must always be LZMA_DELTA_TYPE_BYTE. */
-	lzma_delta_type type;
-
-	/**
-	 * \brief       Delta distance
-	 *
-	 * With the only currently supported type, LZMA_DELTA_TYPE_BYTE,
-	 * the distance is as bytes.
-	 *
-	 * Examples:
-	 *  - 16-bit stereo audio: distance = 4 bytes
-	 *  - 24-bit RGB image data: distance = 3 bytes
-	 */
-	uint32_t dist;
-#	define LZMA_DELTA_DIST_MIN 1
-#	define LZMA_DELTA_DIST_MAX 256
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. You should not touch these, because the names
-	 * of these variables may change. These are and will never be used
-	 * when type is LZMA_DELTA_TYPE_BYTE, so it is safe to leave these
-	 * uninitialized.
-	 */
-	uint32_t reserved_int1;
-	uint32_t reserved_int2;
-	uint32_t reserved_int3;
-	uint32_t reserved_int4;
-	void *reserved_ptr1;
-	void *reserved_ptr2;
-
-} lzma_options_delta;
diff --git a/include.new/lzma/filter.h b/include.new/lzma/filter.h
deleted file mode 100644
index e0bc163..0000000
--- a/include.new/lzma/filter.h
+++ /dev/null
@@ -1,424 +0,0 @@
-/**
- * \file        lzma/filter.h
- * \brief       Common filter related types and functions
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Maximum number of filters in a chain
- *
- * A filter chain can have 1-4 filters, of which three are allowed to change
- * the size of the data. Usually only one or two filters are needed.
- */
-#define LZMA_FILTERS_MAX 4
-
-
-/**
- * \brief       Filter options
- *
- * This structure is used to pass Filter ID and a pointer filter's
- * options to liblzma. A few functions work with a single lzma_filter
- * structure, while most functions expect a filter chain.
- *
- * A filter chain is indicated with an array of lzma_filter structures.
- * The array is terminated with .id = LZMA_VLI_UNKNOWN. Thus, the filter
- * array must have LZMA_FILTERS_MAX + 1 elements (that is, five) to
- * be able to hold any arbitrary filter chain. This is important when
- * using lzma_block_header_decode() from block.h, because too small
- * array would make liblzma write past the end of the filters array.
- */
-typedef struct {
-	/**
-	 * \brief       Filter ID
-	 *
-	 * Use constants whose name begin with `LZMA_FILTER_' to specify
-	 * different filters. In an array of lzma_filter structures, use
-	 * LZMA_VLI_UNKNOWN to indicate end of filters.
-	 *
-	 * \note        This is not an enum, because on some systems enums
-	 *              cannot be 64-bit.
-	 */
-	lzma_vli id;
-
-	/**
-	 * \brief       Pointer to filter-specific options structure
-	 *
-	 * If the filter doesn't need options, set this to NULL. If id is
-	 * set to LZMA_VLI_UNKNOWN, options is ignored, and thus
-	 * doesn't need be initialized.
-	 */
-	void *options;
-
-} lzma_filter;
-
-
-/**
- * \brief       Test if the given Filter ID is supported for encoding
- *
- * Return true if the give Filter ID is supported for encoding by this
- * liblzma build. Otherwise false is returned.
- *
- * There is no way to list which filters are available in this particular
- * liblzma version and build. It would be useless, because the application
- * couldn't know what kind of options the filter would need.
- */
-extern LZMA_API(lzma_bool) lzma_filter_encoder_is_supported(lzma_vli id)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Test if the given Filter ID is supported for decoding
- *
- * Return true if the give Filter ID is supported for decoding by this
- * liblzma build. Otherwise false is returned.
- */
-extern LZMA_API(lzma_bool) lzma_filter_decoder_is_supported(lzma_vli id)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Copy the filters array
- *
- * Copy the Filter IDs and filter-specific options from src to dest.
- * Up to LZMA_FILTERS_MAX filters are copied, plus the terminating
- * .id == LZMA_VLI_UNKNOWN. Thus, dest should have at least
- * LZMA_FILTERS_MAX + 1 elements space unless the caller knows that
- * src is smaller than that.
- *
- * Unless the filter-specific options is NULL, the Filter ID has to be
- * supported by liblzma, because liblzma needs to know the size of every
- * filter-specific options structure. The filter-specific options are not
- * validated. If options is NULL, any unsupported Filter IDs are copied
- * without returning an error.
- *
- * Old filter-specific options in dest are not freed, so dest doesn't
- * need to be initialized by the caller in any way.
- *
- * If an error occurs, memory possibly already allocated by this function
- * is always freed.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR: Unsupported Filter ID and its options
- *                is not NULL.
- *              - LZMA_PROG_ERROR: src or dest is NULL.
- */
-extern LZMA_API(lzma_ret) lzma_filters_copy(const lzma_filter *src,
-		lzma_filter *dest, lzma_allocator *allocator) lzma_nothrow;
-
-
-/**
- * \brief       Calculate approximate memory requirements for raw encoder
- *
- * This function can be used to calculate the memory requirements for
- * Block and Stream encoders too because Block and Stream encoders don't
- * need significantly more memory than raw encoder.
- *
- * \param       filters     Array of filters terminated with
- *                          .id == LZMA_VLI_UNKNOWN.
- *
- * \return      Number of bytes of memory required for the given
- *              filter chain when encoding. If an error occurs,
- *              for example due to unsupported filter chain,
- *              UINT64_MAX is returned.
- */
-extern LZMA_API(uint64_t) lzma_raw_encoder_memusage(const lzma_filter *filters)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Calculate approximate memory requirements for raw decoder
- *
- * This function can be used to calculate the memory requirements for
- * Block and Stream decoders too because Block and Stream decoders don't
- * need significantly more memory than raw decoder.
- *
- * \param       filters     Array of filters terminated with
- *                          .id == LZMA_VLI_UNKNOWN.
- *
- * \return      Number of bytes of memory required for the given
- *              filter chain when decoding. If an error occurs,
- *              for example due to unsupported filter chain,
- *              UINT64_MAX is returned.
- */
-extern LZMA_API(uint64_t) lzma_raw_decoder_memusage(const lzma_filter *filters)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Initialize raw encoder
- *
- * This function may be useful when implementing custom file formats.
- *
- * \param       strm    Pointer to properly prepared lzma_stream
- * \param       filters Array of lzma_filter structures. The end of the
- *                      array must be marked with .id = LZMA_VLI_UNKNOWN.
- *
- * The `action' with lzma_code() can be LZMA_RUN, LZMA_SYNC_FLUSH (if the
- * filter chain supports it), or LZMA_FINISH.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_raw_encoder(
-		lzma_stream *strm, const lzma_filter *filters)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize raw decoder
- *
- * The initialization of raw decoder goes similarly to raw encoder.
- *
- * The `action' with lzma_code() can be LZMA_RUN or LZMA_FINISH. Using
- * LZMA_FINISH is not required, it is supported just for convenience.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_raw_decoder(
-		lzma_stream *strm, const lzma_filter *filters)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Update the filter chain in the encoder
- *
- * This function is for advanced users only. This function has two slightly
- * different purposes:
- *
- *  - After LZMA_FULL_FLUSH when using Stream encoder: Set a new filter
- *    chain, which will be used starting from the next Block.
- *
- *  - After LZMA_SYNC_FLUSH using Raw, Block, or Stream encoder: Change
- *    the filter-specific options in the middle of encoding. The actual
- *    filters in the chain (Filter IDs) cannot be changed. In the future,
- *    it might become possible to change the filter options without
- *    using LZMA_SYNC_FLUSH.
- *
- * While rarely useful, this function may be called also when no data has
- * been compressed yet. In that case, this function will behave as if
- * LZMA_FULL_FLUSH (Stream encoder) or LZMA_SYNC_FLUSH (Raw or Block
- * encoder) had been used right before calling this function.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_MEMLIMIT_ERROR
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_filters_update(
-		lzma_stream *strm, const lzma_filter *filters) lzma_nothrow;
-
-
-/**
- * \brief       Single-call raw encoder
- *
- * \param       filters     Array of lzma_filter structures. The end of the
- *                          array must be marked with .id = LZMA_VLI_UNKNOWN.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_size     Size of the input buffer
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Not enough output buffer space.
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- *
- * \note        There is no function to calculate how big output buffer
- *              would surely be big enough. (lzma_stream_buffer_bound()
- *              works only for lzma_stream_buffer_encode(); raw encoder
- *              won't necessarily meet that bound.)
- */
-extern LZMA_API(lzma_ret) lzma_raw_buffer_encode(
-		const lzma_filter *filters, lzma_allocator *allocator,
-		const uint8_t *in, size_t in_size, uint8_t *out,
-		size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Single-call raw decoder
- *
- * \param       filters     Array of lzma_filter structures. The end of the
- *                          array must be marked with .id = LZMA_VLI_UNKNOWN.
- * \param       allocator   lzma_allocator for custom allocator functions.
- *                          Set to NULL to use malloc() and free().
- * \param       in          Beginning of the input buffer
- * \param       in_pos      The next byte will be read from in[*in_pos].
- *                          *in_pos is updated only if decoding succeeds.
- * \param       in_size     Size of the input buffer; the first byte that
- *                          won't be read is in[in_size].
- * \param       out         Beginning of the output buffer
- * \param       out_pos     The next byte will be written to out[*out_pos].
- *                          *out_pos is updated only if encoding succeeds.
- * \param       out_size    Size of the out buffer; the first byte into
- *                          which no data is written to is out[out_size].
- */
-extern LZMA_API(lzma_ret) lzma_raw_buffer_decode(
-		const lzma_filter *filters, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size,
-		uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Get the size of the Filter Properties field
- *
- * This function may be useful when implementing custom file formats
- * using the raw encoder and decoder.
- *
- * \param       size    Pointer to uint32_t to hold the size of the properties
- * \param       filter  Filter ID and options (the size of the properties may
- *                      vary depending on the options)
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- *
- * \note        This function validates the Filter ID, but does not
- *              necessarily validate the options. Thus, it is possible
- *              that this returns LZMA_OK while the following call to
- *              lzma_properties_encode() returns LZMA_OPTIONS_ERROR.
- */
-extern LZMA_API(lzma_ret) lzma_properties_size(
-		uint32_t *size, const lzma_filter *filter) lzma_nothrow;
-
-
-/**
- * \brief       Encode the Filter Properties field
- *
- * \param       filter  Filter ID and options
- * \param       props   Buffer to hold the encoded options. The size of
- *                      buffer must have been already determined with
- *                      lzma_properties_size().
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_PROG_ERROR
- *
- * \note        Even this function won't validate more options than actually
- *              necessary. Thus, it is possible that encoding the properties
- *              succeeds but using the same options to initialize the encoder
- *              will fail.
- *
- * \note        If lzma_properties_size() indicated that the size
- *              of the Filter Properties field is zero, calling
- *              lzma_properties_encode() is not required, but it
- *              won't do any harm either.
- */
-extern LZMA_API(lzma_ret) lzma_properties_encode(
-		const lzma_filter *filter, uint8_t *props) lzma_nothrow;
-
-
-/**
- * \brief       Decode the Filter Properties field
- *
- * \param       filter      filter->id must have been set to the correct
- *                          Filter ID. filter->options doesn't need to be
- *                          initialized (it's not freed by this function). The
- *                          decoded options will be stored to filter->options.
- *                          filter->options is set to NULL if there are no
- *                          properties or if an error occurs.
- * \param       allocator   Custom memory allocator used to allocate the
- *                          options. Set to NULL to use the default malloc(),
- *                          and in case of an error, also free().
- * \param       props       Input buffer containing the properties.
- * \param       props_size  Size of the properties. This must be the exact
- *                          size; giving too much or too little input will
- *                          return LZMA_OPTIONS_ERROR.
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_properties_decode(
-		lzma_filter *filter, lzma_allocator *allocator,
-		const uint8_t *props, size_t props_size) lzma_nothrow;
-
-
-/**
- * \brief       Calculate encoded size of a Filter Flags field
- *
- * Knowing the size of Filter Flags is useful to know when allocating
- * memory to hold the encoded Filter Flags.
- *
- * \param       size    Pointer to integer to hold the calculated size
- * \param       filter  Filter ID and associated options whose encoded
- *                      size is to be calculated
- *
- * \return      - LZMA_OK: *size set successfully. Note that this doesn't
- *                guarantee that filter->options is valid, thus
- *                lzma_filter_flags_encode() may still fail.
- *              - LZMA_OPTIONS_ERROR: Unknown Filter ID or unsupported options.
- *              - LZMA_PROG_ERROR: Invalid options
- *
- * \note        If you need to calculate size of List of Filter Flags,
- *              you need to loop over every lzma_filter entry.
- */
-extern LZMA_API(lzma_ret) lzma_filter_flags_size(
-		uint32_t *size, const lzma_filter *filter)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Encode Filter Flags into given buffer
- *
- * In contrast to some functions, this doesn't allocate the needed buffer.
- * This is due to how this function is used internally by liblzma.
- *
- * \param       filter      Filter ID and options to be encoded
- * \param       out         Beginning of the output buffer
- * \param       out_pos     out[*out_pos] is the next write position. This
- *                          is updated by the encoder.
- * \param       out_size    out[out_size] is the first byte to not write.
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_OPTIONS_ERROR: Invalid or unsupported options.
- *              - LZMA_PROG_ERROR: Invalid options or not enough output
- *                buffer space (you should have checked it with
- *                lzma_filter_flags_size()).
- */
-extern LZMA_API(lzma_ret) lzma_filter_flags_encode(const lzma_filter *filter,
-		uint8_t *out, size_t *out_pos, size_t out_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode Filter Flags from given buffer
- *
- * The decoded result is stored into *filter. The old value of
- * filter->options is not free()d.
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR
- *              - LZMA_MEM_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_filter_flags_decode(
-		lzma_filter *filter, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
diff --git a/include.new/lzma/hardware.h b/include.new/lzma/hardware.h
deleted file mode 100644
index e7dd03c..0000000
--- a/include.new/lzma/hardware.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * \file        lzma/hardware.h
- * \brief       Hardware information
- *
- * Since liblzma can consume a lot of system resources, it also provides
- * ways to limit the resource usage. Applications linking against liblzma
- * need to do the actual decisions how much resources to let liblzma to use.
- * To ease making these decisions, liblzma provides functions to find out
- * the relevant capabilities of the underlaying hardware. Currently there
- * is only a function to find out the amount of RAM, but in the future there
- * will be also a function to detect how many concurrent threads the system
- * can run.
- *
- * \note        On some operating systems, these function may temporarily
- *              load a shared library or open file descriptor(s) to find out
- *              the requested hardware information. Unless the application
- *              assumes that specific file descriptors are not touched by
- *              other threads, this should have no effect on thread safety.
- *              Possible operations involving file descriptors will restart
- *              the syscalls if they return EINTR.
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Get the total amount of physical memory (RAM) in bytes
- *
- * This function may be useful when determining a reasonable memory
- * usage limit for decompressing or how much memory it is OK to use
- * for compressing.
- *
- * \return      On success, the total amount of physical memory in bytes
- *              is returned. If the amount of RAM cannot be determined,
- *              zero is returned. This can happen if an error occurs
- *              or if there is no code in liblzma to detect the amount
- *              of RAM on the specific operating system.
- */
-extern LZMA_API(uint64_t) lzma_physmem(void) lzma_nothrow;
diff --git a/include.new/lzma/index.h b/include.new/lzma/index.h
deleted file mode 100644
index 16bacc2..0000000
--- a/include.new/lzma/index.h
+++ /dev/null
@@ -1,682 +0,0 @@
-/**
- * \file        lzma/index.h
- * \brief       Handling of .xz Index and related information
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Opaque data type to hold the Index(es) and other information
- *
- * lzma_index often holds just one .xz Index and possibly the Stream Flags
- * of the same Stream and size of the Stream Padding field. However,
- * multiple lzma_indexes can be concatenated with lzma_index_cat() and then
- * there may be information about multiple Streams in the same lzma_index.
- *
- * Notes about thread safety: Only one thread may modify lzma_index at
- * a time. All functions that take non-const pointer to lzma_index
- * modify it. As long as no thread is modifying the lzma_index, getting
- * information from the same lzma_index can be done from multiple threads
- * at the same time with functions that take a const pointer to
- * lzma_index or use lzma_index_iter. The same iterator must be used
- * only by one thread at a time, of course, but there can be as many
- * iterators for the same lzma_index as needed.
- */
-typedef struct lzma_index_s lzma_index;
-
-
-/**
- * \brief       Iterator to get information about Blocks and Streams
- */
-typedef struct {
-	struct {
-		/**
-		 * \brief       Pointer to Stream Flags
-		 *
-		 * This is NULL if Stream Flags have not been set for
-		 * this Stream with lzma_index_stream_flags().
-		 */
-		const lzma_stream_flags *flags;
-
-		const void *reserved_ptr1;
-		const void *reserved_ptr2;
-		const void *reserved_ptr3;
-
-		/**
-		 * \brief       Stream number in the lzma_index
-		 *
-		 * The first Stream is 1.
-		 */
-		lzma_vli number;
-
-		/**
-		 * \brief       Number of Blocks in the Stream
-		 *
-		 * If this is zero, the block structure below has
-		 * undefined values.
-		 */
-		lzma_vli block_count;
-
-		/**
-		 * \brief       Compressed start offset of this Stream
-		 *
-		 * The offset is relative to the beginning of the lzma_index
-		 * (i.e. usually the beginning of the .xz file).
-		 */
-		lzma_vli compressed_offset;
-
-		/**
-		 * \brief       Uncompressed start offset of this Stream
-		 *
-		 * The offset is relative to the beginning of the lzma_index
-		 * (i.e. usually the beginning of the .xz file).
-		 */
-		lzma_vli uncompressed_offset;
-
-		/**
-		 * \brief       Compressed size of this Stream
-		 *
-		 * This includes all headers except the possible
-		 * Stream Padding after this Stream.
-		 */
-		lzma_vli compressed_size;
-
-		/**
-		 * \brief       Uncompressed size of this Stream
-		 */
-		lzma_vli uncompressed_size;
-
-		/**
-		 * \brief       Size of Stream Padding after this Stream
-		 *
-		 * If it hasn't been set with lzma_index_stream_padding(),
-		 * this defaults to zero. Stream Padding is always
-		 * a multiple of four bytes.
-		 */
-		lzma_vli padding;
-
-		lzma_vli reserved_vli1;
-		lzma_vli reserved_vli2;
-		lzma_vli reserved_vli3;
-		lzma_vli reserved_vli4;
-	} stream;
-
-	struct {
-		/**
-		 * \brief       Block number in the file
-		 *
-		 * The first Block is 1.
-		 */
-		lzma_vli number_in_file;
-
-		/**
-		 * \brief       Compressed start offset of this Block
-		 *
-		 * This offset is relative to the beginning of the
-		 * lzma_index (i.e. usually the beginning of the .xz file).
-		 * Normally this is where you should seek in the .xz file
-		 * to start decompressing this Block.
-		 */
-		lzma_vli compressed_file_offset;
-
-		/**
-		 * \brief       Uncompressed start offset of this Block
-		 *
-		 * This offset is relative to the beginning of the lzma_index
-		 * (i.e. usually the beginning of the .xz file).
-		 *
-		 * When doing random-access reading, it is possible that
-		 * the target offset is not exactly at Block boundary. One
-		 * will need to compare the target offset against
-		 * uncompressed_file_offset or uncompressed_stream_offset,
-		 * and possibly decode and throw away some amount of data
-		 * before reaching the target offset.
-		 */
-		lzma_vli uncompressed_file_offset;
-
-		/**
-		 * \brief       Block number in this Stream
-		 *
-		 * The first Block is 1.
-		 */
-		lzma_vli number_in_stream;
-
-		/**
-		 * \brief       Compressed start offset of this Block
-		 *
-		 * This offset is relative to the beginning of the Stream
-		 * containing this Block.
-		 */
-		lzma_vli compressed_stream_offset;
-
-		/**
-		 * \brief       Uncompressed start offset of this Block
-		 *
-		 * This offset is relative to the beginning of the Stream
-		 * containing this Block.
-		 */
-		lzma_vli uncompressed_stream_offset;
-
-		/**
-		 * \brief       Uncompressed size of this Block
-		 *
-		 * You should pass this to the Block decoder if you will
-		 * decode this Block. It will allow the Block decoder to
-		 * validate the uncompressed size.
-		 */
-		lzma_vli uncompressed_size;
-
-		/**
-		 * \brief       Unpadded size of this Block
-		 *
-		 * You should pass this to the Block decoder if you will
-		 * decode this Block. It will allow the Block decoder to
-		 * validate the unpadded size.
-		 */
-		lzma_vli unpadded_size;
-
-		/**
-		 * \brief       Total compressed size
-		 *
-		 * This includes all headers and padding in this Block.
-		 * This is useful if you need to know how many bytes
-		 * the Block decoder will actually read.
-		 */
-		lzma_vli total_size;
-
-		lzma_vli reserved_vli1;
-		lzma_vli reserved_vli2;
-		lzma_vli reserved_vli3;
-		lzma_vli reserved_vli4;
-
-		const void *reserved_ptr1;
-		const void *reserved_ptr2;
-		const void *reserved_ptr3;
-		const void *reserved_ptr4;
-	} block;
-
-	/*
-	 * Internal data which is used to store the state of the iterator.
-	 * The exact format may vary between liblzma versions, so don't
-	 * touch these in any way.
-	 */
-	union {
-		const void *p;
-		size_t s;
-		lzma_vli v;
-	} internal[6];
-} lzma_index_iter;
-
-
-/**
- * \brief       Operation mode for lzma_index_iter_next()
- */
-typedef enum {
-	LZMA_INDEX_ITER_ANY             = 0,
-		/**<
-		 * \brief       Get the next Block or Stream
-		 *
-		 * Go to the next Block if the current Stream has at least
-		 * one Block left. Otherwise go to the next Stream even if
-		 * it has no Blocks. If the Stream has no Blocks
-		 * (lzma_index_iter.stream.block_count == 0),
-		 * lzma_index_iter.block will have undefined values.
-		 */
-
-	LZMA_INDEX_ITER_STREAM          = 1,
-		/**<
-		 * \brief       Get the next Stream
-		 *
-		 * Go to the next Stream even if the current Stream has
-		 * unread Blocks left. If the next Stream has at least one
-		 * Block, the iterator will point to the first Block.
-		 * If there are no Blocks, lzma_index_iter.block will have
-		 * undefined values.
-		 */
-
-	LZMA_INDEX_ITER_BLOCK           = 2,
-		/**<
-		 * \brief       Get the next Block
-		 *
-		 * Go to the next Block if the current Stream has at least
-		 * one Block left. If the current Stream has no Blocks left,
-		 * the next Stream with at least one Block is located and
-		 * the iterator will be made to point to the first Block of
-		 * that Stream.
-		 */
-
-	LZMA_INDEX_ITER_NONEMPTY_BLOCK  = 3
-		/**<
-		 * \brief       Get the next non-empty Block
-		 *
-		 * This is like LZMA_INDEX_ITER_BLOCK except that it will
-		 * skip Blocks whose Uncompressed Size is zero.
-		 */
-
-} lzma_index_iter_mode;
-
-
-/**
- * \brief       Calculate memory usage of lzma_index
- *
- * On disk, the size of the Index field depends on both the number of Records
- * stored and how big values the Records store (due to variable-length integer
- * encoding). When the Index is kept in lzma_index structure, the memory usage
- * depends only on the number of Records/Blocks stored in the Index(es), and
- * in case of concatenated lzma_indexes, the number of Streams. The size in
- * RAM is almost always significantly bigger than in the encoded form on disk.
- *
- * This function calculates an approximate amount of memory needed hold
- * the given number of Streams and Blocks in lzma_index structure. This
- * value may vary between CPU architectures and also between liblzma versions
- * if the internal implementation is modified.
- */
-extern LZMA_API(uint64_t) lzma_index_memusage(
-		lzma_vli streams, lzma_vli blocks) lzma_nothrow;
-
-
-/**
- * \brief       Calculate the memory usage of an existing lzma_index
- *
- * This is a shorthand for lzma_index_memusage(lzma_index_stream_count(i),
- * lzma_index_block_count(i)).
- */
-extern LZMA_API(uint64_t) lzma_index_memused(const lzma_index *i)
-		lzma_nothrow;
-
-
-/**
- * \brief       Allocate and initialize a new lzma_index structure
- *
- * \return      On success, a pointer to an empty initialized lzma_index is
- *              returned. If allocation fails, NULL is returned.
- */
-extern LZMA_API(lzma_index *) lzma_index_init(lzma_allocator *allocator)
-		lzma_nothrow;
-
-
-/**
- * \brief       Deallocate lzma_index
- *
- * If i is NULL, this does nothing.
- */
-extern LZMA_API(void) lzma_index_end(lzma_index *i, lzma_allocator *allocator)
-		lzma_nothrow;
-
-
-/**
- * \brief       Add a new Block to lzma_index
- *
- * \param       i                 Pointer to a lzma_index structure
- * \param       allocator         Pointer to lzma_allocator, or NULL to
- *                                use malloc()
- * \param       unpadded_size     Unpadded Size of a Block. This can be
- *                                calculated with lzma_block_unpadded_size()
- *                                after encoding or decoding the Block.
- * \param       uncompressed_size Uncompressed Size of a Block. This can be
- *                                taken directly from lzma_block structure
- *                                after encoding or decoding the Block.
- *
- * Appending a new Block does not invalidate iterators. For example,
- * if an iterator was pointing to the end of the lzma_index, after
- * lzma_index_append() it is possible to read the next Block with
- * an existing iterator.
- *
- * \return      - LZMA_OK
- *              - LZMA_MEM_ERROR
- *              - LZMA_DATA_ERROR: Compressed or uncompressed size of the
- *                Stream or size of the Index field would grow too big.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_append(
-		lzma_index *i, lzma_allocator *allocator,
-		lzma_vli unpadded_size, lzma_vli uncompressed_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Set the Stream Flags
- *
- * Set the Stream Flags of the last (and typically the only) Stream
- * in lzma_index. This can be useful when reading information from the
- * lzma_index, because to decode Blocks, knowing the integrity check type
- * is needed.
- *
- * The given Stream Flags are copied into internal preallocated structure
- * in the lzma_index, thus the caller doesn't need to keep the *stream_flags
- * available after calling this function.
- *
- * \return      - LZMA_OK
- *              - LZMA_OPTIONS_ERROR: Unsupported stream_flags->version.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_stream_flags(
-		lzma_index *i, const lzma_stream_flags *stream_flags)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Get the types of integrity Checks
- *
- * If lzma_index_stream_flags() is used to set the Stream Flags for
- * every Stream, lzma_index_checks() can be used to get a bitmask to
- * indicate which Check types have been used. It can be useful e.g. if
- * showing the Check types to the user.
- *
- * The bitmask is 1 << check_id, e.g. CRC32 is 1 << 1 and SHA-256 is 1 << 10.
- */
-extern LZMA_API(uint32_t) lzma_index_checks(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Set the amount of Stream Padding
- *
- * Set the amount of Stream Padding of the last (and typically the only)
- * Stream in the lzma_index. This is needed when planning to do random-access
- * reading within multiple concatenated Streams.
- *
- * By default, the amount of Stream Padding is assumed to be zero bytes.
- *
- * \return      - LZMA_OK
- *              - LZMA_DATA_ERROR: The file size would grow too big.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_stream_padding(
-		lzma_index *i, lzma_vli stream_padding)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Get the number of Streams
- */
-extern LZMA_API(lzma_vli) lzma_index_stream_count(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the number of Blocks
- *
- * This returns the total number of Blocks in lzma_index. To get number
- * of Blocks in individual Streams, use lzma_index_iter.
- */
-extern LZMA_API(lzma_vli) lzma_index_block_count(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the size of the Index field as bytes
- *
- * This is needed to verify the Backward Size field in the Stream Footer.
- */
-extern LZMA_API(lzma_vli) lzma_index_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the total size of the Stream
- *
- * If multiple lzma_indexes have been combined, this works as if the Blocks
- * were in a single Stream. This is useful if you are going to combine
- * Blocks from multiple Streams into a single new Stream.
- */
-extern LZMA_API(lzma_vli) lzma_index_stream_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the total size of the Blocks
- *
- * This doesn't include the Stream Header, Stream Footer, Stream Padding,
- * or Index fields.
- */
-extern LZMA_API(lzma_vli) lzma_index_total_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the total size of the file
- *
- * When no lzma_indexes have been combined with lzma_index_cat() and there is
- * no Stream Padding, this function is identical to lzma_index_stream_size().
- * If multiple lzma_indexes have been combined, this includes also the headers
- * of each separate Stream and the possible Stream Padding fields.
- */
-extern LZMA_API(lzma_vli) lzma_index_file_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Get the uncompressed size of the file
- */
-extern LZMA_API(lzma_vli) lzma_index_uncompressed_size(const lzma_index *i)
-		lzma_nothrow lzma_attr_pure;
-
-
-/**
- * \brief       Initialize an iterator
- *
- * \param       iter    Pointer to a lzma_index_iter structure
- * \param       i       lzma_index to which the iterator will be associated
- *
- * This function associates the iterator with the given lzma_index, and calls
- * lzma_index_iter_rewind() on the iterator.
- *
- * This function doesn't allocate any memory, thus there is no
- * lzma_index_iter_end(). The iterator is valid as long as the
- * associated lzma_index is valid, that is, until lzma_index_end() or
- * using it as source in lzma_index_cat(). Specifically, lzma_index doesn't
- * become invalid if new Blocks are added to it with lzma_index_append() or
- * if it is used as the destination in lzma_index_cat().
- *
- * It is safe to make copies of an initialized lzma_index_iter, for example,
- * to easily restart reading at some particular position.
- */
-extern LZMA_API(void) lzma_index_iter_init(
-		lzma_index_iter *iter, const lzma_index *i) lzma_nothrow;
-
-
-/**
- * \brief       Rewind the iterator
- *
- * Rewind the iterator so that next call to lzma_index_iter_next() will
- * return the first Block or Stream.
- */
-extern LZMA_API(void) lzma_index_iter_rewind(lzma_index_iter *iter)
-		lzma_nothrow;
-
-
-/**
- * \brief       Get the next Block or Stream
- *
- * \param       iter    Iterator initialized with lzma_index_iter_init()
- * \param       mode    Specify what kind of information the caller wants
- *                      to get. See lzma_index_iter_mode for details.
- *
- * \return      If next Block or Stream matching the mode was found, *iter
- *              is updated and this function returns false. If no Block or
- *              Stream matching the mode is found, *iter is not modified
- *              and this function returns true. If mode is set to an unknown
- *              value, *iter is not modified and this function returns true.
- */
-extern LZMA_API(lzma_bool) lzma_index_iter_next(
-		lzma_index_iter *iter, lzma_index_iter_mode mode)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Locate a Block
- *
- * If it is possible to seek in the .xz file, it is possible to parse
- * the Index field(s) and use lzma_index_iter_locate() to do random-access
- * reading with granularity of Block size.
- *
- * \param       iter    Iterator that was earlier initialized with
- *                      lzma_index_iter_init().
- * \param       target  Uncompressed target offset which the caller would
- *                      like to locate from the Stream
- *
- * If the target is smaller than the uncompressed size of the Stream (can be
- * checked with lzma_index_uncompressed_size()):
- *  - Information about the Stream and Block containing the requested
- *    uncompressed offset is stored into *iter.
- *  - Internal state of the iterator is adjusted so that
- *    lzma_index_iter_next() can be used to read subsequent Blocks or Streams.
- *  - This function returns false.
- *
- * If target is greater than the uncompressed size of the Stream, *iter
- * is not modified, and this function returns true.
- */
-extern LZMA_API(lzma_bool) lzma_index_iter_locate(
-		lzma_index_iter *iter, lzma_vli target) lzma_nothrow;
-
-
-/**
- * \brief       Concatenate lzma_indexes
- *
- * Concatenating lzma_indexes is useful when doing random-access reading in
- * multi-Stream .xz file, or when combining multiple Streams into single
- * Stream.
- *
- * \param       dest      lzma_index after which src is appended
- * \param       src       lzma_index to be appended after dest. If this
- *                        function succeeds, the memory allocated for src
- *                        is freed or moved to be part of dest, and all
- *                        iterators pointing to src will become invalid.
- * \param       allocator Custom memory allocator; can be NULL to use
- *                        malloc() and free().
- *
- * \return      - LZMA_OK: lzma_indexes were concatenated successfully.
- *                src is now a dangling pointer.
- *              - LZMA_DATA_ERROR: *dest would grow too big.
- *              - LZMA_MEM_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_cat(
-		lzma_index *dest, lzma_index *src, lzma_allocator *allocator)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Duplicate lzma_index
- *
- * \return      A copy of the lzma_index, or NULL if memory allocation failed.
- */
-extern LZMA_API(lzma_index *) lzma_index_dup(
-		const lzma_index *i, lzma_allocator *allocator)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .xz Index encoder
- *
- * \param       strm        Pointer to properly prepared lzma_stream
- * \param       i           Pointer to lzma_index which should be encoded.
- *
- * The valid `action' values for lzma_code() are LZMA_RUN and LZMA_FINISH.
- * It is enough to use only one of them (you can choose freely; use LZMA_RUN
- * to support liblzma versions older than 5.0.0).
- *
- * \return      - LZMA_OK: Initialization succeeded, continue with lzma_code().
- *              - LZMA_MEM_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_encoder(
-		lzma_stream *strm, const lzma_index *i)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Initialize .xz Index decoder
- *
- * \param       strm        Pointer to properly prepared lzma_stream
- * \param       i           The decoded Index will be made available via
- *                          this pointer. Initially this function will
- *                          set *i to NULL (the old value is ignored). If
- *                          decoding succeeds (lzma_code() returns
- *                          LZMA_STREAM_END), *i will be set to point
- *                          to a new lzma_index, which the application
- *                          has to later free with lzma_index_end().
- * \param       memlimit    How much memory the resulting lzma_index is
- *                          allowed to require.
- *
- * The valid `action' values for lzma_code() are LZMA_RUN and LZMA_FINISH.
- * It is enough to use only one of them (you can choose freely; use LZMA_RUN
- * to support liblzma versions older than 5.0.0).
- *
- * \return      - LZMA_OK: Initialization succeeded, continue with lzma_code().
- *              - LZMA_MEM_ERROR
- *              - LZMA_MEMLIMIT_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_decoder(
-		lzma_stream *strm, lzma_index **i, uint64_t memlimit)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Single-call .xz Index encoder
- *
- * \param       i         lzma_index to be encoded
- * \param       out       Beginning of the output buffer
- * \param       out_pos   The next byte will be written to out[*out_pos].
- *                        *out_pos is updated only if encoding succeeds.
- * \param       out_size  Size of the out buffer; the first byte into
- *                        which no data is written to is out[out_size].
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_BUF_ERROR: Output buffer is too small. Use
- *                lzma_index_size() to find out how much output
- *                space is needed.
- *              - LZMA_PROG_ERROR
- *
- * \note        This function doesn't take allocator argument since all
- *              the internal data is allocated on stack.
- */
-extern LZMA_API(lzma_ret) lzma_index_buffer_encode(const lzma_index *i,
-		uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Single-call .xz Index decoder
- *
- * \param       i           If decoding succeeds, *i will point to a new
- *                          lzma_index, which the application has to
- *                          later free with lzma_index_end(). If an error
- *                          occurs, *i will be NULL. The old value of *i
- *                          is always ignored and thus doesn't need to be
- *                          initialized by the caller.
- * \param       memlimit    Pointer to how much memory the resulting
- *                          lzma_index is allowed to require. The value
- *                          pointed by this pointer is modified if and only
- *                          if LZMA_MEMLIMIT_ERROR is returned.
- * \param       allocator   Pointer to lzma_allocator, or NULL to use malloc()
- * \param       in          Beginning of the input buffer
- * \param       in_pos      The next byte will be read from in[*in_pos].
- *                          *in_pos is updated only if decoding succeeds.
- * \param       in_size     Size of the input buffer; the first byte that
- *                          won't be read is in[in_size].
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_MEM_ERROR
- *              - LZMA_MEMLIMIT_ERROR: Memory usage limit was reached.
- *                The minimum required memlimit value was stored to *memlimit.
- *              - LZMA_DATA_ERROR
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_buffer_decode(lzma_index **i,
-		uint64_t *memlimit, lzma_allocator *allocator,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-		lzma_nothrow;
diff --git a/include.new/lzma/index_hash.h b/include.new/lzma/index_hash.h
deleted file mode 100644
index fa2e048..0000000
--- a/include.new/lzma/index_hash.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * \file        lzma/index_hash.h
- * \brief       Validate Index by using a hash function
- *
- * Hashing makes it possible to use constant amount of memory to validate
- * Index of arbitrary size.
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-/**
- * \brief       Opaque data type to hold the Index hash
- */
-typedef struct lzma_index_hash_s lzma_index_hash;
-
-
-/**
- * \brief       Allocate and initialize a new lzma_index_hash structure
- *
- * If index_hash is NULL, a new lzma_index_hash structure is allocated,
- * initialized, and a pointer to it returned. If allocation fails, NULL
- * is returned.
- *
- * If index_hash is non-NULL, it is reinitialized and the same pointer
- * returned. In this case, return value cannot be NULL or a different
- * pointer than the index_hash that was given as an argument.
- */
-extern LZMA_API(lzma_index_hash *) lzma_index_hash_init(
-		lzma_index_hash *index_hash, lzma_allocator *allocator)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Deallocate lzma_index_hash structure
- */
-extern LZMA_API(void) lzma_index_hash_end(
-		lzma_index_hash *index_hash, lzma_allocator *allocator)
-		lzma_nothrow;
-
-
-/**
- * \brief       Add a new Record to an Index hash
- *
- * \param       index             Pointer to a lzma_index_hash structure
- * \param       unpadded_size     Unpadded Size of a Block
- * \param       uncompressed_size Uncompressed Size of a Block
- *
- * \return      - LZMA_OK
- *              - LZMA_DATA_ERROR: Compressed or uncompressed size of the
- *                Stream or size of the Index field would grow too big.
- *              - LZMA_PROG_ERROR: Invalid arguments or this function is being
- *                used when lzma_index_hash_decode() has already been used.
- */
-extern LZMA_API(lzma_ret) lzma_index_hash_append(lzma_index_hash *index_hash,
-		lzma_vli unpadded_size, lzma_vli uncompressed_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode and validate the Index field
- *
- * After telling the sizes of all Blocks with lzma_index_hash_append(),
- * the actual Index field is decoded with this function. Specifically,
- * once decoding of the Index field has been started, no more Records
- * can be added using lzma_index_hash_append().
- *
- * This function doesn't use lzma_stream structure to pass the input data.
- * Instead, the input buffer is specified using three arguments. This is
- * because it matches better the internal APIs of liblzma.
- *
- * \param       index_hash      Pointer to a lzma_index_hash structure
- * \param       in              Pointer to the beginning of the input buffer
- * \param       in_pos          in[*in_pos] is the next byte to process
- * \param       in_size         in[in_size] is the first byte not to process
- *
- * \return      - LZMA_OK: So far good, but more input is needed.
- *              - LZMA_STREAM_END: Index decoded successfully and it matches
- *                the Records given with lzma_index_hash_append().
- *              - LZMA_DATA_ERROR: Index is corrupt or doesn't match the
- *                information given with lzma_index_hash_append().
- *              - LZMA_BUF_ERROR: Cannot progress because *in_pos >= in_size.
- *              - LZMA_PROG_ERROR
- */
-extern LZMA_API(lzma_ret) lzma_index_hash_decode(lzma_index_hash *index_hash,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Get the size of the Index field as bytes
- *
- * This is needed to verify the Backward Size field in the Stream Footer.
- */
-extern LZMA_API(lzma_vli) lzma_index_hash_size(
-		const lzma_index_hash *index_hash)
-		lzma_nothrow lzma_attr_pure;
diff --git a/include.new/lzma/lzma.h b/include.new/lzma/lzma.h
deleted file mode 100644
index 3f8e095..0000000
--- a/include.new/lzma/lzma.h
+++ /dev/null
@@ -1,420 +0,0 @@
-/**
- * \file        lzma/lzma.h
- * \brief       LZMA1 and LZMA2 filters
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       LZMA1 Filter ID
- *
- * LZMA1 is the very same thing as what was called just LZMA in LZMA Utils,
- * 7-Zip, and LZMA SDK. It's called LZMA1 here to prevent developers from
- * accidentally using LZMA when they actually want LZMA2.
- *
- * LZMA1 shouldn't be used for new applications unless you _really_ know
- * what you are doing. LZMA2 is almost always a better choice.
- */
-#define LZMA_FILTER_LZMA1       LZMA_VLI_C(0x4000000000000001)
-
-/**
- * \brief       LZMA2 Filter ID
- *
- * Usually you want this instead of LZMA1. Compared to LZMA1, LZMA2 adds
- * support for LZMA_SYNC_FLUSH, uncompressed chunks (smaller expansion
- * when trying to compress uncompressible data), possibility to change
- * lc/lp/pb in the middle of encoding, and some other internal improvements.
- */
-#define LZMA_FILTER_LZMA2       LZMA_VLI_C(0x21)
-
-
-/**
- * \brief       Match finders
- *
- * Match finder has major effect on both speed and compression ratio.
- * Usually hash chains are faster than binary trees.
- *
- * If you will use LZMA_SYNC_FLUSH often, the hash chains may be a better
- * choice, because binary trees get much higher compression ratio penalty
- * with LZMA_SYNC_FLUSH.
- *
- * The memory usage formulas are only rough estimates, which are closest to
- * reality when dict_size is a power of two. The formulas are  more complex
- * in reality, and can also change a little between liblzma versions. Use
- * lzma_raw_encoder_memusage() to get more accurate estimate of memory usage.
- */
-typedef enum {
-	LZMA_MF_HC3     = 0x03,
-		/**<
-		 * \brief       Hash Chain with 2- and 3-byte hashing
-		 *
-		 * Minimum nice_len: 3
-		 *
-		 * Memory usage:
-		 *  - dict_size <= 16 MiB: dict_size * 7.5
-		 *  - dict_size > 16 MiB: dict_size * 5.5 + 64 MiB
-		 */
-
-	LZMA_MF_HC4     = 0x04,
-		/**<
-		 * \brief       Hash Chain with 2-, 3-, and 4-byte hashing
-		 *
-		 * Minimum nice_len: 4
-		 *
-		 * Memory usage:
-		 *  - dict_size <= 32 MiB: dict_size * 7.5
-		 *  - dict_size > 32 MiB: dict_size * 6.5
-		 */
-
-	LZMA_MF_BT2     = 0x12,
-		/**<
-		 * \brief       Binary Tree with 2-byte hashing
-		 *
-		 * Minimum nice_len: 2
-		 *
-		 * Memory usage: dict_size * 9.5
-		 */
-
-	LZMA_MF_BT3     = 0x13,
-		/**<
-		 * \brief       Binary Tree with 2- and 3-byte hashing
-		 *
-		 * Minimum nice_len: 3
-		 *
-		 * Memory usage:
-		 *  - dict_size <= 16 MiB: dict_size * 11.5
-		 *  - dict_size > 16 MiB: dict_size * 9.5 + 64 MiB
-		 */
-
-	LZMA_MF_BT4     = 0x14
-		/**<
-		 * \brief       Binary Tree with 2-, 3-, and 4-byte hashing
-		 *
-		 * Minimum nice_len: 4
-		 *
-		 * Memory usage:
-		 *  - dict_size <= 32 MiB: dict_size * 11.5
-		 *  - dict_size > 32 MiB: dict_size * 10.5
-		 */
-} lzma_match_finder;
-
-
-/**
- * \brief       Test if given match finder is supported
- *
- * Return true if the given match finder is supported by this liblzma build.
- * Otherwise false is returned. It is safe to call this with a value that
- * isn't listed in lzma_match_finder enumeration; the return value will be
- * false.
- *
- * There is no way to list which match finders are available in this
- * particular liblzma version and build. It would be useless, because
- * a new match finder, which the application developer wasn't aware,
- * could require giving additional options to the encoder that the older
- * match finders don't need.
- */
-extern LZMA_API(lzma_bool) lzma_mf_is_supported(lzma_match_finder match_finder)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Compression modes
- *
- * This selects the function used to analyze the data produced by the match
- * finder.
- */
-typedef enum {
-	LZMA_MODE_FAST = 1,
-		/**<
-		 * \brief       Fast compression
-		 *
-		 * Fast mode is usually at its best when combined with
-		 * a hash chain match finder.
-		 */
-
-	LZMA_MODE_NORMAL = 2
-		/**<
-		 * \brief       Normal compression
-		 *
-		 * This is usually notably slower than fast mode. Use this
-		 * together with binary tree match finders to expose the
-		 * full potential of the LZMA1 or LZMA2 encoder.
-		 */
-} lzma_mode;
-
-
-/**
- * \brief       Test if given compression mode is supported
- *
- * Return true if the given compression mode is supported by this liblzma
- * build. Otherwise false is returned. It is safe to call this with a value
- * that isn't listed in lzma_mode enumeration; the return value will be false.
- *
- * There is no way to list which modes are available in this particular
- * liblzma version and build. It would be useless, because a new compression
- * mode, which the application developer wasn't aware, could require giving
- * additional options to the encoder that the older modes don't need.
- */
-extern LZMA_API(lzma_bool) lzma_mode_is_supported(lzma_mode mode)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Options specific to the LZMA1 and LZMA2 filters
- *
- * Since LZMA1 and LZMA2 share most of the code, it's simplest to share
- * the options structure too. For encoding, all but the reserved variables
- * need to be initialized unless specifically mentioned otherwise.
- * lzma_lzma_preset() can be used to get a good starting point.
- *
- * For raw decoding, both LZMA1 and LZMA2 need dict_size, preset_dict, and
- * preset_dict_size (if preset_dict != NULL). LZMA1 needs also lc, lp, and pb.
- */
-typedef struct {
-	/**
-	 * \brief       Dictionary size in bytes
-	 *
-	 * Dictionary size indicates how many bytes of the recently processed
-	 * uncompressed data is kept in memory. One method to reduce size of
-	 * the uncompressed data is to store distance-length pairs, which
-	 * indicate what data to repeat from the dictionary buffer. Thus,
-	 * the bigger the dictionary, the better the compression ratio
-	 * usually is.
-	 *
-	 * Maximum size of the dictionary depends on multiple things:
-	 *  - Memory usage limit
-	 *  - Available address space (not a problem on 64-bit systems)
-	 *  - Selected match finder (encoder only)
-	 *
-	 * Currently the maximum dictionary size for encoding is 1.5 GiB
-	 * (i.e. (UINT32_C(1) << 30) + (UINT32_C(1) << 29)) even on 64-bit
-	 * systems for certain match finder implementation reasons. In the
-	 * future, there may be match finders that support bigger
-	 * dictionaries.
-	 *
-	 * Decoder already supports dictionaries up to 4 GiB - 1 B (i.e.
-	 * UINT32_MAX), so increasing the maximum dictionary size of the
-	 * encoder won't cause problems for old decoders.
-	 *
-	 * Because extremely small dictionaries sizes would have unneeded
-	 * overhead in the decoder, the minimum dictionary size is 4096 bytes.
-	 *
-	 * \note        When decoding, too big dictionary does no other harm
-	 *              than wasting memory.
-	 */
-	uint32_t dict_size;
-#	define LZMA_DICT_SIZE_MIN       UINT32_C(4096)
-#	define LZMA_DICT_SIZE_DEFAULT   (UINT32_C(1) << 23)
-
-	/**
-	 * \brief       Pointer to an initial dictionary
-	 *
-	 * It is possible to initialize the LZ77 history window using
-	 * a preset dictionary. It is useful when compressing many
-	 * similar, relatively small chunks of data independently from
-	 * each other. The preset dictionary should contain typical
-	 * strings that occur in the files being compressed. The most
-	 * probable strings should be near the end of the preset dictionary.
-	 *
-	 * This feature should be used only in special situations. For
-	 * now, it works correctly only with raw encoding and decoding.
-	 * Currently none of the container formats supported by
-	 * liblzma allow preset dictionary when decoding, thus if
-	 * you create a .xz or .lzma file with preset dictionary, it
-	 * cannot be decoded with the regular decoder functions. In the
-	 * future, the .xz format will likely get support for preset
-	 * dictionary though.
-	 */
-	const uint8_t *preset_dict;
-
-	/**
-	 * \brief       Size of the preset dictionary
-	 *
-	 * Specifies the size of the preset dictionary. If the size is
-	 * bigger than dict_size, only the last dict_size bytes are
-	 * processed.
-	 *
-	 * This variable is read only when preset_dict is not NULL.
-	 * If preset_dict is not NULL but preset_dict_size is zero,
-	 * no preset dictionary is used (identical to only setting
-	 * preset_dict to NULL).
-	 */
-	uint32_t preset_dict_size;
-
-	/**
-	 * \brief       Number of literal context bits
-	 *
-	 * How many of the highest bits of the previous uncompressed
-	 * eight-bit byte (also known as `literal') are taken into
-	 * account when predicting the bits of the next literal.
-	 *
-	 * E.g. in typical English text, an upper-case letter is
-	 * often followed by a lower-case letter, and a lower-case
-	 * letter is usually followed by another lower-case letter.
-	 * In the US-ASCII character set, the highest three bits are 010
-	 * for upper-case letters and 011 for lower-case letters.
-	 * When lc is at least 3, the literal coding can take advantage of
-	 * this property in the uncompressed data.
-	 *
-	 * There is a limit that applies to literal context bits and literal
-	 * position bits together: lc + lp <= 4. Without this limit the
-	 * decoding could become very slow, which could have security related
-	 * results in some cases like email servers doing virus scanning.
-	 * This limit also simplifies the internal implementation in liblzma.
-	 *
-	 * There may be LZMA1 streams that have lc + lp > 4 (maximum possible
-	 * lc would be 8). It is not possible to decode such streams with
-	 * liblzma.
-	 */
-	uint32_t lc;
-#	define LZMA_LCLP_MIN    0
-#	define LZMA_LCLP_MAX    4
-#	define LZMA_LC_DEFAULT  3
-
-	/**
-	 * \brief       Number of literal position bits
-	 *
-	 * lp affects what kind of alignment in the uncompressed data is
-	 * assumed when encoding literals. A literal is a single 8-bit byte.
-	 * See pb below for more information about alignment.
-	 */
-	uint32_t lp;
-#	define LZMA_LP_DEFAULT  0
-
-	/**
-	 * \brief       Number of position bits
-	 *
-	 * pb affects what kind of alignment in the uncompressed data is
-	 * assumed in general. The default means four-byte alignment
-	 * (2^ pb =2^2=4), which is often a good choice when there's
-	 * no better guess.
-	 *
-	 * When the aligment is known, setting pb accordingly may reduce
-	 * the file size a little. E.g. with text files having one-byte
-	 * alignment (US-ASCII, ISO-8859-*, UTF-8), setting pb=0 can
-	 * improve compression slightly. For UTF-16 text, pb=1 is a good
-	 * choice. If the alignment is an odd number like 3 bytes, pb=0
-	 * might be the best choice.
-	 *
-	 * Even though the assumed alignment can be adjusted with pb and
-	 * lp, LZMA1 and LZMA2 still slightly favor 16-byte alignment.
-	 * It might be worth taking into account when designing file formats
-	 * that are likely to be often compressed with LZMA1 or LZMA2.
-	 */
-	uint32_t pb;
-#	define LZMA_PB_MIN      0
-#	define LZMA_PB_MAX      4
-#	define LZMA_PB_DEFAULT  2
-
-	/** Compression mode */
-	lzma_mode mode;
-
-	/**
-	 * \brief       Nice length of a match
-	 *
-	 * This determines how many bytes the encoder compares from the match
-	 * candidates when looking for the best match. Once a match of at
-	 * least nice_len bytes long is found, the encoder stops looking for
-	 * better candidates and encodes the match. (Naturally, if the found
-	 * match is actually longer than nice_len, the actual length is
-	 * encoded; it's not truncated to nice_len.)
-	 *
-	 * Bigger values usually increase the compression ratio and
-	 * compression time. For most files, 32 to 128 is a good value,
-	 * which gives very good compression ratio at good speed.
-	 *
-	 * The exact minimum value depends on the match finder. The maximum
-	 * is 273, which is the maximum length of a match that LZMA1 and
-	 * LZMA2 can encode.
-	 */
-	uint32_t nice_len;
-
-	/** Match finder ID */
-	lzma_match_finder mf;
-
-	/**
-	 * \brief       Maximum search depth in the match finder
-	 *
-	 * For every input byte, match finder searches through the hash chain
-	 * or binary tree in a loop, each iteration going one step deeper in
-	 * the chain or tree. The searching stops if
-	 *  - a match of at least nice_len bytes long is found;
-	 *  - all match candidates from the hash chain or binary tree have
-	 *    been checked; or
-	 *  - maximum search depth is reached.
-	 *
-	 * Maximum search depth is needed to prevent the match finder from
-	 * wasting too much time in case there are lots of short match
-	 * candidates. On the other hand, stopping the search before all
-	 * candidates have been checked can reduce compression ratio.
-	 *
-	 * Setting depth to zero tells liblzma to use an automatic default
-	 * value, that depends on the selected match finder and nice_len.
-	 * The default is in the range [4, 200] or so (it may vary between
-	 * liblzma versions).
-	 *
-	 * Using a bigger depth value than the default can increase
-	 * compression ratio in some cases. There is no strict maximum value,
-	 * but high values (thousands or millions) should be used with care:
-	 * the encoder could remain fast enough with typical input, but
-	 * malicious input could cause the match finder to slow down
-	 * dramatically, possibly creating a denial of service attack.
-	 */
-	uint32_t depth;
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. You should not touch these, because the names
-	 * of these variables may change. These are and will never be used
-	 * with the currently supported options, so it is safe to leave these
-	 * uninitialized.
-	 */
-	uint32_t reserved_int1;
-	uint32_t reserved_int2;
-	uint32_t reserved_int3;
-	uint32_t reserved_int4;
-	uint32_t reserved_int5;
-	uint32_t reserved_int6;
-	uint32_t reserved_int7;
-	uint32_t reserved_int8;
-	lzma_reserved_enum reserved_enum1;
-	lzma_reserved_enum reserved_enum2;
-	lzma_reserved_enum reserved_enum3;
-	lzma_reserved_enum reserved_enum4;
-	void *reserved_ptr1;
-	void *reserved_ptr2;
-
-} lzma_options_lzma;
-
-
-/**
- * \brief       Set a compression preset to lzma_options_lzma structure
- *
- * 0 is the fastest and 9 is the slowest. These match the switches -0 .. -9
- * of the xz command line tool. In addition, it is possible to bitwise-or
- * flags to the preset. Currently only LZMA_PRESET_EXTREME is supported.
- * The flags are defined in container.h, because the flags are used also
- * with lzma_easy_encoder().
- *
- * The preset values are subject to changes between liblzma versions.
- *
- * This function is available only if LZMA1 or LZMA2 encoder has been enabled
- * when building liblzma.
- *
- * \return      On success, false is returned. If the preset is not
- *              supported, true is returned.
- */
-extern LZMA_API(lzma_bool) lzma_lzma_preset(
-		lzma_options_lzma *options, uint32_t preset) lzma_nothrow;
diff --git a/include.new/lzma/stream_flags.h b/include.new/lzma/stream_flags.h
deleted file mode 100644
index bbdd408..0000000
--- a/include.new/lzma/stream_flags.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * \file        lzma/stream_flags.h
- * \brief       .xz Stream Header and Stream Footer encoder and decoder
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Size of Stream Header and Stream Footer
- *
- * Stream Header and Stream Footer have the same size and they are not
- * going to change even if a newer version of the .xz file format is
- * developed in future.
- */
-#define LZMA_STREAM_HEADER_SIZE 12
-
-
-/**
- * \brief       Options for encoding/decoding Stream Header and Stream Footer
- */
-typedef struct {
-	/**
-	 * \brief       Stream Flags format version
-	 *
-	 * To prevent API and ABI breakages if new features are needed in
-	 * Stream Header or Stream Footer, a version number is used to
-	 * indicate which fields in this structure are in use. For now,
-	 * version must always be zero. With non-zero version, the
-	 * lzma_stream_header_encode() and lzma_stream_footer_encode()
-	 * will return LZMA_OPTIONS_ERROR.
-	 *
-	 * lzma_stream_header_decode() and lzma_stream_footer_decode()
-	 * will always set this to the lowest value that supports all the
-	 * features indicated by the Stream Flags field. The application
-	 * must check that the version number set by the decoding functions
-	 * is supported by the application. Otherwise it is possible that
-	 * the application will decode the Stream incorrectly.
-	 */
-	uint32_t version;
-
-	/**
-	 * \brief       Backward Size
-	 *
-	 * Backward Size must be a multiple of four bytes. In this Stream
-	 * format version, Backward Size is the size of the Index field.
-	 *
-	 * Backward Size isn't actually part of the Stream Flags field, but
-	 * it is convenient to include in this structure anyway. Backward
-	 * Size is present only in the Stream Footer. There is no need to
-	 * initialize backward_size when encoding Stream Header.
-	 *
-	 * lzma_stream_header_decode() always sets backward_size to
-	 * LZMA_VLI_UNKNOWN so that it is convenient to use
-	 * lzma_stream_flags_compare() when both Stream Header and Stream
-	 * Footer have been decoded.
-	 */
-	lzma_vli backward_size;
-#	define LZMA_BACKWARD_SIZE_MIN 4
-#	define LZMA_BACKWARD_SIZE_MAX (LZMA_VLI_C(1) << 34)
-
-	/**
-	 * \brief       Check ID
-	 *
-	 * This indicates the type of the integrity check calculated from
-	 * uncompressed data.
-	 */
-	lzma_check check;
-
-	/*
-	 * Reserved space to allow possible future extensions without
-	 * breaking the ABI. You should not touch these, because the
-	 * names of these variables may change.
-	 *
-	 * (We will never be able to use all of these since Stream Flags
-	 * is just two bytes plus Backward Size of four bytes. But it's
-	 * nice to have the proper types when they are needed.)
-	 */
-	lzma_reserved_enum reserved_enum1;
-	lzma_reserved_enum reserved_enum2;
-	lzma_reserved_enum reserved_enum3;
-	lzma_reserved_enum reserved_enum4;
-	lzma_bool reserved_bool1;
-	lzma_bool reserved_bool2;
-	lzma_bool reserved_bool3;
-	lzma_bool reserved_bool4;
-	lzma_bool reserved_bool5;
-	lzma_bool reserved_bool6;
-	lzma_bool reserved_bool7;
-	lzma_bool reserved_bool8;
-	uint32_t reserved_int1;
-	uint32_t reserved_int2;
-
-} lzma_stream_flags;
-
-
-/**
- * \brief       Encode Stream Header
- *
- * \param       options     Stream Header options to be encoded.
- *                          options->backward_size is ignored and doesn't
- *                          need to be initialized.
- * \param       out         Beginning of the output buffer of
- *                          LZMA_STREAM_HEADER_SIZE bytes.
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_OPTIONS_ERROR: options->version is not supported by
- *                this liblzma version.
- *              - LZMA_PROG_ERROR: Invalid options.
- */
-extern LZMA_API(lzma_ret) lzma_stream_header_encode(
-		const lzma_stream_flags *options, uint8_t *out)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Encode Stream Footer
- *
- * \param       options     Stream Footer options to be encoded.
- * \param       out         Beginning of the output buffer of
- *                          LZMA_STREAM_HEADER_SIZE bytes.
- *
- * \return      - LZMA_OK: Encoding was successful.
- *              - LZMA_OPTIONS_ERROR: options->version is not supported by
- *                this liblzma version.
- *              - LZMA_PROG_ERROR: Invalid options.
- */
-extern LZMA_API(lzma_ret) lzma_stream_footer_encode(
-		const lzma_stream_flags *options, uint8_t *out)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode Stream Header
- *
- * \param       options     Target for the decoded Stream Header options.
- * \param       in          Beginning of the input buffer of
- *                          LZMA_STREAM_HEADER_SIZE bytes.
- *
- * options->backward_size is always set to LZMA_VLI_UNKNOWN. This is to
- * help comparing Stream Flags from Stream Header and Stream Footer with
- * lzma_stream_flags_compare().
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_FORMAT_ERROR: Magic bytes don't match, thus the given
- *                buffer cannot be Stream Header.
- *              - LZMA_DATA_ERROR: CRC32 doesn't match, thus the header
- *                is corrupt.
- *              - LZMA_OPTIONS_ERROR: Unsupported options are present
- *                in the header.
- *
- * \note        When decoding .xz files that contain multiple Streams, it may
- *              make sense to print "file format not recognized" only if
- *              decoding of the Stream Header of the _first_ Stream gives
- *              LZMA_FORMAT_ERROR. If non-first Stream Header gives
- *              LZMA_FORMAT_ERROR, the message used for LZMA_DATA_ERROR is
- *              probably more appropriate.
- *
- *              For example, Stream decoder in liblzma uses LZMA_DATA_ERROR if
- *              LZMA_FORMAT_ERROR is returned by lzma_stream_header_decode()
- *              when decoding non-first Stream.
- */
-extern LZMA_API(lzma_ret) lzma_stream_header_decode(
-		lzma_stream_flags *options, const uint8_t *in)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Decode Stream Footer
- *
- * \param       options     Target for the decoded Stream Header options.
- * \param       in          Beginning of the input buffer of
- *                          LZMA_STREAM_HEADER_SIZE bytes.
- *
- * \return      - LZMA_OK: Decoding was successful.
- *              - LZMA_FORMAT_ERROR: Magic bytes don't match, thus the given
- *                buffer cannot be Stream Footer.
- *              - LZMA_DATA_ERROR: CRC32 doesn't match, thus the Stream Footer
- *                is corrupt.
- *              - LZMA_OPTIONS_ERROR: Unsupported options are present
- *                in Stream Footer.
- *
- * \note        If Stream Header was already decoded successfully, but
- *              decoding Stream Footer returns LZMA_FORMAT_ERROR, the
- *              application should probably report some other error message
- *              than "file format not recognized", since the file more likely
- *              is corrupt (possibly truncated). Stream decoder in liblzma
- *              uses LZMA_DATA_ERROR in this situation.
- */
-extern LZMA_API(lzma_ret) lzma_stream_footer_decode(
-		lzma_stream_flags *options, const uint8_t *in)
-		lzma_nothrow lzma_attr_warn_unused_result;
-
-
-/**
- * \brief       Compare two lzma_stream_flags structures
- *
- * backward_size values are compared only if both are not
- * LZMA_VLI_UNKNOWN.
- *
- * \return      - LZMA_OK: Both are equal. If either had backward_size set
- *                to LZMA_VLI_UNKNOWN, backward_size values were not
- *                compared or validated.
- *              - LZMA_DATA_ERROR: The structures differ.
- *              - LZMA_OPTIONS_ERROR: version in either structure is greater
- *                than the maximum supported version (currently zero).
- *              - LZMA_PROG_ERROR: Invalid value, e.g. invalid check or
- *                backward_size.
- */
-extern LZMA_API(lzma_ret) lzma_stream_flags_compare(
-		const lzma_stream_flags *a, const lzma_stream_flags *b)
-		lzma_nothrow lzma_attr_pure;
diff --git a/include.new/lzma/version.h b/include.new/lzma/version.h
deleted file mode 100644
index beec18e..0000000
--- a/include.new/lzma/version.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * \file        lzma/version.h
- * \brief       Version number
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/*
- * Version number split into components
- */
-#define LZMA_VERSION_MAJOR 5
-#define LZMA_VERSION_MINOR 0
-#define LZMA_VERSION_PATCH 7
-#define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE
-
-#ifndef LZMA_VERSION_COMMIT
-#	define LZMA_VERSION_COMMIT ""
-#endif
-
-
-/*
- * Map symbolic stability levels to integers.
- */
-#define LZMA_VERSION_STABILITY_ALPHA 0
-#define LZMA_VERSION_STABILITY_BETA 1
-#define LZMA_VERSION_STABILITY_STABLE 2
-
-
-/**
- * \brief       Compile-time version number
- *
- * The version number is of format xyyyzzzs where
- *  - x = major
- *  - yyy = minor
- *  - zzz = revision
- *  - s indicates stability: 0 = alpha, 1 = beta, 2 = stable
- *
- * The same xyyyzzz triplet is never reused with different stability levels.
- * For example, if 5.1.0alpha has been released, there will never be 5.1.0beta
- * or 5.1.0 stable.
- *
- * \note        The version number of liblzma has nothing to with
- *              the version number of Igor Pavlov's LZMA SDK.
- */
-#define LZMA_VERSION (LZMA_VERSION_MAJOR * UINT32_C(10000000) \
-		+ LZMA_VERSION_MINOR * UINT32_C(10000) \
-		+ LZMA_VERSION_PATCH * UINT32_C(10) \
-		+ LZMA_VERSION_STABILITY)
-
-
-/*
- * Macros to construct the compile-time version string
- */
-#if LZMA_VERSION_STABILITY == LZMA_VERSION_STABILITY_ALPHA
-#	define LZMA_VERSION_STABILITY_STRING "alpha"
-#elif LZMA_VERSION_STABILITY == LZMA_VERSION_STABILITY_BETA
-#	define LZMA_VERSION_STABILITY_STRING "beta"
-#elif LZMA_VERSION_STABILITY == LZMA_VERSION_STABILITY_STABLE
-#	define LZMA_VERSION_STABILITY_STRING ""
-#else
-#	error Incorrect LZMA_VERSION_STABILITY
-#endif
-
-#define LZMA_VERSION_STRING_C_(major, minor, patch, stability, commit) \
-		#major "." #minor "." #patch stability commit
-
-#define LZMA_VERSION_STRING_C(major, minor, patch, stability, commit) \
-		LZMA_VERSION_STRING_C_(major, minor, patch, stability, commit)
-
-
-/**
- * \brief       Compile-time version as a string
- *
- * This can be for example "4.999.5alpha", "4.999.8beta", or "5.0.0" (stable
- * versions don't have any "stable" suffix). In future, a snapshot built
- * from source code repository may include an additional suffix, for example
- * "4.999.8beta-21-g1d92". The commit ID won't be available in numeric form
- * in LZMA_VERSION macro.
- */
-#define LZMA_VERSION_STRING LZMA_VERSION_STRING_C( \
-		LZMA_VERSION_MAJOR, LZMA_VERSION_MINOR, \
-		LZMA_VERSION_PATCH, LZMA_VERSION_STABILITY_STRING, \
-		LZMA_VERSION_COMMIT)
-
-
-/* #ifndef is needed for use with windres (MinGW or Cygwin). */
-#ifndef LZMA_H_INTERNAL_RC
-
-/**
- * \brief       Run-time version number as an integer
- *
- * Return the value of LZMA_VERSION macro at the compile time of liblzma.
- * This allows the application to compare if it was built against the same,
- * older, or newer version of liblzma that is currently running.
- */
-extern LZMA_API(uint32_t) lzma_version_number(void)
-		lzma_nothrow lzma_attr_const;
-
-
-/**
- * \brief       Run-time version as a string
- *
- * This function may be useful if you want to display which version of
- * liblzma your application is currently using.
- */
-extern LZMA_API(const char *) lzma_version_string(void)
-		lzma_nothrow lzma_attr_const;
-
-#endif
diff --git a/include.new/lzma/vli.h b/include.new/lzma/vli.h
deleted file mode 100644
index 9ad13f2..0000000
--- a/include.new/lzma/vli.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * \file        lzma/vli.h
- * \brief       Variable-length integer handling
- *
- * In the .xz format, most integers are encoded in a variable-length
- * representation, which is sometimes called little endian base-128 encoding.
- * This saves space when smaller values are more likely than bigger values.
- *
- * The encoding scheme encodes seven bits to every byte, using minimum
- * number of bytes required to represent the given value. Encodings that use
- * non-minimum number of bytes are invalid, thus every integer has exactly
- * one encoded representation. The maximum number of bits in a VLI is 63,
- * thus the vli argument must be less than or equal to UINT64_MAX / 2. You
- * should use LZMA_VLI_MAX for clarity.
- */
-
-/*
- * Author: Lasse Collin
- *
- * This file has been put into the public domain.
- * You can do whatever you want with this file.
- *
- * See ../lzma.h for information about liblzma as a whole.
- */
-
-#ifndef LZMA_H_INTERNAL
-#	error Never include this file directly. Use <lzma.h> instead.
-#endif
-
-
-/**
- * \brief       Maximum supported value of a variable-length integer
- */
-#define LZMA_VLI_MAX (UINT64_MAX / 2)
-
-/**
- * \brief       VLI value to denote that the value is unknown
- */
-#define LZMA_VLI_UNKNOWN UINT64_MAX
-
-/**
- * \brief       Maximum supported encoded length of variable length integers
- */
-#define LZMA_VLI_BYTES_MAX 9
-
-/**
- * \brief       VLI constant suffix
- */
-#define LZMA_VLI_C(n) UINT64_C(n)
-
-
-/**
- * \brief       Variable-length integer type
- *
- * Valid VLI values are in the range [0, LZMA_VLI_MAX]. Unknown value is
- * indicated with LZMA_VLI_UNKNOWN, which is the maximum value of the
- * underlaying integer type.
- *
- * lzma_vli will be uint64_t for the foreseeable future. If a bigger size
- * is needed in the future, it is guaranteed that 2 * LZMA_VLI_MAX will
- * not overflow lzma_vli. This simplifies integer overflow detection.
- */
-typedef uint64_t lzma_vli;
-
-
-/**
- * \brief       Validate a variable-length integer
- *
- * This is useful to test that application has given acceptable values
- * for example in the uncompressed_size and compressed_size variables.
- *
- * \return      True if the integer is representable as VLI or if it
- *              indicates unknown value.
- */
-#define lzma_vli_is_valid(vli) \
-	((vli) <= LZMA_VLI_MAX || (vli) == LZMA_VLI_UNKNOWN)
-
-
-/**
- * \brief       Encode a variable-length integer
- *
- * This function has two modes: single-call and multi-call. Single-call mode
- * encodes the whole integer at once; it is an error if the output buffer is
- * too small. Multi-call mode saves the position in *vli_pos, and thus it is
- * possible to continue encoding if the buffer becomes full before the whole
- * integer has been encoded.
- *
- * \param       vli       Integer to be encoded
- * \param       vli_pos   How many VLI-encoded bytes have already been written
- *                        out. When starting to encode a new integer in
- *                        multi-call mode, *vli_pos must be set to zero.
- *                        To use single-call encoding, set vli_pos to NULL.
- * \param       out       Beginning of the output buffer
- * \param       out_pos   The next byte will be written to out[*out_pos].
- * \param       out_size  Size of the out buffer; the first byte into
- *                        which no data is written to is out[out_size].
- *
- * \return      Slightly different return values are used in multi-call and
- *              single-call modes.
- *
- *              Single-call (vli_pos == NULL):
- *              - LZMA_OK: Integer successfully encoded.
- *              - LZMA_PROG_ERROR: Arguments are not sane. This can be due
- *                to too little output space; single-call mode doesn't use
- *                LZMA_BUF_ERROR, since the application should have checked
- *                the encoded size with lzma_vli_size().
- *
- *              Multi-call (vli_pos != NULL):
- *              - LZMA_OK: So far all OK, but the integer is not
- *                completely written out yet.
- *              - LZMA_STREAM_END: Integer successfully encoded.
- *              - LZMA_BUF_ERROR: No output space was provided.
- *              - LZMA_PROG_ERROR: Arguments are not sane.
- */
-extern LZMA_API(lzma_ret) lzma_vli_encode(lzma_vli vli, size_t *vli_pos,
-		uint8_t *out, size_t *out_pos, size_t out_size) lzma_nothrow;
-
-
-/**
- * \brief       Decode a variable-length integer
- *
- * Like lzma_vli_encode(), this function has single-call and multi-call modes.
- *
- * \param       vli       Pointer to decoded integer. The decoder will
- *                        initialize it to zero when *vli_pos == 0, so
- *                        application isn't required to initialize *vli.
- * \param       vli_pos   How many bytes have already been decoded. When
- *                        starting to decode a new integer in multi-call
- *                        mode, *vli_pos must be initialized to zero. To
- *                        use single-call decoding, set vli_pos to NULL.
- * \param       in        Beginning of the input buffer
- * \param       in_pos    The next byte will be read from in[*in_pos].
- * \param       in_size   Size of the input buffer; the first byte that
- *                        won't be read is in[in_size].
- *
- * \return      Slightly different return values are used in multi-call and
- *              single-call modes.
- *
- *              Single-call (vli_pos == NULL):
- *              - LZMA_OK: Integer successfully decoded.
- *              - LZMA_DATA_ERROR: Integer is corrupt. This includes hitting
- *                the end of the input buffer before the whole integer was
- *                decoded; providing no input at all will use LZMA_DATA_ERROR.
- *              - LZMA_PROG_ERROR: Arguments are not sane.
- *
- *              Multi-call (vli_pos != NULL):
- *              - LZMA_OK: So far all OK, but the integer is not
- *                completely decoded yet.
- *              - LZMA_STREAM_END: Integer successfully decoded.
- *              - LZMA_DATA_ERROR: Integer is corrupt.
- *              - LZMA_BUF_ERROR: No input was provided.
- *              - LZMA_PROG_ERROR: Arguments are not sane.
- */
-extern LZMA_API(lzma_ret) lzma_vli_decode(lzma_vli *vli, size_t *vli_pos,
-		const uint8_t *in, size_t *in_pos, size_t in_size)
-		lzma_nothrow;
-
-
-/**
- * \brief       Get the number of bytes required to encode a VLI
- *
- * \return      Number of bytes on success (1-9). If vli isn't valid,
- *              zero is returned.
- */
-extern LZMA_API(uint32_t) lzma_vli_size(lzma_vli vli)
-		lzma_nothrow lzma_attr_pure;
diff --git a/include.new/machine/_align.h b/include.new/machine/_align.h
deleted file mode 100644
index 943161a..0000000
--- a/include.new/machine/_align.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/_align.h 215856 2010-11-26 10:59:20Z tijl $ */
-
-#include <x86/_align.h>
diff --git a/include.new/machine/_bus.h b/include.new/machine/_bus.h
deleted file mode 100644
index cc39b13..0000000
--- a/include.new/machine/_bus.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2005 M. Warner Losh.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 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.
- *
- * 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: releng/10.2/sys/i386/include/_bus.h 145253 2005-04-18 21:45:34Z imp $
- */
-
-#ifndef I386_INCLUDE__BUS_H
-#define I386_INCLUDE__BUS_H
-
-/*
- * Bus address and size types
- */
-#ifdef PAE
-typedef uint64_t bus_addr_t;
-#else
-typedef uint32_t bus_addr_t;
-#endif
-typedef uint32_t bus_size_t;
-
-/*
- * Access methods for bus resources and address space.
- */
-typedef	int bus_space_tag_t;
-typedef	u_int bus_space_handle_t;
-
-#endif /* I386_INCLUDE__BUS_H */
diff --git a/include.new/machine/_inttypes.h b/include.new/machine/_inttypes.h
deleted file mode 100644
index 7c7166e..0000000
--- a/include.new/machine/_inttypes.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/_inttypes.h 217157 2011-01-08 18:09:48Z tijl $ */
-
-#include <x86/_inttypes.h>
diff --git a/include.new/machine/_limits.h b/include.new/machine/_limits.h
deleted file mode 100644
index ff6b14a..0000000
--- a/include.new/machine/_limits.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/_limits.h 232262 2012-02-28 18:24:28Z tijl $ */
-
-#include <x86/_limits.h>
diff --git a/include.new/machine/_stdint.h b/include.new/machine/_stdint.h
deleted file mode 100644
index b1e3135..0000000
--- a/include.new/machine/_stdint.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/_stdint.h 232264 2012-02-28 18:38:33Z tijl $ */
-
-#include <x86/_stdint.h>
diff --git a/include.new/machine/_types.h b/include.new/machine/_types.h
deleted file mode 100644
index 06aecc3..0000000
--- a/include.new/machine/_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/_types.h 232261 2012-02-28 18:15:28Z tijl $ */
-
-#include <x86/_types.h>
diff --git a/include.new/machine/acpica_machdep.h b/include.new/machine/acpica_machdep.h
deleted file mode 100644
index 8186ff8..0000000
--- a/include.new/machine/acpica_machdep.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/acpica_machdep.h 254305 2013-08-13 22:05:10Z jkim $ */
-
-#include <x86/acpica_machdep.h>
diff --git a/include.new/machine/apicreg.h b/include.new/machine/apicreg.h
deleted file mode 100644
index 9f9183d..0000000
--- a/include.new/machine/apicreg.h
+++ /dev/null
@@ -1,434 +0,0 @@
-/*-
- * Copyright (c) 1996, by Peter Wemm and Steve Passe
- * 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. The name of the developer 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/i386/include/apicreg.h,v 1.28 2005/01/06 22:18:15 imp Exp $
- */
-
-#ifndef _MACHINE_APICREG_H_
-#define _MACHINE_APICREG_H_
-
-/*
- * Local && I/O APIC definitions.
- */
-
-/*
- * Pentium P54C+ Built-in APIC
- * (Advanced programmable Interrupt Controller)
- * 
- * Base Address of Built-in APIC in memory location
- * is 0xfee00000.
- * 
- * Map of APIC Registers:
- * 
- * Offset (hex)    Description                     Read/Write state
- * 000             Reserved
- * 010             Reserved
- * 020 ID          Local APIC ID                   R/W
- * 030 VER         Local APIC Version              R
- * 040             Reserved
- * 050             Reserved
- * 060             Reserved
- * 070             Reserved
- * 080             Task Priority Register          R/W
- * 090             Arbitration Priority Register   R
- * 0A0             Processor Priority Register     R
- * 0B0             EOI Register                    W
- * 0C0 RRR         Remote read                     R
- * 0D0             Logical Destination             R/W
- * 0E0             Destination Format Register     0..27 R;  28..31 R/W
- * 0F0 SVR         Spurious Interrupt Vector Reg.  0..3  R;  4..9   R/W
- * 100             ISR  000-031                    R
- * 110             ISR  032-063                    R
- * 120             ISR  064-095                    R
- * 130             ISR  095-128                    R
- * 140             ISR  128-159                    R
- * 150             ISR  160-191                    R
- * 160             ISR  192-223                    R
- * 170             ISR  224-255                    R
- * 180             TMR  000-031                    R
- * 190             TMR  032-063                    R
- * 1A0             TMR  064-095                    R
- * 1B0             TMR  095-128                    R
- * 1C0             TMR  128-159                    R
- * 1D0             TMR  160-191                    R
- * 1E0             TMR  192-223                    R
- * 1F0             TMR  224-255                    R
- * 200             IRR  000-031                    R
- * 210             IRR  032-063                    R
- * 220             IRR  064-095                    R
- * 230             IRR  095-128                    R
- * 240             IRR  128-159                    R
- * 250             IRR  160-191                    R
- * 260             IRR  192-223                    R
- * 270             IRR  224-255                    R
- * 280             Error Status Register           R
- * 290             Reserved
- * 2A0             Reserved
- * 2B0             Reserved
- * 2C0             Reserved
- * 2D0             Reserved
- * 2E0             Reserved
- * 2F0             Reserved
- * 300 ICR_LOW     Interrupt Command Reg. (0-31)   R/W
- * 310 ICR_HI      Interrupt Command Reg. (32-63)  R/W
- * 320             Local Vector Table (Timer)      R/W
- * 330             Local Vector Table (Thermal)    R/W (PIV+)
- * 340             Local Vector Table (Performance) R/W (P6+)
- * 350 LVT1        Local Vector Table (LINT0)      R/W
- * 360 LVT2        Local Vector Table (LINT1)      R/W
- * 370 LVT3        Local Vector Table (ERROR)      R/W
- * 380             Initial Count Reg. for Timer    R/W
- * 390             Current Count of Timer          R
- * 3A0             Reserved
- * 3B0             Reserved
- * 3C0             Reserved
- * 3D0             Reserved
- * 3E0             Timer Divide Configuration Reg. R/W
- * 3F0             Reserved
- */
-
-
-/******************************************************************************
- * global defines, etc.
- */
-
-
-/******************************************************************************
- * LOCAL APIC structure
- */
-
-#ifndef LOCORE
-#include <sys/types.h>
-
-#define PAD3	int : 32; int : 32; int : 32
-#define PAD4	int : 32; int : 32; int : 32; int : 32
-
-struct LAPIC {
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	uint32_t id;		PAD3;
-	uint32_t version;	PAD3;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	uint32_t tpr;		PAD3;
-	uint32_t apr;		PAD3;
-	uint32_t ppr;		PAD3;
-	uint32_t eoi;		PAD3;
-	/* reserved */		PAD4;
-	uint32_t ldr;		PAD3;
-	uint32_t dfr;		PAD3;
-	uint32_t svr;		PAD3;
-	uint32_t isr0;		PAD3;
-	uint32_t isr1;		PAD3;
-	uint32_t isr2;		PAD3;
-	uint32_t isr3;		PAD3;
-	uint32_t isr4;		PAD3;
-	uint32_t isr5;		PAD3;
-	uint32_t isr6;		PAD3;
-	uint32_t isr7;		PAD3;
-	uint32_t tmr0;		PAD3;
-	uint32_t tmr1;		PAD3;
-	uint32_t tmr2;		PAD3;
-	uint32_t tmr3;		PAD3;
-	uint32_t tmr4;		PAD3;
-	uint32_t tmr5;		PAD3;
-	uint32_t tmr6;		PAD3;
-	uint32_t tmr7;		PAD3;
-	uint32_t irr0;		PAD3;
-	uint32_t irr1;		PAD3;
-	uint32_t irr2;		PAD3;
-	uint32_t irr3;		PAD3;
-	uint32_t irr4;		PAD3;
-	uint32_t irr5;		PAD3;
-	uint32_t irr6;		PAD3;
-	uint32_t irr7;		PAD3;
-	uint32_t esr;		PAD3;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	uint32_t icr_lo;	PAD3;
-	uint32_t icr_hi;	PAD3;
-	uint32_t lvt_timer;	PAD3;
-	uint32_t lvt_thermal;	PAD3;
-	uint32_t lvt_pcint;	PAD3;
-	uint32_t lvt_lint0;	PAD3;
-	uint32_t lvt_lint1;	PAD3;
-	uint32_t lvt_error;	PAD3;
-	uint32_t icr_timer;	PAD3;
-	uint32_t ccr_timer;	PAD3;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	uint32_t dcr_timer;	PAD3;
-	/* reserved */		PAD4;
-};
-
-typedef struct LAPIC lapic_t;
-
-/******************************************************************************
- * I/O APIC structure
- */
-
-struct IOAPIC {
-	uint32_t ioregsel;	PAD3;
-	uint32_t iowin;	PAD3;
-};
-
-typedef struct IOAPIC ioapic_t;
-
-#undef PAD4
-#undef PAD3
-
-#endif  /* !LOCORE */
-
-
-/******************************************************************************
- * various code 'logical' values
- */
-
-/******************************************************************************
- * LOCAL APIC defines
- */
-
-/* default physical locations of LOCAL (CPU) APICs */
-#define DEFAULT_APIC_BASE	0xfee00000
-
-/* constants relating to APIC ID registers */
-#define APIC_ID_MASK		0xff000000
-#define	APIC_ID_SHIFT		24
-#define	APIC_ID_CLUSTER		0xf0
-#define	APIC_ID_CLUSTER_ID	0x0f
-#define	APIC_MAX_CLUSTER	0xe
-#define	APIC_MAX_INTRACLUSTER_ID 3
-#define	APIC_ID_CLUSTER_SHIFT	4
-
-/* fields in VER */
-#define APIC_VER_VERSION	0x000000ff
-#define APIC_VER_MAXLVT		0x00ff0000
-#define MAXLVTSHIFT		16
-
-/* fields in LDR */
-#define	APIC_LDR_RESERVED	0x00ffffff
-
-/* fields in DFR */
-#define	APIC_DFR_RESERVED	0x0fffffff
-#define	APIC_DFR_MODEL_MASK	0xf0000000
-#define	APIC_DFR_MODEL_FLAT	0xf0000000
-#define	APIC_DFR_MODEL_CLUSTER	0x00000000
-
-/* fields in SVR */
-#define APIC_SVR_VECTOR		0x000000ff
-#define APIC_SVR_VEC_PROG	0x000000f0
-#define APIC_SVR_VEC_FIX	0x0000000f
-#define APIC_SVR_ENABLE		0x00000100
-# define APIC_SVR_SWDIS		0x00000000
-# define APIC_SVR_SWEN		0x00000100
-#define APIC_SVR_FOCUS		0x00000200
-# define APIC_SVR_FEN		0x00000000
-# define APIC_SVR_FDIS		0x00000200
-
-/* fields in TPR */
-#define APIC_TPR_PRIO		0x000000ff
-# define APIC_TPR_INT		0x000000f0
-# define APIC_TPR_SUB		0x0000000f
-
-
-/* fields in ICR_LOW */
-#define APIC_VECTOR_MASK	0x000000ff
-
-#define APIC_DELMODE_MASK	0x00000700
-# define APIC_DELMODE_FIXED	0x00000000
-# define APIC_DELMODE_LOWPRIO	0x00000100
-# define APIC_DELMODE_SMI	0x00000200
-# define APIC_DELMODE_RR	0x00000300
-# define APIC_DELMODE_NMI	0x00000400
-# define APIC_DELMODE_INIT	0x00000500
-# define APIC_DELMODE_STARTUP	0x00000600
-# define APIC_DELMODE_RESV	0x00000700
-
-#define APIC_DESTMODE_MASK	0x00000800
-# define APIC_DESTMODE_PHY	0x00000000
-# define APIC_DESTMODE_LOG	0x00000800
-
-#define APIC_DELSTAT_MASK	0x00001000
-# define APIC_DELSTAT_IDLE	0x00000000
-# define APIC_DELSTAT_PEND	0x00001000
-
-#define APIC_RESV1_MASK		0x00002000
-
-#define APIC_LEVEL_MASK		0x00004000
-# define APIC_LEVEL_DEASSERT	0x00000000
-# define APIC_LEVEL_ASSERT	0x00004000
-
-#define APIC_TRIGMOD_MASK	0x00008000
-# define APIC_TRIGMOD_EDGE	0x00000000
-# define APIC_TRIGMOD_LEVEL	0x00008000
-
-#define APIC_RRSTAT_MASK	0x00030000
-# define APIC_RRSTAT_INVALID	0x00000000
-# define APIC_RRSTAT_INPROG	0x00010000
-# define APIC_RRSTAT_VALID	0x00020000
-# define APIC_RRSTAT_RESV	0x00030000
-
-#define APIC_DEST_MASK		0x000c0000
-# define APIC_DEST_DESTFLD	0x00000000
-# define APIC_DEST_SELF		0x00040000
-# define APIC_DEST_ALLISELF	0x00080000
-# define APIC_DEST_ALLESELF	0x000c0000
-
-#define APIC_RESV2_MASK		0xfff00000
-
-#define	APIC_ICRLO_RESV_MASK	(APIC_RESV1_MASK | APIC_RESV2_MASK)
-
-/* fields in LVT1/2 */
-#define APIC_LVT_VECTOR		0x000000ff
-#define APIC_LVT_DM		0x00000700
-# define APIC_LVT_DM_FIXED	0x00000000
-# define APIC_LVT_DM_SMI	0x00000200
-# define APIC_LVT_DM_NMI	0x00000400
-# define APIC_LVT_DM_INIT	0x00000500
-# define APIC_LVT_DM_EXTINT	0x00000700
-#define APIC_LVT_DS		0x00001000
-#define APIC_LVT_IIPP		0x00002000
-#define APIC_LVT_IIPP_INTALO	0x00002000
-#define APIC_LVT_IIPP_INTAHI	0x00000000
-#define APIC_LVT_RIRR		0x00004000
-#define APIC_LVT_TM		0x00008000
-#define APIC_LVT_M		0x00010000
-
-
-/* fields in LVT Timer */
-#define APIC_LVTT_VECTOR	0x000000ff
-#define APIC_LVTT_DS		0x00001000
-#define APIC_LVTT_M		0x00010000
-#define APIC_LVTT_TM		0x00020000
-# define APIC_LVTT_TM_ONE_SHOT	0x00000000
-# define APIC_LVTT_TM_PERIODIC	0x00020000
-
-
-/* APIC timer current count */
-#define	APIC_TIMER_MAX_COUNT	0xffffffff
-
-/* fields in TDCR */
-#define APIC_TDCR_2		0x00
-#define APIC_TDCR_4		0x01
-#define APIC_TDCR_8		0x02
-#define APIC_TDCR_16		0x03
-#define APIC_TDCR_32		0x08
-#define APIC_TDCR_64		0x09
-#define APIC_TDCR_128		0x0a
-#define APIC_TDCR_1		0x0b
-
-/******************************************************************************
- * I/O APIC defines
- */
-
-/* default physical locations of an IO APIC */
-#define DEFAULT_IO_APIC_BASE	0xfec00000
-
-/* window register offset */
-#define IOAPIC_WINDOW		0x10
-
-/* indexes into IO APIC */
-#define IOAPIC_ID		0x00
-#define IOAPIC_VER		0x01
-#define IOAPIC_ARB		0x02
-#define IOAPIC_REDTBL		0x10
-#define IOAPIC_REDTBL0		IOAPIC_REDTBL
-#define IOAPIC_REDTBL1		(IOAPIC_REDTBL+0x02)
-#define IOAPIC_REDTBL2		(IOAPIC_REDTBL+0x04)
-#define IOAPIC_REDTBL3		(IOAPIC_REDTBL+0x06)
-#define IOAPIC_REDTBL4		(IOAPIC_REDTBL+0x08)
-#define IOAPIC_REDTBL5		(IOAPIC_REDTBL+0x0a)
-#define IOAPIC_REDTBL6		(IOAPIC_REDTBL+0x0c)
-#define IOAPIC_REDTBL7		(IOAPIC_REDTBL+0x0e)
-#define IOAPIC_REDTBL8		(IOAPIC_REDTBL+0x10)
-#define IOAPIC_REDTBL9		(IOAPIC_REDTBL+0x12)
-#define IOAPIC_REDTBL10		(IOAPIC_REDTBL+0x14)
-#define IOAPIC_REDTBL11		(IOAPIC_REDTBL+0x16)
-#define IOAPIC_REDTBL12		(IOAPIC_REDTBL+0x18)
-#define IOAPIC_REDTBL13		(IOAPIC_REDTBL+0x1a)
-#define IOAPIC_REDTBL14		(IOAPIC_REDTBL+0x1c)
-#define IOAPIC_REDTBL15		(IOAPIC_REDTBL+0x1e)
-#define IOAPIC_REDTBL16		(IOAPIC_REDTBL+0x20)
-#define IOAPIC_REDTBL17		(IOAPIC_REDTBL+0x22)
-#define IOAPIC_REDTBL18		(IOAPIC_REDTBL+0x24)
-#define IOAPIC_REDTBL19		(IOAPIC_REDTBL+0x26)
-#define IOAPIC_REDTBL20		(IOAPIC_REDTBL+0x28)
-#define IOAPIC_REDTBL21		(IOAPIC_REDTBL+0x2a)
-#define IOAPIC_REDTBL22		(IOAPIC_REDTBL+0x2c)
-#define IOAPIC_REDTBL23		(IOAPIC_REDTBL+0x2e)
-
-/* fields in VER */
-#define IOART_VER_VERSION	0x000000ff
-#define IOART_VER_MAXREDIR	0x00ff0000
-#define MAXREDIRSHIFT		16
-
-/*
- * fields in the IO APIC's redirection table entries
- */
-#define IOART_DEST	APIC_ID_MASK	/* broadcast addr: all APICs */
-
-#define IOART_RESV	0x00fe0000	/* reserved */
-
-#define IOART_INTMASK	0x00010000	/* R/W: INTerrupt mask */
-# define IOART_INTMCLR	0x00000000	/*       clear, allow INTs */
-# define IOART_INTMSET	0x00010000	/*       set, inhibit INTs */
-
-#define IOART_TRGRMOD	0x00008000	/* R/W: trigger mode */
-# define IOART_TRGREDG	0x00000000	/*       edge */
-# define IOART_TRGRLVL	0x00008000	/*       level */
-
-#define IOART_REM_IRR	0x00004000	/* RO: remote IRR */
-
-#define IOART_INTPOL	0x00002000	/* R/W: INT input pin polarity */
-# define IOART_INTAHI	0x00000000	/*      active high */
-# define IOART_INTALO	0x00002000	/*      active low */
-
-#define IOART_DELIVS	0x00001000	/* RO: delivery status */
-
-#define IOART_DESTMOD	0x00000800	/* R/W: destination mode */
-# define IOART_DESTPHY	0x00000000	/*      physical */
-# define IOART_DESTLOG	0x00000800	/*      logical */
-
-#define IOART_DELMOD	0x00000700	/* R/W: delivery mode */
-# define IOART_DELFIXED	0x00000000	/*       fixed */
-# define IOART_DELLOPRI	0x00000100	/*       lowest priority */
-# define IOART_DELSMI	0x00000200	/*       System Management INT */
-# define IOART_DELRSV1	0x00000300	/*       reserved */
-# define IOART_DELNMI	0x00000400	/*       NMI signal */
-# define IOART_DELINIT	0x00000500	/*       INIT signal */
-# define IOART_DELRSV2	0x00000600	/*       reserved */
-# define IOART_DELEXINT	0x00000700	/*       External INTerrupt */
-
-#define IOART_INTVEC	0x000000ff	/* R/W: INTerrupt vector field */
-
-#endif /* _MACHINE_APICREG_H_ */
diff --git a/include.new/machine/apicvar.h b/include.new/machine/apicvar.h
deleted file mode 100644
index 90eaafa..0000000
--- a/include.new/machine/apicvar.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-
- * Copyright (c) 2003 John Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/i386/include/apicvar.h 283284 2015-05-22 11:20:59Z whu $
- */
-
-#ifndef _MACHINE_APICVAR_H_
-#define _MACHINE_APICVAR_H_
-
-/*
- * Local && I/O APIC variable definitions.
- */
-
-/*
- * Layout of local APIC interrupt vectors:
- *
- *	0xff (255)  +-------------+
- *                  |             | 15 (Spurious / IPIs / Local Interrupts)
- *	0xf0 (240)  +-------------+
- *                  |             | 14 (I/O Interrupts / Timer)
- *	0xe0 (224)  +-------------+
- *                  |             | 13 (I/O Interrupts)
- *	0xd0 (208)  +-------------+
- *                  |             | 12 (I/O Interrupts)
- *	0xc0 (192)  +-------------+
- *                  |             | 11 (I/O Interrupts)
- *	0xb0 (176)  +-------------+
- *                  |             | 10 (I/O Interrupts)
- *	0xa0 (160)  +-------------+
- *                  |             | 9 (I/O Interrupts)
- *	0x90 (144)  +-------------+
- *                  |             | 8 (I/O Interrupts / System Calls)
- *	0x80 (128)  +-------------+
- *                  |             | 7 (I/O Interrupts)
- *	0x70 (112)  +-------------+
- *                  |             | 6 (I/O Interrupts)
- *	0x60 (96)   +-------------+
- *                  |             | 5 (I/O Interrupts)
- *	0x50 (80)   +-------------+
- *                  |             | 4 (I/O Interrupts)
- *	0x40 (64)   +-------------+
- *                  |             | 3 (I/O Interrupts)
- *	0x30 (48)   +-------------+
- *                  |             | 2 (ATPIC Interrupts)
- *	0x20 (32)   +-------------+
- *                  |             | 1 (Exceptions, traps, faults, etc.)
- *	0x10 (16)   +-------------+
- *                  |             | 0 (Exceptions, traps, faults, etc.)
- *	0x00 (0)    +-------------+
- *
- * Note: 0x80 needs to be handled specially and not allocated to an
- * I/O device!
- */
-
-#define	MAX_APIC_ID	0xfe
-#define	APIC_ID_ALL	0xff
-
-/* I/O Interrupts are used for external devices such as ISA, PCI, etc. */
-#define	APIC_IO_INTS	(IDT_IO_INTS + 16)
-#define	APIC_NUM_IOINTS	191
-
-/* The timer interrupt is used for clock handling and drives hardclock, etc. */
-#define	APIC_TIMER_INT	(APIC_IO_INTS + APIC_NUM_IOINTS)
-
-/*  
- ********************* !!! WARNING !!! ******************************
- * Each local apic has an interrupt receive fifo that is two entries deep
- * for each interrupt priority class (higher 4 bits of interrupt vector).
- * Once the fifo is full the APIC can no longer receive interrupts for this
- * class and sending IPIs from other CPUs will be blocked.
- * To avoid deadlocks there should be no more than two IPI interrupts
- * pending at the same time.
- * Currently this is guaranteed by dividing the IPIs in two groups that have 
- * each at most one IPI interrupt pending. The first group is protected by the
- * smp_ipi_mtx and waits for the completion of the IPI (Only one IPI user 
- * at a time) The second group uses a single interrupt and a bitmap to avoid
- * redundant IPI interrupts.
- */ 
-
-/* Interrupts for local APIC LVT entries other than the timer. */
-#define	APIC_LOCAL_INTS	240
-#define	APIC_ERROR_INT	APIC_LOCAL_INTS
-#define	APIC_THERMAL_INT (APIC_LOCAL_INTS + 1)
-#define	APIC_CMC_INT	(APIC_LOCAL_INTS + 2)
-#define	APIC_IPI_INTS	(APIC_LOCAL_INTS + 3)
-
-#define	IPI_RENDEZVOUS	(APIC_IPI_INTS)		/* Inter-CPU rendezvous. */
-#define	IPI_INVLTLB	(APIC_IPI_INTS + 1)	/* TLB Shootdown IPIs */
-#define	IPI_INVLPG	(APIC_IPI_INTS + 2)
-#define	IPI_INVLRNG	(APIC_IPI_INTS + 3)
-#define	IPI_INVLCACHE	(APIC_IPI_INTS + 4)
-#define	IPI_LAZYPMAP	(APIC_IPI_INTS + 5)	/* Lazy pmap release. */
-/* Vector to handle bitmap based IPIs */
-#define	IPI_BITMAP_VECTOR	(APIC_IPI_INTS + 6) 
-
-/* IPIs handled by IPI_BITMAPED_VECTOR  (XXX ups is there a better place?) */
-#define	IPI_AST		0 	/* Generate software trap. */
-#define IPI_PREEMPT     1
-#define IPI_HARDCLOCK   2 
-#define IPI_BITMAP_LAST IPI_HARDCLOCK
-#define IPI_IS_BITMAPED(x) ((x) <= IPI_BITMAP_LAST)
-
-#define	IPI_STOP	(APIC_IPI_INTS + 7)	/* Stop CPU until restarted. */
-#define	IPI_SUSPEND	(APIC_IPI_INTS + 8)	/* Suspend CPU until restarted. */
-#define	IPI_STOP_HARD	(APIC_IPI_INTS + 9)	/* Stop CPU with a NMI. */
-
-/*
- * The spurious interrupt can share the priority class with the IPIs since
- * it is not a normal interrupt. (Does not use the APIC's interrupt fifo)
- */
-#define	APIC_SPURIOUS_INT 255
-
-#ifndef LOCORE
-
-#define	APIC_IPI_DEST_SELF	-1
-#define	APIC_IPI_DEST_ALL	-2
-#define	APIC_IPI_DEST_OTHERS	-3
-
-#define	APIC_BUS_UNKNOWN	-1
-#define	APIC_BUS_ISA		0
-#define	APIC_BUS_EISA		1
-#define	APIC_BUS_PCI		2
-#define	APIC_BUS_MAX		APIC_BUS_PCI
-
-/*
- * An APIC enumerator is a psuedo bus driver that enumerates APIC's including
- * CPU's and I/O APIC's.
- */
-struct apic_enumerator {
-	const char *apic_name;
-	int (*apic_probe)(void);
-	int (*apic_probe_cpus)(void);
-	int (*apic_setup_local)(void);
-	int (*apic_setup_io)(void);
-	SLIST_ENTRY(apic_enumerator) apic_next;
-};
-
-inthand_t
-	IDTVEC(apic_isr1), IDTVEC(apic_isr2), IDTVEC(apic_isr3),
-	IDTVEC(apic_isr4), IDTVEC(apic_isr5), IDTVEC(apic_isr6),
-	IDTVEC(apic_isr7), IDTVEC(cmcint), IDTVEC(errorint),
-	IDTVEC(spuriousint), IDTVEC(timerint);
-
-extern vm_paddr_t lapic_paddr;
-extern int apic_cpuids[];
-
-u_int	apic_alloc_vector(u_int apic_id, u_int irq);
-u_int	apic_alloc_vectors(u_int apic_id, u_int *irqs, u_int count,
-	    u_int align);
-void	apic_disable_vector(u_int apic_id, u_int vector);
-void	apic_enable_vector(u_int apic_id, u_int vector);
-void	apic_free_vector(u_int apic_id, u_int vector, u_int irq);
-u_int	apic_idt_to_irq(u_int apic_id, u_int vector);
-void	apic_register_enumerator(struct apic_enumerator *enumerator);
-u_int	apic_cpuid(u_int apic_id);
-void	*ioapic_create(vm_paddr_t addr, int32_t apic_id, int intbase);
-int	ioapic_disable_pin(void *cookie, u_int pin);
-int	ioapic_get_vector(void *cookie, u_int pin);
-void	ioapic_register(void *cookie);
-int	ioapic_remap_vector(void *cookie, u_int pin, int vector);
-int	ioapic_set_bus(void *cookie, u_int pin, int bus_type);
-int	ioapic_set_extint(void *cookie, u_int pin);
-int	ioapic_set_nmi(void *cookie, u_int pin);
-int	ioapic_set_polarity(void *cookie, u_int pin, enum intr_polarity pol);
-int	ioapic_set_triggermode(void *cookie, u_int pin,
-	    enum intr_trigger trigger);
-int	ioapic_set_smi(void *cookie, u_int pin);
-void	lapic_create(u_int apic_id, int boot_cpu);
-void	lapic_disable(void);
-void	lapic_disable_pmc(void);
-void	lapic_dump(const char *str);
-void	lapic_enable_cmc(void);
-int	lapic_enable_pmc(void);
-void	lapic_eoi(void);
-int	lapic_id(void);
-void	lapic_init(vm_paddr_t addr);
-int	lapic_intr_pending(u_int vector);
-void	lapic_ipi_raw(register_t icrlo, u_int dest);
-void	lapic_ipi_vectored(u_int vector, int dest);
-int	lapic_ipi_wait(int delay);
-void	lapic_handle_cmc(void);
-void	lapic_handle_error(void);
-void	lapic_handle_intr(int vector, struct trapframe *frame);
-void	lapic_handle_timer(struct trapframe *frame);
-void	lapic_reenable_pmc(void);
-void	lapic_set_logical_id(u_int apic_id, u_int cluster, u_int cluster_id);
-int	lapic_set_lvt_mask(u_int apic_id, u_int lvt, u_char masked);
-int	lapic_set_lvt_mode(u_int apic_id, u_int lvt, uint32_t mode);
-int	lapic_set_lvt_polarity(u_int apic_id, u_int lvt,
-	    enum intr_polarity pol);
-int	lapic_set_lvt_triggermode(u_int apic_id, u_int lvt,
-	    enum intr_trigger trigger);
-void	lapic_set_tpr(u_int vector);
-void	lapic_setup(int boot);
-void	xen_intr_handle_upcall(struct trapframe *frame);
-void	hv_vector_handler(struct trapframe *frame);
-
-#endif /* !LOCORE */
-#endif /* _MACHINE_APICVAR_H_ */
diff --git a/include.new/machine/apm_bios.h b/include.new/machine/apm_bios.h
deleted file mode 100644
index 89ac3ab..0000000
--- a/include.new/machine/apm_bios.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/apm_bios.h 215140 2010-11-11 19:36:21Z jkim $ */
-
-#include <x86/apm_bios.h>
diff --git a/include.new/machine/apm_segments.h b/include.new/machine/apm_segments.h
deleted file mode 100644
index 303bc7d..0000000
--- a/include.new/machine/apm_segments.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * LP (Laptop Package)
- *
- * Copyright (C) 1994 by HOSOKAWA Tatsumi <hosokawa@mt.cs.keio.ac.jp>
- *
- * This software may be used, modified, copied, and distributed, in
- * both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
- * use.
- *
- * Sep., 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
- *
- * $FreeBSD: releng/10.2/sys/i386/include/apm_segments.h 139790 2005-01-06 22:18:23Z imp $
- */
-
-#ifndef _MACHINE_APM_SEGMENTS_H
-#define _MACHINE_APM_SEGMENTS_H
-
-#define SIZEOF_GDT		8
-#define BOOTSTRAP_GDT_NUM	32
-
-#define APM_INIT_CS_INDEX	(BOOTSTRAP_GDT_NUM - 4)
-#define APM_INIT_DS_INDEX	(BOOTSTRAP_GDT_NUM - 3)
-#define APM_INIT_CS16_INDEX	(BOOTSTRAP_GDT_NUM - 2)
-#define APM_INIT_DS16_INDEX	(BOOTSTRAP_GDT_NUM - 1)
-#define APM_INIT_CS_SEL		(APM_INIT_CS_INDEX << 3)
-#define APM_INIT_DS_SEL		(APM_INIT_DS_INDEX << 3)
-#define APM_INIT_CS16_SEL	(APM_INIT_CS16_INDEX << 3)
-#define APM_INIT_DS16_SEL	(APM_INIT_DS16_INDEX << 3)
-
-#define CS32_ATTRIB		0x409e
-#define DS32_ATTRIB		0x4092
-#define CS16_ATTRIB		0x009e
-#define DS16_ATTRIB		0x0092
-
-#endif
diff --git a/include.new/machine/asm.h b/include.new/machine/asm.h
deleted file mode 100644
index 990d292..0000000
--- a/include.new/machine/asm.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)DEFS.h	5.1 (Berkeley) 4/23/90
- * $FreeBSD: releng/10.2/sys/i386/include/asm.h 254463 2013-08-17 19:24:58Z jilles $
- */
-
-#ifndef _MACHINE_ASM_H_
-#define	_MACHINE_ASM_H_
-
-#include <sys/cdefs.h>
-
-#ifdef PIC
-#define	PIC_PROLOGUE	\
-	pushl	%ebx;	\
-	call	1f;	\
-1:			\
-	popl	%ebx;	\
-	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b],%ebx
-#define	PIC_EPILOGUE	\
-	popl	%ebx
-#define	PIC_PLT(x)	x@PLT
-#define	PIC_GOT(x)	x@GOT(%ebx)
-#define	PIC_GOTOFF(x)	x@GOTOFF(%ebx)
-#else
-#define	PIC_PROLOGUE
-#define	PIC_EPILOGUE
-#define	PIC_PLT(x)	x
-#define	PIC_GOTOFF(x)	x
-#endif
-
-/*
- * CNAME and HIDENAME manage the relationship between symbol names in C
- * and the equivalent assembly language names.  CNAME is given a name as
- * it would be used in a C program.  It expands to the equivalent assembly
- * language name.  HIDENAME is given an assembly-language name, and expands
- * to a possibly-modified form that will be invisible to C programs.
- */
-#define CNAME(csym)		csym
-#define HIDENAME(asmsym)	.asmsym
-
-/* XXX should use .p2align 4,0x90 for -m486. */
-#define _START_ENTRY	.text; .p2align 2,0x90
-
-#define _ENTRY(x)	_START_ENTRY; \
-			.globl CNAME(x); .type CNAME(x),@function; CNAME(x):
-#define	END(x)		.size x, . - x
-
-#ifdef PROF
-#define	ALTENTRY(x)	_ENTRY(x); \
-			pushl %ebp; movl %esp,%ebp; \
-			call PIC_PLT(HIDENAME(mcount)); \
-			popl %ebp; \
-			jmp 9f
-#define	ENTRY(x)	_ENTRY(x); \
-			pushl %ebp; movl %esp,%ebp; \
-			call PIC_PLT(HIDENAME(mcount)); \
-			popl %ebp; \
-			9:
-#else
-#define	ALTENTRY(x)	_ENTRY(x)
-#define	ENTRY(x)	_ENTRY(x)
-#endif
-
-/*
- * WEAK_ALIAS: create a weak alias.
- */
-#define	WEAK_ALIAS(alias,sym)						\
-	.weak alias;							\
-	alias = sym
-
-/*
- * STRONG_ALIAS: create a strong alias.
- */
-#define	STRONG_ALIAS(alias,sym)						\
-	.globl alias;							\
-	alias = sym
-
-#define RCSID(x)	.text; .asciz x
-
-#undef __FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
-#define __FBSDID(s)	.ident s
-#else
-#define __FBSDID(s)	/* nothing */
-#endif /* not lint and not STRIP_FBSDID */
-
-#endif /* !_MACHINE_ASM_H_ */
diff --git a/include.new/machine/asmacros.h b/include.new/machine/asmacros.h
deleted file mode 100644
index 60328de..0000000
--- a/include.new/machine/asmacros.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*-
- * Copyright (c) 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/i386/include/asmacros.h 181775 2008-08-15 20:51:31Z kmacy $
- */
-
-#ifndef _MACHINE_ASMACROS_H_
-#define _MACHINE_ASMACROS_H_
-
-#include <sys/cdefs.h>
-
-/* XXX too much duplication in various asm*.h's. */
-
-/*
- * CNAME is used to manage the relationship between symbol names in C
- * and the equivalent assembly language names.  CNAME is given a name as
- * it would be used in a C program.  It expands to the equivalent assembly
- * language name.
- */
-#define CNAME(csym)		csym
-
-#define ALIGN_DATA	.p2align 2	/* 4 byte alignment, zero filled */
-#ifdef GPROF
-#define ALIGN_TEXT	.p2align 4,0x90	/* 16-byte alignment, nop filled */
-#else
-#define ALIGN_TEXT	.p2align 2,0x90	/* 4-byte alignment, nop filled */
-#endif
-#define SUPERALIGN_TEXT	.p2align 4,0x90	/* 16-byte alignment, nop filled */
-
-#define GEN_ENTRY(name)		ALIGN_TEXT; .globl CNAME(name); \
-				.type CNAME(name),@function; CNAME(name):
-#define NON_GPROF_ENTRY(name)	GEN_ENTRY(name)
-#define NON_GPROF_RET		.byte 0xc3	/* opcode for `ret' */
-
-#define	END(name)		.size name, . - name
-
-#ifdef GPROF
-/*
- * __mcount is like [.]mcount except that doesn't require its caller to set
- * up a frame pointer.  It must be called before pushing anything onto the
- * stack.  gcc should eventually generate code to call __mcount in most
- * cases.  This would make -pg in combination with -fomit-frame-pointer
- * useful.  gcc has a configuration variable PROFILE_BEFORE_PROLOGUE to
- * allow profiling before setting up the frame pointer, but this is
- * inadequate for good handling of special cases, e.g., -fpic works best
- * with profiling after the prologue.
- *
- * [.]mexitcount is a new function to support non-statistical profiling if an
- * accurate clock is available.  For C sources, calls to it are generated
- * by the FreeBSD extension `-mprofiler-epilogue' to gcc.  It is best to
- * call [.]mexitcount at the end of a function like the MEXITCOUNT macro does,
- * but gcc currently generates calls to it at the start of the epilogue to
- * avoid problems with -fpic.
- *
- * [.]mcount and __mcount may clobber the call-used registers and %ef.
- * [.]mexitcount may clobber %ecx and %ef.
- *
- * Cross-jumping makes non-statistical profiling timing more complicated.
- * It is handled in many cases by calling [.]mexitcount before jumping.  It
- * is handled for conditional jumps using CROSSJUMP() and CROSSJUMP_LABEL().
- * It is handled for some fault-handling jumps by not sharing the exit
- * routine.
- *
- * ALTENTRY() must be before a corresponding ENTRY() so that it can jump to
- * the main entry point.  Note that alt entries are counted twice.  They
- * have to be counted as ordinary entries for gprof to get the call times
- * right for the ordinary entries.
- *
- * High local labels are used in macros to avoid clashes with local labels
- * in functions.
- *
- * Ordinary `ret' is used instead of a macro `RET' because there are a lot
- * of `ret's.  0xc3 is the opcode for `ret' (`#define ret ... ret' can't
- * be used because this file is sometimes preprocessed in traditional mode).
- * `ret' clobbers eflags but this doesn't matter.
- */
-#define ALTENTRY(name)		GEN_ENTRY(name) ; MCOUNT ; MEXITCOUNT ; jmp 9f
-#define	CROSSJUMP(jtrue, label, jfalse) \
-	jfalse 8f; MEXITCOUNT; jmp __CONCAT(to,label); 8:
-#define CROSSJUMPTARGET(label) \
-	ALIGN_TEXT; __CONCAT(to,label): ; MCOUNT; jmp label
-#define ENTRY(name)		GEN_ENTRY(name) ; 9: ; MCOUNT
-#define FAKE_MCOUNT(caller)	pushl caller ; call __mcount ; popl %ecx
-#define MCOUNT			call __mcount
-#define MCOUNT_LABEL(name)	GEN_ENTRY(name) ; nop ; ALIGN_TEXT
-#ifdef GUPROF
-#define MEXITCOUNT		call .mexitcount
-#define ret			MEXITCOUNT ; NON_GPROF_RET
-#else
-#define MEXITCOUNT
-#endif
-
-#else /* !GPROF */
-/*
- * ALTENTRY() has to align because it is before a corresponding ENTRY().
- * ENTRY() has to align to because there may be no ALTENTRY() before it.
- * If there is a previous ALTENTRY() then the alignment code for ENTRY()
- * is empty.
- */
-#define ALTENTRY(name)		GEN_ENTRY(name)
-#define	CROSSJUMP(jtrue, label, jfalse)	jtrue label
-#define	CROSSJUMPTARGET(label)
-#define ENTRY(name)		GEN_ENTRY(name)
-#define FAKE_MCOUNT(caller)
-#define MCOUNT
-#define MCOUNT_LABEL(name)
-#define MEXITCOUNT
-#endif /* GPROF */
-
-#ifdef LOCORE
-/*
- * Convenience macro for declaring interrupt entry points.
- */
-#define	IDTVEC(name)	ALIGN_TEXT; .globl __CONCAT(X,name); \
-			.type __CONCAT(X,name),@function; __CONCAT(X,name):
-
-/*
- * Macros to create and destroy a trap frame.
- */
-#define	PUSH_FRAME							\
-	pushl	$0 ;		/* dummy error code */			\
-	pushl	$0 ;		/* dummy trap type */			\
-	pushal ;		/* 8 ints */				\
-	pushl	%ds ;		/* save data and extra segments ... */	\
-	pushl	%es ;							\
-	pushl	%fs
-	
-#define	POP_FRAME							\
-	popl	%fs ;							\
-	popl	%es ;							\
-	popl	%ds ;							\
-	popal ;								\
-	addl	$4+4,%esp
-
-/*
- * Access per-CPU data.
- */
-#define	PCPU(member)	%fs:PC_ ## member
-
-#define	PCPU_ADDR(member, reg)						\
-	movl %fs:PC_PRVSPACE, reg ;					\
-	addl $PC_ ## member, reg
-
-/*
- * Setup the kernel segment registers.
- */
-#define	SET_KERNEL_SREGS						\
-	movl	$KDSEL, %eax ;	/* reload with kernel's data segment */	\
-	movl	%eax, %ds ;						\
-	movl	%eax, %es ;						\
-	movl	$KPSEL, %eax ;	/* reload with per-CPU data segment */	\
-	movl	%eax, %fs
-
-#ifdef XEN
-#define LOAD_CR3(reg)          \
-        movl    reg,PCPU(CR3); \
-        pushl   %ecx ;         \
-        pushl   %edx ;         \
-        pushl   %esi ;         \
-        pushl   reg ;          \
-        call    xen_load_cr3 ;     \
-        addl    $4,%esp ;      \
-        popl    %esi ;         \
-        popl    %edx ;         \
-        popl    %ecx ;         \
- 
-#define READ_CR3(reg)   movl PCPU(CR3),reg;
-#define LLDT(arg)                 \
-        pushl   %edx ;                    \
-        pushl   %eax ;                    \
-        xorl    %eax,%eax ;               \
-        movl    %eax,%gs ;                \
-        call    i386_reset_ldt ;          \
-        popl    %eax ;                    \
-        popl    %edx 
-#define CLI             call ni_cli
-#else
-#define LOAD_CR3(reg)   movl reg,%cr3; 
-#define READ_CR3(reg)   movl %cr3,reg; 
-#define LLDT(arg)       lldt arg; 
-#define CLI             cli 
-#endif /* !XEN */ 
-
-
-#endif /* LOCORE */
-
-#ifdef __STDC__
-#define ELFNOTE(name, type, desctype, descdata...) \
-.pushsection .note.name                 ;       \
-  .align 4                              ;       \
-  .long 2f - 1f         /* namesz */    ;       \
-  .long 4f - 3f         /* descsz */    ;       \
-  .long type                            ;       \
-1:.asciz #name                          ;       \
-2:.align 4                              ;       \
-3:desctype descdata                     ;       \
-4:.align 4                              ;       \
-.popsection
-#else /* !__STDC__, i.e. -traditional */
-#define ELFNOTE(name, type, desctype, descdata) \
-.pushsection .note.name                 ;       \
-  .align 4                              ;       \
-  .long 2f - 1f         /* namesz */    ;       \
-  .long 4f - 3f         /* descsz */    ;       \
-  .long type                            ;       \
-1:.asciz "name"                         ;       \
-2:.align 4                              ;       \
-3:desctype descdata                     ;       \
-4:.align 4                              ;       \
-.popsection
-#endif /* __STDC__ */
-
-#endif /* !_MACHINE_ASMACROS_H_ */
diff --git a/include.new/machine/atomic.h b/include.new/machine/atomic.h
deleted file mode 100644
index 6b9b9c9..0000000
--- a/include.new/machine/atomic.h
+++ /dev/null
@@ -1,723 +0,0 @@
-/*-
- * Copyright (c) 1998 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/i386/include/atomic.h 254620 2013-08-21 22:30:11Z jkim $
- */
-#ifndef _MACHINE_ATOMIC_H_
-#define	_MACHINE_ATOMIC_H_
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-#ifdef _KERNEL
-#include <machine/md_var.h>
-#include <machine/specialreg.h>
-#endif
-
-#define	mb()	__asm __volatile("lock; addl $0,(%%esp)" : : : "memory", "cc")
-#define	wmb()	__asm __volatile("lock; addl $0,(%%esp)" : : : "memory", "cc")
-#define	rmb()	__asm __volatile("lock; addl $0,(%%esp)" : : : "memory", "cc")
-
-/*
- * Various simple operations on memory, each of which is atomic in the
- * presence of interrupts and multiple processors.
- *
- * atomic_set_char(P, V)	(*(u_char *)(P) |= (V))
- * atomic_clear_char(P, V)	(*(u_char *)(P) &= ~(V))
- * atomic_add_char(P, V)	(*(u_char *)(P) += (V))
- * atomic_subtract_char(P, V)	(*(u_char *)(P) -= (V))
- *
- * atomic_set_short(P, V)	(*(u_short *)(P) |= (V))
- * atomic_clear_short(P, V)	(*(u_short *)(P) &= ~(V))
- * atomic_add_short(P, V)	(*(u_short *)(P) += (V))
- * atomic_subtract_short(P, V)	(*(u_short *)(P) -= (V))
- *
- * atomic_set_int(P, V)		(*(u_int *)(P) |= (V))
- * atomic_clear_int(P, V)	(*(u_int *)(P) &= ~(V))
- * atomic_add_int(P, V)		(*(u_int *)(P) += (V))
- * atomic_subtract_int(P, V)	(*(u_int *)(P) -= (V))
- * atomic_swap_int(P, V)	(return (*(u_int *)(P)); *(u_int *)(P) = (V);)
- * atomic_readandclear_int(P)	(return (*(u_int *)(P)); *(u_int *)(P) = 0;)
- *
- * atomic_set_long(P, V)	(*(u_long *)(P) |= (V))
- * atomic_clear_long(P, V)	(*(u_long *)(P) &= ~(V))
- * atomic_add_long(P, V)	(*(u_long *)(P) += (V))
- * atomic_subtract_long(P, V)	(*(u_long *)(P) -= (V))
- * atomic_swap_long(P, V)	(return (*(u_long *)(P)); *(u_long *)(P) = (V);)
- * atomic_readandclear_long(P)	(return (*(u_long *)(P)); *(u_long *)(P) = 0;)
- */
-
-/*
- * The above functions are expanded inline in the statically-linked
- * kernel.  Lock prefixes are generated if an SMP kernel is being
- * built.
- *
- * Kernel modules call real functions which are built into the kernel.
- * This allows kernel modules to be portable between UP and SMP systems.
- */
-#if defined(KLD_MODULE) || !defined(__GNUCLIKE_ASM)
-#define	ATOMIC_ASM(NAME, TYPE, OP, CONS, V)			\
-void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v);	\
-void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
-
-int	atomic_cmpset_int(volatile u_int *dst, u_int expect, u_int src);
-u_int	atomic_fetchadd_int(volatile u_int *p, u_int v);
-int	atomic_testandset_int(volatile u_int *p, u_int v);
-
-#define	ATOMIC_LOAD(TYPE, LOP)					\
-u_##TYPE	atomic_load_acq_##TYPE(volatile u_##TYPE *p)
-#define	ATOMIC_STORE(TYPE)					\
-void		atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
-
-int		atomic_cmpset_64(volatile uint64_t *, uint64_t, uint64_t);
-uint64_t	atomic_load_acq_64(volatile uint64_t *);
-void		atomic_store_rel_64(volatile uint64_t *, uint64_t);
-uint64_t	atomic_swap_64(volatile uint64_t *, uint64_t);
-
-#else /* !KLD_MODULE && __GNUCLIKE_ASM */
-
-/*
- * For userland, always use lock prefixes so that the binaries will run
- * on both SMP and !SMP systems.
- */
-#if defined(SMP) || !defined(_KERNEL)
-#define	MPLOCKED	"lock ; "
-#else
-#define	MPLOCKED
-#endif
-
-/*
- * The assembly is volatilized to avoid code chunk removal by the compiler.
- * GCC aggressively reorders operations and memory clobbering is necessary
- * in order to avoid that for memory barriers.
- */
-#define	ATOMIC_ASM(NAME, TYPE, OP, CONS, V)		\
-static __inline void					\
-atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
-{							\
-	__asm __volatile(MPLOCKED OP			\
-	: "+m" (*p)					\
-	: CONS (V)					\
-	: "cc");					\
-}							\
-							\
-static __inline void					\
-atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
-{							\
-	__asm __volatile(MPLOCKED OP			\
-	: "+m" (*p)					\
-	: CONS (V)					\
-	: "memory", "cc");				\
-}							\
-struct __hack
-
-/*
- * Atomic compare and set, used by the mutex functions
- *
- * if (*dst == expect) *dst = src (all 32 bit words)
- *
- * Returns 0 on failure, non-zero on success
- */
-
-#ifdef CPU_DISABLE_CMPXCHG
-
-static __inline int
-atomic_cmpset_int(volatile u_int *dst, u_int expect, u_int src)
-{
-	u_char res;
-
-	__asm __volatile(
-	"	pushfl ;		"
-	"	cli ;			"
-	"	cmpl	%3,%1 ;		"
-	"	jne	1f ;		"
-	"	movl	%2,%1 ;		"
-	"1:				"
-	"       sete	%0 ;		"
-	"	popfl ;			"
-	"# atomic_cmpset_int"
-	: "=q" (res),			/* 0 */
-	  "+m" (*dst)			/* 1 */
-	: "r" (src),			/* 2 */
-	  "r" (expect)			/* 3 */
-	: "memory");
-	return (res);
-}
-
-#else /* !CPU_DISABLE_CMPXCHG */
-
-static __inline int
-atomic_cmpset_int(volatile u_int *dst, u_int expect, u_int src)
-{
-	u_char res;
-
-	__asm __volatile(
-	"	" MPLOCKED "		"
-	"	cmpxchgl %3,%1 ;	"
-	"       sete	%0 ;		"
-	"# atomic_cmpset_int"
-	: "=q" (res),			/* 0 */
-	  "+m" (*dst),			/* 1 */
-	  "+a" (expect)			/* 2 */
-	: "r" (src)			/* 3 */
-	: "memory", "cc");
-	return (res);
-}
-
-#endif /* CPU_DISABLE_CMPXCHG */
-
-/*
- * Atomically add the value of v to the integer pointed to by p and return
- * the previous value of *p.
- */
-static __inline u_int
-atomic_fetchadd_int(volatile u_int *p, u_int v)
-{
-
-	__asm __volatile(
-	"	" MPLOCKED "		"
-	"	xaddl	%0,%1 ;		"
-	"# atomic_fetchadd_int"
-	: "+r" (v),			/* 0 */
-	  "+m" (*p)			/* 1 */
-	: : "cc");
-	return (v);
-}
-
-static __inline int
-atomic_testandset_int(volatile u_int *p, u_int v)
-{
-	u_char res;
-
-	__asm __volatile(
-	"	" MPLOCKED "		"
-	"	btsl	%2,%1 ;		"
-	"	setc	%0 ;		"
-	"# atomic_testandset_int"
-	: "=q" (res),			/* 0 */
-	  "+m" (*p)			/* 1 */
-	: "Ir" (v & 0x1f)		/* 2 */
-	: "cc");
-	return (res);
-}
-
-/*
- * We assume that a = b will do atomic loads and stores.  Due to the
- * IA32 memory model, a simple store guarantees release semantics.
- *
- * However, loads may pass stores, so for atomic_load_acq we have to
- * ensure a Store/Load barrier to do the load in SMP kernels.  We use
- * "lock cmpxchg" as recommended by the AMD Software Optimization
- * Guide, and not mfence.  For UP kernels, however, the cache of the
- * single processor is always consistent, so we only need to take care
- * of the compiler.
- */
-#define	ATOMIC_STORE(TYPE)				\
-static __inline void					\
-atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\
-{							\
-	__compiler_membar();				\
-	*p = v;						\
-}							\
-struct __hack
-
-#if defined(_KERNEL) && !defined(SMP)
-
-#define	ATOMIC_LOAD(TYPE, LOP)				\
-static __inline u_##TYPE				\
-atomic_load_acq_##TYPE(volatile u_##TYPE *p)		\
-{							\
-	u_##TYPE tmp;					\
-							\
-	tmp = *p;					\
-	__compiler_membar();				\
-	return (tmp);					\
-}							\
-struct __hack
-
-#else /* !(_KERNEL && !SMP) */
-
-#define	ATOMIC_LOAD(TYPE, LOP)				\
-static __inline u_##TYPE				\
-atomic_load_acq_##TYPE(volatile u_##TYPE *p)		\
-{							\
-	u_##TYPE res;					\
-							\
-	__asm __volatile(MPLOCKED LOP			\
-	: "=a" (res),			/* 0 */		\
-	  "+m" (*p)			/* 1 */		\
-	: : "memory", "cc");				\
-	return (res);					\
-}							\
-struct __hack
-
-#endif /* _KERNEL && !SMP */
-
-#ifdef _KERNEL
-
-#ifdef WANT_FUNCTIONS
-int		atomic_cmpset_64_i386(volatile uint64_t *, uint64_t, uint64_t);
-int		atomic_cmpset_64_i586(volatile uint64_t *, uint64_t, uint64_t);
-uint64_t	atomic_load_acq_64_i386(volatile uint64_t *);
-uint64_t	atomic_load_acq_64_i586(volatile uint64_t *);
-void		atomic_store_rel_64_i386(volatile uint64_t *, uint64_t);
-void		atomic_store_rel_64_i586(volatile uint64_t *, uint64_t);
-uint64_t	atomic_swap_64_i386(volatile uint64_t *, uint64_t);
-uint64_t	atomic_swap_64_i586(volatile uint64_t *, uint64_t);
-#endif
-
-/* I486 does not support SMP or CMPXCHG8B. */
-static __inline int
-atomic_cmpset_64_i386(volatile uint64_t *dst, uint64_t expect, uint64_t src)
-{
-	volatile uint32_t *p;
-	u_char res;
-
-	p = (volatile uint32_t *)dst;
-	__asm __volatile(
-	"	pushfl ;		"
-	"	cli ;			"
-	"	xorl	%1,%%eax ;	"
-	"	xorl	%2,%%edx ;	"
-	"	orl	%%edx,%%eax ;	"
-	"	jne	1f ;		"
-	"	movl	%4,%1 ;		"
-	"	movl	%5,%2 ;		"
-	"1:				"
-	"	sete	%3 ;		"
-	"	popfl"
-	: "+A" (expect),		/* 0 */
-	  "+m" (*p),			/* 1 */
-	  "+m" (*(p + 1)),		/* 2 */
-	  "=q" (res)			/* 3 */
-	: "r" ((uint32_t)src),		/* 4 */
-	  "r" ((uint32_t)(src >> 32))	/* 5 */
-	: "memory", "cc");
-	return (res);
-}
-
-static __inline uint64_t
-atomic_load_acq_64_i386(volatile uint64_t *p)
-{
-	volatile uint32_t *q;
-	uint64_t res;
-
-	q = (volatile uint32_t *)p;
-	__asm __volatile(
-	"	pushfl ;		"
-	"	cli ;			"
-	"	movl	%1,%%eax ;	"
-	"	movl	%2,%%edx ;	"
-	"	popfl"
-	: "=&A" (res)			/* 0 */
-	: "m" (*q),			/* 1 */
-	  "m" (*(q + 1))		/* 2 */
-	: "memory");
-	return (res);
-}
-
-static __inline void
-atomic_store_rel_64_i386(volatile uint64_t *p, uint64_t v)
-{
-	volatile uint32_t *q;
-
-	q = (volatile uint32_t *)p;
-	__asm __volatile(
-	"	pushfl ;		"
-	"	cli ;			"
-	"	movl	%%eax,%0 ;	"
-	"	movl	%%edx,%1 ;	"
-	"	popfl"
-	: "=m" (*q),			/* 0 */
-	  "=m" (*(q + 1))		/* 1 */
-	: "A" (v)			/* 2 */
-	: "memory");
-}
-
-static __inline uint64_t
-atomic_swap_64_i386(volatile uint64_t *p, uint64_t v)
-{
-	volatile uint32_t *q;
-	uint64_t res;
-
-	q = (volatile uint32_t *)p;
-	__asm __volatile(
-	"	pushfl ;		"
-	"	cli ;			"
-	"	movl	%1,%%eax ;	"
-	"	movl	%2,%%edx ;	"
-	"	movl	%4,%2 ;		"
-	"	movl	%3,%1 ;		"
-	"	popfl"
-	: "=&A" (res),			/* 0 */
-	  "+m" (*q),			/* 1 */
-	  "+m" (*(q + 1))		/* 2 */
-	: "r" ((uint32_t)v),		/* 3 */
-	  "r" ((uint32_t)(v >> 32)));	/* 4 */
-	return (res);
-}
-
-static __inline int
-atomic_cmpset_64_i586(volatile uint64_t *dst, uint64_t expect, uint64_t src)
-{
-	u_char res;
-
-	__asm __volatile(
-	"	" MPLOCKED "		"
-	"	cmpxchg8b %1 ;		"
-	"	sete	%0"
-	: "=q" (res),			/* 0 */
-	  "+m" (*dst),			/* 1 */
-	  "+A" (expect)			/* 2 */
-	: "b" ((uint32_t)src),		/* 3 */
-	  "c" ((uint32_t)(src >> 32))	/* 4 */
-	: "memory", "cc");
-	return (res);
-}
-
-static __inline uint64_t
-atomic_load_acq_64_i586(volatile uint64_t *p)
-{
-	uint64_t res;
-
-	__asm __volatile(
-	"	movl	%%ebx,%%eax ;	"
-	"	movl	%%ecx,%%edx ;	"
-	"	" MPLOCKED "		"
-	"	cmpxchg8b %1"
-	: "=&A" (res),			/* 0 */
-	  "+m" (*p)			/* 1 */
-	: : "memory", "cc");
-	return (res);
-}
-
-static __inline void
-atomic_store_rel_64_i586(volatile uint64_t *p, uint64_t v)
-{
-
-	__asm __volatile(
-	"	movl	%%eax,%%ebx ;	"
-	"	movl	%%edx,%%ecx ;	"
-	"1:				"
-	"	" MPLOCKED "		"
-	"	cmpxchg8b %0 ;		"
-	"	jne	1b"
-	: "+m" (*p),			/* 0 */
-	  "+A" (v)			/* 1 */
-	: : "ebx", "ecx", "memory", "cc");
-}
-
-static __inline uint64_t
-atomic_swap_64_i586(volatile uint64_t *p, uint64_t v)
-{
-
-	__asm __volatile(
-	"	movl	%%eax,%%ebx ;	"
-	"	movl	%%edx,%%ecx ;	"
-	"1:				"
-	"	" MPLOCKED "		"
-	"	cmpxchg8b %0 ;		"
-	"	jne	1b"
-	: "+m" (*p),			/* 0 */
-	  "+A" (v)			/* 1 */
-	: : "ebx", "ecx", "memory", "cc");
-	return (v);
-}
-
-static __inline int
-atomic_cmpset_64(volatile uint64_t *dst, uint64_t expect, uint64_t src)
-{
-
-	if ((cpu_feature & CPUID_CX8) == 0)
-		return (atomic_cmpset_64_i386(dst, expect, src));
-	else
-		return (atomic_cmpset_64_i586(dst, expect, src));
-}
-
-static __inline uint64_t
-atomic_load_acq_64(volatile uint64_t *p)
-{
-
-	if ((cpu_feature & CPUID_CX8) == 0)
-		return (atomic_load_acq_64_i386(p));
-	else
-		return (atomic_load_acq_64_i586(p));
-}
-
-static __inline void
-atomic_store_rel_64(volatile uint64_t *p, uint64_t v)
-{
-
-	if ((cpu_feature & CPUID_CX8) == 0)
-		atomic_store_rel_64_i386(p, v);
-	else
-		atomic_store_rel_64_i586(p, v);
-}
-
-static __inline uint64_t
-atomic_swap_64(volatile uint64_t *p, uint64_t v)
-{
-
-	if ((cpu_feature & CPUID_CX8) == 0)
-		return (atomic_swap_64_i386(p, v));
-	else
-		return (atomic_swap_64_i586(p, v));
-}
-
-#endif /* _KERNEL */
-
-#endif /* KLD_MODULE || !__GNUCLIKE_ASM */
-
-ATOMIC_ASM(set,	     char,  "orb %b1,%0",  "iq",  v);
-ATOMIC_ASM(clear,    char,  "andb %b1,%0", "iq", ~v);
-ATOMIC_ASM(add,	     char,  "addb %b1,%0", "iq",  v);
-ATOMIC_ASM(subtract, char,  "subb %b1,%0", "iq",  v);
-
-ATOMIC_ASM(set,	     short, "orw %w1,%0",  "ir",  v);
-ATOMIC_ASM(clear,    short, "andw %w1,%0", "ir", ~v);
-ATOMIC_ASM(add,	     short, "addw %w1,%0", "ir",  v);
-ATOMIC_ASM(subtract, short, "subw %w1,%0", "ir",  v);
-
-ATOMIC_ASM(set,	     int,   "orl %1,%0",   "ir",  v);
-ATOMIC_ASM(clear,    int,   "andl %1,%0",  "ir", ~v);
-ATOMIC_ASM(add,	     int,   "addl %1,%0",  "ir",  v);
-ATOMIC_ASM(subtract, int,   "subl %1,%0",  "ir",  v);
-
-ATOMIC_ASM(set,	     long,  "orl %1,%0",   "ir",  v);
-ATOMIC_ASM(clear,    long,  "andl %1,%0",  "ir", ~v);
-ATOMIC_ASM(add,	     long,  "addl %1,%0",  "ir",  v);
-ATOMIC_ASM(subtract, long,  "subl %1,%0",  "ir",  v);
-
-ATOMIC_LOAD(char,  "cmpxchgb %b0,%1");
-ATOMIC_LOAD(short, "cmpxchgw %w0,%1");
-ATOMIC_LOAD(int,   "cmpxchgl %0,%1");
-ATOMIC_LOAD(long,  "cmpxchgl %0,%1");
-
-ATOMIC_STORE(char);
-ATOMIC_STORE(short);
-ATOMIC_STORE(int);
-ATOMIC_STORE(long);
-
-#undef ATOMIC_ASM
-#undef ATOMIC_LOAD
-#undef ATOMIC_STORE
-
-#ifndef WANT_FUNCTIONS
-
-static __inline int
-atomic_cmpset_long(volatile u_long *dst, u_long expect, u_long src)
-{
-
-	return (atomic_cmpset_int((volatile u_int *)dst, (u_int)expect,
-	    (u_int)src));
-}
-
-static __inline u_long
-atomic_fetchadd_long(volatile u_long *p, u_long v)
-{
-
-	return (atomic_fetchadd_int((volatile u_int *)p, (u_int)v));
-}
-
-static __inline int
-atomic_testandset_long(volatile u_long *p, u_int v)
-{
-
-	return (atomic_testandset_int((volatile u_int *)p, v));
-}
-
-/* Read the current value and store a new value in the destination. */
-#ifdef __GNUCLIKE_ASM
-
-static __inline u_int
-atomic_swap_int(volatile u_int *p, u_int v)
-{
-
-	__asm __volatile(
-	"	xchgl	%1,%0 ;		"
-	"# atomic_swap_int"
-	: "+r" (v),			/* 0 */
-	  "+m" (*p));			/* 1 */
-	return (v);
-}
-
-static __inline u_long
-atomic_swap_long(volatile u_long *p, u_long v)
-{
-
-	return (atomic_swap_int((volatile u_int *)p, (u_int)v));
-}
-
-#else /* !__GNUCLIKE_ASM */
-
-u_int	atomic_swap_int(volatile u_int *p, u_int v);
-u_long	atomic_swap_long(volatile u_long *p, u_long v);
-
-#endif /* __GNUCLIKE_ASM */
-
-#define	atomic_set_acq_char		atomic_set_barr_char
-#define	atomic_set_rel_char		atomic_set_barr_char
-#define	atomic_clear_acq_char		atomic_clear_barr_char
-#define	atomic_clear_rel_char		atomic_clear_barr_char
-#define	atomic_add_acq_char		atomic_add_barr_char
-#define	atomic_add_rel_char		atomic_add_barr_char
-#define	atomic_subtract_acq_char	atomic_subtract_barr_char
-#define	atomic_subtract_rel_char	atomic_subtract_barr_char
-
-#define	atomic_set_acq_short		atomic_set_barr_short
-#define	atomic_set_rel_short		atomic_set_barr_short
-#define	atomic_clear_acq_short		atomic_clear_barr_short
-#define	atomic_clear_rel_short		atomic_clear_barr_short
-#define	atomic_add_acq_short		atomic_add_barr_short
-#define	atomic_add_rel_short		atomic_add_barr_short
-#define	atomic_subtract_acq_short	atomic_subtract_barr_short
-#define	atomic_subtract_rel_short	atomic_subtract_barr_short
-
-#define	atomic_set_acq_int		atomic_set_barr_int
-#define	atomic_set_rel_int		atomic_set_barr_int
-#define	atomic_clear_acq_int		atomic_clear_barr_int
-#define	atomic_clear_rel_int		atomic_clear_barr_int
-#define	atomic_add_acq_int		atomic_add_barr_int
-#define	atomic_add_rel_int		atomic_add_barr_int
-#define	atomic_subtract_acq_int		atomic_subtract_barr_int
-#define	atomic_subtract_rel_int		atomic_subtract_barr_int
-#define	atomic_cmpset_acq_int		atomic_cmpset_int
-#define	atomic_cmpset_rel_int		atomic_cmpset_int
-
-#define	atomic_set_acq_long		atomic_set_barr_long
-#define	atomic_set_rel_long		atomic_set_barr_long
-#define	atomic_clear_acq_long		atomic_clear_barr_long
-#define	atomic_clear_rel_long		atomic_clear_barr_long
-#define	atomic_add_acq_long		atomic_add_barr_long
-#define	atomic_add_rel_long		atomic_add_barr_long
-#define	atomic_subtract_acq_long	atomic_subtract_barr_long
-#define	atomic_subtract_rel_long	atomic_subtract_barr_long
-#define	atomic_cmpset_acq_long		atomic_cmpset_long
-#define	atomic_cmpset_rel_long		atomic_cmpset_long
-
-#define	atomic_readandclear_int(p)	atomic_swap_int(p, 0)
-#define	atomic_readandclear_long(p)	atomic_swap_long(p, 0)
-
-/* Operations on 8-bit bytes. */
-#define	atomic_set_8		atomic_set_char
-#define	atomic_set_acq_8	atomic_set_acq_char
-#define	atomic_set_rel_8	atomic_set_rel_char
-#define	atomic_clear_8		atomic_clear_char
-#define	atomic_clear_acq_8	atomic_clear_acq_char
-#define	atomic_clear_rel_8	atomic_clear_rel_char
-#define	atomic_add_8		atomic_add_char
-#define	atomic_add_acq_8	atomic_add_acq_char
-#define	atomic_add_rel_8	atomic_add_rel_char
-#define	atomic_subtract_8	atomic_subtract_char
-#define	atomic_subtract_acq_8	atomic_subtract_acq_char
-#define	atomic_subtract_rel_8	atomic_subtract_rel_char
-#define	atomic_load_acq_8	atomic_load_acq_char
-#define	atomic_store_rel_8	atomic_store_rel_char
-
-/* Operations on 16-bit words. */
-#define	atomic_set_16		atomic_set_short
-#define	atomic_set_acq_16	atomic_set_acq_short
-#define	atomic_set_rel_16	atomic_set_rel_short
-#define	atomic_clear_16		atomic_clear_short
-#define	atomic_clear_acq_16	atomic_clear_acq_short
-#define	atomic_clear_rel_16	atomic_clear_rel_short
-#define	atomic_add_16		atomic_add_short
-#define	atomic_add_acq_16	atomic_add_acq_short
-#define	atomic_add_rel_16	atomic_add_rel_short
-#define	atomic_subtract_16	atomic_subtract_short
-#define	atomic_subtract_acq_16	atomic_subtract_acq_short
-#define	atomic_subtract_rel_16	atomic_subtract_rel_short
-#define	atomic_load_acq_16	atomic_load_acq_short
-#define	atomic_store_rel_16	atomic_store_rel_short
-
-/* Operations on 32-bit double words. */
-#define	atomic_set_32		atomic_set_int
-#define	atomic_set_acq_32	atomic_set_acq_int
-#define	atomic_set_rel_32	atomic_set_rel_int
-#define	atomic_clear_32		atomic_clear_int
-#define	atomic_clear_acq_32	atomic_clear_acq_int
-#define	atomic_clear_rel_32	atomic_clear_rel_int
-#define	atomic_add_32		atomic_add_int
-#define	atomic_add_acq_32	atomic_add_acq_int
-#define	atomic_add_rel_32	atomic_add_rel_int
-#define	atomic_subtract_32	atomic_subtract_int
-#define	atomic_subtract_acq_32	atomic_subtract_acq_int
-#define	atomic_subtract_rel_32	atomic_subtract_rel_int
-#define	atomic_load_acq_32	atomic_load_acq_int
-#define	atomic_store_rel_32	atomic_store_rel_int
-#define	atomic_cmpset_32	atomic_cmpset_int
-#define	atomic_cmpset_acq_32	atomic_cmpset_acq_int
-#define	atomic_cmpset_rel_32	atomic_cmpset_rel_int
-#define	atomic_swap_32		atomic_swap_int
-#define	atomic_readandclear_32	atomic_readandclear_int
-#define	atomic_fetchadd_32	atomic_fetchadd_int
-#define	atomic_testandset_32	atomic_testandset_int
-
-/* Operations on pointers. */
-#define	atomic_set_ptr(p, v) \
-	atomic_set_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_set_acq_ptr(p, v) \
-	atomic_set_acq_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_set_rel_ptr(p, v) \
-	atomic_set_rel_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_clear_ptr(p, v) \
-	atomic_clear_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_clear_acq_ptr(p, v) \
-	atomic_clear_acq_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_clear_rel_ptr(p, v) \
-	atomic_clear_rel_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_add_ptr(p, v) \
-	atomic_add_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_add_acq_ptr(p, v) \
-	atomic_add_acq_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_add_rel_ptr(p, v) \
-	atomic_add_rel_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_subtract_ptr(p, v) \
-	atomic_subtract_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_subtract_acq_ptr(p, v) \
-	atomic_subtract_acq_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_subtract_rel_ptr(p, v) \
-	atomic_subtract_rel_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_load_acq_ptr(p) \
-	atomic_load_acq_int((volatile u_int *)(p))
-#define	atomic_store_rel_ptr(p, v) \
-	atomic_store_rel_int((volatile u_int *)(p), (v))
-#define	atomic_cmpset_ptr(dst, old, new) \
-	atomic_cmpset_int((volatile u_int *)(dst), (u_int)(old), (u_int)(new))
-#define	atomic_cmpset_acq_ptr(dst, old, new) \
-	atomic_cmpset_acq_int((volatile u_int *)(dst), (u_int)(old), \
-	    (u_int)(new))
-#define	atomic_cmpset_rel_ptr(dst, old, new) \
-	atomic_cmpset_rel_int((volatile u_int *)(dst), (u_int)(old), \
-	    (u_int)(new))
-#define	atomic_swap_ptr(p, v) \
-	atomic_swap_int((volatile u_int *)(p), (u_int)(v))
-#define	atomic_readandclear_ptr(p) \
-	atomic_readandclear_int((volatile u_int *)(p))
-
-#endif /* !WANT_FUNCTIONS */
-
-#endif /* !_MACHINE_ATOMIC_H_ */
diff --git a/include.new/machine/bootinfo.h b/include.new/machine/bootinfo.h
deleted file mode 100644
index 64fa46d..0000000
--- a/include.new/machine/bootinfo.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * Copyright (C) 1994 by Rodney W. Grimes, Milwaukie, Oregon  97222
- * 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 as
- *    the first lines of this file unmodified.
- * 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 Rodney W. Grimes.
- * 4. 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 RODNEY W. GRIMES ``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 RODNEY W. GRIMES 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: releng/10.2/sys/i386/include/bootinfo.h 235391 2012-05-13 09:25:39Z avg $
- */
-
-#ifndef	_MACHINE_BOOTINFO_H_
-#define	_MACHINE_BOOTINFO_H_
-
-/* Only change the version number if you break compatibility. */
-#define	BOOTINFO_VERSION	1
-
-#define	N_BIOS_GEOM		8
-
-/*
- * A zero bootinfo field often means that there is no info available.
- * Flags are used to indicate the validity of fields where zero is a
- * normal value.
- */
-struct bootinfo {
-	uint32_t	bi_version;
-	uint32_t	bi_kernelname;		/* represents a char * */
-	uint32_t	bi_nfs_diskless;	/* struct nfs_diskless * */
-				/* End of fields that are always present. */
-#define	bi_endcommon	bi_n_bios_used
-	uint32_t	bi_n_bios_used;
-	uint32_t	bi_bios_geom[N_BIOS_GEOM];
-	uint32_t	bi_size;
-	u_int8_t	bi_memsizes_valid;
-	u_int8_t	bi_bios_dev;		/* bootdev BIOS unit number */
-	u_int8_t	bi_pad[2];
-	uint32_t	bi_basemem;
-	uint32_t	bi_extmem;
-	uint32_t	bi_symtab;		/* struct symtab * */
-	uint32_t	bi_esymtab;		/* struct symtab * */
-				/* Items below only from advanced bootloader */
-	uint32_t	bi_kernend;		/* end of kernel space */
-	uint32_t	bi_envp;		/* environment */
-	uint32_t	bi_modulep;		/* preloaded modules */
-	uint32_t	bi_memdesc_version;	/* EFI memory desc version */
-	uint64_t	bi_memdesc_size;	/* sizeof EFI memory desc */
-	uint64_t	bi_memmap;		/* pa of EFI memory map */
-	uint64_t	bi_memmap_size;		/* size of EFI memory map */
-	uint64_t	bi_hcdp;		/* DIG64 HCDP table */
-	uint64_t	bi_fpswa;		/* FPSWA interface */
-	uint64_t	bi_systab;		/* pa of EFI system table */
-};
-
-#ifdef _KERNEL
-extern struct bootinfo	bootinfo;
-#endif
-
-/*
- * Constants for converting boot-style device number to type,
- * adaptor (uba, mba, etc), unit number and partition number.
- * Type (== major device number) is in the low byte
- * for backward compatibility.  Except for that of the "magic
- * number", each mask applies to the shifted value.
- * Format:
- *	 (4)   (8)   (4)  (8)     (8)
- *	--------------------------------
- *	|MA | SLICE | UN| PART  | TYPE |
- *	--------------------------------
- */
-#define B_SLICESHIFT		20
-#define B_SLICEMASK		0xff
-#define B_SLICE(val)		(((val)>>B_SLICESHIFT) & B_SLICEMASK)
-#define B_UNITSHIFT		16
-#define B_UNITMASK		0xf
-#define	B_UNIT(val)		(((val) >> B_UNITSHIFT) & B_UNITMASK)
-#define B_PARTITIONSHIFT	8
-#define B_PARTITIONMASK		0xff
-#define	B_PARTITION(val)	(((val) >> B_PARTITIONSHIFT) & B_PARTITIONMASK)
-#define	B_TYPESHIFT		0
-#define	B_TYPEMASK		0xff
-#define	B_TYPE(val)		(((val) >> B_TYPESHIFT) & B_TYPEMASK)
-
-#define	B_MAGICMASK	0xf0000000
-#define	B_DEVMAGIC	0xa0000000
-
-#define	MAKEBOOTDEV(type, slice, unit, partition) \
-	(((type) << B_TYPESHIFT) | ((slice) << B_SLICESHIFT) | \
-	((unit) << B_UNITSHIFT) | ((partition) << B_PARTITIONSHIFT) | \
-	B_DEVMAGIC)
-
-#define	BASE_SLICE		2
-#define	COMPATIBILITY_SLICE	0
-#define	MAX_SLICES		32
-#define	WHOLE_DISK_SLICE	1
-
-#endif	/* !_MACHINE_BOOTINFO_H_ */
diff --git a/include.new/machine/bus.h b/include.new/machine/bus.h
deleted file mode 100644
index fa9b8b0..0000000
--- a/include.new/machine/bus.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/bus.h 244191 2012-12-13 21:27:20Z jimharris $ */
-
-#include <x86/bus.h>
diff --git a/include.new/machine/bus_dma.h b/include.new/machine/bus_dma.h
deleted file mode 100644
index 21d0101..0000000
--- a/include.new/machine/bus_dma.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * Copyright (c) 2005 Scott Long
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/sys/i386/include/bus_dma.h 143598 2005-03-14 16:46:28Z scottl $ */
-
-#ifndef _I386_BUS_DMA_H_
-#define _I386_BUS_DMA_H_
-
-#include <sys/bus_dma.h>
-
-#endif /* _I386_BUS_DMA_H_ */
diff --git a/include.new/machine/clock.h b/include.new/machine/clock.h
deleted file mode 100644
index 596352c..0000000
--- a/include.new/machine/clock.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Kernel interface to machine-dependent clock driver.
- * Garrett Wollman, September 1994.
- * This file is in the public domain.
- *
- * $FreeBSD: releng/10.2/sys/i386/include/clock.h 221703 2011-05-09 17:34:00Z jkim $
- */
-
-#ifndef _MACHINE_CLOCK_H_
-#define	_MACHINE_CLOCK_H_
-
-#ifdef _KERNEL
-/*
- * i386 to clock driver interface.
- * XXX large parts of the driver and its interface are misplaced.
- */
-extern int	clkintr_pending;
-extern u_int	i8254_freq;
-extern int	i8254_max_count;
-extern uint64_t	tsc_freq;
-extern int	tsc_is_invariant;
-extern int	tsc_perf_stat;
-
-void	i8254_init(void);
-
-/*
- * Driver to clock driver interface.
- */
-
-void	startrtclock(void);
-void	timer_restore(void);
-void	init_TSC(void);
-
-#define	HAS_TIMER_SPKR 1
-int	timer_spkr_acquire(void);
-int	timer_spkr_release(void);
-void	timer_spkr_setfreq(int freq);
-
-#endif /* _KERNEL */
-
-#endif /* !_MACHINE_CLOCK_H_ */
diff --git a/include.new/machine/counter.h b/include.new/machine/counter.h
deleted file mode 100644
index f9c8a8d..0000000
--- a/include.new/machine/counter.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * Copyright (c) 2012 Konstantin Belousov <kib@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.
- *
- * 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: releng/10.2/sys/i386/include/counter.h 252434 2013-07-01 02:48:27Z kib $
- */
-
-#ifndef __MACHINE_COUNTER_H__
-#define __MACHINE_COUNTER_H__
-
-#include <sys/pcpu.h>
-#ifdef INVARIANTS
-#include <sys/proc.h>
-#endif
-#include <machine/md_var.h>
-#include <machine/specialreg.h>
-
-#define	counter_enter()	do {				\
-	if ((cpu_feature & CPUID_CX8) == 0)		\
-		critical_enter();			\
-} while (0)
-
-#define	counter_exit()	do {				\
-	if ((cpu_feature & CPUID_CX8) == 0)		\
-		critical_exit();			\
-} while (0)
-
-extern struct pcpu __pcpu[MAXCPU];
-
-static inline void
-counter_64_inc_8b(uint64_t *p, int64_t inc)
-{
-
-	__asm __volatile(
-	"movl	%%fs:(%%esi),%%eax\n\t"
-	"movl	%%fs:4(%%esi),%%edx\n"
-"1:\n\t"
-	"movl	%%eax,%%ebx\n\t"
-	"movl	%%edx,%%ecx\n\t"
-	"addl	(%%edi),%%ebx\n\t"
-	"adcl	4(%%edi),%%ecx\n\t"
-	"cmpxchg8b %%fs:(%%esi)\n\t"
-	"jnz	1b"
-	:
-	: "S" ((char *)p - (char *)&__pcpu[0]), "D" (&inc)
-	: "memory", "cc", "eax", "edx", "ebx", "ecx");
-}
-
-#ifdef IN_SUBR_COUNTER_C
-static inline uint64_t
-counter_u64_read_one_8b(uint64_t *p)
-{
-	uint32_t res_lo, res_high;
-
-	__asm __volatile(
-	"movl	%%eax,%%ebx\n\t"
-	"movl	%%edx,%%ecx\n\t"
-	"cmpxchg8b	(%2)"
-	: "=a" (res_lo), "=d"(res_high)
-	: "SD" (p)
-	: "cc", "ebx", "ecx");
-	return (res_lo + ((uint64_t)res_high << 32));
-}
-
-static inline uint64_t
-counter_u64_fetch_inline(uint64_t *p)
-{
-	uint64_t res;
-	int i;
-
-	res = 0;
-	if ((cpu_feature & CPUID_CX8) == 0) {
-		/*
-		 * The machines without cmpxchg8b are not SMP.
-		 * Disabling the preemption provides atomicity of the
-		 * counter reading, since update is done in the
-		 * critical section as well.
-		 */
-		critical_enter();
-		for (i = 0; i < mp_ncpus; i++) {
-			res += *(uint64_t *)((char *)p +
-			    sizeof(struct pcpu) * i);
-		}
-		critical_exit();
-	} else {
-		for (i = 0; i < mp_ncpus; i++)
-			res += counter_u64_read_one_8b((uint64_t *)((char *)p +
-			    sizeof(struct pcpu) * i));
-	}
-	return (res);
-}
-
-static inline void
-counter_u64_zero_one_8b(uint64_t *p)
-{
-
-	__asm __volatile(
-	"movl	(%0),%%eax\n\t"
-	"movl	4(%0),%%edx\n"
-	"xorl	%%ebx,%%ebx\n\t"
-	"xorl	%%ecx,%%ecx\n\t"
-"1:\n\t"
-	"cmpxchg8b	(%0)\n\t"
-	"jnz	1b"
-	:
-	: "SD" (p)
-	: "memory", "cc", "eax", "edx", "ebx", "ecx");
-}
-
-static void
-counter_u64_zero_one_cpu(void *arg)
-{
-	uint64_t *p;
-
-	p = (uint64_t *)((char *)arg + sizeof(struct pcpu) * PCPU_GET(cpuid));
-	counter_u64_zero_one_8b(p);
-}
-
-static inline void
-counter_u64_zero_inline(counter_u64_t c)
-{
-	int i;
-
-	if ((cpu_feature & CPUID_CX8) == 0) {
-		critical_enter();
-		for (i = 0; i < mp_ncpus; i++)
-			*(uint64_t *)((char *)c + sizeof(struct pcpu) * i) = 0;
-		critical_exit();
-	} else {
-		smp_rendezvous(smp_no_rendevous_barrier,
-		    counter_u64_zero_one_cpu, smp_no_rendevous_barrier, c);
-	}
-}
-#endif
-
-#define	counter_u64_add_protected(c, inc)	do {	\
-	if ((cpu_feature & CPUID_CX8) == 0) {		\
-		CRITICAL_ASSERT(curthread);		\
-		*(uint64_t *)zpcpu_get(c) += (inc);	\
-	} else						\
-		counter_64_inc_8b((c), (inc));		\
-} while (0)
-
-static inline void
-counter_u64_add(counter_u64_t c, int64_t inc)
-{
-
-	if ((cpu_feature & CPUID_CX8) == 0) {
-		critical_enter();
-		*(uint64_t *)zpcpu_get(c) += inc;
-		critical_exit();
-	} else {
-		counter_64_inc_8b(c, inc);
-	}
-}
-
-#endif	/* ! __MACHINE_COUNTER_H__ */
diff --git a/include.new/machine/cpu.h b/include.new/machine/cpu.h
deleted file mode 100644
index 87c8c69..0000000
--- a/include.new/machine/cpu.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)cpu.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD: releng/10.2/sys/i386/include/cpu.h 255744 2013-09-20 22:59:22Z gibbs $
- */
-
-#ifndef _MACHINE_CPU_H_
-#define	_MACHINE_CPU_H_
-
-/*
- * Definitions unique to i386 cpu support.
- */
-#include <machine/psl.h>
-#include <machine/frame.h>
-#include <machine/segments.h>
-
-#define	cpu_exec(p)	/* nothing */
-#define	cpu_swapin(p)	/* nothing */
-#define	cpu_getstack(td)		((td)->td_frame->tf_esp)
-#define	cpu_setstack(td, ap)		((td)->td_frame->tf_esp = (ap))
-#define	cpu_spinwait()			ia32_pause()
-
-#define	TRAPF_USERMODE(framep) \
-	((ISPL((framep)->tf_cs) == SEL_UPL) || ((framep)->tf_eflags & PSL_VM))
-#define	TRAPF_PC(framep)	((framep)->tf_eip)
-
-#ifdef _KERNEL
-/*
- * Struct containing pointers to CPU management functions whose
- * implementation is run time selectable.  Selection can be made,
- * for example, based on detection of a particular CPU variant or
- * hypervisor environment.
- */
-struct cpu_ops {
-	void (*cpu_init)(void);
-	void (*cpu_resume)(void);
-	void (*ipi_vectored)(u_int, int);
-};
-
-extern struct	cpu_ops cpu_ops;
-extern char	btext[];
-extern char	etext[];
-
-void	cpu_halt(void);
-void	cpu_reset(void);
-void	fork_trampoline(void);
-void	swi_vm(void *);
-
-/*
- * Return contents of in-cpu fast counter as a sort of "bogo-time"
- * for random-harvesting purposes.
- */
-static __inline uint64_t
-get_cyclecount(void)
-{
-
-	return (cpu_ticks());
-}
-
-#endif
-
-#endif /* !_MACHINE_CPU_H_ */
diff --git a/include.new/machine/cpufunc.h b/include.new/machine/cpufunc.h
deleted file mode 100644
index 0fc538c..0000000
--- a/include.new/machine/cpufunc.h
+++ /dev/null
@@ -1,802 +0,0 @@
-/*-
- * Copyright (c) 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/i386/include/cpufunc.h 276084 2014-12-22 21:32:39Z jhb $
- */
-
-/*
- * Functions to provide access to special i386 instructions.
- * This in included in sys/systm.h, and that file should be
- * used in preference to this.
- */
-
-#ifndef _MACHINE_CPUFUNC_H_
-#define	_MACHINE_CPUFUNC_H_
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-#ifdef XEN
-extern void xen_cli(void);
-extern void xen_sti(void);
-extern u_int xen_rcr2(void);
-extern void xen_load_cr3(u_int data);
-extern void xen_tlb_flush(void);
-extern void xen_invlpg(u_int addr);
-extern void write_eflags(u_int eflags);
-extern u_int read_eflags(void);
-#endif
-
-struct region_descriptor;
-
-#define readb(va)	(*(volatile uint8_t *) (va))
-#define readw(va)	(*(volatile uint16_t *) (va))
-#define readl(va)	(*(volatile uint32_t *) (va))
-
-#define writeb(va, d)	(*(volatile uint8_t *) (va) = (d))
-#define writew(va, d)	(*(volatile uint16_t *) (va) = (d))
-#define writel(va, d)	(*(volatile uint32_t *) (va) = (d))
-
-#if defined(__GNUCLIKE_ASM) && defined(__CC_SUPPORTS___INLINE)
-
-static __inline void
-breakpoint(void)
-{
-	__asm __volatile("int $3");
-}
-
-static __inline u_int
-bsfl(u_int mask)
-{
-	u_int	result;
-
-	__asm("bsfl %1,%0" : "=r" (result) : "rm" (mask) : "cc");
-	return (result);
-}
-
-static __inline u_int
-bsrl(u_int mask)
-{
-	u_int	result;
-
-	__asm("bsrl %1,%0" : "=r" (result) : "rm" (mask) : "cc");
-	return (result);
-}
-
-static __inline void
-clflush(u_long addr)
-{
-
-	__asm __volatile("clflush %0" : : "m" (*(char *)addr));
-}
-
-static __inline void
-clts(void)
-{
-
-	__asm __volatile("clts");
-}
-
-static __inline void
-disable_intr(void)
-{
-#ifdef XEN
-	xen_cli();
-#else	
-	__asm __volatile("cli" : : : "memory");
-#endif
-}
-
-static __inline void
-do_cpuid(u_int ax, u_int *p)
-{
-	__asm __volatile("cpuid"
-			 : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
-			 :  "0" (ax));
-}
-
-static __inline void
-cpuid_count(u_int ax, u_int cx, u_int *p)
-{
-	__asm __volatile("cpuid"
-			 : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
-			 :  "0" (ax), "c" (cx));
-}
-
-static __inline void
-enable_intr(void)
-{
-#ifdef XEN
-	xen_sti();
-#else
-	__asm __volatile("sti");
-#endif
-}
-
-static __inline void
-cpu_monitor(const void *addr, u_long extensions, u_int hints)
-{
-
-	__asm __volatile("monitor"
-	    : : "a" (addr), "c" (extensions), "d" (hints));
-}
-
-static __inline void
-cpu_mwait(u_long extensions, u_int hints)
-{
-
-	__asm __volatile("mwait" : : "a" (hints), "c" (extensions));
-}
-
-static __inline void
-lfence(void)
-{
-
-	__asm __volatile("lfence" : : : "memory");
-}
-
-static __inline void
-mfence(void)
-{
-
-	__asm __volatile("mfence" : : : "memory");
-}
-
-#ifdef _KERNEL
-
-#define	HAVE_INLINE_FFS
-
-static __inline int
-ffs(int mask)
-{
-	/*
-	 * Note that gcc-2's builtin ffs would be used if we didn't declare
-	 * this inline or turn off the builtin.  The builtin is faster but
-	 * broken in gcc-2.4.5 and slower but working in gcc-2.5 and later
-	 * versions.
-	 */
-	 return (mask == 0 ? mask : (int)bsfl((u_int)mask) + 1);
-}
-
-#define	HAVE_INLINE_FLS
-
-static __inline int
-fls(int mask)
-{
-	return (mask == 0 ? mask : (int)bsrl((u_int)mask) + 1);
-}
-
-#endif /* _KERNEL */
-
-static __inline void
-halt(void)
-{
-	__asm __volatile("hlt");
-}
-
-static __inline u_char
-inb(u_int port)
-{
-	u_char	data;
-
-	__asm __volatile("inb %w1, %0" : "=a" (data) : "Nd" (port));
-	return (data);
-}
-
-static __inline u_int
-inl(u_int port)
-{
-	u_int	data;
-
-	__asm __volatile("inl %w1, %0" : "=a" (data) : "Nd" (port));
-	return (data);
-}
-
-static __inline void
-insb(u_int port, void *addr, size_t count)
-{
-	__asm __volatile("cld; rep; insb"
-			 : "+D" (addr), "+c" (count)
-			 : "d" (port)
-			 : "memory");
-}
-
-static __inline void
-insw(u_int port, void *addr, size_t count)
-{
-	__asm __volatile("cld; rep; insw"
-			 : "+D" (addr), "+c" (count)
-			 : "d" (port)
-			 : "memory");
-}
-
-static __inline void
-insl(u_int port, void *addr, size_t count)
-{
-	__asm __volatile("cld; rep; insl"
-			 : "+D" (addr), "+c" (count)
-			 : "d" (port)
-			 : "memory");
-}
-
-static __inline void
-invd(void)
-{
-	__asm __volatile("invd");
-}
-
-static __inline u_short
-inw(u_int port)
-{
-	u_short	data;
-
-	__asm __volatile("inw %w1, %0" : "=a" (data) : "Nd" (port));
-	return (data);
-}
-
-static __inline void
-outb(u_int port, u_char data)
-{
-	__asm __volatile("outb %0, %w1" : : "a" (data), "Nd" (port));
-}
-
-static __inline void
-outl(u_int port, u_int data)
-{
-	__asm __volatile("outl %0, %w1" : : "a" (data), "Nd" (port));
-}
-
-static __inline void
-outsb(u_int port, const void *addr, size_t count)
-{
-	__asm __volatile("cld; rep; outsb"
-			 : "+S" (addr), "+c" (count)
-			 : "d" (port));
-}
-
-static __inline void
-outsw(u_int port, const void *addr, size_t count)
-{
-	__asm __volatile("cld; rep; outsw"
-			 : "+S" (addr), "+c" (count)
-			 : "d" (port));
-}
-
-static __inline void
-outsl(u_int port, const void *addr, size_t count)
-{
-	__asm __volatile("cld; rep; outsl"
-			 : "+S" (addr), "+c" (count)
-			 : "d" (port));
-}
-
-static __inline void
-outw(u_int port, u_short data)
-{
-	__asm __volatile("outw %0, %w1" : : "a" (data), "Nd" (port));
-}
-
-static __inline void
-ia32_pause(void)
-{
-	__asm __volatile("pause");
-}
-
-static __inline u_int
-#ifdef XEN
-_read_eflags(void)
-#else	
-read_eflags(void)
-#endif
-{
-	u_int	ef;
-
-	__asm __volatile("pushfl; popl %0" : "=r" (ef));
-	return (ef);
-}
-
-static __inline uint64_t
-rdmsr(u_int msr)
-{
-	uint64_t rv;
-
-	__asm __volatile("rdmsr" : "=A" (rv) : "c" (msr));
-	return (rv);
-}
-
-static __inline uint64_t
-rdpmc(u_int pmc)
-{
-	uint64_t rv;
-
-	__asm __volatile("rdpmc" : "=A" (rv) : "c" (pmc));
-	return (rv);
-}
-
-static __inline uint64_t
-rdtsc(void)
-{
-	uint64_t rv;
-
-	__asm __volatile("rdtsc" : "=A" (rv));
-	return (rv);
-}
-
-static __inline uint32_t
-rdtsc32(void)
-{
-	uint32_t rv;
-
-	__asm __volatile("rdtsc" : "=a" (rv) : : "edx");
-	return (rv);
-}
-
-static __inline void
-wbinvd(void)
-{
-	__asm __volatile("wbinvd");
-}
-
-static __inline void
-#ifdef XEN
-_write_eflags(u_int ef)
-#else
-write_eflags(u_int ef)
-#endif
-{
-	__asm __volatile("pushl %0; popfl" : : "r" (ef));
-}
-
-static __inline void
-wrmsr(u_int msr, uint64_t newval)
-{
-	__asm __volatile("wrmsr" : : "A" (newval), "c" (msr));
-}
-
-static __inline void
-load_cr0(u_int data)
-{
-
-	__asm __volatile("movl %0,%%cr0" : : "r" (data));
-}
-
-static __inline u_int
-rcr0(void)
-{
-	u_int	data;
-
-	__asm __volatile("movl %%cr0,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline u_int
-rcr2(void)
-{
-	u_int	data;
-
-#ifdef XEN
-	return (xen_rcr2());
-#endif
-	__asm __volatile("movl %%cr2,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_cr3(u_int data)
-{
-#ifdef XEN
-	xen_load_cr3(data);
-#else
-	__asm __volatile("movl %0,%%cr3" : : "r" (data) : "memory");
-#endif
-}
-
-static __inline u_int
-rcr3(void)
-{
-	u_int	data;
-
-	__asm __volatile("movl %%cr3,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_cr4(u_int data)
-{
-	__asm __volatile("movl %0,%%cr4" : : "r" (data));
-}
-
-static __inline u_int
-rcr4(void)
-{
-	u_int	data;
-
-	__asm __volatile("movl %%cr4,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline uint64_t
-rxcr(u_int reg)
-{
-	u_int low, high;
-
-	__asm __volatile("xgetbv" : "=a" (low), "=d" (high) : "c" (reg));
-	return (low | ((uint64_t)high << 32));
-}
-
-static __inline void
-load_xcr(u_int reg, uint64_t val)
-{
-	u_int low, high;
-
-	low = val;
-	high = val >> 32;
-	__asm __volatile("xsetbv" : : "c" (reg), "a" (low), "d" (high));
-}
-
-/*
- * Global TLB flush (except for thise for pages marked PG_G)
- */
-static __inline void
-invltlb(void)
-{
-#ifdef XEN
-	xen_tlb_flush();
-#else	
-	load_cr3(rcr3());
-#endif
-}
-
-/*
- * TLB flush for an individual page (even if it has PG_G).
- * Only works on 486+ CPUs (i386 does not have PG_G).
- */
-static __inline void
-invlpg(u_int addr)
-{
-
-#ifdef XEN
-	xen_invlpg(addr);
-#else
-	__asm __volatile("invlpg %0" : : "m" (*(char *)addr) : "memory");
-#endif
-}
-
-static __inline u_short
-rfs(void)
-{
-	u_short sel;
-	__asm __volatile("movw %%fs,%0" : "=rm" (sel));
-	return (sel);
-}
-
-static __inline uint64_t
-rgdt(void)
-{
-	uint64_t gdtr;
-	__asm __volatile("sgdt %0" : "=m" (gdtr));
-	return (gdtr);
-}
-
-static __inline u_short
-rgs(void)
-{
-	u_short sel;
-	__asm __volatile("movw %%gs,%0" : "=rm" (sel));
-	return (sel);
-}
-
-static __inline uint64_t
-ridt(void)
-{
-	uint64_t idtr;
-	__asm __volatile("sidt %0" : "=m" (idtr));
-	return (idtr);
-}
-
-static __inline u_short
-rldt(void)
-{
-	u_short ldtr;
-	__asm __volatile("sldt %0" : "=g" (ldtr));
-	return (ldtr);
-}
-
-static __inline u_short
-rss(void)
-{
-	u_short sel;
-	__asm __volatile("movw %%ss,%0" : "=rm" (sel));
-	return (sel);
-}
-
-static __inline u_short
-rtr(void)
-{
-	u_short tr;
-	__asm __volatile("str %0" : "=g" (tr));
-	return (tr);
-}
-
-static __inline void
-load_fs(u_short sel)
-{
-	__asm __volatile("movw %0,%%fs" : : "rm" (sel));
-}
-
-static __inline void
-load_gs(u_short sel)
-{
-	__asm __volatile("movw %0,%%gs" : : "rm" (sel));
-}
-
-static __inline void
-lidt(struct region_descriptor *addr)
-{
-	__asm __volatile("lidt (%0)" : : "r" (addr));
-}
-
-static __inline void
-lldt(u_short sel)
-{
-	__asm __volatile("lldt %0" : : "r" (sel));
-}
-
-static __inline void
-ltr(u_short sel)
-{
-	__asm __volatile("ltr %0" : : "r" (sel));
-}
-
-static __inline u_int
-rdr0(void)
-{
-	u_int	data;
-	__asm __volatile("movl %%dr0,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_dr0(u_int dr0)
-{
-	__asm __volatile("movl %0,%%dr0" : : "r" (dr0));
-}
-
-static __inline u_int
-rdr1(void)
-{
-	u_int	data;
-	__asm __volatile("movl %%dr1,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_dr1(u_int dr1)
-{
-	__asm __volatile("movl %0,%%dr1" : : "r" (dr1));
-}
-
-static __inline u_int
-rdr2(void)
-{
-	u_int	data;
-	__asm __volatile("movl %%dr2,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_dr2(u_int dr2)
-{
-	__asm __volatile("movl %0,%%dr2" : : "r" (dr2));
-}
-
-static __inline u_int
-rdr3(void)
-{
-	u_int	data;
-	__asm __volatile("movl %%dr3,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_dr3(u_int dr3)
-{
-	__asm __volatile("movl %0,%%dr3" : : "r" (dr3));
-}
-
-static __inline u_int
-rdr4(void)
-{
-	u_int	data;
-	__asm __volatile("movl %%dr4,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_dr4(u_int dr4)
-{
-	__asm __volatile("movl %0,%%dr4" : : "r" (dr4));
-}
-
-static __inline u_int
-rdr5(void)
-{
-	u_int	data;
-	__asm __volatile("movl %%dr5,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_dr5(u_int dr5)
-{
-	__asm __volatile("movl %0,%%dr5" : : "r" (dr5));
-}
-
-static __inline u_int
-rdr6(void)
-{
-	u_int	data;
-	__asm __volatile("movl %%dr6,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_dr6(u_int dr6)
-{
-	__asm __volatile("movl %0,%%dr6" : : "r" (dr6));
-}
-
-static __inline u_int
-rdr7(void)
-{
-	u_int	data;
-	__asm __volatile("movl %%dr7,%0" : "=r" (data));
-	return (data);
-}
-
-static __inline void
-load_dr7(u_int dr7)
-{
-	__asm __volatile("movl %0,%%dr7" : : "r" (dr7));
-}
-
-static __inline u_char
-read_cyrix_reg(u_char reg)
-{
-	outb(0x22, reg);
-	return inb(0x23);
-}
-
-static __inline void
-write_cyrix_reg(u_char reg, u_char data)
-{
-	outb(0x22, reg);
-	outb(0x23, data);
-}
-
-static __inline register_t
-intr_disable(void)
-{
-	register_t eflags;
-
-	eflags = read_eflags();
-	disable_intr();
-	return (eflags);
-}
-
-static __inline void
-intr_restore(register_t eflags)
-{
-	write_eflags(eflags);
-}
-
-#else /* !(__GNUCLIKE_ASM && __CC_SUPPORTS___INLINE) */
-
-int	breakpoint(void);
-u_int	bsfl(u_int mask);
-u_int	bsrl(u_int mask);
-void	clflush(u_long addr);
-void	clts(void);
-void	cpuid_count(u_int ax, u_int cx, u_int *p);
-void	disable_intr(void);
-void	do_cpuid(u_int ax, u_int *p);
-void	enable_intr(void);
-void	halt(void);
-void	ia32_pause(void);
-u_char	inb(u_int port);
-u_int	inl(u_int port);
-void	insb(u_int port, void *addr, size_t count);
-void	insl(u_int port, void *addr, size_t count);
-void	insw(u_int port, void *addr, size_t count);
-register_t	intr_disable(void);
-void	intr_restore(register_t ef);
-void	invd(void);
-void	invlpg(u_int addr);
-void	invltlb(void);
-u_short	inw(u_int port);
-void	lidt(struct region_descriptor *addr);
-void	lldt(u_short sel);
-void	load_cr0(u_int cr0);
-void	load_cr3(u_int cr3);
-void	load_cr4(u_int cr4);
-void	load_dr0(u_int dr0);
-void	load_dr1(u_int dr1);
-void	load_dr2(u_int dr2);
-void	load_dr3(u_int dr3);
-void	load_dr4(u_int dr4);
-void	load_dr5(u_int dr5);
-void	load_dr6(u_int dr6);
-void	load_dr7(u_int dr7);
-void	load_fs(u_short sel);
-void	load_gs(u_short sel);
-void	ltr(u_short sel);
-void	outb(u_int port, u_char data);
-void	outl(u_int port, u_int data);
-void	outsb(u_int port, const void *addr, size_t count);
-void	outsl(u_int port, const void *addr, size_t count);
-void	outsw(u_int port, const void *addr, size_t count);
-void	outw(u_int port, u_short data);
-u_int	rcr0(void);
-u_int	rcr2(void);
-u_int	rcr3(void);
-u_int	rcr4(void);
-uint64_t rdmsr(u_int msr);
-uint64_t rdpmc(u_int pmc);
-u_int	rdr0(void);
-u_int	rdr1(void);
-u_int	rdr2(void);
-u_int	rdr3(void);
-u_int	rdr4(void);
-u_int	rdr5(void);
-u_int	rdr6(void);
-u_int	rdr7(void);
-uint64_t rdtsc(void);
-u_char	read_cyrix_reg(u_char reg);
-u_int	read_eflags(void);
-u_int	rfs(void);
-uint64_t rgdt(void);
-u_int	rgs(void);
-uint64_t ridt(void);
-u_short	rldt(void);
-u_short	rtr(void);
-void	wbinvd(void);
-void	write_cyrix_reg(u_char reg, u_char data);
-void	write_eflags(u_int ef);
-void	wrmsr(u_int msr, uint64_t newval);
-
-#endif	/* __GNUCLIKE_ASM && __CC_SUPPORTS___INLINE */
-
-void    reset_dbregs(void);
-
-#ifdef _KERNEL
-int	rdmsr_safe(u_int msr, uint64_t *val);
-int	wrmsr_safe(u_int msr, uint64_t newval);
-#endif
-
-#endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/include.new/machine/cputypes.h b/include.new/machine/cputypes.h
deleted file mode 100644
index 4b75934..0000000
--- a/include.new/machine/cputypes.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1993 Christopher G. Demetriou
- * 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 ``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 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: releng/10.2/sys/i386/include/cputypes.h 185341 2008-11-26 19:25:13Z jkim $
- */
-
-#ifndef _MACHINE_CPUTYPES_H_
-#define	_MACHINE_CPUTYPES_H_
-
-/*
- * Classes of processor.
- */
-#define	CPUCLASS_286		0
-#define	CPUCLASS_386		1
-#define	CPUCLASS_486		2
-#define	CPUCLASS_586		3
-#define	CPUCLASS_686		4
-
-/*
- * Kinds of processor.
- */
-#define	CPU_286			0	/* Intel 80286 */
-#define	CPU_386SX		1	/* Intel 80386SX */
-#define	CPU_386			2	/* Intel 80386DX */
-#define	CPU_486SX		3	/* Intel 80486SX */
-#define	CPU_486			4	/* Intel 80486DX */
-#define	CPU_586			5	/* Intel Pentium */
-#define	CPU_486DLC		6	/* Cyrix 486DLC */
-#define	CPU_686			7	/* Pentium Pro */
-#define	CPU_M1SC		8	/* Cyrix M1sc (aka 5x86) */
-#define	CPU_M1			9	/* Cyrix M1 (aka 6x86) */
-#define	CPU_BLUE		10	/* IBM BlueLighting CPU */
-#define	CPU_M2			11	/* Cyrix M2 (enhanced 6x86 with MMX) */
-#define	CPU_NX586		12	/* NexGen (now AMD) 586 */
-#define	CPU_CY486DX		13	/* Cyrix 486S/DX/DX2/DX4 */
-#define	CPU_PII			14	/* Intel Pentium II */
-#define	CPU_PIII		15	/* Intel Pentium III */
-#define	CPU_P4			16	/* Intel Pentium 4 */
-#define	CPU_GEODE1100		17	/* NS Geode SC1100 */
-
-/*
- * Vendors of processor.
- */
-#define	CPU_VENDOR_NSC		0x100b		/* NSC */
-#define	CPU_VENDOR_IBM		0x1014		/* IBM */
-#define	CPU_VENDOR_AMD		0x1022		/* AMD */
-#define	CPU_VENDOR_SIS		0x1039		/* SiS */
-#define	CPU_VENDOR_UMC		0x1060		/* UMC */
-#define	CPU_VENDOR_NEXGEN	0x1074		/* Nexgen */
-#define	CPU_VENDOR_CYRIX	0x1078		/* Cyrix */
-#define	CPU_VENDOR_IDT		0x111d		/* Centaur/IDT/VIA */
-#define	CPU_VENDOR_TRANSMETA	0x1279		/* Transmeta */
-#define	CPU_VENDOR_INTEL	0x8086		/* Intel */
-#define	CPU_VENDOR_RISE		0xdead2bad	/* Rise */
-#define	CPU_VENDOR_CENTAUR	CPU_VENDOR_IDT
-
-#ifndef LOCORE
-extern int	cpu;
-extern int	cpu_class;
-#endif
-
-#endif /* !_MACHINE_CPUTYPES_H_ */
diff --git a/include.new/machine/cserial.h b/include.new/machine/cserial.h
deleted file mode 100644
index 7505402..0000000
--- a/include.new/machine/cserial.h
+++ /dev/null
@@ -1,519 +0,0 @@
-/*-
- * Ioctl interface to Cronyx serial drivers.
- *
- * Copyright (C) 1997-2002 Cronyx Engineering.
- * Author: Serge Vakulenko, <vak@cronyx.ru>
- *
- * Copyright (C) 2001-2005 Cronyx Engineering.
- * Author: Roman Kurakin, <rik@FreeBSD.org>
- *
- * Copyright (C) 2004-2005 Cronyx Engineering.
- * Author: Leo Yuriev, <ly@cronyx.ru>
- *
- * This software is distributed with NO WARRANTIES, not even the implied
- * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Authors grant any other persons or organisations permission to use
- * or modify this software as long as this message is kept with the software,
- * all derivative works or modified versions.
- *
- * Cronyx Id: cserial.h,v 1.4.2.2 2005/11/09 13:01:35 rik Exp $
- * $FreeBSD: releng/10.2/sys/i386/include/cserial.h 155049 2006-01-30 13:34:57Z rik $
- */
-
-/*
- * General channel statistics.
- */
-struct serial_statistics {
-	unsigned long rintr;		/* receive interrupts */
-	unsigned long tintr;		/* transmit interrupts */
-	unsigned long mintr;		/* modem interrupts */
-	unsigned long ibytes;		/* input bytes */
-	unsigned long ipkts;		/* input packets */
-	unsigned long ierrs;		/* input errors */
-	unsigned long obytes;		/* output bytes */
-	unsigned long opkts;		/* output packets */
-	unsigned long oerrs;		/* output errors */
-};
-
-/*
- * Statistics for E1/G703 channels.
- */
-struct e1_counters {
-	unsigned long bpv;		/* bipolar violations */
-	unsigned long fse;		/* frame sync errors */
-	unsigned long crce;		/* CRC errors */
-	unsigned long rcrce;		/* remote CRC errors (E-bit) */
-	unsigned long uas;		/* unavailable seconds */
-	unsigned long les;		/* line errored seconds */
-	unsigned long es;		/* errored seconds */
-	unsigned long bes;		/* bursty errored seconds */
-	unsigned long ses;		/* severely errored seconds */
-	unsigned long oofs;		/* out of frame seconds */
-	unsigned long css;		/* controlled slip seconds */
-	unsigned long dm;		/* degraded minutes */
-};
-
-struct e1_statistics {
-	unsigned long status;		/* line status bit mask */
-	unsigned long cursec;		/* seconds in current interval */
-	unsigned long totsec;		/* total seconds elapsed */
-	struct e1_counters currnt;	/* current 15-min interval data */
-	struct e1_counters total;	/* total statistics data */
-	struct e1_counters interval [48]; /* 12 hour period data */
-};
-
-struct e3_statistics {
-	unsigned long status;
-	unsigned long cursec;
-	unsigned long totsec;
-	unsigned long ccv;
-	unsigned long tcv;
-	unsigned long icv[48];
-};
-
-#define M_ASYNC         0		/* asynchronous mode */
-#define M_HDLC          1		/* bit-sync mode (HDLC) */
-#define M_G703          2
-#define M_E1            3
-
-/*
- * Receive error codes.
- */
-#define ER_FRAMING	1		/* framing error */
-#define ER_CHECKSUM	2		/* parity/CRC error */
-#define ER_BREAK	3		/* break state */
-#define ER_OVERFLOW	4		/* receive buffer overflow */
-#define ER_OVERRUN	5		/* receive fifo overrun */
-#define ER_UNDERRUN	6		/* transmit fifo underrun */
-#define ER_SCC_FRAMING	7		/* subchannel framing error */
-#define ER_SCC_OVERFLOW	8		/* subchannel receive buffer overflow */
-#define ER_SCC_OVERRUN	9		/* subchannel receiver overrun */
-#define ER_SCC_UNDERRUN	10		/* subchannel transmiter underrun */
-#define ER_BUS		11		/* system bus is too busy (e.g PCI) */
-
-/*
- * E1 channel status.
- */
-#define E1_NOALARM	0x0001          /* no alarm present */
-#define E1_FARLOF	0x0002          /* receiving far loss of framing */
-#define E1_CRC4E	0x0004		/* crc4 errors */
-#define E1_AIS		0x0008          /* receiving all ones */
-#define E1_LOF		0x0020          /* loss of framing */
-#define E1_LOS		0x0040          /* loss of signal */
-#define E1_AIS16	0x0100          /* receiving all ones in timeslot 16 */
-#define E1_FARLOMF	0x0200          /* receiving alarm in timeslot 16 */
-#define E1_LOMF		0x0400          /* loss of multiframe sync */
-#define E1_TSTREQ	0x0800          /* test code detected */
-#define E1_TSTERR	0x1000          /* test error */
-
-#define E3_LOS		0x00000002	/* Lost of synchronization */
-#define E3_TXE		0x00000004	/* Transmit error */
-
-/*
- * Query the mask of all registered channels, max 128.
- */
-#define SERIAL_GETREGISTERED	_IOR ('x', 0, char[16])
-
-/*
- * Attach/detach the protocol to the channel.
- * The protocol is given by it's name, char[8].
- * For example "async", "hdlc", "cisco", "fr", "ppp".
- */
-#define SERIAL_GETPROTO		_IOR ('x', 1, char [8])
-#define SERIAL_SETPROTO		_IOW ('x', 1, char [8])
-
-/*
- * Query/set the hardware mode for the channel.
- */
-#define SERIAL_GETMODE		_IOR ('x', 2, int)
-#define SERIAL_SETMODE		_IOW ('x', 2, int)
-
-#define SERIAL_ASYNC		1
-#define SERIAL_HDLC		2
-#define SERIAL_RAW		3
-
-/*
- * Get/clear the channel statistics.
- */
-#define SERIAL_GETSTAT		_IOR ('x', 3, struct serial_statistics)
-#define SERIAL_GETESTAT		_IOR ('x', 3, struct e1_statistics)
-#define SERIAL_GETE3STAT	_IOR ('x', 3, struct e3_statistics)
-#define SERIAL_CLRSTAT		_IO  ('x', 3)
-
-/*
- * Query/set the synchronization mode and baud rate.
- * If baud==0 then the external clock is used.
- */
-#define SERIAL_GETBAUD		_IOR ('x', 4, long)
-#define SERIAL_SETBAUD		_IOW ('x', 4, long)
-
-/*
- * Query/set the internal loopback mode,
- * useful for debugging purposes.
- */
-#define SERIAL_GETLOOP		_IOR ('x', 5, int)
-#define SERIAL_SETLOOP		_IOW ('x', 5, int)
-
-/*
- * Query/set the DPLL mode, commonly used with NRZI
- * for channels lacking synchro signals.
- */
-#define SERIAL_GETDPLL		_IOR ('x', 6, int)
-#define SERIAL_SETDPLL		_IOW ('x', 6, int)
-
-/*
- * Query/set the NRZI encoding (default is NRZ).
- */
-#define SERIAL_GETNRZI		_IOR ('x', 7, int)
-#define SERIAL_SETNRZI		_IOW ('x', 7, int)
-
-/*
- * Invert receive and transmit clock.
- */
-#define SERIAL_GETINVCLK	_IOR ('x', 8, int)
-#define SERIAL_SETINVCLK	_IOW ('x', 8, int)
-
-/*
- * Query/set the E1/G703 synchronization mode.
- */
-#define SERIAL_GETCLK		_IOR ('x', 9, int)
-#define SERIAL_SETCLK		_IOW ('x', 9, int)
-
-#define E1CLK_RECOVERY		-1
-#define E1CLK_INTERNAL		0
-#define E1CLK_RECEIVE		1
-#define E1CLK_RECEIVE_CHAN0	2
-#define E1CLK_RECEIVE_CHAN1	3
-#define E1CLK_RECEIVE_CHAN2	4
-#define E1CLK_RECEIVE_CHAN3	5
-
-/*
- * Query/set the E1 timeslot mask.
- */
-#define SERIAL_GETTIMESLOTS	_IOR ('x', 10, long)
-#define SERIAL_SETTIMESLOTS	_IOW ('x', 10, long)
-
-/*
- * Query/set the E1 subchannel timeslot mask.
- */
-#define SERIAL_GETSUBCHAN	_IOR ('x', 11, long)
-#define SERIAL_SETSUBCHAN	_IOW ('x', 11, long)
-
-/*
- * Query/set the high input sensitivity mode (E1).
- */
-#define SERIAL_GETHIGAIN	_IOR ('x', 12, int)
-#define SERIAL_SETHIGAIN	_IOW ('x', 12, int)
-
-/*
- * Query the input signal level in santibells.
- */
-#define SERIAL_GETLEVEL		_IOR ('x', 13, int)
-
-/*
- * Get the channel name.
- */
-#define SERIAL_GETNAME		_IOR ('x', 14, char [32])
-
-/*
- * Get version string.
- */
-#define SERIAL_GETVERSIONSTRING _IOR ('x', 15, char [256])
-
-/*
- * Query/set master channel.
- */
-#define SERIAL_GETMASTER	_IOR ('x', 16, char [16])
-#define SERIAL_SETMASTER 	_IOW ('x', 16, char [16])
-
-/*
- * Query/set keepalive.
- */
-#define SERIAL_GETKEEPALIVE 	_IOR ('x', 17, int)
-#define SERIAL_SETKEEPALIVE 	_IOW ('x', 17, int)
-
-/*
- * Query/set E1 configuration.
- */
-#define SERIAL_GETCFG		_IOR ('x', 18, char)
-#define SERIAL_SETCFG		_IOW ('x', 18, char)
-
-/*
- * Query/set debug.
- */
-#define SERIAL_GETDEBUG		_IOR ('x', 19, int)
-#define SERIAL_SETDEBUG		_IOW ('x', 19, int)
-
-/*
- * Query/set phony mode (E1).
- */
-#define SERIAL_GETPHONY		_IOR ('x', 20, int)
-#define SERIAL_SETPHONY		_IOW ('x', 20, int)
-
-/*
- * Query/set timeslot 16 usage mode (E1).
- */
-#define SERIAL_GETUSE16		_IOR ('x', 21, int)
-#define SERIAL_SETUSE16		_IOW ('x', 21, int)
-
-/*
- * Query/set crc4 mode (E1).
- */
-#define SERIAL_GETCRC4		_IOR ('x', 22, int)
-#define SERIAL_SETCRC4		_IOW ('x', 22, int)
-
-/*
- * Query/set the timeout to recover after transmit interrupt loss.
- * If timo==0 recover will be disabled.
- */
-#define SERIAL_GETTIMO		_IOR ('x', 23, long)
-#define SERIAL_SETTIMO		_IOW ('x', 23, long)
-
-/*
- * Query/set port type for old models of Sigma
- * -1 Fixed or cable select
- * 0  RS-232
- * 1  V35
- * 2  RS-449
- * 3  E1	(only for Windows 2000)
- * 4  G.703	(only for Windows 2000)
- * 5  DATA	(only for Windows 2000)
- * 6  E3	(only for Windows 2000)
- * 7  T3	(only for Windows 2000)
- * 8  STS1	(only for Windows 2000)
- */
-#define SERIAL_GETPORT		_IOR ('x', 25, int)
-#define SERIAL_SETPORT		_IOW ('x', 25, int)
-
-/*
- * Add the virtual channel DLCI (Frame Relay).
- */
-#define SERIAL_ADDDLCI		_IOW ('x', 26, int)
-
-/*
- * Invert receive clock.
- */
-#define SERIAL_GETINVRCLK	_IOR ('x', 27, int)
-#define SERIAL_SETINVRCLK	_IOW ('x', 27, int)
-
-/*
- * Invert transmit clock.
- */
-#define SERIAL_GETINVTCLK	_IOR ('x', 28, int)
-#define SERIAL_SETINVTCLK	_IOW ('x', 28, int)
-
-/*
- * Unframed E1 mode.
- */
-#define SERIAL_GETUNFRAM	_IOR ('x', 29, int)
-#define SERIAL_SETUNFRAM	_IOW ('x', 29, int)
-
-/*
- * E1 monitoring mode.
- */
-#define SERIAL_GETMONITOR	_IOR ('x', 30, int)
-#define SERIAL_SETMONITOR	_IOW ('x', 30, int)
-
-/*
- * Interrupt number.
- */
-#define SERIAL_GETIRQ		_IOR ('x', 31, int)
-
-/*
- * Reset.
- */
-#define SERIAL_RESET		_IO ('x', 32)
-
-/*
- * Hard reset.
- */
-#define SERIAL_HARDRESET	_IO ('x', 33)
-
-/*
- * Query cable type.
- */
-#define SERIAL_GETCABLE		_IOR ('x', 34, int)
-
-/*
- * Assignment of HDLC ports to E1 channels.
- */
-#define SERIAL_GETDIR		_IOR ('x', 35, int)
-#define SERIAL_SETDIR		_IOW ('x', 35, int)
-
-struct dxc_table {			/* cross-connector parameters */
-	unsigned char ts [32];		/* timeslot number */
-	unsigned char link [32];	/* E1 link number */
-};
-
-/*
- * DXC cross-connector settings for E1 channels.
- */
-#define SERIAL_GETDXC		_IOR ('x', 36, struct dxc_table)
-#define SERIAL_SETDXC		_IOW ('x', 36, struct dxc_table)
-
-/*
- * Scrambler for G.703.
- */
-#define SERIAL_GETSCRAMBLER	_IOR ('x', 37, int)
-#define SERIAL_SETSCRAMBLER	_IOW ('x', 37, int)
-
-/*
- * Length of cable for T3 and STS-1.
- */
-#define SERIAL_GETCABLEN	_IOR ('x', 38, int)
-#define SERIAL_SETCABLEN	_IOW ('x', 38, int)
-
-/*
- * Remote loopback for E3, T3 and STS-1.
- */
-#define SERIAL_GETRLOOP		_IOR ('x', 39, int)
-#define SERIAL_SETRLOOP		_IOW ('x', 39, int)
-
-/*
- * G.703 line code
- */
-#define SERIAL_GETLCODE		_IOR ('x', 40, int)
-#define SERIAL_SETLCODE		_IOW ('x', 40, int)
-
-/*
- * MTU
- */
-#define SERIAL_GETMTU		_IOR ('x', 41, int)
-#define SERIAL_SETMTU		_IOW ('x', 41, int)
-
-/*
- * Receive Queue Length
- */
-#define SERIAL_GETRQLEN		_IOR ('x', 42, int)
-#define SERIAL_SETRQLEN		_IOW ('x', 42, int)
-
-#ifdef __KERNEL__
-#ifdef CRONYX_LYSAP
-#	define LYSAP_PEER_ADD		_IOWR('x', 101, lysap_peer_config_t)
-#	define LYSAP_PEER_REMOVE	_IOW('x', 102, unsigned)
-#	define LYSAP_PEER_INFO		_IOWR('x', 103, lysap_peer_info_t)
-#	define LYSAP_PEER_COUNT		_IOR('x', 104, unsigned)
-#	define LYSAP_PEER_ENUM		_IOWR('x', 105, unsigned)
-#	define LYSAP_PEER_CLEAR		_IOW('x', 106, unsigned)
-
-#	define LYSAP_CHAN_ADD		_IOWR('x', 111, lysap_channel_config_t)
-#	define LYSAP_CHAN_REMOVE	_IO('x', 112)
-#	define LYSAP_CHAN_INFO		_IOR('x', 113, lysap_channel_info_t)
-#	define LYSAP_CHAN_COUNT		_IOR('x', 114, unsigned)
-#	define LYSAP_CHAN_ENUM		_IOWR('x', 115, unsigned)
-#	define LYSAP_CHAN_CLEAR		_IO('x', 116)
-#	include "lysap-linux.h"
-#else /* CRONYX_LYSAP */
-	typedef struct _lysap_channel_t lysap_channel_t;
-	typedef struct _lysap_channel_config_t lysap_channel_config_t;
-	typedef struct _LYSAP_DeviceInterfaceConfig LYSAP_DeviceInterfaceConfig;
-	typedef struct _LYSAP_ChannelConfig LYSAP_ChannelConfig;
-	typedef struct _lysap_buf_t lysap_buf_t;
-#endif /* !CRONYX_LYSAP */
-
-/*
- * Dynamic binder interface.
- */
-typedef struct _chan_t chan_t;
-typedef struct _proto_t proto_t;
-
-void binder_register_protocol (proto_t *p);
-void binder_unregister_protocol (proto_t *p);
-
-int binder_register_channel (chan_t *h, char *prefix, int minor);
-void binder_unregister_channel (chan_t *h);
-
-/*
- * Hardware channel driver structure.
- */
-struct sk_buff;
-
-struct _chan_t {
-	char name [16];
-	int mtu;			/* max packet size */
-	int fifosz;			/* total hardware i/o buffer size */
-	int port;			/* hardware base i/o port */
-	int irq;			/* hardware interrupt line */
-	int minor;			/* minor number 0..127, assigned by binder */
-	int debug;			/* debug level, 0..2 */
-	int running;			/* running, 0..1 */
-	struct _proto_t *proto;		/* protocol interface data */
-	void *sw;			/* protocol private data */
-	void *hw;			/* hardware layer private data */
-
-	/* Interface to protocol */
-	int (*up) (chan_t *h);
-	void (*down) (chan_t *h);
-	int (*transmit) (chan_t *h, struct sk_buff *skb);
-	void (*set_dtr) (chan_t *h, int val);
-	void (*set_rts) (chan_t *h, int val);
-	int (*query_dtr) (chan_t *h);
-	int (*query_rts) (chan_t *h);
-	int (*query_dsr) (chan_t *h);
-	int (*query_cts) (chan_t *h);
-	int (*query_dcd) (chan_t *h);
-
-	/* Interface to async protocol */
-	void (*set_async_param) (chan_t *h, int baud, int bits, int parity,
-		int stop2, int ignpar, int rtscts,
-		int ixon, int ixany, int symstart, int symstop);
-	void (*send_break) (chan_t *h, int msec);
-	void (*send_xon) (chan_t *h);
-	void (*send_xoff) (chan_t *h);
-	void (*start_transmitter) (chan_t *h);
-	void (*stop_transmitter) (chan_t *h);
-	void (*flush_transmit_buffer) (chan_t *h);
-
-	/* Control interface */
-	int (*control) (chan_t *h, unsigned int cmd, unsigned long arg);
-
-	/* LYSAP interface */
-	struct lysap_t
-	{
-		lysap_channel_t *link;
-		int (*inspect_config)(chan_t *h, lysap_channel_config_t *,
-			LYSAP_DeviceInterfaceConfig *, LYSAP_ChannelConfig *);
-		unsigned long (*probe_freq)(chan_t *h, unsigned long freq);
-		unsigned long (*set_freq)(chan_t *h, unsigned long freq);
-		unsigned (*get_status)(chan_t *h);
-		int (*transmit) (chan_t *h, lysap_buf_t *b);
-		lysap_buf_t* (*alloc_buf) (chan_t *h, unsigned len);
-		int (*set_clock_master)(chan_t *h, int enable);
-		unsigned long (*get_master_freq)(chan_t *h);
-	} lysap;
-};
-
-/*
- * Protocol driver structure.
- */
-struct _proto_t {
-	char *name;
-	struct _proto_t *next;
-
-	/* Interface to channel */
-	void (*receive) (chan_t *h, struct sk_buff *skb);
-	void (*receive_error) (chan_t *h, int errcode);
-	void (*transmit) (chan_t *h);
-	void (*modem_event) (chan_t *h);
-
-	/* Interface to binder */
-	int (*open) (chan_t *h);
-	void (*close) (chan_t *h);
-	int (*read) (chan_t *h, unsigned short flg, char *buf, int len);
-	int (*write) (chan_t *h, unsigned short flg, const char *buf, int len);
-	int (*select) (chan_t *h, int type, void *st, struct file *filp);
-	struct fasync_struct *fasync;
-
-	/* Control interface */
-	int (*attach) (chan_t *h);
-	int (*detach) (chan_t *h);
-	int (*control) (chan_t *h, unsigned int cmd, unsigned long arg);
-
-	/* LYSAP interface */
-	void (*transmit_error) (chan_t *h, int errcode);
-	void (*lysap_notify_receive) (chan_t *h, lysap_buf_t *b);
-	void (*lysap_notify_transmit) (chan_t *h);
-	lysap_buf_t* (*lysap_get_data)(chan_t *h);
-};
-#endif /* KERNEL */
diff --git a/include.new/machine/db_machdep.h b/include.new/machine/db_machdep.h
deleted file mode 100644
index f169faf..0000000
--- a/include.new/machine/db_machdep.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Mach Operating System
- * Copyright (c) 1991,1990 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/i386/include/db_machdep.h 139790 2005-01-06 22:18:23Z imp $
- */
-
-#ifndef _MACHINE_DB_MACHDEP_H_
-#define	_MACHINE_DB_MACHDEP_H_
-
-#include <machine/frame.h>
-#include <machine/trap.h>
-
-typedef	vm_offset_t	db_addr_t;	/* address - unsigned */
-typedef	int		db_expr_t;	/* expression - signed */
-
-#define	PC_REGS()	((db_addr_t)kdb_thrctx->pcb_eip)
-
-#define	BKPT_INST	0xcc		/* breakpoint instruction */
-#define	BKPT_SIZE	(1)		/* size of breakpoint inst */
-#define	BKPT_SET(inst)	(BKPT_INST)
-
-#define BKPT_SKIP				\
-do {						\
-	kdb_frame->tf_eip += 1;			\
-	kdb_thrctx->pcb_eip += 1;		\
-} while(0)
-
-#define	FIXUP_PC_AFTER_BREAK			\
-do {						\
-	kdb_frame->tf_eip -= 1;			\
-	kdb_thrctx->pcb_eip -= 1;		\
-} while(0);
-
-#define	db_clear_single_step	kdb_cpu_clear_singlestep
-#define	db_set_single_step	kdb_cpu_set_singlestep
-
-#define	IS_BREAKPOINT_TRAP(type, code)	((type) == T_BPTFLT)
-/*
- * Watchpoints are not supported.  The debug exception type is in %dr6
- * and not yet in the args to this macro.
- */
-#define IS_WATCHPOINT_TRAP(type, code)	0
-
-#define	I_CALL		0xe8
-#define	I_CALLI		0xff
-#define	I_RET		0xc3
-#define	I_IRET		0xcf
-
-#define	inst_trap_return(ins)	(((ins)&0xff) == I_IRET)
-#define	inst_return(ins)	(((ins)&0xff) == I_RET)
-#define	inst_call(ins)		(((ins)&0xff) == I_CALL || \
-				 (((ins)&0xff) == I_CALLI && \
-				  ((ins)&0x3800) == 0x1000))
-#define inst_load(ins)		0
-#define inst_store(ins)		0
-
-/*
- * There no interesting addresses below _kstack = 0xefbfe000.  There
- * are small absolute values for GUPROF, but we don't want to see them.
- * Treat "negative" addresses below _kstack as non-small to allow for
- * future reductions of _kstack and to avoid sign extension problems.
- *
- * There is one interesting symbol above -db_maxoff = 0xffff0000,
- * namely _APTD = 0xfffff000.  Accepting this would mess up the
- * printing of small negative offsets.  The next largest symbol is
- * _APTmap = 0xffc00000.  Accepting this is OK (unless db_maxoff is
- * set to >= 0x400000 - (max stack offset)).
- */
-#define	DB_SMALL_VALUE_MAX	0x7fffffff
-#define	DB_SMALL_VALUE_MIN	(-0x400001)
-
-#endif /* !_MACHINE_DB_MACHDEP_H_ */
diff --git a/include.new/machine/elan_mmcr.h b/include.new/machine/elan_mmcr.h
deleted file mode 100644
index 10cdb9a..0000000
--- a/include.new/machine/elan_mmcr.h
+++ /dev/null
@@ -1,300 +0,0 @@
-/*-
- * Copyright (c) 2004 John Birrell
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- */
-
-/* AMD Elan SC520 Memory Mapped Configuration Region (MMCR).
- *
- * The layout of this structure is documented by AMD in the Elan SC520
- * Microcontroller Register Set Manual. The field names match those
- * described in that document. The overall structure size must be 4096
- * bytes. Ignore fields with the 'pad' prefix - they are only present for
- * alignment purposes.
- *
- * $FreeBSD: releng/10.2/sys/i386/include/elan_mmcr.h 139788 2005-01-06 22:05:28Z imp $
- */
-
-#ifndef _MACHINE_ELAN_MMCR_H_
-#define	_MACHINE_ELAN_MMCR_H_ 1
-
-struct elan_mmcr {
-	/* CPU */
-	u_int16_t	REVID;
-	u_int8_t	CPUCTL;
-	u_int8_t	pad_0x003[0xd];
-
-	/* SDRAM Controller */
-	u_int16_t	DRCCTL;
-	u_int16_t	DRCTMCTL;
-	u_int16_t	DRCCFG;
-	u_int16_t	DRCBENDADR;
-	u_int8_t	pad_0x01a[0x6];
-	u_int8_t	ECCCTL;
-	u_int8_t	ECCSTA;
-	u_int8_t	ECCCKBPOS;
-	u_int8_t	ECCCKTEST;
-	uint32_t	ECCSBADD;
-	uint32_t	ECCMBADD;
-	u_int8_t	pad_0x02c[0x14];
-
-	/* SDRAM Buffer */
-	u_int8_t	DBCTL;
-	u_int8_t	pad_0x041[0xf];
-
-	/* ROM/Flash Controller */
-	u_int16_t	BOOTCSCTL;
-	u_int8_t	pad_0x052[0x2];
-	u_int16_t	ROMCS1CTL;
-	u_int16_t	ROMCS2CTL;
-	u_int8_t	pad_0x058[0x8];
-
-	/* PCI Bus Host Bridge */
-	u_int16_t	HBCTL;
-	u_int16_t	HBTGTIRQCTL;
-	u_int16_t	HBTGTIRQSTA;
-	u_int16_t	HBMSTIRQCTL;
-	u_int16_t	HBMSTIRQSTA;
-	u_int8_t	pad_0x06a[0x2];
-	uint32_t	MSTINTADD;
-
-	/* System Arbitration */
-	u_int8_t	SYSARBCTL;
-	u_int8_t	PCIARBSTA;
-	u_int16_t	SYSARBMENB;
-	uint32_t	ARBPRICTL;
-	u_int8_t	pad_0x078[0x8];
-
-	/* System Address Mapping */
-	uint32_t	ADDDECCTL;
-	uint32_t	WPVSTA;
-	uint32_t	PAR0;
-	uint32_t	PAR1;
-	uint32_t	PAR2;
-	uint32_t	PAR3;
-	uint32_t	PAR4;
-	uint32_t	PAR5;
-	uint32_t	PAR6;
-	uint32_t	PAR7;
-	uint32_t	PAR8;
-	uint32_t	PAR9;
-	uint32_t	PAR10;
-	uint32_t	PAR11;
-	uint32_t	PAR12;
-	uint32_t	PAR13;
-	uint32_t	PAR14;
-	uint32_t	PAR15;
-	u_int8_t	pad_0x0c8[0xb38];
-
-	/* GP Bus Controller */
-	u_int8_t	GPECHO;
-	u_int8_t	GPCSDW;
-	u_int16_t	GPCSQUAL;
-	u_int8_t	pad_0xc04[0x4];
-	u_int8_t	GPCSRT;
-	u_int8_t	GPCSPW;
-	u_int8_t	GPCSOFF;
-	u_int8_t	GPRDW;
-	u_int8_t	GPRDOFF;
-	u_int8_t	GPWRW;
-	u_int8_t	GPWROFF;
-	u_int8_t	GPALEW;
-	u_int8_t	GPALEOFF;
-	u_int8_t	pad_0xc11[0xf];
-
-	/* Programmable Input/Output */
-	u_int16_t	PIOPFS15_0;
-	u_int16_t	PIOPFS31_16;
-	u_int8_t	CSPFS;
-	u_int8_t	pad_0xc25;
-	u_int8_t	CLKSEL;
-	u_int8_t	pad_0xc27;
-	u_int16_t	DSCTL;
-	u_int16_t	PIODIR15_0;
-	u_int16_t	PIODIR31_16;
-	u_int8_t	 pad_0xc2e[0x2];
-	u_int16_t	PIODATA15_0;
-	u_int16_t	PIODATA31_16;
-	u_int16_t	PIOSET15_0;
-	u_int16_t	PIOSET31_16;
-	u_int16_t	PIOCLR15_0;
-	u_int16_t	PIOCLR31_16;
-	u_int8_t	pad_0xc3c[0x24];
-
-	/* Software Timer */
-	u_int16_t	SWTMRMILLI;
-	u_int16_t	SWTMRMICRO;
-	u_int8_t	SWTMRCFG;
-	u_int8_t	pad_0xc65[0xb];
-
-	/* General-Purpose Timers */
-	u_int8_t	GPTMRSTA;
-	u_int8_t	pad_0xc71;
-	u_int16_t	GPTMR0CTL;
-	u_int16_t	GPTMR0CNT;
-	u_int16_t	GPTMR0MAXCMPA;
-	u_int16_t	GPTMR0MAXCMPB;
-	u_int16_t	GPTMR1CTL;
-	u_int16_t	GPTMR1CNT;
-	u_int16_t	GPTMR1MAXCMPA;
-	u_int16_t	GPTMR1MAXCMPB;
-	u_int16_t	GPTMR2CTL;
-	u_int16_t	GPTMR2CNT;
-	u_int8_t	pad_0xc86[0x8];
-	u_int16_t	GPTMR2MAXCMPA;
-	u_int8_t	pad_0xc90[0x20];
-
-	/* Watchdog Timer */
-	u_int16_t	WDTMRCTL;
-	u_int16_t	WDTMRCNTL;
-	u_int16_t	WDTMRCNTH;
-	u_int8_t	pad_0xcb6[0xa];
-
-	/* UART Serial Ports */
-	u_int8_t	UART1CTL;
-	u_int8_t	UART1STA;
-	u_int8_t	UART1FCRSHAD;
-	u_int8_t	pad_0xcc3;
-	u_int8_t	UART2CTL;
-	u_int8_t	UART2STA;
-	u_int8_t	UART2FCRSHAD;
-	u_int8_t	pad_0xcc7[0x9];
-
-	/* Synchronous Serial Interface */
-	u_int8_t	SSICTL;
-	u_int8_t	SSIXMIT;
-	u_int8_t	SSICMD;
-	u_int8_t	SSISTA;
-	u_int8_t	SSIRCV;
-	u_int8_t	pad_0xcd5[0x2b];
-
-	/* Programmable Interrupt Controller */
-	u_int8_t	PICICR;
-	u_int8_t	pad_0xd01;
-	u_int8_t	MPICMODE;
-	u_int8_t	SL1PICMODE;
-	u_int8_t	SL2PICMODE;
-	u_int8_t	pad_0xd05[0x3];
-	u_int16_t	SWINT16_1;
-	u_int8_t	SWINT22_17;
-	u_int8_t	pad_0xd0b[0x5];
-	u_int16_t	INTPINPOL;
-	u_int8_t	pad_0xd12[0x2];
-	u_int16_t	PCIHOSTMAP;
-	u_int8_t	pad_0xd16[0x2];
-	u_int16_t	ECCMAP;
-	u_int8_t	GPTMR0MAP;
-	u_int8_t	GPTMR1MAP;
-	u_int8_t	GPTMR2MAP;
-	u_int8_t	pad_0xd1d[0x3];
-	u_int8_t	PIT0MAP;
-	u_int8_t	PIT1MAP;
-	u_int8_t	PIT2MAP;
-	u_int8_t	pad_0xd23[0x5];
-	u_int8_t	UART1MAP;
-	u_int8_t	UART2MAP;
-	u_int8_t	pad_0xd2a[0x6];
-	u_int8_t	PCIINTAMAP;
-	u_int8_t	PCIINTBMAP;
-	u_int8_t	PCIINTCMAP;
-	u_int8_t	PCIINTDMAP;
-	u_int8_t	pad_0xd34[0xc];
-	u_int8_t	DMABCINTMAP;
-	u_int8_t	SSIMAP;
-	u_int8_t	WDTMAP;
-	u_int8_t	RTCMAP;
-	u_int8_t	WPVMAP;
-	u_int8_t	ICEMAP;
-	u_int8_t	FERRMAP;
-	u_int8_t	pad_0xd47[0x9];
-	u_int8_t	GP0IMAP;
-	u_int8_t	GP1IMAP;
-	u_int8_t	GP2IMAP;
-	u_int8_t	GP3IMAP;
-	u_int8_t	GP4IMAP;
-	u_int8_t	GP5IMAP;
-	u_int8_t	GP6IMAP;
-	u_int8_t	GP7IMAP;
-	u_int8_t	GP8IMAP;
-	u_int8_t	GP9IMAP;
-	u_int8_t	GP10IMAP;
-	u_int8_t	pad_0xd5b[0x15];
-
-	/* Reset Generation */
-	u_int8_t	SYSINFO;
-	u_int8_t	pad_0xd71;
-	u_int8_t	RESCFG;
-	u_int8_t	pad_0xd73;
-	u_int8_t	RESSTA;
-	u_int8_t	pad_0xd75[0xb];
-
-	/* GP DMA Controller */
-	u_int8_t	GPDMACTL;
-	u_int8_t	GPDMAMMIO;
-	u_int16_t	GPDMAEXTCHMAPA;
-	u_int16_t	GPDMAEXTCHMAPB;
-	u_int8_t	GPDMAEXTPG0;
-	u_int8_t	GPDMAEXTPG1;
-	u_int8_t	GPDMAEXTPG2;
-	u_int8_t	GPDMAEXTPG3;
-	u_int8_t	GPDMAEXTPG5;
-	u_int8_t	GPDMAEXTPG6;
-	u_int8_t	GPDMAEXTPG7;
-	u_int8_t	pad_0xd8d[0x3];
-	u_int8_t	GPDMAEXTTC3;
-	u_int8_t	GPDMAEXTTC5;
-	u_int8_t	GPDMAEXTTC6;
-	u_int8_t	GPDMAEXTTC7;
-	u_int8_t	pad_0xd94[0x4];
-	u_int8_t	GPDMABCCTL;
-	u_int8_t	GPDMABCSTA;
-	u_int8_t	GPDMABSINTENB;
-	u_int8_t	GPDMABCVAL;
-	u_int8_t	pad_0xd9c[0x4];
-	u_int16_t	GPDMANXTADDL3;
-	u_int16_t	GPDMANXTADDH3;
-	u_int16_t	GPDMANXTADDL5;
-	u_int16_t	GPDMANXTADDH5;
-	u_int16_t	GPDMANXTADDL6;
-	u_int16_t	GPDMANXTADDH6;
-	u_int16_t	GPDMANXTADDL7;
-	u_int16_t	GPDMANXTADDH7;
-	u_int16_t	GPDMANXTTCL3;
-	u_int8_t	GPDMANXTTCH3;
-	u_int8_t	pad_0xdb3;
-	u_int16_t	GPDMANXTTCL5;
-	u_int8_t	GPDMANXTTCH5;
-	u_int8_t	pad_0xdb7;
-	u_int16_t	GPDMANXTTCL6;
-	u_int8_t	GPDMANXTTCH6;
-	u_int8_t	pad_0xdbb;
-	u_int16_t	GPDMANXTTCL7;
-	u_int8_t	GPDMANXTTCH7;
-	u_int8_t	pad_0xdc0[0x240];
-	};
-
-CTASSERT(sizeof(struct elan_mmcr) == 4096);
-
-extern volatile struct elan_mmcr * elan_mmcr;
-
-#endif /* _MACHINE_ELAN_MMCR_H_ */
diff --git a/include.new/machine/elf.h b/include.new/machine/elf.h
deleted file mode 100644
index b37cda3..0000000
--- a/include.new/machine/elf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/elf.h 247047 2013-02-20 17:39:52Z kib $ */
-
-#include <x86/elf.h>
diff --git a/include.new/machine/endian.h b/include.new/machine/endian.h
deleted file mode 100644
index f13aa71..0000000
--- a/include.new/machine/endian.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/endian.h 232266 2012-02-28 19:39:54Z tijl $ */
-
-#include <x86/endian.h>
diff --git a/include.new/machine/exec.h b/include.new/machine/exec.h
deleted file mode 100644
index 925f665..0000000
--- a/include.new/machine/exec.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- *	@(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: releng/10.2/sys/i386/include/exec.h 142107 2005-02-19 21:16:48Z ru $
- */
-
-#ifndef	_MACHINE_EXEC_H_
-#define	_MACHINE_EXEC_H_
-
-#define	__LDPGSZ	4096
-
-#endif /* !_MACHINE_EXEC_H_ */
diff --git a/include.new/machine/fdt.h b/include.new/machine/fdt.h
deleted file mode 100644
index 44db7f8..0000000
--- a/include.new/machine/fdt.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/fdt.h 250840 2013-05-21 03:05:49Z marcel $ */
-
-#include <x86/fdt.h>
diff --git a/include.new/machine/float.h b/include.new/machine/float.h
deleted file mode 100644
index ceda02b..0000000
--- a/include.new/machine/float.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/float.h 232491 2012-03-04 14:00:32Z tijl $ */
-
-#include <x86/float.h>
diff --git a/include.new/machine/floatingpoint.h b/include.new/machine/floatingpoint.h
deleted file mode 100644
index 990963d..0000000
--- a/include.new/machine/floatingpoint.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 1993 Andrew Moore, Talke Studio
- * 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.
- *
- *	from: @(#) floatingpoint.h	1.0 (Berkeley) 9/23/93
- * $FreeBSD: releng/10.2/sys/i386/include/floatingpoint.h 144544 2005-04-02 17:31:42Z netchild $
- */
-
-#ifndef _FLOATINGPOINT_H_
-#define _FLOATINGPOINT_H_
-
-#include <sys/cdefs.h>
-#include <machine/ieeefp.h>
-
-#endif /* !_FLOATINGPOINT_H_ */
diff --git a/include.new/machine/frame.h b/include.new/machine/frame.h
deleted file mode 100644
index 9b3fe9b..0000000
--- a/include.new/machine/frame.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/frame.h 247047 2013-02-20 17:39:52Z kib $ */
-
-#include <x86/frame.h>
diff --git a/include.new/machine/gdb_machdep.h b/include.new/machine/gdb_machdep.h
deleted file mode 100644
index 3204405..0000000
--- a/include.new/machine/gdb_machdep.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2004 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/i386/include/gdb_machdep.h 139790 2005-01-06 22:18:23Z imp $
- */
-
-#ifndef _MACHINE_GDB_MACHDEP_H_
-#define	_MACHINE_GDB_MACHDEP_H_
-
-#define	GDB_BUFSZ	400
-#define	GDB_NREGS	14
-#define	GDB_REG_PC	8
-
-static __inline size_t
-gdb_cpu_regsz(int regnum __unused)
-{
-	return (sizeof(int));
-}
-
-static __inline int
-gdb_cpu_query(void)
-{
-	return (0);
-}
-
-void *gdb_cpu_getreg(int, size_t *);
-void gdb_cpu_setreg(int, void *);
-int gdb_cpu_signal(int, int);
-
-#endif /* !_MACHINE_GDB_MACHDEP_H_ */
diff --git a/include.new/machine/i4b_cause.h b/include.new/machine/i4b_cause.h
deleted file mode 100644
index 582e562..0000000
--- a/include.new/machine/i4b_cause.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 1997, 2002 Hellmuth Michaelis. 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.
- *
- * 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.
- */
-
-/*---------------------------------------------------------------------------
- *
- *	i4b_cause.h - causes and cause handling for i4b
- *	-----------------------------------------------
- *
- * $FreeBSD: src/sys/i386/include/i4b_cause.h,v 1.9 2005/01/06 22:18:15 imp Exp $
- *
- *      last edit-date: [Sun Mar 17 10:08:21 2002]
- *
- *---------------------------------------------------------------------------*/
-
-#ifndef _I4B_CAUSE_H_
-#define _I4B_CAUSE_H_
-
-/*---------------------------------------------------------------------------*
- *	ISDN4BSD internal causes specification
- *---------------------------------------------------------------------------*/
-
-#define CAUSE_VAL	0x000000ff	/* cause value			*/
-#define CAUSE_TYPE	0x0000ff00	/* cause type			*/
-#define  CAUSET_Q850	0		/* value coded according to Q.850 */
-#define  CAUSET_I4B	1		/* i4b protocol independent causes*/
-
-#define GET_CAUSE_VAL(cause)	  ((cause) & 0xff)
-#define SET_CAUSE_VAL(dest, val)  ((dest) = ((dest & 0xffffff00) | \
-						(val & 0x000000ff)))
-
-#define GET_CAUSE_TYPE(cause)	   (((cause) >> 8) & 0xff)
-#define SET_CAUSE_TYPE(dest, type) ((dest) = ((dest & 0xffff00ff) | \
-						((type << 8) & 0x0000ff00)))
-
-#define SET_CAUSE_TV(dest, type, val) ((dest) = ((val & 0x000000ff) | \
-						 ((type << 8) & 0x0000ff00)))
-
-/* CAUSET_I4B - protocol independent cause values */
-
-#define	CAUSE_I4B_NORMAL	0	/* normal call clearing 	*/
-#define CAUSE_I4B_BUSY		1	/* user busy			*/
-#define CAUSE_I4B_NOCHAN	2	/* circuit/channel not available*/
-#define	CAUSE_I4B_INCOMP	3	/* incompatible source/dest	*/
-#define CAUSE_I4B_REJECT	4	/* call rejected		*/
-#define CAUSE_I4B_OOO		5	/* destination out of order	*/
-#define CAUSE_I4B_TMPFAIL	6	/* temporary failure		*/
-#define CAUSE_I4B_L1ERROR	7	/* L1 error / persistent deact	*/
-#define CAUSE_I4B_LLDIAL	8	/* no dialout on leased line	*/
-#define CAUSE_I4B_MAX		9
-	/* NOTE: update isdnd/pcause.c when adding causes !!!!!		*/
-	/* NOTE: update layer3/i4b_q931.c when adding causes !!!!!	*/
-	
-/* CAUSET_Q850 - causes defined in Q.850 */
-
-#define	CAUSE_Q850_SHUTDN	0x00	/* normal D-channel shutdown */
-#define CAUSE_Q850_NUNALLC	0x01	/* Unallocated (unassigned) number */
-#define CAUSE_Q850_NRTTN	0x02	/* No route to specified transit network */
-#define CAUSE_Q850_NRTDST	0x03	/* No route to destination */
-#define CAUSE_Q850_SSINFTN	0x04	/* Send special information tone */
-#define CAUSE_Q850_MDIALTP	0x05	/* Misdialled trunk prefix */
-#define CAUSE_Q850_CHUNACC	0x06	/* Channel unacceptable */
-#define CAUSE_Q850_CALLAWD	0x07	/* Call awarded and being delivered in an established channel */
-#define CAUSE_Q850_PREEMPT	0x08	/* Preemption */
-#define CAUSE_Q850_PREECRR	0x09	/* Preemption - circuit reserved for reuse */
-#define CAUSE_Q850_NCCLR	0x10	/* Normal call clearing */
-#define CAUSE_Q850_USRBSY	0x11	/* User busy */
-#define CAUSE_Q850_NOUSRRSP	0x12	/* No user responding */
-#define CAUSE_Q850_NOANSWR	0x13	/* No answer from user (user alerted) */
-#define CAUSE_Q850_SUBSABS	0x14	/* Subscriber absent */
-#define CAUSE_Q850_CALLREJ	0x15	/* Call rejected */
-#define CAUSE_Q850_NUCHNG	0x16	/* Number changed */
-#define CAUSE_Q850_NONSELUC	0x1A	/* Non-selected user clearing */
-#define CAUSE_Q850_DSTOOORDR	0x1B	/* Destination out of order */
-#define CAUSE_Q850_INVNUFMT	0x1C	/* Invalid number format */
-#define CAUSE_Q850_FACREJ	0x1D	/* Facility rejected */
-#define CAUSE_Q850_STENQRSP	0x1E	/* Response to STATUS ENQUIRY */
-#define CAUSE_Q850_NORMUNSP	0x1F	/* Normal, unspecified */
-#define CAUSE_Q850_NOCAVAIL	0x22	/* No circuit / channel available */
-#define CAUSE_Q850_NETOOORDR	0x26	/* Network out of order */
-#define CAUSE_Q850_PFMCDOOSERV	0x27	/* Permanent frame mode connection out of service */
-#define CAUSE_Q850_PFMCOPER	0x28	/* Permanent frame mode connection operational */
-#define CAUSE_Q850_TMPFAIL	0x29	/* Temporary failure */
-#define CAUSE_Q850_SWEQCONG	0x2A	/* Switching equipment congestion */
-#define CAUSE_Q850_ACCINFDIS	0x2B	/* Access information discarded */
-#define CAUSE_Q850_REQCNOTAV	0x2C	/* Requested circuit/channel not available */
-#define CAUSE_Q850_PRECALBLK	0x2E	/* Precedence call blocked */
-#define CAUSE_Q850_RESUNAVAIL	0x2F	/* Resources unavailable, unspecified */
-#define CAUSE_Q850_QOSUNAVAIL	0x31	/* Quality of service unavailable */
-#define CAUSE_Q850_REQSERVNS	0x32	/* Requested facility not subscribed */
-#define CAUSE_Q850_OCBARRCUG	0x35	/* Outgoing calls barred within CUG */
-#define CAUSE_Q850_ICBARRCUG	0x36	/* Incoming calls barred within CUG */
-#define CAUSE_Q850_BCAPNAUTH	0x39	/* Bearer capability not authorized */
-#define CAUSE_Q850_BCAPNAVAIL	0x3A	/* Bearer capability not presently available */
-#define CAUSE_Q850_INCSTOACISC	0x3E	/* Inconsistenciy in designated outgoing access information and subscriber class */
-#define CAUSE_Q850_SOONOTAVAIL	0x3F	/* Service or option not available, unspecified */
-#define CAUSE_Q850_BCAPNOTIMPL	0x41	/* Bearer capability not implemented */
-#define CAUSE_Q850_CHTYPNIMPL	0x42	/* Channel type not implemented */
-#define CAUSE_Q850_REQFACNIMPL	0x45	/* Requested facility not implemented */
-#define CAUSE_Q850_ORDINBCAVL	0x46	/* Only restricted digital information bearer capability is available */
-#define CAUSE_Q850_SOONOTIMPL	0x4F	/* Service or option not implemented, unspecified */
-#define CAUSE_Q850_INVCLRFVAL	0x51	/* Invalid call reference value */
-#define CAUSE_Q850_IDCHDNOEX	0x52	/* Identified channel does not exist */
-#define CAUSE_Q850_SUSCAEXIN	0x53	/* A suspended call exists, but this call identity does not */
-#define CAUSE_Q850_CLIDINUSE	0x54	/* Call identity in use */
-#define CAUSE_Q850_NOCLSUSP	0x55	/* No call suspended */
-#define CAUSE_Q850_CLIDCLRD	0x56	/* Call having the requested call identity has been cleared */
-#define CAUSE_Q850_UNOTMEMCUG	0x57	/* User not member of CUG */
-#define CAUSE_Q850_INCDEST	0x58	/* Incompatible destination */
-#define CAUSE_Q850_NONEXCUG	0x5A	/* Non-existent CUG */
-#define CAUSE_Q850_INVNTWSEL	0x5B	/* Invalid transit network selection */
-#define CAUSE_Q850_INVMSG	0x5F	/* Invalid message, unspecified */
-#define CAUSE_Q850_MIEMISS	0x60	/* Mandatory information element is missing */
-#define CAUSE_Q850_MSGTNI	0x61	/* Message type non-existent or not implemented */
-#define CAUSE_Q850_MSGNCMPT	0x62	/* Message not compatible with call state or message type non-existent or not implemented */
-#define CAUSE_Q850_IENENI	0x63	/* Information element/parameter non-existent or not implemented */
-#define CAUSE_Q850_INVIEC	0x64	/* Invalid information element contents */
-#define CAUSE_Q850_MSGNCWCS	0x65	/* Message not compatible with call state */
-#define CAUSE_Q850_RECOTIMEXP	0x66	/* Recovery on timer expiry */
-#define CAUSE_Q850_PARMNENIPO	0x67	/* Parameter non-existent or not implemented, passed on */
-#define CAUSE_Q850_MSGUNRDPRM	0x6E	/* Message with unrecognized parameter, discarded */
-#define CAUSE_Q850_PROTERR	0x6F	/* Protocol error, unspecified */
-#define CAUSE_Q850_INTWRKU	0x7F	/* Interworking, unspecified */
-
-#define CAUSE_Q850_MAX		128
-
-#endif /* _I4B_CAUSE_H_ */
diff --git a/include.new/machine/i4b_debug.h b/include.new/machine/i4b_debug.h
deleted file mode 100644
index a90cdf1..0000000
--- a/include.new/machine/i4b_debug.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*-
- * Copyright (c) 1997, 2002 Hellmuth Michaelis. 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.
- *
- * 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.
- */
-
-/*---------------------------------------------------------------------------
- *
- *	i4b_debug.h - i4b debug header file
- *	-----------------------------------
- *
- * $FreeBSD: src/sys/i386/include/i4b_debug.h,v 1.12 2005/01/06 22:18:15 imp Exp $
- *
- *      last edit-date: [Sun Mar 17 10:08:41 2002]
- *
- *---------------------------------------------------------------------------*/
-
-#if !defined DO_I4B_DEBUG
-# define DO_I4B_DEBUG 1		/* default = include debugging code */
-#elif DO_I4B_DEBUG != 0
-# undef DO_I4B_DEBUG
-# define DO_I4B_DEBUG 1
-#endif
-
-#undef DO_I4B_MAXDEBUG		/* default = disable ALL debug messages */
-
-#if DO_I4B_DEBUG
-
-extern unsigned int i4b_l1_debug;
-extern unsigned int i4b_l2_debug;
-extern unsigned int i4b_l3_debug;
-extern unsigned int i4b_l4_debug;
-
-#define NDBGL1(bits, fmt, args...)				 	\
-	if(bits & i4b_l1_debug)						\
-	{ printf("i4b-L1 %s: " fmt "\n", __func__ , ##args ); }
-
-#define NDBGL2(bits, fmt, args...)				 	\
-	if(bits & i4b_l2_debug)						\
-	{ printf("i4b-L2 %s: " fmt "\n", __func__ , ##args ); }
-	
-#define NDBGL3(bits, fmt, args...)				 	\
-	if(bits & i4b_l3_debug)						\
-	{ printf("i4b-L3 %s: " fmt "\n", __func__ , ##args ); }
-	
-#define NDBGL4(bits, fmt, args...)				 	\
-	if(bits & i4b_l4_debug)						\
-	{ printf("i4b-L4 %s: " fmt "\n", __func__ , ##args ); }
-	
-#else /* !DO_I4B_DEBUG */
-
-#define NDBGL1(bits, fmt, args...);
-#define NDBGL2(bits, fmt, args...);
-#define NDBGL3(bits, fmt, args...);
-#define NDBGL4(bits, fmt, args...);
-
-#endif /* DO_I4B_DEBUG */
-
-/* Layer 1 */
-
-#define L1_ERROR	0x000001	/* general error message*/
-#define L1_PRIM		0x000002	/* interlayer primitives*/
-#define L1_BCHAN	0x000004	/* B channel action	*/
-#define L1_H_ERR	0x000008	/* HSCX errors		*/
-#define L1_H_IRQ	0x000010	/* HSCX IRQ messages	*/
-#define L1_I_ERR	0x000020	/* ISAC errors		*/
-#define L1_I_MSG	0x000040	/* ISAC messages	*/
-#define L1_I_SETUP	0x000080	/* ISAC setup messages	*/
-#define L1_F_MSG	0x000100	/* FSM messages		*/
-#define L1_F_ERR	0x000200	/* FSM error messages	*/
-#define L1_T_MSG	0x000400	/* Timer messages	*/
-#define L1_T_ERR	0x000800	/* Timer error messages	*/
-#define L1_H_XFRERR	0x001000	/* HSCX data xfer error */
-#define L1_I_CICO	0x002000	/* ISAC command in/out	*/
-#define L1_S_MSG	0x004000	/* silent messages (soft-HDLC)	*/
-#define L1_S_ERR	0x008000	/* error messages (soft-HDLC)	*/
-#define L1_HFC_DBG	0x010000	/* HFC-S PCI messages */
-#define L1_DEBUG_MAX	0x01ffef	/* all messages on except IRQ!	*/
-#define L1_DEBUG_ERR (L1_S_ERR | L1_H_ERR | L1_I_ERR | L1_F_ERR | L1_T_ERR | L1_ERROR)
-
-#ifndef L1_DEBUG_DEFAULT
-#ifdef DO_I4B_MAXDEBUG
-#define L1_DEBUG_DEFAULT L1_DEBUG_MAX
-#else
-#define L1_DEBUG_DEFAULT L1_DEBUG_ERR
-#endif
-#endif
-
-/* Layer 2 */
-
-#define L2_ERROR	0x0001		/* general error message	*/
-#define L2_PRIM		0x0002		/* interlayer primitives	*/
-#define L2_U_MSG	0x0004		/* U frame messages		*/
-#define L2_U_ERR	0x0008		/* U frame error messages	*/
-#define L2_S_MSG	0x0010		/* S frame messages		*/
-#define L2_S_ERR	0x0020		/* S frame error messages	*/
-#define L2_I_MSG	0x0040		/* I frame messages		*/
-#define L2_I_ERR	0x0080		/* I frame error messages	*/
-#define L2_F_MSG	0x0100		/* FSM messages			*/
-#define L2_F_ERR	0x0200		/* FSM error messages		*/
-#define L2_T_MSG	0x0400		/* timer messages		*/
-#define L2_T_ERR	0x0800		/* timer error messages		*/
-#define L2_TEI_MSG	0x1000		/* TEI messages			*/
-#define L2_TEI_ERR	0x2000		/* TEI error messages		*/
-
-#define L2_DEBUG_MAX	0x3fff		/* all messages on		*/
-#define L2_DEBUG_ERR (L2_ERROR | L2_I_ERR | L2_F_ERR | L2_T_ERR | L2_S_ERR | L2_TEI_ERR | L2_U_ERR )
-
-#ifndef L2_DEBUG_DEFAULT
-#ifdef DO_I4B_MAXDEBUG
-#define L2_DEBUG_DEFAULT L2_DEBUG_MAX
-#else
-#define L2_DEBUG_DEFAULT L2_DEBUG_ERR
-#endif
-#endif
-
-/* Layer 3 */
-
-#define L3_ERR		0x0001		/* general error message	*/
-#define L3_MSG		0x0002		/* general message		*/
-#define L3_F_MSG	0x0004		/* FSM messages			*/
-#define L3_F_ERR	0x0008		/* FSM error messages		*/
-#define L3_T_MSG	0x0010		/* timer messages		*/
-#define L3_T_ERR	0x0020		/* timer error messages		*/
-#define L3_P_MSG	0x0040		/* protocol messages		*/
-#define L3_P_ERR	0x0080		/* protocol error messages	*/
-#define L3_A_MSG	0x0100		/* AOC messages			*/
-#define L3_A_ERR	0x0200		/* AOC error messages		*/
-#define L3_PRIM		0x0400		/* messages exchanged		*/
-
-#define L3_DEBUG_MAX	0x07ff		/* all messages on	*/
-#define L3_DEBUG_ERR	(L3_ERR | L3_F_ERR | L3_T_ERR | L3_P_ERR | L3_A_ERR)
-
-#ifndef L3_DEBUG_DEFAULT
-#ifdef DO_I4B_MAXDEBUG
-#define L3_DEBUG_DEFAULT L3_DEBUG_MAX
-#else
-#define L3_DEBUG_DEFAULT L3_DEBUG_ERR
-#endif
-#endif
-
-/* Layer 4 */
-
-#define L4_ERR		0x0001		/* general error message	*/
-#define L4_MSG		0x0002		/* general message		*/
-#define L4_TIMO		0x0004		/* b channel idle timeout msgs	*/
-#define L4_DIALST	0x0008		/* network driver dial states	*/
-#define L4_IPRDBG	0x0010		/* ipr driver debug messages	*/
-#define L4_RBCHDBG	0x0020		/* rbch driver debug messages	*/
-#define L4_ISPDBG	0x0040		/* isp driver debug messages	*/
-#define L4_TELDBG	0x0080		/* tel driver debug messages	*/
-#define L4_INGDBG	0x0100		/* ing driver debug messages	*/
-#define L4_IAVCDBG	0x0200		/* AVM B1 driver debug messages	*/
-#define L4_CAPIDBG	0x0400		/* CAPI driver debug messages	*/
-
-#define L4_DEBUG_MAX	0x0fff		/* all messages on	*/
-#define L4_DEBUG_ERR	L4_ERR
-
-#ifndef L4_DEBUG_DEFAULT
-#ifdef DO_I4B_MAXDEBUG
-#define L4_DEBUG_DEFAULT L4_DEBUG_MAX
-#else
-#define L4_DEBUG_DEFAULT L4_DEBUG_ERR
-#endif
-#endif
-
-/*---------------------------------------------------------------------------*
- * 	ioctl via /dev/i4bctl:
- *	get/set current debug bits settings
- *---------------------------------------------------------------------------*/
-
-typedef struct {
-	unsigned int	l1;
-	unsigned int	l2;
-	unsigned int	l3;
-	unsigned int	l4;	
-} ctl_debug_t;
-	
-#define	I4B_CTL_GET_DEBUG	_IOR('C', 0, ctl_debug_t)
-
-#define	I4B_CTL_SET_DEBUG	_IOW('C', 1, ctl_debug_t)
-
-/*---------------------------------------------------------------------------*
- *	generic get chipset statistics
- *---------------------------------------------------------------------------*/
-
-/* for the ihfc-driver: structure for HFC-1/S/SP statistics */
-
-typedef struct {
-	int txframes;
-	int rxframes;
-	int xdu;
-	int rdo;
-	int crc;
-	int rab;
-} hfcstat_t;
-
-
-/* for the isic-driver: structure for HSCX statistics */
-
-typedef struct {
-	int unit;	/* controller number */
-	int chan;	/* channel number */
-	int vfr;
-	int rdo;
-	int crc;
-	int rab;
-	int xdu;
-	int rfo;
-} hscxstat_t;
-
-/* generic statistics structure */
-
-struct chipstat {
-	int driver_type;		/* type, L1DRVR_XXXX		*/
-	int driver_unit;		/* the unit number		*/
-	int driver_bchannel;		/* the B-channel		*/
-	union stats {			/* union for all drivers	*/
-		hfcstat_t  hfcstat;	/* for ihfc driver, L1DRVR_IHFC	*/
-		hscxstat_t hscxstat;	/* for isic driver, L1DRVR_ISIC	*/
-	} stats;
-};
-
-/* get statistics */
-
-#define	I4B_CTL_GET_CHIPSTAT	_IOWR('C', 2, struct chipstat)
-
-/* clear statistics */
-
-#define	I4B_CTL_CLR_CHIPSTAT	_IOW('C', 3, struct chipstat)
-
-/*---------------------------------------------------------------------------*
- *	get LAPD/Q.921 statistics
- *---------------------------------------------------------------------------*/
-typedef struct {
-
-	/* transmit */
-
-	u_long	tx_i;		/* I 	*/
-	u_long	tx_rr;		/* RR	*/
-	u_long	tx_rnr;		/* RNR 	*/
-	u_long	tx_rej;		/* REJ	*/
-	u_long	tx_sabme;	/* SABME*/
-	u_long	tx_dm;		/* DM	*/
-	u_long	tx_disc;	/* DISC */
-	u_long	tx_ua;		/* UA	*/
-	u_long	tx_frmr;	/* FRMR	*/	
-	u_long	tx_tei;		/* TEI	*/
-
-	/* receive */
-
-	u_long	rx_i;		/* I    */
-	u_long	rx_rr;		/* RR   */
-	u_long	rx_rnr;		/* RNR  */
-	u_long	rx_rej;		/* REJ  */
-	u_long	rx_sabme;	/* SABME*/
-	u_long	rx_tei;		/* TEI	*/
-	u_long	rx_ui;		/* UI	*/
-	u_long	rx_disc;	/* DISC */
-	u_long	rx_xid;		/* XID	*/
-	u_long	rx_dm;		/* DM	*/
-	u_long	rx_ua;		/* UA	*/
-	u_long	rx_frmr;	/* FRMR	*/	
-	
-	/* errors */
-
-	u_long	err_rx_len;	/* incorrect length */
-	u_long	err_rx_badf;	/* bad frame type */
-	u_long	err_rx_bads;	/* bad s frame */
-	u_long	err_rx_badu;	/* bad u frame */
-	u_long	err_rx_badui;	/* bad ui frame */
-} lapdstat_t;
-
-typedef struct {
-	int unit;
-	lapdstat_t lapdstat;
-} l2stat_t;
-
-#define	I4B_CTL_GET_LAPDSTAT	_IOWR('C', 4, l2stat_t)
-
-#define	I4B_CTL_CLR_LAPDSTAT	_IOW('C', 5, int)
-
-/* EOF */
diff --git a/include.new/machine/i4b_ioctl.h b/include.new/machine/i4b_ioctl.h
deleted file mode 100644
index 3eafc6f..0000000
--- a/include.new/machine/i4b_ioctl.h
+++ /dev/null
@@ -1,744 +0,0 @@
-/*-
- * Copyright (c) 1997, 2002 Hellmuth Michaelis. 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.
- *
- * 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.
- */
-
-/*---------------------------------------------------------------------------
- *
- *	i4b_ioctl.h - messages kernel <--> userland
- *	-------------------------------------------
- *
- * $FreeBSD: src/sys/i386/include/i4b_ioctl.h,v 1.22.2.1 2006/08/06 19:03:26 twinterg Exp $
- *
- *      last edit-date: [Sun Aug 11 19:19:08 2002]
- *
- *---------------------------------------------------------------------------*/
-
-#ifndef _I4B_IOCTL_H_
-#define _I4B_IOCTL_H_
-
-/*---------------------------------------------------------------------------*
- *	version and release number for isdn4bsd package
- *---------------------------------------------------------------------------*/
-#define	VERSION		1		/* version number	*/
-#define	REL		4		/* release number	*/
-#define STEP		1		/* release step		*/
-
-/*---------------------------------------------------------------------------*
- * date/time format in i4b log messages
- * ------------------------------------
- * Being year 2000 clean is not easy with the current state of the
- * ANSI C library standard and it's implementation for some locales.
- * You might like to use the "%c" format of "strftime" sometimes,
- * but this breaks Y2K in some locales. Also the old standard logfile
- * format "%d.%m.%y %H:%M:%S" is non compliant.
- * NetBSD's current toolset warns about this problems, and we compile
- * with -Werror, so this problems need to be resolved.
- *---------------------------------------------------------------------------*/
-#define I4B_TIME_FORMAT	"%d.%m.%Y %H:%M:%S"
-
-/*---------------------------------------------------------------------------*
- *	max number of controllers in system
- *---------------------------------------------------------------------------*/
-#define	MAX_CONTROLLERS	8		/* max number of controllers	*/
-
-/*---------------------------------------------------------------------------*
- *	ISDN D-channel protocols 
- *---------------------------------------------------------------------------*/
-#define PROTOCOL_DSS1	0		/* default, Euro-ISDN/DSS1 */
-#define PROTOCOL_D64S	1		/* 64k leased line, no protocol */
-
-/*---------------------------------------------------------------------------*
- *	controller types
- *---------------------------------------------------------------------------*/
-#define CTRL_INVALID	(-1)		/* invalid, error		*/
-#define CTRL_UNKNOWN	0		/* unknown controller type	*/
-#define CTRL_PASSIVE	1		/* passive ISDN controller cards*/
-#define CTRL_DAIC	2		/* Diehl active controller cards*/
-#define CTRL_TINADD	3		/* Stollmann Tina-dd active card*/
-#define CTRL_AVMB1	4		/* AVM B1 active card		*/
-#define CTRL_CAPI       5               /* cards seen via the CAPI layer*/
-#define CTRL_CAPIMGR	6		/* boards accessed through the CAPI manager */
-#define	CTRL_NUMTYPES	7		/* number of controller types	*/
-
-/*---------------------------------------------------------------------------*
- *	CTRL_PASSIVE: driver types
- *---------------------------------------------------------------------------*/
-#define MAXL1UNITS      8		/* max number of units	*/
-
-#define L1DRVR_ISIC     0		/* isic - driver	*/
-#define L1DRVR_IWIC     1		/* iwic - driver	*/
-#define L1DRVR_IFPI     2		/* ifpi - driver	*/
-#define L1DRVR_IHFC     3		/* ihfc - driver	*/
-#define L1DRVR_IFPNP    4		/* ifpnp - driver	*/
-#define L1DRVR_ICCHP	5		/* icchp - driver	*/
-#define L1DRVR_ITJC     6		/* itjc - driver	*/
-#define L1DRVR_IFPI2    7		/* ifpi2 - driver	*/
-
-/* MAXL1DRVR MUST be updated when more passive drivers are added !!! */
-#define MAXL1DRVR       (L1DRVR_IFPI2 + 1)
-
-/*---------------------------------------------------------------------------*
- *	card types for CTRL_PASSIVE 
- *---------------------------------------------------------------------------*/
-#define CARD_TYPEP_INVAL	(-1)	/* invalid, error		*/
-#define CARD_TYPEP_UNK		0	/* unknown			*/
-#define CARD_TYPEP_8		1	/* Teles, S0/8 			*/
-#define CARD_TYPEP_16		2	/* Teles, S0/16			*/
-#define CARD_TYPEP_16_3		3	/* Teles, S0/16.3		*/
-#define CARD_TYPEP_AVMA1	4	/* AVM A1 or AVM Fritz!Card	*/
-#define CARD_TYPEP_163P		5	/* Teles, S0/16.3 PnP		*/
-#define CARD_TYPEP_CS0P		6	/* Creatix, S0 PnP		*/
-#define CARD_TYPEP_USRTA	7	/* US Robotics ISDN TA internal	*/
-#define CARD_TYPEP_DRNNGO	8	/* Dr. Neuhaus Niccy GO@	*/
-#define CARD_TYPEP_SWS		9	/* Sedlbauer Win Speed		*/
-#define CARD_TYPEP_DYNALINK	10	/* Dynalink IS64PH		*/
-#define CARD_TYPEP_BLMASTER	11	/* ISDN Blaster / ISDN Master	*/
-#define	CARD_TYPEP_PCFRITZ	12	/* AVM PCMCIA Fritz!Card	*/
-#define CARD_TYPEP_ELSAQS1ISA	13	/* ELSA QuickStep 1000pro ISA	*/
-#define CARD_TYPEP_ELSAQS1PCI	14	/* ELSA QuickStep 1000pro PCI	*/
-#define CARD_TYPEP_SIEMENSITALK	15	/* Siemens I-Talk		*/
-#define	CARD_TYPEP_ELSAMLIMC	16	/* ELSA MicroLink ISDN/MC	*/
-#define	CARD_TYPEP_ELSAMLMCALL	17	/* ELSA MicroLink MCall		*/
-#define	CARD_TYPEP_ITKIX1	18	/* ITK ix1 micro 		*/
-#define CARD_TYPEP_AVMA1PCI	19	/* AVM FRITZ!CARD PCI		*/
-#define CARD_TYPEP_PCC16	20	/* ELSA PCC-16			*/
-#define CARD_TYPEP_AVM_PNP	21	/* AVM FRITZ!CARD PnP		*/
-#define CARD_TYPEP_SIE_ISURF2 	22	/* Siemens I-Surf 2 PnP		*/
-#define CARD_TYPEP_ASUSCOMIPAC	23	/* Asuscom ISDNlink 128 K PnP	*/
-#define CARD_TYPEP_WINB6692	24	/* Winbond W6692 based		*/
-#define CARD_TYPEP_16_3C	25	/* Teles S0/16.3c PnP (HFC-S/SP	*/
-#define CARD_TYPEP_ACERP10	26	/* Acer ISDN P10 (HFC-S)	*/
-#define CARD_TYPEP_TELEINT_NO_1	27	/* TELEINT ISDN SPEED No. 1 (HFC-1) */
-#define CARD_TYPEP_CCD_HFCS_PCI	28	/* Cologne Chip HFC-S PCI based	*/
-#define	CARD_TYPEP_NETJET_S	29	/* Traverse NetJet-S (Tiger300) */
-#define	CARD_TYPEP_DIVA_ISA	30	/* Eicon DIVA ISA PnP 2.0 or 2.02 */
-#define CARD_TYPEP_COMPAQ_M610	31	/* Compaq Microcom 610 		*/
-#define CARD_TYPEP_AVMA1PCI_V2	32	/* AVM FRITZ!CARD PCI Ver. 2	*/
-/*
- * in case you add support for more cards, please update:
- *
- *	isdnd:		controller.c, name_of_controller()
- *
- * and adjust CARD_TYPEP_MAX below.
- */
-
-#define CARD_TYPEP_MAX		32	/* max type */
-
-/*---------------------------------------------------------------------------*
- *	card types for CTRL_DAIC
- *---------------------------------------------------------------------------*/
-#define CARD_TYPEA_DAIC_UNK	0
-#define	CARD_TYPEA_DAIC_S	1
-#define	CARD_TYPEA_DAIC_SX	2
-#define	CARD_TYPEA_DAIC_SCOM	3
-#define	CARD_TYPEA_DAIC_QUAD	4
-
-/*---------------------------------------------------------------------------*
- *	card types for CTRL_CAPI
- *---------------------------------------------------------------------------*/
-#define CARD_TYPEC_CAPI_UNK	0
-#define	CARD_TYPEC_AVM_T1_PCI	1
-#define CARD_TYPEC_AVM_B1_PCI	2
-#define CARD_TYPEC_AVM_B1_ISA	3
-
-/*---------------------------------------------------------------------------*
- *	max length of some strings
- *---------------------------------------------------------------------------*/
-#define TELNO_MAX	41  /* max length of a telephone number (+ '\0')  */
-#define SUBADDR_MAX	21  /* max length of a subaddress (+ '\0')        */
-#define DISPLAY_MAX	91  /* max length of display information (+ '\0') */
-#define DATETIME_MAX	21  /* max length of datetime information (+ '\0')*/
-#define KEYPAD_MAX	35  /* max length of a keypad string (+ '\0')     */
-
-/*---------------------------------------------------------------------------*
- *	in case the src or dst telephone number is empty
- *---------------------------------------------------------------------------*/
-#define TELNO_EMPTY	"NotAvailable"	
-
-/*---------------------------------------------------------------------------*
- *	B channel parameters
- *---------------------------------------------------------------------------*/
-#define BCH_MAX_DATALEN	2048	/* max length of a B channel frame */
-
-/*---------------------------------------------------------------------------*
- * userland driver types
- * ---------------------
- * a "driver" is defined here as a piece of software interfacing an 
- * ISDN B channel with a userland service, such as IP, Telephony etc.
- *---------------------------------------------------------------------------*/
-#define BDRV_RBCH	0       /* raw b-channel interface driver       */
-#define BDRV_TEL	1       /* telephone (speech) interface driver  */
-#define BDRV_IPR	2       /* IP over raw HDLC interface driver    */
-#define BDRV_ISPPP	3       /* sync Kernel PPP interface driver     */
-#define BDRV_IBC	4       /* BSD/OS point to point driver		*/
-#define BDRV_ING	5       /* NetGraph ing driver			*/
-
-/*---------------------------------------------------------------------------*
- * B channel protocol
- *---------------------------------------------------------------------------*/
-#define BPROT_NONE	0	/* no protocol at all, raw data		*/
-#define BPROT_RHDLC	1	/* raw HDLC: flag, data, crc, flag	*/
-
-/*---------------------------------------------------------------------------*
- * special bearer capability settings (i.e. Data over Voice)
- *---------------------------------------------------------------------------*/
-#define BCAP_NONE	0	/* no special bearer capability		*/
-#define BCAP_DOV	1	/* Data over Voice			*/
-
-/*---------------------------------------------------------------------------*
- * causes data type
- *---------------------------------------------------------------------------*/
-typedef	unsigned int cause_t;		/* 32 bit unsigned int	*/
-
-/*---------------------------------------------------------------------------*
- * call descriptor id (cdid) definitions
- *---------------------------------------------------------------------------*/
-#define CDID_UNUSED	0	/* cdid is invalid and unused		*/
-#define CDID_MAX	99999	/* highest valid cdid, wraparound to 1	*/
-
-/*---------------------------------------------------------------------------*
- *	The shorthold algorithm to use
- *---------------------------------------------------------------------------*/
-#define SHA_FIXU	0    /* timeout algorithm for fix unit charging */
-#define SHA_VARU	1    /* timeout algorithm for variable unit charging */
-
-/*---------------------------------------------------------------------------*
- *	The shorthold data struct
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int	shorthold_algorithm;	/* shorthold algorithm to use	*/
-	int	unitlen_time;		/* length of a charging unit	*/
-	int	idle_time;		/* time without activity on b ch*/
-	int	earlyhup_time;		/* safety area at end of unit	*/
-} msg_shorthold_t;
-
-
-/****************************************************************************
-
-	outgoing call:
-	--------------
-
-		userland		kernel
-		--------		------
-
-		CDID_REQ ----------------->
-
-	            <------------------ cdid
-	
-		CONNECT_REQ -------------->
-
-		    <------------------ PROCEEDING_IND (if connect req ok)
-
-	            <------------------ CONNECT_ACTIVE_IND (if connection ok)
-
-		or
-
-	            <------------------ DISCONNECT_IND (if connection failed)
-	            
-		
-
-	incoming call:
-	--------------
-
-		userland		kernel
-		--------		------
-
-	            <------------------ CONNECT_IND
-
-		CONNECT_RESP ------------->
-
-	            <------------------ CONNECT_ACTIVE_IND (if accepted)
-
-
-
-	active disconnect:
-	------------------
-
-		userland		kernel
-		--------		------
-
-		DISCONNECT_REQ ------------>
-
-	            <------------------ DISCONNECT_IND
-	            
-
-	passive disconnect:
-	-------------------
-
-		userland		kernel
-		--------		------
-
-	            <------------------ DISCONNECT_IND
-	            
-
-****************************************************************************/
-
-
-/*===========================================================================*
- *===========================================================================*
- *	"read" messages from kernel -> userland
- *===========================================================================* 
- *===========================================================================*/
-
- 
-/*---------------------------------------------------------------------------*
- *	message header, included in every message
- *---------------------------------------------------------------------------*/
-typedef struct {
-	char		type;		/* message identifier		*/
-#define MSG_CONNECT_IND		'a'
-#define MSG_CONNECT_ACTIVE_IND	'b'
-#define MSG_DISCONNECT_IND	'c'
-#define MSG_DIALOUT_IND		'd'
-#define MSG_IDLE_TIMEOUT_IND	'e'
-#define MSG_ACCT_IND		'f'
-#define MSG_CHARGING_IND	'g'
-#define MSG_PROCEEDING_IND	'h'
-#define MSG_ALERT_IND		'i'
-#define MSG_DRVRDISC_REQ	'j'
-#define MSG_L12STAT_IND		'k'
-#define MSG_TEIASG_IND		'l'
-#define MSG_PDEACT_IND		'm'
-#define	MSG_NEGCOMP_IND		'n'
-#define	MSG_IFSTATE_CHANGED_IND	'o'
-#define MSG_DIALOUTNUMBER_IND	'p'
-#define MSG_PACKET_IND		'q'
-#define MSG_KEYPAD_IND		'r'
-	int		cdid;		/* call descriptor id		*/
-} msg_hdr_t;
-
-/*---------------------------------------------------------------------------*
- *	connect indication
- *		indicates incoming connection
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header		*/
-	int		controller;	/* controller number		*/
-	int		channel;	/* channel number		*/
-#define  CHAN_B1  0		/* this _must_ be 0, HSCX B1 is also 0	*/
-#define  CHAN_B2  1		/* this _must_ be 1, HSCX B2 is also 1	*/
-#define  CHAN_ANY (-1)		/* outgoing, not possible for incoming	*/
-#define  CHAN_NO  (-2)		/* call waiting (CW) for incoming	*/
-	int		bprot;	/* b channel protocot, see BPROT_XXX	*/
-	int		bcap;	/* special bearer capability, see BCAP_XXX */
-	char		dst_telno[TELNO_MAX];	/* destination telno	*/
-	char		dst_subaddr[SUBADDR_MAX];	/* dest subaddr */
-	char		src_telno[TELNO_MAX];	/* source telno		*/
-	char		src_subaddr[SUBADDR_MAX];	/* src subaddr	*/
-	int		dst_ton;		/* dest. type of number */
-	int		src_ton;		/* src. type of number	*/
-#define  TON_OTHER    0		/* other type of number 		*/
-#define  TON_INTERNAT 1		/* international number			*/
-#define  TON_NATIONAL 2		/* national number			*/
-	int		scr_ind;/* screening indicator			*/
-#define  SCR_NONE     0		/* no screening indicator transmitted	*/
-#define  SCR_USR_NOSC 1		/* screening user provided, not screened*/
-#define  SCR_USR_PASS 2		/* screening user provided, verified & passed */
-#define  SCR_USR_FAIL 3		/* screening user provided, verified & failed */
-#define  SCR_NET      4		/* screening network provided		*/
-	int		prs_ind;/* presentation indicator		*/
-#define  PRS_NONE     0		/* no presentation indicator transmitted*/
-#define  PRS_ALLOWED  1		/* presentation allowed			*/
-#define  PRS_RESTRICT 2		/* presentation restricted		*/
-#define  PRS_NNINTERW 3		/* number not available due to interworking */
-#define  PRS_RESERVED 4		/* reserved				*/
-	char		display[DISPLAY_MAX];	/* content of display IE*/
-} msg_connect_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	connect active indication
- *		indicates active connection
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header		   */
-	int		controller;	/* controller number actually used */
-	int		channel;	/* channel number actually used    */
-	char		datetime[DATETIME_MAX];	/* content of date/time IE */
-} msg_connect_active_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	disconnect indication
- *		indicates a disconnect
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	cause_t		cause;		/* cause code		*/
-} msg_disconnect_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	negotiation complete
- *		indicates an interface is completely up & running
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-} msg_negcomplete_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	interface changes internal state
- *		indicates an interface has somehow switched its FSM
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	int state;			/* new interface state */
-} msg_ifstatechg_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	initiate a call to a remote site
- *		i.e. the IP driver got a packet and wants a connection
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	int		driver;		/* driver type		*/
-	int		driver_unit;	/* driver unit number	*/
-} msg_dialout_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	dial a number
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	int		driver;		/* driver type		*/
-	int		driver_unit;	/* driver unit number	*/
-	int		cmdlen;		/* length of string	*/
-	int		subaddrlen;	/* length of subaddr	*/
-	char		cmd[TELNO_MAX];	/* the number to dial	*/	
-	char		subaddr[SUBADDR_MAX];	/* dest subaddr	*/	
-} msg_dialoutnumber_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	send keypad string
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	int		driver;		/* driver type		*/
-	int		driver_unit;	/* driver unit number	*/
-	int		cmdlen;		/* length of string	*/
-	char		cmd[KEYPAD_MAX];/* keypad string	*/	
-} msg_keypad_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	idle timeout disconnect sent indication
- *		kernel has sent disconnect request because of b-ch idle
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-} msg_idle_timeout_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	accounting information from userland interface driver to daemon
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header		*/
-	int		accttype;	/* accounting type		*/
-#define  ACCT_DURING 0
-#define  ACCT_FINAL  1
-	int		driver;		/* driver type			*/
-	int		driver_unit;	/* driver unit number		*/
-	int		ioutbytes;	/* ISDN # of bytes sent		*/
-	int		iinbytes;	/* ISDN # of bytes received	*/
-	int		outbps;		/* bytes per sec out		*/
-	int		inbps;		/* bytes per sec in		*/
-	int		outbytes;	/* driver # of bytes sent	*/
-	int		inbytes;	/* driver # of bytes received	*/
-} msg_accounting_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	charging information from isdn driver to daemon
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header		*/
-	int		units;		/* number of units		*/
-	int		units_type;	/* type of units info		*/
-#define  CHARGE_INVALID	0	/* invalid, unknown */
-#define  CHARGE_AOCD	1	/* advice of charge during call */
-#define  CHARGE_AOCE	2	/* advice of charge at end of call */
-#define  CHARGE_CALC	3	/* locally calculated from rates information */
-} msg_charging_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	call proceeding indication
- *		indicates outgoing SETUP has been acknowleged
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header		   */
-	int		controller;	/* controller number actually used */
-	int		channel;	/* channel number actually used    */
-} msg_proceeding_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	alert indication
- *		indicates remote user side "rings"
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header		   */
-} msg_alert_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	driver requests to disconnect line
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	int		driver;		/* driver type		*/
-	int		driver_unit;	/* driver unit number	*/
-} msg_drvrdisc_req_t;
-
-/*---------------------------------------------------------------------------*
- *	connect packet logging
- *---------------------------------------------------------------------------*/
-
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	int		driver;		/* driver type		*/
-	int		driver_unit;	/* driver unit number	*/
-	int		direction;	/* 0=in 1=out		*/
-#define DIRECTION_IN	0		/* sending packet to remote	*/
-#define DIRECTION_OUT	1		/* received packet from remote	*/
-#define MAX_PACKET_LOG	40		/* space for IP and TCP header	*/
-	u_int8_t	pktdata[MAX_PACKET_LOG];
-} msg_packet_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	state of layer 1/2
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	int		controller;	/* controller unit 	*/
-	int		layer;		/* layer number (1/2)	*/
-#define LAYER_ONE	1
-#define LAYER_TWO	2
-	int		state;		/* state info		*/
-#define LAYER_IDLE	0
-#define LAYER_ACTIVE	1
-} msg_l12stat_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	TEI assignment messages
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	int		controller;	/* controller unit 	*/
-	int		tei;		/* TEI or -1 if invalid */
-} msg_teiasg_ind_t;
-
-/*---------------------------------------------------------------------------*
- *	persistent deactivation state of stack
- *---------------------------------------------------------------------------*/
-typedef struct {
-	msg_hdr_t	header;		/* common header	*/
-	int		controller;	/* controller unit 	*/
-	int		numactive;	/* number of active connections */
-} msg_pdeact_ind_t;
-
-
-/*===========================================================================*
- *===========================================================================*
- *	"ioctl" messages from userland -> kernel
- *===========================================================================* 
- *===========================================================================*/
-
-/*---------------------------------------------------------------------------*
- *	request a unique cdid (to setup an outgoing call)
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int		cdid;			/* call descriptor id	*/
-} msg_cdid_req_t;
- 
-#define	I4B_CDID_REQ		_IOWR('4', 0, int)
-
-/*---------------------------------------------------------------------------*
- *	connect request
- *		requests an outgoing connection
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int		cdid;		/* call descriptor id		     */
-	int		controller;	/* controller to use		     */
-	int		channel;	/* channel to use		     */
-	int		txdelay;	/* tx delay after connect	     */
-	int		bprot;		/* b channel protocol		     */
-	int		bcap;		/* special bearer capability	     */	
-	int		driver;		/* driver to route b channel data to */
-	int		driver_unit;	/*      unit number for above driver */
-	msg_shorthold_t	shorthold_data;	/* the shorthold data		     */
-	int		unitlen_method;	/* how to calculate the unitlength   */
-#define  ULEN_METHOD_STATIC  0	/* use unitlen_time value (see above) */
-#define  ULEN_METHOD_DYNAMIC 1	/* use AOCD */	
-	char		dst_telno[TELNO_MAX];	/* destination telephone no  */
-	char		dst_subaddr[SUBADDR_MAX];	/* dest subaddr      */
-	char		src_telno[TELNO_MAX];	/* source telephone number   */
-	char		src_subaddr[SUBADDR_MAX];	/* source subaddr    */
-	char		keypad[KEYPAD_MAX];	/* keypad string 	     */	
-} msg_connect_req_t;
-
-#define	I4B_CONNECT_REQ	_IOW('4', 1, msg_connect_req_t)
-
-/*---------------------------------------------------------------------------*
- *	connect response
- *		this is the answer to an incoming connect indication
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int	cdid;		/* call descriptor id			*/
-	int	response;	/* what to do with incoming call	*/
-#define  SETUP_RESP_DNTCRE 0	/* dont care, call is not for me	*/
-#define  SETUP_RESP_REJECT 1	/* reject call				*/
-#define  SETUP_RESP_ACCEPT 2	/* accept call				*/
-	cause_t	cause;		/* cause for case SETUP_RESP_REJECT	*/
-		/* the following are only used for SETUP_RESP_ACCEPT !! */
-	int	txdelay;	/* tx delay after connect		*/
-	int	bprot;		/* B chan protocol			*/
-	int	bcap;		/* special bearer capability		*/	
-	int	driver;		/* driver to route b channel data to	*/
-	int	driver_unit;	/*      unit number for above driver	*/
-	int	max_idle_time;	/* max time without activity on b ch	*/	
-} msg_connect_resp_t;
-	
-#define	I4B_CONNECT_RESP	_IOW('4', 2, msg_connect_resp_t)
-
-/*---------------------------------------------------------------------------*
- *	disconnect request
- *		active disconnect request
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int	cdid;		/* call descriptor id			*/
-	cause_t	cause;		/* protocol independent cause		*/
-} msg_discon_req_t;
-	
-#define	I4B_DISCONNECT_REQ	_IOW('4', 3, msg_discon_req_t)
-
-/*---------------------------------------------------------------------------*
- *	controller info request
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int	controller;	/* controller number			*/
-	int	ncontroller;	/* number of controllers in system	*/
-	int	ctrl_type;	/* controller type passive/active	*/
-	int	card_type;	/* brand / version			*/
-	int	tei;		/* tei controller probably has		*/
-        int     nbch;           /* number of b channels provided        */
-} msg_ctrl_info_req_t;
-	
-#define	I4B_CTRL_INFO_REQ	_IOWR('4', 4, msg_ctrl_info_req_t)
-
-/*---------------------------------------------------------------------------*
- *	dialout response
- *		status report to driver who requested a dialout
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int		driver;		/* driver to route b channel data to */
-	int		driver_unit;	/*      unit number for above driver */
-	int		stat;		/* state of dialout request	     */
-#define  DSTAT_NONE	0
-#define  DSTAT_TFAIL	1		/* transient failure */
-#define  DSTAT_PFAIL	2		/* permanent failure */
-#define  DSTAT_INONLY	3		/* no outgoing dials allowed */
-	cause_t		cause;		/* exact i4b cause */
-} msg_dialout_resp_t;
-
-#define	I4B_DIALOUT_RESP	_IOW('4', 5, msg_dialout_resp_t)
-	
-/*---------------------------------------------------------------------------*
- *	timeout value update
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int	cdid;		/* call descriptor id			*/
-	msg_shorthold_t	shorthold_data;
-} msg_timeout_upd_t;
-	
-#define	I4B_TIMEOUT_UPD		_IOW('4', 6, msg_timeout_upd_t)
-
-/*---------------------------------------------------------------------------*
- *	soft enable/disable
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int		driver;		/* driver to route b channel data to */
-	int		driver_unit;	/*      unit number for above driver */
-	int		updown;		/* what to do			     */
-#define  SOFT_ENA	0	/* enable interface */
-#define  SOFT_DIS	1	/* disable interface */
-} msg_updown_ind_t;
-
-#define	I4B_UPDOWN_IND		_IOW('4', 7, msg_updown_ind_t)
-
-/*---------------------------------------------------------------------------*
- *	send alert request
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int	cdid;		/* call descriptor id			*/
-} msg_alert_req_t;
-	
-#define	I4B_ALERT_REQ		_IOW('4', 8, msg_alert_req_t)
-
-/*---------------------------------------------------------------------------*
- *	request version and release info from kernel part
- *	(msg_vr_req_t is also used by tel & rbch drivers)
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int	version;	/* version number */
-	int	release;	/* release number */
-	int	step;		/* release step number */	
-} msg_vr_req_t;
-
-#define I4B_VR_REQ              _IOR('4', 9, msg_vr_req_t)
-
-/*---------------------------------------------------------------------------*
- *	set ISDN protocol used by a controller
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int	controller;	/* controller number		*/
-	int	protocol;	/* ISDN D-channel protocol type	*/
-} msg_prot_ind_t;
-
-#define I4B_PROT_IND		_IOW('4', 10, msg_prot_ind_t)
-
-/*---------------------------------------------------------------------------*
- *	Protocol download to active cards
- *---------------------------------------------------------------------------*/
-struct isdn_dr_prot {
-	size_t bytecount;	/* length of code */
-	u_int8_t *microcode;	/* pointer to microcode */
-};
-
-struct isdn_download_request {
-	int controller;		/* controller number */
-	int numprotos;		/* number of protocols in 'protocols' */
-	struct isdn_dr_prot *protocols;
-};
-
-#define	I4B_CTRL_DOWNLOAD	_IOW('4', 100, struct isdn_download_request)
-
-/*---------------------------------------------------------------------------*
- *	Generic diagnostic interface for active cards
- *---------------------------------------------------------------------------*/
-struct isdn_diagnostic_request {
-	int controller;		/* controller number */
-	uint32_t cmd;		/* diagnostic command to execute */
-	size_t in_param_len;	/* length of additional input parameter */
-#define I4B_ACTIVE_DIAGNOSTIC_MAXPARAMLEN	65536
-	void *in_param;		/* optional input parameter */
-	size_t out_param_len;	/* available output space */
-	void *out_param;	/* output data goes here */
-};
-
-#define	I4B_ACTIVE_DIAGNOSTIC	_IOW('4', 102, struct isdn_diagnostic_request)
-
-#endif /* _I4B_IOCTL_H_ */
diff --git a/include.new/machine/i4b_rbch_ioctl.h b/include.new/machine/i4b_rbch_ioctl.h
deleted file mode 100644
index 6f73a05..0000000
--- a/include.new/machine/i4b_rbch_ioctl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1999, 2002 Hellmuth Michaelis. 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.
- *
- * 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.
- */
-
-/*---------------------------------------------------------------------------
- *
- *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
- *	------------------------------------------------------
- *
- * $FreeBSD: src/sys/i386/include/i4b_rbch_ioctl.h,v 1.6 2005/01/06 22:18:15 imp Exp $
- *
- *      last edit-date: [Sun Mar 17 10:10:25 2002]
- *
- *---------------------------------------------------------------------------*/
-
-#ifndef _I4B_RBCH_IOCTL_H_
-#define _I4B_RBCH_IOCTL_H_
-
-/*---------------------------------------------------------------------------*
- *	instruct the rbch device to dial the given number
- *---------------------------------------------------------------------------*/
-
-typedef char telno_t[TELNO_MAX];
-
-#define	I4B_RBCH_DIALOUT	_IOW('R', 1, telno_t)
-
-/*---------------------------------------------------------------------------*
- *	request version and release info from kernel part
- *---------------------------------------------------------------------------*/
-
-#define I4B_RBCH_VR_REQ		_IOR('R', 2, msg_vr_req_t)
-
-#endif /* _I4B_RBCH_IOCTL_H_ */
diff --git a/include.new/machine/i4b_tel_ioctl.h b/include.new/machine/i4b_tel_ioctl.h
deleted file mode 100644
index 33095b6..0000000
--- a/include.new/machine/i4b_tel_ioctl.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1997, 2002  Hellmuth Michaelis. 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.
- *
- * 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.
- */
-
-/*---------------------------------------------------------------------------
- *
- *	i4b_tel_ioctl.h telephony interface ioctls
- *	------------------------------------------
- *
- * $FreeBSD: src/sys/i386/include/i4b_tel_ioctl.h,v 1.10 2005/01/06 22:18:15 imp Exp $
- *
- *      last edit-date: [Sun Mar 17 10:10:39 2002]
- *
- *---------------------------------------------------------------------------*/
-
-#ifndef _I4B_TEL_IOCTL_H_
-#define _I4B_TEL_IOCTL_H_
-
-/*===========================================================================*
- *	/dev/i4btel<n> devices (audio data)
- *===========================================================================*/
- 
-/* supported audio format conversions */
-
-#define CVT_NONE	0		/* no A-law/u-law conversion     */
-#define CVT_ALAW2ULAW	1		/* ISDN line: A-law, user: u-law */
-#define CVT_ULAW2ALAW	2		/* ISDN line: u-law, user: A-law */
-      
-/*---------------------------------------------------------------------------*
- *	get / set audio format 
- *---------------------------------------------------------------------------*/
-
-#define	I4B_TEL_GETAUDIOFMT	_IOR('A', 0, int)
-#define	I4B_TEL_SETAUDIOFMT	_IOW('A', 1, int)
-#define	I4B_TEL_EMPTYINPUTQUEUE	_IOW('A', 2, int)
-
-/*---------------------------------------------------------------------------*
- *	request version and release info from kernel part
- *---------------------------------------------------------------------------*/
-
-#define I4B_TEL_VR_REQ		_IOR('A', 3, msg_vr_req_t)
-
-/*---------------------------------------------------------------------------*
- *	send tones out of the tel interface
- *---------------------------------------------------------------------------*/
-
-#define I4B_TEL_MAXTONES 32
-
-struct i4b_tel_tones {
-	int frequency[I4B_TEL_MAXTONES];
-	int duration[I4B_TEL_MAXTONES];
-};
-
-#define I4B_TEL_TONES		_IOR('A', 4, struct i4b_tel_tones)
-
-/*===========================================================================*
- *	/dev/i4bteld<n> devices (dialer interface)
- *===========================================================================*/
-
-/* dialer commands */
-
-#define CMD_DIAL        'D'     /* dial the following number string */
-#define CMD_HUP         'H'     /* hangup */
-#define CMD_KEYP        'K'     /* send keypad string */
-
-/* dialer responses */
-
-#define RSP_CONN        '0'     /* connect */
-#define RSP_BUSY        '1'     /* busy */
-#define RSP_HUP         '2'     /* hangup */
-#define RSP_NOA         '3'     /* no answer */
-
-#endif /* _I4B_TEL_IOCTL_H_ */
diff --git a/include.new/machine/i4b_trace.h b/include.new/machine/i4b_trace.h
deleted file mode 100644
index f5a439a..0000000
--- a/include.new/machine/i4b_trace.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 1997, 2002 Hellmuth Michaelis. 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.
- *
- * 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.
- */
-
-/*---------------------------------------------------------------------------
- *
- *	i4b_trace.h - header file for trace data read device
- *	----------------------------------------------------
- *
- * $FreeBSD: src/sys/i386/include/i4b_trace.h,v 1.9 2005/01/06 22:18:15 imp Exp $
- *
- *      last edit-date: [Sun Mar 17 10:10:52 2002]
- *
- *---------------------------------------------------------------------------*/
-
-#ifndef _I4B_TRACE_H_
-#define _I4B_TRACE_H_
-
-/*---------------------------------------------------------------------------*
- *	structure of the header at the beginning of every trace mbuf
- *---------------------------------------------------------------------------*/
-typedef struct {
-	int length;		/* length of the following mbuf		*/
-	int unit;		/* controller unit number		*/
-	int type;		/* type of channel			*/
-#define TRC_CH_I	0		/* Layer 1 INFO's		*/
-#define TRC_CH_D 	1		/* D channel 			*/
-#define TRC_CH_B1	2		/* B1 channel			*/
-#define TRC_CH_B2	3		/* B2 channel			*/
-	int dir;		/* direction 				*/
-#define FROM_TE	0			/* user -> network		*/
-#define FROM_NT 1			/* network -> user		*/
-	int trunc;		/* # of truncated bytes (frame > MCLBYTES) */
-	unsigned int count;	/* frame count for this unit/type	*/
-	struct timeval time;	/* timestamp for this frame		*/
-} i4b_trace_hdr_t;
-
-#define INFO0		0	/* layer 1 */
-#define INFO1_8		1
-#define INFO1_10	2
-#define INFO2		3
-#define INFO3		4
-#define INFO4_8		5
-#define INFO4_10	6
-
-/*---------------------------------------------------------------------------*
- * 	ioctl via /dev/i4btrc device(s):
- *	get/set current trace flag settings
- *---------------------------------------------------------------------------*/
-	
-#define	I4B_TRC_SET	_IOW('T', 0, int)	/* set trace settings	*/
-
-#define TRACE_OFF       0x00		/* tracing off 		*/
-#define TRACE_I		0x01		/* trace L1 INFO's on	*/
-#define TRACE_D_TX	0x02		/* trace D channel on	*/
-#define TRACE_D_RX	0x04		/* trace D channel on	*/
-#define TRACE_B_TX	0x08		/* trace B channel on	*/
-#define TRACE_B_RX	0x10		/* trace B channel on	*/
-
-typedef struct {
-	int rxunit;		/* unit # for rx frames	*/
-	int rxflags;		/* d and/or b channel	*/
-	int txunit;		/* unit # for tx frames */
-	int txflags;		/* d and/or b channel	*/
-} i4b_trace_setupa_t;
-
-#define	I4B_TRC_SETA	_IOW('T', 1, i4b_trace_setupa_t) /* set analyze mode */
-#define	I4B_TRC_RESETA	_IOW('T', 2, int)	/* reset analyze mode	*/
-
-#endif /* _I4B_TRACE_H_ */
diff --git a/include.new/machine/ieeefp.h b/include.new/machine/ieeefp.h
deleted file mode 100644
index 7f1336e..0000000
--- a/include.new/machine/ieeefp.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*-
- * Copyright (c) 2003 Peter Wemm.
- * Copyright (c) 1990 Andrew Moore, Talke Studio
- * 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.
- *
- * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
- * $FreeBSD: releng/10.2/sys/i386/include/ieeefp.h 226607 2011-10-21 06:41:46Z das $
- */
-
-#ifndef _MACHINE_IEEEFP_H_
-#define _MACHINE_IEEEFP_H_
-
-/*
- * Deprecated historical FPU control interface
- *
- * IEEE floating point type, constant and function definitions.
- * XXX: FP*FLD and FP*OFF are undocumented pollution.
- */
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-/*
- * Rounding modes.
- */
-typedef enum {
-	FP_RN=0,	/* round to nearest */
-	FP_RM,		/* round down towards minus infinity */
-	FP_RP,		/* round up towards plus infinity */
-	FP_RZ		/* truncate */
-} fp_rnd_t;
-
-/*
- * Precision (i.e., rounding precision) modes.
- */
-typedef enum {
-	FP_PS=0,	/* 24 bit (single-precision) */
-	FP_PRS,		/* reserved */
-	FP_PD,		/* 53 bit (double-precision) */
-	FP_PE		/* 64 bit (extended-precision) */
-} fp_prec_t;
-
-#define fp_except_t	int
-
-/*
- * Exception bit masks.
- */
-#define FP_X_INV	0x01	/* invalid operation */
-#define FP_X_DNML	0x02	/* denormal */
-#define FP_X_DZ		0x04	/* zero divide */
-#define FP_X_OFL	0x08	/* overflow */
-#define FP_X_UFL	0x10	/* underflow */
-#define FP_X_IMP	0x20	/* (im)precision */
-#define FP_X_STK	0x40	/* stack fault */
-
-/*
- * FPU control word bit-field masks.
- */
-#define FP_MSKS_FLD	0x3f	/* exception masks field */
-#define FP_PRC_FLD	0x300	/* precision control field */
-#define	FP_RND_FLD	0xc00	/* rounding control field */
-
-/*
- * FPU status word bit-field masks.
- */
-#define FP_STKY_FLD	0x3f	/* sticky flags field */
-
-/*
- * FPU control word bit-field offsets (shift counts).
- */
-#define FP_MSKS_OFF	0	/* exception masks offset */
-#define FP_PRC_OFF	8	/* precision control offset */
-#define	FP_RND_OFF	10	/* rounding control offset */
-
-/*
- * FPU status word bit-field offsets (shift counts).
- */
-#define FP_STKY_OFF	0	/* sticky flags offset */
-
-#ifdef __GNUCLIKE_ASM
-
-#define	__fldcw(addr)	__asm __volatile("fldcw %0" : : "m" (*(addr)))
-#define	__fldenv(addr)	__asm __volatile("fldenv %0" : : "m" (*(addr)))
-#define	__fnclex()	__asm __volatile("fnclex")
-#define	__fnstcw(addr)	__asm __volatile("fnstcw %0" : "=m" (*(addr)))
-#define	__fnstenv(addr)	__asm __volatile("fnstenv %0" : "=m" (*(addr)))
-#define	__fnstsw(addr)	__asm __volatile("fnstsw %0" : "=m" (*(addr)))
-
-/*
- * Load the control word.  Be careful not to trap if there is a currently
- * unmasked exception (ones that will become freshly unmasked are not a
- * problem).  This case must be handled by a save/restore of the
- * environment or even of the full x87 state.  Accessing the environment
- * is very inefficient, so only do it when necessary.
- */
-static __inline void
-__fnldcw(unsigned short _cw, unsigned short _newcw)
-{
-	struct {
-		unsigned _cw;
-		unsigned _other[6];
-	} _env;
-	unsigned short _sw;
-
-	if ((_cw & FP_MSKS_FLD) != FP_MSKS_FLD) {
-		__fnstsw(&_sw);
-		if (((_sw & ~_cw) & FP_STKY_FLD) != 0) {
-			__fnstenv(&_env);
-			_env._cw = _newcw;
-			__fldenv(&_env);
-			return;
-		}
-	}
-	__fldcw(&_newcw);
-}
-
-static __inline fp_rnd_t
-fpgetround(void)
-{
-	unsigned short _cw;
-
-	__fnstcw(&_cw);
-	return ((fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF));
-}
-
-static __inline fp_rnd_t
-fpsetround(fp_rnd_t _m)
-{
-	fp_rnd_t _p;
-	unsigned short _cw, _newcw;
-
-	__fnstcw(&_cw);
-	_p = (fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF);
-	_newcw = _cw & ~FP_RND_FLD;
-	_newcw |= (_m << FP_RND_OFF) & FP_RND_FLD;
-	__fnldcw(_cw, _newcw);
-	return (_p);
-}
-
-static __inline fp_prec_t
-fpgetprec(void)
-{
-	unsigned short _cw;
-
-	__fnstcw(&_cw);
-	return ((fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF));
-}
-
-static __inline fp_prec_t
-fpsetprec(fp_prec_t _m)
-{
-	fp_prec_t _p;
-	unsigned short _cw, _newcw;
-
-	__fnstcw(&_cw);
-	_p = (fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF);
-	_newcw = _cw & ~FP_PRC_FLD;
-	_newcw |= (_m << FP_PRC_OFF) & FP_PRC_FLD;
-	__fnldcw(_cw, _newcw);
-	return (_p);
-}
-
-/*
- * Get or set the exception mask.
- * Note that the x87 mask bits are inverted by the API -- a mask bit of 1
- * means disable for x87 and SSE, but for fp*mask() it means enable.
- */
-
-static __inline fp_except_t
-fpgetmask(void)
-{
-	unsigned short _cw;
-
-	__fnstcw(&_cw);
-	return ((~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF);
-}
-
-static __inline fp_except_t
-fpsetmask(fp_except_t _m)
-{
-	fp_except_t _p;
-	unsigned short _cw, _newcw;
-
-	__fnstcw(&_cw);
-	_p = (~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF;
-	_newcw = _cw & ~FP_MSKS_FLD;
-	_newcw |= (~_m << FP_MSKS_OFF) & FP_MSKS_FLD;
-	__fnldcw(_cw, _newcw);
-	return (_p);
-}
-
-static __inline fp_except_t
-fpgetsticky(void)
-{
-	unsigned _ex;
-	unsigned short _sw;
-
-	__fnstsw(&_sw);
-	_ex = (_sw & FP_STKY_FLD) >> FP_STKY_OFF;
-	return ((fp_except_t)_ex);
-}
-
-static __inline fp_except_t
-fpresetsticky(fp_except_t _m)
-{
-	struct {
-		unsigned _cw;
-		unsigned _sw;
-		unsigned _other[5];
-	} _env;
-	fp_except_t _p;
-
-	_m &= FP_STKY_FLD >> FP_STKY_OFF;
-	_p = fpgetsticky();
-	if ((_p & ~_m) == _p)
-		return (_p);
-	if ((_p & ~_m) == 0) {
-		__fnclex();
-		return (_p);
-	}
-	__fnstenv(&_env);
-	_env._sw &= ~_m;
-	__fldenv(&_env);
-	return (_p);
-}
-
-#endif /* __GNUCLIKE_ASM */
-
-#endif /* !_MACHINE_IEEEFP_H_ */
diff --git a/include.new/machine/if_wl_wavelan.h b/include.new/machine/if_wl_wavelan.h
deleted file mode 100644
index 5d2aefd..0000000
--- a/include.new/machine/if_wl_wavelan.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/i386/include/if_wl_wavelan.h 139790 2005-01-06 22:18:23Z imp $ */
-/*-
- * 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 all copyright 
- *    notices, this list of conditions and the following disclaimer.
- * 2. The names of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
- * 
- */
-#ifndef	_CHIPS_WAVELAN_H
-#define _CHIPS_WAVELAN_H
-
-/* This file contains definitions that are common for all versions of
- * the NCR WaveLAN
- */
-
-#define WAVELAN_ADDR_SIZE	6	/* Size of a MAC address */
-#define WAVELAN_MTU		1500	/* Maximum size of Wavelan packet */
-
-/* Modem Management Controler write commands */
-#define MMC_ENCR_KEY		0x00	/* to 0x07 */
-#define MMC_ENCR_ENABLE		0x08
-#define MMC_DES_IO_INVERT	0x0a
-#define MMC_LOOPT_SEL		0x10
-#define MMC_JABBER_ENABLE	0x11
-#define MMC_FREEZE		0x12
-#define MMC_ANTEN_SEL		0x13
-#define MMC_IFS			0x14
-#define MMC_MOD_DELAY		0x15
-#define MMC_JAM_TIME		0x16
-#define MMC_THR_PRE_SET		0x18
-#define MMC_DECAY_PRM		0x19
-#define MMC_DECAY_UPDAT_PRM	0x1a
-#define MMC_QUALITY_THR		0x1b
-#define MMC_NETW_ID_L		0x1c
-#define MMC_NETW_ID_H		0x1d
-#define MMC_MODE_SEL		0x1e
-#define	MMC_EECTRL		0x20	/* 2.4 Gz */
-#define	MMC_EEADDR		0x21	/* 2.4 Gz */
-#define MMC_EEDATAL		0x22	/* 2.4 Gz */
-#define	MMC_EEDATAH		0x23	/* 2.4 Gz */
-#define	MMC_ANALCTRL		0x24	/* 2.4 Gz */
-
-/* fields in MMC registers that relate to EEPROM in WaveMODEM daughtercard */
-#define MMC_EECTRL_EEPRE	0x10	/* 2.4 Gz EEPROM Protect Reg Enable */
-#define MMC_EECTRL_DWLD		0x08	/* 2.4 Gz EEPROM Download Synths   */
-#define	MMC_EECTRL_EEOP		0x07	/* 2.4 Gz EEPROM Opcode mask	 */
-#define MMC_EECTRL_EEOP_READ	0x06	/* 2.4 Gz EEPROM Read Opcode	 */
-#define	MMC_EEADDR_CHAN		0xf0	/* 2.4 Gz EEPROM Channel # mask	 */
-#define	MMC_EEADDR_WDCNT	0x0f	/* 2.4 Gz EEPROM DNLD WordCount-1 */
-#define	MMC_ANALCTRL_ANTPOL	0x02	/* 2.4 Gz Antenna Polarity mask	 */
-#define	MMC_ANALCTRL_EXTANT	0x01	/* 2.4 Gz External Antenna mask	 */
-
-/* MMC read register names */
-#define MMC_DCE_STATUS		0x10
-#define MMC_CORRECT_NWID_L	0x14
-#define MMC_CORRECT_NWID_H	0x15
-#define MMC_WRONG_NWID_L	0x16
-#define MMC_WRONG_NWID_H	0x17
-#define MMC_THR_PRE_SET		0x18
-#define MMC_SIGNAL_LVL		0x19
-#define MMC_SILENCE_LVL		0x1a
-#define MMC_SIGN_QUAL		0x1b
-#define MMC_DES_AVAIL		0x09
-#define	MMC_EECTRLstat		0x20	/* 2.4 Gz  EEPROM r/w/dwld status */
-#define	MMC_EEDATALrv		0x22	/* 2.4 Gz  EEPROM read value	  */
-#define	MMC_EEDATAHrv		0x23	/* 2.4 Gz  EEPROM read value	  */
-
-/* fields in MMC registers that relate to EEPROM in WaveMODEM daughtercard */
-#define	MMC_EECTRLstat_ID24	0xf0	/* 2.4 Gz  =A0 rev-A, =B0 rev-B   */
-#define	MMC_EECTRLstat_DWLD	0x08	/* 2.4 Gz  Synth/Tx-Pwr DWLD busy */
-#define	MMC_EECTRLstat_EEBUSY	0x04	/* 2.4 Gz  EEPROM busy		  */
-
-/* additional socket ioctl params for wl card   
- * see sys/sockio.h for numbers.  The 2nd params here
- * must be greater than any values in sockio.h
- */
-
-#define SIOCGWLCNWID	_IOWR('i', 60, struct ifreq)	/* get wlan current nwid */
-#define SIOCSWLCNWID	_IOWR('i', 61, struct ifreq)	/* set wlan current nwid */
-#define SIOCGWLPSA	_IOWR('i', 62, struct ifreq)	/* get wlan PSA (all) */
-#define SIOCSWLPSA	_IOWR('i', 63, struct ifreq)	/* set wlan PSA (all) */
-#define	SIOCDWLCACHE	_IOW('i',  64, struct ifreq)	/* clear SNR cache    */
-#define SIOCSWLTHR	_IOW('i',  65, struct ifreq)	/* set new quality threshold */
-#define	SIOCGWLEEPROM	_IOWR('i', 66, struct ifreq)	/* get modem EEPROM   */
-#define	SIOCGWLCACHE	_IOWR('i', 67, struct ifreq)	/* get SNR cache */
-#define	SIOCGWLCITEM	_IOWR('i', 68, struct ifreq)	/* get cache element count */
-
-/* PSA address definitions */
-#define WLPSA_ID		0x0	/* ID byte (0 for ISA, 0x14 for MCA) */
-#define WLPSA_IO1		0x1	/* I/O address 1 */
-#define WLPSA_IO2		0x2	/* I/O address 2 */
-#define WLPSA_IO3		0x3	/* I/O address 3 */
-#define WLPSA_BR1		0x4	/* Bootrom address 1 */
-#define WLPSA_BR2		0x5	/* Bootrom address 2 */
-#define WLPSA_BR3		0x6	/* Bootrom address 3 */
-#define WLPSA_HWCONF		0x7	/* HW config bits */
-#define WLPSA_IRQNO		0x8	/* IRQ value */
-#define WLPSA_UNIMAC		0x10	/* Universal MAC address */
-#define WLPSA_LOCALMAC		0x16	/* Locally configured MAC address */
-#define WLPSA_MACSEL		0x1c	/* MAC selector */
-#define WLPSA_COMPATNO		0x1d	/* compatibility number */
-#define WLPSA_THRESH		0x1e	/* RF modem threshold preset */
-#define WLPSA_FEATSEL		0x1f	/* feature select */
-#define WLPSA_SUBBAND		0x20	/* subband selector */
-#define WLPSA_QUALTHRESH	0x21	/* RF modem quality threshold preset */
-#define WLPSA_HWVERSION		0x22	/* hardware version indicator */
-#define WLPSA_NWID		0x23	/* network ID */
-#define WLPSA_NWIDENABLE	0x24	/* network ID enable */
-#define WLPSA_SECURITY		0x25	/* datalink security enable */
-#define WLPSA_DESKEY		0x26	/* datalink security DES key */
-#define WLPSA_DBWIDTH		0x2f	/* databus width select */
-#define WLPSA_CALLCODE		0x30	/* call code (japan only) */
-#define WLPSA_CONFIGURED	0x3c	/* configuration status */
-#define WLPSA_CRCLOW		0x3d	/* CRC-16 (lowbyte) */
-#define WLPSA_CRCHIGH		0x3e	/*        (highbyte) */
-#define WLPSA_CRCOK		0x3f	/* CRC OK flag */
-
-#define WLPSA_COMPATNO_WL24B	0x04	/* 2.4 Gz WaveMODEM ISA rev-B  */
-
-/* 
- * signal strength cache
- *
- * driver (wlp only at the moment) keeps cache of last
- * IP (only) packets to arrive including signal strength info.
- * daemons may read this with kvm.  See if_wlp.c for globals
- * that may be accessed through kvm.
- *
- * Each entry in the w_sigcache has a unique macsrc and age.
- * Each entry is identified by its macsrc field.
- * Age of the packet is identified by its age field.
- */
-
-#define  MAXCACHEITEMS	10
-#ifndef INT_MAX
-#define        INT_MAX         2147483647
-#endif
-#define  MAX_AGE        (INT_MAX - MAXCACHEITEMS)
-
-/* signal is 7 bits, 0..63, although it doesn't seem to get to 63.
- * silence is 7 bits, 0..63
- * quality is 4 bits, 0..15
- */
-struct w_sigcache {
-        char   macsrc[6]; /* unique MAC address for entry */
-        int    ipsrc;     /* ip address associated with packet */
-        int    signal;    /* signal strength of the packet */
-        int    silence;   /* silence of the packet */
-        int    quality;   /* quality of the packet */
-        int    snr;       /* packet has unique age between 1 to MAX_AGE - 1 */
-};
-
-#endif /* _CHIPS_WAVELAN_H */
-
diff --git a/include.new/machine/in_cksum.h b/include.new/machine/in_cksum.h
deleted file mode 100644
index 15e3b93..0000000
--- a/include.new/machine/in_cksum.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 1990 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.
- * 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.
- *
- *	from tahoe:	in_cksum.c	1.2	86/01/05
- *	from:		@(#)in_cksum.c	1.3 (Berkeley) 1/19/91
- *	from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
- * $FreeBSD: releng/10.2/sys/i386/include/in_cksum.h 235941 2012-05-24 22:00:48Z bz $
- */
-
-#ifndef _MACHINE_IN_CKSUM_H_
-#define	_MACHINE_IN_CKSUM_H_	1
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-/*
- * MP safe (alfred)
- */
-
-#include <sys/cdefs.h>
-
-#define in_cksum(m, len)	in_cksum_skip(m, len, 0)
-
-/*
- * It it useful to have an Internet checksum routine which is inlineable
- * and optimized specifically for the task of computing IP header checksums
- * in the normal case (where there are no options and the header length is
- * therefore always exactly five 32-bit words.
- */
-#if defined(__GNUCLIKE_ASM) && !defined(__INTEL_COMPILER)
-#if defined(IPVERSION) && (IPVERSION == 4)
-static __inline u_int
-in_cksum_hdr(const struct ip *ip)
-{
-	u_int sum = 0;
-
-	__asm(
-		"addl %1, %0\n"
-		"adcl %2, %0\n"
-		"adcl %3, %0\n"
-		"adcl %4, %0\n"
-		"adcl %5, %0\n"
-		"adcl $0, %0"
-		: "+r" (sum)
-		: "g" (((const uint32_t *)ip)[0]),
-		  "g" (((const uint32_t *)ip)[1]),
-		  "g" (((const uint32_t *)ip)[2]),
-		  "g" (((const uint32_t *)ip)[3]),
-		  "g" (((const uint32_t *)ip)[4])
-		: "cc"
-	);
-	sum = (sum & 0xffff) + (sum >> 16);
-	if (sum > 0xffff)
-		sum -= 0xffff;
-
-	return ~sum & 0xffff;
-}
-
-static __inline void
-in_cksum_update(struct ip *ip)
-{
-	int __tmpsum;
-	__tmpsum = (int)ntohs(ip->ip_sum) + 256;
-	ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16));
-}
-#endif
-
-static __inline u_short
-in_addword(u_short sum, u_short b)
-{
-	__asm(
-		"addw %1, %0\n"
-		"adcw $0, %0"
-		: "+r" (sum)
-		: "g" (b)
-		: "cc"
-	);
-	return (sum);
-}
-
-static __inline u_short
-in_pseudo(u_int sum, u_int b, u_int c)
-{
-	__asm(
-		"addl %1, %0\n"
-		"adcl %2, %0\n"
-		"adcl $0, %0"
-		: "+r" (sum)
-		: "g" (b),
-		  "g" (c)
-		: "cc"
-	);
-	sum = (sum & 0xffff) + (sum >> 16);
-	if (sum > 0xffff)
-		sum -= 0xffff;
-	return (sum);
-}
-
-#else
-#if defined(IPVERSION) && (IPVERSION == 4)
-#define	in_cksum_update(ip) \
-	do { \
-		int __tmpsum; \
-		__tmpsum = (int)ntohs(ip->ip_sum) + 256; \
-		ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16)); \
-	} while(0)
-
-#endif
-#endif
-
-#ifdef _KERNEL
-#if !defined(__GNUCLIKE_ASM) || defined(__INTEL_COMPILER)
-#if defined(IPVERSION) && (IPVERSION == 4)
-u_int in_cksum_hdr(const struct ip *ip);
-#endif
-u_short in_addword(u_short sum, u_short b);
-u_short in_pseudo(u_int sum, u_int b, u_int c);
-#endif
-u_short in_cksum_skip(struct mbuf *m, int len, int skip);
-#endif /* _KERNEL */
-
-#endif /* _MACHINE_IN_CKSUM_H_ */
diff --git a/include.new/machine/intr_machdep.h b/include.new/machine/intr_machdep.h
deleted file mode 100644
index 103d323..0000000
--- a/include.new/machine/intr_machdep.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * Copyright (c) 2003 John Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/i386/include/intr_machdep.h 255726 2013-09-20 05:06:03Z gibbs $
- */
-
-#ifndef __MACHINE_INTR_MACHDEP_H__
-#define	__MACHINE_INTR_MACHDEP_H__
-
-#ifdef _KERNEL
-
-/*
- * The maximum number of I/O interrupts we allow.  This number is rather
- * arbitrary as it is just the maximum IRQ resource value.  The interrupt
- * source for a given IRQ maps that I/O interrupt to device interrupt
- * source whether it be a pin on an interrupt controller or an MSI interrupt.
- * The 16 ISA IRQs are assigned fixed IDT vectors, but all other device
- * interrupts allocate IDT vectors on demand.  Currently we have 191 IDT
- * vectors available for device interrupts.  On many systems with I/O APICs,
- * a lot of the IRQs are not used, so this number can be much larger than
- * 191 and still be safe since only interrupt sources in actual use will
- * allocate IDT vectors.
- *
- * The first 255 IRQs (0 - 254) are reserved for ISA IRQs and PCI intline IRQs.
- * IRQ values from 256 to 767 are used by MSI.  When running under the Xen
- * Hypervisor, IRQ values from 768 to 4863 are available for binding to
- * event channel events.  We leave 255 unused to avoid confusion since 255 is
- * used in PCI to indicate an invalid IRQ.
- */
-#define	NUM_MSI_INTS	512
-#define	FIRST_MSI_INT	256
-#ifdef XENHVM
-#include <xen/xen-os.h>
-#define	NUM_EVTCHN_INTS	NR_EVENT_CHANNELS
-#define	FIRST_EVTCHN_INT \
-    (FIRST_MSI_INT + NUM_MSI_INTS)
-#define	LAST_EVTCHN_INT \
-    (FIRST_EVTCHN_INT + NUM_EVTCHN_INTS - 1)
-#elif defined(XEN)
-#include <xen/xen-os.h>
-#define	NUM_EVTCHN_INTS	NR_EVENT_CHANNELS
-#define	FIRST_EVTCHN_INT 0
-#define	LAST_EVTCHN_INT \
-    (FIRST_EVTCHN_INT + NUM_EVTCHN_INTS - 1)
-#else /* !XEN && !XENHVM */
-#define	NUM_EVTCHN_INTS	0
-#endif
-#define	NUM_IO_INTS	(FIRST_MSI_INT + NUM_MSI_INTS + NUM_EVTCHN_INTS)
-
-/*
- * Default base address for MSI messages on x86 platforms.
- */
-#define	MSI_INTEL_ADDR_BASE		0xfee00000
-
-/*
- * - 1 ??? dummy counter.
- * - 2 counters for each I/O interrupt.
- * - 1 counter for each CPU for lapic timer.
- * - 9 counters for each CPU for IPI counters for SMP.
- */
-#ifdef SMP
-#define	INTRCNT_COUNT	(1 + NUM_IO_INTS * 2 + (1 + 9) * MAXCPU)
-#else
-#define	INTRCNT_COUNT	(1 + NUM_IO_INTS * 2 + 1)
-#endif
-
-#ifndef LOCORE
-
-typedef void inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
-
-#define	IDTVEC(name)	__CONCAT(X,name)
-
-struct intsrc;
-
-/*
- * Methods that a PIC provides to mask/unmask a given interrupt source,
- * "turn on" the interrupt on the CPU side by setting up an IDT entry, and
- * return the vector associated with this source.
- */
-struct pic {
-	void (*pic_enable_source)(struct intsrc *);
-	void (*pic_disable_source)(struct intsrc *, int);
-	void (*pic_eoi_source)(struct intsrc *);
-	void (*pic_enable_intr)(struct intsrc *);
-	void (*pic_disable_intr)(struct intsrc *);
-	int (*pic_vector)(struct intsrc *);
-	int (*pic_source_pending)(struct intsrc *);
-	void (*pic_suspend)(struct pic *);
-	void (*pic_resume)(struct pic *, bool suspend_cancelled);
-	int (*pic_config_intr)(struct intsrc *, enum intr_trigger,
-	    enum intr_polarity);
-	int (*pic_assign_cpu)(struct intsrc *, u_int apic_id);
-	TAILQ_ENTRY(pic) pics;
-};
-
-/* Flags for pic_disable_source() */
-enum {
-	PIC_EOI,
-	PIC_NO_EOI,
-};
-
-/*
- * An interrupt source.  The upper-layer code uses the PIC methods to
- * control a given source.  The lower-layer PIC drivers can store additional
- * private data in a given interrupt source such as an interrupt pin number
- * or an I/O APIC pointer.
- */
-struct intsrc {
-	struct pic *is_pic;
-	struct intr_event *is_event;
-	u_long *is_count;
-	u_long *is_straycount;
-	u_int is_index;
-	u_int is_handlers;
-};
-
-struct trapframe;
-
-extern struct mtx icu_lock;
-extern int elcr_found;
-
-#ifndef DEV_ATPIC
-void	atpic_reset(void);
-#endif
-/* XXX: The elcr_* prototypes probably belong somewhere else. */
-int	elcr_probe(void);
-enum intr_trigger elcr_read_trigger(u_int irq);
-void	elcr_resume(void);
-void	elcr_write_trigger(u_int irq, enum intr_trigger trigger);
-#ifdef SMP
-void	intr_add_cpu(u_int cpu);
-#endif
-int	intr_add_handler(const char *name, int vector, driver_filter_t filter,
-    driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep);
-#ifdef SMP
-int	intr_bind(u_int vector, u_char cpu);
-#endif
-int	intr_config_intr(int vector, enum intr_trigger trig,
-    enum intr_polarity pol);
-int	intr_describe(u_int vector, void *ih, const char *descr);
-void	intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame);
-u_int	intr_next_cpu(void);
-struct intsrc *intr_lookup_source(int vector);
-int	intr_register_pic(struct pic *pic);
-int	intr_register_source(struct intsrc *isrc);
-int	intr_remove_handler(void *cookie);
-void	intr_resume(bool suspend_cancelled);
-void	intr_suspend(void);
-void	intrcnt_add(const char *name, u_long **countp);
-void	nexus_add_irq(u_long irq);
-int	msi_alloc(device_t dev, int count, int maxcount, int *irqs);
-void	msi_init(void);
-int	msi_map(int irq, uint64_t *addr, uint32_t *data);
-int	msi_release(int* irqs, int count);
-int	msix_alloc(device_t dev, int *irq);
-int	msix_release(int irq);
-
-#endif	/* !LOCORE */
-#endif	/* _KERNEL */
-#endif	/* !__MACHINE_INTR_MACHDEP_H__ */
diff --git a/include.new/machine/ioctl_bt848.h b/include.new/machine/ioctl_bt848.h
deleted file mode 100644
index 7b11228..0000000
--- a/include.new/machine/ioctl_bt848.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2003 David O'Brien
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/i386/include/ioctl_bt848.h 143063 2005-03-02 21:33:29Z joerg $
- */
-
-#ifndef	_MACHINE_IOCTL_BT848_H_
-#define	_MACHINE_IOCTL_BT848_H_
-
-#include <sys/cdefs.h>
-
-#ifdef __CC_SUPPORTS_WARNING
-#warning Include dev/bktr/ioctl_bt848.h instead of this header.
-#endif
-
-#include <dev/bktr/ioctl_bt848.h>
-
-#endif	/* _MACHINE_IOCTL_BT848_H_ */
diff --git a/include.new/machine/ioctl_meteor.h b/include.new/machine/ioctl_meteor.h
deleted file mode 100644
index a1caaa3..0000000
--- a/include.new/machine/ioctl_meteor.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2003 David O'Brien
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/i386/include/ioctl_meteor.h 143063 2005-03-02 21:33:29Z joerg $
- */
-
-#ifndef	_MACHINE_IOCTL_METEOR_H_
-#define	_MACHINE_IOCTL_METEOR_H_
-
-#include <sys/cdefs.h>
-
-#ifdef __CC_SUPPORTS_WARNING
-#warning Include dev/bktr/ioctl_meteor.h instead of this header.
-#endif
-
-#include <dev/bktr/ioctl_meteor.h>
-
-#endif	/* _MACHINE_IOCTL_METEOR_H_ */
diff --git a/include.new/machine/iodev.h b/include.new/machine/iodev.h
deleted file mode 100644
index 56eac52..0000000
--- a/include.new/machine/iodev.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2004 Mark R V Murray
- * 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
- *    in this position and unchanged.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 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: releng/10.2/sys/i386/include/iodev.h 207329 2010-04-28 15:38:01Z attilio $
- */
-#ifndef _MACHINE_IODEV_H_
-#define	_MACHINE_IODEV_H_
-
-#ifdef _KERNEL
-#include <machine/cpufunc.h>
-
-#define	iodev_read_1	inb
-#define	iodev_read_2	inw
-#define	iodev_read_4	inl
-#define	iodev_write_1	outb
-#define	iodev_write_2	outw
-#define	iodev_write_4	outl
-
-int	 iodev_open(struct thread *td);
-int	 iodev_close(struct thread *td);
-int	 iodev_ioctl(u_long cmd, caddr_t data);
-
-#endif /* _KERNEL */
-#endif /* _MACHINE_IODEV_H_ */
diff --git a/include.new/machine/kdb.h b/include.new/machine/kdb.h
deleted file mode 100644
index b7d5c4e..0000000
--- a/include.new/machine/kdb.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2004 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/i386/include/kdb.h 170473 2007-06-09 21:55:17Z marcel $
- */
-
-#ifndef _MACHINE_KDB_H_
-#define _MACHINE_KDB_H_
-
-#include <machine/frame.h>
-#include <machine/psl.h>
-
-#define	KDB_STOPPEDPCB(pc)	&stoppcbs[pc->pc_cpuid]
-
-static __inline void
-kdb_cpu_clear_singlestep(void)
-{
-	kdb_frame->tf_eflags &= ~PSL_T;
-}
-
-static __inline void
-kdb_cpu_set_singlestep(void)
-{
-	kdb_frame->tf_eflags |= PSL_T;
-}
-
-static __inline void
-kdb_cpu_sync_icache(unsigned char *addr, size_t size)
-{
-}
-
-static __inline void
-kdb_cpu_trap(int type, int code)
-{
-}
-
-#endif /* _MACHINE_KDB_H_ */
diff --git a/include.new/machine/legacyvar.h b/include.new/machine/legacyvar.h
deleted file mode 100644
index 8d51d3b..0000000
--- a/include.new/machine/legacyvar.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- *
- * 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/i386/include/legacyvar.h,v 1.6.2.1 2005/09/18 02:55:10 imp Exp $
- */
-
-#ifndef _MACHINE_LEGACYVAR_H_
-#define	_MACHINE_LEGACYVAR_H_
-
-enum legacy_device_ivars {
-	LEGACY_IVAR_PCIBUS
-};
-
-#define LEGACY_ACCESSOR(var, ivar, type)				\
-    __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type)
-
-LEGACY_ACCESSOR(pcibus,			PCIBUS,		uint32_t)
-
-#undef LEGACY_ACCESSOR
-
-int	legacy_pcib_maxslots(device_t dev);
-uint32_t legacy_pcib_read_config(device_t dev, int bus, int slot, int func,
-    int reg, int bytes);
-int	legacy_pcib_read_ivar(device_t dev, device_t child, int which,
-    uintptr_t *result);
-void	legacy_pcib_write_config(device_t dev, int bus, int slot, int func,
-    int reg, uint32_t data, int bytes);
-int	legacy_pcib_write_ivar(device_t dev, device_t child, int which,
-    uintptr_t value);
-struct resource *legacy_pcib_alloc_resource(device_t dev, device_t child,
-    int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
-
-#endif /* !_MACHINE_LEGACYVAR_H_ */
diff --git a/include.new/machine/limits.h b/include.new/machine/limits.h
deleted file mode 100644
index a465dde..0000000
--- a/include.new/machine/limits.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 1988, 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.
- * 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.
- *
- *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD: releng/10.2/sys/i386/include/limits.h 143063 2005-03-02 21:33:29Z joerg $
- */
-
-#ifndef _MACHINE_LIMITS_H_
-#define	_MACHINE_LIMITS_H_
-
-#include <sys/cdefs.h>
-
-#ifdef __CC_SUPPORTS_WARNING
-#warning "machine/limits.h is deprecated.  Include sys/limits.h instead."
-#endif
-
-#include <sys/limits.h>
-
-#endif /* !_MACHINE_LIMITS_H_ */
diff --git a/include.new/machine/md_var.h b/include.new/machine/md_var.h
deleted file mode 100644
index 9989fe1..0000000
--- a/include.new/machine/md_var.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * Copyright (c) 1995 Bruce D. Evans.
- * 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. Neither the name of the author nor the names of contributors
- *    may 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: releng/10.2/sys/i386/include/md_var.h 284338 2015-06-13 07:31:50Z kib $
- */
-
-#ifndef _MACHINE_MD_VAR_H_
-#define	_MACHINE_MD_VAR_H_
-
-/*
- * Miscellaneous machine-dependent declarations.
- */
-
-extern	long	Maxmem;
-extern	u_int	basemem;	/* PA of original top of base memory */
-extern	int	busdma_swi_pending;
-extern	u_int	cpu_exthigh;
-extern	u_int	cpu_feature;
-extern	u_int	cpu_feature2;
-extern	u_int	amd_feature;
-extern	u_int	amd_feature2;
-extern	u_int	amd_pminfo;
-extern	u_int	via_feature_rng;
-extern	u_int	via_feature_xcrypt;
-extern	u_int	cpu_clflush_line_size;
-extern	u_int	cpu_stdext_feature;
-extern	u_int	cpu_stdext_feature2;
-extern	u_int	cpu_fxsr;
-extern	u_int	cpu_high;
-extern	u_int	cpu_id;
-extern	u_int	cpu_max_ext_state_size;
-extern	u_int	cpu_mxcsr_mask;
-extern	u_int	cpu_procinfo;
-extern	u_int	cpu_procinfo2;
-extern	char	cpu_vendor[];
-extern	u_int	cpu_vendor_id;
-extern	u_int	cpu_mon_mwait_flags;
-extern	u_int	cpu_mon_min_size;
-extern	u_int	cpu_mon_max_size;
-extern	u_int	cpu_maxphyaddr;
-extern	u_int	cyrix_did;
-#if defined(I586_CPU) && !defined(NO_F00F_HACK)
-extern	int	has_f00f_bug;
-#endif
-extern	u_int	hv_high;
-extern	char	hv_vendor[];
-extern	char	kstack[];
-extern	char	sigcode[];
-extern	int	szsigcode;
-#ifdef COMPAT_FREEBSD4
-extern	int	szfreebsd4_sigcode;
-#endif
-#ifdef COMPAT_43
-extern	int	szosigcode;
-#endif
-extern	uint32_t *vm_page_dump;
-extern	int	vm_page_dump_size;
-extern	int	workaround_erratum383;
-extern	int	_udatasel;
-extern	int	_ucodesel;
-extern	int	use_xsave;
-extern	uint64_t xsave_mask;
-
-typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
-struct	pcb;
-union	savefpu;
-struct	thread;
-struct	reg;
-struct	fpreg;
-struct  dbreg;
-struct	dumperinfo;
-
-void	*alloc_fpusave(int flags);
-void	bcopyb(const void *from, void *to, size_t len);
-void	busdma_swi(void);
-void	cpu_setregs(void);
-void	cpu_switch_load_gs(void) __asm(__STRING(cpu_switch_load_gs));
-void	doreti_iret(void) __asm(__STRING(doreti_iret));
-void	doreti_iret_fault(void) __asm(__STRING(doreti_iret_fault));
-void	doreti_popl_ds(void) __asm(__STRING(doreti_popl_ds));
-void	doreti_popl_ds_fault(void) __asm(__STRING(doreti_popl_ds_fault));
-void	doreti_popl_es(void) __asm(__STRING(doreti_popl_es));
-void	doreti_popl_es_fault(void) __asm(__STRING(doreti_popl_es_fault));
-void	doreti_popl_fs(void) __asm(__STRING(doreti_popl_fs));
-void	doreti_popl_fs_fault(void) __asm(__STRING(doreti_popl_fs_fault));
-void	dump_add_page(vm_paddr_t);
-void	dump_drop_page(vm_paddr_t);
-void	finishidentcpu(void);
-void	fillw(int /*u_short*/ pat, void *base, size_t cnt);
-void	initializecpu(void);
-void	initializecpucache(void);
-void	i686_pagezero(void *addr);
-void	sse2_pagezero(void *addr);
-void	init_AMD_Elan_sc520(void);
-int	is_physical_memory(vm_paddr_t addr);
-int	isa_nmi(int cd);
-vm_paddr_t kvtop(void *addr);
-void	panicifcpuunsupported(void);
-void	ppro_reenable_apic(void);
-void	printcpuinfo(void);
-void	setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec);
-int     user_dbreg_trap(void);
-void	minidumpsys(struct dumperinfo *);
-union savefpu *get_pcb_user_save_td(struct thread *td);
-union savefpu *get_pcb_user_save_pcb(struct pcb *pcb);
-struct pcb *get_pcb_td(struct thread *td);
-
-#endif /* !_MACHINE_MD_VAR_H_ */
diff --git a/include.new/machine/memdev.h b/include.new/machine/memdev.h
deleted file mode 100644
index ee6203d..0000000
--- a/include.new/machine/memdev.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2004 Mark R V Murray
- * 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
- *    in this position and unchanged.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 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: releng/10.2/sys/i386/include/memdev.h 217515 2011-01-17 22:58:28Z jkim $
- */
-
-#ifndef _MACHINE_MEMDEV_H_
-#define	_MACHINE_MEMDEV_H_
-
-#define	CDEV_MINOR_MEM	0
-#define	CDEV_MINOR_KMEM	1
-
-d_open_t	memopen;
-d_read_t	memrw;
-d_ioctl_t	memioctl;
-d_mmap_t	memmmap;
-
-#endif /* _MACHINE_MEMDEV_H_ */
diff --git a/include.new/machine/metadata.h b/include.new/machine/metadata.h
deleted file mode 100644
index 34cd589..0000000
--- a/include.new/machine/metadata.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2003 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.
- *
- * 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: releng/10.2/sys/i386/include/metadata.h 250840 2013-05-21 03:05:49Z marcel $
- */
-
-#ifndef _MACHINE_METADATA_H_
-#define	_MACHINE_METADATA_H_
-
-#define	MODINFOMD_SMAP		0x1001
-#define	MODINFOMD_SMAP_XATTR	0x1002
-#define	MODINFOMD_DTBP		0x1003
-
-#endif /* !_MACHINE_METADATA_H_ */
diff --git a/include.new/machine/minidump.h b/include.new/machine/minidump.h
deleted file mode 100644
index a1d069a..0000000
--- a/include.new/machine/minidump.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2006 Peter Wemm
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/i386/include/minidump.h 157909 2006-04-21 04:28:43Z peter $
- */
-
-#ifndef	_MACHINE_MINIDUMP_H_
-#define	_MACHINE_MINIDUMP_H_ 1
-
-#define	MINIDUMP_MAGIC		"minidump FreeBSD/i386"
-#define	MINIDUMP_VERSION	1
-
-struct minidumphdr {
-	char magic[24];
-	uint32_t version;
-	uint32_t msgbufsize;
-	uint32_t bitmapsize;
-	uint32_t ptesize;
-	uint32_t kernbase;
-	uint32_t paemode;
-};
-
-#endif /* _MACHINE_MINIDUMP_H_ */
diff --git a/include.new/machine/mp_watchdog.h b/include.new/machine/mp_watchdog.h
deleted file mode 100644
index 3021a88..0000000
--- a/include.new/machine/mp_watchdog.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * Copyright (c) 2004 Robert N. M. Watson
- * 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.
- *
- * 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: releng/10.2/sys/i386/include/mp_watchdog.h 133759 2004-08-15 18:02:09Z rwatson $
- */
-
-#ifndef	_MACHINE_MP_WATCHDOG_H_
-#define	_MACHINE_MP_WATCHDOG_H_
-
-void	ap_watchdog(u_int cpuid);
-
-#endif /* !_MACHINE_MP_WATCHDOG_H_ */
diff --git a/include.new/machine/mptable.h b/include.new/machine/mptable.h
deleted file mode 100644
index 741597a..0000000
--- a/include.new/machine/mptable.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 1996, by Steve Passe
- * 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. The name of the developer 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/i386/include/mptable.h,v 1.222.2.1 2006/03/01 05:57:15 sam Exp $
- */
-
-#ifndef __MACHINE_MPTABLE_H__
-#define	__MACHINE_MPTABLE_H__
-
-enum busTypes {
-    NOBUS = 0,
-    EISA = 3,
-    ISA = 6,
-    MCA = 9,
-    PCI = 13,
-    MAX_BUSTYPE = 18,
-    UNKNOWN_BUSTYPE = 0xff
-};
-
-/* MP Floating Pointer Structure */
-typedef struct MPFPS {
-	char    signature[4];
-	uint32_t pap;
-	u_char  length;
-	u_char  spec_rev;
-	u_char  checksum;
-	u_char  config_type;
-	u_char  mpfb2;
-	u_char  mpfb3;
-	u_char  mpfb4;
-	u_char  mpfb5;
-}      *mpfps_t;
-
-#define	MPFB2_IMCR_PRESENT	0x80
-#define	MPFB2_MUL_CLK_SRCS	0x40
-
-/* MP Configuration Table Header */
-typedef struct MPCTH {
-	char    signature[4];
-	u_short base_table_length;
-	u_char  spec_rev;
-	u_char  checksum;
-	u_char  oem_id[8];
-	u_char  product_id[12];
-	uint32_t oem_table_pointer;
-	u_short oem_table_size;
-	u_short entry_count;
-	uint32_t apic_address;
-	u_short extended_table_length;
-	u_char  extended_table_checksum;
-	u_char  reserved;
-}      *mpcth_t;
-
-#define	MPCT_ENTRY_PROCESSOR	0
-#define	MPCT_ENTRY_BUS		1
-#define	MPCT_ENTRY_IOAPIC	2
-#define	MPCT_ENTRY_INT		3
-#define	MPCT_ENTRY_LOCAL_INT	4
-
-typedef struct PROCENTRY {
-	u_char  type;
-	u_char  apic_id;
-	u_char  apic_version;
-	u_char  cpu_flags;
-	u_long  cpu_signature;
-	u_long  feature_flags;
-	u_long  reserved1;
-	u_long  reserved2;
-}      *proc_entry_ptr;
-
-#define PROCENTRY_FLAG_EN	0x01
-#define PROCENTRY_FLAG_BP	0x02
-
-typedef struct BUSENTRY {
-	u_char  type;
-	u_char  bus_id;
-	char    bus_type[6];
-}      *bus_entry_ptr;
-
-typedef struct IOAPICENTRY {
-	u_char  type;
-	u_char  apic_id;
-	u_char  apic_version;
-	u_char  apic_flags;
-	uint32_t apic_address;
-}      *io_apic_entry_ptr;
-
-#define IOAPICENTRY_FLAG_EN	0x01
-
-typedef struct INTENTRY {
-	u_char  type;
-	u_char  int_type;
-	u_short int_flags;
-	u_char  src_bus_id;
-	u_char  src_bus_irq;
-	u_char  dst_apic_id;
-	u_char  dst_apic_int;
-}      *int_entry_ptr;
-
-#define	INTENTRY_TYPE_INT  	0
-#define	INTENTRY_TYPE_NMI	1
-#define	INTENTRY_TYPE_SMI	2
-#define	INTENTRY_TYPE_EXTINT	3
-
-#define	INTENTRY_FLAGS_POLARITY			0x3
-#define	INTENTRY_FLAGS_POLARITY_CONFORM		0x0
-#define	INTENTRY_FLAGS_POLARITY_ACTIVEHI	0x1
-#define	INTENTRY_FLAGS_POLARITY_ACTIVELO	0x3
-#define	INTENTRY_FLAGS_TRIGGER			0xc
-#define	INTENTRY_FLAGS_TRIGGER_CONFORM		0x0
-#define	INTENTRY_FLAGS_TRIGGER_EDGE		0x4
-#define	INTENTRY_FLAGS_TRIGGER_LEVEL		0xc
-
-/* descriptions of MP basetable entries */
-typedef struct BASETABLE_ENTRY {
-	u_char  type;
-	u_char  length;
-	char    name[16];
-}       basetable_entry;
-
-#ifdef _KERNEL
-int	mptable_pci_probe_table(int bus);
-int	mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin);
-#endif
-#endif /* !__MACHINE_MPTABLE_H__ */
diff --git a/include.new/machine/mutex.h b/include.new/machine/mutex.h
deleted file mode 100644
index 5267d22..0000000
--- a/include.new/machine/mutex.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1997 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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.
- *
- *	from BSDI $Id: mutex.h 89 2016-01-12 00:20:40Z reddawg $
- * $FreeBSD: src/sys/i386/include/mutex.h,v 1.36 2002/03/28 15:14:23 jhb Exp $
- */
-
-#ifndef _MACHINE_MUTEX_H_
-#define _MACHINE_MUTEX_H_
-
-#ifndef LOCORE
-
-#ifdef _KERNEL
-
-/* Global locks */
-extern struct mtx	clock_lock;
-
-#endif	/* _KERNEL */
-
-#else	/* !LOCORE */
-
-/*
- * Simple assembly macros to get and release mutexes.
- *
- * Note: All of these macros accept a "flags" argument and are analoguous
- *	 to the mtx_lock_flags and mtx_unlock_flags general macros. If one
- *	 desires to not pass a flag, the value 0 may be passed as second
- *	 argument.
- *
- * XXX: We only have MTX_LOCK_SPIN and MTX_UNLOCK_SPIN for now, since that's
- *	all we use right now. We should add MTX_LOCK and MTX_UNLOCK (for sleep
- *	locks) in the near future, however.
- */
-#define MTX_LOCK_SPIN(lck, flags)					\
-	pushl $0 ;							\
-	pushl $0 ;							\
-	pushl $flags ;							\
-	pushl $lck ;							\
-	call _mtx_lock_spin_flags ;					\
-	addl $0x10, %esp ;						\
-
-#define MTX_UNLOCK_SPIN(lck)						\
-	pushl $0 ;							\
-	pushl $0 ;							\
-	pushl $0 ;							\
-	pushl $lck ;							\
-	call _mtx_unlock_spin_flags ;					\
-	addl $0x10, %esp ;						\
-
-#endif	/* !LOCORE */
-#endif	/* __MACHINE_MUTEX_H */
diff --git a/include.new/machine/nexusvar.h b/include.new/machine/nexusvar.h
deleted file mode 100644
index b5f90c2..0000000
--- a/include.new/machine/nexusvar.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright 1998 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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: releng/10.2/sys/i386/include/nexusvar.h 177157 2008-03-13 20:39:04Z jhb $
- */
-
-#ifndef _MACHINE_NEXUSVAR_H_
-#define	_MACHINE_NEXUSVAR_H_
-
-struct nexus_device {
-	struct resource_list	nx_resources;
-};
-
-DECLARE_CLASS(nexus_driver);
-
-extern struct rman irq_rman, drq_rman, port_rman, mem_rman;
-
-void	nexus_init_resources(void);
-
-#endif /* !_MACHINE_NEXUSVAR_H_ */
diff --git a/include.new/machine/npx.h b/include.new/machine/npx.h
deleted file mode 100644
index 4f0f9eb..0000000
--- a/include.new/machine/npx.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD: releng/10.2/sys/i386/include/npx.h 276084 2014-12-22 21:32:39Z jhb $
- */
-
-/*
- * 287/387 NPX Coprocessor Data Structures and Constants
- * W. Jolitz 1/90
- */
-
-#ifndef _MACHINE_NPX_H_
-#define	_MACHINE_NPX_H_
-
-#include <x86/fpu.h>
-
-#ifdef _KERNEL
-
-struct fpu_kern_ctx;
-
-#define	PCB_USER_FPU(pcb) (((pcb)->pcb_flags & PCB_KERNNPX) == 0)
-
-#define	XSAVE_AREA_ALIGN	64
-
-int	npxdna(void);
-void	npxdrop(void);
-void	npxexit(struct thread *td);
-int	npxformat(void);
-int	npxgetregs(struct thread *td);
-void	npxinit(bool bsp);
-void	npxresume(union savefpu *addr);
-void	npxsave(union savefpu *addr);
-int	npxsetregs(struct thread *td, union savefpu *addr,
-	    char *xfpustate, size_t xfpustate_size);
-int	npxsetxstate(struct thread *td, char *xfpustate,
-	    size_t xfpustate_size);
-void	npxsuspend(union savefpu *addr);
-int	npxtrap_x87(void);
-int	npxtrap_sse(void);
-void	npxuserinited(struct thread *);
-struct fpu_kern_ctx *fpu_kern_alloc_ctx(u_int flags);
-void	fpu_kern_free_ctx(struct fpu_kern_ctx *ctx);
-int	fpu_kern_enter(struct thread *td, struct fpu_kern_ctx *ctx,
-	    u_int flags);
-int	fpu_kern_leave(struct thread *td, struct fpu_kern_ctx *ctx);
-int	fpu_kern_thread(u_int flags);
-int	is_fpu_kern_thread(u_int flags);
-
-union savefpu	*fpu_save_area_alloc(void);
-void	fpu_save_area_free(union savefpu *fsa);
-void	fpu_save_area_reset(union savefpu *fsa);
-
-/*
- * Flags for fpu_kern_alloc_ctx(), fpu_kern_enter() and fpu_kern_thread().
- */
-#define	FPU_KERN_NORMAL	0x0000
-#define	FPU_KERN_NOWAIT	0x0001
-#define	FPU_KERN_KTHR	0x0002
-
-#endif
-
-#endif /* !_MACHINE_NPX_H_ */
diff --git a/include.new/machine/ofw_machdep.h b/include.new/machine/ofw_machdep.h
deleted file mode 100644
index 429437d..0000000
--- a/include.new/machine/ofw_machdep.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/ofw_machdep.h 250840 2013-05-21 03:05:49Z marcel $ */
-
-#include <x86/ofw_machdep.h>
diff --git a/include.new/machine/param.h b/include.new/machine/param.h
deleted file mode 100644
index a516e88..0000000
--- a/include.new/machine/param.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD: releng/10.2/sys/i386/include/param.h 282065 2015-04-27 08:02:12Z kib $
- */
-
-
-#ifndef _I386_INCLUDE_PARAM_H_
-#define	_I386_INCLUDE_PARAM_H_
-
-#include <machine/_align.h>
-
-/*
- * Machine dependent constants for Intel 386.
- */
-
-
-#define __HAVE_ACPI
-#define	__HAVE_PIR
-#define __PCI_REROUTE_INTERRUPT
-
-#ifndef MACHINE
-#define MACHINE		"i386"
-#endif
-#ifndef MACHINE_ARCH
-#define	MACHINE_ARCH	"i386"
-#endif
-#define MID_MACHINE	MID_I386
-
-#if defined(SMP) || defined(KLD_MODULE)
-#ifndef MAXCPU
-#define MAXCPU		32
-#endif
-#else
-#define MAXCPU		1
-#endif /* SMP || KLD_MODULE */
-
-#ifndef MAXMEMDOM
-#define	MAXMEMDOM	1
-#endif
-
-#define ALIGNBYTES	_ALIGNBYTES
-#define ALIGN(p)	_ALIGN(p)
-/*
- * ALIGNED_POINTER is a boolean macro that checks whether an address
- * is valid to fetch data elements of type t from on this architecture.
- * This does not reflect the optimal alignment, just the possibility
- * (within reasonable limits). 
- */
-#define	ALIGNED_POINTER(p, t)	1
-
-/*
- * CACHE_LINE_SIZE is the compile-time maximum cache line size for an
- * architecture.  It should be used with appropriate caution.
- */
-#define	CACHE_LINE_SHIFT	7
-#define	CACHE_LINE_SIZE		(1 << CACHE_LINE_SHIFT)
-
-#define PAGE_SHIFT	12		/* LOG2(PAGE_SIZE) */
-#define PAGE_SIZE	(1<<PAGE_SHIFT)	/* bytes/page */
-#define PAGE_MASK	(PAGE_SIZE-1)
-#define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
-
-#if defined(PAE) || defined(PAE_TABLES)
-#define NPGPTD		4
-#define PDRSHIFT	21		/* LOG2(NBPDR) */
-#define NPGPTD_SHIFT	9
-#else
-#define NPGPTD		1
-#define PDRSHIFT	22		/* LOG2(NBPDR) */
-#define NPGPTD_SHIFT	10
-#endif
-
-#define NBPTD		(NPGPTD<<PAGE_SHIFT)
-#define NPDEPTD		(NBPTD/(sizeof (pd_entry_t)))
-#define NPDEPG		(PAGE_SIZE/(sizeof (pd_entry_t)))
-#define NBPDR		(1<<PDRSHIFT)	/* bytes/page dir */
-#define PDRMASK		(NBPDR-1)
-
-#define	MAXPAGESIZES	2	/* maximum number of supported page sizes */
-
-#define IOPAGES	2		/* pages of i/o permission bitmap */
-
-#ifndef KSTACK_PAGES
-#define KSTACK_PAGES 2		/* Includes pcb! */
-#endif
-#define KSTACK_GUARD_PAGES 1	/* pages of kstack guard; 0 disables */
-
-/*
- * Ceiling on amount of swblock kva space, can be changed via
- * the kern.maxswzone /boot/loader.conf variable.
- *
- * 276 is sizeof(struct swblock), but we do not always have a definition
- * in scope for struct swblock, so we have to hardcode it.  Each struct
- * swblock holds metadata for 32 pages, so in theory, this is enough for
- * 16 GB of swap.  In practice, however, the usable amount is considerably
- * lower due to fragmentation.
- */
-#ifndef VM_SWZONE_SIZE_MAX
-#define VM_SWZONE_SIZE_MAX	(276 * 128 * 1024)
-#endif
-
-/*
- * Ceiling on size of buffer cache (really only effects write queueing,
- * the VM page cache is not effected), can be changed via
- * the kern.maxbcache /boot/loader.conf variable.
- *
- * The value is equal to the size of the auto-tuned buffer map for
- * the machine with 4GB of RAM, see vfs_bio.c:kern_vfs_bio_buffer_alloc().
- */
-#ifndef VM_BCACHE_SIZE_MAX
-#define VM_BCACHE_SIZE_MAX	(7224 * 16 * 1024)
-#endif
-
-/*
- * Mach derived conversion macros
- */
-#define trunc_page(x)		((x) & ~PAGE_MASK)
-#define round_page(x)		(((x) + PAGE_MASK) & ~PAGE_MASK)
-#define trunc_4mpage(x)		((x) & ~PDRMASK)
-#define round_4mpage(x)		((((x)) + PDRMASK) & ~PDRMASK)
-
-#define atop(x)			((x) >> PAGE_SHIFT)
-#define ptoa(x)			((x) << PAGE_SHIFT)
-
-#define i386_btop(x)		((x) >> PAGE_SHIFT)
-#define i386_ptob(x)		((x) << PAGE_SHIFT)
-
-#define	pgtok(x)		((x) * (PAGE_SIZE / 1024))
-
-#endif /* !_I386_INCLUDE_PARAM_H_ */
diff --git a/include.new/machine/pc/bios.h b/include.new/machine/pc/bios.h
deleted file mode 100644
index 7939085..0000000
--- a/include.new/machine/pc/bios.h
+++ /dev/null
@@ -1,350 +0,0 @@
-/*-
- * Copyright (c) 1997 Michael Smith
- * Copyright (c) 1998 Jonathan Lemon
- * 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.
- *
- * 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: releng/10.2/sys/i386/include/pc/bios.h 272913 2014-10-10 20:47:23Z jhb $
- */
-
-#ifndef _MACHINE_PC_BIOS_H_
-#define _MACHINE_PC_BIOS_H_
-
-/* 
- * Signature structure for the BIOS32 Service Directory header 
- */
-struct bios32_SDheader 
-{
-    u_int8_t	sig[4];
-    uint32_t	entry;
-    u_int8_t	revision;
-    u_int8_t	len;
-    u_int8_t	cksum;
-    u_int8_t	pad[5];
-};
-
-/* 
- * PnP BIOS presence structure
- */
-struct PnPBIOS_table 
-{
-    u_int8_t	sig[4];			/* "$PnP */
-    u_int8_t	version;		/* should be 0x10 */
-    u_int8_t	len;    		/* total structure length */
-    u_int16_t	control;		/* BIOS feature flags */
-    u_int8_t	cksum;			/* checksum */
-    uint32_t	evflagaddr;		/* address of event notificaton flag */
-    u_int16_t	rmentryoffset;		/* real-mode entry offset */
-    u_int16_t	rmentryseg;		/*                 segment */
-    u_int16_t	pmentryoffset;		/* protected-mode entry offset */
-    uint32_t	pmentrybase;		/*                segment base */
-    uint32_t	oemdevid;		/* motherboard EISA ID */
-    u_int16_t	rmbiosseg;		/* real-mode BIOS segment */
-    uint32_t	pmdataseg;		/* protected-mode data segment */
-} __packed;
-
-/*
- * PnP BIOS return codes
- */
-#define PNP_SUCCESS				0x00
-#define PNP_NOT_SET_STATICALLY			0x7f
-#define PNP_UNKNOWN_FUNCTION			0x81
-#define PNP_FUNCTION_NOT_SUPPORTED		0x82
-#define PNP_INVALID_HANDLE			0x83
-#define PNP_BAD_PARAMETER			0x84
-#define PNP_SET_FAILED				0x85
-#define PNP_EVENTS_NOT_PENDING			0x86
-#define PNP_SYSTEM_NOT_DOCKED			0x87
-#define PNP_NO_ISA_PNP_CARDS			0x88
-#define PNP_UNABLE_TO_DETERMINE_DOCK_CAPABILITIES 0x89
-#define PNP_CONFIG_CHANGE_FAILED_NO_BATTERY	0x8a
-#define PNP_CONFIG_CHANGE_FAILED_RESOURCE_CONFLICT 0x8b
-#define PNP_BUFFER_TOO_SMALL			0x8c
-#define PNP_USE_ESCD_SUPPORT			0x8d
-#define PNP_MESSAGE_NOT_SUPPORTED		0x8e
-#define PNP_HARDWARE_ERROR			0x8f
-
-/*
- * DMI return codes
- */
-#define DMI_SUCCESS				0x00
-#define DMI_UNKNOWN_FUNCTION			0x81
-#define DMI_FUNCTION_NOT_SUPPORTED		0x82
-#define DMI_INVALID_HANDLE			0x83
-#define DMI_BAD_PARAMETER			0x84
-#define DMI_INVALID_SUBFUNCTION			0x85
-#define DMI_NO_CHANGE				0x86
-#define DMI_ADD_STRUCTURE_FAILED		0x87
-#define DMI_READ_ONLY				0x8d
-#define DMI_LOCK_NOT_SUPPORTED			0x90
-#define DMI_CURRENTLY_LOCKED			0x91
-#define DMI_INVALID_LOCK			0x92
-
-/*
- * format specifiers and defines for bios16()
- *     s	= short (16 bits)
- *     i	= int (32 bits)
- *     p	= pointer (converted to seg:offset)
- *     C,D,U 	= selector (corresponding to code/data/utility segment)
- */
-#define PNP_COUNT_DEVNODES	"sppD",		0x00
-#define PNP_GET_DEVNODE		"sppsD",	0x01
-#define PNP_SET_DEVNODE		"sspsD",	0x02
-#define PNP_GET_EVENT		"spD",		0x03
-#define PNP_SEND_MSG		"ssD",		0x04
-#define PNP_GET_DOCK_INFO	"spD",		0x05
-
-#define PNP_SEL_PRIBOOT		"ssiiisspD",	0x07
-#define PNP_GET_PRIBOOT		"sspppppD",	0x08
-#define PNP_SET_RESINFO		"spD",		0x09
-#define PNP_GET_RESINFO		"spD",		0x0A
-#define PNP_GET_APM_ID		"sppD",		0x0B
-
-#define PNP_GET_ISA_INFO	"spD",		0x40
-#define PNP_GET_ECSD_INFO	"spppD",	0x41
-#define PNP_READ_ESCD		"spUD",		0x42
-#define PNP_WRITE_ESCD		"spUD",		0x43
-
-#define PNP_GET_DMI_INFO	"spppppD",	0x50
-#define PNP_GET_DMI_STRUCTURE	"sppUD",	0x51
-#define PNP_SET_DMI_STRUCTURE	"sppsUD"	0x52
-#define PNP_GET_DMI_CHANGE	"spUD"		0x53
-#define PNP_DMI_CONTROL		"sspsUD"	0x54
-#define PNP_GET_GPNV_INFO	"sppppD"	0x55
-#define PNP_READ_GPNV_DATA	"ssppUD"	0x56
-#define PNP_WRITE_GPNV_DATA	"sspsUD"	0x57
-
-#define PNP_BOOT_CHECK		"sp",		0x60
-#define PNP_COUNT_IPL		"sppp",		0x61
-#define PNP_GET_BOOTPRI		"spp",		0x62
-#define PNP_SET_BOOTPRI		"sp",		0x63
-#define PNP_GET_LASTBOOT	"sp",		0x64
-#define PNP_GET_BOOTFIRST	"sp",		0x65
-#define PNP_SET_BOOTFIRST	"sp",		0x66
-
-/*
- * PCI BIOS functions
- */
-#define PCIBIOS_BIOS_PRESENT		0xb101
-#define PCIBIOS_READ_CONFIG_BYTE	0xb108
-#define PCIBIOS_READ_CONFIG_WORD	0xb109
-#define PCIBIOS_READ_CONFIG_DWORD	0xb10a
-#define PCIBIOS_WRITE_CONFIG_BYTE	0xb10b
-#define PCIBIOS_WRITE_CONFIG_WORD	0xb10c
-#define PCIBIOS_WRITE_CONFIG_DWORD	0xb10d
-#define PCIBIOS_GET_IRQ_ROUTING		0xb10e
-#define PCIBIOS_ROUTE_INTERRUPT		0xb10f
-
-/*
- * PCI interrupt routing table.
- *
- * $PIR in the BIOS segment contains a PIR_table
- * int 1a:b106 returns PIR_table in buffer at es:(e)di 
- * int 1a:b18e returns PIR_table in buffer at es:(e)di 
- * int 1a:b406 returns es:di pointing to the BIOS PIR_table
- */
-struct PIR_header 
-{
-    int8_t	ph_signature[4];
-    u_int16_t	ph_version;
-    u_int16_t	ph_length;
-    u_int8_t	ph_router_bus;
-    u_int8_t	ph_router_dev_fn;
-    u_int16_t	ph_pci_irqs;
-    u_int16_t	ph_router_vendor;
-    u_int16_t	ph_router_device;
-    uint32_t	ph_miniport;
-    u_int8_t	ph_res[11];
-    u_int8_t	ph_checksum;
-} __packed;
-
-struct PIR_intpin 
-{
-    u_int8_t	link;
-    u_int16_t	irqs;
-} __packed;
-
-struct PIR_entry
-{
-    u_int8_t		pe_bus;
-    u_int8_t		pe_res1:3;
-    u_int8_t		pe_device:5;
-    struct PIR_intpin	pe_intpin[4];
-    u_int8_t	pe_slot;
-    u_int8_t	pe_res3;
-} __packed;
-
-struct PIR_table 
-{
-    struct PIR_header	pt_header;
-    struct PIR_entry	pt_entry[0];
-} __packed;
-
-/*
- * Int 15:E820 'SMAP' structure
- */
-#define SMAP_SIG	0x534D4150			/* 'SMAP' */
-
-#define	SMAP_TYPE_MEMORY	1
-#define	SMAP_TYPE_RESERVED	2
-#define	SMAP_TYPE_ACPI_RECLAIM	3
-#define	SMAP_TYPE_ACPI_NVS	4
-#define	SMAP_TYPE_ACPI_ERROR	5
-
-#define	SMAP_XATTR_ENABLED	0x00000001
-#define	SMAP_XATTR_NON_VOLATILE	0x00000002
-#define	SMAP_XATTR_MASK		(SMAP_XATTR_ENABLED | SMAP_XATTR_NON_VOLATILE)
-
-struct bios_smap {
-    u_int64_t	base;
-    u_int64_t	length;
-    uint32_t	type;
-} __packed;
-
-/* Structure extended to include extended attribute field in ACPI 3.0. */
-struct bios_smap_xattr {
-    u_int64_t	base;
-    u_int64_t	length;
-    uint32_t	type;
-    uint32_t	xattr;
-} __packed;
-
-/*
- * System Management BIOS
- */
-#define	SMBIOS_START	0xf0000
-#define	SMBIOS_STEP	0x10
-#define	SMBIOS_OFF	0
-#define	SMBIOS_LEN	4
-#define	SMBIOS_SIG	"_SM_"
-
-struct smbios_eps {
-	uint8_t		anchor_string[4];		/* '_SM_' */
-	uint8_t		checksum;
-	uint8_t		length;
-	uint8_t		major_version;
-	uint8_t		minor_version;
-	uint16_t	maximum_structure_size;
-	uint8_t		entry_point_revision;
-	uint8_t		formatted_area[5];
-	uint8_t		intermediate_anchor_string[5];	/* '_DMI_' */
-	uint8_t		intermediate_checksum;
-	uint16_t	structure_table_length;
-	uint32_t	structure_table_address;
-	uint16_t	number_structures;
-	uint8_t		BCD_revision;
-};
-
-struct smbios_structure_header {
-	uint8_t		type;
-	uint8_t		length;
-	uint16_t	handle;
-};
-
-#ifdef _KERNEL
-#define BIOS_PADDRTOVADDR(x)	((x) + KERNBASE)
-#define BIOS_VADDRTOPADDR(x)	((x) - KERNBASE)
-
-struct bios_oem_signature {
-	char * anchor;		/* search anchor string in BIOS memory */
-	size_t offset;		/* offset from anchor (may be negative) */
-	size_t totlen;		/* total length of BIOS string to copy */
-} __packed;
-
-struct bios_oem_range {
-	u_int from;		/* shouldn't be below 0xe0000 */
-	u_int to;		/* shouldn't be above 0xfffff */
-} __packed;
-
-struct bios_oem {
-	struct bios_oem_range range;
-	struct bios_oem_signature signature[];
-} __packed;
-
-struct segment_info {
-	u_int	base;
-	u_int	limit;
-};
-
-#define BIOSCODE_FLAG	0x01
-#define BIOSDATA_FLAG	0x02
-#define BIOSUTIL_FLAG	0x04
-#define BIOSARGS_FLAG	0x08
-
-struct bios_segments {
-	struct	segment_info code32;		/* 32-bit code (mandatory) */
-	struct	segment_info code16;		/* 16-bit code */
-	struct	segment_info data;		/* 16-bit data */
-	struct	segment_info util;		/* 16-bit utility */
-	struct	segment_info args;		/* 16-bit args */
-};
-
-struct bios_regs {
-	u_int	eax;
-	u_int	ebx;
-	u_int	ecx;
-	u_int	edx;
-	u_int	esi;
-	u_int	edi;
-};
-
-struct bios_args {
-	u_int	entry;				/* entry point of routine */
-	struct	bios_regs r;
-	struct	bios_segments seg;
-};
-
-/* 
- * BIOS32 Service Directory entry.  Caller supplies name, bios32_SDlookup
- * fills in the rest of the details.
- */
-struct bios32_SDentry 
-{
-    union 
-    {
-	u_int8_t	name[4];	/* service identifier */
-	uint32_t	id;		/* as a 32-bit value */
-    } ident;
-    uint32_t	base;			/* base of service */
-    uint32_t	len;			/* service length */
-    uint32_t	entry;			/* entrypoint offset from base */
-    vm_offset_t	ventry;			/* entrypoint in kernel virtual segment */
-};
-
-/*
- * Exported lookup results 
- */
-extern struct bios32_SDentry	PCIbios;
-
-int	bios_oem_strings(struct bios_oem *oem, u_char *buffer, size_t maxlen);
-uint32_t bios_sigsearch(uint32_t start, u_char *sig, int siglen, int paralen,
-	    int sigofs);
-int	bios16(struct bios_args *, char *, ...);
-int	bios16_call(struct bios_regs *, char *);
-int	bios32(struct bios_regs *, u_int, u_short);
-int	bios32_SDlookup(struct bios32_SDentry *ent);
-void	set_bios_selectors(struct bios_segments *, int);
-
-#endif
-
-#endif /* _MACHINE_PC_BIOS_H_ */
diff --git a/include.new/machine/pc/display.h b/include.new/machine/pc/display.h
deleted file mode 100644
index dcfae3a..0000000
--- a/include.new/machine/pc/display.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * IBM PC display definitions
- *
- * $FreeBSD: releng/10.2/sys/i386/include/pc/display.h 145010 2005-04-13 13:12:12Z nyan $
- */
-
-/* Color attributes for foreground text */
-
-#define	FG_BLACK		   0
-#define	FG_BLUE			   1
-#define	FG_GREEN		   2
-#define	FG_CYAN			   3
-#define	FG_RED			   4
-#define	FG_MAGENTA		   5
-#define	FG_BROWN		   6
-#define	FG_LIGHTGREY		   7
-#define	FG_DARKGREY		   8
-#define	FG_LIGHTBLUE		   9
-#define	FG_LIGHTGREEN		  10
-#define	FG_LIGHTCYAN		  11
-#define	FG_LIGHTRED		  12
-#define	FG_LIGHTMAGENTA		  13
-#define	FG_YELLOW		  14
-#define	FG_WHITE		  15
-#define	FG_BLINK		0x80
-
-/* Color attributes for text background */
-
-#define	BG_BLACK		0x00
-#define	BG_BLUE			0x10
-#define	BG_GREEN		0x20
-#define	BG_CYAN			0x30
-#define	BG_RED			0x40
-#define	BG_MAGENTA		0x50
-#define	BG_BROWN		0x60
-#define	BG_LIGHTGREY		0x70
-
-/* Monochrome attributes for foreground text */
-
-#define	FG_UNDERLINE		0x01
-#define	FG_INTENSE		0x08
-
-/* Monochrome attributes for text background */
-
-#define	BG_INTENSE		0x10
diff --git a/include.new/machine/pc/vesa.h b/include.new/machine/pc/vesa.h
deleted file mode 100644
index 20851c0..0000000
--- a/include.new/machine/pc/vesa.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * Copyright (c) 1998 Michael Smith and Kazutaka YOKOTA
- * 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 as
- *    the first lines of this file unmodified.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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/i386/include/pc/vesa.h,v 1.8 2002/09/23 18:54:31 alfred Exp $
- */
-
-#ifndef _MACHINE_PC_VESA_H
-#define _MACHINE_PC_VESA_H
-
-struct vesa_info
-{
-    /* mandatory fields */
-    u_int8_t		v_sig[4] __packed;	/* VESA */
-    u_int16_t		v_version __packed;	/* ver in BCD */
-    uint32_t		v_oemstr __packed;	/* OEM string */
-    uint32_t		v_flags __packed;	/* flags */
-#define V_DAC8		(1<<0)
-#define V_NONVGA	(1<<1)
-#define V_SNOW		(1<<2)
-    uint32_t		v_modetable __packed;	/* modes */
-    u_int16_t		v_memsize __packed;	/* in 64K */
-    /* 2.0 */
-    u_int16_t		v_revision __packed;	/* software rev */
-    uint32_t		v_venderstr __packed;	/* vender */
-    uint32_t		v_prodstr __packed;	/* product name */
-    uint32_t		v_revstr __packed;	/* product rev */
-};
-
-struct vesa_mode 
-{
-    /* mandatory fields */
-    u_int16_t		v_modeattr;
-#define V_MODESUPP	(1<<0)	/* VESA mode attributes */
-#define V_MODEOPTINFO	(1<<1)
-#define V_MODEBIOSOUT	(1<<2)
-#define V_MODECOLOR	(1<<3)
-#define V_MODEGRAPHICS	(1<<4)
-#define V_MODENONVGA	(1<<5)
-#define V_MODENONBANK	(1<<6)
-#define V_MODELFB	(1<<7)
-#define V_MODEVESA	(1<<16)	/* Private attributes */
-    u_int8_t		v_waattr;
-    u_int8_t		v_wbattr;
-#define V_WATTREXIST	(1<<0)
-#define V_WATTRREAD	(1<<1)
-#define V_WATTRWRITE	(1<<2)
-    u_int16_t		v_wgran;
-    u_int16_t		v_wsize;
-    u_int16_t		v_waseg;
-    u_int16_t		v_wbseg;
-    uint32_t		v_posfunc;
-    u_int16_t		v_bpscanline;
-    /* fields optional for 1.0/1.1 implementations */
-    u_int16_t		v_width;
-    u_int16_t		v_height;
-    u_int8_t		v_cwidth;
-    u_int8_t		v_cheight;
-    u_int8_t		v_planes;
-    u_int8_t		v_bpp;
-    u_int8_t		v_banks;
-    u_int8_t		v_memmodel;
-#define V_MMTEXT	0
-#define V_MMCGA		1
-#define V_MMHGC		2
-#define V_MMEGA		3
-#define V_MMPACKED	4
-#define V_MMSEQU256	5
-#define V_MMDIRCOLOR	6
-#define V_MMYUV		7
-    u_int8_t		v_banksize;
-    u_int8_t		v_ipages;
-    u_int8_t		v_reserved0;
-    /* fields for 1.2+ implementations */
-    u_int8_t		v_redmasksize;
-    u_int8_t		v_redfieldpos;
-    u_int8_t		v_greenmasksize;
-    u_int8_t		v_greenfieldpos;
-    u_int8_t		v_bluemasksize;
-    u_int8_t		v_bluefieldpos;
-    u_int8_t		v_resmasksize;
-    u_int8_t		v_resfieldpos;
-    u_int8_t		v_dircolormode;
-    /* 2.0 implementations */
-    uint32_t		v_lfb;
-    uint32_t		v_offscreen;
-    u_int16_t		v_offscreensize;
-};
-
-#ifdef _KERNEL
-
-#define VESA_MODE(x)	((x) >= M_VESA_BASE)
-
-int vesa_load_ioctl(void);
-int vesa_unload_ioctl(void);
-
-#endif
-
-#endif /* !_MACHINE_PC_VESA_H */
diff --git a/include.new/machine/pcaudioio.h b/include.new/machine/pcaudioio.h
deleted file mode 100644
index 690654a..0000000
--- a/include.new/machine/pcaudioio.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 1994 Søren Schmidt
- * 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
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/i386/include/pcaudioio.h 230132 2012-01-15 13:23:18Z uqs $
- */
-
-#ifndef	_MACHINE_PCAUDIOIO_H_
-#define	_MACHINE_PCAUDIOIO_H_
-
-#include <sys/ioccom.h>
-
-typedef struct audio_prinfo {
-	unsigned	sample_rate;	/* samples per second */
-	unsigned	channels;	/* # of channels (interleaved) */
-	unsigned	precision;	/* sample size in bits */
-	unsigned	encoding;	/* encoding method used */
-
-	unsigned	gain;		/* volume level: 0 - 255 */
-	unsigned	port;		/* input/output device */
-	unsigned	_fill1[4];
-
-	unsigned	samples;	/* samples played */
-	unsigned	eof;		/* ?!? */
-	unsigned char	pause;		/* !=0 pause, ==0 continue */
-	unsigned char	error;		/* !=0 if overflow/underflow */
-	unsigned char	waiting;	/* !=0 if others wants access */
-	unsigned char	_fill2[3];
-
-	unsigned char	open; 		/* is device open */
-	unsigned char	active;		/* !=0 if sound hardware is active */
-} audio_prinfo_t;
-
-typedef struct audio_info {
-	audio_prinfo_t	play;
-	audio_prinfo_t	record;
-	unsigned	monitor_gain;
-	unsigned	_fill[4];
-} audio_info_t;
-
-#define	AUDIO_ENCODING_ULAW	(1)	/* u-law encoding */
-#define	AUDIO_ENCODING_ALAW	(2)	/* A-law encoding */
-#define	AUDIO_ENCODING_RAW	(3)	/* linear encoding */
-
-#define	AUDIO_MIN_GAIN		(0)	/* minimum volume value */
-#define	AUDIO_MAX_GAIN		(255)	/* maximum volume value */
-
-#define	AUDIO_INITINFO(i)	memset((void*)i, 0xff, sizeof(audio_info_t))
-
-#define	AUDIO_GETINFO		_IOR('A', 1, audio_info_t)
-#define	AUDIO_SETINFO		_IOWR('A', 2, audio_info_t)
-#define	AUDIO_DRAIN		_IO('A', 3)
-#define	AUDIO_FLUSH		_IO('A', 4)
-
-/* compatibility to /dev/audio */
-#define AUDIO_COMPAT_DRAIN	_IO('P', 1)
-#define AUDIO_COMPAT_FLUSH	_IO('P', 0)
-
-#endif /* !_MACHINE_PCAUDIOIO_H_ */
diff --git a/include.new/machine/pcb.h b/include.new/machine/pcb.h
deleted file mode 100644
index 831e3da..0000000
--- a/include.new/machine/pcb.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91
- * $FreeBSD: releng/10.2/sys/i386/include/pcb.h 276084 2014-12-22 21:32:39Z jhb $
- */
-
-#ifndef _I386_PCB_H_
-#define _I386_PCB_H_
-
-/*
- * Intel 386 process control block
- */
-#ifndef _KERNEL
-#include <machine/segments.h>
-#endif
-#include <machine/npx.h>
-
-struct pcb {
-	int	pcb_edi;
-	int	pcb_esi;
-	int	pcb_ebp;
-	int	pcb_esp;
-	int	pcb_ebx;
-	int	pcb_eip;
-	struct segment_descriptor pcb_fsd;
-	struct segment_descriptor pcb_gsd;
-	int	pcb_ds;
-	int	pcb_es;
-	int	pcb_fs;
-	int	pcb_gs;
-	int	pcb_ss;
-	int	pcb_cr0;
-	int	pcb_cr2;
-	int	pcb_cr3;
-	int	pcb_cr4;
-	int     pcb_dr0;
-	int     pcb_dr1;
-	int     pcb_dr2;
-	int     pcb_dr3;
-	int     pcb_dr6;
-	int     pcb_dr7;
-
-	struct region_descriptor pcb_gdt;
-	struct region_descriptor pcb_idt;
-	uint16_t	pcb_ldt;
-	uint16_t	pcb_tr;
-
-	u_int	pcb_flags;
-#define	PCB_DBREGS	0x02	/* process using debug registers */
-#define	PCB_NPXINITDONE	0x08	/* fpu state is initialized */
-#define	PCB_VM86CALL	0x10	/* in vm86 call */
-#define	PCB_NPXUSERINITDONE 0x20 /* user fpu state is initialized */
-#define	PCB_KERNNPX	0x40	/* kernel uses npx */
-
-	uint16_t pcb_initial_npxcw;
-
-	caddr_t	pcb_onfault;	/* copyin/out fault recovery */
-	struct	pcb_ext	*pcb_ext;	/* optional pcb extension */
-	int	pcb_psl;	/* process status long */
-	u_long	pcb_vm86[2];	/* vm86bios scratch space */
-	union	savefpu *pcb_save;
-
-	uint32_t pcb_pad[10];
-};
-
-/* Per-CPU state saved during suspend and resume. */
-struct susppcb {
-	struct pcb	sp_pcb;
-
-	/* fpu context for suspend/resume */
-	void		*sp_fpususpend;
-};
-
-#ifdef _KERNEL
-struct trapframe;
-
-void	makectx(struct trapframe *, struct pcb *);
-int	savectx(struct pcb *) __returns_twice;
-void	resumectx(struct pcb *) __fastcall;
-#endif
-
-#endif /* _I386_PCB_H_ */
diff --git a/include.new/machine/pcb_ext.h b/include.new/machine/pcb_ext.h
deleted file mode 100644
index adc2033..0000000
--- a/include.new/machine/pcb_ext.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1997 Jonathan Lemon
- * 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.
- *
- * 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: releng/10.2/sys/i386/include/pcb_ext.h 150173 2005-09-15 17:30:08Z jhb $
- */
-
-#ifndef _I386_PCB_EXT_H_
-#define _I386_PCB_EXT_H_
-
-/*
- * Extension to the 386 process control block
- */
-#include <machine/tss.h>
-#include <machine/vm86.h>
-#include <machine/segments.h>
-
-struct pcb_ext {
-	struct 	segment_descriptor ext_tssd;	/* tss descriptor */
-	struct 	i386tss	ext_tss;	/* per-process i386tss */
-	caddr_t	ext_iomap;		/* i/o permission bitmap */
-	struct	vm86_kernel ext_vm86;	/* vm86 area */
-};
-
-#ifdef _KERNEL
-extern int private_tss;
-
-int i386_extend_pcb(struct thread *);
-
-#endif
-
-#endif /* _I386_PCB_EXT_H_ */
diff --git a/include.new/machine/pci_cfgreg.h b/include.new/machine/pci_cfgreg.h
deleted file mode 100644
index c1fc6cb..0000000
--- a/include.new/machine/pci_cfgreg.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/pci_cfgreg.h 223440 2011-06-22 21:04:13Z jhb $ */
-
-#include <x86/pci_cfgreg.h>
diff --git a/include.new/machine/pcpu.h b/include.new/machine/pcpu.h
deleted file mode 100644
index bd18d8a..0000000
--- a/include.new/machine/pcpu.h
+++ /dev/null
@@ -1,261 +0,0 @@
-/*-
- * Copyright (c) Peter Wemm
- * 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.
- *
- * 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: releng/10.2/sys/i386/include/pcpu.h 256073 2013-10-05 23:11:01Z gibbs $
- */
-
-#ifndef _MACHINE_PCPU_H_
-#define	_MACHINE_PCPU_H_
-
-#ifndef _SYS_CDEFS_H_
-#error "sys/cdefs.h is a prerequisite for this file"
-#endif
-
-#include <machine/segments.h>
-#include <machine/tss.h>
-
-/*
- * The SMP parts are setup in pmap.c and locore.s for the BSP, and
- * mp_machdep.c sets up the data for the AP's to "see" when they awake.
- * The reason for doing it via a struct is so that an array of pointers
- * to each CPU's data can be set up for things like "check curproc on all
- * other processors"
- */
-
-#if defined(XEN)
-
-/* These are peridically updated in shared_info, and then copied here. */
-struct shadow_time_info {
-	uint64_t tsc_timestamp;     /* TSC at last update of time vals.  */
-	uint64_t system_timestamp;  /* Time, in nanosecs, since boot.    */
-	uint32_t tsc_to_nsec_mul;
-	uint32_t tsc_to_usec_mul;
-	int tsc_shift;
-	uint32_t version;
-};
-
-#define	PCPU_XEN_FIELDS							\
-	;								\
-	u_int	pc_cr3;		/* track cr3 for R1/R3*/		\
-	vm_paddr_t *pc_pdir_shadow;					\
-	uint64_t pc_processed_system_time;				\
-	struct shadow_time_info pc_shadow_time;				\
-	char	__pad[185]
-
-#else /* !XEN */
-
-#define PCPU_XEN_FIELDS							\
-	;								\
-	char	__pad[233]
-
-#endif
-
-#define	PCPU_MD_FIELDS							\
-	char	pc_monitorbuf[128] __aligned(128); /* cache line */	\
-	struct	pcpu *pc_prvspace;	/* Self-reference */		\
-	struct	pmap *pc_curpmap;					\
-	struct	i386tss pc_common_tss;					\
-	struct	segment_descriptor pc_common_tssd;			\
-	struct	segment_descriptor *pc_tss_gdt;				\
-	struct	segment_descriptor *pc_fsgs_gdt;			\
-	int	pc_currentldt;						\
-	u_int   pc_acpi_id;		/* ACPI CPU id */		\
-	u_int	pc_apic_id;						\
-	int	pc_private_tss;		/* Flag indicating private tss*/\
-	u_int	pc_cmci_mask;		/* MCx banks for CMCI */	\
-	u_int	pc_vcpu_id		/* Xen vCPU ID */		\
-	PCPU_XEN_FIELDS
-
-#ifdef _KERNEL
-
-#ifdef lint
-
-extern struct pcpu *pcpup;
-
-#define	PCPU_GET(member)	(pcpup->pc_ ## member)
-#define	PCPU_ADD(member, val)	(pcpup->pc_ ## member += (val))
-#define	PCPU_INC(member)	PCPU_ADD(member, 1)
-#define	PCPU_PTR(member)	(&pcpup->pc_ ## member)
-#define	PCPU_SET(member, val)	(pcpup->pc_ ## member = (val))
-
-#elif defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF)
-
-/*
- * Evaluates to the byte offset of the per-cpu variable name.
- */
-#define	__pcpu_offset(name)						\
-	__offsetof(struct pcpu, name)
-
-/*
- * Evaluates to the type of the per-cpu variable name.
- */
-#define	__pcpu_type(name)						\
-	__typeof(((struct pcpu *)0)->name)
-
-/*
- * Evaluates to the address of the per-cpu variable name.
- */
-#define	__PCPU_PTR(name) __extension__ ({				\
-	__pcpu_type(name) *__p;						\
-									\
-	__asm __volatile("movl %%fs:%1,%0; addl %2,%0"			\
-	    : "=r" (__p)						\
-	    : "m" (*(struct pcpu *)(__pcpu_offset(pc_prvspace))),	\
-	      "i" (__pcpu_offset(name)));				\
-									\
-	__p;								\
-})
-
-/*
- * Evaluates to the value of the per-cpu variable name.
- */
-#define	__PCPU_GET(name) __extension__ ({				\
-	__pcpu_type(name) __res;					\
-	struct __s {							\
-		u_char	__b[MIN(sizeof(__res), 4)];			\
-	} __s;								\
-									\
-	if (sizeof(__res) == 1 || sizeof(__res) == 2 ||			\
-	    sizeof(__res) == 4) {					\
-		__asm __volatile("mov %%fs:%1,%0"			\
-		    : "=r" (__s)					\
-		    : "m" (*(struct __s *)(__pcpu_offset(name))));	\
-		*(struct __s *)(void *)&__res = __s;			\
-	} else {							\
-		__res = *__PCPU_PTR(name);				\
-	}								\
-	__res;								\
-})
-
-/*
- * Adds a value of the per-cpu counter name.  The implementation
- * must be atomic with respect to interrupts.
- */
-#define	__PCPU_ADD(name, val) do {					\
-	__pcpu_type(name) __val;					\
-	struct __s {							\
-		u_char	__b[MIN(sizeof(__val), 4)];			\
-	} __s;								\
-									\
-	__val = (val);							\
-	if (sizeof(__val) == 1 || sizeof(__val) == 2 ||			\
-	    sizeof(__val) == 4) {					\
-		__s = *(struct __s *)(void *)&__val;			\
-		__asm __volatile("add %1,%%fs:%0"			\
-		    : "=m" (*(struct __s *)(__pcpu_offset(name)))	\
-		    : "r" (__s));					\
-	} else								\
-		*__PCPU_PTR(name) += __val;				\
-} while (0)
-
-/*
- * Increments the value of the per-cpu counter name.  The implementation
- * must be atomic with respect to interrupts.
- */
-#define	__PCPU_INC(name) do {						\
-	CTASSERT(sizeof(__pcpu_type(name)) == 1 ||			\
-	    sizeof(__pcpu_type(name)) == 2 ||				\
-	    sizeof(__pcpu_type(name)) == 4);				\
-	if (sizeof(__pcpu_type(name)) == 1) {				\
-		__asm __volatile("incb %%fs:%0"				\
-		    : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
-		    : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
-	} else if (sizeof(__pcpu_type(name)) == 2) {			\
-		__asm __volatile("incw %%fs:%0"				\
-		    : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
-		    : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
-	} else if (sizeof(__pcpu_type(name)) == 4) {			\
-		__asm __volatile("incl %%fs:%0"				\
-		    : "=m" (*(__pcpu_type(name) *)(__pcpu_offset(name)))\
-		    : "m" (*(__pcpu_type(name) *)(__pcpu_offset(name))));\
-	}								\
-} while (0)
-
-/*
- * Sets the value of the per-cpu variable name to value val.
- */
-#define	__PCPU_SET(name, val) do {					\
-	__pcpu_type(name) __val;					\
-	struct __s {							\
-		u_char	__b[MIN(sizeof(__val), 4)];			\
-	} __s;								\
-									\
-	__val = (val);							\
-	if (sizeof(__val) == 1 || sizeof(__val) == 2 ||			\
-	    sizeof(__val) == 4) {					\
-		__s = *(struct __s *)(void *)&__val;			\
-		__asm __volatile("mov %1,%%fs:%0"			\
-		    : "=m" (*(struct __s *)(__pcpu_offset(name)))	\
-		    : "r" (__s));					\
-	} else {							\
-		*__PCPU_PTR(name) = __val;				\
-	}								\
-} while (0)
-
-#define	PCPU_GET(member)	__PCPU_GET(pc_ ## member)
-#define	PCPU_ADD(member, val)	__PCPU_ADD(pc_ ## member, val)
-#define	PCPU_INC(member)	__PCPU_INC(pc_ ## member)
-#define	PCPU_PTR(member)	__PCPU_PTR(pc_ ## member)
-#define	PCPU_SET(member, val)	__PCPU_SET(pc_ ## member, val)
-
-#define	OFFSETOF_CURTHREAD	0
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnull-dereference"
-#endif
-static __inline __pure2 struct thread *
-__curthread(void)
-{
-	struct thread *td;
-
-	__asm("movl %%fs:%1,%0" : "=r" (td)
-	    : "m" (*(char *)OFFSETOF_CURTHREAD));
-	return (td);
-}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
-#define	curthread		(__curthread())
-
-#define	OFFSETOF_CURPCB		16
-static __inline __pure2 struct pcb *
-__curpcb(void)
-{
-	struct pcb *pcb;
-
-	__asm("movl %%fs:%1,%0" : "=r" (pcb) : "m" (*(char *)OFFSETOF_CURPCB));
-	return (pcb);
-}
-#define	curpcb		(__curpcb())
-
-#else /* !lint || defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE___TYPEOF) */
-
-#error "this file needs to be ported to your compiler"
-
-#endif /* lint, etc. */
-
-#endif /* _KERNEL */
-
-#endif /* !_MACHINE_PCPU_H_ */
diff --git a/include.new/machine/pcvt_ioctl.h b/include.new/machine/pcvt_ioctl.h
deleted file mode 100644
index 9d39a03..0000000
--- a/include.new/machine/pcvt_ioctl.h
+++ /dev/null
@@ -1,536 +0,0 @@
-/*-
- * Copyright (c) 1992, 2000 Hellmuth Michaelis
- * Copyright (c) 1992, 1995 Joerg Wunsch.
- * Copyright (c) 1992, 1993 Brian Dunford-Shore and Holger Veit.
- * Copyright (C) 1992, 1993 Soeren Schmidt.
- * All rights reserved.
- *
- * For the sake of compatibility, portions of this code regarding the
- * X server interface are taken from Soeren Schmidt's syscons driver.
- *
- * This code is derived from software contributed to 386BSD by
- * Holger Veit.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz and Don Ahn.
- *
- * 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
- * 	Hellmuth Michaelis, Brian Dunford-Shore, Joerg Wunsch, Holger Veit
- *	and Soeren Schmidt.
- * 4. The name authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
- */
- 
-/*---------------------------------------------------------------------------
- *
- *	pcvt_ioctl.h	ioctl's for the VT220 video driver 'pcvt'
- *	---------------------------------------------------------
- *
- *	Last Edit-Date: [Fri Mar 31 10:22:29 2000]
- *
- * $FreeBSD: src/sys/i386/include/pcvt_ioctl.h,v 1.17 2005/01/06 22:18:15 imp Exp $
- * 
- *---------------------------------------------------------------------------*/
-
-#ifndef	_MACHINE_PCVT_IOCTL_H_
-#define	_MACHINE_PCVT_IOCTL_H_
-
-/* pcvt version information for VGAPCVTID ioctl */
-
-#define PCVTIDNAME    "pcvt"		/* driver id - string		*/
-#define PCVTIDMAJOR   3			/* driver id - major release	*/
-#define PCVTIDMINOR   60		/* driver id - minor release	*/
-
-#if !defined(_KERNEL)
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/*---------------------------------------------------------------------------*
- *		IOCTLs for MF II and AT Keyboards
- *---------------------------------------------------------------------------*/
-
-#define KBDRESET	_IO('K',  1)	  /* reset keyboard / set defaults */
-#define KBDGTPMAT	_IOR('K', 2, int) /* get current typematic value   */
-#define KBDSTPMAT	_IOW('K', 3, int) /* set current typematic value   */
-
-/*	Typematic Delay Values	*/
-
-#define	KBD_TPD250	0x00			/*  250 ms	*/
-#define	KBD_TPD500	0x20			/*  500 ms	*/
-#define	KBD_TPD750	0x40			/*  750 ms	*/
-#define	KBD_TPD1000	0x60			/* 1000 ms	*/
-
-/*	Typematic Repeat Rate	*/
-
-#define	KBD_TPM300	0x00			/* 30.0 char/second */
-#define	KBD_TPM267	0x01			/* 26.7 char/second */
-#define	KBD_TPM240	0x02			/* 24.0 char/second */
-#define	KBD_TPM218	0x03			/* 21.8 char/second */
-#define	KBD_TPM200	0x04			/* 20.0 char/second */
-#define	KBD_TPM185	0x05			/* 18.5 char/second */
-#define	KBD_TPM171	0x06			/* 17.1 char/second */
-#define	KBD_TPM160	0x07			/* 16.0 char/second */
-#define	KBD_TPM150	0x08			/* 15.0 char/second */
-#define	KBD_TPM133	0x09			/* 13.3 char/second */
-#define	KBD_TPM120	0x0A			/* 12.0 char/second */
-#define	KBD_TPM109	0x0B			/* 10.9 char/second */
-#define	KBD_TPM100	0x0C			/* 10.0 char/second */
-#define	KBD_TPM92	0x0D			/*  9.2 char/second */
-#define	KBD_TPM86	0x0E			/*  8.6 char/second */
-#define	KBD_TPM80	0x0F			/*  8.0 char/second */
-#define	KBD_TPM75	0x10			/*  7.5 char/second */
-#define	KBD_TPM67	0x11			/*  6.7 char/second */
-#define	KBD_TPM60	0x12			/*  6.0 char/second */
-#define	KBD_TPM55	0x13			/*  5.5 char/second */
-#define	KBD_TPM50	0x14			/*  5.0 char/second */
-#define	KBD_TPM46	0x15			/*  4.6 char/second */
-#define	KBD_TPM43	0x16			/*  4.3 char/second */
-#define	KBD_TPM40	0x17			/*  4.0 char/second */
-#define	KBD_TPM37	0x18			/*  3.7 char/second */
-#define	KBD_TPM33	0x19			/*  3.3 char/second */
-#define	KBD_TPM30	0x1A			/*  3.0 char/second */
-#define	KBD_TPM27	0x1B			/*  2.7 char/second */
-#define	KBD_TPM25	0x1C			/*  2.5 char/second */
-#define	KBD_TPM23	0x1D			/*  2.3 char/second */
-#define	KBD_TPM21	0x1E			/*  2.1 char/second */
-#define	KBD_TPM20	0x1F			/*  2.0 char/second */
-
-#define KBDGREPSW	_IOR('K', 4, int)	/* get key repetition switch */
-#define KBDSREPSW	_IOW('K', 5, int)	/* set key repetition switch */
-#define		KBD_REPEATOFF	0
-#define		KBD_REPEATON	1
-
-#define KBDGLEDS	_IOR('K', 6, int)	/* get LED state */
-#define KBDSLEDS	_IOW('K', 7, int)	/* set LED state, does not influence */
-#define 	KBD_SCROLLLOCK	0x0001		/* the driver's idea of lock key state */
-#define		KBD_NUMLOCK	0x0002
-#define		KBD_CAPSLOCK	0x0004
-#define KBDGLOCK	_IOR('K', 8, int)	/* gets state of SCROLL,NUM,CAPS */
-#define KBDSLOCK	_IOW('K', 9, int)	/* sets state of SCROLL,NUM,CAPS + LEDs */
-
-#define KBDMAXOVLKEYSIZE	15		/* + zero byte */
-
-struct kbd_ovlkey				/* complete definition of a key */
-{
-	u_short	keynum;				/* the key itself */
-	u_short	type;				/* type of key, see below */
-	u_char	subu;				/* subtype, ignored on write */
-	char	unshift[KBDMAXOVLKEYSIZE+1];	/* emitted string, unshifted */
-	u_char	subs;				/* subtype, ignored on write */
-	char	shift[KBDMAXOVLKEYSIZE+1];	/* emitted string, shifted */
-	u_char	subc;				/* subtype, ignored on write */
-	char	ctrl[KBDMAXOVLKEYSIZE+1];	/* emitted string, control */
-	u_char	suba;				/* subtype, ignored on write */
-	char	altgr[KBDMAXOVLKEYSIZE+1];	/* emitted string, altgr */
-};
-
-/*	Max value for keynum field	*/
-
-#define	KBDMAXKEYS	128		/* Max No. of Keys */
-
-/*	Values for type field	*/
-
-#define	KBD_NONE	0	/* no function, key is disabled */
-#define	KBD_SHIFT	1	/* keyboard shift */
-#define	KBD_META	2	/* alternate shift, sets bit8 to ASCII code */
-#define	KBD_NUM		3	/* numeric shift, keypad num / appl */
-#define	KBD_CTL		4	/* control code generation */
-#define	KBD_CAPS	5	/* caps shift - swaps case of letter */
-#define	KBD_ASCII	6	/* ascii code generating key */
-#define	KBD_SCROLL	7	/* stop output */
-#define	KBD_FUNC	8	/* function key */
-#define	KBD_KP		9	/* keypad keys */
-#define	KBD_BREAK	10	/* ignored */
-#define	KBD_ALTGR	11	/* AltGr Translation feature */
-#define	KBD_SHFTLOCK	12	/* shiftlock */
-#define	KBD_CURSOR	13	/* cursor keys */
-#define	KBD_RETURN	14	/* RETURN/ENTER keys */
-
-/*	Values  for subtype field	*/
-
-#define	KBD_SUBT_STR	0	/* key is bound to a string */
-#define	KBD_SUBT_FNC	1	/* key is bound to a function */
-
-
-#define	KBD_OVERLOAD	0x8000	/* Key is overloaded, ignored in ioctl */
-#define	KBD_MASK	(~KBD_OVERLOAD)	/* mask for type */
-
-#define KBDGCKEY	_IOWR('K',16, struct kbd_ovlkey)	/* get current key values */
-#define KBDSCKEY	_IOW('K',17, struct kbd_ovlkey)		/* set new key assignment values*/
-#define KBDGOKEY	_IOWR('K',18, struct kbd_ovlkey) 	/* get original key assignment values*/
-
-#define KBDRMKEY	_IOW('K',19, int)	/* remove a key assignment */
-#define KBDDEFAULT	_IO('K',20)		/* remove all key assignments */
-
-/*---------------------------------------------------------------------------*
- *		IOCTLs for Video Adapter
- *---------------------------------------------------------------------------*/
-
-/* Definition of PC Video Adaptor Types */
-
-#define UNKNOWN_ADAPTOR	0	/* Unidentified adaptor ... */
-#define MDA_ADAPTOR	1	/* Monochrome Display Adaptor/Hercules Graphics Card */
-#define CGA_ADAPTOR	2	/* Color Graphics Adaptor */
-#define EGA_ADAPTOR	3	/* Enhanced Graphics Adaptor */
-#define VGA_ADAPTOR	4	/* Video Graphics Adaptor/Array */
-
-/* Definitions of Monitor types */
-
-#define MONITOR_MONO	0	/* Monochrome Monitor */
-#define MONITOR_COLOR	1	/* Color Monitor */
-
-/* Types of VGA chips detectable by current driver version */
-
-#define VGA_F_NONE	0	/* FAMILY NOT KNOWN */
-#define VGA_UNKNOWN	0	/* default, no 132 columns	*/
-
-#define VGA_F_TSENG	1	/* FAMILY TSENG */
-#define VGA_ET4000	1	/* Tseng Labs ET4000		*/
-#define VGA_ET3000	2	/* Tseng Labs ET3000		*/
-
-#define VGA_F_WD	2	/* FAMILY WD */
-#define VGA_PVGA	3	/* Western Digital Paradise VGA	*/
-#define VGA_WD90C00	4	/* Western Digital WD90C00	*/
-#define VGA_WD90C10	5	/* Western Digital WD90C10	*/
-#define VGA_WD90C11	6	/* Western Digital WD90C11	*/
-
-#define VGA_F_V7	3	/* FAMILY VIDEO 7 */
-#define VGA_V7VEGA	7	/* Video 7 VEGA VGA */
-#define VGA_V7FWVR	8	/* Video 7 FASTWRITE/VRAM */
-#define VGA_V7V5	9	/* Video 7 Version 5 */
-#define VGA_V71024I	10	/* Video 7 1024i */
-#define VGA_V7UNKNOWN	11	/* Video 7 unknown board .. */
-
-#define VGA_F_TRI	4	/* FAMILY TRIDENT */
-#define VGA_TR8800BR	12	/* Trident TVGA 8800BR */
-#define VGA_TR8800CS	13	/* Trident TVGA 8800CS */
-#define VGA_TR8900B	14	/* Trident TVGA 8900B  */
-#define VGA_TR8900C	15	/* Trident TVGA 8900C  */
-#define VGA_TR8900CL	16	/* Trident TVGA 8900CL */
-#define VGA_TR9000	17	/* Trident TVGA 9000   */
-#define VGA_TR9100	18	/* Trident TVGA 9100   */
-#define VGA_TR9200	19	/* Trident TVGA 9200   */
-#define VGA_TRUNKNOWN	20	/* Trident unknown     */
-
-#define VGA_F_S3	5	/* FAMILY S3  */
-#define VGA_S3_911	21	/* S3 911 */
-#define VGA_S3_924	22	/* S3 924 */
-#define VGA_S3_80x	23	/* S3 801/805 */
-#define VGA_S3_928	24	/* S3 928 */
-#define VGA_S3_UNKNOWN	25	/* unknown S3 chipset */
-
-#define VGA_F_CIR	6	/* FAMILY CIRRUS */
-#define VGA_CL_GD5402	26	/* Cirrus CL-GD5402	*/
-#define VGA_CL_GD5402r1	27	/* Cirrus CL-GD5402r1	*/
-#define VGA_CL_GD5420	28	/* Cirrus CL-GD5420	*/
-#define VGA_CL_GD5420r1	29	/* Cirrus CL-GD5420r1	*/
-#define VGA_CL_GD5422	30	/* Cirrus CL-GD5422	*/
-#define VGA_CL_GD5424	31	/* Cirrus CL-GD5424	*/
-#define VGA_CL_GD5426	32	/* Cirrus CL-GD5426	*/
-#define VGA_CL_GD5428	33	/* Cirrus CL-GD5428	*/
-
-/*****************************************************************************/
-/* NOTE: update the 'scon' utility when adding support for more chipsets !!! */
-/*****************************************************************************/
-
-/* Definitions of Vertical Screen Sizes for EGA/VGA Adaptors */
-
-#define SIZ_25ROWS	0	/* VGA: 25 lines, 8x16 font */
-				/* EGA: 25 lines, 8x14 font */
-#define SIZ_28ROWS	1	/* VGA: 28 lines, 8x14 font */
-#define SIZ_35ROWS	2	/* EGA: 35 lines, 8x10 font */
-#define SIZ_40ROWS	3	/* VGA: 40 lines, 8x10 font */
-#define SIZ_43ROWS	4	/* EGA: 43 lines, 8x8  font */
-#define SIZ_50ROWS	5	/* VGA: 50 lines, 8x8  font */
-
-/* Definitions of Font Sizes for EGA/VGA Adaptors */
-
-#define FNT_8x16	0	/* 8x16 Pixel Font, only VGA */
-#define FNT_8x14	1	/* 8x14 Pixel Font, EGA/VGA  */
-#define FNT_8x10	2	/* 8x10 Pixel Font, EGA/VGA  */
-#define FNT_8x8		3	/* 8x8  Pixel Font, EGA/VGA  */
-
-/* Definitions of Character Set (Font) Numbers */
-
-#define CH_SET0		0	/* Character Set (Font) 0, EGA/VGA */
-#define CH_SET1		1	/* Character Set (Font) 1, EGA/VGA */
-#define CH_SET2		2	/* Character Set (Font) 2, EGA/VGA */
-#define CH_SET3		3	/* Character Set (Font) 3, EGA/VGA */
-#define CH_SETMAX_EGA	3	/* EGA has 4 Character Sets / Fonts */
-#define CH_SET4		4	/* Character Set (Font) 4, VGA */
-#define CH_SET5		5	/* Character Set (Font) 5, VGA */
-#define CH_SET6		6	/* Character Set (Font) 6, VGA */
-#define CH_SET7		7	/* Character Set (Font) 7, VGA */
-#define CH_SETMAX_VGA	7	/* VGA has 8 Character Sets / Fonts */
-
-/* Definitions of Terminal Emulation Modes */
-
-#define M_HPVT		0	/* VTxxx and HP Mode, Labels & Status Line on */
-#define M_PUREVT	1	/* only VTxxx Sequences recognized, no Labels */
-
-/*---*/
-
-#define VGACURSOR	_IOW('V',100, struct cursorshape) /* set cursor shape */
-
-struct cursorshape {
-	int screen_no;	   /* screen number for which to set,		    */
-			   /*  or -1 to set on current active screen        */
-	int start;	   /* top scanline, range 0... Character Height - 1 */
-	int end;	   /* end scanline, range 0... Character Height - 1 */
-};
-
-#define VGALOADCHAR	_IOW('V',101, struct vgaloadchar) /* load vga char */
-
-struct vgaloadchar {
-	int character_set;	    /* VGA character set to load into */
-	int character;		    /* Character to load */
-	int character_scanlines;    /* Scanlines per character */
-	u_char char_table[32];	    /* VGA character shape table */
-};
-
-#define VGASETFONTATTR	_IOW('V',102, struct vgafontattr) /* set font attr */
-#define VGAGETFONTATTR	_IOWR('V',103, struct vgafontattr) /* get font attr */
-
-struct vgafontattr {
-	int character_set;	    /* VGA character set */
-	int font_loaded;	    /* Mark font loaded or unloaded */
-	int screen_size;	    /* Character rows per screen */
-	int character_scanlines;    /* Scanlines per character - 1 */
-	int screen_scanlines;       /* Scanlines per screen - 1 byte */
-};
-
-#define VGASETSCREEN	_IOW('V',104, struct screeninfo) /* set screen info */
-#define VGAGETSCREEN	_IOWR('V',105, struct screeninfo) /* get screen info */
-
-struct screeninfo {
-	int adaptor_type;	/* type of video adaptor installed	*/
-				/* read only, ignored on write		*/
-	int monitor_type;	/* type of monitor (mono/color)installed*/
-				/* read only, ignored on write		*/
-	int totalfonts;		/* no of downloadable fonts		*/
-				/* read only, ignored on write		*/
-	int totalscreens;	/* no of virtual screens		*/
-				/* read only, ignored on write		*/
-	int screen_no;		/* screen number, this was got from	*/
-				/* on write, if -1, apply pure_vt_mode	*/
-				/* and/or screen_size to current screen */
-				/* else to screen_no supplied		*/
-	int current_screen;	/* screen number, which is displayed.	*/
-				/* on write, if -1, make this screen	*/
-				/* the current screen, else set current	*/
-				/* displayed screen to parameter	*/
-	int pure_vt_mode;	/* flag, pure VT mode or HP/VT mode	*/
-				/* on write, if -1, no change		*/
-	int screen_size;	/* screen size 				*/
-				/* on write, if -1, no change		*/
-	int force_24lines;	/* force 24 lines if 25 lines VT mode	*/
-				/* or 28 lines HP mode to get pure	*/
-				/* VT220 screen size			*/
-				/* on write, if -1, no change		*/
-	int vga_family;		/* if adaptor_type = VGA, this reflects */
-				/* the chipset family after a read	*/
-				/* nothing happens on write ...        */
-	int vga_type;		/* if adaptor_type = VGA, this reflects */
-				/* the chipset after a read		*/
-				/* nothing happens on write ...        */
-	int vga_132;		/* set to 1 if driver has support for	*/
-				/* 132 column operation for chipset	*/
-				/* currently ignored on write		*/
-};
-
-#define VGAREADPEL	_IOWR('V', 110, struct vgapel) /*r VGA palette entry */
-#define VGAWRITEPEL	_IOW('V', 111, struct vgapel)  /*w VGA palette entry */
-
-struct vgapel {
-	unsigned idx;		/* index into palette, 0 .. 255 valid	*/
-	unsigned r, g, b;	/* RGB values, masked by VGA_PMASK (63) */
-};
-
-/* NOTE: The next ioctl is only valid if option PCVT_SCREENSAVER is configured*/
-/* this is *not* restricted to VGA's, but won't introduce new garbage...      */
-
-#define VGASCREENSAVER	_IOW('V', 112, int)	/* set timeout for screen     */
-						/* saver in seconds; 0 turns  */
-						/* it off                     */
-
-#define VGAPCVTID	_IOWR('V',113, struct pcvtid)	/* get driver id */
-
-struct pcvtid {				/* THIS STRUCTURE IS NOW FROZEN !!! */
-#define PCVTIDNAMELN  16		/* driver id - string length	*/
-	char name[PCVTIDNAMELN];	/* driver name, == PCVTIDSTR	*/
-	int rmajor;			/* revision number, major	*/
-	int rminor;			/* revision number, minor	*/
-};					/* END OF COLD PART ...		*/
-
-#define VGAPCVTINFO	_IOWR('V',114, struct pcvtinfo)	/* get driver info */
-
-struct pcvtinfo {			/* compile time option values */
-	u_int nscreens;			/* PCVT_NSCREENS */
-	u_int scanset;			/* PCVT_SCANSET */
-	u_int updatefast;		/* PCVT_UPDATEFAST */
-	u_int updateslow;		/* PCVT_UPDATESLOW */
-	u_int sysbeepf;			/* PCVT_SYSBEEPF */
-	u_int pcburst;			/* PCVT_PCBURST */
-	u_int kbd_fifo_sz;		/* PCVT_KBD_FIFO_SZ */
-
-/* config booleans */
-
-	u_long compile_opts;		/* PCVT_xxxxxxxxxxxxxxx */
-
-#define CONF_VT220KEYB		0x00000001
-#define CONF_SCREENSAVER	0x00000002
-#define CONF_PRETTYSCRNS	0x00000004
-#define CONF_CTRL_ALT_DEL	0x00000008
-#define CONF_USEKBDSEC		0x00000010
-#define CONF_24LINESDEF		0x00000020
-#define CONF_SHOWKEYS		0x00000040
-#define CONF_NULLCHARS		0x00000080
-#define CONF_SETCOLOR		0x00000100
-#define CONF_132GENERIC		0x00000200
-#define CONF_XSERVER		0x00000400
-#define CONF_INHIBIT_NUMLOCK	0x00000800
-#define CONF_META_ESC		0x00001000
-#define CONF_SLOW_INTERRUPT	0x00002000
-#define CONF_NO_LED_UPDATE	0x00004000
-#define CONF_GREENSAVER		0x00008000
-};
-
-#define VGASETCOLMS	_IOW('V', 115, int) /* set number of columns (80/132)*/
-
-/*
- * start of USL VT compatibility stuff (in case XSERVER defined)
- * these definitions must match those ones used by syscons
- *
- * Note that some of the ioctl command definitions below break the Berkeley
- * style. They accept a parameter of type "int" (instead of Berkeley style
- * "int *") in order to pass a single integer to the ioctl. These macros
- * below are marked with a dummy "int" comment. Dont blame anyone else
- * than USL for that braindeadness. It is done here to be a bit source-
- * level compatible to SysV. (N.B., within the ioctl, the argument is
- * dereferenced by "int *" anyway. The translation is done by the upper-
- * level ioctl stuff.)
- */
-
-/*
- * NB: Some of the definitions below apparently override the definitions
- * in the KBD section above. But, due to BSDs encoding of the IO direction
- * and transfer size, the resulting ioctl cmds differ, so we can take them
- * here. The only real conflict would appear if we implemented KDGKBMODE,
- * which would be identical to KBDGLEDS above. Since this command is not
- * necessary for XFree86 2.0, we omit it.
- */
-
-/* #define KDGKBMODE 	_IOR('K', 6, int) */ /* not yet implemented */
-
-#define KDSKBMODE 	_IO('K', 7 /*, int */)
-#define K_RAW		0		/* keyboard returns scancodes	*/
-#define K_XLATE		1		/* keyboard returns ascii 	*/
-
-#define KDMKTONE	_IO('K', 8 /*, int */)
-
-/* #define KDGETMODE	_IOR('K', 9, int) */ /* not yet implemented */
-
-#define KDSETMODE	_IO('K', 10 /*, int */)
-#define KD_TEXT		0		/* set text mode restore fonts  */
-#define KD_GRAPHICS	1		/* set graphics mode 		*/
-
-/* we cannot see any sense to support KD_TEXT0 or KD_TEXT1 */
-
-#define KDENABIO	_IO('K', 60) /* only allowed if euid == 0 */
-#define KDDISABIO	_IO('K', 61)
-
-#define KDGETLED	_IOR('K', 65, int)
-#define KDSETLED	_IO('K', 66 /*, int */)
-#define LED_CAP		1
-#define LED_NUM		2
-#define LED_SCR		4
-
-#define KDSETRAD	_IO('K', 67 /*, int */)
-
-/*
- * Note that since our idea of key mapping is much different from the
- * SysV style, we _only_ support mapping layers base (0), shifted (1),
- * alt (4), and alt-shift (5), and only for the basic keys (without
- * any function keys). This is what XFree86 2.0+ needs to establish
- * the default X keysym mapping.
- */
-#define GIO_KEYMAP 	_IOR('k', 6, keymap_t)
-
-#define VT_OPENQRY	_IOR('v', 1, int)
-#define VT_SETMODE	_IOW('v', 2, vtmode_t)
-#define VT_GETMODE	_IOR('v', 3, vtmode_t)
-
-#define VT_RELDISP	_IO('v', 4 /*, int */)
-
-/* acceptable values for the VT_RELDISP command */
-
-#define VT_FALSE	0		/* release of VT refused */
-#define VT_TRUE		1		/* VT released */
-#define VT_ACKACQ	2		/* acknowledging VT acquisition */
-
-
-#define VT_ACTIVATE	_IO('v', 5 /*, int */)
-#define VT_WAITACTIVE	_IO('v', 6 /*, int */)
-#define VT_GETACTIVE	_IOR('v', 7, int)
-
-#ifndef _VT_MODE_DECLARED
-#define	_VT_MODE_DECLARED
-struct vt_mode {
-	char	mode;
-
-#define VT_AUTO		0		/* switching controlled by drvr	*/
-#define VT_PROCESS	1		/* switching controlled by prog */
-
-	char	waitv;			/* not implemented yet 	SOS	*/
-	short	relsig;
-	short	acqsig;
-	short	frsig;			/* not implemented yet	SOS	*/
-};
-
-typedef struct vt_mode vtmode_t;
-#endif /* !_VT_MODE_DECLARED */
-
-#define NUM_KEYS	256
-#define NUM_STATES	8
-
-#ifndef _KEYMAP_DECLARED
-#define	_KEYMAP_DECLARED
-struct keyent_t {
-	u_char map[NUM_STATES];
-	u_char spcl;
-	u_char flgs;
-};
-
-struct keymap {
-	u_short	n_keys;
-	struct keyent_t key[NUM_KEYS];
-};
-
-typedef struct keymap keymap_t;
-#endif /* !_KEYMAP_DECLARED */
-
-/* end of USL VT compatibility stuff */
-
-#endif /* !_MACHINE_PCVT_IOCTL_H_ */
diff --git a/include.new/machine/pecoff_machdep.h b/include.new/machine/pecoff_machdep.h
deleted file mode 100644
index d1056a5..0000000
--- a/include.new/machine/pecoff_machdep.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* $NetBSD: pecoff_machdep.h,v 1.5 2000/01/10 03:03:54 matt Exp $	 */
-/* $FreeBSD: src/sys/i386/include/pecoff_machdep.h,v 1.1 2000/12/20 12:50:50 takawata Exp $ */
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _I386_PECOFF_MACHDEP_H_
-#define _I386_PECOFF_MACHDEP_H_
-
-#define COFF_MAGIC_I386	0x14c
-#define	COFF_BADMAG(ex)	(ex->f_magic != COFF_MAGIC_I386)
-
-#endif				/* !_I386_PECOFF_MACHDEP_H_ */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/include.new/machine/perfmon.h b/include.new/machine/perfmon.h
deleted file mode 100644
index 1499fb9..0000000
--- a/include.new/machine/perfmon.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*-
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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: releng/10.2/sys/i386/include/perfmon.h 139790 2005-01-06 22:18:23Z imp $
- */
-
-/*
- * Interface to performance-monitoring counters for Intel Pentium and
- * Pentium Pro CPUs.
- */
-
-#ifndef	_MACHINE_PERFMON_H_
-#define	_MACHINE_PERFMON_H_
- 
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-#define	NPMC	2
-
-#define	PMIOSETUP	_IOW('5', 1, struct pmc)
-#define	PMIOGET		_IOWR('5', 7, struct pmc)
-#define	PMIOSTART	_IOW('5', 2, int)
-#define	PMIOSTOP	_IOW('5', 3, int)
-#define PMIOREAD	_IOWR('5', 4, struct pmc_data)
-#define	PMIORESET	_IOW('5', 5, int)
-#define	PMIOTSTAMP	_IOR('5', 6, struct pmc_tstamp)
-
-struct pmc {
-	int pmc_num;
-	union {
-		struct {
-			unsigned char pmcus_event;
-			unsigned char pmcus_unit;
-			unsigned char pmcus_flags;
-			unsigned char pmcus_mask;
-		} pmcu_s;
-		unsigned int pmcu_val;
-	} pmc_pmcu;
-};
-
-#define	PMC_ALL		(-1)
-
-#define	pmc_event	pmc_pmcu.pmcu_s.pmcus_event
-#define	pmc_unit	pmc_pmcu.pmcu_s.pmcus_unit
-#define	pmc_flags	pmc_pmcu.pmcu_s.pmcus_flags
-#define	pmc_mask	pmc_pmcu.pmcu_s.pmcus_mask
-#define	pmc_val		pmc_pmcu.pmcu_val
-
-#define	PMCF_USR	0x01	/* count events in user mode */
-#define	PMCF_OS		0x02	/* count events in kernel mode */
-#define	PMCF_E		0x04	/* use edge-detection mode */
-#define	PMCF_PC		0x08	/* PMx output pin control */
-#define	PMCF_INT	0x10	/* APIC interrupt enable (do not use) */
-#define	PMCF_EN		0x40	/* enable counters */
-#define	PMCF_INV	0x80	/* invert counter mask comparison */
-
-#define	PMCF_SYS_FLAGS	(PMCF_INT | PMCF_EN) /* user cannot set */
-
-struct pmc_data {
-	int pmcd_num;
-	quad_t pmcd_value;
-};
-
-struct pmc_tstamp {
-	int pmct_rate;
-	quad_t pmct_value;
-};
-
-#ifndef _KERNEL
-
-#define	_PATH_PERFMON	"/dev/perfmon"
-
-#else
-
-/*
- * Intra-kernel interface to performance monitoring counters
- */
-void	perfmon_init(void);
-int	perfmon_avail(void);
-int	perfmon_setup(int, unsigned int);
-int	perfmon_get(int, unsigned int *);
-int	perfmon_fini(int);
-int	perfmon_start(int);
-int	perfmon_stop(int);
-int	perfmon_read(int, quad_t *);
-int	perfmon_reset(int);
-
-#endif /* _KERNEL */
-
-/*
- * Pentium Pro performance counters, from Appendix B.
- */
-/* Data Cache Unit */
-#define	PMC6_DATA_MEM_REFS	0x43
-#define	PMC6_DCU_LINES_IN	0x45
-#define	PMC6_DCU_M_LINES_IN	0x46
-#define	PMC6_DCU_M_LINES_OUT	0x47
-#define	PMC6_DCU_MISS_OUTSTANDING 0x48
-
-/* Instruction Fetch Unit */ 
-#define	PMC6_IFU_IFETCH		0x80
-#define	PMC6_IFU_IFETCH_MISS	0x81
-#define	PMC6_ITLB_MISS		0x85
-#define	PMC6_IFU_MEM_STALL	0x86
-#define	PMC6_ILD_STALL		0x87
-
-/* L2 Cache */
-#define	PMC6_L2_IFETCH		0x28 /* MESI */
-#define	PMC6_L2_LD		0x29 /* MESI */
-#define	PMC6_L2_ST		0x2a /* MESI */
-#define	PMC6_L2_LINES_IN	0x24
-#define	PMC6_L2_LINES_OUT	0x26
-#define	PMC6_L2_M_LINES_INM	0x25
-#define	PMC6_L2_M_LINES_OUTM	0x27
-#define	PMC6_L2_RQSTS		0x2e /* MESI */
-#define	PMC6_L2_ADS		0x21
-#define	PMC6_L2_DBUS_BUSY	0x22
-#define	PMC6_L2_DBUS_BUSY_RD	0x23
-
-/* External Bus Logic */
-#define	PMC6_BUS_DRDY_CLOCKS	0x62
-#define	PMC6_BUS_LOCK_CLOCKS	0x63
-#define	PMC6_BUS_REQ_OUTSTANDING 0x60
-#define	PMC6_BUS_TRAN_BRD	0x65
-#define	PMC6_BUS_TRAN_RFO	0x66
-#define	PMC6_BUS_TRAN_WB	0x67
-#define	PMC6_BUS_TRAN_IFETCH	0x68
-#define	PMC6_BUS_TRAN_INVAL	0x69
-#define	PMC6_BUS_TRAN_PWR	0x6a
-#define	PMC6_BUS_TRAN_P		0x6b
-#define	PMC6_BUS_TRAN_IO	0x6c
-#define	PMC6_BUS_TRAN_DEF	0x6d
-#define	PMC6_BUS_TRAN_BURST	0x6e
-#define	PMC6_BUS_TRAN_ANY	0x70
-#define	PMC6_BUS_TRAN_MEM	0x6f
-#define	PMC6_BUS_DATA_RCV	0x64
-#define	PMC6_BUS_BNR_DRV	0x61
-#define	PMC6_BUS_HIT_DRV	0x7a
-#define	PMC6_BUS_HITM_DRV	0x7b
-#define	PMC6_BUS_SNOOP_STALL	0x7e
-
-/* Floating Point Unit */
-#define	PMC6_FLOPS		0xc1 /* counter 0 only */
-#define	PMC6_FP_COMP_OPS_EXE	0x10 /* counter 0 only */
-#define	PMC6_FP_ASSIST		0x11 /* counter 1 only */
-#define	PMC6_MUL		0x12 /* counter 1 only */
-#define	PMC6_DIV		0x13 /* counter 1 only */
-#define	PMC6_CYCLES_DIV_BUSY	0x14 /* counter 0 only */
-
-/* Memory Ordering */
-#define	PMC6_LD_BLOCKS		0x03
-#define	PMC6_SB_DRAINS		0x04
-#define	PMC6_MISALIGN_MEM_REF	0x05
-
-/* Instruction Decoding and Retirement */
-#define	PMC6_INST_RETIRED	0xc0
-#define	PMC6_UOPS_RETIRED	0xc2
-#define	PMC6_INST_DECODER	0xd0 /* (sic) */
-
-/* Interrupts */
-#define	PMC6_HW_INT_RX		0xc8
-#define	PMC6_CYCLES_INT_MASKED	0xc6
-#define	PMC6_CYCLES_INT_PENDING_AND_MASKED 0xc7
-
-/* Branches */
-#define	PMC6_BR_INST_RETIRED	0xc4
-#define	PMC6_BR_MISS_PRED_RETIRED 0xc5
-#define	PMC6_BR_TAKEN_RETIRED	0xc9
-#define	PMC6_BR_MISS_PRED_TAKEN_RET 0xca
-#define	PMC6_BR_INST_DECODED	0xe0
-#define	PMC6_BTB_MISSES		0xe2
-#define	PMC6_BR_BOGUS		0xe4
-#define	PMC6_BACLEARS		0xe6
-
-/* Stalls */
-#define	PMC6_RESOURCE_STALLS	0xa2
-#define	PMC6_PARTIAL_RAT_STALLS	0xd2
-
-/* Segment Register Loads */
-#define	PMC6_SEGMENT_REG_LOADS	0x06
-
-/* Clocks */
-#define	PMC6_CPU_CLK_UNHALTED	0x79
-
-/*
- * Pentium Performance Counters
- * This list comes from the Harvard people, not Intel.
- */
-#define	PMC5_DATA_READ		0
-#define	PMC5_DATA_WRITE		1
-#define	PMC5_DATA_TLB_MISS	2
-#define	PMC5_DATA_READ_MISS	3
-#define	PMC5_DATA_WRITE_MISS	4
-#define	PMC5_WRITE_M_E		5
-#define	PMC5_DATA_LINES_WBACK	6
-#define	PMC5_DATA_CACHE_SNOOP	7
-#define	PMC5_DATA_CACHE_SNOOP_HIT 8
-#define	PMC5_MEM_ACCESS_BOTH	9
-#define	PMC5_BANK_CONFLICTS	10
-#define	PMC5_MISALIGNED_DATA	11
-#define	PMC5_INST_READ		12
-#define	PMC5_INST_TLB_MISS	13
-#define	PMC5_INST_CACHE_MISS	14
-#define	PMC5_SEGMENT_REG_LOAD	15
-#define	PMC5_BRANCHES		18
-#define	PMC5_BTB_HITS		19
-#define	PMC5_BRANCH_TAKEN	20
-#define	PMC5_PIPELINE_FLUSH	21
-#define	PMC5_INST_EXECUTED	22
-#define PMC5_INST_EXECUTED_V	23
-#define	PMC5_BUS_UTILIZATION	24
-#define	PMC5_WRITE_BACKUP_STALL	25
-#define	PMC5_DATA_READ_STALL	26
-#define	PMC5_WRITE_E_M_STALL	27
-#define	PMC5_LOCKED_BUS		28
-#define	PMC5_IO_CYCLE		29
-#define	PMC5_NONCACHE_MEMORY	30
-#define	PMC5_ADDR_GEN_INTERLOCK	31
-#define	PMC5_FLOPS		34
-#define	PMC5_BP0_MATCH		35
-#define	PMC5_BP1_MATCH		36
-#define	PMC5_BP2_MATCH		37
-#define	PMC5_BP3_MATCH		38
-#define	PMC5_HW_INTR		39
-#define	PMC5_DATA_RW		40
-#define	PMC5_DATA_RW_MISS	41
-
-#endif /* !_MACHINE_PERFMON_H_ */
diff --git a/include.new/machine/pmap.h b/include.new/machine/pmap.h
deleted file mode 100644
index 6b325d7..0000000
--- a/include.new/machine/pmap.h
+++ /dev/null
@@ -1,476 +0,0 @@
-/*-
- * Copyright (c) 1991 Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department and William Jolitz of UUNET Technologies Inc.
- *
- * 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.
- * 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.
- *
- * Derived from hp300 version by Mike Hibler, this version by William
- * Jolitz uses a recursive map [a pde points to the page directory] to
- * map the page tables using the pagetables themselves. This is done to
- * reduce the impact on kernel virtual memory for lots of sparse address
- * space, and to reduce the cost of memory to each process.
- *
- *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
- *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD: releng/10.2/sys/i386/include/pmap.h 282065 2015-04-27 08:02:12Z kib $
- */
-
-#ifndef _MACHINE_PMAP_H_
-#define	_MACHINE_PMAP_H_
-
-/*
- * Page-directory and page-table entries follow this format, with a few
- * of the fields not present here and there, depending on a lot of things.
- */
-				/* ---- Intel Nomenclature ---- */
-#define	PG_V		0x001	/* P	Valid			*/
-#define PG_RW		0x002	/* R/W	Read/Write		*/
-#define PG_U		0x004	/* U/S  User/Supervisor		*/
-#define	PG_NC_PWT	0x008	/* PWT	Write through		*/
-#define	PG_NC_PCD	0x010	/* PCD	Cache disable		*/
-#define PG_A		0x020	/* A	Accessed		*/
-#define	PG_M		0x040	/* D	Dirty			*/
-#define	PG_PS		0x080	/* PS	Page size (0=4k,1=4M)	*/
-#define	PG_PTE_PAT	0x080	/* PAT	PAT index		*/
-#define	PG_G		0x100	/* G	Global			*/
-#define	PG_AVAIL1	0x200	/*    /	Available for system	*/
-#define	PG_AVAIL2	0x400	/*   <	programmers use		*/
-#define	PG_AVAIL3	0x800	/*    \				*/
-#define	PG_PDE_PAT	0x1000	/* PAT	PAT index		*/
-#if defined(PAE) || defined(PAE_TABLES)
-#define	PG_NX		(1ull<<63) /* No-execute */
-#endif
-
-
-/* Our various interpretations of the above */
-#define PG_W		PG_AVAIL1	/* "Wired" pseudoflag */
-#define	PG_MANAGED	PG_AVAIL2
-#if defined(PAE) || defined(PAE_TABLES)
-#define	PG_FRAME	(0x000ffffffffff000ull)
-#define	PG_PS_FRAME	(0x000fffffffe00000ull)
-#else
-#define	PG_FRAME	(~PAGE_MASK)
-#define	PG_PS_FRAME	(0xffc00000)
-#endif
-#define	PG_PROT		(PG_RW|PG_U)	/* all protection bits . */
-#define PG_N		(PG_NC_PWT|PG_NC_PCD)	/* Non-cacheable */
-
-/* Page level cache control fields used to determine the PAT type */
-#define PG_PDE_CACHE	(PG_PDE_PAT | PG_NC_PWT | PG_NC_PCD)
-#define PG_PTE_CACHE	(PG_PTE_PAT | PG_NC_PWT | PG_NC_PCD)
-
-/*
- * Promotion to a 2 or 4MB (PDE) page mapping requires that the corresponding
- * 4KB (PTE) page mappings have identical settings for the following fields:
- */
-#define PG_PTE_PROMOTE	(PG_MANAGED | PG_W | PG_G | PG_PTE_PAT | \
-	    PG_M | PG_A | PG_NC_PCD | PG_NC_PWT | PG_U | PG_RW | PG_V)
-
-/*
- * Page Protection Exception bits
- */
-
-#define PGEX_P		0x01	/* Protection violation vs. not present */
-#define PGEX_W		0x02	/* during a Write cycle */
-#define PGEX_U		0x04	/* access from User mode (UPL) */
-#define PGEX_RSV	0x08	/* reserved PTE field is non-zero */
-#define PGEX_I		0x10	/* during an instruction fetch */
-
-/*
- * Size of Kernel address space.  This is the number of page table pages
- * (4MB each) to use for the kernel.  256 pages == 1 Gigabyte.
- * This **MUST** be a multiple of 4 (eg: 252, 256, 260, etc).
- * For PAE, the page table page unit size is 2MB.  This means that 512 pages
- * is 1 Gigabyte.  Double everything.  It must be a multiple of 8 for PAE.
- */
-#ifndef KVA_PAGES
-#if defined(PAE) || defined(PAE_TABLES)
-#define KVA_PAGES	512
-#else
-#define KVA_PAGES	256
-#endif
-#endif
-
-/*
- * Pte related macros
- */
-#define VADDR(pdi, pti) ((vm_offset_t)(((pdi)<<PDRSHIFT)|((pti)<<PAGE_SHIFT)))
-
-/*
- * The initial number of kernel page table pages that are constructed
- * by locore must be sufficient to map vm_page_array.  That number can
- * be calculated as follows:
- *     max_phys / PAGE_SIZE * sizeof(struct vm_page) / NBPDR
- * PAE:      max_phys 16G, sizeof(vm_page) 76, NBPDR 2M, 152 page table pages.
- * PAE_TABLES: max_phys 4G,  sizeof(vm_page) 68, NBPDR 2M, 36 page table pages.
- * Non-PAE:  max_phys 4G,  sizeof(vm_page) 68, NBPDR 4M, 18 page table pages.
- */
-#ifndef NKPT
-#if defined(PAE)
-#define	NKPT		240
-#elif defined(PAE_TABLES)
-#define	NKPT		60
-#else
-#define	NKPT		30
-#endif
-#endif
-
-#ifndef NKPDE
-#define NKPDE	(KVA_PAGES)	/* number of page tables/pde's */
-#endif
-
-/*
- * The *PTDI values control the layout of virtual memory
- *
- * XXX This works for now, but I am not real happy with it, I'll fix it
- * right after I fix locore.s and the magic 28K hole
- */
-#define	KPTDI		(NPDEPTD-NKPDE)	/* start of kernel virtual pde's */
-#define	PTDPTDI		(KPTDI-NPGPTD)	/* ptd entry that points to ptd! */
-
-/*
- * XXX doesn't really belong here I guess...
- */
-#define ISA_HOLE_START    0xa0000
-#define ISA_HOLE_LENGTH (0x100000-ISA_HOLE_START)
-
-#ifndef LOCORE
-
-#include <sys/queue.h>
-#include <sys/_cpuset.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-
-#include <vm/_vm_radix.h>
-
-#if defined(PAE) || defined(PAE_TABLES)
-
-typedef uint64_t pdpt_entry_t;
-typedef uint64_t pd_entry_t;
-typedef uint64_t pt_entry_t;
-
-#define	PTESHIFT	(3)
-#define	PDESHIFT	(3)
-
-#else
-
-typedef uint32_t pd_entry_t;
-typedef uint32_t pt_entry_t;
-
-#define	PTESHIFT	(2)
-#define	PDESHIFT	(2)
-
-#endif
-
-/*
- * Address of current address space page table maps and directories.
- */
-#ifdef _KERNEL
-extern pt_entry_t PTmap[];
-extern pd_entry_t PTD[];
-extern pd_entry_t PTDpde[];
-
-#if defined(PAE) || defined(PAE_TABLES)
-extern pdpt_entry_t *IdlePDPT;
-#endif
-extern pd_entry_t *IdlePTD;	/* physical address of "Idle" state directory */
-
-/*
- * Translate a virtual address to the kernel virtual address of its page table
- * entry (PTE).  This can be used recursively.  If the address of a PTE as
- * previously returned by this macro is itself given as the argument, then the
- * address of the page directory entry (PDE) that maps the PTE will be
- * returned.
- *
- * This macro may be used before pmap_bootstrap() is called.
- */
-#define	vtopte(va)	(PTmap + i386_btop(va))
-
-/*
- * Translate a virtual address to its physical address.
- *
- * This macro may be used before pmap_bootstrap() is called.
- */
-#define	vtophys(va)	pmap_kextract((vm_offset_t)(va))
-
-#if defined(XEN)
-#include <sys/param.h>
-
-#include <xen/xen-os.h>
-
-#include <machine/xen/xenvar.h>
-#include <machine/xen/xenpmap.h>
-
-extern pt_entry_t pg_nx;
-
-#define PG_KERNEL  (PG_V | PG_A | PG_RW | PG_M)
-
-#define MACH_TO_VM_PAGE(ma) PHYS_TO_VM_PAGE(xpmap_mtop((ma)))
-#define VM_PAGE_TO_MACH(m) xpmap_ptom(VM_PAGE_TO_PHYS((m)))
-
-#define VTOM(va) xpmap_ptom(VTOP(va))
-
-static __inline vm_paddr_t
-pmap_kextract_ma(vm_offset_t va)
-{
-        vm_paddr_t ma;
-        if ((ma = PTD[va >> PDRSHIFT]) & PG_PS) {
-                ma = (ma & ~(NBPDR - 1)) | (va & (NBPDR - 1));
-        } else {
-                ma = (*vtopte(va) & PG_FRAME) | (va & PAGE_MASK);
-        }
-        return ma;
-}
-
-static __inline vm_paddr_t
-pmap_kextract(vm_offset_t va)
-{
-        return xpmap_mtop(pmap_kextract_ma(va));
-}
-#define vtomach(va)     pmap_kextract_ma(((vm_offset_t) (va)))
-
-vm_paddr_t pmap_extract_ma(struct pmap *pmap, vm_offset_t va);
-
-void    pmap_kenter_ma(vm_offset_t va, vm_paddr_t pa);
-void    pmap_map_readonly(struct pmap *pmap, vm_offset_t va, int len);
-void    pmap_map_readwrite(struct pmap *pmap, vm_offset_t va, int len);
-
-static __inline pt_entry_t
-pte_load_store(pt_entry_t *ptep, pt_entry_t v)
-{
-	pt_entry_t r;
-
-	r = *ptep;
-	PT_SET_VA(ptep, v, TRUE);
-	return (r);
-}
-
-static __inline pt_entry_t
-pte_load_store_ma(pt_entry_t *ptep, pt_entry_t v)
-{
-	pt_entry_t r;
-
-	r = *ptep;
-	PT_SET_VA_MA(ptep, v, TRUE);
-	return (r);
-}
-
-#define	pte_load_clear(ptep)	pte_load_store((ptep), (pt_entry_t)0ULL)
-
-#define	pte_store(ptep, pte)	pte_load_store((ptep), (pt_entry_t)pte)
-#define	pte_store_ma(ptep, pte)	pte_load_store_ma((ptep), (pt_entry_t)pte)
-#define	pde_store_ma(ptep, pte)	pte_load_store_ma((ptep), (pt_entry_t)pte)
-
-#elif !defined(XEN)
-
-/*
- * KPTmap is a linear mapping of the kernel page table.  It differs from the
- * recursive mapping in two ways: (1) it only provides access to kernel page
- * table pages, and not user page table pages, and (2) it provides access to
- * a kernel page table page after the corresponding virtual addresses have
- * been promoted to a 2/4MB page mapping.
- *
- * KPTmap is first initialized by locore to support just NPKT page table
- * pages.  Later, it is reinitialized by pmap_bootstrap() to allow for
- * expansion of the kernel page table.
- */
-extern pt_entry_t *KPTmap;
-
-/*
- * Extract from the kernel page table the physical address that is mapped by
- * the given virtual address "va".
- *
- * This function may be used before pmap_bootstrap() is called.
- */
-static __inline vm_paddr_t
-pmap_kextract(vm_offset_t va)
-{
-	vm_paddr_t pa;
-
-	if ((pa = PTD[va >> PDRSHIFT]) & PG_PS) {
-		pa = (pa & PG_PS_FRAME) | (va & PDRMASK);
-	} else {
-		/*
-		 * Beware of a concurrent promotion that changes the PDE at
-		 * this point!  For example, vtopte() must not be used to
-		 * access the PTE because it would use the new PDE.  It is,
-		 * however, safe to use the old PDE because the page table
-		 * page is preserved by the promotion.
-		 */
-		pa = KPTmap[i386_btop(va)];
-		pa = (pa & PG_FRAME) | (va & PAGE_MASK);
-	}
-	return (pa);
-}
-#endif
-
-#if !defined(XEN)
-#define PT_UPDATES_FLUSH()
-#endif
-
-#if (defined(PAE) || defined(PAE_TABLES)) && !defined(XEN)
-
-#define	pde_cmpset(pdep, old, new)	atomic_cmpset_64_i586(pdep, old, new)
-#define	pte_load_store(ptep, pte)	atomic_swap_64_i586(ptep, pte)
-#define	pte_load_clear(ptep)		atomic_swap_64_i586(ptep, 0)
-#define	pte_store(ptep, pte)		atomic_store_rel_64_i586(ptep, pte)
-
-extern pt_entry_t pg_nx;
-
-#elif !defined(PAE) && !defined(PAE_TABLES) && !defined(XEN)
-
-#define	pde_cmpset(pdep, old, new)	atomic_cmpset_int(pdep, old, new)
-#define	pte_load_store(ptep, pte)	atomic_swap_int(ptep, pte)
-#define	pte_load_clear(ptep)		atomic_swap_int(ptep, 0)
-#define	pte_store(ptep, pte) do { \
-	*(u_int *)(ptep) = (u_int)(pte); \
-} while (0)
-
-#endif /* PAE */
-
-#define	pte_clear(ptep)			pte_store(ptep, 0)
-
-#define	pde_store(pdep, pde)		pte_store(pdep, pde)
-
-#endif /* _KERNEL */
-
-/*
- * Pmap stuff
- */
-struct	pv_entry;
-struct	pv_chunk;
-
-struct md_page {
-	TAILQ_HEAD(,pv_entry)	pv_list;
-	int			pat_mode;
-};
-
-struct pmap {
-	struct mtx		pm_mtx;
-	pd_entry_t		*pm_pdir;	/* KVA of page directory */
-	TAILQ_HEAD(,pv_chunk)	pm_pvchunk;	/* list of mappings in pmap */
-	cpuset_t		pm_active;	/* active on cpus */
-	struct pmap_statistics	pm_stats;	/* pmap statistics */
-	LIST_ENTRY(pmap) 	pm_list;	/* List of all pmaps */
-#if defined(PAE) || defined(PAE_TABLES)
-	pdpt_entry_t		*pm_pdpt;	/* KVA of page directory pointer
-						   table */
-#endif
-	struct vm_radix		pm_root;	/* spare page table pages */
-};
-
-typedef struct pmap	*pmap_t;
-
-#ifdef _KERNEL
-extern struct pmap	kernel_pmap_store;
-#define kernel_pmap	(&kernel_pmap_store)
-
-#define	PMAP_LOCK(pmap)		mtx_lock(&(pmap)->pm_mtx)
-#define	PMAP_LOCK_ASSERT(pmap, type) \
-				mtx_assert(&(pmap)->pm_mtx, (type))
-#define	PMAP_LOCK_DESTROY(pmap)	mtx_destroy(&(pmap)->pm_mtx)
-#define	PMAP_LOCK_INIT(pmap)	mtx_init(&(pmap)->pm_mtx, "pmap", \
-				    NULL, MTX_DEF | MTX_DUPOK)
-#define	PMAP_LOCKED(pmap)	mtx_owned(&(pmap)->pm_mtx)
-#define	PMAP_MTX(pmap)		(&(pmap)->pm_mtx)
-#define	PMAP_TRYLOCK(pmap)	mtx_trylock(&(pmap)->pm_mtx)
-#define	PMAP_UNLOCK(pmap)	mtx_unlock(&(pmap)->pm_mtx)
-#endif
-
-/*
- * For each vm_page_t, there is a list of all currently valid virtual
- * mappings of that page.  An entry is a pv_entry_t, the list is pv_list.
- */
-typedef struct pv_entry {
-	vm_offset_t	pv_va;		/* virtual address for mapping */
-	TAILQ_ENTRY(pv_entry)	pv_next;
-} *pv_entry_t;
-
-/*
- * pv_entries are allocated in chunks per-process.  This avoids the
- * need to track per-pmap assignments.
- */
-#define	_NPCM	11
-#define	_NPCPV	336
-struct pv_chunk {
-	pmap_t			pc_pmap;
-	TAILQ_ENTRY(pv_chunk)	pc_list;
-	uint32_t		pc_map[_NPCM];	/* bitmap; 1 = free */
-	TAILQ_ENTRY(pv_chunk)	pc_lru;
-	struct pv_entry		pc_pventry[_NPCPV];
-};
-
-#ifdef	_KERNEL
-
-extern caddr_t	CADDR3;
-extern pt_entry_t *CMAP3;
-extern vm_paddr_t phys_avail[];
-extern vm_paddr_t dump_avail[];
-extern int pseflag;
-extern int pgeflag;
-extern char *ptvmmap;		/* poor name! */
-extern vm_offset_t virtual_avail;
-extern vm_offset_t virtual_end;
-
-#define	pmap_page_get_memattr(m)	((vm_memattr_t)(m)->md.pat_mode)
-#define	pmap_page_is_write_mapped(m)	(((m)->aflags & PGA_WRITEABLE) != 0)
-#define	pmap_unmapbios(va, sz)	pmap_unmapdev((va), (sz))
-
-/*
- * Only the following functions or macros may be used before pmap_bootstrap()
- * is called: pmap_kenter(), pmap_kextract(), pmap_kremove(), vtophys(), and
- * vtopte().
- */
-void	pmap_bootstrap(vm_paddr_t);
-int	pmap_cache_bits(int mode, boolean_t is_pde);
-int	pmap_change_attr(vm_offset_t, vm_size_t, int);
-void	pmap_init_pat(void);
-void	pmap_kenter(vm_offset_t va, vm_paddr_t pa);
-void	*pmap_kenter_temporary(vm_paddr_t pa, int i);
-void	pmap_kremove(vm_offset_t);
-void	*pmap_mapbios(vm_paddr_t, vm_size_t);
-void	*pmap_mapdev(vm_paddr_t, vm_size_t);
-void	*pmap_mapdev_attr(vm_paddr_t, vm_size_t, int);
-boolean_t pmap_page_is_mapped(vm_page_t m);
-void	pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma);
-void	pmap_unmapdev(vm_offset_t, vm_size_t);
-pt_entry_t *pmap_pte(pmap_t, vm_offset_t) __pure2;
-void	pmap_invalidate_page(pmap_t, vm_offset_t);
-void	pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t);
-void	pmap_invalidate_all(pmap_t);
-void	pmap_invalidate_cache(void);
-void	pmap_invalidate_cache_pages(vm_page_t *pages, int count);
-void	pmap_invalidate_cache_range(vm_offset_t sva, vm_offset_t eva,
-	    boolean_t force);
-
-#endif /* _KERNEL */
-
-#endif /* !LOCORE */
-
-#endif /* !_MACHINE_PMAP_H_ */
diff --git a/include.new/machine/pmc_mdep.h b/include.new/machine/pmc_mdep.h
deleted file mode 100644
index 7fae732..0000000
--- a/include.new/machine/pmc_mdep.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * Copyright (c) 2003-2005,2008 Joseph Koshy
- * Copyright (c) 2007 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by A. Joseph Koshy under
- * sponsorship from the FreeBSD Foundation and Google, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/i386/include/pmc_mdep.h 233628 2012-03-28 20:58:30Z fabient $
- */
-
-#ifndef _MACHINE_PMC_MDEP_H
-#define	_MACHINE_PMC_MDEP_H 1
-
-#ifdef	_KERNEL
-struct pmc_mdep;
-#endif
-
-/*
- * On the i386 platform we support the following PMCs.
- *
- * TSC		The timestamp counter
- * K7		AMD Athlon XP/MP and other 32 bit processors.
- * K8		AMD Athlon64 and Opteron PMCs in 32 bit mode.
- * PIV		Intel P4/HTT and P4/EMT64
- * PPRO		Intel Pentium Pro, Pentium-II, Pentium-III, Celeron and
- *		Pentium-M processors
- * PENTIUM	Intel Pentium MMX.
- * IAP		Intel Core/Core2/Atom programmable PMCs.
- * IAF		Intel fixed-function PMCs.
- * UCP		Intel Uncore programmable PMCs.
- * UCF		Intel Uncore fixed-function PMCs.
- */
-
-#include <dev/hwpmc/hwpmc_amd.h> /* K7 and K8 */
-#include <dev/hwpmc/hwpmc_core.h>
-#include <dev/hwpmc/hwpmc_piv.h>
-#include <dev/hwpmc/hwpmc_ppro.h>
-#include <dev/hwpmc/hwpmc_pentium.h>
-#include <dev/hwpmc/hwpmc_tsc.h>
-#include <dev/hwpmc/hwpmc_uncore.h>
-
-/*
- * Intel processors implementing V2 and later of the Intel performance
- * measurement architecture have PMCs of the following classes: TSC,
- * IAF, IAP, UCF and UCP.
- */
-#define	PMC_MDEP_CLASS_INDEX_TSC	1
-#define	PMC_MDEP_CLASS_INDEX_K7		2
-#define	PMC_MDEP_CLASS_INDEX_K8		2
-#define	PMC_MDEP_CLASS_INDEX_P4		2
-#define	PMC_MDEP_CLASS_INDEX_P5		2
-#define	PMC_MDEP_CLASS_INDEX_P6		2
-#define	PMC_MDEP_CLASS_INDEX_IAP	2
-#define	PMC_MDEP_CLASS_INDEX_IAF	3
-#define	PMC_MDEP_CLASS_INDEX_UCP	4
-#define	PMC_MDEP_CLASS_INDEX_UCF	5
-
-/*
- * Architecture specific extensions to <sys/pmc.h> structures.
- */
-
-union pmc_md_op_pmcallocate  {
-	struct pmc_md_amd_op_pmcallocate	pm_amd;
-	struct pmc_md_iaf_op_pmcallocate	pm_iaf;
-	struct pmc_md_iap_op_pmcallocate	pm_iap;
-	struct pmc_md_ucf_op_pmcallocate	pm_ucf;
-	struct pmc_md_ucp_op_pmcallocate	pm_ucp;
-	struct pmc_md_p4_op_pmcallocate		pm_p4;
-	struct pmc_md_pentium_op_pmcallocate	pm_pentium;
-	struct pmc_md_ppro_op_pmcallocate	pm_ppro;
-	uint64_t				__pad[4];
-};
-
-/* Logging */
-#define	PMCLOG_READADDR		PMCLOG_READ32
-#define	PMCLOG_EMITADDR		PMCLOG_EMIT32
-
-#ifdef _KERNEL
-
-/* MD extension for 'struct pmc' */
-union pmc_md_pmc  {
-	struct pmc_md_amd_pmc	pm_amd;
-	struct pmc_md_iaf_pmc	pm_iaf;
-	struct pmc_md_iap_pmc	pm_iap;
-	struct pmc_md_ucf_pmc	pm_ucf;
-	struct pmc_md_ucp_pmc	pm_ucp;
-	struct pmc_md_p4_pmc	pm_p4;
-	struct pmc_md_pentium_pmc pm_pentium;
-	struct pmc_md_ppro_pmc	pm_ppro;
-};
-
-struct pmc;
-struct pmc_mdep;
-
-#define	PMC_TRAPFRAME_TO_PC(TF)	((TF)->tf_eip)
-#define	PMC_TRAPFRAME_TO_FP(TF)	((TF)->tf_ebp)
-
-/*
- * The layout of the stack frame on entry into the NMI handler depends on
- * whether a privilege level change (and consequent stack switch) was
- * required for entry.
- *
- * When processing an interrupt when in user mode, the processor switches
- * stacks, and saves the user mode stack pointer on the kernel stack.  The
- * user mode stack pointer is then available to the interrupt handler
- * at frame->tf_esp.
- *
- * When processing an interrupt while in kernel mode, the processor
- * continues to use the existing (kernel) stack.  Therefore we determine
- * the stack pointer for the interrupted kernel procedure by adding an
- * offset to the current frame pointer.
- */
-
-#define	PMC_TRAPFRAME_TO_USER_SP(TF)	((TF)->tf_esp)
-#define	PMC_TRAPFRAME_TO_KERNEL_SP(TF)	((uintptr_t) &((TF)->tf_esp))
-
-#define	PMC_IN_KERNEL_STACK(S,START,END)		\
-	((S) >= (START) && (S) < (END))
-#define	PMC_IN_KERNEL(va) (((va) >= USRSTACK) &&	\
-	((va) < VM_MAX_KERNEL_ADDRESS))
-
-#define	PMC_IN_USERSPACE(va) ((va) <= VM_MAXUSER_ADDRESS)
-
-#define	PMC_IN_TRAP_HANDLER(PC) 			\
-	((PC) >= (uintptr_t) start_exceptions &&	\
-	 (PC) < (uintptr_t) end_exceptions)
-
-#define	PMC_AT_FUNCTION_PROLOGUE_PUSH_BP(I)		\
-	(((I) & 0x00ffffff) == 0xe58955) /* pushl %ebp; movl %esp,%ebp */
-#define	PMC_AT_FUNCTION_PROLOGUE_MOV_SP_BP(I)		\
-	(((I) & 0x0000ffff) == 0xe589)	/* movl %esp,%ebp */
-#define	PMC_AT_FUNCTION_EPILOGUE_RET(I)			\
-	(((I) & 0xFF) == 0xC3)		   /* ret */
-
-/* Build a fake kernel trapframe from current instruction pointer. */
-#define PMC_FAKE_TRAPFRAME(TF)						\
-	do {								\
-	(TF)->tf_cs = 0; (TF)->tf_eflags = 0;				\
-	__asm __volatile("movl %%ebp,%0" : "=r" ((TF)->tf_ebp));	\
-	__asm __volatile("movl %%esp,%0" : "=r" ((TF)->tf_esp));	\
-	__asm __volatile("call 1f \n\t1: pop %0" : "=r"((TF)->tf_eip));	\
-	} while (0)
-
-/*
- * Prototypes
- */
-
-void	start_exceptions(void), end_exceptions(void);
-
-struct pmc_mdep *pmc_amd_initialize(void);
-void	pmc_amd_finalize(struct pmc_mdep *_md);
-struct pmc_mdep *pmc_intel_initialize(void);
-void	pmc_intel_finalize(struct pmc_mdep *_md);
-
-#endif /* _KERNEL */
-#endif /* _MACHINE_PMC_MDEP_H */
diff --git a/include.new/machine/ppireg.h b/include.new/machine/ppireg.h
deleted file mode 100644
index 714d0be..0000000
--- a/include.new/machine/ppireg.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (C) 2005 TAKAHASHI Yoshihiro. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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: releng/10.2/sys/i386/include/ppireg.h 146211 2005-05-14 09:10:02Z nyan $
- */
-
-#ifndef _MACHINE_PPIREG_H_
-#define _MACHINE_PPIREG_H_
-
-#ifdef _KERNEL
-
-#define	IO_PPI		0x61	/* Programmable Peripheral Interface */
-
-/*
- * PPI speaker control values
- */
-
-#define	PIT_ENABLETMR2	0x01	/* Enable timer/counter 2 */
-#define	PIT_SPKRDATA	0x02	/* Direct to speaker */
-
-#define	PIT_SPKR	(PIT_ENABLETMR2 | PIT_SPKRDATA)
-
-#define	ppi_spkr_on()	outb(IO_PPI, inb(IO_PPI) | PIT_SPKR)
-#define	ppi_spkr_off()	outb(IO_PPI, inb(IO_PPI) & ~PIT_SPKR)
-
-#endif /* _KERNEL */
-
-#endif /* _MACHINE_PPIREG_H_ */
diff --git a/include.new/machine/privatespace.h b/include.new/machine/privatespace.h
deleted file mode 100644
index c488bd1..0000000
--- a/include.new/machine/privatespace.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) Peter Wemm
- * 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.
- *
- * 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: releng/10.2/sys/i386/include/privatespace.h 158501 2006-05-12 22:38:53Z peter $
- */
-
-#ifndef _MACHINE_PRIVATESPACE_H_
-#define _MACHINE_PRIVATESPACE_H_
-
-/*
- * This is the upper (0xff800000) address space layout that is per-cpu.
- * It is setup in locore.s and pmap.c for the BSP and in mp_machdep.c for
- * each AP.  This is only applicable to the x86 SMP kernel.
- */
-struct privatespace {
-	/* page 0 - data page */
-	struct	pcpu pcpu;
-	char	__filler0[PAGE_SIZE - sizeof(struct pcpu)];
-
-	/* page 1 - idle stack (KSTACK_PAGES pages) */
-	char	idlekstack[KSTACK_PAGES * PAGE_SIZE];
-	/* page 1+KSTACK_PAGES... */
-};
-
-extern struct privatespace SMP_prvspace[];
-
-#endif	/* ! _MACHINE_PRIVATESPACE_H_ */
diff --git a/include.new/machine/proc.h b/include.new/machine/proc.h
deleted file mode 100644
index 2b685de..0000000
--- a/include.new/machine/proc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1991 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.
- * 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.
- *
- *	from: @(#)proc.h	7.1 (Berkeley) 5/15/91
- * $FreeBSD: releng/10.2/sys/i386/include/proc.h 233291 2012-03-22 04:52:51Z alc $
- */
-
-#ifndef _MACHINE_PROC_H_
-#define	_MACHINE_PROC_H_
-
-#include <machine/segments.h>
-
-struct proc_ldt {
-        caddr_t ldt_base;
-        int     ldt_len;
-        int     ldt_refcnt;
-        u_long  ldt_active;
-        struct  segment_descriptor ldt_sd;
-};
-
-/*
- * Machine-dependent part of the proc structure for i386.
- * Table of MD locks:
- *       t - Descriptor tables lock
- */
-struct mdthread {
-	int	md_spinlock_count;	/* (k) */
-	register_t md_saved_flags;	/* (k) */
-	register_t md_spurflt_addr;	/* (k) Spurious page fault address. */
-};
-
-struct mdproc {
-	struct proc_ldt *md_ldt;	/* (t) per-process ldt */
-};
-
-#define	KINFO_PROC_SIZE 768
-
-#ifdef	_KERNEL
-
-/* Get the current kernel thread stack usage. */
-#define GET_STACK_USAGE(total, used) do {				\
-	struct thread	*td = curthread;				\
-	(total) = td->td_kstack_pages * PAGE_SIZE;			\
-	(used) = (char *)td->td_kstack +				\
-	    td->td_kstack_pages * PAGE_SIZE -				\
-	    (char *)&td;						\
-} while (0)
-
-void 	set_user_ldt(struct mdproc *);
-struct 	proc_ldt *user_ldt_alloc(struct mdproc *, int);
-void 	user_ldt_free(struct thread *);
-void	user_ldt_deref(struct proc_ldt *pldt);
-
-extern struct mtx dt_lock;
-
-struct syscall_args {
-	u_int code;
-	struct sysent *callp;
-	register_t args[8];
-	int narg;
-};
-#endif	/* _KERNEL */
-
-#endif /* !_MACHINE_PROC_H_ */
diff --git a/include.new/machine/profile.h b/include.new/machine/profile.h
deleted file mode 100644
index e85eeeb..0000000
--- a/include.new/machine/profile.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- *	@(#)profile.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: releng/10.2/sys/i386/include/profile.h 214346 2010-10-25 15:28:03Z jhb $
- */
-
-#ifndef _MACHINE_PROFILE_H_
-#define	_MACHINE_PROFILE_H_
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-#ifdef _KERNEL
-
-/*
- * Config generates something to tell the compiler to align functions on 16
- * byte boundaries.  A strict alignment is good for keeping the tables small.
- */
-#define	FUNCTION_ALIGNMENT	16
-
-/*
- * The kernel uses assembler stubs instead of unportable inlines.
- * This is mainly to save a little time when profiling is not enabled,
- * which is the usual case for the kernel.
- */
-#define	_MCOUNT_DECL void mcount
-#define	MCOUNT
-
-#ifdef GUPROF
-#define	MCOUNT_DECL(s)
-#define	MCOUNT_ENTER(s)
-#define	MCOUNT_EXIT(s)
-#ifdef __GNUCLIKE_ASM
-#define	MCOUNT_OVERHEAD(label)						\
-	__asm __volatile("pushl %0; call __mcount; popl %%ecx"		\
-			 :						\
-			 : "i" (label)					\
-			 : "ax", "dx", "cx", "memory")
-#define	MEXITCOUNT_OVERHEAD()						\
-	__asm __volatile("call .mexitcount; 1:"				\
-			 : :						\
-			 : "ax", "dx", "cx", "memory")
-#define	MEXITCOUNT_OVERHEAD_GETLABEL(labelp)				\
-	__asm __volatile("movl $1b,%0" : "=rm" (labelp))
-#elif defined(lint)
-#define	MCOUNT_OVERHEAD(label)
-#define	MEXITCOUNT_OVERHEAD()
-#define	MEXITCOUNT_OVERHEAD_GETLABEL()
-#else
-#error
-#endif /* !__GNUCLIKE_ASM */
-#else /* !GUPROF */
-#define	MCOUNT_DECL(s)	register_t s;
-#ifdef SMP
-extern int	mcount_lock;
-#define	MCOUNT_ENTER(s)	{ s = intr_disable(); \
- 			  while (!atomic_cmpset_acq_int(&mcount_lock, 0, 1)) \
-			  	/* nothing */ ; }
-#define	MCOUNT_EXIT(s)	{ atomic_store_rel_int(&mcount_lock, 0); \
-			  intr_restore(s); }
-#else
-#define	MCOUNT_ENTER(s)	{ s = intr_disable(); }
-#define	MCOUNT_EXIT(s)	(intr_restore(s))
-#endif
-#endif /* GUPROF */
-
-void bintr(void);
-void btrap(void);
-void eintr(void);
-void user(void);
-
-#define	MCOUNT_FROMPC_USER(pc)					\
-	((pc < (uintfptr_t)VM_MAXUSER_ADDRESS) ? (uintfptr_t)user : pc)
-
-#define	MCOUNT_FROMPC_INTR(pc)					\
-	((pc >= (uintfptr_t)btrap && pc < (uintfptr_t)eintr) ?	\
-	    ((pc >= (uintfptr_t)bintr) ? (uintfptr_t)bintr :	\
-		(uintfptr_t)btrap) : ~0U)
-
-#else /* !_KERNEL */
-
-#define	FUNCTION_ALIGNMENT	4
-
-#define	_MCOUNT_DECL static __inline void _mcount
-
-#ifdef __GNUCLIKE_ASM
-#define	MCOUNT								\
-void									\
-mcount()								\
-{									\
-	uintfptr_t selfpc, frompc, ecx;					\
-	/*								\
-	 * In gcc 4.2, ecx might be used in the caller as the arg	\
-	 * pointer if the stack realignment option is set (-mstackrealign) \
-	 * or if the caller has the force_align_arg_pointer attribute	\
-	 * (stack realignment is ALWAYS on for main).  Preserve ecx	\
-	 * here.							\
-	 */								\
-	__asm("" : "=c" (ecx));						\
-	/*								\
-	 * Find the return address for mcount,				\
-	 * and the return address for mcount's caller.			\
-	 *								\
-	 * selfpc = pc pushed by call to mcount				\
-	 */								\
-	__asm("movl 4(%%ebp),%0" : "=r" (selfpc));			\
-	/*								\
-	 * frompc = pc pushed by call to mcount's caller.		\
-	 * The caller's stack frame has already been built, so %ebp is	\
-	 * the caller's frame pointer.  The caller's raddr is in the	\
-	 * caller's frame following the caller's caller's frame pointer.\
-	 */								\
-	__asm("movl (%%ebp),%0" : "=r" (frompc));			\
-	frompc = ((uintfptr_t *)frompc)[1];				\
-	_mcount(frompc, selfpc);					\
-	__asm("" : : "c" (ecx));					\
-}
-#else /* !__GNUCLIKE_ASM */
-#define	MCOUNT
-#endif /* __GNUCLIKE_ASM */
-
-typedef	u_int	uintfptr_t;
-
-#endif /* _KERNEL */
-
-/*
- * An unsigned integral type that can hold non-negative difference between
- * function pointers.
- */
-typedef	u_int	fptrdiff_t;
-
-#ifdef _KERNEL
-
-void	mcount(uintfptr_t frompc, uintfptr_t selfpc);
-
-#else /* !_KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-#ifdef __GNUCLIKE_ASM
-void	mcount(void) __asm(".mcount");
-#endif
-__END_DECLS
-
-#endif /* _KERNEL */
-
-#endif /* !_MACHINE_PROFILE_H_ */
diff --git a/include.new/machine/psl.h b/include.new/machine/psl.h
deleted file mode 100644
index 398c736..0000000
--- a/include.new/machine/psl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/psl.h 233204 2012-03-19 21:29:57Z tijl $ */
-
-#include <x86/psl.h>
diff --git a/include.new/machine/ptrace.h b/include.new/machine/ptrace.h
deleted file mode 100644
index 7c8971c..0000000
--- a/include.new/machine/ptrace.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/ptrace.h 232520 2012-03-04 20:24:28Z tijl $ */
-
-#include <x86/ptrace.h>
diff --git a/include.new/machine/reg.h b/include.new/machine/reg.h
deleted file mode 100644
index cce0065..0000000
--- a/include.new/machine/reg.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/reg.h 233124 2012-03-18 19:06:38Z tijl $ */
-
-#include <x86/reg.h>
diff --git a/include.new/machine/reloc.h b/include.new/machine/reloc.h
deleted file mode 100644
index 90774ff..0000000
--- a/include.new/machine/reloc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- *	@(#)reloc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/i386/include/reloc.h 128019 2004-04-07 20:46:16Z imp $
- */
-
-#ifndef _I386_MACHINE_RELOC_H_
-#define _I386_MACHINE_RELOC_H_
-
-/* Relocation format. */
-struct relocation_info {
-	int r_address;			  /* offset in text or data segment */
-	unsigned int   r_symbolnum : 24,  /* ordinal number of add symbol */
-			   r_pcrel :  1,  /* 1 if value should be pc-relative */
-			  r_length :  2,  /* log base 2 of value's width */
-			  r_extern :  1,  /* 1 if need to add symbol to value */
-			 r_baserel :  1,  /* linkage table relative */
-			r_jmptable :  1,  /* relocate to jump table */
-			r_relative :  1,  /* load address relative */
-			    r_copy :  1;  /* run time copy */
-};
-
-#endif
diff --git a/include.new/machine/resource.h b/include.new/machine/resource.h
deleted file mode 100644
index 6f44178..0000000
--- a/include.new/machine/resource.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/i386/include/resource.h 280970 2015-04-01 21:48:54Z jhb $ */
-/*-
- * Copyright 1998 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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.
- */
-
-#ifndef _MACHINE_RESOURCE_H_
-#define	_MACHINE_RESOURCE_H_	1
-
-/*
- * Definitions of resource types for Intel Architecture machines
- * with support for legacy ISA devices and drivers.
- */
-
-#define	SYS_RES_IRQ	1	/* interrupt lines */
-#define	SYS_RES_DRQ	2	/* isa dma lines */
-#define	SYS_RES_MEMORY	3	/* i/o memory */
-#define	SYS_RES_IOPORT	4	/* i/o ports */
-#ifdef NEW_PCIB
-#define	PCI_RES_BUS	5	/* PCI bus numbers */
-#endif
-
-#endif /* !_MACHINE_RESOURCE_H_ */
diff --git a/include.new/machine/runq.h b/include.new/machine/runq.h
deleted file mode 100644
index 25adc41..0000000
--- a/include.new/machine/runq.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2001 Jake Burkholder <jake@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.
- *
- * 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: releng/10.2/sys/i386/include/runq.h 139790 2005-01-06 22:18:23Z imp $
- */
-
-#ifndef	_MACHINE_RUNQ_H_
-#define	_MACHINE_RUNQ_H_
-
-#define	RQB_LEN		(2)		/* Number of priority status words. */
-#define	RQB_L2BPW	(5)		/* Log2(sizeof(rqb_word_t) * NBBY)). */
-#define	RQB_BPW		(1<<RQB_L2BPW)	/* Bits in an rqb_word_t. */
-
-#define	RQB_BIT(pri)	(1 << ((pri) & (RQB_BPW - 1)))
-#define	RQB_WORD(pri)	((pri) >> RQB_L2BPW)
-
-#define	RQB_FFS(word)	(ffs(word) - 1)
-
-/*
- * Type of run queue status word.
- */
-typedef	uint32_t	rqb_word_t;
-
-#endif
diff --git a/include.new/machine/segments.h b/include.new/machine/segments.h
deleted file mode 100644
index 686cebf..0000000
--- a/include.new/machine/segments.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 1989, 1990 William F. Jolitz
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: releng/10.2/sys/i386/include/segments.h 233203 2012-03-19 21:24:50Z tijl $
- */
-
-#ifndef _MACHINE_SEGMENTS_H_
-#define	_MACHINE_SEGMENTS_H_
-
-/*
- * 386 Segmentation Data Structures and definitions
- *	William F. Jolitz (william@ernie.berkeley.edu) 6/20/1989
- */
-
-#include <x86/segments.h>
-
-/*
- * Software definitions are in this convenient format,
- * which are translated into inconvenient segment descriptors
- * when needed to be used by the 386 hardware
- */
-
-struct	soft_segment_descriptor	{
-	unsigned ssd_base ;		/* segment base address  */
-	unsigned ssd_limit ;		/* segment extent */
-	unsigned ssd_type:5 ;		/* segment type */
-	unsigned ssd_dpl:2 ;		/* segment descriptor priority level */
-	unsigned ssd_p:1 ;		/* segment descriptor present */
-	unsigned ssd_xx:4 ;		/* unused */
-	unsigned ssd_xx1:2 ;		/* unused */
-	unsigned ssd_def32:1 ;		/* default 32 vs 16 bit size */
-	unsigned ssd_gran:1 ;		/* limit granularity (byte/page units)*/
-};
-
-/*
- * region descriptors, used to load gdt/idt tables before segments yet exist.
- */
-struct region_descriptor {
-	unsigned rd_limit:16;		/* segment extent */
-	unsigned rd_base:32 __packed;	/* base address  */
-};
-
-/*
- * Segment Protection Exception code bits
- */
-
-#define	SEGEX_EXT	0x01	/* recursive or externally induced */
-#define	SEGEX_IDT	0x02	/* interrupt descriptor table */
-#define	SEGEX_TI	0x04	/* local descriptor table */
-				/* other bits are affected descriptor index */
-#define SEGEX_IDX(s)	(((s)>>3)&0x1fff)
-
-#ifdef _KERNEL
-extern int	_default_ldt;
-#ifdef XEN
-extern struct proc_ldt default_proc_ldt;
-extern union descriptor *gdt;
-extern union descriptor *ldt;
-#else
-extern union descriptor gdt[];
-extern union descriptor ldt[NLDT];
-#endif
-extern struct soft_segment_descriptor gdt_segs[];
-extern struct gate_descriptor *idt;
-extern struct region_descriptor r_gdt, r_idt;
-
-void	lgdt(struct region_descriptor *rdp);
-void	sdtossd(struct segment_descriptor *sdp,
-	    struct soft_segment_descriptor *ssdp);
-void	ssdtosd(struct soft_segment_descriptor *ssdp,
-	    struct segment_descriptor *sdp);
-#endif /* _KERNEL */
-
-#endif /* !_MACHINE_SEGMENTS_H_ */
diff --git a/include.new/machine/setjmp.h b/include.new/machine/setjmp.h
deleted file mode 100644
index 4ba52e0..0000000
--- a/include.new/machine/setjmp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/setjmp.h 232275 2012-02-28 22:17:52Z tijl $ */
-
-#include <x86/setjmp.h>
diff --git a/include.new/machine/sf_buf.h b/include.new/machine/sf_buf.h
deleted file mode 100644
index 7ca3d9f..0000000
--- a/include.new/machine/sf_buf.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2003, 2005 Alan L. Cox <alc@cs.rice.edu>
- * 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.
- *
- * 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: releng/10.2/sys/i386/include/sf_buf.h 255318 2013-09-06 17:44:13Z glebius $
- */
-
-#ifndef _MACHINE_SF_BUF_H_
-#define _MACHINE_SF_BUF_H_
-
-#include <sys/_cpuset.h>
-#include <sys/queue.h>
-
-struct vm_page;
-
-struct sf_buf {
-	LIST_ENTRY(sf_buf) list_entry;	/* list of buffers */
-	TAILQ_ENTRY(sf_buf) free_entry;	/* list of buffers */
-	struct		vm_page *m;	/* currently mapped page */
-	vm_offset_t	kva;		/* va of mapping */
-	int		ref_count;	/* usage of this mapping */
-#ifdef SMP
-	cpuset_t	cpumask;	/* cpus on which mapping is valid */
-#endif
-};
-
-struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags);
-void sf_buf_free(struct sf_buf *sf);
-
-static __inline vm_offset_t
-sf_buf_kva(struct sf_buf *sf)
-{
-
-	return (sf->kva);
-}
-
-static __inline struct vm_page *
-sf_buf_page(struct sf_buf *sf)
-{
-
-	return (sf->m);
-}
-
-boolean_t sf_buf_invalidate_cache(vm_page_t m);
-
-#endif /* !_MACHINE_SF_BUF_H_ */
diff --git a/include.new/machine/sigframe.h b/include.new/machine/sigframe.h
deleted file mode 100644
index 70d0075..0000000
--- a/include.new/machine/sigframe.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1999 Marcel Moolenaar
- * 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 
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/i386/include/sigframe.h 247047 2013-02-20 17:39:52Z kib $
- */
-
-#ifndef _MACHINE_SIGFRAME_H_
-#define	_MACHINE_SIGFRAME_H_
-
-/*
- * Signal frames, arguments passed to application signal handlers.
- */
-#ifdef _KERNEL
-#ifdef COMPAT_43
-struct osigframe {
-	/*
-	 * The first four members may be used by applications.
-	 */
-
-	register_t	sf_signum;
-
-	/*
-	 * Either 'int' for old-style FreeBSD handler or 'siginfo_t *'
-	 * pointing to sf_siginfo for SA_SIGINFO handlers.
-	 */
-	register_t	sf_arg2;
-
-	/* Points to sf_siginfo.si_sc. */
-	register_t	sf_scp;
-
-	register_t	sf_addr;
-
-	/*
-	 * The following arguments are not constrained by the
-	 * function call protocol.
-	 * Applications are not supposed to access these members,
-	 * except using the pointers we provide in the first three
-	 * arguments.
-	 */
-
-	union {
-		__osiginfohandler_t	*sf_action;
-		__sighandler_t		*sf_handler;
-	} sf_ahu;
-
-	/* In the SA_SIGINFO case, sf_arg2 points here. */
-	osiginfo_t	sf_siginfo;
-};
-#endif
-#ifdef COMPAT_FREEBSD4
-/* FreeBSD 4.x */
-struct sigframe4 {
-	register_t	sf_signum;
-	register_t	sf_siginfo;	/* code or pointer to sf_si */
-	register_t	sf_ucontext;	/* points to sf_uc */
-	register_t	sf_addr;	/* undocumented 4th arg */
-
-	union {
-		__siginfohandler_t	*sf_action;
-		__sighandler_t		*sf_handler;
-	} sf_ahu;
-	struct ucontext4 sf_uc;		/* = *sf_ucontext */
-	siginfo_t	sf_si;		/* = *sf_siginfo (SA_SIGINFO case) */
-};
-#endif
-#endif
-
-#include <x86/sigframe.h>
-
-#endif /* !_MACHINE_SIGFRAME_H_ */
diff --git a/include.new/machine/signal.h b/include.new/machine/signal.h
deleted file mode 100644
index 274da31..0000000
--- a/include.new/machine/signal.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1986, 1989, 1991, 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.
- * 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.
- *
- *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: releng/10.2/sys/i386/include/signal.h 247047 2013-02-20 17:39:52Z kib $
- */
-
-#ifndef _MACHINE_SIGNAL_H_
-#define	_MACHINE_SIGNAL_H_
-
-#include <x86/signal.h>
-
-#if defined(_KERNEL) && defined(COMPAT_43)
-/*
- * Only the kernel should need these old type definitions.
- */
-struct osigcontext {
-	int	sc_onstack;		/* sigstack state to restore */
-	osigset_t sc_mask;		/* signal mask to restore */
-	int	sc_esp;			/* machine state follows: */
-	int	sc_ebp;
-	int	sc_isp;
-	int	sc_eip;
-	int	sc_efl;
-	int	sc_es;
-	int	sc_ds;
-	int	sc_cs;
-	int	sc_ss;
-	int	sc_edi;
-	int	sc_esi;
-	int	sc_ebx;
-	int	sc_edx;
-	int	sc_ecx;
-	int	sc_eax;
-	int	sc_gs;
-	int	sc_fs;
-	int	sc_trapno;
-	int	sc_err;
-};
-#endif
-
-#endif /* !_MACHINE_SIGNAL_H_ */
diff --git a/include.new/machine/smapi.h b/include.new/machine/smapi.h
deleted file mode 100644
index 5a1215c..0000000
--- a/include.new/machine/smapi.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 2003 Matthew N. Dodd <winter@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.
- *
- * 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: releng/10.2/sys/i386/include/smapi.h 112558 2003-03-24 20:44:39Z mdodd $
- */
-
-#ifndef _MACHINE_SMAPI_H_
-#define	_MACHINE_SMAPI_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-struct smapi_bios_header {
-	u_int8_t	signature[4];	/* '$SMB' */
-	u_int8_t	version_major;
-	u_int8_t	version_minor;
-	u_int8_t	length;
-	u_int8_t	checksum;
-	u_int16_t	information;
-#define	SMAPI_REAL_VM86		0x0001
-#define	SMAPI_PROT_16BIT	0x0002
-#define	SMAPI_PROT_32BIT	0x0004
-	u_int16_t	reserved1;
-
-	u_int16_t	real16_offset;
-	u_int16_t	real16_segment;
-
-	u_int16_t	reserved2;
-
-	u_int16_t	prot16_offset;
-	uint32_t	prot16_segment;
-
-	uint32_t	prot32_offset;
-	uint32_t	prot32_segment;
-	
-} __packed;
-
-struct smapi_bios_parameter {
-	union {
-		struct {
-			u_int8_t func;
-			u_int8_t sub_func;
-		} in;
-		struct {
-			u_int8_t rc;
-			u_int8_t sub_rc;
-		} out;
-	} type;
-
-	u_int16_t	param1;
-	u_int16_t	param2;
-	u_int16_t	param3;
-
-	uint32_t	param4;
-	uint32_t	param5;
-
-} __packed;
-
-#define	cmd_func	type.in.func
-#define	cmd_sub_func	type.in.sub_func
-#define	rsp_rc		type.out.rc
-#define	rsp_sub_rc	type.out.sub_rc
-
-#define	SMAPIOGHEADER		_IOR('$', 0, struct smapi_bios_header)
-#define SMAPIOCGFUNCTION	_IOWR('$', 1, struct smapi_bios_parameter)
-
-#endif	/* _MACHINE_SMAPI_H_ */
diff --git a/include.new/machine/smp.h b/include.new/machine/smp.h
deleted file mode 100644
index b8a9c1b..0000000
--- a/include.new/machine/smp.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD: releng/10.2/sys/i386/include/smp.h 264118 2014-04-04 14:54:54Z royger $
- *
- */
-
-#ifndef _MACHINE_SMP_H_
-#define _MACHINE_SMP_H_
-
-#ifdef _KERNEL
-
-#ifdef SMP
-
-#ifndef LOCORE
-
-#include <sys/bus.h>
-#include <machine/frame.h>
-#include <machine/intr_machdep.h>
-#include <machine/apicvar.h>
-#include <machine/pcb.h>
-
-/* global data in mpboot.s */
-extern int			bootMP_size;
-
-/* functions in mpboot.s */
-void	bootMP(void);
-
-/* global data in mp_machdep.c */
-extern int			mp_naps;
-extern int			boot_cpu_id;
-extern struct pcb		stoppcbs[];
-extern int			cpu_apic_ids[];
-#ifdef COUNT_IPIS
-extern u_long *ipi_invltlb_counts[MAXCPU];
-extern u_long *ipi_invlrng_counts[MAXCPU];
-extern u_long *ipi_invlpg_counts[MAXCPU];
-extern u_long *ipi_invlcache_counts[MAXCPU];
-extern u_long *ipi_rendezvous_counts[MAXCPU];
-extern u_long *ipi_lazypmap_counts[MAXCPU];
-#endif
-
-/* IPI handlers */
-inthand_t
-	IDTVEC(invltlb),	/* TLB shootdowns - global */
-	IDTVEC(invlpg),		/* TLB shootdowns - 1 page */
-	IDTVEC(invlrng),	/* TLB shootdowns - page range */
-	IDTVEC(invlcache),	/* Write back and invalidate cache */
-	IDTVEC(ipi_intr_bitmap_handler), /* Bitmap based IPIs */ 
-	IDTVEC(cpustop),	/* CPU stops & waits to be restarted */
-	IDTVEC(cpususpend),	/* CPU suspends & waits to be resumed */
-	IDTVEC(rendezvous),	/* handle CPU rendezvous */
-	IDTVEC(lazypmap);	/* handle lazy pmap release */
-
-/* functions in mp_machdep.c */
-void	cpu_add(u_int apic_id, char boot_cpu);
-void	cpustop_handler(void);
-#ifndef XEN
-void	cpususpend_handler(void);
-#endif
-void	invltlb_handler(void);
-void	invlpg_handler(void);
-void	invlrng_handler(void);
-void	invlcache_handler(void);
-void	init_secondary(void);
-void	ipi_startup(int apic_id, int vector);
-void	ipi_all_but_self(u_int ipi);
-#ifndef XEN
-void 	ipi_bitmap_handler(struct trapframe frame);
-#endif
-void	ipi_cpu(int cpu, u_int ipi);
-int	ipi_nmi_handler(void);
-void	ipi_selected(cpuset_t cpus, u_int ipi);
-u_int	mp_bootaddress(u_int);
-void	smp_cache_flush(void);
-void	smp_invlpg(vm_offset_t addr);
-void	smp_masked_invlpg(cpuset_t mask, vm_offset_t addr);
-void	smp_invlpg_range(vm_offset_t startva, vm_offset_t endva);
-void	smp_masked_invlpg_range(cpuset_t mask, vm_offset_t startva,
-	    vm_offset_t endva);
-void	smp_invltlb(void);
-void	smp_masked_invltlb(cpuset_t mask);
-
-#ifdef XEN
-void ipi_to_irq_init(void);
-#endif
-#endif /* !LOCORE */
-#endif /* SMP */
-
-#endif /* _KERNEL */
-#endif /* _MACHINE_SMP_H_ */
diff --git a/include.new/machine/smptests.h b/include.new/machine/smptests.h
deleted file mode 100644
index 1df290f..0000000
--- a/include.new/machine/smptests.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * Copyright (c) 1996, by Steve Passe
- * 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. The name of the developer 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/i386/include/smptests.h,v 1.47.2.1 2005/10/04 15:15:22 jhb Exp $
- */
-
-#ifndef _MACHINE_SMPTESTS_H_
-#define _MACHINE_SMPTESTS_H_
-
-
-/*
- * Various 'tests in progress' and configuration parameters.
- */
-
-/*
- * Send CPUSTOP IPI for stop/restart of other CPUs on DDB break.
-#define VERBOSE_CPUSTOP_ON_DDBBREAK
- */
-#define CPUSTOP_ON_DDBBREAK
-
-/*
- * TLB counters.
- *
-#define COUNT_XINVLTLB_HITS
- */
-
-/*
- * Per-CPU IPI interrupt counters.
- *
-#define	COUNT_IPIS
- */
-
-/*
- * Address of POST hardware port.
- * Defining this enables POSTCODE macros.
- *
-#define POST_ADDR		0x80
- */
-
-
-/*
- * POST hardware macros.
- */
-#ifdef POST_ADDR
-#define ASMPOSTCODE_INC				\
-	pushl	%eax ;				\
-	movl	_current_postcode, %eax ;	\
-	incl	%eax ;				\
-	andl	$0xff, %eax ;			\
-	movl	%eax, _current_postcode ;	\
-	outb	%al, $POST_ADDR ;		\
-	popl	%eax
-
-/*
- * Overwrite the current_postcode value.
- */
-#define ASMPOSTCODE(X)				\
-	pushl	%eax ;				\
-	movl	$X, %eax ;			\
-	movl	%eax, _current_postcode ;	\
-	outb	%al, $POST_ADDR ;		\
-	popl	%eax
-
-/*
- * Overwrite the current_postcode low nibble.
- */
-#define ASMPOSTCODE_LO(X)			\
-	pushl	%eax ;				\
-	movl	_current_postcode, %eax ;	\
-	andl	$0xf0, %eax ;			\
-	orl	$X, %eax ;			\
-	movl	%eax, _current_postcode ;	\
-	outb	%al, $POST_ADDR ;		\
-	popl	%eax
-
-/*
- * Overwrite the current_postcode high nibble.
- */
-#define ASMPOSTCODE_HI(X)			\
-	pushl	%eax ;				\
-	movl	_current_postcode, %eax ;	\
-	andl	$0x0f, %eax ;			\
-	orl	$(X<<4), %eax ;			\
-	movl	%eax, _current_postcode ;	\
-	outb	%al, $POST_ADDR ;		\
-	popl	%eax
-#else
-#define ASMPOSTCODE_INC
-#define ASMPOSTCODE(X)
-#define ASMPOSTCODE_LO(X)
-#define ASMPOSTCODE_HI(X)
-#endif /* POST_ADDR */
-
-
-#endif /* _MACHINE_SMPTESTS_H_ */
diff --git a/include.new/machine/speaker.h b/include.new/machine/speaker.h
deleted file mode 100644
index 3363313..0000000
--- a/include.new/machine/speaker.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/sys/i386/include/speaker.h 152306 2005-11-11 09:57:32Z ru $
- */
-
-#ifndef	_MACHINE_SPEAKER_H_
-#define	_MACHINE_SPEAKER_H_
-
-#include <sys/cdefs.h>
-
-#ifdef __CC_SUPPORTS_WARNING
-#warning "machine/speaker.h is deprecated.  Include dev/speaker/speaker.h instead."
-#endif
-
-#include <dev/speaker/speaker.h>
-
-#endif /* !_MACHINE_SPEAKER_H_ */
diff --git a/include.new/machine/specialreg.h b/include.new/machine/specialreg.h
deleted file mode 100644
index f1d1693..0000000
--- a/include.new/machine/specialreg.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/specialreg.h 233207 2012-03-19 21:34:11Z tijl $ */
-
-#include <x86/specialreg.h>
diff --git a/include.new/machine/stack.h b/include.new/machine/stack.h
deleted file mode 100644
index 74a5044..0000000
--- a/include.new/machine/stack.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Mach Operating System
- * Copyright (c) 1991,1990 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/i386/include/stack.h 174195 2007-12-02 20:40:35Z rwatson $
- */
-
-#ifndef _MACHINE_STACK_H_
-#define	_MACHINE_STACK_H_
-
-/*
- * Stack trace.
- */
-#define INKERNEL(va)	(((vm_offset_t)(va)) >= USRSTACK && \
-	    ((vm_offset_t)(va)) < VM_MAX_KERNEL_ADDRESS)
-
-struct i386_frame {
-	struct i386_frame	*f_frame;
-	int			 f_retaddr;
-	int			 f_arg0;
-};
-
-#endif /* !_MACHINE_STACK_H_ */
diff --git a/include.new/machine/stdarg.h b/include.new/machine/stdarg.h
deleted file mode 100644
index 2cc8e36..0000000
--- a/include.new/machine/stdarg.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/stdarg.h 232276 2012-02-28 22:30:58Z tijl $ */
-
-#include <x86/stdarg.h>
diff --git a/include.new/machine/sysarch.h b/include.new/machine/sysarch.h
deleted file mode 100644
index 6ebfa56..0000000
--- a/include.new/machine/sysarch.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/sysarch.h 233209 2012-03-19 21:57:31Z tijl $ */
-
-#include <x86/sysarch.h>
diff --git a/include.new/machine/timerreg.h b/include.new/machine/timerreg.h
deleted file mode 100644
index 6dd7ffd..0000000
--- a/include.new/machine/timerreg.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (C) 2005 TAKAHASHI Yoshihiro. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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: releng/10.2/sys/i386/include/timerreg.h 177642 2008-03-26 20:09:21Z phk $
- */
-
-/*
- * The outputs of the three timers are connected as follows:
- *
- *	 timer 0 -> irq 0
- *	 timer 1 -> dma chan 0 (for dram refresh)
- * 	 timer 2 -> speaker (via keyboard controller)
- *
- * Timer 0 is used to call hardclock.
- * Timer 2 is used to generate console beeps.
- */
-
-#ifndef _MACHINE_TIMERREG_H_
-#define _MACHINE_TIMERREG_H_
-
-#ifdef _KERNEL
-
-#include <dev/ic/i8253reg.h>
-
-#define	IO_TIMER1	0x40		/* 8253 Timer #1 */
-#define	TIMER_CNTR0	(IO_TIMER1 + TIMER_REG_CNTR0)
-#define	TIMER_CNTR1	(IO_TIMER1 + TIMER_REG_CNTR1)
-#define	TIMER_CNTR2	(IO_TIMER1 + TIMER_REG_CNTR2)
-#define	TIMER_MODE	(IO_TIMER1 + TIMER_REG_MODE)
-
-#endif /* _KERNEL */
-
-#endif /* _MACHINE_TIMERREG_H_ */
diff --git a/include.new/machine/trap.h b/include.new/machine/trap.h
deleted file mode 100644
index f0a055c..0000000
--- a/include.new/machine/trap.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/trap.h 232492 2012-03-04 14:12:57Z tijl $ */
-
-#include <x86/trap.h>
diff --git a/include.new/machine/tss.h b/include.new/machine/tss.h
deleted file mode 100644
index 1967df2..0000000
--- a/include.new/machine/tss.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)tss.h	5.4 (Berkeley) 1/18/91
- * $FreeBSD: releng/10.2/sys/i386/include/tss.h 128019 2004-04-07 20:46:16Z imp $
- */
-
-#ifndef _MACHINE_TSS_H_
-#define _MACHINE_TSS_H_ 1
-
-/*
- * Intel 386 Context Data Type
- */
-
-struct i386tss {
-	int	tss_link;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_esp0; 	/* kernel stack pointer privilege level 0 */
-	int	tss_ss0;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_esp1; 	/* kernel stack pointer privilege level 1 */
-	int	tss_ss1;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_esp2; 	/* kernel stack pointer privilege level 2 */
-	int	tss_ss2;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_cr3; 	/* page table directory */
-	int	tss_eip; 	/* program counter */
-	int	tss_eflags; 	/* program status longword */
-	int	tss_eax;
-	int	tss_ecx;
-	int	tss_edx;
-	int	tss_ebx;
-	int	tss_esp; 	/* user stack pointer */
-	int	tss_ebp; 	/* user frame pointer */
-	int	tss_esi;
-	int	tss_edi;
-	int	tss_es;		/* actually 16 bits: top 16 bits must be zero */
-	int	tss_cs;		/* actually 16 bits: top 16 bits must be zero */
-	int	tss_ss;		/* actually 16 bits: top 16 bits must be zero */
-	int	tss_ds;		/* actually 16 bits: top 16 bits must be zero */
-	int	tss_fs;		/* actually 16 bits: top 16 bits must be zero */
-	int	tss_gs;		/* actually 16 bits: top 16 bits must be zero */
-	int	tss_ldt;	/* actually 16 bits: top 16 bits must be zero */
-	int	tss_ioopt;	/* options & io offset bitmap: currently zero */
-				/* XXX unimplemented .. i/o permission bitmap */
-};
-
-#endif /* _MACHINE_TSS_H_ */
diff --git a/include.new/machine/ucontext.h b/include.new/machine/ucontext.h
deleted file mode 100644
index 8bbe6a2..0000000
--- a/include.new/machine/ucontext.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1999 Marcel Moolenaar
- * 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 
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/i386/include/ucontext.h 247047 2013-02-20 17:39:52Z kib $
- */
-
-#ifndef _MACHINE_UCONTEXT_H_
-#define	_MACHINE_UCONTEXT_H_
-
-#if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
-struct mcontext4 {
-	__register_t	mc_onstack;	/* XXX - sigcontext compat. */
-	__register_t	mc_gs;		/* machine state (struct trapframe) */
-	__register_t	mc_fs;
-	__register_t	mc_es;
-	__register_t	mc_ds;
-	__register_t	mc_edi;
-	__register_t	mc_esi;
-	__register_t	mc_ebp;
-	__register_t	mc_isp;
-	__register_t	mc_ebx;
-	__register_t	mc_edx;
-	__register_t	mc_ecx;
-	__register_t	mc_eax;
-	__register_t	mc_trapno;
-	__register_t	mc_err;
-	__register_t	mc_eip;
-	__register_t	mc_cs;
-	__register_t	mc_eflags;
-	__register_t	mc_esp;		/* machine state */
-	__register_t	mc_ss;
-	__register_t	mc_fpregs[28];	/* env87 + fpacc87 + u_long */
-	__register_t	__spare__[17];
-};
-#endif
-
-#include <x86/ucontext.h>
-
-#endif /* !_MACHINE_UCONTEXT_H_ */
diff --git a/include.new/machine/varargs.h b/include.new/machine/varargs.h
deleted file mode 100644
index ec26373..0000000
--- a/include.new/machine/varargs.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 2002 David E. O'Brien.  All rights reserved.
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)varargs.h	8.2 (Berkeley) 3/22/94
- * $FreeBSD: releng/10.2/sys/i386/include/varargs.h 143063 2005-03-02 21:33:29Z joerg $
- */
-
-#ifndef _MACHINE_VARARGS_H_
-#define	_MACHINE_VARARGS_H_
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-#ifdef __GNUCLIKE_BUILTIN_VARARGS
-
-#include <sys/_types.h>
-
-#ifndef _VA_LIST_DECLARED
-#define	_VA_LIST_DECLARED
-typedef	__va_list	va_list;
-#endif
-
-typedef int __builtin_va_alist_t __attribute__((__mode__(__word__)));
-
-#define	va_alist		__builtin_va_alist
-#define	va_dcl			__builtin_va_alist_t __builtin_va_alist; ...
-#define	va_start(ap)		__builtin_varargs_start(ap)
-#define	va_arg(ap, type)	__builtin_va_arg((ap), type)
-#define	va_end(ap)		__builtin_va_end(ap)
-
-#else	/* !__GNUCLIKE_BUILTIN_VARARGS */
-
-typedef char *va_list;
-
-#define	__va_size(type) \
-	(((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
-#if defined(__GNUCLIKE_BUILTIN_VAALIST)
-#define	va_alist	__builtin_va_alist
-#endif
-#ifdef __CC_SUPPORTS_VARADIC_XXX
-#define	va_dcl	int va_alist; ...
-#else
-#define	va_dcl	int va_alist; 
-#endif
-
-#define	va_start(ap) \
-	((ap) = (va_list)&va_alist)
-
-#define	va_arg(ap, type) \
-	(*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
-
-#define	va_end(ap)
-
-#endif /* __GNUCLIKE_BUILTIN_VARARGS */
-
-#endif /* !_MACHINE_VARARGS_H_ */
diff --git a/include.new/machine/vdso.h b/include.new/machine/vdso.h
deleted file mode 100644
index 5df5610..0000000
--- a/include.new/machine/vdso.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/vdso.h 237433 2012-06-22 07:06:40Z kib $ */
-
-#include <x86/vdso.h>
diff --git a/include.new/machine/vm.h b/include.new/machine/vm.h
deleted file mode 100644
index 51cbbfe..0000000
--- a/include.new/machine/vm.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2009 Hudson River Trading LLC
- * Written by: John H. Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/i386/include/vm.h 283927 2015-06-02 19:20:39Z jhb $
- */
-
-#ifndef _MACHINE_VM_H_
-#define	_MACHINE_VM_H_
-
-#include <machine/specialreg.h>
-
-/* Memory attributes. */
-#define	VM_MEMATTR_UNCACHEABLE		((vm_memattr_t)PAT_UNCACHEABLE)
-#define	VM_MEMATTR_WRITE_COMBINING	((vm_memattr_t)PAT_WRITE_COMBINING)
-#define	VM_MEMATTR_WRITE_THROUGH	((vm_memattr_t)PAT_WRITE_THROUGH)
-#define	VM_MEMATTR_WRITE_PROTECTED	((vm_memattr_t)PAT_WRITE_PROTECTED)
-#define	VM_MEMATTR_WRITE_BACK		((vm_memattr_t)PAT_WRITE_BACK)
-#define	VM_MEMATTR_WEAK_UNCACHEABLE	((vm_memattr_t)PAT_UNCACHED)
-
-#define	VM_MEMATTR_DEFAULT		VM_MEMATTR_WRITE_BACK
-
-#endif /* !_MACHINE_VM_H_ */
diff --git a/include.new/machine/vm86.h b/include.new/machine/vm86.h
deleted file mode 100644
index 444d039..0000000
--- a/include.new/machine/vm86.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*-
- * Copyright (c) 1997 Jonathan Lemon
- * All rights reserved.
- *
- * Derived from register.h, which is
- *     Copyright (c) 1996 Michael Smith.  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.
- *
- * 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: releng/10.2/sys/i386/include/vm86.h 258559 2013-11-25 15:58:48Z emaste $
- */
-
-#ifndef _MACHINE_VM86_H_
-#define _MACHINE_VM86_H_ 1
-
-/* standard register representation */
-typedef union {
-	u_int	r_ex;
-	struct {
-		u_short	r_x;
-		u_int	:16;
-	} r_w;
-	struct {
-		u_char	r_l;
-		u_char	r_h;
-		u_int	:16;
-	} r_b;
-} reg86_t;
-
-/* layout must match definition of struct trapframe_vm86 in <machine/frame.h> */
-
-struct vm86frame {
-	int	kernel_fs;
-	int	kernel_es;
-	int	kernel_ds;
-	reg86_t	edi;
-	reg86_t	esi;
-	reg86_t	ebp;
-	reg86_t	isp;
-	reg86_t	ebx;
-	reg86_t	edx;
-	reg86_t	ecx;
-	reg86_t	eax;
-	int	vmf_trapno;
-	int	vmf_err;
-	reg86_t	eip;
-	reg86_t	cs;
-	reg86_t	eflags;
-	reg86_t	esp;
-	reg86_t	ss;
-	reg86_t	es;
-	reg86_t	ds;
-	reg86_t	fs;
-	reg86_t	gs;
-#define vmf_ah		eax.r_b.r_h
-#define vmf_al		eax.r_b.r_l
-#define vmf_ax		eax.r_w.r_x
-#define vmf_eax		eax.r_ex
-#define vmf_bh		ebx.r_b.r_h
-#define vmf_bl		ebx.r_b.r_l
-#define vmf_bx		ebx.r_w.r_x
-#define vmf_ebx		ebx.r_ex
-#define vmf_ch		ecx.r_b.r_h
-#define vmf_cl		ecx.r_b.r_l
-#define vmf_cx		ecx.r_w.r_x
-#define vmf_ecx		ecx.r_ex
-#define vmf_dh		edx.r_b.r_h
-#define vmf_dl		edx.r_b.r_l
-#define vmf_dx		edx.r_w.r_x
-#define vmf_edx		edx.r_ex
-#define vmf_si		esi.r_w.r_x
-#define vmf_di		edi.r_w.r_x
-#define vmf_cs		cs.r_w.r_x
-#define vmf_ds		ds.r_w.r_x
-#define vmf_es		es.r_w.r_x
-#define vmf_ss		ss.r_w.r_x
-#define vmf_bp		ebp.r_w.r_x
-#define vmf_sp		esp.r_w.r_x
-#define vmf_ip		eip.r_w.r_x
-#define vmf_flags	eflags.r_w.r_x
-#define vmf_eflags	eflags.r_ex
-};
-
-#define VM86_PMAPSIZE	24
-#define VMAP_MALLOC	1	/* page was malloced by us */
-
-struct vm86context {
-	int	npages;
-	struct	vm86pmap {
-		int	flags;
-		int	pte_num;
-		vm_offset_t	kva;
-		u_int	old_pte;
-	} pmap[VM86_PMAPSIZE];
-};
-
-#define VM_USERCHANGE   (PSL_USERCHANGE)
-#define VME_USERCHANGE  (VM_USERCHANGE | PSL_VIP | PSL_VIF)
-
-struct vm86_kernel {
-	caddr_t	vm86_intmap;			/* interrupt map */
-	u_int	vm86_eflags;			/* emulated flags */
-	int	vm86_has_vme;			/* VME support */
-	int	vm86_inited;			/* we were initialized */
-	int	vm86_debug;
-	caddr_t	vm86_sproc;			/* address of sproc */
-};
-
-#define VM86_INIT	1
-#define VM86_SET_VME	2
-#define VM86_GET_VME	3
-#define VM86_INTCALL	4
-
-struct vm86_init_args {
-        int     debug;                  /* debug flag */
-        int     cpu_type;               /* cpu type to emulate */
-        u_char  int_map[32];            /* interrupt map */ 
-};
-
-struct vm86_vme_args {
-	int	state;			/* status */
-};
-
-struct vm86_intcall_args {
-	int	intnum;
-	struct 	vm86frame vmf;
-};
-
-#ifdef _KERNEL
-extern 	int vm86paddr;
-
-struct thread;
-extern	int vm86_emulate(struct vm86frame *);
-extern	int vm86_sysarch(struct thread *, char *);
-extern void vm86_trap(struct vm86frame *);
-extern 	int vm86_intcall(int, struct vm86frame *);
-extern 	int vm86_datacall(int, struct vm86frame *, struct vm86context *);
-extern void vm86_initialize(void);
-extern vm_offset_t vm86_getpage(struct vm86context *, int);
-extern vm_offset_t vm86_addpage(struct vm86context *, int, vm_offset_t);
-extern int vm86_getptr(struct vm86context *, vm_offset_t, u_short *, u_short *);
-
-extern vm_offset_t vm86_getaddr(struct vm86context *, u_short, u_short);
-#endif /* _KERNEL */
-
-#endif /* _MACHINE_VM86_H_ */
diff --git a/include.new/machine/vmparam.h b/include.new/machine/vmparam.h
deleted file mode 100644
index e22ed06..0000000
--- a/include.new/machine/vmparam.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- * Copyright (c) 1994 John S. Dyson
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)vmparam.h	5.9 (Berkeley) 5/12/91
- * $FreeBSD: releng/10.2/sys/i386/include/vmparam.h 282065 2015-04-27 08:02:12Z kib $
- */
-
-
-#ifndef _MACHINE_VMPARAM_H_
-#define _MACHINE_VMPARAM_H_ 1
-
-/*
- * Machine dependent constants for 386.
- */
-
-/*
- * Virtual memory related constants, all in bytes
- */
-#define	MAXTSIZ		(128UL*1024*1024)	/* max text size */
-#ifndef DFLDSIZ
-#define	DFLDSIZ		(128UL*1024*1024)	/* initial data size limit */
-#endif
-#ifndef MAXDSIZ
-#define	MAXDSIZ		(512UL*1024*1024)	/* max data size */
-#endif
-#ifndef	DFLSSIZ
-#define	DFLSSIZ		(8UL*1024*1024)		/* initial stack size limit */
-#endif
-#ifndef	MAXSSIZ
-#define	MAXSSIZ		(64UL*1024*1024)	/* max stack size */
-#endif
-#ifndef SGROWSIZ
-#define SGROWSIZ	(128UL*1024)		/* amount to grow stack */
-#endif
-
-/*
- * Choose between DENSE and SPARSE based on whether lower execution time or
- * lower kernel address space consumption is desired.  Under PAE, kernel
- * address space is often in short supply.
- */
-#ifdef PAE
-#define	VM_PHYSSEG_SPARSE
-#else
-#define	VM_PHYSSEG_DENSE
-#endif
-
-/*
- * The number of PHYSSEG entries must be one greater than the number
- * of phys_avail entries because the phys_avail entry that spans the
- * largest physical address that is accessible by ISA DMA is split
- * into two PHYSSEG entries. 
- */
-#define	VM_PHYSSEG_MAX		17
-
-/*
- * Create two free page pools.  Since the i386 kernel virtual address
- * space does not include a mapping onto the machine's entire physical
- * memory, VM_FREEPOOL_DIRECT is defined as an alias for the default
- * pool, VM_FREEPOOL_DEFAULT.
- */
-#define	VM_NFREEPOOL		2
-#define	VM_FREEPOOL_CACHE	1
-#define	VM_FREEPOOL_DEFAULT	0
-#define	VM_FREEPOOL_DIRECT	0
-
-/*
- * Create two free page lists: VM_FREELIST_DEFAULT is for physical
- * pages that are above the largest physical address that is
- * accessible by ISA DMA and VM_FREELIST_ISADMA is for physical pages
- * that are below that address.
- */
-#define	VM_NFREELIST		2
-#define	VM_FREELIST_DEFAULT	0
-#define	VM_FREELIST_ISADMA	1
-
-/*
- * The largest allocation size is 2MB under PAE and 4MB otherwise.
- */
-#ifdef PAE
-#define	VM_NFREEORDER		10
-#else
-#define	VM_NFREEORDER		11
-#endif
-
-/*
- * Enable superpage reservations: 1 level.
- */
-#ifndef	VM_NRESERVLEVEL
-#define	VM_NRESERVLEVEL		1
-#endif
-
-/*
- * Level 0 reservations consist of 512 pages when PAE pagetables are
- * used, and 1024 pages otherwise.
- */
-#ifndef	VM_LEVEL_0_ORDER
-#if defined(PAE) || defined(PAE_TABLES)
-#define	VM_LEVEL_0_ORDER	9
-#else
-#define	VM_LEVEL_0_ORDER	10
-#endif
-#endif
-
-/*
- * Kernel physical load address.
- */
-#ifndef KERNLOAD
-#if defined(XEN) && !defined(XEN_PRIVILEGED_GUEST)
-#define	KERNLOAD		0
-#else
-#define	KERNLOAD		(1 << PDRSHIFT)
-#endif
-#endif /* !defined(KERNLOAD) */
-
-/*
- * Virtual addresses of things.  Derived from the page directory and
- * page table indexes from pmap.h for precision.
- * Because of the page that is both a PD and PT, it looks a little
- * messy at times, but hey, we'll do anything to save a page :-)
- */
-
-#ifdef XEN
-#define VM_MAX_KERNEL_ADDRESS	HYPERVISOR_VIRT_START
-#else
-#define VM_MAX_KERNEL_ADDRESS	VADDR(KPTDI+NKPDE-1, NPTEPG-1)
-#endif
-
-#define VM_MIN_KERNEL_ADDRESS	VADDR(PTDPTDI, PTDPTDI)
-
-#define	KERNBASE		VADDR(KPTDI, 0)
-
-#define UPT_MAX_ADDRESS		VADDR(PTDPTDI, PTDPTDI)
-#define UPT_MIN_ADDRESS		VADDR(PTDPTDI, 0)
-
-#define VM_MAXUSER_ADDRESS	VADDR(PTDPTDI, 0)
-
-#define	SHAREDPAGE		(VM_MAXUSER_ADDRESS - PAGE_SIZE)
-#define	USRSTACK		SHAREDPAGE
-
-#define VM_MAX_ADDRESS		VADDR(PTDPTDI, PTDPTDI)
-#define VM_MIN_ADDRESS		((vm_offset_t)0)
-
-/*
- * How many physical pages per kmem arena virtual page.
- */
-#ifndef VM_KMEM_SIZE_SCALE
-#define	VM_KMEM_SIZE_SCALE	(3)
-#endif
-
-/*
- * Optional floor (in bytes) on the size of the kmem arena.
- */
-#ifndef VM_KMEM_SIZE_MIN
-#define	VM_KMEM_SIZE_MIN	(12 * 1024 * 1024)
-#endif
-
-/*
- * Optional ceiling (in bytes) on the size of the kmem arena: 40% of the
- * kernel map rounded to the nearest multiple of the superpage size.
- */
-#ifndef VM_KMEM_SIZE_MAX
-#define	VM_KMEM_SIZE_MAX	(((((VM_MAX_KERNEL_ADDRESS - \
-    VM_MIN_KERNEL_ADDRESS) >> (PDRSHIFT - 2)) + 5) / 10) << PDRSHIFT)
-#endif
-
-/* initial pagein size of beginning of executable file */
-#ifndef VM_INITIAL_PAGEIN
-#define	VM_INITIAL_PAGEIN	16
-#endif
-
-#define	ZERO_REGION_SIZE	(64 * 1024)	/* 64KB */
-
-#ifndef VM_MAX_AUTOTUNE_MAXUSERS
-#define VM_MAX_AUTOTUNE_MAXUSERS 384
-#endif
-
-#endif /* _MACHINE_VMPARAM_H_ */
diff --git a/include.new/machine/xbox.h b/include.new/machine/xbox.h
deleted file mode 100644
index b9d4332..0000000
--- a/include.new/machine/xbox.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2005 Rink Springer
- * 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 ``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 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: releng/10.2/sys/i386/include/xbox.h 156243 2006-03-03 14:52:57Z rink $
- */
-#ifndef _MACHINE_XBOX_H_
-#define _MACHINE_XBOX_H_
-
-#define XBOX_LED_GREEN		0x0f
-#define XBOX_LED_RED		0xf0
-#define XBOX_LED_FLASHRED	0xa0
-#define XBOX_LED_FLASHGREEN	0x03
-
-#define XBOX_RAM_SIZE		(arch_i386_xbox_memsize * 1024 * 1024)
-#define XBOX_FB_SIZE		(0x130000)
-#define XBOX_FB_START		(0xf0000000 | (XBOX_RAM_SIZE - XBOX_FB_SIZE))
-#define XBOX_FB_START_PTR	(0xFD600800)
-
-extern int arch_i386_is_xbox;
-extern uint32_t arch_i386_xbox_memsize; /* Megabytes */
-
-void pic16l_setbyte(int addr, int reg, int data);
-void pic16l_setled(int val);
-void pic16l_reboot(void);
-void pic16l_poweroff(void);
-
-#endif /* !_MACHINE_XBOX_H_ */
diff --git a/include.new/magic.h b/include.new/magic.h
deleted file mode 100644
index 0d64316..0000000
--- a/include.new/magic.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) Christos Zoulas 2003.
- * 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 immediately at the beginning of the file, without modification,
- *    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.
- *
- * 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.
- */
-#ifndef _MAGIC_H
-#define _MAGIC_H
-
-#include <sys/types.h>
-
-#define	MAGIC_NONE		0x0000000 /* No flags */
-#define	MAGIC_DEBUG		0x0000001 /* Turn on debugging */
-#define	MAGIC_SYMLINK		0x0000002 /* Follow symlinks */
-#define	MAGIC_COMPRESS		0x0000004 /* Check inside compressed files */
-#define	MAGIC_DEVICES		0x0000008 /* Look at the contents of devices */
-#define	MAGIC_MIME_TYPE		0x0000010 /* Return the MIME type */
-#define	MAGIC_CONTINUE		0x0000020 /* Return all matches */
-#define	MAGIC_CHECK		0x0000040 /* Print warnings to stderr */
-#define	MAGIC_PRESERVE_ATIME	0x0000080 /* Restore access time on exit */
-#define	MAGIC_RAW		0x0000100 /* Don't convert unprintable chars */
-#define	MAGIC_ERROR		0x0000200 /* Handle ENOENT etc as real errors */
-#define	MAGIC_MIME_ENCODING	0x0000400 /* Return the MIME encoding */
-#define MAGIC_MIME		(MAGIC_MIME_TYPE|MAGIC_MIME_ENCODING)
-#define	MAGIC_APPLE		0x0000800 /* Return the Apple creator/type */
-#define	MAGIC_EXTENSION		0x1000000 /* Return a /-separated list of
-					   * extensions */
-#define MAGIC_COMPRESS_TRANSP	0x2000000 /* Check inside compressed files
-					   * but not report compression */
-#define MAGIC_NODESC		(MAGIC_EXTENSION|MAGIC_MIME|MAGIC_APPLE)
-
-#define	MAGIC_NO_CHECK_COMPRESS	0x0001000 /* Don't check for compressed files */
-#define	MAGIC_NO_CHECK_TAR	0x0002000 /* Don't check for tar files */
-#define	MAGIC_NO_CHECK_SOFT	0x0004000 /* Don't check magic entries */
-#define	MAGIC_NO_CHECK_APPTYPE	0x0008000 /* Don't check application type */
-#define	MAGIC_NO_CHECK_ELF	0x0010000 /* Don't check for elf details */
-#define	MAGIC_NO_CHECK_TEXT	0x0020000 /* Don't check for text files */
-#define	MAGIC_NO_CHECK_CDF	0x0040000 /* Don't check for cdf files */
-#define	MAGIC_NO_CHECK_TOKENS	0x0100000 /* Don't check tokens */
-#define MAGIC_NO_CHECK_ENCODING 0x0200000 /* Don't check text encodings */
-
-/* No built-in tests; only consult the magic file */
-#define MAGIC_NO_CHECK_BUILTIN	( \
-	MAGIC_NO_CHECK_COMPRESS	| \
-	MAGIC_NO_CHECK_TAR	| \
-/*	MAGIC_NO_CHECK_SOFT	| */ \
-	MAGIC_NO_CHECK_APPTYPE	| \
-	MAGIC_NO_CHECK_ELF	| \
-	MAGIC_NO_CHECK_TEXT	| \
-	MAGIC_NO_CHECK_CDF	| \
-	MAGIC_NO_CHECK_TOKENS	| \
-	MAGIC_NO_CHECK_ENCODING	| \
-	0			  \
-)
-
-/* Defined for backwards compatibility (renamed) */
-#define	MAGIC_NO_CHECK_ASCII	MAGIC_NO_CHECK_TEXT
-
-/* Defined for backwards compatibility; do nothing */
-#define	MAGIC_NO_CHECK_FORTRAN	0x000000 /* Don't check ascii/fortran */
-#define	MAGIC_NO_CHECK_TROFF	0x000000 /* Don't check ascii/troff */
-
-#define MAGIC_VERSION		522	/* This implementation */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct magic_set *magic_t;
-magic_t magic_open(int);
-void magic_close(magic_t);
-
-const char *magic_getpath(const char *, int);
-const char *magic_file(magic_t, const char *);
-const char *magic_descriptor(magic_t, int);
-const char *magic_buffer(magic_t, const void *, size_t);
-
-const char *magic_error(magic_t);
-int magic_setflags(magic_t, int);
-
-int magic_version(void);
-int magic_load(magic_t, const char *);
-int magic_load_buffers(magic_t, void **, size_t *, size_t);
-
-int magic_compile(magic_t, const char *);
-int magic_check(magic_t, const char *);
-int magic_list(magic_t, const char *);
-int magic_errno(magic_t);
-
-#define MAGIC_PARAM_INDIR_MAX		0
-#define MAGIC_PARAM_NAME_MAX		1
-#define MAGIC_PARAM_ELF_PHNUM_MAX	2
-#define MAGIC_PARAM_ELF_SHNUM_MAX	3
-#define MAGIC_PARAM_ELF_NOTES_MAX	4
-
-int magic_setparam(magic_t, int, const void *);
-int magic_getparam(magic_t, int, void *);
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _MAGIC_H */
diff --git a/include.new/malloc.h b/include.new/malloc.h
deleted file mode 100644
index c0e4159..0000000
--- a/include.new/malloc.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $FreeBSD: releng/10.2/include/malloc.h 86178 2001-11-07 23:14:31Z obrien $ */
-#if __STDC__
-#error "<malloc.h> has been replaced by <stdlib.h>"
-#else
-#include <stdlib.h>
-#endif
diff --git a/include.new/malloc_np.h b/include.new/malloc_np.h
deleted file mode 100644
index a331475..0000000
--- a/include.new/malloc_np.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (C) 2006 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/include/malloc_np.h 250991 2013-05-25 18:59:11Z marcel $
- */
-
-#ifndef _MALLOC_NP_H_
-#define	_MALLOC_NP_H_
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <strings.h>
-
-__BEGIN_DECLS
-size_t	malloc_usable_size(const void *ptr);
-
-void	malloc_stats_print(void (*write_cb)(void *, const char *),
-    void *cbopaque, const char *opts);
-int	mallctl(const char *name, void *oldp, size_t *oldlenp, void *newp,
-    size_t newlen);
-int	mallctlnametomib(const char *name, size_t *mibp, size_t *miblenp);
-int	mallctlbymib(const size_t *mib, size_t miblen, void *oldp,
-    size_t *oldlenp, void *newp, size_t newlen);
-
-#define	ALLOCM_LG_ALIGN(la)	(la)
-#define	ALLOCM_ALIGN(a)	(ffsl(a)-1)
-#define	ALLOCM_ZERO	((int)0x40)
-#define	ALLOCM_NO_MOVE	((int)0x80)
-
-#define	ALLOCM_SUCCESS		0
-#define	ALLOCM_ERR_OOM		1
-#define	ALLOCM_ERR_NOT_MOVED	2
-
-int	allocm(void **ptr, size_t *rsize, size_t size, int flags) __nonnull(1);
-int	rallocm(void **ptr, size_t *rsize, size_t size, size_t extra,
-    int flags) __nonnull(1);
-int	sallocm(const void *ptr, size_t *rsize, int flags) __nonnull(1);
-int	dallocm(void *ptr, int flags) __nonnull(1);
-int	nallocm(size_t *rsize, size_t size, int flags);
-
-void *	__calloc(size_t, size_t) __malloc_like;
-void *	__malloc(size_t) __malloc_like;
-void *	__realloc(void *, size_t);
-void	__free(void *);
-int	__posix_memalign(void **, size_t, size_t);
-size_t	__malloc_usable_size(const void *);
-int	__allocm(void **, size_t *, size_t, int) __nonnull(1);
-int	__rallocm(void **, size_t *, size_t, size_t, int) __nonnull(1);
-int	__sallocm(const void *, size_t *, int) __nonnull(1);
-int	__dallocm(void *, int) __nonnull(1);
-int	__nallocm(size_t *, size_t, int);
-__END_DECLS
-
-#endif /* _MALLOC_NP_H_ */
diff --git a/include.new/math.h b/include.new/math.h
deleted file mode 100644
index 25854da..0000000
--- a/include.new/math.h
+++ /dev/null
@@ -1,511 +0,0 @@
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-/*
- * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD: releng/10.2/lib/msun/src/math.h 284810 2015-06-25 13:01:10Z tijl $
- */
-
-#ifndef _MATH_H_
-#define	_MATH_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <machine/_limits.h>
-
-/*
- * ANSI/POSIX
- */
-extern const union __infinity_un {
-	unsigned char	__uc[8];
-	double		__ud;
-} __infinity;
-
-extern const union __nan_un {
-	unsigned char	__uc[sizeof(float)];
-	float		__uf;
-} __nan;
-
-#if __GNUC_PREREQ__(3, 3) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
-#define	__MATH_BUILTIN_CONSTANTS
-#endif
-
-#if __GNUC_PREREQ__(3, 0) && !defined(__INTEL_COMPILER)
-#define	__MATH_BUILTIN_RELOPS
-#endif
-
-#ifdef __MATH_BUILTIN_CONSTANTS
-#define	HUGE_VAL	__builtin_huge_val()
-#else
-#define	HUGE_VAL	(__infinity.__ud)
-#endif
-
-#if __ISO_C_VISIBLE >= 1999
-#define	FP_ILOGB0	(-__INT_MAX)
-#define	FP_ILOGBNAN	__INT_MAX
-
-#ifdef __MATH_BUILTIN_CONSTANTS
-#define	HUGE_VALF	__builtin_huge_valf()
-#define	HUGE_VALL	__builtin_huge_vall()
-#define	INFINITY	__builtin_inff()
-#define	NAN		__builtin_nanf("")
-#else
-#define	HUGE_VALF	(float)HUGE_VAL
-#define	HUGE_VALL	(long double)HUGE_VAL
-#define	INFINITY	HUGE_VALF
-#define	NAN		(__nan.__uf)
-#endif /* __MATH_BUILTIN_CONSTANTS */
-
-#define	MATH_ERRNO	1
-#define	MATH_ERREXCEPT	2
-#define	math_errhandling	MATH_ERREXCEPT
-
-#define	FP_FAST_FMAF	1
-#ifdef __ia64__
-#define	FP_FAST_FMA	1
-#define	FP_FAST_FMAL	1
-#endif
-
-/* Symbolic constants to classify floating point numbers. */
-#define	FP_INFINITE	0x01
-#define	FP_NAN		0x02
-#define	FP_NORMAL	0x04
-#define	FP_SUBNORMAL	0x08
-#define	FP_ZERO		0x10
-
-#if (__STDC_VERSION__ >= 201112L && defined(__clang__)) || \
-    __has_extension(c_generic_selections)
-#define	__fp_type_select(x, f, d, ld) _Generic((x),			\
-    float: f(x),							\
-    double: d(x),							\
-    long double: ld(x),							\
-    volatile float: f(x),						\
-    volatile double: d(x),						\
-    volatile long double: ld(x),					\
-    volatile const float: f(x),						\
-    volatile const double: d(x),					\
-    volatile const long double: ld(x),					\
-    const float: f(x),							\
-    const double: d(x),							\
-    const long double: ld(x))
-#elif __GNUC_PREREQ__(3, 1) && !defined(__cplusplus)
-#define	__fp_type_select(x, f, d, ld) __builtin_choose_expr(		\
-    __builtin_types_compatible_p(__typeof(x), long double), ld(x),	\
-    __builtin_choose_expr(						\
-    __builtin_types_compatible_p(__typeof(x), double), d(x),		\
-    __builtin_choose_expr(						\
-    __builtin_types_compatible_p(__typeof(x), float), f(x), (void)0)))
-#else
-#define	 __fp_type_select(x, f, d, ld)					\
-    ((sizeof(x) == sizeof(float)) ? f(x)				\
-    : (sizeof(x) == sizeof(double)) ? d(x)				\
-    : ld(x))
-#endif
-
-#define	fpclassify(x) \
-	__fp_type_select(x, __fpclassifyf, __fpclassifyd, __fpclassifyl)
-#define	isfinite(x) __fp_type_select(x, __isfinitef, __isfinite, __isfinitel)
-#define	isinf(x) __fp_type_select(x, __isinff, __isinf, __isinfl)
-#define	isnan(x) \
-	__fp_type_select(x, __inline_isnanf, __inline_isnan, __inline_isnanl)
-#define	isnormal(x) __fp_type_select(x, __isnormalf, __isnormal, __isnormall)
-
-#ifdef __MATH_BUILTIN_RELOPS
-#define	isgreater(x, y)		__builtin_isgreater((x), (y))
-#define	isgreaterequal(x, y)	__builtin_isgreaterequal((x), (y))
-#define	isless(x, y)		__builtin_isless((x), (y))
-#define	islessequal(x, y)	__builtin_islessequal((x), (y))
-#define	islessgreater(x, y)	__builtin_islessgreater((x), (y))
-#define	isunordered(x, y)	__builtin_isunordered((x), (y))
-#else
-#define	isgreater(x, y)		(!isunordered((x), (y)) && (x) > (y))
-#define	isgreaterequal(x, y)	(!isunordered((x), (y)) && (x) >= (y))
-#define	isless(x, y)		(!isunordered((x), (y)) && (x) < (y))
-#define	islessequal(x, y)	(!isunordered((x), (y)) && (x) <= (y))
-#define	islessgreater(x, y)	(!isunordered((x), (y)) && \
-					((x) > (y) || (y) > (x)))
-#define	isunordered(x, y)	(isnan(x) || isnan(y))
-#endif /* __MATH_BUILTIN_RELOPS */
-
-#define	signbit(x) __fp_type_select(x, __signbitf, __signbit, __signbitl)
-
-typedef	__double_t	double_t;
-typedef	__float_t	float_t;
-#endif /* __ISO_C_VISIBLE >= 1999 */
-
-/*
- * XOPEN/SVID
- */
-#if __BSD_VISIBLE || __XSI_VISIBLE
-#define	M_E		2.7182818284590452354	/* e */
-#define	M_LOG2E		1.4426950408889634074	/* log 2e */
-#define	M_LOG10E	0.43429448190325182765	/* log 10e */
-#define	M_LN2		0.69314718055994530942	/* log e2 */
-#define	M_LN10		2.30258509299404568402	/* log e10 */
-#define	M_PI		3.14159265358979323846	/* pi */
-#define	M_PI_2		1.57079632679489661923	/* pi/2 */
-#define	M_PI_4		0.78539816339744830962	/* pi/4 */
-#define	M_1_PI		0.31830988618379067154	/* 1/pi */
-#define	M_2_PI		0.63661977236758134308	/* 2/pi */
-#define	M_2_SQRTPI	1.12837916709551257390	/* 2/sqrt(pi) */
-#define	M_SQRT2		1.41421356237309504880	/* sqrt(2) */
-#define	M_SQRT1_2	0.70710678118654752440	/* 1/sqrt(2) */
-
-#define	MAXFLOAT	((float)3.40282346638528860e+38)
-extern int signgam;
-#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE
-#if 0
-/* Old value from 4.4BSD-Lite math.h; this is probably better. */
-#define	HUGE		HUGE_VAL
-#else
-#define	HUGE		MAXFLOAT
-#endif
-#endif /* __BSD_VISIBLE */
-
-/*
- * Most of these functions depend on the rounding mode and have the side
- * effect of raising floating-point exceptions, so they are not declared
- * as __pure2.  In C99, FENV_ACCESS affects the purity of these functions.
- */
-__BEGIN_DECLS
-/*
- * ANSI/POSIX
- */
-int	__fpclassifyd(double) __pure2;
-int	__fpclassifyf(float) __pure2;
-int	__fpclassifyl(long double) __pure2;
-int	__isfinitef(float) __pure2;
-int	__isfinite(double) __pure2;
-int	__isfinitel(long double) __pure2;
-int	__isinff(float) __pure2;
-int	__isinf(double) __pure2;
-int	__isinfl(long double) __pure2;
-int	__isnormalf(float) __pure2;
-int	__isnormal(double) __pure2;
-int	__isnormall(long double) __pure2;
-int	__signbit(double) __pure2;
-int	__signbitf(float) __pure2;
-int	__signbitl(long double) __pure2;
-
-static __inline int
-__inline_isnan(__const double __x)
-{
-
-	return (__x != __x);
-}
-
-static __inline int
-__inline_isnanf(__const float __x)
-{
-
-	return (__x != __x);
-}
-
-static __inline int
-__inline_isnanl(__const long double __x)
-{
-
-	return (__x != __x);
-}
-
-/*
- * Version 2 of the Single UNIX Specification (UNIX98) defined isnan() and
- * isinf() as functions taking double.  C99, and the subsequent POSIX revisions
- * (SUSv3, POSIX.1-2001, define it as a macro that accepts any real floating
- * point type.  If we are targeting SUSv2 and C99 or C11 (or C++11) then we
- * expose the newer definition, assuming that the language spec takes
- * precedence over the operating system interface spec.
- */
-#if	__XSI_VISIBLE > 0 && __XSI_VISIBLE < 600 && __ISO_C_VISIBLE < 1999
-#undef isinf
-#undef isnan
-int	isinf(double);
-int	isnan(double);
-#endif
-
-double	acos(double);
-double	asin(double);
-double	atan(double);
-double	atan2(double, double);
-double	cos(double);
-double	sin(double);
-double	tan(double);
-
-double	cosh(double);
-double	sinh(double);
-double	tanh(double);
-
-double	exp(double);
-double	frexp(double, int *);	/* fundamentally !__pure2 */
-double	ldexp(double, int);
-double	log(double);
-double	log10(double);
-double	modf(double, double *);	/* fundamentally !__pure2 */
-
-double	pow(double, double);
-double	sqrt(double);
-
-double	ceil(double);
-double	fabs(double) __pure2;
-double	floor(double);
-double	fmod(double, double);
-
-/*
- * These functions are not in C90.
- */
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE
-double	acosh(double);
-double	asinh(double);
-double	atanh(double);
-double	cbrt(double);
-double	erf(double);
-double	erfc(double);
-double	exp2(double);
-double	expm1(double);
-double	fma(double, double, double);
-double	hypot(double, double);
-int	ilogb(double) __pure2;
-double	lgamma(double);
-long long llrint(double);
-long long llround(double);
-double	log1p(double);
-double	log2(double);
-double	logb(double);
-long	lrint(double);
-long	lround(double);
-double	nan(const char *) __pure2;
-double	nextafter(double, double);
-double	remainder(double, double);
-double	remquo(double, double, int *);
-double	rint(double);
-#endif /* __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __XSI_VISIBLE
-double	j0(double);
-double	j1(double);
-double	jn(int, double);
-double	y0(double);
-double	y1(double);
-double	yn(int, double);
-
-#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE
-double	gamma(double);
-#endif
-
-#if __XSI_VISIBLE <= 600 || __BSD_VISIBLE
-double	scalb(double, double);
-#endif
-#endif /* __BSD_VISIBLE || __XSI_VISIBLE */
-
-#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 1999
-double	copysign(double, double) __pure2;
-double	fdim(double, double);
-double	fmax(double, double) __pure2;
-double	fmin(double, double) __pure2;
-double	nearbyint(double);
-double	round(double);
-double	scalbln(double, long);
-double	scalbn(double, int);
-double	tgamma(double);
-double	trunc(double);
-#endif
-
-/*
- * BSD math library entry points
- */
-#if __BSD_VISIBLE
-double	drem(double, double);
-int	finite(double) __pure2;
-int	isnanf(float) __pure2;
-
-/*
- * Reentrant version of gamma & lgamma; passes signgam back by reference
- * as the second argument; user must allocate space for signgam.
- */
-double	gamma_r(double, int *);
-double	lgamma_r(double, int *);
-
-/*
- * IEEE Test Vector
- */
-double	significand(double);
-#endif /* __BSD_VISIBLE */
-
-/* float versions of ANSI/POSIX functions */
-#if __ISO_C_VISIBLE >= 1999
-float	acosf(float);
-float	asinf(float);
-float	atanf(float);
-float	atan2f(float, float);
-float	cosf(float);
-float	sinf(float);
-float	tanf(float);
-
-float	coshf(float);
-float	sinhf(float);
-float	tanhf(float);
-
-float	exp2f(float);
-float	expf(float);
-float	expm1f(float);
-float	frexpf(float, int *);	/* fundamentally !__pure2 */
-int	ilogbf(float) __pure2;
-float	ldexpf(float, int);
-float	log10f(float);
-float	log1pf(float);
-float	log2f(float);
-float	logf(float);
-float	modff(float, float *);	/* fundamentally !__pure2 */
-
-float	powf(float, float);
-float	sqrtf(float);
-
-float	ceilf(float);
-float	fabsf(float) __pure2;
-float	floorf(float);
-float	fmodf(float, float);
-float	roundf(float);
-
-float	erff(float);
-float	erfcf(float);
-float	hypotf(float, float);
-float	lgammaf(float);
-float	tgammaf(float);
-
-float	acoshf(float);
-float	asinhf(float);
-float	atanhf(float);
-float	cbrtf(float);
-float	logbf(float);
-float	copysignf(float, float) __pure2;
-long long llrintf(float);
-long long llroundf(float);
-long	lrintf(float);
-long	lroundf(float);
-float	nanf(const char *) __pure2;
-float	nearbyintf(float);
-float	nextafterf(float, float);
-float	remainderf(float, float);
-float	remquof(float, float, int *);
-float	rintf(float);
-float	scalblnf(float, long);
-float	scalbnf(float, int);
-float	truncf(float);
-
-float	fdimf(float, float);
-float	fmaf(float, float, float);
-float	fmaxf(float, float) __pure2;
-float	fminf(float, float) __pure2;
-#endif
-
-/*
- * float versions of BSD math library entry points
- */
-#if __BSD_VISIBLE
-float	dremf(float, float);
-int	finitef(float) __pure2;
-float	gammaf(float);
-float	j0f(float);
-float	j1f(float);
-float	jnf(int, float);
-float	scalbf(float, float);
-float	y0f(float);
-float	y1f(float);
-float	ynf(int, float);
-
-/*
- * Float versions of reentrant version of gamma & lgamma; passes
- * signgam back by reference as the second argument; user must
- * allocate space for signgam.
- */
-float	gammaf_r(float, int *);
-float	lgammaf_r(float, int *);
-
-/*
- * float version of IEEE Test Vector
- */
-float	significandf(float);
-#endif	/* __BSD_VISIBLE */
-
-/*
- * long double versions of ISO/POSIX math functions
- */
-#if __ISO_C_VISIBLE >= 1999
-long double	acoshl(long double);
-long double	acosl(long double);
-long double	asinhl(long double);
-long double	asinl(long double);
-long double	atan2l(long double, long double);
-long double	atanhl(long double);
-long double	atanl(long double);
-long double	cbrtl(long double);
-long double	ceill(long double);
-long double	copysignl(long double, long double) __pure2;
-long double	coshl(long double);
-long double	cosl(long double);
-long double	erfcl(long double);
-long double	erfl(long double);
-long double	exp2l(long double);
-long double	expl(long double);
-long double	expm1l(long double);
-long double	fabsl(long double) __pure2;
-long double	fdiml(long double, long double);
-long double	floorl(long double);
-long double	fmal(long double, long double, long double);
-long double	fmaxl(long double, long double) __pure2;
-long double	fminl(long double, long double) __pure2;
-long double	fmodl(long double, long double);
-long double	frexpl(long double value, int *); /* fundamentally !__pure2 */
-long double	hypotl(long double, long double);
-int		ilogbl(long double) __pure2;
-long double	ldexpl(long double, int);
-long double	lgammal(long double);
-long long	llrintl(long double);
-long long	llroundl(long double);
-long double	log10l(long double);
-long double	log1pl(long double);
-long double	log2l(long double);
-long double	logbl(long double);
-long double	logl(long double);
-long		lrintl(long double);
-long		lroundl(long double);
-long double	modfl(long double, long double *); /* fundamentally !__pure2 */
-long double	nanl(const char *) __pure2;
-long double	nearbyintl(long double);
-long double	nextafterl(long double, long double);
-double		nexttoward(double, long double);
-float		nexttowardf(float, long double);
-long double	nexttowardl(long double, long double);
-long double	powl(long double, long double);
-long double	remainderl(long double, long double);
-long double	remquol(long double, long double, int *);
-long double	rintl(long double);
-long double	roundl(long double);
-long double	scalblnl(long double, long);
-long double	scalbnl(long double, int);
-long double	sinhl(long double);
-long double	sinl(long double);
-long double	sqrtl(long double);
-long double	tanhl(long double);
-long double	tanl(long double);
-long double	tgammal(long double);
-long double	truncl(long double);
-#endif /* __ISO_C_VISIBLE >= 1999 */
-
-#if __BSD_VISIBLE
-long double	lgammal_r(long double, int *);
-#endif
-
-__END_DECLS
-
-#endif /* !_MATH_H_ */
diff --git a/include.new/md2.h b/include.new/md2.h
deleted file mode 100644
index 4b1adef..0000000
--- a/include.new/md2.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* MD2.H - header file for MD2C.C
- * $FreeBSD: src/lib/libmd/md2.h,v 1.9 2001/03/17 10:00:50 phk Exp $
- */
-
-/* Copyright (C) 1990-2, RSA Data Security, Inc. Created 1990. All
-   rights reserved.
-
-   License to copy and use this software is granted for
-   non-commercial Internet Privacy-Enhanced Mail provided that it is
-   identified as the "RSA Data Security, Inc. MD2 Message Digest
-   Algorithm" in all material mentioning or referencing this software
-   or this function.
-
-   RSA Data Security, Inc. makes no representations concerning either
-   the merchantability of this software or the suitability of this
-   software for any particular purpose. It is provided "as is"
-   without express or implied warranty of any kind.
-
-   These notices must be retained in any copies of any part of this
-   documentation and/or software.
- */
-
-#ifndef _MD2_H_
-#define _MD2_H_
-
-typedef struct MD2Context {
-  unsigned char state[16];	/* state */
-  unsigned char checksum[16];	/* checksum */
-  unsigned int count;		/* number of bytes, modulo 16 */
-  unsigned char buffer[16];	/* input buffer */
-} MD2_CTX;
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void   MD2Init(MD2_CTX *);
-void   MD2Update(MD2_CTX *, const unsigned char *, unsigned int);
-void   MD2Pad(MD2_CTX *);
-void   MD2Final(unsigned char [16], MD2_CTX *);
-char * MD2End(MD2_CTX *, char *);
-char * MD2File(const char *, char *);
-char * MD2FileChunk(const char *, char *, off_t, off_t);
-char * MD2Data(const unsigned char *, unsigned int, char *);
-__END_DECLS
-
-#endif /* _MD2_H_ */
diff --git a/include.new/md4.h b/include.new/md4.h
deleted file mode 100644
index 414d2b8..0000000
--- a/include.new/md4.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* MD4.H - header file for MD4C.C
- * $FreeBSD: releng/10.2/lib/libmd/md4.h 154479 2006-01-17 15:35:57Z phk $
- */
-
-/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-   rights reserved.
-
-   License to copy and use this software is granted provided that it
-   is identified as the "RSA Data Security, Inc. MD4 Message-Digest
-   Algorithm" in all material mentioning or referencing this software
-   or this function.
-   License is also granted to make and use derivative works provided
-   that such works are identified as "derived from the RSA Data
-   Security, Inc. MD4 Message-Digest Algorithm" in all material
-   mentioning or referencing the derived work.
-
-   RSA Data Security, Inc. makes no representations concerning either
-   the merchantability of this software or the suitability of this
-   software for any particular purpose. It is provided "as is"
-   without express or implied warranty of any kind.
-
-   These notices must be retained in any copies of any part of this
-   documentation and/or software.
- */
-
-#ifndef _MD4_H_
-#define _MD4_H_
-/* MD4 context. */
-typedef struct MD4Context {
-  uint32_t state[4];	/* state (ABCD) */
-  uint32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
-  unsigned char buffer[64];	/* input buffer */
-} MD4_CTX;
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void   MD4Init(MD4_CTX *);
-void   MD4Update(MD4_CTX *, const void *, unsigned int);
-void   MD4Pad(MD4_CTX *);
-void   MD4Final(unsigned char [16], MD4_CTX *);
-char * MD4End(MD4_CTX *, char *);
-char * MD4File(const char *, char *);
-char * MD4FileChunk(const char *, char *, off_t, off_t);
-char * MD4Data(const void *, unsigned int, char *);
-__END_DECLS
-
-#endif /* _MD4_H_ */
diff --git a/include.new/md5.h b/include.new/md5.h
deleted file mode 100644
index 803a88f..0000000
--- a/include.new/md5.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _MD5_H_
-#define _MD5_H_
-#include <sys/md5.h>
-#endif /* _MD5_H_ */
diff --git a/include.new/memory.h b/include.new/memory.h
deleted file mode 100644
index ec6fbc3..0000000
--- a/include.new/memory.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 1988, 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. 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.
- *
- *	@(#)memory.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/memory.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#include <string.h>
diff --git a/include.new/memstat.h b/include.new/memstat.h
deleted file mode 100644
index be2dbec..0000000
--- a/include.new/memstat.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*-
- * Copyright (c) 2005 Robert N. M. Watson
- * 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.
- *
- * 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: releng/10.2/lib/libmemstat/memstat.h 224569 2011-08-01 09:43:35Z pluknet $
- */
-
-#ifndef _MEMSTAT_H_
-#define	_MEMSTAT_H_
-
-/*
- * Amount of caller data to maintain for each caller data slot.  Applications
- * must not request more than this number of caller save data, or risk
- * corrupting internal libmemstat(3) data structures.  A compile time check
- * in the application is probably appropriate.
- */
-#define	MEMSTAT_MAXCALLER	16
-
-/*
- * libmemstat(3) is able to extract memory data from different allocators;
- * when it does so, it tags which allocator it got the data from so that
- * consumers can determine which fields are usable, as data returned varies
- * some.
- */
-#define	ALLOCATOR_UNKNOWN	0
-#define	ALLOCATOR_MALLOC	1
-#define	ALLOCATOR_UMA		2
-#define	ALLOCATOR_ANY		255
-
-/*
- * Library maximum type name.  Should be max(set of name maximums over
- * various allocators).
- */
-#define	MEMTYPE_MAXNAME		32
-
-/*
- * Library error conditions, mostly from the underlying data sources.  On
- * failure, functions typically return (-1) or (NULL); on success, (0) or a
- * valid data pointer.  The error from the last operation is stored in
- * struct memory_type_list, and accessed via memstat_get_error(list).
- */
-#define	MEMSTAT_ERROR_UNDEFINED		0	/* Initialization value. */
-#define	MEMSTAT_ERROR_NOMEMORY		1	/* Out of memory. */
-#define	MEMSTAT_ERROR_VERSION		2	/* Unsupported version. */
-#define	MEMSTAT_ERROR_PERMISSION	3	/* Permission denied. */
-#define	MEMSTAT_ERROR_DATAERROR		5	/* Error in stat data. */
-#define	MEMSTAT_ERROR_KVM		6	/* See kvm_geterr() for err. */
-#define	MEMSTAT_ERROR_KVM_NOSYMBOL	7	/* Symbol not available. */
-#define	MEMSTAT_ERROR_KVM_SHORTREAD	8	/* Short kvm_read return. */
-
-/*
- * Forward declare struct memory_type, which holds per-type properties and
- * statistics.  This is an opaque type, to be frobbed only from within the
- * library, in order to avoid building ABI assumptions into the application.
- * Accessor methods should be used to get and sometimes set the fields from
- * consumers of the library.
- */
-struct memory_type;
-
-/*
- * struct memory_type_list is the head of a list of memory types and
- * statistics.
- */
-struct memory_type_list;
-
-__BEGIN_DECLS
-/*
- * Functions that operate without memory type or memory type list context.
- */
-const char	*memstat_strerror(int error);
-
-/*
- * Functions for managing memory type and statistics data.
- */
-struct memory_type_list	*memstat_mtl_alloc(void);
-struct memory_type	*memstat_mtl_first(struct memory_type_list *list);
-struct memory_type	*memstat_mtl_next(struct memory_type *mtp);
-struct memory_type	*memstat_mtl_find(struct memory_type_list *list,
-			    int allocator, const char *name);
-void	memstat_mtl_free(struct memory_type_list *list);
-int	memstat_mtl_geterror(struct memory_type_list *list);
-
-/*
- * Functions to retrieve data from a live kernel using sysctl.
- */
-int	memstat_sysctl_all(struct memory_type_list *list, int flags);
-int	memstat_sysctl_malloc(struct memory_type_list *list, int flags);
-int	memstat_sysctl_uma(struct memory_type_list *list, int flags);
-
-/*
- * Functions to retrieve data from a kernel core (or /dev/kmem).
- */
-int	memstat_kvm_all(struct memory_type_list *list, void *kvm_handle);
-int	memstat_kvm_malloc(struct memory_type_list *list, void *kvm_handle);
-int	memstat_kvm_uma(struct memory_type_list *list, void *kvm_handle);
-
-/*
- * Accessor methods for struct memory_type.
- */
-const char	*memstat_get_name(const struct memory_type *mtp);
-int		 memstat_get_allocator(const struct memory_type *mtp);
-uint64_t	 memstat_get_countlimit(const struct memory_type *mtp);
-uint64_t	 memstat_get_byteslimit(const struct memory_type *mtp);
-uint64_t	 memstat_get_sizemask(const struct memory_type *mtp);
-uint64_t	 memstat_get_size(const struct memory_type *mtp);
-uint64_t	 memstat_get_memalloced(const struct memory_type *mtp);
-uint64_t	 memstat_get_memfreed(const struct memory_type *mtp);
-uint64_t	 memstat_get_numallocs(const struct memory_type *mtp);
-uint64_t	 memstat_get_numfrees(const struct memory_type *mtp);
-uint64_t	 memstat_get_bytes(const struct memory_type *mtp);
-uint64_t	 memstat_get_count(const struct memory_type *mtp);
-uint64_t	 memstat_get_free(const struct memory_type *mtp);
-uint64_t	 memstat_get_failures(const struct memory_type *mtp);
-uint64_t	 memstat_get_sleeps(const struct memory_type *mtp);
-void		*memstat_get_caller_pointer(const struct memory_type *mtp,
-		    int index);
-void		 memstat_set_caller_pointer(struct memory_type *mtp,
-		    int index, void *value);
-uint64_t	 memstat_get_caller_uint64(const struct memory_type *mtp,
-		    int index);
-void		 memstat_set_caller_uint64(struct memory_type *mtp, int index,
-		    uint64_t value);
-uint64_t	 memstat_get_zonefree(const struct memory_type *mtp);
-uint64_t	 memstat_get_kegfree(const struct memory_type *mtp);
-uint64_t	 memstat_get_percpu_memalloced(const struct memory_type *mtp,
-		    int cpu);
-uint64_t	 memstat_get_percpu_memfreed(const struct memory_type *mtp,
-		    int cpu);
-uint64_t	 memstat_get_percpu_numallocs(const struct memory_type *mtp,
-		    int cpu);
-uint64_t	 memstat_get_percpu_numfrees(const struct memory_type *mtp,
-		    int cpu);
-uint64_t	 memstat_get_percpu_sizemask(const struct memory_type *mtp,
-		    int cpu);
-void		*memstat_get_percpu_caller_pointer(
-		    const struct memory_type *mtp, int cpu, int index);
-void		 memstat_set_percpu_caller_pointer(struct memory_type *mtp,
-		    int cpu, int index, void *value);
-uint64_t	 memstat_get_percpu_caller_uint64(
-		    const struct memory_type *mtp, int cpu, int index);
-void		 memstat_set_percpu_caller_uint64(struct memory_type *mtp,
-		    int cpu, int index, uint64_t value);
-uint64_t	 memstat_get_percpu_free(const struct memory_type *mtp,
-		    int cpu);
-__END_DECLS
-
-#endif /* !_MEMSTAT_H_ */
diff --git a/include.new/menu.h b/include.new/menu.h
deleted file mode 100644
index 545aa56..0000000
--- a/include.new/menu.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *   Author:  Juergen Pfeifer, 1995,1997                                    *
- ****************************************************************************/
-
-/* $Id: menu.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef ETI_MENU
-#define ETI_MENU
-
-#ifdef AMIGA
-#define TEXT TEXT_ncurses
-#endif
-
-#include <curses.h>
-#include <eti.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef int Menu_Options;
-typedef int Item_Options;
-
-/* Menu options: */
-#define O_ONEVALUE      (0x01)
-#define O_SHOWDESC      (0x02)
-#define O_ROWMAJOR      (0x04)
-#define O_IGNORECASE    (0x08)
-#define O_SHOWMATCH     (0x10)
-#define O_NONCYCLIC     (0x20)
-
-/* Item options: */
-#define O_SELECTABLE    (0x01)
-
-typedef struct
-{
-  const char* str;
-  unsigned short length;
-} TEXT;
-
-typedef struct tagITEM 
-{
-  TEXT           name;        /* name of menu item                         */
-  TEXT           description; /* description of item, optional in display  */ 
-  struct tagMENU *imenu;      /* Pointer to parent menu                    */
-  void           *userptr;    /* Pointer to user defined per item data     */ 
-  Item_Options   opt;         /* Item options                              */ 
-  short          index;       /* Item number if connected to a menu        */
-  short          y;           /* y and x location of item in menu          */
-  short          x;
-  bool           value;       /* Selection value                           */
-                             
-  struct tagITEM *left;       /* neighbor items                            */
-  struct tagITEM *right;
-  struct tagITEM *up;
-  struct tagITEM *down;
-
-} ITEM;
-
-typedef void (*Menu_Hook)(struct tagMENU *);
-
-typedef struct tagMENU 
-{
-  short          height;                /* Nr. of chars high               */
-  short          width;                 /* Nr. of chars wide               */
-  short          rows;                  /* Nr. of items high               */
-  short          cols;                  /* Nr. of items wide               */
-  short          frows;                 /* Nr. of formatted items high     */
-  short          fcols;                 /* Nr. of formatted items wide     */
-  short          arows;                 /* Nr. of items high (actual)      */
-  short          namelen;               /* Max. name length                */
-  short          desclen;               /* Max. description length         */
-  short          marklen;               /* Length of mark, if any          */
-  short          itemlen;               /* Length of one item              */
-  short          spc_desc;              /* Spacing for descriptor          */
-  short          spc_cols;              /* Spacing for columns             */
-  short          spc_rows;              /* Spacing for rows                */ 
-  char          *pattern;               /* Buffer to store match chars     */
-  short          pindex;                /* Index into pattern buffer       */
-  WINDOW        *win;                   /* Window containing menu          */
-  WINDOW        *sub;                   /* Subwindow for menu display      */
-  WINDOW        *userwin;               /* User's window                   */
-  WINDOW        *usersub;               /* User's subwindow                */
-  ITEM          **items;                /* array of items                  */ 
-  short          nitems;                /* Nr. of items in menu            */
-  ITEM          *curitem;               /* Current item                    */
-  short          toprow;                /* Top row of menu                 */
-  chtype         fore;                  /* Selection attribute             */
-  chtype         back;                  /* Nonselection attribute          */
-  chtype         grey;                  /* Inactive attribute              */
-  unsigned char  pad;                   /* Pad character                   */
-
-  Menu_Hook      menuinit;              /* User hooks                      */
-  Menu_Hook      menuterm;
-  Menu_Hook      iteminit;
-  Menu_Hook      itemterm;
-
-  void          *userptr;               /* Pointer to menus user data      */
-  char          *mark;                  /* Pointer to marker string        */
-
-  Menu_Options   opt;                   /* Menu options                    */
-  unsigned short status;                /* Internal state of menu          */
-
-} MENU;
-
-
-/* Define keys */
-
-#define REQ_LEFT_ITEM           (KEY_MAX + 1)
-#define REQ_RIGHT_ITEM          (KEY_MAX + 2)
-#define REQ_UP_ITEM             (KEY_MAX + 3)
-#define REQ_DOWN_ITEM           (KEY_MAX + 4)
-#define REQ_SCR_ULINE           (KEY_MAX + 5)
-#define REQ_SCR_DLINE           (KEY_MAX + 6)
-#define REQ_SCR_DPAGE           (KEY_MAX + 7)
-#define REQ_SCR_UPAGE           (KEY_MAX + 8)
-#define REQ_FIRST_ITEM          (KEY_MAX + 9)
-#define REQ_LAST_ITEM           (KEY_MAX + 10)
-#define REQ_NEXT_ITEM           (KEY_MAX + 11)
-#define REQ_PREV_ITEM           (KEY_MAX + 12)
-#define REQ_TOGGLE_ITEM         (KEY_MAX + 13)
-#define REQ_CLEAR_PATTERN       (KEY_MAX + 14)
-#define REQ_BACK_PATTERN        (KEY_MAX + 15)
-#define REQ_NEXT_MATCH          (KEY_MAX + 16)
-#define REQ_PREV_MATCH          (KEY_MAX + 17)
-
-#define MIN_MENU_COMMAND        (KEY_MAX + 1)
-#define MAX_MENU_COMMAND        (KEY_MAX + 17)
-
-/*
- * Some AT&T code expects MAX_COMMAND to be out-of-band not
- * just for menu commands but for forms ones as well.
- */
-#if defined(MAX_COMMAND)
-#  if (MAX_MENU_COMMAND > MAX_COMMAND)
-#    error Something is wrong -- MAX_MENU_COMMAND is greater than MAX_COMMAND
-#  elif (MAX_COMMAND != (KEY_MAX + 128))
-#    error Something is wrong -- MAX_COMMAND is already inconsistently defined.
-#  endif
-#else
-#  define MAX_COMMAND (KEY_MAX + 128)
-#endif
-
-
-/* --------- prototypes for libmenu functions ----------------------------- */
-
-extern NCURSES_EXPORT(ITEM **)	menu_items (const MENU *);
-extern NCURSES_EXPORT(ITEM *)	current_item (const MENU *);
-extern NCURSES_EXPORT(ITEM *)	new_item (const char *,const char *);
-
-extern NCURSES_EXPORT(MENU *)	new_menu (ITEM **);
-
-extern NCURSES_EXPORT(Item_Options)	item_opts (const ITEM *);
-extern NCURSES_EXPORT(Menu_Options)	menu_opts (const MENU *);
-
-extern NCURSES_EXPORT(Menu_Hook)	item_init (const MENU *);
-extern NCURSES_EXPORT(Menu_Hook)	item_term (const MENU *);
-extern NCURSES_EXPORT(Menu_Hook)	menu_init (const MENU *);
-extern NCURSES_EXPORT(Menu_Hook)	menu_term (const MENU *);
-
-extern NCURSES_EXPORT(WINDOW *)	menu_sub (const MENU *);
-extern NCURSES_EXPORT(WINDOW *)	menu_win (const MENU *);
-
-extern NCURSES_EXPORT(const char *)	item_description (const ITEM *);
-extern NCURSES_EXPORT(const char *)	item_name (const ITEM *);
-extern NCURSES_EXPORT(const char *)	menu_mark (const MENU *);
-extern NCURSES_EXPORT(const char *)	menu_request_name (int);
-
-extern NCURSES_EXPORT(char *)	menu_pattern (const MENU *);
-
-extern NCURSES_EXPORT(void *)	menu_userptr (const MENU *);
-extern NCURSES_EXPORT(void *)	item_userptr (const ITEM *);
-
-extern NCURSES_EXPORT(chtype)	menu_back (const MENU *);
-extern NCURSES_EXPORT(chtype)	menu_fore (const MENU *);
-extern NCURSES_EXPORT(chtype)	menu_grey (const MENU *);
-
-extern NCURSES_EXPORT(int)	free_item (ITEM *);
-extern NCURSES_EXPORT(int)	free_menu (MENU *);
-extern NCURSES_EXPORT(int)	item_count (const MENU *);
-extern NCURSES_EXPORT(int)	item_index (const ITEM *);
-extern NCURSES_EXPORT(int)	item_opts_off (ITEM *,Item_Options);
-extern NCURSES_EXPORT(int)	item_opts_on (ITEM *,Item_Options);
-extern NCURSES_EXPORT(int)	menu_driver (MENU *,int);
-extern NCURSES_EXPORT(int)	menu_opts_off (MENU *,Menu_Options);
-extern NCURSES_EXPORT(int)	menu_opts_on (MENU *,Menu_Options);
-extern NCURSES_EXPORT(int)	menu_pad (const MENU *);
-extern NCURSES_EXPORT(int)	pos_menu_cursor (const MENU *);
-extern NCURSES_EXPORT(int)	post_menu (MENU *);
-extern NCURSES_EXPORT(int)	scale_menu (const MENU *,int *,int *);
-extern NCURSES_EXPORT(int)	set_current_item (MENU *menu,ITEM *item);
-extern NCURSES_EXPORT(int)	set_item_init (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_item_opts (ITEM *,Item_Options);
-extern NCURSES_EXPORT(int)	set_item_term (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_item_userptr (ITEM *, void *);
-extern NCURSES_EXPORT(int)	set_item_value (ITEM *,bool);
-extern NCURSES_EXPORT(int)	set_menu_back (MENU *,chtype);
-extern NCURSES_EXPORT(int)	set_menu_fore (MENU *,chtype);
-extern NCURSES_EXPORT(int)	set_menu_format (MENU *,int,int);
-extern NCURSES_EXPORT(int)	set_menu_grey (MENU *,chtype);
-extern NCURSES_EXPORT(int)	set_menu_init (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_menu_items (MENU *,ITEM **);
-extern NCURSES_EXPORT(int)	set_menu_mark (MENU *, const char *);
-extern NCURSES_EXPORT(int)	set_menu_opts (MENU *,Menu_Options);
-extern NCURSES_EXPORT(int)	set_menu_pad (MENU *,int);
-extern NCURSES_EXPORT(int)	set_menu_pattern (MENU *,const char *);
-extern NCURSES_EXPORT(int)	set_menu_sub (MENU *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_menu_term (MENU *, Menu_Hook);
-extern NCURSES_EXPORT(int)	set_menu_userptr (MENU *,void *);
-extern NCURSES_EXPORT(int)	set_menu_win (MENU *,WINDOW *);
-extern NCURSES_EXPORT(int)	set_top_row (MENU *,int);
-extern NCURSES_EXPORT(int)	top_row (const MENU *);
-extern NCURSES_EXPORT(int)	unpost_menu (MENU *);
-extern NCURSES_EXPORT(int)	menu_request_by_name (const char *);
-extern NCURSES_EXPORT(int)	set_menu_spacing (MENU *,int,int,int);
-extern NCURSES_EXPORT(int)	menu_spacing (const MENU *,int *,int *,int *);
-
-
-extern NCURSES_EXPORT(bool)	item_value (const ITEM *);
-extern NCURSES_EXPORT(bool)	item_visible (const ITEM *);
-
-extern NCURSES_EXPORT(void)	menu_format (const MENU *,int *,int *);
-
-#ifdef __cplusplus
-  }
-#endif
-
-#endif /* ETI_MENU */
diff --git a/include.new/mmintrin.h b/include.new/mmintrin.h
deleted file mode 100644
index bd775e8..0000000
--- a/include.new/mmintrin.h
+++ /dev/null
@@ -1,917 +0,0 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-
-   This file is part of GCC.
-
-   GCC is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GCC is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you include this header file into source
-   files compiled by GCC, this header file does not by itself cause
-   the resulting executable to be covered by the GNU General Public
-   License.  This exception does not however invalidate any other
-   reasons why the executable file might be covered by the GNU General
-   Public License.  */
-
-/* Implemented from the specification included in the Intel C++ Compiler
-   User Guide and Reference, version 8.0.  */
-
-#ifndef _MMINTRIN_H_INCLUDED
-#define _MMINTRIN_H_INCLUDED
-
-#ifndef __MMX__
-# error "MMX instruction set not enabled"
-#else
-/* The data type intended for user use.  */
-typedef int __m64 __attribute__ ((__mode__ (__V2SI__)));
-
-/* Internal data types for implementing the intrinsics.  */
-typedef int __v2si __attribute__ ((__mode__ (__V2SI__)));
-typedef int __v4hi __attribute__ ((__mode__ (__V4HI__)));
-typedef int __v8qi __attribute__ ((__mode__ (__V8QI__)));
-
-/* Empty the multimedia state.  */
-static __inline void
-_mm_empty (void)
-{
-  __builtin_ia32_emms ();
-}
-
-static __inline void
-_m_empty (void)
-{
-  _mm_empty ();
-}
-
-/* Convert I to a __m64 object.  The integer is zero-extended to 64-bits.  */
-static __inline __m64 
-_mm_cvtsi32_si64 (int __i)
-{
-  long long __tmp = (unsigned int)__i;
-  return (__m64) __tmp;
-}
-
-static __inline __m64 
-_m_from_int (int __i)
-{
-  return _mm_cvtsi32_si64 (__i);
-}
-
-#ifdef __x86_64__
-/* Convert I to a __m64 object.  */
-static __inline __m64 
-_mm_cvtsi64x_si64 (long long __i)
-{
-  return (__m64) __i;
-}
-
-/* Convert I to a __m64 object.  */
-static __inline __m64 
-_mm_set_pi64x (long long __i)
-{
-  return (__m64) __i;
-}
-#endif
-
-/* Convert the lower 32 bits of the __m64 object into an integer.  */
-static __inline int
-_mm_cvtsi64_si32 (__m64 __i)
-{
-  long long __tmp = (long long)__i;
-  return __tmp;
-}
-
-static __inline int
-_m_to_int (__m64 __i)
-{
-  return _mm_cvtsi64_si32 (__i);
-}
-
-#ifdef __x86_64__
-/* Convert the lower 32 bits of the __m64 object into an integer.  */
-static __inline long long
-_mm_cvtsi64_si64x (__m64 __i)
-{
-  return (long long)__i;
-}
-#endif
-
-/* Pack the four 16-bit values from M1 into the lower four 8-bit values of
-   the result, and the four 16-bit values from M2 into the upper four 8-bit
-   values of the result, all with signed saturation.  */
-static __inline __m64
-_mm_packs_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_packsswb ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_packsswb (__m64 __m1, __m64 __m2)
-{
-  return _mm_packs_pi16 (__m1, __m2);
-}
-
-/* Pack the two 32-bit values from M1 in to the lower two 16-bit values of
-   the result, and the two 32-bit values from M2 into the upper two 16-bit
-   values of the result, all with signed saturation.  */
-static __inline __m64
-_mm_packs_pi32 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_packssdw ((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline __m64
-_m_packssdw (__m64 __m1, __m64 __m2)
-{
-  return _mm_packs_pi32 (__m1, __m2);
-}
-
-/* Pack the four 16-bit values from M1 into the lower four 8-bit values of
-   the result, and the four 16-bit values from M2 into the upper four 8-bit
-   values of the result, all with unsigned saturation.  */
-static __inline __m64
-_mm_packs_pu16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_packuswb ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_packuswb (__m64 __m1, __m64 __m2)
-{
-  return _mm_packs_pu16 (__m1, __m2);
-}
-
-/* Interleave the four 8-bit values from the high half of M1 with the four
-   8-bit values from the high half of M2.  */
-static __inline __m64
-_mm_unpackhi_pi8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_punpckhbw ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_punpckhbw (__m64 __m1, __m64 __m2)
-{
-  return _mm_unpackhi_pi8 (__m1, __m2);
-}
-
-/* Interleave the two 16-bit values from the high half of M1 with the two
-   16-bit values from the high half of M2.  */
-static __inline __m64
-_mm_unpackhi_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_punpckhwd ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_punpckhwd (__m64 __m1, __m64 __m2)
-{
-  return _mm_unpackhi_pi16 (__m1, __m2);
-}
-
-/* Interleave the 32-bit value from the high half of M1 with the 32-bit
-   value from the high half of M2.  */
-static __inline __m64
-_mm_unpackhi_pi32 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_punpckhdq ((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline __m64
-_m_punpckhdq (__m64 __m1, __m64 __m2)
-{
-  return _mm_unpackhi_pi32 (__m1, __m2);
-}
-
-/* Interleave the four 8-bit values from the low half of M1 with the four
-   8-bit values from the low half of M2.  */
-static __inline __m64
-_mm_unpacklo_pi8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_punpcklbw ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_punpcklbw (__m64 __m1, __m64 __m2)
-{
-  return _mm_unpacklo_pi8 (__m1, __m2);
-}
-
-/* Interleave the two 16-bit values from the low half of M1 with the two
-   16-bit values from the low half of M2.  */
-static __inline __m64
-_mm_unpacklo_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_punpcklwd ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_punpcklwd (__m64 __m1, __m64 __m2)
-{
-  return _mm_unpacklo_pi16 (__m1, __m2);
-}
-
-/* Interleave the 32-bit value from the low half of M1 with the 32-bit
-   value from the low half of M2.  */
-static __inline __m64
-_mm_unpacklo_pi32 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_punpckldq ((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline __m64
-_m_punpckldq (__m64 __m1, __m64 __m2)
-{
-  return _mm_unpacklo_pi32 (__m1, __m2);
-}
-
-/* Add the 8-bit values in M1 to the 8-bit values in M2.  */
-static __inline __m64
-_mm_add_pi8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_paddb ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_paddb (__m64 __m1, __m64 __m2)
-{
-  return _mm_add_pi8 (__m1, __m2);
-}
-
-/* Add the 16-bit values in M1 to the 16-bit values in M2.  */
-static __inline __m64
-_mm_add_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_paddw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_paddw (__m64 __m1, __m64 __m2)
-{
-  return _mm_add_pi16 (__m1, __m2);
-}
-
-/* Add the 32-bit values in M1 to the 32-bit values in M2.  */
-static __inline __m64
-_mm_add_pi32 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_paddd ((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline __m64
-_m_paddd (__m64 __m1, __m64 __m2)
-{
-  return _mm_add_pi32 (__m1, __m2);
-}
-
-/* Add the 64-bit values in M1 to the 64-bit values in M2.  */
-static __inline __m64
-_mm_add_si64 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_paddq ((long long)__m1, (long long)__m2);
-}
-
-/* Add the 8-bit values in M1 to the 8-bit values in M2 using signed
-   saturated arithmetic.  */
-static __inline __m64
-_mm_adds_pi8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_paddsb ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_paddsb (__m64 __m1, __m64 __m2)
-{
-  return _mm_adds_pi8 (__m1, __m2);
-}
-
-/* Add the 16-bit values in M1 to the 16-bit values in M2 using signed
-   saturated arithmetic.  */
-static __inline __m64
-_mm_adds_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_paddsw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_paddsw (__m64 __m1, __m64 __m2)
-{
-  return _mm_adds_pi16 (__m1, __m2);
-}
-
-/* Add the 8-bit values in M1 to the 8-bit values in M2 using unsigned
-   saturated arithmetic.  */
-static __inline __m64
-_mm_adds_pu8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_paddusb ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_paddusb (__m64 __m1, __m64 __m2)
-{
-  return _mm_adds_pu8 (__m1, __m2);
-}
-
-/* Add the 16-bit values in M1 to the 16-bit values in M2 using unsigned
-   saturated arithmetic.  */
-static __inline __m64
-_mm_adds_pu16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_paddusw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_paddusw (__m64 __m1, __m64 __m2)
-{
-  return _mm_adds_pu16 (__m1, __m2);
-}
-
-/* Subtract the 8-bit values in M2 from the 8-bit values in M1.  */
-static __inline __m64
-_mm_sub_pi8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_psubb ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_psubb (__m64 __m1, __m64 __m2)
-{
-  return _mm_sub_pi8 (__m1, __m2);
-}
-
-/* Subtract the 16-bit values in M2 from the 16-bit values in M1.  */
-static __inline __m64
-_mm_sub_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_psubw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_psubw (__m64 __m1, __m64 __m2)
-{
-  return _mm_sub_pi16 (__m1, __m2);
-}
-
-/* Subtract the 32-bit values in M2 from the 32-bit values in M1.  */
-static __inline __m64
-_mm_sub_pi32 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_psubd ((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline __m64
-_m_psubd (__m64 __m1, __m64 __m2)
-{
-  return _mm_sub_pi32 (__m1, __m2);
-}
-
-/* Add the 64-bit values in M1 to the 64-bit values in M2.  */
-static __inline __m64
-_mm_sub_si64 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_psubq ((long long)__m1, (long long)__m2);
-}
-
-/* Subtract the 8-bit values in M2 from the 8-bit values in M1 using signed
-   saturating arithmetic.  */
-static __inline __m64
-_mm_subs_pi8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_psubsb ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_psubsb (__m64 __m1, __m64 __m2)
-{
-  return _mm_subs_pi8 (__m1, __m2);
-}
-
-/* Subtract the 16-bit values in M2 from the 16-bit values in M1 using
-   signed saturating arithmetic.  */
-static __inline __m64
-_mm_subs_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_psubsw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_psubsw (__m64 __m1, __m64 __m2)
-{
-  return _mm_subs_pi16 (__m1, __m2);
-}
-
-/* Subtract the 8-bit values in M2 from the 8-bit values in M1 using
-   unsigned saturating arithmetic.  */
-static __inline __m64
-_mm_subs_pu8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_psubusb ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_psubusb (__m64 __m1, __m64 __m2)
-{
-  return _mm_subs_pu8 (__m1, __m2);
-}
-
-/* Subtract the 16-bit values in M2 from the 16-bit values in M1 using
-   unsigned saturating arithmetic.  */
-static __inline __m64
-_mm_subs_pu16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_psubusw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_psubusw (__m64 __m1, __m64 __m2)
-{
-  return _mm_subs_pu16 (__m1, __m2);
-}
-
-/* Multiply four 16-bit values in M1 by four 16-bit values in M2 producing
-   four 32-bit intermediate results, which are then summed by pairs to
-   produce two 32-bit results.  */
-static __inline __m64
-_mm_madd_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pmaddwd ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_pmaddwd (__m64 __m1, __m64 __m2)
-{
-  return _mm_madd_pi16 (__m1, __m2);
-}
-
-/* Multiply four signed 16-bit values in M1 by four signed 16-bit values in
-   M2 and produce the high 16 bits of the 32-bit results.  */
-static __inline __m64
-_mm_mulhi_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pmulhw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_pmulhw (__m64 __m1, __m64 __m2)
-{
-  return _mm_mulhi_pi16 (__m1, __m2);
-}
-
-/* Multiply four 16-bit values in M1 by four 16-bit values in M2 and produce
-   the low 16 bits of the results.  */
-static __inline __m64
-_mm_mullo_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pmullw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_pmullw (__m64 __m1, __m64 __m2)
-{
-  return _mm_mullo_pi16 (__m1, __m2);
-}
-
-/* Shift four 16-bit values in M left by COUNT.  */
-static __inline __m64
-_mm_sll_pi16 (__m64 __m, __m64 __count)
-{
-  return (__m64) __builtin_ia32_psllw ((__v4hi)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_psllw (__m64 __m, __m64 __count)
-{
-  return _mm_sll_pi16 (__m, __count);
-}
-
-static __inline __m64
-_mm_slli_pi16 (__m64 __m, int __count)
-{
-  return (__m64) __builtin_ia32_psllw ((__v4hi)__m, __count);
-}
-
-static __inline __m64
-_m_psllwi (__m64 __m, int __count)
-{
-  return _mm_slli_pi16 (__m, __count);
-}
-
-/* Shift two 32-bit values in M left by COUNT.  */
-static __inline __m64
-_mm_sll_pi32 (__m64 __m, __m64 __count)
-{
-  return (__m64) __builtin_ia32_pslld ((__v2si)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_pslld (__m64 __m, __m64 __count)
-{
-  return _mm_sll_pi32 (__m, __count);
-}
-
-static __inline __m64
-_mm_slli_pi32 (__m64 __m, int __count)
-{
-  return (__m64) __builtin_ia32_pslld ((__v2si)__m, __count);
-}
-
-static __inline __m64
-_m_pslldi (__m64 __m, int __count)
-{
-  return _mm_slli_pi32 (__m, __count);
-}
-
-/* Shift the 64-bit value in M left by COUNT.  */
-static __inline __m64
-_mm_sll_si64 (__m64 __m, __m64 __count)
-{
-  return (__m64) __builtin_ia32_psllq ((long long)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_psllq (__m64 __m, __m64 __count)
-{
-  return _mm_sll_si64 (__m, __count);
-}
-
-static __inline __m64
-_mm_slli_si64 (__m64 __m, int __count)
-{
-  return (__m64) __builtin_ia32_psllq ((long long)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_psllqi (__m64 __m, int __count)
-{
-  return _mm_slli_si64 (__m, __count);
-}
-
-/* Shift four 16-bit values in M right by COUNT; shift in the sign bit.  */
-static __inline __m64
-_mm_sra_pi16 (__m64 __m, __m64 __count)
-{
-  return (__m64) __builtin_ia32_psraw ((__v4hi)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_psraw (__m64 __m, __m64 __count)
-{
-  return _mm_sra_pi16 (__m, __count);
-}
-
-static __inline __m64
-_mm_srai_pi16 (__m64 __m, int __count)
-{
-  return (__m64) __builtin_ia32_psraw ((__v4hi)__m, __count);
-}
-
-static __inline __m64
-_m_psrawi (__m64 __m, int __count)
-{
-  return _mm_srai_pi16 (__m, __count);
-}
-
-/* Shift two 32-bit values in M right by COUNT; shift in the sign bit.  */
-static __inline __m64
-_mm_sra_pi32 (__m64 __m, __m64 __count)
-{
-  return (__m64) __builtin_ia32_psrad ((__v2si)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_psrad (__m64 __m, __m64 __count)
-{
-  return _mm_sra_pi32 (__m, __count);
-}
-
-static __inline __m64
-_mm_srai_pi32 (__m64 __m, int __count)
-{
-  return (__m64) __builtin_ia32_psrad ((__v2si)__m, __count);
-}
-
-static __inline __m64
-_m_psradi (__m64 __m, int __count)
-{
-  return _mm_srai_pi32 (__m, __count);
-}
-
-/* Shift four 16-bit values in M right by COUNT; shift in zeros.  */
-static __inline __m64
-_mm_srl_pi16 (__m64 __m, __m64 __count)
-{
-  return (__m64) __builtin_ia32_psrlw ((__v4hi)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_psrlw (__m64 __m, __m64 __count)
-{
-  return _mm_srl_pi16 (__m, __count);
-}
-
-static __inline __m64
-_mm_srli_pi16 (__m64 __m, int __count)
-{
-  return (__m64) __builtin_ia32_psrlw ((__v4hi)__m, __count);
-}
-
-static __inline __m64
-_m_psrlwi (__m64 __m, int __count)
-{
-  return _mm_srli_pi16 (__m, __count);
-}
-
-/* Shift two 32-bit values in M right by COUNT; shift in zeros.  */
-static __inline __m64
-_mm_srl_pi32 (__m64 __m, __m64 __count)
-{
-  return (__m64) __builtin_ia32_psrld ((__v2si)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_psrld (__m64 __m, __m64 __count)
-{
-  return _mm_srl_pi32 (__m, __count);
-}
-
-static __inline __m64
-_mm_srli_pi32 (__m64 __m, int __count)
-{
-  return (__m64) __builtin_ia32_psrld ((__v2si)__m, __count);
-}
-
-static __inline __m64
-_m_psrldi (__m64 __m, int __count)
-{
-  return _mm_srli_pi32 (__m, __count);
-}
-
-/* Shift the 64-bit value in M left by COUNT; shift in zeros.  */
-static __inline __m64
-_mm_srl_si64 (__m64 __m, __m64 __count)
-{
-  return (__m64) __builtin_ia32_psrlq ((long long)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_psrlq (__m64 __m, __m64 __count)
-{
-  return _mm_srl_si64 (__m, __count);
-}
-
-static __inline __m64
-_mm_srli_si64 (__m64 __m, int __count)
-{
-  return (__m64) __builtin_ia32_psrlq ((long long)__m, (long long)__count);
-}
-
-static __inline __m64
-_m_psrlqi (__m64 __m, int __count)
-{
-  return _mm_srli_si64 (__m, __count);
-}
-
-/* Bit-wise AND the 64-bit values in M1 and M2.  */
-static __inline __m64
-_mm_and_si64 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pand ((long long)__m1, (long long)__m2);
-}
-
-static __inline __m64
-_m_pand (__m64 __m1, __m64 __m2)
-{
-  return _mm_and_si64 (__m1, __m2);
-}
-
-/* Bit-wise complement the 64-bit value in M1 and bit-wise AND it with the
-   64-bit value in M2.  */
-static __inline __m64
-_mm_andnot_si64 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pandn ((long long)__m1, (long long)__m2);
-}
-
-static __inline __m64
-_m_pandn (__m64 __m1, __m64 __m2)
-{
-  return _mm_andnot_si64 (__m1, __m2);
-}
-
-/* Bit-wise inclusive OR the 64-bit values in M1 and M2.  */
-static __inline __m64
-_mm_or_si64 (__m64 __m1, __m64 __m2)
-{
-  return (__m64)__builtin_ia32_por ((long long)__m1, (long long)__m2);
-}
-
-static __inline __m64
-_m_por (__m64 __m1, __m64 __m2)
-{
-  return _mm_or_si64 (__m1, __m2);
-}
-
-/* Bit-wise exclusive OR the 64-bit values in M1 and M2.  */
-static __inline __m64
-_mm_xor_si64 (__m64 __m1, __m64 __m2)
-{
-  return (__m64)__builtin_ia32_pxor ((long long)__m1, (long long)__m2);
-}
-
-static __inline __m64
-_m_pxor (__m64 __m1, __m64 __m2)
-{
-  return _mm_xor_si64 (__m1, __m2);
-}
-
-/* Compare eight 8-bit values.  The result of the comparison is 0xFF if the
-   test is true and zero if false.  */
-static __inline __m64
-_mm_cmpeq_pi8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pcmpeqb ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_pcmpeqb (__m64 __m1, __m64 __m2)
-{
-  return _mm_cmpeq_pi8 (__m1, __m2);
-}
-
-static __inline __m64
-_mm_cmpgt_pi8 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pcmpgtb ((__v8qi)__m1, (__v8qi)__m2);
-}
-
-static __inline __m64
-_m_pcmpgtb (__m64 __m1, __m64 __m2)
-{
-  return _mm_cmpgt_pi8 (__m1, __m2);
-}
-
-/* Compare four 16-bit values.  The result of the comparison is 0xFFFF if
-   the test is true and zero if false.  */
-static __inline __m64
-_mm_cmpeq_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pcmpeqw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_pcmpeqw (__m64 __m1, __m64 __m2)
-{
-  return _mm_cmpeq_pi16 (__m1, __m2);
-}
-
-static __inline __m64
-_mm_cmpgt_pi16 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pcmpgtw ((__v4hi)__m1, (__v4hi)__m2);
-}
-
-static __inline __m64
-_m_pcmpgtw (__m64 __m1, __m64 __m2)
-{
-  return _mm_cmpgt_pi16 (__m1, __m2);
-}
-
-/* Compare two 32-bit values.  The result of the comparison is 0xFFFFFFFF if
-   the test is true and zero if false.  */
-static __inline __m64
-_mm_cmpeq_pi32 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pcmpeqd ((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline __m64
-_m_pcmpeqd (__m64 __m1, __m64 __m2)
-{
-  return _mm_cmpeq_pi32 (__m1, __m2);
-}
-
-static __inline __m64
-_mm_cmpgt_pi32 (__m64 __m1, __m64 __m2)
-{
-  return (__m64) __builtin_ia32_pcmpgtd ((__v2si)__m1, (__v2si)__m2);
-}
-
-static __inline __m64
-_m_pcmpgtd (__m64 __m1, __m64 __m2)
-{
-  return _mm_cmpgt_pi32 (__m1, __m2);
-}
-
-/* Creates a 64-bit zero.  */
-static __inline __m64
-_mm_setzero_si64 (void)
-{
-  return (__m64)__builtin_ia32_mmx_zero ();
-}
-
-/* Creates a vector of two 32-bit values; I0 is least significant.  */
-static __inline __m64
-_mm_set_pi32 (int __i1, int __i0)
-{
-  union {
-    __m64 __q;
-    struct {
-      unsigned int __i0;
-      unsigned int __i1;
-    } __s;
-  } __u;
-
-  __u.__s.__i0 = __i0;
-  __u.__s.__i1 = __i1;
-
-  return __u.__q;
-}
-
-/* Creates a vector of four 16-bit values; W0 is least significant.  */
-static __inline __m64
-_mm_set_pi16 (short __w3, short __w2, short __w1, short __w0)
-{
-  unsigned int __i1 = (unsigned short)__w3 << 16 | (unsigned short)__w2;
-  unsigned int __i0 = (unsigned short)__w1 << 16 | (unsigned short)__w0;
-  return _mm_set_pi32 (__i1, __i0);
-		       
-}
-
-/* Creates a vector of eight 8-bit values; B0 is least significant.  */
-static __inline __m64
-_mm_set_pi8 (char __b7, char __b6, char __b5, char __b4,
-	     char __b3, char __b2, char __b1, char __b0)
-{
-  unsigned int __i1, __i0;
-
-  __i1 = (unsigned char)__b7;
-  __i1 = __i1 << 8 | (unsigned char)__b6;
-  __i1 = __i1 << 8 | (unsigned char)__b5;
-  __i1 = __i1 << 8 | (unsigned char)__b4;
-
-  __i0 = (unsigned char)__b3;
-  __i0 = __i0 << 8 | (unsigned char)__b2;
-  __i0 = __i0 << 8 | (unsigned char)__b1;
-  __i0 = __i0 << 8 | (unsigned char)__b0;
-
-  return _mm_set_pi32 (__i1, __i0);
-}
-
-/* Similar, but with the arguments in reverse order.  */
-static __inline __m64
-_mm_setr_pi32 (int __i0, int __i1)
-{
-  return _mm_set_pi32 (__i1, __i0);
-}
-
-static __inline __m64
-_mm_setr_pi16 (short __w0, short __w1, short __w2, short __w3)
-{
-  return _mm_set_pi16 (__w3, __w2, __w1, __w0);
-}
-
-static __inline __m64
-_mm_setr_pi8 (char __b0, char __b1, char __b2, char __b3,
-	      char __b4, char __b5, char __b6, char __b7)
-{
-  return _mm_set_pi8 (__b7, __b6, __b5, __b4, __b3, __b2, __b1, __b0);
-}
-
-/* Creates a vector of two 32-bit values, both elements containing I.  */
-static __inline __m64
-_mm_set1_pi32 (int __i)
-{
-  return _mm_set_pi32 (__i, __i);
-}
-
-/* Creates a vector of four 16-bit values, all elements containing W.  */
-static __inline __m64
-_mm_set1_pi16 (short __w)
-{
-  unsigned int __i = (unsigned short)__w << 16 | (unsigned short)__w;
-  return _mm_set1_pi32 (__i);
-}
-
-/* Creates a vector of eight 8-bit values, all elements containing B.  */
-static __inline __m64
-_mm_set1_pi8 (char __b)
-{
-  unsigned int __w = (unsigned char)__b << 8 | (unsigned char)__b;
-  unsigned int __i = __w << 16 | __w;
-  return _mm_set1_pi32 (__i);
-}
-
-#endif /* __MMX__ */
-#endif /* _MMINTRIN_H_INCLUDED */
diff --git a/include.new/monetary.h b/include.new/monetary.h
deleted file mode 100644
index 5ab02ef..0000000
--- a/include.new/monetary.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@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.
- *
- * 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: releng/10.2/include/monetary.h 233600 2012-03-28 12:11:54Z theraven $
- */
-
-#ifndef _MONETARY_H_
-#define	_MONETARY_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif
-
-__BEGIN_DECLS
-#ifdef _XLOCALE_H_
-#include <xlocale/_monetary.h>
-#endif
-ssize_t	strfmon(char * __restrict, size_t, const char * __restrict, ...);
-__END_DECLS
-
-#endif /* !_MONETARY_H_ */
diff --git a/include.new/mp.h b/include.new/mp.h
deleted file mode 100644
index 36043a2..0000000
--- a/include.new/mp.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libmp/mp.h 189092 2009-02-26 21:43:15Z ed $ */
-
-#ifndef _MP_H_
-#define _MP_H_
-
-#ifndef HEADER_BN_H_
-#include <openssl/bn.h>
-#endif
-
-typedef struct _mint {
-	BIGNUM *bn;
-} MINT;
-
-void mp_gcd(const MINT *, const MINT *, MINT *);
-MINT *mp_itom(short);
-void mp_madd(const MINT *, const MINT *, MINT *);
-int mp_mcmp(const MINT *, const MINT *);
-void mp_mdiv(const MINT *, const MINT *, MINT *, MINT *);
-void mp_mfree(MINT *);
-void mp_min(MINT *);
-void mp_mout(const MINT *);
-void mp_move(const MINT *, MINT *);
-void mp_msqrt(const MINT *, MINT *, MINT *);
-void mp_msub(const MINT *, const MINT *, MINT *);
-char *mp_mtox(const MINT *);
-void mp_mult(const MINT *, const MINT *, MINT *);
-void mp_pow(const MINT *, const MINT *, const MINT *, MINT *);
-void mp_rpow(const MINT *, short, MINT *);
-void mp_sdiv(const MINT *, short, MINT *, short *);
-MINT *mp_xtom(const char *);
-
-#endif /* !_MP_H_ */
diff --git a/include.new/mpool.h b/include.new/mpool.h
deleted file mode 100644
index 0bbf77a..0000000
--- a/include.new/mpool.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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. 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.
- *
- *	@(#)mpool.h	8.4 (Berkeley) 11/2/95
- * $FreeBSD: releng/10.2/include/mpool.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _MPOOL_H_
-#define _MPOOL_H_
-
-#include <sys/queue.h>
-
-/*
- * The memory pool scheme is a simple one.  Each in-memory page is referenced
- * by a bucket which is threaded in up to two of three ways.  All active pages
- * are threaded on a hash chain (hashed by page number) and an lru chain.
- * Inactive pages are threaded on a free chain.  Each reference to a memory
- * pool is handed an opaque MPOOL cookie which stores all of this information.
- */
-#define	HASHSIZE	128
-#define	HASHKEY(pgno)	((pgno - 1 + HASHSIZE) % HASHSIZE)
-
-/* The BKT structures are the elements of the queues. */
-typedef struct _bkt {
-	TAILQ_ENTRY(_bkt) hq;		/* hash queue */
-	TAILQ_ENTRY(_bkt) q;		/* lru queue */
-	void    *page;			/* page */
-	pgno_t   pgno;			/* page number */
-
-#define	MPOOL_DIRTY	0x01		/* page needs to be written */
-#define	MPOOL_PINNED	0x02		/* page is pinned into memory */
-#define	MPOOL_INUSE	0x04		/* page address is valid */
-	u_int8_t flags;			/* flags */
-} BKT;
-
-typedef struct MPOOL {
-	TAILQ_HEAD(_lqh, _bkt) lqh;	/* lru queue head */
-					/* hash queue array */
-	TAILQ_HEAD(_hqh, _bkt) hqh[HASHSIZE];
-	pgno_t	curcache;		/* current number of cached pages */
-	pgno_t	maxcache;		/* max number of cached pages */
-	pgno_t	npages;			/* number of pages in the file */
-	unsigned long	pagesize;	/* file page size */
-	int	fd;			/* file descriptor */
-					/* page in conversion routine */
-	void    (*pgin)(void *, pgno_t, void *);
-					/* page out conversion routine */
-	void    (*pgout)(void *, pgno_t, void *);
-	void	*pgcookie;		/* cookie for page in/out routines */
-#ifdef STATISTICS
-	unsigned long	cachehit;
-	unsigned long	cachemiss;
-	unsigned long	pagealloc;
-	unsigned long	pageflush;
-	unsigned long	pageget;
-	unsigned long	pagenew;
-	unsigned long	pageput;
-	unsigned long	pageread;
-	unsigned long	pagewrite;
-#endif
-} MPOOL;
-
-#define	MPOOL_IGNOREPIN	0x01		/* Ignore if the page is pinned. */
-#define	MPOOL_PAGE_REQUEST	0x01	/* Allocate a new page with a
-					   specific page number. */
-#define	MPOOL_PAGE_NEXT		0x02	/* Allocate a new page with the next
-					  page number. */
-
-__BEGIN_DECLS
-MPOOL	*mpool_open(void *, int, pgno_t, pgno_t);
-void	 mpool_filter(MPOOL *, void (*)(void *, pgno_t, void *),
-	    void (*)(void *, pgno_t, void *), void *);
-void	*mpool_new(MPOOL *, pgno_t *, unsigned int);
-void	*mpool_get(MPOOL *, pgno_t, unsigned int);
-int	 mpool_delete(MPOOL *, void *);
-int	 mpool_put(MPOOL *, void *, unsigned int);
-int	 mpool_sync(MPOOL *);
-int	 mpool_close(MPOOL *);
-#ifdef STATISTICS
-void	 mpool_stat(MPOOL *);
-#endif
-__END_DECLS
-
-#endif
diff --git a/include.new/mqueue.h b/include.new/mqueue.h
deleted file mode 100644
index 336c01c..0000000
--- a/include.new/mqueue.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2005 David Xu <davidxu@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.
- *
- * 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: releng/10.2/include/mqueue.h 240297 2012-09-10 05:12:45Z davidxu $
- */
-
-#ifndef _MQUEUE_H_
-#define _MQUEUE_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/mqueue.h>
-#include <sys/signal.h>
-
-struct timespec;
-
-__BEGIN_DECLS
-int	mq_close(mqd_t);
-int	mq_getattr(mqd_t, struct mq_attr *);
-int	mq_notify(mqd_t, const struct sigevent *);
-mqd_t	mq_open(const char *, int, ...);
-ssize_t	mq_receive(mqd_t, char *, size_t, unsigned *);
-int	mq_send(mqd_t, const char *, size_t, unsigned);
-int	mq_setattr(mqd_t, const struct mq_attr *__restrict,
-		struct mq_attr *__restrict);
-ssize_t	mq_timedreceive(mqd_t, char *__restrict, size_t,
-		unsigned *__restrict, const struct timespec *__restrict);
-int	mq_timedsend(mqd_t, const char *, size_t, unsigned,
-		const struct timespec *);
-int	mq_unlink(const char *);
-int	__mq_oshandle(mqd_t mqd);
-
-__END_DECLS
-#endif
diff --git a/include.new/mtlib.h b/include.new/mtlib.h
deleted file mode 100644
index 804a773..0000000
--- a/include.new/mtlib.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 2013, 2014 Spectra Logic Corporation
- * 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,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
- *
- * Authors: Ken Merry           (Spectra Logic Corporation)
- *
- * $FreeBSD: releng/10.2/lib/libmt/mtlib.h 279219 2015-02-23 21:59:30Z ken $
- */
-
-#ifndef	_MTLIB_H
-#define	_MTLIB_H
-
-typedef enum {
-	MT_TYPE_NONE,
-	MT_TYPE_STRING,
-	MT_TYPE_INT,
-	MT_TYPE_UINT,
-	MT_TYPE_NODE
-} mt_variable_type;
-
-struct mt_status_nv {
-	char *name;
-	char *value;
-	STAILQ_ENTRY(mt_status_nv) links;
-};
-
-struct mt_status_entry {
-	char *entry_name;
-	char *value;
-	uint64_t value_unsigned;
-	int64_t value_signed;
-	char *fmt;
-	char *desc;
-	size_t size;
-	mt_variable_type var_type;
-	struct mt_status_entry *parent;
-	STAILQ_HEAD(, mt_status_nv) nv_list;
-	STAILQ_HEAD(, mt_status_entry) child_entries;
-	STAILQ_ENTRY(mt_status_entry) links;
-};
-
-struct mt_status_data {
-	int level;
-	struct sbuf *cur_sb[32];
-	struct mt_status_entry *cur_entry[32];
-	int error;
-	char error_str[128];
-	STAILQ_HEAD(, mt_status_entry) entries;
-};
-
-typedef enum {
-	MT_PF_NONE		= 0x00,
-	MT_PF_VERBOSE		= 0x01,
-	MT_PF_FULL_PATH		= 0x02,
-	MT_PF_INCLUDE_ROOT	= 0x04
-} mt_print_flags;
-
-struct mt_print_params {
-	mt_print_flags flags;
-	char root_name[64];
-};
-
-__BEGIN_DECLS
-void mt_start_element(void *user_data, const char *name, const char **attr);
-void mt_end_element(void *user_data, const char *name);
-void mt_char_handler(void *user_data, const XML_Char *str, int len);
-void mt_status_tree_sbuf(struct sbuf *sb, struct mt_status_entry *entry,
-			 int indent, void (*sbuf_func)(struct sbuf *sb,
-			 struct mt_status_entry *entry, void *arg), void *arg);
-void mt_status_tree_print(struct mt_status_entry *entry, int indent,
-			  void (*print_func)(struct mt_status_entry *entry,
-			  void *arg), void *arg);
-struct mt_status_entry *mt_entry_find(struct mt_status_entry *entry,
-				      char *name);
-struct mt_status_entry *mt_status_entry_find(struct mt_status_data *status_data,
-					     char *name);
-void mt_status_entry_free(struct mt_status_entry *entry);
-void mt_status_free(struct mt_status_data *status_data);
-void mt_entry_sbuf(struct sbuf *sb, struct mt_status_entry *entry, char *fmt);
-void mt_param_parent_print(struct mt_status_entry *entry,
-			   struct mt_print_params *print_params);
-void mt_param_parent_sbuf(struct sbuf *sb, struct mt_status_entry *entry,
-			  struct mt_print_params *print_params);
-void mt_param_entry_sbuf(struct sbuf *sb, struct mt_status_entry *entry,
-			 void *arg);
-void mt_param_entry_print(struct mt_status_entry *entry, void *arg);
-int mt_protect_print(struct mt_status_data *status_data, int verbose);
-int mt_param_list(struct mt_status_data *status_data, char *param_name,
-		  int quiet);
-const char *mt_density_name(int density_num);
-int mt_density_bp(int density_num, int bpi);
-int mt_density_num(const char *density_name);
-int mt_get_xml_str(int mtfd, unsigned long cmd, char **xml_str);
-int mt_get_status(char *xml_str, struct mt_status_data *status_data);
-__END_DECLS
-
-#endif /* _MTLIB_H */
diff --git a/include.new/ncurses.h b/include.new/ncurses.h
deleted file mode 100644
index c482c9a..0000000
--- a/include.new/ncurses.h
+++ /dev/null
@@ -1,1757 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- *     and: Thomas E. Dickey                        1996-on                 *
- ****************************************************************************/
-
-/* $Id: ncurses.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __NCURSES_H
-#define __NCURSES_H
-
-#define CURSES 1
-#define CURSES_H 1
-
-/* This should be defined for the enhanced functionality to be visible.
- * However, some of the wide-character (enhanced) functionality is missing.
- * So we do not define it (yet).
-#define _XOPEN_CURSES 1
- */
-
-/* These are defined only in curses.h, and are used for conditional compiles */
-#define NCURSES_VERSION_MAJOR 5
-#define NCURSES_VERSION_MINOR 7
-#define NCURSES_VERSION_PATCH 20081102
-
-/* This is defined in more than one ncurses header, for identification */
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "5.7"
-
-/*
- * Identify the mouse encoding version.
- */
-#define NCURSES_MOUSE_VERSION 1
-
-/*
- * Definitions to facilitate DLL's.
- */
-#include <ncurses_dll.h>
-
-/*
- * User-definable tweak to disable the include of <stdbool.h>.
- */
-#ifndef NCURSES_ENABLE_STDBOOL_H
-#define NCURSES_ENABLE_STDBOOL_H 1
-#endif
-
-/*
- * NCURSES_ATTR_T is used to quiet compiler warnings when building ncurses
- * configured using --disable-macros.
- */
-#ifdef NCURSES_NOMACROS
-#ifndef NCURSES_ATTR_T
-#define NCURSES_ATTR_T attr_t
-#endif
-#endif /* NCURSES_NOMACROS */
-
-#ifndef NCURSES_ATTR_T
-#define NCURSES_ATTR_T int
-#endif
-
-/*
- * Expands to 'const' if ncurses is configured using --enable-const.  Note that
- * doing so makes it incompatible with other implementations of X/Open Curses.
- */
-#undef  NCURSES_CONST
-#define NCURSES_CONST const
-
-#undef NCURSES_INLINE
-#define NCURSES_INLINE inline
-
-/*
- * The internal type used for color values
- */
-#undef	NCURSES_COLOR_T
-#define	NCURSES_COLOR_T short
-
-/*
- * Definition used to make WINDOW and similar structs opaque.
- */
-#ifndef NCURSES_OPAQUE
-#define NCURSES_OPAQUE 0
-#endif
-
-/*
- * The internal type used for window dimensions.
- */
-#undef	NCURSES_SIZE_T
-#define	NCURSES_SIZE_T short
-
-/*
- * Control whether tparm() supports varargs or fixed-parameter list.
- */
-#undef NCURSES_TPARM_VARARGS
-#define NCURSES_TPARM_VARARGS 1
-
-/*
- * NCURSES_CH_T is used in building the library, but not used otherwise in
- * this header file, since that would make the normal/wide-character versions
- * of the header incompatible.
- */
-#undef	NCURSES_CH_T
-#define NCURSES_CH_T cchar_t
-
-#if 0 && defined(_LP64)
-typedef unsigned chtype;
-typedef unsigned mmask_t;
-#else
-typedef unsigned long chtype;
-typedef unsigned long mmask_t;
-#endif
-
-#include <stdio.h>
-#include <unctrl.h>
-#include <stdarg.h>	/* we need va_list */
-#ifdef _XOPEN_SOURCE_EXTENDED
-#include <stddef.h>	/* we want wchar_t */
-#endif /* _XOPEN_SOURCE_EXTENDED */
-
-/* X/Open and SVr4 specify that curses implements 'bool'.  However, C++ may also
- * implement it.  If so, we must use the C++ compiler's type to avoid conflict
- * with other interfaces.
- *
- * A further complication is that <stdbool.h> may declare 'bool' to be a
- * different type, such as an enum which is not necessarily compatible with
- * C++.  If we have <stdbool.h>, make 'bool' a macro, so users may #undef it.
- * Otherwise, let it remain a typedef to avoid conflicts with other #define's.
- * In either case, make a typedef for NCURSES_BOOL which can be used if needed
- * from either C or C++.
- */
-
-#undef TRUE
-#define TRUE    1
-
-#undef FALSE
-#define FALSE   0
-
-typedef unsigned char NCURSES_BOOL;
-
-#if defined(__cplusplus)	/* __cplusplus, etc. */
-
-/* use the C++ compiler's bool type */
-#define NCURSES_BOOL bool
-
-#else			/* c89, c99, etc. */
-
-#if NCURSES_ENABLE_STDBOOL_H
-#include <stdbool.h>
-/* use whatever the C compiler decides bool really is */
-#define NCURSES_BOOL bool
-#else
-/* there is no predefined bool - use our own */
-#undef bool
-#define bool NCURSES_BOOL
-#endif
-
-#endif /* !__cplusplus, etc. */
-
-#ifdef __cplusplus
-extern "C" {
-#define NCURSES_CAST(type,value) static_cast<type>(value)
-#else
-#define NCURSES_CAST(type,value) (type)(value)
-#endif
-
-/*
- * X/Open attributes.  In the ncurses implementation, they are identical to the
- * A_ attributes.
- */
-#define WA_ATTRIBUTES	A_ATTRIBUTES
-#define WA_NORMAL	A_NORMAL
-#define WA_STANDOUT	A_STANDOUT
-#define WA_UNDERLINE	A_UNDERLINE
-#define WA_REVERSE	A_REVERSE
-#define WA_BLINK	A_BLINK
-#define WA_DIM		A_DIM
-#define WA_BOLD		A_BOLD
-#define WA_ALTCHARSET	A_ALTCHARSET
-#define WA_INVIS	A_INVIS
-#define WA_PROTECT	A_PROTECT
-#define WA_HORIZONTAL	A_HORIZONTAL
-#define WA_LEFT		A_LEFT
-#define WA_LOW		A_LOW
-#define WA_RIGHT	A_RIGHT
-#define WA_TOP		A_TOP
-#define WA_VERTICAL	A_VERTICAL
-
-/* colors */
-#define COLOR_BLACK	0
-#define COLOR_RED	1
-#define COLOR_GREEN	2
-#define COLOR_YELLOW	3
-#define COLOR_BLUE	4
-#define COLOR_MAGENTA	5
-#define COLOR_CYAN	6
-#define COLOR_WHITE	7
-
-/* line graphics */
-
-#if 0 || 0
-NCURSES_WRAPPED_VAR(chtype*, acs_map);
-#define acs_map (_nc_acs_map())
-#else
-extern NCURSES_EXPORT_VAR(chtype) acs_map[];
-#endif
-
-#define NCURSES_ACS(c)	(acs_map[NCURSES_CAST(unsigned char,c)])
-
-/* VT100 symbols begin here */
-#define ACS_ULCORNER	NCURSES_ACS('l') /* upper left corner */
-#define ACS_LLCORNER	NCURSES_ACS('m') /* lower left corner */
-#define ACS_URCORNER	NCURSES_ACS('k') /* upper right corner */
-#define ACS_LRCORNER	NCURSES_ACS('j') /* lower right corner */
-#define ACS_LTEE	NCURSES_ACS('t') /* tee pointing right */
-#define ACS_RTEE	NCURSES_ACS('u') /* tee pointing left */
-#define ACS_BTEE	NCURSES_ACS('v') /* tee pointing up */
-#define ACS_TTEE	NCURSES_ACS('w') /* tee pointing down */
-#define ACS_HLINE	NCURSES_ACS('q') /* horizontal line */
-#define ACS_VLINE	NCURSES_ACS('x') /* vertical line */
-#define ACS_PLUS	NCURSES_ACS('n') /* large plus or crossover */
-#define ACS_S1		NCURSES_ACS('o') /* scan line 1 */
-#define ACS_S9		NCURSES_ACS('s') /* scan line 9 */
-#define ACS_DIAMOND	NCURSES_ACS('`') /* diamond */
-#define ACS_CKBOARD	NCURSES_ACS('a') /* checker board (stipple) */
-#define ACS_DEGREE	NCURSES_ACS('f') /* degree symbol */
-#define ACS_PLMINUS	NCURSES_ACS('g') /* plus/minus */
-#define ACS_BULLET	NCURSES_ACS('~') /* bullet */
-/* Teletype 5410v1 symbols begin here */
-#define ACS_LARROW	NCURSES_ACS(',') /* arrow pointing left */
-#define ACS_RARROW	NCURSES_ACS('+') /* arrow pointing right */
-#define ACS_DARROW	NCURSES_ACS('.') /* arrow pointing down */
-#define ACS_UARROW	NCURSES_ACS('-') /* arrow pointing up */
-#define ACS_BOARD	NCURSES_ACS('h') /* board of squares */
-#define ACS_LANTERN	NCURSES_ACS('i') /* lantern symbol */
-#define ACS_BLOCK	NCURSES_ACS('0') /* solid square block */
-/*
- * These aren't documented, but a lot of System Vs have them anyway
- * (you can spot pprryyzz{{||}} in a lot of AT&T terminfo strings).
- * The ACS_names may not match AT&T's, our source didn't know them.
- */
-#define ACS_S3		NCURSES_ACS('p') /* scan line 3 */
-#define ACS_S7		NCURSES_ACS('r') /* scan line 7 */
-#define ACS_LEQUAL	NCURSES_ACS('y') /* less/equal */
-#define ACS_GEQUAL	NCURSES_ACS('z') /* greater/equal */
-#define ACS_PI		NCURSES_ACS('{') /* Pi */
-#define ACS_NEQUAL	NCURSES_ACS('|') /* not equal */
-#define ACS_STERLING	NCURSES_ACS('}') /* UK pound sign */
-
-/*
- * Line drawing ACS names are of the form ACS_trbl, where t is the top, r
- * is the right, b is the bottom, and l is the left.  t, r, b, and l might
- * be B (blank), S (single), D (double), or T (thick).  The subset defined
- * here only uses B and S.
- */
-#define ACS_BSSB	ACS_ULCORNER
-#define ACS_SSBB	ACS_LLCORNER
-#define ACS_BBSS	ACS_URCORNER
-#define ACS_SBBS	ACS_LRCORNER
-#define ACS_SBSS	ACS_RTEE
-#define ACS_SSSB	ACS_LTEE
-#define ACS_SSBS	ACS_BTEE
-#define ACS_BSSS	ACS_TTEE
-#define ACS_BSBS	ACS_HLINE
-#define ACS_SBSB	ACS_VLINE
-#define ACS_SSSS	ACS_PLUS
-
-#undef	ERR
-#define ERR     (-1)
-
-#undef	OK
-#define OK      (0)
-
-/* values for the _flags member */
-#define _SUBWIN         0x01	/* is this a sub-window? */
-#define _ENDLINE        0x02	/* is the window flush right? */
-#define _FULLWIN        0x04	/* is the window full-screen? */
-#define _SCROLLWIN      0x08	/* bottom edge is at screen bottom? */
-#define _ISPAD	        0x10	/* is this window a pad? */
-#define _HASMOVED       0x20	/* has cursor moved since last refresh? */
-#define _WRAPPED        0x40	/* cursor was just wrappped */
-
-/*
- * this value is used in the firstchar and lastchar fields to mark
- * unchanged lines
- */
-#define _NOCHANGE       -1
-
-/*
- * this value is used in the oldindex field to mark lines created by insertions
- * and scrolls.
- */
-#define _NEWINDEX	-1
-
-typedef struct screen  SCREEN;
-typedef struct _win_st WINDOW;
-
-typedef	chtype	attr_t;		/* ...must be at least as wide as chtype */
-
-#ifdef _XOPEN_SOURCE_EXTENDED
-
-#if 0
-#ifdef mblen			/* libutf8.h defines it w/o undefining first */
-#undef mblen
-#endif
-#include <libutf8.h>
-#endif
-
-#if 1
-#include <wchar.h>		/* ...to get mbstate_t, etc. */
-#endif
-
-#if 0
-typedef unsigned short wchar_t1;
-#endif
-
-#if 0
-typedef unsigned int wint_t1;
-#endif
-
-#define CCHARW_MAX	5
-typedef struct
-{
-    attr_t	attr;
-    wchar_t	chars[CCHARW_MAX];
-#if 0
-#undef NCURSES_EXT_COLORS
-#define NCURSES_EXT_COLORS 20081102
-    int		ext_color;	/* color pair, must be more than 16-bits */
-#endif
-}
-cchar_t;
-
-#endif /* _XOPEN_SOURCE_EXTENDED */
-
-#if !NCURSES_OPAQUE
-struct ldat;
-
-struct _win_st
-{
-	NCURSES_SIZE_T _cury, _curx; /* current cursor position */
-
-	/* window location and size */
-	NCURSES_SIZE_T _maxy, _maxx; /* maximums of x and y, NOT window size */
-	NCURSES_SIZE_T _begy, _begx; /* screen coords of upper-left-hand corner */
-
-	short   _flags;		/* window state flags */
-
-	/* attribute tracking */
-	attr_t  _attrs;		/* current attribute for non-space character */
-	chtype  _bkgd;		/* current background char/attribute pair */
-
-	/* option values set by user */
-	bool	_notimeout;	/* no time out on function-key entry? */
-	bool	_clear;		/* consider all data in the window invalid? */
-	bool	_leaveok;	/* OK to not reset cursor on exit? */
-	bool	_scroll;	/* OK to scroll this window? */
-	bool	_idlok;		/* OK to use insert/delete line? */
-	bool	_idcok;		/* OK to use insert/delete char? */
-	bool	_immed;		/* window in immed mode? (not yet used) */
-	bool	_sync;		/* window in sync mode? */
-	bool	_use_keypad;	/* process function keys into KEY_ symbols? */
-	int	_delay;		/* 0 = nodelay, <0 = blocking, >0 = delay */
-
-	struct ldat *_line;	/* the actual line data */
-
-	/* global screen state */
-	NCURSES_SIZE_T _regtop;	/* top line of scrolling region */
-	NCURSES_SIZE_T _regbottom; /* bottom line of scrolling region */
-
-	/* these are used only if this is a sub-window */
-	int	_parx;		/* x coordinate of this window in parent */
-	int	_pary;		/* y coordinate of this window in parent */
-	WINDOW	*_parent;	/* pointer to parent if a sub-window */
-
-	/* these are used only if this is a pad */
-	struct pdat
-	{
-	    NCURSES_SIZE_T _pad_y,      _pad_x;
-	    NCURSES_SIZE_T _pad_top,    _pad_left;
-	    NCURSES_SIZE_T _pad_bottom, _pad_right;
-	} _pad;
-
-	NCURSES_SIZE_T _yoffset; /* real begy is _begy + _yoffset */
-
-#ifdef _XOPEN_SOURCE_EXTENDED
-	cchar_t  _bkgrnd;	/* current background char/attribute pair */
-#if 0
-	int	_color;		/* current color-pair for non-space character */
-#endif
-#endif
-};
-#endif /* NCURSES_OPAQUE */
-
-/*
- * This is an extension to support events...
- */
-#if 1
-#ifdef NCURSES_WGETCH_EVENTS
-#if !defined(__BEOS__) || defined(__HAIKU__)
-   /* Fix _nc_timed_wait() on BEOS... */
-#  define NCURSES_EVENT_VERSION	1
-#endif	/* !defined(__BEOS__) */
-
-/*
- * Bits to set in _nc_event.data.flags
- */
-#  define _NC_EVENT_TIMEOUT_MSEC	1
-#  define _NC_EVENT_FILE		2
-#  define _NC_EVENT_FILE_READABLE	2
-#  if 0					/* Not supported yet... */
-#    define _NC_EVENT_FILE_WRITABLE	4
-#    define _NC_EVENT_FILE_EXCEPTION	8
-#  endif
-
-typedef struct
-{
-    int type;
-    union
-    {
-	long timeout_msec;	/* _NC_EVENT_TIMEOUT_MSEC */
-	struct
-	{
-	    unsigned int flags;
-	    int fd;
-	    unsigned int result;
-	} fev;				/* _NC_EVENT_FILE */
-    } data;
-} _nc_event;
-
-typedef struct
-{
-    int count;
-    int result_flags;	/* _NC_EVENT_TIMEOUT_MSEC or _NC_EVENT_FILE_READABLE */
-    _nc_event *events[1];
-} _nc_eventlist;
-
-extern NCURSES_EXPORT(int) wgetch_events(WINDOW *, _nc_eventlist *);	/* experimental */
-extern NCURSES_EXPORT(int) wgetnstr_events(WINDOW *,char *,int,_nc_eventlist *);/* experimental */
-
-#endif /* NCURSES_WGETCH_EVENTS */
-#endif /* NCURSES_EXT_FUNCS */
-
-/*
- * GCC (and some other compilers) define '__attribute__'; we're using this
- * macro to alert the compiler to flag inconsistencies in printf/scanf-like
- * function calls.  Just in case '__attribute__' isn't defined, make a dummy.
- * Old versions of G++ do not accept it anyway, at least not consistently with
- * GCC.
- */
-#if !(defined(__GNUC__) || defined(__GNUG__) || defined(__attribute__))
-#define __attribute__(p) /* nothing */
-#endif
-
-/*
- * We cannot define these in ncurses_cfg.h, since they require parameters to be
- * passed (that is non-portable).  If you happen to be using gcc with warnings
- * enabled, define
- *	GCC_PRINTF
- *	GCC_SCANF
- * to improve checking of calls to printw(), etc.
- */
-#ifndef GCC_PRINTFLIKE
-#if defined(GCC_PRINTF) && !defined(printf)
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-#else
-#define GCC_PRINTFLIKE(fmt,var) /*nothing*/
-#endif
-#endif
-
-#ifndef GCC_SCANFLIKE
-#if defined(GCC_SCANF) && !defined(scanf)
-#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
-#else
-#define GCC_SCANFLIKE(fmt,var)  /*nothing*/
-#endif
-#endif
-
-#ifndef	GCC_NORETURN
-#define	GCC_NORETURN /* nothing */
-#endif
-
-#ifndef	GCC_UNUSED
-#define	GCC_UNUSED /* nothing */
-#endif
-
-/*
- * Function prototypes.  This is the complete X/Open Curses list of required
- * functions.  Those marked `generated' will have sources generated from the
- * macro definitions later in this file, in order to satisfy XPG4.2
- * requirements.
- */
-
-extern NCURSES_EXPORT(int) addch (const chtype);			/* generated */
-extern NCURSES_EXPORT(int) addchnstr (const chtype *, int);		/* generated */
-extern NCURSES_EXPORT(int) addchstr (const chtype *);			/* generated */
-extern NCURSES_EXPORT(int) addnstr (const char *, int);			/* generated */
-extern NCURSES_EXPORT(int) addstr (const char *);			/* generated */
-extern NCURSES_EXPORT(int) attroff (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attron (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attrset (NCURSES_ATTR_T);			/* generated */
-extern NCURSES_EXPORT(int) attr_get (attr_t *, short *, void *);	/* generated */
-extern NCURSES_EXPORT(int) attr_off (attr_t, void *);			/* generated */
-extern NCURSES_EXPORT(int) attr_on (attr_t, void *);			/* generated */
-extern NCURSES_EXPORT(int) attr_set (attr_t, short, void *);		/* generated */
-extern NCURSES_EXPORT(int) baudrate (void);				/* implemented */
-extern NCURSES_EXPORT(int) beep  (void);				/* implemented */
-extern NCURSES_EXPORT(int) bkgd (chtype);				/* generated */
-extern NCURSES_EXPORT(void) bkgdset (chtype);				/* generated */
-extern NCURSES_EXPORT(int) border (chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* generated */
-extern NCURSES_EXPORT(int) box (WINDOW *, chtype, chtype);		/* generated */
-extern NCURSES_EXPORT(bool) can_change_color (void);			/* implemented */
-extern NCURSES_EXPORT(int) cbreak (void);				/* implemented */
-extern NCURSES_EXPORT(int) chgat (int, attr_t, short, const void *);	/* generated */
-extern NCURSES_EXPORT(int) clear (void);				/* generated */
-extern NCURSES_EXPORT(int) clearok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) clrtobot (void);				/* generated */
-extern NCURSES_EXPORT(int) clrtoeol (void);				/* generated */
-extern NCURSES_EXPORT(int) color_content (short,short*,short*,short*);	/* implemented */
-extern NCURSES_EXPORT(int) color_set (short,void*);			/* generated */
-extern NCURSES_EXPORT(int) COLOR_PAIR (int);				/* generated */
-extern NCURSES_EXPORT(int) copywin (const WINDOW*,WINDOW*,int,int,int,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) curs_set (int);				/* implemented */
-extern NCURSES_EXPORT(int) def_prog_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) def_shell_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) delay_output (int);				/* implemented */
-extern NCURSES_EXPORT(int) delch (void);				/* generated */
-extern NCURSES_EXPORT(void) delscreen (SCREEN *);			/* implemented */
-extern NCURSES_EXPORT(int) delwin (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) deleteln (void);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) derwin (WINDOW *,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) doupdate (void);				/* implemented */
-extern NCURSES_EXPORT(WINDOW *) dupwin (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) echo (void);					/* implemented */
-extern NCURSES_EXPORT(int) echochar (const chtype);			/* generated */
-extern NCURSES_EXPORT(int) erase (void);				/* generated */
-extern NCURSES_EXPORT(int) endwin (void);				/* implemented */
-extern NCURSES_EXPORT(char) erasechar (void);				/* implemented */
-extern NCURSES_EXPORT(void) filter (void);				/* implemented */
-extern NCURSES_EXPORT(int) flash (void);				/* implemented */
-extern NCURSES_EXPORT(int) flushinp (void);				/* implemented */
-extern NCURSES_EXPORT(chtype) getbkgd (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getch (void);				/* generated */
-extern NCURSES_EXPORT(int) getnstr (char *, int);			/* generated */
-extern NCURSES_EXPORT(int) getstr (char *);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) getwin (FILE *);			/* implemented */
-extern NCURSES_EXPORT(int) halfdelay (int);				/* implemented */
-extern NCURSES_EXPORT(bool) has_colors (void);				/* implemented */
-extern NCURSES_EXPORT(bool) has_ic (void);				/* implemented */
-extern NCURSES_EXPORT(bool) has_il (void);				/* implemented */
-extern NCURSES_EXPORT(int) hline (chtype, int);				/* generated */
-extern NCURSES_EXPORT(void) idcok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(int) idlok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(void) immedok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(chtype) inch (void);				/* generated */
-extern NCURSES_EXPORT(int) inchnstr (chtype *, int);			/* generated */
-extern NCURSES_EXPORT(int) inchstr (chtype *);				/* generated */
-extern NCURSES_EXPORT(WINDOW *) initscr (void);				/* implemented */
-extern NCURSES_EXPORT(int) init_color (short,short,short,short);	/* implemented */
-extern NCURSES_EXPORT(int) init_pair (short,short,short);		/* implemented */
-extern NCURSES_EXPORT(int) innstr (char *, int);			/* generated */
-extern NCURSES_EXPORT(int) insch (chtype);				/* generated */
-extern NCURSES_EXPORT(int) insdelln (int);				/* generated */
-extern NCURSES_EXPORT(int) insertln (void);				/* generated */
-extern NCURSES_EXPORT(int) insnstr (const char *, int);			/* generated */
-extern NCURSES_EXPORT(int) insstr (const char *);			/* generated */
-extern NCURSES_EXPORT(int) instr (char *);				/* generated */
-extern NCURSES_EXPORT(int) intrflush (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(bool) isendwin (void);				/* implemented */
-extern NCURSES_EXPORT(bool) is_linetouched (WINDOW *,int);		/* implemented */
-extern NCURSES_EXPORT(bool) is_wintouched (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(NCURSES_CONST char *) keyname (int);		/* implemented */
-extern NCURSES_EXPORT(int) keypad (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(char) killchar (void);				/* implemented */
-extern NCURSES_EXPORT(int) leaveok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(char *) longname (void);				/* implemented */
-extern NCURSES_EXPORT(int) meta (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) move (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvaddch (int, int, const chtype);		/* generated */
-extern NCURSES_EXPORT(int) mvaddchnstr (int, int, const chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvaddchstr (int, int, const chtype *);	/* generated */
-extern NCURSES_EXPORT(int) mvaddnstr (int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvaddstr (int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvchgat (int, int, int, attr_t, short, const void *);	/* generated */
-extern NCURSES_EXPORT(int) mvcur (int,int,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) mvdelch (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvderwin (WINDOW *, int, int);		/* implemented */
-extern NCURSES_EXPORT(int) mvgetch (int, int);				/* generated */
-extern NCURSES_EXPORT(int) mvgetnstr (int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvgetstr (int, int, char *);			/* generated */
-extern NCURSES_EXPORT(int) mvhline (int, int, chtype, int);		/* generated */
-extern NCURSES_EXPORT(chtype) mvinch (int, int);			/* generated */
-extern NCURSES_EXPORT(int) mvinchnstr (int, int, chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvinchstr (int, int, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) mvinnstr (int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvinsch (int, int, chtype);			/* generated */
-extern NCURSES_EXPORT(int) mvinsnstr (int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvinsstr (int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvinstr (int, int, char *);			/* generated */
-extern NCURSES_EXPORT(int) mvprintw (int,int, const char *,...)		/* implemented */
-		GCC_PRINTFLIKE(3,4);
-extern NCURSES_EXPORT(int) mvscanw (int,int, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(3,4);
-extern NCURSES_EXPORT(int) mvvline (int, int, chtype, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwaddch (WINDOW *, int, int, const chtype);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddchnstr (WINDOW *, int, int, const chtype *, int);/* generated */
-extern NCURSES_EXPORT(int) mvwaddchstr (WINDOW *, int, int, const chtype *);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddnstr (WINDOW *, int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwaddstr (WINDOW *, int, int, const char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwchgat (WINDOW *, int, int, int, attr_t, short, const void *);/* generated */
-extern NCURSES_EXPORT(int) mvwdelch (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwgetch (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwgetnstr (WINDOW *, int, int, char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwgetstr (WINDOW *, int, int, char *);	/* generated */
-extern NCURSES_EXPORT(int) mvwhline (WINDOW *, int, int, chtype, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwin (WINDOW *,int,int);			/* implemented */
-extern NCURSES_EXPORT(chtype) mvwinch (WINDOW *, int, int);			/* generated */
-extern NCURSES_EXPORT(int) mvwinchnstr (WINDOW *, int, int, chtype *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwinchstr (WINDOW *, int, int, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) mvwinnstr (WINDOW *, int, int, char *, int);		/* generated */
-extern NCURSES_EXPORT(int) mvwinsch (WINDOW *, int, int, chtype);		/* generated */
-extern NCURSES_EXPORT(int) mvwinsnstr (WINDOW *, int, int, const char *, int);	/* generated */
-extern NCURSES_EXPORT(int) mvwinsstr (WINDOW *, int, int, const char *);		/* generated */
-extern NCURSES_EXPORT(int) mvwinstr (WINDOW *, int, int, char *);		/* generated */
-extern NCURSES_EXPORT(int) mvwprintw (WINDOW*,int,int, const char *,...)	/* implemented */
-		GCC_PRINTFLIKE(4,5);
-extern NCURSES_EXPORT(int) mvwscanw (WINDOW *,int,int, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(4,5);
-extern NCURSES_EXPORT(int) mvwvline (WINDOW *,int, int, chtype, int);	/* generated */
-extern NCURSES_EXPORT(int) napms (int);					/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newpad (int,int);				/* implemented */
-extern NCURSES_EXPORT(SCREEN *) newterm (NCURSES_CONST char *,FILE *,FILE *);	/* implemented */
-extern NCURSES_EXPORT(WINDOW *) newwin (int,int,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) nl (void);					/* implemented */
-extern NCURSES_EXPORT(int) nocbreak (void);				/* implemented */
-extern NCURSES_EXPORT(int) nodelay (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) noecho (void);				/* implemented */
-extern NCURSES_EXPORT(int) nonl (void);					/* implemented */
-extern NCURSES_EXPORT(void) noqiflush (void);				/* implemented */
-extern NCURSES_EXPORT(int) noraw (void);				/* implemented */
-extern NCURSES_EXPORT(int) notimeout (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) overlay (const WINDOW*,WINDOW *);		/* implemented */
-extern NCURSES_EXPORT(int) overwrite (const WINDOW*,WINDOW *);		/* implemented */
-extern NCURSES_EXPORT(int) pair_content (short,short*,short*);		/* implemented */
-extern NCURSES_EXPORT(int) PAIR_NUMBER (int);				/* generated */
-extern NCURSES_EXPORT(int) pechochar (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) pnoutrefresh (WINDOW*,int,int,int,int,int,int);/* implemented */
-extern NCURSES_EXPORT(int) prefresh (WINDOW *,int,int,int,int,int,int);	/* implemented */
-extern NCURSES_EXPORT(int) printw (const char *,...)			/* implemented */
-		GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(int) putwin (WINDOW *, FILE *);			/* implemented */
-extern NCURSES_EXPORT(void) qiflush (void);				/* implemented */
-extern NCURSES_EXPORT(int) raw (void);					/* implemented */
-extern NCURSES_EXPORT(int) redrawwin (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) refresh (void);				/* generated */
-extern NCURSES_EXPORT(int) resetty (void);				/* implemented */
-extern NCURSES_EXPORT(int) reset_prog_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) reset_shell_mode (void);			/* implemented */
-extern NCURSES_EXPORT(int) ripoffline (int, int (*)(WINDOW *, int));	/* implemented */
-extern NCURSES_EXPORT(int) savetty (void);				/* implemented */
-extern NCURSES_EXPORT(int) scanw (NCURSES_CONST char *,...)		/* implemented */
-		GCC_SCANFLIKE(1,2);
-extern NCURSES_EXPORT(int) scr_dump (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scr_init (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scrl (int);					/* generated */
-extern NCURSES_EXPORT(int) scroll (WINDOW *);				/* generated */
-extern NCURSES_EXPORT(int) scrollok (WINDOW *,bool);			/* implemented */
-extern NCURSES_EXPORT(int) scr_restore (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) scr_set (const char *);			/* implemented */
-extern NCURSES_EXPORT(int) setscrreg (int,int);				/* generated */
-extern NCURSES_EXPORT(SCREEN *) set_term (SCREEN *);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attroff (const chtype);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_off (const attr_t, void *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) slk_attron (const chtype);			/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_on (attr_t,void*);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) slk_attrset (const chtype);			/* implemented */
-extern NCURSES_EXPORT(attr_t) slk_attr (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_attr_set (const attr_t,short,void*);	/* implemented */
-extern NCURSES_EXPORT(int) slk_clear (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_color (short);				/* implemented */
-extern NCURSES_EXPORT(int) slk_init (int);				/* implemented */
-extern NCURSES_EXPORT(char *) slk_label (int);				/* implemented */
-extern NCURSES_EXPORT(int) slk_noutrefresh (void);			/* implemented */
-extern NCURSES_EXPORT(int) slk_refresh (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_restore (void);				/* implemented */
-extern NCURSES_EXPORT(int) slk_set (int,const char *,int);		/* implemented */
-extern NCURSES_EXPORT(int) slk_touch (void);				/* implemented */
-extern NCURSES_EXPORT(int) standout (void);				/* generated */
-extern NCURSES_EXPORT(int) standend (void);				/* generated */
-extern NCURSES_EXPORT(int) start_color (void);				/* implemented */
-extern NCURSES_EXPORT(WINDOW *) subpad (WINDOW *, int, int, int, int);	/* implemented */
-extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *, int, int, int, int);	/* implemented */
-extern NCURSES_EXPORT(int) syncok (WINDOW *, bool);			/* implemented */
-extern NCURSES_EXPORT(chtype) termattrs (void);				/* implemented */
-extern NCURSES_EXPORT(char *) termname (void);				/* implemented */
-extern NCURSES_EXPORT(void) timeout (int);				/* generated */
-extern NCURSES_EXPORT(int) touchline (WINDOW *, int, int);		/* generated */
-extern NCURSES_EXPORT(int) touchwin (WINDOW *);				/* generated */
-extern NCURSES_EXPORT(int) typeahead (int);				/* implemented */
-extern NCURSES_EXPORT(int) ungetch (int);				/* implemented */
-extern NCURSES_EXPORT(int) untouchwin (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(void) use_env (bool);				/* implemented */
-extern NCURSES_EXPORT(int) vidattr (chtype);				/* implemented */
-extern NCURSES_EXPORT(int) vidputs (chtype, int (*)(int));		/* implemented */
-extern NCURSES_EXPORT(int) vline (chtype, int);				/* generated */
-extern NCURSES_EXPORT(int) vwprintw (WINDOW *, const char *,va_list);	/* implemented */
-extern NCURSES_EXPORT(int) vw_printw (WINDOW *, const char *,va_list);	/* generated */
-extern NCURSES_EXPORT(int) vwscanw (WINDOW *, NCURSES_CONST char *,va_list);	/* implemented */
-extern NCURSES_EXPORT(int) vw_scanw (WINDOW *, NCURSES_CONST char *,va_list);	/* generated */
-extern NCURSES_EXPORT(int) waddch (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) waddchnstr (WINDOW *,const chtype *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddchstr (WINDOW *,const chtype *);		/* generated */
-extern NCURSES_EXPORT(int) waddnstr (WINDOW *,const char *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddstr (WINDOW *,const char *);		/* generated */
-extern NCURSES_EXPORT(int) wattron (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattroff (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattrset (WINDOW *, int);			/* generated */
-extern NCURSES_EXPORT(int) wattr_get (WINDOW *, attr_t *, short *, void *);	/* generated */
-extern NCURSES_EXPORT(int) wattr_on (WINDOW *, attr_t, void *);		/* implemented */
-extern NCURSES_EXPORT(int) wattr_off (WINDOW *, attr_t, void *);	/* implemented */
-extern NCURSES_EXPORT(int) wattr_set (WINDOW *, attr_t, short, void *);	/* generated */
-extern NCURSES_EXPORT(int) wbkgd (WINDOW *, chtype);			/* implemented */
-extern NCURSES_EXPORT(void) wbkgdset (WINDOW *,chtype);			/* implemented */
-extern NCURSES_EXPORT(int) wborder (WINDOW *,chtype,chtype,chtype,chtype,chtype,chtype,chtype,chtype);	/* implemented */
-extern NCURSES_EXPORT(int) wchgat (WINDOW *, int, attr_t, short, const void *);/* implemented */
-extern NCURSES_EXPORT(int) wclear (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wclrtobot (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wclrtoeol (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wcolor_set (WINDOW*,short,void*);		/* implemented */
-extern NCURSES_EXPORT(void) wcursyncup (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wdelch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wdeleteln (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) wechochar (WINDOW *, const chtype);		/* implemented */
-extern NCURSES_EXPORT(int) werase (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wgetch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wgetnstr (WINDOW *,char *,int);		/* implemented */
-extern NCURSES_EXPORT(int) wgetstr (WINDOW *, char *);			/* generated */
-extern NCURSES_EXPORT(int) whline (WINDOW *, chtype, int);		/* implemented */
-extern NCURSES_EXPORT(chtype) winch (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) winchnstr (WINDOW *, chtype *, int);		/* implemented */
-extern NCURSES_EXPORT(int) winchstr (WINDOW *, chtype *);		/* generated */
-extern NCURSES_EXPORT(int) winnstr (WINDOW *, char *, int);		/* implemented */
-extern NCURSES_EXPORT(int) winsch (WINDOW *, chtype);			/* implemented */
-extern NCURSES_EXPORT(int) winsdelln (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) winsertln (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) winsnstr (WINDOW *, const char *,int);	/* implemented */
-extern NCURSES_EXPORT(int) winsstr (WINDOW *, const char *);		/* generated */
-extern NCURSES_EXPORT(int) winstr (WINDOW *, char *);			/* generated */
-extern NCURSES_EXPORT(int) wmove (WINDOW *,int,int);			/* implemented */
-extern NCURSES_EXPORT(int) wnoutrefresh (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(int) wprintw (WINDOW *, const char *,...)		/* implemented */
-		GCC_PRINTFLIKE(2,3);
-extern NCURSES_EXPORT(int) wredrawln (WINDOW *,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wrefresh (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(int) wscanw (WINDOW *, NCURSES_CONST char *,...)	/* implemented */
-		GCC_SCANFLIKE(2,3);
-extern NCURSES_EXPORT(int) wscrl (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) wsetscrreg (WINDOW *,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wstandout (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) wstandend (WINDOW *);			/* generated */
-extern NCURSES_EXPORT(void) wsyncdown (WINDOW *);			/* implemented */
-extern NCURSES_EXPORT(void) wsyncup (WINDOW *);				/* implemented */
-extern NCURSES_EXPORT(void) wtimeout (WINDOW *,int);			/* implemented */
-extern NCURSES_EXPORT(int) wtouchln (WINDOW *,int,int,int);		/* implemented */
-extern NCURSES_EXPORT(int) wvline (WINDOW *,chtype,int);		/* implemented */
-
-/*
- * These are also declared in <term.h>:
- */
-extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);		/* implemented */
-extern NCURSES_EXPORT(int) putp (const char *);				/* implemented */
-
-#if NCURSES_TPARM_VARARGS
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
-#else
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
-extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
-#endif
-
-/*
- * These functions are not in X/Open, but we use them in macro definitions:
- */
-extern NCURSES_EXPORT(int) getattrs (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getcurx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getcury (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getbegx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getbegy (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getmaxx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getmaxy (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getparx (const WINDOW *);			/* generated */
-extern NCURSES_EXPORT(int) getpary (const WINDOW *);			/* generated */
-
-/*
- * vid_attr() was implemented originally based on a draft of X/Open curses.
- */
-#ifndef _XOPEN_SOURCE_EXTENDED
-#define vid_attr(a,pair,opts) vidattr(a)
-#endif
-
-/*
- * These functions are extensions - not in X/Open Curses.
- */
-#if 1
-#undef  NCURSES_EXT_FUNCS
-#define NCURSES_EXT_FUNCS 20081102
-typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
-typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
-extern NCURSES_EXPORT(bool) is_term_resized (int, int);
-extern NCURSES_EXPORT(char *) keybound (int, int);
-extern NCURSES_EXPORT(const char *) curses_version (void);
-extern NCURSES_EXPORT(int) assume_default_colors (int, int);
-extern NCURSES_EXPORT(int) define_key (const char *, int);
-extern NCURSES_EXPORT(int) key_defined (const char *);
-extern NCURSES_EXPORT(int) keyok (int, bool);
-extern NCURSES_EXPORT(int) resize_term (int, int);
-extern NCURSES_EXPORT(int) resizeterm (int, int);
-extern NCURSES_EXPORT(int) set_escdelay (int);
-extern NCURSES_EXPORT(int) set_tabsize (int);
-extern NCURSES_EXPORT(int) use_default_colors (void);
-extern NCURSES_EXPORT(int) use_extended_names (bool);
-extern NCURSES_EXPORT(int) use_legacy_coding (int);
-extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_SCREEN_CB, void *);
-extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_WINDOW_CB, void *);
-extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
-extern NCURSES_EXPORT(void) nofilter(void);
-
-/*
- * These extensions provide access to information stored in the WINDOW even
- * when NCURSES_OPAQUE is set:
- */
-extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* generated */
-extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* generated */
-extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
-
-#else
-#define curses_version() NCURSES_VERSION
-#endif
-
-/* attributes */
-
-#define NCURSES_ATTR_SHIFT       8
-#define NCURSES_BITS(mask,shift) ((mask) << ((shift) + NCURSES_ATTR_SHIFT))
-
-#define A_NORMAL	(1UL - 1UL)
-#define A_ATTRIBUTES	NCURSES_BITS(~(1UL - 1UL),0)
-#define A_CHARTEXT	(NCURSES_BITS(1UL,0) - 1UL)
-#define A_COLOR		NCURSES_BITS(((1UL) << 8) - 1UL,0)
-#define A_STANDOUT	NCURSES_BITS(1UL,8)
-#define A_UNDERLINE	NCURSES_BITS(1UL,9)
-#define A_REVERSE	NCURSES_BITS(1UL,10)
-#define A_BLINK		NCURSES_BITS(1UL,11)
-#define A_DIM		NCURSES_BITS(1UL,12)
-#define A_BOLD		NCURSES_BITS(1UL,13)
-#define A_ALTCHARSET	NCURSES_BITS(1UL,14)
-#define A_INVIS		NCURSES_BITS(1UL,15)
-#define A_PROTECT	NCURSES_BITS(1UL,16)
-#define A_HORIZONTAL	NCURSES_BITS(1UL,17)
-#define A_LEFT		NCURSES_BITS(1UL,18)
-#define A_LOW		NCURSES_BITS(1UL,19)
-#define A_RIGHT		NCURSES_BITS(1UL,20)
-#define A_TOP		NCURSES_BITS(1UL,21)
-#define A_VERTICAL	NCURSES_BITS(1UL,22)
-
-/*
- * Most of the pseudo functions are macros that either provide compatibility
- * with older versions of curses, or provide inline functionality to improve
- * performance.
- */
-
-/*
- * These pseudo functions are always implemented as macros:
- */
-
-#define getyx(win,y,x)   	(y = getcury(win), x = getcurx(win))
-#define getbegyx(win,y,x)	(y = getbegy(win), x = getbegx(win))
-#define getmaxyx(win,y,x)	(y = getmaxy(win), x = getmaxx(win))
-#define getparyx(win,y,x)	(y = getpary(win), x = getparx(win))
-
-#define getsyx(y,x) do { if (newscr) { \
-			     if (is_leaveok(newscr)) \
-				(y) = (x) = -1; \
-			     else \
-				 getyx(newscr,(y), (x)); \
-			} \
-		    } while(0)
-
-#define setsyx(y,x) do { if (newscr) { \
-			    if ((y) == -1 && (x) == -1) \
-				leaveok(newscr, TRUE); \
-			    else { \
-				leaveok(newscr, FALSE); \
-				wmove(newscr, (y), (x)); \
-			    } \
-			} \
-		    } while(0)
-
-#ifndef NCURSES_NOMACROS
-
-/*
- * These miscellaneous pseudo functions are provided for compatibility:
- */
-
-#define wgetstr(w, s)		wgetnstr(w, s, -1)
-#define getnstr(s, n)		wgetnstr(stdscr, s, n)
-
-#define setterm(term)		setupterm(term, 1, (int *)0)
-
-#define fixterm()		reset_prog_mode()
-#define resetterm()		reset_shell_mode()
-#define saveterm()		def_prog_mode()
-#define crmode()		cbreak()
-#define nocrmode()		nocbreak()
-#define gettmode()
-
-/* It seems older SYSV curses versions define these */
-#if !NCURSES_OPAQUE
-#define getattrs(win)		((win) ? (win)->_attrs : A_NORMAL)
-#define getcurx(win)		((win) ? (win)->_curx : ERR)
-#define getcury(win)		((win) ? (win)->_cury : ERR)
-#define getbegx(win)		((win) ? (win)->_begx : ERR)
-#define getbegy(win)		((win) ? (win)->_begy : ERR)
-#define getmaxx(win)		((win) ? ((win)->_maxx + 1) : ERR)
-#define getmaxy(win)		((win) ? ((win)->_maxy + 1) : ERR)
-#define getparx(win)		((win) ? (win)->_parx : ERR)
-#define getpary(win)		((win) ? (win)->_pary : ERR)
-#endif /* NCURSES_OPAQUE */
-
-#define wstandout(win)      	(wattrset(win,A_STANDOUT))
-#define wstandend(win)      	(wattrset(win,A_NORMAL))
-
-#define wattron(win,at)		wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
-#define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
-
-#if !NCURSES_OPAQUE
-#if defined(_XOPEN_SOURCE_EXTENDED) && 0
-#define wattrset(win,at)	((win)->_color = PAIR_NUMBER(at), \
-				 (win)->_attrs = (at))
-#else
-#define wattrset(win,at)	((win)->_attrs = (at))
-#endif
-#endif /* NCURSES_OPAQUE */
-
-#define scroll(win)		wscrl(win,1)
-
-#define touchwin(win)		wtouchln((win), 0, getmaxy(win), 1)
-#define touchline(win, s, c)	wtouchln((win), s, c, 1)
-#define untouchwin(win)		wtouchln((win), 0, getmaxy(win), 0)
-
-#define box(win, v, h)		wborder(win, v, v, h, h, 0, 0, 0, 0)
-#define border(ls, rs, ts, bs, tl, tr, bl, br)	wborder(stdscr, ls, rs, ts, bs, tl, tr, bl, br)
-#define hline(ch, n)		whline(stdscr, ch, n)
-#define vline(ch, n)		wvline(stdscr, ch, n)
-
-#define winstr(w, s)		winnstr(w, s, -1)
-#define winchstr(w, s)		winchnstr(w, s, -1)
-#define winsstr(w, s)		winsnstr(w, s, -1)
-
-#if !NCURSES_OPAQUE
-#define redrawwin(win)		wredrawln(win, 0, (win)->_maxy+1)
-#endif /* NCURSES_OPAQUE */
-
-#define waddstr(win,str)	waddnstr(win,str,-1)
-#define waddchstr(win,str)	waddchnstr(win,str,-1)
-
-/*
- * These apply to the first 256 color pairs.
- */
-#define COLOR_PAIR(n)	NCURSES_BITS(n, 0)
-#define PAIR_NUMBER(a)	(NCURSES_CAST(int,(((a) & A_COLOR) >> NCURSES_ATTR_SHIFT)))
-
-/*
- * pseudo functions for standard screen
- */
-
-#define addch(ch)		waddch(stdscr,ch)
-#define addchnstr(str,n)	waddchnstr(stdscr,str,n)
-#define addchstr(str)		waddchstr(stdscr,str)
-#define addnstr(str,n)		waddnstr(stdscr,str,n)
-#define addstr(str)		waddnstr(stdscr,str,-1)
-#define attroff(at)		wattroff(stdscr,at)
-#define attron(at)		wattron(stdscr,at)
-#define attrset(at)		wattrset(stdscr,at)
-#define attr_get(ap,cp,o)	wattr_get(stdscr,ap,cp,o)
-#define attr_off(a,o)		wattr_off(stdscr,a,o)
-#define attr_on(a,o)		wattr_on(stdscr,a,o)
-#define attr_set(a,c,o)		wattr_set(stdscr,a,c,o)
-#define bkgd(ch)		wbkgd(stdscr,ch)
-#define bkgdset(ch)		wbkgdset(stdscr,ch)
-#define chgat(n,a,c,o)		wchgat(stdscr,n,a,c,o)
-#define clear()			wclear(stdscr)
-#define clrtobot()		wclrtobot(stdscr)
-#define clrtoeol()		wclrtoeol(stdscr)
-#define color_set(c,o)		wcolor_set(stdscr,c,o)
-#define delch()			wdelch(stdscr)
-#define deleteln()		winsdelln(stdscr,-1)
-#define echochar(c)		wechochar(stdscr,c)
-#define erase()			werase(stdscr)
-#define getch()			wgetch(stdscr)
-#define getstr(str)		wgetstr(stdscr,str)
-#define inch()			winch(stdscr)
-#define inchnstr(s,n)		winchnstr(stdscr,s,n)
-#define inchstr(s)		winchstr(stdscr,s)
-#define innstr(s,n)		winnstr(stdscr,s,n)
-#define insch(c)		winsch(stdscr,c)
-#define insdelln(n)		winsdelln(stdscr,n)
-#define insertln()		winsdelln(stdscr,1)
-#define insnstr(s,n)		winsnstr(stdscr,s,n)
-#define insstr(s)		winsstr(stdscr,s)
-#define instr(s)		winstr(stdscr,s)
-#define move(y,x)		wmove(stdscr,y,x)
-#define refresh()		wrefresh(stdscr)
-#define scrl(n)			wscrl(stdscr,n)
-#define setscrreg(t,b)		wsetscrreg(stdscr,t,b)
-#define standend()		wstandend(stdscr)
-#define standout()		wstandout(stdscr)
-#define timeout(delay)		wtimeout(stdscr,delay)
-#define wdeleteln(win)		winsdelln(win,-1)
-#define winsertln(win)		winsdelln(win,1)
-
-/*
- * mv functions
- */
-
-#define mvwaddch(win,y,x,ch)		(wmove(win,y,x) == ERR ? ERR : waddch(win,ch))
-#define mvwaddchnstr(win,y,x,str,n)	(wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,n))
-#define mvwaddchstr(win,y,x,str)	(wmove(win,y,x) == ERR ? ERR : waddchnstr(win,str,-1))
-#define mvwaddnstr(win,y,x,str,n)	(wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,n))
-#define mvwaddstr(win,y,x,str)		(wmove(win,y,x) == ERR ? ERR : waddnstr(win,str,-1))
-#define mvwdelch(win,y,x)		(wmove(win,y,x) == ERR ? ERR : wdelch(win))
-#define mvwchgat(win,y,x,n,a,c,o)	(wmove(win,y,x) == ERR ? ERR : wchgat(win,n,a,c,o))
-#define mvwgetch(win,y,x)		(wmove(win,y,x) == ERR ? ERR : wgetch(win))
-#define mvwgetnstr(win,y,x,str,n)	(wmove(win,y,x) == ERR ? ERR : wgetnstr(win,str,n))
-#define mvwgetstr(win,y,x,str)		(wmove(win,y,x) == ERR ? ERR : wgetstr(win,str))
-#define mvwhline(win,y,x,c,n)		(wmove(win,y,x) == ERR ? ERR : whline(win,c,n))
-#define mvwinch(win,y,x)		(wmove(win,y,x) == ERR ? NCURSES_CAST(chtype, ERR) : winch(win))
-#define mvwinchnstr(win,y,x,s,n)	(wmove(win,y,x) == ERR ? ERR : winchnstr(win,s,n))
-#define mvwinchstr(win,y,x,s)		(wmove(win,y,x) == ERR ? ERR : winchstr(win,s))
-#define mvwinnstr(win,y,x,s,n)		(wmove(win,y,x) == ERR ? ERR : winnstr(win,s,n))
-#define mvwinsch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : winsch(win,c))
-#define mvwinsnstr(win,y,x,s,n)		(wmove(win,y,x) == ERR ? ERR : winsnstr(win,s,n))
-#define mvwinsstr(win,y,x,s)		(wmove(win,y,x) == ERR ? ERR : winsstr(win,s))
-#define mvwinstr(win,y,x,s)		(wmove(win,y,x) == ERR ? ERR : winstr(win,s))
-#define mvwvline(win,y,x,c,n)		(wmove(win,y,x) == ERR ? ERR : wvline(win,c,n))
-
-#define mvaddch(y,x,ch)			mvwaddch(stdscr,y,x,ch)
-#define mvaddchnstr(y,x,str,n)		mvwaddchnstr(stdscr,y,x,str,n)
-#define mvaddchstr(y,x,str)		mvwaddchstr(stdscr,y,x,str)
-#define mvaddnstr(y,x,str,n)		mvwaddnstr(stdscr,y,x,str,n)
-#define mvaddstr(y,x,str)		mvwaddstr(stdscr,y,x,str)
-#define mvchgat(y,x,n,a,c,o)		mvwchgat(stdscr,y,x,n,a,c,o)
-#define mvdelch(y,x)			mvwdelch(stdscr,y,x)
-#define mvgetch(y,x)			mvwgetch(stdscr,y,x)
-#define mvgetnstr(y,x,str,n)		mvwgetnstr(stdscr,y,x,str,n)
-#define mvgetstr(y,x,str)		mvwgetstr(stdscr,y,x,str)
-#define mvhline(y,x,c,n)		mvwhline(stdscr,y,x,c,n)
-#define mvinch(y,x)			mvwinch(stdscr,y,x)
-#define mvinchnstr(y,x,s,n)		mvwinchnstr(stdscr,y,x,s,n)
-#define mvinchstr(y,x,s)		mvwinchstr(stdscr,y,x,s)
-#define mvinnstr(y,x,s,n)		mvwinnstr(stdscr,y,x,s,n)
-#define mvinsch(y,x,c)			mvwinsch(stdscr,y,x,c)
-#define mvinsnstr(y,x,s,n)		mvwinsnstr(stdscr,y,x,s,n)
-#define mvinsstr(y,x,s)			mvwinsstr(stdscr,y,x,s)
-#define mvinstr(y,x,s)			mvwinstr(stdscr,y,x,s)
-#define mvvline(y,x,c,n)		mvwvline(stdscr,y,x,c,n)
-
-/*
- * Some wide-character functions can be implemented without the extensions.
- */
-#if !NCURSES_OPAQUE
-#define getbkgd(win)                    ((win)->_bkgd)
-#endif /* NCURSES_OPAQUE */
-
-#define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
-#define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
-
-#if !NCURSES_OPAQUE
-#if defined(_XOPEN_SOURCE_EXTENDED) && 0
-#define wattr_set(win,a,p,opts)		((win)->_attrs = ((a) & ~A_COLOR), \
-					 (win)->_color = (p), \
-					 OK)
-#define wattr_get(win,a,p,opts)		((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
-					 (void)((p) != (void *)0 && (*(p) = (win)->_color)), \
-					 OK)
-#else
-#define wattr_set(win,a,p,opts)		((win)->_attrs = (((a) & ~A_COLOR) | COLOR_PAIR(p)), OK)
-#define wattr_get(win,a,p,opts)		((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
-					 (void)((p) != (void *)0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \
-					 OK)
-#endif
-#endif /* NCURSES_OPAQUE */
-
-/*
- * X/Open curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
- * varargs.h.  It adds new calls vw_printw/vw_scanw, which are supposed to
- * use POSIX stdarg.h.  The ncurses versions of vwprintw/vwscanw already
- * use stdarg.h, so...
- */
-#define vw_printw		vwprintw
-#define vw_scanw		vwscanw
-
-/*
- * Export fallback function for use in C++ binding.
- */
-#if !1
-#define vsscanf(a,b,c) _nc_vsscanf(a,b,c)
-NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
-#endif
-
-/*
- * These macros are extensions - not in X/Open Curses.
- */
-#if 1
-#if !NCURSES_OPAQUE
-#define is_cleared(win)		((win)->_clear)
-#define is_idcok(win)		((win)->_idcok)
-#define is_idlok(win)		((win)->_idlok)
-#define is_immedok(win)		((win)->_immed)
-#define is_keypad(win)		((win)->_use_keypad)
-#define is_leaveok(win)		((win)->_leaveok)
-#define is_nodelay(win)		((win)->_delay == 0)
-#define is_notimeout(win)	((win)->_notimeout)
-#define is_scrollok(win)	((win)->_scroll)
-#define is_syncok(win)		((win)->_sync)
-#define wgetparent(win)		((win) ? (win)->_parent : 0)
-#define wgetscrreg(win,t,b)	((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
-#endif
-#endif
-
-#endif /* NCURSES_NOMACROS */
-
-/*
- * Public variables.
- *
- * Notes:
- *	a. ESCDELAY was an undocumented feature under AIX curses.
- *	   It gives the ESC expire time in milliseconds.
- *	b. ttytype is needed for backward compatibility
- */
-#if 0
-
-NCURSES_WRAPPED_VAR(WINDOW *, curscr);
-NCURSES_WRAPPED_VAR(WINDOW *, newscr);
-NCURSES_WRAPPED_VAR(WINDOW *, stdscr);
-NCURSES_WRAPPED_VAR(char *, ttytype);
-NCURSES_WRAPPED_VAR(int, COLORS);
-NCURSES_WRAPPED_VAR(int, COLOR_PAIRS);
-NCURSES_WRAPPED_VAR(int, COLS);
-NCURSES_WRAPPED_VAR(int, ESCDELAY);
-NCURSES_WRAPPED_VAR(int, LINES);
-NCURSES_WRAPPED_VAR(int, TABSIZE);
-
-#define curscr      NCURSES_PUBLIC_VAR(curscr())
-#define newscr      NCURSES_PUBLIC_VAR(newscr())
-#define stdscr      NCURSES_PUBLIC_VAR(stdscr())
-#define ttytype     NCURSES_PUBLIC_VAR(ttytype())
-#define COLORS      NCURSES_PUBLIC_VAR(COLORS())
-#define COLOR_PAIRS NCURSES_PUBLIC_VAR(COLOR_PAIRS())
-#define COLS        NCURSES_PUBLIC_VAR(COLS())
-#define ESCDELAY    NCURSES_PUBLIC_VAR(ESCDELAY())
-#define LINES       NCURSES_PUBLIC_VAR(LINES())
-#define TABSIZE     NCURSES_PUBLIC_VAR(TABSIZE())
-
-#else
-
-extern NCURSES_EXPORT_VAR(WINDOW *) curscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) newscr;
-extern NCURSES_EXPORT_VAR(WINDOW *) stdscr;
-extern NCURSES_EXPORT_VAR(char) ttytype[];
-extern NCURSES_EXPORT_VAR(int) COLORS;
-extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
-extern NCURSES_EXPORT_VAR(int) COLS;
-extern NCURSES_EXPORT_VAR(int) ESCDELAY;
-extern NCURSES_EXPORT_VAR(int) LINES;
-extern NCURSES_EXPORT_VAR(int) TABSIZE;
-
-#endif
-
-/*
- * Pseudo-character tokens outside ASCII range.  The curses wgetch() function
- * will return any given one of these only if the corresponding k- capability
- * is defined in your terminal's terminfo entry.
- *
- * Some keys (KEY_A1, etc) are arranged like this:
- *	a1     up    a3
- *	left   b2    right
- *	c1     down  c3
- *
- * A few key codes do not depend upon the terminfo entry.
- */
-#define KEY_CODE_YES	0400		/* A wchar_t contains a key code */
-#define KEY_MIN		0401		/* Minimum curses key */
-#define KEY_BREAK	0401		/* Break key (unreliable) */
-#define KEY_SRESET	0530		/* Soft (partial) reset (unreliable) */
-#define KEY_RESET	0531		/* Reset or hard reset (unreliable) */
-/*
- * These definitions were generated by /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/MKkey_defs.sh /usr/src/lib/ncurses/ncursesw/../../../contrib/ncurses/include/Caps
- */
-#define KEY_DOWN	0402		/* down-arrow key */
-#define KEY_UP		0403		/* up-arrow key */
-#define KEY_LEFT	0404		/* left-arrow key */
-#define KEY_RIGHT	0405		/* right-arrow key */
-#define KEY_HOME	0406		/* home key */
-#define KEY_BACKSPACE	0407		/* backspace key */
-#define KEY_F0		0410		/* Function keys.  Space for 64 */
-#define KEY_F(n)	(KEY_F0+(n))	/* Value of function key n */
-#define KEY_DL		0510		/* delete-line key */
-#define KEY_IL		0511		/* insert-line key */
-#define KEY_DC		0512		/* delete-character key */
-#define KEY_IC		0513		/* insert-character key */
-#define KEY_EIC		0514		/* sent by rmir or smir in insert mode */
-#define KEY_CLEAR	0515		/* clear-screen or erase key */
-#define KEY_EOS		0516		/* clear-to-end-of-screen key */
-#define KEY_EOL		0517		/* clear-to-end-of-line key */
-#define KEY_SF		0520		/* scroll-forward key */
-#define KEY_SR		0521		/* scroll-backward key */
-#define KEY_NPAGE	0522		/* next-page key */
-#define KEY_PPAGE	0523		/* previous-page key */
-#define KEY_STAB	0524		/* set-tab key */
-#define KEY_CTAB	0525		/* clear-tab key */
-#define KEY_CATAB	0526		/* clear-all-tabs key */
-#define KEY_ENTER	0527		/* enter/send key */
-#define KEY_PRINT	0532		/* print key */
-#define KEY_LL		0533		/* lower-left key (home down) */
-#define KEY_A1		0534		/* upper left of keypad */
-#define KEY_A3		0535		/* upper right of keypad */
-#define KEY_B2		0536		/* center of keypad */
-#define KEY_C1		0537		/* lower left of keypad */
-#define KEY_C3		0540		/* lower right of keypad */
-#define KEY_BTAB	0541		/* back-tab key */
-#define KEY_BEG		0542		/* begin key */
-#define KEY_CANCEL	0543		/* cancel key */
-#define KEY_CLOSE	0544		/* close key */
-#define KEY_COMMAND	0545		/* command key */
-#define KEY_COPY	0546		/* copy key */
-#define KEY_CREATE	0547		/* create key */
-#define KEY_END		0550		/* end key */
-#define KEY_EXIT	0551		/* exit key */
-#define KEY_FIND	0552		/* find key */
-#define KEY_HELP	0553		/* help key */
-#define KEY_MARK	0554		/* mark key */
-#define KEY_MESSAGE	0555		/* message key */
-#define KEY_MOVE	0556		/* move key */
-#define KEY_NEXT	0557		/* next key */
-#define KEY_OPEN	0560		/* open key */
-#define KEY_OPTIONS	0561		/* options key */
-#define KEY_PREVIOUS	0562		/* previous key */
-#define KEY_REDO	0563		/* redo key */
-#define KEY_REFERENCE	0564		/* reference key */
-#define KEY_REFRESH	0565		/* refresh key */
-#define KEY_REPLACE	0566		/* replace key */
-#define KEY_RESTART	0567		/* restart key */
-#define KEY_RESUME	0570		/* resume key */
-#define KEY_SAVE	0571		/* save key */
-#define KEY_SBEG	0572		/* shifted begin key */
-#define KEY_SCANCEL	0573		/* shifted cancel key */
-#define KEY_SCOMMAND	0574		/* shifted command key */
-#define KEY_SCOPY	0575		/* shifted copy key */
-#define KEY_SCREATE	0576		/* shifted create key */
-#define KEY_SDC		0577		/* shifted delete-character key */
-#define KEY_SDL		0600		/* shifted delete-line key */
-#define KEY_SELECT	0601		/* select key */
-#define KEY_SEND	0602		/* shifted end key */
-#define KEY_SEOL	0603		/* shifted clear-to-end-of-line key */
-#define KEY_SEXIT	0604		/* shifted exit key */
-#define KEY_SFIND	0605		/* shifted find key */
-#define KEY_SHELP	0606		/* shifted help key */
-#define KEY_SHOME	0607		/* shifted home key */
-#define KEY_SIC		0610		/* shifted insert-character key */
-#define KEY_SLEFT	0611		/* shifted left-arrow key */
-#define KEY_SMESSAGE	0612		/* shifted message key */
-#define KEY_SMOVE	0613		/* shifted move key */
-#define KEY_SNEXT	0614		/* shifted next key */
-#define KEY_SOPTIONS	0615		/* shifted options key */
-#define KEY_SPREVIOUS	0616		/* shifted previous key */
-#define KEY_SPRINT	0617		/* shifted print key */
-#define KEY_SREDO	0620		/* shifted redo key */
-#define KEY_SREPLACE	0621		/* shifted replace key */
-#define KEY_SRIGHT	0622		/* shifted right-arrow key */
-#define KEY_SRSUME	0623		/* shifted resume key */
-#define KEY_SSAVE	0624		/* shifted save key */
-#define KEY_SSUSPEND	0625		/* shifted suspend key */
-#define KEY_SUNDO	0626		/* shifted undo key */
-#define KEY_SUSPEND	0627		/* suspend key */
-#define KEY_UNDO	0630		/* undo key */
-#define KEY_MOUSE	0631		/* Mouse event has occurred */
-#define KEY_RESIZE	0632		/* Terminal resize event */
-#define KEY_EVENT	0633		/* We were interrupted by an event */
-
-#define KEY_MAX		0777		/* Maximum key value is 0633 */
-/* $Id: ncurses.h 103 2016-01-12 05:32:24Z reddawg $ */
-/*
- * vile:cmode:
- * This file is part of ncurses, designed to be appended after curses.h.in
- * (see that file for the relevant copyright).
- */
-#ifdef _XOPEN_SOURCE_EXTENDED
-
-extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
-
-#define NCURSES_WACS(c)	(&_nc_wacs[(unsigned char)c])
-
-#define WACS_BSSB	NCURSES_WACS('l')
-#define WACS_SSBB	NCURSES_WACS('m')
-#define WACS_BBSS	NCURSES_WACS('k')
-#define WACS_SBBS	NCURSES_WACS('j')
-#define WACS_SBSS	NCURSES_WACS('u')
-#define WACS_SSSB	NCURSES_WACS('t')
-#define WACS_SSBS	NCURSES_WACS('v')
-#define WACS_BSSS	NCURSES_WACS('w')
-#define WACS_BSBS	NCURSES_WACS('q')
-#define WACS_SBSB	NCURSES_WACS('x')
-#define WACS_SSSS	NCURSES_WACS('n')
-
-#define WACS_ULCORNER	WACS_BSSB
-#define WACS_LLCORNER	WACS_SSBB
-#define WACS_URCORNER	WACS_BBSS
-#define WACS_LRCORNER	WACS_SBBS
-#define WACS_RTEE	WACS_SBSS
-#define WACS_LTEE	WACS_SSSB
-#define WACS_BTEE	WACS_SSBS
-#define WACS_TTEE	WACS_BSSS
-#define WACS_HLINE	WACS_BSBS
-#define WACS_VLINE	WACS_SBSB
-#define WACS_PLUS	WACS_SSSS
-
-#define WACS_S1		NCURSES_WACS('o') /* scan line 1 */
-#define WACS_S9 	NCURSES_WACS('s') /* scan line 9 */
-#define WACS_DIAMOND	NCURSES_WACS('`') /* diamond */
-#define WACS_CKBOARD	NCURSES_WACS('a') /* checker board */
-#define WACS_DEGREE	NCURSES_WACS('f') /* degree symbol */
-#define WACS_PLMINUS	NCURSES_WACS('g') /* plus/minus */
-#define WACS_BULLET	NCURSES_WACS('~') /* bullet */
-
-	/* Teletype 5410v1 symbols */
-#define WACS_LARROW	NCURSES_WACS(',') /* arrow left */
-#define WACS_RARROW	NCURSES_WACS('+') /* arrow right */
-#define WACS_DARROW	NCURSES_WACS('.') /* arrow down */
-#define WACS_UARROW	NCURSES_WACS('-') /* arrow up */
-#define WACS_BOARD	NCURSES_WACS('h') /* board of squares */
-#define WACS_LANTERN	NCURSES_WACS('i') /* lantern symbol */
-#define WACS_BLOCK	NCURSES_WACS('0') /* solid square block */
-
-	/* ncurses extensions */
-#define WACS_S3		NCURSES_WACS('p') /* scan line 3 */
-#define WACS_S7		NCURSES_WACS('r') /* scan line 7 */
-#define WACS_LEQUAL	NCURSES_WACS('y') /* less/equal */
-#define WACS_GEQUAL	NCURSES_WACS('z') /* greater/equal */
-#define WACS_PI		NCURSES_WACS('{') /* Pi */
-#define WACS_NEQUAL	NCURSES_WACS('|') /* not equal */
-#define WACS_STERLING	NCURSES_WACS('}') /* UK pound sign */
-
-/*
- * Function prototypes for wide-character operations.
- *
- * "generated" comments should include ":WIDEC" to make the corresponding
- * functions ifdef'd in lib_gen.c
- *
- * "implemented" comments do not need this marker.
- */
-
-extern NCURSES_EXPORT(int) add_wch (const cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) add_wchnstr (const cchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) add_wchstr (const cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) addnwstr (const wchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) addwstr (const wchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) bkgrnd (const cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(void) bkgrndset (const cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) border_set (const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) box_set (WINDOW *, const cchar_t *, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) echo_wchar (const cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) erasewchar (wchar_t*);			/* implemented */
-extern NCURSES_EXPORT(int) get_wch (wint_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(int) get_wstr (wint_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(int) getbkgrnd (cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) getcchar (const cchar_t *, wchar_t*, attr_t*, short*, void*);	/* implemented */
-extern NCURSES_EXPORT(int) getn_wstr (wint_t *, int);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) hline_set (const cchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) in_wch (cchar_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(int) in_wchnstr (cchar_t *, int);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) in_wchstr (cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) innwstr (wchar_t *, int);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) ins_nwstr (const wchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) ins_wch (const cchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) ins_wstr (const wchar_t *);			/* generated:WIDEC */
-extern NCURSES_EXPORT(int) inwstr (wchar_t *);				/* generated:WIDEC */
-extern NCURSES_EXPORT(NCURSES_CONST char*) key_name (wchar_t);		/* implemented */
-extern NCURSES_EXPORT(int) killwchar (wchar_t *);			/* implemented */
-extern NCURSES_EXPORT(int) mvadd_wch (int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvadd_wchnstr (int, int, const cchar_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvadd_wchstr (int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvaddnwstr (int, int, const wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvaddwstr (int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvget_wch (int, int, wint_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvget_wstr (int, int, wint_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvgetn_wstr (int, int, wint_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvhline_set (int, int, const cchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvin_wch (int, int, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvin_wchnstr (int, int, cchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvin_wchstr (int, int, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvinnwstr (int, int, wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvins_nwstr (int, int, const wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvins_wch (int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvins_wstr (int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvinwstr (int, int, wchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvvline_set (int, int, const cchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwadd_wch (WINDOW *, int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwadd_wchnstr (WINDOW *, int, int, const cchar_t *, int); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwadd_wchstr (WINDOW *, int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwaddnwstr (WINDOW *, int, int, const wchar_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwaddwstr (WINDOW *, int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwget_wch (WINDOW *, int, int, wint_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwget_wstr (WINDOW *, int, int, wint_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwgetn_wstr (WINDOW *, int, int, wint_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwhline_set (WINDOW *, int, int, const cchar_t *, int);/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwin_wch (WINDOW *, int, int, cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwin_wchnstr (WINDOW *, int,int, cchar_t *,int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwin_wchstr (WINDOW *, int, int, cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwinnwstr (WINDOW *, int, int, wchar_t *, int);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwins_nwstr (WINDOW *, int,int, const wchar_t *,int); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwins_wch (WINDOW *, int, int, const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwins_wstr (WINDOW *, int, int, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwinwstr (WINDOW *, int, int, wchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) mvwvline_set (WINDOW *, int,int, const cchar_t *,int); /* generated:WIDEC */
-extern NCURSES_EXPORT(int) pecho_wchar (WINDOW *, const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) setcchar (cchar_t *, const wchar_t *, const attr_t, short, const void *);	/* implemented */
-extern NCURSES_EXPORT(int) slk_wset (int, const wchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(attr_t) term_attrs (void);			/* implemented */
-extern NCURSES_EXPORT(int) unget_wch (const wchar_t);			/* implemented */
-extern NCURSES_EXPORT(int) vid_attr (attr_t, short, void *);		/* implemented */
-extern NCURSES_EXPORT(int) vid_puts (attr_t, short, void *, int (*)(int)); /* implemented */
-extern NCURSES_EXPORT(int) vline_set (const cchar_t *, int);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wadd_wch (WINDOW *,const cchar_t *);		/* implemented */
-extern NCURSES_EXPORT(int) wadd_wchnstr (WINDOW *,const cchar_t *,int);	/* implemented */
-extern NCURSES_EXPORT(int) wadd_wchstr (WINDOW *,const cchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) waddnwstr (WINDOW *,const wchar_t *,int);	/* implemented */
-extern NCURSES_EXPORT(int) waddwstr (WINDOW *,const wchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wbkgrnd (WINDOW *,const cchar_t *);		/* implemented */
-extern NCURSES_EXPORT(void) wbkgrndset (WINDOW *,const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) wborder_set (WINDOW *,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*,const cchar_t*);	/* implemented */
-extern NCURSES_EXPORT(int) wecho_wchar (WINDOW *, const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) wget_wch (WINDOW *, wint_t *);		/* implemented */
-extern NCURSES_EXPORT(int) wget_wstr (WINDOW *, wint_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wgetbkgrnd (WINDOW *, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) wgetn_wstr (WINDOW *,wint_t *, int);		/* implemented */
-extern NCURSES_EXPORT(int) whline_set (WINDOW *, const cchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(int) win_wch (WINDOW *, cchar_t *);		/* implemented */
-extern NCURSES_EXPORT(int) win_wchnstr (WINDOW *, cchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(int) win_wchstr (WINDOW *, cchar_t *);		/* generated:WIDEC */
-extern NCURSES_EXPORT(int) winnwstr (WINDOW *, wchar_t *, int);		/* implemented */
-extern NCURSES_EXPORT(int) wins_nwstr (WINDOW *, const wchar_t *, int);	/* implemented */
-extern NCURSES_EXPORT(int) wins_wch (WINDOW *, const cchar_t *);	/* implemented */
-extern NCURSES_EXPORT(int) wins_wstr (WINDOW *, const wchar_t *);	/* generated:WIDEC */
-extern NCURSES_EXPORT(int) winwstr (WINDOW *, wchar_t *);		/* implemented */
-extern NCURSES_EXPORT(wchar_t*) wunctrl (cchar_t *);			/* implemented */
-extern NCURSES_EXPORT(int) wvline_set (WINDOW *, const cchar_t *, int);	/* implemented */
-
-#ifndef NCURSES_NOMACROS
-
-/*
- * XSI curses macros for XPG4 conformance.
- */
-#define add_wch(c)			wadd_wch(stdscr,c)
-#define add_wchnstr(str,n)		wadd_wchnstr(stdscr,str,n)
-#define add_wchstr(str)			wadd_wchstr(stdscr,str)
-#define addnwstr(wstr,n)		waddnwstr(stdscr,wstr,n)
-#define addwstr(wstr)			waddwstr(stdscr,wstr)
-#define bkgrnd(c)			wbkgrnd(stdscr,c)
-#define bkgrndset(c)			wbkgrndset(stdscr,c)
-#define border_set(l,r,t,b,tl,tr,bl,br) wborder_set(stdscr,l,r,t,b,tl,tr,bl,br)
-#define box_set(w,v,h)			wborder_set(w,v,v,h,h,0,0,0,0)
-#define echo_wchar(c)			wecho_wchar(stdscr,c)
-#define get_wch(c)			wget_wch(stdscr,c)
-#define get_wstr(t)			wget_wstr(stdscr,t)
-#define getbkgrnd(wch)			wgetbkgrnd(stdscr,wch)
-#define getn_wstr(t,n)			wgetn_wstr(stdscr,t,n)
-#define hline_set(c,n)			whline_set(stdscr,c,n)
-#define in_wch(c)			win_wch(stdscr,c)
-#define in_wchnstr(c,n)			win_wchnstr(stdscr,c,n)
-#define in_wchstr(c)			win_wchstr(stdscr,c)
-#define innwstr(c,n)			winnwstr(stdscr,c,n)
-#define ins_nwstr(t,n)			wins_nwstr(stdscr,t,n)
-#define ins_wch(c)			wins_wch(stdscr,c)
-#define ins_wstr(t)			wins_wstr(stdscr,t)
-#define inwstr(c)			winwstr(stdscr,c)
-#define vline_set(c,n)			wvline_set(stdscr,c,n)
-#define wadd_wchstr(win,str)		wadd_wchnstr(win,str,-1)
-#define waddwstr(win,wstr)		waddnwstr(win,wstr,-1)
-#define wget_wstr(w,t)			wgetn_wstr(w,t,-1)
-#define win_wchstr(w,c)			win_wchnstr(w,c,-1)
-#define wins_wstr(w,t)			wins_nwstr(w,t,-1)
-
-#if !NCURSES_OPAQUE
-#define wgetbkgrnd(win,wch)		(*wch = win->_bkgrnd, OK)
-#endif
-
-#define mvadd_wch(y,x,c)		mvwadd_wch(stdscr,y,x,c)
-#define mvadd_wchnstr(y,x,s,n)		mvwadd_wchnstr(stdscr,y,x,s,n)
-#define mvadd_wchstr(y,x,s)		mvwadd_wchstr(stdscr,y,x,s)
-#define mvaddnwstr(y,x,wstr,n)		mvwaddnwstr(stdscr,y,x,wstr,n)
-#define mvaddwstr(y,x,wstr)		mvwaddwstr(stdscr,y,x,wstr)
-#define mvget_wch(y,x,c)		mvwget_wch(stdscr,y,x,c)
-#define mvget_wstr(y,x,t)		mvwget_wstr(stdscr,y,x,t)
-#define mvgetn_wstr(y,x,t,n)		mvwgetn_wstr(stdscr,y,x,t,n)
-#define mvhline_set(y,x,c,n)		mvwhline_set(stdscr,y,x,c,n)
-#define mvin_wch(y,x,c)			mvwin_wch(stdscr,y,x,c)
-#define mvin_wchnstr(y,x,c,n)		mvwin_wchnstr(stdscr,y,x,c,n)
-#define mvin_wchstr(y,x,c)		mvwin_wchstr(stdscr,y,x,c)
-#define mvinnwstr(y,x,c,n)		mvwinnwstr(stdscr,y,x,c,n)
-#define mvins_nwstr(y,x,t,n)		mvwins_nwstr(stdscr,y,x,t,n)
-#define mvins_wch(y,x,c)		mvwins_wch(stdscr,y,x,c)
-#define mvins_wstr(y,x,t)		mvwins_wstr(stdscr,y,x,t)
-#define mvinwstr(y,x,c)			mvwinwstr(stdscr,y,x,c)
-#define mvvline_set(y,x,c,n)		mvwvline_set(stdscr,y,x,c,n)
-
-#define mvwadd_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wadd_wch(win,c))
-#define mvwadd_wchnstr(win,y,x,s,n)	(wmove(win,y,x) == ERR ? ERR : wadd_wchnstr(win,s,n))
-#define mvwadd_wchstr(win,y,x,s)	(wmove(win,y,x) == ERR ? ERR : wadd_wchstr(win,s))
-#define mvwaddnwstr(win,y,x,wstr,n)	(wmove(win,y,x) == ERR ? ERR : waddnwstr(win,wstr,n))
-#define mvwaddwstr(win,y,x,wstr)	(wmove(win,y,x) == ERR ? ERR : waddwstr(win,wstr))
-#define mvwget_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wget_wch(win,c))
-#define mvwget_wstr(win,y,x,t)		(wmove(win,y,x) == ERR ? ERR : wget_wstr(win,t))
-#define mvwgetn_wstr(win,y,x,t,n)	(wmove(win,y,x) == ERR ? ERR : wgetn_wstr(win,t,n))
-#define mvwhline_set(win,y,x,c,n)	(wmove(win,y,x) == ERR ? ERR : whline_set(win,c,n))
-#define mvwin_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : win_wch(win,c))
-#define mvwin_wchnstr(win,y,x,c,n)	(wmove(win,y,x) == ERR ? ERR : win_wchnstr(win,c,n))
-#define mvwin_wchstr(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : win_wchstr(win,c))
-#define mvwinnwstr(win,y,x,c,n)		(wmove(win,y,x) == ERR ? ERR : winnwstr(win,c,n))
-#define mvwins_nwstr(win,y,x,t,n)	(wmove(win,y,x) == ERR ? ERR : wins_nwstr(win,t,n))
-#define mvwins_wch(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : wins_wch(win,c))
-#define mvwins_wstr(win,y,x,t)		(wmove(win,y,x) == ERR ? ERR : wins_wstr(win,t))
-#define mvwinwstr(win,y,x,c)		(wmove(win,y,x) == ERR ? ERR : winwstr(win,c))
-#define mvwvline_set(win,y,x,c,n)	(wmove(win,y,x) == ERR ? ERR : wvline_set(win,c,n))
-
-#endif /* NCURSES_NOMACROS */
-
-#if defined(TRACE) || defined(NCURSES_TEST)
-extern NCURSES_EXPORT(const char *) _nc_viswbuf(const wchar_t *);
-extern NCURSES_EXPORT(const char *) _nc_viswibuf(const wint_t *);
-#endif
-
-#endif /* _XOPEN_SOURCE_EXTENDED */
-/* $Id: ncurses.h 103 2016-01-12 05:32:24Z reddawg $ */
-/*
- * vile:cmode:
- * This file is part of ncurses, designed to be appended after curses.h.in
- * (see that file for the relevant copyright).
- */
-
-/* mouse interface */
-
-#if NCURSES_MOUSE_VERSION > 1
-#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 5))
-#else
-#define NCURSES_MOUSE_MASK(b,m) ((m) << (((b) - 1) * 6))
-#endif
-
-#define	NCURSES_BUTTON_RELEASED	001L
-#define	NCURSES_BUTTON_PRESSED	002L
-#define	NCURSES_BUTTON_CLICKED	004L
-#define	NCURSES_DOUBLE_CLICKED	010L
-#define	NCURSES_TRIPLE_CLICKED	020L
-#define	NCURSES_RESERVED_EVENT	040L
-
-/* event masks */
-#define	BUTTON1_RELEASED	NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_RELEASED)
-#define	BUTTON1_PRESSED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_PRESSED)
-#define	BUTTON1_CLICKED		NCURSES_MOUSE_MASK(1, NCURSES_BUTTON_CLICKED)
-#define	BUTTON1_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON1_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(1, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON2_RELEASED	NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_RELEASED)
-#define	BUTTON2_PRESSED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_PRESSED)
-#define	BUTTON2_CLICKED		NCURSES_MOUSE_MASK(2, NCURSES_BUTTON_CLICKED)
-#define	BUTTON2_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON2_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(2, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON3_RELEASED	NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_RELEASED)
-#define	BUTTON3_PRESSED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_PRESSED)
-#define	BUTTON3_CLICKED		NCURSES_MOUSE_MASK(3, NCURSES_BUTTON_CLICKED)
-#define	BUTTON3_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON3_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(3, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON4_RELEASED	NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_RELEASED)
-#define	BUTTON4_PRESSED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_PRESSED)
-#define	BUTTON4_CLICKED		NCURSES_MOUSE_MASK(4, NCURSES_BUTTON_CLICKED)
-#define	BUTTON4_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON4_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(4, NCURSES_TRIPLE_CLICKED)
-
-/*
- * In 32 bits the version-1 scheme does not provide enough space for a 5th
- * button, unless we choose to change the ABI by omitting the reserved-events.
- */
-#if NCURSES_MOUSE_VERSION > 1
-
-#define	BUTTON5_RELEASED	NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_RELEASED)
-#define	BUTTON5_PRESSED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_PRESSED)
-#define	BUTTON5_CLICKED		NCURSES_MOUSE_MASK(5, NCURSES_BUTTON_CLICKED)
-#define	BUTTON5_DOUBLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_DOUBLE_CLICKED)
-#define	BUTTON5_TRIPLE_CLICKED	NCURSES_MOUSE_MASK(5, NCURSES_TRIPLE_CLICKED)
-
-#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(6, 0001L)
-#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(6, 0002L)
-#define	BUTTON_ALT		NCURSES_MOUSE_MASK(6, 0004L)
-#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(6, 0010L)
-
-#else
-
-#define	BUTTON1_RESERVED_EVENT	NCURSES_MOUSE_MASK(1, NCURSES_RESERVED_EVENT)
-#define	BUTTON2_RESERVED_EVENT	NCURSES_MOUSE_MASK(2, NCURSES_RESERVED_EVENT)
-#define	BUTTON3_RESERVED_EVENT	NCURSES_MOUSE_MASK(3, NCURSES_RESERVED_EVENT)
-#define	BUTTON4_RESERVED_EVENT	NCURSES_MOUSE_MASK(4, NCURSES_RESERVED_EVENT)
-
-#define	BUTTON_CTRL		NCURSES_MOUSE_MASK(5, 0001L)
-#define	BUTTON_SHIFT		NCURSES_MOUSE_MASK(5, 0002L)
-#define	BUTTON_ALT		NCURSES_MOUSE_MASK(5, 0004L)
-#define	REPORT_MOUSE_POSITION	NCURSES_MOUSE_MASK(5, 0010L)
-
-#endif
-
-#define	ALL_MOUSE_EVENTS	(REPORT_MOUSE_POSITION - 1)
-
-/* macros to extract single event-bits from masks */
-#define	BUTTON_RELEASE(e, x)		((e) & NCURSES_MOUSE_MASK(x, 001))
-#define	BUTTON_PRESS(e, x)		((e) & NCURSES_MOUSE_MASK(x, 002))
-#define	BUTTON_CLICK(e, x)		((e) & NCURSES_MOUSE_MASK(x, 004))
-#define	BUTTON_DOUBLE_CLICK(e, x)	((e) & NCURSES_MOUSE_MASK(x, 010))
-#define	BUTTON_TRIPLE_CLICK(e, x)	((e) & NCURSES_MOUSE_MASK(x, 020))
-#define	BUTTON_RESERVED_EVENT(e, x)	((e) & NCURSES_MOUSE_MASK(x, 040))
-
-typedef struct
-{
-    short id;		/* ID to distinguish multiple devices */
-    int x, y, z;	/* event coordinates (character-cell) */
-    mmask_t bstate;	/* button state bits */
-}
-MEVENT;
-
-extern NCURSES_EXPORT(int) getmouse (MEVENT *);
-extern NCURSES_EXPORT(int) ungetmouse (MEVENT *);
-extern NCURSES_EXPORT(mmask_t) mousemask (mmask_t, mmask_t *);
-extern NCURSES_EXPORT(bool) wenclose (const WINDOW *, int, int);
-extern NCURSES_EXPORT(int) mouseinterval (int);
-extern NCURSES_EXPORT(bool) wmouse_trafo (const WINDOW*, int*, int*, bool);
-extern NCURSES_EXPORT(bool) mouse_trafo (int*, int*, bool);              /* generated */
-
-#define mouse_trafo(y,x,to_screen) wmouse_trafo(stdscr,y,x,to_screen)
-
-/* other non-XSI functions */
-
-extern NCURSES_EXPORT(int) mcprint (char *, int);	/* direct data to printer */
-extern NCURSES_EXPORT(int) has_key (int);		/* do we have given key? */
-
-/* Debugging : use with libncurses_g.a */
-
-extern NCURSES_EXPORT(void) _tracef (const char *, ...) GCC_PRINTFLIKE(1,2);
-extern NCURSES_EXPORT(void) _tracedump (const char *, WINDOW *);
-extern NCURSES_EXPORT(char *) _traceattr (attr_t);
-extern NCURSES_EXPORT(char *) _traceattr2 (int, chtype);
-extern NCURSES_EXPORT(char *) _nc_tracebits (void);
-extern NCURSES_EXPORT(char *) _tracechar (int);
-extern NCURSES_EXPORT(char *) _tracechtype (chtype);
-extern NCURSES_EXPORT(char *) _tracechtype2 (int, chtype);
-#ifdef _XOPEN_SOURCE_EXTENDED
-#define _tracech_t		_tracecchar_t
-extern NCURSES_EXPORT(char *) _tracecchar_t (const cchar_t *);
-#define _tracech_t2		_tracecchar_t2
-extern NCURSES_EXPORT(char *) _tracecchar_t2 (int, const cchar_t *);
-#else
-#define _tracech_t		_tracechtype
-#define _tracech_t2		_tracechtype2
-#endif
-extern NCURSES_EXPORT(char *) _tracemouse (const MEVENT *);
-extern NCURSES_EXPORT(void) trace (const unsigned int);
-
-/* trace masks */
-#define TRACE_DISABLE	0x0000	/* turn off tracing */
-#define TRACE_TIMES	0x0001	/* trace user and system times of updates */
-#define TRACE_TPUTS	0x0002	/* trace tputs calls */
-#define TRACE_UPDATE	0x0004	/* trace update actions, old & new screens */
-#define TRACE_MOVE	0x0008	/* trace cursor moves and scrolls */
-#define TRACE_CHARPUT	0x0010	/* trace all character outputs */
-#define TRACE_ORDINARY	0x001F	/* trace all update actions */
-#define TRACE_CALLS	0x0020	/* trace all curses calls */
-#define TRACE_VIRTPUT	0x0040	/* trace virtual character puts */
-#define TRACE_IEVENT	0x0080	/* trace low-level input processing */
-#define TRACE_BITS	0x0100	/* trace state of TTY control bits */
-#define TRACE_ICALLS	0x0200	/* trace internal/nested calls */
-#define TRACE_CCALLS	0x0400	/* trace per-character calls */
-#define TRACE_DATABASE	0x0800	/* trace read/write of terminfo/termcap data */
-#define TRACE_ATTRS	0x1000	/* trace attribute updates */
-
-#define TRACE_SHIFT	13	/* number of bits in the trace masks */
-#define TRACE_MAXIMUM	((1 << TRACE_SHIFT) - 1) /* maximum trace level */
-
-#if defined(TRACE) || defined(NCURSES_TEST)
-extern NCURSES_EXPORT_VAR(int) _nc_optimize_enable;		/* enable optimizations */
-extern NCURSES_EXPORT(const char *) _nc_visbuf (const char *);
-#define OPTIMIZE_MVCUR		0x01	/* cursor movement optimization */
-#define OPTIMIZE_HASHMAP	0x02	/* diff hashing to detect scrolls */
-#define OPTIMIZE_SCROLL		0x04	/* scroll optimization */
-#define OPTIMIZE_ALL		0xff	/* enable all optimizations (dflt) */
-#endif
-
-#ifdef __cplusplus
-
-#ifndef NCURSES_NOMACROS
-
-/* these names conflict with STL */
-#undef box
-#undef clear
-#undef erase
-#undef move
-#undef refresh
-
-#endif /* NCURSES_NOMACROS */
-
-}
-#endif
-
-#endif /* __NCURSES_H */
diff --git a/include.new/ncurses_dll.h b/include.new/ncurses_dll.h
deleted file mode 100644
index ebc9d1a..0000000
--- a/include.new/ncurses_dll.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-/* $Id: ncurses_dll.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef NCURSES_DLL_H_incl
-#define NCURSES_DLL_H_incl 1
-
-/* no longer needed on cygwin or mingw, thanks to auto-import       */
-/* but this structure may be useful at some point for an MSVC build */
-/* so, for now unconditionally define the important flags           */
-/* "the right way" for proper static and dll+auto-import behavior   */
-#undef NCURSES_DLL
-#define NCURSES_STATIC
-
-#if defined(__CYGWIN__)
-#  if defined(NCURSES_DLL)
-#    if defined(NCURSES_STATIC)
-#      undef NCURSES_STATIC
-#    endif
-#  endif
-#  undef NCURSES_IMPEXP
-#  undef NCURSES_API
-#  undef NCURSES_EXPORT
-#  undef NCURSES_EXPORT_VAR
-#  if defined(NCURSES_DLL)
-/* building a DLL */
-#    define NCURSES_IMPEXP __declspec(dllexport)
-#  elif defined(NCURSES_STATIC)
-/* building or linking to a static library */
-#    define NCURSES_IMPEXP /* nothing */
-#  else
-/* linking to the DLL */
-#    define NCURSES_IMPEXP __declspec(dllimport)
-#  endif
-#  define NCURSES_API __cdecl
-#  define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API
-#  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
-#endif
-
-/* Take care of non-cygwin platforms */
-#if !defined(NCURSES_IMPEXP)
-#  define NCURSES_IMPEXP /* nothing */
-#endif
-#if !defined(NCURSES_API)
-#  define NCURSES_API /* nothing */
-#endif
-#if !defined(NCURSES_EXPORT)
-#  define NCURSES_EXPORT(type) NCURSES_IMPEXP type NCURSES_API
-#endif
-#if !defined(NCURSES_EXPORT_VAR)
-#  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
-#endif
-
-/*
- * For reentrant code, we map the various global variables into SCREEN by
- * using functions to access them.
- */
-#define NCURSES_PUBLIC_VAR(name) _nc_##name
-#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
-
-#endif /* NCURSES_DLL_H_incl */
diff --git a/include.new/ndbm.h b/include.new/ndbm.h
deleted file mode 100644
index 6a49c79..0000000
--- a/include.new/ndbm.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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. 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.
- *
- *	@(#)ndbm.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/ndbm.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _NDBM_H_
-#define	_NDBM_H_
-
-#include <db.h>
-
-/* Map dbm interface onto db(3). */
-#define DBM_RDONLY	O_RDONLY
-
-/* Flags to dbm_store(). */
-#define DBM_INSERT      0
-#define DBM_REPLACE     1
-
-/*
- * The db(3) support for ndbm always appends this suffix to the
- * file name to avoid overwriting the user's original database.
- */
-#define	DBM_SUFFIX	".db"
-
-typedef struct {
-	char *dptr;
-	int dsize;
-} datum;
-
-typedef DB DBM;
-#define	dbm_pagfno(a)	DBM_PAGFNO_NOT_AVAILABLE
-
-__BEGIN_DECLS
-int	 dbm_clearerr(DBM *);
-void	 dbm_close(DBM *);
-int	 dbm_delete(DBM *, datum);
-int	 dbm_error(DBM *);
-datum	 dbm_fetch(DBM *, datum);
-datum	 dbm_firstkey(DBM *);
-#if __BSD_VISIBLE
-long	 dbm_forder(DBM *, datum);
-#endif
-datum	 dbm_nextkey(DBM *);
-DBM	*dbm_open(const char *, int, int);
-int	 dbm_store(DBM *, datum, datum, int);
-#if __BSD_VISIBLE
-int	 dbm_dirfno(DBM *);
-#endif
-__END_DECLS
-
-#endif /* !_NDBM_H_ */
diff --git a/include.new/net/bpf.h b/include.new/net/bpf.h
deleted file mode 100644
index 7ce0080..0000000
--- a/include.new/net/bpf.h
+++ /dev/null
@@ -1,1313 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *      @(#)bpf.h	8.1 (Berkeley) 6/10/93
- *	@(#)bpf.h	1.34 (LBL)     6/16/96
- *
- * $FreeBSD: releng/10.2/sys/net/bpf.h 244090 2012-12-10 16:14:44Z ghelmer $
- */
-
-#ifndef _NET_BPF_H_
-#define _NET_BPF_H_
-
-/* BSD style release date */
-#define	BPF_RELEASE 199606
-
-typedef	int32_t	  bpf_int32;
-typedef	uint32_t bpf_u_int32;
-typedef	int64_t	  bpf_int64;
-typedef	u_int64_t bpf_u_int64;
-
-/*
- * Alignment macros.  BPF_WORDALIGN rounds up to the next
- * even multiple of BPF_ALIGNMENT.
- */
-#define BPF_ALIGNMENT sizeof(long)
-#define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
-
-#define BPF_MAXINSNS 512
-#define BPF_MAXBUFSIZE 0x80000
-#define BPF_MINBUFSIZE 32
-
-/*
- *  Structure for BIOCSETF.
- */
-struct bpf_program {
-	u_int bf_len;
-	struct bpf_insn *bf_insns;
-};
-
-/*
- * Struct returned by BIOCGSTATS.
- */
-struct bpf_stat {
-	u_int bs_recv;		/* number of packets received */
-	u_int bs_drop;		/* number of packets dropped */
-};
-
-/*
- * Struct return by BIOCVERSION.  This represents the version number of
- * the filter language described by the instruction encodings below.
- * bpf understands a program iff kernel_major == filter_major &&
- * kernel_minor >= filter_minor, that is, if the value returned by the
- * running kernel has the same major number and a minor number equal
- * equal to or less than the filter being downloaded.  Otherwise, the
- * results are undefined, meaning an error may be returned or packets
- * may be accepted haphazardly.
- * It has nothing to do with the source code version.
- */
-struct bpf_version {
-	u_short bv_major;
-	u_short bv_minor;
-};
-/* Current version number of filter architecture. */
-#define BPF_MAJOR_VERSION 1
-#define BPF_MINOR_VERSION 1
-
-/*
- * Historically, BPF has supported a single buffering model, first using mbuf
- * clusters in kernel, and later using malloc(9) buffers in kernel.  We now
- * support multiple buffering modes, which may be queried and set using
- * BIOCGETBUFMODE and BIOCSETBUFMODE.  So as to avoid handling the complexity
- * of changing modes while sniffing packets, the mode becomes fixed once an
- * interface has been attached to the BPF descriptor.
- */
-#define	BPF_BUFMODE_BUFFER	1	/* Kernel buffers with read(). */
-#define	BPF_BUFMODE_ZBUF	2	/* Zero-copy buffers. */
-
-/*-
- * Struct used by BIOCSETZBUF, BIOCROTZBUF: describes up to two zero-copy
- * buffer as used by BPF.
- */
-struct bpf_zbuf {
-	void	*bz_bufa;	/* Location of 'a' zero-copy buffer. */
-	void	*bz_bufb;	/* Location of 'b' zero-copy buffer. */
-	size_t	 bz_buflen;	/* Size of zero-copy buffers. */
-};
-
-#define	BIOCGBLEN	_IOR('B', 102, u_int)
-#define	BIOCSBLEN	_IOWR('B', 102, u_int)
-#define	BIOCSETF	_IOW('B', 103, struct bpf_program)
-#define	BIOCFLUSH	_IO('B', 104)
-#define	BIOCPROMISC	_IO('B', 105)
-#define	BIOCGDLT	_IOR('B', 106, u_int)
-#define	BIOCGETIF	_IOR('B', 107, struct ifreq)
-#define	BIOCSETIF	_IOW('B', 108, struct ifreq)
-#define	BIOCSRTIMEOUT	_IOW('B', 109, struct timeval)
-#define	BIOCGRTIMEOUT	_IOR('B', 110, struct timeval)
-#define	BIOCGSTATS	_IOR('B', 111, struct bpf_stat)
-#define	BIOCIMMEDIATE	_IOW('B', 112, u_int)
-#define	BIOCVERSION	_IOR('B', 113, struct bpf_version)
-#define	BIOCGRSIG	_IOR('B', 114, u_int)
-#define	BIOCSRSIG	_IOW('B', 115, u_int)
-#define	BIOCGHDRCMPLT	_IOR('B', 116, u_int)
-#define	BIOCSHDRCMPLT	_IOW('B', 117, u_int)
-#define	BIOCGDIRECTION	_IOR('B', 118, u_int)
-#define	BIOCSDIRECTION	_IOW('B', 119, u_int)
-#define	BIOCSDLT	_IOW('B', 120, u_int)
-#define	BIOCGDLTLIST	_IOWR('B', 121, struct bpf_dltlist)
-#define	BIOCLOCK	_IO('B', 122)
-#define	BIOCSETWF	_IOW('B', 123, struct bpf_program)
-#define	BIOCFEEDBACK	_IOW('B', 124, u_int)
-#define	BIOCGETBUFMODE	_IOR('B', 125, u_int)
-#define	BIOCSETBUFMODE	_IOW('B', 126, u_int)
-#define	BIOCGETZMAX	_IOR('B', 127, size_t)
-#define	BIOCROTZBUF	_IOR('B', 128, struct bpf_zbuf)
-#define	BIOCSETZBUF	_IOW('B', 129, struct bpf_zbuf)
-#define	BIOCSETFNR	_IOW('B', 130, struct bpf_program)
-#define	BIOCGTSTAMP	_IOR('B', 131, u_int)
-#define	BIOCSTSTAMP	_IOW('B', 132, u_int)
-
-/* Obsolete */
-#define	BIOCGSEESENT	BIOCGDIRECTION
-#define	BIOCSSEESENT	BIOCSDIRECTION
-
-/* Packet directions */
-enum bpf_direction {
-	BPF_D_IN,	/* See incoming packets */
-	BPF_D_INOUT,	/* See incoming and outgoing packets */
-	BPF_D_OUT	/* See outgoing packets */
-};
-
-/* Time stamping functions */
-#define	BPF_T_MICROTIME		0x0000
-#define	BPF_T_NANOTIME		0x0001
-#define	BPF_T_BINTIME		0x0002
-#define	BPF_T_NONE		0x0003
-#define	BPF_T_FORMAT_MASK	0x0003
-#define	BPF_T_NORMAL		0x0000
-#define	BPF_T_FAST		0x0100
-#define	BPF_T_MONOTONIC		0x0200
-#define	BPF_T_MONOTONIC_FAST	(BPF_T_FAST | BPF_T_MONOTONIC)
-#define	BPF_T_FLAG_MASK		0x0300
-#define	BPF_T_FORMAT(t)		((t) & BPF_T_FORMAT_MASK)
-#define	BPF_T_FLAG(t)		((t) & BPF_T_FLAG_MASK)
-#define	BPF_T_VALID(t)						\
-    ((t) == BPF_T_NONE || (BPF_T_FORMAT(t) != BPF_T_NONE &&	\
-    ((t) & ~(BPF_T_FORMAT_MASK | BPF_T_FLAG_MASK)) == 0))
-
-#define	BPF_T_MICROTIME_FAST		(BPF_T_MICROTIME | BPF_T_FAST)
-#define	BPF_T_NANOTIME_FAST		(BPF_T_NANOTIME | BPF_T_FAST)
-#define	BPF_T_BINTIME_FAST		(BPF_T_BINTIME | BPF_T_FAST)
-#define	BPF_T_MICROTIME_MONOTONIC	(BPF_T_MICROTIME | BPF_T_MONOTONIC)
-#define	BPF_T_NANOTIME_MONOTONIC	(BPF_T_NANOTIME | BPF_T_MONOTONIC)
-#define	BPF_T_BINTIME_MONOTONIC		(BPF_T_BINTIME | BPF_T_MONOTONIC)
-#define	BPF_T_MICROTIME_MONOTONIC_FAST	(BPF_T_MICROTIME | BPF_T_MONOTONIC_FAST)
-#define	BPF_T_NANOTIME_MONOTONIC_FAST	(BPF_T_NANOTIME | BPF_T_MONOTONIC_FAST)
-#define	BPF_T_BINTIME_MONOTONIC_FAST	(BPF_T_BINTIME | BPF_T_MONOTONIC_FAST)
-
-/*
- * Structure prepended to each packet.
- */
-struct bpf_ts {
-	bpf_int64	bt_sec;		/* seconds */
-	bpf_u_int64	bt_frac;	/* fraction */
-};
-struct bpf_xhdr {
-	struct bpf_ts	bh_tstamp;	/* time stamp */
-	bpf_u_int32	bh_caplen;	/* length of captured portion */
-	bpf_u_int32	bh_datalen;	/* original length of packet */
-	u_short		bh_hdrlen;	/* length of bpf header (this struct
-					   plus alignment padding) */
-};
-/* Obsolete */
-struct bpf_hdr {
-	struct timeval	bh_tstamp;	/* time stamp */
-	bpf_u_int32	bh_caplen;	/* length of captured portion */
-	bpf_u_int32	bh_datalen;	/* original length of packet */
-	u_short		bh_hdrlen;	/* length of bpf header (this struct
-					   plus alignment padding) */
-};
-#ifdef _KERNEL
-#define	MTAG_BPF		0x627066
-#define	MTAG_BPF_TIMESTAMP	0
-#endif
-
-/*
- * When using zero-copy BPF buffers, a shared memory header is present
- * allowing the kernel BPF implementation and user process to synchronize
- * without using system calls.  This structure defines that header.  When
- * accessing these fields, appropriate atomic operation and memory barriers
- * are required in order not to see stale or out-of-order data; see bpf(4)
- * for reference code to access these fields from userspace.
- *
- * The layout of this structure is critical, and must not be changed; if must
- * fit in a single page on all architectures.
- */
-struct bpf_zbuf_header {
-	volatile u_int	bzh_kernel_gen;	/* Kernel generation number. */
-	volatile u_int	bzh_kernel_len;	/* Length of data in the buffer. */
-	volatile u_int	bzh_user_gen;	/* User generation number. */
-	u_int _bzh_pad[5];
-};
-
-/*
- * Data-link level type codes.
- */
-#define DLT_NULL	0	/* BSD loopback encapsulation */
-#define DLT_EN10MB	1	/* Ethernet (10Mb) */
-#define DLT_EN3MB	2	/* Experimental Ethernet (3Mb) */
-#define DLT_AX25	3	/* Amateur Radio AX.25 */
-#define DLT_PRONET	4	/* Proteon ProNET Token Ring */
-#define DLT_CHAOS	5	/* Chaos */
-#define DLT_IEEE802	6	/* IEEE 802 Networks */
-#define DLT_ARCNET	7	/* ARCNET */
-#define DLT_SLIP	8	/* Serial Line IP */
-#define DLT_PPP		9	/* Point-to-point Protocol */
-#define DLT_FDDI	10	/* FDDI */
-#define DLT_ATM_RFC1483	11	/* LLC/SNAP encapsulated atm */
-#define DLT_RAW		12	/* raw IP */
-
-/*
- * These are values from BSD/OS's "bpf.h".
- * These are not the same as the values from the traditional libpcap
- * "bpf.h"; however, these values shouldn't be generated by any
- * OS other than BSD/OS, so the correct values to use here are the
- * BSD/OS values.
- *
- * Platforms that have already assigned these values to other
- * DLT_ codes, however, should give these codes the values
- * from that platform, so that programs that use these codes will
- * continue to compile - even though they won't correctly read
- * files of these types.
- */
-#define DLT_SLIP_BSDOS	15	/* BSD/OS Serial Line IP */
-#define DLT_PPP_BSDOS	16	/* BSD/OS Point-to-point Protocol */
-
-#define DLT_ATM_CLIP	19	/* Linux Classical-IP over ATM */
-
-/*
- * These values are defined by NetBSD; other platforms should refrain from
- * using them for other purposes, so that NetBSD savefiles with link
- * types of 50 or 51 can be read as this type on all platforms.
- */
-#define DLT_PPP_SERIAL	50	/* PPP over serial with HDLC encapsulation */
-#define DLT_PPP_ETHER	51	/* PPP over Ethernet */
-
-/*
- * Reserved for the Symantec Enterprise Firewall.
- */
-#define DLT_SYMANTEC_FIREWALL	99
-
-/*
- * Values between 100 and 103 are used in capture file headers as
- * link-layer header type LINKTYPE_ values corresponding to DLT_ types
- * that differ between platforms; don't use those values for new DLT_
- * new types.
- */
-
-/*
- * Values starting with 104 are used for newly-assigned link-layer
- * header type values; for those link-layer header types, the DLT_
- * value returned by pcap_datalink() and passed to pcap_open_dead(),
- * and the LINKTYPE_ value that appears in capture files, are the
- * same.
- *
- * DLT_MATCHING_MIN is the lowest such value; DLT_MATCHING_MAX is
- * the highest such value.
- */
-#define DLT_MATCHING_MIN	104
-
-/*
- * This value was defined by libpcap 0.5; platforms that have defined
- * it with a different value should define it here with that value -
- * a link type of 104 in a save file will be mapped to DLT_C_HDLC,
- * whatever value that happens to be, so programs will correctly
- * handle files with that link type regardless of the value of
- * DLT_C_HDLC.
- *
- * The name DLT_C_HDLC was used by BSD/OS; we use that name for source
- * compatibility with programs written for BSD/OS.
- *
- * libpcap 0.5 defined it as DLT_CHDLC; we define DLT_CHDLC as well,
- * for source compatibility with programs written for libpcap 0.5.
- */
-#define DLT_C_HDLC	104	/* Cisco HDLC */
-#define DLT_CHDLC	DLT_C_HDLC
-
-#define DLT_IEEE802_11	105	/* IEEE 802.11 wireless */
-
-/*
- * Values between 106 and 107 are used in capture file headers as
- * link-layer types corresponding to DLT_ types that might differ
- * between platforms; don't use those values for new DLT_ new types.
- */
-
-/*
- * Frame Relay; BSD/OS has a DLT_FR with a value of 11, but that collides
- * with other values.
- * DLT_FR and DLT_FRELAY packets start with the Q.922 Frame Relay header
- * (DLCI, etc.).
- */
-#define DLT_FRELAY	107
-
-/*
- * OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except
- * that the AF_ type in the link-layer header is in network byte order.
- *
- * OpenBSD defines it as 12, but that collides with DLT_RAW, so we
- * define it as 108 here.  If OpenBSD picks up this file, it should
- * define DLT_LOOP as 12 in its version, as per the comment above -
- * and should not use 108 as a DLT_ value.
- */
-#define DLT_LOOP	108
-
-/*
- * Values between 109 and 112 are used in capture file headers as
- * link-layer types corresponding to DLT_ types that might differ
- * between platforms; don't use those values for new DLT_ new types.
- */
-
-/*
- * Encapsulated packets for IPsec; DLT_ENC is 13 in OpenBSD, but that's
- * DLT_SLIP_BSDOS in NetBSD, so we don't use 13 for it in OSes other
- * than OpenBSD.
- */
-#define DLT_ENC	109
-
-/*
- * This is for Linux cooked sockets.
- */
-#define DLT_LINUX_SLL	113
-
-/*
- * Apple LocalTalk hardware.
- */
-#define DLT_LTALK	114
-
-/*
- * Acorn Econet.
- */
-#define DLT_ECONET	115
-
-/*
- * Reserved for use with OpenBSD ipfilter.
- */
-#define DLT_IPFILTER	116
-
-/*
- * Reserved for use in capture-file headers as a link-layer type
- * corresponding to OpenBSD DLT_PFLOG; DLT_PFLOG is 17 in OpenBSD,
- * but that's DLT_LANE8023 in SuSE 6.3, so we can't use 17 for it
- * in capture-file headers.
- */
-#define DLT_PFLOG	117
-
-/*
- * Registered for Cisco-internal use.
- */
-#define DLT_CISCO_IOS	118
-
-/*
- * Reserved for 802.11 cards using the Prism II chips, with a link-layer
- * header including Prism monitor mode information plus an 802.11
- * header.
- */
-#define DLT_PRISM_HEADER	119
-
-/*
- * Reserved for Aironet 802.11 cards, with an Aironet link-layer header
- * (see Doug Ambrisko's FreeBSD patches).
- */
-#define DLT_AIRONET_HEADER	120
-
-/*
- * Reserved for use by OpenBSD's pfsync device.
- */
-#define DLT_PFSYNC	121
-
-/*
- * Reserved for Siemens HiPath HDLC. XXX
- */
-#define DLT_HHDLC	121
-
-/*
- * Reserved for RFC 2625 IP-over-Fibre Channel.
- */
-#define DLT_IP_OVER_FC	122
-
-/*
- * Reserved for Full Frontal ATM on Solaris.
- */
-#define DLT_SUNATM	123
-
-/*
- * Reserved as per request from Kent Dahlgren <kent@praesum.com>
- * for private use.
- */
-#define DLT_RIO		124	/* RapidIO */
-#define DLT_PCI_EXP	125	/* PCI Express */
-#define DLT_AURORA	126	/* Xilinx Aurora link layer */
-
-/*
- * BSD header for 802.11 plus a number of bits of link-layer information
- * including radio information.
- */
-#ifndef DLT_IEEE802_11_RADIO
-#define DLT_IEEE802_11_RADIO	127
-#endif
-
-/*
- * Reserved for TZSP encapsulation.
- */
-#define DLT_TZSP		128	/* Tazmen Sniffer Protocol */
-
-/*
- * Reserved for Linux ARCNET.
- */
-#define DLT_ARCNET_LINUX	129
-
-/*
- * Juniper-private data link types.
- */
-#define DLT_JUNIPER_MLPPP	130
-#define DLT_JUNIPER_MLFR	131
-#define DLT_JUNIPER_ES		132
-#define DLT_JUNIPER_GGSN	133
-#define DLT_JUNIPER_MFR		134
-#define DLT_JUNIPER_ATM2	135
-#define DLT_JUNIPER_SERVICES	136
-#define DLT_JUNIPER_ATM1	137
-
-/*
- * Apple IP-over-IEEE 1394, as per a request from Dieter Siegmund
- * <dieter@apple.com>.  The header that's presented is an Ethernet-like
- * header:
- *
- *	#define FIREWIRE_EUI64_LEN	8
- *	struct firewire_header {
- *		u_char  firewire_dhost[FIREWIRE_EUI64_LEN];
- *		u_char  firewire_shost[FIREWIRE_EUI64_LEN];
- *		u_short firewire_type;
- *	};
- *
- * with "firewire_type" being an Ethernet type value, rather than,
- * for example, raw GASP frames being handed up.
- */
-#define DLT_APPLE_IP_OVER_IEEE1394	138
-
-/*
- * Various SS7 encapsulations, as per a request from Jeff Morriss
- * <jeff.morriss[AT]ulticom.com> and subsequent discussions.
- */
-#define DLT_MTP2_WITH_PHDR	139	/* pseudo-header with various info, followed by MTP2 */
-#define DLT_MTP2		140	/* MTP2, without pseudo-header */
-#define DLT_MTP3		141	/* MTP3, without pseudo-header or MTP2 */
-#define DLT_SCCP		142	/* SCCP, without pseudo-header or MTP2 or MTP3 */
-
-/*
- * Reserved for DOCSIS.
- */
-#define DLT_DOCSIS	143
-
-/*
- * Reserved for Linux IrDA.
- */
-#define DLT_LINUX_IRDA	144
-
-/*
- * Reserved for IBM SP switch and IBM Next Federation switch.
- */
-#define DLT_IBM_SP	145
-#define DLT_IBM_SN	146
-
-/*
- * Reserved for private use.  If you have some link-layer header type
- * that you want to use within your organization, with the capture files
- * using that link-layer header type not ever be sent outside your
- * organization, you can use these values.
- *
- * No libpcap release will use these for any purpose, nor will any
- * tcpdump release use them, either.
- *
- * Do *NOT* use these in capture files that you expect anybody not using
- * your private versions of capture-file-reading tools to read; in
- * particular, do *NOT* use them in products, otherwise you may find that
- * people won't be able to use tcpdump, or snort, or Ethereal, or... to
- * read capture files from your firewall/intrusion detection/traffic
- * monitoring/etc. appliance, or whatever product uses that DLT_ value,
- * and you may also find that the developers of those applications will
- * not accept patches to let them read those files.
- *
- * Also, do not use them if somebody might send you a capture using them
- * for *their* private type and tools using them for *your* private type
- * would have to read them.
- *
- * Instead, ask "tcpdump-workers@tcpdump.org" for a new DLT_ value,
- * as per the comment above, and use the type you're given.
- */
-#define DLT_USER0		147
-#define DLT_USER1		148
-#define DLT_USER2		149
-#define DLT_USER3		150
-#define DLT_USER4		151
-#define DLT_USER5		152
-#define DLT_USER6		153
-#define DLT_USER7		154
-#define DLT_USER8		155
-#define DLT_USER9		156
-#define DLT_USER10		157
-#define DLT_USER11		158
-#define DLT_USER12		159
-#define DLT_USER13		160
-#define DLT_USER14		161
-#define DLT_USER15		162
-
-/*
- * For future use with 802.11 captures - defined by AbsoluteValue
- * Systems to store a number of bits of link-layer information
- * including radio information:
- *
- *	http://www.shaftnet.org/~pizza/software/capturefrm.txt
- *
- * but it might be used by some non-AVS drivers now or in the
- * future.
- */
-#define DLT_IEEE802_11_RADIO_AVS 163	/* 802.11 plus AVS radio header */
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.  The DLT_s are used
- * for passing on chassis-internal metainformation such as
- * QOS profiles, etc..
- */
-#define DLT_JUNIPER_MONITOR     164
-
-/*
- * Reserved for BACnet MS/TP.
- */
-#define DLT_BACNET_MS_TP	165
-
-/*
- * Another PPP variant as per request from Karsten Keil <kkeil@suse.de>.
- *
- * This is used in some OSes to allow a kernel socket filter to distinguish
- * between incoming and outgoing packets, on a socket intended to
- * supply pppd with outgoing packets so it can do dial-on-demand and
- * hangup-on-lack-of-demand; incoming packets are filtered out so they
- * don't cause pppd to hold the connection up (you don't want random
- * input packets such as port scans, packets from old lost connections,
- * etc. to force the connection to stay up).
- *
- * The first byte of the PPP header (0xff03) is modified to accomodate
- * the direction - 0x00 = IN, 0x01 = OUT.
- */
-#define DLT_PPP_PPPD		166
-
-/*
- * Names for backwards compatibility with older versions of some PPP
- * software; new software should use DLT_PPP_PPPD.
- */
-#define DLT_PPP_WITH_DIRECTION	DLT_PPP_PPPD
-#define DLT_LINUX_PPP_WITHDIRECTION	DLT_PPP_PPPD
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.  The DLT_s are used
- * for passing on chassis-internal metainformation such as
- * QOS profiles, cookies, etc..
- */
-#define DLT_JUNIPER_PPPOE       167
-#define DLT_JUNIPER_PPPOE_ATM   168
-
-#define DLT_GPRS_LLC		169	/* GPRS LLC */
-#define DLT_GPF_T		170	/* GPF-T (ITU-T G.7041/Y.1303) */
-#define DLT_GPF_F		171	/* GPF-F (ITU-T G.7041/Y.1303) */
-
-/*
- * Requested by Oolan Zimmer <oz@gcom.com> for use in Gcom's T1/E1 line
- * monitoring equipment.
- */
-#define DLT_GCOM_T1E1		172
-#define DLT_GCOM_SERIAL		173
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.  The DLT_ is used
- * for internal communication to Physical Interface Cards (PIC)
- */
-#define DLT_JUNIPER_PIC_PEER    174
-
-/*
- * Link types requested by Gregor Maier <gregor@endace.com> of Endace
- * Measurement Systems.  They add an ERF header (see
- * http://www.endace.com/support/EndaceRecordFormat.pdf) in front of
- * the link-layer header.
- */
-#define DLT_ERF_ETH		175	/* Ethernet */
-#define DLT_ERF_POS		176	/* Packet-over-SONET */
-
-/*
- * Requested by Daniele Orlandi <daniele@orlandi.com> for raw LAPD
- * for vISDN (http://www.orlandi.com/visdn/).  Its link-layer header
- * includes additional information before the LAPD header, so it's
- * not necessarily a generic LAPD header.
- */
-#define DLT_LINUX_LAPD		177
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- * The DLT_ are used for prepending meta-information
- * like interface index, interface name
- * before standard Ethernet, PPP, Frelay & C-HDLC Frames
- */
-#define DLT_JUNIPER_ETHER       178
-#define DLT_JUNIPER_PPP         179
-#define DLT_JUNIPER_FRELAY      180
-#define DLT_JUNIPER_CHDLC       181
-
-/*
- * Multi Link Frame Relay (FRF.16)
- */
-#define DLT_MFR                 182
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- * The DLT_ is used for internal communication with a
- * voice Adapter Card (PIC)
- */
-#define DLT_JUNIPER_VP          183
-
-/*
- * Arinc 429 frames.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- * Every frame contains a 32bit A429 label.
- * More documentation on Arinc 429 can be found at
- * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf
- */
-#define DLT_A429                184
-
-/*
- * Arinc 653 Interpartition Communication messages.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- * Please refer to the A653-1 standard for more information.
- */
-#define DLT_A653_ICM            185
-
-/*
- * USB packets, beginning with a USB setup header; requested by
- * Paolo Abeni <paolo.abeni@email.it>.
- */
-#define DLT_USB			186
-
-/*
- * Bluetooth HCI UART transport layer (part H:4); requested by
- * Paolo Abeni.
- */
-#define DLT_BLUETOOTH_HCI_H4	187
-
-/*
- * IEEE 802.16 MAC Common Part Sublayer; requested by Maria Cruz
- * <cruz_petagay@bah.com>.
- */
-#define DLT_IEEE802_16_MAC_CPS	188
-
-/*
- * USB packets, beginning with a Linux USB header; requested by
- * Paolo Abeni <paolo.abeni@email.it>.
- */
-#define DLT_USB_LINUX		189
-
-/*
- * Controller Area Network (CAN) v. 2.0B packets.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- * Used to dump CAN packets coming from a CAN Vector board.
- * More documentation on the CAN v2.0B frames can be found at
- * http://www.can-cia.org/downloads/?269
- */
-#define DLT_CAN20B              190
-
-/*
- * IEEE 802.15.4, with address fields padded, as is done by Linux
- * drivers; requested by Juergen Schimmer.
- */
-#define DLT_IEEE802_15_4_LINUX	191
-
-/*
- * Per Packet Information encapsulated packets.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- */
-#define DLT_PPI			192
-
-/*
- * Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header;
- * requested by Charles Clancy.
- */
-#define DLT_IEEE802_16_MAC_CPS_RADIO	193
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- * The DLT_ is used for internal communication with a
- * integrated service module (ISM).
- */
-#define DLT_JUNIPER_ISM         194
-
-/*
- * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
- * nothing); requested by Mikko Saarnivala <mikko.saarnivala@sensinode.com>.
- */
-#define DLT_IEEE802_15_4	195
-
-/*
- * Various link-layer types, with a pseudo-header, for SITA
- * (http://www.sita.aero/); requested by Fulko Hew (fulko.hew@gmail.com).
- */
-#define DLT_SITA		196
-
-/*
- * Various link-layer types, with a pseudo-header, for Endace DAG cards;
- * encapsulates Endace ERF records.  Requested by Stephen Donnelly
- * <stephen@endace.com>.
- */
-#define DLT_ERF			197
-
-/*
- * Special header prepended to Ethernet packets when capturing from a
- * u10 Networks board.  Requested by Phil Mulholland
- * <phil@u10networks.com>.
- */
-#define DLT_RAIF1		198
-
-/*
- * IPMB packet for IPMI, beginning with the I2C slave address, followed
- * by the netFn and LUN, etc..  Requested by Chanthy Toeung
- * <chanthy.toeung@ca.kontron.com>.
- */
-#define DLT_IPMB		199
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- * The DLT_ is used for capturing data on a secure tunnel interface.
- */
-#define DLT_JUNIPER_ST          200
-
-/*
- * Bluetooth HCI UART transport layer (part H:4), with pseudo-header
- * that includes direction information; requested by Paolo Abeni.
- */
-#define DLT_BLUETOOTH_HCI_H4_WITH_PHDR	201
-
-/*
- * AX.25 packet with a 1-byte KISS header; see
- *
- *      http://www.ax25.net/kiss.htm
- *
- * as per Richard Stearn <richard@rns-stearn.demon.co.uk>.
- */
-#define DLT_AX25_KISS           202
-
-/*
- * LAPD packets from an ISDN channel, starting with the address field,
- * with no pseudo-header.
- * Requested by Varuna De Silva <varunax@gmail.com>.
- */
-#define DLT_LAPD                203
-
-/*
- * Variants of various link-layer headers, with a one-byte direction
- * pseudo-header prepended - zero means "received by this host",
- * non-zero (any non-zero value) means "sent by this host" - as per
- * Will Barker <w.barker@zen.co.uk>.
- */
-#define DLT_PPP_WITH_DIR        204     /* PPP - don't confuse with DLT_PPP_WITH_DIRECTION */
-#define DLT_C_HDLC_WITH_DIR     205     /* Cisco HDLC */
-#define DLT_FRELAY_WITH_DIR     206     /* Frame Relay */
-#define DLT_LAPB_WITH_DIR       207     /* LAPB */
-
-/*
- * 208 is reserved for an as-yet-unspecified proprietary link-layer
- * type, as requested by Will Barker.
- */
-
-/*
- * IPMB with a Linux-specific pseudo-header; as requested by Alexey Neyman
- * <avn@pigeonpoint.com>.
- */
-#define DLT_IPMB_LINUX          209
-
-/*
- * FlexRay automotive bus - http://www.flexray.com/ - as requested
- * by Hannes Kaelber <hannes.kaelber@x2e.de>.
- */
-#define DLT_FLEXRAY             210
-
-/*
- * Media Oriented Systems Transport (MOST) bus for multimedia
- * transport - http://www.mostcooperation.com/ - as requested
- * by Hannes Kaelber <hannes.kaelber@x2e.de>.
- */
-#define DLT_MOST                211
-
-/*
- * Local Interconnect Network (LIN) bus for vehicle networks -
- * http://www.lin-subbus.org/ - as requested by Hannes Kaelber
- * <hannes.kaelber@x2e.de>.
- */
-#define DLT_LIN                 212
-
-/*
- * X2E-private data link type used for serial line capture,
- * as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
- */
-#define DLT_X2E_SERIAL          213
-
-/*
- * X2E-private data link type used for the Xoraya data logger
- * family, as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
- */
-#define DLT_X2E_XORAYA          214
-
-/*
- * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
- * nothing), but with the PHY-level data for non-ASK PHYs (4 octets
- * of 0 as preamble, one octet of SFD, one octet of frame length+
- * reserved bit, and then the MAC-layer data, starting with the
- * frame control field).
- *
- * Requested by Max Filippov <jcmvbkbc@gmail.com>.
- */
-#define DLT_IEEE802_15_4_NONASK_PHY     215
-
-/* 
- * David Gibson <david@gibson.dropbear.id.au> requested this for
- * captures from the Linux kernel /dev/input/eventN devices. This
- * is used to communicate keystrokes and mouse movements from the
- * Linux kernel to display systems, such as Xorg. 
- */
-#define	DLT_LINUX_EVDEV		216
-
-/*
- * GSM Um and Abis interfaces, preceded by a "gsmtap" header.
- *
- * Requested by Harald Welte <laforge@gnumonks.org>.
- */
-#define	DLT_GSMTAP_UM		217
-#define	DLT_GSMTAP_ABIS		218
-
-/*
- * MPLS, with an MPLS label as the link-layer header.
- * Requested by Michele Marchetto <michele@openbsd.org> on behalf
- * of OpenBSD.
- */
-#define	DLT_MPLS		219
-
-/*
- * USB packets, beginning with a Linux USB header, with the USB header
- * padded to 64 bytes; required for memory-mapped access.
- */
-#define	DLT_USB_LINUX_MMAPPED	220
-
-/*
- * DECT packets, with a pseudo-header; requested by
- * Matthias Wenzel <tcpdump@mazzoo.de>.
- */
-#define	DLT_DECT		221
-/*
- * From: "Lidwa, Eric (GSFC-582.0)[SGT INC]" <eric.lidwa-1@nasa.gov>
- * Date: Mon, 11 May 2009 11:18:30 -0500
- *
- * DLT_AOS. We need it for AOS Space Data Link Protocol.
- *   I have already written dissectors for but need an OK from
- *   legal before I can submit a patch.
- *
- */
-#define	DLT_AOS			222
-
-/*
- * Wireless HART (Highway Addressable Remote Transducer)
- * From the HART Communication Foundation
- * IES/PAS 62591
- *
- * Requested by Sam Roberts <vieuxtech@gmail.com>.
- */
-#define	DLT_WIHART		223
-
-/*
- * Fibre Channel FC-2 frames, beginning with a Frame_Header.
- * Requested by Kahou Lei <kahou82@gmail.com>.
- */
-#define	DLT_FC_2		224
-
-/*
- * Fibre Channel FC-2 frames, beginning with an encoding of the
- * SOF, and ending with an encoding of the EOF.
- *
- * The encodings represent the frame delimiters as 4-byte sequences
- * representing the corresponding ordered sets, with K28.5
- * represented as 0xBC, and the D symbols as the corresponding
- * byte values; for example, SOFi2, which is K28.5 - D21.5 - D1.2 - D21.2,
- * is represented as 0xBC 0xB5 0x55 0x55.
- *
- * Requested by Kahou Lei <kahou82@gmail.com>.
- */
-#define	DLT_FC_2_WITH_FRAME_DELIMS	225
-/*
- * Solaris ipnet pseudo-header; requested by Darren Reed <Darren.Reed@Sun.COM>.
- *
- * The pseudo-header starts with a one-byte version number; for version 2,
- * the pseudo-header is:
- *
- * struct dl_ipnetinfo {
- *     u_int8_t   dli_version;
- *     u_int8_t   dli_family;
- *     u_int16_t  dli_htype;
- *     uint32_t  dli_pktlen;
- *     uint32_t  dli_ifindex;
- *     uint32_t  dli_grifindex;
- *     uint32_t  dli_zsrc;
- *     uint32_t  dli_zdst;
- * };
- *
- * dli_version is 2 for the current version of the pseudo-header.
- *
- * dli_family is a Solaris address family value, so it's 2 for IPv4
- * and 26 for IPv6.
- *
- * dli_htype is a "hook type" - 0 for incoming packets, 1 for outgoing
- * packets, and 2 for packets arriving from another zone on the same
- * machine.
- *
- * dli_pktlen is the length of the packet data following the pseudo-header
- * (so the captured length minus dli_pktlen is the length of the
- * pseudo-header, assuming the entire pseudo-header was captured).
- *
- * dli_ifindex is the interface index of the interface on which the
- * packet arrived.
- *
- * dli_grifindex is the group interface index number (for IPMP interfaces).
- *
- * dli_zsrc is the zone identifier for the source of the packet.
- *
- * dli_zdst is the zone identifier for the destination of the packet.
- *
- * A zone number of 0 is the global zone; a zone number of 0xffffffff
- * means that the packet arrived from another host on the network, not
- * from another zone on the same machine.
- *
- * An IPv4 or IPv6 datagram follows the pseudo-header; dli_family indicates
- * which of those it is.
- */
-#define	DLT_IPNET			226
-
-/*
- * CAN (Controller Area Network) frames, with a pseudo-header as supplied
- * by Linux SocketCAN.  See Documentation/networking/can.txt in the Linux
- * source.
- *
- * Requested by Felix Obenhuber <felix@obenhuber.de>.
- */
-#define	DLT_CAN_SOCKETCAN		227
-
-/*
- * Raw IPv4/IPv6; different from DLT_RAW in that the DLT_ value specifies
- * whether it's v4 or v6.  Requested by Darren Reed <Darren.Reed@Sun.COM>.
- */
-#define DLT_IPV4		228
-#define DLT_IPV6		229
-
-/*
- * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
- * nothing), and with no FCS at the end of the frame; requested by
- * Jon Smirl <jonsmirl@gmail.com>.
- */
-#define DLT_IEEE802_15_4_NOFCS	230
-
-/*
- * Raw D-Bus:
- *
- *	http://www.freedesktop.org/wiki/Software/dbus
- *
- * messages:
- *
- *	http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-messages
- *
- * starting with the endianness flag, followed by the message type, etc.,
- * but without the authentication handshake before the message sequence:
- *
- *	http://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
- *
- * Requested by Martin Vidner <martin@vidner.net>.
- */
-#define DLT_DBUS		231
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- */
-#define DLT_JUNIPER_VS			232
-#define DLT_JUNIPER_SRX_E2E		233
-#define DLT_JUNIPER_FIBRECHANNEL	234
-
-/*
- * DVB-CI (DVB Common Interface for communication between a PC Card
- * module and a DVB receiver).  See
- *
- *	http://www.kaiser.cx/pcap-dvbci.html
- *
- * for the specification.
- *
- * Requested by Martin Kaiser <martin@kaiser.cx>.
- */
-#define DLT_DVB_CI		235
-
-/*
- * Variant of 3GPP TS 27.010 multiplexing protocol (similar to, but
- * *not* the same as, 27.010).  Requested by Hans-Christoph Schemmel
- * <hans-christoph.schemmel@cinterion.com>.
- */
-#define DLT_MUX27010		236
-
-/*
- * STANAG 5066 D_PDUs.  Requested by M. Baris Demiray
- * <barisdemiray@gmail.com>.
- */
-#define DLT_STANAG_5066_D_PDU	237
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- */
-#define DLT_JUNIPER_ATM_CEMIC	238
-
-/*
- * NetFilter LOG messages 
- * (payload of netlink NFNL_SUBSYS_ULOG/NFULNL_MSG_PACKET packets)
- *
- * Requested by Jakub Zawadzki <darkjames-ws@darkjames.pl>
- */
-#define DLT_NFLOG		239
-
-/*
- * Hilscher Gesellschaft fuer Systemautomation mbH link-layer type
- * for Ethernet packets with a 4-byte pseudo-header and always
- * with the payload including the FCS, as supplied by their
- * netANALYZER hardware and software.
- *
- * Requested by Holger P. Frommer <HPfrommer@hilscher.com>
- */
-#define DLT_NETANALYZER		240
-
-/*
- * Hilscher Gesellschaft fuer Systemautomation mbH link-layer type
- * for Ethernet packets with a 4-byte pseudo-header and FCS and
- * with the Ethernet header preceded by 7 bytes of preamble and
- * 1 byte of SFD, as supplied by their netANALYZER hardware and
- * software.
- *
- * Requested by Holger P. Frommer <HPfrommer@hilscher.com>
- */
-#define DLT_NETANALYZER_TRANSPARENT	241
-
-/*
- * IP-over-Infiniband, as specified by RFC 4391.
- *
- * Requested by Petr Sumbera <petr.sumbera@oracle.com>.
- */
-#define DLT_IPOIB		242
-
-/*
- * MPEG-2 transport stream (ISO 13818-1/ITU-T H.222.0).
- *
- * Requested by Guy Martin <gmsoft@tuxicoman.be>.
- */
-#define DLT_MPEG_2_TS		243
-
-/*
- * ng4T GmbH's UMTS Iub/Iur-over-ATM and Iub/Iur-over-IP format as
- * used by their ng40 protocol tester.
- *
- * Requested by Jens Grimmer <jens.grimmer@ng4t.com>.
- */
-#define DLT_NG40		244
-
-/*
- * Pseudo-header giving adapter number and flags, followed by an NFC
- * (Near-Field Communications) Logical Link Control Protocol (LLCP) PDU,
- * as specified by NFC Forum Logical Link Control Protocol Technical
- * Specification LLCP 1.1.
- *
- * Requested by Mike Wakerly <mikey@google.com>.
- */
-#define DLT_NFC_LLCP		245
-
-/*
- * 245 is used as LINKTYPE_PFSYNC; do not use it for any other purpose.
- *
- * DLT_PFSYNC has different values on different platforms, and all of
- * them collide with something used elsewhere.  On platforms that
- * don't already define it, define it as 245.
- */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)
-#define DLT_PFSYNC		246
-#endif
-
-#define DLT_MATCHING_MAX	246	/* highest value in the "matching" range */
-
-/*
- * DLT and savefile link type values are split into a class and
- * a member of that class.  A class value of 0 indicates a regular
- * DLT_/LINKTYPE_ value.
- */
-#define DLT_CLASS(x)            ((x) & 0x03ff0000)
-
-/*
- * The instruction encodings.
- */
-/* instruction classes */
-#define BPF_CLASS(code) ((code) & 0x07)
-#define		BPF_LD		0x00
-#define		BPF_LDX		0x01
-#define		BPF_ST		0x02
-#define		BPF_STX		0x03
-#define		BPF_ALU		0x04
-#define		BPF_JMP		0x05
-#define		BPF_RET		0x06
-#define		BPF_MISC	0x07
-
-/* ld/ldx fields */
-#define BPF_SIZE(code)	((code) & 0x18)
-#define		BPF_W		0x00
-#define		BPF_H		0x08
-#define		BPF_B		0x10
-#define BPF_MODE(code)	((code) & 0xe0)
-#define		BPF_IMM 	0x00
-#define		BPF_ABS		0x20
-#define		BPF_IND		0x40
-#define		BPF_MEM		0x60
-#define		BPF_LEN		0x80
-#define		BPF_MSH		0xa0
-
-/* alu/jmp fields */
-#define BPF_OP(code)	((code) & 0xf0)
-#define		BPF_ADD		0x00
-#define		BPF_SUB		0x10
-#define		BPF_MUL		0x20
-#define		BPF_DIV		0x30
-#define		BPF_OR		0x40
-#define		BPF_AND		0x50
-#define		BPF_LSH		0x60
-#define		BPF_RSH		0x70
-#define		BPF_NEG		0x80
-#define		BPF_JA		0x00
-#define		BPF_JEQ		0x10
-#define		BPF_JGT		0x20
-#define		BPF_JGE		0x30
-#define		BPF_JSET	0x40
-#define BPF_SRC(code)	((code) & 0x08)
-#define		BPF_K		0x00
-#define		BPF_X		0x08
-
-/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code)	((code) & 0x18)
-#define		BPF_A		0x10
-
-/* misc */
-#define BPF_MISCOP(code) ((code) & 0xf8)
-#define		BPF_TAX		0x00
-#define		BPF_TXA		0x80
-
-/*
- * The instruction data structure.
- */
-struct bpf_insn {
-	u_short		code;
-	u_char		jt;
-	u_char		jf;
-	bpf_u_int32	k;
-};
-
-/*
- * Macros for insn array initializers.
- */
-#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
-#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
-
-/*
- * Structure to retrieve available DLTs for the interface.
- */
-struct bpf_dltlist {
-	u_int	bfl_len;	/* number of bfd_list array */
-	u_int	*bfl_list;	/* array of DLTs */
-};
-
-#ifdef _KERNEL
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_BPF);
-#endif
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_bpf);
-#endif
-
-/*
- * Rotate the packet buffers in descriptor d.  Move the store buffer into the
- * hold slot, and the free buffer ino the store slot.  Zero the length of the
- * new store buffer.  Descriptor lock should be held. Hold buffer must
- * not be marked "in use".
- */
-#define	ROTATE_BUFFERS(d)	do {					\
-	(d)->bd_hbuf = (d)->bd_sbuf;					\
-	(d)->bd_hlen = (d)->bd_slen;					\
-	(d)->bd_sbuf = (d)->bd_fbuf;					\
-	(d)->bd_slen = 0;						\
-	(d)->bd_fbuf = NULL;						\
-	bpf_bufheld(d);							\
-} while (0)
-
-/*
- * Descriptor associated with each attached hardware interface.
- * FIXME: this structure is exposed to external callers to speed up
- * bpf_peers_present() call. However we cover all fields not needed by
- * this function via BPF_INTERNAL define
- */
-struct bpf_if {
-	LIST_ENTRY(bpf_if)	bif_next;	/* list of all interfaces */
-	LIST_HEAD(, bpf_d)	bif_dlist;	/* descriptor list */
-#ifdef BPF_INTERNAL
-	u_int bif_dlt;				/* link layer type */
-	u_int bif_hdrlen;		/* length of link header */
-	struct ifnet *bif_ifp;		/* corresponding interface */
-	struct rwlock bif_lock;		/* interface lock */
-	LIST_HEAD(, bpf_d)	bif_wlist;	/* writer-only list */
-	int flags;			/* Interface flags */
-#endif
-};
-
-void	 bpf_bufheld(struct bpf_d *d);
-int	 bpf_validate(const struct bpf_insn *, int);
-void	 bpf_tap(struct bpf_if *, u_char *, u_int);
-void	 bpf_mtap(struct bpf_if *, struct mbuf *);
-void	 bpf_mtap2(struct bpf_if *, void *, u_int, struct mbuf *);
-void	 bpfattach(struct ifnet *, u_int, u_int);
-void	 bpfattach2(struct ifnet *, u_int, u_int, struct bpf_if **);
-void	 bpfdetach(struct ifnet *);
-
-void	 bpfilterattach(int);
-u_int	 bpf_filter(const struct bpf_insn *, u_char *, u_int, u_int);
-
-static __inline int
-bpf_peers_present(struct bpf_if *bpf)
-{
-
-	if (!LIST_EMPTY(&bpf->bif_dlist))
-		return (1);
-	return (0);
-}
-
-#define	BPF_TAP(_ifp,_pkt,_pktlen) do {				\
-	if (bpf_peers_present((_ifp)->if_bpf))			\
-		bpf_tap((_ifp)->if_bpf, (_pkt), (_pktlen));	\
-} while (0)
-#define	BPF_MTAP(_ifp,_m) do {					\
-	if (bpf_peers_present((_ifp)->if_bpf)) {		\
-		M_ASSERTVALID(_m);				\
-		bpf_mtap((_ifp)->if_bpf, (_m));			\
-	}							\
-} while (0)
-#define	BPF_MTAP2(_ifp,_data,_dlen,_m) do {			\
-	if (bpf_peers_present((_ifp)->if_bpf)) {		\
-		M_ASSERTVALID(_m);				\
-		bpf_mtap2((_ifp)->if_bpf,(_data),(_dlen),(_m));	\
-	}							\
-} while (0)
-#endif
-
-/*
- * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
- */
-#define BPF_MEMWORDS 16
-
-#endif /* _NET_BPF_H_ */
diff --git a/include.new/net/bpf_buffer.h b/include.new/net/bpf_buffer.h
deleted file mode 100644
index 9f03a10..0000000
--- a/include.new/net/bpf_buffer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2007 Seccuris Inc.
- * All rights reserved.
- *
- * This software was developed by Robert N. M. Watson under contract to
- * Seccuris Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/net/bpf_buffer.h 235746 2012-05-21 22:19:19Z melifaro $
- */
-
-#ifndef _NET_BPF_BUFFER_H_
-#define	_NET_BPF_BUFFER_H_
-
-#ifndef _KERNEL
-#error "no user-serviceable parts inside"
-#endif
-
-void	bpf_buffer_append_bytes(struct bpf_d *d, caddr_t buf, u_int offset,
-	    void *src, u_int len);
-void	bpf_buffer_append_mbuf(struct bpf_d *d, caddr_t buf, u_int offset,
-	    void *src, u_int len);
-void	bpf_buffer_free(struct bpf_d *d);
-void	bpf_buffer_init(struct bpf_d *d);
-int	bpf_buffer_ioctl_sblen(struct bpf_d *d, u_int *i);
-int	bpf_buffer_uiomove(struct bpf_d *d, caddr_t buf, u_int len,
-	    struct uio *uio);
-
-#endif /* !_NET_BPF_BUFFER_H_ */
diff --git a/include.new/net/bpf_compat.h b/include.new/net/bpf_compat.h
deleted file mode 100644
index f92ee09..0000000
--- a/include.new/net/bpf_compat.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- *	@(#)bpf_compat.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/bpf_compat.h,v 1.12 2004/04/07 20:46:11 imp Exp $
- */
-
-#ifndef _NET_BPF_COMPAT_H_
-#define _NET_BPF_COMPAT_H_
-
-/*
- * Some hacks for compatibility across SunOS and 4.4BSD.  We emulate malloc
- * and free with mbuf clusters.  We store a pointer to the mbuf in the first
- * word of the mbuf and return 8 bytes past the start of data (for double
- * word alignment).  We cannot just use offsets because clusters are not at
- * a fixed offset from the associated mbuf.  Sorry for this kludge.
- */
-#define malloc(size, type, canwait)				\
-bpf_alloc(size, (canwait & M_NOWAIT) ? M_DONTWAIT : M_TRYWAIT)
-
-#define free(cp, type) m_free(*(struct mbuf **)(cp - 8))
-
-/* This mapping works for our purposes. */
-#define ERESTART EINTR
-
-#endif
diff --git a/include.new/net/bpf_jitter.h b/include.new/net/bpf_jitter.h
deleted file mode 100644
index 512e2f7..0000000
--- a/include.new/net/bpf_jitter.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (C) 2002-2003 NetGroup, Politecnico di Torino (Italy)
- * Copyright (C) 2005-2009 Jung-uk Kim <jkim@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. Neither the name of the Politecnico di Torino 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 COPYRIGHT HOLDERS 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 COPYRIGHT
- * OWNER 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: releng/10.2/sys/net/bpf_jitter.h 199603 2009-11-20 18:49:20Z jkim $
- */
-
-#ifndef _NET_BPF_JITTER_H_
-#define _NET_BPF_JITTER_H_
-
-#ifdef _KERNEL
-MALLOC_DECLARE(M_BPFJIT);
-#endif
-
-extern int bpf_jitter_enable;
-
-/*
- * Prototype of a filtering function created by the jitter.
- *
- * The syntax and the meaning of the parameters is analogous to the one of
- * bpf_filter(). Notice that the filter is not among the parameters because
- * it is hardwired in the function.
- */
-typedef u_int (*bpf_filter_func)(u_char *, u_int, u_int);
-
-/* Structure describing a native filtering program created by the jitter. */
-typedef struct bpf_jit_filter {
-	/* The native filtering binary, in the form of a bpf_filter_func. */
-	bpf_filter_func	func;
-	size_t		size;
-} bpf_jit_filter;
-
-/*
- * BPF jitter, builds a machine function from a BPF program.
- *
- * param fp	The BPF pseudo-assembly filter that will be translated
- *		into native code.
- * param nins	Number of instructions of the input filter.
- * return	The bpf_jit_filter structure containing the native filtering
- *		binary.
- *
- * bpf_jitter allocates the buffers for the new native filter and
- * then translates the program pointed by fp calling bpf_jit_compile().
- */
-bpf_jit_filter	*bpf_jitter(struct bpf_insn *fp, int nins);
-
-/*
- * Deletes a filtering function that was previously created by bpf_jitter().
- *
- * param filter	The filter to destroy.
- *
- * This function frees the variuos buffers (code, memory, etc.) associated
- * with a filtering function.
- */
-void		bpf_destroy_jit_filter(bpf_jit_filter *filter);
-
-#endif	/* _NET_BPF_JITTER_H_ */
diff --git a/include.new/net/bpf_zerocopy.h b/include.new/net/bpf_zerocopy.h
deleted file mode 100644
index c977d37..0000000
--- a/include.new/net/bpf_zerocopy.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2007 Seccuris Inc.
- * All rights reserved.
- *
- * This software was developed by Robert N. M. Watson under contract to
- * Seccuris Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/net/bpf_zerocopy.h 230108 2012-01-14 17:07:52Z eadler $
- */
-
-#ifndef _NET_BPF_ZEROCOPY_H_
-#define	_NET_BPF_ZEROCOPY_H_
-
-#ifndef _KERNEL
-#error "no user-serviceable parts inside"
-#endif
-
-void	bpf_zerocopy_append_bytes(struct bpf_d *d, caddr_t buf, u_int offset,
-	    void *src, u_int len);
-void	bpf_zerocopy_append_mbuf(struct bpf_d *d, caddr_t buf, u_int offset,
-	    void *src, u_int len);
-void	bpf_zerocopy_buffull(struct bpf_d *);
-void	bpf_zerocopy_bufheld(struct bpf_d *);
-void	bpf_zerocopy_buf_reclaimed(struct bpf_d *);
-int	bpf_zerocopy_canfreebuf(struct bpf_d *);
-int	bpf_zerocopy_canwritebuf(struct bpf_d *);
-void	bpf_zerocopy_free(struct bpf_d *d);
-int	bpf_zerocopy_ioctl_getzmax(struct thread *td, struct bpf_d *d,
-	    size_t *i);
-int	bpf_zerocopy_ioctl_rotzbuf(struct thread *td, struct bpf_d *d,
-	    struct bpf_zbuf *bz);
-int	bpf_zerocopy_ioctl_setzbuf(struct thread *td, struct bpf_d *d,
-	    struct bpf_zbuf *bz);
-
-#endif /* !_NET_BPF_ZEROCOPY_H_ */
diff --git a/include.new/net/bpfdesc.h b/include.new/net/bpfdesc.h
deleted file mode 100644
index 571a272..0000000
--- a/include.new/net/bpfdesc.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence
- * Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *      @(#)bpfdesc.h	8.1 (Berkeley) 6/10/93
- *
- * $FreeBSD: releng/10.2/sys/net/bpfdesc.h 244090 2012-12-10 16:14:44Z ghelmer $
- */
-
-#ifndef _NET_BPFDESC_H_
-#define _NET_BPFDESC_H_
-
-#include <sys/callout.h>
-#include <sys/selinfo.h>
-#include <sys/queue.h>
-#include <sys/conf.h>
-#include <net/if.h>
-
-/*
- * Descriptor associated with each open bpf file.
- */
-struct zbuf;
-struct bpf_d {
-	LIST_ENTRY(bpf_d) bd_next;	/* Linked list of descriptors */
-	/*
-	 * Buffer slots: two memory buffers store the incoming packets.
-	 *   The model has three slots.  Sbuf is always occupied.
-	 *   sbuf (store) - Receive interrupt puts packets here.
-	 *   hbuf (hold) - When sbuf is full, put buffer here and
-	 *                 wakeup read (replace sbuf with fbuf).
-	 *   fbuf (free) - When read is done, put buffer here.
-	 * On receiving, if sbuf is full and fbuf is 0, packet is dropped.
-	 */
-	caddr_t		bd_sbuf;	/* store slot */
-	caddr_t		bd_hbuf;	/* hold slot */
-	caddr_t		bd_fbuf;	/* free slot */
-	int		bd_hbuf_in_use;	/* don't rotate buffers */
-	int 		bd_slen;	/* current length of store buffer */
-	int 		bd_hlen;	/* current length of hold buffer */
-
-	int		bd_bufsize;	/* absolute length of buffers */
-
-	struct bpf_if *	bd_bif;		/* interface descriptor */
-	u_long		bd_rtout;	/* Read timeout in 'ticks' */
-	struct bpf_insn *bd_rfilter; 	/* read filter code */
-	struct bpf_insn *bd_wfilter;	/* write filter code */
-	void		*bd_bfilter;	/* binary filter code */
-	u_int64_t	bd_rcount;	/* number of packets received */
-	u_int64_t	bd_dcount;	/* number of packets dropped */
-
-	u_char		bd_promisc;	/* true if listening promiscuously */
-	u_char		bd_state;	/* idle, waiting, or timed out */
-	u_char		bd_immediate;	/* true to return on packet arrival */
-	u_char		bd_writer;	/* non-zero if d is writer-only */
-	int		bd_hdrcmplt;	/* false to fill in src lladdr automatically */
-	int		bd_direction;	/* select packet direction */
-	int		bd_tstamp;	/* select time stamping function */
-	int		bd_feedback;	/* true to feed back sent packets */
-	int		bd_async;	/* non-zero if packet reception should generate signal */
-	int		bd_sig;		/* signal to send upon packet reception */
-	struct sigio *	bd_sigio;	/* information for async I/O */
-	struct selinfo	bd_sel;		/* bsd select info */
-	struct mtx	bd_lock;	/* per-descriptor lock */
-	struct callout	bd_callout;	/* for BPF timeouts with select */
-	struct label	*bd_label;	/* MAC label for descriptor */
-	u_int64_t	bd_fcount;	/* number of packets which matched filter */
-	pid_t		bd_pid;		/* PID which created descriptor */
-	int		bd_locked;	/* true if descriptor is locked */
-	u_int		bd_bufmode;	/* Current buffer mode. */
-	u_int64_t	bd_wcount;	/* number of packets written */
-	u_int64_t	bd_wfcount;	/* number of packets that matched write filter */
-	u_int64_t	bd_wdcount;	/* number of packets dropped during a write */
-	u_int64_t	bd_zcopy;	/* number of zero copy operations */
-	u_char		bd_compat32;	/* 32-bit stream on LP64 system */
-};
-
-/* Values for bd_state */
-#define BPF_IDLE	0		/* no select in progress */
-#define BPF_WAITING	1		/* waiting for read timeout in select */
-#define BPF_TIMED_OUT	2		/* read timeout has expired in select */
-
-#define BPFD_LOCK(bd)		mtx_lock(&(bd)->bd_lock)
-#define BPFD_UNLOCK(bd)		mtx_unlock(&(bd)->bd_lock)
-#define BPFD_LOCK_ASSERT(bd)	mtx_assert(&(bd)->bd_lock, MA_OWNED)
-
-#define BPF_PID_REFRESH(bd, td)	(bd)->bd_pid = (td)->td_proc->p_pid
-#define BPF_PID_REFRESH_CUR(bd)	(bd)->bd_pid = curthread->td_proc->p_pid
-
-#define BPF_LOCK()		mtx_lock(&bpf_mtx)
-#define BPF_UNLOCK()		mtx_unlock(&bpf_mtx)
-#define BPF_LOCK_ASSERT()	mtx_assert(&bpf_mtx, MA_OWNED)
-/*
- * External representation of the bpf descriptor
- */
-struct xbpf_d {
-	u_int		bd_structsize;	/* Size of this structure. */
-	u_char		bd_promisc;
-	u_char		bd_immediate;
-	u_char		__bd_pad[6];
-	int		bd_hdrcmplt;
-	int		bd_direction;
-	int		bd_feedback;
-	int		bd_async;
-	u_int64_t	bd_rcount;
-	u_int64_t	bd_dcount;
-	u_int64_t	bd_fcount;
-	int		bd_sig;
-	int		bd_slen;
-	int		bd_hlen;
-	int		bd_bufsize;
-	pid_t		bd_pid;
-	char		bd_ifname[IFNAMSIZ];
-	int		bd_locked;
-	u_int64_t	bd_wcount;
-	u_int64_t	bd_wfcount;
-	u_int64_t	bd_wdcount;
-	u_int64_t	bd_zcopy;
-	int		bd_bufmode;
-	/*
-	 * Allocate 4 64 bit unsigned integers for future expansion so we do
-	 * not have to worry about breaking the ABI.
-	 */
-	u_int64_t	bd_spare[4];
-};
-
-#define BPFIF_RLOCK(bif)	rw_rlock(&(bif)->bif_lock)
-#define BPFIF_RUNLOCK(bif)	rw_runlock(&(bif)->bif_lock)
-#define BPFIF_WLOCK(bif)	rw_wlock(&(bif)->bif_lock)
-#define BPFIF_WUNLOCK(bif)	rw_wunlock(&(bif)->bif_lock)
-
-#define BPFIF_FLAG_DYING	1	/* Reject new bpf consumers */
-
-#endif
diff --git a/include.new/net/bridge.h b/include.new/net/bridge.h
deleted file mode 100644
index d312cf3..0000000
--- a/include.new/net/bridge.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * Copyright (c) 1998-2002 Luigi Rizzo
- *
- * Work partly supported by: Cisco Systems, Inc. - NSITE lab, RTP, NC
- *
- * 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.
- *
- * 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.
- *
- * $FreeBSD: src/sys/net/bridge.h,v 1.15 2005/06/10 16:49:18 brooks Exp $
- */
-
-extern int do_bridge;
-
-/*
- * We need additional per-interface info for the bridge, which is
- * stored in a struct bdg_softc. The ifp2sc[] array provides a pointer
- * to this struct using the if_index as a mapping key.
- * bdg_softc has a backpointer to the struct ifnet, the bridge
- * flags, and a cluster (bridging occurs only between port of the
- * same cluster).
- */
-
-struct cluster_softc;	/* opaque here, defined in bridge.c */
-
-struct bdg_softc {
-    struct ifnet *ifp ;
-    int flags ;
-#define IFF_BDG_PROMISC 0x0001  /* set promisc mode on this if.	*/
-#define IFF_MUTE        0x0002  /* mute this if for bridging.   */
-#define IFF_USED        0x0004  /* use this if for bridging.    */
-    struct cluster_softc *cluster;
-} ;
-
-extern struct bdg_softc *ifp2sc;
-
-#define BDG_USED(ifp) (ifp2sc[ifp->if_index].flags & IFF_USED)
-/*
- * BDG_ACTIVE(ifp) does all checks to see if bridging is enabled, loaded,
- * and used on a given interface.
- */
-#define	BDG_ACTIVE(ifp)	(do_bridge && BDG_LOADED && BDG_USED(ifp))
-
-/*
- * The following constants are not legal ifnet pointers, and are used
- * as return values from the classifier, bridge_dst_lookup().
- * The same values are used as index in the statistics arrays,
- * with BDG_FORWARD replacing specifically forwarded packets.
- *
- * These constants are here because they are used in 'netstat'
- * to show bridge statistics.
- */
-#define BDG_BCAST	( (struct ifnet *)1 )
-#define BDG_MCAST	( (struct ifnet *)2 )
-#define BDG_LOCAL	( (struct ifnet *)3 )
-#define BDG_DROP	( (struct ifnet *)4 )
-#define BDG_UNKNOWN	( (struct ifnet *)5 )
-#define BDG_IN		( (struct ifnet *)7 )
-#define BDG_OUT		( (struct ifnet *)8 )
-#define BDG_FORWARD	( (struct ifnet *)9 )
-
-/*
- * Statistics are passed up with the sysctl interface, "netstat -p bdg"
- * reads them. PF_BDG defines the 'bridge' protocol family.
- */
-
-#define PF_BDG 3 /* XXX superhack */
-
-#define STAT_MAX (int)BDG_FORWARD
-struct bdg_port_stat {
-    char name[16];
-    u_long collisions;
-    u_long p_in[STAT_MAX+1];
-} ;
-
-/* XXX this should be made dynamic */
-#define BDG_MAX_PORTS 128
-struct bdg_stats {
-    struct bdg_port_stat s[BDG_MAX_PORTS];
-} ;
-
-
-#define BDG_STAT(ifp, type) bdg_stats.s[ifp->if_index].p_in[(uintptr_t)type]++ 
- 
-#ifdef _KERNEL
-typedef	struct mbuf *bridge_in_t(struct ifnet *, struct mbuf *);
-/* bdg_forward frees the mbuf if necessary, returning null */
-typedef	struct mbuf *bdg_forward_t(struct mbuf *, struct ifnet *);
-typedef	void bdgtakeifaces_t(void);
-extern	bridge_in_t *bridge_in_ptr;
-extern	bdg_forward_t *bdg_forward_ptr;
-extern	bdgtakeifaces_t *bdgtakeifaces_ptr;
-
-#define	BDG_LOADED	(bdgtakeifaces_ptr != NULL)
-#endif /* KERNEL */
diff --git a/include.new/net/bridgestp.h b/include.new/net/bridgestp.h
deleted file mode 100644
index 2b79dd7..0000000
--- a/include.new/net/bridgestp.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*	$NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $	*/
-
-/*
- * Copyright 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * 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 for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
- * 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.
- */
-
-/*
- * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
- * 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 Jason L. Wright
- * 4. 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 ``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 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.
- *
- * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp
- *
- * $FreeBSD: releng/10.2/sys/net/bridgestp.h 234488 2012-04-20 10:06:28Z thompsa $
- */
-
-/*
- * Data structure and control definitions for STP interfaces.
- */
-
-#include <sys/callout.h>
-#include <sys/queue.h>
-
-/* STP port states */
-#define	BSTP_IFSTATE_DISABLED	0
-#define	BSTP_IFSTATE_LISTENING	1
-#define	BSTP_IFSTATE_LEARNING	2
-#define	BSTP_IFSTATE_FORWARDING	3
-#define	BSTP_IFSTATE_BLOCKING	4
-#define	BSTP_IFSTATE_DISCARDING	5
-
-#define	BSTP_TCSTATE_ACTIVE	1
-#define	BSTP_TCSTATE_DETECTED	2
-#define	BSTP_TCSTATE_INACTIVE	3
-#define	BSTP_TCSTATE_LEARNING	4
-#define	BSTP_TCSTATE_PROPAG	5
-#define	BSTP_TCSTATE_ACK	6
-#define	BSTP_TCSTATE_TC		7
-#define	BSTP_TCSTATE_TCN	8
-
-#define	BSTP_ROLE_DISABLED	0
-#define	BSTP_ROLE_ROOT		1
-#define	BSTP_ROLE_DESIGNATED	2
-#define	BSTP_ROLE_ALTERNATE	3
-#define	BSTP_ROLE_BACKUP	4
-
-#ifdef _KERNEL
-
-/* STP port flags */
-#define	BSTP_PORT_CANMIGRATE	0x0001
-#define	BSTP_PORT_NEWINFO	0x0002
-#define	BSTP_PORT_DISPUTED	0x0004
-#define	BSTP_PORT_ADMCOST	0x0008
-#define	BSTP_PORT_AUTOEDGE	0x0010
-#define	BSTP_PORT_AUTOPTP	0x0020
-#define	BSTP_PORT_ADMEDGE	0x0040
-#define	BSTP_PORT_PNDCOST	0x0080
-
-/* BPDU priority */
-#define	BSTP_PDU_SUPERIOR	1
-#define	BSTP_PDU_REPEATED	2
-#define	BSTP_PDU_INFERIOR	3
-#define	BSTP_PDU_INFERIORALT	4
-#define	BSTP_PDU_OTHER		5
-
-/* BPDU flags */
-#define	BSTP_PDU_PRMASK		0x0c		/* Port Role */
-#define	BSTP_PDU_PRSHIFT	2		/* Port Role offset */
-#define	BSTP_PDU_F_UNKN		0x00		/* Unknown port    (00) */
-#define	BSTP_PDU_F_ALT		0x01		/* Alt/Backup port (01) */
-#define	BSTP_PDU_F_ROOT		0x02		/* Root port       (10) */
-#define	BSTP_PDU_F_DESG		0x03		/* Designated port (11) */
-
-#define	BSTP_PDU_STPMASK	0x81		/* strip unused STP flags */
-#define	BSTP_PDU_RSTPMASK	0x7f		/* strip unused RSTP flags */
-#define	BSTP_PDU_F_TC		0x01		/* Topology change */
-#define	BSTP_PDU_F_P		0x02		/* Proposal flag */
-#define	BSTP_PDU_F_L		0x10		/* Learning flag */
-#define	BSTP_PDU_F_F		0x20		/* Forwarding flag */
-#define	BSTP_PDU_F_A		0x40		/* Agreement flag */
-#define	BSTP_PDU_F_TCA		0x80		/* Topology change ack */
-
-/*
- * Spanning tree defaults.
- */
-#define	BSTP_DEFAULT_MAX_AGE		(20 * 256)
-#define	BSTP_DEFAULT_HELLO_TIME		(2 * 256)
-#define	BSTP_DEFAULT_FORWARD_DELAY	(15 * 256)
-#define	BSTP_DEFAULT_HOLD_TIME		(1 * 256)
-#define	BSTP_DEFAULT_MIGRATE_DELAY	(3 * 256)
-#define	BSTP_DEFAULT_HOLD_COUNT		6
-#define	BSTP_DEFAULT_BRIDGE_PRIORITY	0x8000
-#define	BSTP_DEFAULT_PORT_PRIORITY	0x80
-#define	BSTP_DEFAULT_PATH_COST		55
-#define	BSTP_MIN_HELLO_TIME		(1 * 256)
-#define	BSTP_MIN_MAX_AGE		(6 * 256)
-#define	BSTP_MIN_FORWARD_DELAY		(4 * 256)
-#define	BSTP_MIN_HOLD_COUNT		1
-#define	BSTP_MAX_HELLO_TIME		(2 * 256)
-#define	BSTP_MAX_MAX_AGE		(40 * 256)
-#define	BSTP_MAX_FORWARD_DELAY		(30 * 256)
-#define	BSTP_MAX_HOLD_COUNT		10
-#define	BSTP_MAX_PRIORITY		61440
-#define	BSTP_MAX_PORT_PRIORITY		240
-#define	BSTP_MAX_PATH_COST		200000000
-
-/* BPDU message types */
-#define	BSTP_MSGTYPE_CFG	0x00		/* Configuration */
-#define	BSTP_MSGTYPE_RSTP	0x02		/* Rapid STP */
-#define	BSTP_MSGTYPE_TCN	0x80		/* Topology chg notification */
-
-/* Protocol versions */
-#define	BSTP_PROTO_ID		0x00
-#define	BSTP_PROTO_STP		0x00
-#define	BSTP_PROTO_RSTP		0x02
-#define	BSTP_PROTO_MAX		BSTP_PROTO_RSTP
-
-#define	BSTP_INFO_RECEIVED	1
-#define	BSTP_INFO_MINE		2
-#define	BSTP_INFO_AGED		3
-#define	BSTP_INFO_DISABLED	4
-
-
-#define	BSTP_MESSAGE_AGE_INCR	(1 * 256)	/* in 256ths of a second */
-#define	BSTP_TICK_VAL		(1 * 256)	/* in 256ths of a second */
-#define	BSTP_LINK_TIMER		(BSTP_TICK_VAL * 15)
-
-/*
- * Driver callbacks for STP state changes
- */
-typedef void (*bstp_state_cb_t)(struct ifnet *, int);
-typedef void (*bstp_rtage_cb_t)(struct ifnet *, int);
-struct bstp_cb_ops {
-	bstp_state_cb_t	bcb_state;
-	bstp_rtage_cb_t	bcb_rtage;
-};
-
-/*
- * Because BPDU's do not make nicely aligned structures, two different
- * declarations are used: bstp_?bpdu (wire representation, packed) and
- * bstp_*_unit (internal, nicely aligned version).
- */
-
-/* configuration bridge protocol data unit */
-struct bstp_cbpdu {
-	uint8_t		cbu_dsap;		/* LLC: destination sap */
-	uint8_t		cbu_ssap;		/* LLC: source sap */
-	uint8_t		cbu_ctl;		/* LLC: control */
-	uint16_t	cbu_protoid;		/* protocol id */
-	uint8_t		cbu_protover;		/* protocol version */
-	uint8_t		cbu_bpdutype;		/* message type */
-	uint8_t		cbu_flags;		/* flags (below) */
-
-	/* root id */
-	uint16_t	cbu_rootpri;		/* root priority */
-	uint8_t		cbu_rootaddr[6];	/* root address */
-
-	uint32_t	cbu_rootpathcost;	/* root path cost */
-
-	/* bridge id */
-	uint16_t	cbu_bridgepri;		/* bridge priority */
-	uint8_t		cbu_bridgeaddr[6];	/* bridge address */
-
-	uint16_t	cbu_portid;		/* port id */
-	uint16_t	cbu_messageage;		/* current message age */
-	uint16_t	cbu_maxage;		/* maximum age */
-	uint16_t	cbu_hellotime;		/* hello time */
-	uint16_t	cbu_forwarddelay;	/* forwarding delay */
-	uint8_t		cbu_versionlen;		/* version 1 length */
-} __packed;
-#define	BSTP_BPDU_STP_LEN	(3 + 35)	/* LLC + STP pdu */
-#define	BSTP_BPDU_RSTP_LEN	(3 + 36)	/* LLC + RSTP pdu */
-
-/* topology change notification bridge protocol data unit */
-struct bstp_tbpdu {
-	uint8_t		tbu_dsap;		/* LLC: destination sap */
-	uint8_t		tbu_ssap;		/* LLC: source sap */
-	uint8_t		tbu_ctl;		/* LLC: control */
-	uint16_t	tbu_protoid;		/* protocol id */
-	uint8_t		tbu_protover;		/* protocol version */
-	uint8_t		tbu_bpdutype;		/* message type */
-} __packed;
-
-/*
- * Timekeeping structure used in spanning tree code.
- */
-struct bstp_timer {
-	int		active;
-	int		latched;
-	int		value;
-};
-
-struct bstp_pri_vector {
-	uint64_t		pv_root_id;
-	uint32_t		pv_cost;
-	uint64_t		pv_dbridge_id;
-	uint16_t		pv_dport_id;
-	uint16_t		pv_port_id;
-};
-
-struct bstp_config_unit {
-	struct bstp_pri_vector	cu_pv;
-	uint16_t	cu_message_age;
-	uint16_t	cu_max_age;
-	uint16_t	cu_forward_delay;
-	uint16_t	cu_hello_time;
-	uint8_t		cu_message_type;
-	uint8_t		cu_topology_change_ack;
-	uint8_t		cu_topology_change;
-	uint8_t		cu_proposal;
-	uint8_t		cu_agree;
-	uint8_t		cu_learning;
-	uint8_t		cu_forwarding;
-	uint8_t		cu_role;
-};
-
-struct bstp_tcn_unit {
-	uint8_t		tu_message_type;
-};
-
-struct bstp_port {
-	LIST_ENTRY(bstp_port)	bp_next;
-	struct ifnet		*bp_ifp;	/* parent if */
-	struct bstp_state	*bp_bs;
-	uint8_t			bp_active;
-	uint8_t			bp_protover;
-	uint32_t		bp_flags;
-	uint32_t		bp_path_cost;
-	uint16_t		bp_port_msg_age;
-	uint16_t		bp_port_max_age;
-	uint16_t		bp_port_fdelay;
-	uint16_t		bp_port_htime;
-	uint16_t		bp_desg_msg_age;
-	uint16_t		bp_desg_max_age;
-	uint16_t		bp_desg_fdelay;
-	uint16_t		bp_desg_htime;
-	struct bstp_timer	bp_edge_delay_timer;
-	struct bstp_timer	bp_forward_delay_timer;
-	struct bstp_timer	bp_hello_timer;
-	struct bstp_timer	bp_message_age_timer;
-	struct bstp_timer	bp_migrate_delay_timer;
-	struct bstp_timer	bp_recent_backup_timer;
-	struct bstp_timer	bp_recent_root_timer;
-	struct bstp_timer	bp_tc_timer;
-	struct bstp_config_unit bp_msg_cu;
-	struct bstp_pri_vector	bp_desg_pv;
-	struct bstp_pri_vector	bp_port_pv;
-	uint16_t		bp_port_id;
-	uint8_t			bp_state;
-	uint8_t			bp_tcstate;
-	uint8_t			bp_role;
-	uint8_t			bp_infois;
-	uint8_t			bp_tc_ack;
-	uint8_t			bp_tc_prop;
-	uint8_t			bp_fdbflush;
-	uint8_t			bp_priority;
-	uint8_t			bp_ptp_link;
-	uint8_t			bp_agree;
-	uint8_t			bp_agreed;
-	uint8_t			bp_sync;
-	uint8_t			bp_synced;
-	uint8_t			bp_proposing;
-	uint8_t			bp_proposed;
-	uint8_t			bp_operedge;
-	uint8_t			bp_reroot;
-	uint8_t			bp_rcvdtc;
-	uint8_t			bp_rcvdtca;
-	uint8_t			bp_rcvdtcn;
-	uint32_t		bp_forward_transitions;
-	uint8_t			bp_txcount;
-	struct task		bp_statetask;
-	struct task		bp_rtagetask;
-	struct task		bp_mediatask;
-};
-
-/*
- * Software state for each bridge STP.
- */
-struct bstp_state {
-	LIST_ENTRY(bstp_state)	bs_list;
-	uint8_t			bs_running;
-	struct mtx		bs_mtx;
-	struct bstp_pri_vector	bs_bridge_pv;
-	struct bstp_pri_vector	bs_root_pv;
-	struct bstp_port	*bs_root_port;
-	uint8_t			bs_protover;
-	uint16_t		bs_migration_delay;
-	uint16_t		bs_edge_delay;
-	uint16_t		bs_bridge_max_age;
-	uint16_t		bs_bridge_fdelay;
-	uint16_t		bs_bridge_htime;
-	uint16_t		bs_root_msg_age;
-	uint16_t		bs_root_max_age;
-	uint16_t		bs_root_fdelay;
-	uint16_t		bs_root_htime;
-	uint16_t		bs_hold_time;
-	uint16_t		bs_bridge_priority;
-	uint8_t			bs_txholdcount;
-	uint8_t			bs_allsynced;
-	struct callout		bs_bstpcallout;	/* STP callout */
-	struct bstp_timer	bs_link_timer;
-	struct timeval		bs_last_tc_time;
-	LIST_HEAD(, bstp_port)	bs_bplist;
-	bstp_state_cb_t		bs_state_cb;
-	bstp_rtage_cb_t		bs_rtage_cb;
-	struct vnet		*bs_vnet;
-};
-
-#define	BSTP_LOCK_INIT(_bs)	mtx_init(&(_bs)->bs_mtx, "bstp", NULL, MTX_DEF)
-#define	BSTP_LOCK_DESTROY(_bs)	mtx_destroy(&(_bs)->bs_mtx)
-#define	BSTP_LOCK(_bs)		mtx_lock(&(_bs)->bs_mtx)
-#define	BSTP_UNLOCK(_bs)	mtx_unlock(&(_bs)->bs_mtx)
-#define	BSTP_LOCK_ASSERT(_bs)	mtx_assert(&(_bs)->bs_mtx, MA_OWNED)
-
-extern const uint8_t bstp_etheraddr[];
-
-void	bstp_attach(struct bstp_state *, struct bstp_cb_ops *);
-void	bstp_detach(struct bstp_state *);
-void	bstp_init(struct bstp_state *);
-void	bstp_stop(struct bstp_state *);
-int	bstp_create(struct bstp_state *, struct bstp_port *, struct ifnet *);
-int	bstp_enable(struct bstp_port *);
-void	bstp_disable(struct bstp_port *);
-void	bstp_destroy(struct bstp_port *);
-void	bstp_linkstate(struct bstp_port *);
-int	bstp_set_htime(struct bstp_state *, int);
-int	bstp_set_fdelay(struct bstp_state *, int);
-int	bstp_set_maxage(struct bstp_state *, int);
-int	bstp_set_holdcount(struct bstp_state *, int);
-int	bstp_set_protocol(struct bstp_state *, int);
-int	bstp_set_priority(struct bstp_state *, int);
-int	bstp_set_port_priority(struct bstp_port *, int);
-int	bstp_set_path_cost(struct bstp_port *, uint32_t);
-int	bstp_set_edge(struct bstp_port *, int);
-int	bstp_set_autoedge(struct bstp_port *, int);
-int	bstp_set_ptp(struct bstp_port *, int);
-int	bstp_set_autoptp(struct bstp_port *, int);
-void	bstp_input(struct bstp_port *, struct ifnet *, struct mbuf *);
-
-#endif /* _KERNEL */
diff --git a/include.new/net/ethernet.h b/include.new/net/ethernet.h
deleted file mode 100644
index 11ff136..0000000
--- a/include.new/net/ethernet.h
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * Fundamental constants relating to ethernet.
- *
- * $FreeBSD: releng/10.2/sys/net/ethernet.h 249925 2013-04-26 12:50:32Z glebius $
- *
- */
-
-#ifndef _NET_ETHERNET_H_
-#define _NET_ETHERNET_H_
-
-/*
- * Some basic Ethernet constants.
- */
-#define	ETHER_ADDR_LEN		6	/* length of an Ethernet address */
-#define	ETHER_TYPE_LEN		2	/* length of the Ethernet type field */
-#define	ETHER_CRC_LEN		4	/* length of the Ethernet CRC */
-#define	ETHER_HDR_LEN		(ETHER_ADDR_LEN*2+ETHER_TYPE_LEN)
-#define	ETHER_MIN_LEN		64	/* minimum frame len, including CRC */
-#define	ETHER_MAX_LEN		1518	/* maximum frame len, including CRC */
-#define	ETHER_MAX_LEN_JUMBO	9018	/* max jumbo frame len, including CRC */
-
-#define	ETHER_VLAN_ENCAP_LEN	4	/* len of 802.1Q VLAN encapsulation */
-/*
- * Mbuf adjust factor to force 32-bit alignment of IP header.
- * Drivers should do m_adj(m, ETHER_ALIGN) when setting up a
- * receive so the upper layers get the IP header properly aligned
- * past the 14-byte Ethernet header.
- */
-#define	ETHER_ALIGN		2	/* driver adjust for IP hdr alignment */
-
-/*
- * Compute the maximum frame size based on ethertype (i.e. possible
- * encapsulation) and whether or not an FCS is present.
- */
-#define	ETHER_MAX_FRAME(ifp, etype, hasfcs)				\
-	((ifp)->if_mtu + ETHER_HDR_LEN +				\
-	 ((hasfcs) ? ETHER_CRC_LEN : 0) +				\
-	 (((etype) == ETHERTYPE_VLAN) ? ETHER_VLAN_ENCAP_LEN : 0))
-
-/*
- * Ethernet-specific mbuf flags.
- */
-#define	M_HASFCS	M_PROTO5	/* FCS included at end of frame */
-
-/*
- * Ethernet CRC32 polynomials (big- and little-endian verions).
- */
-#define	ETHER_CRC_POLY_LE	0xedb88320
-#define	ETHER_CRC_POLY_BE	0x04c11db6
-
-/*
- * A macro to validate a length with
- */
-#define	ETHER_IS_VALID_LEN(foo)	\
-	((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
-
-/*
- * Structure of a 10Mb/s Ethernet header.
- */
-struct ether_header {
-	u_char	ether_dhost[ETHER_ADDR_LEN];
-	u_char	ether_shost[ETHER_ADDR_LEN];
-	u_short	ether_type;
-} __packed;
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct ether_addr {
-	u_char octet[ETHER_ADDR_LEN];
-} __packed;
-
-#define	ETHER_IS_MULTICAST(addr) (*(addr) & 0x01) /* is address mcast/bcast? */
-
-/*
- *  NOTE: 0x0000-0x05DC (0..1500) are generally IEEE 802.3 length fields.
- *  However, there are some conflicts.
- */
-
-#define	ETHERTYPE_8023		0x0004	/* IEEE 802.3 packet */
-		   /* 0x0101 .. 0x1FF	   Experimental */
-#define	ETHERTYPE_PUP		0x0200	/* Xerox PUP protocol - see 0A00 */
-#define	ETHERTYPE_PUPAT		0x0200	/* PUP Address Translation - see 0A01 */
-#define	ETHERTYPE_SPRITE	0x0500	/* ??? */
-			     /* 0x0400	   Nixdorf */
-#define	ETHERTYPE_NS		0x0600	/* XNS */
-#define	ETHERTYPE_NSAT		0x0601	/* XNS Address Translation (3Mb only) */
-#define	ETHERTYPE_DLOG1 	0x0660	/* DLOG (?) */
-#define	ETHERTYPE_DLOG2 	0x0661	/* DLOG (?) */
-#define	ETHERTYPE_IP		0x0800	/* IP protocol */
-#define	ETHERTYPE_X75		0x0801	/* X.75 Internet */
-#define	ETHERTYPE_NBS		0x0802	/* NBS Internet */
-#define	ETHERTYPE_ECMA		0x0803	/* ECMA Internet */
-#define	ETHERTYPE_CHAOS 	0x0804	/* CHAOSnet */
-#define	ETHERTYPE_X25		0x0805	/* X.25 Level 3 */
-#define	ETHERTYPE_ARP		0x0806	/* Address resolution protocol */
-#define	ETHERTYPE_NSCOMPAT	0x0807	/* XNS Compatibility */
-#define	ETHERTYPE_FRARP 	0x0808	/* Frame Relay ARP (RFC1701) */
-			     /* 0x081C	   Symbolics Private */
-		    /* 0x0888 - 0x088A	   Xyplex */
-#define	ETHERTYPE_UBDEBUG	0x0900	/* Ungermann-Bass network debugger */
-#define	ETHERTYPE_IEEEPUP	0x0A00	/* Xerox IEEE802.3 PUP */
-#define	ETHERTYPE_IEEEPUPAT	0x0A01	/* Xerox IEEE802.3 PUP Address Translation */
-#define	ETHERTYPE_VINES 	0x0BAD	/* Banyan VINES */
-#define	ETHERTYPE_VINESLOOP	0x0BAE	/* Banyan VINES Loopback */
-#define	ETHERTYPE_VINESECHO	0x0BAF	/* Banyan VINES Echo */
-
-/*		       0x1000 - 0x100F	   Berkeley Trailer */
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define	ETHERTYPE_TRAIL		0x1000	/* Trailer packet */
-#define	ETHERTYPE_NTRAILER	16
-
-#define	ETHERTYPE_DCA		0x1234	/* DCA - Multicast */
-#define	ETHERTYPE_VALID 	0x1600	/* VALID system protocol */
-#define	ETHERTYPE_DOGFIGHT	0x1989	/* Artificial Horizons ("Aviator" dogfight simulator [on Sun]) */
-#define	ETHERTYPE_RCL		0x1995	/* Datapoint Corporation (RCL lan protocol) */
-
-					/* The following 3C0x types
-					   are unregistered: */
-#define	ETHERTYPE_NBPVCD	0x3C00	/* 3Com NBP virtual circuit datagram (like XNS SPP) not registered */
-#define	ETHERTYPE_NBPSCD	0x3C01	/* 3Com NBP System control datagram not registered */
-#define	ETHERTYPE_NBPCREQ	0x3C02	/* 3Com NBP Connect request (virtual cct) not registered */
-#define	ETHERTYPE_NBPCRSP	0x3C03	/* 3Com NBP Connect response not registered */
-#define	ETHERTYPE_NBPCC		0x3C04	/* 3Com NBP Connect complete not registered */
-#define	ETHERTYPE_NBPCLREQ	0x3C05	/* 3Com NBP Close request (virtual cct) not registered */
-#define	ETHERTYPE_NBPCLRSP	0x3C06	/* 3Com NBP Close response not registered */
-#define	ETHERTYPE_NBPDG		0x3C07	/* 3Com NBP Datagram (like XNS IDP) not registered */
-#define	ETHERTYPE_NBPDGB	0x3C08	/* 3Com NBP Datagram broadcast not registered */
-#define	ETHERTYPE_NBPCLAIM	0x3C09	/* 3Com NBP Claim NetBIOS name not registered */
-#define	ETHERTYPE_NBPDLTE	0x3C0A	/* 3Com NBP Delete NetBIOS name not registered */
-#define	ETHERTYPE_NBPRAS	0x3C0B	/* 3Com NBP Remote adaptor status request not registered */
-#define	ETHERTYPE_NBPRAR	0x3C0C	/* 3Com NBP Remote adaptor response not registered */
-#define	ETHERTYPE_NBPRST	0x3C0D	/* 3Com NBP Reset not registered */
-
-#define	ETHERTYPE_PCS		0x4242	/* PCS Basic Block Protocol */
-#define	ETHERTYPE_IMLBLDIAG	0x424C	/* Information Modes Little Big LAN diagnostic */
-#define	ETHERTYPE_DIDDLE	0x4321	/* THD - Diddle */
-#define	ETHERTYPE_IMLBL		0x4C42	/* Information Modes Little Big LAN */
-#define	ETHERTYPE_SIMNET	0x5208	/* BBN Simnet Private */
-#define	ETHERTYPE_DECEXPER	0x6000	/* DEC Unassigned, experimental */
-#define	ETHERTYPE_MOPDL		0x6001	/* DEC MOP dump/load */
-#define	ETHERTYPE_MOPRC		0x6002	/* DEC MOP remote console */
-#define	ETHERTYPE_DECnet	0x6003	/* DEC DECNET Phase IV route */
-#define	ETHERTYPE_DN		ETHERTYPE_DECnet	/* libpcap, tcpdump */
-#define	ETHERTYPE_LAT		0x6004	/* DEC LAT */
-#define	ETHERTYPE_DECDIAG	0x6005	/* DEC diagnostic protocol (at interface initialization?) */
-#define	ETHERTYPE_DECCUST	0x6006	/* DEC customer protocol */
-#define	ETHERTYPE_SCA		0x6007	/* DEC LAVC, SCA */
-#define	ETHERTYPE_AMBER		0x6008	/* DEC AMBER */
-#define	ETHERTYPE_DECMUMPS	0x6009	/* DEC MUMPS */
-		    /* 0x6010 - 0x6014	   3Com Corporation */
-#define	ETHERTYPE_TRANSETHER	0x6558	/* Trans Ether Bridging (RFC1701)*/
-#define	ETHERTYPE_RAWFR		0x6559	/* Raw Frame Relay (RFC1701) */
-#define	ETHERTYPE_UBDL		0x7000	/* Ungermann-Bass download */
-#define	ETHERTYPE_UBNIU		0x7001	/* Ungermann-Bass NIUs */
-#define	ETHERTYPE_UBDIAGLOOP	0x7002	/* Ungermann-Bass diagnostic/loopback */
-#define	ETHERTYPE_UBNMC		0x7003	/* Ungermann-Bass ??? (NMC to/from UB Bridge) */
-#define	ETHERTYPE_UBBST		0x7005	/* Ungermann-Bass Bridge Spanning Tree */
-#define	ETHERTYPE_OS9		0x7007	/* OS/9 Microware */
-#define	ETHERTYPE_OS9NET	0x7009	/* OS/9 Net? */
-		    /* 0x7020 - 0x7029	   LRT (England) (now Sintrom) */
-#define	ETHERTYPE_RACAL		0x7030	/* Racal-Interlan */
-#define	ETHERTYPE_PRIMENTS	0x7031	/* Prime NTS (Network Terminal Service) */
-#define	ETHERTYPE_CABLETRON	0x7034	/* Cabletron */
-#define	ETHERTYPE_CRONUSVLN	0x8003	/* Cronus VLN */
-#define	ETHERTYPE_CRONUS	0x8004	/* Cronus Direct */
-#define	ETHERTYPE_HP		0x8005	/* HP Probe */
-#define	ETHERTYPE_NESTAR	0x8006	/* Nestar */
-#define	ETHERTYPE_ATTSTANFORD	0x8008	/* AT&T/Stanford (local use) */
-#define	ETHERTYPE_EXCELAN	0x8010	/* Excelan */
-#define	ETHERTYPE_SG_DIAG	0x8013	/* SGI diagnostic type */
-#define	ETHERTYPE_SG_NETGAMES	0x8014	/* SGI network games */
-#define	ETHERTYPE_SG_RESV	0x8015	/* SGI reserved type */
-#define	ETHERTYPE_SG_BOUNCE	0x8016	/* SGI bounce server */
-#define	ETHERTYPE_APOLLODOMAIN	0x8019	/* Apollo DOMAIN */
-#define	ETHERTYPE_TYMSHARE	0x802E	/* Tymeshare */
-#define	ETHERTYPE_TIGAN		0x802F	/* Tigan, Inc. */
-#define	ETHERTYPE_REVARP	0x8035	/* Reverse addr resolution protocol */
-#define	ETHERTYPE_AEONIC	0x8036	/* Aeonic Systems */
-#define	ETHERTYPE_IPXNEW	0x8037	/* IPX (Novell Netware?) */
-#define	ETHERTYPE_LANBRIDGE	0x8038	/* DEC LANBridge */
-#define	ETHERTYPE_DSMD	0x8039	/* DEC DSM/DDP */
-#define	ETHERTYPE_ARGONAUT	0x803A	/* DEC Argonaut Console */
-#define	ETHERTYPE_VAXELN	0x803B	/* DEC VAXELN */
-#define	ETHERTYPE_DECDNS	0x803C	/* DEC DNS Naming Service */
-#define	ETHERTYPE_ENCRYPT	0x803D	/* DEC Ethernet Encryption */
-#define	ETHERTYPE_DECDTS	0x803E	/* DEC Distributed Time Service */
-#define	ETHERTYPE_DECLTM	0x803F	/* DEC LAN Traffic Monitor */
-#define	ETHERTYPE_DECNETBIOS	0x8040	/* DEC PATHWORKS DECnet NETBIOS Emulation */
-#define	ETHERTYPE_DECLAST	0x8041	/* DEC Local Area System Transport */
-			     /* 0x8042	   DEC Unassigned */
-#define	ETHERTYPE_PLANNING	0x8044	/* Planning Research Corp. */
-		    /* 0x8046 - 0x8047	   AT&T */
-#define	ETHERTYPE_DECAM		0x8048	/* DEC Availability Manager for Distributed Systems DECamds (but someone at DEC says not) */
-#define	ETHERTYPE_EXPERDATA	0x8049	/* ExperData */
-#define	ETHERTYPE_VEXP		0x805B	/* Stanford V Kernel exp. */
-#define	ETHERTYPE_VPROD		0x805C	/* Stanford V Kernel prod. */
-#define	ETHERTYPE_ES		0x805D	/* Evans & Sutherland */
-#define	ETHERTYPE_LITTLE	0x8060	/* Little Machines */
-#define	ETHERTYPE_COUNTERPOINT	0x8062	/* Counterpoint Computers */
-		    /* 0x8065 - 0x8066	   Univ. of Mass @ Amherst */
-#define	ETHERTYPE_VEECO		0x8067	/* Veeco Integrated Auto. */
-#define	ETHERTYPE_GENDYN	0x8068	/* General Dynamics */
-#define	ETHERTYPE_ATT		0x8069	/* AT&T */
-#define	ETHERTYPE_AUTOPHON	0x806A	/* Autophon */
-#define	ETHERTYPE_COMDESIGN	0x806C	/* ComDesign */
-#define	ETHERTYPE_COMPUGRAPHIC	0x806D	/* Compugraphic Corporation */
-		    /* 0x806E - 0x8077	   Landmark Graphics Corp. */
-#define	ETHERTYPE_MATRA		0x807A	/* Matra */
-#define	ETHERTYPE_DDE		0x807B	/* Dansk Data Elektronik */
-#define	ETHERTYPE_MERIT		0x807C	/* Merit Internodal (or Univ of Michigan?) */
-		    /* 0x807D - 0x807F	   Vitalink Communications */
-#define	ETHERTYPE_VLTLMAN	0x8080	/* Vitalink TransLAN III Management */
-		    /* 0x8081 - 0x8083	   Counterpoint Computers */
-		    /* 0x8088 - 0x808A	   Xyplex */
-#define	ETHERTYPE_ATALK		0x809B	/* AppleTalk */
-#define	ETHERTYPE_AT		ETHERTYPE_ATALK		/* old NetBSD */
-#define	ETHERTYPE_APPLETALK	ETHERTYPE_ATALK		/* HP-UX */
-		    /* 0x809C - 0x809E	   Datability */
-#define	ETHERTYPE_SPIDER	0x809F	/* Spider Systems Ltd. */
-			     /* 0x80A3	   Nixdorf */
-		    /* 0x80A4 - 0x80B3	   Siemens Gammasonics Inc. */
-		    /* 0x80C0 - 0x80C3	   DCA (Digital Comm. Assoc.) Data Exchange Cluster */
-		    /* 0x80C4 - 0x80C5	   Banyan Systems */
-#define	ETHERTYPE_PACER		0x80C6	/* Pacer Software */
-#define	ETHERTYPE_APPLITEK	0x80C7	/* Applitek Corporation */
-		    /* 0x80C8 - 0x80CC	   Intergraph Corporation */
-		    /* 0x80CD - 0x80CE	   Harris Corporation */
-		    /* 0x80CF - 0x80D2	   Taylor Instrument */
-		    /* 0x80D3 - 0x80D4	   Rosemount Corporation */
-#define	ETHERTYPE_SNA		0x80D5	/* IBM SNA Services over Ethernet */
-#define	ETHERTYPE_VARIAN	0x80DD	/* Varian Associates */
-		    /* 0x80DE - 0x80DF	   TRFS (Integrated Solutions Transparent Remote File System) */
-		    /* 0x80E0 - 0x80E3	   Allen-Bradley */
-		    /* 0x80E4 - 0x80F0	   Datability */
-#define	ETHERTYPE_RETIX		0x80F2	/* Retix */
-#define	ETHERTYPE_AARP		0x80F3	/* AppleTalk AARP */
-		    /* 0x80F4 - 0x80F5	   Kinetics */
-#define	ETHERTYPE_APOLLO	0x80F7	/* Apollo Computer */
-#define ETHERTYPE_VLAN		0x8100	/* IEEE 802.1Q VLAN tagging (XXX conflicts) */
-		    /* 0x80FF - 0x8101	   Wellfleet Communications (XXX conflicts) */
-#define	ETHERTYPE_BOFL		0x8102	/* Wellfleet; BOFL (Breath OF Life) pkts [every 5-10 secs.] */
-#define	ETHERTYPE_WELLFLEET	0x8103	/* Wellfleet Communications */
-		    /* 0x8107 - 0x8109	   Symbolics Private */
-#define	ETHERTYPE_TALARIS	0x812B	/* Talaris */
-#define	ETHERTYPE_WATERLOO	0x8130	/* Waterloo Microsystems Inc. (XXX which?) */
-#define	ETHERTYPE_HAYES		0x8130	/* Hayes Microcomputers (XXX which?) */
-#define	ETHERTYPE_VGLAB		0x8131	/* VG Laboratory Systems */
-		    /* 0x8132 - 0x8137	   Bridge Communications */
-#define	ETHERTYPE_IPX		0x8137	/* Novell (old) NetWare IPX (ECONFIG E option) */
-#define	ETHERTYPE_NOVELL	0x8138	/* Novell, Inc. */
-		    /* 0x8139 - 0x813D	   KTI */
-#define	ETHERTYPE_MUMPS		0x813F	/* M/MUMPS data sharing */
-#define	ETHERTYPE_AMOEBA	0x8145	/* Vrije Universiteit (NL) Amoeba 4 RPC (obsolete) */
-#define	ETHERTYPE_FLIP		0x8146	/* Vrije Universiteit (NL) FLIP (Fast Local Internet Protocol) */
-#define	ETHERTYPE_VURESERVED	0x8147	/* Vrije Universiteit (NL) [reserved] */
-#define	ETHERTYPE_LOGICRAFT	0x8148	/* Logicraft */
-#define	ETHERTYPE_NCD		0x8149	/* Network Computing Devices */
-#define	ETHERTYPE_ALPHA		0x814A	/* Alpha Micro */
-#define	ETHERTYPE_SNMP		0x814C	/* SNMP over Ethernet (see RFC1089) */
-		    /* 0x814D - 0x814E	   BIIN */
-#define	ETHERTYPE_TEC	0x814F	/* Technically Elite Concepts */
-#define	ETHERTYPE_RATIONAL	0x8150	/* Rational Corp */
-		    /* 0x8151 - 0x8153	   Qualcomm */
-		    /* 0x815C - 0x815E	   Computer Protocol Pty Ltd */
-		    /* 0x8164 - 0x8166	   Charles River Data Systems */
-#define	ETHERTYPE_XTP		0x817D	/* Protocol Engines XTP */
-#define	ETHERTYPE_SGITW		0x817E	/* SGI/Time Warner prop. */
-#define	ETHERTYPE_HIPPI_FP	0x8180	/* HIPPI-FP encapsulation */
-#define	ETHERTYPE_STP		0x8181	/* Scheduled Transfer STP, HIPPI-ST */
-		    /* 0x8182 - 0x8183	   Reserved for HIPPI-6400 */
-		    /* 0x8184 - 0x818C	   SGI prop. */
-#define	ETHERTYPE_MOTOROLA	0x818D	/* Motorola */
-#define	ETHERTYPE_NETBEUI	0x8191	/* PowerLAN NetBIOS/NetBEUI (PC) */
-		    /* 0x819A - 0x81A3	   RAD Network Devices */
-		    /* 0x81B7 - 0x81B9	   Xyplex */
-		    /* 0x81CC - 0x81D5	   Apricot Computers */
-		    /* 0x81D6 - 0x81DD	   Artisoft Lantastic */
-		    /* 0x81E6 - 0x81EF	   Polygon */
-		    /* 0x81F0 - 0x81F2	   Comsat Labs */
-		    /* 0x81F3 - 0x81F5	   SAIC */
-		    /* 0x81F6 - 0x81F8	   VG Analytical */
-		    /* 0x8203 - 0x8205	   QNX Software Systems Ltd. */
-		    /* 0x8221 - 0x8222	   Ascom Banking Systems */
-		    /* 0x823E - 0x8240	   Advanced Encryption Systems */
-		    /* 0x8263 - 0x826A	   Charles River Data Systems */
-		    /* 0x827F - 0x8282	   Athena Programming */
-		    /* 0x829A - 0x829B	   Inst Ind Info Tech */
-		    /* 0x829C - 0x82AB	   Taurus Controls */
-		    /* 0x82AC - 0x8693	   Walker Richer & Quinn */
-#define	ETHERTYPE_ACCTON	0x8390	/* Accton Technologies (unregistered) */
-#define	ETHERTYPE_TALARISMC	0x852B	/* Talaris multicast */
-#define	ETHERTYPE_KALPANA	0x8582	/* Kalpana */
-		    /* 0x8694 - 0x869D	   Idea Courier */
-		    /* 0x869E - 0x86A1	   Computer Network Tech */
-		    /* 0x86A3 - 0x86AC	   Gateway Communications */
-#define	ETHERTYPE_SECTRA	0x86DB	/* SECTRA */
-#define	ETHERTYPE_IPV6		0x86DD	/* IP protocol version 6 */
-#define	ETHERTYPE_DELTACON	0x86DE	/* Delta Controls */
-#define	ETHERTYPE_ATOMIC	0x86DF	/* ATOMIC */
-		    /* 0x86E0 - 0x86EF	   Landis & Gyr Powers */
-		    /* 0x8700 - 0x8710	   Motorola */
-#define	ETHERTYPE_RDP		0x8739	/* Control Technology Inc. RDP Without IP */
-#define	ETHERTYPE_MICP		0x873A	/* Control Technology Inc. Mcast Industrial Ctrl Proto. */
-		    /* 0x873B - 0x873C	   Control Technology Inc. Proprietary */
-#define	ETHERTYPE_TCPCOMP	0x876B	/* TCP/IP Compression (RFC1701) */
-#define	ETHERTYPE_IPAS		0x876C	/* IP Autonomous Systems (RFC1701) */
-#define	ETHERTYPE_SECUREDATA	0x876D	/* Secure Data (RFC1701) */
-#define	ETHERTYPE_FLOWCONTROL	0x8808	/* 802.3x flow control packet */
-#define	ETHERTYPE_SLOW		0x8809	/* 802.3ad link aggregation (LACP) */
-#define	ETHERTYPE_PPP		0x880B	/* PPP (obsolete by PPPoE) */
-#define	ETHERTYPE_HITACHI	0x8820	/* Hitachi Cable (Optoelectronic Systems Laboratory) */
-#define	ETHERTYPE_MPLS		0x8847	/* MPLS Unicast */
-#define	ETHERTYPE_MPLS_MCAST	0x8848	/* MPLS Multicast */
-#define	ETHERTYPE_AXIS		0x8856	/* Axis Communications AB proprietary bootstrap/config */
-#define	ETHERTYPE_PPPOEDISC	0x8863	/* PPP Over Ethernet Discovery Stage */
-#define	ETHERTYPE_PPPOE		0x8864	/* PPP Over Ethernet Session Stage */
-#define	ETHERTYPE_LANPROBE	0x8888	/* HP LanProbe test? */
-#define	ETHERTYPE_PAE		0x888e	/* EAPOL PAE/802.1x */
-#define	ETHERTYPE_LOOPBACK	0x9000	/* Loopback: used to test interfaces */
-#define	ETHERTYPE_LBACK		ETHERTYPE_LOOPBACK	/* DEC MOP loopback */
-#define	ETHERTYPE_XNSSM		0x9001	/* 3Com (Formerly Bridge Communications), XNS Systems Management */
-#define	ETHERTYPE_TCPSM		0x9002	/* 3Com (Formerly Bridge Communications), TCP/IP Systems Management */
-#define	ETHERTYPE_BCLOOP	0x9003	/* 3Com (Formerly Bridge Communications), loopback detection */
-#define	ETHERTYPE_DEBNI		0xAAAA	/* DECNET? Used by VAX 6220 DEBNI */
-#define	ETHERTYPE_SONIX		0xFAF5	/* Sonix Arpeggio */
-#define	ETHERTYPE_VITAL		0xFF00	/* BBN VITAL-LanBridge cache wakeups */
-		    /* 0xFF00 - 0xFFOF	   ISC Bunker Ramo */
-
-#define	ETHERTYPE_MAX		0xFFFF	/* Maximum valid ethernet type, reserved */
-
-/*
- * The ETHERTYPE_NTRAILER packet types starting at ETHERTYPE_TRAIL have
- * (type-ETHERTYPE_TRAIL)*512 bytes of data followed
- * by an ETHER type (as given above) and then the (variable-length) header.
- */
-#define	ETHERTYPE_TRAIL		0x1000		/* Trailer packet */
-#define	ETHERTYPE_NTRAILER	16
-
-#define	ETHERMTU	(ETHER_MAX_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-#define	ETHERMIN	(ETHER_MIN_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN)
-#define	ETHERMTU_JUMBO	(ETHER_MAX_LEN_JUMBO - ETHER_HDR_LEN - ETHER_CRC_LEN)
-/*
- * The ETHER_BPF_MTAP macro should be used by drivers which support hardware
- * offload for VLAN tag processing.  It will check the mbuf to see if it has
- * M_VLANTAG set, and if it does, will pass the packet along to
- * ether_vlan_mtap.  This function will re-insert VLAN tags for the duration
- * of the tap, so they show up properly for network analyzers.
- */
-#define ETHER_BPF_MTAP(_ifp, _m) do {					\
-	if (bpf_peers_present((_ifp)->if_bpf)) {			\
-		M_ASSERTVALID(_m);					\
-		if (((_m)->m_flags & M_VLANTAG) != 0)			\
-			ether_vlan_mtap((_ifp)->if_bpf, (_m), NULL, 0);	\
-		else							\
-			bpf_mtap((_ifp)->if_bpf, (_m));			\
-	}								\
-} while (0)
-
-#ifdef _KERNEL
-
-struct ifnet;
-struct mbuf;
-struct route;
-struct sockaddr;
-struct bpf_if;
-
-extern	uint32_t ether_crc32_le(const uint8_t *, size_t);
-extern	uint32_t ether_crc32_be(const uint8_t *, size_t);
-extern	void ether_demux(struct ifnet *, struct mbuf *);
-extern	void ether_ifattach(struct ifnet *, const u_int8_t *);
-extern	void ether_ifdetach(struct ifnet *);
-extern	int  ether_ioctl(struct ifnet *, u_long, caddr_t);
-extern	int  ether_output(struct ifnet *, struct mbuf *,
-	    const struct sockaddr *, struct route *);
-extern	int  ether_output_frame(struct ifnet *, struct mbuf *);
-extern	char *ether_sprintf(const u_int8_t *);
-void	ether_vlan_mtap(struct bpf_if *, struct mbuf *,
-	    void *, u_int);
-struct mbuf  *ether_vlanencap(struct mbuf *, uint16_t);
-
-#else /* _KERNEL */
-
-#include <sys/cdefs.h>
-
-/*
- * Ethernet address conversion/parsing routines.
- */
-__BEGIN_DECLS
-struct	ether_addr *ether_aton(const char *);
-struct	ether_addr *ether_aton_r(const char *, struct ether_addr *);
-int	ether_hostton(const char *, struct ether_addr *);
-int	ether_line(const char *, struct ether_addr *, char *);
-char 	*ether_ntoa(const struct ether_addr *);
-char 	*ether_ntoa_r(const struct ether_addr *, char *);
-int	ether_ntohost(char *, const struct ether_addr *);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_NET_ETHERNET_H_ */
diff --git a/include.new/net/fddi.h b/include.new/net/fddi.h
deleted file mode 100644
index 1e6260d..0000000
--- a/include.new/net/fddi.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 1995 Matt Thomas (thomas@lkg.dec.com)
- * 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.
- *
- *	@(#)if_fddi.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/net/fddi.h 194581 2009-06-21 10:29:31Z rdivacky $
- */
-
-#ifndef _NETINET_IF_FDDI_H_
-#define _NETINET_IF_FDDI_H_
-
-#define	FDDIIPMTU		4352
-#define	FDDIMTU			4470
-#define	FDDIMIN			3
-
-#define	FDDIFC_C		0x80	/* 0b10000000 */
-#define	FDDIFC_L		0x40	/* 0b01000000 */
-#define	FDDIFC_F		0x30	/* 0b00110000 */
-#define	FDDIFC_Z		0x0F	/* 0b00001111 */
-#define	FDDIFC_CLFF		0xF0	/* Class/Length/Format bits */
-#define	FDDIFC_ZZZZ		0x0F	/* Control bits */
-
-/*
- * FDDI Frame Control values. (48-bit addressing only).
- */
-#define	FDDIFC_VOID		0x40	/* Void frame */
-#define	FDDIFC_NRT		0x80	/* Nonrestricted token */
-#define	FDDIFC_RT		0xc0	/* Restricted token */
-#define	FDDIFC_MAC_BEACON	0xc2	/* MAC Beacon frame */
-#define	FDDIFC_MAC_CLAIM	0xc3	/* MAC Claim frame */
-#define	FDDIFC_LLC_ASYNC	0x50
-#define	FDDIFC_LLC_PRIO0	0
-#define	FDDIFC_LLC_PRIO1	1
-#define	FDDIFC_LLC_PRIO2	2
-#define	FDDIFC_LLC_PRIO3	3
-#define	FDDIFC_LLC_PRIO4	4
-#define	FDDIFC_LLC_PRIO5	5
-#define	FDDIFC_LLC_PRIO6	6
-#define	FDDIFC_LLC_PRIO7	7
-#define	FDDIFC_LLC_SYNC		0xd0
-#define	FDDIFC_IMP_ASYNC	0x60	/* Implementor Async. */
-#define	FDDIFC_IMP_SYNC		0xe0	/* Implementor Synch. */
-#define	FDDIFC_SMT		0x40
-#define	FDDIFC_SMT_INFO		0x41	/* SMT Info */
-#define	FDDIFC_SMT_NSA		0x4F	/* SMT Next station adrs */
-#define	FDDIFC_MAC		0xc0	/* MAC frame */
-
-#define	FDDI_ADDR_LEN		6
-#define	FDDI_HDR_LEN		(sizeof(struct fddi_header))
-
-/*
- * Structure of an 100Mb/s FDDI header.
- */
-struct fddi_header {
-	u_char  fddi_fc;
-	u_char  fddi_dhost[FDDI_ADDR_LEN];
-	u_char  fddi_shost[FDDI_ADDR_LEN];
-};
-
-#if defined(_KERNEL)
-#define	fddi_ipmulticast_min	ether_ipmulticast_min
-#define	fddi_ipmulticast_max	ether_ipmulticast_max
-#define	fddi_addmulti		ether_addmulti
-#define	fddi_delmulti		ether_delmulti
-#define	fddi_sprintf		ether_sprintf
-
-#define	FDDI_BPF_UNSUPPORTED	0
-#define	FDDI_BPF_SUPPORTED	1
-
-void	fddi_ifattach(struct ifnet *, const u_int8_t *, int);
-void	fddi_ifdetach(struct ifnet *, int);
-int	fddi_ioctl(struct ifnet *, u_long, caddr_t);
-
-#endif	/* _KERNEL */
-#endif	/* _NET_FDDI_H_ */
diff --git a/include.new/net/firewire.h b/include.new/net/firewire.h
deleted file mode 100644
index e3b84c7..0000000
--- a/include.new/net/firewire.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/net/firewire.h 194581 2009-06-21 10:29:31Z rdivacky $
- */
-
-#ifndef _NET_FIREWIRE_H_
-#define _NET_FIREWIRE_H_
-
-#define FW_ENCAP_UNFRAG		0
-#define FW_ENCAP_FIRST		1
-#define FW_ENCAP_LAST		2
-#define FW_ENCAP_NEXT		3
-
-union fw_encap {
-		uint32_t ul[2];
-		struct {
-#if BYTE_ORDER == BIG_ENDIAN
-			uint32_t lf		:2;
-			uint32_t reserved	:14;
-			uint32_t ether_type	:16;
-#else
-			uint32_t ether_type	:16;
-			uint32_t reserved	:14;
-			uint32_t lf		:2;
-#endif
-		} unfrag;
-		struct {
-#if BYTE_ORDER == BIG_ENDIAN
-			uint32_t lf		:2;
-			uint32_t reserved1	:2;
-			uint32_t datagram_size	:12;
-			uint32_t ether_type	:16;
-			uint32_t dgl		:16;
-			uint32_t reserved2	:16;
-#else
-			uint32_t ether_type	:16;
-			uint32_t datagram_size	:12;
-			uint32_t reserved1	:2;
-			uint32_t lf		:2;
-			uint32_t reserved2	:16;
-			uint32_t dgl		:16;
-#endif
-		} firstfrag;
-		struct {
-#if BYTE_ORDER == BIG_ENDIAN
-			uint32_t lf		:2;
-			uint32_t reserved1	:2;
-			uint32_t datagram_size	:12;
-			uint32_t reserved2	:4;
-			uint32_t fragment_offset :12;
-			uint32_t dgl		:16;
-			uint32_t reserved3	:16;
-#else
-			uint32_t fragment_offset :12;
-			uint32_t reserved2	:4;
-			uint32_t datagram_size	:12;
-			uint32_t reserved1	:2;
-			uint32_t lf		:2;
-			uint32_t reserved3	:16;
-			uint32_t dgl		:16;
-#endif
-		} nextfrag;
-};
-
-#define MTAG_FIREWIRE			1394
-#define MTAG_FIREWIRE_HWADDR		0
-#define MTAG_FIREWIRE_SENDER_EUID	1
-
-struct fw_hwaddr {
-	uint32_t		sender_unique_ID_hi;
-	uint32_t		sender_unique_ID_lo;
-	uint8_t			sender_max_rec;
-	uint8_t			sspd;
-	uint16_t		sender_unicast_FIFO_hi;
-	uint32_t		sender_unicast_FIFO_lo;
-};
-
-/*
- * BPF wants to see one of these.
- */
-struct fw_bpfhdr {
-	uint8_t			firewire_dhost[8];
-	uint8_t			firewire_shost[8];
-	uint16_t		firewire_type;
-};
-
-#ifdef _KERNEL
-
-/*
- * A structure to track the reassembly of a link-level fragmented
- * datagram.
- */
-struct fw_reass {
-	STAILQ_ENTRY(fw_reass)	fr_link;
-	uint32_t		fr_id;		/* host+dgl */
-	struct mbuf		*fr_frags;	/* chain of frags */
-};
-STAILQ_HEAD(fw_reass_list, fw_reass);
-
-struct fw_com {
-	struct ifnet		*fc_ifp;
-	struct fw_hwaddr	fc_hwaddr;
-	struct firewire_comm	*fc_fc;
-	uint8_t			fc_broadcast_channel;
-	uint8_t			fc_speed;	/* our speed */
-	uint16_t		fc_node;	/* our nodeid */
-	struct fw_reass_list	fc_frags;	/* partial datagrams */
-};
-#define	IFP2FWC(ifp)	((struct fw_com *)(ifp)->if_l2com)
-
-extern	void	firewire_input(struct ifnet *ifp, struct mbuf *m, uint16_t src);
-extern	void	firewire_ifattach(struct ifnet *, struct fw_hwaddr *);
-extern	void	firewire_ifdetach(struct ifnet *);
-extern	void	firewire_busreset(struct ifnet *);
-extern	int	firewire_ioctl(struct ifnet *, u_long, caddr_t);
-
-#endif /* !_KERNEL */
-
-#endif /* !_NET_FIREWIRE_H_ */
diff --git a/include.new/net/flowtable.h b/include.new/net/flowtable.h
deleted file mode 100644
index 4a6e758..0000000
--- a/include.new/net/flowtable.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2014 Gleb Smirnoff <glebius@FreeBSD.org>
- * Copyright (c) 2008-2010, BitGravity Inc.
- * 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. Neither the name of the BitGravity Corporation 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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: releng/10.2/sys/net/flowtable.h 262743 2014-03-04 15:14:47Z glebius $
- *
- */
-
-#ifndef	_NET_FLOWTABLE_H_
-#define	_NET_FLOWTABLE_H_
-
-struct flowtable_stat {
-	uint64_t	ft_collisions;
-	uint64_t	ft_misses;
-	uint64_t	ft_free_checks;
-	uint64_t	ft_frees;
-	uint64_t	ft_hits;
-	uint64_t	ft_lookups;
-	uint64_t	ft_fail_lle_invalid;
-	uint64_t	ft_inserts;
-};
-
-#ifdef	_KERNEL
-
-/*
- * Given a flow table, look up the L3 and L2 information
- * and return it in the route.
- */
-int flowtable_lookup(sa_family_t, struct mbuf *, struct route *);
-void flowtable_route_flush(sa_family_t, struct rtentry *);
-
-#endif /* _KERNEL */
-#endif /* !_NET_FLOWTABLE_H_ */
diff --git a/include.new/net/ieee8023ad_lacp.h b/include.new/net/ieee8023ad_lacp.h
deleted file mode 100644
index c13a3b9..0000000
--- a/include.new/net/ieee8023ad_lacp.h
+++ /dev/null
@@ -1,338 +0,0 @@
-/*	$NetBSD: ieee8023ad_impl.h,v 1.2 2005/12/10 23:21:39 elad Exp $	*/
-
-/*-
- * Copyright (c)2005 YAMAMOTO Takashi,
- * 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.
- *
- * 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: releng/10.2/sys/net/ieee8023ad_lacp.h 253687 2013-07-26 19:41:13Z adrian $
- */
-
-/*
- * IEEE802.3ad LACP
- *
- * implementation details.
- */
-
-#define	LACP_TIMER_CURRENT_WHILE	0
-#define	LACP_TIMER_PERIODIC		1
-#define	LACP_TIMER_WAIT_WHILE		2
-#define	LACP_NTIMER			3
-
-#define	LACP_TIMER_ARM(port, timer, val) \
-	(port)->lp_timer[(timer)] = (val)
-#define	LACP_TIMER_DISARM(port, timer) \
-	(port)->lp_timer[(timer)] = 0
-#define	LACP_TIMER_ISARMED(port, timer) \
-	((port)->lp_timer[(timer)] > 0)
-
-/*
- * IEEE802.3ad LACP
- *
- * protocol definitions.
- */
-
-#define	LACP_STATE_ACTIVITY	(1<<0)
-#define	LACP_STATE_TIMEOUT	(1<<1)
-#define	LACP_STATE_AGGREGATION	(1<<2)
-#define	LACP_STATE_SYNC		(1<<3)
-#define	LACP_STATE_COLLECTING	(1<<4)
-#define	LACP_STATE_DISTRIBUTING	(1<<5)
-#define	LACP_STATE_DEFAULTED	(1<<6)
-#define	LACP_STATE_EXPIRED	(1<<7)
-
-#define	LACP_PORT_NTT		0x00000001
-#define	LACP_PORT_MARK		0x00000002
-
-#define	LACP_STATE_BITS		\
-	"\020"			\
-	"\001ACTIVITY"		\
-	"\002TIMEOUT"		\
-	"\003AGGREGATION"	\
-	"\004SYNC"		\
-	"\005COLLECTING"	\
-	"\006DISTRIBUTING"	\
-	"\007DEFAULTED"		\
-	"\010EXPIRED"
-
-/*
- * IEEE802.3 slow protocols
- *
- * protocol (on-wire) definitions.
- *
- * XXX should be elsewhere.
- */
-
-#define	SLOWPROTOCOLS_SUBTYPE_LACP	1
-#define	SLOWPROTOCOLS_SUBTYPE_MARKER	2
-
-struct slowprothdr {
-	uint8_t		sph_subtype;
-	uint8_t		sph_version;
-} __packed;
-
-/*
- * TLV on-wire structure.
- */
-
-struct tlvhdr {
-	uint8_t		tlv_type;
-	uint8_t		tlv_length;
-	/* uint8_t tlv_value[]; */
-} __packed;
-
-/*
- * ... and our implementation.
- */
-
-#define	TLV_SET(tlv, type, length) \
-	do { \
-		(tlv)->tlv_type = (type); \
-		(tlv)->tlv_length = sizeof(*tlv) + (length); \
-	} while (/*CONSTCOND*/0)
-
-struct tlv_template {
-	uint8_t			tmpl_type;
-	uint8_t			tmpl_length;
-};
-
-struct lacp_systemid {
-	uint16_t		lsi_prio;
-	uint8_t			lsi_mac[6];
-} __packed;
-
-struct lacp_portid {
-	uint16_t		lpi_prio;
-	uint16_t		lpi_portno;
-} __packed;
-
-struct lacp_peerinfo {
-	struct lacp_systemid	lip_systemid;
-	uint16_t		lip_key;
-	struct lacp_portid	lip_portid;
-	uint8_t			lip_state;
-	uint8_t			lip_resv[3];
-} __packed;
-
-struct lacp_collectorinfo {
-	uint16_t		lci_maxdelay;
-	uint8_t			lci_resv[12];
-} __packed;
-
-struct lacpdu {
-	struct ether_header	ldu_eh;
-	struct slowprothdr	ldu_sph;
-
-	struct tlvhdr		ldu_tlv_actor;
-	struct lacp_peerinfo	ldu_actor;
-	struct tlvhdr		ldu_tlv_partner;
-	struct lacp_peerinfo	ldu_partner;
-	struct tlvhdr		ldu_tlv_collector;
-	struct lacp_collectorinfo ldu_collector;
-	struct tlvhdr		ldu_tlv_term;
-	uint8_t			ldu_resv[50];
-} __packed;
-
-/*
- * IEEE802.3ad marker protocol
- *
- * protocol (on-wire) definitions.
- */
-struct lacp_markerinfo {
-	uint16_t		mi_rq_port;
-	uint8_t			mi_rq_system[ETHER_ADDR_LEN];
-	uint32_t		mi_rq_xid;
-	uint8_t			mi_pad[2];
-} __packed;
-
-struct markerdu {
-	struct ether_header	mdu_eh;
-	struct slowprothdr	mdu_sph;
-
-	struct tlvhdr		mdu_tlv;
-	struct lacp_markerinfo	mdu_info;
-	struct tlvhdr		mdu_tlv_term;
-	uint8_t			mdu_resv[90];
-} __packed;
-
-#define	MARKER_TYPE_INFO	0x01
-#define	MARKER_TYPE_RESPONSE	0x02
-
-enum lacp_selected {
-	LACP_UNSELECTED,
-	LACP_STANDBY,	/* not used in this implementation */
-	LACP_SELECTED,
-};
-
-enum lacp_mux_state {
-	LACP_MUX_DETACHED,
-	LACP_MUX_WAITING,
-	LACP_MUX_ATTACHED,
-	LACP_MUX_COLLECTING,
-	LACP_MUX_DISTRIBUTING,
-};
-
-#define	LACP_MAX_PORTS		32
-
-struct lacp_portmap {
-	int			pm_count;
-	struct lacp_port	*pm_map[LACP_MAX_PORTS];
-};
-
-struct lacp_port {
-	TAILQ_ENTRY(lacp_port)	lp_dist_q;
-	LIST_ENTRY(lacp_port)	lp_next;
-	struct lacp_softc	*lp_lsc;
-	struct lagg_port	*lp_lagg;
-	struct ifnet		*lp_ifp;
-	struct lacp_peerinfo	lp_partner;
-	struct lacp_peerinfo	lp_actor;
-	struct lacp_markerinfo	lp_marker;
-#define	lp_state	lp_actor.lip_state
-#define	lp_key		lp_actor.lip_key
-#define	lp_systemid	lp_actor.lip_systemid
-	struct timeval		lp_last_lacpdu;
-	int			lp_lacpdu_sent;
-	enum lacp_mux_state	lp_mux_state;
-	enum lacp_selected	lp_selected;
-	int			lp_flags;
-	u_int			lp_media; /* XXX redundant */
-	int			lp_timer[LACP_NTIMER];
-	struct ifmultiaddr	*lp_ifma;
-
-	struct lacp_aggregator	*lp_aggregator;
-};
-
-struct lacp_aggregator {
-	TAILQ_ENTRY(lacp_aggregator)	la_q;
-	int			la_refcnt; /* num of ports which selected us */
-	int			la_nports; /* num of distributing ports  */
-	TAILQ_HEAD(, lacp_port)	la_ports; /* distributing ports */
-	struct lacp_peerinfo	la_partner;
-	struct lacp_peerinfo	la_actor;
-	int			la_pending; /* number of ports in wait_while */
-};
-
-struct lacp_softc {
-	struct lagg_softc	*lsc_softc;
-	struct mtx		lsc_mtx;
-	struct lacp_aggregator	*lsc_active_aggregator;
-	TAILQ_HEAD(, lacp_aggregator) lsc_aggregators;
-	boolean_t		lsc_suppress_distributing;
-	struct callout		lsc_transit_callout;
-	struct callout		lsc_callout;
-	LIST_HEAD(, lacp_port)	lsc_ports;
-	struct lacp_portmap	lsc_pmap[2];
-	volatile u_int		lsc_activemap;
-	uint32_t		lsc_hashkey;
-	struct {
-		uint32_t	lsc_rx_test;
-		uint32_t	lsc_tx_test;
-	} lsc_debug;
-	uint32_t		lsc_strict_mode;
-};
-
-#define	LACP_TYPE_ACTORINFO	1
-#define	LACP_TYPE_PARTNERINFO	2
-#define	LACP_TYPE_COLLECTORINFO	3
-
-/* timeout values (in sec) */
-#define	LACP_FAST_PERIODIC_TIME		(1)
-#define	LACP_SLOW_PERIODIC_TIME		(30)
-#define	LACP_SHORT_TIMEOUT_TIME		(3 * LACP_FAST_PERIODIC_TIME)
-#define	LACP_LONG_TIMEOUT_TIME		(3 * LACP_SLOW_PERIODIC_TIME)
-#define	LACP_CHURN_DETECTION_TIME	(60)
-#define	LACP_AGGREGATE_WAIT_TIME	(2)
-#define	LACP_TRANSIT_DELAY		3000	/* in msec */
-
-#define	LACP_STATE_EQ(s1, s2, mask)	\
-	((((s1) ^ (s2)) & (mask)) == 0)
-
-#define	LACP_SYS_PRI(peer)	(peer).lip_systemid.lsi_prio
-
-#define	LACP_PORT(_lp)	((struct lacp_port *)(_lp)->lp_psc)
-#define	LACP_SOFTC(_sc)	((struct lacp_softc *)(_sc)->sc_psc)
-
-#define LACP_LOCK_INIT(_lsc)		mtx_init(&(_lsc)->lsc_mtx, \
-					    "lacp mtx", NULL, MTX_DEF)
-#define LACP_LOCK_DESTROY(_lsc)		mtx_destroy(&(_lsc)->lsc_mtx)
-#define LACP_LOCK(_lsc)			mtx_lock(&(_lsc)->lsc_mtx)
-#define LACP_UNLOCK(_lsc)		mtx_unlock(&(_lsc)->lsc_mtx)
-#define LACP_LOCK_ASSERT(_lsc)		mtx_assert(&(_lsc)->lsc_mtx, MA_OWNED)
-
-struct mbuf	*lacp_input(struct lagg_port *, struct mbuf *);
-struct lagg_port *lacp_select_tx_port(struct lagg_softc *, struct mbuf *);
-int		lacp_attach(struct lagg_softc *);
-int		lacp_detach(struct lagg_softc *);
-void		lacp_init(struct lagg_softc *);
-void		lacp_stop(struct lagg_softc *);
-int		lacp_port_create(struct lagg_port *);
-void		lacp_port_destroy(struct lagg_port *);
-void		lacp_linkstate(struct lagg_port *);
-void		lacp_req(struct lagg_softc *, caddr_t);
-void		lacp_portreq(struct lagg_port *, caddr_t);
-
-static __inline int
-lacp_isactive(struct lagg_port *lgp)
-{
-	struct lacp_port *lp = LACP_PORT(lgp);
-	struct lacp_softc *lsc = lp->lp_lsc;
-	struct lacp_aggregator *la = lp->lp_aggregator;
-
-	/* This port is joined to the active aggregator */
-	if (la != NULL && la == lsc->lsc_active_aggregator)
-		return (1);
-
-	return (0);
-}
-
-static __inline int
-lacp_iscollecting(struct lagg_port *lgp)
-{
-	struct lacp_port *lp = LACP_PORT(lgp);
-
-	return ((lp->lp_state & LACP_STATE_COLLECTING) != 0);
-}
-
-static __inline int
-lacp_isdistributing(struct lagg_port *lgp)
-{
-	struct lacp_port *lp = LACP_PORT(lgp);
-
-	return ((lp->lp_state & LACP_STATE_DISTRIBUTING) != 0);
-}
-
-/* following constants don't include terminating NUL */
-#define	LACP_MACSTR_MAX		(2*6 + 5)
-#define	LACP_SYSTEMPRIOSTR_MAX	(4)
-#define	LACP_SYSTEMIDSTR_MAX	(LACP_SYSTEMPRIOSTR_MAX + 1 + LACP_MACSTR_MAX)
-#define	LACP_PORTPRIOSTR_MAX	(4)
-#define	LACP_PORTNOSTR_MAX	(4)
-#define	LACP_PORTIDSTR_MAX	(LACP_PORTPRIOSTR_MAX + 1 + LACP_PORTNOSTR_MAX)
-#define	LACP_KEYSTR_MAX		(4)
-#define	LACP_PARTNERSTR_MAX	\
-	(1 + LACP_SYSTEMIDSTR_MAX + 1 + LACP_KEYSTR_MAX + 1 \
-	+ LACP_PORTIDSTR_MAX + 1)
-#define	LACP_LAGIDSTR_MAX	\
-	(1 + LACP_PARTNERSTR_MAX + 1 + LACP_PARTNERSTR_MAX + 1)
-#define	LACP_STATESTR_MAX	(255) /* XXX */
diff --git a/include.new/net/if.h b/include.new/net/if.h
deleted file mode 100644
index 5929d9e..0000000
--- a/include.new/net/if.h
+++ /dev/null
@@ -1,552 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 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.
- * 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.
- *
- *	@(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/net/if.h 264076 2014-04-03 14:58:52Z glebius $
- */
-
-#ifndef _NET_IF_H_
-#define	_NET_IF_H_
-
-#include <sys/cdefs.h>
-
-#ifdef _KERNEL
-#include <sys/queue.h>
-#endif
-
-#if __BSD_VISIBLE
-/*
- * <net/if.h> does not depend on <sys/time.h> on most other systems.  This
- * helps userland compatibility.  (struct timeval ifi_lastchange)
- * The same holds for <sys/socket.h>.  (struct sockaddr ifru_addr)
- */
-#ifndef _KERNEL
-#include <sys/time.h>
-#include <sys/socket.h>
-#endif
-
-struct ifnet;
-#endif
-
-/*
- * Length of interface external name, including terminating '\0'.
- * Note: this is the same size as a generic device's external name.
- */
-#define		IF_NAMESIZE	16
-#if __BSD_VISIBLE
-#define		IFNAMSIZ	IF_NAMESIZE
-#define		IF_MAXUNIT	0x7fff	/* historical value */
-#endif
-#if __BSD_VISIBLE
-
-/*
- * Structure used to query names of interface cloners.
- */
-
-struct if_clonereq {
-	int	ifcr_total;		/* total cloners (out) */
-	int	ifcr_count;		/* room for this many in user buffer */
-	char	*ifcr_buffer;		/* buffer for cloner names */
-};
-
-/*
- * Structure describing information about an interface
- * which may be of interest to management entities.
- */
-struct if_data {
-	/* generic interface information */
-	u_char	ifi_type;		/* ethernet, tokenring, etc */
-	u_char	ifi_physical;		/* e.g., AUI, Thinnet, 10base-T, etc */
-	u_char	ifi_addrlen;		/* media address length */
-	u_char	ifi_hdrlen;		/* media header length */
-	u_char	ifi_link_state;		/* current link state */
-	u_char	ifi_vhid;		/* carp vhid */
-	u_char	ifi_baudrate_pf;	/* baudrate power factor */
-	u_char	ifi_datalen;		/* length of this data struct */
-	u_long	ifi_mtu;		/* maximum transmission unit */
-	u_long	ifi_metric;		/* routing metric (external only) */
-	u_long	ifi_baudrate;		/* linespeed */
-	/* volatile statistics */
-	u_long	ifi_ipackets;		/* packets received on interface */
-	u_long	ifi_ierrors;		/* input errors on interface */
-	u_long	ifi_opackets;		/* packets sent on interface */
-	u_long	ifi_oerrors;		/* output errors on interface */
-	u_long	ifi_collisions;		/* collisions on csma interfaces */
-	u_long	ifi_ibytes;		/* total number of octets received */
-	u_long	ifi_obytes;		/* total number of octets sent */
-	u_long	ifi_imcasts;		/* packets received via multicast */
-	u_long	ifi_omcasts;		/* packets sent via multicast */
-	u_long	ifi_iqdrops;		/* dropped on input, this interface */
-	u_long	ifi_noproto;		/* destined for unsupported protocol */
-	uint64_t ifi_hwassist;		/* HW offload capabilities, see IFCAP */
-	time_t	ifi_epoch;		/* uptime at attach or stat reset */
-	struct	timeval ifi_lastchange;	/* time of last administrative change */
-#ifdef _IFI_OQDROPS
-	u_long	ifi_oqdrops;		/* dropped on output */
-#endif
-};
-
-/*-
- * Interface flags are of two types: network stack owned flags, and driver
- * owned flags.  Historically, these values were stored in the same ifnet
- * flags field, but with the advent of fine-grained locking, they have been
- * broken out such that the network stack is responsible for synchronizing
- * the stack-owned fields, and the device driver the device-owned fields.
- * Both halves can perform lockless reads of the other half's field, subject
- * to accepting the involved races.
- *
- * Both sets of flags come from the same number space, and should not be
- * permitted to conflict, as they are exposed to user space via a single
- * field.
- *
- * The following symbols identify read and write requirements for fields:
- *
- * (i) if_flags field set by device driver before attach, read-only there
- *     after.
- * (n) if_flags field written only by the network stack, read by either the
- *     stack or driver.
- * (d) if_drv_flags field written only by the device driver, read by either
- *     the stack or driver.
- */
-#define	IFF_UP		0x1		/* (n) interface is up */
-#define	IFF_BROADCAST	0x2		/* (i) broadcast address valid */
-#define	IFF_DEBUG	0x4		/* (n) turn on debugging */
-#define	IFF_LOOPBACK	0x8		/* (i) is a loopback net */
-#define	IFF_POINTOPOINT	0x10		/* (i) is a point-to-point link */
-#define	IFF_SMART	0x20		/* (i) interface manages own routes */
-#define	IFF_DRV_RUNNING	0x40		/* (d) resources allocated */
-#define	IFF_NOARP	0x80		/* (n) no address resolution protocol */
-#define	IFF_PROMISC	0x100		/* (n) receive all packets */
-#define	IFF_ALLMULTI	0x200		/* (n) receive all multicast packets */
-#define	IFF_DRV_OACTIVE	0x400		/* (d) tx hardware queue is full */
-#define	IFF_SIMPLEX	0x800		/* (i) can't hear own transmissions */
-#define	IFF_LINK0	0x1000		/* per link layer defined bit */
-#define	IFF_LINK1	0x2000		/* per link layer defined bit */
-#define	IFF_LINK2	0x4000		/* per link layer defined bit */
-#define	IFF_ALTPHYS	IFF_LINK2	/* use alternate physical connection */
-#define	IFF_MULTICAST	0x8000		/* (i) supports multicast */
-#define	IFF_CANTCONFIG	0x10000		/* (i) unconfigurable using ioctl(2) */
-#define	IFF_PPROMISC	0x20000		/* (n) user-requested promisc mode */
-#define	IFF_MONITOR	0x40000		/* (n) user-requested monitor mode */
-#define	IFF_STATICARP	0x80000		/* (n) static ARP */
-#define	IFF_DYING	0x200000	/* (n) interface is winding down */
-#define	IFF_RENAMING	0x400000	/* (n) interface is being renamed */
-/*
- * Old names for driver flags so that user space tools can continue to use
- * the old (portable) names.
- */
-#ifndef _KERNEL
-#define	IFF_RUNNING	IFF_DRV_RUNNING
-#define	IFF_OACTIVE	IFF_DRV_OACTIVE
-#endif
-
-/* flags set internally only: */
-#define	IFF_CANTCHANGE \
-	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_DRV_RUNNING|IFF_DRV_OACTIVE|\
-	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART|IFF_PROMISC|\
-	    IFF_DYING|IFF_CANTCONFIG)
-
-/*
- * Values for if_link_state.
- */
-#define	LINK_STATE_UNKNOWN	0	/* link invalid/unknown */
-#define	LINK_STATE_DOWN		1	/* link is down */
-#define	LINK_STATE_UP		2	/* link is up */
-
-/*
- * Some convenience macros used for setting ifi_baudrate.
- * XXX 1000 vs. 1024? --thorpej@netbsd.org
- */
-#define	IF_Kbps(x)	((uintmax_t)(x) * 1000)	/* kilobits/sec. */
-#define	IF_Mbps(x)	(IF_Kbps((x) * 1000))	/* megabits/sec. */
-#define	IF_Gbps(x)	(IF_Mbps((x) * 1000))	/* gigabits/sec. */
-
-/*
- * Capabilities that interfaces can advertise.
- *
- * struct ifnet.if_capabilities
- *   contains the optional features & capabilities a particular interface
- *   supports (not only the driver but also the detected hw revision).
- *   Capabilities are defined by IFCAP_* below.
- * struct ifnet.if_capenable
- *   contains the enabled (either by default or through ifconfig) optional
- *   features & capabilities on this interface.
- *   Capabilities are defined by IFCAP_* below.
- * struct if_data.ifi_hwassist in mbuf CSUM_ flag form, controlled by above
- *   contains the enabled optional feature & capabilites that can be used
- *   individually per packet and are specified in the mbuf pkthdr.csum_flags
- *   field.  IFCAP_* and CSUM_* do not match one to one and CSUM_* may be
- *   more detailed or differenciated than IFCAP_*.
- *   Hwassist features are defined CSUM_* in sys/mbuf.h
- *
- * Capabilities that cannot be arbitrarily changed with ifconfig/ioctl
- * are listed in IFCAP_CANTCHANGE, similar to IFF_CANTCHANGE.
- * This is not strictly necessary because the common code never
- * changes capabilities, and it is left to the individual driver
- * to do the right thing. However, having the filter here
- * avoids replication of the same code in all individual drivers.
- */
-#define	IFCAP_RXCSUM		0x00001  /* can offload checksum on RX */
-#define	IFCAP_TXCSUM		0x00002  /* can offload checksum on TX */
-#define	IFCAP_NETCONS		0x00004  /* can be a network console */
-#define	IFCAP_VLAN_MTU		0x00008	/* VLAN-compatible MTU */
-#define	IFCAP_VLAN_HWTAGGING	0x00010	/* hardware VLAN tag support */
-#define	IFCAP_JUMBO_MTU		0x00020	/* 9000 byte MTU supported */
-#define	IFCAP_POLLING		0x00040	/* driver supports polling */
-#define	IFCAP_VLAN_HWCSUM	0x00080	/* can do IFCAP_HWCSUM on VLANs */
-#define	IFCAP_TSO4		0x00100	/* can do TCP Segmentation Offload */
-#define	IFCAP_TSO6		0x00200	/* can do TCP6 Segmentation Offload */
-#define	IFCAP_LRO		0x00400	/* can do Large Receive Offload */
-#define	IFCAP_WOL_UCAST		0x00800	/* wake on any unicast frame */
-#define	IFCAP_WOL_MCAST		0x01000	/* wake on any multicast frame */
-#define	IFCAP_WOL_MAGIC		0x02000	/* wake on any Magic Packet */
-#define	IFCAP_TOE4		0x04000	/* interface can offload TCP */
-#define	IFCAP_TOE6		0x08000	/* interface can offload TCP6 */
-#define	IFCAP_VLAN_HWFILTER	0x10000 /* interface hw can filter vlan tag */
-#define	IFCAP_POLLING_NOCOUNT	0x20000 /* polling ticks cannot be fragmented */
-#define	IFCAP_VLAN_HWTSO	0x40000 /* can do IFCAP_TSO on VLANs */
-#define	IFCAP_LINKSTATE		0x80000 /* the runtime link state is dynamic */
-#define	IFCAP_NETMAP		0x100000 /* netmap mode supported/enabled */
-#define	IFCAP_RXCSUM_IPV6	0x200000  /* can offload checksum on IPv6 RX */
-#define	IFCAP_TXCSUM_IPV6	0x400000  /* can offload checksum on IPv6 TX */
-#define	IFCAP_HWSTATS		0x800000 /* manages counters internally */
-
-#define IFCAP_HWCSUM_IPV6	(IFCAP_RXCSUM_IPV6 | IFCAP_TXCSUM_IPV6)
-
-#define IFCAP_HWCSUM	(IFCAP_RXCSUM | IFCAP_TXCSUM)
-#define	IFCAP_TSO	(IFCAP_TSO4 | IFCAP_TSO6)
-#define	IFCAP_WOL	(IFCAP_WOL_UCAST | IFCAP_WOL_MCAST | IFCAP_WOL_MAGIC)
-#define	IFCAP_TOE	(IFCAP_TOE4 | IFCAP_TOE6)
-
-#define	IFCAP_CANTCHANGE	(IFCAP_NETMAP)
-
-#define	IFQ_MAXLEN	50
-#define	IFNET_SLOWHZ	1		/* granularity is 1 second */
-
-/*
- * Message format for use in obtaining information about interfaces
- * from getkerninfo and the routing socket
- * For the new, extensible interface see struct if_msghdrl below.
- */
-struct if_msghdr {
-	u_short	ifm_msglen;	/* to skip over non-understood messages */
-	u_char	ifm_version;	/* future binary compatibility */
-	u_char	ifm_type;	/* message type */
-	int	ifm_addrs;	/* like rtm_addrs */
-	int	ifm_flags;	/* value of if_flags */
-	u_short	ifm_index;	/* index for associated ifp */
-	struct	if_data ifm_data;/* statistics and other data about if */
-};
-
-/*
- * The 'l' version shall be used by new interfaces, like NET_RT_IFLISTL.  It is
- * extensible after ifm_data_off or within ifm_data.  Both the if_msghdr and
- * if_data now have a member field detailing the struct length in addition to
- * the routing message length.  Macros are provided to find the start of
- * ifm_data and the start of the socket address strucutres immediately following
- * struct if_msghdrl given a pointer to struct if_msghdrl.
- */
-#define	IF_MSGHDRL_IFM_DATA(_l) \
-    (struct if_data *)((char *)(_l) + (_l)->ifm_data_off)
-#define	IF_MSGHDRL_RTA(_l) \
-    (void *)((uintptr_t)(_l) + (_l)->ifm_len)
-struct if_msghdrl {
-	u_short	ifm_msglen;	/* to skip over non-understood messages */
-	u_char	ifm_version;	/* future binary compatibility */
-	u_char	ifm_type;	/* message type */
-	int	ifm_addrs;	/* like rtm_addrs */
-	int	ifm_flags;	/* value of if_flags */
-	u_short	ifm_index;	/* index for associated ifp */
-	u_short _ifm_spare1;	/* spare space to grow if_index, see if_var.h */
-	u_short	ifm_len;	/* length of if_msghdrl incl. if_data */
-	u_short	ifm_data_off;	/* offset of if_data from beginning */
-	struct	if_data ifm_data;/* statistics and other data about if */
-#ifdef _IN_NET_RTSOCK_C
-	u_long	ifi_oqdrops;
-#endif
-};
-
-/*
- * Message format for use in obtaining information about interface addresses
- * from getkerninfo and the routing socket
- * For the new, extensible interface see struct ifa_msghdrl below.
- */
-struct ifa_msghdr {
-	u_short	ifam_msglen;	/* to skip over non-understood messages */
-	u_char	ifam_version;	/* future binary compatibility */
-	u_char	ifam_type;	/* message type */
-	int	ifam_addrs;	/* like rtm_addrs */
-	int	ifam_flags;	/* value of ifa_flags */
-	u_short	ifam_index;	/* index for associated ifp */
-	int	ifam_metric;	/* value of ifa_metric */
-};
-
-/*
- * The 'l' version shall be used by new interfaces, like NET_RT_IFLISTL.  It is
- * extensible after ifam_metric or within ifam_data.  Both the ifa_msghdrl and
- * if_data now have a member field detailing the struct length in addition to
- * the routing message length.  Macros are provided to find the start of
- * ifm_data and the start of the socket address strucutres immediately following
- * struct ifa_msghdrl given a pointer to struct ifa_msghdrl.
- */
-#define	IFA_MSGHDRL_IFAM_DATA(_l) \
-    (struct if_data *)((char *)(_l) + (_l)->ifam_data_off)
-#define	IFA_MSGHDRL_RTA(_l) \
-    (void *)((uintptr_t)(_l) + (_l)->ifam_len)
-struct ifa_msghdrl {
-	u_short	ifam_msglen;	/* to skip over non-understood messages */
-	u_char	ifam_version;	/* future binary compatibility */
-	u_char	ifam_type;	/* message type */
-	int	ifam_addrs;	/* like rtm_addrs */
-	int	ifam_flags;	/* value of ifa_flags */
-	u_short	ifam_index;	/* index for associated ifp */
-	u_short _ifam_spare1;	/* spare space to grow if_index, see if_var.h */
-	u_short	ifam_len;	/* length of ifa_msghdrl incl. if_data */
-	u_short	ifam_data_off;	/* offset of if_data from beginning */
-	int	ifam_metric;	/* value of ifa_metric */
-	struct	if_data ifam_data;/* statistics and other data about if or
-				 * address */
-};
-
-/*
- * Message format for use in obtaining information about multicast addresses
- * from the routing socket
- */
-struct ifma_msghdr {
-	u_short	ifmam_msglen;	/* to skip over non-understood messages */
-	u_char	ifmam_version;	/* future binary compatibility */
-	u_char	ifmam_type;	/* message type */
-	int	ifmam_addrs;	/* like rtm_addrs */
-	int	ifmam_flags;	/* value of ifa_flags */
-	u_short	ifmam_index;	/* index for associated ifp */
-};
-
-/*
- * Message format announcing the arrival or departure of a network interface.
- */
-struct if_announcemsghdr {
-	u_short	ifan_msglen;	/* to skip over non-understood messages */
-	u_char	ifan_version;	/* future binary compatibility */
-	u_char	ifan_type;	/* message type */
-	u_short	ifan_index;	/* index for associated ifp */
-	char	ifan_name[IFNAMSIZ]; /* if name, e.g. "en0" */
-	u_short	ifan_what;	/* what type of announcement */
-};
-
-#define	IFAN_ARRIVAL	0	/* interface arrival */
-#define	IFAN_DEPARTURE	1	/* interface departure */
-
-/*
- * Buffer with length to be used in SIOCGIFDESCR/SIOCSIFDESCR requests
- */
-struct ifreq_buffer {
-	size_t	length;
-	void	*buffer;
-};
-
-/*
- * Interface request structure used for socket
- * ioctl's.  All interface ioctl's must have parameter
- * definitions which begin with ifr_name.  The
- * remainder may be interface specific.
- */
-struct	ifreq {
-	char	ifr_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	union {
-		struct	sockaddr ifru_addr;
-		struct	sockaddr ifru_dstaddr;
-		struct	sockaddr ifru_broadaddr;
-		struct	ifreq_buffer ifru_buffer;
-		short	ifru_flags[2];
-		short	ifru_index;
-		int	ifru_jid;
-		int	ifru_metric;
-		int	ifru_mtu;
-		int	ifru_phys;
-		int	ifru_media;
-		caddr_t	ifru_data;
-		int	ifru_cap[2];
-		u_int	ifru_fib;
-	} ifr_ifru;
-#define	ifr_addr	ifr_ifru.ifru_addr	/* address */
-#define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
-#define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address */
-#define	ifr_buffer	ifr_ifru.ifru_buffer	/* user supplied buffer with its length */
-#define	ifr_flags	ifr_ifru.ifru_flags[0]	/* flags (low 16 bits) */
-#define	ifr_flagshigh	ifr_ifru.ifru_flags[1]	/* flags (high 16 bits) */
-#define	ifr_jid		ifr_ifru.ifru_jid	/* jail/vnet */
-#define	ifr_metric	ifr_ifru.ifru_metric	/* metric */
-#define	ifr_mtu		ifr_ifru.ifru_mtu	/* mtu */
-#define ifr_phys	ifr_ifru.ifru_phys	/* physical wire */
-#define ifr_media	ifr_ifru.ifru_media	/* physical media */
-#define	ifr_data	ifr_ifru.ifru_data	/* for use by interface */
-#define	ifr_reqcap	ifr_ifru.ifru_cap[0]	/* requested capabilities */
-#define	ifr_curcap	ifr_ifru.ifru_cap[1]	/* current capabilities */
-#define	ifr_index	ifr_ifru.ifru_index	/* interface index */
-#define	ifr_fib		ifr_ifru.ifru_fib	/* interface fib */
-};
-
-#define	_SIZEOF_ADDR_IFREQ(ifr) \
-	((ifr).ifr_addr.sa_len > sizeof(struct sockaddr) ? \
-	 (sizeof(struct ifreq) - sizeof(struct sockaddr) + \
-	  (ifr).ifr_addr.sa_len) : sizeof(struct ifreq))
-
-struct ifaliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr ifra_addr;
-	struct	sockaddr ifra_broadaddr;
-	struct	sockaddr ifra_mask;
-	int	ifra_vhid;
-};
-
-/* Compat with pre-10.x */
-struct oifaliasreq {
-	char	ifra_name[IFNAMSIZ];
-	struct	sockaddr ifra_addr;
-	struct	sockaddr ifra_broadaddr;
-	struct	sockaddr ifra_mask;
-};
-
-struct ifmediareq {
-	char	ifm_name[IFNAMSIZ];	/* if name, e.g. "en0" */
-	int	ifm_current;		/* current media options */
-	int	ifm_mask;		/* don't care mask */
-	int	ifm_status;		/* media status */
-	int	ifm_active;		/* active options */
-	int	ifm_count;		/* # entries in ifm_ulist array */
-	int	*ifm_ulist;		/* media words */
-};
-
-struct  ifdrv {
-	char            ifd_name[IFNAMSIZ];     /* if name, e.g. "en0" */
-	unsigned long   ifd_cmd;
-	size_t          ifd_len;
-	void            *ifd_data;
-};
-
-/* 
- * Structure used to retrieve aux status data from interfaces.
- * Kernel suppliers to this interface should respect the formatting
- * needed by ifconfig(8): each line starts with a TAB and ends with
- * a newline.  The canonical example to copy and paste is in if_tun.c.
- */
-
-#define	IFSTATMAX	800		/* 10 lines of text */
-struct ifstat {
-	char	ifs_name[IFNAMSIZ];	/* if name, e.g. "en0" */
-	char	ascii[IFSTATMAX + 1];
-};
-
-/*
- * Structure used in SIOCGIFCONF request.
- * Used to retrieve interface configuration
- * for machine (useful for programs which
- * must know all networks accessible).
- */
-struct	ifconf {
-	int	ifc_len;		/* size of associated buffer */
-	union {
-		caddr_t	ifcu_buf;
-		struct	ifreq *ifcu_req;
-	} ifc_ifcu;
-#define	ifc_buf	ifc_ifcu.ifcu_buf	/* buffer address */
-#define	ifc_req	ifc_ifcu.ifcu_req	/* array of structures returned */
-};
-
-/*
- * interface groups
- */
-
-#define	IFG_ALL		"all"		/* group contains all interfaces */
-/* XXX: will we implement this? */
-#define	IFG_EGRESS	"egress"	/* if(s) default route(s) point to */
-
-struct ifg_req {
-	union {
-		char			 ifgrqu_group[IFNAMSIZ];
-		char			 ifgrqu_member[IFNAMSIZ];
-	} ifgrq_ifgrqu;
-#define	ifgrq_group	ifgrq_ifgrqu.ifgrqu_group
-#define	ifgrq_member	ifgrq_ifgrqu.ifgrqu_member
-};
-
-/*
- * Used to lookup groups for an interface
- */
-struct ifgroupreq {
-	char	ifgr_name[IFNAMSIZ];
-	u_int	ifgr_len;
-	union {
-		char	ifgru_group[IFNAMSIZ];
-		struct	ifg_req *ifgru_groups;
-	} ifgr_ifgru;
-#define ifgr_group	ifgr_ifgru.ifgru_group
-#define ifgr_groups	ifgr_ifgru.ifgru_groups
-};
-
-/*
- * Structure for SIOC[AGD]LIFADDR
- */
-struct if_laddrreq {
-	char	iflr_name[IFNAMSIZ];
-	u_int	flags;
-#define	IFLR_PREFIX	0x8000  /* in: prefix given  out: kernel fills id */
-	u_int	prefixlen;         /* in/out */
-	struct	sockaddr_storage addr;   /* in/out */
-	struct	sockaddr_storage dstaddr; /* out */
-};
-
-#endif /* __BSD_VISIBLE */
-
-#ifdef _KERNEL
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_IFADDR);
-MALLOC_DECLARE(M_IFMADDR);
-#endif
-#endif
-
-#ifndef _KERNEL
-struct if_nameindex {
-	unsigned int	if_index;	/* 1, 2, ... */
-	char		*if_name;	/* null terminated name: "le0", ... */
-};
-
-__BEGIN_DECLS
-void			 if_freenameindex(struct if_nameindex *);
-char			*if_indextoname(unsigned int, char *);
-struct if_nameindex	*if_nameindex(void);
-unsigned int		 if_nametoindex(const char *);
-__END_DECLS
-#endif
-
-#ifdef _KERNEL
-/* XXX - this should go away soon. */
-#include <net/if_var.h>
-#endif
-
-#endif /* !_NET_IF_H_ */
diff --git a/include.new/net/if_arc.h b/include.new/net/if_arc.h
deleted file mode 100644
index 1c378a1..0000000
--- a/include.new/net/if_arc.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*	$NetBSD: if_arc.h,v 1.13 1999/11/19 20:41:19 thorpej Exp $	*/
-/* $FreeBSD: releng/10.2/sys/net/if_arc.h 249925 2013-04-26 12:50:32Z glebius $ */
-
-/*-
- * 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.
- * 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.
- *
- * from: NetBSD: if_ether.h,v 1.10 1994/06/29 06:37:55 cgd Exp
- *       @(#)if_ether.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NET_IF_ARC_H_
-#define _NET_IF_ARC_H_
-
-/*
- * Arcnet address - 1 octets
- * don't know who uses this.
- */
-struct arc_addr {
-	u_int8_t  arc_addr_octet[1];
-} __packed;
-
-/*
- * Structure of a 2.5MB/s Arcnet header.
- * as given to interface code.
- */
-struct	arc_header {
-	u_int8_t  arc_shost;
-	u_int8_t  arc_dhost;
-	u_int8_t  arc_type;
-	/*
-	 * only present for newstyle encoding with LL fragmentation.
-	 * Don't use sizeof(anything), use ARC_HDR{,NEW}LEN instead.
-	 */
-	u_int8_t  arc_flag;
-	u_int16_t arc_seqid;
-
-	/*
-	 * only present in exception packets (arc_flag == 0xff)
-	 */
-	u_int8_t  arc_type2;	/* same as arc_type */
-	u_int8_t  arc_flag2;	/* real flag value */
-	u_int16_t arc_seqid2;	/* real seqid value */
-} __packed;
-
-#define	ARC_ADDR_LEN		1
-
-#define	ARC_HDRLEN		3
-#define	ARC_HDRNEWLEN		6
-#define	ARC_HDRNEWLEN_EXC	10
-
-/* these lengths are data link layer length - 2 * ARC_ADDR_LEN */
-#define	ARC_MIN_LEN		1
-#define	ARC_MIN_FORBID_LEN	254
-#define	ARC_MAX_FORBID_LEN	256
-#define	ARC_MAX_LEN		508
-#define ARC_MAX_DATA		504
-
-/* RFC 1051 */
-#define	ARCTYPE_IP_OLD		240	/* IP protocol */
-#define	ARCTYPE_ARP_OLD		241	/* address resolution protocol */
-
-/* RFC 1201 */
-#define	ARCTYPE_IP		212	/* IP protocol */
-#define	ARCTYPE_ARP		213	/* address resolution protocol */
-#define	ARCTYPE_REVARP		214	/* reverse addr resolution protocol */
-
-#define	ARCTYPE_ATALK		221	/* Appletalk */
-#define	ARCTYPE_BANIAN		247	/* Banyan Vines */
-#define	ARCTYPE_IPX		250	/* Novell IPX */
-
-#define ARCTYPE_INET6		0xc4	/* IPng */
-#define ARCTYPE_DIAGNOSE	0x80	/* as per ANSI/ATA 878.1 */
-
-#define	ARCMTU			507
-#define	ARCMIN			0
-
-#define ARC_PHDS_MAXMTU		60480
-
-struct	arccom {
-	struct	  ifnet *ac_ifp;	/* network-visible interface */
-
-	u_int16_t ac_seqid;		/* seq. id used by PHDS encap. */
-
-	u_int8_t  arc_shost;
-	u_int8_t  arc_dhost;
-	u_int8_t  arc_type;
-
-	u_int8_t  dummy0;
-	u_int16_t dummy1;
-	int sflag, fsflag, rsflag;
-	struct mbuf *curr_frag;
-
-	struct ac_frag {
-		u_int8_t  af_maxflag;	/* from first packet */
-		u_int8_t  af_lastseen;	/* last split flag seen */
-		u_int16_t af_seqid;
-		struct mbuf *af_packet;
-	} ac_fragtab[256];		/* indexed by sender ll address */
-};
-
-#ifdef _KERNEL
-extern u_int8_t arcbroadcastaddr;
-extern int arc_ipmtu;	/* XXX new ip only, no RFC 1051! */
-
-void	arc_ifattach(struct ifnet *, u_int8_t);
-void	arc_ifdetach(struct ifnet *);
-void	arc_storelladdr(struct ifnet *, u_int8_t);
-int	arc_isphds(u_int8_t);
-void	arc_input(struct ifnet *, struct mbuf *);
-int	arc_output(struct ifnet *, struct mbuf *,
-	    const struct sockaddr *, struct route *);
-int	arc_ioctl(struct ifnet *, u_long, caddr_t);
-
-void		arc_frag_init(struct ifnet *);
-struct mbuf *	arc_frag_next(struct ifnet *);
-#endif
-
-#endif /* _NET_IF_ARC_H_ */
diff --git a/include.new/net/if_arp.h b/include.new/net/if_arp.h
deleted file mode 100644
index 7c84429..0000000
--- a/include.new/net/if_arp.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * Copyright (c) 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.
- * 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.
- *
- *	@(#)if_arp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/net/if_arp.h 253084 2013-07-09 09:50:15Z ae $
- */
-
-#ifndef _NET_IF_ARP_H_
-#define	_NET_IF_ARP_H_
-
-/*
- * Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  ARP packets are variable
- * in size; the arphdr structure defines the fixed-length portion.
- * Protocol type values are the same as those for 10 Mb/s Ethernet.
- * It is followed by the variable-sized fields ar_sha, arp_spa,
- * arp_tha and arp_tpa in that order, according to the lengths
- * specified.  Field names used correspond to RFC 826.
- */
-struct	arphdr {
-	u_short	ar_hrd;		/* format of hardware address */
-#define ARPHRD_ETHER 	1	/* ethernet hardware format */
-#define ARPHRD_IEEE802	6	/* token-ring hardware format */
-#define ARPHRD_ARCNET	7	/* arcnet hardware format */
-#define ARPHRD_FRELAY 	15	/* frame relay hardware format */
-#define ARPHRD_IEEE1394	24	/* firewire hardware format */
-#define ARPHRD_INFINIBAND 32	/* infiniband hardware format */
-	u_short	ar_pro;		/* format of protocol address */
-	u_char	ar_hln;		/* length of hardware address */
-	u_char	ar_pln;		/* length of protocol address */
-	u_short	ar_op;		/* one of: */
-#define	ARPOP_REQUEST	1	/* request to resolve address */
-#define	ARPOP_REPLY	2	/* response to previous request */
-#define	ARPOP_REVREQUEST 3	/* request protocol address given hardware */
-#define	ARPOP_REVREPLY	4	/* response giving protocol address */
-#define ARPOP_INVREQUEST 8 	/* request to identify peer */
-#define ARPOP_INVREPLY	9	/* response identifying peer */
-/*
- * The remaining fields are variable in size,
- * according to the sizes above.
- */
-#ifdef COMMENT_ONLY
-	u_char	ar_sha[];	/* sender hardware address */
-	u_char	ar_spa[];	/* sender protocol address */
-	u_char	ar_tha[];	/* target hardware address */
-	u_char	ar_tpa[];	/* target protocol address */
-#endif
-};
-
-#define ar_sha(ap)	(((caddr_t)((ap)+1)) +   0)
-#define ar_spa(ap)	(((caddr_t)((ap)+1)) +   (ap)->ar_hln)
-#define ar_tha(ap)	(((caddr_t)((ap)+1)) +   (ap)->ar_hln + (ap)->ar_pln)
-#define ar_tpa(ap)	(((caddr_t)((ap)+1)) + 2*(ap)->ar_hln + (ap)->ar_pln)
-
-#define arphdr_len2(ar_hln, ar_pln)					\
-	(sizeof(struct arphdr) + 2*(ar_hln) + 2*(ar_pln))
-#define arphdr_len(ap)	(arphdr_len2((ap)->ar_hln, (ap)->ar_pln))
-
-/*
- * ARP ioctl request
- */
-struct arpreq {
-	struct	sockaddr arp_pa;		/* protocol address */
-	struct	sockaddr arp_ha;		/* hardware address */
-	int	arp_flags;			/* flags */
-};
-/*  arp_flags and at_flags field values */
-#define	ATF_INUSE	0x01	/* entry in use */
-#define ATF_COM		0x02	/* completed entry (enaddr valid) */
-#define	ATF_PERM	0x04	/* permanent entry */
-#define	ATF_PUBL	0x08	/* publish entry (respond for other host) */
-#define	ATF_USETRAILERS	0x10	/* has requested trailers */
-
-#ifdef _KERNEL
-/*
- * Structure shared between the ethernet driver modules and
- * the address resolution code.
- */
-struct	arpcom {
-	struct 	ifnet *ac_ifp;		/* network-visible interface */
-	void	*ac_netgraph;		/* ng_ether(4) netgraph node info */
-};
-#define IFP2AC(ifp) ((struct arpcom *)(ifp->if_l2com))
-#define AC2IFP(ac) ((ac)->ac_ifp)
-
-#endif /* _KERNEL */
-
-struct arpstat {
-	/* Normal things that happen: */
-	uint64_t txrequests;	/* # of ARP requests sent by this host. */
-	uint64_t txreplies;	/* # of ARP replies sent by this host. */
-	uint64_t rxrequests;	/* # of ARP requests received by this host. */
-	uint64_t rxreplies;	/* # of ARP replies received by this host. */
-	uint64_t received;	/* # of ARP packets received by this host. */
-
-	uint64_t arp_spares[4];	/* For either the upper or lower half. */
-	/* Abnormal event and error  counting: */
-	uint64_t dropped;	/* # of packets dropped waiting for a reply. */
-	uint64_t timeouts;	/* # of times with entries removed */
-				/* due to timeout. */
-	uint64_t dupips;	/* # of duplicate IPs detected. */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-#include <net/vnet.h>
-
-VNET_PCPUSTAT_DECLARE(struct arpstat, arpstat);
-/*
- * In-kernel consumers can use these accessor macros directly to update
- * stats.
- */
-#define	ARPSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct arpstat, arpstat, name, (val))
-#define	ARPSTAT_SUB(name, val)	ARPSTAT_ADD(name, -(val))
-#define	ARPSTAT_INC(name)	ARPSTAT_ADD(name, 1)
-#define	ARPSTAT_DEC(name)	ARPSTAT_SUB(name, 1)
-
-#endif /* _KERNEL */
-
-#endif /* !_NET_IF_ARP_H_ */
diff --git a/include.new/net/if_atm.h b/include.new/net/if_atm.h
deleted file mode 100644
index 1a66b29..0000000
--- a/include.new/net/if_atm.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*      $NetBSD: if_atm.h,v 1.7 1996/11/09 23:02:27 chuck Exp $       */
-/* $FreeBSD: releng/10.2/sys/net/if_atm.h 249925 2013-04-26 12:50:32Z glebius $ */
-
-/*-
- *
- * Copyright (c) 1996 Charles D. Cranor and Washington University.
- * 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 Charles D. Cranor and
- *	Washington University.
- * 4. 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 ``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 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.
- */
-
-/*
- * net/if_atm.h
- */
-
-/*
- * Classification of ATM cards.
- */
-#define	ATM_DEVICE_UNKNOWN	0
-#define	ATM_DEVICE_PCA200E	1	/* Fore/Marconi PCA200-E */
-#define	ATM_DEVICE_HE155	2	/* Fore/Marconi HE155 */
-#define	ATM_DEVICE_HE622	3	/* Fore/Marconi HE622 */
-#define	ATM_DEVICE_ENI155P	4	/* Efficient networks 155p */
-#define	ATM_DEVICE_ADP155P	5	/* Adaptec 155p */
-#define	ATM_DEVICE_FORELE25	6	/* ForeRunnerLE 25 */
-#define	ATM_DEVICE_FORELE155	7	/* ForeRunnerLE 155 */
-#define	ATM_DEVICE_NICSTAR25	8	/* other 77211 25.6MBit */
-#define	ATM_DEVICE_NICSTAR155	9	/* other 77211 155MBit */
-#define	ATM_DEVICE_IDTABR25	10	/* 77252 based card 25MBit */
-#define	ATM_DEVICE_IDTABR155	11	/* 77252 based card 155MBit */
-#define	ATM_DEVICE_PROATM25	12	/* 77252 based ProSum card 25MBit */
-#define	ATM_DEVICE_PROATM155	13	/* 77252 based ProSum card 155MBit */
-#define	ATM_DEVICE_VIRTUAL	14	/* virtual ATM device (netgraph) */
-
-/* map to strings and vendors */
-#define	ATM_DEVICE_NAMES						\
-	{ "Unknown",		"Unknown" },				\
-	{ "PCA200-E",		"Fore/Marconi" },			\
-	{ "HE155",		"Fore/Marconi" },			\
-	{ "HE622",		"Fore/Marconi" },			\
-	{ "ENI155p",		"Efficient Networks" },			\
-	{ "ADP155p",		"Adaptec" },				\
-	{ "ForeRunnerLE25",	"Fore/Marconi" },			\
-	{ "ForeRunnerLE155",	"Fore/Marconi" },			\
-	{ "IDT77211/25",	"IDT" },				\
-	{ "IDT77211/155",	"IDT" },				\
-	{ "IDT77252/25",	"IDT" },				\
-	{ "IDT77252/155",	"IDT" },				\
-	{ "ProATM/25",		"ProSum" },				\
-	{ "ProATM/155",		"ProSum" },				\
-	{ "Virtual",		"NetGraph" },
-
-/*
- * This is the common link layer MIB for all ATM interfaces. Much of the
- * information here is needed for ILMI. This will be augmented by statistics
- * at some point.
- */
-struct ifatm_mib {
-	/* configuration data */
-	uint8_t		device;		/* type of card */
-	u_char		esi[6];		/* end system identifier (MAC) */
-	uint32_t	serial;		/* card serial number */
-	uint32_t	hw_version;	/* card version */
-	uint32_t	sw_version;	/* firmware version (if any) */
-	uint32_t	pcr;		/* supported peak cell rate */
-	uint32_t	media;		/* physical media */
-	uint8_t		vpi_bits;	/* number of used bits in VPI field */
-	uint8_t		vci_bits;	/* number of used bits in VCI field */
-	uint16_t	max_vpcs;	/* maximum number of VPCs */
-	uint32_t	max_vccs;	/* maximum number of VCCs */
-};
-
-/*
- * Traffic parameters for ATM connections. This contains all parameters
- * to accomodate UBR, UBR+MCR, CBR, VBR and ABR connections.
- *
- * Keep in sync with ng_atm.h
- */
-struct atmio_tparam {
-	uint32_t	pcr;	/* 24bit: Peak Cell Rate */
-	uint32_t	scr;	/* 24bit: VBR Sustainable Cell Rate */
-	uint32_t	mbs;	/* 24bit: VBR Maximum burst size */
-	uint32_t	mcr;	/* 24bit: ABR/VBR/UBR+MCR MCR */
-	uint32_t	icr;	/* 24bit: ABR ICR */
-	uint32_t	tbe;	/* 24bit: ABR TBE (1...2^24-1) */
-	uint8_t		nrm;	/*  3bit: ABR Nrm */
-	uint8_t		trm;	/*  3bit: ABR Trm */
-	uint16_t	adtf;	/* 10bit: ABR ADTF */
-	uint8_t		rif;	/*  4bit: ABR RIF */
-	uint8_t		rdf;	/*  4bit: ABR RDF */
-	uint8_t		cdf;	/*  3bit: ABR CDF */
-};
-
-/*
- * VCC parameters
- *
- * Keep in sync with ng_atm.h
- */
-struct atmio_vcc {
-	uint16_t	flags;		/* VCC flags */
-	uint16_t	vpi;
-	uint16_t	vci;
-	uint16_t	rmtu;		/* maximum receive PDU */
-	uint16_t	tmtu;		/* maximum transmit PDU */
-	uint8_t		aal;		/* aal type */
-	uint8_t		traffic;	/* traffic type */
-	struct atmio_tparam tparam;	/* traffic parameters */
-};
-
-/* VCC flags */
-#define	ATMIO_FLAG_LLCSNAP	0x0002	/* same as ATM_PH_LLCSNAP */
-#define	ATMIO_FLAG_NG		0x0010	/* owned by netgraph */
-#define	ATMIO_FLAG_HARP		0x0020	/* owned by HARP */
-#define	ATMIO_FLAG_NORX		0x0100	/* not receiving on this VCC */
-#define	ATMIO_FLAG_NOTX		0x0200	/* not transmitting on this VCC */
-#define	ATMIO_FLAG_PVC		0x0400	/* this is a PVC */
-#define	ATMIO_FLAG_ASYNC	0x0800	/* async open/close */
-#define	ATMIO_FLAGS	"\020\2LLCSNAP\5NG\6HARP\11NORX\12NOTX\13PVC\14ASYNC"
-
-#define	ATMIO_AAL_0		0	/* pure cells */
-#define	ATMIO_AAL_34		4	/* AAL3 and 4 */
-#define	ATMIO_AAL_5		5	/* AAL5 */
-#define	ATMIO_AAL_RAW		10	/* whatever the card does */
-
-#define	ATMIO_TRAFFIC_UBR	0
-#define	ATMIO_TRAFFIC_CBR	1
-#define	ATMIO_TRAFFIC_ABR	2
-#define	ATMIO_TRAFFIC_VBR	3
-
-/*
- * VCC table
- *
- * Keep in sync with ng_atm.h
- */
-struct atmio_vcctable {
-	uint32_t	count;		/* number of vccs */
-	struct atmio_vcc vccs[0];	/* array of VCCs */
-};
-
-/*
- * Peak cell rates for various physical media. Note, that there are
- * different opinions on what the correct values are.
- */
-#define	ATM_RATE_25_6M		59259
-#define	ATM_RATE_155M		353208
-#define	ATM_RATE_622M		1412830
-#define	ATM_RATE_2_4G		5651320
-
-#ifdef _KERNEL
-/*
- * Common fields for all ATM interfaces. Each driver's softc must start with
- * this structure.
- */
-struct ifatm {
-	struct ifnet	*ifp;
-	struct ifatm_mib mib;		/* exported data */
-	void		*phy;		/* usually SUNI */
-	void		*ngpriv;	/* netgraph link */
-};
-#define	IFP2IFATM(ifp)	((struct ifatm *)(ifp)->if_l2com)
-#endif
-
-/*
- * Keep structures in sync with ng_atm.h
- *
- * These are used by netgraph/harp to call the driver
- * NATM uses the atm_pseudoioctl instead.
- */
-struct atmio_openvcc {
-	void		*rxhand;	/* handle argument */
-	struct atmio_vcc param;		/* parameters */
-};
-
-struct atmio_closevcc {
-	uint16_t	vpi;
-	uint16_t	vci;
-};
-
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__)
-#define	RTALLOC1(A,B)		rtalloc1((A),(B))
-#elif defined(__FreeBSD__)
-#define	RTALLOC1(A,B)		rtalloc1((A),(B),0UL)
-#endif
-
-/*
- * pseudo header for packet transmission
- */
-struct atm_pseudohdr {
-	uint8_t		atm_ph[4];	/* flags+VPI+VCI1(msb)+VCI2(lsb) */
-};
-
-#define	ATM_PH_FLAGS(X)	((X)->atm_ph[0])
-#define	ATM_PH_VPI(X)	((X)->atm_ph[1])
-#define	ATM_PH_VCI(X)	((((X)->atm_ph[2]) << 8) | ((X)->atm_ph[3]))
-#define	ATM_PH_SETVCI(X,V) { \
-	(X)->atm_ph[2] = ((V) >> 8) & 0xff; \
-	(X)->atm_ph[3] = ((V) & 0xff); \
-}
-
-/* use AAL5? (0 == aal0) */
-#define	ATM_PH_AAL5	0x01
-/* use the LLC SNAP encoding (iff aal5) */
-#define	ATM_PH_LLCSNAP ATMIO_FLAG_LLCSNAP
-
-#define	ATM_PH_DRIVER7  0x40	/* reserve for driver's use */
-#define	ATM_PH_DRIVER8  0x80	/* reserve for driver's use */
-
-#define	ATMMTU		9180	/* ATM MTU size for IP */
-				/* XXX: could be 9188 with LLC/SNAP according
-					to comer */
-
-#define	SIOCATMGETVCCS	_IOW('a', 125, struct atmio_vcctable)
-#define	SIOCATMOPENVCC	_IOR('a', 126, struct atmio_openvcc)
-#define	SIOCATMCLOSEVCC _IOR('a', 127, struct atmio_closevcc)
-
-#define	SIOCATMGVCCS	_IOWR('i', 230, struct ifreq)
-
-/*
- * XXX forget all the garbage in if_llc.h and do it the easy way
- */
-#define	ATMLLC_HDR "\252\252\3\0\0\0"
-struct atmllc {
-	uint8_t		llchdr[6];	/* aa.aa.03.00.00.00 */
-	uint8_t		type[2];	/* "ethernet" type */
-};
-
-/* ATM_LLC macros: note type code in host byte order */
-#define	ATM_LLC_TYPE(X) (((X)->type[0] << 8) | ((X)->type[1]))
-#define	ATM_LLC_SETTYPE(X, V) do {		\
-	(X)->type[0] = ((V) >> 8) & 0xff;	\
-	(X)->type[1] = ((V) & 0xff);		\
-    } while (0)
-
-/*
- * Events that are emitted by the driver. Currently the only consumer
- * of this is the netgraph node.
- */
-#define	ATMEV_FLOW_CONTROL	0x0001	/* channel busy state changed */
-#define	ATMEV_IFSTATE_CHANGED	0x0002	/* up/down or carrier */
-#define	ATMEV_VCC_CHANGED	0x0003	/* PVC deleted/create */
-#define	ATMEV_ACR_CHANGED	0x0004	/* ABR ACR has changed */
-
-struct atmev_flow_control {
-	uint16_t	vpi;		/* channel that is changed */
-	uint16_t	vci;
-	u_int		busy : 1;	/* != 0 -> ATM layer busy */
-};
-
-struct atmev_ifstate_changed {
-	u_int		running : 1;	/* interface is running now */
-	u_int		carrier : 1;	/* carrier detected (or not) */
-};
-
-struct atmev_vcc_changed {
-	uint16_t	vpi;		/* channel that is changed */
-	uint16_t	vci;
-	u_int		up : 1;		/* 1 - created, 0 - deleted */
-};
-
-struct atmev_acr_changed {
-	uint16_t	vpi;		/* channel that is changed */
-	uint16_t	vci;
-	uint32_t	acr;		/* new ACR */
-};
-
-#ifdef _KERNEL
-void	atm_ifattach(struct ifnet *);
-void	atm_ifdetach(struct ifnet *);
-void	atm_input(struct ifnet *, struct atm_pseudohdr *,
-	    struct mbuf *, void *);
-int	atm_output(struct ifnet *, struct mbuf *, const struct sockaddr *, 
-	    struct route *);
-struct atmio_vcctable *atm_getvccs(struct atmio_vcc **, u_int, u_int,
-	    struct mtx *, int);
-
-void	atm_event(struct ifnet *, u_int, void *);
-
-#define	ATMEV_SEND_FLOW_CONTROL(ATMIF, VPI, VCI, BUSY)			\
-	do {								\
-		struct atmev_flow_control _arg;				\
-		_arg.vpi = (VPI);					\
-		_arg.vci = (VCI);					\
-		_arg.busy = (BUSY);					\
-		atm_event((ATMIF)->ifp, ATMEV_FLOW_CONTROL, &_arg);	\
-	} while (0)
-
-#define	ATMEV_SEND_VCC_CHANGED(ATMIF, VPI, VCI, UP)			\
-	do {								\
-		struct atmev_vcc_changed _arg;				\
-		_arg.vpi = (VPI);					\
-		_arg.vci = (VCI);					\
-		_arg.up = (UP);						\
-		atm_event((ATMIF)->ifp, ATMEV_VCC_CHANGED, &_arg);	\
-	} while (0)
-
-#define	ATMEV_SEND_IFSTATE_CHANGED(ATMIF, CARRIER)			\
-	do {								\
-		struct atmev_ifstate_changed _arg;			\
-		_arg.running = (((ATMIF)->ifp->if_drv_flags &		\
-		    IFF_DRV_RUNNING) != 0);				\
-		_arg.carrier = ((CARRIER) != 0);			\
-		atm_event((ATMIF)->ifp, ATMEV_IFSTATE_CHANGED, &_arg); \
-	} while (0)
-
-#define	ATMEV_SEND_ACR_CHANGED(ATMIF, VPI, VCI, ACR)			\
-	do {								\
-		struct atmev_acr_changed _arg;				\
-		_arg.vpi = (VPI);					\
-		_arg.vci = (VCI);					\
-		_arg.acr= (ACR);					\
-		atm_event((ATMIF)->ifp, ATMEV_ACR_CHANGED, &_arg);	\
-	} while (0)
-#endif
diff --git a/include.new/net/if_bridgevar.h b/include.new/net/if_bridgevar.h
deleted file mode 100644
index 4b57c55..0000000
--- a/include.new/net/if_bridgevar.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*	$NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $	*/
-
-/*
- * Copyright 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Jason R. Thorpe for Wasabi Systems, Inc.
- *
- * 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 for the NetBSD Project by
- *	Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
- * 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.
- */
-
-/*
- * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
- * 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 Jason L. Wright
- * 4. 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 ``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 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.
- *
- * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp
- *
- * $FreeBSD: releng/10.2/sys/net/if_bridgevar.h 173320 2007-11-04 08:32:27Z thompsa $
- */
-
-/*
- * Data structure and control definitions for bridge interfaces.
- */
-
-#include <sys/callout.h>
-#include <sys/queue.h>
-#include <sys/condvar.h>
-
-/*
- * Commands used in the SIOCSDRVSPEC ioctl.  Note the lookup of the
- * bridge interface itself is keyed off the ifdrv structure.
- */
-#define	BRDGADD			0	/* add bridge member (ifbreq) */
-#define	BRDGDEL			1	/* delete bridge member (ifbreq) */
-#define	BRDGGIFFLGS		2	/* get member if flags (ifbreq) */
-#define	BRDGSIFFLGS		3	/* set member if flags (ifbreq) */
-#define	BRDGSCACHE		4	/* set cache size (ifbrparam) */
-#define	BRDGGCACHE		5	/* get cache size (ifbrparam) */
-#define	BRDGGIFS		6	/* get member list (ifbifconf) */
-#define	BRDGRTS			7	/* get address list (ifbaconf) */
-#define	BRDGSADDR		8	/* set static address (ifbareq) */
-#define	BRDGSTO			9	/* set cache timeout (ifbrparam) */
-#define	BRDGGTO			10	/* get cache timeout (ifbrparam) */
-#define	BRDGDADDR		11	/* delete address (ifbareq) */
-#define	BRDGFLUSH		12	/* flush address cache (ifbreq) */
-
-#define	BRDGGPRI		13	/* get priority (ifbrparam) */
-#define	BRDGSPRI		14	/* set priority (ifbrparam) */
-#define	BRDGGHT			15	/* get hello time (ifbrparam) */
-#define	BRDGSHT			16	/* set hello time (ifbrparam) */
-#define	BRDGGFD			17	/* get forward delay (ifbrparam) */
-#define	BRDGSFD			18	/* set forward delay (ifbrparam) */
-#define	BRDGGMA			19	/* get max age (ifbrparam) */
-#define	BRDGSMA			20	/* set max age (ifbrparam) */
-#define	BRDGSIFPRIO		21	/* set if priority (ifbreq) */
-#define	BRDGSIFCOST		22	/* set if path cost (ifbreq) */
-#define	BRDGADDS		23	/* add bridge span member (ifbreq) */
-#define	BRDGDELS		24	/* delete bridge span member (ifbreq) */
-#define	BRDGPARAM		25	/* get bridge STP params (ifbropreq) */
-#define	BRDGGRTE		26	/* get cache drops (ifbrparam) */
-#define	BRDGGIFSSTP		27	/* get member STP params list
-					 * (ifbpstpconf) */
-#define	BRDGSPROTO		28	/* set protocol (ifbrparam) */
-#define	BRDGSTXHC		29	/* set tx hold count (ifbrparam) */
-#define	BRDGSIFAMAX		30	/* set max interface addrs (ifbreq) */
-
-/*
- * Generic bridge control request.
- */
-struct ifbreq {
-	char		ifbr_ifsname[IFNAMSIZ];	/* member if name */
-	uint32_t	ifbr_ifsflags;		/* member if flags */
-	uint32_t	ifbr_stpflags;		/* member if STP flags */
-	uint32_t	ifbr_path_cost;		/* member if STP cost */
-	uint8_t		ifbr_portno;		/* member if port number */
-	uint8_t		ifbr_priority;		/* member if STP priority */
-	uint8_t		ifbr_proto;		/* member if STP protocol */
-	uint8_t		ifbr_role;		/* member if STP role */
-	uint8_t		ifbr_state;		/* member if STP state */
-	uint32_t	ifbr_addrcnt;		/* member if addr number */
-	uint32_t	ifbr_addrmax;		/* member if addr max */
-	uint32_t	ifbr_addrexceeded;	/* member if addr violations */
-	uint8_t		pad[32];
-};
-
-/* BRDGGIFFLAGS, BRDGSIFFLAGS */
-#define	IFBIF_LEARNING		0x0001	/* if can learn */
-#define	IFBIF_DISCOVER		0x0002	/* if sends packets w/ unknown dest. */
-#define	IFBIF_STP		0x0004	/* if participates in spanning tree */
-#define	IFBIF_SPAN		0x0008	/* if is a span port */
-#define	IFBIF_STICKY		0x0010	/* if learned addresses stick */
-#define	IFBIF_BSTP_EDGE		0x0020	/* member stp edge port */
-#define	IFBIF_BSTP_AUTOEDGE	0x0040	/* member stp autoedge enabled */
-#define	IFBIF_BSTP_PTP		0x0080	/* member stp point to point */
-#define	IFBIF_BSTP_AUTOPTP	0x0100	/* member stp autoptp enabled */
-#define	IFBIF_BSTP_ADMEDGE	0x0200	/* member stp admin edge enabled */
-#define	IFBIF_BSTP_ADMCOST	0x0400	/* member stp admin path cost */
-#define	IFBIF_PRIVATE		0x0800	/* if is a private segment */
-
-#define	IFBIFBITS	"\020\001LEARNING\002DISCOVER\003STP\004SPAN" \
-			"\005STICKY\014PRIVATE\006EDGE\007AUTOEDGE\010PTP" \
-			"\011AUTOPTP"
-#define	IFBIFMASK	~(IFBIF_BSTP_EDGE|IFBIF_BSTP_AUTOEDGE|IFBIF_BSTP_PTP| \
-			IFBIF_BSTP_AUTOPTP|IFBIF_BSTP_ADMEDGE| \
-			IFBIF_BSTP_ADMCOST)	/* not saved */
-
-/* BRDGFLUSH */
-#define	IFBF_FLUSHDYN		0x00	/* flush learned addresses only */
-#define	IFBF_FLUSHALL		0x01	/* flush all addresses */
-
-/*
- * Interface list structure.
- */
-struct ifbifconf {
-	uint32_t	ifbic_len;	/* buffer size */
-	union {
-		caddr_t	ifbicu_buf;
-		struct ifbreq *ifbicu_req;
-	} ifbic_ifbicu;
-#define	ifbic_buf	ifbic_ifbicu.ifbicu_buf
-#define	ifbic_req	ifbic_ifbicu.ifbicu_req
-};
-
-/*
- * Bridge address request.
- */
-struct ifbareq {
-	char		ifba_ifsname[IFNAMSIZ];	/* member if name */
-	unsigned long	ifba_expire;		/* address expire time */
-	uint8_t		ifba_flags;		/* address flags */
-	uint8_t		ifba_dst[ETHER_ADDR_LEN];/* destination address */
-	uint16_t	ifba_vlan;		/* vlan id */
-};
-
-#define	IFBAF_TYPEMASK	0x03	/* address type mask */
-#define	IFBAF_DYNAMIC	0x00	/* dynamically learned address */
-#define	IFBAF_STATIC	0x01	/* static address */
-#define	IFBAF_STICKY	0x02	/* sticky address */
-
-#define	IFBAFBITS	"\020\1STATIC\2STICKY"
-
-/*
- * Address list structure.
- */
-struct ifbaconf {
-	uint32_t	ifbac_len;	/* buffer size */
-	union {
-		caddr_t ifbacu_buf;
-		struct ifbareq *ifbacu_req;
-	} ifbac_ifbacu;
-#define	ifbac_buf	ifbac_ifbacu.ifbacu_buf
-#define	ifbac_req	ifbac_ifbacu.ifbacu_req
-};
-
-/*
- * Bridge parameter structure.
- */
-struct ifbrparam {
-	union {
-		uint32_t ifbrpu_int32;
-		uint16_t ifbrpu_int16;
-		uint8_t ifbrpu_int8;
-	} ifbrp_ifbrpu;
-};
-#define	ifbrp_csize	ifbrp_ifbrpu.ifbrpu_int32	/* cache size */
-#define	ifbrp_ctime	ifbrp_ifbrpu.ifbrpu_int32	/* cache time (sec) */
-#define	ifbrp_prio	ifbrp_ifbrpu.ifbrpu_int16	/* bridge priority */
-#define	ifbrp_proto	ifbrp_ifbrpu.ifbrpu_int8	/* bridge protocol */
-#define	ifbrp_txhc	ifbrp_ifbrpu.ifbrpu_int8	/* bpdu tx holdcount */
-#define	ifbrp_hellotime	ifbrp_ifbrpu.ifbrpu_int8	/* hello time (sec) */
-#define	ifbrp_fwddelay	ifbrp_ifbrpu.ifbrpu_int8	/* fwd time (sec) */
-#define	ifbrp_maxage	ifbrp_ifbrpu.ifbrpu_int8	/* max age (sec) */
-#define	ifbrp_cexceeded ifbrp_ifbrpu.ifbrpu_int32	/* # of cache dropped
-							 * adresses */
-/*
- * Bridge current operational parameters structure.
- */
-struct ifbropreq {
-	uint8_t		ifbop_holdcount;
-	uint8_t		ifbop_maxage;
-	uint8_t		ifbop_hellotime;
-	uint8_t		ifbop_fwddelay;
-	uint8_t		ifbop_protocol;
-	uint16_t	ifbop_priority;
-	uint16_t	ifbop_root_port;
-	uint32_t	ifbop_root_path_cost;
-	uint64_t	ifbop_bridgeid;
-	uint64_t	ifbop_designated_root;
-	uint64_t	ifbop_designated_bridge;
-	struct timeval	ifbop_last_tc_time;
-};
-
-/*
- * Bridge member operational STP params structure.
- */
-struct ifbpstpreq {
-	uint8_t		ifbp_portno;		/* bp STP port number */
-	uint32_t	ifbp_fwd_trans;		/* bp STP fwd transitions */
-	uint32_t	ifbp_design_cost;	/* bp STP designated cost */
-	uint32_t	ifbp_design_port;	/* bp STP designated port */
-	uint64_t	ifbp_design_bridge;	/* bp STP designated bridge */
-	uint64_t	ifbp_design_root;	/* bp STP designated root */
-};
-
-/*
- * Bridge STP ports list structure.
- */
-struct ifbpstpconf {
-	uint32_t	ifbpstp_len;	/* buffer size */
-	union {
-		caddr_t	ifbpstpu_buf;
-		struct ifbpstpreq *ifbpstpu_req;
-	} ifbpstp_ifbpstpu;
-#define	ifbpstp_buf	ifbpstp_ifbpstpu.ifbpstpu_buf
-#define	ifbpstp_req	ifbpstp_ifbpstpu.ifbpstpu_req
-};
-
-#ifdef _KERNEL
-
-#define BRIDGE_LOCK_INIT(_sc)		do {			\
-	mtx_init(&(_sc)->sc_mtx, "if_bridge", NULL, MTX_DEF);	\
-	cv_init(&(_sc)->sc_cv, "if_bridge_cv");			\
-} while (0)
-#define BRIDGE_LOCK_DESTROY(_sc)	do {	\
-	mtx_destroy(&(_sc)->sc_mtx);		\
-	cv_destroy(&(_sc)->sc_cv);		\
-} while (0)
-#define BRIDGE_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
-#define BRIDGE_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
-#define BRIDGE_LOCK_ASSERT(_sc)		mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
-#define	BRIDGE_LOCK2REF(_sc, _err)	do {	\
-	mtx_assert(&(_sc)->sc_mtx, MA_OWNED);	\
-	if ((_sc)->sc_iflist_xcnt > 0)		\
-		(_err) = EBUSY;			\
-	else					\
-		(_sc)->sc_iflist_ref++;		\
-	mtx_unlock(&(_sc)->sc_mtx);		\
-} while (0)
-#define	BRIDGE_UNREF(_sc)		do {				\
-	mtx_lock(&(_sc)->sc_mtx);					\
-	(_sc)->sc_iflist_ref--;						\
-	if (((_sc)->sc_iflist_xcnt > 0) && ((_sc)->sc_iflist_ref == 0))	\
-		cv_broadcast(&(_sc)->sc_cv);				\
-	mtx_unlock(&(_sc)->sc_mtx);					\
-} while (0)
-#define	BRIDGE_XLOCK(_sc)		do {		\
-	mtx_assert(&(_sc)->sc_mtx, MA_OWNED);		\
-	(_sc)->sc_iflist_xcnt++;			\
-	while ((_sc)->sc_iflist_ref > 0)		\
-		cv_wait(&(_sc)->sc_cv, &(_sc)->sc_mtx);	\
-} while (0)
-#define	BRIDGE_XDROP(_sc)		do {	\
-	mtx_assert(&(_sc)->sc_mtx, MA_OWNED);	\
-	(_sc)->sc_iflist_xcnt--;		\
-} while (0)
-
-#define BRIDGE_INPUT(_ifp, _m)		do {    	\
-	KASSERT(bridge_input_p != NULL,			\
-	    ("%s: if_bridge not loaded!", __func__));	\
-	_m = (*bridge_input_p)(_ifp, _m);		\
-	if (_m != NULL)					\
-		_ifp = _m->m_pkthdr.rcvif;		\
-} while (0)
-
-#define BRIDGE_OUTPUT(_ifp, _m, _err)	do {    		\
-	KASSERT(bridge_output_p != NULL,			\
-	    ("%s: if_bridge not loaded!", __func__));		\
-	_err = (*bridge_output_p)(_ifp, _m, NULL, NULL);	\
-} while (0)
-
-extern	struct mbuf *(*bridge_input_p)(struct ifnet *, struct mbuf *);
-extern	int (*bridge_output_p)(struct ifnet *, struct mbuf *,
-		struct sockaddr *, struct rtentry *);
-extern	void (*bridge_dn_p)(struct mbuf *, struct ifnet *);
-
-#endif /* _KERNEL */
diff --git a/include.new/net/if_clone.h b/include.new/net/if_clone.h
deleted file mode 100644
index a567940..0000000
--- a/include.new/net/if_clone.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 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.
- * 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.
- *
- *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/net/if_clone.h 285824 2015-07-23 19:57:47Z hrs $
- */
-
-#ifndef	_NET_IF_CLONE_H_
-#define	_NET_IF_CLONE_H_
-
-#ifdef _KERNEL
-
-struct if_clone;
-
-/* Methods. */
-typedef int	ifc_match_t(struct if_clone *, const char *);
-typedef int	ifc_create_t(struct if_clone *, char *, size_t, caddr_t);
-typedef int	ifc_destroy_t(struct if_clone *, struct ifnet *);
-
-typedef int	ifcs_create_t(struct if_clone *, int, caddr_t);
-typedef void	ifcs_destroy_t(struct ifnet *);
-
-/* Interface cloner (de)allocating functions. */
-struct if_clone *
-	if_clone_advanced(const char *, u_int, ifc_match_t, ifc_create_t,
-		      ifc_destroy_t);
-struct if_clone *
-	if_clone_simple(const char *, ifcs_create_t, ifcs_destroy_t, u_int);
-void	if_clone_detach(struct if_clone *);
-
-/* Unit (de)allocating fucntions. */
-int	ifc_name2unit(const char *name, int *unit);
-int	ifc_alloc_unit(struct if_clone *, int *);
-void	ifc_free_unit(struct if_clone *, int);
-
-/* Interface clone event. */
-typedef void (*if_clone_event_handler_t)(void *, struct if_clone *);
-EVENTHANDLER_DECLARE(if_clone_event, if_clone_event_handler_t);
-
-/* The below interfaces used only by net/if.c. */
-void	if_clone_init(void);
-void	vnet_if_clone_init(void);
-int	if_clone_create(char *, size_t, caddr_t);
-int	if_clone_destroy(const char *);
-int	if_clone_list(struct if_clonereq *);
-struct if_clone *if_clone_findifc(struct ifnet *);
-void	if_clone_addgroup(struct ifnet *, struct if_clone *);
-
-/* The below interface used only by epair(4). */
-int	if_clone_destroyif(struct if_clone *, struct ifnet *);
-
-#endif /* _KERNEL */
-#endif /* !_NET_IF_CLONE_H_ */
diff --git a/include.new/net/if_dl.h b/include.new/net/if_dl.h
deleted file mode 100644
index 4aec6d0..0000000
--- a/include.new/net/if_dl.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- *
- *	@(#)if_dl.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/net/if_dl.h 235640 2012-05-19 02:39:43Z marcel $
- */
-
-#ifndef _NET_IF_DL_H_
-#define _NET_IF_DL_H_
-
-/*
- * A Link-Level Sockaddr may specify the interface in one of two
- * ways: either by means of a system-provided index number (computed
- * anew and possibly differently on every reboot), or by a human-readable
- * string such as "il0" (for managerial convenience).
- *
- * Census taking actions, such as something akin to SIOCGCONF would return
- * both the index and the human name.
- *
- * High volume transactions (such as giving a link-level ``from'' address
- * in a recvfrom or recvmsg call) may be likely only to provide the indexed
- * form, (which requires fewer copy operations and less space).
- *
- * The form and interpretation  of the link-level address is purely a matter
- * of convention between the device driver and its consumers; however, it is
- * expected that all drivers for an interface of a given if_type will agree.
- */
-
-/*
- * Structure of a Link-Level sockaddr:
- */
-struct sockaddr_dl {
-	u_char	sdl_len;	/* Total length of sockaddr */
-	u_char	sdl_family;	/* AF_LINK */
-	u_short	sdl_index;	/* if != 0, system given index for interface */
-	u_char	sdl_type;	/* interface type */
-	u_char	sdl_nlen;	/* interface name length, no trailing 0 reqd. */
-	u_char	sdl_alen;	/* link level address length */
-	u_char	sdl_slen;	/* link layer selector length */
-	char	sdl_data[46];	/* minimum work area, can be larger;
-				   contains both if name and ll address */
-};
-
-#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
-#define LLINDEX(s) ((s)->sdl_index)
-
-#ifndef _KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void	link_addr(const char *, struct sockaddr_dl *);
-char	*link_ntoa(const struct sockaddr_dl *);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif
diff --git a/include.new/net/if_enc.h b/include.new/net/if_enc.h
deleted file mode 100644
index 451f433..0000000
--- a/include.new/net/if_enc.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2008 The FreeBSD Project.
- * 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.
- *
- * 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: releng/10.2/sys/net/if_enc.h 181627 2008-08-12 09:05:01Z vanhu $
- */
-
-#ifndef _NET_IF_ENC_H
-#define _NET_IF_ENC_H
-
-extern struct ifnet	*encif;
-
-#endif /* _NET_IF_ENC_H */
diff --git a/include.new/net/if_gif.h b/include.new/net/if_gif.h
deleted file mode 100644
index 532bb59..0000000
--- a/include.new/net/if_gif.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/net/if_gif.h 284072 2015-06-06 13:26:13Z ae $	*/
-/*	$KAME: if_gif.h,v 1.17 2000/09/11 11:36:41 sumikawa Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NET_IF_GIF_H_
-#define _NET_IF_GIF_H_
-
-#ifdef _KERNEL
-#include "opt_inet.h"
-#include "opt_inet6.h"
-
-#include <netinet/in.h>
-
-struct ip;
-struct ip6_hdr;
-struct encaptab;
-
-extern	void (*ng_gif_input_p)(struct ifnet *ifp, struct mbuf **mp,
-		int af);
-extern	void (*ng_gif_input_orphan_p)(struct ifnet *ifp, struct mbuf *m,
-		int af);
-extern	int  (*ng_gif_output_p)(struct ifnet *ifp, struct mbuf **mp);
-extern	void (*ng_gif_attach_p)(struct ifnet *ifp);
-extern	void (*ng_gif_detach_p)(struct ifnet *ifp);
-
-struct gif_softc {
-	struct ifnet		*gif_ifp;
-	struct rmlock		gif_lock;
-	const struct encaptab	*gif_ecookie;
-	int			gif_family;
-	int			gif_flags;
-	u_int			gif_fibnum;
-	u_int			gif_options;
-	void			*gif_netgraph;	/* netgraph node info */
-	union {
-		void		*hdr;
-		struct ip	*iphdr;
-#ifdef INET6
-		struct ip6_hdr	*ip6hdr;
-#endif
-	} gif_uhdr;
-	LIST_ENTRY(gif_softc)	gif_list; /* all gif's are linked */
-};
-#define	GIF2IFP(sc)	((sc)->gif_ifp)
-#define	GIF_LOCK_INIT(sc)	rm_init(&(sc)->gif_lock, "gif softc")
-#define	GIF_LOCK_DESTROY(sc)	rm_destroy(&(sc)->gif_lock)
-#define	GIF_RLOCK_TRACKER	struct rm_priotracker gif_tracker
-#define	GIF_RLOCK(sc)		rm_rlock(&(sc)->gif_lock, &gif_tracker)
-#define	GIF_RUNLOCK(sc)		rm_runlock(&(sc)->gif_lock, &gif_tracker)
-#define	GIF_RLOCK_ASSERT(sc)	rm_assert(&(sc)->gif_lock, RA_RLOCKED)
-#define	GIF_WLOCK(sc)		rm_wlock(&(sc)->gif_lock)
-#define	GIF_WUNLOCK(sc)		rm_wunlock(&(sc)->gif_lock)
-#define	GIF_WLOCK_ASSERT(sc)	rm_assert(&(sc)->gif_lock, RA_WLOCKED)
-
-#define	gif_iphdr	gif_uhdr.iphdr
-#define	gif_hdr		gif_uhdr.hdr
-#ifdef INET6
-#define	gif_ip6hdr	gif_uhdr.ip6hdr
-#endif
-
-#define GIF_MTU		(1280)	/* Default MTU */
-#define	GIF_MTU_MIN	(1280)	/* Minimum MTU */
-#define	GIF_MTU_MAX	(8192)	/* Maximum MTU */
-
-struct etherip_header {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int	eip_resvl:4,	/* reserved */
-		eip_ver:4;	/* version */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_int	eip_ver:4,	/* version */
-		eip_resvl:4;	/* reserved */
-#endif
-	u_int8_t eip_resvh;	/* reserved */
-} __packed;
-
-#define ETHERIP_VERSION			0x3
-/* mbuf adjust factor to force 32-bit alignment of IP header */
-#define	ETHERIP_ALIGN		2
-
-/* Prototypes */
-void gif_input(struct mbuf *, struct ifnet *, int, uint8_t);
-int gif_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
-	       struct route *);
-int gif_encapcheck(const struct mbuf *, int, int, void *);
-#ifdef INET
-int in_gif_output(struct ifnet *, struct mbuf *, int, uint8_t);
-int in_gif_encapcheck(const struct mbuf *, int, int, void *);
-int in_gif_attach(struct gif_softc *);
-#endif
-#ifdef INET6
-int in6_gif_output(struct ifnet *, struct mbuf *, int, uint8_t);
-int in6_gif_encapcheck(const struct mbuf *, int, int, void *);
-int in6_gif_attach(struct gif_softc *);
-#endif
-#endif /* _KERNEL */
-
-#define GIFGOPTS	_IOWR('i', 150, struct ifreq)
-#define GIFSOPTS	_IOW('i', 151, struct ifreq)
-
-#define	GIF_ACCEPT_REVETHIP	0x0001
-#define	GIF_IGNORE_SOURCE	0x0002
-#define	GIF_SEND_REVETHIP	0x0010
-#define	GIF_OPTMASK		(GIF_ACCEPT_REVETHIP|GIF_SEND_REVETHIP| \
-    GIF_IGNORE_SOURCE)
-
-#endif /* _NET_IF_GIF_H_ */
diff --git a/include.new/net/if_gre.h b/include.new/net/if_gre.h
deleted file mode 100644
index 1661d0d..0000000
--- a/include.new/net/if_gre.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * Copyright (c) 2014 Andrey V. Elsukov <ae@FreeBSD.org>
- * All rights reserved
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Heiko W.Rupp <hwr@pilhuhn.de>
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- * $NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $
- * $FreeBSD: releng/10.2/sys/net/if_gre.h 284072 2015-06-06 13:26:13Z ae $
- */
-
-#ifndef _NET_IF_GRE_H_
-#define _NET_IF_GRE_H_
-
-#ifdef _KERNEL
-/* GRE header according to RFC 2784 and RFC 2890 */
-struct grehdr {
-	uint16_t	gre_flags;	/* GRE flags */
-#define	GRE_FLAGS_CP	0x8000		/* checksum present */
-#define	GRE_FLAGS_KP	0x2000		/* key present */
-#define	GRE_FLAGS_SP	0x1000		/* sequence present */
-#define	GRE_FLAGS_MASK	(GRE_FLAGS_CP|GRE_FLAGS_KP|GRE_FLAGS_SP)
-	uint16_t	gre_proto;	/* protocol type */
-	uint32_t	gre_opts[0];	/* optional fields */
-} __packed;
-
-#ifdef INET
-struct greip {
-	struct ip	gi_ip;
-	struct grehdr	gi_gre;
-} __packed;
-#endif
-
-#ifdef INET6
-struct greip6 {
-	struct ip6_hdr	gi6_ip6;
-	struct grehdr	gi6_gre;
-} __packed;
-#endif
-
-struct gre_softc {
-	struct ifnet		*gre_ifp;
-	LIST_ENTRY(gre_softc)	gre_list;
-	struct rmlock		gre_lock;
-	int			gre_family;	/* AF of delivery header */
-	uint32_t		gre_iseq;
-	uint32_t		gre_oseq;
-	uint32_t		gre_key;
-	uint32_t		gre_options;
-	uint32_t		gre_mtu;
-	u_int			gre_fibnum;
-	u_int			gre_hlen;	/* header size */
-	union {
-		void		*hdr;
-#ifdef INET
-		struct greip	*gihdr;
-#endif
-#ifdef INET6
-		struct greip6	*gi6hdr;
-#endif
-	} gre_uhdr;
-	const struct encaptab	*gre_ecookie;
-};
-#define	GRE2IFP(sc)		((sc)->gre_ifp)
-#define	GRE_LOCK_INIT(sc)	rm_init(&(sc)->gre_lock, "gre softc")
-#define	GRE_LOCK_DESTROY(sc)	rm_destroy(&(sc)->gre_lock)
-#define	GRE_RLOCK_TRACKER	struct rm_priotracker gre_tracker
-#define	GRE_RLOCK(sc)		rm_rlock(&(sc)->gre_lock, &gre_tracker)
-#define	GRE_RUNLOCK(sc)		rm_runlock(&(sc)->gre_lock, &gre_tracker)
-#define	GRE_RLOCK_ASSERT(sc)	rm_assert(&(sc)->gre_lock, RA_RLOCKED)
-#define	GRE_WLOCK(sc)		rm_wlock(&(sc)->gre_lock)
-#define	GRE_WUNLOCK(sc)		rm_wunlock(&(sc)->gre_lock)
-#define	GRE_WLOCK_ASSERT(sc)	rm_assert(&(sc)->gre_lock, RA_WLOCKED)
-
-#define	gre_hdr			gre_uhdr.hdr
-#define	gre_gihdr		gre_uhdr.gihdr
-#define	gre_gi6hdr		gre_uhdr.gi6hdr
-#define	gre_oip			gre_gihdr->gi_ip
-#define	gre_oip6		gre_gi6hdr->gi6_ip6
-
-int	gre_input(struct mbuf **, int *, int);
-#ifdef INET
-int	in_gre_attach(struct gre_softc *);
-int	in_gre_output(struct mbuf *, int, int);
-#endif
-#ifdef INET6
-int	in6_gre_attach(struct gre_softc *);
-int	in6_gre_output(struct mbuf *, int, int);
-#endif
-/*
- * CISCO uses special type for GRE tunnel created as part of WCCP
- * connection, while in fact those packets are just IPv4 encapsulated
- * into GRE.
- */
-#define ETHERTYPE_WCCP		0x883E
-#endif /* _KERNEL */
-
-#define GRESADDRS	_IOW('i', 101, struct ifreq)
-#define GRESADDRD	_IOW('i', 102, struct ifreq)
-#define GREGADDRS	_IOWR('i', 103, struct ifreq)
-#define GREGADDRD	_IOWR('i', 104, struct ifreq)
-#define GRESPROTO	_IOW('i' , 105, struct ifreq)
-#define GREGPROTO	_IOWR('i', 106, struct ifreq)
-
-#define	GREGKEY		_IOWR('i', 107, struct ifreq)
-#define	GRESKEY		_IOW('i', 108, struct ifreq)
-#define	GREGOPTS	_IOWR('i', 109, struct ifreq)
-#define	GRESOPTS	_IOW('i', 110, struct ifreq)
-
-#define	GRE_ENABLE_CSUM		0x0001
-#define	GRE_ENABLE_SEQ		0x0002
-#define	GRE_OPTMASK		(GRE_ENABLE_CSUM|GRE_ENABLE_SEQ)
-
-#endif /* _NET_IF_GRE_H_ */
diff --git a/include.new/net/if_lagg.h b/include.new/net/if_lagg.h
deleted file mode 100644
index bc1fdb8..0000000
--- a/include.new/net/if_lagg.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*	$OpenBSD: if_trunk.h,v 1.11 2007/01/31 06:20:19 reyk Exp $	*/
-
-/*
- * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD: releng/10.2/sys/net/if_lagg.h 281955 2015-04-24 23:26:44Z hiren $
- */
-
-#ifndef _NET_LAGG_H
-#define _NET_LAGG_H
-
-/*
- * Global definitions
- */
-
-#define	LAGG_MAX_PORTS		32	/* logically */
-#define	LAGG_MAX_NAMESIZE	32	/* name of a protocol */
-#define	LAGG_MAX_STACKING	4	/* maximum number of stacked laggs */
-
-/* Lagg flags */
-#define	LAGG_F_HASHL2		0x00000001	/* hash layer 2 */
-#define	LAGG_F_HASHL3		0x00000002	/* hash layer 3 */
-#define	LAGG_F_HASHL4		0x00000004	/* hash layer 4 */
-#define	LAGG_F_HASHMASK		0x00000007
-
-/* Port flags */
-#define	LAGG_PORT_SLAVE		0x00000000	/* normal enslaved port */
-#define	LAGG_PORT_MASTER	0x00000001	/* primary port */
-#define	LAGG_PORT_STACK		0x00000002	/* stacked lagg port */
-#define	LAGG_PORT_ACTIVE	0x00000004	/* port is active */
-#define	LAGG_PORT_COLLECTING	0x00000008	/* port is receiving frames */
-#define	LAGG_PORT_DISTRIBUTING	0x00000010	/* port is sending frames */
-#define	LAGG_PORT_DISABLED	0x00000020	/* port is disabled */
-#define	LAGG_PORT_BITS		"\20\01MASTER\02STACK\03ACTIVE\04COLLECTING" \
-				  "\05DISTRIBUTING\06DISABLED"
-
-/* Supported lagg PROTOs */
-#define	LAGG_PROTO_NONE		0	/* no lagg protocol defined */
-#define	LAGG_PROTO_ROUNDROBIN	1	/* simple round robin */
-#define	LAGG_PROTO_FAILOVER	2	/* active failover */
-#define	LAGG_PROTO_LOADBALANCE	3	/* loadbalance */
-#define	LAGG_PROTO_LACP		4	/* 802.3ad lacp */
-#define	LAGG_PROTO_ETHERCHANNEL	5	/* Cisco FEC */
-#define	LAGG_PROTO_MAX		6
-
-struct lagg_protos {
-	const char		*lpr_name;
-	int			lpr_proto;
-};
-
-#define	LAGG_PROTO_DEFAULT	LAGG_PROTO_FAILOVER
-#define LAGG_PROTOS	{						\
-	{ "failover",		LAGG_PROTO_FAILOVER },			\
-	{ "fec",		LAGG_PROTO_ETHERCHANNEL },		\
-	{ "lacp",		LAGG_PROTO_LACP },			\
-	{ "loadbalance",	LAGG_PROTO_LOADBALANCE },		\
-	{ "roundrobin",		LAGG_PROTO_ROUNDROBIN },		\
-	{ "none",		LAGG_PROTO_NONE },			\
-	{ "default",		LAGG_PROTO_DEFAULT }			\
-}
-
-/*
- * lagg ioctls.
- */
-
-/*
- * LACP current operational parameters structure.
- */
-struct lacp_opreq {
-	uint16_t		actor_prio;
-	uint8_t			actor_mac[ETHER_ADDR_LEN];
-	uint16_t		actor_key;
-	uint16_t		actor_portprio;
-	uint16_t		actor_portno;
-	uint8_t			actor_state;
-	uint16_t		partner_prio;
-	uint8_t			partner_mac[ETHER_ADDR_LEN];
-	uint16_t		partner_key;
-	uint16_t		partner_portprio;
-	uint16_t		partner_portno;
-	uint8_t			partner_state;
-};
-
-/* lagg port settings */
-struct lagg_reqport {
-	char			rp_ifname[IFNAMSIZ];	/* name of the lagg */
-	char			rp_portname[IFNAMSIZ];	/* name of the port */
-	uint32_t		rp_prio;		/* port priority */
-	uint32_t		rp_flags;		/* port flags */
-	union {
-		struct lacp_opreq rpsc_lacp;
-	} rp_psc;
-#define rp_lacpreq	rp_psc.rpsc_lacp
-};
-
-#define	SIOCGLAGGPORT		_IOWR('i', 140, struct lagg_reqport)
-#define	SIOCSLAGGPORT		 _IOW('i', 141, struct lagg_reqport)
-#define	SIOCSLAGGDELPORT	 _IOW('i', 142, struct lagg_reqport)
-
-/* lagg, ports and options */
-struct lagg_reqall {
-	char			ra_ifname[IFNAMSIZ];	/* name of the lagg */
-	u_int			ra_proto;		/* lagg protocol */
-
-	size_t			ra_size;		/* size of buffer */
-	struct lagg_reqport	*ra_port;		/* allocated buffer */
-	int			ra_ports;		/* total port count */
-	union {
-		struct lacp_opreq rpsc_lacp;
-	} ra_psc;
-#define ra_lacpreq	ra_psc.rpsc_lacp
-};
-
-#define	SIOCGLAGG		_IOWR('i', 143, struct lagg_reqall)
-#define	SIOCSLAGG		 _IOW('i', 144, struct lagg_reqall)
-
-struct lagg_reqflags {
-	char			rf_ifname[IFNAMSIZ];	/* name of the lagg */
-	uint32_t		rf_flags;		/* lagg protocol */
-};
-
-#define	SIOCGLAGGFLAGS		_IOWR('i', 145, struct lagg_reqflags)
-#define	SIOCSLAGGHASH		 _IOW('i', 146, struct lagg_reqflags)
-
-#ifdef _KERNEL
-
-#include <sys/counter.h>
-
-/*
- * Internal kernel part
- */
-
-#define	lp_ifname		lp_ifp->if_xname	/* interface name */
-#define	lp_link_state		lp_ifp->if_link_state	/* link state */
-
-#define	LAGG_PORTACTIVE(_tp)	(					\
-	((_tp)->lp_link_state == LINK_STATE_UP) &&			\
-	((_tp)->lp_ifp->if_flags & IFF_UP)				\
-)
-
-struct lagg_ifreq {
-	union {
-		struct ifreq ifreq;
-		struct {
-			char ifr_name[IFNAMSIZ];
-			struct sockaddr_storage ifr_ss;
-		} ifreq_storage;
-	} ifreq;
-};
-
-#define	sc_ifflags		sc_ifp->if_flags		/* flags */
-#define	sc_ifname		sc_ifp->if_xname		/* name */
-#define	sc_capabilities		sc_ifp->if_capabilities	/* capabilities */
-
-#define	IFCAP_LAGG_MASK		0xffff0000	/* private capabilities */
-#define	IFCAP_LAGG_FULLDUPLEX	0x00010000	/* full duplex with >1 ports */
-
-/* Private data used by the loadbalancing protocol */
-struct lagg_lb {
-	uint32_t		lb_key;
-	struct lagg_port	*lb_ports[LAGG_MAX_PORTS];
-};
-
-struct lagg_mc {
-	struct sockaddr_dl	mc_addr;
-	struct ifmultiaddr      *mc_ifma;
-	SLIST_ENTRY(lagg_mc)	mc_entries;
-};
-
-/* List of interfaces to have the MAC address modified */
-struct lagg_llq {
-	struct ifnet		*llq_ifp;
-	uint8_t			llq_lladdr[ETHER_ADDR_LEN];
-	SLIST_ENTRY(lagg_llq)	llq_entries;
-};
-
-struct lagg_softc {
-	struct ifnet			*sc_ifp;	/* virtual interface */
-	struct rmlock			sc_mtx;
-	struct mtx			sc_call_mtx;
-	int				sc_proto;	/* lagg protocol */
-	u_int				sc_count;	/* number of ports */
-	u_int				sc_active;	/* active port count */
-	u_int				sc_flapping;	/* number of flapping
-							 * events */
-	struct lagg_port		*sc_primary;	/* primary port */
-	struct ifmedia			sc_media;	/* media config */
-	caddr_t				sc_psc;		/* protocol data */
-	uint32_t			sc_seq;		/* sequence counter */
-	uint32_t			sc_flags;
-
-	counter_u64_t			sc_ipackets;
-	counter_u64_t			sc_opackets;
-	counter_u64_t			sc_ibytes;
-	counter_u64_t			sc_obytes;
-
-	SLIST_HEAD(__tplhd, lagg_port)	sc_ports;	/* list of interfaces */
-	SLIST_ENTRY(lagg_softc)	sc_entries;
-
-	struct task			sc_lladdr_task;
-	SLIST_HEAD(__llqhd, lagg_llq)	sc_llq_head;	/* interfaces to program
-							   the lladdr on */
-
-	/* lagg protocol callbacks */
-	int	(*sc_detach)(struct lagg_softc *);
-	int	(*sc_start)(struct lagg_softc *, struct mbuf *);
-	struct mbuf *(*sc_input)(struct lagg_softc *, struct lagg_port *,
-		    struct mbuf *);
-	int	(*sc_port_create)(struct lagg_port *);
-	void	(*sc_port_destroy)(struct lagg_port *);
-	void	(*sc_linkstate)(struct lagg_port *);
-	void	(*sc_init)(struct lagg_softc *);
-	void	(*sc_stop)(struct lagg_softc *);
-	void	(*sc_lladdr)(struct lagg_softc *);
-	void	(*sc_req)(struct lagg_softc *, caddr_t);
-	void	(*sc_portreq)(struct lagg_port *, caddr_t);
-	eventhandler_tag vlan_attach;
-	eventhandler_tag vlan_detach;
-	struct callout			sc_callout;
-	struct sysctl_ctx_list		ctx;		/* sysctl variables */
-	struct sysctl_oid		*sc_oid;	/* sysctl tree oid */
-	int				use_flowid;	/* enable use of flowid */
-	int				flowid_shift;	/* set flowid shift*/
-};
-
-struct lagg_port {
-	struct ifnet			*lp_ifp;	/* physical interface */
-	struct lagg_softc		*lp_softc;	/* parent lagg */
-	uint8_t				lp_lladdr[ETHER_ADDR_LEN];
-
-	u_char				lp_iftype;	/* interface type */
-	uint32_t			lp_prio;	/* port priority */
-	uint32_t			lp_flags;	/* port flags */
-	int				lp_ifflags;	/* saved ifp flags */
-	void				*lh_cookie;	/* if state hook */
-	caddr_t				lp_psc;		/* protocol data */
-	int				lp_detaching;	/* ifnet is detaching */
-
-	SLIST_HEAD(__mclhd, lagg_mc)	lp_mc_head;	/* multicast addresses */
-
-	/* Redirected callbacks */
-	int	(*lp_ioctl)(struct ifnet *, u_long, caddr_t);
-	int	(*lp_output)(struct ifnet *, struct mbuf *,
-		     const struct sockaddr *, struct route *);
-
-	SLIST_ENTRY(lagg_port)		lp_entries;
-};
-
-#define	LAGG_LOCK_INIT(_sc)	rm_init(&(_sc)->sc_mtx, "if_lagg rmlock")
-#define	LAGG_LOCK_DESTROY(_sc)	rm_destroy(&(_sc)->sc_mtx)
-#define	LAGG_RLOCK(_sc, _p)	rm_rlock(&(_sc)->sc_mtx, (_p))
-#define	LAGG_WLOCK(_sc)		rm_wlock(&(_sc)->sc_mtx)
-#define	LAGG_RUNLOCK(_sc, _p)	rm_runlock(&(_sc)->sc_mtx, (_p))
-#define	LAGG_WUNLOCK(_sc)	rm_wunlock(&(_sc)->sc_mtx)
-#define	LAGG_RLOCK_ASSERT(_sc)	rm_assert(&(_sc)->sc_mtx, RA_RLOCKED)
-#define	LAGG_WLOCK_ASSERT(_sc)	rm_assert(&(_sc)->sc_mtx, RA_WLOCKED)
-
-#define	LAGG_CALLOUT_LOCK_INIT(_sc)					\
-	    mtx_init(&(_sc)->sc_call_mtx, "if_lagg callout mutex", NULL,\
-	    MTX_DEF)
-#define	LAGG_CALLOUT_LOCK_DESTROY(_sc)	mtx_destroy(&(_sc)->sc_call_mtx)
-
-extern struct mbuf *(*lagg_input_p)(struct ifnet *, struct mbuf *);
-extern void	(*lagg_linkstate_p)(struct ifnet *, int );
-
-int		lagg_enqueue(struct ifnet *, struct mbuf *);
-uint32_t	lagg_hashmbuf(struct lagg_softc *, struct mbuf *, uint32_t);
-
-SYSCTL_DECL(_net_link_lagg);
-
-#endif /* _KERNEL */
-
-#endif /* _NET_LAGG_H */
diff --git a/include.new/net/if_llatbl.h b/include.new/net/if_llatbl.h
deleted file mode 100644
index 65e15e0..0000000
--- a/include.new/net/if_llatbl.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (c) 2004 Luigi Rizzo, Alessandro Cerri. All rights reserved.
- * Copyright (c) 2004-2008 Qing Li. All rights reserved.
- * Copyright (c) 2008 Kip Macy. 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/net/if_llatbl.h 254963 2013-08-27 16:45:00Z alfred $");
-
-#ifndef	_NET_IF_LLATBL_H_
-#define	_NET_IF_LLATBL_H_
-
-#include <sys/_rwlock.h>
-#include <netinet/in.h>
-
-struct ifnet;
-struct sysctl_req;
-struct rt_msghdr;
-struct rt_addrinfo;
-
-struct llentry;
-LIST_HEAD(llentries, llentry);
-
-extern struct rwlock lltable_rwlock;
-#define	LLTABLE_RLOCK()		rw_rlock(&lltable_rwlock)
-#define	LLTABLE_RUNLOCK()	rw_runlock(&lltable_rwlock)
-#define	LLTABLE_WLOCK()		rw_wlock(&lltable_rwlock)
-#define	LLTABLE_WUNLOCK()	rw_wunlock(&lltable_rwlock)
-#define	LLTABLE_LOCK_ASSERT()	rw_assert(&lltable_rwlock, RA_LOCKED)
-
-/*
- * Code referencing llentry must at least hold
- * a shared lock
- */
-struct llentry {
-	LIST_ENTRY(llentry)	 lle_next;
-	struct rwlock		 lle_lock;
-	struct lltable		 *lle_tbl;
-	struct llentries	 *lle_head;
-	void			(*lle_free)(struct lltable *, struct llentry *);
-	struct mbuf		 *la_hold;
-	int			 la_numheld;  /* # of packets currently held */
-	time_t			 la_expire;
-	uint16_t		 la_flags;
-	uint16_t		 la_asked;
-	uint16_t		 la_preempt;
-	uint16_t		 ln_byhint;
-	int16_t			 ln_state;	/* IPv6 has ND6_LLINFO_NOSTATE == -2 */
-	uint16_t		 ln_router;
-	time_t			 ln_ntick;
-	int			 lle_refcnt;
-
-	union {
-		uint64_t	mac_aligned;
-		uint16_t	mac16[3];
-		uint8_t		mac8[20];	/* IB needs 20 bytes. */
-	} ll_addr;
-
-	/* XXX af-private? */
-	union {
-		struct callout	ln_timer_ch;
-		struct callout  la_timer;
-	} lle_timer;
-	/* NB: struct sockaddr must immediately follow */
-};
-
-#define	LLE_WLOCK(lle)		rw_wlock(&(lle)->lle_lock)
-#define	LLE_RLOCK(lle)		rw_rlock(&(lle)->lle_lock)
-#define	LLE_WUNLOCK(lle)	rw_wunlock(&(lle)->lle_lock)
-#define	LLE_RUNLOCK(lle)	rw_runlock(&(lle)->lle_lock)
-#define	LLE_DOWNGRADE(lle)	rw_downgrade(&(lle)->lle_lock)
-#define	LLE_TRY_UPGRADE(lle)	rw_try_upgrade(&(lle)->lle_lock)
-#define	LLE_LOCK_INIT(lle)	rw_init_flags(&(lle)->lle_lock, "lle", RW_DUPOK)
-#define	LLE_LOCK_DESTROY(lle)	rw_destroy(&(lle)->lle_lock)
-#define	LLE_WLOCK_ASSERT(lle)	rw_assert(&(lle)->lle_lock, RA_WLOCKED)
-
-#define LLE_IS_VALID(lle)	(((lle) != NULL) && ((lle) != (void *)-1))
-
-#define	LLE_ADDREF(lle) do {					\
-	LLE_WLOCK_ASSERT(lle);					\
-	KASSERT((lle)->lle_refcnt >= 0,				\
-	    ("negative refcnt %d on lle %p",			\
-	    (lle)->lle_refcnt, (lle)));				\
-	(lle)->lle_refcnt++;					\
-} while (0)
-
-#define	LLE_REMREF(lle)	do {					\
-	LLE_WLOCK_ASSERT(lle);					\
-	KASSERT((lle)->lle_refcnt > 0,				\
-	    ("bogus refcnt %d on lle %p",			\
-	    (lle)->lle_refcnt, (lle)));				\
-	(lle)->lle_refcnt--;					\
-} while (0)
-
-#define	LLE_FREE_LOCKED(lle) do {				\
-	if ((lle)->lle_refcnt == 1)				\
-		(lle)->lle_free((lle)->lle_tbl, (lle));		\
-	else {							\
-		LLE_REMREF(lle);				\
-		LLE_WUNLOCK(lle);				\
-	}							\
-	/* guard against invalid refs */			\
-	(lle) = NULL;						\
-} while (0)
-
-#define	LLE_FREE(lle) do {					\
-	LLE_WLOCK(lle);						\
-	LLE_FREE_LOCKED(lle);					\
-} while (0)
-
-
-#define	ln_timer_ch	lle_timer.ln_timer_ch
-#define	la_timer	lle_timer.la_timer
-
-/* XXX bad name */
-#define	L3_ADDR(lle)	((struct sockaddr *)(&lle[1]))
-#define	L3_ADDR_LEN(lle)	(((struct sockaddr *)(&lle[1]))->sa_len)
-
-#ifndef LLTBL_HASHTBL_SIZE
-#define	LLTBL_HASHTBL_SIZE	32	/* default 32 ? */
-#endif
-
-#ifndef LLTBL_HASHMASK
-#define	LLTBL_HASHMASK	(LLTBL_HASHTBL_SIZE - 1)
-#endif
-
-struct lltable {
-	SLIST_ENTRY(lltable)	llt_link;
-	struct llentries	lle_head[LLTBL_HASHTBL_SIZE];
-	int			llt_af;
-	struct ifnet		*llt_ifp;
-
-	void			(*llt_prefix_free)(struct lltable *,
-				    const struct sockaddr *prefix,
-				    const struct sockaddr *mask,
-				    u_int flags);
-	struct llentry *	(*llt_lookup)(struct lltable *, u_int flags,
-				    const struct sockaddr *l3addr);
-	int			(*llt_dump)(struct lltable *,
-				    struct sysctl_req *);
-};
-MALLOC_DECLARE(M_LLTABLE);
-
-/*
- * flags to be passed to arplookup.
- */
-#define	LLE_DELETED	0x0001	/* entry must be deleted */
-#define	LLE_STATIC	0x0002	/* entry is static */
-#define	LLE_IFADDR	0x0004	/* entry is interface addr */
-#define	LLE_VALID	0x0008	/* ll_addr is valid */
-#define	LLE_PUB		0x0020	/* publish entry ??? */
-#define	LLE_LINKED	0x0040	/* linked to lookup structure */
-#define	LLE_EXCLUSIVE	0x2000	/* return lle xlocked  */
-#define	LLE_DELETE	0x4000	/* delete on a lookup - match LLE_IFADDR */
-#define	LLE_CREATE	0x8000	/* create on a lookup miss */
-
-#define LLATBL_HASH(key, mask) \
-	(((((((key >> 8) ^ key) >> 8) ^ key) >> 8) ^ key) & mask)
-
-struct lltable *lltable_init(struct ifnet *, int);
-void		lltable_free(struct lltable *);
-void		lltable_prefix_free(int, struct sockaddr *,
-		    struct sockaddr *, u_int);
-#if 0
-void		lltable_drain(int);
-#endif
-int		lltable_sysctl_dumparp(int, struct sysctl_req *);
-
-size_t		llentry_free(struct llentry *);
-struct llentry  *llentry_alloc(struct ifnet *, struct lltable *,
-		    struct sockaddr_storage *);
-
-/*
- * Generic link layer address lookup function.
- */
-static __inline struct llentry *
-lla_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr)
-{
-	return llt->llt_lookup(llt, flags, l3addr);
-}
-
-int		lla_rt_output(struct rt_msghdr *, struct rt_addrinfo *);
-
-#include <sys/eventhandler.h>
-enum {
-	LLENTRY_RESOLVED,
-	LLENTRY_TIMEDOUT,
-	LLENTRY_DELETED,
-	LLENTRY_EXPIRED,
-};
-typedef void (*lle_event_fn)(void *, struct llentry *, int);
-EVENTHANDLER_DECLARE(lle_event, lle_event_fn);
-#endif  /* _NET_IF_LLATBL_H_ */
diff --git a/include.new/net/if_llc.h b/include.new/net/if_llc.h
deleted file mode 100644
index f9dc835..0000000
--- a/include.new/net/if_llc.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*	$NetBSD: if_llc.h,v 1.12 1999/11/19 20:41:19 thorpej Exp $	*/
-
-/*-
- * Copyright (c) 1988, 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.
- * 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.
- *
- *	@(#)if_llc.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/net/if_llc.h 164804 2006-12-01 17:50:11Z imp $
- */
-
-#ifndef _NET_IF_LLC_H_
-#define _NET_IF_LLC_H_
-
-/*
- * IEEE 802.2 Link Level Control headers, for use in conjunction with
- * 802.{3,4,5} media access control methods.
- *
- * Headers here do not use bit fields due to shortcommings in many
- * compilers.
- */
-
-struct llc {
-	u_int8_t llc_dsap;
-	u_int8_t llc_ssap;
-	union {
-	    struct {
-		u_int8_t control;
-		u_int8_t format_id;
-		u_int8_t class;
-		u_int8_t window_x2;
-	    } __packed type_u;
-	    struct {
-		u_int8_t num_snd_x2;
-		u_int8_t num_rcv_x2;
-	    } __packed type_i;
-	    struct {
-		u_int8_t control;
-		u_int8_t num_rcv_x2;
-	    } __packed type_s;
-	    struct {
-	        u_int8_t control;
-		/*
-		 * We cannot put the following fields in a structure because
-		 * the structure rounding might cause padding.
-		 */
-		u_int8_t frmr_rej_pdu0;
-		u_int8_t frmr_rej_pdu1;
-		u_int8_t frmr_control;
-		u_int8_t frmr_control_ext;
-		u_int8_t frmr_cause;
-	    } __packed type_frmr;
-	    struct {
-		u_int8_t  control;
-		u_int8_t  org_code[3];
-		u_int16_t ether_type;
-	    } __packed type_snap;
-	    struct {
-		u_int8_t control;
-		u_int8_t control_ext;
-	    } __packed type_raw;
-	} __packed llc_un;
-} __packed;
-
-struct frmrinfo {
-	u_int8_t frmr_rej_pdu0;
-	u_int8_t frmr_rej_pdu1;
-	u_int8_t frmr_control;
-	u_int8_t frmr_control_ext;
-	u_int8_t frmr_cause;
-} __packed;
-
-#define	llc_control		llc_un.type_u.control
-#define	llc_control_ext		llc_un.type_raw.control_ext
-#define	llc_fid			llc_un.type_u.format_id
-#define	llc_class		llc_un.type_u.class
-#define	llc_window		llc_un.type_u.window_x2
-#define	llc_frmrinfo 		llc_un.type_frmr.frmr_rej_pdu0
-#define	llc_frmr_pdu0		llc_un.type_frmr.frmr_rej_pdu0
-#define	llc_frmr_pdu1		llc_un.type_frmr.frmr_rej_pdu1
-#define	llc_frmr_control	llc_un.type_frmr.frmr_control
-#define	llc_frmr_control_ext	llc_un.type_frmr.frmr_control_ext
-#define	llc_frmr_cause		llc_un.type_frmr.frmr_cause
-#define	llc_snap		llc_un.type_snap
-
-/*
- * Don't use sizeof(struct llc_un) for LLC header sizes
- */
-#define LLC_ISFRAMELEN 4
-#define LLC_UFRAMELEN  3
-#define LLC_FRMRLEN    7
-#define LLC_SNAPFRAMELEN 8
-
-#ifdef CTASSERT
-CTASSERT(sizeof (struct llc) == LLC_SNAPFRAMELEN);
-#endif
-
-/*
- * Unnumbered LLC format commands
- */
-#define LLC_UI		0x3
-#define LLC_UI_P	0x13
-#define LLC_DISC	0x43
-#define	LLC_DISC_P	0x53
-#define LLC_UA		0x63
-#define LLC_UA_P	0x73
-#define LLC_TEST	0xe3
-#define LLC_TEST_P	0xf3
-#define LLC_FRMR	0x87
-#define	LLC_FRMR_P	0x97
-#define LLC_DM		0x0f
-#define	LLC_DM_P	0x1f
-#define LLC_XID		0xaf
-#define LLC_XID_P	0xbf
-#define LLC_SABME	0x6f
-#define LLC_SABME_P	0x7f
-
-/*
- * Supervisory LLC commands
- */
-#define	LLC_RR		0x01
-#define	LLC_RNR		0x05
-#define	LLC_REJ		0x09
-
-/*
- * Info format - dummy only
- */
-#define	LLC_INFO	0x00
-
-/*
- * ISO PDTR 10178 contains among others
- */
-#define LLC_8021D_LSAP	0x42
-#define LLC_X25_LSAP	0x7e
-#define LLC_SNAP_LSAP	0xaa
-#define LLC_ISO_LSAP	0xfe
-
-#endif /* _NET_IF_LLC_H_ */
diff --git a/include.new/net/if_media.h b/include.new/net/if_media.h
deleted file mode 100644
index 6e6e889..0000000
--- a/include.new/net/if_media.h
+++ /dev/null
@@ -1,832 +0,0 @@
-/*	$NetBSD: if_media.h,v 1.3 1997/03/26 01:19:27 thorpej Exp $	*/
-/* $FreeBSD: releng/10.2/sys/net/if_media.h 283758 2015-05-29 23:02:12Z erj $ */
-
-/*-
- * Copyright (c) 1997
- *	Jonathan Stone and Jason R. Thorpe.  All rights reserved.
- *
- * This software is derived from information provided by Matt Thomas.
- *
- * 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 Jonathan Stone
- *	and Jason R. Thorpe for the NetBSD Project.
- * 4. The names of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 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.
- */
-
-#ifndef _NET_IF_MEDIA_H_
-#define	_NET_IF_MEDIA_H_
-
-/*
- * Prototypes and definitions for BSD/OS-compatible network interface
- * media selection.
- *
- * Where it is safe to do so, this code strays slightly from the BSD/OS
- * design.  Software which uses the API (device drivers, basically)
- * shouldn't notice any difference.
- *
- * Many thanks to Matt Thomas for providing the information necessary
- * to implement this interface.
- */
-
-#ifdef _KERNEL
-
-#include <sys/queue.h>
-
-/*
- * Driver callbacks for media status and change requests.
- */
-typedef	int (*ifm_change_cb_t)(struct ifnet *ifp);
-typedef	void (*ifm_stat_cb_t)(struct ifnet *ifp, struct ifmediareq *req);
-
-/*
- * In-kernel representation of a single supported media type.
- */
-struct ifmedia_entry {
-	LIST_ENTRY(ifmedia_entry) ifm_list;
-	int	ifm_media;	/* description of this media attachment */
-	int	ifm_data;	/* for driver-specific use */
-	void	*ifm_aux;	/* for driver-specific use */
-};
-
-/*
- * One of these goes into a network interface's softc structure.
- * It is used to keep general media state.
- */
-struct ifmedia {
-	int	ifm_mask;	/* mask of changes we don't care about */
-	int	ifm_media;	/* current user-set media word */
-	struct ifmedia_entry *ifm_cur;	/* currently selected media */
-	LIST_HEAD(, ifmedia_entry) ifm_list; /* list of all supported media */
-	ifm_change_cb_t	ifm_change;	/* media change driver callback */
-	ifm_stat_cb_t	ifm_status;	/* media status driver callback */
-};
-
-/* Initialize an interface's struct if_media field. */
-void	ifmedia_init(struct ifmedia *ifm, int dontcare_mask,
-	    ifm_change_cb_t change_callback, ifm_stat_cb_t status_callback);
-
-/* Remove all mediums from a struct ifmedia.  */
-void	ifmedia_removeall( struct ifmedia *ifm);
-
-/* Add one supported medium to a struct ifmedia. */
-void	ifmedia_add(struct ifmedia *ifm, int mword, int data, void *aux);
-
-/* Add an array (of ifmedia_entry) media to a struct ifmedia. */
-void	ifmedia_list_add(struct ifmedia *mp, struct ifmedia_entry *lp,
-	    int count);
-
-/* Set default media type on initialization. */
-void	ifmedia_set(struct ifmedia *ifm, int mword);
-
-/* Common ioctl function for getting/setting media, called by driver. */
-int	ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr,
-	    struct ifmedia *ifm, u_long cmd);
-
-/* Compute baudrate for a given media. */
-uint64_t	ifmedia_baudrate(int);
-
-#endif /*_KERNEL */
-
-/*
- * if_media Options word:
- *	Bits	Use
- *	----	-------
- *	0-4	Media variant
- *	5-7	Media type
- *	8-15	Type specific options (includes added variant bits on Ethernet)
- *	16-18	Mode (for multi-mode devices)
- *	19	RFU
- *	20-27	Shared (global) options
- *	28-31	Instance
- */
-
-/*
- * Ethernet
- * In order to use more than 31 subtypes, Ethernet uses some of the option
- * bits as part of the subtype field.  See the options section below for
- * relevant definitions
- */
-#define	IFM_ETHER	0x00000020
-#define	IFM_ETHER_SUBTYPE(x) (((x) & IFM_TMASK) | \
-	(((x) & (IFM_ETH_XTYPE >> IFM_ETH_XSHIFT)) << IFM_ETH_XSHIFT))
-#define	IFM_X(x) IFM_ETHER_SUBTYPE(x)	/* internal shorthand */
-#define	IFM_ETHER_SUBTYPE_SET(x) (IFM_ETHER_SUBTYPE(x) | IFM_ETHER)
-#define	IFM_ETHER_SUBTYPE_GET(x) ((x) & (IFM_TMASK|IFM_ETH_XTYPE))
-#define	IFM_ETHER_IS_EXTENDED(x)	((x) & IFM_ETH_XTYPE)
-
-#define	IFM_10_T	3		/* 10BaseT - RJ45 */
-#define	IFM_10_2	4		/* 10Base2 - Thinnet */
-#define	IFM_10_5	5		/* 10Base5 - AUI */
-#define	IFM_100_TX	6		/* 100BaseTX - RJ45 */
-#define	IFM_100_FX	7		/* 100BaseFX - Fiber */
-#define	IFM_100_T4	8		/* 100BaseT4 - 4 pair cat 3 */
-#define	IFM_100_VG	9		/* 100VG-AnyLAN */
-#define	IFM_100_T2	10		/* 100BaseT2 */
-#define	IFM_1000_SX	11		/* 1000BaseSX - multi-mode fiber */
-#define	IFM_10_STP	12		/* 10BaseT over shielded TP */
-#define	IFM_10_FL	13		/* 10BaseFL - Fiber */
-#define	IFM_1000_LX	14		/* 1000baseLX - single-mode fiber */
-#define	IFM_1000_CX	15		/* 1000baseCX - 150ohm STP */
-#define	IFM_1000_T	16		/* 1000baseT - 4 pair cat 5 */
-#define	IFM_HPNA_1	17		/* HomePNA 1.0 (1Mb/s) */
-#define	IFM_10G_LR	18		/* 10GBase-LR 1310nm Single-mode */
-#define	IFM_10G_SR	19		/* 10GBase-SR 850nm Multi-mode */
-#define	IFM_10G_CX4	20		/* 10GBase CX4 copper */
-#define	IFM_2500_SX	21		/* 2500BaseSX - multi-mode fiber */
-#define	IFM_10G_TWINAX	22		/* 10GBase Twinax copper */
-#define	IFM_10G_TWINAX_LONG	23	/* 10GBase Twinax Long copper */
-#define	IFM_10G_LRM	24		/* 10GBase-LRM 850nm Multi-mode */
-#define	IFM_UNKNOWN	25		/* media types not defined yet */
-#define	IFM_10G_T	26		/* 10GBase-T - RJ45 */
-#define	IFM_40G_CR4	27		/* 40GBase-CR4 */
-#define	IFM_40G_SR4	28		/* 40GBase-SR4 */
-#define	IFM_40G_LR4	29		/* 40GBase-LR4 */
-#define	IFM_1000_KX	30		/* 1000Base-KX backplane */
-#define	IFM_OTHER	31		/* Other: one of the following */
-
-/* following types are not visible to old binaries using only IFM_TMASK */
-#define	IFM_10G_KX4	IFM_X(32)	/* 10GBase-KX4 backplane */
-#define	IFM_10G_KR	IFM_X(33)	/* 10GBase-KR backplane */
-#define	IFM_10G_CR1	IFM_X(34)	/* 10GBase-CR1 Twinax splitter */
-#define	IFM_20G_KR2	IFM_X(35)	/* 20GBase-KR2 backplane */
-#define	IFM_2500_KX	IFM_X(36)	/* 2500Base-KX backplane */
-#define	IFM_2500_T	IFM_X(37)	/* 2500Base-T - RJ45 (NBaseT) */
-#define	IFM_5000_T	IFM_X(38)	/* 5000Base-T - RJ45 (NBaseT) */
-#define	IFM_50G_PCIE	IFM_X(39)	/* 50G Ethernet over PCIE */
-#define	IFM_25G_PCIE	IFM_X(40)	/* 25G Ethernet over PCIE */
-#define	IFM_1000_SGMII	IFM_X(41)	/* 1G media interface */
-#define	IFM_10G_SFI	IFM_X(42)	/* 10G media interface */
-#define	IFM_40G_XLPPI	IFM_X(43)	/* 40G media interface */
-#define	IFM_1000_CX_SGMII IFM_X(44)	/* 1000Base-CX-SGMII */
-#define	IFM_40G_KR4	IFM_X(45)	/* 40GBase-KR4 */
-#define	IFM_10G_ER	IFM_X(46)	/* 10GBase-ER */
-#define	IFM_100G_CR4	IFM_X(47)	/* 100GBase-CR4 */
-#define	IFM_100G_SR4	IFM_X(48)	/* 100GBase-SR4 */
-#define	IFM_100G_KR4	IFM_X(49)	/* 100GBase-KR4 */
-#define	IFM_100G_LR4	IFM_X(50)	/* 100GBase-LR4 */
-#define	IFM_56G_R4	IFM_X(51)	/* 56GBase-R4 */
-#define	IFM_100_T	IFM_X(52)	/* 100BaseT - RJ45 */
-#define	IFM_25G_CR	IFM_X(53)	/* 25GBase-CR */
-#define	IFM_25G_KR	IFM_X(54)	/* 25GBase-KR */
-#define	IFM_25G_SR	IFM_X(55)	/* 25GBase-SR */
-#define	IFM_50G_CR2	IFM_X(56)	/* 50GBase-CR2 */
-#define	IFM_50G_KR2	IFM_X(57)	/* 50GBase-KR2 */
-
-/*
- * Please update ieee8023ad_lacp.c:lacp_compose_key()
- * after adding new Ethernet media types.
- */
-/* Note IFM_X(511) is the max! */
-
-/* Ethernet option values; includes bits used for extended variant field */
-#define	IFM_ETH_MASTER	0x00000100	/* master mode (1000baseT) */
-#define	IFM_ETH_RXPAUSE	0x00000200	/* receive PAUSE frames */
-#define	IFM_ETH_TXPAUSE	0x00000400	/* transmit PAUSE frames */
-#define	IFM_ETH_XTYPE	0x00007800	/* extended media variants */
-#define	IFM_ETH_XSHIFT	6		/* shift XTYPE next to TMASK */
-
-/*
- * Token ring
- */
-#define	IFM_TOKEN	0x00000040
-#define	IFM_TOK_STP4	3		/* Shielded twisted pair 4m - DB9 */
-#define	IFM_TOK_STP16	4		/* Shielded twisted pair 16m - DB9 */
-#define	IFM_TOK_UTP4	5		/* Unshielded twisted pair 4m - RJ45 */
-#define	IFM_TOK_UTP16	6		/* Unshielded twisted pair 16m - RJ45 */
-#define	IFM_TOK_STP100  7		/* Shielded twisted pair 100m - DB9 */
-#define	IFM_TOK_UTP100  8		/* Unshielded twisted pair 100m - RJ45 */
-#define	IFM_TOK_ETR	0x00000200	/* Early token release */
-#define	IFM_TOK_SRCRT	0x00000400	/* Enable source routing features */
-#define	IFM_TOK_ALLR	0x00000800	/* All routes / Single route bcast */
-#define	IFM_TOK_DTR	0x00002000	/* Dedicated token ring */
-#define	IFM_TOK_CLASSIC	0x00004000	/* Classic token ring */
-#define	IFM_TOK_AUTO	0x00008000	/* Automatic Dedicate/Classic token ring */
-
-/*
- * FDDI
- */
-#define	IFM_FDDI	0x00000060
-#define	IFM_FDDI_SMF	3		/* Single-mode fiber */
-#define	IFM_FDDI_MMF	4		/* Multi-mode fiber */
-#define	IFM_FDDI_UTP	5		/* CDDI / UTP */
-#define	IFM_FDDI_DA	0x00000100	/* Dual attach / single attach */
-
-/*
- * IEEE 802.11 Wireless
- */
-#define	IFM_IEEE80211	0x00000080
-/* NB: 0,1,2 are auto, manual, none defined below */
-#define	IFM_IEEE80211_FH1	3	/* Frequency Hopping 1Mbps */
-#define	IFM_IEEE80211_FH2	4	/* Frequency Hopping 2Mbps */
-#define	IFM_IEEE80211_DS1	5	/* Direct Sequence 1Mbps */
-#define	IFM_IEEE80211_DS2	6	/* Direct Sequence 2Mbps */
-#define	IFM_IEEE80211_DS5	7	/* Direct Sequence 5.5Mbps */
-#define	IFM_IEEE80211_DS11	8	/* Direct Sequence 11Mbps */
-#define	IFM_IEEE80211_DS22	9	/* Direct Sequence 22Mbps */
-#define	IFM_IEEE80211_OFDM6	10	/* OFDM 6Mbps */
-#define	IFM_IEEE80211_OFDM9	11	/* OFDM 9Mbps */
-#define	IFM_IEEE80211_OFDM12	12	/* OFDM 12Mbps */
-#define	IFM_IEEE80211_OFDM18	13	/* OFDM 18Mbps */
-#define	IFM_IEEE80211_OFDM24	14	/* OFDM 24Mbps */
-#define	IFM_IEEE80211_OFDM36	15	/* OFDM 36Mbps */
-#define	IFM_IEEE80211_OFDM48	16	/* OFDM 48Mbps */
-#define	IFM_IEEE80211_OFDM54	17	/* OFDM 54Mbps */
-#define	IFM_IEEE80211_OFDM72	18	/* OFDM 72Mbps */
-#define	IFM_IEEE80211_DS354k	19	/* Direct Sequence 354Kbps */
-#define	IFM_IEEE80211_DS512k	20	/* Direct Sequence 512Kbps */
-#define	IFM_IEEE80211_OFDM3	21	/* OFDM 3Mbps */
-#define	IFM_IEEE80211_OFDM4	22	/* OFDM 4.5Mbps */
-#define	IFM_IEEE80211_OFDM27	23	/* OFDM 27Mbps */
-/* NB: not enough bits to express MCS fully */
-#define	IFM_IEEE80211_MCS	24	/* HT MCS rate */
-
-#define	IFM_IEEE80211_ADHOC	0x00000100	/* Operate in Adhoc mode */
-#define	IFM_IEEE80211_HOSTAP	0x00000200	/* Operate in Host AP mode */
-#define	IFM_IEEE80211_IBSS	0x00000400	/* Operate in IBSS mode */
-#define	IFM_IEEE80211_WDS	0x00000800	/* Operate in WDS mode */
-#define	IFM_IEEE80211_TURBO	0x00001000	/* Operate in turbo mode */
-#define	IFM_IEEE80211_MONITOR	0x00002000	/* Operate in monitor mode */
-#define	IFM_IEEE80211_MBSS	0x00004000	/* Operate in MBSS mode */
-
-/* operating mode for multi-mode devices */
-#define	IFM_IEEE80211_11A	0x00010000	/* 5Ghz, OFDM mode */
-#define	IFM_IEEE80211_11B	0x00020000	/* Direct Sequence mode */
-#define	IFM_IEEE80211_11G	0x00030000	/* 2Ghz, CCK mode */
-#define	IFM_IEEE80211_FH	0x00040000	/* 2Ghz, GFSK mode */
-#define	IFM_IEEE80211_11NA	0x00050000	/* 5Ghz, HT mode */
-#define	IFM_IEEE80211_11NG	0x00060000	/* 2Ghz, HT mode */
-
-/*
- * ATM
- */
-#define	IFM_ATM	0x000000a0
-#define	IFM_ATM_UNKNOWN		3
-#define	IFM_ATM_UTP_25		4
-#define	IFM_ATM_TAXI_100	5
-#define	IFM_ATM_TAXI_140	6
-#define	IFM_ATM_MM_155		7
-#define	IFM_ATM_SM_155		8
-#define	IFM_ATM_UTP_155		9
-#define	IFM_ATM_MM_622		10
-#define	IFM_ATM_SM_622		11
-#define	IFM_ATM_VIRTUAL		12
-#define	IFM_ATM_SDH		0x00000100	/* SDH instead of SONET */
-#define	IFM_ATM_NOSCRAMB	0x00000200	/* no scrambling */
-#define	IFM_ATM_UNASSIGNED	0x00000400	/* unassigned cells */
-
-/*
- * Shared media sub-types
- */
-#define	IFM_AUTO	0		/* Autoselect best media */
-#define	IFM_MANUAL	1		/* Jumper/dipswitch selects media */
-#define	IFM_NONE	2		/* Deselect all media */
-
-/*
- * Shared options
- */
-#define	IFM_FDX		0x00100000	/* Force full duplex */
-#define	IFM_HDX		0x00200000	/* Force half duplex */
-#define	IFM_FLOW	0x00400000	/* enable hardware flow control */
-#define	IFM_FLAG0	0x01000000	/* Driver defined flag */
-#define	IFM_FLAG1	0x02000000	/* Driver defined flag */
-#define	IFM_FLAG2	0x04000000	/* Driver defined flag */
-#define	IFM_LOOP	0x08000000	/* Put hardware in loopback */
-
-/*
- * Masks
- */
-#define	IFM_NMASK	0x000000e0	/* Network type */
-#define	IFM_TMASK	0x0000001f	/* Media sub-type */
-#define	IFM_IMASK	0xf0000000	/* Instance */
-#define	IFM_ISHIFT	28		/* Instance shift */
-#define	IFM_OMASK	0x0000ff00	/* Type specific options */
-#define	IFM_MMASK	0x00070000	/* Mode */
-#define	IFM_MSHIFT	16		/* Mode shift */
-#define	IFM_GMASK	0x0ff00000	/* Global options */
-
-/* Ethernet flow control mask */
-#define	IFM_ETH_FMASK	(IFM_FLOW | IFM_ETH_RXPAUSE | IFM_ETH_TXPAUSE)
-
-/*
- * Status bits
- */
-#define	IFM_AVALID	0x00000001	/* Active bit valid */
-#define	IFM_ACTIVE	0x00000002	/* Interface attached to working net */
-
-/* Mask of "status valid" bits, for ifconfig(8). */
-#define	IFM_STATUS_VALID	IFM_AVALID
-
-/* List of "status valid" bits, for ifconfig(8). */
-#define	IFM_STATUS_VALID_LIST {						\
-	IFM_AVALID,							\
-	0								\
-}
-
-/*
- * Macros to extract various bits of information from the media word.
- */
-#define	IFM_TYPE(x)		((x) & IFM_NMASK)
-#define	IFM_SUBTYPE(x)	\
-  (IFM_TYPE(x) == IFM_ETHER ? IFM_ETHER_SUBTYPE_GET(x) : ((x) & IFM_TMASK))
-#define	IFM_TYPE_MATCH(x,y) \
-  (IFM_TYPE(x) == IFM_TYPE(y) && IFM_SUBTYPE(x) == IFM_SUBTYPE(y))
-#define	IFM_TYPE_OPTIONS(x)	((x) & IFM_OMASK)
-#define	IFM_INST(x)		(((x) & IFM_IMASK) >> IFM_ISHIFT)
-#define	IFM_OPTIONS(x)		((x) & (IFM_OMASK | IFM_GMASK))
-#define	IFM_MODE(x)		((x) & IFM_MMASK)
-
-#define	IFM_INST_MAX		IFM_INST(IFM_IMASK)
-
-/*
- * Macro to create a media word.
- */
-#define	IFM_MAKEWORD(type, subtype, options, instance)			\
-	((type) | (subtype) | (options) | ((instance) << IFM_ISHIFT))
-#define	IFM_MAKEMODE(mode) \
-	(((mode) << IFM_MSHIFT) & IFM_MMASK)
-
-/*
- * NetBSD extension not defined in the BSDI API.  This is used in various
- * places to get the canonical description for a given type/subtype.
- *
- * NOTE: all but the top-level type descriptions must contain NO whitespace!
- * Otherwise, parsing these in ifconfig(8) would be a nightmare.
- */
-struct ifmedia_description {
-	int	ifmt_word;		/* word value; may be masked */
-	const char *ifmt_string;	/* description */
-};
-
-#define	IFM_TYPE_DESCRIPTIONS {						\
-	{ IFM_ETHER,		"Ethernet" },				\
-	{ IFM_TOKEN,		"Token ring" },				\
-	{ IFM_FDDI,		"FDDI" },				\
-	{ IFM_IEEE80211,	"IEEE 802.11 Wireless Ethernet" },	\
-	{ IFM_ATM,		"ATM" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_ETHERNET_DESCRIPTIONS {				\
-	{ IFM_10_T,	"10baseT/UTP" },				\
-	{ IFM_10_2,	"10base2/BNC" },				\
-	{ IFM_10_5,	"10base5/AUI" },				\
-	{ IFM_100_TX,	"100baseTX" },					\
-	{ IFM_100_FX,	"100baseFX" },					\
-	{ IFM_100_T4,	"100baseT4" },					\
-	{ IFM_100_VG,	"100baseVG" },					\
-	{ IFM_100_T2,	"100baseT2" },					\
-	{ IFM_10_STP,	"10baseSTP" },					\
-	{ IFM_10_FL,	"10baseFL" },					\
-	{ IFM_1000_SX,	"1000baseSX" },					\
-	{ IFM_1000_LX,	"1000baseLX" },					\
-	{ IFM_1000_CX,	"1000baseCX" },					\
-	{ IFM_1000_T,	"1000baseT" },					\
-	{ IFM_HPNA_1,	"homePNA" },					\
-	{ IFM_10G_LR,	"10Gbase-LR" },					\
-	{ IFM_10G_SR,	"10Gbase-SR" },					\
-	{ IFM_10G_CX4,	"10Gbase-CX4" },				\
-	{ IFM_2500_SX,	"2500BaseSX" },					\
-	{ IFM_10G_LRM,	"10Gbase-LRM" },				\
-	{ IFM_10G_TWINAX,	"10Gbase-Twinax" },			\
-	{ IFM_10G_TWINAX_LONG,	"10Gbase-Twinax-Long" },		\
-	{ IFM_UNKNOWN,	"Unknown" },					\
-	{ IFM_10G_T,	"10Gbase-T" },					\
-	{ IFM_40G_CR4,	"40Gbase-CR4" },				\
-	{ IFM_40G_SR4,	"40Gbase-SR4" },				\
-	{ IFM_40G_LR4,	"40Gbase-LR4" },				\
-	{ IFM_1000_KX,	"1000Base-KX" },				\
-	{ IFM_OTHER,	"Other" },					\
-	{ IFM_10G_KX4,	"10GBase-KX4" },				\
-	{ IFM_10G_KR,	"10GBase-KR" },					\
-	{ IFM_10G_CR1,	"10GBase-CR1" },				\
-	{ IFM_20G_KR2,	"20GBase-KR2" },				\
-	{ IFM_2500_KX,	"2500Base-KX" },				\
-	{ IFM_2500_T,	"2500Base-T" },					\
-	{ IFM_5000_T,	"5000Base-T" },					\
-	{ IFM_50G_PCIE,	"PCIExpress-50G" },				\
-	{ IFM_25G_PCIE,	"PCIExpress-25G" },				\
-	{ IFM_1000_SGMII,	"1000Base-SGMII" },			\
-	{ IFM_10G_SFI,	"10GBase-SFI" },				\
-	{ IFM_40G_XLPPI,	"40GBase-XLPPI" },			\
-	{ IFM_1000_CX_SGMII,	"1000Base-CX-SGMII" },			\
-	{ IFM_40G_KR4,	"40GBase-KR4" },				\
-	{ IFM_10G_ER,	"10GBase-ER" },					\
-	{ IFM_100G_CR4,	"100GBase-CR4" },				\
-	{ IFM_100G_SR4,	"100GBase-SR4" },				\
-	{ IFM_100G_KR4,	"100GBase-KR4" },				\
-	{ IFM_100G_LR4, "100GBase-LR4" },				\
-	{ IFM_56G_R4,	"56GBase-R4" },					\
-	{ IFM_100_T,	"100BaseT" },					\
-	{ IFM_25G_CR,	"25GBase-CR" },					\
-	{ IFM_25G_KR,	"25GBase-KR" },					\
-	{ IFM_25G_SR,	"25GBase-SR" },					\
-	{ IFM_50G_CR2,	"50GBase-CR2" },				\
-	{ IFM_50G_KR2,	"50GBase-KR2" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_ETHERNET_ALIASES {					\
-	{ IFM_10_T,	"10baseT" },					\
-	{ IFM_10_T,	"UTP" },					\
-	{ IFM_10_T,	"10UTP" },					\
-	{ IFM_10_2,	"BNC" },					\
-	{ IFM_10_2,	"10BNC" },					\
-	{ IFM_10_5,	"AUI" },					\
-	{ IFM_10_5,	"10AUI" },					\
-	{ IFM_100_TX,	"100TX" },					\
-	{ IFM_100_T4,	"100T4" },					\
-	{ IFM_100_VG,	"100VG" },					\
-	{ IFM_100_T2,	"100T2" },					\
-	{ IFM_10_STP,	"10STP" },					\
-	{ IFM_10_FL,	"10FL" },					\
-	{ IFM_1000_SX,	"1000SX" },					\
-	{ IFM_1000_LX,	"1000LX" },					\
-	{ IFM_1000_CX,	"1000CX" },					\
-	{ IFM_1000_T,	"1000baseTX" },					\
-	{ IFM_1000_T,	"1000TX" },					\
-	{ IFM_1000_T,	"1000T" },					\
-	{ IFM_2500_SX,	"2500SX" },					\
-									\
-	/*								\
-	 * Shorthands for common media+option combinations as announced	\
-	 * by miibus(4)							\
-	 */								\
-	{ IFM_10_T | IFM_FDX,			"10baseT-FDX" },	\
-	{ IFM_10_T | IFM_FDX | IFM_FLOW,	"10baseT-FDX-flow" },	\
-	{ IFM_100_TX | IFM_FDX,			"100baseTX-FDX" },	\
-	{ IFM_100_TX | IFM_FDX | IFM_FLOW,	"100baseTX-FDX-flow" },	\
-	{ IFM_1000_T | IFM_FDX,			"1000baseT-FDX" },	\
-	{ IFM_1000_T | IFM_FDX | IFM_FLOW,	"1000baseT-FDX-flow" },	\
-	{ IFM_1000_T | IFM_FDX | IFM_FLOW | IFM_ETH_MASTER,		\
-	    "1000baseT-FDX-flow-master" },				\
-	{ IFM_1000_T | IFM_FDX | IFM_ETH_MASTER,			\
-	    "1000baseT-FDX-master" },					\
-	{ IFM_1000_T | IFM_ETH_MASTER,		"1000baseT-master" },	\
-									\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_ETHERNET_OPTION_DESCRIPTIONS {			\
-	{ IFM_ETH_MASTER,	"master" },				\
-	{ IFM_ETH_RXPAUSE,	"rxpause" },				\
-	{ IFM_ETH_TXPAUSE,	"txpause" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_TOKENRING_DESCRIPTIONS {				\
-	{ IFM_TOK_STP4,	"DB9/4Mbit" },					\
-	{ IFM_TOK_STP16, "DB9/16Mbit" },				\
-	{ IFM_TOK_UTP4,	"UTP/4Mbit" },					\
-	{ IFM_TOK_UTP16, "UTP/16Mbit" },				\
-	{ IFM_TOK_STP100, "STP/100Mbit" },				\
-	{ IFM_TOK_UTP100, "UTP/100Mbit" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_TOKENRING_ALIASES {					\
-	{ IFM_TOK_STP4,	"4STP" },					\
-	{ IFM_TOK_STP16, "16STP" },					\
-	{ IFM_TOK_UTP4,	"4UTP" },					\
-	{ IFM_TOK_UTP16, "16UTP" },					\
-	{ IFM_TOK_STP100, "100STP" },					\
-	{ IFM_TOK_UTP100, "100UTP" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_TOKENRING_OPTION_DESCRIPTIONS {			\
-	{ IFM_TOK_ETR,	"EarlyTokenRelease" },				\
-	{ IFM_TOK_SRCRT, "SourceRouting" },				\
-	{ IFM_TOK_ALLR,	"AllRoutes" },					\
-	{ IFM_TOK_DTR,	"Dedicated" },					\
-	{ IFM_TOK_CLASSIC,"Classic" },					\
-	{ IFM_TOK_AUTO,	" " },						\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_FDDI_DESCRIPTIONS {					\
-	{ IFM_FDDI_SMF, "Single-mode" },				\
-	{ IFM_FDDI_MMF, "Multi-mode" },					\
-	{ IFM_FDDI_UTP, "UTP" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_FDDI_ALIASES {					\
-	{ IFM_FDDI_SMF,	"SMF" },					\
-	{ IFM_FDDI_MMF,	"MMF" },					\
-	{ IFM_FDDI_UTP,	"CDDI" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_FDDI_OPTION_DESCRIPTIONS {				\
-	{ IFM_FDDI_DA, "Dual-attach" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_IEEE80211_DESCRIPTIONS {				\
-	{ IFM_IEEE80211_FH1, "FH/1Mbps" },				\
-	{ IFM_IEEE80211_FH2, "FH/2Mbps" },				\
-	{ IFM_IEEE80211_DS1, "DS/1Mbps" },				\
-	{ IFM_IEEE80211_DS2, "DS/2Mbps" },				\
-	{ IFM_IEEE80211_DS5, "DS/5.5Mbps" },				\
-	{ IFM_IEEE80211_DS11, "DS/11Mbps" },				\
-	{ IFM_IEEE80211_DS22, "DS/22Mbps" },				\
-	{ IFM_IEEE80211_OFDM6, "OFDM/6Mbps" },				\
-	{ IFM_IEEE80211_OFDM9, "OFDM/9Mbps" },				\
-	{ IFM_IEEE80211_OFDM12, "OFDM/12Mbps" },			\
-	{ IFM_IEEE80211_OFDM18, "OFDM/18Mbps" },			\
-	{ IFM_IEEE80211_OFDM24, "OFDM/24Mbps" },			\
-	{ IFM_IEEE80211_OFDM36, "OFDM/36Mbps" },			\
-	{ IFM_IEEE80211_OFDM48, "OFDM/48Mbps" },			\
-	{ IFM_IEEE80211_OFDM54, "OFDM/54Mbps" },			\
-	{ IFM_IEEE80211_OFDM72, "OFDM/72Mbps" },			\
-	{ IFM_IEEE80211_DS354k, "DS/354Kbps" },				\
-	{ IFM_IEEE80211_DS512k, "DS/512Kbps" },				\
-	{ IFM_IEEE80211_OFDM3, "OFDM/3Mbps" },				\
-	{ IFM_IEEE80211_OFDM4, "OFDM/4.5Mbps" },			\
-	{ IFM_IEEE80211_OFDM27, "OFDM/27Mbps" },			\
-	{ IFM_IEEE80211_MCS, "MCS" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_IEEE80211_ALIASES {					\
-	{ IFM_IEEE80211_FH1, "FH1" },					\
-	{ IFM_IEEE80211_FH2, "FH2" },					\
-	{ IFM_IEEE80211_FH1, "FrequencyHopping/1Mbps" },		\
-	{ IFM_IEEE80211_FH2, "FrequencyHopping/2Mbps" },		\
-	{ IFM_IEEE80211_DS1, "DS1" },					\
-	{ IFM_IEEE80211_DS2, "DS2" },					\
-	{ IFM_IEEE80211_DS5, "DS5.5" },					\
-	{ IFM_IEEE80211_DS11, "DS11" },					\
-	{ IFM_IEEE80211_DS22, "DS22" },					\
-	{ IFM_IEEE80211_DS1, "DirectSequence/1Mbps" },			\
-	{ IFM_IEEE80211_DS2, "DirectSequence/2Mbps" },			\
-	{ IFM_IEEE80211_DS5, "DirectSequence/5.5Mbps" },		\
-	{ IFM_IEEE80211_DS11, "DirectSequence/11Mbps" },		\
-	{ IFM_IEEE80211_DS22, "DirectSequence/22Mbps" },		\
-	{ IFM_IEEE80211_OFDM6, "OFDM6" },				\
-	{ IFM_IEEE80211_OFDM9, "OFDM9" },				\
-	{ IFM_IEEE80211_OFDM12, "OFDM12" },				\
-	{ IFM_IEEE80211_OFDM18, "OFDM18" },				\
-	{ IFM_IEEE80211_OFDM24, "OFDM24" },				\
-	{ IFM_IEEE80211_OFDM36, "OFDM36" },				\
-	{ IFM_IEEE80211_OFDM48, "OFDM48" },				\
-	{ IFM_IEEE80211_OFDM54, "OFDM54" },				\
-	{ IFM_IEEE80211_OFDM72, "OFDM72" },				\
-	{ IFM_IEEE80211_DS1, "CCK1" },					\
-	{ IFM_IEEE80211_DS2, "CCK2" },					\
-	{ IFM_IEEE80211_DS5, "CCK5.5" },				\
-	{ IFM_IEEE80211_DS11, "CCK11" },				\
-	{ IFM_IEEE80211_DS354k, "DS354K" },				\
-	{ IFM_IEEE80211_DS354k, "DirectSequence/354Kbps" },		\
-	{ IFM_IEEE80211_DS512k, "DS512K" },				\
-	{ IFM_IEEE80211_DS512k, "DirectSequence/512Kbps" },		\
-	{ IFM_IEEE80211_OFDM3, "OFDM3" },				\
-	{ IFM_IEEE80211_OFDM4, "OFDM4.5" },				\
-	{ IFM_IEEE80211_OFDM27, "OFDM27" },				\
-	{ IFM_IEEE80211_MCS, "MCS" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_IEEE80211_OPTION_DESCRIPTIONS {			\
-	{ IFM_IEEE80211_ADHOC, "adhoc" },				\
-	{ IFM_IEEE80211_HOSTAP, "hostap" },				\
-	{ IFM_IEEE80211_IBSS, "ibss" },					\
-	{ IFM_IEEE80211_WDS, "wds" },					\
-	{ IFM_IEEE80211_TURBO, "turbo" },				\
-	{ IFM_IEEE80211_MONITOR, "monitor" },				\
-	{ IFM_IEEE80211_MBSS, "mesh" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_IEEE80211_MODE_DESCRIPTIONS {			\
-	{ IFM_AUTO, "autoselect" },					\
-	{ IFM_IEEE80211_11A, "11a" },					\
-	{ IFM_IEEE80211_11B, "11b" },					\
-	{ IFM_IEEE80211_11G, "11g" },					\
-	{ IFM_IEEE80211_FH, "fh" },					\
-	{ IFM_IEEE80211_11NA, "11na" },					\
-	{ IFM_IEEE80211_11NG, "11ng" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_IEEE80211_MODE_ALIASES {				\
-	{ IFM_AUTO, "auto" },						\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_ATM_DESCRIPTIONS {					\
-	{ IFM_ATM_UNKNOWN,	"Unknown" },				\
-	{ IFM_ATM_UTP_25,	"UTP/25.6MBit" },			\
-	{ IFM_ATM_TAXI_100,	"Taxi/100MBit" },			\
-	{ IFM_ATM_TAXI_140,	"Taxi/140MBit" },			\
-	{ IFM_ATM_MM_155,	"Multi-mode/155MBit" },			\
-	{ IFM_ATM_SM_155,	"Single-mode/155MBit" },		\
-	{ IFM_ATM_UTP_155,	"UTP/155MBit" },			\
-	{ IFM_ATM_MM_622,	"Multi-mode/622MBit" },			\
-	{ IFM_ATM_SM_622,	"Single-mode/622MBit" },		\
-	{ IFM_ATM_VIRTUAL,	"Virtual" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_ATM_ALIASES {					\
-	{ IFM_ATM_UNKNOWN,	"UNKNOWN" },				\
-	{ IFM_ATM_UTP_25,	"UTP-25" },				\
-	{ IFM_ATM_TAXI_100,	"TAXI-100" },				\
-	{ IFM_ATM_TAXI_140,	"TAXI-140" },				\
-	{ IFM_ATM_MM_155,	"MM-155" },				\
-	{ IFM_ATM_SM_155,	"SM-155" },				\
-	{ IFM_ATM_UTP_155,	"UTP-155" },				\
-	{ IFM_ATM_MM_622,	"MM-622" },				\
-	{ IFM_ATM_SM_622,	"SM-622" },				\
-	{ IFM_ATM_VIRTUAL,	"VIRTUAL" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_ATM_OPTION_DESCRIPTIONS {				\
-	{ IFM_ATM_SDH, "SDH" },						\
-	{ IFM_ATM_NOSCRAMB, "Noscramb" },				\
-	{ IFM_ATM_UNASSIGNED, "Unassigned" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_SHARED_DESCRIPTIONS {				\
-	{ IFM_AUTO,	"autoselect" },					\
-	{ IFM_MANUAL,	"manual" },					\
-	{ IFM_NONE,	"none" },					\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SUBTYPE_SHARED_ALIASES {					\
-	{ IFM_AUTO,	"auto" },					\
-									\
-	/*								\
-	 * Shorthands for common media+option combinations as announced	\
-	 * by miibus(4)							\
-	 */								\
-	{ IFM_AUTO | IFM_FLOW,	"auto-flow" },				\
-									\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SHARED_OPTION_DESCRIPTIONS {				\
-	{ IFM_FDX,	"full-duplex" },				\
-	{ IFM_HDX,	"half-duplex" },				\
-	{ IFM_FLOW,	"flowcontrol" },				\
-	{ IFM_FLAG0,	"flag0" },					\
-	{ IFM_FLAG1,	"flag1" },					\
-	{ IFM_FLAG2,	"flag2" },					\
-	{ IFM_LOOP,	"hw-loopback" },				\
-	{ 0, NULL },							\
-}
-
-#define	IFM_SHARED_OPTION_ALIASES {					\
-	{ IFM_FDX,	"fdx" },					\
-	{ IFM_HDX,	"hdx" },					\
-	{ IFM_FLOW,	"flow" },					\
-	{ IFM_LOOP,	"loop" },					\
-	{ IFM_LOOP,	"loopback" },					\
-	{ 0, NULL },							\
-}
-
-/*
- * Baudrate descriptions for the various media types.
- */
-struct ifmedia_baudrate {
-	int		ifmb_word;		/* media word */
-	uint64_t	ifmb_baudrate;		/* corresponding baudrate */
-};
-
-#define	IFM_BAUDRATE_DESCRIPTIONS {					\
-	{ IFM_ETHER | IFM_10_T,		IF_Mbps(10) },			\
-	{ IFM_ETHER | IFM_10_2,		IF_Mbps(10) },			\
-	{ IFM_ETHER | IFM_10_5,		IF_Mbps(10) },			\
-	{ IFM_ETHER | IFM_100_TX,	IF_Mbps(100) },			\
-	{ IFM_ETHER | IFM_100_FX,	IF_Mbps(100) },			\
-	{ IFM_ETHER | IFM_100_T4,	IF_Mbps(100) },			\
-	{ IFM_ETHER | IFM_100_VG,	IF_Mbps(100) },			\
-	{ IFM_ETHER | IFM_100_T2,	IF_Mbps(100) },			\
-	{ IFM_ETHER | IFM_1000_SX,	IF_Mbps(1000) },		\
-	{ IFM_ETHER | IFM_10_STP,	IF_Mbps(10) },			\
-	{ IFM_ETHER | IFM_10_FL,	IF_Mbps(10) },			\
-	{ IFM_ETHER | IFM_1000_LX,	IF_Mbps(1000) },		\
-	{ IFM_ETHER | IFM_1000_CX,	IF_Mbps(1000) },		\
-	{ IFM_ETHER | IFM_1000_T,	IF_Mbps(1000) },		\
-	{ IFM_ETHER | IFM_HPNA_1,	IF_Mbps(1) },			\
-	{ IFM_ETHER | IFM_10G_LR,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_10G_SR,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_10G_CX4,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_2500_SX,	IF_Mbps(2500ULL) },		\
-	{ IFM_ETHER | IFM_10G_TWINAX,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_10G_TWINAX_LONG,	IF_Gbps(10ULL) },	\
-	{ IFM_ETHER | IFM_10G_LRM,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_10G_T,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_40G_CR4,	IF_Gbps(40ULL) },		\
-	{ IFM_ETHER | IFM_40G_SR4,	IF_Gbps(40ULL) },		\
-	{ IFM_ETHER | IFM_40G_LR4,	IF_Gbps(40ULL) },		\
-	{ IFM_ETHER | IFM_1000_KX,	IF_Mbps(1000) },		\
-	{ IFM_ETHER | IFM_10G_KX4,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_10G_KR,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_10G_CR1,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_20G_KR2,	IF_Gbps(20ULL) },		\
-	{ IFM_ETHER | IFM_2500_KX,	IF_Mbps(2500) },		\
-	{ IFM_ETHER | IFM_2500_T,	IF_Mbps(2500) },		\
-	{ IFM_ETHER | IFM_5000_T,	IF_Mbps(5000) },		\
-	{ IFM_ETHER | IFM_50G_PCIE,	IF_Gbps(50ULL) },		\
-	{ IFM_ETHER | IFM_25G_PCIE,	IF_Gbps(25ULL) },		\
-	{ IFM_ETHER | IFM_1000_SGMII,	IF_Mbps(1000) },		\
-	{ IFM_ETHER | IFM_10G_SFI,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_40G_XLPPI,	IF_Gbps(40ULL) },		\
-	{ IFM_ETHER | IFM_1000_CX_SGMII, IF_Mbps(1000) },		\
-	{ IFM_ETHER | IFM_40G_KR4,	IF_Gbps(40ULL) },		\
-	{ IFM_ETHER | IFM_10G_ER,	IF_Gbps(10ULL) },		\
-	{ IFM_ETHER | IFM_100G_CR4,	IF_Gbps(100ULL) },		\
-	{ IFM_ETHER | IFM_100G_SR4,	IF_Gbps(100ULL) },		\
-	{ IFM_ETHER | IFM_100G_KR4,	IF_Gbps(100ULL) },		\
-	{ IFM_ETHER | IFM_100G_LR4,	IF_Gbps(100ULL) },		\
-	{ IFM_ETHER | IFM_56G_R4,	IF_Gbps(56ULL) },		\
-	{ IFM_ETHER | IFM_100_T,	IF_Mbps(100ULL) },		\
-	{ IFM_ETHER | IFM_25G_CR,	IF_Gbps(25ULL) },		\
-	{ IFM_ETHER | IFM_25G_KR,	IF_Gbps(25ULL) },		\
-	{ IFM_ETHER | IFM_25G_SR,	IF_Gbps(25ULL) },		\
-	{ IFM_ETHER | IFM_50G_CR2,	IF_Gbps(50ULL) },		\
-	{ IFM_ETHER | IFM_50G_KR2,	IF_Gbps(50ULL) },		\
-									\
-	{ IFM_TOKEN | IFM_TOK_STP4,	IF_Mbps(4) },			\
-	{ IFM_TOKEN | IFM_TOK_STP16,	IF_Mbps(16) },			\
-	{ IFM_TOKEN | IFM_TOK_UTP4,	IF_Mbps(4) },			\
-	{ IFM_TOKEN | IFM_TOK_UTP16,	IF_Mbps(16) },			\
-									\
-	{ IFM_FDDI | IFM_FDDI_SMF,	IF_Mbps(100) },			\
-	{ IFM_FDDI | IFM_FDDI_MMF,	IF_Mbps(100) },			\
-	{ IFM_FDDI | IFM_FDDI_UTP,	IF_Mbps(100) },			\
-									\
-	{ IFM_IEEE80211 | IFM_IEEE80211_FH1,	IF_Mbps(1) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_FH2,	IF_Mbps(2) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_DS2,	IF_Mbps(2) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_DS5,	IF_Kbps(5500) },	\
-	{ IFM_IEEE80211 | IFM_IEEE80211_DS11,	IF_Mbps(11) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_DS1,	IF_Mbps(1) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_DS22,	IF_Mbps(22) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_OFDM6,	IF_Mbps(6) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_OFDM9,	IF_Mbps(9) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_OFDM12,	IF_Mbps(12) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_OFDM18,	IF_Mbps(18) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_OFDM24,	IF_Mbps(24) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_OFDM36,	IF_Mbps(36) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_OFDM48,	IF_Mbps(48) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_OFDM54,	IF_Mbps(54) },		\
-	{ IFM_IEEE80211 | IFM_IEEE80211_OFDM72,	IF_Mbps(72) },		\
-									\
-	{ 0, 0 },							\
-}
-
-/*
- * Status descriptions for the various media types.
- */
-struct ifmedia_status_description {
-	int	   ifms_type;
-	int	   ifms_valid;
-	int	   ifms_bit;
-	const char *ifms_string[2];
-};
-
-#define	IFM_STATUS_DESC(ifms, bit)					\
-	(ifms)->ifms_string[((ifms)->ifms_bit & (bit)) ? 1 : 0]
-
-#define	IFM_STATUS_DESCRIPTIONS {					\
-	{ IFM_ETHER,		IFM_AVALID,	IFM_ACTIVE,		\
-	    { "no carrier", "active" } },				\
-	{ IFM_FDDI,		IFM_AVALID,	IFM_ACTIVE,		\
-	    { "no ring", "inserted" } },				\
-	{ IFM_TOKEN,		IFM_AVALID,	IFM_ACTIVE,		\
-	    { "no ring", "inserted" } },				\
-	{ IFM_IEEE80211,	IFM_AVALID,	IFM_ACTIVE,		\
-	    { "no network", "active" } },				\
-	{ IFM_ATM,		IFM_AVALID,	IFM_ACTIVE,		\
-	    { "no network", "active" } },				\
-	{ 0,			0,		0,			\
-	    { NULL, NULL } }						\
-}
-#endif	/* _NET_IF_MEDIA_H_ */
diff --git a/include.new/net/if_mib.h b/include.new/net/if_mib.h
deleted file mode 100644
index b128ae4..0000000
--- a/include.new/net/if_mib.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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: releng/10.2/sys/net/if_mib.h 154023 2006-01-04 12:57:09Z harti $
- */
-
-#ifndef _NET_IF_MIB_H
-#define	_NET_IF_MIB_H	1
-
-struct ifmibdata {
-	char	ifmd_name[IFNAMSIZ]; /* name of interface */
-	int	ifmd_pcount;	/* number of promiscuous listeners */
-	int	ifmd_flags;	/* interface flags */
-	int	ifmd_snd_len;	/* instantaneous length of send queue */
-	int	ifmd_snd_maxlen; /* maximum length of send queue */
-	int	ifmd_snd_drops;	/* number of drops in send queue */
-	int	ifmd_filler[4];	/* for future expansion */
-	struct	if_data ifmd_data; /* generic information and statistics */
-};
-
-/*
- * sysctl MIB tags at the net.link.generic level
- */
-#define	IFMIB_SYSTEM	1	/* non-interface-specific */
-#define	IFMIB_IFDATA	2	/* per-interface data table */
-
-/*
- * MIB tags for the various net.link.generic.ifdata tables
- */
-#define	IFDATA_GENERAL	1	/* generic stats for all kinds of ifaces */
-#define	IFDATA_LINKSPECIFIC	2 /* specific to the type of interface */
-#define	IFDATA_DRIVERNAME	3 /* driver name and unit */
-
-/*
- * MIB tags at the net.link.generic.system level
- */
-#define	IFMIB_IFCOUNT	1	/* number of interfaces configured */
-
-/*
- * MIB tags as the net.link level
- * All of the other values are IFT_* names defined in if_types.h.
- */
-#define	NETLINK_GENERIC	0	/* functions not specific to a type of iface */
-
-/*
- * The reason why the IFDATA_LINKSPECIFIC stuff is not under the
- * net.link.<iftype> branches is twofold:
- *   1) It's easier to code this way, and doesn't require duplication.
- *   2) The fourth level under net.link.<iftype> is <pf>; that is to say,
- *	the net.link.<iftype> tree instruments the adaptation layers between
- *	<iftype> and a particular protocol family (e.g., net.link.ether.inet
- *	instruments ARP).  This does not really leave room for anything else
- *	that needs to have a well-known number.
- */
-
-/*
- * Link-specific MIB structures for various link types.
- */
-
-/* For IFT_ETHER, IFT_ISO88023, and IFT_STARLAN, as used by RFC 1650 */
-struct ifmib_iso_8802_3 {
-	uint32_t	dot3StatsAlignmentErrors;
-	uint32_t	dot3StatsFCSErrors;
-	uint32_t	dot3StatsSingleCollisionFrames;
-	uint32_t	dot3StatsMultipleCollisionFrames;
-	uint32_t	dot3StatsSQETestErrors;
-	uint32_t	dot3StatsDeferredTransmissions;
-	uint32_t	dot3StatsLateCollisions;
-	uint32_t	dot3StatsExcessiveCollisions;
-	uint32_t	dot3StatsInternalMacTransmitErrors;
-	uint32_t	dot3StatsCarrierSenseErrors;
-	uint32_t	dot3StatsFrameTooLongs;
-	uint32_t	dot3StatsInternalMacReceiveErrors;
-	uint32_t	dot3StatsEtherChipSet;
-	/* Matt Thomas wants this one, not included in RFC 1650: */
-	uint32_t	dot3StatsMissedFrames;
-
-	uint32_t	dot3StatsCollFrequencies[16]; /* NB: index origin */
-
-	uint32_t	dot3Compliance;
-#define	DOT3COMPLIANCE_STATS	1
-#define	DOT3COMPLIANCE_COLLS	2
-};
-
-/*
- * Chipset identifiers are normally part of the vendor's enterprise MIB.
- * However, we don't want to be trying to represent arbitrary-length
- * OBJECT IDENTIFIERs here (ick!), and the right value is not necessarily
- * obvious to the driver implementor.  So, we define our own identification
- * mechanism here, and let the agent writer deal with the translation.
- */
-#define	DOT3CHIPSET_VENDOR(x)	((x) >> 16)
-#define	DOT3CHIPSET_PART(x)	((x) & 0xffff)
-#define	DOT3CHIPSET(v,p)	(((v) << 16) + ((p) & 0xffff))
-
-/* Driver writers!  Add your vendors here! */
-enum dot3Vendors {
-	dot3VendorAMD = 1,
-	dot3VendorIntel = 2,
-	dot3VendorNational = 4,
-	dot3VendorFujitsu = 5,
-	dot3VendorDigital = 6,
-	dot3VendorWesternDigital = 7
-};
-
-/* Driver writers!  Add your chipsets here! */
-enum {
-	dot3ChipSetAMD7990 = 1,
-	dot3ChipSetAMD79900 = 2,
-	dot3ChipSetAMD79C940 = 3
-};
-
-enum {
-	dot3ChipSetIntel82586 = 1,
-	dot3ChipSetIntel82596 = 2,
-	dot3ChipSetIntel82557 = 3
-};
-
-enum {
-	dot3ChipSetNational8390 = 1,
-	dot3ChipSetNationalSonic = 2
-};
-
-enum {
-	dot3ChipSetFujitsu86950 = 1
-};
-
-enum {
-	dot3ChipSetDigitalDC21040 = 1,
-	dot3ChipSetDigitalDC21140 = 2,
-	dot3ChipSetDigitalDC21041 = 3,
-	dot3ChipSetDigitalDC21140A = 4,
-	dot3ChipSetDigitalDC21142 = 5
-};
-
-enum {
-	dot3ChipSetWesternDigital83C690 = 1,
-	dot3ChipSetWesternDigital83C790 = 2
-};
-/* END of Ethernet-link MIB stuff */
-
-/*
- * Put other types of interface MIBs here, or in interface-specific
- * header files if convenient ones already exist.
- */
-#endif /* _NET_IF_MIB_H */
diff --git a/include.new/net/if_pflog.h b/include.new/net/if_pflog.h
deleted file mode 100644
index 64c0462..0000000
--- a/include.new/net/if_pflog.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $OpenBSD: if_pflog.h,v 1.13 2006/10/23 12:46:09 henning Exp $ */
-/*
- * Copyright 2001 Niels Provos <provos@citi.umich.edu>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#ifndef _NET_IF_PFLOG_H_
-#define	_NET_IF_PFLOG_H_
-
-#define	PFLOGIFS_MAX	16
-
-#define	PFLOG_RULESET_NAME_SIZE	16
-
-struct pfloghdr {
-	u_int8_t	length;
-	sa_family_t	af;
-	u_int8_t	action;
-	u_int8_t	reason;
-	char		ifname[IFNAMSIZ];
-	char		ruleset[PFLOG_RULESET_NAME_SIZE];
-	uint32_t	rulenr;
-	uint32_t	subrulenr;
-	uid_t		uid;
-	pid_t		pid;
-	uid_t		rule_uid;
-	pid_t		rule_pid;
-	u_int8_t	dir;
-	u_int8_t	pad[3];
-};
-
-#define	PFLOG_HDRLEN		sizeof(struct pfloghdr)
-/* minus pad, also used as a signature */
-#define	PFLOG_REAL_HDRLEN	offsetof(struct pfloghdr, pad)
-
-#ifdef _KERNEL
-struct pf_rule;
-struct pf_ruleset;
-struct pfi_kif;
-struct pf_pdesc;
-
-#define	PFLOG_PACKET(i,a,b,c,d,e,f,g,h,di) do {		\
-	if (pflog_packet_ptr != NULL)			\
-		pflog_packet_ptr(i,a,b,c,d,e,f,g,h,di);	\
-} while (0)
-#endif /* _KERNEL */
-#endif /* _NET_IF_PFLOG_H_ */
diff --git a/include.new/net/if_pfsync.h b/include.new/net/if_pfsync.h
deleted file mode 100644
index 8a2993d..0000000
--- a/include.new/net/if_pfsync.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*-
- * Copyright (c) 2001 Michael Shalayeff
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 HIS RELATIVES 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 MIND, 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.
- */
-
-/*-
- * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- *	$OpenBSD: if_pfsync.h,v 1.35 2008/06/29 08:42:15 mcbride Exp $
- *	$FreeBSD: releng/10.2/sys/net/if_pfsync.h 254925 2013-08-26 18:16:05Z jhb $
- */
-
-
-#ifndef _NET_IF_PFSYNC_H_
-#define	_NET_IF_PFSYNC_H_
-
-#define	PFSYNC_VERSION		5
-#define	PFSYNC_DFLTTL		255
-
-#define	PFSYNC_ACT_CLR		0	/* clear all states */
-#define	PFSYNC_ACT_INS		1	/* insert state */
-#define	PFSYNC_ACT_INS_ACK	2	/* ack of insterted state */
-#define	PFSYNC_ACT_UPD		3	/* update state */
-#define	PFSYNC_ACT_UPD_C	4	/* "compressed" update state */
-#define	PFSYNC_ACT_UPD_REQ	5	/* request "uncompressed" state */
-#define	PFSYNC_ACT_DEL		6	/* delete state */
-#define	PFSYNC_ACT_DEL_C	7	/* "compressed" delete state */
-#define	PFSYNC_ACT_INS_F	8	/* insert fragment */
-#define	PFSYNC_ACT_DEL_F	9	/* delete fragments */
-#define	PFSYNC_ACT_BUS		10	/* bulk update status */
-#define	PFSYNC_ACT_TDB		11	/* TDB replay counter update */
-#define	PFSYNC_ACT_EOF		12	/* end of frame */
-#define	PFSYNC_ACT_MAX		13
-
-/*
- * A pfsync frame is built from a header followed by several sections which
- * are all prefixed with their own subheaders. Frames must be terminated with
- * an EOF subheader.
- *
- * | ...			|
- * | IP header			|
- * +============================+
- * | pfsync_header		|
- * +----------------------------+
- * | pfsync_subheader		|
- * +----------------------------+
- * | first action fields	|
- * | ...			|
- * +----------------------------+
- * | pfsync_subheader		|
- * +----------------------------+
- * | second action fields	|
- * | ...			|
- * +----------------------------+
- * | EOF pfsync_subheader	|
- * +----------------------------+
- * | HMAC			|
- * +============================+
- */
-
-/*
- * Frame header
- */
-
-struct pfsync_header {
-	u_int8_t			version;
-	u_int8_t			_pad;
-	u_int16_t			len;
-	u_int8_t			pfcksum[PF_MD5_DIGEST_LENGTH];
-} __packed;
-
-/*
- * Frame region subheader
- */
-
-struct pfsync_subheader {
-	u_int8_t			action;
-	u_int8_t			_pad;
-	u_int16_t			count;
-} __packed;
-
-/*
- * CLR
- */
-
-struct pfsync_clr {
-	char				ifname[IFNAMSIZ];
-	uint32_t			creatorid;
-} __packed;
-
-/*
- * INS, UPD, DEL
- */
-
-/* these use struct pfsync_state in pfvar.h */
-
-/*
- * INS_ACK
- */
-
-struct pfsync_ins_ack {
-	u_int64_t			id;
-	uint32_t			creatorid;
-} __packed;
-
-/*
- * UPD_C
- */
-
-struct pfsync_upd_c {
-	u_int64_t			id;
-	struct pfsync_state_peer	src;
-	struct pfsync_state_peer	dst;
-	uint32_t			creatorid;
-	uint32_t			expire;
-	u_int8_t			timeout;
-	u_int8_t			_pad[3];
-} __packed;
-
-/*
- * UPD_REQ
- */
-
-struct pfsync_upd_req {
-	u_int64_t			id;
-	uint32_t			creatorid;
-} __packed;
-
-/*
- * DEL_C
- */
-
-struct pfsync_del_c {
-	u_int64_t			id;
-	uint32_t			creatorid;
-} __packed;
-
-/*
- * INS_F, DEL_F
- */
-
-/* not implemented (yet) */
-
-/*
- * BUS
- */
-
-struct pfsync_bus {
-	uint32_t			creatorid;
-	uint32_t			endtime;
-	u_int8_t			status;
-#define	PFSYNC_BUS_START			1
-#define	PFSYNC_BUS_END				2
-	u_int8_t			_pad[3];
-} __packed;
-
-/*
- * TDB
- */
-
-struct pfsync_tdb {
-	uint32_t			spi;
-	union sockaddr_union		dst;
-	uint32_t			rpl;
-	u_int64_t			cur_bytes;
-	u_int8_t			sproto;
-	u_int8_t			updates;
-	u_int8_t			_pad[2];
-} __packed;
-
-#define	PFSYNC_HDRLEN		sizeof(struct pfsync_header)
-
-/*
- * Names for PFSYNC sysctl objects
- */
-#define	PFSYNCCTL_STATS		1	/* PFSYNC stats */
-#define	PFSYNCCTL_MAXID		2
-
-struct pfsyncstats {
-	u_int64_t	pfsyncs_ipackets;	/* total input packets, IPv4 */
-	u_int64_t	pfsyncs_ipackets6;	/* total input packets, IPv6 */
-	u_int64_t	pfsyncs_badif;		/* not the right interface */
-	u_int64_t	pfsyncs_badttl;		/* TTL is not PFSYNC_DFLTTL */
-	u_int64_t	pfsyncs_hdrops;		/* packets shorter than hdr */
-	u_int64_t	pfsyncs_badver;		/* bad (incl unsupp) version */
-	u_int64_t	pfsyncs_badact;		/* bad action */
-	u_int64_t	pfsyncs_badlen;		/* data length does not match */
-	u_int64_t	pfsyncs_badauth;	/* bad authentication */
-	u_int64_t	pfsyncs_stale;		/* stale state */
-	u_int64_t	pfsyncs_badval;		/* bad values */
-	u_int64_t	pfsyncs_badstate;	/* insert/lookup failed */
-
-	u_int64_t	pfsyncs_opackets;	/* total output packets, IPv4 */
-	u_int64_t	pfsyncs_opackets6;	/* total output packets, IPv6 */
-	u_int64_t	pfsyncs_onomem;		/* no memory for an mbuf */
-	u_int64_t	pfsyncs_oerrors;	/* ip output error */
-
-	u_int64_t	pfsyncs_iacts[PFSYNC_ACT_MAX];
-	u_int64_t	pfsyncs_oacts[PFSYNC_ACT_MAX];
-};
-
-/*
- * Configuration structure for SIOCSETPFSYNC SIOCGETPFSYNC
- */
-struct pfsyncreq {
-	char		 pfsyncr_syncdev[IFNAMSIZ];
-	struct in_addr	 pfsyncr_syncpeer;
-	int		 pfsyncr_maxupdates;
-	int		 pfsyncr_defer;
-};
-
-#define	SIOCSETPFSYNC   _IOW('i', 247, struct ifreq)
-#define	SIOCGETPFSYNC   _IOWR('i', 248, struct ifreq)
-
-#ifdef _KERNEL
-
-/*
- * this shows where a pf state is with respect to the syncing.
- */
-#define	PFSYNC_S_INS	0x00
-#define	PFSYNC_S_IACK	0x01
-#define	PFSYNC_S_UPD	0x02
-#define	PFSYNC_S_UPD_C	0x03
-#define	PFSYNC_S_DEL	0x04
-#define	PFSYNC_S_COUNT	0x05
-
-#define	PFSYNC_S_DEFER	0xfe
-#define	PFSYNC_S_NONE	0xff
-
-#define	PFSYNC_SI_IOCTL		0x01
-#define	PFSYNC_SI_CKSUM		0x02
-#define	PFSYNC_SI_ACK		0x04
-
-#endif /* _KERNEL */
-
-#endif /* _NET_IF_PFSYNC_H_ */
diff --git a/include.new/net/if_ppp.h b/include.new/net/if_ppp.h
deleted file mode 100644
index b97c341..0000000
--- a/include.new/net/if_ppp.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * if_ppp.h - Point-to-Point Protocol definitions.
- */
-
-/*-
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $FreeBSD: src/sys/net/if_ppp.h,v 1.15 2005/01/07 01:45:34 imp Exp $
- */
-
-#ifndef _IF_PPP_H_
-#define _IF_PPP_H_
-
-/* XXX this used to be self-contained. */
-#include <net/ppp_defs.h>
-#include <net/if.h>
-
-/*
- * Packet sizes
- */
-#define	PPP_MTU		1500	/* Default MTU (size of Info field) */
-#define PPP_MAXMRU	65000	/* Largest MRU we allow */
-#define PPP_MAXMTU	16384	/* Largest MTU we allow */
-
-/*
- * Bit definitions for flags.
- */
-#define SC_COMP_PROT	0x00000001	/* protocol compression (output) */
-#define SC_COMP_AC	0x00000002	/* header compression (output) */
-#define	SC_COMP_TCP	0x00000004	/* TCP (VJ) compression (output) */
-#define SC_NO_TCP_CCID	0x00000008	/* disable VJ connection-id comp. */
-#define SC_REJ_COMP_AC	0x00000010	/* reject adrs/ctrl comp. on input */
-#define SC_REJ_COMP_TCP	0x00000020	/* reject TCP (VJ) comp. on input */
-#define SC_CCP_OPEN	0x00000040	/* Look at CCP packets */
-#define SC_CCP_UP	0x00000080	/* May send/recv compressed packets */
-#define SC_DEBUG	0x00010000	/* enable debug messages */
-#define SC_LOG_INPKT	0x00020000	/* log contents of good pkts recvd */
-#define SC_LOG_OUTPKT	0x00040000	/* log contents of pkts sent */
-#define SC_LOG_RAWIN	0x00080000	/* log all chars received */
-#define SC_LOG_FLUSH	0x00100000	/* log all chars flushed */
-#define SC_RCV_B7_0	0x01000000	/* have rcvd char with bit 7 = 0 */
-#define SC_RCV_B7_1	0x02000000	/* have rcvd char with bit 7 = 1 */
-#define SC_RCV_EVNP	0x04000000	/* have rcvd char with even parity */
-#define SC_RCV_ODDP	0x08000000	/* have rcvd char with odd parity */
-#define	SC_MASK		0x0fff00ff	/* bits that user can change */
-
-/*
- * State bits in sc_flags, not changeable by user.
- */
-#define SC_TIMEOUT	0x00000400	/* timeout is currently pending */
-#define SC_VJ_RESET	0x00000800	/* need to reset VJ decomp */
-#define SC_COMP_RUN	0x00001000	/* compressor has been initiated */
-#define SC_DECOMP_RUN	0x00002000	/* decompressor has been initiated */
-#define SC_DC_ERROR	0x00004000	/* non-fatal decomp error detected */
-#define SC_DC_FERROR	0x00008000	/* fatal decomp error detected */
-#define SC_TBUSY	0x10000000	/* xmitter doesn't need a packet yet */
-#define SC_PKTLOST	0x20000000	/* have lost or dropped a packet */
-#define	SC_FLUSH	0x40000000	/* flush input until next PPP_FLAG */
-#define	SC_ESCAPED	0x80000000	/* saw a PPP_ESCAPE */
-
-/*
- * Ioctl definitions.
- */
-
-struct npioctl {
-    int		protocol;	/* PPP procotol, e.g. PPP_IP */
-    enum NPmode	mode;
-};
-
-/* Structure describing a CCP configuration option, for PPPIOCSCOMPRESS */
-struct ppp_option_data {
-	u_char	*ptr;
-	u_int	length;
-	int	transmit;
-};
-
-struct ifpppstatsreq {
-    char ifr_name[IFNAMSIZ];
-    struct ppp_stats stats;
-};
-
-struct ifpppcstatsreq {
-    char ifr_name[IFNAMSIZ];
-    struct ppp_comp_stats stats;
-};
-
-/*
- * Ioctl definitions.
- */
-
-#define	PPPIOCGFLAGS	_IOR('t', 90, int)	/* get configuration flags */
-#define	PPPIOCSFLAGS	_IOW('t', 89, int)	/* set configuration flags */
-#define	PPPIOCGASYNCMAP	_IOR('t', 88, int)	/* get async map */
-#define	PPPIOCSASYNCMAP	_IOW('t', 87, int)	/* set async map */
-#define	PPPIOCGUNIT	_IOR('t', 86, int)	/* get ppp unit number */
-#define	PPPIOCGRASYNCMAP _IOR('t', 85, int)	/* get receive async map */
-#define	PPPIOCSRASYNCMAP _IOW('t', 84, int)	/* set receive async map */
-#define	PPPIOCGMRU	_IOR('t', 83, int)	/* get max receive unit */
-#define	PPPIOCSMRU	_IOW('t', 82, int)	/* set max receive unit */
-#define	PPPIOCSMAXCID	_IOW('t', 81, int)	/* set VJ max slot ID */
-#define PPPIOCGXASYNCMAP _IOR('t', 80, ext_accm) /* get extended ACCM */
-#define PPPIOCSXASYNCMAP _IOW('t', 79, ext_accm) /* set extended ACCM */
-#define PPPIOCXFERUNIT	_IO('t', 78)		/* transfer PPP unit */
-#define PPPIOCSCOMPRESS	_IOW('t', 77, struct ppp_option_data)
-#define PPPIOCGNPMODE	_IOWR('t', 76, struct npioctl) /* get NP mode */
-#define PPPIOCSNPMODE	_IOW('t', 75, struct npioctl)  /* set NP mode */
-#define PPPIOCGIDLE	_IOR('t', 74, struct ppp_idle) /* get idle time */
-#define PPPIOCSPASS	_IOW('t', 71, struct bpf_program) /* set pass filter */
-#define PPPIOCSACTIVE	_IOW('t', 70, struct bpf_program) /* set active filt */
-
-/* PPPIOC[GS]MTU are alternatives to SIOC[GS]IFMTU, used under Ultrix */
-#define PPPIOCGMTU	_IOR('t', 73, int)	/* get interface MTU */
-#define PPPIOCSMTU	_IOW('t', 72, int)	/* set interface MTU */
-
-/*
- * These two are interface ioctls so that pppstats can do them on
- * a socket without having to open the serial device.
- */
-#define SIOCGPPPSTATS	_IOWR('i', 123, struct ifpppstatsreq)
-#define SIOCGPPPCSTATS	_IOWR('i', 122, struct ifpppcstatsreq)
-
-#if !defined(ifr_mtu)
-#define ifr_mtu	ifr_ifru.ifru_metric
-#endif
-
-#endif /* _IF_PPP_H_ */
diff --git a/include.new/net/if_pppvar.h b/include.new/net/if_pppvar.h
deleted file mode 100644
index c18cac2..0000000
--- a/include.new/net/if_pppvar.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * if_pppvar.h - private structures and declarations for PPP.
- */
-/*-
- * Copyright (c) 1994 The Australian National University.
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
- *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
- *
- * Copyright (c) 1989 Carnegie Mellon University.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by Carnegie Mellon University.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $FreeBSD: src/sys/net/if_pppvar.h,v 1.23.2.1 2005/08/19 14:52:21 glebius Exp $
- */
-
-/*
- * Supported network protocols.  These values are used for
- * indexing sc_npmode.
- */
-#define NP_IP	0		/* Internet Protocol */
-#define NUM_NP	1		/* Number of NPs. */
-
-/*
- * Structure describing each ppp unit.
- */
-struct ppp_softc {
-	struct	ifnet *sc_ifp;		/* network-visible interface */
-/*hi*/	u_int	sc_flags;		/* control/status bits; see if_ppp.h */
-	struct	callout_handle sc_ch;	/* Used for scheduling timeouts */
-	void	*sc_devp;		/* pointer to device-dep structure */
-	void	(*sc_start)(struct ppp_softc *);	/* start output proc */
-	void	(*sc_ctlp)(struct ppp_softc *); /* rcvd control pkt */
-	void	(*sc_relinq)(struct ppp_softc *); /* relinquish ifunit */
-	void	(*sc_setmtu)(struct ppp_softc *); /* set mtu */
-	short	sc_mru;			/* max receive unit */
-	pid_t	sc_xfer;		/* used in transferring unit */
-/*hi*/	struct	ifqueue sc_rawq;	/* received packets */
-/*net*/	struct	ifqueue sc_inq;		/* queue of input packets for daemon */
-/*net*/	struct	ifqueue sc_fastq;	/* interactive output packet q */
-	struct	mbuf *sc_npqueue;	/* output packets not to be sent yet */
-	struct	mbuf **sc_npqtail;	/* ptr to last next ptr in npqueue */
-	struct	pppstat sc_stats;	/* count of bytes/pkts sent/rcvd */
-	enum	NPmode sc_npmode[NUM_NP]; /* what to do with each NP */
-	struct	compressor *sc_xcomp;	/* transmit compressor */
-	void	*sc_xc_state;		/* transmit compressor state */
-	struct	compressor *sc_rcomp;	/* receive decompressor */
-	void	*sc_rc_state;		/* receive decompressor state */
-	time_t	sc_last_sent;		/* time (secs) last NP pkt sent */
-	time_t	sc_last_recv;		/* time (secs) last NP pkt rcvd */
-#ifdef PPP_FILTER
-	struct	bpf_program sc_pass_filt;   /* filter for packets to pass */
-	struct	bpf_program sc_active_filt; /* filter for "non-idle" packets */
-#endif /* PPP_FILTER */
-#ifdef	VJC
-	struct	slcompress *sc_comp; 	/* vjc control buffer */
-#endif
-
-	/* Device-dependent part for async lines. */
-	ext_accm sc_asyncmap;		/* async control character map */
-	u_long	sc_rasyncmap;		/* receive async control char map */
-	struct	mbuf *sc_outm;		/* mbuf chain currently being output */
-	struct	mbuf *sc_m;		/* pointer to input mbuf chain */
-	struct	mbuf *sc_mc;		/* pointer to current input mbuf */
-	char	*sc_mp;			/* ptr to next char in input mbuf */
-	short	sc_ilen;		/* length of input packet so far */
-	u_short	sc_fcs;			/* FCS so far (input) */
-	u_short	sc_outfcs;		/* FCS so far for output packet */
-	u_char	sc_rawin[16];		/* chars as received */
-	int	sc_rawin_count;		/* # in sc_rawin */
-	LIST_ENTRY(ppp_softc) sc_list;
-};
-#define	PPP2IFP(sc)	((sc)->sc_ifp)
-
-struct	ppp_softc *pppalloc(pid_t pid);
-void	pppdealloc(struct ppp_softc *sc);
-int	pppioctl(struct ppp_softc *sc, u_long cmd, caddr_t data, int flag,
-	    struct thread *td);
-int	pppoutput(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
-	    struct rtentry *rtp);
-void	ppp_restart(struct ppp_softc *sc);
-void	ppppktin(struct ppp_softc *sc, struct mbuf *m, int lost);
-struct	mbuf *ppp_dequeue(struct ppp_softc *sc);
diff --git a/include.new/net/if_slvar.h b/include.new/net/if_slvar.h
deleted file mode 100644
index 761cf5c..0000000
--- a/include.new/net/if_slvar.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- *
- *	@(#)if_slvar.h	8.3 (Berkeley) 2/1/94
- *
- * $FreeBSD: src/sys/net/if_slvar.h,v 1.23 2005/06/10 16:49:18 brooks Exp $
- */
-
-#ifndef _NET_IF_SLVAR_H_
-#define _NET_IF_SLVAR_H_
-
-#include <sys/callout.h>
-
-/*
- * Definitions for SLIP interface data structures
- *
- * (This exists so programs like slstats can get at the definition
- *  of sl_softc.)
- */
-struct sl_softc {
-	struct	ifnet *sc_ifp;		/* network-visible interface */
-	struct	ifqueue sc_fastq;	/* interactive output queue */
-	struct	tty *sc_ttyp;		/* pointer to tty structure */
-	struct	mbuf *sc_mbuf;		/* pointer to mbuf containing buffer */
-	u_char	*sc_mp;			/* pointer to next available buf char */
-	u_char	*sc_ep;			/* pointer to last available buf char */
-	u_char	*sc_buf;		/* input buffer */
-	u_int	sc_flags;		/* see below */
-	u_int	sc_escape;	/* =1 if last char input was FRAME_ESCAPE */
-	time_t	sc_lasttime;		/* last time a char arrived */
-	long	sc_abortcount;		/* number of abort escape chars */
-	time_t	sc_starttime;		/* time of first abort in window */
-	u_int	sc_keepalive;		/* time	to decide link hang */
-	u_int	sc_outfill;	/* time	to send	FRAME_END when output idle */
-					/*
-					 * Handles for scheduling outfill and
-					 * keepalive timeouts.
-					 */
-	struct	callout_handle	sc_ofhandle;
-	struct	callout_handle	sc_kahandle;
-	struct	slcompress sc_comp;	/* tcp compression data */
-	LIST_ENTRY(sl_softc) sl_next;
-	u_char	*bpfbuf;		/* hang buffer for bpf here */
-};
-#define	SL2IFP(sc)	((sc)->sc_ifp)
-
-/* internal flags */
-#define	SC_ERROR	0x0001		/* had an input error */
-#define	SC_OUTWAIT	0x0002		/* waiting for output fill */
-#define	SC_KEEPALIVE	0x0004		/* input keepalive */
-
-/* visible flags */
-#define	SC_COMPRESS	IFF_LINK0	/* compress TCP traffic */
-#define	SC_NOICMP	IFF_LINK1	/* suppress ICMP traffic */
-#define	SC_AUTOCOMP	IFF_LINK2	/* auto-enable TCP compression */
-
-
-#endif
diff --git a/include.new/net/if_sppp.h b/include.new/net/if_sppp.h
deleted file mode 100644
index 0fb9ee0..0000000
--- a/include.new/net/if_sppp.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Defines for synchronous PPP/Cisco/Frame Relay link level subroutines.
- */
-/*-
- * Copyright (C) 1994-2000 Cronyx Engineering.
- * Author: Serge Vakulenko, <vak@cronyx.ru>
- *
- * Heavily revamped to conform to RFC 1661.
- * Copyright (C) 1997, Joerg Wunsch.
- *
- * This software is distributed with NO WARRANTIES, not even the implied
- * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Authors grant any other persons or organizations permission to use
- * or modify this software as long as this message is kept with the software,
- * all derivative works or modified versions.
- *
- * From: Version 2.0, Fri Oct  6 20:39:21 MSK 1995
- *
- * $FreeBSD: releng/10.2/sys/net/if_sppp.h 147256 2005-06-10 16:49:24Z brooks $
- */
-
-#ifndef _NET_IF_SPPP_H_
-#define _NET_IF_SPPP_H_ 1
-
-#define IDX_LCP 0		/* idx into state table */
-
-struct slcp {
-	u_long	opts;		/* LCP options to send (bitfield) */
-	u_long  magic;          /* local magic number */
-	u_long	mru;		/* our max receive unit */
-	u_long	their_mru;	/* their max receive unit */
-	u_long	protos;		/* bitmask of protos that are started */
-	u_char  echoid;         /* id of last keepalive echo request */
-	/* restart max values, see RFC 1661 */
-	int	timeout;
-	int	max_terminate;
-	int	max_configure;
-	int	max_failure;
-};
-
-#define IDX_IPCP 1		/* idx into state table */
-#define IDX_IPV6CP 2		/* idx into state table */
-
-struct sipcp {
-	u_long	opts;		/* IPCP options to send (bitfield) */
-	u_int	flags;
-#define IPCP_HISADDR_SEEN 1	/* have seen his address already */
-#define IPCP_MYADDR_DYN   2	/* my address is dynamically assigned */
-#define IPCP_MYADDR_SEEN  4	/* have seen his address already */
-#ifdef notdef
-#define IPV6CP_MYIFID_DYN 8	/* my ifid is dynamically assigned */
-#endif
-#define IPV6CP_MYIFID_SEEN 0x10	/* have seen his ifid already */
-#define IPCP_VJ		0x20	/* can use VJ compression */
-	int	max_state;	/* VJ: Max-Slot-Id */
-	int	compress_cid;	/* VJ: Comp-Slot-Id */
-};
-
-#define AUTHNAMELEN	64
-#define AUTHKEYLEN	16
-
-struct sauth {
-	u_short	proto;			/* authentication protocol to use */
-	u_short	flags;
-#define AUTHFLAG_NOCALLOUT	1	/* do not require authentication on */
-					/* callouts */
-#define AUTHFLAG_NORECHALLENGE	2	/* do not re-challenge CHAP */
-	u_char	name[AUTHNAMELEN];	/* system identification name */
-	u_char	secret[AUTHKEYLEN];	/* secret password */
-	u_char	challenge[AUTHKEYLEN];	/* random challenge */
-};
-
-#define IDX_PAP		3
-#define IDX_CHAP	4
-
-#define IDX_COUNT (IDX_CHAP + 1) /* bump this when adding cp's! */
-
-/*
- * Don't change the order of this.  Ordering the phases this way allows
- * for a comparision of ``pp_phase >= PHASE_AUTHENTICATE'' in order to
- * know whether LCP is up.
- */
-enum ppp_phase {
-	PHASE_DEAD, PHASE_ESTABLISH, PHASE_TERMINATE,
-	PHASE_AUTHENTICATE, PHASE_NETWORK
-};
-
-#define PP_MTU          1500    /* default/minimal MRU */
-#define PP_MAX_MRU	2048	/* maximal MRU we want to negotiate */
-
-/*
- * This is a cut down struct sppp (see below) that can easily be
- * exported to/ imported from userland without the need to include
- * dozens of kernel-internal header files.  It is used by the
- * SPPPIO[GS]DEFS ioctl commands below.
- */
-struct sppp_parms {
-	enum ppp_phase pp_phase;	/* phase we're currently in */
-	int	enable_vj;		/* VJ header compression enabled */
-	int	enable_ipv6;		/*
-					 * Enable IPv6 negotiations -- only
-					 * needed since each IPv4 i/f auto-
-					 * matically gets an IPv6 address
-					 * assigned, so we can't use this as
-					 * a decision.
-					 */
-	struct slcp lcp;		/* LCP params */
-	struct sipcp ipcp;		/* IPCP params */
-	struct sipcp ipv6cp;		/* IPv6CP params */
-	struct sauth myauth;		/* auth params, i'm peer */
-	struct sauth hisauth;		/* auth params, i'm authenticator */
-};
-
-/*
- * Definitions to pass struct sppp_parms data down into the kernel
- * using the SIOC[SG]IFGENERIC ioctl interface.
- *
- * In order to use this, create a struct spppreq, fill in the cmd
- * field with SPPPIOGDEFS, and put the address of this structure into
- * the ifr_data portion of a struct ifreq.  Pass this struct to a
- * SIOCGIFGENERIC ioctl.  Then replace the cmd field by SPPPIOSDEFS,
- * modify the defs field as desired, and pass the struct ifreq now
- * to a SIOCSIFGENERIC ioctl.
- */
-
-#define SPPPIOGDEFS  ((caddr_t)(('S' << 24) + (1 << 16) +\
-	sizeof(struct sppp_parms)))
-#define SPPPIOSDEFS  ((caddr_t)(('S' << 24) + (2 << 16) +\
-	sizeof(struct sppp_parms)))
-
-struct spppreq {
-	int	cmd;
-	struct sppp_parms defs;
-};
-
-#ifdef _KERNEL
-struct sppp {
-	struct  ifnet *pp_ifp;    /* network interface data */
-	struct  ifqueue pp_fastq; /* fast output queue */
-	struct	ifqueue pp_cpq;	/* PPP control protocol queue */
-	struct  sppp *pp_next;  /* next interface in keepalive list */
-	u_int   pp_mode;        /* major protocol modes (cisco/ppp/...) */
-	u_int   pp_flags;       /* sub modes */
-	u_short pp_alivecnt;    /* keepalive packets counter */
-	u_short pp_loopcnt;     /* loopback detection counter */
-	u_long  pp_seq[IDX_COUNT];	/* local sequence number */
-	u_long  pp_rseq[IDX_COUNT];	/* remote sequence number */
-	enum ppp_phase pp_phase;	/* phase we're currently in */
-	int	state[IDX_COUNT];	/* state machine */
-	u_char  confid[IDX_COUNT];	/* id of last configuration request */
-	int	rst_counter[IDX_COUNT];	/* restart counter */
-	int	fail_counter[IDX_COUNT]; /* negotiation failure counter */
-	int	confflags;	/* administrative configuration flags */
-#define CONF_ENABLE_VJ    0x01	/* VJ header compression enabled */
-#define CONF_ENABLE_IPV6  0x02	/* IPv6 administratively enabled */
-	time_t	pp_last_recv;	/* time last packet has been received */
-	time_t	pp_last_sent;	/* time last packet has been sent */
-	struct callout ch[IDX_COUNT];	/* per-proto and if callouts */
-	struct callout pap_my_to_ch;	/* PAP needs one more... */
-	struct callout keepalive_callout; /* keepalive callout */
-	struct slcp lcp;		/* LCP params */
-	struct sipcp ipcp;		/* IPCP params */
-	struct sipcp ipv6cp;		/* IPv6CP params */
-	struct sauth myauth;		/* auth params, i'm peer */
-	struct sauth hisauth;		/* auth params, i'm authenticator */
-	struct slcompress *pp_comp;	/* for VJ compression */
-	u_short fr_dlci;		/* Frame Relay DLCI number, 16..1023 */
-	u_char fr_status;		/* PVC status, active/new/delete */
-	/*
-	 * These functions are filled in by sppp_attach(), and are
-	 * expected to be used by the lower layer (hardware) drivers
-	 * in order to communicate the (un)availability of the
-	 * communication link.  Lower layer drivers that are always
-	 * ready to communicate (like hardware HDLC) can shortcut
-	 * pp_up from pp_tls, and pp_down from pp_tlf.
-	 */
-	void	(*pp_up)(struct sppp *sp);
-	void	(*pp_down)(struct sppp *sp);
-	/*
-	 * These functions need to be filled in by the lower layer
-	 * (hardware) drivers if they request notification from the
-	 * PPP layer whether the link is actually required.  They
-	 * correspond to the tls and tlf actions.
-	 */
-	void	(*pp_tls)(struct sppp *sp);
-	void	(*pp_tlf)(struct sppp *sp);
-	/*
-	 * These (optional) functions may be filled by the hardware
-	 * driver if any notification of established connections
-	 * (currently: IPCP up) is desired (pp_con) or any internal
-	 * state change of the interface state machine should be
-	 * signaled for monitoring purposes (pp_chg).
-	 */
-	void	(*pp_con)(struct sppp *sp);
-	void	(*pp_chg)(struct sppp *sp, int new_state);
-	/* These two fields are for use by the lower layer */
-	void    *pp_lowerp;
-	int     pp_loweri;
-	/* Lock */
-	struct mtx	mtx;
-	/* if_start () wrapper */
-	void	(*if_start) (struct ifnet *);
-	struct callout ifstart_callout; /* if_start () scheduler */
-};
-#define IFP2SP(ifp)	((struct sppp *)(ifp)->if_l2com)
-#define SP2IFP(sp)	((sp)->pp_ifp)
-
-/* bits for pp_flags */
-#define PP_KEEPALIVE    0x01    /* use keepalive protocol */
-#define PP_FR		0x04	/* use Frame Relay protocol instead of PPP */
-				/* 0x04 was PP_TIMO */
-#define PP_CALLIN	0x08	/* we are being called */
-#define PP_NEEDAUTH	0x10	/* remote requested authentication */
-
-void sppp_attach (struct ifnet *ifp);
-void sppp_detach (struct ifnet *ifp);
-void sppp_input (struct ifnet *ifp, struct mbuf *m);
-int sppp_ioctl (struct ifnet *ifp, u_long cmd, void *data);
-struct mbuf *sppp_dequeue (struct ifnet *ifp);
-struct mbuf *sppp_pick(struct ifnet *ifp);
-int sppp_isempty (struct ifnet *ifp);
-void sppp_flush (struct ifnet *ifp);
-
-/* Internal functions */
-void sppp_fr_input (struct sppp *sp, struct mbuf *m);
-struct mbuf *sppp_fr_header (struct sppp *sp, struct mbuf *m, int fam);
-void sppp_fr_keepalive (struct sppp *sp);
-void sppp_get_ip_addrs(struct sppp *sp, u_long *src, u_long *dst,
-		       u_long *srcmask);
-
-#endif
-
-#endif /* _NET_IF_SPPP_H_ */
diff --git a/include.new/net/if_stf.h b/include.new/net/if_stf.h
deleted file mode 100644
index a5096c8..0000000
--- a/include.new/net/if_stf.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/net/if_stf.h 139823 2005-01-07 01:45:51Z imp $	*/
-/*	$KAME: if_stf.h,v 1.5 2001/10/12 10:09:17 keiichi Exp $	*/
-
-/*-
- * Copyright (C) 2000 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NET_IF_STF_H_
-#define _NET_IF_STF_H_
-
-void in_stf_input(struct mbuf *, int);
-
-#endif /* _NET_IF_STF_H_ */
diff --git a/include.new/net/if_tap.h b/include.new/net/if_tap.h
deleted file mode 100644
index f481f9c..0000000
--- a/include.new/net/if_tap.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * BASED ON:
- * -------------------------------------------------------------------------
- *
- * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
- * Nottingham University 1987.
- */
-
-/*
- * $FreeBSD: releng/10.2/sys/net/if_tap.h 182880 2008-09-08 22:43:55Z emax $
- * $Id: if_tap.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef _NET_IF_TAP_H_
-#define _NET_IF_TAP_H_
-
-/* refer to if_tapvar.h for the softc stuff */
-
-/* maximum receive packet size (hard limit) */
-#define	TAPMRU		16384
-
-struct tapinfo {
-	int	baudrate;	/* linespeed                 */
-	short	mtu;		/* maximum transmission unit */
-	u_char	type;		/* ethernet, tokenring, etc. */
-	u_char	dummy;		/* place holder              */
-};
-
-/* ioctl's for get/set debug */
-#define	TAPSDEBUG		_IOW('t', 90, int)
-#define	TAPGDEBUG		_IOR('t', 89, int)
-#define	TAPSIFINFO		_IOW('t', 91, struct tapinfo)
-#define	TAPGIFINFO		_IOR('t', 92, struct tapinfo)
-#define	TAPGIFNAME		_IOR('t', 93, struct ifreq)
-
-/* VMware ioctl's */
-#define VMIO_SIOCSIFFLAGS	_IOWINT('V', 0)
-#define VMIO_SIOCSKEEP		_IO('V', 1)
-#define VMIO_SIOCSIFBR		_IO('V', 2)
-#define VMIO_SIOCSLADRF		_IO('V', 3)
-
-/* XXX -- unimplemented */
-#define VMIO_SIOCSETMACADDR	_IO('V', 4)
-
-/* XXX -- not used? */
-#define VMIO_SIOCPORT		_IO('V', 5)
-#define VMIO_SIOCBRIDGE		_IO('V', 6)
-#define VMIO_SIOCNETIF		_IO('V', 7)
-
-#endif /* !_NET_IF_TAP_H_ */
diff --git a/include.new/net/if_tapvar.h b/include.new/net/if_tapvar.h
deleted file mode 100644
index 263b6a6..0000000
--- a/include.new/net/if_tapvar.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (C) 1999-2000 by Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * BASED ON:
- * -------------------------------------------------------------------------
- *
- * Copyright (c) 1998 Brian Somers <brian@Awfulhak.org>
- * All rights reserved.
- *
- * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
- * Nottingham University 1987.
- */
-
-/*
- * $FreeBSD: releng/10.2/sys/net/if_tapvar.h 240942 2012-09-25 23:41:45Z emaste $
- * $Id: if_tapvar.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef _NET_IF_TAPVAR_H_
-#define _NET_IF_TAPVAR_H_
-
-/*
- * tap_mtx locks tap_flags, tap_pid.  tap_next locked with global tapmtx.
- * Other fields locked by owning subsystems.
- */
-struct tap_softc {
-	struct ifnet	*tap_ifp;
-	u_short		tap_flags;		/* misc flags                */
-#define	TAP_OPEN	(1 << 0)
-#define	TAP_INITED	(1 << 1)
-#define	TAP_RWAIT	(1 << 2)
-#define	TAP_ASYNC	(1 << 3)
-#define TAP_READY       (TAP_OPEN|TAP_INITED)
-#define	TAP_VMNET	(1 << 4)
-
-	u_int8_t 	ether_addr[ETHER_ADDR_LEN]; /* ether addr of the remote side */
-
-	pid_t		 tap_pid;		/* PID of process to open    */
-	struct sigio	*tap_sigio;		/* information for async I/O */
-	struct selinfo	 tap_rsel;		/* read select               */
-
-	SLIST_ENTRY(tap_softc)	tap_next;	/* next device in chain      */
-	struct cdev *tap_dev;
-	struct mtx	 tap_mtx;		/* per-softc mutex */
-};
-
-#endif /* !_NET_IF_TAPVAR_H_ */
diff --git a/include.new/net/if_tun.h b/include.new/net/if_tun.h
deleted file mode 100644
index 65313b9..0000000
--- a/include.new/net/if_tun.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: if_tun.h,v 1.5 1994/06/29 06:36:27 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1988, Julian Onions <jpo@cs.nott.ac.uk>
- * Nottingham University 1987.
- *
- * This source may be freely distributed, however I would be interested
- * in any changes that are made.
- *
- * This driver takes packets off the IP i/f and hands them up to a
- * user process to have its wicked way with. This driver has it's
- * roots in a similar driver written by Phil Cockcroft (formerly) at
- * UCL. This driver is based much more on read/write/select mode of
- * operation though.
- *
- * $FreeBSD: releng/10.2/sys/net/if_tun.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NET_IF_TUN_H_
-#define _NET_IF_TUN_H_
-
-/* Refer to if_tunvar.h for the softc stuff */
-
-/* Maximum transmit packet size (default) */
-#define	TUNMTU		1500
-
-/* Maximum receive packet size (hard limit) */
-#define	TUNMRU		16384
-
-struct tuninfo {
-	int	baudrate;		/* linespeed */
-	short	mtu;			/* maximum transmission unit */
-	u_char	type;			/* ethernet, tokenring, etc. */
-	u_char	dummy;			/* place holder */
-};
-
-/* ioctl's for get/set debug */
-#define	TUNSDEBUG	_IOW('t', 90, int)
-#define	TUNGDEBUG	_IOR('t', 89, int)
-#define	TUNSIFINFO	_IOW('t', 91, struct tuninfo)
-#define	TUNGIFINFO	_IOR('t', 92, struct tuninfo)
-#define	TUNSLMODE	_IOW('t', 93, int)
-#define	TUNSIFMODE	_IOW('t', 94, int)
-#define	TUNSIFPID	_IO('t', 95)
-#define	TUNSIFHEAD	_IOW('t', 96, int)
-#define	TUNGIFHEAD	_IOR('t', 97, int)
-
-#endif /* !_NET_IF_TUN_H_ */
diff --git a/include.new/net/if_types.h b/include.new/net/if_types.h
deleted file mode 100644
index 286ca55..0000000
--- a/include.new/net/if_types.h
+++ /dev/null
@@ -1,254 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)if_types.h	8.3 (Berkeley) 4/28/95
- * $FreeBSD: releng/10.2/sys/net/if_types.h 228571 2011-12-16 12:16:56Z glebius $
- * $NetBSD: if_types.h,v 1.16 2000/04/19 06:30:53 itojun Exp $
- */
-
-#ifndef _NET_IF_TYPES_H_
-#define _NET_IF_TYPES_H_
-
-/*
- * Interface types for benefit of parsing media address headers.
- * This list is derived from the SNMP list of ifTypes, originally
- * documented in RFC1573, now maintained as:
- *
- * 	http://www.iana.org/assignments/smi-numbers
- */
-
-#define	IFT_OTHER	0x1		/* none of the following */
-#define	IFT_1822	0x2		/* old-style arpanet imp */
-#define	IFT_HDH1822	0x3		/* HDH arpanet imp */
-#define	IFT_X25DDN	0x4		/* x25 to imp */
-#define	IFT_X25		0x5		/* PDN X25 interface (RFC877) */
-#define	IFT_ETHER	0x6		/* Ethernet CSMA/CD */
-#define	IFT_ISO88023	0x7		/* CMSA/CD */
-#define	IFT_ISO88024	0x8		/* Token Bus */
-#define	IFT_ISO88025	0x9		/* Token Ring */
-#define	IFT_ISO88026	0xa		/* MAN */
-#define	IFT_STARLAN	0xb
-#define	IFT_P10		0xc		/* Proteon 10MBit ring */
-#define	IFT_P80		0xd		/* Proteon 80MBit ring */
-#define	IFT_HY		0xe		/* Hyperchannel */
-#define	IFT_FDDI	0xf
-#define	IFT_LAPB	0x10
-#define	IFT_SDLC	0x11
-#define	IFT_T1		0x12
-#define	IFT_CEPT	0x13		/* E1 - european T1 */
-#define	IFT_ISDNBASIC	0x14
-#define	IFT_ISDNPRIMARY	0x15
-#define	IFT_PTPSERIAL	0x16		/* Proprietary PTP serial */
-#define	IFT_PPP		0x17		/* RFC 1331 */
-#define	IFT_LOOP	0x18		/* loopback */
-#define	IFT_EON		0x19		/* ISO over IP */
-#define	IFT_XETHER	0x1a		/* obsolete 3MB experimental ethernet */
-#define	IFT_NSIP	0x1b		/* XNS over IP */
-#define	IFT_SLIP	0x1c		/* IP over generic TTY */
-#define	IFT_ULTRA	0x1d		/* Ultra Technologies */
-#define	IFT_DS3		0x1e		/* Generic T3 */
-#define	IFT_SIP		0x1f		/* SMDS */
-#define	IFT_FRELAY	0x20		/* Frame Relay DTE only */
-#define	IFT_RS232	0x21
-#define	IFT_PARA	0x22		/* parallel-port */
-#define	IFT_ARCNET	0x23
-#define	IFT_ARCNETPLUS	0x24
-#define	IFT_ATM		0x25		/* ATM cells */
-#define	IFT_MIOX25	0x26
-#define	IFT_SONET	0x27		/* SONET or SDH */
-#define	IFT_X25PLE	0x28
-#define	IFT_ISO88022LLC	0x29
-#define	IFT_LOCALTALK	0x2a
-#define	IFT_SMDSDXI	0x2b
-#define	IFT_FRELAYDCE	0x2c		/* Frame Relay DCE */
-#define	IFT_V35		0x2d
-#define	IFT_HSSI	0x2e
-#define	IFT_HIPPI	0x2f
-#define	IFT_MODEM	0x30		/* Generic Modem */
-#define	IFT_AAL5	0x31		/* AAL5 over ATM */
-#define	IFT_SONETPATH	0x32
-#define	IFT_SONETVT	0x33
-#define	IFT_SMDSICIP	0x34		/* SMDS InterCarrier Interface */
-#define	IFT_PROPVIRTUAL	0x35		/* Proprietary Virtual/internal */
-#define	IFT_PROPMUX	0x36		/* Proprietary Multiplexing */
-#define	IFT_IEEE80212		   0x37 /* 100BaseVG */
-#define	IFT_FIBRECHANNEL	   0x38 /* Fibre Channel */
-#define	IFT_HIPPIINTERFACE	   0x39 /* HIPPI interfaces	 */
-#define	IFT_FRAMERELAYINTERCONNECT 0x3a /* Obsolete, use either 0x20 or 0x2c */
-#define	IFT_AFLANE8023		   0x3b /* ATM Emulated LAN for 802.3 */
-#define	IFT_AFLANE8025		   0x3c /* ATM Emulated LAN for 802.5 */
-#define	IFT_CCTEMUL		   0x3d /* ATM Emulated circuit		  */
-#define	IFT_FASTETHER		   0x3e /* Fast Ethernet (100BaseT) */
-#define	IFT_ISDN		   0x3f /* ISDN and X.25	    */
-#define	IFT_V11			   0x40 /* CCITT V.11/X.21		*/
-#define	IFT_V36			   0x41 /* CCITT V.36			*/
-#define	IFT_G703AT64K		   0x42 /* CCITT G703 at 64Kbps */
-#define	IFT_G703AT2MB		   0x43 /* Obsolete see DS1-MIB */
-#define	IFT_QLLC		   0x44 /* SNA QLLC			*/
-#define	IFT_FASTETHERFX		   0x45 /* Fast Ethernet (100BaseFX)	*/
-#define	IFT_CHANNEL		   0x46 /* channel			*/
-#define	IFT_IEEE80211		   0x47 /* radio spread spectrum	*/
-#define	IFT_IBM370PARCHAN	   0x48 /* IBM System 360/370 OEMI Channel */
-#define	IFT_ESCON		   0x49 /* IBM Enterprise Systems Connection */
-#define	IFT_DLSW		   0x4a /* Data Link Switching */
-#define	IFT_ISDNS		   0x4b /* ISDN S/T interface */
-#define	IFT_ISDNU		   0x4c /* ISDN U interface */
-#define	IFT_LAPD		   0x4d /* Link Access Protocol D */
-#define	IFT_IPSWITCH		   0x4e /* IP Switching Objects */
-#define	IFT_RSRB		   0x4f /* Remote Source Route Bridging */
-#define	IFT_ATMLOGICAL		   0x50 /* ATM Logical Port */
-#define	IFT_DS0			   0x51 /* Digital Signal Level 0 */
-#define	IFT_DS0BUNDLE		   0x52 /* group of ds0s on the same ds1 */
-#define	IFT_BSC			   0x53 /* Bisynchronous Protocol */
-#define	IFT_ASYNC		   0x54 /* Asynchronous Protocol */
-#define	IFT_CNR			   0x55 /* Combat Net Radio */
-#define	IFT_ISO88025DTR		   0x56 /* ISO 802.5r DTR */
-#define	IFT_EPLRS		   0x57 /* Ext Pos Loc Report Sys */
-#define	IFT_ARAP		   0x58 /* Appletalk Remote Access Protocol */
-#define	IFT_PROPCNLS		   0x59 /* Proprietary Connectionless Protocol*/
-#define	IFT_HOSTPAD		   0x5a /* CCITT-ITU X.29 PAD Protocol */
-#define	IFT_TERMPAD		   0x5b /* CCITT-ITU X.3 PAD Facility */
-#define	IFT_FRAMERELAYMPI	   0x5c /* Multiproto Interconnect over FR */
-#define	IFT_X213		   0x5d /* CCITT-ITU X213 */
-#define	IFT_ADSL		   0x5e /* Asymmetric Digital Subscriber Loop */
-#define	IFT_RADSL		   0x5f /* Rate-Adapt. Digital Subscriber Loop*/
-#define	IFT_SDSL		   0x60 /* Symmetric Digital Subscriber Loop */
-#define	IFT_VDSL		   0x61 /* Very H-Speed Digital Subscrib. Loop*/
-#define	IFT_ISO88025CRFPINT	   0x62 /* ISO 802.5 CRFP */
-#define	IFT_MYRINET		   0x63 /* Myricom Myrinet */
-#define	IFT_VOICEEM		   0x64 /* voice recEive and transMit */
-#define	IFT_VOICEFXO		   0x65 /* voice Foreign Exchange Office */
-#define	IFT_VOICEFXS		   0x66 /* voice Foreign Exchange Station */
-#define	IFT_VOICEENCAP		   0x67 /* voice encapsulation */
-#define	IFT_VOICEOVERIP		   0x68 /* voice over IP encapsulation */
-#define	IFT_ATMDXI		   0x69 /* ATM DXI */
-#define	IFT_ATMFUNI		   0x6a /* ATM FUNI */
-#define	IFT_ATMIMA		   0x6b /* ATM IMA		      */
-#define	IFT_PPPMULTILINKBUNDLE	   0x6c /* PPP Multilink Bundle */
-#define	IFT_IPOVERCDLC		   0x6d /* IBM ipOverCdlc */
-#define	IFT_IPOVERCLAW		   0x6e /* IBM Common Link Access to Workstn */
-#define	IFT_STACKTOSTACK	   0x6f /* IBM stackToStack */
-#define	IFT_VIRTUALIPADDRESS	   0x70 /* IBM VIPA */
-#define	IFT_MPC			   0x71 /* IBM multi-protocol channel support */
-#define	IFT_IPOVERATM		   0x72 /* IBM ipOverAtm */
-#define	IFT_ISO88025FIBER	   0x73 /* ISO 802.5j Fiber Token Ring */
-#define	IFT_TDLC		   0x74 /* IBM twinaxial data link control */
-#define	IFT_GIGABITETHERNET	   0x75 /* Gigabit Ethernet */
-#define	IFT_HDLC		   0x76 /* HDLC */
-#define	IFT_LAPF		   0x77 /* LAP F */
-#define	IFT_V37			   0x78 /* V.37 */
-#define	IFT_X25MLP		   0x79 /* Multi-Link Protocol */
-#define	IFT_X25HUNTGROUP	   0x7a /* X25 Hunt Group */
-#define	IFT_TRANSPHDLC		   0x7b /* Transp HDLC */
-#define	IFT_INTERLEAVE		   0x7c /* Interleave channel */
-#define	IFT_FAST		   0x7d /* Fast channel */
-#define	IFT_IP			   0x7e /* IP (for APPN HPR in IP networks) */
-#define	IFT_DOCSCABLEMACLAYER	   0x7f /* CATV Mac Layer */
-#define	IFT_DOCSCABLEDOWNSTREAM	   0x80 /* CATV Downstream interface */
-#define	IFT_DOCSCABLEUPSTREAM	   0x81 /* CATV Upstream interface */
-#define	IFT_A12MPPSWITCH	   0x82	/* Avalon Parallel Processor */
-#define	IFT_TUNNEL		   0x83	/* Encapsulation interface */
-#define	IFT_COFFEE		   0x84	/* coffee pot */
-#define	IFT_CES			   0x85	/* Circiut Emulation Service */
-#define	IFT_ATMSUBINTERFACE	   0x86	/* (x)  ATM Sub Interface */
-#define	IFT_L2VLAN		   0x87	/* Layer 2 Virtual LAN using 802.1Q */
-#define	IFT_L3IPVLAN		   0x88	/* Layer 3 Virtual LAN - IP Protocol */
-#define	IFT_L3IPXVLAN		   0x89	/* Layer 3 Virtual LAN - IPX Prot. */
-#define	IFT_DIGITALPOWERLINE	   0x8a	/* IP over Power Lines */
-#define	IFT_MEDIAMAILOVERIP	   0x8b	/* (xxx)  Multimedia Mail over IP */
-#define	IFT_DTM			   0x8c	/* Dynamic synchronous Transfer Mode */
-#define	IFT_DCN			   0x8d	/* Data Communications Network */
-#define	IFT_IPFORWARD		   0x8e	/* IP Forwarding Interface */
-#define	IFT_MSDSL		   0x8f	/* Multi-rate Symmetric DSL */
-#define	IFT_IEEE1394		   0x90	/* IEEE1394 High Performance SerialBus*/
-#define	IFT_IFGSN		   0x91	/* HIPPI-6400 */
-#define	IFT_DVBRCCMACLAYER	   0x92	/* DVB-RCC MAC Layer */
-#define	IFT_DVBRCCDOWNSTREAM	   0x93	/* DVB-RCC Downstream Channel */
-#define	IFT_DVBRCCUPSTREAM	   0x94	/* DVB-RCC Upstream Channel */
-#define	IFT_ATMVIRTUAL		   0x95	/* ATM Virtual Interface */
-#define	IFT_MPLSTUNNEL		   0x96	/* MPLS Tunnel Virtual Interface */
-#define	IFT_SRP			   0x97	/* Spatial Reuse Protocol */
-#define	IFT_VOICEOVERATM	   0x98	/* Voice over ATM */
-#define	IFT_VOICEOVERFRAMERELAY	   0x99	/* Voice Over Frame Relay */
-#define	IFT_IDSL		   0x9a	/* Digital Subscriber Loop over ISDN */
-#define	IFT_COMPOSITELINK	   0x9b	/* Avici Composite Link Interface */
-#define	IFT_SS7SIGLINK		   0x9c	/* SS7 Signaling Link */
-#define	IFT_PROPWIRELESSP2P	   0x9d	/* Prop. P2P wireless interface */
-#define	IFT_FRFORWARD		   0x9e	/* Frame forward Interface */
-#define	IFT_RFC1483		   0x9f	/* Multiprotocol over ATM AAL5 */
-#define	IFT_USB			   0xa0	/* USB Interface */
-#define	IFT_IEEE8023ADLAG	   0xa1	/* IEEE 802.3ad Link Aggregate*/
-#define	IFT_BGPPOLICYACCOUNTING	   0xa2	/* BGP Policy Accounting */
-#define	IFT_FRF16MFRBUNDLE	   0xa3	/* FRF.16 Multilik Frame Relay*/
-#define	IFT_H323GATEKEEPER	   0xa4	/* H323 Gatekeeper */
-#define	IFT_H323PROXY		   0xa5	/* H323 Voice and Video Proxy */
-#define	IFT_MPLS		   0xa6	/* MPLS */
-#define	IFT_MFSIGLINK		   0xa7	/* Multi-frequency signaling link */
-#define	IFT_HDSL2		   0xa8	/* High Bit-Rate DSL, 2nd gen. */
-#define	IFT_SHDSL		   0xa9	/* Multirate HDSL2 */
-#define	IFT_DS1FDL		   0xaa	/* Facility Data Link (4Kbps) on a DS1*/
-#define	IFT_POS			   0xab	/* Packet over SONET/SDH Interface */
-#define	IFT_DVBASILN		   0xac	/* DVB-ASI Input */
-#define	IFT_DVBASIOUT		   0xad	/* DVB-ASI Output */
-#define	IFT_PLC			   0xae	/* Power Line Communications */
-#define	IFT_NFAS		   0xaf	/* Non-Facility Associated Signaling */
-#define	IFT_TR008		   0xb0	/* TROO8 */
-#define	IFT_GR303RDT		   0xb1	/* Remote Digital Terminal */
-#define	IFT_GR303IDT		   0xb2	/* Integrated Digital Terminal */
-#define	IFT_ISUP		   0xb3	/* ISUP */
-#define	IFT_PROPDOCSWIRELESSMACLAYER	   0xb4	/* prop/Wireless MAC Layer */
-#define	IFT_PROPDOCSWIRELESSDOWNSTREAM	   0xb5	/* prop/Wireless Downstream */
-#define	IFT_PROPDOCSWIRELESSUPSTREAM	   0xb6	/* prop/Wireless Upstream */
-#define	IFT_HIPERLAN2		   0xb7	/* HIPERLAN Type 2 Radio Interface */
-#define	IFT_PROPBWAP2MP		   0xb8	/* PropBroadbandWirelessAccess P2MP*/
-#define	IFT_SONETOVERHEADCHANNEL   0xb9	/* SONET Overhead Channel */
-#define	IFT_DIGITALWRAPPEROVERHEADCHANNEL  0xba	/* Digital Wrapper Overhead */
-#define	IFT_AAL2		   0xbb	/* ATM adaptation layer 2 */
-#define	IFT_RADIOMAC		   0xbc	/* MAC layer over radio links */
-#define	IFT_ATMRADIO		   0xbd	/* ATM over radio links */
-#define	IFT_IMT			   0xbe /* Inter-Machine Trunks */
-#define	IFT_MVL			   0xbf /* Multiple Virtual Lines DSL */
-#define	IFT_REACHDSL		   0xc0 /* Long Reach DSL */
-#define	IFT_FRDLCIENDPT		   0xc1 /* Frame Relay DLCI End Point */
-#define	IFT_ATMVCIENDPT		   0xc2 /* ATM VCI End Point */
-#define	IFT_OPTICALCHANNEL	   0xc3 /* Optical Channel */
-#define	IFT_OPTICALTRANSPORT	   0xc4 /* Optical Transport */
-#define	IFT_INFINIBAND		   0xc7	/* Infiniband */
-#define	IFT_BRIDGE		   0xd1 /* Transparent bridge interface */
-
-#define	IFT_STF			   0xd7	/* 6to4 interface */
-
-/* not based on IANA assignments */
-#define	IFT_GIF		0xf0
-#define	IFT_PVC		0xf1
-#define	IFT_FAITH	0xf2
-#define	IFT_ENC		0xf4
-#define	IFT_PFLOG	0xf6
-#define	IFT_PFSYNC	0xf7
-#define IFT_IPXIP	0xf9	/* IPX over IP tunneling; no longer used. */
-#endif /* !_NET_IF_TYPES_H_ */
diff --git a/include.new/net/if_var.h b/include.new/net/if_var.h
deleted file mode 100644
index c900204..0000000
--- a/include.new/net/if_var.h
+++ /dev/null
@@ -1,1020 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 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.
- * 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.
- *
- *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/net/if_var.h 276124 2014-12-23 09:39:40Z ae $
- */
-
-#ifndef	_NET_IF_VAR_H_
-#define	_NET_IF_VAR_H_
-
-/*
- * Structures defining a network interface, providing a packet
- * transport mechanism (ala level 0 of the PUP protocols).
- *
- * Each interface accepts output datagrams of a specified maximum
- * length, and provides higher level routines with input datagrams
- * received from its medium.
- *
- * Output occurs when the routine if_output is called, with three parameters:
- *	(*ifp->if_output)(ifp, m, dst, rt)
- * Here m is the mbuf chain to be sent and dst is the destination address.
- * The output routine encapsulates the supplied datagram if necessary,
- * and then transmits it on its medium.
- *
- * On input, each interface unwraps the data received by it, and either
- * places it on the input queue of an internetwork datagram routine
- * and posts the associated software interrupt, or passes the datagram to a raw
- * packet input routine.
- *
- * Routines exist for locating interfaces by their addresses
- * or for locating an interface on a certain network, as well as more general
- * routing and gateway routines maintaining information used to locate
- * interfaces.  These routines live in the files if.c and route.c
- */
-
-#ifdef __STDC__
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-struct	thread;
-struct	rtentry;
-struct	rt_addrinfo;
-struct	socket;
-struct	ether_header;
-struct	carp_if;
-struct	carp_softc;
-struct  ifvlantrunk;
-struct	route;
-struct	vnet;
-#endif
-
-#include <sys/queue.h>		/* get TAILQ macros */
-
-#ifdef _KERNEL
-#include <sys/mbuf.h>
-#include <sys/eventhandler.h>
-#include <sys/buf_ring.h>
-#include <net/vnet.h>
-#endif /* _KERNEL */
-#include <sys/lock.h>		/* XXX */
-#include <sys/mutex.h>		/* XXX */
-#include <sys/rwlock.h>		/* XXX */
-#include <sys/sx.h>		/* XXX */
-#include <sys/event.h>		/* XXX */
-#include <sys/_task.h>
-
-#define	IF_DUNIT_NONE	-1
-
-#include <altq/if_altq.h>
-
-TAILQ_HEAD(ifnethead, ifnet);	/* we use TAILQs so that the order of */
-TAILQ_HEAD(ifaddrhead, ifaddr);	/* instantiation is preserved in the list */
-TAILQ_HEAD(ifmultihead, ifmultiaddr);
-TAILQ_HEAD(ifgrouphead, ifg_group);
-
-#ifdef _KERNEL
-VNET_DECLARE(struct pfil_head, link_pfil_hook);	/* packet filter hooks */
-#define	V_link_pfil_hook	VNET(link_pfil_hook)
-#endif /* _KERNEL */
-
-typedef enum {
-	IFCOUNTER_IPACKETS = 0,
-	IFCOUNTER_IERRORS,
-	IFCOUNTER_OPACKETS,
-	IFCOUNTER_OERRORS,
-	IFCOUNTER_COLLISIONS,
-	IFCOUNTER_IBYTES,
-	IFCOUNTER_OBYTES,
-	IFCOUNTER_IMCASTS,
-	IFCOUNTER_OMCASTS,
-	IFCOUNTER_IQDROPS,
-	IFCOUNTER_OQDROPS,
-	IFCOUNTER_NOPROTO,
-	IFCOUNTERS /* Array size. */
-} ift_counter;
-
-/*
- * Structure defining a queue for a network interface.
- */
-struct	ifqueue {
-	struct	mbuf *ifq_head;
-	struct	mbuf *ifq_tail;
-	int	ifq_len;
-	int	ifq_maxlen;
-	int	ifq_drops;
-	struct	mtx ifq_mtx;
-};
-
-struct ifnet_hw_tsomax {
-	u_int	tsomaxbytes;	/* TSO total burst length limit in bytes */
-	u_int	tsomaxsegcount;	/* TSO maximum segment count */
-	u_int	tsomaxsegsize;	/* TSO maximum segment size in bytes */
-};
-
-/*
- * Structure defining a network interface.
- *
- * (Would like to call this struct ``if'', but C isn't PL/1.)
- */
-
-struct ifnet {
-	void	*if_softc;		/* pointer to driver state */
-	void	*if_l2com;		/* pointer to protocol bits */
-	struct vnet *if_vnet;		/* pointer to network stack instance */
-	TAILQ_ENTRY(ifnet) if_link; 	/* all struct ifnets are chained */
-	char	if_xname[IFNAMSIZ];	/* external name (name + unit) */
-	const char *if_dname;		/* driver name */
-	int	if_dunit;		/* unit or IF_DUNIT_NONE */
-	u_int	if_refcount;		/* reference count */
-	struct	ifaddrhead if_addrhead;	/* linked list of addresses per if */
-		/*
-		 * if_addrhead is the list of all addresses associated to
-		 * an interface.
-		 * Some code in the kernel assumes that first element
-		 * of the list has type AF_LINK, and contains sockaddr_dl
-		 * addresses which store the link-level address and the name
-		 * of the interface.
-		 * However, access to the AF_LINK address through this
-		 * field is deprecated. Use if_addr or ifaddr_byindex() instead.
-		 */
-	int	if_pcount;		/* number of promiscuous listeners */
-	struct	carp_if *if_carp;	/* carp interface structure */
-	struct	bpf_if *if_bpf;		/* packet filter structure */
-	u_short	if_index;		/* numeric abbreviation for this if  */
-	short	if_index_reserved;	/* spare space to grow if_index */
-	struct  ifvlantrunk *if_vlantrunk; /* pointer to 802.1q data */
-	int	if_flags;		/* up/down, broadcast, etc. */
-	int	if_capabilities;	/* interface features & capabilities */
-	int	if_capenable;		/* enabled features & capabilities */
-	void	*if_linkmib;		/* link-type-specific MIB data */
-	size_t	if_linkmiblen;		/* length of above data */
-	struct	if_data if_data;
-	struct	ifmultihead if_multiaddrs; /* multicast addresses configured */
-	int	if_amcount;		/* number of all-multicast requests */
-/* procedure handles */
-	int	(*if_output)		/* output routine (enqueue) */
-		(struct ifnet *, struct mbuf *, const struct sockaddr *,
-		     struct route *);
-	void	(*if_input)		/* input routine (from h/w driver) */
-		(struct ifnet *, struct mbuf *);
-	void	(*if_start)		/* initiate output routine */
-		(struct ifnet *);
-	int	(*if_ioctl)		/* ioctl routine */
-		(struct ifnet *, u_long, caddr_t);
-	void	(*if_init)		/* Init routine */
-		(void *);
-	int	(*if_resolvemulti)	/* validate/resolve multicast */
-		(struct ifnet *, struct sockaddr **, struct sockaddr *);
-	void	(*if_qflush)		/* flush any queues */
-		(struct ifnet *);
-	int	(*if_transmit)		/* initiate output routine */
-		(struct ifnet *, struct mbuf *);
-	void	(*if_reassign)		/* reassign to vnet routine */
-		(struct ifnet *, struct vnet *, char *);
-	struct	vnet *if_home_vnet;	/* where this ifnet originates from */
-	struct	ifaddr	*if_addr;	/* pointer to link-level address */
-	void	*if_llsoftc;		/* link layer softc */
-	int	if_drv_flags;		/* driver-managed status flags */
-	struct  ifaltq if_snd;		/* output queue (includes altq) */
-	const u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */
-
-	void	*if_bridge;		/* bridge glue */
-
-	struct	label *if_label;	/* interface MAC label */
-
-	/* these are only used by IPv6 */
-	void	*if_unused[2];
-	void	*if_afdata[AF_MAX];
-	int	if_afdata_initialized;
-	struct	rwlock if_afdata_lock;
-	struct	task if_linktask;	/* task for link change events */
-	struct	rwlock if_addr_lock;	/* lock to protect address lists */
-
-	LIST_ENTRY(ifnet) if_clones;	/* interfaces of a cloner */
-	TAILQ_HEAD(, ifg_list) if_groups; /* linked list of groups per if */
-					/* protected by if_addr_lock */
-	void	*if_pf_kif;
-	void	*if_lagg;		/* lagg glue */
-	char	*if_description;	/* interface description */
-	u_int	if_fib;			/* interface FIB */
-	u_char	if_alloctype;		/* if_type at time of allocation */
-
-	/*
-	 * Network adapter TSO limits:
-	 * ===========================
-	 *
-	 * If the "if_hw_tsomax" field is zero the maximum segment
-	 * length limit does not apply. If the "if_hw_tsomaxsegcount"
-	 * or the "if_hw_tsomaxsegsize" field is zero the TSO segment
-	 * count limit does not apply. If all three fields are zero,
-	 * there is no TSO limit.
-	 *
-	 * NOTE: The TSO limits only apply to the data payload part of
-	 * a TCP/IP packet. That means there is no need to subtract
-	 * space for ethernet-, vlan-, IP- or TCP- headers from the
-	 * TSO limits unless the hardware driver in question requires
-	 * so.
-	 */
-	u_int	if_hw_tsomax;
-
-	/*
-	 * Spare fields are added so that we can modify sensitive data
-	 * structures without changing the kernel binary interface, and must
-	 * be used with care where binary compatibility is required.
-	 */
-	char	if_cspare[3];
-	int	if_ispare[2];
-
-	/*
-	 * TSO fields for segment limits. If a field is zero below,
-	 * there is no limit:
-	 */
-	u_int	if_hw_tsomaxsegcount;	/* TSO maximum segment count */
-	u_int	if_hw_tsomaxsegsize;	/* TSO maximum segment size in bytes */
-	void	*if_pspare[8];		/* 1 netmap, 7 TDB */
-};
-
-typedef void if_init_f_t(void *);
-
-/*
- * XXX These aliases are terribly dangerous because they could apply
- * to anything.
- */
-#define	if_mtu		if_data.ifi_mtu
-#define	if_type		if_data.ifi_type
-#define if_physical	if_data.ifi_physical
-#define	if_addrlen	if_data.ifi_addrlen
-#define	if_hdrlen	if_data.ifi_hdrlen
-#define	if_metric	if_data.ifi_metric
-#define	if_link_state	if_data.ifi_link_state
-#define	if_baudrate	if_data.ifi_baudrate
-#define	if_baudrate_pf	if_data.ifi_baudrate_pf
-#define	if_hwassist	if_data.ifi_hwassist
-#define	if_ipackets	if_data.ifi_ipackets
-#define	if_ierrors	if_data.ifi_ierrors
-#define	if_opackets	if_data.ifi_opackets
-#define	if_oerrors	if_data.ifi_oerrors
-#define	if_collisions	if_data.ifi_collisions
-#define	if_ibytes	if_data.ifi_ibytes
-#define	if_obytes	if_data.ifi_obytes
-#define	if_imcasts	if_data.ifi_imcasts
-#define	if_omcasts	if_data.ifi_omcasts
-#define	if_iqdrops	if_data.ifi_iqdrops
-#define	if_noproto	if_data.ifi_noproto
-#define	if_lastchange	if_data.ifi_lastchange
-
-/* for compatibility with other BSDs */
-#define	if_addrlist	if_addrhead
-#define	if_list		if_link
-#define	if_name(ifp)	((ifp)->if_xname)
-
-/*
- * Locks for address lists on the network interface.
- */
-#define	IF_ADDR_LOCK_INIT(if)	rw_init(&(if)->if_addr_lock, "if_addr_lock")
-#define	IF_ADDR_LOCK_DESTROY(if)	rw_destroy(&(if)->if_addr_lock)
-#define	IF_ADDR_WLOCK(if)	rw_wlock(&(if)->if_addr_lock)
-#define	IF_ADDR_WUNLOCK(if)	rw_wunlock(&(if)->if_addr_lock)
-#define	IF_ADDR_RLOCK(if)	rw_rlock(&(if)->if_addr_lock)
-#define	IF_ADDR_RUNLOCK(if)	rw_runlock(&(if)->if_addr_lock)
-#define	IF_ADDR_LOCK_ASSERT(if)	rw_assert(&(if)->if_addr_lock, RA_LOCKED)
-#define	IF_ADDR_WLOCK_ASSERT(if) rw_assert(&(if)->if_addr_lock, RA_WLOCKED)
-
-/*
- * Function variations on locking macros intended to be used by loadable
- * kernel modules in order to divorce them from the internals of address list
- * locking.
- */
-void	if_addr_rlock(struct ifnet *ifp);	/* if_addrhead */
-void	if_addr_runlock(struct ifnet *ifp);	/* if_addrhead */
-void	if_maddr_rlock(struct ifnet *ifp);	/* if_multiaddrs */
-void	if_maddr_runlock(struct ifnet *ifp);	/* if_multiaddrs */
-
-/*
- * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq)
- * are queues of messages stored on ifqueue structures
- * (defined above).  Entries are added to and deleted from these structures
- * by these macros.
- */
-#define IF_LOCK(ifq)		mtx_lock(&(ifq)->ifq_mtx)
-#define IF_UNLOCK(ifq)		mtx_unlock(&(ifq)->ifq_mtx)
-#define	IF_LOCK_ASSERT(ifq)	mtx_assert(&(ifq)->ifq_mtx, MA_OWNED)
-#define	_IF_QFULL(ifq)		((ifq)->ifq_len >= (ifq)->ifq_maxlen)
-#define	_IF_DROP(ifq)		((ifq)->ifq_drops++)
-#define	_IF_QLEN(ifq)		((ifq)->ifq_len)
-
-#define	_IF_ENQUEUE(ifq, m) do { 				\
-	(m)->m_nextpkt = NULL;					\
-	if ((ifq)->ifq_tail == NULL) 				\
-		(ifq)->ifq_head = m; 				\
-	else 							\
-		(ifq)->ifq_tail->m_nextpkt = m; 		\
-	(ifq)->ifq_tail = m; 					\
-	(ifq)->ifq_len++; 					\
-} while (0)
-
-#define IF_ENQUEUE(ifq, m) do {					\
-	IF_LOCK(ifq); 						\
-	_IF_ENQUEUE(ifq, m); 					\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_PREPEND(ifq, m) do {				\
-	(m)->m_nextpkt = (ifq)->ifq_head; 			\
-	if ((ifq)->ifq_tail == NULL) 				\
-		(ifq)->ifq_tail = (m); 				\
-	(ifq)->ifq_head = (m); 					\
-	(ifq)->ifq_len++; 					\
-} while (0)
-
-#define IF_PREPEND(ifq, m) do {		 			\
-	IF_LOCK(ifq); 						\
-	_IF_PREPEND(ifq, m); 					\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_DEQUEUE(ifq, m) do { 				\
-	(m) = (ifq)->ifq_head; 					\
-	if (m) { 						\
-		if (((ifq)->ifq_head = (m)->m_nextpkt) == NULL)	\
-			(ifq)->ifq_tail = NULL; 		\
-		(m)->m_nextpkt = NULL; 				\
-		(ifq)->ifq_len--; 				\
-	} 							\
-} while (0)
-
-#define IF_DEQUEUE(ifq, m) do { 				\
-	IF_LOCK(ifq); 						\
-	_IF_DEQUEUE(ifq, m); 					\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_DEQUEUE_ALL(ifq, m) do {				\
-	(m) = (ifq)->ifq_head;					\
-	(ifq)->ifq_head = (ifq)->ifq_tail = NULL;		\
-	(ifq)->ifq_len = 0;					\
-} while (0)
-
-#define	IF_DEQUEUE_ALL(ifq, m) do {				\
-	IF_LOCK(ifq); 						\
-	_IF_DEQUEUE_ALL(ifq, m);				\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_POLL(ifq, m)	((m) = (ifq)->ifq_head)
-#define	IF_POLL(ifq, m)		_IF_POLL(ifq, m)
-
-#define _IF_DRAIN(ifq) do { 					\
-	struct mbuf *m; 					\
-	for (;;) { 						\
-		_IF_DEQUEUE(ifq, m); 				\
-		if (m == NULL) 					\
-			break; 					\
-		m_freem(m); 					\
-	} 							\
-} while (0)
-
-#define IF_DRAIN(ifq) do {					\
-	IF_LOCK(ifq);						\
-	_IF_DRAIN(ifq);						\
-	IF_UNLOCK(ifq);						\
-} while(0)
-
-#ifdef _KERNEL
-/* interface link layer address change event */
-typedef void (*iflladdr_event_handler_t)(void *, struct ifnet *);
-EVENTHANDLER_DECLARE(iflladdr_event, iflladdr_event_handler_t);
-/* interface address change event */
-typedef void (*ifaddr_event_handler_t)(void *, struct ifnet *);
-EVENTHANDLER_DECLARE(ifaddr_event, ifaddr_event_handler_t);
-/* new interface arrival event */
-typedef void (*ifnet_arrival_event_handler_t)(void *, struct ifnet *);
-EVENTHANDLER_DECLARE(ifnet_arrival_event, ifnet_arrival_event_handler_t);
-/* interface departure event */
-typedef void (*ifnet_departure_event_handler_t)(void *, struct ifnet *);
-EVENTHANDLER_DECLARE(ifnet_departure_event, ifnet_departure_event_handler_t);
-/* Interface link state change event */
-typedef void (*ifnet_link_event_handler_t)(void *, struct ifnet *, int);
-EVENTHANDLER_DECLARE(ifnet_link_event, ifnet_link_event_handler_t);
-
-/*
- * interface groups
- */
-struct ifg_group {
-	char				 ifg_group[IFNAMSIZ];
-	u_int				 ifg_refcnt;
-	void				*ifg_pf_kif;
-	TAILQ_HEAD(, ifg_member)	 ifg_members;
-	TAILQ_ENTRY(ifg_group)		 ifg_next;
-};
-
-struct ifg_member {
-	TAILQ_ENTRY(ifg_member)	 ifgm_next;
-	struct ifnet		*ifgm_ifp;
-};
-
-struct ifg_list {
-	struct ifg_group	*ifgl_group;
-	TAILQ_ENTRY(ifg_list)	 ifgl_next;
-};
-
-/* group attach event */
-typedef void (*group_attach_event_handler_t)(void *, struct ifg_group *);
-EVENTHANDLER_DECLARE(group_attach_event, group_attach_event_handler_t);
-/* group detach event */
-typedef void (*group_detach_event_handler_t)(void *, struct ifg_group *);
-EVENTHANDLER_DECLARE(group_detach_event, group_detach_event_handler_t);
-/* group change event */
-typedef void (*group_change_event_handler_t)(void *, const char *);
-EVENTHANDLER_DECLARE(group_change_event, group_change_event_handler_t);
-
-#define	IF_AFDATA_LOCK_INIT(ifp)	\
-	rw_init(&(ifp)->if_afdata_lock, "if_afdata")
-
-#define	IF_AFDATA_WLOCK(ifp)	rw_wlock(&(ifp)->if_afdata_lock)
-#define	IF_AFDATA_RLOCK(ifp)	rw_rlock(&(ifp)->if_afdata_lock)
-#define	IF_AFDATA_WUNLOCK(ifp)	rw_wunlock(&(ifp)->if_afdata_lock)
-#define	IF_AFDATA_RUNLOCK(ifp)	rw_runlock(&(ifp)->if_afdata_lock)
-#define	IF_AFDATA_LOCK(ifp)	IF_AFDATA_WLOCK(ifp)
-#define	IF_AFDATA_UNLOCK(ifp)	IF_AFDATA_WUNLOCK(ifp)
-#define	IF_AFDATA_TRYLOCK(ifp)	rw_try_wlock(&(ifp)->if_afdata_lock)
-#define	IF_AFDATA_DESTROY(ifp)	rw_destroy(&(ifp)->if_afdata_lock)
-
-#define	IF_AFDATA_LOCK_ASSERT(ifp)	rw_assert(&(ifp)->if_afdata_lock, RA_LOCKED)
-#define	IF_AFDATA_RLOCK_ASSERT(ifp)	rw_assert(&(ifp)->if_afdata_lock, RA_RLOCKED)
-#define	IF_AFDATA_WLOCK_ASSERT(ifp)	rw_assert(&(ifp)->if_afdata_lock, RA_WLOCKED)
-#define	IF_AFDATA_UNLOCK_ASSERT(ifp)	rw_assert(&(ifp)->if_afdata_lock, RA_UNLOCKED)
-
-int	if_handoff(struct ifqueue *ifq, struct mbuf *m, struct ifnet *ifp,
-	    int adjust);
-#define	IF_HANDOFF(ifq, m, ifp)			\
-	if_handoff((struct ifqueue *)ifq, m, ifp, 0)
-#define	IF_HANDOFF_ADJ(ifq, m, ifp, adj)	\
-	if_handoff((struct ifqueue *)ifq, m, ifp, adj)
-
-void	if_start(struct ifnet *);
-
-#define	IFQ_ENQUEUE(ifq, m, err)					\
-do {									\
-	IF_LOCK(ifq);							\
-	if (ALTQ_IS_ENABLED(ifq))					\
-		ALTQ_ENQUEUE(ifq, m, NULL, err);			\
-	else {								\
-		if (_IF_QFULL(ifq)) {					\
-			m_freem(m);					\
-			(err) = ENOBUFS;				\
-		} else {						\
-			_IF_ENQUEUE(ifq, m);				\
-			(err) = 0;					\
-		}							\
-	}								\
-	if (err)							\
-		(ifq)->ifq_drops++;					\
-	IF_UNLOCK(ifq);							\
-} while (0)
-
-#define	IFQ_DEQUEUE_NOLOCK(ifq, m)					\
-do {									\
-	if (TBR_IS_ENABLED(ifq))					\
-		(m) = tbr_dequeue_ptr(ifq, ALTDQ_REMOVE);		\
-	else if (ALTQ_IS_ENABLED(ifq))					\
-		ALTQ_DEQUEUE(ifq, m);					\
-	else								\
-		_IF_DEQUEUE(ifq, m);					\
-} while (0)
-
-#define	IFQ_DEQUEUE(ifq, m)						\
-do {									\
-	IF_LOCK(ifq);							\
-	IFQ_DEQUEUE_NOLOCK(ifq, m);					\
-	IF_UNLOCK(ifq);							\
-} while (0)
-
-#define	IFQ_POLL_NOLOCK(ifq, m)						\
-do {									\
-	if (TBR_IS_ENABLED(ifq))					\
-		(m) = tbr_dequeue_ptr(ifq, ALTDQ_POLL);			\
-	else if (ALTQ_IS_ENABLED(ifq))					\
-		ALTQ_POLL(ifq, m);					\
-	else								\
-		_IF_POLL(ifq, m);					\
-} while (0)
-
-#define	IFQ_POLL(ifq, m)						\
-do {									\
-	IF_LOCK(ifq);							\
-	IFQ_POLL_NOLOCK(ifq, m);					\
-	IF_UNLOCK(ifq);							\
-} while (0)
-
-#define	IFQ_PURGE_NOLOCK(ifq)						\
-do {									\
-	if (ALTQ_IS_ENABLED(ifq)) {					\
-		ALTQ_PURGE(ifq);					\
-	} else								\
-		_IF_DRAIN(ifq);						\
-} while (0)
-
-#define	IFQ_PURGE(ifq)							\
-do {									\
-	IF_LOCK(ifq);							\
-	IFQ_PURGE_NOLOCK(ifq);						\
-	IF_UNLOCK(ifq);							\
-} while (0)
-
-#define	IFQ_SET_READY(ifq)						\
-	do { ((ifq)->altq_flags |= ALTQF_READY); } while (0)
-
-#define	IFQ_LOCK(ifq)			IF_LOCK(ifq)
-#define	IFQ_UNLOCK(ifq)			IF_UNLOCK(ifq)
-#define	IFQ_LOCK_ASSERT(ifq)		IF_LOCK_ASSERT(ifq)
-#define	IFQ_IS_EMPTY(ifq)		((ifq)->ifq_len == 0)
-#define	IFQ_INC_LEN(ifq)		((ifq)->ifq_len++)
-#define	IFQ_DEC_LEN(ifq)		(--(ifq)->ifq_len)
-#define	IFQ_INC_DROPS(ifq)		((ifq)->ifq_drops++)
-#define	IFQ_SET_MAXLEN(ifq, len)	((ifq)->ifq_maxlen = (len))
-
-/*
- * The IFF_DRV_OACTIVE test should really occur in the device driver, not in
- * the handoff logic, as that flag is locked by the device driver.
- */
-#define	IFQ_HANDOFF_ADJ(ifp, m, adj, err)				\
-do {									\
-	int len;							\
-	short mflags;							\
-									\
-	len = (m)->m_pkthdr.len;					\
-	mflags = (m)->m_flags;						\
-	IFQ_ENQUEUE(&(ifp)->if_snd, m, err);				\
-	if ((err) == 0) {						\
-		(ifp)->if_obytes += len + (adj);			\
-		if (mflags & M_MCAST)					\
-			(ifp)->if_omcasts++;				\
-		if (((ifp)->if_drv_flags & IFF_DRV_OACTIVE) == 0)	\
-			if_start(ifp);					\
-	}								\
-} while (0)
-
-#define	IFQ_HANDOFF(ifp, m, err)					\
-	IFQ_HANDOFF_ADJ(ifp, m, 0, err)
-
-#define	IFQ_DRV_DEQUEUE(ifq, m)						\
-do {									\
-	(m) = (ifq)->ifq_drv_head;					\
-	if (m) {							\
-		if (((ifq)->ifq_drv_head = (m)->m_nextpkt) == NULL)	\
-			(ifq)->ifq_drv_tail = NULL;			\
-		(m)->m_nextpkt = NULL;					\
-		(ifq)->ifq_drv_len--;					\
-	} else {							\
-		IFQ_LOCK(ifq);						\
-		IFQ_DEQUEUE_NOLOCK(ifq, m);				\
-		while ((ifq)->ifq_drv_len < (ifq)->ifq_drv_maxlen) {	\
-			struct mbuf *m0;				\
-			IFQ_DEQUEUE_NOLOCK(ifq, m0);			\
-			if (m0 == NULL)					\
-				break;					\
-			m0->m_nextpkt = NULL;				\
-			if ((ifq)->ifq_drv_tail == NULL)		\
-				(ifq)->ifq_drv_head = m0;		\
-			else						\
-				(ifq)->ifq_drv_tail->m_nextpkt = m0;	\
-			(ifq)->ifq_drv_tail = m0;			\
-			(ifq)->ifq_drv_len++;				\
-		}							\
-		IFQ_UNLOCK(ifq);					\
-	}								\
-} while (0)
-
-#define	IFQ_DRV_PREPEND(ifq, m)						\
-do {									\
-	(m)->m_nextpkt = (ifq)->ifq_drv_head;				\
-	if ((ifq)->ifq_drv_tail == NULL)				\
-		(ifq)->ifq_drv_tail = (m);				\
-	(ifq)->ifq_drv_head = (m);					\
-	(ifq)->ifq_drv_len++;						\
-} while (0)
-
-#define	IFQ_DRV_IS_EMPTY(ifq)						\
-	(((ifq)->ifq_drv_len == 0) && ((ifq)->ifq_len == 0))
-
-#define	IFQ_DRV_PURGE(ifq)						\
-do {									\
-	struct mbuf *m, *n = (ifq)->ifq_drv_head;			\
-	while((m = n) != NULL) {					\
-		n = m->m_nextpkt;					\
-		m_freem(m);						\
-	}								\
-	(ifq)->ifq_drv_head = (ifq)->ifq_drv_tail = NULL;		\
-	(ifq)->ifq_drv_len = 0;						\
-	IFQ_PURGE(ifq);							\
-} while (0)
-
-#ifdef _KERNEL
-static __inline void
-if_initbaudrate(struct ifnet *ifp, uintmax_t baud)
-{
-
-	ifp->if_baudrate_pf = 0;
-	while (baud > (u_long)(~0UL)) {
-		baud /= 10;
-		ifp->if_baudrate_pf++;
-	}
-	ifp->if_baudrate = baud;
-}
-
-static __inline int
-drbr_enqueue(struct ifnet *ifp, struct buf_ring *br, struct mbuf *m)
-{	
-	int error = 0;
-
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
-		IFQ_ENQUEUE(&ifp->if_snd, m, error);
-		return (error);
-	}
-#endif
-	error = buf_ring_enqueue(br, m);
-	if (error)
-		m_freem(m);
-
-	return (error);
-}
-
-static __inline void
-drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *new)
-{
-	/*
-	 * The top of the list needs to be swapped 
-	 * for this one.
-	 */
-#ifdef ALTQ
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {
-		/* 
-		 * Peek in altq case dequeued it
-		 * so put it back.
-		 */
-		IFQ_DRV_PREPEND(&ifp->if_snd, new);
-		return;
-	}
-#endif
-	buf_ring_putback_sc(br, new);
-}
-
-static __inline struct mbuf *
-drbr_peek(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	struct mbuf *m;
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {
-		/* 
-		 * Pull it off like a dequeue
-		 * since drbr_advance() does nothing
-		 * for altq and drbr_putback() will
-		 * use the old prepend function.
-		 */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
-		return (m);
-	}
-#endif
-	return(buf_ring_peek(br));
-}
-
-static __inline void
-drbr_flush(struct ifnet *ifp, struct buf_ring *br)
-{
-	struct mbuf *m;
-
-#ifdef ALTQ
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd))
-		IFQ_PURGE(&ifp->if_snd);
-#endif	
-	while ((m = buf_ring_dequeue_sc(br)) != NULL)
-		m_freem(m);
-}
-
-static __inline void
-drbr_free(struct buf_ring *br, struct malloc_type *type)
-{
-
-	drbr_flush(NULL, br);
-	buf_ring_free(br, type);
-}
-
-static __inline struct mbuf *
-drbr_dequeue(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	struct mbuf *m;
-
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {	
-		IFQ_DEQUEUE(&ifp->if_snd, m);
-		return (m);
-	}
-#endif
-	return (buf_ring_dequeue_sc(br));
-}
-
-static __inline void
-drbr_advance(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	/* Nothing to do here since peek dequeues in altq case */
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd))
-		return;
-#endif
-	return (buf_ring_advance_sc(br));
-}
-
-
-static __inline struct mbuf *
-drbr_dequeue_cond(struct ifnet *ifp, struct buf_ring *br,
-    int (*func) (struct mbuf *, void *), void *arg) 
-{
-	struct mbuf *m;
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
-		IFQ_LOCK(&ifp->if_snd);
-		IFQ_POLL_NOLOCK(&ifp->if_snd, m);
-		if (m != NULL && func(m, arg) == 0) {
-			IFQ_UNLOCK(&ifp->if_snd);
-			return (NULL);
-		}
-		IFQ_DEQUEUE_NOLOCK(&ifp->if_snd, m);
-		IFQ_UNLOCK(&ifp->if_snd);
-		return (m);
-	}
-#endif
-	m = buf_ring_peek(br);
-	if (m == NULL || func(m, arg) == 0)
-		return (NULL);
-
-	return (buf_ring_dequeue_sc(br));
-}
-
-static __inline int
-drbr_empty(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd))
-		return (IFQ_IS_EMPTY(&ifp->if_snd));
-#endif
-	return (buf_ring_empty(br));
-}
-
-static __inline int
-drbr_needs_enqueue(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd))
-		return (1);
-#endif
-	return (!buf_ring_empty(br));
-}
-
-static __inline int
-drbr_inuse(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd))
-		return (ifp->if_snd.ifq_len);
-#endif
-	return (buf_ring_count(br));
-}
-#endif
-/*
- * 72 was chosen below because it is the size of a TCP/IP
- * header (40) + the minimum mss (32).
- */
-#define	IF_MINMTU	72
-#define	IF_MAXMTU	65535
-
-#define	TOEDEV(ifp)	((ifp)->if_llsoftc)
-
-#endif /* _KERNEL */
-
-/*
- * The ifaddr structure contains information about one address
- * of an interface.  They are maintained by the different address families,
- * are allocated and attached when an address is set, and are linked
- * together so all addresses for an interface can be located.
- *
- * NOTE: a 'struct ifaddr' is always at the beginning of a larger
- * chunk of malloc'ed memory, where we store the three addresses
- * (ifa_addr, ifa_dstaddr and ifa_netmask) referenced here.
- */
-struct ifaddr {
-	struct	sockaddr *ifa_addr;	/* address of interface */
-	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
-#define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
-	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
-	struct	if_data if_data;	/* not all members are meaningful */
-	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
-	struct	carp_softc *ifa_carp;	/* pointer to CARP data */
-	TAILQ_ENTRY(ifaddr) ifa_link;	/* queue macro glue */
-	void	(*ifa_rtrequest)	/* check or clean routes (+ or -)'d */
-		(int, struct rtentry *, struct rt_addrinfo *);
-	u_short	ifa_flags;		/* mostly rt_flags for cloning */
-	u_int	ifa_refcnt;		/* references to this structure */
-	int	ifa_metric;		/* cost of going out this interface */
-	int (*ifa_claim_addr)		/* check if an addr goes to this if */
-		(struct ifaddr *, struct sockaddr *);
-	struct mtx ifa_mtx;
-};
-#define	IFA_ROUTE	RTF_UP		/* route installed */
-#define IFA_RTSELF	RTF_HOST	/* loopback route to self installed */
-
-/* for compatibility with other BSDs */
-#define	ifa_list	ifa_link
-
-#ifdef _KERNEL
-#define	IFA_LOCK(ifa)		mtx_lock(&(ifa)->ifa_mtx)
-#define	IFA_UNLOCK(ifa)		mtx_unlock(&(ifa)->ifa_mtx)
-
-void	ifa_free(struct ifaddr *ifa);
-void	ifa_init(struct ifaddr *ifa);
-void	ifa_ref(struct ifaddr *ifa);
-#endif
-
-/*
- * Multicast address structure.  This is analogous to the ifaddr
- * structure except that it keeps track of multicast addresses.
- */
-struct ifmultiaddr {
-	TAILQ_ENTRY(ifmultiaddr) ifma_link; /* queue macro glue */
-	struct	sockaddr *ifma_addr; 	/* address this membership is for */
-	struct	sockaddr *ifma_lladdr;	/* link-layer translation, if any */
-	struct	ifnet *ifma_ifp;	/* back-pointer to interface */
-	u_int	ifma_refcount;		/* reference count */
-	void	*ifma_protospec;	/* protocol-specific state, if any */
-	struct	ifmultiaddr *ifma_llifma; /* pointer to ifma for ifma_lladdr */
-};
-
-#ifdef _KERNEL
-
-extern	struct rwlock ifnet_rwlock;
-extern	struct sx ifnet_sxlock;
-
-#define	IFNET_LOCK_INIT() do {						\
-	rw_init_flags(&ifnet_rwlock, "ifnet_rw",  RW_RECURSE);		\
-	sx_init_flags(&ifnet_sxlock, "ifnet_sx",  SX_RECURSE);		\
-} while(0)
-
-#define	IFNET_WLOCK() do {						\
-	sx_xlock(&ifnet_sxlock);					\
-	rw_wlock(&ifnet_rwlock);					\
-} while (0)
-
-#define	IFNET_WUNLOCK() do {						\
-	rw_wunlock(&ifnet_rwlock);					\
-	sx_xunlock(&ifnet_sxlock);					\
-} while (0)
-
-/*
- * To assert the ifnet lock, you must know not only whether it's for read or
- * write, but also whether it was acquired with sleep support or not.
- */
-#define	IFNET_RLOCK_ASSERT()		sx_assert(&ifnet_sxlock, SA_SLOCKED)
-#define	IFNET_RLOCK_NOSLEEP_ASSERT()	rw_assert(&ifnet_rwlock, RA_RLOCKED)
-#define	IFNET_WLOCK_ASSERT() do {					\
-	sx_assert(&ifnet_sxlock, SA_XLOCKED);				\
-	rw_assert(&ifnet_rwlock, RA_WLOCKED);				\
-} while (0)
-
-#define	IFNET_RLOCK()		sx_slock(&ifnet_sxlock)
-#define	IFNET_RLOCK_NOSLEEP()	rw_rlock(&ifnet_rwlock)
-#define	IFNET_RUNLOCK()		sx_sunlock(&ifnet_sxlock)
-#define	IFNET_RUNLOCK_NOSLEEP()	rw_runlock(&ifnet_rwlock)
-
-/*
- * Look up an ifnet given its index; the _ref variant also acquires a
- * reference that must be freed using if_rele().  It is almost always a bug
- * to call ifnet_byindex() instead if ifnet_byindex_ref().
- */
-struct ifnet	*ifnet_byindex(u_short idx);
-struct ifnet	*ifnet_byindex_locked(u_short idx);
-struct ifnet	*ifnet_byindex_ref(u_short idx);
-
-/*
- * Given the index, ifaddr_byindex() returns the one and only
- * link-level ifaddr for the interface. You are not supposed to use
- * it to traverse the list of addresses associated to the interface.
- */
-struct ifaddr	*ifaddr_byindex(u_short idx);
-
-VNET_DECLARE(struct ifnethead, ifnet);
-VNET_DECLARE(struct ifgrouphead, ifg_head);
-VNET_DECLARE(int, if_index);
-VNET_DECLARE(struct ifnet *, loif);	/* first loopback interface */
-VNET_DECLARE(int, useloopback);
-
-#define	V_ifnet		VNET(ifnet)
-#define	V_ifg_head	VNET(ifg_head)
-#define	V_if_index	VNET(if_index)
-#define	V_loif		VNET(loif)
-#define	V_useloopback	VNET(useloopback)
-
-extern	int ifqmaxlen;
-
-int	if_addgroup(struct ifnet *, const char *);
-int	if_delgroup(struct ifnet *, const char *);
-int	if_addmulti(struct ifnet *, struct sockaddr *, struct ifmultiaddr **);
-int	if_allmulti(struct ifnet *, int);
-struct	ifnet* if_alloc(u_char);
-void	if_attach(struct ifnet *);
-void	if_dead(struct ifnet *);
-int	if_delmulti(struct ifnet *, struct sockaddr *);
-void	if_delmulti_ifma(struct ifmultiaddr *);
-void	if_detach(struct ifnet *);
-void	if_vmove(struct ifnet *, struct vnet *);
-void	if_purgeaddrs(struct ifnet *);
-void	if_delallmulti(struct ifnet *);
-void	if_down(struct ifnet *);
-struct ifmultiaddr *
-	if_findmulti(struct ifnet *, struct sockaddr *);
-void	if_free(struct ifnet *);
-void	if_initname(struct ifnet *, const char *, int);
-void	if_link_state_change(struct ifnet *, int);
-int	if_printf(struct ifnet *, const char *, ...) __printflike(2, 3);
-void	if_qflush(struct ifnet *);
-void	if_ref(struct ifnet *);
-void	if_rele(struct ifnet *);
-int	if_setlladdr(struct ifnet *, const u_char *, int);
-void	if_up(struct ifnet *);
-int	ifioctl(struct socket *, u_long, caddr_t, struct thread *);
-int	ifpromisc(struct ifnet *, int);
-struct	ifnet *ifunit(const char *);
-struct	ifnet *ifunit_ref(const char *);
-
-void	ifq_init(struct ifaltq *, struct ifnet *ifp);
-void	ifq_delete(struct ifaltq *);
-
-int	ifa_add_loopback_route(struct ifaddr *, struct sockaddr *);
-int	ifa_del_loopback_route(struct ifaddr *, struct sockaddr *);
-
-struct	ifaddr *ifa_ifwithaddr(struct sockaddr *);
-int		ifa_ifwithaddr_check(struct sockaddr *);
-struct	ifaddr *ifa_ifwithbroadaddr(struct sockaddr *);
-struct	ifaddr *ifa_ifwithdstaddr(struct sockaddr *);
-struct	ifaddr *ifa_ifwithdstaddr_fib(struct sockaddr *, int);
-struct	ifaddr *ifa_ifwithnet(struct sockaddr *, int);
-struct	ifaddr *ifa_ifwithnet_fib(struct sockaddr *, int, int);
-struct	ifaddr *ifa_ifwithroute(int, struct sockaddr *, struct sockaddr *);
-struct	ifaddr *ifa_ifwithroute_fib(int, struct sockaddr *, struct sockaddr *, u_int);
-struct	ifaddr *ifaof_ifpforaddr(struct sockaddr *, struct ifnet *);
-int	ifa_preferred(struct ifaddr *, struct ifaddr *);
-
-int	if_simloop(struct ifnet *ifp, struct mbuf *m, int af, int hlen);
-
-typedef	void *if_com_alloc_t(u_char type, struct ifnet *ifp);
-typedef	void if_com_free_t(void *com, u_char type);
-void	if_register_com_alloc(u_char type, if_com_alloc_t *a, if_com_free_t *f);
-void	if_deregister_com_alloc(u_char type);
-uint64_t if_get_counter_default(struct ifnet *, ift_counter);
-void	if_inc_counter(struct ifnet *, ift_counter, int64_t);
-
-#define IF_LLADDR(ifp)							\
-    LLADDR((struct sockaddr_dl *)((ifp)->if_addr->ifa_addr))
-
-#ifdef DEVICE_POLLING
-enum poll_cmd {	POLL_ONLY, POLL_AND_CHECK_STATUS };
-
-typedef	int poll_handler_t(struct ifnet *ifp, enum poll_cmd cmd, int count);
-int    ether_poll_register(poll_handler_t *h, struct ifnet *ifp);
-int    ether_poll_deregister(struct ifnet *ifp);
-#endif /* DEVICE_POLLING */
-
-/* TSO */
-void if_hw_tsomax_common(struct ifnet *, struct ifnet_hw_tsomax *);
-int if_hw_tsomax_update(struct ifnet *, struct ifnet_hw_tsomax *);
-
-#endif /* _KERNEL */
-
-#endif /* !_NET_IF_VAR_H_ */
diff --git a/include.new/net/if_vlan_var.h b/include.new/net/if_vlan_var.h
deleted file mode 100644
index 127b617..0000000
--- a/include.new/net/if_vlan_var.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright 1998 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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: releng/10.2/sys/net/if_vlan_var.h 230026 2012-01-12 18:39:37Z rwatson $
- */
-
-#ifndef _NET_IF_VLAN_VAR_H_
-#define	_NET_IF_VLAN_VAR_H_	1
-
-struct	ether_vlan_header {
-	u_char	evl_dhost[ETHER_ADDR_LEN];
-	u_char	evl_shost[ETHER_ADDR_LEN];
-	u_int16_t evl_encap_proto;
-	u_int16_t evl_tag;
-	u_int16_t evl_proto;
-};
-
-#define	EVL_VLID_MASK		0x0FFF
-#define	EVL_PRI_MASK		0xE000
-#define	EVL_VLANOFTAG(tag)	((tag) & EVL_VLID_MASK)
-#define	EVL_PRIOFTAG(tag)	(((tag) >> 13) & 7)
-#define	EVL_CFIOFTAG(tag)	(((tag) >> 12) & 1)
-#define	EVL_MAKETAG(vlid, pri, cfi)					\
-	((((((pri) & 7) << 1) | ((cfi) & 1)) << 12) | ((vlid) & EVL_VLID_MASK))
-
-/* Set the VLAN ID in an mbuf packet header non-destructively. */
-#define EVL_APPLY_VLID(m, vlid)						\
-	do {								\
-		if ((m)->m_flags & M_VLANTAG) {				\
-			(m)->m_pkthdr.ether_vtag &= EVL_VLID_MASK;	\
-			(m)->m_pkthdr.ether_vtag |= (vlid);		\
-		} else {						\
-			(m)->m_pkthdr.ether_vtag = (vlid);		\
-			(m)->m_flags |= M_VLANTAG;			\
-		}							\
-	} while (0)
-
-/* Set the priority ID in an mbuf packet header non-destructively. */
-#define EVL_APPLY_PRI(m, pri)						\
-	do {								\
-		if ((m)->m_flags & M_VLANTAG) {				\
-			uint16_t __vlantag = (m)->m_pkthdr.ether_vtag;	\
-			(m)->m_pkthdr.ether_vtag |= EVL_MAKETAG(	\
-			    EVL_VLANOFTAG(__vlantag), (pri),		\
-			    EVL_CFIOFTAG(__vlantag));			\
-		} else {						\
-			(m)->m_pkthdr.ether_vtag =			\
-			    EVL_MAKETAG(0, (pri), 0);			\
-			(m)->m_flags |= M_VLANTAG;			\
-		}							\
-	} while (0)
-
-/* sysctl(3) tags, for compatibility purposes */
-#define	VLANCTL_PROTO	1
-#define	VLANCTL_MAX	2
-
-/*
- * Configuration structure for SIOCSETVLAN and SIOCGETVLAN ioctls.
- */
-struct	vlanreq {
-	char	vlr_parent[IFNAMSIZ];
-	u_short	vlr_tag;
-};
-#define	SIOCSETVLAN	SIOCSIFGENERIC
-#define	SIOCGETVLAN	SIOCGIFGENERIC
-
-#ifdef _KERNEL
-/*
- * Drivers that are capable of adding and removing the VLAN header
- * in hardware indicate they support this by marking IFCAP_VLAN_HWTAGGING
- * in if_capabilities.  Drivers for hardware that is capable
- * of handling larger MTU's that may include a software-appended
- * VLAN header w/o lowering the normal MTU should mark IFCAP_VLAN_MTU
- * in if_capabilities; this notifies the VLAN code it can leave the
- * MTU on the vlan interface at the normal setting.
- */
-
-/*
- * VLAN tags are stored in host byte order.  Byte swapping may be
- * necessary.
- *
- * Drivers that support hardware VLAN tag stripping fill in the
- * received VLAN tag (containing both vlan and priority information)
- * into the ether_vtag mbuf packet header field:
- * 
- *	m->m_pkthdr.ether_vtag = vtag;		// ntohs()?
- *	m->m_flags |= M_VLANTAG;
- *
- * to mark the packet m with the specified VLAN tag.
- *
- * On output the driver should check the mbuf for the M_VLANTAG
- * flag to see if a VLAN tag is present and valid:
- *
- *	if (m->m_flags & M_VLANTAG) {
- *		... = m->m_pkthdr.ether_vtag;	// htons()?
- *		... pass tag to hardware ...
- *	}
- *
- * Note that a driver must indicate it supports hardware VLAN
- * stripping/insertion by marking IFCAP_VLAN_HWTAGGING in
- * if_capabilities.
- */
-
-#define	VLAN_CAPABILITIES(_ifp) do {				\
-	if ((_ifp)->if_vlantrunk != NULL) 			\
-		(*vlan_trunk_cap_p)(_ifp);			\
-} while (0)
-
-#define	VLAN_TRUNKDEV(_ifp)					\
-	(_ifp)->if_type == IFT_L2VLAN ? (*vlan_trunkdev_p)((_ifp)) : NULL
-#define	VLAN_TAG(_ifp, _vid)					\
-	(_ifp)->if_type == IFT_L2VLAN ? (*vlan_tag_p)((_ifp), (_vid)) : EINVAL
-#define	VLAN_COOKIE(_ifp)					\
-	(_ifp)->if_type == IFT_L2VLAN ? (*vlan_cookie_p)((_ifp)) : NULL
-#define	VLAN_SETCOOKIE(_ifp, _cookie)				\
-	(_ifp)->if_type == IFT_L2VLAN ?				\
-	    (*vlan_setcookie_p)((_ifp), (_cookie)) : EINVAL
-#define	VLAN_DEVAT(_ifp, _vid)					\
-	(_ifp)->if_vlantrunk != NULL ? (*vlan_devat_p)((_ifp), (_vid)) : NULL
-
-extern	void (*vlan_trunk_cap_p)(struct ifnet *);
-extern	struct ifnet *(*vlan_trunkdev_p)(struct ifnet *);
-extern	struct ifnet *(*vlan_devat_p)(struct ifnet *, uint16_t);
-extern	int (*vlan_tag_p)(struct ifnet *, uint16_t *);
-extern	int (*vlan_setcookie_p)(struct ifnet *, void *);
-extern	void *(*vlan_cookie_p)(struct ifnet *);
-
-#endif /* _KERNEL */
-
-#endif /* _NET_IF_VLAN_VAR_H_ */
diff --git a/include.new/net/if_vxlan.h b/include.new/net/if_vxlan.h
deleted file mode 100644
index bc21c44..0000000
--- a/include.new/net/if_vxlan.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 2014, Bryan Venteicher <bryanv@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net/if_vxlan.h 284365 2015-06-14 03:14:45Z bryanv $
- */
-
-#ifndef _NET_IF_VXLAN_H_
-#define _NET_IF_VXLAN_H_
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/ethernet.h>
-#include <net/if.h>
-#include <netinet/in.h>
-
-struct vxlan_header {
-	uint32_t	vxlh_flags;
-	uint32_t	vxlh_vni;
-};
-
-#define VXLAN_HDR_FLAGS_VALID_VNI	0x08000000
-#define VXLAN_HDR_VNI_SHIFT		8
-
-#define VXLAN_VNI_MAX	(1 << 24)
-#define VXLAN_VNI_MASK	(VXLAN_VNI_MAX - 1)
-
-/*
- * The port assigned by IANA is 4789, but some early implementations
- * (like Linux) use 8472 instead. If not specified, we default to
- * the IANA port.
- */
-#define VXLAN_PORT		4789
-#define VXLAN_LEGACY_PORT	8472
-
-struct ifvxlanparam {
-	uint64_t		vxlp_with;
-
-#define VXLAN_PARAM_WITH_VNI		0x0001
-#define VXLAN_PARAM_WITH_LOCAL_ADDR4	0x0002
-#define VXLAN_PARAM_WITH_LOCAL_ADDR6	0x0004
-#define VXLAN_PARAM_WITH_REMOTE_ADDR4	0x0008
-#define VXLAN_PARAM_WITH_REMOTE_ADDR6	0x0010
-#define VXLAN_PARAM_WITH_LOCAL_PORT	0x0020
-#define VXLAN_PARAM_WITH_REMOTE_PORT	0x0040
-#define VXLAN_PARAM_WITH_PORT_RANGE	0x0080
-#define VXLAN_PARAM_WITH_FTABLE_TIMEOUT	0x0100
-#define VXLAN_PARAM_WITH_FTABLE_MAX	0x0200
-#define VXLAN_PARAM_WITH_MULTICAST_IF	0x0400
-#define VXLAN_PARAM_WITH_TTL		0x0800
-#define VXLAN_PARAM_WITH_LEARN		0x1000
-
-	uint32_t		vxlp_vni;
-	struct in_addr		vxlp_local_in4;
-	struct in6_addr		vxlp_local_in6;
-	struct in_addr		vxlp_remote_in4;
-	struct in6_addr		vxlp_remote_in6;
-	uint16_t		vxlp_local_port;
-	uint16_t		vxlp_remote_port;
-	uint16_t		vxlp_min_port;
-	uint16_t		vxlp_max_port;
-	char			vxlp_mc_ifname[IFNAMSIZ];
-	uint32_t		vxlp_ftable_timeout;
-	uint32_t		vxlp_ftable_max;
-	uint8_t			vxlp_ttl;
-	uint8_t			vxlp_learn;
-};
-
-union vxlan_sockaddr {
-	struct sockaddr		sa;
-	struct sockaddr_in	in4;
-	struct sockaddr_in6	in6;
-};
-
-#define VXLAN_SOCKADDR_IS_IPV4(_vxsin)	((_vxsin)->sa.sa_family == AF_INET)
-#define VXLAN_SOCKADDR_IS_IPV6(_vxsin)	((_vxsin)->sa.sa_family == AF_INET6)
-#define VXLAN_SOCKADDR_IS_IPV46(_vxsin) \
-    (VXLAN_SOCKADDR_IS_IPV4(_vxsin) || VXLAN_SOCKADDR_IS_IPV6(_vxsin))
-
-#define VXLAN_CMD_GET_CONFIG		0
-#define VXLAN_CMD_SET_VNI		1
-#define VXLAN_CMD_SET_LOCAL_ADDR	2
-#define VXLAN_CMD_SET_REMOTE_ADDR	4
-#define VXLAN_CMD_SET_LOCAL_PORT	5
-#define VXLAN_CMD_SET_REMOTE_PORT	6
-#define VXLAN_CMD_SET_PORT_RANGE	7
-#define VXLAN_CMD_SET_FTABLE_TIMEOUT	8
-#define VXLAN_CMD_SET_FTABLE_MAX	9
-#define VXLAN_CMD_SET_MULTICAST_IF	10
-#define VXLAN_CMD_SET_TTL		11
-#define VXLAN_CMD_SET_LEARN		12
-#define VXLAN_CMD_FTABLE_ENTRY_ADD	13
-#define VXLAN_CMD_FTABLE_ENTRY_REM	14
-#define VXLAN_CMD_FLUSH			15
-
-struct ifvxlancfg {
-	uint32_t		vxlc_vni;
-	union vxlan_sockaddr	vxlc_local_sa;
-	union vxlan_sockaddr	vxlc_remote_sa;
-	uint32_t		vxlc_mc_ifindex;
-	uint32_t		vxlc_ftable_cnt;
-	uint32_t		vxlc_ftable_max;
-	uint32_t		vxlc_ftable_timeout;
-	uint16_t		vxlc_port_min;
-	uint16_t		vxlc_port_max;
-	uint8_t			vxlc_learn;
-	uint8_t			vxlc_ttl;
-};
-
-struct ifvxlancmd {
-	uint32_t		vxlcmd_flags;
-#define VXLAN_CMD_FLAG_FLUSH_ALL	0x0001
-#define VXLAN_CMD_FLAG_LEARN		0x0002
-
-	uint32_t		vxlcmd_vni;
-	uint32_t		vxlcmd_ftable_timeout;
-	uint32_t		vxlcmd_ftable_max;
-	uint16_t		vxlcmd_port;
-	uint16_t		vxlcmd_port_min;
-	uint16_t		vxlcmd_port_max;
-	uint8_t			vxlcmd_mac[ETHER_ADDR_LEN];
-	uint8_t			vxlcmd_ttl;
-	union vxlan_sockaddr	vxlcmd_sa;
-	char			vxlcmd_ifname[IFNAMSIZ];
-};
-
-#endif /* _NET_IF_VXLAN_H_ */
diff --git a/include.new/net/iso88025.h b/include.new/net/iso88025.h
deleted file mode 100644
index 061a2b9..0000000
--- a/include.new/net/iso88025.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*-
- * Copyright (c) 1998, Larry Lile
- * All rights reserved.
- *
- * For latest sources and information on this driver, please
- * go to http://anarchy.stdio.com.
- *
- * Questions, comments or suggestions should be directed to
- * Larry Lile <lile@stdio.com>.
- *
- * 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 unmodified, 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.
- *
- * 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: releng/10.2/sys/net/iso88025.h 264299 2014-04-09 11:15:50Z glebius $
- *
- * Information gathered from tokenring@freebsd, /sys/net/ethernet.h and
- * the Mach token ring driver.
- */
-
-/*
- * Fundamental constants relating to iso 802.5
- */
-
-#ifndef _NET_ISO88025_H_
-#define	_NET_ISO88025_H_
-
-/*
- * General ISO 802.5 definitions
- */
-#define	ISO88025_ADDR_LEN	6
-#define	ISO88025_CF_LEN		2
-#define	ISO88025_HDR_LEN	(ISO88025_CF_LEN + (ISO88025_ADDR_LEN * 2))
-#define	RCF_LEN			2
-#define	RIF_MAX_RD		14
-#define	RIF_MAX_LEN		16
-
-#define	TR_AC			0x10
-#define	TR_LLC_FRAME		0x40
-
-#define	TR_4MBPS		4000000
-#define	TR_16MBPS		16000000
-#define	TR_100MBPS		100000000
-
-/*
- * Source routing 
- */
-#define	TR_RII			0x80
-#define	TR_RCF_BCST_MASK	0xe000
-#define	TR_RCF_LEN_MASK		0x1f00
-#define	TR_RCF_DIR		0x0080
-#define	TR_RCF_LF_MASK		0x0070
-
-#define	TR_RCF_RIFLEN(x)	((ntohs(x) & TR_RCF_LEN_MASK) >> 8)
-
-/*
- * Minimum and maximum packet payload lengths.
- */
-#define	ISO88025_MIN_LEN	0 
-#define	ISO88025_MAX_LEN_4	4464
-#define	ISO88025_MAX_LEN_16	17960	
-#define	ISO88025_MAX_LEN	ISO88025_MAX_LEN_16
-
-/*
- * A macro to validate a length with
- */
-#define	ISO88025_IS_VALID_LEN(foo)	\
-	((foo) >= ISO88025_MIN_LEN && (foo) <= ISO88025_MAX_LEN)
-
-/* Access Control field */
-#define	AC_PRI_MASK		0xe0	/* Priority bits 		*/
-#define	AC_TOKEN		0x10	/* Token bit: 0=Token, 1=Frame	*/
-#define	AC_MONITOR		0x08	/* Monitor			*/
-#define	AC_RESV_MASK		0x07	/* Reservation bits		*/
-
-/* Frame Control field */
-#define	FC_FT_MASK		0xc0	/* Frame Type			*/
-#define	FC_FT_MAC		0x00	/* MAC frame			*/
-#define	FC_FT_LLC		0x40	/* LLC frame			*/
-#define	FC_ATTN_MASK		0x0f	/* Attention bits		*/
-#define	FC_ATTN_EB		0x01	/* Express buffer		*/
-#define	FC_ATTN_BE		0x02	/* Beacon			*/
-#define	FC_ATTN_CT		0x03	/* Claim token			*/
-#define	FC_ATTN_RP		0x04	/* Ring purge			*/
-#define	FC_ATTN_AMP		0x05	/* Active monitor present	*/
-#define	FC_ATTN_SMP		0x06	/* Standby monitor present	*/
-
-/* Token Ring destination address */
-#define	DA_IG			0x80	/* Individual/group address.	*/
-					/* 0=Individual, 1=Group	*/
-#define	DA_UL			0x40	/* Universal/local address.	*/
-					/* 0=Universal, 1=Local		*/
-/* Token Ring source address */
-#define	SA_RII			0x80	/* Routing information indicator */
-#define	SA_IG			0x40	/* Individual/group address	*/
-					/* 0=Group, 1=Individual	*/
-
-/*
- * ISO 802.5 physical header
- */
-struct iso88025_header {
-	u_int8_t	ac;				    /* access control field */
-	u_int8_t	fc;				    /* frame control field */
-	u_int8_t	iso88025_dhost[ISO88025_ADDR_LEN];  /* destination address */
-	u_int8_t	iso88025_shost[ISO88025_ADDR_LEN];  /* source address */
-	u_int16_t	rcf;				    /* route control field */
-	u_int16_t	rd[RIF_MAX_RD];			    /* routing designators */
-} __packed;
-
-struct iso88025_rif {
-	u_int16_t	rcf;				    /* route control field */
-	u_int16_t	rd[RIF_MAX_RD];			    /* routing designators */
-} __packed;
-
-struct iso88025_sockaddr_data {
-	u_char ether_dhost[ISO88025_ADDR_LEN];
-	u_char ether_shost[ISO88025_ADDR_LEN];
-	u_char ac;
-	u_char fc;
-};
-
-struct iso88025_sockaddr_dl_data {
-	u_short	 trld_rcf;
-	u_short	*trld_route[RIF_MAX_LEN];
-};
-
-#define	ISO88025_MAX(a, b)	(((a)>(b))?(a):(b))
-#define	SDL_ISO88025(s)		((struct iso88025_sockaddr_dl_data *)	\
-				 ((s)->sdl_data + \
-				  ISO88025_MAX((s)->sdl_nlen + (s)->sdl_alen + \
-					       (s)->sdl_slen, 12)))
-
-/*
- * Structure of a 48-bit iso 802.5 address.
- *  ( We could also add the 16 bit addresses as a union)
- */
-struct	iso88025_addr {
-	u_char octet[ISO88025_ADDR_LEN];
-};
-
-#define	ISO88025_MAX_MTU		18000
-#define	ISO88025_DEFAULT_MTU		1500
-
-#define	ISO88025_BPF_UNSUPPORTED	0
-#define	ISO88025_BPF_SUPPORTED		1
-
-#ifdef _KERNEL
-void	iso88025_ifattach	(struct ifnet *, const u_int8_t *, int);
-void	iso88025_ifdetach	(struct ifnet *, int);
-int	iso88025_ioctl		(struct ifnet *, u_long, caddr_t );
-int	iso88025_output		(struct ifnet *, struct mbuf *,
-				 const struct sockaddr *, struct route *);
-void	iso88025_input		(struct ifnet *, struct mbuf *);
-#endif	/* _KERNEL */
-
-#endif	/* !_NET_ISO88025_H_ */
diff --git a/include.new/net/net_osdep.h b/include.new/net/net_osdep.h
deleted file mode 100644
index dfcefa7..0000000
--- a/include.new/net/net_osdep.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*	$FreeBSD: src/sys/net/net_osdep.h,v 1.15 2005/01/11 07:08:15 ume Exp $	*/
-/*	$KAME: net_osdep.h,v 1.80 2003/08/09 17:06:39 suz Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-/*
- * glue for kernel code programming differences.
- */
-
-/*
- * OS dependencies:
- * - ioctl
- *   FreeBSD 3 and later warn when sys/ioctl.h is included in a kernel source
- *   file.  For socket ioctl, we are suggested to use sys/sockio.h.
- *
- * - RTFREE()
- *   bsdi does not escape this macro using do-clause, so it is recommended
- *   to escape the macro explicitly.
- *   e.g.
- *	if (rt) {
- *		RTFREE(rt);
- *	}
- *
- * - whether the IPv4 input routine convert the byte order of some fileds
- *   of the IP header (x: convert to the host byte order, s: strip the header
- *   length for possible reassembly)
- *             ip_len ip_id ip_off
- * bsdi3:          xs     x      x
- * bsdi4:          xs            x
- * freebsd[23]:    xs     x      x 
- * freebsd4:       xs            x
- * NetBSD:          x            x
- * OpenBSD:        xs     x      x
- *
- * - ifa_ifwithaf()
- *   bsdi[34], netbsd, and openbsd define it in sys/net/if.c
- *   freebsd (all versions) does not have it.
- *  
- * - struct rt_addrinfo
- *   bsdi4, netbsd 1.5R and beyond: rti_addrs, rti_info[], rti_flags, rti_ifa,
- *	rti_ifp, and rti_rtm.
- *   others: rti_addrs and rti_info[] only.
- *
- * - ifa->ifa_rtrequest
- *   bsdi4, netbsd 1.5R and beyond: rt_addrinfo *
- *   others: sockaddr * (note that sys/net/route.c:rtrequest() has an unsafe
- *	typecast code, from 4.3BSD-reno)
- *
- * - side effects of rtrequest{,1}(RTM_DELETE)
- *	BSDI[34]: delete all cloned routes underneath the route.
- *	FreeBSD[234]: delete all protocol-cloned routes underneath the route.
- *		      note that cloned routes from an interface direct route
- *		      still remain.
- *	NetBSD: 1.5 have no side effects.  KAME/netbsd15, and post-1.5R, have
- *		the same effects as of BSDI.
- *	OpenBSD: have no side effects.  KAME/openbsd has the same effects as
- *		of BSDI (the change is not merged - yet).
- *
- * - privileged process
- *	NetBSD, FreeBSD 3
- *		struct proc *p;
- *		if (p && !suser(p->p_ucred, &p->p_acflag))
- *			privileged;
- *	FreeBSD 4
- *		struct proc *p;
- *		if (p && !suser(p))
- *			privileged;
- *	FreeBSD 5
- *		struct thread *td;
- *		if (suser(td))
- *			privileged;
- *	OpenBSD, BSDI [34], FreeBSD 2
- *		struct socket *so;
- *		if (so->so_state & SS_PRIV)
- *			privileged;
- * - foo_control
- *	NetBSD, FreeBSD 3
- *		needs to give struct proc * as argument
- *	OpenBSD, BSDI [34], FreeBSD 2
- *		do not need struct proc *
- *
- * - bpf:
- *	OpenBSD, NetBSD 1.5, BSDI [34]
- *		need caddr_t * (= if_bpf **) and struct ifnet *
- *	FreeBSD 2, FreeBSD 3, NetBSD post-1.5N
- *		need only struct ifnet * as argument
- *
- * - bpfattach:
- *	OpenBSD, NetBSD 1.5, BSDI [34]
- *		bpfattach(caddr_t *, struct ifnet *, u_int, u_int)
- *	FreeBSD, NetBSD 1.6:
- *		bpfattach(struct ifnet *, u_int, u_int)
- *
- * - bpf_mtap:
- *	OpenBSD, NetBSD, BSDI [34]
- *		bpf_mtap(caddr_t, struct mbuf *)
- *	FreeBSD
- *		bpf_mtap(struct ifnet *, struct mbuf *)
- *
- * - struct ifnet
- *			use queue.h?	member names	if name
- *			---		---		---
- *	FreeBSD 2	no		old standard	if_name+unit
- *	FreeBSD 3	yes		strange		if_name+unit
- *	FreeBSD 4	yes		strange		if_name+unit
- *	FreeBSD 5	yes		standard	if_xname
- *	OpenBSD		yes		standard	if_xname
- *	NetBSD		yes		standard	if_xname
- *	BSDI [34]	no		old standard	if_name+unit
- *
- * - usrreq
- *	NetBSD, OpenBSD, BSDI [34], FreeBSD 2
- *		single function with PRU_xx, arguments are mbuf
- *	FreeBSD 3
- *		separates functions, non-mbuf arguments
- *
- * - {set,get}sockopt
- *	NetBSD, OpenBSD, BSDI [34], FreeBSD 2
- *		manipulation based on mbuf
- *	FreeBSD 3
- *		non-mbuf manipulation using sooptcopy{in,out}()
- *
- * - timeout() and untimeout()
- *	NetBSD 1.4.x, OpenBSD, BSDI [34], FreeBSD 2
- *		timeout() is a void function
- *	FreeBSD 3
- *		timeout() is non-void, must keep returned value for untimeout()
- *		callout_xx is also available (sys/callout.h)
- *	NetBSD 1.5
- *		timeout() is obsoleted, use callout_xx (sys/callout.h)
- *	OpenBSD 2.8
- *		timeout_{add,set,del} is encouraged (sys/timeout.h)
- *
- * - kernel internal time structure
- *	FreeBSD 2, NetBSD, OpenBSD, BSD/OS
- *		mono_time.tv_u?sec, time.tv_u?sec
- *	FreeBSD [34]
- *		time_second
- *	if you need portability, #ifdef out FreeBSD[34], or use microtime(&tv)
- *	then touch tv.tv_sec (note: microtime is an expensive operation, so
- *	the use of mono_time is preferred).
- *
- * - sysctl
- *	NetBSD, OpenBSD
- *		foo_sysctl()
- *	BSDI [34]
- *		foo_sysctl() but with different style.  sysctl_int_arr() takes
- *		care of most of the cases.
- *	FreeBSD
- *		linker hack.  however, there are freebsd version differences
- *		(how wonderful!).
- *		on FreeBSD[23] function arg #define includes paren.
- *			int foo SYSCTL_HANDLER_ARGS;
- *		on FreeBSD4, function arg #define does not include paren.
- *			int foo(SYSCTL_HANDLER_ARGS);
- *		on some versions, forward reference to the tree is okay.
- *		on some versions, you need SYSCTL_DECL().  you need things
- *		like this.
- *			#ifdef SYSCTL_DECL
- *			SYSCTL_DECL(net_inet_ip6);
- *			#endif
- *		it is hard to share functions between freebsd and non-freebsd.
- *
- * - if_ioctl
- *	NetBSD, FreeBSD 3, BSDI [34]
- *		2nd argument is u_long cmd
- *	FreeBSD 2
- *		2nd argument is int cmd
- *
- * - if attach routines
- *	NetBSD
- *		void xxattach(int);
- *	FreeBSD 2, FreeBSD 3
- *		void xxattach(void *);
- *		PSEUDO_SET(xxattach, if_xx);
- *
- * - ovbcopy()
- *	in NetBSD 1.4 or later, ovbcopy() is not supplied in the kernel.
- *	we have updated sys/systm.h to include declaration.
- *
- * - splnet()
- *	NetBSD 1.4 or later, and OpenBSD, requires splsoftnet().
- *	other operating systems use splnet().
- *
- * - splimp()
- *	NetBSD 1.6: use splnet() in network, splvm() in vm.
- *	other operating systems: use splimp().
- *
- * - dtom()
- *	NEVER USE IT!
- *
- * - struct ifnet for loopback interface
- *	BSDI3: struct ifnet loif;
- *	BSDI4: struct ifnet *loifp;
- *	NetBSD, OpenBSD 2.8, FreeBSD2: struct ifnet loif[NLOOP];
- *	OpenBSD 2.9: struct ifnet *lo0ifp;
- *
- *	odd thing is that many of them refers loif as ifnet *loif,
- *	not loif[NLOOP], from outside of if_loop.c.
- *
- * - number of bpf pseudo devices
- *	others: bpfilter.h, NBPFILTER
- *	FreeBSD4: bpf.h, NBPF
- *	solution:
- *		#if defined(__FreeBSD__) && __FreeBSD__ >= 4
- *		#include "bpf.h"
- *		#define NBPFILTER	NBPF
- *		#else
- *		#include "bpfilter.h"
- *		#endif
- *
- * - protosw for IPv4 (sys/netinet)
- *	FreeBSD4: struct ipprotosw in netinet/ipprotosw.h
- *	others: struct protosw in sys/protosw.h
- *
- * - protosw in general.
- *	NetBSD 1.5 has extra member for ipfilter (netbsd-current dropped
- *	it so it went away in 1.6).
- *	NetBSD 1.5 requires PR_LISTEN flag bit with protocols that permit
- *	listen/accept (like tcp).
- *
- * - header files with defopt (opt_xx.h)
- *	FreeBSD3: opt_{inet,ipsec,ip6fw,altq}.h
- *	FreeBSD4: opt_{inet,inet6,ipsec,ip6fw,altq}.h
- *	NetBSD: opt_{inet,ipsec,altq}.h
- *	others: does not use defopt
- *
- * - IN_MULTICAST/IN_CLASS[A-D] macro.
- *	OpenBSD and NetBSD: net endian (kernel) or host endian (userland)
- *	others: always host endian
- *
- * - (m->m_flags & M_EXT) != 0 does *not* mean that the max data length of
- *   the mbuf == MCLBYTES.
- *
- * - sys/kern/uipc_mbuf.c:m_dup()
- *	freebsd[34]: copies the whole mbuf chain.
- *	netbsd: similar arg with m_copym().
- *	others: no m_dup().
- *
- * - ifa_refcnt (struct ifaddr) management (IFAREF/IFAFREE).
- *	NetBSD 1.5: always use IFAREF whenever reference gets added.
- *		always use IFAFREE whenever reference gets freed.
- *		IFAFREE frees ifaddr when ifa_refcnt reaches 0.
- *	others: do not increase refcnt for ifp->if_addrlist and in_ifaddr.
- *		use IFAFREE once when ifaddr is disconnected from
- *		ifp->if_addrlist and in_ifaddr.  IFAFREE frees ifaddr when
- *		ifa_refcnt goes negative.  in KAME environment, IFAREF is
- *		provided as a compatibility wrapper (use it instead of
- *		ifa_refcnt++ to reduce #ifdef).
- *
- * - ifnet.if_lastchange
- *	freebsd, bsdi, netbsd-current (jun 14 2001-),
- *	openbsd-current (jun 15 2001-): updated only when IFF_UP changes.
- *		(RFC1573 ifLastChange interpretation)
- *	netbsd151, openbsd29: updated whenever packets go through the interface.
- *		(4.4BSD interpretation)
- *
- * - kernel compilation options ("options HOGE" in kernel config file)
- *	freebsd4: sys/conf/options has to have mapping between option
- *		and a header file (opt_hoge.h).
- *	netbsd: by default, -DHOGE will go into
- *		sys/arch/foo/compile/BAR/Makefile.
- *		if you define mapping in sys/conf/files, you can create
- *		a header file like opt_hoge.h to help make dependencies.
- *	bsdi/openbsd: always use -DHOGE in Makefile.  there's no need/way
- *		to have opt_hoge.h.
- *
- *	therefore, opt_hoge.h is mandatory on freebsd4 only.
- *
- * - MALLOC() macro
- *	Use it only if the size of the allocation is constant.
- *	When we do NOT collect statistics about kernel memory usage, the result
- *	of macro expansion contains a large set of condition branches.  If the
- *	size is not constant, compilation optimization cannot be applied, and
- *	a bunch of the large branch will be embedded in the kernel code.
- *
- * - M_COPY_PKTHDR
- *	openbsd30, freebsd4(after 4.8): M_COPY_PKTHDR is deprecated.
- *		use M_MOVE_PKTHDR or M_DUP_PKTHDR, depending on how you want
- *		to handle m_tag.
- *	others: M_COPY_PKTHDR is available as usual.
- *
- * - M_READONLY() macro
- *	OpenBSD 3.0 and NetBSD 1.6 has it.
- *	FreeBSD 4.x uses M_WRITABLE() macro, which is opposite (NIH!).
- *	KAME tree has it for all platforms except FreeBSD 4.x.
- *
- * - TAILQ_EMPTY
- *	BSD/OS 4.x does not have this macro.
- */
-
-#ifndef __NET_NET_OSDEP_H_DEFINED_
-#define __NET_NET_OSDEP_H_DEFINED_
-#ifdef _KERNEL
-
-#define if_name(ifp)	((ifp)->if_xname)
-
-#define HAVE_NEW_BPFATTACH
-
-#define ifa_list	ifa_link
-#define if_addrlist	if_addrhead
-#define if_list		if_link
-
-#define HAVE_PPSRATECHECK
-
-/* sys/net/if.h */
-#define WITH_CONVERT_AND_STRIP_IP_LEN
-#define WITH_CONVERT_IP_OFF
-
-#endif /*_KERNEL*/
-#endif /*__NET_NET_OSDEP_H_DEFINED_ */
diff --git a/include.new/net/netisr.h b/include.new/net/netisr.h
deleted file mode 100644
index 81c6e40..0000000
--- a/include.new/net/netisr.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*-
- * Copyright (c) 2007-2009 Robert N. M. Watson
- * Copyright (c) 2010-2011 Juniper Networks, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert N. M. Watson under contract
- * to Juniper Networks, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/net/netisr.h 222249 2011-05-24 12:34:19Z rwatson $
- */
-
-#ifndef _NET_NETISR_H_
-#define _NET_NETISR_H_
-
-/*
- * The netisr (network interrupt service routine) provides a deferred
- * execution evironment in which (generally inbound) network processing can
- * take place.  Protocols register handlers which will be executed directly,
- * or via deferred dispatch, depending on the circumstances.
- *
- * Historically, this was implemented by the BSD software ISR facility; it is
- * now implemented via a software ithread (SWI).
- */
-
-/*
- * Protocol numbers, which are encoded in monitoring applications and kernel
- * modules.  Internally, these are used in bit shift operations so must have
- * a value 0 < proto < 32; we currently further limit at compile-time to 16
- * for array-sizing purposes.
- */
-#define	NETISR_IP	1
-#define	NETISR_IGMP	2		/* IGMPv3 output queue */
-#define	NETISR_ROUTE	3		/* routing socket */
-#define	NETISR_AARP	4		/* Appletalk ARP */
-#define	NETISR_ATALK2	5		/* Appletalk phase 2 */
-#define	NETISR_ATALK1	6		/* Appletalk phase 1 */
-#define	NETISR_ARP	7		/* same as AF_LINK */
-#define	NETISR_IPX	8		/* same as AF_IPX */
-#define	NETISR_ETHER	9		/* ethernet input */
-#define	NETISR_IPV6	10
-#define	NETISR_NATM	11
-#define	NETISR_EPAIR	12		/* if_epair(4) */
-
-/*
- * Protocol ordering and affinity policy constants.  See the detailed
- * discussion of policies later in the file.
- */
-#define	NETISR_POLICY_SOURCE	1	/* Maintain source ordering. */
-#define	NETISR_POLICY_FLOW	2	/* Maintain flow ordering. */
-#define	NETISR_POLICY_CPU	3	/* Protocol determines CPU placement. */
-
-/*
- * Protocol dispatch policy constants; selects whether and when direct
- * dispatch is permitted.
- */
-#define	NETISR_DISPATCH_DEFAULT		0	/* Use global default. */
-#define	NETISR_DISPATCH_DEFERRED	1	/* Always defer dispatch. */
-#define	NETISR_DISPATCH_HYBRID		2	/* Allow hybrid dispatch. */
-#define	NETISR_DISPATCH_DIRECT		3	/* Always direct dispatch. */
-
-/*
- * Monitoring data structures, exported by sysctl(2).
- *
- * Three sysctls are defined.  First, a per-protocol structure exported by
- * net.isr.proto.
- */
-#define	NETISR_NAMEMAXLEN	32
-struct sysctl_netisr_proto {
-	u_int	snp_version;			/* Length of struct. */
-	char	snp_name[NETISR_NAMEMAXLEN];	/* nh_name */
-	u_int	snp_proto;			/* nh_proto */
-	u_int	snp_qlimit;			/* nh_qlimit */
-	u_int	snp_policy;			/* nh_policy */
-	u_int	snp_flags;			/* Various flags. */
-	u_int	snp_dispatch;			/* Dispatch policy. */
-	u_int	_snp_ispare[6];
-};
-
-/*
- * Flags for sysctl_netisr_proto.snp_flags.
- */
-#define	NETISR_SNP_FLAGS_M2FLOW		0x00000001	/* nh_m2flow */
-#define	NETISR_SNP_FLAGS_M2CPUID	0x00000002	/* nh_m2cpuid */
-#define	NETISR_SNP_FLAGS_DRAINEDCPU	0x00000004	/* nh_drainedcpu */
-
-/*
- * Next, a structure per-workstream, with per-protocol data, exported as
- * net.isr.workstream.
- */
-struct sysctl_netisr_workstream {
-	u_int	snws_version;			/* Length of struct. */
-	u_int	snws_flags;			/* Various flags. */
-	u_int	snws_wsid;			/* Workstream ID. */
-	u_int	snws_cpu;			/* nws_cpu */
-	u_int	_snws_ispare[12];
-};
-
-/*
- * Flags for sysctl_netisr_workstream.snws_flags
- */
-#define	NETISR_SNWS_FLAGS_INTR		0x00000001	/* nws_intr_event */
-
-/*
- * Finally, a per-workstream-per-protocol structure, exported as
- * net.isr.work.
- */
-struct sysctl_netisr_work {
-	u_int	snw_version;			/* Length of struct. */
-	u_int	snw_wsid;			/* Workstream ID. */
-	u_int	snw_proto;			/* Protocol number. */
-	u_int	snw_len;			/* nw_len */
-	u_int	snw_watermark;			/* nw_watermark */
-	u_int	_snw_ispare[3];
-
-	uint64_t	snw_dispatched;		/* nw_dispatched */
-	uint64_t	snw_hybrid_dispatched;	/* nw_hybrid_dispatched */
-	uint64_t	snw_qdrops;		/* nw_qdrops */
-	uint64_t	snw_queued;		/* nw_queued */
-	uint64_t	snw_handled;		/* nw_handled */
-
-	uint64_t	_snw_llspare[7];
-};
-
-#ifdef _KERNEL
-
-/*-
- * Protocols express ordering constraints and affinity preferences by
- * implementing one or neither of nh_m2flow and nh_m2cpuid, which are used by
- * netisr to determine which per-CPU workstream to assign mbufs to.
- *
- * The following policies may be used by protocols:
- *
- * NETISR_POLICY_SOURCE - netisr should maintain source ordering without
- *                        advice from the protocol.  netisr will ignore any
- *                        flow IDs present on the mbuf for the purposes of
- *                        work placement.
- *
- * NETISR_POLICY_FLOW - netisr should maintain flow ordering as defined by
- *                      the mbuf header flow ID field.  If the protocol
- *                      implements nh_m2flow, then netisr will query the
- *                      protocol in the event that the mbuf doesn't have a
- *                      flow ID, falling back on source ordering.
- *
- * NETISR_POLICY_CPU - netisr will delegate all work placement decisions to
- *                     the protocol, querying nh_m2cpuid for each packet.
- *
- * Protocols might make decisions about work placement based on an existing
- * calculated flow ID on the mbuf, such as one provided in hardware, the
- * receive interface pointed to by the mbuf (if any), the optional source
- * identifier passed at some dispatch points, or even parse packet headers to
- * calculate a flow.  Both protocol handlers may return a new mbuf pointer
- * for the chain, or NULL if the packet proves invalid or m_pullup() fails.
- *
- * XXXRW: If we eventually support dynamic reconfiguration, there should be
- * protocol handlers to notify them of CPU configuration changes so that they
- * can rebalance work.
- */
-struct mbuf;
-typedef void		 netisr_handler_t(struct mbuf *m);
-typedef struct mbuf	*netisr_m2cpuid_t(struct mbuf *m, uintptr_t source,
-			 u_int *cpuid);
-typedef	struct mbuf	*netisr_m2flow_t(struct mbuf *m, uintptr_t source);
-typedef void		 netisr_drainedcpu_t(u_int cpuid);
-
-#define	NETISR_CPUID_NONE	((u_int)-1)	/* No affinity returned. */
-
-/*
- * Data structure describing a protocol handler.
- */
-struct netisr_handler {
-	const char	*nh_name;	/* Character string protocol name. */
-	netisr_handler_t *nh_handler;	/* Protocol handler. */
-	netisr_m2flow_t	*nh_m2flow;	/* Query flow for untagged packet. */
-	netisr_m2cpuid_t *nh_m2cpuid;	/* Query CPU to process mbuf on. */
-	netisr_drainedcpu_t *nh_drainedcpu; /* Callback when drained a queue. */
-	u_int		 nh_proto;	/* Integer protocol ID. */
-	u_int		 nh_qlimit;	/* Maximum per-CPU queue depth. */
-	u_int		 nh_policy;	/* Work placement policy. */
-	u_int		 nh_dispatch;	/* Dispatch policy. */
-	u_int		 nh_ispare[4];	/* For future use. */
-	void		*nh_pspare[4];	/* For future use. */
-};
-
-/*
- * Register, unregister, and other netisr handler management functions.
- */
-void	netisr_clearqdrops(const struct netisr_handler *nhp);
-void	netisr_getqdrops(const struct netisr_handler *nhp,
-	    u_int64_t *qdropsp);
-void	netisr_getqlimit(const struct netisr_handler *nhp, u_int *qlimitp);
-void	netisr_register(const struct netisr_handler *nhp);
-int	netisr_setqlimit(const struct netisr_handler *nhp, u_int qlimit);
-void	netisr_unregister(const struct netisr_handler *nhp);
-
-/*
- * Process a packet destined for a protocol, and attempt direct dispatch.
- * Supplemental source ordering information can be passed using the _src
- * variant.
- */
-int	netisr_dispatch(u_int proto, struct mbuf *m);
-int	netisr_dispatch_src(u_int proto, uintptr_t source, struct mbuf *m);
-int	netisr_queue(u_int proto, struct mbuf *m);
-int	netisr_queue_src(u_int proto, uintptr_t source, struct mbuf *m);
-
-/*
- * Provide a default implementation of "map an ID to a CPU ID".
- */
-u_int	netisr_default_flow2cpu(u_int flowid);
-
-/*
- * Utility routines to return the number of CPUs participting in netisr, and
- * to return a mapping from a number to a CPU ID that can be used with the
- * scheduler.
- */
-u_int	netisr_get_cpucount(void);
-u_int	netisr_get_cpuid(u_int cpunumber);
-
-/*
- * Interfaces between DEVICE_POLLING and netisr.
- */
-void	netisr_sched_poll(void);
-void	netisr_poll(void);
-void	netisr_pollmore(void);
-
-#endif /* !_KERNEL */
-#endif /* !_NET_NETISR_H_ */
diff --git a/include.new/net/netisr_internal.h b/include.new/net/netisr_internal.h
deleted file mode 100644
index 6ee10fd..0000000
--- a/include.new/net/netisr_internal.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 2007-2009 Robert N. M. Watson
- * Copyright (c) 2010-2011 Juniper Networks, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert N. M. Watson under contract
- * to Juniper Networks, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/net/netisr_internal.h 222249 2011-05-24 12:34:19Z rwatson $
- */
-
-#ifndef _NET_NETISR_INTERNAL_H_
-#define	_NET_NETISR_INTERNAL_H_
-
-#ifndef _WANT_NETISR_INTERNAL
-#error "no user-serviceable parts inside"
-#endif
-
-/*
- * These definitions are private to the netisr implementation, but provided
- * here for use by post-mortem crashdump analysis tools.  They should not be
- * used in any other context as they can and will change.  Public definitions
- * may be found in netisr.h.
- */
-
-#ifndef _KERNEL
-typedef void *netisr_handler_t;
-typedef void *netisr_m2flow_t;
-typedef void *netisr_m2cpuid_t;
-typedef void *netisr_drainedcpu_t;
-#endif
-
-/*
- * Each protocol is described by a struct netisr_proto, which holds all
- * global per-protocol information.  This data structure is set up by
- * netisr_register(), and derived from the public struct netisr_handler.
- */
-struct netisr_proto {
-	const char	*np_name;	/* Character string protocol name. */
-	netisr_handler_t *np_handler;	/* Protocol handler. */
-	netisr_m2flow_t	*np_m2flow;	/* Query flow for untagged packet. */
-	netisr_m2cpuid_t *np_m2cpuid;	/* Query CPU to process packet on. */
-	netisr_drainedcpu_t *np_drainedcpu; /* Callback when drained a queue. */
-	u_int		 np_qlimit;	/* Maximum per-CPU queue depth. */
-	u_int		 np_policy;	/* Work placement policy. */
-	u_int		 np_dispatch;	/* Work dispatch policy. */
-};
-
-#define	NETISR_MAXPROT	16		/* Compile-time limit. */
-
-/*
- * Protocol-specific work for each workstream is described by struct
- * netisr_work.  Each work descriptor consists of an mbuf queue and
- * statistics.
- */
-struct netisr_work {
-	/*
-	 * Packet queue, linked by m_nextpkt.
-	 */
-	struct mbuf	*nw_head;
-	struct mbuf	*nw_tail;
-	u_int		 nw_len;
-	u_int		 nw_qlimit;
-	u_int		 nw_watermark;
-
-	/*
-	 * Statistics -- written unlocked, but mostly from curcpu.
-	 */
-	u_int64_t	 nw_dispatched; /* Number of direct dispatches. */
-	u_int64_t	 nw_hybrid_dispatched; /* "" hybrid dispatches. */
-	u_int64_t	 nw_qdrops;	/* "" drops. */
-	u_int64_t	 nw_queued;	/* "" enqueues. */
-	u_int64_t	 nw_handled;	/* "" handled in worker. */
-};
-
-/*
- * Workstreams hold a queue of ordered work across each protocol, and are
- * described by netisr_workstream.  Each workstream is associated with a
- * worker thread, which in turn is pinned to a CPU.  Work associated with a
- * workstream can be processd in other threads during direct dispatch;
- * concurrent processing is prevented by the NWS_RUNNING flag, which
- * indicates that a thread is already processing the work queue.  It is
- * important to prevent a directly dispatched packet from "skipping ahead" of
- * work already in the workstream queue.
- */
-struct netisr_workstream {
-	struct intr_event *nws_intr_event;	/* Handler for stream. */
-	void		*nws_swi_cookie;	/* swi(9) cookie for stream. */
-	struct mtx	 nws_mtx;		/* Synchronize work. */
-	u_int		 nws_cpu;		/* CPU pinning. */
-	u_int		 nws_flags;		/* Wakeup flags. */
-	u_int		 nws_pendingbits;	/* Scheduled protocols. */
-
-	/*
-	 * Each protocol has per-workstream data.
-	 */
-	struct netisr_work	nws_work[NETISR_MAXPROT];
-} __aligned(CACHE_LINE_SIZE);
-
-/*
- * Per-workstream flags.
- */
-#define	NWS_RUNNING	0x00000001	/* Currently running in a thread. */
-#define	NWS_DISPATCHING	0x00000002	/* Currently being direct-dispatched. */
-#define	NWS_SCHEDULED	0x00000004	/* Signal issued. */
-
-#endif /* !_NET_NETISR_INTERNAL_H_ */
diff --git a/include.new/net/netmap.h b/include.new/net/netmap.h
deleted file mode 100644
index a8c307c..0000000
--- a/include.new/net/netmap.h
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
- * Copyright (C) 2011-2014 Matteo Landi, Luigi Rizzo. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``S 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: releng/10.2/sys/net/netmap.h 270292 2014-08-21 19:42:03Z np $
- *
- * Definitions of constants and the structures used by the netmap
- * framework, for the part visible to both kernel and userspace.
- * Detailed info on netmap is available with "man netmap" or at
- *
- *	http://info.iet.unipi.it/~luigi/netmap/
- *
- * This API is also used to communicate with the VALE software switch
- */
-
-#ifndef _NET_NETMAP_H_
-#define _NET_NETMAP_H_
-
-#define	NETMAP_API	11		/* current API version */
-
-#define	NETMAP_MIN_API	11		/* min and max versions accepted */
-#define	NETMAP_MAX_API	15
-/*
- * Some fields should be cache-aligned to reduce contention.
- * The alignment is architecture and OS dependent, but rather than
- * digging into OS headers to find the exact value we use an estimate
- * that should cover most architectures.
- */
-#define NM_CACHE_ALIGN	128
-
-/*
- * --- Netmap data structures ---
- *
- * The userspace data structures used by netmap are shown below.
- * They are allocated by the kernel and mmap()ed by userspace threads.
- * Pointers are implemented as memory offsets or indexes,
- * so that they can be easily dereferenced in kernel and userspace.
-
-   KERNEL (opaque, obviously)
-
-  ====================================================================
-                                         |
-   USERSPACE                             |      struct netmap_ring
-                                         +---->+---------------+
-                                             / | head,cur,tail |
-   struct netmap_if (nifp, 1 per fd)        /  | buf_ofs       |
-    +---------------+                      /   | other fields  |
-    | ni_tx_rings   |                     /    +===============+
-    | ni_rx_rings   |                    /     | buf_idx, len  | slot[0]
-    |               |                   /      | flags, ptr    |
-    |               |                  /       +---------------+
-    +===============+                 /        | buf_idx, len  | slot[1]
-    | txring_ofs[0] | (rel.to nifp)--'         | flags, ptr    |
-    | txring_ofs[1] |                          +---------------+
-     (tx+1 entries)                           (num_slots entries)
-    | txring_ofs[t] |                          | buf_idx, len  | slot[n-1]
-    +---------------+                          | flags, ptr    |
-    | rxring_ofs[0] |                          +---------------+
-    | rxring_ofs[1] |
-     (rx+1 entries)
-    | rxring_ofs[r] |
-    +---------------+
-
- * For each "interface" (NIC, host stack, PIPE, VALE switch port) bound to
- * a file descriptor, the mmap()ed region contains a (logically readonly)
- * struct netmap_if pointing to struct netmap_ring's.
- *
- * There is one netmap_ring per physical NIC ring, plus one tx/rx ring
- * pair attached to the host stack (this pair is unused for non-NIC ports).
- *
- * All physical/host stack ports share the same memory region,
- * so that zero-copy can be implemented between them.
- * VALE switch ports instead have separate memory regions.
- *
- * The netmap_ring is the userspace-visible replica of the NIC ring.
- * Each slot has the index of a buffer (MTU-sized and residing in the
- * mmapped region), its length and some flags. An extra 64-bit pointer
- * is provided for user-supplied buffers in the tx path.
- *
- * In user space, the buffer address is computed as
- *	(char *)ring + buf_ofs + index * NETMAP_BUF_SIZE
- *
- * Added in NETMAP_API 11:
- *
- * + NIOCREGIF can request the allocation of extra spare buffers from
- *   the same memory pool. The desired number of buffers must be in
- *   nr_arg3. The ioctl may return fewer buffers, depending on memory
- *   availability. nr_arg3 will return the actual value, and, once
- *   mapped, nifp->ni_bufs_head will be the index of the first buffer.
- *
- *   The buffers are linked to each other using the first uint32_t
- *   as the index. On close, ni_bufs_head must point to the list of
- *   buffers to be released.
- *
- * + NIOCREGIF can request space for extra rings (and buffers)
- *   allocated in the same memory space. The number of extra rings
- *   is in nr_arg1, and is advisory. This is a no-op on NICs where
- *   the size of the memory space is fixed.
- *
- * + NIOCREGIF can attach to PIPE rings sharing the same memory
- *   space with a parent device. The ifname indicates the parent device,
- *   which must already exist. Flags in nr_flags indicate if we want to
- *   bind the master or slave side, the index (from nr_ringid)
- *   is just a cookie and does not need to be sequential.
- *
- * + NIOCREGIF can also attach to 'monitor' rings that replicate
- *   the content of specific rings, also from the same memory space.
- *
- *   Extra flags in nr_flags support the above functions.
- *   Application libraries may use the following naming scheme:
- *	netmap:foo			all NIC ring pairs
- *	netmap:foo^			only host ring pair
- *	netmap:foo+			all NIC ring + host ring pairs
- *	netmap:foo-k			the k-th NIC ring pair
- *	netmap:foo{k			PIPE ring pair k, master side
- *	netmap:foo}k			PIPE ring pair k, slave side
- */
-
-/*
- * struct netmap_slot is a buffer descriptor
- */
-struct netmap_slot {
-	uint32_t buf_idx;	/* buffer index */
-	uint16_t len;		/* length for this slot */
-	uint16_t flags;		/* buf changed, etc. */
-	uint64_t ptr;		/* pointer for indirect buffers */
-};
-
-/*
- * The following flags control how the slot is used
- */
-
-#define	NS_BUF_CHANGED	0x0001	/* buf_idx changed */
-	/*
-	 * must be set whenever buf_idx is changed (as it might be
-	 * necessary to recompute the physical address and mapping)
-	 */
-
-#define	NS_REPORT	0x0002	/* ask the hardware to report results */
-	/*
-	 * Request notification when slot is used by the hardware.
-	 * Normally transmit completions are handled lazily and
-	 * may be unreported. This flag lets us know when a slot
-	 * has been sent (e.g. to terminate the sender).
-	 */
-
-#define	NS_FORWARD	0x0004	/* pass packet 'forward' */
-	/*
-	 * (Only for physical ports, rx rings with NR_FORWARD set).
-	 * Slot released to the kernel (i.e. before ring->head) with
-	 * this flag set are passed to the peer ring (host/NIC),
-	 * thus restoring the host-NIC connection for these slots.
-	 * This supports efficient traffic monitoring or firewalling.
-	 */
-
-#define	NS_NO_LEARN	0x0008	/* disable bridge learning */
- 	/*
-	 * On a VALE switch, do not 'learn' the source port for
- 	 * this buffer.
-	 */
-
-#define	NS_INDIRECT	0x0010	/* userspace buffer */
- 	/*
-	 * (VALE tx rings only) data is in a userspace buffer,
-	 * whose address is in the 'ptr' field in the slot.
-	 */
-
-#define	NS_MOREFRAG	0x0020	/* packet has more fragments */
- 	/*
-	 * (VALE ports only)
-	 * Set on all but the last slot of a multi-segment packet.
-	 * The 'len' field refers to the individual fragment.
-	 */
-
-#define	NS_PORT_SHIFT	8
-#define	NS_PORT_MASK	(0xff << NS_PORT_SHIFT)
-	/*
- 	 * The high 8 bits of the flag, if not zero, indicate the
-	 * destination port for the VALE switch, overriding
- 	 * the lookup table.
- 	 */
-
-#define	NS_RFRAGS(_slot)	( ((_slot)->flags >> 8) & 0xff)
-	/*
-	 * (VALE rx rings only) the high 8 bits
-	 *  are the number of fragments.
-	 */
-
-
-/*
- * struct netmap_ring
- *
- * Netmap representation of a TX or RX ring (also known as "queue").
- * This is a queue implemented as a fixed-size circular array.
- * At the software level the important fields are: head, cur, tail.
- *
- * In TX rings:
- *
- *	head	first slot available for transmission.
- *	cur	wakeup point. select() and poll() will unblock
- *		when 'tail' moves past 'cur'
- *	tail	(readonly) first slot reserved to the kernel
- *
- *	[head .. tail-1] can be used for new packets to send;
- *	'head' and 'cur' must be incremented as slots are filled
- *	    with new packets to be sent;
- *	'cur' can be moved further ahead if we need more space
- *	for new transmissions. XXX todo (2014-03-12)
- *
- * In RX rings:
- *
- *	head	first valid received packet
- *	cur	wakeup point. select() and poll() will unblock
- *		when 'tail' moves past 'cur'
- *	tail	(readonly) first slot reserved to the kernel
- *
- *	[head .. tail-1] contain received packets;
- *	'head' and 'cur' must be incremented as slots are consumed
- *		and can be returned to the kernel;
- *	'cur' can be moved further ahead if we want to wait for
- *		new packets without returning the previous ones.
- *
- * DATA OWNERSHIP/LOCKING:
- *	The netmap_ring, and all slots and buffers in the range
- *	[head .. tail-1] are owned by the user program;
- *	the kernel only accesses them during a netmap system call
- *	and in the user thread context.
- *
- *	Other slots and buffers are reserved for use by the kernel
- */
-struct netmap_ring {
-	/*
-	 * buf_ofs is meant to be used through macros.
-	 * It contains the offset of the buffer region from this
-	 * descriptor.
-	 */
-	const int64_t	buf_ofs;
-	const uint32_t	num_slots;	/* number of slots in the ring. */
-	const uint32_t	nr_buf_size;
-	const uint16_t	ringid;
-	const uint16_t	dir;		/* 0: tx, 1: rx */
-
-	uint32_t        head;		/* (u) first user slot */
-	uint32_t        cur;		/* (u) wakeup point */
-	uint32_t	tail;		/* (k) first kernel slot */
-
-	uint32_t	flags;
-
-	struct timeval	ts;		/* (k) time of last *sync() */
-
-	/* opaque room for a mutex or similar object */
-	uint8_t		sem[128] __attribute__((__aligned__(NM_CACHE_ALIGN)));
-
-	/* the slots follow. This struct has variable size */
-	struct netmap_slot slot[0];	/* array of slots. */
-};
-
-
-/*
- * RING FLAGS
- */
-#define	NR_TIMESTAMP	0x0002		/* set timestamp on *sync() */
-	/*
-	 * updates the 'ts' field on each netmap syscall. This saves
-	 * saves a separate gettimeofday(), and is not much worse than
-	 * software timestamps generated in the interrupt handler.
-	 */
-
-#define	NR_FORWARD	0x0004		/* enable NS_FORWARD for ring */
- 	/*
-	 * Enables the NS_FORWARD slot flag for the ring.
-	 */
-
-
-/*
- * Netmap representation of an interface and its queue(s).
- * This is initialized by the kernel when binding a file
- * descriptor to a port, and should be considered as readonly
- * by user programs. The kernel never uses it.
- *
- * There is one netmap_if for each file descriptor on which we want
- * to select/poll.
- * select/poll operates on one or all pairs depending on the value of
- * nmr_queueid passed on the ioctl.
- */
-struct netmap_if {
-	char		ni_name[IFNAMSIZ]; /* name of the interface. */
-	const uint32_t	ni_version;	/* API version, currently unused */
-	const uint32_t	ni_flags;	/* properties */
-#define	NI_PRIV_MEM	0x1		/* private memory region */
-
-	/*
-	 * The number of packet rings available in netmap mode.
-	 * Physical NICs can have different numbers of tx and rx rings.
-	 * Physical NICs also have a 'host' ring pair.
-	 * Additionally, clients can request additional ring pairs to
-	 * be used for internal communication.
-	 */
-	const uint32_t	ni_tx_rings;	/* number of HW tx rings */
-	const uint32_t	ni_rx_rings;	/* number of HW rx rings */
-
-	uint32_t	ni_bufs_head;	/* head index for extra bufs */
-	uint32_t	ni_spare1[5];
-	/*
-	 * The following array contains the offset of each netmap ring
-	 * from this structure, in the following order:
-	 * NIC tx rings (ni_tx_rings); host tx ring (1); extra tx rings;
-	 * NIC rx rings (ni_rx_rings); host tx ring (1); extra rx rings.
-	 *
-	 * The area is filled up by the kernel on NIOCREGIF,
-	 * and then only read by userspace code.
-	 */
-	const ssize_t	ring_ofs[0];
-};
-
-
-#ifndef NIOCREGIF
-/*
- * ioctl names and related fields
- *
- * NIOCTXSYNC, NIOCRXSYNC synchronize tx or rx queues,
- *	whose identity is set in NIOCREGIF through nr_ringid.
- *	These are non blocking and take no argument.
- *
- * NIOCGINFO takes a struct ifreq, the interface name is the input,
- *	the outputs are number of queues and number of descriptor
- *	for each queue (useful to set number of threads etc.).
- *	The info returned is only advisory and may change before
- *	the interface is bound to a file descriptor.
- *
- * NIOCREGIF takes an interface name within a struct nmre,
- *	and activates netmap mode on the interface (if possible).
- *
- * The argument to NIOCGINFO/NIOCREGIF overlays struct ifreq so we
- * can pass it down to other NIC-related ioctls.
- *
- * The actual argument (struct nmreq) has a number of options to request
- * different functions.
- * The following are used in NIOCREGIF when nr_cmd == 0:
- *
- * nr_name	(in)
- *	The name of the port (em0, valeXXX:YYY, etc.)
- *	limited to IFNAMSIZ for backward compatibility.
- *
- * nr_version	(in/out)
- *	Must match NETMAP_API as used in the kernel, error otherwise.
- *	Always returns the desired value on output.
- *
- * nr_tx_slots, nr_tx_slots, nr_tx_rings, nr_rx_rings (in/out)
- *	On input, non-zero values may be used to reconfigure the port
- *	according to the requested values, but this is not guaranteed.
- *	On output the actual values in use are reported.
- *
- * nr_ringid (in)
- *	Indicates how rings should be bound to the file descriptors.
- *	If nr_flags != 0, then the low bits (in NETMAP_RING_MASK)
- *	are used to indicate the ring number, and nr_flags specifies
- *	the actual rings to bind. NETMAP_NO_TX_POLL is unaffected.
- *
- *	NOTE: THE FOLLOWING (nr_flags == 0) IS DEPRECATED:
- *	If nr_flags == 0, NETMAP_HW_RING and NETMAP_SW_RING control
- *	the binding as follows:
- *	0 (default)			binds all physical rings
- *	NETMAP_HW_RING | ring number	binds a single ring pair
- *	NETMAP_SW_RING			binds only the host tx/rx rings
- *
- *	NETMAP_NO_TX_POLL can be OR-ed to make select()/poll() push
- *		packets on tx rings only if POLLOUT is set.
- *		The default is to push any pending packet.
- *
- *	NETMAP_DO_RX_POLL can be OR-ed to make select()/poll() release
- *		packets on rx rings also when POLLIN is NOT set.
- *		The default is to touch the rx ring only with POLLIN.
- *		Note that this is the opposite of TX because it
- *		reflects the common usage.
- *
- *	NOTE: NETMAP_PRIV_MEM IS DEPRECATED, use nr_arg2 instead.
- *	NETMAP_PRIV_MEM is set on return for ports that do not use
- *		the global memory allocator.
- *		This information is not significant and applications
- *		should look at the region id in nr_arg2
- *
- * nr_flags	is the recommended mode to indicate which rings should
- *		be bound to a file descriptor. Values are NR_REG_*
- *
- * nr_arg1 (in)	The number of extra rings to be reserved.
- *		Especially when allocating a VALE port the system only
- *		allocates the amount of memory needed for the port.
- *		If more shared memory rings are desired (e.g. for pipes),
- *		the first invocation for the same basename/allocator
- *		should specify a suitable number. Memory cannot be
- *		extended after the first allocation without closing
- *		all ports on the same region.
- *
- * nr_arg2 (in/out) The identity of the memory region used.
- *		On input, 0 means the system decides autonomously,
- *		other values may try to select a specific region.
- *		On return the actual value is reported.
- *		Region '1' is the global allocator, normally shared
- *		by all interfaces. Other values are private regions.
- *		If two ports the same region zero-copy is possible.
- *
- * nr_arg3 (in/out)	number of extra buffers to be allocated.
- *
- *
- *
- * nr_cmd (in)	if non-zero indicates a special command:
- *	NETMAP_BDG_ATTACH	 and nr_name = vale*:ifname
- *		attaches the NIC to the switch; nr_ringid specifies
- *		which rings to use. Used by vale-ctl -a ...
- *	    nr_arg1 = NETMAP_BDG_HOST also attaches the host port
- *		as in vale-ctl -h ...
- *
- *	NETMAP_BDG_DETACH	and nr_name = vale*:ifname
- *		disconnects a previously attached NIC.
- *		Used by vale-ctl -d ...
- *
- *	NETMAP_BDG_LIST
- *		list the configuration of VALE switches.
- *
- *	NETMAP_BDG_VNET_HDR
- *		Set the virtio-net header length used by the client
- *		of a VALE switch port.
- *
- *	NETMAP_BDG_NEWIF
- *		create a persistent VALE port with name nr_name.
- *		Used by vale-ctl -n ...
- *
- *	NETMAP_BDG_DELIF
- *		delete a persistent VALE port. Used by vale-ctl -d ...
- *
- * nr_arg1, nr_arg2, nr_arg3  (in/out)		command specific
- *
- *
- *
- */
-
-
-/*
- * struct nmreq overlays a struct ifreq (just the name)
- */
-struct nmreq {
-	char		nr_name[IFNAMSIZ];
-	uint32_t	nr_version;	/* API version */
-	uint32_t	nr_offset;	/* nifp offset in the shared region */
-	uint32_t	nr_memsize;	/* size of the shared region */
-	uint32_t	nr_tx_slots;	/* slots in tx rings */
-	uint32_t	nr_rx_slots;	/* slots in rx rings */
-	uint16_t	nr_tx_rings;	/* number of tx rings */
-	uint16_t	nr_rx_rings;	/* number of rx rings */
-
-	uint16_t	nr_ringid;	/* ring(s) we care about */
-#define NETMAP_HW_RING		0x4000	/* single NIC ring pair */
-#define NETMAP_SW_RING		0x2000	/* only host ring pair */
-
-#define NETMAP_RING_MASK	0x0fff	/* the ring number */
-
-#define NETMAP_NO_TX_POLL	0x1000	/* no automatic txsync on poll */
-
-#define NETMAP_DO_RX_POLL	0x8000	/* DO automatic rxsync on poll */
-
-	uint16_t	nr_cmd;
-#define NETMAP_BDG_ATTACH	1	/* attach the NIC */
-#define NETMAP_BDG_DETACH	2	/* detach the NIC */
-#define NETMAP_BDG_REGOPS	3	/* register bridge callbacks */
-#define NETMAP_BDG_LIST		4	/* get bridge's info */
-#define NETMAP_BDG_VNET_HDR     5       /* set the port virtio-net-hdr length */
-#define NETMAP_BDG_OFFSET	NETMAP_BDG_VNET_HDR	/* deprecated alias */
-#define NETMAP_BDG_NEWIF	6	/* create a virtual port */
-#define NETMAP_BDG_DELIF	7	/* destroy a virtual port */
-	uint16_t	nr_arg1;	/* reserve extra rings in NIOCREGIF */
-#define NETMAP_BDG_HOST		1	/* attach the host stack on ATTACH */
-
-	uint16_t	nr_arg2;
-	uint32_t	nr_arg3;	/* req. extra buffers in NIOCREGIF */
-	uint32_t	nr_flags;
-	/* various modes, extends nr_ringid */
-	uint32_t	spare2[1];
-};
-
-#define NR_REG_MASK		0xf /* values for nr_flags */
-enum {	NR_REG_DEFAULT	= 0,	/* backward compat, should not be used. */
-	NR_REG_ALL_NIC	= 1,
-	NR_REG_SW	= 2,
-	NR_REG_NIC_SW	= 3,
-	NR_REG_ONE_NIC	= 4,
-	NR_REG_PIPE_MASTER = 5,
-	NR_REG_PIPE_SLAVE = 6,
-};
-/* monitor uses the NR_REG to select the rings to monitor */
-#define NR_MONITOR_TX	0x100
-#define NR_MONITOR_RX	0x200
-
-
-/*
- * FreeBSD uses the size value embedded in the _IOWR to determine
- * how much to copy in/out. So we need it to match the actual
- * data structure we pass. We put some spares in the structure
- * to ease compatibility with other versions
- */
-#define NIOCGINFO	_IOWR('i', 145, struct nmreq) /* return IF info */
-#define NIOCREGIF	_IOWR('i', 146, struct nmreq) /* interface register */
-#define NIOCTXSYNC	_IO('i', 148) /* sync tx queues */
-#define NIOCRXSYNC	_IO('i', 149) /* sync rx queues */
-#define NIOCCONFIG	_IOWR('i',150, struct nm_ifreq) /* for ext. modules */
-#endif /* !NIOCREGIF */
-
-
-/*
- * Helper functions for kernel and userspace
- */
-
-/*
- * check if space is available in the ring.
- */
-static inline int
-nm_ring_empty(struct netmap_ring *ring)
-{
-	return (ring->cur == ring->tail);
-}
-
-/*
- * Opaque structure that is passed to an external kernel
- * module via ioctl(fd, NIOCCONFIG, req) for a user-owned
- * bridge port (at this point ephemeral VALE interface).
- */
-#define NM_IFRDATA_LEN 256
-struct nm_ifreq {
-	char nifr_name[IFNAMSIZ];
-	char data[NM_IFRDATA_LEN];
-};
-
-#endif /* _NET_NETMAP_H_ */
diff --git a/include.new/net/netmap_user.h b/include.new/net/netmap_user.h
deleted file mode 100644
index 533fa38..0000000
--- a/include.new/net/netmap_user.h
+++ /dev/null
@@ -1,681 +0,0 @@
-/*
- * Copyright (C) 2011-2014 Universita` di Pisa. 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.
- *
- * 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: releng/10.2/sys/net/netmap_user.h 278775 2015-02-14 19:18:56Z luigi $
- *
- * Functions and macros to manipulate netmap structures and packets
- * in userspace. See netmap(4) for more information.
- *
- * The address of the struct netmap_if, say nifp, is computed from the
- * value returned from ioctl(.., NIOCREG, ...) and the mmap region:
- *	ioctl(fd, NIOCREG, &req);
- *	mem = mmap(0, ... );
- *	nifp = NETMAP_IF(mem, req.nr_nifp);
- *		(so simple, we could just do it manually)
- *
- * From there:
- *	struct netmap_ring *NETMAP_TXRING(nifp, index)
- *	struct netmap_ring *NETMAP_RXRING(nifp, index)
- *		we can access ring->cur, ring->head, ring->tail, etc.
- *
- *	ring->slot[i] gives us the i-th slot (we can access
- *		directly len, flags, buf_idx)
- *
- *	char *buf = NETMAP_BUF(ring, x) returns a pointer to
- *		the buffer numbered x
- *
- * All ring indexes (head, cur, tail) should always move forward.
- * To compute the next index in a circular ring you can use
- *	i = nm_ring_next(ring, i);
- *
- * To ease porting apps from pcap to netmap we supply a few fuctions
- * that can be called to open, close, read and write on netmap in a way
- * similar to libpcap. Note that the read/write function depend on
- * an ioctl()/select()/poll() being issued to refill rings or push
- * packets out.
- *
- * In order to use these, include #define NETMAP_WITH_LIBS
- * in the source file that invokes these functions.
- */
-
-#ifndef _NET_NETMAP_USER_H_
-#define _NET_NETMAP_USER_H_
-
-#include <stdint.h>
-#include <sys/socket.h>		/* apple needs sockaddr */
-#include <net/if.h>		/* IFNAMSIZ */
-
-#ifndef likely
-#define likely(x)	__builtin_expect(!!(x), 1)
-#define unlikely(x)	__builtin_expect(!!(x), 0)
-#endif /* likely and unlikely */
-
-#include <net/netmap.h>
-
-/* helper macro */
-#define _NETMAP_OFFSET(type, ptr, offset) \
-	((type)(void *)((char *)(ptr) + (offset)))
-
-#define NETMAP_IF(_base, _ofs)	_NETMAP_OFFSET(struct netmap_if *, _base, _ofs)
-
-#define NETMAP_TXRING(nifp, index) _NETMAP_OFFSET(struct netmap_ring *, \
-	nifp, (nifp)->ring_ofs[index] )
-
-#define NETMAP_RXRING(nifp, index) _NETMAP_OFFSET(struct netmap_ring *,	\
-	nifp, (nifp)->ring_ofs[index + (nifp)->ni_tx_rings + 1] )
-
-#define NETMAP_BUF(ring, index)				\
-	((char *)(ring) + (ring)->buf_ofs + ((index)*(ring)->nr_buf_size))
-
-#define NETMAP_BUF_IDX(ring, buf)			\
-	( ((char *)(buf) - ((char *)(ring) + (ring)->buf_ofs) ) / \
-		(ring)->nr_buf_size )
-
-
-static inline uint32_t
-nm_ring_next(struct netmap_ring *r, uint32_t i)
-{
-	return ( unlikely(i + 1 == r->num_slots) ? 0 : i + 1);
-}
-
-
-/*
- * Return 1 if we have pending transmissions in the tx ring.
- * When everything is complete ring->head = ring->tail + 1 (modulo ring size)
- */
-static inline int
-nm_tx_pending(struct netmap_ring *r)
-{
-	return nm_ring_next(r, r->tail) != r->head;
-}
-
-
-static inline uint32_t
-nm_ring_space(struct netmap_ring *ring)
-{
-        int ret = ring->tail - ring->cur;
-        if (ret < 0)
-                ret += ring->num_slots;
-        return ret;
-}
-
-
-#ifdef NETMAP_WITH_LIBS
-/*
- * Support for simple I/O libraries.
- * Include other system headers required for compiling this.
- */
-
-#ifndef HAVE_NETMAP_WITH_LIBS
-#define HAVE_NETMAP_WITH_LIBS
-
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/mman.h>
-#include <string.h>	/* memset */
-#include <sys/ioctl.h>
-#include <sys/errno.h>	/* EINVAL */
-#include <fcntl.h>	/* O_RDWR */
-#include <unistd.h>	/* close() */
-#include <signal.h>
-#include <stdlib.h>
-
-#ifndef ND /* debug macros */
-/* debug support */
-#define ND(_fmt, ...) do {} while(0)
-#define D(_fmt, ...)						\
-	do {							\
-		struct timeval _t0;				\
-		gettimeofday(&_t0, NULL);			\
-		fprintf(stderr, "%03d.%06d %s [%d] " _fmt "\n",	\
-		    (int)(_t0.tv_sec % 1000), (int)_t0.tv_usec,	\
-		    __FUNCTION__, __LINE__, ##__VA_ARGS__);	\
-        } while (0)
-
-/* Rate limited version of "D", lps indicates how many per second */
-#define RD(lps, format, ...)                                    \
-    do {                                                        \
-        static int __t0, __cnt;                                 \
-        struct timeval __xxts;                                  \
-        gettimeofday(&__xxts, NULL);                            \
-        if (__t0 != __xxts.tv_sec) {                            \
-            __t0 = __xxts.tv_sec;                               \
-            __cnt = 0;                                          \
-        }                                                       \
-        if (__cnt++ < lps) {                                    \
-            D(format, ##__VA_ARGS__);                           \
-        }                                                       \
-    } while (0)
-#endif
-
-struct nm_pkthdr {	/* same as pcap_pkthdr */
-	struct timeval	ts;
-	uint32_t	caplen;
-	uint32_t	len;
-};
-
-struct nm_stat {	/* same as pcap_stat	*/
-	u_int	ps_recv;
-	u_int	ps_drop;
-	u_int	ps_ifdrop;
-#ifdef WIN32
-	u_int	bs_capt;
-#endif /* WIN32 */
-};
-
-#define NM_ERRBUF_SIZE	512
-
-struct nm_desc {
-	struct nm_desc *self; /* point to self if netmap. */
-	int fd;
-	void *mem;
-	uint32_t memsize;
-	int done_mmap;	/* set if mem is the result of mmap */
-	struct netmap_if * const nifp;
-	uint16_t first_tx_ring, last_tx_ring, cur_tx_ring;
-	uint16_t first_rx_ring, last_rx_ring, cur_rx_ring;
-	struct nmreq req;	/* also contains the nr_name = ifname */
-	struct nm_pkthdr hdr;
-
-	/*
-	 * The memory contains netmap_if, rings and then buffers.
-	 * Given a pointer (e.g. to nm_inject) we can compare with
-	 * mem/buf_start/buf_end to tell if it is a buffer or
-	 * some other descriptor in our region.
-	 * We also store a pointer to some ring as it helps in the
-	 * translation from buffer indexes to addresses.
-	 */
-	struct netmap_ring * const some_ring;
-	void * const buf_start;
-	void * const buf_end;
-	/* parameters from pcap_open_live */
-	int snaplen;
-	int promisc;
-	int to_ms;
-	char *errbuf;
-
-	/* save flags so we can restore them on close */
-	uint32_t if_flags;
-        uint32_t if_reqcap;
-        uint32_t if_curcap;
-
-	struct nm_stat st;
-	char msg[NM_ERRBUF_SIZE];
-};
-
-/*
- * when the descriptor is open correctly, d->self == d
- * Eventually we should also use some magic number.
- */
-#define P2NMD(p)		((struct nm_desc *)(p))
-#define IS_NETMAP_DESC(d)	((d) && P2NMD(d)->self == P2NMD(d))
-#define NETMAP_FD(d)		(P2NMD(d)->fd)
-
-
-/*
- * this is a slightly optimized copy routine which rounds
- * to multiple of 64 bytes and is often faster than dealing
- * with other odd sizes. We assume there is enough room
- * in the source and destination buffers.
- *
- * XXX only for multiples of 64 bytes, non overlapped.
- */
-static inline void
-nm_pkt_copy(const void *_src, void *_dst, int l)
-{
-	const uint64_t *src = (const uint64_t *)_src;
-	uint64_t *dst = (uint64_t *)_dst;
-
-	if (unlikely(l >= 1024)) {
-		memcpy(dst, src, l);
-		return;
-	}
-	for (; likely(l > 0); l-=64) {
-		*dst++ = *src++;
-		*dst++ = *src++;
-		*dst++ = *src++;
-		*dst++ = *src++;
-		*dst++ = *src++;
-		*dst++ = *src++;
-		*dst++ = *src++;
-		*dst++ = *src++;
-	}
-}
-
-
-/*
- * The callback, invoked on each received packet. Same as libpcap
- */
-typedef void (*nm_cb_t)(u_char *, const struct nm_pkthdr *, const u_char *d);
-
-/*
- *--- the pcap-like API ---
- *
- * nm_open() opens a file descriptor, binds to a port and maps memory.
- *
- * ifname	(netmap:foo or vale:foo) is the port name
- *		a suffix can indicate the follwing:
- *		^		bind the host (sw) ring pair
- *		*		bind host and NIC ring pairs (transparent)
- *		-NN		bind individual NIC ring pair
- *		{NN		bind master side of pipe NN
- *		}NN		bind slave side of pipe NN
- *
- * req		provides the initial values of nmreq before parsing ifname.
- *		Remember that the ifname parsing will override the ring
- *		number in nm_ringid, and part of nm_flags;
- * flags	special functions, normally 0
- *		indicates which fields of *arg are significant
- * arg		special functions, normally NULL
- *		if passed a netmap_desc with mem != NULL,
- *		use that memory instead of mmap.
- */
-
-static struct nm_desc *nm_open(const char *ifname, const struct nmreq *req,
-	uint64_t flags, const struct nm_desc *arg);
-
-/*
- * nm_open can import some fields from the parent descriptor.
- * These flags control which ones.
- * Also in flags you can specify NETMAP_NO_TX_POLL and NETMAP_DO_RX_POLL,
- * which set the initial value for these flags.
- * Note that the 16 low bits of the flags are reserved for data
- * that may go into the nmreq.
- */
-enum {
-	NM_OPEN_NO_MMAP =	0x040000, /* reuse mmap from parent */
-	NM_OPEN_IFNAME =	0x080000, /* nr_name, nr_ringid, nr_flags */
-	NM_OPEN_ARG1 =		0x100000,
-	NM_OPEN_ARG2 =		0x200000,
-	NM_OPEN_ARG3 =		0x400000,
-	NM_OPEN_RING_CFG =	0x800000, /* tx|rx rings|slots */
-};
-
-
-/*
- * nm_close()	closes and restores the port to its previous state
- */
-
-static int nm_close(struct nm_desc *);
-
-/*
- * nm_inject() is the same as pcap_inject()
- * nm_dispatch() is the same as pcap_dispatch()
- * nm_nextpkt() is the same as pcap_next()
- */
-
-static int nm_inject(struct nm_desc *, const void *, size_t);
-static int nm_dispatch(struct nm_desc *, int, nm_cb_t, u_char *);
-static u_char *nm_nextpkt(struct nm_desc *, struct nm_pkthdr *);
-
-
-/*
- * Try to open, return descriptor if successful, NULL otherwise.
- * An invalid netmap name will return errno = 0;
- * You can pass a pointer to a pre-filled nm_desc to add special
- * parameters. Flags is used as follows
- * NM_OPEN_NO_MMAP	use the memory from arg, only
- *			if the nr_arg2 (memory block) matches.
- * NM_OPEN_ARG1		use req.nr_arg1 from arg
- * NM_OPEN_ARG2		use req.nr_arg2 from arg
- * NM_OPEN_RING_CFG	user ring config from arg
- */
-static struct nm_desc *
-nm_open(const char *ifname, const struct nmreq *req,
-	uint64_t new_flags, const struct nm_desc *arg)
-{
-	struct nm_desc *d = NULL;
-	const struct nm_desc *parent = arg;
-	u_int namelen;
-	uint32_t nr_ringid = 0, nr_flags;
-	const char *port = NULL;
-	const char *errmsg = NULL;
-
-	if (strncmp(ifname, "netmap:", 7) && strncmp(ifname, "vale", 4)) {
-		errno = 0; /* name not recognised, not an error */
-		return NULL;
-	}
-	if (ifname[0] == 'n')
-		ifname += 7;
-	/* scan for a separator */
-	for (port = ifname; *port && !index("-*^{}", *port); port++)
-		;
-	namelen = port - ifname;
-	if (namelen >= sizeof(d->req.nr_name)) {
-		errmsg = "name too long";
-		goto fail;
-	}
-	switch (*port) {
-	default:  /* '\0', no suffix */
-		nr_flags = NR_REG_ALL_NIC;
-		break;
-	case '-': /* one NIC */
-		nr_flags = NR_REG_ONE_NIC;
-		nr_ringid = atoi(port + 1);
-		break;
-	case '*': /* NIC and SW, ignore port */
-		nr_flags = NR_REG_NIC_SW;
-		if (port[1]) {
-			errmsg = "invalid port for nic+sw";
-			goto fail;
-		}
-		break;
-	case '^': /* only sw ring */
-		nr_flags = NR_REG_SW;
-		if (port[1]) {
-			errmsg = "invalid port for sw ring";
-			goto fail;
-		}
-		break;
-	case '{':
-		nr_flags = NR_REG_PIPE_MASTER;
-		nr_ringid = atoi(port + 1);
-		break;
-	case '}':
-		nr_flags = NR_REG_PIPE_SLAVE;
-		nr_ringid = atoi(port + 1);
-		break;
-	}
-
-	if (nr_ringid >= NETMAP_RING_MASK) {
-		errmsg = "invalid ringid";
-		goto fail;
-	}
-
-	d = (struct nm_desc *)calloc(1, sizeof(*d));
-	if (d == NULL) {
-		errmsg = "nm_desc alloc failure";
-		errno = ENOMEM;
-		return NULL;
-	}
-	d->self = d;	/* set this early so nm_close() works */
-	d->fd = open("/dev/netmap", O_RDWR);
-	if (d->fd < 0) {
-		errmsg = "cannot open /dev/netmap";
-		goto fail;
-	}
-
-	if (req)
-		d->req = *req;
-	d->req.nr_version = NETMAP_API;
-	d->req.nr_ringid &= ~NETMAP_RING_MASK;
-
-	/* these fields are overridden by ifname and flags processing */
-	d->req.nr_ringid |= nr_ringid;
-	d->req.nr_flags = nr_flags;
-	memcpy(d->req.nr_name, ifname, namelen);
-	d->req.nr_name[namelen] = '\0';
-	/* optionally import info from parent */
-	if (IS_NETMAP_DESC(parent) && new_flags) {
-		if (new_flags & NM_OPEN_ARG1)
-			D("overriding ARG1 %d", parent->req.nr_arg1);
-		d->req.nr_arg1 = new_flags & NM_OPEN_ARG1 ?
-			parent->req.nr_arg1 : 4;
-		if (new_flags & NM_OPEN_ARG2)
-			D("overriding ARG2 %d", parent->req.nr_arg2);
-		d->req.nr_arg2 = new_flags & NM_OPEN_ARG2 ?
-			parent->req.nr_arg2 : 0;
-		if (new_flags & NM_OPEN_ARG3)
-			D("overriding ARG3 %d", parent->req.nr_arg3);
-		d->req.nr_arg3 = new_flags & NM_OPEN_ARG3 ?
-			parent->req.nr_arg3 : 0;
-		if (new_flags & NM_OPEN_RING_CFG) {
-			D("overriding RING_CFG");
-			d->req.nr_tx_slots = parent->req.nr_tx_slots;
-			d->req.nr_rx_slots = parent->req.nr_rx_slots;
-			d->req.nr_tx_rings = parent->req.nr_tx_rings;
-			d->req.nr_rx_rings = parent->req.nr_rx_rings;
-		}
-		if (new_flags & NM_OPEN_IFNAME) {
-			D("overriding ifname %s ringid 0x%x flags 0x%x",
-				parent->req.nr_name, parent->req.nr_ringid,
-				parent->req.nr_flags);
-			memcpy(d->req.nr_name, parent->req.nr_name,
-				sizeof(d->req.nr_name));
-			d->req.nr_ringid = parent->req.nr_ringid;
-			d->req.nr_flags = parent->req.nr_flags;
-		}
-	}
-	/* add the *XPOLL flags */
-	d->req.nr_ringid |= new_flags & (NETMAP_NO_TX_POLL | NETMAP_DO_RX_POLL);
-
-	if (ioctl(d->fd, NIOCREGIF, &d->req)) {
-		errmsg = "NIOCREGIF failed";
-		goto fail;
-	}
-
-	if (IS_NETMAP_DESC(parent) && parent->mem &&
-	    parent->req.nr_arg2 == d->req.nr_arg2) {
-		/* do not mmap, inherit from parent */
-		d->memsize = parent->memsize;
-		d->mem = parent->mem;
-	} else {
-		/* XXX TODO: check if memsize is too large (or there is overflow) */
-		d->memsize = d->req.nr_memsize;
-		d->mem = mmap(0, d->memsize, PROT_WRITE | PROT_READ, MAP_SHARED,
-				d->fd, 0);
-		if (d->mem == MAP_FAILED) {
-			errmsg = "mmap failed";
-			goto fail;
-		}
-		d->done_mmap = 1;
-	}
-	{
-		struct netmap_if *nifp = NETMAP_IF(d->mem, d->req.nr_offset);
-		struct netmap_ring *r = NETMAP_RXRING(nifp, );
-
-		*(struct netmap_if **)(uintptr_t)&(d->nifp) = nifp;
-		*(struct netmap_ring **)(uintptr_t)&d->some_ring = r;
-		*(void **)(uintptr_t)&d->buf_start = NETMAP_BUF(r, 0);
-		*(void **)(uintptr_t)&d->buf_end =
-			(char *)d->mem + d->memsize;
-	}
-
-	if (d->req.nr_flags ==  NR_REG_SW) { /* host stack */
-		d->first_tx_ring = d->last_tx_ring = d->req.nr_tx_rings;
-		d->first_rx_ring = d->last_rx_ring = d->req.nr_rx_rings;
-	} else if (d->req.nr_flags ==  NR_REG_ALL_NIC) { /* only nic */
-		d->first_tx_ring = 0;
-		d->first_rx_ring = 0;
-		d->last_tx_ring = d->req.nr_tx_rings - 1;
-		d->last_rx_ring = d->req.nr_rx_rings - 1;
-	} else if (d->req.nr_flags ==  NR_REG_NIC_SW) {
-		d->first_tx_ring = 0;
-		d->first_rx_ring = 0;
-		d->last_tx_ring = d->req.nr_tx_rings;
-		d->last_rx_ring = d->req.nr_rx_rings;
-	} else if (d->req.nr_flags == NR_REG_ONE_NIC) {
-		/* XXX check validity */
-		d->first_tx_ring = d->last_tx_ring =
-		d->first_rx_ring = d->last_rx_ring = d->req.nr_ringid & NETMAP_RING_MASK;
-	} else { /* pipes */
-		d->first_tx_ring = d->last_tx_ring = 0;
-		d->first_rx_ring = d->last_rx_ring = 0;
-	}
-
-#ifdef DEBUG_NETMAP_USER
-    { /* debugging code */
-	int i;
-
-	D("%s tx %d .. %d %d rx %d .. %d %d", ifname,
-		d->first_tx_ring, d->last_tx_ring, d->req.nr_tx_rings,
-                d->first_rx_ring, d->last_rx_ring, d->req.nr_rx_rings);
-	for (i = 0; i <= d->req.nr_tx_rings; i++) {
-		struct netmap_ring *r = NETMAP_TXRING(d->nifp, i);
-		D("TX%d %p h %d c %d t %d", i, r, r->head, r->cur, r->tail);
-	}
-	for (i = 0; i <= d->req.nr_rx_rings; i++) {
-		struct netmap_ring *r = NETMAP_RXRING(d->nifp, i);
-		D("RX%d %p h %d c %d t %d", i, r, r->head, r->cur, r->tail);
-	}
-    }
-#endif /* debugging */
-
-	d->cur_tx_ring = d->first_tx_ring;
-	d->cur_rx_ring = d->first_rx_ring;
-	return d;
-
-fail:
-	nm_close(d);
-	if (errmsg)
-		D("%s %s", errmsg, ifname);
-	if (errno == 0)
-		errno = EINVAL;
-	return NULL;
-}
-
-
-static int
-nm_close(struct nm_desc *d)
-{
-	/*
-	 * ugly trick to avoid unused warnings
-	 */
-	static void *__xxzt[] __attribute__ ((unused))  =
-		{ (void *)nm_open, (void *)nm_inject,
-		  (void *)nm_dispatch, (void *)nm_nextpkt } ;
-
-	if (d == NULL || d->self != d)
-		return EINVAL;
-	if (d->done_mmap && d->mem)
-		munmap(d->mem, d->memsize);
-	if (d->fd != -1)
-		close(d->fd);
-	bzero(d, sizeof(*d));
-	free(d);
-	return 0;
-}
-
-
-/*
- * Same prototype as pcap_inject(), only need to cast.
- */
-static int
-nm_inject(struct nm_desc *d, const void *buf, size_t size)
-{
-	u_int c, n = d->last_tx_ring - d->first_tx_ring + 1;
-
-	for (c = 0; c < n ; c++) {
-		/* compute current ring to use */
-		struct netmap_ring *ring;
-		uint32_t i, idx;
-		uint32_t ri = d->cur_tx_ring + c;
-
-		if (ri > d->last_tx_ring)
-			ri = d->first_tx_ring;
-		ring = NETMAP_TXRING(d->nifp, ri);
-		if (nm_ring_empty(ring)) {
-			continue;
-		}
-		i = ring->cur;
-		idx = ring->slot[i].buf_idx;
-		ring->slot[i].len = size;
-		nm_pkt_copy(buf, NETMAP_BUF(ring, idx), size);
-		d->cur_tx_ring = ri;
-		ring->head = ring->cur = nm_ring_next(ring, i);
-		return size;
-	}
-	return 0; /* fail */
-}
-
-
-/*
- * Same prototype as pcap_dispatch(), only need to cast.
- */
-static int
-nm_dispatch(struct nm_desc *d, int cnt, nm_cb_t cb, u_char *arg)
-{
-	int n = d->last_rx_ring - d->first_rx_ring + 1;
-	int c, got = 0, ri = d->cur_rx_ring;
-
-	if (cnt == 0)
-		cnt = -1;
-	/* cnt == -1 means infinite, but rings have a finite amount
-	 * of buffers and the int is large enough that we never wrap,
-	 * so we can omit checking for -1
-	 */
-	for (c=0; c < n && cnt != got; c++) {
-		/* compute current ring to use */
-		struct netmap_ring *ring;
-
-		ri = d->cur_rx_ring + c;
-		if (ri > d->last_rx_ring)
-			ri = d->first_rx_ring;
-		ring = NETMAP_RXRING(d->nifp, ri);
-		for ( ; !nm_ring_empty(ring) && cnt != got; got++) {
-			u_int i = ring->cur;
-			u_int idx = ring->slot[i].buf_idx;
-			u_char *buf = (u_char *)NETMAP_BUF(ring, idx);
-
-			// __builtin_prefetch(buf);
-			d->hdr.len = d->hdr.caplen = ring->slot[i].len;
-			d->hdr.ts = ring->ts;
-			cb(arg, &d->hdr, buf);
-			ring->head = ring->cur = nm_ring_next(ring, i);
-		}
-	}
-	d->cur_rx_ring = ri;
-	return got;
-}
-
-static u_char *
-nm_nextpkt(struct nm_desc *d, struct nm_pkthdr *hdr)
-{
-	int ri = d->cur_rx_ring;
-
-	do {
-		/* compute current ring to use */
-		struct netmap_ring *ring = NETMAP_RXRING(d->nifp, ri);
-		if (!nm_ring_empty(ring)) {
-			u_int i = ring->cur;
-			u_int idx = ring->slot[i].buf_idx;
-			u_char *buf = (u_char *)NETMAP_BUF(ring, idx);
-
-			// __builtin_prefetch(buf);
-			hdr->ts = ring->ts;
-			hdr->len = hdr->caplen = ring->slot[i].len;
-			ring->cur = nm_ring_next(ring, i);
-			/* we could postpone advancing head if we want
-			 * to hold the buffer. This can be supported in
-			 * the future.
-			 */
-			ring->head = ring->cur;
-			d->cur_rx_ring = ri;
-			return buf;
-		}
-		ri++;
-		if (ri > d->last_rx_ring)
-			ri = d->first_rx_ring;
-	} while (ri != d->cur_rx_ring);
-	return NULL; /* nothing found */
-}
-
-#endif /* !HAVE_NETMAP_WITH_LIBS */
-
-#endif /* NETMAP_WITH_LIBS */
-
-#endif /* _NET_NETMAP_USER_H_ */
diff --git a/include.new/net/pfil.h b/include.new/net/pfil.h
deleted file mode 100644
index d3fbaf0..0000000
--- a/include.new/net/pfil.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/net/pfil.h 254777 2013-08-24 12:03:24Z andre $ */
-/*	$NetBSD: pfil.h,v 1.22 2003/06/23 12:57:08 martin Exp $	*/
-
-/*-
- * Copyright (c) 1996 Matthew R. Green
- * 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 ``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 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.
- */
-
-#ifndef _NET_PFIL_H_
-#define _NET_PFIL_H_
-
-#include <sys/systm.h>
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/lock.h>
-#include <sys/rmlock.h>
-
-struct mbuf;
-struct ifnet;
-struct inpcb;
-
-typedef	int	(*pfil_func_t)(void *, struct mbuf **, struct ifnet *, int,
-		    struct inpcb *);
-
-/*
- * The packet filter hooks are designed for anything to call them to
- * possibly intercept the packet.  Multiple filter hooks are chained
- * together and after each other in the specified order.
- */
-struct packet_filter_hook {
-	TAILQ_ENTRY(packet_filter_hook) pfil_chain;
-	pfil_func_t	 pfil_func;
-	void		*pfil_arg;
-};
-
-#define PFIL_IN		0x00000001
-#define PFIL_OUT	0x00000002
-#define PFIL_WAITOK	0x00000004
-#define PFIL_ALL	(PFIL_IN|PFIL_OUT)
-
-typedef	TAILQ_HEAD(pfil_chain, packet_filter_hook) pfil_chain_t;
-
-#define	PFIL_TYPE_AF		1	/* key is AF_* type */
-#define	PFIL_TYPE_IFNET		2	/* key is ifnet pointer */
-
-#define	PFIL_FLAG_PRIVATE_LOCK	0x01	/* Personal lock instead of global */
-
-/*
- * A pfil head is created by each protocol or packet intercept point.
- * For packet is then run through the hook chain for inspection.
- */
-struct pfil_head {
-	pfil_chain_t	 ph_in;
-	pfil_chain_t	 ph_out;
-	int		 ph_type;
-	int		 ph_nhooks;
-#if defined( __linux__ ) || defined( _WIN32 )
-	rwlock_t	 ph_mtx;
-#else
-	struct rmlock	*ph_plock;	/* Pointer to the used lock */
-	struct rmlock	 ph_lock;	/* Private lock storage */
-	int		 flags;
-#endif
-	union {
-		u_long	 phu_val;
-		void	*phu_ptr;
-	} ph_un;
-#define	ph_af		 ph_un.phu_val
-#define	ph_ifnet	 ph_un.phu_ptr
-	LIST_ENTRY(pfil_head) ph_list;
-};
-
-/* Public functions for pfil hook management by packet filters. */
-struct pfil_head *pfil_head_get(int, u_long);
-int	pfil_add_hook(pfil_func_t, void *, int, struct pfil_head *);
-int	pfil_remove_hook(pfil_func_t, void *, int, struct pfil_head *);
-#define	PFIL_HOOKED(p) ((p)->ph_nhooks > 0)
-
-/* Public functions to run the packet inspection by protocols. */
-int	pfil_run_hooks(struct pfil_head *, struct mbuf **, struct ifnet *,
-	    int, struct inpcb *inp);
-
-/* Public functions for pfil head management by protocols. */
-int	pfil_head_register(struct pfil_head *);
-int	pfil_head_unregister(struct pfil_head *);
-
-/* Public pfil locking functions for self managed locks by packet filters. */
-struct rm_priotracker;	/* Do not require including rmlock header */
-int	pfil_try_rlock(struct pfil_head *, struct rm_priotracker *);
-void	pfil_rlock(struct pfil_head *, struct rm_priotracker *);
-void	pfil_runlock(struct pfil_head *, struct rm_priotracker *);
-void	pfil_wlock(struct pfil_head *);
-void	pfil_wunlock(struct pfil_head *);
-int	pfil_wowned(struct pfil_head *ph);
-
-/* Internal pfil locking functions. */
-#define	PFIL_LOCK_INIT_REAL(l, t)	\
-	rm_init_flags(l, "PFil " t " rmlock", RM_RECURSE)
-#define	PFIL_LOCK_DESTROY_REAL(l)	\
-	rm_destroy(l)
-#define	PFIL_LOCK_INIT(p)	do {			\
-	if ((p)->flags & PFIL_FLAG_PRIVATE_LOCK) {	\
-		PFIL_LOCK_INIT_REAL(&(p)->ph_lock, "private");	\
-		(p)->ph_plock = &(p)->ph_lock;		\
-	} else						\
-		(p)->ph_plock = &V_pfil_lock;		\
-} while (0)
-#define	PFIL_LOCK_DESTROY(p)	do {			\
-	if ((p)->flags & PFIL_FLAG_PRIVATE_LOCK)	\
-		PFIL_LOCK_DESTROY_REAL((p)->ph_plock);	\
-} while (0)
-
-#define	PFIL_TRY_RLOCK(p, t)	rm_try_rlock((p)->ph_plock, (t))
-#define	PFIL_RLOCK(p, t)	rm_rlock((p)->ph_plock, (t))
-#define	PFIL_WLOCK(p)		rm_wlock((p)->ph_plock)
-#define	PFIL_RUNLOCK(p, t)	rm_runlock((p)->ph_plock, (t))
-#define	PFIL_WUNLOCK(p)		rm_wunlock((p)->ph_plock)
-#define	PFIL_WOWNED(p)		rm_wowned((p)->ph_plock)
-
-/* Internal locking macros for global/vnet pfil_head_list. */
-#define	PFIL_HEADLIST_LOCK()	mtx_lock(&pfil_global_lock)
-#define	PFIL_HEADLIST_UNLOCK()	mtx_unlock(&pfil_global_lock)
-
-#endif /* _NET_PFIL_H_ */
diff --git a/include.new/net/pfkeyv2.h b/include.new/net/pfkeyv2.h
deleted file mode 100644
index 0f3868f..0000000
--- a/include.new/net/pfkeyv2.h
+++ /dev/null
@@ -1,432 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/net/pfkeyv2.h 194062 2009-06-12 15:44:35Z vanhu $	*/
-/*	$KAME: pfkeyv2.h,v 1.37 2003/09/06 05:15:43 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * This file has been derived rfc 2367,
- * And added some flags of SADB_KEY_FLAGS_ as SADB_X_EXT_.
- *	sakane@ydc.co.jp
- */
-
-#ifndef _NET_PFKEYV2_H_
-#define _NET_PFKEYV2_H_
-
-/*
-This file defines structures and symbols for the PF_KEY Version 2
-key management interface. It was written at the U.S. Naval Research
-Laboratory. This file is in the public domain. The authors ask that
-you leave this credit intact on any copies of this file.
-*/
-#ifndef __PFKEY_V2_H
-#define __PFKEY_V2_H 1
-
-#define PF_KEY_V2 2
-#define PFKEYV2_REVISION        199806L
-
-#define SADB_RESERVED    0
-#define SADB_GETSPI      1
-#define SADB_UPDATE      2
-#define SADB_ADD         3
-#define SADB_DELETE      4
-#define SADB_GET         5
-#define SADB_ACQUIRE     6
-#define SADB_REGISTER    7
-#define SADB_EXPIRE      8
-#define SADB_FLUSH       9
-#define SADB_DUMP        10
-#define SADB_X_PROMISC   11
-#define SADB_X_PCHANGE   12
-
-#define SADB_X_SPDUPDATE  13
-#define SADB_X_SPDADD     14
-#define SADB_X_SPDDELETE  15	/* by policy index */
-#define SADB_X_SPDGET     16
-#define SADB_X_SPDACQUIRE 17
-#define SADB_X_SPDDUMP    18
-#define SADB_X_SPDFLUSH   19
-#define SADB_X_SPDSETIDX  20
-#define SADB_X_SPDEXPIRE  21
-#define SADB_X_SPDDELETE2 22	/* by policy id */
-#define SADB_MAX          22
-
-struct sadb_msg {
-  u_int8_t sadb_msg_version;
-  u_int8_t sadb_msg_type;
-  u_int8_t sadb_msg_errno;
-  u_int8_t sadb_msg_satype;
-  u_int16_t sadb_msg_len;
-  u_int16_t sadb_msg_reserved;
-  uint32_t sadb_msg_seq;
-  uint32_t sadb_msg_pid;
-};
-
-struct sadb_ext {
-  u_int16_t sadb_ext_len;
-  u_int16_t sadb_ext_type;
-};
-
-struct sadb_sa {
-  u_int16_t sadb_sa_len;
-  u_int16_t sadb_sa_exttype;
-  uint32_t sadb_sa_spi;
-  u_int8_t sadb_sa_replay;
-  u_int8_t sadb_sa_state;
-  u_int8_t sadb_sa_auth;
-  u_int8_t sadb_sa_encrypt;
-  uint32_t sadb_sa_flags;
-};
-
-struct sadb_lifetime {
-  u_int16_t sadb_lifetime_len;
-  u_int16_t sadb_lifetime_exttype;
-  uint32_t sadb_lifetime_allocations;
-  u_int64_t sadb_lifetime_bytes;
-  u_int64_t sadb_lifetime_addtime;
-  u_int64_t sadb_lifetime_usetime;
-};
-
-struct sadb_address {
-  u_int16_t sadb_address_len;
-  u_int16_t sadb_address_exttype;
-  u_int8_t sadb_address_proto;
-  u_int8_t sadb_address_prefixlen;
-  u_int16_t sadb_address_reserved;
-};
-
-struct sadb_key {
-  u_int16_t sadb_key_len;
-  u_int16_t sadb_key_exttype;
-  u_int16_t sadb_key_bits;
-  u_int16_t sadb_key_reserved;
-};
-
-struct sadb_ident {
-  u_int16_t sadb_ident_len;
-  u_int16_t sadb_ident_exttype;
-  u_int16_t sadb_ident_type;
-  u_int16_t sadb_ident_reserved;
-  u_int64_t sadb_ident_id;
-};
-
-struct sadb_sens {
-  u_int16_t sadb_sens_len;
-  u_int16_t sadb_sens_exttype;
-  uint32_t sadb_sens_dpd;
-  u_int8_t sadb_sens_sens_level;
-  u_int8_t sadb_sens_sens_len;
-  u_int8_t sadb_sens_integ_level;
-  u_int8_t sadb_sens_integ_len;
-  uint32_t sadb_sens_reserved;
-};
-
-struct sadb_prop {
-  u_int16_t sadb_prop_len;
-  u_int16_t sadb_prop_exttype;
-  u_int8_t sadb_prop_replay;
-  u_int8_t sadb_prop_reserved[3];
-};
-
-struct sadb_comb {
-  u_int8_t sadb_comb_auth;
-  u_int8_t sadb_comb_encrypt;
-  u_int16_t sadb_comb_flags;
-  u_int16_t sadb_comb_auth_minbits;
-  u_int16_t sadb_comb_auth_maxbits;
-  u_int16_t sadb_comb_encrypt_minbits;
-  u_int16_t sadb_comb_encrypt_maxbits;
-  uint32_t sadb_comb_reserved;
-  uint32_t sadb_comb_soft_allocations;
-  uint32_t sadb_comb_hard_allocations;
-  u_int64_t sadb_comb_soft_bytes;
-  u_int64_t sadb_comb_hard_bytes;
-  u_int64_t sadb_comb_soft_addtime;
-  u_int64_t sadb_comb_hard_addtime;
-  u_int64_t sadb_comb_soft_usetime;
-  u_int64_t sadb_comb_hard_usetime;
-};
-
-struct sadb_supported {
-  u_int16_t sadb_supported_len;
-  u_int16_t sadb_supported_exttype;
-  uint32_t sadb_supported_reserved;
-};
-
-struct sadb_alg {
-  u_int8_t sadb_alg_id;
-  u_int8_t sadb_alg_ivlen;
-  u_int16_t sadb_alg_minbits;
-  u_int16_t sadb_alg_maxbits;
-  u_int16_t sadb_alg_reserved;
-};
-
-struct sadb_spirange {
-  u_int16_t sadb_spirange_len;
-  u_int16_t sadb_spirange_exttype;
-  uint32_t sadb_spirange_min;
-  uint32_t sadb_spirange_max;
-  uint32_t sadb_spirange_reserved;
-};
-
-struct sadb_x_kmprivate {
-  u_int16_t sadb_x_kmprivate_len;
-  u_int16_t sadb_x_kmprivate_exttype;
-  uint32_t sadb_x_kmprivate_reserved;
-};
-
-/*
- * XXX Additional SA Extension.
- * mode: tunnel or transport
- * reqid: to make SA unique nevertheless the address pair of SA are same.
- *        Mainly it's for VPN.
- */
-struct sadb_x_sa2 {
-  u_int16_t sadb_x_sa2_len;
-  u_int16_t sadb_x_sa2_exttype;
-  u_int8_t sadb_x_sa2_mode;
-  u_int8_t sadb_x_sa2_reserved1;
-  u_int16_t sadb_x_sa2_reserved2;
-  uint32_t sadb_x_sa2_sequence;	/* lowermost 32bit of sequence number */
-  uint32_t sadb_x_sa2_reqid;
-};
-
-/* XXX Policy Extension */
-/* sizeof(struct sadb_x_policy) == 16 */
-struct sadb_x_policy {
-  u_int16_t sadb_x_policy_len;
-  u_int16_t sadb_x_policy_exttype;
-  u_int16_t sadb_x_policy_type;		/* See policy type of ipsec.h */
-  u_int8_t sadb_x_policy_dir;		/* direction, see ipsec.h */
-  u_int8_t sadb_x_policy_reserved;
-  uint32_t sadb_x_policy_id;
-  uint32_t sadb_x_policy_reserved2;
-};
-/*
- * When policy_type == IPSEC, it is followed by some of
- * the ipsec policy request.
- * [total length of ipsec policy requests]
- *	= (sadb_x_policy_len * sizeof(uint64_t) - sizeof(struct sadb_x_policy))
- */
-
-/* XXX IPsec Policy Request Extension */
-/*
- * This structure is aligned 8 bytes.
- */
-struct sadb_x_ipsecrequest {
-  u_int16_t sadb_x_ipsecrequest_len;	/* structure length in 64 bits. */
-  u_int16_t sadb_x_ipsecrequest_proto;	/* See ipsec.h */
-  u_int8_t sadb_x_ipsecrequest_mode;	/* See IPSEC_MODE_XX in ipsec.h. */
-  u_int8_t sadb_x_ipsecrequest_level;	/* See IPSEC_LEVEL_XX in ipsec.h */
-  u_int16_t sadb_x_ipsecrequest_reqid;	/* See ipsec.h */
-
-  /*
-   * followed by source IP address of SA, and immediately followed by
-   * destination IP address of SA.  These encoded into two of sockaddr
-   * structure without any padding.  Must set each sa_len exactly.
-   * Each of length of the sockaddr structure are not aligned to 64bits,
-   * but sum of x_request and addresses is aligned to 64bits.
-   */
-};
-
-/* NAT-Traversal type, see RFC 3948 (and drafts). */
-/* sizeof(struct sadb_x_nat_t_type) == 8 */
-struct sadb_x_nat_t_type {
-  u_int16_t sadb_x_nat_t_type_len;
-  u_int16_t sadb_x_nat_t_type_exttype;
-  u_int8_t sadb_x_nat_t_type_type;
-  u_int8_t sadb_x_nat_t_type_reserved[3];
-};
-
-/* NAT-Traversal source or destination port. */
-/* sizeof(struct sadb_x_nat_t_port) == 8 */
-struct sadb_x_nat_t_port { 
-  u_int16_t sadb_x_nat_t_port_len;
-  u_int16_t sadb_x_nat_t_port_exttype;
-  u_int16_t sadb_x_nat_t_port_port;
-  u_int16_t sadb_x_nat_t_port_reserved;
-};
-
-/* ESP fragmentation size. */
-/* sizeof(struct sadb_x_nat_t_frag) == 8 */
-struct sadb_x_nat_t_frag {
-  u_int16_t sadb_x_nat_t_frag_len;
-  u_int16_t sadb_x_nat_t_frag_exttype;
-  u_int16_t sadb_x_nat_t_frag_fraglen;
-  u_int16_t sadb_x_nat_t_frag_reserved;
-};
-
-
-#define SADB_EXT_RESERVED             0
-#define SADB_EXT_SA                   1
-#define SADB_EXT_LIFETIME_CURRENT     2
-#define SADB_EXT_LIFETIME_HARD        3
-#define SADB_EXT_LIFETIME_SOFT        4
-#define SADB_EXT_ADDRESS_SRC          5
-#define SADB_EXT_ADDRESS_DST          6
-#define SADB_EXT_ADDRESS_PROXY        7
-#define SADB_EXT_KEY_AUTH             8
-#define SADB_EXT_KEY_ENCRYPT          9
-#define SADB_EXT_IDENTITY_SRC         10
-#define SADB_EXT_IDENTITY_DST         11
-#define SADB_EXT_SENSITIVITY          12
-#define SADB_EXT_PROPOSAL             13
-#define SADB_EXT_SUPPORTED_AUTH       14
-#define SADB_EXT_SUPPORTED_ENCRYPT    15
-#define SADB_EXT_SPIRANGE             16
-#define SADB_X_EXT_KMPRIVATE          17
-#define SADB_X_EXT_POLICY             18
-#define SADB_X_EXT_SA2                19
-#define SADB_X_EXT_NAT_T_TYPE         20
-#define SADB_X_EXT_NAT_T_SPORT        21
-#define SADB_X_EXT_NAT_T_DPORT        22
-#define SADB_X_EXT_NAT_T_OA           23	/* Deprecated. */
-#define SADB_X_EXT_NAT_T_OAI          23	/* Peer's NAT_OA for src of SA. */
-#define SADB_X_EXT_NAT_T_OAR          24	/* Peer's NAT_OA for dst of SA. */
-#define SADB_X_EXT_NAT_T_FRAG         25	/* Manual MTU override. */
-#define SADB_EXT_MAX                  25
-
-#define SADB_SATYPE_UNSPEC	0
-#define SADB_SATYPE_AH		2
-#define SADB_SATYPE_ESP		3
-#define SADB_SATYPE_RSVP	5
-#define SADB_SATYPE_OSPFV2	6
-#define SADB_SATYPE_RIPV2	7
-#define SADB_SATYPE_MIP		8
-#define SADB_X_SATYPE_IPCOMP	9
-/*#define SADB_X_SATYPE_POLICY	10	obsolete, do not reuse */
-#define SADB_X_SATYPE_TCPSIGNATURE	11
-#define SADB_SATYPE_MAX		12
-
-#define SADB_SASTATE_LARVAL   0
-#define SADB_SASTATE_MATURE   1
-#define SADB_SASTATE_DYING    2
-#define SADB_SASTATE_DEAD     3
-#define SADB_SASTATE_MAX      3
-
-#define SADB_SAFLAGS_PFS      1
-
-/* RFC2367 numbers - meets RFC2407 */
-#define SADB_AALG_NONE		0
-#define SADB_AALG_MD5HMAC	2
-#define SADB_AALG_SHA1HMAC	3
-#define SADB_AALG_MAX		252
-/* private allocations - based on RFC2407/IANA assignment */
-#define SADB_X_AALG_SHA2_256	5
-#define SADB_X_AALG_SHA2_384	6
-#define SADB_X_AALG_SHA2_512	7
-#define SADB_X_AALG_RIPEMD160HMAC	8
-#define SADB_X_AALG_AES_XCBC_MAC	9	/* draft-ietf-ipsec-ciph-aes-xcbc-mac-04 */
-/* private allocations should use 249-255 (RFC2407) */
-#define SADB_X_AALG_MD5		249	/* Keyed MD5 */
-#define SADB_X_AALG_SHA		250	/* Keyed SHA */
-#define SADB_X_AALG_NULL	251	/* null authentication */
-#define SADB_X_AALG_TCP_MD5	252	/* Keyed TCP-MD5 (RFC2385) */
-
-/* RFC2367 numbers - meets RFC2407 */
-#define SADB_EALG_NONE		0
-#define SADB_EALG_DESCBC	2
-#define SADB_EALG_3DESCBC	3
-#define SADB_EALG_NULL		11
-#define SADB_EALG_MAX		250
-/* private allocations - based on RFC2407/IANA assignment */
-#define SADB_X_EALG_CAST128CBC	6
-#define SADB_X_EALG_BLOWFISHCBC	7
-#define SADB_X_EALG_RIJNDAELCBC	12
-#define SADB_X_EALG_AES		12
-/* private allocations - based on RFC4312/IANA assignment */
-#define SADB_X_EALG_CAMELLIACBC		22
-/* private allocations should use 249-255 (RFC2407) */
-#define SADB_X_EALG_SKIPJACK	249	/*250*/ /* for IPSEC */
-#define SADB_X_EALG_AESCTR	250	/*249*/ /* draft-ietf-ipsec-ciph-aes-ctr-03 */
-
-/* private allocations - based on RFC2407/IANA assignment */
-#define SADB_X_CALG_NONE	0
-#define SADB_X_CALG_OUI		1
-#define SADB_X_CALG_DEFLATE	2
-#define SADB_X_CALG_LZS		3
-#define SADB_X_CALG_MAX		4
-
-#define SADB_IDENTTYPE_RESERVED   0
-#define SADB_IDENTTYPE_PREFIX     1
-#define SADB_IDENTTYPE_FQDN       2
-#define SADB_IDENTTYPE_USERFQDN   3
-#define SADB_X_IDENTTYPE_ADDR     4
-#define SADB_IDENTTYPE_MAX        4
-
-/* `flags' in sadb_sa structure holds followings */
-#define SADB_X_EXT_NONE		0x0000	/* i.e. new format. */
-#define SADB_X_EXT_OLD		0x0001	/* old format. */
-
-#define SADB_X_EXT_IV4B		0x0010	/* IV length of 4 bytes in use */
-#define SADB_X_EXT_DERIV	0x0020	/* DES derived */
-#define SADB_X_EXT_CYCSEQ	0x0040	/* allowing to cyclic sequence. */
-
-	/* three of followings are exclusive flags each them */
-#define SADB_X_EXT_PSEQ		0x0000	/* sequencial padding for ESP */
-#define SADB_X_EXT_PRAND	0x0100	/* random padding for ESP */
-#define SADB_X_EXT_PZERO	0x0200	/* zero padding for ESP */
-#define SADB_X_EXT_PMASK	0x0300	/* mask for padding flag */
-
-#if 1
-#define SADB_X_EXT_RAWCPI	0x0080	/* use well known CPI (IPComp) */
-#endif
-
-#define SADB_KEY_FLAGS_MAX	0x0fff
-
-/* SPI size for PF_KEYv2 */
-#define PFKEY_SPI_SIZE	sizeof(uint32_t)
-
-/* Identifier for menber of lifetime structure */
-#define SADB_X_LIFETIME_ALLOCATIONS	0
-#define SADB_X_LIFETIME_BYTES		1
-#define SADB_X_LIFETIME_ADDTIME		2
-#define SADB_X_LIFETIME_USETIME		3
-
-/* The rate for SOFT lifetime against HARD one. */
-#define PFKEY_SOFT_LIFETIME_RATE	80
-
-/* Utilities */
-#define PFKEY_ALIGN8(a) (1 + (((a) - 1) | (8 - 1)))
-#define	PFKEY_EXTLEN(msg) \
-	PFKEY_UNUNIT64(((struct sadb_ext *)(msg))->sadb_ext_len)
-#define PFKEY_ADDR_PREFIX(ext) \
-	(((struct sadb_address *)(ext))->sadb_address_prefixlen)
-#define PFKEY_ADDR_PROTO(ext) \
-	(((struct sadb_address *)(ext))->sadb_address_proto)
-#define PFKEY_ADDR_SADDR(ext) \
-	((struct sockaddr *)((caddr_t)(ext) + sizeof(struct sadb_address)))
-
-/* in 64bits */
-#define	PFKEY_UNUNIT64(a)	((a) << 3)
-#define	PFKEY_UNIT64(a)		((a) >> 3)
-
-#endif /* __PFKEY_V2_H */
-
-#endif /* _NET_PFKEYV2_H_ */
diff --git a/include.new/net/pfvar.h b/include.new/net/pfvar.h
deleted file mode 100644
index 3b26ae7..0000000
--- a/include.new/net/pfvar.h
+++ /dev/null
@@ -1,1743 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Hartmeier
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
- * COPYRIGHT HOLDERS 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.
- *
- *	$OpenBSD: pfvar.h,v 1.282 2009/01/29 15:12:28 pyr Exp $
- *	$FreeBSD: releng/10.2/sys/net/pfvar.h 286014 2015-07-29 14:16:25Z glebius $
- */
-
-#ifndef _NET_PFVAR_H_
-#define _NET_PFVAR_H_
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/counter.h>
-#include <sys/refcount.h>
-#include <sys/tree.h>
-
-#include <net/radix.h>
-#include <netinet/in.h>
-
-#include <netpfil/pf/pf.h>
-#include <netpfil/pf/pf_altq.h>
-#include <netpfil/pf/pf_mtag.h>
-
-struct pf_addr {
-	union {
-		struct in_addr		v4;
-		struct in6_addr		v6;
-		u_int8_t		addr8[16];
-		u_int16_t		addr16[8];
-		uint32_t		addr32[4];
-	} pfa;		    /* 128-bit address */
-#define v4	pfa.v4
-#define v6	pfa.v6
-#define addr8	pfa.addr8
-#define addr16	pfa.addr16
-#define addr32	pfa.addr32
-};
-
-#define PFI_AFLAG_NETWORK	0x01
-#define PFI_AFLAG_BROADCAST	0x02
-#define PFI_AFLAG_PEER		0x04
-#define PFI_AFLAG_MODEMASK	0x07
-#define PFI_AFLAG_NOALIAS	0x08
-
-struct pf_addr_wrap {
-	union {
-		struct {
-			struct pf_addr		 addr;
-			struct pf_addr		 mask;
-		}			 a;
-		char			 ifname[IFNAMSIZ];
-		char			 tblname[PF_TABLE_NAME_SIZE];
-	}			 v;
-	union {
-		struct pfi_dynaddr	*dyn;
-		struct pfr_ktable	*tbl;
-		int			 dyncnt;
-		int			 tblcnt;
-	}			 p;
-	u_int8_t		 type;		/* PF_ADDR_* */
-	u_int8_t		 iflags;	/* PFI_AFLAG_* */
-};
-
-#ifdef _KERNEL
-
-struct pfi_dynaddr {
-	TAILQ_ENTRY(pfi_dynaddr)	 entry;
-	struct pf_addr			 pfid_addr4;
-	struct pf_addr			 pfid_mask4;
-	struct pf_addr			 pfid_addr6;
-	struct pf_addr			 pfid_mask6;
-	struct pfr_ktable		*pfid_kt;
-	struct pfi_kif			*pfid_kif;
-	int				 pfid_net;	/* mask or 128 */
-	int				 pfid_acnt4;	/* address count IPv4 */
-	int				 pfid_acnt6;	/* address count IPv6 */
-	sa_family_t			 pfid_af;	/* rule af */
-	u_int8_t			 pfid_iflags;	/* PFI_AFLAG_* */
-};
-
-/*
- * Address manipulation macros
- */
-#define	HTONL(x)	(x) = htonl((__uint32_t)(x))
-#define	HTONS(x)	(x) = htons((__uint16_t)(x))
-#define	NTOHL(x)	(x) = ntohl((__uint32_t)(x))
-#define	NTOHS(x)	(x) = ntohs((__uint16_t)(x))
-
-#define	PF_NAME		"pf"
-
-#define	PF_HASHROW_ASSERT(h)	mtx_assert(&(h)->lock, MA_OWNED)
-#define	PF_HASHROW_LOCK(h)	mtx_lock(&(h)->lock)
-#define	PF_HASHROW_UNLOCK(h)	mtx_unlock(&(h)->lock)
-
-#define	PF_STATE_LOCK(s)						\
-	do {								\
-		struct pf_idhash *_ih = &V_pf_idhash[PF_IDHASH(s)];	\
-		PF_HASHROW_LOCK(_ih);					\
-	} while (0)
-
-#define	PF_STATE_UNLOCK(s)						\
-	do {								\
-		struct pf_idhash *_ih = &V_pf_idhash[PF_IDHASH((s))];	\
-		PF_HASHROW_UNLOCK(_ih);					\
-	} while (0)
-
-#ifdef INVARIANTS
-#define	PF_STATE_LOCK_ASSERT(s)						\
-	do {								\
-		struct pf_idhash *_ih = &V_pf_idhash[PF_IDHASH(s)];	\
-		PF_HASHROW_ASSERT(_ih);					\
-	} while (0)
-#else /* !INVARIANTS */
-#define	PF_STATE_LOCK_ASSERT(s)		do {} while (0)
-#endif /* INVARIANTS */
-
-extern struct mtx pf_unlnkdrules_mtx;
-#define	PF_UNLNKDRULES_LOCK()	mtx_lock(&pf_unlnkdrules_mtx)
-#define	PF_UNLNKDRULES_UNLOCK()	mtx_unlock(&pf_unlnkdrules_mtx)
-
-extern struct rwlock pf_rules_lock;
-#define	PF_RULES_RLOCK()	rw_rlock(&pf_rules_lock)
-#define	PF_RULES_RUNLOCK()	rw_runlock(&pf_rules_lock)
-#define	PF_RULES_WLOCK()	rw_wlock(&pf_rules_lock)
-#define	PF_RULES_WUNLOCK()	rw_wunlock(&pf_rules_lock)
-#define	PF_RULES_ASSERT()	rw_assert(&pf_rules_lock, RA_LOCKED)
-#define	PF_RULES_RASSERT()	rw_assert(&pf_rules_lock, RA_RLOCKED)
-#define	PF_RULES_WASSERT()	rw_assert(&pf_rules_lock, RA_WLOCKED)
-
-#define	PF_MODVER	1
-#define	PFLOG_MODVER	1
-#define	PFSYNC_MODVER	1
-
-#define	PFLOG_MINVER	1
-#define	PFLOG_PREFVER	PFLOG_MODVER
-#define	PFLOG_MAXVER	1
-#define	PFSYNC_MINVER	1
-#define	PFSYNC_PREFVER	PFSYNC_MODVER
-#define	PFSYNC_MAXVER	1
-
-#ifdef INET
-#ifndef INET6
-#define	PF_INET_ONLY
-#endif /* ! INET6 */
-#endif /* INET */
-
-#ifdef INET6
-#ifndef INET
-#define	PF_INET6_ONLY
-#endif /* ! INET */
-#endif /* INET6 */
-
-#ifdef INET
-#ifdef INET6
-#define	PF_INET_INET6
-#endif /* INET6 */
-#endif /* INET */
-
-#else
-
-#define	PF_INET_INET6
-
-#endif /* _KERNEL */
-
-/* Both IPv4 and IPv6 */
-#ifdef PF_INET_INET6
-
-#define PF_AEQ(a, b, c) \
-	((c == AF_INET && (a)->addr32[0] == (b)->addr32[0]) || \
-	(c == AF_INET6 && (a)->addr32[3] == (b)->addr32[3] && \
-	(a)->addr32[2] == (b)->addr32[2] && \
-	(a)->addr32[1] == (b)->addr32[1] && \
-	(a)->addr32[0] == (b)->addr32[0])) \
-
-#define PF_ANEQ(a, b, c) \
-	((a)->addr32[0] != (b)->addr32[0] || \
-	(a)->addr32[1] != (b)->addr32[1] || \
-	(a)->addr32[2] != (b)->addr32[2] || \
-	(a)->addr32[3] != (b)->addr32[3]) \
-
-#define PF_AZERO(a, c) \
-	((c == AF_INET && !(a)->addr32[0]) || \
-	(c == AF_INET6 && !(a)->addr32[0] && !(a)->addr32[1] && \
-	!(a)->addr32[2] && !(a)->addr32[3] )) \
-
-#define PF_MATCHA(n, a, m, b, f) \
-	pf_match_addr(n, a, m, b, f)
-
-#define PF_ACPY(a, b, f) \
-	pf_addrcpy(a, b, f)
-
-#define PF_AINC(a, f) \
-	pf_addr_inc(a, f)
-
-#define PF_POOLMASK(a, b, c, d, f) \
-	pf_poolmask(a, b, c, d, f)
-
-#else
-
-/* Just IPv6 */
-
-#ifdef PF_INET6_ONLY
-
-#define PF_AEQ(a, b, c) \
-	((a)->addr32[3] == (b)->addr32[3] && \
-	(a)->addr32[2] == (b)->addr32[2] && \
-	(a)->addr32[1] == (b)->addr32[1] && \
-	(a)->addr32[0] == (b)->addr32[0]) \
-
-#define PF_ANEQ(a, b, c) \
-	((a)->addr32[3] != (b)->addr32[3] || \
-	(a)->addr32[2] != (b)->addr32[2] || \
-	(a)->addr32[1] != (b)->addr32[1] || \
-	(a)->addr32[0] != (b)->addr32[0]) \
-
-#define PF_AZERO(a, c) \
-	(!(a)->addr32[0] && \
-	!(a)->addr32[1] && \
-	!(a)->addr32[2] && \
-	!(a)->addr32[3] ) \
-
-#define PF_MATCHA(n, a, m, b, f) \
-	pf_match_addr(n, a, m, b, f)
-
-#define PF_ACPY(a, b, f) \
-	pf_addrcpy(a, b, f)
-
-#define PF_AINC(a, f) \
-	pf_addr_inc(a, f)
-
-#define PF_POOLMASK(a, b, c, d, f) \
-	pf_poolmask(a, b, c, d, f)
-
-#else
-
-/* Just IPv4 */
-#ifdef PF_INET_ONLY
-
-#define PF_AEQ(a, b, c) \
-	((a)->addr32[0] == (b)->addr32[0])
-
-#define PF_ANEQ(a, b, c) \
-	((a)->addr32[0] != (b)->addr32[0])
-
-#define PF_AZERO(a, c) \
-	(!(a)->addr32[0])
-
-#define PF_MATCHA(n, a, m, b, f) \
-	pf_match_addr(n, a, m, b, f)
-
-#define PF_ACPY(a, b, f) \
-	(a)->v4.s_addr = (b)->v4.s_addr
-
-#define PF_AINC(a, f) \
-	do { \
-		(a)->addr32[0] = htonl(ntohl((a)->addr32[0]) + 1); \
-	} while (0)
-
-#define PF_POOLMASK(a, b, c, d, f) \
-	do { \
-		(a)->addr32[0] = ((b)->addr32[0] & (c)->addr32[0]) | \
-		(((c)->addr32[0] ^ 0xffffffff ) & (d)->addr32[0]); \
-	} while (0)
-
-#endif /* PF_INET_ONLY */
-#endif /* PF_INET6_ONLY */
-#endif /* PF_INET_INET6 */
-
-/*
- * XXX callers not FIB-aware in our version of pf yet.
- * OpenBSD fixed it later it seems, 2010/05/07 13:33:16 claudio.
- */
-#define	PF_MISMATCHAW(aw, x, af, neg, ifp, rtid)			\
-	(								\
-		(((aw)->type == PF_ADDR_NOROUTE &&			\
-		    pf_routable((x), (af), NULL, (rtid))) ||		\
-		(((aw)->type == PF_ADDR_URPFFAILED && (ifp) != NULL &&	\
-		    pf_routable((x), (af), (ifp), (rtid))) ||		\
-		((aw)->type == PF_ADDR_TABLE &&				\
-		    !pfr_match_addr((aw)->p.tbl, (x), (af))) ||		\
-		((aw)->type == PF_ADDR_DYNIFTL &&			\
-		    !pfi_match_addr((aw)->p.dyn, (x), (af))) ||		\
-		((aw)->type == PF_ADDR_RANGE &&				\
-		    !pf_match_addr_range(&(aw)->v.a.addr,		\
-		    &(aw)->v.a.mask, (x), (af))) ||			\
-		((aw)->type == PF_ADDR_ADDRMASK &&			\
-		    !PF_AZERO(&(aw)->v.a.mask, (af)) &&			\
-		    !PF_MATCHA(0, &(aw)->v.a.addr,			\
-		    &(aw)->v.a.mask, (x), (af))))) !=			\
-		(neg)							\
-	)
-
-
-struct pf_rule_uid {
-	uid_t		 uid[2];
-	u_int8_t	 op;
-};
-
-struct pf_rule_gid {
-	uid_t		 gid[2];
-	u_int8_t	 op;
-};
-
-struct pf_rule_addr {
-	struct pf_addr_wrap	 addr;
-	u_int16_t		 port[2];
-	u_int8_t		 neg;
-	u_int8_t		 port_op;
-};
-
-struct pf_pooladdr {
-	struct pf_addr_wrap		 addr;
-	TAILQ_ENTRY(pf_pooladdr)	 entries;
-	char				 ifname[IFNAMSIZ];
-	struct pfi_kif			*kif;
-};
-
-TAILQ_HEAD(pf_palist, pf_pooladdr);
-
-struct pf_poolhashkey {
-	union {
-		u_int8_t		key8[16];
-		u_int16_t		key16[8];
-		uint32_t		key32[4];
-	} pfk;		    /* 128-bit hash key */
-#define key8	pfk.key8
-#define key16	pfk.key16
-#define key32	pfk.key32
-};
-
-struct pf_pool {
-	struct pf_palist	 list;
-	struct pf_pooladdr	*cur;
-	struct pf_poolhashkey	 key;
-	struct pf_addr		 counter;
-	int			 tblidx;
-	u_int16_t		 proxy_port[2];
-	u_int8_t		 opts;
-};
-
-
-/* A packed Operating System description for fingerprinting */
-typedef uint32_t pf_osfp_t;
-#define PF_OSFP_ANY	((pf_osfp_t)0)
-#define PF_OSFP_UNKNOWN	((pf_osfp_t)-1)
-#define PF_OSFP_NOMATCH	((pf_osfp_t)-2)
-
-struct pf_osfp_entry {
-	SLIST_ENTRY(pf_osfp_entry) fp_entry;
-	pf_osfp_t		fp_os;
-	int			fp_enflags;
-#define PF_OSFP_EXPANDED	0x001		/* expanded entry */
-#define PF_OSFP_GENERIC		0x002		/* generic signature */
-#define PF_OSFP_NODETAIL	0x004		/* no p0f details */
-#define PF_OSFP_LEN	32
-	char			fp_class_nm[PF_OSFP_LEN];
-	char			fp_version_nm[PF_OSFP_LEN];
-	char			fp_subtype_nm[PF_OSFP_LEN];
-};
-#define PF_OSFP_ENTRY_EQ(a, b) \
-    ((a)->fp_os == (b)->fp_os && \
-    memcmp((a)->fp_class_nm, (b)->fp_class_nm, PF_OSFP_LEN) == 0 && \
-    memcmp((a)->fp_version_nm, (b)->fp_version_nm, PF_OSFP_LEN) == 0 && \
-    memcmp((a)->fp_subtype_nm, (b)->fp_subtype_nm, PF_OSFP_LEN) == 0)
-
-/* handle pf_osfp_t packing */
-#define _FP_RESERVED_BIT	1  /* For the special negative #defines */
-#define _FP_UNUSED_BITS		1
-#define _FP_CLASS_BITS		10 /* OS Class (Windows, Linux) */
-#define _FP_VERSION_BITS	10 /* OS version (95, 98, NT, 2.4.54, 3.2) */
-#define _FP_SUBTYPE_BITS	10 /* patch level (NT SP4, SP3, ECN patch) */
-#define PF_OSFP_UNPACK(osfp, class, version, subtype) do { \
-	(class) = ((osfp) >> (_FP_VERSION_BITS+_FP_SUBTYPE_BITS)) & \
-	    ((1 << _FP_CLASS_BITS) - 1); \
-	(version) = ((osfp) >> _FP_SUBTYPE_BITS) & \
-	    ((1 << _FP_VERSION_BITS) - 1);\
-	(subtype) = (osfp) & ((1 << _FP_SUBTYPE_BITS) - 1); \
-} while(0)
-#define PF_OSFP_PACK(osfp, class, version, subtype) do { \
-	(osfp) = ((class) & ((1 << _FP_CLASS_BITS) - 1)) << (_FP_VERSION_BITS \
-	    + _FP_SUBTYPE_BITS); \
-	(osfp) |= ((version) & ((1 << _FP_VERSION_BITS) - 1)) << \
-	    _FP_SUBTYPE_BITS; \
-	(osfp) |= (subtype) & ((1 << _FP_SUBTYPE_BITS) - 1); \
-} while(0)
-
-/* the fingerprint of an OSes TCP SYN packet */
-typedef u_int64_t	pf_tcpopts_t;
-struct pf_os_fingerprint {
-	SLIST_HEAD(pf_osfp_enlist, pf_osfp_entry) fp_oses; /* list of matches */
-	pf_tcpopts_t		fp_tcpopts;	/* packed TCP options */
-	u_int16_t		fp_wsize;	/* TCP window size */
-	u_int16_t		fp_psize;	/* ip->ip_len */
-	u_int16_t		fp_mss;		/* TCP MSS */
-	u_int16_t		fp_flags;
-#define PF_OSFP_WSIZE_MOD	0x0001		/* Window modulus */
-#define PF_OSFP_WSIZE_DC	0x0002		/* Window don't care */
-#define PF_OSFP_WSIZE_MSS	0x0004		/* Window multiple of MSS */
-#define PF_OSFP_WSIZE_MTU	0x0008		/* Window multiple of MTU */
-#define PF_OSFP_PSIZE_MOD	0x0010		/* packet size modulus */
-#define PF_OSFP_PSIZE_DC	0x0020		/* packet size don't care */
-#define PF_OSFP_WSCALE		0x0040		/* TCP window scaling */
-#define PF_OSFP_WSCALE_MOD	0x0080		/* TCP window scale modulus */
-#define PF_OSFP_WSCALE_DC	0x0100		/* TCP window scale dont-care */
-#define PF_OSFP_MSS		0x0200		/* TCP MSS */
-#define PF_OSFP_MSS_MOD		0x0400		/* TCP MSS modulus */
-#define PF_OSFP_MSS_DC		0x0800		/* TCP MSS dont-care */
-#define PF_OSFP_DF		0x1000		/* IPv4 don't fragment bit */
-#define PF_OSFP_TS0		0x2000		/* Zero timestamp */
-#define PF_OSFP_INET6		0x4000		/* IPv6 */
-	u_int8_t		fp_optcnt;	/* TCP option count */
-	u_int8_t		fp_wscale;	/* TCP window scaling */
-	u_int8_t		fp_ttl;		/* IPv4 TTL */
-#define PF_OSFP_MAXTTL_OFFSET	40
-/* TCP options packing */
-#define PF_OSFP_TCPOPT_NOP	0x0		/* TCP NOP option */
-#define PF_OSFP_TCPOPT_WSCALE	0x1		/* TCP window scaling option */
-#define PF_OSFP_TCPOPT_MSS	0x2		/* TCP max segment size opt */
-#define PF_OSFP_TCPOPT_SACK	0x3		/* TCP SACK OK option */
-#define PF_OSFP_TCPOPT_TS	0x4		/* TCP timestamp option */
-#define PF_OSFP_TCPOPT_BITS	3		/* bits used by each option */
-#define PF_OSFP_MAX_OPTS \
-    (sizeof(((struct pf_os_fingerprint *)0)->fp_tcpopts) * 8) \
-    / PF_OSFP_TCPOPT_BITS
-
-	SLIST_ENTRY(pf_os_fingerprint)	fp_next;
-};
-
-struct pf_osfp_ioctl {
-	struct pf_osfp_entry	fp_os;
-	pf_tcpopts_t		fp_tcpopts;	/* packed TCP options */
-	u_int16_t		fp_wsize;	/* TCP window size */
-	u_int16_t		fp_psize;	/* ip->ip_len */
-	u_int16_t		fp_mss;		/* TCP MSS */
-	u_int16_t		fp_flags;
-	u_int8_t		fp_optcnt;	/* TCP option count */
-	u_int8_t		fp_wscale;	/* TCP window scaling */
-	u_int8_t		fp_ttl;		/* IPv4 TTL */
-
-	int			fp_getnum;	/* DIOCOSFPGET number */
-};
-
-
-union pf_rule_ptr {
-	struct pf_rule		*ptr;
-	uint32_t		 nr;
-};
-
-#define	PF_ANCHOR_NAME_SIZE	 64
-
-struct pf_rule {
-	struct pf_rule_addr	 src;
-	struct pf_rule_addr	 dst;
-#define PF_SKIP_IFP		0
-#define PF_SKIP_DIR		1
-#define PF_SKIP_AF		2
-#define PF_SKIP_PROTO		3
-#define PF_SKIP_SRC_ADDR	4
-#define PF_SKIP_SRC_PORT	5
-#define PF_SKIP_DST_ADDR	6
-#define PF_SKIP_DST_PORT	7
-#define PF_SKIP_COUNT		8
-	union pf_rule_ptr	 skip[PF_SKIP_COUNT];
-#define PF_RULE_LABEL_SIZE	 64
-	char			 label[PF_RULE_LABEL_SIZE];
-	char			 ifname[IFNAMSIZ];
-	char			 qname[PF_QNAME_SIZE];
-	char			 pqname[PF_QNAME_SIZE];
-#define	PF_TAG_NAME_SIZE	 64
-	char			 tagname[PF_TAG_NAME_SIZE];
-	char			 match_tagname[PF_TAG_NAME_SIZE];
-
-	char			 overload_tblname[PF_TABLE_NAME_SIZE];
-
-	TAILQ_ENTRY(pf_rule)	 entries;
-	struct pf_pool		 rpool;
-
-	u_int64_t		 evaluations;
-	u_int64_t		 packets[2];
-	u_int64_t		 bytes[2];
-
-	struct pfi_kif		*kif;
-	struct pf_anchor	*anchor;
-	struct pfr_ktable	*overload_tbl;
-
-	pf_osfp_t		 os_fingerprint;
-
-	int			 rtableid;
-	uint32_t		 timeout[PFTM_MAX];
-	uint32_t		 max_states;
-	uint32_t		 max_src_nodes;
-	uint32_t		 max_src_states;
-	uint32_t		 max_src_conn;
-	struct {
-		uint32_t		limit;
-		uint32_t		seconds;
-	}			 max_src_conn_rate;
-	uint32_t		 qid;
-	uint32_t		 pqid;
-	uint32_t		 rt_listid;
-	uint32_t		 nr;
-	uint32_t		 prob;
-	uid_t			 cuid;
-	pid_t			 cpid;
-
-	counter_u64_t		 states_cur;
-	counter_u64_t		 states_tot;
-	counter_u64_t		 src_nodes;
-
-	u_int16_t		 return_icmp;
-	u_int16_t		 return_icmp6;
-	u_int16_t		 max_mss;
-	u_int16_t		 tag;
-	u_int16_t		 match_tag;
-	u_int16_t		 spare2;			/* netgraph */
-
-	struct pf_rule_uid	 uid;
-	struct pf_rule_gid	 gid;
-
-	uint32_t		 rule_flag;
-	u_int8_t		 action;
-	u_int8_t		 direction;
-	u_int8_t		 log;
-	u_int8_t		 logif;
-	u_int8_t		 quick;
-	u_int8_t		 ifnot;
-	u_int8_t		 match_tag_not;
-	u_int8_t		 natpass;
-
-#define PF_STATE_NORMAL		0x1
-#define PF_STATE_MODULATE	0x2
-#define PF_STATE_SYNPROXY	0x3
-	u_int8_t		 keep_state;
-	sa_family_t		 af;
-	u_int8_t		 proto;
-	u_int8_t		 type;
-	u_int8_t		 code;
-	u_int8_t		 flags;
-	u_int8_t		 flagset;
-	u_int8_t		 min_ttl;
-	u_int8_t		 allow_opts;
-	u_int8_t		 rt;
-	u_int8_t		 return_ttl;
-	u_int8_t		 tos;
-	u_int8_t		 set_tos;
-	u_int8_t		 anchor_relative;
-	u_int8_t		 anchor_wildcard;
-
-#define PF_FLUSH		0x01
-#define PF_FLUSH_GLOBAL		0x02
-	u_int8_t		 flush;
-
-	struct {
-		struct pf_addr		addr;
-		u_int16_t		port;
-	}			divert;
-
-	uint64_t		 u_states_cur;
-	uint64_t		 u_states_tot;
-	uint64_t		 u_src_nodes;
-};
-
-/* rule flags */
-#define	PFRULE_DROP		0x0000
-#define	PFRULE_RETURNRST	0x0001
-#define	PFRULE_FRAGMENT		0x0002
-#define	PFRULE_RETURNICMP	0x0004
-#define	PFRULE_RETURN		0x0008
-#define	PFRULE_NOSYNC		0x0010
-#define PFRULE_SRCTRACK		0x0020  /* track source states */
-#define PFRULE_RULESRCTRACK	0x0040  /* per rule */
-#define	PFRULE_REFS		0x0080	/* rule has references */
-
-/* scrub flags */
-#define	PFRULE_NODF		0x0100
-#define	PFRULE_FRAGCROP		0x0200	/* non-buffering frag cache */
-#define	PFRULE_FRAGDROP		0x0400	/* drop funny fragments */
-#define PFRULE_RANDOMID		0x0800
-#define PFRULE_REASSEMBLE_TCP	0x1000
-#define PFRULE_SET_TOS		0x2000
-
-/* rule flags again */
-#define PFRULE_IFBOUND		0x00010000	/* if-bound */
-#define PFRULE_STATESLOPPY	0x00020000	/* sloppy state tracking */
-
-#define PFSTATE_HIWAT		10000	/* default state table size */
-#define PFSTATE_ADAPT_START	6000	/* default adaptive timeout start */
-#define PFSTATE_ADAPT_END	12000	/* default adaptive timeout end */
-
-
-struct pf_threshold {
-	uint32_t	limit;
-#define	PF_THRESHOLD_MULT	1000
-#define PF_THRESHOLD_MAX	0xffffffff / PF_THRESHOLD_MULT
-	uint32_t	seconds;
-	uint32_t	count;
-	uint32_t	last;
-};
-
-struct pf_src_node {
-	LIST_ENTRY(pf_src_node) entry;
-	struct pf_addr	 addr;
-	struct pf_addr	 raddr;
-	union pf_rule_ptr rule;
-	struct pfi_kif	*kif;
-	u_int64_t	 bytes[2];
-	u_int64_t	 packets[2];
-	uint32_t	 states;
-	uint32_t	 conn;
-	struct pf_threshold	conn_rate;
-	uint32_t	 creation;
-	uint32_t	 expire;
-	sa_family_t	 af;
-	u_int8_t	 ruletype;
-};
-
-#define PFSNODE_HIWAT		10000	/* default source node table size */
-
-struct pf_state_scrub {
-	struct timeval	pfss_last;	/* time received last packet	*/
-	uint32_t	pfss_tsecr;	/* last echoed timestamp	*/
-	uint32_t	pfss_tsval;	/* largest timestamp		*/
-	uint32_t	pfss_tsval0;	/* original timestamp		*/
-	u_int16_t	pfss_flags;
-#define PFSS_TIMESTAMP	0x0001		/* modulate timestamp		*/
-#define PFSS_PAWS	0x0010		/* stricter PAWS checks		*/
-#define PFSS_PAWS_IDLED	0x0020		/* was idle too long.  no PAWS	*/
-#define PFSS_DATA_TS	0x0040		/* timestamp on data packets	*/
-#define PFSS_DATA_NOTS	0x0080		/* no timestamp on data packets	*/
-	u_int8_t	pfss_ttl;	/* stashed TTL			*/
-	u_int8_t	pad;
-	uint32_t	pfss_ts_mod;	/* timestamp modulation		*/
-};
-
-struct pf_state_host {
-	struct pf_addr	addr;
-	u_int16_t	port;
-	u_int16_t	pad;
-};
-
-struct pf_state_peer {
-	struct pf_state_scrub	*scrub;	/* state is scrubbed		*/
-	uint32_t	seqlo;		/* Max sequence number sent	*/
-	uint32_t	seqhi;		/* Max the other end ACKd + win	*/
-	uint32_t	seqdiff;	/* Sequence number modulator	*/
-	u_int16_t	max_win;	/* largest window (pre scaling)	*/
-	u_int16_t	mss;		/* Maximum segment size option	*/
-	u_int8_t	state;		/* active state level		*/
-	u_int8_t	wscale;		/* window scaling factor	*/
-	u_int8_t	tcp_est;	/* Did we reach TCPS_ESTABLISHED */
-	u_int8_t	pad[1];
-};
-
-/* Keep synced with struct pf_state_key. */
-struct pf_state_key_cmp {
-	struct pf_addr	 addr[2];
-	u_int16_t	 port[2];
-	sa_family_t	 af;
-	u_int8_t	 proto;
-	u_int8_t	 pad[2];
-};
-
-struct pf_state_key {
-	struct pf_addr	 addr[2];
-	u_int16_t	 port[2];
-	sa_family_t	 af;
-	u_int8_t	 proto;
-	u_int8_t	 pad[2];
-
-	LIST_ENTRY(pf_state_key) entry;
-	TAILQ_HEAD(, pf_state)	 states[2];
-};
-
-/* Keep synced with struct pf_state. */
-struct pf_state_cmp {
-	u_int64_t		 id;
-	uint32_t		 creatorid;
-	u_int8_t		 direction;
-	u_int8_t		 pad[3];
-};
-
-struct pf_state {
-	u_int64_t		 id;
-	uint32_t		 creatorid;
-	u_int8_t		 direction;
-	u_int8_t		 pad[3];
-
-	u_int			 refs;
-	TAILQ_ENTRY(pf_state)	 sync_list;
-	TAILQ_ENTRY(pf_state)	 key_list[2];
-	LIST_ENTRY(pf_state)	 entry;
-	struct pf_state_peer	 src;
-	struct pf_state_peer	 dst;
-	union pf_rule_ptr	 rule;
-	union pf_rule_ptr	 anchor;
-	union pf_rule_ptr	 nat_rule;
-	struct pf_addr		 rt_addr;
-	struct pf_state_key	*key[2];	/* addresses stack and wire  */
-	struct pfi_kif		*kif;
-	struct pfi_kif		*rt_kif;
-	struct pf_src_node	*src_node;
-	struct pf_src_node	*nat_src_node;
-	u_int64_t		 packets[2];
-	u_int64_t		 bytes[2];
-	uint32_t		 creation;
-	uint32_t	 	 expire;
-	uint32_t		 pfsync_time;
-	u_int16_t		 tag;
-	u_int8_t		 log;
-	u_int8_t		 state_flags;
-#define	PFSTATE_ALLOWOPTS	0x01
-#define	PFSTATE_SLOPPY		0x02
-/*  was	PFSTATE_PFLOW		0x04 */
-#define	PFSTATE_NOSYNC		0x08
-#define	PFSTATE_ACK		0x10
-	u_int8_t		 timeout;
-	u_int8_t		 sync_state; /* PFSYNC_S_x */
-
-	/* XXX */
-	u_int8_t		 sync_updates;
-	u_int8_t		_tail[3];
-};
-
-/*
- * Unified state structures for pulling states out of the kernel
- * used by pfsync(4) and the pf(4) ioctl.
- */
-struct pfsync_state_scrub {
-	u_int16_t	pfss_flags;
-	u_int8_t	pfss_ttl;	/* stashed TTL		*/
-#define PFSYNC_SCRUB_FLAG_VALID		0x01
-	u_int8_t	scrub_flag;
-	uint32_t	pfss_ts_mod;	/* timestamp modulation	*/
-} __packed;
-
-struct pfsync_state_peer {
-	struct pfsync_state_scrub scrub;	/* state is scrubbed	*/
-	uint32_t	seqlo;		/* Max sequence number sent	*/
-	uint32_t	seqhi;		/* Max the other end ACKd + win	*/
-	uint32_t	seqdiff;	/* Sequence number modulator	*/
-	u_int16_t	max_win;	/* largest window (pre scaling)	*/
-	u_int16_t	mss;		/* Maximum segment size option	*/
-	u_int8_t	state;		/* active state level		*/
-	u_int8_t	wscale;		/* window scaling factor	*/
-	u_int8_t	pad[6];
-} __packed;
-
-struct pfsync_state_key {
-	struct pf_addr	 addr[2];
-	u_int16_t	 port[2];
-};
-
-struct pfsync_state {
-	u_int64_t	 id;
-	char		 ifname[IFNAMSIZ];
-	struct pfsync_state_key	key[2];
-	struct pfsync_state_peer src;
-	struct pfsync_state_peer dst;
-	struct pf_addr	 rt_addr;
-	uint32_t	 rule;
-	uint32_t	 anchor;
-	uint32_t	 nat_rule;
-	uint32_t	 creation;
-	uint32_t	 expire;
-	uint32_t	 packets[2][2];
-	uint32_t	 bytes[2][2];
-	uint32_t	 creatorid;
-	sa_family_t	 af;
-	u_int8_t	 proto;
-	u_int8_t	 direction;
-	u_int8_t	 __spare[2];
-	u_int8_t	 log;
-	u_int8_t	 state_flags;
-	u_int8_t	 timeout;
-	u_int8_t	 sync_flags;
-	u_int8_t	 updates;
-} __packed;
-
-#ifdef _KERNEL
-/* pfsync */
-typedef int		pfsync_state_import_t(struct pfsync_state *, u_int8_t);
-typedef	void		pfsync_insert_state_t(struct pf_state *);
-typedef	void		pfsync_update_state_t(struct pf_state *);
-typedef	void		pfsync_delete_state_t(struct pf_state *);
-typedef void		pfsync_clear_states_t(uint32_t, const char *);
-typedef int		pfsync_defer_t(struct pf_state *, struct mbuf *);
-
-extern pfsync_state_import_t	*pfsync_state_import_ptr;
-extern pfsync_insert_state_t	*pfsync_insert_state_ptr;
-extern pfsync_update_state_t	*pfsync_update_state_ptr;
-extern pfsync_delete_state_t	*pfsync_delete_state_ptr;
-extern pfsync_clear_states_t	*pfsync_clear_states_ptr;
-extern pfsync_defer_t		*pfsync_defer_ptr;
-
-void			pfsync_state_export(struct pfsync_state *,
-			    struct pf_state *);
-
-/* pflog */
-struct pf_ruleset;
-struct pf_pdesc;
-typedef int pflog_packet_t(struct pfi_kif *, struct mbuf *, sa_family_t,
-    u_int8_t, u_int8_t, struct pf_rule *, struct pf_rule *,
-    struct pf_ruleset *, struct pf_pdesc *, int);
-extern pflog_packet_t		*pflog_packet_ptr;
-
-#define	V_pf_end_threads	VNET(pf_end_threads)
-#endif /* _KERNEL */
-
-#define	PFSYNC_FLAG_SRCNODE	0x04
-#define	PFSYNC_FLAG_NATSRCNODE	0x08
-
-/* for copies to/from network byte order */
-/* ioctl interface also uses network byte order */
-#define pf_state_peer_hton(s,d) do {		\
-	(d)->seqlo = htonl((s)->seqlo);		\
-	(d)->seqhi = htonl((s)->seqhi);		\
-	(d)->seqdiff = htonl((s)->seqdiff);	\
-	(d)->max_win = htons((s)->max_win);	\
-	(d)->mss = htons((s)->mss);		\
-	(d)->state = (s)->state;		\
-	(d)->wscale = (s)->wscale;		\
-	if ((s)->scrub) {						\
-		(d)->scrub.pfss_flags = 				\
-		    htons((s)->scrub->pfss_flags & PFSS_TIMESTAMP);	\
-		(d)->scrub.pfss_ttl = (s)->scrub->pfss_ttl;		\
-		(d)->scrub.pfss_ts_mod = htonl((s)->scrub->pfss_ts_mod);\
-		(d)->scrub.scrub_flag = PFSYNC_SCRUB_FLAG_VALID;	\
-	}								\
-} while (0)
-
-#define pf_state_peer_ntoh(s,d) do {		\
-	(d)->seqlo = ntohl((s)->seqlo);		\
-	(d)->seqhi = ntohl((s)->seqhi);		\
-	(d)->seqdiff = ntohl((s)->seqdiff);	\
-	(d)->max_win = ntohs((s)->max_win);	\
-	(d)->mss = ntohs((s)->mss);		\
-	(d)->state = (s)->state;		\
-	(d)->wscale = (s)->wscale;		\
-	if ((s)->scrub.scrub_flag == PFSYNC_SCRUB_FLAG_VALID && 	\
-	    (d)->scrub != NULL) {					\
-		(d)->scrub->pfss_flags =				\
-		    ntohs((s)->scrub.pfss_flags) & PFSS_TIMESTAMP;	\
-		(d)->scrub->pfss_ttl = (s)->scrub.pfss_ttl;		\
-		(d)->scrub->pfss_ts_mod = ntohl((s)->scrub.pfss_ts_mod);\
-	}								\
-} while (0)
-
-#define pf_state_counter_hton(s,d) do {				\
-	d[0] = htonl((s>>32)&0xffffffff);			\
-	d[1] = htonl(s&0xffffffff);				\
-} while (0)
-
-#define pf_state_counter_from_pfsync(s)				\
-	(((u_int64_t)(s[0])<<32) | (u_int64_t)(s[1]))
-
-#define pf_state_counter_ntoh(s,d) do {				\
-	d = ntohl(s[0]);					\
-	d = d<<32;						\
-	d += ntohl(s[1]);					\
-} while (0)
-
-TAILQ_HEAD(pf_rulequeue, pf_rule);
-
-struct pf_anchor;
-
-struct pf_ruleset {
-	struct {
-		struct pf_rulequeue	 queues[2];
-		struct {
-			struct pf_rulequeue	*ptr;
-			struct pf_rule		**ptr_array;
-			uint32_t		 rcount;
-			uint32_t		 ticket;
-			int			 open;
-		}			 active, inactive;
-	}			 rules[PF_RULESET_MAX];
-	struct pf_anchor	*anchor;
-	uint32_t		 tticket;
-	int			 tables;
-	int			 topen;
-};
-
-RB_HEAD(pf_anchor_global, pf_anchor);
-RB_HEAD(pf_anchor_node, pf_anchor);
-struct pf_anchor {
-	RB_ENTRY(pf_anchor)	 entry_global;
-	RB_ENTRY(pf_anchor)	 entry_node;
-	struct pf_anchor	*parent;
-	struct pf_anchor_node	 children;
-	char			 name[PF_ANCHOR_NAME_SIZE];
-	char			 path[MAXPATHLEN];
-	struct pf_ruleset	 ruleset;
-	int			 refcnt;	/* anchor rules */
-	int			 match;	/* XXX: used for pfctl black magic */
-};
-RB_PROTOTYPE(pf_anchor_global, pf_anchor, entry_global, pf_anchor_compare);
-RB_PROTOTYPE(pf_anchor_node, pf_anchor, entry_node, pf_anchor_compare);
-
-#define PF_RESERVED_ANCHOR	"_pf"
-
-#define PFR_TFLAG_PERSIST	0x00000001
-#define PFR_TFLAG_CONST		0x00000002
-#define PFR_TFLAG_ACTIVE	0x00000004
-#define PFR_TFLAG_INACTIVE	0x00000008
-#define PFR_TFLAG_REFERENCED	0x00000010
-#define PFR_TFLAG_REFDANCHOR	0x00000020
-#define PFR_TFLAG_COUNTERS	0x00000040
-/* Adjust masks below when adding flags. */
-#define PFR_TFLAG_USRMASK	(PFR_TFLAG_PERSIST	| \
-				 PFR_TFLAG_CONST	| \
-				 PFR_TFLAG_COUNTERS)
-#define PFR_TFLAG_SETMASK	(PFR_TFLAG_ACTIVE	| \
-				 PFR_TFLAG_INACTIVE	| \
-				 PFR_TFLAG_REFERENCED	| \
-				 PFR_TFLAG_REFDANCHOR)
-#define PFR_TFLAG_ALLMASK	(PFR_TFLAG_PERSIST	| \
-				 PFR_TFLAG_CONST	| \
-				 PFR_TFLAG_ACTIVE	| \
-				 PFR_TFLAG_INACTIVE	| \
-				 PFR_TFLAG_REFERENCED	| \
-				 PFR_TFLAG_REFDANCHOR	| \
-				 PFR_TFLAG_COUNTERS)
-
-struct pf_anchor_stackframe;
-
-struct pfr_table {
-	char			 pfrt_anchor[MAXPATHLEN];
-	char			 pfrt_name[PF_TABLE_NAME_SIZE];
-	uint32_t		 pfrt_flags;
-	u_int8_t		 pfrt_fback;
-};
-
-enum { PFR_FB_NONE, PFR_FB_MATCH, PFR_FB_ADDED, PFR_FB_DELETED,
-	PFR_FB_CHANGED, PFR_FB_CLEARED, PFR_FB_DUPLICATE,
-	PFR_FB_NOTMATCH, PFR_FB_CONFLICT, PFR_FB_NOCOUNT, PFR_FB_MAX };
-
-struct pfr_addr {
-	union {
-		struct in_addr	 _pfra_ip4addr;
-		struct in6_addr	 _pfra_ip6addr;
-	}		 pfra_u;
-	u_int8_t	 pfra_af;
-	u_int8_t	 pfra_net;
-	u_int8_t	 pfra_not;
-	u_int8_t	 pfra_fback;
-};
-#define	pfra_ip4addr	pfra_u._pfra_ip4addr
-#define	pfra_ip6addr	pfra_u._pfra_ip6addr
-
-enum { PFR_DIR_IN, PFR_DIR_OUT, PFR_DIR_MAX };
-enum { PFR_OP_BLOCK, PFR_OP_PASS, PFR_OP_ADDR_MAX, PFR_OP_TABLE_MAX };
-#define PFR_OP_XPASS	PFR_OP_ADDR_MAX
-
-struct pfr_astats {
-	struct pfr_addr	 pfras_a;
-	u_int64_t	 pfras_packets[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
-	u_int64_t	 pfras_bytes[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
-	long		 pfras_tzero;
-};
-
-enum { PFR_REFCNT_RULE, PFR_REFCNT_ANCHOR, PFR_REFCNT_MAX };
-
-struct pfr_tstats {
-	struct pfr_table pfrts_t;
-	u_int64_t	 pfrts_packets[PFR_DIR_MAX][PFR_OP_TABLE_MAX];
-	u_int64_t	 pfrts_bytes[PFR_DIR_MAX][PFR_OP_TABLE_MAX];
-	u_int64_t	 pfrts_match;
-	u_int64_t	 pfrts_nomatch;
-	long		 pfrts_tzero;
-	int		 pfrts_cnt;
-	int		 pfrts_refcnt[PFR_REFCNT_MAX];
-};
-#define	pfrts_name	pfrts_t.pfrt_name
-#define pfrts_flags	pfrts_t.pfrt_flags
-
-#ifndef _SOCKADDR_UNION_DEFINED
-#define	_SOCKADDR_UNION_DEFINED
-union sockaddr_union {
-	struct sockaddr		sa;
-	struct sockaddr_in	sin;
-	struct sockaddr_in6	sin6;
-};
-#endif /* _SOCKADDR_UNION_DEFINED */
-
-struct pfr_kcounters {
-	u_int64_t		 pfrkc_packets[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
-	u_int64_t		 pfrkc_bytes[PFR_DIR_MAX][PFR_OP_ADDR_MAX];
-};
-
-SLIST_HEAD(pfr_kentryworkq, pfr_kentry);
-struct pfr_kentry {
-	struct radix_node	 pfrke_node[2];
-	union sockaddr_union	 pfrke_sa;
-	SLIST_ENTRY(pfr_kentry)	 pfrke_workq;
-	struct pfr_kcounters	*pfrke_counters;
-	long			 pfrke_tzero;
-	u_int8_t		 pfrke_af;
-	u_int8_t		 pfrke_net;
-	u_int8_t		 pfrke_not;
-	u_int8_t		 pfrke_mark;
-};
-
-SLIST_HEAD(pfr_ktableworkq, pfr_ktable);
-RB_HEAD(pfr_ktablehead, pfr_ktable);
-struct pfr_ktable {
-	struct pfr_tstats	 pfrkt_ts;
-	RB_ENTRY(pfr_ktable)	 pfrkt_tree;
-	SLIST_ENTRY(pfr_ktable)	 pfrkt_workq;
-	struct radix_node_head	*pfrkt_ip4;
-	struct radix_node_head	*pfrkt_ip6;
-	struct pfr_ktable	*pfrkt_shadow;
-	struct pfr_ktable	*pfrkt_root;
-	struct pf_ruleset	*pfrkt_rs;
-	long			 pfrkt_larg;
-	int			 pfrkt_nflags;
-};
-#define pfrkt_t		pfrkt_ts.pfrts_t
-#define pfrkt_name	pfrkt_t.pfrt_name
-#define pfrkt_anchor	pfrkt_t.pfrt_anchor
-#define pfrkt_ruleset	pfrkt_t.pfrt_ruleset
-#define pfrkt_flags	pfrkt_t.pfrt_flags
-#define pfrkt_cnt	pfrkt_ts.pfrts_cnt
-#define pfrkt_refcnt	pfrkt_ts.pfrts_refcnt
-#define pfrkt_packets	pfrkt_ts.pfrts_packets
-#define pfrkt_bytes	pfrkt_ts.pfrts_bytes
-#define pfrkt_match	pfrkt_ts.pfrts_match
-#define pfrkt_nomatch	pfrkt_ts.pfrts_nomatch
-#define pfrkt_tzero	pfrkt_ts.pfrts_tzero
-
-/* keep synced with pfi_kif, used in RB_FIND */
-struct pfi_kif_cmp {
-	char				 pfik_name[IFNAMSIZ];
-};
-
-struct pfi_kif {
-	char				 pfik_name[IFNAMSIZ];
-	union {
-		RB_ENTRY(pfi_kif)	 _pfik_tree;
-		LIST_ENTRY(pfi_kif)	 _pfik_list;
-	} _pfik_glue;
-#define	pfik_tree	_pfik_glue._pfik_tree
-#define	pfik_list	_pfik_glue._pfik_list
-	u_int64_t			 pfik_packets[2][2][2];
-	u_int64_t			 pfik_bytes[2][2][2];
-	uint32_t			 pfik_tzero;
-	u_int				 pfik_flags;
-	struct ifnet			*pfik_ifp;
-	struct ifg_group		*pfik_group;
-	u_int				 pfik_rulerefs;
-	TAILQ_HEAD(, pfi_dynaddr)	 pfik_dynaddrs;
-};
-
-#define	PFI_IFLAG_REFS		0x0001	/* has state references */
-#define PFI_IFLAG_SKIP		0x0100	/* skip filtering on interface */
-
-struct pf_pdesc {
-	struct {
-		int	 done;
-		uid_t	 uid;
-		gid_t	 gid;
-	}		 lookup;
-	u_int64_t	 tot_len;	/* Make Mickey money */
-	union {
-		struct tcphdr		*tcp;
-		struct udphdr		*udp;
-		struct icmp		*icmp;
-#ifdef INET6
-		struct icmp6_hdr	*icmp6;
-#endif /* INET6 */
-		void			*any;
-	} hdr;
-
-	struct pf_rule	*nat_rule;	/* nat/rdr rule applied to packet */
-	struct pf_addr	*src;		/* src address */
-	struct pf_addr	*dst;		/* dst address */
-	u_int16_t *sport;
-	u_int16_t *dport;
-	struct pf_mtag	*pf_mtag;
-
-	uint32_t	 p_len;		/* total length of payload */
-
-	u_int16_t	*ip_sum;
-	u_int16_t	*proto_sum;
-	u_int16_t	 flags;		/* Let SCRUB trigger behavior in
-					 * state code. Easier than tags */
-#define PFDESC_TCP_NORM	0x0001		/* TCP shall be statefully scrubbed */
-#define PFDESC_IP_REAS	0x0002		/* IP frags would've been reassembled */
-	sa_family_t	 af;
-	u_int8_t	 proto;
-	u_int8_t	 tos;
-	u_int8_t	 dir;		/* direction */
-	u_int8_t	 sidx;		/* key index for source */
-	u_int8_t	 didx;		/* key index for destination */
-};
-
-/* flags for RDR options */
-#define PF_DPORT_RANGE	0x01		/* Dest port uses range */
-#define PF_RPORT_RANGE	0x02		/* RDR'ed port uses range */
-
-/* UDP state enumeration */
-#define PFUDPS_NO_TRAFFIC	0
-#define PFUDPS_SINGLE		1
-#define PFUDPS_MULTIPLE		2
-
-#define PFUDPS_NSTATES		3	/* number of state levels */
-
-#define PFUDPS_NAMES { \
-	"NO_TRAFFIC", \
-	"SINGLE", \
-	"MULTIPLE", \
-	NULL \
-}
-
-/* Other protocol state enumeration */
-#define PFOTHERS_NO_TRAFFIC	0
-#define PFOTHERS_SINGLE		1
-#define PFOTHERS_MULTIPLE	2
-
-#define PFOTHERS_NSTATES	3	/* number of state levels */
-
-#define PFOTHERS_NAMES { \
-	"NO_TRAFFIC", \
-	"SINGLE", \
-	"MULTIPLE", \
-	NULL \
-}
-
-#define ACTION_SET(a, x) \
-	do { \
-		if ((a) != NULL) \
-			*(a) = (x); \
-	} while (0)
-
-#define REASON_SET(a, x) \
-	do { \
-		if ((a) != NULL) \
-			*(a) = (x); \
-		if (x < PFRES_MAX) \
-			counter_u64_add(V_pf_status.counters[x], 1); \
-	} while (0)
-
-struct pf_kstatus {
-	counter_u64_t	counters[PFRES_MAX]; /* reason for passing/dropping */
-	counter_u64_t	lcounters[LCNT_MAX]; /* limit counters */
-	counter_u64_t	fcounters[FCNT_MAX]; /* state operation counters */
-	counter_u64_t	scounters[SCNT_MAX]; /* src_node operation counters */
-	uint32_t	states;
-	uint32_t	src_nodes;
-	uint32_t	running;
-	uint32_t	since;
-	uint32_t	debug;
-	uint32_t	hostid;
-	char		ifname[IFNAMSIZ];
-	uint8_t		pf_chksum[PF_MD5_DIGEST_LENGTH];
-};
-
-struct pf_divert {
-	union {
-		struct in_addr	ipv4;
-		struct in6_addr	ipv6;
-	}		addr;
-	u_int16_t	port;
-};
-
-#define PFFRAG_FRENT_HIWAT	5000	/* Number of fragment entries */
-#define PFR_KENTRY_HIWAT	200000	/* Number of table entries */
-
-/*
- * ioctl parameter structures
- */
-
-struct pfioc_pooladdr {
-	uint32_t		 action;
-	uint32_t		 ticket;
-	uint32_t		 nr;
-	uint32_t		 r_num;
-	u_int8_t		 r_action;
-	u_int8_t		 r_last;
-	u_int8_t		 af;
-	char			 anchor[MAXPATHLEN];
-	struct pf_pooladdr	 addr;
-};
-
-struct pfioc_rule {
-	uint32_t	 action;
-	uint32_t	 ticket;
-	uint32_t	 pool_ticket;
-	uint32_t	 nr;
-	char		 anchor[MAXPATHLEN];
-	char		 anchor_call[MAXPATHLEN];
-	struct pf_rule	 rule;
-};
-
-struct pfioc_natlook {
-	struct pf_addr	 saddr;
-	struct pf_addr	 daddr;
-	struct pf_addr	 rsaddr;
-	struct pf_addr	 rdaddr;
-	u_int16_t	 sport;
-	u_int16_t	 dport;
-	u_int16_t	 rsport;
-	u_int16_t	 rdport;
-	sa_family_t	 af;
-	u_int8_t	 proto;
-	u_int8_t	 direction;
-};
-
-struct pfioc_state {
-	struct pfsync_state	state;
-};
-
-struct pfioc_src_node_kill {
-	sa_family_t psnk_af;
-	struct pf_rule_addr psnk_src;
-	struct pf_rule_addr psnk_dst;
-	u_int		    psnk_killed;
-};
-
-struct pfioc_state_kill {
-	struct pf_state_cmp	psk_pfcmp;
-	sa_family_t		psk_af;
-	int			psk_proto;
-	struct pf_rule_addr	psk_src;
-	struct pf_rule_addr	psk_dst;
-	char			psk_ifname[IFNAMSIZ];
-	char			psk_label[PF_RULE_LABEL_SIZE];
-	u_int			psk_killed;
-};
-
-struct pfioc_states {
-	int	ps_len;
-	union {
-		caddr_t			 psu_buf;
-		struct pfsync_state	*psu_states;
-	} ps_u;
-#define ps_buf		ps_u.psu_buf
-#define ps_states	ps_u.psu_states
-};
-
-struct pfioc_src_nodes {
-	int	psn_len;
-	union {
-		caddr_t		 psu_buf;
-		struct pf_src_node	*psu_src_nodes;
-	} psn_u;
-#define psn_buf		psn_u.psu_buf
-#define psn_src_nodes	psn_u.psu_src_nodes
-};
-
-struct pfioc_if {
-	char		 ifname[IFNAMSIZ];
-};
-
-struct pfioc_tm {
-	int		 timeout;
-	int		 seconds;
-};
-
-struct pfioc_limit {
-	int		 index;
-	unsigned	 limit;
-};
-
-struct pfioc_altq {
-	uint32_t	 action;
-	uint32_t	 ticket;
-	uint32_t	 nr;
-	struct pf_altq	 altq;
-};
-
-struct pfioc_qstats {
-	uint32_t	 ticket;
-	uint32_t	 nr;
-	void		*buf;
-	int		 nbytes;
-	u_int8_t	 scheduler;
-};
-
-struct pfioc_ruleset {
-	uint32_t	 nr;
-	char		 path[MAXPATHLEN];
-	char		 name[PF_ANCHOR_NAME_SIZE];
-};
-
-#define PF_RULESET_ALTQ		(PF_RULESET_MAX)
-#define PF_RULESET_TABLE	(PF_RULESET_MAX+1)
-struct pfioc_trans {
-	int		 size;	/* number of elements */
-	int		 esize; /* size of each element in bytes */
-	struct pfioc_trans_e {
-		int		rs_num;
-		char		anchor[MAXPATHLEN];
-		uint32_t	ticket;
-	}		*array;
-};
-
-#define PFR_FLAG_ATOMIC		0x00000001	/* unused */
-#define PFR_FLAG_DUMMY		0x00000002
-#define PFR_FLAG_FEEDBACK	0x00000004
-#define PFR_FLAG_CLSTATS	0x00000008
-#define PFR_FLAG_ADDRSTOO	0x00000010
-#define PFR_FLAG_REPLACE	0x00000020
-#define PFR_FLAG_ALLRSETS	0x00000040
-#define PFR_FLAG_ALLMASK	0x0000007F
-#ifdef _KERNEL
-#define PFR_FLAG_USERIOCTL	0x10000000
-#endif
-
-struct pfioc_table {
-	struct pfr_table	 pfrio_table;
-	void			*pfrio_buffer;
-	int			 pfrio_esize;
-	int			 pfrio_size;
-	int			 pfrio_size2;
-	int			 pfrio_nadd;
-	int			 pfrio_ndel;
-	int			 pfrio_nchange;
-	int			 pfrio_flags;
-	uint32_t		 pfrio_ticket;
-};
-#define	pfrio_exists	pfrio_nadd
-#define	pfrio_nzero	pfrio_nadd
-#define	pfrio_nmatch	pfrio_nadd
-#define pfrio_naddr	pfrio_size2
-#define pfrio_setflag	pfrio_size2
-#define pfrio_clrflag	pfrio_nadd
-
-struct pfioc_iface {
-	char	 pfiio_name[IFNAMSIZ];
-	void	*pfiio_buffer;
-	int	 pfiio_esize;
-	int	 pfiio_size;
-	int	 pfiio_nzero;
-	int	 pfiio_flags;
-};
-
-
-/*
- * ioctl operations
- */
-
-#define DIOCSTART	_IO  ('D',  1)
-#define DIOCSTOP	_IO  ('D',  2)
-#define DIOCADDRULE	_IOWR('D',  4, struct pfioc_rule)
-#define DIOCGETRULES	_IOWR('D',  6, struct pfioc_rule)
-#define DIOCGETRULE	_IOWR('D',  7, struct pfioc_rule)
-/* XXX cut 8 - 17 */
-#define DIOCCLRSTATES	_IOWR('D', 18, struct pfioc_state_kill)
-#define DIOCGETSTATE	_IOWR('D', 19, struct pfioc_state)
-#define DIOCSETSTATUSIF _IOWR('D', 20, struct pfioc_if)
-#define DIOCGETSTATUS	_IOWR('D', 21, struct pf_status)
-#define DIOCCLRSTATUS	_IO  ('D', 22)
-#define DIOCNATLOOK	_IOWR('D', 23, struct pfioc_natlook)
-#define DIOCSETDEBUG	_IOWR('D', 24, uint32_t)
-#define DIOCGETSTATES	_IOWR('D', 25, struct pfioc_states)
-#define DIOCCHANGERULE	_IOWR('D', 26, struct pfioc_rule)
-/* XXX cut 26 - 28 */
-#define DIOCSETTIMEOUT	_IOWR('D', 29, struct pfioc_tm)
-#define DIOCGETTIMEOUT	_IOWR('D', 30, struct pfioc_tm)
-#define DIOCADDSTATE	_IOWR('D', 37, struct pfioc_state)
-#define DIOCCLRRULECTRS	_IO  ('D', 38)
-#define DIOCGETLIMIT	_IOWR('D', 39, struct pfioc_limit)
-#define DIOCSETLIMIT	_IOWR('D', 40, struct pfioc_limit)
-#define DIOCKILLSTATES	_IOWR('D', 41, struct pfioc_state_kill)
-#define DIOCSTARTALTQ	_IO  ('D', 42)
-#define DIOCSTOPALTQ	_IO  ('D', 43)
-#define DIOCADDALTQ	_IOWR('D', 45, struct pfioc_altq)
-#define DIOCGETALTQS	_IOWR('D', 47, struct pfioc_altq)
-#define DIOCGETALTQ	_IOWR('D', 48, struct pfioc_altq)
-#define DIOCCHANGEALTQ	_IOWR('D', 49, struct pfioc_altq)
-#define DIOCGETQSTATS	_IOWR('D', 50, struct pfioc_qstats)
-#define DIOCBEGINADDRS	_IOWR('D', 51, struct pfioc_pooladdr)
-#define DIOCADDADDR	_IOWR('D', 52, struct pfioc_pooladdr)
-#define DIOCGETADDRS	_IOWR('D', 53, struct pfioc_pooladdr)
-#define DIOCGETADDR	_IOWR('D', 54, struct pfioc_pooladdr)
-#define DIOCCHANGEADDR	_IOWR('D', 55, struct pfioc_pooladdr)
-/* XXX cut 55 - 57 */
-#define	DIOCGETRULESETS	_IOWR('D', 58, struct pfioc_ruleset)
-#define	DIOCGETRULESET	_IOWR('D', 59, struct pfioc_ruleset)
-#define	DIOCRCLRTABLES	_IOWR('D', 60, struct pfioc_table)
-#define	DIOCRADDTABLES	_IOWR('D', 61, struct pfioc_table)
-#define	DIOCRDELTABLES	_IOWR('D', 62, struct pfioc_table)
-#define	DIOCRGETTABLES	_IOWR('D', 63, struct pfioc_table)
-#define	DIOCRGETTSTATS	_IOWR('D', 64, struct pfioc_table)
-#define DIOCRCLRTSTATS	_IOWR('D', 65, struct pfioc_table)
-#define	DIOCRCLRADDRS	_IOWR('D', 66, struct pfioc_table)
-#define	DIOCRADDADDRS	_IOWR('D', 67, struct pfioc_table)
-#define	DIOCRDELADDRS	_IOWR('D', 68, struct pfioc_table)
-#define	DIOCRSETADDRS	_IOWR('D', 69, struct pfioc_table)
-#define	DIOCRGETADDRS	_IOWR('D', 70, struct pfioc_table)
-#define	DIOCRGETASTATS	_IOWR('D', 71, struct pfioc_table)
-#define	DIOCRCLRASTATS	_IOWR('D', 72, struct pfioc_table)
-#define	DIOCRTSTADDRS	_IOWR('D', 73, struct pfioc_table)
-#define	DIOCRSETTFLAGS	_IOWR('D', 74, struct pfioc_table)
-#define	DIOCRINADEFINE	_IOWR('D', 77, struct pfioc_table)
-#define	DIOCOSFPFLUSH	_IO('D', 78)
-#define	DIOCOSFPADD	_IOWR('D', 79, struct pf_osfp_ioctl)
-#define	DIOCOSFPGET	_IOWR('D', 80, struct pf_osfp_ioctl)
-#define	DIOCXBEGIN	_IOWR('D', 81, struct pfioc_trans)
-#define	DIOCXCOMMIT	_IOWR('D', 82, struct pfioc_trans)
-#define	DIOCXROLLBACK	_IOWR('D', 83, struct pfioc_trans)
-#define	DIOCGETSRCNODES	_IOWR('D', 84, struct pfioc_src_nodes)
-#define	DIOCCLRSRCNODES	_IO('D', 85)
-#define	DIOCSETHOSTID	_IOWR('D', 86, uint32_t)
-#define	DIOCIGETIFACES	_IOWR('D', 87, struct pfioc_iface)
-#define	DIOCSETIFFLAG	_IOWR('D', 89, struct pfioc_iface)
-#define	DIOCCLRIFFLAG	_IOWR('D', 90, struct pfioc_iface)
-#define	DIOCKILLSRCNODES	_IOWR('D', 91, struct pfioc_src_node_kill)
-struct pf_ifspeed {
-	char			ifname[IFNAMSIZ];
-	uint32_t		baudrate;
-};
-#define	DIOCGIFSPEED	_IOWR('D', 92, struct pf_ifspeed)
-
-#ifdef _KERNEL
-LIST_HEAD(pf_src_node_list, pf_src_node);
-struct pf_srchash {
-	struct pf_src_node_list		nodes;
-	struct mtx			lock;
-};
-
-struct pf_keyhash {
-	LIST_HEAD(, pf_state_key)	keys;
-	struct mtx			lock;
-};
-
-struct pf_idhash {
-	LIST_HEAD(, pf_state)		states;
-	struct mtx			lock;
-};
-
-extern u_long		pf_hashmask;
-extern u_long		pf_srchashmask;
-#define	PF_HASHSIZ	(32768)
-VNET_DECLARE(struct pf_keyhash *, pf_keyhash);
-VNET_DECLARE(struct pf_idhash *, pf_idhash);
-#define V_pf_keyhash	VNET(pf_keyhash)
-#define	V_pf_idhash	VNET(pf_idhash)
-VNET_DECLARE(struct pf_srchash *, pf_srchash);
-#define	V_pf_srchash	VNET(pf_srchash)
-
-#define PF_IDHASH(s)	(be64toh((s)->id) % (pf_hashmask + 1))
-
-VNET_DECLARE(void *, pf_swi_cookie);
-#define V_pf_swi_cookie	VNET(pf_swi_cookie)
-
-VNET_DECLARE(uint64_t, pf_stateid[MAXCPU]);
-#define	V_pf_stateid	VNET(pf_stateid)
-
-TAILQ_HEAD(pf_altqqueue, pf_altq);
-VNET_DECLARE(struct pf_altqqueue,	 pf_altqs[2]);
-#define	V_pf_altqs			 VNET(pf_altqs)
-VNET_DECLARE(struct pf_palist,		 pf_pabuf);
-#define	V_pf_pabuf			 VNET(pf_pabuf)
-
-VNET_DECLARE(uint32_t,			 ticket_altqs_active);
-#define	V_ticket_altqs_active		 VNET(ticket_altqs_active)
-VNET_DECLARE(uint32_t,			 ticket_altqs_inactive);
-#define	V_ticket_altqs_inactive		 VNET(ticket_altqs_inactive)
-VNET_DECLARE(int,			 altqs_inactive_open);
-#define	V_altqs_inactive_open		 VNET(altqs_inactive_open)
-VNET_DECLARE(uint32_t,			 ticket_pabuf);
-#define	V_ticket_pabuf			 VNET(ticket_pabuf)
-VNET_DECLARE(struct pf_altqqueue *,	 pf_altqs_active);
-#define	V_pf_altqs_active		 VNET(pf_altqs_active)
-VNET_DECLARE(struct pf_altqqueue *,	 pf_altqs_inactive);
-#define	V_pf_altqs_inactive		 VNET(pf_altqs_inactive)
-
-VNET_DECLARE(struct pf_rulequeue, pf_unlinked_rules);
-#define	V_pf_unlinked_rules	VNET(pf_unlinked_rules)
-
-void				 pf_initialize(void);
-void				 pf_mtag_initialize(void);
-void				 pf_mtag_cleanup(void);
-void				 pf_cleanup(void);
-
-struct pf_mtag			*pf_get_mtag(struct mbuf *);
-
-extern void			 pf_calc_skip_steps(struct pf_rulequeue *);
-#ifdef ALTQ
-extern	void			 pf_altq_ifnet_event(struct ifnet *, int);
-#endif
-VNET_DECLARE(uma_zone_t,	 pf_state_z);
-#define	V_pf_state_z		 VNET(pf_state_z)
-VNET_DECLARE(uma_zone_t,	 pf_state_key_z);
-#define	V_pf_state_key_z	 VNET(pf_state_key_z)
-VNET_DECLARE(uma_zone_t,	 pf_state_scrub_z);
-#define	V_pf_state_scrub_z	 VNET(pf_state_scrub_z)
-
-extern void			 pf_purge_thread(void *);
-extern void			 pf_intr(void *);
-extern void			 pf_purge_expired_src_nodes(void);
-
-extern int			 pf_unlink_state(struct pf_state *, u_int);
-#define	PF_ENTER_LOCKED		0x00000001
-#define	PF_RETURN_LOCKED	0x00000002
-extern int			 pf_state_insert(struct pfi_kif *,
-				    struct pf_state_key *,
-				    struct pf_state_key *,
-				    struct pf_state *);
-extern void			 pf_free_state(struct pf_state *);
-
-static __inline void
-pf_ref_state(struct pf_state *s)
-{
-
-	refcount_acquire(&s->refs);
-}
-
-static __inline int
-pf_release_state(struct pf_state *s)
-{
-
-	if (refcount_release(&s->refs)) {
-		pf_free_state(s);
-		return (1);
-	} else
-		return (0);
-}
-
-extern struct pf_state		*pf_find_state_byid(uint64_t, uint32_t);
-extern struct pf_state		*pf_find_state_all(struct pf_state_key_cmp *,
-				    u_int, int *);
-extern struct pf_src_node	*pf_find_src_node(struct pf_addr *,
-				    struct pf_rule *, sa_family_t, int);
-extern void			 pf_unlink_src_node(struct pf_src_node *);
-extern u_int			 pf_free_src_nodes(struct pf_src_node_list *);
-extern void			 pf_print_state(struct pf_state *);
-extern void			 pf_print_flags(u_int8_t);
-extern u_int16_t		 pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t,
-				    u_int8_t);
-
-VNET_DECLARE(struct ifnet *,		 sync_ifp);
-#define	V_sync_ifp		 	 VNET(sync_ifp);
-VNET_DECLARE(struct pf_rule,		 pf_default_rule);
-#define	V_pf_default_rule		  VNET(pf_default_rule)
-extern void			 pf_addrcpy(struct pf_addr *, struct pf_addr *,
-				    u_int8_t);
-void				pf_free_rule(struct pf_rule *);
-
-#ifdef INET
-int	pf_test(int, struct ifnet *, struct mbuf **, struct inpcb *);
-int	pf_normalize_ip(struct mbuf **, int, struct pfi_kif *, u_short *,
-	    struct pf_pdesc *);
-#endif /* INET */
-
-#ifdef INET6
-int	pf_test6(int, struct ifnet *, struct mbuf **, struct inpcb *);
-int	pf_normalize_ip6(struct mbuf **, int, struct pfi_kif *, u_short *,
-	    struct pf_pdesc *);
-void	pf_poolmask(struct pf_addr *, struct pf_addr*,
-	    struct pf_addr *, struct pf_addr *, u_int8_t);
-void	pf_addr_inc(struct pf_addr *, sa_family_t);
-int	pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *);
-#endif /* INET6 */
-
-uint32_t	pf_new_isn(struct pf_state *);
-void   *pf_pull_hdr(struct mbuf *, int, void *, int, u_short *, u_short *,
-	    sa_family_t);
-void	pf_change_a(void *, u_int16_t *, uint32_t, u_int8_t);
-void	pf_send_deferred_syn(struct pf_state *);
-int	pf_match_addr(u_int8_t, struct pf_addr *, struct pf_addr *,
-	    struct pf_addr *, sa_family_t);
-int	pf_match_addr_range(struct pf_addr *, struct pf_addr *,
-	    struct pf_addr *, sa_family_t);
-int	pf_match_port(u_int8_t, u_int16_t, u_int16_t, u_int16_t);
-
-void	pf_normalize_init(void);
-void	pf_normalize_cleanup(void);
-int	pf_normalize_tcp(int, struct pfi_kif *, struct mbuf *, int, int, void *,
-	    struct pf_pdesc *);
-void	pf_normalize_tcp_cleanup(struct pf_state *);
-int	pf_normalize_tcp_init(struct mbuf *, int, struct pf_pdesc *,
-	    struct tcphdr *, struct pf_state_peer *, struct pf_state_peer *);
-int	pf_normalize_tcp_stateful(struct mbuf *, int, struct pf_pdesc *,
-	    u_short *, struct tcphdr *, struct pf_state *,
-	    struct pf_state_peer *, struct pf_state_peer *, int *);
-uint32_t
-	pf_state_expires(const struct pf_state *);
-void	pf_purge_expired_fragments(void);
-int	pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *,
-	    int);
-int	pf_socket_lookup(int, struct pf_pdesc *, struct mbuf *);
-struct pf_state_key *pf_alloc_state_key(int);
-void	pfr_initialize(void);
-void	pfr_cleanup(void);
-int	pfr_match_addr(struct pfr_ktable *, struct pf_addr *, sa_family_t);
-void	pfr_update_stats(struct pfr_ktable *, struct pf_addr *, sa_family_t,
-	    u_int64_t, int, int, int);
-int	pfr_pool_get(struct pfr_ktable *, int *, struct pf_addr *, sa_family_t);
-void	pfr_dynaddr_update(struct pfr_ktable *, struct pfi_dynaddr *);
-struct pfr_ktable *
-	pfr_attach_table(struct pf_ruleset *, char *);
-void	pfr_detach_table(struct pfr_ktable *);
-int	pfr_clr_tables(struct pfr_table *, int *, int);
-int	pfr_add_tables(struct pfr_table *, int, int *, int);
-int	pfr_del_tables(struct pfr_table *, int, int *, int);
-int	pfr_get_tables(struct pfr_table *, struct pfr_table *, int *, int);
-int	pfr_get_tstats(struct pfr_table *, struct pfr_tstats *, int *, int);
-int	pfr_clr_tstats(struct pfr_table *, int, int *, int);
-int	pfr_set_tflags(struct pfr_table *, int, int, int, int *, int *, int);
-int	pfr_clr_addrs(struct pfr_table *, int *, int);
-int	pfr_insert_kentry(struct pfr_ktable *, struct pfr_addr *, long);
-int	pfr_add_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
-	    int);
-int	pfr_del_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
-	    int);
-int	pfr_set_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
-	    int *, int *, int *, int, uint32_t);
-int	pfr_get_addrs(struct pfr_table *, struct pfr_addr *, int *, int);
-int	pfr_get_astats(struct pfr_table *, struct pfr_astats *, int *, int);
-int	pfr_clr_astats(struct pfr_table *, struct pfr_addr *, int, int *,
-	    int);
-int	pfr_tst_addrs(struct pfr_table *, struct pfr_addr *, int, int *,
-	    int);
-int	pfr_ina_begin(struct pfr_table *, uint32_t *, int *, int);
-int	pfr_ina_rollback(struct pfr_table *, uint32_t, int *, int);
-int	pfr_ina_commit(struct pfr_table *, uint32_t, int *, int *, int);
-int	pfr_ina_define(struct pfr_table *, struct pfr_addr *, int, int *,
-	    int *, uint32_t, int);
-
-MALLOC_DECLARE(PFI_MTYPE);
-VNET_DECLARE(struct pfi_kif *,		 pfi_all);
-#define	V_pfi_all	 		 VNET(pfi_all)
-
-void		 pfi_initialize(void);
-void		 pfi_cleanup(void);
-void		 pfi_kif_ref(struct pfi_kif *);
-void		 pfi_kif_unref(struct pfi_kif *);
-struct pfi_kif	*pfi_kif_find(const char *);
-struct pfi_kif	*pfi_kif_attach(struct pfi_kif *, const char *);
-int		 pfi_kif_match(struct pfi_kif *, struct pfi_kif *);
-void		 pfi_kif_purge(void);
-int		 pfi_match_addr(struct pfi_dynaddr *, struct pf_addr *,
-		    sa_family_t);
-int		 pfi_dynaddr_setup(struct pf_addr_wrap *, sa_family_t);
-void		 pfi_dynaddr_remove(struct pfi_dynaddr *);
-void		 pfi_dynaddr_copyout(struct pf_addr_wrap *);
-void		 pfi_update_status(const char *, struct pf_status *);
-void		 pfi_get_ifaces(const char *, struct pfi_kif *, int *);
-int		 pfi_set_flags(const char *, int);
-int		 pfi_clear_flags(const char *, int);
-
-int		 pf_match_tag(struct mbuf *, struct pf_rule *, int *, int);
-int		 pf_tag_packet(struct mbuf *, struct pf_pdesc *, int);
-int		 pf_addr_cmp(struct pf_addr *, struct pf_addr *,
-		    sa_family_t);
-void		 pf_qid2qname(uint32_t, char *);
-
-VNET_DECLARE(struct pf_kstatus, pf_status);
-#define	V_pf_status	VNET(pf_status)
-
-struct pf_limit {
-	uma_zone_t	zone;
-	u_int		limit;
-};
-VNET_DECLARE(struct pf_limit, pf_limits[PF_LIMIT_MAX]);
-#define	V_pf_limits VNET(pf_limits)
-
-#endif /* _KERNEL */
-
-#ifdef _KERNEL
-VNET_DECLARE(struct pf_anchor_global,		 pf_anchors);
-#define	V_pf_anchors				 VNET(pf_anchors)
-VNET_DECLARE(struct pf_anchor,			 pf_main_anchor);
-#define	V_pf_main_anchor			 VNET(pf_main_anchor)
-#define pf_main_ruleset	V_pf_main_anchor.ruleset
-#endif
-
-/* these ruleset functions can be linked into userland programs (pfctl) */
-int			 pf_get_ruleset_number(u_int8_t);
-void			 pf_init_ruleset(struct pf_ruleset *);
-int			 pf_anchor_setup(struct pf_rule *,
-			    const struct pf_ruleset *, const char *);
-int			 pf_anchor_copyout(const struct pf_ruleset *,
-			    const struct pf_rule *, struct pfioc_rule *);
-void			 pf_anchor_remove(struct pf_rule *);
-void			 pf_remove_if_empty_ruleset(struct pf_ruleset *);
-struct pf_ruleset	*pf_find_ruleset(const char *);
-struct pf_ruleset	*pf_find_or_create_ruleset(const char *);
-void			 pf_rs_initialize(void);
-
-/* The fingerprint functions can be linked into userland programs (tcpdump) */
-int	pf_osfp_add(struct pf_osfp_ioctl *);
-#ifdef _KERNEL
-struct pf_osfp_enlist *
-	pf_osfp_fingerprint(struct pf_pdesc *, struct mbuf *, int,
-	    const struct tcphdr *);
-#endif /* _KERNEL */
-void	pf_osfp_flush(void);
-int	pf_osfp_get(struct pf_osfp_ioctl *);
-int	pf_osfp_match(struct pf_osfp_enlist *, pf_osfp_t);
-
-#ifdef _KERNEL
-void			 pf_print_host(struct pf_addr *, u_int16_t, u_int8_t);
-
-void			 pf_step_into_anchor(struct pf_anchor_stackframe *, int *,
-			    struct pf_ruleset **, int, struct pf_rule **,
-			    struct pf_rule **, int *);
-int			 pf_step_out_of_anchor(struct pf_anchor_stackframe *, int *,
-			    struct pf_ruleset **, int, struct pf_rule **,
-			    struct pf_rule **, int *);
-
-int			 pf_map_addr(u_int8_t, struct pf_rule *,
-			    struct pf_addr *, struct pf_addr *,
-			    struct pf_addr *, struct pf_src_node **);
-struct pf_rule		*pf_get_translation(struct pf_pdesc *, struct mbuf *,
-			    int, int, struct pfi_kif *, struct pf_src_node **,
-			    struct pf_state_key **, struct pf_state_key **,
-			    struct pf_addr *, struct pf_addr *,
-			    uint16_t, uint16_t, struct pf_anchor_stackframe *);
-
-struct pf_state_key	*pf_state_key_setup(struct pf_pdesc *, struct pf_addr *,
-			    struct pf_addr *, u_int16_t, u_int16_t);
-struct pf_state_key	*pf_state_key_clone(struct pf_state_key *);
-#endif /* _KERNEL */
-
-#endif /* _NET_PFVAR_H_ */
diff --git a/include.new/net/ppp_comp.h b/include.new/net/ppp_comp.h
deleted file mode 100644
index d8cc202..0000000
--- a/include.new/net/ppp_comp.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * ppp_comp.h - Definitions for doing PPP packet compression.
- */
-
-/*-
- * Copyright (c) 1994 The Australian National University.
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
- *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
- *
- * $FreeBSD: src/sys/net/ppp_comp.h,v 1.12 2005/01/07 01:45:35 imp Exp $
- */
-
-#ifndef _NET_PPP_COMP_H
-#define _NET_PPP_COMP_H
-
-/*
- * Structure giving methods for compression/decompression.
- */
-#ifdef PACKETPTR
-struct compressor {
-	int	compress_proto;	/* CCP compression protocol number */
-
-	/* Allocate space for a compressor (transmit side) */
-	void	*(*comp_alloc)(u_char *options, int opt_len);
-	/* Free space used by a compressor */
-	void	(*comp_free)(void *state);
-	/* Initialize a compressor */
-	int	(*comp_init)(void *state, u_char *options, int opt_len,
-		    int unit, int hdrlen, int debug);
-	/* Reset a compressor */
-	void	(*comp_reset)(void *state);
-	/* Compress a packet */
-	int	(*compress)(void *state, PACKETPTR *mret, PACKETPTR mp,
-		    int orig_len, int max_len);
-	/* Return compression statistics */
-	void	(*comp_stat)(void *state, struct compstat *stats);
-
-	/* Allocate space for a decompressor (receive side) */
-	void	*(*decomp_alloc)(u_char *options, int opt_len);
-	/* Free space used by a decompressor */
-	void	(*decomp_free)(void *state);
-	/* Initialize a decompressor */
-	int	(*decomp_init)(void *state, u_char *options, int opt_len,
-		    int unit, int hdrlen, int mru, int debug);
-	/* Reset a decompressor */
-	void	(*decomp_reset)(void *state);
-	/* Decompress a packet. */
-	int	(*decompress)(void *state, PACKETPTR mp, PACKETPTR *dmpp);
-	/* Update state for an incompressible packet received */
-	void	(*incomp)(void *state, PACKETPTR mp);
-	/* Return decompression statistics */
-	void	(*decomp_stat)(void *state, struct compstat *stats);
-};
-#endif /* PACKETPTR */
-
-/*
- * Return values for decompress routine.
- * We need to make these distinctions so that we can disable certain
- * useful functionality, namely sending a CCP reset-request as a result
- * of an error detected after decompression.  This is to avoid infringing
- * a patent held by Motorola.
- * Don't you just lurve software patents.
- */
-#define DECOMP_OK		0	/* everything went OK */
-#define DECOMP_ERROR		1	/* error detected before decomp. */
-#define DECOMP_FATALERROR	2	/* error detected after decomp. */
-
-/*
- * CCP codes.
- */
-#define CCP_CONFREQ	1
-#define CCP_CONFACK	2
-#define CCP_TERMREQ	5
-#define CCP_TERMACK	6
-#define CCP_RESETREQ	14
-#define CCP_RESETACK	15
-
-/*
- * Max # bytes for a CCP option
- */
-#define CCP_MAX_OPTION_LENGTH	32
-
-/*
- * Parts of a CCP packet.
- */
-#define CCP_CODE(dp)		((dp)[0])
-#define CCP_ID(dp)		((dp)[1])
-#define CCP_LENGTH(dp)		(((dp)[2] << 8) + (dp)[3])
-#define CCP_HDRLEN		4
-
-#define CCP_OPT_CODE(dp)	((dp)[0])
-#define CCP_OPT_LENGTH(dp)	((dp)[1])
-#define CCP_OPT_MINLEN		2
-
-/*
- * Definitions for BSD-Compress.
- */
-#define CI_BSD_COMPRESS		21	/* config. option for BSD-Compress */
-#define CILEN_BSD_COMPRESS	3	/* length of config. option */
-
-/* Macros for handling the 3rd byte of the BSD-Compress config option. */
-#define BSD_NBITS(x)		((x) & 0x1F)	/* number of bits requested */
-#define BSD_VERSION(x)		((x) >> 5)	/* version of option format */
-#define BSD_CURRENT_VERSION	1		/* current version number */
-#define BSD_MAKE_OPT(v, n)	(((v) << 5) | (n))
-
-#define BSD_MIN_BITS		9	/* smallest code size supported */
-#define BSD_MAX_BITS		15	/* largest code size supported */
-
-/*
- * Definitions for Deflate.
- */
-#define CI_DEFLATE		26	/* config option for Deflate */
-#define CI_DEFLATE_DRAFT	24	/* value used in original draft RFC */
-#define CILEN_DEFLATE		4	/* length of its config option */
-
-#define DEFLATE_MIN_SIZE	8
-#define DEFLATE_MAX_SIZE	15
-#define DEFLATE_METHOD_VAL	8
-#define DEFLATE_SIZE(x)		(((x) >> 4) + DEFLATE_MIN_SIZE)
-#define DEFLATE_METHOD(x)	((x) & 0x0F)
-#define DEFLATE_MAKE_OPT(w)	((((w) - DEFLATE_MIN_SIZE) << 4) \
-				 + DEFLATE_METHOD_VAL)
-#define DEFLATE_CHK_SEQUENCE	0
-
-/*
- * Definitions for other, as yet unsupported, compression methods.
- */
-#define CI_PREDICTOR_1		1	/* config option for Predictor-1 */
-#define CILEN_PREDICTOR_1	2	/* length of its config option */
-#define CI_PREDICTOR_2		2	/* config option for Predictor-2 */
-#define CILEN_PREDICTOR_2	2	/* length of its config option */
-
-#endif /* _NET_PPP_COMP_H */
diff --git a/include.new/net/ppp_defs.h b/include.new/net/ppp_defs.h
deleted file mode 100644
index c1d6990..0000000
--- a/include.new/net/ppp_defs.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * ppp_defs.h - PPP definitions.
- */
-/*-
- * Copyright (c) 1994 The Australian National University.
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, provided that the above copyright
- * notice appears in all copies.  This software is provided without any
- * warranty, express or implied. The Australian National University
- * makes no representations about the suitability of this software for
- * any purpose.
- *
- * IN NO EVENT SHALL THE AUSTRALIAN NATIONAL UNIVERSITY BE LIABLE TO ANY
- * PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
- * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- * THE AUSTRALIAN NATIONAL UNIVERSITY HAVE BEEN ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * THE AUSTRALIAN NATIONAL UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
- * ON AN "AS IS" BASIS, AND THE AUSTRALIAN NATIONAL UNIVERSITY HAS NO
- * OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
- * OR MODIFICATIONS.
- *
- * $FreeBSD: releng/10.2/sys/net/ppp_defs.h 250887 2013-05-21 21:20:10Z ed $
- */
-
-#ifndef _PPP_DEFS_H_
-#define _PPP_DEFS_H_
-
-#include <sys/_types.h>
-
-/*
- * The basic PPP frame.
- */
-#define PPP_HDRLEN	4	/* octets for standard ppp header */
-#define PPP_FCSLEN	2	/* octets for FCS */
-#define PPP_MRU		1500	/* default MRU = max length of info field */
-
-#define PPP_ADDRESS(p)	(((u_char *)(p))[0])
-#define PPP_CONTROL(p)	(((u_char *)(p))[1])
-#define PPP_PROTOCOL(p)	((((u_char *)(p))[2] << 8) + ((u_char *)(p))[3])
-
-/*
- * Significant octet values.
- */
-#define	PPP_ALLSTATIONS	0xff	/* All-Stations broadcast address */
-#define	PPP_UI		0x03	/* Unnumbered Information */
-#define	PPP_FLAG	0x7e	/* Flag Sequence */
-#define	PPP_ESCAPE	0x7d	/* Asynchronous Control Escape */
-#define	PPP_TRANS	0x20	/* Asynchronous transparency modifier */
-
-/*
- * Protocol field values.
- */
-#define PPP_IP		0x21	/* Internet Protocol */
-#define	PPP_XNS		0x25	/* Xerox NS */
-#define PPP_AT		0x29	/* AppleTalk Protocol */
-#define PPP_IPX		0x2b	/* IPX Datagram (RFC1552) */
-#define	PPP_VJC_COMP	0x2d	/* VJ compressed TCP */
-#define	PPP_VJC_UNCOMP	0x2f	/* VJ uncompressed TCP */
-#define PPP_COMP	0xfd	/* compressed packet */
-#define PPP_IPCP	0x8021	/* IP Control Protocol */
-#define PPP_ATCP	0x8029	/* AppleTalk Control Protocol */
-#define PPP_IPXCP	0x802b	/* IPX Control Protocol (RFC1552) */
-#define PPP_CCP		0x80fd	/* Compression Control Protocol */
-#define PPP_LCP		0xc021	/* Link Control Protocol */
-#define PPP_PAP		0xc023	/* Password Authentication Protocol */
-#define PPP_LQR		0xc025	/* Link Quality Report protocol */
-#define PPP_CHAP	0xc223	/* Cryptographic Handshake Auth. Protocol */
-#define PPP_CBCP	0xc029	/* Callback Control Protocol */
-#define PPP_IPV6	0x57	/* Internet Protocol version 6*/
-#define PPP_IPV6CP	0x8057	/* IPv6 Control Protocol */
-
-/*
- * Values for FCS calculations.
- */
-#define PPP_INITFCS	0xffff	/* Initial FCS value */
-#define PPP_GOODFCS	0xf0b8	/* Good final FCS value */
-#define PPP_FCS(fcs, c)	(((fcs) >> 8) ^ fcstab[((fcs) ^ (c)) & 0xff])
-
-/*
- * Extended asyncmap - allows any character to be escaped.
- */
-typedef __uint32_t	ext_accm[8];
-
-/*
- * What to do with network protocol (NP) packets.
- */
-enum NPmode {
-    NPMODE_PASS,		/* pass the packet through */
-    NPMODE_DROP,		/* silently drop the packet */
-    NPMODE_ERROR,		/* return an error */
-    NPMODE_QUEUE		/* save it up for later. */
-};
-
-/*
- * Statistics.
- */
-struct pppstat	{
-    unsigned int ppp_ibytes;	/* bytes received */
-    unsigned int ppp_ipackets;	/* packets received */
-    unsigned int ppp_ierrors;	/* receive errors */
-    unsigned int ppp_obytes;	/* bytes sent */
-    unsigned int ppp_opackets;	/* packets sent */
-    unsigned int ppp_oerrors;	/* transmit errors */
-};
-
-struct vjstat {
-    unsigned int vjs_packets;	/* outbound packets */
-    unsigned int vjs_compressed; /* outbound compressed packets */
-    unsigned int vjs_searches;	/* searches for connection state */
-    unsigned int vjs_misses;	/* times couldn't find conn. state */
-    unsigned int vjs_uncompressedin; /* inbound uncompressed packets */
-    unsigned int vjs_compressedin; /* inbound compressed packets */
-    unsigned int vjs_errorin;	/* inbound unknown type packets */
-    unsigned int vjs_tossed;	/* inbound packets tossed because of error */
-};
-
-struct ppp_stats {
-    struct pppstat p;		/* basic PPP statistics */
-    struct vjstat vj;		/* VJ header compression statistics */
-};
-
-struct compstat {
-    unsigned int unc_bytes;	/* total uncompressed bytes */
-    unsigned int unc_packets;	/* total uncompressed packets */
-    unsigned int comp_bytes;	/* compressed bytes */
-    unsigned int comp_packets;	/* compressed packets */
-    unsigned int inc_bytes;	/* incompressible bytes */
-    unsigned int inc_packets;	/* incompressible packets */
-    unsigned int ratio;		/* recent compression ratio << 8 */
-};
-
-struct ppp_comp_stats {
-    struct compstat c;		/* packet compression statistics */
-    struct compstat d;		/* packet decompression statistics */
-};
-
-/*
- * The following structure records the time in seconds since
- * the last NP packet was sent or received.
- */
-struct ppp_idle {
-    __time_t xmit_idle;		/* time since last NP packet sent */
-    __time_t recv_idle;		/* time since last NP packet received */
-};
-
-#ifndef __P
-#ifdef __STDC__
-#define __P(x)	x
-#else
-#define __P(x)	()
-#endif
-#endif
-
-#endif /* _PPP_DEFS_H_ */
diff --git a/include.new/net/radix.h b/include.new/net/radix.h
deleted file mode 100644
index c1e886d..0000000
--- a/include.new/net/radix.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * Copyright (c) 1988, 1989, 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.
- * 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.
- *
- *	@(#)radix.h	8.2 (Berkeley) 10/31/94
- * $FreeBSD: releng/10.2/sys/net/radix.h 265708 2014-05-08 20:27:06Z melifaro $
- */
-
-#ifndef _RADIX_H_
-#define	_RADIX_H_
-
-#ifdef _KERNEL
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/_rwlock.h>
-#endif
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_RTABLE);
-#endif
-
-/*
- * Radix search tree node layout.
- */
-
-struct radix_node {
-	struct	radix_mask *rn_mklist;	/* list of masks contained in subtree */
-	struct	radix_node *rn_parent;	/* parent */
-	short	rn_bit;			/* bit offset; -1-index(netmask) */
-	char	rn_bmask;		/* node: mask for bit test*/
-	u_char	rn_flags;		/* enumerated next */
-#define RNF_NORMAL	1		/* leaf contains normal route */
-#define RNF_ROOT	2		/* leaf is root leaf for tree */
-#define RNF_ACTIVE	4		/* This node is alive (for rtfree) */
-	union {
-		struct {			/* leaf only data: */
-			caddr_t	rn_Key;		/* object of search */
-			caddr_t	rn_Mask;	/* netmask, if present */
-			struct	radix_node *rn_Dupedkey;
-		} rn_leaf;
-		struct {			/* node only data: */
-			int	rn_Off;		/* where to start compare */
-			struct	radix_node *rn_L;/* progeny */
-			struct	radix_node *rn_R;/* progeny */
-		} rn_node;
-	}		rn_u;
-#ifdef RN_DEBUG
-	int rn_info;
-	struct radix_node *rn_twin;
-	struct radix_node *rn_ybro;
-#endif
-};
-
-#define	rn_dupedkey	rn_u.rn_leaf.rn_Dupedkey
-#define	rn_key		rn_u.rn_leaf.rn_Key
-#define	rn_mask		rn_u.rn_leaf.rn_Mask
-#define	rn_offset	rn_u.rn_node.rn_Off
-#define	rn_left		rn_u.rn_node.rn_L
-#define	rn_right	rn_u.rn_node.rn_R
-
-/*
- * Annotations to tree concerning potential routes applying to subtrees.
- */
-
-struct radix_mask {
-	short	rm_bit;			/* bit offset; -1-index(netmask) */
-	char	rm_unused;		/* cf. rn_bmask */
-	u_char	rm_flags;		/* cf. rn_flags */
-	struct	radix_mask *rm_mklist;	/* more masks to try */
-	union	{
-		caddr_t	rmu_mask;		/* the mask */
-		struct	radix_node *rmu_leaf;	/* for normal routes */
-	}	rm_rmu;
-	int	rm_refs;		/* # of references to this struct */
-};
-
-#define	rm_mask rm_rmu.rmu_mask
-#define	rm_leaf rm_rmu.rmu_leaf		/* extra field would make 32 bytes */
-
-typedef int walktree_f_t(struct radix_node *, void *);
-
-struct radix_node_head {
-	struct	radix_node *rnh_treetop;
-	u_int	rnh_gen;		/* generation counter */
-	int	rnh_multipath;		/* multipath capable ? */
-	int	rnh_addrsize;		/* permit, but not require fixed keys */
-	int	rnh_pktsize;		/* permit, but not require fixed keys */
-	struct	radix_node *(*rnh_addaddr)	/* add based on sockaddr */
-		(void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]);
-	struct	radix_node *(*rnh_addpkt)	/* add based on packet hdr */
-		(void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]);
-	struct	radix_node *(*rnh_deladdr)	/* remove based on sockaddr */
-		(void *v, void *mask, struct radix_node_head *head);
-	struct	radix_node *(*rnh_delpkt)	/* remove based on packet hdr */
-		(void *v, void *mask, struct radix_node_head *head);
-	struct	radix_node *(*rnh_matchaddr)	/* longest match for sockaddr */
-		(void *v, struct radix_node_head *head);
-	struct	radix_node *(*rnh_lookup)	/*exact match for sockaddr*/
-		(void *v, void *mask, struct radix_node_head *head);
-	struct	radix_node *(*rnh_matchpkt)	/* locate based on packet hdr */
-		(void *v, struct radix_node_head *head);
-	int	(*rnh_walktree)			/* traverse tree */
-		(struct radix_node_head *head, walktree_f_t *f, void *w);
-	int	(*rnh_walktree_from)		/* traverse tree below a */
-		(struct radix_node_head *head, void *a, void *m,
-		     walktree_f_t *f, void *w);
-	void	(*rnh_close)	/* do something when the last ref drops */
-		(struct radix_node *rn, struct radix_node_head *head);
-	struct	radix_node rnh_nodes[3];	/* empty tree for common case */
-#ifdef _KERNEL
-	struct	rwlock rnh_lock;		/* locks entire radix tree */
-#endif
-	struct	radix_node_head *rnh_masks;	/* Storage for our masks */
-};
-
-#ifndef _KERNEL
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned int)(n)))
-#define R_Zalloc(p, t, n) (p = (t) calloc(1,(unsigned int)(n)))
-#define Free(p) free((char *)p);
-#else
-#define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_NOWAIT))
-#define R_Zalloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_NOWAIT | M_ZERO))
-#define Free(p) free((caddr_t)p, M_RTABLE);
-
-#define	RADIX_NODE_HEAD_LOCK_INIT(rnh)	\
-    rw_init_flags(&(rnh)->rnh_lock, "radix node head", 0)
-#define	RADIX_NODE_HEAD_LOCK(rnh)	rw_wlock(&(rnh)->rnh_lock)
-#define	RADIX_NODE_HEAD_UNLOCK(rnh)	rw_wunlock(&(rnh)->rnh_lock)
-#define	RADIX_NODE_HEAD_RLOCK(rnh)	rw_rlock(&(rnh)->rnh_lock)
-#define	RADIX_NODE_HEAD_RUNLOCK(rnh)	rw_runlock(&(rnh)->rnh_lock)
-#define	RADIX_NODE_HEAD_LOCK_TRY_UPGRADE(rnh)	rw_try_upgrade(&(rnh)->rnh_lock)
-
-
-#define	RADIX_NODE_HEAD_DESTROY(rnh)	rw_destroy(&(rnh)->rnh_lock)
-#define	RADIX_NODE_HEAD_LOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_LOCKED)
-#define	RADIX_NODE_HEAD_WLOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_WLOCKED)
-#endif /* _KERNEL */
-
-void	 rn_init(int);
-int	 rn_inithead(void **, int);
-int	 rn_detachhead(void **);
-int	 rn_refines(void *, void *);
-struct radix_node
-	 *rn_addmask(void *, int, int),
-	 *rn_addmask_r(void *, struct radix_node_head *, int, int),
-	 *rn_addroute (void *, void *, struct radix_node_head *,
-			struct radix_node [2]),
-	 *rn_delete(void *, void *, struct radix_node_head *),
-	 *rn_lookup (void *v_arg, void *m_arg,
-		        struct radix_node_head *head),
-	 *rn_match(void *, struct radix_node_head *);
-
-#endif /* _RADIX_H_ */
diff --git a/include.new/net/radix_mpath.h b/include.new/net/radix_mpath.h
deleted file mode 100644
index 5a33015..0000000
--- a/include.new/net/radix_mpath.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$KAME: radix_mpath.h,v 1.10 2004/11/06 15:44:28 itojun Exp $	*/
-
-/*
- * Copyright (C) 2001 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- * THE AUTHORS DO NOT GUARANTEE THAT THIS SOFTWARE DOES NOT INFRINGE
- * ANY OTHERS' INTELLECTUAL PROPERTIES. IN NO EVENT SHALL THE AUTHORS
- * BE LIABLE FOR ANY INFRINGEMENT OF ANY OTHERS' INTELLECTUAL
- * PROPERTIES.
- */
-/* $FreeBSD: releng/10.2/sys/net/radix_mpath.h 179426 2008-05-30 09:34:35Z qingli $ */
-
-#ifndef _NET_RADIX_MPATH_H_
-#define	_NET_RADIX_MPATH_H_
-
-#ifdef _KERNEL
-/*
- * Radix tree API with multipath support
- */
-struct route;
-struct rtentry;
-struct sockaddr;
-int	rn_mpath_capable(struct radix_node_head *);
-struct radix_node *rn_mpath_next(struct radix_node *);
-uint32_t rn_mpath_count(struct radix_node *);
-struct rtentry *rt_mpath_matchgate(struct rtentry *, struct sockaddr *);
-int rt_mpath_conflict(struct radix_node_head *, struct rtentry *,
-    struct sockaddr *);
-void rtalloc_mpath_fib(struct route *, uint32_t, u_int);
-#define rtalloc_mpath(_route, _hash) rtalloc_mpath_fib((_route), (_hash), 0)
-struct radix_node *rn_mpath_lookup(void *, void *,
-    struct radix_node_head *);
-int rt_mpath_deldup(struct rtentry *, struct rtentry *);
-int	rn4_mpath_inithead(void **, int);
-int	rn6_mpath_inithead(void **, int);
-
-#endif
-
-#endif /* _NET_RADIX_MPATH_H_ */
diff --git a/include.new/net/raw_cb.h b/include.new/net/raw_cb.h
deleted file mode 100644
index 7234da5..0000000
--- a/include.new/net/raw_cb.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1980, 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.
- * 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.
- *
- *	@(#)raw_cb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/net/raw_cb.h 225837 2011-09-28 13:48:36Z bz $
- */
-
-#ifndef _NET_RAW_CB_H_
-#define _NET_RAW_CB_H_
-
-#include <sys/queue.h>
-
-/*
- * Raw protocol interface control block.  Used to tie a socket to the generic
- * raw interface.
- */
-struct rawcb {
-	LIST_ENTRY(rawcb) list;
-	struct	socket *rcb_socket;	/* back pointer to socket */
-	struct	sockproto rcb_proto;	/* protocol family, protocol */
-};
-
-#define	sotorawcb(so)		((struct rawcb *)(so)->so_pcb)
-
-/*
- * Nominal space allocated to a raw socket.
- */
-#define	RAWSNDQ		8192
-#define	RAWRCVQ		8192
-
-#ifdef _KERNEL
-VNET_DECLARE(LIST_HEAD(rawcb_list_head, rawcb), rawcb_list);
-#define	V_rawcb_list	VNET(rawcb_list)
-
-extern struct mtx rawcb_mtx;
-
-/*
- * Generic protosw entries for raw socket protocols.
- */
-pr_ctlinput_t	raw_ctlinput;
-pr_init_t	raw_init;
-
-/*
- * Library routines for raw socket usrreq functions; will always be wrapped
- * so that protocol-specific functions can be handled.
- */
-typedef int (*raw_input_cb_fn)(struct mbuf *, struct sockproto *,
-    struct sockaddr *, struct rawcb *);
-
-int	 raw_attach(struct socket *, int);
-void	 raw_detach(struct rawcb *);
-void	 raw_input(struct mbuf *, struct sockproto *, struct sockaddr *);
-void	 raw_input_ext(struct mbuf *, struct sockproto *, struct sockaddr *,
-	    raw_input_cb_fn);
-
-/*
- * Generic pr_usrreqs entries for raw socket protocols, usually wrapped so
- * that protocol-specific functions can be handled.
- */
-extern	struct pr_usrreqs raw_usrreqs;
-#endif
-
-#endif
diff --git a/include.new/net/route.h b/include.new/net/route.h
deleted file mode 100644
index 629d163..0000000
--- a/include.new/net/route.h
+++ /dev/null
@@ -1,408 +0,0 @@
-/*-
- * Copyright (c) 1980, 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.
- * 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.
- *
- *	@(#)route.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/net/route.h 265717 2014-05-08 21:03:31Z melifaro $
- */
-
-#ifndef _NET_ROUTE_H_
-#define _NET_ROUTE_H_
-
-#include <sys/counter.h>
-
-/*
- * Kernel resident routing tables.
- *
- * The routing tables are initialized when interface addresses
- * are set by making entries for all directly connected interfaces.
- */
-
-/*
- * A route consists of a destination address, a reference
- * to a routing entry, and a reference to an llentry.  
- * These are often held by protocols in their control
- * blocks, e.g. inpcb.
- */
-struct route {
-	struct	rtentry *ro_rt;
-	struct	llentry *ro_lle;
-	struct	in_ifaddr *ro_ia;
-	int		ro_flags;
-	struct	sockaddr ro_dst;
-};
-
-#define	RT_CACHING_CONTEXT	0x1	/* XXX: not used anywhere */
-#define	RT_NORTREF		0x2	/* doesn't hold reference on ro_rt */
-
-struct rt_metrics {
-	u_long	rmx_locks;	/* Kernel must leave these values alone */
-	u_long	rmx_mtu;	/* MTU for this path */
-	u_long	rmx_hopcount;	/* max hops expected */
-	u_long	rmx_expire;	/* lifetime for route, e.g. redirect */
-	u_long	rmx_recvpipe;	/* inbound delay-bandwidth product */
-	u_long	rmx_sendpipe;	/* outbound delay-bandwidth product */
-	u_long	rmx_ssthresh;	/* outbound gateway buffer limit */
-	u_long	rmx_rtt;	/* estimated round trip time */
-	u_long	rmx_rttvar;	/* estimated rtt variance */
-	u_long	rmx_pksent;	/* packets sent using this route */
-	u_long	rmx_weight;	/* route weight */
-	u_long	rmx_filler[3];	/* will be used for T/TCP later */
-};
-
-/*
- * rmx_rtt and rmx_rttvar are stored as microseconds;
- * RTTTOPRHZ(rtt) converts to a value suitable for use
- * by a protocol slowtimo counter.
- */
-#define	RTM_RTTUNIT	1000000	/* units for rtt, rttvar, as units per sec */
-#define	RTTTOPRHZ(r)	((r) / (RTM_RTTUNIT / PR_SLOWHZ))
-
-#define	RT_DEFAULT_FIB	0	/* Explicitly mark fib=0 restricted cases */
-#define	RT_ALL_FIBS	-1	/* Announce event for every fib */
-extern u_int rt_numfibs;	/* number of usable routing tables */
-extern u_int rt_add_addr_allfibs;	/* Announce interfaces to all fibs */
-
-/*
- * We distinguish between routes to hosts and routes to networks,
- * preferring the former if available.  For each route we infer
- * the interface to use from the gateway address supplied when
- * the route was entered.  Routes that forward packets through
- * gateways are marked so that the output routines know to address the
- * gateway rather than the ultimate destination.
- */
-#ifndef RNF_NORMAL
-#include <net/radix.h>
-#ifdef RADIX_MPATH
-#include <net/radix_mpath.h>
-#endif
-#endif
-
-#if defined(_KERNEL) || defined(_WANT_RTENTRY)
-struct rtentry {
-	struct	radix_node rt_nodes[2];	/* tree glue, and other values */
-	/*
-	 * XXX struct rtentry must begin with a struct radix_node (or two!)
-	 * because the code does some casts of a 'struct radix_node *'
-	 * to a 'struct rtentry *'
-	 */
-#define	rt_key(r)	(*((struct sockaddr **)(&(r)->rt_nodes->rn_key)))
-#define	rt_mask(r)	(*((struct sockaddr **)(&(r)->rt_nodes->rn_mask)))
-	struct	sockaddr *rt_gateway;	/* value */
-	struct	ifnet *rt_ifp;		/* the answer: interface to use */
-	struct	ifaddr *rt_ifa;		/* the answer: interface address to use */
-	int		rt_flags;	/* up/down?, host/net */
-	int		rt_refcnt;	/* # held references */
-	u_int		rt_fibnum;	/* which FIB */
-	u_long		rt_mtu;		/* MTU for this path */
-	u_long		rt_weight;	/* absolute weight */ 
-	u_long		rt_expire;	/* lifetime for route, e.g. redirect */
-#define	rt_endzero	rt_pksent
-	counter_u64_t	rt_pksent;	/* packets sent using this route */
-	struct mtx	rt_mtx;		/* mutex for routing entry */
-};
-#endif /* _KERNEL || _WANT_RTENTRY */
-
-#define	RTF_UP		0x1		/* route usable */
-#define	RTF_GATEWAY	0x2		/* destination is a gateway */
-#define	RTF_HOST	0x4		/* host entry (net otherwise) */
-#define	RTF_REJECT	0x8		/* host or net unreachable */
-#define	RTF_DYNAMIC	0x10		/* created dynamically (by redirect) */
-#define	RTF_MODIFIED	0x20		/* modified dynamically (by redirect) */
-#define RTF_DONE	0x40		/* message confirmed */
-/*			0x80		   unused, was RTF_DELCLONE */
-/*			0x100		   unused, was RTF_CLONING */
-#define RTF_XRESOLVE	0x200		/* external daemon resolves name */
-#define RTF_LLINFO	0x400		/* DEPRECATED - exists ONLY for backward 
-					   compatibility */
-#define RTF_LLDATA	0x400		/* used by apps to add/del L2 entries */
-#define RTF_STATIC	0x800		/* manually added */
-#define RTF_BLACKHOLE	0x1000		/* just discard pkts (during updates) */
-#define RTF_PROTO2	0x4000		/* protocol specific routing flag */
-#define RTF_PROTO1	0x8000		/* protocol specific routing flag */
-/*			0x10000		   unused, was RTF_PRCLONING */
-/*			0x20000		   unused, was RTF_WASCLONED */
-#define RTF_PROTO3	0x40000		/* protocol specific routing flag */
-/*			0x80000		   unused */
-#define RTF_PINNED	0x100000	/* route is immutable */
-#define	RTF_LOCAL	0x200000 	/* route represents a local address */
-#define	RTF_BROADCAST	0x400000	/* route represents a bcast address */
-#define	RTF_MULTICAST	0x800000	/* route represents a mcast address */
-					/* 0x8000000 and up unassigned */
-#define	RTF_STICKY	 0x10000000	/* always route dst->src */
-
-#define	RTF_RNH_LOCKED	 0x40000000	/* radix node head is locked */
-
-#define	RTF_GWFLAG_COMPAT 0x80000000	/* a compatibility bit for interacting
-					   with existing routing apps */
-
-/* Mask of RTF flags that are allowed to be modified by RTM_CHANGE. */
-#define RTF_FMASK	\
-	(RTF_PROTO1 | RTF_PROTO2 | RTF_PROTO3 | RTF_BLACKHOLE | \
-	 RTF_REJECT | RTF_STATIC | RTF_STICKY)
-
-/*
- * Routing statistics.
- */
-struct	rtstat {
-	short	rts_badredirect;	/* bogus redirect calls */
-	short	rts_dynamic;		/* routes created by redirects */
-	short	rts_newgateway;		/* routes modified by redirects */
-	short	rts_unreach;		/* lookups which failed */
-	short	rts_wildcard;		/* lookups satisfied by a wildcard */
-};
-/*
- * Structures for routing messages.
- */
-struct rt_msghdr {
-	u_short	rtm_msglen;	/* to skip over non-understood messages */
-	u_char	rtm_version;	/* future binary compatibility */
-	u_char	rtm_type;	/* message type */
-	u_short	rtm_index;	/* index for associated ifp */
-	int	rtm_flags;	/* flags, incl. kern & message, e.g. DONE */
-	int	rtm_addrs;	/* bitmask identifying sockaddrs in msg */
-	pid_t	rtm_pid;	/* identify sender */
-	int	rtm_seq;	/* for sender to identify action */
-	int	rtm_errno;	/* why failed */
-	int	rtm_fmask;	/* bitmask used in RTM_CHANGE message */
-	u_long	rtm_inits;	/* which metrics we are initializing */
-	struct	rt_metrics rtm_rmx; /* metrics themselves */
-};
-
-#define RTM_VERSION	5	/* Up the ante and ignore older versions */
-
-/*
- * Message types.
- */
-#define RTM_ADD		0x1	/* Add Route */
-#define RTM_DELETE	0x2	/* Delete Route */
-#define RTM_CHANGE	0x3	/* Change Metrics or flags */
-#define RTM_GET		0x4	/* Report Metrics */
-#define RTM_LOSING	0x5	/* Kernel Suspects Partitioning */
-#define RTM_REDIRECT	0x6	/* Told to use different route */
-#define RTM_MISS	0x7	/* Lookup failed on this address */
-#define RTM_LOCK	0x8	/* fix specified metrics */
-		    /*	0x9  */
-		    /*	0xa  */
-#define RTM_RESOLVE	0xb	/* req to resolve dst to LL addr */
-#define RTM_NEWADDR	0xc	/* address being added to iface */
-#define RTM_DELADDR	0xd	/* address being removed from iface */
-#define RTM_IFINFO	0xe	/* iface going up/down etc. */
-#define	RTM_NEWMADDR	0xf	/* mcast group membership being added to if */
-#define	RTM_DELMADDR	0x10	/* mcast group membership being deleted */
-#define	RTM_IFANNOUNCE	0x11	/* iface arrival/departure */
-#define	RTM_IEEE80211	0x12	/* IEEE80211 wireless event */
-
-/*
- * Bitmask values for rtm_inits and rmx_locks.
- */
-#define RTV_MTU		0x1	/* init or lock _mtu */
-#define RTV_HOPCOUNT	0x2	/* init or lock _hopcount */
-#define RTV_EXPIRE	0x4	/* init or lock _expire */
-#define RTV_RPIPE	0x8	/* init or lock _recvpipe */
-#define RTV_SPIPE	0x10	/* init or lock _sendpipe */
-#define RTV_SSTHRESH	0x20	/* init or lock _ssthresh */
-#define RTV_RTT		0x40	/* init or lock _rtt */
-#define RTV_RTTVAR	0x80	/* init or lock _rttvar */
-#define RTV_WEIGHT	0x100	/* init or lock _weight */
-
-/*
- * Bitmask values for rtm_addrs.
- */
-#define RTA_DST		0x1	/* destination sockaddr present */
-#define RTA_GATEWAY	0x2	/* gateway sockaddr present */
-#define RTA_NETMASK	0x4	/* netmask sockaddr present */
-#define RTA_GENMASK	0x8	/* cloning mask sockaddr present */
-#define RTA_IFP		0x10	/* interface name sockaddr present */
-#define RTA_IFA		0x20	/* interface addr sockaddr present */
-#define RTA_AUTHOR	0x40	/* sockaddr for author of redirect */
-#define RTA_BRD		0x80	/* for NEWADDR, broadcast or p-p dest addr */
-
-/*
- * Index offsets for sockaddr array for alternate internal encoding.
- */
-#define RTAX_DST	0	/* destination sockaddr present */
-#define RTAX_GATEWAY	1	/* gateway sockaddr present */
-#define RTAX_NETMASK	2	/* netmask sockaddr present */
-#define RTAX_GENMASK	3	/* cloning mask sockaddr present */
-#define RTAX_IFP	4	/* interface name sockaddr present */
-#define RTAX_IFA	5	/* interface addr sockaddr present */
-#define RTAX_AUTHOR	6	/* sockaddr for author of redirect */
-#define RTAX_BRD	7	/* for NEWADDR, broadcast or p-p dest addr */
-#define RTAX_MAX	8	/* size of array to allocate */
-
-struct rt_addrinfo {
-	int	rti_addrs;
-	struct	sockaddr *rti_info[RTAX_MAX];
-	int	rti_flags;
-	struct	ifaddr *rti_ifa;
-	struct	ifnet *rti_ifp;
-};
-
-/*
- * This macro returns the size of a struct sockaddr when passed
- * through a routing socket. Basically we round up sa_len to
- * a multiple of sizeof(long), with a minimum of sizeof(long).
- * The check for a NULL pointer is just a convenience, probably never used.
- * The case sa_len == 0 should only apply to empty structures.
- */
-#define SA_SIZE(sa)						\
-    (  (!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ?	\
-	sizeof(long)		:				\
-	1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1) ) )
-
-#ifdef _KERNEL
-
-#define RT_LINK_IS_UP(ifp)	(!((ifp)->if_capabilities & IFCAP_LINKSTATE) \
-				 || (ifp)->if_link_state == LINK_STATE_UP)
-
-#define	RT_LOCK_INIT(_rt) \
-	mtx_init(&(_rt)->rt_mtx, "rtentry", NULL, MTX_DEF | MTX_DUPOK)
-#define	RT_LOCK(_rt)		mtx_lock(&(_rt)->rt_mtx)
-#define	RT_UNLOCK(_rt)		mtx_unlock(&(_rt)->rt_mtx)
-#define	RT_LOCK_DESTROY(_rt)	mtx_destroy(&(_rt)->rt_mtx)
-#define	RT_LOCK_ASSERT(_rt)	mtx_assert(&(_rt)->rt_mtx, MA_OWNED)
-#define	RT_UNLOCK_COND(_rt)	do {				\
-	if (mtx_owned(&(_rt)->rt_mtx))				\
-		mtx_unlock(&(_rt)->rt_mtx);			\
-} while (0)
-
-#define	RT_ADDREF(_rt)	do {					\
-	RT_LOCK_ASSERT(_rt);					\
-	KASSERT((_rt)->rt_refcnt >= 0,				\
-		("negative refcnt %d", (_rt)->rt_refcnt));	\
-	(_rt)->rt_refcnt++;					\
-} while (0)
-
-#define	RT_REMREF(_rt)	do {					\
-	RT_LOCK_ASSERT(_rt);					\
-	KASSERT((_rt)->rt_refcnt > 0,				\
-		("bogus refcnt %d", (_rt)->rt_refcnt));	\
-	(_rt)->rt_refcnt--;					\
-} while (0)
-
-#define	RTFREE_LOCKED(_rt) do {					\
-	if ((_rt)->rt_refcnt <= 1)				\
-		rtfree(_rt);					\
-	else {							\
-		RT_REMREF(_rt);					\
-		RT_UNLOCK(_rt);					\
-	}							\
-	/* guard against invalid refs */			\
-	_rt = 0;						\
-} while (0)
-
-#define	RTFREE(_rt) do {					\
-	RT_LOCK(_rt);						\
-	RTFREE_LOCKED(_rt);					\
-} while (0)
-
-#define	RO_RTFREE(_ro) do {					\
-	if ((_ro)->ro_rt) {					\
-		if ((_ro)->ro_flags & RT_NORTREF) {		\
-			(_ro)->ro_flags &= ~RT_NORTREF;		\
-			(_ro)->ro_rt = NULL;			\
-		} else {					\
-			RT_LOCK((_ro)->ro_rt);			\
-			RTFREE_LOCKED((_ro)->ro_rt);		\
-		}						\
-	}							\
-} while (0)
-
-struct radix_node_head *rt_tables_get_rnh(int, int);
-
-struct ifmultiaddr;
-
-void	 rt_ieee80211msg(struct ifnet *, int, void *, size_t);
-void	 rt_ifannouncemsg(struct ifnet *, int);
-void	 rt_ifmsg(struct ifnet *);
-void	 rt_missmsg(int, struct rt_addrinfo *, int, int);
-void	 rt_missmsg_fib(int, struct rt_addrinfo *, int, int, int);
-void	 rt_newaddrmsg(int, struct ifaddr *, int, struct rtentry *);
-void	 rt_newaddrmsg_fib(int, struct ifaddr *, int, struct rtentry *, int);
-int	 rt_addrmsg(int, struct ifaddr *, int);
-int	 rt_routemsg(int, struct ifnet *ifp, int, struct rtentry *, int);
-void	 rt_newmaddrmsg(int, struct ifmultiaddr *);
-int	 rt_setgate(struct rtentry *, struct sockaddr *, struct sockaddr *);
-void 	 rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *);
-
-int	rtsock_addrmsg(int, struct ifaddr *, int);
-int	rtsock_routemsg(int, struct ifnet *ifp, int, struct rtentry *, int);
-
-/*
- * Note the following locking behavior:
- *
- *    rtalloc_ign() and rtalloc() return ro->ro_rt unlocked
- *
- *    rtalloc1() returns a locked rtentry
- *
- *    rtfree() and RTFREE_LOCKED() require a locked rtentry
- *
- *    RTFREE() uses an unlocked entry.
- */
-
-int	 rtexpunge(struct rtentry *);
-void	 rtfree(struct rtentry *);
-int	 rt_check(struct rtentry **, struct rtentry **, struct sockaddr *);
-
-/* XXX MRT COMPAT VERSIONS THAT SET UNIVERSE to 0 */
-/* Thes are used by old code not yet converted to use multiple FIBS */
-int	 rt_getifa(struct rt_addrinfo *);
-void	 rtalloc_ign(struct route *ro, u_long ignflags);
-void	 rtalloc(struct route *ro); /* XXX deprecated, use rtalloc_ign(ro, 0) */
-struct rtentry *rtalloc1(struct sockaddr *, int, u_long);
-int	 rtinit(struct ifaddr *, int, int);
-int	 rtioctl(u_long, caddr_t);
-void	 rtredirect(struct sockaddr *, struct sockaddr *,
-	    struct sockaddr *, int, struct sockaddr *);
-int	 rtrequest(int, struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *, int, struct rtentry **);
-
-/* XXX MRT NEW VERSIONS THAT USE FIBs
- * For now the protocol indepedent versions are the same as the AF_INET ones
- * but this will change.. 
- */
-int	 rt_getifa_fib(struct rt_addrinfo *, u_int fibnum);
-void	 rtalloc_ign_fib(struct route *ro, u_long ignflags, u_int fibnum);
-void	 rtalloc_fib(struct route *ro, u_int fibnum);
-struct rtentry *rtalloc1_fib(struct sockaddr *, int, u_long, u_int);
-int	 rtioctl_fib(u_long, caddr_t, u_int);
-void	 rtredirect_fib(struct sockaddr *, struct sockaddr *,
-	    struct sockaddr *, int, struct sockaddr *, u_int);
-int	 rtrequest_fib(int, struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *, int, struct rtentry **, u_int);
-int	 rtrequest1_fib(int, struct rt_addrinfo *, struct rtentry **, u_int);
-
-#include <sys/eventhandler.h>
-typedef void (*rtevent_arp_update_fn)(void *, struct rtentry *, uint8_t *, struct sockaddr *);
-typedef void (*rtevent_redirect_fn)(void *, struct rtentry *, struct rtentry *, struct sockaddr *);
-/* route_arp_update_event is no longer generated; see arp_update_event */
-EVENTHANDLER_DECLARE(route_arp_update_event, rtevent_arp_update_fn);
-EVENTHANDLER_DECLARE(route_redirect_event, rtevent_redirect_fn);
-#endif
-
-#endif
diff --git a/include.new/net/sff8472.h b/include.new/net/sff8472.h
deleted file mode 100644
index c6c1d89..0000000
--- a/include.new/net/sff8472.h
+++ /dev/null
@@ -1,439 +0,0 @@
-/*-
- * Copyright (c) 2013 George V. Neville-Neil
- * 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.
- *
- * 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: releng/10.2/sys/net/sff8472.h 261860 2014-02-14 00:26:30Z gnn $
- */
-
-/*
- * The following set of constants are from Document SFF-8472
- * "Diagnostic Monitoring Interface for Optical Transceivers" revision
- * 11.3 published by the SFF Committee on June 11, 2013
- *
- * The SFF standard defines two ranges of addresses, each 255 bytes
- * long for the storage of data and diagnostics on cables, such as
- * SFP+ optics and TwinAx cables.  The ranges are defined in the
- * following way:
- *
- * Base Address 0xa0 (Identification Data)
- * 0-95    Serial ID Defined by SFP MSA
- * 96-127  Vendor Specific Data
- * 128-255 Reserved
- *
- * Base Address 0xa2 (Diagnostic Data)
- * 0-55    Alarm and Warning Thresholds
- * 56-95   Cal Constants
- * 96-119  Real Time Diagnostic Interface
- * 120-127 Vendor Specific
- * 128-247 User Writable EEPROM
- * 248-255 Vendor Specific
- *
- * Note that not all addresses are supported.  Where support is
- * optional this is noted and instructions for checking for the
- * support are supplied.
- *
- * All these values are read across an I2C (i squared C) bus.  Any
- * device wishing to read these addresses must first have support for
- * i2c calls.  The Chelsio T4/T5 driver (dev/cxgbe) is one such
- * driver.
- */
-
-
-/* Table 3.1 Two-wire interface ID: Data Fields */
-
-enum {
-	SFF_8472_BASE 		= 0xa0,   /* Base address for all our queries. */
-	SFF_8472_ID		= 0,  /* Transceiver Type (Table 3.2) */
-	SFF_8472_EXT_ID		= 1,  /* Extended transceiver type (Table 3.3) */
-	SFF_8472_CONNECTOR	= 2,  /* Connector type (Table 3.4) */
-	SFF_8472_TRANS_START	= 3,  /* Elec or Optical Compatibility
-				    * (Table 3.5) */
-	SFF_8472_TRANS_END	= 10,
-	SFF_8472_ENCODING	= 11, /* Encoding Code for high speed
-				     * serial encoding algorithm (see
-				     * Table 3.6) */
-	SFF_8472_BITRATE	= 12, /* Nominal signaling rate, units
-				     * of 100MBd.  (see details for
-				     * rates > 25.0Gb/s) */
-	SFF_8472_RATEID		= 13, /* Type of rate select
-				     * functionality (see Table
-				     * 3.6a) */
-	SFF_8472_LEN_SMF_KM	= 14, /* Link length supported for single
-				    * mode fiber, units of km */
-	SFF_8472_LEN_SMF	= 15, /* Link length supported for single
-				    * mode fiber, units of 100 m */
-	SFF_8472_LEN_50UM	= 16, /* Link length supported for 50 um
-				    * OM2 fiber, units of 10 m */
-	SFF_8472_LEN_625UM	= 17, /* Link length supported for 62.5
-				    * um OM1 fiber, units of 10 m */
-	SFF_8472_LEN_OM4	= 18, /* Link length supported for 50um
-				    * OM4 fiber, units of 10m.
-				    * Alternatively copper or direct
-				    * attach cable, units of m */
-	SFF_8472_LEN_OM3	= 19, /* Link length supported for 50 um OM3 fiber, units of 10 m */
-	SFF_8472_VENDOR_START 	= 20, /* Vendor name [Address A0h, Bytes
-				    * 20-35] */
-	SFF_8472_VENDOR_END 	= 35,
-	SFF_8472_TRANS		= 36, /* Transceiver Code for electronic
-				    * or optical compatibility (see
-				    * Table 3.5) */
-	SFF_8472_VENDOR_OUI_START	= 37, /* Vendor OUI SFP vendor IEEE
-				    * company ID */
-	SFF_8472_VENDOR_OUI_END	= 39,
-	SFF_8472_PN_START 	= 40, /* Vendor PN */
-	SFF_8472_PN_END 	= 55,
-	SFF_8472_REV_START 	= 56, /* Vendor Revision */
-	SFF_8472_REV_END 	= 59,
-	SFF_8472_WAVELEN_START	= 60, /* Wavelength Laser wavelength
-				    * (Passive/Active Cable
-				    * Specification Compliance) */
-	SFF_8472_WAVELEN_END	= 61,
-	SFF_8472_CC_BASE	= 63, /* CC_BASE Check code for Base ID
-				    * Fields (addresses 0 to 62) */
-
-/*
- * Extension Fields (optional) check the options before reading other
- * addresses.
- */
-	SFF_8472_OPTIONS_MSB	= 64, /* Options Indicates which optional
-				    * transceiver signals are
-				    * implemented */
-	SFF_8472_OPTIONS_LSB	= 65, /* (see Table 3.7) */
-	SFF_8472_BR_MAX		= 66, /* BR max Upper bit rate margin,
-				    * units of % (see details for
-				    * rates > 25.0Gb/s) */
-	SFF_8472_BR_MIN		= 67, /* Lower bit rate margin, units of
-				    * % (see details for rates >
-				    * 25.0Gb/s) */
-	SFF_8472_SN_START 	= 68, /* Vendor SN [Address A0h, Bytes 68-83] */
-	SFF_8472_SN_END 	= 83,
-	SFF_8472_DATE_START	= 84, /* Date code Vendor’s manufacturing
-				    * date code (see Table 3.8) */
-	SFF_8472_DATE_END	= 91,
-	SFF_8472_DIAG_TYPE	= 92, /* Diagnostic Monitoring Type
-				    * Indicates which type of
-				    * diagnostic monitoring is
-				    * implemented (if any) in the
-				    * transceiver (see Table 3.9)
-				    */
-
-	SFF_8472_ENHANCED	= 93, /* Enhanced Options Indicates which
-				    * optional enhanced features are
-				    * implemented (if any) in the
-				    * transceiver (see Table 3.10) */
-	SFF_8472_COMPLIANCE	= 94, /* SFF-8472 Compliance Indicates
-				    * which revision of SFF-8472 the
-				    * transceiver complies with.  (see
-				    * Table 3.12)*/
-	SFF_8472_CC_EXT		= 95, /* Check code for the Extended ID
-				    * Fields (addresses 64 to 94)
-				    */
-
-	SFF_8472_VENDOR_RSRVD_START	= 96,
-	SFF_8472_VENDOR_RSRVD_END	= 127,
-
-	SFF_8472_RESERVED_START	= 128,
-	SFF_8472_RESERVED_END	= 255
-};
-
-#define SFF_8472_DIAG_IMPL	(1 << 6) /* Required to be 1 */
-#define SFF_8472_DIAG_INTERNAL	(1 << 5) /* Internal measurements. */
-#define SFF_8472_DIAG_EXTERNAL	(1 << 4) /* External measurements. */
-#define SFF_8472_DIAG_POWER	(1 << 3) /* Power measurement type */
-#define SFF_8472_DIAG_ADDR_CHG	(1 << 2) /* Address change required.
-					  * See SFF-8472 doc. */
-
- /*
-  * Diagnostics are available at the two wire address 0xa2.  All
-  * diagnostics are OPTIONAL so you should check 0xa0 registers 92 to
-  * see which, if any are supported.
-  */
-
-enum {SFF_8472_DIAG = 0xa2};  /* Base address for diagnostics. */
-
- /*
-  *  Table 3.15 Alarm and Warning Thresholds All values are 2 bytes
-  * and MUST be read in a single read operation starting at the MSB
-  */
-
-enum {
-	SFF_8472_TEMP_HIGH_ALM		= 0, /* Temp High Alarm  */
-	SFF_8472_TEMP_LOW_ALM		= 2, /* Temp Low Alarm */
-	SFF_8472_TEMP_HIGH_WARN		= 4, /* Temp High Warning */
-	SFF_8472_TEMP_LOW_WARN		= 6, /* Temp Low Warning */
-	SFF_8472_VOLTAGE_HIGH_ALM	= 8, /* Voltage High Alarm */
-	SFF_8472_VOLTAGE_LOW_ALM	= 10, /* Voltage Low Alarm */
-	SFF_8472_VOLTAGE_HIGH_WARN	= 12, /* Voltage High Warning */
-	SFF_8472_VOLTAGE_LOW_WARN	= 14, /* Voltage Low Warning */
-	SFF_8472_BIAS_HIGH_ALM		= 16, /* Bias High Alarm */
-	SFF_8472_BIAS_LOW_ALM		= 18, /* Bias Low Alarm */
-	SFF_8472_BIAS_HIGH_WARN		= 20, /* Bias High Warning */
-	SFF_8472_BIAS_LOW_WARN		= 22, /* Bias Low Warning */
-	SFF_8472_TX_POWER_HIGH_ALM	= 24, /* TX Power High Alarm */
-	SFF_8472_TX_POWER_LOW_ALM	= 26, /* TX Power Low Alarm */
-	SFF_8472_TX_POWER_HIGH_WARN	= 28, /* TX Power High Warning */
-	SFF_8472_TX_POWER_LOW_WARN	= 30, /* TX Power Low Warning */
-	SFF_8472_RX_POWER_HIGH_ALM	= 32, /* RX Power High Alarm */
-	SFF_8472_RX_POWER_LOW_ALM	= 34, /* RX Power Low Alarm */
-	SFF_8472_RX_POWER_HIGH_WARN	= 36, /* RX Power High Warning */
-	SFF_8472_RX_POWER_LOW_WARN	= 38, /* RX Power Low Warning */
-
-	SFF_8472_RX_POWER4	= 56, /* Rx_PWR(4) Single precision
-				    *  floating point calibration data
-				    *  - Rx optical power. Bit 7 of
-				    *  byte 56 is MSB. Bit 0 of byte
-				    *  59 is LSB. Rx_PWR(4) should be
-				    *  set to zero for “internally
-				    *  calibrated” devices. */
-	SFF_8472_RX_POWER3	= 60, /* Rx_PWR(3) Single precision
-				    * floating point calibration data
-				    * - Rx optical power.  Bit 7 of
-				    * byte 60 is MSB. Bit 0 of byte 63
-				    * is LSB. Rx_PWR(3) should be set
-				    * to zero for “internally
-				    * calibrated” devices.*/
-	SFF_8472_RX_POWER2	= 64, /* Rx_PWR(2) Single precision
-				    * floating point calibration data,
-				    * Rx optical power.  Bit 7 of byte
-				    * 64 is MSB, bit 0 of byte 67 is
-				    * LSB. Rx_PWR(2) should be set to
-				    * zero for “internally calibrated”
-				    * devices. */
-	SFF_8472_RX_POWER1	= 68, /* Rx_PWR(1) Single precision
-				    * floating point calibration data,
-				    * Rx optical power. Bit 7 of byte
-				    * 68 is MSB, bit 0 of byte 71 is
-				    * LSB. Rx_PWR(1) should be set to
-				    * 1 for “internally calibrated”
-				    * devices. */
-	SFF_8472_RX_POWER0	= 72, /* Rx_PWR(0) Single precision
-				    * floating point calibration data,
-				    * Rx optical power. Bit 7 of byte
-				    * 72 is MSB, bit 0 of byte 75 is
-				    * LSB. Rx_PWR(0) should be set to
-				    * zero for “internally calibrated”
-				    * devices. */
-	SFF_8472_TX_I_SLOPE	= 76, /* Tx_I(Slope) Fixed decimal
-				    * (unsigned) calibration data,
-				    * laser bias current. Bit 7 of
-				    * byte 76 is MSB, bit 0 of byte 77
-				    * is LSB. Tx_I(Slope) should be
-				    * set to 1 for “internally
-				    * calibrated” devices. */
-	SFF_8472_TX_I_OFFSET	= 78, /* Tx_I(Offset) Fixed decimal
-				    * (signed two’s complement)
-				    * calibration data, laser bias
-				    * current. Bit 7 of byte 78 is
-				    * MSB, bit 0 of byte 79 is
-				    * LSB. Tx_I(Offset) should be set
-				    * to zero for “internally
-				    * calibrated” devices. */
-	SFF_8472_TX_POWER_SLOPE	= 80, /* Tx_PWR(Slope) Fixed decimal
-				    * (unsigned) calibration data,
-				    * transmitter coupled output
-				    * power. Bit 7 of byte 80 is MSB,
-				    * bit 0 of byte 81 is LSB.
-				    * Tx_PWR(Slope) should be set to 1
-				    * for “internally calibrated”
-				    * devices. */
-	SFF_8472_TX_POWER_OFFSET	= 82, /* Tx_PWR(Offset) Fixed decimal
-					    * (signed two’s complement)
-					    * calibration data, transmitter
-					    * coupled output power. Bit 7 of
-					    * byte 82 is MSB, bit 0 of byte 83
-					    * is LSB. Tx_PWR(Offset) should be
-					    * set to zero for “internally
-					    * calibrated” devices. */
-	SFF_8472_T_SLOPE	= 84, /* T (Slope) Fixed decimal
-				    * (unsigned) calibration data,
-				    * internal module temperature. Bit
-				    * 7 of byte 84 is MSB, bit 0 of
-				    * byte 85 is LSB.  T(Slope) should
-				    * be set to 1 for “internally
-				    * calibrated” devices. */
-	SFF_8472_T_OFFSET	= 86, /* T (Offset) Fixed decimal (signed
-				    * two’s complement) calibration
-				    * data, internal module
-				    * temperature. Bit 7 of byte 86 is
-				    * MSB, bit 0 of byte 87 is LSB.
-				    * T(Offset) should be set to zero
-				    * for “internally calibrated”
-				    * devices. */
-	SFF_8472_V_SLOPE	= 88, /* V (Slope) Fixed decimal
-				    * (unsigned) calibration data,
-				    * internal module supply
-				    * voltage. Bit 7 of byte 88 is
-				    * MSB, bit 0 of byte 89 is
-				    * LSB. V(Slope) should be set to 1
-				    * for “internally calibrated”
-				    * devices. */
-	SFF_8472_V_OFFSET	= 90, /* V (Offset) Fixed decimal (signed
-				    * two’s complement) calibration
-				    * data, internal module supply
-				    * voltage. Bit 7 of byte 90 is
-				    * MSB. Bit 0 of byte 91 is
-				    * LSB. V(Offset) should be set to
-				    * zero for “internally calibrated”
-				    * devices. */
-	SFF_8472_CHECKSUM	= 95, /* Checksum Byte 95 contains the
-				    * low order 8 bits of the sum of
-				    * bytes 0 – 94. */
-	/* Internal measurements. */
-
-	SFF_8472_TEMP	 	= 96, /* Internally measured module temperature. */
-	SFF_8472_VCC 		= 98, /* Internally measured supply
-				    * voltage in transceiver.
-				    */
-	SFF_8472_TX_BIAS	= 100, /* Internally measured TX Bias Current. */
-	SFF_8472_TX_POWER	= 102, /* Measured TX output power. */
-	SFF_8472_RX_POWER	= 104, /* Measured RX input power. */
-
-	SFF_8472_STATUS		= 110 /* See below */
-};
- /* Status Bits Described */
-
-/*
- * TX Disable State Digital state of the TX Disable Input Pin. Updated
- * within 100ms of change on pin.
- */
-#define SFF_8472_STATUS_TX_DISABLE  (1 << 7) 
-
-/*
- * Select Read/write bit that allows software disable of
- * laser. Writing ‘1’ disables laser. See Table 3.11 for
- * enable/disable timing requirements. This bit is “OR”d with the hard
- * TX_DISABLE pin value. Note, per SFP MSA TX_DISABLE pin is default
- * enabled unless pulled low by hardware. If Soft TX Disable is not
- * implemented, the transceiver ignores the value of this bit. Default
- * power up value is zero/low.
- */
-#define SFF_8472_STATUS_SOFT_TX_DISABLE (1 << 6) 
-
-/*
- * RS(1) State Digital state of SFP input pin AS(1) per SFF-8079 or
- * RS(1) per SFF-8431. Updated within 100ms of change on pin. See A2h
- * Byte 118, Bit 3 for Soft RS(1) Select control information.
- */
-#define SFF_8472_RS_STATE (1 << 5) 
-
-/*
- * Rate_Select State [aka. “RS(0)”] Digital state of the SFP
- * Rate_Select Input Pin. Updated within 100ms of change on pin. Note:
- * This pin is also known as AS(0) in SFF-8079 and RS(0) in SFF-8431.
- */ 
-#define SFF_8472_STATUS_SELECT_STATE (1 << 4)
-     
-/*
- * Read/write bit that allows software rate select control. Writing
- * ‘1’ selects full bandwidth operation. This bit is “OR’d with the
- * hard Rate_Select, AS(0) or RS(0) pin value. See Table 3.11 for
- * timing requirements. Default at power up is logic zero/low. If Soft
- * Rate Select is not implemented, the transceiver ignores the value
- * of this bit. Note: Specific transceiver behaviors of this bit are
- * identified in Table 3.6a and referenced documents. See Table 3.18a,
- * byte 118, bit 3 for Soft RS(1) Select.
- */
-#define SFF_8472_STATUS_SOFT_RATE_SELECT (1 << 3)
-
-/*
- * TX Fault State Digital state of the TX Fault Output Pin. Updated
- * within 100ms of change on pin.
- */
-#define SFF_8472_STATUS_TX_FAULT_STATE (1 << 2)
-
-/*
- * Digital state of the RX_LOS Output Pin. Updated within 100ms of
- * change on pin.
- */
-#define SFF_8472_STATUS_RX_LOS (1 << 1)
-
-/*
- * Indicates transceiver has achieved power up and data is ready. Bit
- * remains high until data is ready to be read at which time the
- * device sets the bit low.
- */
-#define SFF_8472_STATUS_DATA_READY (1 << 0)
-
-/* Table 3.2 Identifier values */
-enum {
-	SFF_8472_ID_UNKNOWN	= 0x0, /* Unknown or unspecified */
-	SFF_8472_ID_GBIC	= 0x1, /* GBIC */
-	SFF_8472_ID_SFF		= 0x2, /* Module soldered to motherboard (ex: SFF)*/
-	SFF_8472_ID_SFP		= 0x3, /* SFP or SFP “Plus” */
-	SFF_8472_ID_XBI		= 0x4, /* Reserved for “300 pin XBI” devices */
-	SFF_8472_ID_XENPAK	= 0x5, /* Reserved for “Xenpak” devices */
-	SFF_8472_ID_XFP		= 0x6, /* Reserved for “XFP” devices */
-	SFF_8472_ID_XFF		= 0x7, /* Reserved for “XFF” devices */
-	SFF_8472_ID_XFPE	= 0x8, /* Reserved for “XFP-E” devices */
-	SFF_8472_ID_XPAK	= 0x9, /* Reserved for “XPak” devices */
-	SFF_8472_ID_X2		= 0xA, /* Reserved for “X2” devices */
-	SFF_8472_ID_DWDM_SFP	= 0xB, /* Reserved for “DWDM-SFP” devices */
-	SFF_8472_ID_QSFP	= 0xC, /* Reserved for “QSFP” devices */
-	SFF_8472_ID_LAST	= SFF_8472_ID_QSFP
-	};
-
-static char *sff_8472_id[SFF_8472_ID_LAST + 1] = {"Unknown",
-					     "GBIC",
-					     "SFF",
-					     "SFP",
-					     "XBI",
-					     "Xenpak",
-					     "XFP",
-					     "XFF",
-					     "XFP-E",
-					     "XPak",
-					     "X2",
-					     "DWDM-SFP",
-					     "QSFP"};
-
-/* Table 3.13 and 3.14 Temperature Conversion Values */
-#define SFF_8472_TEMP_SIGN (1 << 15)
-#define SFF_8472_TEMP_SHIFT  8
-#define SFF_8472_TEMP_MSK  0xEF00
-#define SFF_8472_TEMP_FRAC 0x00FF
-
-/* Internal Callibration Conversion factors */
-
-/*
- * Represented as a 16 bit unsigned integer with the voltage defined
- * as the full 16 bit value (0 – 65535) with LSB equal to 100 uVolt,
- * yielding a total range of 0 to +6.55 Volts.
- */
-#define SFF_8472_VCC_FACTOR 10000.0 
-
-/*
- * Represented as a 16 bit unsigned integer with the current defined
- * as the full 16 bit value (0 – 65535) with LSB equal to 2 uA,
- * yielding a total range of 0 to 131 mA.
- */
-
-#define SFF_8472_BIAS_FACTOR 2000.0 
-
-/*
- * Represented as a 16 bit unsigned integer with the power defined as
- * the full 16 bit value (0 – 65535) with LSB equal to 0.1 uW,
- * yielding a total range of 0 to 6.5535 mW (~ -40 to +8.2 dBm).
- */
-
-#define SFF_8472_POWER_FACTOR 10000.0
diff --git a/include.new/net/slcompress.h b/include.new/net/slcompress.h
deleted file mode 100644
index d56497e..0000000
--- a/include.new/net/slcompress.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Definitions for tcp compression routines.
- */
-/*-
- * Copyright (c) 1989, 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.
- * 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.
- *
- *	Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
- *	- Initial distribution.
- * $FreeBSD: releng/10.2/sys/net/slcompress.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NET_SLCOMPRESS_H_
-#define _NET_SLCOMPRESS_H_
-
-#define MAX_STATES 16		/* must be > 2 and < 256 */
-#define MAX_HDR 128
-
-/*
- * Compressed packet format:
- *
- * The first octet contains the packet type (top 3 bits), TCP
- * 'push' bit, and flags that indicate which of the 4 TCP sequence
- * numbers have changed (bottom 5 bits).  The next octet is a
- * conversation number that associates a saved IP/TCP header with
- * the compressed packet.  The next two octets are the TCP checksum
- * from the original datagram.  The next 0 to 15 octets are
- * sequence number changes, one change per bit set in the header
- * (there may be no changes and there are two special cases where
- * the receiver implicitly knows what changed -- see below).
- *
- * There are 5 numbers which can change (they are always inserted
- * in the following order): TCP urgent pointer, window,
- * acknowledgement, sequence number and IP ID.  (The urgent pointer
- * is different from the others in that its value is sent, not the
- * change in value.)  Since typical use of SLIP links is biased
- * toward small packets (see comments on MTU/MSS below), changes
- * use a variable length coding with one octet for numbers in the
- * range 1 - 255 and 3 octets (0, MSB, LSB) for numbers in the
- * range 256 - 65535 or 0.  (If the change in sequence number or
- * ack is more than 65535, an uncompressed packet is sent.)
- */
-
-/*
- * Packet types (must not conflict with IP protocol version)
- *
- * The top nibble of the first octet is the packet type.  There are
- * three possible types: IP (not proto TCP or tcp with one of the
- * control flags set); uncompressed TCP (a normal IP/TCP packet but
- * with the 8-bit protocol field replaced by an 8-bit connection id --
- * this type of packet syncs the sender & receiver); and compressed
- * TCP (described above).
- *
- * LSB of 4-bit field is TCP "PUSH" bit (a worthless anachronism) and
- * is logically part of the 4-bit "changes" field that follows.  Top
- * three bits are actual packet type.  For backward compatibility
- * and in the interest of conserving bits, numbers are chosen so the
- * IP protocol version number (4) which normally appears in this nibble
- * means "IP packet".
- */
-
-/* packet types */
-#define TYPE_IP 0x40
-#define TYPE_UNCOMPRESSED_TCP 0x70
-#define TYPE_COMPRESSED_TCP 0x80
-#define TYPE_ERROR 0x00
-
-/* Bits in first octet of compressed packet */
-#define NEW_C	0x40	/* flag bits for what changed in a packet */
-#define NEW_I	0x20
-#define NEW_S	0x08
-#define NEW_A	0x04
-#define NEW_W	0x02
-#define NEW_U	0x01
-
-/* reserved, special-case values of above */
-#define SPECIAL_I (NEW_S|NEW_W|NEW_U)		/* echoed interactive traffic */
-#define SPECIAL_D (NEW_S|NEW_A|NEW_W|NEW_U)	/* unidirectional data */
-#define SPECIALS_MASK (NEW_S|NEW_A|NEW_W|NEW_U)
-
-#define TCP_PUSH_BIT 0x10
-
-
-/*
- * "state" data for each active tcp conversation on the wire.  This is
- * basically a copy of the entire IP/TCP header from the last packet
- * we saw from the conversation together with a small identifier
- * the transmit & receive ends of the line use to locate saved header.
- */
-struct cstate {
-	struct cstate *cs_next;	/* next most recently used cstate (xmit only) */
-	u_int16_t cs_hlen;	/* size of hdr (receive only) */
-	u_char cs_id;		/* connection # associated with this state */
-	u_char cs_filler;
-	union {
-		char csu_hdr[MAX_HDR];
-		struct ip csu_ip;	/* ip/tcp hdr from most recent packet */
-	} slcs_u;
-};
-#define cs_ip slcs_u.csu_ip
-#define cs_hdr slcs_u.csu_hdr
-
-/*
- * all the state data for one serial line (we need one of these
- * per line).
- */
-struct slcompress {
-	struct cstate *last_cs;	/* most recently used tstate */
-	u_char last_recv;	/* last rcvd conn. id */
-	u_char last_xmit;	/* last sent conn. id */
-	u_int16_t flags;
-#ifndef SL_NO_STATS
-	int sls_packets;	/* outbound packets */
-	int sls_compressed;	/* outbound compressed packets */
-	int sls_searches;	/* searches for connection state */
-	int sls_misses;		/* times couldn't find conn. state */
-	int sls_uncompressedin;	/* inbound uncompressed packets */
-	int sls_compressedin;	/* inbound compressed packets */
-	int sls_errorin;	/* inbound unknown type packets */
-	int sls_tossed;		/* inbound packets tossed because of error */
-#endif
-	struct cstate tstate[MAX_STATES];	/* xmit connection states */
-	struct cstate rstate[MAX_STATES];	/* receive connection states */
-};
-/* flag values */
-#define SLF_TOSS 1		/* tossing rcvd frames because of input err */
-
-void	 sl_compress_init(struct slcompress *, int);
-u_int	 sl_compress_tcp(struct mbuf *, struct ip *, struct slcompress *, int);
-int	 sl_uncompress_tcp(u_char **, int, u_int, struct slcompress *);
-int	 sl_uncompress_tcp_core(u_char *, int, int, u_int,
-	    struct slcompress *, u_char **, u_int *);
-
-#endif /* !_NET_SLCOMPRESS_H_ */
diff --git a/include.new/net/slip.h b/include.new/net/slip.h
deleted file mode 100644
index e361ae4..0000000
--- a/include.new/net/slip.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	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.
- * 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.
- *
- *	@(#)slip.h	8.1 (Berkeley) 2/12/94
- * $FreeBSD: src/sys/net/slip.h,v 1.10 2004/04/07 20:46:12 imp Exp $
- */
-
-#ifndef _NET_SLIP_H_
-#define	_NET_SLIP_H_
-
-/* Ioctls operating on SLIP ttys. */
-#define	SLIOCGUNIT	_IOR('t', 88, int)	/* get slip unit number */
-#define	SLIOCSKEEPAL	_IOW('t', 84, int)	/* set keepalive */
-#define	SLIOCSOUTFILL	_IOW('t', 83, int)	/* set out fill time */
-#define	SLIOCGKEEPAL	_IOR('t', 82, int)	/* get keepalive time */
-#define	SLIOCGOUTFILL	_IOR('t', 81, int)	/* get out fill time */
-#define	SLIOCSUNIT	_IOW('t', 80, int)	/* set slip unit number */
-
-/*
- * Definitions of the pseudo-link-level header attached to slip
- * packets grabbed by the packet filter (bpf) traffic monitor.
- */
-#define	SLIP_HDRLEN	16		/* BPF SLIP header length */
-
-/* Offsets into BPF SLIP header. */
-#define	SLX_DIR		0		/* direction; see below */
-#define	SLX_CHDR	1		/* compressed header data */
-#define	CHDR_LEN	15		/* length of compressed header data */
-
-#define	SLIPDIR_IN	0		/* incoming */
-#define	SLIPDIR_OUT	1		/* outgoing */
-
-#endif /* !_NET_SLIP_H */
diff --git a/include.new/net/vnet.h b/include.new/net/vnet.h
deleted file mode 100644
index 8a00073..0000000
--- a/include.new/net/vnet.h
+++ /dev/null
@@ -1,491 +0,0 @@
-/*-
- * Copyright (c) 2006-2009 University of Zagreb
- * Copyright (c) 2006-2009 FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by the University of Zagreb and the
- * FreeBSD Foundation under sponsorship by the Stichting NLnet and the
- * FreeBSD Foundation.
- *
- * Copyright (c) 2009 Jeffrey Roberson <jeff@freebsd.org>
- * Copyright (c) 2009 Robert N. M. Watson
- * 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.
- *
- * 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: releng/10.2/sys/net/vnet.h 262735 2014-03-04 14:05:37Z glebius $
- */
-
-/*-
- * This header file defines several sets of interfaces supporting virtualized
- * network stacks:
- *
- * - Definition of 'struct vnet' and functions and macros to allocate/free/
- *   manipulate it.
- *
- * - A virtual network stack memory allocator, which provides support for
- *   virtualized global variables via a special linker set, set_vnet.
- *
- * - Virtualized sysinits/sysuninits, which allow constructors and
- *   destructors to be run for each network stack subsystem as virtual
- *   instances are created and destroyed.
- *
- * If VIMAGE isn't compiled into the kernel, virtualized global variables
- * compile to normal global variables, and virtualized sysinits to regular
- * sysinits.
- */
-
-#ifndef _NET_VNET_H_
-#define	_NET_VNET_H_
-
-/*
- * struct vnet describes a virtualized network stack, and is primarily a
- * pointer to storage for virtualized global variables.  Expose to userspace
- * as required for libkvm.
- */
-#if defined(_KERNEL) || defined(_WANT_VNET)
-#include <sys/queue.h>
-
-struct vnet {
-	LIST_ENTRY(vnet)	 vnet_le;	/* all vnets list */
-	u_int			 vnet_magic_n;
-	u_int			 vnet_ifcnt;
-	u_int			 vnet_sockcnt;
-	void			*vnet_data_mem;
-	uintptr_t		 vnet_data_base;
-};
-#define	VNET_MAGIC_N	0x3e0d8f29
-
-/*
- * These two virtual network stack allocator definitions are also required
- * for libkvm so that it can evaluate virtualized global variables.
- */
-#define	VNET_SETNAME		"set_vnet"
-#define	VNET_SYMPREFIX		"vnet_entry_"
-#endif
-
-#ifdef _KERNEL
-
-#define	VNET_PCPUSTAT_DECLARE(type, name)	\
-    VNET_DECLARE(counter_u64_t, name[sizeof(type) / sizeof(uint64_t)])
-
-#define	VNET_PCPUSTAT_DEFINE(type, name)	\
-    VNET_DEFINE(counter_u64_t, name[sizeof(type) / sizeof(uint64_t)])
-
-#define	VNET_PCPUSTAT_ALLOC(name, wait)	\
-    COUNTER_ARRAY_ALLOC(VNET(name), \
-	sizeof(VNET(name)) / sizeof(counter_u64_t), (wait))
-
-#define	VNET_PCPUSTAT_FREE(name)	\
-    COUNTER_ARRAY_FREE(VNET(name), sizeof(VNET(name)) / sizeof(counter_u64_t))
-
-#define	VNET_PCPUSTAT_ADD(type, name, f, v)	\
-    counter_u64_add(VNET(name)[offsetof(type, f) / sizeof(uint64_t)], (v))
-
-#define	VNET_PCPUSTAT_SYSINIT(name)	\
-static void				\
-vnet_##name##_init(const void *unused)	\
-{					\
-	VNET_PCPUSTAT_ALLOC(name, M_WAITOK);	\
-}					\
-VNET_SYSINIT(vnet_ ## name ## _init, SI_SUB_PROTO_IFATTACHDOMAIN,	\
-    SI_ORDER_ANY, vnet_ ## name ## _init, NULL)
-
-#define	VNET_PCPUSTAT_SYSUNINIT(name)					\
-static void								\
-vnet_##name##_uninit(const void *unused)				\
-{									\
-	VNET_PCPUSTAT_FREE(name);					\
-}									\
-VNET_SYSUNINIT(vnet_ ## name ## _uninit, SI_SUB_PROTO_IFATTACHDOMAIN,	\
-    SI_ORDER_ANY, vnet_ ## name ## _uninit, NULL)
-
-#define	SYSCTL_VNET_PCPUSTAT(parent, nbr, name, type, array, desc)	\
-static int								\
-array##_sysctl(SYSCTL_HANDLER_ARGS)					\
-{									\
-	type s;								\
-	CTASSERT((sizeof(type) / sizeof(uint64_t)) ==			\
-	    (sizeof(VNET(array)) / sizeof(counter_u64_t)));		\
-	COUNTER_ARRAY_COPY(VNET(array), &s, sizeof(type) / sizeof(uint64_t));\
-	if (req->newptr)						\
-		COUNTER_ARRAY_ZERO(VNET(array),				\
-		    sizeof(type) / sizeof(uint64_t));			\
-	return (SYSCTL_OUT(req, &s, sizeof(type)));			\
-}									\
-SYSCTL_VNET_PROC(parent, nbr, name, CTLTYPE_OPAQUE | CTLFLAG_RW, NULL,	\
-    0, array ## _sysctl, "I", desc)
-
-#ifdef VIMAGE
-#include <sys/lock.h>
-#include <sys/proc.h>			/* for struct thread */
-#include <sys/rwlock.h>
-#include <sys/sx.h>
-
-/*
- * Location of the kernel's 'set_vnet' linker set.
- */
-extern uintptr_t	*__start_set_vnet;
-__GLOBL(__start_set_vnet);
-extern uintptr_t	*__stop_set_vnet;
-__GLOBL(__stop_set_vnet);
-
-#define	VNET_START	(uintptr_t)&__start_set_vnet
-#define	VNET_STOP	(uintptr_t)&__stop_set_vnet
-
-/*
- * Functions to allocate and destroy virtual network stacks.
- */
-struct vnet *vnet_alloc(void);
-void	vnet_destroy(struct vnet *vnet);
-
-/*
- * The current virtual network stack -- we may wish to move this to struct
- * pcpu in the future.
- */
-#define	curvnet	curthread->td_vnet
-
-/*
- * Various macros -- get and set the current network stack, but also
- * assertions.
- */
-#if defined(INVARIANTS) || defined(VNET_DEBUG)
-#define	VNET_ASSERT(exp, msg)	do {					\
-	if (!(exp))							\
-		panic msg;						\
-} while (0)
-#else
-#define	VNET_ASSERT(exp, msg)	do {					\
-} while (0)
-#endif
-
-#ifdef VNET_DEBUG
-void vnet_log_recursion(struct vnet *, const char *, int);
-
-#define	CURVNET_SET_QUIET(arg)						\
-	VNET_ASSERT((arg) != NULL && (arg)->vnet_magic_n == VNET_MAGIC_N, \
-	    ("CURVNET_SET at %s:%d %s() curvnet=%p vnet=%p",		\
-	    __FILE__, __LINE__, __func__, curvnet, (arg)));		\
-	struct vnet *saved_vnet = curvnet;				\
-	const char *saved_vnet_lpush = curthread->td_vnet_lpush;	\
-	curvnet = arg;							\
-	curthread->td_vnet_lpush = __func__;
- 
-#define	CURVNET_SET_VERBOSE(arg)					\
-	CURVNET_SET_QUIET(arg)						\
-	if (saved_vnet)							\
-		vnet_log_recursion(saved_vnet, saved_vnet_lpush, __LINE__);
-
-#define	CURVNET_SET(arg)	CURVNET_SET_VERBOSE(arg)
- 
-#define	CURVNET_RESTORE()						\
-	VNET_ASSERT(curvnet != NULL && (saved_vnet == NULL ||		\
-	    saved_vnet->vnet_magic_n == VNET_MAGIC_N),			\
-	    ("CURVNET_RESTORE at %s:%d %s() curvnet=%p saved_vnet=%p",	\
-	    __FILE__, __LINE__, __func__, curvnet, saved_vnet));	\
-	curvnet = saved_vnet;						\
-	curthread->td_vnet_lpush = saved_vnet_lpush;
-#else /* !VNET_DEBUG */
-
-#define	CURVNET_SET_QUIET(arg)						\
-	VNET_ASSERT((arg) != NULL && (arg)->vnet_magic_n == VNET_MAGIC_N, \
-	    ("CURVNET_SET at %s:%d %s() curvnet=%p vnet=%p",		\
-	    __FILE__, __LINE__, __func__, curvnet, (arg)));		\
-	struct vnet *saved_vnet = curvnet;				\
-	curvnet = arg;	
- 
-#define	CURVNET_SET_VERBOSE(arg)					\
-	CURVNET_SET_QUIET(arg)
-
-#define	CURVNET_SET(arg)	CURVNET_SET_VERBOSE(arg)
- 
-#define	CURVNET_RESTORE()						\
-	VNET_ASSERT(curvnet != NULL && (saved_vnet == NULL ||		\
-	    saved_vnet->vnet_magic_n == VNET_MAGIC_N),			\
-	    ("CURVNET_RESTORE at %s:%d %s() curvnet=%p saved_vnet=%p",	\
-	    __FILE__, __LINE__, __func__, curvnet, saved_vnet));	\
-	curvnet = saved_vnet;
-#endif /* VNET_DEBUG */
-
-extern struct vnet *vnet0;
-#define	IS_DEFAULT_VNET(arg)	((arg) == vnet0)
-
-#define	CRED_TO_VNET(cr)	(cr)->cr_prison->pr_vnet
-#define	TD_TO_VNET(td)		CRED_TO_VNET((td)->td_ucred)
-#define	P_TO_VNET(p)		CRED_TO_VNET((p)->p_ucred)
-
-/*
- * Global linked list of all virtual network stacks, along with read locks to
- * access it.  If a caller may sleep while accessing the list, it must use
- * the sleepable lock macros.
- */
-LIST_HEAD(vnet_list_head, vnet);
-extern struct vnet_list_head vnet_head;
-extern struct rwlock vnet_rwlock;
-extern struct sx vnet_sxlock;
-
-#define	VNET_LIST_RLOCK()		sx_slock(&vnet_sxlock)
-#define	VNET_LIST_RLOCK_NOSLEEP()	rw_rlock(&vnet_rwlock)
-#define	VNET_LIST_RUNLOCK()		sx_sunlock(&vnet_sxlock)
-#define	VNET_LIST_RUNLOCK_NOSLEEP()	rw_runlock(&vnet_rwlock)
-
-/*
- * Iteration macros to walk the global list of virtual network stacks.
- */
-#define	VNET_ITERATOR_DECL(arg)	struct vnet *arg
-#define	VNET_FOREACH(arg)	LIST_FOREACH((arg), &vnet_head, vnet_le)
-
-/*
- * Virtual network stack memory allocator, which allows global variables to
- * be automatically instantiated for each network stack instance.
- */
-#define	VNET_NAME(n)		vnet_entry_##n
-#define	VNET_DECLARE(t, n)	extern t VNET_NAME(n)
-#define	VNET_DEFINE(t, n)	t VNET_NAME(n) __section(VNET_SETNAME) __used
-#define	_VNET_PTR(b, n)		(__typeof(VNET_NAME(n))*)		\
-				    ((b) + (uintptr_t)&VNET_NAME(n))
-
-#define	_VNET(b, n)		(*_VNET_PTR(b, n))
-
-/*
- * Virtualized global variable accessor macros.
- */
-#define	VNET_VNET_PTR(vnet, n)		_VNET_PTR((vnet)->vnet_data_base, n)
-#define	VNET_VNET(vnet, n)		(*VNET_VNET_PTR((vnet), n))
-
-#define	VNET_PTR(n)		VNET_VNET_PTR(curvnet, n)
-#define	VNET(n)			VNET_VNET(curvnet, n)
-
-/*
- * Virtual network stack allocator interfaces from the kernel linker.
- */
-void	*vnet_data_alloc(int size);
-void	 vnet_data_copy(void *start, int size);
-void	 vnet_data_free(void *start_arg, int size);
-
-/*
- * Sysctl variants for vnet-virtualized global variables.  Include
- * <sys/sysctl.h> to expose these definitions.
- *
- * Note: SYSCTL_PROC() handler functions will need to resolve pointer
- * arguments themselves, if required.
- */
-#ifdef SYSCTL_OID
-#define	SYSCTL_VNET_INT(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_OID(parent, nbr, name,					\
-	    CTLTYPE_INT|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access),		\
-	    ptr, val, sysctl_handle_int, "I", descr)
-#define	SYSCTL_VNET_PROC(parent, nbr, name, access, ptr, arg, handler,	\
-	    fmt, descr)							\
-	CTASSERT(((access) & CTLTYPE) != 0);				\
-	SYSCTL_OID(parent, nbr, name, CTLFLAG_VNET|(access), ptr, arg, 	\
-	    handler, fmt, descr)
-#define	SYSCTL_VNET_OPAQUE(parent, nbr, name, access, ptr, len, fmt,    \
-	    descr)							\
-	SYSCTL_OID(parent, nbr, name,					\
-	    CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr, len, 		\
-	    sysctl_handle_opaque, fmt, descr)
-#define	SYSCTL_VNET_STRING(parent, nbr, name, access, arg, len, descr)	\
-	SYSCTL_OID(parent, nbr, name,					\
-	    CTLTYPE_STRING|CTLFLAG_VNET|(access),			\
-	    arg, len, sysctl_handle_string, "A", descr)
-#define	SYSCTL_VNET_STRUCT(parent, nbr, name, access, ptr, type, descr)	\
-	SYSCTL_OID(parent, nbr, name,					\
-	    CTLTYPE_OPAQUE|CTLFLAG_VNET|(access), ptr,			\
-	    sizeof(struct type), sysctl_handle_opaque, "S," #type,	\
-	    descr)
-#define	SYSCTL_VNET_UINT(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_OID(parent, nbr, name,					\
-	    CTLTYPE_UINT|CTLFLAG_MPSAFE|CTLFLAG_VNET|(access),		\
-	    ptr, val, sysctl_handle_int, "IU", descr)
-#define	VNET_SYSCTL_ARG(req, arg1) do {					\
-	if (arg1 != NULL)						\
-		arg1 = (void *)(TD_TO_VNET((req)->td)->vnet_data_base +	\
-		    (uintptr_t)(arg1));					\
-} while (0)
-#endif /* SYSCTL_OID */
-
-/*
- * Virtual sysinit mechanism, allowing network stack components to declare
- * startup and shutdown methods to be run when virtual network stack
- * instances are created and destroyed.
- */
-#include <sys/kernel.h>
-
-/*
- * SYSINIT/SYSUNINIT variants that provide per-vnet constructors and
- * destructors.
- */
-struct vnet_sysinit {
-	enum sysinit_sub_id	subsystem;
-	enum sysinit_elem_order	order;
-	sysinit_cfunc_t		func;
-	const void		*arg;
-	TAILQ_ENTRY(vnet_sysinit) link;
-};
-
-#define	VNET_SYSINIT(ident, subsystem, order, func, arg)		\
-	static struct vnet_sysinit ident ## _vnet_init = {		\
-		subsystem,						\
-		order,							\
-		(sysinit_cfunc_t)(sysinit_nfunc_t)func,			\
-		(arg)							\
-	};								\
-	SYSINIT(vnet_init_ ## ident, subsystem, order,			\
-	    vnet_register_sysinit, &ident ## _vnet_init);		\
-	SYSUNINIT(vnet_init_ ## ident, subsystem, order,		\
-	    vnet_deregister_sysinit, &ident ## _vnet_init)
-
-#define	VNET_SYSUNINIT(ident, subsystem, order, func, arg)		\
-	static struct vnet_sysinit ident ## _vnet_uninit = {		\
-		subsystem,						\
-		order,							\
-		(sysinit_cfunc_t)(sysinit_nfunc_t)func,			\
-		(arg)							\
-	};								\
-	SYSINIT(vnet_uninit_ ## ident, subsystem, order,		\
-	    vnet_register_sysuninit, &ident ## _vnet_uninit);		\
-	SYSUNINIT(vnet_uninit_ ## ident, subsystem, order,		\
-	    vnet_deregister_sysuninit, &ident ## _vnet_uninit)
-
-/*
- * Run per-vnet sysinits or sysuninits during vnet creation/destruction.
- */
-void	 vnet_sysinit(void);
-void	 vnet_sysuninit(void);
-
-/*
- * Interfaces for managing per-vnet constructors and destructors.
- */
-void	vnet_register_sysinit(void *arg);
-void	vnet_register_sysuninit(void *arg);
-void	vnet_deregister_sysinit(void *arg);
-void	vnet_deregister_sysuninit(void *arg);
-
-/*
- * EVENTHANDLER(9) extensions.
- */
-#include <sys/eventhandler.h>
-
-void	vnet_global_eventhandler_iterator_func(void *, ...);
-#define VNET_GLOBAL_EVENTHANDLER_REGISTER_TAG(tag, name, func, arg, priority) \
-do {									\
-	if (IS_DEFAULT_VNET(curvnet)) {					\
-		(tag) = vimage_eventhandler_register(NULL, #name, func,	\
-		    arg, priority,					\
-		    vnet_global_eventhandler_iterator_func);		\
-	}								\
-} while(0)
-#define VNET_GLOBAL_EVENTHANDLER_REGISTER(name, func, arg, priority)	\
-do {									\
-	if (IS_DEFAULT_VNET(curvnet)) {					\
-		vimage_eventhandler_register(NULL, #name, func,		\
-		    arg, priority,					\
-		    vnet_global_eventhandler_iterator_func);		\
-	}								\
-} while(0)
-
-#else /* !VIMAGE */
-
-/*
- * Various virtual network stack macros compile to no-ops without VIMAGE.
- */
-#define	curvnet			NULL
-
-#define	VNET_ASSERT(exp, msg)
-#define	CURVNET_SET(arg)
-#define	CURVNET_SET_QUIET(arg)
-#define	CURVNET_RESTORE()
-
-#define	VNET_LIST_RLOCK()
-#define	VNET_LIST_RLOCK_NOSLEEP()
-#define	VNET_LIST_RUNLOCK()
-#define	VNET_LIST_RUNLOCK_NOSLEEP()
-#define	VNET_ITERATOR_DECL(arg)
-#define	VNET_FOREACH(arg)
-
-#define	IS_DEFAULT_VNET(arg)	1
-#define	CRED_TO_VNET(cr)	NULL
-#define	TD_TO_VNET(td)		NULL
-#define	P_TO_VNET(p)		NULL
-
-/*
- * Versions of the VNET macros that compile to normal global variables and
- * standard sysctl definitions.
- */
-#define	VNET_NAME(n)		n
-#define	VNET_DECLARE(t, n)	extern t n
-#define	VNET_DEFINE(t, n)	t n
-#define	_VNET_PTR(b, n)		&VNET_NAME(n)
-
-/*
- * Virtualized global variable accessor macros.
- */
-#define	VNET_VNET_PTR(vnet, n)		(&(n))
-#define	VNET_VNET(vnet, n)		(n)
-
-#define	VNET_PTR(n)		(&(n))
-#define	VNET(n)			(n)
-
-/*
- * When VIMAGE isn't compiled into the kernel, virtaulized SYSCTLs simply
- * become normal SYSCTLs.
- */
-#ifdef SYSCTL_OID
-#define	SYSCTL_VNET_INT(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_INT(parent, nbr, name, access, ptr, val, descr)
-#define	SYSCTL_VNET_PROC(parent, nbr, name, access, ptr, arg, handler,	\
-	    fmt, descr)							\
-	SYSCTL_PROC(parent, nbr, name, access, ptr, arg, handler, fmt,	\
-	    descr)
-#define	SYSCTL_VNET_OPAQUE(parent, nbr, name, access, ptr, len, fmt,    \
-	    descr)							\
-	SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr)
-#define	SYSCTL_VNET_STRING(parent, nbr, name, access, arg, len, descr)	\
-	SYSCTL_STRING(parent, nbr, name, access, arg, len, descr)
-#define	SYSCTL_VNET_STRUCT(parent, nbr, name, access, ptr, type, descr)	\
-	SYSCTL_STRUCT(parent, nbr, name, access, ptr, type, descr)
-#define	SYSCTL_VNET_UINT(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_UINT(parent, nbr, name, access, ptr, val, descr)
-#define	VNET_SYSCTL_ARG(req, arg1)
-#endif /* SYSCTL_OID */
-
-/*
- * When VIMAGE isn't compiled into the kernel, VNET_SYSINIT/VNET_SYSUNINIT
- * map into normal sysinits, which have the same ordering properties.
- */
-#define	VNET_SYSINIT(ident, subsystem, order, func, arg)		\
-	SYSINIT(ident, subsystem, order, func, arg)
-#define	VNET_SYSUNINIT(ident, subsystem, order, func, arg)		\
-	SYSUNINIT(ident, subsystem, order, func, arg)
-
-/*
- * Without VIMAGE revert to the default implementation.
- */
-#define VNET_GLOBAL_EVENTHANDLER_REGISTER_TAG(tag, name, func, arg, priority) \
-	(tag) = eventhandler_register(NULL, #name, func, arg, priority)
-#define VNET_GLOBAL_EVENTHANDLER_REGISTER(name, func, arg, priority)	\
-	eventhandler_register(NULL, #name, func, arg, priority)
-#endif /* VIMAGE */
-#endif /* _KERNEL */
-
-#endif /* !_NET_VNET_H_ */
diff --git a/include.new/net/zlib.h b/include.new/net/zlib.h
deleted file mode 100644
index 9a48498..0000000
--- a/include.new/net/zlib.h
+++ /dev/null
@@ -1,1025 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/net/zlib.h 245102 2013-01-06 14:59:59Z peter $	*/
-
-/*
- * This file is derived from zlib.h and zconf.h from the zlib-1.0.4
- * distribution by Jean-loup Gailly and Mark Adler, with some additions
- * by Paul Mackerras to aid in implementing Deflate compression and
- * decompression for PPP packets.
- */
-
-/*
- *  ==FILEVERSION 971127==
- *
- * This marker is used by the Linux installation script to determine
- * whether an up-to-date version of this file is already installed.
- */
-
-
-/* +++ zlib.h */
-/*-
-  zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.0.4, Jul 24th, 1996.
-
-  Copyright (C) 1995-1996 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  gzip@prep.ai.mit.edu    madler@alumni.caltech.edu
-*/
-/*
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef _ZLIB_H
-#define _ZLIB_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/* +++ zconf.h */
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-1996 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* From: zconf.h,v 1.20 1996/07/02 15:09:28 me Exp $ */
-
-#ifndef _ZCONF_H
-#define _ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_	z_deflateInit_
-#  define deflate	z_deflate
-#  define deflateEnd	z_deflateEnd
-#  define inflateInit_ 	z_inflateInit_
-#  define inflate	z_inflate
-#  define inflateEnd	z_inflateEnd
-#  define deflateInit2_	z_deflateInit2_
-#  define deflateSetDictionary z_deflateSetDictionary
-#  define deflateCopy	z_deflateCopy
-#  define deflateReset	z_deflateReset
-#  define deflateParams	z_deflateParams
-#  define inflateInit2_	z_inflateInit2_
-#  define inflateSetDictionary z_inflateSetDictionary
-#  define inflateSync	z_inflateSync
-#  define inflateReset	z_inflateReset
-#  define compress	z_compress
-#  define uncompress	z_uncompress
-#  define adler32	z_adler32
-#if 0
-#  define crc32		z_crc32
-#  define get_crc_table z_get_crc_table
-#endif
-
-#  define Byte		z_Byte
-#  define uInt		z_uInt
-#  define uLong		z_uLong
-#  define Bytef	        z_Bytef
-#  define charf		z_charf
-#  define intf		z_intf
-#  define uIntf		z_uIntf
-#  define uLongf	z_uLongf
-#  define voidpf	z_voidpf
-#  define voidp		z_voidp
-#endif
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(__i386__)
-#  ifndef __32BIT__
-#    define __32BIT__
-#  endif
-#endif
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#if defined(MSDOS) && !defined(__32BIT__)
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
-#  define STDC
-#endif
-#if (defined(__STDC__) || defined(__cplusplus)) && !defined(STDC)
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2 */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            1 << (windowBits+2)   +  1 << (memLevel+9)
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
-   /* MSC small or medium model */
-#  define SMALL_MEDIUM
-#  ifdef _MSC_VER
-#    define FAR __far
-#  else
-#    define FAR far
-#  endif
-#endif
-#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
-#  ifndef __32BIT__
-#    define SMALL_MEDIUM
-#    define FAR __far
-#  endif
-#endif
-#ifndef FAR
-#   define FAR
-#endif
-
-typedef unsigned char  Byte;  /* 8 bits */
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#if defined(__BORLANDC__) && defined(SMALL_MEDIUM)
-   /* Borland C/C++ ignores FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void FAR *voidpf;
-   typedef void     *voidp;
-#else
-   typedef Byte FAR *voidpf;
-   typedef Byte     *voidp;
-#endif
-
-
-/* Compile with -DZLIB_DLL for Windows DLL support */
-#if (defined(_WINDOWS) || defined(WINDOWS)) && defined(ZLIB_DLL)
-#  include <windows.h>
-#  define EXPORT  WINAPI
-#else
-#  define EXPORT
-#endif
-
-#endif /* _ZCONF_H */
-/* --- zconf.h */
-
-#define ZLIB_VERSION "1.0.4P"
-
-/* 
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms may be added later and will have the same
-  stream interface.
-
-     For compression the application must provide the output buffer and
-  may optionally provide the input buffer for optimization. For decompression,
-  the application must provide the input buffer and may optionally provide
-  the output buffer for optimization.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The library does not install any signal handler. It is recommended to
-  add at least a handler for SIGSEGV when decompressing; the library checks
-  the consistency of the input data whenever possible but may go nuts
-  for some forms of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    const char     *msg; /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: ascii or binary */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_PACKET_FLUSH	2
-#define Z_SYNC_FLUSH    3
-#define Z_FULL_FLUSH    4
-#define Z_FINISH        5
-/* Allowed flush values; see deflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_ASCII    1
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-extern const char * EXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/* 
-extern int EXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-extern int EXPORT deflate OF((z_streamp strm, int flush));
-/*
-  Performs one or both of the following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    If the parameter flush is set to Z_PARTIAL_FLUSH, the current compression
-  block is terminated and flushed to the output buffer so that the
-  decompressor can get all input data available so far. For method 9, a future
-  variant on method 8, the current block will be flushed but not terminated.
-  Z_SYNC_FLUSH has the same effect as partial flush except that the compressed
-  output is byte aligned (the compressor can clear its internal bit buffer)
-  and the current block is always terminated; this can be useful if the
-  compressor has to be restarted from scratch after an interruption (in which
-  case the internal state of the compressor may be lost).
-    If flush is set to Z_FULL_FLUSH, the compression block is terminated, a
-  special marker is output and the compression dictionary is discarded; this
-  is useful to allow the decompressor to synchronize if one compressed block
-  has been damaged (see inflateSync below).  Flushing degrades compression and
-  so should be used only when necessary.  Using Z_FULL_FLUSH too often can
-  seriously degrade the compression. If deflate returns with avail_out == 0,
-  this function must be called again with the same value of the flush
-  parameter and more output space (updated avail_out), until the flush is
-  complete (deflate returns with non-zero avail_out).
-
-    If the parameter flush is set to Z_PACKET_FLUSH, the compression
-  block is terminated, and a zero-length stored block is output,
-  omitting the length bytes (the effect of this is that the 3-bit type
-  code 000 for a stored block is output, and the output is then
-  byte-aligned).  This is designed for use at the end of a PPP packet.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-  
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() may update data_type if it can make a good guess about
-  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible.
-*/
-
-
-extern int EXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/* 
-extern int EXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, inflateInit updates them to use default
-   allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_VERSION_ERROR if the zlib library version is incompatible
-   with the version assumed by the caller.  msg is set to null if there is no
-   error message. inflateInit does not perform any decompression: this will be
-   done by inflate().
-*/
-
-#if defined(__FreeBSD__) && defined(_KERNEL)
-#define inflate       _zlib104_inflate     /* FreeBSD already has an inflate :-( */
-#endif
-
-extern int EXPORT inflate OF((z_streamp strm, int flush));
-/*
-  Performs one or both of the following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    If the parameter flush is set to Z_PARTIAL_FLUSH or Z_PACKET_FLUSH,
-  inflate flushes as much output as possible to the output buffer. The
-  flushing behavior of inflate is not specified for values of the flush
-  parameter other than Z_PARTIAL_FLUSH, Z_PACKET_FLUSH or Z_FINISH, but the
-  current implementation actually flushes as much output as possible
-  anyway.  For Z_PACKET_FLUSH, inflate checks that once all the input data
-  has been consumed, it is expecting to see the length field of a stored
-  block; if not, it returns Z_DATA_ERROR.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster routine
-  may be used for the single inflate() call.
-
-    inflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if the end of the
-  compressed data has been reached and all uncompressed output has been
-  produced, Z_NEED_DICT if a preset dictionary is needed at this point (see
-  inflateSetDictionary below), Z_DATA_ERROR if the input data was corrupted,
-  Z_STREAM_ERROR if the stream structure was inconsistent (for example if
-  next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in
-  the output buffer when Z_FINISH is used. In the Z_DATA_ERROR case, the
-  application may then call inflateSync to look for a good compression block.
-  In the Z_NEED_DICT case, strm->adler is set to the Adler32 value of the
-  dictionary chosen by the compressor.
-*/
-
-
-extern int EXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*   
-extern int EXPORT deflateInit2 OF((z_streamp strm,
-                                   int  level,
-                                   int  method,
-                                   int  windowBits,
-                                   int  memLevel,
-                                   int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library. (Method 9 will allow a 64K history buffer and
-   partial block flushes.)
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library (the value 16 will be allowed for method 9). Larger
-   values of this parameter result in better compression at the expense of
-   memory usage. The default value is 15 if deflateInit is used instead.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match).  Filtered data consists mostly of small values with a
-   somewhat random distribution. In this case, the compression algorithm is
-   tuned to compress them better. The effect of Z_FILTERED is to force more
-   Huffman coding and less string matching; it is somewhat intermediate
-   between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
-   the compression ratio but not the correctness of the compressed output even
-   if it is not set appropriately.
-
-     If next_in is not null, the library will use this buffer to hold also
-   some history information; the buffer must either hold the entire input
-   data, or have at least 1<<(windowBits+1) bytes and be writable. If next_in
-   is null, the library will allocate its own history buffer (and leave next_in
-   null). next_out need not be provided here but must be provided by the
-   application for the next call of deflate().
-
-     If the history buffer is provided by the application, next_in must
-   must never be changed by the application since the compressor maintains
-   information inside this buffer from call to call; the application
-   must provide more input only by increasing avail_in. next_in is always
-   reset by the library in this case.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
-   not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
-   an invalid method). msg is set to null if there is no error message.
-   deflateInit2 does not perform any compression: this will be done by
-   deflate(). 
-*/
-                            
-extern int EXPORT deflateSetDictionary OF((z_streamp strm,
-                                           const Bytef *dictionary,
-				           uInt  dictLength));
-/*
-     Initializes the compression dictionary (history buffer) from the given
-   byte sequence without producing any compressed output. This function must
-   be called immediately after deflateInit or deflateInit2, before any call
-   of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and
-   can be predicted with good accuracy; the data can then be compressed better
-   than with the default empty dictionary. In this version of the library,
-   only the last 32K bytes of the dictionary are used.
-     Upon return of this function, strm->adler is set to the Adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The Adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.)
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state
-   is inconsistent (for example if deflate has already been called for this
-   stream). deflateSetDictionary does not perform any compression: this will
-   be done by deflate(). 
-*/
-
-extern int EXPORT deflateCopy OF((z_streamp dest,
-                                  z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.  If
-   the source stream is using an application-supplied history buffer, a new
-   buffer is allocated for the destination stream.  The compressed output
-   buffer is always application-supplied. It's the responsibility of the
-   application to provide the correct values of next_out and avail_out for the
-   next call of deflate.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-extern int EXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-extern int EXPORT deflateParams OF((z_streamp strm, int level, int strategy));
-/*
-     Dynamically update the compression level and compression strategy.
-   This can be used to switch between compression and straight copy of
-   the input data, or to switch to a different kind of input data requiring
-   a different strategy. If the compression level is changed, the input
-   available so far is compressed with the old level (and may be flushed);
-   the new level will take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-extern int EXPORT deflateOutputPending OF((z_streamp strm));
-/*
-     Returns the number of bytes of output which are immediately
-   available from the compressor (i.e. without any further input
-   or flush).
-*/
-
-/*   
-extern int EXPORT inflateInit2 OF((z_streamp strm,
-                                   int  windowBits));
-
-     This is another version of inflateInit with more compression options. The
-   fields next_out, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library (the value 16 will be allowed soon). The
-   default value is 15 if inflateInit is used instead. If a compressed stream
-   with a larger window size is given as input, inflate() will return with
-   the error code Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     If next_out is not null, the library will use this buffer for the history
-   buffer; the buffer must either be large enough to hold the entire output
-   data, or have at least 1<<windowBits bytes.  If next_out is null, the
-   library will allocate its own buffer (and leave next_out null). next_in
-   need not be provided here but must be provided by the application for the
-   next call of inflate().
-
-     If the history buffer is provided by the application, next_out must
-   never be changed by the application since the decompressor maintains
-   history information inside this buffer from call to call; the application
-   can only reset next_out to the beginning of the history buffer when
-   avail_out is zero and all output has been consumed.
-
-      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was
-   not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as
-   windowBits < 8). msg is set to null if there is no error message.
-   inflateInit2 does not perform any decompression: this will be done by
-   inflate().
-*/
-
-extern int EXPORT inflateSetDictionary OF((z_streamp strm,
-				           const Bytef *dictionary,
-					   uInt  dictLength));
-/*
-     Initializes the decompression dictionary (history buffer) from the given
-   uncompressed byte sequence. This function must be called immediately after
-   a call of inflate if this call returned Z_NEED_DICT. The dictionary chosen
-   by the compressor can be determined from the Adler32 value returned by this
-   call of inflate. The compressor and decompressor must use exactly the same
-   dictionary (see deflateSetDictionary).
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-extern int EXPORT inflateSync OF((z_streamp strm));
-/* 
-    Skips invalid compressed data until the special marker (see deflate()
-  above) can be found, or until all available input is skipped. No output
-  is provided.
-
-    inflateSync returns Z_OK if the special marker has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no marker has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-extern int EXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-extern int inflateIncomp OF((z_stream *strm));
-/*
-     This function adds the data at next_in (avail_in bytes) to the output
-   history without performing any output.  There must be no pending output,
-   and the decompressor must be expecting to see the start of a block.
-   Calling this function is equivalent to decompressing a stored block
-   containing the data at next_in (except that the data is not output).
-*/
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level, window size,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-extern int EXPORT compress OF((Bytef *dest,   uLongf *destLen,
-			       const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least 0.1% larger than
-   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-extern int EXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-				 const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-
-
-typedef voidp gzFile;
-
-extern gzFile EXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9").  gzopen can be used to read a file which is not in gzip format;
-   in this case gzread will directly read from the file without decompression.
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).
-*/
-
-extern gzFile EXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-extern int EXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-extern int EXPORT    gzwrite OF((gzFile file, const voidp buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-extern int EXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-extern int EXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-extern const char * EXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the filesystem and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-extern uLong EXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-#if 0
-extern uLong EXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running crc with the bytes buf[0..len-1] and return the updated
-   crc. If buf is NULL, this function returns the required initial value
-   for the crc. Pre- and post-conditioning (one's complement) is performed
-   within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-#endif
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-extern int EXPORT deflateInit_ OF((z_streamp strm, int level,
-			           const char *version, int stream_size));
-extern int EXPORT inflateInit_ OF((z_streamp strm,
-				   const char *version, int stream_size));
-extern int EXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-				    int windowBits, int memLevel, int strategy,
-				    const char *version, int stream_size));
-extern int EXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-				    const char *version, int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-		      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-
-#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-uLongf *get_crc_table OF((void)); /* can be used by asm versions of crc32() */
-
-#ifdef _KERNEL
-struct vnode;
-extern gzFile gz_open     OF((const char *path, const char *mode,
-	                              struct vnode *vp));
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ZLIB_H */
-/* --- zlib.h */
diff --git a/include.new/net/zutil.h b/include.new/net/zutil.h
deleted file mode 100644
index 2cec5c3..0000000
--- a/include.new/net/zutil.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-1996 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* From: zutil.h,v 1.16 1996/07/24 13:41:13 me Exp $ */
-/* $FreeBSD: releng/10.2/sys/net/zutil.h 204552 2010-03-02 06:58:58Z alfred $ */
-
-#ifndef _Z_UTIL_H
-#define _Z_UTIL_H
-
-#define ZEXPORT
-
-#ifdef _KERNEL
-#include <net/zlib.h>
-#else
-#include "zlib.h"
-#endif
-
-#ifdef _KERNEL
-/* Assume this is a *BSD or SVR4 kernel */
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/systm.h>
-#include <sys/module.h>
-#include <sys/errno.h>
-#include <sys/param.h>
-#include <sys/kernel.h>
-#  define HAVE_MEMCPY
-#  define memcpy(d, s, n)	bcopy((s), (d), (n))
-#  define memset(d, v, n)	bzero((d), (n))
-#  define memcmp		bcmp
-
-#else
-#if defined(__KERNEL__)
-/* Assume this is a Linux kernel */
-#include <linux/string.h>
-#define HAVE_MEMCPY
-
-#else /* not kernel */
-
-#if defined(MSDOS)||defined(VMS)||defined(CRAY)||defined(WIN32)||defined(RISCOS)
-#   include <stddef.h>
-#   include <errno.h>
-#else
-    extern int errno;
-#endif
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#endif /* __KERNEL__ */
-#endif /* _KERNEL */
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = (const char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#ifdef MSDOS
-#  define OS_CODE  0x00
-#  ifdef __TURBOC__
-#    include <alloc.h>
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
-#  endif
-#endif
-
-#ifdef OS2
-#  define OS_CODE  0x06
-#endif
-
-#ifdef WIN32 /* Window 95 & Windows NT */
-#  define OS_CODE  0x0b
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
-#  define FOPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  0x01
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
-#endif
-
-#ifdef MACOS
-#  define OS_CODE  0x07
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0F
-#endif
-
-#ifdef TOPS20
-#  define OS_CODE  0x0a
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-        /* Common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef FOPEN
-#  define FOPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#ifdef HAVE_STRERROR
-   extern char *strerror OF((int));
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
-#if defined(pyr)
-#  define NO_MEMCPY
-#endif
-#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(_MSC_VER)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  */
-#  define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#  define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-#else
-   extern void zmemcpy  OF((Bytef* dest, Bytef* source, uInt len));
-   extern int  zmemcmp  OF((Bytef* s1,   Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG_ZLIB
-#  include <stdio.h>
-#  ifndef verbose
-#    define verbose 0
-#  endif
-   extern void z_error    OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) fprintf x
-#  define Tracev(x) {if (verbose) fprintf x ;}
-#  define Tracevv(x) {if (verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-
-typedef uLong (*check_func) OF((uLong check, const Bytef *buf, uInt len));
-
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-#endif /* _Z_UTIL_H */
diff --git a/include.new/net80211/_ieee80211.h b/include.new/net80211/_ieee80211.h
deleted file mode 100644
index 6d733c3..0000000
--- a/include.new/net80211/_ieee80211.h
+++ /dev/null
@@ -1,405 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/_ieee80211.h 237871 2012-07-01 04:25:49Z adrian $
- */
-#ifndef _NET80211__IEEE80211_H_
-#define _NET80211__IEEE80211_H_
-
-/*
- * 802.11 implementation definitions.
- *
- * NB: this file is used by applications.
- */
-
-/*
- * PHY type; mostly used to identify FH phys.
- */
-enum ieee80211_phytype {
-	IEEE80211_T_DS,			/* direct sequence spread spectrum */
-	IEEE80211_T_FH,			/* frequency hopping */
-	IEEE80211_T_OFDM,		/* frequency division multiplexing */
-	IEEE80211_T_TURBO,		/* high rate OFDM, aka turbo mode */
-	IEEE80211_T_HT,			/* high throughput */
-	IEEE80211_T_OFDM_HALF,		/* 1/2 rate OFDM */
-	IEEE80211_T_OFDM_QUARTER,	/* 1/4 rate OFDM */
-};
-#define	IEEE80211_T_CCK	IEEE80211_T_DS	/* more common nomenclature */
-
-/*
- * PHY mode; this is not really a mode as multi-mode devices
- * have multiple PHY's.  Mode is mostly used as a shorthand
- * for constraining which channels to consider in setting up
- * operation.  Modes used to be used more extensively when
- * channels were identified as IEEE channel numbers.
- */
-enum ieee80211_phymode {
-	IEEE80211_MODE_AUTO	= 0,	/* autoselect */
-	IEEE80211_MODE_11A	= 1,	/* 5GHz, OFDM */
-	IEEE80211_MODE_11B	= 2,	/* 2GHz, CCK */
-	IEEE80211_MODE_11G	= 3,	/* 2GHz, OFDM */
-	IEEE80211_MODE_FH	= 4,	/* 2GHz, GFSK */
-	IEEE80211_MODE_TURBO_A	= 5,	/* 5GHz, OFDM, 2x clock */
-	IEEE80211_MODE_TURBO_G	= 6,	/* 2GHz, OFDM, 2x clock */
-	IEEE80211_MODE_STURBO_A	= 7,	/* 5GHz, OFDM, 2x clock, static */
-	IEEE80211_MODE_11NA	= 8,	/* 5GHz, w/ HT */
-	IEEE80211_MODE_11NG	= 9,	/* 2GHz, w/ HT */
-	IEEE80211_MODE_HALF	= 10,	/* OFDM, 1/2x clock */
-	IEEE80211_MODE_QUARTER	= 11,	/* OFDM, 1/4x clock */
-};
-#define	IEEE80211_MODE_MAX	(IEEE80211_MODE_QUARTER+1)
-
-/*
- * Operating mode.  Devices do not necessarily support
- * all modes; they indicate which are supported in their
- * capabilities.
- */
-enum ieee80211_opmode {
-	IEEE80211_M_IBSS 	= 0,	/* IBSS (adhoc) station */
-	IEEE80211_M_STA		= 1,	/* infrastructure station */
-	IEEE80211_M_WDS		= 2,	/* WDS link */
-	IEEE80211_M_AHDEMO	= 3,	/* Old lucent compatible adhoc demo */
-	IEEE80211_M_HOSTAP	= 4,	/* Software Access Point */
-	IEEE80211_M_MONITOR	= 5,	/* Monitor mode */
-	IEEE80211_M_MBSS	= 6,	/* MBSS (Mesh Point) link */
-};
-#define	IEEE80211_OPMODE_MAX	(IEEE80211_M_MBSS+1)
-
-/*
- * 802.11g/802.11n protection mode.
- */
-enum ieee80211_protmode {
-	IEEE80211_PROT_NONE	= 0,	/* no protection */
-	IEEE80211_PROT_CTSONLY	= 1,	/* CTS to self */
-	IEEE80211_PROT_RTSCTS	= 2,	/* RTS-CTS */
-};
-
-/*
- * Authentication mode.  The open and shared key authentication
- * modes are implemented within the 802.11 layer.  802.1x and
- * WPA/802.11i are implemented in user mode by setting the
- * 802.11 layer into IEEE80211_AUTH_8021X and deferring
- * authentication to user space programs.
- */
-enum ieee80211_authmode {
-	IEEE80211_AUTH_NONE	= 0,
-	IEEE80211_AUTH_OPEN	= 1,		/* open */
-	IEEE80211_AUTH_SHARED	= 2,		/* shared-key */
-	IEEE80211_AUTH_8021X	= 3,		/* 802.1x */
-	IEEE80211_AUTH_AUTO	= 4,		/* auto-select/accept */
-	/* NB: these are used only for ioctls */
-	IEEE80211_AUTH_WPA	= 5,		/* WPA/RSN w/ 802.1x/PSK */
-};
-
-/*
- * Roaming mode is effectively who controls the operation
- * of the 802.11 state machine when operating as a station.
- * State transitions are controlled either by the driver
- * (typically when management frames are processed by the
- * hardware/firmware), the host (auto/normal operation of
- * the 802.11 layer), or explicitly through ioctl requests
- * when applications like wpa_supplicant want control.
- */
-enum ieee80211_roamingmode {
-	IEEE80211_ROAMING_DEVICE= 0,	/* driver/hardware control */
-	IEEE80211_ROAMING_AUTO	= 1,	/* 802.11 layer control */
-	IEEE80211_ROAMING_MANUAL= 2,	/* application control */
-};
-
-/*
- * Channels are specified by frequency and attributes.
- */
-struct ieee80211_channel {
-	uint32_t	ic_flags;	/* see below */
-	uint16_t	ic_freq;	/* setting in MHz */
-	uint8_t		ic_ieee;	/* IEEE channel number */
-	int8_t		ic_maxregpower;	/* maximum regulatory tx power in dBm */
-	int8_t		ic_maxpower;	/* maximum tx power in .5 dBm */
-	int8_t		ic_minpower;	/* minimum tx power in .5 dBm */
-	uint8_t		ic_state;	/* dynamic state */
-	uint8_t		ic_extieee;	/* HT40 extension channel number */
-	int8_t		ic_maxantgain;	/* maximum antenna gain in .5 dBm */
-	uint8_t		ic_pad;
-	uint16_t	ic_devdata;	/* opaque device/driver data */
-};
-
-#define	IEEE80211_CHAN_MAX	256
-#define	IEEE80211_CHAN_BYTES	32	/* howmany(IEEE80211_CHAN_MAX, NBBY) */
-#define	IEEE80211_CHAN_ANY	0xffff	/* token for ``any channel'' */
-#define	IEEE80211_CHAN_ANYC \
-	((struct ieee80211_channel *) IEEE80211_CHAN_ANY)
-
-/* channel attributes */
-#define	IEEE80211_CHAN_PRIV0	0x00000001 /* driver private bit 0 */
-#define	IEEE80211_CHAN_PRIV1	0x00000002 /* driver private bit 1 */
-#define	IEEE80211_CHAN_PRIV2	0x00000004 /* driver private bit 2 */
-#define	IEEE80211_CHAN_PRIV3	0x00000008 /* driver private bit 3 */
-#define	IEEE80211_CHAN_TURBO	0x00000010 /* Turbo channel */
-#define	IEEE80211_CHAN_CCK	0x00000020 /* CCK channel */
-#define	IEEE80211_CHAN_OFDM	0x00000040 /* OFDM channel */
-#define	IEEE80211_CHAN_2GHZ	0x00000080 /* 2 GHz spectrum channel. */
-#define	IEEE80211_CHAN_5GHZ	0x00000100 /* 5 GHz spectrum channel */
-#define	IEEE80211_CHAN_PASSIVE	0x00000200 /* Only passive scan allowed */
-#define	IEEE80211_CHAN_DYN	0x00000400 /* Dynamic CCK-OFDM channel */
-#define	IEEE80211_CHAN_GFSK	0x00000800 /* GFSK channel (FHSS PHY) */
-#define	IEEE80211_CHAN_GSM	0x00001000 /* 900 MHz spectrum channel */
-#define	IEEE80211_CHAN_STURBO	0x00002000 /* 11a static turbo channel only */
-#define	IEEE80211_CHAN_HALF	0x00004000 /* Half rate channel */
-#define	IEEE80211_CHAN_QUARTER	0x00008000 /* Quarter rate channel */
-#define	IEEE80211_CHAN_HT20	0x00010000 /* HT 20 channel */
-#define	IEEE80211_CHAN_HT40U	0x00020000 /* HT 40 channel w/ ext above */
-#define	IEEE80211_CHAN_HT40D	0x00040000 /* HT 40 channel w/ ext below */
-#define	IEEE80211_CHAN_DFS	0x00080000 /* DFS required */
-#define	IEEE80211_CHAN_4MSXMIT	0x00100000 /* 4ms limit on frame length */
-#define	IEEE80211_CHAN_NOADHOC	0x00200000 /* adhoc mode not allowed */
-#define	IEEE80211_CHAN_NOHOSTAP	0x00400000 /* hostap mode not allowed */
-#define	IEEE80211_CHAN_11D	0x00800000 /* 802.11d required */
-
-#define	IEEE80211_CHAN_HT40	(IEEE80211_CHAN_HT40U | IEEE80211_CHAN_HT40D)
-#define	IEEE80211_CHAN_HT	(IEEE80211_CHAN_HT20 | IEEE80211_CHAN_HT40)
-
-#define	IEEE80211_CHAN_BITS \
-	"\20\1PRIV0\2PRIV2\3PRIV3\4PRIV4\5TURBO\6CCK\7OFDM\0102GHZ\0115GHZ" \
-	"\12PASSIVE\13DYN\14GFSK\15GSM\16STURBO\17HALF\20QUARTER\21HT20" \
-	"\22HT40U\23HT40D\24DFS\0254MSXMIT\26NOADHOC\27NOHOSTAP\03011D"
-
-/*
- * Useful combinations of channel characteristics.
- */
-#define	IEEE80211_CHAN_FHSS \
-	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_GFSK)
-#define	IEEE80211_CHAN_A \
-	(IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM)
-#define	IEEE80211_CHAN_B \
-	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_CCK)
-#define	IEEE80211_CHAN_PUREG \
-	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM)
-#define	IEEE80211_CHAN_G \
-	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
-#define IEEE80211_CHAN_108A \
-	(IEEE80211_CHAN_A | IEEE80211_CHAN_TURBO)
-#define	IEEE80211_CHAN_108G \
-	(IEEE80211_CHAN_PUREG | IEEE80211_CHAN_TURBO)
-#define	IEEE80211_CHAN_ST \
-	(IEEE80211_CHAN_108A | IEEE80211_CHAN_STURBO)
-
-#define	IEEE80211_CHAN_ALL \
-	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_GFSK | \
-	 IEEE80211_CHAN_CCK | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN | \
-	 IEEE80211_CHAN_HALF | IEEE80211_CHAN_QUARTER | \
-	 IEEE80211_CHAN_HT)
-#define	IEEE80211_CHAN_ALLTURBO \
-	(IEEE80211_CHAN_ALL | IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)
-
-#define	IEEE80211_IS_CHAN_FHSS(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_FHSS) == IEEE80211_CHAN_FHSS)
-#define	IEEE80211_IS_CHAN_A(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_A) == IEEE80211_CHAN_A)
-#define	IEEE80211_IS_CHAN_B(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_B) == IEEE80211_CHAN_B)
-#define	IEEE80211_IS_CHAN_PUREG(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_PUREG) == IEEE80211_CHAN_PUREG)
-#define	IEEE80211_IS_CHAN_G(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G)
-#define	IEEE80211_IS_CHAN_ANYG(_c) \
-	(IEEE80211_IS_CHAN_PUREG(_c) || IEEE80211_IS_CHAN_G(_c))
-#define	IEEE80211_IS_CHAN_ST(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_ST) == IEEE80211_CHAN_ST)
-#define	IEEE80211_IS_CHAN_108A(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_108A) == IEEE80211_CHAN_108A)
-#define	IEEE80211_IS_CHAN_108G(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_108G) == IEEE80211_CHAN_108G)
-
-#define	IEEE80211_IS_CHAN_2GHZ(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_2GHZ) != 0)
-#define	IEEE80211_IS_CHAN_5GHZ(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_5GHZ) != 0)
-#define	IEEE80211_IS_CHAN_PASSIVE(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_PASSIVE) != 0)
-#define	IEEE80211_IS_CHAN_OFDM(_c) \
-	(((_c)->ic_flags & (IEEE80211_CHAN_OFDM | IEEE80211_CHAN_DYN)) != 0)
-#define	IEEE80211_IS_CHAN_CCK(_c) \
-	(((_c)->ic_flags & (IEEE80211_CHAN_CCK | IEEE80211_CHAN_DYN)) != 0)
-#define	IEEE80211_IS_CHAN_DYN(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_DYN) == IEEE80211_CHAN_DYN)
-#define	IEEE80211_IS_CHAN_GFSK(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_GFSK) != 0)
-#define	IEEE80211_IS_CHAN_TURBO(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_TURBO) != 0)
-#define	IEEE80211_IS_CHAN_STURBO(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_STURBO) != 0)
-#define	IEEE80211_IS_CHAN_DTURBO(_c) \
-	(((_c)->ic_flags & \
-	(IEEE80211_CHAN_TURBO | IEEE80211_CHAN_STURBO)) == IEEE80211_CHAN_TURBO)
-#define	IEEE80211_IS_CHAN_HALF(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_HALF) != 0)
-#define	IEEE80211_IS_CHAN_QUARTER(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_QUARTER) != 0)
-#define	IEEE80211_IS_CHAN_FULL(_c) \
-	(((_c)->ic_flags & (IEEE80211_CHAN_QUARTER | IEEE80211_CHAN_HALF)) == 0)
-#define	IEEE80211_IS_CHAN_GSM(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_GSM) != 0)
-#define	IEEE80211_IS_CHAN_HT(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_HT) != 0)
-#define	IEEE80211_IS_CHAN_HT20(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_HT20) != 0)
-#define	IEEE80211_IS_CHAN_HT40(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_HT40) != 0)
-#define	IEEE80211_IS_CHAN_HT40U(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_HT40U) != 0)
-#define	IEEE80211_IS_CHAN_HT40D(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_HT40D) != 0)
-#define	IEEE80211_IS_CHAN_HTA(_c) \
-	(IEEE80211_IS_CHAN_5GHZ(_c) && \
-	 ((_c)->ic_flags & IEEE80211_CHAN_HT) != 0)
-#define	IEEE80211_IS_CHAN_HTG(_c) \
-	(IEEE80211_IS_CHAN_2GHZ(_c) && \
-	 ((_c)->ic_flags & IEEE80211_CHAN_HT) != 0)
-#define	IEEE80211_IS_CHAN_DFS(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_DFS) != 0)
-#define	IEEE80211_IS_CHAN_NOADHOC(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_NOADHOC) != 0)
-#define	IEEE80211_IS_CHAN_NOHOSTAP(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_NOHOSTAP) != 0)
-#define	IEEE80211_IS_CHAN_11D(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_11D) != 0)
-
-#define	IEEE80211_CHAN2IEEE(_c)		(_c)->ic_ieee
-
-/* dynamic state */
-#define	IEEE80211_CHANSTATE_RADAR	0x01	/* radar detected */
-#define	IEEE80211_CHANSTATE_CACDONE	0x02	/* CAC completed */
-#define	IEEE80211_CHANSTATE_CWINT	0x04	/* interference detected */
-#define	IEEE80211_CHANSTATE_NORADAR	0x10	/* post notify on radar clear */
-
-#define	IEEE80211_IS_CHAN_RADAR(_c) \
-	(((_c)->ic_state & IEEE80211_CHANSTATE_RADAR) != 0)
-#define	IEEE80211_IS_CHAN_CACDONE(_c) \
-	(((_c)->ic_state & IEEE80211_CHANSTATE_CACDONE) != 0)
-#define	IEEE80211_IS_CHAN_CWINT(_c) \
-	(((_c)->ic_state & IEEE80211_CHANSTATE_CWINT) != 0)
-
-/* ni_chan encoding for FH phy */
-#define	IEEE80211_FH_CHANMOD	80
-#define	IEEE80211_FH_CHAN(set,pat)	(((set)-1)*IEEE80211_FH_CHANMOD+(pat))
-#define	IEEE80211_FH_CHANSET(chan)	((chan)/IEEE80211_FH_CHANMOD+1)
-#define	IEEE80211_FH_CHANPAT(chan)	((chan)%IEEE80211_FH_CHANMOD)
-
-#define	IEEE80211_TID_SIZE	(WME_NUM_TID+1)	/* WME TID's +1 for non-QoS */
-#define	IEEE80211_NONQOS_TID	WME_NUM_TID	/* index for non-QoS sta */
-
-/*
- * The 802.11 spec says at most 2007 stations may be
- * associated at once.  For most AP's this is way more
- * than is feasible so we use a default of 128.  This
- * number may be overridden by the driver and/or by
- * user configuration but may not be less than IEEE80211_AID_MIN.
- */
-#define	IEEE80211_AID_DEF		128
-#define	IEEE80211_AID_MIN		16
-
-/*
- * 802.11 rate set.
- */
-#define	IEEE80211_RATE_SIZE	8		/* 802.11 standard */
-#define	IEEE80211_RATE_MAXSIZE	15		/* max rates we'll handle */
-
-struct ieee80211_rateset {
-	uint8_t		rs_nrates;
-	uint8_t		rs_rates[IEEE80211_RATE_MAXSIZE];
-};
-
-/*
- * 802.11n variant of ieee80211_rateset.  Instead of
- * legacy rates the entries are MCS rates.  We define
- * the structure such that it can be used interchangeably
- * with an ieee80211_rateset (modulo structure size).
- */
-#define	IEEE80211_HTRATE_MAXSIZE	77
-
-struct ieee80211_htrateset {
-	uint8_t		rs_nrates;
-	uint8_t		rs_rates[IEEE80211_HTRATE_MAXSIZE];
-};
-
-#define	IEEE80211_RATE_MCS	0x80
-
-/*
- * Per-mode transmit parameters/controls visible to user space.
- * These can be used to set fixed transmit rate for all operating
- * modes or on a per-client basis according to the capabilities
- * of the client (e.g. an 11b client associated to an 11g ap).
- *
- * MCS are distinguished from legacy rates by or'ing in 0x80.
- */
-struct ieee80211_txparam {
-	uint8_t		ucastrate;	/* ucast data rate (legacy/MCS|0x80) */
-	uint8_t		mgmtrate;	/* mgmt frame rate (legacy/MCS|0x80) */
-	uint8_t		mcastrate;	/* multicast rate (legacy/MCS|0x80) */
-	uint8_t		maxretry;	/* max unicast data retry count */
-};
-
-/*
- * Per-mode roaming state visible to user space.  There are two
- * thresholds that control whether roaming is considered; when
- * either is exceeded the 802.11 layer will check the scan cache
- * for another AP.  If the cache is stale then a scan may be
- * triggered.
- */
-struct ieee80211_roamparam {
-	int8_t		rssi;		/* rssi thresh (.5 dBm) */
-	uint8_t		rate;		/* tx rate thresh (.5 Mb/s or MCS) */
-	uint16_t	pad;		/* reserve */
-};
-
-/*
- * Regulatory Information.
- */
-struct ieee80211_regdomain {
-	uint16_t	regdomain;	/* SKU */
-	uint16_t	country;	/* ISO country code */
-	uint8_t		location;	/* I (indoor), O (outdoor), other */
-	uint8_t		ecm;		/* Extended Channel Mode */
-	char		isocc[2];	/* country code string */
-	short		pad[2];
-};
-
-/*
- * MIMO antenna/radio state.
- */
-
-#define	IEEE80211_MAX_CHAINS		3
-#define	IEEE80211_MAX_EVM_PILOTS	6
-
-/*
- * XXX This doesn't yet export both ctl/ext chain details
- */
-struct ieee80211_mimo_info {
-	int8_t		rssi[IEEE80211_MAX_CHAINS];	/* per-antenna rssi */
-	int8_t		noise[IEEE80211_MAX_CHAINS];	/* per-antenna noise floor */
-	uint8_t		pad[2];
-	uint32_t	evm[3];		/* EVM data */
-};
-#endif /* _NET80211__IEEE80211_H_ */
diff --git a/include.new/net80211/ieee80211.h b/include.new/net80211/ieee80211.h
deleted file mode 100644
index 7ffcf69..0000000
--- a/include.new/net80211/ieee80211.h
+++ /dev/null
@@ -1,1118 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211.h 262007 2014-02-17 01:36:53Z kevlo $
- */
-#ifndef _NET80211_IEEE80211_H_
-#define _NET80211_IEEE80211_H_
-
-/*
- * 802.11 protocol definitions.
- */
-
-#define	IEEE80211_ADDR_LEN	6		/* size of 802.11 address */
-/* is 802.11 address multicast/broadcast? */
-#define	IEEE80211_IS_MULTICAST(_a)	(*(_a) & 0x01)
-
-typedef uint16_t ieee80211_seq;
-
-/* IEEE 802.11 PLCP header */
-struct ieee80211_plcp_hdr {
-	uint16_t	i_sfd;
-	uint8_t		i_signal;
-	uint8_t		i_service;
-	uint16_t	i_length;
-	uint16_t	i_crc;
-} __packed;
-
-#define IEEE80211_PLCP_SFD      0xF3A0 
-#define IEEE80211_PLCP_SERVICE  0x00
-#define IEEE80211_PLCP_SERVICE_LOCKED	0x04
-#define IEEE80211_PLCL_SERVICE_PBCC	0x08
-#define IEEE80211_PLCP_SERVICE_LENEXT5	0x20
-#define IEEE80211_PLCP_SERVICE_LENEXT6	0x40
-#define IEEE80211_PLCP_SERVICE_LENEXT7	0x80
-
-/*
- * generic definitions for IEEE 802.11 frames
- */
-struct ieee80211_frame {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr3[IEEE80211_ADDR_LEN];
-	uint8_t		i_seq[2];
-	/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
-	/* see below */
-} __packed;
-
-struct ieee80211_qosframe {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr3[IEEE80211_ADDR_LEN];
-	uint8_t		i_seq[2];
-	uint8_t		i_qos[2];
-	/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
-	/* see below */
-} __packed;
-
-struct ieee80211_qoscntl {
-	uint8_t		i_qos[2];
-};
-
-struct ieee80211_frame_addr4 {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr3[IEEE80211_ADDR_LEN];
-	uint8_t		i_seq[2];
-	uint8_t		i_addr4[IEEE80211_ADDR_LEN];
-} __packed;
-
-
-struct ieee80211_qosframe_addr4 {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr3[IEEE80211_ADDR_LEN];
-	uint8_t		i_seq[2];
-	uint8_t		i_addr4[IEEE80211_ADDR_LEN];
-	uint8_t		i_qos[2];
-} __packed;
-
-#define	IEEE80211_FC0_VERSION_MASK		0x03
-#define	IEEE80211_FC0_VERSION_SHIFT		0
-#define	IEEE80211_FC0_VERSION_0			0x00
-#define	IEEE80211_FC0_TYPE_MASK			0x0c
-#define	IEEE80211_FC0_TYPE_SHIFT		2
-#define	IEEE80211_FC0_TYPE_MGT			0x00
-#define	IEEE80211_FC0_TYPE_CTL			0x04
-#define	IEEE80211_FC0_TYPE_DATA			0x08
-
-#define	IEEE80211_FC0_SUBTYPE_MASK		0xf0
-#define	IEEE80211_FC0_SUBTYPE_SHIFT		4
-/* for TYPE_MGT */
-#define	IEEE80211_FC0_SUBTYPE_ASSOC_REQ		0x00
-#define	IEEE80211_FC0_SUBTYPE_ASSOC_RESP	0x10
-#define	IEEE80211_FC0_SUBTYPE_REASSOC_REQ	0x20
-#define	IEEE80211_FC0_SUBTYPE_REASSOC_RESP	0x30
-#define	IEEE80211_FC0_SUBTYPE_PROBE_REQ		0x40
-#define	IEEE80211_FC0_SUBTYPE_PROBE_RESP	0x50
-#define	IEEE80211_FC0_SUBTYPE_BEACON		0x80
-#define	IEEE80211_FC0_SUBTYPE_ATIM		0x90
-#define	IEEE80211_FC0_SUBTYPE_DISASSOC		0xa0
-#define	IEEE80211_FC0_SUBTYPE_AUTH		0xb0
-#define	IEEE80211_FC0_SUBTYPE_DEAUTH		0xc0
-#define	IEEE80211_FC0_SUBTYPE_ACTION		0xd0
-#define	IEEE80211_FC0_SUBTYPE_ACTION_NOACK	0xe0
-/* for TYPE_CTL */
-#define	IEEE80211_FC0_SUBTYPE_BAR		0x80
-#define	IEEE80211_FC0_SUBTYPE_BA		0x90
-#define	IEEE80211_FC0_SUBTYPE_PS_POLL		0xa0
-#define	IEEE80211_FC0_SUBTYPE_RTS		0xb0
-#define	IEEE80211_FC0_SUBTYPE_CTS		0xc0
-#define	IEEE80211_FC0_SUBTYPE_ACK		0xd0
-#define	IEEE80211_FC0_SUBTYPE_CF_END		0xe0
-#define	IEEE80211_FC0_SUBTYPE_CF_END_ACK	0xf0
-/* for TYPE_DATA (bit combination) */
-#define	IEEE80211_FC0_SUBTYPE_DATA		0x00
-#define	IEEE80211_FC0_SUBTYPE_CF_ACK		0x10
-#define	IEEE80211_FC0_SUBTYPE_CF_POLL		0x20
-#define	IEEE80211_FC0_SUBTYPE_CF_ACPL		0x30
-#define	IEEE80211_FC0_SUBTYPE_NODATA		0x40
-#define	IEEE80211_FC0_SUBTYPE_CFACK		0x50
-#define	IEEE80211_FC0_SUBTYPE_CFPOLL		0x60
-#define	IEEE80211_FC0_SUBTYPE_CF_ACK_CF_ACK	0x70
-#define	IEEE80211_FC0_SUBTYPE_QOS		0x80
-#define	IEEE80211_FC0_SUBTYPE_QOS_NULL		0xc0
-
-#define	IEEE80211_FC1_DIR_MASK			0x03
-#define	IEEE80211_FC1_DIR_NODS			0x00	/* STA->STA */
-#define	IEEE80211_FC1_DIR_TODS			0x01	/* STA->AP  */
-#define	IEEE80211_FC1_DIR_FROMDS		0x02	/* AP ->STA */
-#define	IEEE80211_FC1_DIR_DSTODS		0x03	/* AP ->AP  */
-
-#define	IEEE80211_IS_DSTODS(wh) \
-	(((wh)->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
-
-#define	IEEE80211_FC1_MORE_FRAG			0x04
-#define	IEEE80211_FC1_RETRY			0x08
-#define	IEEE80211_FC1_PWR_MGT			0x10
-#define	IEEE80211_FC1_MORE_DATA			0x20
-#define	IEEE80211_FC1_PROTECTED			0x40
-#define	IEEE80211_FC1_ORDER			0x80
-
-#define	IEEE80211_SEQ_FRAG_MASK			0x000f
-#define	IEEE80211_SEQ_FRAG_SHIFT		0
-#define	IEEE80211_SEQ_SEQ_MASK			0xfff0
-#define	IEEE80211_SEQ_SEQ_SHIFT			4
-#define	IEEE80211_SEQ_RANGE			4096
-
-#define	IEEE80211_SEQ_ADD(seq, incr) \
-	(((seq) + (incr)) & (IEEE80211_SEQ_RANGE-1))
-#define	IEEE80211_SEQ_INC(seq)	IEEE80211_SEQ_ADD(seq,1)
-#define	IEEE80211_SEQ_SUB(a, b) \
-	(((a) + IEEE80211_SEQ_RANGE - (b)) & (IEEE80211_SEQ_RANGE-1))
-
-#define	IEEE80211_SEQ_BA_RANGE			2048	/* 2^11 */
-#define	IEEE80211_SEQ_BA_BEFORE(a, b) \
-	(IEEE80211_SEQ_SUB(b, a+1) < IEEE80211_SEQ_BA_RANGE-1)
-
-#define	IEEE80211_NWID_LEN			32
-#define	IEEE80211_MESHID_LEN			32
-
-#define	IEEE80211_QOS_TXOP			0x00ff
-/* bit 8 is reserved */
-#define	IEEE80211_QOS_AMSDU			0x80
-#define	IEEE80211_QOS_AMSDU_S			7
-#define	IEEE80211_QOS_ACKPOLICY			0x60
-#define	IEEE80211_QOS_ACKPOLICY_S		5
-#define	IEEE80211_QOS_ACKPOLICY_NOACK		0x20	/* No ACK required */
-#define	IEEE80211_QOS_ACKPOLICY_BA		0x60	/* Block ACK */
-#define	IEEE80211_QOS_EOSP			0x10	/* EndOfService Period*/
-#define	IEEE80211_QOS_EOSP_S			4
-#define	IEEE80211_QOS_TID			0x0f
-/* qos[1] byte used for all frames sent by mesh STAs in a mesh BSS */
-#define IEEE80211_QOS_MC			0x01	/* Mesh control */
-/* Mesh power save level*/
-#define IEEE80211_QOS_MESH_PSL			0x02
-/* Mesh Receiver Service Period Initiated */
-#define IEEE80211_QOS_RSPI			0x04
-/* bits 11 to 15 reserved */
-
-/* does frame have QoS sequence control data */
-#define	IEEE80211_QOS_HAS_SEQ(wh) \
-	(((wh)->i_fc[0] & \
-	  (IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
-	  (IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
-
-/*
- * WME/802.11e information element.
- */
-struct ieee80211_wme_info {
-	uint8_t		wme_id;		/* IEEE80211_ELEMID_VENDOR */
-	uint8_t		wme_len;	/* length in bytes */
-	uint8_t		wme_oui[3];	/* 0x00, 0x50, 0xf2 */
-	uint8_t		wme_type;	/* OUI type */
-	uint8_t		wme_subtype;	/* OUI subtype */
-	uint8_t		wme_version;	/* spec revision */
-	uint8_t		wme_info;	/* QoS info */
-} __packed;
-
-/*
- * WME/802.11e Tspec Element
- */
-struct ieee80211_wme_tspec {
-	uint8_t		ts_id;
-	uint8_t		ts_len;
-	uint8_t		ts_oui[3];
-	uint8_t		ts_oui_type;
-	uint8_t		ts_oui_subtype;
-	uint8_t		ts_version;
-	uint8_t		ts_tsinfo[3];
-	uint8_t		ts_nom_msdu[2];
-	uint8_t		ts_max_msdu[2];
-	uint8_t		ts_min_svc[4];
-	uint8_t		ts_max_svc[4];
-	uint8_t		ts_inactv_intv[4];
-	uint8_t		ts_susp_intv[4];
-	uint8_t		ts_start_svc[4];
-	uint8_t		ts_min_rate[4];
-	uint8_t		ts_mean_rate[4];
-	uint8_t		ts_max_burst[4];
-	uint8_t		ts_min_phy[4];
-	uint8_t		ts_peak_rate[4];
-	uint8_t		ts_delay[4];
-	uint8_t		ts_surplus[2];
-	uint8_t		ts_medium_time[2];
-} __packed;
-
-/*
- * WME AC parameter field
- */
-struct ieee80211_wme_acparams {
-	uint8_t		acp_aci_aifsn;
-	uint8_t		acp_logcwminmax;
-	uint16_t	acp_txop;
-} __packed;
-
-#define WME_NUM_AC		4	/* 4 AC categories */
-#define	WME_NUM_TID		16	/* 16 tids */
-
-#define WME_PARAM_ACI		0x60	/* Mask for ACI field */
-#define WME_PARAM_ACI_S		5	/* Shift for ACI field */
-#define WME_PARAM_ACM		0x10	/* Mask for ACM bit */
-#define WME_PARAM_ACM_S		4	/* Shift for ACM bit */
-#define WME_PARAM_AIFSN		0x0f	/* Mask for aifsn field */
-#define WME_PARAM_AIFSN_S	0	/* Shift for aifsn field */
-#define WME_PARAM_LOGCWMIN	0x0f	/* Mask for CwMin field (in log) */
-#define WME_PARAM_LOGCWMIN_S	0	/* Shift for CwMin field */
-#define WME_PARAM_LOGCWMAX	0xf0	/* Mask for CwMax field (in log) */
-#define WME_PARAM_LOGCWMAX_S	4	/* Shift for CwMax field */
-
-#define WME_AC_TO_TID(_ac) (       \
-	((_ac) == WME_AC_VO) ? 6 : \
-	((_ac) == WME_AC_VI) ? 5 : \
-	((_ac) == WME_AC_BK) ? 1 : \
-	0)
-
-#define TID_TO_WME_AC(_tid) (      \
-	((_tid) == 0 || (_tid) == 3) ? WME_AC_BE : \
-	((_tid) < 3) ? WME_AC_BK : \
-	((_tid) < 6) ? WME_AC_VI : \
-	WME_AC_VO)
-
-/*
- * WME Parameter Element
- */
-struct ieee80211_wme_param {
-	uint8_t		param_id;
-	uint8_t		param_len;
-	uint8_t		param_oui[3];
-	uint8_t		param_oui_type;
-	uint8_t		param_oui_subtype;
-	uint8_t		param_version;
-	uint8_t		param_qosInfo;
-#define	WME_QOSINFO_COUNT	0x0f	/* Mask for param count field */
-	uint8_t		param_reserved;
-	struct ieee80211_wme_acparams	params_acParams[WME_NUM_AC];
-} __packed;
-
-/*
- * Management Notification Frame
- */
-struct ieee80211_mnf {
-	uint8_t		mnf_category;
-	uint8_t		mnf_action;
-	uint8_t		mnf_dialog;
-	uint8_t		mnf_status;
-} __packed;
-#define	MNF_SETUP_REQ	0
-#define	MNF_SETUP_RESP	1
-#define	MNF_TEARDOWN	2
-
-/* 
- * 802.11n Management Action Frames 
- */
-/* generic frame format */
-struct ieee80211_action {
-	uint8_t		ia_category;
-	uint8_t		ia_action;
-} __packed;
-
-#define	IEEE80211_ACTION_CAT_SM		0	/* Spectrum Management */
-#define	IEEE80211_ACTION_CAT_QOS	1	/* QoS */
-#define	IEEE80211_ACTION_CAT_DLS	2	/* DLS */
-#define	IEEE80211_ACTION_CAT_BA		3	/* BA */
-#define	IEEE80211_ACTION_CAT_HT		7	/* HT */
-#define	IEEE80211_ACTION_CAT_MESH	13	/* Mesh */
-#define	IEEE80211_ACTION_CAT_SELF_PROT	15	/* Self-protected */
-/* 16 - 125 reserved */
-#define	IEEE80211_ACTION_CAT_VENDOR	127	/* Vendor Specific */
-
-#define	IEEE80211_ACTION_HT_TXCHWIDTH	0	/* recommended xmit chan width*/
-#define	IEEE80211_ACTION_HT_MIMOPWRSAVE	1	/* MIMO power save */
-
-/* HT - recommended transmission channel width */
-struct ieee80211_action_ht_txchwidth {
-	struct ieee80211_action	at_header;
-	uint8_t		at_chwidth;	
-} __packed;
-
-#define	IEEE80211_A_HT_TXCHWIDTH_20	0
-#define	IEEE80211_A_HT_TXCHWIDTH_2040	1
-
-/* HT - MIMO Power Save (NB: D2.04) */
-struct ieee80211_action_ht_mimopowersave {
-	struct ieee80211_action am_header;
-	uint8_t		am_control;
-} __packed;
-
-#define	IEEE80211_A_HT_MIMOPWRSAVE_ENA		0x01	/* PS enabled */
-#define	IEEE80211_A_HT_MIMOPWRSAVE_MODE		0x02
-#define	IEEE80211_A_HT_MIMOPWRSAVE_MODE_S	1
-#define	IEEE80211_A_HT_MIMOPWRSAVE_DYNAMIC	0x02	/* Dynamic Mode */
-#define	IEEE80211_A_HT_MIMOPWRSAVE_STATIC	0x00	/* no SM packets */
-/* bits 2-7 reserved */
-
-/* Block Ack actions */
-#define IEEE80211_ACTION_BA_ADDBA_REQUEST       0   /* ADDBA request */
-#define IEEE80211_ACTION_BA_ADDBA_RESPONSE      1   /* ADDBA response */
-#define IEEE80211_ACTION_BA_DELBA	        2   /* DELBA */
-
-/* Block Ack Parameter Set */
-#define	IEEE80211_BAPS_BUFSIZ	0xffc0		/* buffer size */
-#define	IEEE80211_BAPS_BUFSIZ_S	6
-#define	IEEE80211_BAPS_TID	0x003c		/* TID */
-#define	IEEE80211_BAPS_TID_S	2
-#define	IEEE80211_BAPS_POLICY	0x0002		/* block ack policy */
-#define	IEEE80211_BAPS_POLICY_S	1
-
-#define	IEEE80211_BAPS_POLICY_DELAYED	(0<<IEEE80211_BAPS_POLICY_S)
-#define	IEEE80211_BAPS_POLICY_IMMEDIATE	(1<<IEEE80211_BAPS_POLICY_S)
-
-/* Block Ack Sequence Control */
-#define	IEEE80211_BASEQ_START	0xfff0		/* starting seqnum */
-#define	IEEE80211_BASEQ_START_S	4
-#define	IEEE80211_BASEQ_FRAG	0x000f		/* fragment number */
-#define	IEEE80211_BASEQ_FRAG_S	0
-
-/* Delayed Block Ack Parameter Set */
-#define	IEEE80211_DELBAPS_TID	0xf000		/* TID */
-#define	IEEE80211_DELBAPS_TID_S	12
-#define	IEEE80211_DELBAPS_INIT	0x0800		/* initiator */
-#define	IEEE80211_DELBAPS_INIT_S 11
-
-/* BA - ADDBA request */
-struct ieee80211_action_ba_addbarequest {
-	struct ieee80211_action rq_header;
-	uint8_t		rq_dialogtoken;
-	uint16_t	rq_baparamset;
-	uint16_t	rq_batimeout;		/* in TUs */
-	uint16_t	rq_baseqctl;
-} __packed;
-
-/* BA - ADDBA response */
-struct ieee80211_action_ba_addbaresponse {
-	struct ieee80211_action rs_header;
-	uint8_t		rs_dialogtoken;
-	uint16_t	rs_statuscode;
-	uint16_t	rs_baparamset; 
-	uint16_t	rs_batimeout;		/* in TUs */
-} __packed;
-
-/* BA - DELBA */
-struct ieee80211_action_ba_delba {
-	struct ieee80211_action dl_header;
-	uint16_t	dl_baparamset;
-	uint16_t	dl_reasoncode;
-} __packed;
-
-/* BAR Control */
-#define	IEEE80211_BAR_TID	0xf000		/* TID */
-#define	IEEE80211_BAR_TID_S	12
-#define	IEEE80211_BAR_COMP	0x0004		/* Compressed Bitmap */
-#define	IEEE80211_BAR_MTID	0x0002		/* Multi-TID */
-#define	IEEE80211_BAR_NOACK	0x0001		/* No-Ack policy */
-
-/* BAR Starting Sequence Control */
-#define	IEEE80211_BAR_SEQ_START	0xfff0		/* starting seqnum */
-#define	IEEE80211_BAR_SEQ_START_S	4
-
-struct ieee80211_ba_request {
-	uint16_t	rq_barctl;
-	uint16_t	rq_barseqctl;
-} __packed;
-
-/*
- * Control frames.
- */
-struct ieee80211_frame_min {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_addr1[IEEE80211_ADDR_LEN];
-	uint8_t		i_addr2[IEEE80211_ADDR_LEN];
-	/* FCS */
-} __packed;
-
-struct ieee80211_frame_rts {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_ra[IEEE80211_ADDR_LEN];
-	uint8_t		i_ta[IEEE80211_ADDR_LEN];
-	/* FCS */
-} __packed;
-
-struct ieee80211_frame_cts {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_ra[IEEE80211_ADDR_LEN];
-	/* FCS */
-} __packed;
-
-struct ieee80211_frame_ack {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_ra[IEEE80211_ADDR_LEN];
-	/* FCS */
-} __packed;
-
-struct ieee80211_frame_pspoll {
-	uint8_t		i_fc[2];
-	uint8_t		i_aid[2];
-	uint8_t		i_bssid[IEEE80211_ADDR_LEN];
-	uint8_t		i_ta[IEEE80211_ADDR_LEN];
-	/* FCS */
-} __packed;
-
-struct ieee80211_frame_cfend {		/* NB: also CF-End+CF-Ack */
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];	/* should be zero */
-	uint8_t		i_ra[IEEE80211_ADDR_LEN];
-	uint8_t		i_bssid[IEEE80211_ADDR_LEN];
-	/* FCS */
-} __packed;
-
-struct ieee80211_frame_bar {
-	uint8_t		i_fc[2];
-	uint8_t		i_dur[2];
-	uint8_t		i_ra[IEEE80211_ADDR_LEN];
-	uint8_t		i_ta[IEEE80211_ADDR_LEN];
-	uint16_t	i_ctl;
-	uint16_t	i_seq;
-	/* FCS */
-} __packed;
-
-/*
- * BEACON management packets
- *
- *	octet timestamp[8]
- *	octet beacon interval[2]
- *	octet capability information[2]
- *	information element
- *		octet elemid
- *		octet length
- *		octet information[length]
- */
-
-#define	IEEE80211_BEACON_INTERVAL(beacon) \
-	((beacon)[8] | ((beacon)[9] << 8))
-#define	IEEE80211_BEACON_CAPABILITY(beacon) \
-	((beacon)[10] | ((beacon)[11] << 8))
-
-#define	IEEE80211_CAPINFO_ESS			0x0001
-#define	IEEE80211_CAPINFO_IBSS			0x0002
-#define	IEEE80211_CAPINFO_CF_POLLABLE		0x0004
-#define	IEEE80211_CAPINFO_CF_POLLREQ		0x0008
-#define	IEEE80211_CAPINFO_PRIVACY		0x0010
-#define	IEEE80211_CAPINFO_SHORT_PREAMBLE	0x0020
-#define	IEEE80211_CAPINFO_PBCC			0x0040
-#define	IEEE80211_CAPINFO_CHNL_AGILITY		0x0080
-#define	IEEE80211_CAPINFO_SPECTRUM_MGMT		0x0100
-/* bit 9 is reserved */
-#define	IEEE80211_CAPINFO_SHORT_SLOTTIME	0x0400
-#define	IEEE80211_CAPINFO_RSN			0x0800
-/* bit 12 is reserved */
-#define	IEEE80211_CAPINFO_DSSSOFDM		0x2000
-/* bits 14-15 are reserved */
-
-#define	IEEE80211_CAPINFO_BITS \
-	"\20\1ESS\2IBSS\3CF_POLLABLE\4CF_POLLREQ\5PRIVACY\6SHORT_PREAMBLE" \
-	"\7PBCC\10CHNL_AGILITY\11SPECTRUM_MGMT\13SHORT_SLOTTIME\14RSN" \
-	"\16DSSOFDM"
-
-/*
- * 802.11i/WPA information element (maximally sized).
- */
-struct ieee80211_ie_wpa {
-	uint8_t		wpa_id;		/* IEEE80211_ELEMID_VENDOR */
-	uint8_t		wpa_len;	/* length in bytes */
-	uint8_t		wpa_oui[3];	/* 0x00, 0x50, 0xf2 */
-	uint8_t		wpa_type;	/* OUI type */
-	uint16_t	wpa_version;	/* spec revision */
-	uint32_t	wpa_mcipher[1];	/* multicast/group key cipher */
-	uint16_t	wpa_uciphercnt;	/* # pairwise key ciphers */
-	uint32_t	wpa_uciphers[8];/* ciphers */
-	uint16_t	wpa_authselcnt;	/* authentication selector cnt*/
-	uint32_t	wpa_authsels[8];/* selectors */
-	uint16_t	wpa_caps;	/* 802.11i capabilities */
-	uint16_t	wpa_pmkidcnt;	/* 802.11i pmkid count */
-	uint16_t	wpa_pmkids[8];	/* 802.11i pmkids */
-} __packed;
-
-/*
- * 802.11n HT Capability IE
- * NB: these reflect D1.10 
- */
-struct ieee80211_ie_htcap {
-	uint8_t		hc_id;			/* element ID */
-	uint8_t		hc_len;			/* length in bytes */
-	uint16_t	hc_cap;			/* HT caps (see below) */
-	uint8_t		hc_param;		/* HT params (see below) */
-	uint8_t 	hc_mcsset[16]; 		/* supported MCS set */
-	uint16_t	hc_extcap;		/* extended HT capabilities */
-	uint32_t	hc_txbf;		/* txbf capabilities */
-	uint8_t		hc_antenna;		/* antenna capabilities */
-} __packed;
-
-/* HT capability flags (ht_cap) */
-#define	IEEE80211_HTCAP_LDPC		0x0001	/* LDPC supported */
-#define	IEEE80211_HTCAP_CHWIDTH40	0x0002	/* 20/40 supported */
-#define	IEEE80211_HTCAP_SMPS		0x000c	/* SM Power Save mode */
-#define	IEEE80211_HTCAP_SMPS_OFF	0x000c	/* disabled */
-#define	IEEE80211_HTCAP_SMPS_DYNAMIC	0x0004	/* send RTS first */
-/* NB: SMPS value 2 is reserved */
-#define	IEEE80211_HTCAP_SMPS_ENA	0x0000	/* enabled (static mode) */
-#define	IEEE80211_HTCAP_GREENFIELD	0x0010	/* Greenfield supported */
-#define	IEEE80211_HTCAP_SHORTGI20	0x0020	/* Short GI in 20MHz */
-#define	IEEE80211_HTCAP_SHORTGI40	0x0040	/* Short GI in 40MHz */
-#define	IEEE80211_HTCAP_TXSTBC		0x0080	/* STBC tx ok */
-#define	IEEE80211_HTCAP_RXSTBC		0x0300  /* STBC rx support */
-#define	IEEE80211_HTCAP_RXSTBC_S	8
-#define	IEEE80211_HTCAP_RXSTBC_1STREAM	0x0100  /* 1 spatial stream */
-#define	IEEE80211_HTCAP_RXSTBC_2STREAM	0x0200  /* 1-2 spatial streams*/
-#define	IEEE80211_HTCAP_RXSTBC_3STREAM	0x0300  /* 1-3 spatial streams*/
-#define	IEEE80211_HTCAP_DELBA		0x0400	/* HT DELBA supported */
-#define	IEEE80211_HTCAP_MAXAMSDU	0x0800	/* max A-MSDU length */
-#define	IEEE80211_HTCAP_MAXAMSDU_7935	0x0800	/* 7935 octets */
-#define	IEEE80211_HTCAP_MAXAMSDU_3839	0x0000	/* 3839 octets */
-#define	IEEE80211_HTCAP_DSSSCCK40	0x1000  /* DSSS/CCK in 40MHz */
-#define	IEEE80211_HTCAP_PSMP		0x2000  /* PSMP supported */
-#define	IEEE80211_HTCAP_40INTOLERANT	0x4000  /* 40MHz intolerant */
-#define	IEEE80211_HTCAP_LSIGTXOPPROT	0x8000  /* L-SIG TXOP prot */
-
-#define	IEEE80211_HTCAP_BITS \
-	"\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \
-	"\13DELBA\14AMSDU(7935)\15DSSSCCK40\16PSMP\1740INTOLERANT" \
-	"\20LSIGTXOPPROT"
-
-/* HT parameters (hc_param) */
-#define	IEEE80211_HTCAP_MAXRXAMPDU	0x03	/* max rx A-MPDU factor */
-#define	IEEE80211_HTCAP_MAXRXAMPDU_S	0
-#define	IEEE80211_HTCAP_MAXRXAMPDU_8K	0
-#define	IEEE80211_HTCAP_MAXRXAMPDU_16K	1
-#define	IEEE80211_HTCAP_MAXRXAMPDU_32K	2
-#define	IEEE80211_HTCAP_MAXRXAMPDU_64K	3
-#define	IEEE80211_HTCAP_MPDUDENSITY	0x1c	/* min MPDU start spacing */
-#define	IEEE80211_HTCAP_MPDUDENSITY_S	2
-#define	IEEE80211_HTCAP_MPDUDENSITY_NA	0	/* no time restriction */
-#define	IEEE80211_HTCAP_MPDUDENSITY_025	1	/* 1/4 us */
-#define	IEEE80211_HTCAP_MPDUDENSITY_05	2	/* 1/2 us */
-#define	IEEE80211_HTCAP_MPDUDENSITY_1	3	/* 1 us */
-#define	IEEE80211_HTCAP_MPDUDENSITY_2	4	/* 2 us */
-#define	IEEE80211_HTCAP_MPDUDENSITY_4	5	/* 4 us */
-#define	IEEE80211_HTCAP_MPDUDENSITY_8	6	/* 8 us */
-#define	IEEE80211_HTCAP_MPDUDENSITY_16	7	/* 16 us */
-
-/* HT extended capabilities (hc_extcap) */
-#define	IEEE80211_HTCAP_PCO		0x0001	/* PCO capable */
-#define	IEEE80211_HTCAP_PCOTRANS	0x0006	/* PCO transition time */
-#define	IEEE80211_HTCAP_PCOTRANS_S	1
-#define	IEEE80211_HTCAP_PCOTRANS_04	0x0002	/* 400 us */
-#define	IEEE80211_HTCAP_PCOTRANS_15	0x0004	/* 1.5 ms */
-#define	IEEE80211_HTCAP_PCOTRANS_5	0x0006	/* 5 ms */
-/* bits 3-7 reserved */
-#define	IEEE80211_HTCAP_MCSFBACK	0x0300	/* MCS feedback */
-#define	IEEE80211_HTCAP_MCSFBACK_S	8
-#define	IEEE80211_HTCAP_MCSFBACK_NONE	0x0000	/* nothing provided */
-#define	IEEE80211_HTCAP_MCSFBACK_UNSOL	0x0200	/* unsolicited feedback */
-#define	IEEE80211_HTCAP_MCSFBACK_MRQ	0x0300	/* " "+respond to MRQ */
-#define	IEEE80211_HTCAP_HTC		0x0400	/* +HTC support */
-#define	IEEE80211_HTCAP_RDR		0x0800	/* reverse direction responder*/
-/* bits 12-15 reserved */
-
-/*
- * 802.11n HT Information IE
- */
-struct ieee80211_ie_htinfo {
-	uint8_t		hi_id;			/* element ID */
-	uint8_t		hi_len;			/* length in bytes */
-	uint8_t		hi_ctrlchannel;		/* primary channel */
-	uint8_t		hi_byte1;		/* ht ie byte 1 */
-	uint8_t		hi_byte2;		/* ht ie byte 2 */
-	uint8_t		hi_byte3;		/* ht ie byte 3 */
-	uint16_t	hi_byte45;		/* ht ie bytes 4+5 */
-	uint8_t 	hi_basicmcsset[16]; 	/* basic MCS set */
-} __packed;
-
-/* byte1 */
-#define	IEEE80211_HTINFO_2NDCHAN	0x03	/* secondary/ext chan offset */
-#define	IEEE80211_HTINFO_2NDCHAN_S	0
-#define	IEEE80211_HTINFO_2NDCHAN_NONE	0x00	/* no secondary/ext channel */
-#define	IEEE80211_HTINFO_2NDCHAN_ABOVE	0x01	/* above private channel */
-/* NB: 2 is reserved */
-#define	IEEE80211_HTINFO_2NDCHAN_BELOW	0x03	/* below primary channel */ 
-#define	IEEE80211_HTINFO_TXWIDTH	0x04	/* tx channel width */
-#define	IEEE80211_HTINFO_TXWIDTH_20	0x00	/* 20MHz width */
-#define	IEEE80211_HTINFO_TXWIDTH_2040	0x04	/* any supported width */
-#define	IEEE80211_HTINFO_RIFSMODE	0x08	/* Reduced IFS (RIFS) use */
-#define	IEEE80211_HTINFO_RIFSMODE_PROH	0x00	/* RIFS use prohibited */
-#define	IEEE80211_HTINFO_RIFSMODE_PERM	0x08	/* RIFS use permitted */
-#define	IEEE80211_HTINFO_PMSPONLY	0x10	/* PSMP required to associate */
-#define	IEEE80211_HTINFO_SIGRAN		0xe0	/* shortest Service Interval */
-#define	IEEE80211_HTINFO_SIGRAN_S	5
-#define	IEEE80211_HTINFO_SIGRAN_5	0x00	/* 5 ms */
-/* XXX add rest */
-
-/* bytes 2+3 */
-#define	IEEE80211_HTINFO_OPMODE		0x03	/* operating mode */
-#define	IEEE80211_HTINFO_OPMODE_S	0
-#define	IEEE80211_HTINFO_OPMODE_PURE	0x00	/* no protection */
-#define	IEEE80211_HTINFO_OPMODE_PROTOPT	0x01	/* protection optional */
-#define	IEEE80211_HTINFO_OPMODE_HT20PR	0x02	/* protection for HT20 sta's */
-#define	IEEE80211_HTINFO_OPMODE_MIXED	0x03	/* protection for legacy sta's*/
-#define	IEEE80211_HTINFO_NONGF_PRESENT	0x04	/* non-GF sta's present */
-#define	IEEE80211_HTINFO_TXBL		0x08	/* transmit burst limit */
-#define	IEEE80211_HTINFO_NONHT_PRESENT	0x10	/* non-HT sta's present */
-/* bits 5-15 reserved */
-
-/* bytes 4+5 */
-#define	IEEE80211_HTINFO_2NDARYBEACON	0x01
-#define	IEEE80211_HTINFO_LSIGTXOPPROT	0x02
-#define	IEEE80211_HTINFO_PCO_ACTIVE	0x04
-#define	IEEE80211_HTINFO_40MHZPHASE	0x08
-
-/* byte5 */
-#define	IEEE80211_HTINFO_BASIC_STBCMCS	0x7f
-#define	IEEE80211_HTINFO_BASIC_STBCMCS_S 0
-#define	IEEE80211_HTINFO_DUALPROTECTED	0x80
-
-/*
- * Management information element payloads.
- */
-
-enum {
-	IEEE80211_ELEMID_SSID		= 0,
-	IEEE80211_ELEMID_RATES		= 1,
-	IEEE80211_ELEMID_FHPARMS	= 2,
-	IEEE80211_ELEMID_DSPARMS	= 3,
-	IEEE80211_ELEMID_CFPARMS	= 4,
-	IEEE80211_ELEMID_TIM		= 5,
-	IEEE80211_ELEMID_IBSSPARMS	= 6,
-	IEEE80211_ELEMID_COUNTRY	= 7,
-	IEEE80211_ELEMID_CHALLENGE	= 16,
-	/* 17-31 reserved for challenge text extension */
-	IEEE80211_ELEMID_PWRCNSTR	= 32,
-	IEEE80211_ELEMID_PWRCAP		= 33,
-	IEEE80211_ELEMID_TPCREQ		= 34,
-	IEEE80211_ELEMID_TPCREP		= 35,
-	IEEE80211_ELEMID_SUPPCHAN	= 36,
-	IEEE80211_ELEMID_CSA		= 37,
-	IEEE80211_ELEMID_MEASREQ	= 38,
-	IEEE80211_ELEMID_MEASREP	= 39,
-	IEEE80211_ELEMID_QUIET		= 40,
-	IEEE80211_ELEMID_IBSSDFS	= 41,
-	IEEE80211_ELEMID_ERP		= 42,
-	IEEE80211_ELEMID_HTCAP		= 45,
-	IEEE80211_ELEMID_QOS		= 46,
-	IEEE80211_ELEMID_RSN		= 48,
-	IEEE80211_ELEMID_XRATES		= 50,
-	IEEE80211_ELEMID_HTINFO		= 61,
-	IEEE80211_ELEMID_TPC		= 150,
-	IEEE80211_ELEMID_CCKM		= 156,
-	IEEE80211_ELEMID_VENDOR		= 221,	/* vendor private */
-
-	/*
-	 * 802.11s IEs
-	 * NB: On vanilla Linux still IEEE80211_ELEMID_MESHPEER = 55,
-	 * but they defined a new with id 117 called PEER_MGMT.
-	 * NB: complies with open80211
-	 */
-	IEEE80211_ELEMID_MESHCONF	= 113,
-	IEEE80211_ELEMID_MESHID		= 114,
-	IEEE80211_ELEMID_MESHLINK	= 115,
-	IEEE80211_ELEMID_MESHCNGST	= 116,
-	IEEE80211_ELEMID_MESHPEER	= 117,
-	IEEE80211_ELEMID_MESHCSA	= 118,
-	IEEE80211_ELEMID_MESHTIM	= 39, /* XXX: remove */
-	IEEE80211_ELEMID_MESHAWAKEW	= 119,
-	IEEE80211_ELEMID_MESHBEACONT	= 120,
-	/* 121-124 MMCAOP not implemented yet */
-	IEEE80211_ELEMID_MESHGANN	= 125,
-	IEEE80211_ELEMID_MESHRANN	= 126,
-	/* 127 Extended Capabilities */
-	/* 128-129 reserved */
-	IEEE80211_ELEMID_MESHPREQ	= 130,
-	IEEE80211_ELEMID_MESHPREP	= 131,
-	IEEE80211_ELEMID_MESHPERR	= 132,
-	/* 133-136 reserved */
-	IEEE80211_ELEMID_MESHPXU	= 137,
-	IEEE80211_ELEMID_MESHPXUC	= 138,
-	IEEE80211_ELEMID_MESHAH		= 60, /* XXX: remove */
-};
-
-struct ieee80211_tim_ie {
-	uint8_t		tim_ie;			/* IEEE80211_ELEMID_TIM */
-	uint8_t		tim_len;
-	uint8_t		tim_count;		/* DTIM count */
-	uint8_t		tim_period;		/* DTIM period */
-	uint8_t		tim_bitctl;		/* bitmap control */
-	uint8_t		tim_bitmap[1];		/* variable-length bitmap */
-} __packed;
-
-struct ieee80211_country_ie {
-	uint8_t		ie;			/* IEEE80211_ELEMID_COUNTRY */
-	uint8_t		len;
-	uint8_t		cc[3];			/* ISO CC+(I)ndoor/(O)utdoor */
-	struct {
-		uint8_t schan;			/* starting channel */
-		uint8_t nchan;			/* number channels */
-		uint8_t maxtxpwr;		/* tx power cap */
-	} __packed band[1];			/* sub bands (NB: var size) */
-} __packed;
-
-#define	IEEE80211_COUNTRY_MAX_BANDS	84	/* max possible bands */
-#define	IEEE80211_COUNTRY_MAX_SIZE \
-	(sizeof(struct ieee80211_country_ie) + 3*(IEEE80211_COUNTRY_MAX_BANDS-1))
-
-/*
- * 802.11h Quiet Time Element.
- */
-struct ieee80211_quiet_ie {
-	uint8_t		quiet_ie;		/* IEEE80211_ELEMID_QUIET */
-	uint8_t		len;
-	uint8_t		tbttcount;		/* quiet start */
-	uint8_t		period;			/* beacon intervals between quiets */
-	uint16_t	duration;		/* TUs of each quiet*/
-	uint16_t	offset;			/* TUs of from TBTT of quiet start */
-} __packed;
-
-/*
- * 802.11h Channel Switch Announcement (CSA).
- */
-struct ieee80211_csa_ie {
-	uint8_t		csa_ie;		/* IEEE80211_ELEMID_CHANSWITCHANN */
-	uint8_t		csa_len;
-	uint8_t		csa_mode;		/* Channel Switch Mode */
-	uint8_t		csa_newchan;		/* New Channel Number */
-	uint8_t		csa_count;		/* Channel Switch Count */
-} __packed;
-
-/*
- * Note the min acceptable CSA count is used to guard against
- * malicious CSA injection in station mode.  Defining this value
- * as other than 0 violates the 11h spec.
- */
-#define	IEEE80211_CSA_COUNT_MIN	2
-#define	IEEE80211_CSA_COUNT_MAX	255
-
-/* rate set entries are in .5 Mb/s units, and potentially marked as basic */
-#define	IEEE80211_RATE_BASIC		0x80
-#define	IEEE80211_RATE_VAL		0x7f
-
-/* EPR information element flags */
-#define	IEEE80211_ERP_NON_ERP_PRESENT	0x01
-#define	IEEE80211_ERP_USE_PROTECTION	0x02
-#define	IEEE80211_ERP_LONG_PREAMBLE	0x04
-
-#define	IEEE80211_ERP_BITS \
-	"\20\1NON_ERP_PRESENT\2USE_PROTECTION\3LONG_PREAMBLE"
-
-#define	ATH_OUI			0x7f0300	/* Atheros OUI */
-#define	ATH_OUI_TYPE		0x01		/* Atheros protocol ie */
-
-/* NB: Atheros allocated the OUI for this purpose ~2005 but beware ... */
-#define	TDMA_OUI		ATH_OUI
-#define	TDMA_OUI_TYPE		0x02		/* TDMA protocol ie */
-
-#define	BCM_OUI			0x4c9000	/* Broadcom OUI */
-#define	BCM_OUI_HTCAP		51		/* pre-draft HTCAP ie */
-#define	BCM_OUI_HTINFO		52		/* pre-draft HTINFO ie */
-
-#define	WPA_OUI			0xf25000
-#define	WPA_OUI_TYPE		0x01
-#define	WPA_VERSION		1		/* current supported version */
-
-#define	WPA_CSE_NULL		0x00
-#define	WPA_CSE_WEP40		0x01
-#define	WPA_CSE_TKIP		0x02
-#define	WPA_CSE_CCMP		0x04
-#define	WPA_CSE_WEP104		0x05
-
-#define	WPA_ASE_NONE		0x00
-#define	WPA_ASE_8021X_UNSPEC	0x01
-#define	WPA_ASE_8021X_PSK	0x02
-
-#define	WPS_OUI_TYPE		0x04
-
-#define	RSN_OUI			0xac0f00
-#define	RSN_VERSION		1		/* current supported version */
-
-#define	RSN_CSE_NULL		0x00
-#define	RSN_CSE_WEP40		0x01
-#define	RSN_CSE_TKIP		0x02
-#define	RSN_CSE_WRAP		0x03
-#define	RSN_CSE_CCMP		0x04
-#define	RSN_CSE_WEP104		0x05
-
-#define	RSN_ASE_NONE		0x00
-#define	RSN_ASE_8021X_UNSPEC	0x01
-#define	RSN_ASE_8021X_PSK	0x02
-
-#define	RSN_CAP_PREAUTH		0x01
-
-#define	WME_OUI			0xf25000
-#define	WME_OUI_TYPE		0x02
-#define	WME_INFO_OUI_SUBTYPE	0x00
-#define	WME_PARAM_OUI_SUBTYPE	0x01
-#define	WME_VERSION		1
-
-/* WME stream classes */
-#define	WME_AC_BE	0		/* best effort */
-#define	WME_AC_BK	1		/* background */
-#define	WME_AC_VI	2		/* video */
-#define	WME_AC_VO	3		/* voice */
-
-/*
- * AUTH management packets
- *
- *	octet algo[2]
- *	octet seq[2]
- *	octet status[2]
- *	octet chal.id
- *	octet chal.length
- *	octet chal.text[253]		NB: 1-253 bytes
- */
-
-/* challenge length for shared key auth */
-#define IEEE80211_CHALLENGE_LEN		128
-
-#define	IEEE80211_AUTH_ALG_OPEN		0x0000
-#define	IEEE80211_AUTH_ALG_SHARED	0x0001
-#define	IEEE80211_AUTH_ALG_LEAP		0x0080
-
-enum {
-	IEEE80211_AUTH_OPEN_REQUEST		= 1,
-	IEEE80211_AUTH_OPEN_RESPONSE		= 2,
-};
-
-enum {
-	IEEE80211_AUTH_SHARED_REQUEST		= 1,
-	IEEE80211_AUTH_SHARED_CHALLENGE		= 2,
-	IEEE80211_AUTH_SHARED_RESPONSE		= 3,
-	IEEE80211_AUTH_SHARED_PASS		= 4,
-};
-
-/*
- * Reason and status codes.
- *
- * Reason codes are used in management frames to indicate why an
- * action took place (e.g. on disassociation).  Status codes are
- * used in management frames to indicate the result of an operation.
- *
- * Unlisted codes are reserved
- */
-
-enum {
-	IEEE80211_REASON_UNSPECIFIED		= 1,
-	IEEE80211_REASON_AUTH_EXPIRE		= 2,
-	IEEE80211_REASON_AUTH_LEAVE		= 3,
-	IEEE80211_REASON_ASSOC_EXPIRE		= 4,
-	IEEE80211_REASON_ASSOC_TOOMANY		= 5,
-	IEEE80211_REASON_NOT_AUTHED		= 6,
-	IEEE80211_REASON_NOT_ASSOCED		= 7,
-	IEEE80211_REASON_ASSOC_LEAVE		= 8,
-	IEEE80211_REASON_ASSOC_NOT_AUTHED	= 9,
-	IEEE80211_REASON_DISASSOC_PWRCAP_BAD	= 10,	/* 11h */
-	IEEE80211_REASON_DISASSOC_SUPCHAN_BAD	= 11,	/* 11h */
-	IEEE80211_REASON_IE_INVALID		= 13,	/* 11i */
-	IEEE80211_REASON_MIC_FAILURE		= 14,	/* 11i */
-	IEEE80211_REASON_4WAY_HANDSHAKE_TIMEOUT	= 15,	/* 11i */
-	IEEE80211_REASON_GROUP_KEY_UPDATE_TIMEOUT = 16,	/* 11i */
-	IEEE80211_REASON_IE_IN_4WAY_DIFFERS	= 17,	/* 11i */
-	IEEE80211_REASON_GROUP_CIPHER_INVALID	= 18,	/* 11i */
-	IEEE80211_REASON_PAIRWISE_CIPHER_INVALID= 19,	/* 11i */
-	IEEE80211_REASON_AKMP_INVALID		= 20,	/* 11i */
-	IEEE80211_REASON_UNSUPP_RSN_IE_VERSION	= 21,	/* 11i */
-	IEEE80211_REASON_INVALID_RSN_IE_CAP	= 22,	/* 11i */
-	IEEE80211_REASON_802_1X_AUTH_FAILED	= 23,	/* 11i */
-	IEEE80211_REASON_CIPHER_SUITE_REJECTED	= 24,	/* 11i */
-	IEEE80211_REASON_UNSPECIFIED_QOS	= 32,	/* 11e */
-	IEEE80211_REASON_INSUFFICIENT_BW	= 33,	/* 11e */
-	IEEE80211_REASON_TOOMANY_FRAMES		= 34,	/* 11e */
-	IEEE80211_REASON_OUTSIDE_TXOP		= 35,	/* 11e */
-	IEEE80211_REASON_LEAVING_QBSS		= 36,	/* 11e */
-	IEEE80211_REASON_BAD_MECHANISM		= 37,	/* 11e */
-	IEEE80211_REASON_SETUP_NEEDED		= 38,	/* 11e */
-	IEEE80211_REASON_TIMEOUT		= 39,	/* 11e */
-
-	IEEE80211_REASON_PEER_LINK_CANCELED	= 52,	/* 11s */
-	IEEE80211_REASON_MESH_MAX_PEERS		= 53,	/* 11s */
-	IEEE80211_REASON_MESH_CPVIOLATION	= 54,	/* 11s */
-	IEEE80211_REASON_MESH_CLOSE_RCVD	= 55,	/* 11s */
-	IEEE80211_REASON_MESH_MAX_RETRIES	= 56,	/* 11s */
-	IEEE80211_REASON_MESH_CONFIRM_TIMEOUT	= 57,	/* 11s */
-	IEEE80211_REASON_MESH_INVALID_GTK	= 58,	/* 11s */
-	IEEE80211_REASON_MESH_INCONS_PARAMS	= 59,	/* 11s */
-	IEEE80211_REASON_MESH_INVALID_SECURITY	= 60,	/* 11s */
-	IEEE80211_REASON_MESH_PERR_NO_PROXY	= 61,	/* 11s */
-	IEEE80211_REASON_MESH_PERR_NO_FI	= 62,	/* 11s */
-	IEEE80211_REASON_MESH_PERR_DEST_UNREACH	= 63,	/* 11s */
-	IEEE80211_REASON_MESH_MAC_ALRDY_EXISTS_MBSS = 64, /* 11s */
-	IEEE80211_REASON_MESH_CHAN_SWITCH_REG	= 65,	/* 11s */
-	IEEE80211_REASON_MESH_CHAN_SWITCH_UNSPEC = 66,	/* 11s */
-
-	IEEE80211_STATUS_SUCCESS		= 0,
-	IEEE80211_STATUS_UNSPECIFIED		= 1,
-	IEEE80211_STATUS_CAPINFO		= 10,
-	IEEE80211_STATUS_NOT_ASSOCED		= 11,
-	IEEE80211_STATUS_OTHER			= 12,
-	IEEE80211_STATUS_ALG			= 13,
-	IEEE80211_STATUS_SEQUENCE		= 14,
-	IEEE80211_STATUS_CHALLENGE		= 15,
-	IEEE80211_STATUS_TIMEOUT		= 16,
-	IEEE80211_STATUS_TOOMANY		= 17,
-	IEEE80211_STATUS_BASIC_RATE		= 18,
-	IEEE80211_STATUS_SP_REQUIRED		= 19,	/* 11b */
-	IEEE80211_STATUS_PBCC_REQUIRED		= 20,	/* 11b */
-	IEEE80211_STATUS_CA_REQUIRED		= 21,	/* 11b */
-	IEEE80211_STATUS_SPECMGMT_REQUIRED	= 22,	/* 11h */
-	IEEE80211_STATUS_PWRCAP_REQUIRED	= 23,	/* 11h */
-	IEEE80211_STATUS_SUPCHAN_REQUIRED	= 24,	/* 11h */
-	IEEE80211_STATUS_SHORTSLOT_REQUIRED	= 25,	/* 11g */
-	IEEE80211_STATUS_DSSSOFDM_REQUIRED	= 26,	/* 11g */
-	IEEE80211_STATUS_MISSING_HT_CAPS	= 27,	/* 11n D3.0 */
-	IEEE80211_STATUS_INVALID_IE		= 40,	/* 11i */
-	IEEE80211_STATUS_GROUP_CIPHER_INVALID	= 41,	/* 11i */
-	IEEE80211_STATUS_PAIRWISE_CIPHER_INVALID = 42,	/* 11i */
-	IEEE80211_STATUS_AKMP_INVALID		= 43,	/* 11i */
-	IEEE80211_STATUS_UNSUPP_RSN_IE_VERSION	= 44,	/* 11i */
-	IEEE80211_STATUS_INVALID_RSN_IE_CAP	= 45,	/* 11i */
-	IEEE80211_STATUS_CIPHER_SUITE_REJECTED	= 46,	/* 11i */
-};
-
-#define	IEEE80211_WEP_KEYLEN		5	/* 40bit */
-#define	IEEE80211_WEP_IVLEN		3	/* 24bit */
-#define	IEEE80211_WEP_KIDLEN		1	/* 1 octet */
-#define	IEEE80211_WEP_CRCLEN		4	/* CRC-32 */
-#define	IEEE80211_WEP_TOTLEN		(IEEE80211_WEP_IVLEN + \
-					 IEEE80211_WEP_KIDLEN + \
-					 IEEE80211_WEP_CRCLEN)
-#define	IEEE80211_WEP_NKID		4	/* number of key ids */
-
-/*
- * 802.11i defines an extended IV for use with non-WEP ciphers.
- * When the EXTIV bit is set in the key id byte an additional
- * 4 bytes immediately follow the IV for TKIP.  For CCMP the
- * EXTIV bit is likewise set but the 8 bytes represent the
- * CCMP header rather than IV+extended-IV.
- */
-#define	IEEE80211_WEP_EXTIV		0x20
-#define	IEEE80211_WEP_EXTIVLEN		4	/* extended IV length */
-#define	IEEE80211_WEP_MICLEN		8	/* trailing MIC */
-
-#define	IEEE80211_CRC_LEN		4
-
-/*
- * Maximum acceptable MTU is:
- *	IEEE80211_MAX_LEN - WEP overhead - CRC -
- *		QoS overhead - RSN/WPA overhead
- * Min is arbitrarily chosen > IEEE80211_MIN_LEN.  The default
- * mtu is Ethernet-compatible; it's set by ether_ifattach.
- */
-#define	IEEE80211_MTU_MAX		2290
-#define	IEEE80211_MTU_MIN		32
-
-#define	IEEE80211_MAX_LEN		(2300 + IEEE80211_CRC_LEN + \
-    (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN))
-#define	IEEE80211_ACK_LEN \
-	(sizeof(struct ieee80211_frame_ack) + IEEE80211_CRC_LEN)
-#define	IEEE80211_MIN_LEN \
-	(sizeof(struct ieee80211_frame_min) + IEEE80211_CRC_LEN)
-
-/*
- * The 802.11 spec says at most 2007 stations may be
- * associated at once.  For most AP's this is way more
- * than is feasible so we use a default of IEEE80211_AID_DEF.
- * This number may be overridden by the driver and/or by
- * user configuration but may not be less than IEEE80211_AID_MIN
- * (see _ieee80211.h for implementation-specific settings).
- */
-#define	IEEE80211_AID_MAX		2007
-
-#define	IEEE80211_AID(b)	((b) &~ 0xc000)
-
-/* 
- * RTS frame length parameters.  The default is specified in
- * the 802.11 spec as 512; we treat it as implementation-dependent
- * so it's defined in ieee80211_var.h.  The max may be wrong
- * for jumbo frames.
- */
-#define	IEEE80211_RTS_MIN		1
-#define	IEEE80211_RTS_MAX		2346
-
-/* 
- * TX fragmentation parameters.  As above for RTS, we treat
- * default as implementation-dependent so define it elsewhere.
- */
-#define	IEEE80211_FRAG_MIN		256
-#define	IEEE80211_FRAG_MAX		2346
-
-/*
- * Beacon interval (TU's).  Min+max come from WiFi requirements.
- * As above, we treat default as implementation-dependent so
- * define it elsewhere.
- */
-#define	IEEE80211_BINTVAL_MAX	1000	/* max beacon interval (TU's) */
-#define	IEEE80211_BINTVAL_MIN	25	/* min beacon interval (TU's) */
-
-/*
- * DTIM period (beacons).  Min+max are not really defined
- * by the protocol but we want them publicly visible so
- * define them here.
- */
-#define	IEEE80211_DTIM_MAX	15	/* max DTIM period */
-#define	IEEE80211_DTIM_MIN	1	/* min DTIM period */
-
-/*
- * Beacon miss threshold (beacons).  As for DTIM, we define
- * them here to be publicly visible.  Note the max may be
- * clamped depending on device capabilities.
- */
-#define	IEEE80211_HWBMISS_MIN 	1
-#define	IEEE80211_HWBMISS_MAX 	255
-
-/*
- * 802.11 frame duration definitions.
- */
-
-struct ieee80211_duration {
-	uint16_t	d_rts_dur;
-	uint16_t	d_data_dur;
-	uint16_t	d_plcp_len;
-	uint8_t		d_residue;	/* unused octets in time slot */
-};
-
-/* One Time Unit (TU) is 1Kus = 1024 microseconds. */
-#define IEEE80211_DUR_TU		1024
-
-/* IEEE 802.11b durations for DSSS PHY in microseconds */
-#define IEEE80211_DUR_DS_LONG_PREAMBLE	144
-#define IEEE80211_DUR_DS_SHORT_PREAMBLE	72
-
-#define IEEE80211_DUR_DS_SLOW_PLCPHDR	48
-#define IEEE80211_DUR_DS_FAST_PLCPHDR	24
-#define IEEE80211_DUR_DS_SLOW_ACK	112
-#define IEEE80211_DUR_DS_FAST_ACK	56
-#define IEEE80211_DUR_DS_SLOW_CTS	112
-#define IEEE80211_DUR_DS_FAST_CTS	56
-
-#define IEEE80211_DUR_DS_SLOT		20
-#define IEEE80211_DUR_DS_SIFS		10
-#define IEEE80211_DUR_DS_PIFS	(IEEE80211_DUR_DS_SIFS + IEEE80211_DUR_DS_SLOT)
-#define IEEE80211_DUR_DS_DIFS	(IEEE80211_DUR_DS_SIFS + \
-				 2 * IEEE80211_DUR_DS_SLOT)
-#define IEEE80211_DUR_DS_EIFS	(IEEE80211_DUR_DS_SIFS + \
-				 IEEE80211_DUR_DS_SLOW_ACK + \
-				 IEEE80211_DUR_DS_LONG_PREAMBLE + \
-				 IEEE80211_DUR_DS_SLOW_PLCPHDR + \
-				 IEEE80211_DUR_DIFS)
-
-#endif /* _NET80211_IEEE80211_H_ */
diff --git a/include.new/net80211/ieee80211_action.h b/include.new/net80211/ieee80211_action.h
deleted file mode 100644
index 92a9137..0000000
--- a/include.new/net80211/ieee80211_action.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_action.h 195377 2009-07-05 17:59:19Z sam $
- */
-#ifndef _NET80211_IEEE80211_ACTION_H_
-#define _NET80211_IEEE80211_ACTION_H_
-
-/*
- * 802.11 send/recv action frame support.
- */
-
-struct ieee80211_node;
-struct ieee80211_frame;
-
-typedef int ieee80211_send_action_func(struct ieee80211_node *,
-    int, int, void *);
-int	ieee80211_send_action_register(int cat, int act,
-		ieee80211_send_action_func *f);
-void	ieee80211_send_action_unregister(int cat, int act);
-int	ieee80211_send_action(struct ieee80211_node *, int, int, void *);
-
-typedef int ieee80211_recv_action_func(struct ieee80211_node *,
-    const struct ieee80211_frame *, const uint8_t *, const uint8_t *);
-int	ieee80211_recv_action_register(int cat, int act,
-		ieee80211_recv_action_func *);
-void	ieee80211_recv_action_unregister(int cat, int act);
-int	ieee80211_recv_action(struct ieee80211_node *,
-		const struct ieee80211_frame *,
-		const uint8_t *, const uint8_t *);
-#endif /* _NET80211_IEEE80211_ACTION_H_ */
diff --git a/include.new/net80211/ieee80211_adhoc.h b/include.new/net80211/ieee80211_adhoc.h
deleted file mode 100644
index 53c9d3f..0000000
--- a/include.new/net80211/ieee80211_adhoc.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_adhoc.h 178354 2008-04-20 20:35:46Z sam $
- */
-#ifndef _NET80211_IEEE80211_ADHOC_H_
-#define _NET80211_IEEE80211_ADHOC_H_
-
-/*
- * Adhoc-mode (ibss+ahdemo) implementation definitions.
- */
-void	ieee80211_adhoc_attach(struct ieee80211com *);
-void	ieee80211_adhoc_detach(struct ieee80211com *);
-#endif /* !_NET80211_IEEE80211_STA_H_ */
diff --git a/include.new/net80211/ieee80211_ageq.h b/include.new/net80211/ieee80211_ageq.h
deleted file mode 100644
index f3f4daa..0000000
--- a/include.new/net80211/ieee80211_ageq.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_ageq.h 195379 2009-07-05 18:17:37Z sam $
- */
-#ifndef _NET80211_IEEE80211_STAGEQ_H_
-#define _NET80211_IEEE80211_STAGEQ_H_
-
-struct ieee80211_node;
-struct mbuf;
-
-struct ieee80211_ageq {
-	ieee80211_ageq_lock_t	aq_lock;
-	int			aq_len;		/* # items on queue */
-	int			aq_maxlen;	/* max queue length */
-	int			aq_drops;	/* frames dropped */
-	struct mbuf		*aq_head;	/* frames linked w/ m_nextpkt */
-	struct mbuf		*aq_tail;	/* last frame in queue */
-};
-
-void	ieee80211_ageq_init(struct ieee80211_ageq *, int maxlen,
-	    const char *name);
-void	ieee80211_ageq_cleanup(struct ieee80211_ageq *);
-void	ieee80211_ageq_mfree(struct mbuf *);
-int	ieee80211_ageq_append(struct ieee80211_ageq *, struct mbuf *,
-	    int age);
-void	ieee80211_ageq_drain(struct ieee80211_ageq *);
-void	ieee80211_ageq_drain_node(struct ieee80211_ageq *,
-	    struct ieee80211_node *);
-struct mbuf *ieee80211_ageq_age(struct ieee80211_ageq *, int quanta);
-struct mbuf *ieee80211_ageq_remove(struct ieee80211_ageq *,
-	    struct ieee80211_node *match);
-#endif /* _NET80211_IEEE80211_STAGEQ_H_ */
diff --git a/include.new/net80211/ieee80211_alq.h b/include.new/net80211/ieee80211_alq.h
deleted file mode 100644
index ab4eec2..0000000
--- a/include.new/net80211/ieee80211_alq.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2011 Adrian Chadd, Xenion Lty Ltd
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_alq.h 233133 2012-03-18 21:54:59Z adrian $
- */
-#ifndef	__IEEE80211_ALQ_H__
-#define	__IEEE80211_ALQ_H__
-
-#define	IEEE80211_ALQ_PAYLOAD_SIZE	24
-
-/*
- * timestamp
- * wlan interface
- * operation
- * sub-operation
- * rest of structure - operation specific
- */
-struct ieee80211_alq_rec {
-	uint32_t	r_timestamp;	/* XXX may wrap! */
-	uint32_t	r_threadid;	/* current thread id */
-	uint16_t	r_wlan;		/* wlan interface number */
-	uint8_t		r_version;	/* version */
-	uint8_t		r_op;		/* top-level operation id */
-	u_char		r_payload[IEEE80211_ALQ_PAYLOAD_SIZE];
-					/* operation-specific payload */
-};
-
-/* General logging function */
-extern	void ieee80211_alq_log(struct ieee80211vap *vap, uint8_t op,
-	    u_char *p, int l);
-
-#endif	/* __IEEE80211_ALQ_H__ */
diff --git a/include.new/net80211/ieee80211_amrr.h b/include.new/net80211/ieee80211_amrr.h
deleted file mode 100644
index cc7dd7a..0000000
--- a/include.new/net80211/ieee80211_amrr.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/net80211/ieee80211_amrr.h 206358 2010-04-07 15:29:13Z rpaulo $ */
-/*	$OpenBSD: ieee80211_amrr.h,v 1.3 2006/06/17 19:34:31 damien Exp $	*/
-
-/*-
- * Copyright (c) 2006
- *	Damien Bergamini <damien.bergamini@free.fr>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#ifndef _NET80211_IEEE80211_AMRR_H_
-#define _NET80211_IEEE80211_AMRR_H_
-
-/*-
- * Naive implementation of the Adaptive Multi Rate Retry algorithm:
- *
- * "IEEE 802.11 Rate Adaptation: A Practical Approach"
- *  Mathieu Lacage, Hossein Manshaei, Thierry Turletti
- *  INRIA Sophia - Projet Planete
- *  http://www-sop.inria.fr/rapports/sophia/RR-5208.html
- */
-
-/*
- * Rate control settings.
- */
-struct ieee80211vap;
-
-struct ieee80211_amrr {
-	u_int	amrr_min_success_threshold;
-	u_int	amrr_max_success_threshold;
-	int	amrr_interval;		/* update interval (ticks) */
-};
-
-#define IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD	 1
-#define IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD	15
-
-/*
- * Rate control state for a given node.
- */
-struct ieee80211_amrr_node {
-	struct ieee80211_amrr *amn_amrr;/* backpointer */
-	int	amn_rix;		/* current rate index */
-	int	amn_ticks;		/* time of last update */
-	/* statistics */
-	u_int	amn_txcnt;
-	u_int	amn_success;
-	u_int	amn_success_threshold;
-	u_int	amn_recovery;
-	u_int	amn_retrycnt;
-};
-
-#endif /* _NET80211_IEEE80211_AMRR_H_ */
diff --git a/include.new/net80211/ieee80211_crypto.h b/include.new/net80211/ieee80211_crypto.h
deleted file mode 100644
index 5ef9b87..0000000
--- a/include.new/net80211/ieee80211_crypto.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_crypto.h 209636 2010-07-01 20:50:12Z bschmidt $
- */
-#ifndef _NET80211_IEEE80211_CRYPTO_H_
-#define _NET80211_IEEE80211_CRYPTO_H_
-
-/*
- * 802.11 protocol crypto-related definitions.
- */
-#define	IEEE80211_KEYBUF_SIZE	16
-#define	IEEE80211_MICBUF_SIZE	(8+8)	/* space for both tx+rx keys */
-
-/*
- * Old WEP-style key.  Deprecated.
- */
-struct ieee80211_wepkey {
-	u_int		wk_len;		/* key length in bytes */
-	uint8_t		wk_key[IEEE80211_KEYBUF_SIZE];
-};
-
-struct ieee80211_rsnparms {
-	uint8_t		rsn_mcastcipher;	/* mcast/group cipher */
-	uint8_t		rsn_mcastkeylen;	/* mcast key length */
-	uint8_t		rsn_ucastcipher;	/* selected unicast cipher */
-	uint8_t		rsn_ucastkeylen;	/* unicast key length */
-	uint8_t		rsn_keymgmt;		/* selected key mgmt algo */
-	uint16_t	rsn_caps;		/* capabilities */
-};
-
-struct ieee80211_cipher;
-
-/*
- * Crypto key state.  There is sufficient room for all supported
- * ciphers (see below).  The underlying ciphers are handled
- * separately through loadable cipher modules that register with
- * the generic crypto support.  A key has a reference to an instance
- * of the cipher; any per-key state is hung off wk_private by the
- * cipher when it is attached.  Ciphers are automatically called
- * to detach and cleanup any such state when the key is deleted.
- *
- * The generic crypto support handles encap/decap of cipher-related
- * frame contents for both hardware- and software-based implementations.
- * A key requiring software crypto support is automatically flagged and
- * the cipher is expected to honor this and do the necessary work.
- * Ciphers such as TKIP may also support mixed hardware/software
- * encrypt/decrypt and MIC processing.
- */
-typedef uint16_t ieee80211_keyix;	/* h/w key index */
-
-struct ieee80211_key {
-	uint8_t		wk_keylen;	/* key length in bytes */
-	uint8_t		wk_pad;
-	uint16_t	wk_flags;
-#define	IEEE80211_KEY_XMIT	0x0001	/* key used for xmit */
-#define	IEEE80211_KEY_RECV	0x0002	/* key used for recv */
-#define	IEEE80211_KEY_GROUP	0x0004	/* key used for WPA group operation */
-#define	IEEE80211_KEY_NOREPLAY	0x0008	/* ignore replay failures */
-#define	IEEE80211_KEY_SWENCRYPT	0x0010	/* host-based encrypt */
-#define	IEEE80211_KEY_SWDECRYPT	0x0020	/* host-based decrypt */
-#define	IEEE80211_KEY_SWENMIC	0x0040	/* host-based enmic */
-#define	IEEE80211_KEY_SWDEMIC	0x0080	/* host-based demic */
-#define	IEEE80211_KEY_DEVKEY	0x0100	/* device key request completed */
-#define	IEEE80211_KEY_CIPHER0	0x1000	/* cipher-specific action 0 */
-#define	IEEE80211_KEY_CIPHER1	0x2000	/* cipher-specific action 1 */
-	ieee80211_keyix	wk_keyix;	/* h/w key index */
-	ieee80211_keyix	wk_rxkeyix;	/* optional h/w rx key index */
-	uint8_t		wk_key[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
-#define	wk_txmic	wk_key+IEEE80211_KEYBUF_SIZE+0	/* XXX can't () right */
-#define	wk_rxmic	wk_key+IEEE80211_KEYBUF_SIZE+8	/* XXX can't () right */
-					/* key receive sequence counter */
-	uint64_t	wk_keyrsc[IEEE80211_TID_SIZE];
-	uint64_t	wk_keytsc;	/* key transmit sequence counter */
-	const struct ieee80211_cipher *wk_cipher;
-	void		*wk_private;	/* private cipher state */
-	uint8_t		wk_macaddr[IEEE80211_ADDR_LEN];
-};
-#define	IEEE80211_KEY_COMMON 		/* common flags passed in by apps */\
-	(IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV | IEEE80211_KEY_GROUP | \
-	 IEEE80211_KEY_NOREPLAY)
-#define	IEEE80211_KEY_DEVICE		/* flags owned by device driver */\
-	(IEEE80211_KEY_DEVKEY|IEEE80211_KEY_CIPHER0|IEEE80211_KEY_CIPHER1)
-
-#define	IEEE80211_KEY_SWCRYPT \
-	(IEEE80211_KEY_SWENCRYPT | IEEE80211_KEY_SWDECRYPT)
-#define	IEEE80211_KEY_SWMIC	(IEEE80211_KEY_SWENMIC | IEEE80211_KEY_SWDEMIC)
-
-#define	IEEE80211_KEY_BITS \
-	"\20\1XMIT\2RECV\3GROUP\4SWENCRYPT\5SWDECRYPT\6SWENMIC\7SWDEMIC" \
-	"\10DEVKEY\11CIPHER0\12CIPHER1"
-
-#define	IEEE80211_KEYIX_NONE	((ieee80211_keyix) -1)
-
-/*
- * NB: these values are ordered carefully; there are lots of
- * of implications in any reordering.  Beware that 4 is used
- * only to indicate h/w TKIP MIC support in driver capabilities;
- * there is no separate cipher support (it's rolled into the
- * TKIP cipher support).
- */
-#define	IEEE80211_CIPHER_WEP		0
-#define	IEEE80211_CIPHER_TKIP		1
-#define	IEEE80211_CIPHER_AES_OCB	2
-#define	IEEE80211_CIPHER_AES_CCM	3
-#define	IEEE80211_CIPHER_TKIPMIC	4	/* TKIP MIC capability */
-#define	IEEE80211_CIPHER_CKIP		5
-#define	IEEE80211_CIPHER_NONE		6	/* pseudo value */
-
-#define	IEEE80211_CIPHER_MAX		(IEEE80211_CIPHER_NONE+1)
-
-/* capability bits in ic_cryptocaps/iv_cryptocaps */
-#define	IEEE80211_CRYPTO_WEP		(1<<IEEE80211_CIPHER_WEP)
-#define	IEEE80211_CRYPTO_TKIP		(1<<IEEE80211_CIPHER_TKIP)
-#define	IEEE80211_CRYPTO_AES_OCB	(1<<IEEE80211_CIPHER_AES_OCB)
-#define	IEEE80211_CRYPTO_AES_CCM	(1<<IEEE80211_CIPHER_AES_CCM)
-#define	IEEE80211_CRYPTO_TKIPMIC	(1<<IEEE80211_CIPHER_TKIPMIC)
-#define	IEEE80211_CRYPTO_CKIP		(1<<IEEE80211_CIPHER_CKIP)
-
-#define	IEEE80211_CRYPTO_BITS \
-	"\20\1WEP\2TKIP\3AES\4AES_CCM\5TKIPMIC\6CKIP"
-
-#if defined(__KERNEL__) || defined(_KERNEL)
-
-struct ieee80211com;
-struct ieee80211vap;
-struct ieee80211_node;
-struct mbuf;
-
-MALLOC_DECLARE(M_80211_CRYPTO);
-
-void	ieee80211_crypto_attach(struct ieee80211com *);
-void	ieee80211_crypto_detach(struct ieee80211com *);
-void	ieee80211_crypto_vattach(struct ieee80211vap *);
-void	ieee80211_crypto_vdetach(struct ieee80211vap *);
-int	ieee80211_crypto_newkey(struct ieee80211vap *,
-		int cipher, int flags, struct ieee80211_key *);
-int	ieee80211_crypto_delkey(struct ieee80211vap *,
-		struct ieee80211_key *);
-int	ieee80211_crypto_setkey(struct ieee80211vap *, struct ieee80211_key *);
-void	ieee80211_crypto_delglobalkeys(struct ieee80211vap *);
-void	ieee80211_crypto_reload_keys(struct ieee80211com *);
-
-/*
- * Template for a supported cipher.  Ciphers register with the
- * crypto code and are typically loaded as separate modules
- * (the null cipher is always present).
- * XXX may need refcnts
- */
-struct ieee80211_cipher {
-	const char *ic_name;		/* printable name */
-	u_int	ic_cipher;		/* IEEE80211_CIPHER_* */
-	u_int	ic_header;		/* size of privacy header (bytes) */
-	u_int	ic_trailer;		/* size of privacy trailer (bytes) */
-	u_int	ic_miclen;		/* size of mic trailer (bytes) */
-	void*	(*ic_attach)(struct ieee80211vap *, struct ieee80211_key *);
-	void	(*ic_detach)(struct ieee80211_key *);
-	int	(*ic_setkey)(struct ieee80211_key *);
-	int	(*ic_encap)(struct ieee80211_key *, struct mbuf *,
-			uint8_t keyid);
-	int	(*ic_decap)(struct ieee80211_key *, struct mbuf *, int);
-	int	(*ic_enmic)(struct ieee80211_key *, struct mbuf *, int);
-	int	(*ic_demic)(struct ieee80211_key *, struct mbuf *, int);
-};
-extern	const struct ieee80211_cipher ieee80211_cipher_none;
-
-#define	IEEE80211_KEY_UNDEFINED(k) \
-	((k)->wk_cipher == &ieee80211_cipher_none)
-
-void	ieee80211_crypto_register(const struct ieee80211_cipher *);
-void	ieee80211_crypto_unregister(const struct ieee80211_cipher *);
-int	ieee80211_crypto_available(u_int cipher);
-
-struct ieee80211_key *ieee80211_crypto_encap(struct ieee80211_node *,
-		struct mbuf *);
-struct ieee80211_key *ieee80211_crypto_decap(struct ieee80211_node *,
-		struct mbuf *, int);
-
-/*
- * Check and remove any MIC.
- */
-static __inline int
-ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k,
-	struct mbuf *m, int force)
-{
-	const struct ieee80211_cipher *cip = k->wk_cipher;
-	return (cip->ic_miclen > 0 ? cip->ic_demic(k, m, force) : 1);
-}
-
-/*
- * Add any MIC.
- */
-static __inline int
-ieee80211_crypto_enmic(struct ieee80211vap *vap,
-	struct ieee80211_key *k, struct mbuf *m, int force)
-{
-	const struct ieee80211_cipher *cip = k->wk_cipher;
-	return (cip->ic_miclen > 0 ? cip->ic_enmic(k, m, force) : 1);
-}
-
-/* 
- * Reset key state to an unused state.  The crypto
- * key allocation mechanism insures other state (e.g.
- * key data) is properly setup before a key is used.
- */
-static __inline void
-ieee80211_crypto_resetkey(struct ieee80211vap *vap,
-	struct ieee80211_key *k, ieee80211_keyix ix)
-{
-	k->wk_cipher = &ieee80211_cipher_none;
-	k->wk_private = k->wk_cipher->ic_attach(vap, k);
-	k->wk_keyix = k->wk_rxkeyix = ix;
-	k->wk_flags = IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV;
-}
-
-/*
- * Crypt-related notification methods.
- */
-void	ieee80211_notify_replay_failure(struct ieee80211vap *,
-		const struct ieee80211_frame *, const struct ieee80211_key *,
-		uint64_t rsc, int tid);
-void	ieee80211_notify_michael_failure(struct ieee80211vap *,
-		const struct ieee80211_frame *, u_int keyix);
-#endif /* defined(__KERNEL__) || defined(_KERNEL) */
-#endif /* _NET80211_IEEE80211_CRYPTO_H_ */
diff --git a/include.new/net80211/ieee80211_dfs.h b/include.new/net80211/ieee80211_dfs.h
deleted file mode 100644
index a3206ec..0000000
--- a/include.new/net80211/ieee80211_dfs.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_dfs.h 230793 2012-01-31 00:03:49Z adrian $
- */
-#ifndef _NET80211_IEEE80211_DFS_H_
-#define _NET80211_IEEE80211_DFS_H_
-
-/*
- * 802.11h/DFS definitions.
- */
-
-typedef enum {
-	DFS_DBG_NONE		= 0,
-	DFS_DBG_NONOL		= 1,
-	DFS_DBG_NOCSANOL	= 2
-} dfs_debug_t;
-
-struct ieee80211_dfs_state {
-	int		nol_event[IEEE80211_CHAN_MAX];
-	struct callout	nol_timer;		/* NOL list processing */
-	struct callout	cac_timer;		/* CAC timer */
-	struct timeval	lastevent;		/* time of last radar event */
-	int		cureps;			/* current events/second */
-	const struct ieee80211_channel *lastchan;/* chan w/ last radar event */
-	struct ieee80211_channel *newchan;	/* chan selected next */
-};
-
-void	ieee80211_dfs_attach(struct ieee80211com *);
-void	ieee80211_dfs_detach(struct ieee80211com *);
-
-void	ieee80211_dfs_reset(struct ieee80211com *);
-
-void	ieee80211_dfs_cac_start(struct ieee80211vap *);
-void	ieee80211_dfs_cac_stop(struct ieee80211vap *);
-void	ieee80211_dfs_cac_clear(struct ieee80211com *,
-		const struct ieee80211_channel *);
-
-void	ieee80211_dfs_notify_radar(struct ieee80211com *,
-		struct ieee80211_channel *);
-struct ieee80211_channel *ieee80211_dfs_pickchannel(struct ieee80211com *);
-#endif /* _NET80211_IEEE80211_DFS_H_ */
diff --git a/include.new/net80211/ieee80211_freebsd.h b/include.new/net80211/ieee80211_freebsd.h
deleted file mode 100644
index e59eb10..0000000
--- a/include.new/net80211/ieee80211_freebsd.h
+++ /dev/null
@@ -1,599 +0,0 @@
-/*-
- * Copyright (c) 2003-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_freebsd.h 254640 2013-08-22 05:53:47Z adrian $
- */
-#ifndef _NET80211_IEEE80211_FREEBSD_H_
-#define _NET80211_IEEE80211_FREEBSD_H_
-
-#ifdef _KERNEL
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/rwlock.h>
-#include <sys/sysctl.h>
-#include <sys/taskqueue.h>
-
-/*
- * Common state locking definitions.
- */
-typedef struct {
-	char		name[16];		/* e.g. "ath0_com_lock" */
-	struct mtx	mtx;
-} ieee80211_com_lock_t;
-#define	IEEE80211_LOCK_INIT(_ic, _name) do {				\
-	ieee80211_com_lock_t *cl = &(_ic)->ic_comlock;			\
-	snprintf(cl->name, sizeof(cl->name), "%s_com_lock", _name);	\
-	mtx_init(&cl->mtx, cl->name, NULL, MTX_DEF | MTX_RECURSE);	\
-} while (0)
-#define	IEEE80211_LOCK_OBJ(_ic)	(&(_ic)->ic_comlock.mtx)
-#define	IEEE80211_LOCK_DESTROY(_ic) mtx_destroy(IEEE80211_LOCK_OBJ(_ic))
-#define	IEEE80211_LOCK(_ic)	   mtx_lock(IEEE80211_LOCK_OBJ(_ic))
-#define	IEEE80211_UNLOCK(_ic)	   mtx_unlock(IEEE80211_LOCK_OBJ(_ic))
-#define	IEEE80211_LOCK_ASSERT(_ic) \
-	mtx_assert(IEEE80211_LOCK_OBJ(_ic), MA_OWNED)
-#define	IEEE80211_UNLOCK_ASSERT(_ic) \
-	mtx_assert(IEEE80211_LOCK_OBJ(_ic), MA_NOTOWNED)
-
-/*
- * Transmit lock.
- *
- * This is a (mostly) temporary lock designed to serialise all of the
- * transmission operations throughout the stack.
- */
-typedef struct {
-	char		name[16];		/* e.g. "ath0_com_lock" */
-	struct mtx	mtx;
-} ieee80211_tx_lock_t;
-#define	IEEE80211_TX_LOCK_INIT(_ic, _name) do {				\
-	ieee80211_tx_lock_t *cl = &(_ic)->ic_txlock;			\
-	snprintf(cl->name, sizeof(cl->name), "%s_tx_lock", _name);	\
-	mtx_init(&cl->mtx, cl->name, NULL, MTX_DEF);	\
-} while (0)
-#define	IEEE80211_TX_LOCK_OBJ(_ic)	(&(_ic)->ic_txlock.mtx)
-#define	IEEE80211_TX_LOCK_DESTROY(_ic) mtx_destroy(IEEE80211_TX_LOCK_OBJ(_ic))
-#define	IEEE80211_TX_LOCK(_ic)	   mtx_lock(IEEE80211_TX_LOCK_OBJ(_ic))
-#define	IEEE80211_TX_UNLOCK(_ic)	   mtx_unlock(IEEE80211_TX_LOCK_OBJ(_ic))
-#define	IEEE80211_TX_LOCK_ASSERT(_ic) \
-	mtx_assert(IEEE80211_TX_LOCK_OBJ(_ic), MA_OWNED)
-#define	IEEE80211_TX_UNLOCK_ASSERT(_ic) \
-	mtx_assert(IEEE80211_TX_LOCK_OBJ(_ic), MA_NOTOWNED)
-
-/*
- * Node locking definitions.
- */
-typedef struct {
-	char		name[16];		/* e.g. "ath0_node_lock" */
-	struct mtx	mtx;
-} ieee80211_node_lock_t;
-#define	IEEE80211_NODE_LOCK_INIT(_nt, _name) do {			\
-	ieee80211_node_lock_t *nl = &(_nt)->nt_nodelock;		\
-	snprintf(nl->name, sizeof(nl->name), "%s_node_lock", _name);	\
-	mtx_init(&nl->mtx, nl->name, NULL, MTX_DEF | MTX_RECURSE);	\
-} while (0)
-#define	IEEE80211_NODE_LOCK_OBJ(_nt)	(&(_nt)->nt_nodelock.mtx)
-#define	IEEE80211_NODE_LOCK_DESTROY(_nt) \
-	mtx_destroy(IEEE80211_NODE_LOCK_OBJ(_nt))
-#define	IEEE80211_NODE_LOCK(_nt) \
-	mtx_lock(IEEE80211_NODE_LOCK_OBJ(_nt))
-#define	IEEE80211_NODE_IS_LOCKED(_nt) \
-	mtx_owned(IEEE80211_NODE_LOCK_OBJ(_nt))
-#define	IEEE80211_NODE_UNLOCK(_nt) \
-	mtx_unlock(IEEE80211_NODE_LOCK_OBJ(_nt))
-#define	IEEE80211_NODE_LOCK_ASSERT(_nt)	\
-	mtx_assert(IEEE80211_NODE_LOCK_OBJ(_nt), MA_OWNED)
-
-/*
- * Node table iteration locking definitions; this protects the
- * scan generation # used to iterate over the station table
- * while grabbing+releasing the node lock.
- */
-typedef struct {
-	char		name[16];		/* e.g. "ath0_scan_lock" */
-	struct mtx	mtx;
-} ieee80211_scan_lock_t;
-#define	IEEE80211_NODE_ITERATE_LOCK_INIT(_nt, _name) do {		\
-	ieee80211_scan_lock_t *sl = &(_nt)->nt_scanlock;		\
-	snprintf(sl->name, sizeof(sl->name), "%s_scan_lock", _name);	\
-	mtx_init(&sl->mtx, sl->name, NULL, MTX_DEF);			\
-} while (0)
-#define	IEEE80211_NODE_ITERATE_LOCK_OBJ(_nt)	(&(_nt)->nt_scanlock.mtx)
-#define	IEEE80211_NODE_ITERATE_LOCK_DESTROY(_nt) \
-	mtx_destroy(IEEE80211_NODE_ITERATE_LOCK_OBJ(_nt))
-#define	IEEE80211_NODE_ITERATE_LOCK(_nt) \
-	mtx_lock(IEEE80211_NODE_ITERATE_LOCK_OBJ(_nt))
-#define	IEEE80211_NODE_ITERATE_UNLOCK(_nt) \
-	mtx_unlock(IEEE80211_NODE_ITERATE_LOCK_OBJ(_nt))
-
-/*
- * Power-save queue definitions. 
- */
-typedef struct mtx ieee80211_psq_lock_t;
-#define	IEEE80211_PSQ_INIT(_psq, _name) \
-	mtx_init(&(_psq)->psq_lock, _name, "802.11 ps q", MTX_DEF)
-#define	IEEE80211_PSQ_DESTROY(_psq)	mtx_destroy(&(_psq)->psq_lock)
-#define	IEEE80211_PSQ_LOCK(_psq)	mtx_lock(&(_psq)->psq_lock)
-#define	IEEE80211_PSQ_UNLOCK(_psq)	mtx_unlock(&(_psq)->psq_lock)
-
-#ifndef IF_PREPEND_LIST
-#define _IF_PREPEND_LIST(ifq, mhead, mtail, mcount) do {	\
-	(mtail)->m_nextpkt = (ifq)->ifq_head;			\
-	if ((ifq)->ifq_tail == NULL)				\
-		(ifq)->ifq_tail = (mtail);			\
-	(ifq)->ifq_head = (mhead);				\
-	(ifq)->ifq_len += (mcount);				\
-} while (0)
-#define IF_PREPEND_LIST(ifq, mhead, mtail, mcount) do {		\
-	IF_LOCK(ifq);						\
-	_IF_PREPEND_LIST(ifq, mhead, mtail, mcount);		\
-	IF_UNLOCK(ifq);						\
-} while (0)
-#endif /* IF_PREPEND_LIST */
- 
-/*
- * Age queue definitions.
- */
-typedef struct mtx ieee80211_ageq_lock_t;
-#define	IEEE80211_AGEQ_INIT(_aq, _name) \
-	mtx_init(&(_aq)->aq_lock, _name, "802.11 age q", MTX_DEF)
-#define	IEEE80211_AGEQ_DESTROY(_aq)	mtx_destroy(&(_aq)->aq_lock)
-#define	IEEE80211_AGEQ_LOCK(_aq)	mtx_lock(&(_aq)->aq_lock)
-#define	IEEE80211_AGEQ_UNLOCK(_aq)	mtx_unlock(&(_aq)->aq_lock)
-
-/*
- * 802.1x MAC ACL database locking definitions.
- */
-typedef struct mtx acl_lock_t;
-#define	ACL_LOCK_INIT(_as, _name) \
-	mtx_init(&(_as)->as_lock, _name, "802.11 ACL", MTX_DEF)
-#define	ACL_LOCK_DESTROY(_as)		mtx_destroy(&(_as)->as_lock)
-#define	ACL_LOCK(_as)			mtx_lock(&(_as)->as_lock)
-#define	ACL_UNLOCK(_as)			mtx_unlock(&(_as)->as_lock)
-#define	ACL_LOCK_ASSERT(_as) \
-	mtx_assert((&(_as)->as_lock), MA_OWNED)
-
-/*
- * Scan table definitions.
- */
-typedef struct mtx ieee80211_scan_table_lock_t;
-#define	IEEE80211_SCAN_TABLE_LOCK_INIT(_st, _name) \
-	mtx_init(&(_st)->st_lock, _name, "802.11 scan table", MTX_DEF)
-#define	IEEE80211_SCAN_TABLE_LOCK_DESTROY(_st)	mtx_destroy(&(_st)->st_lock)
-#define	IEEE80211_SCAN_TABLE_LOCK(_st)		mtx_lock(&(_st)->st_lock)
-#define	IEEE80211_SCAN_TABLE_UNLOCK(_st)	mtx_unlock(&(_st)->st_lock)
-
-/*
- * Node reference counting definitions.
- *
- * ieee80211_node_initref	initialize the reference count to 1
- * ieee80211_node_incref	add a reference
- * ieee80211_node_decref	remove a reference
- * ieee80211_node_dectestref	remove a reference and return 1 if this
- *				is the last reference, otherwise 0
- * ieee80211_node_refcnt	reference count for printing (only)
- */
-#include <machine/atomic.h>
-
-#define ieee80211_node_initref(_ni) \
-	do { ((_ni)->ni_refcnt = 1); } while (0)
-#define ieee80211_node_incref(_ni) \
-	atomic_add_int(&(_ni)->ni_refcnt, 1)
-#define	ieee80211_node_decref(_ni) \
-	atomic_subtract_int(&(_ni)->ni_refcnt, 1)
-struct ieee80211_node;
-int	ieee80211_node_dectestref(struct ieee80211_node *ni);
-#define	ieee80211_node_refcnt(_ni)	(_ni)->ni_refcnt
-
-struct ifqueue;
-struct ieee80211vap;
-void	ieee80211_drain_ifq(struct ifqueue *);
-void	ieee80211_flush_ifq(struct ifqueue *, struct ieee80211vap *);
-
-void	ieee80211_vap_destroy(struct ieee80211vap *);
-
-#define	IFNET_IS_UP_RUNNING(_ifp) \
-	(((_ifp)->if_flags & IFF_UP) && \
-	 ((_ifp)->if_drv_flags & IFF_DRV_RUNNING))
-
-#define	msecs_to_ticks(ms)	(((ms)*hz)/1000)
-#define	ticks_to_msecs(t)	(1000*(t) / hz)
-#define	ticks_to_secs(t)	((t) / hz)
-#define time_after(a,b) 	((long)(b) - (long)(a) < 0)
-#define time_before(a,b)	time_after(b,a)
-#define time_after_eq(a,b)	((long)(a) - (long)(b) >= 0)
-#define time_before_eq(a,b)	time_after_eq(b,a)
-
-struct mbuf *ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen);
-
-/* tx path usage */
-#define	M_ENCAP		M_PROTO1		/* 802.11 encap done */
-#define	M_EAPOL		M_PROTO3		/* PAE/EAPOL frame */
-#define	M_PWR_SAV	M_PROTO4		/* bypass PS handling */
-#define	M_MORE_DATA	M_PROTO5		/* more data frames to follow */
-#define	M_FF		M_PROTO6		/* fast frame */
-#define	M_TXCB		M_PROTO7		/* do tx complete callback */
-#define	M_AMPDU_MPDU	M_PROTO8		/* ok for A-MPDU aggregation */
-
-/*
- * FreeBSD-HEAD from 1000046 retired M_*FRAG* flags and turned them
- * into header flags instead.  So, we use the new protocol-specific
- * flags.
- *
- * Earlier FreeBSD versions overload M_FRAG, M_FIRSTFRAG and M_LASTFRAG.
- *
- * XXX TODO: rename these fields so there are no namespace clashes!
- */
-#if __FreeBSD_version >= 1000046
-#define	M_FRAG		M_PROTO9		/* frame fragmentation */
-#define	M_FIRSTFRAG	M_PROTO10		/* first frame fragment */
-#define	M_LASTFRAG	M_PROTO11		/* last frame fragment */
-#endif
-
-#define	M_80211_TX \
-	(M_ENCAP|M_EAPOL|M_PWR_SAV|M_MORE_DATA|M_FF|M_TXCB| \
-	 M_AMPDU_MPDU|M_FRAG|M_FIRSTFRAG|M_LASTFRAG)
-
-/* rx path usage */
-#define	M_AMPDU		M_PROTO1		/* A-MPDU subframe */
-#define	M_WEP		M_PROTO2		/* WEP done by hardware */
-#if 0
-#define	M_AMPDU_MPDU	M_PROTO8		/* A-MPDU re-order done */
-#endif
-#define	M_80211_RX	(M_AMPDU|M_WEP|M_AMPDU_MPDU)
-
-#if __FreeBSD_version >= 1000046
-#define	IEEE80211_MBUF_TX_FLAG_BITS \
-	M_FLAG_BITS \
-	"\15M_ENCAP\17M_EAPOL\20M_PWR_SAV\21M_MORE_DATA\22M_FF\23M_TXCB" \
-	"\24M_AMPDU_MPDU\25M_FRAG\26M_FIRSTFRAG\27M_LASTFRAG"
-#else
-/* There aren't any flag bits available for versions before this */
-/* XXX TODO: implement M_FLAG_BITS for this! */
-#define	IEEE80211_MBUF_TX_FLAG_BITS \
-	"\15M_ENCAP\17M_EAPOL\20M_PWR_SAV\21M_MORE_DATA\22M_FF\23M_TXCB" \
-	"\24M_AMPDU_MPDU"
-#endif
-
-#define	IEEE80211_MBUF_RX_FLAG_BITS \
-	M_FLAG_BITS \
-	"\15M_AMPDU\16M_WEP\24M_AMPDU_MPDU"
-
-/*
- * Store WME access control bits in the vlan tag.
- * This is safe since it's done after the packet is classified
- * (where we use any previous tag) and because it's passed
- * directly in to the driver and there's no chance someone
- * else will clobber them on us.
- */
-#define	M_WME_SETAC(m, ac) \
-	((m)->m_pkthdr.ether_vtag = (ac))
-#define	M_WME_GETAC(m)	((m)->m_pkthdr.ether_vtag)
-
-/*
- * Mbufs on the power save queue are tagged with an age and
- * timed out.  We reuse the hardware checksum field in the
- * mbuf packet header to store this data.
- */
-#define	M_AGE_SET(m,v)		(m->m_pkthdr.csum_data = v)
-#define	M_AGE_GET(m)		(m->m_pkthdr.csum_data)
-#define	M_AGE_SUB(m,adj)	(m->m_pkthdr.csum_data -= adj)
-
-/*
- * Store the sequence number.
- */
-#define	M_SEQNO_SET(m, seqno) \
-	((m)->m_pkthdr.tso_segsz = (seqno))
-#define	M_SEQNO_GET(m)	((m)->m_pkthdr.tso_segsz)
-
-#define	MTAG_ABI_NET80211	1132948340	/* net80211 ABI */
-
-struct ieee80211_cb {
-	void	(*func)(struct ieee80211_node *, void *, int status);
-	void	*arg;
-};
-#define	NET80211_TAG_CALLBACK	0	/* xmit complete callback */
-int	ieee80211_add_callback(struct mbuf *m,
-		void (*func)(struct ieee80211_node *, void *, int), void *arg);
-void	ieee80211_process_callback(struct ieee80211_node *, struct mbuf *, int);
-
-struct ieee80211com;
-int	ieee80211_parent_xmitpkt(struct ieee80211com *, struct mbuf *);
-int	ieee80211_vap_xmitpkt(struct ieee80211vap *, struct mbuf *);
-
-void	get_random_bytes(void *, size_t);
-
-void	ieee80211_sysctl_attach(struct ieee80211com *);
-void	ieee80211_sysctl_detach(struct ieee80211com *);
-void	ieee80211_sysctl_vattach(struct ieee80211vap *);
-void	ieee80211_sysctl_vdetach(struct ieee80211vap *);
-
-SYSCTL_DECL(_net_wlan);
-int	ieee80211_sysctl_msecs_ticks(SYSCTL_HANDLER_ARGS);
-
-void	ieee80211_load_module(const char *);
-
-/*
- * A "policy module" is an adjunct module to net80211 that provides
- * functionality that typically includes policy decisions.  This
- * modularity enables extensibility and vendor-supplied functionality.
- */
-#define	_IEEE80211_POLICY_MODULE(policy, name, version)			\
-typedef void (*policy##_setup)(int);					\
-SET_DECLARE(policy##_set, policy##_setup);				\
-static int								\
-wlan_##name##_modevent(module_t mod, int type, void *unused)		\
-{									\
-	policy##_setup * const *iter, f;				\
-	switch (type) {							\
-	case MOD_LOAD:							\
-		SET_FOREACH(iter, policy##_set) {			\
-			f = (void*) *iter;				\
-			f(type);					\
-		}							\
-		return 0;						\
-	case MOD_UNLOAD:						\
-	case MOD_QUIESCE:						\
-		if (nrefs) {						\
-			printf("wlan_##name: still in use (%u dynamic refs)\n",\
-				nrefs);					\
-			return EBUSY;					\
-		}							\
-		if (type == MOD_UNLOAD) {				\
-			SET_FOREACH(iter, policy##_set) {		\
-				f = (void*) *iter;			\
-				f(type);				\
-			}						\
-		}							\
-		return 0;						\
-	}								\
-	return EINVAL;							\
-}									\
-static moduledata_t name##_mod = {					\
-	"wlan_" #name,							\
-	wlan_##name##_modevent,						\
-	0								\
-};									\
-DECLARE_MODULE(wlan_##name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);\
-MODULE_VERSION(wlan_##name, version);					\
-MODULE_DEPEND(wlan_##name, wlan, 1, 1, 1)
-
-/*
- * Crypto modules implement cipher support.
- */
-#define	IEEE80211_CRYPTO_MODULE(name, version)				\
-_IEEE80211_POLICY_MODULE(crypto, name, version);			\
-static void								\
-name##_modevent(int type)						\
-{									\
-	if (type == MOD_LOAD)						\
-		ieee80211_crypto_register(&name);			\
-	else								\
-		ieee80211_crypto_unregister(&name);			\
-}									\
-TEXT_SET(crypto##_set, name##_modevent)
-
-/*
- * Scanner modules provide scanning policy.
- */
-#define	IEEE80211_SCANNER_MODULE(name, version)				\
-	_IEEE80211_POLICY_MODULE(scanner, name, version)
-
-#define	IEEE80211_SCANNER_ALG(name, alg, v)				\
-static void								\
-name##_modevent(int type)						\
-{									\
-	if (type == MOD_LOAD)						\
-		ieee80211_scanner_register(alg, &v);			\
-	else								\
-		ieee80211_scanner_unregister(alg, &v);			\
-}									\
-TEXT_SET(scanner_set, name##_modevent);					\
-
-/*
- * ACL modules implement acl policy.
- */
-#define	IEEE80211_ACL_MODULE(name, alg, version)			\
-_IEEE80211_POLICY_MODULE(acl, name, version);				\
-static void								\
-alg##_modevent(int type)						\
-{									\
-	if (type == MOD_LOAD)						\
-		ieee80211_aclator_register(&alg);			\
-	else								\
-		ieee80211_aclator_unregister(&alg);			\
-}									\
-TEXT_SET(acl_set, alg##_modevent);					\
-
-/*
- * Authenticator modules handle 802.1x/WPA authentication.
- */
-#define	IEEE80211_AUTH_MODULE(name, version)				\
-	_IEEE80211_POLICY_MODULE(auth, name, version)
-
-#define	IEEE80211_AUTH_ALG(name, alg, v)				\
-static void								\
-name##_modevent(int type)						\
-{									\
-	if (type == MOD_LOAD)						\
-		ieee80211_authenticator_register(alg, &v);		\
-	else								\
-		ieee80211_authenticator_unregister(alg);		\
-}									\
-TEXT_SET(auth_set, name##_modevent)
-
-/*
- * Rate control modules provide tx rate control support.
- */
-#define	IEEE80211_RATECTL_MODULE(alg, version)				\
-	_IEEE80211_POLICY_MODULE(ratectl, alg, version);		\
-
-#define	IEEE80211_RATECTL_ALG(name, alg, v)				\
-static void								\
-alg##_modevent(int type)						\
-{									\
-	if (type == MOD_LOAD)						\
-		ieee80211_ratectl_register(alg, &v);			\
-	else								\
-		ieee80211_ratectl_unregister(alg);			\
-}									\
-TEXT_SET(ratectl##_set, alg##_modevent)
-
-struct ieee80211req;
-typedef int ieee80211_ioctl_getfunc(struct ieee80211vap *,
-    struct ieee80211req *);
-SET_DECLARE(ieee80211_ioctl_getset, ieee80211_ioctl_getfunc);
-#define	IEEE80211_IOCTL_GET(_name, _get) TEXT_SET(ieee80211_ioctl_getset, _get)
-
-typedef int ieee80211_ioctl_setfunc(struct ieee80211vap *,
-    struct ieee80211req *);
-SET_DECLARE(ieee80211_ioctl_setset, ieee80211_ioctl_setfunc);
-#define	IEEE80211_IOCTL_SET(_name, _set) TEXT_SET(ieee80211_ioctl_setset, _set)
-#endif /* _KERNEL */
-
-/* XXX this stuff belongs elsewhere */
-/*
- * Message formats for messages from the net80211 layer to user
- * applications via the routing socket.  These messages are appended
- * to an if_announcemsghdr structure.
- */
-struct ieee80211_join_event {
-	uint8_t		iev_addr[6];
-};
-
-struct ieee80211_leave_event {
-	uint8_t		iev_addr[6];
-};
-
-struct ieee80211_replay_event {
-	uint8_t		iev_src[6];	/* src MAC */
-	uint8_t		iev_dst[6];	/* dst MAC */
-	uint8_t		iev_cipher;	/* cipher type */
-	uint8_t		iev_keyix;	/* key id/index */
-	uint64_t	iev_keyrsc;	/* RSC from key */
-	uint64_t	iev_rsc;	/* RSC from frame */
-};
-
-struct ieee80211_michael_event {
-	uint8_t		iev_src[6];	/* src MAC */
-	uint8_t		iev_dst[6];	/* dst MAC */
-	uint8_t		iev_cipher;	/* cipher type */
-	uint8_t		iev_keyix;	/* key id/index */
-};
-
-struct ieee80211_wds_event {
-	uint8_t		iev_addr[6];
-};
-
-struct ieee80211_csa_event {
-	uint32_t	iev_flags;	/* channel flags */
-	uint16_t	iev_freq;	/* setting in Mhz */
-	uint8_t		iev_ieee;	/* IEEE channel number */
-	uint8_t		iev_mode;	/* CSA mode */
-	uint8_t		iev_count;	/* CSA count */
-};
-
-struct ieee80211_cac_event {
-	uint32_t	iev_flags;	/* channel flags */
-	uint16_t	iev_freq;	/* setting in Mhz */
-	uint8_t		iev_ieee;	/* IEEE channel number */
-	/* XXX timestamp? */
-	uint8_t		iev_type;	/* IEEE80211_NOTIFY_CAC_* */
-};
-
-struct ieee80211_radar_event {
-	uint32_t	iev_flags;	/* channel flags */
-	uint16_t	iev_freq;	/* setting in Mhz */
-	uint8_t		iev_ieee;	/* IEEE channel number */
-	/* XXX timestamp? */
-};
-
-struct ieee80211_auth_event {
-	uint8_t		iev_addr[6];
-};
-
-struct ieee80211_deauth_event {
-	uint8_t		iev_addr[6];
-};
-
-struct ieee80211_country_event {
-	uint8_t		iev_addr[6];
-	uint8_t		iev_cc[2];	/* ISO country code */
-};
-
-struct ieee80211_radio_event {
-	uint8_t		iev_state;	/* 1 on, 0 off */
-};
-
-#define	RTM_IEEE80211_ASSOC	100	/* station associate (bss mode) */
-#define	RTM_IEEE80211_REASSOC	101	/* station re-associate (bss mode) */
-#define	RTM_IEEE80211_DISASSOC	102	/* station disassociate (bss mode) */
-#define	RTM_IEEE80211_JOIN	103	/* station join (ap mode) */
-#define	RTM_IEEE80211_LEAVE	104	/* station leave (ap mode) */
-#define	RTM_IEEE80211_SCAN	105	/* scan complete, results available */
-#define	RTM_IEEE80211_REPLAY	106	/* sequence counter replay detected */
-#define	RTM_IEEE80211_MICHAEL	107	/* Michael MIC failure detected */
-#define	RTM_IEEE80211_REJOIN	108	/* station re-associate (ap mode) */
-#define	RTM_IEEE80211_WDS	109	/* WDS discovery (ap mode) */
-#define	RTM_IEEE80211_CSA	110	/* Channel Switch Announcement event */
-#define	RTM_IEEE80211_RADAR	111	/* radar event */
-#define	RTM_IEEE80211_CAC	112	/* Channel Availability Check event */
-#define	RTM_IEEE80211_DEAUTH	113	/* station deauthenticate */
-#define	RTM_IEEE80211_AUTH	114	/* station authenticate (ap mode) */
-#define	RTM_IEEE80211_COUNTRY	115	/* discovered country code (sta mode) */
-#define	RTM_IEEE80211_RADIO	116	/* RF kill switch state change */
-
-/*
- * Structure prepended to raw packets sent through the bpf
- * interface when set to DLT_IEEE802_11_RADIO.  This allows
- * user applications to specify pretty much everything in
- * an Atheros tx descriptor.  XXX need to generalize.
- *
- * XXX cannot be more than 14 bytes as it is copied to a sockaddr's
- * XXX sa_data area.
- */
-struct ieee80211_bpf_params {
-	uint8_t		ibp_vers;	/* version */
-#define	IEEE80211_BPF_VERSION	0
-	uint8_t		ibp_len;	/* header length in bytes */
-	uint8_t		ibp_flags;
-#define	IEEE80211_BPF_SHORTPRE	0x01	/* tx with short preamble */
-#define	IEEE80211_BPF_NOACK	0x02	/* tx with no ack */
-#define	IEEE80211_BPF_CRYPTO	0x04	/* tx with h/w encryption */
-#define	IEEE80211_BPF_FCS	0x10	/* frame incldues FCS */
-#define	IEEE80211_BPF_DATAPAD	0x20	/* frame includes data padding */
-#define	IEEE80211_BPF_RTS	0x40	/* tx with RTS/CTS */
-#define	IEEE80211_BPF_CTS	0x80	/* tx with CTS only */
-	uint8_t		ibp_pri;	/* WME/WMM AC+tx antenna */
-	uint8_t		ibp_try0;	/* series 1 try count */
-	uint8_t		ibp_rate0;	/* series 1 IEEE tx rate */
-	uint8_t		ibp_power;	/* tx power (device units) */
-	uint8_t		ibp_ctsrate;	/* IEEE tx rate for CTS */
-	uint8_t		ibp_try1;	/* series 2 try count */
-	uint8_t		ibp_rate1;	/* series 2 IEEE tx rate */
-	uint8_t		ibp_try2;	/* series 3 try count */
-	uint8_t		ibp_rate2;	/* series 3 IEEE tx rate */
-	uint8_t		ibp_try3;	/* series 4 try count */
-	uint8_t		ibp_rate3;	/* series 4 IEEE tx rate */
-};
-#endif /* _NET80211_IEEE80211_FREEBSD_H_ */
diff --git a/include.new/net80211/ieee80211_hostap.h b/include.new/net80211/ieee80211_hostap.h
deleted file mode 100644
index 4771d3f..0000000
--- a/include.new/net80211/ieee80211_hostap.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_hostap.h 241138 2012-10-02 17:45:19Z adrian $
- */
-#ifndef _NET80211_IEEE80211_HOSTAP_H_
-#define _NET80211_IEEE80211_HOSTAP_H_
-
-/*
- * Hostap implementation definitions.
- */
-void	ieee80211_hostap_attach(struct ieee80211com *);
-void	ieee80211_hostap_detach(struct ieee80211com *);
-
-/*
- * This method can be overridden
- */
-void ieee80211_recv_pspoll(struct ieee80211_node *, struct mbuf *);
-
-#endif /* !_NET80211_IEEE80211_HOSTAP_H_ */
diff --git a/include.new/net80211/ieee80211_ht.h b/include.new/net80211/ieee80211_ht.h
deleted file mode 100644
index 2b8d849..0000000
--- a/include.new/net80211/ieee80211_ht.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_ht.h 234324 2012-04-15 20:29:39Z adrian $
- */
-#ifndef _NET80211_IEEE80211_HT_H_
-#define _NET80211_IEEE80211_HT_H_
-
-/*
- * 802.11n protocol implementation definitions.
- */
-
-#define	IEEE80211_AGGR_BAWMAX	64	/* max block ack window size */
-/* threshold for aging overlapping non-HT bss */
-#define	IEEE80211_NONHT_PRESENT_AGE	msecs_to_ticks(60*1000)
-
-struct ieee80211_tx_ampdu {
-	struct ieee80211_node *txa_ni;	/* back pointer */
-	u_short		txa_flags;
-#define	IEEE80211_AGGR_IMMEDIATE	0x0001	/* BA policy */
-#define	IEEE80211_AGGR_XCHGPEND		0x0002	/* ADDBA response pending */
-#define	IEEE80211_AGGR_RUNNING		0x0004	/* ADDBA response received */
-#define	IEEE80211_AGGR_SETUP		0x0008	/* deferred state setup */
-#define	IEEE80211_AGGR_NAK		0x0010	/* peer NAK'd ADDBA request */
-#define	IEEE80211_AGGR_BARPEND		0x0020	/* BAR response pending */
-	uint8_t		txa_tid;
-	uint8_t		txa_token;	/* dialog token */
-	int		txa_lastsample;	/* ticks @ last traffic sample */
-	int		txa_pkts;	/* packets over last sample interval */
-	int		txa_avgpps;	/* filtered traffic over window */
-	int		txa_qbytes;	/* data queued (bytes) */
-	short		txa_qframes;	/* data queued (frames) */
-	ieee80211_seq	txa_start;	/* BA window left edge */
-	ieee80211_seq	txa_seqpending;	/* new txa_start pending BAR response */
-	uint16_t	txa_wnd;	/* BA window size */
-	uint8_t		txa_attempts;	/* # ADDBA/BAR requests w/o a response*/
-	int		txa_nextrequest;/* soonest to make next request */
-	struct callout	txa_timer;
-	void		*txa_private;	/* driver-private storage */
-	uint64_t	txa_pad[4];
-};
-
-/* return non-zero if AMPDU tx for the TID is running */
-#define	IEEE80211_AMPDU_RUNNING(tap) \
-	(((tap)->txa_flags & IEEE80211_AGGR_RUNNING) != 0)
-
-/* return non-zero if AMPDU tx for the TID is running or started */
-#define	IEEE80211_AMPDU_REQUESTED(tap) \
-	(((tap)->txa_flags & \
-	 (IEEE80211_AGGR_RUNNING|IEEE80211_AGGR_XCHGPEND|IEEE80211_AGGR_NAK)) != 0)
-
-#define	IEEE80211_AGGR_BITS \
-	"\20\1IMMEDIATE\2XCHGPEND\3RUNNING\4SETUP\5NAK"
-
-/*
- * Traffic estimator support.  We estimate packets/sec for
- * each AC that is setup for AMPDU or will potentially be
- * setup for AMPDU.  The traffic rate can be used to decide
- * when AMPDU should be setup (according to a threshold)
- * and is available for drivers to do things like cache
- * eviction when only a limited number of BA streams are
- * available and more streams are requested than available.
- */
-
-static __inline void
-ieee80211_txampdu_update_pps(struct ieee80211_tx_ampdu *tap)
-{
-	/* NB: scale factor of 2 was picked heuristically */
-	tap->txa_avgpps = ((tap->txa_avgpps << 2) -
-	     tap->txa_avgpps + tap->txa_pkts) >> 2;
-}
-
-/*
- * Count a packet towards the pps estimate.
- */
-static __inline void
-ieee80211_txampdu_count_packet(struct ieee80211_tx_ampdu *tap)
-{
-	/* XXX bound loop/do more crude estimate? */
-	while (ticks - tap->txa_lastsample >= hz) {
-		ieee80211_txampdu_update_pps(tap);
-		/* reset to start new sample interval */
-		tap->txa_pkts = 0;
-		if (tap->txa_avgpps == 0) {
-			tap->txa_lastsample = ticks;
-			break;
-		}
-		tap->txa_lastsample += hz;
-	}
-	tap->txa_pkts++;
-}
-
-/*
- * Get the current pps estimate.  If the average is out of
- * date due to lack of traffic then we decay the estimate
- * to account for the idle time.
- */
-static __inline int
-ieee80211_txampdu_getpps(struct ieee80211_tx_ampdu *tap)
-{
-	/* XXX bound loop/do more crude estimate? */
-	while (ticks - tap->txa_lastsample >= hz) {
-		ieee80211_txampdu_update_pps(tap);
-		tap->txa_pkts = 0;
-		if (tap->txa_avgpps == 0) {
-			tap->txa_lastsample = ticks;
-			break;
-		}
-		tap->txa_lastsample += hz;
-	}
-	return tap->txa_avgpps;
-}
-
-struct ieee80211_rx_ampdu {
-	int		rxa_flags;
-	int		rxa_qbytes;	/* data queued (bytes) */
-	short		rxa_qframes;	/* data queued (frames) */
-	ieee80211_seq	rxa_seqstart;
-	ieee80211_seq	rxa_start;	/* start of current BA window */
-	uint16_t	rxa_wnd;	/* BA window size */
-	int		rxa_age;	/* age of oldest frame in window */
-	int		rxa_nframes;	/* frames since ADDBA */
-	struct mbuf *rxa_m[IEEE80211_AGGR_BAWMAX];
-	void		*rxa_private;
-	uint64_t	rxa_pad[3];
-};
-
-void	ieee80211_ht_attach(struct ieee80211com *);
-void	ieee80211_ht_detach(struct ieee80211com *);
-void	ieee80211_ht_vattach(struct ieee80211vap *);
-void	ieee80211_ht_vdetach(struct ieee80211vap *);
-
-void	ieee80211_ht_announce(struct ieee80211com *);
-
-struct ieee80211_mcs_rates {
-	uint16_t	ht20_rate_800ns;
-	uint16_t	ht20_rate_400ns;
-	uint16_t	ht40_rate_800ns;
-	uint16_t	ht40_rate_400ns;
-};
-extern const struct ieee80211_mcs_rates ieee80211_htrates[];
-const struct ieee80211_htrateset *ieee80211_get_suphtrates(
-		struct ieee80211com *, const struct ieee80211_channel *);
-
-struct ieee80211_node;
-int	ieee80211_setup_htrates(struct ieee80211_node *,
-		const uint8_t *htcap, int flags);
-void	ieee80211_setup_basic_htrates(struct ieee80211_node *,
-		const uint8_t *htinfo);
-struct mbuf *ieee80211_decap_amsdu(struct ieee80211_node *, struct mbuf *);
-int	ieee80211_ampdu_reorder(struct ieee80211_node *, struct mbuf *);
-void	ieee80211_recv_bar(struct ieee80211_node *, struct mbuf *);
-void	ieee80211_ht_node_init(struct ieee80211_node *);
-void	ieee80211_ht_node_cleanup(struct ieee80211_node *);
-void	ieee80211_ht_node_age(struct ieee80211_node *);
-
-struct ieee80211_channel *ieee80211_ht_adjust_channel(struct ieee80211com *,
-		struct ieee80211_channel *, int);
-void	ieee80211_ht_wds_init(struct ieee80211_node *);
-void	ieee80211_ht_node_join(struct ieee80211_node *);
-void	ieee80211_ht_node_leave(struct ieee80211_node *);
-void	ieee80211_htprot_update(struct ieee80211com *, int protmode);
-void	ieee80211_ht_timeout(struct ieee80211com *);
-void	ieee80211_parse_htcap(struct ieee80211_node *, const uint8_t *);
-void	ieee80211_parse_htinfo(struct ieee80211_node *, const uint8_t *);
-int	ieee80211_ht_updateparams(struct ieee80211_node *, const uint8_t *,
-		const uint8_t *);
-void	ieee80211_ht_updatehtcap(struct ieee80211_node *, const uint8_t *);
-int	ieee80211_ampdu_request(struct ieee80211_node *,
-		struct ieee80211_tx_ampdu *);
-void	ieee80211_ampdu_stop(struct ieee80211_node *,
-		struct ieee80211_tx_ampdu *, int);
-int	ieee80211_send_bar(struct ieee80211_node *, struct ieee80211_tx_ampdu *,
-		ieee80211_seq);
-uint8_t	*ieee80211_add_htcap(uint8_t *, struct ieee80211_node *);
-uint8_t	*ieee80211_add_htcap_vendor(uint8_t *, struct ieee80211_node *);
-uint8_t	*ieee80211_add_htinfo(uint8_t *, struct ieee80211_node *);
-uint8_t	*ieee80211_add_htinfo_vendor(uint8_t *, struct ieee80211_node *);
-struct ieee80211_beacon_offsets;
-void	ieee80211_ht_update_beacon(struct ieee80211vap *,
-		struct ieee80211_beacon_offsets *);
-#endif /* _NET80211_IEEE80211_HT_H_ */
diff --git a/include.new/net80211/ieee80211_input.h b/include.new/net80211/ieee80211_input.h
deleted file mode 100644
index 11a9fdf..0000000
--- a/include.new/net80211/ieee80211_input.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*-
- * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_input.h 221418 2011-05-04 02:23:59Z adrian $
- */
-#ifndef _NET80211_IEEE80211_INPUT_H_
-#define _NET80211_IEEE80211_INPUT_H_
-
-/* Verify the existence and length of __elem or get out. */
-#define IEEE80211_VERIFY_ELEMENT(__elem, __maxlen, _action) do {	\
-	if ((__elem) == NULL) {						\
-		IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID,		\
-		    wh, NULL, "%s", "no " #__elem );			\
-		vap->iv_stats.is_rx_elem_missing++;			\
-		_action;						\
-	} else if ((__elem)[1] > (__maxlen)) {				\
-		IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID,		\
-		    wh, NULL, "bad " #__elem " len %d", (__elem)[1]);	\
-		vap->iv_stats.is_rx_elem_toobig++;			\
-		_action;						\
-	}								\
-} while (0)
-
-#define	IEEE80211_VERIFY_LENGTH(_len, _minlen, _action) do {		\
-	if ((_len) < (_minlen)) {					\
-		IEEE80211_DISCARD(vap, IEEE80211_MSG_ELEMID,		\
-		    wh, NULL, "ie too short, got %d, expected %d",	\
-		    (_len), (_minlen));					\
-		vap->iv_stats.is_rx_elem_toosmall++;			\
-		_action;						\
-	}								\
-} while (0)
-
-#ifdef IEEE80211_DEBUG
-void	ieee80211_ssid_mismatch(struct ieee80211vap *, const char *tag,
-	uint8_t mac[IEEE80211_ADDR_LEN], uint8_t *ssid);
-
-#define	IEEE80211_VERIFY_SSID(_ni, _ssid, _action) do {			\
-	if ((_ssid)[1] != 0 &&						\
-	    ((_ssid)[1] != (_ni)->ni_esslen ||				\
-	    memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) {	\
-		if (ieee80211_msg_input(vap))				\
-			ieee80211_ssid_mismatch(vap, 			\
-			    ieee80211_mgt_subtype_name[subtype >>	\
-				IEEE80211_FC0_SUBTYPE_SHIFT],		\
-				wh->i_addr2, _ssid);			\
-		vap->iv_stats.is_rx_ssidmismatch++;			\
-		_action;						\
-	}								\
-} while (0)
-#else /* !IEEE80211_DEBUG */
-#define	IEEE80211_VERIFY_SSID(_ni, _ssid, _action) do {			\
-	if ((_ssid)[1] != 0 &&						\
-	    ((_ssid)[1] != (_ni)->ni_esslen ||				\
-	    memcmp((_ssid) + 2, (_ni)->ni_essid, (_ssid)[1]) != 0)) {	\
-		vap->iv_stats.is_rx_ssidmismatch++;			\
-		_action;						\
-	}								\
-} while (0)
-#endif /* !IEEE80211_DEBUG */
-
-/* unalligned little endian access */     
-#define LE_READ_2(p)					\
-	((uint16_t)					\
-	 ((((const uint8_t *)(p))[0]      ) |		\
-	  (((const uint8_t *)(p))[1] <<  8)))
-#define LE_READ_4(p)					\
-	((uint32_t)					\
-	 ((((const uint8_t *)(p))[0]      ) |		\
-	  (((const uint8_t *)(p))[1] <<  8) |		\
-	  (((const uint8_t *)(p))[2] << 16) |		\
-	  (((const uint8_t *)(p))[3] << 24)))
-
-static __inline int
-iswpaoui(const uint8_t *frm)
-{
-	return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI);
-}
-
-static __inline int
-iswmeoui(const uint8_t *frm)
-{
-	return frm[1] > 3 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI);
-}
-
-static __inline int
-iswmeparam(const uint8_t *frm)
-{
-	return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) &&
-		frm[6] == WME_PARAM_OUI_SUBTYPE;
-}
-
-static __inline int
-iswmeinfo(const uint8_t *frm)
-{
-	return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) &&
-		frm[6] == WME_INFO_OUI_SUBTYPE;
-}
-
-static __inline int
-isatherosoui(const uint8_t *frm)
-{
-	return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI);
-}
-
-static __inline int
-istdmaoui(const uint8_t *frm)
-{
-	return frm[1] > 3 && LE_READ_4(frm+2) == ((TDMA_OUI_TYPE<<24)|TDMA_OUI);
-}
-
-static __inline int
-ishtcapoui(const uint8_t *frm)
-{
-	return frm[1] > 3 && LE_READ_4(frm+2) == ((BCM_OUI_HTCAP<<24)|BCM_OUI);
-}
-
-static __inline int
-ishtinfooui(const uint8_t *frm)
-{
-	return frm[1] > 3 && LE_READ_4(frm+2) == ((BCM_OUI_HTINFO<<24)|BCM_OUI);
-}
-
-#include <sys/endian.h>		/* For le16toh() */
-
-/*
- * Check the current frame sequence number against the current TID
- * state and return whether it's in sequence or should be dropped.
- *
- * Since out of order packet and duplicate packet eliminations should
- * be done by the AMPDU RX code, this routine blindly accepts all
- * frames from a HT station w/ a TID that is currently doing AMPDU-RX.
- * HT stations without WME or where the TID is not doing AMPDU-RX
- * are checked like non-HT stations.
- *
- * The routine only eliminates packets whose sequence/fragment
- * match or are less than the last seen sequence/fragment number
- * AND are retransmits It doesn't try to eliminate out of order packets.
- *
- * Since all frames after sequence number 4095 will be less than 4095
- * (as the seqnum wraps), handle that special case so packets aren't
- * incorrectly dropped - ie, if the next packet is sequence number 0
- * but a retransmit since the initial packet didn't make it.
- */
-static __inline int
-ieee80211_check_rxseq(struct ieee80211_node *ni, struct ieee80211_frame *wh)
-{
-#define	SEQ_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	SEQ_EQ(a,b)	((int)((a)-(b)) == 0)
-#define	HAS_SEQ(type)	((type & 0x4) == 0)
-#define	SEQNO(a)	((a) >> IEEE80211_SEQ_SEQ_SHIFT)
-#define	FRAGNO(a)	((a) & IEEE80211_SEQ_FRAG_MASK)
-	uint16_t rxseq;
-	uint8_t type;
-	uint8_t tid;
-	struct ieee80211_rx_ampdu *rap;
-
-	rxseq = le16toh(*(uint16_t *)wh->i_seq);
-	type = wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK;
-
-	/* Types with no sequence number are always treated valid */
-	if (! HAS_SEQ(type))
-		return 1;
-
-	tid = ieee80211_gettid(wh);
-
-	/*
-	 * Only do the HT AMPDU check for WME stations; non-WME HT stations
-	 * shouldn't exist outside of debugging. We should at least
-	 * handle that.
-	 */
-	if (tid < WME_NUM_TID) {
-		rap = &ni->ni_rx_ampdu[tid];
-		/* HT nodes currently doing RX AMPDU are always valid */
-		if ((ni->ni_flags & IEEE80211_NODE_HT) &&
-		    (rap->rxa_flags & IEEE80211_AGGR_RUNNING))
-			return 1;
-	}
-
-	/*	
-	 * Otherwise, retries for packets below or equal to the last
-	 * seen sequence number should be dropped.
-	 */
-
-	/*
-	 * Treat frame seqnum 4095 as special due to boundary
-	 * wrapping conditions.
-	 */
-	if (SEQNO(ni->ni_rxseqs[tid]) == 4095) {
-		/*
-		 * Drop retransmits on seqnum 4095/current fragment for itself.
-		 */
-		if (SEQ_EQ(rxseq, ni->ni_rxseqs[tid]) &&
-		    (wh->i_fc[1] & IEEE80211_FC1_RETRY))
-			return 0;
-		/*
-		 * Treat any subsequent frame as fine if the last seen frame
-		 * is 4095 and it's not a retransmit for the same sequence
-		 * number. However, this doesn't capture incorrectly ordered
-	 	 * fragments w/ sequence number 4095. It shouldn't be seen
-		 * in practice, but see the comment above for further info.
-		 */
-		return 1;
-	}
-
-	/*
-	 * At this point we assume that retransmitted seq/frag numbers below
-	 * the current can simply be eliminated.
-	 */
-	if ((wh->i_fc[1] & IEEE80211_FC1_RETRY) &&
-	    SEQ_LEQ(rxseq, ni->ni_rxseqs[tid]))
-		return 0;
-
-	return 1;
-#undef	SEQ_LEQ
-#undef	SEQ_EQ
-#undef	HAS_SEQ
-#undef	SEQNO
-#undef	FRAGNO
-}
-
-void	ieee80211_deliver_data(struct ieee80211vap *,
-		struct ieee80211_node *, struct mbuf *);
-struct mbuf *ieee80211_defrag(struct ieee80211_node *,
-		struct mbuf *, int);
-struct mbuf *ieee80211_realign(struct ieee80211vap *, struct mbuf *, size_t);
-struct mbuf *ieee80211_decap(struct ieee80211vap *, struct mbuf *, int);
-struct mbuf *ieee80211_decap1(struct mbuf *, int *);
-int	ieee80211_setup_rates(struct ieee80211_node *ni,
-		const uint8_t *rates, const uint8_t *xrates, int flags);
-void ieee80211_send_error(struct ieee80211_node *,
-		const uint8_t mac[IEEE80211_ADDR_LEN], int subtype, int arg);
-int	ieee80211_alloc_challenge(struct ieee80211_node *);
-int	ieee80211_parse_beacon(struct ieee80211_node *, struct mbuf *,
-		struct ieee80211_scanparams *);
-int	ieee80211_parse_action(struct ieee80211_node *, struct mbuf *);
-#endif /* _NET80211_IEEE80211_INPUT_H_ */
diff --git a/include.new/net80211/ieee80211_ioctl.h b/include.new/net80211/ieee80211_ioctl.h
deleted file mode 100644
index 56c1aca..0000000
--- a/include.new/net80211/ieee80211_ioctl.h
+++ /dev/null
@@ -1,861 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_ioctl.h 246501 2013-02-07 21:20:28Z monthadar $
- */
-#ifndef _NET80211_IEEE80211_IOCTL_H_
-#define _NET80211_IEEE80211_IOCTL_H_
-
-/*
- * IEEE 802.11 ioctls.
- */
-#include <net80211/_ieee80211.h>
-#include <net80211/ieee80211.h>
-#include <net80211/ieee80211_crypto.h>
-
-/*
- * Per/node (station) statistics.
- */
-struct ieee80211_nodestats {
-	uint32_t	ns_rx_data;		/* rx data frames */
-	uint32_t	ns_rx_mgmt;		/* rx management frames */
-	uint32_t	ns_rx_ctrl;		/* rx control frames */
-	uint32_t	ns_rx_ucast;		/* rx unicast frames */
-	uint32_t	ns_rx_mcast;		/* rx multi/broadcast frames */
-	uint64_t	ns_rx_bytes;		/* rx data count (bytes) */
-	uint64_t	ns_rx_beacons;		/* rx beacon frames */
-	uint32_t	ns_rx_proberesp;	/* rx probe response frames */
-
-	uint32_t	ns_rx_dup;		/* rx discard 'cuz dup */
-	uint32_t	ns_rx_noprivacy;	/* rx w/ wep but privacy off */
-	uint32_t	ns_rx_wepfail;		/* rx wep processing failed */
-	uint32_t	ns_rx_demicfail;	/* rx demic failed */
-	uint32_t	ns_rx_decap;		/* rx decapsulation failed */
-	uint32_t	ns_rx_defrag;		/* rx defragmentation failed */
-	uint32_t	ns_rx_disassoc;		/* rx disassociation */
-	uint32_t	ns_rx_deauth;		/* rx deauthentication */
-	uint32_t	ns_rx_action;		/* rx action */
-	uint32_t	ns_rx_decryptcrc;	/* rx decrypt failed on crc */
-	uint32_t	ns_rx_unauth;		/* rx on unauthorized port */
-	uint32_t	ns_rx_unencrypted;	/* rx unecrypted w/ privacy */
-	uint32_t	ns_rx_drop;		/* rx discard other reason */
-
-	uint32_t	ns_tx_data;		/* tx data frames */
-	uint32_t	ns_tx_mgmt;		/* tx management frames */
-	uint32_t	ns_tx_ctrl;		/* tx control frames */
-	uint32_t	ns_tx_ucast;		/* tx unicast frames */
-	uint32_t	ns_tx_mcast;		/* tx multi/broadcast frames */
-	uint64_t	ns_tx_bytes;		/* tx data count (bytes) */
-	uint32_t	ns_tx_probereq;		/* tx probe request frames */
-
-	uint32_t	ns_tx_novlantag;	/* tx discard 'cuz no tag */
-	uint32_t	ns_tx_vlanmismatch;	/* tx discard 'cuz bad tag */
-
-	uint32_t	ns_ps_discard;		/* ps discard 'cuz of age */
-
-	/* MIB-related state */
-	uint32_t	ns_tx_assoc;		/* [re]associations */
-	uint32_t	ns_tx_assoc_fail;	/* [re]association failures */
-	uint32_t	ns_tx_auth;		/* [re]authentications */
-	uint32_t	ns_tx_auth_fail;	/* [re]authentication failures*/
-	uint32_t	ns_tx_deauth;		/* deauthentications */
-	uint32_t	ns_tx_deauth_code;	/* last deauth reason */
-	uint32_t	ns_tx_disassoc;		/* disassociations */
-	uint32_t	ns_tx_disassoc_code;	/* last disassociation reason */
-	uint32_t	ns_spare[8];
-};
-
-/*
- * Summary statistics.
- */
-struct ieee80211_stats {
-	uint32_t	is_rx_badversion;	/* rx frame with bad version */
-	uint32_t	is_rx_tooshort;		/* rx frame too short */
-	uint32_t	is_rx_wrongbss;		/* rx from wrong bssid */
-	uint32_t	is_rx_dup;		/* rx discard 'cuz dup */
-	uint32_t	is_rx_wrongdir;		/* rx w/ wrong direction */
-	uint32_t	is_rx_mcastecho;	/* rx discard 'cuz mcast echo */
-	uint32_t	is_rx_notassoc;		/* rx discard 'cuz sta !assoc */
-	uint32_t	is_rx_noprivacy;	/* rx w/ wep but privacy off */
-	uint32_t	is_rx_unencrypted;	/* rx w/o wep and privacy on */
-	uint32_t	is_rx_wepfail;		/* rx wep processing failed */
-	uint32_t	is_rx_decap;		/* rx decapsulation failed */
-	uint32_t	is_rx_mgtdiscard;	/* rx discard mgt frames */
-	uint32_t	is_rx_ctl;		/* rx ctrl frames */
-	uint32_t	is_rx_beacon;		/* rx beacon frames */
-	uint32_t	is_rx_rstoobig;		/* rx rate set truncated */
-	uint32_t	is_rx_elem_missing;	/* rx required element missing*/
-	uint32_t	is_rx_elem_toobig;	/* rx element too big */
-	uint32_t	is_rx_elem_toosmall;	/* rx element too small */
-	uint32_t	is_rx_elem_unknown;	/* rx element unknown */
-	uint32_t	is_rx_badchan;		/* rx frame w/ invalid chan */
-	uint32_t	is_rx_chanmismatch;	/* rx frame chan mismatch */
-	uint32_t	is_rx_nodealloc;	/* rx frame dropped */
-	uint32_t	is_rx_ssidmismatch;	/* rx frame ssid mismatch  */
-	uint32_t	is_rx_auth_unsupported;	/* rx w/ unsupported auth alg */
-	uint32_t	is_rx_auth_fail;	/* rx sta auth failure */
-	uint32_t	is_rx_auth_countermeasures;/* rx auth discard 'cuz CM */
-	uint32_t	is_rx_assoc_bss;	/* rx assoc from wrong bssid */
-	uint32_t	is_rx_assoc_notauth;	/* rx assoc w/o auth */
-	uint32_t	is_rx_assoc_capmismatch;/* rx assoc w/ cap mismatch */
-	uint32_t	is_rx_assoc_norate;	/* rx assoc w/ no rate match */
-	uint32_t	is_rx_assoc_badwpaie;	/* rx assoc w/ bad WPA IE */
-	uint32_t	is_rx_deauth;		/* rx deauthentication */
-	uint32_t	is_rx_disassoc;		/* rx disassociation */
-	uint32_t	is_rx_badsubtype;	/* rx frame w/ unknown subtype*/
-	uint32_t	is_rx_nobuf;		/* rx failed for lack of buf */
-	uint32_t	is_rx_decryptcrc;	/* rx decrypt failed on crc */
-	uint32_t	is_rx_ahdemo_mgt;	/* rx discard ahdemo mgt frame*/
-	uint32_t	is_rx_bad_auth;		/* rx bad auth request */
-	uint32_t	is_rx_unauth;		/* rx on unauthorized port */
-	uint32_t	is_rx_badkeyid;		/* rx w/ incorrect keyid */
-	uint32_t	is_rx_ccmpreplay;	/* rx seq# violation (CCMP) */
-	uint32_t	is_rx_ccmpformat;	/* rx format bad (CCMP) */
-	uint32_t	is_rx_ccmpmic;		/* rx MIC check failed (CCMP) */
-	uint32_t	is_rx_tkipreplay;	/* rx seq# violation (TKIP) */
-	uint32_t	is_rx_tkipformat;	/* rx format bad (TKIP) */
-	uint32_t	is_rx_tkipmic;		/* rx MIC check failed (TKIP) */
-	uint32_t	is_rx_tkipicv;		/* rx ICV check failed (TKIP) */
-	uint32_t	is_rx_badcipher;	/* rx failed 'cuz key type */
-	uint32_t	is_rx_nocipherctx;	/* rx failed 'cuz key !setup */
-	uint32_t	is_rx_acl;		/* rx discard 'cuz acl policy */
-	uint32_t	is_tx_nobuf;		/* tx failed for lack of buf */
-	uint32_t	is_tx_nonode;		/* tx failed for no node */
-	uint32_t	is_tx_unknownmgt;	/* tx of unknown mgt frame */
-	uint32_t	is_tx_badcipher;	/* tx failed 'cuz key type */
-	uint32_t	is_tx_nodefkey;		/* tx failed 'cuz no defkey */
-	uint32_t	is_tx_noheadroom;	/* tx failed 'cuz no space */
-	uint32_t	is_tx_fragframes;	/* tx frames fragmented */
-	uint32_t	is_tx_frags;		/* tx fragments created */
-	uint32_t	is_scan_active;		/* active scans started */
-	uint32_t	is_scan_passive;	/* passive scans started */
-	uint32_t	is_node_timeout;	/* nodes timed out inactivity */
-	uint32_t	is_crypto_nomem;	/* no memory for crypto ctx */
-	uint32_t	is_crypto_tkip;		/* tkip crypto done in s/w */
-	uint32_t	is_crypto_tkipenmic;	/* tkip en-MIC done in s/w */
-	uint32_t	is_crypto_tkipdemic;	/* tkip de-MIC done in s/w */
-	uint32_t	is_crypto_tkipcm;	/* tkip counter measures */
-	uint32_t	is_crypto_ccmp;		/* ccmp crypto done in s/w */
-	uint32_t	is_crypto_wep;		/* wep crypto done in s/w */
-	uint32_t	is_crypto_setkey_cipher;/* cipher rejected key */
-	uint32_t	is_crypto_setkey_nokey;	/* no key index for setkey */
-	uint32_t	is_crypto_delkey;	/* driver key delete failed */
-	uint32_t	is_crypto_badcipher;	/* unknown cipher */
-	uint32_t	is_crypto_nocipher;	/* cipher not available */
-	uint32_t	is_crypto_attachfail;	/* cipher attach failed */
-	uint32_t	is_crypto_swfallback;	/* cipher fallback to s/w */
-	uint32_t	is_crypto_keyfail;	/* driver key alloc failed */
-	uint32_t	is_crypto_enmicfail;	/* en-MIC failed */
-	uint32_t	is_ibss_capmismatch;	/* merge failed-cap mismatch */
-	uint32_t	is_ibss_norate;		/* merge failed-rate mismatch */
-	uint32_t	is_ps_unassoc;		/* ps-poll for unassoc. sta */
-	uint32_t	is_ps_badaid;		/* ps-poll w/ incorrect aid */
-	uint32_t	is_ps_qempty;		/* ps-poll w/ nothing to send */
-	uint32_t	is_ff_badhdr;		/* fast frame rx'd w/ bad hdr */
-	uint32_t	is_ff_tooshort;		/* fast frame rx decap error */
-	uint32_t	is_ff_split;		/* fast frame rx split error */
-	uint32_t	is_ff_decap;		/* fast frames decap'd */
-	uint32_t	is_ff_encap;		/* fast frames encap'd for tx */
-	uint32_t	is_rx_badbintval;	/* rx frame w/ bogus bintval */
-	uint32_t	is_rx_demicfail;	/* rx demic failed */
-	uint32_t	is_rx_defrag;		/* rx defragmentation failed */
-	uint32_t	is_rx_mgmt;		/* rx management frames */
-	uint32_t	is_rx_action;		/* rx action mgt frames */
-	uint32_t	is_amsdu_tooshort;	/* A-MSDU rx decap error */
-	uint32_t	is_amsdu_split;		/* A-MSDU rx split error */
-	uint32_t	is_amsdu_decap;		/* A-MSDU decap'd */
-	uint32_t	is_amsdu_encap;		/* A-MSDU encap'd for tx */
-	uint32_t	is_ampdu_bar_bad;	/* A-MPDU BAR out of window */
-	uint32_t	is_ampdu_bar_oow;	/* A-MPDU BAR before ADDBA */
-	uint32_t	is_ampdu_bar_move;	/* A-MPDU BAR moved window */
-	uint32_t	is_ampdu_bar_rx;	/* A-MPDU BAR frames handled */
-	uint32_t	is_ampdu_rx_flush;	/* A-MPDU frames flushed */
-	uint32_t	is_ampdu_rx_oor;	/* A-MPDU frames out-of-order */
-	uint32_t	is_ampdu_rx_copy;	/* A-MPDU frames copied down */
-	uint32_t	is_ampdu_rx_drop;	/* A-MPDU frames dropped */
-	uint32_t	is_tx_badstate;		/* tx discard state != RUN */
-	uint32_t	is_tx_notassoc;		/* tx failed, sta not assoc */
-	uint32_t	is_tx_classify;		/* tx classification failed */
-	uint32_t	is_dwds_mcast;		/* discard mcast over dwds */
-	uint32_t	is_dwds_qdrop;		/* dwds pending frame q full */
-	uint32_t	is_ht_assoc_nohtcap;	/* non-HT sta rejected */
-	uint32_t	is_ht_assoc_downgrade;	/* HT sta forced to legacy */
-	uint32_t	is_ht_assoc_norate;	/* HT assoc w/ rate mismatch */
-	uint32_t	is_ampdu_rx_age;	/* A-MPDU sent up 'cuz of age */
-	uint32_t	is_ampdu_rx_move;	/* A-MPDU MSDU moved window */
-	uint32_t	is_addba_reject;	/* ADDBA reject 'cuz disabled */
-	uint32_t	is_addba_norequest;	/* ADDBA response w/o ADDBA */
-	uint32_t	is_addba_badtoken;	/* ADDBA response w/ wrong
-						   dialogtoken */
-	uint32_t	is_addba_badpolicy;	/* ADDBA resp w/ wrong policy */
-	uint32_t	is_ampdu_stop;		/* A-MPDU stream stopped */
-	uint32_t	is_ampdu_stop_failed;	/* A-MPDU stream not running */
-	uint32_t	is_ampdu_rx_reorder;	/* A-MPDU held for rx reorder */
-	uint32_t	is_scan_bg;		/* background scans started */
-	uint8_t		is_rx_deauth_code;	/* last rx'd deauth reason */
-	uint8_t		is_rx_disassoc_code;	/* last rx'd disassoc reason */
-	uint8_t		is_rx_authfail_code;	/* last rx'd auth fail reason */
-	uint32_t	is_beacon_miss;		/* beacon miss notification */
-	uint32_t	is_rx_badstate;		/* rx discard state != RUN */
-	uint32_t	is_ff_flush;		/* ff's flush'd from stageq */
-	uint32_t	is_tx_ctl;		/* tx ctrl frames */
-	uint32_t	is_ampdu_rexmt;		/* A-MPDU frames rexmt ok */
-	uint32_t	is_ampdu_rexmt_fail;	/* A-MPDU frames rexmt fail */
-
-	uint32_t	is_mesh_wrongmesh;	/* dropped 'cuz not mesh sta*/
-	uint32_t	is_mesh_nolink;		/* dropped 'cuz link not estab*/
-	uint32_t	is_mesh_fwd_ttl;	/* mesh not fwd'd 'cuz ttl 0 */
-	uint32_t	is_mesh_fwd_nobuf;	/* mesh not fwd'd 'cuz no mbuf*/
-	uint32_t	is_mesh_fwd_tooshort;	/* mesh not fwd'd 'cuz no hdr */
-	uint32_t	is_mesh_fwd_disabled;	/* mesh not fwd'd 'cuz disabled */
-	uint32_t	is_mesh_fwd_nopath;	/* mesh not fwd'd 'cuz path unknown */
-
-	uint32_t	is_hwmp_wrongseq;	/* wrong hwmp seq no. */
-	uint32_t	is_hwmp_rootreqs;	/* root PREQs sent */
-	uint32_t	is_hwmp_rootrann;	/* root RANNs sent */
-
-	uint32_t	is_mesh_badae;		/* dropped 'cuz invalid AE */
-	uint32_t	is_mesh_rtaddfailed;	/* route add failed */
-	uint32_t	is_mesh_notproxy;	/* dropped 'cuz not proxying */
-	uint32_t	is_rx_badalign;		/* dropped 'cuz misaligned */
-	uint32_t	is_hwmp_proxy;		/* PREP for proxy route */
-	uint32_t	is_beacon_bad;		/* Number of bad beacons */
-	uint32_t	is_ampdu_bar_tx;	/* A-MPDU BAR frames TXed */
-	uint32_t	is_ampdu_bar_tx_retry;	/* A-MPDU BAR frames TX rtry */
-	uint32_t	is_ampdu_bar_tx_fail;	/* A-MPDU BAR frames TX fail */
-
-	uint32_t	is_spare[7];
-};
-
-/*
- * Max size of optional information elements.  We artificially
- * constrain this; it's limited only by the max frame size (and
- * the max parameter size of the wireless extensions).
- */
-#define	IEEE80211_MAX_OPT_IE	256
-
-/*
- * WPA/RSN get/set key request.  Specify the key/cipher
- * type and whether the key is to be used for sending and/or
- * receiving.  The key index should be set only when working
- * with global keys (use IEEE80211_KEYIX_NONE for ``no index'').
- * Otherwise a unicast/pairwise key is specified by the bssid
- * (on a station) or mac address (on an ap).  They key length
- * must include any MIC key data; otherwise it should be no
- * more than IEEE80211_KEYBUF_SIZE.
- */
-struct ieee80211req_key {
-	uint8_t		ik_type;	/* key/cipher type */
-	uint8_t		ik_pad;
-	uint16_t	ik_keyix;	/* key index */
-	uint8_t		ik_keylen;	/* key length in bytes */
-	uint8_t		ik_flags;
-/* NB: IEEE80211_KEY_XMIT and IEEE80211_KEY_RECV defined elsewhere */
-#define	IEEE80211_KEY_DEFAULT	0x80	/* default xmit key */
-	uint8_t		ik_macaddr[IEEE80211_ADDR_LEN];
-	uint64_t	ik_keyrsc;	/* key receive sequence counter */
-	uint64_t	ik_keytsc;	/* key transmit sequence counter */
-	uint8_t		ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE];
-};
-
-/*
- * Delete a key either by index or address.  Set the index
- * to IEEE80211_KEYIX_NONE when deleting a unicast key.
- */
-struct ieee80211req_del_key {
-	uint8_t		idk_keyix;	/* key index */
-	uint8_t		idk_macaddr[IEEE80211_ADDR_LEN];
-};
-
-/*
- * MLME state manipulation request.  IEEE80211_MLME_ASSOC
- * only makes sense when operating as a station.  The other
- * requests can be used when operating as a station or an
- * ap (to effect a station).
- */
-struct ieee80211req_mlme {
-	uint8_t		im_op;		/* operation to perform */
-#define	IEEE80211_MLME_ASSOC		1	/* associate station */
-#define	IEEE80211_MLME_DISASSOC		2	/* disassociate station */
-#define	IEEE80211_MLME_DEAUTH		3	/* deauthenticate station */
-#define	IEEE80211_MLME_AUTHORIZE	4	/* authorize station */
-#define	IEEE80211_MLME_UNAUTHORIZE	5	/* unauthorize station */
-#define	IEEE80211_MLME_AUTH		6	/* authenticate station */
-	uint8_t		im_ssid_len;	/* length of optional ssid */
-	uint16_t	im_reason;	/* 802.11 reason code */
-	uint8_t		im_macaddr[IEEE80211_ADDR_LEN];
-	uint8_t		im_ssid[IEEE80211_NWID_LEN];
-};
-
-/* 
- * MAC ACL operations.
- */
-enum {
-	IEEE80211_MACCMD_POLICY_OPEN	= 0,	/* set policy: no ACL's */
-	IEEE80211_MACCMD_POLICY_ALLOW	= 1,	/* set policy: allow traffic */
-	IEEE80211_MACCMD_POLICY_DENY	= 2,	/* set policy: deny traffic */
-	IEEE80211_MACCMD_FLUSH		= 3,	/* flush ACL database */
-	IEEE80211_MACCMD_DETACH		= 4,	/* detach ACL policy */
-	IEEE80211_MACCMD_POLICY		= 5,	/* get ACL policy */
-	IEEE80211_MACCMD_LIST		= 6,	/* get ACL database */
-	IEEE80211_MACCMD_POLICY_RADIUS	= 7,	/* set policy: RADIUS managed */
-};
-
-struct ieee80211req_maclist {
-	uint8_t		ml_macaddr[IEEE80211_ADDR_LEN];
-} __packed;
-
-/*
- * Mesh Routing Table Operations.
- */
-enum {
-	IEEE80211_MESH_RTCMD_LIST   = 0, /* list HWMP routing table */
-	IEEE80211_MESH_RTCMD_FLUSH  = 1, /* flush HWMP routing table */
-	IEEE80211_MESH_RTCMD_ADD    = 2, /* add entry to the table */
-	IEEE80211_MESH_RTCMD_DELETE = 3, /* delete an entry from the table */
-};
-
-struct ieee80211req_mesh_route {
-	uint8_t		imr_flags;
-#define	IEEE80211_MESHRT_FLAGS_DISCOVER	0x01
-#define	IEEE80211_MESHRT_FLAGS_VALID	0x02
-#define	IEEE80211_MESHRT_FLAGS_PROXY	0x04
-#define	IEEE80211_MESHRT_FLAGS_GATE	0x08
-	uint8_t		imr_dest[IEEE80211_ADDR_LEN];
-	uint8_t		imr_nexthop[IEEE80211_ADDR_LEN];
-	uint16_t	imr_nhops;
-	uint8_t		imr_pad;
-	uint32_t	imr_metric;
-	uint32_t	imr_lifetime;
-	uint32_t	imr_lastmseq;
-};
-
-/*
- * HWMP root modes
- */
-enum {
-	IEEE80211_HWMP_ROOTMODE_DISABLED	= 0, 	/* disabled */
-	IEEE80211_HWMP_ROOTMODE_NORMAL		= 1,	/* normal PREPs */
-	IEEE80211_HWMP_ROOTMODE_PROACTIVE	= 2,	/* proactive PREPS */
-	IEEE80211_HWMP_ROOTMODE_RANN		= 3,	/* use RANN elemid */
-};
-
-
-/*
- * Set the active channel list by IEEE channel #: each channel
- * to be marked active is set in a bit vector.  Note this list is
- * intersected with the available channel list in calculating
- * the set of channels actually used in scanning.
- */
-struct ieee80211req_chanlist {
-	uint8_t		ic_channels[32];	/* NB: can be variable length */
-};
-
-/*
- * Get the active channel list info.
- */
-struct ieee80211req_chaninfo {
-	u_int	ic_nchans;
-	struct ieee80211_channel ic_chans[1];	/* NB: variable length */
-};
-#define	IEEE80211_CHANINFO_SIZE(_nchan) \
-	(sizeof(struct ieee80211req_chaninfo) + \
-	 (((_nchan)-1) * sizeof(struct ieee80211_channel)))
-#define	IEEE80211_CHANINFO_SPACE(_ci) \
-	IEEE80211_CHANINFO_SIZE((_ci)->ic_nchans)
-
-/*
- * Retrieve the WPA/RSN information element for an associated station.
- */
-struct ieee80211req_wpaie {	/* old version w/ only one ie */
-	uint8_t		wpa_macaddr[IEEE80211_ADDR_LEN];
-	uint8_t		wpa_ie[IEEE80211_MAX_OPT_IE];
-};
-struct ieee80211req_wpaie2 {
-	uint8_t		wpa_macaddr[IEEE80211_ADDR_LEN];
-	uint8_t		wpa_ie[IEEE80211_MAX_OPT_IE];
-	uint8_t		rsn_ie[IEEE80211_MAX_OPT_IE];
-};
-
-/*
- * Retrieve per-node statistics.
- */
-struct ieee80211req_sta_stats {
-	union {
-		/* NB: explicitly force 64-bit alignment */
-		uint8_t		macaddr[IEEE80211_ADDR_LEN];
-		uint64_t	pad;
-	} is_u;
-	struct ieee80211_nodestats is_stats;
-};
-
-/*
- * Station information block; the mac address is used
- * to retrieve other data like stats, unicast key, etc.
- */
-struct ieee80211req_sta_info {
-	uint16_t	isi_len;		/* total length (mult of 4) */
-	uint16_t	isi_ie_off;		/* offset to IE data */
-	uint16_t	isi_ie_len;		/* IE length */
-	uint16_t	isi_freq;		/* MHz */
-	uint32_t	isi_flags;		/* channel flags */
-	uint32_t	isi_state;		/* state flags */
-	uint8_t		isi_authmode;		/* authentication algorithm */
-	int8_t		isi_rssi;		/* receive signal strength */
-	int8_t		isi_noise;		/* noise floor */
-	uint8_t		isi_capinfo;		/* capabilities */
-	uint8_t		isi_erp;		/* ERP element */
-	uint8_t		isi_macaddr[IEEE80211_ADDR_LEN];
-	uint8_t		isi_nrates;
-						/* negotiated rates */
-	uint8_t		isi_rates[IEEE80211_RATE_MAXSIZE];
-	uint8_t		isi_txrate;		/* legacy/IEEE rate or MCS */
-	uint16_t	isi_associd;		/* assoc response */
-	uint16_t	isi_txpower;		/* current tx power */
-	uint16_t	isi_vlan;		/* vlan tag */
-	/* NB: [IEEE80211_NONQOS_TID] holds seq#'s for non-QoS stations */
-	uint16_t	isi_txseqs[IEEE80211_TID_SIZE];/* tx seq #/TID */
-	uint16_t	isi_rxseqs[IEEE80211_TID_SIZE];/* rx seq#/TID */
-	uint16_t	isi_inact;		/* inactivity timer */
-	uint16_t	isi_txmbps;		/* current tx rate in .5 Mb/s */
-	uint16_t	isi_pad;
-	uint32_t	isi_jointime;		/* time of assoc/join */
-	struct ieee80211_mimo_info isi_mimo;	/* MIMO info for 11n sta's */
-	/* 11s info */
-	uint16_t	isi_peerid;
-	uint16_t	isi_localid;
-	uint8_t		isi_peerstate;
-	/* XXX frag state? */
-	/* variable length IE data */
-};
-
-/*
- * Retrieve per-station information; to retrieve all
- * specify a mac address of ff:ff:ff:ff:ff:ff.
- */
-struct ieee80211req_sta_req {
-	union {
-		/* NB: explicitly force 64-bit alignment */
-		uint8_t		macaddr[IEEE80211_ADDR_LEN];
-		uint64_t	pad;
-	} is_u;
-	struct ieee80211req_sta_info info[1];	/* variable length */
-};
-
-/*
- * Get/set per-station tx power cap.
- */
-struct ieee80211req_sta_txpow {
-	uint8_t		it_macaddr[IEEE80211_ADDR_LEN];
-	uint8_t		it_txpow;
-};
-
-/*
- * WME parameters manipulated with IEEE80211_IOC_WME_CWMIN
- * through IEEE80211_IOC_WME_ACKPOLICY are set and return
- * using i_val and i_len.  i_val holds the value itself.
- * i_len specifies the AC and, as appropriate, then high bit
- * specifies whether the operation is to be applied to the
- * BSS or ourself.
- */
-#define	IEEE80211_WMEPARAM_SELF	0x0000		/* parameter applies to self */
-#define	IEEE80211_WMEPARAM_BSS	0x8000		/* parameter applies to BSS */
-#define	IEEE80211_WMEPARAM_VAL	0x7fff		/* parameter value */
-
-/*
- * Application Information Elements can be appended to a variety
- * of frames with the IEE80211_IOC_APPIE request.  This request
- * piggybacks on a normal ieee80211req; the frame type is passed
- * in i_val as the 802.11 FC0 bytes and the length of the IE data
- * is passed in i_len.  The data is referenced in i_data.  If i_len
- * is zero then any previously configured IE data is removed.  At
- * most IEEE80211_MAX_APPIE data be appened.  Note that multiple
- * IE's can be supplied; the data is treated opaquely.
- */
-#define	IEEE80211_MAX_APPIE	1024		/* max app IE data */
-/*
- * Hack: the WPA authenticator uses this mechanism to specify WPA
- * ie's that are used instead of the ones normally constructed using
- * the cipher state setup with separate ioctls.  This avoids issues
- * like the authenticator ordering ie data differently than the
- * net80211 layer and needing to keep separate state for WPA and RSN.
- */
-#define	IEEE80211_APPIE_WPA \
-	(IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_BEACON | \
-	 IEEE80211_FC0_SUBTYPE_PROBE_RESP)
-
-/*
- * Station mode roaming parameters.  These are maintained
- * per band/mode and control the roaming algorithm.
- */
-struct ieee80211_roamparams_req {
-	struct ieee80211_roamparam params[IEEE80211_MODE_MAX];
-};
-
-/*
- * Transmit parameters.  These can be used to set fixed transmit
- * rate for each operating mode when operating as client or on a
- * per-client basis according to the capabilities of the client
- * (e.g. an 11b client associated to an 11g ap) when operating as
- * an ap.
- *
- * MCS are distinguished from legacy rates by or'ing in 0x80.
- */
-struct ieee80211_txparams_req {
-	struct ieee80211_txparam params[IEEE80211_MODE_MAX];
-};
-
-/*
- * Set regulatory domain state with IEEE80211_IOC_REGDOMAIN.
- * Note this is both the regulatory description and the channel
- * list.  The get request for IEEE80211_IOC_REGDOMAIN returns
- * only the regdomain info; the channel list is obtained
- * separately with IEEE80211_IOC_CHANINFO.
- */
-struct ieee80211_regdomain_req {
-	struct ieee80211_regdomain	rd;
-	struct ieee80211req_chaninfo	chaninfo;
-};
-#define	IEEE80211_REGDOMAIN_SIZE(_nchan) \
-	(sizeof(struct ieee80211_regdomain_req) + \
-	 (((_nchan)-1) * sizeof(struct ieee80211_channel)))
-#define	IEEE80211_REGDOMAIN_SPACE(_req) \
-	IEEE80211_REGDOMAIN_SIZE((_req)->chaninfo.ic_nchans)
-
-/*
- * Get driver capabilities.  Driver, hardware crypto, and
- * HT/802.11n capabilities, and a table that describes what
- * the radio can do.
- */
-struct ieee80211_devcaps_req {
-	uint32_t	dc_drivercaps;		/* general driver caps */
-	uint32_t	dc_cryptocaps;		/* hardware crypto support */
-	uint32_t	dc_htcaps;		/* HT/802.11n support */
-	struct ieee80211req_chaninfo dc_chaninfo;
-};
-#define	IEEE80211_DEVCAPS_SIZE(_nchan) \
-	(sizeof(struct ieee80211_devcaps_req) + \
-	 (((_nchan)-1) * sizeof(struct ieee80211_channel)))
-#define	IEEE80211_DEVCAPS_SPACE(_dc) \
-	IEEE80211_DEVCAPS_SIZE((_dc)->dc_chaninfo.ic_nchans)
-
-struct ieee80211_chanswitch_req {
-	struct ieee80211_channel csa_chan;	/* new channel */
-	int		csa_mode;		/* CSA mode */
-	int		csa_count;		/* beacon count to switch */
-};
-
-/*
- * Get/set per-station vlan tag.
- */
-struct ieee80211req_sta_vlan {
-	uint8_t		sv_macaddr[IEEE80211_ADDR_LEN];
-	uint16_t	sv_vlan;
-};
-
-#ifdef __FreeBSD__
-/*
- * FreeBSD-style ioctls.
- */
-/* the first member must be matched with struct ifreq */
-struct ieee80211req {
-	char		i_name[IFNAMSIZ];	/* if_name, e.g. "wi0" */
-	uint16_t	i_type;			/* req type */
-	int16_t		i_val;			/* Index or simple value */
-	uint16_t	i_len;			/* Index or simple value */
-	void		*i_data;		/* Extra data */
-};
-#define	SIOCS80211		 _IOW('i', 234, struct ieee80211req)
-#define	SIOCG80211		_IOWR('i', 235, struct ieee80211req)
-#define	SIOCG80211STATS		_IOWR('i', 236, struct ifreq)
-
-#define IEEE80211_IOC_SSID		1
-#define IEEE80211_IOC_NUMSSIDS		2
-#define IEEE80211_IOC_WEP		3
-#define 	IEEE80211_WEP_NOSUP	-1
-#define 	IEEE80211_WEP_OFF	0
-#define 	IEEE80211_WEP_ON	1
-#define 	IEEE80211_WEP_MIXED	2
-#define IEEE80211_IOC_WEPKEY		4
-#define IEEE80211_IOC_NUMWEPKEYS	5
-#define IEEE80211_IOC_WEPTXKEY		6
-#define IEEE80211_IOC_AUTHMODE		7
-#define IEEE80211_IOC_STATIONNAME	8
-#define IEEE80211_IOC_CHANNEL		9
-#define IEEE80211_IOC_POWERSAVE		10
-#define 	IEEE80211_POWERSAVE_NOSUP	-1
-#define 	IEEE80211_POWERSAVE_OFF		0
-#define 	IEEE80211_POWERSAVE_CAM		1
-#define 	IEEE80211_POWERSAVE_PSP		2
-#define 	IEEE80211_POWERSAVE_PSP_CAM	3
-#define 	IEEE80211_POWERSAVE_ON		IEEE80211_POWERSAVE_CAM
-#define IEEE80211_IOC_POWERSAVESLEEP	11
-#define	IEEE80211_IOC_RTSTHRESHOLD	12
-#define IEEE80211_IOC_PROTMODE		13
-#define 	IEEE80211_PROTMODE_OFF		0
-#define 	IEEE80211_PROTMODE_CTS		1
-#define 	IEEE80211_PROTMODE_RTSCTS	2
-#define	IEEE80211_IOC_TXPOWER		14	/* global tx power limit */
-#define	IEEE80211_IOC_BSSID		15
-#define	IEEE80211_IOC_ROAMING		16	/* roaming mode */
-#define	IEEE80211_IOC_PRIVACY		17	/* privacy invoked */
-#define	IEEE80211_IOC_DROPUNENCRYPTED	18	/* discard unencrypted frames */
-#define	IEEE80211_IOC_WPAKEY		19
-#define	IEEE80211_IOC_DELKEY		20
-#define	IEEE80211_IOC_MLME		21
-/* 22 was IEEE80211_IOC_OPTIE, replaced by IEEE80211_IOC_APPIE */
-/* 23 was IEEE80211_IOC_SCAN_REQ */
-/* 24 was IEEE80211_IOC_SCAN_RESULTS */
-#define	IEEE80211_IOC_COUNTERMEASURES	25	/* WPA/TKIP countermeasures */
-#define	IEEE80211_IOC_WPA		26	/* WPA mode (0,1,2) */
-#define	IEEE80211_IOC_CHANLIST		27	/* channel list */
-#define	IEEE80211_IOC_WME		28	/* WME mode (on, off) */
-#define	IEEE80211_IOC_HIDESSID		29	/* hide SSID mode (on, off) */
-#define	IEEE80211_IOC_APBRIDGE		30	/* AP inter-sta bridging */
-/* 31-35,37-38 were for WPA authenticator settings */
-/* 36 was IEEE80211_IOC_DRIVER_CAPS */
-#define	IEEE80211_IOC_WPAIE		39	/* WPA information element */
-#define	IEEE80211_IOC_STA_STATS		40	/* per-station statistics */
-#define	IEEE80211_IOC_MACCMD		41	/* MAC ACL operation */
-#define	IEEE80211_IOC_CHANINFO		42	/* channel info list */
-#define	IEEE80211_IOC_TXPOWMAX		43	/* max tx power for channel */
-#define	IEEE80211_IOC_STA_TXPOW		44	/* per-station tx power limit */
-/* 45 was IEEE80211_IOC_STA_INFO */
-#define	IEEE80211_IOC_WME_CWMIN		46	/* WME: ECWmin */
-#define	IEEE80211_IOC_WME_CWMAX		47	/* WME: ECWmax */
-#define	IEEE80211_IOC_WME_AIFS		48	/* WME: AIFSN */
-#define	IEEE80211_IOC_WME_TXOPLIMIT	49	/* WME: txops limit */
-#define	IEEE80211_IOC_WME_ACM		50	/* WME: ACM (bss only) */
-#define	IEEE80211_IOC_WME_ACKPOLICY	51	/* WME: ACK policy (!bss only)*/
-#define	IEEE80211_IOC_DTIM_PERIOD	52	/* DTIM period (beacons) */
-#define	IEEE80211_IOC_BEACON_INTERVAL	53	/* beacon interval (ms) */
-#define	IEEE80211_IOC_ADDMAC		54	/* add sta to MAC ACL table */
-#define	IEEE80211_IOC_DELMAC		55	/* del sta from MAC ACL table */
-#define	IEEE80211_IOC_PUREG		56	/* pure 11g (no 11b stations) */
-#define	IEEE80211_IOC_FF		57	/* ATH fast frames (on, off) */
-#define	IEEE80211_IOC_TURBOP		58	/* ATH turbo' (on, off) */
-#define	IEEE80211_IOC_BGSCAN		59	/* bg scanning (on, off) */
-#define	IEEE80211_IOC_BGSCAN_IDLE	60	/* bg scan idle threshold */
-#define	IEEE80211_IOC_BGSCAN_INTERVAL	61	/* bg scan interval */
-#define	IEEE80211_IOC_SCANVALID		65	/* scan cache valid threshold */
-/* 66-72 were IEEE80211_IOC_ROAM_* and IEEE80211_IOC_MCAST_RATE */
-#define	IEEE80211_IOC_FRAGTHRESHOLD	73	/* tx fragmentation threshold */
-#define	IEEE80211_IOC_BURST		75	/* packet bursting */
-#define	IEEE80211_IOC_SCAN_RESULTS	76	/* get scan results */
-#define	IEEE80211_IOC_BMISSTHRESHOLD	77	/* beacon miss threshold */
-#define	IEEE80211_IOC_STA_INFO		78	/* station/neighbor info */
-#define	IEEE80211_IOC_WPAIE2		79	/* WPA+RSN info elements */
-#define	IEEE80211_IOC_CURCHAN		80	/* current channel */
-#define	IEEE80211_IOC_SHORTGI		81	/* 802.11n half GI */
-#define	IEEE80211_IOC_AMPDU		82	/* 802.11n A-MPDU (on, off) */
-#define	IEEE80211_IOC_AMPDU_LIMIT	83	/* A-MPDU length limit */
-#define	IEEE80211_IOC_AMPDU_DENSITY	84	/* A-MPDU density */
-#define	IEEE80211_IOC_AMSDU		85	/* 802.11n A-MSDU (on, off) */
-#define	IEEE80211_IOC_AMSDU_LIMIT	86	/* A-MSDU length limit */
-#define	IEEE80211_IOC_PUREN		87	/* pure 11n (no legacy sta's) */
-#define	IEEE80211_IOC_DOTH		88	/* 802.11h (on, off) */
-/* 89-91 were regulatory items */
-#define	IEEE80211_IOC_HTCOMPAT		92	/* support pre-D1.10 HT ie's */
-#define	IEEE80211_IOC_DWDS		93	/* DWDS/4-address handling */
-#define	IEEE80211_IOC_INACTIVITY	94	/* sta inactivity handling */
-#define	IEEE80211_IOC_APPIE		95	/* application IE's */
-#define	IEEE80211_IOC_WPS		96	/* WPS operation */
-#define	IEEE80211_IOC_TSN		97	/* TSN operation */
-#define	IEEE80211_IOC_DEVCAPS		98	/* driver+device capabilities */
-#define	IEEE80211_IOC_CHANSWITCH	99	/* start 11h channel switch */
-#define	IEEE80211_IOC_DFS		100	/* DFS (on, off) */
-#define	IEEE80211_IOC_DOTD		101	/* 802.11d (on, off) */
-#define IEEE80211_IOC_HTPROTMODE	102	/* HT protection (off, rts) */
-#define	IEEE80211_IOC_SCAN_REQ		103	/* scan w/ specified params */
-#define	IEEE80211_IOC_SCAN_CANCEL	104	/* cancel ongoing scan */
-#define	IEEE80211_IOC_HTCONF		105	/* HT config (off, HT20, HT40)*/
-#define	IEEE80211_IOC_REGDOMAIN		106	/* regulatory domain info */
-#define	IEEE80211_IOC_ROAM		107	/* roaming params en masse */
-#define	IEEE80211_IOC_TXPARAMS		108	/* tx parameters */
-#define	IEEE80211_IOC_STA_VLAN		109	/* per-station vlan tag */
-#define	IEEE80211_IOC_SMPS		110	/* MIMO power save */
-#define	IEEE80211_IOC_RIFS		111	/* RIFS config (on, off) */
-#define	IEEE80211_IOC_GREENFIELD	112	/* Greenfield (on, off) */
-#define	IEEE80211_IOC_STBC		113	/* STBC Tx/RX (on, off) */
-
-#define	IEEE80211_IOC_MESH_ID		170	/* mesh identifier */
-#define	IEEE80211_IOC_MESH_AP		171	/* accepting peerings */
-#define	IEEE80211_IOC_MESH_FWRD		172	/* forward frames */
-#define	IEEE80211_IOC_MESH_PROTO	173	/* mesh protocols */
-#define	IEEE80211_IOC_MESH_TTL		174	/* mesh TTL */
-#define	IEEE80211_IOC_MESH_RTCMD	175	/* mesh routing table commands*/
-#define	IEEE80211_IOC_MESH_PR_METRIC	176	/* mesh metric protocol */
-#define	IEEE80211_IOC_MESH_PR_PATH	177	/* mesh path protocol */
-#define	IEEE80211_IOC_MESH_PR_SIG	178	/* mesh sig protocol */
-#define	IEEE80211_IOC_MESH_PR_CC	179	/* mesh congestion protocol */
-#define	IEEE80211_IOC_MESH_PR_AUTH	180	/* mesh auth protocol */
-#define	IEEE80211_IOC_MESH_GATE		181	/* mesh gate XXX: 173? */
-
-#define	IEEE80211_IOC_HWMP_ROOTMODE	190	/* HWMP root mode */
-#define	IEEE80211_IOC_HWMP_MAXHOPS	191	/* number of hops before drop */
-#define	IEEE80211_IOC_HWMP_TTL		192	/* HWMP TTL */
-
-#define	IEEE80211_IOC_TDMA_SLOT		201	/* TDMA: assigned slot */
-#define	IEEE80211_IOC_TDMA_SLOTCNT	202	/* TDMA: slots in bss */
-#define	IEEE80211_IOC_TDMA_SLOTLEN	203	/* TDMA: slot length (usecs) */
-#define	IEEE80211_IOC_TDMA_BINTERVAL	204	/* TDMA: beacon intvl (slots) */
-
-#define	IEEE80211_IOC_QUIET		205	/* Quiet Enable/Disable */
-#define	IEEE80211_IOC_QUIET_PERIOD	206	/* Quiet Period */
-#define	IEEE80211_IOC_QUIET_OFFSET	207	/* Quiet Offset */
-#define	IEEE80211_IOC_QUIET_DUR		208	/* Quiet Duration */
-#define	IEEE80211_IOC_QUIET_COUNT	209	/* Quiet Count */
-/*
- * Parameters for controlling a scan requested with
- * IEEE80211_IOC_SCAN_REQ.
- *
- * Active scans cause ProbeRequest frames to be issued for each
- * specified ssid and, by default, a broadcast ProbeRequest frame.
- * The set of ssid's is specified in the request.
- *
- * By default the scan will cause a BSS to be joined (in station/adhoc
- * mode) or a channel to be selected for operation (hostap mode).
- * To disable that specify IEEE80211_IOC_SCAN_NOPICK and if the
- *
- * If the station is currently associated to an AP then a scan request
- * will cause the station to leave the current channel and potentially
- * miss frames from the AP.  Alternatively the station may notify the
- * AP that it is going into power save mode before it leaves the channel.
- * This ensures frames for the station are buffered by the AP.  This is
- * termed a ``bg scan'' and is requested with the IEEE80211_IOC_SCAN_BGSCAN
- * flag.  Background scans may take longer than foreground scans and may
- * be preempted by traffic.  If a station is not associated to an AP
- * then a request for a background scan is automatically done in the
- * foreground.
- *
- * The results of the scan request are cached by the system.  This
- * information is aged out and/or invalidated based on events like not
- * being able to associated to an AP.  To flush the current cache
- * contents before doing a scan the IEEE80211_IOC_SCAN_FLUSH flag may
- * be specified.
- *
- * By default the scan will be done until a suitable AP is located
- * or a channel is found for use.  A scan can also be constrained
- * to be done once (IEEE80211_IOC_SCAN_ONCE) or to last for no more
- * than a specified duration.
- */
-struct ieee80211_scan_req {
-	int		sr_flags;
-#define	IEEE80211_IOC_SCAN_NOPICK	0x00001	/* scan only, no selection */
-#define	IEEE80211_IOC_SCAN_ACTIVE	0x00002	/* active scan (probe req) */
-#define	IEEE80211_IOC_SCAN_PICK1ST	0x00004	/* ``hey sailor'' mode */
-#define	IEEE80211_IOC_SCAN_BGSCAN	0x00008	/* bg scan, exit ps at end */
-#define	IEEE80211_IOC_SCAN_ONCE		0x00010	/* do one complete pass */
-#define	IEEE80211_IOC_SCAN_NOBCAST	0x00020	/* don't send bcast probe req */
-#define	IEEE80211_IOC_SCAN_NOJOIN	0x00040	/* no auto-sequencing */
-#define	IEEE80211_IOC_SCAN_FLUSH	0x10000	/* flush scan cache first */
-#define	IEEE80211_IOC_SCAN_CHECK	0x20000	/* check scan cache first */
-	u_int		sr_duration;		/* duration (ms) */
-#define	IEEE80211_IOC_SCAN_DURATION_MIN	1
-#define	IEEE80211_IOC_SCAN_DURATION_MAX	0x7fffffff
-#define	IEEE80211_IOC_SCAN_FOREVER	IEEE80211_IOC_SCAN_DURATION_MAX
-	u_int		sr_mindwell;		/* min channel dwelltime (ms) */
-	u_int		sr_maxdwell;		/* max channel dwelltime (ms) */
-	int		sr_nssid;
-#define	IEEE80211_IOC_SCAN_MAX_SSID	3
-	struct {
-		int	 len;				/* length in bytes */
-		uint8_t ssid[IEEE80211_NWID_LEN];	/* ssid contents */
-	} sr_ssid[IEEE80211_IOC_SCAN_MAX_SSID];
-};
-
-/*
- * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS.
- * Each result is a fixed size structure followed by a variable
- * length SSID and one or more variable length information elements.
- * The size of each variable length item is found in the fixed
- * size structure and the entire length of the record is specified
- * in isr_len.  Result records are rounded to a multiple of 4 bytes.
- */
-struct ieee80211req_scan_result {
-	uint16_t	isr_len;		/* total length (mult of 4) */
-	uint16_t	isr_ie_off;		/* offset to SSID+IE data */
-	uint16_t	isr_ie_len;		/* IE length */
-	uint16_t	isr_freq;		/* MHz */
-	uint16_t	isr_flags;		/* channel flags */
-	int8_t		isr_noise;
-	int8_t		isr_rssi;
-	uint16_t	isr_intval;		/* beacon interval */
-	uint8_t		isr_capinfo;		/* capabilities */
-	uint8_t		isr_erp;		/* ERP element */
-	uint8_t		isr_bssid[IEEE80211_ADDR_LEN];
-	uint8_t		isr_nrates;
-	uint8_t		isr_rates[IEEE80211_RATE_MAXSIZE];
-	uint8_t		isr_ssid_len;		/* SSID length */
-	uint8_t		isr_meshid_len;		/* MESH ID length */
-	/* variable length SSID, followed by variable length MESH ID,
-	  followed by IE data */
-};
-
-/*
- * Virtual AP cloning parameters.  The parent device must
- * be a vap-capable device.  All parameters specified with
- * the clone request are fixed for the lifetime of the vap.
- *
- * There are two flavors of WDS vaps: legacy and dynamic.
- * Legacy WDS operation implements a static binding between
- * two stations encapsulating traffic in 4-address frames.
- * Dynamic WDS vaps are created when a station associates to
- * an AP and sends a 4-address frame.  If the AP vap is
- * configured to support WDS then this will generate an
- * event to user programs listening on the routing socket
- * and a Dynamic WDS vap will be created to handle traffic
- * to/from that station.  In both cases the bssid of the
- * peer must be specified when creating the vap.
- *
- * By default a vap will inherit the mac address/bssid of
- * the underlying device.  To request a unique address the
- * IEEE80211_CLONE_BSSID flag should be supplied.  This is
- * meaningless for WDS vaps as they share the bssid of an
- * AP vap that must otherwise exist.  Note that some devices
- * may not be able to support multiple addresses.
- *
- * Station mode vap's normally depend on the device to notice
- * when the AP stops sending beacon frames.  If IEEE80211_CLONE_NOBEACONS
- * is specified the net80211 layer will do this in s/w.  This
- * is mostly useful when setting up a WDS repeater/extender where
- * an AP vap is combined with a sta vap and the device isn't able
- * to track beacon frames in hardware.
- */
-struct ieee80211_clone_params {
-	char	icp_parent[IFNAMSIZ];		/* parent device */
-	uint16_t icp_opmode;			/* operating mode */
-	uint16_t icp_flags;			/* see below */
-	uint8_t	icp_bssid[IEEE80211_ADDR_LEN];	/* for WDS links */
-	uint8_t	icp_macaddr[IEEE80211_ADDR_LEN];/* local address */
-};
-#define	IEEE80211_CLONE_BSSID		0x0001	/* allocate unique mac/bssid */
-#define	IEEE80211_CLONE_NOBEACONS	0x0002	/* don't setup beacon timers */
-#define	IEEE80211_CLONE_WDSLEGACY	0x0004	/* legacy WDS processing */
-#define	IEEE80211_CLONE_MACADDR		0x0008	/* use specified mac addr */
-#define	IEEE80211_CLONE_TDMA		0x0010	/* operate in TDMA mode */
-#endif /* __FreeBSD__ */
-
-#endif /* _NET80211_IEEE80211_IOCTL_H_ */
diff --git a/include.new/net80211/ieee80211_mesh.h b/include.new/net80211/ieee80211_mesh.h
deleted file mode 100644
index 52b491e..0000000
--- a/include.new/net80211/ieee80211_mesh.h
+++ /dev/null
@@ -1,605 +0,0 @@
-/*- 
- * Copyright (c) 2009 The FreeBSD Foundation 
- * All rights reserved. 
- * 
- * This software was developed by Rui Paulo under sponsorship from the
- * FreeBSD Foundation. 
- *  
- * 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. 
- * 
- * 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: releng/10.2/sys/net80211/ieee80211_mesh.h 246512 2013-02-07 21:26:40Z monthadar $
- */
-#ifndef _NET80211_IEEE80211_MESH_H_
-#define _NET80211_IEEE80211_MESH_H_
-
-#define	IEEE80211_MESH_DEFAULT_TTL	31
-#define	IEEE80211_MESH_MAX_NEIGHBORS	15
-
-/*
- * NB: all structures are __packed  so sizeof works on arm, et. al.
- */
-/*
- * 802.11s Information Elements.
-*/
-/* Mesh Configuration */
-#define IEEE80211_MESH_CONF_SZ		(7)
-struct ieee80211_meshconf_ie {
-	uint8_t		conf_ie;	/* IEEE80211_ELEMID_MESHCONF */
-	uint8_t		conf_len;
-	uint8_t		conf_pselid;	/* Active Path Sel. Proto. ID */
-	uint8_t		conf_pmetid;	/* Active Metric Identifier */
-	uint8_t		conf_ccid;	/* Congestion Control Mode ID  */
-	uint8_t		conf_syncid;	/* Sync. Protocol ID */
-	uint8_t		conf_authid;	/* Auth. Protocol ID */
-	uint8_t		conf_form;	/* Formation Information */
-	uint8_t		conf_cap;
-} __packed;
-
-/* Hybrid Wireless Mesh Protocol */
-enum {
-	/* 0 reserved */
-	IEEE80211_MESHCONF_PATH_HWMP		= 1,
-	/* 2-254 reserved */
-	IEEE80211_MESHCONF_PATH_VENDOR		= 255,
-};
-
-/* Airtime Link Metric */
-enum {
-	/* 0 reserved */
-	IEEE80211_MESHCONF_METRIC_AIRTIME	= 1,
-	/* 2-254 reserved */
-	IEEE80211_MESHCONF_METRIC_VENDOR	= 255,
-};
-
-/* Congestion Control */
-enum {
-	IEEE80211_MESHCONF_CC_DISABLED		= 0,
-	IEEE80211_MESHCONF_CC_SIG		= 1,
-	/* 2-254 reserved */
-	IEEE80211_MESHCONF_CC_VENDOR		= 255,
-};
-
-/* Neighbour Offset */
-enum {
-	/* 0 reserved */
-	IEEE80211_MESHCONF_SYNC_NEIGHOFF	= 1,
-	/* 2-254 rserved */
-	IEEE80211_MESHCONF_SYNC_VENDOR		= 255,
-};
-
-/* Authentication Protocol Identifier */
-enum {
-	
-	IEEE80211_MESHCONF_AUTH_DISABLED	= 0,
-	/* Simultaneous Authenticaction of Equals */
-	IEEE80211_MESHCONF_AUTH_SEA		= 1,
-	IEEE80211_MESHCONF_AUTH_8021X		= 2, /* IEEE 802.1X */
-	/* 3-254 reserved */
-	IEEE80211_MESHCONF_AUTH_VENDOR		= 255,
-};
-
-/* Mesh Formation Info */
-#define	IEEE80211_MESHCONF_FORM_GATE	0x01 	/* Connected to Gate */
-#define	IEEE80211_MESHCONF_FORM_NNEIGH_MASK 0x7E /* Number of Neighbours */
-#define	IEEE80211_MESHCONF_FORM_SA	0xF0 	/* indicating 802.1X auth */
-
-/* Mesh Capability */
-#define	IEEE80211_MESHCONF_CAP_AP	0x01	/* Accepting Peers */
-#define	IEEE80211_MESHCONF_CAP_MCCAS	0x02	/* MCCA supported */
-#define	IEEE80211_MESHCONF_CAP_MCCAE	0x04	/* MCCA enabled */
-#define	IEEE80211_MESHCONF_CAP_FWRD 	0x08	/* forwarding enabled */
-#define	IEEE80211_MESHCONF_CAP_BTR	0x10	/* Beacon Timing Report Enab */
-#define	IEEE80211_MESHCONF_CAP_TBTT	0x20	/* TBTT Adjusting  */
-#define	IEEE80211_MESHCONF_CAP_PSL	0x40	/* Power Save Level */
-/* 0x80 reserved */
-
-/* Mesh Identifier */
-struct ieee80211_meshid_ie {
-	uint8_t		id_ie;		/* IEEE80211_ELEMID_MESHID */
-	uint8_t		id_len;
-} __packed;
-
-/* Link Metric Report */
-struct ieee80211_meshlmetric_ie {
-	uint8_t		lm_ie;	/* IEEE80211_ACTION_MESH_LMETRIC */
-	uint8_t		lm_len;
-	uint8_t		lm_flags;
-#define	IEEE80211_MESH_LMETRIC_FLAGS_REQ	0x01	/* Request */
-	/*
-	 * XXX: this field should be variable in size and depend on
-	 * the active active path selection metric identifier
-	 */
-	uint32_t	lm_metric;
-#define	IEEE80211_MESHLMETRIC_INITIALVAL	0
-} __packed;
-
-/* Congestion Notification */
-struct ieee80211_meshcngst_ie {
-	uint8_t		cngst_ie;	/* IEEE80211_ELEMID_MESHCNGST */
-	uint8_t		cngst_len;
-	uint16_t	cngst_timer[4];	/* Expiration Timers: AC_BK,
-					   AC_BE, AC_VI, AC_VO */
-} __packed;
-
-/* Peer Link Management */
-#define IEEE80211_MPM_BASE_SZ	(4)
-#define IEEE80211_MPM_MAX_SZ	(8)
-struct ieee80211_meshpeer_ie {
-	uint8_t		peer_ie;	/* IEEE80211_ELEMID_MESHPEER */
-	uint8_t		peer_len;
-	uint16_t	peer_proto;	/* Peer Management Protocol */
-	uint16_t	peer_llinkid;	/* Local Link ID */
-	uint16_t	peer_linkid;	/* Peer Link ID */
-	uint16_t	peer_rcode;
-} __packed;
-
-/* Mesh Peering Protocol Identifier field value */
-enum {
-	IEEE80211_MPPID_MPM		= 0,	/* Mesh peering management */
-	IEEE80211_MPPID_AUTH_MPM	= 1,	/* Auth. mesh peering exchange */
-	/* 2-65535 reserved */
-};
-
-#ifdef notyet
-/* Mesh Channel Switch Annoucement */
-struct ieee80211_meshcsa_ie {
-	uint8_t		csa_ie;		/* IEEE80211_ELEMID_MESHCSA */
-	uint8_t		csa_len;
-	uint8_t		csa_mode;
-	uint8_t		csa_newclass;	/* New Regulatory Class */
-	uint8_t		csa_newchan;
-	uint8_t		csa_precvalue;	/* Precedence Value */
-	uint8_t		csa_count;
-} __packed;
-
-/* Mesh TIM */
-/* Equal to the non Mesh version */
-
-/* Mesh Awake Window */
-struct ieee80211_meshawakew_ie {
-	uint8_t		awakew_ie;		/* IEEE80211_ELEMID_MESHAWAKEW */
-	uint8_t		awakew_len;
-	uint8_t		awakew_windowlen;	/* in TUs */
-} __packed;
-
-/* Mesh Beacon Timing */
-struct ieee80211_meshbeacont_ie {
-	uint8_t		beacont_ie;		/* IEEE80211_ELEMID_MESHBEACONT */
-	uint8_t		beacont_len;
-	struct {
-		uint8_t		mp_aid;		/* Least Octet of AID */
-		uint16_t	mp_btime;	/* Beacon Time */
-		uint16_t	mp_bint;	/* Beacon Interval */
-	} __packed mp[1];			/* NB: variable size */
-} __packed;
-#endif
-
-/* Gate (GANN) Annoucement */
-/*
- * NB: these macros used for the length in the IEs does not include 2 bytes
- * for _ie and _len fields as is defined by the standard.
- */
-#define	IEEE80211_MESHGANN_BASE_SZ 	(15)
-struct ieee80211_meshgann_ie {
-	uint8_t		gann_ie;		/* IEEE80211_ELEMID_MESHGANN */
-	uint8_t		gann_len;
-	uint8_t		gann_flags;
-	uint8_t		gann_hopcount;
-	uint8_t		gann_ttl;
-	uint8_t		gann_addr[IEEE80211_ADDR_LEN];
-	uint32_t	gann_seq;		/* GANN Sequence Number */
-	uint16_t	gann_interval;		/* GANN Interval */
-} __packed;
-
-/* Root (MP) Annoucement */
-#define	IEEE80211_MESHRANN_BASE_SZ 	(21)
-struct ieee80211_meshrann_ie {
-	uint8_t		rann_ie;		/* IEEE80211_ELEMID_MESHRANN */
-	uint8_t		rann_len;
-	uint8_t		rann_flags;
-#define	IEEE80211_MESHRANN_FLAGS_GATE	0x01	/* Mesh Gate */
-	uint8_t		rann_hopcount;
-	uint8_t		rann_ttl;
-	uint8_t		rann_addr[IEEE80211_ADDR_LEN];
-	uint32_t	rann_seq;		/* HWMP Sequence Number */
-	uint32_t	rann_interval;
-	uint32_t	rann_metric;
-} __packed;
-
-/* Mesh Path Request */
-#define	IEEE80211_MESHPREQ_BASE_SZ 		(26)
-#define	IEEE80211_MESHPREQ_BASE_SZ_AE 		(32)
-#define	IEEE80211_MESHPREQ_TRGT_SZ 		(11)
-#define	IEEE80211_MESHPREQ_TCNT_OFFSET		(27)
-#define	IEEE80211_MESHPREQ_TCNT_OFFSET_AE	(33)
-struct ieee80211_meshpreq_ie {
-	uint8_t		preq_ie;	/* IEEE80211_ELEMID_MESHPREQ */
-	uint8_t		preq_len;
-	uint8_t		preq_flags;
-#define	IEEE80211_MESHPREQ_FLAGS_GATE	0x01	/* Mesh Gate */
-#define	IEEE80211_MESHPREQ_FLAGS_AM	0x02	/* 0 = bcast / 1 = ucast */
-#define	IEEE80211_MESHPREQ_FLAGS_PP	0x04	/* Proactive PREP */
-#define	IEEE80211_MESHPREQ_FLAGS_AE	0x40	/* Address Extension */
-	uint8_t		preq_hopcount;
-	uint8_t		preq_ttl;
-	uint32_t	preq_id;
-	uint8_t		preq_origaddr[IEEE80211_ADDR_LEN];
-	uint32_t	preq_origseq;	/* HWMP Sequence Number */
-	/* NB: may have Originator External Address */
-	uint8_t		preq_orig_ext_addr[IEEE80211_ADDR_LEN];
-	uint32_t	preq_lifetime;
-	uint32_t	preq_metric;
-	uint8_t		preq_tcount;	/* target count */
-	struct {
-		uint8_t		target_flags;
-#define	IEEE80211_MESHPREQ_TFLAGS_TO	0x01	/* Target Only */
-#define	IEEE80211_MESHPREQ_TFLAGS_USN	0x04	/* Unknown HWMP seq number */
-		uint8_t		target_addr[IEEE80211_ADDR_LEN];
-		uint32_t	target_seq;	/* HWMP Sequence Number */
-	} __packed preq_targets[1];		/* NB: variable size */
-} __packed;
-
-/* Mesh Path Reply */
-#define	IEEE80211_MESHPREP_BASE_SZ 	(31)
-#define	IEEE80211_MESHPREP_BASE_SZ_AE 	(37)
-struct ieee80211_meshprep_ie {
-	uint8_t		prep_ie;	/* IEEE80211_ELEMID_MESHPREP */
-	uint8_t		prep_len;
-	uint8_t		prep_flags;
-#define	IEEE80211_MESHPREP_FLAGS_AE	0x40	/* Address Extension */
-	uint8_t		prep_hopcount;
-	uint8_t		prep_ttl;
-	uint8_t		prep_targetaddr[IEEE80211_ADDR_LEN];
-	uint32_t	prep_targetseq;
-	/* NB: May have Target External Address */
-	uint8_t		prep_target_ext_addr[IEEE80211_ADDR_LEN];
-	uint32_t	prep_lifetime;
-	uint32_t	prep_metric;
-	uint8_t		prep_origaddr[IEEE80211_ADDR_LEN];
-	uint32_t	prep_origseq;	/* HWMP Sequence Number */
-} __packed;
-
-/* Mesh Path Error */
-#define	IEEE80211_MESHPERR_MAXDEST	(19)
-#define	IEEE80211_MESHPERR_NDEST_OFFSET	(3)
-#define	IEEE80211_MESHPERR_BASE_SZ 	(2)
-#define	IEEE80211_MESHPERR_DEST_SZ 	(13)
-#define	IEEE80211_MESHPERR_DEST_SZ_AE 	(19)
-struct ieee80211_meshperr_ie {
-	uint8_t		perr_ie;	/* IEEE80211_ELEMID_MESHPERR */
-	uint8_t		perr_len;
-	uint8_t		perr_ttl;
-	uint8_t		perr_ndests;	/* Number of Destinations */
-	struct {
-		uint8_t		dest_flags;
-#define	IEEE80211_MESHPERR_DFLAGS_USN	0x01	/* XXX: not part of standard */
-#define	IEEE80211_MESHPERR_DFLAGS_RC	0x02	/* XXX: not part of standard */
-#define	IEEE80211_MESHPERR_FLAGS_AE	0x40	/* Address Extension */
-		uint8_t		dest_addr[IEEE80211_ADDR_LEN];
-		uint32_t	dest_seq;	/* HWMP Sequence Number */
-		/* NB: May have Destination External Address */
-		uint8_t		dest_ext_addr[IEEE80211_ADDR_LEN];
-		uint16_t	dest_rcode;
-	} __packed perr_dests[1];		/* NB: variable size */
-} __packed;
-
-#ifdef notyet
-/* Mesh Proxy Update */
-struct ieee80211_meshpu_ie {
-	uint8_t		pu_ie;		/* IEEE80211_ELEMID_MESHPU */
-	uint8_t		pu_len;
-	uint8_t		pu_flags;
-#define	IEEE80211_MESHPU_FLAGS_MASK		0x1
-#define	IEEE80211_MESHPU_FLAGS_DEL		0x0
-#define	IEEE80211_MESHPU_FLAGS_ADD		0x1
-	uint8_t		pu_seq;		/* PU Sequence Number */
-	uint8_t		pu_addr[IEEE80211_ADDR_LEN];
-	uint8_t		pu_naddr;	/* Number of Proxied Addresses */
-	/* NB: proxied address follows */
-} __packed;
-
-/* Mesh Proxy Update Confirmation */
-struct ieee80211_meshpuc_ie {
-	uint8_t		puc_ie;		/* IEEE80211_ELEMID_MESHPUC */
-	uint8_t		puc_len;
-	uint8_t		puc_flags;
-	uint8_t		puc_seq;	/* PU Sequence Number */
-	uint8_t		puc_daddr[IEEE80211_ADDR_LEN];
-} __packed;
-#endif
-
-/*
- * 802.11s Action Frames
- * XXX: these are wrong, and some of them should be
- * under MESH category while PROXY is under MULTIHOP category.
- */
-#define	IEEE80211_ACTION_CAT_INTERWORK		15
-#define	IEEE80211_ACTION_CAT_RESOURCE		16
-#define	IEEE80211_ACTION_CAT_PROXY		17
-
-/*
- * Mesh Peering Action codes.
- */
-enum {
-	/* 0 reserved */
-	IEEE80211_ACTION_MESHPEERING_OPEN	= 1,
-	IEEE80211_ACTION_MESHPEERING_CONFIRM	= 2,
-	IEEE80211_ACTION_MESHPEERING_CLOSE	= 3,
-	/* 4-255 reserved */
-};
-
-/*
- * Mesh Action code.
- */
-enum {
-	IEEE80211_ACTION_MESH_LMETRIC	= 0,	/* Mesh Link Metric Report */
-	IEEE80211_ACTION_MESH_HWMP	= 1,	/* HWMP Mesh Path Selection */
-	IEEE80211_ACTION_MESH_GANN	= 2,	/* Gate Announcement */
-	IEEE80211_ACTION_MESH_CC	= 3,	/* Congestion Control */
-	IEEE80211_ACTION_MESH_MCCA_SREQ	= 4,	/* MCCA Setup Request */
-	IEEE80211_ACTION_MESH_MCCA_SREP	= 5,	/* MCCA Setup Reply */
-	IEEE80211_ACTION_MESH_MCCA_AREQ	= 6,	/* MCCA Advertisement Req. */
-	IEEE80211_ACTION_MESH_MCCA_ADVER =7,	/* MCCA Advertisement */
-	IEEE80211_ACTION_MESH_MCCA_TRDOWN = 8,	/* MCCA Teardown */
-	IEEE80211_ACTION_MESH_TBTT_REQ	= 9,	/* TBTT Adjustment Request */
-	IEEE80211_ACTION_MESH_TBTT_RES	= 10,	/* TBTT Adjustment Response */
-	/* 11-255 reserved */
-};
-
-/*
- * Different mesh control structures based on the AE
- * (Address Extension) bits.
- */
-struct ieee80211_meshcntl {
-	uint8_t		mc_flags;	/* Address Extension 00 */
-	uint8_t		mc_ttl;		/* TTL */
-	uint8_t		mc_seq[4];	/* Sequence No. */
-	/* NB: more addresses may follow */
-} __packed;
-
-struct ieee80211_meshcntl_ae01 {
-	uint8_t		mc_flags;	/* Address Extension 01 */
-	uint8_t		mc_ttl;		/* TTL */
-	uint8_t		mc_seq[4];	/* Sequence No. */
-	uint8_t		mc_addr4[IEEE80211_ADDR_LEN];
-} __packed;
-
-struct ieee80211_meshcntl_ae10 {
-	uint8_t		mc_flags;	/* Address Extension 10 */
-	uint8_t		mc_ttl;		/* TTL */
-	uint8_t		mc_seq[4];	/* Sequence No. */
-	uint8_t		mc_addr5[IEEE80211_ADDR_LEN];
-	uint8_t		mc_addr6[IEEE80211_ADDR_LEN];
-} __packed;
-
-#define IEEE80211_MESH_AE_MASK		0x03
-enum {
-	IEEE80211_MESH_AE_00		= 0,	/* MC has no AE subfield */
-	IEEE80211_MESH_AE_01		= 1,	/* MC contain addr4 */
-	IEEE80211_MESH_AE_10		= 2,	/* MC contain addr5 & addr6 */
-	IEEE80211_MESH_AE_11		= 3,	/* RESERVED */
-};
-
-#ifdef _KERNEL
-MALLOC_DECLARE(M_80211_MESH_PREQ);
-MALLOC_DECLARE(M_80211_MESH_PREP);
-MALLOC_DECLARE(M_80211_MESH_PERR);
-
-MALLOC_DECLARE(M_80211_MESH_RT);
-MALLOC_DECLARE(M_80211_MESH_GT_RT);
-/*
- * Basic forwarding information:
- * o Destination MAC
- * o Next-hop MAC
- * o Precursor list (not implemented yet)
- * o Path timeout
- * The rest is part of the active Mesh path selection protocol.
- * XXX: to be moved out later.
- */
-struct ieee80211_mesh_route {
-	TAILQ_ENTRY(ieee80211_mesh_route)	rt_next;
-	struct ieee80211vap	*rt_vap;
-	struct mtx		rt_lock;	/* fine grained route lock */
-	struct callout		rt_discovery;	/* discovery timeout */
-	int			rt_updtime;	/* last update time */
-	uint8_t			rt_dest[IEEE80211_ADDR_LEN];
-	uint8_t			rt_mesh_gate[IEEE80211_ADDR_LEN]; /* meshDA */
-	uint8_t			rt_nexthop[IEEE80211_ADDR_LEN];
-	uint32_t		rt_metric;	/* path metric */
-	uint16_t		rt_nhops;	/* number of hops */
-	uint16_t		rt_flags;
-#define	IEEE80211_MESHRT_FLAGS_DISCOVER	0x01	/* path discovery */
-#define	IEEE80211_MESHRT_FLAGS_VALID	0x02	/* path discovery complete */
-#define	IEEE80211_MESHRT_FLAGS_PROXY	0x04	/* proxy entry */
-#define	IEEE80211_MESHRT_FLAGS_GATE	0x08	/* mesh gate entry */
-	uint32_t		rt_lifetime;	/* route timeout */
-	uint32_t		rt_lastmseq;	/* last seq# seen dest */
-	uint32_t		rt_ext_seq;	/* proxy seq number */
-	void			*rt_priv;	/* private data */
-};
-#define	IEEE80211_MESH_ROUTE_PRIV(rt, cast)	((cast *)rt->rt_priv)
-
-/*
- * Stored information about known mesh gates.
- */
-struct ieee80211_mesh_gate_route {
-	TAILQ_ENTRY(ieee80211_mesh_gate_route)	gr_next;
-	uint8_t				gr_addr[IEEE80211_ADDR_LEN];
-	uint32_t			gr_lastseq;
-	struct ieee80211_mesh_route 	*gr_route;
-};
-
-#define	IEEE80211_MESH_PROTO_DSZ	12	/* description size */
-/*
- * Mesh Path Selection Protocol.
- */
-enum ieee80211_state;
-struct ieee80211_mesh_proto_path {
-	uint8_t		mpp_active;
-	char 		mpp_descr[IEEE80211_MESH_PROTO_DSZ];
-	uint8_t		mpp_ie;
-	struct ieee80211_node *
-	    		(*mpp_discover)(struct ieee80211vap *,
-				const uint8_t [IEEE80211_ADDR_LEN],
-				struct mbuf *);
-	void		(*mpp_peerdown)(struct ieee80211_node *);
-	void		(*mpp_senderror)(struct ieee80211vap *,
-				const uint8_t [IEEE80211_ADDR_LEN],
-				struct ieee80211_mesh_route *, int);
-	void		(*mpp_vattach)(struct ieee80211vap *);
-	void		(*mpp_vdetach)(struct ieee80211vap *);
-	int		(*mpp_newstate)(struct ieee80211vap *,
-			    enum ieee80211_state, int);
-	const size_t	mpp_privlen;	/* size required in the routing table
-					   for private data */
-	int		mpp_inact;	/* inact. timeout for invalid routes
-					   (ticks) */
-};
-
-/*
- * Mesh Link Metric Report Protocol.
- */
-struct ieee80211_mesh_proto_metric {
-	uint8_t		mpm_active;
-	char		mpm_descr[IEEE80211_MESH_PROTO_DSZ];
-	uint8_t		mpm_ie;
-	uint32_t	(*mpm_metric)(struct ieee80211_node *);
-};
-
-#ifdef notyet
-/*
- * Mesh Authentication Protocol.
- */
-struct ieee80211_mesh_proto_auth {
-	uint8_t		mpa_ie[4];
-};
-
-struct ieee80211_mesh_proto_congestion {
-};
-
-struct ieee80211_mesh_proto_sync {
-};
-#endif
-
-typedef uint32_t ieee80211_mesh_seq;
-#define	IEEE80211_MESH_SEQ_LEQ(a, b)	((int32_t)((a)-(b)) <= 0)
-#define	IEEE80211_MESH_SEQ_GEQ(a, b)	((int32_t)((a)-(b)) >= 0)
-
-struct ieee80211_mesh_state {
-	int				ms_idlen;
-	uint8_t				ms_id[IEEE80211_MESHID_LEN];
-	ieee80211_mesh_seq		ms_seq;	/* seq no for meshcntl */
-	uint16_t			ms_neighbors;
-	uint8_t				ms_ttl;	/* mesh ttl set in packets */
-#define IEEE80211_MESHFLAGS_AP		0x01	/* accept peers */
-#define IEEE80211_MESHFLAGS_GATE	0x02	/* mesh gate role */
-#define IEEE80211_MESHFLAGS_FWD		0x04	/* forward packets */
-#define IEEE80211_MESHFLAGS_ROOT	0x08	/* configured as root */
-	uint8_t				ms_flags;
-	struct mtx			ms_rt_lock;
-	struct callout			ms_cleantimer;
-	struct callout			ms_gatetimer;
-	ieee80211_mesh_seq		ms_gateseq;
-	TAILQ_HEAD(, ieee80211_mesh_gate_route) ms_known_gates;
-	TAILQ_HEAD(, ieee80211_mesh_route)  ms_routes;
-	struct ieee80211_mesh_proto_metric *ms_pmetric;
-	struct ieee80211_mesh_proto_path   *ms_ppath;
-};
-void		ieee80211_mesh_attach(struct ieee80211com *);
-void		ieee80211_mesh_detach(struct ieee80211com *);
-
-struct ieee80211_mesh_route *
-		ieee80211_mesh_rt_find(struct ieee80211vap *,
-		    const uint8_t [IEEE80211_ADDR_LEN]);
-struct ieee80211_mesh_route *
-                ieee80211_mesh_rt_add(struct ieee80211vap *,
-		    const uint8_t [IEEE80211_ADDR_LEN]);
-void		ieee80211_mesh_rt_del(struct ieee80211vap *,
-		    const uint8_t [IEEE80211_ADDR_LEN]);
-void		ieee80211_mesh_rt_flush(struct ieee80211vap *);
-void		ieee80211_mesh_rt_flush_peer(struct ieee80211vap *,
-		    const uint8_t [IEEE80211_ADDR_LEN]);
-int		ieee80211_mesh_rt_update(struct ieee80211_mesh_route *rt, int);
-void		ieee80211_mesh_proxy_check(struct ieee80211vap *,
-		    const uint8_t [IEEE80211_ADDR_LEN]);
-
-int		ieee80211_mesh_register_proto_path(const
-		    struct ieee80211_mesh_proto_path *);
-int		ieee80211_mesh_register_proto_metric(const
-		    struct ieee80211_mesh_proto_metric *);
-
-uint8_t *	ieee80211_add_meshid(uint8_t *, struct ieee80211vap *);
-uint8_t *	ieee80211_add_meshconf(uint8_t *, struct ieee80211vap *);
-uint8_t *	ieee80211_add_meshpeer(uint8_t *, uint8_t, uint16_t, uint16_t,
-		    uint16_t);
-uint8_t *	ieee80211_add_meshlmetric(uint8_t *, uint8_t, uint32_t);
-uint8_t *	ieee80211_add_meshgate(uint8_t *,
-		    struct ieee80211_meshgann_ie *);
-
-void		ieee80211_mesh_node_init(struct ieee80211vap *,
-		    struct ieee80211_node *);
-void		ieee80211_mesh_node_cleanup(struct ieee80211_node *);
-void		ieee80211_parse_meshid(struct ieee80211_node *,
-		    const uint8_t *);
-struct ieee80211_scanparams;
-void		ieee80211_mesh_init_neighbor(struct ieee80211_node *,
-		   const struct ieee80211_frame *,
-		   const struct ieee80211_scanparams *);
-void		ieee80211_mesh_update_beacon(struct ieee80211vap *,
-		    struct ieee80211_beacon_offsets *);
-struct ieee80211_mesh_gate_route *
-		ieee80211_mesh_mark_gate(struct ieee80211vap *,
-		    const uint8_t *, struct ieee80211_mesh_route *);
-void		ieee80211_mesh_forward_to_gates(struct ieee80211vap *,
-		    struct ieee80211_mesh_route *);
-struct ieee80211_node *
-		ieee80211_mesh_find_txnode(struct ieee80211vap *,
-		    const uint8_t [IEEE80211_ADDR_LEN]);
-
-/*
- * Return non-zero if proxy operation is enabled.
- */
-static __inline int
-ieee80211_mesh_isproxyena(struct ieee80211vap *vap)
-{
-	struct ieee80211_mesh_state *ms = vap->iv_mesh;
-	return (ms->ms_flags &
-	    (IEEE80211_MESHFLAGS_AP | IEEE80211_MESHFLAGS_GATE)) != 0;
-}
-
-/*
- * Process an outbound frame: if a path is known to the
- * destination then return a reference to the next hop
- * for immediate transmission.  Otherwise initiate path
- * discovery and, if possible queue the packet to be
- * sent when path discovery completes.
- */
-static __inline struct ieee80211_node *
-ieee80211_mesh_discover(struct ieee80211vap *vap,
-    const uint8_t dest[IEEE80211_ADDR_LEN], struct mbuf *m)
-{
-	struct ieee80211_mesh_state *ms = vap->iv_mesh;
-	return ms->ms_ppath->mpp_discover(vap, dest, m);
-}
-
-#endif /* _KERNEL */
-#endif /* !_NET80211_IEEE80211_MESH_H_ */
diff --git a/include.new/net80211/ieee80211_monitor.h b/include.new/net80211/ieee80211_monitor.h
deleted file mode 100644
index c19b899..0000000
--- a/include.new/net80211/ieee80211_monitor.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_monitor.h 178354 2008-04-20 20:35:46Z sam $
- */
-#ifndef _NET80211_IEEE80211_MONITOR_H_
-#define _NET80211_IEEE80211_MONITOR_H_
-
-/*
- * Monitor implementation definitions.
- */
-void	ieee80211_monitor_attach(struct ieee80211com *);
-void	ieee80211_monitor_detach(struct ieee80211com *);
-#endif /* !_NET80211_IEEE80211_MONITOR_H_ */
diff --git a/include.new/net80211/ieee80211_node.h b/include.new/net80211/ieee80211_node.h
deleted file mode 100644
index b54ab6f..0000000
--- a/include.new/net80211/ieee80211_node.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_node.h 246497 2013-02-07 21:12:55Z monthadar $
- */
-#ifndef _NET80211_IEEE80211_NODE_H_
-#define _NET80211_IEEE80211_NODE_H_
-
-#include <net80211/ieee80211_ioctl.h>		/* for ieee80211_nodestats */
-#include <net80211/ieee80211_ht.h>		/* for aggregation state */
-
-/*
- * Each ieee80211com instance has a single timer that fires every
- * IEEE80211_INACT_WAIT seconds to handle "inactivity processing".
- * This is used to do node inactivity processing when operating
- * as an AP, adhoc or mesh mode.  For inactivity processing each node
- * has a timeout set in it's ni_inact field that is decremented
- * on each timeout and the node is reclaimed when the counter goes
- * to zero.  We use different inactivity timeout values depending
- * on whether the node is associated and authorized (either by
- * 802.1x or open/shared key authentication) or associated but yet
- * to be authorized.  The latter timeout is shorter to more aggressively
- * reclaim nodes that leave part way through the 802.1x exchange.
- */
-#define	IEEE80211_INACT_WAIT	15		/* inactivity interval (secs) */
-#define	IEEE80211_INACT_INIT	(30/IEEE80211_INACT_WAIT)	/* initial */
-#define	IEEE80211_INACT_AUTH	(180/IEEE80211_INACT_WAIT)	/* associated but not authorized */
-#define	IEEE80211_INACT_RUN	(300/IEEE80211_INACT_WAIT)	/* authorized */
-#define	IEEE80211_INACT_PROBE	(30/IEEE80211_INACT_WAIT)	/* probe */
-#define	IEEE80211_INACT_SCAN	(300/IEEE80211_INACT_WAIT)	/* scanned */
-
-#define	IEEE80211_TRANS_WAIT 	2		/* mgt frame tx timer (secs) */
-
-/* threshold for aging overlapping non-ERP bss */
-#define	IEEE80211_NONERP_PRESENT_AGE	msecs_to_ticks(60*1000)
-
-#define	IEEE80211_NODE_HASHSIZE	32		/* NB: hash size must be pow2 */
-/* simple hash is enough for variation of macaddr */
-#define	IEEE80211_NODE_HASH(ic, addr)	\
-	(((const uint8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % \
-		IEEE80211_NODE_HASHSIZE)
-
-struct ieee80211_node_table;
-struct ieee80211com;
-struct ieee80211vap;
-
-/*
- * Information element ``blob''.  We use this structure
- * to capture management frame payloads that need to be
- * retained.  Information elements within the payload that
- * we need to consult have references recorded.
- */
-struct ieee80211_ies {
-	/* the following are either NULL or point within data */
-	uint8_t	*wpa_ie;	/* captured WPA ie */
-	uint8_t	*rsn_ie;	/* captured RSN ie */
-	uint8_t	*wme_ie;	/* captured WME ie */
-	uint8_t	*ath_ie;	/* captured Atheros ie */
-	uint8_t	*htcap_ie;	/* captured HTCAP ie */
-	uint8_t	*htinfo_ie;	/* captured HTINFO ie */
-	uint8_t	*tdma_ie;	/* captured TDMA ie */
-	uint8_t *meshid_ie;	/* captured MESH ID ie */
-	uint8_t	*spare[4];
-	/* NB: these must be the last members of this structure */
-	uint8_t	*data;		/* frame data > 802.11 header */
-	int	len;		/* data size in bytes */
-};
-
-/*
- * 802.11s (Mesh) Peer Link FSM state.
- */
-enum ieee80211_mesh_mlstate {
-	IEEE80211_NODE_MESH_IDLE	= 0,
-	IEEE80211_NODE_MESH_OPENSNT	= 1,	/* open frame sent */
-	IEEE80211_NODE_MESH_OPENRCV	= 2,	/* open frame received */
-	IEEE80211_NODE_MESH_CONFIRMRCV	= 3,	/* confirm frame received */
-	IEEE80211_NODE_MESH_ESTABLISHED	= 4,	/* link established */
-	IEEE80211_NODE_MESH_HOLDING	= 5,	/* link closing */
-};
-#define	IEEE80211_MESH_MLSTATE_BITS \
-	"\20\1IDLE\2OPENSNT\2OPENRCV\3CONFIRMRCV\4ESTABLISHED\5HOLDING"
-
-/*
- * Node specific information.  Note that drivers are expected
- * to derive from this structure to add device-specific per-node
- * state.  This is done by overriding the ic_node_* methods in
- * the ieee80211com structure.
- */
-struct ieee80211_node {
-	struct ieee80211vap	*ni_vap;	/* associated vap */
-	struct ieee80211com	*ni_ic;		/* copy from vap to save deref*/
-	struct ieee80211_node_table *ni_table;	/* NB: may be NULL */
-	TAILQ_ENTRY(ieee80211_node) ni_list;	/* list of all nodes */
-	LIST_ENTRY(ieee80211_node) ni_hash;	/* hash collision list */
-	u_int			ni_refcnt;	/* count of held references */
-	u_int			ni_scangen;	/* gen# for timeout scan */
-	u_int			ni_flags;
-#define	IEEE80211_NODE_AUTH	0x000001	/* authorized for data */
-#define	IEEE80211_NODE_QOS	0x000002	/* QoS enabled */
-#define	IEEE80211_NODE_ERP	0x000004	/* ERP enabled */
-/* NB: this must have the same value as IEEE80211_FC1_PWR_MGT */
-#define	IEEE80211_NODE_PWR_MGT	0x000010	/* power save mode enabled */
-#define	IEEE80211_NODE_AREF	0x000020	/* authentication ref held */
-#define	IEEE80211_NODE_HT	0x000040	/* HT enabled */
-#define	IEEE80211_NODE_HTCOMPAT	0x000080	/* HT setup w/ vendor OUI's */
-#define	IEEE80211_NODE_WPS	0x000100	/* WPS association */
-#define	IEEE80211_NODE_TSN	0x000200	/* TSN association */
-#define	IEEE80211_NODE_AMPDU_RX	0x000400	/* AMPDU rx enabled */
-#define	IEEE80211_NODE_AMPDU_TX	0x000800	/* AMPDU tx enabled */
-#define	IEEE80211_NODE_MIMO_PS	0x001000	/* MIMO power save enabled */
-#define	IEEE80211_NODE_MIMO_RTS	0x002000	/* send RTS in MIMO PS */
-#define	IEEE80211_NODE_RIFS	0x004000	/* RIFS enabled */
-#define	IEEE80211_NODE_SGI20	0x008000	/* Short GI in HT20 enabled */
-#define	IEEE80211_NODE_SGI40	0x010000	/* Short GI in HT40 enabled */
-#define	IEEE80211_NODE_ASSOCID	0x020000	/* xmit requires associd */
-#define	IEEE80211_NODE_AMSDU_RX	0x040000	/* AMSDU rx enabled */
-#define	IEEE80211_NODE_AMSDU_TX	0x080000	/* AMSDU tx enabled */
-	uint16_t		ni_associd;	/* association ID */
-	uint16_t		ni_vlan;	/* vlan tag */
-	uint16_t		ni_txpower;	/* current transmit power */
-	uint8_t			ni_authmode;	/* authentication algorithm */
-	uint8_t			ni_ath_flags;	/* Atheros feature flags */
-	/* NB: These must have the same values as IEEE80211_ATHC_* */
-#define IEEE80211_NODE_TURBOP	0x0001		/* Turbo prime enable */
-#define IEEE80211_NODE_COMP	0x0002		/* Compresssion enable */
-#define IEEE80211_NODE_FF	0x0004          /* Fast Frame capable */
-#define IEEE80211_NODE_XR	0x0008		/* Atheros WME enable */
-#define IEEE80211_NODE_AR	0x0010		/* AR capable */
-#define IEEE80211_NODE_BOOST	0x0080		/* Dynamic Turbo boosted */
-	uint16_t		ni_ath_defkeyix;/* Atheros def key index */
-	const struct ieee80211_txparam *ni_txparms;
-	uint32_t		ni_jointime;	/* time of join (secs) */
-	uint32_t		*ni_challenge;	/* shared-key challenge */
-	struct ieee80211_ies	ni_ies;		/* captured ie's */
-						/* tx seq per-tid */
-	ieee80211_seq		ni_txseqs[IEEE80211_TID_SIZE];
-						/* rx seq previous per-tid*/
-	ieee80211_seq		ni_rxseqs[IEEE80211_TID_SIZE];
-	uint32_t		ni_rxfragstamp;	/* time stamp of last rx frag */
-	struct mbuf		*ni_rxfrag[3];	/* rx frag reassembly */
-	struct ieee80211_key	ni_ucastkey;	/* unicast key */
-
-	/* hardware */
-	uint32_t		ni_avgrssi;	/* recv ssi state */
-	int8_t			ni_noise;	/* noise floor */
-
-	/* mimo statistics */
-	uint32_t		ni_mimo_rssi_ctl[IEEE80211_MAX_CHAINS];
-	uint32_t		ni_mimo_rssi_ext[IEEE80211_MAX_CHAINS];
-	uint8_t			ni_mimo_noise_ctl[IEEE80211_MAX_CHAINS];
-	uint8_t			ni_mimo_noise_ext[IEEE80211_MAX_CHAINS];
-	uint8_t			ni_mimo_chains;
-
-	/* header */
-	uint8_t			ni_macaddr[IEEE80211_ADDR_LEN];
-	uint8_t			ni_bssid[IEEE80211_ADDR_LEN];
-
-	/* beacon, probe response */
-	union {
-		uint8_t		data[8];
-		u_int64_t	tsf;
-	} ni_tstamp;				/* from last rcv'd beacon */
-	uint16_t		ni_intval;	/* beacon interval */
-	uint16_t		ni_capinfo;	/* capabilities */
-	uint8_t			ni_esslen;
-	uint8_t			ni_essid[IEEE80211_NWID_LEN];
-	struct ieee80211_rateset ni_rates;	/* negotiated rate set */
-	struct ieee80211_channel *ni_chan;
-	uint16_t		ni_fhdwell;	/* FH only */
-	uint8_t			ni_fhindex;	/* FH only */
-	uint16_t		ni_erp;		/* ERP from beacon/probe resp */
-	uint16_t		ni_timoff;	/* byte offset to TIM ie */
-	uint8_t			ni_dtim_period;	/* DTIM period */
-	uint8_t			ni_dtim_count;	/* DTIM count for last bcn */
-
-	/* 11s state */
-	uint8_t			ni_meshidlen;
-	uint8_t			ni_meshid[IEEE80211_MESHID_LEN];
-	enum ieee80211_mesh_mlstate ni_mlstate;	/* peering management state */
-	uint16_t		ni_mllid;	/* link local ID */
-	uint16_t		ni_mlpid;	/* link peer ID */
-	struct callout		ni_mltimer;	/* link mesh timer */
-	uint8_t			ni_mlrcnt;	/* link mesh retry counter */
-	uint8_t			ni_mltval;	/* link mesh timer value */
-	struct callout		ni_mlhtimer;	/* link mesh backoff timer */
-	uint8_t			ni_mlhcnt;	/* link mesh holding counter */
-
-	/* 11n state */
-	uint16_t		ni_htcap;	/* HT capabilities */
-	uint8_t			ni_htparam;	/* HT params */
-	uint8_t			ni_htctlchan;	/* HT control channel */
-	uint8_t			ni_ht2ndchan;	/* HT 2nd channel */
-	uint8_t			ni_htopmode;	/* HT operating mode */
-	uint8_t			ni_htstbc;	/* HT */
-	uint8_t			ni_chw;		/* negotiated channel width */
-	struct ieee80211_htrateset ni_htrates;	/* negotiated ht rate set */
-	struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_TID];
-	struct ieee80211_rx_ampdu ni_rx_ampdu[WME_NUM_TID];
-
-	/* others */
-	short			ni_inact;	/* inactivity mark count */
-	short			ni_inact_reload;/* inactivity reload value */
-	int			ni_txrate;	/* legacy rate/MCS */
-	struct ieee80211_psq	ni_psq;		/* power save queue */
-	struct ieee80211_nodestats ni_stats;	/* per-node statistics */
-
-	struct ieee80211vap	*ni_wdsvap;	/* associated WDS vap */
-	void			*ni_rctls;	/* private ratectl state */
-	uint64_t		ni_spare[3];
-};
-MALLOC_DECLARE(M_80211_NODE);
-MALLOC_DECLARE(M_80211_NODE_IE);
-
-#define	IEEE80211_NODE_ATH	(IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP)
-#define	IEEE80211_NODE_AMPDU \
-	(IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX)
-#define	IEEE80211_NODE_AMSDU \
-	(IEEE80211_NODE_AMSDU_RX | IEEE80211_NODE_AMSDU_TX)
-#define	IEEE80211_NODE_HT_ALL \
-	(IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT | \
-	 IEEE80211_NODE_AMPDU | IEEE80211_NODE_AMSDU | \
-	 IEEE80211_NODE_MIMO_PS | IEEE80211_NODE_MIMO_RTS | \
-	 IEEE80211_NODE_RIFS | IEEE80211_NODE_SGI20 | IEEE80211_NODE_SGI40)
-
-#define	IEEE80211_NODE_BITS \
-	"\20\1AUTH\2QOS\3ERP\5PWR_MGT\6AREF\7HT\10HTCOMPAT\11WPS\12TSN" \
-	"\13AMPDU_RX\14AMPDU_TX\15MIMO_PS\16MIMO_RTS\17RIFS\20SGI20\21SGI40" \
-	"\22ASSOCID"
-
-#define	IEEE80211_NODE_AID(ni)	IEEE80211_AID(ni->ni_associd)
-
-#define	IEEE80211_NODE_STAT(ni,stat)	(ni->ni_stats.ns_##stat++)
-#define	IEEE80211_NODE_STAT_ADD(ni,stat,v)	(ni->ni_stats.ns_##stat += v)
-#define	IEEE80211_NODE_STAT_SET(ni,stat,v)	(ni->ni_stats.ns_##stat = v)
-
-/*
- * Filtered rssi calculation support.  The receive rssi is maintained
- * as an average over the last 10 frames received using a low pass filter
- * (all frames for now, possibly need to be more selective).  Calculations
- * are designed such that a good compiler can optimize them.  The avg
- * rssi state should be initialized to IEEE80211_RSSI_DUMMY_MARKER and
- * each sample incorporated with IEEE80211_RSSI_LPF.  Use IEEE80211_RSSI_GET
- * to extract the current value.
- *
- * Note that we assume rssi data are in the range [-127..127] and we
- * discard values <-20.  This is consistent with assumptions throughout
- * net80211 that signal strength data are in .5 dBm units relative to
- * the current noise floor (linear, not log).
- */
-#define IEEE80211_RSSI_LPF_LEN		10
-#define	IEEE80211_RSSI_DUMMY_MARKER	127
-/* NB: pow2 to optimize out * and / */
-#define	IEEE80211_RSSI_EP_MULTIPLIER	(1<<7)
-#define IEEE80211_RSSI_IN(x)		((x) * IEEE80211_RSSI_EP_MULTIPLIER)
-#define _IEEE80211_RSSI_LPF(x, y, len) \
-    (((x) != IEEE80211_RSSI_DUMMY_MARKER) ? (((x) * ((len) - 1) + (y)) / (len)) : (y))
-#define IEEE80211_RSSI_LPF(x, y) do {					\
-    if ((y) >= -20) {							\
-    	x = _IEEE80211_RSSI_LPF((x), IEEE80211_RSSI_IN((y)), 		\
-		IEEE80211_RSSI_LPF_LEN);				\
-    }									\
-} while (0)
-#define	IEEE80211_RSSI_EP_RND(x, mul) \
-	((((x) % (mul)) >= ((mul)/2)) ? ((x) + ((mul) - 1)) / (mul) : (x)/(mul))
-#define	IEEE80211_RSSI_GET(x) \
-	IEEE80211_RSSI_EP_RND(x, IEEE80211_RSSI_EP_MULTIPLIER)
-
-static __inline struct ieee80211_node *
-ieee80211_ref_node(struct ieee80211_node *ni)
-{
-	ieee80211_node_incref(ni);
-	return ni;
-}
-
-static __inline void
-ieee80211_unref_node(struct ieee80211_node **ni)
-{
-	ieee80211_node_decref(*ni);
-	*ni = NULL;			/* guard against use */
-}
-
-void	ieee80211_node_attach(struct ieee80211com *);
-void	ieee80211_node_lateattach(struct ieee80211com *);
-void	ieee80211_node_detach(struct ieee80211com *);
-void	ieee80211_node_vattach(struct ieee80211vap *);
-void	ieee80211_node_latevattach(struct ieee80211vap *);
-void	ieee80211_node_vdetach(struct ieee80211vap *);
-
-static __inline int
-ieee80211_node_is_authorized(const struct ieee80211_node *ni)
-{
-	return (ni->ni_flags & IEEE80211_NODE_AUTH);
-}
-
-void	ieee80211_node_authorize(struct ieee80211_node *);
-void	ieee80211_node_unauthorize(struct ieee80211_node *);
-
-void	ieee80211_node_setuptxparms(struct ieee80211_node *);
-void	ieee80211_node_set_chan(struct ieee80211_node *,
-		struct ieee80211_channel *);
-void	ieee80211_create_ibss(struct ieee80211vap*, struct ieee80211_channel *);
-void	ieee80211_reset_bss(struct ieee80211vap *);
-void	ieee80211_sync_curchan(struct ieee80211com *);
-void	ieee80211_setupcurchan(struct ieee80211com *,
-	    struct ieee80211_channel *);
-void	ieee80211_setcurchan(struct ieee80211com *, struct ieee80211_channel *);
-void	ieee80211_update_chw(struct ieee80211com *);
-int	ieee80211_ibss_merge(struct ieee80211_node *);
-struct ieee80211_scan_entry;
-int	ieee80211_sta_join(struct ieee80211vap *, struct ieee80211_channel *,
-		const struct ieee80211_scan_entry *);
-void	ieee80211_sta_leave(struct ieee80211_node *);
-void	ieee80211_node_deauth(struct ieee80211_node *, int);
-
-int	ieee80211_ies_init(struct ieee80211_ies *, const uint8_t *, int);
-void	ieee80211_ies_cleanup(struct ieee80211_ies *);
-void	ieee80211_ies_expand(struct ieee80211_ies *);
-#define	ieee80211_ies_setie(_ies, _ie, _off) do {		\
-	(_ies)._ie = (_ies).data + (_off);			\
-} while (0)
-
-/*
- * Table of ieee80211_node instances.  Each ieee80211com
- * has one that holds association stations (when operating
- * as an ap) or neighbors (in ibss mode).
- *
- * XXX embed this in ieee80211com instead of indirect?
- */
-struct ieee80211_node_table {
-	struct ieee80211com	*nt_ic;		/* back reference */
-	ieee80211_node_lock_t	nt_nodelock;	/* on node table */
-	TAILQ_HEAD(, ieee80211_node) nt_node;	/* information of all nodes */
-	LIST_HEAD(, ieee80211_node) nt_hash[IEEE80211_NODE_HASHSIZE];
-	struct ieee80211_node	**nt_keyixmap;	/* key ix -> node map */
-	int			nt_keyixmax;	/* keyixmap size */
-	const char		*nt_name;	/* table name for debug msgs */
-	ieee80211_scan_lock_t	nt_scanlock;	/* on nt_scangen */
-	u_int			nt_scangen;	/* gen# for iterators */
-	int			nt_inact_init;	/* initial node inact setting */
-};
-
-struct ieee80211_node *ieee80211_alloc_node(struct ieee80211_node_table *,
-		struct ieee80211vap *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-struct ieee80211_node *ieee80211_tmp_node(struct ieee80211vap *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-struct ieee80211_node *ieee80211_dup_bss(struct ieee80211vap *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-struct ieee80211_node *ieee80211_node_create_wds(struct ieee80211vap *,
-		const uint8_t bssid[IEEE80211_ADDR_LEN],
-		struct ieee80211_channel *);
-#ifdef IEEE80211_DEBUG_REFCNT
-void	ieee80211_free_node_debug(struct ieee80211_node *,
-		const char *func, int line);
-struct ieee80211_node *ieee80211_find_node_locked_debug(
-		struct ieee80211_node_table *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN],
-		const char *func, int line);
-struct ieee80211_node *ieee80211_find_node_debug(struct ieee80211_node_table *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN],
-		const char *func, int line);
-struct ieee80211_node *ieee80211_find_vap_node_locked_debug(
-		struct ieee80211_node_table *,
-		const struct ieee80211vap *vap,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN],
-		const char *func, int line);
-struct ieee80211_node *ieee80211_find_vap_node_debug(
-		struct ieee80211_node_table *,
-		const struct ieee80211vap *vap,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN],
-		const char *func, int line);
-struct ieee80211_node * ieee80211_find_rxnode_debug(struct ieee80211com *,
-		const struct ieee80211_frame_min *,
-		const char *func, int line);
-struct ieee80211_node * ieee80211_find_rxnode_withkey_debug(
-		struct ieee80211com *,
-		const struct ieee80211_frame_min *, uint16_t keyix,
-		const char *func, int line);
-struct ieee80211_node *ieee80211_find_txnode_debug(struct ieee80211vap *,
-		const uint8_t *,
-		const char *func, int line);
-#define	ieee80211_free_node(ni) \
-	ieee80211_free_node_debug(ni, __func__, __LINE__)
-#define	ieee80211_find_node_locked(nt, mac) \
-	ieee80211_find_node_locked_debug(nt, mac, __func__, __LINE__)
-#define	ieee80211_find_node(nt, mac) \
-	ieee80211_find_node_debug(nt, mac, __func__, __LINE__)
-#define	ieee80211_find_vap_node_locked(nt, vap, mac) \
-	ieee80211_find_vap_node_locked_debug(nt, vap, mac, __func__, __LINE__)
-#define	ieee80211_find_vap_node(nt, vap, mac) \
-	ieee80211_find_vap_node_debug(nt, vap, mac, __func__, __LINE__)
-#define	ieee80211_find_rxnode(ic, wh) \
-	ieee80211_find_rxnode_debug(ic, wh, __func__, __LINE__)
-#define	ieee80211_find_rxnode_withkey(ic, wh, keyix) \
-	ieee80211_find_rxnode_withkey_debug(ic, wh, keyix, __func__, __LINE__)
-#define	ieee80211_find_txnode(vap, mac) \
-	ieee80211_find_txnode_debug(vap, mac, __func__, __LINE__)
-#else
-void	ieee80211_free_node(struct ieee80211_node *);
-struct ieee80211_node *ieee80211_find_node_locked(struct ieee80211_node_table *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-struct ieee80211_node *ieee80211_find_node(struct ieee80211_node_table *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-struct ieee80211_node *ieee80211_find_vap_node_locked(
-		struct ieee80211_node_table *, const struct ieee80211vap *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-struct ieee80211_node *ieee80211_find_vap_node(
-		struct ieee80211_node_table *, const struct ieee80211vap *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-struct ieee80211_node * ieee80211_find_rxnode(struct ieee80211com *,
-		const struct ieee80211_frame_min *);
-struct ieee80211_node * ieee80211_find_rxnode_withkey(struct ieee80211com *,
-		const struct ieee80211_frame_min *, uint16_t keyix);
-struct ieee80211_node *ieee80211_find_txnode(struct ieee80211vap *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-#endif
-int	ieee80211_node_delucastkey(struct ieee80211_node *);
-void	ieee80211_node_timeout(void *arg);
-
-typedef void ieee80211_iter_func(void *, struct ieee80211_node *);
-int	ieee80211_iterate_nt(struct ieee80211_node_table *,
-		struct ieee80211_node **, uint16_t);
-void	ieee80211_iterate_nodes(struct ieee80211_node_table *,
-		ieee80211_iter_func *, void *);
-
-void	ieee80211_notify_erp(struct ieee80211com *);
-void	ieee80211_dump_node(struct ieee80211_node_table *,
-		struct ieee80211_node *);
-void	ieee80211_dump_nodes(struct ieee80211_node_table *);
-
-struct ieee80211_node *ieee80211_fakeup_adhoc_node(struct ieee80211vap *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-struct ieee80211_scanparams;
-void	ieee80211_init_neighbor(struct ieee80211_node *,
-		const struct ieee80211_frame *,
-		const struct ieee80211_scanparams *);
-struct ieee80211_node *ieee80211_add_neighbor(struct ieee80211vap *,
-		const struct ieee80211_frame *,
-		const struct ieee80211_scanparams *);
-void	ieee80211_node_join(struct ieee80211_node *,int);
-void	ieee80211_node_leave(struct ieee80211_node *);
-int8_t	ieee80211_getrssi(struct ieee80211vap *);
-void	ieee80211_getsignal(struct ieee80211vap *, int8_t *, int8_t *);
-#endif /* _NET80211_IEEE80211_NODE_H_ */
diff --git a/include.new/net80211/ieee80211_phy.h b/include.new/net80211/ieee80211_phy.h
deleted file mode 100644
index 66b5cfb..0000000
--- a/include.new/net80211/ieee80211_phy.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_phy.h 252727 2013-07-04 21:16:49Z adrian $
- */
-
-#ifndef _NET80211_IEEE80211_PHY_H_
-#define _NET80211_IEEE80211_PHY_H_
-
-#ifdef _KERNEL
-/*
- * IEEE 802.11 PHY-related definitions.
- */
-
-/*
- * Contention window (slots).
- */
-#define IEEE80211_CW_MAX	1023	/* aCWmax */
-#define IEEE80211_CW_MIN_0	31	/* DS/CCK aCWmin, ERP aCWmin(0) */
-#define IEEE80211_CW_MIN_1	15	/* OFDM aCWmin, ERP aCWmin(1) */
-
-/*
- * SIFS (microseconds).
- */
-#define IEEE80211_DUR_SIFS	10	/* DS/CCK/ERP SIFS */
-#define IEEE80211_DUR_OFDM_SIFS	16	/* OFDM SIFS */
-
-/*
- * Slot time (microseconds).
- */
-#define IEEE80211_DUR_SLOT	20	/* DS/CCK slottime, ERP long slottime */
-#define IEEE80211_DUR_SHSLOT	9	/* ERP short slottime */
-#define IEEE80211_DUR_OFDM_SLOT	9	/* OFDM slottime */
-
-/*
- * DIFS (microseconds).
- */
-#define IEEE80211_DUR_DIFS(sifs, slot)	((sifs) + 2 * (slot))
-
-struct ieee80211_channel;
-
-#define	IEEE80211_RATE_TABLE_SIZE	128
-
-struct ieee80211_rate_table {
-	int		rateCount;		/* NB: for proper padding */
-	uint8_t		rateCodeToIndex[256];	/* back mapping */
-	struct {
-		uint8_t		phy;		/* CCK/OFDM/TURBO */
-		uint32_t	rateKbps;	/* transfer rate in kbs */
-		uint8_t		shortPreamble;	/* mask for enabling short
-						 * preamble in CCK rate code */
-		uint8_t		dot11Rate;	/* value for supported rates
-						 * info element of MLME */
-		uint8_t		ctlRateIndex;	/* index of next lower basic
-						 * rate; used for dur. calcs */
-		uint16_t	lpAckDuration;	/* long preamble ACK dur. */
-		uint16_t	spAckDuration;	/* short preamble ACK dur. */
-	} info[IEEE80211_RATE_TABLE_SIZE];
-};
-
-const struct ieee80211_rate_table *ieee80211_get_ratetable(
-			struct ieee80211_channel *);
-
-static __inline__ uint8_t
-ieee80211_ack_rate(const struct ieee80211_rate_table *rt, uint8_t rate)
-{
-	/*
-	 * XXX Assert this is for a legacy rate; not for an MCS rate.
-	 * If the caller wishes to use it for a basic rate, they should
-	 * clear the high bit first.
-	 */
-	KASSERT(! (rate & 0x80), ("rate %d is basic/mcs?", rate));
-
-	uint8_t cix = rt->info[rt->rateCodeToIndex[rate & IEEE80211_RATE_VAL]].ctlRateIndex;
-	KASSERT(cix != (uint8_t)-1, ("rate %d has no info", rate));
-	return rt->info[cix].dot11Rate;
-}
-
-static __inline__ uint8_t
-ieee80211_ctl_rate(const struct ieee80211_rate_table *rt, uint8_t rate)
-{
-	/*
-	 * XXX Assert this is for a legacy rate; not for an MCS rate.
-	 * If the caller wishes to use it for a basic rate, they should
-	 * clear the high bit first.
-	 */
-	KASSERT(! (rate & 0x80), ("rate %d is basic/mcs?", rate));
-
-	uint8_t cix = rt->info[rt->rateCodeToIndex[rate & IEEE80211_RATE_VAL]].ctlRateIndex;
-	KASSERT(cix != (uint8_t)-1, ("rate %d has no info", rate));
-	return rt->info[cix].dot11Rate;
-}
-
-static __inline__ enum ieee80211_phytype
-ieee80211_rate2phytype(const struct ieee80211_rate_table *rt, uint8_t rate)
-{
-	/*
-	 * XXX Assert this is for a legacy rate; not for an MCS rate.
-	 * If the caller wishes to use it for a basic rate, they should
-	 * clear the high bit first.
-	 */
-	KASSERT(! (rate & 0x80), ("rate %d is basic/mcs?", rate));
-
-	uint8_t rix = rt->rateCodeToIndex[rate & IEEE80211_RATE_VAL];
-	KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate));
-	return rt->info[rix].phy;
-}
-
-static __inline__ int
-ieee80211_isratevalid(const struct ieee80211_rate_table *rt, uint8_t rate)
-{
-	/*
-	 * XXX Assert this is for a legacy rate; not for an MCS rate.
-	 * If the caller wishes to use it for a basic rate, they should
-	 * clear the high bit first.
-	 */
-	KASSERT(! (rate & 0x80), ("rate %d is basic/mcs?", rate));
-
-	return rt->rateCodeToIndex[rate] != (uint8_t)-1;
-}
-
-/*
- * Calculate ACK field for
- * o  non-fragment data frames
- * o  management frames
- * sent using rate, phy and short preamble setting.
- */
-static __inline__ uint16_t
-ieee80211_ack_duration(const struct ieee80211_rate_table *rt,
-    uint8_t rate, int isShortPreamble)
-{
-	uint8_t rix = rt->rateCodeToIndex[rate];
-
-	KASSERT(rix != (uint8_t)-1, ("rate %d has no info", rate));
-	if (isShortPreamble) {
-		KASSERT(rt->info[rix].spAckDuration != 0,
-			("shpreamble ack dur is not computed!\n"));
-		return rt->info[rix].spAckDuration;
-	} else {
-		KASSERT(rt->info[rix].lpAckDuration != 0,
-			("lgpreamble ack dur is not computed!\n"));
-		return rt->info[rix].lpAckDuration;
-	}
-}
-
-static __inline__ uint8_t
-ieee80211_legacy_rate_lookup(const struct ieee80211_rate_table *rt,
-    uint8_t rate)
-{
-
-	return (rt->rateCodeToIndex[rate & IEEE80211_RATE_VAL]);
-}
-
-/*
- * Compute the time to transmit a frame of length frameLen bytes
- * using the specified 802.11 rate code, phy, and short preamble
- * setting.
- *
- * NB: SIFS is included.
- */
-uint16_t	ieee80211_compute_duration(const struct ieee80211_rate_table *,
-			uint32_t frameLen, uint16_t rate, int isShortPreamble);
-/*
- * Convert PLCP signal/rate field to 802.11 rate code (.5Mbits/s)
- */
-uint8_t		ieee80211_plcp2rate(uint8_t, enum ieee80211_phytype);
-/*
- * Convert 802.11 rate code to PLCP signal.
- */
-uint8_t		ieee80211_rate2plcp(int, enum ieee80211_phytype);
-
-uint32_t	ieee80211_compute_duration_ht(uint32_t frameLen,
-			uint16_t rate, int streams, int isht40,
-			int isShortGI);
-
-#endif	/* _KERNEL */
-#endif	/* !_NET80211_IEEE80211_PHY_H_ */
diff --git a/include.new/net80211/ieee80211_power.h b/include.new/net80211/ieee80211_power.h
deleted file mode 100644
index ab2fad9..0000000
--- a/include.new/net80211/ieee80211_power.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_power.h 241138 2012-10-02 17:45:19Z adrian $
- */
-#ifndef _NET80211_IEEE80211_POWER_H_
-#define _NET80211_IEEE80211_POWER_H_
-
-struct ieee80211com;
-struct ieee80211vap;
-struct ieee80211_node;
-struct mbuf;
-
-/*
- * Power save packet queues.  There are two queues, one
- * for frames coming from the net80211 layer and the other
- * for frames that come from the driver. Frames from the
- * driver are expected to have M_ENCAP marked to indicate
- * they have already been encapsulated and are treated as
- * higher priority: they are sent first when flushing the
- * queue on a power save state change or in response to a
- * ps-poll frame.
- *
- * Note that frames sent from the high priority queue are
- * fed directly to the driver without going through
- * ieee80211_start again; drivers that send up encap'd
- * frames are required to handle them when they come back.
- */
-struct ieee80211_psq {
-	ieee80211_psq_lock_t psq_lock;
-	int	psq_len;
-	int	psq_maxlen;
-	int	psq_drops;
-	struct ieee80211_psq_head {
-		struct mbuf *head;
-		struct mbuf *tail;
-		int len;
-	} psq_head[2];			/* 2 priorities */
-};
-
-void	ieee80211_psq_init(struct ieee80211_psq *, const char *);
-void	ieee80211_psq_cleanup(struct ieee80211_psq *);
-
-void	ieee80211_power_attach(struct ieee80211com *);
-void	ieee80211_power_detach(struct ieee80211com *);
-void	ieee80211_power_vattach(struct ieee80211vap *);
-void	ieee80211_power_vdetach(struct ieee80211vap *);
-void	ieee80211_power_latevattach(struct ieee80211vap *);
-
-struct mbuf *ieee80211_node_psq_dequeue(struct ieee80211_node *ni, int *qlen);
-int	ieee80211_node_psq_drain(struct ieee80211_node *);
-int	ieee80211_node_psq_age(struct ieee80211_node *);
-
-/*
- * Don't call these directly from the stack; they are vap methods
- * that should be overridden.
- */
-int	ieee80211_pwrsave(struct ieee80211_node *, struct mbuf *);
-void	ieee80211_node_pwrsave(struct ieee80211_node *, int enable);
-void	ieee80211_sta_pwrsave(struct ieee80211vap *, int enable);
-
-void	ieee80211_power_poll(struct ieee80211com *);
-#endif /* _NET80211_IEEE80211_POWER_H_ */
diff --git a/include.new/net80211/ieee80211_proto.h b/include.new/net80211/ieee80211_proto.h
deleted file mode 100644
index 2f177f5..0000000
--- a/include.new/net80211/ieee80211_proto.h
+++ /dev/null
@@ -1,435 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_proto.h 259175 2013-12-10 13:42:59Z gavin $
- */
-#ifndef _NET80211_IEEE80211_PROTO_H_
-#define _NET80211_IEEE80211_PROTO_H_
-
-/*
- * 802.11 protocol implementation definitions.
- */
-
-enum ieee80211_state {
-	IEEE80211_S_INIT	= 0,	/* default state */
-	IEEE80211_S_SCAN	= 1,	/* scanning */
-	IEEE80211_S_AUTH	= 2,	/* try to authenticate */
-	IEEE80211_S_ASSOC	= 3,	/* try to assoc */
-	IEEE80211_S_CAC		= 4,	/* doing channel availability check */
-	IEEE80211_S_RUN		= 5,	/* operational (e.g. associated) */
-	IEEE80211_S_CSA		= 6,	/* channel switch announce pending */
-	IEEE80211_S_SLEEP	= 7,	/* power save */
-};
-#define	IEEE80211_S_MAX		(IEEE80211_S_SLEEP+1)
-
-#define	IEEE80211_SEND_MGMT(_ni,_type,_arg) \
-	((*(_ni)->ni_ic->ic_send_mgmt)(_ni, _type, _arg))
-
-extern	const char *ieee80211_mgt_subtype_name[];
-extern	const char *ieee80211_phymode_name[IEEE80211_MODE_MAX];
-extern	const int ieee80211_opcap[IEEE80211_OPMODE_MAX];
-
-void	ieee80211_proto_attach(struct ieee80211com *);
-void	ieee80211_proto_detach(struct ieee80211com *);
-void	ieee80211_proto_vattach(struct ieee80211vap *);
-void	ieee80211_proto_vdetach(struct ieee80211vap *);
-
-void	ieee80211_syncifflag_locked(struct ieee80211com *, int flag);
-void	ieee80211_syncflag(struct ieee80211vap *, int flag);
-void	ieee80211_syncflag_ht(struct ieee80211vap *, int flag);
-void	ieee80211_syncflag_ext(struct ieee80211vap *, int flag);
-
-#define	IEEE80211_R_NF		0x0000001	/* global NF value valid */
-#define	IEEE80211_R_RSSI	0x0000002	/* global RSSI value valid */
-#define	IEEE80211_R_C_CHAIN	0x0000004	/* RX chain count valid */
-#define	IEEE80211_R_C_NF	0x0000008	/* per-chain NF value valid */
-#define	IEEE80211_R_C_RSSI	0x0000010	/* per-chain RSSI value valid */
-#define	IEEE80211_R_C_EVM	0x0000020	/* per-chain EVM valid */
-#define	IEEE80211_R_C_HT40	0x0000040	/* RX'ed packet is 40mhz, pilots 4,5 valid */
-
-struct ieee80211_rx_stats {
-	uint32_t r_flags;		/* IEEE80211_R_* flags */
-	uint8_t c_chain;		/* number of RX chains involved */
-	int16_t	c_nf_ctl[IEEE80211_MAX_CHAINS];	/* per-chain NF */
-	int16_t	c_nf_ext[IEEE80211_MAX_CHAINS];	/* per-chain NF */
-	int16_t	c_rssi_ctl[IEEE80211_MAX_CHAINS];	/* per-chain RSSI */
-	int16_t	c_rssi_ext[IEEE80211_MAX_CHAINS];	/* per-chain RSSI */
-	uint8_t nf;			/* global NF */
-	uint8_t rssi;			/* global RSSI */
-	uint8_t evm[IEEE80211_MAX_CHAINS][IEEE80211_MAX_EVM_PILOTS];
-					/* per-chain, per-pilot EVM values */
-};
-
-#define	ieee80211_input(ni, m, rssi, nf) \
-	((ni)->ni_vap->iv_input(ni, m, rssi, nf))
-int	ieee80211_input_all(struct ieee80211com *, struct mbuf *, int, int);
-
-int	ieee80211_input_mimo(struct ieee80211_node *, struct mbuf *,
-	    struct ieee80211_rx_stats *);
-int	ieee80211_input_mimo_all(struct ieee80211com *, struct mbuf *,
-	    struct ieee80211_rx_stats *);
-
-struct ieee80211_bpf_params;
-int	ieee80211_mgmt_output(struct ieee80211_node *, struct mbuf *, int,
-		struct ieee80211_bpf_params *);
-int	ieee80211_raw_xmit(struct ieee80211_node *, struct mbuf *,
-		const struct ieee80211_bpf_params *);
-#if __FreeBSD_version >= 1000031
-int	ieee80211_output(struct ifnet *, struct mbuf *,
-               const struct sockaddr *, struct route *ro);
-#else
-int	ieee80211_output(struct ifnet *, struct mbuf *,
-               struct sockaddr *, struct route *ro);
-#endif
-int	ieee80211_vap_pkt_send_dest(struct ieee80211vap *, struct mbuf *,
-		struct ieee80211_node *);
-int	ieee80211_raw_output(struct ieee80211vap *, struct ieee80211_node *,
-		struct mbuf *, const struct ieee80211_bpf_params *);
-void	ieee80211_send_setup(struct ieee80211_node *, struct mbuf *, int, int,
-        const uint8_t [IEEE80211_ADDR_LEN], const uint8_t [IEEE80211_ADDR_LEN],
-        const uint8_t [IEEE80211_ADDR_LEN]);
-int	ieee80211_vap_transmit(struct ifnet *ifp, struct mbuf *m);
-void	ieee80211_vap_qflush(struct ifnet *ifp);
-int	ieee80211_send_nulldata(struct ieee80211_node *);
-int	ieee80211_classify(struct ieee80211_node *, struct mbuf *m);
-struct mbuf *ieee80211_mbuf_adjust(struct ieee80211vap *, int,
-		struct ieee80211_key *, struct mbuf *);
-struct mbuf *ieee80211_encap(struct ieee80211vap *, struct ieee80211_node *,
-		struct mbuf *);
-int	ieee80211_send_mgmt(struct ieee80211_node *, int, int);
-struct ieee80211_appie;
-int	ieee80211_send_probereq(struct ieee80211_node *ni,
-		const uint8_t sa[IEEE80211_ADDR_LEN],
-		const uint8_t da[IEEE80211_ADDR_LEN],
-		const uint8_t bssid[IEEE80211_ADDR_LEN],
-		const uint8_t *ssid, size_t ssidlen);
-struct mbuf *	ieee80211_ff_encap1(struct ieee80211vap *, struct mbuf *,
-		const struct ether_header *);
-void	ieee80211_tx_complete(struct ieee80211_node *,
-		struct mbuf *, int);
-
-/*
- * The formation of ProbeResponse frames requires guidance to
- * deal with legacy clients.  When the client is identified as
- * "legacy 11b" ieee80211_send_proberesp is passed this token.
- */
-#define	IEEE80211_SEND_LEGACY_11B	0x1	/* legacy 11b client */
-#define	IEEE80211_SEND_LEGACY_11	0x2	/* other legacy client */
-#define	IEEE80211_SEND_LEGACY		0x3	/* any legacy client */
-struct mbuf *ieee80211_alloc_proberesp(struct ieee80211_node *, int);
-int	ieee80211_send_proberesp(struct ieee80211vap *,
-		const uint8_t da[IEEE80211_ADDR_LEN], int);
-struct mbuf *ieee80211_alloc_rts(struct ieee80211com *ic,
-		const uint8_t [IEEE80211_ADDR_LEN],
-		const uint8_t [IEEE80211_ADDR_LEN], uint16_t);
-struct mbuf *ieee80211_alloc_cts(struct ieee80211com *,
-		const uint8_t [IEEE80211_ADDR_LEN], uint16_t);
-
-uint8_t *ieee80211_add_rates(uint8_t *, const struct ieee80211_rateset *);
-uint8_t *ieee80211_add_xrates(uint8_t *, const struct ieee80211_rateset *);
-uint8_t *ieee80211_add_wpa(uint8_t *, const struct ieee80211vap *);
-uint8_t *ieee80211_add_rsn(uint8_t *, const struct ieee80211vap *);
-uint8_t *ieee80211_add_qos(uint8_t *, const struct ieee80211_node *);
-uint16_t ieee80211_getcapinfo(struct ieee80211vap *,
-		struct ieee80211_channel *);
-
-void	ieee80211_reset_erp(struct ieee80211com *);
-void	ieee80211_set_shortslottime(struct ieee80211com *, int onoff);
-int	ieee80211_iserp_rateset(const struct ieee80211_rateset *);
-void	ieee80211_setbasicrates(struct ieee80211_rateset *,
-		enum ieee80211_phymode);
-void	ieee80211_addbasicrates(struct ieee80211_rateset *,
-		enum ieee80211_phymode);
-
-/*
- * Return the size of the 802.11 header for a management or data frame.
- */
-static __inline int
-ieee80211_hdrsize(const void *data)
-{
-	const struct ieee80211_frame *wh = data;
-	int size = sizeof(struct ieee80211_frame);
-
-	/* NB: we don't handle control frames */
-	KASSERT((wh->i_fc[0]&IEEE80211_FC0_TYPE_MASK) != IEEE80211_FC0_TYPE_CTL,
-		("%s: control frame", __func__));
-	if (IEEE80211_IS_DSTODS(wh))
-		size += IEEE80211_ADDR_LEN;
-	if (IEEE80211_QOS_HAS_SEQ(wh))
-		size += sizeof(uint16_t);
-	return size;
-}
-
-/*
- * Like ieee80211_hdrsize, but handles any type of frame.
- */
-static __inline int
-ieee80211_anyhdrsize(const void *data)
-{
-	const struct ieee80211_frame *wh = data;
-
-	if ((wh->i_fc[0]&IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL) {
-		switch (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK) {
-		case IEEE80211_FC0_SUBTYPE_CTS:
-		case IEEE80211_FC0_SUBTYPE_ACK:
-			return sizeof(struct ieee80211_frame_ack);
-		case IEEE80211_FC0_SUBTYPE_BAR:
-			return sizeof(struct ieee80211_frame_bar);
-		}
-		return sizeof(struct ieee80211_frame_min);
-	} else
-		return ieee80211_hdrsize(data);
-}
-
-/*
- * Template for an in-kernel authenticator.  Authenticators
- * register with the protocol code and are typically loaded
- * as separate modules as needed.  One special authenticator
- * is xauth; it intercepts requests so that protocols like
- * WPA can be handled in user space.
- */
-struct ieee80211_authenticator {
-	const char *ia_name;		/* printable name */
-	int	(*ia_attach)(struct ieee80211vap *);
-	void	(*ia_detach)(struct ieee80211vap *);
-	void	(*ia_node_join)(struct ieee80211_node *);
-	void	(*ia_node_leave)(struct ieee80211_node *);
-};
-void	ieee80211_authenticator_register(int type,
-		const struct ieee80211_authenticator *);
-void	ieee80211_authenticator_unregister(int type);
-const struct ieee80211_authenticator *ieee80211_authenticator_get(int auth);
-
-struct ieee80211req;
-/*
- * Template for an MAC ACL policy module.  Such modules
- * register with the protocol code and are passed the sender's
- * address of each received auth frame for validation.
- */
-struct ieee80211_aclator {
-	const char *iac_name;		/* printable name */
-	int	(*iac_attach)(struct ieee80211vap *);
-	void	(*iac_detach)(struct ieee80211vap *);
-	int	(*iac_check)(struct ieee80211vap *,
-			const struct ieee80211_frame *wh);
-	int	(*iac_add)(struct ieee80211vap *,
-			const uint8_t mac[IEEE80211_ADDR_LEN]);
-	int	(*iac_remove)(struct ieee80211vap *,
-			const uint8_t mac[IEEE80211_ADDR_LEN]);
-	int	(*iac_flush)(struct ieee80211vap *);
-	int	(*iac_setpolicy)(struct ieee80211vap *, int);
-	int	(*iac_getpolicy)(struct ieee80211vap *);
-	int	(*iac_setioctl)(struct ieee80211vap *, struct ieee80211req *);
-	int	(*iac_getioctl)(struct ieee80211vap *, struct ieee80211req *);
-};
-void	ieee80211_aclator_register(const struct ieee80211_aclator *);
-void	ieee80211_aclator_unregister(const struct ieee80211_aclator *);
-const struct ieee80211_aclator *ieee80211_aclator_get(const char *name);
-
-/* flags for ieee80211_fix_rate() */
-#define	IEEE80211_F_DOSORT	0x00000001	/* sort rate list */
-#define	IEEE80211_F_DOFRATE	0x00000002	/* use fixed legacy rate */
-#define	IEEE80211_F_DONEGO	0x00000004	/* calc negotiated rate */
-#define	IEEE80211_F_DODEL	0x00000008	/* delete ignore rate */
-#define	IEEE80211_F_DOBRS	0x00000010	/* check basic rate set */
-#define	IEEE80211_F_JOIN	0x00000020	/* sta joining our bss */
-#define	IEEE80211_F_DOFMCS	0x00000040	/* use fixed HT rate */
-int	ieee80211_fix_rate(struct ieee80211_node *,
-		struct ieee80211_rateset *, int);
-
-/*
- * WME/WMM support.
- */
-struct wmeParams {
-	uint8_t		wmep_acm;
-	uint8_t		wmep_aifsn;
-	uint8_t		wmep_logcwmin;		/* log2(cwmin) */
-	uint8_t		wmep_logcwmax;		/* log2(cwmax) */
-	uint8_t		wmep_txopLimit;
-	uint8_t		wmep_noackPolicy;	/* 0 (ack), 1 (no ack) */
-};
-#define	IEEE80211_TXOP_TO_US(_txop)	((_txop)<<5)
-#define	IEEE80211_US_TO_TXOP(_us)	((_us)>>5)
-
-struct chanAccParams {
-	uint8_t		cap_info;		/* version of the current set */
-	struct wmeParams cap_wmeParams[WME_NUM_AC];
-};
-
-struct ieee80211_wme_state {
-	u_int	wme_flags;
-#define	WME_F_AGGRMODE	0x00000001	/* STATUS: WME agressive mode */
-	u_int	wme_hipri_traffic;	/* VI/VO frames in beacon interval */
-	u_int	wme_hipri_switch_thresh;/* agressive mode switch thresh */
-	u_int	wme_hipri_switch_hysteresis;/* agressive mode switch hysteresis */
-
-	struct wmeParams wme_params[4];		/* from assoc resp for each AC*/
-	struct chanAccParams wme_wmeChanParams;	/* WME params applied to self */
-	struct chanAccParams wme_wmeBssChanParams;/* WME params bcast to stations */
-	struct chanAccParams wme_chanParams;	/* params applied to self */
-	struct chanAccParams wme_bssChanParams;	/* params bcast to stations */
-
-	int	(*wme_update)(struct ieee80211com *);
-};
-
-void	ieee80211_wme_initparams(struct ieee80211vap *);
-void	ieee80211_wme_updateparams(struct ieee80211vap *);
-void	ieee80211_wme_updateparams_locked(struct ieee80211vap *);
-
-/*
- * Return the WME TID from a QoS frame.  If no TID
- * is present return the index for the "non-QoS" entry.
- */
-static __inline uint8_t
-ieee80211_gettid(const struct ieee80211_frame *wh)
-{
-	uint8_t tid;
-
-	if (IEEE80211_QOS_HAS_SEQ(wh)) {
-		if (IEEE80211_IS_DSTODS(wh))
-			tid = ((const struct ieee80211_qosframe_addr4 *)wh)->
-				i_qos[0];
-		else
-			tid = ((const struct ieee80211_qosframe *)wh)->i_qos[0];
-		tid &= IEEE80211_QOS_TID;
-	} else
-		tid = IEEE80211_NONQOS_TID;
-	return tid;
-}
-
-void	ieee80211_waitfor_parent(struct ieee80211com *);
-void	ieee80211_start_locked(struct ieee80211vap *);
-void	ieee80211_init(void *);
-void	ieee80211_start_all(struct ieee80211com *);
-void	ieee80211_stop_locked(struct ieee80211vap *);
-void	ieee80211_stop(struct ieee80211vap *);
-void	ieee80211_stop_all(struct ieee80211com *);
-void	ieee80211_suspend_all(struct ieee80211com *);
-void	ieee80211_resume_all(struct ieee80211com *);
-void	ieee80211_dturbo_switch(struct ieee80211vap *, int newflags);
-void	ieee80211_swbmiss(void *arg);
-void	ieee80211_beacon_miss(struct ieee80211com *);
-int	ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int);
-int	ieee80211_new_state_locked(struct ieee80211vap *, enum ieee80211_state,
-		int);
-void	ieee80211_print_essid(const uint8_t *, int);
-void	ieee80211_dump_pkt(struct ieee80211com *,
-		const uint8_t *, int, int, int);
-
-extern 	const char *ieee80211_opmode_name[];
-extern	const char *ieee80211_state_name[IEEE80211_S_MAX];
-extern	const char *ieee80211_wme_acnames[];
-
-/*
- * Beacon frames constructed by ieee80211_beacon_alloc
- * have the following structure filled in so drivers
- * can update the frame later w/ minimal overhead.
- */
-struct ieee80211_beacon_offsets {
-	uint8_t		bo_flags[4];	/* update/state flags */
-	uint16_t	*bo_caps;	/* capabilities */
-	uint8_t		*bo_cfp;	/* start of CFParms element */
-	uint8_t		*bo_tim;	/* start of atim/dtim */
-	uint8_t		*bo_wme;	/* start of WME parameters */
-	uint8_t		*bo_tdma;	/* start of TDMA parameters */
-	uint8_t		*bo_tim_trailer;/* start of fixed-size trailer */
-	uint16_t	bo_tim_len;	/* atim/dtim length in bytes */
-	uint16_t	bo_tim_trailer_len;/* tim trailer length in bytes */
-	uint8_t		*bo_erp;	/* start of ERP element */
-	uint8_t		*bo_htinfo;	/* start of HT info element */
-	uint8_t		*bo_ath;	/* start of ATH parameters */
-	uint8_t		*bo_appie;	/* start of AppIE element */
-	uint16_t	bo_appie_len;	/* AppIE length in bytes */
-	uint16_t	bo_csa_trailer_len;
-	uint8_t		*bo_csa;	/* start of CSA element */
-	uint8_t		*bo_quiet;	/* start of Quiet element */
-	uint8_t		*bo_meshconf;	/* start of MESHCONF element */
-	uint8_t		*bo_spare[3];
-};
-struct mbuf *ieee80211_beacon_alloc(struct ieee80211_node *,
-		struct ieee80211_beacon_offsets *);
-
-/*
- * Beacon frame updates are signaled through calls to iv_update_beacon
- * with one of the IEEE80211_BEACON_* tokens defined below.  For devices
- * that construct beacon frames on the host this can trigger a rebuild
- * or defer the processing.  For devices that offload beacon frame
- * handling this callback can be used to signal a rebuild.  The bo_flags
- * array in the ieee80211_beacon_offsets structure is intended to record
- * deferred processing requirements; ieee80211_beacon_update uses the
- * state to optimize work.  Since this structure is owned by the driver
- * and not visible to the 802.11 layer drivers must supply an iv_update_beacon
- * callback that marks the flag bits and schedules (as necessary) an update.
- */
-enum {
-	IEEE80211_BEACON_CAPS	= 0,	/* capabilities */
-	IEEE80211_BEACON_TIM	= 1,	/* DTIM/ATIM */
-	IEEE80211_BEACON_WME	= 2,
-	IEEE80211_BEACON_ERP	= 3,	/* Extended Rate Phy */
-	IEEE80211_BEACON_HTINFO	= 4,	/* HT Information */
-	IEEE80211_BEACON_APPIE	= 5,	/* Application IE's */
-	IEEE80211_BEACON_CFP	= 6,	/* CFParms */
-	IEEE80211_BEACON_CSA	= 7,	/* Channel Switch Announcement */
-	IEEE80211_BEACON_TDMA	= 9,	/* TDMA Info */
-	IEEE80211_BEACON_ATH	= 10,	/* ATH parameters */
-	IEEE80211_BEACON_MESHCONF = 11,	/* Mesh Configuration */
-};
-int	ieee80211_beacon_update(struct ieee80211_node *,
-		struct ieee80211_beacon_offsets *, struct mbuf *, int mcast);
-
-void	ieee80211_csa_startswitch(struct ieee80211com *,
-		struct ieee80211_channel *, int mode, int count);
-void	ieee80211_csa_completeswitch(struct ieee80211com *);
-void	ieee80211_csa_cancelswitch(struct ieee80211com *);
-void	ieee80211_cac_completeswitch(struct ieee80211vap *);
-
-/*
- * Notification methods called from the 802.11 state machine.
- * Note that while these are defined here, their implementation
- * is OS-specific.
- */
-void	ieee80211_notify_node_join(struct ieee80211_node *, int newassoc);
-void	ieee80211_notify_node_leave(struct ieee80211_node *);
-void	ieee80211_notify_scan_done(struct ieee80211vap *);
-void	ieee80211_notify_wds_discover(struct ieee80211_node *);
-void	ieee80211_notify_csa(struct ieee80211com *,
-		const struct ieee80211_channel *, int mode, int count);
-void	ieee80211_notify_radar(struct ieee80211com *,
-		const struct ieee80211_channel *);
-enum ieee80211_notify_cac_event {
-	IEEE80211_NOTIFY_CAC_START  = 0, /* CAC timer started */
-	IEEE80211_NOTIFY_CAC_STOP   = 1, /* CAC intentionally stopped */
-	IEEE80211_NOTIFY_CAC_RADAR  = 2, /* CAC stopped due to radar detectio */
-	IEEE80211_NOTIFY_CAC_EXPIRE = 3, /* CAC expired w/o radar */
-};
-void	ieee80211_notify_cac(struct ieee80211com *,
-		const struct ieee80211_channel *,
-		enum ieee80211_notify_cac_event);
-void	ieee80211_notify_node_deauth(struct ieee80211_node *);
-void	ieee80211_notify_node_auth(struct ieee80211_node *);
-void	ieee80211_notify_country(struct ieee80211vap *, const uint8_t [],
-		const uint8_t cc[2]);
-void	ieee80211_notify_radio(struct ieee80211com *, int);
-#endif /* _NET80211_IEEE80211_PROTO_H_ */
diff --git a/include.new/net80211/ieee80211_radiotap.h b/include.new/net80211/ieee80211_radiotap.h
deleted file mode 100644
index 7c53e2b..0000000
--- a/include.new/net80211/ieee80211_radiotap.h
+++ /dev/null
@@ -1,253 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/net80211/ieee80211_radiotap.h 245156 2013-01-08 06:59:21Z adrian $ */
-/* $NetBSD: ieee80211_radiotap.h,v 1.16 2007/01/06 05:51:15 dyoung Exp $ */
-
-/*-
- * Copyright (c) 2003, 2004 David Young.  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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DAVID YOUNG ``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 DAVID
- * YOUNG 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.
- */
-#ifndef _NET80211_IEEE80211_RADIOTAP_H_
-#define _NET80211_IEEE80211_RADIOTAP_H_
-
-/* A generic radio capture format is desirable. It must be
- * rigidly defined (e.g., units for fields should be given),
- * and easily extensible.
- *
- * The following is an extensible radio capture format. It is
- * based on a bitmap indicating which fields are present.
- *
- * I am trying to describe precisely what the application programmer
- * should expect in the following, and for that reason I tell the
- * units and origin of each measurement (where it applies), or else I
- * use sufficiently weaselly language ("is a monotonically nondecreasing
- * function of...") that I cannot set false expectations for lawyerly
- * readers.
- */
-#if defined(__KERNEL__) || defined(_KERNEL)
-#ifndef DLT_IEEE802_11_RADIO
-#define	DLT_IEEE802_11_RADIO	127	/* 802.11 plus WLAN header */
-#endif
-#endif /* defined(__KERNEL__) || defined(_KERNEL) */
-
-#define	IEEE80211_RADIOTAP_HDRLEN	64	/* XXX deprecated */
-
-struct ieee80211_radiotap_vendor_header {
-	uint8_t		vh_oui[3];	/* 3 byte vendor OUI */
-	uint8_t		vh_sub_ns;	/* Sub namespace of this section */
-	uint16_t	vh_skip_len;	/* Length of this vendor section */
-} __packed;
-
-/*
- * The radio capture header precedes the 802.11 header.
- *
- * Note well: all radiotap fields are little-endian.
- */
-struct ieee80211_radiotap_header {
-	uint8_t		it_version;	/* Version 0. Only increases
-					 * for drastic changes,
-					 * introduction of compatible
-					 * new fields does not count.
-					 */
-	uint8_t		it_pad;
-	uint16_t	it_len;		/* length of the whole
-					 * header in bytes, including
-					 * it_version, it_pad,
-					 * it_len, and data fields.
-					 */
-	uint32_t	it_present;	/* A bitmap telling which
-					 * fields are present. Set bit 31
-					 * (0x80000000) to extend the
-					 * bitmap by another 32 bits.
-					 * Additional extensions are made
-					 * by setting bit 31.
-					 */
-} __packed;
-
-/*
- * Name                                 Data type       Units
- * ----                                 ---------       -----
- *
- * IEEE80211_RADIOTAP_TSFT              uint64_t        microseconds
- *
- *      Value in microseconds of the MAC's 64-bit 802.11 Time
- *      Synchronization Function timer when the first bit of the
- *      MPDU arrived at the MAC. For received frames, only.
- *
- * IEEE80211_RADIOTAP_CHANNEL           2 x uint16_t    MHz, bitmap
- *
- *      Tx/Rx frequency in MHz, followed by flags (see below).
- *
- * IEEE80211_RADIOTAP_FHSS              uint16_t        see below
- *
- *      For frequency-hopping radios, the hop set (first byte)
- *      and pattern (second byte).
- *
- * IEEE80211_RADIOTAP_RATE              uint8_t         500kb/s or index
- *
- *      Tx/Rx data rate.  If bit 0x80 is set then it represents an
- *	an MCS index and not an IEEE rate.
- *
- * IEEE80211_RADIOTAP_DBM_ANTSIGNAL     int8_t          decibels from
- *                                                      one milliwatt (dBm)
- *
- *      RF signal power at the antenna, decibel difference from
- *      one milliwatt.
- *
- * IEEE80211_RADIOTAP_DBM_ANTNOISE      int8_t          decibels from
- *                                                      one milliwatt (dBm)
- *
- *      RF noise power at the antenna, decibel difference from one
- *      milliwatt.
- *
- * IEEE80211_RADIOTAP_DB_ANTSIGNAL      uint8_t         decibel (dB)
- *
- *      RF signal power at the antenna, decibel difference from an
- *      arbitrary, fixed reference.
- *
- * IEEE80211_RADIOTAP_DB_ANTNOISE       uint8_t         decibel (dB)
- *
- *      RF noise power at the antenna, decibel difference from an
- *      arbitrary, fixed reference point.
- *
- * IEEE80211_RADIOTAP_LOCK_QUALITY      uint16_t        unitless
- *
- *      Quality of Barker code lock. Unitless. Monotonically
- *      nondecreasing with "better" lock strength. Called "Signal
- *      Quality" in datasheets.  (Is there a standard way to measure
- *      this?)
- *
- * IEEE80211_RADIOTAP_TX_ATTENUATION    uint16_t        unitless
- *
- *      Transmit power expressed as unitless distance from max
- *      power set at factory calibration.  0 is max power.
- *      Monotonically nondecreasing with lower power levels.
- *
- * IEEE80211_RADIOTAP_DB_TX_ATTENUATION uint16_t        decibels (dB)
- *
- *      Transmit power expressed as decibel distance from max power
- *      set at factory calibration.  0 is max power.  Monotonically
- *      nondecreasing with lower power levels.
- *
- * IEEE80211_RADIOTAP_DBM_TX_POWER      int8_t          decibels from
- *                                                      one milliwatt (dBm)
- *
- *      Transmit power expressed as dBm (decibels from a 1 milliwatt
- *      reference). This is the absolute power level measured at
- *      the antenna port.
- *
- * IEEE80211_RADIOTAP_FLAGS             uint8_t         bitmap
- *
- *      Properties of transmitted and received frames. See flags
- *      defined below.
- *
- * IEEE80211_RADIOTAP_ANTENNA           uint8_t         antenna index
- *
- *      Unitless indication of the Rx/Tx antenna for this packet.
- *      The first antenna is antenna 0.
- *
- * IEEE80211_RADIOTAP_XCHANNEL          uint32_t        bitmap
- *                                      uint16_t        MHz
- *                                      uint8_t         channel number
- *                                      int8_t          .5 dBm
- *
- *      Extended channel specification: flags (see below) followed by
- *      frequency in MHz, the corresponding IEEE channel number, and
- *      finally the maximum regulatory transmit power cap in .5 dBm
- *      units.  This property supersedes IEEE80211_RADIOTAP_CHANNEL
- *      and only one of the two should be present.
- */
-enum ieee80211_radiotap_type {
-	IEEE80211_RADIOTAP_TSFT = 0,
-	IEEE80211_RADIOTAP_FLAGS = 1,
-	IEEE80211_RADIOTAP_RATE = 2,
-	IEEE80211_RADIOTAP_CHANNEL = 3,
-	IEEE80211_RADIOTAP_FHSS = 4,
-	IEEE80211_RADIOTAP_DBM_ANTSIGNAL = 5,
-	IEEE80211_RADIOTAP_DBM_ANTNOISE = 6,
-	IEEE80211_RADIOTAP_LOCK_QUALITY = 7,
-	IEEE80211_RADIOTAP_TX_ATTENUATION = 8,
-	IEEE80211_RADIOTAP_DB_TX_ATTENUATION = 9,
-	IEEE80211_RADIOTAP_DBM_TX_POWER = 10,
-	IEEE80211_RADIOTAP_ANTENNA = 11,
-	IEEE80211_RADIOTAP_DB_ANTSIGNAL = 12,
-	IEEE80211_RADIOTAP_DB_ANTNOISE = 13,
-	/*
-	 * 14-17 are from Linux, they overlap the netbsd-specific
-	 * fields.
-	 */
-	IEEE80211_RADIOTAP_RX_FLAGS = 14,
-	IEEE80211_RADIOTAP_TX_FLAGS = 15,
-	IEEE80211_RADIOTAP_RTS_RETRIES = 16,
-	IEEE80211_RADIOTAP_DATA_RETRIES = 17,
-
-	IEEE80211_RADIOTAP_XCHANNEL = 18,
-	IEEE80211_RADIOTAP_MCS = 19,
-	IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
-
-        IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
-	IEEE80211_RADIOTAP_VENDOREXT = 30,
-	IEEE80211_RADIOTAP_EXT = 31,
-};
-
-#ifndef _KERNEL
-/* channel attributes */
-#define	IEEE80211_CHAN_TURBO	0x00000010 /* Turbo channel */
-#define	IEEE80211_CHAN_CCK	0x00000020 /* CCK channel */
-#define	IEEE80211_CHAN_OFDM	0x00000040 /* OFDM channel */
-#define	IEEE80211_CHAN_2GHZ	0x00000080 /* 2 GHz spectrum channel. */
-#define	IEEE80211_CHAN_5GHZ	0x00000100 /* 5 GHz spectrum channel */
-#define	IEEE80211_CHAN_PASSIVE	0x00000200 /* Only passive scan allowed */
-#define	IEEE80211_CHAN_DYN	0x00000400 /* Dynamic CCK-OFDM channel */
-#define	IEEE80211_CHAN_GFSK	0x00000800 /* GFSK channel (FHSS PHY) */
-#define	IEEE80211_CHAN_GSM	0x00001000 /* 900 MHz spectrum channel */
-#define	IEEE80211_CHAN_STURBO	0x00002000 /* 11a static turbo channel only */
-#define	IEEE80211_CHAN_HALF	0x00004000 /* Half rate channel */
-#define	IEEE80211_CHAN_QUARTER	0x00008000 /* Quarter rate channel */
-#endif /* !_KERNEL */
-
-/* For IEEE80211_RADIOTAP_FLAGS */
-#define	IEEE80211_RADIOTAP_F_CFP	0x01	/* sent/received
-						 * during CFP
-						 */
-#define	IEEE80211_RADIOTAP_F_SHORTPRE	0x02	/* sent/received
-						 * with short
-						 * preamble
-						 */
-#define	IEEE80211_RADIOTAP_F_WEP	0x04	/* sent/received
-						 * with WEP encryption
-						 */
-#define	IEEE80211_RADIOTAP_F_FRAG	0x08	/* sent/received
-						 * with fragmentation
-						 */
-#define	IEEE80211_RADIOTAP_F_FCS	0x10	/* frame includes FCS */
-#define	IEEE80211_RADIOTAP_F_DATAPAD	0x20	/* frame has padding between
-						 * 802.11 header and payload
-						 * (to 32-bit boundary)
-						 */
-#define	IEEE80211_RADIOTAP_F_BADFCS	0x40	/* does not pass FCS check */
-#define	IEEE80211_RADIOTAP_F_SHORTGI	0x80	/* HT short GI */
-
-#endif /* !_NET80211_IEEE80211_RADIOTAP_H_ */
diff --git a/include.new/net80211/ieee80211_ratectl.h b/include.new/net80211/ieee80211_ratectl.h
deleted file mode 100644
index e614742..0000000
--- a/include.new/net80211/ieee80211_ratectl.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 2010 Rui Paulo <rpaulo@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_ratectl.h 215289 2010-11-14 09:59:52Z bschmidt $
- */
-
-enum ieee80211_ratealgs {
-	IEEE80211_RATECTL_AMRR		= 0,
-	IEEE80211_RATECTL_RSSADAPT	= 1,
-	IEEE80211_RATECTL_ONOE		= 2,
-	IEEE80211_RATECTL_SAMPLE	= 3,
-	IEEE80211_RATECTL_NONE		= 4,
-	IEEE80211_RATECTL_MAX
-};
-
-#define	IEEE80211_RATECTL_TX_SUCCESS	1
-#define	IEEE80211_RATECTL_TX_FAILURE	0
-
-struct ieee80211_ratectl {
-	const char *ir_name;
-	int	(*ir_attach)(const struct ieee80211vap *);
-	void	(*ir_detach)(const struct ieee80211vap *);
-	void	(*ir_init)(struct ieee80211vap *);
-	void	(*ir_deinit)(struct ieee80211vap *);
-	void	(*ir_node_init)(struct ieee80211_node *);
-	void	(*ir_node_deinit)(struct ieee80211_node *);
-	int	(*ir_rate)(struct ieee80211_node *, void *, uint32_t);
-	void	(*ir_tx_complete)(const struct ieee80211vap *,
-	    			  const struct ieee80211_node *, int,
-	    			  void *, void *);
-	void	(*ir_tx_update)(const struct ieee80211vap *,
-	    			const struct ieee80211_node *,
-	    			void *, void *, void *);
-	void	(*ir_setinterval)(const struct ieee80211vap *, int);
-};
-
-void	ieee80211_ratectl_register(int, const struct ieee80211_ratectl *);
-void	ieee80211_ratectl_unregister(int);
-void	ieee80211_ratectl_init(struct ieee80211vap *);
-void	ieee80211_ratectl_set(struct ieee80211vap *, int);
-
-MALLOC_DECLARE(M_80211_RATECTL);
-
-static void __inline
-ieee80211_ratectl_deinit(struct ieee80211vap *vap)
-{
-	vap->iv_rate->ir_deinit(vap);
-}
-
-static void __inline
-ieee80211_ratectl_node_init(struct ieee80211_node *ni)
-{
-	const struct ieee80211vap *vap = ni->ni_vap;
-
-	vap->iv_rate->ir_node_init(ni);
-}
-
-static void __inline
-ieee80211_ratectl_node_deinit(struct ieee80211_node *ni)
-{
-	const struct ieee80211vap *vap = ni->ni_vap;
-
-	vap->iv_rate->ir_node_deinit(ni);
-}
-
-static int __inline
-ieee80211_ratectl_rate(struct ieee80211_node *ni, void *arg, uint32_t iarg)
-{
-	const struct ieee80211vap *vap = ni->ni_vap;
-
-	return vap->iv_rate->ir_rate(ni, arg, iarg);
-}
-
-static void __inline
-ieee80211_ratectl_tx_complete(const struct ieee80211vap *vap,
-    const struct ieee80211_node *ni, int status, void *arg1, void *arg2)
-{
-	vap->iv_rate->ir_tx_complete(vap, ni, status, arg1, arg2);
-}
-
-static void __inline
-ieee80211_ratectl_tx_update(const struct ieee80211vap *vap,
-    const struct ieee80211_node *ni, void *arg1, void *arg2, void *arg3)
-{
-	if (vap->iv_rate->ir_tx_update == NULL)
-		return;
-	vap->iv_rate->ir_tx_update(vap, ni, arg1, arg2, arg3);
-}
-
-static void __inline
-ieee80211_ratectl_setinterval(const struct ieee80211vap *vap, int msecs)
-{
-	if (vap->iv_rate->ir_setinterval == NULL)
-		return;
-	vap->iv_rate->ir_setinterval(vap, msecs);
-}
diff --git a/include.new/net80211/ieee80211_regdomain.h b/include.new/net80211/ieee80211_regdomain.h
deleted file mode 100644
index 43fd5bc..0000000
--- a/include.new/net80211/ieee80211_regdomain.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*-
- * Copyright (c) 2005-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_regdomain.h 243974 2012-12-07 06:34:46Z adrian $
- */
-#ifndef _NET80211_IEEE80211_REGDOMAIN_H_
-#define _NET80211_IEEE80211_REGDOMAIN_H_
-
-/*
- * 802.11 regulatory domain definitions.
- */
-
-/*
- * ISO 3166 Country/Region Codes
- * http://ftp.ics.uci.edu/pub/ietf/http/related/iso3166.txt
- */
-enum ISOCountryCode {
-	CTRY_AFGHANISTAN	= 4,
-	CTRY_ALBANIA		= 8,	/* Albania */
-	CTRY_ALGERIA		= 12,	/* Algeria */
-	CTRY_AMERICAN_SAMOA	= 16,
-	CTRY_ANDORRA		= 20,
-	CTRY_ANGOLA		= 24,
-	CTRY_ANGUILLA		= 660,
-	CTRY_ANTARTICA		= 10,
-	CTRY_ANTIGUA		= 28,	/* Antigua and Barbuda */
-	CTRY_ARGENTINA		= 32,	/* Argentina */
-	CTRY_ARMENIA		= 51,	/* Armenia */
-	CTRY_ARUBA		= 533,	/* Aruba */
-	CTRY_AUSTRALIA		= 36,	/* Australia */
-	CTRY_AUSTRIA		= 40,	/* Austria */
-	CTRY_AZERBAIJAN		= 31,	/* Azerbaijan */
-	CTRY_BAHAMAS		= 44,	/* Bahamas */
-	CTRY_BAHRAIN		= 48,	/* Bahrain */
-	CTRY_BANGLADESH		= 50,	/* Bangladesh */
-	CTRY_BARBADOS		= 52,
-	CTRY_BELARUS		= 112,	/* Belarus */
-	CTRY_BELGIUM		= 56,	/* Belgium */
-	CTRY_BELIZE		= 84,
-	CTRY_BENIN		= 204,
-	CTRY_BERMUDA		= 60,
-	CTRY_BHUTAN		= 64,
-	CTRY_BOLIVIA		= 68,	/* Bolivia */
-	CTRY_BOSNIA_AND_HERZEGOWINA = 70,
-	CTRY_BOTSWANA		= 72,
-	CTRY_BOUVET_ISLAND	= 74,
-	CTRY_BRAZIL		= 76,	/* Brazil */
-	CTRY_BRITISH_INDIAN_OCEAN_TERRITORY = 86,
-	CTRY_BRUNEI_DARUSSALAM	= 96,	/* Brunei Darussalam */
-	CTRY_BULGARIA		= 100,	/* Bulgaria */
-	CTRY_BURKINA_FASO	= 854,
-	CTRY_BURUNDI		= 108,
-	CTRY_CAMBODIA		= 116,
-	CTRY_CAMEROON		= 120,
-	CTRY_CANADA		= 124,	/* Canada */
-	CTRY_CAPE_VERDE		= 132,
-	CTRY_CAYMAN_ISLANDS	= 136,
-	CTRY_CENTRAL_AFRICAN_REPUBLIC = 140,
-	CTRY_CHAD		= 148,
-	CTRY_CHILE		= 152,	/* Chile */
-	CTRY_CHINA		= 156,	/* People's Republic of China */
-	CTRY_CHRISTMAS_ISLAND	= 162,
-	CTRY_COCOS_ISLANDS	= 166,
-	CTRY_COLOMBIA		= 170,	/* Colombia */
-	CTRY_COMOROS		= 174,
-	CTRY_CONGO		= 178,
-	CTRY_COOK_ISLANDS	= 184,
-	CTRY_COSTA_RICA		= 188,	/* Costa Rica */
-	CTRY_COTE_DIVOIRE	= 384,
-	CTRY_CROATIA		= 191,	/* Croatia (local name: Hrvatska) */
-	CTRY_CYPRUS		= 196,	/* Cyprus */
-	CTRY_CZECH		= 203,	/* Czech Republic */
-	CTRY_DENMARK		= 208,	/* Denmark */
-	CTRY_DJIBOUTI		= 262,
-	CTRY_DOMINICA		= 212,
-	CTRY_DOMINICAN_REPUBLIC	= 214,	/* Dominican Republic */
-	CTRY_EAST_TIMOR		= 626,
-	CTRY_ECUADOR		= 218,	/* Ecuador */
-	CTRY_EGYPT		= 818,	/* Egypt */
-	CTRY_EL_SALVADOR	= 222,	/* El Salvador */
-	CTRY_EQUATORIAL_GUINEA	= 226,
-	CTRY_ERITREA		= 232,
-	CTRY_ESTONIA		= 233,	/* Estonia */
-	CTRY_ETHIOPIA		= 210,
-	CTRY_FALKLAND_ISLANDS	= 238,	/* (Malvinas) */
-	CTRY_FAEROE_ISLANDS	= 234,	/* Faeroe Islands */
-	CTRY_FIJI		= 242,
-	CTRY_FINLAND		= 246,	/* Finland */
-	CTRY_FRANCE		= 250,	/* France */
-	CTRY_FRANCE2		= 255,	/* France (Metropolitan) */
-	CTRY_FRENCH_GUIANA	= 254,
-	CTRY_FRENCH_POLYNESIA	= 258,
-	CTRY_FRENCH_SOUTHERN_TERRITORIES	= 260,
-	CTRY_GABON		= 266,
-	CTRY_GAMBIA		= 270,
-	CTRY_GEORGIA		= 268,	/* Georgia */
-	CTRY_GERMANY		= 276,	/* Germany */
-	CTRY_GHANA		= 288,
-	CTRY_GIBRALTAR		= 292,
-	CTRY_GREECE		= 300,	/* Greece */
-	CTRY_GREENLAND		= 304,
-	CTRY_GRENADA		= 308,
-	CTRY_GUADELOUPE		= 312,
-	CTRY_GUAM		= 316,
-	CTRY_GUATEMALA		= 320,	/* Guatemala */
-	CTRY_GUINEA		= 324,
-	CTRY_GUINEA_BISSAU	= 624,
-	CTRY_GUYANA		= 328,
-	/* XXX correct remainder */
-	CTRY_HAITI		= 332,
-	CTRY_HONDURAS		= 340,	/* Honduras */
-	CTRY_HONG_KONG		= 344,	/* Hong Kong S.A.R., P.R.C. */
-	CTRY_HUNGARY		= 348,	/* Hungary */
-	CTRY_ICELAND		= 352,	/* Iceland */
-	CTRY_INDIA		= 356,	/* India */
-	CTRY_INDONESIA		= 360,	/* Indonesia */
-	CTRY_IRAN		= 364,	/* Iran */
-	CTRY_IRAQ		= 368,	/* Iraq */
-	CTRY_IRELAND		= 372,	/* Ireland */
-	CTRY_ISRAEL		= 376,	/* Israel */
-	CTRY_ITALY		= 380,	/* Italy */
-	CTRY_JAMAICA		= 388,	/* Jamaica */
-	CTRY_JAPAN		= 392,	/* Japan */
-	CTRY_JORDAN		= 400,	/* Jordan */
-	CTRY_KAZAKHSTAN		= 398,	/* Kazakhstan */
-	CTRY_KENYA		= 404,	/* Kenya */
-	CTRY_KOREA_NORTH	= 408,	/* North Korea */
-	CTRY_KOREA_ROC		= 410,	/* South Korea */
-	CTRY_KOREA_ROC2		= 411,	/* South Korea */
-	CTRY_KUWAIT		= 414,	/* Kuwait */
-	CTRY_LATVIA		= 428,	/* Latvia */
-	CTRY_LEBANON		= 422,	/* Lebanon */
-	CTRY_LIBYA		= 434,	/* Libya */
-	CTRY_LIECHTENSTEIN	= 438,	/* Liechtenstein */
-	CTRY_LITHUANIA		= 440,	/* Lithuania */
-	CTRY_LUXEMBOURG		= 442,	/* Luxembourg */
-	CTRY_MACAU		= 446,	/* Macau */
-	CTRY_MACEDONIA		= 807,	/* the Former Yugoslav Republic of Macedonia */
-	CTRY_MALAYSIA		= 458,	/* Malaysia */
-	CTRY_MALTA		= 470,	/* Malta */
-	CTRY_MEXICO		= 484,	/* Mexico */
-	CTRY_MONACO		= 492,	/* Principality of Monaco */
-	CTRY_MOROCCO		= 504,	/* Morocco */
-	CTRY_NEPAL		= 524,	/* Nepal */
-	CTRY_NETHERLANDS	= 528,	/* Netherlands */
-	CTRY_NEW_ZEALAND	= 554,	/* New Zealand */
-	CTRY_NICARAGUA		= 558,	/* Nicaragua */
-	CTRY_NORWAY		= 578,	/* Norway */
-	CTRY_OMAN		= 512,	/* Oman */
-	CTRY_PAKISTAN		= 586,	/* Islamic Republic of Pakistan */
-	CTRY_PANAMA		= 591,	/* Panama */
-	CTRY_PARAGUAY		= 600,	/* Paraguay */
-	CTRY_PERU		= 604,	/* Peru */
-	CTRY_PHILIPPINES	= 608,	/* Republic of the Philippines */
-	CTRY_POLAND		= 616,	/* Poland */
-	CTRY_PORTUGAL		= 620,	/* Portugal */
-	CTRY_PUERTO_RICO	= 630,	/* Puerto Rico */
-	CTRY_QATAR		= 634,	/* Qatar */
-	CTRY_ROMANIA		= 642,	/* Romania */
-	CTRY_RUSSIA		= 643,	/* Russia */
-	CTRY_SAUDI_ARABIA	= 682,	/* Saudi Arabia */
-	CTRY_SINGAPORE		= 702,	/* Singapore */
-	CTRY_SLOVAKIA		= 703,	/* Slovak Republic */
-	CTRY_SLOVENIA		= 705,	/* Slovenia */
-	CTRY_SOUTH_AFRICA	= 710,	/* South Africa */
-	CTRY_SPAIN		= 724,	/* Spain */
-	CTRY_SRILANKA		= 144,	/* Sri Lanka */
-	CTRY_SWEDEN		= 752,	/* Sweden */
-	CTRY_SWITZERLAND	= 756,	/* Switzerland */
-	CTRY_SYRIA		= 760,	/* Syria */
-	CTRY_TAIWAN		= 158,	/* Taiwan */
-	CTRY_THAILAND		= 764,	/* Thailand */
-	CTRY_TRINIDAD_Y_TOBAGO	= 780,	/* Trinidad y Tobago */
-	CTRY_TUNISIA		= 788,	/* Tunisia */
-	CTRY_TURKEY		= 792,	/* Turkey */
-	CTRY_UAE		= 784,	/* U.A.E. */
-	CTRY_UKRAINE		= 804,	/* Ukraine */
-	CTRY_UNITED_KINGDOM	= 826,	/* United Kingdom */
-	CTRY_UNITED_STATES	= 840,	/* United States */
-	CTRY_URUGUAY		= 858,	/* Uruguay */
-	CTRY_UZBEKISTAN		= 860,	/* Uzbekistan */
-	CTRY_VENEZUELA		= 862,	/* Venezuela */
-	CTRY_VIET_NAM		= 704,	/* Viet Nam */
-	CTRY_YEMEN		= 887,	/* Yemen */
-	CTRY_ZIMBABWE		= 716,	/* Zimbabwe */
-
-	/* NB: from here down not listed in 3166; they come from Atheros */
-	CTRY_DEBUG		= 0x1ff, /* debug */
-	CTRY_DEFAULT		= 0,	 /* default */
-
-	CTRY_UNITED_STATES_FCC49 = 842,	/* United States (Public Safety)*/
-	CTRY_KOREA_ROC3		= 412,	/* South Korea */
-
-	CTRY_JAPAN1		= 393,	/* Japan (JP1) */
-	CTRY_JAPAN2		= 394,	/* Japan (JP0) */
-	CTRY_JAPAN3		= 395,	/* Japan (JP1-1) */
-	CTRY_JAPAN4		= 396,	/* Japan (JE1) */
-	CTRY_JAPAN5		= 397,	/* Japan (JE2) */
-	CTRY_JAPAN6		= 399,	/* Japan (JP6) */
-	CTRY_JAPAN7		= 4007,	/* Japan (J7) */
-	CTRY_JAPAN8		= 4008,	/* Japan (J8) */
-	CTRY_JAPAN9		= 4009,	/* Japan (J9) */
-	CTRY_JAPAN10		= 4010,	/* Japan (J10) */
-	CTRY_JAPAN11		= 4011,	/* Japan (J11) */
-	CTRY_JAPAN12		= 4012,	/* Japan (J12) */
-	CTRY_JAPAN13		= 4013,	/* Japan (J13) */
-	CTRY_JAPAN14		= 4014,	/* Japan (J14) */
-	CTRY_JAPAN15		= 4015,	/* Japan (J15) */
-	CTRY_JAPAN16		= 4016,	/* Japan (J16) */
-	CTRY_JAPAN17		= 4017,	/* Japan (J17) */
-	CTRY_JAPAN18		= 4018,	/* Japan (J18) */
-	CTRY_JAPAN19		= 4019,	/* Japan (J19) */
-	CTRY_JAPAN20		= 4020,	/* Japan (J20) */
-	CTRY_JAPAN21		= 4021,	/* Japan (J21) */
-	CTRY_JAPAN22		= 4022,	/* Japan (J22) */
-	CTRY_JAPAN23		= 4023,	/* Japan (J23) */
-	CTRY_JAPAN24		= 4024,	/* Japan (J24) */
-};
-
-enum RegdomainCode {
-	SKU_FCC			= 0x10,	/* FCC, aka United States */
-	SKU_CA			= 0x20,	/* North America, aka Canada */
-	SKU_ETSI		= 0x30,	/* Europe */
-	SKU_ETSI2		= 0x32,	/* Europe w/o HT40 in 5GHz */
-	SKU_ETSI3		= 0x33,	/* Europe - channel 36 */
-	SKU_FCC3		= 0x3a,	/* FCC w/5470 band, 11h, DFS */
-	SKU_JAPAN		= 0x40,
-	SKU_KOREA		= 0x45,
-	SKU_APAC		= 0x50,	/* Asia Pacific */
-	SKU_APAC2		= 0x51,	/* Asia Pacific w/ DFS on mid-band */
-	SKU_APAC3		= 0x5d,	/* Asia Pacific w/o ISM band */
-	SKU_ROW			= 0x81,	/* China/Taiwan/Rest of World */
-	SKU_NONE		= 0xf0,	/* "Region Free" */
-	SKU_DEBUG		= 0x1ff,
-
-	/* NB: from here down private */
-	SKU_SR9			= 0x0298, /* Ubiquiti SR9 (900MHz/GSM) */
-	SKU_XR9			= 0x0299, /* Ubiquiti XR9 (900MHz/GSM) */
-	SKU_GZ901		= 0x029a, /* Zcomax GZ-901 (900MHz/GSM) */
-	SKU_XC900M		= 0x029b, /* Xagyl XC900M (900MHz/GSM) */
-					  /*
-					   * The XC900M by default uses the
-					   * same mapping as the XR9.  It
-					   * can optionally use a slightly
-					   * offset channel spacing (905MHz-
-					   * 925MHz) versus the XR9 (907MHz-
-					   * 922MHz), giving an extra channel.
-					   * This requires a jumper on the
-					   * NIC to be changed.
-					   */
-};
-
-#if defined(__KERNEL__) || defined(_KERNEL)
-struct ieee80211com;
-void	ieee80211_regdomain_attach(struct ieee80211com *);
-void	ieee80211_regdomain_detach(struct ieee80211com *);
-struct ieee80211vap;
-void	ieee80211_regdomain_vattach(struct ieee80211vap *);
-void	ieee80211_regdomain_vdetach(struct ieee80211vap *);
-
-struct ieee80211_regdomain;
-int	ieee80211_init_channels(struct ieee80211com *,
-	    const struct ieee80211_regdomain *, const uint8_t bands[]);
-struct ieee80211_channel;
-void	ieee80211_sort_channels(struct ieee80211_channel *chans, int nchans);
-struct ieee80211_appie;
-struct ieee80211_appie *ieee80211_alloc_countryie(struct ieee80211com *);
-struct ieee80211_regdomain_req;
-int	ieee80211_setregdomain(struct ieee80211vap *,
-	    struct ieee80211_regdomain_req *);
-#endif /* defined(__KERNEL__) || defined(_KERNEL) */
-#endif /* _NET80211_IEEE80211_REGDOMAIN_H_ */
diff --git a/include.new/net80211/ieee80211_rssadapt.h b/include.new/net80211/ieee80211_rssadapt.h
deleted file mode 100644
index 3c8811f..0000000
--- a/include.new/net80211/ieee80211_rssadapt.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/net80211/ieee80211_rssadapt.h 206358 2010-04-07 15:29:13Z rpaulo $	*/
-/* $NetBSD: ieee80211_rssadapt.h,v 1.4 2005/02/26 22:45:09 perry Exp $ */
-/*-
- * Copyright (c) 2003, 2004 David Young.  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 David Young may not be used to endorse or promote
- *    products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY David Young ``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 David
- * Young 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.
- */
-#ifndef _NET80211_IEEE80211_RSSADAPT_H_
-#define _NET80211_IEEE80211_RSSADAPT_H_
-
-/* Data-rate adaptation loosely based on "Link Adaptation Strategy
- * for IEEE 802.11 WLAN via Received Signal Strength Measurement"
- * by Javier del Prado Pavon and Sunghyun Choi.
- */
-
-/* Buckets for frames 0-128 bytes long, 129-1024, 1025-maximum. */
-#define	IEEE80211_RSSADAPT_BKTS		3
-#define IEEE80211_RSSADAPT_BKT0		128
-#define	IEEE80211_RSSADAPT_BKTPOWER	3	/* 2**_BKTPOWER */
-
-struct ieee80211_rssadapt {
-	const struct ieee80211vap *vap;
-	int	interval;			/* update interval (ticks) */
-};
-
-struct ieee80211_rssadapt_node {
-	struct ieee80211_rssadapt *ra_rs;	/* backpointer */
-	struct ieee80211_rateset ra_rates;	/* negotiated rates */
-	int	ra_rix;				/* current rate index */
-	int	ra_ticks;			/* time of last update */
-	int	ra_last_raise;			/* time of last rate raise */
-	int	ra_raise_interval;		/* rate raise time threshold */
-
-	/* Tx failures in this update interval */
-	uint32_t		ra_nfail;
-	/* Tx successes in this update interval */
-	uint32_t		ra_nok;
-	/* exponential average packets/second */
-	uint32_t		ra_pktrate;
-	/* RSSI threshold for each Tx rate */
-	uint16_t		ra_rate_thresh[IEEE80211_RSSADAPT_BKTS]
-					      [IEEE80211_RATE_SIZE];
-};
-
-#define	IEEE80211_RSSADAPT_SUCCESS	1
-#define	IEEE80211_RSSADAPT_FAILURE	0
-#endif /* _NET80211_IEEE80211_RSSADAPT_H_ */
diff --git a/include.new/net80211/ieee80211_scan.h b/include.new/net80211/ieee80211_scan.h
deleted file mode 100644
index fe2fd3d..0000000
--- a/include.new/net80211/ieee80211_scan.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*-
- * Copyright (c) 2005-2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_scan.h 227331 2011-11-08 04:00:24Z adrian $
- */
-#ifndef _NET80211_IEEE80211_SCAN_H_
-#define _NET80211_IEEE80211_SCAN_H_
-
-/*
- * 802.11 scanning support.
- *
- * Scanning is the procedure by which a station locates a bss to join
- * (infrastructure/ibss mode), or a channel to use (when operating as
- * an ap or ibss master).  Scans are either "active" or "passive".  An
- * active scan causes one or more probe request frames to be sent on
- * visiting each channel.  A passive request causes each channel in the
- * scan set to be visited but no frames to be transmitted; the station
- * only listens for traffic.  Note that active scanning may still need
- * to listen for traffic before sending probe request frames depending
- * on regulatory constraints; the 802.11 layer handles this by generating
- * a callback when scanning on a ``passive channel'' when the
- * IEEE80211_FEXT_PROBECHAN flag is set.
- *
- * A scan operation involves constructing a set of channels to inspect
- * (the scan set), visiting each channel and collecting information
- * (e.g. what bss are present), and then analyzing the results to make
- * decisions like which bss to join.  This process needs to be as fast
- * as possible so we do things like intelligently construct scan sets
- * and dwell on a channel only as long as necessary.  The scan code also
- * maintains a cache of recent scan results and uses it to bypass scanning
- * whenever possible.  The scan cache is also used to enable roaming
- * between access points when operating in infrastructure mode.
- *
- * Scanning is handled with pluggable modules that implement "policy"
- * per-operating mode.  The core scanning support provides an
- * instrastructure to support these modules and exports a common api
- * to the rest of the 802.11 layer.  Policy modules decide what
- * channels to visit, what state to record to make decisions (e.g. ap
- * mode scanning for auto channel selection keeps significantly less
- * state than sta mode scanning for an ap to associate to), and selects
- * the final station/channel to return as the result of a scan.
- *
- * Scanning is done synchronously when initially bringing a vap to an
- * operational state and optionally in the background to maintain the
- * scan cache for doing roaming and rogue ap monitoring.  Scanning is
- * not tied to the 802.11 state machine that governs vaps though there
- * is linkage to the IEEE80211_SCAN state.  Only one vap at a time may
- * be scanning; this scheduling policy is handled in ieee80211_new_state
- * and is invisible to the scanning code.
-*/
-#define	IEEE80211_SCAN_MAX	IEEE80211_CHAN_MAX
-
-struct ieee80211_scanner;			/* scan policy state */
-
-struct ieee80211_scan_ssid {
-	int	 len;				/* length in bytes */
-	uint8_t ssid[IEEE80211_NWID_LEN];	/* ssid contents */
-};
-#define	IEEE80211_SCAN_MAX_SSID	1		/* max # ssid's to probe */
-
-/*
- * Scan state visible to the 802.11 layer.  Scan parameters and
- * results are stored in this data structure.  The ieee80211_scan_state
- * structure is extended with space that is maintained private to
- * the core scanning support.  We allocate one instance and link it
- * to the ieee80211com structure; then share it between all associated
- * vaps.  We could allocate multiple of these, e.g. to hold multiple
- * scan results, but this is sufficient for current needs.
- */
-struct ieee80211_scan_state {
-	struct ieee80211vap *ss_vap;
-	struct ieee80211com *ss_ic;
-	const struct ieee80211_scanner *ss_ops;	/* policy hookup, see below */
-	void		*ss_priv;		/* scanner private state */
-	uint16_t	ss_flags;
-#define	IEEE80211_SCAN_NOPICK	0x0001		/* scan only, no selection */
-#define	IEEE80211_SCAN_ACTIVE	0x0002		/* active scan (probe req) */
-#define	IEEE80211_SCAN_PICK1ST	0x0004		/* ``hey sailor'' mode */
-#define	IEEE80211_SCAN_BGSCAN	0x0008		/* bg scan, exit ps at end */
-#define	IEEE80211_SCAN_ONCE	0x0010		/* do one complete pass */
-#define	IEEE80211_SCAN_NOBCAST	0x0020		/* no broadcast probe req */
-#define	IEEE80211_SCAN_NOJOIN	0x0040		/* no auto-sequencing */
-#define	IEEE80211_SCAN_GOTPICK	0x1000		/* got candidate, can stop */
-	uint8_t		ss_nssid;		/* # ssid's to probe/match */
-	struct ieee80211_scan_ssid ss_ssid[IEEE80211_SCAN_MAX_SSID];
-						/* ssid's to probe/match */
-						/* ordered channel set */
-	struct ieee80211_channel *ss_chans[IEEE80211_SCAN_MAX];
-	uint16_t	ss_next;		/* ix of next chan to scan */
-	uint16_t	ss_last;		/* ix+1 of last chan to scan */
-	unsigned long	ss_mindwell;		/* min dwell on channel */
-	unsigned long	ss_maxdwell;		/* max dwell on channel */
-};
-
-/*
- * The upper 16 bits of the flags word is used to communicate
- * information to the scanning code that is NOT recorded in
- * ss_flags.  It might be better to split this stuff out into
- * a separate variable to avoid confusion.
- */
-#define	IEEE80211_SCAN_FLUSH	0x00010000	/* flush candidate table */
-#define	IEEE80211_SCAN_NOSSID	0x80000000	/* don't update ssid list */
-
-struct ieee80211com;
-void	ieee80211_scan_attach(struct ieee80211com *);
-void	ieee80211_scan_detach(struct ieee80211com *);
-void	ieee80211_scan_vattach(struct ieee80211vap *);
-void	ieee80211_scan_vdetach(struct ieee80211vap *);
-
-void	ieee80211_scan_dump_channels(const struct ieee80211_scan_state *);
-
-#define	IEEE80211_SCAN_FOREVER	0x7fffffff
-int	ieee80211_start_scan(struct ieee80211vap *, int flags,
-		u_int duration, u_int mindwell, u_int maxdwell,
-		u_int nssid, const struct ieee80211_scan_ssid ssids[]);
-int	ieee80211_check_scan(struct ieee80211vap *, int flags,
-		u_int duration, u_int mindwell, u_int maxdwell,
-		u_int nssid, const struct ieee80211_scan_ssid ssids[]);
-int	ieee80211_check_scan_current(struct ieee80211vap *);
-int	ieee80211_bg_scan(struct ieee80211vap *, int);
-void	ieee80211_cancel_scan(struct ieee80211vap *);
-void	ieee80211_cancel_anyscan(struct ieee80211vap *);
-void	ieee80211_scan_next(struct ieee80211vap *);
-void	ieee80211_scan_done(struct ieee80211vap *);
-void	ieee80211_probe_curchan(struct ieee80211vap *, int);
-struct ieee80211_channel *ieee80211_scan_pickchannel(struct ieee80211com *, int);
-
-struct ieee80211_scanparams;
-void	ieee80211_add_scan(struct ieee80211vap *,
-		const struct ieee80211_scanparams *,
-		const struct ieee80211_frame *,
-		int subtype, int rssi, int noise);
-void	ieee80211_scan_timeout(struct ieee80211com *);
-
-void	ieee80211_scan_assoc_success(struct ieee80211vap *,
-		const uint8_t mac[IEEE80211_ADDR_LEN]);
-enum {
-	IEEE80211_SCAN_FAIL_TIMEOUT	= 1,	/* no response to mgmt frame */
-	IEEE80211_SCAN_FAIL_STATUS	= 2	/* negative response to " " */
-};
-void	ieee80211_scan_assoc_fail(struct ieee80211vap *,
-		const uint8_t mac[IEEE80211_ADDR_LEN], int reason);
-void	ieee80211_scan_flush(struct ieee80211vap *);
-
-struct ieee80211_scan_entry;
-typedef void ieee80211_scan_iter_func(void *,
-		const struct ieee80211_scan_entry *);
-void	ieee80211_scan_iterate(struct ieee80211vap *,
-		ieee80211_scan_iter_func, void *);
-enum {
-	IEEE80211_BPARSE_BADIELEN	= 0x01,	/* ie len past end of frame */
-	IEEE80211_BPARSE_RATES_INVALID	= 0x02,	/* invalid RATES ie */
-	IEEE80211_BPARSE_XRATES_INVALID	= 0x04,	/* invalid XRATES ie */
-	IEEE80211_BPARSE_SSID_INVALID	= 0x08,	/* invalid SSID ie */
-	IEEE80211_BPARSE_CHAN_INVALID	= 0x10,	/* invalid FH/DSPARMS chan */
-	IEEE80211_BPARSE_OFFCHAN	= 0x20,	/* DSPARMS chan != curchan */
-	IEEE80211_BPARSE_BINTVAL_INVALID= 0x40,	/* invalid beacon interval */
-	IEEE80211_BPARSE_CSA_INVALID	= 0x80,	/* invalid CSA ie */
-};
-
-/*
- * Parameters supplied when adding/updating an entry in a
- * scan cache.  Pointer variables should be set to NULL
- * if no data is available.  Pointer references can be to
- * local data; any information that is saved will be copied.
- * All multi-byte values must be in host byte order.
- */
-struct ieee80211_scanparams {
-	uint8_t		status;		/* bitmask of IEEE80211_BPARSE_* */
-	uint8_t		chan;		/* channel # from FH/DSPARMS */
-	uint8_t		bchan;		/* curchan's channel # */
-	uint8_t		fhindex;
-	uint16_t	fhdwell;	/* FHSS dwell interval */
-	uint16_t	capinfo;	/* 802.11 capabilities */
-	uint16_t	erp;		/* NB: 0x100 indicates ie present */
-	uint16_t	bintval;
-	uint8_t		timoff;
-	uint8_t		*ies;		/* all captured ies */
-	size_t		ies_len;	/* length of all captured ies */
-	uint8_t		*tim;
-	uint8_t		*tstamp;
-	uint8_t		*country;
-	uint8_t		*ssid;
-	uint8_t		*rates;
-	uint8_t		*xrates;
-	uint8_t		*doth;
-	uint8_t		*wpa;
-	uint8_t		*rsn;
-	uint8_t		*wme;
-	uint8_t		*htcap;
-	uint8_t		*htinfo;
-	uint8_t		*ath;
-	uint8_t		*tdma;
-	uint8_t		*csa;
-	uint8_t		*quiet;
-	uint8_t		*meshid;
-	uint8_t		*meshconf;
-	uint8_t		*spare[3];
-};
-
-/*
- * Scan cache entry format used when exporting data from a policy
- * module; this data may be represented some other way internally.
- */
-struct ieee80211_scan_entry {
-	uint8_t		se_macaddr[IEEE80211_ADDR_LEN];
-	uint8_t		se_bssid[IEEE80211_ADDR_LEN];
-	/* XXX can point inside se_ies */
-	uint8_t		se_ssid[2+IEEE80211_NWID_LEN];
-	uint8_t		se_rates[2+IEEE80211_RATE_MAXSIZE];
-	uint8_t		se_xrates[2+IEEE80211_RATE_MAXSIZE];
-	union {
-		uint8_t		data[8];
-		u_int64_t	tsf;
-	} se_tstamp;			/* from last rcv'd beacon */
-	uint16_t	se_intval;	/* beacon interval (host byte order) */
-	uint16_t	se_capinfo;	/* capabilities (host byte order) */
-	struct ieee80211_channel *se_chan;/* channel where sta found */
-	uint16_t	se_timoff;	/* byte offset to TIM ie */
-	uint16_t	se_fhdwell;	/* FH only (host byte order) */
-	uint8_t		se_fhindex;	/* FH only */
-	uint8_t		se_dtimperiod;	/* DTIM period */
-	uint16_t	se_erp;		/* ERP from beacon/probe resp */
-	int8_t		se_rssi;	/* avg'd recv ssi */
-	int8_t		se_noise;	/* noise floor */
-	uint8_t		se_cc[2];	/* captured country code */
-	uint8_t		se_meshid[2+IEEE80211_MESHID_LEN];
-	struct ieee80211_ies se_ies;	/* captured ie's */
-	u_int		se_age;		/* age of entry (0 on create) */
-};
-MALLOC_DECLARE(M_80211_SCAN);
-
-/*
- * Template for an in-kernel scan policy module.
- * Modules register with the scanning code and are
- * typically loaded as needed.
- */
-struct ieee80211_scanner {
-	const char *scan_name;		/* printable name */
-	int	(*scan_attach)(struct ieee80211_scan_state *);
-	int	(*scan_detach)(struct ieee80211_scan_state *);
-	int	(*scan_start)(struct ieee80211_scan_state *,
-			struct ieee80211vap *);
-	int	(*scan_restart)(struct ieee80211_scan_state *,
-			struct ieee80211vap *);
-	int	(*scan_cancel)(struct ieee80211_scan_state *,
-			struct ieee80211vap *);
-	int	(*scan_end)(struct ieee80211_scan_state *,
-			struct ieee80211vap *);
-	int	(*scan_flush)(struct ieee80211_scan_state *);
-	struct ieee80211_channel *(*scan_pickchan)(
-			struct ieee80211_scan_state *, int);
-	/* add an entry to the cache */
-	int	(*scan_add)(struct ieee80211_scan_state *,
-			const struct ieee80211_scanparams *,
-			const struct ieee80211_frame *,
-			int subtype, int rssi, int noise);
-	/* age and/or purge entries in the cache */
-	void	(*scan_age)(struct ieee80211_scan_state *);
-	/* note that association failed for an entry */
-	void	(*scan_assoc_fail)(struct ieee80211_scan_state *,
-			const uint8_t macaddr[IEEE80211_ADDR_LEN],
-			int reason);
-	/* note that association succeed for an entry */
-	void	(*scan_assoc_success)(struct ieee80211_scan_state *,
-			const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-	/* iterate over entries in the scan cache */
-	void	(*scan_iterate)(struct ieee80211_scan_state *,
-			ieee80211_scan_iter_func *, void *);
-	void	(*scan_spare0)(void);
-	void	(*scan_spare1)(void);
-	void	(*scan_spare2)(void);
-	void	(*scan_spare4)(void);
-};
-void	ieee80211_scanner_register(enum ieee80211_opmode,
-		const struct ieee80211_scanner *);
-void	ieee80211_scanner_unregister(enum ieee80211_opmode,
-		const struct ieee80211_scanner *);
-void	ieee80211_scanner_unregister_all(const struct ieee80211_scanner *);
-const struct ieee80211_scanner *ieee80211_scanner_get(enum ieee80211_opmode);
-#endif /* _NET80211_IEEE80211_SCAN_H_ */
diff --git a/include.new/net80211/ieee80211_sta.h b/include.new/net80211/ieee80211_sta.h
deleted file mode 100644
index 82d5946..0000000
--- a/include.new/net80211/ieee80211_sta.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_sta.h 244060 2012-12-09 22:56:29Z adrian $
- */
-#ifndef _NET80211_IEEE80211_STA_H_
-#define _NET80211_IEEE80211_STA_H_
-
-/*
- * Station-mode implementation definitions.
- */
-void	ieee80211_sta_attach(struct ieee80211com *);
-void	ieee80211_sta_detach(struct ieee80211com *);
-void	ieee80211_sta_vattach(struct ieee80211vap *);
-
-/*
- * Used by the adhoc/mesh/tdma paths.
- */
-extern	int ieee80211_parse_wmeparams(struct ieee80211vap *vap, uint8_t *frm,
-	    const struct ieee80211_frame *wh);
-#endif /* !_NET80211_IEEE80211_STA_H_ */
diff --git a/include.new/net80211/ieee80211_superg.h b/include.new/net80211/ieee80211_superg.h
deleted file mode 100644
index 9a069d1..0000000
--- a/include.new/net80211/ieee80211_superg.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * Copyright (c) 2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_superg.h 244051 2012-12-09 19:20:28Z adrian $
- */
-#ifndef _NET80211_IEEE80211_SUPERG_H_
-#define _NET80211_IEEE80211_SUPERG_H_
-
-/*
- * Atheros' 802.11 SuperG protocol support.
- */
-
-/*
- * Atheros advanced capability information element.
- */
-struct ieee80211_ath_ie {
-	uint8_t		ath_id;			/* IEEE80211_ELEMID_VENDOR */
-	uint8_t		ath_len;		/* length in bytes */
-	uint8_t		ath_oui[3];		/* ATH_OUI */
-	uint8_t		ath_oui_type;		/* ATH_OUI_TYPE */
-	uint8_t		ath_oui_subtype;	/* ATH_OUI_SUBTYPE */
-	uint8_t		ath_version;		/* spec revision */
-	uint8_t		ath_capability;		/* capability info */
-#define	ATHEROS_CAP_TURBO_PRIME		0x01	/* dynamic turbo--aka Turbo' */
-#define	ATHEROS_CAP_COMPRESSION		0x02	/* data compression */
-#define	ATHEROS_CAP_FAST_FRAME		0x04	/* fast (jumbo) frames */
-#define	ATHEROS_CAP_XR			0x08	/* Xtended Range support */
-#define	ATHEROS_CAP_AR			0x10	/* Advanded Radar support */
-#define	ATHEROS_CAP_BURST		0x20	/* Bursting - not negotiated */
-#define	ATHEROS_CAP_WME			0x40	/* CWMin tuning */
-#define	ATHEROS_CAP_BOOST		0x80	/* use turbo/!turbo mode */
-	uint8_t		ath_defkeyix[2];
-} __packed;
-
-#define	ATH_OUI_VERSION		0x00
-#define	ATH_OUI_SUBTYPE		0x01
-
-#ifdef _KERNEL
-struct ieee80211_stageq {
-	struct mbuf		*head;		/* frames linked w/ m_nextpkt */
-	struct mbuf		*tail;		/* last frame in queue */
-	int			depth;		/* # items on head */
-};
-
-struct ieee80211_superg {
-	/* fast-frames staging q */
-	struct ieee80211_stageq	ff_stageq[WME_NUM_AC];
-};
-
-void	ieee80211_superg_attach(struct ieee80211com *);
-void	ieee80211_superg_detach(struct ieee80211com *);
-void	ieee80211_superg_vattach(struct ieee80211vap *);
-void	ieee80211_superg_vdetach(struct ieee80211vap *);
-
-uint8_t *ieee80211_add_ath(uint8_t *, uint8_t, ieee80211_keyix);
-uint8_t *ieee80211_add_athcaps(uint8_t *, const struct ieee80211_node *);
-void	ieee80211_parse_ath(struct ieee80211_node *, uint8_t *);
-int	ieee80211_parse_athparams(struct ieee80211_node *, uint8_t *,
-	    const struct ieee80211_frame *);
-
-void	ieee80211_ff_node_init(struct ieee80211_node *);
-void	ieee80211_ff_node_cleanup(struct ieee80211_node *);
-
-struct mbuf *ieee80211_ff_check(struct ieee80211_node *, struct mbuf *);
-void	ieee80211_ff_age(struct ieee80211com *, struct ieee80211_stageq *,
-	     int quanta);
-
-/*
- * See ieee80211_ff_age() for a description of the locking
- * expectation here.
- */
-static __inline void
-ieee80211_ff_flush(struct ieee80211com *ic, int ac)
-{
-	struct ieee80211_superg *sg = ic->ic_superg;
-
-	if (sg != NULL && sg->ff_stageq[ac].depth)
-		ieee80211_ff_age(ic, &sg->ff_stageq[ac], 0x7fffffff);
-}
-
-/*
- * See ieee80211_ff_age() for a description of the locking
- * expectation here.
- */
-static __inline void
-ieee80211_ff_age_all(struct ieee80211com *ic, int quanta)
-{
-	struct ieee80211_superg *sg = ic->ic_superg;
-
-	if (sg != NULL) {
-		if (sg->ff_stageq[WME_AC_VO].depth)
-			ieee80211_ff_age(ic, &sg->ff_stageq[WME_AC_VO], quanta);
-		if (sg->ff_stageq[WME_AC_VI].depth)
-			ieee80211_ff_age(ic, &sg->ff_stageq[WME_AC_VI], quanta);
-		if (sg->ff_stageq[WME_AC_BE].depth)
-			ieee80211_ff_age(ic, &sg->ff_stageq[WME_AC_BE], quanta);
-		if (sg->ff_stageq[WME_AC_BK].depth)
-			ieee80211_ff_age(ic, &sg->ff_stageq[WME_AC_BK], quanta);
-	}
-}
-
-struct mbuf *ieee80211_ff_encap(struct ieee80211vap *, struct mbuf *,
-	    int, struct ieee80211_key *);
-
-struct mbuf *ieee80211_ff_decap(struct ieee80211_node *, struct mbuf *);
-
-static __inline struct mbuf *
-ieee80211_decap_fastframe(struct ieee80211vap *vap, struct ieee80211_node *ni,
-    struct mbuf *m)
-{
-	return IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) ?
-	    ieee80211_ff_decap(ni, m) : m;
-}
-#endif /* _KERNEL */
-#endif /* _NET80211_IEEE80211_SUPERG_H_ */
diff --git a/include.new/net80211/ieee80211_tdma.h b/include.new/net80211/ieee80211_tdma.h
deleted file mode 100644
index 9fe8709..0000000
--- a/include.new/net80211/ieee80211_tdma.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting
- * Copyright (c) 2007-2009 Intel Corporation
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_tdma.h 192468 2009-05-20 20:00:40Z sam $
- */
-#ifndef _NET80211_IEEE80211_TDMA_H_
-#define _NET80211_IEEE80211_TDMA_H_
-
-/*
- * TDMA-mode implementation definitions.
- */
-
-#define	TDMA_SUBTYPE_PARAM	0x01
-#define	TDMA_VERSION_V2		2
-#define	TDMA_VERSION		TDMA_VERSION_V2
-
-/* NB: we only support 2 right now but protocol handles up to 8 */
-#define	TDMA_MAXSLOTS		2	/* max slots/sta's */
-
-#define	TDMA_PARAM_LEN_V2	sizeof(struct ieee80211_tdma_param)
-
-/*
- * TDMA information element.
- */
-struct ieee80211_tdma_param {
-	u_int8_t	tdma_id;	/* IEEE80211_ELEMID_VENDOR */
-	u_int8_t	tdma_len;
-	u_int8_t	tdma_oui[3];	/* TDMA_OUI */
-	u_int8_t	tdma_type;	/* TDMA_OUI_TYPE */
-	u_int8_t	tdma_subtype;	/* TDMA_SUBTYPE_PARAM */
-	u_int8_t	tdma_version;	/* spec revision */
-	u_int8_t	tdma_slot;	/* station slot # [0..7] */
-	u_int8_t	tdma_slotcnt;	/* bss slot count [1..8] */
-	u_int16_t	tdma_slotlen;	/* bss slot len (100us) */
-	u_int8_t	tdma_bintval;	/* beacon interval (superframes) */
-	u_int8_t	tdma_inuse[1];	/* slot occupancy map */
-	u_int8_t	tdma_pad[2];
-	u_int8_t	tdma_tstamp[8];	/* timestamp from last beacon */
-} __packed;
-
-#ifdef _KERNEL
-/*
- * Implementation state.
- */
-struct ieee80211_tdma_state {
-	u_int	tdma_slotlen;		/* bss slot length (us) */
-	uint8_t	tdma_version;		/* protocol version to use */
-	uint8_t	tdma_slotcnt;		/* bss slot count */
-	uint8_t	tdma_bintval;		/* beacon interval (slots) */
-	uint8_t	tdma_slot;		/* station slot # */
-	uint8_t	tdma_inuse[1];		/* mask of slots in use */
-	uint8_t	tdma_active[1];		/* mask of active slots */
-	int	tdma_count;		/* active/inuse countdown */
-	void	*tdma_peer;		/* peer station cookie */
-	struct timeval tdma_lastprint;	/* time of last rate-limited printf */
-	int	tdma_fails;		/* fail count for rate-limiting */
-
-	/* parent method pointers */
-	int	(*tdma_newstate)(struct ieee80211vap *, enum ieee80211_state,
-		    int arg);
-	void	(*tdma_recv_mgmt)(struct ieee80211_node *,
-		    struct mbuf *, int, int, int);
-	void	(*tdma_opdetach)(struct ieee80211vap *);
-};
- 
-#define	TDMA_UPDATE_SLOT	0x0001	/* tdma_slot changed */
-#define	TDMA_UPDATE_SLOTCNT	0x0002	/* tdma_slotcnt changed */
-#define	TDMA_UPDATE_SLOTLEN	0x0004	/* tdma_slotlen changed */
-#define	TDMA_UPDATE_BINTVAL	0x0008	/* tdma_bintval changed */
-
-void	ieee80211_tdma_vattach(struct ieee80211vap *);
-
-int	ieee80211_tdma_getslot(struct ieee80211vap *vap);
-void	ieee80211_parse_tdma(struct ieee80211_node *ni, const uint8_t *ie);
-uint8_t *ieee80211_add_tdma(uint8_t *frm, struct ieee80211vap *vap);
-struct ieee80211_beacon_offsets;
-void	ieee80211_tdma_update_beacon(struct ieee80211vap *vap,
-	    struct ieee80211_beacon_offsets *bo);
-#endif /* _KERNEL */
-#endif /* !_NET80211_IEEE80211_TDMA_H_ */
diff --git a/include.new/net80211/ieee80211_var.h b/include.new/net80211/ieee80211_var.h
deleted file mode 100644
index 23235d3..0000000
--- a/include.new/net80211/ieee80211_var.h
+++ /dev/null
@@ -1,980 +0,0 @@
-/*-
- * Copyright (c) 2001 Atsushi Onoe
- * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_var.h 254076 2013-08-07 22:01:43Z adrian $
- */
-#ifndef _NET80211_IEEE80211_VAR_H_
-#define _NET80211_IEEE80211_VAR_H_
-
-/*
- * Definitions for IEEE 802.11 drivers.
- */
-/* NB: portability glue must go first */
-#if defined(__NetBSD__)
-#include <net80211/ieee80211_netbsd.h>
-#elif defined(__FreeBSD__)
-#include <net80211/ieee80211_freebsd.h>
-#elif defined(__linux__)
-#include <net80211/ieee80211_linux.h>
-#else
-#error	"No support for your operating system!"
-#endif
-
-#include <net80211/_ieee80211.h>
-#include <net80211/ieee80211.h>
-#include <net80211/ieee80211_ageq.h>
-#include <net80211/ieee80211_crypto.h>
-#include <net80211/ieee80211_dfs.h>
-#include <net80211/ieee80211_ioctl.h>		/* for ieee80211_stats */
-#include <net80211/ieee80211_phy.h>
-#include <net80211/ieee80211_power.h>
-#include <net80211/ieee80211_node.h>
-#include <net80211/ieee80211_proto.h>
-#include <net80211/ieee80211_radiotap.h>
-#include <net80211/ieee80211_scan.h>
-
-#define	IEEE80211_TXPOWER_MAX	100	/* .5 dBm (XXX units?) */
-#define	IEEE80211_TXPOWER_MIN	0	/* kill radio */
-
-#define	IEEE80211_DTIM_DEFAULT	1	/* default DTIM period */
-#define	IEEE80211_BINTVAL_DEFAULT 100	/* default beacon interval (TU's) */
-
-#define	IEEE80211_BMISS_MAX	2	/* maximum consecutive bmiss allowed */
-#define	IEEE80211_HWBMISS_DEFAULT 7	/* h/w bmiss threshold (beacons) */
-
-#define	IEEE80211_BGSCAN_INTVAL_MIN	15	/* min bg scan intvl (secs) */
-#define	IEEE80211_BGSCAN_INTVAL_DEFAULT	(5*60)	/* default bg scan intvl */
-
-#define	IEEE80211_BGSCAN_IDLE_MIN	100	/* min idle time (ms) */
-#define	IEEE80211_BGSCAN_IDLE_DEFAULT	250	/* default idle time (ms) */
-
-#define	IEEE80211_SCAN_VALID_MIN	10	/* min scan valid time (secs) */
-#define	IEEE80211_SCAN_VALID_DEFAULT	60	/* default scan valid time */
-
-#define	IEEE80211_PS_SLEEP	0x1	/* STA is in power saving mode */
-#define	IEEE80211_PS_MAX_QUEUE	50	/* maximum saved packets */
-
-#define	IEEE80211_FIXED_RATE_NONE	0xff
-#define	IEEE80211_TXMAX_DEFAULT		6	/* default ucast max retries */
-
-#define	IEEE80211_RTS_DEFAULT		IEEE80211_RTS_MAX
-#define	IEEE80211_FRAG_DEFAULT		IEEE80211_FRAG_MAX
-
-#define	IEEE80211_MS_TO_TU(x)	(((x) * 1000) / 1024)
-#define	IEEE80211_TU_TO_MS(x)	(((x) * 1024) / 1000)
-#define	IEEE80211_TU_TO_TICKS(x)(((x) * 1024 * hz) / (1000 * 1000))
-
-/*
- * 802.11 control state is split into a common portion that maps
- * 1-1 to a physical device and one or more "Virtual AP's" (VAP)
- * that are bound to an ieee80211com instance and share a single
- * underlying device.  Each VAP has a corresponding OS device
- * entity through which traffic flows and that applications use
- * for issuing ioctls, etc.
- */
-
-/*
- * Data common to one or more virtual AP's.  State shared by
- * the underlying device and the net80211 layer is exposed here;
- * e.g. device-specific callbacks.
- */
-struct ieee80211vap;
-typedef void (*ieee80211vap_attach)(struct ieee80211vap *);
-
-struct ieee80211_appie {
-	uint16_t		ie_len;		/* size of ie_data */
-	uint8_t			ie_data[];	/* user-specified IE's */
-};
-
-struct ieee80211_tdma_param;
-struct ieee80211_rate_table;
-struct ieee80211_tx_ampdu;
-struct ieee80211_rx_ampdu;
-struct ieee80211_superg;
-struct ieee80211_frame;
-
-struct ieee80211com {
-	struct ifnet		*ic_ifp;	/* associated device */
-	ieee80211_com_lock_t	ic_comlock;	/* state update lock */
-	ieee80211_tx_lock_t	ic_txlock;	/* ic/vap TX lock */
-	TAILQ_HEAD(, ieee80211vap) ic_vaps;	/* list of vap instances */
-	int			ic_headroom;	/* driver tx headroom needs */
-	enum ieee80211_phytype	ic_phytype;	/* XXX wrong for multi-mode */
-	enum ieee80211_opmode	ic_opmode;	/* operation mode */
-	struct ifmedia		ic_media;	/* interface media config */
-	struct callout		ic_inact;	/* inactivity processing */
-	struct taskqueue	*ic_tq;		/* deferred state thread */
-	struct task		ic_parent_task;	/* deferred parent processing */
-	struct task		ic_promisc_task;/* deferred promisc update */
-	struct task		ic_mcast_task;	/* deferred mcast update */
-	struct task		ic_chan_task;	/* deferred channel change */
-	struct task		ic_bmiss_task;	/* deferred beacon miss hndlr */
-	struct task		ic_chw_task;	/* deferred HT CHW update */
-
-	uint32_t		ic_flags;	/* state flags */
-	uint32_t		ic_flags_ext;	/* extended state flags */
-	uint32_t		ic_flags_ht;	/* HT state flags */
-	uint32_t		ic_flags_ven;	/* vendor state flags */
-	uint32_t		ic_caps;	/* capabilities */
-	uint32_t		ic_htcaps;	/* HT capabilities */
-	uint32_t		ic_htextcaps;	/* HT extended capabilities */
-	uint32_t		ic_cryptocaps;	/* crypto capabilities */
-	uint8_t			ic_modecaps[2];	/* set of mode capabilities */
-	uint8_t			ic_promisc;	/* vap's needing promisc mode */
-	uint8_t			ic_allmulti;	/* vap's needing all multicast*/
-	uint8_t			ic_nrunning;	/* vap's marked running */
-	uint8_t			ic_curmode;	/* current mode */
-	uint16_t		ic_bintval;	/* beacon interval */
-	uint16_t		ic_lintval;	/* listen interval */
-	uint16_t		ic_holdover;	/* PM hold over duration */
-	uint16_t		ic_txpowlimit;	/* global tx power limit */
-	struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX];
-
-	/*
-	 * Channel state:
-	 *
-	 * ic_channels is the set of available channels for the device;
-	 *    it is setup by the driver
-	 * ic_nchans is the number of valid entries in ic_channels
-	 * ic_chan_avail is a bit vector of these channels used to check
-	 *    whether a channel is available w/o searching the channel table.
-	 * ic_chan_active is a (potentially) constrained subset of
-	 *    ic_chan_avail that reflects any mode setting or user-specified
-	 *    limit on the set of channels to use/scan
-	 * ic_curchan is the current channel the device is set to; it may
-	 *    be different from ic_bsschan when we are off-channel scanning
-	 *    or otherwise doing background work
-	 * ic_bsschan is the channel selected for operation; it may
-	 *    be undefined (IEEE80211_CHAN_ANYC)
-	 * ic_prevchan is a cached ``previous channel'' used to optimize
-	 *    lookups when switching back+forth between two channels
-	 *    (e.g. for dynamic turbo)
-	 */
-	int			ic_nchans;	/* # entries in ic_channels */
-	struct ieee80211_channel ic_channels[IEEE80211_CHAN_MAX];
-	uint8_t			ic_chan_avail[IEEE80211_CHAN_BYTES];
-	uint8_t			ic_chan_active[IEEE80211_CHAN_BYTES];
-	uint8_t			ic_chan_scan[IEEE80211_CHAN_BYTES];
-	struct ieee80211_channel *ic_curchan;	/* current channel */
-	const struct ieee80211_rate_table *ic_rt; /* table for ic_curchan */
-	struct ieee80211_channel *ic_bsschan;	/* bss channel */
-	struct ieee80211_channel *ic_prevchan;	/* previous channel */
-	struct ieee80211_regdomain ic_regdomain;/* regulatory data */
-	struct ieee80211_appie	*ic_countryie;	/* calculated country ie */
-	struct ieee80211_channel *ic_countryie_chan;
-
-	/* 802.11h/DFS state */
-	struct ieee80211_channel *ic_csa_newchan;/* channel for doing CSA */
-	short			ic_csa_mode;	/* mode for doing CSA */
-	short			ic_csa_count;	/* count for doing CSA */
-	struct ieee80211_dfs_state ic_dfs;	/* DFS state */
-
-	struct ieee80211_scan_state *ic_scan;	/* scan state */
-	int			ic_lastdata;	/* time of last data frame */
-	int			ic_lastscan;	/* time last scan completed */
-
-	/* NB: this is the union of all vap stations/neighbors */
-	int			ic_max_keyix;	/* max h/w key index */
-	struct ieee80211_node_table ic_sta;	/* stations/neighbors */
-	struct ieee80211_ageq	ic_stageq;	/* frame staging queue */
-	uint32_t		ic_hash_key;	/* random key for mac hash */
-
-	/* XXX multi-bss: split out common/vap parts */
-	struct ieee80211_wme_state ic_wme;	/* WME/WMM state */
-
-	/* XXX multi-bss: can per-vap be done/make sense? */
-	enum ieee80211_protmode	ic_protmode;	/* 802.11g protection mode */
-	uint16_t		ic_nonerpsta;	/* # non-ERP stations */
-	uint16_t		ic_longslotsta;	/* # long slot time stations */
-	uint16_t		ic_sta_assoc;	/* stations associated */
-	uint16_t		ic_ht_sta_assoc;/* HT stations associated */
-	uint16_t		ic_ht40_sta_assoc;/* HT40 stations associated */
-	uint8_t			ic_curhtprotmode;/* HTINFO bss state */
-	enum ieee80211_protmode	ic_htprotmode;	/* HT protection mode */
-	int			ic_lastnonerp;	/* last time non-ERP sta noted*/
-	int			ic_lastnonht;	/* last time non-HT sta noted */
-	uint8_t			ic_rxstream;    /* # RX streams */
-	uint8_t			ic_txstream;    /* # TX streams */
-
-	/* optional state for Atheros SuperG protocol extensions */
-	struct ieee80211_superg	*ic_superg;
-
-	/* radiotap handling */
-	struct ieee80211_radiotap_header *ic_th;/* tx radiotap headers */
-	void			*ic_txchan;	/* channel state in ic_th */
-	struct ieee80211_radiotap_header *ic_rh;/* rx radiotap headers */
-	void			*ic_rxchan;	/* channel state in ic_rh */
-	int			ic_montaps;	/* active monitor mode taps */
-
-	/* virtual ap create/delete */
-	struct ieee80211vap*	(*ic_vap_create)(struct ieee80211com *,
-				    const char [IFNAMSIZ], int,
-				    enum ieee80211_opmode, int,
-				    const uint8_t [IEEE80211_ADDR_LEN],
-				    const uint8_t [IEEE80211_ADDR_LEN]);
-	void			(*ic_vap_delete)(struct ieee80211vap *);
-	/* operating mode attachment */
-	ieee80211vap_attach	ic_vattach[IEEE80211_OPMODE_MAX];
-	/* return hardware/radio capabilities */
-	void			(*ic_getradiocaps)(struct ieee80211com *,
-				    int, int *, struct ieee80211_channel []);
-	/* check and/or prepare regdomain state change */
-	int			(*ic_setregdomain)(struct ieee80211com *,
-				    struct ieee80211_regdomain *,
-				    int, struct ieee80211_channel []);
-
-	int			(*ic_set_quiet)(struct ieee80211_node *,
-				    u_int8_t *quiet_elm);
-
-	/* send/recv 802.11 management frame */
-	int			(*ic_send_mgmt)(struct ieee80211_node *,
-				     int, int);
-	/* send raw 802.11 frame */
-	int			(*ic_raw_xmit)(struct ieee80211_node *,
-				    struct mbuf *,
-				    const struct ieee80211_bpf_params *);
-	/* update device state for 802.11 slot time change */
-	void			(*ic_updateslot)(struct ifnet *);
-	/* handle multicast state changes */
-	void			(*ic_update_mcast)(struct ifnet *);
-	/* handle promiscuous mode changes */
-	void			(*ic_update_promisc)(struct ifnet *);
-	/* new station association callback/notification */
-	void			(*ic_newassoc)(struct ieee80211_node *, int);
-	/* TDMA update notification */
-	void			(*ic_tdma_update)(struct ieee80211_node *,
-				    const struct ieee80211_tdma_param *, int);
-	/* node state management */
-	struct ieee80211_node*	(*ic_node_alloc)(struct ieee80211vap *,
-				    const uint8_t [IEEE80211_ADDR_LEN]);
-	void			(*ic_node_free)(struct ieee80211_node *);
-	void			(*ic_node_cleanup)(struct ieee80211_node *);
-	void			(*ic_node_age)(struct ieee80211_node *);
-	void			(*ic_node_drain)(struct ieee80211_node *);
-	int8_t			(*ic_node_getrssi)(const struct ieee80211_node*);
-	void			(*ic_node_getsignal)(const struct ieee80211_node*,
-				    int8_t *, int8_t *);
-	void			(*ic_node_getmimoinfo)(
-				    const struct ieee80211_node*,
-				    struct ieee80211_mimo_info *);
-	/* scanning support */
-	void			(*ic_scan_start)(struct ieee80211com *);
-	void			(*ic_scan_end)(struct ieee80211com *);
-	void			(*ic_set_channel)(struct ieee80211com *);
-	void			(*ic_scan_curchan)(struct ieee80211_scan_state *,
-				    unsigned long);
-	void			(*ic_scan_mindwell)(struct ieee80211_scan_state *);
-
-	/*
-	 * 802.11n ADDBA support.  A simple/generic implementation
-	 * of A-MPDU tx aggregation is provided; the driver may
-	 * override these methods to provide their own support.
-	 * A-MPDU rx re-ordering happens automatically if the
-	 * driver passes out-of-order frames to ieee80211_input
-	 * from an assocated HT station.
-	 */
-	int			(*ic_recv_action)(struct ieee80211_node *,
-				    const struct ieee80211_frame *,
-				    const uint8_t *frm, const uint8_t *efrm);
-	int			(*ic_send_action)(struct ieee80211_node *,
-				    int category, int action, void *);
-	/* check if A-MPDU should be enabled this station+ac */
-	int			(*ic_ampdu_enable)(struct ieee80211_node *,
-				    struct ieee80211_tx_ampdu *);
-	/* start/stop doing A-MPDU tx aggregation for a station */
-	int			(*ic_addba_request)(struct ieee80211_node *,
-				    struct ieee80211_tx_ampdu *,
-				    int dialogtoken, int baparamset,
-				    int batimeout);
-	int			(*ic_addba_response)(struct ieee80211_node *,
-				    struct ieee80211_tx_ampdu *,
-				    int status, int baparamset, int batimeout);
-	void			(*ic_addba_stop)(struct ieee80211_node *,
-				    struct ieee80211_tx_ampdu *);
-	void			(*ic_addba_response_timeout)(struct ieee80211_node *,
-				    struct ieee80211_tx_ampdu *);
-	/* BAR response received */
-	void			(*ic_bar_response)(struct ieee80211_node *,
-				    struct ieee80211_tx_ampdu *, int status);
-	/* start/stop doing A-MPDU rx processing for a station */
-	int			(*ic_ampdu_rx_start)(struct ieee80211_node *,
-				    struct ieee80211_rx_ampdu *, int baparamset,
-				    int batimeout, int baseqctl);
-	void			(*ic_ampdu_rx_stop)(struct ieee80211_node *,
-				    struct ieee80211_rx_ampdu *);
-
-	/* The channel width has changed (20<->2040) */
-	void			(*ic_update_chw)(struct ieee80211com *);
-
-	uint64_t		ic_spare[7];
-};
-
-struct ieee80211_aclator;
-struct ieee80211_tdma_state;
-struct ieee80211_mesh_state;
-struct ieee80211_hwmp_state;
-
-struct ieee80211vap {
-	struct ifmedia		iv_media;	/* interface media config */
-	struct ifnet		*iv_ifp;	/* associated device */
-	struct bpf_if		*iv_rawbpf;	/* packet filter structure */
-	struct sysctl_ctx_list	*iv_sysctl;	/* dynamic sysctl context */
-	struct sysctl_oid	*iv_oid;	/* net.wlan.X sysctl oid */
-
-	TAILQ_ENTRY(ieee80211vap) iv_next;	/* list of vap instances */
-	struct ieee80211com	*iv_ic;		/* back ptr to common state */
-	uint32_t		iv_debug;	/* debug msg flags */
-	struct ieee80211_stats	iv_stats;	/* statistics */
-
-	uint8_t			iv_myaddr[IEEE80211_ADDR_LEN];
-	uint32_t		iv_flags;	/* state flags */
-	uint32_t		iv_flags_ext;	/* extended state flags */
-	uint32_t		iv_flags_ht;	/* HT state flags */
-	uint32_t		iv_flags_ven;	/* vendor state flags */
-	uint32_t		iv_caps;	/* capabilities */
-	uint32_t		iv_htcaps;	/* HT capabilities */
-	uint32_t		iv_htextcaps;	/* HT extended capabilities */
-	enum ieee80211_opmode	iv_opmode;	/* operation mode */
-	enum ieee80211_state	iv_state;	/* state machine state */
-	enum ieee80211_state	iv_nstate;	/* pending state */
-	int			iv_nstate_arg;	/* pending state arg */
-	struct task		iv_nstate_task;	/* deferred state processing */
-	struct task		iv_swbmiss_task;/* deferred iv_bmiss call */
-	struct callout		iv_mgtsend;	/* mgmt frame response timer */
-						/* inactivity timer settings */
-	int			iv_inact_init;	/* setting for new station */
-	int			iv_inact_auth;	/* auth but not assoc setting */
-	int			iv_inact_run;	/* authorized setting */
-	int			iv_inact_probe;	/* inactive probe time */
-
-	int			iv_des_nssid;	/* # desired ssids */
-	struct ieee80211_scan_ssid iv_des_ssid[1];/* desired ssid table */
-	uint8_t			iv_des_bssid[IEEE80211_ADDR_LEN];
-	struct ieee80211_channel *iv_des_chan;	/* desired channel */
-	uint16_t		iv_des_mode;	/* desired mode */
-	int			iv_nicknamelen;	/* XXX junk */
-	uint8_t			iv_nickname[IEEE80211_NWID_LEN];
-	u_int			iv_bgscanidle;	/* bg scan idle threshold */
-	u_int			iv_bgscanintvl;	/* bg scan min interval */
-	u_int			iv_scanvalid;	/* scan cache valid threshold */
-	u_int			iv_scanreq_duration;
-	u_int			iv_scanreq_mindwell;
-	u_int			iv_scanreq_maxdwell;
-	uint16_t		iv_scanreq_flags;/* held scan request params */
-	uint8_t			iv_scanreq_nssid;
-	struct ieee80211_scan_ssid iv_scanreq_ssid[IEEE80211_SCAN_MAX_SSID];
-	/* sta-mode roaming state */
-	enum ieee80211_roamingmode iv_roaming;	/* roaming mode */
-	struct ieee80211_roamparam iv_roamparms[IEEE80211_MODE_MAX];
-
-	uint8_t			iv_bmissthreshold;
-	uint8_t			iv_bmiss_count;	/* current beacon miss count */
-	int			iv_bmiss_max;	/* max bmiss before scan */
-	uint16_t		iv_swbmiss_count;/* beacons in last period */
-	uint16_t		iv_swbmiss_period;/* s/w bmiss period */
-	struct callout		iv_swbmiss;	/* s/w beacon miss timer */
-
-	int			iv_ampdu_rxmax;	/* A-MPDU rx limit (bytes) */
-	int			iv_ampdu_density;/* A-MPDU density */
-	int			iv_ampdu_limit;	/* A-MPDU tx limit (bytes) */
-	int			iv_amsdu_limit;	/* A-MSDU tx limit (bytes) */
-	u_int			iv_ampdu_mintraffic[WME_NUM_AC];
-
-	uint32_t		*iv_aid_bitmap;	/* association id map */
-	uint16_t		iv_max_aid;
-	uint16_t		iv_sta_assoc;	/* stations associated */
-	uint16_t		iv_ps_sta;	/* stations in power save */
-	uint16_t		iv_ps_pending;	/* ps sta's w/ pending frames */
-	uint16_t		iv_txseq;	/* mcast xmit seq# space */
-	uint16_t		iv_tim_len;	/* ic_tim_bitmap size (bytes) */
-	uint8_t			*iv_tim_bitmap;	/* power-save stations w/ data*/
-	uint8_t			iv_dtim_period;	/* DTIM period */
-	uint8_t			iv_dtim_count;	/* DTIM count from last bcn */
-						/* set/unset aid pwrsav state */
-	uint8_t			iv_quiet;	/* Quiet Element */
-	uint8_t			iv_quiet_count;	/* constant count for Quiet Element */
-	uint8_t			iv_quiet_count_value;	/* variable count for Quiet Element */
-	uint8_t			iv_quiet_period;	/* period for Quiet Element */
-	uint16_t		iv_quiet_duration;	/* duration for Quiet Element */
-	uint16_t		iv_quiet_offset;	/* offset for Quiet Element */
-	int			iv_csa_count;	/* count for doing CSA */
-
-	struct ieee80211_node	*iv_bss;	/* information for this node */
-	struct ieee80211_txparam iv_txparms[IEEE80211_MODE_MAX];
-	uint16_t		iv_rtsthreshold;
-	uint16_t		iv_fragthreshold;
-	int			iv_inact_timer;	/* inactivity timer wait */
-	/* application-specified IE's to attach to mgt frames */
-	struct ieee80211_appie	*iv_appie_beacon;
-	struct ieee80211_appie	*iv_appie_probereq;
-	struct ieee80211_appie	*iv_appie_proberesp;
-	struct ieee80211_appie	*iv_appie_assocreq;
-	struct ieee80211_appie	*iv_appie_assocresp;
-	struct ieee80211_appie	*iv_appie_wpa;
-	uint8_t			*iv_wpa_ie;
-	uint8_t			*iv_rsn_ie;
-	uint16_t		iv_max_keyix;	/* max h/w key index */
-	ieee80211_keyix		iv_def_txkey;	/* default/group tx key index */
-	struct ieee80211_key	iv_nw_keys[IEEE80211_WEP_NKID];
-	int			(*iv_key_alloc)(struct ieee80211vap *,
-				    struct ieee80211_key *,
-				    ieee80211_keyix *, ieee80211_keyix *);
-	int			(*iv_key_delete)(struct ieee80211vap *, 
-				    const struct ieee80211_key *);
-	int			(*iv_key_set)(struct ieee80211vap *,
-				    const struct ieee80211_key *,
-				    const uint8_t mac[IEEE80211_ADDR_LEN]);
-	void			(*iv_key_update_begin)(struct ieee80211vap *);
-	void			(*iv_key_update_end)(struct ieee80211vap *);
-
-	const struct ieee80211_authenticator *iv_auth; /* authenticator glue */
-	void			*iv_ec;		/* private auth state */
-
-	const struct ieee80211_aclator *iv_acl;	/* acl glue */
-	void			*iv_as;		/* private aclator state */
-
-	const struct ieee80211_ratectl *iv_rate;
-	void			*iv_rs;		/* private ratectl state */
-
-	struct ieee80211_tdma_state *iv_tdma;	/* tdma state */
-	struct ieee80211_mesh_state *iv_mesh;	/* MBSS state */
-	struct ieee80211_hwmp_state *iv_hwmp;	/* HWMP state */
-
-	/* operate-mode detach hook */
-	void			(*iv_opdetach)(struct ieee80211vap *);
-	/* receive processing */
-	int			(*iv_input)(struct ieee80211_node *,
-				    struct mbuf *, int, int);
-	void			(*iv_recv_mgmt)(struct ieee80211_node *,
-				    struct mbuf *, int, int, int);
-	void			(*iv_recv_ctl)(struct ieee80211_node *,
-				    struct mbuf *, int);
-	void			(*iv_deliver_data)(struct ieee80211vap *,
-				    struct ieee80211_node *, struct mbuf *);
-#if 0
-	/* send processing */
-	int			(*iv_send_mgmt)(struct ieee80211_node *,
-				     int, int);
-#endif
-	/* beacon miss processing */
-	void			(*iv_bmiss)(struct ieee80211vap *);
-	/* reset device state after 802.11 parameter/state change */
-	int			(*iv_reset)(struct ieee80211vap *, u_long);
-	/* [schedule] beacon frame update */
-	void			(*iv_update_beacon)(struct ieee80211vap *, int);
-	/* power save handling */
-	void			(*iv_update_ps)(struct ieee80211vap *, int);
-	int			(*iv_set_tim)(struct ieee80211_node *, int);
-	void			(*iv_node_ps)(struct ieee80211_node *, int);
-	void			(*iv_sta_ps)(struct ieee80211vap *, int);
-	void			(*iv_recv_pspoll)(struct ieee80211_node *,
-				    struct mbuf *);
-
-	/* state machine processing */
-	int			(*iv_newstate)(struct ieee80211vap *,
-				    enum ieee80211_state, int);
-	/* 802.3 output method for raw frame xmit */
-#if __FreeBSD_version >= 1000031
-	int			(*iv_output)(struct ifnet *, struct mbuf *,
-				    const struct sockaddr *, struct route *);
-#else
-	int			(*iv_output)(struct ifnet *, struct mbuf *,
-				    struct sockaddr *, struct route *);
-#endif
-	uint64_t		iv_spare[6];
-};
-MALLOC_DECLARE(M_80211_VAP);
-
-#define	IEEE80211_ADDR_EQ(a1,a2)	(memcmp(a1,a2,IEEE80211_ADDR_LEN) == 0)
-#define	IEEE80211_ADDR_COPY(dst,src)	memcpy(dst,src,IEEE80211_ADDR_LEN)
-
-/* ic_flags/iv_flags */
-#define	IEEE80211_F_TURBOP	0x00000001	/* CONF: ATH Turbo enabled*/
-#define	IEEE80211_F_COMP	0x00000002	/* CONF: ATH comp enabled */
-#define	IEEE80211_F_FF		0x00000004	/* CONF: ATH FF enabled */
-#define	IEEE80211_F_BURST	0x00000008	/* CONF: bursting enabled */
-/* NB: this is intentionally setup to be IEEE80211_CAPINFO_PRIVACY */
-#define	IEEE80211_F_PRIVACY	0x00000010	/* CONF: privacy enabled */
-#define	IEEE80211_F_PUREG	0x00000020	/* CONF: 11g w/o 11b sta's */
-#define	IEEE80211_F_SCAN	0x00000080	/* STATUS: scanning */
-#define	IEEE80211_F_ASCAN	0x00000100	/* STATUS: active scan */
-#define	IEEE80211_F_SIBSS	0x00000200	/* STATUS: start IBSS */
-/* NB: this is intentionally setup to be IEEE80211_CAPINFO_SHORT_SLOTTIME */
-#define	IEEE80211_F_SHSLOT	0x00000400	/* STATUS: use short slot time*/
-#define	IEEE80211_F_PMGTON	0x00000800	/* CONF: Power mgmt enable */
-#define	IEEE80211_F_DESBSSID	0x00001000	/* CONF: des_bssid is set */
-#define	IEEE80211_F_WME		0x00002000	/* CONF: enable WME use */
-#define	IEEE80211_F_BGSCAN	0x00004000	/* CONF: bg scan enabled (???)*/
-#define	IEEE80211_F_SWRETRY	0x00008000	/* CONF: sw tx retry enabled */
-#define IEEE80211_F_TXPOW_FIXED	0x00010000	/* TX Power: fixed rate */
-#define	IEEE80211_F_IBSSON	0x00020000	/* CONF: IBSS creation enable */
-#define	IEEE80211_F_SHPREAMBLE	0x00040000	/* STATUS: use short preamble */
-#define	IEEE80211_F_DATAPAD	0x00080000	/* CONF: do alignment pad */
-#define	IEEE80211_F_USEPROT	0x00100000	/* STATUS: protection enabled */
-#define	IEEE80211_F_USEBARKER	0x00200000	/* STATUS: use barker preamble*/
-#define	IEEE80211_F_CSAPENDING	0x00400000	/* STATUS: chan switch pending*/
-#define	IEEE80211_F_WPA1	0x00800000	/* CONF: WPA enabled */
-#define	IEEE80211_F_WPA2	0x01000000	/* CONF: WPA2 enabled */
-#define	IEEE80211_F_WPA		0x01800000	/* CONF: WPA/WPA2 enabled */
-#define	IEEE80211_F_DROPUNENC	0x02000000	/* CONF: drop unencrypted */
-#define	IEEE80211_F_COUNTERM	0x04000000	/* CONF: TKIP countermeasures */
-#define	IEEE80211_F_HIDESSID	0x08000000	/* CONF: hide SSID in beacon */
-#define	IEEE80211_F_NOBRIDGE	0x10000000	/* CONF: dis. internal bridge */
-#define	IEEE80211_F_PCF		0x20000000	/* CONF: PCF enabled */
-#define	IEEE80211_F_DOTH	0x40000000	/* CONF: 11h enabled */
-#define	IEEE80211_F_DWDS	0x80000000	/* CONF: Dynamic WDS enabled */
-
-#define	IEEE80211_F_BITS \
-	"\20\1TURBOP\2COMP\3FF\4BURST\5PRIVACY\6PUREG\10SCAN\11ASCAN\12SIBSS" \
-	"\13SHSLOT\14PMGTON\15DESBSSID\16WME\17BGSCAN\20SWRETRY\21TXPOW_FIXED" \
-	"\22IBSSON\23SHPREAMBLE\24DATAPAD\25USEPROT\26USERBARKER\27CSAPENDING" \
-	"\30WPA1\31WPA2\32DROPUNENC\33COUNTERM\34HIDESSID\35NOBRIDG\36PCF" \
-	"\37DOTH\40DWDS"
-
-/* Atheros protocol-specific flags */
-#define	IEEE80211_F_ATHEROS \
-	(IEEE80211_F_FF | IEEE80211_F_COMP | IEEE80211_F_TURBOP)
-/* Check if an Atheros capability was negotiated for use */
-#define	IEEE80211_ATH_CAP(vap, ni, bit) \
-	((vap)->iv_flags & (ni)->ni_ath_flags & (bit))
-
-/* ic_flags_ext/iv_flags_ext */
-#define	IEEE80211_FEXT_INACT	 0x00000002	/* CONF: sta inact handling */
-#define	IEEE80211_FEXT_SCANWAIT	 0x00000004	/* STATUS: awaiting scan */
-/* 0x00000006 reserved */
-#define	IEEE80211_FEXT_BGSCAN	 0x00000008	/* STATUS: complete bgscan */
-#define	IEEE80211_FEXT_WPS	 0x00000010	/* CONF: WPS enabled */
-#define	IEEE80211_FEXT_TSN 	 0x00000020	/* CONF: TSN enabled */
-#define	IEEE80211_FEXT_SCANREQ	 0x00000040	/* STATUS: scan req params */
-#define	IEEE80211_FEXT_RESUME	 0x00000080	/* STATUS: start on resume */
-#define	IEEE80211_FEXT_4ADDR	 0x00000100	/* CONF: apply 4-addr encap */
-#define	IEEE80211_FEXT_NONERP_PR 0x00000200	/* STATUS: non-ERP sta present*/
-#define	IEEE80211_FEXT_SWBMISS	 0x00000400	/* CONF: do bmiss in s/w */
-#define	IEEE80211_FEXT_DFS	 0x00000800	/* CONF: DFS enabled */
-#define	IEEE80211_FEXT_DOTD	 0x00001000	/* CONF: 11d enabled */
-#define	IEEE80211_FEXT_STATEWAIT 0x00002000	/* STATUS: awaiting state chg */
-#define	IEEE80211_FEXT_REINIT	 0x00004000	/* STATUS: INIT state first */
-#define	IEEE80211_FEXT_BPF	 0x00008000	/* STATUS: BPF tap present */
-/* NB: immutable: should be set only when creating a vap */
-#define	IEEE80211_FEXT_WDSLEGACY 0x00010000	/* CONF: legacy WDS operation */
-#define	IEEE80211_FEXT_PROBECHAN 0x00020000	/* CONF: probe passive channel*/
-#define	IEEE80211_FEXT_UNIQMAC	 0x00040000	/* CONF: user or computed mac */
-
-#define	IEEE80211_FEXT_BITS \
-	"\20\2INACT\3SCANWAIT\4BGSCAN\5WPS\6TSN\7SCANREQ\10RESUME" \
-	"\0114ADDR\12NONEPR_PR\13SWBMISS\14DFS\15DOTD\16STATEWAIT\17REINIT" \
-	"\20BPF\21WDSLEGACY\22PROBECHAN\23UNIQMAC"
-
-/* ic_flags_ht/iv_flags_ht */
-#define	IEEE80211_FHT_NONHT_PR	 0x00000001	/* STATUS: non-HT sta present */
-#define	IEEE80211_FHT_GF  	 0x00040000	/* CONF: Greenfield enabled */
-#define	IEEE80211_FHT_HT	 0x00080000	/* CONF: HT supported */
-#define	IEEE80211_FHT_AMPDU_TX	 0x00100000	/* CONF: A-MPDU tx supported */
-#define	IEEE80211_FHT_AMPDU_RX	 0x00200000	/* CONF: A-MPDU rx supported */
-#define	IEEE80211_FHT_AMSDU_TX	 0x00400000	/* CONF: A-MSDU tx supported */
-#define	IEEE80211_FHT_AMSDU_RX	 0x00800000	/* CONF: A-MSDU rx supported */
-#define	IEEE80211_FHT_USEHT40	 0x01000000	/* CONF: 20/40 use enabled */
-#define	IEEE80211_FHT_PUREN	 0x02000000	/* CONF: 11n w/o legacy sta's */
-#define	IEEE80211_FHT_SHORTGI20	 0x04000000	/* CONF: short GI in HT20 */
-#define	IEEE80211_FHT_SHORTGI40	 0x08000000	/* CONF: short GI in HT40 */
-#define	IEEE80211_FHT_HTCOMPAT 	 0x10000000	/* CONF: HT vendor OUI's */
-#define	IEEE80211_FHT_RIFS  	 0x20000000	/* CONF: RIFS enabled */
-#define	IEEE80211_FHT_STBC_TX 	 0x40000000	/* CONF: STBC tx enabled */
-#define	IEEE80211_FHT_STBC_RX 	 0x80000000	/* CONF: STBC rx enabled */
-
-#define	IEEE80211_FHT_BITS \
-	"\20\1NONHT_PR" \
-	"\23GF\24HT\25AMPDU_TX\26AMPDU_TX" \
-	"\27AMSDU_TX\30AMSDU_RX\31USEHT40\32PUREN\33SHORTGI20\34SHORTGI40" \
-	"\35HTCOMPAT\36RIFS\37STBC_TX\40STBC_RX"
-
-#define	IEEE80211_FVEN_BITS	"\20"
-
-/* ic_caps/iv_caps: device driver capabilities */
-/* 0x2e available */
-#define	IEEE80211_C_STA		0x00000001	/* CAPABILITY: STA available */
-#define	IEEE80211_C_8023ENCAP	0x00000002	/* CAPABILITY: 802.3 encap */
-#define	IEEE80211_C_FF		0x00000040	/* CAPABILITY: ATH FF avail */
-#define	IEEE80211_C_TURBOP	0x00000080	/* CAPABILITY: ATH Turbo avail*/
-#define	IEEE80211_C_IBSS	0x00000100	/* CAPABILITY: IBSS available */
-#define	IEEE80211_C_PMGT	0x00000200	/* CAPABILITY: Power mgmt */
-#define	IEEE80211_C_HOSTAP	0x00000400	/* CAPABILITY: HOSTAP avail */
-#define	IEEE80211_C_AHDEMO	0x00000800	/* CAPABILITY: Old Adhoc Demo */
-#define	IEEE80211_C_SWRETRY	0x00001000	/* CAPABILITY: sw tx retry */
-#define	IEEE80211_C_TXPMGT	0x00002000	/* CAPABILITY: tx power mgmt */
-#define	IEEE80211_C_SHSLOT	0x00004000	/* CAPABILITY: short slottime */
-#define	IEEE80211_C_SHPREAMBLE	0x00008000	/* CAPABILITY: short preamble */
-#define	IEEE80211_C_MONITOR	0x00010000	/* CAPABILITY: monitor mode */
-#define	IEEE80211_C_DFS		0x00020000	/* CAPABILITY: DFS/radar avail*/
-#define	IEEE80211_C_MBSS	0x00040000	/* CAPABILITY: MBSS available */
-/* 0x7c0000 available */
-#define	IEEE80211_C_WPA1	0x00800000	/* CAPABILITY: WPA1 avail */
-#define	IEEE80211_C_WPA2	0x01000000	/* CAPABILITY: WPA2 avail */
-#define	IEEE80211_C_WPA		0x01800000	/* CAPABILITY: WPA1+WPA2 avail*/
-#define	IEEE80211_C_BURST	0x02000000	/* CAPABILITY: frame bursting */
-#define	IEEE80211_C_WME		0x04000000	/* CAPABILITY: WME avail */
-#define	IEEE80211_C_WDS		0x08000000	/* CAPABILITY: 4-addr support */
-/* 0x10000000 reserved */
-#define	IEEE80211_C_BGSCAN	0x20000000	/* CAPABILITY: bg scanning */
-#define	IEEE80211_C_TXFRAG	0x40000000	/* CAPABILITY: tx fragments */
-#define	IEEE80211_C_TDMA	0x80000000	/* CAPABILITY: TDMA avail */
-/* XXX protection/barker? */
-
-#define	IEEE80211_C_OPMODE \
-	(IEEE80211_C_STA | IEEE80211_C_IBSS | IEEE80211_C_HOSTAP | \
-	 IEEE80211_C_AHDEMO | IEEE80211_C_MONITOR | IEEE80211_C_WDS | \
-	 IEEE80211_C_TDMA | IEEE80211_C_MBSS)
-
-#define	IEEE80211_C_BITS \
-	"\20\1STA\002803ENCAP\7FF\10TURBOP\11IBSS\12PMGT" \
-	"\13HOSTAP\14AHDEMO\15SWRETRY\16TXPMGT\17SHSLOT\20SHPREAMBLE" \
-	"\21MONITOR\22DFS\23MBSS\30WPA1\31WPA2\32BURST\33WME\34WDS\36BGSCAN" \
-	"\37TXFRAG\40TDMA"
-
-/*
- * ic_htcaps/iv_htcaps: HT-specific device/driver capabilities
- *
- * NB: the low 16-bits are the 802.11 definitions, the upper
- *     16-bits are used to define s/w/driver capabilities.
- */
-#define	IEEE80211_HTC_AMPDU	0x00010000	/* CAPABILITY: A-MPDU tx */
-#define	IEEE80211_HTC_AMSDU	0x00020000	/* CAPABILITY: A-MSDU tx */
-/* NB: HT40 is implied by IEEE80211_HTCAP_CHWIDTH40 */
-#define	IEEE80211_HTC_HT	0x00040000	/* CAPABILITY: HT operation */
-#define	IEEE80211_HTC_SMPS	0x00080000	/* CAPABILITY: MIMO power save*/
-#define	IEEE80211_HTC_RIFS	0x00100000	/* CAPABILITY: RIFS support */
-#define	IEEE80211_HTC_RXUNEQUAL	0x00200000	/* CAPABILITY: RX unequal MCS */
-#define	IEEE80211_HTC_RXMCS32	0x00400000	/* CAPABILITY: MCS32 support */
-#define	IEEE80211_HTC_TXUNEQUAL	0x00800000	/* CAPABILITY: TX unequal MCS */
-#define	IEEE80211_HTC_TXMCS32	0x01000000	/* CAPABILITY: MCS32 suport */
-
-#define	IEEE80211_C_HTCAP_BITS \
-	"\20\1LDPC\2CHWIDTH40\5GREENFIELD\6SHORTGI20\7SHORTGI40\10TXSTBC" \
-	"\21AMPDU\22AMSDU\23HT\24SMPS\25RIFS"
-
-void	ieee80211_ifattach(struct ieee80211com *,
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-void	ieee80211_ifdetach(struct ieee80211com *);
-int	ieee80211_vap_setup(struct ieee80211com *, struct ieee80211vap *,
-		const char name[IFNAMSIZ], int unit,
-		enum ieee80211_opmode opmode, int flags,
-		const uint8_t bssid[IEEE80211_ADDR_LEN],
-		const uint8_t macaddr[IEEE80211_ADDR_LEN]);
-int	ieee80211_vap_attach(struct ieee80211vap *,
-		ifm_change_cb_t, ifm_stat_cb_t);
-void	ieee80211_vap_detach(struct ieee80211vap *);
-const struct ieee80211_rateset *ieee80211_get_suprates(struct ieee80211com *ic,
-		const struct ieee80211_channel *);
-void	ieee80211_announce(struct ieee80211com *);
-void	ieee80211_announce_channels(struct ieee80211com *);
-void	ieee80211_drain(struct ieee80211com *);
-void	ieee80211_media_init(struct ieee80211com *);
-struct ieee80211com *ieee80211_find_vap(const uint8_t mac[IEEE80211_ADDR_LEN]);
-int	ieee80211_media_change(struct ifnet *);
-void	ieee80211_media_status(struct ifnet *, struct ifmediareq *);
-int	ieee80211_ioctl(struct ifnet *, u_long, caddr_t);
-int	ieee80211_rate2media(struct ieee80211com *, int,
-		enum ieee80211_phymode);
-int	ieee80211_media2rate(int);
-int	ieee80211_mhz2ieee(u_int, u_int);
-int	ieee80211_chan2ieee(struct ieee80211com *,
-		const struct ieee80211_channel *);
-u_int	ieee80211_ieee2mhz(u_int, u_int);
-struct ieee80211_channel *ieee80211_find_channel(struct ieee80211com *,
-		int freq, int flags);
-struct ieee80211_channel *ieee80211_find_channel_byieee(struct ieee80211com *,
-		int ieee, int flags);
-int	ieee80211_setmode(struct ieee80211com *, enum ieee80211_phymode);
-enum ieee80211_phymode ieee80211_chan2mode(const struct ieee80211_channel *);
-uint32_t ieee80211_mac_hash(const struct ieee80211com *,
-		const uint8_t addr[IEEE80211_ADDR_LEN]);
-
-void	ieee80211_radiotap_attach(struct ieee80211com *,
-	    struct ieee80211_radiotap_header *th, int tlen,
-		uint32_t tx_radiotap,
-	    struct ieee80211_radiotap_header *rh, int rlen,
-		uint32_t rx_radiotap);
-void	ieee80211_radiotap_attachv(struct ieee80211com *,
-	    struct ieee80211_radiotap_header *th,
-	    int tlen, int n_tx_v, uint32_t tx_radiotap,
-	    struct ieee80211_radiotap_header *rh,
-	    int rlen, int n_rx_v, uint32_t rx_radiotap);
-void	ieee80211_radiotap_detach(struct ieee80211com *);
-void	ieee80211_radiotap_vattach(struct ieee80211vap *);
-void	ieee80211_radiotap_vdetach(struct ieee80211vap *);
-void	ieee80211_radiotap_chan_change(struct ieee80211com *);
-void	ieee80211_radiotap_tx(struct ieee80211vap *, struct mbuf *);
-void	ieee80211_radiotap_rx(struct ieee80211vap *, struct mbuf *);
-void	ieee80211_radiotap_rx_all(struct ieee80211com *, struct mbuf *);
-
-static __inline int
-ieee80211_radiotap_active(const struct ieee80211com *ic)
-{
-	return (ic->ic_flags_ext & IEEE80211_FEXT_BPF) != 0;
-}
-
-static __inline int
-ieee80211_radiotap_active_vap(const struct ieee80211vap *vap)
-{
-	return (vap->iv_flags_ext & IEEE80211_FEXT_BPF) ||
-	    vap->iv_ic->ic_montaps != 0;
-}
-
-/*
- * Enqueue a task on the state thread.
- */
-static __inline void
-ieee80211_runtask(struct ieee80211com *ic, struct task *task)
-{
-	taskqueue_enqueue(ic->ic_tq, task);
-}
-
-/*
- * Wait for a queued task to complete.
- */
-static __inline void
-ieee80211_draintask(struct ieee80211com *ic, struct task *task)
-{
-	taskqueue_drain(ic->ic_tq, task);
-}
-
-/* 
- * Key update synchronization methods.  XXX should not be visible.
- */
-static __inline void
-ieee80211_key_update_begin(struct ieee80211vap *vap)
-{
-	vap->iv_key_update_begin(vap);
-}
-static __inline void
-ieee80211_key_update_end(struct ieee80211vap *vap)
-{
-	vap->iv_key_update_end(vap);
-}
-
-/*
- * XXX these need to be here for IEEE80211_F_DATAPAD
- */
-
-/*
- * Return the space occupied by the 802.11 header and any
- * padding required by the driver.  This works for a
- * management or data frame.
- */
-static __inline int
-ieee80211_hdrspace(struct ieee80211com *ic, const void *data)
-{
-	int size = ieee80211_hdrsize(data);
-	if (ic->ic_flags & IEEE80211_F_DATAPAD)
-		size = roundup(size, sizeof(uint32_t));
-	return size;
-}
-
-/*
- * Like ieee80211_hdrspace, but handles any type of frame.
- */
-static __inline int
-ieee80211_anyhdrspace(struct ieee80211com *ic, const void *data)
-{
-	int size = ieee80211_anyhdrsize(data);
-	if (ic->ic_flags & IEEE80211_F_DATAPAD)
-		size = roundup(size, sizeof(uint32_t));
-	return size;
-}
-
-/*
- * Notify a vap that beacon state has been updated.
- */
-static __inline void
-ieee80211_beacon_notify(struct ieee80211vap *vap, int what)
-{
-	if (vap->iv_state == IEEE80211_S_RUN)
-		vap->iv_update_beacon(vap, what);
-}
-
-/*
- * Calculate HT channel promotion flags for a channel.
- * XXX belongs in ieee80211_ht.h but needs IEEE80211_FHT_*
- */
-static __inline int
-ieee80211_htchanflags(const struct ieee80211_channel *c)
-{
-	return IEEE80211_IS_CHAN_HT40(c) ?
-	    IEEE80211_FHT_HT | IEEE80211_FHT_USEHT40 :
-	    IEEE80211_IS_CHAN_HT(c) ?  IEEE80211_FHT_HT : 0;
-}
-
-/*
- * Fetch the current TX power (cap) for the given node.
- *
- * This includes the node and ic/vap TX power limit as needed,
- * but it doesn't take into account any per-rate limit.
- */
-static __inline uint16_t
-ieee80211_get_node_txpower(struct ieee80211_node *ni)
-{
-	struct ieee80211com *ic = ni->ni_ic;
-	uint16_t txpower;
-
-	txpower = ni->ni_txpower;
-	txpower = MIN(txpower, ic->ic_txpowlimit);
-	if (ic->ic_curchan != NULL) {
-		txpower = MIN(txpower, 2 * ic->ic_curchan->ic_maxregpower);
-		txpower = MIN(txpower, ic->ic_curchan->ic_maxpower);
-	}
-
-	return (txpower);
-}
-
-/*
- * Debugging facilities compiled in when IEEE80211_DEBUG is defined.
- *
- * The intent is that any problem in the net80211 layer can be
- * diagnosed by inspecting the statistics (dumped by the wlanstats
- * program) and/or the msgs generated by net80211.  Messages are
- * broken into functional classes and can be controlled with the
- * wlandebug program.  Certain of these msg groups are for facilities
- * that are no longer part of net80211 (e.g. IEEE80211_MSG_DOT1XSM).
- */
-#define	IEEE80211_MSG_11N	0x80000000	/* 11n mode debug */
-#define	IEEE80211_MSG_DEBUG	0x40000000	/* IFF_DEBUG equivalent */
-#define	IEEE80211_MSG_DUMPPKTS	0x20000000	/* IFF_LINK2 equivalant */
-#define	IEEE80211_MSG_CRYPTO	0x10000000	/* crypto work */
-#define	IEEE80211_MSG_INPUT	0x08000000	/* input handling */
-#define	IEEE80211_MSG_XRATE	0x04000000	/* rate set handling */
-#define	IEEE80211_MSG_ELEMID	0x02000000	/* element id parsing */
-#define	IEEE80211_MSG_NODE	0x01000000	/* node handling */
-#define	IEEE80211_MSG_ASSOC	0x00800000	/* association handling */
-#define	IEEE80211_MSG_AUTH	0x00400000	/* authentication handling */
-#define	IEEE80211_MSG_SCAN	0x00200000	/* scanning */
-#define	IEEE80211_MSG_OUTPUT	0x00100000	/* output handling */
-#define	IEEE80211_MSG_STATE	0x00080000	/* state machine */
-#define	IEEE80211_MSG_POWER	0x00040000	/* power save handling */
-#define	IEEE80211_MSG_HWMP	0x00020000	/* hybrid mesh protocol */
-#define	IEEE80211_MSG_DOT1XSM	0x00010000	/* 802.1x state machine */
-#define	IEEE80211_MSG_RADIUS	0x00008000	/* 802.1x radius client */
-#define	IEEE80211_MSG_RADDUMP	0x00004000	/* dump 802.1x radius packets */
-#define	IEEE80211_MSG_MESH	0x00002000	/* mesh networking */
-#define	IEEE80211_MSG_WPA	0x00001000	/* WPA/RSN protocol */
-#define	IEEE80211_MSG_ACL	0x00000800	/* ACL handling */
-#define	IEEE80211_MSG_WME	0x00000400	/* WME protocol */
-#define	IEEE80211_MSG_SUPERG	0x00000200	/* Atheros SuperG protocol */
-#define	IEEE80211_MSG_DOTH	0x00000100	/* 802.11h support */
-#define	IEEE80211_MSG_INACT	0x00000080	/* inactivity handling */
-#define	IEEE80211_MSG_ROAM	0x00000040	/* sta-mode roaming */
-#define	IEEE80211_MSG_RATECTL	0x00000020	/* tx rate control */
-#define	IEEE80211_MSG_ACTION	0x00000010	/* action frame handling */
-#define	IEEE80211_MSG_WDS	0x00000008	/* WDS handling */
-#define	IEEE80211_MSG_IOCTL	0x00000004	/* ioctl handling */
-#define	IEEE80211_MSG_TDMA	0x00000002	/* TDMA handling */
-
-#define	IEEE80211_MSG_ANY	0xffffffff	/* anything */
-
-#define	IEEE80211_MSG_BITS \
-	"\20\2TDMA\3IOCTL\4WDS\5ACTION\6RATECTL\7ROAM\10INACT\11DOTH\12SUPERG" \
-	"\13WME\14ACL\15WPA\16RADKEYS\17RADDUMP\20RADIUS\21DOT1XSM\22HWMP" \
-	"\23POWER\24STATE\25OUTPUT\26SCAN\27AUTH\30ASSOC\31NODE\32ELEMID" \
-	"\33XRATE\34INPUT\35CRYPTO\36DUPMPKTS\37DEBUG\04011N"
-
-#ifdef IEEE80211_DEBUG
-#define	ieee80211_msg(_vap, _m)	((_vap)->iv_debug & (_m))
-#define	IEEE80211_DPRINTF(_vap, _m, _fmt, ...) do {			\
-	if (ieee80211_msg(_vap, _m))					\
-		ieee80211_note(_vap, _fmt, __VA_ARGS__);		\
-} while (0)
-#define	IEEE80211_NOTE(_vap, _m, _ni, _fmt, ...) do {			\
-	if (ieee80211_msg(_vap, _m))					\
-		ieee80211_note_mac(_vap, (_ni)->ni_macaddr, _fmt, __VA_ARGS__);\
-} while (0)
-#define	IEEE80211_NOTE_MAC(_vap, _m, _mac, _fmt, ...) do {		\
-	if (ieee80211_msg(_vap, _m))					\
-		ieee80211_note_mac(_vap, _mac, _fmt, __VA_ARGS__);	\
-} while (0)
-#define	IEEE80211_NOTE_FRAME(_vap, _m, _wh, _fmt, ...) do {		\
-	if (ieee80211_msg(_vap, _m))					\
-		ieee80211_note_frame(_vap, _wh, _fmt, __VA_ARGS__);	\
-} while (0)
-void	ieee80211_note(const struct ieee80211vap *, const char *, ...);
-void	ieee80211_note_mac(const struct ieee80211vap *,
-		const uint8_t mac[IEEE80211_ADDR_LEN], const char *, ...);
-void	ieee80211_note_frame(const struct ieee80211vap *,
-		const struct ieee80211_frame *, const char *, ...);
-#define	ieee80211_msg_debug(_vap) \
-	((_vap)->iv_debug & IEEE80211_MSG_DEBUG)
-#define	ieee80211_msg_dumppkts(_vap) \
-	((_vap)->iv_debug & IEEE80211_MSG_DUMPPKTS)
-#define	ieee80211_msg_input(_vap) \
-	((_vap)->iv_debug & IEEE80211_MSG_INPUT)
-#define	ieee80211_msg_radius(_vap) \
-	((_vap)->iv_debug & IEEE80211_MSG_RADIUS)
-#define	ieee80211_msg_dumpradius(_vap) \
-	((_vap)->iv_debug & IEEE80211_MSG_RADDUMP)
-#define	ieee80211_msg_dumpradkeys(_vap) \
-	((_vap)->iv_debug & IEEE80211_MSG_RADKEYS)
-#define	ieee80211_msg_scan(_vap) \
-	((_vap)->iv_debug & IEEE80211_MSG_SCAN)
-#define	ieee80211_msg_assoc(_vap) \
-	((_vap)->iv_debug & IEEE80211_MSG_ASSOC)
-
-/*
- * Emit a debug message about discarding a frame or information
- * element.  One format is for extracting the mac address from
- * the frame header; the other is for when a header is not
- * available or otherwise appropriate.
- */
-#define	IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...) do {		\
-	if ((_vap)->iv_debug & (_m))					\
-		ieee80211_discard_frame(_vap, _wh, _type, _fmt, __VA_ARGS__);\
-} while (0)
-#define	IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...) do {	\
-	if ((_vap)->iv_debug & (_m))					\
-		ieee80211_discard_ie(_vap, _wh, _type, _fmt, __VA_ARGS__);\
-} while (0)
-#define	IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...) do {	\
-	if ((_vap)->iv_debug & (_m))					\
-		ieee80211_discard_mac(_vap, _mac, _type, _fmt, __VA_ARGS__);\
-} while (0)
-
-void ieee80211_discard_frame(const struct ieee80211vap *,
-	const struct ieee80211_frame *, const char *type, const char *fmt, ...);
-void ieee80211_discard_ie(const struct ieee80211vap *,
-	const struct ieee80211_frame *, const char *type, const char *fmt, ...);
-void ieee80211_discard_mac(const struct ieee80211vap *,
-	const uint8_t mac[IEEE80211_ADDR_LEN], const char *type,
-	const char *fmt, ...);
-#else
-#define	IEEE80211_DPRINTF(_vap, _m, _fmt, ...)
-#define	IEEE80211_NOTE(_vap, _m, _ni, _fmt, ...)
-#define	IEEE80211_NOTE_FRAME(_vap, _m, _wh, _fmt, ...)
-#define	IEEE80211_NOTE_MAC(_vap, _m, _mac, _fmt, ...)
-#define	ieee80211_msg_dumppkts(_vap)	0
-#define	ieee80211_msg(_vap, _m)		0
-
-#define	IEEE80211_DISCARD(_vap, _m, _wh, _type, _fmt, ...)
-#define	IEEE80211_DISCARD_IE(_vap, _m, _wh, _type, _fmt, ...)
-#define	IEEE80211_DISCARD_MAC(_vap, _m, _mac, _type, _fmt, ...)
-#endif
-
-#endif /* _NET80211_IEEE80211_VAR_H_ */
diff --git a/include.new/net80211/ieee80211_wds.h b/include.new/net80211/ieee80211_wds.h
deleted file mode 100644
index 3620f60..0000000
--- a/include.new/net80211/ieee80211_wds.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/net80211/ieee80211_wds.h 178354 2008-04-20 20:35:46Z sam $
- */
-#ifndef _NET80211_IEEE80211_WDS_H_
-#define _NET80211_IEEE80211_WDS_H_
-
-/*
- * WDS implementation definitions.
- */
-void	ieee80211_wds_attach(struct ieee80211com *);
-void	ieee80211_wds_detach(struct ieee80211com *);
-
-void	ieee80211_dwds_mcast(struct ieee80211vap *, struct mbuf *);
-void	ieee80211_dwds_discover(struct ieee80211_node *, struct mbuf *);
-int	ieee80211_node_wdsq_age(struct ieee80211_node *);
-#endif /* !_NET80211_IEEE80211_WDS_H_ */
diff --git a/include.new/netatalk/aarp.h b/include.new/netatalk/aarp.h
deleted file mode 100644
index a21dd21..0000000
--- a/include.new/netatalk/aarp.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1990,1991 Regents of The University of Michigan.
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of The University
- * of Michigan not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. This software is supplied as is without expressed or
- * implied warranties of any kind.
- *
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- *
- *	Research Systems Unix Group
- *	The University of Michigan
- *	c/o Wesley Craig
- *	535 W. William Street
- *	Ann Arbor, Michigan
- *	+1-313-764-2278
- *	netatalk@umich.edu
- *
- * $FreeBSD: releng/10.2/sys/netatalk/aarp.h 249925 2013-04-26 12:50:32Z glebius $
- */
-
-#ifndef _NETATALK_AARP_H_
-#define	_NETATALK_AARP_H_
-
-/*
- * This structure is used for both phase 1 and 2. Under phase 1
- * the net is not filled in. It is in phase 2. In both cases, the
- * hardware address length is (for some unknown reason) 4. If
- * anyone at Apple could program their way out of paper bag, it
- * would be 1 and 3 respectively for phase 1 and 2.
- */
-union aapa {
-	u_char ap_pa[4];
-	struct ap_node {
-		u_char an_zero;
-		u_char an_net[2];
-		u_char an_node;
-	} __packed ap_node;
-};
-
-struct ether_aarp {
-	struct arphdr eaa_hdr;
-	u_char aarp_sha[6];
-	union aapa aarp_spu;
-	u_char aarp_tha[6];
-	union aapa aarp_tpu;
-} __packed;
-
-#define	aarp_hrd	eaa_hdr.ar_hrd
-#define	aarp_pro	eaa_hdr.ar_pro
-#define	aarp_hln	eaa_hdr.ar_hln
-#define	aarp_pln	eaa_hdr.ar_pln
-#define	aarp_op		eaa_hdr.ar_op
-#define	aarp_spa	aarp_spu.ap_node.an_node
-#define	aarp_tpa	aarp_tpu.ap_node.an_node
-#define	aarp_spnet	aarp_spu.ap_node.an_net
-#define	aarp_tpnet	aarp_tpu.ap_node.an_net
-#define	aarp_spnode	aarp_spu.ap_node.an_node
-#define	aarp_tpnode	aarp_tpu.ap_node.an_node
-
-struct aarptab {
-	struct at_addr aat_ataddr;
-	u_char aat_enaddr[6];
-	u_char aat_timer;
-	u_char aat_flags;
-	struct mbuf *aat_hold;
-};
-
-#define	AARPHRD_ETHER	0x0001
-
-#define	AARPOP_REQUEST	0x01
-#define	AARPOP_RESPONSE	0x02
-#define	AARPOP_PROBE	0x03
-
-#ifdef _KERNEL
-struct aarptab		*aarptnew(const struct at_addr *);
-#endif
-
-#endif /* _NETATALK_AARP_H_ */
diff --git a/include.new/netatalk/at.h b/include.new/netatalk/at.h
deleted file mode 100644
index a2b2cee..0000000
--- a/include.new/netatalk/at.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1990,1991 Regents of The University of Michigan.
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of The University
- * of Michigan not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. This software is supplied as is without expressed or
- * implied warranties of any kind.
- *
- *	Research Systems Unix Group
- *	The University of Michigan
- *	c/o Mike Clark
- *	535 W. William Street
- *	Ann Arbor, Michigan
- *	+1-313-763-0525
- *	netatalk@itd.umich.edu
- *
- * $FreeBSD: releng/10.2/sys/netatalk/at.h 165972 2007-01-12 13:18:08Z rwatson $
- */
-
-#ifndef _NETATALK_AT_H_
-#define	_NETATALK_AT_H_
-
-/*
- * Supported protocols
- */
-#define	ATPROTO_DDP	0
-#define	ATPROTO_AARP	254
-
-#define	DDP_MAXSZ	587
-
-/*
- * If ATPORT_FIRST <= Port < ATPORT_RESERVED, the port was created by a
- * privileged process.
- *
- * If ATPORT_RESERVED <= Port < ATPORT_LAST, the port was not necessarily
- * created by a privileged process.
- */
-#define	ATPORT_FIRST	1
-#define	ATPORT_RESERVED	128
-#define	ATPORT_LAST	255
-
-/*
- * AppleTalk address.
- */
-struct at_addr {
-	u_short	s_net;
-	u_char	s_node;
-};
-
-#define	ATADDR_ANYNET	(u_short)0x0000
-#define	ATADDR_ANYNODE	(u_char)0x00
-#define	ATADDR_ANYPORT	(u_char)0x00
-#define	ATADDR_BCAST	(u_char)0xff	/* There is no BCAST for NET. */
-
-struct netrange {
-	u_char	nr_phase;
-	u_short	nr_firstnet;
-	u_short	nr_lastnet;
-};
-
-/*
- * Socket address, AppleTalk style.  We keep magic information in the zero
- * bytes.  There are three types, NONE, CONFIG which has the phase and a net
- * range, and IFACE which has the network address of an interface.  IFACE may
- * be filled in by the client, and is filled in by the kernel.
- */
-struct sockaddr_at {
-	u_char		sat_len;
-	u_char		sat_family;
-	u_char		sat_port;
-	struct at_addr	sat_addr;
-	union {
-		struct netrange	r_netrange;
-		char		r_zero[8];	/* Hide struct netrange here. */
-	} sat_range;
-};
-
-#define	sat_zero	sat_range.r_zero
-
-#endif /* !_NETATALK_AT_H_ */
diff --git a/include.new/netatalk/at_extern.h b/include.new/netatalk/at_extern.h
deleted file mode 100644
index 779ac93..0000000
--- a/include.new/netatalk/at_extern.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1990,1994 Regents of The University of Michigan.
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of The University
- * of Michigan not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. This software is supplied as is without expressed or
- * implied warranties of any kind.
- *
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- *
- *	Research Systems Unix Group
- *	The University of Michigan
- *	c/o Wesley Craig
- *	535 W. William Street
- *	Ann Arbor, Michigan
- *	+1-313-764-2278
- *	netatalk@umich.edu
- *
- * $FreeBSD: releng/10.2/sys/netatalk/at_extern.h 249925 2013-04-26 12:50:32Z glebius $
- */
-
-#ifndef _NETATALK_AT_EXTERN_H_
-#define	_NETATALK_AT_EXTERN_H_
-
-extern struct mtx	aarptab_mtx;
-
-#define	AARPTAB_LOCK()		mtx_lock(&aarptab_mtx)
-#define	AARPTAB_UNLOCK()	mtx_unlock(&aarptab_mtx)
-#define	AARPTAB_LOCK_ASSERT()	mtx_assert(&aarptab_mtx, MA_OWNED)
-#define	AARPTAB_UNLOCK_ASSERT()	mtx_assert(&aarptab_mtx, MA_NOTOWNED)
-
-struct at_ifaddr;
-struct ifnet;
-struct mbuf;
-struct route;
-struct thread;
-struct sockaddr_at;
-struct socket;
-void		 aarpintr(struct mbuf *);
-void		 aarpprobe(void *arg);
-int		 aarpresolve(struct ifnet *, struct mbuf *,
-		    const struct sockaddr_at *, u_char *);
-void		 aarp_clean(void);
-void		 at1intr(struct mbuf *);
-void		 at2intr(struct mbuf *);
-int		 at_broadcast(const struct sockaddr_at  *);
-u_short		 at_cksum(struct mbuf *m, int skip);
-int		 at_control(struct socket *so, u_long cmd, caddr_t data,
-		    struct ifnet *ifp, struct thread *td);
-struct at_ifaddr	*at_ifawithnet(const struct sockaddr_at *);
-struct at_ifaddr	*at_ifawithnet_locked(const struct sockaddr_at  *sat);
-
-int		 at_inithead(void**, int);
-void		 ddp_init(void);
-int		 ddp_output(struct mbuf *m, struct socket *so); 
-int		 ddp_route(struct mbuf *m, struct route *ro);
-struct ddpcb	*ddp_search(struct sockaddr_at *, struct sockaddr_at *,
-		    struct at_ifaddr *);
-
-#endif /* !_NETATALK_AT_EXTERN_H_ */
diff --git a/include.new/netatalk/at_var.h b/include.new/netatalk/at_var.h
deleted file mode 100644
index 0082ae9..0000000
--- a/include.new/netatalk/at_var.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991 Regents of The University of Michigan.
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of The University
- * of Michigan not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. This software is supplied as is without expressed or
- * implied warranties of any kind.
- *
- *	Research Systems Unix Group
- *	The University of Michigan
- *	c/o Mike Clark
- *	535 W. William Street
- *	Ann Arbor, Michigan
- *	+1-313-763-0525
- *	netatalk@itd.umich.edu
- *
- * $FreeBSD: releng/10.2/sys/netatalk/at_var.h 194913 2009-06-24 21:36:09Z rwatson $
- */
-
-#ifndef _NETATALK_AT_VAR_H_
-#define	_NETATALK_AT_VAR_H_
-
-/*
- * For phase2, we need to keep not only our address on an interface, but also
- * the legal networks on the interface.
- */
-struct at_ifaddr {
-	struct ifaddr		 aa_ifa;
-	struct sockaddr_at	 aa_addr;
-	struct sockaddr_at	 aa_broadaddr;
-	struct sockaddr_at	 aa_netmask;
-	int			 aa_flags;
-	u_short			 aa_firstnet;
-	u_short			 aa_lastnet;
-	int			 aa_probcnt;
-	struct callout		 aa_callout;
-	TAILQ_ENTRY(at_ifaddr)	 aa_link;
-};
-#define	aa_ifp		aa_ifa.ifa_ifp
-#define	aa_dstaddr	aa_broadaddr;
-
-TAILQ_HEAD(at_ifaddrhead, at_ifaddr);
-
-struct at_aliasreq {
-	char			ifra_name[IFNAMSIZ];
-	struct sockaddr_at	ifra_addr;
-	struct sockaddr_at	ifra_broadaddr;
-	struct sockaddr_at	ifra_mask;
-};
-#define	ifra_dstaddr	ifra_broadaddr
-
-#define	AA_SAT(aa)	(&(aa->aa_addr))
-#define	satosat(sa)	((struct sockaddr_at *)(sa))
-
-#define	AFA_ROUTE	0x0001
-#define	AFA_PROBING	0x0002
-#define	AFA_PHASE2	0x0004
-
-#ifdef _KERNEL
-extern struct rwlock		at_ifaddr_rw;
-extern struct at_ifaddrhead	at_ifaddrhead;
-
-#define	AT_IFADDR_LOCK_INIT()	rw_init(&at_ifaddr_rw, "at_ifaddr_rw")
-#define	AT_IFADDR_LOCK_ASSERT()	rw_assert(&at_ifaddr_rw, RA_LOCKED)
-#define	AT_IFADDR_RLOCK()	rw_rlock(&at_ifaddr_rw)
-#define	AT_IFADDR_RUNLOCK()	rw_runlock(&at_ifaddr_rw)
-#define	AT_IFADDR_WLOCK()	rw_wlock(&at_ifaddr_rw)
-#define	AT_IFADDR_WUNLOCK()	rw_wunlock(&at_ifaddr_rw)
-#endif
-
-#endif /* _NETATALK_AT_VAR_H_ */
diff --git a/include.new/netatalk/ddp.h b/include.new/netatalk/ddp.h
deleted file mode 100644
index 800b61f..0000000
--- a/include.new/netatalk/ddp.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991 Regents of The University of Michigan.
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of The University
- * of Michigan not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. This software is supplied as is without expressed or
- * implied warranties of any kind.
- *
- *	Research Systems Unix Group
- *	The University of Michigan
- *	c/o Mike Clark
- *	535 W. William Street
- *	Ann Arbor, Michigan
- *	+1-313-763-0525
- *	netatalk@itd.umich.edu
- *
- * $FreeBSD: releng/10.2/sys/netatalk/ddp.h 171078 2007-06-28 12:54:58Z rwatson $
- */
-
-#ifndef _NETATALK_DDP_H_
-#define	_NETATALK_DDP_H_
-
-/*-
- * <-1byte(8bits) ->
- * +---------------+
- * | 0 | hopc  |len|
- * +---------------+
- * | len (cont)    |
- * +---------------+
- * |               |
- * +- DDP csum    -+
- * |               |
- * +---------------+
- * |               |
- * +- Dest NET    -+
- * |               |
- * +---------------+
- * |               |
- * +- Src NET     -+
- * |               |
- * +---------------+
- * | Dest NODE     |
- * +---------------+
- * | Src NODE      |
- * +---------------+
- * | Dest PORT     |
- * +---------------+
- * | Src PORT      |
- * +---------------+
- *
- * On Apples, there is also a ddp_type field, after src_port.  However, under
- * this unix implementation, user level processes need to be able to set the
- * ddp_type.  In later revisions, the ddp_type may only be available in a
- * raw_appletalk interface.
- */
-
-struct elaphdr {
-	u_char	el_dnode;
-	u_char	el_snode;
-	u_char	el_type;
-} __packed;
-
-#define	SZ_ELAPHDR	3
-
-#define	ELAP_DDPSHORT	0x01
-#define	ELAP_DDPEXTEND	0x02
-
-/*
- * Extended DDP header. Includes sickness for dealing with arbitrary
- * bitfields on a little-endian arch.
- */
-struct ddpehdr {
-	union {
-		struct {
-#if BYTE_ORDER == BIG_ENDIAN
-			unsigned	dub_pad:2;
-			unsigned	dub_hops:4;
-			unsigned	dub_len:10;
-			unsigned	dub_sum:16;
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-			unsigned	dub_sum:16;
-			unsigned	dub_len:10;
-			unsigned	dub_hops:4;
-			unsigned	dub_pad:2;
-#endif
-		} __packed du_bits;
-		unsigned	du_bytes;
-	} deh_u;
-	u_short	deh_dnet;
-	u_short	deh_snet;
-	u_char	deh_dnode;
-	u_char	deh_snode;
-	u_char	deh_dport;
-	u_char	deh_sport;
-} __packed;
-#define	deh_pad		deh_u.du_bits.dub_pad
-#define	deh_hops	deh_u.du_bits.dub_hops
-#define	deh_len		deh_u.du_bits.dub_len
-#define	deh_sum		deh_u.du_bits.dub_sum
-#define	deh_bytes	deh_u.du_bytes
-
-#define	DDP_MAXHOPS	15
-
-struct ddpshdr {
-	union {
-		struct {
-#if BYTE_ORDER == BIG_ENDIAN
-			unsigned	dub_pad:6;
-			unsigned	dub_len:10;
-			unsigned	dub_dport:8;
-			unsigned	dub_sport:8;
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-			unsigned	dub_sport:8;
-			unsigned	dub_dport:8;
-			unsigned	dub_len:10;
-			unsigned	dub_pad:6;
-#endif
-		} __packed du_bits;
-		unsigned	du_bytes;
-	} dsh_u;
-} __packed;
-
-#define	dsh_pad		dsh_u.du_bits.dub_pad
-#define	dsh_len		dsh_u.du_bits.dub_len
-#define	dsh_dport	dsh_u.du_bits.dub_dport
-#define	dsh_sport	dsh_u.du_bits.dub_sport
-#define	dsh_bytes	dsh_u.du_bytes
-
-#endif /* _NETATALK_DDP_H_ */
diff --git a/include.new/netatalk/ddp_pcb.h b/include.new/netatalk/ddp_pcb.h
deleted file mode 100644
index f6262fe..0000000
--- a/include.new/netatalk/ddp_pcb.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * Copyright (c) 2004 Robert N. M. Watson
- * 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.
- *
- * 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.
- *
- * Copyright (c) 1990, 1994 Regents of The University of Michigan.
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of The University
- * of Michigan not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. This software is supplied as is without expressed or
- * implied warranties of any kind.
- *
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- *
- *	Research Systems Unix Group
- *	The University of Michigan
- *	c/o Wesley Craig
- *	535 W. William Street
- *	Ann Arbor, Michigan
- *	+1-313-764-2278
- *	netatalk@umich.edu
- *
- * $FreeBSD: releng/10.2/sys/netatalk/ddp_pcb.h 165974 2007-01-12 15:07:51Z rwatson $
- */
-
-#ifndef _NETATALK_DDP_PCB_H_
-#define	_NETATALK_DDP_PCB_H_
-
-int	at_pcballoc(struct socket *so);
-int	at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, 
-	    struct thread *td);
-void	at_pcbdetach(struct socket *so, struct ddpcb *ddp);
-void	at_pcbdisconnect(struct ddpcb *ddp);
-int	at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr,
-	    struct thread *td);
-void	at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr);
-
-/* Lock macros for per-pcb locks. */
-#define	DDP_LOCK_INIT(ddp)	mtx_init(&(ddp)->ddp_mtx, "ddp_mtx",	\
-				    NULL, MTX_DEF)
-#define	DDP_LOCK_DESTROY(ddp)	mtx_destroy(&(ddp)->ddp_mtx)
-#define	DDP_LOCK(ddp)		mtx_lock(&(ddp)->ddp_mtx)
-#define	DDP_UNLOCK(ddp)		mtx_unlock(&(ddp)->ddp_mtx)
-#define	DDP_LOCK_ASSERT(ddp)	mtx_assert(&(ddp)->ddp_mtx, MA_OWNED)
-
-/* Lock macros for global pcb list lock. */
-#define	DDP_LIST_LOCK_INIT()	mtx_init(&ddp_list_mtx, "ddp_list_mtx",	\
-				    NULL, MTX_DEF)
-#define	DDP_LIST_LOCK_DESTROY()	mtx_destroy(&ddp_list_mtx)
-#define	DDP_LIST_XLOCK()	mtx_lock(&ddp_list_mtx)
-#define	DDP_LIST_XUNLOCK()	mtx_unlock(&ddp_list_mtx)
-#define	DDP_LIST_XLOCK_ASSERT()	mtx_assert(&ddp_list_mtx, MA_OWNED)
-#define	DDP_LIST_SLOCK()	mtx_lock(&ddp_list_mtx)
-#define	DDP_LIST_SUNLOCK()	mtx_unlock(&ddp_list_mtx)
-#define	DDP_LIST_SLOCK_ASSERT()	mtx_assert(&ddp_list_mtx, MA_OWNED)
-
-#endif /* !_NETATALK_DDP_PCB_H_ */
diff --git a/include.new/netatalk/ddp_var.h b/include.new/netatalk/ddp_var.h
deleted file mode 100644
index 7d0143c..0000000
--- a/include.new/netatalk/ddp_var.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1990, 1994 Regents of The University of Michigan.
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of The University
- * of Michigan not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. This software is supplied as is without expressed or
- * implied warranties of any kind.
- *
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- *
- *	Research Systems Unix Group
- *	The University of Michigan
- *	c/o Wesley Craig
- *	535 W. William Street
- *	Ann Arbor, Michigan
- *	+1-313-764-2278
- *	netatalk@umich.edu
- *
- * $FreeBSD: releng/10.2/sys/netatalk/ddp_var.h 165974 2007-01-12 15:07:51Z rwatson $
- */
-
-#ifndef _NETATALK_DDP_VAR_H_
-#define	_NETATALK_DDP_VAR_H_
-
-struct ddpcb {
-	struct sockaddr_at	 ddp_fsat, ddp_lsat;
-	struct route		 ddp_route;
-	struct socket		*ddp_socket;
-	struct ddpcb		*ddp_prev, *ddp_next;
-	struct ddpcb		*ddp_pprev, *ddp_pnext;
-	struct mtx		 ddp_mtx;
-};
-
-#define	sotoddpcb(so)	((struct ddpcb *)(so)->so_pcb)
-
-struct ddpstat {
-	long	ddps_short;		/* short header packets received */
-	long	ddps_long;		/* long header packets received */
-	long	ddps_nosum;		/* no checksum */
-	long	ddps_badsum;		/* bad checksum */
-	long	ddps_tooshort;		/* packet too short */
-	long	ddps_toosmall;		/* not enough data */
-	long	ddps_forward;		/* packets forwarded */
-	long	ddps_encap;		/* packets encapsulated */
-	long	ddps_cantforward;	/* packets rcvd for unreachable dest */
-	long	ddps_nosockspace;	/* no space in sockbuf for packet */
-};
-
-#ifdef _KERNEL
-extern int			 ddp_cksum;
-extern struct ddpcb		*ddpcb_list;
-extern struct pr_usrreqs	 ddp_usrreqs;
-extern struct mtx		 ddp_list_mtx;
-#endif
-
-#endif /* _NETATALK_DDP_VAR_H_ */
diff --git a/include.new/netatalk/endian.h b/include.new/netatalk/endian.h
deleted file mode 100644
index ea4f425..0000000
--- a/include.new/netatalk/endian.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-
- * Copyright (c) 1990,1991 Regents of The University of Michigan.
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of The University
- * of Michigan not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. This software is supplied as is without expressed or
- * implied warranties of any kind.
- *
- *	Research Systems Unix Group
- *	The University of Michigan
- *	c/o Mike Clark
- *	535 W. William Street
- *	Ann Arbor, Michigan
- *	+1-313-763-0525
- *	netatalk@itd.umich.edu
- *
- * $FreeBSD: releng/10.2/sys/netatalk/endian.h 139827 2005-01-07 02:35:34Z imp $
- */
-
-#ifndef _ATALK_ENDIAN_H_
-#define _ATALK_ENDIAN_H_
-
-#include <machine/endian.h>
-
-#endif /* !_ATALK_ENDIAN_H_ */
diff --git a/include.new/netatalk/phase2.h b/include.new/netatalk/phase2.h
deleted file mode 100644
index 140afcd..0000000
--- a/include.new/netatalk/phase2.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * Copyright (c) 1990,1991 Regents of The University of Michigan.
- * All Rights Reserved.
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear
- * in supporting documentation, and that the name of The University
- * of Michigan not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission. This software is supplied as is without expressed or
- * implied warranties of any kind.
- *
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- *
- *	Research Systems Unix Group
- *	The University of Michigan
- *	c/o Wesley Craig
- *	535 W. William Street
- *	Ann Arbor, Michigan
- *	+1-313-764-2278
- *	netatalk@umich.edu
- * $FreeBSD: releng/10.2/sys/netatalk/phase2.h 139827 2005-01-07 02:35:34Z imp $
- */
-
-#include <net/if_llc.h>
-
-#define llc_org_code llc_un.type_snap.org_code
-#define llc_ether_type llc_un.type_snap.ether_type
-
-#define SIOCPHASE1	_IOW('i', 100, struct ifreq)	/* AppleTalk phase 1 */
-#define SIOCPHASE2	_IOW('i', 101, struct ifreq)	/* AppleTalk phase 2 */
diff --git a/include.new/netatm/atm.h b/include.new/netatm/atm.h
deleted file mode 100644
index 9541922..0000000
--- a/include.new/netatm/atm.h
+++ /dev/null
@@ -1,649 +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: src/sys/netatm/atm.h,v 1.6 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * ATM address family definitions
- *
- */
-
-#ifndef _NETATM_ATM_H
-#define _NETATM_ATM_H
-
-
-/*
- * The definitions in this file are intended to conform to the 
- * specifications defined in:
- *
- *	The Open Group, Networking Services (XNS) Issue 5
- *
- *	ATM Transport Protocol Information for Sockets
- *
- * which is Copyright (c) 1997, The Open Group.
- *
- * All extensions contained in this file to the base specification 
- * are denoted with a comment string of "XNS_EXT".
- */
-
-/*
- * ATM socket protocols
- */
-#define	ATM_PROTO_AAL5		0x5301	/* AAL type 5 protocol */
-#define	ATM_PROTO_SSCOP		0x5302	/* SSCOP protocol      */
-
-
-/*
- * ATM address defintions
- */
-/*
- * General format of an ATM address
- */
-#define	ATM_ADDR_LEN	20		/* Size of address field (XNS_EXT) */
-
-struct t_atm_addr {
-	int8_t		address_format;	/* Address format (see below) */
-	u_int8_t	address_length;	/* Length of address field */
-	u_int8_t	address[ATM_ADDR_LEN];	/* Address field */
-};
-typedef struct t_atm_addr	Atm_addr;	/* XNS_EXT */
-
-/*
- * ATM address formats
- */
-#define	T_ATM_ABSENT		(-1)	/* No address present */
-#define	T_ATM_ENDSYS_ADDR	1	/* ATM Endsystem */
-#define	T_ATM_NSAP_ADDR		1	/* NSAP */
-#define	T_ATM_E164_ADDR		2	/* E.164 */
-#define	T_ATM_SPANS_ADDR	3	/* FORE SPANS (XNS_EXT) */
-#define	T_ATM_PVC_ADDR		4	/* PVC (VPI,VCI) (XNS_EXT) */
-
-/*
- * ATM Endsystem / NSAP address format
- */
-struct atm_addr_nsap {			/* XNS_EXT */
-	u_char		aan_afi;	/* Authority and Format Identifier */
-					/* (see below) */
-	u_char		aan_afspec[12];	/* AFI specific fields */
-	u_char		aan_esi[6];	/* End System Identifier */
-	u_char		aan_sel;	/* Selector */
-};
-typedef struct atm_addr_nsap	Atm_addr_nsap;
-
-/*
- * AFI codes
- */
-#define	AFI_DCC		0x39		/* DCC ATM Format (XNS_EXT) */
-#define	AFI_ICD		0x47		/* ICD ATM Format (XNS_EXT) */
-#define	AFI_E164	0x45		/* E.164 ATM Format (XNS_EXT) */
-
-/*
- * E.164 address format
- */
-struct atm_addr_e164 {			/* XNS_EXT */
-	u_char		aae_addr[15];	/* E.164 address */
-};
-typedef struct atm_addr_e164	Atm_addr_e164;
-
-/*
- * SPANS address format
- */
-struct atm_addr_spans {			/* XNS_EXT */
-	u_char		aas_addr[8];	/* See SPANS code for specific fields */
-};
-typedef struct atm_addr_spans	Atm_addr_spans;
-
-/*
- * PVC address format
- */
-struct atm_addr_pvc {			/* XNS_EXT */
-	u_int8_t	aap_vpi[2];	/* VPI */
-	u_int8_t	aap_vci[2];	/* VCI */
-};
-typedef struct atm_addr_pvc	Atm_addr_pvc;
-
-#define	ATM_PVC_GET_VPI(addr)		/* XNS_EXT */		\
-	((u_int16_t)(((addr)->aap_vpi[0] << 8) | (addr)->aap_vpi[1]))
-#define	ATM_PVC_GET_VCI(addr)		/* XNS_EXT */		\
-	((u_int16_t)(((addr)->aap_vci[0] << 8) | (addr)->aap_vci[1]))
-#define	ATM_PVC_SET_VPI(addr,vpi) {	/* XNS_EXT */		\
-	(addr)->aap_vpi[0] = ((vpi) >> 8) & 0xff;		\
-	(addr)->aap_vpi[1] = (vpi) & 0xff;			\
-}
-#define	ATM_PVC_SET_VCI(addr,vci) {	/* XNS_EXT */		\
-	(addr)->aap_vci[0] = ((vci) >> 8) & 0xff;		\
-	(addr)->aap_vci[1] = (vci) & 0xff;			\
-}
-
-
-/*
- * ATM service access point (SAP)
- *
- * A SAP address consists of SAP Vector Elements (SVE).  Each SVE consists 
- * of the following fields:
- * 	o tag - defines the interpretation of the SVE;
- * 	o length - the length of the SVE value field;
- * 	o value - the value associated with the SVE;
- *
- * All of the possible SAP field values are either defined below
- * or in the corresponding option value definitions.
- */
-
-/*
- * ATM Address and Selector SVE
- */
-struct t_atm_sap_addr {
-	int8_t		SVE_tag_addr;	/* SVE tag (address) */
-	int8_t		SVE_tag_selector; /* SVE tag (selector) */
-					/* Address/selector value */
-	int8_t		address_format;	/* Address format */
-	u_int8_t	address_length;	/* Length of address field */
-	u_int8_t	address[ATM_ADDR_LEN];	/* Address field */
-};
-
-/*
- * B-LLI Layer 2 SVE
- */
-struct t_atm_sap_layer2 {
-	int8_t		SVE_tag;	/* SVE tag */
-	u_int8_t	ID_type;	/* Layer 2 protocol discriminator */
-	union {				/* Layer 2 protocol */
-		u_int8_t	simple_ID;	/* ITU */
-		u_int8_t	user_defined_ID;/* User-defined */
-	} ID;
-};
-
-/*
- * B-LLI Layer 3 SVE
- */
-struct t_atm_sap_layer3 {
-	int8_t		SVE_tag;	/* SVE tag */
-	u_int8_t	ID_type;	/* Layer 3 protocol discriminator */
-	union {				/* Layer 3 protocol */
-		u_int8_t	simple_ID;	/* ITU */
-		u_int8_t	IPI_ID;		/* ISO IPI */
-		struct {			/* IEEE 802.1 SNAP ID */
-			u_int8_t	OUI[3];
-			u_int8_t	PID[2];
-		} SNAP_ID;
-		u_int8_t	user_defined_ID;/* User-defined */
-	} ID;
-};
-
-/*
- * B_HLI SVE
- */
-struct t_atm_sap_appl {
-	int8_t		SVE_tag;	/* SVE tag */
-	u_int8_t	ID_type;	/* High Layer type discriminator */
-	union {				/* High Layer type */
-		u_int8_t	ISO_ID[8];	/* ISO */
-		struct {			/* Vendor-specific */
-			u_int8_t	OUI[3];
-			u_int8_t	app_ID[4];
-		} vendor_ID;
-		u_int8_t	user_defined_ID[8];/* User-defined */
-	} ID;
-};
-
-/*
- * ATM SAP (protocol) address structure
- */
-struct t_atm_sap {
-	struct t_atm_sap_addr		t_atm_sap_addr;
-	struct t_atm_sap_layer2		t_atm_sap_layer2;
-	struct t_atm_sap_layer3		t_atm_sap_layer3;
-	struct t_atm_sap_appl		t_atm_sap_appl;
-};
-
-/*
- * SVE Tag values
- */
-#define	T_ATM_ABSENT		(-1)	/* Value field invalid; match none */
-#define	T_ATM_PRESENT		(-2)	/* Value field valid; match value */
-#define	T_ATM_ANY		(-3)	/* Value field invalid; match any */
-
-
-/*
- * ATM socket address
- */
-struct sockaddr_atm {			/* XNS_EXT */
-	u_char		satm_len;	/* Length of socket structure */
-	u_char		satm_family;	/* Address family */
-	struct t_atm_sap	satm_addr;	/* Protocol address */
-};
-
-
-/*
- * ATM socket options for use with [gs]etsockopt()
- */
-#define	T_ATM_SIGNALING		0x5301	/* Option level */
-
-#define	T_ATM_AAL5		1	/* ATM adaptation layer 5      */
-#define	T_ATM_TRAFFIC		2	/* ATM traffic descriptor      */
-#define	T_ATM_BEARER_CAP	3	/* ATM service capabilities    */
-#define	T_ATM_BHLI		4	/* Higher-layer protocol       */
-#define	T_ATM_BLLI		5	/* Lower-layer protocol        */
-#define	T_ATM_DEST_ADDR		6	/* Call responder's address    */
-#define	T_ATM_DEST_SUB		7	/* Call responder's subaddress */
-#define	T_ATM_ORIG_ADDR		8	/* Call initiator's address    */
-#define	T_ATM_ORIG_SUB		9	/* Call initiator's subaddress */
-#define	T_ATM_CALLER_ID		10	/* Caller's ID attributes      */
-#define	T_ATM_CAUSE		11	/* Cause of disconection       */
-#define	T_ATM_QOS		12	/* Quality of service          */
-#define	T_ATM_TRANSIT		13	/* Choice of public carrier    */
-#define	T_ATM_ADD_LEAF		14	/* Add leaf to connection      */
-#define	T_ATM_DROP_LEAF		15	/* Remove leaf from connection */
-#define	T_ATM_LEAF_IND		16	/* Indication of leaf status   */
-#define	T_ATM_NET_INTF		17	/* Network interface XNS_EXT   */
-#define	T_ATM_LLC		18	/* LLC multiplexing XNS_EXT    */
-#define	T_ATM_APP_NAME		19	/* Application name XNS_EXT    */
-
-
-/*
- * Common socket option values
- *
- * See API specification for individual option applicability/meaning
- */
-#define	T_ATM_ABSENT		(-1)	/* No option value present */
-#define	T_ATM_NULL		0	/* Option value is null */
-#define	T_NO			0	/* Option is not requested */
-#define	T_YES			1	/* Option is requested */
-
-
-/*
- * T_ATM_AAL5 option value structure
- */
-struct t_atm_aal5 {
-	int32_t		forward_max_SDU_size;
-	int32_t		backward_max_SDU_size;
-	int32_t		SSCS_type;
-};
-
-/*
- * T_ATM_AAL5 option values
- */
-		/* SSCS_type */
-#define	T_ATM_SSCS_SSCOP_REL	1	/* SSCOP assured operation */
-#define	T_ATM_SSCS_SSCOP_UNREL	2	/* SSCOP non-assured operation */
-#define	T_ATM_SSCS_FR		4	/* Frame relay */
-
-
-/*
- * T_ATM_TRAFFIC option value structure
- */
-struct t_atm_traffic_substruct {
-	int32_t		PCR_high_priority;
-	int32_t		PCR_all_traffic;
-	int32_t		SCR_high_priority;
-	int32_t		SCR_all_traffic;
-	int32_t		MBS_high_priority;
-	int32_t		MBS_all_traffic;
-	int32_t		tagging;
-};
-
-struct t_atm_traffic {
-	struct t_atm_traffic_substruct	forward;
-	struct t_atm_traffic_substruct	backward;
-	u_int8_t	best_effort;
-};
-
-
-/*
- * T_ATM_BEARER_CAP option value structure
- */
-struct t_atm_bearer {
-	u_int8_t	bearer_class;
-	u_int8_t	traffic_type;
-	u_int8_t	timing_requirements;
-	u_int8_t	clipping_susceptibility;
-	u_int8_t	connection_configuration;
-};
-
-/*
- * T_ATM_BEARER_CAP option values
- */
-		/* bearer_class */
-#define	T_ATM_CLASS_A		0x01	/* Bearer class A                 */
-#define	T_ATM_CLASS_C		0x03	/* Bearer class C                 */
-#define	T_ATM_CLASS_X		0x10	/* Bearer class X                 */
-
-		/* traffic_type */
-#define	T_ATM_CBR		0x01	/* Constant bit rate              */
-#define	T_ATM_VBR		0x02	/* Variable bit rate              */
-#define	T_ATM_ABR		0x03	/* Available Bit Rate		  */
-#define	T_ATM_UBR		0x04	/* Unspecified bit rate		  */
-
-		/* timing_requirements */
-#define	T_ATM_END_TO_END	0x01	/* End-to-end timing required     */
-#define	T_ATM_NO_END_TO_END	0x02	/* End-to-end timing not required */
-
-		/* connection_configuration */
-#define	T_ATM_1_TO_1		0x00	/* Point-to-point connection      */
-#define	T_ATM_1_TO_MANY		0x01	/* Point-to-multipoint connection */
-
-
-/*
- * T_ATM_BHLI option value structure
- */
-struct t_atm_bhli {
-	int32_t		ID_type;
-	union {
-		u_int8_t	ISO_ID[8];
-		struct {
-			u_int8_t	OUI[3];
-			u_int8_t	app_ID[4];
-		} vendor_ID;
-		u_int8_t	user_defined_ID[8];
-	} ID;
-};
-
-/*
- * T_ATM_BHLI option values
- */
-		/* ID_type */
-#define	T_ATM_ISO_APP_ID	0	/* ISO codepoint             */
-#define	T_ATM_USER_APP_ID	1	/* User-specific codepoint   */
-#define	T_ATM_VENDOR_APP_ID	3	/* Vendor-specific codepoint */
-
-/*
- * T_ATM_BLLI option value structure
- */
-struct t_atm_blli {
-	struct {
-		int8_t		ID_type;
-		union {
-			u_int8_t	simple_ID;
-			u_int8_t	user_defined_ID;
-		} ID;
-		int8_t		mode;
-		int8_t		window_size;
-	} layer_2_protocol;
-	struct {
-		int8_t		ID_type;
-		union {
-			u_int8_t	simple_ID;
-			int32_t		IPI_ID;
-			struct {
-				u_int8_t	OUI[3];
-				u_int8_t	PID[2];
-			} SNAP_ID;
-			u_int8_t	user_defined_ID;
-		} ID;
-		int8_t		mode;
-		int8_t		packet_size;
-		int8_t		window_size;
-	} layer_3_protocol;
-};
-
-
-/*
- * T_ATM_BLLI option values
- */
-		/* layer_[23]_protocol.ID_type */
-#define	T_ATM_SIMPLE_ID		1	/* ID via ITU encoding    */
-#define	T_ATM_IPI_ID		2	/* ID via ISO/IEC TR 9577 */
-#define	T_ATM_SNAP_ID		3	/* ID via SNAP            */
-#define	T_ATM_USER_ID		4	/* ID via user codepoints */
-
-		/* layer_[23]_protocol.mode */
-#define	T_ATM_BLLI_NORMAL_MODE	1
-#define	T_ATM_BLLI_EXTENDED_MODE	2
-
-		/* layer_2_protocol.simple_ID */
-#define	T_ATM_BLLI2_I1745	1	/* I.1745           */
-#define	T_ATM_BLLI2_Q921	2	/* Q.921            */
-#define	T_ATM_BLLI2_X25_LINK	6	/* X.25, link layer */
-#define	T_ATM_BLLI2_X25_MLINK	7	/* X.25, multilink  */
-#define	T_ATM_BLLI2_LAPB	8	/* Extended LAPB    */
-#define	T_ATM_BLLI2_HDLC_ARM	9	/* I.4335, ARM      */
-#define	T_ATM_BLLI2_HDLC_NRM	10	/* I.4335, NRM      */
-#define	T_ATM_BLLI2_HDLC_ABM	11	/* I.4335, ABM      */
-#define	T_ATM_BLLI2_I8802	12	/* I.8802           */
-#define	T_ATM_BLLI2_X75		13	/* X.75             */
-#define	T_ATM_BLLI2_Q922	14	/* Q.922            */
-#define	T_ATM_BLLI2_I7776	17	/* I.7776           */
-
-		/* layer_3_protocol.simple_ID */
-#define	T_ATM_BLLI3_X25		6	/* X.25             */
-#define	T_ATM_BLLI3_I8208	7	/* I.8208           */
-#define	T_ATM_BLLI3_X223	8	/* X.223            */
-#define	T_ATM_BLLI3_I8473	9	/* I.8473           */
-#define	T_ATM_BLLI3_T70		10	/* T.70             */
-#define	T_ATM_BLLI3_I9577	11	/* I.9577           */
-
-		/* layer_3_protocol.packet_size */
-#define	T_ATM_PACKET_SIZE_16	4
-#define	T_ATM_PACKET_SIZE_32	5
-#define	T_ATM_PACKET_SIZE_64	6
-#define	T_ATM_PACKET_SIZE_128	7
-#define	T_ATM_PACKET_SIZE_256	8
-#define	T_ATM_PACKET_SIZE_512	9
-#define	T_ATM_PACKET_SIZE_1024	10
-#define	T_ATM_PACKET_SIZE_2048	11
-#define	T_ATM_PACKET_SIZE_4096	12
-
-
-/*
- * T_ATM_CALLER_ID option value structure
- */
-struct t_atm_caller_id {
-	int8_t		presentation;
-	u_int8_t	screening;
-};
-
-/*
- * T_ATM_CALLER_ID option values
- */
-		/* presentation */
-#define	T_ATM_PRES_ALLOWED		0
-#define	T_ATM_PRES_RESTRICTED		1
-#define	T_ATM_PRES_UNAVAILABLE		2
-		/* screening */
-#define	T_ATM_USER_ID_NOT_SCREENED	0
-#define	T_ATM_USER_ID_PASSED_SCREEN	1
-#define	T_ATM_USER_ID_FAILED_SCREEN	2
-#define	T_ATM_NETWORK_PROVIDED_ID	3
-
-
-/*
- * T_ATM_CAUSE option value structure
- */
-struct t_atm_cause {
-	int8_t		coding_standard;
-	u_int8_t	location;
-	u_int8_t	cause_value;
-	u_int8_t	diagnostics[4];
-};
-
-/*
- * T_ATM_CAUSE option values
- */
-		/* coding_standard */
-#define	T_ATM_ITU_CODING		0
-#define	T_ATM_NETWORK_CODING		3
-
-		/* location */
-#define	T_ATM_LOC_USER			0
-#define	T_ATM_LOC_LOCAL_PRIVATE_NET	1
-#define	T_ATM_LOC_LOCAL_PUBLIC_NET	2
-#define	T_ATM_LOC_TRANSIT_NET		3
-#define	T_ATM_LOC_REMOTE_PUBLIC_NET	4
-#define	T_ATM_LOC_REMOTE_PRIVATE_NET	5
-#define	T_ATM_LOC_INTERNATIONAL_NET	7
-#define	T_ATM_LOC_BEYOND_INTERWORKING	10
-
-		/* cause_value */
-#define	T_ATM_CAUSE_UNALLOCATED_NUMBER				1
-#define	T_ATM_CAUSE_NO_ROUTE_TO_TRANSIT_NETWORK			2
-#define	T_ATM_CAUSE_NO_ROUTE_TO_DESTINATION			3
-#define	T_ATM_CAUSE_NORMAL_CALL_CLEARING			16
-#define	T_ATM_CAUSE_USER_BUSY					17
-#define	T_ATM_CAUSE_NO_USER_RESPONDING				18
-#define	T_ATM_CAUSE_CALL_REJECTED				21
-#define	T_ATM_CAUSE_NUMBER_CHANGED				22
-#define	T_ATM_CAUSE_ALL_CALLS_WITHOUT_CALLER_ID_REJECTED	23
-#define	T_ATM_CAUSE_DESTINATION_OUT_OF_ORDER			27
-#define	T_ATM_CAUSE_INVALID_NUMBER_FORMAT			28
-#define	T_ATM_CAUSE_RESPONSE_TO_STATUS_ENQUIRY			30
-#define	T_ATM_CAUSE_UNSPECIFIED_NORMAL				31
-#define	T_ATM_CAUSE_REQUESTED_VPCI_VCI_NOT_AVAILABLE		35
-#define	T_ATM_CAUSE_VPCI_VCI_ASSIGNMENT_FAILURE			36
-#define	T_ATM_CAUSE_USER_CELL_RATE_NOT_AVAILABLE		37
-#define	T_ATM_CAUSE_NETWORK_OUT_OF_ORDER			38
-#define	T_ATM_CAUSE_TEMPORARY_FAILURE				41
-#define	T_ATM_CAUSE_ACCESS_INFO_DISCARDED			43
-#define	T_ATM_CAUSE_NO_VPCI_VCI_AVAILABLE			45
-#define	T_ATM_CAUSE_UNSPECIFIED_RESOURCE_UNAVAILABLE		47
-#define	T_ATM_CAUSE_QUALITY_OF_SERVICE_UNAVAILABLE		49
-#define	T_ATM_CAUSE_BEARER_CAPABILITY_NOT_AUTHORIZED		57
-#define	T_ATM_CAUSE_BEARER_CAPABILITY_UNAVAILABLE		58
-#define	T_ATM_CAUSE_SERVICE_OR_OPTION_UNAVAILABLE		63
-#define	T_ATM_CAUSE_BEARER_CAPABILITY_NOT_IMPLEMENTED		65
-#define	T_ATM_CAUSE_INVALID_TRAFFIC_PARAMETERS			73
-#define	T_ATM_CAUSE_AAL_PARAMETERS_NOT_SUPPORTED		78
-#define	T_ATM_CAUSE_INVALID_CALL_REFERENCE_VALUE		81
-#define	T_ATM_CAUSE_IDENTIFIED_CHANNEL_DOES_NOT_EXIST		82
-#define	T_ATM_CAUSE_INCOMPATIBLE_DESTINATION			88
-#define	T_ATM_CAUSE_INVALID_ENDPOINT_REFERENCE			89
-#define	T_ATM_CAUSE_INVALID_TRANSIT_NETWORK_SELECTION		91
-#define	T_ATM_CAUSE_TOO_MANY_PENDING_ADD_PARTY_REQUESTS		92
-#define	T_ATM_CAUSE_MANDITORY_INFO_ELEMENT_MISSING		96
-#define	T_ATM_CAUSE_MESSAGE_TYPE_NOT_IMPLEMENTED		97
-#define	T_ATM_CAUSE_INFO_ELEMENT_NOT_IMPLEMENTED		99
-#define	T_ATM_CAUSE_INVALID_INFO_ELEMENT_CONTENTS		100
-#define	T_ATM_CAUSE_MESSAGE_INCOMPATIBLE_WITH_CALL_STATE	101
-#define	T_ATM_CAUSE_RECOVERY_ON_TIMER_EXPIRY			102
-#define	T_ATM_CAUSE_INCORRECT_MESSAGE_LENGTH			104
-#define	T_ATM_CAUSE_UNSPECIFIED_PROTOCOL_ERROR			111
-
-
-/*
- * T_ATM_QOS option value structure
- */
-struct t_atm_qos_substruct {
-	int32_t		qos_class;
-};
-
-struct t_atm_qos {
-	int8_t		coding_standard;
-	struct t_atm_qos_substruct	forward;
-	struct t_atm_qos_substruct	backward;
-};
-
-/*
- * T_ATM_QOS option values
- */
-		/* qos_class */
-#define	T_ATM_QOS_CLASS_0	0
-#define	T_ATM_QOS_CLASS_1	1
-#define	T_ATM_QOS_CLASS_2	2
-#define	T_ATM_QOS_CLASS_3	3
-#define	T_ATM_QOS_CLASS_4	4
-
-
-/*
- * T_ATM_TRANSIT structure
- */
-#define	T_ATM_MAX_NET_ID	4		/* XNS_EXT */
-struct t_atm_transit {
-	u_int8_t	length;
-	u_int8_t	network_id[T_ATM_MAX_NET_ID];
-};
-
-
-/*
- * T_ATM_ADD_LEAF option value structure
- */
-struct t_atm_add_leaf {
-	int32_t		leaf_ID;
-	struct t_atm_addr	leaf_address;
-};
-
-
-/*
- * T_ATM_DROP_LEAF option value structure
- */
-struct t_atm_drop_leaf {
-	int32_t		leaf_ID;
-	int32_t		reason;
-};
-
-/*
- * T_ATM_LEAF_IND option value structure
- */
-struct t_atm_leaf_ind {
-	int32_t		status;
-	int32_t		leaf_ID;
-	int32_t		reason;
-};
-
-/*
- * T_ATM_LEAF_IND option values
- */
-		/* status */
-#define	T_LEAF_NOCHANGE		0
-#define	T_LEAF_CONNECTED	1
-#define	T_LEAF_DISCONNECTED	2
-
-/*
- * T_ATM_NET_INTF option value structure	(XNS_EXT)
- */
-struct t_atm_net_intf {				/* XNS_EXT */
-	char		net_intf[IFNAMSIZ];
-};
-
-/*
- * T_ATM_LLC option value structure		(XNS_EXT)
- */
-#define	T_ATM_LLC_MIN_LEN	3
-#define	T_ATM_LLC_MAX_LEN	8
-
-struct t_atm_llc {				/* XNS_EXT */
-	u_int8_t	flags;			/* LLC flags (see below) */
-	u_int8_t	llc_len;		/* Length of LLC information */
-	u_int8_t	llc_info[T_ATM_LLC_MAX_LEN];	/* LLC information */
-};
-
-/*
- * T_ATM_LLC option values
- */
-		/* flags */
-#define	T_ATM_LLC_SHARING	0x01		/* LLC sharing allowed */
-
-/*
- * T_ATM_APP_NAME option value structure	(XNS_EXT)
- */
-#define	T_ATM_APP_NAME_LEN	8
-struct t_atm_app_name {				/* XNS_EXT */
-	char		app_name[T_ATM_APP_NAME_LEN];
-};
-
-#endif	/* _NETATM_ATM_H */
diff --git a/include.new/netatm/atm_cm.h b/include.new/netatm/atm_cm.h
deleted file mode 100644
index f409022..0000000
--- a/include.new/netatm/atm_cm.h
+++ /dev/null
@@ -1,351 +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: src/sys/netatm/atm_cm.h,v 1.8 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * ATM Connection Management definitions
- *
- */
-
-#ifndef _NETATM_ATM_CM_H
-#define _NETATM_ATM_CM_H
-
-/*
- * Forward declaration
- */
-struct atm_connection;
-struct atm_attributes;
-
-
-#ifdef _KERNEL
-/*
- * Structure used to define a kernel ATM endpoint service module and its 
- * associated entry points.  An endpoint service is defined as a kernel 
- * entity which will serve as the endpoint of an ATM connection, i.e. it is
- * responsible for issuing/receiving requests to/from the connection manager.
- */
-struct atm_endpoint {
-	struct atm_endpoint *ep_next;	/* Next in registry list */
-	u_int		ep_id;		/* Endpoint ID (see below) */
-
-/* Exported functions: Miscellaneous */
-	int		(*ep_ioctl)	/* Ioctl */
-				(int, caddr_t, caddr_t);
-	caddr_t		(*ep_getname)	/* Get application/owner name */
-				(void *);
-
-/* Exported functions: Connection Manager Control API */
-	void		(*ep_connected)	/* Call connected */
-				(void *);
-	void		(*ep_cleared)	/* Call cleared */
-				(void *, struct t_atm_cause *);
-	int		(*ep_incoming)	/* Incoming call */
-				(void *, struct atm_connection *,
-					struct atm_attributes *, void **);
-	int		(*ep_addparty)	/* Add Party notification */
-				(void *, int, int);
-	int		(*ep_dropparty)	/* Drop Party notification */
-				(void *, int, int);
-
-/* Exported functions: Connection Manager Data API: CPCS */ 
-	void		(*ep_cpcs_ctl)	/* Control operation */
-				(int, void *, void *);
-	void		(*ep_cpcs_data)	/* Received data */
-				(void *, KBuffer *);
-
-/* Exported functions: Connection Manager Data API: SAAL */ 
-	void		(*ep_saal_ctl)	/* Control operation */
-				(int, void *, void *);
-	void		(*ep_saal_data)	/* Received data */
-				(void *, KBuffer *);
-
-/* Exported functions: Connection Manager Data API: SSCOP */ 
-	void		(*ep_sscop_ctl)	/* Control operation */
-				(int, void *, void *, void *);
-	void		(*ep_sscop_data)	/* Received data */
-				(void *, KBuffer *, u_int);
-};
-typedef struct atm_endpoint	Atm_endpoint;
-#endif	/* _KERNEL */
-
-/*
- * Endpoint IDs
- */
-#define	ENDPT_UNKNOWN		0	/* Unknown */
-#define	ENDPT_IP		1	/* IP over ATM */
-#define	ENDPT_ATMARP		2	/* ATMARP */
-#define	ENDPT_SPANS_SIG		3	/* SPANS Signalling */
-#define	ENDPT_SPANS_CLS		4	/* SPANS CLS */
-#define	ENDPT_UNI_SIG		5	/* UNI Signalling */
-#define	ENDPT_SOCK_AAL5		6	/* Socket - AAL5 */
-#define	ENDPT_SOCK_SSCOP	7	/* Socket - SSCOP */
-#define	ENDPT_MAX		7
-
-
-/*
- * ATM Connection Attributes
- *
- * Note: Attribute tag values are the same as the SVE_tag values.
- *       Unless otherwise specified, attribute field values are the same 
- *       as the corresponding socket option values.
- *       The above values are all defined in netatm/atm.h.  
- */
-
-/* AAL Attributes */
-struct t_atm_aal4 {
-	int32_t		forward_max_SDU_size;
-	int32_t		backward_max_SDU_size;
-	int32_t		SSCS_type;
-	int32_t		mid_low;
-	int32_t		mid_high;
-};
-
-struct attr_aal {
-	int		tag;		/* Attribute tag */
-	Aal_t		type;		/* AAL type (discriminator) */
-	union {
-		struct t_atm_aal4 aal4;
-		struct t_atm_aal5 aal5;
-	} v;				/* Attribute value */
-};
-
-/* Traffic Descriptor Attributes */
-struct attr_traffic {
-	int		tag;		/* Attribute tag */
-	struct t_atm_traffic	v;	/* Attribute value */
-};
-
-/* Broadband Bearer Attributes */
-struct attr_bearer {
-	int		tag;		/* Attribute tag */
-	struct t_atm_bearer	v;	/* Attribute value */
-};
-
-/* Broadband High Layer Information Attributes */
-struct attr_bhli {
-	int		tag;		/* Attribute tag */
-	struct t_atm_bhli	v;	/* Attribute value */
-};
-
-/* Broadband Low Layer Information Attributes */
-struct attr_blli {
-	int		tag_l2;		/* Layer 2 attribute tag */
-	int		tag_l3;		/* Layer 3 attribute tag */
-	struct t_atm_blli	v;	/* Attribute value */
-};
-
-/* Logical Link Control Attributes (multiplexing use only, not signalled) */
-struct attr_llc {
-	int		tag;		/* Attribute tag */
-	struct t_atm_llc	v;	/* Attribute value */
-};
-
-/* Called Party Attributes */
-struct attr_called {
-	int		tag;		/* Attribute tag */
-	Atm_addr	addr;		/* Called party address */
-	Atm_addr	subaddr;	/* Called party subaddress */
-};
-
-/* Calling Party Attributes */
-struct attr_calling {
-	int		tag;		/* Attribute tag */
-	Atm_addr	addr;		/* Calling party address */
-	Atm_addr	subaddr;	/* Calling party subaddress */
-	struct t_atm_caller_id	cid;	/* Caller ID */
-};
-
-/* Quality of Service Attributes */
-struct attr_qos {
-	int		tag;		/* Attribute tag */
-	struct t_atm_qos	v;	/* Attribute value */
-};
-
-/* Transit Network Attributes */
-struct attr_transit {
-	int		tag;		/* Attribute tag */
-	struct t_atm_transit	v;	/* Attribute value */
-};
-
-/* Cause Attributes */
-struct attr_cause {
-	int		tag;		/* Attribute tag */
-	struct t_atm_cause	v;	/* Attribute value */
-};
-
-
-struct atm_attributes {
-	struct atm_nif		*nif;	/* Network interface */
-	u_int			api;	/* Connect Mgr Data API (see below) */
-	int			api_init;/* API initialization parameter */
-	u_short			headin;	/* Input buffer headroom */
-	u_short			headout;/* Output buffer headroom */
-	struct attr_aal		aal;	/* AAL attributes */
-	struct attr_traffic	traffic;/* Traffic descriptor attributes */
-	struct attr_bearer	bearer;	/* Broadband bearer attributes */
-	struct attr_bhli	bhli;	/* Broadband high layer attributes */
-	struct attr_blli	blli;	/* Broadband low layer attributes */
-	struct attr_llc		llc;	/* Logical link control attributes */
-	struct attr_called	called;	/* Called party attributes */
-	struct attr_calling	calling;/* Calling party attributes */
-	struct attr_qos		qos;	/* Quality of service attributes */
-	struct attr_transit	transit;/* Transit network attributes */
-	struct attr_cause	cause;	/* Cause attributes */
-};
-typedef struct atm_attributes	Atm_attributes;
-
-/*
- * Connection Manager Data APIs
- */
-#define	CMAPI_CPCS	0		/* AAL CPCS */
-#define	CMAPI_SAAL	1		/* Signalling AAL */
-#define	CMAPI_SSCOP	2		/* Reliable data (SSCOP) */
-
-
-#ifdef _KERNEL
-/*
- * ATM Connection Instance
- *
- * There will be one connection block for each endpoint <-> Connection Manager 
- * API instance.  Note that with connection multiplexors (e.g. LLC), there 
- * may be multiple connections per VCC.
- */
-struct atm_connection {
-	struct atm_connection *co_next;	/* Multiplexor/listen queue link */
-	struct atm_connection *co_mxh;	/* Connection multiplexor head */
-	u_char		co_flags;	/* Connection flags (see below) */
-	u_char		co_state;	/* User <-> CM state (see below) */
-	Encaps_t	co_mpx;		/* Multiplexor type */
-	void		*co_toku;	/* Endpoint's session token */
-	Atm_endpoint	*co_endpt;	/* Endpoint service */
-	struct atm_connvc *co_connvc;	/* Connection VCC */
-	struct attr_llc	co_llc;		/* Connection LLC header */
-	Atm_attributes	*co_lattr;	/* Listening attributes */
-};
-typedef struct atm_connection	Atm_connection;
-
-/*
- * Connection Flags
- */
-#define	COF_P2P		0x01		/* Point-to-point */
-#define	COF_P2MP	0x02		/* Point-to-multipoint */
-
-/*
- * Endpoint <-> Connection Manager States
- */
-#define	COS_FREE	0		/* Not allocated */
-#define	COS_OUTCONN	1		/* Outgoing connection pending */
-#define	COS_LISTEN	2		/* Listening for connection */
-#define	COS_INCONN	3		/* Incoming connection pending */
-#define	COS_INACCEPT	4		/* Incoming connection accepted */
-#define	COS_ACTIVE	5		/* Connection active */
-#define	COS_CLEAR	6		/* Connection is clearing */
-
-
-/*
- * ATM Connection VCC Instance
- *
- * There will be one connection-vcc block for each VCC created by the
- * Connection Manager. For multiplexed connections, there may be multiple
- * connection blocks associated with each connection-vcc.  This block is
- * used to control the Connection Manager <-> VCC interface, including the 
- * interfaces to stack management and the signalling manager.
- */
-struct atm_connvc {
-	Qelem_t		cvc_q;		/* Queueing links */
-	Atm_connection	*cvc_conn;	/* Connection head */
-	struct vccb	*cvc_vcc;	/* VCC for connection */
-	struct sigmgr	*cvc_sigmgr;	/* VCC signalling manager */
-	u_char		cvc_flags;	/* Connection flags (see below) */
-	u_char		cvc_state;	/* CM - VCC state (see below) */
-	void		*cvc_tokl;	/* Stack lower layer token */
-	void		(*cvc_lower)	/* Stack lower layer handler */
-				(int, void *, intptr_t, intptr_t);
-	u_short		cvc_upcnt;	/* Up stack calls in progress */
-	u_short		cvc_downcnt;	/* Down stack calls in progress */
-	KBuffer		*cvc_rcvq;	/* Packet receive queue */
-	int		cvc_rcvqlen;	/* Receive queue length */
-	Atm_attributes	cvc_attr;	/* VCC attributes */
-	struct atm_time	cvc_time;	/* Timer controls */
-};
-typedef struct atm_connvc	Atm_connvc;
-
-/*
- * Connection Flags
- */
-#define	CVCF_ABORTING	0x01		/* VCC abort is pending */
-#define	CVCF_INCOMQ	0x02		/* VCC is on incoming queue */
-#define	CVCF_CONNQ	0x04		/* VCC is on connection queue */
-#define	CVCF_CALLER	0x08		/* We are the call originator */
-
-/*
- * Connection Manager <-> VCC States
- */
-#define	CVCS_FREE	0		/* Not allocated */
-#define	CVCS_SETUP	1		/* Call setup pending */
-#define	CVCS_INIT	2		/* Stack INIT pending */
-#define	CVCS_INCOMING	3		/* Incoming call present */
-#define	CVCS_ACCEPT	4		/* Incoming call accepted */
-#define	CVCS_REJECT	5		/* Incoming call rejected */
-#define	CVCS_ACTIVE	6		/* Stack active */
-#define	CVCS_RELEASE	7		/* Connection release pending */
-#define	CVCS_CLEAR	8		/* Call has been cleared */
-#define	CVCS_TERM	9		/* Stack TERM pending */
-
-
-/*
- * Connection VCC variables
- */
-#define	CVC_RCVQ_MAX	3		/* Max length of receive queue */
-
-
-/*
- * Timer macros
- */
-#define	CVC_TIMER(s, t)		atm_timeout(&(s)->cvc_time, (t), atm_cm_timeout)
-#define	CVC_CANCEL(s)		atm_untimeout(&(s)->cvc_time)
-
-
-/*
- * Connection Manager Statistics
- */
-struct atm_cm_stat {
-	u_long		cms_llcdrop;	/* Packets dropped by llc demux'ing */
-	u_long		cms_llcid;	/* Packets with unknown llc id */
-	u_long		cms_rcvconn;	/* Packets dropped, bad conn state */
-	u_long		cms_rcvconnvc;	/* Packets dropped, bad connvc state */
-};
-
-void atm_cm_init(void);
-
-#endif	/* _KERNEL */
-
-#endif	/* _NETATM_ATM_CM_H */
diff --git a/include.new/netatm/atm_if.h b/include.new/netatm/atm_if.h
deleted file mode 100644
index 3014423..0000000
--- a/include.new/netatm/atm_if.h
+++ /dev/null
@@ -1,369 +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: src/sys/netatm/atm_if.h,v 1.20 2005/06/10 16:49:20 brooks Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * ATM Physical and Network Interface definitions 
- *
- */
-
-#ifndef _NETATM_ATM_IF_H
-#define _NETATM_ATM_IF_H
-
-/*
- * Handy constants
- */
-#define ATM_NIF_MTU	9180		/* Default network interface MTU */
-
-#define ATM_PCR_25	59111		/* Peak Cell Rate for 25.6 Mbs */
-#define ATM_PCR_DS3	(12*8000)	/* 12 cells in 1/8000 sec */
-#define ATM_PCR_TAXI100	227273		/* Peak Cell Rate for 100 Mbs TAXI */
-#define ATM_PCR_TAXI140	318181		/* Peak Cell Rate for 140 Mbs TAXI */
-#define ATM_PCR_OC3C	353207		/* Peak Cell Rate for OC3c */
-#define ATM_PCR_OC12C	1416905		/* Peak Cell Rate for OC12c */
-
-
-/*
- * Media Access Control (MAC) address
- */
-struct mac_addr	{
-	u_char		ma_data[6];	/* MAC address */
-};
-typedef struct mac_addr	Mac_addr;
-
-
-/*
- * Adapter vendor identifiers
- */
-enum atm_vendor {
-	VENDOR_UNKNOWN,			/* Unknown vendor */
-	VENDOR_FORE,			/* FORE Systems, Inc. */
-	VENDOR_ENI,			/* Efficient Networks, Inc. */
-	VENDOR_IDT,			/* Integrated Device Technology, Inc. */
-	VENDOR_PROSUM,			/* Prosum, Inc. */
-	VENDOR_NETGRAPH			/* Netgraph device */
-};
-typedef enum atm_vendor	Atm_vendor;
-
-
-/*
- * Adapter vendor interface identifiers
- */
-enum atm_vendapi {
-	VENDAPI_UNKNOWN,		/* Unknown interface */
-	VENDAPI_FORE_1,			/* FORE - 200 Series */
-	VENDAPI_ENI_1,			/* ENI - Midway */
-	VENDAPI_IDT_1,			/* IDT - NICStAR */
-	VENDAPI_IDT_2,			/* IDT 77252 */
-	VENDAPI_NETGRAPH_1,		/* Netgraph API v1 */
-	VENDAPI_FORE_2,			/* FORE - HE Series */
-};
-typedef enum atm_vendapi	Atm_vendapi;
-
-
-/*
- * Adapter device model identifiers
- */
-enum atm_device {
-	DEV_UNKNOWN,			/* Unknown device */
-	DEV_FORE_SBA200E,		/* FORE SBA-200E */
-	DEV_FORE_SBA200,		/* FORE SBA-200 */
-	DEV_FORE_PCA200E,		/* FORE PCA-200E */
-	DEV_FORE_ESA200E,		/* FORE ESA-200E */
-	DEV_ENI_155P,			/* ENI-155p */
-	DEV_IDT_155,			/* IDT NICStAR */
-	DEV_PROATM_25,			/* Prosum boards based on IDT 77252 */
-	DEV_PROATM_155,			/* Prosum boards based on IDT 77252 */
-	DEV_VATMPIF,			/* Virtual ATM Physical IF */
-	DEV_FORE_LE25,			/* ForeLE-25 */
-	DEV_FORE_LE155,			/* ForeLE-155 */
-	DEV_IDT_25,			/* IDT NICStAR */
-	DEV_IDTABR_25,			/* IDT 77252 evaluation board */
-	DEV_IDTABR_155,			/* IDT 77252 evaluation board */
-	DEV_FORE_HE155,			/* ForeRunnerHE-155 */
-	DEV_FORE_HE622,			/* ForeRunnerHE-622 */
-};
-typedef enum atm_device	Atm_device;
-
-
-/*
- * Adapter media identifiers
- */
-enum atm_media {
-	MEDIA_UNKNOWN,			/* Unknown media type */
-	MEDIA_TAXI_100,			/* TAXI - 100 Mbps */
-	MEDIA_TAXI_140,			/* TAXI - 140 Mbps */
-	MEDIA_OC3C,			/* OC-3C */
-	MEDIA_OC12C,			/* OC-12C */
-	MEDIA_UTP155,			/* UTP-155 */
-	MEDIA_UTP25,			/* UTP-25.6 */
-	MEDIA_VIRTUAL,			/* Virtual Link */
-	MEDIA_DSL			/* xDSL */
-};
-typedef enum atm_media	Atm_media;
-
-
-/*
- * Bus type identifiers
- */
-enum atm_bus {
-	BUS_UNKNOWN,			/* Unknown bus type */
-	BUS_SBUS_B16,			/* SBus: 16 byte (4 word) max burst */
-	BUS_SBUS_B32,			/* SBus: 32 byte (8 word) max burst */
-	BUS_PCI,			/* PCI */
-	BUS_EISA,			/* EISA */
-	BUS_USB,			/* USB */
-	BUS_VIRTUAL			/* Virtual Bus */
-};
-typedef enum atm_bus	Atm_bus;
-
-
-#define	VERSION_LEN	16		/* Length of version info string */
-
-
-/*
- * ATM adapter configuration information structure
- */
-struct atm_config {
-	Atm_vendor	ac_vendor;	/* Vendor */
-	Atm_vendapi	ac_vendapi;	/* Vendor interface */
-	Atm_device	ac_device;	/* Device model */
-	Atm_media	ac_media;	/* Media type */
-	u_long		ac_serial;	/* Serial number */
-	Atm_bus		ac_bustype;	/* Bus type */
-	u_long		ac_busslot;	/* Bus slot info (bus type dependent) */
-	u_long		ac_ram;		/* Device ram offset */
-	u_long		ac_ramsize;	/* Device ram size */
-	Mac_addr	ac_macaddr;	/* MAC address */
-	char		ac_hard_vers[VERSION_LEN];	/* Hardware version */
-	char		ac_firm_vers[VERSION_LEN];	/* Firmware version */
-};
-typedef struct atm_config	Atm_config;
-
-
-#ifdef _KERNEL
-
-#include <vm/uma.h>
-
-/*
- * Common structure used to define each physical ATM device interface.
- * This structure will (normally) be embedded at the top of each driver's 
- * device-specific interface structure.  
- */
-struct	atm_pif {
-	struct atm_pif	*pif_next;	/* Next registered atm interface */
-	const char	*pif_name;	/* Device name */
-	short		pif_unit;	/* Device unit number */
-	u_char		pif_flags;	/* Interface flags (see below) */
-	struct sigmgr	*pif_sigmgr;	/* Signalling Manager for interface */
-	struct siginst	*pif_siginst;	/* Signalling protocol instance */
-	struct stack_defn	*pif_services;	/* Interface's stack services */
-	struct mac_addr	pif_macaddr;	/* Interface's MAC address */
-	struct atm_nif	*pif_nif;	/* List of network interfaces */
-	struct atm_pif	*pif_grnext;	/* Next atm device in group */
-
-/* Exported functions */
-	int		(*pif_ioctl)	/* Interface ioctl handler */
-				(int, caddr_t, caddr_t);
-
-/* Interface statistics */
-	u_quad_t	pif_ipdus;	/* PDUs received from interface */
-	u_quad_t	pif_opdus;	/* PDUs sent to interface */
-	u_quad_t	pif_ibytes;	/* Bytes received from interface */
-	u_quad_t	pif_obytes;	/* Bytes sent to interface */
-	u_quad_t	pif_ierrors;	/* Errors receiving from interface */
-	u_quad_t	pif_oerrors;	/* Errors sending to interface */
-	u_quad_t	pif_cmderrors;	/* Interface command errors */
-	caddr_t		pif_cardstats;	/* Card specific statistics */
-
-/* Interface capabilities */
-	u_short		pif_maxvpi;	/* Maximum VPI value supported */
-	u_short		pif_maxvci;	/* Maximum VCI value supported */
-	u_int		pif_pcr;	/* Peak Cell Rate */
-};
-
-/*
- * Physical interface flags
- */
-#define	PIF_UP		0x01		/* Interface is up */
-#define	PIF_LOOPBACK	0x02		/* Loopback local packets */
-
-
-/*
- * Structure defining an ATM network interface.  This structure is used as 
- * the hook between the standard BSD network layer interface mechanism and 
- * the ATM device layer.  There may be one or more network interfaces for 
- * each physical ATM interface.
- */
-struct	atm_nif {
-	struct ifnet	*nif_ifp;	/* Network interface */
-	struct atm_pif	*nif_pif;	/* Our physical interface */
-	char		nif_name[IFNAMSIZ];/* Network interface name */
-	u_char		nif_sel;	/* Interface's address selector */
-	struct atm_nif	*nif_pnext;	/* Next net interface on phys i/f */
-
-/* Interface statistics (in addition to ifnet stats) */
-	long		nif_ibytes;	/* Bytes received from interface */
-	long		nif_obytes;	/* Bytes sent to interface */
-};
-#define ANIF2IFP(an)	((an)->nif_ifp)
-#define IFP2ANIF(ifp)	((struct atm_nif *)(ifp)->if_softc)
-
-/*
- * Common Device VCC Entry
- *
- * Contains the common information for each VCC which is opened
- * through a particular device.
- */
-struct cmn_vcc {
-	struct cmn_vcc	*cv_next;	/* Next in list */
-	void		*cv_toku;	/* Upper layer's token */
-	void		(*cv_upper)	/* Upper layer's interface */
-				(int, void *, intptr_t, intptr_t);
-	Atm_connvc	*cv_connvc;	/* Associated connection VCC */
-	u_char		cv_state;	/* VCC state (see below) */
-	u_char		cv_flags;	/* VCC flags (see below) */
-};
-typedef struct cmn_vcc	Cmn_vcc;
-
-/*
- * VCC States
- */
-#define	CVS_FREE	0		/* Not allocated */
-#define	CVS_INST	1		/* Instantiated, waiting for INIT */
-#define	CVS_INITED	2		/* Initialized, waiting for driver */
-#define	CVS_ACTIVE	3		/* Device activated by driver */
-#define	CVS_PTERM	4		/* Waiting for TERM */
-#define	CVS_TERM	5		/* Terminated */
-
-/*
- * VCC Flags
- */
-#define	CVF_RSVD	0x0f		/* Reserved for device-specific use */
-
-
-/*
- * Common Device Unit Structure
- *
- * Contains the common information for a single device (adapter).
- */
-struct cmn_unit {
-	struct atm_pif	cu_pif;		/* Physical interface */
-	u_int		cu_unit;	/* Local unit number */
-	u_char		cu_flags;	/* Device flags (see below) */
-	u_int		cu_mtu;		/* Interface MTU */
-
-	u_int		cu_open_vcc;	/* Open VCC count */
-	Cmn_vcc		*cu_vcc;	/* List of VCC's on interface */
-
-	u_int		cu_intrpri;	/* Highest unit interrupt priority */
-	int		cu_savepri;	/* Saved priority for locking device */
-
-	uma_zone_t	cu_vcc_zone;	/* Device VCC zone */
-	uma_zone_t	cu_nif_zone;	/* Device NIF zone */
-
-	int		(*cu_ioctl)	/* Interface ioctl handler */
-				(int, caddr_t, caddr_t);
-	int		(*cu_instvcc)	/* VCC stack instantion handler */
-				(struct cmn_unit *, Cmn_vcc *);
-	int		(*cu_openvcc)	/* Open VCC handler */
-				(struct cmn_unit *, Cmn_vcc *);
-	int		(*cu_closevcc)	/* Close VCC handler */
-				(struct cmn_unit *, Cmn_vcc *);
-	void		(*cu_output)	/* Data output handler */
-				(struct cmn_unit *, Cmn_vcc *, KBuffer *);
-
-	Atm_config	cu_config;	/* Device configuration data */
-
-	void *		cu_softc;	/* pointer to driver state */
-};
-typedef struct cmn_unit	Cmn_unit;
-
-/*
- * Device flags
- */
-#define	CUF_REGISTER	0x01		/* Device is registered */
-#define	CUF_INITED	0x02		/* Device is initialized */
-
-
-/*
- * Structure used to define a network convergence module and its associated
- * entry points.  A convergence module is used to provide the interface
- * translations necessary between the ATM system and the BSD network layer
- * interface mechanism.  There will be one network convergence module for
- * each protocol address family supporting ATM connections.
- */
-struct atm_ncm {
-	struct atm_ncm	*ncm_next;	/* Next in registry list */
-	u_short		ncm_family;	/* Protocol family */
-/* Exported functions */
-	int		(*ncm_ifoutput)	/* Interface if_output handler */
-				(struct ifnet *, KBuffer *, struct sockaddr *);
-	int		(*ncm_stat)	/* Network i/f status handler */
-				(int, struct atm_nif *, intptr_t);
-};
-
-/*
- * ncm_stat() commands
- */
-#define	NCM_ATTACH	1		/* Attaching a new net i/f */
-#define	NCM_DETACH	2		/* Detaching a current net i/f */
-#define	NCM_SETADDR	3		/* Net i/f address change */
-#define	NCM_SIGATTACH	4		/* Attaching a signalling manager */
-#define	NCM_SIGDETACH	5		/* Detaching a signalling manager */
-
-
-/*
- * atm_dev_alloc() parameters
- */
-#define	ATM_DEV_NONCACHE	1	/* Allocate non-cacheable memory */
-
-/*
- * atm_dev_compress() buffer allocation sizes
- */
-#define	ATM_DEV_CMPR_LG	MCLBYTES	/* Size of large buffers */
-#define	ATM_DEV_CMPR_SM	MLEN		/* Size of small buffers */
-
-/*
- * Macros to lock out device interrupts
- */
-#define	DEVICE_LOCK(u)		((u)->cu_savepri = splimp())
-#define	DEVICE_UNLOCK(u)	((void) splx((u)->cu_savepri))
-
-/*
- * Macro to schedule the ATM interrupt queue handler
- */
-typedef	void (atm_intr_t)(void *, KBuffer *); /* Callback function type */
-typedef	atm_intr_t	*atm_intr_func_t; /* Pointer to callback function */
-
-#endif /* _KERNEL */
-
-#endif	/* _NETATM_ATM_IF_H */
diff --git a/include.new/netatm/atm_ioctl.h b/include.new/netatm/atm_ioctl.h
deleted file mode 100644
index aa20d3e..0000000
--- a/include.new/netatm/atm_ioctl.h
+++ /dev/null
@@ -1,430 +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: src/sys/netatm/atm_ioctl.h,v 1.10 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * PF_ATM socket ioctl definitions
- *
- */
-
-#ifndef _NETATM_ATM_IOCTL_H
-#define _NETATM_ATM_IOCTL_H
-
-
-/*
- * Structure for PF_ATM configure (AIOCCFG) socket ioctls
- */
-struct atmcfgreq {
-	int		acr_opcode;		/* Sub-operation */
-	union {
-		struct {
-			/* Configure - attach */
-			char	acru_att_intf[IFNAMSIZ];/* Interface name */
-			u_char	acru_att_proto;	/* Signalling protocol */
-		} acru_att;
-		struct {
-			/* Configure - detach */
-			char	acru_det_intf[IFNAMSIZ];/* Interface name */
-		} acru_det;
-	} acr_u;
-};
-#define	acr_att_intf	acr_u.acru_att.acru_att_intf
-#define	acr_att_proto	acr_u.acru_att.acru_att_proto
-#define	acr_det_intf	acr_u.acru_det.acru_det_intf
-
-
-/*
- * Structure for PF_ATM set (AIOCSET) socket ioctls
- */
-struct atmsetreq {
-	int		asr_opcode;		/* Sub-operation */
-	union {
-		/* ARP server */
-		struct {
-			char	asru_arp_intf[IFNAMSIZ];/* Interface name */
-			Atm_addr	asru_arp_addr;	/* ARP srvr address */
-			Atm_addr	asru_arp_subaddr;/* ARP srvr subaddr */
-			caddr_t		asru_arp_pbuf;	/* Prefix buffer addr */
-			size_t		asru_arp_plen;	/* Prefix buffer len */
-		} asru_asrvr;
-		/* MAC address */
-		struct {
-			char	asru_mac_intf[IFNAMSIZ];/* Interface name */
-			struct mac_addr	asru_mac_addr;	/* MAC address */
-		} asru_mac;
-		/* Network interface */
-		struct {
-			char	asru_nif_intf[IFNAMSIZ];/* Interface name */
-			char	asru_nif_pref[IFNAMSIZ];/* I/f prefix name */
-			u_int	asru_nif_cnt;		/* Number of i/fs */
-		} asru_nif;
-		/* NSAP prefix */
-		struct {
-			char	asru_prf_intf[IFNAMSIZ];/* Interface name */
-			u_char	asru_prf_pref[13];	/* NSAP prefix */
-		} asru_prf;
-	} asr_u;
-};
-#define	asr_arp_intf	asr_u.asru_asrvr.asru_arp_intf
-#define	asr_arp_addr	asr_u.asru_asrvr.asru_arp_addr
-#define	asr_arp_pbuf	asr_u.asru_asrvr.asru_arp_pbuf
-#define	asr_arp_plen	asr_u.asru_asrvr.asru_arp_plen
-#define	asr_arp_subaddr	asr_u.asru_asrvr.asru_arp_subaddr
-#define	asr_mac_intf	asr_u.asru_mac.asru_mac_intf
-#define	asr_mac_addr	asr_u.asru_mac.asru_mac_addr
-#define	asr_nif_intf	asr_u.asru_nif.asru_nif_intf
-#define	asr_nif_pref	asr_u.asru_nif.asru_nif_pref
-#define	asr_nif_cnt	asr_u.asru_nif.asru_nif_cnt
-#define	asr_prf_intf	asr_u.asru_prf.asru_prf_intf
-#define	asr_prf_pref	asr_u.asru_prf.asru_prf_pref
-
-
-/*
- * Structure for PF_ATM add (AIOCADD) socket ioctls
- */
-struct atmaddreq {
-	int		aar_opcode;		/* Sub-operation */
-	union {
-		/* Add PVC */
-		struct {
-			char	aaru_pvc_intf[IFNAMSIZ];/* Interface name */
-			u_short	aaru_pvc_vpi;		/* VPI value */
-			u_short	aaru_pvc_vci;		/* VCI value */
-			struct sockaddr	aaru_pvc_dst;	/* Destination addr */
-			Sap_t	aaru_pvc_sap;		/* Endpoint SAP */
-			Aal_t	aaru_pvc_aal;		/* AAL */
-			Encaps_t aaru_pvc_encaps;	/* Encapsulation */
-			u_char	aaru_pvc_flags;		/* Flags (see below) */
-			uint8_t	aaru_pvc_traffic_type;	/* traffic type */
-			struct t_atm_traffic aaru_pvc_traffic; /* traffic parameters */
-		} aaru_add_pvc;
-
-		/* Add ARP table entry */
-		struct {
-			char	aaru_arp_intf[IFNAMSIZ];/* Interface name */
-			struct sockaddr	aaru_arp_dst;	/* IP addr */
-			Atm_addr	aaru_arp_addr;	/* ATM addr */
-			u_char	aaru_arp_origin;	/* Entry origin */
-		} aaru_add_arp;
-	} aar_u;
-};
-#define	aar_pvc_intf	aar_u.aaru_add_pvc.aaru_pvc_intf
-#define	aar_pvc_vpi	aar_u.aaru_add_pvc.aaru_pvc_vpi
-#define	aar_pvc_vci	aar_u.aaru_add_pvc.aaru_pvc_vci
-#define	aar_pvc_dst	aar_u.aaru_add_pvc.aaru_pvc_dst
-#define	aar_pvc_sap	aar_u.aaru_add_pvc.aaru_pvc_sap
-#define	aar_pvc_aal	aar_u.aaru_add_pvc.aaru_pvc_aal
-#define	aar_pvc_encaps	aar_u.aaru_add_pvc.aaru_pvc_encaps
-#define	aar_pvc_flags	aar_u.aaru_add_pvc.aaru_pvc_flags
-#define	aar_pvc_traffic_type	aar_u.aaru_add_pvc.aaru_pvc_traffic_type
-#define	aar_pvc_traffic	aar_u.aaru_add_pvc.aaru_pvc_traffic
-#define	aar_arp_intf	aar_u.aaru_add_arp.aaru_arp_intf
-#define	aar_arp_dst	aar_u.aaru_add_arp.aaru_arp_dst
-#define	aar_arp_addr	aar_u.aaru_add_arp.aaru_arp_addr
-#define	aar_arp_origin	aar_u.aaru_add_arp.aaru_arp_origin
-
-/* PVC flags */
-#define	PVC_DYN		0x01			/* Dest addr is dynamic */
-
-
-/*
- * Structure for PF_ATM delete (AIOCDEL) socket ioctls
- */
-struct atmdelreq {
-	int		adr_opcode;		/* Sub-operation */
-	union {
-		/* Delete PVC */
-		struct {
-			char	adru_pvc_intf[IFNAMSIZ];/* Interface name */
-			u_short	adru_pvc_vpi;		/* VPI value */
-			u_short	adru_pvc_vci;		/* VCI value */
-		} adru_del_pvc;
-
-		/* Delete SVC */
-		struct {
-			char	adru_svc_intf[IFNAMSIZ];/* Interface name */
-			u_short	adru_svc_vpi;		/* VPI value */
-			u_short	adru_svc_vci;		/* VCI value */
-		} adru_del_svc;
-
-		/* Delete ARP table entry */
-		struct {
-			char	adru_arp_intf[IFNAMSIZ];/* Interface name */
-			struct sockaddr	adru_arp_dst;	/* IP addr */
-		} adru_del_arp;
-	} adr_u;
-};
-#define	adr_pvc_intf	adr_u.adru_del_pvc.adru_pvc_intf
-#define	adr_pvc_vpi	adr_u.adru_del_pvc.adru_pvc_vpi
-#define	adr_pvc_vci	adr_u.adru_del_pvc.adru_pvc_vci
-#define	adr_svc_intf	adr_u.adru_del_svc.adru_svc_intf
-#define	adr_svc_vpi	adr_u.adru_del_svc.adru_svc_vpi
-#define	adr_svc_vci	adr_u.adru_del_svc.adru_svc_vci
-#define	adr_arp_intf	adr_u.adru_del_arp.adru_arp_intf
-#define	adr_arp_dst	adr_u.adru_del_arp.adru_arp_dst
-
-
-/*
- * Structure for PF_ATM information (AIOCINFO) socket ioctls
- */
-struct atminfreq {
-	int		air_opcode;		/* Sub-operation */
-	caddr_t		air_buf_addr;		/* Buffer for returned info */
-	size_t		air_buf_len;		/* Buffer length */
-	union {
-		/* Vendor info */
-		char		airu_vinfo_intf[IFNAMSIZ];/* Interface name */
-		/* IP VCC */
-		struct sockaddr	airu_ip_addr;		/* Destination host */
-		/* ARP table */
-		struct {
-			struct sockaddr	airu_arp_addr;	/* Destination host */
-			u_char		airu_arp_flags;	/* Flags (see below) */
-		} airu_arp;
-		/* ARP server */
-		char		airu_asrv_intf[IFNAMSIZ];/* Interface name */
-		/* Interface */
-		char		airu_int_intf[IFNAMSIZ];/* Interface name */
-		/* VCC */
-		char		airu_vcc_intf[IFNAMSIZ];/* Interface name */
-		/* Configuration */
-		char		airu_cfg_intf[IFNAMSIZ];/* Interface name */
-		/* Network interface */
-		char		airu_netif_intf[IFNAMSIZ];/* Interface name */
-		/* Physical interface statistics */
-		char		airu_physt_intf[IFNAMSIZ];/* Interface name */
-	} air_u;
-};
-#define	air_vinfo_intf		air_u.airu_vinfo_intf
-#define	air_ip_addr		air_u.airu_ip_addr
-#define	air_arp_addr		air_u.airu_arp.airu_arp_addr
-#define	air_arp_flags		air_u.airu_arp.airu_arp_flags
-#define	air_asrv_intf		air_u.airu_asrv_intf
-#define	air_int_intf		air_u.airu_int_intf
-#define	air_vcc_intf		air_u.airu_vcc_intf
-#define	air_cfg_intf		air_u.airu_cfg_intf
-#define	air_netif_intf		air_u.airu_netif_intf
-#define	air_physt_intf		air_u.airu_physt_intf
-
-/* ARP table info flags */
-#define	ARP_RESET_REF	0x01			/* Reset refresh status */
-
-
-/*
- * Structures returned by information requests
- */
-
-/*
- * Vendor-specific interface information
- */
-struct air_vinfo_rsp {
-	char		avsp_intf[IFNAMSIZ];	/* Interface name */
-	size_t		avsp_len;		/* Length of returned
-							Vendor Info block */
-						/* Vendor info ... */
-};
-
-
-/*
- * ARP table information
- */
-struct air_arp_rsp {
-	struct sockaddr	aap_arp_addr;		/* Destination host */
-	char		aap_intf[IFNAMSIZ];	/* Interface name */
-	u_char		aap_flags;		/* Flags (see below) */
-	u_char		aap_origin;		/* Entry origin (see below) */
-	u_char		aap_age;		/* Aging timeout (minutes) */
-	Atm_addr	aap_addr;		/* ATM address */
-	Atm_addr	aap_subaddr;		/* ATM subaddress */
-};
-
-/*
- * ARP entry flags
- */
-#define	ARPF_VALID	0x01			/* Entry is valid */
-#define	ARPF_REFRESH	0x02			/* Entry has been refreshed */
-
-/*
- * ARP entry origin
- */
-#define	ARP_ORIG_PERM	50			/* Permanent entry */
-
-/*
- * IP VCC information
- */
-struct air_ip_vcc_rsp {
-	struct sockaddr	aip_dst_addr;		/* Destination host */
-	char		aip_intf[IFNAMSIZ];	/* Interface name */
-	u_short		aip_vpi;		/* VPI value */
-	u_short		aip_vci;		/* VCI value */
-	u_char		aip_sig_proto;		/* Signalling protocol */
-	u_char		aip_flags;		/* Flags (IVF_*) */
-	u_char		aip_state;		/* IP VCC state */
-};
-
-/*
- * ARP server information
- */
-struct air_asrv_rsp {
-	char		asp_intf[IFNAMSIZ];	/* Interface name */
-	Atm_addr	asp_addr;		/* Server ATM address */
-	Atm_addr	asp_subaddr;		/* Server ATM subaddress */
-	int		asp_state;		/* Server state */
-	int		asp_nprefix;		/* Number of prefix entries */
-};
-
-/*
- * Interface information
- */
-struct air_int_rsp {
-	char		anp_intf[IFNAMSIZ];	/* Interface name */
-	Atm_addr	anp_addr;		/* ATM address */
-	Atm_addr	anp_subaddr;		/* ATM subaddress */
-	u_char		anp_sig_proto;		/* Signalling protocol */
-	u_char		anp_sig_state;		/* Signalling protocol state */
-	char		anp_nif_pref[IFNAMSIZ]; /* Netif prefix */
-	u_int		anp_nif_cnt;		/* No. of netifs */
-};
-
-/*
- * Network interface information
- */
-struct air_netif_rsp {
-	char		anp_intf[IFNAMSIZ];	/* Interface name */
-	struct sockaddr	anp_proto_addr;		/* Protocol address */
-	char		anp_phy_intf[IFNAMSIZ];	/* Interface name */
-};
-
-/*
- * VCC information
- * Todo: add avp_traffic_type and avp_traffic. Update unisig_if.c,
- *	spans_if.c and sigpvc_if.c
- */
-#define	O_CNT		8
-struct air_vcc_rsp {
-	char		avp_intf[IFNAMSIZ];	/* Interface name */
-	u_short		avp_vpi;		/* VPI value */
-	u_short		avp_vci;		/* VCI value */
-	u_char		avp_type;		/* Type (SVC or PVC) */
-	u_char		avp_aal;		/* AAL */
-	u_char		avp_sig_proto;		/* Signalling protocol */
-	Encaps_t	avp_encaps;		/* Encapsulation */
-	u_char		avp_state;		/* State (sig mgr specific) */
-	char		avp_owners[(T_ATM_APP_NAME_LEN+1)*O_CNT];/* VCC users */
-	Atm_addr	avp_daddr;		/* Address of far end */
-	Atm_addr	avp_dsubaddr;		/* Subaddress of far end */
-	u_long		avp_ipdus;		/* PDUs received from VCC */
-	u_long		avp_opdus;		/* PDUs sent to VCC */
-	u_long		avp_ibytes;		/* Bytes received from VCC */
-	u_long		avp_obytes;		/* Bytes sent to VCC */
-	u_long		avp_ierrors;		/* Errors receiving from VCC */
-	u_long		avp_oerrors;		/* Errors sending to VCC */
-	time_t		avp_tstamp;		/* State transition timestamp */
-};
-
-/*
- * Adapter configuration information
- */
-struct air_cfg_rsp {
-	char		acp_intf[IFNAMSIZ];	/* Interface name */
-	Atm_config	acp_cfg;		/* Config info */
-};
-#define	acp_vendor	acp_cfg.ac_vendor
-#define	acp_vendapi	acp_cfg.ac_vendapi
-#define	acp_device	acp_cfg.ac_device
-#define	acp_media	acp_cfg.ac_media
-#define	acp_serial	acp_cfg.ac_serial
-#define	acp_bustype	acp_cfg.ac_bustype
-#define	acp_busslot	acp_cfg.ac_busslot
-#define	acp_ram		acp_cfg.ac_ram
-#define	acp_ramsize	acp_cfg.ac_ramsize
-#define	acp_macaddr	acp_cfg.ac_macaddr
-#define	acp_hard_vers	acp_cfg.ac_hard_vers
-#define	acp_firm_vers	acp_cfg.ac_firm_vers
-
-/*
- * Version information
- */
-struct air_version_rsp {
-	int		avp_version;		/* Software version */
-};
-
-/*
- * Physical interface statistics
- */
-struct air_phy_stat_rsp {
-	char		app_intf[IFNAMSIZ];	/* Interface name */
-	u_quad_t	app_ipdus;		/* PDUs received from I/F */
-	u_quad_t	app_opdus;		/* PDUs sent to I/F */
-	u_quad_t	app_ibytes;		/* Bytes received from I/F */
-	u_quad_t	app_obytes;		/* Bytes sent to I/F */
-	u_quad_t	app_ierrors;		/* Errors receiving from I/F */
-	u_quad_t	app_oerrors;		/* Errors sending to I/F */
-	u_quad_t	app_cmderrors;		/* I/F command errors */
-};
-
-
-/*
- * PF_ATM sub-operation codes
- */
-#define	AIOCS_CFG_ATT	1
-#define	AIOCS_CFG_DET	2
-#define	AIOCS_ADD_PVC	32
-#define	AIOCS_ADD_ARP	33
-#define	AIOCS_DEL_PVC	64
-#define	AIOCS_DEL_SVC	65
-#define	AIOCS_DEL_ARP	66
-#define	AIOCS_SET_ASV	96
-#define	AIOCS_SET_NIF	97
-#define	AIOCS_SET_PRF 	98
-#define	AIOCS_SET_MAC 	99
-#define	AIOCS_INF_VST	160
-#define	AIOCS_INF_IPM	161
-#define	AIOCS_INF_ARP	162
-#define	AIOCS_INF_ASV	163
-#define	AIOCS_INF_INT	164
-#define	AIOCS_INF_VCC	165
-#define	AIOCS_INF_CFG	166
-#define	AIOCS_INF_NIF	167
-#define	AIOCS_INF_PIS	168
-#define	AIOCS_INF_VER	169
-
-
-/*
- * PF_ATM ioctls
- */
-#define	AIOCCFG		_IOW('A', 128, struct atmcfgreq)/* Configure i/f */
-#define	AIOCADD		_IOW('A', 129, struct atmaddreq)/* Add (e.g. PVC) */
-#define	AIOCDEL		_IOW('A', 130, struct atmdelreq)/* Delete */
-#define	AIOCSET		_IOW('A', 132, struct atmsetreq)/* Set (e.g. net i/f) */
-#define	AIOCINFO	_IOWR('A', 133, struct atminfreq)/* Show kernel info */
-
-#endif	/* _NETATM_ATM_IOCTL_H */
diff --git a/include.new/netatm/atm_pcb.h b/include.new/netatm/atm_pcb.h
deleted file mode 100644
index e0eed21..0000000
--- a/include.new/netatm/atm_pcb.h
+++ /dev/null
@@ -1,92 +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: src/sys/netatm/atm_pcb.h,v 1.4 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * ATM socket protocol definitions
- *
- */
-
-#ifndef _NETATM_ATM_PCB_H
-#define _NETATM_ATM_PCB_H
-
-
-#ifdef _KERNEL
-/*
- * ATM Socket PCB
- *
- * Common structure for all ATM protocol sockets.  This control block
- * will be used for all ATM socket types.
- */
-struct atm_pcb {
-	struct socket	*atp_socket;	/* Socket */
-	Atm_connection	*atp_conn;	/* Connection manager token */
-	u_char		atp_type;	/* Protocol type (see below) */
-	u_char		atp_flags;	/* Protocol flags (see below) */
-	Atm_attributes	atp_attr;	/* Socket's call attributes */
-	char		atp_name[T_ATM_APP_NAME_LEN];	/* Owner's name */
-};
-typedef struct atm_pcb	Atm_pcb;
-
-/*
- * Protocol Types
- */
-#define	ATPT_AAL5	0		/* AAL type 5 protocol */
-#define	ATPT_SSCOP	1		/* SSCOP protocol */
-#define	ATPT_NUM	2		/* Number of protocols */
-
-/*
- * PCB Flags
- */
-
-
-/*
- * Handy macros
- */
-#define sotoatmpcb(so)   ((Atm_pcb *)(so)->so_pcb)
-
-
-/*
- * ATM Socket Statistics
- */
-struct atm_sock_stat {
-	u_long	as_connreq[ATPT_NUM];	/* Connection requests */
-	u_long	as_inconn[ATPT_NUM];	/* Incoming connection requests */
-	u_long	as_conncomp[ATPT_NUM];	/* Connections completed */
-	u_long	as_connfail[ATPT_NUM];	/* Connections failed */
-	u_long	as_connrel[ATPT_NUM];	/* Connections released */
-	u_long	as_connclr[ATPT_NUM];	/* Connections cleared */
-	u_long	as_indrop[ATPT_NUM];	/* Input packets dropped */
-	u_long	as_outdrop[ATPT_NUM];	/* Output packets dropped */
-};
-#endif	/* _KERNEL */
-
-#endif	/* _NETATM_ATM_PCB_H */
diff --git a/include.new/netatm/atm_sap.h b/include.new/netatm/atm_sap.h
deleted file mode 100644
index 941d594..0000000
--- a/include.new/netatm/atm_sap.h
+++ /dev/null
@@ -1,81 +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: src/sys/netatm/atm_sap.h,v 1.3 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * ATM Services definitions
- *
- */
-
-#ifndef _NETATM_ATM_SAP_H
-#define _NETATM_ATM_SAP_H
-
-/*
- * Service Access Point (SAP)
- *
- * A SAP specifies the definition of an interface used between two adjacent
- * layers.  The SAP is named for the services the lower layer provides to 
- * the upper layer.
- *
- * The types of SAPs used are:
- * 	Stack - defines the interfaces between stack service entities.
- *		These are further divided into:
- *
- *		Stack class SAP - which identifies the type of interface
- *			used.  All SAPs of a particular class will provide
- *			the same interface services to the higher layer.
- *			All stack command codes are constructed using class
- *			SAP values.
- *
- *		Stack instance SAP - which identifies the specific identity
- *			of the layer providing the class interface.
- */
-typedef u_short	Sap_t;
-
-#define	SAP_TYPE_MASK	0xc000
-#define	SAP_TYPE_STACK	0x8000
-#define	SAP_CLASS_MASK	0xff80
-
-#define	SAP_STACK(c, i)		(SAP_TYPE_STACK | ((c) << 7) | (i))
-
-/* Stack SAPs */
-#define	SAP_ATM			SAP_STACK(1, 0)		/* ATM cell */
-#define	SAP_SAR			SAP_STACK(2, 0)		/* AAL SAR */
-#define	SAP_SAR_AAL3_4		SAP_STACK(2, 3)		/* AAL3/4 SAR */
-#define	SAP_SAR_AAL5		SAP_STACK(2, 5)		/* AAL5 SAR */
-#define	SAP_CPCS		SAP_STACK(3, 0)		/* AAL CPCS */
-#define	SAP_CPCS_AAL3_4		SAP_STACK(3, 3)		/* AAL3/4 CPCS */
-#define	SAP_CPCS_AAL5		SAP_STACK(3, 5)		/* AAL5 CPCS */
-#define	SAP_SSCOP		SAP_STACK(4, 0)		/* ITU Q.2110 */
-#define	SAP_SSCF_UNI		SAP_STACK(5, 0)		/* ITU Q.2130 */
-#define	SAP_SSCF_NNI		SAP_STACK(6, 0)		/* ITU Q.2140 */
-
-#endif	/* _NETATM_ATM_SAP_H */
diff --git a/include.new/netatm/atm_sigmgr.h b/include.new/netatm/atm_sigmgr.h
deleted file mode 100644
index 7b8f980..0000000
--- a/include.new/netatm/atm_sigmgr.h
+++ /dev/null
@@ -1,109 +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: src/sys/netatm/atm_sigmgr.h,v 1.5 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * ATM Signalling Manager definitions 
- *
- */
-
-#ifndef _NETATM_ATM_SIGMGR_H
-#define _NETATM_ATM_SIGMGR_H
-
-#ifdef _KERNEL
-/*
- * Structure common to all ATM Signalling Managers.  Each Signalling 
- * Manager must create one of these and use it to register itself 
- * with the system.
- */
-struct	sigmgr {
-	struct sigmgr	*sm_next;	/* Next registered sigmgr */
-	u_char		sm_proto;	/* Signalling protocol (see below) */
-	struct siginst	*sm_prinst;	/* List of protocol instances */
-/* Exported functions */
-	int		(*sm_attach)	/* Attach interface */
-				(struct sigmgr *, struct atm_pif *);
-	int		(*sm_detach)	/* Detach interface */
-				(struct atm_pif *);
-	int		(*sm_setup)	/* Connection setup */
-				(Atm_connvc *, int *);
-	int		(*sm_accept)	/* Call accepted */
-				(struct vccb *, int *);
-	int		(*sm_reject)	/* Call rejected */
-				(struct vccb *, int *);
-	int		(*sm_release)	/* Connection release */
-				(struct vccb *, int *);
-	int		(*sm_free)	/* Free connection resources */
-				(struct vccb *);
-	int		(*sm_ioctl)	/* Ioctl handler */
-				(int, caddr_t, caddr_t);
-};
-#endif	/* _KERNEL */
-
-/* 
- * ATM Signalling Protocols
- */
-#define	ATM_SIG_PVC	1		/* PVC-only */
-#define	ATM_SIG_SPANS	2		/* Fore Systems SPANS */
-#define	ATM_SIG_UNI30	3		/* ATM Forum UNI 3.0 */
-#define	ATM_SIG_UNI31	4		/* ATM Forum UNI 3.1 */
-#define	ATM_SIG_UNI40	5		/* ATM Forum UNI 4.0 */
-
-
-#ifdef _KERNEL
-/*
- * Signalling Protocol Instance control block header.  Common header for
- * every signalling protocol instance control block.
- */
-struct	siginst {
-	struct siginst	*si_next;	/* Next sigmgr protocol instance */
-	struct atm_pif	*si_pif;	/* Device interface */
-	Atm_addr	si_addr;	/* Interface ATM address */
-	Atm_addr	si_subaddr;	/* Interface ATM subaddress */
-	Queue_t		si_vccq;	/* VCCB queue */
-	u_short		si_state;	/* Protocol state (sigmgr specific) */
-
-/* Exported protocol services */
-	struct ip_serv	*si_ipserv;	/* IP/ATM services */
-};
-
-
-/*
- * Sigmgr function return codes
- */
-#define	CALL_PROCEEDING	1		/* Connection request is in progress */
-#define	CALL_FAILED	2		/* Connection request failed */
-#define	CALL_CONNECTED	3		/* Connection setup successful */
-#define	CALL_CLEARED	4		/* Connection has been terminated */
-
-#endif	/* _KERNEL */
-
-#endif	/* _NETATM_ATM_SIGMGR_H */
diff --git a/include.new/netatm/atm_stack.h b/include.new/netatm/atm_stack.h
deleted file mode 100644
index face2ea..0000000
--- a/include.new/netatm/atm_stack.h
+++ /dev/null
@@ -1,287 +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: src/sys/netatm/atm_stack.h,v 1.6 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * ATM Stack definitions
- *
- */
-
-#ifndef _NETATM_ATM_STACK_H
-#define _NETATM_ATM_STACK_H
-
-#ifdef _KERNEL
-/*
- * Structure used to define a kernel-provided ATM stack service and its
- * associated entry points.  Each stack service provider must register
- * themselves before they will be used.  ATM stack service providers include 
- * kernel modules (both linked and loaded) and device drivers, which must list
- * (via its atm_pif) any of its available hardware-supplied stack services 
- * (such as on-card AAL processing).
- */
-struct stack_defn {
-	struct stack_defn *sd_next;	/* Next in registry list */
-	Sap_t		sd_sap;		/* Stack instance SAP */
-	u_char		sd_flag;	/* Flags (see below) */
-/* Exported functions */
-	int		(*sd_inst)	/* Stack instantiation */
-				(struct stack_defn **, Atm_connvc *);
-	void		(*sd_lower)	/* Lower (from above) command handler */
-				(int, void *, intptr_t, intptr_t);
-	void		(*sd_upper)	/* Upper (from below) command handler */
-				(int, void *, intptr_t, intptr_t);
-/* Variables used during stack instantiation */
-	void		*sd_toku;	/* Stack service instance token */
-};
-
-/*
- * Stack Service Flags
- */
-#define	SDF_TERM	0x01		/* Terminal (to lowest layer) service */
-
-
-/*
- * Stack Specification List  
- *
- * The list names the stack services and their layering relationships in
- * order to construct a stack to provide the protocol services defined
- * by the list.  The list is ordered starting from the stack service 
- * interfacing with the user "down" to the ATM cell service.
- */
-#define	STACK_CNT	8		/* Max services in a stack list */
-struct stack_list {
-	Sap_t		sl_sap[STACK_CNT];	/* Stack service SAP list */
-};
-
-
-/*
- * Structure used during the construction and instantiation of a stack 
- * instance from a supplied stack list.  It contains pointers to the stack 
- * service definitions which will be used to implement the stack.  The first 
- * element in the array is reserved for the user's "stack service".
- */
-struct stack_inst {
-	struct stack_defn *si_srvc[STACK_CNT+1];	/* Assigned services */
-};
-
-
-/*
- * Macros to update buffer headroom values during stack instantiation.
- *
- * These values are advisory, i.e. every service must verify the amount
- * of available space in input/output messages and allocate new buffers
- * if needed.
- *
- * The 'maximum' and 'minimum' values used below may be chosen by a 
- * service to reflect the typical, expected message traffic pattern 
- * for a specific connection.
- * 
- * The macro arguments are:
- *	cvp = pointer to connection vcc;
- *	hi = maximum amount of buffer headroom required by the current
- *	     service during input message processing;
- *	si = minimum amount of buffer data stripped off the front 
- *	     of an input message by the current service;
- *	ho = maximum amount of buffer headroom required by the current
- *	     service during output message processing;
- *	ao = maximum amount of buffer data added to the front 
- *	     of an output message by the current service;
- */
-#define HEADIN(cvp, hi, si)					\
-{								\
-	short	t = (cvp)->cvc_attr.headin - (si);		\
-	t = (t >= (hi)) ? t : (hi);				\
-	(cvp)->cvc_attr.headin = roundup(t, sizeof(long));	\
-}
-
-#define HEADOUT(cvp, ho, ao)					\
-{								\
-	short	t = (cvp)->cvc_attr.headout + (ao);		\
-	t = (t >= (ho)) ? t : (ho);				\
-	(cvp)->cvc_attr.headout = roundup(t, sizeof(long));	\
-}
-
-
-/*
- * Stack command codes - All stack command codes are specific to the 
- * defined stack SAP across which the command is used.  Command values 0-15 
- * are reserved for any common codes, which all stack SAPs must support.
- */
-#define	STKCMD(s, d, v)	(((s) << 16) | (d) | (v))
-#define	STKCMD_DOWN	0
-#define	STKCMD_UP	0x00008000
-#define	STKCMD_SAP_MASK	0xffff0000
-#define	STKCMD_VAL_MASK	0x00007fff
-
-/* Common command values (0-15) */
-#define	CCV_INIT	1		/* DOWN */
-#define	CCV_TERM	2		/* DOWN */
-
-/* SAP_ATM */
-#define	ATM_INIT		STKCMD(SAP_ATM, STKCMD_DOWN, CCV_INIT)
-#define	ATM_TERM		STKCMD(SAP_ATM, STKCMD_DOWN, CCV_TERM)
-#define	ATM_DATA_REQ		STKCMD(SAP_ATM, STKCMD_DOWN, 16)
-#define	ATM_DATA_IND		STKCMD(SAP_ATM, STKCMD_UP, 17)
-
-/* SAP_SAR */
-#define	SAR_INIT		STKCMD(SAP_SAR, STKCMD_DOWN, CCV_INIT)
-#define	SAR_TERM		STKCMD(SAP_SAR, STKCMD_DOWN, CCV_TERM)
-#define	SAR_UNITDATA_INV	STKCMD(SAP_SAR, STKCMD_DOWN, 16)
-#define	SAR_UNITDATA_SIG	STKCMD(SAP_SAR, STKCMD_UP, 17)
-#define	SAR_UABORT_INV		STKCMD(SAP_SAR, STKCMD_DOWN, 18)
-#define	SAR_UABORT_SIG		STKCMD(SAP_SAR, STKCMD_UP, 19)
-#define	SAR_PABORT_SIG		STKCMD(SAP_SAR, STKCMD_UP, 20)
-
-/* SAP_CPCS */
-#define	CPCS_INIT		STKCMD(SAP_CPCS, STKCMD_DOWN, CCV_INIT)
-#define	CPCS_TERM		STKCMD(SAP_CPCS, STKCMD_DOWN, CCV_TERM)
-#define	CPCS_UNITDATA_INV	STKCMD(SAP_CPCS, STKCMD_DOWN, 16)
-#define	CPCS_UNITDATA_SIG	STKCMD(SAP_CPCS, STKCMD_UP, 17)
-#define	CPCS_UABORT_INV		STKCMD(SAP_CPCS, STKCMD_DOWN, 18)
-#define	CPCS_UABORT_SIG		STKCMD(SAP_CPCS, STKCMD_UP, 19)
-#define	CPCS_PABORT_SIG		STKCMD(SAP_CPCS, STKCMD_UP, 20)
-
-/* SAP_SSCOP */
-#define	SSCOP_INIT		STKCMD(SAP_SSCOP, STKCMD_DOWN, CCV_INIT)
-#define	SSCOP_TERM		STKCMD(SAP_SSCOP, STKCMD_DOWN, CCV_TERM)
-#define	SSCOP_ESTABLISH_REQ	STKCMD(SAP_SSCOP, STKCMD_DOWN, 16)
-#define	SSCOP_ESTABLISH_IND	STKCMD(SAP_SSCOP, STKCMD_UP, 17)
-#define	SSCOP_ESTABLISH_RSP	STKCMD(SAP_SSCOP, STKCMD_DOWN, 18)
-#define	SSCOP_ESTABLISH_CNF	STKCMD(SAP_SSCOP, STKCMD_UP, 19)
-#define	SSCOP_RELEASE_REQ	STKCMD(SAP_SSCOP, STKCMD_DOWN, 20)
-#define	SSCOP_RELEASE_IND	STKCMD(SAP_SSCOP, STKCMD_UP, 21)
-#define	SSCOP_RELEASE_CNF	STKCMD(SAP_SSCOP, STKCMD_UP, 22)
-#define	SSCOP_DATA_REQ		STKCMD(SAP_SSCOP, STKCMD_DOWN, 23)
-#define	SSCOP_DATA_IND		STKCMD(SAP_SSCOP, STKCMD_UP, 24)
-#define	SSCOP_RESYNC_REQ	STKCMD(SAP_SSCOP, STKCMD_DOWN, 25)
-#define	SSCOP_RESYNC_IND	STKCMD(SAP_SSCOP, STKCMD_UP, 26)
-#define	SSCOP_RESYNC_RSP	STKCMD(SAP_SSCOP, STKCMD_DOWN, 27)
-#define	SSCOP_RESYNC_CNF	STKCMD(SAP_SSCOP, STKCMD_UP, 28)
-#define	SSCOP_RECOVER_IND	STKCMD(SAP_SSCOP, STKCMD_UP, 29)
-#define	SSCOP_RECOVER_RSP	STKCMD(SAP_SSCOP, STKCMD_DOWN, 30)
-#define	SSCOP_UNITDATA_REQ	STKCMD(SAP_SSCOP, STKCMD_DOWN, 31)
-#define	SSCOP_UNITDATA_IND	STKCMD(SAP_SSCOP, STKCMD_UP, 32)
-#define	SSCOP_RETRIEVE_REQ	STKCMD(SAP_SSCOP, STKCMD_DOWN, 33)
-#define	SSCOP_RETRIEVE_IND	STKCMD(SAP_SSCOP, STKCMD_UP, 34)
-#define	SSCOP_RETRIEVECMP_IND	STKCMD(SAP_SSCOP, STKCMD_UP, 35)
-
-/* SAP_SSCF_UNI */
-#define	SSCF_UNI_INIT		STKCMD(SAP_SSCF_UNI, STKCMD_DOWN, CCV_INIT)
-#define	SSCF_UNI_TERM		STKCMD(SAP_SSCF_UNI, STKCMD_DOWN, CCV_TERM)
-#define	SSCF_UNI_ESTABLISH_REQ	STKCMD(SAP_SSCF_UNI, STKCMD_DOWN, 16)
-#define	SSCF_UNI_ESTABLISH_IND	STKCMD(SAP_SSCF_UNI, STKCMD_UP, 17)
-#define	SSCF_UNI_ESTABLISH_CNF	STKCMD(SAP_SSCF_UNI, STKCMD_UP, 18)
-#define	SSCF_UNI_RELEASE_REQ	STKCMD(SAP_SSCF_UNI, STKCMD_DOWN, 19)
-#define	SSCF_UNI_RELEASE_IND	STKCMD(SAP_SSCF_UNI, STKCMD_UP, 20)
-#define	SSCF_UNI_RELEASE_CNF	STKCMD(SAP_SSCF_UNI, STKCMD_UP, 21)
-#define	SSCF_UNI_DATA_REQ	STKCMD(SAP_SSCF_UNI, STKCMD_DOWN, 22)
-#define	SSCF_UNI_DATA_IND	STKCMD(SAP_SSCF_UNI, STKCMD_UP, 23)
-#define	SSCF_UNI_UNITDATA_REQ	STKCMD(SAP_SSCF_UNI, STKCMD_DOWN, 24)
-#define	SSCF_UNI_UNITDATA_IND	STKCMD(SAP_SSCF_UNI, STKCMD_UP, 25)
-
-
-/*
- * The STACK_CALL macro must be used for all stack calls between adjacent
- * entities.  In order to avoid the problem with recursive stack calls 
- * modifying protocol state, this macro will only allow calls to proceed if 
- * they are not "against the flow" of any currently pending calls for a
- * stack instance.  If the requested call can't be processed now, it will 
- * be deferred and queued until a later, safe time (but before control is 
- * returned back to the kernel scheduler) when it will be dispatched.
- *
- * The STACK_CALL macro arguments are:
- *	cmd = command code;
- *	fn  = Destination entity processing function
- * 	tok = Destination layer's session token;
- *	cvp = Connection VCC address;
- *	a1  = command specific argument;
- *	a2  = command specific argument;
- *	ret = call result value (0 => success)
- *
- * The receiving entity command processing function prototype is:
- *
- * 	void (fn)(int cmd, int tok, int arg1, int arg2)
- *
- */
-#define	STACK_CALL(cmd, fn, tok, cvp, a1, a2, ret)			\
-{									\
-	if ((cmd) & STKCMD_UP) {					\
-		if ((cvp)->cvc_downcnt) {				\
-			(ret) = atm_stack_enq((cmd), (fn), (tok), 	\
-						(cvp), (a1), (a2));	\
-		} else {						\
-			(cvp)->cvc_upcnt++;				\
-			(*fn)(cmd, tok, a1, a2);			\
-			(cvp)->cvc_upcnt--;				\
-			(ret) = 0;					\
-		}							\
-	} else {							\
-		if ((cvp)->cvc_upcnt) {					\
-			(ret) = atm_stack_enq((cmd), (fn), (tok), 	\
-						(cvp), (a1), (a2));	\
-		} else {						\
-			(cvp)->cvc_downcnt++;				\
-			(*fn)(cmd, tok, a1, a2);			\
-			(cvp)->cvc_downcnt--;				\
-			(ret) = 0;					\
-		}							\
-	}								\
-}
-
-
-/*
- * Stack queue entry - The stack queue will contain stack calls which have 
- * been deferred in order to avoid recursive calls to a single protocol 
- * control block.  The queue entries are allocated from its own storage pool.
- */
-struct stackq_entry {
-	struct stackq_entry *sq_next;	/* Next entry in queue */
-	int		sq_cmd;		/* Stack command */
-	void		(*sq_func)	/* Destination function */
-				(int, void *, intptr_t, intptr_t);
-	void		*sq_token;	/* Destination token */
-	intptr_t	sq_arg1;	/* Command-specific argument */
-	intptr_t	sq_arg2;	/* Command-specific argument */
-	Atm_connvc	*sq_connvc;	/* Connection VCC */
-};
-
-
-/*
- * Macro to avoid unnecessary function call when draining the stack queue.
- */
-#define	STACK_DRAIN()							\
-{									\
-	if (atm_stackq_head)						\
-		atm_stack_drain();					\
-}
-#endif	/* _KERNEL */
-
-#endif	/* _NETATM_ATM_STACK_H */
diff --git a/include.new/netatm/atm_sys.h b/include.new/netatm/atm_sys.h
deleted file mode 100644
index 9066772..0000000
--- a/include.new/netatm/atm_sys.h
+++ /dev/null
@@ -1,220 +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: src/sys/netatm/atm_sys.h,v 1.8 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * General system definitions
- *
- */
-
-#ifndef _NETATM_ATM_SYS_H
-#define _NETATM_ATM_SYS_H
-
-/*
- * Software Version
- */
-#define	ATM_VERSION	0x00030000	/* Version 3.0 */
-#define	ATM_VERS_MAJ(v)	((v) >> 16)
-#define	ATM_VERS_MIN(v)	((v) & 0xffff)
-
-
-/*
- * Misc system defines
- */
-#define	ATM_CALLQ_MAX	100		/* Maximum length of call queue */
-#define	ATM_INTRQ_MAX	1000		/* Maximum length of interrupt queue */
-
-
-/*
- * ATM address manipulation macros
- */
-#define	ATM_ADDR_EQUAL(a1, a2)						\
-	(((a1)->address_format == (a2)->address_format) && 		\
-	 ((a1)->address_length == (a2)->address_length) && 		\
-	 (bcmp((caddr_t)(a1)->address, (caddr_t)(a2)->address,	 	\
-		(a1)->address_length) == 0))
-
-#define	ATM_ADDR_SEL_EQUAL(a1, s1, a2)					\
-	(((a1)->address_format == (a2)->address_format) && 		\
-	 ((a1)->address_length == (a2)->address_length) && 		\
-	 (((((a1)->address_format == T_ATM_ENDSYS_ADDR) ||		\
-	    ((a1)->address_format == T_ATM_NSAP_ADDR)) &&		\
-	   (bcmp((caddr_t)(a1)->address, (caddr_t)(a2)->address, 	\
-		(a1)->address_length - 1) == 0) &&			\
-	   ((s1) == ((struct atm_addr_nsap *)(a2)->address)->aan_sel)) || \
-	  (((a1)->address_format != T_ATM_ENDSYS_ADDR) &&		\
-	   ((a1)->address_format != T_ATM_NSAP_ADDR) &&			\
-	   (bcmp((caddr_t)(a1)->address, (caddr_t)(a2)->address, 	\
-		(a1)->address_length) == 0))))
-
-#define	ATM_ADDR_COPY(a1, a2)						\
-{									\
-	(a2)->address_format = (a1)->address_format;			\
-	(a2)->address_length = (a1)->address_length;			\
-	bcopy((caddr_t)(a1)->address, (caddr_t)(a2)->address,		\
-		(a1)->address_length);					\
-}
-
-#define	ATM_ADDR_SEL_COPY(a1, s1, a2)					\
-{									\
-	(a2)->address_format = (a1)->address_format;			\
-	(a2)->address_length = (a1)->address_length;			\
-	if (((a1)->address_format == T_ATM_ENDSYS_ADDR) || 		\
-	    ((a1)->address_format == T_ATM_NSAP_ADDR)) {		\
-		bcopy((caddr_t)(a1)->address, (caddr_t)(a2)->address,	\
-			(a1)->address_length - 1);			\
-		((struct atm_addr_nsap *)(a2)->address)->aan_sel = (s1);\
-	} else {							\
-		bcopy((caddr_t)(a1)->address, (caddr_t)(a2)->address,	\
-			(a1)->address_length);				\
-	}								\
-}
-
-
-/*
- * ATM Cell Header definitions
- */
-
-/*
- * These macros assume that the cell header (minus the HEC)
- * is contained in the least-significant 32-bits of a word
- */
-#define	ATM_HDR_SET_VPI(vpi)	(((vpi) & 0xff) << 20)
-#define	ATM_HDR_SET_VCI(vci)	(((vci) & 0xffff) << 4)
-#define	ATM_HDR_SET_PT(pt)	(((pt) & 0x7) << 1)
-#define	ATM_HDR_SET_CLP(clp)	((clp) & 0x1)
-#define	ATM_HDR_SET(vpi,vci,pt,clp)	(ATM_HDR_SET_VPI(vpi) | \
-					ATM_HDR_SET_VCI(vci) | \
-					ATM_HDR_SET_PT(pt) | \
-					ATM_HDR_SET_CLP(clp))
-#define	ATM_HDR_GET_VPI(hdr)	(((hdr) >> 20) & 0xff)
-#define	ATM_HDR_GET_VCI(hdr)	(((hdr) >> 4) & 0xffff)
-#define	ATM_HDR_GET_PT(hdr)	(((hdr) >> 1) & 0x7)
-#define	ATM_HDR_GET_CLP(hdr)	((hdr) & 0x1)
-
-/*
- * Payload Type Identifier (3 bits)
- */
-#define	ATM_PT_USER_SDU0	0x0	/* User, no congestion, sdu type 0 */
-#define	ATM_PT_USER_SDU1	0x1	/* User, no congestion, sdu type 1 */
-#define	ATM_PT_USER_CONG_SDU0	0x2	/* User, congestion, sdu type 0 */
-#define	ATM_PT_USER_CONG_SDU1	0x3	/* User, congestion, sdu type 1 */
-#define	ATM_PT_NONUSER		0x4	/* User/non-user differentiator */
-#define	ATM_PT_OAMF5_SEG	0x4	/* OAM F5 segment flow */
-#define	ATM_PT_OAMF5_E2E	0x5	/* OAM F5 end-to-end flow */
-
-
-/*
- * AAL (ATM Adaptation Layer) codes
- */
-typedef u_char	Aal_t;
-#define	ATM_AAL0	0		/* AAL0 - Cell service */
-#define	ATM_AAL1	1		/* AAL1 */
-#define	ATM_AAL2	2		/* AAL2 */
-#define	ATM_AAL3_4	3		/* AAL3/4 */
-#define	ATM_AAL5	5		/* AAL5 */
-
-
-/*
- * VCC Encapsulation codes
- */
-typedef u_char	Encaps_t;
-#define	ATM_ENC_NULL	1		/* Null encapsulation */
-#define	ATM_ENC_LLC	2		/* LLC encapsulation */
-
-
-#ifdef _KERNEL
-/*
- * ATM timer control block.  Used to schedule a timeout via atm_timeout().
- * This control block will typically be embedded in a processing-specific
- * control block.
- */
-struct atm_time {
-	u_short		ti_ticks;	/* Delta of ticks until timeout */
-	u_char		ti_flag;	/* Timer flag bits (see below) */
-	void 		(*ti_func)	/* Call at timeout expiration */
-				(struct atm_time *);
-	struct atm_time	*ti_next;	/* Next on queue */
-};
-
-/*
- * Timer Flags
- */
-#define	TIF_QUEUED	0x01		/* Control block on timer queue */
-
-#define	ATM_HZ		2		/* Time ticks per second */
-
-/*
- * Debugging
- */
-#ifdef DIAGNOSTIC
-#define ATM_TIME							\
-	struct timeval now, delta;					\
-	KT_TIME(now);							\
-	delta.tv_sec = now.tv_sec - atm_debugtime.tv_sec;		\
-	delta.tv_usec = now.tv_usec - atm_debugtime.tv_usec;		\
-	atm_debugtime = now;						\
-	if (delta.tv_usec < 0) {					\
-		delta.tv_sec--;						\
-		delta.tv_usec += 1000000;				\
-	}								\
-	printf("%3ld.%6ld: ", delta.tv_sec, delta.tv_usec);
-
-#define	ATM_DEBUG0(f)		if (atm_debug) {ATM_TIME; printf(f);}
-#define	ATM_DEBUGN0(f)		if (atm_debug) {printf(f);}
-#define	ATM_DEBUG1(f,a1)	if (atm_debug) {ATM_TIME; printf(f, a1);}
-#define	ATM_DEBUGN1(f,a1)	if (atm_debug) {printf(f, a1);}
-#define	ATM_DEBUG2(f,a1,a2)	if (atm_debug) {ATM_TIME; printf(f, a1, a2);}
-#define	ATM_DEBUGN2(f,a1,a2)	if (atm_debug) {printf(f, a1, a2);}
-#define	ATM_DEBUG3(f,a1,a2,a3)	if (atm_debug) {ATM_TIME; printf(f, a1, a2, a3);}
-#define	ATM_DEBUGN3(f,a1,a2,a3)	if (atm_debug) {printf(f, a1, a2, a3);}
-#define	ATM_DEBUG4(f,a1,a2,a3,a4)	if (atm_debug) {ATM_TIME; printf(f, a1, a2, a3, a4);}
-#define	ATM_DEBUGN4(f,a1,a2,a3,a4)	if (atm_debug) {printf(f, a1, a2, a3, a4);}
-#define	ATM_DEBUG5(f,a1,a2,a3,a4,a5)	if (atm_debug) {ATM_TIME; printf(f, a1, a2, a3, a4, a5);}
-#define	ATM_DEBUGN5(f,a1,a2,a3,a4,a5)	if (atm_debug) {printf(f, a1, a2, a3, a4, a5);}
-#else
-#define	ATM_DEBUG0(f)
-#define	ATM_DEBUGN0(f)
-#define	ATM_DEBUG1(f,a1)
-#define	ATM_DEBUGN1(f,a1)
-#define	ATM_DEBUG2(f,a1,a2)
-#define	ATM_DEBUGN2(f,a1,a2)
-#define	ATM_DEBUG3(f,a1,a2,a3)
-#define	ATM_DEBUGN3(f,a1,a2,a3)
-#define	ATM_DEBUG4(f,a1,a2,a3,a4)
-#define	ATM_DEBUGN4(f,a1,a2,a3,a4)
-#define	ATM_DEBUG5(f,a1,a2,a3,a4,a5)
-#define	ATM_DEBUGN5(f,a1,a2,a3,a4,a5)
-#endif
-
-#endif	/* _KERNEL */
-
-#endif	/* _NETATM_ATM_SYS_H */
diff --git a/include.new/netatm/atm_var.h b/include.new/netatm/atm_var.h
deleted file mode 100644
index f4b69bd..0000000
--- a/include.new/netatm/atm_var.h
+++ /dev/null
@@ -1,184 +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: src/sys/netatm/atm_var.h,v 1.26 2005/02/21 21:58:16 rwatson Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * ATM system variables
- *
- */
-
-#ifndef _NETATM_ATM_VAR_H
-#define _NETATM_ATM_VAR_H
-
-
-#ifdef _KERNEL
-
-#include <vm/uma.h>
-
-typedef void (*atm_init_fn)(void);
-
-/*
- * Global variable declarations
- */
-extern struct pr_usrreqs	atm_aal5_usrreqs;
-
-	/* atm_proto.c */
-extern struct domain	atmdomain;
-
-	/* atm_subr.c */
-extern struct atm_pif	*atm_interface_head;
-extern struct atm_ncm	*atm_netconv_head;
-extern Atm_endpoint	*atm_endpoints[];
-extern struct stackq_entry	*atm_stackq_head;
-extern struct stackq_entry	*atm_stackq_tail;
-extern struct atm_sock_stat	atm_sock_stat;
-extern int		atm_init;
-extern int		atm_version;
-extern int		atm_debug;
-extern struct timeval	atm_debugtime;
-extern int		atm_dev_print;
-extern int		atm_print_data;
-extern uma_zone_t	atm_attributes_zone;
-
-extern struct pr_usrreqs	atm_dgram_usrreqs;
-
-
-/*
- * Global function declarations
- */
-	/* atm_aal5.c */
-int		atm_aal5_ctloutput(struct socket *, struct sockopt *);
-void		atm_aal5_init(void);
-
-	/* atm_cm.c */
-int		atm_cm_connect(Atm_endpoint *, void *, Atm_attributes *,
-			Atm_connection **);
-int		atm_cm_listen(struct socket *, Atm_endpoint *, void *,
-			Atm_attributes *, Atm_connection **);
-int		atm_cm_addllc(Atm_endpoint *, void *, struct attr_llc *,
-			Atm_connection *, Atm_connection **);
-int		atm_cm_addparty(Atm_connection *, int, struct t_atm_sap *);
-int		atm_cm_dropparty(Atm_connection *, int, struct t_atm_cause *);
-int		atm_cm_release(Atm_connection *, struct t_atm_cause *);
-int		atm_cm_abort(Atm_connvc *, struct t_atm_cause *);
-int		atm_cm_incoming(struct vccb *, Atm_attributes *);
-void		atm_cm_connected(Atm_connvc *);
-void		atm_cm_cleared(Atm_connvc *);
-Atm_connection *atm_cm_match(Atm_attributes *, Atm_connection *);
-int		atm_cm_cpcs_ctl(int, Atm_connection *, void *);
-int		atm_cm_cpcs_data(Atm_connection *, KBuffer *);
-int		atm_cm_saal_ctl(int, Atm_connection *, void *);
-int		atm_cm_saal_data(Atm_connection *, KBuffer *);
-int		atm_cm_sscop_ctl(int, Atm_connection *, void *, void *);
-int		atm_cm_sscop_data(Atm_connection *, KBuffer *);
-int		atm_endpoint_register(Atm_endpoint *);
-int		atm_endpoint_deregister(Atm_endpoint *);
-
-	/* atm_device.c */
-int		atm_dev_inst(struct stack_defn **, Atm_connvc *);
-void		atm_dev_lower(int, void *, intptr_t, intptr_t);
-void *		atm_dev_alloc(u_int, u_int, u_int);
-void		atm_dev_free(volatile void *);
-KBuffer *	atm_dev_compress(KBuffer *);
-Cmn_vcc *	atm_dev_vcc_find(Cmn_unit *, u_int, u_int, u_int);
-void		atm_dev_pdu_print(const Cmn_unit *, const Cmn_vcc *,
-		    const KBuffer *, const char *);
-
-	/* atm_if.c */
-int		atm_physif_register(Cmn_unit *, const char *,
-			struct stack_defn *);
-int		atm_physif_deregister(Cmn_unit *);
-void		atm_physif_freenifs(struct atm_pif *, uma_zone_t);
-int		atm_netconv_register(struct atm_ncm *);
-int		atm_netconv_deregister(struct atm_ncm *);
-int		atm_nif_attach(struct atm_nif *);
-void		atm_nif_detach(struct atm_nif *);
-int		atm_nif_setaddr(struct atm_nif *, struct ifaddr *);
-int		atm_ifoutput(struct ifnet *, KBuffer *,
-			struct sockaddr *, struct rtentry *);
-struct atm_pif *
-		atm_pifname(char *);
-struct atm_nif *
-		atm_nifname(char *);
-
-	/* atm_proto.c */
-int		atm_proto_notsupp1(struct socket *);
-int		atm_proto_notsupp2(struct socket *, struct sockaddr *,
-			struct thread *);
-int		atm_proto_notsupp3(struct socket *, struct sockaddr **);
-int		atm_proto_notsupp4(struct socket *, int, KBuffer *, 
-			struct sockaddr *, KBuffer *, struct thread *);
-
-	/* atm_signal.c */
-int		atm_sigmgr_register(struct sigmgr *);
-int		atm_sigmgr_deregister(struct sigmgr *);
-int		atm_sigmgr_attach(struct atm_pif *, u_char);
-int		atm_sigmgr_detach(struct atm_pif *);
-int		atm_stack_register(struct stack_defn *);
-int		atm_stack_deregister(struct stack_defn *);
-int		atm_create_stack(Atm_connvc *, struct stack_list *,
-			void (*)(int, void *, intptr_t, intptr_t) );
-
-	/* atm_socket.c */
-void		atm_sock_init(void);
-int		atm_sock_attach(struct socket *, u_long, u_long);
-int		atm_sock_detach(struct socket *);
-int		atm_sock_bind(struct socket *, struct sockaddr *);
-int		atm_sock_listen(struct socket *, Atm_endpoint *);
-int		atm_sock_connect(struct socket *, struct sockaddr *,
-			Atm_endpoint *);
-int		atm_sock_disconnect(struct socket *);
-int		atm_sock_sockaddr(struct socket *, struct sockaddr **);
-int		atm_sock_peeraddr(struct socket *, struct sockaddr **);
-int		atm_sock_setopt(struct socket *, struct sockopt *,
-			Atm_pcb *);
-int		atm_sock_getopt(struct socket *, struct sockopt *,
-			Atm_pcb *);
-void		atm_sock_connected(void *);
-void		atm_sock_cleared(void *, struct t_atm_cause *);
-
-	/* atm_subr.c */
-void		atm_initialize(void);
-void		atm_timeout(struct atm_time *, int, 
-			void (*)(struct atm_time *) );
-int		atm_untimeout(struct atm_time *);
-int		atm_stack_enq(int, void (*)(int, void *, intptr_t, intptr_t), 
-			void *, Atm_connvc *, intptr_t, intptr_t);
-void		atm_stack_drain(void);
-void		atm_pdu_print(const KBuffer *, const char *);
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_harp);
-SYSCTL_DECL(_net_harp_atm);
-#endif
-
-#endif	/* _KERNEL */
-#endif	/* _NETATM_ATM_VAR_H */
diff --git a/include.new/netatm/atm_vc.h b/include.new/netatm/atm_vc.h
deleted file mode 100644
index 78ae3ef..0000000
--- a/include.new/netatm/atm_vc.h
+++ /dev/null
@@ -1,89 +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: src/sys/netatm/atm_vc.h,v 1.5 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * ATM Virtual Channel definitions 
- *
- */
-
-#ifndef _NETATM_ATM_VC_H
-#define _NETATM_ATM_VC_H
-
-
-#ifdef _KERNEL
-/*
- * ATM Virtual Channel Connection control block.  All vccb's are created
- * and controlled by an ATM signalling manager.  Each ATM signalling 
- * protocol will also have its own protocol-specific vccb format.  Each 
- * of these protocol vccb's must have this common block at the beginning.
- */
-struct vccb {
-	u_char		vc_type;	/* VCC type (see below) */
-	u_char		vc_proto;	/* Signalling protocol */
-	u_char		vc_sstate;	/* Signalling state (sigmgr specific) */
-	u_char		vc_ustate;	/* User interface state (see below) */
-	struct atm_pif	*vc_pif;	/* Physical interface */
-	struct atm_nif	*vc_nif;	/* Network interface */
-	Qelem_t		vc_sigelem;	/* Signalling instance vccb queue */
-	struct atm_time	vc_time;	/* Timer controls */
-	u_short		vc_vpi;		/* Virtual Path Identifier */
-	u_short		vc_vci;		/* Virtual Channel Identifier */
-	Atm_connvc	*vc_connvc;	/* CM connection VCC instance */
-	u_long		vc_ipdus;	/* PDUs received from VCC */
-	u_long		vc_opdus;	/* PDUs sent to VCC */
-	u_long		vc_ibytes;	/* Bytes received from VCC */
-	u_long		vc_obytes;	/* Bytes sent to VCC */
-	u_long		vc_ierrors;	/* Errors receiving from VCC */
-	u_long		vc_oerrors;	/* Errors sending to VCC */
-	time_t		vc_tstamp;	/* State transition timestamp */
-};
-#endif	/* _KERNEL */
-
-/*
- * VCC Types
- */
-#define	VCC_PVC		0x01		/* PVC (Permanent Virtual Channel) */
-#define	VCC_SVC		0x02		/* SVC (Switched Virtual Channel) */
-#define	VCC_IN		0x04		/* Inbound VCC */
-#define	VCC_OUT		0x08		/* Outbound VCC */
-
-/*
- * VCC Signalling-to-User Interface States
- */
-#define	VCCU_NULL	0		/* No state */
-#define	VCCU_POPEN	1		/* Pending open completion */
-#define	VCCU_OPEN	2		/* Connection is open */
-#define	VCCU_CLOSED	3		/* Connection has been terminated */
-#define	VCCU_ABORT	4		/* Connection being aborted */
-
-
-#endif	/* _NETATM_ATM_VC_H */
diff --git a/include.new/netatm/ipatm/ipatm.h b/include.new/netatm/ipatm/ipatm.h
deleted file mode 100644
index c1399d4..0000000
--- a/include.new/netatm/ipatm/ipatm.h
+++ /dev/null
@@ -1,55 +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: src/sys/netatm/ipatm/ipatm.h,v 1.3 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * IP Over ATM Support
- * -------------------
- *
- * Protocol definitions
- *
- */
-
-#ifndef _IPATM_IPATM_H
-#define _IPATM_IPATM_H
-
-/*
- * Protocol Variables
- */
-#define	IPATM_VCIDLE		15		/* VCC idle time (minutes) */
-#define	IPATM_ARP_TIME		(60 * ATM_HZ)	/* Wait for ARP answer */
-#define	IPATM_SVC_TIME		(60 * ATM_HZ)	/* Wait for SVC open answer */
-#define	IPATM_IDLE_TIME		(60 * ATM_HZ)	/* VCC idle timer tick */
-
-/*
- * IP/ATM LLC/SNAP header
- */
-#define	IPATM_LLC_LEN		8
-#define	IPATM_LLC_HDR		{0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x08, 0x00}
-
-#endif	/* _IPATM_IPATM_H */
diff --git a/include.new/netatm/ipatm/ipatm_serv.h b/include.new/netatm/ipatm/ipatm_serv.h
deleted file mode 100644
index 6f1c8de..0000000
--- a/include.new/netatm/ipatm/ipatm_serv.h
+++ /dev/null
@@ -1,114 +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: src/sys/netatm/ipatm/ipatm_serv.h,v 1.4 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * IP Over ATM Support
- * -------------------
- *
- * IP/ATM service interface definitions
- *
- */
-
-#ifndef _IPATM_IPATM_SERV_H
-#define _IPATM_IPATM_SERV_H
-
-
-/*
- * Structures specifying VCC parameters and pointers to all of the IP 
- * services offered by an external IP interface service provider.
- */
-struct ip_vccparm {
-	Aal_t		ivc_aal;		/* AAL type */
-	Encaps_t	ivc_encaps;		/* VCC encapsulation */
-};
-
-#define	IPATM_VCCPARMS	4			/* Number of parameter lists */
-
-struct ip_serv {
-/* Interfaces to IP/ATM interface services */
-	int		(*is_ifact)		/* Interface activation */
-				(struct ip_nif *);
-	int		(*is_ifdact)		/* Interface deactivation */
-				(struct ip_nif *);
-	int		(*is_ioctl)		/* Interface ioctl */
-				(int, caddr_t, caddr_t);
-
-/* Interfaces to IP/ATM ARP services */
-	int		(*is_arp_pvcopen)	/* IP creating dynamic PVC */
-				(struct ipvcc *);
-	int		(*is_arp_svcout)	/* IP creating outgoing SVC */
-				(struct ipvcc *, struct in_addr *);
-	int		(*is_arp_svcin)		/* IP creating incoming SVC */
-				(struct ipvcc *, Atm_addr *, Atm_addr *);
-	int		(*is_arp_svcact)	/* IP SVC is active */
-				(struct ipvcc *);
-	void		(*is_arp_close)		/* IP closing VCC */
-				(struct ipvcc *);
-
-/* Interfaces to IP/ATM broadcast services */
-	int		(*is_bcast_output)	/* IP broadcast packet output */
-				(struct ip_nif *, KBuffer *);
-
-/* Interfaces to IP/ATM multicast services */
-
-/* Ordered list of parameters to try for IP/ATM VCC connections */
-	struct ip_vccparm is_vccparm[IPATM_VCCPARMS];	/* List of vcc params */
-};
-
-
-/*
- * ARP Interface
- * ----------------
- */
-
-/*
- * Common header for IP/ATM ARP mappings.  For each IP VCC created, the
- * appropriate IP/ATM ARP server must assign one of these structures to 
- * indicate the address mapping.  This is the only IP-visible ARP structure.
- * The servers may embed this structure at the beginning of their 
- * module-specific mappings.
- */
-struct arpmap {
-	struct in_addr	am_dstip;	/* Destination IP address */
-	Atm_addr	am_dstatm;	/* Destination ATM address */
-	Atm_addr	am_dstatmsub;	/* Destination ATM subaddress */
-};
-
-
-/*
- * is_arp_[ps]open() return codes and ipatm_arpnotify() event types
- */
-#define	MAP_PROCEEDING	1		/* Lookup is proceeding (open only) */
-#define	MAP_VALID	2		/* Mapping is valid */
-#define	MAP_INVALID	3		/* Mapping is invalid */
-#define	MAP_CHANGED	4		/* Mapping has changed */
-#define	MAP_FAILED	5		/* Mapping request has failed */
-
-
-#endif	/* _IPATM_IPATM_SERV_H */
diff --git a/include.new/netatm/ipatm/ipatm_var.h b/include.new/netatm/ipatm/ipatm_var.h
deleted file mode 100644
index 902096b..0000000
--- a/include.new/netatm/ipatm/ipatm_var.h
+++ /dev/null
@@ -1,219 +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: src/sys/netatm/ipatm/ipatm_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * IP Over ATM Support
- * -------------------
- *
- * Protocol control blocks
- *
- */
-
-#ifndef _IPATM_IPATM_VAR_H
-#define _IPATM_IPATM_VAR_H
-
-#ifdef _KERNEL
-/*
- * Structure containing information for each VCC, both SVC and PVC, which
- * supports IP traffic.
- */
-struct ipvcc {
-	Qelem_t		iv_elem;	/* ip_nif queueing links */
-	u_short		iv_flags;	/* VCC flags (see below) */
-	u_char		iv_state;	/* VCC state (see below) */
-	Atm_connection	*iv_conn;	/* Connection manager token */
-	struct in_addr	iv_dst;		/* Peer's IP address */
-	struct ip_nif	*iv_ipnif;	/* IP network interface */
-	struct atm_time	iv_time;	/* Timer controls */
-	short		iv_idle;	/* VCC idle timer */
-	u_char		iv_parmx;	/* Index into provider's vcc params */ 
-	KBuffer		*iv_queue;	/* Packet waiting for VCC */
-	struct arpmap	*iv_arpent;	/* ARP entry for VCC */
-	struct ipvcc	*iv_arpnext;	/* ARP link field */
-	Atm_connection	*iv_arpconn;	/* ARP connection manager token */
-};
-#define iv_forw		iv_elem.q_forw
-#define iv_back		iv_elem.q_back
-#endif	/* _KERNEL */
-
-/*
- * VCC Flags
- */
-#define	IVF_PVC		0x0001		/* PVC */
-#define	IVF_SVC		0x0002		/* SVC */
-#define	IVF_LLC		0x0004		/* VCC uses LLC/SNAP encapsulation */
-#define	IVF_MAPOK	0x0008		/* VCC ARP mapping is valid */
-#define	IVF_NOIDLE	0x0010		/* Do not idle-timeout this VCC */
-
-/*
- * VCC States
- */
-#define	IPVCC_FREE	0		/* No VCC associated with entry */
-#define	IPVCC_PMAP	1		/* SVC waiting for ARP mapping */
-#define	IPVCC_POPEN	2		/* Pending SVC open completion */
-#define	IPVCC_PACCEPT	3		/* Pending SVC accept completion */
-#define	IPVCC_ACTPENT	4		/* PVC open - waiting for ARP entry */
-#define	IPVCC_ACTIVE	5		/* VCC open - available */
-#define	IPVCC_CLOSED	6		/* VCC has been closed */
-
-
-#ifdef _KERNEL
-/*
- * Structure containing IP-specific information for each ATM network
- * interface in the system.
- */
-struct ip_nif {
-	struct ip_nif	*inf_next;	/* Next on interface chain */
-	struct atm_nif	*inf_nif;	/* ATM network interface */
-	u_short		inf_state;	/* Interface state (see below) */
-	struct in_ifaddr *inf_addr;	/* Interface's IP address */
-	Queue_t		inf_vcq;	/* VCC connections queue */
-	struct ip_serv	*inf_serv;	/* Interface service provider */
-
-/* For use by IP interface service provider (ie signalling manager) */
-	caddr_t		inf_isintf;	/* Interface control block */
-
-/* IP/ATM provided interface services */
-	void		(*inf_arpnotify)/* ARP event notification */
-				(struct ipvcc *, int);
-	int		(*inf_ipinput)	/* IP packet input */
-				(struct ip_nif *, KBuffer *);
-	int		(*inf_createsvc)/* Create an IP SVC */
-				(struct ifnet *, u_short, caddr_t,
-				     struct ipvcc **);
-};
-
-/*
- * Network Interface States
- */
-#define	IPNIF_ADDR	1		/* Waiting for i/f address */
-#define	IPNIF_SIGMGR	2		/* Waiting for sigmgr attach */
-#define	IPNIF_ACTIVE	3		/* Active */
-
-
-/*
- * Global IP/ATM Statistics
- */
-struct ipatm_stat {
-	u_long		ias_rcvstate;	/* Packets received, bad vcc state */
-	u_long		ias_rcvnobuf;	/* Packets received, no buf avail */
-};
-
-
-/*
- * Structure to pass parameters for ipatm_openpvc()
- */
-struct ipatmpvc {
-	struct ip_nif	*ipp_ipnif;	/* PVC's IP network interface */
-	u_short		ipp_vpi;	/* VPI value */
-	u_short		ipp_vci;	/* VCI value */
-	Aal_t		ipp_aal;	/* AAL type */
-	Encaps_t	ipp_encaps;	/* VCC encapsulation */
-	struct sockaddr_in ipp_dst;	/* Destination's IP address */
-	uint8_t		ipp_traffic_type;	/* CBR, UBR, ... */
-	struct t_atm_traffic ipp_traffic;	/* traffic parameters */
-};
-
-
-/*
- * Timer macros
- */
-#define	IPVCC_TIMER(s, t)	atm_timeout(&(s)->iv_time, (t), ipatm_timeout)
-#define	IPVCC_CANCEL(s)		atm_untimeout(&(s)->iv_time)
-
-/*
- * Misc useful macros
- */
-#define SATOSIN(sa)	((struct sockaddr_in *)(sa))
-
-
-/*
- * Global function declarations
- */
-	/* ipatm_event.c */
-void		ipatm_timeout(struct atm_time *);
-void		ipatm_connected(void *);
-void		ipatm_cleared(void *, struct t_atm_cause *);
-void		ipatm_arpnotify(struct ipvcc *, int);
-void		ipatm_itimeout(struct atm_time *);
-
-	/* ipatm_if.c */
-int		ipatm_nifstat(int, struct atm_nif *, intptr_t);
-
-	/* ipatm_input.c */
-void		ipatm_cpcs_data(void *, KBuffer *);
-int		ipatm_ipinput(struct ip_nif *, KBuffer *);
-
-	/* ipatm_load.c */
-
-	/* ipatm_output.c */
-int		ipatm_ifoutput(struct ifnet *, KBuffer *, struct sockaddr *);
-
-	/* ipatm_usrreq.c */
-int		ipatm_ioctl(int, caddr_t, caddr_t);
-caddr_t		ipatm_getname(void *);
-
-	/* ipatm_vcm.c */
-int		ipatm_openpvc(struct ipatmpvc *, struct ipvcc **);
-int		ipatm_createsvc(struct ifnet *, u_short, caddr_t,
-			struct ipvcc **);
-int		ipatm_opensvc(struct ipvcc *);
-int		ipatm_retrysvc(struct ipvcc *);
-void		ipatm_activate(struct ipvcc *);
-int		ipatm_incoming(void *, Atm_connection *, Atm_attributes *,
-			void **);
-int		ipatm_closevc(struct ipvcc *, int);
-int		ipatm_chknif(struct in_addr, struct ip_nif *);
-struct ipvcc	*ipatm_iptovc(struct sockaddr_in *, struct atm_nif *);
- 
-
-/*
- * External variables
- */
-extern int 		ipatm_vccnt;
-extern int 		ipatm_vcidle;
-extern int 		ipatm_print;
-extern u_long		last_map_ipdst;
-extern struct ipvcc	*last_map_ipvcc;
-extern struct ip_nif	*ipatm_nif_head;
-extern uma_zone_t	ipatm_vc_zone;
-extern struct ipatm_stat	ipatm_stat;
-extern struct atm_time	ipatm_itimer;
-extern Atm_endpoint	ipatm_endpt;
-extern Atm_attributes	ipatm_aal5llc;
-extern Atm_attributes	ipatm_aal5null;
-extern Atm_attributes	ipatm_aal4null;
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_harp_ip);
-#endif
-
-#endif	/* _KERNEL */
-
-#endif	/* _IPATM_IPATM_VAR_H */
diff --git a/include.new/netatm/port.h b/include.new/netatm/port.h
deleted file mode 100644
index a271148..0000000
--- a/include.new/netatm/port.h
+++ /dev/null
@@ -1,292 +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: src/sys/netatm/port.h,v 1.16 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * System Configuration
- * --------------------
- *
- * Porting aides
- *
- */
-
-#ifndef _NETATM_PORT_H
-#define	_NETATM_PORT_H
-
-
-#ifdef _KERNEL
-/*
- * Kernel buffers
- *
- * KBuffer 		Typedef for a kernel buffer.
- *
- * KB_NEXT(bfr)		Access next buffer in chain (r/w).
- * KB_LEN(bfr)		Access length of data in this buffer (r/w).
- * KB_QNEXT(bfr)	Access next buffer in queue (r/w).
- *
- * KB_ALLOC(bfr, size, flags, type)
- *			Allocates a new kernel buffer of at least size bytes.
- * KB_ALLOCPKT(bfr, size, flags, type)
- *			Allocates a new kernel packet header buffer of at
- *			least size bytes.
- * KB_ALLOCEXT(bfr, size, flags, type)
- *			Allocates a new kernel buffer with external storage
- *			of at least size bytes.
- * KB_FREEONE(bfr, nxt)	Free buffer bfr and set next buffer in chain in nxt.
- * KB_FREEALL(bfr)	Free bfr's entire buffer chain.
- * KB_COPY(bfr, off, len, new, flags)
- *			Copy len bytes of user data from buffer bfr starting at
- *			byte offset off and return new buffer chain in new.
- *			If len is KB_COPYALL, copy until end of chain.
- * KB_COPYDATA(bfr, off, len, datap)
- *			Copy data from buffer bfr starting at byte offset off
- *			for len bytes into the data area pointed to by datap.
- *			Returns the number of bytes not copied to datap.
- * KB_PULLUP(bfr, n, new)
- *			Get at least the first n bytes of data in the buffer 
- *			chain headed by bfr contiguous in the first buffer.
- *			Returns the (potentially new) head of the chain in new.
- *			On failure the chain is freed and NULL is returned.
- * KB_LINKHEAD(new, head)
- *			Link the kernel buffer new at the head of the buffer
- *			chain headed by head.  If both new and head are
- *			packet header buffers, new will become the packet
- *			header for the chain.
- * KB_LINK(new, prev)
- *			Link the kernel buffer new into the buffer chain
- *			after the buffer prev.
- * KB_UNLINKHEAD(head, next)
- *			Unlink the kernel buffer from the head of the buffer
- *			chain headed by head.  The buffer head will be freed
- *			and the new chain head will be placed in next.
- * KB_UNLINK(old, prev, next)
- *			Unlink the kernel buffer old with previous buffer prev
- *			from its buffer chain.  The following buffer in the
- *			chain will be placed in next and the buffer old will
- *			be freed.
- * KB_ISPKT(bfr)	Tests whether bfr is a packet header buffer.
- * KB_ISEXT(bfr)	Tests whether bfr has external storage.
- * KB_BFRSTART(bfr, x, t)
- *			Sets x (cast to type t) to point to the start of the
- *			buffer space in bfr.
- * KB_BFREND(bfr, x, t)
- *			Sets x (cast to type t) to point one byte past the end
- *			of the buffer space in bfr.
- * KB_BFRLEN(bfr)	Returns length of buffer space in bfr.
- * KB_DATASTART(bfr, x, t)
- *			Sets x (cast to type t) to point to the start of the
- *			buffer data contained in bfr.
- * KB_DATAEND(bfr, x, t)
- *			Sets x (cast to type t) to point one byte past the end
- *			of the buffer data contained in bfr.
- * KB_HEADSET(bfr, n)	Sets the start address for buffer data in buffer bfr to
- *			n bytes from the beginning of the buffer space.
- * KB_HEADMOVE(bfr, n) 	Adjust buffer data controls to move data down (n > 0) 
- *			or up (n < 0) n bytes in the buffer bfr.
- * KB_HEADADJ(bfr, n) 	Adjust buffer data controls to add (n > 0) or subtract
- *			(n < 0) n bytes of data to/from the beginning of bfr.
- * KB_TAILADJ(bfr, n)	Adjust buffer data controls to add (n > 0) or subtract
- *			(n < 0) n bytes of data to/from the end of bfr.
- * KB_TAILALIGN(bfr, n)	Set buffer data controls to place an object of size n
- *			at the end of bfr, longword aligned.
- * KB_HEADROOM(bfr, n)	Set n to the amount of buffer space available before
- *			the start of data in bfr.
- * KB_TAILROOM(bfr, n)	Set n to the amount of buffer space available after
- *			the end of data in bfr.
- * KB_PLENGET(bfr, n)	Set n to bfr's packet length.
- * KB_PLENSET(bfr, n)	Set bfr's packet length to n.
- * KB_PLENADJ(bfr, n)	Adjust total packet length by n bytes.
- *
- */
-#include <sys/mbuf.h>
-typedef struct mbuf	KBuffer;
-
-#define	KB_F_WAIT	M_TRYWAIT
-#define	KB_F_NOWAIT	M_DONTWAIT
-
-#define	KB_T_HEADER	MT_HEADER
-#define	KB_T_DATA	MT_DATA
-
-#define	KB_COPYALL	M_COPYALL
-
-#define	KB_NEXT(bfr)		(bfr)->m_next
-#define	KB_LEN(bfr)		(bfr)->m_len
-#define	KB_QNEXT(bfr)		(bfr)->m_nextpkt
-#define KB_ALLOC(bfr, size, flags, type) {		\
-	if ((size) <= MLEN) {				\
-		MGET((bfr), (flags), (type));		\
-	} else						\
-		(bfr) = NULL;				\
-}
-#define KB_ALLOCPKT(bfr, size, flags, type) {		\
-	if ((size) <= MHLEN) {				\
-		MGETHDR((bfr), (flags), (type));	\
-	} else						\
-		(bfr) = NULL;				\
-}
-#define KB_ALLOCEXT(bfr, size, flags, type) {		\
-	if ((size) <= MCLBYTES)	{			\
-		MGET((bfr), (flags), (type));		\
-		if ((bfr) != NULL) {			\
-			MCLGET((bfr), (flags));		\
-			if (((bfr)->m_flags & M_EXT) == 0) {	\
-				m_freem((bfr));		\
-				(bfr) = NULL;		\
-			}				\
-		}					\
-	} else						\
-		(bfr) = NULL;				\
-}
-#define KB_FREEONE(bfr, nxt) {				\
-	(nxt) = m_free(bfr);				\
-}
-#define KB_FREEALL(bfr) {				\
-	m_freem(bfr);					\
-}
-#define	KB_COPY(bfr, off, len, new, flags) {		\
-	(new) = m_copym((bfr), (off), (len), (flags));	\
-}
-#define	KB_COPYDATA(bfr, off, len, datap) 		\
-	(m_copydata((bfr), (off), (len), (datap)), 0)
-#define	KB_PULLUP(bfr, n, new) {			\
-	(new) = m_pullup((bfr), (n));			\
-}
-#define	KB_LINKHEAD(new, head) {			\
-	if ((head) && KB_ISPKT(new) && KB_ISPKT(head)) {\
-		M_MOVE_PKTHDR((new), (head));		\
-	}						\
-	(new)->m_next = (head);				\
-}
-#define	KB_LINK(new, prev) {				\
-	(new)->m_next = (prev)->m_next;			\
-	(prev)->m_next = (new);				\
-}
-#define	KB_UNLINKHEAD(head, next) {			\
-	(next) = m_free((head));			\
-	(head) = NULL;					\
-}
-#define	KB_UNLINK(old, prev, next) {			\
-	(next) = m_free((old));				\
-	(old) = NULL;					\
-	(prev)->m_next = (next);			\
-}
-#define	KB_ISPKT(bfr)		(((bfr)->m_flags & M_PKTHDR) != 0)
-#define	KB_ISEXT(bfr)		(((bfr)->m_flags & M_EXT) != 0)
-#define	KB_BFRSTART(bfr, x, t) {			\
-	if ((bfr)->m_flags & M_EXT)			\
-		(x) = (t)((bfr)->m_ext.ext_buf);	\
-	else if ((bfr)->m_flags & M_PKTHDR)		\
-		(x) = (t)(&(bfr)->m_pktdat);		\
-	else						\
-		(x) = (t)((bfr)->m_dat);		\
-}
-#define	KB_BFREND(bfr, x, t) {				\
-	if ((bfr)->m_flags & M_EXT)			\
-		(x) = (t)((bfr)->m_ext.ext_buf + (bfr)->m_ext.ext_size);\
-	else if ((bfr)->m_flags & M_PKTHDR)		\
-		(x) = (t)(&(bfr)->m_pktdat + MHLEN);	\
-	else						\
-		(x) = (t)((bfr)->m_dat + MLEN);		\
-}
-#define	KB_BFRLEN(bfr)					\
-	(((bfr)->m_flags & M_EXT) ? (bfr)->m_ext.ext_size :	\
-		(((bfr)->m_flags & M_PKTHDR) ? MHLEN : MLEN))
-#define	KB_DATASTART(bfr, x, t) {			\
-	(x) = mtod((bfr), t);				\
-}
-#define	KB_DATAEND(bfr, x, t) {				\
-	(x) = (t)(mtod((bfr), caddr_t) + (bfr)->m_len);	\
-}
-#define	KB_HEADSET(bfr, n) {				\
-	if ((bfr)->m_flags & M_EXT)			\
-		(bfr)->m_data = (bfr)->m_ext.ext_buf + (n);	\
-	else if ((bfr)->m_flags & M_PKTHDR)		\
-		(bfr)->m_data = (bfr)->m_pktdat + (n);	\
-	else						\
-		(bfr)->m_data = (bfr)->m_dat + (n);	\
-}
-#define	KB_HEADMOVE(bfr, n) {				\
-	(bfr)->m_data += (n);				\
-}
-#define	KB_HEADADJ(bfr, n) {				\
-	(bfr)->m_len += (n);				\
-	(bfr)->m_data -= (n);				\
-}
-#define	KB_TAILADJ(bfr, n) {				\
-	(bfr)->m_len += (n);				\
-}
-#define	KB_TAILALIGN(bfr, n) {				\
-	(bfr)->m_len = (n);				\
-	if ((bfr)->m_flags & M_EXT)			\
-		(bfr)->m_data = (caddr_t)(((uintptr_t)(bfr)->m_ext.ext_buf \
-			+ (bfr)->m_ext.ext_size - (n)) & ~(sizeof(long) - 1));\
-	else						\
-		(bfr)->m_data = (caddr_t)(((uintptr_t)(bfr)->m_dat + MLEN - (n)) \
-			& ~(sizeof(long) - 1));		\
-}
-#define	KB_HEADROOM(bfr, n) {				\
-	/* N = m_leadingspace(BFR) XXX */		\
-	(n) = ((bfr)->m_flags & M_EXT ? (bfr)->m_data - (bfr)->m_ext.ext_buf : \
-		(bfr)->m_flags & M_PKTHDR ? (bfr)->m_data - (bfr)->m_pktdat : \
-			(bfr)->m_data - (bfr)->m_dat);	\
-}
-#define	KB_TAILROOM(bfr, n) {				\
-	(n) = M_TRAILINGSPACE(bfr);			\
-}
-#define	KB_PLENGET(bfr, n) {				\
-	(n) = (bfr)->m_pkthdr.len;			\
-}
-#define	KB_PLENSET(bfr, n) {				\
-	(bfr)->m_pkthdr.len = (n);			\
-}
-#define	KB_PLENADJ(bfr, n) {				\
-	(bfr)->m_pkthdr.len += (n);			\
-}
-
-
-/*
- * Kernel time
- *
- * KTimeout_ret		Typedef for timeout() function return
- *
- * KT_TIME(t)		Sets t to the current time.
- *
- */
-typedef void	KTimeout_ret;
-#define	KT_TIME(t)	microtime(&t)
-
-#endif	/* _KERNEL */
-
-#ifndef MAX
-#define	MAX(a,b)	max((a),(b))
-#endif
-#ifndef MIN
-#define	MIN(a,b)	min((a),(b))
-#endif
-
-#endif	/* _NETATM_PORT_H */
diff --git a/include.new/netatm/queue.h b/include.new/netatm/queue.h
deleted file mode 100644
index ad9624b..0000000
--- a/include.new/netatm/queue.h
+++ /dev/null
@@ -1,213 +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: src/sys/netatm/queue.h,v 1.3 2005/01/07 01:45:36 imp Exp $
- *
- */
-
-/*
- * Core ATM Services
- * -----------------
- *
- * General queueing/linking definitions
- *
- */
-
-#ifndef _NETATM_QUEUE_H
-#define _NETATM_QUEUE_H
-
-/*
- * Structure defining the queue controls for a doubly linked queue
- */
-struct q_queue {
-	caddr_t		q_head;		/* Head of queue */
-	caddr_t		q_tail;		/* Tail of queue */
-};
-typedef struct q_queue Queue_t;
-
-/*
- * Structure defining the queue elements of a doubly linked queue
- */
-struct q_elem {
-	caddr_t		q_forw;		/* Forward link */
-	caddr_t		q_back;		/* Backward link */
-};
-typedef struct q_elem Qelem_t;
-
-/*
- * Macro to add a control block onto the tail of a doubly linked queue
- *	e = control block to add
- *	t = control block structure type
- *	el = name of control block's q_elem field
- *	q = pointer to queue controls
- */
-#define	ENQUEUE(e,t,el,q)					\
-{								\
-	(e)->el.q_forw = NULL;					\
-	(e)->el.q_back = (q).q_tail;				\
-	if ((q).q_head == NULL) {				\
-		(q).q_head = (caddr_t)(e);			\
-		(q).q_tail = (caddr_t)(e);			\
-	} else {						\
-		((t *)(q).q_tail)->el.q_forw = (caddr_t)(e);	\
-		(q).q_tail = (caddr_t)(e);			\
-	}							\
-}
-
-/*
- * Macro to remove a control block from a doubly linked queue
- *	e = control block to remove
- *	t = control block structure type
- *	el = name of control block's q_elem field
- *	q = pointer to queue controls
- */
-#define	DEQUEUE(e,t,el,q)					\
-{								\
-	/* Ensure control block is on queue */			\
-	if ((e)->el.q_forw || (q).q_tail == (caddr_t)(e)) {	\
-		if ((e)->el.q_forw)				\
-			((t *)(e)->el.q_forw)->el.q_back = (e)->el.q_back;\
-		else						\
-			(q).q_tail = (e)->el.q_back;		\
-		if ((e)->el.q_back)				\
-			((t *)(e)->el.q_back)->el.q_forw = (e)->el.q_forw;\
-		else						\
-			(q).q_head = (e)->el.q_forw;		\
-	}							\
-	(e)->el.q_back = (e)->el.q_forw = NULL;			\
-}
-
-/*
- * Macro to return the head of a doubly linked queue
- *	q = pointer to queue controls
- *	t = control block structure type
- */
-#define	Q_HEAD(q,t)	((t *)(q).q_head)
-
-/*
- * Macro to return the next control block of a doubly linked queue
- *	e = current control block
- *	t = control block structure type
- *	el = name of control block's q_elem field
- */
-#define	Q_NEXT(e,t,el)	((t *)(e)->el.q_forw)
-
-
-/*
- * Macro to add a control block onto the head of a singly linked chain
- *	u = control block to add
- *	t = structure type
- *	h = head of chain
- *	l = name of link field
- */
-#define LINK2HEAD(u,t,h,l)					\
-{								\
-	(u)->l = (h);						\
-	(h) = (u);						\
-}
-
-/*
- * Macro to add a control block onto the tail of a singly linked chain
- *	u = control block to add
- *	t = structure type
- *	h = head of chain
- *	l = name of link field
- */
-#define LINK2TAIL(u,t,h,l)					\
-{								\
-	(u)->l = (t *)NULL;					\
-	/* Check for empty chain */				\
-	if ((h) == (t *)NULL) {					\
-		(h) = (u);					\
-	} else {						\
-		t	*tp;					\
-		/* Loop until we find the end of chain */	\
-		for (tp = (h); tp->l != (t *)NULL; tp = tp->l)	\
-			;					\
-		tp->l = (u);					\
-	}							\
-}
-
-/*
- * Macro to remove a control block from a singly linked chain
- *	u = control block to unlink
- *	t = structure type
- *	h = head of chain
- *	l = name of link field
- */
-#define UNLINK(u,t,h,l)						\
-{								\
-	/* Check for control block at head of chain */		\
-	if ((u) == (h)) {					\
-		(h) = (u)->l;					\
-	} else {						\
-		t	*tp;					\
-		/* Loop until we find the control block */	\
-		for (tp = (h); tp != (t *)NULL; tp = tp->l) {	\
-			if (tp->l == (u))			\
-				break;				\
-		}						\
-		if (tp) {					\
-			/* Remove it from chain */		\
-			tp->l = (u)->l;				\
-		}						\
-	}							\
-	(u)->l = (t *)NULL;					\
-}
-
-/*
- * Macro to remove a control block from a singly linked chain and return
- * an indication of whether the block was found
- *	u = control block to unlink
- *	t = structure type
- *	h = head of chain
- *	l = name of link field
- *	f = flag; 1 => control block found on chain; else 0
- */
-#define UNLINKF(u,t,h,l,f)					\
-{								\
-	/* Check for control block at head of chain */		\
-	if ((u) == (h)) {					\
-		(h) = (u)->l;					\
-		(f) = 1;					\
-	} else {						\
-		t	*tp;					\
-		/* Loop until we find the control block */	\
-		for (tp = (h); tp != (t *)NULL; tp = tp->l) {	\
-			if (tp->l == (u))			\
-				break;				\
-		}						\
-		if (tp) {					\
-			/* Remove it from chain */		\
-			tp->l = (u)->l;				\
-			(f) = 1;				\
-		} else						\
-			/* It wasn't on the chain */		\
-			(f) = 0;				\
-	}							\
-	(u)->l = (t *)NULL;					\
-}
-
-#endif	/* _NETATM_QUEUE_H */
diff --git a/include.new/netatm/sigpvc/sigpvc_var.h b/include.new/netatm/sigpvc/sigpvc_var.h
deleted file mode 100644
index f663f55..0000000
--- a/include.new/netatm/sigpvc/sigpvc_var.h
+++ /dev/null
@@ -1,95 +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: src/sys/netatm/sigpvc/sigpvc_var.h,v 1.5 2005/01/07 01:45:38 imp Exp $
- *
- */
-
-/*
- * PVC-only Signalling Manager
- * ---------------------------
- *
- * Protocol control blocks
- *
- */
-
-#ifndef _SIGPVC_SIGPVC_VAR_H
-#define _SIGPVC_SIGPVC_VAR_H
-
-#ifdef _KERNEL
-/*
- * Structure containing state information for each SigPVC protocol instance.
- * There will be one instance for each ATM device interface using the SigPVC
- * signalling manager.
- */
-struct	sigpvc {
-	struct siginst	pv_inst;	/* Common header */
-};
-#define	pv_next		pv_inst.si_next
-#define	pv_pif		pv_inst.si_pif
-#define	pv_addr		pv_inst.si_addr
-#define	pv_vccq		pv_inst.si_vccq
-#define	pv_state	pv_inst.si_state
-#endif	/* _KERNEL */
-
-/*
- * SigPVC Protocol States
- */
-#define	SIGPVC_ACTIVE	1		/* Active */
-#define	SIGPVC_DETACH	2		/* Detach in progress */
-
-
-#ifdef _KERNEL
-/*
- * SigPVC Virtual Channel Connection control block.  All information regarding
- * the state of a SigPVC controlled VCC will be recorded here.  There will be
- * one SigPVC VCC control block for each SigPVC-controlled VCC.
- */
-struct sigpvc_vccb {
-	struct vccb	vcp_hdr;	/* Generic vccb */
-};
-#endif	/* _KERNEL */
-
-/*
- * SigPVC VCC Signalling Protocol States
- */
-#define	VCCS_NULL	0		/* No state */
-#define	VCCS_ACTIVE	1		/* Active */
-#define	VCCS_FREE	2		/* Waiting for user to free resources */
-
-
-#ifdef _KERNEL
-/*
- * Global function declarations
- */
-	/* sigpvc_if.c */
-
-	/* sigpvc_subr.c */
-int		sigpvc_create_pvc(struct sigpvc *, Atm_connvc *, int *);
-void		sigpvc_close_vcc(struct vccb *);
-
-#endif	/* _KERNEL */
-
-#endif	/* _SIGPVC_SIGPVC_VAR_H */
diff --git a/include.new/netatm/spans/spans_cls.h b/include.new/netatm/spans/spans_cls.h
deleted file mode 100644
index 1429f3a..0000000
--- a/include.new/netatm/spans/spans_cls.h
+++ /dev/null
@@ -1,188 +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: src/sys/netatm/spans/spans_cls.h,v 1.4 2005/01/07 01:45:38 imp Exp $
- *
- */
-
-/*
- * SPANS Signalling Manager
- * ---------------------------
- *
- * SPANS Connectionless Datagram Service (CLS) control blocks
- *
- */
-
-#ifndef _SPANS_SPANSCLS_H
-#define _SPANS_SPANSCLS_H
-
-/*
- * Protocol constants
- */
-#define	SPANSARP_AGING		(60 * ATM_HZ)	/* ARP aging timer */
-#define	SPANSARP_RETRY		(3 * ATM_HZ)	/* ARP retry timer */
-#define	SPANSARP_MAXAGE		20 		/* Max ARP entry age (minutes)*/
-#define	SPANSARP_HASHSIZ	19		/* Hash table size */
-
-
-/*
- * SPANS CLS protocol structure.  There will be one such structure for 
- * each SPANS signalling instance.
- */
-struct spanscls {
-	struct spanscls	*cls_next;	/* Next attached cls instance */
-	u_char		cls_state;	/* Protocol state (see below) */
-	struct spans	*cls_spans;	/* Spans signalling instance */
-	Atm_connection	*cls_conn;	/* Connection manager token */
-	struct ip_nif	*cls_ipnif;	/* IP network interface */
-};
-
-/*
- * SPANS CLS Protocol States
- */
-#define	CLS_CLOSED	1		/* CLS PVC is closed */
-#define	CLS_OPEN	2		/* CLS PVC is open */
-
-
-/*
- * Structure for SPANS ARP mappings.  Each of these structures will contain 
- * IP address to SPANS hardware address mappings.  There will be one such
- * structure for each IP address currently in use.
- */
-struct spansarp {
-	struct arpmap	sa_arpmap;	/* Common entry header */
-	struct spanscls	*sa_cls;	/* Interface where we learned answer */
-	struct spansarp	*sa_next;	/* Hash chain */
-	struct spansarp	*sa_rnext;	/* Retry chain */
-	u_char		sa_flags;	/* Flags (see below) */
-	u_char		sa_origin;	/* Origin (see below) */
-	u_short		sa_reftime;	/* Entry reference time (minutes) */
-	struct ipvcc	*sa_ivp;	/* IP VCCs waiting for answer */
-};
-#define	sa_dstip	sa_arpmap.am_dstip
-#define	sa_dstatm	sa_arpmap.am_dstatm
-#define	sa_dstatmsub	sa_arpmap.am_dstatmsub
-
-/*
- * Entry Flags
- */
-#define	SAF_VALID	ARPF_VALID	/* Entry is valid */
-#define	SAF_REFRESH	ARPF_REFRESH	/* Entry has been refreshed */
-#define	SAF_LOCKED	0x04		/* Entry is locked */
-
-/*
- * Entry Origin
- */
-#define	SAO_PERM	ARP_ORIG_PERM	/* Entry is permanently installed */
-#define	SAO_LOOKUP	20		/* Learned via lookup */
-
-
-/*
- * SPANS CLS Packet Header
- */
-struct spanscls_hdr {
-	/* IEEE 802.6 MAC header */
-	spans_addr	ch_dst;		/* Destination SPANS address */
-	spans_addr	ch_src;		/* Source SPANS address */
-	u_char		ch_proto;	/* */
-	u_char		ch_extlen;	/* */
-	u_short		ch_bridging;	/* */
-
-	/* LLC SNAP header */
-	u_char		ch_dsap;	/* Destination SAP */
-	u_char		ch_ssap;	/* Source SAP */
-	u_char		ch_ctl;		/* Control field */
-	u_char		ch_oui[3];	/* Organizationally Unique Identifier */
-	u_short		ch_pid;		/* Protocol Identifier */
-};
-
-/*
- * SPANS ARP Packet Format
- */
-struct spansarp_hdr {
-	u_short		ah_hrd;		/* Hardware type (see below) */
-	u_short		ah_pro;		/* Protocol type */
-	u_char		ah_hln;		/* Length of hardware address */
-	u_char		ah_pln;		/* Length of protocol address */
-	u_short		ah_op;		/* Operation code (see below) */
-	spans_addr	ah_sha;		/* Source hardware address */
-	u_char		ah_spa[4];	/* Source protocol address */
-	spans_addr	ah_tha;		/* Target hardware address */
-	u_char		ah_tpa[4];	/* Target protocol address */
-};
-
-/*
- * Hardware types
- */
-#define	ARP_SPANS	0x4040
-
-/*
- * Operation types
- */
-#define	ARP_REQUEST	1		/* SPANSARP request */
-#define	ARP_REPLY	2		/* SPANSARP response */
-
-#define	ARP_PACKET_LEN	\
-	(sizeof(struct spanscls_hdr) + sizeof(struct spansarp_hdr))
-
-#ifdef _KERNEL
-/*
- * Macros for manipulating SPANS ARP tables and entries
- */
-#define SPANSARP_HASH(ip)	((u_long)(ip) % SPANSARP_HASHSIZ)
-
-#define	SPANSARP_ADD(sa)						\
-{								\
-	struct spansarp	**h;					\
-	h = &spansarp_arptab[SPANSARP_HASH((sa)->sa_dstip.s_addr)];	\
-	LINK2TAIL((sa), struct spansarp, *h, sa_next);		\
-}
-
-#define	SPANSARP_DELETE(sa)					\
-{								\
-	struct spansarp	**h;					\
-	h = &spansarp_arptab[SPANSARP_HASH((sa)->sa_dstip.s_addr)];	\
-	UNLINK((sa), struct spansarp, *h, sa_next);		\
-}
-
-#define	SPANSARP_LOOKUP(ip, sa)					\
-{								\
-	for ((sa) = spansarp_arptab[SPANSARP_HASH(ip)];		\
-				(sa); (sa) = (sa)->sa_next) {	\
-		if ((sa)->sa_dstip.s_addr == (ip))		\
-			break;					\
-	}							\
-}
-
-
-/*
- * External variables
- */
-extern struct spanscls		*spanscls_head;
-extern struct spanscls_hdr	spanscls_hdr;
-
-#endif	/* _KERNEL */
-
-#endif	/* _SPANS_SPANSCLS_H */
diff --git a/include.new/netatm/spans/spans_kxdr.h b/include.new/netatm/spans/spans_kxdr.h
deleted file mode 100644
index 002b9cd..0000000
--- a/include.new/netatm/spans/spans_kxdr.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/*	$NetBSD: types.h,v 1.13 2000/06/13 01:02:44 thorpej Exp $	*/
-/*	$NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt Exp $	*/
-
-/*-
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- *	from: @(#)types.h 1.18 87/07/24 SMI
- *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- *	from: @(#)xdr.h 1.19 87/04/22 SMI
- *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD: src/sys/netatm/spans/spans_kxdr.h,v 1.3 2005/01/07 01:45:38 imp Exp $
- */
-
-#ifndef _SPANS_KXDR_H
-#define _SPANS_KXDR_H
-
-/*
- * Rpc additions to <sys/types.h>
- */
-#include <sys/types.h>
-
-typedef int32_t bool_t;
-typedef int32_t enum_t;
-
-typedef uint32_t rpcprog_t;
-typedef uint32_t rpcvers_t;
-typedef uint32_t rpcproc_t;
-typedef uint32_t rpcprot_t;
-typedef uint32_t rpcport_t;
-typedef   int32_t rpc_inline_t;
-
-#define __dontcare__	-1
-
-#ifndef FALSE
-#	define FALSE	(0)
-#endif
-#ifndef TRUE
-#	define TRUE	(1)
-#endif
-#ifndef NULL
-#	define NULL	0
-#endif
-
-/*
- * xdr.h, External Data Representation Serialization Routines.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-/*
- * XDR provides a conventional way for converting between C data
- * types and an external bit-string representation.  Library supplied
- * routines provide for the conversion on built-in C data types.  These
- * routines and utility routines defined here are used to help implement
- * a type encode/decode routine for each user-defined type.
- *
- * Each data type provides a single procedure which takes two arguments:
- *
- *	bool_t
- *	xdrproc(xdrs, argresp)
- *		XDR *xdrs;
- *		<type> *argresp;
- *
- * xdrs is an instance of a XDR handle, to which or from which the data
- * type is to be converted.  argresp is a pointer to the structure to be
- * converted.  The XDR handle contains an operation field which indicates
- * which of the operations (ENCODE, DECODE * or FREE) is to be performed.
- *
- * XDR_DECODE may allocate space if the pointer argresp is null.  This
- * data can be freed with the XDR_FREE operation.
- *
- * We write only one procedure per data type to make it easy
- * to keep the encode and decode procedures for a data type consistent.
- * In many cases the same code performs all operations on a user defined type,
- * because all the hard work is done in the component type routines.
- * decode as a series of calls on the nested data types.
- */
-
-/*
- * Xdr operations.  XDR_ENCODE causes the type to be encoded into the
- * stream.  XDR_DECODE causes the type to be extracted from the stream.
- * XDR_FREE can be used to release the space allocated by an XDR_DECODE
- * request.
- */
-enum xdr_op {
-	XDR_ENCODE=0,
-	XDR_DECODE=1,
-	XDR_FREE=2
-};
-
-/*
- * This is the number of bytes per unit of external data.
- */
-#define BYTES_PER_XDR_UNIT	(4)
-#define RNDUP(x)  ((((x) + BYTES_PER_XDR_UNIT - 1) / BYTES_PER_XDR_UNIT) \
-		    * BYTES_PER_XDR_UNIT)
-
-/*
- * The XDR handle.
- * Contains operation which is being applied to the stream,
- * an operations vector for the particular implementation (e.g. see xdr_mem.c),
- * and two private fields for the use of the particular implementation.
- */
-typedef struct __rpc_xdr {
-	enum xdr_op	x_op;		/* operation; fast additional param */
-	const struct xdr_ops {
-		/* get a long from underlying stream */
-		bool_t	(*x_getlong)(struct __rpc_xdr *, long *);
-		/* put a long to " */
-		bool_t	(*x_putlong)(struct __rpc_xdr *, const long *);
-		/* get some bytes from " */
-		bool_t	(*x_getbytes)(struct __rpc_xdr *, char *, u_int);
-		/* put some bytes to " */
-		bool_t	(*x_putbytes)(struct __rpc_xdr *, const char *, u_int);
-		/* returns bytes off from beginning */
-		u_int	(*x_getpostn)(struct __rpc_xdr *);
-		/* lets you reposition the stream */
-		bool_t  (*x_setpostn)(struct __rpc_xdr *, u_int);
-		/* buf quick ptr to buffered data */
-		int32_t *(*x_inline)(struct __rpc_xdr *, u_int);
-		/* free privates of this xdr_stream */
-		void	(*x_destroy)(struct __rpc_xdr *);
-		bool_t	(*x_control)(struct __rpc_xdr *, int, void *);
-	} *x_ops;
-	char *	 	x_public;	/* users' data */
-	void *		x_private;	/* pointer to private data */
-	char * 		x_base;		/* private used for position info */
-	int		x_handy;	/* extra private word */
-} XDR;
-
-/*
- * A xdrproc_t exists for each data type which is to be encoded or decoded.
- *
- * The second argument to the xdrproc_t is a pointer to an opaque pointer.
- * The opaque pointer generally points to a structure of the data type
- * to be decoded.  If this pointer is 0, then the type routines should
- * allocate dynamic storage of the appropriate size and return it.
- */
-typedef	bool_t (*xdrproc_t)(XDR *, void *, u_int);
-
-/*
- * Operations defined on a XDR handle
- *
- * XDR		*xdrs;
- * long		*longp;
- * char *	 addr;
- * u_int	 len;
- * u_int	 pos;
- */
-#define XDR_GETLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-#define xdr_getlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-
-#define XDR_PUTLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-#define xdr_putlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-
-static __inline int
-xdr_getint32(XDR *xdrs, int32_t *ip)
-{
-	long l;
-
-	if (!xdr_getlong(xdrs, &l))
-		return (FALSE);
-	*ip = (int32_t)l;
-	return (TRUE);
-}
-
-static __inline int
-xdr_putint32(XDR *xdrs, int32_t *ip)
-{
-	long l;
-
-	l = (long)*ip;
-	return xdr_putlong(xdrs, &l);
-}
-
-#define XDR_GETINT32(xdrs, int32p)	xdr_getint32(xdrs, int32p)
-#define XDR_PUTINT32(xdrs, int32p)	xdr_putint32(xdrs, int32p)
-
-#define XDR_GETBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-#define xdr_getbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-
-#define XDR_PUTBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-#define xdr_putbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-
-#define XDR_GETPOS(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-#define xdr_getpos(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-
-#define XDR_SETPOS(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-#define xdr_setpos(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-
-#define	XDR_INLINE(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-#define	xdr_inline(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-
-#define	XDR_DESTROY(xdrs)				\
-	if ((xdrs)->x_ops->x_destroy) 			\
-		(*(xdrs)->x_ops->x_destroy)(xdrs)
-#define	xdr_destroy(xdrs)				\
-	if ((xdrs)->x_ops->x_destroy) 			\
-		(*(xdrs)->x_ops->x_destroy)(xdrs)
-
-#define XDR_CONTROL(xdrs, req, op)			\
-	if ((xdrs)->x_ops->x_control)			\
-		(*(xdrs)->x_ops->x_control)(xdrs, req, op)
-#define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs, req, op)
-
-/*
- * Solaris strips the '_t' from these types -- not sure why.
- * But, let's be compatible.
- */
-#define xdr_rpcvers(xdrs, versp) xdr_u_int32(xdrs, versp)
-#define xdr_rpcprog(xdrs, progp) xdr_u_int32(xdrs, progp)
-#define xdr_rpcproc(xdrs, procp) xdr_u_int32(xdrs, procp)
-#define xdr_rpcprot(xdrs, protp) xdr_u_int32(xdrs, protp)
-#define xdr_rpcport(xdrs, portp) xdr_u_int32(xdrs, portp)
-
-/*
- * Support struct for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * an entry with a null procedure pointer.  The xdr_union routine gets
- * the discriminant value and then searches the array of structures
- * for a matching value.  If a match is found the associated xdr routine
- * is called to handle that part of the union.  If there is
- * no match, then a default routine may be called.
- * If there is no match and no default routine it is an error.
- */
-#define NULL_xdrproc_t ((xdrproc_t)0)
-struct xdr_discrim {
-	int	value;
-	xdrproc_t proc;
-};
-
-/*
- * In-line routines for fast encode/decode of primitive data types.
- * Caveat emptor: these use single memory cycles to get the
- * data from the underlying buffer, and will fail to operate
- * properly if the data is not aligned.  The standard way to use these
- * is to say:
- *	if ((buf = XDR_INLINE(xdrs, count)) == NULL)
- *		return (FALSE);
- *	<<< macro calls >>>
- * where ``count'' is the number of bytes of data occupied
- * by the primitive data types.
- *
- * N.B. and frozen for all time: each data type here uses 4 bytes
- * of external representation.
- */
-#define IXDR_GET_INT32(buf)		((int32_t)__ntohl((uint32_t)*(buf)++))
-#define IXDR_PUT_INT32(buf, v)		(*(buf)++ =(int32_t)__htonl((uint32_t)v))
-#define IXDR_GET_U_INT32(buf)		((uint32_t)IXDR_GET_INT32(buf))
-#define IXDR_PUT_U_INT32(buf, v)	IXDR_PUT_INT32((buf), ((int32_t)(v)))
-
-#define IXDR_GET_LONG(buf)		((long)__ntohl((uint32_t)*(buf)++))
-#define IXDR_PUT_LONG(buf, v)		(*(buf)++ =(int32_t)__htonl((uint32_t)v))
-
-#define IXDR_GET_BOOL(buf)		((bool_t)IXDR_GET_LONG(buf))
-#define IXDR_GET_ENUM(buf, t)		((t)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_LONG(buf)		((u_long)IXDR_GET_LONG(buf))
-#define IXDR_GET_SHORT(buf)		((short)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_SHORT(buf)		((u_short)IXDR_GET_LONG(buf))
-
-#define IXDR_PUT_BOOL(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_ENUM(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_U_LONG(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_SHORT(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_U_SHORT(buf, v)	IXDR_PUT_LONG((buf), (v))
-
-/*
- * These are the "generic" xdr routines.
- */
-__BEGIN_DECLS
-extern bool_t	xdr_void(void);
-extern bool_t	xdr_int(XDR *, int *);
-extern bool_t	xdr_u_int(XDR *, u_int *);
-extern bool_t	xdr_long(XDR *, long *);
-extern bool_t	xdr_u_long(XDR *, u_long *);
-extern bool_t	xdr_short(XDR *, short *);
-extern bool_t	xdr_u_short(XDR *, u_short *);
-extern bool_t	xdr_int16_t(XDR *, int16_t *);
-extern bool_t	xdr_u_int16_t(XDR *, u_int16_t *);
-extern bool_t	xdr_int32_t(XDR *, int32_t *);
-extern bool_t	xdr_uint32_t(XDR *, uint32_t *);
-extern bool_t	xdr_int64_t(XDR *, int64_t *);
-extern bool_t	xdr_u_int64_t(XDR *, u_int64_t *);
-extern bool_t	xdr_bool(XDR *, bool_t *);
-extern bool_t	xdr_enum(XDR *, enum_t *);
-extern bool_t	xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
-extern bool_t	xdr_bytes(XDR *, char **, u_int *, u_int);
-extern bool_t	xdr_opaque(XDR *, char *, u_int);
-extern bool_t	xdr_string(XDR *, char **, u_int);
-extern bool_t	xdr_union(XDR *, enum_t *, char *, const struct xdr_discrim *, xdrproc_t);
-extern bool_t	xdr_char(XDR *, char *);
-extern bool_t	xdr_u_char(XDR *, u_char *);
-extern bool_t	xdr_vector(XDR *, char *, u_int, u_int, xdrproc_t);
-extern bool_t	xdr_float(XDR *, float *);
-extern bool_t	xdr_double(XDR *, double *);
-extern bool_t	xdr_quadruple(XDR *, long double *);
-extern bool_t	xdr_reference(XDR *, char **, u_int, xdrproc_t);
-extern bool_t	xdr_pointer(XDR *, char **, u_int, xdrproc_t);
-extern bool_t	xdr_wrapstring(XDR *, char **);
-extern void	xdr_free(xdrproc_t, void *);
-extern bool_t	xdr_hyper(XDR *, quad_t *);
-extern bool_t	xdr_u_hyper(XDR *, u_quad_t *);
-extern bool_t	xdr_longlong_t(XDR *, quad_t *);
-extern bool_t	xdr_u_longlong_t(XDR *, u_quad_t *);
-__END_DECLS
-
-/*
- * Common opaque bytes objects used by many rpc protocols;
- * declared here due to commonality.
- */
-#define MAX_NETOBJ_SZ 1024
-struct netobj {
-	u_int	n_len;
-	char	*n_bytes;
-};
-typedef struct netobj netobj;
-extern bool_t   xdr_netobj(XDR *, struct netobj *);
-
-/*
- * These are the public routines for the various implementations of
- * xdr streams.
- */
-__BEGIN_DECLS
-/* XDR using memory buffers */
-extern void   xdrmem_create(XDR *, char *, u_int, enum xdr_op);
-
-/* XDR pseudo records for tcp */
-extern void   xdrrec_create(XDR *, u_int, u_int, void *,
-			    int (*)(void *, void *, int),
-			    int (*)(void *, void *, int));
-
-/* make end of xdr record */
-extern bool_t xdrrec_endofrecord(XDR *, int);
-
-/* move to beginning of next record */
-extern bool_t xdrrec_skiprecord(XDR *);
-
-/* true if no more input */
-extern bool_t xdrrec_eof(XDR *);
-extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int);
-__END_DECLS
-
-#endif /* !_SPANS_KXDR_H */
diff --git a/include.new/netatm/spans/spans_var.h b/include.new/netatm/spans/spans_var.h
deleted file mode 100644
index 19b1ddc..0000000
--- a/include.new/netatm/spans/spans_var.h
+++ /dev/null
@@ -1,261 +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: src/sys/netatm/spans/spans_var.h,v 1.9 2005/01/07 01:45:38 imp Exp $
- *
- */
-
-/*
- * SPANS Signalling Manager
- * ---------------------------
- *
- * Protocol control blocks
- *
- */
-
-#ifndef _SPANS_SPANS_VAR_H
-#define _SPANS_SPANS_VAR_H
-
-#ifdef _KERNEL
-
-#include <vm/uma.h>	/* XXX arr: will remove rsn */
-
-/*
- * Constants to indicate the state of the signalling interface
- */
-#define SPANS_UNI_UP	1
-#define SPANS_UNI_DOWN	-1
-
-
-/*
- * Structure containing state information for each SPANS protocol
- * instance.  There will be one instance for each ATM device interface
- * using the SPANS signalling manager.
- */
-struct	spans {
-	struct siginst	sp_inst;	/* Header */
-	struct atm_time	sp_time;	/* Timer controls */
-	void		(*sp_lower)	/* Lower command handler */
-				(int, void *, int, int);
-	Atm_connection	*sp_conn;	/* Signalling connection */
-	long		sp_s_epoch;	/* Switch epoch */
-	long		sp_h_epoch;	/* Host epoch */
-	u_int		sp_probe_ct;	/* Status_req msgs unanswered */
-	u_int		sp_alloc_vci;	/* Next VCI to allocate */
-	u_int		sp_alloc_vpi;	/* Next VPI to allocate */
-	u_int		sp_min_vci;	/* Lowest VCI to allocate */
-	u_int		sp_max_vci;	/* Highest VCI to allocate */
-	struct spanscls	*sp_cls;	/* CLS instance */
-};
-
-#define sp_next		sp_inst.si_next
-#define sp_pif		sp_inst.si_pif
-#define sp_addr		sp_inst.si_addr
-#define sp_subaddr	sp_inst.si_subaddr
-#define sp_vccq		sp_inst.si_vccq
-#define sp_state	sp_inst.si_state
-#define sp_ipserv	sp_inst.si_ipserv
-#endif	/* _KERNEL */
-
-/*
- * SPANS Protocol States
- */
-#define	SPANS_ACTIVE	1		/* Active */
-#define	SPANS_DETACH	2		/* Detach in progress */
-#define SPANS_INIT	3		/* Initializing */
-#define SPANS_PROBE	4		/* Exchanging status info */
-
-#define	SPANS_PROBE_INTERVAL	(ATM_HZ)	/* Interval between SPANS_STAT_REQs */
-#define	SPANS_PROBE_THRESH	10		/* Probe time-out threshold */
-#define	SPANS_PROBE_ERR_WAIT	(3 * ATM_HZ)	/* Time to wait if send probe fails */
-
-
-#ifdef _KERNEL
-/*
- * SPANS Virtual Channel Connection control block.  All information
- * regarding the state of a SPANS-controlled VCC will be recorded here.
- * There will be one SPANS VCC control block for each SPANS-controlled
- * VCC.
- */
-struct spans_vccb {
-	struct vccb	vcp_hdr;	/* Generic VCCB */
-	u_short		sv_retry;	/* Xmit retry count */
-	spans_atm_conn	sv_conn;	/* SPANS connection info */
-	spans_resrc sv_spans_qos;	/* QoS for VCC */
-	spans_aal	sv_spans_aal;	/* AAL for VCC */
-};
-
-#define	sv_type		vcp_hdr.vc_type
-#define	sv_proto	vcp_hdr.vc_proto
-#define	sv_sstate	vcp_hdr.vc_sstate
-#define	sv_ustate	vcp_hdr.vc_ustate
-#define	sv_pif		vcp_hdr.vc_pif
-#define	sv_nif		vcp_hdr.vc_nif
-#define	sv_sigelem	vcp_hdr.vc_sigelem
-#define	sv_time		vcp_hdr.vc_time
-#define	sv_vpi		vcp_hdr.vc_vpi
-#define	sv_vci		vcp_hdr.vc_vci
-#define	sv_connvc	vcp_hdr.vc_connvc
-#define	sv_ipdus	vcp_hdr.vc_ipdus
-#define	sv_opdus	vcp_hdr.vc_opdus
-#define	sv_ibytes	vcp_hdr.vc_ibytes
-#define	sv_obytes	vcp_hdr.vc_obytes
-#define	sv_ierrors	vcp_hdr.vc_ierrors
-#define	sv_oerrors	vcp_hdr.vc_oerrors
-#define	sv_tstamp	vcp_hdr.vc_tstamp
-#define	sv_daddr	sv_conn.daddr
-#define	sv_saddr	sv_conn.saddr
-#define	sv_dsap		sv_conn.dsap
-#define	sv_ssap		sv_conn.ssap
-
-#define SV_MAX_RETRY	3
-#define SV_TIMEOUT	(ATM_HZ)
-
-#endif	/* _KERNEL */
-
-
-/*
- * SPANS VCC Signalling Protocol States
- */
-#define	SPANS_VC_NULL		0	/* No state */
-#define	SPANS_VC_ACTIVE		1	/* Active */
-#define	SPANS_VC_ACT_DOWN	2	/* Active - Interface down */
-#define	SPANS_VC_POPEN		3	/* VCC open in progress */
-#define	SPANS_VC_R_POPEN	4	/* VCC rmt open in progress */
-#define	SPANS_VC_OPEN		5	/* VCC open */
-#define	SPANS_VC_CLOSE		6	/* VCC close in progress */
-#define	SPANS_VC_ABORT		7	/* VCC abort in progress */
-#define	SPANS_VC_FREE		8	/* Waiting for user to free resources */
-
-
-#ifdef _KERNEL
-/*
- * Macro to compare two SPANS addresses.  
- *
- * Returns 0 if the addresses are equal.
- */
-#define spans_addr_cmp(a, b)	\
-	(bcmp((caddr_t)a, (caddr_t)b, sizeof(struct spans_addr)))
-
-/*
- * Macro to copy a SPANS address from a to b.  
- */
-#define spans_addr_copy(a, b)	\
-	(bcopy((caddr_t)a, (caddr_t)b, sizeof(struct spans_addr)))
-
-
-/*
- * Timer macros
- */
-#define	SPANS_TIMER(s, t)	atm_timeout(&(s)->sp_time, (t), spans_timer)
-#define	SPANS_CANCEL(s)	atm_untimeout(&(s)->sp_time)
-#define	SPANS_VC_TIMER(v, t)	atm_timeout(&(v)->vc_time, (t), spans_vctimer)
-#define	SPANS_VC_CANCEL(v)	atm_untimeout(&(v)->vc_time)
-
-
-/*
- * Global function declarations
- */
-struct ipvcc;
-
-	/* spans_arp.c */
-int		spansarp_svcout(struct ipvcc *, struct in_addr *);
-int		spansarp_svcin(struct ipvcc *, Atm_addr *, Atm_addr *);
-int		spansarp_svcactive(struct ipvcc *);
-void		spansarp_vcclose(struct ipvcc *);
-void		spansarp_ipact(struct spanscls *);
-void		spansarp_ipdact(struct spanscls *);
-void		spansarp_start(void);
-void		spansarp_stop(void);
-void		spansarp_input(struct spanscls *, KBuffer *);
-int		spansarp_ioctl(int, caddr_t, caddr_t);
-
-	/* spans_cls.c */
-int		spanscls_start(void);
-void		spanscls_stop(void);
-int		spanscls_attach(struct spans *);
-void		spanscls_detach(struct spans *);
-void		spanscls_closevc(struct spanscls *, struct t_atm_cause *);
-
-	/* spans_if.c */
-int		spans_abort(struct vccb *);
-int		spans_free(struct vccb *);
-
-	/* spans_msg.c */
-int		spans_send_msg(struct spans *, spans_msg *);
-int		spans_send_open_req(struct spans *, struct spans_vccb *);
-int		spans_send_open_rsp(struct spans *,
-				struct spans_vccb *,
-				spans_result);
-int		spans_send_close_req(struct spans *,
-				struct spans_vccb *);
-void		spans_rcv_msg(struct spans *, KBuffer *);
-
-	/* spans_print.c */
-void		spans_print_msg(spans_msg *);
-
-	/* spans_proto.c */
-void		spans_timer(struct atm_time *);
-void		spans_vctimer(struct atm_time *);
-void		spans_upper(int, void *, int, int);
-void		spans_notify(void *, int, int);
-
-	/* spans_subr.c */
-int		spans_open_vcc(struct spans *, Atm_connvc *);
-int		spans_close_vcc(struct spans *, struct spans_vccb *, int);
-int		spans_clear_vcc(struct spans *, struct spans_vccb *);
-void		spans_switch_reset(struct spans *, int);
-
-	/* spans_util.c */
-int		spans_get_spans_sap(Sap_t, spans_sap *);
-int		spans_get_local_sap(spans_sap, Sap_t *);
-int		spans_ephemeral_sap(struct spans *);
-int		spans_get_spans_aal(Aal_t, spans_aal *);
-int		spans_get_local_aal(spans_aal, Aal_t *);
-int		spans_verify_vccb(struct spans *, struct spans_vccb *);
-struct spans_vccb *
-		spans_find_vpvc(struct spans *, int, int, u_char);
-struct spans_vccb *
-		spans_find_conn(struct spans *, struct spans_atm_conn *);
-spans_vpvc	spans_alloc_vpvc(struct spans *);
-char *		spans_addr_print(struct spans_addr *);
-void		spans_dump_buffer(KBuffer *);
-
-
-/*
- * External variables
- */
-extern struct spans_addr	spans_bcastaddr;
-extern uma_zone_t		spans_vc_zone;
-extern uma_zone_t		spans_msg_zone;
-extern struct t_atm_cause	spans_cause;
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_harp_spans);
-#endif
-
-#endif	/* _KERNEL */
-
-#endif	/* _SPANS_SPANS_VAR_H */
diff --git a/include.new/netatm/uni/sscf_uni.h b/include.new/netatm/uni/sscf_uni.h
deleted file mode 100644
index d6d49ef..0000000
--- a/include.new/netatm/uni/sscf_uni.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: src/sys/netatm/uni/sscf_uni.h,v 1.3 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI Support
- * ---------------------
- *
- * SSCF UNI protocol definitions
- *
- */
-
-#ifndef _UNI_SSCF_UNI_H
-#define _UNI_SSCF_UNI_H
-
-/*
- * SSCF_UNI API definitions
- */
-#define	SSCF_UNI_ESTIND_YES	1		/* Allow new ESTABLISH_IND */
-#define	SSCF_UNI_ESTIND_NO	2		/* Disallow new ESTABLISH_IND */
-
-#endif	/* _UNI_SSCF_UNI_H */
diff --git a/include.new/netatm/uni/sscf_uni_var.h b/include.new/netatm/uni/sscf_uni_var.h
deleted file mode 100644
index 77a4869..0000000
--- a/include.new/netatm/uni/sscf_uni_var.h
+++ /dev/null
@@ -1,115 +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: src/sys/netatm/uni/sscf_uni_var.h,v 1.8 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI Support
- * ---------------------
- *
- * SSCF UNI protocol control blocks
- *
- */
-
-#ifndef _UNI_SSCF_UNI_VAR_H
-#define _UNI_SSCF_UNI_VAR_H
-
-/*
- * Structure containing information for each SSCF UNI connection.
- */
-struct univcc {
-	u_char		uv_ustate;	/* SSCF-User state (see below) */
-	u_char		uv_lstate;	/* SSCF-SSCOP state (see below) */
-	u_short		uv_flags;	/* Connection flags (see below) */
-	enum uni_vers	uv_vers;	/* UNI version */
-
-	/* Stack variables */
-	Atm_connvc	*uv_connvc;	/* Connection vcc for this stack */
-	void		*uv_toku;	/* Stack upper layer's token */
-	void		*uv_tokl;	/* Stack lower layer's token */
-	void		(*uv_upper)	/* Stack upper layer's interface */
-				(int, void *, intptr_t, intptr_t);
-	void		(*uv_lower)	/* Stack lower layer's interface */
-				(int, void *, intptr_t, intptr_t);
-};
-
-/*
- * SSCF to SAAL User (Q.2931) Interface States
- */
-#define	UVU_INST	0		/* Instantiated, waiting for INIT */
-#define	UVU_RELEASED	1		/* Connection released */
-#define	UVU_PACTIVE	2		/* Awaiting connection establishment */
-#define	UVU_PRELEASE	3		/* Awaiting connection release */
-#define	UVU_ACTIVE	4		/* Connection established */
-#define	UVU_TERM	5		/* Waiting for TERM */
-
-/*
- * SSCF to SSCOP Interface States
- */
-#define	UVL_INST	0		/* Instantiated, waiting for INIT */
-#define	UVL_IDLE	1		/* Idle */
-#define	UVL_OUTCONN	2		/* Outgoing connection pending */
-#define	UVL_INCONN	3		/* Incoming connection pending */
-#define	UVL_OUTDISC	4		/* Outgoing disconnection pending */
-#define	UVL_OUTRESYN	5		/* Outgoing resynchronization pending */
-#define	UVL_INRESYN	6		/* Incoming resynchornization pending */
-#define	UVL_RECOVERY	8		/* Recovery pending */
-#define	UVL_READY	10		/* Data transfer ready */
-#define	UVL_TERM	11		/* Waiting for TERM */
-
-/*
- * Connection Flags
- */
-#define	UVF_NOESTIND	0x0001		/* Don't process ESTABLISH_IND */
-
-
-#ifdef _KERNEL
-/*
- * Global function declarations
- */
-	/* sscf_uni.c */
-int		sscf_uni_start(void);
-int		sscf_uni_stop(void);
-void		sscf_uni_abort(struct univcc *, char *);
-void		sscf_uni_pdu_print(const struct univcc *,
-		    const KBuffer *, const char *);
-
-	/* sscf_uni_lower.c */
-void		sscf_uni_lower(int, void *, intptr_t, intptr_t);
-
-	/* sscf_uni_upper.c */
-void		sscf_uni_upper(int, void *, intptr_t, intptr_t);
-
-
-/*
- * External variables
- */
-extern int		sscf_uni_vccnt;
-
-#endif	/* _KERNEL */
-
-#endif	/* _UNI_SSCF_UNI_VAR_H */
diff --git a/include.new/netatm/uni/sscop.h b/include.new/netatm/uni/sscop.h
deleted file mode 100644
index 85748a0..0000000
--- a/include.new/netatm/uni/sscop.h
+++ /dev/null
@@ -1,80 +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: src/sys/netatm/uni/sscop.h,v 1.3 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI Support
- * ---------------------
- *
- * SSCOP protocol definitions
- *
- */
-
-#ifndef _UNI_SSCOP_H
-#define _UNI_SSCOP_H
-
-/*
- * SSCOP Version
- */
-enum sscop_vers {
-	SSCOP_VERS_QSAAL,			/* Version = Q.SAAL1 */
-	SSCOP_VERS_Q2110			/* Version = Q.2110 */
-};
-
-
-/*
- * SSCOP API definitions
- */
-#define	SSCOP_UU_NULL		0		/* User-to-User Info = null */
-#define	SSCOP_RN_TOTAL		-1		/* Retrieval Number = Total */
-#define	SSCOP_RN_UNKNOWN	-2		/* Retrieval Number = Unknown */
-#define	SSCOP_BR_YES		1		/* Buffer Release = Yes */
-#define	SSCOP_BR_NO		2		/* Buffer Release = No */
-#define	SSCOP_SOURCE_SSCOP	1		/* Source = SSCOP */
-#define	SSCOP_SOURCE_USER	2		/* Source = User */
-#define	SSCOP_SOURCE_LAST	3		/* Source = from last END */
-
-
-/*
- * Connection parameters for an SSCOP entity.
- * Passed via an SSCOP_INIT stack call argument.
- */
-struct sscop_parms {
-	u_short		sp_maxinfo;	/* k - max information field size */
-	u_short		sp_maxuu;	/* j - max SSCOP-UU field size */
-	short		sp_maxcc;	/* MaxCC - max value of VT(CC) */
-	short		sp_maxpd;	/* MaxPD - max value of VT(PD) */
-	u_short		sp_timecc;	/* Timer_CC value (ticks) */
-	u_short		sp_timekeep;	/* Timer_KEEPALIVE value (ticks) */
-	u_short		sp_timeresp;	/* Timer_NO-RESPONSE value (ticks) */
-	u_short		sp_timepoll;	/* Timer_POLL value (ticks) */
-	u_short		sp_timeidle;	/* Timer_IDLE value (ticks) */
-	short		sp_rcvwin;	/* Receiver window size */
-};
-
-#endif	/* _UNI_SSCOP_H */
diff --git a/include.new/netatm/uni/sscop_misc.h b/include.new/netatm/uni/sscop_misc.h
deleted file mode 100644
index ab68ead..0000000
--- a/include.new/netatm/uni/sscop_misc.h
+++ /dev/null
@@ -1,97 +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: src/sys/netatm/uni/sscop_misc.h,v 1.3 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI Support
- * ---------------------
- *
- * SSCOP miscellaneous definitions
- *
- */
-
-#ifndef _UNI_SSCOP_MISC_H
-#define _UNI_SSCOP_MISC_H
-
-/*
- * SSCOP command definitions
- */
-#define	SSCOP_CMD_MIN	SSCOP_INIT	/* Minimum SSCOP CMD value */
-#define	SSCOP_CMD_MAX	SSCOP_RETRIEVECMP_IND	/* Maximum SSCOP CMD value */
-#define	SSCOP_CMD_SIZE	36		/* Size of command lookup table */
-
-
-/*
- * Management Errors
- */
-#define	MAA_ERROR_MIN	'A'
-#define	MAA_ERROR_MAX	'X'
-#define	MAA_ERROR_INVAL	(MAA_ERROR_MAX + 1)
-#define	MAA_ERROR_COUNT	(MAA_ERROR_MAX - MAA_ERROR_MIN + 2)
-
-
-/*
- * SSCOP Sequence Numbers
- *
- * SSCOP sequence numbers are 24 bit integers using modulo arithmetic.
- * The macros below must be used to modify and compare such numbers.
- * Comparison of sequence numbers is always relative to some base number (b).
- */
-typedef u_int     sscop_seq;
-
-#define	SEQ_MOD		0xffffff
-#define	SEQ_VAL(v)	((v) & SEQ_MOD)
-#define	SEQ_SET(s,v)	((s) = SEQ_VAL(v))
-#define	SEQ_ADD(s,v)	(SEQ_VAL((s) + (v)))
-#define	SEQ_SUB(s,v)	(SEQ_VAL((s) - (v)))
-#define	SEQ_INCR(s,v)	((s) = SEQ_VAL((s) + (v)))
-#define	SEQ_DECR(s,v)	((s) = SEQ_VAL((s) - (v)))
-#define	SEQ_EQ(x,y)	(SEQ_VAL(x) == SEQ_VAL(y))
-#define	SEQ_NEQ(x,y)	(SEQ_VAL(x) != SEQ_VAL(y))
-#define	SEQ_LT(x,y,b)	(SEQ_VAL((x) - (b)) < SEQ_VAL((y) - (b)))
-#define	SEQ_LEQ(x,y,b)	(SEQ_VAL((x) - (b)) <= SEQ_VAL((y) - (b)))
-#define	SEQ_GT(x,y,b)	(SEQ_VAL((x) - (b)) > SEQ_VAL((y) - (b)))
-#define	SEQ_GEQ(x,y,b)	(SEQ_VAL((x) - (b)) >= SEQ_VAL((y) - (b)))
-
-
-/*
- * SSCOP Timers
- *
- * All of the SSCOP timer fields are maintained in terms of clock ticks.
- * The timers tick 2 times per second.
- */
-#define	SSCOP_HZ	2		/* SSCOP ticks per second */
-
-#define	SSCOP_T_NUM	4		/* Number of timers per connection */
-
-#define	SSCOP_T_POLL	0		/* Timer_POLL / Timer_KEEP-ALIVE */
-#define	SSCOP_T_NORESP	1		/* Timer_NO-RESPONSE */
-#define	SSCOP_T_CC	2		/* Timer_CC */
-#define	SSCOP_T_IDLE	3		/* Timer_IDLE */
-
-#endif	/* _UNI_SSCOP_MISC_H */
diff --git a/include.new/netatm/uni/sscop_pdu.h b/include.new/netatm/uni/sscop_pdu.h
deleted file mode 100644
index 5c7f079..0000000
--- a/include.new/netatm/uni/sscop_pdu.h
+++ /dev/null
@@ -1,317 +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: src/sys/netatm/uni/sscop_pdu.h,v 1.3 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI Support
- * ---------------------
- *
- * SSCOP Protocol Data Unit (PDU) definitions
- *
- */
-
-#ifndef _UNI_SSCOP_PDU_H
-#define _UNI_SSCOP_PDU_H
-
-/*
- * SSCOP PDU Constants
- */
-#define	PDU_MIN_LEN	4		/* Minimum PDU length */
-#define	PDU_LEN_MASK	3		/* PDU length must be 32-bit aligned */
-#define	PDU_ADDR_MASK	3		/* PDUs must be 32-bit aligned */
-#define	PDU_SEQ_MASK	0x00ffffff	/* Mask for 24-bit sequence values */
-#define	PDU_MAX_INFO	65528		/* Maximum length of PDU info field */
-#define	PDU_MAX_UU	65524		/* Maximum length of SSCOP-UU field */
-#define	PDU_MAX_STAT	65520		/* Maximum length of STAT list */
-#define	PDU_MAX_ELEM	67		/* Maximum elements sent in STAT */
-#define	PDU_PAD_ALIGN	4		/* I-field padding alignment */
-
-
-/*
- * PDU Queueing Header
- *
- * There will be a queueing header tacked on to the front of each
- * buffer chain that is placed on any of the sscop SD PDU queues (not
- * including the SD transmission queue).  Note that this header will
- * not be included in the buffer data length/offset fields.
- */
-struct pdu_hdr {
-	union {
-		struct pdu_hdr	*phu_pack_lk;	/* Pending ack queue link */
-		struct pdu_hdr	*phu_recv_lk;	/* Receive queue link */
-	} ph_u;
-	struct pdu_hdr	*ph_rexmit_lk;	/* Retranmit queue link */
-	sscop_seq	ph_ns;		/* SD.N(S) - SD's sequence number */
-	sscop_seq	ph_nps;		/* SD.N(PS) - SD's poll sequence */
-	KBuffer		*ph_buf;	/* Pointer to containing buffer */
-};
-#define	ph_pack_lk	ph_u.phu_pack_lk
-#define	ph_recv_lk	ph_u.phu_recv_lk
-
-
-/*
- * SSCOP PDU formats
- *
- * N.B. - all SSCOP PDUs are trailer oriented (don't ask me...)
- */
-
-/*
- * PDU Type Fields
- */
-#define	PT_PAD_MASK	0xc0		/* Pad length mask */
-#define	PT_PAD_SHIFT	6		/* Pad byte shift count */
-#define	PT_SOURCE_SSCOP	0x10		/* Source = SSCOP */
-#define	PT_TYPE_MASK	0x0f		/* Type mask */
-#define	PT_TYPE_MAX	0x0f		/* Maximum pdu type */
-#define	PT_TYPE_SHIFT	24		/* Type word shift count */
-
-#define	PT_BGN		0x01		/* Begin */
-#define	PT_BGAK		0x02		/* Begin Acknowledge */
-#define	PT_BGREJ	0x07		/* Begin Reject */
-#define	PT_END		0x03		/* End */
-#define	PT_ENDAK	0x04		/* End Acknowledge */
-#define	PT_RS		0x05		/* Resynchronization */
-#define	PT_RSAK		0x06		/* Resynchronization Acknowledge */
-#define	PT_ER		0x09		/* Error Recovery */
-#define	PT_ERAK		0x0f		/* Error Recovery Acknowledge */
-#define	PT_SD		0x08		/* Sequenced Data */
-#define	PT_SDP		0x09		/* Sequenced Data with Poll */
-#define	PT_POLL		0x0a		/* Status Request */
-#define	PT_STAT		0x0b		/* Solicited Status Response */
-#define	PT_USTAT	0x0c		/* Unsolicited Status Response */
-#define	PT_UD		0x0d		/* Unnumbered Data */
-#define	PT_MD		0x0e		/* Management Data */
-
-/*
- * Begin PDU
- */
-struct bgn_pdu {
-	u_char		bgn_rsvd[3];	/* Reserved */
-	u_char		bgn_nsq;	/* N(SQ) */
-	union {
-		u_char		bgnu_type;	/* PDU type, etc */
-		sscop_seq	bgnu_nmr;	/* N(MR) */
-	} bgn_u;
-};
-#define	bgn_type	bgn_u.bgnu_type
-#define	bgn_nmr		bgn_u.bgnu_nmr
-
-/*
- * Begin Acknowledge PDU
- */
-struct bgak_pdu {
-	int		bgak_rsvd;	/* Reserved */
-	union {
-		u_char		bgaku_type;	/* PDU type, etc */
-		sscop_seq	bgaku_nmr;	/* N(MR) */
-	} bgak_u;
-};
-#define	bgak_type	bgak_u.bgaku_type
-#define	bgak_nmr	bgak_u.bgaku_nmr
-
-/*
- * Begin Reject PDU
- */
-struct bgrej_pdu {
-	int		bgrej_rsvd2;	/* Reserved */
-	u_char		bgrej_type;	/* PDU type, etc */
-	u_char		bgrej_rsvd1[3];	/* Reserved */
-};
-
-/*
- * End PDU
- */
-struct end_pdu {
-	int		end_rsvd2;	/* Reserved */
-	u_char		end_type;	/* PDU type, etc */
-	u_char		end_rsvd1[3];	/* Reserved */
-};
-
-/*
- * End Acknowledge PDU (Q.2110)
- */
-struct endak_q2110_pdu {
-	int		endak_rsvd2;	/* Reserved */
-	u_char		endak_type;	/* PDU type, etc */
-	u_char		endak_rsvd1[3];	/* Reserved */
-};
-
-/*
- * End Acknowledge PDU (Q.SAAL)
- */
-struct endak_qsaal_pdu {
-	u_char		endak_type;	/* PDU type, etc */
-	u_char		endak_rsvd[3];	/* Reserved */
-};
-
-/*
- * Resynchronization PDU
- */
-struct rs_pdu {
-	char		rs_rsvd[3];	/* Reserved */
-	u_char		rs_nsq;		/* N(SQ) */
-	union {
-		u_char		rsu_type;	/* PDU type, etc */
-		sscop_seq	rsu_nmr;	/* N(MR) */
-	} rs_u;
-};
-#define	rs_type		rs_u.rsu_type
-#define	rs_nmr		rs_u.rsu_nmr
-
-/*
- * Resynchronization Acknowledge PDU (Q.2110)
- */
-struct rsak_q2110_pdu {
-	int		rsak_rsvd;	/* Reserved */
-	union {
-		u_char		rsaku_type;	/* PDU type, etc */
-		sscop_seq	rsaku_nmr;	/* N(MR) */
-	} rsak_u;
-};
-#define	rsak2_type	rsak_u.rsaku_type
-#define	rsak_nmr	rsak_u.rsaku_nmr
-
-/*
- * Resynchronization Acknowledge PDU (Q.SAAL)
- */
-struct rsak_qsaal_pdu {
-	u_char		rsaks_type;	/* PDU type, etc */
-	u_char		rsak_rsvd[3];	/* Reserved */
-};
-
-/*
- * Error Recovery PDU
- */
-struct er_pdu {
-	char		er_rsvd[3];	/* Reserved */
-	u_char		er_nsq;		/* N(SQ) */
-	union {
-		u_char		eru_type;	/* PDU type, etc */
-		sscop_seq	eru_nmr;	/* N(MR) */
-	} er_u;
-};
-#define	er_type		er_u.eru_type
-#define	er_nmr		er_u.eru_nmr
-
-/*
- * Error Recovery Acknowledge PDU
- */
-struct erak_pdu {
-	int		erak_rsvd;	/* Reserved */
-	union {
-		u_char		eraku_type;	/* PDU type, etc */
-		sscop_seq	eraku_nmr;	/* N(MR) */
-	} erak_u;
-};
-#define	erak_type	erak_u.eraku_type
-#define	erak_nmr	erak_u.eraku_nmr
-
-/*
- * Sequenced Data PDU
- */
-struct sd_pdu {
-	union {
-		u_char		sdu_type;	/* PDU type, etc */
-		sscop_seq	sdu_ns;		/* N(S) */
-	} sd_u;
-};
-#define	sd_type		sd_u.sdu_type
-#define	sd_ns		sd_u.sdu_ns
-
-/*
- * Sequenced Data with Poll PDU
- */
-struct sdp_pdu {
-	sscop_seq	sdp_nps;	/* N(PS) */
-	union {
-		u_char		sdpu_type;	/* PDU type, etc */
-		sscop_seq	sdpu_ns;	/* N(S) */
-	} sdp_u;
-};
-#define	sdp_type	sdp_u.sdpu_type
-#define	sdp_ns		sdp_u.sdpu_ns
-
-/*
- * Poll PDU
- */
-struct poll_pdu {
-	sscop_seq	poll_nps;	/* N(PS) */
-	union {
-		u_char		pollu_type;	/* PDU type, etc */
-		sscop_seq	pollu_ns;	/* N(S) */
-	} poll_u;
-};
-#define	poll_type	poll_u.pollu_type
-#define	poll_ns		poll_u.pollu_ns
-
-/*
- * Solicited Status PDU
- */
-struct stat_pdu {
-	sscop_seq	stat_nps;	/* N(PS) */
-	sscop_seq	stat_nmr;	/* N(MR) */
-	union {
-		u_char		statu_type;	/* PDU type, etc */
-		sscop_seq	statu_nr;	/* N(R) */
-	} stat_u;
-};
-#define	stat_type	stat_u.statu_type
-#define	stat_nr		stat_u.statu_nr
-
-/*
- * Unsolicited Status PDU
- */
-struct ustat_pdu {
-	sscop_seq	ustat_le1;	/* List element 1 */
-	sscop_seq	ustat_le2;	/* List element 2 */
-	sscop_seq	ustat_nmr;	/* N(MR) */
-	union {
-		u_char		ustatu_type;	/* PDU type, etc */
-		sscop_seq	ustatu_nr;	/* N(R) */
-	} ustat_u;
-};
-#define	ustat_type	ustat_u.ustatu_type
-#define	ustat_nr	ustat_u.ustatu_nr
-
-/*
- * Unit Data PDU
- */
-struct ud_pdu {
-	u_char		ud_type;	/* PDU type, etc */
-	u_char		ud_rsvd[3];	/* Reserved */
-};
-
-/*
- * Management Data PDU
- */
-struct md_pdu {
-	u_char		md_type;	/* PDU type, etc */
-	u_char		md_rsvd[3];	/* Reserved */
-};
-
-#endif	/* _UNI_SSCOP_PDU_H */
diff --git a/include.new/netatm/uni/sscop_var.h b/include.new/netatm/uni/sscop_var.h
deleted file mode 100644
index 9eb47a7..0000000
--- a/include.new/netatm/uni/sscop_var.h
+++ /dev/null
@@ -1,287 +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: src/sys/netatm/uni/sscop_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI Support
- * ---------------------
- *
- * SSCOP protocol control blocks
- *
- */
-
-#ifndef _UNI_SSCOP_VAR_H
-#define _UNI_SSCOP_VAR_H
-
-/*
- * Structure containing information for each SSCOP connection.
- */
-struct sscop {
-	struct sscop	*so_next;	/* Next connection in chain */
-	u_char		so_state;	/* Connection state (see below) */
-	u_short		so_flags;	/* Connection flags (see below) */
-	enum sscop_vers	so_vers;	/* SSCOP version */
-
-	/* Transmitter variables */
-	sscop_seq	so_send;	/* VT(S) - next SD to send */
-	sscop_seq	so_sendmax;	/* VT(MS) - max SD to send + 1 */
-	sscop_seq	so_ack;		/* VT(A) - next expected ack */
-	sscop_seq	so_pollsend;	/* VT(PS) - last POLL sent */
-	sscop_seq	so_pollack;	/* VT(PA) - next expected STAT */
-	short		so_polldata;	/* VT(PD) - SD's sent between POLLs */
-	short		so_connctl;	/* VT(CC) - un-ack'd BGN,END,ER,RS */
-	u_char		so_sendconn;	/* VT(SQ) - last BGN,ER,RS sent */
-
-	/* Receiver variables */
-	sscop_seq	so_rcvnext;	/* VR(R) - next SD to receive */
-	sscop_seq	so_rcvhigh;	/* VR(H) - next highest SD to receive */
-	sscop_seq	so_rcvmax;	/* VR(MR) - max SD to receive + 1 */
-	u_char		so_rcvconn;	/* VR(SQ) - last BGN,ER,RS received */
-
-	/* PDU queues */
-	KBuffer		*so_xmit_hd;	/* SD transmission queue head */
-	KBuffer		*so_xmit_tl;	/* SD transmission queue tail */
-	struct pdu_hdr	*so_rexmit_hd;	/* SD retransmission queue head */
-	struct pdu_hdr	*so_rexmit_tl;	/* SD retransmission queue head */
-	struct pdu_hdr	*so_pack_hd;	/* SD pending ack queue head */
-	struct pdu_hdr	*so_pack_tl;	/* SD pending ack queue tail */
-	struct pdu_hdr	*so_recv_hd;	/* SD receive queue head */
-	struct pdu_hdr	*so_recv_tl;	/* SD receive queue tail */
-
-	/* Connection parameters */
-	struct sscop_parms so_parm;	/* Connection parameters */
-
-	/* Timers */
-	u_short		so_timer[SSCOP_T_NUM];	/* Connection timers */
-
-	/* Stack variables */
-	Atm_connvc	*so_connvc;	/* Connection vcc for this stack */
-	void		*so_toku;	/* Stack upper layer's token */
-	void		*so_tokl;	/* Stack lower layer's token */
-	void		(*so_upper)	/* Stack upper layer's interface */
-				(int, void *, intptr_t, intptr_t);
-	void		(*so_lower)	/* Stack lower layer's interface */
-				(int, void *, intptr_t, intptr_t);
-	u_short		so_headout;	/* Output buffer headroom */
-};
-
-/*
- * Connection States
- *
- * Notes:
- *	#  - state valid only for Q.SAAL1
- *      ## - state valid only for Q.2110
- */
-#define	SOS_INST	0		/* Instantiated, waiting for INIT */
-#define	SOS_IDLE	1		/* Idle connection */
-#define	SOS_OUTCONN	2		/* Outgoing connection pending */
-#define	SOS_INCONN	3		/* Incoming connection pending */
-#define	SOS_OUTDISC	4		/* Outgoing disconnection pending */
-#define	SOS_OUTRESYN	5		/* Outgoing resynchronization pending */
-#define	SOS_INRESYN	6		/* Incoming resynchronization pending */
-#define	SOS_CONRESYN	7		/* Concurrent resynch pending (#) */
-#define	SOS_OUTRECOV	7		/* Outgoing recovery pending (##) */
-#define	SOS_RECOVRSP	8		/* Recovery response pending (##) */
-#define	SOS_INRECOV	9		/* Incoming recovery pending (##) */
-#define	SOS_READY	10		/* Data transfer ready */
-#define	SOS_TERM	11		/* Waiting for TERM */
-
-#define	SOS_MAXSTATE	11		/* Maximum state value */
-#define	SOS_NUMSTATES	(SOS_MAXSTATE+1)/* Number of states */
-
-/*
- * Connection Flags
- */
-#define	SOF_NOCLRBUF	0x0001		/* Clear buffers = no */
-#define	SOF_REESTAB	0x0002		/* SSCOP initiated reestablishment */
-#define	SOF_XMITSRVC	0x0004		/* Transmit queues need servicing */
-#define	SOF_KEEPALIVE	0x0008		/* Polling in transient phase */
-#define	SOF_ENDSSCOP	0x0010		/* Last END PDU, SOURCE=SSCOP */
-#define	SOF_NOCREDIT	0x0020		/* Transmit window closed */
-
-
-/*
- * SSCOP statistics
- */
-struct sscop_stat {
-	u_long		sos_connects;	/* Connection instances */
-	u_long		sos_aborts;	/* Connection aborts */
-	u_long		sos_maa_error[MAA_ERROR_COUNT]; /* Management errors */
-};
-
-#ifdef _KERNEL
-
-#include <vm/uma.h>
-
-/*
- * Global function declarations
- */
-	/* sscop.c */
-int		sscop_start(void);
-int		sscop_stop(void);
-void		sscop_maa_error(struct sscop *, int);
-void		sscop_abort(struct sscop *, char *);
-
-	/* sscop_lower.c */
-void		sscop_lower(int, void *, intptr_t, intptr_t);
-void		sscop_aa_noop_0(struct sscop *, intptr_t, intptr_t);
-void		sscop_aa_noop_1(struct sscop *, intptr_t, intptr_t);
-void		sscop_init_inst(struct sscop *, intptr_t, intptr_t);
-void		sscop_term_all(struct sscop *, intptr_t, intptr_t);
-
-	/* sscop_pdu.c */
-int		sscop_send_bgn(struct sscop *, int);
-int		sscop_send_bgak(struct sscop *);
-int		sscop_send_bgrej(struct sscop *);
-int		sscop_send_end(struct sscop *, int);
-int		sscop_send_endak(struct sscop *);
-int		sscop_send_rs(struct sscop *);
-int		sscop_send_rsak(struct sscop *);
-int		sscop_send_er(struct sscop *);
-int		sscop_send_erak(struct sscop *);
-int		sscop_send_poll(struct sscop *);
-int		sscop_send_stat(struct sscop *, sscop_seq);
-int		sscop_send_ustat(struct sscop *, sscop_seq);
-int		sscop_send_ud(struct sscop *, KBuffer *);
-void		sscop_pdu_print(const struct sscop *,
-		    const KBuffer *, const char *);
-
-	/* sscop_sigaa.c */
-void		sscop_estreq_idle(struct sscop *, intptr_t, intptr_t);
-void		sscop_estrsp_inconn(struct sscop *, intptr_t, intptr_t);
-void		sscop_relreq_outconn(struct sscop *, intptr_t, intptr_t);
-void		sscop_relreq_inconn(struct sscop *, intptr_t, intptr_t);
-void		sscop_relreq_ready(struct sscop *, intptr_t, intptr_t);
-void		sscop_datreq_ready(struct sscop *, intptr_t, intptr_t);
-void		sscop_udtreq_all(struct sscop *, intptr_t, intptr_t);
-
-	/* sscop_sigcpcs.c */
-void		sscop_noop(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgn_idle(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgn_outdisc(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgn_outresyn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgn_inresyn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgak_error(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgak_idle(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgak_outconn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgrej_error(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgrej_outconn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgrej_inconn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgrej_outresyn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_bgrej_ready(struct sscop *, KBuffer *, caddr_t);
-void		sscop_end_idle(struct sscop *, KBuffer *, caddr_t);
-void		sscop_end_inconn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_end_outdisc(struct sscop *, KBuffer *, caddr_t);
-void		sscop_endak_error(struct sscop *, KBuffer *, caddr_t);
-void		sscop_endak_inconn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_endak_outdisc(struct sscop *, KBuffer *, caddr_t);
-void		sscop_endak_ready(struct sscop *, KBuffer *, caddr_t);
-void		sscop_rs_error(struct sscop *, KBuffer *, caddr_t);
-void		sscop_rs_idle(struct sscop *, KBuffer *, caddr_t);
-void		sscop_rsak_error(struct sscop *, KBuffer *, caddr_t);
-void		sscop_rsak_idle(struct sscop *, KBuffer *, caddr_t);
-void		sscop_rsak_outresyn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_sd_error(struct sscop *, KBuffer *, caddr_t);
-void		sscop_sd_idle(struct sscop *, KBuffer *, caddr_t);
-void		sscop_sd_inconn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_poll_error(struct sscop *, KBuffer *, caddr_t);
-void		sscop_poll_idle(struct sscop *, KBuffer *, caddr_t);
-void		sscop_poll_inconn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_stat_error(struct sscop *, KBuffer *, caddr_t);
-void		sscop_stat_idle(struct sscop *, KBuffer *, caddr_t);
-void		sscop_stat_inconn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_stat_ready(struct sscop *, KBuffer *, caddr_t);
-void		sscop_ustat_error(struct sscop *, KBuffer *, caddr_t);
-void		sscop_ustat_idle(struct sscop *, KBuffer *, caddr_t);
-void		sscop_ustat_inconn(struct sscop *, KBuffer *, caddr_t);
-void		sscop_ustat_ready(struct sscop *, KBuffer *, caddr_t);
-void		sscop_ud_all(struct sscop *, KBuffer *, caddr_t);
-void		sscop_md_all(struct sscop *, KBuffer *, caddr_t);
-
-	/* sscop_subr.c */
-KBuffer *	sscop_stat_getelem(KBuffer *, sscop_seq *);
-struct pdu_hdr *sscop_pack_locate(struct sscop *, sscop_seq);
-void		sscop_pack_free(struct sscop *, sscop_seq);
-void		sscop_rexmit_insert(struct sscop *, struct pdu_hdr *);
-void		sscop_rexmit_unlink(struct sscop *, struct pdu_hdr *);
-void		sscop_xmit_drain(struct sscop *);
-int		sscop_recv_insert(struct sscop *, struct pdu_hdr *);
-void		sscop_rcvr_drain(struct sscop *);
-void		sscop_service_xmit(struct sscop *);
-int		sscop_is_rexmit(struct sscop *, u_char);
-void		sscop_set_poll(struct sscop *);
-
-	/* sscop_timer.c */
-void		sscop_timeout(struct atm_time *);
-
-	/* sscop_upper.c */
-void		sscop_upper(int, void *, intptr_t, intptr_t);
-
-	/* q2110_sigaa.c */
-
-	/* q2110_sigcpcs.c */
-
-	/* q2110_subr.c */
-void		q2110_clear_xmit(struct sscop *);
-void		q2110_init_state(struct sscop *);
-void		q2110_prep_retrieve(struct sscop *);
-void		q2110_prep_recovery(struct sscop *);
-void		q2110_deliver_data(struct sscop *);
-void		q2110_error_recovery(struct sscop *);
-
-	/* qsaal1_sigaa.c */
-
-	/* qsaal1_sigcpcs.c */
-
-	/* qsaal1_subr.c */
-void		qsaal1_reestablish(struct sscop *);
-void		qsaal1_reset_xmit(struct sscop *);
-void		qsaal1_reset_rcvr(struct sscop *);
-void		qsaal1_clear_connection(struct sscop *);
-
-
-/*
- * External variables
- */
-extern uma_zone_t	sscop_zone;
-extern int		sscop_vccnt;
-extern struct sscop	*sscop_head;
-extern struct sscop_stat	sscop_stat;
-extern struct atm_time	sscop_timer;
-extern void		(*(*sscop_qsaal_aatab[]))
-				(struct sscop *, intptr_t, intptr_t);
-extern void		(*(*sscop_q2110_aatab[]))
-				(struct sscop *, intptr_t, intptr_t);
-extern void		(*(*sscop_qsaal_pdutab[]))
-				(struct sscop *, KBuffer *, caddr_t);
-extern void		(*(*sscop_q2110_pdutab[]))
-				(struct sscop *, KBuffer *, caddr_t);
-
-#endif	/* _KERNEL */
-
-#endif	/* _UNI_SSCOP_VAR_H */
diff --git a/include.new/netatm/uni/uni.h b/include.new/netatm/uni/uni.h
deleted file mode 100644
index b59d209..0000000
--- a/include.new/netatm/uni/uni.h
+++ /dev/null
@@ -1,50 +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: src/sys/netatm/uni/uni.h,v 1.3 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI Support
- * ---------------------
- *
- * Protocol definitions
- *
- */
-
-#ifndef _UNI_UNI_H
-#define _UNI_UNI_H
-
-/*
- * UNI Version
- */
-enum uni_vers {
-	UNI_VERS_3_0,
-	UNI_VERS_3_1,
-	UNI_VERS_4_0
-};
-
-#endif	/* _UNI_UNI_H */
diff --git a/include.new/netatm/uni/uniip_var.h b/include.new/netatm/uni/uniip_var.h
deleted file mode 100644
index d5d9a10..0000000
--- a/include.new/netatm/uni/uniip_var.h
+++ /dev/null
@@ -1,318 +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: src/sys/netatm/uni/uniip_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI Support
- * ---------------------
- *
- * IP interface control blocks
- *
- */
-
-#ifndef _UNI_UNIIP_VAR_H
-#define _UNI_UNIIP_VAR_H
-
-#ifdef _KERNEL
-/*
- * UNI IP network interface structure.  There will be one such structure for 
- * each IP network interface attached via a UNI signalling instance.
- */
-struct uniip {
-	struct uniip	*uip_next;	/* Next attached IP interface */
-	struct ip_nif	*uip_ipnif;	/* IP network interface */
-	u_char		uip_flags;	/* Interface flags (see below) */
-
-	/* ATMARP (RFC1577) */
-	u_char		uip_arpstate;	/* ARP interface state (see below) */
-	struct arpmap	uip_arpsvrmap;	/* ATMARP server map info */
-	struct ipvcc	*uip_arpsvrvcc;	/* ATMARP server's VCC */
-	u_int		uip_nprefix;	/* Count of IP prefixes (server only) */
-	struct uniarp_prf *uip_prefix;	/* Array of IP prefixes (server only) */
-	struct atm_time	uip_arptime;	/* ARP timer controls */
-};
-#define	uip_arpsvrip	uip_arpsvrmap.am_dstip
-#define	uip_arpsvratm	uip_arpsvrmap.am_dstatm
-#define	uip_arpsvrsub	uip_arpsvrmap.am_dstatmsub
-#endif	/* _KERNEL */
-
-/*
- * UNI Interface Flags
- */
-#define	UIF_IFADDR	0x01		/* Interface address is set */
-
-/*
- * UNI ARP Interface States
- */
-#define	UIAS_NOTCONF		1	/* Not configured */
-#define	UIAS_SERVER_ACTIVE	2	/* Server - active */
-#define	UIAS_CLIENT_PADDR	3	/* Client - pending ATM address */
-#define	UIAS_CLIENT_POPEN	4	/* Client - pending server vcc open */
-#define	UIAS_CLIENT_REGISTER	5	/* Client - registering with server */
-#define	UIAS_CLIENT_ACTIVE	6	/* Client - active */
-
-
-#ifdef _KERNEL
-/*
- * Structure for allowable IP prefixes for ATMARP server registration
- */
-struct uniarp_prf {
-	struct in_addr	upf_addr;	/* Prefix address */
-	struct in_addr	upf_mask;	/* Prefix mask */
-};
-
-
-/*
- * UNI ARP protocol constants
- */
-#define	UNIARP_AGING		(60 * ATM_HZ)	/* Aging timer tick */
-#define	UNIARP_HASHSIZ		19	/* Hash table size */
-#define	UNIARP_REGIS_REFRESH	(15 * 60 * ATM_HZ)
-					/* Client registration refresh timer */
-#define	UNIARP_REGIS_RETRY	(60 * ATM_HZ)
-					/* Client registration retry timer */
-#define	UNIARP_ARP_RETRY	(3 * ATM_HZ)	/* ARP command retry timer */
-#define	UNIARP_CLIENT_AGE	12	/* Client validation timeout */
-#define	UNIARP_CLIENT_RETRY	3	/* Client validation retrys */
-#define	UNIARP_SERVER_AGE	17	/* Server validation timeout */
-#define	UNIARP_SERVER_RETRY	3	/* Server validation retrys */
-#define	UNIARP_RETRY_AGE	1	/* Retry timeout */
-#define	UNIARP_REVALID_AGE	2	/* Revalidation timeout */
-#define	UNIARP_MIN_REFRESH	10	/* Minimum entry refresh time */
-
-
-/*
- * Structure for ATMARP mappings.  Each of these structures will contain
- * IP address to ATM hardware address mappings.  There will be one such
- * structure for each IP address and for each unresolved ATM address
- * currently in use.
- */
-struct uniarp {
-	struct arpmap	ua_arpmap;	/* Common entry header */
-	struct uniip	*ua_intf;	/* Interface where we learned answer */
-	struct uniarp	*ua_next;	/* Hash chain link */
-	u_char		ua_flags;	/* Flags (see below) */
-	u_char		ua_origin;	/* Source of mapping (see below) */
-	u_char		ua_retry;	/* Retry counter */
-	u_char		ua_aging;	/* Aging timeout value (minutes) */
-	struct ipvcc	*ua_ivp;	/* Head of IP VCC chain */
-	struct atm_time	ua_time;	/* Timer controls */
-};
-#define	ua_dstip	ua_arpmap.am_dstip
-#define	ua_dstatm	ua_arpmap.am_dstatm
-#define	ua_dstatmsub	ua_arpmap.am_dstatmsub
-#endif	/* _KERNEL */
-
-/*
- * UNIARP Entry Flags
- */
-#define	UAF_VALID	ARPF_VALID	/* Entry is valid */
-#define	UAF_REFRESH	ARPF_REFRESH	/* Entry has been refreshed */
-#define	UAF_LOCKED	0x04		/* Entry is locked */
-#define	UAF_USED	0x08		/* Entry has been used recently */
-
-/*
- * UNIARP Entry Origin
- *
- * The origin values are ranked according to the source precedence.  
- * Larger values are more preferred.
- */
-#define	UAO_LOCAL	100		/* Local address */
-#define	UAO_PERM	ARP_ORIG_PERM	/* Permanently installed */
-#define	UAO_REGISTER	40		/* Learned via client registration */
-#define	UAO_SCSP	30		/* Learned via SCSP */
-#define	UAO_LOOKUP	20		/* Learned via server lookup */
-#define	UAO_PEER_RSP	15		/* Learned from peer - inarp rsp */
-#define	UAO_PEER_REQ	10		/* Learned from peer - inarp req */
-
-/*
- * ATMARP/InATMARP Packet Format
- */
-struct atmarp_hdr {
-	u_short		ah_hrd;		/* Hardware type (see below) */
-	u_short		ah_pro;		/* Protocol type */
-	u_char		ah_shtl;	/* Type/len of source ATM address */
-	u_char		ah_sstl;	/* Type/len of source ATM subaddress */
-	u_short		ah_op;		/* Operation code (see below) */
-	u_char		ah_spln;	/* Length of source protocol address */
-	u_char		ah_thtl;	/* Type/len of target ATM address */
-	u_char		ah_tstl;	/* Type/len of target ATM subaddress */
-	u_char		ah_tpln;	/* Length of target protocol address */
-#ifdef notdef
-	/* Variable size fields */
-	u_char		ah_sha[];	/* Source ATM address */
-	u_char		ah_ssa[];	/* Source ATM subaddress */
-	u_char		ah_spa[];	/* Source protocol address */
-	u_char		ah_tha[];	/* Target ATM subaddress */
-	u_char		ah_tsa[];	/* Target ATM address */
-	u_char		ah_tpa[];	/* Target protocol subaddress */
-#endif
-};
-
-/*
- * Hardware types
- */
-#define	ARP_ATMFORUM	19
-
-/*
- * Operation types
- */
-#define	ARP_REQUEST	1		/* ATMARP request */
-#define	ARP_REPLY	2		/* ATMARP response */
-#define	INARP_REQUEST	8		/* InATMARP request */
-#define	INARP_REPLY	9		/* InATMARP response */
-#define	ARP_NAK		10		/* ATMARP negative ack */
-
-/*
- * Type/length fields
- */
-#define ARP_TL_TMASK	0x40		/* Type mask */
-#define ARP_TL_NSAPA	0x00		/* Type = ATM Forum NSAPA */
-#define ARP_TL_E164	0x40		/* Type = E.164 */
-#define ARP_TL_LMASK	0x3f		/* Length mask */
-
-
-#ifdef _KERNEL
-/*
- * Timer macros
- */
-#define	UNIIP_ARP_TIMER(s, t)	atm_timeout(&(s)->uip_arptime, (t), uniarp_iftimeout)
-#define	UNIIP_ARP_CANCEL(s)	atm_untimeout(&(s)->uip_arptime)
-#define	UNIARP_TIMER(s, t)	atm_timeout(&(s)->ua_time, (t), uniarp_timeout)
-#define	UNIARP_CANCEL(s)	atm_untimeout(&(s)->ua_time)
-
-
-/*
- * Macros for manipulating UNIARP tables and entries
- */
-#define UNIARP_HASH(ip)	((u_long)(ip) % UNIARP_HASHSIZ)
-
-#define	UNIARP_ADD(ua)						\
-{								\
-	struct uniarp	**h;					\
-	h = &uniarp_arptab[UNIARP_HASH((ua)->ua_dstip.s_addr)];	\
-	LINK2TAIL((ua), struct uniarp, *h, ua_next);		\
-}
-
-#define	UNIARP_DELETE(ua)					\
-{								\
-	struct uniarp	**h;					\
-	h = &uniarp_arptab[UNIARP_HASH((ua)->ua_dstip.s_addr)];	\
-	UNLINK((ua), struct uniarp, *h, ua_next);		\
-}
-
-#define	UNIARP_LOOKUP(ip, ua)					\
-{								\
-	for ((ua) = uniarp_arptab[UNIARP_HASH(ip)];		\
-				(ua); (ua) = (ua)->ua_next) {	\
-		if ((ua)->ua_dstip.s_addr == (ip))		\
-			break;					\
-	}							\
-}
-
-
-/*
- * Global UNIARP Statistics
- */
-struct uniarp_stat {
-	u_long		uas_rcvdrop;	/* Input packets dropped */
-};
-
-
-/*
- * External variables
- */
-extern struct uniip		*uniip_head;
-extern struct ip_serv		uniip_ipserv;
-extern struct uniarp		*uniarp_arptab[];
-extern struct uniarp		*uniarp_nomaptab;
-extern struct uniarp		*uniarp_pvctab;
-extern uma_zone_t	uniarp_zone;
-extern struct atm_time		uniarp_timer;
-extern int			uniarp_print;
-extern Atm_endpoint		uniarp_endpt;
-extern struct uniarp_stat	uniarp_stat;
-
-
-/*
- * Global function declarations
- */
-	/* uniarp.c */
-int		uniarp_start(void);
-void		uniarp_stop(void);
-void		uniarp_ipact(struct uniip *);
-void		uniarp_ipdact(struct uniip *);
-void		uniarp_ifaddr(struct siginst *);
-void		uniarp_iftimeout(struct atm_time *);
-int		uniarp_ioctl(int, caddr_t, caddr_t);
-caddr_t		uniarp_getname(void *);
-
-	/* uniarp_cache.c */
-int		uniarp_cache_svc(struct uniip *, struct in_addr *,
-			Atm_addr *, Atm_addr *, u_int);
-void		uniarp_cache_pvc(struct ipvcc *, struct in_addr *,
-			Atm_addr *, Atm_addr *);
-int		uniarp_validate_ip(struct uniip *, struct in_addr *, u_int);
-
-	/* uniarp_input.c */
-void		uniarp_cpcs_data(void *, KBuffer *);
-void		uniarp_pdu_print(const struct ipvcc *,
-		    const KBuffer *, const char *);
-
-	/* uniarp_output.c */
-int		uniarp_arp_req(struct uniip *, struct in_addr *);
-int		uniarp_arp_rsp(struct uniip *, struct arpmap *,
-			struct in_addr *, Atm_addr *,
-			Atm_addr *, struct ipvcc *);
-int		uniarp_arp_nak(struct uniip *, KBuffer *, struct ipvcc *);
-int		uniarp_inarp_req(struct uniip *, Atm_addr *,
-			Atm_addr *, struct ipvcc *);
-int		uniarp_inarp_rsp(struct uniip *, struct in_addr *,
-			Atm_addr *, Atm_addr *, struct ipvcc *);
-
-	/* uniarp_timer.c */
-void		uniarp_timeout(struct atm_time *);
-void		uniarp_aging(struct atm_time *);
-
-	/* uniarp_vcm.c */
-int		uniarp_pvcopen(struct ipvcc *);
-int		uniarp_svcout(struct ipvcc *, struct in_addr *);
-int		uniarp_svcin(struct ipvcc *, Atm_addr *, Atm_addr *);
-int		uniarp_svcactive(struct ipvcc *);
-void		uniarp_vcclose(struct ipvcc *);
-void		uniarp_connected(void *);
-void		uniarp_cleared(void *, struct t_atm_cause *);
-
-	/* uniip.c */
-int		uniip_start(void);
-int		uniip_stop(void);
-
-
-#endif	/* _KERNEL */
-
-#endif	/* _UNI_UNIIP_VAR_H */
diff --git a/include.new/netatm/uni/unisig.h b/include.new/netatm/uni/unisig.h
deleted file mode 100644
index fd79efe..0000000
--- a/include.new/netatm/uni/unisig.h
+++ /dev/null
@@ -1,49 +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: src/sys/netatm/uni/unisig.h,v 1.3 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI 3.0/3.1 Signalling Manager
- * ----------------------------------------
- *
- * Protocol control blocks
- *
- */
-
-#ifndef _UNISIG_H
-#define _UNISIG_H
-
-/*
- * ATM Forum UNI 3.0/3.1 Signalling
- */
-#define	UNISIG_SIG_VPI	0		/* Signalling VPI */
-#define	UNISIG_SIG_VCI	5		/* Signalling VCI */
-
-#define	STACK_SSCF	"uni_sscf"
-
-#endif	/* _UNISIG_H */
diff --git a/include.new/netatm/uni/unisig_decode.h b/include.new/netatm/uni/unisig_decode.h
deleted file mode 100644
index 7fa8712..0000000
--- a/include.new/netatm/uni/unisig_decode.h
+++ /dev/null
@@ -1,87 +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: src/sys/netatm/uni/unisig_decode.h,v 1.4 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI 3.0/3.1 Signalling Manager
- * ----------------------------------------
- *
- * Message formats
- *
- */
-
-#ifndef _UNI_SIG_DECODE_H
-#define _UNI_SIG_DECODE_H
-
-
-/*
- * Values specifying which IEs are required in messages
- */
-#define	IE_NA	0
-#define	IE_MAND	1
-#define	IE_OPT	2
-
-/*
- * Structure for information element decoding information
- */
-struct ie_ent {
-	u_char		ident;		/* IE identifier */
-	int		min_len;	/* Min. length */
-	int		max_len;	/* Max. length */
-	int		p_idx;		/* IE pointer index in msg */
-	int		(*decode)	/* Decoding function */
-				(struct usfmt *, struct ie_generic *);
-};
-
-/*
- * Macro to give the offset of a field in a generic IE structure
- */
-#define	IE_OFFSET(f) \
-	((int)&((struct ie_generic *) 0)->f)
-
-/*
- * Macro to give the size of a field in a generic IE structure
- */
-#define IE_FSIZE(f) \
-	(sizeof(((struct ie_generic *) 0)->f))
-
-#define IE_OFF_SIZE(f)   IE_OFFSET(f),IE_FSIZE(f)
-
-
-/*
- * Structure to define a field-driven decoding table (for AAL
- * parameters and ATM user cell rate IEs)
- */
-struct ie_decode_tbl {
-	u_char	ident;
-	int	len;
-	int	f_offs;
-	int	f_size;
-};
-
-#endif /* _UNI_SIG_DECODE_H */
diff --git a/include.new/netatm/uni/unisig_mbuf.h b/include.new/netatm/uni/unisig_mbuf.h
deleted file mode 100644
index 7885ad3..0000000
--- a/include.new/netatm/uni/unisig_mbuf.h
+++ /dev/null
@@ -1,58 +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: src/sys/netatm/uni/unisig_mbuf.h,v 1.3 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI 3.0/3.1 Signalling Manager
- * ----------------------------------------
- *
- * Message buffer formats
- *
- */
-
-#ifndef _UNI_SIG_MBUF_H
-#define _UNI_SIG_MBUF_H
-
-
-/*
- * Structure for message encoding/decoding information.
- */
-struct usfmt {
-	KBuffer		*usf_m_addr;	/* Current buffer */
-	KBuffer		*usf_m_base;	/* First buffer in chain */
-	int		usf_loc;	/* Offset in current buffer */
-	int		usf_op;		/* Operation (see below) */
-	struct unisig	*usf_sig;	/* UNI signalling instance */
-};
-
-#define	USF_ENCODE	1
-#define	USF_DECODE	2
-
-#define	USF_MIN_ALLOC	MHLEN		/* Minimum encoding buffer size */
-
-#endif	/* _UNI_SIG_MBUF_H */
diff --git a/include.new/netatm/uni/unisig_msg.h b/include.new/netatm/uni/unisig_msg.h
deleted file mode 100644
index 7fdc336..0000000
--- a/include.new/netatm/uni/unisig_msg.h
+++ /dev/null
@@ -1,953 +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: src/sys/netatm/uni/unisig_msg.h,v 1.4 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI 3.0/3.1 Signalling Manager
- * ----------------------------------------
- *
- * Message formatting blocks
- *
- */
-
-#ifndef _UNI_SIG_MSG_H
-#define	_UNI_SIG_MSG_H
-
-#define	UNI_MSG_DISC_Q93B	0x09
-#define	UNI_MSG_MIN_LEN		9
-
-/*
- * Values for Q.2931 message type.
- */
-#define	UNI_MSG_CALP	0x02
-#define	UNI_MSG_CONN	0x07
-#define	UNI_MSG_CACK	0x0F
-#define	UNI_MSG_SETU	0x05
-#define	UNI_MSG_RLSE	0x4D
-#define	UNI_MSG_RLSC	0x5A
-#define	UNI_MSG_RSTR	0x46
-#define	UNI_MSG_RSTA	0x4E
-#define	UNI_MSG_STAT	0x7D
-#define	UNI_MSG_SENQ	0x75
-#define	UNI_MSG_ADDP	0x80
-#define	UNI_MSG_ADPA	0x81
-#define	UNI_MSG_ADPR	0x82
-#define	UNI_MSG_DRPP	0x83
-#define	UNI_MSG_DRPA	0x84
-
-
-/*
- * Values for information element identifier.
- */
-#define	UNI_IE_CAUS	0x08
-#define	UNI_IE_CLST	0x14
-#define	UNI_IE_EPRF	0x54
-#define	UNI_IE_EPST	0x55
-#define	UNI_IE_AALP	0x58
-#define	UNI_IE_CLRT	0x59
-#define	UNI_IE_CNID	0x5A
-#define	UNI_IE_QOSP	0x5C
-#define	UNI_IE_BHLI	0x5D
-#define	UNI_IE_BBCP	0x5E
-#define	UNI_IE_BLLI	0x5F
-#define	UNI_IE_BLSH	0x60
-#define	UNI_IE_BNSH	0x61
-#define	UNI_IE_BSDC	0x62
-#define	UNI_IE_BRPI	0x63
-#define	UNI_IE_CGAD	0x6C
-#define	UNI_IE_CGSA	0x6D
-#define	UNI_IE_CDAD	0x70
-#define	UNI_IE_CDSA	0x71
-#define	UNI_IE_TRNT	0x78
-#define	UNI_IE_RSTI	0x79
-
-/*
- * Masks for information element extension in bit 8
- */
-#define	UNI_IE_EXT_BIT	0x80
-#define	UNI_IE_EXT_MASK	0x7F
-
-
-/*
- * Signalling message in internal format.
- */
-#define	UNI_MSG_IE_CNT		22
-
-struct unisig_msg {
-	u_int				msg_call_ref;
-	u_char				msg_type;
-	u_char				msg_type_flag;
-	u_char				msg_type_action;
-	int				msg_length;
-	struct ie_generic		*msg_ie_vec[UNI_MSG_IE_CNT];
-};
-
-#define	UNI_MSG_CALL_REF_RMT	0x800000
-#define	UNI_MSG_CALL_REF_MASK	0x7FFFFF
-#define	UNI_MSG_CALL_REF_GLOBAL	0
-#define	UNI_MSG_CALL_REF_DUMMY	0x7FFFFF
-
-#define	EXTRACT_CREF(x)						\
-	((x) & UNI_MSG_CALL_REF_RMT ? (x) & UNI_MSG_CALL_REF_MASK : (x) | UNI_MSG_CALL_REF_RMT)
-#define GLOBAL_CREF(x)	(((x) & UNI_MSG_CALL_REF_MASK) == UNI_MSG_CALL_REF_GLOBAL)
-#define DUMMY_CREF(x)	(((x) & UNI_MSG_CALL_REF_MASK) == UNI_MSG_CALL_REF_DUMMY)
-
-#define	UNI_MSG_TYPE_FLAG_MASK	1
-#define	UNI_MSG_TYPE_FLAG_SHIFT	4
-
-#define	UNI_MSG_TYPE_ACT_CLEAR	0
-#define	UNI_MSG_TYPE_ACT_DISC	1
-#define	UNI_MSG_TYPE_ACT_RPRT	2
-#define	UNI_MSG_TYPE_ACT_RSVD	3
-#define	UNI_MSG_TYPE_ACT_MASK	3
-
-#define	UNI_MSG_IE_AALP		0
-#define	UNI_MSG_IE_CLRT		1
-#define	UNI_MSG_IE_BBCP		2
-#define	UNI_MSG_IE_BHLI		3
-#define	UNI_MSG_IE_BLLI		4
-#define	UNI_MSG_IE_CLST		5
-#define	UNI_MSG_IE_CDAD		6
-#define	UNI_MSG_IE_CDSA		7
-#define	UNI_MSG_IE_CGAD		8
-#define	UNI_MSG_IE_CGSA		9
-#define	UNI_MSG_IE_CAUS		10
-#define	UNI_MSG_IE_CNID		11
-#define	UNI_MSG_IE_QOSP		12
-#define	UNI_MSG_IE_BRPI		13
-#define	UNI_MSG_IE_RSTI		14
-#define	UNI_MSG_IE_BLSH		15
-#define	UNI_MSG_IE_BNSH		16
-#define	UNI_MSG_IE_BSDC		17
-#define	UNI_MSG_IE_TRNT		18
-#define	UNI_MSG_IE_EPRF		19
-#define	UNI_MSG_IE_EPST		20
-#define	UNI_MSG_IE_ERR		21
-
-#define	msg_ie_aalp	msg_ie_vec[UNI_MSG_IE_AALP]
-#define	msg_ie_clrt	msg_ie_vec[UNI_MSG_IE_CLRT]
-#define	msg_ie_bbcp	msg_ie_vec[UNI_MSG_IE_BBCP]
-#define	msg_ie_bhli	msg_ie_vec[UNI_MSG_IE_BHLI]
-#define	msg_ie_blli	msg_ie_vec[UNI_MSG_IE_BLLI]
-#define	msg_ie_clst	msg_ie_vec[UNI_MSG_IE_CLST]
-#define	msg_ie_cdad	msg_ie_vec[UNI_MSG_IE_CDAD]
-#define	msg_ie_cdsa	msg_ie_vec[UNI_MSG_IE_CDSA]
-#define	msg_ie_cgad	msg_ie_vec[UNI_MSG_IE_CGAD]
-#define	msg_ie_cgsa	msg_ie_vec[UNI_MSG_IE_CGSA]
-#define	msg_ie_caus	msg_ie_vec[UNI_MSG_IE_CAUS]
-#define	msg_ie_cnid	msg_ie_vec[UNI_MSG_IE_CNID]
-#define	msg_ie_qosp	msg_ie_vec[UNI_MSG_IE_QOSP]
-#define	msg_ie_brpi	msg_ie_vec[UNI_MSG_IE_BRPI]
-#define	msg_ie_rsti	msg_ie_vec[UNI_MSG_IE_RSTI]
-#define	msg_ie_blsh	msg_ie_vec[UNI_MSG_IE_BLSH]
-#define	msg_ie_bnsh	msg_ie_vec[UNI_MSG_IE_BNSH]
-#define	msg_ie_bsdc	msg_ie_vec[UNI_MSG_IE_BSDC]
-#define	msg_ie_trnt	msg_ie_vec[UNI_MSG_IE_TRNT]
-#define	msg_ie_eprf	msg_ie_vec[UNI_MSG_IE_EPRF]
-#define	msg_ie_epst	msg_ie_vec[UNI_MSG_IE_EPST]
-#define	msg_ie_err	msg_ie_vec[UNI_MSG_IE_ERR]
-
-
-/*
- * Information element header.
- */
-struct ie_hdr {
-	u_char			ie_hdr_ident;
-	u_char			ie_hdr_coding;
-	u_char			ie_hdr_flag;
-	u_char			ie_hdr_action;
-	int			ie_hdr_length;
-	int			ie_hdr_err_cause;
-	struct ie_generic	*ie_hdr_next;
-};
-
-#define	UNI_IE_HDR_LEN		4
-
-#define	UNI_IE_CODE_CCITT	0
-#define	UNI_IE_CODE_STD		3
-#define	UNI_IE_CODE_MASK	3
-#define	UNI_IE_CODE_SHIFT	5
-
-#define	UNI_IE_FLAG_MASK	1
-#define	UNI_IE_FLAG_SHIFT	4
-
-#define	UNI_IE_ACT_CLEAR	0
-#define	UNI_IE_ACT_DIS		1
-#define	UNI_IE_ACT_RPRT		2
-#define	UNI_IE_ACT_DMSGIGN	5
-#define	UNI_IE_ACT_DMSGRPRT	6
-#define	UNI_IE_ACT_MASK		7
-
-
-/*
- * ATM AAL parameters information element in internal format.
- */
-struct ie_aalp {
-	int8_t	ie_aal_type;
-	union {
-		struct aal_type_1_parm {
-			u_char	subtype;
-			u_char	cbr_rate;
-			u_short	multiplier;
-			u_char	clock_recovery;
-			u_char	error_correction;
-			u_char	struct_data_tran;
-			u_char	partial_cells;
-		} type_1;
-		struct aal_type_4_parm {
-			int32_t	fwd_max_sdu;
-			int32_t	bkwd_max_sdu;
-			int32_t	mid_range;
-			u_char	mode;
-			u_char	sscs_type;
-		} type_4;
-		struct aal_type_5_parm {
-			int32_t	fwd_max_sdu;
-			int32_t	bkwd_max_sdu;
-			u_char	mode;
-			u_char	sscs_type;
-		} type_5;
-		struct user_aal_type {
-			u_char	aal_info[4];
-		} type_user;
-	} aal_u;
-};
-
-#define	UNI_IE_AALP_AT_AAL1	1
-#define	UNI_IE_AALP_AT_AAL3	3
-#define	UNI_IE_AALP_AT_AAL5	5
-#define	UNI_IE_AALP_AT_AALU	16
-
-#define	UNI_IE_AALP_A1_ST_NULL	0
-#define	UNI_IE_AALP_A1_ST_VCE	1
-#define	UNI_IE_AALP_A1_ST_SCE	2
-#define	UNI_IE_AALP_A1_ST_ACE	3
-#define	UNI_IE_AALP_A1_ST_HQA	4
-#define	UNI_IE_AALP_A1_ST_VID	5
-
-#define	UNI_IE_AALP_A1_CB_64	1
-#define	UNI_IE_AALP_A1_CB_DS1	4
-#define	UNI_IE_AALP_A1_CB_DS2	5
-#define	UNI_IE_AALP_A1_CB_32064	6
-#define	UNI_IE_AALP_A1_CB_DS3	7
-#define	UNI_IE_AALP_A1_CB_97728	8
-#define	UNI_IE_AALP_A1_CB_E1	16
-#define	UNI_IE_AALP_A1_CB_E2	17
-#define	UNI_IE_AALP_A1_CB_E3	18
-#define	UNI_IE_AALP_A1_CB_139264	19
-#define	UNI_IE_AALP_A1_CB_N64	64
-
-#define	UNI_IE_AALP_A1_CR_NULL	0
-#define	UNI_IE_AALP_A1_CR_SRTS	1
-#define	UNI_IE_AALP_A1_CR_ACR	2
-
-#define	UNI_IE_AALP_A1_EC_NULL	0
-#define	UNI_IE_AALP_A1_EC_FEC	1
-
-#define	UNI_IE_AALP_A1_SD_NULL	0
-#define	UNI_IE_AALP_A1_SD_SDT	1
-
-#define	UNI_IE_AALP_A3_R_MASK	1023
-#define	UNI_IE_AALP_A3_R_SHIFT	16
-
-#define	UNI_IE_AALP_A5_M_MSG	1
-#define	UNI_IE_AALP_A5_M_STR	2
-
-#define	UNI_IE_AALP_A5_ST_NULL	0
-#define	UNI_IE_AALP_A5_ST_AO	1
-#define	UNI_IE_AALP_A5_ST_NAO	2
-#define	UNI_IE_AALP_A5_ST_FR	4
-
-
-/*
- * ATM user cell rate information element in internal format.
- */
-struct ie_clrt {
-	int32_t		ie_fwd_peak;
-	int32_t		ie_bkwd_peak;
-	int32_t		ie_fwd_peak_01;
-	int32_t		ie_bkwd_peak_01;
-	int32_t		ie_fwd_sust;
-	int32_t		ie_bkwd_sust;
-	int32_t		ie_fwd_sust_01;
-	int32_t		ie_bkwd_sust_01;
-	int32_t		ie_fwd_burst;
-	int32_t		ie_bkwd_burst;
-	int32_t		ie_fwd_burst_01;
-	int32_t		ie_bkwd_burst_01;
-	int8_t		ie_best_effort;
-	int8_t		ie_tm_options;
-};
-
-#define	UNI_IE_CLRT_FWD_PEAK_ID		130
-#define	UNI_IE_CLRT_BKWD_PEAK_ID	131
-#define	UNI_IE_CLRT_FWD_PEAK_01_ID	132
-#define	UNI_IE_CLRT_BKWD_PEAK_01_ID	133
-#define	UNI_IE_CLRT_FWD_SUST_ID		136
-#define	UNI_IE_CLRT_BKWD_SUST_ID	137
-#define	UNI_IE_CLRT_FWD_SUST_01_ID	144
-#define	UNI_IE_CLRT_BKWD_SUST_01_ID	145
-#define	UNI_IE_CLRT_FWD_BURST_ID	160
-#define	UNI_IE_CLRT_BKWD_BURST_ID	161
-#define	UNI_IE_CLRT_FWD_BURST_01_ID	176
-#define	UNI_IE_CLRT_BKWD_BURST_01_ID	177
-#define	UNI_IE_CLRT_BEST_EFFORT_ID	190
-#define	UNI_IE_CLRT_TM_OPTIONS_ID	191
-
-#define	UNI_IE_CLRT_TM_FWD_TAG		0x01
-#define	UNI_IE_CLRT_TM_BKWD_TAG		0x02
-
-
-/*
- * Broadband bearer capability information element in internal format.
- */
-struct ie_bbcp {
-	int8_t		ie_bearer_class;
-	int8_t		ie_traffic_type;
-	int8_t		ie_timing_req;
-	int8_t		ie_clipping;
-	int8_t		ie_conn_config;
-};
-
-
-#define	UNI_IE_BBCP_BC_BCOB_A	1
-#define	UNI_IE_BBCP_BC_BCOB_C	3
-#define	UNI_IE_BBCP_BC_BCOB_X	16
-#define	UNI_IE_BBCP_BC_MASK	0x1F
-
-#define	UNI_IE_BBCP_TT_NIND	0
-#define	UNI_IE_BBCP_TT_CBR	1
-#define	UNI_IE_BBCP_TT_VBR	2
-#define	UNI_IE_BBCP_TT_MASK	3
-#define	UNI_IE_BBCP_TT_SHIFT	2
-
-#define	UNI_IE_BBCP_TR_NIND	0
-#define	UNI_IE_BBCP_TR_EER	1
-#define	UNI_IE_BBCP_TR_EENR	2
-#define	UNI_IE_BBCP_TR_RSVD	3
-#define	UNI_IE_BBCP_TR_MASK	3
-
-#define	UNI_IE_BBCP_SC_NSUS	0
-#define	UNI_IE_BBCP_SC_SUS	1
-#define	UNI_IE_BBCP_SC_MASK	3
-#define	UNI_IE_BBCP_SC_SHIFT	5
-
-#define	UNI_IE_BBCP_CC_PP		0
-#define	UNI_IE_BBCP_CC_PM		1
-#define	UNI_IE_BBCP_CC_MASK	3
-
-
-/*
- * Broadband high layer information information element in internal
- * format.
- */
-struct ie_bhli {
-	int8_t		ie_type;
-	u_char		ie_info[8];
-};
-
-#define	UNI_IE_BHLI_TYPE_ISO	0
-#define	UNI_IE_BHLI_TYPE_USER	1
-#define	UNI_IE_BHLI_TYPE_HLP	2
-#define	UNI_IE_BHLI_TYPE_VSA	3
-
-#define	UNI_IE_BHLI_HLP_LEN	4
-#define	UNI_IE_BHLI_VSA_LEN	7
-
-
-/*
- * Broadband low-layer information information element in internal
- * format.
- */
-struct ie_blli {
-	int8_t		ie_l1_id;
-	int8_t		ie_l2_id;
-	int8_t		ie_l2_mode;
-	int8_t		ie_l2_q933_use;
-	int8_t		ie_l2_window;
-	int8_t		ie_l2_user_proto;
-	int8_t		ie_l3_id;
-	int8_t		ie_l3_mode;
-	int8_t		ie_l3_packet_size;
-	int8_t		ie_l3_window;
-	int8_t		ie_l3_user_proto;
-	int16_t		ie_l3_ipi;
-	int8_t		ie_l3_snap_id;
-	u_char		ie_l3_oui[3];
-	u_char		ie_l3_pid[2];
-};
-
-#define	UNI_IE_BLLI_L1_ID	1
-#define	UNI_IE_BLLI_L2_ID	2
-#define	UNI_IE_BLLI_L3_ID	3
-#define	UNI_IE_BLLI_LID_MASK	3
-#define	UNI_IE_BLLI_LID_SHIFT	5
-#define	UNI_IE_BLLI_LP_MASK	31
-
-#define	UNI_IE_BLLI_L2P_ISO1745	1
-#define	UNI_IE_BLLI_L2P_Q921	2
-#define	UNI_IE_BLLI_L2P_X25L	6
-#define	UNI_IE_BLLI_L2P_X25M	7
-#define	UNI_IE_BLLI_L2P_LAPB	8
-#define	UNI_IE_BLLI_L2P_HDLC1	9
-#define	UNI_IE_BLLI_L2P_HDLC2	10
-#define	UNI_IE_BLLI_L2P_HDLC3	11
-#define	UNI_IE_BLLI_L2P_LLC	12
-#define	UNI_IE_BLLI_L2P_X75	13
-#define	UNI_IE_BLLI_L2P_Q922	14
-#define	UNI_IE_BLLI_L2P_USER	16
-#define	UNI_IE_BLLI_L2P_ISO7776	17
-
-#define	UNI_IE_BLLI_L2MODE_NORM		1
-#define	UNI_IE_BLLI_L2MODE_EXT		2
-#define	UNI_IE_BLLI_L2MODE_SHIFT	5
-#define	UNI_IE_BLLI_L2MODE_MASK		3
-
-#define	UNI_IE_BLLI_Q933_ALT	0
-
-#define	UNI_IE_BLLI_L3P_X25	6
-#define	UNI_IE_BLLI_L3P_ISO8208	7
-#define	UNI_IE_BLLI_L3P_ISO8878	8
-#define	UNI_IE_BLLI_L3P_ISO8473	9
-#define	UNI_IE_BLLI_L3P_T70	10
-#define	UNI_IE_BLLI_L3P_ISO9577	11
-#define	UNI_IE_BLLI_L3P_USER	16
-
-#define	UNI_IE_BLLI_L3MODE_NORM		1
-#define	UNI_IE_BLLI_L3MODE_EXT		2
-#define	UNI_IE_BLLI_L3MODE_SHIFT	5
-#define	UNI_IE_BLLI_L3MODE_MASK		3
-
-#define	UNI_IE_BLLI_L3PS_16	4
-#define	UNI_IE_BLLI_L3PS_32	5
-#define	UNI_IE_BLLI_L3PS_64	6
-#define	UNI_IE_BLLI_L3PS_128	7
-#define	UNI_IE_BLLI_L3PS_256	8
-#define	UNI_IE_BLLI_L3PS_512	9
-#define	UNI_IE_BLLI_L3PS_1024	10
-#define	UNI_IE_BLLI_L3PS_2048	11
-#define	UNI_IE_BLLI_L3PS_4096	12
-#define	UNI_IE_BLLI_L3PS_MASK	15
-
-#define	UNI_IE_BLLI_L3IPI_SHIFT	6
-#define	UNI_IE_BLLI_L3IPI_SNAP	0x80
-
-
-/*
- * Call state information element in internal format.
- */
-struct ie_clst {
-	int8_t		ie_state;
-};
-
-#define	UNI_IE_CLST_STATE_U0	0
-#define	UNI_IE_CLST_STATE_U1	1
-#define	UNI_IE_CLST_STATE_U3	3
-#define	UNI_IE_CLST_STATE_U6	6
-#define	UNI_IE_CLST_STATE_U8	8
-#define	UNI_IE_CLST_STATE_U9	9
-#define	UNI_IE_CLST_STATE_U10	10
-#define	UNI_IE_CLST_STATE_U11	11
-#define	UNI_IE_CLST_STATE_U12	12
-
-#define	UNI_IE_CLST_STATE_N0	0
-#define	UNI_IE_CLST_STATE_N1	1
-#define	UNI_IE_CLST_STATE_N3	3
-#define	UNI_IE_CLST_STATE_N6	6
-#define	UNI_IE_CLST_STATE_N8	8
-#define	UNI_IE_CLST_STATE_N9	9
-#define	UNI_IE_CLST_STATE_N10	10
-#define	UNI_IE_CLST_STATE_N11	11
-#define	UNI_IE_CLST_STATE_N12	12
-
-#define	UNI_IE_CLST_GLBL_REST0	0x00
-#define	UNI_IE_CLST_GLBL_REST1	0x3d
-#define	UNI_IE_CLST_GLBL_REST2	0x3e
-
-#define	UNI_IE_CLST_STATE_MASK	0x3f
-
-
-/*
- * Called party number information element in internal format.
- */
-struct ie_cdad {
-	int8_t		ie_type;
-	int8_t		ie_plan;
-	Atm_addr	ie_addr;
-};
-
-#define	UNI_IE_CDAD_TYPE_UNK	0
-#define	UNI_IE_CDAD_TYPE_INTL	1
-#define	UNI_IE_CDAD_TYPE_MASK	7
-#define	UNI_IE_CDAD_TYPE_SHIFT	4
-
-#define	UNI_IE_CDAD_PLAN_E164	1
-#define	UNI_IE_CDAD_PLAN_NSAP	2
-#define	UNI_IE_CDAD_PLAN_MASK	15
-
-
-/*
- * Called party subaddress information element in internal format.
- */
-struct ie_cdsa {
-	Atm_addr	ie_addr;
-};
-
-#define	UNI_IE_CDSA_TYPE_NSAP	0
-#define	UNI_IE_CDSA_TYPE_AESA	1
-#define	UNI_IE_CDSA_TYPE_MASK	7
-#define	UNI_IE_CDSA_TYPE_SHIFT	4
-
-
-/*
- * Calling party number information element in internal format.
- */
-struct ie_cgad {
-	int8_t		ie_type;
-	int8_t		ie_plan;
-	int8_t		ie_pres_ind;
-	int8_t		ie_screen_ind;
-	Atm_addr	ie_addr;
-};
-
-#define	UNI_IE_CGAD_TYPE_UNK	0
-#define	UNI_IE_CGAD_TYPE_INTL	1
-#define	UNI_IE_CGAD_TYPE_MASK	7
-#define	UNI_IE_CGAD_TYPE_SHIFT	4
-
-#define	UNI_IE_CGAD_PLAN_E164	1
-#define	UNI_IE_CGAD_PLAN_NSAP	2
-#define	UNI_IE_CGAD_PLAN_MASK	15
-
-#define	UNI_IE_CGAD_PRES_ALLOW	0
-#define	UNI_IE_CGAD_PRES_RSTR	1
-#define	UNI_IE_CGAD_PRES_NNA	2
-#define	UNI_IE_CGAD_PRES_RSVD	3
-#define	UNI_IE_CGAD_PRES_MASK	3
-#define	UNI_IE_CGAD_PRES_SHIFT	5
-
-#define	UNI_IE_CGAD_SCR_UNS	0
-#define	UNI_IE_CGAD_SCR_UVP	1
-#define	UNI_IE_CGAD_SCR_UVF	2
-#define	UNI_IE_CGAD_SCR_NET	3
-#define	UNI_IE_CGAD_SCR_MASK	3
-
-
-/*
- * Calling party subaddress information element in internal format.
- */
-struct ie_cgsa {
-	Atm_addr	ie_addr;
-};
-
-#define	UNI_IE_CGSA_TYPE_NSAP	0
-#define	UNI_IE_CGSA_TYPE_AESA	1
-#define	UNI_IE_CGSA_TYPE_MASK	7
-#define	UNI_IE_CGSA_TYPE_SHIFT	4
-
-
-/*
- * Cause information element in internal format.
- */
-#define	UNI_IE_CAUS_MAX_ID	24
-#define	UNI_IE_CAUS_MAX_QOS_SUB	24
-struct ie_caus {
-	int8_t		ie_loc;
-	int8_t		ie_cause;
-	int8_t		ie_diag_len;
-	u_int8_t	ie_diagnostic[24];
-};
-
-#define	UNI_IE_CAUS_LOC_USER	0
-#define	UNI_IE_CAUS_LOC_PRI_LCL	1
-#define	UNI_IE_CAUS_LOC_PUB_LCL	2
-#define	UNI_IE_CAUS_LOC_TRANSIT	3
-#define	UNI_IE_CAUS_LOC_PUB_RMT	4
-#define	UNI_IE_CAUS_LOC_PRI_RMT	5
-#define	UNI_IE_CAUS_LOC_INTL	7
-#define	UNI_IE_CAUS_LOC_BEYOND	10
-#define	UNI_IE_CAUS_LOC_MASK	15
-
-#define	UNI_IE_CAUS_UN_NS_SHIFT	3
-#define	UNI_IE_CAUS_UN_NS_MASK	1
-
-#define	UNI_IE_CAUS_UN_NA_SHIFT	2
-#define	UNI_IE_CAUS_UN_NA_MASK	1
-
-#define	UNI_IE_CAUS_UN_CAU_MASK	3
-
-#define	UNI_IE_CAUS_RR_USER	0
-#define	UNI_IE_CAUS_RR_IE	1
-#define	UNI_IE_CAUS_RR_INSUFF	2
-#define UNI_IE_CAUS_RR_SHIFT	2
-#define UNI_IE_CAUS_RR_MASK	31
-
-#define	UNI_IE_CAUS_RC_UNK	0
-#define	UNI_IE_CAUS_RC_PERM	1
-#define	UNI_IE_CAUS_RC_TRANS	2
-#define	UNI_IE_CAUS_RC_MASK	3
-
-/*
- * Cause codes from UNI 3.0, section 5.4.5.15
- */
-#define	UNI_IE_CAUS_UNO		1	/* Unallocated number */
-#define	UNI_IE_CAUS_NOTROUTE	2	/* No route to transit net */
-#define	UNI_IE_CAUS_NODROUTE	3	/* No route to destination */
-#define	UNI_IE_CAUS_BAD_VCC	10	/* VPI/VCI unacceptable */
-#define	UNI_IE_CAUS_NORM	16	/* Normal call clearing */
-#define	UNI_IE_CAUS_BUSY	17	/* User busy */
-#define	UNI_IE_CAUS_NORSP	18	/* No user responding */
-#define	UNI_IE_CAUS_REJECT	21	/* Call rejected */
-#define	UNI_IE_CAUS_CHANGED	22	/* Number changed */
-#define	UNI_IE_CAUS_CLIR	23	/* User rejects CLIR */
-#define	UNI_IE_CAUS_DORDER	27	/* Dest out of order */
-#define	UNI_IE_CAUS_INVNO	28	/* Invalid number format */
-#define	UNI_IE_CAUS_SENQ	30	/* Rsp to Status Enquiry */
-#define	UNI_IE_CAUS_NORM_UNSP	31	/* Normal, unspecified */
-#define	UNI_IE_CAUS_NA_VCC	35	/* VCC not available */
-#define	UNI_IE_CAUS_ASSIGN_VCC	36	/* VPCI/VCI assignment failure */
-#define	UNI_IE_CAUS_NORDER	38	/* Network out of order */
-#define	UNI_IE_CAUS_TEMP	41	/* Temporary failure */
-#define	UNI_IE_CAUS_DISCARD	43	/* Access info discarded */
-#define	UNI_IE_CAUS_NO_VCC	45	/* No VPI/VCI available */
-#define	UNI_IE_CAUS_UNAVAIL	47	/* Resource unavailable */
-#define	UNI_IE_CAUS_NO_QOS	49	/* QoS unavailable */
-#define	UNI_IE_CAUS_NO_CR	51	/* User cell rate not avail */
-#define	UNI_IE_CAUS_NO_BC	57	/* Bearer capability not auth */
-#define	UNI_IE_CAUS_NA_BC	58	/* Bearer capability n/a */
-#define	UNI_IE_CAUS_SERVICE	63	/* Service or opt not avail */
-#define	UNI_IE_CAUS_NI_BC	65	/* Bearer cap not implemented */
-#define	UNI_IE_CAUS_COMB	73	/* Unsupported combination */
-#define	UNI_IE_CAUS_CREF	81	/* Invalid call reference */
-#define	UNI_IE_CAUS_CEXIST	82	/* Channel does not exist */
-#define	UNI_IE_CAUS_IDEST	88	/* Incompatible destination */
-#define	UNI_IE_CAUS_ENDPT	89	/* Invalid endpoint reference */
-#define	UNI_IE_CAUS_TRNET	91	/* Invalid transit net */
-#define	UNI_IE_CAUS_APPEND	92	/* Too many pending add party */
-#define	UNI_IE_CAUS_UAAL	93	/* AAL parms can't be supp */
-#define	UNI_IE_CAUS_MISSING	96	/* Mandatory IE missing */
-#define	UNI_IE_CAUS_MTEXIST	97	/* Message type nonexistent */
-#define	UNI_IE_CAUS_IEEXIST	99	/* IE type nonexistent */
-#define	UNI_IE_CAUS_IECONTENT	100	/* IE content invalid */
-#define	UNI_IE_CAUS_STATE	101	/* Message incomp with state */
-#define	UNI_IE_CAUS_TIMER	102	/* Recovery on timer expire */
-#define	UNI_IE_CAUS_LEN		104	/* Incorrect message length */
-#define	UNI_IE_CAUS_PROTO	111	/* Protocol error */
-
-
-/*
- * Connection identifier information element in internal format.
- */
-struct ie_cnid {
-	int8_t		ie_vp_sig;
-	int8_t		ie_pref_excl;
-	u_short		ie_vpci;
-	u_short		ie_vci;
-};
-
-#define	UNI_IE_CNID_VPSIG_MASK	3
-#define	UNI_IE_CNID_VPSIG_SHIFT	3
-#define	UNI_IE_CNID_PREX_MASK	7
-
-#define	UNI_IE_CNID_MIN_VCI	32
-
-
-/*
- * Quality of service parameter information element in internal format.
- */
-struct ie_qosp {
-	int8_t		ie_fwd_class;
-	int8_t		ie_bkwd_class;
-};
-
-#define	UNI_IE_QOSP_FWD_CLASS_0	0
-#define	UNI_IE_QOSP_FWD_CLASS_1	1
-#define	UNI_IE_QOSP_FWD_CLASS_2	2
-#define	UNI_IE_QOSP_FWD_CLASS_3	3
-#define	UNI_IE_QOSP_FWD_CLASS_4	4
-
-#define	UNI_IE_QOSP_BKWD_CLASS_0	0
-#define	UNI_IE_QOSP_BKWD_CLASS_1	1
-#define	UNI_IE_QOSP_BKWD_CLASS_2	2
-#define	UNI_IE_QOSP_BKWD_CLASS_3	3
-#define	UNI_IE_QOSP_BKWD_CLASS_4	4
-
-
-/*
- * Broadband repeat indicator information element in internal format.
- */
-struct ie_brpi {
-	int8_t		ie_ind;
-};
-
-#define	UNI_IE_BRPI_PRI_LIST	2
-#define	UNI_IE_BRPI_IND_MASK	15
-
-
-/*
- * Restart indicator information element in internal format.
- */
-struct ie_rsti {
-	int8_t		ie_class;
-};
-
-#define UNI_IE_RSTI_IND_VC	0
-#define UNI_IE_RSTI_ALL_VC	2
-#define UNI_IE_RSTI_CLASS_MASK	3
-
-
-/*
- * Broadband locking shift information element in internal format.
- */
-struct ie_blsh {
-	int8_t		ie_dummy;
-};
-
-
-/*
- * Broadband non-locking shift information element in internal format.
- */
-struct ie_bnsh {
-	int8_t		ie_dummy;
-};
-
-
-/*
- * Broadband sending complete information element in internal format.
- */
-struct ie_bsdc {
-	int8_t		ie_ind;
-};
-
-#define	UNI_IE_BSDC_IND		0x21
-
-
-/*
- * Transit net selection information element in internal format.
- */
-struct ie_trnt {
-	int8_t		ie_id_type;
-	int8_t		ie_id_plan;
-	u_char		ie_id_len;
-	u_char		ie_id[4];
-};
-
-#define	UNI_IE_TRNT_IDT_MASK	7
-#define	UNI_IE_TRNT_IDT_SHIFT	4
-#define	UNI_IE_TRNT_IDP_MASK	15
-
-#define	UNI_IE_TRNT_IDT_NATL	2
-#define	UNI_IE_TRNT_IDP_CIC	1
-
-
-/*
- * Endpoint reference information element in internal format.
- */
-struct ie_eprf {
-	int8_t		ie_type;
-	int16_t		ie_id;
-};
-
-#define	UNI_IE_EPRF_LDI		0
-
-
-/*
- * Endpoint state information element in internal format.
- */
-struct ie_epst {
-	int8_t		ie_state;
-};
-
-#define	UNI_IE_EPST_NULL	0
-#define	UNI_IE_EPST_API		1
-#define	UNI_IE_EPST_APR		6
-#define	UNI_IE_EPST_DPI		11
-#define	UNI_IE_EPST_DPR		12
-#define	UNI_IE_EPST_ACTIVE	10
-#define	UNI_IE_EPST_STATE_MASK	0x3F
-
-
-/*
- * Generic information element
- */
-struct ie_generic {
-	struct ie_hdr		ie_hdr;
-	union {
-		struct ie_aalp		ie_aalp;
-		struct ie_clrt		ie_clrt;
-		struct ie_bbcp		ie_bbcp;
-		struct ie_bhli		ie_bhli;
-		struct ie_blli		ie_blli;
-		struct ie_clst		ie_clst;
-		struct ie_cdad		ie_cdad;
-		struct ie_cdsa		ie_cdsa;
-		struct ie_cgad		ie_cgad;
-		struct ie_cgsa		ie_cgsa;
-		struct ie_caus		ie_caus;
-		struct ie_cnid		ie_cnid;
-		struct ie_qosp		ie_qosp;
-		struct ie_brpi		ie_brpi;
-		struct ie_rsti		ie_rsti;
-		struct ie_blsh		ie_blsh;
-		struct ie_bnsh		ie_bnsh;
-		struct ie_bsdc		ie_bsdc;
-		struct ie_trnt		ie_trnt;
-		struct ie_eprf		ie_eprf;
-		struct ie_epst		ie_epst;
-	} ie_u;
-};
-
-#define	ie_ident	ie_hdr.ie_hdr_ident
-#define	ie_coding	ie_hdr.ie_hdr_coding
-#define	ie_flag		ie_hdr.ie_hdr_flag
-#define	ie_action	ie_hdr.ie_hdr_action
-#define	ie_length	ie_hdr.ie_hdr_length
-#define	ie_err_cause	ie_hdr.ie_hdr_err_cause
-#define	ie_next		ie_hdr.ie_hdr_next
-
-#define	ie_aalp_aal_type		ie_u.ie_aalp.ie_aal_type
-#define	ie_aalp_1_subtype		ie_u.ie_aalp.aal_u.type_1.subtype
-#define	ie_aalp_1_cbr_rate		ie_u.ie_aalp.aal_u.type_1.cbr_rate
-#define	ie_aalp_1_multiplier		ie_u.ie_aalp.aal_u.type_1.multiplier
-#define	ie_aalp_1_clock_recovery	ie_u.ie_aalp.aal_u.type_1.clock_recovery
-#define	ie_aalp_1_error_correction	ie_u.ie_aalp.aal_u.type_1.error_correction
-#define	ie_aalp_1_struct_data_tran	ie_u.ie_aalp.aal_u.type_1.struct_data_tran
-#define	ie_aalp_1_partial_cells		ie_u.ie_aalp.aal_u.type_1.partial_cells
-
-#define	ie_aalp_4_fwd_max_sdu		ie_u.ie_aalp.aal_u.type_4.fwd_max_sdu
-#define	ie_aalp_4_bkwd_max_sdu		ie_u.ie_aalp.aal_u.type_4.bkwd_max_sdu
-#define	ie_aalp_4_mid_range		ie_u.ie_aalp.aal_u.type_4.mid_range
-#define	ie_aalp_4_mode			ie_u.ie_aalp.aal_u.type_4.mode
-#define	ie_aalp_4_sscs_type		ie_u.ie_aalp.aal_u.type_4.sscs_type
-
-#define	ie_aalp_5_fwd_max_sdu		ie_u.ie_aalp.aal_u.type_5.fwd_max_sdu
-#define	ie_aalp_5_bkwd_max_sdu		ie_u.ie_aalp.aal_u.type_5.bkwd_max_sdu
-#define	ie_aalp_5_mode			ie_u.ie_aalp.aal_u.type_5.mode
-#define	ie_aalp_5_sscs_type		ie_u.ie_aalp.aal_u.type_5.sscs_type
-#define	ie_aalp_user_info		ie_u.ie_aalp.aal_u.type_user.aal_info
-
-#define	ie_clrt_fwd_peak	ie_u.ie_clrt.ie_fwd_peak
-#define	ie_clrt_bkwd_peak	ie_u.ie_clrt.ie_bkwd_peak
-#define	ie_clrt_fwd_peak_01	ie_u.ie_clrt.ie_fwd_peak_01
-#define	ie_clrt_bkwd_peak_01	ie_u.ie_clrt.ie_bkwd_peak_01
-#define	ie_clrt_fwd_sust	ie_u.ie_clrt.ie_fwd_sust
-#define	ie_clrt_bkwd_sust	ie_u.ie_clrt.ie_bkwd_sust
-#define	ie_clrt_fwd_sust_01	ie_u.ie_clrt.ie_fwd_sust_01
-#define	ie_clrt_bkwd_sust_01	ie_u.ie_clrt.ie_bkwd_sust_01
-#define	ie_clrt_fwd_burst	ie_u.ie_clrt.ie_fwd_burst
-#define	ie_clrt_bkwd_burst	ie_u.ie_clrt.ie_bkwd_burst
-#define	ie_clrt_fwd_burst_01	ie_u.ie_clrt.ie_fwd_burst_01
-#define	ie_clrt_bkwd_burst_01	ie_u.ie_clrt.ie_bkwd_burst_01
-#define	ie_clrt_best_effort	ie_u.ie_clrt.ie_best_effort
-#define	ie_clrt_tm_options	ie_u.ie_clrt.ie_tm_options
-
-#define	ie_bbcp_bearer_class	ie_u.ie_bbcp.ie_bearer_class
-#define	ie_bbcp_traffic_type	ie_u.ie_bbcp.ie_traffic_type
-#define	ie_bbcp_timing_req	ie_u.ie_bbcp.ie_timing_req
-#define	ie_bbcp_clipping	ie_u.ie_bbcp.ie_clipping
-#define	ie_bbcp_conn_config	ie_u.ie_bbcp.ie_conn_config
-
-#define	ie_bhli_type		ie_u.ie_bhli.ie_type
-#define	ie_bhli_info		ie_u.ie_bhli.ie_info
-
-#define	ie_blli_l1_id		ie_u.ie_blli.ie_l1_id
-#define	ie_blli_l2_id		ie_u.ie_blli.ie_l2_id
-#define	ie_blli_l2_mode		ie_u.ie_blli.ie_l2_mode
-#define	ie_blli_l2_q933_use	ie_u.ie_blli.ie_l2_q933_use
-#define	ie_blli_l2_window	ie_u.ie_blli.ie_l2_window
-#define	ie_blli_l2_user_proto	ie_u.ie_blli.ie_l2_user_proto
-#define	ie_blli_l3_id		ie_u.ie_blli.ie_l3_id
-#define	ie_blli_l3_mode		ie_u.ie_blli.ie_l3_mode
-#define	ie_blli_l3_packet_size	ie_u.ie_blli.ie_l3_packet_size
-#define	ie_blli_l3_window	ie_u.ie_blli.ie_l3_window
-#define	ie_blli_l3_user_proto	ie_u.ie_blli.ie_l3_user_proto
-#define	ie_blli_l3_ipi		ie_u.ie_blli.ie_l3_ipi
-#define	ie_blli_l3_snap_id	ie_u.ie_blli.ie_l3_snap_id
-#define	ie_blli_l3_oui		ie_u.ie_blli.ie_l3_oui
-#define	ie_blli_l3_pid		ie_u.ie_blli.ie_l3_pid
-
-#define	ie_clst_state		ie_u.ie_clst.ie_state
-
-#define	ie_cdad_type		ie_u.ie_cdad.ie_type
-#define	ie_cdad_plan		ie_u.ie_cdad.ie_plan
-#define	ie_cdad_addr		ie_u.ie_cdad.ie_addr
-
-#define	ie_cdsa_addr		ie_u.ie_cdsa.ie_addr
-
-#define	ie_cgad_type		ie_u.ie_cgad.ie_type
-#define	ie_cgad_plan		ie_u.ie_cgad.ie_plan
-#define	ie_cgad_pres_ind	ie_u.ie_cgad.ie_pres_ind
-#define	ie_cgad_screen_ind	ie_u.ie_cgad.ie_screen_ind
-#define	ie_cgad_addr		ie_u.ie_cgad.ie_addr
-
-#define	ie_cgsa_addr		ie_u.ie_cgsa.ie_addr
-
-#define	ie_caus_loc		ie_u.ie_caus.ie_loc
-#define	ie_caus_cause		ie_u.ie_caus.ie_cause
-#define	ie_caus_diag_len	ie_u.ie_caus.ie_diag_len
-#define	ie_caus_diagnostic	ie_u.ie_caus.ie_diagnostic
-
-#define	ie_cnid_vp_sig		ie_u.ie_cnid.ie_vp_sig
-#define	ie_cnid_pref_excl	ie_u.ie_cnid.ie_pref_excl
-#define	ie_cnid_vpci		ie_u.ie_cnid.ie_vpci
-#define	ie_cnid_vci		ie_u.ie_cnid.ie_vci
-
-#define	ie_qosp_fwd_class	ie_u.ie_qosp.ie_fwd_class
-#define	ie_qosp_bkwd_class	ie_u.ie_qosp.ie_bkwd_class
-
-#define	ie_brpi_ind		ie_u.ie_brpi.ie_ind
-
-#define	ie_rsti_class		ie_u.ie_rsti.ie_class
-
-#define	ie_bsdc_ind		ie_u.ie_bsdc.ie_ind
-
-#define	ie_trnt_id_type		ie_u.ie_trnt.ie_id_type
-#define	ie_trnt_id_plan		ie_u.ie_trnt.ie_id_plan
-#define	ie_trnt_id_len		ie_u.ie_trnt.ie_id_len
-#define	ie_trnt_id		ie_u.ie_trnt.ie_id
-
-#define	ie_eprf_type		ie_u.ie_eprf.ie_type
-#define	ie_eprf_id		ie_u.ie_eprf.ie_id
-
-#define	ie_epst_state		ie_u.ie_epst.ie_state
-
-/*
- * Macro to add an IE to the end of a list of IEs
- */
-#define	MSG_IE_ADD(m, i, ind) 					\
-	if (m->msg_ie_vec[ind]) {				\
-		struct ie_generic *_iep = msg->msg_ie_vec[ind];	\
-		while (_iep->ie_next) {				\
-			_iep = _iep->ie_next;			\
-		}						\
-		_iep->ie_next = i;				\
-	} else {						\
-		m->msg_ie_vec[ind] = i;				\
-	}
-
-#endif	/* _UNI_SIG_MSG_H */
diff --git a/include.new/netatm/uni/unisig_print.h b/include.new/netatm/uni/unisig_print.h
deleted file mode 100644
index b256059..0000000
--- a/include.new/netatm/uni/unisig_print.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: src/sys/netatm/uni/unisig_print.h,v 1.3 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI 3.0/3.1 Signalling Manager
- * ----------------------------------------
- *
- * Protocol control blocks
- *
- */
-
-#ifndef _UNISIG_PRINT_H
-#define _UNISIG_PRINT_H
-
-/*
- * Message direction for print routine
- */
-#define	UNISIG_MSG_IN	1
-#define	UNISIG_MSG_OUT	2
-
-#endif	/* _UNISIG_PRINT_H */
diff --git a/include.new/netatm/uni/unisig_var.h b/include.new/netatm/uni/unisig_var.h
deleted file mode 100644
index d18721a..0000000
--- a/include.new/netatm/uni/unisig_var.h
+++ /dev/null
@@ -1,329 +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: src/sys/netatm/uni/unisig_var.h,v 1.9 2005/01/07 01:45:37 imp Exp $
- *
- */
-
-/*
- * ATM Forum UNI 3.0/3.1 Signalling Manager
- * ----------------------------------------
- *
- * Protocol control blocks
- *
- */
-
-#ifndef _UNISIG_VAR_H
-#define	_UNISIG_VAR_H
-
-#ifndef TRUE
-#define	TRUE	1
-#define	FALSE	0
-#endif
-
-#ifdef _KERNEL
-
-#include <vm/uma.h>
-
-/*
- * Structure containing state information for each UNI protocol
- * instance.  There will be one instance for each ATM device interface
- * using the UNI signalling manager.
- */
-struct	unisig {
-	struct siginst	us_inst;	/* Header */
-	struct atm_time	us_time;	/* Timer controls */
-	void		(*us_lower)	/* Lower command handler */
-				(int, void *, intptr_t, intptr_t);
-	Atm_connection	*us_conn;	/* Signalling connection */
-	int		us_cref;	/* Call reference allocation */
-	u_int		us_retry;	/* Protocol retry count */
-	u_short		us_headout;	/* Headroom on sig ch output */
-	u_char		us_proto;	/* Signalling version */
-};
-
-#define	us_next		us_inst.si_next
-#define	us_pif		us_inst.si_pif
-#define	us_addr		us_inst.si_addr
-#define	us_subaddr	us_inst.si_subaddr
-#define	us_vccq		us_inst.si_vccq
-#define	us_state	us_inst.si_state
-#define	us_ipserv	us_inst.si_ipserv
-#endif	/* _KERNEL */
-
-/*
- * Signalling manager states
- */
-#define	UNISIG_NULL		0
-#define	UNISIG_ADDR_WAIT	1
-#define	UNISIG_INIT		2
-#define	UNISIG_ACTIVE		3
-#define	UNISIG_DETACH		4
-
-/*
- * Signalling manager events
- */
-#define	UNISIG_SIGMGR_TIMEOUT		0
-#define	UNISIG_SIGMGR_SSCF_EST_IND	1
-#define	UNISIG_SIGMGR_SSCF_EST_CNF	2
-#define	UNISIG_SIGMGR_SSCF_RLS_IND	3
-#define	UNISIG_SIGMGR_SSCF_RLS_CNF	4
-#define	UNISIG_SIGMGR_SSCF_DATA_IND	5
-#define	UNISIG_SIGMGR_SSCF_UDATA_IND	6
-#define	UNISIG_SIGMGR_CALL_CLEARED	7
-#define	UNISIG_SIGMGR_DETACH		8
-#define	UNISIG_SIGMGR_ADDR_SET		9
-
-/*
- * Signalling manager timer values
- */
-#define	UNISIG_SSCF_TIMEOUT	(3 * ATM_HZ)
-
-
-#ifdef _KERNEL
-/*
- * UNI Virtual Channel Connection control block.  All information
- * regarding the state of a UNI-controlled VCC will be recorded here.
- * There will be one UNI VCC control block for each UNI-controlled
- * VCC.
- */
-struct unisig_vccb {
-	struct vccb	vcp_hdr;	/* Generic VCCB */
-	u_short		uv_retry;	/* Xmit retry count */
-	u_int		uv_call_ref;	/* Q.2931 call reference */
-};
-
-#define	uv_type		vcp_hdr.vc_type
-#define	uv_proto	vcp_hdr.vc_proto
-#define	uv_sstate	vcp_hdr.vc_sstate
-#define	uv_ustate	vcp_hdr.vc_ustate
-#define	uv_pif		vcp_hdr.vc_pif
-#define	uv_nif		vcp_hdr.vc_nif
-#define	uv_sigelem	vcp_hdr.vc_sigelem
-#define	uv_time		vcp_hdr.vc_time
-#define	uv_vpi		vcp_hdr.vc_vpi
-#define	uv_vci		vcp_hdr.vc_vci
-#define	uv_connvc	vcp_hdr.vc_connvc
-#define	uv_ipdus	vcp_hdr.vc_ipdus
-#define	uv_opdus	vcp_hdr.vc_opdus
-#define	uv_ibytes	vcp_hdr.vc_ibytes
-#define	uv_obytes	vcp_hdr.vc_obytes
-#define	uv_ierrors	vcp_hdr.vc_ierrors
-#define	uv_oerrors	vcp_hdr.vc_oerrors
-#define	uv_tstamp	vcp_hdr.vc_tstamp
-#endif	/* _KERNEL */
-
-/*
- * UNI VCC protocol states.  Taken from The ATM Forum UNI 3.0 (section
- * 5.2.1.1)
- */
-#define	UNI_NULL		0	/* No call exists */
-#define	UNI_CALL_INITIATED	1	/* Initiating call */
-#define	UNI_CALL_OUT_PROC	3	/* Outgoing call proceeding */
-#define	UNI_CALL_DELIVERED	4	/* Not supported */
-#define	UNI_CALL_PRESENT	6	/* Call coming in */
-#define	UNI_CALL_RECEIVED	7	/* Not supported */
-#define	UNI_CONNECT_REQUEST	8	/* Call coming in */
-#define	UNI_CALL_IN_PROC	9	/* Incoming call proceeding */
-#define	UNI_ACTIVE		10	/* Call is established */
-#define	UNI_RELEASE_REQUEST	11	/* Clearing call */
-#define	UNI_RELEASE_IND		12	/* Network disconnecting */
-
-/*
- * Additional states required for internal management of VCCs
- */
-#define	UNI_SSCF_RECOV		13	/* Signalling chan recovery */
-#define	UNI_FREE		14	/* Waiting for user to free */
-#define	UNI_PVC_ACTIVE		15	/* PVC Active */
-#define	UNI_PVC_ACT_DOWN	16	/* PVC Active - i/f down */
-
-/*
- * UNI VCC events
- */
-#define	UNI_VC_TIMEOUT		0	/* Timer expired */
-#define	UNI_VC_CALLP_MSG	1	/* CALL PROCEEDING message */
-#define	UNI_VC_CONNECT_MSG	2	/* CONNECT message */
-#define	UNI_VC_CNCTACK_MSG	3	/* CONNECT ACK message */
-#define	UNI_VC_SETUP_MSG	4	/* SETUP message */
-#define	UNI_VC_RELEASE_MSG	5	/* RELEASE message */
-#define	UNI_VC_RLSCMP_MSG	6	/* RELEASE COMPLETE message */
-#define	UNI_VC_STATUS_MSG	7	/* STATUS message */
-#define	UNI_VC_STATUSENQ_MSG	8	/* STATUS ENQ message */
-#define	UNI_VC_ADDP_MSG		9	/* ADD PARTY message */
-#define	UNI_VC_ADDPACK_MSG	10	/* ADD PARTY ACK message */
-#define	UNI_VC_ADDPREJ_MSG	11	/* ADD PARTY REJ message */
-#define	UNI_VC_DROP_MSG		12	/* DROP PARTY message */
-#define	UNI_VC_DROPACK_MSG	13	/* DROP PARTY ACK message */
-#define	UNI_VC_SETUP_CALL	14	/* Setup routine called */
-#define	UNI_VC_ACCEPT_CALL	15	/* Accept call routine called */
-#define	UNI_VC_REJECT_CALL	16	/* Reject call routine called */
-#define	UNI_VC_RELEASE_CALL	17	/* Release routine called */
-#define	UNI_VC_ABORT_CALL	18	/* Abort routine called */
-#define	UNI_VC_SAAL_FAIL	19	/* Signalling AAL failed */
-#define	UNI_VC_SAAL_ESTAB	20	/* Signalling AAL back up */
-
-
-#ifdef _KERNEL
-/*
- * UNI Timer Values.  These values (except for T317) are taken from
- * The ATM Forum UNI 3.0 (section 5.7.2).
- */
-#define	UNI_T303	(4 * ATM_HZ)
-#define	UNI_T308	(30 * ATM_HZ)
-#define	UNI_T309	(10 * ATM_HZ)
-#define	UNI_T310	(10 * ATM_HZ)
-#define	UNI_T313	(4 * ATM_HZ)
-#define	UNI_T316	(120 * ATM_HZ)
-#define	UNI_T317	(60 * ATM_HZ)
-#define	UNI_T322	(4 * ATM_HZ)
-#define	UNI_T398	(4 * ATM_HZ)
-#define	UNI_T399	(14 * ATM_HZ)
-
-
-/*
- * Timer macros
- */
-#define	UNISIG_TIMER(s, t)	atm_timeout(&(s)->us_time, (t), unisig_timer)
-#define	UNISIG_CANCEL(s)	atm_untimeout(&(s)->us_time)
-#define	UNISIG_VC_TIMER(v, t)	atm_timeout(&(v)->vc_time, (t), unisig_vctimer)
-#define	UNISIG_VC_CANCEL(v)	atm_untimeout(&(v)->vc_time)
-
-
-/*
- * Global function declarations
- */
-struct usfmt;
-struct unisig_msg;
-
-	/* unisig_decode.c */
-int		usf_dec_msg(struct usfmt *, struct unisig_msg *);
-
-	/* unisig_encode.c */
-int		usf_enc_msg(struct usfmt *, struct unisig_msg *);
-
-	/* unisig_if.c */
-int		unisig_start(void);
-int		unisig_stop(void);
-int		unisig_free(struct vccb *);
-
-	/* unisig_mbuf.c */
-int		usf_init(struct usfmt *, struct unisig *, KBuffer *, int, int);
-int		usf_byte(struct usfmt *, u_char *);
-int		usf_short(struct usfmt *, u_short *);
-int		usf_int3(struct usfmt *, u_int *);
-int		usf_int(struct usfmt *, u_int *);
-int		usf_ext(struct usfmt *, u_int *);
-int		usf_count(struct usfmt *);
-int		usf_byte_mark(struct usfmt *, u_char *, u_char **);
-
-	/* unisig_msg.c */
-struct		ie_generic;
-void		unisig_cause_from_attr(struct ie_generic *,
-				Atm_attributes *);
-void		unisig_cause_from_msg(struct ie_generic *,
-				struct unisig_msg *, int);
-int		unisig_send_msg(struct unisig *,
-				struct unisig_msg *);
-int		unisig_send_setup(struct unisig *,
-				struct unisig_vccb *);
-int		unisig_send_release(struct unisig *,
-				struct unisig_vccb *,
-				struct unisig_msg *,
-				int);
-int		unisig_send_release_complete(struct unisig *,
-				struct unisig_vccb *,
-				struct unisig_msg *,
-				int);
-int		unisig_send_status(struct unisig *,
-				struct unisig_vccb *,
-				struct unisig_msg *,
-				int);
-int		unisig_rcv_msg(struct unisig *, KBuffer *);
-
-	/* unisig_print.c */
-void		usp_print_msg(struct unisig_msg *, int);
-
-	/* unisig_proto.c */
-void		unisig_timer(struct atm_time *);
-void		unisig_vctimer(struct atm_time *);
-void		unisig_saal_ctl(int, void *, void *);
-void		unisig_saal_data(void *, KBuffer *);
-caddr_t		unisig_getname(void *);
-void		unisig_connected(void *);
-void		unisig_cleared(void *, struct t_atm_cause *);
-
-	/* unisig_sigmgr_state.c */
-int		unisig_sigmgr_state(struct unisig *, int,
-				KBuffer *);
-
-	/* unisig_subr.c */
-void		unisig_cause_attr_from_user(Atm_attributes *, int);
-void		unisig_cause_attr_from_ie(Atm_attributes *,
-				struct ie_generic *);
-int		unisig_open_vcc(struct unisig *, Atm_connvc *);
-int		unisig_close_vcc(struct unisig *,
-				struct unisig_vccb *);
-int		unisig_clear_vcc(struct unisig *,
-				struct unisig_vccb *, int);
-void		unisig_switch_reset(struct unisig *, int);
-void		unisig_save_attrs(struct unisig *, struct unisig_msg *,
-				Atm_attributes *);
-int		unisig_set_attrs(struct unisig *, struct unisig_msg *,
-				Atm_attributes *);
-
-	/* unisig_util.c */
-void		unisig_free_msg(struct unisig_msg *);
-int		unisig_verify_vccb(struct unisig *,
-				struct unisig_vccb *);
-struct unisig_vccb *
-		unisig_find_conn(struct unisig *, u_int);
-struct unisig_vccb *
-		unisig_find_vpvc(struct unisig *, int, int,
-				u_char);
-int		unisig_alloc_call_ref(struct unisig *);
-char *		unisig_addr_print(Atm_addr *);
-void		unisig_print_mbuf(KBuffer *);
-void		unisig_print_buffer(KBuffer *);
-
-	/* unisig_vc_state.c */
-int		unisig_vc_state(struct unisig *,
-				struct unisig_vccb *,
-				int,
-				struct unisig_msg *);
-
-
-/*
- * External variables
- */
-extern uma_zone_t	unisig_vc_zone;
-extern uma_zone_t	unisig_msg_zone;
-extern uma_zone_t	unisig_ie_zone;
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_harp_uni);
-#endif
-
-#endif	/* _KERNEL */
-#endif	/* _UNISIG_VAR_H */
diff --git a/include.new/netconfig.h b/include.new/netconfig.h
deleted file mode 100644
index 046bfd4..0000000
--- a/include.new/netconfig.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$NetBSD: netconfig.h,v 1.1 2000/06/02 22:57:54 fvdl Exp $	*/
-/*	$FreeBSD: releng/10.2/include/netconfig.h 93032 2002-03-23 17:24:55Z imp $ */
-
-
-#ifndef _NETCONFIG_H_
-#define _NETCONFIG_H_
-
-#include <sys/cdefs.h>
-
-#define NETCONFIG	"/etc/netconfig"
-#define NETPATH		"NETPATH"
-
-struct netconfig {
-	char *nc_netid;			/* Network ID */
-	unsigned long nc_semantics;	/* Semantics (see below) */
-	unsigned long nc_flag;		/* Flags (see below) */
-	char *nc_protofmly;		/* Protocol family */
-	char *nc_proto;			/* Protocol name */
-	char *nc_device;		/* Network device pathname */
-	unsigned long nc_nlookups;	/* Number of directory lookup libs */
-	char **nc_lookups;		/* Names of the libraries */
-	unsigned long nc_unused[9];	/* reserved */
-};
-
-typedef struct {
-	struct netconfig **nc_head;
-	struct netconfig **nc_curr;
-} NCONF_HANDLE;
-
-/*
- * nc_semantics values
- */
-#define NC_TPI_CLTS	1
-#define NC_TPI_COTS	2
-#define NC_TPI_COTS_ORD	3
-#define NC_TPI_RAW	4
-
-/*
- * nc_flag values
- */
-#define NC_NOFLAG	0x00
-#define NC_VISIBLE	0x01
-#define NC_BROADCAST	0x02
-
-/*
- * nc_protofmly values
- */
-#define NC_NOPROTOFMLY	"-"
-#define NC_LOOPBACK	"loopback"
-#define NC_INET		"inet"
-#define NC_INET6	"inet6"
-#define NC_IMPLINK	"implink"
-#define NC_PUP		"pup"
-#define NC_CHAOS	"chaos"
-#define NC_NS		"ns"
-#define NC_NBS		"nbs"
-#define NC_ECMA		"ecma"
-#define NC_DATAKIT	"datakit"
-#define NC_CCITT	"ccitt"
-#define NC_SNA		"sna"
-#define NC_DECNET	"decnet"
-#define NC_DLI		"dli"
-#define NC_LAT		"lat"
-#define NC_HYLINK	"hylink"
-#define NC_APPLETALK	"appletalk"
-#define NC_NIT		"nit"
-#define NC_IEEE802	"ieee802"
-#define NC_OSI		"osi"
-#define NC_X25		"x25"
-#define NC_OSINET	"osinet"
-#define NC_GOSIP	"gosip"
-
-/*
- * nc_proto values
- */
-#define NC_NOPROTO	"-"
-#define NC_TCP		"tcp"
-#define NC_UDP		"udp"
-#define NC_ICMP		"icmp"
-
-__BEGIN_DECLS
-void *setnetconfig(void);
-struct netconfig *getnetconfig(void *);
-struct netconfig *getnetconfigent(const char *);
-void freenetconfigent(struct netconfig *);
-int endnetconfig(void *);
-
-void *setnetpath(void);
-struct netconfig *getnetpath(void *);
-int endnetpath(void *);
-
-void nc_perror(const char *);
-char *nc_sperror(void);
-__END_DECLS
-
-#endif /* _NETCONFIG_H_ */
diff --git a/include.new/netdb.h b/include.new/netdb.h
deleted file mode 100644
index 5c5925f..0000000
--- a/include.new/netdb.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*-
- * Copyright (c) 1980, 1983, 1988, 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. 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.
- *
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
- *      From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- * $FreeBSD: releng/10.2/include/netdb.h 228468 2011-12-13 13:32:56Z ed $
- */
-
-#ifndef _NETDB_H_
-#define _NETDB_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _SOCKLEN_T_DECLARED
-typedef	__socklen_t	socklen_t;
-#define	_SOCKLEN_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t	uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
-
-#ifndef _PATH_HEQUIV
-# define	_PATH_HEQUIV	"/etc/hosts.equiv"
-#endif
-#define	_PATH_HOSTS	"/etc/hosts"
-#define	_PATH_NETWORKS	"/etc/networks"
-#define	_PATH_PROTOCOLS	"/etc/protocols"
-#define	_PATH_SERVICES	"/etc/services"
-#define	_PATH_SERVICES_DB "/var/db/services.db"
-
-#define	h_errno (*__h_errno())
-
-/*
- * Structures returned by network data base library.  All addresses are
- * supplied in host order, and returned in network order (suitable for
- * use in system calls).
- */
-struct hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-#define	h_addr	h_addr_list[0]	/* address, for backward compatibility */
-};
-
-struct netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net address type */
-	uint32_t	n_net;		/* network # */
-};
-
-struct servent {
-	char	*s_name;	/* official service name */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port # */
-	char	*s_proto;	/* protocol to use */
-};
-
-struct protoent {
-	char	*p_name;	/* official protocol name */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol # */
-};
-
-struct addrinfo {
-	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
-	int	ai_family;	/* PF_xxx */
-	int	ai_socktype;	/* SOCK_xxx */
-	int	ai_protocol;	/* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-	socklen_t ai_addrlen;	/* length of ai_addr */
-	char	*ai_canonname;	/* canonical name for hostname */
-	struct	sockaddr *ai_addr;	/* binary address */
-	struct	addrinfo *ai_next;	/* next structure in linked list */
-};
-
-/*
- * Error return codes from gethostbyname() and gethostbyaddr()
- * (left in h_errno).
- */
-
-#define	NETDB_INTERNAL	-1	/* see errno */
-#define	NETDB_SUCCESS	0	/* no problem */
-#define	HOST_NOT_FOUND	1 /* Authoritative Answer Host not found */
-#define	TRY_AGAIN	2 /* Non-Authoritative Host not found, or SERVERFAIL */
-#define	NO_RECOVERY	3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
-#define	NO_DATA		4 /* Valid name, no data record of requested type */
-#define	NO_ADDRESS	NO_DATA		/* no address, look for MX record */
-
-/*
- * Error return codes from getaddrinfo()
- */
-#if 0
-/* obsoleted */
-#define	EAI_ADDRFAMILY	 1	/* address family for hostname not supported */
-#endif
-#define	EAI_AGAIN	 2	/* temporary failure in name resolution */
-#define	EAI_BADFLAGS	 3	/* invalid value for ai_flags */
-#define	EAI_FAIL	 4	/* non-recoverable failure in name resolution */
-#define	EAI_FAMILY	 5	/* ai_family not supported */
-#define	EAI_MEMORY	 6	/* memory allocation failure */
-#if 0
-/* obsoleted */
-#define	EAI_NODATA	 7	/* no address associated with hostname */
-#endif
-#define	EAI_NONAME	 8	/* hostname nor servname provided, or not known */
-#define	EAI_SERVICE	 9	/* servname not supported for ai_socktype */
-#define	EAI_SOCKTYPE	10	/* ai_socktype not supported */
-#define	EAI_SYSTEM	11	/* system error returned in errno */
-#define	EAI_BADHINTS	12	/* invalid value for hints */
-#define	EAI_PROTOCOL	13	/* resolved protocol is unknown */
-#define	EAI_OVERFLOW	14	/* argument buffer overflow */
-#define	EAI_MAX		15
-
-/*
- * Flag values for getaddrinfo()
- */
-#define	AI_PASSIVE	0x00000001 /* get address to use bind() */
-#define	AI_CANONNAME	0x00000002 /* fill ai_canonname */
-#define	AI_NUMERICHOST	0x00000004 /* prevent host name resolution */
-#define	AI_NUMERICSERV	0x00000008 /* prevent service name resolution */
-/* valid flags for addrinfo (not a standard def, apps should not use it) */
-#define AI_MASK \
-    (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST | AI_NUMERICSERV | \
-    AI_ADDRCONFIG)
-
-#define	AI_ALL		0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */
-#define	AI_V4MAPPED_CFG	0x00000200 /* accept IPv4-mapped if kernel supports */
-#define	AI_ADDRCONFIG	0x00000400 /* only if any address is assigned */
-#define	AI_V4MAPPED	0x00000800 /* accept IPv4-mapped IPv6 address */
-/* special recommended flags for getipnodebyname */
-#define	AI_DEFAULT	(AI_V4MAPPED_CFG | AI_ADDRCONFIG)
-
-/*
- * Constants for getnameinfo()
- */
-#define	NI_MAXHOST	1025
-#define	NI_MAXSERV	32
-
-/*
- * Flag values for getnameinfo()
- */
-#define	NI_NOFQDN	0x00000001
-#define	NI_NUMERICHOST	0x00000002
-#define	NI_NAMEREQD	0x00000004
-#define	NI_NUMERICSERV	0x00000008
-#define	NI_DGRAM	0x00000010
-#if 0 /* obsolete */
-#define NI_WITHSCOPEID	0x00000020
-#endif
-
-/*
- * Scope delimit character
- */
-#define	SCOPE_DELIMITER	'%'
-
-__BEGIN_DECLS
-void		endhostent(void);
-void		endnetent(void);
-void		endprotoent(void);
-void		endservent(void);
-#if __BSD_VISIBLE || (__POSIX_VISIBLE && __POSIX_VISIBLE <= 200112)
-struct hostent	*gethostbyaddr(const void *, socklen_t, int);
-struct hostent	*gethostbyname(const char *);
-#endif
-struct hostent	*gethostent(void);
-struct netent	*getnetbyaddr(uint32_t, int);
-struct netent	*getnetbyname(const char *);
-struct netent	*getnetent(void);
-struct protoent	*getprotobyname(const char *);
-struct protoent	*getprotobynumber(int);
-struct protoent	*getprotoent(void);
-struct servent	*getservbyname(const char *, const char *);
-struct servent	*getservbyport(int, const char *);
-struct servent	*getservent(void);
-void		sethostent(int);
-/* void		sethostfile(const char *); */
-void		setnetent(int);
-void		setprotoent(int);
-int		getaddrinfo(const char *, const char *,
-			    const struct addrinfo *, struct addrinfo **);
-int		getnameinfo(const struct sockaddr *, socklen_t, char *,
-			    size_t, char *, size_t, int);
-void		freeaddrinfo(struct addrinfo *);
-const char	*gai_strerror(int);
-void		setservent(int);
-
-#if __BSD_VISIBLE
-void		endnetgrent(void);
-void		freehostent(struct hostent *);
-int		gethostbyaddr_r(const void *, socklen_t, int, struct hostent *,
-    char *, size_t, struct hostent **, int *);
-int		gethostbyname_r(const char *, struct hostent *, char *, size_t,
-    struct hostent **, int *);
-struct hostent	*gethostbyname2(const char *, int);
-int		gethostbyname2_r(const char *, int, struct hostent *, char *,
-    size_t, struct hostent **, int *);
-int		gethostent_r(struct hostent *, char *, size_t,
-    struct hostent **, int *);
-struct hostent	*getipnodebyaddr(const void *, size_t, int, int *);
-struct hostent	*getipnodebyname(const char *, int, int, int *);
-int		getnetbyaddr_r(uint32_t, int, struct netent *, char *, size_t,
-    struct netent**, int *);
-int		getnetbyname_r(const char *, struct netent *, char *, size_t,
-    struct netent **, int *);
-int		getnetent_r(struct netent *, char *, size_t, struct netent **,
-    int *);
-int		getnetgrent(char **, char **, char **);
-int		getprotobyname_r(const char *, struct protoent *, char *,
-    size_t, struct protoent **);
-int		getprotobynumber_r(int, struct protoent *, char *, size_t,
-    struct protoent **);
-int		getprotoent_r(struct protoent *, char *, size_t,
-    struct protoent **);
-int		getservbyname_r(const char *, const char *, struct servent *,
-    char *, size_t, struct servent **);
-int		getservbyport_r(int, const char *, struct servent *, char *,
-    size_t, struct servent **);
-int		getservent_r(struct servent *, char *, size_t,
-    struct servent **);
-void		herror(const char *);
-const char	*hstrerror(int);
-int		innetgr(const char *, const char *, const char *, const char *);
-void		setnetgrent(const char *);
-#endif
-
-
-/*
- * PRIVATE functions specific to the FreeBSD implementation
- */
-
-/* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */
-int	* __h_errno(void);
-__END_DECLS
-
-#endif /* !_NETDB_H_ */
diff --git a/include.new/netgraph.h b/include.new/netgraph.h
deleted file mode 100644
index 0724048..0000000
--- a/include.new/netgraph.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-/*
- * netgraph.h
- *
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@whistle.com>
- *
- * $FreeBSD: releng/10.2/lib/libnetgraph/netgraph.h 125113 2004-01-27 20:25:14Z ru $
- * $Whistle: netgraph.h,v 1.7 1999/01/20 00:57:23 archie Exp $
- */
-
-#ifndef _NETGRAPH_H_
-#define _NETGRAPH_H_
-
-#include <sys/types.h>
-#include <netgraph/ng_message.h>
-
-__BEGIN_DECLS
-int	NgMkSockNode(const char *, int *, int *);
-int	NgNameNode(int, const char *, const char *, ...) __printflike(3, 4);
-int	NgSendMsg(int, const char *, int, int, const void *, size_t);
-int	NgSendAsciiMsg(int, const char *, const char *, ...) __printflike(3, 4);
-int	NgSendReplyMsg(int, const char *,
-		const struct ng_mesg *, const void *, size_t);
-int	NgRecvMsg(int, struct ng_mesg *, size_t, char *);
-int	NgAllocRecvMsg(int, struct ng_mesg **, char *);
-int	NgRecvAsciiMsg(int, struct ng_mesg *, size_t, char *);
-int	NgAllocRecvAsciiMsg(int, struct ng_mesg **, char *);
-int	NgSendData(int, const char *, const u_char *, size_t);
-int	NgRecvData(int, u_char *, size_t, char *);
-int	NgAllocRecvData(int, u_char **, char *);
-int	NgSetDebug(int);
-void	NgSetErrLog(void (*)(const char *fmt, ...),
-	    void (*)(const char *fmt, ...));
-__END_DECLS
-
-#endif
-
diff --git a/include.new/netgraph/atm/ng_atm.h b/include.new/netgraph/atm/ng_atm.h
deleted file mode 100644
index 0f02f6f..0000000
--- a/include.new/netgraph/atm/ng_atm.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*-
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- */
-
-/*
- * Netgraph module to connect NATM interfaces to netgraph.
- *
- * $FreeBSD: releng/10.2/sys/netgraph/atm/ng_atm.h 139823 2005-01-07 01:45:51Z imp $
- */
-#ifndef _NETGRAPH_ATM_NG_ATM_H_
-#define _NETGRAPH_ATM_NG_ATM_H_
-
-#define NG_ATM_NODE_TYPE "atm"
-#define NGM_ATM_COOKIE	960802260
-
-/* Netgraph control messages */
-enum {
-	NGM_ATM_GET_IFNAME = 1,		/* get the interface name */
-	NGM_ATM_GET_CONFIG,		/* get configuration */
-	NGM_ATM_GET_VCCS,		/* get a list of all active vccs */
-	NGM_ATM_CPCS_INIT,		/* start the channel */
-	NGM_ATM_CPCS_TERM,		/* stop the channel */
-	NGM_ATM_GET_VCC,		/* get VCC config */
-	NGM_ATM_GET_VCCID,		/* get VCC by VCI/VPI */
-	NGM_ATM_GET_STATS,		/* get global statistics */
-
-	/* messages from the node */
-	NGM_ATM_CARRIER_CHANGE = 1000,	/* UNUSED: carrier changed */
-	NGM_ATM_VCC_CHANGE,		/* permanent VCC changed */
-	NGM_ATM_ACR_CHANGE,		/* ABR ACR has changed */
-	NGM_ATM_IF_CHANGE,		/* interface state change */
-};
-
-/*
- * Hardware interface configuration
- */
-struct ngm_atm_config {
-	uint32_t	pcr;		/* peak cell rate */
-	uint32_t	vpi_bits;	/* number of active VPI bits */
-	uint32_t	vci_bits;	/* number of active VCI bits */
-	uint32_t	max_vpcs;	/* maximum number of VPCs */
-	uint32_t	max_vccs;	/* maximum number of VCCs */
-};
-#define NGM_ATM_CONFIG_INFO 					\
-	{							\
-	  { "pcr",	&ng_parse_uint32_type },		\
-	  { "vpi_bits",	&ng_parse_uint32_type },		\
-	  { "vci_bits",	&ng_parse_uint32_type },		\
-	  { "max_vpcs",	&ng_parse_uint32_type },		\
-	  { "max_vccs",	&ng_parse_uint32_type },		\
-	  { NULL }						\
-	}
-
-/*
- * Information about an open VCC
- * See net/if_atm.h. Keep in sync.
- */
-#define NGM_ATM_TPARAM_INFO 					\
-	{							\
-	  { "pcr",	&ng_parse_uint32_type },		\
-	  { "scr",	&ng_parse_uint32_type },		\
-	  { "mbs",	&ng_parse_uint32_type },		\
-	  { "mcr",	&ng_parse_uint32_type },		\
-	  { "icr",	&ng_parse_uint32_type },		\
-	  { "tbe",	&ng_parse_uint32_type },		\
-	  { "nrm",	&ng_parse_uint8_type },			\
-	  { "trm",	&ng_parse_uint8_type },			\
-	  { "adtf",	&ng_parse_uint16_type },		\
-	  { "rif",	&ng_parse_uint8_type },			\
-	  { "rdf",	&ng_parse_uint8_type },			\
-	  { "cdf",	&ng_parse_uint8_type },			\
-	  { NULL }						\
-	}
-
-#define NGM_ATM_VCC_INFO 					\
-	{							\
-	  { "flags",	&ng_parse_hint16_type },		\
-	  { "vpi",	&ng_parse_uint16_type },		\
-	  { "vci",	&ng_parse_uint16_type },		\
-	  { "rmtu",	&ng_parse_uint16_type },		\
-	  { "tmtu",	&ng_parse_uint16_type },		\
-	  { "aal",	&ng_parse_uint8_type },			\
-	  { "traffic",	&ng_parse_uint8_type },			\
-	  { "tparam",	&ng_atm_tparam_type },			\
-	  { NULL }						\
-	}
-
-#define NGM_ATM_VCCARRAY_INFO					\
-	{							\
-	  &ng_atm_vcc_type,					\
-	  ng_atm_vccarray_getlen,				\
-	  NULL							\
-	}
-
-#define NGM_ATM_VCCTABLE_INFO 					\
-	{							\
-	  { "count",	&ng_parse_uint32_type },		\
-	  { "vccs",	&ng_atm_vccarray_type },		\
-	  { NULL }						\
-	}
-
-/*
- * Structure to open a VCC.
- */
-struct ngm_atm_cpcs_init {
-	char		name[NG_HOOKSIZ];
-	uint32_t	flags;		/* flags. (if_atm.h) */
-	uint16_t	vci;		/* VCI to open */
-	uint16_t	vpi;		/* VPI to open */
-	uint16_t	rmtu;		/* Receive maximum CPCS size */
-	uint16_t	tmtu;		/* Transmit maximum CPCS size */
-	uint8_t		aal;		/* AAL type (if_atm.h) */
-	uint8_t		traffic;	/* traffic type (if_atm.h) */
-	uint32_t	pcr;		/* Peak cell rate */
-	uint32_t	scr;		/* VBR: Sustainable cell rate */
-	uint32_t	mbs;		/* VBR: Maximum burst rate */
-	uint32_t	mcr;		/* UBR+: Minimum cell rate */
-	uint32_t	icr;		/* ABR: Initial cell rate */
-	uint32_t	tbe;		/* ABR: Transmit buffer exposure */
-	uint8_t		nrm;		/* ABR: Nrm */
-	uint8_t		trm;		/* ABR: Trm */
-	uint16_t	adtf;		/* ABR: ADTF */
-	uint8_t		rif;		/* ABR: RIF */
-	uint8_t		rdf;		/* ABR: RDF */
-	uint8_t		cdf;		/* ABR: CDF */
-};
-
-#define NGM_ATM_CPCS_INIT_INFO 					\
-	{							\
-	  { "name",	&ng_parse_hookbuf_type },		\
-	  { "flags",	&ng_parse_hint32_type },		\
-	  { "vci",	&ng_parse_uint16_type },		\
-	  { "vpi",	&ng_parse_uint16_type },		\
-	  { "rmtu",	&ng_parse_uint16_type },		\
-	  { "tmtu",	&ng_parse_uint16_type },		\
-	  { "aal",	&ng_parse_uint8_type },			\
-	  { "traffic",	&ng_parse_uint8_type },			\
-	  { "pcr",	&ng_parse_uint32_type },		\
-	  { "scr",	&ng_parse_uint32_type },		\
-	  { "mbs",	&ng_parse_uint32_type },		\
-	  { "mcr",	&ng_parse_uint32_type },		\
-	  { "icr",	&ng_parse_uint32_type },		\
-	  { "tbe",	&ng_parse_uint32_type },		\
-	  { "nrm",	&ng_parse_uint8_type },			\
-	  { "trm",	&ng_parse_uint8_type },			\
-	  { "adtf",	&ng_parse_uint16_type },		\
-	  { "rif",	&ng_parse_uint8_type },			\
-	  { "rdf",	&ng_parse_uint8_type },			\
-	  { "cdf",	&ng_parse_uint8_type },			\
-	  { NULL }						\
-	}
-
-/*
- * Structure to close a VCI without disconnecting the hook
- */
-struct ngm_atm_cpcs_term {
-	char		name[NG_HOOKSIZ];
-};
-#define NGM_ATM_CPCS_TERM_INFO 					\
-	{							\
-	  { "name",	&ng_parse_hookbuf_type },		\
-	  { NULL }						\
-	}
-
-struct ngm_atm_stats {
-	uint64_t	in_packets;
-	uint64_t	in_errors;
-	uint64_t	out_packets;
-	uint64_t	out_errors;
-};
-#define NGM_ATM_STATS_INFO					\
-	{							\
-	  { "in_packets",	&ng_parse_uint64_type },	\
-	  { "in_errors",	&ng_parse_uint64_type },	\
-	  { "out_packets",	&ng_parse_uint64_type },	\
-	  { "out_errors",	&ng_parse_uint64_type },	\
-	  { NULL }						\
-	}
-
-struct ngm_atm_if_change {
-	uint32_t	node;
-	uint8_t		carrier;
-	uint8_t		running;
-};
-#define NGM_ATM_IF_CHANGE_INFO 					\
-	{							\
-	  { "node",	&ng_parse_hint32_type },		\
-	  { "carrier",	&ng_parse_uint8_type },			\
-	  { "running",	&ng_parse_uint8_type },			\
-	  { NULL }						\
-	}
-
-struct ngm_atm_vcc_change {
-	uint32_t	node;
-	uint16_t	vci;
-	uint8_t		vpi;
-	uint8_t		state;
-};
-#define NGM_ATM_VCC_CHANGE_INFO 				\
-	{							\
-	  { "node",	&ng_parse_hint32_type },		\
-	  { "vci",	&ng_parse_uint16_type },		\
-	  { "vpi",	&ng_parse_uint8_type },			\
-	  { "state",	&ng_parse_uint8_type },			\
-	  { NULL }						\
-	}
-
-struct ngm_atm_acr_change {
-	uint32_t	node;
-	uint16_t	vci;
-	uint8_t		vpi;
-	uint32_t	acr;
-};
-#define NGM_ATM_ACR_CHANGE_INFO					\
-	{							\
-	  { "node",	&ng_parse_hint32_type },		\
-	  { "vci",	&ng_parse_uint16_type },		\
-	  { "vpi",	&ng_parse_uint8_type },			\
-	  { "acr",	&ng_parse_uint32_type },		\
-	  { NULL }						\
-	}
-
-#endif /* _NETGRAPH_ATM_NG_ATM_H */
diff --git a/include.new/netgraph/atm/ng_atmpif.h b/include.new/netgraph/atm/ng_atmpif.h
deleted file mode 100644
index 70fb211..0000000
--- a/include.new/netgraph/atm/ng_atmpif.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * Copyright (c) 2003 Harti Brandt.
- * Copyright (c) 2003 Vincent Jardin.
- * 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.
- *
- * 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/netgraph/atm/ng_atmpif.h,v 1.2 2005/01/07 01:45:40 imp Exp $
- */
-
-#ifndef _NETGRAPH_ATM_NG_ATMPIF_H_
-#define _NETGRAPH_ATM_NG_ATMPIF_H_
-
-/* Node type name and magic cookie */
-#define NG_ATMPIF_NODE_TYPE		"atmpif"
-#define NGM_ATMPIF_COOKIE		967239456
-
-/*
- * Physical device name - used to configure HARP devices
- */
-#ifndef VATMPIF_DEV_NAME
-#define VATMPIF_DEV_NAME	"hva"	/* HARP Virtual ATM */
-#endif
-
-#define VATMPIF_MAX_VCI		65535
-#define VATMPIF_MAX_VPI		255
-
-/* Hook name */
-#define NG_ATMPIF_HOOK_LINK	"link"	 /* virtual link hook */
-
-/*
- * Node configuration structure
- */
-struct ng_vatmpif_config {
-	uint8_t		debug;		/* debug bit field (see below) */
-	uint32_t	pcr;		/* peak cell rate */
-	Mac_addr	macaddr;	/* Mac Address */
-};
-/* Keep this in sync with the above structure definition */
-#define NG_ATMPIF_CONFIG_TYPE_INFO { 				\
-	{ "debug",		&ng_parse_uint8_type	},	\
-	{ "pcr",		&ng_parse_uint32_type	},	\
-	{ "macaddr",		&ng_mac_addr_type	},	\
-	{ NULL }						\
-}
-
-/*
- * Debug bit-fields
- */
-#define VATMPIF_DEBUG_NONE	0x00
-#define VATMPIF_DEBUG_PACKET	0x01 /* enable ng_atmpif debugging	 */
-
-#define IS_VATMPIF_DEBUG_PACKET(a)  ( (a)	\
-				&&  ((a)->conf.debug & VATMPIF_DEBUG_PACKET)  )
-
-/*
- * Statistics
- */
-struct hva_stats_ng {
-	uint32_t	ng_errseq;	/* Duplicate or out of order */
-	uint32_t	ng_lostpdu;	/* PDU lost detected */
-	uint32_t	ng_badpdu;	/* Unknown PDU type */
-	uint32_t	ng_rx_novcc;	/* Draining PDU on closed VCC */
-	uint32_t	ng_rx_iqfull;	/* PDU drops, no room in atm_intrq */
-	uint32_t	ng_tx_rawcell;	/* PDU raw cells transmitted */
-	uint32_t	ng_rx_rawcell;	/* PDU raw cells received */
-	uint64_t	ng_tx_pdu;	/* PDU transmitted */
-	uint64_t	ng_rx_pdu;	/* PDU received */
-};
-typedef struct hva_stats_ng	Hva_Stats_ng;
-/* Keep this in sync with the above structure definition */
-#define HVA_STATS_NG_TYPE_INFO 		 			\
-	{ "errSeqOrder",	&ng_parse_uint32_type	},	\
-	{ "errLostPDU",		&ng_parse_uint32_type	},	\
-	{ "recvBadPDU",		&ng_parse_uint32_type	},	\
-	{ "ErrATMVC",		&ng_parse_uint32_type	},	\
-	{ "ErrQfull",		&ng_parse_uint32_type	},	\
-	{ "xmitRawCell",	&ng_parse_uint32_type	},	\
-	{ "recvRawCell",	&ng_parse_uint32_type	},	\
-	{ "xmitPDU",		&ng_parse_uint64_type	},	\
-	{ "recvPDU",		&ng_parse_uint64_type	},
-	
-
-struct hva_stats_atm {
-	uint64_t	atm_xmit;	/* Cells transmitted */
-	uint64_t	atm_rcvd;	/* Cells received */
-};
-typedef struct hva_stats_atm	Hva_Stats_atm;
-/* Keep this in sync with the above structure definition */
-#define HVA_STATS_ATM_NG_TYPE_INFO	 			\
-	{ "xmitATMCells",	&ng_parse_uint64_type	},	\
-	{ "recvATMCells",	&ng_parse_uint64_type	},
-
-struct hva_stats_aal5 {
-	uint64_t	aal5_xmit;	/* Cells transmitted */
-	uint64_t	aal5_rcvd;	/* Cells received */
-	uint32_t	aal5_crc_len;	/* Cells with CRC/length errors */
-	uint32_t	aal5_drops;	/* Cell drops */
-	uint64_t	aal5_pdu_xmit;	/* CS PDUs transmitted */
-	uint64_t	aal5_pdu_rcvd;	/* CS PDUs received */
-	uint32_t	aal5_pdu_crc;	/* CS PDUs with CRC errors */
-	uint32_t	aal5_pdu_errs;	/* CS layer protocol errors */
-	uint32_t	aal5_pdu_drops;	/* CS PDUs dropped */
-};
-typedef struct hva_stats_aal5	Hva_Stats_aal5;
-/* Keep this in sync with the above structure definition */
-#define HVA_STATS_AAL5_NG_TYPE_INFO	 			\
-	{ "xmitAAL5Cells",		&ng_parse_uint64_type	},	\
-	{ "recvAAL5Cells",		&ng_parse_uint64_type	},	\
-	{ "AAL5ErrCRCCells",		&ng_parse_uint32_type	},	\
-	{ "AAL5DropsCells",		&ng_parse_uint32_type	},	\
-	{ "xmitAAL5PDU",		&ng_parse_uint64_type	},	\
-	{ "recvAAL5PDU",		&ng_parse_uint64_type	},	\
-	{ "AAL5CRCPDU",			&ng_parse_uint32_type	},	\
-	{ "AAL5ErrPDU",			&ng_parse_uint32_type	},	\
-	{ "AAL5DropsPDU",		&ng_parse_uint32_type	},
-
-struct vatmpif_stats {
-	Hva_Stats_ng	hva_st_ng;	/* Netgraph layer stats */
-	Hva_Stats_atm	hva_st_atm;	/* ATM layer stats */
-	Hva_Stats_aal5	hva_st_aal5;	/* AAL5 layer stats */
-};
-typedef struct vatmpif_stats	Vatmpif_stats;
-/* Keep this in sync with the above structure definition */
-#define NG_ATMPIF_STATS_TYPE_INFO {	\
-	HVA_STATS_NG_TYPE_INFO	 	\
-	HVA_STATS_ATM_NG_TYPE_INFO	\
-	HVA_STATS_AAL5_NG_TYPE_INFO	\
-	{ NULL }			\
-}
-
-/* Structure returned by NGM_ATMPIF_GET_LINK_STATUS */
-struct ng_atmpif_link_status {
-	uint32_t	InSeq;		/* last received sequence number + 1 */
-	uint32_t	OutSeq;		/* last sent sequence number */
-	uint32_t	cur_pcr;	/* slot's reserved PCR */
-};
-/* Keep this in sync with the above structure definition */
-#define NG_ATMPIF_LINK_STATUS_TYPE_INFO  {		\
-	{ "InSeq",	&ng_parse_uint32_type },	\
-	{ "OutSeq",	&ng_parse_uint32_type },	\
-	{ "cur_pcr",	&ng_parse_uint32_type },	\
-	{ NULL }					\
-}
-
-/* Netgraph control messages */
-enum {
-	NGM_ATMPIF_SET_CONFIG = 1,	/* set node configuration */
-	NGM_ATMPIF_GET_CONFIG,		/* get node configuration */
-	NGM_ATMPIF_GET_LINK_STATUS,	/* get link status */
-	NGM_ATMPIF_GET_STATS,		/* get link stats */
-	NGM_ATMPIF_CLR_STATS,		/* clear link stats */
-	NGM_ATMPIF_GETCLR_STATS,	/* atomically get & clear link stats */
-};
-
-#endif /* _NETGRAPH_NG_ATMPIF_H_ */
diff --git a/include.new/netgraph/atm/ng_ccatm.h b/include.new/netgraph/atm/ng_ccatm.h
deleted file mode 100644
index 1a9a7f6..0000000
--- a/include.new/netgraph/atm/ng_ccatm.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation 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.
- *
- * 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: releng/10.2/sys/netgraph/atm/ng_ccatm.h 189315 2009-03-03 18:47:33Z ed $
- */
-
-/*
- * Interface to ng_ccatm
- */
-#ifndef _NETGRAPH_ATM_NG_CCATM_H_
-#define _NETGRAPH_ATM_NG_CCATM_H_
-
-#define NG_CCATM_NODE_TYPE	"ccatm"
-#define NGM_CCATM_COOKIE	984046139
-
-enum {
-	NGM_CCATM_DUMP,			/* dump internal status */
-	NGM_CCATM_STOP,			/* stop all processing, close all */
-	NGM_CCATM_START,		/* start processing */
-	NGM_CCATM_CLEAR,		/* clear prefix/address table */
-	NGM_CCATM_GET_ADDRESSES,	/* get list of all addresses */
-	NGM_CCATM_ADDRESS_REGISTERED,	/* registration ok */
-	NGM_CCATM_ADDRESS_UNREGISTERED,	/* unregistration ok */
-	NGM_CCATM_SET_PORT_PARAM,	/* set port parameters */
-	NGM_CCATM_GET_PORT_PARAM,	/* get port parameters */
-	NGM_CCATM_GET_PORTLIST,		/* get list of port numbers */
-	NGM_CCATM_GETSTATE,		/* get port status */
-	NGM_CCATM_SETLOG,		/* set/get loglevel */
-	NGM_CCATM_RESET,		/* reset everything */
-	NGM_CCATM_GET_EXSTAT,		/* get extended status */
-};
-
-/*
- * This must be synchronized with unistruct.h::struct uni_addr
- */
-#define	NGM_CCATM_ADDR_ARRAY_INFO				\
-	{							\
-	  &ng_parse_hint8_type,					\
-	  UNI_ADDR_MAXLEN					\
-	}
-
-#define NGM_CCATM_UNI_ADDR_INFO 				\
- 	{							\
-	  { "type",	&ng_parse_uint32_type },		\
-	  { "plan",	&ng_parse_uint32_type },		\
-	  { "len",	&ng_parse_uint32_type },		\
-	  { "addr",	&ng_ccatm_addr_array_type },		\
-	  { NULL }						\
-	}
-
-/*
- * Address request
- */
-struct ngm_ccatm_addr_req {
-	uint32_t	port;
-	struct uni_addr	addr;
-};
-#define	NGM_CCATM_ADDR_REQ_INFO					\
-	{							\
-	  { "port",	&ng_parse_uint32_type },		\
-	  { "addr",	&ng_ccatm_uni_addr_type },		\
-	  { NULL },						\
-	}
-
-/*
- * Get current address list
- */
-struct ngm_ccatm_get_addresses {
-	uint32_t	count;
-	struct ngm_ccatm_addr_req addr[];
-};
-#define	NGM_CCATM_ADDR_REQ_ARRAY_INFO				\
-	{							\
-	  &ng_ccatm_addr_req_type,				\
-	  ng_ccatm_addr_req_array_getlen			\
-	}
-#define NGM_CCATM_GET_ADDRESSES_INFO 				\
-	{							\
-	  { "count",	&ng_parse_uint32_type },		\
-	  { "addr",	&ng_ccatm_addr_req_array_type },	\
-	  { NULL }						\
-	}
-
-/*
- * Port as parameter
- */
-struct ngm_ccatm_port {
-	uint32_t	port;
-};
-#define NGM_CCATM_PORT_INFO 					\
-	{							\
-	  { "port",	&ng_parse_uint32_type },		\
-	  { NULL }						\
-	}
-
-/*
- * Port parameters.
- * This must be synchronized with atmapi.h::struct atm_port_info.
- */
-#define	NGM_CCATM_ESI_INFO						\
-	{								\
-	  &ng_parse_hint8_type,						\
-	  6								\
-	}
-#define NGM_CCATM_ATM_PORT_INFO 					\
-	{								\
-	  { "port",		&ng_parse_uint32_type },		\
-	  { "pcr",		&ng_parse_uint32_type },		\
-	  { "max_vpi_bits",	&ng_parse_uint32_type },		\
-	  { "max_vci_bits",	&ng_parse_uint32_type },		\
-	  { "max_svpc_vpi",	&ng_parse_uint32_type },		\
-	  { "max_svcc_vpi",	&ng_parse_uint32_type },		\
-	  { "min_svcc_vci",	&ng_parse_uint32_type },		\
-	  { "esi",		&ng_ccatm_esi_type },			\
-	  { "num_addr",		&ng_parse_uint32_type },		\
-	  { NULL }							\
-	}
-
-/*
- * List of port numbers
- */
-struct ngm_ccatm_portlist {
-	uint32_t	nports;
-	uint32_t	ports[];
-};
-#define	NGM_CCATM_PORT_ARRAY_INFO					\
-	{								\
-	  &ng_parse_uint32_type,					\
-	  ng_ccatm_port_array_getlen					\
-	}
-#define NGM_CCATM_PORTLIST_INFO 					\
-	{								\
-	  { "nports",	&ng_parse_uint32_type },			\
-	  { "ports",	&ng_ccatm_port_array_type },			\
-	  { NULL }							\
-	}
-
-struct ccatm_op {
-	uint32_t	op;	/* request code */
-};
-
-#endif
diff --git a/include.new/netgraph/atm/ng_sscfu.h b/include.new/netgraph/atm/ng_sscfu.h
deleted file mode 100644
index 22a01e2..0000000
--- a/include.new/netgraph/atm/ng_sscfu.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * 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.
- *
- * 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: releng/10.2/sys/netgraph/atm/ng_sscfu.h 139823 2005-01-07 01:45:51Z imp $
- *
- * Netgraph module for ITU-T Q.2120 UNI SSCF.
- */
-#ifndef _NETGRAPH_ATM_NG_SSCFU_H_
-#define	_NETGRAPH_ATM_NG_SSCFU_H_
-
-#define NG_SSCFU_NODE_TYPE "sscfu"
-#define NGM_SSCFU_COOKIE	980517963
-
-/* Netgraph control messages */
-enum {
-	NGM_SSCFU_GETDEFPARAM = 1,	/* get default SSCOP parameters */
-	NGM_SSCFU_ENABLE,		/* enable processing */
-	NGM_SSCFU_DISABLE,		/* disable processing */
-	NGM_SSCFU_GETDEBUG,		/* get debug flags */
-	NGM_SSCFU_SETDEBUG,		/* set debug flags */
-	NGM_SSCFU_GETSTATE,		/* get current state */
-};
-
-/* getdefparam return */
-struct ng_sscfu_getdefparam {
-	struct sscop_param	param;
-	uint32_t		mask;
-};
-#define NG_SSCFU_GETDEFPARAM_INFO 				\
-	{							\
-	  { "param",		&ng_sscop_param_type },		\
-	  { "mask",		&ng_parse_uint32_type },	\
-	  { NULL }						\
-	}
-
-/*
- * Upper interface
- */
-struct sscfu_arg {
-	uint32_t	sig;
-	u_char		data[];
-};
-#endif
diff --git a/include.new/netgraph/atm/ng_sscop.h b/include.new/netgraph/atm/ng_sscop.h
deleted file mode 100644
index c920c46..0000000
--- a/include.new/netgraph/atm/ng_sscop.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * 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.
- *
- * 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: releng/10.2/sys/netgraph/atm/ng_sscop.h 139823 2005-01-07 01:45:51Z imp $
- *
- * Netgraph module for Q.2110 SSCOP
- */
-#ifndef _NETGRAPH_ATM_NG_SSCOP_H_
-#define _NETGRAPH_ATM_NG_SSCOP_H_
-
-#define NG_SSCOP_NODE_TYPE "sscop"
-#define NGM_SSCOP_COOKIE	980175044
-
-/* Netgraph control messages */
-enum {
-	NGM_SSCOP_GETPARAM = 1,		/* get parameters */
-	NGM_SSCOP_SETPARAM,		/* set parameters */
-	NGM_SSCOP_ENABLE,		/* enable processing */
-	NGM_SSCOP_DISABLE,		/* disable and reset */
-	NGM_SSCOP_GETDEBUG,		/* get debugging flags */
-	NGM_SSCOP_SETDEBUG,		/* set debugging flags */
-	NGM_SSCOP_GETSTATE,		/* get current SSCOP state */
-};
-
-/* This must be in-sync with the definition in sscopdef.h */
-#define NG_SSCOP_PARAM_INFO 					\
-	{							\
-	  { "timer_cc",		&ng_parse_uint32_type },	\
-	  { "timer_poll",	&ng_parse_uint32_type },	\
-	  { "timer_keep_alive",	&ng_parse_uint32_type },	\
-	  { "timer_no_response",&ng_parse_uint32_type },	\
-	  { "timer_idle",	&ng_parse_uint32_type },	\
-	  { "maxk",		&ng_parse_uint32_type },	\
-	  { "maxj",		&ng_parse_uint32_type },	\
-	  { "maxcc",		&ng_parse_uint32_type },	\
-	  { "maxpd",		&ng_parse_uint32_type },	\
-	  { "maxstat",		&ng_parse_uint32_type },	\
-	  { "mr",		&ng_parse_uint32_type },	\
-	  { "flags",		&ng_parse_uint32_type },	\
-	  { NULL }						\
-	}
-
-
-struct ng_sscop_setparam {
-	uint32_t		mask;
-	struct sscop_param	param;
-};
-#define NG_SSCOP_SETPARAM_INFO 					\
-	{							\
-	  { "mask",		&ng_parse_uint32_type },	\
-	  { "param",		&ng_sscop_param_type },		\
-	  { NULL }						\
-	}
-
-struct ng_sscop_setparam_resp {
-	uint32_t		mask;
-	int32_t			error;
-};
-#define NG_SSCOP_SETPARAM_RESP_INFO 				\
-	{							\
-	  { "mask",		&ng_parse_uint32_type },	\
-	  { "error",		&ng_parse_int32_type },		\
-	  { NULL }						\
-	}
-
-/*
- * Upper interface
- */
-struct sscop_arg {
-	uint32_t	sig;
-	uint32_t	arg;	/* opt. sequence number or clear-buff */
-	u_char		data[];
-};
-
-struct sscop_marg {
-	uint32_t	sig;
-	u_char		data[];
-};
-struct sscop_merr {
-	uint32_t	sig;
-	uint32_t	err;	/* error code */
-	uint32_t	cnt;	/* error count */
-};
-
-#endif
diff --git a/include.new/netgraph/atm/ng_uni.h b/include.new/netgraph/atm/ng_uni.h
deleted file mode 100644
index a2ae06c..0000000
--- a/include.new/netgraph/atm/ng_uni.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * 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.
- *
- * 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: releng/10.2/sys/netgraph/atm/ng_uni.h 139823 2005-01-07 01:45:51Z imp $
- *
- * Netgraph module for UNI 4.0
- */
-#ifndef _NETGRAPH_ATM_NG_UNI_H_
-#define _NETGRAPH_ATM_NG_UNI_H_
-
-#define NG_UNI_NODE_TYPE "uni"
-#define NGM_UNI_COOKIE	981112392
-
-enum {
-	NGM_UNI_GETDEBUG,	/* get debug flags */
-	NGM_UNI_SETDEBUG,	/* set debug flags */
-	NGM_UNI_GET_CONFIG,	/* get configuration */
-	NGM_UNI_SET_CONFIG,	/* set configuration */
-	NGM_UNI_ENABLE,		/* enable processing */
-	NGM_UNI_DISABLE,	/* free resources and disable */
-	NGM_UNI_GETSTATE,	/* retrieve coord state */
-};
-
-struct ngm_uni_debug {
-	uint32_t	level[UNI_MAXFACILITY];
-};
-#define NGM_UNI_DEBUGLEVEL_INFO {				\
-	&ng_parse_uint32_type,					\
-	UNI_MAXFACILITY						\
-}
-#define NGM_UNI_DEBUG_INFO 					\
-	{							\
-	  { "level",	&ng_uni_debuglevel_type },		\
-	  { NULL }						\
-	}
-
-#define NGM_UNI_CONFIG_INFO 					\
-	{							\
-	  { "proto",	&ng_parse_uint32_type },		\
-	  { "popt",	&ng_parse_uint32_type },		\
-	  { "option",	&ng_parse_uint32_type },		\
-	  { "timer301",	&ng_parse_uint32_type },		\
-	  { "timer303",	&ng_parse_uint32_type },		\
-	  { "init303",	&ng_parse_uint32_type },		\
-	  { "timer308",	&ng_parse_uint32_type },		\
-	  { "init308",	&ng_parse_uint32_type },		\
-	  { "timer309",	&ng_parse_uint32_type },		\
-	  { "timer310",	&ng_parse_uint32_type },		\
-	  { "timer313",	&ng_parse_uint32_type },		\
-	  { "timer316",	&ng_parse_uint32_type },		\
-	  { "init316",	&ng_parse_uint32_type },		\
-	  { "timer317",	&ng_parse_uint32_type },		\
-	  { "timer322",	&ng_parse_uint32_type },		\
-	  { "init322",	&ng_parse_uint32_type },		\
-	  { "timer397",	&ng_parse_uint32_type },		\
-	  { "timer398",	&ng_parse_uint32_type },		\
-	  { "timer399",	&ng_parse_uint32_type },		\
-	  { NULL }						\
-	}
-
-struct ngm_uni_config_mask {
-	uint32_t		mask;
-	uint32_t		popt_mask;
-	uint32_t		option_mask;
-};
-#define NGM_UNI_CONFIG_MASK_INFO 				\
-	{							\
-	  { "mask",		&ng_parse_hint32_type },	\
-	  { "popt_mask",	&ng_parse_hint32_type },	\
-	  { "option_mask",	&ng_parse_hint32_type },	\
-	  { NULL }						\
-	}
-
-struct ngm_uni_set_config {
-	struct uni_config		config;
-	struct ngm_uni_config_mask	mask;
-};
-#define NGM_UNI_SET_CONFIG_INFO 				\
-	{							\
-	  { "config",		&ng_uni_config_type },		\
-	  { "mask",		&ng_uni_config_mask_type },	\
-	  { NULL }						\
-	}
-
-/*
- * API message
- */
-struct uni_arg {
-	uint32_t	sig;
-	uint32_t	cookie;
-	u_char		data[];
-};
-
-#endif
diff --git a/include.new/netgraph/atm/ngatmbase.h b/include.new/netgraph/atm/ngatmbase.h
deleted file mode 100644
index f595eca..0000000
--- a/include.new/netgraph/atm/ngatmbase.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation 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.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY FRAUNHOFER FOKUS
- * AND ITS 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
- * FRAUNHOFER FOKUS OR ITS 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: releng/10.2/sys/netgraph/atm/ngatmbase.h 139823 2005-01-07 01:45:51Z imp $
- *
- * In-kernel UNI stack message functions.
- */
-#ifndef _NETGRAPH_ATM_NGATMBASE_H_
-#define	_NETGRAPH_ATM_NGATMBASE_H_
-
-/* forward declarations */
-struct mbuf;
-struct uni_msg;
-
-struct mbuf *uni_msg_pack_mbuf(struct uni_msg *, void *, size_t);
-
-#ifdef NGATM_DEBUG
-
-struct uni_msg *_uni_msg_alloc(size_t, const char *, int);
-struct uni_msg *_uni_msg_build(const char *, int, void *, ...);
-void _uni_msg_destroy(struct uni_msg *, const char *, int);
-int _uni_msg_unpack_mbuf(struct mbuf *, struct uni_msg **, const char *, int);
-
-#define	uni_msg_alloc(S) _uni_msg_alloc((S), __FILE__, __LINE__)
-#define	uni_msg_build(P...) _uni_msg_build(__FILE__, __LINE__, P)
-#define	uni_msg_destroy(M) _uni_msg_destroy((M), __FILE__, __LINE__)
-#define	uni_msg_unpack_mbuf(M, PP) \
-	    _uni_msg_unpack_mbuf((M), (PP), __FILE__, __LINE__)
-
-#else /* !NGATM_DEBUG */
-
-struct uni_msg *uni_msg_alloc(size_t);
-struct uni_msg *uni_msg_build(void *, ...);
-void uni_msg_destroy(struct uni_msg *);
-int uni_msg_unpack_mbuf(struct mbuf *, struct uni_msg **);
-
-#endif
-#endif
diff --git a/include.new/netgraph/bluetooth/include/ng_bluetooth.h b/include.new/netgraph/bluetooth/include/ng_bluetooth.h
deleted file mode 100644
index f0e9454..0000000
--- a/include.new/netgraph/bluetooth/include/ng_bluetooth.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * bluetooth.h
- */
-
-/*-
- * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_bluetooth.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_bluetooth.h 180399 2008-07-10 00:15:29Z emax $
- */
-
-#ifndef _NETGRAPH_BLUETOOTH_H_
-#define _NETGRAPH_BLUETOOTH_H_
-
-#include <sys/queue.h>
-
-/*
- * Version of the stack
- */
-
-#define NG_BLUETOOTH_VERSION	1
-
-/*
- * Declare the base of the Bluetooth sysctl hierarchy, 
- * but only if this file cares about sysctl's
- */
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_bluetooth);
-SYSCTL_DECL(_net_bluetooth_hci);
-SYSCTL_DECL(_net_bluetooth_l2cap);
-SYSCTL_DECL(_net_bluetooth_rfcomm);
-SYSCTL_DECL(_net_bluetooth_sco);
-#endif /* SYSCTL_DECL */
-
-/*
- * Mbuf qeueue and useful mbufq macros. We do not use ifqueue because we
- * do not need mutex and other locking stuff
- */
-
-struct mbuf;
-
-struct ng_bt_mbufq {
-	struct mbuf	*head;   /* first item in the queue */
-	struct mbuf	*tail;   /* last item in the queue */
-	uint32_t	 len;    /* number of items in the queue */
-	uint32_t	 maxlen; /* maximal number of items in the queue */
-	uint32_t	 drops;	 /* number if dropped items */
-};
-typedef struct ng_bt_mbufq	ng_bt_mbufq_t;
-typedef struct ng_bt_mbufq *	ng_bt_mbufq_p;
-
-#define NG_BT_MBUFQ_INIT(q, _maxlen)			\
-	do {						\
-		(q)->head = NULL;			\
-		(q)->tail = NULL;			\
-		(q)->len = 0;				\
-		(q)->maxlen = (_maxlen);		\
-		(q)->drops = 0;				\
-	} while (0)
-
-#define NG_BT_MBUFQ_DESTROY(q)				\
-	do {						\
-		NG_BT_MBUFQ_DRAIN((q));			\
-	} while (0)
-
-#define NG_BT_MBUFQ_FIRST(q)	(q)->head
-
-#define NG_BT_MBUFQ_LEN(q)	(q)->len
-
-#define NG_BT_MBUFQ_FULL(q)	((q)->len >= (q)->maxlen)
-
-#define NG_BT_MBUFQ_DROP(q)	(q)->drops ++
-
-#define NG_BT_MBUFQ_ENQUEUE(q, i)			\
-	do {						\
-		(i)->m_nextpkt = NULL;			\
-							\
-		if ((q)->tail == NULL)			\
-			(q)->head = (i);		\
-		else					\
-			(q)->tail->m_nextpkt = (i);	\
-							\
-		(q)->tail = (i);			\
-		(q)->len ++;				\
-	} while (0)
-
-#define NG_BT_MBUFQ_DEQUEUE(q, i)			\
-	do {						\
-		(i) = (q)->head;			\
-		if ((i) != NULL) {			\
-			(q)->head = (q)->head->m_nextpkt; \
-			if ((q)->head == NULL)		\
-				(q)->tail = NULL;	\
-							\
-			(q)->len --;			\
-			(i)->m_nextpkt = NULL;		\
-		} 					\
-	} while (0)
-
-#define NG_BT_MBUFQ_PREPEND(q, i)			\
-	do {						\
-		(i)->m_nextpkt = (q)->head;		\
-		if ((q)->tail == NULL)			\
-			(q)->tail = (i);		\
-							\
-		(q)->head = (i);			\
-		(q)->len ++;				\
-	} while (0)
-
-#define NG_BT_MBUFQ_DRAIN(q)				\
-	do { 						\
-        	struct mbuf	*m = NULL;		\
-							\
-		for (;;) { 				\
-			NG_BT_MBUFQ_DEQUEUE((q), m);	\
-			if (m == NULL) 			\
-				break; 			\
-							\
-			NG_FREE_M(m);	 		\
-		} 					\
-	} while (0)
-
-/* 
- * Netgraph item queue and useful itemq macros
- */
-
-struct ng_item;
-
-struct ng_bt_itemq {
-	STAILQ_HEAD(, ng_item)	queue;	/* actually items queue */
-	uint32_t	 len;    /* number of items in the queue */
-	uint32_t	 maxlen; /* maximal number of items in the queue */
-	uint32_t	 drops;  /* number if dropped items */
-};
-typedef struct ng_bt_itemq	ng_bt_itemq_t;
-typedef struct ng_bt_itemq *	ng_bt_itemq_p;
-
-#define NG_BT_ITEMQ_INIT(q, _maxlen)			\
-	do {						\
-		STAILQ_INIT(&(q)->queue);		\
-		(q)->len = 0;				\
-		(q)->maxlen = (_maxlen);		\
-		(q)->drops = 0;				\
-	} while (0)
-
-#define NG_BT_ITEMQ_DESTROY(q)				\
-	do {						\
-		NG_BT_ITEMQ_DRAIN((q));			\
-	} while (0)
-
-#define NG_BT_ITEMQ_FIRST(q)	STAILQ_FIRST(&(q)->queue)
-
-#define NG_BT_ITEMQ_LEN(q)	NG_BT_MBUFQ_LEN((q))
-
-#define NG_BT_ITEMQ_FULL(q)	NG_BT_MBUFQ_FULL((q))
-
-#define NG_BT_ITEMQ_DROP(q)	NG_BT_MBUFQ_DROP((q))
-
-#define NG_BT_ITEMQ_ENQUEUE(q, i)			\
-	do {						\
-		STAILQ_INSERT_TAIL(&(q)->queue, (i), el_next);	\
-		(q)->len ++;				\
-	} while (0)
-
-#define NG_BT_ITEMQ_DEQUEUE(q, i)			\
-	do {						\
-		(i) = STAILQ_FIRST(&(q)->queue);	\
-		if ((i) != NULL) {			\
-			STAILQ_REMOVE_HEAD(&(q)->queue, el_next);	\
-			(q)->len --;			\
-		} 					\
-	} while (0)
-
-#define NG_BT_ITEMQ_PREPEND(q, i)			\
-	do {						\
-		STAILQ_INSERT_HEAD(&(q)->queue, (i), el_next);	\
-		(q)->len ++;				\
-	} while (0)
-
-#define NG_BT_ITEMQ_DRAIN(q)				\
-	do { 						\
-        	struct ng_item	*i = NULL;		\
-							\
-		for (;;) { 				\
-			NG_BT_ITEMQ_DEQUEUE((q), i);	\
-			if (i == NULL) 			\
-				break; 			\
-							\
-			NG_FREE_ITEM(i); 		\
-		} 					\
-	} while (0)
-
-/*
- * Get Bluetooth stack sysctl globals
- */
-
-uint32_t	bluetooth_hci_command_timeout	(void);
-uint32_t	bluetooth_hci_connect_timeout	(void);
-uint32_t	bluetooth_hci_max_neighbor_age	(void);
-uint32_t	bluetooth_l2cap_rtx_timeout	(void);
-uint32_t	bluetooth_l2cap_ertx_timeout	(void);
-uint32_t      bluetooth_sco_rtx_timeout       (void);
-
-#endif /* _NETGRAPH_BLUETOOTH_H_ */
-
diff --git a/include.new/netgraph/bluetooth/include/ng_bt3c.h b/include.new/netgraph/bluetooth/include/ng_bt3c.h
deleted file mode 100644
index 654d186..0000000
--- a/include.new/netgraph/bluetooth/include/ng_bt3c.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * ng_bt3c.h
- */
-
-/*-
- * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_bt3c.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_bt3c.h 139823 2005-01-07 01:45:51Z imp $
- *
- * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX 
- *
- * Based on information obrained from: Jose Orlando Pereira <jop@di.uminho.pt>
- * and disassembled w2k driver.
- *
- * XXX XXX XX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX 
- *
- */
-
-#ifndef _NG_BT3C_H_
-#define _NG_BT3C_H_
-
-/**************************************************************************
- **************************************************************************
- **     Netgraph node hook name, type name and type cookie and commands 
- **************************************************************************  
- **************************************************************************/
-
-#define NG_BT3C_NODE_TYPE	"btccc"	/* XXX can't use bt3c in pccard.conf */
-#define NG_BT3C_HOOK		"hook"
-
-#define NGM_BT3C_COOKIE		1014752016
-
-/* Debug levels */
-#define NG_BT3C_ALERT_LEVEL	1
-#define NG_BT3C_ERR_LEVEL	2
-#define NG_BT3C_WARN_LEVEL	3
-#define NG_BT3C_INFO_LEVEL	4
-
-/* Node states */
-#define NG_BT3C_W4_PKT_IND	1               /* wait for packet indicator */
-#define NG_BT3C_W4_PKT_HDR	2               /* wait for packet header */
-#define NG_BT3C_W4_PKT_DATA	3               /* wait for packet data */
-
-/**************************************************************************
- **************************************************************************
- **                    BT3C node command/event parameters
- **************************************************************************
- **************************************************************************/
-
-#define NGM_BT3C_NODE_GET_STATE	1		/* get node state */
-typedef u_int16_t		ng_bt3c_node_state_ep;
-
-#define NGM_BT3C_NODE_SET_DEBUG	2		/* set debug level */
-#define NGM_BT3C_NODE_GET_DEBUG	3		/* get debug level */
-typedef u_int16_t		ng_bt3c_node_debug_ep; 
-
-#define NGM_BT3C_NODE_GET_QLEN	4		/* get queue length */
-#define NGM_BT3C_NODE_SET_QLEN	5		/* set queue length */
-typedef struct {
-	int32_t	queue;				/* queue index */
-#define NGM_BT3C_NODE_IN_QUEUE	1		/* incoming queue */
-#define NGM_BT3C_NODE_OUT_QUEUE	2		/* outgoing queue */
-
-	int32_t	qlen;				/* queue length */
-} ng_bt3c_node_qlen_ep;
-
-#define NGM_BT3C_NODE_GET_STAT	6		/* get statistic */
-typedef struct {
-	uint32_t	pckts_recv;		/* # of packets received */
-	uint32_t	bytes_recv;		/* # of bytes received */
-	uint32_t	pckts_sent;		/* # of packets sent */
-	uint32_t	bytes_sent;		/* # of bytes sent */
-	uint32_t	oerrors;		/* # of output errors */
-	uint32_t	ierrors;		/* # of input errors */
-} ng_bt3c_node_stat_ep;
-
-#define NGM_BT3C_NODE_RESET_STAT 7		/* reset statistic */
-
-#define NGM_BT3C_NODE_DOWNLOAD_FIRMWARE	8	/* download firmware */
-
-typedef struct {
-	uint32_t	block_address;
-	u_int16_t	block_size;		/* in words */
-	u_int16_t	block_alignment;	/* in bytes */
-} ng_bt3c_firmware_block_ep;
-
-#endif /* ndef _NG_BT3C_H_ */
-
diff --git a/include.new/netgraph/bluetooth/include/ng_btsocket.h b/include.new/netgraph/bluetooth/include/ng_btsocket.h
deleted file mode 100644
index 53c7502..0000000
--- a/include.new/netgraph/bluetooth/include/ng_btsocket.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * ng_btsocket.h
- */
-
-/*-
- * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_btsocket.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_btsocket.h 180399 2008-07-10 00:15:29Z emax $
- */
-
-#ifndef _NETGRAPH_BTSOCKET_H_
-#define _NETGRAPH_BTSOCKET_H_
-
-/*
- * Bluetooth protocols
- */
-
-#define BLUETOOTH_PROTO_HCI	134	/* HCI protocol number */
-#define BLUETOOTH_PROTO_L2CAP	135	/* L2CAP protocol number */
-#define BLUETOOTH_PROTO_RFCOMM	136	/* RFCOMM protocol number */
-#define BLUETOOTH_PROTO_SCO	137	/* SCO protocol number */
-
-/*
- * Bluetooth version of struct sockaddr for raw HCI sockets
- */
-
-struct sockaddr_hci {
-	u_char		hci_len;	/* total length */
-	u_char		hci_family;	/* address family */
-	char		hci_node[32];	/* address (size == NG_NODESIZ ) */
-};
-
-/* Raw HCI socket options */
-#define SOL_HCI_RAW		0x0802	/* socket options level */
-
-#define SO_HCI_RAW_FILTER	1	/* get/set filter on socket */
-#define SO_HCI_RAW_DIRECTION	2	/* turn on/off direction info */
-#define SCM_HCI_RAW_DIRECTION	SO_HCI_RAW_DIRECTION /* cmsg_type  */
-
-/*
- * Raw HCI socket filter.
- *
- * For packet mask use (1 << (HCI packet indicator - 1))
- * For event mask use (1 << (Event - 1))
- */
-
-struct ng_btsocket_hci_raw_filter {
-	bitstr_t	bit_decl(packet_mask, 32);
-	bitstr_t	bit_decl(event_mask, (NG_HCI_EVENT_MASK_SIZE * 8));
-};
-
-/*
- * Raw HCI sockets ioctl's
- */
-
-/* Get state */
-struct ng_btsocket_hci_raw_node_state {
-	ng_hci_node_state_ep	state;
-};
-#define SIOC_HCI_RAW_NODE_GET_STATE \
-	_IOWR('b', NGM_HCI_NODE_GET_STATE, \
-		struct ng_btsocket_hci_raw_node_state)
-
-/* Initialize */
-#define SIOC_HCI_RAW_NODE_INIT \
-	_IO('b', NGM_HCI_NODE_INIT)
-
-/* Get/Set debug level */
-struct ng_btsocket_hci_raw_node_debug {
-	ng_hci_node_debug_ep	debug;
-};
-#define SIOC_HCI_RAW_NODE_GET_DEBUG \
-	_IOWR('b', NGM_HCI_NODE_GET_DEBUG, \
-		struct ng_btsocket_hci_raw_node_debug)
-#define SIOC_HCI_RAW_NODE_SET_DEBUG \
-	_IOWR('b', NGM_HCI_NODE_SET_DEBUG, \
-		struct ng_btsocket_hci_raw_node_debug)
-
-/* Get buffer info */
-struct ng_btsocket_hci_raw_node_buffer {
-	ng_hci_node_buffer_ep	buffer;
-};
-#define SIOC_HCI_RAW_NODE_GET_BUFFER \
-	_IOWR('b', NGM_HCI_NODE_GET_BUFFER, \
-		struct ng_btsocket_hci_raw_node_buffer)
-
-/* Get BD_ADDR */
-struct ng_btsocket_hci_raw_node_bdaddr {
-	bdaddr_t	bdaddr;
-};
-#define SIOC_HCI_RAW_NODE_GET_BDADDR \
-	_IOWR('b', NGM_HCI_NODE_GET_BDADDR, \
-		struct ng_btsocket_hci_raw_node_bdaddr)
-
-/* Get features */
-struct ng_btsocket_hci_raw_node_features {
-	u_int8_t	features[NG_HCI_FEATURES_SIZE];
-};
-#define SIOC_HCI_RAW_NODE_GET_FEATURES \
-	_IOWR('b', NGM_HCI_NODE_GET_FEATURES, \
-		struct ng_btsocket_hci_raw_node_features)
-
-/* Get stat */
-struct ng_btsocket_hci_raw_node_stat {
-	ng_hci_node_stat_ep	stat;
-};
-#define SIOC_HCI_RAW_NODE_GET_STAT \
-	_IOWR('b', NGM_HCI_NODE_GET_STAT, \
-		struct ng_btsocket_hci_raw_node_stat)
-
-/* Reset stat */
-#define SIOC_HCI_RAW_NODE_RESET_STAT \
-	_IO('b', NGM_HCI_NODE_RESET_STAT)
-
-/* Flush neighbor cache */
-#define SIOC_HCI_RAW_NODE_FLUSH_NEIGHBOR_CACHE \
-	_IO('b', NGM_HCI_NODE_FLUSH_NEIGHBOR_CACHE)
-
-/* Get neighbor cache */
-struct ng_btsocket_hci_raw_node_neighbor_cache {
-	uint32_t				 num_entries;
-	ng_hci_node_neighbor_cache_entry_ep	*entries;
-};
-#define SIOC_HCI_RAW_NODE_GET_NEIGHBOR_CACHE \
-	_IOWR('b', NGM_HCI_NODE_GET_NEIGHBOR_CACHE, \
-		struct ng_btsocket_hci_raw_node_neighbor_cache)
-
-/* Get connection list */
-struct ng_btsocket_hci_raw_con_list {
-	uint32_t		 num_connections;
-	ng_hci_node_con_ep	*connections;
-};
-#define SIOC_HCI_RAW_NODE_GET_CON_LIST \
-	_IOWR('b', NGM_HCI_NODE_GET_CON_LIST, \
-		struct ng_btsocket_hci_raw_con_list)
-
-/* Get/Set link policy settings mask */
-struct ng_btsocket_hci_raw_node_link_policy_mask {
-	ng_hci_node_link_policy_mask_ep	policy_mask;
-};
-#define SIOC_HCI_RAW_NODE_GET_LINK_POLICY_MASK \
-	_IOWR('b', NGM_HCI_NODE_GET_LINK_POLICY_SETTINGS_MASK, \
-		struct ng_btsocket_hci_raw_node_link_policy_mask)
-#define SIOC_HCI_RAW_NODE_SET_LINK_POLICY_MASK \
-	_IOWR('b', NGM_HCI_NODE_SET_LINK_POLICY_SETTINGS_MASK, \
-		struct ng_btsocket_hci_raw_node_link_policy_mask)
-
-/* Get/Set packet mask */
-struct ng_btsocket_hci_raw_node_packet_mask {
-	ng_hci_node_packet_mask_ep	packet_mask;
-};
-#define SIOC_HCI_RAW_NODE_GET_PACKET_MASK \
-	_IOWR('b', NGM_HCI_NODE_GET_PACKET_MASK, \
-		struct ng_btsocket_hci_raw_node_packet_mask)
-#define SIOC_HCI_RAW_NODE_SET_PACKET_MASK \
-	_IOWR('b', NGM_HCI_NODE_SET_PACKET_MASK, \
-		struct ng_btsocket_hci_raw_node_packet_mask)
-
-/* Get/Set role switch */
-struct ng_btsocket_hci_raw_node_role_switch {
-	ng_hci_node_role_switch_ep	role_switch;
-};
-#define SIOC_HCI_RAW_NODE_GET_ROLE_SWITCH \
-	_IOWR('b', NGM_HCI_NODE_GET_ROLE_SWITCH, \
-		struct ng_btsocket_hci_raw_node_role_switch)
-#define SIOC_HCI_RAW_NODE_SET_ROLE_SWITCH \
-	_IOWR('b', NGM_HCI_NODE_SET_ROLE_SWITCH, \
-		struct ng_btsocket_hci_raw_node_role_switch)
-
-/* Get list of HCI node names */
-struct ng_btsocket_hci_raw_node_list_names {
-	uint32_t	 num_names;
-	struct nodeinfo	*names;
-};
-#define SIOC_HCI_RAW_NODE_LIST_NAMES \
-	_IOWR('b', NGM_HCI_NODE_LIST_NAMES, \
-		struct ng_btsocket_hci_raw_node_list_names)
-
-/*
- * XXX FIXME: probably does not belong here
- * Bluetooth version of struct sockaddr for SCO sockets (SEQPACKET)
- */
-
-struct sockaddr_sco {
-	u_char		sco_len;	/* total length */
-	u_char		sco_family;	/* address family */
-	bdaddr_t	sco_bdaddr;	/* address */
-};
-
-/* SCO socket options */
-#define SOL_SCO		0x0209		/* socket options level */
-
-#define SO_SCO_MTU	1		/* get sockets mtu */
-#define SO_SCO_CONNINFO	2		/* get HCI connection handle */
-
-/*
- * XXX FIXME: probably does not belong here
- * Bluetooth version of struct sockaddr for L2CAP sockets (RAW and SEQPACKET)
- */
-
-struct sockaddr_l2cap {
-	u_char		l2cap_len;	/* total length */
-	u_char		l2cap_family;	/* address family */
-	u_int16_t	l2cap_psm;	/* PSM (Protocol/Service Multiplexor) */
-	bdaddr_t	l2cap_bdaddr;	/* address */
-};
-
-/* L2CAP socket options */
-#define SOL_L2CAP		0x1609	/* socket option level */
-
-#define SO_L2CAP_IMTU		1	/* get/set incoming MTU */
-#define SO_L2CAP_OMTU		2	/* get outgoing (peer incoming) MTU */
-#define SO_L2CAP_IFLOW		3	/* get incoming flow spec. */
-#define SO_L2CAP_OFLOW		4	/* get/set outgoing flow spec. */
-#define SO_L2CAP_FLUSH		5	/* get/set flush timeout */
-
-/*
- * Raw L2CAP sockets ioctl's
- */
-
-/* Ping */
-struct ng_btsocket_l2cap_raw_ping {
-	uint32_t		 result;
-	uint32_t		 echo_size;
-	u_int8_t		*echo_data;
-};
-#define SIOC_L2CAP_L2CA_PING \
-	_IOWR('b', NGM_L2CAP_L2CA_PING, \
-		struct ng_btsocket_l2cap_raw_ping)
-
-/* Get info */
-struct ng_btsocket_l2cap_raw_get_info {
-	uint32_t		 result;
-	uint32_t		 info_type;
-	uint32_t		 info_size;
-	u_int8_t		*info_data;
-};
-#define SIOC_L2CAP_L2CA_GET_INFO \
-	_IOWR('b', NGM_L2CAP_L2CA_GET_INFO, \
-		struct ng_btsocket_l2cap_raw_get_info)
-
-/* Get flags */
-struct ng_btsocket_l2cap_raw_node_flags {
-	ng_l2cap_node_flags_ep	flags;
-};
-#define SIOC_L2CAP_NODE_GET_FLAGS \
-	_IOWR('b', NGM_L2CAP_NODE_GET_FLAGS, \
-		struct ng_btsocket_l2cap_raw_node_flags)
-
-/* Get/Set debug level */
-struct ng_btsocket_l2cap_raw_node_debug {
-	ng_l2cap_node_debug_ep	debug;
-};
-#define SIOC_L2CAP_NODE_GET_DEBUG \
-	_IOWR('b', NGM_L2CAP_NODE_GET_DEBUG, \
-		struct ng_btsocket_l2cap_raw_node_debug)
-#define SIOC_L2CAP_NODE_SET_DEBUG \
-	_IOWR('b', NGM_L2CAP_NODE_SET_DEBUG, \
-		struct ng_btsocket_l2cap_raw_node_debug)
-
-/* Get connection list */
-struct ng_btsocket_l2cap_raw_con_list {
-	uint32_t		 num_connections;
-	ng_l2cap_node_con_ep	*connections;
-};
-#define SIOC_L2CAP_NODE_GET_CON_LIST \
-	_IOWR('b', NGM_L2CAP_NODE_GET_CON_LIST, \
-		struct ng_btsocket_l2cap_raw_con_list)
-
-/* Get channel list */
-struct ng_btsocket_l2cap_raw_chan_list {
-	uint32_t		 num_channels;
-	ng_l2cap_node_chan_ep	*channels;
-};
-#define SIOC_L2CAP_NODE_GET_CHAN_LIST \
-	_IOWR('b', NGM_L2CAP_NODE_GET_CHAN_LIST, \
-		struct ng_btsocket_l2cap_raw_chan_list)
-
-/* Get/Set auto disconnect timeout */
-struct ng_btsocket_l2cap_raw_auto_discon_timo
-{
-	ng_l2cap_node_auto_discon_ep	timeout;
-};
-#define SIOC_L2CAP_NODE_GET_AUTO_DISCON_TIMO \
-	_IOWR('b', NGM_L2CAP_NODE_GET_AUTO_DISCON_TIMO, \
-		struct ng_btsocket_l2cap_raw_auto_discon_timo)
-#define SIOC_L2CAP_NODE_SET_AUTO_DISCON_TIMO \
-	_IOWR('b', NGM_L2CAP_NODE_SET_AUTO_DISCON_TIMO, \
-		struct ng_btsocket_l2cap_raw_auto_discon_timo)
-
-/*
- * XXX FIXME: probably does not belong here
- * Bluetooth version of struct sockaddr for RFCOMM sockets (STREAM)
- */
-
-struct sockaddr_rfcomm {
-	u_char		rfcomm_len;	/* total length */
-	u_char		rfcomm_family;	/* address family */
-	bdaddr_t	rfcomm_bdaddr;	/* address */
-	u_int8_t	rfcomm_channel;	/* channel */
-};
-
-/* Flow control information */
-struct ng_btsocket_rfcomm_fc_info {
-	u_int8_t	lmodem;		/* modem signals (local) */
-	u_int8_t	rmodem;		/* modem signals (remote) */
-	u_int8_t	tx_cred;	/* TX credits */
-	u_int8_t	rx_cred;	/* RX credits */
-	u_int8_t	cfc;		/* credit flow control */
-	u_int8_t	reserved;
-};
-
-/* STREAM RFCOMM socket options */
-#define SOL_RFCOMM		0x0816	/* socket options level */
-
-#define SO_RFCOMM_MTU		1	/* get channel MTU */
-#define SO_RFCOMM_FC_INFO	2	/* get flow control information */
-
-/* 
- * Netgraph node type name and cookie 
- */
-
-#define	NG_BTSOCKET_HCI_RAW_NODE_TYPE	"btsock_hci_raw"
-#define	NG_BTSOCKET_L2CAP_RAW_NODE_TYPE	"btsock_l2c_raw"
-#define	NG_BTSOCKET_L2CAP_NODE_TYPE	"btsock_l2c"
-#define	NG_BTSOCKET_SCO_NODE_TYPE	"btsock_sco"
-
-/*
- * Debug levels 
- */
-
-#define NG_BTSOCKET_ALERT_LEVEL	1
-#define NG_BTSOCKET_ERR_LEVEL	2
-#define NG_BTSOCKET_WARN_LEVEL	3
-#define NG_BTSOCKET_INFO_LEVEL	4
-
-#endif /* _NETGRAPH_BTSOCKET_H_ */
-
diff --git a/include.new/netgraph/bluetooth/include/ng_btsocket_hci_raw.h b/include.new/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
deleted file mode 100644
index 98b082b..0000000
--- a/include.new/netgraph/bluetooth/include/ng_btsocket_hci_raw.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * ng_btsocket_hci_raw.h
- */
-
-/*-
- * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_btsocket_hci_raw.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h 160549 2006-07-21 17:11:15Z rwatson $
- */
-
-#ifndef _NETGRAPH_BTSOCKET_HCI_RAW_H_
-#define _NETGRAPH_BTSOCKET_HCI_RAW_H_
-
-#define NG_BTSOCKET_HCI_RAW_SENDSPACE	(4 * 1024)
-#define NG_BTSOCKET_HCI_RAW_RECVSPACE	(4 * 1024)
-
-/*
- * Bluetooth raw HCI socket PCB
- */
-
-struct ng_btsocket_hci_raw_pcb {
-	struct socket				*so;     /* socket */
-	uint32_t				 flags;  /* flags */
-#define NG_BTSOCKET_HCI_RAW_DIRECTION	(1 << 0)
-#define NG_BTSOCKET_HCI_RAW_PRIVILEGED	(1 << 1)
-	struct sockaddr_hci			 addr;   /* local address */
-	struct ng_btsocket_hci_raw_filter	 filter; /* filter */
-	uint32_t				 token;  /* message token */
-	struct ng_mesg				*msg;    /* message */
-	LIST_ENTRY(ng_btsocket_hci_raw_pcb)	 next;   /* link to next */
-	struct mtx				 pcb_mtx; /* pcb mutex */
-};
-typedef struct ng_btsocket_hci_raw_pcb		ng_btsocket_hci_raw_pcb_t;
-typedef struct ng_btsocket_hci_raw_pcb *	ng_btsocket_hci_raw_pcb_p;
-
-#define	so2hci_raw_pcb(so) \
-	((struct ng_btsocket_hci_raw_pcb *)((so)->so_pcb))
-
-/*
- * Bluetooth raw HCI socket methods
- */
-
-#ifdef _KERNEL
-
-void ng_btsocket_hci_raw_init       (void);
-void ng_btsocket_hci_raw_abort      (struct socket *);
-void ng_btsocket_hci_raw_close      (struct socket *);
-int  ng_btsocket_hci_raw_attach     (struct socket *, int, struct thread *);
-int  ng_btsocket_hci_raw_bind       (struct socket *, struct sockaddr *, 
-                                     struct thread *);
-int  ng_btsocket_hci_raw_connect    (struct socket *, struct sockaddr *, 
-                                     struct thread *);
-int  ng_btsocket_hci_raw_control    (struct socket *, u_long, caddr_t,
-                                     struct ifnet *, struct thread *);
-int  ng_btsocket_hci_raw_ctloutput  (struct socket *, struct sockopt *);
-void ng_btsocket_hci_raw_detach     (struct socket *);
-int  ng_btsocket_hci_raw_disconnect (struct socket *);
-int  ng_btsocket_hci_raw_peeraddr   (struct socket *, struct sockaddr **);
-int  ng_btsocket_hci_raw_send       (struct socket *, int, struct mbuf *,
-                                     struct sockaddr *, struct mbuf *,
-                                     struct thread *);
-int  ng_btsocket_hci_raw_sockaddr   (struct socket *, struct sockaddr **);
-
-#endif /* _KERNEL */
- 
-#endif /* ndef _NETGRAPH_BTSOCKET_HCI_RAW_H_ */
-
diff --git a/include.new/netgraph/bluetooth/include/ng_btsocket_l2cap.h b/include.new/netgraph/bluetooth/include/ng_btsocket_l2cap.h
deleted file mode 100644
index c0baf7b..0000000
--- a/include.new/netgraph/bluetooth/include/ng_btsocket_l2cap.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * ng_btsocket_l2cap.h
- */
-
-/*-
- * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_btsocket_l2cap.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h 160549 2006-07-21 17:11:15Z rwatson $
- */
-
-#ifndef _NETGRAPH_BTSOCKET_L2CAP_H_
-#define _NETGRAPH_BTSOCKET_L2CAP_H_
-
-/*
- * L2CAP routing entry
- */
-
-struct ng_hook;
-struct ng_message;
-
-struct ng_btsocket_l2cap_rtentry {
-	bdaddr_t				 src;  /* source BD_ADDR */
-	struct ng_hook				*hook; /* downstream hook */
-	LIST_ENTRY(ng_btsocket_l2cap_rtentry)	 next; /* link to next */
-};
-typedef struct ng_btsocket_l2cap_rtentry	ng_btsocket_l2cap_rtentry_t;
-typedef struct ng_btsocket_l2cap_rtentry *	ng_btsocket_l2cap_rtentry_p;
-
-/*****************************************************************************
- *****************************************************************************
- **                          SOCK_RAW L2CAP sockets                         **
- *****************************************************************************
- *****************************************************************************/
-
-#define NG_BTSOCKET_L2CAP_RAW_SENDSPACE	NG_L2CAP_MTU_DEFAULT
-#define NG_BTSOCKET_L2CAP_RAW_RECVSPACE	NG_L2CAP_MTU_DEFAULT
-
-/*
- * Bluetooth raw L2CAP socket PCB
- */
-
-struct ng_btsocket_l2cap_raw_pcb {
-	struct socket				*so;	/* socket */
-
-	uint32_t				 flags; /* flags */
-#define NG_BTSOCKET_L2CAP_RAW_PRIVILEGED	(1 << 0)
-
-	bdaddr_t				 src;	/* source address */
-	bdaddr_t				 dst;	/* dest address */
-	ng_btsocket_l2cap_rtentry_p		 rt;    /* routing info */
-
-	uint32_t				 token;	/* message token */
-	struct ng_mesg				*msg;   /* message */
-
-	struct mtx				 pcb_mtx; /* pcb mutex */
-
-	LIST_ENTRY(ng_btsocket_l2cap_raw_pcb)	 next;  /* link to next PCB */
-};
-typedef struct ng_btsocket_l2cap_raw_pcb	ng_btsocket_l2cap_raw_pcb_t;
-typedef struct ng_btsocket_l2cap_raw_pcb *	ng_btsocket_l2cap_raw_pcb_p;
-
-#define	so2l2cap_raw_pcb(so) \
-	((struct ng_btsocket_l2cap_raw_pcb *)((so)->so_pcb))
-
-/*
- * Bluetooth raw L2CAP socket methods
- */
-
-#ifdef _KERNEL
-
-void ng_btsocket_l2cap_raw_init       (void);
-void ng_btsocket_l2cap_raw_abort      (struct socket *);
-void ng_btsocket_l2cap_raw_close      (struct socket *);
-int  ng_btsocket_l2cap_raw_attach     (struct socket *, int, struct thread *);
-int  ng_btsocket_l2cap_raw_bind       (struct socket *, struct sockaddr *,
-                                       struct thread *);
-int  ng_btsocket_l2cap_raw_connect    (struct socket *, struct sockaddr *,
-                                       struct thread *);
-int  ng_btsocket_l2cap_raw_control    (struct socket *, u_long, caddr_t,
-                                       struct ifnet *, struct thread *);
-void ng_btsocket_l2cap_raw_detach     (struct socket *);
-int  ng_btsocket_l2cap_raw_disconnect (struct socket *);
-int  ng_btsocket_l2cap_raw_peeraddr   (struct socket *, struct sockaddr **);
-int  ng_btsocket_l2cap_raw_send       (struct socket *, int, struct mbuf *,
-                                       struct sockaddr *, struct mbuf *,
-                                       struct thread *);
-int  ng_btsocket_l2cap_raw_sockaddr   (struct socket *, struct sockaddr **);
-
-#endif /* _KERNEL */
-
-/*****************************************************************************
- *****************************************************************************
- **                    SOCK_SEQPACKET L2CAP sockets                         **
- *****************************************************************************
- *****************************************************************************/
-
-#define NG_BTSOCKET_L2CAP_SENDSPACE	NG_L2CAP_MTU_DEFAULT /* (64 * 1024) */
-#define NG_BTSOCKET_L2CAP_RECVSPACE	(64 * 1024)
-
-/*
- * Bluetooth L2CAP socket PCB
- */
-
-struct ng_btsocket_l2cap_pcb {
-	struct socket			*so;	     /* Pointer to socket */
-
-	bdaddr_t			 src;	     /* Source address */
-	bdaddr_t			 dst;	     /* Destination address */
-
-	u_int16_t			 psm;	     /* PSM */
-	u_int16_t			 cid;	     /* Local channel ID */
-
-	u_int16_t			 flags;      /* socket flags */
-#define NG_BTSOCKET_L2CAP_CLIENT	(1 << 0)     /* socket is client */
-#define NG_BTSOCKET_L2CAP_TIMO		(1 << 1)     /* timeout pending */
-
-	u_int8_t			 state;      /* socket state */
-#define NG_BTSOCKET_L2CAP_CLOSED	0            /* socket closed */
-#define NG_BTSOCKET_L2CAP_CONNECTING	1            /* wait for connect */
-#define NG_BTSOCKET_L2CAP_CONFIGURING	2            /* wait for config */
-#define NG_BTSOCKET_L2CAP_OPEN		3            /* socket open */
-#define NG_BTSOCKET_L2CAP_DISCONNECTING	4            /* wait for disconnect */
-
-	u_int8_t			 cfg_state;  /* config state */
-#define	NG_BTSOCKET_L2CAP_CFG_IN	(1 << 0)     /* incoming path done */
-#define	NG_BTSOCKET_L2CAP_CFG_OUT	(1 << 1)     /* outgoing path done */
-#define	NG_BTSOCKET_L2CAP_CFG_BOTH \
-	(NG_BTSOCKET_L2CAP_CFG_IN | NG_BTSOCKET_L2CAP_CFG_OUT)
-
-#define	NG_BTSOCKET_L2CAP_CFG_IN_SENT	(1 << 2)     /* L2CAP ConfigReq sent */
-#define	NG_BTSOCKET_L2CAP_CFG_OUT_SENT	(1 << 3)     /* ---/--- */
-
-	u_int16_t			 imtu;       /* Incoming MTU */
-	ng_l2cap_flow_t			 iflow;      /* Input flow spec */
-
-	u_int16_t			 omtu;       /* Outgoing MTU */
-	ng_l2cap_flow_t			 oflow;      /* Outgoing flow spec */
-
-	u_int16_t			 flush_timo; /* flush timeout */   
-	u_int16_t			 link_timo;  /* link timeout */ 
-
-	struct callout_handle		 timo;       /* timeout */
-
-	uint32_t			 token;	     /* message token */
-	ng_btsocket_l2cap_rtentry_p	 rt;         /* routing info */
-
-	struct mtx			 pcb_mtx;    /* pcb mutex */
-
-	LIST_ENTRY(ng_btsocket_l2cap_pcb) next;      /* link to next PCB */
-};
-typedef struct ng_btsocket_l2cap_pcb	ng_btsocket_l2cap_pcb_t;
-typedef struct ng_btsocket_l2cap_pcb *	ng_btsocket_l2cap_pcb_p;
-
-#define	so2l2cap_pcb(so) \
-	((struct ng_btsocket_l2cap_pcb *)((so)->so_pcb))
-
-/*
- * Bluetooth L2CAP socket methods
- */
-
-#ifdef _KERNEL
-
-void ng_btsocket_l2cap_init       (void);
-void ng_btsocket_l2cap_abort      (struct socket *);
-void ng_btsocket_l2cap_close      (struct socket *);
-int  ng_btsocket_l2cap_accept     (struct socket *, struct sockaddr **);
-int  ng_btsocket_l2cap_attach     (struct socket *, int, struct thread *);
-int  ng_btsocket_l2cap_bind       (struct socket *, struct sockaddr *,
-                                   struct thread *);
-int  ng_btsocket_l2cap_connect    (struct socket *, struct sockaddr *,
-                                   struct thread *);
-int  ng_btsocket_l2cap_control    (struct socket *, u_long, caddr_t,
-                                   struct ifnet *, struct thread *);
-int  ng_btsocket_l2cap_ctloutput  (struct socket *, struct sockopt *);
-void ng_btsocket_l2cap_detach     (struct socket *);
-int  ng_btsocket_l2cap_disconnect (struct socket *);
-int  ng_btsocket_l2cap_listen     (struct socket *, int, struct thread *);
-int  ng_btsocket_l2cap_peeraddr   (struct socket *, struct sockaddr **);
-int  ng_btsocket_l2cap_send       (struct socket *, int, struct mbuf *,
-                                   struct sockaddr *, struct mbuf *,
-                                   struct thread *);
-int  ng_btsocket_l2cap_sockaddr   (struct socket *, struct sockaddr **);
-
-#endif /* _KERNEL */
-
-#endif /* _NETGRAPH_BTSOCKET_L2CAP_H_ */
-
diff --git a/include.new/netgraph/bluetooth/include/ng_btsocket_rfcomm.h b/include.new/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
deleted file mode 100644
index a131205..0000000
--- a/include.new/netgraph/bluetooth/include/ng_btsocket_rfcomm.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * ng_btsocket_rfcomm.h
- */
-
-/*-
- * Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_btsocket_rfcomm.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h 197083 2009-09-10 23:30:13Z emax $
- */
-
-#ifndef _NETGRAPH_BTSOCKET_RFCOMM_H_
-#define _NETGRAPH_BTSOCKET_RFCOMM_H_
-
-/*****************************************************************************
- *****************************************************************************
- **                              RFCOMM                                     **
- *****************************************************************************
- *****************************************************************************/
-
-/* XXX FIXME this does not belong here */
-
-#define RFCOMM_DEFAULT_MTU		667
-#define RFCOMM_MAX_MTU			1024
-
-#define RFCOMM_DEFAULT_CREDITS		7
-#define RFCOMM_MAX_CREDITS		40
-
-/* RFCOMM frame types */
-#define RFCOMM_FRAME_SABM		0x2f
-#define RFCOMM_FRAME_DISC		0x43
-#define RFCOMM_FRAME_UA			0x63
-#define RFCOMM_FRAME_DM			0x0f
-#define RFCOMM_FRAME_UIH		0xef
-
-/* RFCOMM MCC commands */
-#define RFCOMM_MCC_TEST			0x08 /* Test */
-#define RFCOMM_MCC_FCON			0x28 /* Flow Control on */
-#define RFCOMM_MCC_FCOFF		0x18 /* Flow Control off */
-#define RFCOMM_MCC_MSC			0x38 /* Modem Status Command */
-#define RFCOMM_MCC_RPN			0x24 /* Remote Port Negotiation */
-#define RFCOMM_MCC_RLS			0x14 /* Remote Line Status */
-#define RFCOMM_MCC_PN			0x20 /* Port Negotiation */
-#define RFCOMM_MCC_NSC			0x04 /* Non Supported Command */
-
-/* RFCOMM modem signals */
-#define RFCOMM_MODEM_FC			0x02 /* Flow Control asserted */
-#define RFCOMM_MODEM_RTC		0x04 /* Ready To Communicate */
-#define RFCOMM_MODEM_RTR		0x08 /* Ready To Receive */
-#define RFCOMM_MODEM_IC			0x40 /* Incomming Call */
-#define RFCOMM_MODEM_DV			0x80 /* Data Valid */
-
-/* RPN parameters - baud rate */
-#define RFCOMM_RPN_BR_2400		0x0
-#define RFCOMM_RPN_BR_4800		0x1
-#define RFCOMM_RPN_BR_7200		0x2
-#define RFCOMM_RPN_BR_9600		0x3
-#define RFCOMM_RPN_BR_19200		0x4
-#define RFCOMM_RPN_BR_38400		0x5
-#define RFCOMM_RPN_BR_57600		0x6
-#define RFCOMM_RPN_BR_115200		0x7
-#define RFCOMM_RPN_BR_230400		0x8
-
-/* RPN parameters - data bits */
-#define RFCOMM_RPN_DATA_5		0x0
-#define RFCOMM_RPN_DATA_6		0x2
-#define RFCOMM_RPN_DATA_7		0x1
-#define RFCOMM_RPN_DATA_8		0x3
-
-/* RPN parameters - stop bit */
-#define RFCOMM_RPN_STOP_1		0
-#define RFCOMM_RPN_STOP_15		1
-
-/* RPN parameters - parity */
-#define RFCOMM_RPN_PARITY_NONE		0x0
-#define RFCOMM_RPN_PARITY_ODD		0x4
-#define RFCOMM_RPN_PARITY_EVEN		0x5
-#define RFCOMM_RPN_PARITY_MARK		0x6
-#define RFCOMM_RPN_PARITY_SPACE		0x7
-
-/* RPN parameters - flow control */
-#define RFCOMM_RPN_FLOW_NONE		0x00
-#define RFCOMM_RPN_XON_CHAR		0x11
-#define RFCOMM_RPN_XOFF_CHAR		0x13
-
-/* RPN parameters - mask */
-#define RFCOMM_RPN_PM_BITRATE		0x0001
-#define RFCOMM_RPN_PM_DATA		0x0002
-#define RFCOMM_RPN_PM_STOP		0x0004
-#define RFCOMM_RPN_PM_PARITY		0x0008
-#define RFCOMM_RPN_PM_PARITY_TYPE	0x0010
-#define RFCOMM_RPN_PM_XON		0x0020
-#define RFCOMM_RPN_PM_XOFF		0x0040
-#define RFCOMM_RPN_PM_FLOW		0x3F00
-#define RFCOMM_RPN_PM_ALL		0x3F7F
-
-/* RFCOMM frame header */
-struct rfcomm_frame_hdr 
-{
-	u_int8_t	address;
-	u_int8_t	control;
-	u_int8_t	length;	/* Actual size could be 2 bytes */
-} __attribute__ ((packed));
-
-/* RFCOMM command frame header */
-struct rfcomm_cmd_hdr
-{
-	u_int8_t	address;
-	u_int8_t	control;
-	u_int8_t	length;
-	u_int8_t	fcs;
-} __attribute__ ((packed));
-                
-/* RFCOMM MCC command header */
-struct rfcomm_mcc_hdr
-{
-	u_int8_t	type;
-	u_int8_t	length; /* XXX FIXME Can actual size be 2 bytes?? */
-} __attribute__ ((packed));
-
-/* RFCOMM MSC command */
-struct rfcomm_mcc_msc
-{
-	u_int8_t	address;
-	u_int8_t	modem;
-} __attribute__ ((packed));
-
-/* RFCOMM RPN command */
-struct rfcomm_mcc_rpn
-{
-	u_int8_t	dlci;
-	u_int8_t	bit_rate;
-	u_int8_t	line_settings;
-	u_int8_t	flow_control;
-	u_int8_t	xon_char;
-	u_int8_t	xoff_char;
-	u_int16_t	param_mask;
-} __attribute__ ((packed));
-
-/* RFCOMM RLS command */
-struct rfcomm_mcc_rls
-{
-	u_int8_t	address;
-	u_int8_t	status;
-} __attribute__ ((packed));
-
-/* RFCOMM PN command */
-struct rfcomm_mcc_pn
-{
-	u_int8_t	dlci;
-	u_int8_t	flow_control;
-	u_int8_t	priority;
-	u_int8_t	ack_timer;
-	u_int16_t	mtu;
-	u_int8_t	max_retrans;
-	u_int8_t	credits;
-} __attribute__ ((packed));
-
-/* RFCOMM frame parsing macros */
-#define RFCOMM_DLCI(b)			(((b) & 0xfc) >> 2)
-#define RFCOMM_CHANNEL(b)		(((b) & 0xf8) >> 3)
-#define RFCOMM_DIRECTION(b)		(((b) & 0x04) >> 2)
-#define RFCOMM_TYPE(b)			(((b) & 0xef))
-  
-#define RFCOMM_EA(b)			(((b) & 0x01))
-#define RFCOMM_CR(b)			(((b) & 0x02) >> 1)
-#define RFCOMM_PF(b)			(((b) & 0x10) >> 4)
-
-#define RFCOMM_SRVCHANNEL(dlci)		((dlci) >> 1)
-  
-#define RFCOMM_MKADDRESS(cr, dlci) \
-	((((dlci) & 0x3f) << 2) | ((cr) << 1) | 0x01)
-
-#define RFCOMM_MKCONTROL(type, pf)	((((type) & 0xef) | ((pf) << 4)))
-#define RFCOMM_MKDLCI(dir, channel)	((((channel) & 0x1f) << 1) | (dir))
-
-#define RFCOMM_MKLEN8(len)		(((len) << 1) | 1)
-#define RFCOMM_MKLEN16(len)		((len) << 1)
-
-/* RFCOMM MCC macros */
-#define RFCOMM_MCC_TYPE(b)		(((b) & 0xfc) >> 2)
-#define RFCOMM_MCC_LENGTH(b)		(((b) & 0xfe) >> 1)
-#define RFCOMM_MKMCC_TYPE(cr, type)	((((type) << 2) | ((cr) << 1) | 0x01))
-   
-/* RPN macros */
-#define RFCOMM_RPN_DATA_BITS(line)	((line) & 0x3)
-#define RFCOMM_RPN_STOP_BITS(line)	(((line) >> 2) & 0x1)
-#define RFCOMM_RPN_PARITY(line)		(((line) >> 3) & 0x3)
-#define RFCOMM_MKRPN_LINE_SETTINGS(data, stop, parity) \
-	(((data) & 0x3) | (((stop) & 0x1) << 2) | (((parity) & 0x3) << 3))
-
-/*****************************************************************************
- *****************************************************************************
- **                      SOCK_STREAM RFCOMM sockets                         **
- *****************************************************************************
- *****************************************************************************/
-
-#define NG_BTSOCKET_RFCOMM_SENDSPACE \
-	(RFCOMM_MAX_CREDITS * RFCOMM_DEFAULT_MTU * 2)
-#define NG_BTSOCKET_RFCOMM_RECVSPACE \
-	(RFCOMM_MAX_CREDITS * RFCOMM_DEFAULT_MTU * 2)
-
-/*
- * Bluetooth RFCOMM session. One L2CAP connection == one RFCOMM session
- */
-
-struct ng_btsocket_rfcomm_pcb;
-struct ng_btsocket_rfcomm_session;
-
-struct ng_btsocket_rfcomm_session {
-	struct socket				*l2so;	 /* L2CAP socket */
-
-	u_int16_t				 state;  /* session state */
-#define NG_BTSOCKET_RFCOMM_SESSION_CLOSED	 0
-#define NG_BTSOCKET_RFCOMM_SESSION_LISTENING	 1
-#define NG_BTSOCKET_RFCOMM_SESSION_CONNECTING	 2 
-#define NG_BTSOCKET_RFCOMM_SESSION_CONNECTED	 3
-#define NG_BTSOCKET_RFCOMM_SESSION_OPEN		 4
-#define NG_BTSOCKET_RFCOMM_SESSION_DISCONNECTING 5
-
-	u_int16_t				 flags;  /* session flags */
-#define NG_BTSOCKET_RFCOMM_SESSION_INITIATOR	(1 << 0) /* initiator */
-#define NG_BTSOCKET_RFCOMM_SESSION_LFC		(1 << 1) /* local flow */
-#define NG_BTSOCKET_RFCOMM_SESSION_RFC		(1 << 2) /* remote flow */
-
-#define INITIATOR(s) \
-	(((s)->flags & NG_BTSOCKET_RFCOMM_SESSION_INITIATOR)? 1 : 0)
-
-	u_int16_t				 mtu;    /* default MTU */
-	struct ng_bt_mbufq			 outq;   /* outgoing queue */
-
-	struct mtx				 session_mtx; /* session lock */
-	LIST_HEAD(, ng_btsocket_rfcomm_pcb)	 dlcs;	 /* active DLC */
-
-	LIST_ENTRY(ng_btsocket_rfcomm_session)	 next;	 /* link to next */
-};
-typedef struct ng_btsocket_rfcomm_session	ng_btsocket_rfcomm_session_t;
-typedef struct ng_btsocket_rfcomm_session *	ng_btsocket_rfcomm_session_p;
-
-/*
- * Bluetooth RFCOMM socket PCB (DLC)
- */
-
-struct ng_btsocket_rfcomm_pcb {
-	struct socket				*so;	  /* RFCOMM socket */
-	struct ng_btsocket_rfcomm_session	*session; /* RFCOMM session */
-
-	u_int16_t				 flags;   /* DLC flags */
-#define NG_BTSOCKET_RFCOMM_DLC_TIMO		(1 << 0)  /* timeout pending */
-#define NG_BTSOCKET_RFCOMM_DLC_CFC		(1 << 1)  /* credit flow ctrl */
-#define NG_BTSOCKET_RFCOMM_DLC_TIMEDOUT		(1 << 2)  /* timeout happend */
-#define NG_BTSOCKET_RFCOMM_DLC_DETACHED		(1 << 3)  /* DLC detached */
-#define NG_BTSOCKET_RFCOMM_DLC_SENDING		(1 << 4)  /* send pending */
-
-	u_int16_t				 state;   /* DLC state */
-#define NG_BTSOCKET_RFCOMM_DLC_CLOSED		0
-#define NG_BTSOCKET_RFCOMM_DLC_W4_CONNECT	1
-#define NG_BTSOCKET_RFCOMM_DLC_CONFIGURING	2
-#define NG_BTSOCKET_RFCOMM_DLC_CONNECTING	3
-#define NG_BTSOCKET_RFCOMM_DLC_CONNECTED	4
-#define NG_BTSOCKET_RFCOMM_DLC_DISCONNECTING	5
-
-	bdaddr_t				 src;     /* source address */
-	bdaddr_t				 dst;     /* dest. address */
-
-	u_int8_t				 channel; /* RFCOMM channel */
-	u_int8_t				 dlci;    /* RFCOMM DLCI */
-
-	u_int8_t				 lmodem;  /* local mdm signls */
-	u_int8_t				 rmodem;  /* remote -/- */
-
-	u_int16_t				 mtu;	  /* MTU */
-	int16_t					 rx_cred; /* RX credits */
-	int16_t					 tx_cred; /* TX credits */
-
-	struct mtx				 pcb_mtx; /* PCB lock */
-	struct callout_handle			 timo;    /* timeout */
-
-	LIST_ENTRY(ng_btsocket_rfcomm_pcb)	 session_next;/* link to next */
-	LIST_ENTRY(ng_btsocket_rfcomm_pcb)	 next;	  /* link to next */
-};
-typedef struct ng_btsocket_rfcomm_pcb	ng_btsocket_rfcomm_pcb_t;
-typedef struct ng_btsocket_rfcomm_pcb *	ng_btsocket_rfcomm_pcb_p;
-
-#define	so2rfcomm_pcb(so) \
-	((struct ng_btsocket_rfcomm_pcb *)((so)->so_pcb))
-
-/*
- * Bluetooth RFCOMM socket methods
- */
-
-#ifdef _KERNEL
-
-void ng_btsocket_rfcomm_init       (void);
-void ng_btsocket_rfcomm_abort      (struct socket *);
-void ng_btsocket_rfcomm_close      (struct socket *);
-int  ng_btsocket_rfcomm_accept     (struct socket *, struct sockaddr **);
-int  ng_btsocket_rfcomm_attach     (struct socket *, int, struct thread *);
-int  ng_btsocket_rfcomm_bind       (struct socket *, struct sockaddr *,
-                                    struct thread *);
-int  ng_btsocket_rfcomm_connect    (struct socket *, struct sockaddr *,
-                                    struct thread *);
-int  ng_btsocket_rfcomm_control    (struct socket *, u_long, caddr_t,
-                                    struct ifnet *, struct thread *);
-int  ng_btsocket_rfcomm_ctloutput  (struct socket *, struct sockopt *);
-void ng_btsocket_rfcomm_detach     (struct socket *);
-int  ng_btsocket_rfcomm_disconnect (struct socket *);
-int  ng_btsocket_rfcomm_listen     (struct socket *, int, struct thread *);
-int  ng_btsocket_rfcomm_peeraddr   (struct socket *, struct sockaddr **);
-int  ng_btsocket_rfcomm_send       (struct socket *, int, struct mbuf *,
-                                    struct sockaddr *, struct mbuf *,
-                                    struct thread *);
-int  ng_btsocket_rfcomm_sockaddr   (struct socket *, struct sockaddr **);
-
-#endif /* _KERNEL */
-
-#endif /* _NETGRAPH_BTSOCKET_RFCOMM_H_ */
-
diff --git a/include.new/netgraph/bluetooth/include/ng_btsocket_sco.h b/include.new/netgraph/bluetooth/include/ng_btsocket_sco.h
deleted file mode 100644
index b80d718..0000000
--- a/include.new/netgraph/bluetooth/include/ng_btsocket_sco.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * ng_btsocket_sco.h
- */
-
-/*-
- * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_btsocket_sco.h,v 1.3 2005/10/31 18:08:52 max Exp $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_btsocket_sco.h 181033 2008-07-30 22:41:23Z emax $
- */
-
-#ifndef _NETGRAPH_BTSOCKET_SCO_H_
-#define _NETGRAPH_BTSOCKET_SCO_H_
-
-/*
- * SCO routing entry
- */
-
-struct ng_hook;
-struct ng_message;
-
-struct ng_btsocket_sco_rtentry {
-	bdaddr_t				 src;  /* source BD_ADDR */
-	u_int16_t				 pkt_size; /* mtu */
-	u_int16_t				 num_pkts; /* buffer size */
-	int32_t					 pending; /* pending packets */
-	struct ng_hook				*hook; /* downstream hook */
-	LIST_ENTRY(ng_btsocket_sco_rtentry)	 next; /* link to next */
-};
-typedef struct ng_btsocket_sco_rtentry		ng_btsocket_sco_rtentry_t;
-typedef struct ng_btsocket_sco_rtentry *	ng_btsocket_sco_rtentry_p;
-
-/*****************************************************************************
- *****************************************************************************
- **                      SOCK_SEQPACKET SCO sockets                         **
- *****************************************************************************
- *****************************************************************************/
-
-#define NG_BTSOCKET_SCO_SENDSPACE	1024
-#define NG_BTSOCKET_SCO_RECVSPACE	(64 * 1024)
-
-/*
- * Bluetooth SCO socket PCB
- */
-
-struct ng_btsocket_sco_pcb {
-	struct socket			*so;	     /* Pointer to socket */
-
-	bdaddr_t			 src;	     /* Source address */
-	bdaddr_t			 dst;	     /* Destination address */
-
-	u_int16_t			 con_handle; /* connection handle */
-
-	u_int16_t			 flags;      /* socket flags */
-#define NG_BTSOCKET_SCO_CLIENT		(1 << 0)     /* socket is client */
-#define NG_BTSOCKET_SCO_TIMO		(1 << 1)     /* timeout pending */
-
-	u_int8_t			 state;      /* socket state */
-#define NG_BTSOCKET_SCO_CLOSED		0            /* socket closed */
-#define NG_BTSOCKET_SCO_CONNECTING	1            /* wait for connect */
-#define NG_BTSOCKET_SCO_OPEN		2            /* socket open */
-#define NG_BTSOCKET_SCO_DISCONNECTING	3            /* wait for disconnect */
-
-	struct callout			 timo;       /* timeout */
-
-	ng_btsocket_sco_rtentry_p	 rt;         /* routing info */
-
-	struct mtx			 pcb_mtx;    /* pcb mutex */
-
-	LIST_ENTRY(ng_btsocket_sco_pcb)	 next;       /* link to next PCB */
-};
-typedef struct ng_btsocket_sco_pcb	ng_btsocket_sco_pcb_t;
-typedef struct ng_btsocket_sco_pcb *	ng_btsocket_sco_pcb_p;
-
-#define	so2sco_pcb(so) \
-	((struct ng_btsocket_sco_pcb *)((so)->so_pcb))
-
-/*
- * Bluetooth SCO socket methods
- */
-
-#ifdef _KERNEL
-
-void ng_btsocket_sco_init       (void);
-void ng_btsocket_sco_abort      (struct socket *);
-void ng_btsocket_sco_close      (struct socket *);
-int  ng_btsocket_sco_accept     (struct socket *, struct sockaddr **);
-int  ng_btsocket_sco_attach     (struct socket *, int, struct thread *);
-int  ng_btsocket_sco_bind       (struct socket *, struct sockaddr *,
-                                   struct thread *);
-int  ng_btsocket_sco_connect    (struct socket *, struct sockaddr *,
-                                   struct thread *);
-int  ng_btsocket_sco_control    (struct socket *, u_long, caddr_t,
-                                   struct ifnet *, struct thread *);
-int  ng_btsocket_sco_ctloutput  (struct socket *, struct sockopt *);
-void ng_btsocket_sco_detach     (struct socket *);
-int  ng_btsocket_sco_disconnect (struct socket *);
-int  ng_btsocket_sco_listen     (struct socket *, int, struct thread *);
-int  ng_btsocket_sco_peeraddr   (struct socket *, struct sockaddr **);
-int  ng_btsocket_sco_send       (struct socket *, int, struct mbuf *,
-                                   struct sockaddr *, struct mbuf *,
-                                   struct thread *);
-int  ng_btsocket_sco_sockaddr   (struct socket *, struct sockaddr **);
-
-#endif /* _KERNEL */
-
-#endif /* _NETGRAPH_BTSOCKET_SCO_H_ */
-
diff --git a/include.new/netgraph/bluetooth/include/ng_h4.h b/include.new/netgraph/bluetooth/include/ng_h4.h
deleted file mode 100644
index 9a2e3bf..0000000
--- a/include.new/netgraph/bluetooth/include/ng_h4.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * ng_h4.h
- */
-
-/*-
- * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_h4.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_h4.h 139823 2005-01-07 01:45:51Z imp $
- * 
- * Based on:
- * ---------
- *
- * FreeBSD: src/sys/netgraph/ng_tty.h
- * Author: Archie Cobbs <archie@freebsd.org>
- */
-
-/*
- * This file contains everything that application needs to know about
- * Bluetooth HCI UART transport layer as per chapter H4 of the Bluetooth
- * Specification Book v1.1.
- *
- * This file can be included by both kernel and userland applications.
- */
-
-#ifndef _NETGRAPH_H4_H_
-#define _NETGRAPH_H4_H_
-
-/**************************************************************************
- **************************************************************************
- **     Netgraph node hook name, type name and type cookie and commands
- **************************************************************************
- **************************************************************************/
-
-/* Hook name */
-#define NG_H4_HOOK		"hook"
-
-/* Node type name and magic cookie */
-#define NG_H4_NODE_TYPE		"h4"
-#define NGM_H4_COOKIE		1013899512
-
-/* Node states */
-#define NG_H4_W4_PKT_IND	1	/* Waiting for packet indicator */
-#define NG_H4_W4_PKT_HDR	2	/* Waiting for packet header */
-#define NG_H4_W4_PKT_DATA	3	/* Waiting for packet data */
-
-/* Debug levels */
-#define NG_H4_ALERT_LEVEL	1
-#define NG_H4_ERR_LEVEL		2
-#define NG_H4_WARN_LEVEL	3
-#define NG_H4_INFO_LEVEL	4
-
-/**************************************************************************
- **************************************************************************
- **                    H4 node command/event parameters
- **************************************************************************
- **************************************************************************/
-
-/* Reset node */
-#define NGM_H4_NODE_RESET	1
-
-/* Get node state (see states above) */
-#define NGM_H4_NODE_GET_STATE	2
-typedef u_int16_t	ng_h4_node_state_ep;
-
-/* Get/Set node debug level (see levels above) */
-#define NGM_H4_NODE_GET_DEBUG	3
-#define NGM_H4_NODE_SET_DEBUG	4
-typedef u_int16_t	ng_h4_node_debug_ep;
-
-/* Get/Set max queue length for the node */
-#define NGM_H4_NODE_GET_QLEN	5
-#define NGM_H4_NODE_SET_QLEN	6
-typedef int32_t		ng_h4_node_qlen_ep;
-
-/* Get node statistic */
-#define NGM_H4_NODE_GET_STAT	7
-typedef struct {
-	uint32_t	pckts_recv; /* # of packets received */
-	uint32_t	bytes_recv; /* # of bytes received */
-	uint32_t	pckts_sent; /* # of packets sent */
-	uint32_t	bytes_sent; /* # of bytes sent */
-	uint32_t	oerrors;    /* # of output errors */
-	uint32_t	ierrors;    /* # of input errors */
-} ng_h4_node_stat_ep;
-
-/* Reset node statistic */
-#define NGM_H4_NODE_RESET_STAT	8
-
-#endif /* _NETGRAPH_H4_H_ */
-
diff --git a/include.new/netgraph/bluetooth/include/ng_hci.h b/include.new/netgraph/bluetooth/include/ng_hci.h
deleted file mode 100644
index 45964d6..0000000
--- a/include.new/netgraph/bluetooth/include/ng_hci.h
+++ /dev/null
@@ -1,1662 +0,0 @@
-/*
- * ng_hci.h
- */
-
-/*-
- * Copyright (c) 2001 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_hci.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_hci.h 158672 2006-05-17 00:13:07Z emax $
- */
-
-/*
- * This file contains everything that application needs to know about
- * Host Controller Interface (HCI). All information was obtained from
- * Bluetooth Specification Book v1.1.
- *
- * This file can be included by both kernel and userland applications.
- *
- * NOTE: Here and after Bluetooth device is called a "unit". Bluetooth
- *       specification refers to both devices and units. They are the
- *       same thing (i think), so to be consistent word "unit" will be
- *       used.
- */
-
-#ifndef _NETGRAPH_HCI_H_
-#define _NETGRAPH_HCI_H_
-
-/**************************************************************************
- **************************************************************************
- **     Netgraph node hook name, type name and type cookie and commands
- **************************************************************************
- **************************************************************************/
-
-/* Node type name and type cookie */
-#define NG_HCI_NODE_TYPE			"hci"
-#define NGM_HCI_COOKIE				1000774184
-
-/* Netgraph node hook names */
-#define NG_HCI_HOOK_DRV				"drv" /* Driver <-> HCI */
-#define NG_HCI_HOOK_ACL				"acl" /* HCI <-> Upper */
-#define NG_HCI_HOOK_SCO				"sco" /* HCI <-> Upper */ 
-#define NG_HCI_HOOK_RAW				"raw" /* HCI <-> Upper */ 
-
-/**************************************************************************
- **************************************************************************
- **                   Common defines and types (HCI)
- **************************************************************************
- **************************************************************************/
-
-/* All sizes are in bytes */
-#define NG_HCI_BDADDR_SIZE			6   /* unit address */
-#define NG_HCI_LAP_SIZE				3   /* unit LAP */
-#define NG_HCI_KEY_SIZE				16  /* link key */
-#define NG_HCI_PIN_SIZE				16  /* link PIN */
-#define NG_HCI_EVENT_MASK_SIZE			8   /* event mask */
-#define NG_HCI_CLASS_SIZE			3   /* unit class */
-#define NG_HCI_FEATURES_SIZE			8   /* LMP features */
-#define NG_HCI_UNIT_NAME_SIZE			248 /* unit name size */
-
-/* HCI specification */
-#define NG_HCI_SPEC_V10				0x00 /* v1.0 */
-#define NG_HCI_SPEC_V11				0x01 /* v1.1 */
-/* 0x02 - 0xFF - reserved for future use */
-
-/* LMP features */
-/* ------------------- byte 0 --------------------*/
-#define NG_HCI_LMP_3SLOT			0x01
-#define NG_HCI_LMP_5SLOT			0x02
-#define NG_HCI_LMP_ENCRYPTION			0x04
-#define NG_HCI_LMP_SLOT_OFFSET			0x08
-#define NG_HCI_LMP_TIMING_ACCURACY		0x10
-#define NG_HCI_LMP_SWITCH			0x20
-#define NG_HCI_LMP_HOLD_MODE			0x40
-#define NG_HCI_LMP_SNIFF_MODE			0x80
-/* ------------------- byte 1 --------------------*/
-#define NG_HCI_LMP_PARK_MODE			0x01
-#define NG_HCI_LMP_RSSI				0x02
-#define NG_HCI_LMP_CHANNEL_QUALITY		0x04
-#define NG_HCI_LMP_SCO_LINK			0x08
-#define NG_HCI_LMP_HV2_PKT			0x10
-#define NG_HCI_LMP_HV3_PKT			0x20
-#define NG_HCI_LMP_ULAW_LOG			0x40
-#define NG_HCI_LMP_ALAW_LOG			0x80
-/* ------------------- byte 2 --------------------*/
-#define NG_HCI_LMP_CVSD				0x01
-#define NG_HCI_LMP_PAGING_SCHEME		0x02
-#define NG_HCI_LMP_POWER_CONTROL		0x04
-#define NG_HCI_LMP_TRANSPARENT_SCO		0x08
-#define NG_HCI_LMP_FLOW_CONTROL_LAG0		0x10
-#define NG_HCI_LMP_FLOW_CONTROL_LAG1		0x20
-#define NG_HCI_LMP_FLOW_CONTROL_LAG2		0x40
-
-/* Link types */
-#define NG_HCI_LINK_SCO				0x00 /* Voice */
-#define NG_HCI_LINK_ACL				0x01 /* Data */
-/* 0x02 - 0xFF - reserved for future use */
-
-/* Packet types */
-				/* 0x0001 - 0x0004 - reserved for future use */
-#define NG_HCI_PKT_DM1				0x0008 /* ACL link */
-#define NG_HCI_PKT_DH1				0x0010 /* ACL link */
-#define NG_HCI_PKT_HV1				0x0020 /* SCO link */
-#define NG_HCI_PKT_HV2				0x0040 /* SCO link */
-#define NG_HCI_PKT_HV3				0x0080 /* SCO link */
-				/* 0x0100 - 0x0200 - reserved for future use */
-#define NG_HCI_PKT_DM3				0x0400 /* ACL link */
-#define NG_HCI_PKT_DH3				0x0800 /* ACL link */
-				/* 0x1000 - 0x2000 - reserved for future use */
-#define NG_HCI_PKT_DM5				0x4000 /* ACL link */
-#define NG_HCI_PKT_DH5				0x8000 /* ACL link */
-
-/* 
- * Connection modes/Unit modes
- *
- * This is confusing. It means that one of the units change its mode
- * for the specific connection. For example one connection was put on 
- * hold (but i could be wrong :) 
- */
-
-#define NG_HCI_UNIT_MODE_ACTIVE			0x00
-#define NG_HCI_UNIT_MODE_HOLD			0x01
-#define NG_HCI_UNIT_MODE_SNIFF			0x02
-#define NG_HCI_UNIT_MODE_PARK			0x03
-/* 0x04 - 0xFF - reserved for future use */
-
-/* Page scan modes */
-#define NG_HCI_MANDATORY_PAGE_SCAN_MODE		0x00
-#define NG_HCI_OPTIONAL_PAGE_SCAN_MODE1		0x01
-#define NG_HCI_OPTIONAL_PAGE_SCAN_MODE2		0x02
-#define NG_HCI_OPTIONAL_PAGE_SCAN_MODE3		0x03
-/* 0x04 - 0xFF - reserved for future use */
-
-/* Page scan repetition modes */
-#define NG_HCI_SCAN_REP_MODE0			0x00
-#define NG_HCI_SCAN_REP_MODE1			0x01
-#define NG_HCI_SCAN_REP_MODE2			0x02
-/* 0x03 - 0xFF - reserved for future use */
-
-/* Page scan period modes */
-#define NG_HCI_PAGE_SCAN_PERIOD_MODE0		0x00
-#define NG_HCI_PAGE_SCAN_PERIOD_MODE1		0x01
-#define NG_HCI_PAGE_SCAN_PERIOD_MODE2		0x02
-/* 0x03 - 0xFF - reserved for future use */
-
-/* Scan enable */
-#define NG_HCI_NO_SCAN_ENABLE			0x00
-#define NG_HCI_INQUIRY_ENABLE_PAGE_DISABLE	0x01
-#define NG_HCI_INQUIRY_DISABLE_PAGE_ENABLE	0x02
-#define NG_HCI_INQUIRY_ENABLE_PAGE_ENABLE	0x03
-/* 0x04 - 0xFF - reserved for future use */
-
-/* Hold mode activities */
-#define NG_HCI_HOLD_MODE_NO_CHANGE		0x00
-#define NG_HCI_HOLD_MODE_SUSPEND_PAGE_SCAN	0x01
-#define NG_HCI_HOLD_MODE_SUSPEND_INQUIRY_SCAN	0x02
-#define NG_HCI_HOLD_MODE_SUSPEND_PERIOD_INQUIRY	0x04
-/* 0x08 - 0x80 - reserved for future use */
-
-/* Connection roles */
-#define NG_HCI_ROLE_MASTER			0x00
-#define NG_HCI_ROLE_SLAVE			0x01
-/* 0x02 - 0xFF - reserved for future use */
-
-/* Key flags */
-#define NG_HCI_USE_SEMI_PERMANENT_LINK_KEYS	0x00
-#define NG_HCI_USE_TEMPORARY_LINK_KEY		0x01
-/* 0x02 - 0xFF - reserved for future use */
-
-/* Pin types */
-#define NG_HCI_PIN_TYPE_VARIABLE		0x00
-#define NG_HCI_PIN_TYPE_FIXED			0x01
-
-/* Link key types */
-#define NG_HCI_LINK_KEY_TYPE_COMBINATION_KEY	0x00
-#define NG_HCI_LINK_KEY_TYPE_LOCAL_UNIT_KEY	0x01
-#define NG_HCI_LINK_KEY_TYPE_REMOTE_UNIT_KEY	0x02
-/* 0x03 - 0xFF - reserved for future use */
-
-/* Encryption modes */
-#define NG_HCI_ENCRYPTION_MODE_NONE		0x00
-#define NG_HCI_ENCRYPTION_MODE_P2P		0x01
-#define NG_HCI_ENCRYPTION_MODE_ALL		0x02
-/* 0x03 - 0xFF - reserved for future use */
-
-/* Quality of service types */
-#define NG_HCI_SERVICE_TYPE_NO_TRAFFIC		0x00
-#define NG_HCI_SERVICE_TYPE_BEST_EFFORT		0x01
-#define NG_HCI_SERVICE_TYPE_GUARANTEED		0x02
-/* 0x03 - 0xFF - reserved for future use */
-
-/* Link policy settings */
-#define NG_HCI_LINK_POLICY_DISABLE_ALL_LM_MODES	0x0000
-#define NG_HCI_LINK_POLICY_ENABLE_ROLE_SWITCH	0x0001 /* Master/Slave switch */
-#define NG_HCI_LINK_POLICY_ENABLE_HOLD_MODE	0x0002
-#define NG_HCI_LINK_POLICY_ENABLE_SNIFF_MODE	0x0004
-#define NG_HCI_LINK_POLICY_ENABLE_PARK_MODE	0x0008
-/* 0x0010 - 0x8000 - reserved for future use */
-
-/* Event masks */
-#define NG_HCI_EVMSK_ALL			0x00000000ffffffff
-#define NG_HCI_EVMSK_NONE			0x0000000000000000
-#define NG_HCI_EVMSK_INQUIRY_COMPL		0x0000000000000001
-#define NG_HCI_EVMSK_INQUIRY_RESULT		0x0000000000000002
-#define NG_HCI_EVMSK_CON_COMPL			0x0000000000000004
-#define NG_HCI_EVMSK_CON_REQ			0x0000000000000008
-#define NG_HCI_EVMSK_DISCON_COMPL		0x0000000000000010
-#define NG_HCI_EVMSK_AUTH_COMPL			0x0000000000000020
-#define NG_HCI_EVMSK_REMOTE_NAME_REQ_COMPL	0x0000000000000040
-#define NG_HCI_EVMSK_ENCRYPTION_CHANGE		0x0000000000000080
-#define NG_HCI_EVMSK_CHANGE_CON_LINK_KEY_COMPL	0x0000000000000100
-#define NG_HCI_EVMSK_MASTER_LINK_KEY_COMPL	0x0000000000000200
-#define NG_HCI_EVMSK_READ_REMOTE_FEATURES_COMPL	0x0000000000000400
-#define NG_HCI_EVMSK_READ_REMOTE_VER_INFO_COMPL	0x0000000000000800
-#define NG_HCI_EVMSK_QOS_SETUP_COMPL		0x0000000000001000
-#define NG_HCI_EVMSK_COMMAND_COMPL		0x0000000000002000
-#define NG_HCI_EVMSK_COMMAND_STATUS		0x0000000000004000
-#define NG_HCI_EVMSK_HARDWARE_ERROR		0x0000000000008000
-#define NG_HCI_EVMSK_FLUSH_OCCUR		0x0000000000010000
-#define NG_HCI_EVMSK_ROLE_CHANGE		0x0000000000020000
-#define NG_HCI_EVMSK_NUM_COMPL_PKTS		0x0000000000040000
-#define NG_HCI_EVMSK_MODE_CHANGE		0x0000000000080000
-#define NG_HCI_EVMSK_RETURN_LINK_KEYS		0x0000000000100000
-#define NG_HCI_EVMSK_PIN_CODE_REQ		0x0000000000200000
-#define NG_HCI_EVMSK_LINK_KEY_REQ		0x0000000000400000
-#define NG_HCI_EVMSK_LINK_KEY_NOTIFICATION	0x0000000000800000
-#define NG_HCI_EVMSK_LOOPBACK_COMMAND		0x0000000001000000
-#define NG_HCI_EVMSK_DATA_BUFFER_OVERFLOW	0x0000000002000000
-#define NG_HCI_EVMSK_MAX_SLOT_CHANGE		0x0000000004000000
-#define NG_HCI_EVMSK_READ_CLOCK_OFFSET_COMLETE	0x0000000008000000
-#define NG_HCI_EVMSK_CON_PKT_TYPE_CHANGED	0x0000000010000000
-#define NG_HCI_EVMSK_QOS_VIOLATION		0x0000000020000000
-#define NG_HCI_EVMSK_PAGE_SCAN_MODE_CHANGE	0x0000000040000000
-#define NG_HCI_EVMSK_PAGE_SCAN_REP_MODE_CHANGE	0x0000000080000000
-/* 0x0000000100000000 - 0x8000000000000000 - reserved for future use */
-
-/* Filter types */
-#define NG_HCI_FILTER_TYPE_NONE			0x00
-#define NG_HCI_FILTER_TYPE_INQUIRY_RESULT	0x01
-#define NG_HCI_FILTER_TYPE_CON_SETUP		0x02
-/* 0x03 - 0xFF - reserved for future use */
-
-/* Filter condition types for NG_HCI_FILTER_TYPE_INQUIRY_RESULT */
-#define NG_HCI_FILTER_COND_INQUIRY_NEW_UNIT	0x00
-#define NG_HCI_FILTER_COND_INQUIRY_UNIT_CLASS	0x01
-#define NG_HCI_FILTER_COND_INQUIRY_BDADDR	0x02
-/* 0x03 - 0xFF - reserved for future use */
-
-/* Filter condition types for NG_HCI_FILTER_TYPE_CON_SETUP */
-#define NG_HCI_FILTER_COND_CON_ANY_UNIT		0x00
-#define NG_HCI_FILTER_COND_CON_UNIT_CLASS	0x01
-#define NG_HCI_FILTER_COND_CON_BDADDR		0x02
-/* 0x03 - 0xFF - reserved for future use */
-
-/* Xmit level types */
-#define NG_HCI_XMIT_LEVEL_CURRENT		0x00
-#define NG_HCI_XMIT_LEVEL_MAXIMUM		0x01
-/* 0x02 - 0xFF - reserved for future use */
-
-/* Host to Host Controller flow control */
-#define NG_HCI_H2HC_FLOW_CONTROL_NONE		0x00
-#define NG_HCI_H2HC_FLOW_CONTROL_ACL		0x01
-#define NG_HCI_H2HC_FLOW_CONTROL_SCO		0x02
-#define NG_HCI_H2HC_FLOW_CONTROL_BOTH		0x03	/* ACL and SCO */
-/* 0x04 - 0xFF - reserved future use */
-
-/* Country codes */
-#define NG_HCI_COUNTRY_CODE_NAM_EUR_JP		0x00
-#define NG_HCI_COUNTRY_CODE_FRANCE		0x01
-/* 0x02 - 0xFF - reserved future use */
-
-/* Loopback modes */
-#define NG_HCI_LOOPBACK_NONE			0x00
-#define NG_HCI_LOOPBACK_LOCAL			0x01
-#define NG_HCI_LOOPBACK_REMOTE			0x02
-/* 0x03 - 0xFF - reserved future use */
-
-/**************************************************************************
- **************************************************************************
- **                 Link level defines, headers and types
- **************************************************************************
- **************************************************************************/
-
-/* 
- * Macro(s) to combine OpCode and extract OGF (OpCode Group Field) 
- * and OCF (OpCode Command Field) from OpCode.
- */
-
-#define NG_HCI_OPCODE(gf,cf)		((((gf) & 0x3f) << 10) | ((cf) & 0x3ff))
-#define NG_HCI_OCF(op)			((op) & 0x3ff)
-#define NG_HCI_OGF(op)			(((op) >> 10) & 0x3f)
-
-/* 
- * Marco(s) to extract/combine connection handle, BC (Broadcast) and 
- * PB (Packet boundary) flags.
- */
-
-#define NG_HCI_CON_HANDLE(h)		((h) & 0x0fff)
-#define NG_HCI_PB_FLAG(h)		(((h) & 0x3000) >> 12)
-#define NG_HCI_BC_FLAG(h)		(((h) & 0xc000) >> 14)
-#define NG_HCI_MK_CON_HANDLE(h, pb, bc) \
-	(((h) & 0x0fff) | (((pb) & 3) << 12) | (((bc) & 3) << 14))
-
-/* PB flag values */
-					/* 00 - reserved for future use */
-#define	NG_HCI_PACKET_FRAGMENT		0x1 
-#define	NG_HCI_PACKET_START		0x2
-					/* 11 - reserved for future use */
-
-/* BC flag values */
-#define NG_HCI_POINT2POINT		0x0 /* only Host controller to Host */
-#define NG_HCI_BROADCAST_ACTIVE		0x1 /* both directions */
-#define NG_HCI_BROADCAST_PICONET	0x2 /* both directions */
-					/* 11 - reserved for future use */
-
-/* HCI command packet header */
-#define NG_HCI_CMD_PKT			0x01
-#define NG_HCI_CMD_PKT_SIZE		0xff /* without header */
-typedef struct {
-	u_int8_t	type;   /* MUST be 0x1 */
-	u_int16_t	opcode; /* OpCode */
-	u_int8_t	length; /* parameter(s) length in bytes */
-} __attribute__ ((packed)) ng_hci_cmd_pkt_t;
-
-/* ACL data packet header */
-#define NG_HCI_ACL_DATA_PKT		0x02
-#define NG_HCI_ACL_PKT_SIZE		0xffff /* without header */
-typedef struct {
-	u_int8_t	type;        /* MUST be 0x2 */
-	u_int16_t	con_handle;  /* connection handle + PB + BC flags */
-	u_int16_t	length;      /* payload length in bytes */
-} __attribute__ ((packed)) ng_hci_acldata_pkt_t;
-
-/* SCO data packet header */
-#define NG_HCI_SCO_DATA_PKT		0x03
-#define NG_HCI_SCO_PKT_SIZE		0xff /* without header */
-typedef struct {
-	u_int8_t	type;       /* MUST be 0x3 */
-	u_int16_t	con_handle; /* connection handle + reserved bits */
-	u_int8_t	length;     /* payload length in bytes */
-} __attribute__ ((packed)) ng_hci_scodata_pkt_t;
-
-/* HCI event packet header */
-#define NG_HCI_EVENT_PKT		0x04
-#define NG_HCI_EVENT_PKT_SIZE		0xff /* without header */
-typedef struct {
-	u_int8_t	type;   /* MUST be 0x4 */
-	u_int8_t	event;  /* event */
-	u_int8_t	length; /* parameter(s) length in bytes */
-} __attribute__ ((packed)) ng_hci_event_pkt_t;
-
-/* Bluetooth unit address */
-typedef struct {
-	u_int8_t	b[NG_HCI_BDADDR_SIZE];
-} __attribute__ ((packed)) bdaddr_t;
-typedef bdaddr_t *	bdaddr_p;
-
-/* Any BD_ADDR. Note: This is actually 7 bytes (count '\0' terminator) */
-#define NG_HCI_BDADDR_ANY	((bdaddr_p) "\000\000\000\000\000\000")
-
-/* HCI status return parameter */
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-} __attribute__ ((packed)) ng_hci_status_rp;
-
-/**************************************************************************
- **************************************************************************
- **        Upper layer protocol interface. LP_xxx event parameters
- **************************************************************************
- **************************************************************************/
-
-/* Connection Request Event */
-#define NGM_HCI_LP_CON_REQ			1  /* Upper -> HCI */
-typedef struct {
-	u_int16_t	link_type; /* type of connection */
-	bdaddr_t	bdaddr;    /* remote unit address */
-} ng_hci_lp_con_req_ep;
-
-/*
- * XXX XXX XXX
- *
- * NOTE: This request is not defined by Bluetooth specification, 
- * but i find it useful :)
- */
-#define NGM_HCI_LP_DISCON_REQ			2 /* Upper -> HCI */
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	reason;	    /* reason to disconnect (only low byte) */
-} ng_hci_lp_discon_req_ep;
-
-/* Connection Confirmation Event */
-#define NGM_HCI_LP_CON_CFM			3  /* HCI -> Upper */
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int8_t	link_type;  /* link type */
-	u_int16_t	con_handle; /* con_handle */
-	bdaddr_t	bdaddr;     /* remote unit address */
-} ng_hci_lp_con_cfm_ep;
-
-/* Connection Indication Event */
-#define NGM_HCI_LP_CON_IND			4  /* HCI -> Upper */
-typedef struct {
-	u_int8_t	link_type;                 /* link type */
-	u_int8_t	uclass[NG_HCI_CLASS_SIZE]; /* unit class */
-	bdaddr_t	bdaddr;                    /* remote unit address */
-} ng_hci_lp_con_ind_ep;
-
-/* Connection Response Event */
-#define NGM_HCI_LP_CON_RSP			5  /* Upper -> HCI */
-typedef struct {
-	u_int8_t	status;    /* 0x00 - accept connection */
-	u_int8_t	link_type; /* link type */
-	bdaddr_t	bdaddr;    /* remote unit address */
-} ng_hci_lp_con_rsp_ep;
-
-/* Disconnection Indication Event */
-#define NGM_HCI_LP_DISCON_IND			6  /* HCI -> Upper */
-typedef struct {
-	u_int8_t	reason;     /* reason to disconnect (only low byte) */
-	u_int8_t	link_type;  /* link type */
-	u_int16_t	con_handle; /* connection handle */
-} ng_hci_lp_discon_ind_ep;
-
-/* QoS Setup Request Event */
-#define NGM_HCI_LP_QOS_REQ			7  /* Upper -> HCI */
-typedef struct {
-	u_int16_t	con_handle;      /* connection handle */
-	u_int8_t	flags;           /* reserved */
-	u_int8_t	service_type;    /* service type */
-	uint32_t	token_rate;      /* bytes/sec */
-	uint32_t	peak_bandwidth;  /* bytes/sec */
-	uint32_t	latency;         /* msec */
-	uint32_t	delay_variation; /* msec */
-} ng_hci_lp_qos_req_ep;
-
-/* QoS Conformition Event */
-#define NGM_HCI_LP_QOS_CFM			8  /* HCI -> Upper */
-typedef struct {
-	u_int16_t	status;          /* 0x00 - success  (only low byte) */
-	u_int16_t	con_handle;      /* connection handle */
-} ng_hci_lp_qos_cfm_ep;
-
-/* QoS Violation Indication Event */
-#define NGM_HCI_LP_QOS_IND			9  /* HCI -> Upper */
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} ng_hci_lp_qos_ind_ep;
-
-/**************************************************************************
- **************************************************************************
- **                    HCI node command/event parameters
- **************************************************************************
- **************************************************************************/
-
-/* Debug levels */
-#define NG_HCI_ALERT_LEVEL		1
-#define NG_HCI_ERR_LEVEL		2
-#define NG_HCI_WARN_LEVEL		3
-#define NG_HCI_INFO_LEVEL		4
-
-/* Unit states */
-#define NG_HCI_UNIT_CONNECTED		(1 << 0)
-#define NG_HCI_UNIT_INITED		(1 << 1)
-#define NG_HCI_UNIT_READY	(NG_HCI_UNIT_CONNECTED|NG_HCI_UNIT_INITED)
-#define NG_HCI_UNIT_COMMAND_PENDING	(1 << 2)
-
-/* Connection state */
-#define NG_HCI_CON_CLOSED		0 /* connection closed */
-#define NG_HCI_CON_W4_LP_CON_RSP	1 /* wait for LP_ConnectRsp */
-#define NG_HCI_CON_W4_CONN_COMPLETE	2 /* wait for Connection_Complete evt */
-#define NG_HCI_CON_OPEN			3 /* connection open */
-
-/* Get HCI node (unit) state (see states above) */
-#define NGM_HCI_NODE_GET_STATE			100  /* HCI -> User */
-typedef u_int16_t	ng_hci_node_state_ep;
-
-/* Turn on "inited" bit */
-#define NGM_HCI_NODE_INIT			101 /* User -> HCI */
-/* No parameters */
-
-/* Get/Set node debug level (see debug levels above) */
-#define NGM_HCI_NODE_GET_DEBUG			102 /* HCI -> User */
-#define NGM_HCI_NODE_SET_DEBUG			103 /* User -> HCI */
-typedef u_int16_t	ng_hci_node_debug_ep;
-
-/* Get node buffer info */
-#define NGM_HCI_NODE_GET_BUFFER			104 /* HCI -> User */
-typedef struct {
-	u_int8_t	cmd_free; /* number of free command packets */
-	u_int8_t	sco_size; /* max. size of SCO packet */
-	u_int16_t	sco_pkts; /* number of SCO packets */
-	u_int16_t	sco_free; /* number of free SCO packets */
-	u_int16_t	acl_size; /* max. size of ACL packet */
-	u_int16_t	acl_pkts; /* number of ACL packets */
-	u_int16_t	acl_free; /* number of free ACL packets */
-} ng_hci_node_buffer_ep;
-
-/* Get BDADDR */
-#define NGM_HCI_NODE_GET_BDADDR			105 /* HCI -> User */
-/* bdaddr_t -- BDADDR */
-
-/* Get features */
-#define NGM_HCI_NODE_GET_FEATURES		106 /* HCI -> User */
-/* features[NG_HCI_FEATURES_SIZE] -- features */
-
-#define NGM_HCI_NODE_GET_STAT			107 /* HCI -> User */
-typedef struct {
-	uint32_t	cmd_sent;   /* number of HCI commands sent */
-	uint32_t	evnt_recv;  /* number of HCI events received */
-	uint32_t	acl_recv;   /* number of ACL packets received */
-	uint32_t	acl_sent;   /* number of ACL packets sent */
-	uint32_t	sco_recv;   /* number of SCO packets received */
-	uint32_t	sco_sent;   /* number of SCO packets sent */
-	uint32_t	bytes_recv; /* total number of bytes received */
-	uint32_t	bytes_sent; /* total number of bytes sent */
-} ng_hci_node_stat_ep;
-
-#define NGM_HCI_NODE_RESET_STAT			108 /* User -> HCI */
-/* No parameters */
-
-#define NGM_HCI_NODE_FLUSH_NEIGHBOR_CACHE	109 /* User -> HCI */
-
-#define NGM_HCI_NODE_GET_NEIGHBOR_CACHE		110 /* HCI -> User */
-typedef struct {
-	uint32_t	num_entries;	/* number of entries */
-} ng_hci_node_get_neighbor_cache_ep;
-
-typedef struct {
-	u_int16_t	page_scan_rep_mode;             /* page rep scan mode */
-	u_int16_t	page_scan_mode;                 /* page scan mode */
-	u_int16_t	clock_offset;                   /* clock offset */
-	bdaddr_t	bdaddr;                         /* bdaddr */
-	u_int8_t	features[NG_HCI_FEATURES_SIZE]; /* features */
-} ng_hci_node_neighbor_cache_entry_ep;
-
-#define NG_HCI_MAX_NEIGHBOR_NUM \
-	((0xffff - sizeof(ng_hci_node_get_neighbor_cache_ep))/sizeof(ng_hci_node_neighbor_cache_entry_ep))
-
-#define NGM_HCI_NODE_GET_CON_LIST		111 /* HCI -> User */
-typedef struct {
-	uint32_t	num_connections; /* number of connections */
-} ng_hci_node_con_list_ep;
-
-typedef struct {
-	u_int8_t	link_type;       /* ACL or SCO */
-	u_int8_t	encryption_mode; /* none, p2p, ... */
-	u_int8_t	mode;            /* ACTIVE, HOLD ... */
-	u_int8_t	role;            /* MASTER/SLAVE */
-	u_int16_t	state;           /* connection state */
-	u_int16_t	reserved;        /* place holder */
-	u_int16_t	pending;         /* number of pending packets */
-	u_int16_t	queue_len;       /* number of packets in queue */
-	u_int16_t	con_handle;      /* connection handle */
-	bdaddr_t	bdaddr;          /* remote bdaddr */
-} ng_hci_node_con_ep;
-
-#define NG_HCI_MAX_CON_NUM \
-	((0xffff - sizeof(ng_hci_node_con_list_ep))/sizeof(ng_hci_node_con_ep))
-
-#define NGM_HCI_NODE_UP				112 /* HCI -> Upper */
-typedef struct {
-	u_int16_t	pkt_size; /* max. ACL/SCO packet size (w/out header) */
-	u_int16_t	num_pkts; /* ACL/SCO packet queue size */
-	u_int16_t	reserved; /* place holder */
-	bdaddr_t	bdaddr;	  /* bdaddr */
-} ng_hci_node_up_ep;
-
-#define NGM_HCI_SYNC_CON_QUEUE			113 /* HCI -> Upper */
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	completed;  /* number of completed packets */
-} ng_hci_sync_con_queue_ep;
-
-#define NGM_HCI_NODE_GET_LINK_POLICY_SETTINGS_MASK	114 /* HCI -> User */
-#define NGM_HCI_NODE_SET_LINK_POLICY_SETTINGS_MASK	115 /* User -> HCI */
-typedef u_int16_t	ng_hci_node_link_policy_mask_ep;
-
-#define NGM_HCI_NODE_GET_PACKET_MASK		116 /* HCI -> User */
-#define NGM_HCI_NODE_SET_PACKET_MASK		117 /* User -> HCI */
-typedef u_int16_t	ng_hci_node_packet_mask_ep;
-
-#define NGM_HCI_NODE_GET_ROLE_SWITCH		118 /* HCI -> User */
-#define NGM_HCI_NODE_SET_ROLE_SWITCH		119 /* User -> HCI */
-typedef u_int16_t	ng_hci_node_role_switch_ep;
-
-#define	NGM_HCI_NODE_LIST_NAMES			200 /* HCI -> User */
-
-/**************************************************************************
- **************************************************************************
- **             Link control commands and return parameters
- **************************************************************************
- **************************************************************************/
-
-#define NG_HCI_OGF_LINK_CONTROL			0x01 /* OpCode Group Field */
-
-#define NG_HCI_OCF_INQUIRY			0x0001
-typedef struct {
-	u_int8_t	lap[NG_HCI_LAP_SIZE]; /* LAP */
-	u_int8_t	inquiry_length; /* (N x 1.28) sec */
-	u_int8_t	num_responses;  /* Max. # of responses before halted */
-} __attribute__ ((packed)) ng_hci_inquiry_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_INQUIRY_CANCEL		0x0002
-/* No command parameter(s) */
-typedef ng_hci_status_rp	ng_hci_inquiry_cancel_rp;
-
-#define NG_HCI_OCF_PERIODIC_INQUIRY		0x0003
-typedef struct {
-	u_int16_t	max_period_length; /* Max. and min. amount of time */
-	u_int16_t	min_period_length; /* between consecutive inquiries */
-	u_int8_t	lap[NG_HCI_LAP_SIZE]; /* LAP */
-	u_int8_t	inquiry_length;    /* (inquiry_length * 1.28) sec */
-	u_int8_t	num_responses;     /* Max. # of responses */
-} __attribute__ ((packed)) ng_hci_periodic_inquiry_cp;
-
-typedef ng_hci_status_rp	ng_hci_periodic_inquiry_rp;
-	
-#define NG_HCI_OCF_EXIT_PERIODIC_INQUIRY	0x0004
-/* No command parameter(s) */
-typedef ng_hci_status_rp	ng_hci_exit_periodic_inquiry_rp;
-
-#define NG_HCI_OCF_CREATE_CON			0x0005
-typedef struct {
-	bdaddr_t	bdaddr;             /* destination address */
-	u_int16_t	pkt_type;           /* packet type */
-	u_int8_t	page_scan_rep_mode; /* page scan repetition mode */
-	u_int8_t	page_scan_mode;     /* page scan mode */
-	u_int16_t	clock_offset;       /* clock offset */
-	u_int8_t	accept_role_switch; /* accept role switch? 0x00 - no */
-} __attribute__ ((packed)) ng_hci_create_con_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_DISCON			0x0006
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-	u_int8_t	reason;     /* reason to disconnect */
-} __attribute__ ((packed)) ng_hci_discon_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_ADD_SCO_CON			0x0007
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	pkt_type;   /* packet type */
-} __attribute__ ((packed)) ng_hci_add_sco_con_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_ACCEPT_CON			0x0009
-typedef struct {
-	bdaddr_t	bdaddr; /* address of unit to be connected */
-	u_int8_t	role;   /* connection role */
-} __attribute__ ((packed)) ng_hci_accept_con_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_REJECT_CON			0x000a
-typedef struct {
-	bdaddr_t	bdaddr; /* remote address */
-	u_int8_t	reason; /* reason to reject */
-} __attribute__ ((packed)) ng_hci_reject_con_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_LINK_KEY_REP			0x000b
-typedef struct {
-	bdaddr_t	bdaddr;               /* remote address */
-	u_int8_t	key[NG_HCI_KEY_SIZE]; /* key */
-} __attribute__ ((packed)) ng_hci_link_key_rep_cp;
-
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-	bdaddr_t	bdaddr; /* unit address */
-} __attribute__ ((packed)) ng_hci_link_key_rep_rp;
-
-#define NG_HCI_OCF_LINK_KEY_NEG_REP		0x000c
-typedef struct {
-	bdaddr_t	bdaddr; /* remote address */
-} __attribute__ ((packed)) ng_hci_link_key_neg_rep_cp;
-
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-	bdaddr_t	bdaddr; /* unit address */
-} __attribute__ ((packed)) ng_hci_link_key_neg_rep_rp;
-
-#define NG_HCI_OCF_PIN_CODE_REP			0x000d
-typedef struct {
-	bdaddr_t	bdaddr;               /* remote address */
-	u_int8_t	pin_size;             /* pin code length (in bytes) */
-	u_int8_t	pin[NG_HCI_PIN_SIZE]; /* pin code */
-} __attribute__ ((packed)) ng_hci_pin_code_rep_cp;
-
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-	bdaddr_t	bdaddr; /* unit address */
-} __attribute__ ((packed)) ng_hci_pin_code_rep_rp;
-
-#define NG_HCI_OCF_PIN_CODE_NEG_REP		0x000e
-typedef struct {
-	bdaddr_t	bdaddr;  /* remote address */
-} __attribute__ ((packed)) ng_hci_pin_code_neg_rep_cp;
-
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-	bdaddr_t	bdaddr; /* unit address */
-} __attribute__ ((packed)) ng_hci_pin_code_neg_rep_rp;
-
-#define NG_HCI_OCF_CHANGE_CON_PKT_TYPE		0x000f
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	pkt_type;   /* packet type */
-} __attribute__ ((packed)) ng_hci_change_con_pkt_type_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_AUTH_REQ			0x0011
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_auth_req_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_SET_CON_ENCRYPTION		0x0013
-typedef struct {
-	u_int16_t	con_handle;        /* connection handle */
-	u_int8_t	encryption_enable; /* 0x00 - disable, 0x01 - enable */
-} __attribute__ ((packed)) ng_hci_set_con_encryption_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_CHANGE_CON_LINK_KEY		0x0015
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_change_con_link_key_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_MASTER_LINK_KEY		0x0017
-typedef struct {
-	u_int8_t	key_flag; /* key flag */
-} __attribute__ ((packed)) ng_hci_master_link_key_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_REMOTE_NAME_REQ		0x0019
-typedef struct {
-	bdaddr_t	bdaddr;             /* remote address */
-	u_int8_t	page_scan_rep_mode; /* page scan repetition mode */
-	u_int8_t	page_scan_mode;     /* page scan mode */
-	u_int16_t	clock_offset;       /* clock offset */
-} __attribute__ ((packed)) ng_hci_remote_name_req_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_READ_REMOTE_FEATURES		0x001b
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_read_remote_features_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_READ_REMOTE_VER_INFO		0x001d
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_read_remote_ver_info_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_READ_CLOCK_OFFSET		 0x001f
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_read_clock_offset_cp;
-/* No return parameter(s) */
-
-/**************************************************************************
- **************************************************************************
- **        Link policy commands and return parameters
- **************************************************************************
- **************************************************************************/
-
-#define NG_HCI_OGF_LINK_POLICY			0x02 /* OpCode Group Field */
-
-#define NG_HCI_OCF_HOLD_MODE			0x0001
-typedef struct {
-	u_int16_t	con_handle;   /* connection handle */
-	u_int16_t	max_interval; /* (max_interval * 0.625) msec */
-	u_int16_t	min_interval; /* (max_interval * 0.625) msec */
-} __attribute__ ((packed)) ng_hci_hold_mode_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_SNIFF_MODE			0x0003
-typedef struct {
-	u_int16_t	con_handle;   /* connection handle */
-	u_int16_t	max_interval; /* (max_interval * 0.625) msec */
-	u_int16_t	min_interval; /* (max_interval * 0.625) msec */
-	u_int16_t	attempt;      /* (2 * attempt - 1) * 0.625 msec */
-	u_int16_t	timeout;      /* (2 * attempt - 1) * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_sniff_mode_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_EXIT_SNIFF_MODE		0x0004
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_exit_sniff_mode_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_PARK_MODE			0x0005
-typedef struct {
-	u_int16_t	con_handle;   /* connection handle */
-	u_int16_t	max_interval; /* (max_interval * 0.625) msec */
-	u_int16_t	min_interval; /* (max_interval * 0.625) msec */
-} __attribute__ ((packed)) ng_hci_park_mode_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_EXIT_PARK_MODE		0x0006
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_exit_park_mode_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_QOS_SETUP			0x0007
-typedef struct {
-	u_int16_t	con_handle;      /* connection handle */
-	u_int8_t	flags;           /* reserved for future use */
-	u_int8_t	service_type;    /* service type */
-	uint32_t	token_rate;      /* bytes per second */
-	uint32_t	peak_bandwidth;  /* bytes per second */
-	uint32_t	latency;         /* microseconds */
-	uint32_t	delay_variation; /* microseconds */
-} __attribute__ ((packed)) ng_hci_qos_setup_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_ROLE_DISCOVERY		0x0009
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_role_discovery_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	u_int8_t	role;       /* role for the connection handle */
-} __attribute__ ((packed)) ng_hci_role_discovery_rp;
-
-#define NG_HCI_OCF_SWITCH_ROLE			0x000b
-typedef struct {
-	bdaddr_t	bdaddr; /* remote address */
-	u_int8_t	role;   /* new local role */
-} __attribute__ ((packed)) ng_hci_switch_role_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_READ_LINK_POLICY_SETTINGS	0x000c
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_read_link_policy_settings_cp;
-	
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	settings;   /* link policy settings */
-} __attribute__ ((packed)) ng_hci_read_link_policy_settings_rp;
-
-#define NG_HCI_OCF_WRITE_LINK_POLICY_SETTINGS	0x000d
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	settings;   /* link policy settings */
-} __attribute__ ((packed)) ng_hci_write_link_policy_settings_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_write_link_policy_settings_rp;
-
-/**************************************************************************
- **************************************************************************
- **   Host controller and baseband commands and return parameters 
- **************************************************************************
- **************************************************************************/
-
-#define NG_HCI_OGF_HC_BASEBAND			0x03 /* OpCode Group Field */
-
-#define NG_HCI_OCF_SET_EVENT_MASK		0x0001
-typedef struct {
-	u_int8_t	event_mask[NG_HCI_EVENT_MASK_SIZE]; /* event_mask */
-} __attribute__ ((packed)) ng_hci_set_event_mask_cp;
-
-typedef ng_hci_status_rp	ng_hci_set_event_mask_rp;
-
-#define NG_HCI_OCF_RESET			0x0003
-/* No command parameter(s) */
-typedef ng_hci_status_rp	ng_hci_reset_rp;
-
-#define NG_HCI_OCF_SET_EVENT_FILTER		0x0005
-typedef struct {
-	u_int8_t	filter_type;           /* filter type */
-	u_int8_t	filter_condition_type; /* filter condition type */
-	u_int8_t	condition[0];          /* conditions - variable size */
-} __attribute__ ((packed)) ng_hci_set_event_filter_cp;
-
-typedef ng_hci_status_rp	ng_hci_set_event_filter_rp;
-
-#define NG_HCI_OCF_FLUSH			0x0008
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_flush_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_flush_rp;
-
-#define NG_HCI_OCF_READ_PIN_TYPE		0x0009
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;   /* 0x00 - success */
-	u_int8_t	pin_type; /* PIN type */
-} __attribute__ ((packed)) ng_hci_read_pin_type_rp;
-
-#define NG_HCI_OCF_WRITE_PIN_TYPE		0x000a
-typedef struct {
-	u_int8_t	pin_type; /* PIN type */
-} __attribute__ ((packed)) ng_hci_write_pin_type_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_pin_type_rp;
-
-#define NG_HCI_OCF_CREATE_NEW_UNIT_KEY		0x000b
-/* No command parameter(s) */
-typedef ng_hci_status_rp	ng_hci_create_new_unit_key_rp;
-
-#define NG_HCI_OCF_READ_STORED_LINK_KEY		0x000d
-typedef struct {
-	bdaddr_t	bdaddr;   /* address */
-	u_int8_t	read_all; /* read all keys? 0x01 - yes */
-} __attribute__ ((packed)) ng_hci_read_stored_link_key_cp;
-
-typedef struct {
-	u_int8_t	status;        /* 0x00 - success */
-	u_int16_t	max_num_keys;  /* Max. number of keys */
-	u_int16_t	num_keys_read; /* Number of stored keys */
-} __attribute__ ((packed)) ng_hci_read_stored_link_key_rp;
-
-#define NG_HCI_OCF_WRITE_STORED_LINK_KEY	0x0011
-typedef struct {
-	u_int8_t	num_keys_write; /* # of keys to write */
-/* these are repeated "num_keys_write" times 
-	bdaddr_t	bdaddr;                --- remote address(es)
-	u_int8_t	key[NG_HCI_KEY_SIZE];  --- key(s) */
-} __attribute__ ((packed)) ng_hci_write_stored_link_key_cp;
-
-typedef struct {
-	u_int8_t	status;           /* 0x00 - success */
-	u_int8_t	num_keys_written; /* # of keys successfully written */
-} __attribute__ ((packed)) ng_hci_write_stored_link_key_rp;
-
-#define NG_HCI_OCF_DELETE_STORED_LINK_KEY	0x0012
-typedef struct {
-	bdaddr_t	bdaddr;     /* address */
-	u_int8_t	delete_all; /* delete all keys? 0x01 - yes */
-} __attribute__ ((packed)) ng_hci_delete_stored_link_key_cp;
-
-typedef struct {
-	u_int8_t	status;           /* 0x00 - success */
-	u_int16_t	num_keys_deleted; /* Number of keys deleted */
-} __attribute__ ((packed)) ng_hci_delete_stored_link_key_rp;
-
-#define NG_HCI_OCF_CHANGE_LOCAL_NAME		0x0013
-typedef struct {
-	char		name[NG_HCI_UNIT_NAME_SIZE]; /* new unit name */
-} __attribute__ ((packed)) ng_hci_change_local_name_cp;
-
-typedef ng_hci_status_rp	ng_hci_change_local_name_rp;
-
-#define NG_HCI_OCF_READ_LOCAL_NAME		0x0014
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;  /* 0x00 - success */
-	char		name[NG_HCI_UNIT_NAME_SIZE]; /* unit name */
-} __attribute__ ((packed)) ng_hci_read_local_name_rp;
-
-#define NG_HCI_OCF_READ_CON_ACCEPT_TIMO		0x0015
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;  /* 0x00 - success */
-	u_int16_t	timeout; /* (timeout * 0.625) msec */
-} __attribute__ ((packed)) ng_hci_read_con_accept_timo_rp;
-
-#define NG_HCI_OCF_WRITE_CON_ACCEPT_TIMO	0x0016
-typedef struct {
-	u_int16_t	timeout; /* (timeout * 0.625) msec */
-} __attribute__ ((packed)) ng_hci_write_con_accept_timo_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_con_accept_timo_rp;
-
-#define NG_HCI_OCF_READ_PAGE_TIMO		0x0017
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;  /* 0x00 - success */
-	u_int16_t	timeout; /* (timeout * 0.625) msec */
-} __attribute__ ((packed)) ng_hci_read_page_timo_rp;
-
-#define NG_HCI_OCF_WRITE_PAGE_TIMO		0x0018
-typedef struct {
-	u_int16_t	timeout; /* (timeout * 0.625) msec */
-} __attribute__ ((packed)) ng_hci_write_page_timo_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_page_timo_rp;
-
-#define NG_HCI_OCF_READ_SCAN_ENABLE		0x0019
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;      /* 0x00 - success */
-	u_int8_t	scan_enable; /* Scan enable */
-} __attribute__ ((packed)) ng_hci_read_scan_enable_rp;
-
-#define NG_HCI_OCF_WRITE_SCAN_ENABLE		0x001a
-typedef struct {
-	u_int8_t	scan_enable; /* Scan enable */
-} __attribute__ ((packed)) ng_hci_write_scan_enable_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_scan_enable_rp;
-
-#define NG_HCI_OCF_READ_PAGE_SCAN_ACTIVITY	0x001b
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;             /* 0x00 - success */
-	u_int16_t	page_scan_interval; /* interval * 0.625 msec */
-	u_int16_t	page_scan_window;   /* window * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_read_page_scan_activity_rp;
-
-#define NG_HCI_OCF_WRITE_PAGE_SCAN_ACTIVITY	0x001c
-typedef struct {
-	u_int16_t	page_scan_interval; /* interval * 0.625 msec */
-	u_int16_t	page_scan_window;   /* window * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_write_page_scan_activity_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_page_scan_activity_rp;
-
-#define NG_HCI_OCF_READ_INQUIRY_SCAN_ACTIVITY	0x001d
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;                /* 0x00 - success */
-	u_int16_t	inquiry_scan_interval; /* interval * 0.625 msec */
-	u_int16_t	inquiry_scan_window;   /* window * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_read_inquiry_scan_activity_rp;
-
-#define NG_HCI_OCF_WRITE_INQUIRY_SCAN_ACTIVITY	0x001e
-typedef struct {
-	u_int16_t	inquiry_scan_interval; /* interval * 0.625 msec */
-	u_int16_t	inquiry_scan_window;   /* window * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_write_inquiry_scan_activity_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_inquiry_scan_activity_rp;
-
-#define NG_HCI_OCF_READ_AUTH_ENABLE		0x001f
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;      /* 0x00 - success */
-	u_int8_t	auth_enable; /* 0x01 - enabled */
-} __attribute__ ((packed)) ng_hci_read_auth_enable_rp;
-
-#define NG_HCI_OCF_WRITE_AUTH_ENABLE		0x0020
-typedef struct {
-	u_int8_t	auth_enable; /* 0x01 - enabled */
-} __attribute__ ((packed)) ng_hci_write_auth_enable_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_auth_enable_rp;
-
-#define NG_HCI_OCF_READ_ENCRYPTION_MODE		0x0021
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;          /* 0x00 - success */
-	u_int8_t	encryption_mode; /* encryption mode */
-} __attribute__ ((packed)) ng_hci_read_encryption_mode_rp;
-
-#define NG_HCI_OCF_WRITE_ENCRYPTION_MODE	0x0022
-typedef struct {
-	u_int8_t	encryption_mode; /* encryption mode */
-} __attribute__ ((packed)) ng_hci_write_encryption_mode_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_encryption_mode_rp;
-
-#define NG_HCI_OCF_READ_UNIT_CLASS		0x0023
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;                    /* 0x00 - success */
-	u_int8_t	uclass[NG_HCI_CLASS_SIZE]; /* unit class */
-} __attribute__ ((packed)) ng_hci_read_unit_class_rp;
-
-#define NG_HCI_OCF_WRITE_UNIT_CLASS		0x0024
-typedef struct {
-	u_int8_t	uclass[NG_HCI_CLASS_SIZE]; /* unit class */
-} __attribute__ ((packed)) ng_hci_write_unit_class_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_unit_class_rp;
-
-#define NG_HCI_OCF_READ_VOICE_SETTINGS		0x0025
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;   /* 0x00 - success */
-	u_int16_t	settings; /* voice settings */
-} __attribute__ ((packed)) ng_hci_read_voice_settings_rp;
-
-#define NG_HCI_OCF_WRITE_VOICE_SETTINGS		0x0026
-typedef struct {
-	u_int16_t	settings; /* voice settings */
-} __attribute__ ((packed)) ng_hci_write_voice_settings_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_voice_settings_rp;
-
-#define NG_HCI_OCF_READ_AUTO_FLUSH_TIMO		0x0027
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_read_auto_flush_timo_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	timeout;    /* 0x00 - no flush, timeout * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_read_auto_flush_timo_rp;
-	
-#define NG_HCI_OCF_WRITE_AUTO_FLUSH_TIMO	0x0028
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	timeout;    /* 0x00 - no flush, timeout * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_write_auto_flush_timo_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_write_auto_flush_timo_rp;
-
-#define NG_HCI_OCF_READ_NUM_BROADCAST_RETRANS	0x0029
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;  /* 0x00 - success */
-	u_int8_t	counter; /* number of broadcast retransmissions */
-} __attribute__ ((packed)) ng_hci_read_num_broadcast_retrans_rp;
-
-#define NG_HCI_OCF_WRITE_NUM_BROADCAST_RETRANS	0x002a
-typedef struct {
-	u_int8_t	counter; /* number of broadcast retransmissions */
-} __attribute__ ((packed)) ng_hci_write_num_broadcast_retrans_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_num_broadcast_retrans_rp;
-
-#define NG_HCI_OCF_READ_HOLD_MODE_ACTIVITY	0x002b
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;             /* 0x00 - success */
-	u_int8_t	hold_mode_activity; /* Hold mode activities */
-} __attribute__ ((packed)) ng_hci_read_hold_mode_activity_rp;
-
-#define NG_HCI_OCF_WRITE_HOLD_MODE_ACTIVITY	0x002c
-typedef struct {
-	u_int8_t	hold_mode_activity; /* Hold mode activities */
-} __attribute__ ((packed)) ng_hci_write_hold_mode_activity_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_hold_mode_activity_rp;
-
-#define NG_HCI_OCF_READ_XMIT_LEVEL		0x002d
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-	u_int8_t	type;       /* Xmit level type */
-} __attribute__ ((packed)) ng_hci_read_xmit_level_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	char		level;      /* -30 <= level <= 30 dBm */
-} __attribute__ ((packed)) ng_hci_read_xmit_level_rp;
-
-#define NG_HCI_OCF_READ_SCO_FLOW_CONTROL	0x002e
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;       /* 0x00 - success */
-	u_int8_t	flow_control; /* 0x00 - disabled */
-} __attribute__ ((packed)) ng_hci_read_sco_flow_control_rp;
-
-#define NG_HCI_OCF_WRITE_SCO_FLOW_CONTROL	0x002f
-typedef struct {
-	u_int8_t	flow_control; /* 0x00 - disabled */
-} __attribute__ ((packed)) ng_hci_write_sco_flow_control_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_sco_flow_control_rp;
-
-#define NG_HCI_OCF_H2HC_FLOW_CONTROL		0x0031
-typedef struct {
-	u_int8_t	h2hc_flow; /* Host to Host controller flow control */
-} __attribute__ ((packed)) ng_hci_h2hc_flow_control_cp;
-
-typedef ng_hci_status_rp	ng_hci_h2hc_flow_control_rp;
-
-#define NG_HCI_OCF_HOST_BUFFER_SIZE		0x0033
-typedef struct {
-	u_int16_t	max_acl_size; /* Max. size of ACL packet (bytes) */
-	u_int8_t	max_sco_size; /* Max. size of SCO packet (bytes) */
-	u_int16_t	num_acl_pkt;  /* Max. number of ACL packets */
-	u_int16_t	num_sco_pkt;  /* Max. number of SCO packets */
-} __attribute__ ((packed)) ng_hci_host_buffer_size_cp;
-
-typedef ng_hci_status_rp	ng_hci_host_buffer_size_rp;
-
-#define NG_HCI_OCF_HOST_NUM_COMPL_PKTS		0x0035
-typedef struct {
-	u_int8_t	num_con_handles; /* # of connection handles */
-/* these are repeated "num_con_handles" times
-	u_int16_t	con_handle; --- connection handle(s)
-	u_int16_t	compl_pkt;  --- # of completed packets */
-} __attribute__ ((packed)) ng_hci_host_num_compl_pkts_cp;
-/* No return parameter(s) */
-
-#define NG_HCI_OCF_READ_LINK_SUPERVISION_TIMO	0x0036
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_read_link_supervision_timo_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	timeout;    /* Link supervision timeout * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_read_link_supervision_timo_rp;
-
-#define NG_HCI_OCF_WRITE_LINK_SUPERVISION_TIMO	0x0037
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	timeout;    /* Link supervision timeout * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_write_link_supervision_timo_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_write_link_supervision_timo_rp;
-
-#define NG_HCI_OCF_READ_SUPPORTED_IAC_NUM	0x0038
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;  /* 0x00 - success */
-	u_int8_t	num_iac; /* # of supported IAC during scan */
-} __attribute__ ((packed)) ng_hci_read_supported_iac_num_rp;
-
-#define NG_HCI_OCF_READ_IAC_LAP			0x0039
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;  /* 0x00 - success */
-	u_int8_t	num_iac; /* # of IAC */
-/* these are repeated "num_iac" times 
-	u_int8_t	laps[NG_HCI_LAP_SIZE]; --- LAPs */
-} __attribute__ ((packed)) ng_hci_read_iac_lap_rp;
-
-#define NG_HCI_OCF_WRITE_IAC_LAP		0x003a
-typedef struct {
-	u_int8_t	num_iac; /* # of IAC */
-/* these are repeated "num_iac" times 
-	u_int8_t	laps[NG_HCI_LAP_SIZE]; --- LAPs */
-} __attribute__ ((packed)) ng_hci_write_iac_lap_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_iac_lap_rp;
-
-#define NG_HCI_OCF_READ_PAGE_SCAN_PERIOD	0x003b
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;                /* 0x00 - success */
-	u_int8_t	page_scan_period_mode; /* Page scan period mode */
-} __attribute__ ((packed)) ng_hci_read_page_scan_period_rp;
-
-#define NG_HCI_OCF_WRITE_PAGE_SCAN_PERIOD	0x003c
-typedef struct {
-	u_int8_t	page_scan_period_mode; /* Page scan period mode */
-} __attribute__ ((packed)) ng_hci_write_page_scan_period_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_page_scan_period_rp;
-
-#define NG_HCI_OCF_READ_PAGE_SCAN		0x003d
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status;         /* 0x00 - success */
-	u_int8_t	page_scan_mode; /* Page scan mode */
-} __attribute__ ((packed)) ng_hci_read_page_scan_rp;
-
-#define NG_HCI_OCF_WRITE_PAGE_SCAN		0x003e
-typedef struct {
-	u_int8_t	page_scan_mode; /* Page scan mode */
-} __attribute__ ((packed)) ng_hci_write_page_scan_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_page_scan_rp;
-
-/**************************************************************************
- **************************************************************************
- **           Informational commands and return parameters 
- **     All commands in this category do not accept any parameters
- **************************************************************************
- **************************************************************************/
-
-#define NG_HCI_OGF_INFO				0x04 /* OpCode Group Field */
-
-#define NG_HCI_OCF_READ_LOCAL_VER		0x0001
-typedef struct {
-	u_int8_t	status;         /* 0x00 - success */
-	u_int8_t	hci_version;    /* HCI version */
-	u_int16_t	hci_revision;   /* HCI revision */
-	u_int8_t	lmp_version;    /* LMP version */
-	u_int16_t	manufacturer;   /* Hardware manufacturer name */
-	u_int16_t	lmp_subversion; /* LMP sub-version */
-} __attribute__ ((packed)) ng_hci_read_local_ver_rp;
-
-#define NG_HCI_OCF_READ_LOCAL_FEATURES		0x0003
-typedef struct {
-	u_int8_t	status;                         /* 0x00 - success */
-	u_int8_t	features[NG_HCI_FEATURES_SIZE]; /* LMP features bitmsk*/
-} __attribute__ ((packed)) ng_hci_read_local_features_rp;
-
-#define NG_HCI_OCF_READ_BUFFER_SIZE		0x0005
-typedef struct {
-	u_int8_t	status;       /* 0x00 - success */
-	u_int16_t	max_acl_size; /* Max. size of ACL packet (bytes) */
-	u_int8_t	max_sco_size; /* Max. size of SCO packet (bytes) */
-	u_int16_t	num_acl_pkt;  /* Max. number of ACL packets */
-	u_int16_t	num_sco_pkt;  /* Max. number of SCO packets */
-} __attribute__ ((packed)) ng_hci_read_buffer_size_rp;
-
-#define NG_HCI_OCF_READ_COUNTRY_CODE		0x0007
-typedef struct {
-	u_int8_t	status;       /* 0x00 - success */
-	u_int8_t	country_code; /* 0x00 - NAM, EUR, JP; 0x01 - France */
-} __attribute__ ((packed)) ng_hci_read_country_code_rp;
-
-#define NG_HCI_OCF_READ_BDADDR			0x0009
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-	bdaddr_t	bdaddr; /* unit address */
-} __attribute__ ((packed)) ng_hci_read_bdaddr_rp;
-
-/**************************************************************************
- **************************************************************************
- **            Status commands and return parameters 
- **************************************************************************
- **************************************************************************/
-
-#define NG_HCI_OGF_STATUS			0x05 /* OpCode Group Field */
-
-#define NG_HCI_OCF_READ_FAILED_CONTACT_CNTR	0x0001
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_read_failed_contact_cntr_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	counter;    /* number of consecutive failed contacts */
-} __attribute__ ((packed)) ng_hci_read_failed_contact_cntr_rp;
-
-#define NG_HCI_OCF_RESET_FAILED_CONTACT_CNTR	0x0002
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_reset_failed_contact_cntr_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_reset_failed_contact_cntr_rp;
-
-#define NG_HCI_OCF_GET_LINK_QUALITY		0x0003
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_get_link_quality_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	u_int8_t	quality;    /* higher value means better quality */
-} __attribute__ ((packed)) ng_hci_get_link_quality_rp;
-
-#define NG_HCI_OCF_READ_RSSI			0x0005
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_read_rssi_cp;
-
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	char		rssi;       /* -127 <= rssi <= 127 dB */
-} __attribute__ ((packed)) ng_hci_read_rssi_rp;
-
-/**************************************************************************
- **************************************************************************
- **             Testing commands and return parameters 
- **************************************************************************
- **************************************************************************/
-
-#define NG_HCI_OGF_TESTING			0x06 /* OpCode Group Field */
-
-#define NG_HCI_OCF_READ_LOOPBACK_MODE		0x0001
-/* No command parameter(s) */
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-	u_int8_t	lbmode; /* loopback mode */
-} __attribute__ ((packed)) ng_hci_read_loopback_mode_rp;
-
-#define NG_HCI_OCF_WRITE_LOOPBACK_MODE		0x0002
-typedef struct {
-	u_int8_t	lbmode; /* loopback mode */
-} __attribute__ ((packed)) ng_hci_write_loopback_mode_cp;
-
-typedef ng_hci_status_rp	ng_hci_write_loopback_mode_rp;
-
-#define NG_HCI_OCF_ENABLE_UNIT_UNDER_TEST	0x0003
-/* No command parameter(s) */
-typedef ng_hci_status_rp	ng_hci_enable_unit_under_test_rp;
-
-/**************************************************************************
- **************************************************************************
- **                Special HCI OpCode group field values
- **************************************************************************
- **************************************************************************/
-
-#define NG_HCI_OGF_BT_LOGO			0x3e	
-
-#define NG_HCI_OGF_VENDOR			0x3f
-
-/**************************************************************************
- **************************************************************************
- **                         Events and event parameters
- **************************************************************************
- **************************************************************************/
-
-#define NG_HCI_EVENT_INQUIRY_COMPL		0x01
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-} __attribute__ ((packed)) ng_hci_inquiry_compl_ep;
-
-#define NG_HCI_EVENT_INQUIRY_RESULT		0x02
-typedef struct {
-	u_int8_t	num_responses;      /* number of responses */
-/*	ng_hci_inquiry_response[num_responses]   -- see below */
-} __attribute__ ((packed)) ng_hci_inquiry_result_ep;
-
-typedef struct {
-	bdaddr_t	bdaddr;                   /* unit address */
-	u_int8_t	page_scan_rep_mode;       /* page scan rep. mode */
-	u_int8_t	page_scan_period_mode;    /* page scan period mode */
-	u_int8_t	page_scan_mode;           /* page scan mode */
-	u_int8_t	uclass[NG_HCI_CLASS_SIZE];/* unit class */
-	u_int16_t	clock_offset;             /* clock offset */
-} __attribute__ ((packed)) ng_hci_inquiry_response;
-
-#define NG_HCI_EVENT_CON_COMPL			0x03
-typedef struct {
-	u_int8_t	status;          /* 0x00 - success */
-	u_int16_t	con_handle;      /* Connection handle */
-	bdaddr_t	bdaddr;          /* remote unit address */
-	u_int8_t	link_type;       /* Link type */
-	u_int8_t	encryption_mode; /* Encryption mode */
-} __attribute__ ((packed)) ng_hci_con_compl_ep;
-
-#define NG_HCI_EVENT_CON_REQ			0x04
-typedef struct {
-	bdaddr_t	bdaddr;                    /* remote unit address */
-	u_int8_t	uclass[NG_HCI_CLASS_SIZE]; /* remote unit class */
-	u_int8_t	link_type;                 /* link type */
-} __attribute__ ((packed)) ng_hci_con_req_ep;
-
-#define NG_HCI_EVENT_DISCON_COMPL		0x05
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	u_int8_t	reason;     /* reason to disconnect */
-} __attribute__ ((packed)) ng_hci_discon_compl_ep;
-
-#define NG_HCI_EVENT_AUTH_COMPL			0x06
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_auth_compl_ep;
-
-#define NG_HCI_EVENT_REMOTE_NAME_REQ_COMPL	0x7
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-	bdaddr_t	bdaddr; /* remote unit address */
-	char		name[NG_HCI_UNIT_NAME_SIZE]; /* remote unit name */
-} __attribute__ ((packed)) ng_hci_remote_name_req_compl_ep;
-
-#define NG_HCI_EVENT_ENCRYPTION_CHANGE		0x08
-typedef struct {
-	u_int8_t	status;            /* 0x00 - success */
-	u_int16_t	con_handle;        /* Connection handle */
-	u_int8_t	encryption_enable; /* 0x00 - disable */
-} __attribute__ ((packed)) ng_hci_encryption_change_ep;
-
-#define NG_HCI_EVENT_CHANGE_CON_LINK_KEY_COMPL	0x09
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* Connection handle */
-} __attribute__ ((packed)) ng_hci_change_con_link_key_compl_ep;
-
-#define NG_HCI_EVENT_MASTER_LINK_KEY_COMPL	0x0a
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* Connection handle */
-	u_int8_t	key_flag;   /* Key flag */
-} __attribute__ ((packed)) ng_hci_master_link_key_compl_ep;
-
-#define NG_HCI_EVENT_READ_REMOTE_FEATURES_COMPL	0x0b
-typedef struct {
-	u_int8_t	status;                         /* 0x00 - success */
-	u_int16_t	con_handle;                     /* Connection handle */
-	u_int8_t	features[NG_HCI_FEATURES_SIZE]; /* LMP features bitmsk*/
-} __attribute__ ((packed)) ng_hci_read_remote_features_compl_ep;
-
-#define NG_HCI_EVENT_READ_REMOTE_VER_INFO_COMPL	0x0c
-typedef struct {
-	u_int8_t	status;         /* 0x00 - success */
-	u_int16_t	con_handle;     /* Connection handle */
-	u_int8_t	lmp_version;    /* LMP version */
-	u_int16_t	manufacturer;   /* Hardware manufacturer name */
-	u_int16_t	lmp_subversion; /* LMP sub-version */
-} __attribute__ ((packed)) ng_hci_read_remote_ver_info_compl_ep;
-
-#define NG_HCI_EVENT_QOS_SETUP_COMPL		0x0d
-typedef struct {
-	u_int8_t	status;          /* 0x00 - success */
-	u_int16_t	con_handle;      /* connection handle */
-	u_int8_t	flags;           /* reserved for future use */
-	u_int8_t	service_type;    /* service type */
-	uint32_t	token_rate;      /* bytes per second */
-	uint32_t	peak_bandwidth;  /* bytes per second */
-	uint32_t	latency;         /* microseconds */
-	uint32_t	delay_variation; /* microseconds */
-} __attribute__ ((packed)) ng_hci_qos_setup_compl_ep;
-
-#define NG_HCI_EVENT_COMMAND_COMPL		0x0e
-typedef struct {
-	u_int8_t	num_cmd_pkts; /* # of HCI command packets */
-	u_int16_t	opcode;       /* command OpCode */
-	/* command return parameters (if any) */
-} __attribute__ ((packed)) ng_hci_command_compl_ep;
-
-#define NG_HCI_EVENT_COMMAND_STATUS		0x0f
-typedef struct {
-	u_int8_t	status;       /* 0x00 - pending */
-	u_int8_t	num_cmd_pkts; /* # of HCI command packets */
-	u_int16_t	opcode;       /* command OpCode */
-} __attribute__ ((packed)) ng_hci_command_status_ep;
-
-#define NG_HCI_EVENT_HARDWARE_ERROR		0x10
-typedef struct {
-	u_int8_t	hardware_code; /* hardware error code */
-} __attribute__ ((packed)) ng_hci_hardware_error_ep;
-
-#define NG_HCI_EVENT_FLUSH_OCCUR		0x11
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_flush_occur_ep;
-
-#define NG_HCI_EVENT_ROLE_CHANGE		0x12
-typedef struct {
-	u_int8_t	status; /* 0x00 - success */
-	bdaddr_t	bdaddr; /* address of remote unit */
-	u_int8_t	role;   /* new connection role */
-} __attribute__ ((packed)) ng_hci_role_change_ep;
-
-#define NG_HCI_EVENT_NUM_COMPL_PKTS		0x13
-typedef struct {
-	u_int8_t	num_con_handles; /* # of connection handles */
-/* these are repeated "num_con_handles" times 
-	u_int16_t	con_handle; --- connection handle(s)
-	u_int16_t	compl_pkt;  --- # of completed packets */
-} __attribute__ ((packed)) ng_hci_num_compl_pkts_ep;
-
-#define NG_HCI_EVENT_MODE_CHANGE		0x14
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	u_int8_t	unit_mode;  /* remote unit mode */
-	u_int16_t	interval;   /* interval * 0.625 msec */
-} __attribute__ ((packed)) ng_hci_mode_change_ep;
-
-#define NG_HCI_EVENT_RETURN_LINK_KEYS		0x15
-typedef struct {
-	u_int8_t	num_keys; /* # of keys */
-/* these are repeated "num_keys" times 
-	bdaddr_t	bdaddr;               --- remote address(es)
-	u_int8_t	key[NG_HCI_KEY_SIZE]; --- key(s) */
-} __attribute__ ((packed)) ng_hci_return_link_keys_ep;
-
-#define NG_HCI_EVENT_PIN_CODE_REQ		0x16
-typedef struct {
-	bdaddr_t	bdaddr; /* remote unit address */
-} __attribute__ ((packed)) ng_hci_pin_code_req_ep;
-
-#define NG_HCI_EVENT_LINK_KEY_REQ		0x17
-typedef struct {
-	bdaddr_t	bdaddr; /* remote unit address */
-} __attribute__ ((packed)) ng_hci_link_key_req_ep;
-
-#define NG_HCI_EVENT_LINK_KEY_NOTIFICATION	0x18
-typedef struct {
-	bdaddr_t	bdaddr;               /* remote unit address */
-	u_int8_t	key[NG_HCI_KEY_SIZE]; /* link key */
-	u_int8_t	key_type;             /* type of the key */
-} __attribute__ ((packed)) ng_hci_link_key_notification_ep;
-
-#define NG_HCI_EVENT_LOOPBACK_COMMAND		0x19
-typedef struct {
-	u_int8_t	command[0]; /* Command packet */
-} __attribute__ ((packed)) ng_hci_loopback_command_ep;
-
-#define NG_HCI_EVENT_DATA_BUFFER_OVERFLOW	0x1a
-typedef struct {
-	u_int8_t	link_type; /* Link type */
-} __attribute__ ((packed)) ng_hci_data_buffer_overflow_ep;
-
-#define NG_HCI_EVENT_MAX_SLOT_CHANGE		0x1b
-typedef struct {
-	u_int16_t	con_handle;    /* connection handle */
-	u_int8_t	lmp_max_slots; /* Max. # of slots allowed */
-} __attribute__ ((packed)) ng_hci_max_slot_change_ep;
-
-#define NG_HCI_EVENT_READ_CLOCK_OFFSET_COMPL	0x1c
-typedef struct {
-	u_int8_t	status;       /* 0x00 - success */
-	u_int16_t	con_handle;   /* Connection handle */
-	u_int16_t	clock_offset; /* Clock offset */
-} __attribute__ ((packed)) ng_hci_read_clock_offset_compl_ep;
-
-#define NG_HCI_EVENT_CON_PKT_TYPE_CHANGED	0x1d
-typedef struct {
-	u_int8_t	status;     /* 0x00 - success */
-	u_int16_t	con_handle; /* connection handle */
-	u_int16_t	pkt_type;   /* packet type */
-} __attribute__ ((packed)) ng_hci_con_pkt_type_changed_ep;
-
-#define NG_HCI_EVENT_QOS_VIOLATION		0x1e
-typedef struct {
-	u_int16_t	con_handle; /* connection handle */
-} __attribute__ ((packed)) ng_hci_qos_violation_ep;
-
-#define NG_HCI_EVENT_PAGE_SCAN_MODE_CHANGE	0x1f
-typedef struct {
-	bdaddr_t	bdaddr;         /* destination address */
-	u_int8_t	page_scan_mode; /* page scan mode */
-} __attribute__ ((packed)) ng_hci_page_scan_mode_change_ep;
-
-#define NG_HCI_EVENT_PAGE_SCAN_REP_MODE_CHANGE	0x20
-typedef struct {
-	bdaddr_t	bdaddr;             /* destination address */
-	u_int8_t	page_scan_rep_mode; /* page scan repetition mode */
-} __attribute__ ((packed)) ng_hci_page_scan_rep_mode_change_ep;
-
-#define NG_HCI_EVENT_BT_LOGO			0xfe
-
-#define NG_HCI_EVENT_VENDOR			0xff
-
-#endif /* ndef _NETGRAPH_HCI_H_ */
diff --git a/include.new/netgraph/bluetooth/include/ng_l2cap.h b/include.new/netgraph/bluetooth/include/ng_l2cap.h
deleted file mode 100644
index 4a9ceb9..0000000
--- a/include.new/netgraph/bluetooth/include/ng_l2cap.h
+++ /dev/null
@@ -1,665 +0,0 @@
-/*
- * ng_l2cap.h
- */
-
-/*-
- * Copyright (c) Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_l2cap.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_l2cap.h 149679 2005-08-31 18:13:23Z emax $
- */
-
-/*
- * This file contains everything that application needs to know about
- * Link Layer Control and Adaptation Protocol (L2CAP). All information 
- * was obtained from Bluetooth Specification Book v1.1.
- *
- * This file can be included by both kernel and userland applications.
- */
-
-#ifndef _NETGRAPH_L2CAP_H_
-#define _NETGRAPH_L2CAP_H_
-
-/**************************************************************************
- **************************************************************************
- **     Netgraph node hook name, type name and type cookie and commands
- **************************************************************************
- **************************************************************************/
-
-/* Netgraph node hook names */
-#define NG_L2CAP_HOOK_HCI		"hci"	/* HCI   <-> L2CAP */
-#define NG_L2CAP_HOOK_L2C		"l2c"	/* L2CAP <-> Upper */
-#define NG_L2CAP_HOOK_CTL		"ctl"	/* L2CAP <-> User  */ 
-
-/* Node type name and type cookie */
-#define NG_L2CAP_NODE_TYPE		"l2cap"
-#define NGM_L2CAP_COOKIE		1000774185
-
-/**************************************************************************
- **************************************************************************
- **                   Common defines and types (L2CAP)
- **************************************************************************
- **************************************************************************/
-
-/*
- * Channel IDs are assigned relative to the instance of L2CAP node, i.e.
- * relative to the unit. So the total number of channels that unit can have
- * open at the same time is 0xffff - 0x0040 = 0xffbf (65471). This number
- * does not depend on number of connections.
- */
-
-#define NG_L2CAP_NULL_CID	0x0000	/* DO NOT USE THIS CID */
-#define NG_L2CAP_SIGNAL_CID	0x0001	/* signaling channel ID */
-#define NG_L2CAP_CLT_CID	0x0002	/* connectionless channel ID */
-	/* 0x0003 - 0x003f Reserved */
-#define NG_L2CAP_FIRST_CID	0x0040	/* dynamically alloc. (start) */
-#define NG_L2CAP_LAST_CID	0xffff	/* dynamically alloc. (end) */
-
-/* L2CAP MTU */
-#define NG_L2CAP_MTU_MINIMUM		48
-#define NG_L2CAP_MTU_DEFAULT		672
-#define NG_L2CAP_MTU_MAXIMUM		0xffff
-
-/* L2CAP flush and link timeouts */
-#define NG_L2CAP_FLUSH_TIMO_DEFAULT	0xffff /* always retransmit */
-#define NG_L2CAP_LINK_TIMO_DEFAULT	0xffff
-
-/* L2CAP Command Reject reasons */
-#define NG_L2CAP_REJ_NOT_UNDERSTOOD	0x0000
-#define NG_L2CAP_REJ_MTU_EXCEEDED	0x0001
-#define NG_L2CAP_REJ_INVALID_CID	0x0002
-/* 0x0003 - 0xffff - reserved for future use */
-
-/* Protocol/Service Multioplexor (PSM) values */
-#define NG_L2CAP_PSM_ANY		0x0000	/* Any/Invalid PSM */
-#define NG_L2CAP_PSM_SDP		0x0001	/* Service Discovery Protocol */
-#define NG_L2CAP_PSM_RFCOMM		0x0003	/* RFCOMM protocol */
-#define NG_L2CAP_PSM_TCP		0x0005	/* Telephony Control Protocol */
-/* 0x0006 - 0x1000 - reserved for future use */
-
-/* L2CAP Connection response command result codes */
-#define NG_L2CAP_SUCCESS		0x0000
-#define NG_L2CAP_PENDING		0x0001
-#define NG_L2CAP_PSM_NOT_SUPPORTED	0x0002
-#define NG_L2CAP_SEQUIRY_BLOCK		0x0003
-#define NG_L2CAP_NO_RESOURCES		0x0004
-#define NG_L2CAP_TIMEOUT		0xeeee
-#define NG_L2CAP_UNKNOWN		0xffff
-/* 0x0005 - 0xffff - reserved for future use */
-
-/* L2CAP Connection response status codes */
-#define NG_L2CAP_NO_INFO		0x0000
-#define NG_L2CAP_AUTH_PENDING		0x0001
-#define NG_L2CAP_AUTZ_PENDING		0x0002
-/* 0x0003 - 0xffff - reserved for future use */
-
-/* L2CAP Configuration response result codes */
-#define NG_L2CAP_UNACCEPTABLE_PARAMS	0x0001
-#define NG_L2CAP_REJECT			0x0002
-#define NG_L2CAP_UNKNOWN_OPTION		0x0003
-/* 0x0003 - 0xffff - reserved for future use */
-
-/* L2CAP Configuration options */
-#define NG_L2CAP_OPT_CFLAG_BIT		0x0001
-#define NG_L2CAP_OPT_CFLAG(flags)	((flags) & NG_L2CAP_OPT_CFLAG_BIT)
-#define NG_L2CAP_OPT_HINT_BIT		0x80
-#define NG_L2CAP_OPT_HINT(type)		((type) & NG_L2CAP_OPT_HINT_BIT)
-#define NG_L2CAP_OPT_HINT_MASK		0x7f
-#define NG_L2CAP_OPT_MTU		0x01
-#define NG_L2CAP_OPT_MTU_SIZE		sizeof(u_int16_t)
-#define NG_L2CAP_OPT_FLUSH_TIMO		0x02
-#define NG_L2CAP_OPT_FLUSH_TIMO_SIZE	sizeof(u_int16_t)
-#define NG_L2CAP_OPT_QOS		0x03
-#define NG_L2CAP_OPT_QOS_SIZE		sizeof(ng_l2cap_flow_t)
-/* 0x4 - 0xff - reserved for future use */
-
-/* L2CAP Information request type codes */
-#define NG_L2CAP_CONNLESS_MTU		0x0001
-/* 0x0002 - 0xffff - reserved for future use */
-
-/* L2CAP Information response codes */
-#define NG_L2CAP_NOT_SUPPORTED		0x0001
-/* 0x0002 - 0xffff - reserved for future use */
-
-/* L2CAP flow control */
-typedef struct {
-	u_int8_t	flags;             /* reserved for future use */
-	u_int8_t	service_type;      /* service type */
-	uint32_t	token_rate;        /* bytes per second */
-	uint32_t	token_bucket_size; /* bytes */
-	uint32_t	peak_bandwidth;    /* bytes per second */
-	uint32_t	latency;           /* microseconds */
-	uint32_t	delay_variation;   /* microseconds */
-} __attribute__ ((packed)) ng_l2cap_flow_t;
-typedef ng_l2cap_flow_t *	ng_l2cap_flow_p;
-
-/**************************************************************************
- **************************************************************************
- **                 Link level defines, headers and types
- **************************************************************************
- **************************************************************************/
-
-/* L2CAP header */
-typedef struct {
-	u_int16_t	length;	/* payload size */
-	u_int16_t	dcid;	/* destination channel ID */
-} __attribute__ ((packed)) ng_l2cap_hdr_t;
-
-/* L2CAP ConnectionLess Traffic (CLT) (if destination cid == 0x2) */
-typedef struct {
-	u_int16_t	psm; /* Protocol/Service Multiplexor */
-} __attribute__ ((packed)) ng_l2cap_clt_hdr_t;
-
-#define NG_L2CAP_CLT_MTU_MAXIMUM \
-	(NG_L2CAP_MTU_MAXIMUM - sizeof(ng_l2cap_clt_hdr_t))
-
-/* L2CAP command header */
-typedef struct {
-	u_int8_t	code;   /* command OpCode */
-	u_int8_t	ident;  /* identifier to match request and response */
-	u_int16_t	length; /* command parameters length */
-} __attribute__ ((packed)) ng_l2cap_cmd_hdr_t;
-
-/* L2CAP Command Reject */
-#define NG_L2CAP_CMD_REJ	0x01
-typedef struct {
-	u_int16_t	reason; /* reason to reject command */
-/*	u_int8_t	data[]; -- optional data (depends on reason) */
-} __attribute__ ((packed)) ng_l2cap_cmd_rej_cp;
-
-/* CommandReject data */
-typedef union {
- 	/* NG_L2CAP_REJ_MTU_EXCEEDED */
-	struct {
-		u_int16_t	mtu; /* actual signaling MTU */
-	} __attribute__ ((packed)) mtu;
-	/* NG_L2CAP_REJ_INVALID_CID */
-	struct {
-		u_int16_t	scid; /* local CID */
-		u_int16_t	dcid; /* remote CID */
-	} __attribute__ ((packed)) cid;
-} ng_l2cap_cmd_rej_data_t;
-typedef ng_l2cap_cmd_rej_data_t * ng_l2cap_cmd_rej_data_p;
-
-/* L2CAP Connection Request */
-#define NG_L2CAP_CON_REQ	0x02
-typedef struct {
-	u_int16_t	psm;  /* Protocol/Service Multiplexor (PSM) */
-	u_int16_t	scid; /* source channel ID */
-} __attribute__ ((packed)) ng_l2cap_con_req_cp;
-
-/* L2CAP Connection Response */
-#define NG_L2CAP_CON_RSP	0x03
-typedef struct {
-	u_int16_t	dcid;   /* destination channel ID */
-	u_int16_t	scid;   /* source channel ID */
-	u_int16_t	result; /* 0x00 - success */
-	u_int16_t	status; /* more info if result != 0x00 */
-} __attribute__ ((packed)) ng_l2cap_con_rsp_cp;
-
-/* L2CAP Configuration Request */
-#define NG_L2CAP_CFG_REQ	0x04
-typedef struct {
-	u_int16_t	dcid;  /* destination channel ID */
-	u_int16_t	flags; /* flags */
-/*	u_int8_t	options[] --  options */
-} __attribute__ ((packed)) ng_l2cap_cfg_req_cp;
-
-/* L2CAP Configuration Response */
-#define NG_L2CAP_CFG_RSP	0x05
-typedef struct {
-	u_int16_t	scid;   /* source channel ID */
-	u_int16_t	flags;  /* flags */
-	u_int16_t	result; /* 0x00 - success */
-/*	u_int8_t	options[] -- options */
-} __attribute__ ((packed)) ng_l2cap_cfg_rsp_cp;
-
-/* L2CAP configuration option */
-typedef struct {
-	u_int8_t	type;
-	u_int8_t	length;
-/*	u_int8_t	value[] -- option value (depends on type) */
-} __attribute__ ((packed)) ng_l2cap_cfg_opt_t;
-typedef ng_l2cap_cfg_opt_t * ng_l2cap_cfg_opt_p;
-
-/* L2CAP configuration option value */
-typedef union {
-	u_int16_t		mtu;		/* NG_L2CAP_OPT_MTU */
-	u_int16_t		flush_timo;	/* NG_L2CAP_OPT_FLUSH_TIMO */
-	ng_l2cap_flow_t		flow;		/* NG_L2CAP_OPT_QOS */
-} ng_l2cap_cfg_opt_val_t;
-typedef ng_l2cap_cfg_opt_val_t * ng_l2cap_cfg_opt_val_p;
-
-/* L2CAP Disconnect Request */
-#define NG_L2CAP_DISCON_REQ	0x06
-typedef struct {
-	u_int16_t	dcid; /* destination channel ID */
-	u_int16_t	scid; /* source channel ID */
-} __attribute__ ((packed)) ng_l2cap_discon_req_cp;
-
-/* L2CAP Disconnect Response */
-#define NG_L2CAP_DISCON_RSP	0x07
-typedef ng_l2cap_discon_req_cp	ng_l2cap_discon_rsp_cp;
-
-/* L2CAP Echo Request */
-#define NG_L2CAP_ECHO_REQ	0x08
-/* No command parameters, only optional data */
-
-/* L2CAP Echo Response */
-#define NG_L2CAP_ECHO_RSP	0x09
-#define NG_L2CAP_MAX_ECHO_SIZE \
-	(NG_L2CAP_MTU_MAXIMUM - sizeof(ng_l2cap_cmd_hdr_t))
-/* No command parameters, only optional data */
-
-/* L2CAP Information Request */
-#define NG_L2CAP_INFO_REQ	0x0a
-typedef struct {
-	u_int16_t	type; /* requested information type */
-} __attribute__ ((packed)) ng_l2cap_info_req_cp;
-
-/* L2CAP Information Response */
-#define NG_L2CAP_INFO_RSP	0x0b
-typedef struct {
-	u_int16_t	type;   /* requested information type */
-	u_int16_t	result; /* 0x00 - success */
-/*	u_int8_t	info[]  -- info data (depends on type)
- *
- * NG_L2CAP_CONNLESS_MTU - 2 bytes connectionless MTU
- */
-} __attribute__ ((packed)) ng_l2cap_info_rsp_cp;
-
-typedef union {
- 	/* NG_L2CAP_CONNLESS_MTU */
-	struct {
-		u_int16_t	mtu;
-	} __attribute__ ((packed)) mtu;
-} ng_l2cap_info_rsp_data_t;
-typedef ng_l2cap_info_rsp_data_t *	ng_l2cap_info_rsp_data_p;
-
-/**************************************************************************
- **************************************************************************
- **        Upper layer protocol interface. L2CA_xxx messages 
- **************************************************************************
- **************************************************************************/
-
-/*
- * NOTE! NOTE! NOTE!
- *
- * Bluetooth specification says that L2CA_xxx request must block until
- * response is ready. We are not allowed to block in Netgraph, so we 
- * need to queue request and save some information that can be used 
- * later and help match request and response.
- *
- * The idea is to use "token" field from Netgraph message header. The
- * upper layer protocol _MUST_ populate "token". L2CAP will queue request
- * (using L2CAP command descriptor) and start processing. Later, when
- * response is ready or timeout has occur L2CAP layer will create new 
- * Netgraph message, set "token" and RESP flag and send the message to
- * the upper layer protocol. 
- *
- * L2CA_xxx_Ind messages _WILL_NOT_ populate "token" and _WILL_NOT_
- * set RESP flag. There is no reason for this, because they are just
- * notifications and do not require acknowlegment.
- *
- * NOTE: This is _NOT_ what NG_MKRESPONSE and NG_RESPOND_MSG do, however
- *       it is somewhat similar.
- */
-
-/* L2CA data packet header */
-typedef struct {
-	uint32_t	token;	/* token to use in L2CAP_L2CA_WRITE */
-	u_int16_t	length;	/* length of the data */
-	u_int16_t	lcid;	/* local channel ID */
-} __attribute__ ((packed)) ng_l2cap_l2ca_hdr_t;
-
-/* L2CA_Connect */
-#define NGM_L2CAP_L2CA_CON		0x80
-/* Upper -> L2CAP */
-typedef struct {
-	u_int16_t	psm;    /* Protocol/Service Multiplexor */
-	bdaddr_t	bdaddr;	/* remote unit address */
-} ng_l2cap_l2ca_con_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	lcid;   /* local channel ID */
-	u_int16_t	result; /* 0x00 - success */
-	u_int16_t	status; /* if result != 0x00 */
-} ng_l2cap_l2ca_con_op;
-
-/* L2CA_ConnectInd */
-#define NGM_L2CAP_L2CA_CON_IND		0x81
-/* L2CAP -> Upper */
-typedef struct {
-	bdaddr_t	bdaddr; /* remote unit address */
-	u_int16_t	lcid;   /* local channel ID */
-	u_int16_t	psm;    /* Procotol/Service Multiplexor */
-	u_int8_t	ident;  /* indentifier */
-	u_int8_t	unused; /* place holder */
-} ng_l2cap_l2ca_con_ind_ip;
-/* No output parameters */
-
-/* L2CA_ConnectRsp */
-#define NGM_L2CAP_L2CA_CON_RSP		0x82
-/* Upper -> L2CAP */
-typedef struct {
-	bdaddr_t	bdaddr; /* remote unit address */
-	u_int8_t	ident;  /* "ident" from L2CAP_ConnectInd event */
-	u_int8_t	unused; /* place holder */
-	u_int16_t	lcid;   /* local channel ID */
-	u_int16_t	result; /* 0x00 - success */ 
-	u_int16_t	status; /* if response != 0x00 */ 
-} ng_l2cap_l2ca_con_rsp_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	result; /* 0x00 - success */
-} ng_l2cap_l2ca_con_rsp_op;
-
-/* L2CA_Config */
-#define NGM_L2CAP_L2CA_CFG		0x83
-/* Upper -> L2CAP */
-typedef struct {
-	u_int16_t	lcid;        /* local channel ID */
-	u_int16_t	imtu;        /* receiving MTU for the local channel */
-	ng_l2cap_flow_t	oflow;       /* out flow */
-	u_int16_t	flush_timo;  /* flush timeout (msec) */
-	u_int16_t	link_timo;   /* link timeout (msec) */
-} ng_l2cap_l2ca_cfg_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	result;      /* 0x00 - success */
-	u_int16_t	imtu;        /* sending MTU for the remote channel */
-	ng_l2cap_flow_t	oflow;       /* out flow */
-	u_int16_t	flush_timo;  /* flush timeout (msec) */
-} ng_l2cap_l2ca_cfg_op;
-
-/* L2CA_ConfigRsp */
-#define NGM_L2CAP_L2CA_CFG_RSP		0x84
-/* Upper -> L2CAP */
-typedef struct {
-	u_int16_t	lcid;  /* local channel ID */
-	u_int16_t	omtu;  /* sending MTU for the local channel */
-	ng_l2cap_flow_t	iflow; /* in FLOW */
-} ng_l2cap_l2ca_cfg_rsp_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	result; /* 0x00 - sucsess */
-} ng_l2cap_l2ca_cfg_rsp_op;
-
-/* L2CA_ConfigInd */
-#define NGM_L2CAP_L2CA_CFG_IND		0x85
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	lcid;        /* local channel ID */
-	u_int16_t	omtu;        /* outgoing MTU for the local channel */
-	ng_l2cap_flow_t	iflow;       /* in flow */
-	u_int16_t	flush_timo;  /* flush timeout (msec) */
-} ng_l2cap_l2ca_cfg_ind_ip;
-/* No output parameters */
-
-/* L2CA_QoSViolationInd */
-#define NGM_L2CAP_L2CA_QOS_IND		0x86
-/* L2CAP -> Upper */
-typedef struct {
-	bdaddr_t	bdaddr;	/* remote unit address */
-} ng_l2cap_l2ca_qos_ind_ip;
-/* No output parameters */
-
-/* L2CA_Disconnect */
-#define NGM_L2CAP_L2CA_DISCON		0x87
-/* Upper -> L2CAP */
-typedef struct {
-	u_int16_t	lcid;  /* local channel ID */
-} ng_l2cap_l2ca_discon_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	result; /* 0x00 - sucsess */
-} ng_l2cap_l2ca_discon_op;
-
-/* L2CA_DisconnectInd */
-#define NGM_L2CAP_L2CA_DISCON_IND	0x88
-/* L2CAP -> Upper */
-typedef ng_l2cap_l2ca_discon_ip ng_l2cap_l2ca_discon_ind_ip;
-/* No output parameters */
-
-/* L2CA_Write response */
-#define NGM_L2CAP_L2CA_WRITE		0x89
-/* No input parameters */
-
-/* L2CAP -> Upper */
-typedef struct {
-	int		result;	/* result (0x00 - success) */
-	u_int16_t	length;	/* amount of data written */
-	u_int16_t	lcid;	/* local channel ID */
-} ng_l2cap_l2ca_write_op;
-
-/* L2CA_GroupCreate */
-#define NGM_L2CAP_L2CA_GRP_CREATE	0x8a
-/* Upper -> L2CAP */
-typedef struct {
-	u_int16_t	psm;   /* Protocol/Service Multiplexor */
-} ng_l2cap_l2ca_grp_create_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	lcid;  /* local group channel ID */
-} ng_l2cap_l2ca_grp_create_op;
-
-/* L2CA_GroupClose */
-#define NGM_L2CAP_L2CA_GRP_CLOSE	0x8b
-/* Upper -> L2CAP */
-typedef struct {
-	u_int16_t	lcid;  /* local group channel ID */
-} ng_l2cap_l2ca_grp_close_ip;
-
-#if 0
-/* L2CAP -> Upper */
- * typedef struct {
- * 	u_int16_t	result; /* 0x00 - success */
- * } ng_l2cap_l2ca_grp_close_op;
-#endif
-
-/* L2CA_GroupAddMember */
-#define NGM_L2CAP_L2CA_GRP_ADD_MEMBER	0x8c
-/* Upper -> L2CAP */
-typedef struct {
-	u_int16_t	lcid;   /* local group channel ID */
-	bdaddr_t	bdaddr; /* remote unit address */
-} ng_l2cap_l2ca_grp_add_member_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	result; /* 0x00 - success */
-} ng_l2cap_l2ca_grp_add_member_op;
-
-/* L2CA_GroupRemoveMember */
-#define NGM_L2CAP_L2CA_GRP_REM_MEMBER	0x8d
-/* Upper -> L2CAP */
-typedef ng_l2cap_l2ca_grp_add_member_ip	ng_l2cap_l2ca_grp_rem_member_ip;
-
-/* L2CAP -> Upper */
-#if 0
- * typedef ng_l2cap_l2ca_grp_add_member_op	ng_l2cap_l2ca_grp_rem_member_op;
-#endif
-
-/* L2CA_GroupMembeship */
-#define NGM_L2CAP_L2CA_GRP_MEMBERSHIP	0x8e
-/* Upper -> L2CAP */
-typedef struct {
-	u_int16_t	lcid;  /* local group channel ID */
-} ng_l2cap_l2ca_grp_get_members_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	result;   /* 0x00 - success */
-	u_int16_t	nmembers; /* number of group members */
-/*	bdaddr_t	members[] -- group memebers */
-} ng_l2cap_l2ca_grp_get_members_op;
-
-/* L2CA_Ping */
-#define NGM_L2CAP_L2CA_PING		0x8f
-/* Upper -> L2CAP */
-typedef struct {
-	bdaddr_t	bdaddr;    /* remote unit address */
-	u_int16_t	echo_size; /* size of echo data in bytes */
-/*	u_int8_t	echo_data[] -- echo data */
-} ng_l2cap_l2ca_ping_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	result;    /* 0x00 - success */
-	bdaddr_t	bdaddr;    /* remote unit address */
-	u_int16_t	echo_size; /* size of echo data in bytes */
-/*	u_int8_t	echo_data[] -- echo data */
-} ng_l2cap_l2ca_ping_op;
-
-/* L2CA_GetInfo */
-#define NGM_L2CAP_L2CA_GET_INFO		0x90
-/* Upper -> L2CAP */
-typedef struct {
-	bdaddr_t	bdaddr;	   /* remote unit address */
-	u_int16_t	info_type; /* info type */
-} ng_l2cap_l2ca_get_info_ip;
-
-/* L2CAP -> Upper */
-typedef struct {
-	u_int16_t	result;    /* 0x00 - success */
-	u_int16_t	info_size; /* size of info data in bytes */
-/*	u_int8_t	info_data[] -- info data */
-} ng_l2cap_l2ca_get_info_op;
-
-/* L2CA_EnableCLT/L2CA_DisableCLT */
-#define NGM_L2CAP_L2CA_ENABLE_CLT	0x91
-/* Upper -> L2CAP */
-typedef struct {
-	u_int16_t	psm;    /* Protocol/Service Multiplexor */
-	u_int16_t	enable; /* 0x00 - disable */
-} ng_l2cap_l2ca_enable_clt_ip;
-
-#if 0
-/* L2CAP -> Upper */
- * typedef struct {
- * 	u_int16_t	result; /* 0x00 - success */
- * } ng_l2cap_l2ca_enable_clt_op;
-#endif
-
-/**************************************************************************
- **************************************************************************
- **                          L2CAP node messages
- **************************************************************************
- **************************************************************************/
-
-/* L2CAP connection states */
-#define NG_L2CAP_CON_CLOSED		0	/* connection closed */
-#define NG_L2CAP_W4_LP_CON_CFM		1	/* waiting... */
-#define NG_L2CAP_CON_OPEN		2	/* connection open */
-
-/* L2CAP channel states */
-#define NG_L2CAP_CLOSED			0	/* channel closed */
-#define NG_L2CAP_W4_L2CAP_CON_RSP	1	/* wait for L2CAP resp. */
-#define NG_L2CAP_W4_L2CA_CON_RSP	2	/* wait for upper resp. */
-#define NG_L2CAP_CONFIG			3	/* L2CAP configuration */
-#define NG_L2CAP_OPEN			4	/* channel open */
-#define NG_L2CAP_W4_L2CAP_DISCON_RSP	5	/* wait for L2CAP discon. */
-#define NG_L2CAP_W4_L2CA_DISCON_RSP	6	/* wait for upper discon. */
-
-/* Node flags */
-#define NG_L2CAP_CLT_SDP_DISABLED	(1 << 0)      /* disable SDP CLT */
-#define NG_L2CAP_CLT_RFCOMM_DISABLED	(1 << 1)      /* disable RFCOMM CLT */
-#define NG_L2CAP_CLT_TCP_DISABLED	(1 << 2)      /* disable TCP CLT */
-
-/* Debug levels */
-#define NG_L2CAP_ALERT_LEVEL		1
-#define NG_L2CAP_ERR_LEVEL		2
-#define NG_L2CAP_WARN_LEVEL		3
-#define NG_L2CAP_INFO_LEVEL		4
-
-/* Get node flags (see flags above) */
-#define	NGM_L2CAP_NODE_GET_FLAGS	0x400	/* L2CAP -> User */
-typedef u_int16_t	ng_l2cap_node_flags_ep;
-
-/* Get/Set debug level (see levels above) */
-#define	NGM_L2CAP_NODE_GET_DEBUG	0x401	/* L2CAP -> User */
-#define	NGM_L2CAP_NODE_SET_DEBUG	0x402	/* User -> L2CAP */
-typedef u_int16_t	ng_l2cap_node_debug_ep;
-
-#define NGM_L2CAP_NODE_HOOK_INFO	0x409	/* L2CAP -> Upper */
-/* bdaddr_t bdaddr; -- local (source BDADDR) */
-
-#define NGM_L2CAP_NODE_GET_CON_LIST	0x40a	/* L2CAP -> User */
-typedef struct {
-	uint32_t	num_connections; /* number of connections */
-} ng_l2cap_node_con_list_ep;
-
-/* Connection flags */
-#define NG_L2CAP_CON_TX			(1 << 0) /* sending data */
-#define NG_L2CAP_CON_RX			(1 << 1) /* receiving data */
-#define NG_L2CAP_CON_OUTGOING		(1 << 2) /* outgoing connection */
-#define NG_L2CAP_CON_LP_TIMO		(1 << 3) /* LP timeout */
-#define NG_L2CAP_CON_AUTO_DISCON_TIMO	(1 << 4) /* auto discon. timeout */
-#define NG_L2CAP_CON_DYING		(1 << 5) /* connection is dying */
-
-typedef struct {
-	u_int8_t	state;      /* connection state */
-	u_int8_t	flags;      /* flags */
-	int16_t		pending;    /* num. pending packets */
-	u_int16_t	con_handle; /* connection handle */
-	bdaddr_t	remote;     /* remote bdaddr */
-} ng_l2cap_node_con_ep;
-
-#define NG_L2CAP_MAX_CON_NUM \
-	((0xffff - sizeof(ng_l2cap_node_con_list_ep))/sizeof(ng_l2cap_node_con_ep))
-
-#define NGM_L2CAP_NODE_GET_CHAN_LIST	0x40b	/* L2CAP -> User */
-typedef struct {
-	uint32_t	num_channels;	/* number of channels */
-} ng_l2cap_node_chan_list_ep;
-
-typedef struct {
-	uint32_t	state;		/* channel state */
-
-	u_int16_t	scid;		/* source (local) channel ID */
-	u_int16_t	dcid;		/* destination (remote) channel ID */
-
-	u_int16_t	imtu;		/* incomming MTU */
-	u_int16_t	omtu;		/* outgoing MTU */
-
-	u_int16_t	psm;		/* PSM */
-	bdaddr_t	remote;		/* remote bdaddr */
-} ng_l2cap_node_chan_ep;
-
-#define NG_L2CAP_MAX_CHAN_NUM \
-	((0xffff - sizeof(ng_l2cap_node_chan_list_ep))/sizeof(ng_l2cap_node_chan_ep))
-
-#define NGM_L2CAP_NODE_GET_AUTO_DISCON_TIMO 0x40c /* L2CAP -> User */
-#define NGM_L2CAP_NODE_SET_AUTO_DISCON_TIMO 0x40d /* User -> L2CAP */
-typedef u_int16_t	ng_l2cap_node_auto_discon_ep;
-
-#endif /* ndef _NETGRAPH_L2CAP_H_ */
-
diff --git a/include.new/netgraph/bluetooth/include/ng_ubt.h b/include.new/netgraph/bluetooth/include/ng_ubt.h
deleted file mode 100644
index 4c08267..0000000
--- a/include.new/netgraph/bluetooth/include/ng_ubt.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * ng_ubt.h
- */
-
-/*-
- * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: ng_ubt.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/netgraph/bluetooth/include/ng_ubt.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NG_UBT_H_
-#define _NG_UBT_H_
-
-/**************************************************************************
- **************************************************************************
- **     Netgraph node hook name, type name and type cookie and commands 
- **************************************************************************  
- **************************************************************************/
-
-#define NG_UBT_NODE_TYPE	"ubt"
-#define NG_UBT_HOOK		"hook"
-
-#define NGM_UBT_COOKIE		1021837971
-
-/* Debug levels */
-#define NG_UBT_ALERT_LEVEL	1
-#define NG_UBT_ERR_LEVEL	2
-#define NG_UBT_WARN_LEVEL	3
-#define NG_UBT_INFO_LEVEL	4
-
-/**************************************************************************
- **************************************************************************
- **                    UBT node command/event parameters
- **************************************************************************
- **************************************************************************/
-
-#define NGM_UBT_NODE_SET_DEBUG	1		/* set debug level */
-#define NGM_UBT_NODE_GET_DEBUG	2		/* get debug level */
-typedef u_int16_t		ng_ubt_node_debug_ep; 
-
-#define NGM_UBT_NODE_SET_QLEN	3		/* set queue length */
-#define NGM_UBT_NODE_GET_QLEN	4		/* get queue length */ 
-typedef struct {
-	int32_t		queue;			/* queue index */
-#define	NGM_UBT_NODE_QUEUE_CMD	1		/* commands */
-#define	NGM_UBT_NODE_QUEUE_ACL	2		/* ACL data */
-#define	NGM_UBT_NODE_QUEUE_SCO	3		/* SCO data */
-
-	int32_t		qlen;			/* queue length */
-} ng_ubt_node_qlen_ep;
-
-#define NGM_UBT_NODE_GET_STAT	5		/* get statistic */
-typedef struct {
-	uint32_t	pckts_recv;		/* # of packets received */
-	uint32_t	bytes_recv;		/* # of bytes received */
-	uint32_t	pckts_sent;		/* # of packets sent */
-	uint32_t	bytes_sent;		/* # of bytes sent */
-	uint32_t	oerrors;		/* # of output errors */
-	uint32_t	ierrors;		/* # of input errors */
-} ng_ubt_node_stat_ep;
-
-#define NGM_UBT_NODE_RESET_STAT	6		/* reset statistic */
-
-#define NGM_UBT_NODE_DEV_NODES	7		/* on/off device interface */
-typedef u_int16_t	ng_ubt_node_dev_nodes_ep;
-
-#endif /* ndef _NG_UBT_H_ */
-
diff --git a/include.new/netgraph/netflow/netflow.h b/include.new/netgraph/netflow/netflow.h
deleted file mode 100644
index 491d760..0000000
--- a/include.new/netgraph/netflow/netflow.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*-
- * Copyright (c) 2010-2011 Alexander V. Chernikov <melifaro@ipfw.ru>
- * Copyright (c) 2004 Gleb Smirnoff <glebius@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.
- *
- * 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.
- *
- *	 $SourceForge: netflow.h,v 1.8 2004/09/16 17:05:11 glebius Exp $
- *	 $FreeBSD: releng/10.2/sys/netgraph/netflow/netflow.h 219182 2011-03-02 16:15:11Z glebius $
- */
-
-/* netflow timeouts in seconds */
-
-#define	ACTIVE_TIMEOUT		(30*60)	/* maximum flow lifetime is 30 min */
-#define	INACTIVE_TIMEOUT	15
-
-/*
- * More info can be found in these Cisco documents:
- *
- * Cisco IOS NetFlow, White Papers.
- * http://www.cisco.com/en/US/products/ps6601/prod_white_papers_list.html
- *
- * Cisco CNS NetFlow Collection Engine User Guide, 5.0.2, NetFlow Export
- * Datagram Formats.
- * http://www.cisco.com/en/US/products/sw/netmgtsw/ps1964/products_user_guide_chapter09186a00803f3147.html#wp26453
- *
- * Cisco Systems NetFlow Services Export Version 9
- * http://www.ietf.org/rfc/rfc3954.txt
- *
- */
-
-#define NETFLOW_V1 1
-#define NETFLOW_V5 5
-#define NETFLOW_V9 9
-
-struct netflow_v1_header
-{
-  uint16_t version;	/* NetFlow version */
-  uint16_t count;	/* Number of records in flow */
-  uint32_t sys_uptime;	/* System uptime */
-  uint32_t unix_secs;	/* Current seconds since 0000 UTC 1970 */
-  uint32_t unix_nsecs;	/* Remaining nanoseconds since 0000 UTC 1970 */
-} __attribute__((__packed__));
-
-struct netflow_v5_header
-{
-  uint16_t version;	/* NetFlow version */
-  uint16_t count;	/* Number of records in flow */
-  uint32_t sys_uptime;	/* System uptime */
-  uint32_t unix_secs;	/* Current seconds since 0000 UTC 1970 */
-  uint32_t unix_nsecs;	/* Remaining nanoseconds since 0000 UTC 1970 */
-  uint32_t flow_seq;	/* Sequence number of the first record */
-  uint8_t engine_type;	/* Type of flow switching engine (RP,VIP,etc.) */
-  uint8_t engine_id;	/* Slot number of the flow switching engine */
-  uint16_t pad;		/* Pad to word boundary */
-} __attribute__((__packed__));
-
-struct netflow_v9_header
-{
-  uint16_t version;	/* NetFlow version */
-  uint16_t count;	/* Total number of records in packet */
-  uint32_t sys_uptime;	/* System uptime */
-  uint32_t unix_secs;	/* Current seconds since 0000 UTC 1970 */
-  uint32_t seq_num;	/* Sequence number */
-  uint32_t source_id;	/* Observation Domain id */
-} __attribute__((__packed__));
-
-struct netflow_v1_record
-{
-  uint32_t src_addr;	/* Source IP address */
-  uint32_t dst_addr;	/* Destination IP address */
-  uint32_t next_hop;	/* Next hop IP address */
-  uint16_t in_ifx;	/* Source interface index */
-  uint16_t out_ifx;	/* Destination interface index */
-  uint32_t packets;	/* Number of packets in a flow */
-  uint32_t octets;	/* Number of octets in a flow */
-  uint32_t first;	/* System uptime at start of a flow */
-  uint32_t last;	/* System uptime at end of a flow */
-  uint16_t s_port;	/* Source port */
-  uint16_t d_port;	/* Destination port */
-  uint16_t pad1;	/* Pad to word boundary */
-  uint8_t prot;		/* IP protocol */
-  uint8_t tos;		/* IP type of service */
-  uint8_t flags;	/* Cumulative OR of tcp flags */
-  uint8_t pad2;		/* Pad to word boundary */
-  uint16_t pad3;	/* Pad to word boundary */
-  uint8_t reserved[5];	/* Reserved for future use */
-} __attribute__((__packed__));
-
-struct netflow_v5_record
-{
-  uint32_t src_addr;	/* Source IP address */
-  uint32_t dst_addr;	/* Destination IP address */
-  uint32_t next_hop;	/* Next hop IP address */
-  uint16_t i_ifx;	/* Source interface index */
-  uint16_t o_ifx;	/* Destination interface index */
-  uint32_t packets;	/* Number of packets in a flow */
-  uint32_t octets;	/* Number of octets in a flow */
-  uint32_t first;	/* System uptime at start of a flow */
-  uint32_t last;	/* System uptime at end of a flow */
-  uint16_t s_port;	/* Source port */
-  uint16_t d_port;	/* Destination port */
-  uint8_t pad1;		/* Pad to word boundary */
-  uint8_t flags;	/* Cumulative OR of tcp flags */
-  uint8_t prot;		/* IP protocol */
-  uint8_t tos;		/* IP type of service */
-  uint16_t src_as;	/* Src peer/origin Autonomous System */
-  uint16_t dst_as;	/* Dst peer/origin Autonomous System */
-  uint8_t src_mask;	/* Source route's mask bits */
-  uint8_t dst_mask;	/* Destination route's mask bits */
-  uint16_t pad2;	/* Pad to word boundary */
-} __attribute__((__packed__));
-
-#define NETFLOW_V1_MAX_RECORDS 24
-#define NETFLOW_V5_MAX_RECORDS 30
-
-#define NETFLOW_V1_MAX_SIZE (sizeof(netflow_v1_header)+ \
-			     sizeof(netflow_v1_record)*NETFLOW_V1_MAX_RECORDS)
-#define NETFLOW_V5_MAX_SIZE (sizeof(netflow_v5_header)+ \
-			     sizeof(netflow_v5_record)*NETFLOW_V5_MAX_RECORDS)
-
-struct netflow_v5_export_dgram {
-	struct netflow_v5_header	header;
-	struct netflow_v5_record	r[NETFLOW_V5_MAX_RECORDS];
-} __attribute__((__packed__));
-
-
-/* RFC3954 field definitions */
-#define NETFLOW_V9_FIELD_IN_BYTES		1	/* Input bytes count for a flow. Default 4, can be 8 */
-#define NETFLOW_V9_FIELD_IN_PKTS		2	/* Incoming counter with number of packets associated with an IP Flow. Default 4 */
-#define NETFLOW_V9_FIELD_FLOWS			3	/* Number of Flows that were aggregated. Default 4 */
-#define NETFLOW_V9_FIELD_PROTOCOL		4	/* IP protocol byte. 1 */
-#define NETFLOW_V9_FIELD_TOS			5	/* Type of service byte setting when entering the incoming interface. 1 */
-#define NETFLOW_V9_FIELD_TCP_FLAGS		6	/* TCP flags; cumulative of all the TCP flags seen in this Flow. 1 */
-#define NETFLOW_V9_FIELD_L4_SRC_PORT		7	/* TCP/UDP source port number. 2 */
-#define NETFLOW_V9_FIELD_IPV4_SRC_ADDR		8	/* IPv4 source address. 4 */
-#define NETFLOW_V9_FIELD_SRC_MASK		9	/* The number of contiguous bits in the source subnet mask (i.e., the mask in slash notation). 1 */
-#define NETFLOW_V9_FIELD_INPUT_SNMP		10	/* Input interface index. Default 2 */
-#define NETFLOW_V9_FIELD_L4_DST_PORT		11	/* TCP/UDP destination port number. 2 */
-#define NETFLOW_V9_FIELD_IPV4_DST_ADDR		12	/* IPv4 destination address. 4 */
-#define NETFLOW_V9_FIELD_DST_MASK		13	/* The number of contiguous bits in the destination subnet mask (i.e., the mask in slash notation). 1 */
-#define NETFLOW_V9_FIELD_OUTPUT_SNMP		14	/* Output interface index. Default 2 */
-#define NETFLOW_V9_FIELD_IPV4_NEXT_HOP		15	/* IPv4 address of the next-hop router. 4 */
-#define NETFLOW_V9_FIELD_SRC_AS			16	/* Source BGP autonomous system number. Default 2, can be 4 */
-#define NETFLOW_V9_FIELD_DST_AS			17	/* Destination BGP autonomous system number. Default 2, can be 4 */
-#define NETFLOW_V9_FIELD_BGP_IPV4_NEXT_HOP	18	/* Next-hop router's IP address in the BGP domain. 4 */
-#define NETFLOW_V9_FIELD_MUL_DST_PKTS		19	/* IP multicast outgoing packet counter for packets associated with IP flow. Default 4 */
-#define NETFLOW_V9_FIELD_MUL_DST_BYTES		20	/* IP multicast outgoing Octet (byte) counter for the number of bytes associated with IP flow. Default 4 */
-#define NETFLOW_V9_FIELD_LAST_SWITCHED		21	/* sysUptime in msec at which the last packet of this Flow was switched. 4 */
-#define NETFLOW_V9_FIELD_FIRST_SWITCHED		22	/* sysUptime in msec at which the first packet of this Flow was switched. 4 */
-#define NETFLOW_V9_FIELD_OUT_BYTES		23	/* Outgoing counter for the number of bytes associated with an IP Flow. Default 4 */
-#define NETFLOW_V9_FIELD_OUT_PKTS		24	/* Outgoing counter for the number of packets associated with an IP Flow. Default 4 */
-#define NETFLOW_V9_FIELD_IPV6_SRC_ADDR		27	/* IPv6 source address. 16 */
-#define NETFLOW_V9_FIELD_IPV6_DST_ADDR		28	/* IPv6 destination address. 16 */
-#define NETFLOW_V9_FIELD_IPV6_SRC_MASK		29	/* Length of the IPv6 source mask in contiguous bits. 1 */
-#define NETFLOW_V9_FIELD_IPV6_DST_MASK		30	/* Length of the IPv6 destination mask in contiguous bits. 1 */
-#define NETFLOW_V9_FIELD_IPV6_FLOW_LABEL	31	/* IPv6 flow label as per RFC 2460 definition. 3 */
-#define NETFLOW_V9_FIELD_ICMP_TYPE		32	/* Internet Control Message Protocol (ICMP) packet type; reported as ICMP Type * 256 + ICMP code. 2 */
-#define NETFLOW_V9_FIELD_MUL_IGMP_TYPE		33	/* Internet Group Management Protocol (IGMP) packet type. 1 */
-#define NETFLOW_V9_FIELD_SAMPLING_INTERVAL	34	/* When using sampled NetFlow, the rate at which packets are sampled; for example, a value of 100 indicates that one of every hundred packets is sampled. 4 */
-#define NETFLOW_V9_FIELD_SAMPLING_ALGORITHM	35	/* For sampled NetFlow platform-wide: 0x01 deterministic sampling 0x02 random sampling. 1 */
-#define NETFLOW_V9_FIELD_FLOW_ACTIVE_TIMEOUT	36	/* Timeout value (in seconds) for active flow entries in the NetFlow cache. 2 */
-#define NETFLOW_V9_FIELD_FLOW_INACTIVE_TIMEOUT	37	/* Timeout value (in seconds) for inactive Flow entries in the NetFlow cache. 2 */
-#define NETFLOW_V9_FIELD_ENGINE_TYPE		38	/* Type of Flow switching engine (route processor, linecard, etc...). 1 */
-#define NETFLOW_V9_FIELD_ENGINE_ID		39	/* ID number of the Flow switching engine. 1 */
-#define NETFLOW_V9_FIELD_TOTAL_BYTES_EXP	40	/* Counter with for the number of bytes exported by the Observation Domain. Default 4 */
-#define NETFLOW_V9_FIELD_TOTAL_PKTS_EXP		41	/* Counter with for the number of packets exported by the Observation Domain. Default 4 */
-#define NETFLOW_V9_FIELD_TOTAL_FLOWS_EXP	42	/* Counter with for the number of flows exported by the Observation Domain. Default 4 */
-#define NETFLOW_V9_FIELD_MPLS_TOP_LABEL_TYPE	46	/* MPLS Top Label Type. 1 */
-#define NETFLOW_V9_FIELD_MPLS_TOP_LABEL_IP_ADDR	47	/* Forwarding Equivalent Class corresponding to the MPLS Top Label. 4 */
-#define NETFLOW_V9_FIELD_FLOW_SAMPLER_ID	48	/* Identifier shown in "show flow-sampler". 1 */
-#define NETFLOW_V9_FIELD_FLOW_SAMPLER_MODE	49	/* The type of algorithm used for sampling data. 2 */
-#define NETFLOW_V9_FIELD_FLOW_SAMPLER_RANDOM_INTERVAL		50	/* Packet interval at which to sample. 4. */
-#define NETFLOW_V9_FIELD_DST_TOS		55	/* Type of Service byte setting when exiting outgoing interface. 1. */
-#define NETFLOW_V9_FIELD_SRC_MAC		56	/* Source MAC Address. 6 */
-#define NETFLOW_V9_FIELD_DST_MAC		57	/* Destination MAC Address. 6 */
-#define NETFLOW_V9_FIELD_SRC_VLAN		58	/* Virtual LAN identifier associated with ingress interface. 2 */
-#define NETFLOW_V9_FIELD_DST_VLAN		59	/* Virtual LAN identifier associated with egress interface. 2 */
-#define NETFLOW_V9_FIELD_IP_PROTOCOL_VERSION	60	/* Internet Protocol Version. Set to 4 for IPv4, set to 6 for IPv6. If not present in the template, then version 4 is assumed. 1. */
-#define NETFLOW_V9_FIELD_DIRECTION		61	/* Flow direction: 0 - ingress flow 1 - egress flow. 1 */
-#define NETFLOW_V9_FIELD_IPV6_NEXT_HOP		62	/* IPv6 address of the next-hop router. 16 */
-#define NETFLOW_V9_FIELD_BGP_IPV6_NEXT_HOP	63	/* Next-hop router in the BGP domain. 16 */
-#define NETFLOW_V9_FIELD_IPV6_OPTION_HEADERS	64	/* Bit-encoded field identifying IPv6 option headers found in the flow */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_1		70	/* MPLS label at position 1 in the stack. 3 */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_2		71	/* MPLS label at position 2 in the stack. 3 */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_3		72	/* MPLS label at position 3 in the stack. 3 */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_4		73	/* MPLS label at position 4 in the stack. 3 */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_5		74	/* MPLS label at position 5 in the stack. 3 */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_6		75	/* MPLS label at position 6 in the stack. 3 */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_7		76	/* MPLS label at position 7 in the stack. 3 */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_8		77	/* MPLS label at position 8 in the stack. 3 */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_9		78	/* MPLS label at position 9 in the stack. 3 */
-#define NETFLOW_V9_FIELD_MPLS_LABEL_10		79	/* MPLS label at position 10 in the stack. 3 */
-
-#define NETFLOW_V9_MAX_RESERVED_FLOWSET		0xFF	/* Clause 5.2 */
diff --git a/include.new/netgraph/netflow/netflow_v9.h b/include.new/netgraph/netflow/netflow_v9.h
deleted file mode 100644
index b16d7c7..0000000
--- a/include.new/netgraph/netflow/netflow_v9.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 2010 Alexander V. Chernikov <melifaro@ipfw.ru>
- * 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.
- *
- * 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: releng/10.2/sys/netgraph/netflow/netflow_v9.h 219182 2011-03-02 16:15:11Z glebius $
- */
-
-#ifndef	_NETFLOW_V9_H_
-#define	_NETFLOW_V9_H_
-
-#ifdef COUNTERS_64
-#define CNTR		uint64_t
-#define CNTR_MAX	UINT64_MAX
-#else
-#define CNTR		uint32_t
-#define CNTR_MAX	UINT_MAX
-#endif
-
-struct netflow_v9_template
-{
-	int	field_id;
-	int	field_length;
-};
-
-/* Template ID for tcp/udp v4 streams ID:257 (0x100 + NETFLOW_V9_FLOW_V4_L4) */
-struct netflow_v9_record_ipv4_tcp
-{
-	uint32_t	src_addr;	/* Source IPv4 address (IPV4_SRC_ADDR) */
-	uint32_t	dst_addr;	/* Destination IPv4 address (IPV4_DST_ADDR) */
-	uint32_t	next_hop;	/* Next hop IPv4 address (IPV4_NEXT_HOP) */
-	uint16_t	i_ifx;	/* Source interface index (INPUT_SNMP) */
-	uint16_t	o_ifx;	/* Destination interface index (OUTPUT_SNMP) */
-	CNTR		i_packets;	/* Number of incoming packets in a flow (IN_PKTS) */
-	CNTR		i_octets;	/* Number of incoming octets in a flow (IN_BYTES) */
-	CNTR		o_packets;	/* Number of outgoing packets in a flow (OUT_PKTS) */
-	CNTR		o_octets;	/* Number of outgoing octets in a flow (OUT_BYTES) */
-	uint32_t	first;	/* System uptime at start of a flow (FIRST_SWITCHED) */
-	uint32_t	last;	/* System uptime at end of a flow (LAST_SWITCHED) */
-	uint16_t	s_port;	/* Source port (L4_SRC_PORT) */
-	uint16_t	d_port;	/* Destination port (L4_DST_PORT) */
-	uint8_t		flags;	/* Cumulative OR of tcp flags (TCP_FLAGS) */
-	uint8_t		prot;		/* IP protocol */
-	uint8_t		tos;		/* IP type of service IN (or OUT) (TOS) */
-	uint32_t	src_as;	/* Src peer/origin Autonomous System (SRC_AS) */
-	uint32_t	dst_as;	/* Dst peer/origin Autonomous System (DST_AS) */
-	uint8_t		src_mask;	/* Source route's mask bits (SRC_MASK) */
-	uint8_t		dst_mask; 	/* Destination route's mask bits (DST_MASK) */
-} __attribute__((__packed__));
-
-/* Template ID for tcp/udp v6 streams ID: 260 (0x100 + NETFLOW_V9_FLOW_V6_L4) */
-struct netflow_v9_record_ipv6_tcp
-{
-	struct in6_addr	src_addr;	/* Source IPv6 address (IPV6_SRC_ADDR) */
-	struct in6_addr	dst_addr;	/* Destination IPv6 address (IPV6_DST_ADDR) */
-	struct in6_addr	next_hop;	/* Next hop IPv6 address (IPV6_NEXT_HOP) */
-	uint16_t	i_ifx;	/* Source interface index (INPUT_SNMP) */
-	uint16_t	o_ifx;	/* Destination interface index (OUTPUT_SNMP) */
-	CNTR		i_packets;	/* Number of incoming packets in a flow (IN_PKTS) */
-	CNTR		i_octets;	/* Number of incoming octets in a flow (IN_BYTES) */
-	CNTR		o_packets;	/* Number of outgoing packets in a flow (OUT_PKTS) */
-	CNTR		o_octets;	/* Number of outgoing octets in a flow (OUT_BYTES) */
-	uint32_t	first;	/* System uptime at start of a flow (FIRST_SWITCHED) */
-	uint32_t	last;	/* System uptime at end of a flow (LAST_SWITCHED) */
-	uint16_t	s_port;	/* Source port (L4_SRC_PORT) */
-	uint16_t	d_port;	/* Destination port (L4_DST_PORT) */
-	uint8_t		flags;	/* Cumulative OR of tcp flags (TCP_FLAGS) */
-	uint8_t		prot;		/* IP protocol */
-	uint8_t		tos;		/* IP type of service IN (or OUT) (TOS) */
-	uint32_t	src_as;	/* Src peer/origin Autonomous System (SRC_AS) */
-	uint32_t	dst_as;	/* Dst peer/origin Autonomous System (DST_AS) */
-	uint8_t		src_mask;	/* Source route's mask bits (SRC_MASK) */
-	uint8_t		dst_mask; 	/* Destination route's mask bits (DST_MASK) */
-} __attribute__((__packed__));
-
-/* Used in export9_add to determine max record size */
-struct netflow_v9_record_general
-{
-	union {
-		struct netflow_v9_record_ipv4_tcp v4_tcp;
-		struct netflow_v9_record_ipv6_tcp v6_tcp;
-	} rec;
-};
-
-#define BASE_MTU	1500
-#define MIN_MTU		sizeof(struct netflow_v5_header)
-#define MAX_MTU		16384
-#define NETFLOW_V9_MAX_SIZE	_NETFLOW_V9_MAX_SIZE(BASE_MTU)
-/* Decrease MSS by 16 since there can be some IPv[46] header options */
-#define _NETFLOW_V9_MAX_SIZE(x)	(x) - sizeof(struct ip6_hdr) - sizeof(struct udphdr) - 16
-
-/* #define NETFLOW_V9_MAX_FLOWSETS	2 */
-
-#define NETFLOW_V9_MAX_RECORD_SIZE	sizeof(struct netflow_v9_record_ipv6_tcp)
-#define NETFLOW_V9_MAX_PACKETS_TEMPL	500	/* Send data templates every ... packets */
-#define NETFLOW_V9_MAX_TIME_TEMPL	600	/* Send data templates every ... seconds */
-#define NETFLOW_V9_MAX_TEMPLATES	16	/* Not a real value */
-#define _NETFLOW_V9_TEMPLATE_SIZE(x)	(sizeof(x) / sizeof(struct netflow_v9_template)) * 4
-//#define _NETFLOW_V9_TEMPLATE_SIZE(x)	((x) + 1) * 4
-
-/* Flow Templates */
-#define NETFLOW_V9_FLOW_V4_L4	1 /* IPv4 TCP/UDP packet */
-#define NETFLOW_V9_FLOW_V4_ICMP	2 /* IPv4 ICMP packet, currently unused */
-#define NETFLOW_V9_FLOW_V4_L3	3 /* IPv4 IP packet */
-#define NETFLOW_V9_FLOW_V6_L4	4 /* IPv6 TCP/UDP packet */
-#define NETFLOW_V9_FLOW_V6_ICMP	5 /* IPv6 ICMP packet, currently unused */
-#define NETFLOW_V9_FLOW_V6_L3	6 /* IPv6 IP packet */
-
-#define NETFLOW_V9_FLOW_FAKE	65535 /* Not uset used in real flowsets! */
-
-struct netflow_v9_export_dgram {
-	struct netflow_v9_header	header;
-	char				*data; /* MTU can change, record length is dynamic */
-};
-
-struct netflow_v9_flowset_header {
-	uint16_t	id; /* FlowSet id */
-	uint16_t	length; /* FlowSet length */
-} __attribute__((__packed__));
-
-struct netflow_v9_packet_opt {
-	uint16_t	length; /* current packet length */
-	uint16_t	count; /* current records count */
-	uint16_t	mtu; /* max MTU shapshot */
-	uint16_t	flow_type; /* current flowset */
-	uint16_t	flow_header; /* offset pointing to current flow header */
-};
-#endif
diff --git a/include.new/netgraph/netflow/ng_netflow.h b/include.new/netgraph/netflow/ng_netflow.h
deleted file mode 100644
index ae52f04..0000000
--- a/include.new/netgraph/netflow/ng_netflow.h
+++ /dev/null
@@ -1,523 +0,0 @@
-/*-
- * Copyright (c) 2010-2011 Alexander V. Chernikov <melifaro@ipfw.ru>
- * Copyright (c) 2004-2005 Gleb Smirnoff <glebius@FreeBSD.org>
- * Copyright (c) 2001-2003 Roman V. Palagin <romanp@unshadow.net>
- * 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.
- *
- * 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.
- *
- *	 $SourceForge: ng_netflow.h,v 1.26 2004/09/04 15:44:55 glebius Exp $
- *	 $FreeBSD: releng/10.2/sys/netgraph/netflow/ng_netflow.h 255202 2013-09-04 10:17:50Z glebius $
- */
-
-#ifndef	_NG_NETFLOW_H_
-#define	_NG_NETFLOW_H_
-
-#define NG_NETFLOW_NODE_TYPE	"netflow"
-#define NGM_NETFLOW_COOKIE	1309868867
-#define NGM_NETFLOW_V9_COOKIE	1349865386
-
-#define	NG_NETFLOW_MAXIFACES	USHRT_MAX
-
-/* Hook names */
-
-#define	NG_NETFLOW_HOOK_DATA	"iface"
-#define	NG_NETFLOW_HOOK_OUT	"out"
-#define NG_NETFLOW_HOOK_EXPORT	"export"
-#define NG_NETFLOW_HOOK_EXPORT9	"export9"
-
-/* This define effectively disable (v5) netflow export hook! */
-/* #define COUNTERS_64 */
-
-/* Netgraph commands understood by netflow node */
-enum {
-    NGM_NETFLOW_INFO = 1|NGM_READONLY|NGM_HASREPLY,	/* get node info */
-    NGM_NETFLOW_IFINFO = 2|NGM_READONLY|NGM_HASREPLY,	/* get iface info */
-    NGM_NETFLOW_SHOW = 3|NGM_READONLY|NGM_HASREPLY,	/* show ip cache flow */
-    NGM_NETFLOW_SETDLT		= 4,	/* set data-link type */	
-    NGM_NETFLOW_SETIFINDEX	= 5, 	/* set interface index */
-    NGM_NETFLOW_SETTIMEOUTS	= 6, 	/* set active/inactive flow timeouts */
-    NGM_NETFLOW_SETCONFIG	= 7, 	/* set flow generation options */
-    NGM_NETFLOW_SETTEMPLATE	= 8, 	/* set v9 flow template periodic */
-    NGM_NETFLOW_SETMTU		= 9, 	/* set outgoing interface MTU */
-    NGM_NETFLOW_V9INFO = 10|NGM_READONLY|NGM_HASREPLY, 	/* get v9 info */
-};
-
-/* This structure is returned by the NGM_NETFLOW_INFO message */
-struct ng_netflow_info {
-	uint64_t	nfinfo_bytes;		/* accounted IPv4 bytes */
-	uint32_t	nfinfo_packets;		/* accounted IPv4 packets */
-	uint64_t	nfinfo_bytes6;		/* accounted IPv6 bytes */
-	uint32_t	nfinfo_packets6;	/* accounted IPv6 packets */
-	uint64_t	nfinfo_sbytes;		/* skipped IPv4 bytes */
-	uint32_t	nfinfo_spackets;	/* skipped IPv4 packets */
-	uint64_t	nfinfo_sbytes6;		/* skipped IPv6 bytes */
-	uint32_t	nfinfo_spackets6;	/* skipped IPv6 packets */
-	uint32_t	nfinfo_used;		/* used cache records */
-	uint32_t	nfinfo_used6;		/* used IPv6 cache records */
-	uint32_t	nfinfo_alloc_failed;	/* failed allocations */
-	uint32_t	nfinfo_export_failed;	/* failed exports */
-	uint32_t	nfinfo_export9_failed;	/* failed exports */
-	uint32_t	nfinfo_realloc_mbuf;	/* reallocated mbufs */
-	uint32_t	nfinfo_alloc_fibs;	/* fibs allocated */
-	uint32_t	nfinfo_act_exp;		/* active expiries */
-	uint32_t	nfinfo_inact_exp;	/* inactive expiries */
-	uint32_t	nfinfo_inact_t;		/* flow inactive timeout */
-	uint32_t	nfinfo_act_t;		/* flow active timeout */
-};
-
-/* This structure is returned by the NGM_NETFLOW_IFINFO message */
-struct ng_netflow_ifinfo {
-	uint32_t	ifinfo_packets;	/* number of packets for this iface */
-	uint8_t		ifinfo_dlt;	/* Data Link Type, DLT_XXX */
-#define	MAXDLTNAMELEN	20
-	uint16_t	ifinfo_index;	/* connected iface index */
-	uint32_t	conf;
-};
-
-
-/* This structure is passed to NGM_NETFLOW_SETDLT message */
-struct ng_netflow_setdlt {
-	uint16_t iface;		/* which iface dlt change */
-	uint8_t  dlt;		/* DLT_XXX from bpf.h */
-};
-
-/* This structure is passed to NGM_NETFLOW_SETIFINDEX */
-struct ng_netflow_setifindex {
-	uint16_t iface;		/* which iface index change */
-	uint16_t index;		/* new index */
-};
-
-/* This structure is passed to NGM_NETFLOW_SETTIMEOUTS */
-struct ng_netflow_settimeouts {
-	uint32_t	inactive_timeout;	/* flow inactive timeout */
-	uint32_t	active_timeout;		/* flow active timeout */
-};
-
-#define NG_NETFLOW_CONF_INGRESS		0x01	/* Account on ingress */
-#define NG_NETFLOW_CONF_EGRESS		0x02	/* Account on egress */
-#define NG_NETFLOW_CONF_ONCE		0x04	/* Add tag to account only once */
-#define NG_NETFLOW_CONF_THISONCE	0x08	/* Account once in current node */
-#define NG_NETFLOW_CONF_NOSRCLOOKUP	0x10	/* No radix lookup on src */
-#define NG_NETFLOW_CONF_NODSTLOOKUP	0x20	/* No radix lookup on dst */
-
-#define NG_NETFLOW_IS_FRAG		0x01
-#define NG_NETFLOW_FLOW_FLAGS		(NG_NETFLOW_CONF_NOSRCLOOKUP|\
-					NG_NETFLOW_CONF_NODSTLOOKUP)
-
-/* This structure is passed to NGM_NETFLOW_SETCONFIG */
-struct ng_netflow_setconfig {
-	uint16_t iface;		/* which iface config change */
-	uint32_t conf;		/* new config */
-};
-
-/* This structure is passed to NGM_NETFLOW_SETTEMPLATE */
-struct ng_netflow_settemplate {
-	uint16_t time;		/* max time between announce */
-	uint16_t packets;	/* max packets between announce */
-};
-
-/* This structure is passed to NGM_NETFLOW_SETMTU */
-struct ng_netflow_setmtu {
-	uint16_t mtu;		/* MTU for packet */
-};
-
-/* This structure is used in NGM_NETFLOW_SHOW request/responce */
-struct ngnf_show_header {
-	u_char		version;	/* IPv4 or IPv6 */
-	uint32_t	hash_id;	/* current hash index */
-	uint32_t	list_id;	/* current record number in hash */
-	uint32_t	nentries;	/* number of records in response */
-};
-
-/* This structure is used in NGM_NETFLOW_V9INFO message */
-struct ng_netflow_v9info {
-	uint16_t	templ_packets;	/* v9 template packets */
-	uint16_t	templ_time;	/* v9 template time */
-	uint16_t	mtu;		/* v9 MTU */
-};
-
-/* XXXGL
- * Somewhere flow_rec6 is casted to flow_rec, and flow6_entry_data is
- * casted to flow_entry_data. After casting, fle->r.fib is accessed.
- * So beginning of these structs up to fib should be kept common.
- */
-
-/* This is unique data, which identifies flow */
-struct flow_rec {
-	uint16_t	flow_type;
-	uint16_t	fib;
-	struct in_addr	r_src;
-	struct in_addr	r_dst;
-	union {
-		struct {
-			uint16_t	s_port;	/* source TCP/UDP port */
-			uint16_t	d_port; /* destination TCP/UDP port */
-		} dir;
-		uint32_t both;
-	} ports;
-	union {
-		struct {
-			u_char		prot;	/* IP protocol */
-			u_char		tos;	/* IP TOS */
-			uint16_t	i_ifx;	/* input interface index */
-		} i;
-		uint32_t all;
-	} misc;
-};
-
-/* This is unique data, which identifies flow */
-struct flow6_rec {
-	uint16_t	flow_type;
-	uint16_t	fib;
-	union {
-		struct in_addr	r_src;
-		struct in6_addr	r_src6;
-	} src;
-	union {
-		struct in_addr	r_dst;
-		struct in6_addr	r_dst6;
-	} dst;
-	union {
-		struct {
-			uint16_t	s_port;	/* source TCP/UDP port */
-			uint16_t	d_port; /* destination TCP/UDP port */
-		} dir;
-		uint32_t both;
-	} ports;
-	union {
-		struct {
-			u_char		prot;	/* IP protocol */
-			u_char		tos;	/* IP TOS */
-			uint16_t	i_ifx;	/* input interface index */
-		} i;
-		uint32_t all;
-	} misc;
-};
-
-#define	r_ip_p	misc.i.prot
-#define	r_tos	misc.i.tos
-#define	r_i_ifx	misc.i.i_ifx
-#define r_misc	misc.all
-#define r_ports	ports.both
-#define r_sport	ports.dir.s_port
-#define r_dport	ports.dir.d_port
-	
-/* A flow entry which accumulates statistics */
-struct flow_entry_data {
-	uint16_t	version;	/* Protocol version */
-	struct flow_rec	r;
-	struct in_addr	next_hop;
-	uint16_t	fle_o_ifx;	/* output interface index */
-#define	fle_i_ifx	r.misc.i.i_ifx
-	uint8_t		dst_mask;	/* destination route mask bits */
-	uint8_t		src_mask;	/* source route mask bits */
-	u_long		packets;
-	u_long		bytes;
-	long		first;		/* uptime on first packet */
-	long		last;		/* uptime on last packet */
-	u_char		tcp_flags;	/* cumulative OR */
-};
-
-struct flow6_entry_data {
-	uint16_t		version;	/* Protocol version */
-	struct flow6_rec	r;
-	union {
-		struct in_addr	next_hop;
-		struct in6_addr	next_hop6;
-	} n;
-	uint16_t	fle_o_ifx;	/* output interface index */
-#define	fle_i_ifx	r.misc.i.i_ifx
-	uint8_t		dst_mask;	/* destination route mask bits */
-	uint8_t		src_mask;	/* source route mask bits */
-	u_long		packets;
-	u_long		bytes;
-	long		first;		/* uptime on first packet */
-	long		last;		/* uptime on last packet */
-	u_char		tcp_flags;	/* cumulative OR */
-};
-
-/*
- * How many flow records we will transfer at once
- * without overflowing socket receive buffer
- */
-#define NREC_AT_ONCE	 1000
-#define NREC6_AT_ONCE	(NREC_AT_ONCE * sizeof(struct flow_entry_data) / \
-			sizeof(struct flow6_entry_data))
-#define NGRESP_SIZE	(sizeof(struct ngnf_show_header) + (NREC_AT_ONCE * \
-			sizeof(struct flow_entry_data)))
-#define SORCVBUF_SIZE	(NGRESP_SIZE + 2 * sizeof(struct ng_mesg))
-
-/* Everything below is for kernel */
-
-#ifdef _KERNEL
-
-struct flow_entry {
-	TAILQ_ENTRY(flow_entry)	fle_hash;	/* entries in hash slot */
-	struct flow_entry_data	f;
-};
-
-struct flow6_entry {
-	TAILQ_ENTRY(flow_entry)	fle_hash;	/* entries in hash slot */
-	struct flow6_entry_data	f;
-};
-/* Parsing declarations */
-
-/* Parse the info structure */
-#define	NG_NETFLOW_INFO_TYPE {					\
-	{ "IPv4 bytes",			&ng_parse_uint64_type },\
-	{ "IPv4 packets",		&ng_parse_uint32_type },\
-	{ "IPv6 bytes",			&ng_parse_uint64_type },\
-	{ "IPv6 packets",		&ng_parse_uint32_type },\
-	{ "IPv4 skipped bytes",		&ng_parse_uint64_type },\
-	{ "IPv4 skipped packets",	&ng_parse_uint32_type },\
-	{ "IPv6 skipped bytes",		&ng_parse_uint64_type },\
-	{ "IPv6 skipped packets",	&ng_parse_uint32_type },\
-	{ "IPv4 records used",		&ng_parse_uint32_type },\
-	{ "IPv6 records used",		&ng_parse_uint32_type },\
-	{ "Failed allocations",		&ng_parse_uint32_type },\
-	{ "V5 failed exports",		&ng_parse_uint32_type },\
-	{ "V9 failed exports",		&ng_parse_uint32_type },\
-	{ "mbuf reallocations",		&ng_parse_uint32_type },\
-	{ "fibs allocated",		&ng_parse_uint32_type },\
-	{ "Active expiries",		&ng_parse_uint32_type },\
-	{ "Inactive expiries",		&ng_parse_uint32_type },\
-	{ "Inactive timeout",		&ng_parse_uint32_type },\
-	{ "Active timeout",		&ng_parse_uint32_type },\
-	{ NULL }						\
-}
-
-/* Parse the ifinfo structure */
-#define NG_NETFLOW_IFINFO_TYPE	{			\
-	{ "packets",		&ng_parse_uint32_type },\
-	{ "data link type",	&ng_parse_uint8_type },	\
-	{ "index",		&ng_parse_uint16_type },\
-	{ "conf",		&ng_parse_uint32_type },\
-	{ NULL }					\
-}
-
-/* Parse the setdlt structure */
-#define	NG_NETFLOW_SETDLT_TYPE {			\
-	{ "iface",	&ng_parse_uint16_type },	\
-	{ "dlt",	&ng_parse_uint8_type },		\
-	{ NULL }					\
-}
-
-/* Parse the setifindex structure */
-#define	NG_NETFLOW_SETIFINDEX_TYPE {			\
-	{ "iface",	&ng_parse_uint16_type },	\
-	{ "index",	&ng_parse_uint16_type },	\
-	{ NULL }					\
-}
-
-/* Parse the settimeouts structure */
-#define NG_NETFLOW_SETTIMEOUTS_TYPE {			\
-	{ "inactive",	&ng_parse_uint32_type },	\
-	{ "active",	&ng_parse_uint32_type },	\
-	{ NULL }					\
-}
-
-/* Parse the setifindex structure */
-#define	NG_NETFLOW_SETCONFIG_TYPE {			\
-	{ "iface",	&ng_parse_uint16_type },	\
-	{ "conf",	&ng_parse_uint32_type },	\
-	{ NULL }					\
-}
-
-/* Parse the settemplate structure */
-#define	NG_NETFLOW_SETTEMPLATE_TYPE {		\
-	{ "time",	&ng_parse_uint16_type },	\
-	{ "packets",	&ng_parse_uint16_type },	\
-	{ NULL }					\
-}
-
-/* Parse the setmtu structure */
-#define	NG_NETFLOW_SETMTU_TYPE {			\
-	{ "mtu",	&ng_parse_uint16_type },	\
-	{ NULL }					\
-}
-
-/* Parse the v9info structure */
-#define	NG_NETFLOW_V9INFO_TYPE {				\
-	{ "v9 template packets",	&ng_parse_uint16_type },\
-	{ "v9 template time",		&ng_parse_uint16_type },\
-	{ "v9 MTU",			&ng_parse_uint16_type },\
-	{ NULL }						\
-}
-
-/* Private hook data */
-struct ng_netflow_iface {
-	hook_p		hook;		/* NULL when disconnected */
-	hook_p		out;		/* NULL when no bypass hook */
-	struct ng_netflow_ifinfo	info;
-};
-
-typedef struct ng_netflow_iface *iface_p;
-typedef struct ng_netflow_ifinfo *ifinfo_p;
-
-struct netflow_export_item {
-	item_p		item;
-	item_p		item9;
-	struct netflow_v9_packet_opt	*item9_opt;
-};
-
-/* Structure contatining fib-specific data */
-struct fib_export {
-	uint32_t	fib;		/* kernel fib id */
-
-	/* Various data used for export */
-	struct netflow_export_item exp;
-
-	struct mtx	export_mtx;	/* exp.item mutex */
-	struct mtx	export9_mtx;	/* exp.item9 mutex */
-	uint32_t	flow_seq;	/* current V5 flow sequence */
-	uint32_t	flow9_seq;	/* current V9 flow sequence */
-	uint32_t	domain_id;	/* Observartion domain id */
-	/* Netflow V9 counters */
-	uint32_t	templ_last_ts;	/* unixtime of last template announce */
-	uint32_t	templ_last_pkt;	/* packet count on last announce */
-	uint32_t	sent_packets;	/* packets sent by exporter; */
-
-	/* Current packet specific options */
-	struct netflow_v9_packet_opt *export9_opt;
-};
-
-typedef struct fib_export *fib_export_p;
-
-/* Structure describing our flow engine */
-struct netflow {
-	node_p		node;		/* link to the node itself */
-	hook_p		export;		/* export data goes there */
-	hook_p		export9;	/* Netflow V9 export data goes there */
-	struct ng_netflow_info  info;
-	struct callout	exp_callout;	/* expiry periodic job */
-
-	/*
-	 * Flow entries are allocated in uma(9) zone zone. They are
-	 * indexed by hash hash. Each hash element consist of tailqueue
-	 * head and mutex to protect this element.
-	 */
-#define	CACHESIZE			(65536*16)
-#define	CACHELOWAT			(CACHESIZE * 3/4)
-#define	CACHEHIGHWAT			(CACHESIZE * 9/10)
-	uma_zone_t		zone;
-	struct flow_hash_entry	*hash;
-
-	/*
-	 * NetFlow data export
-	 *
-	 * export_item is a data item, it has an mbuf with cluster
-	 * attached to it. A thread detaches export_item from priv
-	 * and works with it. If the export is full it is sent, and
-	 * a new one is allocated. Before exiting thread re-attaches
-	 * its current item back to priv. If there is item already,
-	 * current incomplete datagram is sent.
-	 * export_mtx is used for attaching/detaching.
-	 */
-
-	/* IPv6 support */
-#ifdef INET6
-	uma_zone_t		zone6;
-	struct flow_hash_entry	*hash6;
-#endif
-
-	/* Multiple FIB support */
-	fib_export_p	*fib_data;	/* vector to per-fib data */
-	uint16_t	maxfibs;	/* number of allocated fibs */
-
-	/* Netflow v9 configuration options */
-	/*
-	 * RFC 3954 clause 7.3
-	 * "Both options MUST be configurable by the user on the Exporter."
-	 */
-	uint16_t	templ_time;	/* time between sending templates */
-	uint16_t	templ_packets;	/* packets between sending templates */
-#define NETFLOW_V9_MAX_FLOWSETS	2
-	u_char		flowsets_count; /* current flowsets used */
-
-	/* Count of records in each flowset */
-	u_char		flowset_records[NETFLOW_V9_MAX_FLOWSETS - 1];
-	uint16_t	mtu;		/* export interface MTU */
-
-	/* Pointers to pre-compiled flowsets */
-	struct netflow_v9_flowset_header
-	    *v9_flowsets[NETFLOW_V9_MAX_FLOWSETS - 1];
-
-	struct ng_netflow_iface	ifaces[NG_NETFLOW_MAXIFACES];
-};
-
-typedef struct netflow *priv_p;
-
-/* Header of a small list in hash cell */
-struct flow_hash_entry {
-	struct mtx		mtx;
-	TAILQ_HEAD(fhead, flow_entry) head;
-};
-
-#define	ERROUT(x)	{ error = (x); goto done; }
-
-#define MTAG_NETFLOW		1221656444
-#define MTAG_NETFLOW_CALLED	0
-
-#define m_pktlen(m)	((m)->m_pkthdr.len)
-#define IP6VERSION	6
-
-#define priv_to_fib(priv, fib)	(priv)->fib_data[(fib)]
-
-/*
- * Cisco uses milliseconds for uptime. Bad idea, since it overflows
- * every 48+ days. But we will do same to keep compatibility. This macro
- * does overflowable multiplication to 1000.
- */
-#define	MILLIUPTIME(t)	(((t) << 9) +	/* 512 */	\
-			 ((t) << 8) +	/* 256 */	\
-			 ((t) << 7) +	/* 128 */	\
-			 ((t) << 6) +	/* 64  */	\
-			 ((t) << 5) +	/* 32  */	\
-			 ((t) << 3))	/* 8   */
-
-/* Prototypes for netflow.c */
-void	ng_netflow_cache_init(priv_p);
-void	ng_netflow_cache_flush(priv_p);
-int	ng_netflow_fib_init(priv_p priv, int fib);
-void	ng_netflow_copyinfo(priv_p, struct ng_netflow_info *);
-void	ng_netflow_copyv9info(priv_p, struct ng_netflow_v9info *);
-timeout_t ng_netflow_expire;
-int 	ng_netflow_flow_add(priv_p, fib_export_p, struct ip *, caddr_t,
-	uint8_t, uint8_t, unsigned int);
-int	ng_netflow_flow6_add(priv_p, fib_export_p, struct ip6_hdr *, caddr_t,
-	uint8_t, uint8_t, unsigned int);
-int	ng_netflow_flow_show(priv_p, struct ngnf_show_header *req,
-	struct ngnf_show_header *resp);
-void	ng_netflow_v9_cache_init(priv_p);
-void	ng_netflow_v9_cache_flush(priv_p);
-item_p	get_export9_dgram(priv_p, fib_export_p,
-	struct netflow_v9_packet_opt **);
-void	return_export9_dgram(priv_p, fib_export_p, item_p,
-	struct netflow_v9_packet_opt *, int);
-int	export9_add(item_p, struct netflow_v9_packet_opt *,
-	struct flow_entry *);
-int	export9_send(priv_p, fib_export_p, item_p,
-	struct netflow_v9_packet_opt *, int);
-
-#endif	/* _KERNEL */
-#endif	/* _NG_NETFLOW_H_ */
diff --git a/include.new/netgraph/netgraph.h b/include.new/netgraph/netgraph.h
deleted file mode 100644
index 78339a9..0000000
--- a/include.new/netgraph/netgraph.h
+++ /dev/null
@@ -1,1219 +0,0 @@
-/*
- * netgraph.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Julian Elischer <julian@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/netgraph.h 231831 2012-02-16 19:10:01Z glebius $
- * $Whistle: netgraph.h,v 1.29 1999/11/01 07:56:13 julian Exp $
- */
-
-#ifndef _NETGRAPH_NETGRAPH_H_
-#define _NETGRAPH_NETGRAPH_H_
-
-#ifndef _KERNEL
-#error "This file should not be included in user level programs"
-#endif
-
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/mutex.h>
-#include <sys/refcount.h>
-
-#ifdef HAVE_KERNEL_OPTION_HEADERS
-#include "opt_netgraph.h"
-#include "opt_kdb.h"
-#endif
-
-/* debugging options */
-#define NG_SEPARATE_MALLOC	/* make modules use their own malloc types */
-
-/*
- * This defines the in-kernel binary interface version.
- * It is possible to change this but leave the external message
- * API the same. Each type also has it's own cookies for versioning as well.
- * Change it for NETGRAPH_DEBUG version so we cannot mix debug and non debug
- * modules.
- */
-#define _NG_ABI_VERSION 12
-#ifdef	NETGRAPH_DEBUG /*----------------------------------------------*/
-#define NG_ABI_VERSION	(_NG_ABI_VERSION + 0x10000)
-#else	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-#define NG_ABI_VERSION	_NG_ABI_VERSION
-#endif	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-
-
-/*
- * Forward references for the basic structures so we can
- * define the typedefs and use them in the structures themselves.
- */
-struct ng_hook ;
-struct ng_node ;
-struct ng_item ;
-typedef	struct ng_item *item_p;
-typedef struct ng_node *node_p;
-typedef struct ng_hook *hook_p;
-
-/* node method definitions */
-typedef	int	ng_constructor_t(node_p node);
-typedef	int	ng_close_t(node_p node);
-typedef	int	ng_shutdown_t(node_p node);
-typedef	int	ng_newhook_t(node_p node, hook_p hook, const char *name);
-typedef	hook_p	ng_findhook_t(node_p node, const char *name);
-typedef	int	ng_connect_t(hook_p hook);
-typedef	int	ng_rcvmsg_t(node_p node, item_p item, hook_p lasthook);
-typedef	int	ng_rcvdata_t(hook_p hook, item_p item);
-typedef	int	ng_disconnect_t(hook_p hook);
-typedef	int	ng_rcvitem (node_p node, hook_p hook, item_p item);
-
-/***********************************************************************
- ***************** Hook Structure and Methods **************************
- ***********************************************************************
- *
- * Structure of a hook
- */
-struct ng_hook {
-	char	hk_name[NG_HOOKSIZ];	/* what this node knows this link as */
-	void   *hk_private;		/* node dependant ID for this hook */
-	int	hk_flags;		/* info about this hook/link */
-	int	hk_type;		/* tbd: hook data link type */
-	struct	ng_hook *hk_peer;	/* the other end of this link */
-	struct	ng_node *hk_node;	/* The node this hook is attached to */
-	LIST_ENTRY(ng_hook) hk_hooks;	/* linked list of all hooks on node */
-	ng_rcvmsg_t	*hk_rcvmsg;	/* control messages come here */
-	ng_rcvdata_t	*hk_rcvdata;	/* data comes here */
-	int	hk_refs;		/* dont actually free this till 0 */
-#ifdef	NETGRAPH_DEBUG /*----------------------------------------------*/
-#define HK_MAGIC 0x78573011
-	int	hk_magic;
-	char	*lastfile;
-	int	lastline;
-	SLIST_ENTRY(ng_hook)	  hk_all;		/* all existing items */
-#endif	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-};
-/* Flags for a hook */
-#define HK_INVALID		0x0001	/* don't trust it! */
-#define HK_QUEUE		0x0002	/* queue for later delivery */
-#define HK_FORCE_WRITER		0x0004	/* Incoming data queued as a writer */
-#define HK_DEAD			0x0008	/* This is the dead hook.. don't free */
-#define HK_HI_STACK		0x0010	/* Hook has hi stack usage */
-#define HK_TO_INBOUND		0x0020	/* Hook on ntw. stack inbound path. */
-
-/*
- * Public Methods for hook
- * If you can't do it with these you probably shouldn;t be doing it.
- */
-void ng_unref_hook(hook_p hook); /* don't move this */
-#define	_NG_HOOK_REF(hook)	refcount_acquire(&(hook)->hk_refs)
-#define _NG_HOOK_NAME(hook)	((hook)->hk_name)
-#define _NG_HOOK_UNREF(hook)	ng_unref_hook(hook)
-#define	_NG_HOOK_SET_PRIVATE(hook, val)	do {(hook)->hk_private = val;} while (0)
-#define	_NG_HOOK_SET_RCVMSG(hook, val)	do {(hook)->hk_rcvmsg = val;} while (0)
-#define	_NG_HOOK_SET_RCVDATA(hook, val)	do {(hook)->hk_rcvdata = val;} while (0)
-#define	_NG_HOOK_PRIVATE(hook)	((hook)->hk_private)
-#define _NG_HOOK_NOT_VALID(hook)	((hook)->hk_flags & HK_INVALID)
-#define _NG_HOOK_IS_VALID(hook)	(!((hook)->hk_flags & HK_INVALID))
-#define _NG_HOOK_NODE(hook)	((hook)->hk_node) /* only rvalue! */
-#define _NG_HOOK_PEER(hook)	((hook)->hk_peer) /* only rvalue! */
-#define _NG_HOOK_FORCE_WRITER(hook)				\
-		do { hook->hk_flags |= HK_FORCE_WRITER; } while (0)
-#define _NG_HOOK_FORCE_QUEUE(hook) do { hook->hk_flags |= HK_QUEUE; } while (0)
-#define _NG_HOOK_SET_TO_INBOUND(hook)				\
-		do { hook->hk_flags |= HK_TO_INBOUND; } while (0)
-#define _NG_HOOK_HI_STACK(hook) do { hook->hk_flags |= HK_HI_STACK; } while (0)
-
-/* Some shortcuts */
-#define NG_PEER_NODE(hook)	NG_HOOK_NODE(NG_HOOK_PEER(hook))
-#define NG_PEER_HOOK_NAME(hook)	NG_HOOK_NAME(NG_HOOK_PEER(hook))
-#define NG_PEER_NODE_NAME(hook)	NG_NODE_NAME(NG_PEER_NODE(hook))
-
-#ifdef	NETGRAPH_DEBUG /*----------------------------------------------*/
-#define _NN_ __FILE__,__LINE__
-void	dumphook (hook_p hook, char *file, int line);
-static __inline void	_chkhook(hook_p hook, char *file, int line);
-static __inline void	_ng_hook_ref(hook_p hook, char * file, int line);
-static __inline char *	_ng_hook_name(hook_p hook, char * file, int line);
-static __inline void	_ng_hook_unref(hook_p hook, char * file, int line);
-static __inline void	_ng_hook_set_private(hook_p hook,
-				void * val, char * file, int line);
-static __inline void	_ng_hook_set_rcvmsg(hook_p hook,
-				ng_rcvmsg_t *val, char * file, int line);
-static __inline void	_ng_hook_set_rcvdata(hook_p hook,
-				ng_rcvdata_t *val, char * file, int line);
-static __inline void *	_ng_hook_private(hook_p hook, char * file, int line);
-static __inline int	_ng_hook_not_valid(hook_p hook, char * file, int line);
-static __inline int	_ng_hook_is_valid(hook_p hook, char * file, int line);
-static __inline node_p	_ng_hook_node(hook_p hook, char * file, int line);
-static __inline hook_p	_ng_hook_peer(hook_p hook, char * file, int line);
-static __inline void	_ng_hook_force_writer(hook_p hook, char * file,
-				int line);
-static __inline void	_ng_hook_force_queue(hook_p hook, char * file,
-				int line);
-static __inline void	_ng_hook_set_to_inbound(hook_p hook, char * file,
-				int line);
-
-static __inline void
-_chkhook(hook_p hook, char *file, int line)
-{
-	if (hook->hk_magic != HK_MAGIC) {
-		printf("Accessing freed ");
-		dumphook(hook, file, line);
-	}
-	hook->lastline = line;
-	hook->lastfile = file;
-}
-
-static __inline void
-_ng_hook_ref(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	_NG_HOOK_REF(hook);
-}
-
-static __inline char *
-_ng_hook_name(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	return (_NG_HOOK_NAME(hook));
-}
-
-static __inline void
-_ng_hook_unref(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	_NG_HOOK_UNREF(hook);
-}
-
-static __inline void
-_ng_hook_set_private(hook_p hook, void *val, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	_NG_HOOK_SET_PRIVATE(hook, val);
-}
-
-static __inline void
-_ng_hook_set_rcvmsg(hook_p hook, ng_rcvmsg_t *val, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	_NG_HOOK_SET_RCVMSG(hook, val);
-}
-
-static __inline void
-_ng_hook_set_rcvdata(hook_p hook, ng_rcvdata_t *val, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	_NG_HOOK_SET_RCVDATA(hook, val);
-}
-
-static __inline void *
-_ng_hook_private(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	return (_NG_HOOK_PRIVATE(hook));
-}
-
-static __inline int
-_ng_hook_not_valid(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	return (_NG_HOOK_NOT_VALID(hook));
-}
-
-static __inline int
-_ng_hook_is_valid(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	return (_NG_HOOK_IS_VALID(hook));
-}
-
-static __inline node_p
-_ng_hook_node(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	return (_NG_HOOK_NODE(hook));
-}
-
-static __inline hook_p
-_ng_hook_peer(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	return (_NG_HOOK_PEER(hook));
-}
-
-static __inline void
-_ng_hook_force_writer(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	_NG_HOOK_FORCE_WRITER(hook);
-}
-
-static __inline void
-_ng_hook_force_queue(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	_NG_HOOK_FORCE_QUEUE(hook);
-}
-
-static __inline void
-_ng_hook_set_to_inbound(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	_NG_HOOK_SET_TO_INBOUND(hook);
-}
-
-static __inline void
-_ng_hook_hi_stack(hook_p hook, char * file, int line)
-{
-	_chkhook(hook, file, line);
-	_NG_HOOK_HI_STACK(hook);
-}
-
-
-#define	NG_HOOK_REF(hook)		_ng_hook_ref(hook, _NN_)
-#define NG_HOOK_NAME(hook)		_ng_hook_name(hook, _NN_)
-#define NG_HOOK_UNREF(hook)		_ng_hook_unref(hook, _NN_)
-#define	NG_HOOK_SET_PRIVATE(hook, val)	_ng_hook_set_private(hook, val, _NN_)
-#define	NG_HOOK_SET_RCVMSG(hook, val)	_ng_hook_set_rcvmsg(hook, val, _NN_)
-#define	NG_HOOK_SET_RCVDATA(hook, val)	_ng_hook_set_rcvdata(hook, val, _NN_)
-#define	NG_HOOK_PRIVATE(hook)		_ng_hook_private(hook, _NN_)
-#define NG_HOOK_NOT_VALID(hook)		_ng_hook_not_valid(hook, _NN_)
-#define NG_HOOK_IS_VALID(hook)		_ng_hook_is_valid(hook, _NN_)
-#define NG_HOOK_NODE(hook)		_ng_hook_node(hook, _NN_)
-#define NG_HOOK_PEER(hook)		_ng_hook_peer(hook, _NN_)
-#define NG_HOOK_FORCE_WRITER(hook)	_ng_hook_force_writer(hook, _NN_)
-#define NG_HOOK_FORCE_QUEUE(hook)	_ng_hook_force_queue(hook, _NN_)
-#define NG_HOOK_SET_TO_INBOUND(hook)	_ng_hook_set_to_inbound(hook, _NN_)
-#define NG_HOOK_HI_STACK(hook)		_ng_hook_hi_stack(hook, _NN_)
-
-#else	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-
-#define	NG_HOOK_REF(hook)		_NG_HOOK_REF(hook)
-#define NG_HOOK_NAME(hook)		_NG_HOOK_NAME(hook)
-#define NG_HOOK_UNREF(hook)		_NG_HOOK_UNREF(hook)
-#define	NG_HOOK_SET_PRIVATE(hook, val)	_NG_HOOK_SET_PRIVATE(hook, val)
-#define	NG_HOOK_SET_RCVMSG(hook, val)	_NG_HOOK_SET_RCVMSG(hook, val)
-#define	NG_HOOK_SET_RCVDATA(hook, val)	_NG_HOOK_SET_RCVDATA(hook, val)
-#define	NG_HOOK_PRIVATE(hook)		_NG_HOOK_PRIVATE(hook)
-#define NG_HOOK_NOT_VALID(hook)		_NG_HOOK_NOT_VALID(hook)
-#define NG_HOOK_IS_VALID(hook)		_NG_HOOK_IS_VALID(hook)
-#define NG_HOOK_NODE(hook)		_NG_HOOK_NODE(hook)
-#define NG_HOOK_PEER(hook)		_NG_HOOK_PEER(hook)
-#define NG_HOOK_FORCE_WRITER(hook)	_NG_HOOK_FORCE_WRITER(hook)
-#define NG_HOOK_FORCE_QUEUE(hook)	_NG_HOOK_FORCE_QUEUE(hook)
-#define NG_HOOK_SET_TO_INBOUND(hook)	_NG_HOOK_SET_TO_INBOUND(hook)
-#define NG_HOOK_HI_STACK(hook)		_NG_HOOK_HI_STACK(hook)
-
-#endif	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-
-/***********************************************************************
- ***************** Node Structure and Methods **************************
- ***********************************************************************
- * Structure of a node
- * including the eembedded queue structure.
- *
- * The structure for queueing Netgraph request items
- * embedded in the node structure
- */
-struct ng_queue {
-	u_int		q_flags;	/* Current r/w/q lock flags */
-	u_int		q_flags2;	/* Other queue flags */
-	struct mtx	q_mtx;
-	STAILQ_ENTRY(ng_node)	q_work;	/* nodes with work to do */
-	STAILQ_HEAD(, ng_item)	queue;	/* actually items queue */
-};
-
-struct ng_node {
-	char	nd_name[NG_NODESIZ];	/* optional globally unique name */
-	struct	ng_type *nd_type;	/* the installed 'type' */
-	int	nd_flags;		/* see below for bit definitions */
-	int	nd_numhooks;		/* number of hooks */
-	void   *nd_private;		/* node type dependant node ID */
-	ng_ID_t	nd_ID;			/* Unique per node */
-	LIST_HEAD(hooks, ng_hook) nd_hooks;	/* linked list of node hooks */
-	LIST_ENTRY(ng_node)	  nd_nodes;	/* name hash collision list */
-	LIST_ENTRY(ng_node)	  nd_idnodes;	/* ID hash collision list */
-	struct	ng_queue	  nd_input_queue; /* input queue for locking */
-	int	nd_refs;		/* # of references to this node */
-	struct	vnet		 *nd_vnet;	/* network stack instance */
-#ifdef	NETGRAPH_DEBUG /*----------------------------------------------*/
-#define ND_MAGIC 0x59264837
-	int	nd_magic;
-	char	*lastfile;
-	int	lastline;
-	SLIST_ENTRY(ng_node)	  nd_all;	/* all existing nodes */
-#endif	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-};
-
-/* Flags for a node */
-#define NGF_INVALID	0x00000001	/* free when refs go to 0 */
-#define NG_INVALID	NGF_INVALID	/* compat for old code */
-#define NGF_FORCE_WRITER	0x00000004	/* Never multithread this node */
-#define NG_FORCE_WRITER	NGF_FORCE_WRITER /* compat for old code */
-#define NGF_CLOSING	0x00000008	/* ng_rmnode() at work */
-#define NG_CLOSING	NGF_CLOSING	/* compat for old code */
-#define NGF_REALLY_DIE	0x00000010	/* "persistent" node is unloading */
-#define NG_REALLY_DIE	NGF_REALLY_DIE	/* compat for old code */
-#define NGF_HI_STACK	0x00000020	/* node has hi stack usage */
-#define NGF_TYPE1	0x10000000	/* reserved for type specific storage */
-#define NGF_TYPE2	0x20000000	/* reserved for type specific storage */
-#define NGF_TYPE3	0x40000000	/* reserved for type specific storage */
-#define NGF_TYPE4	0x80000000	/* reserved for type specific storage */
-
-/*
- * Public methods for nodes.
- * If you can't do it with these you probably shouldn't be doing it.
- */
-void	ng_unref_node(node_p node); /* don't move this */
-#define _NG_NODE_NAME(node)	((node)->nd_name + 0)
-#define _NG_NODE_HAS_NAME(node)	((node)->nd_name[0] + 0)
-#define _NG_NODE_ID(node)	((node)->nd_ID + 0)
-#define	_NG_NODE_REF(node)	refcount_acquire(&(node)->nd_refs)
-#define	_NG_NODE_UNREF(node)	ng_unref_node(node)
-#define	_NG_NODE_SET_PRIVATE(node, val)	do {(node)->nd_private = val;} while (0)
-#define	_NG_NODE_PRIVATE(node)	((node)->nd_private)
-#define _NG_NODE_IS_VALID(node)	(!((node)->nd_flags & NGF_INVALID))
-#define _NG_NODE_NOT_VALID(node)	((node)->nd_flags & NGF_INVALID)
-#define _NG_NODE_NUMHOOKS(node)	((node)->nd_numhooks + 0) /* rvalue */
-#define _NG_NODE_FORCE_WRITER(node)					\
-	do{ node->nd_flags |= NGF_FORCE_WRITER; }while (0)
-#define _NG_NODE_HI_STACK(node)						\
-	do{ node->nd_flags |= NGF_HI_STACK; }while (0)
-#define _NG_NODE_REALLY_DIE(node)					\
-	do{ node->nd_flags |= (NGF_REALLY_DIE|NGF_INVALID); }while (0)
-#define _NG_NODE_REVIVE(node) \
-	do { node->nd_flags &= ~NGF_INVALID; } while (0)
-/*
- * The hook iterator.
- * This macro will call a function of type ng_fn_eachhook for each
- * hook attached to the node. If the function returns 0, then the
- * iterator will stop and return a pointer to the hook that returned 0.
- */
-typedef	int	ng_fn_eachhook(hook_p hook, void* arg);
-#define _NG_NODE_FOREACH_HOOK(node, fn, arg, rethook)			\
-	do {								\
-		hook_p _hook;						\
-		(rethook) = NULL;					\
-		LIST_FOREACH(_hook, &((node)->nd_hooks), hk_hooks) {	\
-			if ((fn)(_hook, arg) == 0) {			\
-				(rethook) = _hook;			\
-				break;					\
-			}						\
-		}							\
-	} while (0)
-
-#ifdef	NETGRAPH_DEBUG /*----------------------------------------------*/
-void	dumpnode(node_p node, char *file, int line);
-static __inline void _chknode(node_p node, char *file, int line);
-static __inline char * _ng_node_name(node_p node, char *file, int line);
-static __inline int _ng_node_has_name(node_p node, char *file, int line);
-static __inline ng_ID_t _ng_node_id(node_p node, char *file, int line);
-static __inline void _ng_node_ref(node_p node, char *file, int line);
-static __inline void _ng_node_unref(node_p node, char *file, int line);
-static __inline void _ng_node_set_private(node_p node, void * val,
-							char *file, int line);
-static __inline void * _ng_node_private(node_p node, char *file, int line);
-static __inline int _ng_node_is_valid(node_p node, char *file, int line);
-static __inline int _ng_node_not_valid(node_p node, char *file, int line);
-static __inline int _ng_node_numhooks(node_p node, char *file, int line);
-static __inline void _ng_node_force_writer(node_p node, char *file, int line);
-static __inline hook_p _ng_node_foreach_hook(node_p node,
-			ng_fn_eachhook *fn, void *arg, char *file, int line);
-static __inline void _ng_node_revive(node_p node, char *file, int line);
-
-static __inline void
-_chknode(node_p node, char *file, int line)
-{
-	if (node->nd_magic != ND_MAGIC) {
-		printf("Accessing freed ");
-		dumpnode(node, file, line);
-	}
-	node->lastline = line;
-	node->lastfile = file;
-}
-
-static __inline char *
-_ng_node_name(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	return(_NG_NODE_NAME(node));
-}
-
-static __inline int
-_ng_node_has_name(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	return(_NG_NODE_HAS_NAME(node));
-}
-
-static __inline ng_ID_t
-_ng_node_id(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	return(_NG_NODE_ID(node));
-}
-
-static __inline void
-_ng_node_ref(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	_NG_NODE_REF(node);
-}
-
-static __inline void
-_ng_node_unref(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	_NG_NODE_UNREF(node);
-}
-
-static __inline void
-_ng_node_set_private(node_p node, void * val, char *file, int line)
-{
-	_chknode(node, file, line);
-	_NG_NODE_SET_PRIVATE(node, val);
-}
-
-static __inline void *
-_ng_node_private(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	return (_NG_NODE_PRIVATE(node));
-}
-
-static __inline int
-_ng_node_is_valid(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	return(_NG_NODE_IS_VALID(node));
-}
-
-static __inline int
-_ng_node_not_valid(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	return(_NG_NODE_NOT_VALID(node));
-}
-
-static __inline int
-_ng_node_numhooks(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	return(_NG_NODE_NUMHOOKS(node));
-}
-
-static __inline void
-_ng_node_force_writer(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	_NG_NODE_FORCE_WRITER(node);
-}
-
-static __inline void
-_ng_node_hi_stack(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	_NG_NODE_HI_STACK(node);
-}
-
-static __inline void
-_ng_node_really_die(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	_NG_NODE_REALLY_DIE(node);
-}
-
-static __inline void
-_ng_node_revive(node_p node, char *file, int line)
-{
-	_chknode(node, file, line);
-	_NG_NODE_REVIVE(node);
-}
-
-static __inline hook_p
-_ng_node_foreach_hook(node_p node, ng_fn_eachhook *fn, void *arg,
-						char *file, int line)
-{
-	hook_p hook;
-	_chknode(node, file, line);
-	_NG_NODE_FOREACH_HOOK(node, fn, arg, hook);
-	return (hook);
-}
-
-#define NG_NODE_NAME(node)		_ng_node_name(node, _NN_)	
-#define NG_NODE_HAS_NAME(node)		_ng_node_has_name(node, _NN_)	
-#define NG_NODE_ID(node)		_ng_node_id(node, _NN_)
-#define NG_NODE_REF(node)		_ng_node_ref(node, _NN_)
-#define	NG_NODE_UNREF(node)		_ng_node_unref(node, _NN_)
-#define	NG_NODE_SET_PRIVATE(node, val)	_ng_node_set_private(node, val, _NN_)
-#define	NG_NODE_PRIVATE(node)		_ng_node_private(node, _NN_)
-#define NG_NODE_IS_VALID(node)		_ng_node_is_valid(node, _NN_)
-#define NG_NODE_NOT_VALID(node)		_ng_node_not_valid(node, _NN_)
-#define NG_NODE_FORCE_WRITER(node) 	_ng_node_force_writer(node, _NN_)
-#define NG_NODE_HI_STACK(node) 		_ng_node_hi_stack(node, _NN_)
-#define NG_NODE_REALLY_DIE(node) 	_ng_node_really_die(node, _NN_)
-#define NG_NODE_NUMHOOKS(node)		_ng_node_numhooks(node, _NN_)
-#define NG_NODE_REVIVE(node)		_ng_node_revive(node, _NN_)
-#define NG_NODE_FOREACH_HOOK(node, fn, arg, rethook)			      \
-	do {								      \
-		rethook = _ng_node_foreach_hook(node, fn, (void *)arg, _NN_); \
-	} while (0)
-
-#else	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-
-#define NG_NODE_NAME(node)		_NG_NODE_NAME(node)	
-#define NG_NODE_HAS_NAME(node)		_NG_NODE_HAS_NAME(node)	
-#define NG_NODE_ID(node)		_NG_NODE_ID(node)	
-#define	NG_NODE_REF(node)		_NG_NODE_REF(node)	
-#define	NG_NODE_UNREF(node)		_NG_NODE_UNREF(node)	
-#define	NG_NODE_SET_PRIVATE(node, val)	_NG_NODE_SET_PRIVATE(node, val)	
-#define	NG_NODE_PRIVATE(node)		_NG_NODE_PRIVATE(node)	
-#define NG_NODE_IS_VALID(node)		_NG_NODE_IS_VALID(node)	
-#define NG_NODE_NOT_VALID(node)		_NG_NODE_NOT_VALID(node)	
-#define NG_NODE_FORCE_WRITER(node) 	_NG_NODE_FORCE_WRITER(node)
-#define NG_NODE_HI_STACK(node) 		_NG_NODE_HI_STACK(node)
-#define NG_NODE_REALLY_DIE(node) 	_NG_NODE_REALLY_DIE(node)
-#define NG_NODE_NUMHOOKS(node)		_NG_NODE_NUMHOOKS(node)	
-#define NG_NODE_REVIVE(node)		_NG_NODE_REVIVE(node)
-#define NG_NODE_FOREACH_HOOK(node, fn, arg, rethook)			\
-		_NG_NODE_FOREACH_HOOK(node, fn, arg, rethook)
-#endif	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-
-/***********************************************************************
- ************* Node Queue and Item Structures and Methods **************
- ***********************************************************************
- *
- */
-typedef	void	ng_item_fn(node_p node, hook_p hook, void *arg1, int arg2);
-typedef	int	ng_item_fn2(node_p node, struct ng_item *item, hook_p hook);
-typedef	void	ng_apply_t(void *context, int error);
-struct ng_apply_info {
-	ng_apply_t	*apply;
-	void		*context;
-	int		refs;
-	int		error;
-};
-struct ng_item {
-	u_long	el_flags;
-	STAILQ_ENTRY(ng_item)	el_next;
-	node_p	el_dest; /* The node it will be applied against (or NULL) */
-	hook_p	el_hook; /* Entering hook. Optional in Control messages */
-	union {
-		struct mbuf	*da_m;
-		struct {
-			struct ng_mesg	*msg_msg;
-			ng_ID_t		msg_retaddr;
-		} msg;
-		struct {
-			union {
-				ng_item_fn	*fn_fn;
-				ng_item_fn2	*fn_fn2;
-			} fn_fn;
-			void 		*fn_arg1;
-			int		fn_arg2;
-		} fn;
-	} body;
-	/*
-	 * Optional callback called when item is being applied,
-	 * and its context.
-	 */
-	struct ng_apply_info	*apply;
-	u_int	depth;
-#ifdef	NETGRAPH_DEBUG /*----------------------------------------------*/
-	char *lastfile;
-	int  lastline;
-	TAILQ_ENTRY(ng_item)	  all;		/* all existing items */
-#endif	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-};
-
-#define NGQF_TYPE	0x03		/* MASK of content definition */
-#define NGQF_MESG	0x00		/* the queue element is a message */
-#define NGQF_DATA	0x01		/* the queue element is data */
-#define NGQF_FN		0x02		/* the queue element is a function */
-#define NGQF_FN2	0x03		/* the queue element is a new function */
-
-#define NGQF_RW		0x04		/* MASK for wanted queue mode */
-#define NGQF_READER	0x04		/* wants to be a reader */
-#define NGQF_WRITER	0x00		/* wants to be a writer */
-
-#define NGQF_QMODE	0x08		/* MASK for how it was queued */
-#define NGQF_QREADER	0x08		/* was queued as a reader */
-#define NGQF_QWRITER	0x00		/* was queued as a writer */
-
-/*
- * Get the mbuf (etc) out of an item.
- * Sets the value in the item to NULL in case we need to call NG_FREE_ITEM()
- * with it, (to avoid freeing the things twice).
- * If you don't want to zero out the item then realise that the
- * item still owns it.
- * Retaddr is different. There are no references on that. It's just a number.
- * The debug versions must be either all used everywhere or not at all.
- */
-
-#define _NGI_M(i) ((i)->body.da_m)
-#define _NGI_MSG(i) ((i)->body.msg.msg_msg)
-#define _NGI_RETADDR(i) ((i)->body.msg.msg_retaddr)
-#define	_NGI_FN(i) ((i)->body.fn.fn_fn.fn_fn)
-#define	_NGI_FN2(i) ((i)->body.fn.fn_fn.fn_fn2)
-#define	_NGI_ARG1(i) ((i)->body.fn.fn_arg1)
-#define	_NGI_ARG2(i) ((i)->body.fn.fn_arg2)
-#define	_NGI_NODE(i) ((i)->el_dest)
-#define	_NGI_HOOK(i) ((i)->el_hook)
-#define	_NGI_SET_HOOK(i,h) do { _NGI_HOOK(i) = h; h = NULL;} while (0)
-#define	_NGI_CLR_HOOK(i)   do {						\
-		hook_p _hook = _NGI_HOOK(i);				\
-		if (_hook) {						\
-			_NG_HOOK_UNREF(_hook);				\
-			_NGI_HOOK(i) = NULL;				\
-		}							\
-	} while (0)
-#define	_NGI_SET_NODE(i,n) do { _NGI_NODE(i) = n; n = NULL;} while (0)
-#define	_NGI_CLR_NODE(i)   do {						\
-		node_p _node = _NGI_NODE(i);				\
-		if (_node) {						\
-			_NG_NODE_UNREF(_node);				\
-			_NGI_NODE(i) = NULL;				\
-		}							\
-	} while (0)
-
-#ifdef NETGRAPH_DEBUG /*----------------------------------------------*/
-void				dumpitem(item_p item, char *file, int line);
-static __inline void		_ngi_check(item_p item, char *file, int line) ;
-static __inline struct mbuf **	_ngi_m(item_p item, char *file, int line) ;
-static __inline ng_ID_t *	_ngi_retaddr(item_p item, char *file, int line);
-static __inline struct ng_mesg ** _ngi_msg(item_p item, char *file, int line) ;
-static __inline ng_item_fn **	_ngi_fn(item_p item, char *file, int line) ;
-static __inline ng_item_fn2 **	_ngi_fn2(item_p item, char *file, int line) ;
-static __inline void **		_ngi_arg1(item_p item, char *file, int line) ;
-static __inline int *		_ngi_arg2(item_p item, char *file, int line) ;
-static __inline node_p		_ngi_node(item_p item, char *file, int line);
-static __inline hook_p		_ngi_hook(item_p item, char *file, int line);
-
-static __inline void
-_ngi_check(item_p item, char *file, int line)
-{
-	(item)->lastline = line;
-	(item)->lastfile = file;
-}
-
-static __inline struct mbuf **
-_ngi_m(item_p item, char *file, int line)
-{
-	_ngi_check(item, file, line);
-	return (&_NGI_M(item));
-}
-
-static __inline struct ng_mesg **
-_ngi_msg(item_p item, char *file, int line)
-{
-	_ngi_check(item, file, line);
-	return (&_NGI_MSG(item));
-}
-
-static __inline ng_ID_t *
-_ngi_retaddr(item_p item, char *file, int line)
-{
-	_ngi_check(item, file, line);
-	return (&_NGI_RETADDR(item));
-}
-
-static __inline ng_item_fn **
-_ngi_fn(item_p item, char *file, int line)
-{
-	_ngi_check(item, file, line);
-	return (&_NGI_FN(item));
-}
-
-static __inline ng_item_fn2 **
-_ngi_fn2(item_p item, char *file, int line)
-{
-	_ngi_check(item, file, line);
-	return (&_NGI_FN2(item));
-}
-
-static __inline void **
-_ngi_arg1(item_p item, char *file, int line)
-{
-	_ngi_check(item, file, line);
-	return (&_NGI_ARG1(item));
-}
-
-static __inline int *
-_ngi_arg2(item_p item, char *file, int line)
-{
-	_ngi_check(item, file, line);
-	return (&_NGI_ARG2(item));
-}
-
-static __inline node_p
-_ngi_node(item_p item, char *file, int line)
-{
-	_ngi_check(item, file, line);
-	return (_NGI_NODE(item));
-}
-
-static __inline hook_p
-_ngi_hook(item_p item, char *file, int line)
-{
-	_ngi_check(item, file, line);
-	return (_NGI_HOOK(item));
-}
-
-#define NGI_M(i)	(*_ngi_m(i, _NN_))
-#define NGI_MSG(i)	(*_ngi_msg(i, _NN_))
-#define NGI_RETADDR(i)	(*_ngi_retaddr(i, _NN_))
-#define NGI_FN(i)	(*_ngi_fn(i, _NN_))
-#define NGI_FN2(i)	(*_ngi_fn2(i, _NN_))
-#define NGI_ARG1(i)	(*_ngi_arg1(i, _NN_))
-#define NGI_ARG2(i)	(*_ngi_arg2(i, _NN_))
-#define NGI_HOOK(i)	_ngi_hook(i, _NN_)
-#define NGI_NODE(i)	_ngi_node(i, _NN_)
-#define	NGI_SET_HOOK(i,h)						\
-	do { _ngi_check(i, _NN_); _NGI_SET_HOOK(i, h); } while (0)
-#define	NGI_CLR_HOOK(i)							\
-	do { _ngi_check(i, _NN_); _NGI_CLR_HOOK(i); } while (0)
-#define	NGI_SET_NODE(i,n)						\
-	do { _ngi_check(i, _NN_); _NGI_SET_NODE(i, n); } while (0)
-#define	NGI_CLR_NODE(i)							\
-	do { _ngi_check(i, _NN_); _NGI_CLR_NODE(i); } while (0)
-
-#define NG_FREE_ITEM(item)						\
-	do {								\
-		_ngi_check(item, _NN_);					\
-		ng_free_item((item));					\
-	} while (0)
-
-#define	SAVE_LINE(item)							\
-	do {								\
-		(item)->lastline = __LINE__;				\
-		(item)->lastfile = __FILE__;				\
-	} while (0)
-
-#else	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-
-#define NGI_M(i)	_NGI_M(i)
-#define NGI_MSG(i)	_NGI_MSG(i)
-#define NGI_RETADDR(i)	_NGI_RETADDR(i)
-#define NGI_FN(i)	_NGI_FN(i)
-#define NGI_FN2(i)	_NGI_FN2(i)
-#define NGI_ARG1(i)	_NGI_ARG1(i)
-#define NGI_ARG2(i)	_NGI_ARG2(i)
-#define	NGI_NODE(i)	_NGI_NODE(i)
-#define	NGI_HOOK(i)	_NGI_HOOK(i)
-#define	NGI_SET_HOOK(i,h) _NGI_SET_HOOK(i,h)
-#define	NGI_CLR_HOOK(i)	  _NGI_CLR_HOOK(i)
-#define	NGI_SET_NODE(i,n) _NGI_SET_NODE(i,n)
-#define	NGI_CLR_NODE(i)	  _NGI_CLR_NODE(i)
-
-#define	NG_FREE_ITEM(item)	ng_free_item((item))
-#define	SAVE_LINE(item)		do {} while (0)
-
-#endif	/* NETGRAPH_DEBUG */ /*----------------------------------------------*/
-
-#define NGI_GET_M(i,m)							\
-	do {								\
-		(m) = NGI_M(i);						\
-		_NGI_M(i) = NULL;					\
-	} while (0)
-
-#define NGI_GET_MSG(i,m)						\
-	do {								\
-		(m) = NGI_MSG(i);					\
-		_NGI_MSG(i) = NULL;					\
-	} while (0)
-
-#define NGI_GET_NODE(i,n)	/* YOU NOW HAVE THE REFERENCE */	\
-	do {								\
-		(n) = NGI_NODE(i);					\
-		_NGI_NODE(i) = NULL;					\
-	} while (0)
-
-#define NGI_GET_HOOK(i,h)						\
-	do {								\
-		(h) = NGI_HOOK(i);					\
-		_NGI_HOOK(i) = NULL;					\
-	} while (0)
-
-#define NGI_SET_WRITER(i)	((i)->el_flags &= ~NGQF_QMODE)
-#define NGI_SET_READER(i)	((i)->el_flags |= NGQF_QREADER)
-
-#define NGI_QUEUED_READER(i)	((i)->el_flags & NGQF_QREADER)
-#define NGI_QUEUED_WRITER(i)	(((i)->el_flags & NGQF_QMODE) == NGQF_QWRITER)
-	
-/**********************************************************************
-* Data macros.  Send, manipulate and free.
-**********************************************************************/
-/*
- * Assuming the data is already ok, just set the new address and send
- */
-#define NG_FWD_ITEM_HOOK_FLAGS(error, item, hook, flags)		\
-	do {								\
-		(error) =						\
-		    ng_address_hook(NULL, (item), (hook), NG_NOFLAGS);	\
-		if (error == 0) {					\
-			SAVE_LINE(item);				\
-			(error) = ng_snd_item((item), (flags));		\
-		}							\
-		(item) = NULL;						\
-	} while (0)
-#define	NG_FWD_ITEM_HOOK(error, item, hook)	\
-		NG_FWD_ITEM_HOOK_FLAGS(error, item, hook, NG_NOFLAGS)
-
-/*
- * Forward a data packet. Mbuf pointer is updated to new value. We
- * presume you dealt with the old one when you update it to the new one
- * (or it maybe the old one). We got a packet and possibly had to modify
- * the mbuf. You should probably use NGI_GET_M() if you are going to use
- * this too.
- */
-#define NG_FWD_NEW_DATA_FLAGS(error, item, hook, m, flags)		\
-	do {								\
-		NGI_M(item) = (m);					\
-		(m) = NULL;						\
-		NG_FWD_ITEM_HOOK_FLAGS(error, item, hook, flags);	\
-	} while (0)
-#define	NG_FWD_NEW_DATA(error, item, hook, m)	\
-		NG_FWD_NEW_DATA_FLAGS(error, item, hook, m, NG_NOFLAGS)
-
-/* Send a previously unpackaged mbuf. XXX: This should be called
- * NG_SEND_DATA in future, but this name is kept for compatibility
- * reasons.
- */
-#define NG_SEND_DATA_FLAGS(error, hook, m, flags)			\
-	do {								\
-		item_p _item;						\
-		if ((_item = ng_package_data((m), flags))) {		\
-			NG_FWD_ITEM_HOOK_FLAGS(error, _item, hook, flags);\
-		} else {						\
-			(error) = ENOMEM;				\
-		}							\
-		(m) = NULL;						\
-	} while (0)
-
-#define NG_SEND_DATA_ONLY(error, hook, m)	\
-		NG_SEND_DATA_FLAGS(error, hook, m, NG_NOFLAGS)
-/* NG_SEND_DATA() compat for meta-data times */
-#define	NG_SEND_DATA(error, hook, m, x)	\
-		NG_SEND_DATA_FLAGS(error, hook, m, NG_NOFLAGS)
-
-#define NG_FREE_MSG(msg)						\
-	do {								\
-		if ((msg)) {						\
-			free((msg), M_NETGRAPH_MSG);			\
-			(msg) = NULL;					\
-		}	 						\
-	} while (0)
-
-#define NG_FREE_M(m)							\
-	do {								\
-		if ((m)) {						\
-			m_freem((m));					\
-			(m) = NULL;					\
-		}							\
-	} while (0)
-
-/*****************************************
-* Message macros
-*****************************************/
-
-#define NG_SEND_MSG_HOOK(error, here, msg, hook, retaddr)		\
-	do {								\
-		item_p _item;						\
-		if ((_item = ng_package_msg(msg, NG_NOFLAGS)) == NULL) {\
-			(msg) = NULL;					\
-			(error) = ENOMEM;				\
-			break;						\
-		}							\
-		if (((error) = ng_address_hook((here), (_item),		\
-					(hook), (retaddr))) == 0) {	\
-			SAVE_LINE(_item);				\
-			(error) = ng_snd_item((_item), 0);		\
-		}							\
-		(msg) = NULL;						\
-	} while (0)
-
-#define NG_SEND_MSG_PATH(error, here, msg, path, retaddr)		\
-	do {								\
-		item_p _item;						\
-		if ((_item = ng_package_msg(msg, NG_NOFLAGS)) == NULL) {\
-			(msg) = NULL;					\
-			(error) = ENOMEM;				\
-			break;						\
-		}							\
-		if (((error) = ng_address_path((here), (_item),		\
-					(path), (retaddr))) == 0) {	\
-			SAVE_LINE(_item);				\
-			(error) = ng_snd_item((_item), 0);		\
-		}							\
-		(msg) = NULL;						\
-	} while (0)
-
-#define NG_SEND_MSG_ID(error, here, msg, ID, retaddr)			\
-	do {								\
-		item_p _item;						\
-		if ((_item = ng_package_msg(msg, NG_NOFLAGS)) == NULL) {\
-			(msg) = NULL;					\
-			(error) = ENOMEM;				\
-			break;						\
-		}							\
-		if (((error) = ng_address_ID((here), (_item),		\
-					(ID), (retaddr))) == 0) {	\
-			SAVE_LINE(_item);				\
-			(error) = ng_snd_item((_item), 0);		\
-		}							\
-		(msg) = NULL;						\
-	} while (0)
-
-/*
- * Redirect the message to the next hop using the given hook.
- * ng_retarget_msg() frees the item if there is an error
- * and returns an error code.  It returns 0 on success.
- */
-#define NG_FWD_MSG_HOOK(error, here, item, hook, retaddr)		\
-	do {								\
-		if (((error) = ng_address_hook((here), (item),		\
-					(hook), (retaddr))) == 0) {	\
-			SAVE_LINE(item);				\
-			(error) = ng_snd_item((item), 0);		\
-		}							\
-		(item) = NULL;						\
-	} while (0)
-
-/*
- * Send a queue item back to it's originator with a response message.
- * Assume original message was removed and freed separatly.
- */
-#define NG_RESPOND_MSG(error, here, item, resp)				\
-	do {								\
-		if (resp) {						\
-			ng_ID_t _dest = NGI_RETADDR(item);		\
-			NGI_RETADDR(item) = 0;				\
-			NGI_MSG(item) = resp;				\
-			if ((error = ng_address_ID((here), (item),	\
-					_dest, 0)) == 0) {		\
-				SAVE_LINE(item);			\
-				(error) = ng_snd_item((item), NG_QUEUE);\
-			}						\
-		} else							\
-			NG_FREE_ITEM(item);				\
-		(item) = NULL;						\
-	} while (0)
-
-
-/***********************************************************************
- ******** Structures Definitions and Macros for defining a node  *******
- ***********************************************************************
- *
- * Here we define the structures needed to actually define a new node
- * type.
- */
-
-/*
- * Command list -- each node type specifies the command that it knows
- * how to convert between ASCII and binary using an array of these.
- * The last element in the array must be a terminator with cookie=0.
- */
-
-struct ng_cmdlist {
-	uint32_t			cookie;		/* command typecookie */
-	int				cmd;		/* command number */
-	const char			*name;		/* command name */
-	const struct ng_parse_type	*mesgType;	/* args if !NGF_RESP */
-	const struct ng_parse_type	*respType;	/* args if NGF_RESP */
-};
-
-/*
- * Structure of a node type
- * If data is sent to the "rcvdata()" entrypoint then the system
- * may decide to defer it until later by queing it with the normal netgraph
- * input queuing system.  This is decidde by the HK_QUEUE flag being set in
- * the flags word of the peer (receiving) hook. The dequeuing mechanism will
- * ensure it is not requeued again.
- * Note the input queueing system is to allow modules
- * to 'release the stack' or to pass data across spl layers.
- * The data will be redelivered as soon as the NETISR code runs
- * which may be almost immediatly.  A node may also do it's own queueing
- * for other reasons (e.g. device output queuing).
- */
-struct ng_type {
-
-	uint32_t	version; 	/* must equal NG_API_VERSION */
-	const char	*name;		/* Unique type name */
-	modeventhand_t	mod_event;	/* Module event handler (optional) */
-	ng_constructor_t *constructor;	/* Node constructor */
-	ng_rcvmsg_t	*rcvmsg;	/* control messages come here */
-	ng_close_t	*close;		/* warn about forthcoming shutdown */
-	ng_shutdown_t	*shutdown;	/* reset, and free resources */
-	ng_newhook_t	*newhook;	/* first notification of new hook */
-	ng_findhook_t	*findhook;	/* only if you have lots of hooks */
-	ng_connect_t	*connect;	/* final notification of new hook */
-	ng_rcvdata_t	*rcvdata;	/* data comes here */
-	ng_disconnect_t	*disconnect;	/* notify on disconnect */
-
-	const struct	ng_cmdlist *cmdlist;	/* commands we can convert */
-
-	/* R/W data private to the base netgraph code DON'T TOUCH! */
-	LIST_ENTRY(ng_type) types;		/* linked list of all types */
-	int		    refs;		/* number of instances */
-};
-
-/*
- * Use the NETGRAPH_INIT() macro to link a node type into the
- * netgraph system. This works for types compiled into the kernel
- * as well as KLD modules. The first argument should be the type
- * name (eg, echo) and the second a pointer to the type struct.
- *
- * If a different link time is desired, e.g., a device driver that
- * needs to install its netgraph type before probing, use the
- * NETGRAPH_INIT_ORDERED() macro instead.  Device drivers probably
- * want to use SI_SUB_DRIVERS/SI_ORDER_FIRST.
- */
-
-#define NETGRAPH_INIT_ORDERED(typename, typestructp, sub, order)	\
-static moduledata_t ng_##typename##_mod = {				\
-	"ng_" #typename,						\
-	ng_mod_event,							\
-	(typestructp)							\
-};									\
-DECLARE_MODULE(ng_##typename, ng_##typename##_mod, sub, order);		\
-MODULE_DEPEND(ng_##typename, netgraph,	NG_ABI_VERSION,			\
-					NG_ABI_VERSION,			\
-					NG_ABI_VERSION)
-
-#define NETGRAPH_INIT(tn, tp)						\
-	NETGRAPH_INIT_ORDERED(tn, tp, SI_SUB_PSEUDO, SI_ORDER_MIDDLE)
-
-/* Special malloc() type for netgraph structs and ctrl messages */
-/* Only these two types should be visible to nodes */
-MALLOC_DECLARE(M_NETGRAPH);
-MALLOC_DECLARE(M_NETGRAPH_MSG);
-
-/* declare the base of the netgraph sysclt hierarchy */
-/* but only if this file cares about sysctls */
-#ifdef	SYSCTL_DECL
-SYSCTL_DECL(_net_graph);
-#endif
-
-/*
- * Methods that the nodes can use.
- * Many of these methods should usually NOT be used directly but via
- * Macros above.
- */
-int	ng_address_ID(node_p here, item_p item, ng_ID_t ID, ng_ID_t retaddr);
-int	ng_address_hook(node_p here, item_p item, hook_p hook, ng_ID_t retaddr);
-int	ng_address_path(node_p here, item_p item, const char *address, ng_ID_t raddr);
-int	ng_bypass(hook_p hook1, hook_p hook2);
-hook_p	ng_findhook(node_p node, const char *name);
-struct	ng_type *ng_findtype(const char *type);
-int	ng_make_node_common(struct ng_type *typep, node_p *nodep);
-int	ng_name_node(node_p node, const char *name);
-node_p	ng_name2noderef(node_p node, const char *name);
-int	ng_newtype(struct ng_type *tp);
-ng_ID_t ng_node2ID(node_p node);
-item_p	ng_package_data(struct mbuf *m, int flags);
-item_p	ng_package_msg(struct ng_mesg *msg, int flags);
-item_p	ng_package_msg_self(node_p here, hook_p hook, struct ng_mesg *msg);
-void	ng_replace_retaddr(node_p here, item_p item, ng_ID_t retaddr);
-int	ng_rmhook_self(hook_p hook);	/* if a node wants to kill a hook */
-int	ng_rmnode_self(node_p here);	/* if a node wants to suicide */
-int	ng_rmtype(struct ng_type *tp);
-int	ng_snd_item(item_p item, int queue);
-int 	ng_send_fn(node_p node, hook_p hook, ng_item_fn *fn, void *arg1,
-	int arg2);
-int 	ng_send_fn1(node_p node, hook_p hook, ng_item_fn *fn, void *arg1,
-	int arg2, int flags);
-int 	ng_send_fn2(node_p node, hook_p hook, item_p pitem, ng_item_fn2 *fn,
-	void *arg1, int arg2, int flags);
-int	ng_uncallout(struct callout *c, node_p node);
-int	ng_callout(struct callout *c, node_p node, hook_p hook, int ticks,
-	    ng_item_fn *fn, void * arg1, int arg2);
-#define	ng_callout_init(c)	callout_init(c, CALLOUT_MPSAFE)
-
-/* Flags for netgraph functions. */
-#define	NG_NOFLAGS	0x00000000	/* no special options */
-#define	NG_QUEUE	0x00000001	/* enqueue item, don't dispatch */
-#define	NG_WAITOK	0x00000002	/* use M_WAITOK, etc. */
-/* XXXGL: NG_PROGRESS unused since ng_base.c rev. 1.136. Should be deleted? */
-#define	NG_PROGRESS	0x00000004	/* return EINPROGRESS if queued */
-#define	NG_REUSE_ITEM	0x00000008	/* supplied item should be reused */
-
-/*
- * prototypes the user should DEFINITELY not use directly
- */
-void	ng_free_item(item_p item); /* Use NG_FREE_ITEM instead */
-int	ng_mod_event(module_t mod, int what, void *arg);
-
-/*
- * Tag definitions and constants
- */
-
-#define	NG_TAG_PRIO	1
-
-struct ng_tag_prio {
-	struct m_tag	tag;
-	char	priority;
-	char	discardability;
-};
-
-#define	NG_PRIO_CUTOFF		32
-#define	NG_PRIO_LINKSTATE	64
-
-/* Macros and declarations to keep compatibility with metadata, which
- * is obsoleted now. To be deleted.
- */
-typedef void *meta_p;
-#define _NGI_META(i)	NULL
-#define NGI_META(i)	NULL
-#define NG_FREE_META(meta)
-#define NGI_GET_META(i,m)
-#define	ng_copy_meta(meta) NULL
-
-/*
- * Mark the current thread when called from the outbound path of the
- * network stack, in order to enforce queuing on ng nodes calling into
- * the inbound network stack path.
- */
-#define NG_OUTBOUND_THREAD_REF()					\
-	curthread->td_ng_outbound++
-#define NG_OUTBOUND_THREAD_UNREF()					\
-	do {								\
-		curthread->td_ng_outbound--;				\
-		KASSERT(curthread->td_ng_outbound >= 0,			\
-		    ("%s: negative td_ng_outbound", __func__));		\
-	} while (0)
-
-#endif /* _NETGRAPH_NETGRAPH_H_ */
diff --git a/include.new/netgraph/ng_UI.h b/include.new/netgraph/ng_UI.h
deleted file mode 100644
index 8d2a5b9..0000000
--- a/include.new/netgraph/ng_UI.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * ng_UI.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Julian Elischer <julian@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_UI.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_UI.h,v 1.6 1999/01/20 00:54:15 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_UI_H_
-#define _NETGRAPH_NG_UI_H_
-
-/* Node type name and cookie */
-#define NG_UI_NODE_TYPE		"UI"
-#define NGM_UI_COOKIE		884639499
-
-/* Hook names */
-#define NG_UI_HOOK_DOWNSTREAM	"downstream"
-#define NG_UI_HOOK_UPSTREAM	"upstream"
-
-#endif /* _NETGRAPH_NG_UI_H_ */
-
diff --git a/include.new/netgraph/ng_async.h b/include.new/netgraph/ng_async.h
deleted file mode 100644
index ad37648..0000000
--- a/include.new/netgraph/ng_async.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * ng_async.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_async.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_async.h,v 1.5 1999/01/25 01:17:14 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_ASYNC_H_
-#define _NETGRAPH_NG_ASYNC_H_
-
-/* Type name and cookie */
-#define NG_ASYNC_NODE_TYPE	"async"
-#define NGM_ASYNC_COOKIE	886473717
-
-/* Hook names */
-#define NG_ASYNC_HOOK_SYNC	"sync"	/* Sync frames */
-#define NG_ASYNC_HOOK_ASYNC	"async"	/* Async-encoded frames */
-
-/* Maximum receive size bounds (for both sync and async sides) */
-#define NG_ASYNC_MIN_MRU	1
-#define NG_ASYNC_MAX_MRU	8192
-#define NG_ASYNC_DEFAULT_MRU	1600
-
-/* Frame statistics */
-struct ng_async_stat {
-	uint32_t	syncOctets;
-	uint32_t	syncFrames;
-	uint32_t	syncOverflows;
-	uint32_t	asyncOctets;
-	uint32_t	asyncFrames;
-	uint32_t	asyncRunts;
-	uint32_t	asyncOverflows;
-	uint32_t	asyncBadCheckSums;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_ASYNC_STATS_TYPE_INFO	{			\
-	  { "syncOctets",	&ng_parse_uint32_type	},	\
-	  { "syncFrames",	&ng_parse_uint32_type	},	\
-	  { "syncOverflows",	&ng_parse_uint32_type	},	\
-	  { "asyncOctets",	&ng_parse_uint32_type	},	\
-	  { "asyncFrames",	&ng_parse_uint32_type	},	\
-	  { "asyncRunts",	&ng_parse_uint32_type	},	\
-	  { "asyncOverflows",	&ng_parse_uint32_type	},	\
-	  { "asyncBadCheckSums",&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-/* Configuration for this node */
-struct ng_async_cfg {
-	u_char		enabled;	/* Turn encoding on/off */
-	u_int16_t	amru;		/* Max receive async frame length */
-	u_int16_t	smru;		/* Max receive sync frame length */
-	uint32_t	accm;		/* ACCM encoding */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_ASYNC_CONFIG_TYPE_INFO	{			\
-	  { "enabled",		&ng_parse_int8_type	},	\
-	  { "amru",		&ng_parse_uint16_type	},	\
-	  { "smru",		&ng_parse_uint16_type	},	\
-	  { "accm",		&ng_parse_hint32_type	},	\
-	  { NULL }						\
-}
-
-/* Commands */
-enum {
-	NGM_ASYNC_CMD_GET_STATS = 1,	/* returns struct ng_async_stat */
-	NGM_ASYNC_CMD_CLR_STATS,
-	NGM_ASYNC_CMD_SET_CONFIG,	/* takes struct ng_async_cfg */
-	NGM_ASYNC_CMD_GET_CONFIG,	/* returns struct ng_async_cfg */
-};
-
-#endif /* _NETGRAPH_NG_ASYNC_H_ */
diff --git a/include.new/netgraph/ng_atmllc.h b/include.new/netgraph/ng_atmllc.h
deleted file mode 100644
index e5ab1bb..0000000
--- a/include.new/netgraph/ng_atmllc.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2003-2004 Benno Rice <benno@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR  ``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  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: releng/10.2/sys/netgraph/ng_atmllc.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef	_NETGRAPH_ATMLLC_H_
-#define	_NETGRAPH_ATMLLC_H_
-
-/* Node type name and magic cookie. */
-#define	NG_ATMLLC_NODE_TYPE	"atmllc"
-#define	NGM_ATMLLC_COOKIE	1065246274
-
-/* Hook names. */
-#define	NG_ATMLLC_HOOK_ATM	"atm"
-#define	NG_ATMLLC_HOOK_ETHER	"ether"
-#define	NG_ATMLLC_HOOK_802_4	"ieee8024"
-#define	NG_ATMLLC_HOOK_802_5	"ieee8025"
-#define	NG_ATMLLC_HOOK_802_6	"ieee8026"
-#define	NG_ATMLLC_HOOK_FDDI	"fddi"
-#define	NG_ATMLLC_HOOK_BPDU	"bpdu"
-
-#endif /* _NETGRAPH_ATMLLC_H_ */
diff --git a/include.new/netgraph/ng_bpf.h b/include.new/netgraph/ng_bpf.h
deleted file mode 100644
index 5a8dfb4..0000000
--- a/include.new/netgraph/ng_bpf.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * ng_bpf.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_bpf.h 141751 2005-02-12 18:10:26Z ru $
- * $Whistle: ng_bpf.h,v 1.3 1999/12/03 20:30:23 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_BPF_H_
-#define _NETGRAPH_NG_BPF_H_
-
-/* Node type name and magic cookie */
-#define NG_BPF_NODE_TYPE	"bpf"
-#define NGM_BPF_COOKIE		944100792
-
-/* Program structure for one hook */
-struct ng_bpf_hookprog {
-	char		thisHook[NG_HOOKSIZ];		/* name of hook */
-	char		ifMatch[NG_HOOKSIZ];		/* match dest hook */
-	char		ifNotMatch[NG_HOOKSIZ];		/* !match dest hook */
-	int32_t		bpf_prog_len;			/* #insns in program */
-	struct bpf_insn	bpf_prog[];			/* bpf program */
-};
-
-#define NG_BPF_HOOKPROG_SIZE(numInsn)	\
-	(sizeof(struct ng_bpf_hookprog) + (numInsn) * sizeof(struct bpf_insn))
-
-/* Keep this in sync with the above structure definition */
-#define NG_BPF_HOOKPROG_TYPE_INFO(bptype)	{		\
-	  { "thisHook",		&ng_parse_hookbuf_type	},	\
-	  { "ifMatch",		&ng_parse_hookbuf_type	},	\
-	  { "ifNotMatch",	&ng_parse_hookbuf_type	},	\
-	  { "bpf_prog_len",	&ng_parse_int32_type	},	\
-	  { "bpf_prog",		(bptype)		},	\
-	  { NULL }						\
-}
-
-/* Statistics structure for one hook */
-struct ng_bpf_hookstat {
-	u_int64_t	recvFrames;
-	u_int64_t	recvOctets;
-	u_int64_t	recvMatchFrames;
-	u_int64_t	recvMatchOctets;
-	u_int64_t	xmitFrames;
-	u_int64_t	xmitOctets;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_BPF_HOOKSTAT_TYPE_INFO	{			\
-	  { "recvFrames",	&ng_parse_uint64_type	},	\
-	  { "recvOctets",	&ng_parse_uint64_type	},	\
-	  { "recvMatchFrames",	&ng_parse_uint64_type	},	\
-	  { "recvMatchOctets",	&ng_parse_uint64_type	},	\
-	  { "xmitFrames",	&ng_parse_uint64_type	},	\
-	  { "xmitOctets",	&ng_parse_uint64_type	},	\
-	  { NULL }						\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_BPF_SET_PROGRAM = 1,	/* supply a struct ng_bpf_hookprog */
-	NGM_BPF_GET_PROGRAM,		/* returns a struct ng_bpf_hookprog */
-	NGM_BPF_GET_STATS,		/* supply name as char[NG_HOOKSIZ] */
-	NGM_BPF_CLR_STATS,		/* supply name as char[NG_HOOKSIZ] */
-	NGM_BPF_GETCLR_STATS,		/* supply name as char[NG_HOOKSIZ] */
-};
-
-#endif /* _NETGRAPH_NG_BPF_H_ */
diff --git a/include.new/netgraph/ng_bridge.h b/include.new/netgraph/ng_bridge.h
deleted file mode 100644
index 03cfaa3..0000000
--- a/include.new/netgraph/ng_bridge.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * ng_bridge.h
- */
-
-/*-
- * Copyright (c) 2000 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_bridge.h 207680 2010-05-05 22:06:05Z zec $
- */
-
-#ifndef _NETGRAPH_NG_BRIDGE_H_
-#define _NETGRAPH_NG_BRIDGE_H_
-
-/* Node type name and magic cookie */
-#define NG_BRIDGE_NODE_TYPE		"bridge"
-#define NGM_BRIDGE_COOKIE		967239368
-
-/* Hook names */
-#define NG_BRIDGE_HOOK_LINK_PREFIX	"link"	 /* append decimal integer */
-#define NG_BRIDGE_HOOK_LINK_FMT		"link%d" /* for use with printf(3) */
-
-/* Maximum number of supported links */
-#define NG_BRIDGE_MAX_LINKS		32
-
-/* Node configuration structure */
-struct ng_bridge_config {
-	u_char		ipfw[NG_BRIDGE_MAX_LINKS]; 	/* enable ipfw */
-	u_char		debugLevel;		/* debug level */
-	uint32_t	loopTimeout;		/* link loopback mute time */
-	uint32_t	maxStaleness;		/* max host age before nuking */
-	uint32_t	minStableAge;		/* min time for a stable host */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_BRIDGE_CONFIG_TYPE_INFO(ainfo)	{		\
-	  { "ipfw",		(ainfo)			},	\
-	  { "debugLevel",	&ng_parse_uint8_type	},	\
-	  { "loopTimeout",	&ng_parse_uint32_type	},	\
-	  { "maxStaleness",	&ng_parse_uint32_type	},	\
-	  { "minStableAge",	&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-/* Statistics structure (one for each link) */
-struct ng_bridge_link_stats {
-	u_int64_t	recvOctets;	/* total octets rec'd on link */
-	u_int64_t	recvPackets;	/* total pkts rec'd on link */
-	u_int64_t	recvMulticasts;	/* multicast pkts rec'd on link */
-	u_int64_t	recvBroadcasts;	/* broadcast pkts rec'd on link */
-	u_int64_t	recvUnknown;	/* pkts rec'd with unknown dest addr */
-	u_int64_t	recvRunts;	/* pkts rec'd less than 14 bytes */
-	u_int64_t	recvInvalid;	/* pkts rec'd with bogus source addr */
-	u_int64_t	xmitOctets;	/* total octets xmit'd on link */
-	u_int64_t	xmitPackets;	/* total pkts xmit'd on link */
-	u_int64_t	xmitMulticasts;	/* multicast pkts xmit'd on link */
-	u_int64_t	xmitBroadcasts;	/* broadcast pkts xmit'd on link */
-	u_int64_t	loopDrops;	/* pkts dropped due to loopback */
-	u_int64_t	loopDetects;	/* number of loop detections */
-	u_int64_t	memoryFailures;	/* times couldn't get mem or mbuf */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_BRIDGE_STATS_TYPE_INFO	{			\
-	  { "recvOctets",	&ng_parse_uint64_type	},	\
-	  { "recvPackets",	&ng_parse_uint64_type	},	\
-	  { "recvMulticast",	&ng_parse_uint64_type	},	\
-	  { "recvBroadcast",	&ng_parse_uint64_type	},	\
-	  { "recvUnknown",	&ng_parse_uint64_type	},	\
-	  { "recvRunts",	&ng_parse_uint64_type	},	\
-	  { "recvInvalid",	&ng_parse_uint64_type	},	\
-	  { "xmitOctets",	&ng_parse_uint64_type	},	\
-	  { "xmitPackets",	&ng_parse_uint64_type	},	\
-	  { "xmitMulticasts",	&ng_parse_uint64_type	},	\
-	  { "xmitBroadcasts",	&ng_parse_uint64_type	},	\
-	  { "loopDrops",	&ng_parse_uint64_type	},	\
-	  { "loopDetects",	&ng_parse_uint64_type	},	\
-	  { "memoryFailures",	&ng_parse_uint64_type	},	\
-	  { NULL }						\
-}
-
-/* Structure describing a single host */
-struct ng_bridge_host {
-	u_char		addr[6];	/* ethernet address */
-	u_int16_t	linkNum;	/* link where addr can be found */
-	u_int16_t	age;		/* seconds ago entry was created */
-	u_int16_t	staleness;	/* seconds ago host last heard from */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_BRIDGE_HOST_TYPE_INFO(entype)	{		\
-	  { "addr",		(entype)		},	\
-	  { "linkNum",		&ng_parse_uint16_type	},	\
-	  { "age",		&ng_parse_uint16_type	},	\
-	  { "staleness",	&ng_parse_uint16_type	},	\
-	  { NULL }						\
-}
-
-/* Structure returned by NGM_BRIDGE_GET_TABLE */
-struct ng_bridge_host_ary {
-	uint32_t		numHosts;
-	struct ng_bridge_host	hosts[];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_BRIDGE_HOST_ARY_TYPE_INFO(harytype)	{		\
-	  { "numHosts",		&ng_parse_uint32_type	},	\
-	  { "hosts",		(harytype)		},	\
-	  { NULL }						\
-}
-
-/* Netgraph control messages */
-enum {
-	NGM_BRIDGE_SET_CONFIG = 1,	/* set node configuration */
-	NGM_BRIDGE_GET_CONFIG,		/* get node configuration */
-	NGM_BRIDGE_RESET,		/* reset (forget) all information */
-	NGM_BRIDGE_GET_STATS,		/* get link stats */
-	NGM_BRIDGE_CLR_STATS,		/* clear link stats */
-	NGM_BRIDGE_GETCLR_STATS,	/* atomically get & clear link stats */
-	NGM_BRIDGE_GET_TABLE,		/* get link table */
-	NGM_BRIDGE_SET_PERSISTENT,	/* set persistent mode */
-};
-
-#endif /* _NETGRAPH_NG_BRIDGE_H_ */
-
diff --git a/include.new/netgraph/ng_car.h b/include.new/netgraph/ng_car.h
deleted file mode 100644
index 9abc258..0000000
--- a/include.new/netgraph/ng_car.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 2005 Nuno Antunes <nuno.antunes@gmail.com>
- * Copyright (c) 2007 Alexander Motin <mav@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.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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: releng/10.2/sys/netgraph/ng_car.h 174795 2007-12-19 22:50:14Z mav $
- */
-
-#ifndef _NETGRAPH_NG_CAR_H_
-#define _NETGRAPH_NG_CAR_H_
-
-#define NG_CAR_NODE_TYPE	"car"
-#define NGM_CAR_COOKIE		1173648034
-
-/* Hook names */
-#define NG_CAR_HOOK_UPPER	"upper"
-#define NG_CAR_HOOK_LOWER	"lower"
-
-/* Per hook statistics counters */
-struct ng_car_hookstats {
-	u_int64_t passed_pkts;	/* Counter for passed packets */
-	u_int64_t droped_pkts;	/* Counter for droped packets */
-	u_int64_t green_pkts;	/* Counter for green packets */
-	u_int64_t yellow_pkts;	/* Counter for yellow packets */
-	u_int64_t red_pkts;	/* Counter for red packets */
-	u_int64_t errors;	/* Counter for operation errors */
-};
-#define NG_CAR_HOOKSTATS	{				\
-	  { "passed",		&ng_parse_uint64_type	},	\
-	  { "droped",		&ng_parse_uint64_type	},	\
-	  { "green",		&ng_parse_uint64_type	},	\
-	  { "yellow",		&ng_parse_uint64_type	},	\
-	  { "red",		&ng_parse_uint64_type	},	\
-	  { "errors",		&ng_parse_uint64_type	},	\
-	  { NULL }						\
-}
-
-/* Bulk statistics */
-struct ng_car_bulkstats {
-	struct ng_car_hookstats upstream;
-	struct ng_car_hookstats downstream;
-};
-#define NG_CAR_BULKSTATS(hstatstype) {				\
-	  { "upstream",		(hstatstype)		},	\
-	  { "downstream",	(hstatstype)		},	\
-	  { NULL }						\
-}
-
-/* Per hook configuration */
-struct ng_car_hookconf {
-	u_int64_t cbs;		/* Commited burst size (bytes) */
-	u_int64_t ebs;		/* Exceeded/Peak burst size (bytes) */
-	u_int64_t cir;		/* Commited information rate (bits/s) */
-	u_int64_t pir;		/* Peak information rate (bits/s) */
-	u_int8_t green_action;	/* Action for green packets */
-	u_int8_t yellow_action;	/* Action for yellow packets */
-	u_int8_t red_action;	/* Action for red packets */
-	u_int8_t mode;		/* single/double rate, ... */
-	u_int8_t opt;		/* color-aware or color-blind */
-};
-/* Keep this definition in sync with the above structure */
-#define NG_CAR_HOOKCONF	{					\
-	  { "cbs",		&ng_parse_uint64_type	},	\
-	  { "ebs",		&ng_parse_uint64_type	},	\
-	  { "cir",		&ng_parse_uint64_type	},	\
-	  { "pir",		&ng_parse_uint64_type	},	\
-	  { "greenAction",	&ng_parse_uint8_type	},	\
-	  { "yellowAction",	&ng_parse_uint8_type	},	\
-	  { "redAction",	&ng_parse_uint8_type	},	\
-	  { "mode",		&ng_parse_uint8_type	},	\
-	  { "opt",		&ng_parse_uint8_type	},	\
-	  { NULL }						\
-}
-
-#define NG_CAR_CBS_MIN		8192
-#define NG_CAR_EBS_MIN		8192
-#define NG_CAR_CIR_DFLT		10240
-
-/* possible actions (...Action) */
-enum {
-    NG_CAR_ACTION_FORWARD = 1,
-    NG_CAR_ACTION_DROP,
-    NG_CAR_ACTION_MARK,
-    NG_CAR_ACTION_SET_TOS
-};
-
-/* operation modes (mode) */
-enum {
-    NG_CAR_SINGLE_RATE = 0,
-    NG_CAR_DOUBLE_RATE,
-    NG_CAR_RED,
-    NG_CAR_SHAPE
-};
-
-/* mode options (opt) */
-#define NG_CAR_COLOR_AWARE	1
-#define NG_CAR_COUNT_PACKETS	2
-
-/* Bulk config */
-struct ng_car_bulkconf {
-	struct ng_car_hookconf upstream;
-	struct ng_car_hookconf downstream;
-};
-#define NG_CAR_BULKCONF(hconftype) {				\
-	  { "upstream",		(hconftype)		},	\
-	  { "downstream",	(hconftype)		},	\
-	  { NULL }						\
-}
-
-/* Commands */
-enum {
-	NGM_CAR_GET_STATS = 1,		/* Get statistics */
-	NGM_CAR_CLR_STATS,		/* Clear statistics */
-	NGM_CAR_GETCLR_STATS,		/* Get and clear statistics */
-	NGM_CAR_GET_CONF,		/* Get bulk configuration */
-	NGM_CAR_SET_CONF,		/* Set bulk configuration */
-};
-
-#endif /* _NETGRAPH_NG_CAR_H_ */
diff --git a/include.new/netgraph/ng_cisco.h b/include.new/netgraph/ng_cisco.h
deleted file mode 100644
index 5c0b126..0000000
--- a/include.new/netgraph/ng_cisco.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * ng_cisco.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_cisco.h 231543 2012-02-12 05:14:12Z fjoe $
- * $Whistle: ng_cisco.h,v 1.6 1999/01/25 01:21:48 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_CISCO_H_
-#define _NETGRAPH_NG_CISCO_H_
-
-/* Node type name and magic cookie */
-#define NG_CISCO_NODE_TYPE		"cisco"
-#define NGM_CISCO_COOKIE		860707227
-
-/* Hook names */
-#define NG_CISCO_HOOK_DOWNSTREAM	"downstream"
-#define NG_CISCO_HOOK_INET		"inet"
-#define NG_CISCO_HOOK_INET6		"inet6"
-#define NG_CISCO_HOOK_APPLETALK		"atalk"
-#define NG_CISCO_HOOK_IPX		"ipx"
-#define NG_CISCO_HOOK_DEBUG		"debug"
-
-/* Netgraph commands */
-enum {
-	NGM_CISCO_SET_IPADDR = 1,	/* requires a struct ng_cisco_ipaddr */
-	NGM_CISCO_GET_IPADDR,		/* returns a struct ng_cisco_ipaddr */
-	NGM_CISCO_GET_STATUS,		/* returns a struct ng_cisco_stat */
-};
-
-struct ng_cisco_ipaddr {
-	struct in_addr	ipaddr;		/* IP address */
-	struct in_addr	netmask;	/* Netmask */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_CISCO_IPADDR_TYPE_INFO	{			\
-	  { "ipaddr",		&ng_parse_ipaddr_type	},	\
-	  { "netmask",		&ng_parse_ipaddr_type	},	\
-	  { NULL }						\
-}
-
-struct ng_cisco_stats {
-	uint32_t   seqRetries;		/* # unack'd retries */
-	uint32_t   keepAlivePeriod;	/* in seconds */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_CISCO_STATS_TYPE_INFO	{			\
-	  { "seqRetries",	&ng_parse_uint32_type	},	\
-	  { "keepAlivePeriod",	&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-#endif /* _NETGRAPH_NG_CISCO_H_ */
-
diff --git a/include.new/netgraph/ng_deflate.h b/include.new/netgraph/ng_deflate.h
deleted file mode 100644
index e836853..0000000
--- a/include.new/netgraph/ng_deflate.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 2006 Alexander Motin <mav@alkar.net>
- * 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 unmodified, 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.
- *
- * 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: releng/10.2/sys/netgraph/ng_deflate.h 165581 2006-12-28 15:44:05Z glebius $
- */
-
-#ifndef _NETGRAPH_NG_DEFLATE_H_
-#define _NETGRAPH_NG_DEFLATE_H_
-
-/* Node type name and magic cookie */
-#define NG_DEFLATE_NODE_TYPE	"deflate"
-#define NGM_DEFLATE_COOKIE	1166642656
-
-/* Hook names */
-#define NG_DEFLATE_HOOK_COMP	"comp"		/* compression hook */
-#define NG_DEFLATE_HOOK_DECOMP	"decomp"	/* decompression hook */
-
-/* Config struct */
-struct ng_deflate_config {
-	u_char		enable;			/* node enabled */
-	u_char		windowBits;		/* log2(Window size) */
-};
-
-/* Keep this in sync with the above structure definition. */
-#define NG_DEFLATE_CONFIG_INFO	{			\
-	{ "enable",	&ng_parse_uint8_type	},	\
-	{ "windowBits",	&ng_parse_uint8_type	},	\
-	{ NULL }					\
-}
-
-/* Statistics structure for one direction. */
-struct ng_deflate_stats {
-	uint64_t	FramesPlain;
-	uint64_t	FramesComp;
-	uint64_t	FramesUncomp;
-	uint64_t	InOctets;
-	uint64_t	OutOctets;
-	uint64_t	Errors;
-};
-
-/* Keep this in sync with the above structure definition. */
-#define NG_DEFLATE_STATS_INFO	{				\
-	{ "FramesPlain",&ng_parse_uint64_type	},	\
-	{ "FramesComp",	&ng_parse_uint64_type	},	\
-	{ "FramesUncomp", &ng_parse_uint64_type	},	\
-	{ "InOctets",	&ng_parse_uint64_type	},	\
-	{ "OutOctets",	&ng_parse_uint64_type	},	\
-	{ "Errors",	&ng_parse_uint64_type	},	\
-	{ NULL }					\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_DEFLATE_CONFIG = 1,
-	NGM_DEFLATE_RESETREQ,			/* sent either way! */
-	NGM_DEFLATE_GET_STATS,
-	NGM_DEFLATE_CLR_STATS,
-	NGM_DEFLATE_GETCLR_STATS,
-};
-
-#endif /* _NETGRAPH_NG_DEFLATE_H_ */
-
diff --git a/include.new/netgraph/ng_device.h b/include.new/netgraph/ng_device.h
deleted file mode 100644
index 774c3e1..0000000
--- a/include.new/netgraph/ng_device.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2002 Mark Santcroos <marks@ripe.net>
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/netgraph/ng_device.h 139823 2005-01-07 01:45:51Z imp $
- *
- */
-
-#ifndef _NETGRAPH_NG_DEVICE_H_
-#define _NETGRAPH_NG_DEVICE_H_
-
-/* Node type name and magic cookie */
-#define NG_DEVICE_NODE_TYPE	"device"
-#define NGM_DEVICE_COOKIE	1091129178
-#define	NG_DEVICE_DEVNAME	"ngd"
-
-/* Netgraph control messages */
-enum {
-	NGM_DEVICE_GET_DEVNAME,
-};
-
-#if 0
-/* passing ioctl params */
-struct ngd_param_s {
-	        void * p;
-};
-#endif
-
-#endif /* _NETGRAPH_NG_DEVICE_H_ */
diff --git a/include.new/netgraph/ng_echo.h b/include.new/netgraph/ng_echo.h
deleted file mode 100644
index 630f96a..0000000
--- a/include.new/netgraph/ng_echo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ng_echo.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_echo.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_echo.h,v 1.3 1999/01/20 00:22:12 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_ECHO_H_
-#define _NETGRAPH_NG_ECHO_H_
-
-/* Node type name and magic cookie */
-#define NG_ECHO_NODE_TYPE	"echo"
-#define NGM_ECHO_COOKIE		884298942
-
-#endif /* _NETGRAPH_NG_ECHO_H_ */
diff --git a/include.new/netgraph/ng_eiface.h b/include.new/netgraph/ng_eiface.h
deleted file mode 100644
index 611639a..0000000
--- a/include.new/netgraph/ng_eiface.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * ng_eiface.h
- */
-
-/*-
- * Copyright (c) 1999-2001, Vitaly V Belekhov
- * 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 unmodified, 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.
- *
- * 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: releng/10.2/sys/netgraph/ng_eiface.h 215673 2010-11-22 12:32:19Z zec $
- */
-
-#ifndef _NETGRAPH_NG_EIFACE_H_
-#define _NETGRAPH_NG_EIFACE_H_
-
-/* Node type name and magic cookie */
-#define NG_EIFACE_NODE_TYPE		"eiface"
-#define NGM_EIFACE_COOKIE		948105892
-
-/* Interface base name */
-#define NG_EIFACE_EIFACE_NAME		"ngeth"
-
-/* My hook names */
-#define NG_EIFACE_HOOK_ETHER		"ether"
-
-/* MTU bounds */
-#define NG_EIFACE_MTU_MIN		72
-#define NG_EIFACE_MTU_MAX		ETHER_MAX_LEN_JUMBO
-#define NG_EIFACE_MTU_DEFAULT		1500
-
-/* Netgraph commands */
-enum {
-	NGM_EIFACE_GET_IFNAME = 1,	/* get the interface name */
-	NGM_EIFACE_GET_IFADDRS,		/* returns list of addresses */
-	NGM_EIFACE_SET,			/* set ethernet address */
-};
-
-#endif /* _NETGRAPH_NG_EIFACE_H_ */
diff --git a/include.new/netgraph/ng_etf.h b/include.new/netgraph/ng_etf.h
deleted file mode 100644
index 720ae77..0000000
--- a/include.new/netgraph/ng_etf.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * ng_etf.h
- */
-
-/*-
- * Copyright (c) 2001, FreeBSD Incorporated 
- * 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 unmodified, 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.
- *
- * 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.
- *
- * Author: Julian Elischer <julian@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_etf.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NETGRAPH_NG_ETF_H_
-#define _NETGRAPH_NG_ETF_H_
-
-/* Node type name. This should be unique among all netgraph node types */
-#define NG_ETF_NODE_TYPE	"etf"
-
-/* Node type cookie. Should also be unique. This value MUST change whenever
-   an incompatible change is made to this header file, to insure consistency.
-   The de facto method for generating cookies is to take the output of the
-   date command: date -u +'%s' */
-#define NGM_ETF_COOKIE		983084516
-
-/* Hook names */
-#define NG_ETF_HOOK_DOWNSTREAM	"downstream"
-#define NG_ETF_HOOK_NOMATCH	"nomatch"
-
-/* Netgraph commands understood by this node type */
-enum {
-	NGM_ETF_SET_FLAG = 1,
-	NGM_ETF_GET_STATUS,
-	NGM_ETF_SET_FILTER,
-
-};
-
-/* This structure is returned by the NGM_ETF_GET_STATUS command */
-struct ng_etfstat {
-	uint32_t   packets_in;		/* packets in from downstream */
-	uint32_t   packets_out;	/* packets out towards downstream */
-};
-
-/*
- * This needs to be kept in sync with the above structure definition
- */
-#define NG_ETF_STATS_TYPE_INFO	{				\
-	  { "packets_in",	&ng_parse_uint32_type	},	\
-	  { "packets_out",	&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-/* This structure is returned by the NGM_ETF_GET_STATUS command */
-struct ng_etffilter {
-	char		matchhook[NG_HOOKSIZ]; /* hook name */
-	u_int16_t	ethertype;	/* this ethertype to this hook */
-};	
-
-/*
- * This needs to be kept in sync with the above structure definition
- */
-#define NG_ETF_FILTER_TYPE_INFO	{				\
-          { "matchhook",	&ng_parse_hookbuf_type  },	\
-	  { "ethertype",	&ng_parse_uint16_type   },	\
-	  { NULL }						\
-}
-
-#endif /* _NETGRAPH_NG_ETF_H_ */
diff --git a/include.new/netgraph/ng_ether.h b/include.new/netgraph/ng_ether.h
deleted file mode 100644
index 14394ad..0000000
--- a/include.new/netgraph/ng_ether.h
+++ /dev/null
@@ -1,73 +0,0 @@
-
-/*
- * ng_ether.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_ether.h 141910 2005-02-14 12:01:09Z glebius $
- * $Whistle: ng_ether.h,v 1.1 1999/02/02 03:17:22 julian Exp $
- */
-
-#ifndef _NETGRAPH_NG_ETHER_H_
-#define _NETGRAPH_NG_ETHER_H_
-
-/* Node type name and magic cookie */
-#define NG_ETHER_NODE_TYPE	"ether"
-#define NGM_ETHER_COOKIE	917786906
-
-/* Hook names */
-#define NG_ETHER_HOOK_LOWER	"lower"		/* connection to raw device */
-#define NG_ETHER_HOOK_UPPER	"upper"		/* connection to upper layers */
-#define NG_ETHER_HOOK_DIVERT	"divert"	/* alias for lower */
-#define NG_ETHER_HOOK_ORPHAN	"orphans"	/* like lower, unknowns only */
-
-/* Netgraph control messages */
-enum {
-	NGM_ETHER_GET_IFNAME = 1,	/* get the interface name */
-	NGM_ETHER_GET_IFINDEX,		/* get the interface global index # */
-	NGM_ETHER_GET_ENADDR,		/* get Ethernet address */
-	NGM_ETHER_SET_ENADDR,		/* set Ethernet address */
-	NGM_ETHER_GET_PROMISC,		/* get node's promiscuous mode bit */
-	NGM_ETHER_SET_PROMISC,		/* enable/disable promiscuous mode */
-	NGM_ETHER_GET_AUTOSRC,		/* get source address override */
-	NGM_ETHER_SET_AUTOSRC,		/* enable/disable src addr override */
-	NGM_ETHER_ADD_MULTI,		/* add multicast membership */
-	NGM_ETHER_DEL_MULTI,		/* delete multicast membership */
-	NGM_ETHER_DETACH,		/* our way to be shut down */
-};
-
-#endif /* _NETGRAPH_NG_ETHER_H_ */
diff --git a/include.new/netgraph/ng_ether_echo.h b/include.new/netgraph/ng_ether_echo.h
deleted file mode 100644
index 69bf5a2..0000000
--- a/include.new/netgraph/ng_ether_echo.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ng_ether_echo.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_ether_echo.h 186481 2008-12-25 00:01:29Z julian $
- * $Whistle: ng_echo.h,v 1.3 1999/01/20 00:22:12 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_ETHER_ECHO_H_
-#define _NETGRAPH_NG_ETHER_ECHO_H_
-
-/* Node type name and magic cookie */
-#define NG_ETHER_ECHO_NODE_TYPE	"ether_echo"
-#define NGM_ETHER_ECHO_COOKIE		1230155201
-
-#endif /* _NETGRAPH_NG_ETHER_ECHO_H_ */
diff --git a/include.new/netgraph/ng_fec.h b/include.new/netgraph/ng_fec.h
deleted file mode 100644
index 205a44e..0000000
--- a/include.new/netgraph/ng_fec.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * ng_fec.h
- */
-
-/*-
- * Copyright (c) 2000 Berkeley Software Design, Inc.
- * Copyright (c) 1997, 1998, 1999, 2000
- *	Bill Paul <wpaul@osd.bsdi.com>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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: releng/10.2/sys/netgraph/ng_fec.h 139823 2005-01-07 01:45:51Z imp $
- */
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $Whistle: ng_fec.h,v 1.5 1999/01/20 00:22:13 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_FEC_H_
-#define _NETGRAPH_NG_FEC_H_
-
-#define NETISR_FEC			26
-
-/* Node type name and magic cookie */
-#define NG_FEC_NODE_TYPE		"fec"
-#define NGM_FEC_COOKIE			983566799
-
-/* Interface base name */
-#define NG_FEC_FEC_NAME			"fec"
-#define NG_FEC_FEC_NAME_MAX		15
-
-/* MTU bounds */
-#define NG_FEC_MTU_MIN			72
-#define NG_FEC_MTU_MAX			65535
-#define NG_FEC_MTU_DEFAULT		1500
-
-/* Special flags for mbufs. */
-#define M_FEC_MAC			0x2000
-#define M_FEC_INET			0x4000
-#define M_FEC_INET6			0x8000
-
-/* Netgraph commands */
-enum {
-	NGM_FEC_ADD_IFACE,
-	NGM_FEC_DEL_IFACE,
-	NGM_FEC_SET_MODE_MAC,
-	NGM_FEC_SET_MODE_INET,
-	NGM_FEC_SET_MODE_INET6
-};
-
-struct ng_fec_ifname {
-	char    ngif_name[NG_FEC_FEC_NAME_MAX + 1];
-};
-
-#endif /* _NETGRAPH_NG_FEC_H_ */
diff --git a/include.new/netgraph/ng_frame_relay.h b/include.new/netgraph/ng_frame_relay.h
deleted file mode 100644
index 8406490..0000000
--- a/include.new/netgraph/ng_frame_relay.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * ng_frame_relay.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_frame_relay.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_frame_relay.h,v 1.7 1999/01/20 00:22:13 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_FRAME_RELAY_H_
-#define _NETGRAPH_NG_FRAME_RELAY_H_
-
-/* Node type name and magic cookie */
-#define NG_FRAMERELAY_NODE_TYPE		"frame_relay"
-#define NGM_FRAMERELAY_COOKIE		872148478
-
-/* Hook names */
-#define NG_FRAMERELAY_HOOK_DEBUG	"debug"
-#define NG_FRAMERELAY_HOOK_DOWNSTREAM	"downstream"
-#define NG_FRAMERELAY_HOOK_DLCI		"dlci"	/* really just the prefix */
-
-#endif /* _NETGRAPH_NG_FRAME_RELAY_H_ */
diff --git a/include.new/netgraph/ng_gif.h b/include.new/netgraph/ng_gif.h
deleted file mode 100644
index 55ebebe..0000000
--- a/include.new/netgraph/ng_gif.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * ng_gif.h
- */
-
-/*-
- * Copyright 2001 The Aerospace Corporation.  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 Aerospace Corporation may not be used to endorse or
- *    promote products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION ``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 AEROSPACE CORPORATION 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.
- *
- *
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_gif.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NETGRAPH_NG_GIF_H_
-#define _NETGRAPH_NG_GIF_H_
-
-/* Node type name and magic cookie */
-#define NG_GIF_NODE_TYPE	"gif"
-#define NGM_GIF_COOKIE		994115727
-
-/* Hook names */
-#define NG_GIF_HOOK_LOWER	"lower"		/* connection to raw device */
-#define NG_GIF_HOOK_DIVERT	"divert"	/* alias for lower */
-#define NG_GIF_HOOK_ORPHAN	"orphans"	/* like lower, unknowns only */
-
-/* Netgraph control messages */
-enum {
-	NGM_GIF_GET_IFNAME = 1,		/* get the interface name */
-	NGM_GIF_GET_IFINDEX		/* get the interface global index # */
-};
-
-#endif /* _NETGRAPH_NG_GIF_H_ */
diff --git a/include.new/netgraph/ng_gif_demux.h b/include.new/netgraph/ng_gif_demux.h
deleted file mode 100644
index d9cf6f6..0000000
--- a/include.new/netgraph/ng_gif_demux.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ng_gif_demux.h
- */
-
-/*-
- * Copyright 2001 The Aerospace Corporation.  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 Aerospace Corporation may not be used to endorse or
- *    promote products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION ``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 AEROSPACE CORPORATION 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: releng/10.2/sys/netgraph/ng_gif_demux.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NETGRAPH_NG_GIF_DEMUX_H_
-#define _NETGRAPH_NG_GIF_DEMUX_H_
-
-/* Node type name and magic cookie */
-#define NG_GIF_DEMUX_NODE_TYPE		"gif_demux"
-#define NGM_GIF_DEMUX_COOKIE		995567329
-
-/* Hook names */
-#define NG_GIF_DEMUX_HOOK_GIF		"gif"
-#define NG_GIF_DEMUX_HOOK_INET		"inet"
-#define NG_GIF_DEMUX_HOOK_INET6		"inet6"
-#define NG_GIF_DEMUX_HOOK_ATALK		"atalk"
-#define NG_GIF_DEMUX_HOOK_IPX		"ipx"
-#define NG_GIF_DEMUX_HOOK_ATM		"atm"
-#define NG_GIF_DEMUX_HOOK_NATM		"natm"
-
-#endif /* _NETGRAPH_NG_GIF_DEMUX_H_ */
diff --git a/include.new/netgraph/ng_hole.h b/include.new/netgraph/ng_hole.h
deleted file mode 100644
index 5c26bb4..0000000
--- a/include.new/netgraph/ng_hole.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * ng_hole.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_hole.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_hole.h,v 1.3 1999/01/20 00:22:13 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_HOLE_H_
-#define _NETGRAPH_NG_HOLE_H_
-
-/* Node type name and magic cookie */
-#define NG_HOLE_NODE_TYPE	"hole"
-#define NGM_HOLE_COOKIE		915433206
-
-/* Statistics structure for one hook. */
-struct ng_hole_hookstat {
-	uint64_t	frames;
-	uint64_t	octets;
-};
-
-/* Keep this in sync with the above structure definition. */
-#define	NG_HOLE_HOOKSTAT_TYPE_INFO {				\
-	{ "frames",	&ng_parse_uint64_type },		\
-	{ "octets",	&ng_parse_uint64_type },		\
-	{ NULL }						\
-}
-
-/* Netgraph commands. */
-enum {
-	NGM_HOLE_GET_STATS = 1,
-	NGM_HOLE_CLR_STATS,
-	NGM_HOLE_GETCLR_STATS,
-};
-
-#endif /* _NETGRAPH_NG_HOLE_H_ */
diff --git a/include.new/netgraph/ng_hub.h b/include.new/netgraph/ng_hub.h
deleted file mode 100644
index ca620a7..0000000
--- a/include.new/netgraph/ng_hub.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2004 Ruslan Ermilov
- * 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.
- *
- * 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: releng/10.2/sys/netgraph/ng_hub.h 207680 2010-05-05 22:06:05Z zec $
- */
-
-#ifndef _NETGRAPH_NG_HUB_H_
-#define	_NETGRAPH_NG_HUB_H_
-
-/* Node type name and magic cookie. */
-#define	NG_HUB_NODE_TYPE	"hub"
-#define	NGM_HUB_COOKIE		1082189597
-
-/* Netgraph control messages */
-enum {
-	NGM_HUB_SET_PERSISTENT = 1,	/* set persistent mode */
-};
-
-#endif /* _NETGRAPH_NG_HUB_H_ */
diff --git a/include.new/netgraph/ng_iface.h b/include.new/netgraph/ng_iface.h
deleted file mode 100644
index b7832e9..0000000
--- a/include.new/netgraph/ng_iface.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * ng_iface.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_iface.h 187495 2009-01-20 22:26:09Z mav $
- * $Whistle: ng_iface.h,v 1.5 1999/01/20 00:22:13 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_IFACE_H_
-#define _NETGRAPH_NG_IFACE_H_
-
-/* Node type name and magic cookie */
-#define NG_IFACE_NODE_TYPE		"iface"
-#define NGM_IFACE_COOKIE		1108312559
-
-/* Interface base name */
-#define NG_IFACE_IFACE_NAME		"ng"
-
-/* My hook names */
-#define NG_IFACE_HOOK_INET		"inet"
-#define NG_IFACE_HOOK_INET6		"inet6"
-#define NG_IFACE_HOOK_ATALK		"atalk"	/* AppleTalk phase 2 */
-#define NG_IFACE_HOOK_IPX		"ipx"
-#define NG_IFACE_HOOK_ATM		"atm"
-#define NG_IFACE_HOOK_NATM		"natm"
-
-/* MTU bounds */
-#define NG_IFACE_MTU_MIN		72
-#define NG_IFACE_MTU_MAX		65535
-#define NG_IFACE_MTU_DEFAULT		1500
-
-/* Netgraph commands */
-enum {
-	NGM_IFACE_GET_IFNAME = 1,
-	NGM_IFACE_POINT2POINT,
-	NGM_IFACE_BROADCAST,
-	NGM_IFACE_GET_IFINDEX,
-};
-
-#define	MTAG_NGIF			NGM_IFACE_COOKIE
-#define	MTAG_NGIF_CALLED		0 | MTAG_PERSISTENT
-
-#endif /* _NETGRAPH_NG_IFACE_H_ */
diff --git a/include.new/netgraph/ng_ip_input.h b/include.new/netgraph/ng_ip_input.h
deleted file mode 100644
index da9df2d..0000000
--- a/include.new/netgraph/ng_ip_input.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * ng_ip_input.h
- */
-
-/*-
- * Copyright 2001 The Aerospace Corporation.  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 Aerospace Corporation may not be used to endorse or
- *     promote products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "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 AEROSPACE CORPORATION 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.
- *
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author:		Brooks Davis <brooks@FreeBSD.org>
- * Derived from:	ng_hole.h
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_ip_input.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NETGRAPH_NG_IP_INPUT_H_
-#define _NETGRAPH_NG_IP_INPUT_H_
-
-/* Node type name and magic cookie */
-#define NG_IP_INPUT_NODE_TYPE	"ip_input"
-#define NGM_IP_INPUT_COOKIE	994874907
-
-#endif /* _NETGRAPH_NG_IP_INPUT_H_ */
diff --git a/include.new/netgraph/ng_ipfw.h b/include.new/netgraph/ng_ipfw.h
deleted file mode 100644
index 6d0dec7..0000000
--- a/include.new/netgraph/ng_ipfw.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright 2005, Gleb Smirnoff <glebius@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.
- *
- * 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: releng/10.2/sys/netgraph/ng_ipfw.h 201124 2009-12-28 12:29:13Z luigi $
- */
-
-#ifndef _NG_IPFW_H
-#define _NG_IPFW_H
-#define NG_IPFW_NODE_TYPE    "ipfw"
-#define NGM_IPFW_COOKIE      1105988990
-#endif /* _NG_IPFW_H */
diff --git a/include.new/netgraph/ng_ksocket.h b/include.new/netgraph/ng_ksocket.h
deleted file mode 100644
index e2cee4b..0000000
--- a/include.new/netgraph/ng_ksocket.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * ng_ksocket.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_ksocket.h 151800 2005-10-28 14:41:28Z ru $
- * $Whistle: ng_ksocket.h,v 1.1 1999/11/16 20:04:40 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_KSOCKET_H_
-#define _NETGRAPH_NG_KSOCKET_H_
-
-#include <sys/socket.h>
-
-/* Node type name and magic cookie */
-#define NG_KSOCKET_NODE_TYPE	"ksocket"
-#define NGM_KSOCKET_COOKIE	942710669
-
-/* For NGM_KSOCKET_SETOPT and NGM_KSOCKET_GETOPT control messages */
-struct ng_ksocket_sockopt {
-	int32_t		level;		/* second arg of [gs]etsockopt() */
-	int32_t		name;		/* third arg of [gs]etsockopt() */
-	u_char		value[];	/* fourth arg of [gs]etsockopt() */
-};
-
-/* Max length socket option we can return via NGM_KSOCKET_GETOPT
-   XXX This should not be necessary, we should dynamically size
-   XXX the response. Until then.. */
-#define NG_KSOCKET_MAX_OPTLEN	1024
-
-/* Keep this in sync with the above structure definition */
-#define NG_KSOCKET_SOCKOPT_INFO(svtype)	{			\
-	  { "level",		&ng_parse_int32_type	},	\
-	  { "name",		&ng_parse_int32_type	},	\
-	  { "value",		(svtype)		},	\
-	  { NULL }						\
-}
-
-/* For NGM_KSOCKET_ACCEPT control message responses */
-struct ng_ksocket_accept {
-	uint32_t	nodeid;		/* node ID of connected ksocket */
-	struct sockaddr	addr;		/* peer's address (variable length) */
-};
-
-/* Keep this in sync with the above structure definition */
-#define	NGM_KSOCKET_ACCEPT_INFO {					\
-	  { "nodeid",		&ng_parse_hint32_type		  },	\
-	  { "addr",		&ng_ksocket_generic_sockaddr_type },	\
-	  { NULL }							\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_KSOCKET_BIND = 1,
-	NGM_KSOCKET_LISTEN,
-	NGM_KSOCKET_ACCEPT,
-	NGM_KSOCKET_CONNECT,
-	NGM_KSOCKET_GETNAME,
-	NGM_KSOCKET_GETPEERNAME,
-	NGM_KSOCKET_SETOPT,
-	NGM_KSOCKET_GETOPT,
-};
-
-#ifdef _KERNEL
-
-/* Structure for sockaddr tag */
-struct sa_tag {
-	struct m_tag	tag;
-	ng_ID_t		id;
-	struct sockaddr	sa;
-};
-
-/* Tag information ID's */
-#define NG_KSOCKET_TAG_SOCKADDR	1	/* data is struct sockaddr */
-
-#endif /* _KERNEL */
-#endif /* _NETGRAPH_NG_KSOCKET_H_ */
diff --git a/include.new/netgraph/ng_l2tp.h b/include.new/netgraph/ng_l2tp.h
deleted file mode 100644
index 0ce3204..0000000
--- a/include.new/netgraph/ng_l2tp.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*-
- * Copyright (c) 2001-2002 Packet Design, LLC.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty,
- * use and redistribution of this software, in source or object code
- * forms, with or without modifications are expressly permitted by
- * Packet Design; provided, however, that:
- * 
- *    (i)  Any and all reproductions of the source or object code
- *         must include the copyright notice above and the following
- *         disclaimer of warranties; and
- *    (ii) No rights are granted, in any manner or form, to use
- *         Packet Design trademarks, including the mark "PACKET DESIGN"
- *         on advertising, endorsements, or otherwise except as such
- *         appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY PACKET DESIGN "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, PACKET DESIGN MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING
- * THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
- * OR NON-INFRINGEMENT.  PACKET DESIGN DOES NOT WARRANT, GUARANTEE,
- * OR MAKE ANY REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS
- * OF THE USE OF THIS SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY,
- * RELIABILITY OR OTHERWISE.  IN NO EVENT SHALL PACKET DESIGN BE
- * LIABLE FOR ANY DAMAGES RESULTING FROM OR ARISING OUT OF ANY USE
- * OF THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE, OR CONSEQUENTIAL
- * DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF
- * USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 PACKET DESIGN IS ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_l2tp.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NETGRAPH_NG_L2TP_H_
-#define _NETGRAPH_NG_L2TP_H_
-
-/* Node type name and magic cookie */
-#define NG_L2TP_NODE_TYPE	"l2tp"
-#define NGM_L2TP_COOKIE		1091515793
-
-/* Hook names */
-#define NG_L2TP_HOOK_CTRL	"ctrl"		/* control channel hook */
-#define NG_L2TP_HOOK_LOWER	"lower"		/* hook to lower layers */
-
-/* Session hooks: prefix plus hex session ID, e.g., "session_3e14" */
-#define NG_L2TP_HOOK_SESSION_P	"session_"	/* session data hook (prefix) */
-#define NG_L2TP_HOOK_SESSION_F	"session_%04x"	/* session data hook (format) */
-
-/* Set intial sequence numbers to not yet enabled node. */
-struct ng_l2tp_seq_config {
-	u_int16_t	ns;		/* sequence number to send next */
-	u_int16_t	nr;		/* sequence number to be recved next */
-	u_int16_t	rack;		/* last 'nr' received */
-	u_int16_t	xack;		/* last 'nr' sent */
-};
-
-/* Keep this in sync with the above structure definition. */
-#define	NG_L2TP_SEQ_CONFIG_TYPE_INFO	{			\
-	  { "ns",		&ng_parse_uint16_type	},	\
-	  { "nr",		&ng_parse_uint16_type	},	\
-	  { NULL }						\
-}
-
-/* Configuration for a node */
-struct ng_l2tp_config {
-	u_char		enabled;	/* enables traffic flow */
-	u_char		match_id;	/* tunnel id must match 'tunnel_id' */
-	u_int16_t	tunnel_id;	/* local tunnel id */
-	u_int16_t	peer_id;	/* peer's tunnel id */
-	u_int16_t	peer_win;	/* peer's max recv window size */
-	u_int16_t	rexmit_max;	/* max retransmits before failure */
-	u_int16_t	rexmit_max_to;	/* max delay between retransmits */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_L2TP_CONFIG_TYPE_INFO	{			\
-	  { "enabled",		&ng_parse_uint8_type	},	\
-	  { "match_id",		&ng_parse_uint8_type	},	\
-	  { "tunnel_id",	&ng_parse_hint16_type	},	\
-	  { "peer_id",		&ng_parse_hint16_type	},	\
-	  { "peer_win",		&ng_parse_uint16_type	},	\
-	  { "rexmit_max",	&ng_parse_uint16_type	},	\
-	  { "rexmit_max_to",	&ng_parse_uint16_type	},	\
-	  { NULL }						\
-}
-
-/* Configuration for a session hook */
-struct ng_l2tp_sess_config {
-	u_int16_t	session_id;	/* local session id */
-	u_int16_t	peer_id;	/* peer's session id */
-	u_char		control_dseq;	/* whether we control data sequencing */
-	u_char		enable_dseq;	/* whether to enable data sequencing */
-	u_char		include_length;	/* whether to include length field */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_L2TP_SESS_CONFIG_TYPE_INFO	{			\
-	  { "session_id",	&ng_parse_hint16_type	},	\
-	  { "peer_id",		&ng_parse_hint16_type	},	\
-	  { "control_dseq",	&ng_parse_uint8_type	},	\
-	  { "enable_dseq",	&ng_parse_uint8_type	},	\
-	  { "include_length",	&ng_parse_uint8_type	},	\
-	  { NULL }						\
-}
-
-/* Statistics struct */
-struct ng_l2tp_stats {
-	uint32_t xmitPackets;		/* number of packets xmit */
-	uint32_t xmitOctets;		/* number of octets xmit */
-	uint32_t xmitZLBs;		/* ack-only packets transmitted */
-	uint32_t xmitDrops;		/* xmits dropped due to full window */
-	uint32_t xmitTooBig;		/* ctrl pkts dropped because too big */
-	uint32_t xmitInvalid;		/* ctrl packets with no session ID */
-	uint32_t xmitDataTooBig;	/* data pkts dropped because too big */
-	uint32_t xmitRetransmits;	/* retransmitted packets */
-	uint32_t recvPackets;		/* number of packets rec'd */
-	uint32_t recvOctets;		/* number of octets rec'd */
-	uint32_t recvRunts;		/* too short packets rec'd */
-	uint32_t recvInvalid;		/* invalid packets rec'd */
-	uint32_t recvWrongTunnel;	/* packets rec'd with wrong tunnel id */
-	uint32_t recvUnknownSID;	/* pkts rec'd with unknown session id */
-	uint32_t recvBadAcks;		/* ctrl pkts rec'd with invalid 'nr' */
-	uint32_t recvOutOfOrder;	/* out of order ctrl pkts rec'd */
-	uint32_t recvDuplicates;	/* duplicate ctrl pkts rec'd */
-	uint32_t recvDataDrops;	/* dup/out of order data pkts rec'd */
-	uint32_t recvZLBs;		/* ack-only packets rec'd */
-	uint32_t memoryFailures;	/* times we couldn't allocate memory */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_L2TP_STATS_TYPE_INFO	{			\
-	  { "xmitPackets",	&ng_parse_uint32_type	},	\
-	  { "xmitOctets",	&ng_parse_uint32_type	},	\
-	  { "xmitZLBs",		&ng_parse_uint32_type	},	\
-	  { "xmitDrops",	&ng_parse_uint32_type	},	\
-	  { "xmitTooBig",	&ng_parse_uint32_type	},	\
-	  { "xmitInvalid",	&ng_parse_uint32_type	},	\
-	  { "xmitDataTooBig",	&ng_parse_uint32_type	},	\
-	  { "xmitRetransmits",	&ng_parse_uint32_type	},	\
-	  { "recvPackets",	&ng_parse_uint32_type	},	\
-	  { "recvOctets",	&ng_parse_uint32_type	},	\
-	  { "recvRunts",	&ng_parse_uint32_type	},	\
-	  { "recvInvalid",	&ng_parse_uint32_type	},	\
-	  { "recvWrongTunnel",	&ng_parse_uint32_type	},	\
-	  { "recvUnknownSID",	&ng_parse_uint32_type	},	\
-	  { "recvBadAcks",	&ng_parse_uint32_type	},	\
-	  { "recvOutOfOrder",	&ng_parse_uint32_type	},	\
-	  { "recvDuplicates",	&ng_parse_uint32_type	},	\
-	  { "recvDataDrops",	&ng_parse_uint32_type	},	\
-	  { "recvZLBs",		&ng_parse_uint32_type	},	\
-	  { "memoryFailures",	&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-/* Session statistics struct. */
-struct ng_l2tp_session_stats {
-	u_int64_t xmitPackets;		/* number of packets xmit */
-	u_int64_t xmitOctets;		/* number of octets xmit */
-	u_int64_t recvPackets;		/* number of packets received */
-	u_int64_t recvOctets;		/* number of octets received */
-};
-
-/* Keep this in sync with the above structure definition. */
-#define NG_L2TP_SESSION_STATS_TYPE_INFO	{			\
-	  { "xmitPackets",	&ng_parse_uint64_type	},	\
-	  { "xmitOctets",	&ng_parse_uint64_type	},	\
-	  { "recvPackets",	&ng_parse_uint64_type	},	\
-	  { "recvOctets",	&ng_parse_uint64_type	},	\
-	  { NULL }						\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_L2TP_SET_CONFIG = 1,	/* supply a struct ng_l2tp_config */
-	NGM_L2TP_GET_CONFIG,		/* returns a struct ng_l2tp_config */
-	NGM_L2TP_SET_SESS_CONFIG,	/* supply struct ng_l2tp_sess_config */
-	NGM_L2TP_GET_SESS_CONFIG,	/* supply a session id (u_int16_t) */
-	NGM_L2TP_GET_STATS,		/* returns struct ng_l2tp_stats */
-	NGM_L2TP_CLR_STATS,		/* clears stats */
-	NGM_L2TP_GETCLR_STATS,		/* returns & clears stats */
-	NGM_L2TP_GET_SESSION_STATS,	/* returns session stats */
-	NGM_L2TP_CLR_SESSION_STATS,	/* clears session stats */
-	NGM_L2TP_GETCLR_SESSION_STATS,	/* returns & clears session stats */
-	NGM_L2TP_ACK_FAILURE,		/* sent *from* node after ack timeout */
-	NGM_L2TP_SET_SEQ		/* supply a struct ng_l2tp_seq_config */
-};
-
-#endif /* _NETGRAPH_NG_L2TP_H_ */
diff --git a/include.new/netgraph/ng_lmi.h b/include.new/netgraph/ng_lmi.h
deleted file mode 100644
index e4d36c8..0000000
--- a/include.new/netgraph/ng_lmi.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * ng_lmi.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_lmi.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_lmi.h,v 1.9 1999/01/20 00:22:13 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_LMI_H_
-#define _NETGRAPH_NG_LMI_H_
-
-/* Node type name and magic cookie */
-#define NG_LMI_NODE_TYPE		"lmi"
-#define NGM_LMI_COOKIE			867184133
-
-/* My hook names */
-#define NG_LMI_HOOK_DEBUG		"debug"
-#define NG_LMI_HOOK_ANNEXA		"annexA"
-#define NG_LMI_HOOK_ANNEXD		"annexD"
-#define NG_LMI_HOOK_GROUPOF4		"group4"
-#define NG_LMI_HOOK_AUTO0		"auto0"
-#define NG_LMI_HOOK_AUTO1023		"auto1023"
-
-/* Netgraph commands */
-enum {
-	NGM_LMI_GET_STATUS = 1,
-};
-
-#define NGM_LMI_STAT_ARYSIZE		(1024/8)
-
-struct nglmistat {
-	u_char  proto[12];	/* Active proto (same as hook name) */
-	u_char  hook[12];	/* Active hook */
-	u_char  fixed;		/* Set to fixed LMI mode */
-	u_char  autod;		/* Currently auto-detecting */
-	u_char  seen[NGM_LMI_STAT_ARYSIZE];	/* DLCIs ever seen */
-	u_char  up[NGM_LMI_STAT_ARYSIZE];	/* DLCIs currently up */
-};
-
-/* Some default values */
-#define NG_LMI_KEEPALIVE_RATE		10	/* seconds per keepalive */
-#define NG_LMI_POLL_RATE		3	/* faster when AUTO polling */
-#define NG_LMI_SEQ_PER_FULL		5	/* keepalives per full status */
-#define NG_LMI_LMI_PRIORITY		64	/* priority for LMI data */
-
-#endif /* _NETGRAPH_NG_LMI_H_ */
diff --git a/include.new/netgraph/ng_message.h b/include.new/netgraph/ng_message.h
deleted file mode 100644
index 7e821d4..0000000
--- a/include.new/netgraph/ng_message.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * ng_message.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Julian Elischer <julian@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_message.h 193812 2009-06-09 07:07:20Z imp $
- * $Whistle: ng_message.h,v 1.12 1999/01/25 01:17:44 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_MESSAGE_H_
-#define _NETGRAPH_NG_MESSAGE_H_
-
-/* ASCII string size limits */
-#define	NG_TYPESIZ	32	/* max type name len (including null) */
-#define	NG_HOOKSIZ	32	/* max hook name len (including null) */
-#define	NG_NODESIZ	32	/* max node name len (including null) */
-#define	NG_PATHSIZ	512	/* max path len (including null) */
-#define	NG_CMDSTRSIZ	32	/* max command string (including null) */
-
-#define NG_TEXTRESPONSE 1024	/* allow this length for a text response */
-
-/* A netgraph message */
-struct ng_mesg {
-	struct	ng_msghdr {
-		u_char		version;		/*  == NGM_VERSION */
-		u_char		spare;			/* pad to 4 bytes */
-		u_int16_t	spare2;	
-		uint32_t	arglen;			/* length of data */
-		uint32_t	cmd;			/* command identifier */
-		uint32_t	flags;			/* message status */
-		uint32_t	token;			/* match with reply */
-		uint32_t	typecookie;		/* node's type cookie */
-		u_char		cmdstr[NG_CMDSTRSIZ];	/* cmd string + \0 */
-	} header;
-	char	data[];			/* placeholder for actual data */
-};
-
-/* This command is guaranteed to not alter data (or'd into the command). */
-#define NGM_READONLY	0x10000000
-/* This command is guaranteed to have a reply (or'd into the command). */
-#define NGM_HASREPLY	0x20000000
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_NG_MESG_INFO(dtype)	{			\
-	  { "version",		&ng_parse_uint8_type	},	\
-	  { "spare",		&ng_parse_uint8_type	},	\
-	  { "spare2",		&ng_parse_uint16_type	},	\
-	  { "arglen",		&ng_parse_uint32_type	},	\
-	  { "cmd",		&ng_parse_uint32_type	},	\
-	  { "flags",		&ng_parse_hint32_type	},	\
-	  { "token",		&ng_parse_uint32_type	},	\
-	  { "typecookie",	&ng_parse_uint32_type	},	\
-	  { "cmdstr",		&ng_parse_cmdbuf_type	},	\
-	  { "data",		(dtype)			},	\
-	  { NULL }						\
-}
-
-/*
- * Netgraph message header compatibility field
- * Interfaces within the kernel are defined by a different 
- * value (see NG_ABI_VERSION in netgraph.h)
- */
-#define NG_VERSION	8
-
-/* Flags field flags */
-#define NGF_ORIG	0x00000000	/* the msg is the original request */
-#define NGF_RESP	0x00000001	/* the message is a response */
-
-/* Type of a unique node ID. */
-#define ng_ID_t uint32_t
-
-/*
- * Here we describe the "generic" messages that all nodes inherently
- * understand. With the exception of NGM_TEXT_STATUS, these are handled
- * automatically by the base netgraph code.
- */
-
-/* Generic message type cookie */
-#define NGM_GENERIC_COOKIE	1137070366
-
-/* Generic messages defined for this type cookie. */
-enum {
-	NGM_SHUTDOWN	= 1,	/* Shut down node. */
-	NGM_MKPEER	= 2,	/* Create and attach a peer node. */
-	NGM_CONNECT	= 3,	/* Connect two nodes. */
-	NGM_NAME	= 4,	/* Give a node a name. */
-	NGM_RMHOOK	= 5,	/* Break a connection between two nodes. */
-
-	/* Get nodeinfo for target. */
-	NGM_NODEINFO	= (6|NGM_READONLY|NGM_HASREPLY),
-	/* Get list of hooks on node. */
-	NGM_LISTHOOKS	= (7|NGM_READONLY|NGM_HASREPLY),
-	/* List globally named nodes. */
-	NGM_LISTNAMES	= (8|NGM_READONLY|NGM_HASREPLY),
-	/* List all nodes. */
-	NGM_LISTNODES	= (9|NGM_READONLY|NGM_HASREPLY),
-	/* List installed node types. */
-	NGM_LISTTYPES	= (10|NGM_READONLY|NGM_HASREPLY),
-	/* (optional) Get text status. */
-	NGM_TEXT_STATUS	= (11|NGM_READONLY|NGM_HASREPLY),
-	/* Convert struct ng_mesg to ASCII. */
-	NGM_BINARY2ASCII= (12|NGM_READONLY|NGM_HASREPLY),
-	/* Convert ASCII to struct ng_mesg. */
-	NGM_ASCII2BINARY= (13|NGM_READONLY|NGM_HASREPLY),
-	/* (optional) Get/set text config. */
-	NGM_TEXT_CONFIG	= 14,
-};
-
-/*
- * Flow control and intra node control messages.
- * These are routed between nodes to allow flow control and to allow
- * events to be passed around the graph. 
- * There will be some form of default handling for these but I 
- * do not yet know what it is..
- */
-
-/* Generic message type cookie */
-#define NGM_FLOW_COOKIE	851672669 /* temp for debugging */
-
-/* Upstream messages */
-#define NGM_LINK_IS_UP		32	/* e.g. carrier found - no data */
-#define NGM_LINK_IS_DOWN	33	/* carrier lost, includes queue state */
-#define NGM_HIGH_WATER_PASSED	34	/* includes queue state */
-#define NGM_LOW_WATER_PASSED	35	/* includes queue state */
-#define NGM_SYNC_QUEUE_STATE	36	/* sync response from sending packet */
-
-/* Downstream messages */
-#define NGM_DROP_LINK		41	/* drop DTR, etc. - stay in the graph */
-#define NGM_RAISE_LINK		42	/* if you previously dropped it */
-#define NGM_FLUSH_QUEUE		43	/* no data */
-#define NGM_GET_BANDWIDTH	(44|NGM_READONLY)	/* either real or measured */
-#define NGM_SET_XMIT_Q_LIMITS	45	/* includes queue state */
-#define NGM_GET_XMIT_Q_LIMITS	(46|NGM_READONLY)	/* returns queue state */
-#define NGM_MICROMANAGE		47	/* We want sync. queue state
-						reply for each packet sent */
-#define NGM_SET_FLOW_MANAGER	48	/* send flow control here */ 
-/* Structure used for NGM_MKPEER */
-struct ngm_mkpeer {
-	char	type[NG_TYPESIZ];		/* peer type */
-	char	ourhook[NG_HOOKSIZ];		/* hook name */
-	char	peerhook[NG_HOOKSIZ];		/* peer hook name */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_MKPEER_INFO()	{			\
-	  { "type",		&ng_parse_typebuf_type	},	\
-	  { "ourhook",		&ng_parse_hookbuf_type	},	\
-	  { "peerhook",		&ng_parse_hookbuf_type	},	\
-	  { NULL }						\
-}
-
-/* Structure used for NGM_CONNECT */
-struct ngm_connect {
-	char	path[NG_PATHSIZ];		/* peer path */
-	char	ourhook[NG_HOOKSIZ];		/* hook name */
-	char	peerhook[NG_HOOKSIZ];		/* peer hook name */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_CONNECT_INFO()	{			\
-	  { "path",		&ng_parse_pathbuf_type	},	\
-	  { "ourhook",		&ng_parse_hookbuf_type	},	\
-	  { "peerhook",		&ng_parse_hookbuf_type	},	\
-	  { NULL }						\
-}
-
-/* Structure used for NGM_NAME */
-struct ngm_name {
-	char	name[NG_NODESIZ];			/* node name */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_NAME_INFO()	{				\
-	  { "name",		&ng_parse_nodebuf_type	},	\
-	  { NULL }						\
-}
-
-/* Structure used for NGM_RMHOOK */
-struct ngm_rmhook {
-	char	ourhook[NG_HOOKSIZ];		/* hook name */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_RMHOOK_INFO()	{			\
-	  { "hook",		&ng_parse_hookbuf_type	},	\
-	  { NULL }						\
-}
-
-/* Structure used for NGM_NODEINFO */
-struct nodeinfo {
-	char		name[NG_NODESIZ];	/* node name (if any) */
-        char    	type[NG_TYPESIZ];	/* peer type */
-	ng_ID_t		id;			/* unique identifier */
-	uint32_t	hooks;			/* number of active hooks */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_NODEINFO_INFO()	{			\
-	  { "name",		&ng_parse_nodebuf_type	},	\
-	  { "type",		&ng_parse_typebuf_type	},	\
-	  { "id",		&ng_parse_hint32_type	},	\
-	  { "hooks",		&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-/* Structure used for NGM_LISTHOOKS */
-struct linkinfo {
-	char		ourhook[NG_HOOKSIZ];	/* hook name */
-	char		peerhook[NG_HOOKSIZ];	/* peer hook */
-	struct nodeinfo	nodeinfo;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_LINKINFO_INFO(nitype)	{		\
-	  { "ourhook",		&ng_parse_hookbuf_type	},	\
-	  { "peerhook",		&ng_parse_hookbuf_type	},	\
-	  { "nodeinfo",		(nitype)		},	\
-	  { NULL }						\
-}
-
-struct hooklist {
-	struct nodeinfo nodeinfo;		/* node information */
-	struct linkinfo link[];			/* info about each hook */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_HOOKLIST_INFO(nitype,litype)	{		\
-	  { "nodeinfo",		(nitype)		},	\
-	  { "linkinfo",		(litype)		},	\
-	  { NULL }						\
-}
-
-/* Structure used for NGM_LISTNAMES/NGM_LISTNODES */
-struct namelist {
-	uint32_t	numnames;
-	struct nodeinfo	nodeinfo[];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_LISTNODES_INFO(niarraytype)	{		\
-	  { "numnames",		&ng_parse_uint32_type	},	\
-	  { "nodeinfo",		(niarraytype)		},	\
-	  { NULL }						\
-}
-
-/* Structure used for NGM_LISTTYPES */
-struct typeinfo {
-	char		type_name[NG_TYPESIZ];	/* name of type */
-	uint32_t	numnodes;		/* number alive */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_TYPEINFO_INFO()		{		\
-	  { "typename",		&ng_parse_typebuf_type	},	\
-	  { "numnodes",		&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-struct typelist {
-	uint32_t	numtypes;
-	struct typeinfo	typeinfo[];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_TYPELIST_INFO(tiarraytype)	{		\
-	  { "numtypes",		&ng_parse_uint32_type	},	\
-	  { "typeinfo",		(tiarraytype)		},	\
-	  { NULL }						\
-}
-
-struct ngm_bandwidth {
-	u_int64_t	nominal_in;
-	u_int64_t	seen_in;
-	u_int64_t	nominal_out;
-	u_int64_t	seen_out;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_BANDWIDTH_INFO()	{			\
-	  { "nominal_in",	&ng_parse_uint64_type	},	\
-	  { "seen_in",		&ng_parse_uint64_type	},	\
-	  { "nominal_out",	&ng_parse_uint64_type	},	\
-	  { "seen_out",		&ng_parse_uint64_type	},	\
-	  { NULL }						\
-}
-
-/*
- * Information about a node's 'output' queue.
- * This is NOT the netgraph input queueing mechanism,
- * but rather any queue the node may implement internally
- * This has to consider ALTQ if we are to work with it.
- * As far as I can see, ALTQ counts PACKETS, not bytes.
- * If ALTQ has several queues and one has passed a watermark
- * we should have the priority of that queue be real (and not -1)
- * XXX ALTQ stuff is just an idea.....
- */
-struct ngm_queue_state {
-	u_int queue_priority; /* maybe only low-pri is full. -1 = all*/
-	u_int	max_queuelen_bytes;
-	u_int	max_queuelen_packets;
-	u_int	low_watermark;
-	u_int	high_watermark;
-	u_int	current;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_QUEUE_INFO()	{				\
-	  { "max_queuelen_bytes", &ng_parse_uint_type	},	\
-	  { "max_queuelen_packets", &ng_parse_uint_type	},	\
-	  { "high_watermark",	&ng_parse_uint_type	},	\
-	  { "low_watermark",	&ng_parse_uint_type	},	\
-	  { "current",		&ng_parse_uint_type	},	\
-	  { NULL }						\
-}
-
-/* Tell a node who to send async flow control info to. */
-struct flow_manager {
-	ng_ID_t		id;			/* unique identifier */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_GENERIC_FLOW_MANAGER_INFO()	{			\
-	  { "id",		&ng_parse_hint32_type	},	\
-	  { NULL }						\
-}
-
-
-/*
- * For netgraph nodes that are somehow associated with file descriptors
- * (e.g., a device that has a /dev entry and is also a netgraph node),
- * we define a generic ioctl for requesting the corresponding nodeinfo
- * structure and for assigning a name (if there isn't one already).
- *
- * For these to you need to also #include <sys/ioccom.h>.
- */
-
-#define NGIOCGINFO	_IOR('N', 40, struct nodeinfo)	/* get node info */
-#define NGIOCSETNAME	_IOW('N', 41, struct ngm_name)	/* set node name */
-
-#ifdef _KERNEL
-/*
- * Allocate and initialize a netgraph message "msg" with "len"
- * extra bytes of argument. Sets "msg" to NULL if fails.
- * Does not initialize token.
- */
-#define NG_MKMESSAGE(msg, cookie, cmdid, len, how)			\
-	do {								\
-	  (msg) = malloc(sizeof(struct ng_mesg)				\
-	    + (len), M_NETGRAPH_MSG, (how) | M_ZERO);			\
-	  if ((msg) == NULL)						\
-	    break;							\
-	  (msg)->header.version = NG_VERSION;				\
-	  (msg)->header.typecookie = (cookie);				\
-	  (msg)->header.cmd = (cmdid);					\
-	  (msg)->header.arglen = (len);					\
-	  strncpy((msg)->header.cmdstr, #cmdid,				\
-	    sizeof((msg)->header.cmdstr) - 1);				\
-	} while (0)
-
-/*
- * Allocate and initialize a response "rsp" to a message "msg"
- * with "len" extra bytes of argument. Sets "rsp" to NULL if fails.
- */
-#define NG_MKRESPONSE(rsp, msg, len, how)				\
-	do {								\
-	  (rsp) = malloc(sizeof(struct ng_mesg)				\
-	    + (len), M_NETGRAPH_MSG, (how) | M_ZERO);			\
-	  if ((rsp) == NULL)						\
-	    break;							\
-	  (rsp)->header.version = NG_VERSION;				\
-	  (rsp)->header.arglen = (len);					\
-	  (rsp)->header.token = (msg)->header.token;			\
-	  (rsp)->header.typecookie = (msg)->header.typecookie;		\
-	  (rsp)->header.cmd = (msg)->header.cmd;			\
-	  bcopy((msg)->header.cmdstr, (rsp)->header.cmdstr,		\
-	    sizeof((rsp)->header.cmdstr));				\
-	  (rsp)->header.flags |= NGF_RESP;				\
-	} while (0)
-
-/*
- * Make a copy of message. Sets "copy" to NULL if fails.
- */
-#define	NG_COPYMESSAGE(copy, msg, how)					\
-	do {								\
-	  (copy) = malloc(sizeof(struct ng_mesg)			\
-	    + (msg)->header.arglen, M_NETGRAPH_MSG, (how) | M_ZERO);	\
-	  if ((copy) == NULL)						\
-	    break;							\
-	  (copy)->header.version = NG_VERSION;				\
-	  (copy)->header.arglen = (msg)->header.arglen;			\
-	  (copy)->header.token = (msg)->header.token;			\
-	  (copy)->header.typecookie = (msg)->header.typecookie;		\
-	  (copy)->header.cmd = (msg)->header.cmd;			\
-	  (copy)->header.flags = (msg)->header.flags;			\
-	  bcopy((msg)->header.cmdstr, (copy)->header.cmdstr,		\
-	    sizeof((copy)->header.cmdstr));				\
-	  if ((msg)->header.arglen > 0)					\
-	    bcopy((msg)->data, (copy)->data, (msg)->header.arglen);	\
-	} while (0)
-
-#endif /* _KERNEL */
-
-#endif /* _NETGRAPH_NG_MESSAGE_H_ */
diff --git a/include.new/netgraph/ng_mppc.h b/include.new/netgraph/ng_mppc.h
deleted file mode 100644
index c3555e9..0000000
--- a/include.new/netgraph/ng_mppc.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * ng_mppc.h
- */
-
-/*-
- * Copyright (c) 1996-2000 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $Whistle: ng_mppc.h,v 1.3 2000/02/12 01:17:22 archie Exp $
- * $FreeBSD: releng/10.2/sys/netgraph/ng_mppc.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NETGRAPH_NG_MPPC_H_
-#define _NETGRAPH_NG_MPPC_H_
-
-/* Node type name and magic cookie */
-#define NG_MPPC_NODE_TYPE	"mppc"
-#define NGM_MPPC_COOKIE		942886745
-
-/* Hook names */
-#define NG_MPPC_HOOK_COMP	"comp"		/* compression hook */
-#define NG_MPPC_HOOK_DECOMP	"decomp"	/* decompression hook */
-
-/* Length of MPPE key */
-#define MPPE_KEY_LEN		16
-
-/* Max expansion due to MPPC header and compression algorithm */
-#define MPPC_MAX_BLOWUP(n)	((n) * 9 / 8 + 26)
-
-/* MPPC/MPPE PPP negotiation bits */
-#define MPPC_BIT		0x00000001	/* mppc compression bits */
-#define MPPE_40			0x00000020	/* use 40 bit key */
-#define MPPE_56			0x00000080	/* use 56 bit key */
-#define MPPE_128		0x00000040	/* use 128 bit key */
-#define MPPE_BITS		0x000000e0	/* mppe encryption bits */
-#define MPPE_STATELESS		0x01000000	/* use stateless mode */
-#define MPPC_VALID_BITS		0x010000e1	/* possibly valid bits */
-
-/* Config struct (per-direction) */
-struct ng_mppc_config {
-	u_char		enable;			/* enable */
-	uint32_t	bits;			/* config bits */
-	u_char		startkey[MPPE_KEY_LEN];	/* start key */
-};
-
-/* Netgraph commands */
-enum {
-	NGM_MPPC_CONFIG_COMP = 1,
-	NGM_MPPC_CONFIG_DECOMP,
-	NGM_MPPC_RESETREQ,			/* sent either way! */
-};
-
-#endif /* _NETGRAPH_NG_MPPC_H_ */
-
diff --git a/include.new/netgraph/ng_nat.h b/include.new/netgraph/ng_nat.h
deleted file mode 100644
index 5d52f46..0000000
--- a/include.new/netgraph/ng_nat.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*-
- * Copyright 2005, Gleb Smirnoff <glebius@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.
- *
- * 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: releng/10.2/sys/netgraph/ng_nat.h 248570 2013-03-21 08:36:15Z glebius $
- */
-
-#define NG_NAT_NODE_TYPE    "nat"
-#define NGM_NAT_COOKIE      1107718711
-
-#define	NG_NAT_HOOK_IN	"in"
-#define	NG_NAT_HOOK_OUT	"out"
-
-/* Arguments for NGM_NAT_SET_MODE message */
-struct ng_nat_mode {
-	uint32_t	flags;
-	uint32_t	mask;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_NAT_MODE_INFO {				\
-	  { "flags",	&ng_parse_uint32_type	},	\
-	  { "mask",	&ng_parse_uint32_type	},	\
-	  { NULL }					\
-}
-
-#define NG_NAT_LOG			0x01
-#define NG_NAT_DENY_INCOMING		0x02
-#define NG_NAT_SAME_PORTS		0x04
-#define NG_NAT_UNREGISTERED_ONLY	0x10
-#define NG_NAT_RESET_ON_ADDR_CHANGE	0x20
-#define NG_NAT_PROXY_ONLY		0x40
-#define NG_NAT_REVERSE			0x80
-
-#define NG_NAT_DESC_LENGTH	64
-#define NG_NAT_REDIRPROTO_ADDR	(IPPROTO_MAX + 3) 	/* LibAlias' LINK_ADDR, also unused in in.h */
-
-/* Arguments for NGM_NAT_REDIRECT_PORT message */
-struct ng_nat_redirect_port {
-	struct in_addr	local_addr;
-	struct in_addr	alias_addr;
-	struct in_addr	remote_addr;
-	uint16_t	local_port;
-	uint16_t	alias_port;
-	uint16_t	remote_port;
-	uint8_t		proto;
-	char		description[NG_NAT_DESC_LENGTH];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_NAT_REDIRECT_PORT_TYPE_INFO(desctype) {		\
-	  { "local_addr",	&ng_parse_ipaddr_type	},	\
-	  { "alias_addr",	&ng_parse_ipaddr_type	},	\
-	  { "remote_addr",	&ng_parse_ipaddr_type	},	\
-	  { "local_port",	&ng_parse_uint16_type	},	\
-	  { "alias_port",	&ng_parse_uint16_type	},	\
-	  { "remote_port",	&ng_parse_uint16_type	},	\
-	  { "proto",		&ng_parse_uint8_type	},	\
-	  { "description",	(desctype)		},	\
-	  { NULL }						\
-}
-
-/* Arguments for NGM_NAT_REDIRECT_ADDR message */
-struct ng_nat_redirect_addr {
-	struct in_addr	local_addr;
-	struct in_addr	alias_addr;
-	char		description[NG_NAT_DESC_LENGTH];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_NAT_REDIRECT_ADDR_TYPE_INFO(desctype) {		\
-	  { "local_addr",	&ng_parse_ipaddr_type	},	\
-	  { "alias_addr",	&ng_parse_ipaddr_type	},	\
-	  { "description",	(desctype)		},	\
-	  { NULL }						\
-}
-
-/* Arguments for NGM_NAT_REDIRECT_PROTO message */
-struct ng_nat_redirect_proto {
-	struct in_addr	local_addr;
-	struct in_addr	alias_addr;
-	struct in_addr	remote_addr;
-	uint8_t		proto;
-	char		description[NG_NAT_DESC_LENGTH];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_NAT_REDIRECT_PROTO_TYPE_INFO(desctype) {		\
-	  { "local_addr",	&ng_parse_ipaddr_type	},	\
-	  { "alias_addr",	&ng_parse_ipaddr_type	},	\
-	  { "remote_addr",	&ng_parse_ipaddr_type	},	\
-	  { "proto",		&ng_parse_uint8_type	},	\
-	  { "description",	(desctype)		},	\
-	  { NULL }						\
-}
-
-/* Arguments for NGM_NAT_ADD_SERVER message */
-struct ng_nat_add_server {
-	uint32_t	id;
-	struct in_addr	addr;
-	uint16_t	port;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_NAT_ADD_SERVER_TYPE_INFO {				\
-	  { "id",		&ng_parse_uint32_type	},	\
-	  { "addr",		&ng_parse_ipaddr_type	},	\
-	  { "port",		&ng_parse_uint16_type	},	\
-	  { NULL }						\
-}
-
-/* List entry of array returned in NGM_NAT_LIST_REDIRECTS message */
-struct ng_nat_listrdrs_entry {
-	uint32_t	id;		/* Anything except zero */
-	struct in_addr	local_addr;
-	struct in_addr	alias_addr;
-	struct in_addr	remote_addr;
-	uint16_t	local_port;
-	uint16_t	alias_port;
-	uint16_t	remote_port;
-	uint16_t	proto;		/* Valid proto or NG_NAT_REDIRPROTO_ADDR */
-	uint16_t	lsnat;		/* LSNAT servers count */
-	char		description[NG_NAT_DESC_LENGTH];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_NAT_LISTRDRS_ENTRY_TYPE_INFO(desctype) {			\
-	  { "id",		&ng_parse_uint32_type	},	\
-	  { "local_addr",	&ng_parse_ipaddr_type	},	\
-	  { "alias_addr",	&ng_parse_ipaddr_type	},	\
-	  { "remote_addr",	&ng_parse_ipaddr_type	},	\
-	  { "local_port",	&ng_parse_uint16_type	},	\
-	  { "alias_port",	&ng_parse_uint16_type	},	\
-	  { "remote_port",	&ng_parse_uint16_type	},	\
-	  { "proto",		&ng_parse_uint16_type	},	\
-	  { "lsnat",		&ng_parse_uint16_type	},	\
-	  { "description",	(desctype)		},	\
-	  { NULL }						\
-}
-
-/* Structure returned by NGM_NAT_LIST_REDIRECTS */
-struct ng_nat_list_redirects {
-	uint32_t		total_count;
-	struct ng_nat_listrdrs_entry redirects[];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_NAT_LIST_REDIRECTS_TYPE_INFO(redirtype) {		\
-	  { "total_count",	&ng_parse_uint32_type	},	\
-	  { "redirects",	(redirtype)		},	\
-	  { NULL }						\
-}
-
-/* Structure returned by NGM_NAT_LIBALIAS_INFO */
-struct ng_nat_libalias_info {
-	uint32_t	icmpLinkCount;
-	uint32_t	udpLinkCount;
-	uint32_t	tcpLinkCount;
-	uint32_t	sctpLinkCount;
-	uint32_t	pptpLinkCount;
-	uint32_t	protoLinkCount;
-	uint32_t	fragmentIdLinkCount;
-	uint32_t	fragmentPtrLinkCount;
-	uint32_t	sockCount;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_NAT_LIBALIAS_INFO {					\
-	  { "icmpLinkCount",	&ng_parse_uint32_type	},	\
-	  { "udpLinkCount",	&ng_parse_uint32_type	},	\
-	  { "tcpLinkCount",	&ng_parse_uint32_type	},	\
-	  { "sctpLinkCount",	&ng_parse_uint32_type	},	\
-	  { "pptpLinkCount",	&ng_parse_uint32_type	},	\
-	  { "protoLinkCount",	&ng_parse_uint32_type	},	\
-	  { "fragmentIdLinkCount", &ng_parse_uint32_type },	\
-	  { "fragmentPtrLinkCount", &ng_parse_uint32_type },	\
-	  { "sockCount",	&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-enum {
-	NGM_NAT_SET_IPADDR = 1,
-	NGM_NAT_SET_MODE,
-	NGM_NAT_SET_TARGET,
-	NGM_NAT_REDIRECT_PORT,
-	NGM_NAT_REDIRECT_ADDR,
-	NGM_NAT_REDIRECT_PROTO,
-	NGM_NAT_REDIRECT_DYNAMIC,
-	NGM_NAT_REDIRECT_DELETE,
-	NGM_NAT_ADD_SERVER,
-	NGM_NAT_LIST_REDIRECTS,
-	NGM_NAT_PROXY_RULE,
-	NGM_NAT_LIBALIAS_INFO,
-};
diff --git a/include.new/netgraph/ng_one2many.h b/include.new/netgraph/ng_one2many.h
deleted file mode 100644
index 171b6eb..0000000
--- a/include.new/netgraph/ng_one2many.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * ng_one2many.h
- */
-
-/*-
- * Copyright (c) 2000 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_one2many.h 219127 2011-03-01 13:10:56Z ae $
- */
-
-#ifndef _NETGRAPH_NG_ONE2MANY_H_
-#define _NETGRAPH_NG_ONE2MANY_H_
-
-/* Node type name and magic cookie */
-#define NG_ONE2MANY_NODE_TYPE		"one2many"
-#define NGM_ONE2MANY_COOKIE		1100897444
-
-/* Hook names */
-#define NG_ONE2MANY_HOOK_ONE		"one"
-#define NG_ONE2MANY_HOOK_MANY_PREFIX	"many"	 /* append decimal integer */
-#define NG_ONE2MANY_HOOK_MANY_FMT	"many%d" /* for use with printf(3) */
-
-/* Maximum number of supported "many" links */
-#define NG_ONE2MANY_MAX_LINKS		64
-
-/* Link number used to indicate the "one" hook */
-#define NG_ONE2MANY_ONE_LINKNUM		(-1)
-
-/* Algorithms for outgoing packet distribution (XXX only one so far) */
-#define NG_ONE2MANY_XMIT_ROUNDROBIN	1	/* round-robin delivery */
-#define NG_ONE2MANY_XMIT_ALL		2	/* send packets to all many hooks */
-#define	NG_ONE2MANY_XMIT_FAILOVER	3	/* send packets to first active "many" */
-
-/* Algorithms for detecting link failure (XXX only one so far) */
-#define NG_ONE2MANY_FAIL_MANUAL		1	/* use enabledLinks[] array */
-#define NG_ONE2MANY_FAIL_NOTIFY		2	/* listen to flow control msgs */
-
-/* Node configuration structure */
-struct ng_one2many_config {
-	uint32_t	xmitAlg;		/* how to distribute packets */
-	uint32_t	failAlg;		/* how to detect link failure */
-	u_char		enabledLinks[NG_ONE2MANY_MAX_LINKS];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_ONE2MANY_CONFIG_TYPE_INFO(atype)	{		\
-	  { "xmitAlg",		&ng_parse_uint32_type	},	\
-	  { "failAlg",		&ng_parse_uint32_type	},	\
-	  { "enabledLinks",	(atype)			},	\
-	  { NULL }						\
-}
-
-/* Statistics structure (one for each link) */
-struct ng_one2many_link_stats {
-	u_int64_t	recvOctets;	/* total octets rec'd on link */
-	u_int64_t	recvPackets;	/* total pkts rec'd on link */
-	u_int64_t	xmitOctets;	/* total octets xmit'd on link */
-	u_int64_t	xmitPackets;	/* total pkts xmit'd on link */
-	u_int64_t	memoryFailures;	/* times couldn't get mem or mbuf */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_ONE2MANY_LINK_STATS_TYPE_INFO	{		\
-	  { "recvOctets",	&ng_parse_uint64_type	},	\
-	  { "recvPackets",	&ng_parse_uint64_type	},	\
-	  { "xmitOctets",	&ng_parse_uint64_type	},	\
-	  { "xmitPackets",	&ng_parse_uint64_type	},	\
-	  { "memoryFailures",	&ng_parse_uint64_type	},	\
-	  { NULL }						\
-}
-
-/* Netgraph control messages */
-enum {
-	NGM_ONE2MANY_SET_CONFIG,	/* set configuration */
-	NGM_ONE2MANY_GET_CONFIG,	/* get configuration */
-	NGM_ONE2MANY_GET_STATS,		/* get link stats */
-	NGM_ONE2MANY_CLR_STATS,		/* clear link stats */
-	NGM_ONE2MANY_GETCLR_STATS,	/* atomically get & clear link stats */
-};
-
-#endif /* _NETGRAPH_NG_ONE2MANY_H_ */
-
diff --git a/include.new/netgraph/ng_parse.h b/include.new/netgraph/ng_parse.h
deleted file mode 100644
index 6477f10..0000000
--- a/include.new/netgraph/ng_parse.h
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * ng_parse.h
- */
-
-/*-
- * Copyright (c) 1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $Whistle: ng_parse.h,v 1.2 1999/11/29 01:43:48 archie Exp $
- * $FreeBSD: releng/10.2/sys/netgraph/ng_parse.h 151800 2005-10-28 14:41:28Z ru $
- */
-
-#ifndef _NETGRAPH_NG_PARSE_H_
-#define _NETGRAPH_NG_PARSE_H_
-
-/*
-
-  This defines a library of routines for converting between various C
-  language types in binary form and ASCII strings.  Types are user
-  definable.  Several pre-defined types are supplied, for some common
-  C types: structures, variable and fixed length arrays, integer types,
-  variable and fixed length strings, IP addresses, etc.
-
-  A netgraph node type may provide a list of types that correspond to
-  the structures it expects to send and receive in the arguments field
-  of a control message.  This allows these messages to be converted
-  between their native binary form and the corresponding ASCII form.
-
-  A future use of the ASCII form may be for inter-machine communication
-  of control messages, because the ASCII form is machine independent
-  whereas the native binary form is not.
-
-  Syntax
-  ------
-
-    Structures:
-
-      '{' [ <name>=<value> ... ] '}'
-
-      Omitted fields have their default values by implication.
-      The order in which the fields are specified does not matter.
-
-    Arrays:
-
-      '[' [ [index=]<value> ... ] ']'
-
-      Element value may be specified with or without the "<index>=" prefix;
-      If omitted, the index after the previous element is used.
-      Omitted fields have their default values by implication.
-
-    Strings:
-
-      "foo bar blah\r\n"
-
-      That is, strings are specified just like C strings. The usual
-      backslash escapes are accepted.
-
-    Other simple types (integers, IP addresses) have their obvious forms.
-
-  Example
-  -------
-
-    Suppose we have a netgraph command that takes as an argument
-    a 'struct foo' shown below.  Here is an example of a possible
-    value for the structure, and the corresponding ASCII encoding
-    of that value:
-
-	Structure			Binary value
-	---------			------------
-
-	struct foo {
-	    struct in_addr ip;  	01 02 03 04
-	    int bar;			00 00 00 00
-	    char label[8];		61 62 63 0a 00 00 00 00
-	    u_char alen;		03 00
-	    short ary[];	  	05 00 00 00 0a 00
-	};
-
-	ASCII value
-	-----------
-
-	{ ip=1.2.3.4 label="abc\n" alen=3 ary=[ 5 2=10 ] }
-
-    Note that omitted fields and array elements get their default
-    values ("bar" and ary[2]), and that the alignment is handled
-    automatically (the extra 00 byte after "alen").  Also, since byte
-    order and alignment are inherently machine dependent, so is this
-    conversion process.  The above example shows an x86 (little
-    endian) encoding.  Also the above example is tricky because the
-    structure is variable length, depending on 'alen', the number of
-    elements in the array 'ary'.
-
-    Here is how one would define a parse type for the above structure,
-    subclassing the pre-defined types below.  We construct the type in
-    a 'bottom up' fashion, defining each field's type first, then the
-    type for the whole structure ('//' comments used to avoid breakage).
-
-    // Super-type info for 'label' field
-    struct ng_parse_fixedstring_info foo_label_info = { 8 };
-
-    // Parse type for 'label' field
-    struct ng_parse_type foo_label_type = {
-	    &ng_parse_fixedstring_type		// super-type
-	    &foo_label_info			// super-type info
-    };
-
-    #define OFFSETOF(s, e) ((char *)&((s *)0)->e - (char *)((s *)0))
-
-    // Function to compute the length of the array 'ary', which
-    // is variable length, depending on the previous field 'alen'.
-    // Upon entry 'buf' will be pointing at &ary[0].
-    int
-    foo_ary_getLength(const struct ng_parse_type *type,
-	    const u_char *start, const u_char *buf)
-    {
-	    const struct foo *f;
-
-	    f = (const struct foo *)(buf - OFFSETOF(struct foo, ary));
-	    return f->alen;
-    }
-
-    // Super-type info for 'ary' field
-    struct ng_parse_array_info foo_ary_info = {
-	    &ng_parse_int16_type,		// element type
-	    &foo_ary_getLength			// func to get array length
-    }
-
-    // Parse type for 'ary' field
-    struct ng_parse_type foo_ary_type = {
-	    &ng_parse_array_type,		// super-type
-	    &foo_ary_info			// super-type info
-    };
-
-    // Super-type info for struct foo
-    struct ng_parse_struct_field foo_fields[] = {
-	    { "ip",	&ng_parse_ipaddr_type	},
-	    { "bar",	&ng_parse_int32_type	},
-	    { "label",	&foo_label_type		},
-	    { "alen",	&ng_parse_uint8_type	},
-	    { "ary",	&foo_ary_type		},
-	    { NULL }
-    };
-
-    // Parse type for struct foo
-    struct ng_parse_type foo_type = {
-	    &ng_parse_struct_type,		// super-type
-	    &foo_fields				// super-type info
-    };
-
-  To define a type, you can define it as a sub-type of a predefined
-  type as shown above, possibly overriding some of the predefined
-  type's methods, or define an entirely new syntax, with the restriction
-  that the ASCII representation of your type's value must not contain
-  any whitespace or any of these characters: { } [ ] = "
-
-  See ng_ksocket.c for an example of how to do this for 'struct sockaddr'.
-  See ng_parse.c to see implementations of the pre-defined types below.
-
-*/
-
-/************************************************************************
-			METHODS REQUIRED BY A TYPE
- ************************************************************************/
-
-/*
- * Three methods are required for a type. These may be given explicitly
- * or, if NULL, inherited from the super-type.  The 'getDefault' method
- * is always optional; the others are required if there is no super-type.
- */
-
-struct ng_parse_type;
-
-/*
- * Convert ASCII to binary according to the supplied type.
- *
- * The ASCII characters begin at offset *off in 'string'.  The binary
- * representation is put into 'buf', which has at least *buflen bytes.
- * 'start' points to the first byte output by ng_parse() (ie, start <= buf).
- *
- * Upon return, *buflen contains the length of the new binary data, and
- * *off is updated to point just past the end of the parsed range of
- * characters, or, in the case of an error, to the offending character(s).
- *
- * Return values:
- *	0		Success; *buflen holds the length of the data
- *			and *off points just past the last char parsed.
- *	EALREADY	Field specified twice
- *	ENOENT		Unknown field
- *	E2BIG		Array or character string overflow
- *	ERANGE		Output was longer than *buflen bytes
- *	EINVAL		Parse failure or other invalid content
- *	ENOMEM		Out of memory
- *	EOPNOTSUPP	Mandatory array/structure element missing
- */
-typedef	int	ng_parse_t(const struct ng_parse_type *type, const char *string,
-			int *off, const u_char *start,
-			u_char *buf, int *buflen);
-
-/*
- * Convert binary to ASCII according to the supplied type.
- *
- * The results are put into 'buf', which is at least buflen bytes long.
- * *off points to the current byte in 'data' and should be updated
- * before return to point just past the last byte unparsed.
- *
- * Returns:
- *	0		Success
- *	ERANGE		Output was longer than buflen bytes
- */
-typedef	int	ng_unparse_t(const struct ng_parse_type *type,
-			const u_char *data, int *off, char *buf, int buflen);
-
-/*
- * Compute the default value according to the supplied type.
- *
- * Store the result in 'buf', which is at least *buflen bytes long.
- * Upon return *buflen contains the length of the output.
- *
- * Returns:
- *	0		Success
- *	ERANGE		Output was longer than *buflen bytes
- *	EOPNOTSUPP	Default value is not specified for this type
- */
-typedef	int	ng_getDefault_t(const struct ng_parse_type *type,
-			const u_char *start, u_char *buf, int *buflen);
-
-/*
- * Return the alignment requirement of this type.  Zero is same as one.
- */
-typedef	int	ng_getAlign_t(const struct ng_parse_type *type);
-
-/************************************************************************
-			TYPE DEFINITION
- ************************************************************************/
-
-/*
- * This structure describes a type, which may be a sub-type of another
- * type by pointing to it with 'supertype' and possibly omitting methods.
- * Typically the super-type requires some type-specific info, which is
- * supplied by the 'info' field.
- *
- * The 'private' field is ignored by all of the pre-defined types.
- * Sub-types may use it as they see fit.
- *
- * The 'getDefault' method may always be omitted (even if there is no
- * super-type), which means the value for any item of this type must
- * always be explicitly given.
- */
-struct ng_parse_type {
-	const struct ng_parse_type *supertype;	/* super-type, if any */
-	const void		*info;		/* type-specific info */
-	void			*private;	/* client private info */
-	ng_parse_t		*parse;		/* parse method */
-	ng_unparse_t		*unparse;	/* unparse method */
-	ng_getDefault_t		*getDefault;	/* get default value method */
-	ng_getAlign_t		*getAlign;	/* get alignment */
-};
-
-/************************************************************************
-			PRE-DEFINED TYPES
- ************************************************************************/
-
-/*
- * STRUCTURE TYPE
- *
- * This type supports arbitrary C structures.  The normal field alignment
- * rules for the local machine are applied.  Fields are always parsed in
- * field order, no matter what order they are listed in the ASCII string.
- *
- *   Default value:		Determined on a per-field basis
- *   Additional info:		struct ng_parse_struct_field *
- */
-extern const struct ng_parse_type ng_parse_struct_type;
-
-/* Each field has a name, type, and optional alignment override. If the
-   override is non-zero, the alignment is determined from the field type.
-   Note: add an extra struct ng_parse_struct_field with name == NULL
-   to indicate the end of the list. */
-struct ng_parse_struct_field {
-	const char			*name;		/* field name */
-	const struct ng_parse_type	*type;		/* field type */
-	int				alignment;	/* override alignment */
-};
-
-/*
- * FIXED LENGTH ARRAY TYPE
- *
- * This type supports fixed length arrays, having any element type.
- *
- *   Default value:		As returned by getDefault for each index
- *   Additional info:		struct ng_parse_fixedarray_info *
- */
-extern const struct ng_parse_type ng_parse_fixedarray_type;
-
-/*
- * Get the default value for the element at index 'index'.  This method
- * may be NULL, in which case the default value is computed from the
- * element type.  Otherwise, it should fill in the default value at *buf
- * (having size *buflen) and update *buflen to the length of the filled-in
- * value before return.  If there is not enough routine return ERANGE.
- */
-typedef	int	ng_parse_array_getDefault_t(const struct ng_parse_type *type,
-				int index, const u_char *start,
-				u_char *buf, int *buflen);
-
-struct ng_parse_fixedarray_info {
-	const struct ng_parse_type	*elementType;
-	int				length;
-	ng_parse_array_getDefault_t	*getDefault;
-};
-
-/*
- * VARIABLE LENGTH ARRAY TYPE
- *
- * Same as fixed length arrays, except that the length is determined
- * by a function instead of a constant value.
- *
- *   Default value:		Same as with fixed length arrays
- *   Additional info:		struct ng_parse_array_info *
- */
-extern const struct ng_parse_type ng_parse_array_type;
-
-/*
- * Return the length of the array.  If the array is a field in a structure,
- * all prior fields are guaranteed to be filled in already.  Upon entry,
- * 'start' is equal to the first byte parsed in this run, while 'buf' points
- * to the first element of the array to be filled in.
- */
-typedef int	ng_parse_array_getLength_t(const struct ng_parse_type *type,
-				const u_char *start, const u_char *buf);
-
-struct ng_parse_array_info {
-	const struct ng_parse_type	*elementType;
-	ng_parse_array_getLength_t	*getLength;
-	ng_parse_array_getDefault_t	*getDefault;
-};
-
-/*
- * ARBITRARY LENGTH STRING TYPE
- *
- * For arbirary length, NUL-terminated strings.
- *
- *   Default value:		Empty string
- *   Additional info:		None required
- */
-extern const struct ng_parse_type ng_parse_string_type;
-
-/*
- * BOUNDED LENGTH STRING TYPE
- *
- * These are strings that have a fixed-size buffer, and always include
- * a terminating NUL character.
- *
- *   Default value:		Empty string
- *   Additional info:		struct ng_parse_fixedstring_info *
- */
-extern const struct ng_parse_type ng_parse_fixedstring_type;
-
-struct ng_parse_fixedstring_info {
-	int	bufSize;	/* size of buffer (including NUL) */
-};
-
-/*
- * EXPLICITLY SIZED STRING TYPE
- *
- * These are strings that have a two byte length field preceding them.
- * Parsed strings are NOT NUL-terminated.
- *
- *   Default value:		Empty string
- *   Additional info:		None
- */
-extern const struct ng_parse_type ng_parse_sizedstring_type;
-
-/*
- * COMMONLY USED BOUNDED LENGTH STRING TYPES
- */
-extern const struct ng_parse_type ng_parse_nodebuf_type;  /* NG_NODESIZ */
-extern const struct ng_parse_type ng_parse_hookbuf_type;  /* NG_HOOKSIZ */
-extern const struct ng_parse_type ng_parse_pathbuf_type;  /* NG_PATHSIZ */
-extern const struct ng_parse_type ng_parse_typebuf_type;  /* NG_TYPESIZ */
-extern const struct ng_parse_type ng_parse_cmdbuf_type;   /* NG_CMDSTRSIZ */
-
-/*
- * INTEGER TYPES
- *
- *   Default value:		0
- *   Additional info:		None required
- */
-extern const struct ng_parse_type ng_parse_int8_type;
-extern const struct ng_parse_type ng_parse_int16_type;
-extern const struct ng_parse_type ng_parse_int32_type;
-extern const struct ng_parse_type ng_parse_int64_type;
-
-/* Same thing but unparse as unsigned quantities */
-extern const struct ng_parse_type ng_parse_uint8_type;
-extern const struct ng_parse_type ng_parse_uint16_type;
-extern const struct ng_parse_type ng_parse_uint32_type;
-extern const struct ng_parse_type ng_parse_uint64_type;
-
-/* Same thing but unparse as hex quantities, e.g., "0xe7" */
-extern const struct ng_parse_type ng_parse_hint8_type;
-extern const struct ng_parse_type ng_parse_hint16_type;
-extern const struct ng_parse_type ng_parse_hint32_type;
-extern const struct ng_parse_type ng_parse_hint64_type;
-
-/*
- * IP ADDRESS TYPE
- *
- *   Default value:		0.0.0.0
- *   Additional info:		None required
- */
-extern const struct ng_parse_type ng_parse_ipaddr_type;
-
-/*
- * ETHERNET ADDRESS TYPE
- *
- *   Default value:		None
- *   Additional info:		None required
- */
-extern const struct ng_parse_type ng_parse_enaddr_type;
-
-/*
- * VARIABLE LENGTH BYTE ARRAY TYPE
- *
- * The bytes are displayed in hex.  The ASCII form may be either an
- * array of bytes or a string constant, in which case the array is
- * zero-filled after the string bytes.
- *
- *   Default value:		All bytes are zero
- *   Additional info:		ng_parse_array_getLength_t *
- */
-extern const struct ng_parse_type ng_parse_bytearray_type;
-
-/*
- * NETGRAPH CONTROL MESSAGE TYPE
- *
- * This is the parse type for a struct ng_mesg.
- *
- *   Default value:		All fields zero
- *   Additional info:		None required
- */
-extern const struct ng_parse_type ng_parse_ng_mesg_type;
-
-/************************************************************************
-		CONVERSTION AND PARSING ROUTINES
- ************************************************************************/
-
-/* Tokens for parsing structs and arrays */
-enum ng_parse_token {
-	T_LBRACE,		/* '{' */
-	T_RBRACE,		/* '}' */
-	T_LBRACKET,		/* '[' */
-	T_RBRACKET,		/* ']' */
-	T_EQUALS,		/* '=' */
-	T_STRING,		/* string in double quotes */
-	T_ERROR,		/* error parsing string in double quotes */
-	T_WORD,			/* anything else containing no whitespace */
-	T_EOF,			/* end of string reached */
-};
-
-/*
- * See typedef ng_parse_t for definition
- */
-extern int	ng_parse(const struct ng_parse_type *type, const char *string,
-			int *off, u_char *buf, int *buflen);
-
-/*
- * See typedef ng_unparse_t for definition (*off assumed to be zero).
- */
-extern int	ng_unparse(const struct ng_parse_type *type,
-			const u_char *data, char *buf, int buflen);
-
-/*
- * See typedef ng_getDefault_t for definition
- */
-extern int	ng_parse_getDefault(const struct ng_parse_type *type,
-			u_char *buf, int *buflen);
-
-/*
- * Parse a token: '*startp' is the offset to start looking.  Upon
- * successful return, '*startp' equals the beginning of the token
- * and '*lenp' the length.  If error, '*startp' points at the
- * offending character(s).
- */
-extern enum	ng_parse_token ng_parse_get_token(const char *s,
-			int *startp, int *lenp);
-
-/*
- * Like above, but specifically for getting a string token and returning
- * the string value.  The string token must be enclosed in double quotes
- * and the normal C backslash escapes are recognized.  The caller must
- * eventually free() the returned result.  Returns NULL if token is
- * not a string token, or parse or other error. Otherwise, *lenp contains
- * the number of characters parsed, and *slenp (if not NULL) contains
- * the actual number of characters in the parsed string.
- */
-extern char	*ng_get_string_token(const char *s, int *startp,
-			int *lenp, int *slenp);
-
-/*
- * Convert a raw string into a doubly-quoted string including any
- * necessary backslash escapes.  Caller must free the result.
- * Returns NULL if ENOMEM. Normally "slen" should equal strlen(s)
- * unless you want to encode NUL bytes.
- */
-extern char	*ng_encode_string(const char *s, int slen);
-
-#endif /* _NETGRAPH_NG_PARSE_H_ */
-
diff --git a/include.new/netgraph/ng_patch.h b/include.new/netgraph/ng_patch.h
deleted file mode 100644
index 071db72..0000000
--- a/include.new/netgraph/ng_patch.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * Copyright (C) 2010 by Maxim Ignatenko <gelraen.ua@gmail.com>
- * 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.
- *
- * 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: releng/10.2/sys/netgraph/ng_patch.h 208989 2010-06-10 16:45:30Z ae $
- */
-
-#ifndef _NETGRAPH_NG_PATCH_H_
-#define _NETGRAPH_NG_PATCH_H_
-
-/* Node type name. */
-#define	NG_PATCH_NODE_TYPE	"patch"
-
-/* Node type cookie. */
-#define	NGM_PATCH_COOKIE	1262445509
-
-/* Hook names */
-#define	NG_PATCH_HOOK_IN	"in"
-#define	NG_PATCH_HOOK_OUT	"out"
-
-/* Netgraph commands understood by this node type */
-enum {
-	NGM_PATCH_SETCONFIG = 1,
-	NGM_PATCH_GETCONFIG,
-	NGM_PATCH_GET_STATS,
-	NGM_PATCH_CLR_STATS,
-	NGM_PATCH_GETCLR_STATS
-};
-
-/* Patching modes */
-enum {
-	NG_PATCH_MODE_SET = 1,
-	NG_PATCH_MODE_ADD = 2,
-	NG_PATCH_MODE_SUB = 3,
-	NG_PATCH_MODE_MUL = 4,
-	NG_PATCH_MODE_DIV = 5,
-	NG_PATCH_MODE_NEG = 6,
-	NG_PATCH_MODE_AND = 7,
-	NG_PATCH_MODE_OR = 8,
-	NG_PATCH_MODE_XOR = 9,
-	NG_PATCH_MODE_SHL = 10,
-	NG_PATCH_MODE_SHR = 11
-};
-
-struct ng_patch_op {
-	uint64_t	value;
-	uint32_t	offset;
-	uint16_t	length;	/* 1,2,4 or 8 (bytes) */
-	uint16_t	mode;
-};
-
-#define	NG_PATCH_OP_TYPE_INFO	{	\
-		{ "value",	&ng_parse_uint64_type	},	\
-		{ "offset",	&ng_parse_uint32_type	},	\
-		{ "length",	&ng_parse_uint16_type	},	\
-		{ "mode",	&ng_parse_uint16_type	},	\
-		{ NULL } \
-}
-
-struct ng_patch_config {
-	uint32_t	count;
-	uint32_t	csum_flags;
-	struct ng_patch_op ops[];
-};
-
-#define	NG_PATCH_CONFIG_TYPE_INFO	{	\
-		{ "count",	&ng_parse_uint32_type	},	\
-		{ "csum_flags",	&ng_parse_uint32_type	},	\
-		{ "ops",	&ng_patch_confarr_type	},	\
-		{ NULL } \
-}
-
-struct ng_patch_stats {
-	uint64_t	received;
-	uint64_t	patched;
-	uint64_t	dropped;
-};
-
-#define	NG_PATCH_STATS_TYPE_INFO {	\
-		{ "received",	&ng_parse_uint64_type	},	\
-		{ "patched",	&ng_parse_uint64_type	},	\
-		{ "dropped",	&ng_parse_uint64_type	},	\
-		{ NULL } \
-}
-
-#endif /* _NETGRAPH_NG_PATCH_H_ */
diff --git a/include.new/netgraph/ng_pipe.h b/include.new/netgraph/ng_pipe.h
deleted file mode 100644
index 53da643..0000000
--- a/include.new/netgraph/ng_pipe.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*-
- * Copyright (c) 2004-2008 University of Zagreb
- * Copyright (c) 2007-2008 FreeBSD Foundation
- *
- * This software was developed by the University of Zagreb and the
- * FreeBSD Foundation under sponsorship by the Stichting NLnet and the
- * FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/netgraph/ng_pipe.h 206360 2010-04-07 16:29:10Z joel $
- */
-
-#ifndef _NETGRAPH_PIPE_H_
-#define _NETGRAPH_PIPE_H_
-
-/* Node type name and magic cookie */
-#define NG_PIPE_NODE_TYPE	"pipe"
-#define NGM_PIPE_COOKIE		200708191
-
-/* Hook names */
-#define NG_PIPE_HOOK_UPPER	"upper"
-#define NG_PIPE_HOOK_LOWER	"lower"
-
-#define MAX_FSIZE 16384	/* Largest supported frame size, in bytes, for BER */
-#define MAX_OHSIZE 256	/* Largest supported dummy-framing size, in bytes */
-
-/* Statistics structure for one hook */
-struct ng_pipe_hookstat {
-	u_int64_t		fwd_octets;
-	u_int64_t		fwd_frames;
-	u_int64_t		in_disc_octets;
-	u_int64_t		in_disc_frames;
-	u_int64_t		out_disc_octets;
-	u_int64_t		out_disc_frames;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PIPE_HOOKSTAT_INFO	{					\
-	{ "FwdOctets",		&ng_parse_uint64_type	},		\
-	{ "FwdFrames",		&ng_parse_uint64_type	},		\
-	{ "queueDropOctets",	&ng_parse_uint64_type	},		\
-	{ "queueDropFrames",	&ng_parse_uint64_type	},		\
-	{ "delayDropOctets",	&ng_parse_uint64_type	},		\
-	{ "delayDropFrames",	&ng_parse_uint64_type	},		\
-	{ NULL },							\
-}
-
-/* Statistics structure returned by NGM_PIPE_GET_STATS */
-struct ng_pipe_stats {
-	struct ng_pipe_hookstat	downstream;
-	struct ng_pipe_hookstat	upstream;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PIPE_STATS_INFO(hstype)	{				\
-	{ "downstream",		(hstype) },				\
-	{ "upstream",		(hstype) },				\
-	{ NULL },							\
-}
-
-/* Runtime structure for one hook */
-struct ng_pipe_hookrun {
-	uint32_t		fifo_queues;
-	uint32_t		qin_octets;
-	uint32_t		qin_frames;
-	uint32_t		qout_octets;
-	uint32_t		qout_frames;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PIPE_HOOKRUN_INFO	{					\
-	{ "queues",		&ng_parse_uint32_type	},		\
-	{ "queuedOctets",	&ng_parse_uint32_type	},		\
-	{ "queuedFrames",	&ng_parse_uint32_type	},		\
-	{ "delayedOctets",	&ng_parse_uint32_type	},		\
-	{ "delayedFrames",	&ng_parse_uint32_type	},		\
-	{ NULL },							\
-}
-
-/* Runtime structure returned by NGM_PIPE_GET_RUN */
-struct ng_pipe_run {
-	struct ng_pipe_hookrun	downstream;
-	struct ng_pipe_hookrun	upstream;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PIPE_RUN_INFO(hstype)	{				\
-	{ "downstream",		(hstype) },				\
-	{ "upstream",		(hstype) },				\
-	{ NULL },							\
-}
-
-/* Config structure for one hook */
-struct ng_pipe_hookcfg {
-	u_int64_t		bandwidth;
-	u_int64_t		ber;
-	uint32_t		qin_size_limit;
-	uint32_t		qout_size_limit;
-	uint32_t		duplicate;
-	uint32_t		fifo;
-	uint32_t		drr;
-	uint32_t		wfq;
-	uint32_t		droptail;
-	uint32_t		drophead;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PIPE_HOOKCFG_INFO	{					\
-	{ "bandwidth",		&ng_parse_uint64_type	},		\
-	{ "BER",		&ng_parse_uint64_type	},		\
-	{ "queuelen",		&ng_parse_uint32_type	},		\
-	{ "delaylen",		&ng_parse_uint32_type	},		\
-	{ "duplicate",		&ng_parse_uint32_type	},		\
-	{ "fifo",		&ng_parse_uint32_type	},		\
-	{ "drr",		&ng_parse_uint32_type	},		\
-	{ "wfq",		&ng_parse_uint32_type	},		\
-	{ "droptail",		&ng_parse_uint32_type	},		\
-	{ "drophead",		&ng_parse_uint32_type	},		\
-	{ NULL },							\
-}
-
-/* Config structure returned by NGM_PIPE_GET_CFG */
-struct ng_pipe_cfg {
-	u_int64_t		bandwidth;
-	u_int64_t		delay;
-	uint32_t		header_offset;
-	uint32_t		overhead;
-	struct ng_pipe_hookcfg	downstream;
-	struct ng_pipe_hookcfg	upstream;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PIPE_CFG_INFO(hstype)	{				\
-	{ "bandwidth",		&ng_parse_uint64_type	},		\
-	{ "delay",		&ng_parse_uint64_type	},		\
-	{ "header_offset",	&ng_parse_uint32_type	},		\
-	{ "overhead",		&ng_parse_uint32_type	},		\
-	{ "downstream",		(hstype)		},		\
-	{ "upstream",		(hstype)		},		\
-	{ NULL },							\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_PIPE_GET_STATS=1,		/* get stats */
-	NGM_PIPE_CLR_STATS,		/* clear stats */
-	NGM_PIPE_GETCLR_STATS,		/* atomically get and clear stats */
-	NGM_PIPE_GET_RUN,		/* get current runtime status */
-	NGM_PIPE_GET_CFG,		/* get configurable parameters */
-	NGM_PIPE_SET_CFG,		/* set configurable parameters */
-};
-
-#endif /* _NETGRAPH_PIPE_H_ */
diff --git a/include.new/netgraph/ng_ppp.h b/include.new/netgraph/ng_ppp.h
deleted file mode 100644
index 341b624..0000000
--- a/include.new/netgraph/ng_ppp.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * ng_ppp.h
- */
-
-/*-
- * Copyright (c) 1996-2000 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_ppp.h 171688 2007-08-01 20:49:35Z mav $
- * $Whistle: ng_ppp.h,v 1.8 1999/01/25 02:40:02 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_PPP_H_
-#define _NETGRAPH_NG_PPP_H_
-
-/* Node type name and magic cookie */
-#define NG_PPP_NODE_TYPE	"ppp"
-#define NGM_PPP_COOKIE		940897795
-
-/* 64bit stats presence flag */
-#define NG_PPP_STATS64
-
-/* Maximum number of supported links */
-#define NG_PPP_MAX_LINKS	16
-
-/* Pseudo-link number representing the multi-link bundle */
-#define NG_PPP_BUNDLE_LINKNUM	0xffff
-
-/* Max allowable link latency (miliseconds) and bandwidth (bytes/second/10) */
-#define NG_PPP_MAX_LATENCY	1000		/* 1 second */
-#define NG_PPP_MAX_BANDWIDTH	125000		/* 10 Mbits / second */
-
-/* Hook names */
-#define NG_PPP_HOOK_BYPASS	"bypass"	/* unknown protocols */
-#define NG_PPP_HOOK_COMPRESS	"compress"	/* outgoing compression */
-#define NG_PPP_HOOK_DECOMPRESS	"decompress"	/* incoming decompression */
-#define NG_PPP_HOOK_ENCRYPT	"encrypt"	/* outgoing encryption */
-#define NG_PPP_HOOK_DECRYPT	"decrypt"	/* incoming decryption */
-#define NG_PPP_HOOK_VJC_IP	"vjc_ip"	/* VJC raw IP */
-#define NG_PPP_HOOK_VJC_COMP	"vjc_vjcomp"	/* VJC compressed TCP */
-#define NG_PPP_HOOK_VJC_UNCOMP	"vjc_vjuncomp"	/* VJC uncompressed TCP */
-#define NG_PPP_HOOK_VJC_VJIP	"vjc_vjip"	/* VJC uncompressed IP */
-#define NG_PPP_HOOK_INET	"inet"		/* IP packet data */
-#define NG_PPP_HOOK_ATALK	"atalk"		/* AppleTalk packet data */
-#define NG_PPP_HOOK_IPX		"ipx"		/* IPX packet data */
-#define NG_PPP_HOOK_IPV6	"ipv6"		/* IPv6 packet data */
-
-#define NG_PPP_HOOK_LINK_PREFIX	"link"		/* append decimal link number */
-
-/* Compress hook operation modes */
-enum {
-	NG_PPP_COMPRESS_NONE = 0,	/* compression disabled */
-	NG_PPP_COMPRESS_SIMPLE,		/* original operation mode */
-	NG_PPP_COMPRESS_FULL,		/* compressor returns proto */
-};
-
-/* Decompress hook operation modes */
-enum {
-	NG_PPP_DECOMPRESS_NONE = 0,	/* decompression disabled */
-	NG_PPP_DECOMPRESS_SIMPLE,	/* original operation mode */
-	NG_PPP_DECOMPRESS_FULL,		/* forward any packet to decompressor */
-};
-
-/* Netgraph commands */
-enum {
-	NGM_PPP_SET_CONFIG = 1,		/* takes struct ng_ppp_node_conf */
-	NGM_PPP_GET_CONFIG,		/* returns ng_ppp_node_conf */
-	NGM_PPP_GET_MP_STATE,		/* returns ng_ppp_mp_state */
-	NGM_PPP_GET_LINK_STATS,		/* takes link #, returns stats struct */
-	NGM_PPP_CLR_LINK_STATS,		/* takes link #, clears link stats */
-	NGM_PPP_GETCLR_LINK_STATS,	/* takes link #, returns & clrs stats */
-	NGM_PPP_GET_LINK_STATS64,	/* takes link #, returns stats64 struct */
-	NGM_PPP_GETCLR_LINK_STATS64,	/* takes link #, returns stats64 & clrs */
-};
-
-/* Multi-link sequence number state (for debugging) */
-struct ng_ppp_mp_state {
-	int32_t		rseq[NG_PPP_MAX_LINKS];	/* highest rec'd MP seq # */
-	int32_t		mseq;			/* min rseq[i] */
-	int32_t		xseq;			/* next xmit MP seq # */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPP_MP_STATE_TYPE_INFO(atype)	{		\
-	  { "rseq",	(atype)			},		\
-	  { "mseq",	&ng_parse_hint32_type	},		\
-	  { "xseq",	&ng_parse_hint32_type	},		\
-	  { NULL }						\
-}
-
-/* Per-link config structure */
-struct ng_ppp_link_conf {
-	u_char		enableLink;	/* enable this link */
-	u_char		enableProtoComp;/* enable protocol field compression */
-	u_char		enableACFComp;	/* enable addr/ctrl field compression */
-	u_int16_t	mru;		/* peer MRU */
-	uint32_t	latency;	/* link latency (in milliseconds) */
-	uint32_t	bandwidth;	/* link bandwidth (in bytes/sec/10) */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPP_LINK_TYPE_INFO	{				\
-	  { "enableLink",	&ng_parse_uint8_type	},	\
-	  { "enableProtoComp",	&ng_parse_uint8_type	},	\
-	  { "enableACFComp",	&ng_parse_uint8_type	},	\
-	  { "mru",		&ng_parse_uint16_type	},	\
-	  { "latency",		&ng_parse_uint32_type	},	\
-	  { "bandwidth",	&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-/* Bundle config structure */
-struct ng_ppp_bund_conf {
-	u_int16_t	mrru;			/* multilink peer MRRU */
-	u_char		enableMultilink;	/* enable multilink */
-	u_char		recvShortSeq;		/* recv multilink short seq # */
-	u_char		xmitShortSeq;		/* xmit multilink short seq # */
-	u_char		enableRoundRobin;	/* xmit whole packets */
-	u_char		enableIP;		/* enable IP data flow */
-	u_char		enableIPv6;		/* enable IPv6 data flow */
-	u_char		enableAtalk;		/* enable AppleTalk data flow */
-	u_char		enableIPX;		/* enable IPX data flow */
-	u_char		enableCompression;	/* enable PPP compression */
-	u_char		enableDecompression;	/* enable PPP decompression */
-	u_char		enableEncryption;	/* enable PPP encryption */
-	u_char		enableDecryption;	/* enable PPP decryption */
-	u_char		enableVJCompression;	/* enable VJ compression */
-	u_char		enableVJDecompression;	/* enable VJ decompression */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPP_BUND_TYPE_INFO	{					\
-	  { "mrru",			&ng_parse_uint16_type	},	\
-	  { "enableMultilink",		&ng_parse_uint8_type	},	\
-	  { "recvShortSeq",		&ng_parse_uint8_type	},	\
-	  { "xmitShortSeq",		&ng_parse_uint8_type	},	\
-	  { "enableRoundRobin",		&ng_parse_uint8_type	},	\
-	  { "enableIP",			&ng_parse_uint8_type	},	\
-	  { "enableIPv6",		&ng_parse_uint8_type	},	\
-	  { "enableAtalk",		&ng_parse_uint8_type	},	\
-	  { "enableIPX",		&ng_parse_uint8_type	},	\
-	  { "enableCompression",	&ng_parse_uint8_type	},	\
-	  { "enableDecompression",	&ng_parse_uint8_type	},	\
-	  { "enableEncryption",		&ng_parse_uint8_type	},	\
-	  { "enableDecryption",		&ng_parse_uint8_type	},	\
-	  { "enableVJCompression",	&ng_parse_uint8_type	},	\
-	  { "enableVJDecompression",	&ng_parse_uint8_type	},	\
-	  { NULL }							\
-}
-
-/* Total node config structure */
-struct ng_ppp_node_conf {
-	struct ng_ppp_bund_conf	bund;
-	struct ng_ppp_link_conf	links[NG_PPP_MAX_LINKS];
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPP_CONFIG_TYPE_INFO(bctype, arytype)	{	\
-	  { "bund",		(bctype)	},		\
-	  { "links",		(arytype)	},		\
-	  { NULL }						\
-}
-
-/* Statistics struct for a link (or the bundle if NG_PPP_BUNDLE_LINKNUM) */
-struct ng_ppp_link_stat {
-	uint32_t xmitFrames;		/* xmit frames on link */
-	uint32_t xmitOctets;		/* xmit octets on link */
-	uint32_t recvFrames;		/* recv frames on link */
-	uint32_t recvOctets;		/* recv octets on link */
-	uint32_t badProtos;		/* frames rec'd with bogus protocol */
-	uint32_t runts;		/* Too short MP fragments */
-	uint32_t dupFragments;		/* MP frames with duplicate seq # */
-	uint32_t dropFragments;	/* MP fragments we had to drop */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPP_STATS_TYPE_INFO	{				\
-	  { "xmitFrames",	&ng_parse_uint32_type	},	\
-	  { "xmitOctets",	&ng_parse_uint32_type	},	\
-	  { "recvFrames",	&ng_parse_uint32_type	},	\
-	  { "recvOctets",	&ng_parse_uint32_type	},	\
-	  { "badProtos",	&ng_parse_uint32_type	},	\
-	  { "runts",		&ng_parse_uint32_type	},	\
-	  { "dupFragments",	&ng_parse_uint32_type	},	\
-	  { "dropFragments",	&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-/* Statistics struct for a link (or the bundle if NG_PPP_BUNDLE_LINKNUM) */
-struct ng_ppp_link_stat64 {
-	u_int64_t xmitFrames;		/* xmit frames on link */
-	u_int64_t xmitOctets;		/* xmit octets on link */
-	u_int64_t recvFrames;		/* recv frames on link */
-	u_int64_t recvOctets;		/* recv octets on link */
-	u_int64_t badProtos;		/* frames rec'd with bogus protocol */
-	u_int64_t runts;		/* Too short MP fragments */
-	u_int64_t dupFragments;		/* MP frames with duplicate seq # */
-	u_int64_t dropFragments;	/* MP fragments we had to drop */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPP_STATS64_TYPE_INFO	{			\
-	  { "xmitFrames",	&ng_parse_uint64_type	},	\
-	  { "xmitOctets",	&ng_parse_uint64_type	},	\
-	  { "recvFrames",	&ng_parse_uint64_type	},	\
-	  { "recvOctets",	&ng_parse_uint64_type	},	\
-	  { "badProtos",	&ng_parse_uint64_type	},	\
-	  { "runts",		&ng_parse_uint64_type	},	\
-	  { "dupFragments",	&ng_parse_uint64_type	},	\
-	  { "dropFragments",	&ng_parse_uint64_type	},	\
-	  { NULL }						\
-}
-
-#endif /* _NETGRAPH_NG_PPP_H_ */
diff --git a/include.new/netgraph/ng_pppoe.h b/include.new/netgraph/ng_pppoe.h
deleted file mode 100644
index bdc1775..0000000
--- a/include.new/netgraph/ng_pppoe.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * ng_pppoe.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Julian Elischer <julian@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_pppoe.h 253564 2013-07-23 10:25:34Z glebius $
- * $Whistle: ng_pppoe.h,v 1.7 1999/10/16 10:16:43 julian Exp $
- */
-
-#ifndef _NETGRAPH_NG_PPPOE_H_
-#define _NETGRAPH_NG_PPPOE_H_
-
-/********************************************************************
- * Netgraph hook constants etc.
- ********************************************************************/
-/* Node type name. This should be unique among all netgraph node types */
-#define NG_PPPOE_NODE_TYPE	"pppoe"
-
-#define NGM_PPPOE_COOKIE		1089893072
-
-#define	PPPOE_SERVICE_NAME_SIZE		64 /* for now */
-
-/* Hook names */
-#define NG_PPPOE_HOOK_ETHERNET	"ethernet"
-#define NG_PPPOE_HOOK_DEBUG	"debug"
-
-/* Mode names */
-#define	NG_PPPOE_STANDARD	"standard"
-#define	NG_PPPOE_3COM		"3Com"
-#define	NG_PPPOE_NONSTANDARD	NG_PPPOE_3COM
-#define	NG_PPPOE_DLINK		"D-Link"
-
-/**********************************************************************
- * Netgraph commands understood by this node type.
- * FAIL, SUCCESS, CLOSE and ACNAME are sent by the node rather than received.
- ********************************************************************/
-enum cmd {
-	NGM_PPPOE_SET_FLAG = 1,
-	NGM_PPPOE_CONNECT  = 2,	/* Client, Try find this service */
-	NGM_PPPOE_LISTEN   = 3,	/* Server, Await a request for this service */
-	NGM_PPPOE_OFFER    = 4,	/* Server, hook X should respond (*) */
-	NGM_PPPOE_SUCCESS  = 5,	/* State machine connected */
-	NGM_PPPOE_FAIL     = 6,	/* State machine could not connect */
-	NGM_PPPOE_CLOSE    = 7,	/* Session closed down */
-	NGM_PPPOE_SERVICE  = 8,	/* additional Service to advertise (in PADO) */
-	NGM_PPPOE_ACNAME   = 9,	/* AC_NAME for informational purposes */
-	NGM_PPPOE_GET_STATUS = 10, /* data in/out */
-	NGM_PPPOE_SESSIONID  = 11,  /* Session_ID for informational purposes */
-	NGM_PPPOE_SETMODE  = 12, /* set to standard or compat modes */
-	NGM_PPPOE_GETMODE  = 13, /* see current mode */
-	NGM_PPPOE_SETENADDR = 14, /* set Ethernet address */
-};
-
-/***********************
- * Structures passed in the various netgraph command messages.
- ***********************/
-/* This structure is returned by the NGM_PPPOE_GET_STATUS command */
-struct ngpppoestat {
-	u_int   packets_in;	/* packets in from ethernet */
-	u_int   packets_out;	/* packets out towards ethernet */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPPOESTAT_TYPE_INFO	{				\
-	  { "packets_in",	&ng_parse_uint_type	},	\
-	  { "packets_out",	&ng_parse_uint_type	},	\
-	  { NULL }						\
-}
-
-/*
- * When this structure is accepted by the NGM_PPPOE_CONNECT command :
- * The data field is MANDATORY.
- * The session sends out a PADI request for the named service.
- *
- *
- * When this structure is accepted by the NGM_PPPOE_LISTEN command.
- * If no service is given this is assumed to accept ALL PADI requests.
- * This may at some time take a regexp expression, but not yet.
- * Matching PADI requests will be passed up the named hook.
- *
- *
- * When this structure is accepted by the NGM_PPPOE_OFFER command:
- * The AC-NAme field is set from that given and a PADI
- * packet is expected to arrive from the session control daemon, on the
- * named hook. The session will then issue the appropriate PADO
- * and begin negotiation.
- */
-struct ngpppoe_init_data {
-	char		hook[NG_HOOKSIZ];	/* hook to monitor on */
-	u_int16_t	data_len;		/* Length of the service name */
-	char		data[];			/* init data goes here */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPPOE_INIT_DATA_TYPE_INFO	{		\
-	  { "hook",	&ng_parse_hookbuf_type	},	\
-	  { "data",	&ng_parse_sizedstring_type },	\
-	  { NULL }					\
-}
-
-/*
- * This structure is used by the asychronous success and failure messages.
- * (to report which hook has failed or connected). The message is sent
- * to whoever requested the connection. (close may use this too).
- */
-struct ngpppoe_sts {
-	char	hook[NG_HOOKSIZ];	/* hook associated with event session */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPPOE_STS_TYPE_INFO		{		\
-	  { "hook",	&ng_parse_hookbuf_type	},	\
-	  { NULL }					\
-}
-
-
-/********************************************************************
- * Constants and definitions specific to pppoe
- ********************************************************************/
-
-#define PPPOE_TIMEOUT_LIMIT 64
-#define PPPOE_OFFER_TIMEOUT 16
-#define PPPOE_INITIAL_TIMEOUT 2
-
-/* Codes to identify message types */
-#define PADI_CODE	0x09
-#define PADO_CODE	0x07
-#define PADR_CODE	0x19
-#define PADS_CODE	0x65
-#define PADT_CODE	0xa7
-
-/* Tag identifiers */
-#if BYTE_ORDER == BIG_ENDIAN
-#define PTT_EOL		(0x0000)
-#define PTT_SRV_NAME	(0x0101)
-#define PTT_AC_NAME	(0x0102)
-#define PTT_HOST_UNIQ	(0x0103)
-#define PTT_AC_COOKIE	(0x0104)
-#define PTT_VENDOR 	(0x0105)
-#define PTT_RELAY_SID	(0x0110)
-#define	PTT_MAX_PAYL	(0x0120)	/* PPP-Max-Payload (RFC4638) */
-#define PTT_SRV_ERR     (0x0201)
-#define PTT_SYS_ERR  	(0x0202)
-#define PTT_GEN_ERR  	(0x0203)
-
-#define ETHERTYPE_PPPOE_DISC	0x8863	/* pppoe discovery packets     */
-#define ETHERTYPE_PPPOE_SESS	0x8864	/* pppoe session packets       */
-#define ETHERTYPE_PPPOE_3COM_DISC 0x3c12 /* pppoe discovery packets 3com? */
-#define ETHERTYPE_PPPOE_3COM_SESS 0x3c13 /* pppoe session packets   3com? */
-#else
-#define PTT_EOL		(0x0000)
-#define PTT_SRV_NAME	(0x0101)
-#define PTT_AC_NAME	(0x0201)
-#define PTT_HOST_UNIQ	(0x0301)
-#define PTT_AC_COOKIE	(0x0401)
-#define PTT_VENDOR 	(0x0501)
-#define PTT_RELAY_SID	(0x1001)
-#define	PTT_MAX_PAYL	(0x2001)	/* PPP-Max-Payload (RFC4638) */
-#define PTT_SRV_ERR     (0x0102)
-#define PTT_SYS_ERR  	(0x0202)
-#define PTT_GEN_ERR  	(0x0302)
-
-#define ETHERTYPE_PPPOE_DISC	0x6388	/* pppoe discovery packets     */
-#define ETHERTYPE_PPPOE_SESS	0x6488	/* pppoe session packets       */
-#define ETHERTYPE_PPPOE_3COM_DISC 0x123c /* pppoe discovery packets 3com? */
-#define ETHERTYPE_PPPOE_3COM_SESS 0x133c /* pppoe session packets   3com? */
-#endif
-
-struct pppoe_tag {
-	u_int16_t tag_type;
-	u_int16_t tag_len;
-}__packed;
-
-struct pppoe_hdr{
-	u_int8_t ver:4;
-	u_int8_t type:4;
-	u_int8_t code;
-	u_int16_t sid;
-	u_int16_t length;
-}__packed;
-
-
-struct pppoe_full_hdr {
-	struct  ether_header eh;
-	struct pppoe_hdr ph;
-}__packed;
-
-union	packet {
-	struct pppoe_full_hdr	pkt_header;
-	u_int8_t	bytes[2048];
-};
-
-struct datatag {
-        struct pppoe_tag hdr;
-	u_int8_t        data[PPPOE_SERVICE_NAME_SIZE];
-};     
-
-
-/*
- * Define the order in which we will place tags in packets
- * this may be ignored
- */
-/* for PADI */
-#define TAGI_SVC 0
-#define TAGI_HUNIQ 1
-/* for PADO */
-#define TAGO_ACNAME 0
-#define TAGO_SVC 1
-#define TAGO_COOKIE 2
-#define TAGO_HUNIQ 3
-/* for PADR */
-#define TAGR_SVC 0
-#define TAGR_HUNIQ 1
-#define TAGR_COOKIE 2
-/* for PADS */
-#define TAGS_ACNAME 0
-#define TAGS_SVC 1
-#define TAGS_COOKIE 2
-#define TAGS_HUNIQ 3
-/* for PADT */
-
-#endif /* _NETGRAPH_NG_PPPOE_H_ */
-
diff --git a/include.new/netgraph/ng_pptpgre.h b/include.new/netgraph/ng_pptpgre.h
deleted file mode 100644
index ee0b67b..0000000
--- a/include.new/netgraph/ng_pptpgre.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * ng_pptpgre.h
- */
-
-/*-
- * Copyright (c) 1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_pptpgre.h 177587 2008-03-24 22:55:22Z mav $
- * $Whistle: ng_pptpgre.h,v 1.3 1999/12/08 00:11:36 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_PPTPGRE_H_
-#define _NETGRAPH_NG_PPTPGRE_H_
-
-/* Node type name and magic cookie */
-#define NG_PPTPGRE_NODE_TYPE	"pptpgre"
-#define NGM_PPTPGRE_COOKIE	1082548365
-
-/* Hook names */
-#define NG_PPTPGRE_HOOK_UPPER	"upper"		/* to upper layers */
-#define NG_PPTPGRE_HOOK_LOWER	"lower"		/* to lower layers */
-
-/* Session hooks: prefix plus hex session ID, e.g., "session_3e14" */
-#define NG_PPTPGRE_HOOK_SESSION_P	"session_"
-#define NG_PPTPGRE_HOOK_SESSION_F	"session_%04x"
-
-/* Configuration for a session */
-struct ng_pptpgre_conf {
-	u_char		enabled;	/* enables traffic flow */
-	u_char		enableDelayedAck;/* enables delayed acks */
-	u_char		enableAlwaysAck;/* always include ack with data */
-	u_char		enableWindowing;/* enable windowing algorithm */
-	u_int16_t	cid;		/* my call id */
-	u_int16_t	peerCid;	/* peer call id */
-	u_int16_t	recvWin;	/* peer recv window size */
-	u_int16_t	peerPpd;	/* peer packet processing delay
-					   (in units of 1/10 of a second) */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPTPGRE_CONF_TYPE_INFO	{			\
-	  { "enabled",		&ng_parse_uint8_type	},	\
-	  { "enableDelayedAck",	&ng_parse_uint8_type	},	\
-	  { "enableAlwaysAck",	&ng_parse_uint8_type	},	\
-	  { "enableWindowing",	&ng_parse_uint8_type	},	\
-	  { "cid",		&ng_parse_hint16_type	},	\
-	  { "peerCid",		&ng_parse_hint16_type	},	\
-	  { "recvWin",		&ng_parse_uint16_type	},	\
-	  { "peerPpd",		&ng_parse_uint16_type	},	\
-	  { NULL }						\
-}
-
-/* Statistics struct */
-struct ng_pptpgre_stats {
-	uint32_t xmitPackets;		/* number of GRE packets xmit */
-	uint32_t xmitOctets;		/* number of GRE octets xmit */
-	uint32_t xmitLoneAcks;		/* ack-only packets transmitted */
-	uint32_t xmitDrops;		/* xmits dropped due to full window */
-	uint32_t xmitTooBig;		/* xmits dropped because too big */
-	uint32_t recvPackets;		/* number of GRE packets rec'd */
-	uint32_t recvOctets;		/* number of GRE octets rec'd */
-	uint32_t recvRunts;		/* too short packets rec'd */
-	uint32_t recvBadGRE;		/* bogus packets rec'd (bad GRE hdr) */
-	uint32_t recvBadAcks;		/* bogus ack's rec'd in GRE header */
-	uint32_t recvBadCID;		/* pkts with unknown call ID rec'd */
-	uint32_t recvOutOfOrder;	/* packets rec'd out of order */
-	uint32_t recvDuplicates;	/* packets rec'd with duplicate seq # */
-	uint32_t recvLoneAcks;		/* ack-only packets rec'd */
-	uint32_t recvAckTimeouts;	/* times peer failed to ack in time */
-	uint32_t memoryFailures;	/* times we couldn't allocate memory */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_PPTPGRE_STATS_TYPE_INFO	{			\
-	  { "xmitPackets",	&ng_parse_uint32_type	},	\
-	  { "xmitOctets",	&ng_parse_uint32_type	},	\
-	  { "xmitLoneAcks",	&ng_parse_uint32_type	},	\
-	  { "xmitDrops",	&ng_parse_uint32_type	},	\
-	  { "xmitTooBig",	&ng_parse_uint32_type	},	\
-	  { "recvPackets",	&ng_parse_uint32_type	},	\
-	  { "recvOctets",	&ng_parse_uint32_type	},	\
-	  { "recvRunts",	&ng_parse_uint32_type	},	\
-	  { "recvBadGRE",	&ng_parse_uint32_type	},	\
-	  { "recvBadAcks",	&ng_parse_uint32_type	},	\
-	  { "recvBadCID",	&ng_parse_uint32_type	},	\
-	  { "recvOutOfOrder",	&ng_parse_uint32_type	},	\
-	  { "recvDuplicates",	&ng_parse_uint32_type	},	\
-	  { "recvLoneAcks",	&ng_parse_uint32_type	},	\
-	  { "recvAckTimeouts",	&ng_parse_uint32_type	},	\
-	  { "memoryFailures",	&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_PPTPGRE_SET_CONFIG = 1,	/* supply a struct ng_pptpgre_conf */
-	NGM_PPTPGRE_GET_CONFIG,		/* returns a struct ng_pptpgre_conf */
-	NGM_PPTPGRE_GET_STATS,		/* returns struct ng_pptpgre_stats */
-	NGM_PPTPGRE_CLR_STATS,		/* clears stats */
-	NGM_PPTPGRE_GETCLR_STATS,	/* returns & clears stats */
-};
-
-#endif /* _NETGRAPH_NG_PPTPGRE_H_ */
diff --git a/include.new/netgraph/ng_pred1.h b/include.new/netgraph/ng_pred1.h
deleted file mode 100644
index b4cb2a7..0000000
--- a/include.new/netgraph/ng_pred1.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 2006 Alexander Motin <mav@alkar.net>
- * 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 unmodified, 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.
- *
- * 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: releng/10.2/sys/netgraph/ng_pred1.h 165619 2006-12-29 09:54:32Z glebius $
- */
-
-#ifndef _NETGRAPH_NG_PRED1_H_
-#define _NETGRAPH_NG_PRED1_H_
-
-/* Node type name and magic cookie */
-#define NG_PRED1_NODE_TYPE	"pred1"
-#define NGM_PRED1_COOKIE	1166902612
-
-/* Hook names */
-#define NG_PRED1_HOOK_COMP	"comp"		/* compression hook */
-#define NG_PRED1_HOOK_DECOMP	"decomp"	/* decompression hook */
-
-/* Config struct */
-struct ng_pred1_config {
-	u_char		enable;			/* node enabled */
-};
-
-/* Keep this in sync with the above structure definition. */
-#define NG_PRED1_CONFIG_INFO	{			\
-	{ "enable",	&ng_parse_uint8_type	},	\
-	{ NULL }					\
-}
-
-/* Statistics structure for one direction. */
-struct ng_pred1_stats {
-	uint64_t	FramesPlain;
-	uint64_t	FramesComp;
-	uint64_t	FramesUncomp;
-	uint64_t	InOctets;
-	uint64_t	OutOctets;
-	uint64_t	Errors;
-};
-
-/* Keep this in sync with the above structure definition. */
-#define NG_PRED1_STATS_INFO	{				\
-	{ "FramesPlain",&ng_parse_uint64_type	},	\
-	{ "FramesComp",	&ng_parse_uint64_type	},	\
-	{ "FramesUncomp", &ng_parse_uint64_type	},	\
-	{ "InOctets",	&ng_parse_uint64_type	},	\
-	{ "OutOctets",	&ng_parse_uint64_type	},	\
-	{ "Errors",	&ng_parse_uint64_type	},	\
-	{ NULL }					\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_PRED1_CONFIG = 1,
-	NGM_PRED1_RESETREQ,			/* sent either way! */
-	NGM_PRED1_GET_STATS,
-	NGM_PRED1_CLR_STATS,
-	NGM_PRED1_GETCLR_STATS,
-};
-
-#endif /* _NETGRAPH_NG_PRED1_H_ */
-
diff --git a/include.new/netgraph/ng_rfc1490.h b/include.new/netgraph/ng_rfc1490.h
deleted file mode 100644
index e2ae928..0000000
--- a/include.new/netgraph/ng_rfc1490.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * ng_rfc1490.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_rfc1490.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_rfc1490.h,v 1.7 1999/01/20 00:54:15 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_RFC1490_H_
-#define _NETGRAPH_NG_RFC1490_H_
-
-/* Node type name */
-#define NG_RFC1490_NODE_TYPE		"rfc1490"
-#define NGM_RFC1490_COOKIE		1086947474
-
-/* Hook names */
-#define NG_RFC1490_HOOK_DOWNSTREAM	"downstream"
-#define NG_RFC1490_HOOK_INET		"inet"
-#define NG_RFC1490_HOOK_PPP		"ppp"
-#define NG_RFC1490_HOOK_ETHERNET	"ethernet"
-
-/* Netgraph commands */
-enum {
-	NGM_RFC1490_SET_ENCAP,		/* sets encapsulation method */
-	NGM_RFC1490_GET_ENCAP,		/* gets current encapsulation method */
-};
-
-#endif /* _NETGRAPH_NG_RFC1490_H_ */
diff --git a/include.new/netgraph/ng_sample.h b/include.new/netgraph/ng_sample.h
deleted file mode 100644
index ab1c37f..0000000
--- a/include.new/netgraph/ng_sample.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * ng_sample.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Julian Elischer <julian@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_sample.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_sample.h,v 1.3 1999/01/20 00:22:14 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_SAMPLE_H_
-#define _NETGRAPH_NG_SAMPLE_H_
-
-/* Node type name. This should be unique among all netgraph node types */
-#define NG_XXX_NODE_TYPE	"sample"
-
-/* Node type cookie. Should also be unique. This value MUST change whenever
-   an incompatible change is made to this header file, to insure consistency.
-   The de facto method for generating cookies is to take the output of the
-   date command: date -u +'%s' */
-#define NGM_XXX_COOKIE		915491374
-
-/* Number of active DLCI's we can handle */
-#define	XXX_NUM_DLCIS		16
-
-/* Hook names */
-#define NG_XXX_HOOK_DLCI_LEADIN	"dlci"
-#define NG_XXX_HOOK_DOWNSTREAM	"downstream"
-#define NG_XXX_HOOK_DEBUG	"debug"
-
-/* Netgraph commands understood by this node type */
-enum {
-	NGM_XXX_SET_FLAG = 1,
-	NGM_XXX_GET_STATUS,
-};
-
-/* This structure is returned by the NGM_XXX_GET_STATUS command */
-struct ngxxxstat {
-	uint32_t   packets_in;		/* packets in from downstream */
-	uint32_t   packets_out;	/* packets out towards downstream */
-};
-
-/*
- * This is used to define the 'parse type' for a struct ngxxxstat, which
- * is bascially a description of how to convert a binary struct ngxxxstat
- * to an ASCII string and back.  See ng_parse.h for more info.
- *
- * This needs to be kept in sync with the above structure definition
- */
-#define NG_XXX_STATS_TYPE_INFO	{				\
-	  { "packets_in",	&ng_parse_uint32_type	},	\
-	  { "packets_out",	&ng_parse_uint32_type	},	\
-	  { NULL }						\
-}
-
-#endif /* _NETGRAPH_NG_SAMPLE_H_ */
diff --git a/include.new/netgraph/ng_socket.h b/include.new/netgraph/ng_socket.h
deleted file mode 100644
index 9588beb..0000000
--- a/include.new/netgraph/ng_socket.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * ng_socket.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Julian Elischer <julian@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_socket.h 163462 2006-10-17 11:03:55Z glebius $
- * $Whistle: ng_socket.h,v 1.5 1999/01/20 00:22:14 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_SOCKET_H_
-#define _NETGRAPH_NG_SOCKET_H_
-
-/* Netgraph node type name and cookie */
-#define	NG_SOCKET_NODE_TYPE	"socket"
-#define	NGM_SOCKET_COOKIE	851601233
-
-/* Netgraph socket(2) constants */
-#define	NG_DATA			1
-#define	NG_CONTROL		2
-
-/* Commands */
-enum {
-	NGM_SOCK_CMD_NOLINGER = 1,	/* close the socket with last hook */
-	NGM_SOCK_CMD_LINGER		/* Keep socket even if 0 hooks */
-};
-
-/* Netgraph version of struct sockaddr */
-struct sockaddr_ng {
-	unsigned char	sg_len;		/* total length */
-	sa_family_t	sg_family;	/* address family */
-	char		sg_data[14];	/* actually longer; address value */
-};
-
-#endif /* _NETGRAPH_NG_SOCKET_H_ */
-
diff --git a/include.new/netgraph/ng_socketvar.h b/include.new/netgraph/ng_socketvar.h
deleted file mode 100644
index b1b8440..0000000
--- a/include.new/netgraph/ng_socketvar.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * netgraph.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Julian Elischer <julian@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_socketvar.h 230481 2012-01-23 15:39:45Z glebius $
- * $Whistle: ng_socketvar.h,v 1.1 1999/01/20 21:35:39 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_SOCKETVAR_H_
-#define _NETGRAPH_NG_SOCKETVAR_H_
-
-/* Netgraph protocol control block for each socket */
-struct ngpcb {
-	struct socket	 *ng_socket;	/* the socket */
-	struct ngsock	 *sockdata;	/* netgraph info */
-	LIST_ENTRY(ngpcb) socks;	/* linked list of sockets */
-	int		  type;		/* NG_CONTROL or NG_DATA */
-	ng_ID_t		node_id;	/* a hint for netstat(1) to find the node */
-};
-#endif /* _NETGRAPH_NG_SOCKETVAR_H_ */
diff --git a/include.new/netgraph/ng_source.h b/include.new/netgraph/ng_source.h
deleted file mode 100644
index 286ea81..0000000
--- a/include.new/netgraph/ng_source.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * ng_source.h
- */
-
-/*-
- * Copyright 2002 Sandvine Inc.
- * All rights reserved.
- *
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Sandvine Inc.; provided,
- * however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Sandvine Inc.
- *    trademarks, including the mark "SANDVINE" on advertising, endorsements,
- *    or otherwise except as such appears in the above copyright notice or in
- *    the software.
- *
- * THIS SOFTWARE IS BEING PROVIDED BY SANDVINE "AS IS", AND TO THE MAXIMUM
- * EXTENT PERMITTED BY LAW, SANDVINE MAKES NO REPRESENTATIONS OR WARRANTIES,
- * EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, INCLUDING WITHOUT LIMITATION,
- * ANY AND ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE, OR NON-INFRINGEMENT.  SANDVINE DOES NOT WARRANT, GUARANTEE, OR
- * MAKE ANY REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE
- * USE OF THIS SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY
- * OR OTHERWISE.  IN NO EVENT SHALL SANDVINE BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 SANDVINE IS ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * Author: Dave Chapeskie
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_source.h 209730 2010-07-06 16:55:39Z emaste $
- */
-
-#ifndef _NETGRAPH_NG_SOURCE_H_
-#define _NETGRAPH_NG_SOURCE_H_
-
-/* Node type name and magic cookie */
-#define NG_SOURCE_NODE_TYPE	"source"
-#define NGM_SOURCE_COOKIE	1110646684
-
-/* Hook names */
-#define NG_SOURCE_HOOK_INPUT	"input"
-#define NG_SOURCE_HOOK_OUTPUT	"output"
-
-/* Statistics structure returned by NGM_SOURCE_GET_STATS */
-struct ng_source_stats {
-	uint64_t	outOctets;
-	uint64_t	outFrames;
-	uint32_t	queueOctets;
-	uint32_t	queueFrames;
-	uint32_t	maxPps;
-	struct timeval	startTime;
-	struct timeval	endTime;
-	struct timeval	elapsedTime;
-	struct timeval	lastTime;
-};
-
-extern const struct ng_parse_type ng_source_timeval_type;
-/* Keep this in sync with the above structure definition */
-#define NG_SOURCE_STATS_TYPE_INFO	{			\
-	  { "outOctets",	&ng_parse_uint64_type	},	\
-	  { "outFrames",	&ng_parse_uint64_type	},	\
-	  { "queueOctets",	&ng_parse_uint32_type	},	\
-	  { "queueFrames",	&ng_parse_uint32_type	},	\
-	  { "maxPps",		&ng_parse_uint32_type	},	\
-	  { "startTime",	&ng_source_timeval_type },	\
-	  { "endTime",		&ng_source_timeval_type },	\
-	  { "elapsedTime",	&ng_source_timeval_type },	\
-	  { "lastTime",		&ng_source_timeval_type },	\
-	  { NULL }						\
-}
-
-/* Packet embedding info for NGM_SOURCE_GET/SET_TIMESTAMP */
-struct ng_source_embed_info {
-	uint16_t	offset;		/* offset from ethernet header */
-	uint8_t		flags;
-	uint8_t		spare;
-};
-#define NGM_SOURCE_EMBED_ENABLE		0x01	/* enable embedding */
-#define	NGM_SOURCE_INC_CNT_PER_LIST	0x02	/* increment once per list */
-
-/* Keep this in sync with the above structure definition. */
-#define NG_SOURCE_EMBED_TYPE_INFO {				\
-	{ "offset",		&ng_parse_hint16_type	},	\
-	{ "flags",		&ng_parse_hint8_type	},	\
-	{ NULL }						\
-}
-
-/* Packet embedding info for NGM_SOURCE_GET/SET_COUNTER */
-#define	NG_SOURCE_COUNTERS	4
-struct ng_source_embed_cnt_info {
-	uint16_t	offset;		/* offset from ethernet header */
-	uint8_t		flags;		/* as above */
-	uint8_t		width;		/* in bytes (1, 2, 4) */
-	uint32_t	next_val;
-	uint32_t	min_val;
-	uint32_t	max_val;
-	int32_t		increment;
-	uint8_t		index;		/* which counter (0..3) */
-};
-
-/* Keep this in sync with the above structure definition. */
-#define NG_SOURCE_EMBED_CNT_TYPE_INFO {				\
-	{ "offset",		&ng_parse_hint16_type	}, 	\
-	{ "flags",		&ng_parse_hint8_type	},	\
-	{ "width",		&ng_parse_uint8_type	},	\
-	{ "next_val",		&ng_parse_uint32_type	},	\
-	{ "min_val",		&ng_parse_uint32_type	},	\
-	{ "max_val",		&ng_parse_uint32_type	},	\
-	{ "increment",		&ng_parse_int32_type	},	\
-	{ "index",		&ng_parse_uint8_type	},	\
-	{ NULL }						\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_SOURCE_GET_STATS = 1,	/* get stats */
-	NGM_SOURCE_CLR_STATS,		/* clear stats */
-	NGM_SOURCE_GETCLR_STATS,	/* atomically get and clear stats */
-	NGM_SOURCE_START,		/* start sending queued data */
-	NGM_SOURCE_STOP,		/* stop sending queued data */
-	NGM_SOURCE_CLR_DATA,		/* clear the queued data */
-	NGM_SOURCE_SETIFACE,		/* configure downstream iface */
-	NGM_SOURCE_SETPPS,		/* rate-limiting packets per second */
-	NGM_SOURCE_SET_TIMESTAMP,	/* embed xmit timestamp */
-	NGM_SOURCE_GET_TIMESTAMP,
-	NGM_SOURCE_SET_COUNTER,		/* embed counter */
-	NGM_SOURCE_GET_COUNTER,
-};
-
-#endif /* _NETGRAPH_NG_SOURCE_H_ */
diff --git a/include.new/netgraph/ng_split.h b/include.new/netgraph/ng_split.h
deleted file mode 100644
index b934d91..0000000
--- a/include.new/netgraph/ng_split.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- *
- * Copyright (c) 1999-2000, Vitaly V Belekhov
- * 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 unmodified, 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.
- *
- * 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: releng/10.2/sys/netgraph/ng_split.h 151676 2005-10-25 20:56:12Z ru $
- *
- */
-
-
-#ifndef _NETGRAPH_NG_SPLIT_H_
-#define _NETGRAPH_NG_SPLIT_H_
-
-/* Node type name and magic cookie */
-#define NG_SPLIT_NODE_TYPE	"split"
-#define NGM_SPLIT_COOKIE	949409402
-
-/* My hook names */
-#define NG_SPLIT_HOOK_MIXED	"mixed"	/* Mixed stream (in/out) */
-#define NG_SPLIT_HOOK_OUT	"out"	/* Output to outhook (sending out) */
-#define NG_SPLIT_HOOK_IN	"in"	/* Input from inhook (recieving) */
-
-#endif /* _NETGRAPH_NG_SPLIT_H_ */
diff --git a/include.new/netgraph/ng_sppp.h b/include.new/netgraph/ng_sppp.h
deleted file mode 100644
index 4f9987d..0000000
--- a/include.new/netgraph/ng_sppp.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * ng_sppp.h Netgraph to Sppp module.
- */
-
-/*-
- * Copyright (C) 2002-2004 Cronyx Engineering.
- * Copyright (C) 2002-2004 Roman Kurakin <rik@cronyx.ru>
- *
- * This software is distributed with NO WARRANTIES, not even the implied
- * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Authors grant any other persons or organisations a permission to use,
- * modify and redistribute this software in source and binary forms,
- * as long as this message is kept with the software, all derivative
- * works or modified versions.
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_sppp.h 141197 2005-02-03 13:03:31Z ru $
- * Cronyx Id: ng_sppp.h,v 1.1.2.6 2004/03/01 15:17:21 rik Exp $
- */
-
-#ifndef _NETGRAPH_SPPP_H_
-#define _NETGRAPH_SPPP_H_
-
-/* Node type name and magic cookie */
-#define NG_SPPP_NODE_TYPE		"sppp"
-#define NGM_SPPP_COOKIE			1040804655
-
-/* Interface base name */
-#define NG_SPPP_IFACE_NAME		"sppp"
-
-/* My hook names */
-#define NG_SPPP_HOOK_DOWNSTREAM		"downstream"
-
-/* Netgraph commands */
-enum {
-	NGM_SPPP_GET_IFNAME = 1,	/* returns struct ng_sppp_ifname */
-};
-
-#endif /* _NETGRAPH_SPPP_H_ */
diff --git a/include.new/netgraph/ng_tag.h b/include.new/netgraph/ng_tag.h
deleted file mode 100644
index 0965fa3..0000000
--- a/include.new/netgraph/ng_tag.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 2006 Vadim Goncharov <vadimnuclight@tpu.ru>
- * 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 unmodified, 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.
- *
- * 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: releng/10.2/sys/netgraph/ng_tag.h 159979 2006-06-27 12:45:28Z glebius $
- */
-
-#ifndef _NETGRAPH_NG_TAG_H_
-#define _NETGRAPH_NG_TAG_H_
-
-/* Node type name and magic cookie. */
-#define NG_TAG_NODE_TYPE	"tag"
-#define NGM_TAG_COOKIE		1149771193
-
-/*
- * The types of tag_cookie, tag_len and tag_id in structures below
- * must be the same as corresponding members m_tag_cookie, m_tag_len
- * and m_tag_id in struct m_tag (defined in <sys/mbuf.h>).
- */
-
-/* Tag match structure for every (input) hook. */
-struct ng_tag_hookin {
-	char		thisHook[NG_HOOKSIZ];		/* name of hook */
-	char		ifMatch[NG_HOOKSIZ];		/* match dest hook */
-	char		ifNotMatch[NG_HOOKSIZ];		/* !match dest hook */
-	uint8_t		strip;				/* strip tag if found */
-	uint32_t	tag_cookie;			/* ABI/Module ID */
-	uint16_t	tag_id;				/* tag ID */
-	uint16_t	tag_len;			/* length of data */
-	uint8_t		tag_data[0];			/* tag data */
-};
-
-/* Tag set structure for every (output) hook. */
-struct ng_tag_hookout {
-	char		thisHook[NG_HOOKSIZ];		/* name of hook */
-	uint32_t	tag_cookie;			/* ABI/Module ID */
-	uint16_t	tag_id;				/* tag ID */
-	uint16_t	tag_len;			/* length of data */
-	uint8_t		tag_data[0];			/* tag data */
-};
-
-#define NG_TAG_HOOKIN_SIZE(taglen)	\
-	(sizeof(struct ng_tag_hookin) + (taglen))
-
-#define NG_TAG_HOOKOUT_SIZE(taglen)	\
-	(sizeof(struct ng_tag_hookout) + (taglen))
-
-/* Keep this in sync with the above structures definitions. */
-#define NG_TAG_HOOKIN_TYPE_INFO(tdtype)	{		\
-	  { "thisHook",		&ng_parse_hookbuf_type	},	\
-	  { "ifMatch",		&ng_parse_hookbuf_type	},	\
-	  { "ifNotMatch",	&ng_parse_hookbuf_type	},	\
-	  { "strip",		&ng_parse_uint8_type	},	\
-	  { "tag_cookie",	&ng_parse_uint32_type	},	\
-	  { "tag_id",		&ng_parse_uint16_type	},	\
-	  { "tag_len",		&ng_parse_uint16_type	},	\
-	  { "tag_data",		(tdtype)		},	\
-	  { NULL }						\
-}
-
-#define NG_TAG_HOOKOUT_TYPE_INFO(tdtype)	{		\
-	  { "thisHook",		&ng_parse_hookbuf_type	},	\
-	  { "tag_cookie",	&ng_parse_uint32_type	},	\
-	  { "tag_id",		&ng_parse_uint16_type	},	\
-	  { "tag_len",		&ng_parse_uint16_type	},	\
-	  { "tag_data",		(tdtype)		},	\
-	  { NULL }						\
-}
-
-#ifdef NG_TAG_DEBUG
-
-/* Statistics structure for one hook. */
-struct ng_tag_hookstat {
-	uint64_t	recvFrames;
-	uint64_t	recvOctets;
-	uint64_t	recvMatchFrames;
-	uint64_t	recvMatchOctets;
-	uint64_t	xmitFrames;
-	uint64_t	xmitOctets;
-};
-
-/* Keep this in sync with the above structure definition. */
-#define NG_TAG_HOOKSTAT_TYPE_INFO	{			\
-	  { "recvFrames",	&ng_parse_uint64_type	},	\
-	  { "recvOctets",	&ng_parse_uint64_type	},	\
-	  { "recvMatchFrames",	&ng_parse_uint64_type	},	\
-	  { "recvMatchOctets",	&ng_parse_uint64_type	},	\
-	  { "xmitFrames",	&ng_parse_uint64_type	},	\
-	  { "xmitOctets",	&ng_parse_uint64_type	},	\
-	  { NULL }						\
-}
-
-#endif /* NG_TAG_DEBUG */
-
-/* Netgraph commands. */
-enum {
-	NGM_TAG_SET_HOOKIN = 1,		/* supply a struct ng_tag_hookin */
-	NGM_TAG_GET_HOOKIN,		/* returns a struct ng_tag_hookin */
-	NGM_TAG_SET_HOOKOUT,		/* supply a struct ng_tag_hookout */
-	NGM_TAG_GET_HOOKOUT,		/* returns a struct ng_tag_hookout */
-#ifdef NG_TAG_DEBUG
-	NGM_TAG_GET_STATS,		/* supply name as char[NG_HOOKSIZ] */
-	NGM_TAG_CLR_STATS,		/* supply name as char[NG_HOOKSIZ] */
-	NGM_TAG_GETCLR_STATS,		/* supply name as char[NG_HOOKSIZ] */
-#endif
-};
-
-#endif /* _NETGRAPH_NG_TAG_H_ */
diff --git a/include.new/netgraph/ng_tcpmss.h b/include.new/netgraph/ng_tcpmss.h
deleted file mode 100644
index aef80f9..0000000
--- a/include.new/netgraph/ng_tcpmss.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * ng_tcpmss.h
- *
- * Copyright (c) 2004, Alexey Popov <lollypop@flexuser.ru>
- * 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 unmodified, 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.
- *
- * 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: releng/10.2/sys/netgraph/ng_tcpmss.h 147231 2005-06-10 08:02:34Z glebius $
- */
-
-#ifndef _NETGRAPH_TCPMSS_H_
-#define _NETGRAPH_TCPMSS_H_
-
-/* Node type name and magic cookie */
-#define NG_TCPMSS_NODE_TYPE	"tcpmss"
-#define NGM_TCPMSS_COOKIE	1097623478
-
-/* Statistics structure for one hook. */
-struct ng_tcpmss_hookstat {
-	uint64_t	Octets;
-	uint64_t	Packets;
-	uint16_t	maxMSS;
-	uint64_t	SYNPkts;
-	uint64_t	FixedPkts;
-};
-
-/* Keep this in sync with the above structure definition. */
-#define NG_TCPMSS_HOOKSTAT_INFO	{			\
-	{ "Octets",	&ng_parse_uint64_type	},	\
-	{ "Packets",	&ng_parse_uint64_type	},	\
-	{ "maxMSS",	&ng_parse_uint16_type	},	\
-	{ "SYNPkts",	&ng_parse_uint64_type	},	\
-	{ "FixedPkts",	&ng_parse_uint64_type	},	\
-	{ NULL }					\
-}
-
-
-/* Structure for NGM_TCPMSS_CONFIG. */
-struct ng_tcpmss_config {
-	char		inHook[NG_HOOKSIZ];
-	char		outHook[NG_HOOKSIZ];
-	uint16_t	maxMSS;
-};
-
-/* Keep this in sync with the above structure definition. */
-#define NG_TCPMSS_CONFIG_INFO {				\
-	{ "inHook",	&ng_parse_hookbuf_type	},	\
-	{ "outHook",	&ng_parse_hookbuf_type	},	\
-	{ "maxMSS",	&ng_parse_uint16_type	},	\
-	{ NULL }					\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_TCPMSS_GET_STATS = 1,	/* Get stats. */
-	NGM_TCPMSS_CLR_STATS,		/* Clear stats. */
-	NGM_TCPMSS_GETCLR_STATS,	/* "Atomically" get and clear stats. */
-	NGM_TCPMSS_CONFIG		/* Set configuration. */
-};
-
-#endif /* _NETGRAPH_TCPMSS_H_ */
diff --git a/include.new/netgraph/ng_tee.h b/include.new/netgraph/ng_tee.h
deleted file mode 100644
index d7defb3..0000000
--- a/include.new/netgraph/ng_tee.h
+++ /dev/null
@@ -1,99 +0,0 @@
-
-/*
- * ng_tee.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_tee.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_tee.h,v 1.2 1999/01/20 00:22:14 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_TEE_H_
-#define _NETGRAPH_NG_TEE_H_
-
-/* Node type name and magic cookie */
-#define NG_TEE_NODE_TYPE	"tee"
-#define NGM_TEE_COOKIE		916107047
-
-/* Hook names */
-#define NG_TEE_HOOK_RIGHT	"right"
-#define NG_TEE_HOOK_LEFT	"left"
-#define NG_TEE_HOOK_RIGHT2LEFT	"right2left"
-#define NG_TEE_HOOK_LEFT2RIGHT	"left2right"
-
-/* Statistics structure for one hook */
-struct ng_tee_hookstat {
-	u_int64_t	inOctets;
-	u_int64_t	inFrames;
-	u_int64_t	outOctets;
-	u_int64_t	outFrames;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_TEE_HOOKSTAT_INFO	{				\
-	  { "inOctets",		&ng_parse_uint64_type	},	\
-	  { "inFrames",		&ng_parse_uint64_type	},	\
-	  { "outOctets",	&ng_parse_uint64_type	},	\
-	  { "outFrames",	&ng_parse_uint64_type	},	\
-	  { NULL }						\
-}
-
-/* Statistics structure returned by NGM_TEE_GET_STATS */
-struct ng_tee_stats {
-	struct ng_tee_hookstat	right;
-	struct ng_tee_hookstat	left;
-	struct ng_tee_hookstat	right2left;
-	struct ng_tee_hookstat	left2right;
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_TEE_STATS_INFO(hstype)	{			\
-	  { "right",		(hstype)		},	\
-	  { "left",		(hstype)		},	\
-	  { "right2left",	(hstype)		},	\
-	  { "left2right",	(hstype)		},	\
-	  { NULL }						\
-}
-
-/* Netgraph commands */
-enum {
-	NGM_TEE_GET_STATS = 1,		/* get stats */
-	NGM_TEE_CLR_STATS,		/* clear stats */
-	NGM_TEE_GETCLR_STATS,		/* atomically get and clear stats */
-};
-
-#endif /* _NETGRAPH_NG_TEE_H_ */
diff --git a/include.new/netgraph/ng_tty.h b/include.new/netgraph/ng_tty.h
deleted file mode 100644
index 0a08466..0000000
--- a/include.new/netgraph/ng_tty.h
+++ /dev/null
@@ -1,65 +0,0 @@
-
-/*
- * ng_tty.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_tty.h 184760 2008-11-08 02:05:41Z mav $
- * $Whistle: ng_tty.h,v 1.7 1999/01/20 00:22:15 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_TTY_H_
-#define _NETGRAPH_NG_TTY_H_
-
-/* Node type name and magic cookie */
-#define NG_TTY_NODE_TYPE	"tty"
-#define NGM_TTY_COOKIE		1226109660
-
-/* Default hot char */
-#define NG_TTY_DFL_HOTCHAR	0x7e	/* PPP flag byte */
-
-/* Hook names */
-#define NG_TTY_HOOK		"hook"
-
-/* Netgraph commands */
-enum {
-	NGM_TTY_GET_HOTCHAR = 1,
-	NGM_TTY_SET_HOTCHAR,
-	NGM_TTY_SET_TTY,
-};
-
-#endif /* _NETGRAPH_NG_TTY_H_ */
diff --git a/include.new/netgraph/ng_vjc.h b/include.new/netgraph/ng_vjc.h
deleted file mode 100644
index 0512fdb..0000000
--- a/include.new/netgraph/ng_vjc.h
+++ /dev/null
@@ -1,88 +0,0 @@
-
-/*
- * ng_vjc.h
- */
-
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_vjc.h 139823 2005-01-07 01:45:51Z imp $
- * $Whistle: ng_vjc.h,v 1.6 1999/01/25 02:40:22 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_VJC_H_
-#define _NETGRAPH_NG_VJC_H_
-
- /* Node type name and magic cookie */
-#define NG_VJC_NODE_TYPE	"vjc"
-#define NGM_VJC_COOKIE		868219210
-
- /* Hook names */
-#define NG_VJC_HOOK_IP		"ip"		/* normal IP traffic */
-#define NG_VJC_HOOK_VJCOMP	"vjcomp"	/* compressed TCP */
-#define NG_VJC_HOOK_VJUNCOMP	"vjuncomp"	/* uncompressed TCP */
-#define NG_VJC_HOOK_VJIP	"vjip"		/* uncompressed IP */
-
- /* Minimum and maximum number of compression channels */
-#define NG_VJC_MIN_CHANNELS	4
-#define NG_VJC_MAX_CHANNELS	16
-
- /* Configure struct */
-struct ngm_vjc_config {
-	u_char	enableComp;	/* Enable compression */
-	u_char	enableDecomp;	/* Enable decompression */
-	u_char	maxChannel;	/* Number of compression channels - 1 */
-	u_char	compressCID;	/* OK to compress outgoing CID's */
-};
-
-/* Keep this in sync with the above structure definition */
-#define NG_VJC_CONFIG_TYPE_INFO	{				\
-	  { "enableComp",	&ng_parse_uint8_type	},	\
-	  { "enableDecomp",	&ng_parse_uint8_type	},	\
-	  { "maxChannel",	&ng_parse_uint8_type	},	\
-	  { "compressCID",	&ng_parse_uint8_type	},	\
-	  { NULL }						\
-}
-
- /* Netgraph commands */
-enum {
-	NGM_VJC_SET_CONFIG,	/* Supply a struct ngm_vjc_config */
-	NGM_VJC_GET_CONFIG,	/* Returns a struct ngm_vjc_config */
-	NGM_VJC_GET_STATE,	/* Returns current struct slcompress */
-	NGM_VJC_CLR_STATS,	/* Clears statistics counters */
-	NGM_VJC_RECV_ERROR,	/* Indicate loss of incoming frame */
-};
-
-#endif /* _NETGRAPH_NG_VJC_H_ */
diff --git a/include.new/netgraph/ng_vlan.h b/include.new/netgraph/ng_vlan.h
deleted file mode 100644
index c6bcc3a..0000000
--- a/include.new/netgraph/ng_vlan.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 2003 IPNET Internet Communication Company
- * Copyright (c) 2011 - 2012 Rozhuk Ivan <rozhuk.im@gmail.com>
- * 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.
- *
- * 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.
- *
- * Author: Ruslan Ermilov <ru@FreeBSD.org>
- *
- * $FreeBSD: releng/10.2/sys/netgraph/ng_vlan.h 232825 2012-03-11 19:08:56Z adrian $
- */
-
-#ifndef _NETGRAPH_NG_VLAN_H_
-#define	_NETGRAPH_NG_VLAN_H_
-
-/* Using "vlan" in addfilter and gettable messages. 2012.01 */
-#define	NG_VLAN_USE_OLD_VLAN_NAME 1
-
-/* Node type name and magic cookie. */
-#define	NG_VLAN_NODE_TYPE	"vlan"
-#define	NGM_VLAN_COOKIE		1068486472
-
-/* Hook names. */
-#define	NG_VLAN_HOOK_DOWNSTREAM	"downstream"
-#define	NG_VLAN_HOOK_NOMATCH	"nomatch"
-
-/* Netgraph commands. */
-enum {
-	NGM_VLAN_ADD_FILTER = 1,
-	NGM_VLAN_DEL_FILTER,
-	NGM_VLAN_GET_TABLE,
-	NGM_VLAN_DEL_VID_FLT,
-	NGM_VLAN_GET_DECAP,
-	NGM_VLAN_SET_DECAP,
-	NGM_VLAN_GET_ENCAP,
-	NGM_VLAN_SET_ENCAP,
-	NGM_VLAN_GET_ENCAP_PROTO,
-	NGM_VLAN_SET_ENCAP_PROTO,
-};
-
-#define	VLAN_ENCAP_FROM_FILTER	0x00000001
-#define	VLAN_ENCAP_FROM_NOMATCH	0x00000002
-
-/* For NGM_VLAN_ADD_FILTER control message. */
-struct ng_vlan_filter {
-	char		hook_name[NG_HOOKSIZ];
-#ifdef	NG_VLAN_USE_OLD_VLAN_NAME
-	uint16_t	vlan;	/* VLAN - same as vid, oldname, deprecated. */
-#endif
-	uint16_t	vid;	/* VID - VLAN Identifier. */
-	uint8_t		pcp;	/* PCP - Priority Code Point. */
-	uint8_t		cfi;	/* CFI - Canonical Format Indicator. */
-};
-
-/* Keep this in sync with the above structure definition.  */
-#ifdef	NG_VLAN_USE_OLD_VLAN_NAME
-#define	NG_VLAN_FILTER_FIELDS	{				\
-	{ "hook",	&ng_parse_hookbuf_type	},		\
-	{ "vlan",	&ng_parse_uint16_type	},		\
-	{ "vid",	&ng_parse_uint16_type	},		\
-	{ "pcp",	&ng_parse_uint8_type	},		\
-	{ "cfi",	&ng_parse_uint8_type	},		\
-	{ NULL }						\
-}
-#else
-#define	NG_VLAN_FILTER_FIELDS	{				\
-	{ "hook",	&ng_parse_hookbuf_type	},		\
-	{ "vid",	&ng_parse_uint16_type	},		\
-	{ "pcp",	&ng_parse_uint8_type	},		\
-	{ "cfi",	&ng_parse_uint8_type	},		\
-	{ NULL }						\
-}
-#endif
-
-
-/* Structure returned by NGM_VLAN_GET_TABLE. */
-struct ng_vlan_table {
-	uint32_t	n;
-	struct ng_vlan_filter filter[];
-};
-
-/* Keep this in sync with the above structure definition. */
-#define	NG_VLAN_TABLE_FIELDS	{				\
-	{ "n",		&ng_parse_uint32_type },		\
-	{ "filter",	&ng_vlan_table_array_type },		\
-	{ NULL }						\
-}
-
-#endif /* _NETGRAPH_NG_VLAN_H_ */
diff --git a/include.new/netinet/cc.h b/include.new/netinet/cc.h
deleted file mode 100644
index 2af1810..0000000
--- a/include.new/netinet/cc.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*-
- * Copyright (c) 2007-2008
- * 	Swinburne University of Technology, Melbourne, Australia.
- * Copyright (c) 2009-2010 Lawrence Stewart <lstewart@freebsd.org>
- * Copyright (c) 2010 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University of Technology, by Lawrence Stewart and
- * James Healy, made possible in part by a grant from the Cisco University
- * Research Program Fund at Community Foundation Silicon Valley.
- *
- * Portions of this software were developed at the Centre for Advanced
- * Internet Architectures, Swinburne University of Technology, Melbourne,
- * Australia by David Hayes under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/netinet/cc.h 220560 2011-04-12 08:13:18Z lstewart $
- */
-
-/*
- * This software was first released in 2007 by James Healy and Lawrence Stewart
- * whilst working on the NewTCP research project at Swinburne University of
- * Technology's Centre for Advanced Internet Architectures, Melbourne,
- * Australia, which was made possible in part by a grant from the Cisco
- * University Research Program Fund at Community Foundation Silicon Valley.
- * More details are available at:
- *   http://caia.swin.edu.au/urp/newtcp/
- */
-
-#ifndef _NETINET_CC_H_
-#define _NETINET_CC_H_
-
-/* XXX: TCP_CA_NAME_MAX define lives in tcp.h for compat reasons. */
-#include <netinet/tcp.h>
-
-/* Global CC vars. */
-extern STAILQ_HEAD(cc_head, cc_algo) cc_list;
-extern const int tcprexmtthresh;
-extern struct cc_algo newreno_cc_algo;
-
-/* Per-netstack bits. */
-VNET_DECLARE(struct cc_algo *, default_cc_ptr);
-#define	V_default_cc_ptr VNET(default_cc_ptr)
-
-/* Define the new net.inet.tcp.cc sysctl tree. */
-SYSCTL_DECL(_net_inet_tcp_cc);
-
-/* CC housekeeping functions. */
-int	cc_register_algo(struct cc_algo *add_cc);
-int	cc_deregister_algo(struct cc_algo *remove_cc);
-
-/*
- * Wrapper around transport structs that contain same-named congestion
- * control variables. Allows algos to be shared amongst multiple CC aware
- * transprots.
- */
-struct cc_var {
-	void		*cc_data; /* Per-connection private CC algorithm data. */
-	int		bytes_this_ack; /* # bytes acked by the current ACK. */
-	tcp_seq		curack; /* Most recent ACK. */
-	uint32_t	flags; /* Flags for cc_var (see below) */
-	int		type; /* Indicates which ptr is valid in ccvc. */
-	union ccv_container {
-		struct tcpcb		*tcp;
-		struct sctp_nets	*sctp;
-	} ccvc;
-};
-
-/* cc_var flags. */
-#define	CCF_ABC_SENTAWND	0x0001	/* ABC counted cwnd worth of bytes? */
-#define	CCF_CWND_LIMITED	0x0002	/* Are we currently cwnd limited? */
-
-/* ACK types passed to the ack_received() hook. */
-#define	CC_ACK		0x0001	/* Regular in sequence ACK. */
-#define	CC_DUPACK	0x0002	/* Duplicate ACK. */
-#define	CC_PARTIALACK	0x0004	/* Not yet. */
-#define	CC_SACK		0x0008	/* Not yet. */
-
-/*
- * Congestion signal types passed to the cong_signal() hook. The highest order 8
- * bits (0x01000000 - 0x80000000) are reserved for CC algos to declare their own
- * congestion signal types.
- */
-#define	CC_ECN		0x00000001	/* ECN marked packet received. */
-#define	CC_RTO		0x00000002	/* RTO fired. */
-#define	CC_RTO_ERR	0x00000004	/* RTO fired in error. */
-#define	CC_NDUPACK	0x00000008	/* Threshold of dupack's reached. */
-
-#define	CC_SIGPRIVMASK	0xFF000000	/* Mask to check if sig is private. */
-
-/*
- * Structure to hold data and function pointers that together represent a
- * congestion control algorithm.
- */
-struct cc_algo {
-	char	name[TCP_CA_NAME_MAX];
-
-	/* Init global module state on kldload. */
-	int	(*mod_init)(void);
-
-	/* Cleanup global module state on kldunload. */
-	int	(*mod_destroy)(void);
-
-	/* Init CC state for a new control block. */
-	int	(*cb_init)(struct cc_var *ccv);
-
-	/* Cleanup CC state for a terminating control block. */
-	void	(*cb_destroy)(struct cc_var *ccv);
-
-	/* Init variables for a newly established connection. */
-	void	(*conn_init)(struct cc_var *ccv);
-
-	/* Called on receipt of an ack. */
-	void	(*ack_received)(struct cc_var *ccv, uint16_t type);
-
-	/* Called on detection of a congestion signal. */
-	void	(*cong_signal)(struct cc_var *ccv, uint32_t type);
-
-	/* Called after exiting congestion recovery. */
-	void	(*post_recovery)(struct cc_var *ccv);
-
-	/* Called when data transfer resumes after an idle period. */
-	void	(*after_idle)(struct cc_var *ccv);
-
-	STAILQ_ENTRY (cc_algo) entries;
-};
-
-/* Macro to obtain the CC algo's struct ptr. */
-#define	CC_ALGO(tp)	((tp)->cc_algo)
-
-/* Macro to obtain the CC algo's data ptr. */
-#define	CC_DATA(tp)	((tp)->ccv->cc_data)
-
-/* Macro to obtain the system default CC algo's struct ptr. */
-#define	CC_DEFAULT()	V_default_cc_ptr
-
-extern struct rwlock cc_list_lock;
-#define	CC_LIST_LOCK_INIT()	rw_init(&cc_list_lock, "cc_list")
-#define	CC_LIST_LOCK_DESTROY()	rw_destroy(&cc_list_lock)
-#define	CC_LIST_RLOCK()		rw_rlock(&cc_list_lock)
-#define	CC_LIST_RUNLOCK()	rw_runlock(&cc_list_lock)
-#define	CC_LIST_WLOCK()		rw_wlock(&cc_list_lock)
-#define	CC_LIST_WUNLOCK()	rw_wunlock(&cc_list_lock)
-#define	CC_LIST_LOCK_ASSERT()	rw_assert(&cc_list_lock, RA_LOCKED)
-
-#endif /* _NETINET_CC_H_ */
diff --git a/include.new/netinet/icmp6.h b/include.new/netinet/icmp6.h
deleted file mode 100644
index 9464bc1..0000000
--- a/include.new/netinet/icmp6.h
+++ /dev/null
@@ -1,777 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netinet/icmp6.h 282622 2015-05-08 08:35:06Z hiren $	*/
-/*	$KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*-
- * 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.
- * 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.
- *
- *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETINET_ICMP6_H_
-#define _NETINET_ICMP6_H_
-
-#define ICMPV6_PLD_MAXLEN	1232	/* IPV6_MMTU - sizeof(struct ip6_hdr)
-					   - sizeof(struct icmp6_hdr) */
-
-struct icmp6_hdr {
-	u_int8_t	icmp6_type;	/* type field */
-	u_int8_t	icmp6_code;	/* code field */
-	u_int16_t	icmp6_cksum;	/* checksum field */
-	union {
-		uint32_t	icmp6_un_data32[1]; /* type-specific field */
-		u_int16_t	icmp6_un_data16[2]; /* type-specific field */
-		u_int8_t	icmp6_un_data8[4];  /* type-specific field */
-	} icmp6_dataun;
-} __packed;
-
-#define icmp6_data32	icmp6_dataun.icmp6_un_data32
-#define icmp6_data16	icmp6_dataun.icmp6_un_data16
-#define icmp6_data8	icmp6_dataun.icmp6_un_data8
-#define icmp6_pptr	icmp6_data32[0]		/* parameter prob */
-#define icmp6_mtu	icmp6_data32[0]		/* packet too big */
-#define icmp6_id	icmp6_data16[0]		/* echo request/reply */
-#define icmp6_seq	icmp6_data16[1]		/* echo request/reply */
-#define icmp6_maxdelay	icmp6_data16[0]		/* mcast group membership */
-
-#define ICMP6_DST_UNREACH		1	/* dest unreachable, codes: */
-#define ICMP6_PACKET_TOO_BIG		2	/* packet too big */
-#define ICMP6_TIME_EXCEEDED		3	/* time exceeded, code: */
-#define ICMP6_PARAM_PROB		4	/* ip6 header bad */
-
-#define ICMP6_ECHO_REQUEST		128	/* echo service */
-#define ICMP6_ECHO_REPLY		129	/* echo reply */
-#define MLD_LISTENER_QUERY		130 	/* multicast listener query */
-#define MLD_LISTENER_REPORT		131	/* multicast listener report */
-#define MLD_LISTENER_DONE		132	/* multicast listener done */
-#define MLD_LISTENER_REDUCTION MLD_LISTENER_DONE /* RFC3542 definition */
-
-/* RFC2292 decls */
-#define ICMP6_MEMBERSHIP_QUERY		130	/* group membership query */
-#define ICMP6_MEMBERSHIP_REPORT		131	/* group membership report */
-#define ICMP6_MEMBERSHIP_REDUCTION	132	/* group membership termination */
-
-#ifndef _KERNEL
-/* the followings are for backward compatibility to old KAME apps. */
-#define MLD6_LISTENER_QUERY	MLD_LISTENER_QUERY
-#define MLD6_LISTENER_REPORT	MLD_LISTENER_REPORT
-#define MLD6_LISTENER_DONE	MLD_LISTENER_DONE
-#endif
-
-#define ND_ROUTER_SOLICIT		133	/* router solicitation */
-#define ND_ROUTER_ADVERT		134	/* router advertisement */
-#define ND_NEIGHBOR_SOLICIT		135	/* neighbor solicitation */
-#define ND_NEIGHBOR_ADVERT		136	/* neighbor advertisement */
-#define ND_REDIRECT			137	/* redirect */
-
-#define ICMP6_ROUTER_RENUMBERING	138	/* router renumbering */
-
-#define ICMP6_WRUREQUEST		139	/* who are you request */
-#define ICMP6_WRUREPLY			140	/* who are you reply */
-#define ICMP6_FQDN_QUERY		139	/* FQDN query */
-#define ICMP6_FQDN_REPLY		140	/* FQDN reply */
-#define ICMP6_NI_QUERY			139	/* node information request */
-#define ICMP6_NI_REPLY			140	/* node information reply */
-#define MLDV2_LISTENER_REPORT		143	/* RFC3810 listener report */
-
-/* The definitions below are experimental. TBA */
-#define MLD_MTRACE_RESP			200	/* mtrace resp (to sender) */
-#define MLD_MTRACE			201	/* mtrace messages */
-
-#ifndef _KERNEL
-#define MLD6_MTRACE_RESP	MLD_MTRACE_RESP
-#define MLD6_MTRACE		MLD_MTRACE
-#endif
-
-#define ICMP6_MAXTYPE			201
-
-#define ICMP6_DST_UNREACH_NOROUTE	0	/* no route to destination */
-#define ICMP6_DST_UNREACH_ADMIN	 	1	/* administratively prohibited */
-#define ICMP6_DST_UNREACH_NOTNEIGHBOR	2	/* not a neighbor(obsolete) */
-#define ICMP6_DST_UNREACH_BEYONDSCOPE	2	/* beyond scope of source address */
-#define ICMP6_DST_UNREACH_ADDR		3	/* address unreachable */
-#define ICMP6_DST_UNREACH_NOPORT	4	/* port unreachable */
-
-#define ICMP6_TIME_EXCEED_TRANSIT 	0	/* ttl==0 in transit */
-#define ICMP6_TIME_EXCEED_REASSEMBLY	1	/* ttl==0 in reass */
-
-#define ICMP6_PARAMPROB_HEADER 	 	0	/* erroneous header field */
-#define ICMP6_PARAMPROB_NEXTHEADER	1	/* unrecognized next header */
-#define ICMP6_PARAMPROB_OPTION		2	/* unrecognized option */
-
-#define ICMP6_INFOMSG_MASK		0x80	/* all informational messages */
-
-#define ICMP6_NI_SUBJ_IPV6	0	/* Query Subject is an IPv6 address */
-#define ICMP6_NI_SUBJ_FQDN	1	/* Query Subject is a Domain name */
-#define ICMP6_NI_SUBJ_IPV4	2	/* Query Subject is an IPv4 address */
-
-#define ICMP6_NI_SUCCESS	0	/* node information successful reply */
-#define ICMP6_NI_REFUSED	1	/* node information request is refused */
-#define ICMP6_NI_UNKNOWN	2	/* unknown Qtype */
-
-#define ICMP6_ROUTER_RENUMBERING_COMMAND  0	/* rr command */
-#define ICMP6_ROUTER_RENUMBERING_RESULT   1	/* rr result */
-#define ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET   255	/* rr seq num reset */
-
-/* Used in kernel only */
-#define ND_REDIRECT_ONLINK	0	/* redirect to an on-link node */
-#define ND_REDIRECT_ROUTER	1	/* redirect to a better router */
-
-/*
- * Multicast Listener Discovery
- */
-struct mld_hdr {
-	struct icmp6_hdr	mld_icmp6_hdr;
-	struct in6_addr		mld_addr; /* multicast address */
-} __packed;
-
-/* definitions to provide backward compatibility to old KAME applications */
-#ifndef _KERNEL
-#define mld6_hdr	mld_hdr
-#define mld6_type	mld_type
-#define mld6_code	mld_code
-#define mld6_cksum	mld_cksum
-#define mld6_maxdelay	mld_maxdelay
-#define mld6_reserved	mld_reserved
-#define mld6_addr	mld_addr
-#endif
-
-/* shortcut macro definitions */
-#define mld_type	mld_icmp6_hdr.icmp6_type
-#define mld_code	mld_icmp6_hdr.icmp6_code
-#define mld_cksum	mld_icmp6_hdr.icmp6_cksum
-#define mld_maxdelay	mld_icmp6_hdr.icmp6_data16[0]
-#define mld_reserved	mld_icmp6_hdr.icmp6_data16[1]
-#define mld_v2_reserved	mld_icmp6_hdr.icmp6_data16[0]
-#define mld_v2_numrecs	mld_icmp6_hdr.icmp6_data16[1]
-
-/*
- * Neighbor Discovery
- */
-
-struct nd_router_solicit {	/* router solicitation */
-	struct icmp6_hdr 	nd_rs_hdr;
-	/* could be followed by options */
-} __packed;
-
-#define nd_rs_type	nd_rs_hdr.icmp6_type
-#define nd_rs_code	nd_rs_hdr.icmp6_code
-#define nd_rs_cksum	nd_rs_hdr.icmp6_cksum
-#define nd_rs_reserved	nd_rs_hdr.icmp6_data32[0]
-
-struct nd_router_advert {	/* router advertisement */
-	struct icmp6_hdr	nd_ra_hdr;
-	uint32_t		nd_ra_reachable;	/* reachable time */
-	uint32_t		nd_ra_retransmit;	/* retransmit timer */
-	/* could be followed by options */
-} __packed;
-
-#define nd_ra_type		nd_ra_hdr.icmp6_type
-#define nd_ra_code		nd_ra_hdr.icmp6_code
-#define nd_ra_cksum		nd_ra_hdr.icmp6_cksum
-#define nd_ra_curhoplimit	nd_ra_hdr.icmp6_data8[0]
-#define nd_ra_flags_reserved	nd_ra_hdr.icmp6_data8[1]
-#define ND_RA_FLAG_MANAGED	0x80
-#define ND_RA_FLAG_OTHER	0x40
-#define ND_RA_FLAG_HA		0x20
-
-/*
- * Router preference values based on draft-draves-ipngwg-router-selection-01.
- * These are non-standard definitions.
- */
-#define ND_RA_FLAG_RTPREF_MASK	0x18 /* 00011000 */
-
-#define ND_RA_FLAG_RTPREF_HIGH	0x08 /* 00001000 */
-#define ND_RA_FLAG_RTPREF_MEDIUM	0x00 /* 00000000 */
-#define ND_RA_FLAG_RTPREF_LOW	0x18 /* 00011000 */
-#define ND_RA_FLAG_RTPREF_RSV	0x10 /* 00010000 */
-
-#define nd_ra_router_lifetime	nd_ra_hdr.icmp6_data16[1]
-
-struct nd_neighbor_solicit {	/* neighbor solicitation */
-	struct icmp6_hdr	nd_ns_hdr;
-	struct in6_addr		nd_ns_target;	/*target address */
-	/* could be followed by options */
-} __packed;
-
-#define nd_ns_type		nd_ns_hdr.icmp6_type
-#define nd_ns_code		nd_ns_hdr.icmp6_code
-#define nd_ns_cksum		nd_ns_hdr.icmp6_cksum
-#define nd_ns_reserved		nd_ns_hdr.icmp6_data32[0]
-
-struct nd_neighbor_advert {	/* neighbor advertisement */
-	struct icmp6_hdr	nd_na_hdr;
-	struct in6_addr		nd_na_target;	/* target address */
-	/* could be followed by options */
-} __packed;
-
-#define nd_na_type		nd_na_hdr.icmp6_type
-#define nd_na_code		nd_na_hdr.icmp6_code
-#define nd_na_cksum		nd_na_hdr.icmp6_cksum
-#define nd_na_flags_reserved	nd_na_hdr.icmp6_data32[0]
-#if BYTE_ORDER == BIG_ENDIAN
-#define ND_NA_FLAG_ROUTER		0x80000000
-#define ND_NA_FLAG_SOLICITED		0x40000000
-#define ND_NA_FLAG_OVERRIDE		0x20000000
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define ND_NA_FLAG_ROUTER		0x80
-#define ND_NA_FLAG_SOLICITED		0x40
-#define ND_NA_FLAG_OVERRIDE		0x20
-#endif
-#endif
-
-struct nd_redirect {		/* redirect */
-	struct icmp6_hdr	nd_rd_hdr;
-	struct in6_addr		nd_rd_target;	/* target address */
-	struct in6_addr		nd_rd_dst;	/* destination address */
-	/* could be followed by options */
-} __packed;
-
-#define nd_rd_type		nd_rd_hdr.icmp6_type
-#define nd_rd_code		nd_rd_hdr.icmp6_code
-#define nd_rd_cksum		nd_rd_hdr.icmp6_cksum
-#define nd_rd_reserved		nd_rd_hdr.icmp6_data32[0]
-
-struct nd_opt_hdr {		/* Neighbor discovery option header */
-	u_int8_t	nd_opt_type;
-	u_int8_t	nd_opt_len;
-	/* followed by option specific data*/
-} __packed;
-
-#define ND_OPT_SOURCE_LINKADDR		1
-#define ND_OPT_TARGET_LINKADDR		2
-#define ND_OPT_PREFIX_INFORMATION	3
-#define ND_OPT_REDIRECTED_HEADER	4
-#define ND_OPT_MTU			5
-#define ND_OPT_NONCE			14	/* RFC 3971 */
-#define ND_OPT_ROUTE_INFO		24	/* RFC 4191 */
-#define ND_OPT_RDNSS			25	/* RFC 6106 */
-#define ND_OPT_DNSSL			31	/* RFC 6106 */
-#define ND_OPT_MAX			31
-
-struct nd_opt_prefix_info {	/* prefix information */
-	u_int8_t	nd_opt_pi_type;
-	u_int8_t	nd_opt_pi_len;
-	u_int8_t	nd_opt_pi_prefix_len;
-	u_int8_t	nd_opt_pi_flags_reserved;
-	uint32_t	nd_opt_pi_valid_time;
-	uint32_t	nd_opt_pi_preferred_time;
-	uint32_t	nd_opt_pi_reserved2;
-	struct in6_addr	nd_opt_pi_prefix;
-} __packed;
-
-#define ND_OPT_PI_FLAG_ONLINK		0x80
-#define ND_OPT_PI_FLAG_AUTO		0x40
-
-struct nd_opt_rd_hdr {		/* redirected header */
-	u_int8_t	nd_opt_rh_type;
-	u_int8_t	nd_opt_rh_len;
-	u_int16_t	nd_opt_rh_reserved1;
-	uint32_t	nd_opt_rh_reserved2;
-	/* followed by IP header and data */
-} __packed;
-
-struct nd_opt_mtu {		/* MTU option */
-	u_int8_t	nd_opt_mtu_type;
-	u_int8_t	nd_opt_mtu_len;
-	u_int16_t	nd_opt_mtu_reserved;
-	uint32_t	nd_opt_mtu_mtu;
-} __packed;
-
-#define	ND_OPT_NONCE_LEN	((1 * 8) - 2)
-#if ((ND_OPT_NONCE_LEN + 2) % 8) != 0
-#error "(ND_OPT_NONCE_LEN + 2) must be a multiple of 8."
-#endif 
-struct nd_opt_nonce {		/* nonce option */
-	u_int8_t	nd_opt_nonce_type;
-	u_int8_t	nd_opt_nonce_len;
-	u_int8_t	nd_opt_nonce[ND_OPT_NONCE_LEN];
-} __packed;
-
-struct nd_opt_route_info {	/* route info */
-	u_int8_t	nd_opt_rti_type;
-	u_int8_t	nd_opt_rti_len;
-	u_int8_t	nd_opt_rti_prefixlen;
-	u_int8_t	nd_opt_rti_flags;
-	uint32_t	nd_opt_rti_lifetime;
-	/* prefix follows */
-} __packed;
-
-struct nd_opt_rdnss {		/* RDNSS option (RFC 6106) */
-	u_int8_t	nd_opt_rdnss_type;
-	u_int8_t	nd_opt_rdnss_len;
-	u_int16_t	nd_opt_rdnss_reserved;
-	uint32_t	nd_opt_rdnss_lifetime;
-	/* followed by list of recursive DNS servers */
-} __packed;
-
-struct nd_opt_dnssl {		/* DNSSL option (RFC 6106) */
-	u_int8_t	nd_opt_dnssl_type;
-	u_int8_t	nd_opt_dnssl_len;
-	u_int16_t	nd_opt_dnssl_reserved;
-	uint32_t	nd_opt_dnssl_lifetime;
-	/* followed by list of DNS search domains */
-} __packed;
-
-/*
- * icmp6 namelookup
- */
-
-struct icmp6_namelookup {
-	struct icmp6_hdr 	icmp6_nl_hdr;
-	u_int8_t	icmp6_nl_nonce[8];
-	int32_t		icmp6_nl_ttl;
-#if 0
-	u_int8_t	icmp6_nl_len;
-	u_int8_t	icmp6_nl_name[3];
-#endif
-	/* could be followed by options */
-} __packed;
-
-/*
- * icmp6 node information
- */
-struct icmp6_nodeinfo {
-	struct icmp6_hdr icmp6_ni_hdr;
-	u_int8_t icmp6_ni_nonce[8];
-	/* could be followed by reply data */
-} __packed;
-
-#define ni_type		icmp6_ni_hdr.icmp6_type
-#define ni_code		icmp6_ni_hdr.icmp6_code
-#define ni_cksum	icmp6_ni_hdr.icmp6_cksum
-#define ni_qtype	icmp6_ni_hdr.icmp6_data16[0]
-#define ni_flags	icmp6_ni_hdr.icmp6_data16[1]
-
-#define NI_QTYPE_NOOP		0 /* NOOP  */
-#define NI_QTYPE_SUPTYPES	1 /* Supported Qtypes */
-#define NI_QTYPE_FQDN		2 /* FQDN (draft 04) */
-#define NI_QTYPE_DNSNAME	2 /* DNS Name */
-#define NI_QTYPE_NODEADDR	3 /* Node Addresses */
-#define NI_QTYPE_IPV4ADDR	4 /* IPv4 Addresses */
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define NI_SUPTYPE_FLAG_COMPRESS	0x1
-#define NI_FQDN_FLAG_VALIDTTL		0x1
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define NI_SUPTYPE_FLAG_COMPRESS	0x0100
-#define NI_FQDN_FLAG_VALIDTTL		0x0100
-#endif
-
-#ifdef NAME_LOOKUPS_04
-#if BYTE_ORDER == BIG_ENDIAN
-#define NI_NODEADDR_FLAG_LINKLOCAL	0x1
-#define NI_NODEADDR_FLAG_SITELOCAL	0x2
-#define NI_NODEADDR_FLAG_GLOBAL		0x4
-#define NI_NODEADDR_FLAG_ALL		0x8
-#define NI_NODEADDR_FLAG_TRUNCATE	0x10
-#define NI_NODEADDR_FLAG_ANYCAST	0x20 /* just experimental. not in spec */
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define NI_NODEADDR_FLAG_LINKLOCAL	0x0100
-#define NI_NODEADDR_FLAG_SITELOCAL	0x0200
-#define NI_NODEADDR_FLAG_GLOBAL		0x0400
-#define NI_NODEADDR_FLAG_ALL		0x0800
-#define NI_NODEADDR_FLAG_TRUNCATE	0x1000
-#define NI_NODEADDR_FLAG_ANYCAST	0x2000 /* just experimental. not in spec */
-#endif
-#else  /* draft-ietf-ipngwg-icmp-name-lookups-05 (and later?) */
-#if BYTE_ORDER == BIG_ENDIAN
-#define NI_NODEADDR_FLAG_TRUNCATE	0x1
-#define NI_NODEADDR_FLAG_ALL		0x2
-#define NI_NODEADDR_FLAG_COMPAT		0x4
-#define NI_NODEADDR_FLAG_LINKLOCAL	0x8
-#define NI_NODEADDR_FLAG_SITELOCAL	0x10
-#define NI_NODEADDR_FLAG_GLOBAL		0x20
-#define NI_NODEADDR_FLAG_ANYCAST	0x40 /* just experimental. not in spec */
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define NI_NODEADDR_FLAG_TRUNCATE	0x0100
-#define NI_NODEADDR_FLAG_ALL		0x0200
-#define NI_NODEADDR_FLAG_COMPAT		0x0400
-#define NI_NODEADDR_FLAG_LINKLOCAL	0x0800
-#define NI_NODEADDR_FLAG_SITELOCAL	0x1000
-#define NI_NODEADDR_FLAG_GLOBAL		0x2000
-#define NI_NODEADDR_FLAG_ANYCAST	0x4000 /* just experimental. not in spec */
-#endif
-#endif
-
-struct ni_reply_fqdn {
-	uint32_t ni_fqdn_ttl;	/* TTL */
-	u_int8_t ni_fqdn_namelen; /* length in octets of the FQDN */
-	u_int8_t ni_fqdn_name[3]; /* XXX: alignment */
-} __packed;
-
-/*
- * Router Renumbering. as router-renum-08.txt
- */
-struct icmp6_router_renum {	/* router renumbering header */
-	struct icmp6_hdr	rr_hdr;
-	u_int8_t	rr_segnum;
-	u_int8_t	rr_flags;
-	u_int16_t	rr_maxdelay;
-	uint32_t	rr_reserved;
-} __packed;
-
-#define ICMP6_RR_FLAGS_TEST		0x80
-#define ICMP6_RR_FLAGS_REQRESULT	0x40
-#define ICMP6_RR_FLAGS_FORCEAPPLY	0x20
-#define ICMP6_RR_FLAGS_SPECSITE		0x10
-#define ICMP6_RR_FLAGS_PREVDONE		0x08
-
-#define rr_type		rr_hdr.icmp6_type
-#define rr_code		rr_hdr.icmp6_code
-#define rr_cksum	rr_hdr.icmp6_cksum
-#define rr_seqnum 	rr_hdr.icmp6_data32[0]
-
-struct rr_pco_match {		/* match prefix part */
-	u_int8_t	rpm_code;
-	u_int8_t	rpm_len;
-	u_int8_t	rpm_ordinal;
-	u_int8_t	rpm_matchlen;
-	u_int8_t	rpm_minlen;
-	u_int8_t	rpm_maxlen;
-	u_int16_t	rpm_reserved;
-	struct	in6_addr	rpm_prefix;
-} __packed;
-
-#define RPM_PCO_ADD		1
-#define RPM_PCO_CHANGE		2
-#define RPM_PCO_SETGLOBAL	3
-#define RPM_PCO_MAX		4
-
-struct rr_pco_use {		/* use prefix part */
-	u_int8_t	rpu_uselen;
-	u_int8_t	rpu_keeplen;
-	u_int8_t	rpu_ramask;
-	u_int8_t	rpu_raflags;
-	uint32_t	rpu_vltime;
-	uint32_t	rpu_pltime;
-	uint32_t	rpu_flags;
-	struct	in6_addr rpu_prefix;
-} __packed;
-#define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK	0x80
-#define ICMP6_RR_PCOUSE_RAFLAGS_AUTO	0x40
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME     0x80000000
-#define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME     0x40000000
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME     0x80
-#define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME     0x40
-#endif
-
-struct rr_result {		/* router renumbering result message */
-	u_int16_t	rrr_flags;
-	u_int8_t	rrr_ordinal;
-	u_int8_t	rrr_matchedlen;
-	uint32_t	rrr_ifid;
-	struct	in6_addr rrr_prefix;
-} __packed;
-#if BYTE_ORDER == BIG_ENDIAN
-#define ICMP6_RR_RESULT_FLAGS_OOB		0x0002
-#define ICMP6_RR_RESULT_FLAGS_FORBIDDEN		0x0001
-#elif BYTE_ORDER == LITTLE_ENDIAN
-#define ICMP6_RR_RESULT_FLAGS_OOB		0x0200
-#define ICMP6_RR_RESULT_FLAGS_FORBIDDEN		0x0100
-#endif
-
-/*
- * icmp6 filter structures.
- */
-
-struct icmp6_filter {
-	uint32_t icmp6_filt[8];
-};
-
-#ifdef _KERNEL
-#define	ICMP6_FILTER_SETPASSALL(filterp) \
-do {								\
-	int i; u_char *p;					\
-	p = (u_char *)filterp;					\
-	for (i = 0; i < sizeof(struct icmp6_filter); i++)	\
-		p[i] = 0xff;					\
-} while (/*CONSTCOND*/ 0)
-#define	ICMP6_FILTER_SETBLOCKALL(filterp) \
-	bzero(filterp, sizeof(struct icmp6_filter))
-#else /* _KERNEL */
-#define	ICMP6_FILTER_SETPASSALL(filterp) \
-	memset(filterp, 0xff, sizeof(struct icmp6_filter))
-#define	ICMP6_FILTER_SETBLOCKALL(filterp) \
-	memset(filterp, 0x00, sizeof(struct icmp6_filter))
-#endif /* _KERNEL */
-
-#define	ICMP6_FILTER_SETPASS(type, filterp) \
-	(((filterp)->icmp6_filt[(type) >> 5]) |= (1 << ((type) & 31)))
-#define	ICMP6_FILTER_SETBLOCK(type, filterp) \
-	(((filterp)->icmp6_filt[(type) >> 5]) &= ~(1 << ((type) & 31)))
-#define	ICMP6_FILTER_WILLPASS(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) != 0)
-#define	ICMP6_FILTER_WILLBLOCK(type, filterp) \
-	((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) == 0)
-
-/*
- * Variables related to this implementation
- * of the internet control message protocol version 6.
- */
-struct icmp6errstat {
-	uint64_t icp6errs_dst_unreach_noroute;
-	uint64_t icp6errs_dst_unreach_admin;
-	uint64_t icp6errs_dst_unreach_beyondscope;
-	uint64_t icp6errs_dst_unreach_addr;
-	uint64_t icp6errs_dst_unreach_noport;
-	uint64_t icp6errs_packet_too_big;
-	uint64_t icp6errs_time_exceed_transit;
-	uint64_t icp6errs_time_exceed_reassembly;
-	uint64_t icp6errs_paramprob_header;
-	uint64_t icp6errs_paramprob_nextheader;
-	uint64_t icp6errs_paramprob_option;
-	uint64_t icp6errs_redirect; /* we regard redirect as an error here */
-	uint64_t icp6errs_unknown;
-};
-
-struct icmp6stat {
-/* statistics related to icmp6 packets generated */
-	uint64_t icp6s_error;		/* # of calls to icmp6_error */
-	uint64_t icp6s_canterror;	/* no error 'cuz old was icmp */
-	uint64_t icp6s_toofreq;		/* no error 'cuz rate limitation */
-	uint64_t icp6s_outhist[256];
-/* statistics related to input message processed */
-	uint64_t icp6s_badcode;		/* icmp6_code out of range */
-	uint64_t icp6s_tooshort;	/* packet < sizeof(struct icmp6_hdr) */
-	uint64_t icp6s_checksum;	/* bad checksum */
-	uint64_t icp6s_badlen;		/* calculated bound mismatch */
-	/*
-	 * number of responses: this member is inherited from netinet code, but
-	 * for netinet6 code, it is already available in icp6s_outhist[].
-	 */
-	uint64_t icp6s_reflect;
-	uint64_t icp6s_inhist[256];	
-	uint64_t icp6s_nd_toomanyopt;	/* too many ND options */
-	struct icmp6errstat icp6s_outerrhist;
-#define icp6s_odst_unreach_noroute \
-	icp6s_outerrhist.icp6errs_dst_unreach_noroute
-#define icp6s_odst_unreach_admin icp6s_outerrhist.icp6errs_dst_unreach_admin
-#define icp6s_odst_unreach_beyondscope \
-	icp6s_outerrhist.icp6errs_dst_unreach_beyondscope
-#define icp6s_odst_unreach_addr icp6s_outerrhist.icp6errs_dst_unreach_addr
-#define icp6s_odst_unreach_noport icp6s_outerrhist.icp6errs_dst_unreach_noport
-#define icp6s_opacket_too_big icp6s_outerrhist.icp6errs_packet_too_big
-#define icp6s_otime_exceed_transit \
-	icp6s_outerrhist.icp6errs_time_exceed_transit
-#define icp6s_otime_exceed_reassembly \
-	icp6s_outerrhist.icp6errs_time_exceed_reassembly
-#define icp6s_oparamprob_header icp6s_outerrhist.icp6errs_paramprob_header
-#define icp6s_oparamprob_nextheader \
-	icp6s_outerrhist.icp6errs_paramprob_nextheader
-#define icp6s_oparamprob_option icp6s_outerrhist.icp6errs_paramprob_option
-#define icp6s_oredirect icp6s_outerrhist.icp6errs_redirect
-#define icp6s_ounknown icp6s_outerrhist.icp6errs_unknown
-	uint64_t icp6s_pmtuchg;		/* path MTU changes */
-	uint64_t icp6s_nd_badopt;	/* bad ND options */
-	uint64_t icp6s_badns;		/* bad neighbor solicitation */
-	uint64_t icp6s_badna;		/* bad neighbor advertisement */
-	uint64_t icp6s_badrs;		/* bad router advertisement */
-	uint64_t icp6s_badra;		/* bad router advertisement */
-	uint64_t icp6s_badredirect;	/* bad redirect message */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_PCPUSTAT_DECLARE(struct icmp6stat, icmp6stat);
-/*
- * In-kernel consumers can use these accessor macros directly to update
- * stats.
- */
-#define	ICMP6STAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct icmp6stat, icmp6stat, name, (val))
-#define	ICMP6STAT_INC(name)		ICMP6STAT_ADD(name, 1)
-
-/*
- * Kernel module consumers must use this accessor macro.
- */
-void	kmod_icmp6stat_inc(int statnum);
-#define	KMOD_ICMP6STAT_INC(name)	\
-    kmod_icmp6stat_inc(offsetof(struct icmp6stat, name) / sizeof(uint64_t))
-#endif
-
-/*
- * Names for ICMP sysctl objects
- */
-#define ICMPV6CTL_STATS		1
-#define ICMPV6CTL_REDIRACCEPT	2	/* accept/process redirects */
-#define ICMPV6CTL_REDIRTIMEOUT	3	/* redirect cache time */
-#if 0	/*obsoleted*/
-#define ICMPV6CTL_ERRRATELIMIT	5	/* ICMPv6 error rate limitation */
-#endif
-#define ICMPV6CTL_ND6_PRUNE	6
-#define ICMPV6CTL_ND6_DELAY	8
-#define ICMPV6CTL_ND6_UMAXTRIES	9
-#define ICMPV6CTL_ND6_MMAXTRIES		10
-#define ICMPV6CTL_ND6_USELOOPBACK	11
-/*#define ICMPV6CTL_ND6_PROXYALL	12	obsoleted, do not reuse here */
-#define ICMPV6CTL_NODEINFO	13
-#define ICMPV6CTL_ERRPPSLIMIT	14	/* ICMPv6 error pps limitation */
-#define ICMPV6CTL_ND6_MAXNUDHINT	15
-#define ICMPV6CTL_MTUDISC_HIWAT	16
-#define ICMPV6CTL_MTUDISC_LOWAT	17
-#define ICMPV6CTL_ND6_DEBUG	18
-#define ICMPV6CTL_ND6_DRLIST	19
-#define ICMPV6CTL_ND6_PRLIST	20
-#define ICMPV6CTL_MLD_MAXSRCFILTER	21
-#define ICMPV6CTL_MLD_SOMAXSRC	22
-#define ICMPV6CTL_MLD_VERSION	23
-#define ICMPV6CTL_ND6_MAXQLEN	24
-#define ICMPV6CTL_NODEINFO_OLDMCPREFIX	25
-#define ICMPV6CTL_MAXID		26
-
-#define RTF_PROBEMTU	RTF_PROTO1
-
-#ifdef _KERNEL
-# ifdef __STDC__
-struct	rtentry;
-struct	rttimer;
-struct	in6_multi;
-# endif
-void	icmp6_paramerror(struct mbuf *, int);
-void	icmp6_error(struct mbuf *, int, int, int);
-void	icmp6_error2(struct mbuf *, int, int, int, struct ifnet *);
-int	icmp6_input(struct mbuf **, int *, int);
-void	icmp6_fasttimo(void);
-void	icmp6_slowtimo(void);
-void	icmp6_reflect(struct mbuf *, size_t);
-void	icmp6_prepare(struct mbuf *);
-void	icmp6_redirect_input(struct mbuf *, int);
-void	icmp6_redirect_output(struct mbuf *, struct rtentry *);
-
-struct	ip6ctlparam;
-void	icmp6_mtudisc_update(struct ip6ctlparam *, int);
-
-/* XXX: is this the right place for these macros? */
-#define icmp6_ifstat_inc(ifp, tag) \
-do {								\
-	if (ifp)						\
-		counter_u64_add(((struct in6_ifextra *)		\
-		    ((ifp)->if_afdata[AF_INET6]))->icmp6_ifstat[\
-		    offsetof(struct icmp6_ifstat, tag) / sizeof(uint64_t)], 1);\
-} while (/*CONSTCOND*/ 0)
-
-#define icmp6_ifoutstat_inc(ifp, type, code) \
-do { \
-		icmp6_ifstat_inc(ifp, ifs6_out_msg); \
- 		if (type < ICMP6_INFOMSG_MASK) \
- 			icmp6_ifstat_inc(ifp, ifs6_out_error); \
-		switch (type) { \
-		 case ICMP6_DST_UNREACH: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_dstunreach); \
-			 if (code == ICMP6_DST_UNREACH_ADMIN) \
-				 icmp6_ifstat_inc(ifp, ifs6_out_adminprohib); \
-			 break; \
-		 case ICMP6_PACKET_TOO_BIG: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_pkttoobig); \
-			 break; \
-		 case ICMP6_TIME_EXCEEDED: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_timeexceed); \
-			 break; \
-		 case ICMP6_PARAM_PROB: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_paramprob); \
-			 break; \
-		 case ICMP6_ECHO_REQUEST: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_echo); \
-			 break; \
-		 case ICMP6_ECHO_REPLY: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_echoreply); \
-			 break; \
-		 case MLD_LISTENER_QUERY: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_mldquery); \
-			 break; \
-		 case MLD_LISTENER_REPORT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_mldreport); \
-			 break; \
-		 case MLD_LISTENER_DONE: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_mlddone); \
-			 break; \
-		 case ND_ROUTER_SOLICIT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_routersolicit); \
-			 break; \
-		 case ND_ROUTER_ADVERT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_routeradvert); \
-			 break; \
-		 case ND_NEIGHBOR_SOLICIT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_neighborsolicit); \
-			 break; \
-		 case ND_NEIGHBOR_ADVERT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_neighboradvert); \
-			 break; \
-		 case ND_REDIRECT: \
-			 icmp6_ifstat_inc(ifp, ifs6_out_redirect); \
-			 break; \
-		} \
-} while (/*CONSTCOND*/ 0)
-
-VNET_DECLARE(int, icmp6_rediraccept);	/* accept/process redirects */
-VNET_DECLARE(int, icmp6_redirtimeout);	/* cache time for redirect routes */
-
-#define	V_icmp6_rediraccept	VNET(icmp6_rediraccept)
-#define	V_icmp6_redirtimeout	VNET(icmp6_redirtimeout)
-
-#define ICMP6_NODEINFO_FQDNOK		0x1
-#define ICMP6_NODEINFO_NODEADDROK	0x2
-#define ICMP6_NODEINFO_TMPADDROK	0x4
-#define ICMP6_NODEINFO_GLOBALOK		0x8
-#endif /* _KERNEL */
-
-#endif /* not _NETINET_ICMP6_H_ */
diff --git a/include.new/netinet/icmp_var.h b/include.new/netinet/icmp_var.h
deleted file mode 100644
index 0dd2cb1..0000000
--- a/include.new/netinet/icmp_var.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)icmp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/icmp_var.h 254925 2013-08-26 18:16:05Z jhb $
- */
-
-#ifndef _NETINET_ICMP_VAR_H_
-#define _NETINET_ICMP_VAR_H_
-
-
-/*
- * Variables related to this implementation
- * of the internet control message protocol.
- */
-struct	icmpstat {
-/* statistics related to icmp packets generated */
-	u_long	icps_error;		/* # of calls to icmp_error */
-	u_long	icps_oldshort;		/* no error 'cuz old ip too short */
-	u_long	icps_oldicmp;		/* no error 'cuz old was icmp */
-	u_long	icps_outhist[ICMP_MAXTYPE + 1];
-/* statistics related to input messages processed */
-	u_long	icps_badcode;		/* icmp_code out of range */
-	u_long	icps_tooshort;		/* packet < ICMP_MINLEN */
-	u_long	icps_checksum;		/* bad checksum */
-	u_long	icps_badlen;		/* calculated bound mismatch */
-	u_long	icps_reflect;		/* number of responses */
-	u_long	icps_inhist[ICMP_MAXTYPE + 1];
-	u_long	icps_bmcastecho;	/* b/mcast echo requests dropped */
-	u_long	icps_bmcasttstamp;	/* b/mcast tstamp requests dropped */
-	u_long	icps_badaddr;		/* bad return address */
-	u_long	icps_noroute;		/* no route back */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_PCPUSTAT_DECLARE(struct icmpstat, icmpstat);
-/*
- * In-kernel consumers can use these accessor macros directly to update
- * stats.
- */
-#define	ICMPSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct icmpstat, icmpstat, name, (val))
-#define	ICMPSTAT_INC(name)	ICMPSTAT_ADD(name, 1)
-
-/*
- * Kernel module consumers must use this accessor macro.
- */
-void	kmod_icmpstat_inc(int statnum);
-#define	KMOD_ICMPSTAT_INC(name)						\
-    kmod_icmpstat_inc(offsetof(struct icmpstat, name) / sizeof(uint64_t))
-#endif
-
-/*
- * Names for ICMP sysctl objects
- */
-#define	ICMPCTL_MASKREPL	1	/* allow replies to netmask requests */
-#define	ICMPCTL_STATS		2	/* statistics (read-only) */
-#define ICMPCTL_ICMPLIM		3
-#define ICMPCTL_MAXID		4
-
-#ifdef _KERNEL
-SYSCTL_DECL(_net_inet_icmp);
-
-extern int badport_bandlim(int);
-#define BANDLIM_UNLIMITED -1
-#define BANDLIM_ICMP_UNREACH 0
-#define BANDLIM_ICMP_ECHO 1
-#define BANDLIM_ICMP_TSTAMP 2
-#define BANDLIM_RST_CLOSEDPORT 3 /* No connection, and no listeners */
-#define BANDLIM_RST_OPENPORT 4   /* No connection, listener */
-#define BANDLIM_ICMP6_UNREACH 5
-#define BANDLIM_SCTP_OOTB 6
-#define BANDLIM_MAX 6
-#endif
-
-#endif
diff --git a/include.new/netinet/if_atm.h b/include.new/netinet/if_atm.h
deleted file mode 100644
index 0668348..0000000
--- a/include.new/netinet/if_atm.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/netinet/if_atm.h 249925 2013-04-26 12:50:32Z glebius $ */
-/*      $NetBSD: if_atm.h,v 1.2 1996/07/03 17:17:17 chuck Exp $       */
-
-/*-
- *
- * Copyright (c) 1996 Charles D. Cranor and Washington University.
- * 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 Charles D. Cranor and
- *      Washington University.
- * 4. 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 ``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 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.
- */
-
-/*
- * if_atm.h
- */
-
-struct atm_pseudohdr;
-struct mbuf;
-struct rtentry;
-struct sockaddr;
-
-void atm_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
-int atmresolve(struct rtentry *, struct mbuf *, const struct sockaddr *,
-		struct atm_pseudohdr *);
diff --git a/include.new/netinet/if_ether.h b/include.new/netinet/if_ether.h
deleted file mode 100644
index 8c2448f..0000000
--- a/include.new/netinet/if_ether.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)if_ether.h	8.3 (Berkeley) 5/2/95
- * $FreeBSD: releng/10.2/sys/netinet/if_ether.h 249925 2013-04-26 12:50:32Z glebius $
- */
-
-#ifndef _NETINET_IF_ETHER_H_
-#define _NETINET_IF_ETHER_H_
-
-#include <net/ethernet.h>
-#include <net/if_arp.h>
-
-/*
- * Macro to map an IP multicast address to an Ethernet multicast address.
- * The high-order 25 bits of the Ethernet address are statically assigned,
- * and the low-order 23 bits are taken from the low end of the IP address.
- */
-#define ETHER_MAP_IP_MULTICAST(ipaddr, enaddr) \
-	/* struct in_addr *ipaddr; */ \
-	/* u_char enaddr[ETHER_ADDR_LEN];	   */ \
-{ \
-	(enaddr)[0] = 0x01; \
-	(enaddr)[1] = 0x00; \
-	(enaddr)[2] = 0x5e; \
-	(enaddr)[3] = ((const u_char *)ipaddr)[1] & 0x7f; \
-	(enaddr)[4] = ((const u_char *)ipaddr)[2]; \
-	(enaddr)[5] = ((const u_char *)ipaddr)[3]; \
-}
-/*
- * Macro to map an IP6 multicast address to an Ethernet multicast address.
- * The high-order 16 bits of the Ethernet address are statically assigned,
- * and the low-order 32 bits are taken from the low end of the IP6 address.
- */
-#define ETHER_MAP_IPV6_MULTICAST(ip6addr, enaddr)			\
-/* struct	in6_addr *ip6addr; */					\
-/* u_char	enaddr[ETHER_ADDR_LEN]; */				\
-{                                                                       \
-	(enaddr)[0] = 0x33;						\
-	(enaddr)[1] = 0x33;						\
-	(enaddr)[2] = ((const u_char *)ip6addr)[12];			\
-	(enaddr)[3] = ((const u_char *)ip6addr)[13];			\
-	(enaddr)[4] = ((const u_char *)ip6addr)[14];			\
-	(enaddr)[5] = ((const u_char *)ip6addr)[15];			\
-}
-
-/*
- * Ethernet Address Resolution Protocol.
- *
- * See RFC 826 for protocol description.  Structure below is adapted
- * to resolving internet addresses.  Field names used correspond to
- * RFC 826.
- */
-struct	ether_arp {
-	struct	arphdr ea_hdr;	/* fixed-size header */
-	u_char	arp_sha[ETHER_ADDR_LEN];	/* sender hardware address */
-	u_char	arp_spa[4];	/* sender protocol address */
-	u_char	arp_tha[ETHER_ADDR_LEN];	/* target hardware address */
-	u_char	arp_tpa[4];	/* target protocol address */
-};
-#define	arp_hrd	ea_hdr.ar_hrd
-#define	arp_pro	ea_hdr.ar_pro
-#define	arp_hln	ea_hdr.ar_hln
-#define	arp_pln	ea_hdr.ar_pln
-#define	arp_op	ea_hdr.ar_op
-
-#ifndef BURN_BRIDGES	/* Can be used by third party software. */
-struct sockaddr_inarp {
-	u_char	sin_len;
-	u_char	sin_family;
-	u_short sin_port;
-	struct	in_addr sin_addr;
-	struct	in_addr sin_srcaddr;
-	u_short	sin_tos;
-	u_short	sin_other;
-#define SIN_PROXY 1
-};
-#endif /* !BURN_BRIDGES  */
-
-/*
- * IP and ethernet specific routing flags
- */
-#define	RTF_USETRAILERS	RTF_PROTO1	/* use trailers */
-#define RTF_ANNOUNCE	RTF_PROTO2	/* announce new arp entry */
-
-#ifdef	_KERNEL
-extern u_char	ether_ipmulticast_min[ETHER_ADDR_LEN];
-extern u_char	ether_ipmulticast_max[ETHER_ADDR_LEN];
-
-struct llentry;
-struct ifaddr;
-
-int	arpresolve(struct ifnet *ifp, struct rtentry *rt, struct mbuf *m,
-	    const struct sockaddr *dst, u_char *desten, struct llentry **lle);
-void	arprequest(struct ifnet *, const struct in_addr *,
-	    const struct in_addr *, u_char *);
-void	arp_ifinit(struct ifnet *, struct ifaddr *);
-void	arp_ifinit2(struct ifnet *, struct ifaddr *, u_char *);
-void	arp_ifscrub(struct ifnet *, uint32_t);
-#endif
-
-#endif
diff --git a/include.new/netinet/igmp.h b/include.new/netinet/igmp.h
deleted file mode 100644
index c2f8376..0000000
--- a/include.new/netinet/igmp.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * 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.
- * 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.
- *
- *	@(#)igmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/igmp.h 193938 2009-06-10 18:12:15Z imp $
- */
-
-#ifndef _NETINET_IGMP_H_
-#define _NETINET_IGMP_H_
-
-/*
- * Internet Group Management Protocol (IGMP) definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.2
- */
-
-/* Minimum length of any IGMP protocol message. */
-#define IGMP_MINLEN			8
-
-/*
- * IGMPv1/v2 query and host report format.
- */
-struct igmp {
-	u_char		igmp_type;	/* version & type of IGMP message  */
-	u_char		igmp_code;	/* subtype for routing msgs        */
-	u_short		igmp_cksum;	/* IP-style checksum               */
-	struct in_addr	igmp_group;	/* group address being reported    */
-};					/*  (zero for queries)             */
-
-/*
- * IGMP v3 query format.
- */
-struct igmpv3 {
-	u_char		igmp_type;	/* version & type of IGMP message  */
-	u_char		igmp_code;	/* subtype for routing msgs        */
-	u_short		igmp_cksum;	/* IP-style checksum               */
-	struct in_addr	igmp_group;	/* group address being reported    */
-					/*  (zero for queries)             */
-	u_char		igmp_misc;	/* reserved/suppress/robustness    */
-	u_char		igmp_qqi;	/* querier's query interval        */
-	u_short		igmp_numsrc;	/* number of sources               */
-	/*struct in_addr	igmp_sources[1];*/ /* source addresses */
-};
-#define IGMP_V3_QUERY_MINLEN		12
-#define IGMP_EXP(x)			(((x) >> 4) & 0x07)
-#define IGMP_MANT(x)			((x) & 0x0f)
-#define IGMP_QRESV(x)			(((x) >> 4) & 0x0f)
-#define IGMP_SFLAG(x)			(((x) >> 3) & 0x01)
-#define IGMP_QRV(x)			((x) & 0x07)
-
-struct igmp_grouprec {
-	u_char		ig_type;	/* record type */
-	u_char		ig_datalen;	/* length of auxiliary data */
-	u_short		ig_numsrc;	/* number of sources */
-	struct in_addr	ig_group;	/* group address being reported */
-	/*struct in_addr	ig_sources[1];*/ /* source addresses */
-};
-#define IGMP_GRPREC_HDRLEN		8
-
-/*
- * IGMPv3 host membership report header.
- */
-struct igmp_report {
-	u_char		ir_type;	/* IGMP_v3_HOST_MEMBERSHIP_REPORT */
-	u_char		ir_rsv1;	/* must be zero */
-	u_short		ir_cksum;	/* checksum */
-	u_short		ir_rsv2;	/* must be zero */
-	u_short		ir_numgrps;	/* number of group records */
-	/*struct	igmp_grouprec ir_groups[1];*/	/* group records */
-};
-#define IGMP_V3_REPORT_MINLEN		8
-#define IGMP_V3_REPORT_MAXRECS		65535
-
-/*
- * Message types, including version number.
- */
-#define IGMP_HOST_MEMBERSHIP_QUERY	0x11	/* membership query         */
-#define IGMP_v1_HOST_MEMBERSHIP_REPORT	0x12	/* Ver. 1 membership report */
-#define IGMP_DVMRP			0x13	/* DVMRP routing message    */
-#define IGMP_PIM			0x14	/* PIMv1 message (historic) */
-#define IGMP_v2_HOST_MEMBERSHIP_REPORT	0x16	/* Ver. 2 membership report */
-#define IGMP_HOST_LEAVE_MESSAGE		0x17	/* Leave-group message     */
-#define IGMP_MTRACE_REPLY		0x1e	/* mtrace(8) reply */
-#define IGMP_MTRACE_QUERY		0x1f	/* mtrace(8) probe */
-#define IGMP_v3_HOST_MEMBERSHIP_REPORT	0x22	/* Ver. 3 membership report */
-
-/*
- * IGMPv3 report modes.
- */
-#define IGMP_DO_NOTHING			0	/* don't send a record */
-#define IGMP_MODE_IS_INCLUDE		1	/* MODE_IN */
-#define IGMP_MODE_IS_EXCLUDE		2	/* MODE_EX */
-#define IGMP_CHANGE_TO_INCLUDE_MODE	3	/* TO_IN */
-#define IGMP_CHANGE_TO_EXCLUDE_MODE	4	/* TO_EX */
-#define IGMP_ALLOW_NEW_SOURCES		5	/* ALLOW_NEW */
-#define IGMP_BLOCK_OLD_SOURCES		6	/* BLOCK_OLD */
-
-/*
- * IGMPv3 query types.
- */
-#define IGMP_V3_GENERAL_QUERY		1
-#define IGMP_V3_GROUP_QUERY		2
-#define IGMP_V3_GROUP_SOURCE_QUERY	3
-
-/*
- * Maximum report interval for IGMP v1/v2 host membership reports [RFC 1112]
- */
-#define IGMP_V1V2_MAX_RI		10
-#define IGMP_MAX_HOST_REPORT_DELAY	IGMP_V1V2_MAX_RI
-
-/*
- * IGMP_TIMER_SCALE denotes that the igmp code field specifies
- * time in tenths of a second.
- */
-#define IGMP_TIMER_SCALE		10
-
-#endif /* _NETINET_IGMP_H_ */
diff --git a/include.new/netinet/igmp_var.h b/include.new/netinet/igmp_var.h
deleted file mode 100644
index 756916e..0000000
--- a/include.new/netinet/igmp_var.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-a
- * Copyright (c) 1988 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * 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.
- * 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.
- *
- *	from: @(#)igmp_var.h	8.1 (Berkeley) 7/19/93
- * $FreeBSD: releng/10.2/sys/netinet/igmp_var.h 254925 2013-08-26 18:16:05Z jhb $
- */
-
-#ifndef _NETINET_IGMP_VAR_H_
-#define _NETINET_IGMP_VAR_H_
-
-/*
- * Internet Group Management Protocol (IGMP),
- * implementation-specific definitions.
- *
- * Written by Steve Deering, Stanford, May 1988.
- *
- * MULTICAST Revision: 3.5.1.3
- */
-
-#ifndef BURN_BRIDGES
-/*
- * Pre-IGMPV3 igmpstat structure.
- */
-struct oigmpstat {
-	u_int igps_rcv_total;		/* total IGMP messages received */
-	u_int igps_rcv_tooshort;	/* received with too few bytes */
-	u_int igps_rcv_badsum;		/* received with bad checksum */
-	u_int igps_rcv_queries;		/* received membership queries */
-	u_int igps_rcv_badqueries;	/* received invalid queries */
-	u_int igps_rcv_reports;		/* received membership reports */
-	u_int igps_rcv_badreports;	/* received invalid reports */
-	u_int igps_rcv_ourreports;	/* received reports for our groups */
-	u_int igps_snd_reports;		/* sent membership reports */
-	u_int igps_rcv_toolong;		/* received with too many bytes */
-};
-#endif
-
-/*
- * IGMPv3 protocol statistics.
- */
-struct igmpstat {
-	/*
-	 * Structure header (to insulate ABI changes).
-	 */
-	uint32_t igps_version;		/* version of this structure */
-	uint32_t igps_len;		/* length of this structure */
-	/*
-	 * Message statistics.
-	 */
-	uint64_t igps_rcv_total;	/* total IGMP messages received */
-	uint64_t igps_rcv_tooshort;	/* received with too few bytes */
-	uint64_t igps_rcv_badttl;	/* received with ttl other than 1 */
-	uint64_t igps_rcv_badsum;	/* received with bad checksum */
-	/*
-	 * Query statistics.
-	 */
-	uint64_t igps_rcv_v1v2_queries;	/* received IGMPv1/IGMPv2 queries */
-	uint64_t igps_rcv_v3_queries;	/* received IGMPv3 queries */
-	uint64_t igps_rcv_badqueries;	/* received invalid queries */
-	uint64_t igps_rcv_gen_queries;	/* received general queries */
-	uint64_t igps_rcv_group_queries;/* received group queries */
-	uint64_t igps_rcv_gsr_queries;	/* received group-source queries */
-	uint64_t igps_drop_gsr_queries;	/* dropped group-source queries */
-	/*
-	 * Report statistics.
-	 */
-	uint64_t igps_rcv_reports;	/* received membership reports */
-	uint64_t igps_rcv_badreports;	/* received invalid reports */
-	uint64_t igps_rcv_ourreports;	/* received reports for our groups */
-	uint64_t igps_rcv_nora;		/* received w/o Router Alert option */
-	uint64_t igps_snd_reports;	/* sent membership reports */
-	/*
-	 * Padding for future additions.
-	 */
-	uint64_t __igps_pad[4];
-};
-#define IGPS_VERSION_3	3		/* as of FreeBSD 8.x */
-#define IGPS_VERSION3_LEN		168
-
-#ifdef _KERNEL
-#define	IGMPSTAT_ADD(name, val)		V_igmpstat.name += (val)
-#define	IGMPSTAT_INC(name)		IGMPSTAT_ADD(name, 1)
-#endif
-
-#ifdef CTASSERT
-CTASSERT(sizeof(struct igmpstat) == 168);
-#endif
-
-#ifdef _KERNEL
-#define IGMP_RANDOM_DELAY(X) (random() % (X) + 1)
-
-#define IGMP_MAX_STATE_CHANGES		24 /* Max pending changes per group */
-
-/*
- * IGMP per-group states.
- */
-#define IGMP_NOT_MEMBER			0 /* Can garbage collect in_multi */
-#define IGMP_SILENT_MEMBER		1 /* Do not perform IGMP for group */
-#define IGMP_REPORTING_MEMBER		2 /* IGMPv1/2/3 we are reporter */
-#define IGMP_IDLE_MEMBER		3 /* IGMPv1/2 we reported last */
-#define IGMP_LAZY_MEMBER		4 /* IGMPv1/2 other member reporting */
-#define IGMP_SLEEPING_MEMBER		5 /* IGMPv1/2 start query response */
-#define IGMP_AWAKENING_MEMBER		6 /* IGMPv1/2 group timer will start */
-#define IGMP_G_QUERY_PENDING_MEMBER	7 /* IGMPv3 group query pending */
-#define IGMP_SG_QUERY_PENDING_MEMBER	8 /* IGMPv3 source query pending */
-#define IGMP_LEAVING_MEMBER		9 /* IGMPv3 dying gasp (pending last */
-					  /* retransmission of INCLUDE {}) */
-
-/*
- * IGMP version tag.
- */
-#define IGMP_VERSION_NONE		0 /* Invalid */
-#define IGMP_VERSION_1			1
-#define IGMP_VERSION_2			2
-#define IGMP_VERSION_3			3 /* Default */
-
-/*
- * IGMPv3 protocol control variables.
- */
-#define IGMP_RV_INIT		2	/* Robustness Variable */
-#define IGMP_RV_MIN		1
-#define IGMP_RV_MAX		7
-
-#define IGMP_QI_INIT		125	/* Query Interval (s) */
-#define IGMP_QI_MIN		1
-#define IGMP_QI_MAX		255
-
-#define IGMP_QRI_INIT		10	/* Query Response Interval (s) */
-#define IGMP_QRI_MIN		1
-#define IGMP_QRI_MAX		255
-
-#define IGMP_URI_INIT		3	/* Unsolicited Report Interval (s) */
-#define IGMP_URI_MIN		0
-#define IGMP_URI_MAX		10
-
-#define IGMP_MAX_G_GS_PACKETS		8 /* # of packets to answer G/GS */
-#define IGMP_MAX_STATE_CHANGE_PACKETS	8 /* # of packets per state change */
-#define IGMP_MAX_RESPONSE_PACKETS	16 /* # of packets for general query */
-#define IGMP_MAX_RESPONSE_BURST		4 /* # of responses to send at once */
-#define IGMP_RESPONSE_BURST_INTERVAL	(PR_FASTHZ / 2)	/* 500ms */
-
-/*
- * IGMP-specific mbuf flags.
- */
-#define M_IGMPV2	M_PROTO1	/* Packet is IGMPv2 */
-#define M_IGMPV3_HDR	M_PROTO2	/* Packet has IGMPv3 headers */
-#define M_GROUPREC	M_PROTO3	/* mbuf chain is a group record */
-#define M_IGMP_LOOP	M_PROTO4	/* transmit on loif, not real ifp */
-
-/*
- * Default amount of leading space for IGMPv3 to allocate at the
- * beginning of its mbuf packet chains, to avoid fragmentation and
- * unnecessary allocation of leading mbufs.
- */
-#define RAOPT_LEN	4		/* Length of IP Router Alert option */
-#define	IGMP_LEADINGSPACE		\
-	(sizeof(struct ip) + RAOPT_LEN + sizeof(struct igmp_report))
-
-/*
- * Subsystem lock macros.
- * The IGMP lock is only taken with IGMP. Currently it is system-wide.
- * VIMAGE: The lock could be pushed to per-VIMAGE granularity in future.
- */
-#define	IGMP_LOCK_INIT()	mtx_init(&igmp_mtx, "igmp_mtx", NULL, MTX_DEF)
-#define	IGMP_LOCK_DESTROY()	mtx_destroy(&igmp_mtx)
-#define	IGMP_LOCK()		mtx_lock(&igmp_mtx)
-#define	IGMP_LOCK_ASSERT()	mtx_assert(&igmp_mtx, MA_OWNED)
-#define	IGMP_UNLOCK()		mtx_unlock(&igmp_mtx)
-#define	IGMP_UNLOCK_ASSERT()	mtx_assert(&igmp_mtx, MA_NOTOWNED)
-
-struct igmp_ifinfo;
-
-int	igmp_change_state(struct in_multi *);
-void	igmp_fasttimo(void);
-struct igmp_ifinfo *
-	igmp_domifattach(struct ifnet *);
-void	igmp_domifdetach(struct ifnet *);
-void	igmp_ifdetach(struct ifnet *);
-void	igmp_input(struct mbuf *, int);
-void	igmp_slowtimo(void);
-
-SYSCTL_DECL(_net_inet_igmp);
-
-#endif /* _KERNEL */
-
-/*
- * Names for IGMP sysctl objects
- */
-#define IGMPCTL_STATS		1	/* statistics (read-only) */
-#define IGMPCTL_MAXID		2
-
-#endif
diff --git a/include.new/netinet/in.h b/include.new/netinet/in.h
deleted file mode 100644
index 2e90f46..0000000
--- a/include.new/netinet/in.h
+++ /dev/null
@@ -1,740 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 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.
- * 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.
- *
- *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD: releng/10.2/sys/netinet/in.h 273841 2014-10-29 23:10:48Z jilles $
- */
-
-#ifndef _NETINET_IN_H_
-#define	_NETINET_IN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <machine/endian.h>
-
-/* Protocols common to RFC 1700, POSIX, and X/Open. */
-#define	IPPROTO_IP		0		/* dummy for IP */
-#define	IPPROTO_ICMP		1		/* control message protocol */
-#define	IPPROTO_TCP		6		/* tcp */
-#define	IPPROTO_UDP		17		/* user datagram protocol */
-
-#define	INADDR_ANY		(uint32_t)0x00000000
-#define	INADDR_BROADCAST	(uint32_t)0xffffffff	/* must be masked */
-
-#ifndef _UINT8_T_DECLARED
-typedef	__uint8_t		uint8_t;
-#define	_UINT8_T_DECLARED
-#endif
-
-#ifndef _UINT16_T_DECLARED
-typedef	__uint16_t		uint16_t;
-#define	_UINT16_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t		uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
-
-#ifndef _IN_ADDR_T_DECLARED
-typedef	uint32_t		in_addr_t;
-#define	_IN_ADDR_T_DECLARED
-#endif
-
-#ifndef _IN_PORT_T_DECLARED
-typedef	uint16_t		in_port_t;
-#define	_IN_PORT_T_DECLARED
-#endif
-
-#ifndef _SA_FAMILY_T_DECLARED
-typedef	__sa_family_t		sa_family_t;
-#define	_SA_FAMILY_T_DECLARED
-#endif
-
-/* Internet address (a structure for historical reasons). */
-#ifndef	_STRUCT_IN_ADDR_DECLARED
-struct in_addr {
-	in_addr_t s_addr;
-};
-#define	_STRUCT_IN_ADDR_DECLARED
-#endif
-
-#ifndef	_SOCKLEN_T_DECLARED
-typedef	__socklen_t	socklen_t;
-#define	_SOCKLEN_T_DECLARED
-#endif
-
-#include <sys/_sockaddr_storage.h>
-
-/* Socket address, internet style. */
-struct sockaddr_in {
-	uint8_t	sin_len;
-	sa_family_t	sin_family;
-	in_port_t	sin_port;
-	struct	in_addr sin_addr;
-	char	sin_zero[8];
-};
-
-#if !defined(_KERNEL) && __POSIX_VISIBLE >= 200112
-
-#ifndef _BYTEORDER_PROTOTYPED
-#define	_BYTEORDER_PROTOTYPED
-__BEGIN_DECLS
-uint32_t	htonl(uint32_t);
-uint16_t	htons(uint16_t);
-uint32_t	ntohl(uint32_t);
-uint16_t	ntohs(uint16_t);
-__END_DECLS
-#endif
-
-#ifndef _BYTEORDER_FUNC_DEFINED
-#define	_BYTEORDER_FUNC_DEFINED
-#define	htonl(x)	__htonl(x)
-#define	htons(x)	__htons(x)
-#define	ntohl(x)	__ntohl(x)
-#define	ntohs(x)	__ntohs(x)
-#endif
-
-#endif /* !_KERNEL && __POSIX_VISIBLE >= 200112 */
-
-#if __POSIX_VISIBLE >= 200112
-#define	IPPROTO_IPV6		41		/* IP6 header */
-#define	IPPROTO_RAW		255		/* raw IP packet */
-#define	INET_ADDRSTRLEN		16
-#endif
-
-#if __BSD_VISIBLE
-/*
- * Constants and structures defined by the internet system,
- * Per RFC 790, September 1981, and numerous additions.
- */
-
-/*
- * Protocols (RFC 1700)
- */
-#define	IPPROTO_HOPOPTS		0		/* IP6 hop-by-hop options */
-#define	IPPROTO_IGMP		2		/* group mgmt protocol */
-#define	IPPROTO_GGP		3		/* gateway^2 (deprecated) */
-#define	IPPROTO_IPV4		4		/* IPv4 encapsulation */
-#define	IPPROTO_IPIP		IPPROTO_IPV4	/* for compatibility */
-#define	IPPROTO_ST		7		/* Stream protocol II */
-#define	IPPROTO_EGP		8		/* exterior gateway protocol */
-#define	IPPROTO_PIGP		9		/* private interior gateway */
-#define	IPPROTO_RCCMON		10		/* BBN RCC Monitoring */
-#define	IPPROTO_NVPII		11		/* network voice protocol*/
-#define	IPPROTO_PUP		12		/* pup */
-#define	IPPROTO_ARGUS		13		/* Argus */
-#define	IPPROTO_EMCON		14		/* EMCON */
-#define	IPPROTO_XNET		15		/* Cross Net Debugger */
-#define	IPPROTO_CHAOS		16		/* Chaos*/
-#define	IPPROTO_MUX		18		/* Multiplexing */
-#define	IPPROTO_MEAS		19		/* DCN Measurement Subsystems */
-#define	IPPROTO_HMP		20		/* Host Monitoring */
-#define	IPPROTO_PRM		21		/* Packet Radio Measurement */
-#define	IPPROTO_IDP		22		/* xns idp */
-#define	IPPROTO_TRUNK1		23		/* Trunk-1 */
-#define	IPPROTO_TRUNK2		24		/* Trunk-2 */
-#define	IPPROTO_LEAF1		25		/* Leaf-1 */
-#define	IPPROTO_LEAF2		26		/* Leaf-2 */
-#define	IPPROTO_RDP		27		/* Reliable Data */
-#define	IPPROTO_IRTP		28		/* Reliable Transaction */
-#define	IPPROTO_TP		29		/* tp-4 w/ class negotiation */
-#define	IPPROTO_BLT		30		/* Bulk Data Transfer */
-#define	IPPROTO_NSP		31		/* Network Services */
-#define	IPPROTO_INP		32		/* Merit Internodal */
-#define	IPPROTO_SEP		33		/* Sequential Exchange */
-#define	IPPROTO_3PC		34		/* Third Party Connect */
-#define	IPPROTO_IDPR		35		/* InterDomain Policy Routing */
-#define	IPPROTO_XTP		36		/* XTP */
-#define	IPPROTO_DDP		37		/* Datagram Delivery */
-#define	IPPROTO_CMTP		38		/* Control Message Transport */
-#define	IPPROTO_TPXX		39		/* TP++ Transport */
-#define	IPPROTO_IL		40		/* IL transport protocol */
-#define	IPPROTO_SDRP		42		/* Source Demand Routing */
-#define	IPPROTO_ROUTING		43		/* IP6 routing header */
-#define	IPPROTO_FRAGMENT	44		/* IP6 fragmentation header */
-#define	IPPROTO_IDRP		45		/* InterDomain Routing*/
-#define	IPPROTO_RSVP		46		/* resource reservation */
-#define	IPPROTO_GRE		47		/* General Routing Encap. */
-#define	IPPROTO_MHRP		48		/* Mobile Host Routing */
-#define	IPPROTO_BHA		49		/* BHA */
-#define	IPPROTO_ESP		50		/* IP6 Encap Sec. Payload */
-#define	IPPROTO_AH		51		/* IP6 Auth Header */
-#define	IPPROTO_INLSP		52		/* Integ. Net Layer Security */
-#define	IPPROTO_SWIPE		53		/* IP with encryption */
-#define	IPPROTO_NHRP		54		/* Next Hop Resolution */
-#define	IPPROTO_MOBILE		55		/* IP Mobility */
-#define	IPPROTO_TLSP		56		/* Transport Layer Security */
-#define	IPPROTO_SKIP		57		/* SKIP */
-#define	IPPROTO_ICMPV6		58		/* ICMP6 */
-#define	IPPROTO_NONE		59		/* IP6 no next header */
-#define	IPPROTO_DSTOPTS		60		/* IP6 destination option */
-#define	IPPROTO_AHIP		61		/* any host internal protocol */
-#define	IPPROTO_CFTP		62		/* CFTP */
-#define	IPPROTO_HELLO		63		/* "hello" routing protocol */
-#define	IPPROTO_SATEXPAK	64		/* SATNET/Backroom EXPAK */
-#define	IPPROTO_KRYPTOLAN	65		/* Kryptolan */
-#define	IPPROTO_RVD		66		/* Remote Virtual Disk */
-#define	IPPROTO_IPPC		67		/* Pluribus Packet Core */
-#define	IPPROTO_ADFS		68		/* Any distributed FS */
-#define	IPPROTO_SATMON		69		/* Satnet Monitoring */
-#define	IPPROTO_VISA		70		/* VISA Protocol */
-#define	IPPROTO_IPCV		71		/* Packet Core Utility */
-#define	IPPROTO_CPNX		72		/* Comp. Prot. Net. Executive */
-#define	IPPROTO_CPHB		73		/* Comp. Prot. HeartBeat */
-#define	IPPROTO_WSN		74		/* Wang Span Network */
-#define	IPPROTO_PVP		75		/* Packet Video Protocol */
-#define	IPPROTO_BRSATMON	76		/* BackRoom SATNET Monitoring */
-#define	IPPROTO_ND		77		/* Sun net disk proto (temp.) */
-#define	IPPROTO_WBMON		78		/* WIDEBAND Monitoring */
-#define	IPPROTO_WBEXPAK		79		/* WIDEBAND EXPAK */
-#define	IPPROTO_EON		80		/* ISO cnlp */
-#define	IPPROTO_VMTP		81		/* VMTP */
-#define	IPPROTO_SVMTP		82		/* Secure VMTP */
-#define	IPPROTO_VINES		83		/* Banyon VINES */
-#define	IPPROTO_TTP		84		/* TTP */
-#define	IPPROTO_IGP		85		/* NSFNET-IGP */
-#define	IPPROTO_DGP		86		/* dissimilar gateway prot. */
-#define	IPPROTO_TCF		87		/* TCF */
-#define	IPPROTO_IGRP		88		/* Cisco/GXS IGRP */
-#define	IPPROTO_OSPFIGP		89		/* OSPFIGP */
-#define	IPPROTO_SRPC		90		/* Strite RPC protocol */
-#define	IPPROTO_LARP		91		/* Locus Address Resoloution */
-#define	IPPROTO_MTP		92		/* Multicast Transport */
-#define	IPPROTO_AX25		93		/* AX.25 Frames */
-#define	IPPROTO_IPEIP		94		/* IP encapsulated in IP */
-#define	IPPROTO_MICP		95		/* Mobile Int.ing control */
-#define	IPPROTO_SCCSP		96		/* Semaphore Comm. security */
-#define	IPPROTO_ETHERIP		97		/* Ethernet IP encapsulation */
-#define	IPPROTO_ENCAP		98		/* encapsulation header */
-#define	IPPROTO_APES		99		/* any private encr. scheme */
-#define	IPPROTO_GMTP		100		/* GMTP*/
-#define	IPPROTO_IPCOMP		108		/* payload compression (IPComp) */
-#define	IPPROTO_SCTP		132		/* SCTP */
-#define	IPPROTO_MH		135		/* IPv6 Mobility Header */
-#define	IPPROTO_UDPLITE		136		/* UDP-Lite */
-#define	IPPROTO_HIP		139		/* IP6 Host Identity Protocol */
-#define	IPPROTO_SHIM6		140		/* IP6 Shim6 Protocol */
-/* 101-254: Partly Unassigned */
-#define	IPPROTO_PIM		103		/* Protocol Independent Mcast */
-#define	IPPROTO_CARP		112		/* CARP */
-#define	IPPROTO_PGM		113		/* PGM */
-#define	IPPROTO_MPLS		137		/* MPLS-in-IP */
-#define	IPPROTO_PFSYNC		240		/* PFSYNC */
-#define	IPPROTO_RESERVED_253	253		/* Reserved */
-#define	IPPROTO_RESERVED_254	254		/* Reserved */
-/* 255: Reserved */
-/* BSD Private, local use, namespace incursion, no longer used */
-#define	IPPROTO_OLD_DIVERT	254		/* OLD divert pseudo-proto */
-#define	IPPROTO_MAX		256
-
-/* last return value of *_input(), meaning "all job for this pkt is done".  */
-#define	IPPROTO_DONE		257
-
-/* Only used internally, so can be outside the range of valid IP protocols. */
-#define	IPPROTO_DIVERT		258		/* divert pseudo-protocol */
-#define	IPPROTO_SEND		259		/* SeND pseudo-protocol */
-
-/*
- * Defined to avoid confusion.  The master value is defined by
- * PROTO_SPACER in sys/protosw.h.
- */
-#define	IPPROTO_SPACER		32767		/* spacer for loadable protos */
-
-/*
- * Local port number conventions:
- *
- * When a user does a bind(2) or connect(2) with a port number of zero,
- * a non-conflicting local port address is chosen.
- * The default range is IPPORT_HIFIRSTAUTO through
- * IPPORT_HILASTAUTO, although that is settable by sysctl.
- *
- * A user may set the IPPROTO_IP option IP_PORTRANGE to change this
- * default assignment range.
- *
- * The value IP_PORTRANGE_DEFAULT causes the default behavior.
- *
- * The value IP_PORTRANGE_HIGH changes the range of candidate port numbers
- * into the "high" range.  These are reserved for client outbound connections
- * which do not want to be filtered by any firewalls.
- *
- * The value IP_PORTRANGE_LOW changes the range to the "low" are
- * that is (by convention) restricted to privileged processes.  This
- * convention is based on "vouchsafe" principles only.  It is only secure
- * if you trust the remote host to restrict these ports.
- *
- * The default range of ports and the high range can be changed by
- * sysctl(3).  (net.inet.ip.port{hi,low}{first,last}_auto)
- *
- * Changing those values has bad security implications if you are
- * using a stateless firewall that is allowing packets outside of that
- * range in order to allow transparent outgoing connections.
- *
- * Such a firewall configuration will generally depend on the use of these
- * default values.  If you change them, you may find your Security
- * Administrator looking for you with a heavy object.
- *
- * For a slightly more orthodox text view on this:
- *
- *            ftp://ftp.isi.edu/in-notes/iana/assignments/port-numbers
- *
- *    port numbers are divided into three ranges:
- *
- *                0 -  1023 Well Known Ports
- *             1024 - 49151 Registered Ports
- *            49152 - 65535 Dynamic and/or Private Ports
- *
- */
-
-/*
- * Ports < IPPORT_RESERVED are reserved for
- * privileged processes (e.g. root).         (IP_PORTRANGE_LOW)
- */
-#define	IPPORT_RESERVED		1024
-
-/*
- * Default local port range, used by IP_PORTRANGE_DEFAULT
- */
-#define IPPORT_EPHEMERALFIRST	10000
-#define IPPORT_EPHEMERALLAST	65535 
- 
-/*
- * Dynamic port range, used by IP_PORTRANGE_HIGH.
- */
-#define	IPPORT_HIFIRSTAUTO	49152
-#define	IPPORT_HILASTAUTO	65535
-
-/*
- * Scanning for a free reserved port return a value below IPPORT_RESERVED,
- * but higher than IPPORT_RESERVEDSTART.  Traditionally the start value was
- * 512, but that conflicts with some well-known-services that firewalls may
- * have a fit if we use.
- */
-#define	IPPORT_RESERVEDSTART	600
-
-#define	IPPORT_MAX		65535
-
-/*
- * Definitions of bits in internet address integers.
- * On subnets, the decomposition of addresses to host and net parts
- * is done according to subnet mask, not the masks here.
- */
-#define	IN_CLASSA(i)		(((uint32_t)(i) & 0x80000000) == 0)
-#define	IN_CLASSA_NET		0xff000000
-#define	IN_CLASSA_NSHIFT	24
-#define	IN_CLASSA_HOST		0x00ffffff
-#define	IN_CLASSA_MAX		128
-
-#define	IN_CLASSB(i)		(((uint32_t)(i) & 0xc0000000) == 0x80000000)
-#define	IN_CLASSB_NET		0xffff0000
-#define	IN_CLASSB_NSHIFT	16
-#define	IN_CLASSB_HOST		0x0000ffff
-#define	IN_CLASSB_MAX		65536
-
-#define	IN_CLASSC(i)		(((uint32_t)(i) & 0xe0000000) == 0xc0000000)
-#define	IN_CLASSC_NET		0xffffff00
-#define	IN_CLASSC_NSHIFT	8
-#define	IN_CLASSC_HOST		0x000000ff
-
-#define	IN_CLASSD(i)		(((uint32_t)(i) & 0xf0000000) == 0xe0000000)
-#define	IN_CLASSD_NET		0xf0000000	/* These ones aren't really */
-#define	IN_CLASSD_NSHIFT	28		/* net and host fields, but */
-#define	IN_CLASSD_HOST		0x0fffffff	/* routing needn't know.    */
-#define	IN_MULTICAST(i)		IN_CLASSD(i)
-
-#define	IN_EXPERIMENTAL(i)	(((uint32_t)(i) & 0xf0000000) == 0xf0000000)
-#define	IN_BADCLASS(i)		(((uint32_t)(i) & 0xf0000000) == 0xf0000000)
-
-#define IN_LINKLOCAL(i)		(((uint32_t)(i) & 0xffff0000) == 0xa9fe0000)
-#define IN_LOOPBACK(i)		(((uint32_t)(i) & 0xff000000) == 0x7f000000)
-#define IN_ZERONET(i)		(((uint32_t)(i) & 0xff000000) == 0)
-
-#define	IN_PRIVATE(i)	((((uint32_t)(i) & 0xff000000) == 0x0a000000) || \
-			 (((uint32_t)(i) & 0xfff00000) == 0xac100000) || \
-			 (((uint32_t)(i) & 0xffff0000) == 0xc0a80000))
-
-#define	IN_LOCAL_GROUP(i)	(((uint32_t)(i) & 0xffffff00) == 0xe0000000)
- 
-#define	IN_ANY_LOCAL(i)		(IN_LINKLOCAL(i) || IN_LOCAL_GROUP(i))
-
-#define	INADDR_LOOPBACK		(uint32_t)0x7f000001
-#ifndef _KERNEL
-#define	INADDR_NONE		0xffffffff		/* -1 return */
-#endif
-
-#define	INADDR_UNSPEC_GROUP	(uint32_t)0xe0000000	/* 224.0.0.0 */
-#define	INADDR_ALLHOSTS_GROUP	(uint32_t)0xe0000001	/* 224.0.0.1 */
-#define	INADDR_ALLRTRS_GROUP	(uint32_t)0xe0000002	/* 224.0.0.2 */
-#define	INADDR_ALLRPTS_GROUP	(uint32_t)0xe0000016	/* 224.0.0.22, IGMPv3 */
-#define	INADDR_CARP_GROUP	(uint32_t)0xe0000012	/* 224.0.0.18 */
-#define	INADDR_PFSYNC_GROUP	(uint32_t)0xe00000f0	/* 224.0.0.240 */
-#define	INADDR_ALLMDNS_GROUP	(uint32_t)0xe00000fb	/* 224.0.0.251 */
-#define	INADDR_MAX_LOCAL_GROUP	(uint32_t)0xe00000ff	/* 224.0.0.255 */
-
-#define	IN_LOOPBACKNET		127			/* official! */
-
-#define	IN_RFC3021_MASK		(uint32_t)0xfffffffe
-
-/*
- * Options for use with [gs]etsockopt at the IP level.
- * First word of comment is data type; bool is stored in int.
- */
-#define	IP_OPTIONS		1    /* buf/ip_opts; set/get IP options */
-#define	IP_HDRINCL		2    /* int; header is included with data */
-#define	IP_TOS			3    /* int; IP type of service and preced. */
-#define	IP_TTL			4    /* int; IP time to live */
-#define	IP_RECVOPTS		5    /* bool; receive all IP opts w/dgram */
-#define	IP_RECVRETOPTS		6    /* bool; receive IP opts for response */
-#define	IP_RECVDSTADDR		7    /* bool; receive IP dst addr w/dgram */
-#define	IP_SENDSRCADDR		IP_RECVDSTADDR /* cmsg_type to set src addr */
-#define	IP_RETOPTS		8    /* ip_opts; set/get IP options */
-#define	IP_MULTICAST_IF		9    /* struct in_addr *or* struct ip_mreqn;
-				      * set/get IP multicast i/f  */
-#define	IP_MULTICAST_TTL	10   /* u_char; set/get IP multicast ttl */
-#define	IP_MULTICAST_LOOP	11   /* u_char; set/get IP multicast loopback */
-#define	IP_ADD_MEMBERSHIP	12   /* ip_mreq; add an IP group membership */
-#define	IP_DROP_MEMBERSHIP	13   /* ip_mreq; drop an IP group membership */
-#define	IP_MULTICAST_VIF	14   /* set/get IP mcast virt. iface */
-#define	IP_RSVP_ON		15   /* enable RSVP in kernel */
-#define	IP_RSVP_OFF		16   /* disable RSVP in kernel */
-#define	IP_RSVP_VIF_ON		17   /* set RSVP per-vif socket */
-#define	IP_RSVP_VIF_OFF		18   /* unset RSVP per-vif socket */
-#define	IP_PORTRANGE		19   /* int; range to choose for unspec port */
-#define	IP_RECVIF		20   /* bool; receive reception if w/dgram */
-/* for IPSEC */
-#define	IP_IPSEC_POLICY		21   /* int; set/get security policy */
-#define	IP_FAITH		22   /* bool; accept FAITH'ed connections */
-
-#define	IP_ONESBCAST		23   /* bool: send all-ones broadcast */
-#define	IP_BINDANY		24   /* bool: allow bind to any address */
-
-/*
- * Options for controlling the firewall and dummynet.
- * Historical options (from 40 to 64) will eventually be
- * replaced by only two options, IP_FW3 and IP_DUMMYNET3.
- */
-#define	IP_FW_TABLE_ADD		40   /* add entry */
-#define	IP_FW_TABLE_DEL		41   /* delete entry */
-#define	IP_FW_TABLE_FLUSH	42   /* flush table */
-#define	IP_FW_TABLE_GETSIZE	43   /* get table size */
-#define	IP_FW_TABLE_LIST	44   /* list table contents */
-
-#define	IP_FW3			48   /* generic ipfw v.3 sockopts */
-#define	IP_DUMMYNET3		49   /* generic dummynet v.3 sockopts */
-
-#define	IP_FW_ADD		50   /* add a firewall rule to chain */
-#define	IP_FW_DEL		51   /* delete a firewall rule from chain */
-#define	IP_FW_FLUSH		52   /* flush firewall rule chain */
-#define	IP_FW_ZERO		53   /* clear single/all firewall counter(s) */
-#define	IP_FW_GET		54   /* get entire firewall rule chain */
-#define	IP_FW_RESETLOG		55   /* reset logging counters */
-
-#define IP_FW_NAT_CFG           56   /* add/config a nat rule */
-#define IP_FW_NAT_DEL           57   /* delete a nat rule */
-#define IP_FW_NAT_GET_CONFIG    58   /* get configuration of a nat rule */
-#define IP_FW_NAT_GET_LOG       59   /* get log of a nat rule */
-
-#define	IP_DUMMYNET_CONFIGURE	60   /* add/configure a dummynet pipe */
-#define	IP_DUMMYNET_DEL		61   /* delete a dummynet pipe from chain */
-#define	IP_DUMMYNET_FLUSH	62   /* flush dummynet */
-#define	IP_DUMMYNET_GET		64   /* get entire dummynet pipes */
-
-#define	IP_RECVTTL		65   /* bool; receive IP TTL w/dgram */
-#define	IP_MINTTL		66   /* minimum TTL for packet or drop */
-#define	IP_DONTFRAG		67   /* don't fragment packet */
-#define	IP_RECVTOS		68   /* bool; receive IP TOS w/dgram */
-
-/* IPv4 Source Filter Multicast API [RFC3678] */
-#define	IP_ADD_SOURCE_MEMBERSHIP	70   /* join a source-specific group */
-#define	IP_DROP_SOURCE_MEMBERSHIP	71   /* drop a single source */
-#define	IP_BLOCK_SOURCE			72   /* block a source */
-#define	IP_UNBLOCK_SOURCE		73   /* unblock a source */
-
-/* The following option is private; do not use it from user applications. */
-#define	IP_MSFILTER			74   /* set/get filter list */
-
-/* Protocol Independent Multicast API [RFC3678] */
-#define	MCAST_JOIN_GROUP		80   /* join an any-source group */
-#define	MCAST_LEAVE_GROUP		81   /* leave all sources for group */
-#define	MCAST_JOIN_SOURCE_GROUP		82   /* join a source-specific group */
-#define	MCAST_LEAVE_SOURCE_GROUP	83   /* leave a single source */
-#define	MCAST_BLOCK_SOURCE		84   /* block a source */
-#define	MCAST_UNBLOCK_SOURCE		85   /* unblock a source */
-
-/*
- * Defaults and limits for options
- */
-#define	IP_DEFAULT_MULTICAST_TTL  1	/* normally limit m'casts to 1 hop  */
-#define	IP_DEFAULT_MULTICAST_LOOP 1	/* normally hear sends if a member  */
-
-/*
- * The imo_membership vector for each socket is now dynamically allocated at
- * run-time, bounded by USHRT_MAX, and is reallocated when needed, sized
- * according to a power-of-two increment.
- */
-#define	IP_MIN_MEMBERSHIPS	31
-#define	IP_MAX_MEMBERSHIPS	4095
-#define	IP_MAX_SOURCE_FILTER	1024	/* XXX to be unused */
-
-/*
- * Default resource limits for IPv4 multicast source filtering.
- * These may be modified by sysctl.
- */
-#define	IP_MAX_GROUP_SRC_FILTER		512	/* sources per group */
-#define	IP_MAX_SOCK_SRC_FILTER		128	/* sources per socket/group */
-#define	IP_MAX_SOCK_MUTE_FILTER		128	/* XXX no longer used */
-
-/*
- * Argument structure for IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
- */
-struct ip_mreq {
-	struct	in_addr imr_multiaddr;	/* IP multicast address of group */
-	struct	in_addr imr_interface;	/* local IP address of interface */
-};
-
-/*
- * Modified argument structure for IP_MULTICAST_IF, obtained from Linux.
- * This is used to specify an interface index for multicast sends, as
- * the IPv4 legacy APIs do not support this (unless IP_SENDIF is available).
- */
-struct ip_mreqn {
-	struct	in_addr imr_multiaddr;	/* IP multicast address of group */
-	struct	in_addr imr_address;	/* local IP address of interface */
-	int		imr_ifindex;	/* Interface index; cast to uint32_t */
-};
-
-/*
- * Argument structure for IPv4 Multicast Source Filter APIs. [RFC3678]
- */
-struct ip_mreq_source {
-	struct	in_addr imr_multiaddr;	/* IP multicast address of group */
-	struct	in_addr imr_sourceaddr;	/* IP address of source */
-	struct	in_addr imr_interface;	/* local IP address of interface */
-};
-
-/*
- * Argument structures for Protocol-Independent Multicast Source
- * Filter APIs. [RFC3678]
- */
-struct group_req {
-	uint32_t		gr_interface;	/* interface index */
-	struct sockaddr_storage	gr_group;	/* group address */
-};
-
-struct group_source_req {
-	uint32_t		gsr_interface;	/* interface index */
-	struct sockaddr_storage	gsr_group;	/* group address */
-	struct sockaddr_storage	gsr_source;	/* source address */
-};
-
-#ifndef __MSFILTERREQ_DEFINED
-#define __MSFILTERREQ_DEFINED
-/*
- * The following structure is private; do not use it from user applications.
- * It is used to communicate IP_MSFILTER/IPV6_MSFILTER information between
- * the RFC 3678 libc functions and the kernel.
- */
-struct __msfilterreq {
-	uint32_t		 msfr_ifindex;	/* interface index */
-	uint32_t		 msfr_fmode;	/* filter mode for group */
-	uint32_t		 msfr_nsrcs;	/* # of sources in msfr_srcs */
-	struct sockaddr_storage	 msfr_group;	/* group address */
-	struct sockaddr_storage	*msfr_srcs;	/* pointer to the first member
-						 * of a contiguous array of
-						 * sources to filter in full.
-						 */
-};
-#endif
-
-struct sockaddr;
-
-/*
- * Advanced (Full-state) APIs [RFC3678]
- * The RFC specifies uint_t for the 6th argument to [sg]etsourcefilter().
- * We use uint32_t here to be consistent.
- */
-int	setipv4sourcefilter(int, struct in_addr, struct in_addr, uint32_t,
-	    uint32_t, struct in_addr *);
-int	getipv4sourcefilter(int, struct in_addr, struct in_addr, uint32_t *,
-	    uint32_t *, struct in_addr *);
-int	setsourcefilter(int, uint32_t, struct sockaddr *, socklen_t,
-	    uint32_t, uint32_t, struct sockaddr_storage *);
-int	getsourcefilter(int, uint32_t, struct sockaddr *, socklen_t,
-	    uint32_t *, uint32_t *, struct sockaddr_storage *);
-
-/*
- * Filter modes; also used to represent per-socket filter mode internally.
- */
-#define	MCAST_UNDEFINED	0	/* fmode: not yet defined */
-#define	MCAST_INCLUDE	1	/* fmode: include these source(s) */
-#define	MCAST_EXCLUDE	2	/* fmode: exclude these source(s) */
-
-/*
- * Argument for IP_PORTRANGE:
- * - which range to search when port is unspecified at bind() or connect()
- */
-#define	IP_PORTRANGE_DEFAULT	0	/* default range */
-#define	IP_PORTRANGE_HIGH	1	/* "high" - request firewall bypass */
-#define	IP_PORTRANGE_LOW	2	/* "low" - vouchsafe security */
-
-/*
- * Definitions for inet sysctl operations.
- *
- * Third level is protocol number.
- * Fourth level is desired variable within that protocol.
- */
-#define	IPPROTO_MAXID	(IPPROTO_AH + 1)	/* don't list to IPPROTO_MAX */
-
-#define	CTL_IPPROTO_NAMES { \
-	{ "ip", CTLTYPE_NODE }, \
-	{ "icmp", CTLTYPE_NODE }, \
-	{ "igmp", CTLTYPE_NODE }, \
-	{ "ggp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "tcp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ "egp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "udp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "idp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "ipsec", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "pim", CTLTYPE_NODE }, \
-}
-
-/*
- * Names for IP sysctl objects
- */
-#define	IPCTL_FORWARDING	1	/* act as router */
-#define	IPCTL_SENDREDIRECTS	2	/* may send redirects when forwarding */
-#define	IPCTL_DEFTTL		3	/* default TTL */
-#ifdef notyet
-#define	IPCTL_DEFMTU		4	/* default MTU */
-#endif
-#define	IPCTL_RTEXPIRE		5	/* cloned route expiration time */
-#define	IPCTL_RTMINEXPIRE	6	/* min value for expiration time */
-#define	IPCTL_RTMAXCACHE	7	/* trigger level for dynamic expire */
-#define	IPCTL_SOURCEROUTE	8	/* may perform source routes */
-#define	IPCTL_DIRECTEDBROADCAST	9	/* may re-broadcast received packets */
-#define	IPCTL_INTRQMAXLEN	10	/* max length of netisr queue */
-#define	IPCTL_INTRQDROPS	11	/* number of netisr q drops */
-#define	IPCTL_STATS		12	/* ipstat structure */
-#define	IPCTL_ACCEPTSOURCEROUTE	13	/* may accept source routed packets */
-#define	IPCTL_FASTFORWARDING	14	/* use fast IP forwarding code */
-#define	IPCTL_KEEPFAITH		15	/* FAITH IPv4->IPv6 translater ctl */
-#define	IPCTL_GIF_TTL		16	/* default TTL for gif encap packet */
-#define	IPCTL_MAXID		17
-
-#endif /* __BSD_VISIBLE */
-
-#ifdef _KERNEL
-
-struct ifnet; struct mbuf;	/* forward declarations for Standard C */
-
-int	 in_broadcast(struct in_addr, struct ifnet *);
-int	 in_canforward(struct in_addr);
-int	 in_localaddr(struct in_addr);
-int	 in_localip(struct in_addr);
-int	 inet_aton(const char *, struct in_addr *); /* in libkern */
-char	*inet_ntoa(struct in_addr); /* in libkern */
-char	*inet_ntoa_r(struct in_addr ina, char *buf); /* in libkern */
-char	*inet_ntop(int, const void *, char *, socklen_t); /* in libkern */
-int	 inet_pton(int af, const char *, void *); /* in libkern */
-void	 in_ifdetach(struct ifnet *);
-
-#define	in_hosteq(s, t)	((s).s_addr == (t).s_addr)
-#define	in_nullhost(x)	((x).s_addr == INADDR_ANY)
-#define	in_allhosts(x)	((x).s_addr == htonl(INADDR_ALLHOSTS_GROUP))
-
-#define	satosin(sa)	((struct sockaddr_in *)(sa))
-#define	sintosa(sin)	((struct sockaddr *)(sin))
-#define	ifatoia(ifa)	((struct in_ifaddr *)(ifa))
-#endif /* _KERNEL */
-
-/* INET6 stuff */
-#if __POSIX_VISIBLE >= 200112
-#define	__KAME_NETINET_IN_H_INCLUDED_
-#include <netinet6/in6.h>
-#undef __KAME_NETINET_IN_H_INCLUDED_
-#endif
-
-#endif /* !_NETINET_IN_H_*/
diff --git a/include.new/netinet/in_gif.h b/include.new/netinet/in_gif.h
deleted file mode 100644
index 0124dbb..0000000
--- a/include.new/netinet/in_gif.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$FreeBSD: src/sys/netinet/in_gif.h,v 1.12 2005/01/07 01:45:44 imp Exp $	*/
-/*	$KAME: in_gif.h,v 1.5 2000/04/14 08:36:02 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETINET_IN_GIF_H_
-#define _NETINET_IN_GIF_H_
-
-#define GIF_TTL		30
-
-struct gif_softc;
-void in_gif_input(struct mbuf *, int);
-int in_gif_output(struct ifnet *, int, struct mbuf *);
-int gif_encapcheck4(const struct mbuf *, int, int, void *);
-int in_gif_attach(struct gif_softc *);
-int in_gif_detach(struct gif_softc *);
-
-#endif /*_NETINET_IN_GIF_H_*/
diff --git a/include.new/netinet/in_kdtrace.h b/include.new/netinet/in_kdtrace.h
deleted file mode 100644
index efcbcca..0000000
--- a/include.new/netinet/in_kdtrace.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2013 Mark Johnston <markj@FreeBSD.org>
- *
- * 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.
- *
- * 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: releng/10.2/sys/netinet/in_kdtrace.h 260817 2014-01-17 10:58:59Z avg $
- */
-
-#ifndef _SYS_IN_KDTRACE_H_
-#define	_SYS_IN_KDTRACE_H_
-
-#define	IP_PROBE(probe, arg0, arg1, arg2, arg3, arg4, arg5)		\
-	SDT_PROBE6(ip, , , probe, arg0, arg1, arg2, arg3, arg4, arg5)
-#define	UDP_PROBE(probe, arg0, arg1, arg2, arg3, arg4)			\
-	SDT_PROBE5(udp, , , probe, arg0, arg1, arg2, arg3, arg4)
-#define	TCP_PROBE5(probe, arg0, arg1, arg2, arg3, arg4)			\
-	SDT_PROBE5(tcp, , , probe, arg0, arg1, arg2, arg3, arg4)
-#define	TCP_PROBE6(probe, arg0, arg1, arg2, arg3, arg4, arg5)		\
-	SDT_PROBE6(tcp, , , probe, arg0, arg1, arg2, arg3, arg4, arg5)
-
-SDT_PROVIDER_DECLARE(ip);
-SDT_PROVIDER_DECLARE(tcp);
-SDT_PROVIDER_DECLARE(udp);
-
-SDT_PROBE_DECLARE(ip, , , receive);
-SDT_PROBE_DECLARE(ip, , , send);
-
-SDT_PROBE_DECLARE(tcp, , , accept__established);
-SDT_PROBE_DECLARE(tcp, , , accept__refused);
-SDT_PROBE_DECLARE(tcp, , , connect__established);
-SDT_PROBE_DECLARE(tcp, , , connect__refused);
-SDT_PROBE_DECLARE(tcp, , , connect__request);
-SDT_PROBE_DECLARE(tcp, , , receive);
-SDT_PROBE_DECLARE(tcp, , , send);
-SDT_PROBE_DECLARE(tcp, , , state__change);
-
-SDT_PROBE_DECLARE(udp, , , receive);
-SDT_PROBE_DECLARE(udp, , , send);
-
-#endif
diff --git a/include.new/netinet/in_pcb.h b/include.new/netinet/in_pcb.h
deleted file mode 100644
index eaff1c2..0000000
--- a/include.new/netinet/in_pcb.h
+++ /dev/null
@@ -1,667 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993
- *	The Regents of the University of California.
- * Copyright (c) 2010-2011 Juniper Networks, Inc.
- * All rights reserved.
- *
- * Portions of this software were developed by Robert N. M. Watson under
- * contract to Juniper Networks, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/in_pcb.h 281955 2015-04-24 23:26:44Z hiren $
- */
-
-#ifndef _NETINET_IN_PCB_H_
-#define _NETINET_IN_PCB_H_
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/_rwlock.h>
-
-#ifdef _KERNEL
-#include <sys/lock.h>
-#include <sys/rwlock.h>
-#include <net/vnet.h>
-#include <vm/uma.h>
-#endif
-
-#define	in6pcb		inpcb	/* for KAME src sync over BSD*'s */
-#define	in6p_sp		inp_sp	/* for KAME src sync over BSD*'s */
-struct inpcbpolicy;
-
-/*
- * struct inpcb is the common protocol control block structure used in most
- * IP transport protocols.
- *
- * Pointers to local and foreign host table entries, local and foreign socket
- * numbers, and pointers up (to a socket structure) and down (to a
- * protocol-specific control block) are stored here.
- */
-LIST_HEAD(inpcbhead, inpcb);
-LIST_HEAD(inpcbporthead, inpcbport);
-typedef	u_quad_t	inp_gen_t;
-
-/*
- * PCB with AF_INET6 null bind'ed laddr can receive AF_INET input packet.
- * So, AF_INET6 null laddr is also used as AF_INET null laddr, by utilizing
- * the following structure.
- */
-struct in_addr_4in6 {
-	uint32_t	ia46_pad32[3];
-	struct	in_addr	ia46_addr4;
-};
-
-/*
- * NOTE: ipv6 addrs should be 64-bit aligned, per RFC 2553.  in_conninfo has
- * some extra padding to accomplish this.
- */
-struct in_endpoints {
-	u_int16_t	ie_fport;		/* foreign port */
-	u_int16_t	ie_lport;		/* local port */
-	/* protocol dependent part, local and foreign addr */
-	union {
-		/* foreign host table entry */
-		struct	in_addr_4in6 ie46_foreign;
-		struct	in6_addr ie6_foreign;
-	} ie_dependfaddr;
-	union {
-		/* local host table entry */
-		struct	in_addr_4in6 ie46_local;
-		struct	in6_addr ie6_local;
-	} ie_dependladdr;
-};
-#define	ie_faddr	ie_dependfaddr.ie46_foreign.ia46_addr4
-#define	ie_laddr	ie_dependladdr.ie46_local.ia46_addr4
-#define	ie6_faddr	ie_dependfaddr.ie6_foreign
-#define	ie6_laddr	ie_dependladdr.ie6_local
-
-/*
- * XXX The defines for inc_* are hacks and should be changed to direct
- * references.
- */
-struct in_conninfo {
-	u_int8_t	inc_flags;
-	u_int8_t	inc_len;
-	u_int16_t	inc_fibnum;	/* XXX was pad, 16 bits is plenty */
-	/* protocol dependent part */
-	struct	in_endpoints inc_ie;
-};
-
-/*
- * Flags for inc_flags.
- */
-#define	INC_ISIPV6	0x01
-
-#define inc_isipv6	inc_flags	/* temp compatability */
-#define	inc_fport	inc_ie.ie_fport
-#define	inc_lport	inc_ie.ie_lport
-#define	inc_faddr	inc_ie.ie_faddr
-#define	inc_laddr	inc_ie.ie_laddr
-#define	inc6_faddr	inc_ie.ie6_faddr
-#define	inc6_laddr	inc_ie.ie6_laddr
-
-struct	icmp6_filter;
-
-/*-
- * struct inpcb captures the network layer state for TCP, UDP, and raw IPv4
- * and IPv6 sockets.  In the case of TCP, further per-connection state is
- * hung off of inp_ppcb most of the time.  Almost all fields of struct inpcb
- * are static after creation or protected by a per-inpcb rwlock, inp_lock.  A
- * few fields also require the global pcbinfo lock for the inpcb to be held,
- * when modified, such as the global connection lists and hashes, as well as
- * binding information (which affects which hash a connection is on).  This
- * model means that connections can be looked up without holding the
- * per-connection lock, which is important for performance when attempting to
- * find the connection for a packet given its IP and port tuple.  Writing to
- * these fields that write locks be held on both the inpcb and global locks.
- *
- * Key:
- * (c) - Constant after initialization
- * (g) - Protected by the pcbgroup lock
- * (i) - Protected by the inpcb lock
- * (p) - Protected by the pcbinfo lock for the inpcb
- * (s) - Protected by another subsystem's locks
- * (x) - Undefined locking
- *
- * A few other notes:
- *
- * When a read lock is held, stability of the field is guaranteed; to write
- * to a field, a write lock must generally be held.
- *
- * netinet/netinet6-layer code should not assume that the inp_socket pointer
- * is safe to dereference without inp_lock being held, even for protocols
- * other than TCP (where the inpcb persists during TIMEWAIT even after the
- * socket has been freed), or there may be close(2)-related races.
- *
- * The inp_vflag field is overloaded, and would otherwise ideally be (c).
- */
-struct inpcb {
-	LIST_ENTRY(inpcb) inp_hash;	/* (i/p) hash list */
-	LIST_ENTRY(inpcb) inp_pcbgrouphash;	/* (g/i) hash list */
-	LIST_ENTRY(inpcb) inp_list;	/* (i/p) list for all PCBs for proto */
-	void	*inp_ppcb;		/* (i) pointer to per-protocol pcb */
-	struct	inpcbinfo *inp_pcbinfo;	/* (c) PCB list info */
-	struct	inpcbgroup *inp_pcbgroup; /* (g/i) PCB group list */
-	LIST_ENTRY(inpcb) inp_pcbgroup_wild; /* (g/i/p) group wildcard entry */
-	struct	socket *inp_socket;	/* (i) back pointer to socket */
-	struct	ucred	*inp_cred;	/* (c) cache of socket cred */
-	uint32_t inp_flow;		/* (i) IPv6 flow information */
-	int	inp_flags;		/* (i) generic IP/datagram flags */
-	int	inp_flags2;		/* (i) generic IP/datagram flags #2*/
-	u_char	inp_vflag;		/* (i) IP version flag (v4/v6) */
-	u_char	inp_ip_ttl;		/* (i) time to live proto */
-	u_char	inp_ip_p;		/* (c) protocol proto */
-	u_char	inp_ip_minttl;		/* (i) minimum TTL or drop */
-	uint32_t inp_flowid;		/* (x) flow id / queue id */
-	u_int	inp_refcount;		/* (i) refcount */
-	void	*inp_pspare[5];		/* (x) route caching / general use */
-	uint32_t inp_flowtype;		/* (x) M_HASHTYPE value */
-	u_int	inp_ispare[5];		/* (x) route caching / user cookie /
-					 *     general use */
-
-	/* Local and foreign ports, local and foreign addr. */
-	struct	in_conninfo inp_inc;	/* (i/p) list for PCB's local port */
-
-	/* MAC and IPSEC policy information. */
-	struct	label *inp_label;	/* (i) MAC label */
-	struct	inpcbpolicy *inp_sp;    /* (s) for IPSEC */
-
-	/* Protocol-dependent part; options. */
-	struct {
-		u_char	inp4_ip_tos;		/* (i) type of service proto */
-		struct	mbuf *inp4_options;	/* (i) IP options */
-		struct	ip_moptions *inp4_moptions; /* (i) IP mcast options */
-	} inp_depend4;
-	struct {
-		/* (i) IP options */
-		struct	mbuf *inp6_options;
-		/* (i) IP6 options for outgoing packets */
-		struct	ip6_pktopts *inp6_outputopts;
-		/* (i) IP multicast options */
-		struct	ip6_moptions *inp6_moptions;
-		/* (i) ICMPv6 code type filter */
-		struct	icmp6_filter *inp6_icmp6filt;
-		/* (i) IPV6_CHECKSUM setsockopt */
-		int	inp6_cksum;
-		short	inp6_hops;
-	} inp_depend6;
-	LIST_ENTRY(inpcb) inp_portlist;	/* (i/p) */
-	struct	inpcbport *inp_phd;	/* (i/p) head of this list */
-#define inp_zero_size offsetof(struct inpcb, inp_gencnt)
-	inp_gen_t	inp_gencnt;	/* (c) generation count */
-	struct llentry	*inp_lle;	/* cached L2 information */
-	struct rtentry	*inp_rt;	/* cached L3 information */
-	struct rwlock	inp_lock;
-};
-#define	inp_fport	inp_inc.inc_fport
-#define	inp_lport	inp_inc.inc_lport
-#define	inp_faddr	inp_inc.inc_faddr
-#define	inp_laddr	inp_inc.inc_laddr
-#define	inp_ip_tos	inp_depend4.inp4_ip_tos
-#define	inp_options	inp_depend4.inp4_options
-#define	inp_moptions	inp_depend4.inp4_moptions
-
-#define	in6p_faddr	inp_inc.inc6_faddr
-#define	in6p_laddr	inp_inc.inc6_laddr
-#define	in6p_hops	inp_depend6.inp6_hops	/* default hop limit */
-#define	in6p_flowinfo	inp_flow
-#define	in6p_options	inp_depend6.inp6_options
-#define	in6p_outputopts	inp_depend6.inp6_outputopts
-#define	in6p_moptions	inp_depend6.inp6_moptions
-#define	in6p_icmp6filt	inp_depend6.inp6_icmp6filt
-#define	in6p_cksum	inp_depend6.inp6_cksum
-
-#define	inp_vnet	inp_pcbinfo->ipi_vnet
-
-/*
- * The range of the generation count, as used in this implementation, is 9e19.
- * We would have to create 300 billion connections per second for this number
- * to roll over in a year.  This seems sufficiently unlikely that we simply
- * don't concern ourselves with that possibility.
- */
-
-/*
- * Interface exported to userland by various protocols which use inpcbs.  Hack
- * alert -- only define if struct xsocket is in scope.
- */
-#ifdef _SYS_SOCKETVAR_H_
-struct	xinpcb {
-	size_t	xi_len;		/* length of this structure */
-	struct	inpcb xi_inp;
-	struct	xsocket xi_socket;
-	u_quad_t	xi_alignment_hack;
-};
-
-struct	xinpgen {
-	size_t	xig_len;	/* length of this structure */
-	u_int	xig_count;	/* number of PCBs at this time */
-	inp_gen_t xig_gen;	/* generation count at this time */
-	so_gen_t xig_sogen;	/* socket generation count at this time */
-};
-#endif /* _SYS_SOCKETVAR_H_ */
-
-struct inpcbport {
-	LIST_ENTRY(inpcbport) phd_hash;
-	struct inpcbhead phd_pcblist;
-	u_short phd_port;
-};
-
-/*-
- * Global data structure for each high-level protocol (UDP, TCP, ...) in both
- * IPv4 and IPv6.  Holds inpcb lists and information for managing them.
- *
- * Each pcbinfo is protected by two locks: ipi_lock and ipi_hash_lock,
- * the former covering mutable global fields (such as the global pcb list),
- * and the latter covering the hashed lookup tables.  The lock order is:
- *
- *    ipi_lock (before) inpcb locks (before) {ipi_hash_lock, pcbgroup locks}
- *
- * Locking key:
- *
- * (c) Constant or nearly constant after initialisation
- * (g) Locked by ipi_lock
- * (h) Read using either ipi_hash_lock or inpcb lock; write requires both
- * (p) Protected by one or more pcbgroup locks
- * (x) Synchronisation properties poorly defined
- */
-struct inpcbinfo {
-	/*
-	 * Global lock protecting global inpcb list, inpcb count, etc.
-	 */
-	struct rwlock		 ipi_lock;
-
-	/*
-	 * Global list of inpcbs on the protocol.
-	 */
-	struct inpcbhead	*ipi_listhead;		/* (g) */
-	u_int			 ipi_count;		/* (g) */
-
-	/*
-	 * Generation count -- incremented each time a connection is allocated
-	 * or freed.
-	 */
-	u_quad_t		 ipi_gencnt;		/* (g) */
-
-	/*
-	 * Fields associated with port lookup and allocation.
-	 */
-	u_short			 ipi_lastport;		/* (x) */
-	u_short			 ipi_lastlow;		/* (x) */
-	u_short			 ipi_lasthi;		/* (x) */
-
-	/*
-	 * UMA zone from which inpcbs are allocated for this protocol.
-	 */
-	struct	uma_zone	*ipi_zone;		/* (c) */
-
-	/*
-	 * Connection groups associated with this protocol.  These fields are
-	 * constant, but pcbgroup structures themselves are protected by
-	 * per-pcbgroup locks.
-	 */
-	struct inpcbgroup	*ipi_pcbgroups;		/* (c) */
-	u_int			 ipi_npcbgroups;	/* (c) */
-	u_int			 ipi_hashfields;	/* (c) */
-
-	/*
-	 * Global lock protecting non-pcbgroup hash lookup tables.
-	 */
-	struct rwlock		 ipi_hash_lock;
-
-	/*
-	 * Global hash of inpcbs, hashed by local and foreign addresses and
-	 * port numbers.
-	 */
-	struct inpcbhead	*ipi_hashbase;		/* (h) */
-	u_long			 ipi_hashmask;		/* (h) */
-
-	/*
-	 * Global hash of inpcbs, hashed by only local port number.
-	 */
-	struct inpcbporthead	*ipi_porthashbase;	/* (h) */
-	u_long			 ipi_porthashmask;	/* (h) */
-
-	/*
-	 * List of wildcard inpcbs for use with pcbgroups.  In the past, was
-	 * per-pcbgroup but is now global.  All pcbgroup locks must be held
-	 * to modify the list, so any is sufficient to read it.
-	 */
-	struct inpcbhead	*ipi_wildbase;		/* (p) */
-	u_long			 ipi_wildmask;		/* (p) */
-
-	/*
-	 * Pointer to network stack instance
-	 */
-	struct vnet		*ipi_vnet;		/* (c) */
-
-	/*
-	 * general use 2
-	 */
-	void 			*ipi_pspare[2];
-};
-
-#ifdef _KERNEL
-/*
- * Connection groups hold sets of connections that have similar CPU/thread
- * affinity.  Each connection belongs to exactly one connection group.
- */
-struct inpcbgroup {
-	/*
-	 * Per-connection group hash of inpcbs, hashed by local and foreign
-	 * addresses and port numbers.
-	 */
-	struct inpcbhead	*ipg_hashbase;		/* (c) */
-	u_long			 ipg_hashmask;		/* (c) */
-
-	/*
-	 * Notional affinity of this pcbgroup.
-	 */
-	u_int			 ipg_cpu;		/* (p) */
-
-	/*
-	 * Per-connection group lock, not to be confused with ipi_lock.
-	 * Protects the hash table hung off the group, but also the global
-	 * wildcard list in inpcbinfo.
-	 */
-	struct mtx		 ipg_lock;
-} __aligned(CACHE_LINE_SIZE);
-
-#define INP_LOCK_INIT(inp, d, t) \
-	rw_init_flags(&(inp)->inp_lock, (t), RW_RECURSE |  RW_DUPOK)
-#define INP_LOCK_DESTROY(inp)	rw_destroy(&(inp)->inp_lock)
-#define INP_RLOCK(inp)		rw_rlock(&(inp)->inp_lock)
-#define INP_WLOCK(inp)		rw_wlock(&(inp)->inp_lock)
-#define INP_TRY_RLOCK(inp)	rw_try_rlock(&(inp)->inp_lock)
-#define INP_TRY_WLOCK(inp)	rw_try_wlock(&(inp)->inp_lock)
-#define INP_RUNLOCK(inp)	rw_runlock(&(inp)->inp_lock)
-#define INP_WUNLOCK(inp)	rw_wunlock(&(inp)->inp_lock)
-#define	INP_TRY_UPGRADE(inp)	rw_try_upgrade(&(inp)->inp_lock)
-#define	INP_DOWNGRADE(inp)	rw_downgrade(&(inp)->inp_lock)
-#define	INP_WLOCKED(inp)	rw_wowned(&(inp)->inp_lock)
-#define	INP_LOCK_ASSERT(inp)	rw_assert(&(inp)->inp_lock, RA_LOCKED)
-#define	INP_RLOCK_ASSERT(inp)	rw_assert(&(inp)->inp_lock, RA_RLOCKED)
-#define	INP_WLOCK_ASSERT(inp)	rw_assert(&(inp)->inp_lock, RA_WLOCKED)
-#define	INP_UNLOCK_ASSERT(inp)	rw_assert(&(inp)->inp_lock, RA_UNLOCKED)
-
-/*
- * These locking functions are for inpcb consumers outside of sys/netinet,
- * more specifically, they were added for the benefit of TOE drivers. The
- * macros are reserved for use by the stack.
- */
-void inp_wlock(struct inpcb *);
-void inp_wunlock(struct inpcb *);
-void inp_rlock(struct inpcb *);
-void inp_runlock(struct inpcb *);
-
-#ifdef INVARIANTS
-void inp_lock_assert(struct inpcb *);
-void inp_unlock_assert(struct inpcb *);
-#else
-static __inline void
-inp_lock_assert(struct inpcb *inp __unused)
-{
-}
-
-static __inline void
-inp_unlock_assert(struct inpcb *inp __unused)
-{
-}
-
-#endif
-
-void	inp_apply_all(void (*func)(struct inpcb *, void *), void *arg);
-int 	inp_ip_tos_get(const struct inpcb *inp);
-void 	inp_ip_tos_set(struct inpcb *inp, int val);
-struct socket *
-	inp_inpcbtosocket(struct inpcb *inp);
-struct tcpcb *
-	inp_inpcbtotcpcb(struct inpcb *inp);
-void 	inp_4tuple_get(struct inpcb *inp, uint32_t *laddr, uint16_t *lp,
-		uint32_t *faddr, uint16_t *fp);
-short	inp_so_options(const struct inpcb *inp);
-
-#endif /* _KERNEL */
-
-#define INP_INFO_LOCK_INIT(ipi, d) \
-	rw_init_flags(&(ipi)->ipi_lock, (d), RW_RECURSE)
-#define INP_INFO_LOCK_DESTROY(ipi)  rw_destroy(&(ipi)->ipi_lock)
-#define INP_INFO_RLOCK(ipi)	rw_rlock(&(ipi)->ipi_lock)
-#define INP_INFO_WLOCK(ipi)	rw_wlock(&(ipi)->ipi_lock)
-#define INP_INFO_TRY_RLOCK(ipi)	rw_try_rlock(&(ipi)->ipi_lock)
-#define INP_INFO_TRY_WLOCK(ipi)	rw_try_wlock(&(ipi)->ipi_lock)
-#define INP_INFO_TRY_UPGRADE(ipi)	rw_try_upgrade(&(ipi)->ipi_lock)
-#define INP_INFO_RUNLOCK(ipi)	rw_runlock(&(ipi)->ipi_lock)
-#define INP_INFO_WUNLOCK(ipi)	rw_wunlock(&(ipi)->ipi_lock)
-#define	INP_INFO_LOCK_ASSERT(ipi)	rw_assert(&(ipi)->ipi_lock, RA_LOCKED)
-#define INP_INFO_RLOCK_ASSERT(ipi)	rw_assert(&(ipi)->ipi_lock, RA_RLOCKED)
-#define INP_INFO_WLOCK_ASSERT(ipi)	rw_assert(&(ipi)->ipi_lock, RA_WLOCKED)
-#define INP_INFO_UNLOCK_ASSERT(ipi)	rw_assert(&(ipi)->ipi_lock, RA_UNLOCKED)
-
-#define	INP_HASH_LOCK_INIT(ipi, d) \
-	rw_init_flags(&(ipi)->ipi_hash_lock, (d), 0)
-#define	INP_HASH_LOCK_DESTROY(ipi)	rw_destroy(&(ipi)->ipi_hash_lock)
-#define	INP_HASH_RLOCK(ipi)		rw_rlock(&(ipi)->ipi_hash_lock)
-#define	INP_HASH_WLOCK(ipi)		rw_wlock(&(ipi)->ipi_hash_lock)
-#define	INP_HASH_RUNLOCK(ipi)		rw_runlock(&(ipi)->ipi_hash_lock)
-#define	INP_HASH_WUNLOCK(ipi)		rw_wunlock(&(ipi)->ipi_hash_lock)
-#define	INP_HASH_LOCK_ASSERT(ipi)	rw_assert(&(ipi)->ipi_hash_lock, \
-					    RA_LOCKED)
-#define	INP_HASH_WLOCK_ASSERT(ipi)	rw_assert(&(ipi)->ipi_hash_lock, \
-					    RA_WLOCKED)
-
-#define	INP_GROUP_LOCK_INIT(ipg, d)	mtx_init(&(ipg)->ipg_lock, (d), NULL, \
-					    MTX_DEF | MTX_DUPOK)
-#define	INP_GROUP_LOCK_DESTROY(ipg)	mtx_destroy(&(ipg)->ipg_lock)
-
-#define	INP_GROUP_LOCK(ipg)		mtx_lock(&(ipg)->ipg_lock)
-#define	INP_GROUP_LOCK_ASSERT(ipg)	mtx_assert(&(ipg)->ipg_lock, MA_OWNED)
-#define	INP_GROUP_UNLOCK(ipg)		mtx_unlock(&(ipg)->ipg_lock)
-
-#define INP_PCBHASH(faddr, lport, fport, mask) \
-	(((faddr) ^ ((faddr) >> 16) ^ ntohs((lport) ^ (fport))) & (mask))
-#define INP_PCBPORTHASH(lport, mask) \
-	(ntohs((lport)) & (mask))
-
-/*
- * Flags for inp_vflags -- historically version flags only
- */
-#define	INP_IPV4	0x1
-#define	INP_IPV6	0x2
-#define	INP_IPV6PROTO	0x4		/* opened under IPv6 protocol */
-
-/*
- * Flags for inp_flags.
- */
-#define	INP_RECVOPTS		0x00000001 /* receive incoming IP options */
-#define	INP_RECVRETOPTS		0x00000002 /* receive IP options for reply */
-#define	INP_RECVDSTADDR		0x00000004 /* receive IP dst address */
-#define	INP_HDRINCL		0x00000008 /* user supplies entire IP header */
-#define	INP_HIGHPORT		0x00000010 /* user wants "high" port binding */
-#define	INP_LOWPORT		0x00000020 /* user wants "low" port binding */
-#define	INP_ANONPORT		0x00000040 /* port chosen for user */
-#define	INP_RECVIF		0x00000080 /* receive incoming interface */
-#define	INP_MTUDISC		0x00000100 /* user can do MTU discovery */
-#define	INP_FAITH		0x00000200 /* accept FAITH'ed connections */
-#define	INP_RECVTTL		0x00000400 /* receive incoming IP TTL */
-#define	INP_DONTFRAG		0x00000800 /* don't fragment packet */
-#define	INP_BINDANY		0x00001000 /* allow bind to any address */
-#define	INP_INHASHLIST		0x00002000 /* in_pcbinshash() has been called */
-#define	INP_RECVTOS		0x00004000 /* receive incoming IP TOS */
-#define	IN6P_IPV6_V6ONLY	0x00008000 /* restrict AF_INET6 socket for v6 */
-#define	IN6P_PKTINFO		0x00010000 /* receive IP6 dst and I/F */
-#define	IN6P_HOPLIMIT		0x00020000 /* receive hoplimit */
-#define	IN6P_HOPOPTS		0x00040000 /* receive hop-by-hop options */
-#define	IN6P_DSTOPTS		0x00080000 /* receive dst options after rthdr */
-#define	IN6P_RTHDR		0x00100000 /* receive routing header */
-#define	IN6P_RTHDRDSTOPTS	0x00200000 /* receive dstoptions before rthdr */
-#define	IN6P_TCLASS		0x00400000 /* receive traffic class value */
-#define	IN6P_AUTOFLOWLABEL	0x00800000 /* attach flowlabel automatically */
-#define	INP_TIMEWAIT		0x01000000 /* in TIMEWAIT, ppcb is tcptw */
-#define	INP_ONESBCAST		0x02000000 /* send all-ones broadcast */
-#define	INP_DROPPED		0x04000000 /* protocol drop flag */
-#define	INP_SOCKREF		0x08000000 /* strong socket reference */
-#define	INP_RESERVED_0          0x10000000 /* reserved field */
-#define	INP_RESERVED_1          0x20000000 /* reserved field */
-#define	IN6P_RFC2292		0x40000000 /* used RFC2292 API on the socket */
-#define	IN6P_MTU		0x80000000 /* receive path MTU */
-
-#define	INP_CONTROLOPTS		(INP_RECVOPTS|INP_RECVRETOPTS|INP_RECVDSTADDR|\
-				 INP_RECVIF|INP_RECVTTL|INP_RECVTOS|\
-				 IN6P_PKTINFO|IN6P_HOPLIMIT|IN6P_HOPOPTS|\
-				 IN6P_DSTOPTS|IN6P_RTHDR|IN6P_RTHDRDSTOPTS|\
-				 IN6P_TCLASS|IN6P_AUTOFLOWLABEL|IN6P_RFC2292|\
-				 IN6P_MTU)
-
-/*
- * Flags for inp_flags2.
- */
-#define	INP_LLE_VALID		0x00000001 /* cached lle is valid */	
-#define	INP_RT_VALID		0x00000002 /* cached rtentry is valid */
-#define	INP_PCBGROUPWILD	0x00000004 /* in pcbgroup wildcard list */
-#define	INP_REUSEPORT		0x00000008 /* SO_REUSEPORT option is set */
-#define	INP_FREED		0x00000010 /* inp itself is not valid */
-#define	INP_REUSEADDR		0x00000020 /* SO_REUSEADDR option is set */
-
-/*
- * Flags passed to in_pcblookup*() functions.
- */
-#define	INPLOOKUP_WILDCARD	0x00000001	/* Allow wildcard sockets. */
-#define	INPLOOKUP_RLOCKPCB	0x00000002	/* Return inpcb read-locked. */
-#define	INPLOOKUP_WLOCKPCB	0x00000004	/* Return inpcb write-locked. */
-
-#define	INPLOOKUP_MASK	(INPLOOKUP_WILDCARD | INPLOOKUP_RLOCKPCB | \
-			    INPLOOKUP_WLOCKPCB)
-
-#define	sotoinpcb(so)	((struct inpcb *)(so)->so_pcb)
-#define	sotoin6pcb(so)	sotoinpcb(so) /* for KAME src sync over BSD*'s */
-
-#define	INP_SOCKAF(so) so->so_proto->pr_domain->dom_family
-
-#define	INP_CHECK_SOCKAF(so, af)	(INP_SOCKAF(so) == af)
-
-/*
- * Constants for pcbinfo.ipi_hashfields.
- */
-#define	IPI_HASHFIELDS_NONE	0
-#define	IPI_HASHFIELDS_2TUPLE	1
-#define	IPI_HASHFIELDS_4TUPLE	2
-
-#ifdef _KERNEL
-VNET_DECLARE(int, ipport_reservedhigh);
-VNET_DECLARE(int, ipport_reservedlow);
-VNET_DECLARE(int, ipport_lowfirstauto);
-VNET_DECLARE(int, ipport_lowlastauto);
-VNET_DECLARE(int, ipport_firstauto);
-VNET_DECLARE(int, ipport_lastauto);
-VNET_DECLARE(int, ipport_hifirstauto);
-VNET_DECLARE(int, ipport_hilastauto);
-VNET_DECLARE(int, ipport_randomized);
-VNET_DECLARE(int, ipport_randomcps);
-VNET_DECLARE(int, ipport_randomtime);
-VNET_DECLARE(int, ipport_stoprandom);
-VNET_DECLARE(int, ipport_tcpallocs);
-
-#define	V_ipport_reservedhigh	VNET(ipport_reservedhigh)
-#define	V_ipport_reservedlow	VNET(ipport_reservedlow)
-#define	V_ipport_lowfirstauto	VNET(ipport_lowfirstauto)
-#define	V_ipport_lowlastauto	VNET(ipport_lowlastauto)
-#define	V_ipport_firstauto	VNET(ipport_firstauto)
-#define	V_ipport_lastauto	VNET(ipport_lastauto)
-#define	V_ipport_hifirstauto	VNET(ipport_hifirstauto)
-#define	V_ipport_hilastauto	VNET(ipport_hilastauto)
-#define	V_ipport_randomized	VNET(ipport_randomized)
-#define	V_ipport_randomcps	VNET(ipport_randomcps)
-#define	V_ipport_randomtime	VNET(ipport_randomtime)
-#define	V_ipport_stoprandom	VNET(ipport_stoprandom)
-#define	V_ipport_tcpallocs	VNET(ipport_tcpallocs)
-
-void	in_pcbinfo_destroy(struct inpcbinfo *);
-void	in_pcbinfo_init(struct inpcbinfo *, const char *, struct inpcbhead *,
-	    int, int, char *, uma_init, uma_fini, uint32_t, u_int);
-
-struct inpcbgroup *
-	in_pcbgroup_byhash(struct inpcbinfo *, u_int, uint32_t);
-struct inpcbgroup *
-	in_pcbgroup_byinpcb(struct inpcb *);
-struct inpcbgroup *
-	in_pcbgroup_bytuple(struct inpcbinfo *, struct in_addr, u_short,
-	    struct in_addr, u_short);
-void	in_pcbgroup_destroy(struct inpcbinfo *);
-int	in_pcbgroup_enabled(struct inpcbinfo *);
-void	in_pcbgroup_init(struct inpcbinfo *, u_int, int);
-void	in_pcbgroup_remove(struct inpcb *);
-void	in_pcbgroup_update(struct inpcb *);
-void	in_pcbgroup_update_mbuf(struct inpcb *, struct mbuf *);
-
-void	in_pcbpurgeif0(struct inpcbinfo *, struct ifnet *);
-int	in_pcballoc(struct socket *, struct inpcbinfo *);
-int	in_pcbbind(struct inpcb *, struct sockaddr *, struct ucred *);
-int	in_pcb_lport(struct inpcb *, struct in_addr *, u_short *,
-	    struct ucred *, int);
-int	in_pcbbind_setup(struct inpcb *, struct sockaddr *, in_addr_t *,
-	    u_short *, struct ucred *);
-int	in_pcbconnect(struct inpcb *, struct sockaddr *, struct ucred *);
-int	in_pcbconnect_mbuf(struct inpcb *, struct sockaddr *, struct ucred *,
-	    struct mbuf *);
-int	in_pcbconnect_setup(struct inpcb *, struct sockaddr *, in_addr_t *,
-	    u_short *, in_addr_t *, u_short *, struct inpcb **,
-	    struct ucred *);
-void	in_pcbdetach(struct inpcb *);
-void	in_pcbdisconnect(struct inpcb *);
-void	in_pcbdrop(struct inpcb *);
-void	in_pcbfree(struct inpcb *);
-int	in_pcbinshash(struct inpcb *);
-int	in_pcbinshash_nopcbgroup(struct inpcb *);
-int	in_pcbladdr(struct inpcb *, struct in_addr *, struct in_addr *,
-	    struct ucred *);
-struct inpcb *
-	in_pcblookup_local(struct inpcbinfo *,
-	    struct in_addr, u_short, int, struct ucred *);
-struct inpcb *
-	in_pcblookup(struct inpcbinfo *, struct in_addr, u_int,
-	    struct in_addr, u_int, int, struct ifnet *);
-struct inpcb *
-	in_pcblookup_mbuf(struct inpcbinfo *, struct in_addr, u_int,
-	    struct in_addr, u_int, int, struct ifnet *, struct mbuf *);
-void	in_pcbnotifyall(struct inpcbinfo *pcbinfo, struct in_addr,
-	    int, struct inpcb *(*)(struct inpcb *, int));
-void	in_pcbref(struct inpcb *);
-void	in_pcbrehash(struct inpcb *);
-void	in_pcbrehash_mbuf(struct inpcb *, struct mbuf *);
-int	in_pcbrele(struct inpcb *);
-int	in_pcbrele_rlocked(struct inpcb *);
-int	in_pcbrele_wlocked(struct inpcb *);
-void	in_pcbsetsolabel(struct socket *so);
-int	in_getpeeraddr(struct socket *so, struct sockaddr **nam);
-int	in_getsockaddr(struct socket *so, struct sockaddr **nam);
-struct sockaddr *
-	in_sockaddr(in_port_t port, struct in_addr *addr);
-void	in_pcbsosetlabel(struct socket *so);
-#endif /* _KERNEL */
-
-#endif /* !_NETINET_IN_PCB_H_ */
diff --git a/include.new/netinet/in_systm.h b/include.new/netinet/in_systm.h
deleted file mode 100644
index 721f282..0000000
--- a/include.new/netinet/in_systm.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)in_systm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/in_systm.h 188578 2009-02-13 15:14:43Z luigi $
- */
-
-#ifndef _NETINET_IN_SYSTM_H_
-#define _NETINET_IN_SYSTM_H_
-
-/*
- * Miscellaneous internetwork
- * definitions for kernel.
- */
-
-/*
- * Network types.
- *
- * Internally the system keeps counters in the headers with the bytes
- * swapped so that VAX instructions will work on them.  It reverses
- * the bytes before transmission at each protocol level.  The n_ types
- * represent the types with the bytes in ``high-ender'' order.
- */
-typedef u_int16_t n_short;		/* short as received from the net */
-typedef uint32_t n_long;		/* long as received from the net */
-
-typedef	uint32_t n_time;		/* ms since 00:00 GMT, byte rev */
-
-#ifdef _KERNEL
-uint32_t	 iptime(void);
-#endif
-
-#endif
diff --git a/include.new/netinet/in_var.h b/include.new/netinet/in_var.h
deleted file mode 100644
index 3ac3ecd..0000000
--- a/include.new/netinet/in_var.h
+++ /dev/null
@@ -1,480 +0,0 @@
-/*-
- * Copyright (c) 1985, 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.
- * 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.
- *
- *	@(#)in_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/netinet/in_var.h 250300 2013-05-06 16:42:18Z andre $
- */
-
-#ifndef _NETINET_IN_VAR_H_
-#define _NETINET_IN_VAR_H_
-
-#include <sys/queue.h>
-#include <sys/fnv_hash.h>
-#include <sys/tree.h>
-
-struct igmp_ifinfo;
-struct in_multi;
-struct lltable;
-
-/*
- * IPv4 per-interface state.
- */
-struct in_ifinfo {
-	struct lltable		*ii_llt;	/* ARP state */
-	struct igmp_ifinfo	*ii_igmp;	/* IGMP state */
-	struct in_multi		*ii_allhosts;	/* 224.0.0.1 membership */
-};
-
-/*
- * Interface address, Internet version.  One of these structures
- * is allocated for each Internet address on an interface.
- * The ifaddr structure contains the protocol-independent part
- * of the structure and is assumed to be first.
- */
-struct in_ifaddr {
-	struct	ifaddr ia_ifa;		/* protocol-independent info */
-#define	ia_ifp		ia_ifa.ifa_ifp
-#define ia_flags	ia_ifa.ifa_flags
-					/* ia_subnet{,mask} in host order */
-	u_long	ia_subnet;		/* subnet address */
-	u_long	ia_subnetmask;		/* mask of subnet */
-	LIST_ENTRY(in_ifaddr) ia_hash;	/* entry in bucket of inet addresses */
-	TAILQ_ENTRY(in_ifaddr) ia_link;	/* list of internet addresses */
-	struct	sockaddr_in ia_addr;	/* reserve space for interface name */
-	struct	sockaddr_in ia_dstaddr; /* reserve space for broadcast addr */
-#define	ia_broadaddr	ia_dstaddr
-	struct	sockaddr_in ia_sockmask; /* reserve space for general netmask */
-};
-
-struct	in_aliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr_in ifra_addr;
-	struct	sockaddr_in ifra_broadaddr;
-#define ifra_dstaddr ifra_broadaddr
-	struct	sockaddr_in ifra_mask;
-	int	ifra_vhid;
-};
-/*
- * Given a pointer to an in_ifaddr (ifaddr),
- * return a pointer to the addr as a sockaddr_in.
- */
-#define IA_SIN(ia)    (&(((struct in_ifaddr *)(ia))->ia_addr))
-#define IA_DSTSIN(ia) (&(((struct in_ifaddr *)(ia))->ia_dstaddr))
-#define IA_MASKSIN(ia) (&(((struct in_ifaddr *)(ia))->ia_sockmask))
-
-#define IN_LNAOF(in, ifa) \
-	((ntohl((in).s_addr) & ~((struct in_ifaddr *)(ifa)->ia_subnetmask))
-
-
-#ifdef	_KERNEL
-extern	u_char	inetctlerrmap[];
-
-#define LLTABLE(ifp)	\
-	((struct in_ifinfo *)(ifp)->if_afdata[AF_INET])->ii_llt
-/*
- * Hash table for IP addresses.
- */
-TAILQ_HEAD(in_ifaddrhead, in_ifaddr);
-LIST_HEAD(in_ifaddrhashhead, in_ifaddr);
-
-VNET_DECLARE(struct in_ifaddrhashhead *, in_ifaddrhashtbl);
-VNET_DECLARE(struct in_ifaddrhead, in_ifaddrhead);
-VNET_DECLARE(u_long, in_ifaddrhmask);		/* mask for hash table */
-
-#define	V_in_ifaddrhashtbl	VNET(in_ifaddrhashtbl)
-#define	V_in_ifaddrhead		VNET(in_ifaddrhead)
-#define	V_in_ifaddrhmask	VNET(in_ifaddrhmask)
-
-#define INADDR_NHASH_LOG2       9
-#define INADDR_NHASH		(1 << INADDR_NHASH_LOG2)
-#define INADDR_HASHVAL(x)	fnv_32_buf((&(x)), sizeof(x), FNV1_32_INIT)
-#define INADDR_HASH(x) \
-	(&V_in_ifaddrhashtbl[INADDR_HASHVAL(x) & V_in_ifaddrhmask])
-
-extern	struct rwlock in_ifaddr_lock;
-
-#define	IN_IFADDR_LOCK_ASSERT()	rw_assert(&in_ifaddr_lock, RA_LOCKED)
-#define	IN_IFADDR_RLOCK()	rw_rlock(&in_ifaddr_lock)
-#define	IN_IFADDR_RLOCK_ASSERT()	rw_assert(&in_ifaddr_lock, RA_RLOCKED)
-#define	IN_IFADDR_RUNLOCK()	rw_runlock(&in_ifaddr_lock)
-#define	IN_IFADDR_WLOCK()	rw_wlock(&in_ifaddr_lock)
-#define	IN_IFADDR_WLOCK_ASSERT()	rw_assert(&in_ifaddr_lock, RA_WLOCKED)
-#define	IN_IFADDR_WUNLOCK()	rw_wunlock(&in_ifaddr_lock)
-
-/*
- * Macro for finding the internet address structure (in_ifaddr)
- * corresponding to one of our IP addresses (in_addr).
- */
-#define INADDR_TO_IFADDR(addr, ia) \
-	/* struct in_addr addr; */ \
-	/* struct in_ifaddr *ia; */ \
-do { \
-\
-	LIST_FOREACH(ia, INADDR_HASH((addr).s_addr), ia_hash) \
-		if (IA_SIN(ia)->sin_addr.s_addr == (addr).s_addr) \
-			break; \
-} while (0)
-
-/*
- * Macro for finding the interface (ifnet structure) corresponding to one
- * of our IP addresses.
- */
-#define INADDR_TO_IFP(addr, ifp) \
-	/* struct in_addr addr; */ \
-	/* struct ifnet *ifp; */ \
-{ \
-	struct in_ifaddr *ia; \
-\
-	INADDR_TO_IFADDR(addr, ia); \
-	(ifp) = (ia == NULL) ? NULL : ia->ia_ifp; \
-}
-
-/*
- * Macro for finding the internet address structure (in_ifaddr) corresponding
- * to a given interface (ifnet structure).
- */
-#define IFP_TO_IA(ifp, ia)						\
-	/* struct ifnet *ifp; */					\
-	/* struct in_ifaddr *ia; */					\
-do {									\
-	IN_IFADDR_RLOCK();						\
-	for ((ia) = TAILQ_FIRST(&V_in_ifaddrhead);			\
-	    (ia) != NULL && (ia)->ia_ifp != (ifp);			\
-	    (ia) = TAILQ_NEXT((ia), ia_link))				\
-		continue;						\
-	if ((ia) != NULL)						\
-		ifa_ref(&(ia)->ia_ifa);					\
-	IN_IFADDR_RUNLOCK();						\
-} while (0)
-#endif
-
-/*
- * IP datagram reassembly.
- */
-#define	IPREASS_NHASH_LOG2	6
-#define	IPREASS_NHASH		(1 << IPREASS_NHASH_LOG2)
-#define	IPREASS_HMASK		(IPREASS_NHASH - 1)
-#define	IPREASS_HASH(x,y) \
-	(((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK)
-
-/*
- * Legacy IPv4 IGMP per-link structure.
- */
-struct router_info {
-	struct ifnet *rti_ifp;
-	int    rti_type; /* type of router which is querier on this interface */
-	int    rti_time; /* # of slow timeouts since last old query */
-	SLIST_ENTRY(router_info) rti_list;
-};
-
-/*
- * Per-interface IGMP router version information.
- */
-struct igmp_ifinfo {
-	LIST_ENTRY(igmp_ifinfo) igi_link;
-	struct ifnet *igi_ifp;	/* interface this instance belongs to */
-	uint32_t igi_version;	/* IGMPv3 Host Compatibility Mode */
-	uint32_t igi_v1_timer;	/* IGMPv1 Querier Present timer (s) */
-	uint32_t igi_v2_timer;	/* IGMPv2 Querier Present timer (s) */
-	uint32_t igi_v3_timer;	/* IGMPv3 General Query (interface) timer (s)*/
-	uint32_t igi_flags;	/* IGMP per-interface flags */
-	uint32_t igi_rv;	/* IGMPv3 Robustness Variable */
-	uint32_t igi_qi;	/* IGMPv3 Query Interval (s) */
-	uint32_t igi_qri;	/* IGMPv3 Query Response Interval (s) */
-	uint32_t igi_uri;	/* IGMPv3 Unsolicited Report Interval (s) */
-	SLIST_HEAD(,in_multi)	igi_relinmhead; /* released groups */
-	struct ifqueue	 igi_gq;	/* queue of general query responses */
-};
-
-#define IGIF_SILENT	0x00000001	/* Do not use IGMP on this ifp */
-#define IGIF_LOOPBACK	0x00000002	/* Send IGMP reports to loopback */
-
-/*
- * IPv4 multicast IGMP-layer source entry.
- */
-struct ip_msource {
-	RB_ENTRY(ip_msource)	ims_link;	/* RB tree links */
-	in_addr_t		ims_haddr;	/* host byte order */
-	struct ims_st {
-		uint16_t	ex;		/* # of exclusive members */
-		uint16_t	in;		/* # of inclusive members */
-	}			ims_st[2];	/* state at t0, t1 */
-	uint8_t			ims_stp;	/* pending query */
-};
-
-/*
- * IPv4 multicast PCB-layer source entry.
- */
-struct in_msource {
-	RB_ENTRY(ip_msource)	ims_link;	/* RB tree links */
-	in_addr_t		ims_haddr;	/* host byte order */
-	uint8_t			imsl_st[2];	/* state before/at commit */
-};
-
-RB_HEAD(ip_msource_tree, ip_msource);	/* define struct ip_msource_tree */
-
-static __inline int
-ip_msource_cmp(const struct ip_msource *a, const struct ip_msource *b)
-{
-
-	if (a->ims_haddr < b->ims_haddr)
-		return (-1);
-	if (a->ims_haddr == b->ims_haddr)
-		return (0);
-	return (1);
-}
-RB_PROTOTYPE(ip_msource_tree, ip_msource, ims_link, ip_msource_cmp);
-
-/*
- * IPv4 multicast PCB-layer group filter descriptor.
- */
-struct in_mfilter {
-	struct ip_msource_tree	imf_sources; /* source list for (S,G) */
-	u_long			imf_nsrc;    /* # of source entries */
-	uint8_t			imf_st[2];   /* state before/at commit */
-};
-
-/*
- * IPv4 group descriptor.
- *
- * For every entry on an ifnet's if_multiaddrs list which represents
- * an IP multicast group, there is one of these structures.
- *
- * If any source filters are present, then a node will exist in the RB-tree
- * to permit fast lookup by source whenever an operation takes place.
- * This permits pre-order traversal when we issue reports.
- * Source filter trees are kept separately from the socket layer to
- * greatly simplify locking.
- *
- * When IGMPv3 is active, inm_timer is the response to group query timer.
- * The state-change timer inm_sctimer is separate; whenever state changes
- * for the group the state change record is generated and transmitted,
- * and kept if retransmissions are necessary.
- *
- * FUTURE: inm_link is now only used when groups are being purged
- * on a detaching ifnet. It could be demoted to a SLIST_ENTRY, but
- * because it is at the very start of the struct, we can't do this
- * w/o breaking the ABI for ifmcstat.
- */
-struct in_multi {
-	LIST_ENTRY(in_multi) inm_link;	/* to-be-released by in_ifdetach */
-	struct	in_addr inm_addr;	/* IP multicast address, convenience */
-	struct	ifnet *inm_ifp;		/* back pointer to ifnet */
-	struct	ifmultiaddr *inm_ifma;	/* back pointer to ifmultiaddr */
-	u_int	inm_timer;		/* IGMPv1/v2 group / v3 query timer */
-	u_int	inm_state;		/* state of the membership */
-	void	*inm_rti;		/* unused, legacy field */
-	u_int	inm_refcount;		/* reference count */
-
-	/* New fields for IGMPv3 follow. */
-	struct igmp_ifinfo	*inm_igi;	/* IGMP info */
-	SLIST_ENTRY(in_multi)	 inm_nrele;	/* to-be-released by IGMP */
-	struct ip_msource_tree	 inm_srcs;	/* tree of sources */
-	u_long			 inm_nsrc;	/* # of tree entries */
-
-	struct ifqueue		 inm_scq;	/* queue of pending
-						 * state-change packets */
-	struct timeval		 inm_lastgsrtv;	/* Time of last G-S-R query */
-	uint16_t		 inm_sctimer;	/* state-change timer */
-	uint16_t		 inm_scrv;	/* state-change rexmit count */
-
-	/*
-	 * SSM state counters which track state at T0 (the time the last
-	 * state-change report's RV timer went to zero) and T1
-	 * (time of pending report, i.e. now).
-	 * Used for computing IGMPv3 state-change reports. Several refcounts
-	 * are maintained here to optimize for common use-cases.
-	 */
-	struct inm_st {
-		uint16_t	iss_fmode;	/* IGMP filter mode */
-		uint16_t	iss_asm;	/* # of ASM listeners */
-		uint16_t	iss_ex;		/* # of exclusive members */
-		uint16_t	iss_in;		/* # of inclusive members */
-		uint16_t	iss_rec;	/* # of recorded sources */
-	}			inm_st[2];	/* state at t0, t1 */
-};
-
-/*
- * Helper function to derive the filter mode on a source entry
- * from its internal counters. Predicates are:
- *  A source is only excluded if all listeners exclude it.
- *  A source is only included if no listeners exclude it,
- *  and at least one listener includes it.
- * May be used by ifmcstat(8).
- */
-static __inline uint8_t
-ims_get_mode(const struct in_multi *inm, const struct ip_msource *ims,
-    uint8_t t)
-{
-
-	t = !!t;
-	if (inm->inm_st[t].iss_ex > 0 &&
-	    inm->inm_st[t].iss_ex == ims->ims_st[t].ex)
-		return (MCAST_EXCLUDE);
-	else if (ims->ims_st[t].in > 0 && ims->ims_st[t].ex == 0)
-		return (MCAST_INCLUDE);
-	return (MCAST_UNDEFINED);
-}
-
-#ifdef _KERNEL
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_inet);
-SYSCTL_DECL(_net_inet_ip);
-SYSCTL_DECL(_net_inet_raw);
-#endif
-
-/*
- * Lock macros for IPv4 layer multicast address lists.  IPv4 lock goes
- * before link layer multicast locks in the lock order.  In most cases,
- * consumers of IN_*_MULTI() macros should acquire the locks before
- * calling them; users of the in_{add,del}multi() functions should not.
- */
-extern struct mtx in_multi_mtx;
-#define	IN_MULTI_LOCK()		mtx_lock(&in_multi_mtx)
-#define	IN_MULTI_UNLOCK()	mtx_unlock(&in_multi_mtx)
-#define	IN_MULTI_LOCK_ASSERT()	mtx_assert(&in_multi_mtx, MA_OWNED)
-#define	IN_MULTI_UNLOCK_ASSERT() mtx_assert(&in_multi_mtx, MA_NOTOWNED)
-
-/*
- * Function for looking up an in_multi record for an IPv4 multicast address
- * on a given interface. ifp must be valid. If no record found, return NULL.
- * The IN_MULTI_LOCK and IF_ADDR_LOCK on ifp must be held.
- */
-static __inline struct in_multi *
-inm_lookup_locked(struct ifnet *ifp, const struct in_addr ina)
-{
-	struct ifmultiaddr *ifma;
-	struct in_multi *inm;
-
-	IN_MULTI_LOCK_ASSERT();
-	IF_ADDR_LOCK_ASSERT(ifp);
-
-	inm = NULL;
-	TAILQ_FOREACH(ifma, &((ifp)->if_multiaddrs), ifma_link) {
-		if (ifma->ifma_addr->sa_family == AF_INET) {
-			inm = (struct in_multi *)ifma->ifma_protospec;
-			if (inm->inm_addr.s_addr == ina.s_addr)
-				break;
-			inm = NULL;
-		}
-	}
-	return (inm);
-}
-
-/*
- * Wrapper for inm_lookup_locked().
- * The IF_ADDR_LOCK will be taken on ifp and released on return.
- */
-static __inline struct in_multi *
-inm_lookup(struct ifnet *ifp, const struct in_addr ina)
-{
-	struct in_multi *inm;
-
-	IN_MULTI_LOCK_ASSERT();
-	IF_ADDR_RLOCK(ifp);
-	inm = inm_lookup_locked(ifp, ina);
-	IF_ADDR_RUNLOCK(ifp);
-
-	return (inm);
-}
-
-/* Acquire an in_multi record. */
-static __inline void
-inm_acquire_locked(struct in_multi *inm)
-{
-
-	IN_MULTI_LOCK_ASSERT();
-	++inm->inm_refcount;
-}
-
-/*
- * Return values for imo_multi_filter().
- */
-#define MCAST_PASS		0	/* Pass */
-#define MCAST_NOTGMEMBER	1	/* This host not a member of group */
-#define MCAST_NOTSMEMBER	2	/* This host excluded source */
-#define MCAST_MUTED		3	/* [deprecated] */
-
-struct	rtentry;
-struct	route;
-struct	ip_moptions;
-struct radix_node_head;
-
-int	imo_multi_filter(const struct ip_moptions *, const struct ifnet *,
-	    const struct sockaddr *, const struct sockaddr *);
-void	inm_commit(struct in_multi *);
-void	inm_clear_recorded(struct in_multi *);
-void	inm_print(const struct in_multi *);
-int	inm_record_source(struct in_multi *inm, const in_addr_t);
-void	inm_release(struct in_multi *);
-void	inm_release_locked(struct in_multi *);
-struct	in_multi *
-	in_addmulti(struct in_addr *, struct ifnet *);
-void	in_delmulti(struct in_multi *);
-int	in_joingroup(struct ifnet *, const struct in_addr *,
-	    /*const*/ struct in_mfilter *, struct in_multi **);
-int	in_joingroup_locked(struct ifnet *, const struct in_addr *,
-	    /*const*/ struct in_mfilter *, struct in_multi **);
-int	in_leavegroup(struct in_multi *, /*const*/ struct in_mfilter *);
-int	in_leavegroup_locked(struct in_multi *,
-	    /*const*/ struct in_mfilter *);
-int	in_control(struct socket *, u_long, caddr_t, struct ifnet *,
-	    struct thread *);
-void	in_rtqdrain(void);
-int	in_addprefix(struct in_ifaddr *, int);
-int	in_scrubprefix(struct in_ifaddr *, u_int);
-void	ip_input(struct mbuf *);
-int	in_ifadown(struct ifaddr *ifa, int);
-void	in_ifscrub(struct ifnet *, struct in_ifaddr *, u_int);
-struct	mbuf	*ip_fastforward(struct mbuf *);
-void	*in_domifattach(struct ifnet *);
-void	in_domifdetach(struct ifnet *, void *);
-
-
-/* XXX */
-void	 in_rtalloc_ign(struct route *ro, u_long ignflags, u_int fibnum);
-void	 in_rtalloc(struct route *ro, u_int fibnum);
-struct rtentry *in_rtalloc1(struct sockaddr *, int, u_long, u_int);
-void	 in_rtredirect(struct sockaddr *, struct sockaddr *,
-	    struct sockaddr *, int, struct sockaddr *, u_int);
-int	 in_rtrequest(int, struct sockaddr *,
-	    struct sockaddr *, struct sockaddr *, int, struct rtentry **, u_int);
-void	in_setmatchfunc(struct radix_node_head *, int);
-
-#if 0
-int	 in_rt_getifa(struct rt_addrinfo *, u_int fibnum);
-int	 in_rtioctl(u_long, caddr_t, u_int);
-int	 in_rtrequest1(int, struct rt_addrinfo *, struct rtentry **, u_int);
-#endif
-#endif /* _KERNEL */
-
-/* INET6 stuff */
-#include <netinet6/in6_var.h>
-
-#endif /* _NETINET_IN_VAR_H_ */
diff --git a/include.new/netinet/ip.h b/include.new/netinet/ip.h
deleted file mode 100644
index 6223513..0000000
--- a/include.new/netinet/ip.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)ip.h	8.2 (Berkeley) 6/1/94
- * $FreeBSD: releng/10.2/sys/netinet/ip.h 284099 2015-06-06 20:14:58Z ian $
- */
-
-#ifndef _NETINET_IP_H_
-#define	_NETINET_IP_H_
-
-#include <sys/cdefs.h>
-
-/*
- * Definitions for internet protocol version 4.
- *
- * Per RFC 791, September 1981.
- */
-#define	IPVERSION	4
-
-/*
- * Structure of an internet header, naked of options.
- */
-struct ip {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	ip_hl:4,		/* header length */
-		ip_v:4;			/* version */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	ip_v:4,			/* version */
-		ip_hl:4;		/* header length */
-#endif
-	u_char	ip_tos;			/* type of service */
-	u_short	ip_len;			/* total length */
-	u_short	ip_id;			/* identification */
-	u_short	ip_off;			/* fragment offset field */
-#define	IP_RF 0x8000			/* reserved fragment flag */
-#define	IP_DF 0x4000			/* dont fragment flag */
-#define	IP_MF 0x2000			/* more fragments flag */
-#define	IP_OFFMASK 0x1fff		/* mask for fragmenting bits */
-	u_char	ip_ttl;			/* time to live */
-	u_char	ip_p;			/* protocol */
-	u_short	ip_sum;			/* checksum */
-	struct	in_addr ip_src,ip_dst;	/* source and dest address */
-} __packed __aligned(2);
-
-#define	IP_MAXPACKET	65535		/* maximum packet size */
-
-/*
- * Definitions for IP type of service (ip_tos).
- */
-#define	IPTOS_LOWDELAY		0x10
-#define	IPTOS_THROUGHPUT	0x08
-#define	IPTOS_RELIABILITY	0x04
-#define	IPTOS_MINCOST		0x02
-
-/*
- * Definitions for IP precedence (also in ip_tos) (hopefully unused).
- */
-#define	IPTOS_PREC_NETCONTROL		0xe0
-#define	IPTOS_PREC_INTERNETCONTROL	0xc0
-#define	IPTOS_PREC_CRITIC_ECP		0xa0
-#define	IPTOS_PREC_FLASHOVERRIDE	0x80
-#define	IPTOS_PREC_FLASH		0x60
-#define	IPTOS_PREC_IMMEDIATE		0x40
-#define	IPTOS_PREC_PRIORITY		0x20
-#define	IPTOS_PREC_ROUTINE		0x00
-
-/*
- * Definitions for DiffServ Codepoints as per RFC2474
- */
-#define	IPTOS_DSCP_CS0		0x00
-#define	IPTOS_DSCP_CS1		0x20
-#define	IPTOS_DSCP_AF11		0x28
-#define	IPTOS_DSCP_AF12		0x30
-#define	IPTOS_DSCP_AF13		0x38
-#define	IPTOS_DSCP_CS2		0x40
-#define	IPTOS_DSCP_AF21		0x48
-#define	IPTOS_DSCP_AF22		0x50
-#define	IPTOS_DSCP_AF23		0x58
-#define	IPTOS_DSCP_CS3		0x60
-#define	IPTOS_DSCP_AF31		0x68
-#define	IPTOS_DSCP_AF32		0x70
-#define	IPTOS_DSCP_AF33		0x78
-#define	IPTOS_DSCP_CS4		0x80
-#define	IPTOS_DSCP_AF41		0x88
-#define	IPTOS_DSCP_AF42		0x90
-#define	IPTOS_DSCP_AF43		0x98
-#define	IPTOS_DSCP_CS5		0xa0
-#define	IPTOS_DSCP_EF		0xb8
-#define	IPTOS_DSCP_CS6		0xc0
-#define	IPTOS_DSCP_CS7		0xe0
-
-/*
- * ECN (Explicit Congestion Notification) codepoints in RFC3168 mapped to the
- * lower 2 bits of the TOS field.
- */
-#define	IPTOS_ECN_NOTECT	0x00	/* not-ECT */
-#define	IPTOS_ECN_ECT1		0x01	/* ECN-capable transport (1) */
-#define	IPTOS_ECN_ECT0		0x02	/* ECN-capable transport (0) */
-#define	IPTOS_ECN_CE		0x03	/* congestion experienced */
-#define	IPTOS_ECN_MASK		0x03	/* ECN field mask */
-
-/*
- * Definitions for options.
- */
-#define	IPOPT_COPIED(o)		((o)&0x80)
-#define	IPOPT_CLASS(o)		((o)&0x60)
-#define	IPOPT_NUMBER(o)		((o)&0x1f)
-
-#define	IPOPT_CONTROL		0x00
-#define	IPOPT_RESERVED1		0x20
-#define	IPOPT_DEBMEAS		0x40
-#define	IPOPT_RESERVED2		0x60
-
-#define	IPOPT_EOL		0		/* end of option list */
-#define	IPOPT_NOP		1		/* no operation */
-
-#define	IPOPT_RR		7		/* record packet route */
-#define	IPOPT_TS		68		/* timestamp */
-#define	IPOPT_SECURITY		130		/* provide s,c,h,tcc */
-#define	IPOPT_LSRR		131		/* loose source route */
-#define	IPOPT_ESO		133		/* extended security */
-#define	IPOPT_CIPSO		134		/* commerical security */
-#define	IPOPT_SATID		136		/* satnet id */
-#define	IPOPT_SSRR		137		/* strict source route */
-#define	IPOPT_RA		148		/* router alert */
-
-/*
- * Offsets to fields in options other than EOL and NOP.
- */
-#define	IPOPT_OPTVAL		0		/* option ID */
-#define	IPOPT_OLEN		1		/* option length */
-#define	IPOPT_OFFSET		2		/* offset within option */
-#define	IPOPT_MINOFF		4		/* min value of above */
-
-/*
- * Time stamp option structure.
- */
-struct	ip_timestamp {
-	u_char	ipt_code;		/* IPOPT_TS */
-	u_char	ipt_len;		/* size of structure (variable) */
-	u_char	ipt_ptr;		/* index of current entry */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	ipt_flg:4,		/* flags, see below */
-		ipt_oflw:4;		/* overflow counter */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	ipt_oflw:4,		/* overflow counter */
-		ipt_flg:4;		/* flags, see below */
-#endif
-	union ipt_timestamp {
-		uint32_t	ipt_time[1];	/* network format */
-		struct	ipt_ta {
-			struct in_addr ipt_addr;
-			uint32_t ipt_time;	/* network format */
-		} ipt_ta[1];
-	} ipt_timestamp;
-};
-
-/* Flag bits for ipt_flg. */
-#define	IPOPT_TS_TSONLY		0		/* timestamps only */
-#define	IPOPT_TS_TSANDADDR	1		/* timestamps and addresses */
-#define	IPOPT_TS_PRESPEC	3		/* specified modules only */
-
-/* Bits for security (not byte swapped). */
-#define	IPOPT_SECUR_UNCLASS	0x0000
-#define	IPOPT_SECUR_CONFID	0xf135
-#define	IPOPT_SECUR_EFTO	0x789a
-#define	IPOPT_SECUR_MMMM	0xbc4d
-#define	IPOPT_SECUR_RESTR	0xaf13
-#define	IPOPT_SECUR_SECRET	0xd788
-#define	IPOPT_SECUR_TOPSECRET	0x6bc5
-
-/*
- * Internet implementation parameters.
- */
-#define	MAXTTL		255		/* maximum time to live (seconds) */
-#define	IPDEFTTL	64		/* default ttl, from RFC 1340 */
-#define	IPFRAGTTL	60		/* time to live for frags, slowhz */
-#define	IPTTLDEC	1		/* subtracted when forwarding */
-#define	IP_MSS		576		/* default maximum segment size */
-
-/*
- * This is the real IPv4 pseudo header, used for computing the TCP and UDP
- * checksums. For the Internet checksum, struct ipovly can be used instead.
- * For stronger checksums, the real thing must be used.
- */
-struct ippseudo {
-	struct	in_addr	ippseudo_src;	/* source internet address */
-	struct	in_addr	ippseudo_dst;	/* destination internet address */
-	u_char		ippseudo_pad;	/* pad, must be zero */
-	u_char		ippseudo_p;	/* protocol */
-	u_short		ippseudo_len;	/* protocol length */
-};
-#endif
diff --git a/include.new/netinet/ip6.h b/include.new/netinet/ip6.h
deleted file mode 100644
index 8e8bd5f..0000000
--- a/include.new/netinet/ip6.h
+++ /dev/null
@@ -1,352 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netinet/ip6.h 249294 2013-04-09 07:11:22Z ae $	*/
-/*	$KAME: ip6.h,v 1.18 2001/03/29 05:34:30 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*-
- * 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.
- * 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.
- *
- *	@(#)ip.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef _NETINET_IP6_H_
-#define _NETINET_IP6_H_
-
-/*
- * Definition for internet protocol version 6.
- * RFC 2460
- */
-
-struct ip6_hdr {
-	union {
-		struct ip6_hdrctl {
-			uint32_t ip6_un1_flow;	/* 20 bits of flow-ID */
-			u_int16_t ip6_un1_plen;	/* payload length */
-			u_int8_t  ip6_un1_nxt;	/* next header */
-			u_int8_t  ip6_un1_hlim;	/* hop limit */
-		} ip6_un1;
-		u_int8_t ip6_un2_vfc;	/* 4 bits version, top 4 bits class */
-	} ip6_ctlun;
-	struct in6_addr ip6_src;	/* source address */
-	struct in6_addr ip6_dst;	/* destination address */
-} __packed;
-
-#define ip6_vfc		ip6_ctlun.ip6_un2_vfc
-#define ip6_flow	ip6_ctlun.ip6_un1.ip6_un1_flow
-#define ip6_plen	ip6_ctlun.ip6_un1.ip6_un1_plen
-#define ip6_nxt		ip6_ctlun.ip6_un1.ip6_un1_nxt
-#define ip6_hlim	ip6_ctlun.ip6_un1.ip6_un1_hlim
-#define ip6_hops	ip6_ctlun.ip6_un1.ip6_un1_hlim
-
-#define IPV6_VERSION		0x60
-#define IPV6_VERSION_MASK	0xf0
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IPV6_FLOWINFO_MASK	0x0fffffff	/* flow info (28 bits) */
-#define IPV6_FLOWLABEL_MASK	0x000fffff	/* flow label (20 bits) */
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define IPV6_FLOWINFO_MASK	0xffffff0f	/* flow info (28 bits) */
-#define IPV6_FLOWLABEL_MASK	0xffff0f00	/* flow label (20 bits) */
-#endif /* LITTLE_ENDIAN */
-#endif
-#if 1
-/* ECN bits proposed by Sally Floyd */
-#define IP6TOS_CE		0x01	/* congestion experienced */
-#define IP6TOS_ECT		0x02	/* ECN-capable transport */
-#endif
-
-/*
- * Extension Headers
- */
-
-struct	ip6_ext {
-	u_int8_t ip6e_nxt;
-	u_int8_t ip6e_len;
-} __packed;
-
-/* Hop-by-Hop options header */
-/* XXX should we pad it to force alignment on an 8-byte boundary? */
-struct ip6_hbh {
-	u_int8_t ip6h_nxt;	/* next header */
-	u_int8_t ip6h_len;	/* length in units of 8 octets */
-	/* followed by options */
-} __packed;
-
-/* Destination options header */
-/* XXX should we pad it to force alignment on an 8-byte boundary? */
-struct ip6_dest {
-	u_int8_t ip6d_nxt;	/* next header */
-	u_int8_t ip6d_len;	/* length in units of 8 octets */
-	/* followed by options */
-} __packed;
-
-/* Option types and related macros */
-#define IP6OPT_PAD1		0x00	/* 00 0 00000 */
-#define IP6OPT_PADN		0x01	/* 00 0 00001 */
-#define IP6OPT_JUMBO		0xC2	/* 11 0 00010 = 194 */
-#define IP6OPT_NSAP_ADDR	0xC3	/* 11 0 00011 */
-#define IP6OPT_TUNNEL_LIMIT	0x04	/* 00 0 00100 */
-#ifndef _KERNEL
-#define IP6OPT_RTALERT		0x05	/* 00 0 00101 (KAME definition) */
-#endif
-#define IP6OPT_ROUTER_ALERT	0x05	/* 00 0 00101 (RFC3542, recommended) */
-
-#define IP6OPT_RTALERT_LEN	4
-#define IP6OPT_RTALERT_MLD	0	/* Datagram contains an MLD message */
-#define IP6OPT_RTALERT_RSVP	1	/* Datagram contains an RSVP message */
-#define IP6OPT_RTALERT_ACTNET	2 	/* contains an Active Networks msg */
-#define IP6OPT_MINLEN		2
-
-#define IP6OPT_EID		0x8a	/* 10 0 01010 */
-
-#define IP6OPT_TYPE(o)		((o) & 0xC0)
-#define IP6OPT_TYPE_SKIP	0x00
-#define IP6OPT_TYPE_DISCARD	0x40
-#define IP6OPT_TYPE_FORCEICMP	0x80
-#define IP6OPT_TYPE_ICMP	0xC0
-
-#define IP6OPT_MUTABLE		0x20
-
-/* IPv6 options: common part */
-struct ip6_opt {
-	u_int8_t ip6o_type;
-	u_int8_t ip6o_len;
-} __packed;
-
-/* Jumbo Payload Option */
-struct ip6_opt_jumbo {
-	u_int8_t ip6oj_type;
-	u_int8_t ip6oj_len;
-	u_int8_t ip6oj_jumbo_len[4];
-} __packed;
-#define IP6OPT_JUMBO_LEN	6
-
-/* NSAP Address Option */
-struct ip6_opt_nsap {
-	u_int8_t ip6on_type;
-	u_int8_t ip6on_len;
-	u_int8_t ip6on_src_nsap_len;
-	u_int8_t ip6on_dst_nsap_len;
-	/* followed by source NSAP */
-	/* followed by destination NSAP */
-} __packed;
-
-/* Tunnel Limit Option */
-struct ip6_opt_tunnel {
-	u_int8_t ip6ot_type;
-	u_int8_t ip6ot_len;
-	u_int8_t ip6ot_encap_limit;
-} __packed;
-
-/* Router Alert Option */
-struct ip6_opt_router {
-	u_int8_t ip6or_type;
-	u_int8_t ip6or_len;
-	u_int8_t ip6or_value[2];
-} __packed;
-/* Router alert values (in network byte order) */
-#if BYTE_ORDER == BIG_ENDIAN
-#define IP6_ALERT_MLD	0x0000
-#define IP6_ALERT_RSVP	0x0001
-#define IP6_ALERT_AN	0x0002
-#else
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define IP6_ALERT_MLD	0x0000
-#define IP6_ALERT_RSVP	0x0100
-#define IP6_ALERT_AN	0x0200
-#endif /* LITTLE_ENDIAN */
-#endif
-
-/* Routing header */
-struct ip6_rthdr {
-	u_int8_t  ip6r_nxt;	/* next header */
-	u_int8_t  ip6r_len;	/* length in units of 8 octets */
-	u_int8_t  ip6r_type;	/* routing type */
-	u_int8_t  ip6r_segleft;	/* segments left */
-	/* followed by routing type specific data */
-} __packed;
-
-/* Type 0 Routing header, deprecated by RFC 5095. */
-struct ip6_rthdr0 {
-	u_int8_t  ip6r0_nxt;		/* next header */
-	u_int8_t  ip6r0_len;		/* length in units of 8 octets */
-	u_int8_t  ip6r0_type;		/* always zero */
-	u_int8_t  ip6r0_segleft;	/* segments left */
-	uint32_t  ip6r0_reserved;	/* reserved field */
-	/* followed by up to 127 struct in6_addr */
-} __packed;
-
-/* Fragment header */
-struct ip6_frag {
-	u_int8_t  ip6f_nxt;		/* next header */
-	u_int8_t  ip6f_reserved;	/* reserved field */
-	u_int16_t ip6f_offlg;		/* offset, reserved, and flag */
-	uint32_t ip6f_ident;		/* identification */
-} __packed;
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IP6F_OFF_MASK		0xfff8	/* mask out offset from _offlg */
-#define IP6F_RESERVED_MASK	0x0006	/* reserved bits in ip6f_offlg */
-#define IP6F_MORE_FRAG		0x0001	/* more-fragments flag */
-#else /* BYTE_ORDER == LITTLE_ENDIAN */
-#define IP6F_OFF_MASK		0xf8ff	/* mask out offset from _offlg */
-#define IP6F_RESERVED_MASK	0x0600	/* reserved bits in ip6f_offlg */
-#define IP6F_MORE_FRAG		0x0100	/* more-fragments flag */
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
-/*
- * Internet implementation parameters.
- */
-#define IPV6_MAXHLIM	255	/* maximum hoplimit */
-#define IPV6_DEFHLIM	64	/* default hlim */
-#define IPV6_FRAGTTL	120	/* ttl for fragment packets, in slowtimo tick */
-#define IPV6_HLIMDEC	1	/* subtracted when forwarding */
-
-#define IPV6_MMTU	1280	/* minimal MTU and reassembly. 1024 + 256 */
-#define IPV6_MAXPACKET	65535	/* ip6 max packet size without Jumbo payload*/
-#define IPV6_MAXOPTHDR	2048	/* max option header size, 256 64-bit words */
-
-#ifdef _KERNEL
-/*
- * IP6_EXTHDR_CHECK ensures that region between the IP6 header and the
- * target header (including IPv6 itself, extension headers and
- * TCP/UDP/ICMP6 headers) are contiguous. KAME requires drivers
- * to store incoming data into one internal mbuf or one or more external
- * mbufs(never into two or more internal mbufs). Thus, the third case is
- * supposed to never be matched but is prepared just in case.
- */
-
-#define IP6_EXTHDR_CHECK(m, off, hlen, ret)				\
-do {									\
-    if ((m)->m_next != NULL) {						\
-	if (((m)->m_flags & M_LOOP) &&					\
-	    ((m)->m_len < (off) + (hlen)) &&				\
-	    (((m) = m_pullup((m), (off) + (hlen))) == NULL)) {		\
-		IP6STAT_INC(ip6s_exthdrtoolong);				\
-		return ret;						\
-	} else if ((m)->m_flags & M_EXT) {				\
-		if ((m)->m_len < (off) + (hlen)) {			\
-			IP6STAT_INC(ip6s_exthdrtoolong);			\
-			m_freem(m);					\
-			return ret;					\
-		}							\
-	} else {							\
-		if ((m)->m_len < (off) + (hlen)) {			\
-			IP6STAT_INC(ip6s_exthdrtoolong);			\
-			m_freem(m);					\
-			return ret;					\
-		}							\
-	}								\
-    } else {								\
-	if ((m)->m_len < (off) + (hlen)) {				\
-		IP6STAT_INC(ip6s_tooshort);				\
-		in6_ifstat_inc(m->m_pkthdr.rcvif, ifs6_in_truncated);	\
-		m_freem(m);						\
-		return ret;						\
-	}								\
-    }									\
-} while (/*CONSTCOND*/ 0)
-
-/*
- * IP6_EXTHDR_GET ensures that intermediate protocol header (from "off" to
- * "len") is located in single mbuf, on contiguous memory region.
- * The pointer to the region will be returned to pointer variable "val",
- * with type "typ".
- * IP6_EXTHDR_GET0 does the same, except that it aligns the structure at the
- * very top of mbuf.  GET0 is likely to make memory copy than GET.
- *
- * XXX we're now testing this, needs m_pulldown()
- */
-#define IP6_EXTHDR_GET(val, typ, m, off, len) \
-do {									\
-	struct mbuf *t;							\
-	int tmp;							\
-	if ((m)->m_len >= (off) + (len))				\
-		(val) = (typ)(mtod((m), caddr_t) + (off));		\
-	else {								\
-		t = m_pulldown((m), (off), (len), &tmp);		\
-		if (t) {						\
-			if (t->m_len < tmp + (len))			\
-				panic("m_pulldown malfunction");	\
-			(val) = (typ)(mtod(t, caddr_t) + tmp);		\
-		} else {						\
-			(val) = (typ)NULL;				\
-			(m) = NULL;					\
-		}							\
-	}								\
-} while (/*CONSTCOND*/ 0)
-
-#define IP6_EXTHDR_GET0(val, typ, m, off, len) \
-do {									\
-	struct mbuf *t;							\
-	if ((off) == 0)							\
-		(val) = (typ)mtod(m, caddr_t);				\
-	else {								\
-		t = m_pulldown((m), (off), (len), NULL);		\
-		if (t) {						\
-			if (t->m_len < (len))				\
-				panic("m_pulldown malfunction");	\
-			(val) = (typ)mtod(t, caddr_t);			\
-		} else {						\
-			(val) = (typ)NULL;				\
-			(m) = NULL;					\
-		}							\
-	}								\
-} while (/*CONSTCOND*/ 0)
-
-#endif /*_KERNEL*/
-
-#endif /* not _NETINET_IP6_H_ */
diff --git a/include.new/netinet/ip_auth.h b/include.new/netinet/ip_auth.h
deleted file mode 100644
index 3b3dd8d..0000000
--- a/include.new/netinet/ip_auth.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_auth.h 266829 2014-05-29 02:55:07Z cy $	*/
-
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * $FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_auth.h 266829 2014-05-29 02:55:07Z cy $
- * Id: ip_auth.h,v 2.16.2.2 2006/03/16 06:45:49 darrenr Exp $
- *
- */
-#ifndef	__IP_AUTH_H__
-#define	__IP_AUTH_H__
-
-#define FR_NUMAUTH      32
-
-typedef struct  frauth {
-	int	fra_age;
-	int	fra_len;
-	int	fra_index;
-	u_32_t	fra_pass;
-	fr_info_t	fra_info;
-	char	*fra_buf;
-	u_32_t	fra_flx;
-#ifdef	MENTAT
-	queue_t	*fra_q;
-	mb_t	*fra_m;
-#endif
-} frauth_t;
-
-typedef	struct	frauthent  {
-	struct	frentry	fae_fr;
-	struct	frauthent	*fae_next;
-	struct	frauthent	**fae_pnext;
-	u_long	fae_age;
-	int	fae_ref;
-} frauthent_t;
-
-typedef struct  ipf_authstat {
-	U_QUAD_T	fas_hits;
-	U_QUAD_T	fas_miss;
-	u_long		fas_nospace;
-	u_long		fas_added;
-	u_long		fas_sendfail;
-	u_long		fas_sendok;
-	u_long		fas_queok;
-	u_long		fas_quefail;
-	u_long		fas_expire;
-	frauthent_t	*fas_faelist;
-} ipf_authstat_t;
-
-typedef	struct ipf_auth_softc_s {
-	ipfrwlock_t	ipf_authlk;
-	ipfmutex_t	ipf_auth_mx;
-	int		ipf_auth_size;
-	int		ipf_auth_used;
-	int		ipf_auth_replies;
-	int		ipf_auth_defaultage;
-	int		ipf_auth_lock;
-	ipf_authstat_t	ipf_auth_stats;
-	frauth_t	*ipf_auth;
-	mb_t		**ipf_auth_pkts;
-	int		ipf_auth_start;
-	int		ipf_auth_end;
-	int		ipf_auth_next;
-	frauthent_t	*ipf_auth_entries;
-	frentry_t	*ipf_auth_ip;
-	frentry_t	*ipf_auth_rules;
-} ipf_auth_softc_t;
-
-extern	frentry_t *ipf_auth_check __P((fr_info_t *, u_32_t *));
-extern	void	ipf_auth_expire __P((ipf_main_softc_t *));
-extern	int	ipf_auth_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t,
-				    int, int, void *));
-extern	int	ipf_auth_init __P((void));
-extern	int	ipf_auth_main_load __P((void));
-extern	int	ipf_auth_main_unload __P((void));
-extern	void	ipf_auth_soft_destroy __P((ipf_main_softc_t *, void *));
-extern	void	*ipf_auth_soft_create __P((ipf_main_softc_t *));
-extern	int	ipf_auth_new __P((mb_t *, fr_info_t *));
-extern	int	ipf_auth_precmd __P((ipf_main_softc_t *, ioctlcmd_t,
-				     frentry_t *, frentry_t **));
-extern	void	ipf_auth_unload __P((ipf_main_softc_t *));
-extern	int	ipf_auth_waiting __P((ipf_main_softc_t *));
-extern	void	ipf_auth_setlock __P((void *, int));
-extern	int	ipf_auth_soft_init __P((ipf_main_softc_t *, void *));
-extern	int	ipf_auth_soft_fini __P((ipf_main_softc_t *, void *));
-extern	u_32_t	ipf_auth_pre_scanlist __P((ipf_main_softc_t *, fr_info_t *,
-					   u_32_t));
-extern	frentry_t **ipf_auth_rulehead __P((ipf_main_softc_t *));
-
-#endif	/* __IP_AUTH_H__ */
diff --git a/include.new/netinet/ip_carp.h b/include.new/netinet/ip_carp.h
deleted file mode 100644
index c8e64ae..0000000
--- a/include.new/netinet/ip_carp.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netinet/ip_carp.h 253087 2013-07-09 10:02:51Z ae $	*/
-/*	$OpenBSD: ip_carp.h,v 1.8 2004/07/29 22:12:15 mcbride Exp $	*/
-
-/*
- * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
- * Copyright (c) 2003 Ryan McBride. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 HIS RELATIVES 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 MIND, 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.
- */
-
-#ifndef _IP_CARP_H
-#define	_IP_CARP_H
-
-/*
- * The CARP header layout is as follows:
- *
- *     0                   1                   2                   3
- *     0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |Version| Type  | VirtualHostID |    AdvSkew    |    Auth Len   |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |   Reserved    |     AdvBase   |          Checksum             |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                         Counter (1)                           |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                         Counter (2)                           |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                        SHA-1 HMAC (1)                         |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                        SHA-1 HMAC (2)                         |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                        SHA-1 HMAC (3)                         |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                        SHA-1 HMAC (4)                         |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *    |                        SHA-1 HMAC (5)                         |
- *    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- */
-
-struct carp_header {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int8_t	carp_type:4,
-			carp_version:4;
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_int8_t	carp_version:4,
-			carp_type:4;
-#endif
-	u_int8_t	carp_vhid;	/* virtual host id */
-	u_int8_t	carp_advskew;	/* advertisement skew */
-	u_int8_t	carp_authlen;   /* size of counter+md, 32bit chunks */
-	u_int8_t	carp_pad1;	/* reserved */
-	u_int8_t	carp_advbase;	/* advertisement interval */
-	u_int16_t	carp_cksum;
-	uint32_t	carp_counter[2];
-	unsigned char	carp_md[20];	/* SHA1 HMAC */
-} __packed;
-
-#ifdef CTASSERT
-CTASSERT(sizeof(struct carp_header) == 36);
-#endif
-
-#define	CARP_DFLTTL		255
-
-/* carp_version */
-#define	CARP_VERSION		2
-
-/* carp_type */
-#define	CARP_ADVERTISEMENT	0x01
-
-#define	CARP_KEY_LEN		20	/* a sha1 hash of a passphrase */
-
-/* carp_advbase */
-#define	CARP_DFLTINTV		1
-
-/*
- * Statistics.
- */
-struct carpstats {
-	uint64_t	carps_ipackets;		/* total input packets, IPv4 */
-	uint64_t	carps_ipackets6;	/* total input packets, IPv6 */
-	uint64_t	carps_badif;		/* wrong interface */
-	uint64_t	carps_badttl;		/* TTL is not CARP_DFLTTL */
-	uint64_t	carps_hdrops;		/* packets shorter than hdr */
-	uint64_t	carps_badsum;		/* bad checksum */
-	uint64_t	carps_badver;		/* bad (incl unsupp) version */
-	uint64_t	carps_badlen;		/* data length does not match */
-	uint64_t	carps_badauth;		/* bad authentication */
-	uint64_t	carps_badvhid;		/* bad VHID */
-	uint64_t	carps_badaddrs;		/* bad address list */
-
-	uint64_t	carps_opackets;		/* total output packets, IPv4 */
-	uint64_t	carps_opackets6;	/* total output packets, IPv6 */
-	uint64_t	carps_onomem;		/* no memory for an mbuf */
-	uint64_t	carps_ostates;		/* total state updates sent */
-
-	uint64_t	carps_preempt;		/* if enabled, preemptions */
-};
-
-/*
- * Configuration structure for SIOCSVH SIOCGVH
- */
-struct carpreq {
-	int		carpr_count;
-	int		carpr_vhid;
-#define	CARP_MAXVHID	255
-	int		carpr_state;
-#define	CARP_STATES	"INIT", "BACKUP", "MASTER"
-#define	CARP_MAXSTATE	2
-	int		carpr_advskew;
-#define	CARP_MAXSKEW	240
-	int		carpr_advbase;
-	unsigned char	carpr_key[CARP_KEY_LEN];
-};
-#define	SIOCSVH	_IOWR('i', 245, struct ifreq)
-#define	SIOCGVH	_IOWR('i', 246, struct ifreq)
-
-#ifdef _KERNEL
-int		carp_ioctl(struct ifreq *, u_long, struct thread *);
-int		carp_attach(struct ifaddr *, int);
-void		carp_detach(struct ifaddr *);
-void		carp_carpdev_state(struct ifnet *);
-void		carp_input (struct mbuf *, int);
-int		carp6_input (struct mbuf **, int *, int);
-int		carp_output (struct ifnet *, struct mbuf *,
-		    const struct sockaddr *);
-int		carp_master(struct ifaddr *);
-int		carp_iamatch(struct ifaddr *, uint8_t **);
-struct ifaddr	*carp_iamatch6(struct ifnet *, struct in6_addr *);
-caddr_t		carp_macmatch6(struct ifnet *, struct mbuf *, const struct in6_addr *);
-int		carp_forus(struct ifnet *, u_char *);
-
-/* These are external networking stack hooks for CARP */
-/* net/if.c */
-extern int (*carp_ioctl_p)(struct ifreq *, u_long, struct thread *);
-extern int (*carp_attach_p)(struct ifaddr *, int);
-extern void (*carp_detach_p)(struct ifaddr *);
-extern void (*carp_linkstate_p)(struct ifnet *);
-extern void (*carp_demote_adj_p)(int, char *);
-extern int (*carp_master_p)(struct ifaddr *);
-/* net/if_bridge.c net/if_ethersubr.c */
-extern int (*carp_forus_p)(struct ifnet *, u_char *);
-/* net/if_ethersubr.c */
-extern int (*carp_output_p)(struct ifnet *, struct mbuf *,
-    const struct sockaddr *);
-/* net/rtsock.c */
-extern int (*carp_get_vhid_p)(struct ifaddr *);
-#ifdef INET
-/* netinet/if_ether.c */
-extern int (*carp_iamatch_p)(struct ifaddr *, uint8_t **);
-#endif
-#ifdef INET6
-/* netinet6/nd6_nbr.c */
-extern struct ifaddr *(*carp_iamatch6_p)(struct ifnet *, struct in6_addr *);
-extern caddr_t (*carp_macmatch6_p)(struct ifnet *, struct mbuf *,
-    const struct in6_addr *);
-#endif
-#endif
-#endif /* _IP_CARP_H */
diff --git a/include.new/netinet/ip_compat.h b/include.new/netinet/ip_compat.h
deleted file mode 100644
index 9cde03c..0000000
--- a/include.new/netinet/ip_compat.h
+++ /dev/null
@@ -1,1477 +0,0 @@
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ip_compat.h	1.8 1/14/96
- * $FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_compat.h 269696 2014-08-08 00:58:24Z cy $
- * Id: ip_compat.h,v 2.142.2.57 2007/10/10 09:51:42 darrenr Exp $
- */
-
-#ifndef	__IP_COMPAT_H__
-#define	__IP_COMPAT_H__
-
-#ifndef	__P
-# ifdef	__STDC__
-#  define	__P(x)  x
-# else
-#  define	__P(x)  ()
-# endif
-#endif
-#ifndef	__STDC__
-# undef		const
-# define	const
-#endif
-
-#if defined(_KERNEL) || defined(KERNEL) || defined(__KERNEL__)
-# undef	KERNEL
-# undef	_KERNEL
-# undef 	__KERNEL__
-# define	KERNEL
-# define	_KERNEL
-# define 	__KERNEL__
-#endif
-
-#define	SOLARIS	(defined(sun) && (defined(__svr4__) || defined(__SVR4)))
-
-
-#if defined(__SVR4) || defined(__svr4__) || defined(__sgi)
-# define index   strchr
-# if !defined(_KERNEL)
-#  define	bzero(a,b)	memset(a,0,b)
-#  define	bcmp		memcmp
-#  define	bcopy(a,b,c)	memmove(b,a,c)
-# endif
-#endif
-
-#ifndef LIFNAMSIZ
-# ifdef IF_NAMESIZE
-#  define	LIFNAMSIZ	IF_NAMESIZE
-# else
-#  ifdef	IFNAMSIZ
-#   define	LIFNAMSIZ	IFNAMSIZ
-#  else
-#   define	LIFNAMSIZ	16
-#  endif
-# endif
-#endif
-
-#if defined(__sgi) || defined(bsdi) || defined(__hpux) || defined(hpux)
-struct  ether_addr {
-        u_char  ether_addr_octet[6];
-};
-#endif
-
-# ifdef __STDC__
-#  define IPL_EXTERN(ep) ipl##ep
-# else
-#  define IPL_EXTERN(ep) ipl/**/ep
-# endif
-
-/*
- * This is a workaround for <sys/uio.h> troubles on FreeBSD and OpenBSD.
- */
-# ifndef _KERNEL
-#  define ADD_KERNEL
-#  define _KERNEL
-#  define KERNEL
-# endif
-# include <sys/uio.h>
-# ifdef ADD_KERNEL
-#  undef _KERNEL
-#  undef KERNEL
-# endif
-
-#define	NETBSD_GE_REV(x)	(defined(__NetBSD_Version__) && \
-				 (__NetBSD_Version__ >= (x)))
-#define	NETBSD_GT_REV(x)	(defined(__NetBSD_Version__) && \
-				 (__NetBSD_Version__ > (x)))
-#define	NETBSD_LT_REV(x)	(defined(__NetBSD_Version__) && \
-				 (__NetBSD_Version__ < (x)))
-#define	FREEBSD_GE_REV(x)	(defined(__FreeBSD_version) && \
-				 (__FreeBSD_version >= (x)))
-#define	FREEBSD_GT_REV(x)	(defined(__FreeBSD_version) && \
-				 (__FreeBSD_version > (x)))
-#define	FREEBSD_LT_REV(x)	(defined(__FreeBSD_version) && \
-				 (__FreeBSD_version < (x)))
-#define	BSDOS_GE_REV(x)		(defined(_BSDI_VERSION) && \
-				 (_BSDI_VERSION >= (x)))
-#define	BSDOS_GT_REV(x)		(defined(_BSDI_VERSION) && \
-				 (_BSDI_VERSION > (x)))
-#define	BSDOS_LT_REV(x)		(defined(_BSDI_VERSION) && \
-				 (_BSDI_VERSION < (x)))
-#define	OPENBSD_GE_REV(x)	(defined(OpenBSD) && (OpenBSD >= (x)))
-#define	OPENBSD_GT_REV(x)	(defined(OpenBSD) && (OpenBSD > (x)))
-#define	OPENBSD_LT_REV(x)	(defined(OpenBSD) && (OpenBSD < (x)))
-#define	BSD_GE_YEAR(x)		(defined(BSD) && (BSD >= (x)))
-#define	BSD_GT_YEAR(x)		(defined(BSD) && (BSD > (x)))
-#define	BSD_LT_YEAR(x)		(defined(BSD) && (BSD < (x)))
-
-
-/* ----------------------------------------------------------------------- */
-/*                                F R E E B S D                            */
-/* ----------------------------------------------------------------------- */
-# define HAS_SYS_MD5_H	1
-# if defined(_KERNEL)
-#   include "opt_bpf.h"
-#   include "opt_inet6.h"
-#  if defined(INET6) && !defined(USE_INET6)
-#   define USE_INET6
-#  endif
-# else
-#  if !defined(USE_INET6) && !defined(NOINET6)
-#   define	USE_INET6
-#  endif
-# endif
-
-# if defined(_KERNEL)
-#  include <netinet/ip_var.h>
-#    define	p_cred	td_ucred
-#    define	p_uid	td_ucred->cr_ruid
-
-/*
- * When #define'd, the 5.2.1 kernel panics when used with the ftp proxy.
- * There may be other, safe, kernels but this is not extensively tested yet.
- */
-#   define HAVE_M_PULLDOWN
-#  if !defined(IPFILTER_LKM) && (__FreeBSD_version >= 300000)
-#   include "opt_ipfilter.h"
-#  endif
-#  define	COPYIN(a,b,c)	copyin((caddr_t)(a), (caddr_t)(b), (c))
-#  define	COPYOUT(a,b,c)	copyout((caddr_t)(a), (caddr_t)(b), (c))
-
-#   define NETBSD_PF
-# else
-#  include <inttypes.h>
-# endif /* _KERNEL */
-
-#  include <sys/selinfo.h>
-#  include <sys/mutex.h>
-#    define	KRWLOCK_FILL_SZ		56
-#    define	KMUTEX_FILL_SZ		56
-#   include <sys/rwlock.h>
-#   define	KMUTEX_T		struct mtx
-#   define	KRWLOCK_T		struct rwlock
-#   ifdef _KERNEL
-#    define	READ_ENTER(x)		rw_rlock(&(x)->ipf_lk)
-#    define	WRITE_ENTER(x)		rw_wlock(&(x)->ipf_lk)
-#    define	MUTEX_DOWNGRADE(x)	rw_downgrade(&(x)->ipf_lk)
-#    define	RWLOCK_INIT(x,y)	rw_init(&(x)->ipf_lk, (y))
-#    define	RW_DESTROY(x)		rw_destroy(&(x)->ipf_lk)
-#    define	RWLOCK_EXIT(x)		do { \
-					    if (rw_wowned(&(x)->ipf_lk)) \
-					    	rw_wunlock(&(x)->ipf_lk); \
-					    else \
-						rw_runlock(&(x)->ipf_lk); \
-					} while (0)
-#   endif
-
-#  include <net/if_var.h>
-#  define	IFNAME(x)	((struct ifnet *)x)->if_xname
-#  define	COPYIFNAME(v, x, b) \
-				(void) strncpy(b, \
-					       ((struct ifnet *)x)->if_xname, \
-					       LIFNAMSIZ)
-
-# ifdef _KERNEL
-#  define	GETKTIME(x)	microtime((struct timeval *)x)
-
-#   include <netinet/in_systm.h>
-#   include <netinet/ip.h>
-#   include <machine/in_cksum.h>
-
-#   define	USE_MUTEXES
-#   define	MUTEX_ENTER(x)		mtx_lock(&(x)->ipf_lk)
-#   define	MUTEX_EXIT(x)		mtx_unlock(&(x)->ipf_lk)
-#   define	MUTEX_INIT(x,y)		mtx_init(&(x)->ipf_lk, (y), NULL,\
-						 MTX_DEF)
-#   define	MUTEX_DESTROY(x)	mtx_destroy(&(x)->ipf_lk)
-#   define	MUTEX_NUKE(x)		bzero((x), sizeof(*(x)))
-/*
- * Whilst the sx(9) locks on FreeBSD have the right semantics and interface
- * for what we want to use them for, despite testing showing they work -
- * with a WITNESS kernel, it generates LOR messages.
- */
-#   include <machine/atomic.h>
-#   define	ATOMIC_INC(x)		{ mtx_lock(&softc->ipf_rw.ipf_lk); (x)++; \
-					  mtx_unlock(&softc->ipf_rw.ipf_lk); }
-#   define	ATOMIC_DEC(x)		{ mtx_lock(&softc->ipf_rw.ipf_lk); (x)--; \
-					  mtx_unlock(&softc->ipf_rw.ipf_lk); }
-#   define	ATOMIC_INCL(x)		atomic_add_long(&(x), 1)
-#   define	ATOMIC_INC64(x)		ATOMIC_INC(x)
-#   define	ATOMIC_INC32(x)		atomic_add_32((u_int *)&(x), 1)
-#   define	ATOMIC_DECL(x)		atomic_add_long(&(x), -1)
-#   define	ATOMIC_DEC64(x)		ATOMIC_DEC(x)
-#   define	ATOMIC_DEC32(x)		atomic_add_32((u_int *)&(x), -1)
-#   define	SPL_X(x)	;
-#   define	SPL_NET(x)	;
-#   define	SPL_IMP(x)	;
-#   define	SPL_SCHED(x)	;
-#   define	GET_MINOR		dev2unit
-#  define	MSGDSIZE(m)	mbufchainlen(m)
-#  define	M_LEN(m)	(m)->m_len
-#  define	M_ADJ(m,x)	m_adj(m, x)
-#  define	M_COPY(x)	m_copy((x), 0, M_COPYALL)
-#  define	M_DUP(m)	m_dup(m, M_NOWAIT)
-#  define	IPF_PANIC(x,y)	if (x) { printf y; panic("ipf_panic"); }
-typedef struct mbuf mb_t;
-# endif /* _KERNEL */
-
-
-typedef	u_long		ioctlcmd_t;
-typedef	struct uio	uio_t;
-typedef	int		minor_t;
-typedef	uint32_t	u_32_t;
-# define	U_32_T	1
-
-
-/* ----------------------------------------------------------------------- */
-/*                           G E N E R I C                                 */
-/* ----------------------------------------------------------------------- */
-
-/*
- * For BSD kernels, if bpf is in the kernel, enable ipfilter to use bpf in
- * filter rules.
- */
-#if !defined(IPFILTER_BPF)
-# if (defined(NBPF) && (NBPF > 0)) || (defined(DEV_BPF) && (DEV_BPF > 0)) || \
-     (defined(NBPFILTER) && (NBPFILTER > 0))
-#  define	IPFILTER_BPF
-# endif
-#endif
-
-/*
- * Userland locking primitives
- */
-#ifndef _KERNEL
-#if !defined(KMUTEX_FILL_SZ)
-# define	KMUTEX_FILL_SZ	1
-#endif
-#if !defined(KRWLOCK_FILL_SZ)
-# define	KRWLOCK_FILL_SZ	1
-#endif
-#endif
-
-typedef	struct	{
-	char	*eMm_owner;
-	char	*eMm_heldin;
-	u_int	eMm_magic;
-	int	eMm_held;
-	int	eMm_heldat;
-} eMmutex_t;
-
-typedef	struct	{
-	char	*eMrw_owner;
-	char	*eMrw_heldin;
-	u_int	eMrw_magic;
-	short	eMrw_read;
-	short	eMrw_write;
-	int	eMrw_heldat;
-} eMrwlock_t;
-
-typedef union {
-	char	_fill[KMUTEX_FILL_SZ];
-#ifdef KMUTEX_T
-	struct	{
-		KMUTEX_T	ipf_slk;
-		const char	*ipf_lname;
-	} ipf_lkun_s;
-#endif
-	eMmutex_t	ipf_emu;
-} ipfmutex_t;
-
-typedef union {
-	char	_fill[KRWLOCK_FILL_SZ];
-#ifdef KRWLOCK_T
-	struct	{
-		KRWLOCK_T	ipf_slk;
-		const char	*ipf_lname;
-		int		ipf_sr;
-		int		ipf_sw;
-		u_int		ipf_magic;
-	} ipf_lkun_s;
-#endif
-	eMrwlock_t	ipf_emu;
-} ipfrwlock_t;
-
-#define	ipf_lk		ipf_lkun_s.ipf_slk
-#define	ipf_lname	ipf_lkun_s.ipf_lname
-#define	ipf_isr		ipf_lkun_s.ipf_sr
-#define	ipf_isw		ipf_lkun_s.ipf_sw
-#define	ipf_magic	ipf_lkun_s.ipf_magic
-
-#if !defined(__GNUC__) || \
-    (defined(__FreeBSD_version) && (__FreeBSD_version >= 503000))
-# ifndef	INLINE
-#  define	INLINE
-# endif
-#else
-# define	INLINE	__inline__
-#endif
-
-#if defined(__FreeBSD_version) && defined(_KERNEL)
-     CTASSERT(sizeof(ipfrwlock_t) == KRWLOCK_FILL_SZ);
-     CTASSERT(sizeof(ipfmutex_t) == KMUTEX_FILL_SZ);
-#endif
-
-
-/*
- * In a non-kernel environment, there are a lot of macros that need to be
- * filled in to be null-ops or to point to some compatibility function,
- * somewhere in userland.
- */
-#ifndef _KERNEL
-typedef	struct	mb_s	{
-	struct	mb_s	*mb_next;
-	char		*mb_data;
-	void		*mb_ifp;
-	int		mb_len;
-	int		mb_flags;
-	u_long		mb_buf[2048];
-} mb_t;
-# undef		m_next
-# define	m_next		mb_next
-# undef		m_len
-# define	m_len		mb_len
-# undef		m_flags
-# define	m_flags		mb_flags
-# undef		m_data
-# define	m_data		mb_data
-# undef		M_MCAST
-# define	M_MCAST		0x01
-# undef		M_BCAST
-# define	M_BCAST		0x02
-# undef		M_MBCAST
-# define	M_MBCAST	0x04
-# define	MSGDSIZE(m)	msgdsize(m)
-# define	M_LEN(m)	(m)->mb_len
-# define	M_ADJ(m,x)	(m)->mb_len += x
-# define	M_COPY(m)	dupmbt(m)
-# define	M_DUP(m)	dupmbt(m)
-# define	GETKTIME(x)	gettimeofday((struct timeval *)(x), NULL)
-# define	MTOD(m, t)	((t)(m)->mb_data)
-# define	FREE_MB_T(m)	freembt(m)
-# define	ALLOC_MB_T(m,l)	(m) = allocmbt(l)
-# define	PREP_MB_T(f, m)	do { \
-						(m)->mb_next = *(f)->fin_mp; \
-						*(fin)->fin_mp = (m); \
-						(f)->fin_m = (m); \
-					} while (0)
-# define	SLEEP(x,y)	1;
-# define	WAKEUP(x,y)	;
-# define	POLLWAKEUP(y)	;
-# define	IPF_PANIC(x,y)	;
-# define	PANIC(x,y)	;
-# define	SPL_SCHED(x)	;
-# define	SPL_NET(x)	;
-# define	SPL_IMP(x)	;
-# define	SPL_X(x)	;
-# define	KMALLOC(a,b)	(a) = (b)malloc(sizeof(*a))
-# define	KMALLOCS(a,b,c)	(a) = (b)malloc(c)
-# define	KFREE(x)	free(x)
-# define	KFREES(x,s)	free(x)
-# define	GETIFP(x, v)	get_unit(x,v)
-# define	GETIFMTU_4(x)	2048
-# define	GETIFMTU_6(x)	2048
-# define	COPYIN(a,b,c)	bcopywrap((a), (b), (c))
-# define	COPYOUT(a,b,c)	bcopywrap((a), (b), (c))
-# define	COPYDATA(m, o, l, b)	bcopy(MTOD((mb_t *)m, char *) + (o), \
-					      (b), (l))
-# define	COPYBACK(m, o, l, b)	bcopy((b), \
-					      MTOD((mb_t *)m, char *) + (o), \
-					      (l))
-# define	UIOMOVE(a,b,c,d)	ipfuiomove((caddr_t)a,b,c,d)
-extern	void	m_copydata __P((mb_t *, int, int, caddr_t));
-extern	int	ipfuiomove __P((caddr_t, int, int, struct uio *));
-extern	int	bcopywrap __P((void *, void *, size_t));
-extern	mb_t	*allocmbt __P((size_t));
-extern	mb_t	*dupmbt __P((mb_t *));
-extern	void	freembt __P((mb_t *));
-
-# define	MUTEX_DESTROY(x)	eMmutex_destroy(&(x)->ipf_emu, \
-							__FILE__, __LINE__)
-# define	MUTEX_ENTER(x)		eMmutex_enter(&(x)->ipf_emu, \
-						      __FILE__, __LINE__)
-# define	MUTEX_EXIT(x)		eMmutex_exit(&(x)->ipf_emu, \
-						     __FILE__, __LINE__)
-# define	MUTEX_INIT(x,y)		eMmutex_init(&(x)->ipf_emu, y, \
-						     __FILE__, __LINE__)
-# define	MUTEX_NUKE(x)		bzero((x), sizeof(*(x)))
-
-# define	MUTEX_DOWNGRADE(x)	eMrwlock_downgrade(&(x)->ipf_emu, \
-							   __FILE__, __LINE__)
-# define	READ_ENTER(x)		eMrwlock_read_enter(&(x)->ipf_emu, \
-							    __FILE__, __LINE__)
-# define	RWLOCK_INIT(x, y)	eMrwlock_init(&(x)->ipf_emu, y)
-# define	RWLOCK_EXIT(x)		eMrwlock_exit(&(x)->ipf_emu)
-# define	RW_DESTROY(x)		eMrwlock_destroy(&(x)->ipf_emu)
-# define	WRITE_ENTER(x)		eMrwlock_write_enter(&(x)->ipf_emu, \
-							     __FILE__, \
-							     __LINE__)
-
-# define	USE_MUTEXES		1
-
-extern void eMmutex_destroy __P((eMmutex_t *, char *, int));
-extern void eMmutex_enter __P((eMmutex_t *, char *, int));
-extern void eMmutex_exit __P((eMmutex_t *, char *, int));
-extern void eMmutex_init __P((eMmutex_t *, char *, char *, int));
-extern void eMrwlock_destroy __P((eMrwlock_t *));
-extern void eMrwlock_exit __P((eMrwlock_t *));
-extern void eMrwlock_init __P((eMrwlock_t *, char *));
-extern void eMrwlock_read_enter __P((eMrwlock_t *, char *, int));
-extern void eMrwlock_write_enter __P((eMrwlock_t *, char *, int));
-extern void eMrwlock_downgrade __P((eMrwlock_t *, char *, int));
-
-#endif
-
-extern	mb_t	*allocmbt(size_t);
-
-#define	MAX_IPV4HDR	((0xf << 2) + sizeof(struct icmp) + sizeof(ip_t) + 8)
-
-#ifndef	IP_OFFMASK
-# define	IP_OFFMASK	0x1fff
-#endif
-
-
-/*
- * On BSD's use quad_t as a guarantee for getting at least a 64bit sized
- * object.
- */
-#if !defined(__amd64__) && BSD_GT_YEAR(199306)
-# define	USE_QUAD_T
-# define	U_QUAD_T	unsigned long long
-# define	QUAD_T		long long
-#else /* BSD > 199306 */
-# if !defined(U_QUAD_T)
-#  define	U_QUAD_T	u_long
-#  define	QUAD_T		long
-# endif
-#endif /* BSD > 199306 */
-
-
-#ifdef	USE_INET6
-# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
-     defined(__osf__) || defined(linux)
-#  include <netinet/ip6.h>
-#  include <netinet/icmp6.h>
-#   if defined(_KERNEL) && !defined(__osf__)
-#    include <netinet6/ip6_var.h>
-#   endif
-typedef	struct ip6_hdr	ip6_t;
-# endif
-#endif
-
-#ifndef	MAX
-# define	MAX(a,b)	(((a) > (b)) ? (a) : (b))
-#endif
-
-#if defined(_KERNEL)
-# if defined(MENTAT) && !defined(INSTANCES)
-#  define	COPYDATA	mb_copydata
-#  define	COPYBACK	mb_copyback
-# else
-#  define	COPYDATA	m_copydata
-#  define	COPYBACK	m_copyback
-# endif
-#  if (defined(__NetBSD_Version__) && (__NetBSD_Version__ < 105180000)) || \
-       defined(__FreeBSD__) || (defined(OpenBSD) && (OpenBSD < 200206)) || \
-       defined(_BSDI_VERSION)
-#   include <vm/vm.h>
-#  endif
-#  if !defined(__FreeBSD__) || FREEBSD_GE_REV(300000)
-#   if NETBSD_GE_REV(105180000) || OPENBSD_GE_REV(200111)
-#    include <uvm/uvm_extern.h>
-#   else
-#    include <vm/vm_extern.h>
-extern  vm_map_t        kmem_map;
-#   endif
-#   include <sys/proc.h>
-#  else /* !__FreeBSD__ || (__FreeBSD__ && __FreeBSD_version >= 300000) */
-#   include <vm/vm_kern.h>
-#  endif /* !__FreeBSD__ || (__FreeBSD__ && __FreeBSD_version >= 300000) */
-
-#  ifdef IPFILTER_M_IPFILTER
-#    include <sys/malloc.h>
-MALLOC_DECLARE(M_IPFILTER);
-#    define	_M_IPF		M_IPFILTER
-#  else /* IPFILTER_M_IPFILTER */
-#   ifdef M_PFIL
-#    define	_M_IPF		M_PFIL
-#   else
-#    ifdef M_IPFILTER
-#     define	_M_IPF		M_IPFILTER
-#    else
-#     define	_M_IPF		M_TEMP
-#    endif /* M_IPFILTER */
-#   endif /* M_PFIL */
-#  endif /* IPFILTER_M_IPFILTER */
-#  if !defined(KMALLOC)
-#   define	KMALLOC(a, b)	MALLOC((a), b, sizeof(*(a)), _M_IPF, M_NOWAIT)
-#  endif
-#  if !defined(KMALLOCS)
-#   define	KMALLOCS(a, b, c)	MALLOC((a), b, (c), _M_IPF, M_NOWAIT)
-#  endif
-#  if !defined(KFREE)
-#   define	KFREE(x)	FREE((x), _M_IPF)
-#  endif
-#   if !defined(KFREES)
-#  define	KFREES(x,s)	FREE((x), _M_IPF)
-#  endif
-#  define	UIOMOVE(a,b,c,d)	uiomove((caddr_t)a,b,d)
-#  define	SLEEP(id, n)	tsleep((id), PPAUSE|PCATCH, n, 0)
-#  define	WAKEUP(id,x)	wakeup(id+x)
-#  if !defined(POLLWAKEUP)
-#   define	POLLWAKEUP(x)	selwakeup(softc->ipf_selwait+x)
-#  endif
-#  define	GETIFP(n, v)	ifunit(n)
-#  define	GETIFMTU_4(x)	((struct ifnet *)x)->if_mtu
-#  define	GETIFMTU_6(x)	((struct ifnet *)x)->if_mtu
-
-# if !defined(USE_MUTEXES) && !defined(SPL_NET)
-#  define	SPL_IMP(x)	x = splimp()
-#  define	SPL_NET(x)	x = splnet()
-#  if !defined(SPL_SCHED)
-#   define	SPL_SCHED(x)	x = splsched()
-#  endif
-#  define	SPL_X(x)	(void) splx(x)
-# endif /* !USE_MUTEXES */
-
-# ifndef FREE_MB_T
-#  define	FREE_MB_T(m)	m_freem(m)
-# endif
-# ifndef ALLOC_MB_T
-#  ifdef MGETHDR
-#   define	ALLOC_MB_T(m,l)	do { \
-					MGETHDR((m), M_DONTWAIT, MT_HEADER); \
-					if ((m) != NULL) { \
-						(m)->m_len = (l); \
-						(m)->m_pkthdr.len = (l); \
-					} \
-				} while (0)
-#  else
-#   define	ALLOC_MB_T(m,l)	do { \
-					MGET((m), M_DONTWAIT, MT_HEADER); \
-					if ((m) != NULL) { \
-						(m)->m_len = (l); \
-						(m)->m_pkthdr.len = (l); \
-					} \
-				} while (0)
-#  endif
-# endif
-# ifndef PREP_MB_T
-#  define	PREP_MB_T(f, m)	do { \
-						mb_t *_o = *(f)->fin_mp; \
-						(m)->m_next = _o; \
-						*(fin)->fin_mp = (m); \
-						if (_o->m_flags & M_PKTHDR) { \
-							(m)->m_pkthdr.len += \
-							    _o->m_pkthdr.len; \
-							(m)->m_pkthdr.rcvif = \
-							  _o->m_pkthdr.rcvif; \
-						} \
-					} while (0)
-# endif
-# ifndef M_DUP
-#  ifdef M_COPYALL
-#   define	M_DUP(m)	m_dup(m, 0, M_COPYALL, 0)
-#  else
-#   define	M_DUP(m)	m_dup(m)
-#  endif
-# endif
-
-# ifndef MTOD
-#  define	MTOD(m,t)	mtod(m,t)
-# endif
-
-# ifndef COPYIN
-#  define	COPYIN(a,b,c)	(bcopy((caddr_t)(a), (caddr_t)(b), (c)), 0)
-#  define	COPYOUT(a,b,c)	(bcopy((caddr_t)(a), (caddr_t)(b), (c)), 0)
-# endif
-
-# ifndef KMALLOC
-#  define	KMALLOC(a,b)	(a) = (b)new_kmem_alloc(sizeof(*(a)), \
-							KMEM_NOSLEEP)
-#  define	KMALLOCS(a,b,c)	(a) = (b)new_kmem_alloc((c), KMEM_NOSLEEP)
-# endif
-
-# ifndef	GET_MINOR
-#  define	GET_MINOR(x)	dev2unit(x)
-# endif
-# define	PANIC(x,y)	if (x) panic y
-#endif /* _KERNEL */
-
-#if !defined(IFNAME) && !defined(_KERNEL)
-# define	IFNAME(x)	get_ifname((struct ifnet *)x)
-#endif
-#ifndef	COPYIFNAME
-# define	NEED_FRGETIFNAME
-extern	char	*ipf_getifname __P((struct ifnet *, char *));
-# define	COPYIFNAME(v, x, b) \
-				ipf_getifname((struct ifnet *)x, b)
-#endif
-
-#ifndef ASSERT
-# ifdef _KERNEL
-#  define	ASSERT(x)
-# else
-#  define	ASSERT(x)	do { if (!(x)) abort(); } while (0)
-# endif
-#endif
-
-#ifndef BCOPYIN
-#  define	BCOPYIN(a,b,c)	(bcopy((caddr_t)(a), (caddr_t)(b), (c)), 0)
-#  define	BCOPYOUT(a,b,c)	(bcopy((caddr_t)(a), (caddr_t)(b), (c)), 0)
-#endif
-
-/*
- * Because the ctype(3) posix definition, if used "safely" in code everywhere,
- * would mean all normal code that walks through strings needed casts.  Yuck.
- */
-#define	ISALNUM(x)	isalnum((u_char)(x))
-#define	ISALPHA(x)	isalpha((u_char)(x))
-#define	ISDIGIT(x)	isdigit((u_char)(x))
-#define	ISSPACE(x)	isspace((u_char)(x))
-#define	ISUPPER(x)	isupper((u_char)(x))
-#define	ISXDIGIT(x)	isxdigit((u_char)(x))
-#define	ISLOWER(x)	islower((u_char)(x))
-#define	TOUPPER(x)	toupper((u_char)(x))
-#define	TOLOWER(x)	tolower((u_char)(x))
-
-/*
- * If mutexes aren't being used, turn all the mutex functions into null-ops.
- */
-#if !defined(USE_MUTEXES)
-# define	USE_SPL			1
-# undef		RW_DESTROY
-# undef		MUTEX_INIT
-# undef		MUTEX_NUKE
-# undef		MUTEX_DESTROY
-# define	MUTEX_ENTER(x)		;
-# define	READ_ENTER(x)		;
-# define	WRITE_ENTER(x)		;
-# define	MUTEX_DOWNGRADE(x)	;
-# define	RWLOCK_INIT(x, y)	;
-# define	RWLOCK_EXIT(x)		;
-# define	RW_DESTROY(x)		;
-# define	MUTEX_EXIT(x)		;
-# define	MUTEX_INIT(x,y)		;
-# define	MUTEX_DESTROY(x)	;
-# define	MUTEX_NUKE(x)		;
-#endif /* !USE_MUTEXES */
-#ifndef	ATOMIC_INC
-# define	ATOMIC_INC(x)		(x)++
-# define	ATOMIC_DEC(x)		(x)--
-#endif
-
-#if defined(USE_SPL) && defined(_KERNEL)
-# define	SPL_INT(x)	int x
-#else
-# define	SPL_INT(x)
-#endif
-
-/*
- * If there are no atomic operations for bit sizes defined, define them to all
- * use a generic one that works for all sizes.
- */
-#ifndef	ATOMIC_INCL
-# define	ATOMIC_INCL		ATOMIC_INC
-# define	ATOMIC_INC64		ATOMIC_INC
-# define	ATOMIC_INC32		ATOMIC_INC
-# define	ATOMIC_DECL		ATOMIC_DEC
-# define	ATOMIC_DEC64		ATOMIC_DEC
-# define	ATOMIC_DEC32		ATOMIC_DEC
-#endif
-
-#ifndef HDR_T_PRIVATE
-typedef	struct	tcphdr	tcphdr_t;
-typedef	struct	udphdr	udphdr_t;
-#endif
-typedef	struct	icmp	icmphdr_t;
-typedef	struct	ip	ip_t;
-typedef	struct	ether_header	ether_header_t;
-typedef	struct	tcpiphdr	tcpiphdr_t;
-
-#ifndef	FR_GROUPLEN
-# define	FR_GROUPLEN	16
-#endif
-
-#ifndef offsetof
-# define offsetof(t,m) (size_t)((&((t *)0L)->m))
-#endif
-#ifndef stsizeof
-# define stsizeof(t,m)	sizeof(((t *)0L)->m)
-#endif
-
-/*
- * This set of macros has been brought about because on Tru64 it is not
- * possible to easily assign or examine values in a structure that are
- * bit fields.
- */
-#ifndef IP_V
-# define	IP_V(x)		(x)->ip_v
-#endif
-#ifndef	IP_V_A
-# define	IP_V_A(x,y)	(x)->ip_v = (y)
-#endif
-#ifndef	IP_HL
-# define	IP_HL(x)	(x)->ip_hl
-#endif
-#ifndef	IP_HL_A
-# define	IP_HL_A(x,y)	(x)->ip_hl = ((y) & 0xf)
-#endif
-#ifndef	TCP_X2
-# define	TCP_X2(x)	(x)->th_x2
-#endif
-#ifndef	TCP_X2_A
-# define	TCP_X2_A(x,y)	(x)->th_x2 = (y)
-#endif
-#ifndef	TCP_OFF
-# define	TCP_OFF(x)	(x)->th_off
-#endif
-#ifndef	TCP_OFF_A
-# define	TCP_OFF_A(x,y)	(x)->th_off = (y)
-#endif
-#define	IPMINLEN(i, h)	((i)->ip_len >= (IP_HL(i) * 4 + sizeof(struct h)))
-
-
-/*
- * XXX - This is one of those *awful* hacks which nobody likes
- */
-#ifdef	ultrix
-#define	A_A
-#else
-#define	A_A	&
-#endif
-
-#define	TCPF_ALL	(TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG|\
-			 TH_ECN|TH_CWR)
-
-#if BSD_GE_YEAR(199306) && !defined(m_act)
-# define	m_act	m_nextpkt
-#endif
-
-/*
- * Security Options for Intenet Protocol (IPSO) as defined in RFC 1108.
- *
- * Basic Option
- *
- * 00000001   -   (Reserved 4)
- * 00111101   -   Top Secret
- * 01011010   -   Secret
- * 10010110   -   Confidential
- * 01100110   -   (Reserved 3)
- * 11001100   -   (Reserved 2)
- * 10101011   -   Unclassified
- * 11110001   -   (Reserved 1)
- */
-#define	IPSO_CLASS_RES4		0x01
-#define	IPSO_CLASS_TOPS		0x3d
-#define	IPSO_CLASS_SECR		0x5a
-#define	IPSO_CLASS_CONF		0x96
-#define	IPSO_CLASS_RES3		0x66
-#define	IPSO_CLASS_RES2		0xcc
-#define	IPSO_CLASS_UNCL		0xab
-#define	IPSO_CLASS_RES1		0xf1
-
-#define	IPSO_AUTH_GENSER	0x80
-#define	IPSO_AUTH_ESI		0x40
-#define	IPSO_AUTH_SCI		0x20
-#define	IPSO_AUTH_NSA		0x10
-#define	IPSO_AUTH_DOE		0x08
-#define	IPSO_AUTH_UN		0x06
-#define	IPSO_AUTH_FTE		0x01
-
-/*
- * IP option #defines
- */
-#undef	IPOPT_RR
-#define	IPOPT_RR	7
-#undef	IPOPT_ZSU
-#define	IPOPT_ZSU	10	/* ZSU */
-#undef	IPOPT_MTUP
-#define	IPOPT_MTUP	11	/* MTUP */
-#undef	IPOPT_MTUR
-#define	IPOPT_MTUR	12	/* MTUR */
-#undef	IPOPT_ENCODE
-#define	IPOPT_ENCODE	15	/* ENCODE */
-#undef	IPOPT_TS
-#define	IPOPT_TS	68
-#undef	IPOPT_TR
-#define	IPOPT_TR	82	/* TR */
-#undef	IPOPT_SECURITY
-#define	IPOPT_SECURITY	130
-#undef	IPOPT_LSRR
-#define	IPOPT_LSRR	131
-#undef	IPOPT_E_SEC
-#define	IPOPT_E_SEC	133	/* E-SEC */
-#undef	IPOPT_CIPSO
-#define	IPOPT_CIPSO	134	/* CIPSO */
-#undef	IPOPT_SATID
-#define	IPOPT_SATID	136
-#ifndef	IPOPT_SID
-# define	IPOPT_SID	IPOPT_SATID
-#endif
-#undef	IPOPT_SSRR
-#define	IPOPT_SSRR	137
-#undef	IPOPT_ADDEXT
-#define	IPOPT_ADDEXT	147	/* ADDEXT */
-#undef	IPOPT_VISA
-#define	IPOPT_VISA	142	/* VISA */
-#undef	IPOPT_IMITD
-#define	IPOPT_IMITD	144	/* IMITD */
-#undef	IPOPT_EIP
-#define	IPOPT_EIP	145	/* EIP */
-#undef	IPOPT_RTRALRT
-#define	IPOPT_RTRALRT	148	/* RTRALRT */
-#undef	IPOPT_SDB
-#define	IPOPT_SDB	149
-#undef	IPOPT_NSAPA
-#define	IPOPT_NSAPA	150
-#undef	IPOPT_DPS
-#define	IPOPT_DPS	151
-#undef	IPOPT_UMP
-#define	IPOPT_UMP	152
-#undef	IPOPT_FINN
-#define	IPOPT_FINN	205	/* FINN */
-#undef	IPOPT_AH
-#define	IPOPT_AH	256+IPPROTO_AH
-
-#ifndef TCPOPT_EOL
-# define TCPOPT_EOL		0
-#endif
-#ifndef TCPOPT_NOP
-# define TCPOPT_NOP		1
-#endif
-#ifndef TCPOPT_MAXSEG
-# define TCPOPT_MAXSEG		2
-#endif
-#ifndef TCPOLEN_MAXSEG
-# define TCPOLEN_MAXSEG		4
-#endif
-#ifndef TCPOPT_WINDOW
-# define TCPOPT_WINDOW		3
-#endif
-#ifndef TCPOLEN_WINDOW
-# define TCPOLEN_WINDOW		3
-#endif
-#ifndef TCPOPT_SACK_PERMITTED
-# define TCPOPT_SACK_PERMITTED	4
-#endif
-#ifndef TCPOLEN_SACK_PERMITTED
-# define TCPOLEN_SACK_PERMITTED	2
-#endif
-#ifndef TCPOPT_SACK
-# define TCPOPT_SACK		5
-#endif
-#ifndef TCPOPT_TIMESTAMP
-# define TCPOPT_TIMESTAMP	8
-#endif
-
-#ifndef	ICMP_MINLEN
-# define	ICMP_MINLEN	8
-#endif
-#ifndef	ICMP_ECHOREPLY
-# define	ICMP_ECHOREPLY	0
-#endif
-#ifndef	ICMP_UNREACH
-# define	ICMP_UNREACH	3
-#endif
-#ifndef	ICMP_UNREACH_NET
-# define	ICMP_UNREACH_NET	0
-#endif
-#ifndef	ICMP_UNREACH_HOST
-# define	ICMP_UNREACH_HOST	1
-#endif
-#ifndef	ICMP_UNREACH_PROTOCOL
-# define	ICMP_UNREACH_PROTOCOL	2
-#endif
-#ifndef	ICMP_UNREACH_PORT
-# define	ICMP_UNREACH_PORT	3
-#endif
-#ifndef	ICMP_UNREACH_NEEDFRAG
-# define	ICMP_UNREACH_NEEDFRAG	4
-#endif
-#ifndef	ICMP_UNREACH_SRCFAIL
-# define	ICMP_UNREACH_SRCFAIL	5
-#endif
-#ifndef	ICMP_UNREACH_NET_UNKNOWN
-# define	ICMP_UNREACH_NET_UNKNOWN	6
-#endif
-#ifndef	ICMP_UNREACH_HOST_UNKNOWN
-# define	ICMP_UNREACH_HOST_UNKNOWN	7
-#endif
-#ifndef	ICMP_UNREACH_ISOLATED
-# define	ICMP_UNREACH_ISOLATED	8
-#endif
-#ifndef	ICMP_UNREACH_NET_PROHIB
-# define	ICMP_UNREACH_NET_PROHIB	9
-#endif
-#ifndef	ICMP_UNREACH_HOST_PROHIB
-# define	ICMP_UNREACH_HOST_PROHIB	10
-#endif
-#ifndef	ICMP_UNREACH_TOSNET
-# define	ICMP_UNREACH_TOSNET	11
-#endif
-#ifndef	ICMP_UNREACH_TOSHOST
-# define	ICMP_UNREACH_TOSHOST	12
-#endif
-#ifndef	ICMP_UNREACH_ADMIN_PROHIBIT
-# define	ICMP_UNREACH_ADMIN_PROHIBIT	13
-#endif
-#ifndef	ICMP_UNREACH_FILTER
-# define	ICMP_UNREACH_FILTER	13
-#endif
-#ifndef	ICMP_UNREACH_HOST_PRECEDENCE
-# define	ICMP_UNREACH_HOST_PRECEDENCE	14
-#endif
-#ifndef	ICMP_UNREACH_PRECEDENCE_CUTOFF
-# define	ICMP_UNREACH_PRECEDENCE_CUTOFF	15
-#endif
-#ifndef	ICMP_SOURCEQUENCH
-# define	ICMP_SOURCEQUENCH	4
-#endif
-#ifndef	ICMP_REDIRECT_NET
-# define	ICMP_REDIRECT_NET	0
-#endif
-#ifndef	ICMP_REDIRECT_HOST
-# define	ICMP_REDIRECT_HOST	1
-#endif
-#ifndef	ICMP_REDIRECT_TOSNET
-# define	ICMP_REDIRECT_TOSNET	2
-#endif
-#ifndef	ICMP_REDIRECT_TOSHOST
-# define	ICMP_REDIRECT_TOSHOST	3
-#endif
-#ifndef	ICMP_ALTHOSTADDR
-# define	ICMP_ALTHOSTADDR	6
-#endif
-#ifndef	ICMP_TIMXCEED
-# define	ICMP_TIMXCEED	11
-#endif
-#ifndef	ICMP_TIMXCEED_INTRANS
-# define	ICMP_TIMXCEED_INTRANS	0
-#endif
-#ifndef	ICMP_TIMXCEED_REASS
-# define		ICMP_TIMXCEED_REASS	1
-#endif
-#ifndef	ICMP_PARAMPROB
-# define	ICMP_PARAMPROB	12
-#endif
-#ifndef	ICMP_PARAMPROB_ERRATPTR
-# define	ICMP_PARAMPROB_ERRATPTR	0
-#endif
-#ifndef	ICMP_PARAMPROB_OPTABSENT
-# define	ICMP_PARAMPROB_OPTABSENT	1
-#endif
-#ifndef	ICMP_PARAMPROB_LENGTH
-# define	ICMP_PARAMPROB_LENGTH	2
-#endif
-#ifndef ICMP_TSTAMP
-# define	ICMP_TSTAMP	13
-#endif
-#ifndef ICMP_TSTAMPREPLY
-# define	ICMP_TSTAMPREPLY	14
-#endif
-#ifndef ICMP_IREQ
-# define	ICMP_IREQ	15
-#endif
-#ifndef ICMP_IREQREPLY
-# define	ICMP_IREQREPLY	16
-#endif
-#ifndef	ICMP_MASKREQ
-# define	ICMP_MASKREQ	17
-#endif
-#ifndef ICMP_MASKREPLY
-# define	ICMP_MASKREPLY	18
-#endif
-#ifndef	ICMP_TRACEROUTE
-# define	ICMP_TRACEROUTE	30
-#endif
-#ifndef	ICMP_DATACONVERR
-# define	ICMP_DATACONVERR	31
-#endif
-#ifndef	ICMP_MOBILE_REDIRECT
-# define	ICMP_MOBILE_REDIRECT	32
-#endif
-#ifndef	ICMP_IPV6_WHEREAREYOU
-# define	ICMP_IPV6_WHEREAREYOU	33
-#endif
-#ifndef	ICMP_IPV6_IAMHERE
-# define	ICMP_IPV6_IAMHERE	34
-#endif
-#ifndef	ICMP_MOBILE_REGREQUEST
-# define	ICMP_MOBILE_REGREQUEST	35
-#endif
-#ifndef	ICMP_MOBILE_REGREPLY
-# define	ICMP_MOBILE_REGREPLY	36
-#endif
-#ifndef	ICMP_SKIP
-# define	ICMP_SKIP	39
-#endif
-#ifndef	ICMP_PHOTURIS
-# define	ICMP_PHOTURIS	40
-#endif
-#ifndef	ICMP_PHOTURIS_UNKNOWN_INDEX
-# define	ICMP_PHOTURIS_UNKNOWN_INDEX	1
-#endif
-#ifndef	ICMP_PHOTURIS_AUTH_FAILED
-# define	ICMP_PHOTURIS_AUTH_FAILED	2
-#endif
-#ifndef	ICMP_PHOTURIS_DECRYPT_FAILED
-# define	ICMP_PHOTURIS_DECRYPT_FAILED	3
-#endif
-#ifndef	IPVERSION
-# define	IPVERSION	4
-#endif
-#ifndef	IPOPT_MINOFF
-# define	IPOPT_MINOFF	4
-#endif
-#ifndef	IPOPT_COPIED
-# define	IPOPT_COPIED(x)	((x)&0x80)
-#endif
-#ifndef	IPOPT_EOL
-# define	IPOPT_EOL	0
-#endif
-#ifndef	IPOPT_NOP
-# define	IPOPT_NOP	1
-#endif
-#ifndef	IP_MF
-# define	IP_MF	((u_short)0x2000)
-#endif
-#ifndef	ETHERTYPE_IP
-# define	ETHERTYPE_IP	((u_short)0x0800)
-#endif
-#ifndef	TH_FIN
-# define	TH_FIN	0x01
-#endif
-#ifndef	TH_SYN
-# define	TH_SYN	0x02
-#endif
-#ifndef	TH_RST
-# define	TH_RST	0x04
-#endif
-#ifndef	TH_PUSH
-# define	TH_PUSH	0x08
-#endif
-#ifndef	TH_ACK
-# define	TH_ACK	0x10
-#endif
-#ifndef	TH_URG
-# define	TH_URG	0x20
-#endif
-#undef	TH_ACKMASK
-#define	TH_ACKMASK	(TH_FIN|TH_SYN|TH_RST|TH_ACK)
-
-#ifndef	IPOPT_EOL
-# define	IPOPT_EOL	0
-#endif
-#ifndef	IPOPT_NOP
-# define	IPOPT_NOP	1
-#endif
-#ifndef	IPOPT_RR
-# define	IPOPT_RR	7
-#endif
-#ifndef	IPOPT_TS
-# define	IPOPT_TS	68
-#endif
-#ifndef	IPOPT_SECURITY
-# define	IPOPT_SECURITY	130
-#endif
-#ifndef	IPOPT_LSRR
-# define	IPOPT_LSRR	131
-#endif
-#ifndef	IPOPT_SATID
-# define	IPOPT_SATID	136
-#endif
-#ifndef	IPOPT_SSRR
-# define	IPOPT_SSRR	137
-#endif
-#ifndef	IPOPT_SECUR_UNCLASS
-# define	IPOPT_SECUR_UNCLASS	((u_short)0x0000)
-#endif
-#ifndef	IPOPT_SECUR_CONFID
-# define	IPOPT_SECUR_CONFID	((u_short)0xf135)
-#endif
-#ifndef	IPOPT_SECUR_EFTO
-# define	IPOPT_SECUR_EFTO	((u_short)0x789a)
-#endif
-#ifndef	IPOPT_SECUR_MMMM
-# define	IPOPT_SECUR_MMMM	((u_short)0xbc4d)
-#endif
-#ifndef	IPOPT_SECUR_RESTR
-# define	IPOPT_SECUR_RESTR	((u_short)0xaf13)
-#endif
-#ifndef	IPOPT_SECUR_SECRET
-# define	IPOPT_SECUR_SECRET	((u_short)0xd788)
-#endif
-#ifndef IPOPT_SECUR_TOPSECRET
-# define	IPOPT_SECUR_TOPSECRET	((u_short)0x6bc5)
-#endif
-#ifndef IPOPT_OLEN
-# define	IPOPT_OLEN	1
-#endif
-#ifndef	IPPROTO_HOPOPTS
-# define	IPPROTO_HOPOPTS	0
-#endif
-#ifndef	IPPROTO_IPIP
-# define	IPPROTO_IPIP	4
-#endif
-#ifndef	IPPROTO_ENCAP
-# define	IPPROTO_ENCAP	98
-#endif
-#ifndef	IPPROTO_IPV6
-# define	IPPROTO_IPV6	41
-#endif
-#ifndef	IPPROTO_ROUTING
-# define	IPPROTO_ROUTING	43
-#endif
-#ifndef	IPPROTO_FRAGMENT
-# define	IPPROTO_FRAGMENT	44
-#endif
-#ifndef	IPPROTO_GRE
-# define	IPPROTO_GRE	47	/* GRE encaps RFC 1701 */
-#endif
-#ifndef	IPPROTO_ESP
-# define	IPPROTO_ESP	50
-#endif
-#ifndef	IPPROTO_AH
-# define	IPPROTO_AH	51
-#endif
-#ifndef	IPPROTO_ICMPV6
-# define	IPPROTO_ICMPV6	58
-#endif
-#ifndef	IPPROTO_NONE
-# define	IPPROTO_NONE	59
-#endif
-#ifndef	IPPROTO_DSTOPTS
-# define	IPPROTO_DSTOPTS	60
-#endif
-#ifndef	IPPROTO_MOBILITY
-# define	IPPROTO_MOBILITY	135
-#endif
-
-#ifndef	ICMP_ROUTERADVERT
-# define	ICMP_ROUTERADVERT	9
-#endif
-#ifndef	ICMP_ROUTERSOLICIT
-# define	ICMP_ROUTERSOLICIT	10
-#endif
-#ifndef	ICMP6_DST_UNREACH
-# define	ICMP6_DST_UNREACH	1
-#endif
-#ifndef	ICMP6_PACKET_TOO_BIG
-# define	ICMP6_PACKET_TOO_BIG	2
-#endif
-#ifndef	ICMP6_TIME_EXCEEDED
-# define	ICMP6_TIME_EXCEEDED	3
-#endif
-#ifndef	ICMP6_PARAM_PROB
-# define	ICMP6_PARAM_PROB	4
-#endif
-
-#ifndef	ICMP6_ECHO_REQUEST
-# define	ICMP6_ECHO_REQUEST	128
-#endif
-#ifndef	ICMP6_ECHO_REPLY
-# define	ICMP6_ECHO_REPLY	129
-#endif
-#ifndef	ICMP6_MEMBERSHIP_QUERY
-# define	ICMP6_MEMBERSHIP_QUERY	130
-#endif
-#ifndef	MLD6_LISTENER_QUERY
-# define	MLD6_LISTENER_QUERY	130
-#endif
-#ifndef	ICMP6_MEMBERSHIP_REPORT
-# define	ICMP6_MEMBERSHIP_REPORT	131
-#endif
-#ifndef	MLD6_LISTENER_REPORT
-# define	MLD6_LISTENER_REPORT	131
-#endif
-#ifndef	ICMP6_MEMBERSHIP_REDUCTION
-# define	ICMP6_MEMBERSHIP_REDUCTION	132
-#endif
-#ifndef	MLD6_LISTENER_DONE
-# define	MLD6_LISTENER_DONE	132
-#endif
-#ifndef	ND_ROUTER_SOLICIT
-# define	ND_ROUTER_SOLICIT	133
-#endif
-#ifndef	ND_ROUTER_ADVERT
-# define	ND_ROUTER_ADVERT	134
-#endif
-#ifndef	ND_NEIGHBOR_SOLICIT
-# define	ND_NEIGHBOR_SOLICIT	135
-#endif
-#ifndef	ND_NEIGHBOR_ADVERT
-# define	ND_NEIGHBOR_ADVERT	136
-#endif
-#ifndef	ND_REDIRECT
-# define	ND_REDIRECT	137
-#endif
-#ifndef	ICMP6_ROUTER_RENUMBERING
-# define	ICMP6_ROUTER_RENUMBERING	138
-#endif
-#ifndef	ICMP6_WRUREQUEST
-# define	ICMP6_WRUREQUEST	139
-#endif
-#ifndef	ICMP6_WRUREPLY
-# define	ICMP6_WRUREPLY		140
-#endif
-#ifndef	ICMP6_FQDN_QUERY
-# define	ICMP6_FQDN_QUERY	139
-#endif
-#ifndef	ICMP6_FQDN_REPLY
-# define	ICMP6_FQDN_REPLY	140
-#endif
-#ifndef	ICMP6_NI_QUERY
-# define	ICMP6_NI_QUERY		139
-#endif
-#ifndef	ICMP6_NI_REPLY
-# define	ICMP6_NI_REPLY		140
-#endif
-#ifndef	MLD6_MTRACE_RESP
-# define	MLD6_MTRACE_RESP	200
-#endif
-#ifndef	MLD6_MTRACE
-# define	MLD6_MTRACE		201
-#endif
-#ifndef	ICMP6_HADISCOV_REQUEST
-# define	ICMP6_HADISCOV_REQUEST	202
-#endif
-#ifndef	ICMP6_HADISCOV_REPLY
-# define	ICMP6_HADISCOV_REPLY	203
-#endif
-#ifndef	ICMP6_MOBILEPREFIX_SOLICIT
-# define	ICMP6_MOBILEPREFIX_SOLICIT	204
-#endif
-#ifndef	ICMP6_MOBILEPREFIX_ADVERT
-# define	ICMP6_MOBILEPREFIX_ADVERT	205
-#endif
-#ifndef	ICMP6_MAXTYPE
-# define	ICMP6_MAXTYPE		205
-#endif
-
-#ifndef	ICMP6_DST_UNREACH_NOROUTE
-# define	ICMP6_DST_UNREACH_NOROUTE	0
-#endif
-#ifndef	ICMP6_DST_UNREACH_ADMIN
-# define	ICMP6_DST_UNREACH_ADMIN		1
-#endif
-#ifndef	ICMP6_DST_UNREACH_NOTNEIGHBOR
-# define	ICMP6_DST_UNREACH_NOTNEIGHBOR	2
-#endif
-#ifndef	ICMP6_DST_UNREACH_BEYONDSCOPE
-# define	ICMP6_DST_UNREACH_BEYONDSCOPE	2
-#endif
-#ifndef	ICMP6_DST_UNREACH_ADDR
-# define	ICMP6_DST_UNREACH_ADDR		3
-#endif
-#ifndef	ICMP6_DST_UNREACH_NOPORT
-# define	ICMP6_DST_UNREACH_NOPORT	4
-#endif
-#ifndef	ICMP6_TIME_EXCEED_TRANSIT
-# define	ICMP6_TIME_EXCEED_TRANSIT	0
-#endif
-#ifndef	ICMP6_TIME_EXCEED_REASSEMBLY
-# define	ICMP6_TIME_EXCEED_REASSEMBLY	1
-#endif
-
-#ifndef	ICMP6_NI_SUCCESS
-# define	ICMP6_NI_SUCCESS	0
-#endif
-#ifndef	ICMP6_NI_REFUSED
-# define	ICMP6_NI_REFUSED	1
-#endif
-#ifndef	ICMP6_NI_UNKNOWN
-# define	ICMP6_NI_UNKNOWN	2
-#endif
-
-#ifndef	ICMP6_ROUTER_RENUMBERING_COMMAND
-# define	ICMP6_ROUTER_RENUMBERING_COMMAND	0
-#endif
-#ifndef	ICMP6_ROUTER_RENUMBERING_RESULT
-# define	ICMP6_ROUTER_RENUMBERING_RESULT	1
-#endif
-#ifndef	ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET
-# define	ICMP6_ROUTER_RENUMBERING_SEQNUM_RESET	255
-#endif
-
-#ifndef	ICMP6_PARAMPROB_HEADER
-# define	ICMP6_PARAMPROB_HEADER	0
-#endif
-#ifndef	ICMP6_PARAMPROB_NEXTHEADER
-# define	ICMP6_PARAMPROB_NEXTHEADER	1
-#endif
-#ifndef	ICMP6_PARAMPROB_OPTION
-# define	ICMP6_PARAMPROB_OPTION	2
-#endif
-
-#ifndef	ICMP6_NI_SUBJ_IPV6
-# define	ICMP6_NI_SUBJ_IPV6	0
-#endif
-#ifndef	ICMP6_NI_SUBJ_FQDN
-# define	ICMP6_NI_SUBJ_FQDN	1
-#endif
-#ifndef	ICMP6_NI_SUBJ_IPV4
-# define	ICMP6_NI_SUBJ_IPV4	2
-#endif
-
-#ifndef	MLD_MTRACE_RESP
-# define	MLD_MTRACE_RESP		200
-#endif
-#ifndef	MLD_MTRACE
-# define	MLD_MTRACE		201
-#endif
-#ifndef	MLD6_MTRACE_RESP
-# define	MLD6_MTRACE_RESP	MLD_MTRACE_RESP
-#endif
-#ifndef	MLD6_MTRACE
-# define	MLD6_MTRACE		MLD_MTRACE
-#endif
-
-#if !defined(IPV6_FLOWINFO_MASK)
-# if (BYTE_ORDER == BIG_ENDIAN) || defined(_BIG_ENDIAN)
-#  define IPV6_FLOWINFO_MASK	0x0fffffff	/* flow info (28 bits) */
-# else
-#  if(BYTE_ORDER == LITTLE_ENDIAN) || !defined(_BIG_ENDIAN)
-#   define IPV6_FLOWINFO_MASK	0xffffff0f	/* flow info (28 bits) */
-#  endif /* LITTLE_ENDIAN */
-# endif
-#endif
-#if !defined(IPV6_FLOWLABEL_MASK)
-# if (BYTE_ORDER == BIG_ENDIAN) || defined(_BIG_ENDIAN)
-#  define IPV6_FLOWLABEL_MASK	0x000fffff	/* flow label (20 bits) */
-# else
-#  if (BYTE_ORDER == LITTLE_ENDIAN) || !defined(_BIG_ENDIAN)
-#   define IPV6_FLOWLABEL_MASK	0xffff0f00	/* flow label (20 bits) */
-#  endif /* LITTLE_ENDIAN */
-# endif
-#endif
-
-/*
- * ECN is a new addition to TCP - RFC 2481
- */
-#ifndef TH_ECN
-# define	TH_ECN	0x40
-#endif
-#ifndef TH_CWR
-# define	TH_CWR	0x80
-#endif
-#define	TH_ECNALL	(TH_ECN|TH_CWR)
-
-/*
- * TCP States
- */
-#define IPF_TCPS_LISTEN		0	/* listening for connection */
-#define IPF_TCPS_SYN_SENT	1	/* active, have sent syn */
-#define IPF_TCPS_SYN_RECEIVED	2	/* have send and received syn */
-#define IPF_TCPS_HALF_ESTAB	3	/* for connections not fully "up" */
-/* states < IPF_TCPS_ESTABLISHED are those where connections not established */
-#define IPF_TCPS_ESTABLISHED	4	/* established */
-#define IPF_TCPS_CLOSE_WAIT	5	/* rcvd fin, waiting for close */
-/* states > IPF_TCPS_CLOSE_WAIT are those where user has closed */
-#define IPF_TCPS_FIN_WAIT_1	6	/* have closed, sent fin */
-#define IPF_TCPS_CLOSING	7	/* closed xchd FIN; await FIN ACK */
-#define IPF_TCPS_LAST_ACK	8	/* had fin and close; await FIN ACK */
-/* states > IPF_TCPS_CLOSE_WAIT && < IPF_TCPS_FIN_WAIT_2 await ACK of FIN */
-#define IPF_TCPS_FIN_WAIT_2	9	/* have closed, fin is acked */
-#define IPF_TCPS_TIME_WAIT	10	/* in 2*msl quiet wait after close */
-#define IPF_TCPS_CLOSED		11	/* closed */
-#define IPF_TCP_NSTATES		12
-
-#define	TCP_MSL			120
-
-#undef	ICMP_MAX_UNREACH
-#define	ICMP_MAX_UNREACH	14
-#undef	ICMP_MAXTYPE
-#define	ICMP_MAXTYPE		18
-
-#ifndef	IFNAMSIZ
-#define	IFNAMSIZ		16
-#endif
-
-#ifndef	LOG_FTP
-# define	LOG_FTP		(11<<3)
-#endif
-#ifndef	LOG_AUTHPRIV
-# define	LOG_AUTHPRIV	(10<<3)
-#endif
-#ifndef	LOG_AUDIT
-# define	LOG_AUDIT	(13<<3)
-#endif
-#ifndef	LOG_NTP
-# define	LOG_NTP		(12<<3)
-#endif
-#ifndef	LOG_SECURITY
-# define	LOG_SECURITY	(13<<3)
-#endif
-#ifndef	LOG_LFMT
-# define	LOG_LFMT	(14<<3)
-#endif
-#ifndef	LOG_CONSOLE
-# define	LOG_CONSOLE	(14<<3)
-#endif
-
-/*
- * ICMP error replies have an IP header (20 bytes), 8 bytes of ICMP data,
- * another IP header and then 64 bits of data, totalling 56.  Of course,
- * the last 64 bits is dependent on that being available.
- */
-#define	ICMPERR_ICMPHLEN	8
-#define	ICMPERR_IPICMPHLEN	(20 + 8)
-#define	ICMPERR_MINPKTLEN	(20 + 8 + 20)
-#define	ICMPERR_MAXPKTLEN	(20 + 8 + 20 + 8)
-#define ICMP6ERR_MINPKTLEN	(40 + 8)
-#define ICMP6ERR_IPICMPHLEN	(40 + 8 + 40)
-
-#ifndef MIN
-# define	MIN(a,b)	(((a)<(b))?(a):(b))
-#endif
-
-#ifdef RESCUE
-# undef IPFILTER_BPF
-#endif
-
-#ifdef IPF_DEBUG
-# define	DPRINT(x)	printf x
-#else
-# define	DPRINT(x)
-#endif
-
-#ifndef	AF_INET6
-# define	AF_INET6	26
-#endif
-
-#ifdef DTRACE_PROBE
-# ifdef _KERNEL
-#  define	DT(_n)			DTRACE_PROBE(_n)
-#  define	DT1(_n,_a,_b)		DTRACE_PROBE1(_n,_a,_b)
-#  define	DT2(_n,_a,_b,_c,_d)	DTRACE_PROBE2(_n,_a,_b,_c,_d)
-#  define	DT3(_n,_a,_b,_c,_d,_e,_f)	\
-					DTRACE_PROBE3(_n,_a,_b,_c,_d,_e,_f)
-#  define	DT4(_n,_a,_b,_c,_d,_e,_f,_g,_h) \
-				DTRACE_PROBE4(_n,_a,_b,_c,_d,_e,_f,_g,_h)
-# else
-#  define	DT(_n)
-#  define	DT1(_n,_a,_b)
-#  define	DT2(_n,_a,_b,_c,_d)
-#  define	DT3(_n,_a,_b,_c,_d,_e,_f)
-#  define	DT4(_n,_a,_b,_c,_d,_e,_f,_g,_h)
-# endif
-#else
-# define	DT(_n)
-# define	DT1(_n,_a,_b)
-# define	DT2(_n,_a,_b,_c,_d)
-# define	DT3(_n,_a,_b,_c,_d,_e,_f)
-# define	DT4(_n,_a,_b,_c,_d,_e,_f,_g,_h)
-#endif
-
-struct ip6_routing {
-	u_char	ip6r_nxt;	/* next header */
-	u_char	ip6r_len;	/* length in units of 8 octets */
-	u_char	ip6r_type;	/* always zero */
-	u_char	ip6r_segleft;	/* segments left */
-	u_32_t	ip6r_reserved;	/* reserved field */
-};
-
-#endif	/* __IP_COMPAT_H__ */
diff --git a/include.new/netinet/ip_divert.h b/include.new/netinet/ip_divert.h
deleted file mode 100644
index 956ce3a..0000000
--- a/include.new/netinet/ip_divert.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2003 Sam Leffler, Errno Consulting
- * 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,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
- *    redistribution must be conditioned upon including a substantially
- *    similar Disclaimer requirement for further binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
- *
- * $FreeBSD: releng/10.2/sys/netinet/ip_divert.h 201527 2010-01-04 19:01:22Z luigi $
- */
-
-#ifndef _NETINET_IP_DIVERT_H_
-#define	_NETINET_IP_DIVERT_H_
-
-/*
- * divert has no custom kernel-userland API.
- *
- * All communication occurs through a sockaddr_in socket where
- *
- * kernel-->userland
- *	sin_port = matching rule, host format;
- * 	sin_addr = IN: first address of the incoming interface;
- *		   OUT: INADDR_ANY
- *	sin_zero = if fits, the interface name (max 7 bytes + NUL)
- *
- * userland->kernel
- *	sin_port = restart-rule - 1, host order
- *		(we restart at sin_port + 1)
- *	sin_addr = IN: address of the incoming interface;
- *		   OUT: INADDR_ANY
- */
-#endif /* _NETINET_IP_DIVERT_H_ */
diff --git a/include.new/netinet/ip_dstlist.h b/include.new/netinet/ip_dstlist.h
deleted file mode 100644
index e2885e5..0000000
--- a/include.new/netinet/ip_dstlist.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * $Id: ip_dstlist.h,v 1.5.2.6 2012/07/22 08:04:23 darren_r Exp $
- */
-
-#ifndef	__IP_DSTLIST_H__
-#define	__IP_DSTLIST_H__
-
-typedef struct ipf_dstnode {
-	struct ipf_dstnode	*ipfd_next;
-	struct ipf_dstnode	**ipfd_pnext;
-	ipfmutex_t		ipfd_lock;
-	frdest_t		ipfd_dest;
-	u_long			ipfd_syncat;
-	int			ipfd_flags;
-	int			ipfd_size;
-	int			ipfd_states;
-	int			ipfd_ref;
-	int			ipfd_uid;
-	char			ipfd_names[1];
-} ipf_dstnode_t;
-
-typedef enum ippool_policy_e {
-	IPLDP_NONE = 0,
-	IPLDP_ROUNDROBIN,
-	IPLDP_CONNECTION,
-	IPLDP_RANDOM,
-	IPLDP_HASHED,
-	IPLDP_SRCHASH,
-	IPLDP_DSTHASH
-} ippool_policy_t;
-
-typedef struct ippool_dst {
-	struct ippool_dst	*ipld_next;
-	struct ippool_dst	**ipld_pnext;
-	ipfmutex_t		ipld_lock;
-	int			ipld_seed;
-	int			ipld_unit;
-	int			ipld_ref;
-	int			ipld_flags;
-	int			ipld_nodes;
-	int			ipld_maxnodes;
-	ippool_policy_t		ipld_policy;
-	ipf_dstnode_t		**ipld_dests;
-	ipf_dstnode_t		*ipld_selected;
-	char			ipld_name[FR_GROUPLEN];
-} ippool_dst_t;
-
-#define	IPDST_DELETE		0x01
-
-typedef	struct dstlist_stat_s {
-	void			*ipls_list[LOOKUP_POOL_SZ];
-	int			ipls_numlists;
-	u_long			ipls_nomem;
-	int			ipls_numnodes;
-	int			ipls_numdereflists;
-	int			ipls_numderefnodes;
-} ipf_dstl_stat_t;
-
-extern ipf_lookup_t ipf_dstlist_backend;
-
-extern int ipf_dstlist_select_node __P((fr_info_t *, void *, u_32_t *,
-					frdest_t *));
-
-#endif /* __IP_DSTLIST_H__ */
diff --git a/include.new/netinet/ip_dummynet.h b/include.new/netinet/ip_dummynet.h
deleted file mode 100644
index f906a10..0000000
--- a/include.new/netinet/ip_dummynet.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*-
- * Copyright (c) 1998-2010 Luigi Rizzo, Universita` di Pisa
- * Portions Copyright (c) 2000 Akamba Corp.
- * 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.
- *
- * 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: releng/10.2/sys/netinet/ip_dummynet.h 239124 2012-08-07 07:52:25Z luigi $
- */
-
-#ifndef _IP_DUMMYNET_H
-#define _IP_DUMMYNET_H
-
-/*
- * Definition of the kernel-userland API for dummynet.
- *
- * Setsockopt() and getsockopt() pass a batch of objects, each
- * of them starting with a "struct dn_id" which should fully identify
- * the object and its relation with others in the sequence.
- * The first object in each request should have
- *	 type= DN_CMD_*, id = DN_API_VERSION.
- * For other objects, type and subtype specify the object, len indicates
- * the total length including the header, and 'id' identifies the specific
- * object.
- *
- * Most objects are numbered with an identifier in the range 1..65535.
- * DN_MAX_ID indicates the first value outside the range.
- */
-
-#define	DN_API_VERSION	12500000
-#define	DN_MAX_ID	0x10000
-
-struct dn_id {
-	uint16_t	len;	/* total obj len including this header */
-	uint8_t		type;
-	uint8_t		subtype;
-	uint32_t	id;	/* generic id */
-};
-
-/*
- * These values are in the type field of struct dn_id.
- * To preserve the ABI, never rearrange the list or delete
- * entries with the exception of DN_LAST
- */
-enum {
-	DN_NONE = 0,
-	DN_LINK = 1,
-	DN_FS,
-	DN_SCH,
-	DN_SCH_I,
-	DN_QUEUE,
-	DN_DELAY_LINE,
-	DN_PROFILE,
-	DN_FLOW,		/* struct dn_flow */
-	DN_TEXT,		/* opaque text is the object */
-
-	DN_CMD_CONFIG = 0x80,	/* objects follow */
-	DN_CMD_DELETE,		/* subtype + list of entries */
-	DN_CMD_GET,		/* subtype + list of entries */
-	DN_CMD_FLUSH,
-	/* for compatibility with FreeBSD 7.2/8 */
-	DN_COMPAT_PIPE,
-	DN_COMPAT_QUEUE,
-	DN_GET_COMPAT,
-
-	/* special commands for emulation of sysctl variables */
-	DN_SYSCTL_GET,
-	DN_SYSCTL_SET,
-
-	DN_LAST,
-};
-
-enum { /* subtype for schedulers, flowset and the like */
-	DN_SCHED_UNKNOWN = 0,
-	DN_SCHED_FIFO = 1,
-	DN_SCHED_WF2QP = 2,
-	/* others are in individual modules */
-};
-
-enum {	/* user flags */
-	DN_HAVE_MASK	= 0x0001,	/* fs or sched has a mask */
-	DN_NOERROR	= 0x0002,	/* do not report errors */
-	DN_QHT_HASH	= 0x0004,	/* qht is a hash table */
-	DN_QSIZE_BYTES	= 0x0008,	/* queue size is in bytes */
-	DN_HAS_PROFILE	= 0x0010,	/* a link has a profile */
-	DN_IS_RED	= 0x0020,
-	DN_IS_GENTLE_RED= 0x0040,
-	DN_PIPE_CMD	= 0x1000,	/* pipe config... */
-};
-
-/*
- * link template.
- */
-struct dn_link {
-	struct dn_id oid;
-
-	/*
-	 * Userland sets bw and delay in bits/s and milliseconds.
-	 * The kernel converts this back and forth to bits/tick and ticks.
-	 * XXX what about burst ?
-	 */
-	int32_t		link_nr;
-	int		bandwidth;	/* bit/s or bits/tick.   */
-	int		delay;		/* ms and ticks */
-	uint64_t	burst;		/* scaled. bits*Hz  XXX */
-};
-
-/*
- * A flowset, which is a template for flows. Contains parameters
- * from the command line: id, target scheduler, queue sizes, plr,
- * flow masks, buckets for the flow hash, and possibly scheduler-
- * specific parameters (weight, quantum and so on).
- */
-struct dn_fs {
-	struct dn_id oid;
-	uint32_t fs_nr;		/* the flowset number */
-	uint32_t flags;		/* userland flags */
-	int qsize;		/* queue size in slots or bytes */
-	int32_t plr;		/* PLR, pkt loss rate (2^31-1 means 100%) */
-	uint32_t buckets;	/* buckets used for the queue hash table */
-
-	struct ipfw_flow_id flow_mask;
-	uint32_t sched_nr;	/* the scheduler we attach to */
-	/* generic scheduler parameters. Leave them at -1 if unset.
-	 * Now we use 0: weight, 1: lmax, 2: priority
-	 */
-	int par[4];
-
-	/* RED/GRED parameters.
-	 * weight and probabilities are in the range 0..1 represented
-	 * in fixed point arithmetic with SCALE_RED decimal bits.
-	 */
-#define SCALE_RED	16
-#define SCALE(x)	( (x) << SCALE_RED )
-#define SCALE_VAL(x)	( (x) >> SCALE_RED )
-#define SCALE_MUL(x,y)	( ( (x) * (y) ) >> SCALE_RED )
-	int w_q ;		/* queue weight (scaled) */
-	int max_th ;		/* maximum threshold for queue (scaled) */
-	int min_th ;		/* minimum threshold for queue (scaled) */
-	int max_p ;		/* maximum value for p_b (scaled) */
-
-};
-
-/*
- * dn_flow collects flow_id and stats for queues and scheduler
- * instances, and is used to pass these info to userland.
- * oid.type/oid.subtype describe the object, oid.id is number
- * of the parent object.
- */
-struct dn_flow {
-	struct dn_id	oid;
-	struct ipfw_flow_id fid;
-	uint64_t	tot_pkts; /* statistics counters  */
-	uint64_t	tot_bytes;
-	uint32_t	length; /* Queue length, in packets */
-	uint32_t	len_bytes; /* Queue length, in bytes */
-	uint32_t	drops;
-};
-
-
-/*
- * Scheduler template, mostly indicating the name, number,
- * sched_mask and buckets.
- */
-struct dn_sch {
-	struct dn_id	oid;
-	uint32_t	sched_nr; /* N, scheduler number */
-	uint32_t	buckets; /* number of buckets for the instances */
-	uint32_t	flags;	/* have_mask, ... */
-
-	char name[16];	/* null terminated */
-	/* mask to select the appropriate scheduler instance */
-	struct ipfw_flow_id sched_mask; /* M */
-};
-
-
-/* A delay profile is attached to a link.
- * Note that a profile, as any other object, cannot be longer than 2^16
- */
-#define	ED_MAX_SAMPLES_NO	1024
-struct dn_profile {
-	struct dn_id	oid;
-	/* fields to simulate a delay profile */
-#define ED_MAX_NAME_LEN		32
-	char	name[ED_MAX_NAME_LEN];
-	int	link_nr;
-	int	loss_level;
-	int	bandwidth;			// XXX use link bandwidth?
-	int	samples_no;			/* actual len of samples[] */
-	int	samples[ED_MAX_SAMPLES_NO];	/* may be shorter */
-};
-
-
-
-/*
- * Overall structure of dummynet
-
-In dummynet, packets are selected with the firewall rules, and passed
-to two different objects: PIPE or QUEUE (bad name).
-
-A QUEUE defines a classifier, which groups packets into flows
-according to a 'mask', puts them into independent queues (one
-per flow) with configurable size and queue management policy,
-and passes flows to a scheduler:
-
-                 (flow_mask|sched_mask)  sched_mask
-	 +---------+   weight Wx  +-------------+
-         |         |->-[flow]-->--|             |-+
-    -->--| QUEUE x |   ...        |             | |
-         |         |->-[flow]-->--| SCHEDuler N | |
-	 +---------+              |             | |
-	     ...                  |             +--[LINK N]-->--
-	 +---------+   weight Wy  |             | +--[LINK N]-->--
-         |         |->-[flow]-->--|             | |
-    -->--| QUEUE y |   ...        |             | |
-         |         |->-[flow]-->--|             | |
-	 +---------+              +-------------+ |
-	                            +-------------+
-
-Many QUEUE objects can connect to the same scheduler, each
-QUEUE object can have its own set of parameters.
-
-In turn, the SCHEDuler 'forks' multiple instances according
-to a 'sched_mask', each instance manages its own set of queues
-and transmits on a private instance of a configurable LINK.
-
-A PIPE is a simplified version of the above, where there
-is no flow_mask, and each scheduler instance handles a single queue.
-
-The following data structures (visible from userland) describe
-the objects used by dummynet:
-
- + dn_link, contains the main configuration parameters related
-   to delay and bandwidth;
- + dn_profile describes a delay profile;
- + dn_flow describes the flow status (flow id, statistics)
-   
- + dn_sch describes a scheduler
- + dn_fs describes a flowset (msk, weight, queue parameters)
-
- *
- */
-
-#endif /* _IP_DUMMYNET_H */
diff --git a/include.new/netinet/ip_ecn.h b/include.new/netinet/ip_ecn.h
deleted file mode 100644
index f1b42cc..0000000
--- a/include.new/netinet/ip_ecn.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netinet/ip_ecn.h 139823 2005-01-07 01:45:51Z imp $	*/
-/*	$KAME: ip_ecn.h,v 1.8 2002/01/07 11:34:47 kjc Exp $	*/
-
-/*-
- * Copyright (C) 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- */
-/*
- * ECN consideration on tunnel ingress/egress operation.
- * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
- */
-
-#ifndef _NETINET_IP_ECN_H_
-#define _NETINET_IP_ECN_H_
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-
-#define ECN_ALLOWED	1	/* ECN allowed */
-#define ECN_FORBIDDEN	0	/* ECN forbidden */
-#define ECN_NOCARE	(-1)	/* no consideration to ECN */
-
-#ifdef _KERNEL
-extern void ip_ecn_ingress(int, u_int8_t *, const u_int8_t *);
-extern int ip_ecn_egress(int, const u_int8_t *, u_int8_t *);
-#endif
-#endif
diff --git a/include.new/netinet/ip_encap.h b/include.new/netinet/ip_encap.h
deleted file mode 100644
index d267710..0000000
--- a/include.new/netinet/ip_encap.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netinet/ip_encap.h 139823 2005-01-07 01:45:51Z imp $	*/
-/*	$KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETINET_IP_ENCAP_H_
-#define _NETINET_IP_ENCAP_H_
-
-#ifdef _KERNEL
-
-struct encaptab {
-	LIST_ENTRY(encaptab) chain;
-	int af;
-	int proto;			/* -1: don't care, I'll check myself */
-	struct sockaddr_storage src;	/* my addr */
-	struct sockaddr_storage srcmask;
-	struct sockaddr_storage dst;	/* remote addr */
-	struct sockaddr_storage dstmask;
-	int (*func)(const struct mbuf *, int, int, void *);
-	const struct protosw *psw;	/* only pr_input will be used */
-	void *arg;			/* passed via m->m_pkthdr.aux */
-};
-
-void	encap_init(void);
-void	encap4_input(struct mbuf *, int);
-int	encap6_input(struct mbuf **, int *, int);
-const struct encaptab *encap_attach(int, int, const struct sockaddr *,
-	const struct sockaddr *, const struct sockaddr *,
-	const struct sockaddr *, const struct protosw *, void *);
-const struct encaptab *encap_attach_func(int, int,
-	int (*)(const struct mbuf *, int, int, void *),
-	const struct protosw *, void *);
-int	encap_detach(const struct encaptab *);
-void	*encap_getarg(struct mbuf *);
-#endif
-
-#endif /*_NETINET_IP_ENCAP_H_*/
diff --git a/include.new/netinet/ip_fil.h b/include.new/netinet/ip_fil.h
deleted file mode 100644
index 5292760..0000000
--- a/include.new/netinet/ip_fil.h
+++ /dev/null
@@ -1,2000 +0,0 @@
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ip_fil.h	1.35 6/5/96
- * $FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_fil.h 255755 2013-09-21 04:05:38Z cy $
- * Id: ip_fil.h,v 2.170.2.51 2007/10/10 09:48:03 darrenr Exp $
- */
-
-#ifndef	__IP_FIL_H__
-#define	__IP_FIL_H__
-
-#include "netinet/ip_compat.h"
-#include "netinet/ipf_rb.h"
-#if NETBSD_GE_REV(104040000)
-# include <sys/callout.h>
-#endif
-#if defined(BSD) && defined(_KERNEL)
-# if NETBSD_LT_REV(399000000) || defined(__osf__) || FREEBSD_LT_REV(500043)
-#  include <sys/select.h>
-# else
-#  include <sys/selinfo.h>
-# endif
-#endif
-
-#if !defined(linux) || !defined(_KERNEL)
-# include <netinet/in.h>
-#endif
-
-#ifndef	SOLARIS
-# define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
-#endif
-
-#ifndef	__P
-# ifdef	__STDC__
-#  define	__P(x)	x
-# else
-#  define	__P(x)	()
-# endif
-#endif
-
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
-# define	SIOCADAFR	_IOW('r', 60, struct ipfobj)
-# define	SIOCRMAFR	_IOW('r', 61, struct ipfobj)
-# define	SIOCSETFF	_IOW('r', 62, u_int)
-# define	SIOCGETFF	_IOR('r', 63, u_int)
-# define	SIOCGETFS	_IOWR('r', 64, struct ipfobj)
-# define	SIOCIPFFL	_IOWR('r', 65, int)
-# define	SIOCIPFFB	_IOR('r', 66, int)
-# define	SIOCADIFR	_IOW('r', 67, struct ipfobj)
-# define	SIOCRMIFR	_IOW('r', 68, struct ipfobj)
-# define	SIOCSWAPA	_IOR('r', 69, u_int)
-# define	SIOCINAFR	_IOW('r', 70, struct ipfobj)
-# define	SIOCINIFR	_IOW('r', 71, struct ipfobj)
-# define	SIOCFRENB	_IOW('r', 72, u_int)
-# define	SIOCFRSYN	_IOW('r', 73, u_int)
-# define	SIOCFRZST	_IOWR('r', 74, struct ipfobj)
-# define	SIOCZRLST	_IOWR('r', 75, struct ipfobj)
-# define	SIOCAUTHW	_IOWR('r', 76, struct ipfobj)
-# define	SIOCAUTHR	_IOWR('r', 77, struct ipfobj)
-# define	SIOCSTAT1	_IOWR('r', 78, struct ipfobj)
-# define	SIOCSTLCK	_IOWR('r', 79, u_int)
-# define	SIOCSTPUT	_IOWR('r', 80, struct ipfobj)
-# define	SIOCSTGET	_IOWR('r', 81, struct ipfobj)
-# define	SIOCSTGSZ	_IOWR('r', 82, struct ipfobj)
-# define	SIOCSTAT2	_IOWR('r', 83, struct ipfobj)
-# define	SIOCSETLG	_IOWR('r', 84, int)
-# define	SIOCGETLG	_IOWR('r', 85, int)
-# define	SIOCFUNCL	_IOWR('r', 86, struct ipfunc_resolve)
-# define	SIOCIPFGETNEXT	_IOWR('r', 87, struct ipfobj)
-# define	SIOCIPFGET	_IOWR('r', 88, struct ipfobj)
-# define	SIOCIPFSET	_IOWR('r', 89, struct ipfobj)
-# define	SIOCIPFL6	_IOWR('r', 90, int)
-# define	SIOCIPFITER	_IOWR('r', 91, struct ipfobj)
-# define	SIOCGENITER	_IOWR('r', 92, struct ipfobj)
-# define	SIOCGTABL	_IOWR('r', 93, struct ipfobj)
-# define	SIOCIPFDELTOK	_IOWR('r', 94, int)
-# define	SIOCLOOKUPITER	_IOWR('r', 95, struct ipfobj)
-# define	SIOCGTQTAB	_IOWR('r', 96, struct ipfobj)
-# define	SIOCMATCHFLUSH	_IOWR('r', 97, struct ipfobj)
-# define	SIOCIPFINTERROR	_IOR('r', 98, int)
-#else
-# define	SIOCADAFR	_IOW(r, 60, struct ipfobj)
-# define	SIOCRMAFR	_IOW(r, 61, struct ipfobj)
-# define	SIOCSETFF	_IOW(r, 62, u_int)
-# define	SIOCGETFF	_IOR(r, 63, u_int)
-# define	SIOCGETFS	_IOWR(r, 64, struct ipfobj)
-# define	SIOCIPFFL	_IOWR(r, 65, int)
-# define	SIOCIPFFB	_IOR(r, 66, int)
-# define	SIOCADIFR	_IOW(r, 67, struct ipfobj)
-# define	SIOCRMIFR	_IOW(r, 68, struct ipfobj)
-# define	SIOCSWAPA	_IOR(r, 69, u_int)
-# define	SIOCINAFR	_IOW(r, 70, struct ipfobj)
-# define	SIOCINIFR	_IOW(r, 71, struct ipfobj)
-# define	SIOCFRENB	_IOW(r, 72, u_int)
-# define	SIOCFRSYN	_IOW(r, 73, u_int)
-# define	SIOCFRZST	_IOWR(r, 74, struct ipfobj)
-# define	SIOCZRLST	_IOWR(r, 75, struct ipfobj)
-# define	SIOCAUTHW	_IOWR(r, 76, struct ipfobj)
-# define	SIOCAUTHR	_IOWR(r, 77, struct ipfobj)
-# define	SIOCSTAT1	_IOWR(r, 78, struct ipfobj)
-# define	SIOCSTLCK	_IOWR(r, 79, u_int)
-# define	SIOCSTPUT	_IOWR(r, 80, struct ipfobj)
-# define	SIOCSTGET	_IOWR(r, 81, struct ipfobj)
-# define	SIOCSTGSZ	_IOWR(r, 82, struct ipfobj)
-# define	SIOCSTAT2	_IOWR(r, 83, struct ipfobj)
-# define	SIOCSETLG	_IOWR(r, 84, int)
-# define	SIOCGETLG	_IOWR(r, 85, int)
-# define	SIOCFUNCL	_IOWR(r, 86, struct ipfunc_resolve)
-# define	SIOCIPFGETNEXT	_IOWR(r, 87, struct ipfobj)
-# define	SIOCIPFGET	_IOWR(r, 88, struct ipfobj)
-# define	SIOCIPFSET	_IOWR(r, 89, struct ipfobj)
-# define	SIOCIPFL6	_IOWR(r, 90, int)
-# define	SIOCIPFITER	_IOWR(r, 91, struct ipfobj)
-# define	SIOCGENITER	_IOWR(r, 92, struct ipfobj)
-# define	SIOCGTABL	_IOWR(r, 93, struct ipfobj)
-# define	SIOCIPFDELTOK	_IOWR(r, 94, int)
-# define	SIOCLOOKUPITER	_IOWR(r, 95, struct ipfobj)
-# define	SIOCGTQTAB	_IOWR(r, 96, struct ipfobj)
-# define	SIOCMATCHFLUSH	_IOWR(r, 97, struct ipfobj)
-# define	SIOCIPFINTERROR	_IOR(r, 98, int)
-#endif
-#define	SIOCADDFR	SIOCADAFR
-#define	SIOCDELFR	SIOCRMAFR
-#define	SIOCINSFR	SIOCINAFR
-#define	SIOCATHST	SIOCSTAT1
-#define	SIOCGFRST	SIOCSTAT2
-
-
-struct ipscan;
-struct ifnet;
-struct ipf_main_softc_s;
-
-typedef	int	(* lookupfunc_t) __P((struct ipf_main_softc_s *, void *,
-				      int, void *, u_int));
-
-/*
- * i6addr is used as a container for both IPv4 and IPv6 addresses, as well
- * as other types of objects, depending on its qualifier.
- */
-#ifdef	USE_INET6
-typedef	union	i6addr	{
-	u_32_t	i6[4];
-	struct	in_addr	in4;
-	struct	in6_addr in6;
-	void	*vptr[2];
-	lookupfunc_t	lptr[2];
-	struct {
-		u_short	type;
-		u_short	subtype;
-		int	name;
-	} i6un;
-} i6addr_t;
-#else
-typedef	union	i6addr	{
-	u_32_t	i6[4];
-	struct	in_addr	in4;
-	void	*vptr[2];
-	lookupfunc_t	lptr[2];
-	struct {
-		u_short	type;
-		u_short	subtype;
-		int	name;
-	} i6un;
-} i6addr_t;
-#endif
-
-#define in4_addr	in4.s_addr
-#define	iplookupnum	i6[1]
-#define	iplookupname	i6un.name
-#define	iplookuptype	i6un.type
-#define	iplookupsubtype	i6un.subtype
-/*
- * NOTE: These DO overlap the above on 64bit systems and this IS recognised.
- */
-#define	iplookupptr	vptr[0]
-#define	iplookupfunc	lptr[1]
-
-#define	I60(x)	(((u_32_t *)(x))[0])
-#define	I61(x)	(((u_32_t *)(x))[1])
-#define	I62(x)	(((u_32_t *)(x))[2])
-#define	I63(x)	(((u_32_t *)(x))[3])
-#define	HI60(x)	ntohl(((u_32_t *)(x))[0])
-#define	HI61(x)	ntohl(((u_32_t *)(x))[1])
-#define	HI62(x)	ntohl(((u_32_t *)(x))[2])
-#define	HI63(x)	ntohl(((u_32_t *)(x))[3])
-
-#define	IP6_EQ(a,b)	((I63(a) == I63(b)) && (I62(a) == I62(b)) && \
-			 (I61(a) == I61(b)) && (I60(a) == I60(b)))
-#define	IP6_NEQ(a,b)	((I63(a) != I63(b)) || (I62(a) != I62(b)) || \
-			 (I61(a) != I61(b)) || (I60(a) != I60(b)))
-#define IP6_ISZERO(a)   ((I60(a) | I61(a) | I62(a) | I63(a)) == 0)
-#define IP6_NOTZERO(a)  ((I60(a) | I61(a) | I62(a) | I63(a)) != 0)
-#define	IP6_ISONES(a)	((I63(a) == 0xffffffff) && (I62(a) == 0xffffffff) && \
-			 (I61(a) == 0xffffffff) && (I60(a) == 0xffffffff))
-#define	IP6_GT(a,b)	(ntohl(HI60(a)) > ntohl(HI60(b)) || \
-			 (HI60(a) == HI60(b) && \
-			  (ntohl(HI61(a)) > ntohl(HI61(b)) || \
-			   (HI61(a) == HI61(b) && \
-			    (ntohl(HI62(a)) > ntohl(HI62(b)) || \
-			     (HI62(a) == HI62(b) && \
-			      ntohl(HI63(a)) > ntohl(HI63(b))))))))
-#define	IP6_LT(a,b)	(ntohl(HI60(a)) < ntohl(HI60(b)) || \
-			 (HI60(a) == HI60(b) && \
-			  (ntohl(HI61(a)) < ntohl(HI61(b)) || \
-			   (HI61(a) == HI61(b) && \
-			    (ntohl(HI62(a)) < ntohl(HI62(b)) || \
-			     (HI62(a) == HI62(b) && \
-			      ntohl(HI63(a)) < ntohl(HI63(b))))))))
-#define	NLADD(n,x)	htonl(ntohl(n) + (x))
-#define	IP6_INC(a)	\
-		do { u_32_t *_i6 = (u_32_t *)(a); \
-		  _i6[3] = NLADD(_i6[3], 1); \
-		  if (_i6[3] == 0) { \
-			_i6[2] = NLADD(_i6[2], 1); \
-			if (_i6[2] == 0) { \
-				_i6[1] = NLADD(_i6[1], 1); \
-				if (_i6[1] == 0) { \
-					_i6[0] = NLADD(_i6[0], 1); \
-				} \
-			} \
-		  } \
-		} while (0)
-#define	IP6_ADD(a,x,d)	\
-		do { i6addr_t *_s = (i6addr_t *)(a); \
-		  i6addr_t *_d = (i6addr_t *)(d); \
-		  _d->i6[0] = NLADD(_s->i6[0], x); \
-		  if (ntohl(_d->i6[0]) < ntohl(_s->i6[0])) { \
-			_d->i6[1] = NLADD(_d->i6[1], 1); \
-			if (ntohl(_d->i6[1]) < ntohl(_s->i6[1])) { \
-				_d->i6[2] = NLADD(_d->i6[2], 1); \
-				if (ntohl(_d->i6[2]) < ntohl(_s->i6[2])) { \
-					_d->i6[3] = NLADD(_d->i6[3], 1); \
-				} \
-			} \
-		  } \
-		} while (0)
-#define	IP6_AND(a,b,d)	do { i6addr_t *_s1 = (i6addr_t *)(a); \
-			  i6addr_t *_s2 = (i6addr_t *)(b); \
-			  i6addr_t *_d = (i6addr_t *)(d); \
-			  _d->i6[0] = _s1->i6[0] & _s2->i6[0]; \
-			  _d->i6[1] = _s1->i6[1] & _s2->i6[1]; \
-			  _d->i6[2] = _s1->i6[2] & _s2->i6[2]; \
-			  _d->i6[3] = _s1->i6[3] & _s2->i6[3]; \
-			} while (0)
-#define	IP6_ANDASSIGN(a,m) \
-			do { i6addr_t *_d = (i6addr_t *)(a); \
-			  i6addr_t *_m = (i6addr_t *)(m); \
-			  _d->i6[0] &= _m->i6[0]; \
-			  _d->i6[1] &= _m->i6[1]; \
-			  _d->i6[2] &= _m->i6[2]; \
-			  _d->i6[3] &= _m->i6[3]; \
-			} while (0)
-#define	IP6_MASKEQ(a,m,b) \
-			(((I60(a) & I60(m)) == I60(b)) && \
-			 ((I61(a) & I61(m)) == I61(b)) && \
-			 ((I62(a) & I62(m)) == I62(b)) && \
-			 ((I63(a) & I63(m)) == I63(b)))
-#define	IP6_MASKNEQ(a,m,b) \
-			(((I60(a) & I60(m)) != I60(b)) || \
-			 ((I61(a) & I61(m)) != I61(b)) || \
-			 ((I62(a) & I62(m)) != I62(b)) || \
-			 ((I63(a) & I63(m)) != I63(b)))
-#define	IP6_MERGE(a,b,c) \
-			do { i6addr_t *_d, *_s1, *_s2; \
-			  _d = (i6addr_t *)(a); \
-			  _s1 = (i6addr_t *)(b); \
-			  _s2 = (i6addr_t *)(c); \
-			  _d->i6[0] |= _s1->i6[0] & ~_s2->i6[0]; \
-			  _d->i6[1] |= _s1->i6[1] & ~_s2->i6[1]; \
-			  _d->i6[2] |= _s1->i6[2] & ~_s2->i6[2]; \
-			  _d->i6[3] |= _s1->i6[3] & ~_s2->i6[3]; \
-			} while (0)
-#define	IP6_MASK(a,b,c) \
-			do { i6addr_t *_d, *_s1, *_s2; \
-			  _d = (i6addr_t *)(a); \
-			  _s1 = (i6addr_t *)(b); \
-			  _s2 = (i6addr_t *)(c); \
-			  _d->i6[0] = _s1->i6[0] & ~_s2->i6[0]; \
-			  _d->i6[1] = _s1->i6[1] & ~_s2->i6[1]; \
-			  _d->i6[2] = _s1->i6[2] & ~_s2->i6[2]; \
-			  _d->i6[3] = _s1->i6[3] & ~_s2->i6[3]; \
-			} while (0)
-#define	IP6_SETONES(a)	\
-			do { i6addr_t *_d = (i6addr_t *)(a); \
-			  _d->i6[0] = 0xffffffff; \
-			  _d->i6[1] = 0xffffffff; \
-			  _d->i6[2] = 0xffffffff; \
-			  _d->i6[3] = 0xffffffff; \
-			} while (0)
-
-typedef	union ipso_u	{
-	u_short	ipso_ripso[2];
-	u_32_t	ipso_doi;
-} ipso_t;
-
-typedef	struct	fr_ip	{
-	u_32_t	fi_v:4;		/* IP version */
-	u_32_t	fi_xx:4;	/* spare */
-	u_32_t	fi_tos:8;	/* IP packet TOS */
-	u_32_t	fi_ttl:8;	/* IP packet TTL */
-	u_32_t	fi_p:8;		/* IP packet protocol */
-	u_32_t	fi_optmsk;	/* bitmask composed from IP options */
-	i6addr_t fi_src;	/* source address from packet */
-	i6addr_t fi_dst;	/* destination address from packet */
-	ipso_t	fi_ipso;	/* IP security options */
-	u_32_t	fi_flx;		/* packet flags */
-	u_32_t	fi_tcpmsk;	/* TCP options set/reset */
-	u_32_t	fi_ports[2];	/* TCP ports */
-	u_char	fi_tcpf;	/* TCP flags */
-	u_char	fi_sensitivity;
-	u_char	fi_xxx[2];	/* pad */
-} fr_ip_t;
-
-/*
- * For use in fi_flx
- */
-#define	FI_TCPUDP	0x0001	/* TCP/UCP implied comparison*/
-#define	FI_OPTIONS	0x0002
-#define	FI_FRAG		0x0004
-#define	FI_SHORT	0x0008
-#define	FI_NATED	0x0010
-#define	FI_MULTICAST	0x0020
-#define	FI_BROADCAST	0x0040
-#define	FI_MBCAST	0x0080
-#define	FI_STATE	0x0100
-#define	FI_BADNAT	0x0200
-#define	FI_BAD		0x0400
-#define	FI_OOW		0x0800	/* Out of state window, else match */
-#define	FI_ICMPERR	0x1000
-#define	FI_FRAGBODY	0x2000
-#define	FI_BADSRC	0x4000
-#define	FI_LOWTTL	0x8000
-#define	FI_CMP		0x5cfe3	/* Not FI_FRAG,FI_NATED,FI_FRAGTAIL */
-#define	FI_ICMPCMP	0x0003	/* Flags we can check for ICMP error packets */
-#define	FI_WITH		0x5effe	/* Not FI_TCPUDP */
-#define	FI_V6EXTHDR	0x10000
-#define	FI_COALESCE	0x20000
-#define	FI_NEWNAT	0x40000
-#define	FI_ICMPQUERY	0x80000
-#define	FI_ENCAP	0x100000	/* encap/decap with NAT */
-#define	FI_AH		0x200000	/* AH header present */
-#define	FI_DOCKSUM	0x10000000	/* Proxy wants L4 recalculation */
-#define	FI_NOCKSUM	0x20000000	/* don't do a L4 checksum validation */
-#define	FI_NOWILD	0x40000000	/* Do not do wildcard searches */
-#define	FI_IGNORE	0x80000000
-
-#define	fi_secmsk	fi_ipso.ipso_ripso[0]
-#define	fi_auth		fi_ipso.ipso_ripso[1]
-#define	fi_doi		fi_ipso.ipso_doi
-#define	fi_saddr	fi_src.in4.s_addr
-#define	fi_daddr	fi_dst.in4.s_addr
-#define	fi_srcnum	fi_src.iplookupnum
-#define	fi_dstnum	fi_dst.iplookupnum
-#define	fi_srcname	fi_src.iplookupname
-#define	fi_dstname	fi_dst.iplookupname
-#define	fi_srctype	fi_src.iplookuptype
-#define	fi_dsttype	fi_dst.iplookuptype
-#define	fi_srcsubtype	fi_src.iplookupsubtype
-#define	fi_dstsubtype	fi_dst.iplookupsubtype
-#define	fi_srcptr	fi_src.iplookupptr
-#define	fi_dstptr	fi_dst.iplookupptr
-#define	fi_srcfunc	fi_src.iplookupfunc
-#define	fi_dstfunc	fi_dst.iplookupfunc
-
-
-/*
- * These are both used by the state and NAT code to indicate that one port or
- * the other should be treated as a wildcard.
- * NOTE: When updating, check bit masks in ip_state.h and update there too.
- */
-#define	SI_W_SPORT	0x00000100
-#define	SI_W_DPORT	0x00000200
-#define	SI_WILDP	(SI_W_SPORT|SI_W_DPORT)
-#define	SI_W_SADDR	0x00000400
-#define	SI_W_DADDR	0x00000800
-#define	SI_WILDA	(SI_W_SADDR|SI_W_DADDR)
-#define	SI_NEWFR	0x00001000
-#define	SI_CLONE	0x00002000
-#define	SI_CLONED	0x00004000
-#define	SI_NEWCLONE	0x00008000
-
-typedef	struct {
-	u_short	fda_ports[2];
-	u_char	fda_tcpf;		/* TCP header flags (SYN, ACK, etc) */
-} frdat_t;
-
-typedef enum fr_breasons_e {
-	FRB_BLOCKED = 0,
-	FRB_LOGFAIL = 1,
-	FRB_PPSRATE = 2,
-	FRB_JUMBO = 3,
-	FRB_MAKEFRIP = 4,
-	FRB_STATEADD = 5,
-	FRB_UPDATEIPID = 6,
-	FRB_LOGFAIL2 = 7,
-	FRB_DECAPFRIP = 8,
-	FRB_AUTHNEW = 9,
-	FRB_AUTHCAPTURE = 10,
-	FRB_COALESCE = 11,
-	FRB_PULLUP = 12,
-	FRB_AUTHFEEDBACK = 13,
-	FRB_BADFRAG = 14,
-	FRB_NATV4 = 15,
-	FRB_NATV6 = 16,
-} fr_breason_t;
-
-#define	FRB_MAX_VALUE	16
-
-typedef enum ipf_cksum_e {
-	FI_CK_BAD = -1,
-	FI_CK_NEEDED = 0,
-	FI_CK_SUMOK = 1,
-	FI_CK_L4PART = 2,
-	FI_CK_L4FULL = 4
-} ipf_cksum_t;
-
-typedef	struct	fr_info	{
-	void	*fin_main_soft;
-	void	*fin_ifp;		/* interface packet is `on' */
-	struct	frentry *fin_fr;	/* last matching rule */
-	int	fin_out;		/* in or out ? 1 == out, 0 == in */
-	fr_ip_t	fin_fi;			/* IP Packet summary */
-	frdat_t	fin_dat;		/* TCP/UDP ports, ICMP code/type */
-	int	fin_dlen;		/* length of data portion of packet */
-	int	fin_plen;
-	u_32_t	fin_rule;		/* rule # last matched */
-	u_short	fin_hlen;		/* length of IP header in bytes */
-	char	fin_group[FR_GROUPLEN];	/* group number, -1 for none */
-	void	*fin_dp;		/* start of data past IP header */
-	/*
-	 * Fields after fin_dp aren't used for compression of log records.
-	 * fin_fi contains the IP version (fin_family)
-	 * fin_rule isn't included because adding a new rule can change it but
-	 * not change fin_fr. fin_rule is the rule number reported.
-	 * It isn't necessary to include fin_crc because that is checked
-	 * for explicitly, before calling bcmp.
-	 */
-	u_32_t	fin_crc;		/* Simple calculation for logging */
-	int	fin_family;		/* AF_INET, etc. */
-	int	fin_icode;		/* ICMP error to return */
-	int	fin_mtu;		/* MTU input for ICMP need-frag */
-	int	fin_rev;		/* state only: 1 = reverse */
-	int	fin_ipoff;		/* # bytes from buffer start to hdr */
-	u_32_t	fin_id;			/* IP packet id field */
-	u_short	fin_l4hlen;		/* length of L4 header, if known */
-	u_short	fin_off;
-	int	fin_depth;		/* Group nesting depth */
-	int	fin_error;		/* Error code to return */
-	ipf_cksum_t	fin_cksum;	/* -1 = bad, 1 = good, 0 = not done */
-	fr_breason_t	fin_reason;	/* why auto blocked */
-	u_int	fin_pktnum;
-	void	*fin_nattag;
-	struct frdest	*fin_dif;
-	struct frdest	*fin_tif;
-	union {
-		ip_t	*fip_ip;
-#ifdef USE_INET6
-		ip6_t	*fip_ip6;
-#endif
-	} fin_ipu;
-	mb_t	**fin_mp;		/* pointer to pointer to mbuf */
-	mb_t	*fin_m;			/* pointer to mbuf */
-#ifdef	MENTAT
-	mb_t	*fin_qfm;		/* pointer to mblk where pkt starts */
-	void	*fin_qpi;
-	char	fin_ifname[LIFNAMSIZ];
-#endif
-#ifdef	__sgi
-	void	*fin_hbuf;
-#endif
-	void	*fin_fraghdr;		/* pointer to start of ipv6 frag hdr */
-} fr_info_t;
-
-#define	fin_ip		fin_ipu.fip_ip
-#define	fin_ip6		fin_ipu.fip_ip6
-#define	fin_v		fin_fi.fi_v
-#define	fin_p		fin_fi.fi_p
-#define	fin_flx		fin_fi.fi_flx
-#define	fin_optmsk	fin_fi.fi_optmsk
-#define	fin_secmsk	fin_fi.fi_secmsk
-#define	fin_doi		fin_fi.fi_doi
-#define	fin_auth	fin_fi.fi_auth
-#define	fin_src		fin_fi.fi_src.in4
-#define	fin_saddr	fin_fi.fi_saddr
-#define	fin_dst		fin_fi.fi_dst.in4
-#define	fin_daddr	fin_fi.fi_daddr
-#define	fin_data	fin_fi.fi_ports
-#define	fin_sport	fin_fi.fi_ports[0]
-#define	fin_dport	fin_fi.fi_ports[1]
-#define	fin_tcpf	fin_fi.fi_tcpf
-#define	fin_src6	fin_fi.fi_src
-#define	fin_dst6	fin_fi.fi_dst
-#define	fin_srcip6	fin_fi.fi_src.in6
-#define	fin_dstip6	fin_fi.fi_dst.in6
-
-#define	IPF_IN		0
-#define	IPF_OUT		1
-
-typedef	struct frentry	*(*ipfunc_t) __P((fr_info_t *, u_32_t *));
-typedef	int		(*ipfuncinit_t) __P((struct ipf_main_softc_s *, struct frentry *));
-
-typedef	struct	ipfunc_resolve	{
-	char		ipfu_name[32];
-	ipfunc_t	ipfu_addr;
-	ipfuncinit_t	ipfu_init;
-	ipfuncinit_t	ipfu_fini;
-} ipfunc_resolve_t;
-
-/*
- * Size for compares on fr_info structures
- */
-#define	FI_CSIZE	offsetof(fr_info_t, fin_icode)
-#define	FI_LCSIZE	offsetof(fr_info_t, fin_dp)
-
-/*
- * Size for copying cache fr_info structure
- */
-#define	FI_COPYSIZE	offsetof(fr_info_t, fin_dp)
-
-/*
- * Structure for holding IPFilter's tag information
- */
-#define	IPFTAG_LEN	16
-typedef	struct	{
-	union	{
-		u_32_t	iptu_num[4];
-		char	iptu_tag[IPFTAG_LEN];
-	} ipt_un;
-	int	ipt_not;
-} ipftag_t;
-
-#define	ipt_tag	ipt_un.iptu_tag
-#define	ipt_num	ipt_un.iptu_num
-
-/*
- * Structure to define address for pool lookups.
- */
-typedef	struct	{
-	u_char		adf_len;
-	sa_family_t	adf_family;
-	u_char		adf_xxx[2];
-	i6addr_t	adf_addr;
-} addrfamily_t;
-
-
-RBI_LINK(ipf_rb, host_node_s);
-
-typedef	struct	host_node_s {
-	RBI_FIELD(ipf_rb)	hn_entry;
-	addrfamily_t		hn_addr;
-	int			hn_active;
-} host_node_t;
-
-typedef RBI_HEAD(ipf_rb, host_node_s) ipf_rb_head_t;
-
-typedef	struct	host_track_s {
-	ipf_rb_head_t	ht_root;
-	int		ht_max_nodes;
-	int		ht_max_per_node;
-	int		ht_netmask;
-	int		ht_cur_nodes;
-} host_track_t;
-
-
-typedef enum fr_dtypes_e {
-	FRD_NORMAL = 0,
-	FRD_DSTLIST
-} fr_dtypes_t;
-/*
- * This structure is used to hold information about the next hop for where
- * to forward a packet.
- */
-typedef	struct	frdest	{
-	void		*fd_ptr;
-	addrfamily_t	fd_addr;
-	fr_dtypes_t	fd_type;
-	int		fd_name;
-	int		fd_local;
-} frdest_t;
-
-#define	fd_ip6	fd_addr.adf_addr
-#define	fd_ip	fd_ip6.in4
-
-
-typedef enum fr_ctypes_e {
-	FR_NONE = 0,
-	FR_EQUAL,
-	FR_NEQUAL,
-	FR_LESST,
-	FR_GREATERT,
-	FR_LESSTE,
-	FR_GREATERTE,
-	FR_OUTRANGE,
-	FR_INRANGE,
-	FR_INCRANGE
-} fr_ctypes_t;
-
-/*
- * This structure holds information about a port comparison.
- */
-typedef	struct	frpcmp	{
-	fr_ctypes_t	frp_cmp;	/* data for port comparisons */
-	u_32_t		frp_port;	/* top port for <> and >< */
-	u_32_t		frp_top;	/* top port for <> and >< */
-} frpcmp_t;
-
-
-/*
- * Structure containing all the relevant TCP things that can be checked in
- * a filter rule.
- */
-typedef	struct	frtuc	{
-	u_char		ftu_tcpfm;	/* tcp flags mask */
-	u_char		ftu_tcpf;	/* tcp flags */
-	frpcmp_t	ftu_src;
-	frpcmp_t	ftu_dst;
-} frtuc_t;
-
-#define	ftu_scmp	ftu_src.frp_cmp
-#define	ftu_dcmp	ftu_dst.frp_cmp
-#define	ftu_sport	ftu_src.frp_port
-#define	ftu_dport	ftu_dst.frp_port
-#define	ftu_stop	ftu_src.frp_top
-#define	ftu_dtop	ftu_dst.frp_top
-
-#define	FR_TCPFMAX	0x3f
-
-typedef enum fr_atypes_e {
-	FRI_NONE = -1,	/* For LHS of NAT */
-	FRI_NORMAL = 0,	/* Normal address */
-	FRI_DYNAMIC,	/* dynamic address */
-	FRI_LOOKUP,	/* address is a pool # */
-	FRI_RANGE,	/* address/mask is a range */
-	FRI_NETWORK,	/* network address from if */
-	FRI_BROADCAST,	/* broadcast address from if */
-	FRI_PEERADDR,	/* Peer address for P-to-P */
-	FRI_NETMASKED,	/* network address with netmask from if */
-	FRI_SPLIT,	/* For NAT compatibility */
-	FRI_INTERFACE	/* address is based on interface name */
-} fr_atypes_t;
-
-/*
- * This structure makes up what is considered to be the IPFilter specific
- * matching components of a filter rule, as opposed to the data structures
- * used to define the result which are in frentry_t and not here.
- */
-typedef	struct	fripf	{
-	fr_ip_t		fri_ip;
-	fr_ip_t		fri_mip;	/* mask structure */
-
-	u_short		fri_icmpm;	/* data for ICMP packets (mask) */
-	u_short		fri_icmp;
-
-	frtuc_t		fri_tuc;
-	fr_atypes_t	fri_satype;	/* addres type */
-	fr_atypes_t	fri_datype;	/* addres type */
-	int		fri_sifpidx;	/* doing dynamic addressing */
-	int		fri_difpidx;	/* index into fr_ifps[] to use when */
-} fripf_t;
-
-#define	fri_dlookup	fri_mip.fi_dst
-#define	fri_slookup	fri_mip.fi_src
-#define	fri_dstnum	fri_mip.fi_dstnum
-#define	fri_srcnum	fri_mip.fi_srcnum
-#define	fri_dstname	fri_mip.fi_dstname
-#define	fri_srcname	fri_mip.fi_srcname
-#define	fri_dstptr	fri_mip.fi_dstptr
-#define	fri_srcptr	fri_mip.fi_srcptr
-
-
-typedef enum fr_rtypes_e {
-	FR_T_NONE = 0,
-	FR_T_IPF,		/* IPF structures */
-	FR_T_BPFOPC,		/* BPF opcode */
-	FR_T_CALLFUNC,		/* callout to function in fr_func only */
-	FR_T_COMPIPF,			/* compiled C code */
-	FR_T_IPFEXPR,			/* IPF expression */
-	FR_T_BUILTIN = 0x40000000,	/* rule is in kernel space */
-	FR_T_IPF_BUILTIN,
-	FR_T_BPFOPC_BUILTIN,
-	FR_T_CALLFUNC_BUILTIN,
-	FR_T_COMPIPF_BUILTIN,
-	FR_T_IPFEXPR_BUILTIN
-} fr_rtypes_t;
-
-typedef	struct	frentry	* (* frentfunc_t) __P((fr_info_t *));
-
-typedef	struct	frentry {
-	ipfmutex_t	fr_lock;
-	struct	frentry	*fr_next;
-	struct	frentry	**fr_pnext;
-	struct	frgroup	*fr_grp;
-	struct	frgroup	*fr_grphead;
-	struct	frgroup	*fr_icmpgrp;
-	struct	ipscan	*fr_isc;
-	struct	frentry	*fr_dnext;	/* 2 fr_die linked list pointers */
-	struct	frentry	**fr_pdnext;
-	void	*fr_ifas[4];
-	void	*fr_ptr;	/* for use with fr_arg */
-	int	fr_comment;	/* text comment for rule */
-	int	fr_size;	/* size of this structure */
-	int	fr_ref;		/* reference count */
-	int	fr_statecnt;	/* state count - for limit rules */
-	u_32_t	fr_die;		/* only used on loading the rule */
-	u_int	fr_cksum;	/* checksum on filter rules for performance */
-	/*
-	 * The line number from a file is here because we need to be able to
-	 * match the rule generated with ``grep rule ipf.conf | ipf -rf -''
-	 * with the rule loaded using ``ipf -f ipf.conf'' - thus it can't be
-	 * on the other side of fr_func.
-	 */
-	int	fr_flineno;	/* line number from conf file */
-	/*
-	 * These are only incremented when a packet  matches this rule and
-	 * it is the last match
-	 */
-	U_QUAD_T	fr_hits;
-	U_QUAD_T	fr_bytes;
-
-	/*
-	 * For PPS rate limiting
-	 * fr_lpu is used to always have the same size for this field,
-	 * allocating 64bits for seconds and 32bits for milliseconds.
-	 */
-	union {
-		struct timeval	frp_lastpkt;
-		char	frp_bytes[12];
-	} fr_lpu;
-	int		fr_curpps;
-
-	union	{
-		void		*fru_data;
-		char		*fru_caddr;
-		fripf_t		*fru_ipf;
-		frentfunc_t	fru_func;
-	} fr_dun;
-
-	/*
-	 * Fields after this may not change whilst in the kernel.
-	 */
-	ipfunc_t fr_func; 	/* call this function */
-	int	fr_dsize;
-	int	fr_pps;
-	fr_rtypes_t	fr_type;
-	u_32_t	fr_flags;	/* per-rule flags && options (see below) */
-	u_32_t	fr_logtag;	/* user defined log tag # */
-	u_32_t	fr_collect;	/* collection number */
-	u_int	fr_arg;		/* misc. numeric arg for rule */
-	u_int	fr_loglevel;	/* syslog log facility + priority */
-	u_char	fr_family;
-	u_char	fr_icode;	/* return ICMP code */
-	int	fr_group;	/* group to which this rule belongs */
-	int	fr_grhead;	/* group # which this rule starts */
-	int	fr_ifnames[4];
-	int	fr_isctag;
-	int	fr_rpc;		/* XID Filtering */ 
-	ipftag_t fr_nattag;
-	frdest_t fr_tifs[2];	/* "to"/"reply-to" interface */
-	frdest_t fr_dif;	/* duplicate packet interface */
-	/*
-	 * These are all options related to stateful filtering
-	 */
-	host_track_t	fr_srctrack;
-	int	fr_nostatelog;
-	int	fr_statemax;	/* max reference count */
-	int	fr_icmphead;	/* ICMP group  for state options */
-	u_int	fr_age[2];	/* non-TCP state timeouts */
-	/*
-	 * How big is the name buffer at the end?
-	 */
-	int	fr_namelen;
-	char	fr_names[1];
-} frentry_t;
-
-#define	fr_lastpkt	fr_lpu.frp_lastpkt
-#define	fr_caddr	fr_dun.fru_caddr
-#define	fr_data		fr_dun.fru_data
-#define	fr_dfunc	fr_dun.fru_func
-#define	fr_ipf		fr_dun.fru_ipf
-#define	fr_ip		fr_ipf->fri_ip
-#define	fr_mip		fr_ipf->fri_mip
-#define	fr_icmpm	fr_ipf->fri_icmpm
-#define	fr_icmp		fr_ipf->fri_icmp
-#define	fr_tuc		fr_ipf->fri_tuc
-#define	fr_satype	fr_ipf->fri_satype
-#define	fr_datype	fr_ipf->fri_datype
-#define	fr_sifpidx	fr_ipf->fri_sifpidx
-#define	fr_difpidx	fr_ipf->fri_difpidx
-#define	fr_proto	fr_ip.fi_p
-#define	fr_mproto	fr_mip.fi_p
-#define	fr_ttl		fr_ip.fi_ttl
-#define	fr_mttl		fr_mip.fi_ttl
-#define	fr_tos		fr_ip.fi_tos
-#define	fr_mtos		fr_mip.fi_tos
-#define	fr_tcpfm	fr_tuc.ftu_tcpfm
-#define	fr_tcpf		fr_tuc.ftu_tcpf
-#define	fr_scmp		fr_tuc.ftu_scmp
-#define	fr_dcmp		fr_tuc.ftu_dcmp
-#define	fr_dport	fr_tuc.ftu_dport
-#define	fr_sport	fr_tuc.ftu_sport
-#define	fr_stop		fr_tuc.ftu_stop
-#define	fr_dtop		fr_tuc.ftu_dtop
-#define	fr_dst		fr_ip.fi_dst.in4
-#define	fr_dst6		fr_ip.fi_dst
-#define	fr_daddr	fr_ip.fi_dst.in4.s_addr
-#define	fr_src		fr_ip.fi_src.in4
-#define	fr_src6		fr_ip.fi_src
-#define	fr_saddr	fr_ip.fi_src.in4.s_addr
-#define	fr_dmsk		fr_mip.fi_dst.in4
-#define	fr_dmsk6	fr_mip.fi_dst
-#define	fr_dmask	fr_mip.fi_dst.in4.s_addr
-#define	fr_smsk		fr_mip.fi_src.in4
-#define	fr_smsk6	fr_mip.fi_src
-#define	fr_smask	fr_mip.fi_src.in4.s_addr
-#define	fr_dstnum	fr_ip.fi_dstnum
-#define	fr_srcnum	fr_ip.fi_srcnum
-#define	fr_dlookup	fr_ip.fi_dst
-#define	fr_slookup	fr_ip.fi_src
-#define	fr_dstname	fr_ip.fi_dstname
-#define	fr_srcname	fr_ip.fi_srcname
-#define	fr_dsttype	fr_ip.fi_dsttype
-#define	fr_srctype	fr_ip.fi_srctype
-#define	fr_dstsubtype	fr_ip.fi_dstsubtype
-#define	fr_srcsubtype	fr_ip.fi_srcsubtype
-#define	fr_dstptr	fr_mip.fi_dstptr
-#define	fr_srcptr	fr_mip.fi_srcptr
-#define	fr_dstfunc	fr_mip.fi_dstfunc
-#define	fr_srcfunc	fr_mip.fi_srcfunc
-#define	fr_optbits	fr_ip.fi_optmsk
-#define	fr_optmask	fr_mip.fi_optmsk
-#define	fr_secbits	fr_ip.fi_secmsk
-#define	fr_secmask	fr_mip.fi_secmsk
-#define	fr_authbits	fr_ip.fi_auth
-#define	fr_authmask	fr_mip.fi_auth
-#define	fr_doi		fr_ip.fi_doi
-#define	fr_doimask	fr_mip.fi_doi
-#define	fr_flx		fr_ip.fi_flx
-#define	fr_mflx		fr_mip.fi_flx
-#define	fr_ifa		fr_ifas[0]
-#define	fr_oifa		fr_ifas[2]
-#define	fr_tif		fr_tifs[0]
-#define	fr_rif		fr_tifs[1]
-
-#define	FR_NOLOGTAG	0
-
-#define	FR_CMPSIZ	(sizeof(struct frentry) - \
-			 offsetof(struct frentry, fr_func))
-#define	FR_NAME(_f, _n)	(_f)->fr_names + (_f)->_n
-
-
-/*
- * fr_flags
- */
-#define	FR_BLOCK	0x00001	/* do not allow packet to pass */
-#define	FR_PASS		0x00002	/* allow packet to pass */
-#define	FR_AUTH		0x00003	/* use authentication */
-#define	FR_PREAUTH	0x00004	/* require preauthentication */
-#define	FR_ACCOUNT	0x00005	/* Accounting rule */
-#define	FR_SKIP		0x00006	/* skip rule */
-#define	FR_DECAPSULATE	0x00008	/* decapsulate rule */
-#define	FR_CALL		0x00009	/* call rule */
-#define	FR_CMDMASK	0x0000f
-#define	FR_LOG		0x00010	/* Log */
-#define	FR_LOGB		0x00011	/* Log-fail */
-#define	FR_LOGP		0x00012	/* Log-pass */
-#define	FR_LOGMASK	(FR_LOG|FR_CMDMASK)
-#define	FR_CALLNOW	0x00020	/* call another function (fr_func) if matches */
-#define	FR_NOTSRCIP	0x00040
-#define	FR_NOTDSTIP	0x00080
-#define	FR_QUICK	0x00100	/* match & stop processing list */
-#define	FR_KEEPFRAG	0x00200	/* keep fragment information */
-#define	FR_KEEPSTATE	0x00400	/* keep `connection' state information */
-#define	FR_FASTROUTE	0x00800	/* bypass normal routing */
-#define	FR_RETRST	0x01000	/* Return TCP RST packet - reset connection */
-#define	FR_RETICMP	0x02000	/* Return ICMP unreachable packet */
-#define	FR_FAKEICMP	0x03000	/* Return ICMP unreachable with fake source */
-#define	FR_OUTQUE	0x04000	/* outgoing packets */
-#define	FR_INQUE	0x08000	/* ingoing packets */
-#define	FR_LOGBODY	0x10000	/* Log the body */
-#define	FR_LOGFIRST	0x20000	/* Log the first byte if state held */
-#define	FR_LOGORBLOCK	0x40000	/* block the packet if it can't be logged */
-#define	FR_STLOOSE	0x80000	/* loose state checking */
-#define	FR_FRSTRICT	0x100000	/* strict frag. cache */
-#define	FR_STSTRICT	0x200000	/* strict keep state */
-#define	FR_NEWISN	0x400000	/* new ISN for outgoing TCP */
-#define	FR_NOICMPERR	0x800000	/* do not match ICMP errors in state */
-#define	FR_STATESYNC	0x1000000	/* synchronize state to slave */
-#define	FR_COPIED	0x2000000	/* copied from user space */
-#define	FR_INACTIVE	0x4000000	/* only used when flush'ing rules */
-#define	FR_NOMATCH	0x8000000	/* no match occured */
-		/*	0x10000000 	FF_LOGPASS */
-		/*	0x20000000 	FF_LOGBLOCK */
-		/*	0x40000000 	FF_LOGNOMATCH */
-		/*	0x80000000 	FF_BLOCKNONIP */
-
-#define	FR_RETMASK	(FR_RETICMP|FR_RETRST|FR_FAKEICMP)
-#define	FR_ISBLOCK(x)	(((x) & FR_CMDMASK) == FR_BLOCK)
-#define	FR_ISPASS(x)	(((x) & FR_CMDMASK) == FR_PASS)
-#define	FR_ISAUTH(x)	(((x) & FR_CMDMASK) == FR_AUTH)
-#define	FR_ISPREAUTH(x)	(((x) & FR_CMDMASK) == FR_PREAUTH)
-#define	FR_ISACCOUNT(x)	(((x) & FR_CMDMASK) == FR_ACCOUNT)
-#define	FR_ISSKIP(x)	(((x) & FR_CMDMASK) == FR_SKIP)
-#define	FR_ISDECAPS(x)	(((x) & FR_CMDMASK) == FR_DECAPSULATE)
-#define	FR_ISNOMATCH(x)	((x) & FR_NOMATCH)
-#define	FR_INOUT	(FR_INQUE|FR_OUTQUE)
-
-/*
- * recognized flags for SIOCGETFF and SIOCSETFF, and get put in fr_flags
- */
-#define	FF_LOGPASS	0x10000000
-#define	FF_LOGBLOCK	0x20000000
-#define	FF_LOGNOMATCH	0x40000000
-#define	FF_LOGGING	(FF_LOGPASS|FF_LOGBLOCK|FF_LOGNOMATCH)
-#define	FF_BLOCKNONIP	0x80000000	/* Solaris2 Only */
-
-
-/*
- * Structure that passes information on what/how to flush to the kernel.
- */
-typedef	struct	ipfflush	{
-	int		ipflu_how;
-	int		ipflu_arg;
-} ipfflush_t;
-
-
-/*
- *
- */
-typedef	struct	ipfgetctl	{
-	u_int		ipfg_min;	/* min value */
-	u_int		ipfg_current;	/* current value */
-	u_int		ipfg_max;	/* max value */
-	u_int		ipfg_default;	/* default value */
-	u_int		ipfg_steps;	/* value increments */
-	char		ipfg_name[40];	/* tag name for this control */
-} ipfgetctl_t;
-
-typedef	struct	ipfsetctl	{
-	int	ipfs_which;	/* 0 = min 1 = current 2 = max 3 = default */
-	u_int	ipfs_value;	/* min value */
-	char	ipfs_name[40];	/* tag name for this control */
-} ipfsetctl_t;
-
-
-/*
- * Some of the statistics below are in their own counters, but most are kept
- * in this single structure so that they can all easily be collected and
- * copied back as required.
- */
-typedef	struct	ipf_statistics {
-	u_long	fr_icmp_coalesce;
-	u_long	fr_tcp_frag;
-	u_long	fr_tcp_pullup;
-	u_long	fr_tcp_short;
-	u_long	fr_tcp_small;
-	u_long	fr_tcp_bad_flags;
-	u_long	fr_udp_pullup;
-	u_long	fr_ip_freed;
-	u_long	fr_v6_ah_bad;
-	u_long	fr_v6_bad;
-	u_long	fr_v6_badfrag;
-	u_long	fr_v6_dst_bad;
-	u_long	fr_v6_esp_pullup;
-	u_long	fr_v6_ext_short;
-	u_long	fr_v6_ext_pullup;
-	u_long	fr_v6_ext_hlen;
-	u_long	fr_v6_frag_bad;
-	u_long	fr_v6_frag_pullup;
-	u_long	fr_v6_frag_size;
-	u_long	fr_v6_gre_pullup;
-	u_long	fr_v6_icmp6_pullup;
-	u_long	fr_v6_rh_bad;
-	u_long	fr_v6_badttl;	/* TTL in packet doesn't reach minimum */
-	u_long	fr_v4_ah_bad;
-	u_long	fr_v4_ah_pullup;
-	u_long	fr_v4_esp_pullup;
-	u_long	fr_v4_cipso_bad;
-	u_long	fr_v4_cipso_tlen;
-	u_long	fr_v4_gre_frag;
-	u_long	fr_v4_gre_pullup;
-	u_long	fr_v4_icmp_frag;
-	u_long	fr_v4_icmp_pullup;
-	u_long	fr_v4_badttl;	/* TTL in packet doesn't reach minimum */
-	u_long	fr_v4_badsrc;	/* source received doesn't match route */
-	u_long	fr_l4_badcksum;	/* layer 4 header checksum failure */
-	u_long	fr_badcoalesces;
-	u_long	fr_pass;	/* packets allowed */
-	u_long	fr_block;	/* packets denied */
-	u_long	fr_nom;		/* packets which don't match any rule */
-	u_long	fr_short;	/* packets which are short */
-	u_long	fr_ppkl;	/* packets allowed and logged */
-	u_long	fr_bpkl;	/* packets denied and logged */
-	u_long	fr_npkl;	/* packets unmatched and logged */
-	u_long	fr_ret;		/* packets for which a return is sent */
-	u_long	fr_acct;	/* packets for which counting was performed */
-	u_long	fr_bnfr;	/* bad attempts to allocate fragment state */
-	u_long	fr_nfr;		/* new fragment state kept */
-	u_long	fr_cfr;		/* add new fragment state but complete pkt */
-	u_long	fr_bads;	/* bad attempts to allocate packet state */
-	u_long	fr_ads;		/* new packet state kept */
-	u_long	fr_chit;	/* cached hit */
-	u_long	fr_cmiss;	/* cached miss */
-	u_long	fr_tcpbad;	/* TCP checksum check failures */
-	u_long	fr_pull[2];	/* good and bad pullup attempts */
-	u_long	fr_bad;		/* bad IP packets to the filter */
-	u_long	fr_ipv6;	/* IPv6 packets in/out */
-	u_long	fr_ppshit;	/* dropped because of pps ceiling */
-	u_long	fr_ipud;	/* IP id update failures */
-	u_long	fr_blocked[FRB_MAX_VALUE + 1];
-} ipf_statistics_t;
-
-/*
- * Log structure.  Each packet header logged is prepended by one of these.
- * Following this in the log records read from the device will be an ipflog
- * structure which is then followed by any packet data.
- */
-typedef	struct	iplog	{
-	u_32_t		ipl_magic;
-	u_int		ipl_count;
-	u_32_t		ipl_seqnum;
-	struct	timeval	ipl_time;
-	size_t		ipl_dsize;
-	struct	iplog	*ipl_next;
-} iplog_t;
-
-#define	ipl_sec		ipl_time.tv_sec
-#define	ipl_usec	ipl_time.tv_usec
-
-#define IPL_MAGIC	0x49504c4d	/* 'IPLM' */
-#define IPL_MAGIC_NAT	0x49504c4e	/* 'IPLN' */
-#define IPL_MAGIC_STATE	0x49504c53	/* 'IPLS' */
-#define	IPLOG_SIZE	sizeof(iplog_t)
-
-typedef	struct	ipflog	{
-#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603)) || \
-        (defined(OpenBSD) && (OpenBSD >= 199603))
-#else
-	u_int	fl_unit;
-#endif
-	u_32_t		fl_rule;
-	u_32_t		fl_flags;
-	u_32_t		fl_lflags;
-	u_32_t		fl_logtag;
-	ipftag_t	fl_nattag;
-	u_short		fl_plen;	/* extra data after hlen */
-	u_short		fl_loglevel;	/* syslog log level */
-	char		fl_group[FR_GROUPLEN];
-	u_char		fl_hlen;	/* length of IP headers saved */
-	u_char		fl_dir;
-	u_char		fl_breason;	/* from fin_reason */
-	u_char		fl_family;	/* address family of packet logged */
-	char		fl_ifname[LIFNAMSIZ];
-} ipflog_t;
-
-#ifndef	IPF_LOGGING
-# define	IPF_LOGGING	0
-#endif
-#ifndef	IPF_DEFAULT_PASS
-# define	IPF_DEFAULT_PASS	FR_PASS
-#endif
-
-#define	DEFAULT_IPFLOGSIZE	32768
-#ifndef	IPFILTER_LOGSIZE
-# define	IPFILTER_LOGSIZE	DEFAULT_IPFLOGSIZE
-#else
-# if IPFILTER_LOGSIZE < 8192
-#  error IPFILTER_LOGSIZE too small.  Must be >= 8192
-# endif
-#endif
-
-#define	IPF_OPTCOPY	0x07ff00	/* bit mask of copied options */
-
-/*
- * Device filenames for reading log information.  Use ipf on Solaris2 because
- * ipl is already a name used by something else.
- */
-#ifndef	IPL_NAME
-# if	SOLARIS
-#  define	IPL_NAME	"/dev/ipf"
-# else
-#  define	IPL_NAME	"/dev/ipl"
-# endif
-#endif
-/*
- * Pathnames for various IP Filter control devices.  Used by LKM
- * and userland, so defined here.
- */
-#define	IPNAT_NAME	"/dev/ipnat"
-#define	IPSTATE_NAME	"/dev/ipstate"
-#define	IPAUTH_NAME	"/dev/ipauth"
-#define	IPSYNC_NAME	"/dev/ipsync"
-#define	IPSCAN_NAME	"/dev/ipscan"
-#define	IPLOOKUP_NAME	"/dev/iplookup"
-
-#define	IPL_LOGIPF	0	/* Minor device #'s for accessing logs */
-#define	IPL_LOGNAT	1
-#define	IPL_LOGSTATE	2
-#define	IPL_LOGAUTH	3
-#define	IPL_LOGSYNC	4
-#define	IPL_LOGSCAN	5
-#define	IPL_LOGLOOKUP	6
-#define	IPL_LOGCOUNT	7
-#define	IPL_LOGMAX	7
-#define	IPL_LOGSIZE	IPL_LOGMAX + 1
-#define	IPL_LOGALL	-1
-#define	IPL_LOGNONE	-2
-
-/*
- * For SIOCGETFS
- */
-typedef	struct	friostat	{
-	ipf_statistics_t f_st[2];
-	frentry_t	*f_ipf[2][2];
-	frentry_t	*f_acct[2][2];
-	frentry_t	*f_auth;
-	struct frgroup	*f_groups[IPL_LOGSIZE][2];
-	u_long		f_froute[2];
-	u_long		f_log_ok;
-	u_long		f_log_fail;
-	u_long		f_rb_no_mem;
-	u_long		f_rb_node_max;
-	u_32_t		f_ticks;
-	int		f_locks[IPL_LOGSIZE];
-	int		f_defpass;	/* default pass - from fr_pass */
-	int		f_active;	/* 1 or 0 - active rule set */
-	int		f_running;	/* 1 if running, else 0 */
-	int		f_logging;	/* 1 if enabled, else 0 */
-	int		f_features;
-	char		f_version[32];	/* version string */
-} friostat_t;
-
-#define	f_fin		f_ipf[0]
-#define	f_fout		f_ipf[1]
-#define	f_acctin	f_acct[0]
-#define	f_acctout	f_acct[1]
-
-#define	IPF_FEAT_LKM		0x001
-#define	IPF_FEAT_LOG		0x002
-#define	IPF_FEAT_LOOKUP		0x004
-#define	IPF_FEAT_BPF		0x008
-#define	IPF_FEAT_COMPILED	0x010
-#define	IPF_FEAT_CKSUM		0x020
-#define	IPF_FEAT_SYNC		0x040
-#define	IPF_FEAT_SCAN		0x080
-#define	IPF_FEAT_IPV6		0x100
-
-typedef struct	optlist {
-	u_short ol_val;
-	int	ol_bit;
-} optlist_t;
-
-
-/*
- * Group list structure.
- */
-typedef	struct frgroup {
-	struct frgroup	*fg_next;
-	struct frentry	*fg_head;
-	struct frentry	*fg_start;
-	struct frgroup	**fg_set;
-	u_32_t		fg_flags;
-	int		fg_ref;
-	char		fg_name[FR_GROUPLEN];
-} frgroup_t;
-
-#define	FG_NAME(g)	(*(g)->fg_name == '\0' ? "" : (g)->fg_name)
-
-
-/*
- * Used by state and NAT tables
- */
-typedef struct icmpinfo {
-	u_short		ici_id;
-	u_short		ici_seq;
-	u_char		ici_type;
-} icmpinfo_t;
-
-typedef struct udpinfo {
-	u_short		us_sport;
-	u_short		us_dport;
-} udpinfo_t;
-
-
-typedef	struct	tcpdata	{
-	u_32_t		td_end;
-	u_32_t		td_maxend;
-	u_32_t		td_maxwin;
-	u_32_t		td_winscale;
-	u_32_t		td_maxseg;
-	int		td_winflags;
-} tcpdata_t;
-
-#define	TCP_WSCALE_MAX		14
-
-#define	TCP_WSCALE_SEEN		0x00000001
-#define	TCP_WSCALE_FIRST	0x00000002
-#define	TCP_SACK_PERMIT		0x00000004
-
-
-typedef	struct tcpinfo {
-	u_32_t		ts_sport;
-	u_32_t		ts_dport;
-	tcpdata_t	ts_data[2];
-} tcpinfo_t;
-
-
-/*
- * Structures to define a GRE header as seen in a packet.
- */
-struct	grebits	{
-#if defined(sparc)
-	u_32_t		grb_ver:3;
-	u_32_t		grb_flags:3;
-	u_32_t		grb_A:1;
-	u_32_t		grb_recur:1;
-	u_32_t		grb_s:1;
-	u_32_t		grb_S:1;
-	u_32_t		grb_K:1;
-	u_32_t		grb_R:1;
-	u_32_t		grb_C:1;
-#else
-	u_32_t		grb_C:1;
-	u_32_t		grb_R:1;
-	u_32_t		grb_K:1;
-	u_32_t		grb_S:1;
-	u_32_t		grb_s:1;
-	u_32_t		grb_recur:1;
-	u_32_t		grb_A:1;
-	u_32_t		grb_flags:3;
-	u_32_t		grb_ver:3;
-#endif
-	u_short		grb_ptype;
-};
-
-typedef	struct	grehdr	{
-	union	{
-		struct	grebits	gru_bits;
-		u_short	gru_flags;
-	} gr_un;
-	u_short		gr_len;
-	u_short		gr_call;
-} grehdr_t;
-
-#define	gr_flags	gr_un.gru_flags
-#define	gr_bits		gr_un.gru_bits
-#define	gr_ptype	gr_bits.grb_ptype
-#define	gr_C		gr_bits.grb_C
-#define	gr_R		gr_bits.grb_R
-#define	gr_K		gr_bits.grb_K
-#define	gr_S		gr_bits.grb_S
-#define	gr_s		gr_bits.grb_s
-#define	gr_recur	gr_bits.grb_recur
-#define	gr_A		gr_bits.grb_A
-#define	gr_ver		gr_bits.grb_ver
-
-/*
- * GRE information tracked by "keep state"
- */
-typedef	struct	greinfo	{
-	u_short		gs_call[2];
-	u_short		gs_flags;
-	u_short		gs_ptype;
-} greinfo_t;
-
-#define	GRE_REV(x)	((ntohs(x) >> 13) & 7)
-
-
-/*
- * Format of an Authentication header
- */
-typedef	struct	authhdr	{
-	u_char		ah_next;
-	u_char		ah_plen;
-	u_short		ah_reserved;
-	u_32_t		ah_spi;
-	u_32_t		ah_seq;
-	/* Following the sequence number field is 0 or more bytes of */
-	/* authentication data, as specified by ah_plen - RFC 2402.  */
-} authhdr_t;
-
-
-/*
- * Timeout tail queue list member
- */
-typedef	struct	ipftqent	{
-	struct ipftqent **tqe_pnext;
-	struct ipftqent *tqe_next;
-	struct	ipftq	*tqe_ifq;
-	void		*tqe_parent;	/* pointer back to NAT/state struct */
-	u_32_t		tqe_die;	/* when this entriy is to die */
-	u_32_t		tqe_touched;
-	int		tqe_flags;
-	int		tqe_state[2];	/* current state of this entry */
-} ipftqent_t;
-
-#define	TQE_RULEBASED	0x00000001
-#define	TQE_DELETE	0x00000002
-
-
-/*
- * Timeout tail queue head for IPFilter
- */
-typedef struct  ipftq   {
-	ipfmutex_t	ifq_lock;
-	u_int		ifq_ttl;
-	ipftqent_t	*ifq_head;
-	ipftqent_t	**ifq_tail;
-	struct ipftq	*ifq_next;
-	struct ipftq	**ifq_pnext;
-	int		ifq_ref;
-	u_int		ifq_flags;
-} ipftq_t;
-
-#define	IFQF_USER	0x01		/* User defined aging */
-#define	IFQF_DELETE	0x02		/* Marked for deletion */
-#define	IFQF_PROXY	0x04		/* Timeout queue in use by a proxy */
-
-#define	IPFTQ_INIT(x,y,z)	do {			\
-					(x)->ifq_ttl = (y);	\
-					(x)->ifq_head = NULL;	\
-					(x)->ifq_ref = 1;	\
-					(x)->ifq_tail = &(x)->ifq_head; \
-					MUTEX_INIT(&(x)->ifq_lock, (z)); \
-				} while (0)
-
-#define	IPF_HZ_MULT	1
-#define	IPF_HZ_DIVIDE	2		/* How many times a second ipfilter */
-					/* checks its timeout queues.       */
-#define	IPF_TTLVAL(x)	(((x) / IPF_HZ_MULT) * IPF_HZ_DIVIDE)
-
-typedef	int	(*ipftq_delete_fn_t)(struct ipf_main_softc_s *, void *);
-
-
-/*
- * Object structure description.  For passing through in ioctls.
- */
-typedef	struct	ipfobj	{
-	u_32_t		ipfo_rev;	/* IPFilter version number */
-	u_32_t		ipfo_size;	/* size of object at ipfo_ptr */
-	void		*ipfo_ptr;	/* pointer to object */
-	int		ipfo_type;	/* type of object being pointed to */
-	int		ipfo_offset;	/* bytes from ipfo_ptr where to start */
-	int		ipfo_retval;	/* return value */
-	u_char		ipfo_xxxpad[28];	/* reserved for future use */
-} ipfobj_t;
-
-#define	IPFOBJ_FRENTRY		0	/* struct frentry */
-#define	IPFOBJ_IPFSTAT		1	/* struct friostat */
-#define	IPFOBJ_IPFINFO		2	/* struct fr_info */
-#define	IPFOBJ_AUTHSTAT		3	/* struct fr_authstat */
-#define	IPFOBJ_FRAGSTAT		4	/* struct ipfrstat */
-#define	IPFOBJ_IPNAT		5	/* struct ipnat */
-#define	IPFOBJ_NATSTAT		6	/* struct natstat */
-#define	IPFOBJ_STATESAVE	7	/* struct ipstate_save */
-#define	IPFOBJ_NATSAVE		8	/* struct nat_save */
-#define	IPFOBJ_NATLOOKUP	9	/* struct natlookup */
-#define	IPFOBJ_IPSTATE		10	/* struct ipstate */
-#define	IPFOBJ_STATESTAT	11	/* struct ips_stat */
-#define	IPFOBJ_FRAUTH		12	/* struct frauth */
-#define	IPFOBJ_TUNEABLE		13	/* struct ipftune */
-#define	IPFOBJ_NAT		14	/* struct nat */
-#define	IPFOBJ_IPFITER		15	/* struct ipfruleiter */
-#define	IPFOBJ_GENITER		16	/* struct ipfgeniter */
-#define	IPFOBJ_GTABLE		17	/* struct ipftable */
-#define	IPFOBJ_LOOKUPITER	18	/* struct ipflookupiter */
-#define	IPFOBJ_STATETQTAB	19	/* struct ipftq * NSTATES */
-#define	IPFOBJ_IPFEXPR		20
-#define	IPFOBJ_PROXYCTL		21	/* strct ap_ctl */
-#define	IPFOBJ_FRIPF		22	/* structfripf */
-#define	IPFOBJ_COUNT		23	/* How many #defines are above this? */
-
-
-typedef	union	ipftunevalptr	{
-	void		*ipftp_void;
-	u_long		*ipftp_long;
-	u_int		*ipftp_int;
-	u_short		*ipftp_short;
-	u_char		*ipftp_char;
-	u_long		ipftp_offset;
-} ipftunevalptr_t;
-
-typedef	union	ipftuneval	{
-	u_long		ipftu_long;
-	u_int		ipftu_int;
-	u_short		ipftu_short;
-	u_char		ipftu_char;
-} ipftuneval_t;
-
-struct ipftuneable;
-typedef	int (* ipftunefunc_t) __P((struct ipf_main_softc_s *, struct ipftuneable *, ipftuneval_t *));
-
-typedef	struct	ipftuneable	{
-	ipftunevalptr_t	ipft_una;
-	const char	*ipft_name;
-	u_long		ipft_min;
-	u_long		ipft_max;
-	int		ipft_sz;
-	int		ipft_flags;
-	struct ipftuneable *ipft_next;
-	ipftunefunc_t	ipft_func;
-} ipftuneable_t;
-
-#define	ipft_addr	ipft_una.ipftp_void
-#define	ipft_plong	ipft_una.ipftp_long
-#define	ipft_pint	ipft_una.ipftp_int
-#define	ipft_pshort	ipft_una.ipftp_short
-#define	ipft_pchar	ipft_una.ipftp_char
-
-#define	IPFT_RDONLY	1	/* read-only */
-#define	IPFT_WRDISABLED	2	/* write when disabled only */
-
-typedef	struct	ipftune	{
-	void    	*ipft_cookie;
-	ipftuneval_t	ipft_un;
-	u_long  	ipft_min;
-	u_long  	ipft_max;
-	int		ipft_sz;
-	int		ipft_flags;
-	char		ipft_name[80];
-} ipftune_t;
-
-#define	ipft_vlong	ipft_un.ipftu_long
-#define	ipft_vint	ipft_un.ipftu_int
-#define	ipft_vshort	ipft_un.ipftu_short
-#define	ipft_vchar	ipft_un.ipftu_char
-
-/*
- * Hash table header
- */
-#define	IPFHASH(x,y)	typedef struct { 			\
-				ipfrwlock_t	ipfh_lock;	\
-				struct	x	*ipfh_head;	\
-				} y
-
-/*
-** HPUX Port
-*/
-#ifdef __hpux
-/* HP-UX locking sequence deadlock detection module lock MAJOR ID */
-# define	IPF_SMAJ	0	/* temp assignment XXX, not critical */
-#endif
-
-#if !defined(CDEV_MAJOR) && defined (__FreeBSD_version) && \
-    (__FreeBSD_version >= 220000)
-# define	CDEV_MAJOR	79
-#endif
-
-/*
- * Post NetBSD 1.2 has the PFIL interface for packet filters.  This turns
- * on those hooks.  We don't need any special mods in non-IP Filter code
- * with this!
- */
-#if (defined(NetBSD) && (NetBSD > 199609) && (NetBSD <= 1991011)) || \
-    (defined(NetBSD1_2) && NetBSD1_2 > 1) || \
-    (defined(__FreeBSD__) && (__FreeBSD_version >= 500043))
-# if (defined(NetBSD) && NetBSD >= 199905)
-#  define PFIL_HOOKS
-# endif
-# ifdef PFIL_HOOKS
-#  define NETBSD_PF
-# endif
-#endif
-
-#ifdef _KERNEL
-# define	FR_VERBOSE(verb_pr)
-# define	FR_DEBUG(verb_pr)
-#else
-extern	void	ipfkdebug __P((char *, ...));
-extern	void	ipfkverbose __P((char *, ...));
-# define	FR_VERBOSE(verb_pr)	ipfkverbose verb_pr
-# define	FR_DEBUG(verb_pr)	ipfkdebug verb_pr
-#endif
-
-/*
- *
- */
-typedef	struct	ipfruleiter {
-	int		iri_inout;
-	char		iri_group[FR_GROUPLEN];
-	int		iri_active;
-	int		iri_nrules;
-	int		iri_v;		/* No longer used (compatibility) */
-	frentry_t	*iri_rule;
-} ipfruleiter_t;
-
-/*
- * Values for iri_inout
- */
-#define	F_IN	0
-#define	F_OUT	1
-#define	F_ACIN	2
-#define	F_ACOUT	3
-
-
-typedef	struct	ipfgeniter {
-	int	igi_type;
-	int	igi_nitems;
-	void	*igi_data;
-} ipfgeniter_t;
-
-#define	IPFGENITER_IPF		0
-#define	IPFGENITER_NAT		1
-#define	IPFGENITER_IPNAT	2
-#define	IPFGENITER_FRAG		3
-#define	IPFGENITER_AUTH		4
-#define	IPFGENITER_STATE	5
-#define	IPFGENITER_NATFRAG	6
-#define	IPFGENITER_HOSTMAP	7
-#define	IPFGENITER_LOOKUP	8
-
-typedef	struct	ipftable {
-	int	ita_type;
-	void	*ita_table;
-} ipftable_t;
-
-#define	IPFTABLE_BUCKETS	1
-#define	IPFTABLE_BUCKETS_NATIN	2
-#define	IPFTABLE_BUCKETS_NATOUT	3
-
-
-typedef struct ipf_v4_masktab_s {
-	u_32_t	imt4_active[33];
-	int	imt4_masks[33];
-	int	imt4_max;
-} ipf_v4_masktab_t;
-
-typedef struct ipf_v6_masktab_s {
-	i6addr_t	imt6_active[129];
-	int		imt6_masks[129];
-	int		imt6_max;
-} ipf_v6_masktab_t;
-
-
-/*
- *
- */
-typedef struct ipftoken {
-	struct ipftoken	*ipt_next;
-	struct ipftoken	**ipt_pnext;
-	void		*ipt_ctx;
-	void		*ipt_data;
-	u_long		ipt_die;
-	int		ipt_type;
-	int		ipt_uid;
-	int		ipt_subtype;
-	int		ipt_ref;
-	int		ipt_complete;
-} ipftoken_t;
-
-
-/*
- *
- */
-typedef struct ipfexp {
-	int		ipfe_cmd;
-	int		ipfe_not;
-	int		ipfe_narg;
-	int		ipfe_size;
-	int		ipfe_arg0[1];
-} ipfexp_t;
-
-/*
- * Currently support commands (ipfe_cmd)
- * 32bits is split up follows:
- * aabbcccc
- * aa = 0 = packet matching, 1 = meta data matching
- * bb = IP protocol number
- * cccc = command
- */
-#define	IPF_EXP_IP_PR		0x00000001
-#define	IPF_EXP_IP_ADDR		0x00000002
-#define	IPF_EXP_IP_SRCADDR	0x00000003
-#define	IPF_EXP_IP_DSTADDR	0x00000004
-#define	IPF_EXP_IP6_ADDR	0x00000005
-#define	IPF_EXP_IP6_SRCADDR	0x00000006
-#define	IPF_EXP_IP6_DSTADDR	0x00000007
-#define	IPF_EXP_TCP_FLAGS	0x00060001
-#define	IPF_EXP_TCP_PORT	0x00060002
-#define	IPF_EXP_TCP_SPORT	0x00060003
-#define	IPF_EXP_TCP_DPORT	0x00060004
-#define	IPF_EXP_UDP_PORT	0x00110002
-#define	IPF_EXP_UDP_SPORT	0x00110003
-#define	IPF_EXP_UDP_DPORT	0x00110004
-#define	IPF_EXP_IDLE_GT		0x01000001
-#define	IPF_EXP_TCP_STATE	0x01060002
-#define	IPF_EXP_END		0xffffffff
-
-#define	ONE_DAY			IPF_TTLVAL(1 * 86400)   /* 1 day */
-#define	FIVE_DAYS		(5 * ONE_DAY)
-
-typedef struct ipf_main_softc_s {
-	struct ipf_main_softc_s *ipf_next;
-	ipfmutex_t	ipf_rw;
-	ipfmutex_t      ipf_timeoutlock;
-	ipfrwlock_t     ipf_mutex;
-	ipfrwlock_t	ipf_frag;
-	ipfrwlock_t	ipf_global;
-	ipfrwlock_t	ipf_tokens;
-	ipfrwlock_t	ipf_state;
-	ipfrwlock_t	ipf_nat;
-	ipfrwlock_t	ipf_natfrag;
-	ipfrwlock_t	ipf_poolrw;
-	int		ipf_dynamic_softc;
-	int		ipf_refcnt;
-	int		ipf_running;
-	int		ipf_flags;
-	int		ipf_active;
-	int		ipf_control_forwarding;
-	int		ipf_update_ipid;
-	int		ipf_chksrc;	/* causes a system crash if enabled */
-	int		ipf_pass;
-	int		ipf_minttl;
-	int		ipf_icmpminfragmtu;
-	int		ipf_interror;	/* Should be in a struct that is per  */
-					/* thread or process. Does not belong */
-					/* here but there's a lot more work   */
-					/* in doing that properly. For now,   */
-					/* it is squatting. */
-	u_int		ipf_tcpidletimeout;
-	u_int		ipf_tcpclosewait;
-	u_int		ipf_tcplastack;
-	u_int		ipf_tcptimewait;
-	u_int		ipf_tcptimeout;
-	u_int		ipf_tcpsynsent;
-	u_int		ipf_tcpsynrecv;
-	u_int		ipf_tcpclosed;
-	u_int		ipf_tcphalfclosed;
-	u_int		ipf_udptimeout;
-	u_int		ipf_udpacktimeout;
-	u_int		ipf_icmptimeout;
-	u_int		ipf_icmpacktimeout;
-	u_int		ipf_iptimeout;
-	u_long		ipf_ticks;
-	u_long		ipf_userifqs;
-	u_long		ipf_rb_no_mem;
-	u_long		ipf_rb_node_max;
-	u_long		ipf_frouteok[2];
-	ipftuneable_t	*ipf_tuners;
-	void		*ipf_frag_soft;
-	void		*ipf_nat_soft;
-	void		*ipf_state_soft;
-	void		*ipf_auth_soft;
-	void		*ipf_proxy_soft;
-	void		*ipf_sync_soft;
-	void		*ipf_lookup_soft;
-	void		*ipf_log_soft;
-	struct frgroup	*ipf_groups[IPL_LOGSIZE][2];
-	frentry_t	*ipf_rules[2][2];
-	frentry_t	*ipf_acct[2][2];
-	frentry_t	*ipf_rule_explist[2];
-	ipftoken_t	*ipf_token_head;
-	ipftoken_t	**ipf_token_tail;
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) && \
-    defined(_KERNEL)
-	struct callout ipf_slow_ch;
-#endif
-#if defined(linux) && defined(_KERNEL)
-	struct timer_list	ipf_timer;
-#endif
-#if NETBSD_GE_REV(104040000)
-	struct callout	ipf_slow_ch;
-#endif
-#if SOLARIS
-# if SOLARIS2 >= 7
-	timeout_id_t	ipf_slow_ch;
-# else
-	int		ipf_slow_ch;
-# endif
-#endif
-#if defined(_KERNEL)
-# if SOLARIS
-	struct pollhead	ipf_poll_head[IPL_LOGSIZE];
-	void		*ipf_dip;
-#  if defined(INSTANCES)
-	int		ipf_get_loopback;
-	u_long		ipf_idnum;
-	net_handle_t	ipf_nd_v4;
-	net_handle_t	ipf_nd_v6;
-	hook_t		*ipf_hk_v4_in;
-	hook_t		*ipf_hk_v4_out;
-	hook_t		*ipf_hk_v4_nic;
-	hook_t		*ipf_hk_v6_in;
-	hook_t		*ipf_hk_v6_out;
-	hook_t		*ipf_hk_v6_nic;
-	hook_t		*ipf_hk_loop_v4_in;
-	hook_t		*ipf_hk_loop_v4_out;
-	hook_t		*ipf_hk_loop_v6_in;
-	hook_t		*ipf_hk_loop_v6_out;
-#  endif
-# else
-#  if defined(linux) && defined(_KERNEL)
-	struct poll_table_struct	ipf_selwait[IPL_LOGSIZE];
-	wait_queue_head_t		iplh_linux[IPL_LOGSIZE];
-#  else
-	struct selinfo	ipf_selwait[IPL_LOGSIZE];
-#  endif
-# endif
-#endif
-	void		*ipf_slow;
-	ipf_statistics_t ipf_stats[2];
-	u_char		ipf_iss_secret[32];
-	u_short		ipf_ip_id;
-} ipf_main_softc_t;
-
-#define	IPFERROR(_e)	do { softc->ipf_interror = (_e); \
-			     DT1(user_error, int, _e); \
-			} while (0)
-
-#ifndef	_KERNEL
-extern	int	ipf_check __P((void *, struct ip *, int, void *, int, mb_t **));
-extern	int	(*ipf_checkp) __P((ip_t *, int, void *, int, mb_t **));
-extern	struct	ifnet *get_unit __P((char *, int));
-extern	char	*get_ifname __P((struct ifnet *));
-extern	int	ipfioctl __P((ipf_main_softc_t *, int, ioctlcmd_t,
-			      caddr_t, int));
-extern	void	m_freem __P((mb_t *));
-extern	size_t	msgdsize __P((mb_t *));
-extern	int	bcopywrap __P((void *, void *, size_t));
-#else /* #ifndef _KERNEL */
-# if defined(__NetBSD__) && defined(PFIL_HOOKS)
-extern	void	ipfilterattach __P((int));
-# endif
-extern	int	ipl_enable __P((void));
-extern	int	ipl_disable __P((void));
-# ifdef MENTAT
-extern	int	ipf_check __P((void *, struct ip *, int, void *, int, void *,
-			       mblk_t **));
-#  if SOLARIS
-extern	void	ipf_prependmbt(fr_info_t *, mblk_t *);
-#   if SOLARIS2 >= 7
-extern	int	ipfioctl __P((dev_t, int, intptr_t, int, cred_t *, int *));
-#   else
-extern	int	ipfioctl __P((dev_t, int, int *, int, cred_t *, int *));
-#   endif
-#  endif
-#  ifdef __hpux
-extern	int	ipfioctl __P((dev_t, int, caddr_t, int));
-extern	int	ipf_select __P((dev_t, int));
-#  endif
-extern	int	ipf_qout __P((queue_t *, mblk_t *));
-# else /* MENTAT */
-extern	int	ipf_check __P((void *, struct ip *, int, void *, int, mb_t **));
-extern	int	(*fr_checkp) __P((ip_t *, int, void *, int, mb_t **));
-extern	size_t	mbufchainlen __P((mb_t *));
-#  ifdef	__sgi
-#   include <sys/cred.h>
-extern	int	ipfioctl __P((dev_t, int, caddr_t, int, cred_t *, int *));
-extern	int	ipfilter_sgi_attach __P((void));
-extern	void	ipfilter_sgi_detach __P((void));
-extern	void	ipfilter_sgi_intfsync __P((void));
-#  else
-#   ifdef	IPFILTER_LKM
-extern	int	ipf_identify __P((char *));
-#   endif
-#   if BSDOS_GE_REV(199510) || FREEBSD_GE_REV(220000) || \
-      (defined(NetBSD) && (NetBSD >= 199511)) || defined(__OpenBSD__)
-#    if defined(__NetBSD__) || BSDOS_GE_REV(199701) || \
-       defined(__OpenBSD__) || FREEBSD_GE_REV(300000)
-#     if (__FreeBSD_version >= 500024)
-#      if (__FreeBSD_version >= 502116)
-extern	int	ipfioctl __P((struct cdev*, u_long, caddr_t, int, struct thread *));
-#      else
-extern	int	ipfioctl __P((dev_t, u_long, caddr_t, int, struct thread *));
-#      endif /* __FreeBSD_version >= 502116 */
-#     else
-#      if  NETBSD_GE_REV(499001000)
-extern	int	ipfioctl __P((dev_t, u_long, void *, int, struct lwp *));
-#       else
-#       if  NETBSD_GE_REV(399001400)
-extern	int	ipfioctl __P((dev_t, u_long, caddr_t, int, struct lwp *));
-#       else
-extern	int	ipfioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
-#       endif
-#      endif
-#     endif /* __FreeBSD_version >= 500024 */
-#    else
-extern	int	ipfioctl __P((dev_t, int, caddr_t, int, struct proc *));
-#    endif
-#   else
-#    ifdef linux
-extern	int	ipfioctl __P((struct inode *, struct file *, u_int, u_long));
-#    else
-extern	int	ipfioctl __P((dev_t, int, caddr_t, int));
-#    endif
-#   endif /* (_BSDI_VERSION >= 199510) */
-#  endif /* __ sgi */
-# endif /* MENTAT */
-
-# if defined(__FreeBSD_version)
-extern	int	ipf_pfil_hook __P((void));
-extern	int	ipf_pfil_unhook __P((void));
-extern	void	ipf_event_reg __P((void));
-extern	void	ipf_event_dereg __P((void));
-# endif
-
-# if defined(INSTANCES)
-extern	ipf_main_softc_t	*ipf_find_softc __P((u_long));
-extern	int	ipf_set_loopback __P((ipf_main_softc_t *, ipftuneable_t *,
-				      ipftuneval_t *));
-# endif
-
-#endif /* #ifndef _KERNEL */
-
-extern	char	*memstr __P((const char *, char *, size_t, size_t));
-extern	int	count4bits __P((u_32_t));
-#ifdef USE_INET6
-extern	int	count6bits __P((u_32_t *));
-#endif
-extern	int	frrequest __P((ipf_main_softc_t *, int, ioctlcmd_t, caddr_t,
-			       int, int));
-extern	char	*getifname __P((struct ifnet *));
-extern	int	ipfattach __P((ipf_main_softc_t *));
-extern	int	ipfdetach __P((ipf_main_softc_t *));
-extern	u_short	ipf_cksum __P((u_short *, int));
-extern	int	copyinptr __P((ipf_main_softc_t *, void *, void *, size_t));
-extern	int	copyoutptr __P((ipf_main_softc_t *, void *, void *, size_t));
-extern	int	ipf_fastroute __P((mb_t *, mb_t **, fr_info_t *, frdest_t *));
-extern	int	ipf_inject __P((fr_info_t *, mb_t *));
-extern	int	ipf_inobj __P((ipf_main_softc_t *, void *, ipfobj_t *,
-			       void *, int));
-extern	int	ipf_inobjsz __P((ipf_main_softc_t *, void *, void *,
-				 int , int));
-extern	int	ipf_ioctlswitch __P((ipf_main_softc_t *, int, void *,
-				     ioctlcmd_t, int, int, void *));
-extern	int	ipf_ipf_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t,
-				   int, int, void *));
-extern	int	ipf_ipftune __P((ipf_main_softc_t *, ioctlcmd_t, void *));
-extern	int	ipf_matcharray_load __P((ipf_main_softc_t *, caddr_t,
-					 ipfobj_t *, int **));
-extern	int	ipf_matcharray_verify __P((int *, int));
-extern	int	ipf_outobj __P((ipf_main_softc_t *, void *, void *, int));
-extern	int	ipf_outobjk __P((ipf_main_softc_t *, ipfobj_t *, void *));
-extern	int	ipf_outobjsz __P((ipf_main_softc_t *, void *, void *,
-				  int, int));
-extern	void	*ipf_pullup __P((mb_t *, fr_info_t *, int));
-extern	int	ipf_resolvedest __P((ipf_main_softc_t *, char *,
-				     struct frdest *, int));
-extern	int	ipf_resolvefunc __P((ipf_main_softc_t *, void *));
-extern	void	*ipf_resolvenic __P((ipf_main_softc_t *, char *, int));
-extern	int	ipf_send_icmp_err __P((int, fr_info_t *, int));
-extern	int	ipf_send_reset __P((fr_info_t *));
-#if  (defined(__FreeBSD_version) && (__FreeBSD_version < 501000)) || \
-     !defined(_KERNEL) || defined(linux)
-#endif
-extern	void	ipf_apply_timeout __P((ipftq_t *, u_int));
-extern	ipftq_t	*ipf_addtimeoutqueue __P((ipf_main_softc_t *, ipftq_t **,
-					  u_int));
-extern	void	ipf_deletequeueentry __P((ipftqent_t *));
-extern	int	ipf_deletetimeoutqueue __P((ipftq_t *));
-extern	void	ipf_freetimeoutqueue __P((ipf_main_softc_t *, ipftq_t *));
-extern	void	ipf_movequeue __P((u_long, ipftqent_t *, ipftq_t *,
-				   ipftq_t *));
-extern	void	ipf_queueappend __P((u_long, ipftqent_t *, ipftq_t *, void *));
-extern	void	ipf_queueback __P((u_long, ipftqent_t *));
-extern	int	ipf_queueflush __P((ipf_main_softc_t *, ipftq_delete_fn_t,
-				    ipftq_t *, ipftq_t *, u_int *, int, int));
-extern	void	ipf_queuefront __P((ipftqent_t *));
-extern	int	ipf_settimeout_tcp __P((ipftuneable_t *, ipftuneval_t *,
-					ipftq_t *));
-extern	int	ipf_checkv4sum __P((fr_info_t *));
-extern	int	ipf_checkl4sum __P((fr_info_t *));
-extern	int	ipf_ifpfillv4addr __P((int, struct sockaddr_in *,
-				      struct sockaddr_in *, struct in_addr *,
-				      struct in_addr *));
-extern	int	ipf_coalesce __P((fr_info_t *));
-#ifdef	USE_INET6
-extern	int	ipf_checkv6sum __P((fr_info_t *));
-extern	int	ipf_ifpfillv6addr __P((int, struct sockaddr_in6 *,
-				      struct sockaddr_in6 *, i6addr_t *,
-				      i6addr_t *));
-#endif
-
-extern	int	ipf_tune_add __P((ipf_main_softc_t *, ipftuneable_t *));
-extern	int	ipf_tune_add_array __P((ipf_main_softc_t *, ipftuneable_t *));
-extern	int	ipf_tune_del __P((ipf_main_softc_t *, ipftuneable_t *));
-extern	int	ipf_tune_del_array __P((ipf_main_softc_t *, ipftuneable_t *));
-extern	int	ipf_tune_array_link __P((ipf_main_softc_t *, ipftuneable_t *));
-extern	int	ipf_tune_array_unlink __P((ipf_main_softc_t *,
-					   ipftuneable_t *));
-extern	ipftuneable_t *ipf_tune_array_copy __P((void *, size_t,
-						ipftuneable_t *));
-
-extern int	ipf_pr_pullup __P((fr_info_t *, int));
-
-extern	int	ipf_flush __P((ipf_main_softc_t *, minor_t, int));
-extern	frgroup_t *ipf_group_add __P((ipf_main_softc_t *, char *, void *,
-				      u_32_t, minor_t, int));
-extern	void	ipf_group_del __P((ipf_main_softc_t *, frgroup_t *,
-				   frentry_t *));
-extern	int	ipf_derefrule __P((ipf_main_softc_t *, frentry_t **));
-extern	frgroup_t *ipf_findgroup __P((ipf_main_softc_t *, char *, minor_t,
-				      int, frgroup_t ***));
-
-extern	int	ipf_log_init __P((void));
-extern	int	ipf_log_bytesused __P((ipf_main_softc_t *, int));
-extern	int	ipf_log_canread __P((ipf_main_softc_t *, int));
-extern	int	ipf_log_clear __P((ipf_main_softc_t *, minor_t));
-extern	u_long  ipf_log_failures __P((ipf_main_softc_t *, int));
-extern	int	ipf_log_read __P((ipf_main_softc_t *, minor_t, uio_t *));
-extern	int	ipf_log_items __P((ipf_main_softc_t *, int, fr_info_t *,
-				   void **, size_t *, int *, int));
-extern	u_long  ipf_log_logok __P((ipf_main_softc_t *, int));
-extern	void	ipf_log_unload __P((ipf_main_softc_t *));
-extern	int 	ipf_log_pkt __P((fr_info_t *, u_int));
-
-extern	frentry_t	*ipf_acctpkt __P((fr_info_t *, u_32_t *));
-extern	u_short		fr_cksum __P((fr_info_t *, ip_t *, int, void *));
-extern	void		ipf_deinitialise __P((ipf_main_softc_t *));
-extern	int		ipf_deliverlocal __P((ipf_main_softc_t *, int, void *,
-					      i6addr_t *));
-extern	frentry_t 	*ipf_dstgrpmap __P((fr_info_t *, u_32_t *));
-extern	void		ipf_fixskip __P((frentry_t **, frentry_t *, int));
-extern	void		ipf_forgetifp __P((ipf_main_softc_t *, void *));
-extern	frentry_t 	*ipf_getrulen __P((ipf_main_softc_t *, int, char *,
-					   u_32_t));
-extern	int		ipf_ifpaddr __P((ipf_main_softc_t *, int, int, void *,
-					i6addr_t *, i6addr_t *));
-extern	void		ipf_inet_mask_add __P((int, ipf_v4_masktab_t *));
-extern	void		ipf_inet_mask_del __P((int, ipf_v4_masktab_t *));
-#ifdef	USE_INET6
-extern	void		ipf_inet6_mask_add __P((int, i6addr_t *,
-						ipf_v6_masktab_t *));
-extern	void		ipf_inet6_mask_del __P((int, i6addr_t *,
-						ipf_v6_masktab_t *));
-#endif
-extern	int		ipf_initialise __P((void));
-extern	int		ipf_lock __P((caddr_t, int *));
-extern  int		ipf_makefrip __P((int, ip_t *, fr_info_t *));
-extern	int		ipf_matchtag __P((ipftag_t *, ipftag_t *));
-extern	int		ipf_matchicmpqueryreply __P((int, icmpinfo_t *,
-						     struct icmp *, int));
-extern	u_32_t		ipf_newisn __P((fr_info_t *));
-extern	u_short		ipf_nextipid __P((fr_info_t *));
-extern	u_int		ipf_pcksum __P((fr_info_t *, int, u_int));
-extern	void		ipf_rule_expire __P((ipf_main_softc_t *));
-extern	int		ipf_scanlist __P((fr_info_t *, u_32_t));
-extern	frentry_t 	*ipf_srcgrpmap __P((fr_info_t *, u_32_t *));
-extern	int		ipf_tcpudpchk __P((fr_ip_t *, frtuc_t *));
-extern	int		ipf_verifysrc __P((fr_info_t *fin));
-extern	int		ipf_zerostats __P((ipf_main_softc_t *, char *));
-extern	int		ipf_getnextrule __P((ipf_main_softc_t *, ipftoken_t *,
-					     void *));
-extern	int		ipf_sync __P((ipf_main_softc_t *, void *));
-extern	int		ipf_token_deref __P((ipf_main_softc_t *, ipftoken_t *));
-extern	void		ipf_token_expire __P((ipf_main_softc_t *));
-extern	ipftoken_t	*ipf_token_find __P((ipf_main_softc_t *, int, int,
-					    void *));
-extern	int		ipf_token_del __P((ipf_main_softc_t *, int, int,
-					  void *));
-extern	void		ipf_token_mark_complete __P((ipftoken_t *));
-extern	int		ipf_genericiter __P((ipf_main_softc_t *, void *,
-					     int, void *));
-#ifdef	IPFILTER_LOOKUP
-extern	void		*ipf_resolvelookup __P((int, u_int, u_int,
-						lookupfunc_t *));
-#endif
-extern	u_32_t		ipf_random __P((void));
-
-extern	int		ipf_main_load __P((void));
-extern	void		*ipf_main_soft_create __P((void *));
-extern	void		ipf_main_soft_destroy __P((ipf_main_softc_t *));
-extern	int		ipf_main_soft_init __P((ipf_main_softc_t *));
-extern	int		ipf_main_soft_fini __P((ipf_main_softc_t *));
-extern	int		ipf_main_unload __P((void));
-extern	int		ipf_load_all __P((void));
-extern	int		ipf_unload_all __P((void));
-extern	void		ipf_destroy_all __P((ipf_main_softc_t *));
-extern	ipf_main_softc_t *ipf_create_all __P((void *));
-extern	int		ipf_init_all __P((ipf_main_softc_t *));
-extern	int		ipf_fini_all __P((ipf_main_softc_t *));
-extern	void		ipf_log_soft_destroy __P((ipf_main_softc_t *, void *));
-extern	void		*ipf_log_soft_create __P((ipf_main_softc_t *));
-extern	int		ipf_log_soft_init __P((ipf_main_softc_t *, void *));
-extern	int		ipf_log_soft_fini __P((ipf_main_softc_t *, void *));
-extern	int		ipf_log_main_load __P((void));
-extern	int		ipf_log_main_unload __P((void));
-
-
-extern	char	ipfilter_version[];
-#ifdef	USE_INET6
-extern	int	icmptoicmp6types[ICMP_MAXTYPE+1];
-extern	int	icmptoicmp6unreach[ICMP_MAX_UNREACH];
-extern	int	icmpreplytype6[ICMP6_MAXTYPE + 1];
-#endif
-#ifdef	IPFILTER_COMPAT
-extern	int	ipf_in_compat __P((ipf_main_softc_t *, ipfobj_t *, void *,int));
-extern	int	ipf_out_compat __P((ipf_main_softc_t *, ipfobj_t *, void *));
-#endif
-extern	int	icmpreplytype4[ICMP_MAXTYPE + 1];
-
-extern	int	ipf_ht_node_add __P((ipf_main_softc_t *, host_track_t *,
-				     int, i6addr_t *));
-extern	int	ipf_ht_node_del __P((host_track_t *, int, i6addr_t *));
-extern	void	ipf_rb_ht_flush __P((host_track_t *));
-extern	void	ipf_rb_ht_freenode __P((host_node_t *, void *));
-extern	void	ipf_rb_ht_init __P((host_track_t *));
-
-#endif	/* __IP_FIL_H__ */
diff --git a/include.new/netinet/ip_frag.h b/include.new/netinet/ip_frag.h
deleted file mode 100644
index 80bcf8f..0000000
--- a/include.new/netinet/ip_frag.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_frag.h 266829 2014-05-29 02:55:07Z cy $	*/
-
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ip_frag.h	1.5 3/24/96
- * $FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_frag.h 266829 2014-05-29 02:55:07Z cy $
- * Id: ip_frag.h,v 2.23.2.1 2004/03/29 16:21:56 darrenr Exp
- */
-
-#ifndef	__IP_FRAG_H__
-#define	__IP_FRAG_H__
-
-#define	IPFT_SIZE	257
-
-typedef	struct	ipfr	{
-	struct	ipfr	*ipfr_hnext, **ipfr_hprev;
-	struct	ipfr	*ipfr_next, **ipfr_prev;
-	void	*ipfr_data;
-	frentry_t *ipfr_rule;
-	u_long	ipfr_ttl;
-	u_int	ipfr_pkts;
-	u_int	ipfr_bytes;
-	u_int	ipfr_badorder;
-	int	ipfr_ref;
-	u_short	ipfr_off;
-	u_short	ipfr_firstend;
-	u_char	ipfr_p;
-	u_char	ipfr_seen0;
-	/*
-	 * All of the fields, from ipfr_ifp to ipfr_pass, are compared
-	 * using bcmp to see if an identical entry is present.  It is
-	 * therefore important for this set to remain together.
-	 */
-	void	*ipfr_ifp;
-	i6addr_t	ipfr_source;
-	i6addr_t	ipfr_dest;
-	u_32_t	ipfr_optmsk;
-	u_short	ipfr_secmsk;
-	u_short	ipfr_auth;
-	u_32_t	ipfr_id;
-	u_32_t	ipfr_pass;
-	int	ipfr_v;
-} ipfr_t;
-
-#define	ipfr_src	ipfr_source.in4
-#define	ipfr_dst	ipfr_dest.in4
-
-
-typedef	struct	ipfrstat {
-	u_long	ifs_exists;	/* add & already exists */
-	u_long	ifs_nomem;
-	u_long	ifs_new;
-	u_long	ifs_hits;
-	u_long	ifs_expire;
-	u_long	ifs_inuse;
-	u_long	ifs_retrans0;
-	u_long	ifs_short;
-	u_long	ifs_bad;
-	u_long	ifs_overlap;
-	u_long	ifs_unordered;
-	u_long	ifs_strict;
-	u_long	ifs_miss;
-	u_long	ifs_maximum;
-	u_long	ifs_newbad;
-	u_long	ifs_newrestrictnot0;
-	struct	ipfr	**ifs_table;
-	struct	ipfr	**ifs_nattab;
-} ipfrstat_t;
-
-typedef struct ipf_frag_softc_s  {
-	ipfrwlock_t	ipfr_ipidfrag;
-	ipfrwlock_t	ipfr_frag;
-	ipfrwlock_t	ipfr_natfrag;
-	int		ipfr_size;
-	int		ipfr_ttl;
-	int		ipfr_lock;
-	int		ipfr_inited;
-	ipfr_t		*ipfr_list;
-	ipfr_t		**ipfr_tail;
-	ipfr_t		*ipfr_natlist;
-	ipfr_t		**ipfr_nattail;
-	ipfr_t		*ipfr_ipidlist;
-	ipfr_t		**ipfr_ipidtail;
-	ipfr_t		**ipfr_heads;
-	ipfr_t		**ipfr_nattab;
-	ipfr_t		**ipfr_ipidtab;
-	ipfrstat_t	ipfr_stats;
-} ipf_frag_softc_t;
-
-#define	IPFR_CMPSZ	(offsetof(ipfr_t, ipfr_pass) - \
-			 offsetof(ipfr_t, ipfr_ifp))
-
-extern	void	*ipf_frag_soft_create __P((ipf_main_softc_t *));
-extern	int	ipf_frag_soft_init __P((ipf_main_softc_t *, void *));
-extern	int	ipf_frag_soft_fini __P((ipf_main_softc_t *, void *));
-extern	void	ipf_frag_soft_destroy __P((ipf_main_softc_t *, void *));
-extern	int	ipf_frag_main_load __P((void));
-extern	int	ipf_frag_main_unload __P((void));
-extern	int	ipf_frag_load __P((void));
-extern	void	ipf_frag_clear __P((ipf_main_softc_t *));
-extern	void	ipf_frag_expire __P((ipf_main_softc_t *));
-extern	void	ipf_frag_forget __P((void *));
-extern	int	ipf_frag_init __P((void));
-extern	u_32_t	ipf_frag_ipidknown __P((fr_info_t *));
-extern	int	ipf_frag_ipidnew __P((fr_info_t *, u_32_t));
-extern	frentry_t *ipf_frag_known __P((fr_info_t *, u_32_t *));
-extern	void	ipf_frag_natforget __P((ipf_main_softc_t *, void *));
-extern	int	ipf_frag_natnew __P((ipf_main_softc_t *, fr_info_t *, u_32_t, struct nat *));
-extern	nat_t	*ipf_frag_natknown __P((fr_info_t *));
-extern	int	ipf_frag_new __P((ipf_main_softc_t *, fr_info_t *, u_32_t));
-extern	ipfrstat_t	*ipf_frag_stats __P((void *));
-extern	void	ipf_frag_setlock __P((void *, int));
-extern	void	ipf_frag_pkt_deref __P((ipf_main_softc_t *, void *));
-extern	int	ipf_frag_pkt_next __P((ipf_main_softc_t *, ipftoken_t *,
-				       ipfgeniter_t *));
-extern	void	ipf_frag_nat_deref __P((ipf_main_softc_t *, void *));
-extern	int	ipf_frag_nat_next __P((ipf_main_softc_t *, ipftoken_t *,
-				       ipfgeniter_t *));
-extern	void	ipf_slowtimer __P((ipf_main_softc_t *));
-
-#endif	/* __IP_FRAG_H__ */
diff --git a/include.new/netinet/ip_fw.h b/include.new/netinet/ip_fw.h
deleted file mode 100644
index 0e94a0a..0000000
--- a/include.new/netinet/ip_fw.h
+++ /dev/null
@@ -1,641 +0,0 @@
-/*-
- * Copyright (c) 2002-2009 Luigi Rizzo, Universita` di Pisa
- *
- * 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.
- *
- * 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: releng/10.2/sys/netinet/ip_fw.h 248552 2013-03-20 10:35:33Z melifaro $
- */
-
-#ifndef _IPFW2_H
-#define _IPFW2_H
-
-/*
- * The default rule number.  By the design of ip_fw, the default rule
- * is the last one, so its number can also serve as the highest number
- * allowed for a rule.  The ip_fw code relies on both meanings of this
- * constant. 
- */
-#define	IPFW_DEFAULT_RULE	65535
-
-/*
- * Default number of ipfw tables.
- */
-#define	IPFW_TABLES_MAX		65535
-#define	IPFW_TABLES_DEFAULT	128
-
-/*
- * Most commands (queue, pipe, tag, untag, limit...) can have a 16-bit
- * argument between 1 and 65534. The value 0 is unused, the value
- * 65535 (IP_FW_TABLEARG) is used to represent 'tablearg', i.e. the
- * can be 1..65534, or 65535 to indicate the use of a 'tablearg'
- * result of the most recent table() lookup.
- * Note that 16bit is only a historical limit, resulting from
- * the use of a 16-bit fields for that value. In reality, we can have
- * 2^32 pipes, queues, tag values and so on, and use 0 as a tablearg.
- */
-#define	IPFW_ARG_MIN		1
-#define	IPFW_ARG_MAX		65534
-#define IP_FW_TABLEARG		65535	/* XXX should use 0 */
-
-/*
- * Number of entries in the call stack of the call/return commands.
- * Call stack currently is an uint16_t array with rule numbers.
- */
-#define	IPFW_CALLSTACK_SIZE	16
-
-/* IP_FW3 header/opcodes */
-typedef struct _ip_fw3_opheader {
-	uint16_t opcode;	/* Operation opcode */
-	uint16_t reserved[3];	/* Align to 64-bit boundary */
-} ip_fw3_opheader;
-
-
-/* IPFW extented tables support */
-#define	IP_FW_TABLE_XADD	86	/* add entry */
-#define	IP_FW_TABLE_XDEL	87	/* delete entry */
-#define	IP_FW_TABLE_XGETSIZE	88	/* get table size */
-#define	IP_FW_TABLE_XLIST	89	/* list table contents */
-
-/*
- * The kernel representation of ipfw rules is made of a list of
- * 'instructions' (for all practical purposes equivalent to BPF
- * instructions), which specify which fields of the packet
- * (or its metadata) should be analysed.
- *
- * Each instruction is stored in a structure which begins with
- * "ipfw_insn", and can contain extra fields depending on the
- * instruction type (listed below).
- * Note that the code is written so that individual instructions
- * have a size which is a multiple of 32 bits. This means that, if
- * such structures contain pointers or other 64-bit entities,
- * (there is just one instance now) they may end up unaligned on
- * 64-bit architectures, so the must be handled with care.
- *
- * "enum ipfw_opcodes" are the opcodes supported. We can have up
- * to 256 different opcodes. When adding new opcodes, they should
- * be appended to the end of the opcode list before O_LAST_OPCODE,
- * this will prevent the ABI from being broken, otherwise users
- * will have to recompile ipfw(8) when they update the kernel.
- */
-
-enum ipfw_opcodes {		/* arguments (4 byte each)	*/
-	O_NOP,
-
-	O_IP_SRC,		/* u32 = IP			*/
-	O_IP_SRC_MASK,		/* ip = IP/mask			*/
-	O_IP_SRC_ME,		/* none				*/
-	O_IP_SRC_SET,		/* u32=base, arg1=len, bitmap	*/
-
-	O_IP_DST,		/* u32 = IP			*/
-	O_IP_DST_MASK,		/* ip = IP/mask			*/
-	O_IP_DST_ME,		/* none				*/
-	O_IP_DST_SET,		/* u32=base, arg1=len, bitmap	*/
-
-	O_IP_SRCPORT,		/* (n)port list:mask 4 byte ea	*/
-	O_IP_DSTPORT,		/* (n)port list:mask 4 byte ea	*/
-	O_PROTO,		/* arg1=protocol		*/
-
-	O_MACADDR2,		/* 2 mac addr:mask		*/
-	O_MAC_TYPE,		/* same as srcport		*/
-
-	O_LAYER2,		/* none				*/
-	O_IN,			/* none				*/
-	O_FRAG,			/* none				*/
-
-	O_RECV,			/* none				*/
-	O_XMIT,			/* none				*/
-	O_VIA,			/* none				*/
-
-	O_IPOPT,		/* arg1 = 2*u8 bitmap		*/
-	O_IPLEN,		/* arg1 = len			*/
-	O_IPID,			/* arg1 = id			*/
-
-	O_IPTOS,		/* arg1 = id			*/
-	O_IPPRECEDENCE,		/* arg1 = precedence << 5	*/
-	O_IPTTL,		/* arg1 = TTL			*/
-
-	O_IPVER,		/* arg1 = version		*/
-	O_UID,			/* u32 = id			*/
-	O_GID,			/* u32 = id			*/
-	O_ESTAB,		/* none (tcp established)	*/
-	O_TCPFLAGS,		/* arg1 = 2*u8 bitmap		*/
-	O_TCPWIN,		/* arg1 = desired win		*/
-	O_TCPSEQ,		/* u32 = desired seq.		*/
-	O_TCPACK,		/* u32 = desired seq.		*/
-	O_ICMPTYPE,		/* u32 = icmp bitmap		*/
-	O_TCPOPTS,		/* arg1 = 2*u8 bitmap		*/
-
-	O_VERREVPATH,		/* none				*/
-	O_VERSRCREACH,		/* none				*/
-
-	O_PROBE_STATE,		/* none				*/
-	O_KEEP_STATE,		/* none				*/
-	O_LIMIT,		/* ipfw_insn_limit		*/
-	O_LIMIT_PARENT,		/* dyn_type, not an opcode.	*/
-
-	/*
-	 * These are really 'actions'.
-	 */
-
-	O_LOG,			/* ipfw_insn_log		*/
-	O_PROB,			/* u32 = match probability	*/
-
-	O_CHECK_STATE,		/* none				*/
-	O_ACCEPT,		/* none				*/
-	O_DENY,			/* none 			*/
-	O_REJECT,		/* arg1=icmp arg (same as deny)	*/
-	O_COUNT,		/* none				*/
-	O_SKIPTO,		/* arg1=next rule number	*/
-	O_PIPE,			/* arg1=pipe number		*/
-	O_QUEUE,		/* arg1=queue number		*/
-	O_DIVERT,		/* arg1=port number		*/
-	O_TEE,			/* arg1=port number		*/
-	O_FORWARD_IP,		/* fwd sockaddr			*/
-	O_FORWARD_MAC,		/* fwd mac			*/
-	O_NAT,                  /* nope                         */
-	O_REASS,                /* none                         */
-	
-	/*
-	 * More opcodes.
-	 */
-	O_IPSEC,		/* has ipsec history 		*/
-	O_IP_SRC_LOOKUP,	/* arg1=table number, u32=value	*/
-	O_IP_DST_LOOKUP,	/* arg1=table number, u32=value	*/
-	O_ANTISPOOF,		/* none				*/
-	O_JAIL,			/* u32 = id			*/
-	O_ALTQ,			/* u32 = altq classif. qid	*/
-	O_DIVERTED,		/* arg1=bitmap (1:loop, 2:out)	*/
-	O_TCPDATALEN,		/* arg1 = tcp data len		*/
-	O_IP6_SRC,		/* address without mask		*/
-	O_IP6_SRC_ME,		/* my addresses			*/
-	O_IP6_SRC_MASK,		/* address with the mask	*/
-	O_IP6_DST,
-	O_IP6_DST_ME,
-	O_IP6_DST_MASK,
-	O_FLOW6ID,		/* for flow id tag in the ipv6 pkt */
-	O_ICMP6TYPE,		/* icmp6 packet type filtering	*/
-	O_EXT_HDR,		/* filtering for ipv6 extension header */
-	O_IP6,
-
-	/*
-	 * actions for ng_ipfw
-	 */
-	O_NETGRAPH,		/* send to ng_ipfw		*/
-	O_NGTEE,		/* copy to ng_ipfw		*/
-
-	O_IP4,
-
-	O_UNREACH6,		/* arg1=icmpv6 code arg (deny)  */
-
-	O_TAG,   		/* arg1=tag number */
-	O_TAGGED,		/* arg1=tag number */
-
-	O_SETFIB,		/* arg1=FIB number */
-	O_FIB,			/* arg1=FIB desired fib number */
-	
-	O_SOCKARG,		/* socket argument */
-
-	O_CALLRETURN,		/* arg1=called rule number */
-
-	O_FORWARD_IP6,		/* fwd sockaddr_in6             */
-
-	O_DSCP,			/* 2 u32 = DSCP mask */
-	O_SETDSCP,		/* arg1=DSCP value */
-
-	O_LAST_OPCODE		/* not an opcode!		*/
-};
-
-
-/*
- * The extension header are filtered only for presence using a bit
- * vector with a flag for each header.
- */
-#define EXT_FRAGMENT	0x1
-#define EXT_HOPOPTS	0x2
-#define EXT_ROUTING	0x4
-#define EXT_AH		0x8
-#define EXT_ESP		0x10
-#define EXT_DSTOPTS	0x20
-#define EXT_RTHDR0		0x40
-#define EXT_RTHDR2		0x80
-
-/*
- * Template for instructions.
- *
- * ipfw_insn is used for all instructions which require no operands,
- * a single 16-bit value (arg1), or a couple of 8-bit values.
- *
- * For other instructions which require different/larger arguments
- * we have derived structures, ipfw_insn_*.
- *
- * The size of the instruction (in 32-bit words) is in the low
- * 6 bits of "len". The 2 remaining bits are used to implement
- * NOT and OR on individual instructions. Given a type, you can
- * compute the length to be put in "len" using F_INSN_SIZE(t)
- *
- * F_NOT	negates the match result of the instruction.
- *
- * F_OR		is used to build or blocks. By default, instructions
- *		are evaluated as part of a logical AND. An "or" block
- *		{ X or Y or Z } contains F_OR set in all but the last
- *		instruction of the block. A match will cause the code
- *		to skip past the last instruction of the block.
- *
- * NOTA BENE: in a couple of places we assume that
- *	sizeof(ipfw_insn) == sizeof(uint32_t)
- * this needs to be fixed.
- *
- */
-typedef struct	_ipfw_insn {	/* template for instructions */
-	u_int8_t 	opcode;
-	u_int8_t	len;	/* number of 32-bit words */
-#define	F_NOT		0x80
-#define	F_OR		0x40
-#define	F_LEN_MASK	0x3f
-#define	F_LEN(cmd)	((cmd)->len & F_LEN_MASK)
-
-	u_int16_t	arg1;
-} ipfw_insn;
-
-/*
- * The F_INSN_SIZE(type) computes the size, in 4-byte words, of
- * a given type.
- */
-#define	F_INSN_SIZE(t)	((sizeof (t))/sizeof(uint32_t))
-
-/*
- * This is used to store an array of 16-bit entries (ports etc.)
- */
-typedef struct	_ipfw_insn_u16 {
-	ipfw_insn o;
-	u_int16_t ports[2];	/* there may be more */
-} ipfw_insn_u16;
-
-/*
- * This is used to store an array of 32-bit entries
- * (uid, single IPv4 addresses etc.)
- */
-typedef struct	_ipfw_insn_u32 {
-	ipfw_insn o;
-	uint32_t d[1];	/* one or more */
-} ipfw_insn_u32;
-
-/*
- * This is used to store IP addr-mask pairs.
- */
-typedef struct	_ipfw_insn_ip {
-	ipfw_insn o;
-	struct in_addr	addr;
-	struct in_addr	mask;
-} ipfw_insn_ip;
-
-/*
- * This is used to forward to a given address (ip).
- */
-typedef struct  _ipfw_insn_sa {
-	ipfw_insn o;
-	struct sockaddr_in sa;
-} ipfw_insn_sa;
-
-/*
- * This is used to forward to a given address (ipv6).
- */
-typedef struct _ipfw_insn_sa6 {
-	ipfw_insn o;
-	struct sockaddr_in6 sa;
-} ipfw_insn_sa6;
-
-/*
- * This is used for MAC addr-mask pairs.
- */
-typedef struct	_ipfw_insn_mac {
-	ipfw_insn o;
-	u_char addr[12];	/* dst[6] + src[6] */
-	u_char mask[12];	/* dst[6] + src[6] */
-} ipfw_insn_mac;
-
-/*
- * This is used for interface match rules (recv xx, xmit xx).
- */
-typedef struct	_ipfw_insn_if {
-	ipfw_insn o;
-	union {
-		struct in_addr ip;
-		int glob;
-	} p;
-	char name[IFNAMSIZ];
-} ipfw_insn_if;
-
-/*
- * This is used for storing an altq queue id number.
- */
-typedef struct _ipfw_insn_altq {
-	ipfw_insn	o;
-	uint32_t	qid;
-} ipfw_insn_altq;
-
-/*
- * This is used for limit rules.
- */
-typedef struct	_ipfw_insn_limit {
-	ipfw_insn o;
-	u_int8_t _pad;
-	u_int8_t limit_mask;	/* combination of DYN_* below	*/
-#define	DYN_SRC_ADDR	0x1
-#define	DYN_SRC_PORT	0x2
-#define	DYN_DST_ADDR	0x4
-#define	DYN_DST_PORT	0x8
-
-	u_int16_t conn_limit;
-} ipfw_insn_limit;
-
-/*
- * This is used for log instructions.
- */
-typedef struct  _ipfw_insn_log {
-        ipfw_insn o;
-	uint32_t max_log;	/* how many do we log -- 0 = all */
-	uint32_t log_left;	/* how many left to log 	*/
-} ipfw_insn_log;
-
-/*
- * Data structures required by both ipfw(8) and ipfw(4) but not part of the
- * management API are protected by IPFW_INTERNAL.
- */
-#ifdef IPFW_INTERNAL
-/* Server pool support (LSNAT). */
-struct cfg_spool {
-	LIST_ENTRY(cfg_spool)   _next;          /* chain of spool instances */
-	struct in_addr          addr;
-	u_short                 port;
-};
-#endif
-
-/* Redirect modes id. */
-#define REDIR_ADDR      0x01
-#define REDIR_PORT      0x02
-#define REDIR_PROTO     0x04
-
-#ifdef IPFW_INTERNAL
-/* Nat redirect configuration. */
-struct cfg_redir {
-	LIST_ENTRY(cfg_redir)   _next;          /* chain of redir instances */
-	u_int16_t               mode;           /* type of redirect mode */
-	struct in_addr	        laddr;          /* local ip address */
-	struct in_addr	        paddr;          /* public ip address */
-	struct in_addr	        raddr;          /* remote ip address */
-	u_short                 lport;          /* local port */
-	u_short                 pport;          /* public port */
-	u_short                 rport;          /* remote port  */
-	u_short                 pport_cnt;      /* number of public ports */
-	u_short                 rport_cnt;      /* number of remote ports */
-	int                     proto;          /* protocol: tcp/udp */
-	struct alias_link       **alink;	
-	/* num of entry in spool chain */
-	u_int16_t               spool_cnt;      
-	/* chain of spool instances */
-	LIST_HEAD(spool_chain, cfg_spool) spool_chain;
-};
-#endif
-
-#ifdef IPFW_INTERNAL
-/* Nat configuration data struct. */
-struct cfg_nat {
-	/* chain of nat instances */
-	LIST_ENTRY(cfg_nat)     _next;
-	int                     id;                     /* nat id */
-	struct in_addr          ip;                     /* nat ip address */
-	char                    if_name[IF_NAMESIZE];   /* interface name */
-	int                     mode;                   /* aliasing mode */
-	struct libalias	        *lib;                   /* libalias instance */
-	/* number of entry in spool chain */
-	int                     redir_cnt;              
-	/* chain of redir instances */
-	LIST_HEAD(redir_chain, cfg_redir) redir_chain;  
-};
-#endif
-
-#define SOF_NAT         sizeof(struct cfg_nat)
-#define SOF_REDIR       sizeof(struct cfg_redir)
-#define SOF_SPOOL       sizeof(struct cfg_spool)
-
-/* Nat command. */
-typedef struct	_ipfw_insn_nat {
- 	ipfw_insn	o;
- 	struct cfg_nat *nat;	
-} ipfw_insn_nat;
-
-/* Apply ipv6 mask on ipv6 addr */
-#define APPLY_MASK(addr,mask)                          \
-    (addr)->__u6_addr.__u6_addr32[0] &= (mask)->__u6_addr.__u6_addr32[0]; \
-    (addr)->__u6_addr.__u6_addr32[1] &= (mask)->__u6_addr.__u6_addr32[1]; \
-    (addr)->__u6_addr.__u6_addr32[2] &= (mask)->__u6_addr.__u6_addr32[2]; \
-    (addr)->__u6_addr.__u6_addr32[3] &= (mask)->__u6_addr.__u6_addr32[3];
-
-/* Structure for ipv6 */
-typedef struct _ipfw_insn_ip6 {
-       ipfw_insn o;
-       struct in6_addr addr6;
-       struct in6_addr mask6;
-} ipfw_insn_ip6;
-
-/* Used to support icmp6 types */
-typedef struct _ipfw_insn_icmp6 {
-       ipfw_insn o;
-       uint32_t d[7]; /* XXX This number si related to the netinet/icmp6.h
-                       *     define ICMP6_MAXTYPE
-                       *     as follows: n = ICMP6_MAXTYPE/32 + 1
-                        *     Actually is 203 
-                       */
-} ipfw_insn_icmp6;
-
-/*
- * Here we have the structure representing an ipfw rule.
- *
- * It starts with a general area (with link fields and counters)
- * followed by an array of one or more instructions, which the code
- * accesses as an array of 32-bit values.
- *
- * Given a rule pointer  r:
- *
- *  r->cmd		is the start of the first instruction.
- *  ACTION_PTR(r)	is the start of the first action (things to do
- *			once a rule matched).
- *
- * When assembling instruction, remember the following:
- *
- *  + if a rule has a "keep-state" (or "limit") option, then the
- *	first instruction (at r->cmd) MUST BE an O_PROBE_STATE
- *  + if a rule has a "log" option, then the first action
- *	(at ACTION_PTR(r)) MUST be O_LOG
- *  + if a rule has an "altq" option, it comes after "log"
- *  + if a rule has an O_TAG option, it comes after "log" and "altq"
- *
- * NOTE: we use a simple linked list of rules because we never need
- * 	to delete a rule without scanning the list. We do not use
- *	queue(3) macros for portability and readability.
- */
-
-struct ip_fw {
-	struct ip_fw	*x_next;	/* linked list of rules		*/
-	struct ip_fw	*next_rule;	/* ptr to next [skipto] rule	*/
-	/* 'next_rule' is used to pass up 'set_disable' status		*/
-
-	uint16_t	act_ofs;	/* offset of action in 32-bit units */
-	uint16_t	cmd_len;	/* # of 32-bit words in cmd	*/
-	uint16_t	rulenum;	/* rule number			*/
-	uint8_t	set;		/* rule set (0..31)		*/
-#define	RESVD_SET	31	/* set for default and persistent rules */
-	uint8_t		_pad;		/* padding			*/
-	uint32_t	id;		/* rule id */
-
-	/* These fields are present in all rules.			*/
-	uint64_t	pcnt;		/* Packet counter		*/
-	uint64_t	bcnt;		/* Byte counter			*/
-	uint32_t	timestamp;	/* tv_sec of last match		*/
-
-	ipfw_insn	cmd[1];		/* storage for commands		*/
-};
-
-#define ACTION_PTR(rule)				\
-	(ipfw_insn *)( (uint32_t *)((rule)->cmd) + ((rule)->act_ofs) )
-
-#define RULESIZE(rule)  (sizeof(struct ip_fw) + \
-	((struct ip_fw *)(rule))->cmd_len * 4 - 4)
-
-#if 1 // should be moved to in.h
-/*
- * This structure is used as a flow mask and a flow id for various
- * parts of the code.
- * addr_type is used in userland and kernel to mark the address type.
- * fib is used in the kernel to record the fib in use.
- * _flags is used in the kernel to store tcp flags for dynamic rules.
- */
-struct ipfw_flow_id {
-	uint32_t	dst_ip;
-	uint32_t	src_ip;
-	uint16_t	dst_port;
-	uint16_t	src_port;
-	uint8_t		fib;
-	uint8_t		proto;
-	uint8_t		_flags;	/* protocol-specific flags */
-	uint8_t		addr_type; /* 4=ip4, 6=ip6, 1=ether ? */
-	struct in6_addr dst_ip6;
-	struct in6_addr src_ip6;
-	uint32_t	flow_id6;
-	uint32_t	extra; /* queue/pipe or frag_id */
-};
-#endif
-
-#define IS_IP6_FLOW_ID(id)	((id)->addr_type == 6)
-
-/*
- * Dynamic ipfw rule.
- */
-typedef struct _ipfw_dyn_rule ipfw_dyn_rule;
-
-struct _ipfw_dyn_rule {
-	ipfw_dyn_rule	*next;		/* linked list of rules.	*/
-	struct ip_fw *rule;		/* pointer to rule		*/
-	/* 'rule' is used to pass up the rule number (from the parent)	*/
-
-	ipfw_dyn_rule *parent;		/* pointer to parent rule	*/
-	u_int64_t	pcnt;		/* packet match counter		*/
-	u_int64_t	bcnt;		/* byte match counter		*/
-	struct ipfw_flow_id id;		/* (masked) flow id		*/
-	uint32_t	expire;		/* expire time			*/
-	uint32_t	bucket;		/* which bucket in hash table	*/
-	uint32_t	state;		/* state of this rule (typically a
-					 * combination of TCP flags)
-					 */
-	uint32_t	ack_fwd;	/* most recent ACKs in forward	*/
-	uint32_t	ack_rev;	/* and reverse directions (used	*/
-					/* to generate keepalives)	*/
-	u_int16_t	dyn_type;	/* rule type			*/
-	u_int16_t	count;		/* refcount			*/
-};
-
-/*
- * Definitions for IP option names.
- */
-#define	IP_FW_IPOPT_LSRR	0x01
-#define	IP_FW_IPOPT_SSRR	0x02
-#define	IP_FW_IPOPT_RR		0x04
-#define	IP_FW_IPOPT_TS		0x08
-
-/*
- * Definitions for TCP option names.
- */
-#define	IP_FW_TCPOPT_MSS	0x01
-#define	IP_FW_TCPOPT_WINDOW	0x02
-#define	IP_FW_TCPOPT_SACK	0x04
-#define	IP_FW_TCPOPT_TS		0x08
-#define	IP_FW_TCPOPT_CC		0x10
-
-#define	ICMP_REJECT_RST		0x100	/* fake ICMP code (send a TCP RST) */
-#define	ICMP6_UNREACH_RST	0x100	/* fake ICMPv6 code (send a TCP RST) */
-
-/*
- * These are used for lookup tables.
- */
-
-#define	IPFW_TABLE_CIDR		1	/* Table for holding IPv4/IPv6 prefixes */
-#define	IPFW_TABLE_INTERFACE	2	/* Table for holding interface names */
-#define	IPFW_TABLE_MAXTYPE	2	/* Maximum valid number */
-
-typedef struct	_ipfw_table_entry {
-	in_addr_t	addr;		/* network address		*/
-	uint32_t	value;		/* value			*/
-	u_int16_t	tbl;		/* table number			*/
-	u_int8_t	masklen;	/* mask length			*/
-} ipfw_table_entry;
-
-typedef struct	_ipfw_table_xentry {
-	uint16_t	len;		/* Total entry length		*/
-	uint8_t		type;		/* entry type			*/
-	uint8_t		masklen;	/* mask length			*/
-	uint16_t	tbl;		/* table number			*/
-	uint32_t	value;		/* value			*/
-	union {
-		/* Longest field needs to be aligned by 4-byte boundary	*/
-		struct in6_addr	addr6;	/* IPv6 address 		*/
-		char	iface[IF_NAMESIZE];	/* interface name	*/
-	} k;
-} ipfw_table_xentry;
-
-typedef struct	_ipfw_table {
-	uint32_t	size;		/* size of entries in bytes	*/
-	uint32_t	cnt;		/* # of entries			*/
-	u_int16_t	tbl;		/* table number			*/
-	ipfw_table_entry ent[0];	/* entries			*/
-} ipfw_table;
-
-typedef struct	_ipfw_xtable {
-	ip_fw3_opheader	opheader;	/* eXtended tables are controlled via IP_FW3 */
-	uint32_t	size;		/* size of entries in bytes	*/
-	uint32_t	cnt;		/* # of entries			*/
-	uint16_t	tbl;		/* table number			*/
-	uint8_t		type;		/* table type			*/
-	ipfw_table_xentry xent[0];	/* entries			*/
-} ipfw_xtable;
-
-#endif /* _IPFW2_H */
diff --git a/include.new/netinet/ip_gre.h b/include.new/netinet/ip_gre.h
deleted file mode 100644
index 5111568..0000000
--- a/include.new/netinet/ip_gre.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*	$NetBSD: ip_gre.h,v 1.5 2002/06/09 16:33:40 itojun Exp $ */
-/*	 $FreeBSD: src/sys/netinet/ip_gre.h,v 1.3.2.1 2006/01/27 21:50:10 bz Exp $ */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Heiko W.Rupp <hwr@pilhuhn.de>
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifdef _KERNEL
-void gre_input(struct mbuf *, int);
-void gre_mobile_input(struct mbuf *, int);
-#endif /* _KERNEL */
diff --git a/include.new/netinet/ip_htable.h b/include.new/netinet/ip_htable.h
deleted file mode 100644
index 8038bbc..0000000
--- a/include.new/netinet/ip_htable.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef __IP_HTABLE_H__
-#define __IP_HTABLE_H__
-
-#include "netinet/ip_lookup.h"
-
-typedef	struct	iphtent_s	{
-	struct	iphtent_s	*ipe_next, **ipe_pnext;
-	struct	iphtent_s	*ipe_hnext, **ipe_phnext;
-	struct	iphtent_s	*ipe_dnext, **ipe_pdnext;
-	struct	iphtable_s	*ipe_owner;
-	void		*ipe_ptr;
-	i6addr_t	ipe_addr;
-	i6addr_t	ipe_mask;
-	U_QUAD_T	ipe_hits;
-	U_QUAD_T	ipe_bytes;
-	u_long		ipe_die;
-	int		ipe_uid;
-	int		ipe_ref;
-	int		ipe_unit;
-	char		ipe_family;
-	char		ipe_xxx[3];
-	union	{
-		char	ipeu_char[16];
-		u_long	ipeu_long;
-		u_int	ipeu_int;
-	} ipe_un;
-} iphtent_t;
-
-#define	ipe_value	ipe_un.ipeu_int
-#define	ipe_group	ipe_un.ipeu_char
-
-#define	IPE_V4_HASH_FN(a, m, s)	((((m) ^ (a)) - 1 - ((a) >> 8)) % (s))
-#define	IPE_V6_HASH_FN(a, m, s)	(((((m)[0] ^ (a)[0]) - ((a)[0] >> 8)) + \
-				  (((m)[1] & (a)[1]) - ((a)[1] >> 8)) + \
-				  (((m)[2] & (a)[2]) - ((a)[2] >> 8)) + \
-				  (((m)[3] & (a)[3]) - ((a)[3] >> 8))) % (s))
-
-typedef	struct	iphtable_s	{
-	ipfrwlock_t	iph_rwlock;
-	struct	iphtable_s	*iph_next, **iph_pnext;
-	struct	iphtent_s	**iph_table;
-	struct	iphtent_s	*iph_list;
-	struct	iphtent_s	**iph_tail;
-#ifdef USE_INET6
-	ipf_v6_masktab_t	iph_v6_masks;
-#endif
-	ipf_v4_masktab_t	iph_v4_masks;
-	size_t	iph_size;		/* size of hash table */
-	u_long	iph_seed;		/* hashing seed */
-	u_32_t	iph_flags;
-	u_int	iph_unit;		/* IPL_LOG* */
-	u_int	iph_ref;
-	u_int	iph_type;		/* lookup or group map  - IPHASH_* */
-	u_int	iph_maskset[4];		/* netmasks in use */
-	char	iph_name[FR_GROUPLEN];	/* hash table number */
-} iphtable_t;
-
-/* iph_type */
-#define	IPHASH_LOOKUP	0
-#define	IPHASH_GROUPMAP	1
-#define	IPHASH_DELETE	2
-#define	IPHASH_ANON	0x80000000
-
-
-typedef	struct	iphtstat_s	{
-	iphtable_t	*iphs_tables;
-	u_long		iphs_numtables;
-	u_long		iphs_numnodes;
-	u_long		iphs_nomem;
-	u_long		iphs_pad[16];
-} iphtstat_t;
-
-
-extern void *ipf_iphmfindgroup __P((ipf_main_softc_t *, void *, void *));
-extern iphtable_t *ipf_htable_find __P((void *, int, char *));
-extern ipf_lookup_t ipf_htable_backend;
-#ifndef _KERNEL
-extern	void	ipf_htable_dump __P((ipf_main_softc_t *, void *));
-#endif
-
-#endif /* __IP_HTABLE_H__ */
diff --git a/include.new/netinet/ip_icmp.h b/include.new/netinet/ip_icmp.h
deleted file mode 100644
index ac30500..0000000
--- a/include.new/netinet/ip_icmp.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)ip_icmp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/ip_icmp.h 207369 2010-04-29 11:52:42Z bz $
- */
-
-#ifndef _NETINET_IP_ICMP_H_
-#define _NETINET_IP_ICMP_H_
-
-/*
- * Interface Control Message Protocol Definitions.
- * Per RFC 792, September 1981.
- */
-
-/*
- * Internal of an ICMP Router Advertisement
- */
-struct icmp_ra_addr {
-	uint32_t ira_addr;
-	uint32_t ira_preference;
-};
-
-/*
- * Structure of an icmp header.
- */
-struct icmphdr {
-	u_char	icmp_type;		/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
-};
-
-/*
- * Structure of an icmp packet.
- *
- * XXX: should start with a struct icmphdr.
- */
-struct icmp {
-	u_char	icmp_type;		/* type of message, see below */
-	u_char	icmp_code;		/* type sub code */
-	u_short	icmp_cksum;		/* ones complement cksum of struct */
-	union {
-		u_char ih_pptr;			/* ICMP_PARAMPROB */
-		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
-		struct ih_idseq {
-			uint16_t	icd_id;	/* network format */
-			uint16_t	icd_seq; /* network format */
-		} ih_idseq;
-		int ih_void;
-
-		/* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
-		struct ih_pmtu {
-			uint16_t ipm_void;	/* network format */
-			uint16_t ipm_nextmtu;	/* network format */
-		} ih_pmtu;
-
-		struct ih_rtradv {
-			u_char irt_num_addrs;
-			u_char irt_wpa;
-			u_int16_t irt_lifetime;
-		} ih_rtradv;
-	} icmp_hun;
-#define	icmp_pptr	icmp_hun.ih_pptr
-#define	icmp_gwaddr	icmp_hun.ih_gwaddr
-#define	icmp_id		icmp_hun.ih_idseq.icd_id
-#define	icmp_seq	icmp_hun.ih_idseq.icd_seq
-#define	icmp_void	icmp_hun.ih_void
-#define	icmp_pmvoid	icmp_hun.ih_pmtu.ipm_void
-#define	icmp_nextmtu	icmp_hun.ih_pmtu.ipm_nextmtu
-#define	icmp_num_addrs	icmp_hun.ih_rtradv.irt_num_addrs
-#define	icmp_wpa	icmp_hun.ih_rtradv.irt_wpa
-#define	icmp_lifetime	icmp_hun.ih_rtradv.irt_lifetime
-	union {
-		struct id_ts {			/* ICMP Timestamp */
-			/*
-			 * The next 3 fields are in network format,
-			 * milliseconds since 00:00 GMT
-			 */
-			uint32_t its_otime;	/* Originate */
-			uint32_t its_rtime;	/* Receive */
-			uint32_t its_ttime;	/* Transmit */
-		} id_ts;
-		struct id_ip  {
-			struct ip idi_ip;
-			/* options and then 64 bits of data */
-		} id_ip;
-		struct icmp_ra_addr id_radv;
-		uint32_t id_mask;
-		char	id_data[1];
-	} icmp_dun;
-#define	icmp_otime	icmp_dun.id_ts.its_otime
-#define	icmp_rtime	icmp_dun.id_ts.its_rtime
-#define	icmp_ttime	icmp_dun.id_ts.its_ttime
-#define	icmp_ip		icmp_dun.id_ip.idi_ip
-#define	icmp_radv	icmp_dun.id_radv
-#define	icmp_mask	icmp_dun.id_mask
-#define	icmp_data	icmp_dun.id_data
-};
-
-/*
- * Lower bounds on packet lengths for various types.
- * For the error advice packets must first insure that the
- * packet is large enough to contain the returned ip header.
- * Only then can we do the check to see if 64 bits of packet
- * data have been returned, since we need to check the returned
- * ip header length.
- */
-#define	ICMP_MINLEN	8				/* abs minimum */
-#define	ICMP_TSLEN	(8 + 3 * sizeof (uint32_t))	/* timestamp */
-#define	ICMP_MASKLEN	12				/* address mask */
-#define	ICMP_ADVLENMIN	(8 + sizeof (struct ip) + 8)	/* min */
-#define	ICMP_ADVLEN(p)	(8 + ((p)->icmp_ip.ip_hl << 2) + 8)
-	/* N.B.: must separately check that ip_hl >= 5 */
-
-/*
- * Definition of type and code field values.
- */
-#define	ICMP_ECHOREPLY		0		/* echo reply */
-#define	ICMP_UNREACH		3		/* dest unreachable, codes: */
-#define		ICMP_UNREACH_NET	0		/* bad net */
-#define		ICMP_UNREACH_HOST	1		/* bad host */
-#define		ICMP_UNREACH_PROTOCOL	2		/* bad protocol */
-#define		ICMP_UNREACH_PORT	3		/* bad port */
-#define		ICMP_UNREACH_NEEDFRAG	4		/* IP_DF caused drop */
-#define		ICMP_UNREACH_SRCFAIL	5		/* src route failed */
-#define		ICMP_UNREACH_NET_UNKNOWN 6		/* unknown net */
-#define		ICMP_UNREACH_HOST_UNKNOWN 7		/* unknown host */
-#define		ICMP_UNREACH_ISOLATED	8		/* src host isolated */
-#define		ICMP_UNREACH_NET_PROHIB	9		/* prohibited access */
-#define		ICMP_UNREACH_HOST_PROHIB 10		/* ditto */
-#define		ICMP_UNREACH_TOSNET	11		/* bad tos for net */
-#define		ICMP_UNREACH_TOSHOST	12		/* bad tos for host */
-#define		ICMP_UNREACH_FILTER_PROHIB 13		/* admin prohib */
-#define		ICMP_UNREACH_HOST_PRECEDENCE 14		/* host prec vio. */
-#define		ICMP_UNREACH_PRECEDENCE_CUTOFF 15	/* prec cutoff */
-#define	ICMP_SOURCEQUENCH	4		/* packet lost, slow down */
-#define	ICMP_REDIRECT		5		/* shorter route, codes: */
-#define		ICMP_REDIRECT_NET	0		/* for network */
-#define		ICMP_REDIRECT_HOST	1		/* for host */
-#define		ICMP_REDIRECT_TOSNET	2		/* for tos and net */
-#define		ICMP_REDIRECT_TOSHOST	3		/* for tos and host */
-#define	ICMP_ALTHOSTADDR	6		/* alternate host address */
-#define	ICMP_ECHO		8		/* echo service */
-#define	ICMP_ROUTERADVERT	9		/* router advertisement */
-#define		ICMP_ROUTERADVERT_NORMAL		0	/* normal advertisement */
-#define		ICMP_ROUTERADVERT_NOROUTE_COMMON	16	/* selective routing */
-#define	ICMP_ROUTERSOLICIT	10		/* router solicitation */
-#define	ICMP_TIMXCEED		11		/* time exceeded, code: */
-#define		ICMP_TIMXCEED_INTRANS	0		/* ttl==0 in transit */
-#define		ICMP_TIMXCEED_REASS	1		/* ttl==0 in reass */
-#define	ICMP_PARAMPROB		12		/* ip header bad */
-#define		ICMP_PARAMPROB_ERRATPTR 0		/* error at param ptr */
-#define		ICMP_PARAMPROB_OPTABSENT 1		/* req. opt. absent */
-#define		ICMP_PARAMPROB_LENGTH 2			/* bad length */
-#define	ICMP_TSTAMP		13		/* timestamp request */
-#define	ICMP_TSTAMPREPLY	14		/* timestamp reply */
-#define	ICMP_IREQ		15		/* information request */
-#define	ICMP_IREQREPLY		16		/* information reply */
-#define	ICMP_MASKREQ		17		/* address mask request */
-#define	ICMP_MASKREPLY		18		/* address mask reply */
-#define	ICMP_TRACEROUTE		30		/* traceroute */
-#define	ICMP_DATACONVERR	31		/* data conversion error */
-#define	ICMP_MOBILE_REDIRECT	32		/* mobile host redirect */
-#define	ICMP_IPV6_WHEREAREYOU	33		/* IPv6 where-are-you */
-#define	ICMP_IPV6_IAMHERE	34		/* IPv6 i-am-here */
-#define	ICMP_MOBILE_REGREQUEST	35		/* mobile registration req */
-#define	ICMP_MOBILE_REGREPLY	36		/* mobile registration reply */
-#define	ICMP_SKIP		39		/* SKIP */
-#define	ICMP_PHOTURIS		40		/* Photuris */
-#define		ICMP_PHOTURIS_UNKNOWN_INDEX	1	/* unknown sec index */
-#define		ICMP_PHOTURIS_AUTH_FAILED	2	/* auth failed */
-#define		ICMP_PHOTURIS_DECRYPT_FAILED	3	/* decrypt failed */
-
-#define	ICMP_MAXTYPE		40
-
-#define	ICMP_INFOTYPE(type) \
-	((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \
-	(type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \
-	(type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \
-	(type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \
-	(type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
-
-#ifdef _KERNEL
-void	icmp_error(struct mbuf *, int, int, uint32_t, int);
-void	icmp_input(struct mbuf *, int);
-int	ip_next_mtu(int, int);
-#endif
-
-#endif
diff --git a/include.new/netinet/ip_ipsec.h b/include.new/netinet/ip_ipsec.h
deleted file mode 100644
index 88c9a1e..0000000
--- a/include.new/netinet/ip_ipsec.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/netinet/ip_ipsec.h 199102 2009-11-09 19:53:34Z trasz $
- */
-
-#ifndef _NETINET_IP_IPSEC_H_
-#define _NETINET_IP_IPSEC_H_
-
-int	ip_ipsec_filtertunnel(struct mbuf *);
-int	ip_ipsec_fwd(struct mbuf *);
-int	ip_ipsec_input(struct mbuf *);
-int	ip_ipsec_mtu(struct mbuf *, int);
-int	ip_ipsec_output(struct mbuf **, struct inpcb *, int *, int *);
-#endif
diff --git a/include.new/netinet/ip_lookup.h b/include.new/netinet/ip_lookup.h
deleted file mode 100644
index ba0aa35..0000000
--- a/include.new/netinet/ip_lookup.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * $Id: ip_lookup.h 103 2016-01-12 05:32:24Z reddawg $
- */
-#ifndef __IP_LOOKUP_H__
-#define __IP_LOOKUP_H__
-
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
-# define	SIOCLOOKUPADDTABLE	_IOWR('r', 60, struct iplookupop)
-# define	SIOCLOOKUPDELTABLE	_IOWR('r', 61, struct iplookupop)
-# define	SIOCLOOKUPSTAT		_IOWR('r', 64, struct iplookupop)
-# define	SIOCLOOKUPSTATW		_IOW('r', 64, struct iplookupop)
-# define	SIOCLOOKUPFLUSH		_IOWR('r', 65, struct iplookupflush)
-# define	SIOCLOOKUPADDNODE	_IOWR('r', 67, struct iplookupop)
-# define	SIOCLOOKUPADDNODEW	_IOW('r', 67, struct iplookupop)
-# define	SIOCLOOKUPDELNODE	_IOWR('r', 68, struct iplookupop)
-# define	SIOCLOOKUPDELNODEW	_IOW('r', 68, struct iplookupop)
-#else
-# define	SIOCLOOKUPADDTABLE	_IOWR(r, 60, struct iplookupop)
-# define	SIOCLOOKUPDELTABLE	_IOWR(r, 61, struct iplookupop)
-# define	SIOCLOOKUPSTAT		_IOWR(r, 64, struct iplookupop)
-# define	SIOCLOOKUPSTATW		_IOW(r, 64, struct iplookupop)
-# define	SIOCLOOKUPFLUSH		_IOWR(r, 65, struct iplookupflush)
-# define	SIOCLOOKUPADDNODE	_IOWR(r, 67, struct iplookupop)
-# define	SIOCLOOKUPADDNODEW	_IOW(r, 67, struct iplookupop)
-# define	SIOCLOOKUPDELNODE	_IOWR(r, 68, struct iplookupop)
-# define	SIOCLOOKUPDELNODEW	_IOW(r, 68, struct iplookupop)
-#endif
-
-#define	LOOKUP_POOL_MAX	(IPL_LOGSIZE)
-#define	LOOKUP_POOL_SZ	(IPL_LOGSIZE + 1)
-
-typedef	struct	iplookupop	{
-	int	iplo_type;	/* IPLT_* */
-	int	iplo_unit;	/* IPL_LOG* */
-	u_int	iplo_arg;
-	char	iplo_name[FR_GROUPLEN];
-	size_t	iplo_size;	/* sizeof struct at iplo_struct */
-	void	*iplo_struct;
-} iplookupop_t;
-
-#define	LOOKUP_ANON	0x80000000
-
-
-typedef	struct	iplookupflush	{
-	int	iplf_type;	/* IPLT_* */
-	int	iplf_unit;	/* IPL_LOG* */
-	u_int	iplf_arg;
-	u_int	iplf_count;
-	char	iplf_name[FR_GROUPLEN];
-} iplookupflush_t;
-
-typedef	struct	iplookuplink	{
-	int	ipll_type;	/* IPLT_* */
-	int	ipll_unit;	/* IPL_LOG* */
-	u_int	ipll_num;
-	char	ipll_group[FR_GROUPLEN];
-} iplookuplink_t;
-
-#define	IPLT_ALL	-1
-#define	IPLT_NONE	0
-#define	IPLT_POOL	1
-#define	IPLT_HASH	2
-#define	IPLT_DSTLIST	3
-
-
-#define	IPLT_ANON	0x80000000
-
-
-typedef	union	{
-	struct	iplookupiterkey {
-		u_char	ilik_ival;
-		u_char	ilik_type;	/* IPLT_* */
-		u_char	ilik_otype;
-		signed char	ilik_unit;	/* IPL_LOG* */
-	} ilik_unstr;
-	u_32_t	ilik_key;
-} iplookupiterkey_t;
-
-typedef	struct	ipflookupiter	{
-	int			ili_nitems;
-	iplookupiterkey_t	ili_lkey;
-	char			ili_name[FR_GROUPLEN];
-	void			*ili_data;
-} ipflookupiter_t;
-
-#define	ili_key		ili_lkey.ilik_key
-#define	ili_ival	ili_lkey.ilik_unstr.ilik_ival
-#define	ili_unit	ili_lkey.ilik_unstr.ilik_unit
-#define	ili_type	ili_lkey.ilik_unstr.ilik_type
-#define	ili_otype	ili_lkey.ilik_unstr.ilik_otype
-
-#define	IPFLOOKUPITER_LIST	0
-#define	IPFLOOKUPITER_NODE	1
-
-
-typedef struct ipf_lookup {
-	int	ipfl_type;
-	void	*(*ipfl_create) __P((ipf_main_softc_t *));
-	void	(*ipfl_destroy) __P((ipf_main_softc_t *, void *));
-	int	(*ipfl_init) __P((ipf_main_softc_t *, void *));
-	void	(*ipfl_fini) __P((ipf_main_softc_t *, void *));
-	int	(*ipfl_addr_find) __P((ipf_main_softc_t *, void *,
-				       int, void *, u_int));
-	size_t	(*ipfl_flush) __P((ipf_main_softc_t *, void *,
-				   iplookupflush_t *));
-	int	(*ipfl_iter_deref) __P((ipf_main_softc_t *, void *,
-					int, int, void *));
-	int	(*ipfl_iter_next) __P((ipf_main_softc_t *, void *,
-				       ipftoken_t *, ipflookupiter_t *));
-	int	(*ipfl_node_add) __P((ipf_main_softc_t *, void *,
-				      iplookupop_t *, int));
-	int	(*ipfl_node_del) __P((ipf_main_softc_t *, void *,
-				      iplookupop_t *, int));
-	int	(*ipfl_stats_get) __P((ipf_main_softc_t *, void *,
-				       iplookupop_t *));
-	int	(*ipfl_table_add) __P((ipf_main_softc_t *, void *,
-				       iplookupop_t *));
-	int	(*ipfl_table_del) __P((ipf_main_softc_t *, void *,
-				       iplookupop_t *));
-	int	(*ipfl_table_deref) __P((ipf_main_softc_t *, void *, void *));
-	void	*(*ipfl_table_find) __P((void *, int, char *));
-	void	*(*ipfl_select_add_ref) __P((void *, int, char *));
-	int	(*ipfl_select_node) __P((fr_info_t *, void *, u_32_t *,
-					 frdest_t *));
-	void	(*ipfl_expire) __P((ipf_main_softc_t *, void *));
-	void	(*ipfl_sync) __P((ipf_main_softc_t *, void *));
-} ipf_lookup_t;
-
-extern int ipf_lookup_init __P((void));
-extern int ipf_lookup_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *));
-extern void ipf_lookup_main_unload __P((void));
-extern void ipf_lookup_deref __P((ipf_main_softc_t *, int, void *));
-extern void ipf_lookup_iterderef __P((ipf_main_softc_t *, u_32_t, void *));
-extern void *ipf_lookup_res_name __P((ipf_main_softc_t *, int, u_int, char *,
-				      lookupfunc_t *));
-extern void *ipf_lookup_res_num __P((ipf_main_softc_t *, int, u_int, u_int,
-				     lookupfunc_t *));
-extern void ipf_lookup_soft_destroy __P((ipf_main_softc_t *, void *));
-extern void *ipf_lookup_soft_create __P((ipf_main_softc_t *));
-extern int ipf_lookup_soft_init __P((ipf_main_softc_t *, void *));
-extern int ipf_lookup_soft_fini __P((ipf_main_softc_t *, void *));
-extern void *ipf_lookup_find_htable __P((ipf_main_softc_t *, int, char *));
-extern void ipf_lookup_expire __P((ipf_main_softc_t *));
-extern void ipf_lookup_sync __P((ipf_main_softc_t *, void *));
-#ifndef _KERNEL
-extern	void	ipf_lookup_dump __P((ipf_main_softc_t *, void *));
-#endif
-#endif /* __IP_LOOKUP_H__ */
diff --git a/include.new/netinet/ip_mroute.h b/include.new/netinet/ip_mroute.h
deleted file mode 100644
index 04a72e8..0000000
--- a/include.new/netinet/ip_mroute.h
+++ /dev/null
@@ -1,359 +0,0 @@
-/*-
- * Copyright (c) 1989 Stephen Deering.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Stephen Deering of Stanford University.
- *
- * 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.
- * 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.
- *
- *	@(#)ip_mroute.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/ip_mroute.h 253084 2013-07-09 09:50:15Z ae $
- */
-
-#ifndef _NETINET_IP_MROUTE_H_
-#define _NETINET_IP_MROUTE_H_
-
-/*
- * Definitions for IP multicast forwarding.
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Ajit Thyagarajan, PARC, August 1993.
- * Modified by Ajit Thyagarajan, PARC, August 1994.
- * Modified by Ahmed Helmy, SGI, June 1996.
- * Modified by Pavlin Radoslavov, ICSI, October 2002.
- *
- * MROUTING Revision: 3.3.1.3
- * and PIM-SMv2 and PIM-DM support, advanced API support,
- * bandwidth metering and signaling.
- */
-
-/*
- * Multicast Routing set/getsockopt commands.
- */
-#define	MRT_INIT	100	/* initialize forwarder */
-#define	MRT_DONE	101	/* shut down forwarder */
-#define	MRT_ADD_VIF	102	/* create virtual interface */
-#define	MRT_DEL_VIF	103	/* delete virtual interface */
-#define MRT_ADD_MFC	104	/* insert forwarding cache entry */
-#define MRT_DEL_MFC	105	/* delete forwarding cache entry */
-#define MRT_VERSION	106	/* get kernel version number */
-#define MRT_ASSERT      107     /* enable assert processing */
-#define MRT_PIM		MRT_ASSERT /* enable PIM processing */
-#define MRT_API_SUPPORT	109	/* supported MRT API */
-#define MRT_API_CONFIG	110	/* config MRT API */
-#define MRT_ADD_BW_UPCALL 111	/* create bandwidth monitor */
-#define MRT_DEL_BW_UPCALL 112	/* delete bandwidth monitor */
-
-/*
- * Types and macros for handling bitmaps with one bit per virtual interface.
- */
-#define	MAXVIFS 32
-typedef u_long vifbitmap_t;
-typedef u_short vifi_t;		/* type of a vif index */
-#define ALL_VIFS (vifi_t)-1
-
-#define	VIFM_SET(n, m)		((m) |= (1 << (n)))
-#define	VIFM_CLR(n, m)		((m) &= ~(1 << (n)))
-#define	VIFM_ISSET(n, m)	((m) & (1 << (n)))
-#define	VIFM_CLRALL(m)		((m) = 0x00000000)
-#define	VIFM_COPY(mfrom, mto)	((mto) = (mfrom))
-#define	VIFM_SAME(m1, m2)	((m1) == (m2))
-
-struct mfc;
-
-/*
- * Argument structure for MRT_ADD_VIF.
- * (MRT_DEL_VIF takes a single vifi_t argument.)
- */
-struct vifctl {
-	vifi_t	vifc_vifi;		/* the index of the vif to be added */
-	u_char	vifc_flags;		/* VIFF_ flags defined below */
-	u_char	vifc_threshold;		/* min ttl required to forward on vif */
-	u_int	vifc_rate_limit;	/* max rate */
-	struct	in_addr vifc_lcl_addr;	/* local interface address */
-	struct	in_addr vifc_rmt_addr;	/* remote address (tunnels only) */
-};
-
-#define	VIFF_TUNNEL	0x1		/* no-op; retained for old source */
-#define VIFF_SRCRT	0x2		/* no-op; retained for old source */
-#define VIFF_REGISTER	0x4		/* used for PIM Register encap/decap */
-
-/*
- * Argument structure for MRT_ADD_MFC and MRT_DEL_MFC
- * XXX if you change this, make sure to change struct mfcctl2 as well.
- */
-struct mfcctl {
-    struct in_addr  mfcc_origin;		/* ip origin of mcasts       */
-    struct in_addr  mfcc_mcastgrp;		/* multicast group associated*/
-    vifi_t	    mfcc_parent;		/* incoming vif              */
-    u_char	    mfcc_ttls[MAXVIFS];		/* forwarding ttls on vifs   */
-};
-
-/*
- * The new argument structure for MRT_ADD_MFC and MRT_DEL_MFC overlays
- * and extends the old struct mfcctl.
- */
-struct mfcctl2 {
-	/* the mfcctl fields */
-	struct in_addr	mfcc_origin;		/* ip origin of mcasts	     */
-	struct in_addr	mfcc_mcastgrp;		/* multicast group associated*/
-	vifi_t		mfcc_parent;		/* incoming vif		     */
-	u_char		mfcc_ttls[MAXVIFS];	/* forwarding ttls on vifs   */
-
-	/* extension fields */
-	uint8_t		mfcc_flags[MAXVIFS];	/* the MRT_MFC_FLAGS_* flags */
-	struct in_addr	mfcc_rp;		/* the RP address            */
-};
-/*
- * The advanced-API flags.
- *
- * The MRT_MFC_FLAGS_XXX API flags are also used as flags
- * for the mfcc_flags field.
- */
-#define	MRT_MFC_FLAGS_DISABLE_WRONGVIF	(1 << 0) /* disable WRONGVIF signals */
-#define	MRT_MFC_FLAGS_BORDER_VIF	(1 << 1) /* border vif		     */
-#define MRT_MFC_RP			(1 << 8) /* enable RP address	     */
-#define MRT_MFC_BW_UPCALL		(1 << 9) /* enable bw upcalls	     */
-#define MRT_MFC_FLAGS_ALL		(MRT_MFC_FLAGS_DISABLE_WRONGVIF |    \
-					 MRT_MFC_FLAGS_BORDER_VIF)
-#define MRT_API_FLAGS_ALL		(MRT_MFC_FLAGS_ALL |		     \
-					 MRT_MFC_RP |			     \
-					 MRT_MFC_BW_UPCALL)
-
-/*
- * Structure for installing or delivering an upcall if the
- * measured bandwidth is above or below a threshold.
- *
- * User programs (e.g. daemons) may have a need to know when the
- * bandwidth used by some data flow is above or below some threshold.
- * This interface allows the userland to specify the threshold (in
- * bytes and/or packets) and the measurement interval. Flows are
- * all packet with the same source and destination IP address.
- * At the moment the code is only used for multicast destinations
- * but there is nothing that prevents its use for unicast.
- *
- * The measurement interval cannot be shorter than some Tmin (currently, 3s).
- * The threshold is set in packets and/or bytes per_interval.
- *
- * Measurement works as follows:
- *
- * For >= measurements:
- * The first packet marks the start of a measurement interval.
- * During an interval we count packets and bytes, and when we
- * pass the threshold we deliver an upcall and we are done.
- * The first packet after the end of the interval resets the
- * count and restarts the measurement.
- *
- * For <= measurement:
- * We start a timer to fire at the end of the interval, and
- * then for each incoming packet we count packets and bytes.
- * When the timer fires, we compare the value with the threshold,
- * schedule an upcall if we are below, and restart the measurement
- * (reschedule timer and zero counters).
- */
-
-struct bw_data {
-	struct timeval	b_time;
-	uint64_t	b_packets;
-	uint64_t	b_bytes;
-};
-
-struct bw_upcall {
-	struct in_addr	bu_src;			/* source address            */
-	struct in_addr	bu_dst;			/* destination address       */
-	uint32_t	bu_flags;		/* misc flags (see below)    */
-#define BW_UPCALL_UNIT_PACKETS   (1 << 0)	/* threshold (in packets)    */
-#define BW_UPCALL_UNIT_BYTES     (1 << 1)	/* threshold (in bytes)      */
-#define BW_UPCALL_GEQ            (1 << 2)	/* upcall if bw >= threshold */
-#define BW_UPCALL_LEQ            (1 << 3)	/* upcall if bw <= threshold */
-#define BW_UPCALL_DELETE_ALL     (1 << 4)	/* delete all upcalls for s,d*/
-	struct bw_data	bu_threshold;		/* the bw threshold	     */
-	struct bw_data	bu_measured;		/* the measured bw	     */
-};
-
-/* max. number of upcalls to deliver together */
-#define BW_UPCALLS_MAX				128
-/* min. threshold time interval for bandwidth measurement */
-#define BW_UPCALL_THRESHOLD_INTERVAL_MIN_SEC	3
-#define BW_UPCALL_THRESHOLD_INTERVAL_MIN_USEC	0
-
-/*
- * The kernel's multicast routing statistics.
- */
-struct mrtstat {
-	uint64_t mrts_mfc_lookups;    /* # forw. cache hash table hits   */
-	uint64_t mrts_mfc_misses;     /* # forw. cache hash table misses */
-	uint64_t mrts_upcalls;	      /* # calls to multicast routing daemon */
-	uint64_t mrts_no_route;	      /* no route for packet's origin    */
-	uint64_t mrts_bad_tunnel;     /* malformed tunnel options        */
-	uint64_t mrts_cant_tunnel;    /* no room for tunnel options      */
-	uint64_t mrts_wrong_if;	      /* arrived on wrong interface	 */
-	uint64_t mrts_upq_ovflw;      /* upcall Q overflow		 */
-	uint64_t mrts_cache_cleanups; /* # entries with no upcalls	 */
-	uint64_t mrts_drop_sel;	      /* pkts dropped selectively        */
-	uint64_t mrts_q_overflow;     /* pkts dropped - Q overflow       */
-	uint64_t mrts_pkt2large;      /* pkts dropped - size > BKT SIZE  */
-	uint64_t mrts_upq_sockfull;   /* upcalls dropped - socket full   */
-};
-
-#ifdef _KERNEL
-#define	MRTSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct mrtstat, mrtstat, name, (val))
-#define	MRTSTAT_INC(name)	MRTSTAT_ADD(name, 1)
-#endif
-
-/*
- * Argument structure used by mrouted to get src-grp pkt counts
- */
-struct sioc_sg_req {
-    struct in_addr src;
-    struct in_addr grp;
-    u_long pktcnt;
-    u_long bytecnt;
-    u_long wrong_if;
-};
-
-/*
- * Argument structure used by mrouted to get vif pkt counts
- */
-struct sioc_vif_req {
-    vifi_t vifi;		/* vif number				*/
-    u_long icount;		/* Input packet count on vif		*/
-    u_long ocount;		/* Output packet count on vif		*/
-    u_long ibytes;		/* Input byte count on vif		*/
-    u_long obytes;		/* Output byte count on vif		*/
-};
-
-
-/*
- * The kernel's virtual-interface structure.
- */
-struct vif {
-    u_char		v_flags;	/* VIFF_ flags defined above         */
-    u_char		v_threshold;	/* min ttl required to forward on vif*/
-    struct in_addr	v_lcl_addr;	/* local interface address           */
-    struct in_addr	v_rmt_addr;	/* remote address (tunnels only)     */
-    struct ifnet       *v_ifp;		/* pointer to interface              */
-    u_long		v_pkt_in;	/* # pkts in on interface            */
-    u_long		v_pkt_out;	/* # pkts out on interface           */
-    u_long		v_bytes_in;	/* # bytes in on interface	     */
-    u_long		v_bytes_out;	/* # bytes out on interface	     */
-};
-
-#ifdef _KERNEL
-/*
- * The kernel's multicast forwarding cache entry structure
- */
-struct mfc {
-	LIST_ENTRY(mfc)	mfc_hash;
-	struct in_addr	mfc_origin;		/* IP origin of mcasts	     */
-	struct in_addr  mfc_mcastgrp;		/* multicast group associated*/
-	vifi_t		mfc_parent;		/* incoming vif              */
-	u_char		mfc_ttls[MAXVIFS];	/* forwarding ttls on vifs   */
-	u_long		mfc_pkt_cnt;		/* pkt count for src-grp     */
-	u_long		mfc_byte_cnt;		/* byte count for src-grp    */
-	u_long		mfc_wrong_if;		/* wrong if for src-grp	     */
-	int		mfc_expire;		/* time to clean entry up    */
-	struct timeval	mfc_last_assert;	/* last time I sent an assert*/
-	uint8_t		mfc_flags[MAXVIFS];	/* the MRT_MFC_FLAGS_* flags */
-	struct in_addr	mfc_rp;			/* the RP address	     */
-	struct bw_meter	*mfc_bw_meter;		/* list of bandwidth meters  */
-	u_long		mfc_nstall;		/* # of packets awaiting mfc */
-	TAILQ_HEAD(, rtdetq) mfc_stall;		/* q of packets awaiting mfc */
-};
-#endif /* _KERNEL */
-
-/*
- * Struct used to communicate from kernel to multicast router
- * note the convenient similarity to an IP packet
- */
-struct igmpmsg {
-    uint32_t	    unused1;
-    uint32_t	    unused2;
-    u_char	    im_msgtype;			/* what type of message	    */
-#define IGMPMSG_NOCACHE		1	/* no MFC in the kernel		    */
-#define IGMPMSG_WRONGVIF	2	/* packet came from wrong interface */
-#define	IGMPMSG_WHOLEPKT	3	/* PIM pkt for user level encap.    */
-#define	IGMPMSG_BW_UPCALL	4	/* BW monitoring upcall		    */
-    u_char	    im_mbz;			/* must be zero		    */
-    u_char	    im_vif;			/* vif rec'd on		    */
-    u_char	    unused3;
-    struct in_addr  im_src, im_dst;
-};
-
-#ifdef _KERNEL
-/*
- * Argument structure used for pkt info. while upcall is made
- */
-struct rtdetq {
-    TAILQ_ENTRY(rtdetq)	rte_link;
-    struct mbuf		*m;		/* A copy of the packet		    */
-    struct ifnet	*ifp;		/* Interface pkt came in on	    */
-    vifi_t		xmt_vif;	/* Saved copy of imo_multicast_vif  */
-};
-#define MAX_UPQ	4		/* max. no of pkts in upcall Q */
-#endif /* _KERNEL */
-
-/*
- * Structure for measuring the bandwidth and sending an upcall if the
- * measured bandwidth is above or below a threshold.
- */
-struct bw_meter {
-	struct bw_meter	*bm_mfc_next;		/* next bw meter (same mfc)  */
-	struct bw_meter	*bm_time_next;		/* next bw meter (same time) */
-	uint32_t	bm_time_hash;		/* the time hash value       */
-	struct mfc	*bm_mfc;		/* the corresponding mfc     */
-	uint32_t	bm_flags;		/* misc flags (see below)    */
-#define BW_METER_UNIT_PACKETS	(1 << 0)	/* threshold (in packets)    */
-#define BW_METER_UNIT_BYTES	(1 << 1)	/* threshold (in bytes)      */
-#define BW_METER_GEQ		(1 << 2)	/* upcall if bw >= threshold */
-#define BW_METER_LEQ		(1 << 3)	/* upcall if bw <= threshold */
-#define BW_METER_USER_FLAGS	(BW_METER_UNIT_PACKETS |		\
-				 BW_METER_UNIT_BYTES |			\
-				 BW_METER_GEQ |				\
-				 BW_METER_LEQ)
-
-#define BW_METER_UPCALL_DELIVERED (1 << 24)	/* upcall was delivered      */
-
-	struct bw_data	bm_threshold;		/* the upcall threshold	     */
-	struct bw_data	bm_measured;		/* the measured bw	     */
-	struct timeval	bm_start_time;		/* abs. time		     */
-};
-
-#ifdef _KERNEL
-
-struct sockopt;
-
-extern int	(*ip_mrouter_set)(struct socket *, struct sockopt *);
-extern int	(*ip_mrouter_get)(struct socket *, struct sockopt *);
-extern int	(*ip_mrouter_done)(void);
-extern int	(*mrt_ioctl)(u_long, caddr_t, int);
-
-#endif /* _KERNEL */
-
-#endif /* _NETINET_IP_MROUTE_H_ */
diff --git a/include.new/netinet/ip_nat.h b/include.new/netinet/ip_nat.h
deleted file mode 100644
index 7e78c6f..0000000
--- a/include.new/netinet/ip_nat.h
+++ /dev/null
@@ -1,774 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_nat.h 255332 2013-09-06 23:11:19Z cy $	*/
-
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ip_nat.h	1.5 2/4/96
- * $FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_nat.h 255332 2013-09-06 23:11:19Z cy $
- * Id: ip_nat.h,v 2.90.2.20 2007/09/25 08:27:32 darrenr Exp $
- */
-
-#ifndef	__IP_NAT_H__
-#define	__IP_NAT_H__
-
-#ifndef SOLARIS
-#define	SOLARIS	(defined(sun) && (defined(__svr4__) || defined(__SVR4)))
-#endif
-
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
-#define	SIOCADNAT	_IOW('r', 60, struct ipfobj)
-#define	SIOCRMNAT	_IOW('r', 61, struct ipfobj)
-#define	SIOCGNATS	_IOWR('r', 62, struct ipfobj)
-#define	SIOCGNATL	_IOWR('r', 63, struct ipfobj)
-#define	SIOCPURGENAT	_IOWR('r', 100, struct ipfobj)
-#else
-#define	SIOCADNAT	_IOW(r, 60, struct ipfobj)
-#define	SIOCRMNAT	_IOW(r, 61, struct ipfobj)
-#define	SIOCGNATS	_IOWR(r, 62, struct ipfobj)
-#define	SIOCGNATL	_IOWR(r, 63, struct ipfobj)
-#define	SIOCPURGENAT	_IOWR(r, 100, struct ipfobj)
-#endif
-
-#undef	LARGE_NAT	/* define	this if you're setting up a system to NAT
-			 * LARGE numbers of networks/hosts - i.e. in the
-			 * hundreds or thousands.  In such a case, you should
-			 * also change the RDR_SIZE and NAT_SIZE below to more
-			 * appropriate sizes.  The figures below were used for
-			 * a setup with 1000-2000 networks to NAT.
-			 */
-#ifndef NAT_SIZE
-# ifdef LARGE_NAT
-#  define	NAT_SIZE	2047
-# else
-#  define	NAT_SIZE	127
-# endif
-#endif
-#ifndef RDR_SIZE
-# ifdef LARGE_NAT
-#  define	RDR_SIZE	2047
-# else
-#  define	RDR_SIZE	127
-# endif
-#endif
-#ifndef HOSTMAP_SIZE
-# ifdef LARGE_NAT
-#  define	HOSTMAP_SIZE	8191
-# else
-#  define	HOSTMAP_SIZE	2047
-# endif
-#endif
-#ifndef NAT_TABLE_MAX
-/*
- * This is newly introduced and for the sake of "least surprise", the numbers
- * present aren't what we'd normally use for creating a proper hash table.
- */
-# ifdef	LARGE_NAT
-#  define	NAT_TABLE_MAX	180000
-# else
-#  define	NAT_TABLE_MAX	30000
-# endif
-#endif
-#ifndef NAT_TABLE_SZ
-# ifdef LARGE_NAT
-#  define	NAT_TABLE_SZ	16383
-# else
-#  define	NAT_TABLE_SZ	2047
-# endif
-#endif
-#ifndef	APR_LABELLEN
-#define	APR_LABELLEN	16
-#endif
-#define	NAT_HW_CKSUM		0x80000000
-#define	NAT_HW_CKSUM_PART	0x40000000
-
-#define	DEF_NAT_AGE	1200     /* 10 minutes (600 seconds) */
-
-struct ipstate;
-struct ap_session;
-
-/*
- * This structure is used in the active NAT table and represents an
- * active NAT session.
- */
-typedef	struct	nat	{
-	ipfmutex_t	nat_lock;
-	struct	nat	*nat_next;
-	struct	nat	**nat_pnext;
-	struct	nat	*nat_hnext[2];
-	struct	nat	**nat_phnext[2];
-	struct	hostmap	*nat_hm;
-	void		*nat_data;
-	struct	nat	**nat_me;
-	struct	ipstate	*nat_state;
-	struct	ap_session	*nat_aps;		/* proxy session */
-	frentry_t	*nat_fr;	/* filter rule ptr if appropriate */
-	struct	ipnat	*nat_ptr;	/* pointer back to the rule */
-	void		*nat_ifps[2];
-	void		*nat_sync;
-	ipftqent_t	nat_tqe;
-	int		nat_mtu[2];
-	u_32_t		nat_flags;
-	u_32_t		nat_sumd[2];	/* ip checksum delta for data segment*/
-	u_32_t		nat_ipsumd;	/* ip checksum delta for ip header */
-	u_32_t		nat_mssclamp;	/* if != zero clamp MSS to this */
-	i6addr_t	nat_odst6;
-	i6addr_t	nat_osrc6;
-	i6addr_t	nat_ndst6;
-	i6addr_t	nat_nsrc6;
-	U_QUAD_T	nat_pkts[2];
-	U_QUAD_T	nat_bytes[2];
-	union	{
-		udpinfo_t	nat_unu;
-		tcpinfo_t	nat_unt;
-		icmpinfo_t	nat_uni;
-		greinfo_t	nat_ugre;
-	} nat_unold, nat_unnew;
-	int		nat_use;
-	int		nat_pr[2];		/* protocol for NAT */
-	int		nat_dir;
-	int		nat_ref;		/* reference count */
-	u_int		nat_hv[2];
-	char		nat_ifnames[2][LIFNAMSIZ];
-	int		nat_rev;		/* 0 = forward, 1 = reverse */
-	int		nat_dlocal;
-	int		nat_v[2];		/* 0 = old, 1 = new */
-	u_int		nat_redir;		/* copy of in_redir */
-} nat_t;
-
-#define	nat_osrcip	nat_osrc6.in4
-#define	nat_odstip	nat_odst6.in4
-#define	nat_nsrcip	nat_nsrc6.in4
-#define	nat_ndstip	nat_ndst6.in4
-#define	nat_osrcaddr	nat_osrc6.in4.s_addr
-#define	nat_odstaddr	nat_odst6.in4.s_addr
-#define	nat_nsrcaddr	nat_nsrc6.in4.s_addr
-#define	nat_ndstaddr	nat_ndst6.in4.s_addr
-#define	nat_age		nat_tqe.tqe_die
-#define	nat_osport	nat_unold.nat_unt.ts_sport
-#define	nat_odport	nat_unold.nat_unt.ts_dport
-#define	nat_nsport	nat_unnew.nat_unt.ts_sport
-#define	nat_ndport	nat_unnew.nat_unt.ts_dport
-#define	nat_oicmpid	nat_unold.nat_uni.ici_id
-#define	nat_nicmpid	nat_unnew.nat_uni.ici_id
-#define	nat_type	nat_unold.nat_uni.ici_type
-#define	nat_oseq	nat_unold.nat_uni.ici_seq
-#define	nat_nseq	nat_unnew.nat_uni.ici_seq
-#define	nat_tcpstate	nat_tqe.tqe_state
-#define	nat_die		nat_tqe.tqe_die
-#define	nat_touched	nat_tqe.tqe_touched
-
-/*
- * Values for nat_dir
- */
-#define	NAT_INBOUND	0
-#define	NAT_OUTBOUND	1
-#define	NAT_ENCAPIN	2
-#define	NAT_ENCAPOUT	3
-#define	NAT_DIVERTIN	4
-#define	NAT_DIVERTOUT	5
-
-/*
- * Definitions for nat_flags
- */
-#define	NAT_TCP		0x0001	/* IPN_TCP */
-#define	NAT_UDP		0x0002	/* IPN_UDP */
-#define	NAT_ICMPERR	0x0004	/* IPN_ICMPERR */
-#define	NAT_ICMPQUERY	0x0008	/* IPN_ICMPQUERY */
-#define	NAT_SEARCH	0x0010
-#define	NAT_SLAVE	0x0020	/* Slave connection for a proxy */
-#define	NAT_NOTRULEPORT	0x0040	/* Don't use the port # in the NAT rule */
-
-#define	NAT_TCPUDP	(NAT_TCP|NAT_UDP)
-#define	NAT_TCPUDPICMP	(NAT_TCP|NAT_UDP|NAT_ICMPERR)
-#define	NAT_TCPUDPICMPQ	(NAT_TCP|NAT_UDP|NAT_ICMPQUERY)
-#define	NAT_FROMRULE	(NAT_TCP|NAT_UDP)
-
-/* 0x0100 reserved for FI_W_SPORT */
-/* 0x0200 reserved for FI_W_DPORT */
-/* 0x0400 reserved for FI_W_SADDR */
-/* 0x0800 reserved for FI_W_DADDR */
-/* 0x1000 reserved for FI_W_NEWFR */
-/* 0x2000 reserved for SI_CLONE */
-/* 0x4000 reserved for SI_CLONED */
-/* 0x8000 reserved for SI_IGNOREPKT */
-
-#define	NAT_DEBUG	0x800000
-
-typedef	struct nat_addr_s {
-	i6addr_t	na_addr[2];
-	i6addr_t	na_nextaddr;
-	int		na_atype;
-	int		na_function;
-} nat_addr_t;
-
-#define	na_nextip	na_nextaddr.in4.s_addr
-#define	na_nextip6	na_nextaddr.in6
-#define	na_num		na_addr[0].iplookupnum
-#define	na_type		na_addr[0].iplookuptype
-#define	na_subtype	na_addr[0].iplookupsubtype
-#define	na_ptr		na_addr[1].iplookupptr
-#define	na_func		na_addr[1].iplookupfunc
-
-
-/*
- * This structure represents an actual NAT rule, loaded by ipnat.
- */
-typedef	struct	ipnat	{
-	ipfmutex_t	in_lock;
-	struct	ipnat	*in_next;		/* NAT rule list next */
-	struct	ipnat	**in_pnext;		/* prior rdr next ptr */
-	struct	ipnat	*in_rnext;		/* rdr rule hash next */
-	struct	ipnat	**in_prnext;		/* prior rdr next ptr */
-	struct	ipnat	*in_mnext;		/* map rule hash next */
-	struct	ipnat	**in_pmnext;		/* prior map next ptr */
-	struct	ipftq	*in_tqehead[2];
-	void		*in_ifps[2];
-	void		*in_apr;
-	char		*in_comment;
-	mb_t		*in_divmp;
-	void		*in_pconf;
-	U_QUAD_T	in_pkts[2];
-	U_QUAD_T	in_bytes[2];
-	u_long		in_space;
-	u_long		in_hits;
-	int		in_size;
-	int		in_use;
-	u_int		in_hv[2];
-	int		in_flineno;		/* conf. file line number */
-	int		in_stepnext;
-	int		in_dlocal;
-	u_short		in_dpnext;
-	u_short		in_spnext;
-	/* From here to the end is covered by IPN_CMPSIZ */
-	u_char		in_v[2];		/* 0 = old, 1 = new */
-	u_32_t		in_flags;
-	u_32_t		in_mssclamp;		/* if != 0 clamp MSS to this */
-	u_int		in_age[2];
-	int		in_redir;		/* see below for values */
-	int		in_pr[2];		/* protocol. */
-	nat_addr_t	in_ndst;
-	nat_addr_t	in_nsrc;
-	nat_addr_t	in_osrc;
-	nat_addr_t	in_odst;
-	frtuc_t		in_tuc;
-	u_short		in_ppip;		/* ports per IP. */
-	u_short		in_ippip;		/* IP #'s per IP# */
-	u_short		in_ndports[2];
-	u_short		in_nsports[2];
-	int		in_ifnames[2];
-	int		in_plabel;	/* proxy label. */
-	int		in_pconfig;	/* proxy label. */
-	ipftag_t	in_tag;
-	int		in_namelen;
-	char		in_names[1];
-} ipnat_t;
-
-/*
- *      MAP-IN MAP-OUT RDR-IN RDR-OUT
- * osrc    X   == src  == src    X
- * odst    X   == dst  == dst    X
- * nsrc == dst   X       X    == dst
- * ndst == src   X       X    == src
- */
-#define	in_dpmin	in_ndports[0]	/* Also holds static redir port */
-#define	in_dpmax	in_ndports[1]
-#define	in_spmin	in_nsports[0]	/* Also holds static redir port */
-#define	in_spmax	in_nsports[1]
-#define	in_ndport	in_ndports[0]
-#define	in_nsport	in_nsports[0]
-#define	in_dipnext	in_ndst.na_nextaddr.in4
-#define	in_dipnext6	in_ndst.na_nextaddr
-#define	in_dnip		in_ndst.na_nextaddr.in4.s_addr
-#define	in_dnip6	in_ndst.na_nextaddr
-#define	in_sipnext	in_nsrc.na_nextaddr.in4
-#define	in_snip		in_nsrc.na_nextaddr.in4.s_addr
-#define	in_snip6	in_nsrc.na_nextaddr
-#define	in_odstip	in_odst.na_addr[0].in4
-#define	in_odstip6	in_odst.na_addr[0]
-#define	in_odstaddr	in_odst.na_addr[0].in4.s_addr
-#define	in_odstmsk	in_odst.na_addr[1].in4.s_addr
-#define	in_odstmsk6	in_odst.na_addr[1]
-#define	in_odstatype	in_odst.na_atype
-#define	in_osrcip	in_osrc.na_addr[0].in4
-#define	in_osrcip6	in_osrc.na_addr[0]
-#define	in_osrcaddr	in_osrc.na_addr[0].in4.s_addr
-#define	in_osrcmsk	in_osrc.na_addr[1].in4.s_addr
-#define	in_osrcmsk6	in_osrc.na_addr[1]
-#define	in_osrcatype	in_osrc.na_atype
-#define	in_ndstip	in_ndst.na_addr[0].in4
-#define	in_ndstip6	in_ndst.na_addr[0]
-#define	in_ndstaddr	in_ndst.na_addr[0].in4.s_addr
-#define	in_ndstmsk	in_ndst.na_addr[1].in4.s_addr
-#define	in_ndstmsk6	in_ndst.na_addr[1]
-#define	in_ndstatype	in_ndst.na_atype
-#define	in_ndstafunc	in_ndst.na_function
-#define	in_nsrcip	in_nsrc.na_addr[0].in4
-#define	in_nsrcip6	in_nsrc.na_addr[0]
-#define	in_nsrcaddr	in_nsrc.na_addr[0].in4.s_addr
-#define	in_nsrcmsk	in_nsrc.na_addr[1].in4.s_addr
-#define	in_nsrcmsk6	in_nsrc.na_addr[1]
-#define	in_nsrcatype	in_nsrc.na_atype
-#define	in_nsrcafunc	in_nsrc.na_function
-#define	in_scmp		in_tuc.ftu_scmp
-#define	in_dcmp		in_tuc.ftu_dcmp
-#define	in_stop		in_tuc.ftu_stop
-#define	in_dtop		in_tuc.ftu_dtop
-#define	in_osport	in_tuc.ftu_sport
-#define	in_odport	in_tuc.ftu_dport
-#define	in_ndstnum	in_ndst.na_addr[0].iplookupnum
-#define	in_ndsttype	in_ndst.na_addr[0].iplookuptype
-#define	in_ndstptr	in_ndst.na_addr[1].iplookupptr
-#define	in_ndstfunc	in_ndst.na_addr[1].iplookupfunc
-#define	in_nsrcnum	in_nsrc.na_addr[0].iplookupnum
-#define	in_nsrctype	in_nsrc.na_addr[0].iplookuptype
-#define	in_nsrcptr	in_nsrc.na_addr[1].iplookupptr
-#define	in_nsrcfunc	in_nsrc.na_addr[1].iplookupfunc
-#define	in_odstnum	in_odst.na_addr[0].iplookupnum
-#define	in_odsttype	in_odst.na_addr[0].iplookuptype
-#define	in_odstptr	in_odst.na_addr[1].iplookupptr
-#define	in_odstfunc	in_odst.na_addr[1].iplookupfunc
-#define	in_osrcnum	in_osrc.na_addr[0].iplookupnum
-#define	in_osrctype	in_osrc.na_addr[0].iplookuptype
-#define	in_osrcptr	in_osrc.na_addr[1].iplookupptr
-#define	in_osrcfunc	in_osrc.na_addr[1].iplookupfunc
-#define	in_icmpidmin	in_nsports[0]
-#define	in_icmpidmax	in_nsports[1]
-
-/*
- * Bit definitions for in_flags
- */
-#define	IPN_ANY		0x00000
-#define	IPN_TCP		0x00001
-#define	IPN_UDP		0x00002
-#define	IPN_TCPUDP	(IPN_TCP|IPN_UDP)
-#define	IPN_ICMPERR	0x00004
-#define	IPN_TCPUDPICMP	(IPN_TCP|IPN_UDP|IPN_ICMPERR)
-#define	IPN_ICMPQUERY	0x00008
-#define	IPN_TCPUDPICMPQ	(IPN_TCP|IPN_UDP|IPN_ICMPQUERY)
-#define	IPN_RF		(IPN_TCPUDP|IPN_DELETE|IPN_ICMPERR)
-#define	IPN_AUTOPORTMAP	0x00010
-#define	IPN_FILTER	0x00020
-#define	IPN_SPLIT	0x00040
-#define	IPN_ROUNDR	0x00080
-#define	IPN_SIPRANGE	0x00100
-#define	IPN_DIPRANGE	0x00200
-#define	IPN_NOTSRC	0x00400
-#define	IPN_NOTDST	0x00800
-#define	IPN_NO		0x01000
-#define	IPN_DYNSRCIP	0x02000	/* dynamic src IP# */
-#define	IPN_DYNDSTIP	0x04000	/* dynamic dst IP# */
-#define	IPN_DELETE	0x08000
-#define	IPN_STICKY	0x10000
-#define	IPN_FRAG	0x20000
-#define	IPN_FIXEDSPORT	0x40000
-#define	IPN_FIXEDDPORT	0x80000
-#define	IPN_FINDFORWARD	0x100000
-#define	IPN_IN		0x200000
-#define	IPN_SEQUENTIAL	0x400000
-#define	IPN_PURGE	0x800000
-#define	IPN_PROXYRULE	0x1000000
-#define	IPN_USERFLAGS	(IPN_TCPUDP|IPN_AUTOPORTMAP|IPN_SIPRANGE|IPN_SPLIT|\
-			 IPN_ROUNDR|IPN_FILTER|IPN_NOTSRC|IPN_NOTDST|IPN_NO|\
-			 IPN_FRAG|IPN_STICKY|IPN_FIXEDDPORT|IPN_ICMPQUERY|\
-			 IPN_DIPRANGE|IPN_SEQUENTIAL|IPN_PURGE)
-
-/*
- * Values for in_redir
- */
-#define	NAT_MAP		0x01
-#define	NAT_REDIRECT	0x02
-#define	NAT_BIMAP	(NAT_MAP|NAT_REDIRECT)
-#define	NAT_MAPBLK	0x04
-#define	NAT_REWRITE	0x08
-#define	NAT_ENCAP	0x10
-#define	NAT_DIVERTUDP	0x20
-
-#define	MAPBLK_MINPORT	1024	/* don't use reserved ports for src port */
-#define	USABLE_PORTS	(65536 - MAPBLK_MINPORT)
-
-#define	IPN_CMPSIZ	(sizeof(ipnat_t) - offsetof(ipnat_t, in_v))
-
-typedef	struct	natlookup {
-	i6addr_t	nl_inipaddr;
-	i6addr_t	nl_outipaddr;
-	i6addr_t	nl_realipaddr;
-	int		nl_v;
-	int		nl_flags;
-	u_short		nl_inport;
-	u_short		nl_outport;
-	u_short		nl_realport;
-} natlookup_t;
-
-#define	nl_inip		nl_inipaddr.in4
-#define	nl_outip	nl_outipaddr.in4
-#define	nl_realip	nl_realipaddr.in4
-#define	nl_inip6	nl_inipaddr.in6
-#define	nl_outip6	nl_outipaddr.in6
-#define	nl_realip6	nl_realipaddr.in6
-
-
-typedef struct  nat_save    {
-	void	*ipn_next;
-	struct	nat	ipn_nat;
-	struct	ipnat	ipn_ipnat;
-	struct	frentry ipn_fr;
-	int	ipn_dsize;
-	char	ipn_data[4];
-} nat_save_t;
-
-#define	ipn_rule	ipn_nat.nat_fr
-
-typedef	struct	natget	{
-	void	*ng_ptr;
-	int	ng_sz;
-} natget_t;
-
-
-/*
- * This structure gets used to help NAT sessions keep the same NAT rule (and
- * thus translation for IP address) when:
- * (a) round-robin redirects are in use
- * (b) different IP add
- */
-typedef	struct	hostmap	{
-	struct	hostmap	*hm_hnext;
-	struct	hostmap	**hm_phnext;
-	struct	hostmap	*hm_next;
-	struct	hostmap	**hm_pnext;
-	struct	ipnat	*hm_ipnat;
-	i6addr_t	hm_osrcip6;
-	i6addr_t	hm_odstip6;
-	i6addr_t	hm_nsrcip6;
-	i6addr_t	hm_ndstip6;
-	u_32_t		hm_port;
-	int		hm_ref;
-	int		hm_hv;
-	int		hm_v;
-} hostmap_t;
-
-#define	hm_osrcip	hm_osrcip6.in4
-#define	hm_odstip	hm_odstip6.in4
-#define	hm_nsrcip	hm_nsrcip6.in4
-#define	hm_ndstip	hm_ndstip6.in4
-#define	hm_osrc6	hm_osrcip6.in6
-#define	hm_odst6	hm_odstip6.in6
-#define	hm_nsrc6	hm_nsrcip6.in6
-#define	hm_ndst6	hm_ndstip6.in6
-
-
-/*
- * Structure used to pass information in to nat_newmap and nat_newrdr.
- */
-typedef struct	natinfo	{
-	ipnat_t		*nai_np;
-	u_32_t		nai_sum1;
-	u_32_t		nai_sum2;
-	struct	in_addr	nai_ip;		/* In host byte order */
-	u_short		nai_port;
-	u_short		nai_nport;
-	u_short		nai_sport;
-	u_short		nai_dport;
-} natinfo_t;
-
-
-typedef	struct nat_stat_side {
-	u_int	*ns_bucketlen;
-	nat_t	**ns_table;
-	u_long	ns_added;
-	u_long	ns_appr_fail;
-	u_long	ns_badnat;
-	u_long	ns_badnatnew;
-	u_long	ns_badnextaddr;
-	u_long	ns_bucket_max;
-	u_long	ns_clone_nomem;
-	u_long	ns_decap_bad;
-	u_long	ns_decap_fail;
-	u_long	ns_decap_pullup;
-	u_long	ns_divert_dup;
-	u_long	ns_divert_exist;
-	u_long	ns_drop;
-	u_long	ns_encap_dup;
-	u_long	ns_encap_pullup;
-	u_long	ns_exhausted;
-	u_long	ns_icmp_address;
-	u_long	ns_icmp_basic;
-	u_long	ns_icmp_mbuf;
-	u_long	ns_icmp_notfound;
-	u_long	ns_icmp_rebuild;
-	u_long	ns_icmp_short;
-	u_long	ns_icmp_size;
-	u_long	ns_ifpaddrfail;
-	u_long	ns_ignored;
-	u_long	ns_insert_fail;
-	u_long	ns_inuse;
-	u_long	ns_log;
-	u_long	ns_lookup_miss;
-	u_long	ns_lookup_nowild;
-	u_long	ns_new_ifpaddr;
-	u_long	ns_memfail;
-	u_long	ns_table_max;
-	u_long	ns_translated;
-	u_long	ns_unfinalised;
-	u_long	ns_wrap;
-	u_long	ns_xlate_null;
-	u_long	ns_xlate_exists;
-	u_long	ns_ipf_proxy_fail;
-	u_long	ns_uncreate[2];
-} nat_stat_side_t;
-
-
-typedef	struct	natstat	{
-	nat_t		*ns_instances;
-	ipnat_t		*ns_list;
-	hostmap_t	*ns_maplist;
-	hostmap_t	**ns_maptable;
-	u_int		ns_active;
-	u_long		ns_addtrpnt;
-	u_long		ns_divert_build;
-	u_long		ns_expire;
-	u_long		ns_flush_all;
-	u_long		ns_flush_closing;
-	u_long		ns_flush_queue;
-	u_long		ns_flush_state;
-	u_long		ns_flush_timeout;
-	u_long		ns_hm_new;
-	u_long		ns_hm_newfail;
-	u_long		ns_hm_addref;
-	u_long		ns_hm_nullnp;
-	u_long		ns_log_ok;
-	u_long		ns_log_fail;
-	u_int		ns_hostmap_sz;
-	u_int		ns_nattab_sz;
-	u_int		ns_nattab_max;
-	u_int		ns_orphans;
-	u_int		ns_rules;
-	u_int		ns_rules_map;
-	u_int		ns_rules_rdr;
-	u_int		ns_rultab_sz;
-	u_int		ns_rdrtab_sz;
-	u_32_t		ns_ticks;
-	u_int		ns_trpntab_sz;
-	u_int		ns_wilds;
-	u_long		ns_proto[256];
-	nat_stat_side_t	ns_side[2];
-#ifdef USE_INET6
-	nat_stat_side_t	ns_side6[2];
-#endif
-} natstat_t;
-
-typedef	struct	natlog {
-	i6addr_t	nl_osrcip;
-	i6addr_t	nl_odstip;
-	i6addr_t	nl_nsrcip;
-	i6addr_t	nl_ndstip;
-	u_short		nl_osrcport;
-	u_short		nl_odstport;
-	u_short		nl_nsrcport;
-	u_short		nl_ndstport;
-	int		nl_action;
-	int		nl_type;
-	int		nl_rule;
-	U_QUAD_T	nl_pkts[2];
-	U_QUAD_T	nl_bytes[2];
-	u_char		nl_p[2];
-	u_char		nl_v[2];
-	u_char		nl_ifnames[2][LIFNAMSIZ];
-} natlog_t;
-
-
-#define	NL_NEW		0
-#define	NL_CLONE	1
-#define	NL_PURGE	0xfffc
-#define	NL_DESTROY	0xfffd
-#define	NL_FLUSH	0xfffe
-#define	NL_EXPIRE	0xffff
-
-#define	NAT_HASH_FN(_k,_l,_m)	(((_k) + ((_k) >> 12) + _l) % (_m))
-#define	NAT_HASH_FN6(_k,_l,_m)	((((u_32_t *)(_k))[3] \
-				 + (((u_32_t *)(_k))[3] >> 12) \
-				 + (((u_32_t *)(_k))[2]) \
-				 + (((u_32_t *)(_k))[2] >> 12) \
-				 + (((u_32_t *)(_k))[1]) \
-				 + (((u_32_t *)(_k))[1] >> 12) \
-				 + (((u_32_t *)(_k))[0]) \
-				 + (((u_32_t *)(_k))[0] >> 12) \
-				 + _l) % (_m))
-
-#define	LONG_SUM(_i)	(((_i) & 0xffff) + ((_i) >> 16))
-#define	LONG_SUM6(_i)	(LONG_SUM(ntohl(((u_32_t *)(_i))[0])) + \
-			 LONG_SUM(ntohl(((u_32_t *)(_i))[1])) + \
-			 LONG_SUM(ntohl(((u_32_t *)(_i))[2])) + \
-			 LONG_SUM(ntohl(((u_32_t *)(_i))[3])))
-
-#define	CALC_SUMD(s1, s2, sd) { \
-			    (s1) = ((s1) & 0xffff) + ((s1) >> 16); \
-			    (s2) = ((s2) & 0xffff) + ((s2) >> 16); \
-			    /* Do it twice */ \
-			    (s1) = ((s1) & 0xffff) + ((s1) >> 16); \
-			    (s2) = ((s2) & 0xffff) + ((s2) >> 16); \
-			    /* Because ~1 == -2, We really need ~1 == -1 */ \
-			    if ((s1) > (s2)) (s2)--; \
-			    (sd) = (s2) - (s1); \
-			    (sd) = ((sd) & 0xffff) + ((sd) >> 16); }
-
-#define	NAT_SYSSPACE		0x80000000
-#define	NAT_LOCKHELD		0x40000000
-
-/*
- * This is present in ip_nat.h because it needs to be shared between
- * ip_nat.c and ip_nat6.c
- */
-typedef struct ipf_nat_softc_s {
-	ipfmutex_t	ipf_nat_new;
-	ipfmutex_t	ipf_nat_io;
-	int		ipf_nat_doflush;
-	int		ipf_nat_logging;
-	int		ipf_nat_lock;
-	int		ipf_nat_inited;
-	int		ipf_nat_table_wm_high;
-	int		ipf_nat_table_wm_low;
-	u_int		ipf_nat_table_max;
-	u_int		ipf_nat_table_sz;
-	u_int		ipf_nat_maprules_sz;
-	u_int		ipf_nat_rdrrules_sz;
-	u_int		ipf_nat_hostmap_sz;
-	u_int		ipf_nat_maxbucket;
-	u_int		ipf_nat_last_force_flush;
-	u_int		ipf_nat_defage;
-	u_int		ipf_nat_defipage;
-	u_int		ipf_nat_deficmpage;
-	ipf_v4_masktab_t	ipf_nat_map_mask;
-	ipf_v6_masktab_t	ipf_nat6_map_mask;
-	ipf_v4_masktab_t	ipf_nat_rdr_mask;
-	ipf_v6_masktab_t	ipf_nat6_rdr_mask;
-	nat_t		**ipf_nat_table[2];
-	nat_t		*ipf_nat_instances;
-	ipnat_t		*ipf_nat_list;
-	ipnat_t		**ipf_nat_list_tail;
-	ipnat_t		**ipf_nat_map_rules;
-	ipnat_t		**ipf_nat_rdr_rules;
-	ipftq_t		*ipf_nat_utqe;
-	hostmap_t	**ipf_hm_maptable ;
-	hostmap_t	*ipf_hm_maplist ;
-	ipftuneable_t	*ipf_nat_tune;
-	ipftq_t		ipf_nat_udptq;
-	ipftq_t		ipf_nat_udpacktq;
-	ipftq_t		ipf_nat_icmptq;
-	ipftq_t		ipf_nat_icmpacktq;
-	ipftq_t		ipf_nat_iptq;
-	ipftq_t		ipf_nat_pending;
-	ipftq_t		ipf_nat_tcptq[IPF_TCP_NSTATES];
-	natstat_t	ipf_nat_stats;
-} ipf_nat_softc_t ;
-
-#define	ipf_nat_map_max			ipf_nat_map_mask.imt4_max
-#define	ipf_nat_rdr_max			ipf_nat_rdr_mask.imt4_max
-#define	ipf_nat6_map_max		ipf_nat6_map_mask.imt6_max
-#define	ipf_nat6_rdr_max		ipf_nat6_rdr_mask.imt6_max
-#define	ipf_nat_map_active_masks	ipf_nat_map_mask.imt4_active
-#define	ipf_nat_rdr_active_masks	ipf_nat_rdr_mask.imt4_active
-#define	ipf_nat6_map_active_masks	ipf_nat6_map_mask.imt6_active
-#define	ipf_nat6_rdr_active_masks	ipf_nat6_rdr_mask.imt6_active
-
-extern	frentry_t 	ipfnatblock;
-
-extern	void	ipf_fix_datacksum __P((u_short *, u_32_t));
-extern	void	ipf_fix_incksum __P((int, u_short *, u_32_t, u_32_t));
-extern	void	ipf_fix_outcksum __P((int, u_short *, u_32_t, u_32_t));
-
-extern	int	ipf_nat_checkin __P((fr_info_t *, u_32_t *));
-extern	int	ipf_nat_checkout __P((fr_info_t *, u_32_t *));
-extern	void	ipf_nat_delete __P((ipf_main_softc_t *, struct nat *, int));
-extern	void	ipf_nat_deref __P((ipf_main_softc_t *, nat_t **));
-extern	void	ipf_nat_expire __P((ipf_main_softc_t *));
-extern	int	ipf_nat_hashtab_add __P((ipf_main_softc_t *,
-					 ipf_nat_softc_t *, nat_t *));
-extern	void	ipf_nat_hostmapdel __P((ipf_main_softc_t *, hostmap_t **));
-extern	int	ipf_nat_hostmap_rehash __P((ipf_main_softc_t *,
-					    ipftuneable_t *, ipftuneval_t *));
-extern	nat_t	*ipf_nat_icmperrorlookup __P((fr_info_t *, int));
-extern	nat_t	*ipf_nat_icmperror __P((fr_info_t *, u_int *, int));
-#if defined(__OpenBSD__)
-extern	void	ipf_nat_ifdetach __P((void *));
-#endif
-extern	int	ipf_nat_init __P((void));
-extern	nat_t	*ipf_nat_inlookup __P((fr_info_t *, u_int, u_int,
-				      struct in_addr, struct in_addr));
-extern	int	ipf_nat_in __P((fr_info_t *, nat_t *, int, u_32_t));
-extern	int	ipf_nat_insert __P((ipf_main_softc_t *, ipf_nat_softc_t *,
-				    nat_t *));
-extern	int	ipf_nat_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t,
-				   int, int, void *));
-extern	void	ipf_nat_log __P((ipf_main_softc_t *, ipf_nat_softc_t *,
-				 struct nat *, u_int));
-extern	nat_t	*ipf_nat_lookupredir __P((natlookup_t *));
-extern	nat_t	*ipf_nat_maplookup __P((void *, u_int, struct in_addr,
-				struct in_addr));
-extern	nat_t	*ipf_nat_add __P((fr_info_t *, ipnat_t *, nat_t **,
-				 u_int, int));
-extern	int	ipf_nat_out __P((fr_info_t *, nat_t *, int, u_32_t));
-extern	nat_t	*ipf_nat_outlookup __P((fr_info_t *, u_int, u_int,
-				       struct in_addr, struct in_addr));
-extern	u_short	*ipf_nat_proto __P((fr_info_t *, nat_t *, u_int));
-extern	void	ipf_nat_rule_deref __P((ipf_main_softc_t *, ipnat_t **));
-extern	void	ipf_nat_setqueue __P((ipf_main_softc_t *, ipf_nat_softc_t *,
-				      nat_t *));
-extern	void	ipf_nat_setpending __P((ipf_main_softc_t *, nat_t *));
-extern	nat_t	*ipf_nat_tnlookup __P((fr_info_t *, int));
-extern	void	ipf_nat_update __P((fr_info_t *, nat_t *));
-extern	int	ipf_nat_rehash __P((ipf_main_softc_t *, ipftuneable_t *,
-				    ipftuneval_t *));
-extern	int	ipf_nat_rehash_rules __P((ipf_main_softc_t *, ipftuneable_t *,
-					  ipftuneval_t *));
-extern	int	ipf_nat_settimeout __P((struct ipf_main_softc_s *,
-					ipftuneable_t *, ipftuneval_t *));
-extern	void	ipf_nat_sync __P((ipf_main_softc_t *, void *));
-
-extern	nat_t	*ipf_nat_clone __P((fr_info_t *, nat_t *));
-extern	void	ipf_nat_delmap __P((ipf_nat_softc_t *, ipnat_t *));
-extern	void	ipf_nat_delrdr __P((ipf_nat_softc_t *, ipnat_t *));
-extern	int	ipf_nat_wildok __P((nat_t *, int, int, int, int));
-extern	void	ipf_nat_setlock __P((void *, int));
-extern	void	ipf_nat_load __P((void));
-extern	void	*ipf_nat_soft_create __P((ipf_main_softc_t *));
-extern	int	ipf_nat_soft_init __P((ipf_main_softc_t *, void *));
-extern	void	ipf_nat_soft_destroy __P((ipf_main_softc_t *, void *));
-extern	int	ipf_nat_soft_fini __P((ipf_main_softc_t *, void *));
-extern	int	ipf_nat_main_load __P((void));
-extern	int	ipf_nat_main_unload __P((void));
-extern	ipftq_t	*ipf_nat_add_tq __P((ipf_main_softc_t *, int));
-extern	void	ipf_nat_uncreate __P((fr_info_t *));
-
-#ifdef USE_INET6
-extern	nat_t	*ipf_nat6_add __P((fr_info_t *, ipnat_t *, nat_t **,
-				   u_int, int));
-extern	void	ipf_nat6_addrdr __P((ipf_nat_softc_t *, ipnat_t *));
-extern	void	ipf_nat6_addmap __P((ipf_nat_softc_t *, ipnat_t *));
-extern	void	ipf_nat6_addencap __P((ipf_nat_softc_t *, ipnat_t *));
-extern	int	ipf_nat6_checkout __P((fr_info_t *, u_32_t *));
-extern	int	ipf_nat6_checkin __P((fr_info_t *, u_32_t *));
-extern	void	ipf_nat6_delmap __P((ipf_nat_softc_t *, ipnat_t *));
-extern	void	ipf_nat6_delrdr __P((ipf_nat_softc_t *, ipnat_t *));
-extern	int	ipf_nat6_finalise __P((fr_info_t *, nat_t *));
-extern	nat_t	*ipf_nat6_icmperror __P((fr_info_t *, u_int *, int));
-extern	nat_t	*ipf_nat6_icmperrorlookup __P((fr_info_t *, int));
-extern	nat_t	*ipf_nat6_inlookup __P((fr_info_t *, u_int, u_int,
-					struct in6_addr *, struct in6_addr *));
-extern	u_32_t	ipf_nat6_ip6subtract __P((i6addr_t *, i6addr_t *));
-extern	frentry_t *ipf_nat6_ipfin __P((fr_info_t *, u_32_t *));
-extern	frentry_t *ipf_nat6_ipfout __P((fr_info_t *, u_32_t *));
-extern	nat_t	*ipf_nat6_lookupredir __P((natlookup_t *));
-extern	int	ipf_nat6_newmap __P((fr_info_t *, nat_t *, natinfo_t *));
-extern	int	ipf_nat6_newrdr __P((fr_info_t *, nat_t *, natinfo_t *));
-extern	nat_t	*ipf_nat6_outlookup __P((fr_info_t *, u_int, u_int,
-					 struct in6_addr *, struct in6_addr *));
-extern	int	ipf_nat6_newrewrite __P((fr_info_t *, nat_t *, natinfo_t *));
-extern	int	ipf_nat6_newdivert __P((fr_info_t *, nat_t *, natinfo_t *));
-extern	int	ipf_nat6_ruleaddrinit __P((ipf_main_softc_t *, ipf_nat_softc_t *, ipnat_t *));
-
-#endif
-
-
-#endif /* __IP_NAT_H__ */
diff --git a/include.new/netinet/ip_options.h b/include.new/netinet/ip_options.h
deleted file mode 100644
index 7577170..0000000
--- a/include.new/netinet/ip_options.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.
- * Copyright (c) 2005 Andre Oppermann, Internet Business Solutions AG.
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/netinet/ip_options.h 272868 2014-10-09 23:45:26Z hrs $
- */
-
-#ifndef _NETINET_IP_OPTIONS_H_
-#define	_NETINET_IP_OPTIONS_H_
-
-struct ipoptrt {
-        struct  in_addr dst;                    /* final destination */
-        char    nop;                            /* one NOP to align */
-        char    srcopt[IPOPT_OFFSET + 1];       /* OPTVAL, OLEN and OFFSET */
-        struct  in_addr route[MAX_IPOPTLEN/sizeof(struct in_addr)];
-};
-
-struct ipopt_tag {
-	struct	m_tag tag;			/* m_tag */
-	int	ip_nhops;
-	struct	ipoptrt ip_srcrt;
-};
-
-VNET_DECLARE(int, ip_doopts);		/* process or ignore IP options */
-#define	V_ip_doopts	VNET(ip_doopts)
-
-int		 ip_checkrouteralert(struct mbuf *);
-int		 ip_dooptions(struct mbuf *, int);
-struct mbuf	*ip_insertoptions(struct mbuf *, struct mbuf *, int *);
-int		 ip_optcopy(struct ip *, struct ip *);
-int		 ip_pcbopts(struct inpcb *, int, struct mbuf *);
-void		 ip_stripoptions(struct mbuf *);
-struct mbuf	*ip_srcroute(struct mbuf *);
-
-#endif /* !_NETINET_IP_OPTIONS_H_ */
diff --git a/include.new/netinet/ip_pool.h b/include.new/netinet/ip_pool.h
deleted file mode 100644
index 3e0c82a..0000000
--- a/include.new/netinet/ip_pool.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * $Id: ip_pool.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef	__IP_POOL_H__
-#define	__IP_POOL_H__
-
-#include "netinet/ip_lookup.h"
-#include "radix_ipf.h"
-
-#define	IP_POOL_NOMATCH		0
-#define	IP_POOL_POSITIVE	1
-
-typedef	struct ip_pool_node {
-	ipf_rdx_node_t		ipn_nodes[2];
-	addrfamily_t		ipn_addr;
-	addrfamily_t		ipn_mask;
-	int			ipn_uid;
-	int			ipn_info;
-	int			ipn_ref;
-	char			ipn_name[FR_GROUPLEN];
-	U_QUAD_T		ipn_hits;
-	U_QUAD_T		ipn_bytes;
-	u_long			ipn_die;
-	struct ip_pool_node	*ipn_next, **ipn_pnext;
-	struct ip_pool_node	*ipn_dnext, **ipn_pdnext;
-	struct ip_pool_s	*ipn_owner;
-} ip_pool_node_t;
-
-
-typedef	struct ip_pool_s {
-	struct ip_pool_s	*ipo_next;
-	struct ip_pool_s	**ipo_pnext;
-	ipf_rdx_head_t		*ipo_head;
-	ip_pool_node_t		*ipo_list;
-	ip_pool_node_t		**ipo_tail;
-	ip_pool_node_t		*ipo_nextaddr;
-	void			*ipo_radix;
-	u_long			ipo_hits;
-	int			ipo_unit;
-	int			ipo_flags;
-	int			ipo_ref;
-	char			ipo_name[FR_GROUPLEN];
-} ip_pool_t;
-
-#define	IPOOL_DELETE	0x01
-#define	IPOOL_ANON	0x02
-
-
-typedef	struct	ipf_pool_stat	{
-	u_long			ipls_pools;
-	u_long			ipls_tables;
-	u_long			ipls_nodes;
-	ip_pool_t		*ipls_list[LOOKUP_POOL_SZ];
-} ipf_pool_stat_t;
-
-extern	ipf_lookup_t	ipf_pool_backend;
-
-#ifndef _KERNEL
-extern	void	ipf_pool_dump __P((ipf_main_softc_t *, void *));
-#endif
-
-#endif /* __IP_POOL_H__ */
diff --git a/include.new/netinet/ip_proxy.h b/include.new/netinet/ip_proxy.h
deleted file mode 100644
index 1eeb36c..0000000
--- a/include.new/netinet/ip_proxy.h
+++ /dev/null
@@ -1,463 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_proxy.h 255332 2013-09-06 23:11:19Z cy $	*/
-
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * $FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_proxy.h 255332 2013-09-06 23:11:19Z cy $
- * Id: ip_proxy.h,v 2.31.2.2 2005/03/12 19:33:48 darrenr Exp
- */
-
-#ifndef	__IP_PROXY_H__
-#define	__IP_PROXY_H__
-
-#ifndef SOLARIS
-#define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4)))
-#endif
-
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
-#define	SIOCPROXY	_IOWR('r', 64, struct ap_control)
-#else
-#define	SIOCPROXY	_IOWR(r, 64, struct ap_control)
-#endif
-
-#ifndef	APR_LABELLEN
-#define	APR_LABELLEN	16
-#endif
-#define	AP_SESS_SIZE	53
-
-struct	nat;
-struct	ipnat;
-struct	ipstate;
-
-typedef	struct	ap_tcp {
-	u_short	apt_sport;	/* source port */
-	u_short	apt_dport;	/* destination port */
-	short	apt_sel[2];	/* {seq,ack}{off,min} set selector */
-	short	apt_seqoff[2];	/* sequence # difference */
-	u_32_t	apt_seqmin[2];	/* don't change seq-off until after this */
-	short	apt_ackoff[2];	/* sequence # difference */
-	u_32_t	apt_ackmin[2];	/* don't change seq-off until after this */
-	u_char	apt_state[2];	/* connection state */
-} ap_tcp_t;
-
-typedef	struct	ap_udp {
-	u_short	apu_sport;	/* source port */
-	u_short	apu_dport;	/* destination port */
-} ap_udp_t;
-
-typedef	struct ap_session {
-	struct	aproxy	*aps_apr;
-	union {
-		struct	ap_tcp	apu_tcp;
-		struct	ap_udp	apu_udp;
-	} aps_un;
-	U_QUAD_T aps_bytes;	/* bytes sent */
-	U_QUAD_T aps_pkts;	/* packets sent */
-	void	*aps_nat;	/* pointer back to nat struct */
-	void	*aps_data;	/* private data */
-	int	aps_psiz;	/* size of private data */
-	struct	ap_session	*aps_next;
-} ap_session_t;
-
-#define	aps_sport	aps_un.apu_tcp.apt_sport
-#define	aps_dport	aps_un.apu_tcp.apt_dport
-#define	aps_sel		aps_un.apu_tcp.apt_sel
-#define	aps_seqoff	aps_un.apu_tcp.apt_seqoff
-#define	aps_seqmin	aps_un.apu_tcp.apt_seqmin
-#define	aps_state	aps_un.apu_tcp.apt_state
-#define	aps_ackoff	aps_un.apu_tcp.apt_ackoff
-#define	aps_ackmin	aps_un.apu_tcp.apt_ackmin
-
-
-typedef	struct	ap_control {
-	char	apc_label[APR_LABELLEN];
-	char	apc_config[APR_LABELLEN];
-	u_char	apc_p;
-	/*
-	 * The following fields are upto the proxy's apr_ctl routine to deal
-	 * with.  When the proxy gets this in kernel space, apc_data will
-	 * point to a malloc'd region of memory of apc_dsize bytes.  If the
-	 * proxy wants to keep that memory, it must set apc_data to NULL
-	 * before it returns.  It is expected if this happens that it will
-	 * take care to free it in apr_fini or otherwise as appropriate.
-	 * apc_cmd is provided as a standard place to put simple commands,
-	 * with apc_arg being available to put a simple arg.
-	 */
-	u_long	apc_cmd;
-	u_long	apc_arg;
-	void	*apc_data;
-	size_t	apc_dsize;
-} ap_ctl_t;
-
-#define	APC_CMD_ADD	0
-#define	APC_CMD_DEL	1
-
-
-typedef	struct	aproxy	{
-	struct	aproxy	*apr_next;
-	struct	aproxy	*apr_parent;
-	char	apr_label[APR_LABELLEN];	/* Proxy label # */
-	u_char	apr_p;				/* protocol */
-	int	apr_flags;
-	int	apr_ref;
-	int	apr_clones;
-	void	(* apr_load) __P((void));
-	void	(* apr_unload) __P((void));
-	void	*(* apr_create) __P((ipf_main_softc_t *));
-	void	(* apr_destroy) __P((ipf_main_softc_t *, void *));
-	int	(* apr_init) __P((ipf_main_softc_t *, void *));
-	void	(* apr_fini) __P((ipf_main_softc_t *, void *));
-	int	(* apr_new) __P((void *, fr_info_t *, ap_session_t *,
-				 struct nat *));
-	void	(* apr_del) __P((ipf_main_softc_t *, ap_session_t *));
-	int	(* apr_inpkt) __P((void *, fr_info_t *, ap_session_t *,
-				   struct nat *));
-	int	(* apr_outpkt) __P((void *, fr_info_t *, ap_session_t *,
-				    struct nat *));
-	int	(* apr_match) __P((fr_info_t *, ap_session_t *, struct nat *));
-	int	(* apr_ctl) __P((ipf_main_softc_t *, void *, ap_ctl_t *));
-	int	(* apr_clear) __P((struct aproxy *));
-	int	(* apr_flush) __P((struct aproxy *, int));
-	void	*apr_soft;
-} aproxy_t;
-
-#define	APR_DELETE	1
-
-#define	APR_ERR(x)	((x) << 16)
-#define	APR_EXIT(x)	(((x) >> 16) & 0xffff)
-#define	APR_INC(x)	((x) & 0xffff)
-
-
-#ifdef _KERNEL
-/*
- * Generic #define's to cover missing things in the kernel
- */
-# ifndef isdigit
-#  define isdigit(x)	((x) >= '0' && (x) <= '9')
-# endif
-# ifndef isupper
-#  define isupper(x)	(((unsigned)(x) >= 'A') && ((unsigned)(x) <= 'Z'))
-# endif
-# ifndef islower
-#  define islower(x)	(((unsigned)(x) >= 'a') && ((unsigned)(x) <= 'z'))
-# endif
-# ifndef isalpha
-#  define isalpha(x)	(isupper(x) || islower(x))
-# endif
-# ifndef toupper
-#  define toupper(x)	(isupper(x) ? (x) : (x) - 'a' + 'A')
-# endif
-# ifndef isspace
-#  define isspace(x)	(((x) == ' ') || ((x) == '\r') || ((x) == '\n') || \
-			 ((x) == '\t') || ((x) == '\b'))
-# endif
-#endif /* _KERNEL */
-
-/*
- * For the ftp proxy.
- */
-#define	FTP_BUFSZ	160
-#define	IPF_FTPBUFSZ	160
-
-typedef struct  ftpside {
-	char	*ftps_rptr;
-	char	*ftps_wptr;
-	void	*ftps_ifp;
-	u_32_t	ftps_seq[2];
-	u_32_t	ftps_len;
-	int	ftps_junk;
-	int	ftps_cmds;
-	int	ftps_cmd;
-	char	ftps_buf[FTP_BUFSZ];
-} ftpside_t;
-
-typedef struct  ftpinfo {
-	int 	  	ftp_passok;
-	int		ftp_incok;
-	void		*ftp_pendstate;
-	nat_t		*ftp_pendnat;
-	ftpside_t	ftp_side[2];
-} ftpinfo_t;
-
-
-/*
- * IPsec proxy
- */
-typedef u_32_t		ipsec_cookie_t[2];
-
-typedef struct ipsec_pxy {
-	ipsec_cookie_t	ipsc_icookie;
-	ipsec_cookie_t	ipsc_rcookie;
-	int		ipsc_rckset;
-	nat_t		*ipsc_nat;
-	struct ipstate	*ipsc_state;
-	ipnat_t		*ipsc_rule;
-} ipsec_pxy_t;
-
-
-/*
- * For the irc proxy.
- */
-typedef	struct	ircinfo {
-	size_t	irc_len;
-	char	*irc_snick;
-	char	*irc_dnick;
-	char	*irc_type;
-	char	*irc_arg;
-	char	*irc_addr;
-	u_32_t	irc_ipnum;
-	u_short	irc_port;
-} ircinfo_t;
-
-
-/*
- * For the DNS "proxy"
- */
-typedef struct dnsinfo {
-        ipfmutex_t	dnsi_lock;
-	u_short		dnsi_id;
-	char		dnsi_buffer[512];
-} dnsinfo_t;
-
-
-/*
- * Real audio proxy structure and #defines
- */
-typedef	struct	raudio_s {
-	int	rap_seenpna;
-	int	rap_seenver;
-	int	rap_version;
-	int	rap_eos;	/* End Of Startup */
-	int	rap_gotid;
-	int	rap_gotlen;
-	int	rap_mode;
-	int	rap_sdone;
-	u_short	rap_plport;
-	u_short	rap_prport;
-	u_short	rap_srport;
-	char	rap_svr[19];
-	u_32_t	rap_sbf;	/* flag to indicate which of the 19 bytes have
-				 * been filled
-				 */
-	u_32_t	rap_sseq;
-} raudio_t;
-
-#define	RA_ID_END	0
-#define	RA_ID_UDP	1
-#define	RA_ID_ROBUST	7
-
-#define	RAP_M_UDP	1
-#define	RAP_M_ROBUST	2
-#define	RAP_M_TCP	4
-#define	RAP_M_UDP_ROBUST	(RAP_M_UDP|RAP_M_ROBUST)
-
-
-/*
- * MSN RPC proxy
- */
-typedef	struct	msnrpcinfo	{
-	u_int		mri_flags;
-	int		mri_cmd[2];
-	u_int		mri_valid;
-	struct	in_addr	mri_raddr;
-	u_short		mri_rport;
-} msnrpcinfo_t;
-
-
-/*
- * Sun RPCBIND proxy
- */
-#define RPCB_MAXMSG	888
-#define RPCB_RES_PMAP	0	/* Response contains a v2 port. */
-#define RPCB_RES_STRING	1	/* " " " v3 (GETADDR) string. */
-#define RPCB_RES_LIST	2	/* " " " v4 (GETADDRLIST) list. */
-#define RPCB_MAXREQS	32	/* Arbitrary limit on tracked transactions */
-
-#define RPCB_REQMIN	40
-#define RPCB_REQMAX	888
-#define RPCB_REPMIN	20
-#define	RPCB_REPMAX	604	/* XXX double check this! */
-
-/*
- * These macros determine the number of bytes between p and the end of
- * r->rs_buf relative to l.
- */
-#define RPCB_BUF_END(r) (char *)((r)->rm_msgbuf + (r)->rm_buflen)
-#define RPCB_BUF_GEQ(r, p, l)   \
-        ((RPCB_BUF_END((r)) > (char *)(p)) &&           \
-         ((RPCB_BUF_END((r)) - (char *)(p)) >= (l)))
-#define	RPCB_BUF_EQ(r, p, l)                            \
-        (RPCB_BUF_END((r)) == ((char *)(p) + (l)))
-
-/*
- * The following correspond to RPC(B) detailed in RFC183[13].
- */
-#define RPCB_CALL		0
-#define RPCB_REPLY		1
-#define RPCB_MSG_VERSION	2
-#define RPCB_PROG		100000
-#define RPCB_GETPORT		3
-#define RPCB_GETADDR		3
-#define RPCB_GETADDRLIST	11
-#define RPCB_MSG_ACCEPTED	0
-#define RPCB_MSG_DENIED		1
-
-/* BEGIN (Generic XDR structures) */
-typedef struct xdr_string {
-	u_32_t	*xs_len;
-	char	*xs_str;
-} xdr_string_t;
-
-typedef struct xdr_auth {
-	/* u_32_t	xa_flavor; */
-	xdr_string_t	xa_string;
-} xdr_auth_t;
-
-typedef struct xdr_uaddr {
-	u_32_t		xu_ip;
-	u_short         xu_port;
-	xdr_string_t	xu_str;
-} xdr_uaddr_t;
-
-typedef	struct xdr_proto {
-	u_int		xp_proto;
-	xdr_string_t	xp_str;
-} xdr_proto_t;
-
-#define xu_xslen	xu_str.xs_len
-#define xu_xsstr	xu_str.xs_str
-#define	xp_xslen	xp_str.xs_len
-#define xp_xsstr	xp_str.xs_str
-/* END (Generic XDR structures) */
-
-/* BEGIN (RPC call structures) */
-typedef struct pmap_args {
-	/* u_32_t	pa_prog; */
-	/* u_32_t	pa_vers; */
-	u_32_t		*pa_prot;
-	/* u_32_t	pa_port; */
-} pmap_args_t;
-
-typedef struct rpcb_args {
-	/* u_32_t	*ra_prog; */
-	/* u_32_t	*ra_vers; */
-	xdr_proto_t	ra_netid;
-	xdr_uaddr_t	ra_maddr;
-	/* xdr_string_t	ra_owner; */
-} rpcb_args_t;
-
-typedef struct rpc_call {
-	/* u_32_t	rc_rpcvers; */
-	/* u_32_t	rc_prog; */
-	u_32_t	*rc_vers;
-	u_32_t	*rc_proc;
-	xdr_auth_t	rc_authcred;
-	xdr_auth_t	rc_authverf;
-	union {
-		pmap_args_t	ra_pmapargs;
-		rpcb_args_t	ra_rpcbargs;
-	} rpcb_args;
-} rpc_call_t;
-
-#define	rc_pmapargs	rpcb_args.ra_pmapargs
-#define rc_rpcbargs	rpcb_args.ra_rpcbargs
-/* END (RPC call structures) */
-
-/* BEGIN (RPC reply structures) */
-typedef struct rpcb_entry {
-	xdr_uaddr_t	re_maddr;
-	xdr_proto_t	re_netid;
-	/* u_32_t	re_semantics; */
-	xdr_string_t	re_family;
-	xdr_proto_t	re_proto;
-	u_32_t		*re_more; /* 1 == another entry follows */
-} rpcb_entry_t;
-
-typedef struct rpcb_listp {
-	u_32_t		*rl_list; /* 1 == list follows */
-	int		rl_cnt;
-	rpcb_entry_t	rl_entries[2]; /* TCP / UDP only */
-} rpcb_listp_t;
-
-typedef struct rpc_resp {
-	/* u_32_t	rr_acceptdeny; */
-	/* Omitted 'message denied' fork; we don't care about rejects. */
-	xdr_auth_t	rr_authverf;
-	/* u_32_t		*rr_astat;	*/
-	union {
-		u_32_t		*resp_pmap;
-		xdr_uaddr_t	resp_getaddr;
-		rpcb_listp_t	resp_getaddrlist;
-	} rpcb_reply;
-} rpc_resp_t;
-
-#define	rr_v2	rpcb_reply.resp_pmap
-#define rr_v3	rpcb_reply.resp_getaddr
-#define	rr_v4	rpcb_reply.resp_getaddrlist
-/* END (RPC reply structures) */
-
-/* BEGIN (RPC message structure & macros) */
-typedef struct rpc_msg {
-	char	rm_msgbuf[RPCB_MAXMSG];	/* RPCB data buffer */
-	u_int	rm_buflen;
-	u_32_t	*rm_xid;
-	/* u_32_t Call vs Reply */
-	union {
-		rpc_call_t	rb_call;
-		rpc_resp_t	rb_resp;
-	} rm_body;
-} rpc_msg_t;
-
-#define rm_call		rm_body.rb_call
-#define rm_resp		rm_body.rb_resp
-/* END (RPC message structure & macros) */
-
-/*
- * These code paths aren't hot enough to warrant per transaction
- * mutexes.
- */
-typedef struct rpcb_xact {
-	struct	rpcb_xact	*rx_next;
-	struct	rpcb_xact	**rx_pnext;
-	u_32_t	rx_xid;		/* RPC transmission ID */
-	u_int	rx_type;	/* RPCB response type */
-	u_int	rx_ref;         /* reference count */
-	u_int	rx_proto;	/* transport protocol (v2 only) */
-} rpcb_xact_t;
-
-typedef struct rpcb_session {
-        ipfmutex_t	rs_rxlock;
-	rpcb_xact_t	*rs_rxlist;
-} rpcb_session_t;
-
-/*
- * For an explanation, please see the following:
- *   RFC1832 - Sections 3.11, 4.4, and 4.5.
- */
-#define XDRALIGN(x)	((((x) % 4) != 0) ? ((((x) + 3) / 4) * 4) : (x))
-
-extern	int	ipf_proxy_add __P((void *, aproxy_t *));
-extern	int	ipf_proxy_check __P((fr_info_t *, struct nat *));
-extern	int	ipf_proxy_ctl __P((ipf_main_softc_t *, void *, ap_ctl_t *));
-extern	int	ipf_proxy_del __P((aproxy_t *));
-extern	void	ipf_proxy_deref __P((aproxy_t *));
-extern	void	ipf_proxy_flush __P((void *, int));
-extern	int	ipf_proxy_init __P((void));
-extern	int	ipf_proxy_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, void *));
-extern	aproxy_t	*ipf_proxy_lookup __P((void *, u_int, char *));
-extern	int	ipf_proxy_match __P((fr_info_t *, struct nat *));
-extern	int	ipf_proxy_new __P((fr_info_t *, struct nat *));
-extern	int	ipf_proxy_ok __P((fr_info_t *, tcphdr_t *, struct ipnat *));
-extern	void	ipf_proxy_free __P((ipf_main_softc_t *, ap_session_t *));
-extern	int	ipf_proxy_main_load __P((void));
-extern	int	ipf_proxy_main_unload __P((void));
-extern	ipnat_t	*ipf_proxy_rule_fwd __P((nat_t *));
-extern	ipnat_t	*ipf_proxy_rule_rev __P((nat_t *));
-extern	void	*ipf_proxy_soft_create __P((ipf_main_softc_t *));
-extern	void	ipf_proxy_soft_destroy __P((ipf_main_softc_t *, void *));
-extern	int	ipf_proxy_soft_init __P((ipf_main_softc_t *, void *));
-extern	int	ipf_proxy_soft_fini __P((ipf_main_softc_t *, void *));
-
-#endif /* __IP_PROXY_H__ */
diff --git a/include.new/netinet/ip_rules.h b/include.new/netinet/ip_rules.h
deleted file mode 100644
index 896af6a..0000000
--- a/include.new/netinet/ip_rules.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_rules.h 145517 2005-04-25 18:15:41Z darrenr $	*/
-
-extern int ipfrule_add __P((void));
-extern int ipfrule_remove __P((void));
-
-extern frentry_t *ipfrule_match_out_ __P((fr_info_t *, u_32_t *));
-extern frentry_t *ipf_rules_out_[1];
-
-extern int ipfrule_add_out_ __P((void));
-extern int ipfrule_remove_out_ __P((void));
-
-extern frentry_t *ipfrule_match_in_ __P((fr_info_t *, u_32_t *));
-extern frentry_t *ipf_rules_in_[1];
-
-extern int ipfrule_add_in_ __P((void));
-extern int ipfrule_remove_in_ __P((void));
diff --git a/include.new/netinet/ip_scan.h b/include.new/netinet/ip_scan.h
deleted file mode 100644
index 0dfe5af..0000000
--- a/include.new/netinet/ip_scan.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ip_fil.h	1.35 6/5/96
- * $Id: ip_scan.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef __IP_SCAN_H__
-#define __IP_SCAN_H__ 1
-
-#ifdef sun
-# include <sys/ioccom.h>
-#endif
-
-#define	IPSCAN_NAME	"/dev/ipscan"
-#define	IPL_SCAN	IPSCAN_NAME
-#define	ISC_TLEN	16
-
-
-struct fr_info;
-struct frentry;
-struct ip;
-struct ipstate;
-
-
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
-# define	SIOCADSCA	_IOWR('r', 60, struct ipscan *)
-# define	SIOCRMSCA	_IOWR('r', 61, struct ipscan *)
-# define	SIOCGSCST	_IOWR('r', 62, struct ipscan *)
-#else
-# define	SIOCADSCA	_IOWR(r, 60, struct ipscan *)
-# define	SIOCRMSCA	_IOWR(r, 61, struct ipscan *)
-# define	SIOCGSCST	_IOWR(r, 62, struct ipscan *)
-#endif
-
-struct	action	{
-	int		act_val;	/* what to do */
-	struct	in_addr	act_ip;		/* redirect IP# */
-	u_short		act_port;	/* redirect port number */
-	int		act_else;	/* what to do */
-	struct	in_addr	act_eip;	/* redirect IP# */
-	u_short		act_eport;	/* redirect port number */
-};
-
-
-typedef	struct	sinfo {
-	char	s_txt[ISC_TLEN];	/* text to match */
-	char	s_msk[ISC_TLEN];	/* mask of the above to check */
-	int	s_len;			/* length of server text */
-} sinfo_t;
-
-
-typedef	struct	ipscan	{
-	struct	ipscan	*ipsc_next;
-	struct	ipscan	**ipsc_pnext;
-	char		ipsc_tag[ISC_TLEN];	/* table entry protocol tag */
-	sinfo_t		ipsc_si[2];	/* client/server side information */
-	int		ipsc_hits;	/* times this has been matched */
-	int		ipsc_active;	/* # of active matches */
-	int		ipsc_fref;	/* # of references from filter rules */
-	int		ipsc_sref;	/* # of references from state entries */
-	struct	action	ipsc_act;
-} ipscan_t;
-
-
-#define	ipsc_cl		ipsc_si[0]
-#define	ipsc_sl		ipsc_si[1]
-#define	ipsc_ctxt	ipsc_cl.s_txt
-#define	ipsc_cmsk	ipsc_cl.s_msk
-#define	ipsc_clen	ipsc_cl.s_len
-#define	ipsc_stxt	ipsc_sl.s_txt
-#define	ipsc_smsk	ipsc_sl.s_msk
-#define	ipsc_slen	ipsc_sl.s_len
-#define	ipsc_action	ipsc_act.act_val
-#define	ipsc_ip		ipsc_act.act_ip
-#define	ipsc_port	ipsc_act.act_port
-#define	ipsc_else	ipsc_act.act_else
-#define	ipsc_eip	ipsc_act.act_eip
-#define	ipsc_eport	ipsc_act.act_eport
-
-#define	ISC_A_NONE	0
-#define	ISC_A_TRACK	1
-#define	ISC_A_CLOSE	2
-#define	ISC_A_REDIRECT	3
-
-
-typedef	struct	ipscanstat	{
-	struct	ipscan	*iscs_list;
-	u_long		iscs_acted;
-	u_long		iscs_else;
-	int		iscs_entries;
-} ipscanstat_t;
-
-
-extern	int ipf_scan_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *));
-extern	int ipf_scan_init __P((void));
-extern	int ipf_scan_attachis __P((struct ipstate *));
-extern	int ipf_scan_attachfr __P((struct frentry *));
-extern	int ipf_scan_detachis __P((struct ipstate *));
-extern	int ipf_scan_detachfr __P((struct frentry *));
-extern	int ipf_scan_packet __P((struct fr_info *, struct ipstate *));
-extern	void ipf_scan_unload __P((ipf_main_softc_t *));
-
-#endif /* __IP_SCAN_H__ */
diff --git a/include.new/netinet/ip_state.h b/include.new/netinet/ip_state.h
deleted file mode 100644
index a866baf..0000000
--- a/include.new/netinet/ip_state.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_state.h 255332 2013-09-06 23:11:19Z cy $	*/
-
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ip_state.h	1.3 1/12/96 (C) 1995 Darren Reed
- * $FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ip_state.h 255332 2013-09-06 23:11:19Z cy $
- * Id: ip_state.h,v 2.68.2.10 2007/10/16 09:33:24 darrenr Exp $
- */
-#ifndef	__IP_STATE_H__
-#define	__IP_STATE_H__
-
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
-# define	SIOCDELST	_IOW('r', 61, struct ipfobj)
-#else
-# define	SIOCDELST	_IOW(r, 61, struct ipfobj)
-#endif
-
-struct ipscan;
-
-#ifndef	IPSTATE_SIZE
-# define	IPSTATE_SIZE	5737
-#endif
-#ifndef	IPSTATE_MAX
-# define	IPSTATE_MAX	4013	/* Maximum number of states held */
-#endif
-
-#define	PAIRS(s1,d1,s2,d2)	((((s1) == (s2)) && ((d1) == (d2))) ||\
-				 (((s1) == (d2)) && ((d1) == (s2))))
-#define	IPPAIR(s1,d1,s2,d2)	PAIRS((s1).s_addr, (d1).s_addr, \
-				      (s2).s_addr, (d2).s_addr)
-
-
-typedef struct ipstate {
-	ipfmutex_t	is_lock;
-	struct	ipstate	*is_next;
-	struct	ipstate	**is_pnext;
-	struct	ipstate	*is_hnext;
-	struct	ipstate	**is_phnext;
-	struct	ipstate	**is_me;
-	void		*is_ifp[4];
-	void		*is_sync;
-	frentry_t	*is_rule;
-	struct	ipftq	*is_tqehead[2];
-	struct	ipscan	*is_isc;
-	U_QUAD_T	is_pkts[4];
-	U_QUAD_T	is_bytes[4];
-	U_QUAD_T	is_icmppkts[4];
-	struct	ipftqent is_sti;
-	u_int	is_frage[2];
-	int	is_ref;			/* reference count */
-	int	is_isninc[2];
-	u_short	is_sumd[2];
-	i6addr_t	is_src;
-	i6addr_t	is_dst;
-	u_int	is_pass;
-	u_char	is_p;			/* Protocol */
-	u_char	is_v;
-	int	is_family;
-	u_32_t	is_hv;
-	u_32_t	is_tag;
-	u_32_t	is_opt[2];		/* packet options set */
-	u_32_t	is_optmsk[2];		/*    "      "    mask */
-	u_short	is_sec;			/* security options set */
-	u_short	is_secmsk;		/*    "        "    mask */
-	u_short	is_auth;		/* authentication options set */
-	u_short	is_authmsk;		/*    "              "    mask */
-	union {
-		icmpinfo_t	is_ics;
-		tcpinfo_t	is_ts;
-		udpinfo_t	is_us;
-		greinfo_t	is_ug;
-	} is_ps;
-	u_32_t	is_flags;
-	int	is_flx[2][2];
-	u_32_t	is_rulen;		/* rule number when created */
-	u_32_t	is_s0[2];
-	u_short	is_smsk[2];
-	frdest_t	is_dif;
-	frdest_t	is_tifs[2];
-	char	is_group[FR_GROUPLEN];
-	char	is_sbuf[2][16];
-	char	is_ifname[4][LIFNAMSIZ];
-} ipstate_t;
-
-#define	is_die		is_sti.tqe_die
-#define	is_state	is_sti.tqe_state
-#define	is_touched	is_sti.tqe_touched
-#define	is_saddr	is_src.in4.s_addr
-#define	is_daddr	is_dst.in4.s_addr
-#define	is_icmp		is_ps.is_ics
-#define	is_type		is_icmp.ici_type
-#define	is_tcp		is_ps.is_ts
-#define	is_udp		is_ps.is_us
-#define is_send		is_tcp.ts_data[0].td_end
-#define is_dend		is_tcp.ts_data[1].td_end
-#define is_maxswin	is_tcp.ts_data[0].td_maxwin
-#define is_maxdwin	is_tcp.ts_data[1].td_maxwin
-#define is_maxsend	is_tcp.ts_data[0].td_maxend
-#define is_maxdend	is_tcp.ts_data[1].td_maxend
-#define	is_swinscale	is_tcp.ts_data[0].td_winscale
-#define	is_dwinscale	is_tcp.ts_data[1].td_winscale
-#define	is_swinflags	is_tcp.ts_data[0].td_winflags
-#define	is_dwinflags	is_tcp.ts_data[1].td_winflags
-#define	is_sport	is_tcp.ts_sport
-#define	is_dport	is_tcp.ts_dport
-#define	is_ifpin	is_ifp[0]
-#define	is_ifpout	is_ifp[2]
-#define	is_gre		is_ps.is_ug
-#define	is_call		is_gre.gs_call
-
-#define	IS_WSPORT	SI_W_SPORT	/* 0x00100 */
-#define	IS_WDPORT	SI_W_DPORT	/* 0x00200 */
-#define	IS_WSADDR	SI_W_SADDR	/* 0x00400 */
-#define	IS_WDADDR	SI_W_DADDR	/* 0x00800 */
-#define	IS_NEWFR	SI_NEWFR	/* 0x01000 */
-#define	IS_CLONE	SI_CLONE	/* 0x02000 */
-#define	IS_CLONED	SI_CLONED	/* 0x04000 */
-#define	IS_TCPFSM			   0x10000
-#define	IS_STRICT			   0x20000
-#define	IS_ISNSYN			   0x40000
-#define	IS_ISNACK			   0x80000
-#define	IS_STATESYNC			   0x100000
-#define	IS_LOOSE			   0x200000
-/*
- * IS_SC flags are for scan-operations that need to be recognised in state.
- */
-#define	IS_SC_CLIENT			0x10000000
-#define	IS_SC_SERVER			0x20000000
-#define	IS_SC_MATCHC			0x40000000
-#define	IS_SC_MATCHS			0x80000000
-#define	IS_SC_MATCHALL	(IS_SC_MATCHC|IS_SC_MATCHC)
-#define	IS_SC_ALL	(IS_SC_MATCHC|IS_SC_MATCHC|IS_SC_CLIENT|IS_SC_SERVER)
-
-/*
- * Flags that can be passed into ipf_addstate
- */
-#define	IS_INHERITED			0x0fffff00
-
-#define	TH_OPENING	(TH_SYN|TH_ACK)
-/*
- * is_flags:
- * Bits 0 - 3 are use as a mask with the current packet's bits to check for
- * whether it is short, tcp/udp, a fragment or the presence of IP options.
- * Bits 4 - 7 are set from the initial packet and contain what the packet
- * anded with bits 0-3 must match.
- * Bits 8,9 are used to indicate wildcard source/destination port matching.
- * Bits 10,11 are reserved for other wildcard flag compatibility.
- * Bits 12,13 are for scaning.
- */
-
-typedef	struct	ipstate_save	{
-	void	*ips_next;
-	struct	ipstate	ips_is;
-	struct	frentry	ips_fr;
-} ipstate_save_t;
-
-#define	ips_rule	ips_is.is_rule
-
-
-typedef	struct	ipslog	{
-	U_QUAD_T	isl_pkts[4];
-	U_QUAD_T	isl_bytes[4];
-	i6addr_t	isl_src;
-	i6addr_t	isl_dst;
-	u_32_t	isl_tag;
-	u_short	isl_type;
-	union {
-		u_short	isl_filler[2];
-		u_short	isl_ports[2];
-		u_short	isl_icmp;
-	} isl_ps;
-	u_char	isl_v;
-	u_char	isl_p;
-	u_char	isl_flags;
-	u_char	isl_state[2];
-	u_32_t	isl_rulen;
-	char	isl_group[FR_GROUPLEN];
-} ipslog_t;
-
-#define	isl_sport	isl_ps.isl_ports[0]
-#define	isl_dport	isl_ps.isl_ports[1]
-#define	isl_itype	isl_ps.isl_icmp
-
-#define	ISL_NEW			0
-#define	ISL_CLONE		1
-#define	ISL_STATECHANGE		2
-#define	ISL_EXPIRE		0xffff
-#define	ISL_FLUSH		0xfffe
-#define	ISL_REMOVE		0xfffd
-#define	ISL_INTERMEDIATE	0xfffc
-#define	ISL_KILLED		0xfffb
-#define	ISL_ORPHAN		0xfffa
-#define	ISL_UNLOAD		0xfff9
-
-
-typedef	struct	ips_stat {
-	u_int	iss_active;
-	u_int	iss_active_proto[256];
-	u_long	iss_add_bad;
-	u_long	iss_add_dup;
-	u_long	iss_add_locked;
-	u_long	iss_add_oow;
-	u_long	iss_bucket_full;
-	u_long	iss_check_bad;
-	u_long	iss_check_miss;
-	u_long	iss_check_nattag;
-	u_long	iss_check_notag;
-	u_long	iss_clone_nomem;
-	u_long	iss_cloned;
-	u_long	iss_expire;
-	u_long	iss_fin;
-	u_long	iss_flush_all;
-	u_long	iss_flush_closing;
-	u_long	iss_flush_queue;
-	u_long	iss_flush_state;
-	u_long	iss_flush_timeout;
-	u_long	iss_hits;
-	u_long	iss_icmp6_icmperr;
-	u_long	iss_icmp6_miss;
-	u_long	iss_icmp6_notinfo;
-	u_long	iss_icmp6_notquery;
-	u_long	iss_icmp_bad;
-	u_long	iss_icmp_banned;
-	u_long	iss_icmp_headblock;
-	u_long	iss_icmp_hits;
-	u_long	iss_icmp_icmperr;
-	u_long	iss_icmp_miss;
-	u_long	iss_icmp_notquery;
-	u_long	iss_icmp_short;
-	u_long	iss_icmp_toomany;
-	u_int	iss_inuse;
-	ipstate_t *iss_list;
-	u_long	iss_log_fail;
-	u_long	iss_log_ok;
-	u_long	iss_lookup_badifp;
-	u_long	iss_lookup_badport;
-	u_long	iss_lookup_miss;
-	u_long	iss_max;
-	u_long	iss_max_ref;
-	u_long	iss_max_track;
-	u_long	iss_miss_mask;
-	u_long	iss_nomem;
-	u_long	iss_oow;
-	u_long	iss_orphan;
-	u_long	iss_proto[256];
-	u_long	iss_scan_block;
-	u_long	iss_state_max;
-	u_long	iss_state_size;
-	u_long	iss_states[IPF_TCP_NSTATES];
-	ipstate_t **iss_table;
-	u_long	iss_tcp_closing;
-	u_long	iss_tcp_oow;
-	u_long	iss_tcp_rstadd;
-	u_long	iss_tcp_toosmall;
-	u_long	iss_tcp_badopt;
-	u_long	iss_tcp_fsm;
-	u_long	iss_tcp_strict;
-	ipftq_t	*iss_tcptab;
-	u_int	iss_ticks;
-	u_long	iss_wild;
-	u_long	iss_winsack;
-	u_int	*iss_bucketlen;
-} ips_stat_t;
-
-
-typedef struct ipf_state_softc_s {
-	ipfmutex_t	ipf_stinsert;
-	int		ipf_state_logging;
-	int		ipf_state_lock;
-	int		ipf_state_doflush;
-	u_int		ipf_state_inited;
-	u_int		ipf_state_max;
-	u_int		ipf_state_maxbucket;
-	u_int		ipf_state_size;
-	u_int		ipf_state_wm_freq;
-	u_int		ipf_state_wm_high;
-	u_int		ipf_state_wm_low;
-	u_int		ipf_state_wm_last;
-	u_long		*ipf_state_seed;
-	ipstate_t	*ipf_state_list;
-	ipstate_t	**ipf_state_table;
-	ipftuneable_t	*ipf_state_tune;
-	ipftq_t		*ipf_state_usertq;
-	ipftq_t		ipf_state_pending;
-	ipftq_t		ipf_state_deletetq;
-	ipftq_t		ipf_state_udptq;
-	ipftq_t		ipf_state_udpacktq;
-	ipftq_t		ipf_state_iptq;
-	ipftq_t		ipf_state_icmptq;
-	ipftq_t		ipf_state_icmpacktq;
-	ipftq_t		ipf_state_tcptq[IPF_TCP_NSTATES];
-	ips_stat_t	ipf_state_stats;
-} ipf_state_softc_t;
-
-
-#ifndef _KERNEL
-extern	void	ipf_state_dump __P((ipf_main_softc_t *, void *));
-#endif
-extern	int	ipf_tcp_age __P((struct ipftqent *, struct fr_info *,
-				struct ipftq *, int, int));
-extern	int	ipf_tcpinwindow __P((struct fr_info *, struct tcpdata *,
-				    struct tcpdata *, tcphdr_t *, int));
-
-extern	int	ipf_state_add __P((ipf_main_softc_t *, fr_info_t *,
-				   ipstate_t **, u_int));
-extern	frentry_t *ipf_state_check __P((struct fr_info *, u_32_t *));
-extern	void	ipf_state_deref __P((ipf_main_softc_t *, ipstate_t **));
-extern	void	ipf_state_expire __P((ipf_main_softc_t *));
-extern	int	ipf_state_flush __P((ipf_main_softc_t *, int, int));
-extern	ipstate_t *ipf_state_lookup __P((fr_info_t *, tcphdr_t *, ipftq_t **));
-extern	int	ipf_state_init __P((void));
-extern	int	ipf_state_insert __P((ipf_main_softc_t *, struct ipstate *, int));
-extern	int	ipf_state_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *));
-extern	void	ipf_state_log __P((ipf_main_softc_t *, struct ipstate *, u_int));
-extern	int	ipf_state_matchflush __P((ipf_main_softc_t *, caddr_t));
-extern	int	ipf_state_rehash __P((ipf_main_softc_t *, ipftuneable_t *, ipftuneval_t *));
-extern	void	ipf_state_setqueue __P((ipf_main_softc_t *, ipstate_t *, int));
-extern	void	ipf_state_setpending __P((ipf_main_softc_t *, ipstate_t *));
-extern	int	ipf_state_settimeout __P((struct ipf_main_softc_s *, ipftuneable_t *, ipftuneval_t *));
-extern	void	ipf_state_sync __P((ipf_main_softc_t *, void *));
-extern	void	ipf_state_update __P((fr_info_t *, ipstate_t *));
-
-extern	void	ipf_sttab_init __P((ipf_main_softc_t *, struct ipftq *));
-extern	void	ipf_sttab_destroy __P((struct ipftq *));
-extern	void	ipf_state_setlock __P((void *, int));
-extern	int	ipf_state_main_load __P((void));
-extern	int	ipf_state_main_unload __P((void));
-extern	void	*ipf_state_soft_create __P((ipf_main_softc_t *));
-extern	void	ipf_state_soft_destroy __P((ipf_main_softc_t *, void *));
-extern	int	ipf_state_soft_init __P((ipf_main_softc_t *, void *));
-extern	int	ipf_state_soft_fini __P((ipf_main_softc_t *, void *));
-extern	ipftq_t	*ipf_state_add_tq __P((ipf_main_softc_t *, int));
-
-#endif /* __IP_STATE_H__ */
diff --git a/include.new/netinet/ip_sync.h b/include.new/netinet/ip_sync.h
deleted file mode 100644
index 6767561..0000000
--- a/include.new/netinet/ip_sync.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ip_fil.h	1.35 6/5/96
- * $Id: ip_sync.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef __IP_SYNC_H__
-#define __IP_SYNC_H__
-
-typedef	struct	synchdr	{
-	u_32_t		sm_magic;	/* magic */
-	u_char		sm_v;		/* version: 4,6 */
-	u_char		sm_p;		/* protocol */
-	u_char		sm_cmd;		/* command */
-	u_char		sm_table;	/* NAT, STATE, etc */
-	u_int		sm_num;		/* table entry number */
-	int		sm_rev;		/* forward/reverse */
-	int		sm_len;		/* length of the data section */
-	struct	synclist	*sm_sl;		/* back pointer to parent */
-} synchdr_t;
-
-
-#define SYNHDRMAGIC 0x0FF51DE5
-
-/*
- * Commands
- * No delete required as expirey will take care of that!
- */
-#define	SMC_CREATE	0	/* pass ipstate_t after synchdr_t */
-#define	SMC_UPDATE	1
-#define	SMC_MAXCMD	1
-
-/*
- * Tables
- */
-#define	SMC_RLOG	-2	/* Only used with SIOCIPFFL */
-#define	SMC_NAT		0
-#define	SMC_STATE	1
-#define	SMC_MAXTBL	1
-
-
-/*
- * Only TCP requires "more" information than just a reference to the entry
- * for which an update is being made.
- */
-typedef	struct	synctcp_update	{
-	u_long		stu_age;
-	tcpdata_t	stu_data[2];
-	int		stu_state[2];
-} synctcp_update_t;
-
-
-typedef	struct	synclist	{
-	struct	synclist	*sl_next;
-	struct	synclist	**sl_pnext;
-	int			sl_idx;		/* update index */
-	struct	synchdr		sl_hdr;
-	union	{
-		struct	ipstate	*slu_ips;
-		struct	nat	*slu_ipn;
-		void		*slu_ptr;
-	} sl_un;
-} synclist_t;
-
-#define	sl_ptr	sl_un.slu_ptr
-#define	sl_ips	sl_un.slu_ips
-#define	sl_ipn	sl_un.slu_ipn
-#define	sl_magic sl_hdr.sm_magic
-#define	sl_v	sl_hdr.sm_v
-#define	sl_p	sl_hdr.sm_p
-#define	sl_cmd	sl_hdr.sm_cmd
-#define	sl_rev	sl_hdr.sm_rev
-#define	sl_table	sl_hdr.sm_table
-#define	sl_num	sl_hdr.sm_num
-#define	sl_len	sl_hdr.sm_len
-
-/*
- * NOTE: SYNCLOG_SZ is defined *low*.  It should be the next power of two
- * up for whatever number of packets per second you expect to see.  Be
- * warned: this index's a table of large elements (upto 272 bytes in size
- * each), and thus a size of 8192, for example, results in a 2MB table.
- * The lesson here is not to use small machines for running fast firewalls
- * (100BaseT) in sync, where you might have upwards of 10k pps.
- */
-#define	SYNCLOG_SZ	256
-
-typedef	struct	synclogent	{
-	struct	synchdr	sle_hdr;
-	union	{
-		struct	ipstate	sleu_ips;
-		struct	nat	sleu_ipn;
-	} sle_un;
-} synclogent_t;
-
-typedef	struct	syncupdent	{		/* 28 or 32 bytes */
-	struct	synchdr	sup_hdr;
-	struct	synctcp_update	sup_tcp;
-} syncupdent_t;
-
-extern	void *ipf_sync_create __P((ipf_main_softc_t *));
-extern	int ipf_sync_soft_init __P((ipf_main_softc_t *, void *));
-extern	int ipf_sync_soft_fini __P((ipf_main_softc_t *, void *));
-extern	int ipf_sync_canread __P((void *));
-extern	int ipf_sync_canwrite __P((void *));
-extern	void ipf_sync_del_nat __P((void *, synclist_t *));
-extern	void ipf_sync_del_state __P((void *, synclist_t *));
-extern	int ipf_sync_init __P((void));
-extern	int ipf_sync_ioctl __P((ipf_main_softc_t *, caddr_t, ioctlcmd_t, int, int, void *));
-extern	synclist_t *ipf_sync_new __P((ipf_main_softc_t *, int, fr_info_t *, void *));
-extern	int ipf_sync_read __P((ipf_main_softc_t *, struct uio *uio));
-extern	int ipf_sync_write __P((ipf_main_softc_t *, struct uio *uio));
-extern	int ipf_sync_main_unload __P((void));
-extern	void ipf_sync_update __P((ipf_main_softc_t *, int, fr_info_t *, synclist_t *));
-extern	void ipf_sync_expire __P((ipf_main_softc_t *));
-extern	void	ipf_sync_soft_destroy __P((ipf_main_softc_t *, void *));
-extern	void	*ipf_sync_soft_create __P((ipf_main_softc_t *));
-
-#endif /* __IP_SYNC_H__ */
diff --git a/include.new/netinet/ip_var.h b/include.new/netinet/ip_var.h
deleted file mode 100644
index a460825..0000000
--- a/include.new/netinet/ip_var.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)ip_var.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/netinet/ip_var.h 263307 2014-03-18 16:56:05Z glebius $
- */
-
-#ifndef _NETINET_IP_VAR_H_
-#define	_NETINET_IP_VAR_H_
-
-#include <sys/queue.h>
-
-/*
- * Overlay for ip header used by other protocols (tcp, udp).
- */
-struct ipovly {
-	u_char	ih_x1[9];		/* (unused) */
-	u_char	ih_pr;			/* protocol */
-	u_short	ih_len;			/* protocol length */
-	struct	in_addr ih_src;		/* source internet address */
-	struct	in_addr ih_dst;		/* destination internet address */
-};
-
-#ifdef _KERNEL
-/*
- * Ip reassembly queue structure.  Each fragment
- * being reassembled is attached to one of these structures.
- * They are timed out after ipq_ttl drops to 0, and may also
- * be reclaimed if memory becomes tight.
- */
-struct ipq {
-	TAILQ_ENTRY(ipq) ipq_list;	/* to other reass headers */
-	u_char	ipq_ttl;		/* time for reass q to live */
-	u_char	ipq_p;			/* protocol of this fragment */
-	u_short	ipq_id;			/* sequence id for reassembly */
-	struct mbuf *ipq_frags;		/* to ip headers of fragments */
-	struct	in_addr ipq_src,ipq_dst;
-	u_char	ipq_nfrags;		/* # frags in this packet */
-	struct label *ipq_label;	/* MAC label */
-};
-#endif /* _KERNEL */
-
-/*
- * Structure stored in mbuf in inpcb.ip_options
- * and passed to ip_output when ip options are in use.
- * The actual length of the options (including ipopt_dst)
- * is in m_len.
- */
-#define MAX_IPOPTLEN	40
-
-struct ipoption {
-	struct	in_addr ipopt_dst;	/* first-hop dst if source routed */
-	char	ipopt_list[MAX_IPOPTLEN];	/* options proper */
-};
-
-/*
- * Structure attached to inpcb.ip_moptions and
- * passed to ip_output when IP multicast options are in use.
- * This structure is lazy-allocated.
- */
-struct ip_moptions {
-	struct	ifnet *imo_multicast_ifp; /* ifp for outgoing multicasts */
-	struct in_addr imo_multicast_addr; /* ifindex/addr on MULTICAST_IF */
-	u_long	imo_multicast_vif;	/* vif num outgoing multicasts */
-	u_char	imo_multicast_ttl;	/* TTL for outgoing multicasts */
-	u_char	imo_multicast_loop;	/* 1 => hear sends if a member */
-	u_short	imo_num_memberships;	/* no. memberships this socket */
-	u_short	imo_max_memberships;	/* max memberships this socket */
-	struct	in_multi **imo_membership;	/* group memberships */
-	struct	in_mfilter *imo_mfilters;	/* source filters */
-	STAILQ_ENTRY(ip_moptions) imo_link;
-};
-
-struct	ipstat {
-	uint64_t ips_total;		/* total packets received */
-	uint64_t ips_badsum;		/* checksum bad */
-	uint64_t ips_tooshort;		/* packet too short */
-	uint64_t ips_toosmall;		/* not enough data */
-	uint64_t ips_badhlen;		/* ip header length < data size */
-	uint64_t ips_badlen;		/* ip length < ip header length */
-	uint64_t ips_fragments;		/* fragments received */
-	uint64_t ips_fragdropped;	/* frags dropped (dups, out of space) */
-	uint64_t ips_fragtimeout;	/* fragments timed out */
-	uint64_t ips_forward;		/* packets forwarded */
-	uint64_t ips_fastforward;	/* packets fast forwarded */
-	uint64_t ips_cantforward;	/* packets rcvd for unreachable dest */
-	uint64_t ips_redirectsent;	/* packets forwarded on same net */
-	uint64_t ips_noproto;		/* unknown or unsupported protocol */
-	uint64_t ips_delivered;		/* datagrams delivered to upper level*/
-	uint64_t ips_localout;		/* total ip packets generated here */
-	uint64_t ips_odropped;		/* lost packets due to nobufs, etc. */
-	uint64_t ips_reassembled;	/* total packets reassembled ok */
-	uint64_t ips_fragmented;	/* datagrams successfully fragmented */
-	uint64_t ips_ofragments;	/* output fragments created */
-	uint64_t ips_cantfrag;		/* don't fragment flag was set, etc. */
-	uint64_t ips_badoptions;		/* error in option processing */
-	uint64_t ips_noroute;		/* packets discarded due to no route */
-	uint64_t ips_badvers;		/* ip version != 4 */
-	uint64_t ips_rawout;		/* total raw ip packets generated */
-	uint64_t ips_toolong;		/* ip length > max ip packet size */
-	uint64_t ips_notmember;		/* multicasts for unregistered grps */
-	uint64_t ips_nogif;		/* no match gif found */
-	uint64_t ips_badaddr;		/* invalid address on header */
-};
-
-#ifdef _KERNEL
-
-#include <sys/counter.h>
-#include <net/vnet.h>
-
-VNET_PCPUSTAT_DECLARE(struct ipstat, ipstat);
-/*
- * In-kernel consumers can use these accessor macros directly to update
- * stats.
- */
-#define	IPSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct ipstat, ipstat, name, (val))
-#define	IPSTAT_SUB(name, val)	IPSTAT_ADD(name, -(val))
-#define	IPSTAT_INC(name)	IPSTAT_ADD(name, 1)
-#define	IPSTAT_DEC(name)	IPSTAT_SUB(name, 1)
-
-/*
- * Kernel module consumers must use this accessor macro.
- */
-void	kmod_ipstat_inc(int statnum);
-#define	KMOD_IPSTAT_INC(name)	\
-    kmod_ipstat_inc(offsetof(struct ipstat, name) / sizeof(uint64_t))
-void	kmod_ipstat_dec(int statnum);
-#define	KMOD_IPSTAT_DEC(name)	\
-    kmod_ipstat_dec(offsetof(struct ipstat, name) / sizeof(uint64_t))
-
-/* flags passed to ip_output as last parameter */
-#define	IP_FORWARDING		0x1		/* most of ip header exists */
-#define	IP_RAWOUTPUT		0x2		/* raw ip header exists */
-#define	IP_SENDONES		0x4		/* send all-ones broadcast */
-#define	IP_SENDTOIF		0x8		/* send on specific ifnet */
-#define IP_ROUTETOIF		SO_DONTROUTE	/* 0x10 bypass routing tables */
-#define IP_ALLOWBROADCAST	SO_BROADCAST	/* 0x20 can send broadcast packets */
-
-#ifdef __NO_STRICT_ALIGNMENT
-#define IP_HDR_ALIGNED_P(ip)	1
-#else
-#define IP_HDR_ALIGNED_P(ip)	((((intptr_t) (ip)) & 3) == 0)
-#endif
-
-struct ip;
-struct inpcb;
-struct route;
-struct sockopt;
-
-VNET_DECLARE(u_short, ip_id);			/* ip packet ctr, for ids */
-VNET_DECLARE(int, ip_defttl);			/* default IP ttl */
-VNET_DECLARE(int, ipforwarding);		/* ip forwarding */
-#ifdef IPSTEALTH
-VNET_DECLARE(int, ipstealth);			/* stealth forwarding */
-#endif
-extern u_char	ip_protox[];
-VNET_DECLARE(struct socket *, ip_rsvpd);	/* reservation protocol daemon*/
-VNET_DECLARE(struct socket *, ip_mrouter);	/* multicast routing daemon */
-extern int	(*legal_vif_num)(int);
-extern u_long	(*ip_mcast_src)(int);
-VNET_DECLARE(int, rsvp_on);
-VNET_DECLARE(int, drop_redirect);
-extern struct	pr_usrreqs rip_usrreqs;
-
-#define	V_ip_id			VNET(ip_id)
-#define	V_ip_defttl		VNET(ip_defttl)
-#define	V_ipforwarding		VNET(ipforwarding)
-#ifdef IPSTEALTH
-#define	V_ipstealth		VNET(ipstealth)
-#endif
-#define	V_ip_rsvpd		VNET(ip_rsvpd)
-#define	V_ip_mrouter		VNET(ip_mrouter)
-#define	V_rsvp_on		VNET(rsvp_on)
-#define	V_drop_redirect		VNET(drop_redirect)
-
-void	inp_freemoptions(struct ip_moptions *);
-int	inp_getmoptions(struct inpcb *, struct sockopt *);
-int	inp_setmoptions(struct inpcb *, struct sockopt *);
-
-int	ip_ctloutput(struct socket *, struct sockopt *sopt);
-void	ip_drain(void);
-int	ip_fragment(struct ip *ip, struct mbuf **m_frag, int mtu,
-	    u_long if_hwassist_flags);
-void	ip_forward(struct mbuf *m, int srcrt);
-void	ip_init(void);
-#ifdef VIMAGE
-void	ip_destroy(void);
-#endif
-extern int
-	(*ip_mforward)(struct ip *, struct ifnet *, struct mbuf *,
-	    struct ip_moptions *);
-int	ip_output(struct mbuf *,
-	    struct mbuf *, struct route *, int, struct ip_moptions *,
-	    struct inpcb *);
-int	ipproto_register(short);
-int	ipproto_unregister(short);
-struct mbuf *
-	ip_reass(struct mbuf *);
-struct in_ifaddr *
-	ip_rtaddr(struct in_addr, u_int fibnum);
-void	ip_savecontrol(struct inpcb *, struct mbuf **, struct ip *,
-	    struct mbuf *);
-void	ip_slowtimo(void);
-u_int16_t	ip_randomid(void);
-int	rip_ctloutput(struct socket *, struct sockopt *);
-void	rip_ctlinput(int, struct sockaddr *, void *);
-void	rip_init(void);
-#ifdef VIMAGE
-void	rip_destroy(void);
-#endif
-void	rip_input(struct mbuf *, int);
-int	rip_output(struct mbuf *, struct socket *, u_long);
-void	ipip_input(struct mbuf *, int);
-void	rsvp_input(struct mbuf *, int);
-int	ip_rsvp_init(struct socket *);
-int	ip_rsvp_done(void);
-extern int	(*ip_rsvp_vif)(struct socket *, struct sockopt *);
-extern void	(*ip_rsvp_force_done)(struct socket *);
-extern void	(*rsvp_input_p)(struct mbuf *m, int off);
-
-VNET_DECLARE(struct pfil_head, inet_pfil_hook);	/* packet filter hooks */
-#define	V_inet_pfil_hook	VNET(inet_pfil_hook)
-
-void	in_delayed_cksum(struct mbuf *m);
-
-/* Hooks for ipfw, dummynet, divert etc. Most are declared in raw_ip.c */
-/*
- * Reference to an ipfw or packet filter rule that can be carried
- * outside critical sections.
- * A rule is identified by rulenum:rule_id which is ordered.
- * In version chain_id the rule can be found in slot 'slot', so
- * we don't need a lookup if chain_id == chain->id.
- *
- * On exit from the firewall this structure refers to the rule after
- * the matching one (slot points to the new rule; rulenum:rule_id-1
- * is the matching rule), and additional info (e.g. info often contains
- * the insn argument or tablearg in the low 16 bits, in host format).
- * On entry, the structure is valid if slot>0, and refers to the starting
- * rules. 'info' contains the reason for reinject, e.g. divert port,
- * divert direction, and so on.
- */
-struct ipfw_rule_ref {
-	uint32_t	slot;		/* slot for matching rule	*/
-	uint32_t	rulenum;	/* matching rule number		*/
-	uint32_t	rule_id;	/* matching rule id		*/
-	uint32_t	chain_id;	/* ruleset id			*/
-	uint32_t	info;		/* see below			*/
-};
-
-enum {
-	IPFW_INFO_MASK	= 0x0000ffff,
-	IPFW_INFO_OUT	= 0x00000000,	/* outgoing, just for convenience */
-	IPFW_INFO_IN	= 0x80000000,	/* incoming, overloads dir */
-	IPFW_ONEPASS	= 0x40000000,	/* One-pass, do not reinject */
-	IPFW_IS_MASK	= 0x30000000,	/* which source ? */
-	IPFW_IS_DIVERT	= 0x20000000,
-	IPFW_IS_DUMMYNET =0x10000000,
-	IPFW_IS_PIPE	= 0x08000000,	/* pip1=1, queue = 0 */
-};
-#define MTAG_IPFW	1148380143	/* IPFW-tagged cookie */
-#define MTAG_IPFW_RULE	1262273568	/* rule reference */
-#define	MTAG_IPFW_CALL	1308397630	/* call stack */
-
-struct ip_fw_args;
-typedef int	(*ip_fw_chk_ptr_t)(struct ip_fw_args *args);
-typedef int	(*ip_fw_ctl_ptr_t)(struct sockopt *);
-VNET_DECLARE(ip_fw_ctl_ptr_t, ip_fw_ctl_ptr);
-#define	V_ip_fw_ctl_ptr		VNET(ip_fw_ctl_ptr)
-
-/* Divert hooks. */
-extern void	(*ip_divert_ptr)(struct mbuf *m, int incoming);
-/* ng_ipfw hooks -- XXX make it the same as divert and dummynet */
-extern int	(*ng_ipfw_input_p)(struct mbuf **, int,
-			struct ip_fw_args *, int);
-
-extern int	(*ip_dn_ctl_ptr)(struct sockopt *);
-extern int	(*ip_dn_io_ptr)(struct mbuf **, int, struct ip_fw_args *);
-
-VNET_DECLARE(int, ip_do_randomid);
-#define	V_ip_do_randomid	VNET(ip_do_randomid)
-#define	ip_newid()	((V_ip_do_randomid != 0) ? ip_randomid() : \
-			    htons(V_ip_id++))
-
-#endif /* _KERNEL */
-
-#endif /* !_NETINET_IP_VAR_H_ */
diff --git a/include.new/netinet/ipf_rb.h b/include.new/netinet/ipf_rb.h
deleted file mode 100644
index 3d7a59d..0000000
--- a/include.new/netinet/ipf_rb.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- */
-typedef enum rbcolour_e {
-	C_BLACK = 0,
-	C_RED = 1
-} rbcolour_t;
-
-#define	RBI_LINK(_n, _t)							\
-	struct _n##_rb_link {						\
-		struct _t	*left;					\
-		struct _t	*right;					\
-		struct _t	*parent;				\
-		rbcolour_t	colour;					\
-	}
-
-#define	RBI_HEAD(_n, _t)						\
-struct _n##_rb_head {							\
-	struct _t	top;						\
-	int		count;						\
-	int		(* compare)(struct _t *, struct _t *);		\
-}
-
-#define	RBI_CODE(_n, _t, _f, _cmp)					\
-									\
-typedef	void	(*_n##_rb_walker_t)(_t *, void *);			\
-									\
-_t *	_n##_rb_delete(struct _n##_rb_head *, _t *);			\
-void	_n##_rb_init(struct _n##_rb_head *);				\
-void	_n##_rb_insert(struct _n##_rb_head *, _t *);			\
-_t *	_n##_rb_search(struct _n##_rb_head *, void *);			\
-void	_n##_rb_walktree(struct _n##_rb_head *, _n##_rb_walker_t, void *);\
-									\
-static void								\
-rotate_left(struct _n##_rb_head *head, _t *node)			\
-{									\
-	_t *parent, *tmp1, *tmp2;					\
-									\
-	parent = node->_f.parent;					\
-	tmp1 = node->_f.right;						\
-	tmp2 = tmp1->_f.left;						\
-	node->_f.right = tmp2;						\
-	if (tmp2 != & _n##_rb_zero)					\
-		tmp2->_f.parent = node;					\
-	if (parent == & _n##_rb_zero)					\
-		head->top._f.right = tmp1;				\
-	else if (parent->_f.right == node)				\
-		parent->_f.right = tmp1;				\
-	else								\
-		parent->_f.left = tmp1;					\
-	tmp1->_f.left = node;						\
-	tmp1->_f.parent = parent;					\
-	node->_f.parent = tmp1;						\
-}									\
-									\
-static void								\
-rotate_right(struct _n##_rb_head *head, _t *node)			\
-{									\
-	_t *parent, *tmp1, *tmp2;					\
-									\
-	parent = node->_f.parent;					\
-	tmp1 = node->_f.left;						\
-	tmp2 = tmp1->_f.right;						\
-	node->_f.left = tmp2;						\
-	if (tmp2 != &_n##_rb_zero)					\
-		tmp2->_f.parent = node;					\
-	if (parent == &_n##_rb_zero)					\
-		head->top._f.right = tmp1;				\
-	else if (parent->_f.right == node)				\
-		parent->_f.right = tmp1;				\
-	else								\
-		parent->_f.left = tmp1;					\
-	tmp1->_f.right = node;						\
-	tmp1->_f.parent = parent;					\
-	node->_f.parent = tmp1;						\
-}									\
-									\
-void									\
-_n##_rb_insert(struct _n##_rb_head *head, _t *node)			\
-{									\
-	_t *n, *parent, **p, *tmp1, *gparent;				\
-									\
-	parent = &head->top;						\
-	node->_f.left = &_n##_rb_zero;					\
-	node->_f.right = &_n##_rb_zero;					\
-	p = &head->top._f.right;					\
-	while ((n = *p) != &_n##_rb_zero) {				\
-		if (_cmp(node, n) < 0)					\
-			p = &n->_f.left;				\
-		else							\
-			p = &n->_f.right;				\
-		parent = n;						\
-	}								\
-	*p = node;							\
-	node->_f.colour = C_RED;					\
-	node->_f.parent = parent;					\
-									\
-	while ((node != &_n##_rb_zero) && (parent->_f.colour == C_RED)){\
-		gparent = parent->_f.parent;				\
-		if (parent == gparent->_f.left) {			\
-			tmp1 = gparent->_f.right;			\
-			if (tmp1->_f.colour == C_RED) {			\
-				parent->_f.colour = C_BLACK;		\
-				tmp1->_f.colour = C_BLACK;		\
-				gparent->_f.colour = C_RED;		\
-				node = gparent;				\
-			} else {					\
-				if (node == parent->_f.right) {		\
-					node = parent;			\
-					rotate_left(head, node);	\
-					parent = node->_f.parent;	\
-				}					\
-				parent->_f.colour = C_BLACK;		\
-				gparent->_f.colour = C_RED;		\
-				rotate_right(head, gparent);		\
-			}						\
-		} else {						\
-			tmp1 = gparent->_f.left;			\
-			if (tmp1->_f.colour == C_RED) {			\
-				parent->_f.colour = C_BLACK;		\
-				tmp1->_f.colour = C_BLACK;		\
-				gparent->_f.colour = C_RED;		\
-				node = gparent;				\
-			} else {					\
-				if (node == parent->_f.left) {		\
-					node = parent;			\
-					rotate_right(head, node);	\
-					parent = node->_f.parent;	\
-				}					\
-				parent->_f.colour = C_BLACK;		\
-				gparent->_f.colour = C_RED;		\
-				rotate_left(head, parent->_f.parent);	\
-			}						\
-		}							\
-		parent = node->_f.parent;				\
-	}								\
-	head->top._f.right->_f.colour = C_BLACK;			\
-	head->count++;						\
-}									\
-									\
-static void								\
-deleteblack(struct _n##_rb_head *head, _t *parent, _t *node)		\
-{									\
-	_t *tmp;							\
-									\
-	while ((node == &_n##_rb_zero || node->_f.colour == C_BLACK) &&	\
-	       node != &head->top) {					\
-		if (parent->_f.left == node) {				\
-			tmp = parent->_f.right;				\
-			if (tmp->_f.colour == C_RED) {			\
-				tmp->_f.colour = C_BLACK;		\
-				parent->_f.colour = C_RED;		\
-				rotate_left(head, parent);		\
-				tmp = parent->_f.right;			\
-			}						\
-			if ((tmp->_f.left == &_n##_rb_zero ||		\
-			     tmp->_f.left->_f.colour == C_BLACK) &&	\
-			    (tmp->_f.right == &_n##_rb_zero ||		\
-			     tmp->_f.right->_f.colour == C_BLACK)) {	\
-				tmp->_f.colour = C_RED;			\
-				node = parent;				\
-				parent = node->_f.parent;		\
-			} else {					\
-				if (tmp->_f.right == &_n##_rb_zero ||	\
-				    tmp->_f.right->_f.colour == C_BLACK) {\
-					_t *tmp2 = tmp->_f.left;	\
-									\
-					if (tmp2 != &_n##_rb_zero)	\
-						tmp2->_f.colour = C_BLACK;\
-					tmp->_f.colour = C_RED;		\
-					rotate_right(head, tmp);	\
-					tmp = parent->_f.right;		\
-				}					\
-				tmp->_f.colour = parent->_f.colour;	\
-				parent->_f.colour = C_BLACK;		\
-				if (tmp->_f.right != &_n##_rb_zero)	\
-					tmp->_f.right->_f.colour = C_BLACK;\
-				rotate_left(head, parent);		\
-				node = head->top._f.right;		\
-			}						\
-		} else {						\
-			tmp = parent->_f.left;				\
-			if (tmp->_f.colour == C_RED) {			\
-				tmp->_f.colour = C_BLACK;		\
-				parent->_f.colour = C_RED;		\
-				rotate_right(head, parent);		\
-				tmp = parent->_f.left;			\
-			}						\
-			if ((tmp->_f.left == &_n##_rb_zero ||		\
-			     tmp->_f.left->_f.colour == C_BLACK) &&	\
-			    (tmp->_f.right == &_n##_rb_zero ||		\
-			     tmp->_f.right->_f.colour == C_BLACK)) {	\
-				tmp->_f.colour = C_RED;			\
-				node = parent;				\
-				parent = node->_f.parent;		\
-			} else {					\
-				if (tmp->_f.left == &_n##_rb_zero ||	\
-				    tmp->_f.left->_f.colour == C_BLACK) {\
-					_t *tmp2 = tmp->_f.right;	\
-									\
-					if (tmp2 != &_n##_rb_zero)	\
-						tmp2->_f.colour = C_BLACK;\
-					tmp->_f.colour = C_RED;		\
-					rotate_left(head, tmp);		\
-					tmp = parent->_f.left;		\
-				}					\
-				tmp->_f.colour = parent->_f.colour;	\
-				parent->_f.colour = C_BLACK;		\
-				if (tmp->_f.left != &_n##_rb_zero)	\
-					tmp->_f.left->_f.colour = C_BLACK;\
-				rotate_right(head, parent);		\
-				node = head->top._f.right;		\
-				break;					\
-			}						\
-		}							\
-	}								\
-	if (node != &_n##_rb_zero)					\
-		node->_f.colour = C_BLACK;				\
-}									\
-									\
-_t *									\
-_n##_rb_delete(struct _n##_rb_head *head, _t *node)			\
-{									\
-	_t *child, *parent, *old = node, *left;				\
-	rbcolour_t color;						\
-									\
-	if (node->_f.left == &_n##_rb_zero) {				\
-		child = node->_f.right;					\
-	} else if (node->_f.right == &_n##_rb_zero) {			\
-		child = node->_f.left;					\
-	} else {							\
-		node = node->_f.right;					\
-		while ((left = node->_f.left) != &_n##_rb_zero)		\
-			node = left;					\
-		child = node->_f.right;					\
-		parent = node->_f.parent;				\
-		color = node->_f.colour;				\
-		if (child != &_n##_rb_zero)				\
-			child->_f.parent = parent;			\
-		if (parent != &_n##_rb_zero) {				\
-			if (parent->_f.left == node)			\
-				parent->_f.left = child;		\
-			else						\
-				parent->_f.right = child;		\
-		} else {						\
-			head->top._f.right = child;			\
-		}							\
-		if (node->_f.parent == old)				\
-			parent = node;					\
-		*node = *old;						\
-		if (old->_f.parent != &_n##_rb_zero) {			\
-			if (old->_f.parent->_f.left == old)		\
-				old->_f.parent->_f.left = node;		\
-			else						\
-				old->_f.parent->_f.right = node;	\
-		} else {						\
-			head->top._f.right = child;			\
-		}							\
-		old->_f.left->_f.parent = node;				\
-		if (old->_f.right != &_n##_rb_zero)			\
-			old->_f.right->_f.parent = node;		\
-		if (parent != &_n##_rb_zero) {				\
-			left = parent;					\
-		}							\
-		goto colour;						\
-	}								\
-	parent = node->_f.parent;					\
-	color= node->_f.colour;						\
-	if (child != &_n##_rb_zero)					\
-		child->_f.parent = parent;				\
-	if (parent != &_n##_rb_zero) {					\
-		if (parent->_f.left == node)				\
-			parent->_f.left = child;			\
-		else							\
-			parent->_f.right = child;			\
-	} else {							\
-		head->top._f.right = child;				\
-	}								\
-colour:									\
-	if (color == C_BLACK)						\
-		deleteblack(head, parent, node);			\
-	head->count--;							\
-	return old;							\
-}									\
-									\
-void									\
-_n##_rb_init(struct _n##_rb_head *head)					\
-{									\
-	memset(head, 0, sizeof(*head));					\
-	memset(&_n##_rb_zero, 0, sizeof(_n##_rb_zero));			\
-	head->top._f.left = &_n##_rb_zero;				\
-	head->top._f.right = &_n##_rb_zero;				\
-	head->top._f.parent = &head->top;				\
-	_n##_rb_zero._f.left = &_n##_rb_zero;				\
-	_n##_rb_zero._f.right = &_n##_rb_zero;				\
-	_n##_rb_zero._f.parent = &_n##_rb_zero;				\
-}									\
-									\
-void									\
-_n##_rb_walktree(struct _n##_rb_head *head, _n##_rb_walker_t func, void *arg)\
-{									\
-	_t *prev;							\
-	_t *next;							\
-	_t *node = head->top._f.right;					\
-	_t *base;							\
-									\
-	while (node != &_n##_rb_zero)					\
-		node = node->_f.left;					\
-									\
-	for (;;) {							\
-		base = node;						\
-		prev = node;						\
-		while ((node->_f.parent->_f.right == node) &&		\
-		       (node != &_n##_rb_zero))	{			\
-			prev = node;					\
-			node = node->_f.parent;				\
-		}							\
-									\
-		node = prev;						\
-		for (node = node->_f.parent->_f.right; node != &_n##_rb_zero;\
-		     node = node->_f.left)				\
-			prev = node;					\
-		next = prev;						\
-									\
-		if (node != &_n##_rb_zero)				\
-			func(node, arg);				\
-									\
-		node = next;						\
-		if (node == &_n##_rb_zero)				\
-			break;						\
-	}								\
-}									\
-									\
-_t *									\
-_n##_rb_search(struct _n##_rb_head *head, void *key)			\
-{									\
-	int	match;							\
-	_t	*node;							\
-	node = head->top._f.right;					\
-	while (node != &_n##_rb_zero) {					\
-		match = _cmp(key, node);				\
-		if (match == 0)						\
-			break;						\
-		if (match< 0)						\
-			node = node->_f.left;				\
-		else							\
-			node = node->_f.right;				\
-	}								\
-	if (node == &_n##_rb_zero || match != 0)			\
-		return (NULL);						\
-	return (node);							\
-}
-
-#define	RBI_DELETE(_n, _h, _v)		_n##_rb_delete(_h, _v)
-#define	RBI_FIELD(_n)			struct _n##_rb_link
-#define	RBI_INIT(_n, _h)		_n##_rb_init(_h)
-#define	RBI_INSERT(_n, _h, _v)		_n##_rb_insert(_h, _v)
-#define	RBI_ISEMPTY(_h)			((_h)->count == 0)
-#define	RBI_SEARCH(_n, _h, _k)		_n##_rb_search(_h, _k)
-#define	RBI_WALK(_n, _h, _w, _a)	_n##_rb_walktree(_h, _w, _a)
-#define	RBI_ZERO(_n)			_n##_rb_zero
diff --git a/include.new/netinet/ipl.h b/include.new/netinet/ipl.h
deleted file mode 100644
index bbac24a..0000000
--- a/include.new/netinet/ipl.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ipl.h 255332 2013-09-06 23:11:19Z cy $	*/
-
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- *
- * @(#)ipl.h	1.21 6/5/96
- * $FreeBSD: releng/10.2/sys/contrib/ipfilter/netinet/ipl.h 255332 2013-09-06 23:11:19Z cy $
- * Id: ipl.h,v 2.52.2.30 2007/10/16 09:41:00 darrenr Exp $
- */
-
-#ifndef	__IPL_H__
-#define	__IPL_H__
-
-#define	IPL_VERSION	"IP Filter: v5.1.2"
-
-#define	IPFILTER_VERSION	5010200
-
-#endif	/* __IPL_H__ */
diff --git a/include.new/netinet/ipprotosw.h b/include.new/netinet/ipprotosw.h
deleted file mode 100644
index 4c1337b..0000000
--- a/include.new/netinet/ipprotosw.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*-
- * 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.
- * 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.
- *
- *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/sys/netinet/ipprotosw.h,v 1.6 2005/01/07 01:45:44 imp Exp $
- */
-
-#ifndef _NETINET_IPPROTOSW_H_
-#define _NETINET_IPPROTOSW_H_
-
-/*
- * For pfil_head structure.
- */
-#include <net/pfil.h>
-
-/* Forward declare these structures referenced from prototypes below. */
-struct mbuf;
-struct sockaddr;
-struct socket;
-struct sockopt;
-
-struct ipprotosw {
-	short	pr_type;		/* socket type used for */
-	struct	domain *pr_domain;	/* domain protocol a member of */
-	short	pr_protocol;		/* protocol number */
-	short	pr_flags;		/* see below */
-/* protocol-protocol hooks */
-	pr_in_input_t *pr_input;	/* input to protocol (from below) */
-	pr_output_t *pr_output;		/* output to protocol (from above) */
-	pr_ctlinput_t *pr_ctlinput;	/* control input (from below) */
-	pr_ctloutput_t *pr_ctloutput;	/* control output (from above) */
-/* user-protocol hook */
-	void	*pr_ousrreq;
-/* utility hooks */
-	pr_init_t *pr_init;
-	pr_fasttimo_t *pr_fasttimo;	/* fast timeout (200ms) */
-	pr_slowtimo_t *pr_slowtimo;	/* slow timeout (500ms) */
-	pr_drain_t *pr_drain;		/* flush any excess space possible */
-
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-	struct	pfil_head	pr_pfh;
-};
-
-#endif /* !_NETINET_IPPROTOSW_H_ */
diff --git a/include.new/netinet/pim.h b/include.new/netinet/pim.h
deleted file mode 100644
index 409c05f..0000000
--- a/include.new/netinet/pim.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * Copyright (c) 1996-2000
- * University of Southern California/Information Sciences Institute.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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: releng/10.2/sys/netinet/pim.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NETINET_PIM_H_
-#define _NETINET_PIM_H_
-
-/*
- * Protocol Independent Multicast (PIM) definitions.
- * RFC 2362, June 1998.
- *
- * Written by Ahmed Helmy, USC/SGI, July 1996.
- * Modified by George Edmond Eddy (Rusty), ISI, February 1998.
- * Modified by Pavlin Radoslavov, USC/ISI, May 1998, October 2000.
- */
-
-#include <sys/types.h>
-
-#ifndef _PIM_VT
-#ifndef BYTE_ORDER
-# error BYTE_ORDER is not defined!
-#endif
-#if (BYTE_ORDER != BIG_ENDIAN) && (BYTE_ORDER != LITTLE_ENDIAN)
-# error BYTE_ORDER must be defined to either BIG_ENDIAN or LITTLE_ENDIAN
-#endif
-#endif /* ! _PIM_VT */
-
-/*
- * PIM packet header
- */
-struct pim {
-#ifdef _PIM_VT
-	uint8_t		pim_vt;		/* PIM version and message type	*/
-#else /* ! _PIM_VT   */
-#if BYTE_ORDER == BIG_ENDIAN
-	u_int		pim_vers:4,	/* PIM protocol version		*/
-			pim_type:4;	/* PIM message type		*/
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int		pim_type:4,	/* PIM message type		*/
-			pim_vers:4;	/* PIM protocol version		*/
-#endif
-#endif /* ! _PIM_VT  */
-	uint8_t		pim_reserved;	/* Reserved			*/
-	uint16_t	pim_cksum;	/* IP-style checksum		*/
-};
-/* KAME-related name backward compatibility */
-#define pim_ver pim_vers
-#define pim_rsv pim_reserved
-
-#ifdef _PIM_VT
-#define PIM_MAKE_VT(v, t)	(0xff & (((v) << 4) | (0x0f & (t))))
-#define PIM_VT_V(x)		(((x) >> 4) & 0x0f)
-#define PIM_VT_T(x)		((x) & 0x0f)
-#endif /* _PIM_VT */
-
-#define PIM_VERSION		2
-#define PIM_MINLEN		8	/* PIM message min. length	*/
-#define PIM_REG_MINLEN	(PIM_MINLEN+20)	/* PIM Register hdr + inner IPv4 hdr */
-#define PIM6_REG_MINLEN	(PIM_MINLEN+40)	/* PIM Register hdr + inner IPv6 hdr */
-
-/*
- * PIM message types
- */
-#define PIM_HELLO		0x0	/* PIM-SM and PIM-DM		*/
-#define PIM_REGISTER		0x1	/* PIM-SM only			*/
-#define PIM_REGISTER_STOP	0x2	/* PIM-SM only			*/
-#define PIM_JOIN_PRUNE		0x3	/* PIM-SM and PIM-DM		*/
-#define PIM_BOOTSTRAP		0x4	/* PIM-SM only			*/
-#define PIM_ASSERT		0x5	/* PIM-SM and PIM-DM		*/
-#define PIM_GRAFT		0x6	/* PIM-DM only			*/
-#define PIM_GRAFT_ACK		0x7	/* PIM-DM only			*/
-#define PIM_CAND_RP_ADV		0x8	/* PIM-SM only			*/
-#define PIM_ALL_DF_ELECTION	0xa	/* Bidir-PIM-SM only		*/
-
-/*
- * PIM-Register message flags
- */
-#define PIM_BORDER_REGISTER 0x80000000U	/* The Border bit (host-order)	*/
-#define PIM_NULL_REGISTER   0x40000000U	/* The Null-Register bit (host-order)*/
-
-/*
- * All-PIM-Routers IPv4 and IPv6 multicast addresses
- */
-#define INADDR_ALLPIM_ROUTERS_GROUP	(uint32_t)0xe000000dU  /* 224.0.0.13 */
-#define IN6ADDR_LINKLOCAL_ALLPIM_ROUTERS	"ff02::d"
-#define IN6ADDR_LINKLOCAL_ALLPIM_ROUTERS_INIT				\
-	{{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,		\
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0d }}}
-
-#endif /* _NETINET_PIM_H_ */
diff --git a/include.new/netinet/pim_var.h b/include.new/netinet/pim_var.h
deleted file mode 100644
index f36463e..0000000
--- a/include.new/netinet/pim_var.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1998-2000
- * University of Southern California/Information Sciences Institute.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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: releng/10.2/sys/netinet/pim_var.h 254925 2013-08-26 18:16:05Z jhb $
- */
-
-#ifndef _NETINET_PIM_VAR_H_
-#define _NETINET_PIM_VAR_H_
-
-/*
- * Protocol Independent Multicast (PIM),
- * kernel variables and implementation-specific definitions.
- *
- * Written by George Edmond Eddy (Rusty), ISI, February 1998.
- * Modified by Pavlin Radoslavov, USC/ISI, May 1998, Aug 1999, October 2000.
- * Modified by Hitoshi Asaeda, WIDE, August 1998.
- */
-
-/*
- * PIM statistics kept in the kernel
- */
-struct pimstat {
-	uint64_t pims_rcv_total_msgs;	   /* total PIM messages received    */
-	uint64_t pims_rcv_total_bytes;	   /* total PIM bytes received	     */
-	uint64_t pims_rcv_tooshort;	   /* rcvd with too few bytes	     */
-	uint64_t pims_rcv_badsum;	   /* rcvd with bad checksum	     */
-	uint64_t pims_rcv_badversion;	   /* rcvd bad PIM version	     */
-	uint64_t pims_rcv_registers_msgs;  /* rcvd regs. msgs (data only)    */
-	uint64_t pims_rcv_registers_bytes; /* rcvd regs. bytes (data only)   */
-	uint64_t pims_rcv_registers_wrongiif; /* rcvd regs. on wrong iif     */
-	uint64_t pims_rcv_badregisters;	   /* rcvd invalid registers	     */
-	uint64_t pims_snd_registers_msgs;  /* sent regs. msgs (data only)    */
-	uint64_t pims_snd_registers_bytes; /* sent regs. bytes (data only)   */
-};
-
-#ifdef _KERNEL
-#define	PIMSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct pimstat, pimstat, name, (val))
-#define	PIMSTAT_INC(name)	PIMSTAT_ADD(name, 1)
-#endif
-
-/*
- * Names for PIM sysctl objects
- */
-#define PIMCTL_STATS		1	/* statistics (read-only) */
-#define PIMCTL_MAXID		2
-
-#ifdef _KERNEL
-
-void pim_input(struct mbuf *, int);
-SYSCTL_DECL(_net_inet_pim);
-#endif
-
-#endif /* _NETINET_PIM_VAR_H_ */
diff --git a/include.new/netinet/radix_ipf.h b/include.new/netinet/radix_ipf.h
deleted file mode 100644
index 73e66b0..0000000
--- a/include.new/netinet/radix_ipf.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2012 by Darren Reed.
- *
- * See the IPFILTER.LICENCE file for details on licencing.
- */
-#ifndef __RADIX_IPF_H__
-#define	__RADIX_IPF_H__
-
-#ifndef U_32_T
-typedef unsigned int u_32_t;
-# define	U_32_T	1
-#endif
-
-typedef struct ipf_rdx_mask {
-	struct ipf_rdx_mask	*next;
-	struct ipf_rdx_node	*node;
-	u_32_t			*mask;
-	int			maskbitcount;
-} ipf_rdx_mask_t;
-
-typedef struct ipf_rdx_node {
-	struct ipf_rdx_node	*left;
-	struct ipf_rdx_node	*right;
-	struct ipf_rdx_node	*parent;
-	struct ipf_rdx_node	*dupkey;
-	struct ipf_rdx_mask	*masks;
-	struct ipf_rdx_mask	*mymask;
-	u_32_t			*addrkey;
-	u_32_t			*maskkey;
-	u_32_t			*addroff;
-	u_32_t			*maskoff;
-	u_32_t			lastmask;
-	u_32_t			bitmask;
-	int			offset;
-	int			index;
-	int			maskbitcount;
-	int			root;
-#ifdef RDX_DEBUG
-	char			name[40];
-#endif
-} ipf_rdx_node_t;
-
-struct ipf_rdx_head;
-
-typedef	void		(* radix_walk_func_t)(ipf_rdx_node_t *, void *);
-typedef	ipf_rdx_node_t	*(* idx_hamn_func_t)(struct ipf_rdx_head *,
-					     addrfamily_t *, addrfamily_t *,
-					     ipf_rdx_node_t *);
-typedef	ipf_rdx_node_t	*(* idx_ham_func_t)(struct ipf_rdx_head *,
-					    addrfamily_t *, addrfamily_t *);
-typedef	ipf_rdx_node_t	*(* idx_ha_func_t)(struct ipf_rdx_head *,
-					   addrfamily_t *);
-typedef	void		(* idx_walk_func_t)(struct ipf_rdx_head *,
-					    radix_walk_func_t, void *);
-
-typedef struct ipf_rdx_head {
-	ipf_rdx_node_t	*root;
-	ipf_rdx_node_t	nodes[3];
-	ipfmutex_t	lock;
-	idx_hamn_func_t	addaddr;	/* add addr/mask to tree */
-	idx_ham_func_t	deladdr;	/* delete addr/mask from tree */
-	idx_ham_func_t	lookup;		/* look for specific addr/mask */
-	idx_ha_func_t	matchaddr;	/* search tree for address match */
-	idx_walk_func_t	walktree;	/* walk entire tree */
-} ipf_rdx_head_t;
-
-typedef struct radix_softc {
-	u_char			*zeros;
-	u_char			*ones;
-} radix_softc_t;
-
-#undef	RADIX_NODE_HEAD_LOCK
-#undef	RADIX_NODE_HEAD_UNLOCK
-#ifdef	_KERNEL
-# define	RADIX_NODE_HEAD_LOCK(x)		MUTEX_ENTER(&(x)->lock)
-# define	RADIX_NODE_HEAD_UNLOCK(x)	MUTEX_UNLOCK(&(x)->lock)
-#else
-# define	RADIX_NODE_HEAD_LOCK(x)
-# define	RADIX_NODE_HEAD_UNLOCK(x)
-#endif
-
-extern	void	*ipf_rx_create __P((void));
-extern	int	ipf_rx_init __P((void *));
-extern	void	ipf_rx_destroy __P((void *));   
-extern	int	ipf_rx_inithead __P((radix_softc_t *, ipf_rdx_head_t **));
-extern	void	ipf_rx_freehead __P((ipf_rdx_head_t *));
-extern	ipf_rdx_node_t *ipf_rx_addroute __P((ipf_rdx_head_t *,
-					     addrfamily_t *, addrfamily_t *,
-					     ipf_rdx_node_t *));
-extern	ipf_rdx_node_t *ipf_rx_delete __P((ipf_rdx_head_t *, addrfamily_t *,
-					   addrfamily_t *));
-extern	void	ipf_rx_walktree __P((ipf_rdx_head_t *, radix_walk_func_t,
-				     void *));
-
-#endif /* __RADIX_IPF_H__ */
diff --git a/include.new/netinet/sctp.h b/include.new/netinet/sctp.h
deleted file mode 100644
index 992f3eb..0000000
--- a/include.new/netinet/sctp.h
+++ /dev/null
@@ -1,633 +0,0 @@
-/*-
- * Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp.h 283724 2015-05-29 12:54:30Z tuexen $");
-
-#ifndef _NETINET_SCTP_H_
-#define _NETINET_SCTP_H_
-
-
-#include <sys/types.h>
-
-
-#define SCTP_PACKED __attribute__((packed))
-
-/*
- * SCTP protocol - RFC4960.
- */
-struct sctphdr {
-	uint16_t src_port;	/* source port */
-	uint16_t dest_port;	/* destination port */
-	uint32_t v_tag;		/* verification tag of packet */
-	uint32_t checksum;	/* CRC32C checksum */
-	/* chunks follow... */
-}       SCTP_PACKED;
-
-/*
- * SCTP Chunks
- */
-struct sctp_chunkhdr {
-	uint8_t chunk_type;	/* chunk type */
-	uint8_t chunk_flags;	/* chunk flags */
-	uint16_t chunk_length;	/* chunk length */
-	/* optional params follow */
-}             SCTP_PACKED;
-
-/*
- * SCTP chunk parameters
- */
-struct sctp_paramhdr {
-	uint16_t param_type;	/* parameter type */
-	uint16_t param_length;	/* parameter length */
-}             SCTP_PACKED;
-
-/*
- * user socket options: socket API defined
- */
-/*
- * read-write options
- */
-#define SCTP_RTOINFO			0x00000001
-#define SCTP_ASSOCINFO			0x00000002
-#define SCTP_INITMSG			0x00000003
-#define SCTP_NODELAY			0x00000004
-#define SCTP_AUTOCLOSE			0x00000005
-#define SCTP_SET_PEER_PRIMARY_ADDR	0x00000006
-#define SCTP_PRIMARY_ADDR		0x00000007
-#define SCTP_ADAPTATION_LAYER		0x00000008
-/* same as above */
-#define SCTP_ADAPTION_LAYER		0x00000008
-#define SCTP_DISABLE_FRAGMENTS		0x00000009
-#define SCTP_PEER_ADDR_PARAMS 		0x0000000a
-#define SCTP_DEFAULT_SEND_PARAM		0x0000000b
-/* ancillary data/notification interest options */
-#define SCTP_EVENTS			0x0000000c	/* deprecated */
-/* Without this applied we will give V4 and V6 addresses on a V6 socket */
-#define SCTP_I_WANT_MAPPED_V4_ADDR	0x0000000d
-#define SCTP_MAXSEG 			0x0000000e
-#define SCTP_DELAYED_SACK               0x0000000f
-#define SCTP_FRAGMENT_INTERLEAVE        0x00000010
-#define SCTP_PARTIAL_DELIVERY_POINT     0x00000011
-/* authentication support */
-#define SCTP_AUTH_CHUNK 		0x00000012
-#define SCTP_AUTH_KEY 			0x00000013
-#define SCTP_HMAC_IDENT 		0x00000014
-#define SCTP_AUTH_ACTIVE_KEY 		0x00000015
-#define SCTP_AUTH_DELETE_KEY 		0x00000016
-#define SCTP_USE_EXT_RCVINFO		0x00000017
-#define SCTP_AUTO_ASCONF		0x00000018	/* rw */
-#define SCTP_MAXBURST			0x00000019	/* rw */
-#define SCTP_MAX_BURST			0x00000019	/* rw */
-/* assoc level context */
-#define SCTP_CONTEXT                    0x0000001a	/* rw */
-/* explicit EOR signalling */
-#define SCTP_EXPLICIT_EOR               0x0000001b
-#define SCTP_REUSE_PORT                 0x0000001c	/* rw */
-#define SCTP_AUTH_DEACTIVATE_KEY	0x0000001d
-#define SCTP_EVENT                      0x0000001e
-#define SCTP_RECVRCVINFO                0x0000001f
-#define SCTP_RECVNXTINFO                0x00000020
-#define SCTP_DEFAULT_SNDINFO            0x00000021
-#define SCTP_DEFAULT_PRINFO             0x00000022
-#define SCTP_PEER_ADDR_THLDS            0x00000023
-#define SCTP_REMOTE_UDP_ENCAPS_PORT     0x00000024
-#define SCTP_ECN_SUPPORTED              0x00000025
-#define SCTP_PR_SUPPORTED               0x00000026
-#define SCTP_AUTH_SUPPORTED             0x00000027
-#define SCTP_ASCONF_SUPPORTED           0x00000028
-#define SCTP_RECONFIG_SUPPORTED         0x00000029
-#define SCTP_NRSACK_SUPPORTED           0x00000030
-#define SCTP_PKTDROP_SUPPORTED          0x00000031
-#define SCTP_MAX_CWND                   0x00000032
-
-/*
- * read-only options
- */
-#define SCTP_STATUS			0x00000100
-#define SCTP_GET_PEER_ADDR_INFO		0x00000101
-/* authentication support */
-#define SCTP_PEER_AUTH_CHUNKS 		0x00000102
-#define SCTP_LOCAL_AUTH_CHUNKS 		0x00000103
-#define SCTP_GET_ASSOC_NUMBER           0x00000104	/* ro */
-#define SCTP_GET_ASSOC_ID_LIST          0x00000105	/* ro */
-#define SCTP_TIMEOUTS                   0x00000106
-#define SCTP_PR_STREAM_STATUS           0x00000107
-#define SCTP_PR_ASSOC_STATUS            0x00000108
-
-/*
- * user socket options: BSD implementation specific
- */
-/*
- * Blocking I/O is enabled on any TCP type socket by default. For the UDP
- * model if this is turned on then the socket buffer is shared for send
- * resources amongst all associations.  The default for the UDP model is that
- * is SS_NBIO is set.  Which means all associations have a separate send
- * limit BUT they will NOT ever BLOCK instead you will get an error back
- * EAGAIN if you try to send too much. If you want the blocking semantics you
- * set this option at the cost of sharing one socket send buffer size amongst
- * all associations. Peeled off sockets turn this option off and block. But
- * since both TCP and peeled off sockets have only one assoc per socket this
- * is fine. It probably does NOT make sense to set this on SS_NBIO on a TCP
- * model OR peeled off UDP model, but we do allow you to do so. You just use
- * the normal syscall to toggle SS_NBIO the way you want.
- *
- * Blocking I/O is controlled by the SS_NBIO flag on the socket state so_state
- * field.
- */
-
-#define SCTP_ENABLE_STREAM_RESET	0x00000900	/* struct
-							 * sctp_assoc_value */
-#define SCTP_RESET_STREAMS		0x00000901	/* struct
-							 * sctp_reset_streams */
-#define SCTP_RESET_ASSOC		0x00000902	/* sctp_assoc_t */
-#define SCTP_ADD_STREAMS		0x00000903	/* struct
-							 * sctp_add_streams */
-
-/* For enable stream reset */
-#define SCTP_ENABLE_RESET_STREAM_REQ 	0x00000001
-#define SCTP_ENABLE_RESET_ASSOC_REQ 	0x00000002
-#define SCTP_ENABLE_CHANGE_ASSOC_REQ 	0x00000004
-#define SCTP_ENABLE_VALUE_MASK		0x00000007
-/* For reset streams */
-#define SCTP_STREAM_RESET_INCOMING	0x00000001
-#define SCTP_STREAM_RESET_OUTGOING	0x00000002
-
-
-/* here on down are more implementation specific */
-#define SCTP_SET_DEBUG_LEVEL		0x00001005
-#define SCTP_CLR_STAT_LOG               0x00001007
-/* CMT ON/OFF socket option */
-#define SCTP_CMT_ON_OFF                 0x00001200
-#define SCTP_CMT_USE_DAC                0x00001201
-/* JRS - Pluggable Congestion Control Socket option */
-#define SCTP_PLUGGABLE_CC               0x00001202
-/* RS - Pluggable Stream Scheduling Socket option */
-#define SCTP_PLUGGABLE_SS		0x00001203
-#define SCTP_SS_VALUE			0x00001204
-#define SCTP_CC_OPTION			0x00001205	/* Options for CC
-							 * modules */
-/* read only */
-#define SCTP_GET_SNDBUF_USE		0x00001101
-#define SCTP_GET_STAT_LOG		0x00001103
-#define SCTP_PCB_STATUS			0x00001104
-#define SCTP_GET_NONCE_VALUES           0x00001105
-
-
-/* Special hook for dynamically setting primary for all assoc's,
- * this is a write only option that requires root privilege.
- */
-#define SCTP_SET_DYNAMIC_PRIMARY        0x00002001
-
-/* VRF (virtual router feature) and multi-VRF support
- * options. VRF's provide splits within a router
- * that give the views of multiple routers. A
- * standard host, without VRF support, is just
- * a single VRF. If VRF's are supported then
- * the transport must be VRF aware. This means
- * that every socket call coming in must be directed
- * within the endpoint to one of the VRF's it belongs
- * to. The endpoint, before binding, may select
- * the "default" VRF it is in by using a set socket
- * option with SCTP_VRF_ID. This will also
- * get propagated to the default VRF. Once the
- * endpoint binds an address then it CANNOT add
- * additional VRF's to become a Multi-VRF endpoint.
- *
- * Before BINDING additional VRF's can be added with
- * the SCTP_ADD_VRF_ID call or deleted with
- * SCTP_DEL_VRF_ID.
- *
- * Associations are ALWAYS contained inside a single
- * VRF. They cannot reside in two (or more) VRF's. Incoming
- * packets, assuming the router is VRF aware, can always
- * tell us what VRF they arrived on. A host not supporting
- * any VRF's will find that the packets always arrived on the
- * single VRF that the host has.
- *
- */
-
-#define SCTP_VRF_ID			0x00003001
-#define SCTP_ADD_VRF_ID			0x00003002
-#define SCTP_GET_VRF_IDS		0x00003003
-#define SCTP_GET_ASOC_VRF               0x00003004
-#define SCTP_DEL_VRF_ID                 0x00003005
-
-/*
- * If you enable packet logging you can get
- * a poor mans ethereal output in binary
- * form. Note this is a compile option to
- * the kernel,  SCTP_PACKET_LOGGING, and
- * without it in your kernel you
- * will get a EOPNOTSUPP
- */
-#define SCTP_GET_PACKET_LOG             0x00004001
-
-/*
- * hidden implementation specific options these are NOT user visible (should
- * move out of sctp.h)
- */
-/* sctp_bindx() flags as hidden socket options */
-#define SCTP_BINDX_ADD_ADDR		0x00008001
-#define SCTP_BINDX_REM_ADDR		0x00008002
-/* Hidden socket option that gets the addresses */
-#define SCTP_GET_PEER_ADDRESSES		0x00008003
-#define SCTP_GET_LOCAL_ADDRESSES	0x00008004
-/* return the total count in bytes needed to hold all local addresses bound */
-#define SCTP_GET_LOCAL_ADDR_SIZE	0x00008005
-/* Return the total count in bytes needed to hold the remote address */
-#define SCTP_GET_REMOTE_ADDR_SIZE	0x00008006
-/* hidden option for connectx */
-#define SCTP_CONNECT_X			0x00008007
-/* hidden option for connectx_delayed, part of sendx */
-#define SCTP_CONNECT_X_DELAYED		0x00008008
-#define SCTP_CONNECT_X_COMPLETE         0x00008009
-/* hidden socket option based sctp_peeloff */
-#define SCTP_PEELOFF                    0x0000800a
-/* the real worker for sctp_getaddrlen() */
-#define SCTP_GET_ADDR_LEN               0x0000800b
-/* Debug things that need to be purged */
-#define SCTP_SET_INITIAL_DBG_SEQ	0x00009f00
-
-/* JRS - Supported congestion control modules for pluggable
- * congestion control
- */
-/* Standard TCP Congestion Control */
-#define SCTP_CC_RFC2581		0x00000000
-/* High Speed TCP Congestion Control (Floyd) */
-#define SCTP_CC_HSTCP		0x00000001
-/* HTCP Congestion Control */
-#define SCTP_CC_HTCP		0x00000002
-/* RTCC Congestion Control - RFC2581 plus */
-#define SCTP_CC_RTCC            0x00000003
-
-#define SCTP_CC_OPT_RTCC_SETMODE	0x00002000
-#define SCTP_CC_OPT_USE_DCCC_ECN	0x00002001
-#define SCTP_CC_OPT_STEADY_STEP         0x00002002
-
-#define SCTP_CMT_OFF            0
-#define SCTP_CMT_BASE           1
-#define SCTP_CMT_RPV1           2
-#define SCTP_CMT_RPV2           3
-#define SCTP_CMT_MPTCP          4
-#define SCTP_CMT_MAX            SCTP_CMT_MPTCP
-
-/* RS - Supported stream scheduling modules for pluggable
- * stream scheduling
- */
-/* Default simple round-robin */
-#define SCTP_SS_DEFAULT			0x00000000
-/* Real round-robin */
-#define SCTP_SS_ROUND_ROBIN		0x00000001
-/* Real round-robin per packet */
-#define SCTP_SS_ROUND_ROBIN_PACKET	0x00000002
-/* Priority */
-#define SCTP_SS_PRIORITY		0x00000003
-/* Fair Bandwidth */
-#define SCTP_SS_FAIR_BANDWITH		0x00000004
-/* First-come, first-serve */
-#define SCTP_SS_FIRST_COME		0x00000005
-
-
-/* fragment interleave constants
- * setting must be one of these or
- * EINVAL returned.
- */
-#define SCTP_FRAG_LEVEL_0    0x00000000
-#define SCTP_FRAG_LEVEL_1    0x00000001
-#define SCTP_FRAG_LEVEL_2    0x00000002
-
-/*
- * user state values
- */
-#define SCTP_CLOSED			0x0000
-#define SCTP_BOUND			0x1000
-#define SCTP_LISTEN			0x2000
-#define SCTP_COOKIE_WAIT		0x0002
-#define SCTP_COOKIE_ECHOED		0x0004
-#define SCTP_ESTABLISHED		0x0008
-#define SCTP_SHUTDOWN_SENT		0x0010
-#define SCTP_SHUTDOWN_RECEIVED		0x0020
-#define SCTP_SHUTDOWN_ACK_SENT		0x0040
-#define SCTP_SHUTDOWN_PENDING		0x0080
-
-/*
- * SCTP operational error codes (user visible)
- */
-#define SCTP_CAUSE_NO_ERROR		0x0000
-#define SCTP_CAUSE_INVALID_STREAM	0x0001
-#define SCTP_CAUSE_MISSING_PARAM	0x0002
-#define SCTP_CAUSE_STALE_COOKIE		0x0003
-#define SCTP_CAUSE_OUT_OF_RESC		0x0004
-#define SCTP_CAUSE_UNRESOLVABLE_ADDR	0x0005
-#define SCTP_CAUSE_UNRECOG_CHUNK	0x0006
-#define SCTP_CAUSE_INVALID_PARAM	0x0007
-#define SCTP_CAUSE_UNRECOG_PARAM	0x0008
-#define SCTP_CAUSE_NO_USER_DATA		0x0009
-#define SCTP_CAUSE_COOKIE_IN_SHUTDOWN	0x000a
-#define SCTP_CAUSE_RESTART_W_NEWADDR	0x000b
-#define SCTP_CAUSE_USER_INITIATED_ABT	0x000c
-#define SCTP_CAUSE_PROTOCOL_VIOLATION	0x000d
-
-/* Error causes from RFC5061 */
-#define SCTP_CAUSE_DELETING_LAST_ADDR	0x00a0
-#define SCTP_CAUSE_RESOURCE_SHORTAGE	0x00a1
-#define SCTP_CAUSE_DELETING_SRC_ADDR	0x00a2
-#define SCTP_CAUSE_ILLEGAL_ASCONF_ACK	0x00a3
-#define SCTP_CAUSE_REQUEST_REFUSED	0x00a4
-
-/* Error causes from nat-draft */
-#define SCTP_CAUSE_NAT_COLLIDING_STATE  0x00b0
-#define SCTP_CAUSE_NAT_MISSING_STATE    0x00b1
-
-/* Error causes from RFC4895 */
-#define SCTP_CAUSE_UNSUPPORTED_HMACID	0x0105
-
-/*
- * error cause parameters (user visible)
- */
-struct sctp_gen_error_cause {
-	uint16_t code;
-	uint16_t length;
-	uint8_t info[];
-}                    SCTP_PACKED;
-
-struct sctp_error_cause {
-	uint16_t code;
-	uint16_t length;
-	/* optional cause-specific info may follow */
-}                SCTP_PACKED;
-
-struct sctp_error_invalid_stream {
-	struct sctp_error_cause cause;	/* code=SCTP_ERROR_INVALID_STREAM */
-	uint16_t stream_id;	/* stream id of the DATA in error */
-	uint16_t reserved;
-}                         SCTP_PACKED;
-
-struct sctp_error_missing_param {
-	struct sctp_error_cause cause;	/* code=SCTP_ERROR_MISSING_PARAM */
-	uint32_t num_missing_params;	/* number of missing parameters */
-	/* uint16_t param_type's follow */
-}                        SCTP_PACKED;
-
-struct sctp_error_stale_cookie {
-	struct sctp_error_cause cause;	/* code=SCTP_ERROR_STALE_COOKIE */
-	uint32_t stale_time;	/* time in usec of staleness */
-}                       SCTP_PACKED;
-
-struct sctp_error_out_of_resource {
-	struct sctp_error_cause cause;	/* code=SCTP_ERROR_OUT_OF_RESOURCES */
-}                          SCTP_PACKED;
-
-struct sctp_error_unresolv_addr {
-	struct sctp_error_cause cause;	/* code=SCTP_ERROR_UNRESOLVABLE_ADDR */
-
-}                        SCTP_PACKED;
-
-struct sctp_error_unrecognized_chunk {
-	struct sctp_error_cause cause;	/* code=SCTP_ERROR_UNRECOG_CHUNK */
-	struct sctp_chunkhdr ch;/* header from chunk in error */
-}                             SCTP_PACKED;
-
-struct sctp_error_no_user_data {
-	struct sctp_error_cause cause;	/* code=SCTP_CAUSE_NO_USER_DATA */
-	uint32_t tsn;		/* TSN of the empty data chunk */
-}                       SCTP_PACKED;
-
-/*
- * Main SCTP chunk types we place these here so natd and f/w's in user land
- * can find them.
- */
-/************0x00 series ***********/
-#define SCTP_DATA		0x00
-#define SCTP_INITIATION		0x01
-#define SCTP_INITIATION_ACK	0x02
-#define SCTP_SELECTIVE_ACK	0x03
-#define SCTP_HEARTBEAT_REQUEST	0x04
-#define SCTP_HEARTBEAT_ACK	0x05
-#define SCTP_ABORT_ASSOCIATION	0x06
-#define SCTP_SHUTDOWN		0x07
-#define SCTP_SHUTDOWN_ACK	0x08
-#define SCTP_OPERATION_ERROR	0x09
-#define SCTP_COOKIE_ECHO	0x0a
-#define SCTP_COOKIE_ACK		0x0b
-#define SCTP_ECN_ECHO		0x0c
-#define SCTP_ECN_CWR		0x0d
-#define SCTP_SHUTDOWN_COMPLETE	0x0e
-/* RFC4895 */
-#define SCTP_AUTHENTICATION     0x0f
-/* EY nr_sack chunk id*/
-#define SCTP_NR_SELECTIVE_ACK	0x10
-/************0x40 series ***********/
-/************0x80 series ***********/
-/* RFC5061 */
-#define	SCTP_ASCONF_ACK		0x80
-/* draft-ietf-stewart-pktdrpsctp */
-#define SCTP_PACKET_DROPPED	0x81
-/* draft-ietf-stewart-strreset-xxx */
-#define SCTP_STREAM_RESET       0x82
-
-/* RFC4820                         */
-#define SCTP_PAD_CHUNK          0x84
-/************0xc0 series ***********/
-/* RFC3758 */
-#define SCTP_FORWARD_CUM_TSN	0xc0
-/* RFC5061 */
-#define SCTP_ASCONF		0xc1
-
-
-/* ABORT and SHUTDOWN COMPLETE FLAG */
-#define SCTP_HAD_NO_TCB		0x01
-
-/* Packet dropped flags */
-#define SCTP_FROM_MIDDLE_BOX	SCTP_HAD_NO_TCB
-#define SCTP_BADCRC		0x02
-#define SCTP_PACKET_TRUNCATED	0x04
-
-/* Flag for ECN -CWR */
-#define SCTP_CWR_REDUCE_OVERRIDE 0x01
-#define SCTP_CWR_IN_SAME_WINDOW  0x02
-
-#define SCTP_SAT_NETWORK_MIN	400	/* min ms for RTT to set satellite
-					 * time */
-#define SCTP_SAT_NETWORK_BURST_INCR  2	/* how many times to multiply maxburst
-					 * in sat */
-
-/* Data Chuck Specific Flags */
-#define SCTP_DATA_FRAG_MASK        0x03
-#define SCTP_DATA_MIDDLE_FRAG      0x00
-#define SCTP_DATA_LAST_FRAG        0x01
-#define SCTP_DATA_FIRST_FRAG       0x02
-#define SCTP_DATA_NOT_FRAG         0x03
-#define SCTP_DATA_UNORDERED        0x04
-#define SCTP_DATA_SACK_IMMEDIATELY 0x08
-/* ECN Nonce: SACK Chunk Specific Flags */
-#define SCTP_SACK_NONCE_SUM        0x01
-
-/* CMT DAC algorithm SACK flag */
-#define SCTP_SACK_CMT_DAC          0x80
-
-/*
- * PCB flags (in sctp_flags bitmask).
- * Note the features and flags are meant
- * for use by netstat.
- */
-#define SCTP_PCB_FLAGS_UDPTYPE		0x00000001
-#define SCTP_PCB_FLAGS_TCPTYPE		0x00000002
-#define SCTP_PCB_FLAGS_BOUNDALL		0x00000004
-#define SCTP_PCB_FLAGS_ACCEPTING	0x00000008
-#define SCTP_PCB_FLAGS_UNBOUND		0x00000010
-#define SCTP_PCB_FLAGS_CLOSE_IP         0x00040000
-#define SCTP_PCB_FLAGS_WAS_CONNECTED    0x00080000
-#define SCTP_PCB_FLAGS_WAS_ABORTED      0x00100000
-/* TCP model support */
-
-#define SCTP_PCB_FLAGS_CONNECTED	0x00200000
-#define SCTP_PCB_FLAGS_IN_TCPPOOL	0x00400000
-#define SCTP_PCB_FLAGS_DONT_WAKE	0x00800000
-#define SCTP_PCB_FLAGS_WAKEOUTPUT	0x01000000
-#define SCTP_PCB_FLAGS_WAKEINPUT	0x02000000
-#define SCTP_PCB_FLAGS_BOUND_V6		0x04000000
-#define SCTP_PCB_FLAGS_BLOCKING_IO	0x08000000
-#define SCTP_PCB_FLAGS_SOCKET_GONE	0x10000000
-#define SCTP_PCB_FLAGS_SOCKET_ALLGONE	0x20000000
-#define SCTP_PCB_FLAGS_SOCKET_CANT_READ	0x40000000
-
-/* flags to copy to new PCB */
-#define SCTP_PCB_COPY_FLAGS		(SCTP_PCB_FLAGS_BOUNDALL|\
-					 SCTP_PCB_FLAGS_WAKEINPUT|\
-					 SCTP_PCB_FLAGS_BOUND_V6)
-
-/*
- * PCB Features (in sctp_features bitmask)
- */
-#define SCTP_PCB_FLAGS_DO_NOT_PMTUD      0x0000000000000001
-#define SCTP_PCB_FLAGS_EXT_RCVINFO       0x0000000000000002	/* deprecated */
-#define SCTP_PCB_FLAGS_DONOT_HEARTBEAT   0x0000000000000004
-#define SCTP_PCB_FLAGS_FRAG_INTERLEAVE   0x0000000000000008
-#define SCTP_PCB_FLAGS_INTERLEAVE_STRMS  0x0000000000000010
-#define SCTP_PCB_FLAGS_DO_ASCONF         0x0000000000000020
-#define SCTP_PCB_FLAGS_AUTO_ASCONF       0x0000000000000040
-#define SCTP_PCB_FLAGS_ZERO_COPY_ACTIVE  0x0000000000000080
-/* socket options */
-#define SCTP_PCB_FLAGS_NODELAY           0x0000000000000100
-#define SCTP_PCB_FLAGS_AUTOCLOSE         0x0000000000000200
-#define SCTP_PCB_FLAGS_RECVDATAIOEVNT    0x0000000000000400	/* deprecated */
-#define SCTP_PCB_FLAGS_RECVASSOCEVNT     0x0000000000000800
-#define SCTP_PCB_FLAGS_RECVPADDREVNT     0x0000000000001000
-#define SCTP_PCB_FLAGS_RECVPEERERR       0x0000000000002000
-#define SCTP_PCB_FLAGS_RECVSENDFAILEVNT  0x0000000000004000	/* deprecated */
-#define SCTP_PCB_FLAGS_RECVSHUTDOWNEVNT  0x0000000000008000
-#define SCTP_PCB_FLAGS_ADAPTATIONEVNT    0x0000000000010000
-#define SCTP_PCB_FLAGS_PDAPIEVNT         0x0000000000020000
-#define SCTP_PCB_FLAGS_AUTHEVNT          0x0000000000040000
-#define SCTP_PCB_FLAGS_STREAM_RESETEVNT  0x0000000000080000
-#define SCTP_PCB_FLAGS_NO_FRAGMENT       0x0000000000100000
-#define SCTP_PCB_FLAGS_EXPLICIT_EOR      0x0000000000400000
-#define SCTP_PCB_FLAGS_NEEDS_MAPPED_V4   0x0000000000800000
-#define SCTP_PCB_FLAGS_MULTIPLE_ASCONFS  0x0000000001000000
-#define SCTP_PCB_FLAGS_PORTREUSE         0x0000000002000000
-#define SCTP_PCB_FLAGS_DRYEVNT           0x0000000004000000
-#define SCTP_PCB_FLAGS_RECVRCVINFO       0x0000000008000000
-#define SCTP_PCB_FLAGS_RECVNXTINFO       0x0000000010000000
-#define SCTP_PCB_FLAGS_ASSOC_RESETEVNT   0x0000000020000000
-#define SCTP_PCB_FLAGS_STREAM_CHANGEEVNT 0x0000000040000000
-#define SCTP_PCB_FLAGS_RECVNSENDFAILEVNT 0x0000000080000000
-
-/*-
- * mobility_features parameters (by micchie).Note
- * these features are applied against the
- * sctp_mobility_features flags.. not the sctp_features
- * flags.
- */
-#define SCTP_MOBILITY_BASE               0x00000001
-#define SCTP_MOBILITY_FASTHANDOFF        0x00000002
-#define SCTP_MOBILITY_PRIM_DELETED       0x00000004
-
-
-#define SCTP_SMALLEST_PMTU 512	/* smallest pmtu allowed when disabling PMTU
-				 * discovery */
-
-#undef SCTP_PACKED
-
-#include <netinet/sctp_uio.h>
-
-/* This dictates the size of the packet
- * collection buffer. This only applies
- * if SCTP_PACKET_LOGGING is enabled in
- * your config.
- */
-#define SCTP_PACKET_LOG_SIZE 65536
-
-/* Maximum delays and such a user can set for options that
- * take ms.
- */
-#define SCTP_MAX_SACK_DELAY 500	/* per RFC4960 */
-#define SCTP_MAX_HB_INTERVAL 14400000	/* 4 hours in ms */
-#define SCTP_MAX_COOKIE_LIFE  3600000	/* 1 hour in ms */
-
-
-/* Types of logging/KTR tracing  that can be enabled via the
- * sysctl net.inet.sctp.sctp_logging. You must also enable
- * SUBSYS tracing.
- * Note that you must have the SCTP option in the kernel
- * to enable these as well.
- */
-#define SCTP_BLK_LOGGING_ENABLE				0x00000001
-#define SCTP_CWND_MONITOR_ENABLE			0x00000002
-#define SCTP_CWND_LOGGING_ENABLE			0x00000004
-#define SCTP_FLIGHT_LOGGING_ENABLE			0x00000020
-#define SCTP_FR_LOGGING_ENABLE				0x00000040
-#define SCTP_LOCK_LOGGING_ENABLE			0x00000080
-#define SCTP_MAP_LOGGING_ENABLE				0x00000100
-#define SCTP_MBCNT_LOGGING_ENABLE			0x00000200
-#define SCTP_MBUF_LOGGING_ENABLE			0x00000400
-#define SCTP_NAGLE_LOGGING_ENABLE			0x00000800
-#define SCTP_RECV_RWND_LOGGING_ENABLE			0x00001000
-#define SCTP_RTTVAR_LOGGING_ENABLE			0x00002000
-#define SCTP_SACK_LOGGING_ENABLE			0x00004000
-#define SCTP_SACK_RWND_LOGGING_ENABLE			0x00008000
-#define SCTP_SB_LOGGING_ENABLE				0x00010000
-#define SCTP_STR_LOGGING_ENABLE				0x00020000
-#define SCTP_WAKE_LOGGING_ENABLE			0x00040000
-#define SCTP_LOG_MAXBURST_ENABLE			0x00080000
-#define SCTP_LOG_RWND_ENABLE    			0x00100000
-#define SCTP_LOG_SACK_ARRIVALS_ENABLE			0x00200000
-#define SCTP_LTRACE_CHUNK_ENABLE			0x00400000
-#define SCTP_LTRACE_ERROR_ENABLE			0x00800000
-#define SCTP_LAST_PACKET_TRACING			0x01000000
-#define SCTP_THRESHOLD_LOGGING				0x02000000
-#define SCTP_LOG_AT_SEND_2_SCTP				0x04000000
-#define SCTP_LOG_AT_SEND_2_OUTQ				0x08000000
-#define SCTP_LOG_TRY_ADVANCE				0x10000000
-
-#endif				/* !_NETINET_SCTP_H_ */
diff --git a/include.new/netinet/sctp_asconf.h b/include.new/netinet/sctp_asconf.h
deleted file mode 100644
index c375944..0000000
--- a/include.new/netinet/sctp_asconf.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_asconf.h 237715 2012-06-28 16:01:08Z tuexen $");
-
-#ifndef _NETINET_SCTP_ASCONF_H_
-#define _NETINET_SCTP_ASCONF_H_
-
-#if defined(_KERNEL) || defined(__Userspace__)
-
-/*
- * function prototypes
- */
-extern void sctp_asconf_cleanup(struct sctp_tcb *, struct sctp_nets *);
-
-extern struct mbuf *sctp_compose_asconf(struct sctp_tcb *, int *, int);
-
-extern void
-sctp_handle_asconf(struct mbuf *, unsigned int, struct sockaddr *,
-    struct sctp_asconf_chunk *, struct sctp_tcb *, int);
-
-extern void
-sctp_handle_asconf_ack(struct mbuf *, int, struct sctp_asconf_ack_chunk *,
-    struct sctp_tcb *, struct sctp_nets *, int *);
-
-extern uint32_t
-sctp_addr_mgmt_ep_sa(struct sctp_inpcb *, struct sockaddr *,
-    uint32_t, uint32_t, struct sctp_ifa *);
-
-
-extern int 
-sctp_asconf_iterator_ep(struct sctp_inpcb *inp, void *ptr,
-    uint32_t val);
-extern void 
-sctp_asconf_iterator_stcb(struct sctp_inpcb *inp,
-    struct sctp_tcb *stcb,
-    void *ptr, uint32_t type);
-extern void sctp_asconf_iterator_end(void *ptr, uint32_t val);
-
-
-extern int32_t
-sctp_set_primary_ip_address_sa(struct sctp_tcb *,
-    struct sockaddr *);
-
-extern void
-     sctp_set_primary_ip_address(struct sctp_ifa *ifa);
-
-extern void
-sctp_check_address_list(struct sctp_tcb *, struct mbuf *, int, int,
-    struct sockaddr *, uint16_t, uint16_t, uint16_t, uint16_t);
-
-extern void
-     sctp_assoc_immediate_retrans(struct sctp_tcb *, struct sctp_nets *);
-extern void
-     sctp_net_immediate_retrans(struct sctp_tcb *, struct sctp_nets *);
-
-extern void
-sctp_asconf_send_nat_state_update(struct sctp_tcb *stcb,
-    struct sctp_nets *net);
-
-extern int
-    sctp_is_addr_pending(struct sctp_tcb *, struct sctp_ifa *);
-
-#endif				/* _KERNEL */
-
-#endif				/* !_NETINET_SCTP_ASCONF_H_ */
diff --git a/include.new/netinet/sctp_auth.h b/include.new/netinet/sctp_auth.h
deleted file mode 100644
index 8c560eb..0000000
--- a/include.new/netinet/sctp_auth.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*-
- * Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_auth.h 271750 2014-09-18 09:49:49Z tuexen $");
-
-#ifndef _NETINET_SCTP_AUTH_H_
-#define _NETINET_SCTP_AUTH_H_
-
-#include <netinet/sctp_os.h>
-
-/* digest lengths */
-#define SCTP_AUTH_DIGEST_LEN_SHA1	20
-#define SCTP_AUTH_DIGEST_LEN_SHA256	32
-#define SCTP_AUTH_DIGEST_LEN_MAX	SCTP_AUTH_DIGEST_LEN_SHA256
-
-/* random sizes */
-#define SCTP_AUTH_RANDOM_SIZE_DEFAULT	32
-#define SCTP_AUTH_RANDOM_SIZE_REQUIRED	32
-
-/* union of all supported HMAC algorithm contexts */
-typedef union sctp_hash_context {
-	SCTP_SHA1_CTX sha1;
-	SCTP_SHA256_CTX sha256;
-}                 sctp_hash_context_t;
-
-typedef struct sctp_key {
-	uint32_t keylen;
-	uint8_t key[];
-}        sctp_key_t;
-
-typedef struct sctp_shared_key {
-	LIST_ENTRY(sctp_shared_key) next;
-	sctp_key_t *key;	/* key text */
-	uint32_t refcount;	/* reference count */
-	uint16_t keyid;		/* shared key ID */
-	uint8_t deactivated;	/* key is deactivated */
-}               sctp_sharedkey_t;
-
-LIST_HEAD(sctp_keyhead, sctp_shared_key);
-
-/* authentication chunks list */
-typedef struct sctp_auth_chklist {
-	uint8_t chunks[256];
-	uint8_t num_chunks;
-}                 sctp_auth_chklist_t;
-
-/* hmac algos supported list */
-typedef struct sctp_hmaclist {
-	uint16_t max_algo;	/* max algorithms allocated */
-	uint16_t num_algo;	/* num algorithms used */
-	uint16_t hmac[];
-}             sctp_hmaclist_t;
-
-/* authentication info */
-typedef struct sctp_authinformation {
-	sctp_key_t *random;	/* local random key (concatenated) */
-	uint32_t random_len;	/* local random number length for param */
-	sctp_key_t *peer_random;/* peer's random key (concatenated) */
-	sctp_key_t *assoc_key;	/* cached concatenated send key */
-	sctp_key_t *recv_key;	/* cached concatenated recv key */
-	uint16_t active_keyid;	/* active send keyid */
-	uint16_t assoc_keyid;	/* current send keyid (cached) */
-	uint16_t recv_keyid;	/* last recv keyid (cached) */
-}                    sctp_authinfo_t;
-
-
-
-/*
- * Macros
- */
-#define sctp_auth_is_required_chunk(chunk, list) ((list == NULL) ? (0) : (list->chunks[chunk] != 0))
-
-/*
- * function prototypes
- */
-
-/* socket option api functions */
-extern sctp_auth_chklist_t *sctp_alloc_chunklist(void);
-extern void sctp_free_chunklist(sctp_auth_chklist_t * chklist);
-extern void sctp_clear_chunklist(sctp_auth_chklist_t * chklist);
-extern sctp_auth_chklist_t *sctp_copy_chunklist(sctp_auth_chklist_t * chklist);
-extern int sctp_auth_add_chunk(uint8_t chunk, sctp_auth_chklist_t * list);
-extern int sctp_auth_delete_chunk(uint8_t chunk, sctp_auth_chklist_t * list);
-extern size_t sctp_auth_get_chklist_size(const sctp_auth_chklist_t * list);
-extern int 
-sctp_serialize_auth_chunks(const sctp_auth_chklist_t * list,
-    uint8_t * ptr);
-extern int 
-sctp_pack_auth_chunks(const sctp_auth_chklist_t * list,
-    uint8_t * ptr);
-extern int 
-sctp_unpack_auth_chunks(const uint8_t * ptr, uint8_t num_chunks,
-    sctp_auth_chklist_t * list);
-
-/* key handling */
-extern sctp_key_t *sctp_alloc_key(uint32_t keylen);
-extern void sctp_free_key(sctp_key_t * key);
-extern void sctp_print_key(sctp_key_t * key, const char *str);
-extern void sctp_show_key(sctp_key_t * key, const char *str);
-extern sctp_key_t *sctp_generate_random_key(uint32_t keylen);
-extern sctp_key_t *sctp_set_key(uint8_t * key, uint32_t keylen);
-extern sctp_key_t *
-sctp_compute_hashkey(sctp_key_t * key1, sctp_key_t * key2,
-    sctp_key_t * shared);
-
-/* shared key handling */
-extern sctp_sharedkey_t *sctp_alloc_sharedkey(void);
-extern void sctp_free_sharedkey(sctp_sharedkey_t * skey);
-extern sctp_sharedkey_t *
-sctp_find_sharedkey(struct sctp_keyhead *shared_keys,
-    uint16_t key_id);
-extern int 
-sctp_insert_sharedkey(struct sctp_keyhead *shared_keys,
-    sctp_sharedkey_t * new_skey);
-extern int 
-sctp_copy_skeylist(const struct sctp_keyhead *src,
-    struct sctp_keyhead *dest);
-
-/* ref counts on shared keys, by key id */
-extern void sctp_auth_key_acquire(struct sctp_tcb *stcb, uint16_t keyid);
-extern void 
-sctp_auth_key_release(struct sctp_tcb *stcb, uint16_t keyid,
-    int so_locked);
-
-
-/* hmac list handling */
-extern sctp_hmaclist_t *sctp_alloc_hmaclist(uint16_t num_hmacs);
-extern void sctp_free_hmaclist(sctp_hmaclist_t * list);
-extern int sctp_auth_add_hmacid(sctp_hmaclist_t * list, uint16_t hmac_id);
-extern sctp_hmaclist_t *sctp_copy_hmaclist(sctp_hmaclist_t * list);
-extern sctp_hmaclist_t *sctp_default_supported_hmaclist(void);
-extern uint16_t 
-sctp_negotiate_hmacid(sctp_hmaclist_t * peer,
-    sctp_hmaclist_t * local);
-extern int sctp_serialize_hmaclist(sctp_hmaclist_t * list, uint8_t * ptr);
-extern int 
-sctp_verify_hmac_param(struct sctp_auth_hmac_algo *hmacs,
-    uint32_t num_hmacs);
-
-extern sctp_authinfo_t *sctp_alloc_authinfo(void);
-extern void sctp_free_authinfo(sctp_authinfo_t * authinfo);
-
-/* keyed-HMAC functions */
-extern uint32_t sctp_get_auth_chunk_len(uint16_t hmac_algo);
-extern uint32_t sctp_get_hmac_digest_len(uint16_t hmac_algo);
-extern uint32_t 
-sctp_hmac(uint16_t hmac_algo, uint8_t * key, uint32_t keylen,
-    uint8_t * text, uint32_t textlen, uint8_t * digest);
-extern int 
-sctp_verify_hmac(uint16_t hmac_algo, uint8_t * key, uint32_t keylen,
-    uint8_t * text, uint32_t textlen, uint8_t * digest, uint32_t digestlen);
-extern uint32_t 
-sctp_compute_hmac(uint16_t hmac_algo, sctp_key_t * key,
-    uint8_t * text, uint32_t textlen, uint8_t * digest);
-extern int sctp_auth_is_supported_hmac(sctp_hmaclist_t * list, uint16_t id);
-
-/* mbuf versions */
-extern uint32_t 
-sctp_hmac_m(uint16_t hmac_algo, uint8_t * key, uint32_t keylen,
-    struct mbuf *m, uint32_t m_offset, uint8_t * digest, uint32_t trailer);
-extern uint32_t 
-sctp_compute_hmac_m(uint16_t hmac_algo, sctp_key_t * key,
-    struct mbuf *m, uint32_t m_offset, uint8_t * digest);
-
-/*
- * authentication routines
- */
-extern void sctp_clear_cachedkeys(struct sctp_tcb *stcb, uint16_t keyid);
-extern void sctp_clear_cachedkeys_ep(struct sctp_inpcb *inp, uint16_t keyid);
-extern int sctp_delete_sharedkey(struct sctp_tcb *stcb, uint16_t keyid);
-extern int sctp_delete_sharedkey_ep(struct sctp_inpcb *inp, uint16_t keyid);
-extern int sctp_auth_setactivekey(struct sctp_tcb *stcb, uint16_t keyid);
-extern int sctp_auth_setactivekey_ep(struct sctp_inpcb *inp, uint16_t keyid);
-extern int sctp_deact_sharedkey(struct sctp_tcb *stcb, uint16_t keyid);
-extern int sctp_deact_sharedkey_ep(struct sctp_inpcb *inp, uint16_t keyid);
-
-extern void 
-sctp_auth_get_cookie_params(struct sctp_tcb *stcb, struct mbuf *m,
-    uint32_t offset, uint32_t length);
-extern void 
-sctp_fill_hmac_digest_m(struct mbuf *m, uint32_t auth_offset,
-    struct sctp_auth_chunk *auth, struct sctp_tcb *stcb, uint16_t key_id);
-extern struct mbuf *
-sctp_add_auth_chunk(struct mbuf *m, struct mbuf **m_end,
-    struct sctp_auth_chunk **auth_ret, uint32_t * offset,
-    struct sctp_tcb *stcb, uint8_t chunk);
-extern int 
-sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *ch,
-    struct mbuf *m, uint32_t offset);
-extern void 
-sctp_notify_authentication(struct sctp_tcb *stcb,
-    uint32_t indication, uint16_t keyid, uint16_t alt_keyid, int so_locked);
-extern int 
-sctp_validate_init_auth_params(struct mbuf *m, int offset,
-    int limit);
-extern void 
-sctp_initialize_auth_params(struct sctp_inpcb *inp,
-    struct sctp_tcb *stcb);
-
-/* test functions */
-#endif				/* __SCTP_AUTH_H__ */
diff --git a/include.new/netinet/sctp_bsd_addr.h b/include.new/netinet/sctp_bsd_addr.h
deleted file mode 100644
index 4581ce2..0000000
--- a/include.new/netinet/sctp_bsd_addr.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_bsd_addr.h 237540 2012-06-24 21:25:54Z tuexen $");
-
-#ifndef _NETINET_SCTP_BSD_ADDR_H_
-#define _NETINET_SCTP_BSD_ADDR_H_
-
-#include <netinet/sctp_pcb.h>
-
-#if defined(_KERNEL) || defined(__Userspace__)
-
-extern struct iterator_control sctp_it_ctl;
-void sctp_wakeup_iterator(void);
-
-void sctp_startup_iterator(void);
-
-
-#ifdef INET6
-void sctp_gather_internal_ifa_flags(struct sctp_ifa *ifa);
-
-#endif
-
-#ifdef  SCTP_PACKET_LOGGING
-
-void sctp_packet_log(struct mbuf *m);
-int sctp_copy_out_packet_log(uint8_t * target, int length);
-
-#endif
-
-void sctp_addr_change(struct ifaddr *ifa, int cmd);
-
-void sctp_add_or_del_interfaces(int (*pred) (struct ifnet *), int add);
-
-#endif
-#endif
diff --git a/include.new/netinet/sctp_constants.h b/include.new/netinet/sctp_constants.h
deleted file mode 100644
index 7757fb6..0000000
--- a/include.new/netinet/sctp_constants.h
+++ /dev/null
@@ -1,1038 +0,0 @@
-/*-
- * Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_constants.h 283822 2015-05-31 12:46:40Z tuexen $");
-
-#ifndef _NETINET_SCTP_CONSTANTS_H_
-#define _NETINET_SCTP_CONSTANTS_H_
-
-
-/* IANA assigned port number for SCTP over UDP encapsulation */
-#define SCTP_OVER_UDP_TUNNELING_PORT 9899
-
-/* Number of packets to get before sack sent by default */
-#define SCTP_DEFAULT_SACK_FREQ 2
-
-/* Address limit - This variable is calculated
- * based on an 65535 byte max ip packet. We take out 100 bytes
- * for the cookie, 40 bytes for a v6 header and 32
- * bytes for the init structure. A second init structure
- * for the init-ack and then finally a third one for the
- * imbedded init. This yeilds 100+40+(3 * 32) = 236 bytes.
- * This leaves 65299 bytes for addresses. We throw out the 299 bytes.
- * Now whatever we send in the INIT() we need to allow to get back in the
- * INIT-ACK plus all the values from INIT and INIT-ACK
- * listed in the cookie. Plus we need some overhead for
- * maybe copied parameters in the COOKIE. If we
- * allow 1080 addresses, and each side has 1080 V6 addresses
- * that will be 21600 bytes. In the INIT-ACK we will
- * see the INIT-ACK 21600 + 43200 in the cookie. This leaves
- * about 500 bytes slack for misc things in the cookie.
- */
-#define SCTP_ADDRESS_LIMIT 1080
-
-/* We need at least 2k of space for us, inits
- * larger than that lets abort.
- */
-#define SCTP_LARGEST_INIT_ACCEPTED (65535 - 2048)
-
-/* Number of addresses where we just skip the counting */
-#define SCTP_COUNT_LIMIT 40
-
-#define SCTP_ZERO_COPY_TICK_DELAY (((100 * hz) + 999) / 1000)
-#define SCTP_ZERO_COPY_SENDQ_TICK_DELAY (((100 * hz) + 999) / 1000)
-
-/* Number of ticks to delay before running
- * iterator on an address change.
- */
-#define SCTP_ADDRESS_TICK_DELAY 2
-
-#define SCTP_VERSION_STRING "KAME-BSD 1.1"
-/* #define SCTP_AUDITING_ENABLED 1 used for debug/auditing */
-#define SCTP_AUDIT_SIZE 256
-
-
-#define SCTP_KTRHEAD_NAME "sctp_iterator"
-#define SCTP_KTHREAD_PAGES 0
-
-#define SCTP_MCORE_NAME "sctp_core_worker"
-
-
-/* If you support Multi-VRF how big to
- * make the initial array of VRF's to.
- */
-#define SCTP_DEFAULT_VRF_SIZE 4
-
-/* constants for rto calc */
-#define sctp_align_safe_nocopy 0
-#define sctp_align_unsafe_makecopy 1
-
-/* JRS - Values defined for the HTCP algorithm */
-#define ALPHA_BASE	(1<<7)	/* 1.0 with shift << 7 */
-#define BETA_MIN	(1<<6)	/* 0.5 with shift << 7 */
-#define BETA_MAX	102	/* 0.8 with shift << 7 */
-
-/* Places that CWND log can happen from */
-#define SCTP_CWND_LOG_FROM_FR	1
-#define SCTP_CWND_LOG_FROM_RTX	2
-#define SCTP_CWND_LOG_FROM_BRST	3
-#define SCTP_CWND_LOG_FROM_SS	4
-#define SCTP_CWND_LOG_FROM_CA	5
-#define SCTP_CWND_LOG_FROM_SAT	6
-#define SCTP_BLOCK_LOG_INTO_BLK 7
-#define SCTP_BLOCK_LOG_OUTOF_BLK 8
-#define SCTP_BLOCK_LOG_CHECK     9
-#define SCTP_STR_LOG_FROM_INTO_STRD 10
-#define SCTP_STR_LOG_FROM_IMMED_DEL 11
-#define SCTP_STR_LOG_FROM_INSERT_HD 12
-#define SCTP_STR_LOG_FROM_INSERT_MD 13
-#define SCTP_STR_LOG_FROM_INSERT_TL 14
-#define SCTP_STR_LOG_FROM_MARK_TSN  15
-#define SCTP_STR_LOG_FROM_EXPRS_DEL 16
-#define SCTP_FR_LOG_BIGGEST_TSNS    17
-#define SCTP_FR_LOG_STRIKE_TEST     18
-#define SCTP_FR_LOG_STRIKE_CHUNK    19
-#define SCTP_FR_T3_TIMEOUT          20
-#define SCTP_MAP_PREPARE_SLIDE      21
-#define SCTP_MAP_SLIDE_FROM         22
-#define SCTP_MAP_SLIDE_RESULT       23
-#define SCTP_MAP_SLIDE_CLEARED	    24
-#define SCTP_MAP_SLIDE_NONE         25
-#define SCTP_FR_T3_MARK_TIME        26
-#define SCTP_FR_T3_MARKED           27
-#define SCTP_FR_T3_STOPPED          28
-#define SCTP_FR_MARKED              30
-#define SCTP_CWND_LOG_NOADV_SS      31
-#define SCTP_CWND_LOG_NOADV_CA      32
-#define SCTP_MAX_BURST_APPLIED      33
-#define SCTP_MAX_IFP_APPLIED        34
-#define SCTP_MAX_BURST_ERROR_STOP   35
-#define SCTP_INCREASE_PEER_RWND     36
-#define SCTP_DECREASE_PEER_RWND     37
-#define SCTP_SET_PEER_RWND_VIA_SACK 38
-#define SCTP_LOG_MBCNT_INCREASE     39
-#define SCTP_LOG_MBCNT_DECREASE     40
-#define SCTP_LOG_MBCNT_CHKSET       41
-#define SCTP_LOG_NEW_SACK           42
-#define SCTP_LOG_TSN_ACKED          43
-#define SCTP_LOG_TSN_REVOKED        44
-#define SCTP_LOG_LOCK_TCB           45
-#define SCTP_LOG_LOCK_INP           46
-#define SCTP_LOG_LOCK_SOCK          47
-#define SCTP_LOG_LOCK_SOCKBUF_R     48
-#define SCTP_LOG_LOCK_SOCKBUF_S     49
-#define SCTP_LOG_LOCK_CREATE        50
-#define SCTP_LOG_INITIAL_RTT        51
-#define SCTP_LOG_RTTVAR             52
-#define SCTP_LOG_SBALLOC            53
-#define SCTP_LOG_SBFREE             54
-#define SCTP_LOG_SBRESULT           55
-#define SCTP_FR_DUPED               56
-#define SCTP_FR_MARKED_EARLY        57
-#define SCTP_FR_CWND_REPORT         58
-#define SCTP_FR_CWND_REPORT_START   59
-#define SCTP_FR_CWND_REPORT_STOP    60
-#define SCTP_CWND_LOG_FROM_SEND     61
-#define SCTP_CWND_INITIALIZATION    62
-#define SCTP_CWND_LOG_FROM_T3       63
-#define SCTP_CWND_LOG_FROM_SACK     64
-#define SCTP_CWND_LOG_NO_CUMACK     65
-#define SCTP_CWND_LOG_FROM_RESEND   66
-#define SCTP_FR_LOG_CHECK_STRIKE    67
-#define SCTP_SEND_NOW_COMPLETES     68
-#define SCTP_CWND_LOG_FILL_OUTQ_CALLED 69
-#define SCTP_CWND_LOG_FILL_OUTQ_FILLS  70
-#define SCTP_LOG_FREE_SENT             71
-#define SCTP_NAGLE_APPLIED          72
-#define SCTP_NAGLE_SKIPPED          73
-#define SCTP_WAKESND_FROM_SACK      74
-#define SCTP_WAKESND_FROM_FWDTSN    75
-#define SCTP_NOWAKE_FROM_SACK       76
-#define SCTP_CWNDLOG_PRESEND        77
-#define SCTP_CWNDLOG_ENDSEND        78
-#define SCTP_AT_END_OF_SACK         79
-#define SCTP_REASON_FOR_SC          80
-#define SCTP_BLOCK_LOG_INTO_BLKA    81
-#define SCTP_ENTER_USER_RECV        82
-#define SCTP_USER_RECV_SACKS        83
-#define SCTP_SORECV_BLOCKSA         84
-#define SCTP_SORECV_BLOCKSB         85
-#define SCTP_SORECV_DONE            86
-#define SCTP_SACK_RWND_UPDATE       87
-#define SCTP_SORECV_ENTER           88
-#define SCTP_SORECV_ENTERPL         89
-#define SCTP_MBUF_INPUT             90
-#define SCTP_MBUF_IALLOC            91
-#define SCTP_MBUF_IFREE             92
-#define SCTP_MBUF_ICOPY             93
-#define SCTP_MBUF_SPLIT             94
-#define SCTP_SORCV_FREECTL          95
-#define SCTP_SORCV_DOESCPY          96
-#define SCTP_SORCV_DOESLCK          97
-#define SCTP_SORCV_DOESADJ          98
-#define SCTP_SORCV_BOTWHILE         99
-#define SCTP_SORCV_PASSBF          100
-#define SCTP_SORCV_ADJD            101
-#define SCTP_UNKNOWN_MAX           102
-#define SCTP_RANDY_STUFF           103
-#define SCTP_RANDY_STUFF1          104
-#define SCTP_STRMOUT_LOG_ASSIGN	   105
-#define SCTP_STRMOUT_LOG_SEND	   106
-#define SCTP_FLIGHT_LOG_DOWN_CA    107
-#define SCTP_FLIGHT_LOG_UP         108
-#define SCTP_FLIGHT_LOG_DOWN_GAP   109
-#define SCTP_FLIGHT_LOG_DOWN_RSND  110
-#define SCTP_FLIGHT_LOG_UP_RSND    111
-#define SCTP_FLIGHT_LOG_DOWN_RSND_TO    112
-#define SCTP_FLIGHT_LOG_DOWN_WP    113
-#define SCTP_FLIGHT_LOG_UP_REVOKE  114
-#define SCTP_FLIGHT_LOG_DOWN_PDRP  115
-#define SCTP_FLIGHT_LOG_DOWN_PMTU  116
-#define SCTP_SACK_LOG_NORMAL	   117
-#define SCTP_SACK_LOG_EXPRESS	   118
-#define SCTP_MAP_TSN_ENTERS        119
-#define SCTP_THRESHOLD_CLEAR       120
-#define SCTP_THRESHOLD_INCR        121
-#define SCTP_FLIGHT_LOG_DWN_WP_FWD 122
-#define SCTP_FWD_TSN_CHECK         123
-#define SCTP_LOG_MAX_TYPES 124
-/*
- * To turn on various logging, you must first enable 'options KTR' and
- * you might want to bump the entires 'options KTR_ENTRIES=80000'.
- * To get something to log you define one of the logging defines.
- * (see LINT).
- *
- * This gets the compile in place, but you still need to turn the
- * logging flag on too in the sysctl (see in sctp.h).
- */
-
-#define SCTP_LOG_EVENT_UNKNOWN 0
-#define SCTP_LOG_EVENT_CWND  1
-#define SCTP_LOG_EVENT_BLOCK 2
-#define SCTP_LOG_EVENT_STRM  3
-#define SCTP_LOG_EVENT_FR    4
-#define SCTP_LOG_EVENT_MAP   5
-#define SCTP_LOG_EVENT_MAXBURST 6
-#define SCTP_LOG_EVENT_RWND  7
-#define SCTP_LOG_EVENT_MBCNT 8
-#define SCTP_LOG_EVENT_SACK  9
-#define SCTP_LOG_LOCK_EVENT 10
-#define SCTP_LOG_EVENT_RTT  11
-#define SCTP_LOG_EVENT_SB   12
-#define SCTP_LOG_EVENT_NAGLE 13
-#define SCTP_LOG_EVENT_WAKE 14
-#define SCTP_LOG_MISC_EVENT 15
-#define SCTP_LOG_EVENT_CLOSE 16
-#define SCTP_LOG_EVENT_MBUF 17
-#define SCTP_LOG_CHUNK_PROC 18
-#define SCTP_LOG_ERROR_RET  19
-
-#define SCTP_LOG_MAX_EVENT 20
-
-#define SCTP_LOCK_UNKNOWN 2
-
-
-/* number of associations by default for zone allocation */
-#define SCTP_MAX_NUM_OF_ASOC	40000
-/* how many addresses per assoc remote and local */
-#define SCTP_SCALE_FOR_ADDR	2
-
-/* default MULTIPLE_ASCONF mode enable(1)/disable(0) value (sysctl) */
-#define SCTP_DEFAULT_MULTIPLE_ASCONFS	0
-
-/*
- * Theshold for rwnd updates, we have to read (sb_hiwat >>
- * SCTP_RWND_HIWAT_SHIFT) before we will look to see if we need to send a
- * window update sack. When we look, we compare the last rwnd we sent vs the
- * current rwnd. It too must be greater than this value. Using 3 divdes the
- * hiwat by 8, so for 200k rwnd we need to read 24k. For a 64k rwnd we need
- * to read 8k. This seems about right.. I hope :-D.. we do set a
- * min of a MTU on it so if the rwnd is real small we will insist
- * on a full MTU of 1500 bytes.
- */
-#define SCTP_RWND_HIWAT_SHIFT 3
-
-/* How much of the rwnd must the
- * message be taking up to start partial delivery.
- * We calculate this by shifing the hi_water (recv_win)
- * left the following .. set to 1, when a message holds
- * 1/2 the rwnd. If we set it to 2 when a message holds
- * 1/4 the rwnd...etc..
- */
-
-#define SCTP_PARTIAL_DELIVERY_SHIFT 1
-
-/*
- * default HMAC for cookies, etc... use one of the AUTH HMAC id's
- * SCTP_HMAC is the HMAC_ID to use
- * SCTP_SIGNATURE_SIZE is the digest length
- */
-#define SCTP_HMAC		SCTP_AUTH_HMAC_ID_SHA1
-#define SCTP_SIGNATURE_SIZE	SCTP_AUTH_DIGEST_LEN_SHA1
-#define SCTP_SIGNATURE_ALOC_SIZE SCTP_SIGNATURE_SIZE
-
-/*
- * the SCTP protocol signature this includes the version number encoded in
- * the last 4 bits of the signature.
- */
-#define PROTO_SIGNATURE_A	0x30000000
-#define SCTP_VERSION_NUMBER	0x3
-
-#define MAX_TSN	0xffffffff
-
-/* how many executions every N tick's */
-#define SCTP_ITERATOR_MAX_AT_ONCE 20
-
-/* number of clock ticks between iterator executions */
-#define SCTP_ITERATOR_TICKS 1
-
-/*
- * option: If you comment out the following you will receive the old behavior
- * of obeying cwnd for the fast retransmit algorithm. With this defined a FR
- * happens right away with-out waiting for the flightsize to drop below the
- * cwnd value (which is reduced by the FR to 1/2 the inflight packets).
- */
-#define SCTP_IGNORE_CWND_ON_FR 1
-
-/*
- * Adds implementors guide behavior to only use newest highest update in SACK
- * gap ack's to figure out if you need to stroke a chunk for FR.
- */
-#define SCTP_NO_FR_UNLESS_SEGMENT_SMALLER 1
-
-/* default max I can burst out after a fast retransmit, 0 disables it */
-#define SCTP_DEF_MAX_BURST 4
-#define SCTP_DEF_HBMAX_BURST 4
-#define SCTP_DEF_FRMAX_BURST 4
-
-/* RTO calculation flag to say if it
- * is safe to determine local lan or not.
- */
-#define SCTP_RTT_FROM_NON_DATA 0
-#define SCTP_RTT_FROM_DATA     1
-
-
-/* IP hdr (20/40) + 12+2+2 (enet) + sctp common 12 */
-#define SCTP_FIRST_MBUF_RESV 68
-/* Packet transmit states in the sent field */
-#define SCTP_DATAGRAM_UNSENT		0
-#define SCTP_DATAGRAM_SENT		1
-#define SCTP_DATAGRAM_RESEND1		2	/* not used (in code, but may
-						 * hit this value) */
-#define SCTP_DATAGRAM_RESEND2		3	/* not used (in code, but may
-						 * hit this value) */
-#define SCTP_DATAGRAM_RESEND		4
-#define SCTP_DATAGRAM_ACKED		10010
-#define SCTP_DATAGRAM_MARKED		20010
-#define SCTP_FORWARD_TSN_SKIP		30010
-#define SCTP_DATAGRAM_NR_ACKED		40010
-
-/* chunk output send from locations */
-#define SCTP_OUTPUT_FROM_USR_SEND       0
-#define SCTP_OUTPUT_FROM_T3       	1
-#define SCTP_OUTPUT_FROM_INPUT_ERROR    2
-#define SCTP_OUTPUT_FROM_CONTROL_PROC   3
-#define SCTP_OUTPUT_FROM_SACK_TMR       4
-#define SCTP_OUTPUT_FROM_SHUT_TMR       5
-#define SCTP_OUTPUT_FROM_HB_TMR         6
-#define SCTP_OUTPUT_FROM_SHUT_ACK_TMR   7
-#define SCTP_OUTPUT_FROM_ASCONF_TMR     8
-#define SCTP_OUTPUT_FROM_STRRST_TMR     9
-#define SCTP_OUTPUT_FROM_AUTOCLOSE_TMR  10
-#define SCTP_OUTPUT_FROM_EARLY_FR_TMR   11
-#define SCTP_OUTPUT_FROM_STRRST_REQ     12
-#define SCTP_OUTPUT_FROM_USR_RCVD       13
-#define SCTP_OUTPUT_FROM_COOKIE_ACK     14
-#define SCTP_OUTPUT_FROM_DRAIN          15
-#define SCTP_OUTPUT_FROM_CLOSING        16
-#define SCTP_OUTPUT_FROM_SOCKOPT        17
-
-/* SCTP chunk types are moved sctp.h for application (NAT, FW) use */
-
-/* align to 32-bit sizes */
-#define SCTP_SIZE32(x)	((((x) + 3) >> 2) << 2)
-
-#define IS_SCTP_CONTROL(a) ((a)->chunk_type != SCTP_DATA)
-#define IS_SCTP_DATA(a) ((a)->chunk_type == SCTP_DATA)
-
-
-/* SCTP parameter types */
-/*************0x0000 series*************/
-#define SCTP_HEARTBEAT_INFO		0x0001
-#define SCTP_IPV4_ADDRESS		0x0005
-#define SCTP_IPV6_ADDRESS		0x0006
-#define SCTP_STATE_COOKIE		0x0007
-#define SCTP_UNRECOG_PARAM		0x0008
-#define SCTP_COOKIE_PRESERVE		0x0009
-#define SCTP_HOSTNAME_ADDRESS		0x000b
-#define SCTP_SUPPORTED_ADDRTYPE		0x000c
-
-/* draft-ietf-stewart-tsvwg-strreset-xxx */
-#define SCTP_STR_RESET_OUT_REQUEST	0x000d
-#define SCTP_STR_RESET_IN_REQUEST	0x000e
-#define SCTP_STR_RESET_TSN_REQUEST	0x000f
-#define SCTP_STR_RESET_RESPONSE		0x0010
-#define SCTP_STR_RESET_ADD_OUT_STREAMS	0x0011
-#define SCTP_STR_RESET_ADD_IN_STREAMS   0x0012
-
-#define SCTP_MAX_RESET_PARAMS 2
-#define SCTP_STREAM_RESET_TSN_DELTA    0x1000
-
-/*************0x4000 series*************/
-
-/*************0x8000 series*************/
-#define SCTP_ECN_CAPABLE		0x8000
-
-/* draft-ietf-tsvwg-auth-xxx */
-#define SCTP_RANDOM			0x8002
-#define SCTP_CHUNK_LIST			0x8003
-#define SCTP_HMAC_LIST			0x8004
-/*
- * draft-ietf-tsvwg-addip-sctp-xx param=0x8008  len=0xNNNN Byte | Byte | Byte
- * | Byte Byte | Byte ...
- *
- * Where each byte is a chunk type extension supported. For example, to support
- * all chunks one would have (in hex):
- *
- * 80 01 00 09 C0 C1 80 81 82 00 00 00
- *
- * Has the parameter. C0 = PR-SCTP    (RFC3758) C1, 80 = ASCONF (addip draft) 81
- * = Packet Drop 82 = Stream Reset 83 = Authentication
- */
-#define SCTP_SUPPORTED_CHUNK_EXT    0x8008
-
-/*************0xC000 series*************/
-#define SCTP_PRSCTP_SUPPORTED		0xc000
-/* draft-ietf-tsvwg-addip-sctp */
-#define SCTP_ADD_IP_ADDRESS		0xc001
-#define SCTP_DEL_IP_ADDRESS		0xc002
-#define SCTP_ERROR_CAUSE_IND		0xc003
-#define SCTP_SET_PRIM_ADDR		0xc004
-#define SCTP_SUCCESS_REPORT		0xc005
-#define SCTP_ULP_ADAPTATION		0xc006
-/* behave-nat-draft */
-#define SCTP_HAS_NAT_SUPPORT            0xc007
-#define SCTP_NAT_VTAGS                  0xc008
-
-/* bits for TOS field */
-#define SCTP_ECT0_BIT		0x02
-#define SCTP_ECT1_BIT		0x01
-#define SCTP_CE_BITS		0x03
-
-/* below turns off above */
-#define SCTP_FLEXIBLE_ADDRESS	0x20
-#define SCTP_NO_HEARTBEAT	0x40
-
-/* mask to get sticky */
-#define SCTP_STICKY_OPTIONS_MASK	0x0c
-
-
-/*
- * SCTP states for internal state machine XXX (should match "user" values)
- */
-#define SCTP_STATE_EMPTY		0x0000
-#define SCTP_STATE_INUSE		0x0001
-#define SCTP_STATE_COOKIE_WAIT		0x0002
-#define SCTP_STATE_COOKIE_ECHOED	0x0004
-#define SCTP_STATE_OPEN			0x0008
-#define SCTP_STATE_SHUTDOWN_SENT	0x0010
-#define SCTP_STATE_SHUTDOWN_RECEIVED	0x0020
-#define SCTP_STATE_SHUTDOWN_ACK_SENT	0x0040
-#define SCTP_STATE_SHUTDOWN_PENDING	0x0080
-#define SCTP_STATE_CLOSED_SOCKET	0x0100
-#define SCTP_STATE_ABOUT_TO_BE_FREED    0x0200
-#define SCTP_STATE_PARTIAL_MSG_LEFT     0x0400
-#define SCTP_STATE_WAS_ABORTED          0x0800
-#define SCTP_STATE_IN_ACCEPT_QUEUE      0x1000
-#define SCTP_STATE_MASK			0x007f
-
-#define SCTP_GET_STATE(asoc)	((asoc)->state & SCTP_STATE_MASK)
-#define SCTP_SET_STATE(asoc, newstate)  ((asoc)->state = ((asoc)->state & ~SCTP_STATE_MASK) |  newstate)
-#define SCTP_CLEAR_SUBSTATE(asoc, substate) ((asoc)->state &= ~substate)
-#define SCTP_ADD_SUBSTATE(asoc, substate) ((asoc)->state |= substate)
-
-/* SCTP reachability state for each address */
-#define SCTP_ADDR_REACHABLE		0x001
-#define SCTP_ADDR_NO_PMTUD              0x002
-#define SCTP_ADDR_NOHB			0x004
-#define SCTP_ADDR_BEING_DELETED		0x008
-#define SCTP_ADDR_NOT_IN_ASSOC		0x010
-#define SCTP_ADDR_OUT_OF_SCOPE		0x080
-#define SCTP_ADDR_UNCONFIRMED		0x200
-#define SCTP_ADDR_REQ_PRIMARY           0x400
-/* JRS 5/13/07 - Added potentially failed state for CMT PF */
-#define SCTP_ADDR_PF                    0x800
-
-/* bound address types (e.g. valid address types to allow) */
-#define SCTP_BOUND_V6		0x01
-#define SCTP_BOUND_V4		0x02
-
-/*
- * what is the default number of mbufs in a chain I allow before switching to
- * a cluster
- */
-#define SCTP_DEFAULT_MBUFS_IN_CHAIN 5
-
-/* How long a cookie lives in milli-seconds */
-#define SCTP_DEFAULT_COOKIE_LIFE	60000
-
-/* Maximum the mapping array will  grow to (TSN mapping array) */
-#define SCTP_MAPPING_ARRAY	512
-
-/* size of the inital malloc on the mapping array */
-#define SCTP_INITIAL_MAPPING_ARRAY  16
-/* how much we grow the mapping array each call */
-#define SCTP_MAPPING_ARRAY_INCR     32
-
-/*
- * Here we define the timer types used by the implementation as arguments in
- * the set/get timer type calls.
- */
-#define SCTP_TIMER_INIT 	0
-#define SCTP_TIMER_RECV 	1
-#define SCTP_TIMER_SEND 	2
-#define SCTP_TIMER_HEARTBEAT	3
-#define SCTP_TIMER_PMTU		4
-#define SCTP_TIMER_MAXSHUTDOWN	5
-#define SCTP_TIMER_SIGNATURE	6
-/*
- * number of timer types in the base SCTP structure used in the set/get and
- * has the base default.
- */
-#define SCTP_NUM_TMRS	7
-
-/* timer types */
-#define SCTP_TIMER_TYPE_NONE		0
-#define SCTP_TIMER_TYPE_SEND		1
-#define SCTP_TIMER_TYPE_INIT		2
-#define SCTP_TIMER_TYPE_RECV		3
-#define SCTP_TIMER_TYPE_SHUTDOWN	4
-#define SCTP_TIMER_TYPE_HEARTBEAT	5
-#define SCTP_TIMER_TYPE_COOKIE		6
-#define SCTP_TIMER_TYPE_NEWCOOKIE	7
-#define SCTP_TIMER_TYPE_PATHMTURAISE	8
-#define SCTP_TIMER_TYPE_SHUTDOWNACK	9
-#define SCTP_TIMER_TYPE_ASCONF		10
-#define SCTP_TIMER_TYPE_SHUTDOWNGUARD	11
-#define SCTP_TIMER_TYPE_AUTOCLOSE	12
-#define SCTP_TIMER_TYPE_EVENTWAKE	13
-#define SCTP_TIMER_TYPE_STRRESET        14
-#define SCTP_TIMER_TYPE_INPKILL         15
-#define SCTP_TIMER_TYPE_ASOCKILL        16
-#define SCTP_TIMER_TYPE_ADDR_WQ         17
-#define SCTP_TIMER_TYPE_ZERO_COPY       18
-#define SCTP_TIMER_TYPE_ZCOPY_SENDQ     19
-#define SCTP_TIMER_TYPE_PRIM_DELETED    20
-/* add new timers here - and increment LAST */
-#define SCTP_TIMER_TYPE_LAST            21
-
-#define SCTP_IS_TIMER_TYPE_VALID(t)	(((t) > SCTP_TIMER_TYPE_NONE) && \
-					 ((t) < SCTP_TIMER_TYPE_LAST))
-
-
-
-/* max number of TSN's dup'd that I will hold */
-#define SCTP_MAX_DUP_TSNS	20
-
-/*
- * Here we define the types used when setting the retry amounts.
- */
-/* How many drop re-attempts we make on  INIT/COOKIE-ECHO */
-#define SCTP_RETRY_DROPPED_THRESH 4
-
-/*
- * Maxmium number of chunks a single association can have on it. Note that
- * this is a squishy number since the count can run over this if the user
- * sends a large message down .. the fragmented chunks don't count until
- * AFTER the message is on queue.. it would be the next send that blocks
- * things. This number will get tuned up at boot in the sctp_init and use the
- * number of clusters as a base. This way high bandwidth environments will
- * not get impacted by the lower bandwidth sending a bunch of 1 byte chunks
- */
-#define SCTP_ASOC_MAX_CHUNKS_ON_QUEUE 512
-
-
-/* The conversion from time to ticks and vice versa is done by rounding
- * upwards. This way we can test in the code the time to be positive and
- * know that this corresponds to a positive number of ticks.
- */
-#define MSEC_TO_TICKS(x) ((hz == 1000) ? x : ((((x) * hz) + 999) / 1000))
-#define TICKS_TO_MSEC(x) ((hz == 1000) ? x : ((((x) * 1000) + (hz - 1)) / hz))
-
-#define SEC_TO_TICKS(x) ((x) * hz)
-#define TICKS_TO_SEC(x) (((x) + (hz - 1)) / hz)
-
-/*
- * Basically the minimum amount of time before I do a early FR. Making this
- * value to low will cause duplicate retransmissions.
- */
-#define SCTP_MINFR_MSEC_TIMER 250
-/* The floor this value is allowed to fall to when starting a timer. */
-#define SCTP_MINFR_MSEC_FLOOR 20
-
-/* init timer def = 1 sec */
-#define SCTP_INIT_SEC	1
-
-/* send timer def = 1 seconds */
-#define SCTP_SEND_SEC	1
-
-/* recv timer def = 200ms  */
-#define SCTP_RECV_MSEC	200
-
-/* 30 seconds + RTO (in ms) */
-#define SCTP_HB_DEFAULT_MSEC	30000
-
-/* Max time I will wait for Shutdown to complete */
-#define SCTP_DEF_MAX_SHUTDOWN_SEC 180
-
-
-/*
- * This is how long a secret lives, NOT how long a cookie lives how many
- * ticks the current secret will live.
- */
-#define SCTP_DEFAULT_SECRET_LIFE_SEC 3600
-
-#define SCTP_RTO_UPPER_BOUND	(60000)	/* 60 sec in ms */
-#define SCTP_RTO_LOWER_BOUND	(1000)	/* 1 sec is ms */
-#define SCTP_RTO_INITIAL	(3000)	/* 3 sec in ms */
-
-
-#define SCTP_INP_KILL_TIMEOUT 20/* number of ms to retry kill of inpcb */
-#define SCTP_ASOC_KILL_TIMEOUT 10	/* number of ms to retry kill of inpcb */
-
-#define SCTP_DEF_MAX_INIT		8
-#define SCTP_DEF_MAX_SEND		10
-#define SCTP_DEF_MAX_PATH_RTX		5
-#define SCTP_DEF_PATH_PF_THRESHOLD	SCTP_DEF_MAX_PATH_RTX
-
-#define SCTP_DEF_PMTU_RAISE_SEC	600	/* 10 min between raise attempts */
-
-
-/* How many streams I request initally by default */
-#define SCTP_OSTREAM_INITIAL 10
-#define SCTP_ISTREAM_INITIAL 2048
-
-/*
- * How many smallest_mtu's need to increase before a window update sack is
- * sent (should be a power of 2).
- */
-/* Send window update (incr * this > hiwat). Should be a power of 2 */
-#define SCTP_MINIMAL_RWND		(4096)	/* minimal rwnd */
-
-#define SCTP_ADDRMAX		16
-
-/* SCTP DEBUG Switch parameters */
-#define SCTP_DEBUG_TIMER1	0x00000001
-#define SCTP_DEBUG_TIMER2	0x00000002	/* unused */
-#define SCTP_DEBUG_TIMER3	0x00000004	/* unused */
-#define SCTP_DEBUG_TIMER4	0x00000008
-#define SCTP_DEBUG_OUTPUT1	0x00000010
-#define SCTP_DEBUG_OUTPUT2	0x00000020
-#define SCTP_DEBUG_OUTPUT3	0x00000040
-#define SCTP_DEBUG_OUTPUT4	0x00000080
-#define SCTP_DEBUG_UTIL1	0x00000100
-#define SCTP_DEBUG_UTIL2	0x00000200	/* unused */
-#define SCTP_DEBUG_AUTH1	0x00000400
-#define SCTP_DEBUG_AUTH2	0x00000800	/* unused */
-#define SCTP_DEBUG_INPUT1	0x00001000
-#define SCTP_DEBUG_INPUT2	0x00002000
-#define SCTP_DEBUG_INPUT3	0x00004000
-#define SCTP_DEBUG_INPUT4	0x00008000	/* unused */
-#define SCTP_DEBUG_ASCONF1	0x00010000
-#define SCTP_DEBUG_ASCONF2	0x00020000
-#define SCTP_DEBUG_OUTPUT5	0x00040000	/* unused */
-#define SCTP_DEBUG_XXX		0x00080000	/* unused */
-#define SCTP_DEBUG_PCB1		0x00100000
-#define SCTP_DEBUG_PCB2		0x00200000	/* unused */
-#define SCTP_DEBUG_PCB3		0x00400000
-#define SCTP_DEBUG_PCB4		0x00800000
-#define SCTP_DEBUG_INDATA1	0x01000000
-#define SCTP_DEBUG_INDATA2	0x02000000	/* unused */
-#define SCTP_DEBUG_INDATA3	0x04000000	/* unused */
-#define SCTP_DEBUG_CRCOFFLOAD	0x08000000	/* unused */
-#define SCTP_DEBUG_USRREQ1	0x10000000	/* unused */
-#define SCTP_DEBUG_USRREQ2	0x20000000	/* unused */
-#define SCTP_DEBUG_PEEL1	0x40000000
-#define SCTP_DEBUG_XXXXX	0x80000000	/* unused */
-#define SCTP_DEBUG_ALL		0x7ff3ffff
-#define SCTP_DEBUG_NOISY	0x00040000
-
-/* What sender needs to see to avoid SWS or we consider peers rwnd 0 */
-#define SCTP_SWS_SENDER_DEF	1420
-
-/*
- * SWS is scaled to the sb_hiwat of the socket. A value of 2 is hiwat/4, 1
- * would be hiwat/2 etc.
- */
-/* What receiver needs to see in sockbuf or we tell peer its 1 */
-#define SCTP_SWS_RECEIVER_DEF	3000
-
-#define SCTP_INITIAL_CWND 4380
-
-#define SCTP_DEFAULT_MTU 1500	/* emergency default MTU */
-/* amount peer is obligated to have in rwnd or I will abort */
-#define SCTP_MIN_RWND	1500
-
-#define SCTP_DEFAULT_MAXSEGMENT 65535
-
-#define SCTP_CHUNK_BUFFER_SIZE	512
-#define SCTP_PARAM_BUFFER_SIZE	512
-
-/* small chunk store for looking at chunk_list in auth */
-#define SCTP_SMALL_CHUNK_STORE 260
-
-#define SCTP_HOW_MANY_SECRETS	2	/* how many secrets I keep */
-
-#define SCTP_NUMBER_OF_SECRETS	8	/* or 8 * 4 = 32 octets */
-#define SCTP_SECRET_SIZE	32	/* number of octets in a 256 bits */
-
-
-/*
- * SCTP upper layer notifications
- */
-#define SCTP_NOTIFY_ASSOC_UP                     1
-#define SCTP_NOTIFY_ASSOC_DOWN                   2
-#define SCTP_NOTIFY_INTERFACE_DOWN               3
-#define SCTP_NOTIFY_INTERFACE_UP                 4
-#define SCTP_NOTIFY_SENT_DG_FAIL                 5
-#define SCTP_NOTIFY_UNSENT_DG_FAIL               6
-#define SCTP_NOTIFY_SPECIAL_SP_FAIL              7
-#define SCTP_NOTIFY_ASSOC_LOC_ABORTED            8
-#define SCTP_NOTIFY_ASSOC_REM_ABORTED            9
-#define SCTP_NOTIFY_ASSOC_RESTART               10
-#define SCTP_NOTIFY_PEER_SHUTDOWN               11
-#define SCTP_NOTIFY_ASCONF_ADD_IP               12
-#define SCTP_NOTIFY_ASCONF_DELETE_IP            13
-#define SCTP_NOTIFY_ASCONF_SET_PRIMARY          14
-#define SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION 15
-#define SCTP_NOTIFY_INTERFACE_CONFIRMED         16
-#define SCTP_NOTIFY_STR_RESET_RECV              17
-#define SCTP_NOTIFY_STR_RESET_SEND              18
-#define SCTP_NOTIFY_STR_RESET_FAILED_OUT        19
-#define SCTP_NOTIFY_STR_RESET_FAILED_IN         20
-#define SCTP_NOTIFY_STR_RESET_DENIED_OUT        21
-#define SCTP_NOTIFY_STR_RESET_DENIED_IN         22
-#define SCTP_NOTIFY_AUTH_NEW_KEY                23
-#define SCTP_NOTIFY_AUTH_FREE_KEY               24
-#define SCTP_NOTIFY_NO_PEER_AUTH                25
-#define SCTP_NOTIFY_SENDER_DRY                  26
-#define SCTP_NOTIFY_REMOTE_ERROR                27
-
-/* This is the value for messages that are NOT completely
- * copied down where we will start to split the message.
- * So, with our default, we split only if the piece we
- * want to take will fill up a full MTU (assuming
- * a 1500 byte MTU).
- */
-#define SCTP_DEFAULT_SPLIT_POINT_MIN 2904
-
-/* Maximum length of diagnostic information in error causes */
-#define SCTP_DIAG_INFO_LEN 64
-
-/* ABORT CODES and other tell-tale location
- * codes are generated by adding the below
- * to the instance id.
- */
-
-/* File defines */
-#define SCTP_FROM_SCTP_INPUT        0x10000000
-#define SCTP_FROM_SCTP_PCB          0x20000000
-#define SCTP_FROM_SCTP_INDATA       0x30000000
-#define SCTP_FROM_SCTP_TIMER        0x40000000
-#define SCTP_FROM_SCTP_USRREQ       0x50000000
-#define SCTP_FROM_SCTPUTIL          0x60000000
-#define SCTP_FROM_SCTP6_USRREQ      0x70000000
-#define SCTP_FROM_SCTP_ASCONF       0x80000000
-#define SCTP_FROM_SCTP_OUTPUT       0x90000000
-#define SCTP_FROM_SCTP_PEELOFF      0xa0000000
-#define SCTP_FROM_SCTP_PANDA        0xb0000000
-#define SCTP_FROM_SCTP_SYSCTL       0xc0000000
-#define SCTP_FROM_SCTP_CC_FUNCTIONS 0xd0000000
-
-/* Location ID's */
-#define SCTP_LOC_1  0x00000001
-#define SCTP_LOC_2  0x00000002
-#define SCTP_LOC_3  0x00000003
-#define SCTP_LOC_4  0x00000004
-#define SCTP_LOC_5  0x00000005
-#define SCTP_LOC_6  0x00000006
-#define SCTP_LOC_7  0x00000007
-#define SCTP_LOC_8  0x00000008
-#define SCTP_LOC_9  0x00000009
-#define SCTP_LOC_10 0x0000000a
-#define SCTP_LOC_11 0x0000000b
-#define SCTP_LOC_12 0x0000000c
-#define SCTP_LOC_13 0x0000000d
-#define SCTP_LOC_14 0x0000000e
-#define SCTP_LOC_15 0x0000000f
-#define SCTP_LOC_16 0x00000010
-#define SCTP_LOC_17 0x00000011
-#define SCTP_LOC_18 0x00000012
-#define SCTP_LOC_19 0x00000013
-#define SCTP_LOC_20 0x00000014
-#define SCTP_LOC_21 0x00000015
-#define SCTP_LOC_22 0x00000016
-#define SCTP_LOC_23 0x00000017
-#define SCTP_LOC_24 0x00000018
-#define SCTP_LOC_25 0x00000019
-#define SCTP_LOC_26 0x0000001a
-#define SCTP_LOC_27 0x0000001b
-#define SCTP_LOC_28 0x0000001c
-#define SCTP_LOC_29 0x0000001d
-#define SCTP_LOC_30 0x0000001e
-#define SCTP_LOC_31 0x0000001f
-#define SCTP_LOC_32 0x00000020
-#define SCTP_LOC_33 0x00000021
-#define SCTP_LOC_34 0x00000022
-#define SCTP_LOC_35 0x00000023
-
-
-/* Free assoc codes */
-#define SCTP_NORMAL_PROC      0
-#define SCTP_PCBFREE_NOFORCE  1
-#define SCTP_PCBFREE_FORCE    2
-
-/* From codes for adding addresses */
-#define SCTP_ADDR_IS_CONFIRMED 8
-#define SCTP_ADDR_DYNAMIC_ADDED 6
-#define SCTP_IN_COOKIE_PROC 100
-#define SCTP_ALLOC_ASOC  1
-#define SCTP_LOAD_ADDR_2 2
-#define SCTP_LOAD_ADDR_3 3
-#define SCTP_LOAD_ADDR_4 4
-#define SCTP_LOAD_ADDR_5 5
-
-#define SCTP_DONOT_SETSCOPE 0
-#define SCTP_DO_SETSCOPE 1
-
-
-/* This value determines the default for when
- * we try to add more on the send queue., if
- * there is room. This prevents us from cycling
- * into the copy_resume routine to often if
- * we have not got enough space to add a decent
- * enough size message. Note that if we have enough
- * space to complete the message copy we will always
- * add to the message, no matter what the size. Its
- * only when we reach the point that we have some left
- * to add, there is only room for part of it that we
- * will use this threshold. Its also a sysctl.
- */
-#define SCTP_DEFAULT_ADD_MORE 1452
-
-#ifndef SCTP_PCBHASHSIZE
-/* default number of association hash buckets in each endpoint */
-#define SCTP_PCBHASHSIZE 256
-#endif
-#ifndef SCTP_TCBHASHSIZE
-#define SCTP_TCBHASHSIZE 1024
-#endif
-
-#ifndef SCTP_CHUNKQUEUE_SCALE
-#define SCTP_CHUNKQUEUE_SCALE 10
-#endif
-
-/* clock variance is 1 ms */
-#define SCTP_CLOCK_GRANULARITY	1
-#define IP_HDR_SIZE 40		/* we use the size of a IP6 header here this
-				 * detracts a small amount for ipv4 but it
-				 * simplifies the ipv6 addition */
-
-/* Argument magic number for sctp_inpcb_free() */
-
-/* third argument */
-#define SCTP_CALLED_DIRECTLY_NOCMPSET     0
-#define SCTP_CALLED_AFTER_CMPSET_OFCLOSE  1
-#define SCTP_CALLED_FROM_INPKILL_TIMER    2
-/* second argument */
-#define SCTP_FREE_SHOULD_USE_ABORT          1
-#define SCTP_FREE_SHOULD_USE_GRACEFUL_CLOSE 0
-
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132	/* the Official IANA number :-) */
-#endif				/* !IPPROTO_SCTP */
-
-#define SCTP_MAX_DATA_BUNDLING		256
-
-/* modular comparison */
-/* See RFC 1982 for details. */
-#define SCTP_SSN_GT(a, b) (((a < b) && ((uint16_t)(b - a) > (1U<<15))) || \
-                           ((a > b) && ((uint16_t)(a - b) < (1U<<15))))
-#define SCTP_SSN_GE(a, b) (SCTP_SSN_GT(a, b) || (a == b))
-#define SCTP_TSN_GT(a, b) (((a < b) && ((uint32_t)(b - a) > (1U<<31))) || \
-                           ((a > b) && ((uint32_t)(a - b) < (1U<<31))))
-#define SCTP_TSN_GE(a, b) (SCTP_TSN_GT(a, b) || (a == b))
-
-/* Mapping array manipulation routines */
-#define SCTP_IS_TSN_PRESENT(arry, gap) ((arry[(gap >> 3)] >> (gap & 0x07)) & 0x01)
-#define SCTP_SET_TSN_PRESENT(arry, gap) (arry[(gap >> 3)] |= (0x01 << ((gap & 0x07))))
-#define SCTP_UNSET_TSN_PRESENT(arry, gap) (arry[(gap >> 3)] &= ((~(0x01 << ((gap & 0x07)))) & 0xff))
-#define SCTP_CALC_TSN_TO_GAP(gap, tsn, mapping_tsn) do { \
-	                if (tsn >= mapping_tsn) { \
-						gap = tsn - mapping_tsn; \
-					} else { \
-						gap = (MAX_TSN - mapping_tsn) + tsn + 1; \
-					} \
-                  } while (0)
-
-
-#define SCTP_RETRAN_DONE -1
-#define SCTP_RETRAN_EXIT -2
-
-/*
- * This value defines the number of vtag block time wait entry's per list
- * element.  Each entry will take 2 4 byte ints (and of course the overhead
- * of the next pointer as well). Using 15 as an example will yield * ((8 *
- * 15) + 8) or 128 bytes of overhead for each timewait block that gets
- * initialized. Increasing it to 31 would yeild 256 bytes per block.
- */
-#define SCTP_NUMBER_IN_VTAG_BLOCK 15
-/*
- * If we use the STACK option, we have an array of this size head pointers.
- * This array is mod'd the with the size to find which bucket and then all
- * entries must be searched to see if the tag is in timed wait. If so we
- * reject it.
- */
-#define SCTP_STACK_VTAG_HASH_SIZE   32
-
-/*
- * Number of seconds of time wait for a vtag.
- */
-#define SCTP_TIME_WAIT 60
-
-/* How many micro seconds is the cutoff from
- * local lan type rtt's
- */
- /*
-  * We allow 900us for the rtt.
-  */
-#define SCTP_LOCAL_LAN_RTT 900
-#define SCTP_LAN_UNKNOWN  0
-#define SCTP_LAN_LOCAL    1
-#define SCTP_LAN_INTERNET 2
-
-#define SCTP_SEND_BUFFER_SPLITTING 0x00000001
-#define SCTP_RECV_BUFFER_SPLITTING 0x00000002
-
-/* The system retains a cache of free chunks such to
- * cut down on calls the memory allocation system. There
- * is a per association limit of free items and a overall
- * system limit. If either one gets hit then the resource
- * stops being cached.
- */
-
-#define SCTP_DEF_ASOC_RESC_LIMIT 10
-#define SCTP_DEF_SYSTEM_RESC_LIMIT 1000
-
-/*-
- * defines for socket lock states.
- * Used by __APPLE__ and SCTP_SO_LOCK_TESTING
- */
-#define SCTP_SO_LOCKED		1
-#define SCTP_SO_NOT_LOCKED	0
-
-
-#define SCTP_HOLDS_LOCK 1
-#define SCTP_NOT_LOCKED 0
-
-/*-
- * For address locks, do we hold the lock?
- */
-#define SCTP_ADDR_LOCKED 1
-#define SCTP_ADDR_NOT_LOCKED 0
-
-#define IN4_ISPRIVATE_ADDRESS(a) \
-   ((((uint8_t *)&(a)->s_addr)[0] == 10) || \
-    ((((uint8_t *)&(a)->s_addr)[0] == 172) && \
-     (((uint8_t *)&(a)->s_addr)[1] >= 16) && \
-     (((uint8_t *)&(a)->s_addr)[1] <= 32)) || \
-    ((((uint8_t *)&(a)->s_addr)[0] == 192) && \
-     (((uint8_t *)&(a)->s_addr)[1] == 168)))
-
-#define IN4_ISLOOPBACK_ADDRESS(a) \
-    ((((uint8_t *)&(a)->s_addr)[0] == 127) && \
-     (((uint8_t *)&(a)->s_addr)[1] == 0) && \
-     (((uint8_t *)&(a)->s_addr)[2] == 0) && \
-     (((uint8_t *)&(a)->s_addr)[3] == 1))
-
-#define IN4_ISLINKLOCAL_ADDRESS(a) \
-    ((((uint8_t *)&(a)->s_addr)[0] == 169) && \
-     (((uint8_t *)&(a)->s_addr)[1] == 254))
-
-
-#if defined(_KERNEL)
-#define SCTP_GETTIME_TIMEVAL(x) (getmicrouptime(x))
-#define SCTP_GETPTIME_TIMEVAL(x) (microuptime(x))
-#endif
-
-#if defined(_KERNEL) || defined(__Userspace__)
-#define sctp_sowwakeup(inp, so) \
-do { \
-	if (inp->sctp_flags & SCTP_PCB_FLAGS_DONT_WAKE) { \
-		inp->sctp_flags |= SCTP_PCB_FLAGS_WAKEOUTPUT; \
-	} else { \
-		sowwakeup(so); \
-	} \
-} while (0)
-
-#define sctp_sowwakeup_locked(inp, so) \
-do { \
-	if (inp->sctp_flags & SCTP_PCB_FLAGS_DONT_WAKE) { \
-                SOCKBUF_UNLOCK(&((so)->so_snd)); \
-		inp->sctp_flags |= SCTP_PCB_FLAGS_WAKEOUTPUT; \
-	} else { \
-		sowwakeup_locked(so); \
-	} \
-} while (0)
-
-#define sctp_sorwakeup(inp, so) \
-do { \
-	if (inp->sctp_flags & SCTP_PCB_FLAGS_DONT_WAKE) { \
-		inp->sctp_flags |= SCTP_PCB_FLAGS_WAKEINPUT; \
-	} else { \
-		sorwakeup(so); \
-	} \
-} while (0)
-
-#define sctp_sorwakeup_locked(inp, so) \
-do { \
-	if (inp->sctp_flags & SCTP_PCB_FLAGS_DONT_WAKE) { \
-		inp->sctp_flags |= SCTP_PCB_FLAGS_WAKEINPUT; \
-                SOCKBUF_UNLOCK(&((so)->so_rcv)); \
-	} else { \
-		sorwakeup_locked(so); \
-	} \
-} while (0)
-
-#endif				/* _KERNEL || __Userspace__ */
-#endif
diff --git a/include.new/netinet/sctp_crc32.h b/include.new/netinet/sctp_crc32.h
deleted file mode 100644
index ceeff50..0000000
--- a/include.new/netinet/sctp_crc32.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_crc32.h 235828 2012-05-23 11:26:28Z tuexen $");
-
-#ifndef _NETINET_SCTP_CRC32_H_
-#define _NETINET_SCTP_CRC32_H_
-
-#if defined(_KERNEL)
-#if !defined(SCTP_WITH_NO_CSUM)
-uint32_t sctp_calculate_cksum(struct mbuf *, uint32_t);
-
-#endif
-void sctp_delayed_cksum(struct mbuf *, uint32_t offset);
-
-#endif				/* _KERNEL */
-#endif				/* __crc32c_h__ */
diff --git a/include.new/netinet/sctp_dtrace_declare.h b/include.new/netinet/sctp_dtrace_declare.h
deleted file mode 100644
index ba53006..0000000
--- a/include.new/netinet/sctp_dtrace_declare.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_dtrace_declare.h 235828 2012-05-23 11:26:28Z tuexen $");
-
-#ifndef _NETINET_SCTP_DTRACE_DECLARE_H_
-#define _NETINET_SCTP_DTRACE_DECLARE_H_
-
-#include "opt_kdtrace.h"
-#include <sys/kernel.h>
-#include <sys/sdt.h>
-
-/* Declare the SCTP provider */
-SDT_PROVIDER_DECLARE(sctp);
-
-/* The probes we have so far: */
-
-/* One to track a net's cwnd */
-/* initial */
-SDT_PROBE_DECLARE(sctp, cwnd, net, init);
-/* update at a ack -- increase */
-SDT_PROBE_DECLARE(sctp, cwnd, net, ack);
-/* update at a fast retransmit -- decrease */
-SDT_PROBE_DECLARE(sctp, cwnd, net, fr);
-/* update at a time-out -- decrease */
-SDT_PROBE_DECLARE(sctp, cwnd, net, to);
-/* update at a burst-limit -- decrease */
-SDT_PROBE_DECLARE(sctp, cwnd, net, bl);
-/* update at a ECN -- decrease */
-SDT_PROBE_DECLARE(sctp, cwnd, net, ecn);
-/* update at a Packet-Drop -- decrease */
-SDT_PROBE_DECLARE(sctp, cwnd, net, pd);
-/* Rttvar probe declaration */
-SDT_PROBE_DECLARE(sctp, cwnd, net, rttvar);
-SDT_PROBE_DECLARE(sctp, cwnd, net, rttstep);
-
-/* One to track an associations rwnd */
-SDT_PROBE_DECLARE(sctp, rwnd, assoc, val);
-
-/* One to track a net's flight size */
-SDT_PROBE_DECLARE(sctp, flightsize, net, val);
-
-/* One to track an associations flight size */
-SDT_PROBE_DECLARE(sctp, flightsize, assoc, val);
-
-
-
-
-
-
-#endif
diff --git a/include.new/netinet/sctp_dtrace_define.h b/include.new/netinet/sctp_dtrace_define.h
deleted file mode 100644
index 4b59f02..0000000
--- a/include.new/netinet/sctp_dtrace_define.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*-
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_dtrace_define.h 260817 2014-01-17 10:58:59Z avg $");
-
-#ifndef _NETINET_SCTP_DTRACE_DEFINE_H_
-#define _NETINET_SCTP_DTRACE_DEFINE_H_
-
-#include "opt_kdtrace.h"
-#include <sys/kernel.h>
-#include <sys/sdt.h>
-
-SDT_PROVIDER_DEFINE(sctp);
-
-/********************************************************/
-/* Cwnd probe - tracks changes in the congestion window on a netp */
-/********************************************************/
-/* Initial */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, init,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "uintptr_t",	/* The pointer to the struct sctp_nets * changing */
-    "int",		/* The old value of the cwnd */
-    "int");		/* The new value of the cwnd */
-
-/* ACK-INCREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, ack,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "uintptr_t",	/* The pointer to the struct sctp_nets * changing */
-    "int",		/* The old value of the cwnd */
-    "int");		/* The new value of the cwnd */
-
-/* ACK-INCREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, rttvar,
-    "uint64_t",		/* The Vtag << 32 | localport << 16 | remoteport */
-    "uint64_t",		/* obw | nbw */
-    "uint64_t",		/* bwrtt | newrtt */
-    "uint64_t",		/* flight */
-    "uint64_t");	/* (cwnd << 32) | point << 16 | retval(0/1) */
-
-SDT_PROBE_DEFINE5(sctp, cwnd, net, rttstep,
-    "uint64_t",		/* The Vtag << 32 | localport << 16 | remoteport */
-    "uint64_t",		/* obw | nbw */
-    "uint64_t",		/* bwrtt | newrtt */
-    "uint64_t",		/* flight */
-    "uint64_t");	/* (cwnd << 32) | point << 16 | retval(0/1) */
-
-/* FastRetransmit-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, fr,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "uintptr_t",	/* The pointer to the struct sctp_nets * changing */
-    "int",		/* The old value of the cwnd */
-    "int");		/* The new value of the cwnd */
-
-/* TimeOut-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, to,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "uintptr_t",	/* The pointer to the struct sctp_nets * changing */
-    "int",		/* The old value of the cwnd */
-    "int");		/* The new value of the cwnd */
-
-/* BurstLimit-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, bl,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "uintptr_t",	/* The pointer to the struct sctp_nets * changing */
-    "int",		/* The old value of the cwnd */
-    "int");		/* The new value of the cwnd */
-
-/* ECN-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, ecn,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "uintptr_t",	/* The pointer to the struct sctp_nets * changing */
-    "int",		/* The old value of the cwnd */
-    "int");		/* The new value of the cwnd */
-
-/* PacketDrop-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, pd,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "uintptr_t",	/* The pointer to the struct sctp_nets * changing */
-    "int",		/* The old value of the cwnd */
-    "int");		/* The new value of the cwnd */
-
-/********************************************************/
-/* Rwnd probe - tracks changes in the receiver window for an assoc */
-/********************************************************/
-SDT_PROBE_DEFINE4(sctp, rwnd, assoc, val,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "int",		/* The up/down amount */
-    "int");		/* The new value of the cwnd */
-
-/********************************************************/
-/* flight probe - tracks changes in the flight size on a net or assoc */
-/********************************************************/
-SDT_PROBE_DEFINE5(sctp, flightsize, net, val,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "uintptr_t",        /* The pointer to the struct sctp_nets * changing */
-    "int",		/* The up/down amount */
-    "int");		/* The new value of the cwnd */
-
-/********************************************************/
-/* The total flight version */
-/********************************************************/
-SDT_PROBE_DEFINE4(sctp, flightsize, assoc, val,
-    "uint32_t",		/* The Vtag for this end */
-    "uint32_t",		/*
-			 * The port number of the local side << 16 | port number
-			 * of remote in network byte order.
-			 */
-    "int",		/* The up/down amount */
-    "int");		/* The new value of the cwnd */
-
-#endif
diff --git a/include.new/netinet/sctp_header.h b/include.new/netinet/sctp_header.h
deleted file mode 100644
index 70a2b3a..0000000
--- a/include.new/netinet/sctp_header.h
+++ /dev/null
@@ -1,613 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_header.h 273275 2014-10-19 11:31:23Z tuexen $");
-
-#ifndef _NETINET_SCTP_HEADER_H_
-#define _NETINET_SCTP_HEADER_H_
-
-#include <sys/time.h>
-#include <netinet/sctp.h>
-#include <netinet/sctp_constants.h>
-
-#define SCTP_PACKED __attribute__((packed))
-
-/*
- * Parameter structures
- */
-struct sctp_ipv4addr_param {
-	struct sctp_paramhdr ph;/* type=SCTP_IPV4_PARAM_TYPE, len=8 */
-	uint32_t addr;		/* IPV4 address */
-}                   SCTP_PACKED;
-
-#define SCTP_V6_ADDR_BYTES 16
-
-
-struct sctp_ipv6addr_param {
-	struct sctp_paramhdr ph;/* type=SCTP_IPV6_PARAM_TYPE, len=20 */
-	uint8_t addr[SCTP_V6_ADDR_BYTES];	/* IPV6 address */
-}                   SCTP_PACKED;
-
-/* Cookie Preservative */
-struct sctp_cookie_perserve_param {
-	struct sctp_paramhdr ph;/* type=SCTP_COOKIE_PRESERVE, len=8 */
-	uint32_t time;		/* time in ms to extend cookie */
-}                          SCTP_PACKED;
-
-#define SCTP_ARRAY_MIN_LEN 1
-/* Host Name Address */
-struct sctp_host_name_param {
-	struct sctp_paramhdr ph;/* type=SCTP_HOSTNAME_ADDRESS */
-	char name[SCTP_ARRAY_MIN_LEN];	/* host name */
-}                    SCTP_PACKED;
-
-/*
- * This is the maximum padded size of a s-a-p
- * so paramheadr + 3 address types (6 bytes) + 2 byte pad = 12
- */
-#define SCTP_MAX_ADDR_PARAMS_SIZE 12
-/* supported address type */
-struct sctp_supported_addr_param {
-	struct sctp_paramhdr ph;/* type=SCTP_SUPPORTED_ADDRTYPE */
-	uint16_t addr_type[2];	/* array of supported address types */
-}                         SCTP_PACKED;
-
-/* heartbeat info parameter */
-struct sctp_heartbeat_info_param {
-	struct sctp_paramhdr ph;
-	uint32_t time_value_1;
-	uint32_t time_value_2;
-	uint32_t random_value1;
-	uint32_t random_value2;
-	uint8_t addr_family;
-	uint8_t addr_len;
-	/* make sure that this structure is 4 byte aligned */
-	uint8_t padding[2];
-	char address[SCTP_ADDRMAX];
-}                         SCTP_PACKED;
-
-
-/* draft-ietf-tsvwg-prsctp */
-/* PR-SCTP supported parameter */
-struct sctp_prsctp_supported_param {
-	struct sctp_paramhdr ph;
-}                           SCTP_PACKED;
-
-
-/* draft-ietf-tsvwg-addip-sctp */
-struct sctp_asconf_paramhdr {	/* an ASCONF "parameter" */
-	struct sctp_paramhdr ph;/* a SCTP parameter header */
-	uint32_t correlation_id;/* correlation id for this param */
-}                    SCTP_PACKED;
-
-struct sctp_asconf_addr_param {	/* an ASCONF address parameter */
-	struct sctp_asconf_paramhdr aph;	/* asconf "parameter" */
-	struct sctp_ipv6addr_param addrp;	/* max storage size */
-}                      SCTP_PACKED;
-
-
-struct sctp_asconf_tag_param {	/* an ASCONF NAT-Vtag parameter */
-	struct sctp_asconf_paramhdr aph;	/* asconf "parameter" */
-	uint32_t local_vtag;
-	uint32_t remote_vtag;
-}                     SCTP_PACKED;
-
-
-struct sctp_asconf_addrv4_param {	/* an ASCONF address (v4) parameter */
-	struct sctp_asconf_paramhdr aph;	/* asconf "parameter" */
-	struct sctp_ipv4addr_param addrp;	/* max storage size */
-}                        SCTP_PACKED;
-
-#define SCTP_MAX_SUPPORTED_EXT 256
-
-struct sctp_supported_chunk_types_param {
-	struct sctp_paramhdr ph;/* type = 0x8008  len = x */
-	uint8_t chunk_types[];
-}                                SCTP_PACKED;
-
-
-/*
- * Structures for DATA chunks
- */
-struct sctp_data {
-	uint32_t tsn;
-	uint16_t stream_id;
-	uint16_t stream_sequence;
-	uint32_t protocol_id;
-	/* user data follows */
-}         SCTP_PACKED;
-
-struct sctp_data_chunk {
-	struct sctp_chunkhdr ch;
-	struct sctp_data dp;
-}               SCTP_PACKED;
-
-/*
- * Structures for the control chunks
- */
-
-/* Initiate (INIT)/Initiate Ack (INIT ACK) */
-struct sctp_init {
-	uint32_t initiate_tag;	/* initiate tag */
-	uint32_t a_rwnd;	/* a_rwnd */
-	uint16_t num_outbound_streams;	/* OS */
-	uint16_t num_inbound_streams;	/* MIS */
-	uint32_t initial_tsn;	/* I-TSN */
-	/* optional param's follow */
-}         SCTP_PACKED;
-
-#define SCTP_IDENTIFICATION_SIZE 16
-#define SCTP_ADDRESS_SIZE 4
-#define SCTP_RESERVE_SPACE 6
-/* state cookie header */
-struct sctp_state_cookie {	/* this is our definition... */
-	uint8_t identification[SCTP_IDENTIFICATION_SIZE];	/* id of who we are */
-	struct timeval time_entered;	/* the time I built cookie */
-	uint32_t cookie_life;	/* life I will award this cookie */
-	uint32_t tie_tag_my_vtag;	/* my tag in old association */
-
-	uint32_t tie_tag_peer_vtag;	/* peers tag in old association */
-	uint32_t peers_vtag;	/* peers tag in INIT (for quick ref) */
-
-	uint32_t my_vtag;	/* my tag in INIT-ACK (for quick ref) */
-	uint32_t address[SCTP_ADDRESS_SIZE];	/* 4 ints/128 bits */
-	uint32_t addr_type;	/* address type */
-	uint32_t laddress[SCTP_ADDRESS_SIZE];	/* my local from address */
-	uint32_t laddr_type;	/* my local from address type */
-	uint32_t scope_id;	/* v6 scope id for link-locals */
-
-	uint16_t peerport;	/* port address of the peer in the INIT */
-	uint16_t myport;	/* my port address used in the INIT */
-	uint8_t ipv4_addr_legal;/* Are V4 addr legal? */
-	uint8_t ipv6_addr_legal;/* Are V6 addr legal? */
-	uint8_t local_scope;	/* IPv6 local scope flag */
-	uint8_t site_scope;	/* IPv6 site scope flag */
-
-	uint8_t ipv4_scope;	/* IPv4 private addr scope */
-	uint8_t loopback_scope;	/* loopback scope information */
-	uint8_t reserved[SCTP_RESERVE_SPACE];	/* Align to 64 bits */
-	/*
-	 * at the end is tacked on the INIT chunk and the INIT-ACK chunk
-	 * (minus the cookie).
-	 */
-}                 SCTP_PACKED;
-
-
-/* Used for NAT state error cause */
-struct sctp_missing_nat_state {
-	uint16_t cause;
-	uint16_t length;
-	uint8_t data[];
-}                      SCTP_PACKED;
-
-
-struct sctp_inv_mandatory_param {
-	uint16_t cause;
-	uint16_t length;
-	uint32_t num_param;
-	uint16_t param;
-	/*
-	 * We include this to 0 it since only a missing cookie will cause
-	 * this error.
-	 */
-	uint16_t resv;
-}                        SCTP_PACKED;
-
-struct sctp_unresolv_addr {
-	uint16_t cause;
-	uint16_t length;
-	uint16_t addr_type;
-	uint16_t reserved;	/* Only one invalid addr type */
-}                  SCTP_PACKED;
-
-/* state cookie parameter */
-struct sctp_state_cookie_param {
-	struct sctp_paramhdr ph;
-	struct sctp_state_cookie cookie;
-}                       SCTP_PACKED;
-
-struct sctp_init_chunk {
-	struct sctp_chunkhdr ch;
-	struct sctp_init init;
-}               SCTP_PACKED;
-
-struct sctp_init_msg {
-	struct sctphdr sh;
-	struct sctp_init_chunk msg;
-}             SCTP_PACKED;
-
-/* ... used for both INIT and INIT ACK */
-#define sctp_init_ack		sctp_init
-#define sctp_init_ack_chunk	sctp_init_chunk
-#define sctp_init_ack_msg	sctp_init_msg
-
-
-/* Selective Ack (SACK) */
-struct sctp_gap_ack_block {
-	uint16_t start;		/* Gap Ack block start */
-	uint16_t end;		/* Gap Ack block end */
-}                  SCTP_PACKED;
-
-struct sctp_sack {
-	uint32_t cum_tsn_ack;	/* cumulative TSN Ack */
-	uint32_t a_rwnd;	/* updated a_rwnd of sender */
-	uint16_t num_gap_ack_blks;	/* number of Gap Ack blocks */
-	uint16_t num_dup_tsns;	/* number of duplicate TSNs */
-	/* struct sctp_gap_ack_block's follow */
-	/* uint32_t duplicate_tsn's follow */
-}         SCTP_PACKED;
-
-struct sctp_sack_chunk {
-	struct sctp_chunkhdr ch;
-	struct sctp_sack sack;
-}               SCTP_PACKED;
-
-struct sctp_nr_sack {
-	uint32_t cum_tsn_ack;	/* cumulative TSN Ack */
-	uint32_t a_rwnd;	/* updated a_rwnd of sender */
-	uint16_t num_gap_ack_blks;	/* number of Gap Ack blocks */
-	uint16_t num_nr_gap_ack_blks;	/* number of NR Gap Ack blocks */
-	uint16_t num_dup_tsns;	/* number of duplicate TSNs */
-	uint16_t reserved;	/* not currently used */
-	/* struct sctp_gap_ack_block's follow */
-	/* uint32_t duplicate_tsn's follow */
-}            SCTP_PACKED;
-
-struct sctp_nr_sack_chunk {
-	struct sctp_chunkhdr ch;
-	struct sctp_nr_sack nr_sack;
-}                  SCTP_PACKED;
-
-
-/* Heartbeat Request (HEARTBEAT) */
-struct sctp_heartbeat {
-	struct sctp_heartbeat_info_param hb_info;
-}              SCTP_PACKED;
-
-struct sctp_heartbeat_chunk {
-	struct sctp_chunkhdr ch;
-	struct sctp_heartbeat heartbeat;
-}                    SCTP_PACKED;
-
-/* ... used for Heartbeat Ack (HEARTBEAT ACK) */
-#define sctp_heartbeat_ack		sctp_heartbeat
-#define sctp_heartbeat_ack_chunk	sctp_heartbeat_chunk
-
-
-/* Abort Asssociation (ABORT) */
-struct sctp_abort_chunk {
-	struct sctp_chunkhdr ch;
-	/* optional error cause may follow */
-}                SCTP_PACKED;
-
-struct sctp_abort_msg {
-	struct sctphdr sh;
-	struct sctp_abort_chunk msg;
-}              SCTP_PACKED;
-
-
-/* Shutdown Association (SHUTDOWN) */
-struct sctp_shutdown_chunk {
-	struct sctp_chunkhdr ch;
-	uint32_t cumulative_tsn_ack;
-}                   SCTP_PACKED;
-
-
-/* Shutdown Acknowledgment (SHUTDOWN ACK) */
-struct sctp_shutdown_ack_chunk {
-	struct sctp_chunkhdr ch;
-}                       SCTP_PACKED;
-
-
-/* Operation Error (ERROR) */
-struct sctp_error_chunk {
-	struct sctp_chunkhdr ch;
-	/* optional error causes follow */
-}                SCTP_PACKED;
-
-
-/* Cookie Echo (COOKIE ECHO) */
-struct sctp_cookie_echo_chunk {
-	struct sctp_chunkhdr ch;
-	struct sctp_state_cookie cookie;
-}                      SCTP_PACKED;
-
-/* Cookie Acknowledgment (COOKIE ACK) */
-struct sctp_cookie_ack_chunk {
-	struct sctp_chunkhdr ch;
-}                     SCTP_PACKED;
-
-/* Explicit Congestion Notification Echo (ECNE) */
-struct old_sctp_ecne_chunk {
-	struct sctp_chunkhdr ch;
-	uint32_t tsn;
-}                   SCTP_PACKED;
-
-struct sctp_ecne_chunk {
-	struct sctp_chunkhdr ch;
-	uint32_t tsn;
-	uint32_t num_pkts_since_cwr;
-}               SCTP_PACKED;
-
-/* Congestion Window Reduced (CWR) */
-struct sctp_cwr_chunk {
-	struct sctp_chunkhdr ch;
-	uint32_t tsn;
-}              SCTP_PACKED;
-
-/* Shutdown Complete (SHUTDOWN COMPLETE) */
-struct sctp_shutdown_complete_chunk {
-	struct sctp_chunkhdr ch;
-}                            SCTP_PACKED;
-
-/* Oper error holding a stale cookie */
-struct sctp_stale_cookie_msg {
-	struct sctp_paramhdr ph;/* really an error cause */
-	uint32_t time_usec;
-}                     SCTP_PACKED;
-
-struct sctp_adaptation_layer_indication {
-	struct sctp_paramhdr ph;
-	uint32_t indication;
-}                                SCTP_PACKED;
-
-struct sctp_cookie_while_shutting_down {
-	struct sctphdr sh;
-	struct sctp_chunkhdr ch;
-	struct sctp_paramhdr ph;/* really an error cause */
-}                               SCTP_PACKED;
-
-struct sctp_shutdown_complete_msg {
-	struct sctphdr sh;
-	struct sctp_shutdown_complete_chunk shut_cmp;
-}                          SCTP_PACKED;
-
-/*
- * draft-ietf-tsvwg-addip-sctp
- */
-/* Address/Stream Configuration Change (ASCONF) */
-struct sctp_asconf_chunk {
-	struct sctp_chunkhdr ch;
-	uint32_t serial_number;
-	/* lookup address parameter (mandatory) */
-	/* asconf parameters follow */
-}                 SCTP_PACKED;
-
-/* Address/Stream Configuration Acknowledge (ASCONF ACK) */
-struct sctp_asconf_ack_chunk {
-	struct sctp_chunkhdr ch;
-	uint32_t serial_number;
-	/* asconf parameters follow */
-}                     SCTP_PACKED;
-
-/* draft-ietf-tsvwg-prsctp */
-/* Forward Cumulative TSN (FORWARD TSN) */
-struct sctp_forward_tsn_chunk {
-	struct sctp_chunkhdr ch;
-	uint32_t new_cumulative_tsn;
-	/* stream/sequence pairs (sctp_strseq) follow */
-}                      SCTP_PACKED;
-
-struct sctp_strseq {
-	uint16_t stream;
-	uint16_t sequence;
-}           SCTP_PACKED;
-
-struct sctp_forward_tsn_msg {
-	struct sctphdr sh;
-	struct sctp_forward_tsn_chunk msg;
-}                    SCTP_PACKED;
-
-/* should be a multiple of 4 - 1 aka 3/7/11 etc. */
-
-#define SCTP_NUM_DB_TO_VERIFY 31
-
-struct sctp_chunk_desc {
-	uint8_t chunk_type;
-	uint8_t data_bytes[SCTP_NUM_DB_TO_VERIFY];
-	uint32_t tsn_ifany;
-}               SCTP_PACKED;
-
-
-struct sctp_pktdrop_chunk {
-	struct sctp_chunkhdr ch;
-	uint32_t bottle_bw;
-	uint32_t current_onq;
-	uint16_t trunc_len;
-	uint16_t reserved;
-	uint8_t data[];
-}                  SCTP_PACKED;
-
-/**********STREAM RESET STUFF ******************/
-
-struct sctp_stream_reset_request {
-	struct sctp_paramhdr ph;
-	uint32_t request_seq;
-}                         SCTP_PACKED;
-
-struct sctp_stream_reset_out_request {
-	struct sctp_paramhdr ph;
-	uint32_t request_seq;	/* monotonically increasing seq no */
-	uint32_t response_seq;	/* if a response, the resp seq no */
-	uint32_t send_reset_at_tsn;	/* last TSN I assigned outbound */
-	uint16_t list_of_streams[];	/* if not all list of streams */
-}                             SCTP_PACKED;
-
-struct sctp_stream_reset_in_request {
-	struct sctp_paramhdr ph;
-	uint32_t request_seq;
-	uint16_t list_of_streams[];	/* if not all list of streams */
-}                            SCTP_PACKED;
-
-struct sctp_stream_reset_tsn_request {
-	struct sctp_paramhdr ph;
-	uint32_t request_seq;
-}                             SCTP_PACKED;
-
-struct sctp_stream_reset_response {
-	struct sctp_paramhdr ph;
-	uint32_t response_seq;	/* if a response, the resp seq no */
-	uint32_t result;
-}                          SCTP_PACKED;
-
-struct sctp_stream_reset_response_tsn {
-	struct sctp_paramhdr ph;
-	uint32_t response_seq;	/* if a response, the resp seq no */
-	uint32_t result;
-	uint32_t senders_next_tsn;
-	uint32_t receivers_next_tsn;
-}                              SCTP_PACKED;
-
-struct sctp_stream_reset_add_strm {
-	struct sctp_paramhdr ph;
-	uint32_t request_seq;
-	uint16_t number_of_streams;
-	uint16_t reserved;
-}                          SCTP_PACKED;
-
-#define SCTP_STREAM_RESET_RESULT_NOTHING_TO_DO   0x00000000	/* XXX: unused */
-#define SCTP_STREAM_RESET_RESULT_PERFORMED       0x00000001
-#define SCTP_STREAM_RESET_RESULT_DENIED          0x00000002
-#define SCTP_STREAM_RESET_RESULT_ERR__WRONG_SSN  0x00000003	/* XXX: unused */
-#define SCTP_STREAM_RESET_RESULT_ERR_IN_PROGRESS 0x00000004
-#define SCTP_STREAM_RESET_RESULT_ERR_BAD_SEQNO   0x00000005
-#define SCTP_STREAM_RESET_RESULT_IN_PROGRESS     0x00000006	/* XXX: unused */
-
-/*
- * convience structures, note that if you are making a request for specific
- * streams then the request will need to be an overlay structure.
- */
-
-struct sctp_stream_reset_tsn_req {
-	struct sctp_chunkhdr ch;
-	struct sctp_stream_reset_tsn_request sr_req;
-}                         SCTP_PACKED;
-
-struct sctp_stream_reset_resp {
-	struct sctp_chunkhdr ch;
-	struct sctp_stream_reset_response sr_resp;
-}                      SCTP_PACKED;
-
-/* respone only valid with a TSN request */
-struct sctp_stream_reset_resp_tsn {
-	struct sctp_chunkhdr ch;
-	struct sctp_stream_reset_response_tsn sr_resp;
-}                          SCTP_PACKED;
-
-/****************************************************/
-
-/*
- * Authenticated chunks support draft-ietf-tsvwg-sctp-auth
- */
-
-/* Should we make the max be 32? */
-#define SCTP_RANDOM_MAX_SIZE 256
-struct sctp_auth_random {
-	struct sctp_paramhdr ph;/* type = 0x8002 */
-	uint8_t random_data[];
-}                SCTP_PACKED;
-
-struct sctp_auth_chunk_list {
-	struct sctp_paramhdr ph;/* type = 0x8003 */
-	uint8_t chunk_types[];
-}                    SCTP_PACKED;
-
-struct sctp_auth_hmac_algo {
-	struct sctp_paramhdr ph;/* type = 0x8004 */
-	uint16_t hmac_ids[];
-}                   SCTP_PACKED;
-
-struct sctp_auth_chunk {
-	struct sctp_chunkhdr ch;
-	uint16_t shared_key_id;
-	uint16_t hmac_id;
-	uint8_t hmac[];
-}               SCTP_PACKED;
-
-struct sctp_auth_invalid_hmac {
-	struct sctp_paramhdr ph;
-	uint16_t hmac_id;
-	uint16_t padding;
-}                      SCTP_PACKED;
-
-/*
- * we pre-reserve enough room for a ECNE or CWR AND a SACK with no missing
- * pieces. If ENCE is missing we could have a couple of blocks. This way we
- * optimize so we MOST likely can bundle a SACK/ECN with the smallest size
- * data chunk I will split into. We could increase throughput slightly by
- * taking out these two but the  24-sack/8-CWR i.e. 32 bytes I pre-reserve I
- * feel is worth it for now.
- */
-#ifndef SCTP_MAX_OVERHEAD
-#ifdef INET6
-#define SCTP_MAX_OVERHEAD (sizeof(struct sctp_data_chunk) + \
-			   sizeof(struct sctphdr) + \
-			   sizeof(struct sctp_ecne_chunk) + \
-			   sizeof(struct sctp_sack_chunk) + \
-			   sizeof(struct ip6_hdr))
-
-#define SCTP_MED_OVERHEAD (sizeof(struct sctp_data_chunk) + \
-			   sizeof(struct sctphdr) + \
-			   sizeof(struct ip6_hdr))
-
-
-#define SCTP_MIN_OVERHEAD (sizeof(struct ip6_hdr) + \
-			   sizeof(struct sctphdr))
-
-#else
-#define SCTP_MAX_OVERHEAD (sizeof(struct sctp_data_chunk) + \
-			   sizeof(struct sctphdr) + \
-			   sizeof(struct sctp_ecne_chunk) + \
-			   sizeof(struct sctp_sack_chunk) + \
-			   sizeof(struct ip))
-
-#define SCTP_MED_OVERHEAD (sizeof(struct sctp_data_chunk) + \
-			   sizeof(struct sctphdr) + \
-			   sizeof(struct ip))
-
-
-#define SCTP_MIN_OVERHEAD (sizeof(struct ip) + \
-			   sizeof(struct sctphdr))
-
-#endif				/* INET6 */
-#endif				/* !SCTP_MAX_OVERHEAD */
-
-#define SCTP_MED_V4_OVERHEAD (sizeof(struct sctp_data_chunk) + \
-			      sizeof(struct sctphdr) + \
-			      sizeof(struct ip))
-
-#define SCTP_MIN_V4_OVERHEAD (sizeof(struct ip) + \
-			      sizeof(struct sctphdr))
-
-#undef SCTP_PACKED
-#endif				/* !__sctp_header_h__ */
diff --git a/include.new/netinet/sctp_indata.h b/include.new/netinet/sctp_indata.h
deleted file mode 100644
index f98ca81..0000000
--- a/include.new/netinet/sctp_indata.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_indata.h 252585 2013-07-03 18:48:43Z tuexen $");
-
-#ifndef _NETINET_SCTP_INDATA_H_
-#define _NETINET_SCTP_INDATA_H_
-
-#if defined(_KERNEL) || defined(__Userspace__)
-
-struct sctp_queued_to_read *
-sctp_build_readq_entry(struct sctp_tcb *stcb,
-    struct sctp_nets *net,
-    uint32_t tsn, uint32_t ppid,
-    uint32_t context, uint16_t stream_no,
-    uint16_t stream_seq, uint8_t flags,
-    struct mbuf *dm);
-
-
-#define sctp_build_readq_entry_mac(_ctl, in_it, context, net, tsn, ppid, stream_no, stream_seq, flags, dm) do { \
-	if (_ctl) { \
-		atomic_add_int(&((net)->ref_count), 1); \
-		(_ctl)->sinfo_stream = stream_no; \
-		(_ctl)->sinfo_ssn = stream_seq; \
-		(_ctl)->sinfo_flags = (flags << 8); \
-		(_ctl)->sinfo_ppid = ppid; \
-		(_ctl)->sinfo_context = context; \
-		(_ctl)->sinfo_timetolive = 0; \
-		(_ctl)->sinfo_tsn = tsn; \
-		(_ctl)->sinfo_cumtsn = tsn; \
-		(_ctl)->sinfo_assoc_id = sctp_get_associd((in_it)); \
-		(_ctl)->length = 0; \
-		(_ctl)->held_length = 0; \
-		(_ctl)->whoFrom = net; \
-		(_ctl)->data = dm; \
-		(_ctl)->tail_mbuf = NULL; \
-	        (_ctl)->aux_data = NULL; \
-		(_ctl)->stcb = (in_it); \
-		(_ctl)->port_from = (in_it)->rport; \
-		(_ctl)->spec_flags = 0; \
-		(_ctl)->do_not_ref_stcb = 0; \
-		(_ctl)->end_added = 0; \
-		(_ctl)->pdapi_aborted = 0; \
-		(_ctl)->some_taken = 0; \
-	} \
-} while (0)
-
-
-
-struct mbuf *
-sctp_build_ctl_nchunk(struct sctp_inpcb *inp,
-    struct sctp_sndrcvinfo *sinfo);
-
-void sctp_set_rwnd(struct sctp_tcb *, struct sctp_association *);
-
-uint32_t
-sctp_calc_rwnd(struct sctp_tcb *stcb, struct sctp_association *asoc);
-
-void
-sctp_express_handle_sack(struct sctp_tcb *stcb, uint32_t cumack,
-    uint32_t rwnd, int *abort_now, int ecne_seen);
-
-void
-sctp_handle_sack(struct mbuf *m, int offset_seg, int offset_dup,
-    struct sctp_tcb *stcb,
-    uint16_t num_seg, uint16_t num_nr_seg, uint16_t num_dup,
-    int *abort_now, uint8_t flags,
-    uint32_t cum_ack, uint32_t rwnd, int ecne_seen);
-
-/* draft-ietf-tsvwg-usctp */
-void
-sctp_handle_forward_tsn(struct sctp_tcb *,
-    struct sctp_forward_tsn_chunk *, int *, struct mbuf *, int);
-
-struct sctp_tmit_chunk *
-                sctp_try_advance_peer_ack_point(struct sctp_tcb *, struct sctp_association *);
-
-void sctp_service_queues(struct sctp_tcb *, struct sctp_association *);
-
-void
-     sctp_update_acked(struct sctp_tcb *, struct sctp_shutdown_chunk *, int *);
-
-int
-sctp_process_data(struct mbuf **, int, int *, int,
-    struct sockaddr *src, struct sockaddr *dst,
-    struct sctphdr *,
-    struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *, uint32_t *,
-    uint8_t, uint32_t,
-    uint32_t, uint16_t);
-
-void sctp_slide_mapping_arrays(struct sctp_tcb *stcb);
-
-void sctp_sack_check(struct sctp_tcb *, int);
-
-#endif
-#endif
diff --git a/include.new/netinet/sctp_input.h b/include.new/netinet/sctp_input.h
deleted file mode 100644
index d5cd092..0000000
--- a/include.new/netinet/sctp_input.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_input.h 284633 2015-06-20 08:25:27Z tuexen $");
-
-#ifndef _NETINET_SCTP_INPUT_H_
-#define _NETINET_SCTP_INPUT_H_
-
-#if defined(_KERNEL) || defined(__Userspace__)
-void
-sctp_common_input_processing(struct mbuf **, int, int, int,
-    struct sockaddr *, struct sockaddr *,
-    struct sctphdr *, struct sctp_chunkhdr *,
-#if !defined(SCTP_WITH_NO_CSUM)
-    uint8_t,
-#endif
-    uint8_t,
-    uint8_t, uint32_t, uint16_t,
-    uint32_t, uint16_t);
-
-struct sctp_stream_reset_request *
-sctp_find_stream_reset(struct sctp_tcb *stcb, uint32_t seq,
-    struct sctp_tmit_chunk **bchk);
-
-void 
-sctp_reset_in_stream(struct sctp_tcb *stcb, uint32_t number_entries,
-    uint16_t * list);
-
-
-int sctp_is_there_unsent_data(struct sctp_tcb *stcb, int so_locked);
-
-#endif
-#endif
diff --git a/include.new/netinet/sctp_lock_bsd.h b/include.new/netinet/sctp_lock_bsd.h
deleted file mode 100644
index 529c808..0000000
--- a/include.new/netinet/sctp_lock_bsd.h
+++ /dev/null
@@ -1,475 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_lock_bsd.h 235828 2012-05-23 11:26:28Z tuexen $");
-
-#ifndef _NETINET_SCTP_LOCK_BSD_H_
-#define _NETINET_SCTP_LOCK_BSD_H_
-
-/*
- * General locking concepts: The goal of our locking is to of course provide
- * consistency and yet minimize overhead. We will attempt to use
- * non-recursive locks which are supposed to be quite inexpensive. Now in
- * order to do this the goal is that most functions are not aware of locking.
- * Once we have a TCB we lock it and unlock when we are through. This means
- * that the TCB lock is kind-of a "global" lock when working on an
- * association. Caution must be used when asserting a TCB_LOCK since if we
- * recurse we deadlock.
- *
- * Most other locks (INP and INFO) attempt to localize the locking i.e. we try
- * to contain the lock and unlock within the function that needs to lock it.
- * This sometimes mean we do extra locks and unlocks and lose a bit of
- * efficency, but if the performance statements about non-recursive locks are
- * true this should not be a problem.  One issue that arises with this only
- * lock when needed is that if an implicit association setup is done we have
- * a problem. If at the time I lookup an association I have NULL in the tcb
- * return, by the time I call to create the association some other processor
- * could have created it. This is what the CREATE lock on the endpoint.
- * Places where we will be implicitly creating the association OR just
- * creating an association (the connect call) will assert the CREATE_INP
- * lock. This will assure us that during all the lookup of INP and INFO if
- * another creator is also locking/looking up we can gate the two to
- * synchronize. So the CREATE_INP lock is also another one we must use
- * extreme caution in locking to make sure we don't hit a re-entrancy issue.
- *
- * For non FreeBSD 5.x we provide a bunch of EMPTY lock macros so we can
- * blatantly put locks everywhere and they reduce to nothing on
- * NetBSD/OpenBSD and FreeBSD 4.x
- *
- */
-
-/*
- * When working with the global SCTP lists we lock and unlock the INP_INFO
- * lock. So when we go to lookup an association we will want to do a
- * SCTP_INP_INFO_RLOCK() and then when we want to add a new association to
- * the SCTP_BASE_INFO() list's we will do a SCTP_INP_INFO_WLOCK().
- */
-
-extern struct sctp_foo_stuff sctp_logoff[];
-extern int sctp_logoff_stuff;
-
-#define SCTP_IPI_COUNT_INIT()
-
-#define SCTP_STATLOG_INIT_LOCK()
-#define SCTP_STATLOG_LOCK()
-#define SCTP_STATLOG_UNLOCK()
-#define SCTP_STATLOG_DESTROY()
-
-#define SCTP_INP_INFO_LOCK_DESTROY() do { \
-        if(rw_wowned(&SCTP_BASE_INFO(ipi_ep_mtx))) { \
-             rw_wunlock(&SCTP_BASE_INFO(ipi_ep_mtx)); \
-        } \
-        rw_destroy(&SCTP_BASE_INFO(ipi_ep_mtx)); \
-      }  while (0)
-
-#define SCTP_INP_INFO_LOCK_INIT() \
-        rw_init(&SCTP_BASE_INFO(ipi_ep_mtx), "sctp-info");
-
-
-#define SCTP_INP_INFO_RLOCK()	do { 					\
-             rw_rlock(&SCTP_BASE_INFO(ipi_ep_mtx));                         \
-} while (0)
-
-#define SCTP_MCORE_QLOCK_INIT(cpstr) do { \
-		mtx_init(&(cpstr)->que_mtx,	      \
-			 "sctp-mcore_queue","queue_lock",	\
-			 MTX_DEF|MTX_DUPOK);		\
-} while (0)
-
-#define SCTP_MCORE_QLOCK(cpstr)  do { \
-		mtx_lock(&(cpstr)->que_mtx);	\
-} while (0)
-
-#define SCTP_MCORE_QUNLOCK(cpstr)  do { \
-		mtx_unlock(&(cpstr)->que_mtx);	\
-} while (0)
-
-#define SCTP_MCORE_QDESTROY(cpstr)  do { \
-	if(mtx_owned(&(cpstr)->core_mtx)) {	\
-		mtx_unlock(&(cpstr)->que_mtx);	\
-        } \
-	mtx_destroy(&(cpstr)->que_mtx);	\
-} while (0)
-
-
-#define SCTP_MCORE_LOCK_INIT(cpstr) do { \
-		mtx_init(&(cpstr)->core_mtx,	      \
-			 "sctp-cpulck","cpu_proc_lock",	\
-			 MTX_DEF|MTX_DUPOK);		\
-} while (0)
-
-#define SCTP_MCORE_LOCK(cpstr)  do { \
-		mtx_lock(&(cpstr)->core_mtx);	\
-} while (0)
-
-#define SCTP_MCORE_UNLOCK(cpstr)  do { \
-		mtx_unlock(&(cpstr)->core_mtx);	\
-} while (0)
-
-#define SCTP_MCORE_DESTROY(cpstr)  do { \
-	if(mtx_owned(&(cpstr)->core_mtx)) {	\
-		mtx_unlock(&(cpstr)->core_mtx);	\
-        } \
-	mtx_destroy(&(cpstr)->core_mtx);	\
-} while (0)
-
-#define SCTP_INP_INFO_WLOCK()	do { 					\
-            rw_wlock(&SCTP_BASE_INFO(ipi_ep_mtx));                         \
-} while (0)
-
-
-#define SCTP_INP_INFO_RUNLOCK()		rw_runlock(&SCTP_BASE_INFO(ipi_ep_mtx))
-#define SCTP_INP_INFO_WUNLOCK()		rw_wunlock(&SCTP_BASE_INFO(ipi_ep_mtx))
-
-
-#define SCTP_IPI_ADDR_INIT()								\
-        rw_init(&SCTP_BASE_INFO(ipi_addr_mtx), "sctp-addr")
-#define SCTP_IPI_ADDR_DESTROY() do  { \
-        if(rw_wowned(&SCTP_BASE_INFO(ipi_addr_mtx))) { \
-             rw_wunlock(&SCTP_BASE_INFO(ipi_addr_mtx)); \
-        } \
-	rw_destroy(&SCTP_BASE_INFO(ipi_addr_mtx)); \
-      }  while (0)
-#define SCTP_IPI_ADDR_RLOCK()	do { 					\
-             rw_rlock(&SCTP_BASE_INFO(ipi_addr_mtx));                         \
-} while (0)
-#define SCTP_IPI_ADDR_WLOCK()	do { 					\
-             rw_wlock(&SCTP_BASE_INFO(ipi_addr_mtx));                         \
-} while (0)
-
-#define SCTP_IPI_ADDR_RUNLOCK()		rw_runlock(&SCTP_BASE_INFO(ipi_addr_mtx))
-#define SCTP_IPI_ADDR_WUNLOCK()		rw_wunlock(&SCTP_BASE_INFO(ipi_addr_mtx))
-
-
-#define SCTP_IPI_ITERATOR_WQ_INIT() \
-        mtx_init(&sctp_it_ctl.ipi_iterator_wq_mtx, "sctp-it-wq", "sctp_it_wq", MTX_DEF)
-
-#define SCTP_IPI_ITERATOR_WQ_DESTROY() \
-	mtx_destroy(&sctp_it_ctl.ipi_iterator_wq_mtx)
-
-#define SCTP_IPI_ITERATOR_WQ_LOCK()	do { 					\
-             mtx_lock(&sctp_it_ctl.ipi_iterator_wq_mtx);                \
-} while (0)
-
-#define SCTP_IPI_ITERATOR_WQ_UNLOCK()		mtx_unlock(&sctp_it_ctl.ipi_iterator_wq_mtx)
-
-
-#define SCTP_IP_PKTLOG_INIT() \
-        mtx_init(&SCTP_BASE_INFO(ipi_pktlog_mtx), "sctp-pktlog", "packetlog", MTX_DEF)
-
-
-#define SCTP_IP_PKTLOG_LOCK()	do { 			\
-             mtx_lock(&SCTP_BASE_INFO(ipi_pktlog_mtx));     \
-} while (0)
-
-#define SCTP_IP_PKTLOG_UNLOCK()	mtx_unlock(&SCTP_BASE_INFO(ipi_pktlog_mtx))
-
-#define SCTP_IP_PKTLOG_DESTROY() \
-	mtx_destroy(&SCTP_BASE_INFO(ipi_pktlog_mtx))
-
-
-
-
-
-/*
- * The INP locks we will use for locking an SCTP endpoint, so for example if
- * we want to change something at the endpoint level for example random_store
- * or cookie secrets we lock the INP level.
- */
-
-#define SCTP_INP_READ_INIT(_inp) \
-	mtx_init(&(_inp)->inp_rdata_mtx, "sctp-read", "inpr", MTX_DEF | MTX_DUPOK)
-
-#define SCTP_INP_READ_DESTROY(_inp) \
-	mtx_destroy(&(_inp)->inp_rdata_mtx)
-
-#define SCTP_INP_READ_LOCK(_inp)	do { \
-        mtx_lock(&(_inp)->inp_rdata_mtx);    \
-} while (0)
-
-
-#define SCTP_INP_READ_UNLOCK(_inp) mtx_unlock(&(_inp)->inp_rdata_mtx)
-
-
-#define SCTP_INP_LOCK_INIT(_inp) \
-	mtx_init(&(_inp)->inp_mtx, "sctp-inp", "inp", MTX_DEF | MTX_DUPOK)
-#define SCTP_ASOC_CREATE_LOCK_INIT(_inp) \
-	mtx_init(&(_inp)->inp_create_mtx, "sctp-create", "inp_create", \
-		 MTX_DEF | MTX_DUPOK)
-
-#define SCTP_INP_LOCK_DESTROY(_inp) \
-	mtx_destroy(&(_inp)->inp_mtx)
-
-#define SCTP_INP_LOCK_CONTENDED(_inp) ((_inp)->inp_mtx.mtx_lock & MTX_CONTESTED)
-
-#define SCTP_INP_READ_CONTENDED(_inp) ((_inp)->inp_rdata_mtx.mtx_lock & MTX_CONTESTED)
-
-#define SCTP_ASOC_CREATE_LOCK_CONTENDED(_inp) ((_inp)->inp_create_mtx.mtx_lock & MTX_CONTESTED)
-
-
-#define SCTP_ASOC_CREATE_LOCK_DESTROY(_inp) \
-	mtx_destroy(&(_inp)->inp_create_mtx)
-
-
-#ifdef SCTP_LOCK_LOGGING
-#define SCTP_INP_RLOCK(_inp)	do { 					\
-	if(SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LOCK_LOGGING_ENABLE) sctp_log_lock(_inp, (struct sctp_tcb *)NULL, SCTP_LOG_LOCK_INP);\
-        mtx_lock(&(_inp)->inp_mtx);                                     \
-} while (0)
-
-#define SCTP_INP_WLOCK(_inp)	do { 					\
-	if(SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LOCK_LOGGING_ENABLE) sctp_log_lock(_inp, (struct sctp_tcb *)NULL, SCTP_LOG_LOCK_INP);\
-        mtx_lock(&(_inp)->inp_mtx);                                     \
-} while (0)
-
-#else
-
-#define SCTP_INP_RLOCK(_inp)	do { 					\
-        mtx_lock(&(_inp)->inp_mtx);                                     \
-} while (0)
-
-#define SCTP_INP_WLOCK(_inp)	do { 					\
-        mtx_lock(&(_inp)->inp_mtx);                                     \
-} while (0)
-
-#endif
-
-
-#define SCTP_TCB_SEND_LOCK_INIT(_tcb) \
-	mtx_init(&(_tcb)->tcb_send_mtx, "sctp-send-tcb", "tcbs", MTX_DEF | MTX_DUPOK)
-
-#define SCTP_TCB_SEND_LOCK_DESTROY(_tcb) mtx_destroy(&(_tcb)->tcb_send_mtx)
-
-#define SCTP_TCB_SEND_LOCK(_tcb)  do { \
-	mtx_lock(&(_tcb)->tcb_send_mtx); \
-} while (0)
-
-#define SCTP_TCB_SEND_UNLOCK(_tcb) mtx_unlock(&(_tcb)->tcb_send_mtx)
-
-#define SCTP_INP_INCR_REF(_inp) atomic_add_int(&((_inp)->refcount), 1)
-#define SCTP_INP_DECR_REF(_inp) atomic_add_int(&((_inp)->refcount), -1)
-
-
-#ifdef SCTP_LOCK_LOGGING
-#define SCTP_ASOC_CREATE_LOCK(_inp) \
-	do {								\
-	if(SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LOCK_LOGGING_ENABLE) sctp_log_lock(_inp, (struct sctp_tcb *)NULL, SCTP_LOG_LOCK_CREATE); \
-		mtx_lock(&(_inp)->inp_create_mtx);			\
-	} while (0)
-#else
-
-#define SCTP_ASOC_CREATE_LOCK(_inp) \
-	do {								\
-		mtx_lock(&(_inp)->inp_create_mtx);			\
-	} while (0)
-#endif
-
-#define SCTP_INP_RUNLOCK(_inp)		mtx_unlock(&(_inp)->inp_mtx)
-#define SCTP_INP_WUNLOCK(_inp)		mtx_unlock(&(_inp)->inp_mtx)
-#define SCTP_ASOC_CREATE_UNLOCK(_inp)	mtx_unlock(&(_inp)->inp_create_mtx)
-
-/*
- * For the majority of things (once we have found the association) we will
- * lock the actual association mutex. This will protect all the assoiciation
- * level queues and streams and such. We will need to lock the socket layer
- * when we stuff data up into the receiving sb_mb. I.e. we will need to do an
- * extra SOCKBUF_LOCK(&so->so_rcv) even though the association is locked.
- */
-
-#define SCTP_TCB_LOCK_INIT(_tcb) \
-	mtx_init(&(_tcb)->tcb_mtx, "sctp-tcb", "tcb", MTX_DEF | MTX_DUPOK)
-
-#define SCTP_TCB_LOCK_DESTROY(_tcb)	mtx_destroy(&(_tcb)->tcb_mtx)
-
-#ifdef SCTP_LOCK_LOGGING
-#define SCTP_TCB_LOCK(_tcb)  do {					\
-	if(SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LOCK_LOGGING_ENABLE)  sctp_log_lock(_tcb->sctp_ep, _tcb, SCTP_LOG_LOCK_TCB);          \
-	mtx_lock(&(_tcb)->tcb_mtx);                                     \
-} while (0)
-
-#else
-#define SCTP_TCB_LOCK(_tcb)  do {					\
-	mtx_lock(&(_tcb)->tcb_mtx);                                     \
-} while (0)
-
-#endif
-
-
-#define SCTP_TCB_TRYLOCK(_tcb) 	mtx_trylock(&(_tcb)->tcb_mtx)
-
-#define SCTP_TCB_UNLOCK(_tcb)		mtx_unlock(&(_tcb)->tcb_mtx)
-
-#define SCTP_TCB_UNLOCK_IFOWNED(_tcb)	      do { \
-                                                if (mtx_owned(&(_tcb)->tcb_mtx)) \
-                                                     mtx_unlock(&(_tcb)->tcb_mtx); \
-                                              } while (0)
-
-
-
-#ifdef INVARIANTS
-#define SCTP_TCB_LOCK_ASSERT(_tcb) do { \
-                            if (mtx_owned(&(_tcb)->tcb_mtx) == 0) \
-                                panic("Don't own TCB lock"); \
-                            } while (0)
-#else
-#define SCTP_TCB_LOCK_ASSERT(_tcb)
-#endif
-
-#define SCTP_ITERATOR_LOCK_INIT() \
-        mtx_init(&sctp_it_ctl.it_mtx, "sctp-it", "iterator", MTX_DEF)
-
-#ifdef INVARIANTS
-#define SCTP_ITERATOR_LOCK() \
-	do {								\
-		if (mtx_owned(&sctp_it_ctl.it_mtx))			\
-			panic("Iterator Lock");				\
-		mtx_lock(&sctp_it_ctl.it_mtx);				\
-	} while (0)
-#else
-#define SCTP_ITERATOR_LOCK() \
-	do {								\
-		mtx_lock(&sctp_it_ctl.it_mtx);				\
-	} while (0)
-
-#endif
-
-#define SCTP_ITERATOR_UNLOCK()	        mtx_unlock(&sctp_it_ctl.it_mtx)
-#define SCTP_ITERATOR_LOCK_DESTROY()	mtx_destroy(&sctp_it_ctl.it_mtx)
-
-
-#define SCTP_WQ_ADDR_INIT() do { \
-        mtx_init(&SCTP_BASE_INFO(wq_addr_mtx), "sctp-addr-wq","sctp_addr_wq",MTX_DEF); \
- } while (0)
-
-#define SCTP_WQ_ADDR_DESTROY() do  { \
-        if(mtx_owned(&SCTP_BASE_INFO(wq_addr_mtx))) { \
-             mtx_unlock(&SCTP_BASE_INFO(wq_addr_mtx)); \
-        } \
-	    mtx_destroy(&SCTP_BASE_INFO(wq_addr_mtx)); \
-      }  while (0)
-
-#define SCTP_WQ_ADDR_LOCK()	do { \
-             mtx_lock(&SCTP_BASE_INFO(wq_addr_mtx));  \
-} while (0)
-#define SCTP_WQ_ADDR_UNLOCK() do { \
-		mtx_unlock(&SCTP_BASE_INFO(wq_addr_mtx)); \
-} while (0)
-
-
-
-#define SCTP_INCR_EP_COUNT() \
-                do { \
-		       atomic_add_int(&SCTP_BASE_INFO(ipi_count_ep), 1); \
-	        } while (0)
-
-#define SCTP_DECR_EP_COUNT() \
-                do { \
-		       atomic_subtract_int(&SCTP_BASE_INFO(ipi_count_ep), 1); \
-	        } while (0)
-
-#define SCTP_INCR_ASOC_COUNT() \
-                do { \
-	               atomic_add_int(&SCTP_BASE_INFO(ipi_count_asoc), 1); \
-	        } while (0)
-
-#define SCTP_DECR_ASOC_COUNT() \
-                do { \
-	               atomic_subtract_int(&SCTP_BASE_INFO(ipi_count_asoc), 1); \
-	        } while (0)
-
-#define SCTP_INCR_LADDR_COUNT() \
-                do { \
-	               atomic_add_int(&SCTP_BASE_INFO(ipi_count_laddr), 1); \
-	        } while (0)
-
-#define SCTP_DECR_LADDR_COUNT() \
-                do { \
-	               atomic_subtract_int(&SCTP_BASE_INFO(ipi_count_laddr), 1); \
-	        } while (0)
-
-#define SCTP_INCR_RADDR_COUNT() \
-                do { \
- 	               atomic_add_int(&SCTP_BASE_INFO(ipi_count_raddr), 1); \
-	        } while (0)
-
-#define SCTP_DECR_RADDR_COUNT() \
-                do { \
- 	               atomic_subtract_int(&SCTP_BASE_INFO(ipi_count_raddr),1); \
-	        } while (0)
-
-#define SCTP_INCR_CHK_COUNT() \
-                do { \
-  	               atomic_add_int(&SCTP_BASE_INFO(ipi_count_chunk), 1); \
-	        } while (0)
-#ifdef INVARIANTS
-#define SCTP_DECR_CHK_COUNT() \
-                do { \
-                       if(SCTP_BASE_INFO(ipi_count_chunk) == 0) \
-                             panic("chunk count to 0?");    \
-  	               atomic_subtract_int(&SCTP_BASE_INFO(ipi_count_chunk), 1); \
-	        } while (0)
-#else
-#define SCTP_DECR_CHK_COUNT() \
-                do { \
-                       if(SCTP_BASE_INFO(ipi_count_chunk) != 0) \
-  	               atomic_subtract_int(&SCTP_BASE_INFO(ipi_count_chunk), 1); \
-	        } while (0)
-#endif
-#define SCTP_INCR_READQ_COUNT() \
-                do { \
-		       atomic_add_int(&SCTP_BASE_INFO(ipi_count_readq),1); \
-	        } while (0)
-
-#define SCTP_DECR_READQ_COUNT() \
-                do { \
-		       atomic_subtract_int(&SCTP_BASE_INFO(ipi_count_readq), 1); \
-	        } while (0)
-
-#define SCTP_INCR_STRMOQ_COUNT() \
-                do { \
-		       atomic_add_int(&SCTP_BASE_INFO(ipi_count_strmoq), 1); \
-	        } while (0)
-
-#define SCTP_DECR_STRMOQ_COUNT() \
-                do { \
-		       atomic_subtract_int(&SCTP_BASE_INFO(ipi_count_strmoq), 1); \
-	        } while (0)
-
-
-#if defined(SCTP_SO_LOCK_TESTING)
-#define SCTP_INP_SO(sctpinp)	(sctpinp)->ip_inp.inp.inp_socket
-#define SCTP_SOCKET_LOCK(so, refcnt)
-#define SCTP_SOCKET_UNLOCK(so, refcnt)
-#endif
-
-#endif
diff --git a/include.new/netinet/sctp_os.h b/include.new/netinet/sctp_os.h
deleted file mode 100644
index b4be787..0000000
--- a/include.new/netinet/sctp_os.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_os.h 235828 2012-05-23 11:26:28Z tuexen $");
-
-#ifndef _NETINET_SCTP_OS_H_
-#define _NETINET_SCTP_OS_H_
-
-/*
- * General kernel memory allocation:
- *  SCTP_MALLOC(element, type, size, name)
- *  SCTP_FREE(element)
- * Kernel memory allocation for "soname"- memory must be zeroed.
- *  SCTP_MALLOC_SONAME(name, type, size)
- *  SCTP_FREE_SONAME(name)
- */
-
-/*
- * Zone(pool) allocation routines: MUST be defined for each OS.
- *  zone = zone/pool pointer.
- *  name = string name of the zone/pool.
- *  size = size of each zone/pool element.
- *  number = number of elements in zone/pool.
- *  type = structure type to allocate
- *
- * sctp_zone_t
- * SCTP_ZONE_INIT(zone, name, size, number)
- * SCTP_ZONE_GET(zone, type)
- * SCTP_ZONE_FREE(zone, element)
- * SCTP_ZONE_DESTROY(zone)
- */
-
-#include <netinet/sctp_os_bsd.h>
-
-
-
-
-
-/* All os's must implement this address gatherer. If
- * no VRF's exist, then vrf 0 is the only one and all
- * addresses and ifn's live here.
- */
-#define SCTP_DEFAULT_VRF 0
-void sctp_init_vrf_list(int vrfid);
-
-#endif
diff --git a/include.new/netinet/sctp_os_bsd.h b/include.new/netinet/sctp_os_bsd.h
deleted file mode 100644
index 60fbe27..0000000
--- a/include.new/netinet/sctp_os_bsd.h
+++ /dev/null
@@ -1,497 +0,0 @@
-/*-
- * Copyright (c) 2006-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_os_bsd.h 284633 2015-06-20 08:25:27Z tuexen $");
-
-#ifndef _NETINET_SCTP_OS_BSD_H_
-#define _NETINET_SCTP_OS_BSD_H_
-/*
- * includes
- */
-#include "opt_ipsec.h"
-#include "opt_compat.h"
-#include "opt_inet6.h"
-#include "opt_inet.h"
-#include "opt_sctp.h"
-
-#include <sys/param.h>
-#include <sys/ktr.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/mbuf.h>
-#include <sys/protosw.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/jail.h>
-#include <sys/sysctl.h>
-#include <sys/resourcevar.h>
-#include <sys/uio.h>
-#include <sys/lock.h>
-#include <sys/rwlock.h>
-#include <sys/kthread.h>
-#include <sys/priv.h>
-#include <sys/random.h>
-#include <sys/limits.h>
-#include <sys/queue.h>
-#include <machine/cpu.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_var.h>
-#include <net/route.h>
-#include <net/vnet.h>
-
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/in_pcb.h>
-#include <netinet/in_var.h>
-#include <netinet/ip_var.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/icmp_var.h>
-
-#ifdef IPSEC
-#include <netipsec/ipsec.h>
-#include <netipsec/key.h>
-#endif				/* IPSEC */
-
-#ifdef INET6
-#include <sys/domain.h>
-#ifdef IPSEC
-#include <netipsec/ipsec6.h>
-#endif
-#include <netinet/ip6.h>
-#include <netinet6/ip6_var.h>
-#include <netinet6/in6_pcb.h>
-#include <netinet/icmp6.h>
-#include <netinet6/ip6protosw.h>
-#include <netinet6/nd6.h>
-#include <netinet6/scope6_var.h>
-#endif				/* INET6 */
-
-
-#include <netinet/ip_options.h>
-
-#include <crypto/sha1.h>
-#include <crypto/sha2/sha2.h>
-
-#ifndef in6pcb
-#define in6pcb		inpcb
-#endif
-/* Declare all the malloc names for all the various mallocs */
-MALLOC_DECLARE(SCTP_M_MAP);
-MALLOC_DECLARE(SCTP_M_STRMI);
-MALLOC_DECLARE(SCTP_M_STRMO);
-MALLOC_DECLARE(SCTP_M_ASC_ADDR);
-MALLOC_DECLARE(SCTP_M_ASC_IT);
-MALLOC_DECLARE(SCTP_M_AUTH_CL);
-MALLOC_DECLARE(SCTP_M_AUTH_KY);
-MALLOC_DECLARE(SCTP_M_AUTH_HL);
-MALLOC_DECLARE(SCTP_M_AUTH_IF);
-MALLOC_DECLARE(SCTP_M_STRESET);
-MALLOC_DECLARE(SCTP_M_CMSG);
-MALLOC_DECLARE(SCTP_M_COPYAL);
-MALLOC_DECLARE(SCTP_M_VRF);
-MALLOC_DECLARE(SCTP_M_IFA);
-MALLOC_DECLARE(SCTP_M_IFN);
-MALLOC_DECLARE(SCTP_M_TIMW);
-MALLOC_DECLARE(SCTP_M_MVRF);
-MALLOC_DECLARE(SCTP_M_ITER);
-MALLOC_DECLARE(SCTP_M_SOCKOPT);
-MALLOC_DECLARE(SCTP_M_MCORE);
-
-#if defined(SCTP_LOCAL_TRACE_BUF)
-
-#define SCTP_GET_CYCLECOUNT get_cyclecount()
-#define SCTP_CTR6 sctp_log_trace
-
-#else
-#define SCTP_CTR6 CTR6
-#endif
-
-/*
- * Macros to expand out globals defined by various modules
- * to either a real global or a virtualized instance of one,
- * depending on whether VIMAGE is defined.
- */
-/* then define the macro(s) that hook into the vimage macros */
-#define MODULE_GLOBAL(__SYMBOL) V_##__SYMBOL
-
-#define V_system_base_info VNET(system_base_info)
-#define SCTP_BASE_INFO(__m) V_system_base_info.sctppcbinfo.__m
-#define SCTP_BASE_STATS V_system_base_info.sctpstat
-#define SCTP_BASE_STAT(__m) V_system_base_info.sctpstat.__m
-#define SCTP_BASE_SYSCTL(__m) V_system_base_info.sctpsysctl.__m
-#define SCTP_BASE_VAR(__m) V_system_base_info.__m
-
-#define SCTP_PRINTF(params...)	printf(params)
-#if defined(SCTP_DEBUG)
-#define SCTPDBG(level, params...)					\
-{									\
-	do {								\
-		if (SCTP_BASE_SYSCTL(sctp_debug_on) & level ) {		\
-			SCTP_PRINTF(params);				\
-		}							\
-	} while (0);							\
-}
-#define SCTPDBG_ADDR(level, addr)					\
-{									\
-	do {								\
-		if (SCTP_BASE_SYSCTL(sctp_debug_on) & level ) {		\
-			sctp_print_address(addr);			\
-		}							\
-	} while (0);							\
-}
-#else
-#define SCTPDBG(level, params...)
-#define SCTPDBG_ADDR(level, addr)
-#endif
-
-#ifdef SCTP_LTRACE_CHUNKS
-#define SCTP_LTRACE_CHK(a, b, c, d) if(SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LTRACE_CHUNK_ENABLE) SCTP_CTR6(KTR_SUBSYS, "SCTP:%d[%d]:%x-%x-%x-%x", SCTP_LOG_CHUNK_PROC, 0, a, b, c, d)
-#else
-#define SCTP_LTRACE_CHK(a, b, c, d)
-#endif
-
-#ifdef SCTP_LTRACE_ERRORS
-#define SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, file, err) \
-	if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LTRACE_ERROR_ENABLE) \
-		SCTP_PRINTF("mbuf:%p inp:%p stcb:%p net:%p file:%x line:%d error:%d\n", \
-		            m, inp, stcb, net, file, __LINE__, err);
-#define SCTP_LTRACE_ERR_RET(inp, stcb, net, file, err) \
-	if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LTRACE_ERROR_ENABLE) \
-		SCTP_PRINTF("inp:%p stcb:%p net:%p file:%x line:%d error:%d\n", \
-		            inp, stcb, net, file, __LINE__, err);
-#else
-#define SCTP_LTRACE_ERR_RET_PKT(m, inp, stcb, net, file, err)
-#define SCTP_LTRACE_ERR_RET(inp, stcb, net, file, err)
-#endif
-
-
-/*
- * Local address and interface list handling
- */
-#define SCTP_MAX_VRF_ID		0
-#define SCTP_SIZE_OF_VRF_HASH	3
-#define SCTP_IFNAMSIZ		IFNAMSIZ
-#define SCTP_DEFAULT_VRFID	0
-#define SCTP_VRF_ADDR_HASH_SIZE	16
-#define SCTP_VRF_IFN_HASH_SIZE	3
-#define	SCTP_INIT_VRF_TABLEID(vrf)
-
-#define SCTP_IFN_IS_IFT_LOOP(ifn) ((ifn)->ifn_type == IFT_LOOP)
-#define SCTP_ROUTE_IS_REAL_LOOP(ro) ((ro)->ro_rt && (ro)->ro_rt->rt_ifa && (ro)->ro_rt->rt_ifa->ifa_ifp && (ro)->ro_rt->rt_ifa->ifa_ifp->if_type == IFT_LOOP)
-
-/*
- * Access to IFN's to help with src-addr-selection
- */
-/* This could return VOID if the index works but for BSD we provide both. */
-#define SCTP_GET_IFN_VOID_FROM_ROUTE(ro) (void *)ro->ro_rt->rt_ifp
-#define SCTP_GET_IF_INDEX_FROM_ROUTE(ro) (ro)->ro_rt->rt_ifp->if_index
-#define SCTP_ROUTE_HAS_VALID_IFN(ro) ((ro)->ro_rt && (ro)->ro_rt->rt_ifp)
-
-/*
- * general memory allocation
- */
-#define SCTP_MALLOC(var, type, size, name) \
-	do { \
-		var = (type)malloc(size, name, M_NOWAIT); \
-	} while (0)
-
-#define SCTP_FREE(var, type)	free(var, type)
-
-#define SCTP_MALLOC_SONAME(var, type, size) \
-	do { \
-		var = (type)malloc(size, M_SONAME, M_WAITOK | M_ZERO); \
-	} while (0)
-
-#define SCTP_FREE_SONAME(var)	free(var, M_SONAME)
-
-#define SCTP_PROCESS_STRUCT struct proc *
-
-/*
- * zone allocation functions
- */
-#include <vm/uma.h>
-
-/* SCTP_ZONE_INIT: initialize the zone */
-typedef struct uma_zone *sctp_zone_t;
-
-#define SCTP_ZONE_INIT(zone, name, size, number) { \
-	zone = uma_zcreate(name, size, NULL, NULL, NULL, NULL, UMA_ALIGN_PTR,\
-		0); \
-	uma_zone_set_max(zone, number); \
-}
-
-#define SCTP_ZONE_DESTROY(zone) uma_zdestroy(zone)
-
-/* SCTP_ZONE_GET: allocate element from the zone */
-#define SCTP_ZONE_GET(zone, type) \
-	(type *)uma_zalloc(zone, M_NOWAIT);
-
-/* SCTP_ZONE_FREE: free element from the zone */
-#define SCTP_ZONE_FREE(zone, element) \
-	uma_zfree(zone, element);
-
-#define SCTP_HASH_INIT(size, hashmark) hashinit_flags(size, M_PCB, hashmark, HASH_NOWAIT)
-#define SCTP_HASH_FREE(table, hashmark) hashdestroy(table, M_PCB, hashmark)
-
-#define SCTP_M_COPYM	m_copym
-
-/*
- * timers
- */
-#include <sys/callout.h>
-typedef struct callout sctp_os_timer_t;
-
-
-#define SCTP_OS_TIMER_INIT(tmr)	callout_init(tmr, 1)
-#define SCTP_OS_TIMER_START	callout_reset
-#define SCTP_OS_TIMER_STOP	callout_stop
-#define SCTP_OS_TIMER_STOP_DRAIN callout_drain
-#define SCTP_OS_TIMER_PENDING	callout_pending
-#define SCTP_OS_TIMER_ACTIVE	callout_active
-#define SCTP_OS_TIMER_DEACTIVATE callout_deactivate
-
-#define sctp_get_tick_count() (ticks)
-
-#define SCTP_UNUSED __attribute__((unused))
-
-/*
- * Functions
- */
-/* Mbuf manipulation and access macros  */
-#define SCTP_BUF_LEN(m) (m->m_len)
-#define SCTP_BUF_NEXT(m) (m->m_next)
-#define SCTP_BUF_NEXT_PKT(m) (m->m_nextpkt)
-#define SCTP_BUF_RESV_UF(m, size) m->m_data += size
-#define SCTP_BUF_AT(m, size) m->m_data + size
-#define SCTP_BUF_IS_EXTENDED(m) (m->m_flags & M_EXT)
-#define SCTP_BUF_EXTEND_SIZE(m) (m->m_ext.ext_size)
-#define SCTP_BUF_TYPE(m) (m->m_type)
-#define SCTP_BUF_RECVIF(m) (m->m_pkthdr.rcvif)
-#define SCTP_BUF_PREPEND	M_PREPEND
-
-#define SCTP_ALIGN_TO_END(m, len) if(m->m_flags & M_PKTHDR) { \
-                                     MH_ALIGN(m, len); \
-                                  } else if ((m->m_flags & M_EXT) == 0) { \
-                                     M_ALIGN(m, len); \
-                                  }
-
-/* We make it so if you have up to 4 threads
- * writing based on the default size of
- * the packet log 65 k, that would be
- * 4 16k packets before we would hit
- * a problem.
- */
-#define SCTP_PKTLOG_WRITERS_NEED_LOCK 3
-
-/*************************/
-/*      MTU              */
-/*************************/
-#define SCTP_GATHER_MTU_FROM_IFN_INFO(ifn, ifn_index, af) ((struct ifnet *)ifn)->if_mtu
-#define SCTP_GATHER_MTU_FROM_ROUTE(sctp_ifa, sa, rt) ((uint32_t)((rt != NULL) ? rt->rt_mtu : 0))
-#define SCTP_GATHER_MTU_FROM_INTFC(sctp_ifn) ((sctp_ifn->ifn_p != NULL) ? ((struct ifnet *)(sctp_ifn->ifn_p))->if_mtu : 0)
-#define SCTP_SET_MTU_OF_ROUTE(sa, rt, mtu) do { \
-                                              if (rt != NULL) \
-                                                 rt->rt_mtu = mtu; \
-                                           } while(0)
-
-/* (de-)register interface event notifications */
-#define SCTP_REGISTER_INTERFACE(ifhandle, af)
-#define SCTP_DEREGISTER_INTERFACE(ifhandle, af)
-
-
-/*************************/
-/* These are for logging */
-/*************************/
-/* return the base ext data pointer */
-#define SCTP_BUF_EXTEND_BASE(m) (m->m_ext.ext_buf)
- /* return the refcnt of the data pointer */
-#define SCTP_BUF_EXTEND_REFCNT(m) (*m->m_ext.ref_cnt)
-/* return any buffer related flags, this is
- * used beyond logging for apple only.
- */
-#define SCTP_BUF_GET_FLAGS(m) (m->m_flags)
-
-/* For BSD this just accesses the M_PKTHDR length
- * so it operates on an mbuf with hdr flag. Other
- * O/S's may have separate packet header and mbuf
- * chain pointers.. thus the macro.
- */
-#define SCTP_HEADER_TO_CHAIN(m) (m)
-#define SCTP_DETACH_HEADER_FROM_CHAIN(m)
-#define SCTP_HEADER_LEN(m) ((m)->m_pkthdr.len)
-#define SCTP_GET_HEADER_FOR_OUTPUT(o_pak) 0
-#define SCTP_RELEASE_HEADER(m)
-#define SCTP_RELEASE_PKT(m)	sctp_m_freem(m)
-#define SCTP_ENABLE_UDP_CSUM(m) do { \
-					m->m_pkthdr.csum_flags = CSUM_UDP; \
-					m->m_pkthdr.csum_data = offsetof(struct udphdr, uh_sum); \
-				} while (0)
-
-#define SCTP_GET_PKT_VRFID(m, vrf_id)  ((vrf_id = SCTP_DEFAULT_VRFID) != SCTP_DEFAULT_VRFID)
-
-
-
-/* Attach the chain of data into the sendable packet. */
-#define SCTP_ATTACH_CHAIN(pak, m, packet_length) do { \
-                                                 pak = m; \
-                                                 pak->m_pkthdr.len = packet_length; \
-                         } while(0)
-
-/* Other m_pkthdr type things */
-#define SCTP_IS_IT_BROADCAST(dst, m) ((m->m_flags & M_PKTHDR) ? in_broadcast(dst, m->m_pkthdr.rcvif) : 0)
-#define SCTP_IS_IT_LOOPBACK(m) ((m->m_flags & M_PKTHDR) && ((m->m_pkthdr.rcvif == NULL) || (m->m_pkthdr.rcvif->if_type == IFT_LOOP)))
-
-
-/* This converts any input packet header
- * into the chain of data holders, for BSD
- * its a NOP.
- */
-
-/* get the v6 hop limit */
-#define SCTP_GET_HLIM(inp, ro)	in6_selecthlim((struct in6pcb *)&inp->ip_inp.inp, (ro ? (ro->ro_rt ? (ro->ro_rt->rt_ifp) : (NULL)) : (NULL)));
-
-/* is the endpoint v6only? */
-#define SCTP_IPV6_V6ONLY(inp)	(((struct inpcb *)inp)->inp_flags & IN6P_IPV6_V6ONLY)
-/* is the socket non-blocking? */
-#define SCTP_SO_IS_NBIO(so)	((so)->so_state & SS_NBIO)
-#define SCTP_SET_SO_NBIO(so)	((so)->so_state |= SS_NBIO)
-#define SCTP_CLEAR_SO_NBIO(so)	((so)->so_state &= ~SS_NBIO)
-/* get the socket type */
-#define SCTP_SO_TYPE(so)	((so)->so_type)
-/* reserve sb space for a socket */
-#define SCTP_SORESERVE(so, send, recv)	soreserve(so, send, recv)
-/* wakeup a socket */
-#define SCTP_SOWAKEUP(so)	wakeup(&(so)->so_timeo)
-/* clear the socket buffer state */
-#define SCTP_SB_CLEAR(sb)	\
-	(sb).sb_cc = 0;		\
-	(sb).sb_mb = NULL;	\
-	(sb).sb_mbcnt = 0;
-
-#define SCTP_SB_LIMIT_RCV(so) so->so_rcv.sb_hiwat
-#define SCTP_SB_LIMIT_SND(so) so->so_snd.sb_hiwat
-
-/*
- * routes, output, etc.
- */
-typedef struct route sctp_route_t;
-typedef struct rtentry sctp_rtentry_t;
-
-#define SCTP_RTALLOC(ro, vrf_id, fibnum) \
-	rtalloc_ign_fib((struct route *)ro, 0UL, fibnum)
-
-/* Future zero copy wakeup/send  function */
-#define SCTP_ZERO_COPY_EVENT(inp, so)
-/* This is re-pulse ourselves for sendbuf */
-#define SCTP_ZERO_COPY_SENDQ_EVENT(inp, so)
-
-/*
- * SCTP protocol specific mbuf flags.
- */
-#define	M_NOTIFICATION		M_PROTO1	/* SCTP notification */
-
-/*
- * IP output routines
- */
-#define SCTP_IP_OUTPUT(result, o_pak, ro, stcb, vrf_id) \
-{ \
-	int o_flgs = IP_RAWOUTPUT; \
-	struct sctp_tcb *local_stcb = stcb; \
-	if (local_stcb && \
-	    local_stcb->sctp_ep && \
-	    local_stcb->sctp_ep->sctp_socket) \
-		o_flgs |= local_stcb->sctp_ep->sctp_socket->so_options & SO_DONTROUTE; \
-	m_clrprotoflags(o_pak); \
-	result = ip_output(o_pak, NULL, ro, o_flgs, 0, NULL); \
-}
-
-#define SCTP_IP6_OUTPUT(result, o_pak, ro, ifp, stcb, vrf_id) \
-{ \
-	struct sctp_tcb *local_stcb = stcb; \
-	m_clrprotoflags(o_pak); \
-	if (local_stcb && local_stcb->sctp_ep) \
-		result = ip6_output(o_pak, \
-				    ((struct in6pcb *)(local_stcb->sctp_ep))->in6p_outputopts, \
-				    (ro), 0, 0, ifp, NULL); \
-	else \
-		result = ip6_output(o_pak, NULL, (ro), 0, 0, ifp, NULL); \
-}
-
-struct mbuf *
-sctp_get_mbuf_for_msg(unsigned int space_needed,
-    int want_header, int how, int allonebuf, int type);
-
-
-/*
- * SCTP AUTH
- */
-#define SCTP_READ_RANDOM(buf, len)	read_random(buf, len)
-
-/* map standard crypto API names */
-#define SCTP_SHA1_CTX		SHA1_CTX
-#define SCTP_SHA1_INIT		SHA1Init
-#define SCTP_SHA1_UPDATE	SHA1Update
-#define SCTP_SHA1_FINAL(x,y)	SHA1Final((caddr_t)x, y)
-
-#define SCTP_SHA256_CTX		SHA256_CTX
-#define SCTP_SHA256_INIT	SHA256_Init
-#define SCTP_SHA256_UPDATE	SHA256_Update
-#define SCTP_SHA256_FINAL(x,y)	SHA256_Final((caddr_t)x, y)
-
-#endif
-
-#define SCTP_DECREMENT_AND_CHECK_REFCOUNT(addr) (atomic_fetchadd_int(addr, -1) == 1)
-#if defined(INVARIANTS)
-#define SCTP_SAVE_ATOMIC_DECREMENT(addr, val) \
-{ \
-	int32_t oldval; \
-	oldval = atomic_fetchadd_int(addr, -val); \
-	if (oldval < val) { \
-		panic("Counter goes negative"); \
-	} \
-}
-#else
-#define SCTP_SAVE_ATOMIC_DECREMENT(addr, val) \
-{ \
-	int32_t oldval; \
-	oldval = atomic_fetchadd_int(addr, -val); \
-	if (oldval < val) { \
-		*addr = 0; \
-	} \
-}
-#endif
diff --git a/include.new/netinet/sctp_output.h b/include.new/netinet/sctp_output.h
deleted file mode 100644
index a4fdd94..0000000
--- a/include.new/netinet/sctp_output.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_output.h 284633 2015-06-20 08:25:27Z tuexen $");
-
-#ifndef _NETINET_SCTP_OUTPUT_H_
-#define _NETINET_SCTP_OUTPUT_H_
-
-#include <netinet/sctp_header.h>
-
-#if defined(_KERNEL) || defined(__Userspace__)
-
-
-struct mbuf *
-sctp_add_addresses_to_i_ia(struct sctp_inpcb *inp,
-    struct sctp_tcb *stcb,
-    struct sctp_scoping *scope,
-    struct mbuf *m_at,
-    int cnt_inits_to,
-    uint16_t * padding_len, uint16_t * chunk_len);
-
-
-int sctp_is_addr_restricted(struct sctp_tcb *, struct sctp_ifa *);
-
-
-int
-sctp_is_address_in_scope(struct sctp_ifa *ifa,
-    struct sctp_scoping *scope,
-    int do_update);
-
-int
-    sctp_is_addr_in_ep(struct sctp_inpcb *inp, struct sctp_ifa *ifa);
-
-struct sctp_ifa *
-sctp_source_address_selection(struct sctp_inpcb *inp,
-    struct sctp_tcb *stcb,
-    sctp_route_t * ro, struct sctp_nets *net,
-    int non_asoc_addr_ok, uint32_t vrf_id);
-
-int
-    sctp_v6src_match_nexthop(struct sockaddr_in6 *src6, sctp_route_t * ro);
-int
-    sctp_v4src_match_nexthop(struct sctp_ifa *sifa, sctp_route_t * ro);
-
-void 
-sctp_send_initiate(struct sctp_inpcb *, struct sctp_tcb *, int
-#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
-    SCTP_UNUSED
-#endif
-);
-
-void
-sctp_send_initiate_ack(struct sctp_inpcb *, struct sctp_tcb *, struct mbuf *,
-    int, int,
-    struct sockaddr *, struct sockaddr *,
-    struct sctphdr *, struct sctp_init_chunk *,
-    uint8_t, uint32_t,
-    uint32_t, uint16_t, int);
-
-struct mbuf *
-sctp_arethere_unrecognized_parameters(struct mbuf *, int, int *,
-    struct sctp_chunkhdr *, int *);
-void sctp_queue_op_err(struct sctp_tcb *, struct mbuf *);
-
-int
-sctp_send_cookie_echo(struct mbuf *, int, struct sctp_tcb *,
-    struct sctp_nets *);
-
-void sctp_send_cookie_ack(struct sctp_tcb *);
-
-void
-sctp_send_heartbeat_ack(struct sctp_tcb *, struct mbuf *, int, int,
-    struct sctp_nets *);
-
-void
-sctp_remove_from_wheel(struct sctp_tcb *stcb,
-    struct sctp_association *asoc,
-    struct sctp_stream_out *strq, int holds_lock);
-
-
-void sctp_send_shutdown(struct sctp_tcb *, struct sctp_nets *);
-
-void sctp_send_shutdown_ack(struct sctp_tcb *, struct sctp_nets *);
-
-void sctp_send_shutdown_complete(struct sctp_tcb *, struct sctp_nets *, int);
-
-void 
-sctp_send_shutdown_complete2(struct sockaddr *, struct sockaddr *,
-    struct sctphdr *,
-    uint8_t, uint32_t, uint16_t,
-    uint32_t, uint16_t);
-
-void sctp_send_asconf(struct sctp_tcb *, struct sctp_nets *, int addr_locked);
-
-void sctp_send_asconf_ack(struct sctp_tcb *);
-
-int sctp_get_frag_point(struct sctp_tcb *, struct sctp_association *);
-
-void sctp_toss_old_cookies(struct sctp_tcb *, struct sctp_association *);
-
-void sctp_toss_old_asconf(struct sctp_tcb *);
-
-void sctp_fix_ecn_echo(struct sctp_association *);
-
-void sctp_move_chunks_from_net(struct sctp_tcb *stcb, struct sctp_nets *net);
-
-int
-sctp_output(struct sctp_inpcb *, struct mbuf *, struct sockaddr *,
-    struct mbuf *, struct thread *, int);
-
-void 
-sctp_chunk_output(struct sctp_inpcb *, struct sctp_tcb *, int, int
-#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
-    SCTP_UNUSED
-#endif
-);
-void 
-sctp_send_abort_tcb(struct sctp_tcb *, struct mbuf *, int
-#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
-    SCTP_UNUSED
-#endif
-);
-
-void send_forward_tsn(struct sctp_tcb *, struct sctp_association *);
-
-void sctp_send_sack(struct sctp_tcb *, int);
-
-void sctp_send_hb(struct sctp_tcb *, struct sctp_nets *, int);
-
-void sctp_send_ecn_echo(struct sctp_tcb *, struct sctp_nets *, uint32_t);
-
-
-void
-sctp_send_packet_dropped(struct sctp_tcb *, struct sctp_nets *, struct mbuf *,
-    int, int, int);
-
-
-
-void sctp_send_cwr(struct sctp_tcb *, struct sctp_nets *, uint32_t, uint8_t);
-
-
-void
-sctp_add_stream_reset_out(struct sctp_tmit_chunk *,
-    int, uint16_t *, uint32_t, uint32_t, uint32_t);
-
-void
-     sctp_add_stream_reset_result(struct sctp_tmit_chunk *, uint32_t, uint32_t);
-
-void
-sctp_add_stream_reset_result_tsn(struct sctp_tmit_chunk *,
-    uint32_t, uint32_t, uint32_t, uint32_t);
-
-int
-sctp_send_str_reset_req(struct sctp_tcb *, uint16_t, uint16_t *, uint8_t,
-    uint8_t, uint8_t, uint8_t, uint16_t, uint16_t, uint8_t);
-
-void
-sctp_send_abort(struct mbuf *, int, struct sockaddr *, struct sockaddr *,
-    struct sctphdr *, uint32_t, struct mbuf *,
-    uint8_t, uint32_t, uint16_t,
-    uint32_t, uint16_t);
-
-void 
-sctp_send_operr_to(struct sockaddr *, struct sockaddr *,
-    struct sctphdr *, uint32_t, struct mbuf *,
-    uint8_t, uint32_t, uint16_t,
-    uint32_t, uint16_t);
-
-#endif				/* _KERNEL || __Userspace__ */
-
-#if defined(_KERNEL) || defined(__Userspace__)
-int
-sctp_sosend(struct socket *so,
-    struct sockaddr *addr,
-    struct uio *uio,
-    struct mbuf *top,
-    struct mbuf *control,
-    int flags,
-    struct thread *p
-);
-
-#endif
-#endif
diff --git a/include.new/netinet/sctp_pcb.h b/include.new/netinet/sctp_pcb.h
deleted file mode 100644
index 49629ab..0000000
--- a/include.new/netinet/sctp_pcb.h
+++ /dev/null
@@ -1,664 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_pcb.h 284633 2015-06-20 08:25:27Z tuexen $");
-
-#ifndef _NETINET_SCTP_PCB_H_
-#define _NETINET_SCTP_PCB_H_
-
-#include <netinet/sctp_os.h>
-#include <netinet/sctp.h>
-#include <netinet/sctp_constants.h>
-#include <netinet/sctp_sysctl.h>
-
-LIST_HEAD(sctppcbhead, sctp_inpcb);
-LIST_HEAD(sctpasochead, sctp_tcb);
-LIST_HEAD(sctpladdr, sctp_laddr);
-LIST_HEAD(sctpvtaghead, sctp_tagblock);
-LIST_HEAD(sctp_vrflist, sctp_vrf);
-LIST_HEAD(sctp_ifnlist, sctp_ifn);
-LIST_HEAD(sctp_ifalist, sctp_ifa);
-TAILQ_HEAD(sctp_readhead, sctp_queued_to_read);
-TAILQ_HEAD(sctp_streamhead, sctp_stream_queue_pending);
-
-#include <netinet/sctp_structs.h>
-#include <netinet/sctp_auth.h>
-
-#define SCTP_PCBHASH_ALLADDR(port, mask) (port & mask)
-#define SCTP_PCBHASH_ASOC(tag, mask) (tag & mask)
-
-struct sctp_vrf {
-	LIST_ENTRY(sctp_vrf) next_vrf;
-	struct sctp_ifalist *vrf_addr_hash;
-	struct sctp_ifnlist ifnlist;
-	uint32_t vrf_id;
-	uint32_t tbl_id_v4;	/* default v4 table id */
-	uint32_t tbl_id_v6;	/* default v6 table id */
-	uint32_t total_ifa_count;
-	u_long vrf_addr_hashmark;
-	uint32_t refcount;
-};
-
-struct sctp_ifn {
-	struct sctp_ifalist ifalist;
-	struct sctp_vrf *vrf;
-	         LIST_ENTRY(sctp_ifn) next_ifn;
-	         LIST_ENTRY(sctp_ifn) next_bucket;
-	void *ifn_p;		/* never access without appropriate lock */
-	uint32_t ifn_mtu;
-	uint32_t ifn_type;
-	uint32_t ifn_index;	/* shorthand way to look at ifn for reference */
-	uint32_t refcount;	/* number of reference held should be >=
-				 * ifa_count */
-	uint32_t ifa_count;	/* IFA's we hold (in our list - ifalist) */
-	uint32_t num_v6;	/* number of v6 addresses */
-	uint32_t num_v4;	/* number of v4 addresses */
-	uint32_t registered_af;	/* registered address family for i/f events */
-	char ifn_name[SCTP_IFNAMSIZ];
-};
-
-/* SCTP local IFA flags */
-#define SCTP_ADDR_VALID         0x00000001	/* its up and active */
-#define SCTP_BEING_DELETED      0x00000002	/* being deleted, when
-						 * refcount = 0. Note that it
-						 * is pulled from the ifn list
-						 * and ifa_p is nulled right
-						 * away but it cannot be freed
-						 * until the last *net
-						 * pointing to it is deleted. */
-#define SCTP_ADDR_DEFER_USE     0x00000004	/* Hold off using this one */
-#define SCTP_ADDR_IFA_UNUSEABLE 0x00000008
-
-struct sctp_ifa {
-	LIST_ENTRY(sctp_ifa) next_ifa;
-	LIST_ENTRY(sctp_ifa) next_bucket;
-	struct sctp_ifn *ifn_p;	/* back pointer to parent ifn */
-	void *ifa;		/* pointer to ifa, needed for flag update for
-				 * that we MUST lock appropriate locks. This
-				 * is for V6. */
-	union sctp_sockstore address;
-	uint32_t refcount;	/* number of folks refering to this */
-	uint32_t flags;
-	uint32_t localifa_flags;
-	uint32_t vrf_id;	/* vrf_id of this addr (for deleting) */
-	uint8_t src_is_loop;
-	uint8_t src_is_priv;
-	uint8_t src_is_glob;
-	uint8_t resv;
-};
-
-struct sctp_laddr {
-	LIST_ENTRY(sctp_laddr) sctp_nxt_addr;	/* next in list */
-	struct sctp_ifa *ifa;
-	uint32_t action;	/* Used during asconf and adding if no-zero
-				 * src-addr selection will not consider this
-				 * address. */
-	struct timeval start_time;	/* time when this address was created */
-};
-
-struct sctp_block_entry {
-	int error;
-};
-
-struct sctp_timewait {
-	uint32_t tv_sec_at_expire;	/* the seconds from boot to expire */
-	uint32_t v_tag;		/* the vtag that can not be reused */
-	uint16_t lport;		/* the local port used in vtag */
-	uint16_t rport;		/* the remote port used in vtag */
-};
-
-struct sctp_tagblock {
-	LIST_ENTRY(sctp_tagblock) sctp_nxt_tagblock;
-	struct sctp_timewait vtag_block[SCTP_NUMBER_IN_VTAG_BLOCK];
-};
-
-
-struct sctp_epinfo {
-#ifdef INET
-	struct socket *udp4_tun_socket;
-#endif
-#ifdef INET6
-	struct socket *udp6_tun_socket;
-#endif
-	struct sctpasochead *sctp_asochash;
-	u_long hashasocmark;
-
-	struct sctppcbhead *sctp_ephash;
-	u_long hashmark;
-
-	/*-
-	 * The TCP model represents a substantial overhead in that we get an
-	 * additional hash table to keep explicit connections in. The
-	 * listening TCP endpoint will exist in the usual ephash above and
-	 * accept only INIT's. It will be incapable of sending off an INIT.
-	 * When a dg arrives we must look in the normal ephash. If we find a
-	 * TCP endpoint that will tell us to go to the specific endpoint
-	 * hash and re-hash to find the right assoc/socket. If we find a UDP
-	 * model socket we then must complete the lookup. If this fails,
-	 * i.e. no association can be found then we must continue to see if
-	 * a sctp_peeloff()'d socket is in the tcpephash (a spun off socket
-	 * acts like a TCP model connected socket).
-	 */
-	struct sctppcbhead *sctp_tcpephash;
-	u_long hashtcpmark;
-	uint32_t hashtblsize;
-
-	struct sctp_vrflist *sctp_vrfhash;
-	u_long hashvrfmark;
-
-	struct sctp_ifnlist *vrf_ifn_hash;
-	u_long vrf_ifn_hashmark;
-
-	struct sctppcbhead listhead;
-	struct sctpladdr addr_wq;
-
-	/* ep zone info */
-	sctp_zone_t ipi_zone_ep;
-	sctp_zone_t ipi_zone_asoc;
-	sctp_zone_t ipi_zone_laddr;
-	sctp_zone_t ipi_zone_net;
-	sctp_zone_t ipi_zone_chunk;
-	sctp_zone_t ipi_zone_readq;
-	sctp_zone_t ipi_zone_strmoq;
-	sctp_zone_t ipi_zone_asconf;
-	sctp_zone_t ipi_zone_asconf_ack;
-
-	struct rwlock ipi_ep_mtx;
-	struct mtx ipi_iterator_wq_mtx;
-	struct rwlock ipi_addr_mtx;
-	struct mtx ipi_pktlog_mtx;
-	struct mtx wq_addr_mtx;
-	uint32_t ipi_count_ep;
-
-	/* assoc/tcb zone info */
-	uint32_t ipi_count_asoc;
-
-	/* local addrlist zone info */
-	uint32_t ipi_count_laddr;
-
-	/* remote addrlist zone info */
-	uint32_t ipi_count_raddr;
-
-	/* chunk structure list for output */
-	uint32_t ipi_count_chunk;
-
-	/* socket queue zone info */
-	uint32_t ipi_count_readq;
-
-	/* socket queue zone info */
-	uint32_t ipi_count_strmoq;
-
-	/* Number of vrfs */
-	uint32_t ipi_count_vrfs;
-
-	/* Number of ifns */
-	uint32_t ipi_count_ifns;
-
-	/* Number of ifas */
-	uint32_t ipi_count_ifas;
-
-	/* system wide number of free chunks hanging around */
-	uint32_t ipi_free_chunks;
-	uint32_t ipi_free_strmoq;
-
-	struct sctpvtaghead vtag_timewait[SCTP_STACK_VTAG_HASH_SIZE];
-
-	/* address work queue handling */
-	struct sctp_timer addr_wq_timer;
-
-};
-
-
-struct sctp_base_info {
-	/*
-	 * All static structures that anchor the system must be here.
-	 */
-	struct sctp_epinfo sctppcbinfo;
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
-	struct sctpstat *sctpstat;
-#else
-	struct sctpstat sctpstat;
-#endif
-	struct sctp_sysctl sctpsysctl;
-	uint8_t first_time;
-	char sctp_pcb_initialized;
-#if defined(SCTP_PACKET_LOGGING)
-	int packet_log_writers;
-	int packet_log_end;
-	uint8_t packet_log_buffer[SCTP_PACKET_LOG_SIZE];
-#endif
-};
-
-/*-
- * Here we have all the relevant information for each SCTP entity created. We
- * will need to modify this as approprate. We also need to figure out how to
- * access /dev/random.
- */
-struct sctp_pcb {
-	unsigned int time_of_secret_change;	/* number of seconds from
-						 * timeval.tv_sec */
-	uint32_t secret_key[SCTP_HOW_MANY_SECRETS][SCTP_NUMBER_OF_SECRETS];
-	unsigned int size_of_a_cookie;
-
-	unsigned int sctp_timeoutticks[SCTP_NUM_TMRS];
-	unsigned int sctp_minrto;
-	unsigned int sctp_maxrto;
-	unsigned int initial_rto;
-	int initial_init_rto_max;
-
-	unsigned int sctp_sack_freq;
-	uint32_t sctp_sws_sender;
-	uint32_t sctp_sws_receiver;
-
-	uint32_t sctp_default_cc_module;
-	uint32_t sctp_default_ss_module;
-	/* authentication related fields */
-	struct sctp_keyhead shared_keys;
-	sctp_auth_chklist_t *local_auth_chunks;
-	sctp_hmaclist_t *local_hmacs;
-	uint16_t default_keyid;
-
-	/* various thresholds */
-	/* Max times I will init at a guy */
-	uint16_t max_init_times;
-
-	/* Max times I will send before we consider someone dead */
-	uint16_t max_send_times;
-
-	uint16_t def_net_failure;
-
-	uint16_t def_net_pf_threshold;
-
-	/* number of streams to pre-open on a association */
-	uint16_t pre_open_stream_count;
-	uint16_t max_open_streams_intome;
-
-	/* random number generator */
-	uint32_t random_counter;
-	uint8_t random_numbers[SCTP_SIGNATURE_ALOC_SIZE];
-	uint8_t random_store[SCTP_SIGNATURE_ALOC_SIZE];
-
-	/*
-	 * This timer is kept running per endpoint.  When it fires it will
-	 * change the secret key.  The default is once a hour
-	 */
-	struct sctp_timer signature_change;
-
-	/* Zero copy full buffer timer */
-	struct sctp_timer zero_copy_timer;
-	/* Zero copy app to transport (sendq) read repulse timer */
-	struct sctp_timer zero_copy_sendq_timer;
-	uint32_t def_cookie_life;
-	/* defaults to 0 */
-	int auto_close_time;
-	uint32_t initial_sequence_debug;
-	uint32_t adaptation_layer_indicator;
-	uint8_t adaptation_layer_indicator_provided;
-	uint32_t store_at;
-	uint32_t max_burst;
-	uint32_t fr_max_burst;
-#ifdef INET6
-	uint32_t default_flowlabel;
-#endif
-	uint8_t default_dscp;
-	char current_secret_number;
-	char last_secret_number;
-	uint16_t port;		/* remote UDP encapsulation port */
-};
-
-#ifndef SCTP_ALIGNMENT
-#define SCTP_ALIGNMENT 32
-#endif
-
-#ifndef SCTP_ALIGNM1
-#define SCTP_ALIGNM1 (SCTP_ALIGNMENT-1)
-#endif
-
-#define sctp_lport ip_inp.inp.inp_lport
-
-struct sctp_pcbtsn_rlog {
-	uint32_t vtag;
-	uint16_t strm;
-	uint16_t seq;
-	uint16_t sz;
-	uint16_t flgs;
-};
-
-#define SCTP_READ_LOG_SIZE 135	/* we choose the number to make a pcb a page */
-
-
-struct sctp_inpcb {
-	/*-
-	 * put an inpcb in front of it all, kind of a waste but we need to
-	 * for compatability with all the other stuff.
-	 */
-	union {
-		struct inpcb inp;
-		char align[(sizeof(struct in6pcb) + SCTP_ALIGNM1) &
-		        ~SCTP_ALIGNM1];
-	}     ip_inp;
-
-
-	/* Socket buffer lock protects read_queue and of course sb_cc */
-	struct sctp_readhead read_queue;
-
-	              LIST_ENTRY(sctp_inpcb) sctp_list;	/* lists all endpoints */
-	/* hash of all endpoints for model */
-	              LIST_ENTRY(sctp_inpcb) sctp_hash;
-	/* count of local addresses bound, 0 if bound all */
-	int laddr_count;
-
-	/* list of addrs in use by the EP, NULL if bound-all */
-	struct sctpladdr sctp_addr_list;
-	/*
-	 * used for source address selection rotation when we are subset
-	 * bound
-	 */
-	struct sctp_laddr *next_addr_touse;
-
-	/* back pointer to our socket */
-	struct socket *sctp_socket;
-	uint64_t sctp_features;	/* Feature flags */
-	uint32_t sctp_flags;	/* INP state flag set */
-	uint32_t sctp_mobility_features;	/* Mobility  Feature flags */
-	struct sctp_pcb sctp_ep;/* SCTP ep data */
-	/* head of the hash of all associations */
-	struct sctpasochead *sctp_tcbhash;
-	u_long sctp_hashmark;
-	/* head of the list of all associations */
-	struct sctpasochead sctp_asoc_list;
-#ifdef SCTP_TRACK_FREED_ASOCS
-	struct sctpasochead sctp_asoc_free_list;
-#endif
-	struct sctp_iterator *inp_starting_point_for_iterator;
-	uint32_t sctp_frag_point;
-	uint32_t partial_delivery_point;
-	uint32_t sctp_context;
-	uint32_t max_cwnd;
-	uint8_t local_strreset_support;
-	uint32_t sctp_cmt_on_off;
-	uint8_t ecn_supported;
-	uint8_t prsctp_supported;
-	uint8_t auth_supported;
-	uint8_t asconf_supported;
-	uint8_t reconfig_supported;
-	uint8_t nrsack_supported;
-	uint8_t pktdrop_supported;
-	struct sctp_nonpad_sndrcvinfo def_send;
-	/*-
-	 * These three are here for the sosend_dgram
-	 * (pkt, pkt_last and control).
-	 * routine. However, I don't think anyone in
-	 * the current FreeBSD kernel calls this. So
-	 * they are candidates with sctp_sendm for
-	 * de-supporting.
-	 */
-	struct mbuf *pkt, *pkt_last;
-	struct mbuf *control;
-	struct mtx inp_mtx;
-	struct mtx inp_create_mtx;
-	struct mtx inp_rdata_mtx;
-	int32_t refcount;
-	uint32_t def_vrf_id;
-	uint16_t fibnum;
-	uint32_t total_sends;
-	uint32_t total_recvs;
-	uint32_t last_abort_code;
-	uint32_t total_nospaces;
-	struct sctpasochead *sctp_asocidhash;
-	u_long hashasocidmark;
-	uint32_t sctp_associd_counter;
-
-#ifdef SCTP_ASOCLOG_OF_TSNS
-	struct sctp_pcbtsn_rlog readlog[SCTP_READ_LOG_SIZE];
-	uint32_t readlog_index;
-#endif
-};
-
-struct sctp_tcb {
-	struct socket *sctp_socket;	/* back pointer to socket */
-	struct sctp_inpcb *sctp_ep;	/* back pointer to ep */
-	           LIST_ENTRY(sctp_tcb) sctp_tcbhash;	/* next link in hash
-							 * table */
-	           LIST_ENTRY(sctp_tcb) sctp_tcblist;	/* list of all of the
-							 * TCB's */
-	           LIST_ENTRY(sctp_tcb) sctp_tcbasocidhash;	/* next link in asocid
-								 * hash table */
-	           LIST_ENTRY(sctp_tcb) sctp_asocs;	/* vtag hash list */
-	struct sctp_block_entry *block_entry;	/* pointer locked by  socket
-						 * send buffer */
-	struct sctp_association asoc;
-	/*-
-	 * freed_by_sorcv_sincelast is protected by the sockbuf_lock NOT the
-	 * tcb_lock. Its special in this way to help avoid extra mutex calls
-	 * in the reading of data.
-	 */
-	uint32_t freed_by_sorcv_sincelast;
-	uint32_t total_sends;
-	uint32_t total_recvs;
-	int freed_from_where;
-	uint16_t rport;		/* remote port in network format */
-	uint16_t resv;
-	struct mtx tcb_mtx;
-	struct mtx tcb_send_mtx;
-};
-
-
-
-#include <netinet/sctp_lock_bsd.h>
-
-
-/* TODO where to put non-_KERNEL things for __Userspace__? */
-#if defined(_KERNEL) || defined(__Userspace__)
-
-/* Attention Julian, this is the extern that
- * goes with the base info. sctp_pcb.c has
- * the real definition.
- */
-VNET_DECLARE(struct sctp_base_info, system_base_info);
-
-#ifdef INET6
-int SCTP6_ARE_ADDR_EQUAL(struct sockaddr_in6 *a, struct sockaddr_in6 *b);
-
-#endif
-
-void sctp_fill_pcbinfo(struct sctp_pcbinfo *);
-
-struct sctp_ifn *
-         sctp_find_ifn(void *ifn, uint32_t ifn_index);
-
-struct sctp_vrf *sctp_allocate_vrf(int vrfid);
-struct sctp_vrf *sctp_find_vrf(uint32_t vrfid);
-void sctp_free_vrf(struct sctp_vrf *vrf);
-
-/*-
- * Change address state, can be used if
- * O/S supports telling transports about
- * changes to IFA/IFN's (link layer triggers).
- * If a ifn goes down, we will do src-addr-selection
- * and NOT use that, as a source address. This does
- * not stop the routing system from routing out
- * that interface, but we won't put it as a source.
- */
-void sctp_mark_ifa_addr_down(uint32_t vrf_id, struct sockaddr *addr, const char *if_name, uint32_t ifn_index);
-void sctp_mark_ifa_addr_up(uint32_t vrf_id, struct sockaddr *addr, const char *if_name, uint32_t ifn_index);
-
-struct sctp_ifa *
-sctp_add_addr_to_vrf(uint32_t vrfid,
-    void *ifn, uint32_t ifn_index, uint32_t ifn_type,
-    const char *if_name,
-    void *ifa, struct sockaddr *addr, uint32_t ifa_flags,
-    int dynamic_add);
-
-void sctp_update_ifn_mtu(uint32_t ifn_index, uint32_t mtu);
-
-void sctp_free_ifn(struct sctp_ifn *sctp_ifnp);
-void sctp_free_ifa(struct sctp_ifa *sctp_ifap);
-
-
-void 
-sctp_del_addr_from_vrf(uint32_t vrfid, struct sockaddr *addr,
-    uint32_t ifn_index, const char *if_name);
-
-
-
-struct sctp_nets *sctp_findnet(struct sctp_tcb *, struct sockaddr *);
-
-struct sctp_inpcb *sctp_pcb_findep(struct sockaddr *, int, int, uint32_t);
-
-int 
-sctp_inpcb_bind(struct socket *, struct sockaddr *,
-    struct sctp_ifa *, struct thread *);
-
-struct sctp_tcb *
-sctp_findassociation_addr(struct mbuf *, int,
-    struct sockaddr *, struct sockaddr *,
-    struct sctphdr *, struct sctp_chunkhdr *, struct sctp_inpcb **,
-    struct sctp_nets **, uint32_t vrf_id);
-
-struct sctp_tcb *
-sctp_findassociation_addr_sa(struct sockaddr *,
-    struct sockaddr *, struct sctp_inpcb **, struct sctp_nets **, int, uint32_t);
-
-void
-sctp_move_pcb_and_assoc(struct sctp_inpcb *, struct sctp_inpcb *,
-    struct sctp_tcb *);
-
-/*-
- * For this call ep_addr, the to is the destination endpoint address of the
- * peer (relative to outbound). The from field is only used if the TCP model
- * is enabled and helps distingush amongst the subset bound (non-boundall).
- * The TCP model MAY change the actual ep field, this is why it is passed.
- */
-struct sctp_tcb *
-sctp_findassociation_ep_addr(struct sctp_inpcb **,
-    struct sockaddr *, struct sctp_nets **, struct sockaddr *,
-    struct sctp_tcb *);
-
-struct sctp_tcb *
-         sctp_findasoc_ep_asocid_locked(struct sctp_inpcb *inp, sctp_assoc_t asoc_id, int want_lock);
-
-struct sctp_tcb *
-sctp_findassociation_ep_asocid(struct sctp_inpcb *,
-    sctp_assoc_t, int);
-
-struct sctp_tcb *
-sctp_findassociation_ep_asconf(struct mbuf *, int, struct sockaddr *,
-    struct sctphdr *, struct sctp_inpcb **, struct sctp_nets **, uint32_t vrf_id);
-
-int sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id);
-
-int sctp_is_address_on_local_host(struct sockaddr *addr, uint32_t vrf_id);
-
-void sctp_inpcb_free(struct sctp_inpcb *, int, int);
-
-struct sctp_tcb *
-sctp_aloc_assoc(struct sctp_inpcb *, struct sockaddr *,
-    int *, uint32_t, uint32_t, struct thread *);
-
-int sctp_free_assoc(struct sctp_inpcb *, struct sctp_tcb *, int, int);
-
-
-void sctp_delete_from_timewait(uint32_t, uint16_t, uint16_t);
-
-int sctp_is_in_timewait(uint32_t tag, uint16_t lport, uint16_t rport);
-
-void
-     sctp_add_vtag_to_timewait(uint32_t tag, uint32_t time, uint16_t lport, uint16_t rport);
-
-void sctp_add_local_addr_ep(struct sctp_inpcb *, struct sctp_ifa *, uint32_t);
-
-int sctp_insert_laddr(struct sctpladdr *, struct sctp_ifa *, uint32_t);
-
-void sctp_remove_laddr(struct sctp_laddr *);
-
-void sctp_del_local_addr_ep(struct sctp_inpcb *, struct sctp_ifa *);
-
-int sctp_add_remote_addr(struct sctp_tcb *, struct sockaddr *, struct sctp_nets **, int, int);
-
-void sctp_remove_net(struct sctp_tcb *, struct sctp_nets *);
-
-int sctp_del_remote_addr(struct sctp_tcb *, struct sockaddr *);
-
-void sctp_pcb_init(void);
-
-void sctp_pcb_finish(void);
-
-void sctp_add_local_addr_restricted(struct sctp_tcb *, struct sctp_ifa *);
-void sctp_del_local_addr_restricted(struct sctp_tcb *, struct sctp_ifa *);
-
-int
-sctp_load_addresses_from_init(struct sctp_tcb *, struct mbuf *, int, int,
-    struct sockaddr *, struct sockaddr *, struct sockaddr *);
-
-int
-sctp_set_primary_addr(struct sctp_tcb *, struct sockaddr *,
-    struct sctp_nets *);
-
-int sctp_is_vtag_good(uint32_t, uint16_t lport, uint16_t rport, struct timeval *);
-
-/* void sctp_drain(void); */
-
-int sctp_destination_is_reachable(struct sctp_tcb *, struct sockaddr *);
-
-int sctp_swap_inpcb_for_listen(struct sctp_inpcb *inp);
-
-/*-
- * Null in last arg inpcb indicate run on ALL ep's. Specific inp in last arg
- * indicates run on ONLY assoc's of the specified endpoint.
- */
-int
-sctp_initiate_iterator(inp_func inpf,
-    asoc_func af,
-    inp_func inpe,
-    uint32_t, uint32_t,
-    uint32_t, void *,
-    uint32_t,
-    end_func ef,
-    struct sctp_inpcb *,
-    uint8_t co_off);
-
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
-void
-     sctp_queue_to_mcore(struct mbuf *m, int off, int cpu_to_use);
-
-#endif
-
-#ifdef INVARIANTS
-void
-     sctp_validate_no_locks(struct sctp_inpcb *inp);
-
-#endif
-
-#endif				/* _KERNEL */
-#endif				/* !__sctp_pcb_h__ */
diff --git a/include.new/netinet/sctp_peeloff.h b/include.new/netinet/sctp_peeloff.h
deleted file mode 100644
index 67b3878..0000000
--- a/include.new/netinet/sctp_peeloff.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_peeloff.h 243516 2012-11-25 14:25:08Z tuexen $");
-
-#ifndef _NETINET_SCTP_PEELOFF_H_
-#define _NETINET_SCTP_PEELOFF_H_
-#if defined(_KERNEL)
-int sctp_can_peel_off(struct socket *, sctp_assoc_t);
-int sctp_do_peeloff(struct socket *, struct socket *, sctp_assoc_t);
-
-#endif				/* _KERNEL */
-#endif				/* _NETINET_SCTP_PEELOFF_H_ */
diff --git a/include.new/netinet/sctp_structs.h b/include.new/netinet/sctp_structs.h
deleted file mode 100644
index c7f06ba..0000000
--- a/include.new/netinet/sctp_structs.h
+++ /dev/null
@@ -1,1224 +0,0 @@
-/*-
- * Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_structs.h 283736 2015-05-29 13:26:05Z tuexen $");
-
-#ifndef _NETINET_SCTP_STRUCTS_H_
-#define _NETINET_SCTP_STRUCTS_H_
-
-#include <netinet/sctp_os.h>
-#include <netinet/sctp_header.h>
-#include <netinet/sctp_auth.h>
-
-struct sctp_timer {
-	sctp_os_timer_t timer;
-
-	int type;
-	/*
-	 * Depending on the timer type these will be setup and cast with the
-	 * appropriate entity.
-	 */
-	void *ep;
-	void *tcb;
-	void *net;
-	void *vnet;
-
-	/* for sanity checking */
-	void *self;
-	uint32_t ticks;
-	uint32_t stopped_from;
-};
-
-
-struct sctp_foo_stuff {
-	struct sctp_inpcb *inp;
-	uint32_t lineno;
-	uint32_t ticks;
-	int updown;
-};
-
-
-/*
- * This is the information we track on each interface that we know about from
- * the distant end.
- */
-TAILQ_HEAD(sctpnetlisthead, sctp_nets);
-
-struct sctp_stream_reset_list {
-	TAILQ_ENTRY(sctp_stream_reset_list) next_resp;
-	uint32_t tsn;
-	uint32_t number_entries;
-	uint16_t list_of_streams[];
-};
-
-TAILQ_HEAD(sctp_resethead, sctp_stream_reset_list);
-
-/*
- * Users of the iterator need to malloc a iterator with a call to
- * sctp_initiate_iterator(inp_func, assoc_func, inp_func,  pcb_flags, pcb_features,
- *     asoc_state, void-ptr-arg, uint32-arg, end_func, inp);
- *
- * Use the following two defines if you don't care what pcb flags are on the EP
- * and/or you don't care what state the association is in.
- *
- * Note that if you specify an INP as the last argument then ONLY each
- * association of that single INP will be executed upon. Note that the pcb
- * flags STILL apply so if the inp you specify has different pcb_flags then
- * what you put in pcb_flags nothing will happen. use SCTP_PCB_ANY_FLAGS to
- * assure the inp you specify gets treated.
- */
-#define SCTP_PCB_ANY_FLAGS	0x00000000
-#define SCTP_PCB_ANY_FEATURES	0x00000000
-#define SCTP_ASOC_ANY_STATE	0x00000000
-
-typedef void (*asoc_func) (struct sctp_inpcb *, struct sctp_tcb *, void *ptr,
-         uint32_t val);
-typedef int (*inp_func) (struct sctp_inpcb *, void *ptr, uint32_t val);
-typedef void (*end_func) (void *ptr, uint32_t val);
-
-#if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
-/* whats on the mcore control struct */
-struct sctp_mcore_queue {
-	TAILQ_ENTRY(sctp_mcore_queue) next;
-	struct vnet *vn;
-	struct mbuf *m;
-	int off;
-	int v6;
-};
-
-TAILQ_HEAD(sctp_mcore_qhead, sctp_mcore_queue);
-
-struct sctp_mcore_ctrl {
-	SCTP_PROCESS_STRUCT thread_proc;
-	struct sctp_mcore_qhead que;
-	struct mtx core_mtx;
-	struct mtx que_mtx;
-	int running;
-	int cpuid;
-};
-
-
-#endif
-
-
-struct sctp_iterator {
-	TAILQ_ENTRY(sctp_iterator) sctp_nxt_itr;
-	struct vnet *vn;
-	struct sctp_timer tmr;
-	struct sctp_inpcb *inp;	/* current endpoint */
-	struct sctp_tcb *stcb;	/* current* assoc */
-	struct sctp_inpcb *next_inp;	/* special hook to skip to */
-	asoc_func function_assoc;	/* per assoc function */
-	inp_func function_inp;	/* per endpoint function */
-	inp_func function_inp_end;	/* end INP function */
-	end_func function_atend;/* iterator completion function */
-	void *pointer;		/* pointer for apply func to use */
-	uint32_t val;		/* value for apply func to use */
-	uint32_t pcb_flags;	/* endpoint flags being checked */
-	uint32_t pcb_features;	/* endpoint features being checked */
-	uint32_t asoc_state;	/* assoc state being checked */
-	uint32_t iterator_flags;
-	uint8_t no_chunk_output;
-	uint8_t done_current_ep;
-};
-
-/* iterator_flags values */
-#define SCTP_ITERATOR_DO_ALL_INP	0x00000001
-#define SCTP_ITERATOR_DO_SINGLE_INP	0x00000002
-
-
-TAILQ_HEAD(sctpiterators, sctp_iterator);
-
-struct sctp_copy_all {
-	struct sctp_inpcb *inp;	/* ep */
-	struct mbuf *m;
-	struct sctp_sndrcvinfo sndrcv;
-	int sndlen;
-	int cnt_sent;
-	int cnt_failed;
-};
-
-struct sctp_asconf_iterator {
-	struct sctpladdr list_of_work;
-	int cnt;
-};
-
-struct iterator_control {
-	struct mtx ipi_iterator_wq_mtx;
-	struct mtx it_mtx;
-	SCTP_PROCESS_STRUCT thread_proc;
-	struct sctpiterators iteratorhead;
-	struct sctp_iterator *cur_it;
-	uint32_t iterator_running;
-	uint32_t iterator_flags;
-};
-
-#define SCTP_ITERATOR_STOP_CUR_IT	0x00000004
-#define SCTP_ITERATOR_STOP_CUR_INP	0x00000008
-
-struct sctp_net_route {
-	sctp_rtentry_t *ro_rt;
-	void *ro_lle;
-	void *ro_ia;
-	int ro_flags;
-	union sctp_sockstore _l_addr;	/* remote peer addr */
-	struct sctp_ifa *_s_addr;	/* our selected src addr */
-};
-
-struct htcp {
-	uint16_t alpha;		/* Fixed point arith, << 7 */
-	uint8_t beta;		/* Fixed point arith, << 7 */
-	uint8_t modeswitch;	/* Delay modeswitch until we had at least one
-				 * congestion event */
-	uint32_t last_cong;	/* Time since last congestion event end */
-	uint32_t undo_last_cong;
-	uint16_t bytes_acked;
-	uint32_t bytecount;
-	uint32_t minRTT;
-	uint32_t maxRTT;
-
-	uint32_t undo_maxRTT;
-	uint32_t undo_old_maxB;
-
-	/* Bandwidth estimation */
-	uint32_t minB;
-	uint32_t maxB;
-	uint32_t old_maxB;
-	uint32_t Bi;
-	uint32_t lasttime;
-};
-
-struct rtcc_cc {
-	struct timeval tls;	/* The time we started the sending  */
-	uint64_t lbw;		/* Our last estimated bw */
-	uint64_t lbw_rtt;	/* RTT at bw estimate */
-	uint64_t bw_bytes;	/* The total bytes since this sending began */
-	uint64_t bw_tot_time;	/* The total time since sending began */
-	uint64_t new_tot_time;	/* temp holding the new value */
-	uint64_t bw_bytes_at_last_rttc;	/* What bw_bytes was at last rtt calc */
-	uint32_t cwnd_at_bw_set;/* Cwnd at last bw saved - lbw */
-	uint32_t vol_reduce;	/* cnt of voluntary reductions */
-	uint16_t steady_step;	/* The number required to be in steady state */
-	uint16_t step_cnt;	/* The current number */
-	uint8_t ret_from_eq;	/* When all things are equal what do I return
-				 * 0/1 - 1 no cc advance */
-	uint8_t use_dccc_ecn;	/* Flag to enable DCCC ECN */
-	uint8_t tls_needs_set;	/* Flag to indicate we need to set tls 0 or 1
-				 * means set at send 2 not */
-	uint8_t last_step_state;/* Last state if steady state stepdown is on */
-	uint8_t rtt_set_this_sack;	/* Flag saying this sack had RTT calc
-					 * on it */
-	uint8_t last_inst_ind;	/* Last saved inst indication */
-};
-
-
-struct sctp_nets {
-	TAILQ_ENTRY(sctp_nets) sctp_next;	/* next link */
-
-	/*
-	 * Things on the top half may be able to be split into a common
-	 * structure shared by all.
-	 */
-	struct sctp_timer pmtu_timer;
-	struct sctp_timer hb_timer;
-
-	/*
-	 * The following two in combination equate to a route entry for v6
-	 * or v4.
-	 */
-	struct sctp_net_route ro;
-
-	/* mtu discovered so far */
-	uint32_t mtu;
-	uint32_t ssthresh;	/* not sure about this one for split */
-	uint32_t last_cwr_tsn;
-	uint32_t cwr_window_tsn;
-	uint32_t ecn_ce_pkt_cnt;
-	uint32_t lost_cnt;
-	/* smoothed average things for RTT and RTO itself */
-	int lastsa;
-	int lastsv;
-	uint64_t rtt;		/* last measured rtt value in us */
-	unsigned int RTO;
-
-	/* This is used for SHUTDOWN/SHUTDOWN-ACK/SEND or INIT timers */
-	struct sctp_timer rxt_timer;
-
-	/* last time in seconds I sent to it */
-	struct timeval last_sent_time;
-	union cc_control_data {
-		struct htcp htcp_ca;	/* JRS - struct used in HTCP algorithm */
-		struct rtcc_cc rtcc;	/* rtcc module cc stuff  */
-	}               cc_mod;
-	int ref_count;
-
-	/* Congestion stats per destination */
-	/*
-	 * flight size variables and such, sorry Vern, I could not avoid
-	 * this if I wanted performance :>
-	 */
-	uint32_t flight_size;
-	uint32_t cwnd;		/* actual cwnd */
-	uint32_t prev_cwnd;	/* cwnd before any processing */
-	uint32_t ecn_prev_cwnd;	/* ECN prev cwnd at first ecn_echo seen in new
-				 * window */
-	uint32_t partial_bytes_acked;	/* in CA tracks when to incr a MTU */
-	/* tracking variables to avoid the aloc/free in sack processing */
-	unsigned int net_ack;
-	unsigned int net_ack2;
-
-	/*
-	 * JRS - 5/8/07 - Variable to track last time a destination was
-	 * active for CMT PF
-	 */
-	uint32_t last_active;
-
-	/*
-	 * CMT variables (iyengar@cis.udel.edu)
-	 */
-	uint32_t this_sack_highest_newack;	/* tracks highest TSN newly
-						 * acked for a given dest in
-						 * the current SACK. Used in
-						 * SFR and HTNA algos */
-	uint32_t pseudo_cumack;	/* CMT CUC algorithm. Maintains next expected
-				 * pseudo-cumack for this destination */
-	uint32_t rtx_pseudo_cumack;	/* CMT CUC algorithm. Maintains next
-					 * expected pseudo-cumack for this
-					 * destination */
-
-	/* CMT fast recovery variables */
-	uint32_t fast_recovery_tsn;
-	uint32_t heartbeat_random1;
-	uint32_t heartbeat_random2;
-#ifdef INET6
-	uint32_t flowlabel;
-#endif
-	uint8_t dscp;
-
-	struct timeval start_time;	/* time when this net was created */
-	uint32_t marked_retrans;/* number or DATA chunks marked for timer
-				 * based retransmissions */
-	uint32_t marked_fastretrans;
-	uint32_t heart_beat_delay;	/* Heart Beat delay in ms */
-
-	/* if this guy is ok or not ... status */
-	uint16_t dest_state;
-	/* number of timeouts to consider the destination unreachable */
-	uint16_t failure_threshold;
-	/* number of timeouts to consider the destination potentially failed */
-	uint16_t pf_threshold;
-	/* error stats on the destination */
-	uint16_t error_count;
-	/* UDP port number in case of UDP tunneling */
-	uint16_t port;
-
-	uint8_t fast_retran_loss_recovery;
-	uint8_t will_exit_fast_recovery;
-	/* Flags that probably can be combined into dest_state */
-	uint8_t fast_retran_ip;	/* fast retransmit in progress */
-	uint8_t hb_responded;
-	uint8_t saw_newack;	/* CMT's SFR algorithm flag */
-	uint8_t src_addr_selected;	/* if we split we move */
-	uint8_t indx_of_eligible_next_to_use;
-	uint8_t addr_is_local;	/* its a local address (if known) could move
-				 * in split */
-
-	/*
-	 * CMT variables (iyengar@cis.udel.edu)
-	 */
-	uint8_t find_pseudo_cumack;	/* CMT CUC algorithm. Flag used to
-					 * find a new pseudocumack. This flag
-					 * is set after a new pseudo-cumack
-					 * has been received and indicates
-					 * that the sender should find the
-					 * next pseudo-cumack expected for
-					 * this destination */
-	uint8_t find_rtx_pseudo_cumack;	/* CMT CUCv2 algorithm. Flag used to
-					 * find a new rtx-pseudocumack. This
-					 * flag is set after a new
-					 * rtx-pseudo-cumack has been received
-					 * and indicates that the sender
-					 * should find the next
-					 * rtx-pseudo-cumack expected for this
-					 * destination */
-	uint8_t new_pseudo_cumack;	/* CMT CUC algorithm. Flag used to
-					 * indicate if a new pseudo-cumack or
-					 * rtx-pseudo-cumack has been received */
-	uint8_t window_probe;	/* Doing a window probe? */
-	uint8_t RTO_measured;	/* Have we done the first measure */
-	uint8_t last_hs_used;	/* index into the last HS table entry we used */
-	uint8_t lan_type;
-	uint8_t rto_needed;
-	uint32_t flowid;
-	uint8_t flowtype;
-};
-
-
-struct sctp_data_chunkrec {
-	uint32_t TSN_seq;	/* the TSN of this transmit */
-	uint16_t stream_seq;	/* the stream sequence number of this transmit */
-	uint16_t stream_number;	/* the stream number of this guy */
-	uint32_t payloadtype;
-	uint32_t context;	/* from send */
-	uint32_t cwnd_at_send;
-	/*
-	 * part of the Highest sacked algorithm to be able to stroke counts
-	 * on ones that are FR'd.
-	 */
-	uint32_t fast_retran_tsn;	/* sending_seq at the time of FR */
-	struct timeval timetodrop;	/* time we drop it from queue */
-	uint8_t doing_fast_retransmit;
-	uint8_t rcv_flags;	/* flags pulled from data chunk on inbound for
-				 * outbound holds sending flags for PR-SCTP. */
-	uint8_t state_flags;
-	uint8_t chunk_was_revoked;
-	uint8_t fwd_tsn_cnt;
-};
-
-TAILQ_HEAD(sctpchunk_listhead, sctp_tmit_chunk);
-
-/* The lower byte is used to enumerate PR_SCTP policies */
-#define CHUNK_FLAGS_PR_SCTP_TTL	        SCTP_PR_SCTP_TTL
-#define CHUNK_FLAGS_PR_SCTP_BUF	        SCTP_PR_SCTP_BUF
-#define CHUNK_FLAGS_PR_SCTP_RTX         SCTP_PR_SCTP_RTX
-
-/* The upper byte is used as a bit mask */
-#define CHUNK_FLAGS_FRAGMENT_OK	        0x0100
-
-struct chk_id {
-	uint8_t id;
-	uint8_t can_take_data;
-};
-
-
-struct sctp_tmit_chunk {
-	union {
-		struct sctp_data_chunkrec data;
-		struct chk_id chunk_id;
-	}     rec;
-	struct sctp_association *asoc;	/* bp to asoc this belongs to */
-	struct timeval sent_rcv_time;	/* filled in if RTT being calculated */
-	struct mbuf *data;	/* pointer to mbuf chain of data */
-	struct mbuf *last_mbuf;	/* pointer to last mbuf in chain */
-	struct sctp_nets *whoTo;
-	          TAILQ_ENTRY(sctp_tmit_chunk) sctp_next;	/* next link */
-	int32_t sent;		/* the send status */
-	uint16_t snd_count;	/* number of times I sent */
-	uint16_t flags;		/* flags, such as FRAGMENT_OK */
-	uint16_t send_size;
-	uint16_t book_size;
-	uint16_t mbcnt;
-	uint16_t auth_keyid;
-	uint8_t holds_key_ref;	/* flag if auth keyid refcount is held */
-	uint8_t pad_inplace;
-	uint8_t do_rtt;
-	uint8_t book_size_scale;
-	uint8_t no_fr_allowed;
-	uint8_t copy_by_ref;
-	uint8_t window_probe;
-};
-
-/*
- * The first part of this structure MUST be the entire sinfo structure. Maybe
- * I should have made it a sub structure... we can circle back later and do
- * that if we want.
- */
-struct sctp_queued_to_read {	/* sinfo structure Pluse more */
-	uint16_t sinfo_stream;	/* off the wire */
-	uint16_t sinfo_ssn;	/* off the wire */
-	uint16_t sinfo_flags;	/* SCTP_UNORDERED from wire use SCTP_EOF for
-				 * EOR */
-	uint32_t sinfo_ppid;	/* off the wire */
-	uint32_t sinfo_context;	/* pick this up from assoc def context? */
-	uint32_t sinfo_timetolive;	/* not used by kernel */
-	uint32_t sinfo_tsn;	/* Use this in reassembly as first TSN */
-	uint32_t sinfo_cumtsn;	/* Use this in reassembly as last TSN */
-	sctp_assoc_t sinfo_assoc_id;	/* our assoc id */
-	/* Non sinfo stuff */
-	uint32_t length;	/* length of data */
-	uint32_t held_length;	/* length held in sb */
-	struct sctp_nets *whoFrom;	/* where it came from */
-	struct mbuf *data;	/* front of the mbuf chain of data with
-				 * PKT_HDR */
-	struct mbuf *tail_mbuf;	/* used for multi-part data */
-	struct mbuf *aux_data;	/* used to hold/cache  control if o/s does not
-				 * take it from us */
-	struct sctp_tcb *stcb;	/* assoc, used for window update */
-	         TAILQ_ENTRY(sctp_queued_to_read) next;
-	uint16_t port_from;
-	uint16_t spec_flags;	/* Flags to hold the notification field */
-	uint8_t do_not_ref_stcb;
-	uint8_t end_added;
-	uint8_t pdapi_aborted;
-	uint8_t some_taken;
-};
-
-/* This data structure will be on the outbound
- * stream queues. Data will be pulled off from
- * the front of the mbuf data and chunk-ified
- * by the output routines. We will custom
- * fit every chunk we pull to the send/sent
- * queue to make up the next full packet
- * if we can. An entry cannot be removed
- * from the stream_out queue until
- * the msg_is_complete flag is set. This
- * means at times data/tail_mbuf MIGHT
- * be NULL.. If that occurs it happens
- * for one of two reasons. Either the user
- * is blocked on a send() call and has not
- * awoken to copy more data down... OR
- * the user is in the explict MSG_EOR mode
- * and wrote some data, but has not completed
- * sending.
- */
-struct sctp_stream_queue_pending {
-	struct mbuf *data;
-	struct mbuf *tail_mbuf;
-	struct timeval ts;
-	struct sctp_nets *net;
-	          TAILQ_ENTRY(sctp_stream_queue_pending) next;
-	          TAILQ_ENTRY(sctp_stream_queue_pending) ss_next;
-	uint32_t length;
-	uint32_t timetolive;
-	uint32_t ppid;
-	uint32_t context;
-	uint16_t sinfo_flags;
-	uint16_t stream;
-	uint16_t act_flags;
-	uint16_t auth_keyid;
-	uint8_t holds_key_ref;
-	uint8_t msg_is_complete;
-	uint8_t some_taken;
-	uint8_t sender_all_done;
-	uint8_t put_last_out;
-	uint8_t discard_rest;
-};
-
-/*
- * this struct contains info that is used to track inbound stream data and
- * help with ordering.
- */
-TAILQ_HEAD(sctpwheelunrel_listhead, sctp_stream_in);
-struct sctp_stream_in {
-	struct sctp_readhead inqueue;
-	uint16_t stream_no;
-	uint16_t last_sequence_delivered;	/* used for re-order */
-	uint8_t delivery_started;
-};
-
-TAILQ_HEAD(sctpwheel_listhead, sctp_stream_out);
-TAILQ_HEAD(sctplist_listhead, sctp_stream_queue_pending);
-
-/* Round-robin schedulers */
-struct ss_rr {
-	/* next link in wheel */
-	TAILQ_ENTRY(sctp_stream_out) next_spoke;
-};
-
-/* Priority scheduler */
-struct ss_prio {
-	/* next link in wheel */
-	TAILQ_ENTRY(sctp_stream_out) next_spoke;
-	/* priority id */
-	uint16_t priority;
-};
-
-/* Fair Bandwidth scheduler */
-struct ss_fb {
-	/* next link in wheel */
-	TAILQ_ENTRY(sctp_stream_out) next_spoke;
-	/* stores message size */
-	int32_t rounds;
-};
-
-/*
- * This union holds all data necessary for
- * different stream schedulers.
- */
-union scheduling_data {
-	struct sctpwheel_listhead out_wheel;
-	struct sctplist_listhead out_list;
-};
-
-/*
- * This union holds all parameters per stream
- * necessary for different stream schedulers.
- */
-union scheduling_parameters {
-	struct ss_rr rr;
-	struct ss_prio prio;
-	struct ss_fb fb;
-};
-
-/* This struct is used to track the traffic on outbound streams */
-struct sctp_stream_out {
-	struct sctp_streamhead outqueue;
-	union scheduling_parameters ss_params;
-	uint32_t chunks_on_queues;
-#if defined(SCTP_DETAILED_STR_STATS)
-	uint32_t abandoned_unsent[SCTP_PR_SCTP_MAX + 1];
-	uint32_t abandoned_sent[SCTP_PR_SCTP_MAX + 1];
-#else
-	/* Only the aggregation */
-	uint32_t abandoned_unsent[1];
-	uint32_t abandoned_sent[1];
-#endif
-	uint16_t stream_no;
-	uint16_t next_sequence_send;	/* next one I expect to send out */
-	uint8_t last_msg_incomplete;
-};
-
-/* used to keep track of the addresses yet to try to add/delete */
-TAILQ_HEAD(sctp_asconf_addrhead, sctp_asconf_addr);
-struct sctp_asconf_addr {
-	TAILQ_ENTRY(sctp_asconf_addr) next;
-	struct sctp_asconf_addr_param ap;
-	struct sctp_ifa *ifa;	/* save the ifa for add/del ip */
-	uint8_t sent;		/* has this been sent yet? */
-	uint8_t special_del;	/* not to be used in lookup */
-};
-
-struct sctp_scoping {
-	uint8_t ipv4_addr_legal;
-	uint8_t ipv6_addr_legal;
-	uint8_t loopback_scope;
-	uint8_t ipv4_local_scope;
-	uint8_t local_scope;
-	uint8_t site_scope;
-};
-
-#define SCTP_TSN_LOG_SIZE 40
-
-struct sctp_tsn_log {
-	void *stcb;
-	uint32_t tsn;
-	uint16_t strm;
-	uint16_t seq;
-	uint16_t sz;
-	uint16_t flgs;
-	uint16_t in_pos;
-	uint16_t in_out;
-};
-
-#define SCTP_FS_SPEC_LOG_SIZE 200
-struct sctp_fs_spec_log {
-	uint32_t sent;
-	uint32_t total_flight;
-	uint32_t tsn;
-	uint16_t book;
-	uint8_t incr;
-	uint8_t decr;
-};
-
-/* This struct is here to cut out the compatiabilty
- * pad that bulks up both the inp and stcb. The non
- * pad portion MUST stay in complete sync with
- * sctp_sndrcvinfo... i.e. if sinfo_xxxx is added
- * this must be done here too.
- */
-struct sctp_nonpad_sndrcvinfo {
-	uint16_t sinfo_stream;
-	uint16_t sinfo_ssn;
-	uint16_t sinfo_flags;
-	uint32_t sinfo_ppid;
-	uint32_t sinfo_context;
-	uint32_t sinfo_timetolive;
-	uint32_t sinfo_tsn;
-	uint32_t sinfo_cumtsn;
-	sctp_assoc_t sinfo_assoc_id;
-	uint16_t sinfo_keynumber;
-	uint16_t sinfo_keynumber_valid;
-};
-
-/*
- * JRS - Structure to hold function pointers to the functions responsible
- * for congestion control.
- */
-
-struct sctp_cc_functions {
-	void (*sctp_set_initial_cc_param) (struct sctp_tcb *stcb, struct sctp_nets *net);
-	void (*sctp_cwnd_update_after_sack) (struct sctp_tcb *stcb,
-	         struct sctp_association *asoc,
-	         int accum_moved, int reneged_all, int will_exit);
-	void (*sctp_cwnd_update_exit_pf) (struct sctp_tcb *stcb, struct sctp_nets *net);
-	void (*sctp_cwnd_update_after_fr) (struct sctp_tcb *stcb,
-	         struct sctp_association *asoc);
-	void (*sctp_cwnd_update_after_timeout) (struct sctp_tcb *stcb,
-	         struct sctp_nets *net);
-	void (*sctp_cwnd_update_after_ecn_echo) (struct sctp_tcb *stcb,
-	         struct sctp_nets *net, int in_window, int num_pkt_lost);
-	void (*sctp_cwnd_update_after_packet_dropped) (struct sctp_tcb *stcb,
-	         struct sctp_nets *net, struct sctp_pktdrop_chunk *cp,
-	         uint32_t * bottle_bw, uint32_t * on_queue);
-	void (*sctp_cwnd_update_after_output) (struct sctp_tcb *stcb,
-	         struct sctp_nets *net, int burst_limit);
-	void (*sctp_cwnd_update_packet_transmitted) (struct sctp_tcb *stcb,
-	         struct sctp_nets *net);
-	void (*sctp_cwnd_update_tsn_acknowledged) (struct sctp_nets *net,
-	         struct sctp_tmit_chunk *);
-	void (*sctp_cwnd_new_transmission_begins) (struct sctp_tcb *stcb,
-	         struct sctp_nets *net);
-	void (*sctp_cwnd_prepare_net_for_sack) (struct sctp_tcb *stcb,
-	         struct sctp_nets *net);
-	int (*sctp_cwnd_socket_option) (struct sctp_tcb *stcb, int set, struct sctp_cc_option *);
-	void (*sctp_rtt_calculated) (struct sctp_tcb *, struct sctp_nets *, struct timeval *);
-};
-
-/*
- * RS - Structure to hold function pointers to the functions responsible
- * for stream scheduling.
- */
-struct sctp_ss_functions {
-	void (*sctp_ss_init) (struct sctp_tcb *stcb, struct sctp_association *asoc,
-	         int holds_lock);
-	void (*sctp_ss_clear) (struct sctp_tcb *stcb, struct sctp_association *asoc,
-	         int clear_values, int holds_lock);
-	void (*sctp_ss_init_stream) (struct sctp_stream_out *strq, struct sctp_stream_out *with_strq);
-	void (*sctp_ss_add_to_stream) (struct sctp_tcb *stcb, struct sctp_association *asoc,
-	         struct sctp_stream_out *strq, struct sctp_stream_queue_pending *sp, int holds_lock);
-	int (*sctp_ss_is_empty) (struct sctp_tcb *stcb, struct sctp_association *asoc);
-	void (*sctp_ss_remove_from_stream) (struct sctp_tcb *stcb, struct sctp_association *asoc,
-	         struct sctp_stream_out *strq, struct sctp_stream_queue_pending *sp, int holds_lock);
-	struct sctp_stream_out *(*sctp_ss_select_stream) (struct sctp_tcb *stcb,
-	                    struct sctp_nets *net, struct sctp_association *asoc);
-	void (*sctp_ss_scheduled) (struct sctp_tcb *stcb, struct sctp_nets *net,
-	         struct sctp_association *asoc, struct sctp_stream_out *strq, int moved_how_much);
-	void (*sctp_ss_packet_done) (struct sctp_tcb *stcb, struct sctp_nets *net,
-	         struct sctp_association *asoc);
-	int (*sctp_ss_get_value) (struct sctp_tcb *stcb, struct sctp_association *asoc,
-	        struct sctp_stream_out *strq, uint16_t * value);
-	int (*sctp_ss_set_value) (struct sctp_tcb *stcb, struct sctp_association *asoc,
-	        struct sctp_stream_out *strq, uint16_t value);
-};
-
-/* used to save ASCONF chunks for retransmission */
-TAILQ_HEAD(sctp_asconf_head, sctp_asconf);
-struct sctp_asconf {
-	TAILQ_ENTRY(sctp_asconf) next;
-	uint32_t serial_number;
-	uint16_t snd_count;
-	struct mbuf *data;
-	uint16_t len;
-};
-
-/* used to save ASCONF-ACK chunks for retransmission */
-TAILQ_HEAD(sctp_asconf_ackhead, sctp_asconf_ack);
-struct sctp_asconf_ack {
-	TAILQ_ENTRY(sctp_asconf_ack) next;
-	uint32_t serial_number;
-	struct sctp_nets *last_sent_to;
-	struct mbuf *data;
-	uint16_t len;
-};
-
-/*
- * Here we have information about each individual association that we track.
- * We probably in production would be more dynamic. But for ease of
- * implementation we will have a fixed array that we hunt for in a linear
- * fashion.
- */
-struct sctp_association {
-	/* association state */
-	int state;
-
-	/* queue of pending addrs to add/delete */
-	struct sctp_asconf_addrhead asconf_queue;
-
-	struct timeval time_entered;	/* time we entered state */
-	struct timeval time_last_rcvd;
-	struct timeval time_last_sent;
-	struct timeval time_last_sat_advance;
-	struct sctp_nonpad_sndrcvinfo def_send;
-
-	/* timers and such */
-	struct sctp_timer dack_timer;	/* Delayed ack timer */
-	struct sctp_timer asconf_timer;	/* asconf */
-	struct sctp_timer strreset_timer;	/* stream reset */
-	struct sctp_timer shut_guard_timer;	/* shutdown guard */
-	struct sctp_timer autoclose_timer;	/* automatic close timer */
-	struct sctp_timer delayed_event_timer;	/* timer for delayed events */
-	struct sctp_timer delete_prim_timer;	/* deleting primary dst */
-
-	/* list of restricted local addresses */
-	struct sctpladdr sctp_restricted_addrs;
-
-	/* last local address pending deletion (waiting for an address add) */
-	struct sctp_ifa *asconf_addr_del_pending;
-	/* Deleted primary destination (used to stop timer) */
-	struct sctp_nets *deleted_primary;
-
-	struct sctpnetlisthead nets;	/* remote address list */
-
-	/* Free chunk list */
-	struct sctpchunk_listhead free_chunks;
-
-	/* Control chunk queue */
-	struct sctpchunk_listhead control_send_queue;
-
-	/* ASCONF chunk queue */
-	struct sctpchunk_listhead asconf_send_queue;
-
-	/*
-	 * Once a TSN hits the wire it is moved to the sent_queue. We
-	 * maintain two counts here (don't know if any but retran_cnt is
-	 * needed). The idea is that the sent_queue_retran_cnt reflects how
-	 * many chunks have been marked for retranmission by either T3-rxt
-	 * or FR.
-	 */
-	struct sctpchunk_listhead sent_queue;
-	struct sctpchunk_listhead send_queue;
-
-	/* re-assembly queue for fragmented chunks on the inbound path */
-	struct sctpchunk_listhead reasmqueue;
-
-	/* Scheduling queues */
-	union scheduling_data ss_data;
-
-	/*
-	 * This pointer will be set to NULL most of the time. But when we
-	 * have a fragmented message, where we could not get out all of the
-	 * message at the last send then this will point to the stream to go
-	 * get data from.
-	 */
-	struct sctp_stream_out *locked_on_sending;
-
-	/* If an iterator is looking at me, this is it */
-	struct sctp_iterator *stcb_starting_point_for_iterator;
-
-	/* ASCONF save the last ASCONF-ACK so we can resend it if necessary */
-	struct sctp_asconf_ackhead asconf_ack_sent;
-
-	/*
-	 * pointer to last stream reset queued to control queue by us with
-	 * requests.
-	 */
-	struct sctp_tmit_chunk *str_reset;
-	/*
-	 * if Source Address Selection happening, this will rotate through
-	 * the link list.
-	 */
-	struct sctp_laddr *last_used_address;
-
-	/* stream arrays */
-	struct sctp_stream_in *strmin;
-	struct sctp_stream_out *strmout;
-	uint8_t *mapping_array;
-	/* primary destination to use */
-	struct sctp_nets *primary_destination;
-	struct sctp_nets *alternate;	/* If primary is down or PF */
-	/* For CMT */
-	struct sctp_nets *last_net_cmt_send_started;
-	/* last place I got a data chunk from */
-	struct sctp_nets *last_data_chunk_from;
-	/* last place I got a control from */
-	struct sctp_nets *last_control_chunk_from;
-
-	/* circular looking for output selection */
-	struct sctp_stream_out *last_out_stream;
-
-	/*
-	 * wait to the point the cum-ack passes req->send_reset_at_tsn for
-	 * any req on the list.
-	 */
-	struct sctp_resethead resetHead;
-
-	/* queue of chunks waiting to be sent into the local stack */
-	struct sctp_readhead pending_reply_queue;
-
-	/* JRS - the congestion control functions are in this struct */
-	struct sctp_cc_functions cc_functions;
-	/*
-	 * JRS - value to store the currently loaded congestion control
-	 * module
-	 */
-	uint32_t congestion_control_module;
-	/* RS - the stream scheduling functions are in this struct */
-	struct sctp_ss_functions ss_functions;
-	/* RS - value to store the currently loaded stream scheduling module */
-	uint32_t stream_scheduling_module;
-
-	uint32_t vrf_id;
-
-	uint32_t cookie_preserve_req;
-	/* ASCONF next seq I am sending out, inits at init-tsn */
-	uint32_t asconf_seq_out;
-	uint32_t asconf_seq_out_acked;
-	/* ASCONF last received ASCONF from peer, starts at peer's TSN-1 */
-	uint32_t asconf_seq_in;
-
-	/* next seq I am sending in str reset messages */
-	uint32_t str_reset_seq_out;
-	/* next seq I am expecting in str reset messages */
-	uint32_t str_reset_seq_in;
-
-	/* various verification tag information */
-	uint32_t my_vtag;	/* The tag to be used. if assoc is re-initited
-				 * by remote end, and I have unlocked this
-				 * will be regenerated to a new random value. */
-	uint32_t peer_vtag;	/* The peers last tag */
-
-	uint32_t my_vtag_nonce;
-	uint32_t peer_vtag_nonce;
-
-	uint32_t assoc_id;
-
-	/* This is the SCTP fragmentation threshold */
-	uint32_t smallest_mtu;
-
-	/*
-	 * Special hook for Fast retransmit, allows us to track the highest
-	 * TSN that is NEW in this SACK if gap ack blocks are present.
-	 */
-	uint32_t this_sack_highest_gap;
-
-	/*
-	 * The highest consecutive TSN that has been acked by peer on my
-	 * sends
-	 */
-	uint32_t last_acked_seq;
-
-	/* The next TSN that I will use in sending. */
-	uint32_t sending_seq;
-
-	/* Original seq number I used ??questionable to keep?? */
-	uint32_t init_seq_number;
-
-
-	/* The Advanced Peer Ack Point, as required by the PR-SCTP */
-	/* (A1 in Section 4.2) */
-	uint32_t advanced_peer_ack_point;
-
-	/*
-	 * The highest consequetive TSN at the bottom of the mapping array
-	 * (for his sends).
-	 */
-	uint32_t cumulative_tsn;
-	/*
-	 * Used to track the mapping array and its offset bits. This MAY be
-	 * lower then cumulative_tsn.
-	 */
-	uint32_t mapping_array_base_tsn;
-	/*
-	 * used to track highest TSN we have received and is listed in the
-	 * mapping array.
-	 */
-	uint32_t highest_tsn_inside_map;
-
-	/* EY - new NR variables used for nr_sack based on mapping_array */
-	uint8_t *nr_mapping_array;
-	uint32_t highest_tsn_inside_nr_map;
-
-	uint32_t fast_recovery_tsn;
-	uint32_t sat_t3_recovery_tsn;
-	uint32_t tsn_last_delivered;
-	/*
-	 * For the pd-api we should re-write this a bit more efficent. We
-	 * could have multiple sctp_queued_to_read's that we are building at
-	 * once. Now we only do this when we get ready to deliver to the
-	 * socket buffer. Note that we depend on the fact that the struct is
-	 * "stuck" on the read queue until we finish all the pd-api.
-	 */
-	struct sctp_queued_to_read *control_pdapi;
-
-	uint32_t tsn_of_pdapi_last_delivered;
-	uint32_t pdapi_ppid;
-	uint32_t context;
-	uint32_t last_reset_action[SCTP_MAX_RESET_PARAMS];
-	uint32_t last_sending_seq[SCTP_MAX_RESET_PARAMS];
-	uint32_t last_base_tsnsent[SCTP_MAX_RESET_PARAMS];
-#ifdef SCTP_ASOCLOG_OF_TSNS
-	/*
-	 * special log  - This adds considerable size to the asoc, but
-	 * provides a log that you can use to detect problems via kgdb.
-	 */
-	struct sctp_tsn_log in_tsnlog[SCTP_TSN_LOG_SIZE];
-	struct sctp_tsn_log out_tsnlog[SCTP_TSN_LOG_SIZE];
-	uint32_t cumack_log[SCTP_TSN_LOG_SIZE];
-	uint32_t cumack_logsnt[SCTP_TSN_LOG_SIZE];
-	uint16_t tsn_in_at;
-	uint16_t tsn_out_at;
-	uint16_t tsn_in_wrapped;
-	uint16_t tsn_out_wrapped;
-	uint16_t cumack_log_at;
-	uint16_t cumack_log_atsnt;
-#endif				/* SCTP_ASOCLOG_OF_TSNS */
-#ifdef SCTP_FS_SPEC_LOG
-	struct sctp_fs_spec_log fslog[SCTP_FS_SPEC_LOG_SIZE];
-	uint16_t fs_index;
-#endif
-
-	/*
-	 * window state information and smallest MTU that I use to bound
-	 * segmentation
-	 */
-	uint32_t peers_rwnd;
-	uint32_t my_rwnd;
-	uint32_t my_last_reported_rwnd;
-	uint32_t sctp_frag_point;
-
-	uint32_t total_output_queue_size;
-
-	uint32_t sb_cc;		/* shadow of sb_cc */
-	uint32_t sb_send_resv;	/* amount reserved on a send */
-	uint32_t my_rwnd_control_len;	/* shadow of sb_mbcnt used for rwnd
-					 * control */
-#ifdef INET6
-	uint32_t default_flowlabel;
-#endif
-	uint32_t pr_sctp_cnt;
-	int ctrl_queue_cnt;	/* could be removed  REM - NO IT CAN'T!! RRS */
-	/*
-	 * All outbound datagrams queue into this list from the individual
-	 * stream queue. Here they get assigned a TSN and then await
-	 * sending. The stream seq comes when it is first put in the
-	 * individual str queue
-	 */
-	unsigned int stream_queue_cnt;
-	unsigned int send_queue_cnt;
-	unsigned int sent_queue_cnt;
-	unsigned int sent_queue_cnt_removeable;
-	/*
-	 * Number on sent queue that are marked for retran until this value
-	 * is 0 we only send one packet of retran'ed data.
-	 */
-	unsigned int sent_queue_retran_cnt;
-
-	unsigned int size_on_reasm_queue;
-	unsigned int cnt_on_reasm_queue;
-	unsigned int fwd_tsn_cnt;
-	/* amount of data (bytes) currently in flight (on all destinations) */
-	unsigned int total_flight;
-	/* Total book size in flight */
-	unsigned int total_flight_count;	/* count of chunks used with
-						 * book total */
-	/* count of destinaton nets and list of destination nets */
-	unsigned int numnets;
-
-	/* Total error count on this association */
-	unsigned int overall_error_count;
-
-	unsigned int cnt_msg_on_sb;
-
-	/* All stream count of chunks for delivery */
-	unsigned int size_on_all_streams;
-	unsigned int cnt_on_all_streams;
-
-	/* Heart Beat delay in ms */
-	uint32_t heart_beat_delay;
-
-	/* autoclose */
-	unsigned int sctp_autoclose_ticks;
-
-	/* how many preopen streams we have */
-	unsigned int pre_open_streams;
-
-	/* How many streams I support coming into me */
-	unsigned int max_inbound_streams;
-
-	/* the cookie life I award for any cookie, in seconds */
-	unsigned int cookie_life;
-	/* time to delay acks for */
-	unsigned int delayed_ack;
-	unsigned int old_delayed_ack;
-	unsigned int sack_freq;
-	unsigned int data_pkts_seen;
-
-	unsigned int numduptsns;
-	int dup_tsns[SCTP_MAX_DUP_TSNS];
-	unsigned int initial_init_rto_max;	/* initial RTO for INIT's */
-	unsigned int initial_rto;	/* initial send RTO */
-	unsigned int minrto;	/* per assoc RTO-MIN */
-	unsigned int maxrto;	/* per assoc RTO-MAX */
-
-	/* authentication fields */
-	sctp_auth_chklist_t *local_auth_chunks;
-	sctp_auth_chklist_t *peer_auth_chunks;
-	sctp_hmaclist_t *local_hmacs;	/* local HMACs supported */
-	sctp_hmaclist_t *peer_hmacs;	/* peer HMACs supported */
-	struct sctp_keyhead shared_keys;	/* assoc's shared keys */
-	sctp_authinfo_t authinfo;	/* randoms, cached keys */
-	/*
-	 * refcnt to block freeing when a sender or receiver is off coping
-	 * user data in.
-	 */
-	uint32_t refcnt;
-	uint32_t chunks_on_out_queue;	/* total chunks floating around,
-					 * locked by send socket buffer */
-	uint32_t peers_adaptation;
-	uint16_t peer_hmac_id;	/* peer HMAC id to send */
-
-	/*
-	 * Being that we have no bag to collect stale cookies, and that we
-	 * really would not want to anyway.. we will count them in this
-	 * counter. We of course feed them to the pigeons right away (I have
-	 * always thought of pigeons as flying rats).
-	 */
-	uint16_t stale_cookie_count;
-
-	/*
-	 * For the partial delivery API, if up, invoked this is what last
-	 * TSN I delivered
-	 */
-	uint16_t str_of_pdapi;
-	uint16_t ssn_of_pdapi;
-
-	/* counts of actual built streams. Allocation may be more however */
-	/* could re-arrange to optimize space here. */
-	uint16_t streamincnt;
-	uint16_t streamoutcnt;
-	uint16_t strm_realoutsize;
-	uint16_t strm_pending_add_size;
-	/* my maximum number of retrans of INIT and SEND */
-	/* copied from SCTP but should be individually setable */
-	uint16_t max_init_times;
-	uint16_t max_send_times;
-
-	uint16_t def_net_failure;
-
-	uint16_t def_net_pf_threshold;
-
-	/*
-	 * lock flag: 0 is ok to send, 1+ (duals as a retran count) is
-	 * awaiting ACK
-	 */
-	uint16_t mapping_array_size;
-
-	uint16_t last_strm_seq_delivered;
-	uint16_t last_strm_no_delivered;
-
-	uint16_t last_revoke_count;
-	int16_t num_send_timers_up;
-
-	uint16_t stream_locked_on;
-	uint16_t ecn_echo_cnt_onq;
-
-	uint16_t free_chunk_cnt;
-	uint8_t stream_locked;
-	uint8_t authenticated;	/* packet authenticated ok */
-	/*
-	 * This flag indicates that a SACK need to be sent. Initially this
-	 * is 1 to send the first sACK immediately.
-	 */
-	uint8_t send_sack;
-
-	/* max burst of new packets into the network */
-	uint32_t max_burst;
-	/* max burst of fast retransmit packets */
-	uint32_t fr_max_burst;
-
-	uint8_t sat_network;	/* RTT is in range of sat net or greater */
-	uint8_t sat_network_lockout;	/* lockout code */
-	uint8_t burst_limit_applied;	/* Burst limit in effect at last send? */
-	/* flag goes on when we are doing a partial delivery api */
-	uint8_t hb_random_values[4];
-	uint8_t fragmented_delivery_inprogress;
-	uint8_t fragment_flags;
-	uint8_t last_flags_delivered;
-	uint8_t hb_ect_randombit;
-	uint8_t hb_random_idx;
-	uint8_t default_dscp;
-	uint8_t asconf_del_pending;	/* asconf delete last addr pending */
-
-	/*
-	 * This value, plus all other ack'd but above cum-ack is added
-	 * together to cross check against the bit that we have yet to
-	 * define (probably in the SACK). When the cum-ack is updated, this
-	 * sum is updated as well.
-	 */
-
-	/* Flags whether an extension is supported or not */
-	uint8_t ecn_supported;
-	uint8_t prsctp_supported;
-	uint8_t auth_supported;
-	uint8_t asconf_supported;
-	uint8_t reconfig_supported;
-	uint8_t nrsack_supported;
-	uint8_t pktdrop_supported;
-
-	/* Did the peer make the stream config (add out) request */
-	uint8_t peer_req_out;
-
-	uint8_t local_strreset_support;
-
-	uint8_t peer_supports_nat;
-
-	struct sctp_scoping scope;
-	/* flags to handle send alternate net tracking */
-	uint8_t used_alt_asconfack;
-	uint8_t fast_retran_loss_recovery;
-	uint8_t sat_t3_loss_recovery;
-	uint8_t dropped_special_cnt;
-	uint8_t seen_a_sack_this_pkt;
-	uint8_t stream_reset_outstanding;
-	uint8_t stream_reset_out_is_outstanding;
-	uint8_t delayed_connection;
-	uint8_t ifp_had_enobuf;
-	uint8_t saw_sack_with_frags;
-	uint8_t saw_sack_with_nr_frags;
-	uint8_t in_asocid_hash;
-	uint8_t assoc_up_sent;
-	uint8_t adaptation_needed;
-	uint8_t adaptation_sent;
-	/* CMT variables */
-	uint8_t cmt_dac_pkts_rcvd;
-	uint8_t sctp_cmt_on_off;
-	uint8_t iam_blocking;
-	uint8_t cookie_how[8];
-	/* JRS 5/21/07 - CMT PF variable */
-	uint8_t sctp_cmt_pf;
-	uint8_t use_precise_time;
-	uint64_t sctp_features;
-	uint32_t max_cwnd;
-	uint16_t port;		/* remote UDP encapsulation port */
-	/*
-	 * The mapping array is used to track out of order sequences above
-	 * last_acked_seq. 0 indicates packet missing 1 indicates packet
-	 * rec'd. We slide it up every time we raise last_acked_seq and 0
-	 * trailing locactions out.  If I get a TSN above the array
-	 * mappingArraySz, I discard the datagram and let retransmit happen.
-	 */
-	uint32_t marked_retrans;
-	uint32_t timoinit;
-	uint32_t timodata;
-	uint32_t timosack;
-	uint32_t timoshutdown;
-	uint32_t timoheartbeat;
-	uint32_t timocookie;
-	uint32_t timoshutdownack;
-	struct timeval start_time;
-	struct timeval discontinuity_time;
-	uint64_t abandoned_unsent[SCTP_PR_SCTP_MAX + 1];
-	uint64_t abandoned_sent[SCTP_PR_SCTP_MAX + 1];
-};
-
-#endif
diff --git a/include.new/netinet/sctp_sysctl.h b/include.new/netinet/sctp_sysctl.h
deleted file mode 100644
index 6119b15..0000000
--- a/include.new/netinet/sctp_sysctl.h
+++ /dev/null
@@ -1,583 +0,0 @@
-/*-
- * Copyright (c) 2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_sysctl.h 271746 2014-09-18 08:58:22Z tuexen $");
-
-#ifndef _NETINET_SCTP_SYSCTL_H_
-#define _NETINET_SCTP_SYSCTL_H_
-
-#include <netinet/sctp_os.h>
-#include <netinet/sctp_constants.h>
-
-struct sctp_sysctl {
-	uint32_t sctp_sendspace;
-	uint32_t sctp_recvspace;
-	uint32_t sctp_auto_asconf;
-	uint32_t sctp_multiple_asconfs;
-	uint32_t sctp_ecn_enable;
-	uint32_t sctp_pr_enable;
-	uint32_t sctp_auth_disable;
-	uint32_t sctp_asconf_enable;
-	uint32_t sctp_reconfig_enable;
-	uint32_t sctp_nrsack_enable;
-	uint32_t sctp_pktdrop_enable;
-	uint32_t sctp_fr_max_burst_default;
-	uint32_t sctp_strict_sacks;
-	uint32_t sctp_peer_chunk_oh;
-	uint32_t sctp_max_burst_default;
-	uint32_t sctp_max_chunks_on_queue;
-	uint32_t sctp_hashtblsize;
-	uint32_t sctp_pcbtblsize;
-	uint32_t sctp_min_split_point;
-	uint32_t sctp_chunkscale;
-	uint32_t sctp_delayed_sack_time_default;
-	uint32_t sctp_sack_freq_default;
-	uint32_t sctp_system_free_resc_limit;
-	uint32_t sctp_asoc_free_resc_limit;
-	uint32_t sctp_heartbeat_interval_default;
-	uint32_t sctp_pmtu_raise_time_default;
-	uint32_t sctp_shutdown_guard_time_default;
-	uint32_t sctp_secret_lifetime_default;
-	uint32_t sctp_rto_max_default;
-	uint32_t sctp_rto_min_default;
-	uint32_t sctp_rto_initial_default;
-	uint32_t sctp_init_rto_max_default;
-	uint32_t sctp_valid_cookie_life_default;
-	uint32_t sctp_init_rtx_max_default;
-	uint32_t sctp_assoc_rtx_max_default;
-	uint32_t sctp_path_rtx_max_default;
-	uint32_t sctp_path_pf_threshold;
-	uint32_t sctp_add_more_threshold;
-	uint32_t sctp_nr_incoming_streams_default;
-	uint32_t sctp_nr_outgoing_streams_default;
-	uint32_t sctp_cmt_on_off;
-	uint32_t sctp_cmt_use_dac;
-	uint32_t sctp_use_cwnd_based_maxburst;
-	uint32_t sctp_nat_friendly;
-	uint32_t sctp_L2_abc_variable;
-	uint32_t sctp_mbuf_threshold_count;
-	uint32_t sctp_do_drain;
-	uint32_t sctp_hb_maxburst;
-	uint32_t sctp_abort_if_one_2_one_hits_limit;
-	uint32_t sctp_strict_data_order;
-	uint32_t sctp_min_residual;
-	uint32_t sctp_max_retran_chunk;
-	uint32_t sctp_logging_level;
-	/* JRS - Variable for default congestion control module */
-	uint32_t sctp_default_cc_module;
-	/* RS - Variable for default stream scheduling module */
-	uint32_t sctp_default_ss_module;
-	uint32_t sctp_default_frag_interleave;
-	uint32_t sctp_mobility_base;
-	uint32_t sctp_mobility_fasthandoff;
-	uint32_t sctp_inits_include_nat_friendly;
-	uint32_t sctp_rttvar_bw;
-	uint32_t sctp_rttvar_rtt;
-	uint32_t sctp_rttvar_eqret;
-	uint32_t sctp_steady_step;
-	uint32_t sctp_use_dccc_ecn;
-	uint32_t sctp_diag_info_code;
-#if defined(SCTP_LOCAL_TRACE_BUF)
-	struct sctp_log sctp_log;
-#endif
-	uint32_t sctp_udp_tunneling_port;
-	uint32_t sctp_enable_sack_immediately;
-	uint32_t sctp_vtag_time_wait;
-	uint32_t sctp_buffer_splitting;
-	uint32_t sctp_initial_cwnd;
-	uint32_t sctp_blackhole;
-#if defined(SCTP_DEBUG)
-	uint32_t sctp_debug_on;
-#endif
-#if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
-	uint32_t sctp_output_unlocked;
-#endif
-};
-
-/*
- * limits for the sysctl variables
- */
-/* maxdgram: Maximum outgoing SCTP buffer size */
-#define SCTPCTL_MAXDGRAM_DESC		"Maximum outgoing SCTP buffer size"
-#define SCTPCTL_MAXDGRAM_MIN		0
-#define SCTPCTL_MAXDGRAM_MAX		0xFFFFFFFF
-#define SCTPCTL_MAXDGRAM_DEFAULT	262144	/* 256k */
-
-/* recvspace: Maximum incoming SCTP buffer size */
-#define SCTPCTL_RECVSPACE_DESC		"Maximum incoming SCTP buffer size"
-#define SCTPCTL_RECVSPACE_MIN		0
-#define SCTPCTL_RECVSPACE_MAX		0xFFFFFFFF
-#define SCTPCTL_RECVSPACE_DEFAULT	262144	/* 256k */
-
-/* autoasconf: Enable SCTP Auto-ASCONF */
-#define SCTPCTL_AUTOASCONF_DESC		"Enable SCTP Auto-ASCONF"
-#define SCTPCTL_AUTOASCONF_MIN		0
-#define SCTPCTL_AUTOASCONF_MAX		1
-#define SCTPCTL_AUTOASCONF_DEFAULT	1
-
-/* autoasconf: Enable SCTP Auto-ASCONF */
-#define SCTPCTL_MULTIPLEASCONFS_DESC	"Enable SCTP Muliple-ASCONFs"
-#define SCTPCTL_MULTIPLEASCONFS_MIN	0
-#define SCTPCTL_MULTIPLEASCONFS_MAX	1
-#define SCTPCTL_MULTIPLEASCONFS_DEFAULT	SCTP_DEFAULT_MULTIPLE_ASCONFS
-
-/* ecn_enable: Enable SCTP ECN */
-#define SCTPCTL_ECN_ENABLE_DESC		"Enable SCTP ECN"
-#define SCTPCTL_ECN_ENABLE_MIN		0
-#define SCTPCTL_ECN_ENABLE_MAX		1
-#define SCTPCTL_ECN_ENABLE_DEFAULT	1
-
-/* pr_enable: Enable PR-SCTP */
-#define SCTPCTL_PR_ENABLE_DESC		"Enable PR-SCTP"
-#define SCTPCTL_PR_ENABLE_MIN		0
-#define SCTPCTL_PR_ENABLE_MAX		1
-#define SCTPCTL_PR_ENABLE_DEFAULT	1
-
-/* auth_disable: Disable SCTP AUTH function */
-#define SCTPCTL_AUTH_DISABLE_DESC	"Disable SCTP AUTH function"
-#define SCTPCTL_AUTH_DISABLE_MIN	0
-#define SCTPCTL_AUTH_DISABLE_MAX	1
-#define SCTPCTL_AUTH_DISABLE_DEFAULT	0
-
-/* asconf_enable: Enable SCTP ASCONF */
-#define SCTPCTL_ASCONF_ENABLE_DESC	"Enable SCTP ASCONF"
-#define SCTPCTL_ASCONF_ENABLE_MIN	0
-#define SCTPCTL_ASCONF_ENABLE_MAX	1
-#define SCTPCTL_ASCONF_ENABLE_DEFAULT	1
-
-/* reconfig_enable: Enable SCTP RE-CONFIG */
-#define SCTPCTL_RECONFIG_ENABLE_DESC	"Enable SCTP RE-CONFIG"
-#define SCTPCTL_RECONFIG_ENABLE_MIN	0
-#define SCTPCTL_RECONFIG_ENABLE_MAX	1
-#define SCTPCTL_RECONFIG_ENABLE_DEFAULT	1
-
-/* nrsack_enable: Enable NR_SACK */
-#define SCTPCTL_NRSACK_ENABLE_DESC	"Enable SCTP NR-SACK"
-#define SCTPCTL_NRSACK_ENABLE_MIN	0
-#define SCTPCTL_NRSACK_ENABLE_MAX	1
-#define SCTPCTL_NRSACK_ENABLE_DEFAULT	0
-
-/* pktdrop_enable: Enable SCTP Packet Drop Reports */
-#define SCTPCTL_PKTDROP_ENABLE_DESC	"Enable SCTP PKTDROP"
-#define SCTPCTL_PKTDROP_ENABLE_MIN	0
-#define SCTPCTL_PKTDROP_ENABLE_MAX	1
-#define SCTPCTL_PKTDROP_ENABLE_DEFAULT	0
-
-/* strict_sacks: Enable SCTP Strict SACK checking */
-#define SCTPCTL_STRICT_SACKS_DESC	"Enable SCTP Strict SACK checking"
-#define SCTPCTL_STRICT_SACKS_MIN	0
-#define SCTPCTL_STRICT_SACKS_MAX	1
-#define SCTPCTL_STRICT_SACKS_DEFAULT	1
-
-/* loopback_nocsum: Enable NO Csum on packets sent on loopback */
-#define SCTPCTL_LOOPBACK_NOCSUM_DESC	"Enable NO Csum on packets sent on loopback"
-#define SCTPCTL_LOOPBACK_NOCSUM_MIN	0
-#define SCTPCTL_LOOPBACK_NOCSUM_MAX	1
-#define SCTPCTL_LOOPBACK_NOCSUM_DEFAULT	1
-
-/* peer_chkoh: Amount to debit peers rwnd per chunk sent */
-#define SCTPCTL_PEER_CHKOH_DESC		"Amount to debit peers rwnd per chunk sent"
-#define SCTPCTL_PEER_CHKOH_MIN		0
-#define SCTPCTL_PEER_CHKOH_MAX		0xFFFFFFFF
-#define SCTPCTL_PEER_CHKOH_DEFAULT	256
-
-/* maxburst: Default max burst for sctp endpoints */
-#define SCTPCTL_MAXBURST_DESC		"Default max burst for sctp endpoints"
-#define SCTPCTL_MAXBURST_MIN		0
-#define SCTPCTL_MAXBURST_MAX		0xFFFFFFFF
-#define SCTPCTL_MAXBURST_DEFAULT	SCTP_DEF_MAX_BURST
-
-/* fr_maxburst: Default max burst for sctp endpoints when fast retransmitting */
-#define SCTPCTL_FRMAXBURST_DESC		"Default fr max burst for sctp endpoints"
-#define SCTPCTL_FRMAXBURST_MIN		0
-#define SCTPCTL_FRMAXBURST_MAX		0xFFFFFFFF
-#define SCTPCTL_FRMAXBURST_DEFAULT	SCTP_DEF_FRMAX_BURST
-
-
-/* maxchunks: Default max chunks on queue per asoc */
-#define SCTPCTL_MAXCHUNKS_DESC		"Default max chunks on queue per asoc"
-#define SCTPCTL_MAXCHUNKS_MIN		0
-#define SCTPCTL_MAXCHUNKS_MAX		0xFFFFFFFF
-#define SCTPCTL_MAXCHUNKS_DEFAULT	SCTP_ASOC_MAX_CHUNKS_ON_QUEUE
-
-/* tcbhashsize: Tunable for Hash table sizes */
-#define SCTPCTL_TCBHASHSIZE_DESC	"Tunable for TCB hash table sizes"
-#define SCTPCTL_TCBHASHSIZE_MIN		1
-#define SCTPCTL_TCBHASHSIZE_MAX		0xFFFFFFFF
-#define SCTPCTL_TCBHASHSIZE_DEFAULT	SCTP_TCBHASHSIZE
-
-/* pcbhashsize: Tunable for PCB Hash table sizes */
-#define SCTPCTL_PCBHASHSIZE_DESC	"Tunable for PCB hash table sizes"
-#define SCTPCTL_PCBHASHSIZE_MIN		1
-#define SCTPCTL_PCBHASHSIZE_MAX		0xFFFFFFFF
-#define SCTPCTL_PCBHASHSIZE_DEFAULT	SCTP_PCBHASHSIZE
-
-/* min_split_point: Minimum size when splitting a chunk */
-#define SCTPCTL_MIN_SPLIT_POINT_DESC	"Minimum size when splitting a chunk"
-#define SCTPCTL_MIN_SPLIT_POINT_MIN	0
-#define SCTPCTL_MIN_SPLIT_POINT_MAX	0xFFFFFFFF
-#define SCTPCTL_MIN_SPLIT_POINT_DEFAULT	SCTP_DEFAULT_SPLIT_POINT_MIN
-
-/* chunkscale: Tunable for Scaling of number of chunks and messages */
-#define SCTPCTL_CHUNKSCALE_DESC		"Tunable for Scaling of number of chunks and messages"
-#define SCTPCTL_CHUNKSCALE_MIN		1
-#define SCTPCTL_CHUNKSCALE_MAX		0xFFFFFFFF
-#define SCTPCTL_CHUNKSCALE_DEFAULT	SCTP_CHUNKQUEUE_SCALE
-
-/* delayed_sack_time: Default delayed SACK timer in ms */
-#define SCTPCTL_DELAYED_SACK_TIME_DESC	"Default delayed SACK timer in ms"
-#define SCTPCTL_DELAYED_SACK_TIME_MIN	0
-#define SCTPCTL_DELAYED_SACK_TIME_MAX	0xFFFFFFFF
-#define SCTPCTL_DELAYED_SACK_TIME_DEFAULT	SCTP_RECV_MSEC
-
-/* sack_freq: Default SACK frequency */
-#define SCTPCTL_SACK_FREQ_DESC		"Default SACK frequency"
-#define SCTPCTL_SACK_FREQ_MIN		0
-#define SCTPCTL_SACK_FREQ_MAX		0xFFFFFFFF
-#define SCTPCTL_SACK_FREQ_DEFAULT	SCTP_DEFAULT_SACK_FREQ
-
-/* sys_resource: Max number of cached resources in the system */
-#define SCTPCTL_SYS_RESOURCE_DESC	"Max number of cached resources in the system"
-#define SCTPCTL_SYS_RESOURCE_MIN	0
-#define SCTPCTL_SYS_RESOURCE_MAX	0xFFFFFFFF
-#define SCTPCTL_SYS_RESOURCE_DEFAULT	SCTP_DEF_SYSTEM_RESC_LIMIT
-
-/* asoc_resource: Max number of cached resources in an asoc */
-#define SCTPCTL_ASOC_RESOURCE_DESC	"Max number of cached resources in an asoc"
-#define SCTPCTL_ASOC_RESOURCE_MIN	0
-#define SCTPCTL_ASOC_RESOURCE_MAX	0xFFFFFFFF
-#define SCTPCTL_ASOC_RESOURCE_DEFAULT	SCTP_DEF_ASOC_RESC_LIMIT
-
-/* heartbeat_interval: Default heartbeat interval in ms */
-#define SCTPCTL_HEARTBEAT_INTERVAL_DESC	"Default heartbeat interval in ms"
-#define SCTPCTL_HEARTBEAT_INTERVAL_MIN	0
-#define SCTPCTL_HEARTBEAT_INTERVAL_MAX	0xFFFFFFFF
-#define SCTPCTL_HEARTBEAT_INTERVAL_DEFAULT	SCTP_HB_DEFAULT_MSEC
-
-/* pmtu_raise_time: Default PMTU raise timer in seconds */
-#define SCTPCTL_PMTU_RAISE_TIME_DESC	"Default PMTU raise timer in seconds"
-#define SCTPCTL_PMTU_RAISE_TIME_MIN	0
-#define SCTPCTL_PMTU_RAISE_TIME_MAX	0xFFFFFFFF
-#define SCTPCTL_PMTU_RAISE_TIME_DEFAULT	SCTP_DEF_PMTU_RAISE_SEC
-
-/* shutdown_guard_time: Default shutdown guard timer in seconds */
-#define SCTPCTL_SHUTDOWN_GUARD_TIME_DESC	"Default shutdown guard timer in seconds"
-#define SCTPCTL_SHUTDOWN_GUARD_TIME_MIN		0
-#define SCTPCTL_SHUTDOWN_GUARD_TIME_MAX		0xFFFFFFFF
-#define SCTPCTL_SHUTDOWN_GUARD_TIME_DEFAULT	SCTP_DEF_MAX_SHUTDOWN_SEC
-
-/* secret_lifetime: Default secret lifetime in seconds */
-#define SCTPCTL_SECRET_LIFETIME_DESC	"Default secret lifetime in seconds"
-#define SCTPCTL_SECRET_LIFETIME_MIN	0
-#define SCTPCTL_SECRET_LIFETIME_MAX	0xFFFFFFFF
-#define SCTPCTL_SECRET_LIFETIME_DEFAULT	SCTP_DEFAULT_SECRET_LIFE_SEC
-
-/* rto_max: Default maximum retransmission timeout in ms */
-#define SCTPCTL_RTO_MAX_DESC		"Default maximum retransmission timeout in ms"
-#define SCTPCTL_RTO_MAX_MIN		0
-#define SCTPCTL_RTO_MAX_MAX		0xFFFFFFFF
-#define SCTPCTL_RTO_MAX_DEFAULT		SCTP_RTO_UPPER_BOUND
-
-/* rto_min: Default minimum retransmission timeout in ms */
-#define SCTPCTL_RTO_MIN_DESC		"Default minimum retransmission timeout in ms"
-#define SCTPCTL_RTO_MIN_MIN		0
-#define SCTPCTL_RTO_MIN_MAX		0xFFFFFFFF
-#define SCTPCTL_RTO_MIN_DEFAULT		SCTP_RTO_LOWER_BOUND
-
-/* rto_initial: Default initial retransmission timeout in ms */
-#define SCTPCTL_RTO_INITIAL_DESC	"Default initial retransmission timeout in ms"
-#define SCTPCTL_RTO_INITIAL_MIN		0
-#define SCTPCTL_RTO_INITIAL_MAX		0xFFFFFFFF
-#define SCTPCTL_RTO_INITIAL_DEFAULT	SCTP_RTO_INITIAL
-
-/* init_rto_max: Default maximum retransmission timeout during association setup in ms */
-#define SCTPCTL_INIT_RTO_MAX_DESC	"Default maximum retransmission timeout during association setup in ms"
-#define SCTPCTL_INIT_RTO_MAX_MIN	0
-#define SCTPCTL_INIT_RTO_MAX_MAX	0xFFFFFFFF
-#define SCTPCTL_INIT_RTO_MAX_DEFAULT	SCTP_RTO_UPPER_BOUND
-
-/* valid_cookie_life: Default cookie lifetime in sec */
-#define SCTPCTL_VALID_COOKIE_LIFE_DESC	"Default cookie lifetime in seconds"
-#define SCTPCTL_VALID_COOKIE_LIFE_MIN	0
-#define SCTPCTL_VALID_COOKIE_LIFE_MAX	0xFFFFFFFF
-#define SCTPCTL_VALID_COOKIE_LIFE_DEFAULT	SCTP_DEFAULT_COOKIE_LIFE
-
-/* init_rtx_max: Default maximum number of retransmission for INIT chunks */
-#define SCTPCTL_INIT_RTX_MAX_DESC	"Default maximum number of retransmission for INIT chunks"
-#define SCTPCTL_INIT_RTX_MAX_MIN	0
-#define SCTPCTL_INIT_RTX_MAX_MAX	0xFFFFFFFF
-#define SCTPCTL_INIT_RTX_MAX_DEFAULT	SCTP_DEF_MAX_INIT
-
-/* assoc_rtx_max: Default maximum number of retransmissions per association */
-#define SCTPCTL_ASSOC_RTX_MAX_DESC	"Default maximum number of retransmissions per association"
-#define SCTPCTL_ASSOC_RTX_MAX_MIN	0
-#define SCTPCTL_ASSOC_RTX_MAX_MAX	0xFFFFFFFF
-#define SCTPCTL_ASSOC_RTX_MAX_DEFAULT	SCTP_DEF_MAX_SEND
-
-/* path_rtx_max: Default maximum of retransmissions per path */
-#define SCTPCTL_PATH_RTX_MAX_DESC	"Default maximum of retransmissions per path"
-#define SCTPCTL_PATH_RTX_MAX_MIN	0
-#define SCTPCTL_PATH_RTX_MAX_MAX	0xFFFFFFFF
-#define SCTPCTL_PATH_RTX_MAX_DEFAULT	SCTP_DEF_MAX_PATH_RTX
-
-/* path_pf_threshold: threshold for considering the path potentially failed */
-#define SCTPCTL_PATH_PF_THRESHOLD_DESC		"Default potentially failed threshold"
-#define SCTPCTL_PATH_PF_THRESHOLD_MIN		0
-#define SCTPCTL_PATH_PF_THRESHOLD_MAX		0xFFFF
-#define SCTPCTL_PATH_PF_THRESHOLD_DEFAULT	SCTPCTL_PATH_PF_THRESHOLD_MAX
-
-/* add_more_on_output: When space-wise is it worthwhile to try to add more to a socket send buffer */
-#define SCTPCTL_ADD_MORE_ON_OUTPUT_DESC	"When space-wise is it worthwhile to try to add more to a socket send buffer"
-#define SCTPCTL_ADD_MORE_ON_OUTPUT_MIN	0
-#define SCTPCTL_ADD_MORE_ON_OUTPUT_MAX	0xFFFFFFFF
-#define SCTPCTL_ADD_MORE_ON_OUTPUT_DEFAULT SCTP_DEFAULT_ADD_MORE
-
-/* incoming_streams: Default number of incoming streams */
-#define SCTPCTL_INCOMING_STREAMS_DESC	"Default number of incoming streams"
-#define SCTPCTL_INCOMING_STREAMS_MIN	1
-#define SCTPCTL_INCOMING_STREAMS_MAX	65535
-#define SCTPCTL_INCOMING_STREAMS_DEFAULT SCTP_ISTREAM_INITIAL
-
-/* outgoing_streams: Default number of outgoing streams */
-#define SCTPCTL_OUTGOING_STREAMS_DESC	"Default number of outgoing streams"
-#define SCTPCTL_OUTGOING_STREAMS_MIN	1
-#define SCTPCTL_OUTGOING_STREAMS_MAX	65535
-#define SCTPCTL_OUTGOING_STREAMS_DEFAULT SCTP_OSTREAM_INITIAL
-
-/* cmt_on_off: CMT on/off flag */
-#define SCTPCTL_CMT_ON_OFF_DESC		"CMT settings"
-#define SCTPCTL_CMT_ON_OFF_MIN		SCTP_CMT_OFF
-#define SCTPCTL_CMT_ON_OFF_MAX		SCTP_CMT_MAX
-#define SCTPCTL_CMT_ON_OFF_DEFAULT	SCTP_CMT_OFF
-
-/* cmt_use_dac: CMT DAC on/off flag */
-#define SCTPCTL_CMT_USE_DAC_DESC	"CMT DAC on/off flag"
-#define SCTPCTL_CMT_USE_DAC_MIN		0
-#define SCTPCTL_CMT_USE_DAC_MAX		1
-#define SCTPCTL_CMT_USE_DAC_DEFAULT    	0
-
-/* cwnd_maxburst: Use a CWND adjusting maxburst */
-#define SCTPCTL_CWND_MAXBURST_DESC	"Use a CWND adjusting maxburst"
-#define SCTPCTL_CWND_MAXBURST_MIN	0
-#define SCTPCTL_CWND_MAXBURST_MAX	1
-#define SCTPCTL_CWND_MAXBURST_DEFAULT	1
-
-/* nat_friendly: SCTP NAT friendly operation */
-#define SCTPCTL_NAT_FRIENDLY_DESC	"SCTP NAT friendly operation"
-#define SCTPCTL_NAT_FRIENDLY_MIN	0
-#define SCTPCTL_NAT_FRIENDLY_MAX	1
-#define SCTPCTL_NAT_FRIENDLY_DEFAULT	1
-
-/* abc_l_var: SCTP ABC max increase per SACK (L) */
-#define SCTPCTL_ABC_L_VAR_DESC		"SCTP ABC max increase per SACK (L)"
-#define SCTPCTL_ABC_L_VAR_MIN		0
-#define SCTPCTL_ABC_L_VAR_MAX		0xFFFFFFFF
-#define SCTPCTL_ABC_L_VAR_DEFAULT	2
-
-/* max_chained_mbufs: Default max number of small mbufs on a chain */
-#define SCTPCTL_MAX_CHAINED_MBUFS_DESC	"Default max number of small mbufs on a chain"
-#define SCTPCTL_MAX_CHAINED_MBUFS_MIN	0
-#define SCTPCTL_MAX_CHAINED_MBUFS_MAX	0xFFFFFFFF
-#define SCTPCTL_MAX_CHAINED_MBUFS_DEFAULT	SCTP_DEFAULT_MBUFS_IN_CHAIN
-
-/* do_sctp_drain: Should SCTP respond to the drain calls */
-#define SCTPCTL_DO_SCTP_DRAIN_DESC	"Should SCTP respond to the drain calls"
-#define SCTPCTL_DO_SCTP_DRAIN_MIN	0
-#define SCTPCTL_DO_SCTP_DRAIN_MAX	1
-#define SCTPCTL_DO_SCTP_DRAIN_DEFAULT	1
-
-/* hb_max_burst: Confirmation Heartbeat max burst? */
-#define SCTPCTL_HB_MAX_BURST_DESC	"Confirmation Heartbeat max burst"
-#define SCTPCTL_HB_MAX_BURST_MIN	1
-#define SCTPCTL_HB_MAX_BURST_MAX	0xFFFFFFFF
-#define SCTPCTL_HB_MAX_BURST_DEFAULT	SCTP_DEF_HBMAX_BURST
-
-/* abort_at_limit: When one-2-one hits qlimit abort */
-#define SCTPCTL_ABORT_AT_LIMIT_DESC	"When one-2-one hits qlimit abort"
-#define SCTPCTL_ABORT_AT_LIMIT_MIN	0
-#define SCTPCTL_ABORT_AT_LIMIT_MAX	1
-#define SCTPCTL_ABORT_AT_LIMIT_DEFAULT	0
-
-/* strict_data_order: Enforce strict data ordering, abort if control inside data */
-#define SCTPCTL_STRICT_DATA_ORDER_DESC	"Enforce strict data ordering, abort if control inside data"
-#define SCTPCTL_STRICT_DATA_ORDER_MIN	0
-#define SCTPCTL_STRICT_DATA_ORDER_MAX	1
-#define SCTPCTL_STRICT_DATA_ORDER_DEFAULT	0
-
-/* min_residual: min residual in a data fragment leftover */
-#define SCTPCTL_MIN_RESIDUAL_DESC	"Minimum residual data chunk in second part of split"
-#define SCTPCTL_MIN_RESIDUAL_MIN	20
-#define SCTPCTL_MIN_RESIDUAL_MAX	65535
-#define SCTPCTL_MIN_RESIDUAL_DEFAULT	1452
-
-/* max_retran_chunk: max chunk retransmissions */
-#define SCTPCTL_MAX_RETRAN_CHUNK_DESC	"Maximum times an unlucky chunk can be retran'd before assoc abort"
-#define SCTPCTL_MAX_RETRAN_CHUNK_MIN	0
-#define SCTPCTL_MAX_RETRAN_CHUNK_MAX	65535
-#define SCTPCTL_MAX_RETRAN_CHUNK_DEFAULT	30
-
-/* sctp_logging: This gives us logging when the options are enabled */
-#define SCTPCTL_LOGGING_LEVEL_DESC	"Ltrace/KTR trace logging level"
-#define SCTPCTL_LOGGING_LEVEL_MIN	0
-#define SCTPCTL_LOGGING_LEVEL_MAX	0xffffffff
-#define SCTPCTL_LOGGING_LEVEL_DEFAULT	0
-
-/* JRS - default congestion control module sysctl */
-#define SCTPCTL_DEFAULT_CC_MODULE_DESC		"Default congestion control module"
-#define SCTPCTL_DEFAULT_CC_MODULE_MIN		0
-#define SCTPCTL_DEFAULT_CC_MODULE_MAX		2
-#define SCTPCTL_DEFAULT_CC_MODULE_DEFAULT	0
-
-/* RS - default stream scheduling module sysctl */
-#define SCTPCTL_DEFAULT_SS_MODULE_DESC		"Default stream scheduling module"
-#define SCTPCTL_DEFAULT_SS_MODULE_MIN		0
-#define SCTPCTL_DEFAULT_SS_MODULE_MAX		5
-#define SCTPCTL_DEFAULT_SS_MODULE_DEFAULT	0
-
-/* RRS - default fragment interleave */
-#define SCTPCTL_DEFAULT_FRAG_INTERLEAVE_DESC	"Default fragment interleave level"
-#define SCTPCTL_DEFAULT_FRAG_INTERLEAVE_MIN	0
-#define SCTPCTL_DEFAULT_FRAG_INTERLEAVE_MAX	2
-#define SCTPCTL_DEFAULT_FRAG_INTERLEAVE_DEFAULT	1
-
-/* mobility_base: Enable SCTP mobility support */
-#define SCTPCTL_MOBILITY_BASE_DESC	"Enable SCTP base mobility"
-#define SCTPCTL_MOBILITY_BASE_MIN	0
-#define SCTPCTL_MOBILITY_BASE_MAX	1
-#define SCTPCTL_MOBILITY_BASE_DEFAULT	0
-
-/* mobility_fasthandoff: Enable SCTP fast handoff support */
-#define SCTPCTL_MOBILITY_FASTHANDOFF_DESC	"Enable SCTP fast handoff"
-#define SCTPCTL_MOBILITY_FASTHANDOFF_MIN	0
-#define SCTPCTL_MOBILITY_FASTHANDOFF_MAX	1
-#define SCTPCTL_MOBILITY_FASTHANDOFF_DEFAULT	0
-
-/* Enable SCTP/UDP tunneling port */
-#define SCTPCTL_UDP_TUNNELING_PORT_DESC		"Set the SCTP/UDP tunneling port"
-#define SCTPCTL_UDP_TUNNELING_PORT_MIN		0
-#define SCTPCTL_UDP_TUNNELING_PORT_MAX		65535
-#define SCTPCTL_UDP_TUNNELING_PORT_DEFAULT	0
-
-/* Enable sending of the SACK-IMMEDIATELY bit */
-#define SCTPCTL_SACK_IMMEDIATELY_ENABLE_DESC	"Enable sending of the SACK-IMMEDIATELY-bit."
-#define SCTPCTL_SACK_IMMEDIATELY_ENABLE_MIN	0
-#define SCTPCTL_SACK_IMMEDIATELY_ENABLE_MAX	1
-#define SCTPCTL_SACK_IMMEDIATELY_ENABLE_DEFAULT	SCTPCTL_SACK_IMMEDIATELY_ENABLE_MIN
-
-/* Enable sending of the NAT-FRIENDLY message */
-#define SCTPCTL_NAT_FRIENDLY_INITS_DESC	"Enable sending of the nat-friendly SCTP option on INITs."
-#define SCTPCTL_NAT_FRIENDLY_INITS_MIN	0
-#define SCTPCTL_NAT_FRIENDLY_INITS_MAX	1
-#define SCTPCTL_NAT_FRIENDLY_INITS_DEFAULT	SCTPCTL_NAT_FRIENDLY_INITS_MIN
-
-/* Vtag time wait in seconds */
-#define SCTPCTL_TIME_WAIT_DESC	"Vtag time wait time in seconds, 0 disables it."
-#define SCTPCTL_TIME_WAIT_MIN	0
-#define SCTPCTL_TIME_WAIT_MAX	0xffffffff
-#define SCTPCTL_TIME_WAIT_DEFAULT	SCTP_TIME_WAIT
-
-/* Enable Send/Receive buffer splitting */
-#define SCTPCTL_BUFFER_SPLITTING_DESC		"Enable send/receive buffer splitting."
-#define SCTPCTL_BUFFER_SPLITTING_MIN		0
-#define SCTPCTL_BUFFER_SPLITTING_MAX		0x3
-#define SCTPCTL_BUFFER_SPLITTING_DEFAULT	SCTPCTL_BUFFER_SPLITTING_MIN
-
-/* Initial congestion window in MTU */
-#define SCTPCTL_INITIAL_CWND_DESC	"Initial congestion window in MTUs"
-#define SCTPCTL_INITIAL_CWND_MIN	0
-#define SCTPCTL_INITIAL_CWND_MAX	0xffffffff
-#define SCTPCTL_INITIAL_CWND_DEFAULT	3
-
-/* rttvar smooth avg for bw calc  */
-#define SCTPCTL_RTTVAR_BW_DESC	"Shift amount for bw smoothing on rtt calc"
-#define SCTPCTL_RTTVAR_BW_MIN	0
-#define SCTPCTL_RTTVAR_BW_MAX	32
-#define SCTPCTL_RTTVAR_BW_DEFAULT	4
-
-/* rttvar smooth avg for bw calc  */
-#define SCTPCTL_RTTVAR_RTT_DESC	"Shift amount for rtt smoothing on rtt calc"
-#define SCTPCTL_RTTVAR_RTT_MIN	0
-#define SCTPCTL_RTTVAR_RTT_MAX	32
-#define SCTPCTL_RTTVAR_RTT_DEFAULT	5
-
-#define SCTPCTL_RTTVAR_EQRET_DESC	"What to return when rtt and bw are unchanged"
-#define SCTPCTL_RTTVAR_EQRET_MIN	0
-#define SCTPCTL_RTTVAR_EQRET_MAX	1
-#define SCTPCTL_RTTVAR_EQRET_DEFAULT	0
-
-#define SCTPCTL_RTTVAR_STEADYS_DESC	"How many the sames it takes to try step down of cwnd"
-#define SCTPCTL_RTTVAR_STEADYS_MIN	0
-#define SCTPCTL_RTTVAR_STEADYS_MAX	0xFFFF
-#define SCTPCTL_RTTVAR_STEADYS_DEFAULT	20	/* 0 means disable feature */
-
-#define SCTPCTL_RTTVAR_DCCCECN_DESC	"Enable for RTCC CC datacenter ECN"
-#define SCTPCTL_RTTVAR_DCCCECN_MIN	0
-#define SCTPCTL_RTTVAR_DCCCECN_MAX	1
-#define SCTPCTL_RTTVAR_DCCCECN_DEFAULT	1	/* 0 means disable feature */
-
-#define SCTPCTL_BLACKHOLE_DESC		"Enable SCTP blackholing"
-#define SCTPCTL_BLACKHOLE_MIN		0
-#define SCTPCTL_BLACKHOLE_MAX		2
-#define SCTPCTL_BLACKHOLE_DEFAULT	SCTPCTL_BLACKHOLE_MIN
-
-#define SCTPCTL_DIAG_INFO_CODE_DESC	"Diagnostic information error cause code"
-#define SCTPCTL_DIAG_INFO_CODE_MIN	0
-#define SCTPCTL_DIAG_INFO_CODE_MAX	65535
-#define SCTPCTL_DIAG_INFO_CODE_DEFAULT	0
-
-#if defined(SCTP_DEBUG)
-/* debug: Configure debug output */
-#define SCTPCTL_DEBUG_DESC	"Configure debug output"
-#define SCTPCTL_DEBUG_MIN	0
-#define SCTPCTL_DEBUG_MAX	0xFFFFFFFF
-#define SCTPCTL_DEBUG_DEFAULT	0
-#endif
-
-
-#if defined(__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
-#define SCTPCTL_OUTPUT_UNLOCKED_DESC	"Unlock socket when sending packets down to IP."
-#define SCTPCTL_OUTPUT_UNLOCKED_MIN	0
-#define SCTPCTL_OUTPUT_UNLOCKED_MAX	1
-#define SCTPCTL_OUTPUT_UNLOCKED_DEFAULT	SCTPCTL_OUTPUT_UNLOCKED_MIN
-#endif
-
-
-#if defined(_KERNEL) || defined(__Userspace__)
-#if defined(SYSCTL_DECL)
-SYSCTL_DECL(_net_inet_sctp);
-#endif
-
-void sctp_init_sysctls(void);
-
-#endif				/* _KERNEL */
-#endif				/* __sctp_sysctl_h__ */
diff --git a/include.new/netinet/sctp_timer.h b/include.new/netinet/sctp_timer.h
deleted file mode 100644
index 99eb5e6..0000000
--- a/include.new/netinet/sctp_timer.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_timer.h 235828 2012-05-23 11:26:28Z tuexen $");
-
-#ifndef _NETINET_SCTP_TIMER_H_
-#define _NETINET_SCTP_TIMER_H_
-
-#if defined(_KERNEL) || defined(__Userspace__)
-
-#define SCTP_RTT_SHIFT 3
-#define SCTP_RTT_VAR_SHIFT 2
-
-struct sctp_nets *
-sctp_find_alternate_net(struct sctp_tcb *,
-    struct sctp_nets *, int mode);
-
-int
-sctp_threshold_management(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *, uint16_t);
-
-int
-sctp_t3rxt_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-int
-sctp_t1init_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-int
-sctp_shutdown_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-int
-sctp_heartbeat_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-
-int
-sctp_cookie_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-
-void
-sctp_pathmtu_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-
-int
-sctp_shutdownack_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-int
-sctp_strreset_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
-    struct sctp_nets *net);
-
-int
-sctp_asconf_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-
-void
-sctp_delete_prim_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-
-void
-sctp_autoclose_timer(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *net);
-
-void sctp_audit_retranmission_queue(struct sctp_association *);
-
-void sctp_iterator_timer(struct sctp_iterator *it);
-
-
-#endif
-#endif
diff --git a/include.new/netinet/sctp_uio.h b/include.new/netinet/sctp_uio.h
deleted file mode 100644
index 3b9f834..0000000
--- a/include.new/netinet/sctp_uio.h
+++ /dev/null
@@ -1,1332 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_uio.h 284150 2015-06-08 07:06:33Z tuexen $");
-
-#ifndef _NETINET_SCTP_UIO_H_
-#define _NETINET_SCTP_UIO_H_
-
-
-#if ! defined(_KERNEL)
-#include <stdint.h>
-#endif
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-typedef uint32_t sctp_assoc_t;
-
-#define SCTP_FUTURE_ASSOC  0
-#define SCTP_CURRENT_ASSOC 1
-#define SCTP_ALL_ASSOC     2
-
-struct sctp_event {
-	sctp_assoc_t se_assoc_id;
-	uint16_t se_type;
-	uint8_t se_on;
-};
-
-/* Compatibility to previous define's */
-#define sctp_stream_reset_events sctp_stream_reset_event
-
-/* On/Off setup for subscription to events */
-struct sctp_event_subscribe {
-	uint8_t sctp_data_io_event;
-	uint8_t sctp_association_event;
-	uint8_t sctp_address_event;
-	uint8_t sctp_send_failure_event;
-	uint8_t sctp_peer_error_event;
-	uint8_t sctp_shutdown_event;
-	uint8_t sctp_partial_delivery_event;
-	uint8_t sctp_adaptation_layer_event;
-	uint8_t sctp_authentication_event;
-	uint8_t sctp_sender_dry_event;
-	uint8_t sctp_stream_reset_event;
-};
-
-/* ancillary data types */
-#define SCTP_INIT	0x0001
-#define SCTP_SNDRCV	0x0002
-#define SCTP_EXTRCV	0x0003
-#define SCTP_SNDINFO    0x0004
-#define SCTP_RCVINFO    0x0005
-#define SCTP_NXTINFO    0x0006
-#define SCTP_PRINFO     0x0007
-#define SCTP_AUTHINFO   0x0008
-#define SCTP_DSTADDRV4  0x0009
-#define SCTP_DSTADDRV6  0x000a
-
-/*
- * ancillary data structures
- */
-struct sctp_initmsg {
-	uint16_t sinit_num_ostreams;
-	uint16_t sinit_max_instreams;
-	uint16_t sinit_max_attempts;
-	uint16_t sinit_max_init_timeo;
-};
-
-/* We add 96 bytes to the size of sctp_sndrcvinfo.
- * This makes the current structure 128 bytes long
- * which is nicely 64 bit aligned but also has room
- * for us to add more and keep ABI compatibility.
- * For example, already we have the sctp_extrcvinfo
- * when enabled which is 48 bytes.
- */
-
-/*
- * The assoc up needs a verfid
- * all sendrcvinfo's need a verfid for SENDING only.
- */
-
-
-#define SCTP_ALIGN_RESV_PAD 92
-#define SCTP_ALIGN_RESV_PAD_SHORT 76
-
-struct sctp_sndrcvinfo {
-	uint16_t sinfo_stream;
-	uint16_t sinfo_ssn;
-	uint16_t sinfo_flags;
-	uint32_t sinfo_ppid;
-	uint32_t sinfo_context;
-	uint32_t sinfo_timetolive;
-	uint32_t sinfo_tsn;
-	uint32_t sinfo_cumtsn;
-	sctp_assoc_t sinfo_assoc_id;
-	uint16_t sinfo_keynumber;
-	uint16_t sinfo_keynumber_valid;
-	uint8_t __reserve_pad[SCTP_ALIGN_RESV_PAD];
-};
-
-struct sctp_extrcvinfo {
-	uint16_t sinfo_stream;
-	uint16_t sinfo_ssn;
-	uint16_t sinfo_flags;
-	uint32_t sinfo_ppid;
-	uint32_t sinfo_context;
-	uint32_t sinfo_timetolive;
-	uint32_t sinfo_tsn;
-	uint32_t sinfo_cumtsn;
-	sctp_assoc_t sinfo_assoc_id;
-	uint16_t sreinfo_next_flags;
-	uint16_t sreinfo_next_stream;
-	uint32_t sreinfo_next_aid;
-	uint32_t sreinfo_next_length;
-	uint32_t sreinfo_next_ppid;
-	uint16_t sinfo_keynumber;
-	uint16_t sinfo_keynumber_valid;
-	uint8_t __reserve_pad[SCTP_ALIGN_RESV_PAD_SHORT];
-};
-
-struct sctp_sndinfo {
-	uint16_t snd_sid;
-	uint16_t snd_flags;
-	uint32_t snd_ppid;
-	uint32_t snd_context;
-	sctp_assoc_t snd_assoc_id;
-};
-
-struct sctp_prinfo {
-	uint16_t pr_policy;
-	uint32_t pr_value;
-};
-
-struct sctp_default_prinfo {
-	uint16_t pr_policy;
-	uint32_t pr_value;
-	sctp_assoc_t pr_assoc_id;
-};
-
-struct sctp_authinfo {
-	uint16_t auth_keynumber;
-};
-
-struct sctp_rcvinfo {
-	uint16_t rcv_sid;
-	uint16_t rcv_ssn;
-	uint16_t rcv_flags;
-	uint32_t rcv_ppid;
-	uint32_t rcv_tsn;
-	uint32_t rcv_cumtsn;
-	uint32_t rcv_context;
-	sctp_assoc_t rcv_assoc_id;
-};
-
-struct sctp_nxtinfo {
-	uint16_t nxt_sid;
-	uint16_t nxt_flags;
-	uint32_t nxt_ppid;
-	uint32_t nxt_length;
-	sctp_assoc_t nxt_assoc_id;
-};
-
-#define SCTP_NO_NEXT_MSG           0x0000
-#define SCTP_NEXT_MSG_AVAIL        0x0001
-#define SCTP_NEXT_MSG_ISCOMPLETE   0x0002
-#define SCTP_NEXT_MSG_IS_UNORDERED 0x0004
-#define SCTP_NEXT_MSG_IS_NOTIFICATION 0x0008
-
-struct sctp_recvv_rn {
-	struct sctp_rcvinfo recvv_rcvinfo;
-	struct sctp_nxtinfo recvv_nxtinfo;
-};
-
-#define SCTP_RECVV_NOINFO  0
-#define SCTP_RECVV_RCVINFO 1
-#define SCTP_RECVV_NXTINFO 2
-#define SCTP_RECVV_RN      3
-
-#define SCTP_SENDV_NOINFO   0
-#define SCTP_SENDV_SNDINFO  1
-#define SCTP_SENDV_PRINFO   2
-#define SCTP_SENDV_AUTHINFO 3
-#define SCTP_SENDV_SPA      4
-
-struct sctp_sendv_spa {
-	uint32_t sendv_flags;
-	struct sctp_sndinfo sendv_sndinfo;
-	struct sctp_prinfo sendv_prinfo;
-	struct sctp_authinfo sendv_authinfo;
-};
-
-#define SCTP_SEND_SNDINFO_VALID  0x00000001
-#define SCTP_SEND_PRINFO_VALID   0x00000002
-#define SCTP_SEND_AUTHINFO_VALID 0x00000004
-
-struct sctp_snd_all_completes {
-	uint16_t sall_stream;
-	uint16_t sall_flags;
-	uint32_t sall_ppid;
-	uint32_t sall_context;
-	uint32_t sall_num_sent;
-	uint32_t sall_num_failed;
-};
-
-/* Flags that go into the sinfo->sinfo_flags field */
-#define SCTP_NOTIFICATION     0x0010	/* next message is a notification */
-#define SCTP_COMPLETE         0x0020	/* next message is complete */
-#define SCTP_EOF              0x0100	/* Start shutdown procedures */
-#define SCTP_ABORT            0x0200	/* Send an ABORT to peer */
-#define SCTP_UNORDERED        0x0400	/* Message is un-ordered */
-#define SCTP_ADDR_OVER        0x0800	/* Override the primary-address */
-#define SCTP_SENDALL          0x1000	/* Send this on all associations */
-#define SCTP_EOR              0x2000	/* end of message signal */
-#define SCTP_SACK_IMMEDIATELY 0x4000	/* Set I-Bit */
-
-#define INVALID_SINFO_FLAG(x) (((x) & 0xfffffff0 \
-                                    & ~(SCTP_EOF | SCTP_ABORT | SCTP_UNORDERED |\
-				        SCTP_ADDR_OVER | SCTP_SENDALL | SCTP_EOR |\
-					SCTP_SACK_IMMEDIATELY)) != 0)
-/* for the endpoint */
-
-/* The lower four bits is an enumeration of PR-SCTP policies */
-#define SCTP_PR_SCTP_NONE 0x0000/* Reliable transfer */
-#define SCTP_PR_SCTP_TTL  0x0001/* Time based PR-SCTP */
-#define SCTP_PR_SCTP_BUF  0x0002/* Buffer based PR-SCTP */
-#define SCTP_PR_SCTP_RTX  0x0003/* Number of retransmissions based PR-SCTP */
-#define SCTP_PR_SCTP_MAX  SCTP_PR_SCTP_RTX
-#define SCTP_PR_SCTP_ALL  0x000f/* Used for aggregated stats */
-
-#define PR_SCTP_POLICY(x)         ((x) & 0x0f)
-#define PR_SCTP_ENABLED(x)        ((PR_SCTP_POLICY(x) != SCTP_PR_SCTP_NONE) && \
-                                   (PR_SCTP_POLICY(x) != SCTP_PR_SCTP_ALL))
-#define PR_SCTP_TTL_ENABLED(x)    (PR_SCTP_POLICY(x) == SCTP_PR_SCTP_TTL)
-#define PR_SCTP_BUF_ENABLED(x)    (PR_SCTP_POLICY(x) == SCTP_PR_SCTP_BUF)
-#define PR_SCTP_RTX_ENABLED(x)    (PR_SCTP_POLICY(x) == SCTP_PR_SCTP_RTX)
-#define PR_SCTP_INVALID_POLICY(x) (PR_SCTP_POLICY(x) > SCTP_PR_SCTP_MAX)
-#define PR_SCTP_VALID_POLICY(x)   (PR_SCTP_POLICY(x) <= SCTP_PR_SCTP_MAX)
-
-/* Stat's */
-struct sctp_pcbinfo {
-	uint32_t ep_count;
-	uint32_t asoc_count;
-	uint32_t laddr_count;
-	uint32_t raddr_count;
-	uint32_t chk_count;
-	uint32_t readq_count;
-	uint32_t free_chunks;
-	uint32_t stream_oque;
-};
-
-struct sctp_sockstat {
-	sctp_assoc_t ss_assoc_id;
-	uint32_t ss_total_sndbuf;
-	uint32_t ss_total_recv_buf;
-};
-
-/*
- * notification event structures
- */
-
-/*
- * association change event
- */
-struct sctp_assoc_change {
-	uint16_t sac_type;
-	uint16_t sac_flags;
-	uint32_t sac_length;
-	uint16_t sac_state;
-	uint16_t sac_error;
-	uint16_t sac_outbound_streams;
-	uint16_t sac_inbound_streams;
-	sctp_assoc_t sac_assoc_id;
-	uint8_t sac_info[];
-};
-
-/* sac_state values */
-#define SCTP_COMM_UP            0x0001
-#define SCTP_COMM_LOST          0x0002
-#define SCTP_RESTART            0x0003
-#define SCTP_SHUTDOWN_COMP      0x0004
-#define SCTP_CANT_STR_ASSOC     0x0005
-
-/* sac_info values */
-#define SCTP_ASSOC_SUPPORTS_PR        0x01
-#define SCTP_ASSOC_SUPPORTS_AUTH      0x02
-#define SCTP_ASSOC_SUPPORTS_ASCONF    0x03
-#define SCTP_ASSOC_SUPPORTS_MULTIBUF  0x04
-#define SCTP_ASSOC_SUPPORTS_RE_CONFIG 0x05
-#define SCTP_ASSOC_SUPPORTS_MAX       0x05
-/*
- * Address event
- */
-struct sctp_paddr_change {
-	uint16_t spc_type;
-	uint16_t spc_flags;
-	uint32_t spc_length;
-	struct sockaddr_storage spc_aaddr;
-	uint32_t spc_state;
-	uint32_t spc_error;
-	sctp_assoc_t spc_assoc_id;
-	uint8_t spc_padding[4];
-};
-
-/* paddr state values */
-#define SCTP_ADDR_AVAILABLE	0x0001
-#define SCTP_ADDR_UNREACHABLE	0x0002
-#define SCTP_ADDR_REMOVED	0x0003
-#define SCTP_ADDR_ADDED		0x0004
-#define SCTP_ADDR_MADE_PRIM	0x0005
-#define SCTP_ADDR_CONFIRMED	0x0006
-
-#define SCTP_ACTIVE		0x0001	/* SCTP_ADDR_REACHABLE */
-#define SCTP_INACTIVE		0x0002	/* neither SCTP_ADDR_REACHABLE nor
-					 * SCTP_ADDR_UNCONFIRMED */
-#define SCTP_UNCONFIRMED	0x0200	/* SCTP_ADDR_UNCONFIRMED */
-
-/* remote error events */
-struct sctp_remote_error {
-	uint16_t sre_type;
-	uint16_t sre_flags;
-	uint32_t sre_length;
-	uint16_t sre_error;
-	sctp_assoc_t sre_assoc_id;
-	uint8_t sre_data[4];
-};
-
-/* data send failure event (deprecated) */
-struct sctp_send_failed {
-	uint16_t ssf_type;
-	uint16_t ssf_flags;
-	uint32_t ssf_length;
-	uint32_t ssf_error;
-	struct sctp_sndrcvinfo ssf_info;
-	sctp_assoc_t ssf_assoc_id;
-	uint8_t ssf_data[];
-};
-
-/* data send failure event (not deprecated) */
-struct sctp_send_failed_event {
-	uint16_t ssfe_type;
-	uint16_t ssfe_flags;
-	uint32_t ssfe_length;
-	uint32_t ssfe_error;
-	struct sctp_sndinfo ssfe_info;
-	sctp_assoc_t ssfe_assoc_id;
-	uint8_t ssfe_data[];
-};
-
-/* flag that indicates state of data */
-#define SCTP_DATA_UNSENT	0x0001	/* inqueue never on wire */
-#define SCTP_DATA_SENT		0x0002	/* on wire at failure */
-
-/* shutdown event */
-struct sctp_shutdown_event {
-	uint16_t sse_type;
-	uint16_t sse_flags;
-	uint32_t sse_length;
-	sctp_assoc_t sse_assoc_id;
-};
-
-/* Adaptation layer indication stuff */
-struct sctp_adaptation_event {
-	uint16_t sai_type;
-	uint16_t sai_flags;
-	uint32_t sai_length;
-	uint32_t sai_adaptation_ind;
-	sctp_assoc_t sai_assoc_id;
-};
-
-struct sctp_setadaptation {
-	uint32_t ssb_adaptation_ind;
-};
-
-/* compatible old spelling */
-struct sctp_adaption_event {
-	uint16_t sai_type;
-	uint16_t sai_flags;
-	uint32_t sai_length;
-	uint32_t sai_adaption_ind;
-	sctp_assoc_t sai_assoc_id;
-};
-
-struct sctp_setadaption {
-	uint32_t ssb_adaption_ind;
-};
-
-
-/*
- * Partial Delivery API event
- */
-struct sctp_pdapi_event {
-	uint16_t pdapi_type;
-	uint16_t pdapi_flags;
-	uint32_t pdapi_length;
-	uint32_t pdapi_indication;
-	uint16_t pdapi_stream;
-	uint16_t pdapi_seq;
-	sctp_assoc_t pdapi_assoc_id;
-};
-
-/* indication values */
-#define SCTP_PARTIAL_DELIVERY_ABORTED	0x0001
-
-
-/*
- * authentication key event
- */
-struct sctp_authkey_event {
-	uint16_t auth_type;
-	uint16_t auth_flags;
-	uint32_t auth_length;
-	uint16_t auth_keynumber;
-	uint16_t auth_altkeynumber;
-	uint32_t auth_indication;
-	sctp_assoc_t auth_assoc_id;
-};
-
-/* indication values */
-#define SCTP_AUTH_NEW_KEY	0x0001
-#define SCTP_AUTH_NEWKEY	SCTP_AUTH_NEW_KEY
-#define SCTP_AUTH_NO_AUTH	0x0002
-#define SCTP_AUTH_FREE_KEY	0x0003
-
-
-struct sctp_sender_dry_event {
-	uint16_t sender_dry_type;
-	uint16_t sender_dry_flags;
-	uint32_t sender_dry_length;
-	sctp_assoc_t sender_dry_assoc_id;
-};
-
-
-/*
- * Stream reset event - subscribe to SCTP_STREAM_RESET_EVENT
- */
-struct sctp_stream_reset_event {
-	uint16_t strreset_type;
-	uint16_t strreset_flags;
-	uint32_t strreset_length;
-	sctp_assoc_t strreset_assoc_id;
-	uint16_t strreset_stream_list[];
-};
-
-/* flags in stream_reset_event (strreset_flags) */
-#define SCTP_STREAM_RESET_INCOMING_SSN  0x0001
-#define SCTP_STREAM_RESET_OUTGOING_SSN  0x0002
-#define SCTP_STREAM_RESET_DENIED        0x0004
-#define SCTP_STREAM_RESET_FAILED        0x0008
-
-/*
- * Assoc reset event - subscribe to SCTP_ASSOC_RESET_EVENT
- */
-struct sctp_assoc_reset_event {
-	uint16_t assocreset_type;
-	uint16_t assocreset_flags;
-	uint32_t assocreset_length;
-	sctp_assoc_t assocreset_assoc_id;
-	uint32_t assocreset_local_tsn;
-	uint32_t assocreset_remote_tsn;
-};
-
-#define SCTP_ASSOC_RESET_DENIED		0x0004
-#define SCTP_ASSOC_RESET_FAILED		0x0008
-
-/*
- * Stream change event - subscribe to SCTP_STREAM_CHANGE_EVENT
- */
-struct sctp_stream_change_event {
-	uint16_t strchange_type;
-	uint16_t strchange_flags;
-	uint32_t strchange_length;
-	sctp_assoc_t strchange_assoc_id;
-	uint16_t strchange_instrms;
-	uint16_t strchange_outstrms;
-};
-
-#define SCTP_STREAM_CHANGE_DENIED	0x0004
-#define SCTP_STREAM_CHANGE_FAILED	0x0008
-
-
-/* SCTP notification event */
-struct sctp_tlv {
-	uint16_t sn_type;
-	uint16_t sn_flags;
-	uint32_t sn_length;
-};
-
-union sctp_notification {
-	struct sctp_tlv sn_header;
-	struct sctp_assoc_change sn_assoc_change;
-	struct sctp_paddr_change sn_paddr_change;
-	struct sctp_remote_error sn_remote_error;
-	struct sctp_send_failed sn_send_failed;
-	struct sctp_shutdown_event sn_shutdown_event;
-	struct sctp_adaptation_event sn_adaptation_event;
-	/* compatibility same as above */
-	struct sctp_adaption_event sn_adaption_event;
-	struct sctp_pdapi_event sn_pdapi_event;
-	struct sctp_authkey_event sn_auth_event;
-	struct sctp_sender_dry_event sn_sender_dry_event;
-	struct sctp_send_failed_event sn_send_failed_event;
-	struct sctp_stream_reset_event sn_strreset_event;
-	struct sctp_assoc_reset_event sn_assocreset_event;
-	struct sctp_stream_change_event sn_strchange_event;
-};
-
-/* notification types */
-#define SCTP_ASSOC_CHANGE                       0x0001
-#define SCTP_PEER_ADDR_CHANGE                   0x0002
-#define SCTP_REMOTE_ERROR                       0x0003
-#define SCTP_SEND_FAILED                        0x0004
-#define SCTP_SHUTDOWN_EVENT                     0x0005
-#define SCTP_ADAPTATION_INDICATION              0x0006
-/* same as above */
-#define SCTP_ADAPTION_INDICATION                0x0006
-#define SCTP_PARTIAL_DELIVERY_EVENT             0x0007
-#define SCTP_AUTHENTICATION_EVENT               0x0008
-#define SCTP_STREAM_RESET_EVENT                 0x0009
-#define SCTP_SENDER_DRY_EVENT                   0x000a
-#define SCTP_NOTIFICATIONS_STOPPED_EVENT        0x000b	/* we don't send this */
-#define SCTP_ASSOC_RESET_EVENT                  0x000c
-#define SCTP_STREAM_CHANGE_EVENT                0x000d
-#define SCTP_SEND_FAILED_EVENT                  0x000e
-/*
- * socket option structs
- */
-
-struct sctp_paddrparams {
-	struct sockaddr_storage spp_address;
-	sctp_assoc_t spp_assoc_id;
-	uint32_t spp_hbinterval;
-	uint32_t spp_pathmtu;
-	uint32_t spp_flags;
-	uint32_t spp_ipv6_flowlabel;
-	uint16_t spp_pathmaxrxt;
-	uint8_t spp_dscp;
-};
-
-#define spp_ipv4_tos spp_dscp
-
-#define SPP_HB_ENABLE		0x00000001
-#define SPP_HB_DISABLE		0x00000002
-#define SPP_HB_DEMAND		0x00000004
-#define SPP_PMTUD_ENABLE	0x00000008
-#define SPP_PMTUD_DISABLE	0x00000010
-#define SPP_HB_TIME_IS_ZERO     0x00000080
-#define SPP_IPV6_FLOWLABEL      0x00000100
-#define SPP_DSCP                0x00000200
-#define SPP_IPV4_TOS            SPP_DSCP
-
-struct sctp_paddrthlds {
-	struct sockaddr_storage spt_address;
-	sctp_assoc_t spt_assoc_id;
-	uint16_t spt_pathmaxrxt;
-	uint16_t spt_pathpfthld;
-};
-
-struct sctp_paddrinfo {
-	struct sockaddr_storage spinfo_address;
-	sctp_assoc_t spinfo_assoc_id;
-	int32_t spinfo_state;
-	uint32_t spinfo_cwnd;
-	uint32_t spinfo_srtt;
-	uint32_t spinfo_rto;
-	uint32_t spinfo_mtu;
-};
-
-struct sctp_rtoinfo {
-	sctp_assoc_t srto_assoc_id;
-	uint32_t srto_initial;
-	uint32_t srto_max;
-	uint32_t srto_min;
-};
-
-struct sctp_assocparams {
-	sctp_assoc_t sasoc_assoc_id;
-	uint32_t sasoc_peer_rwnd;
-	uint32_t sasoc_local_rwnd;
-	uint32_t sasoc_cookie_life;
-	uint16_t sasoc_asocmaxrxt;
-	uint16_t sasoc_number_peer_destinations;
-};
-
-struct sctp_setprim {
-	struct sockaddr_storage ssp_addr;
-	sctp_assoc_t ssp_assoc_id;
-	uint8_t ssp_padding[4];
-};
-
-struct sctp_setpeerprim {
-	struct sockaddr_storage sspp_addr;
-	sctp_assoc_t sspp_assoc_id;
-	uint8_t sspp_padding[4];
-};
-
-struct sctp_getaddresses {
-	sctp_assoc_t sget_assoc_id;
-	/* addr is filled in for N * sockaddr_storage */
-	struct sockaddr addr[1];
-};
-
-struct sctp_status {
-	sctp_assoc_t sstat_assoc_id;
-	int32_t sstat_state;
-	uint32_t sstat_rwnd;
-	uint16_t sstat_unackdata;
-	uint16_t sstat_penddata;
-	uint16_t sstat_instrms;
-	uint16_t sstat_outstrms;
-	uint32_t sstat_fragmentation_point;
-	struct sctp_paddrinfo sstat_primary;
-};
-
-/*
- * AUTHENTICATION support
- */
-/* SCTP_AUTH_CHUNK */
-struct sctp_authchunk {
-	uint8_t sauth_chunk;
-};
-
-/* SCTP_AUTH_KEY */
-struct sctp_authkey {
-	sctp_assoc_t sca_assoc_id;
-	uint16_t sca_keynumber;
-	uint16_t sca_keylength;
-	uint8_t sca_key[];
-};
-
-/* SCTP_HMAC_IDENT */
-struct sctp_hmacalgo {
-	uint32_t shmac_number_of_idents;
-	uint16_t shmac_idents[];
-};
-
-/* AUTH hmac_id */
-#define SCTP_AUTH_HMAC_ID_RSVD		0x0000
-#define SCTP_AUTH_HMAC_ID_SHA1		0x0001	/* default, mandatory */
-#define SCTP_AUTH_HMAC_ID_SHA256	0x0003
-
-/* SCTP_AUTH_ACTIVE_KEY / SCTP_AUTH_DELETE_KEY */
-struct sctp_authkeyid {
-	sctp_assoc_t scact_assoc_id;
-	uint16_t scact_keynumber;
-};
-
-/* SCTP_PEER_AUTH_CHUNKS / SCTP_LOCAL_AUTH_CHUNKS */
-struct sctp_authchunks {
-	sctp_assoc_t gauth_assoc_id;
-	uint32_t gauth_number_of_chunks;
-	uint8_t gauth_chunks[];
-};
-
-struct sctp_assoc_value {
-	sctp_assoc_t assoc_id;
-	uint32_t assoc_value;
-};
-
-struct sctp_cc_option {
-	int option;
-	struct sctp_assoc_value aid_value;
-};
-
-struct sctp_stream_value {
-	sctp_assoc_t assoc_id;
-	uint16_t stream_id;
-	uint16_t stream_value;
-};
-
-struct sctp_assoc_ids {
-	uint32_t gaids_number_of_ids;
-	sctp_assoc_t gaids_assoc_id[];
-};
-
-struct sctp_sack_info {
-	sctp_assoc_t sack_assoc_id;
-	uint32_t sack_delay;
-	uint32_t sack_freq;
-};
-
-struct sctp_timeouts {
-	sctp_assoc_t stimo_assoc_id;
-	uint32_t stimo_init;
-	uint32_t stimo_data;
-	uint32_t stimo_sack;
-	uint32_t stimo_shutdown;
-	uint32_t stimo_heartbeat;
-	uint32_t stimo_cookie;
-	uint32_t stimo_shutdownack;
-};
-
-struct sctp_udpencaps {
-	struct sockaddr_storage sue_address;
-	sctp_assoc_t sue_assoc_id;
-	uint16_t sue_port;
-};
-
-struct sctp_prstatus {
-	sctp_assoc_t sprstat_assoc_id;
-	uint16_t sprstat_sid;
-	uint16_t sprstat_policy;
-	uint64_t sprstat_abandoned_unsent;
-	uint64_t sprstat_abandoned_sent;
-};
-
-struct sctp_cwnd_args {
-	struct sctp_nets *net;	/* network to *//* FIXME: LP64 issue */
-	uint32_t cwnd_new_value;/* cwnd in k */
-	uint32_t pseudo_cumack;
-	uint16_t inflight;	/* flightsize in k */
-	uint16_t cwnd_augment;	/* increment to it */
-	uint8_t meets_pseudo_cumack;
-	uint8_t need_new_pseudo_cumack;
-	uint8_t cnt_in_send;
-	uint8_t cnt_in_str;
-};
-
-struct sctp_blk_args {
-	uint32_t onsb;		/* in 1k bytes */
-	uint32_t sndlen;	/* len of send being attempted */
-	uint32_t peer_rwnd;	/* rwnd of peer */
-	uint16_t send_sent_qcnt;/* chnk cnt */
-	uint16_t stream_qcnt;	/* chnk cnt */
-	uint16_t chunks_on_oque;/* chunks out */
-	uint16_t flight_size;	/* flight size in k */
-};
-
-/*
- * Max we can reset in one setting, note this is dictated not by the define
- * but the size of a mbuf cluster so don't change this define and think you
- * can specify more. You must do multiple resets if you want to reset more
- * than SCTP_MAX_EXPLICIT_STR_RESET.
- */
-#define SCTP_MAX_EXPLICT_STR_RESET   1000
-
-struct sctp_reset_streams {
-	sctp_assoc_t srs_assoc_id;
-	uint16_t srs_flags;
-	uint16_t srs_number_streams;	/* 0 == ALL */
-	uint16_t srs_stream_list[];	/* list if strrst_num_streams is not 0 */
-};
-
-struct sctp_add_streams {
-	sctp_assoc_t sas_assoc_id;
-	uint16_t sas_instrms;
-	uint16_t sas_outstrms;
-};
-
-struct sctp_get_nonce_values {
-	sctp_assoc_t gn_assoc_id;
-	uint32_t gn_peers_tag;
-	uint32_t gn_local_tag;
-};
-
-/* Debugging logs */
-struct sctp_str_log {
-	void *stcb;		/* FIXME: LP64 issue */
-	uint32_t n_tsn;
-	uint32_t e_tsn;
-	uint16_t n_sseq;
-	uint16_t e_sseq;
-	uint16_t strm;
-};
-
-struct sctp_sb_log {
-	void *stcb;		/* FIXME: LP64 issue */
-	uint32_t so_sbcc;
-	uint32_t stcb_sbcc;
-	uint32_t incr;
-};
-
-struct sctp_fr_log {
-	uint32_t largest_tsn;
-	uint32_t largest_new_tsn;
-	uint32_t tsn;
-};
-
-struct sctp_fr_map {
-	uint32_t base;
-	uint32_t cum;
-	uint32_t high;
-};
-
-struct sctp_rwnd_log {
-	uint32_t rwnd;
-	uint32_t send_size;
-	uint32_t overhead;
-	uint32_t new_rwnd;
-};
-
-struct sctp_mbcnt_log {
-	uint32_t total_queue_size;
-	uint32_t size_change;
-	uint32_t total_queue_mb_size;
-	uint32_t mbcnt_change;
-};
-
-struct sctp_sack_log {
-	uint32_t cumack;
-	uint32_t oldcumack;
-	uint32_t tsn;
-	uint16_t numGaps;
-	uint16_t numDups;
-};
-
-struct sctp_lock_log {
-	void *sock;		/* FIXME: LP64 issue */
-	void *inp;		/* FIXME: LP64 issue */
-	uint8_t tcb_lock;
-	uint8_t inp_lock;
-	uint8_t info_lock;
-	uint8_t sock_lock;
-	uint8_t sockrcvbuf_lock;
-	uint8_t socksndbuf_lock;
-	uint8_t create_lock;
-	uint8_t resv;
-};
-
-struct sctp_rto_log {
-	void *net;		/* FIXME: LP64 issue */
-	uint32_t rtt;
-};
-
-struct sctp_nagle_log {
-	void *stcb;		/* FIXME: LP64 issue */
-	uint32_t total_flight;
-	uint32_t total_in_queue;
-	uint16_t count_in_queue;
-	uint16_t count_in_flight;
-};
-
-struct sctp_sbwake_log {
-	void *stcb;		/* FIXME: LP64 issue */
-	uint16_t send_q;
-	uint16_t sent_q;
-	uint16_t flight;
-	uint16_t wake_cnt;
-	uint8_t stream_qcnt;	/* chnk cnt */
-	uint8_t chunks_on_oque;	/* chunks out */
-	uint8_t sbflags;
-	uint8_t sctpflags;
-};
-
-struct sctp_misc_info {
-	uint32_t log1;
-	uint32_t log2;
-	uint32_t log3;
-	uint32_t log4;
-};
-
-struct sctp_log_closing {
-	void *inp;		/* FIXME: LP64 issue */
-	void *stcb;		/* FIXME: LP64 issue */
-	uint32_t sctp_flags;
-	uint16_t state;
-	int16_t loc;
-};
-
-struct sctp_mbuf_log {
-	struct mbuf *mp;	/* FIXME: LP64 issue */
-	caddr_t ext;
-	caddr_t data;
-	uint16_t size;
-	uint8_t refcnt;
-	uint8_t mbuf_flags;
-};
-
-struct sctp_cwnd_log {
-	uint64_t time_event;
-	uint8_t from;
-	uint8_t event_type;
-	uint8_t resv[2];
-	union {
-		struct sctp_log_closing close;
-		struct sctp_blk_args blk;
-		struct sctp_cwnd_args cwnd;
-		struct sctp_str_log strlog;
-		struct sctp_fr_log fr;
-		struct sctp_fr_map map;
-		struct sctp_rwnd_log rwnd;
-		struct sctp_mbcnt_log mbcnt;
-		struct sctp_sack_log sack;
-		struct sctp_lock_log lock;
-		struct sctp_rto_log rto;
-		struct sctp_sb_log sb;
-		struct sctp_nagle_log nagle;
-		struct sctp_sbwake_log wake;
-		struct sctp_mbuf_log mb;
-		struct sctp_misc_info misc;
-	}     x;
-};
-
-struct sctp_cwnd_log_req {
-	int32_t num_in_log;	/* Number in log */
-	int32_t num_ret;	/* Number returned */
-	int32_t start_at;	/* start at this one */
-	int32_t end_at;		/* end at this one */
-	struct sctp_cwnd_log log[];
-};
-
-struct sctp_timeval {
-	uint32_t tv_sec;
-	uint32_t tv_usec;
-};
-
-struct sctpstat {
-	struct sctp_timeval sctps_discontinuitytime;	/* sctpStats 18
-							 * (TimeStamp) */
-	/* MIB according to RFC 3873 */
-	uint32_t sctps_currestab;	/* sctpStats  1   (Gauge32) */
-	uint32_t sctps_activeestab;	/* sctpStats  2 (Counter32) */
-	uint32_t sctps_restartestab;
-	uint32_t sctps_collisionestab;
-	uint32_t sctps_passiveestab;	/* sctpStats  3 (Counter32) */
-	uint32_t sctps_aborted;	/* sctpStats  4 (Counter32) */
-	uint32_t sctps_shutdown;/* sctpStats  5 (Counter32) */
-	uint32_t sctps_outoftheblue;	/* sctpStats  6 (Counter32) */
-	uint32_t sctps_checksumerrors;	/* sctpStats  7 (Counter32) */
-	uint32_t sctps_outcontrolchunks;	/* sctpStats  8 (Counter64) */
-	uint32_t sctps_outorderchunks;	/* sctpStats  9 (Counter64) */
-	uint32_t sctps_outunorderchunks;	/* sctpStats 10 (Counter64) */
-	uint32_t sctps_incontrolchunks;	/* sctpStats 11 (Counter64) */
-	uint32_t sctps_inorderchunks;	/* sctpStats 12 (Counter64) */
-	uint32_t sctps_inunorderchunks;	/* sctpStats 13 (Counter64) */
-	uint32_t sctps_fragusrmsgs;	/* sctpStats 14 (Counter64) */
-	uint32_t sctps_reasmusrmsgs;	/* sctpStats 15 (Counter64) */
-	uint32_t sctps_outpackets;	/* sctpStats 16 (Counter64) */
-	uint32_t sctps_inpackets;	/* sctpStats 17 (Counter64) */
-
-	/* input statistics: */
-	uint32_t sctps_recvpackets;	/* total input packets        */
-	uint32_t sctps_recvdatagrams;	/* total input datagrams      */
-	uint32_t sctps_recvpktwithdata;	/* total packets that had data */
-	uint32_t sctps_recvsacks;	/* total input SACK chunks    */
-	uint32_t sctps_recvdata;/* total input DATA chunks    */
-	uint32_t sctps_recvdupdata;	/* total input duplicate DATA chunks */
-	uint32_t sctps_recvheartbeat;	/* total input HB chunks      */
-	uint32_t sctps_recvheartbeatack;	/* total input HB-ACK chunks  */
-	uint32_t sctps_recvecne;/* total input ECNE chunks    */
-	uint32_t sctps_recvauth;/* total input AUTH chunks    */
-	uint32_t sctps_recvauthmissing;	/* total input chunks missing AUTH */
-	uint32_t sctps_recvivalhmacid;	/* total number of invalid HMAC ids
-					 * received */
-	uint32_t sctps_recvivalkeyid;	/* total number of invalid secret ids
-					 * received */
-	uint32_t sctps_recvauthfailed;	/* total number of auth failed */
-	uint32_t sctps_recvexpress;	/* total fast path receives all one
-					 * chunk */
-	uint32_t sctps_recvexpressm;	/* total fast path multi-part data */
-	uint32_t sctps_recvnocrc;
-	uint32_t sctps_recvswcrc;
-	uint32_t sctps_recvhwcrc;
-
-	/* output statistics: */
-	uint32_t sctps_sendpackets;	/* total output packets       */
-	uint32_t sctps_sendsacks;	/* total output SACKs         */
-	uint32_t sctps_senddata;/* total output DATA chunks   */
-	uint32_t sctps_sendretransdata;	/* total output retransmitted DATA
-					 * chunks */
-	uint32_t sctps_sendfastretrans;	/* total output fast retransmitted
-					 * DATA chunks */
-	uint32_t sctps_sendmultfastretrans;	/* total FR's that happened
-						 * more than once to same
-						 * chunk (u-del multi-fr
-						 * algo). */
-	uint32_t sctps_sendheartbeat;	/* total output HB chunks     */
-	uint32_t sctps_sendecne;/* total output ECNE chunks    */
-	uint32_t sctps_sendauth;/* total output AUTH chunks FIXME   */
-	uint32_t sctps_senderrors;	/* ip_output error counter */
-	uint32_t sctps_sendnocrc;
-	uint32_t sctps_sendswcrc;
-	uint32_t sctps_sendhwcrc;
-	/* PCKDROPREP statistics: */
-	uint32_t sctps_pdrpfmbox;	/* Packet drop from middle box */
-	uint32_t sctps_pdrpfehos;	/* P-drop from end host */
-	uint32_t sctps_pdrpmbda;/* P-drops with data */
-	uint32_t sctps_pdrpmbct;/* P-drops, non-data, non-endhost */
-	uint32_t sctps_pdrpbwrpt;	/* P-drop, non-endhost, bandwidth rep
-					 * only */
-	uint32_t sctps_pdrpcrupt;	/* P-drop, not enough for chunk header */
-	uint32_t sctps_pdrpnedat;	/* P-drop, not enough data to confirm */
-	uint32_t sctps_pdrppdbrk;	/* P-drop, where process_chunk_drop
-					 * said break */
-	uint32_t sctps_pdrptsnnf;	/* P-drop, could not find TSN */
-	uint32_t sctps_pdrpdnfnd;	/* P-drop, attempt reverse TSN lookup */
-	uint32_t sctps_pdrpdiwnp;	/* P-drop, e-host confirms zero-rwnd */
-	uint32_t sctps_pdrpdizrw;	/* P-drop, midbox confirms no space */
-	uint32_t sctps_pdrpbadd;/* P-drop, data did not match TSN */
-	uint32_t sctps_pdrpmark;/* P-drop, TSN's marked for Fast Retran */
-	/* timeouts */
-	uint32_t sctps_timoiterator;	/* Number of iterator timers that
-					 * fired */
-	uint32_t sctps_timodata;/* Number of T3 data time outs */
-	uint32_t sctps_timowindowprobe;	/* Number of window probe (T3) timers
-					 * that fired */
-	uint32_t sctps_timoinit;/* Number of INIT timers that fired */
-	uint32_t sctps_timosack;/* Number of sack timers that fired */
-	uint32_t sctps_timoshutdown;	/* Number of shutdown timers that
-					 * fired */
-	uint32_t sctps_timoheartbeat;	/* Number of heartbeat timers that
-					 * fired */
-	uint32_t sctps_timocookie;	/* Number of times a cookie timeout
-					 * fired */
-	uint32_t sctps_timosecret;	/* Number of times an endpoint changed
-					 * its cookie secret */
-	uint32_t sctps_timopathmtu;	/* Number of PMTU timers that fired */
-	uint32_t sctps_timoshutdownack;	/* Number of shutdown ack timers that
-					 * fired */
-	uint32_t sctps_timoshutdownguard;	/* Number of shutdown guard
-						 * timers that fired */
-	uint32_t sctps_timostrmrst;	/* Number of stream reset timers that
-					 * fired */
-	uint32_t sctps_timoearlyfr;	/* Number of early FR timers that
-					 * fired */
-	uint32_t sctps_timoasconf;	/* Number of times an asconf timer
-					 * fired */
-	uint32_t sctps_timodelprim;	/* Number of times a prim_deleted
-					 * timer fired */
-	uint32_t sctps_timoautoclose;	/* Number of times auto close timer
-					 * fired */
-	uint32_t sctps_timoassockill;	/* Number of asoc free timers expired */
-	uint32_t sctps_timoinpkill;	/* Number of inp free timers expired */
-	/* former early FR counters */
-	uint32_t sctps_spare[11];
-	/* others */
-	uint32_t sctps_hdrops;	/* packet shorter than header */
-	uint32_t sctps_badsum;	/* checksum error             */
-	uint32_t sctps_noport;	/* no endpoint for port       */
-	uint32_t sctps_badvtag;	/* bad v-tag                  */
-	uint32_t sctps_badsid;	/* bad SID                    */
-	uint32_t sctps_nomem;	/* no memory                  */
-	uint32_t sctps_fastretransinrtt;	/* number of multiple FR in a
-						 * RTT window */
-	uint32_t sctps_markedretrans;
-	uint32_t sctps_naglesent;	/* nagle allowed sending      */
-	uint32_t sctps_naglequeued;	/* nagle doesn't allow sending */
-	uint32_t sctps_maxburstqueued;	/* max burst doesn't allow sending */
-	uint32_t sctps_ifnomemqueued;	/* look ahead tells us no memory in
-					 * interface ring buffer OR we had a
-					 * send error and are queuing one
-					 * send. */
-	uint32_t sctps_windowprobed;	/* total number of window probes sent */
-	uint32_t sctps_lowlevelerr;	/* total times an output error causes
-					 * us to clamp down on next user send. */
-	uint32_t sctps_lowlevelerrusr;	/* total times sctp_senderrors were
-					 * caused from a user send from a user
-					 * invoked send not a sack response */
-	uint32_t sctps_datadropchklmt;	/* Number of in data drops due to
-					 * chunk limit reached */
-	uint32_t sctps_datadroprwnd;	/* Number of in data drops due to rwnd
-					 * limit reached */
-	uint32_t sctps_ecnereducedcwnd;	/* Number of times a ECN reduced the
-					 * cwnd */
-	uint32_t sctps_vtagexpress;	/* Used express lookup via vtag */
-	uint32_t sctps_vtagbogus;	/* Collision in express lookup. */
-	uint32_t sctps_primary_randry;	/* Number of times the sender ran dry
-					 * of user data on primary */
-	uint32_t sctps_cmt_randry;	/* Same for above */
-	uint32_t sctps_slowpath_sack;	/* Sacks the slow way */
-	uint32_t sctps_wu_sacks_sent;	/* Window Update only sacks sent */
-	uint32_t sctps_sends_with_flags;	/* number of sends with
-						 * sinfo_flags !=0 */
-	uint32_t sctps_sends_with_unord;	/* number of unordered sends */
-	uint32_t sctps_sends_with_eof;	/* number of sends with EOF flag set */
-	uint32_t sctps_sends_with_abort;	/* number of sends with ABORT
-						 * flag set */
-	uint32_t sctps_protocol_drain_calls;	/* number of times protocol
-						 * drain called */
-	uint32_t sctps_protocol_drains_done;	/* number of times we did a
-						 * protocol drain */
-	uint32_t sctps_read_peeks;	/* Number of times recv was called
-					 * with peek */
-	uint32_t sctps_cached_chk;	/* Number of cached chunks used */
-	uint32_t sctps_cached_strmoq;	/* Number of cached stream oq's used */
-	uint32_t sctps_left_abandon;	/* Number of unread messages abandoned
-					 * by close */
-	uint32_t sctps_send_burst_avoid;	/* Unused */
-	uint32_t sctps_send_cwnd_avoid;	/* Send cwnd full  avoidance, already
-					 * max burst inflight to net */
-	uint32_t sctps_fwdtsn_map_over;	/* number of map array over-runs via
-					 * fwd-tsn's */
-	uint32_t sctps_queue_upd_ecne;	/* Number of times we queued or
-					 * updated an ECN chunk on send queue */
-	uint32_t sctps_reserved[31];	/* Future ABI compat - remove int's
-					 * from here when adding new */
-};
-
-#define SCTP_STAT_INCR(_x) SCTP_STAT_INCR_BY(_x,1)
-#define SCTP_STAT_DECR(_x) SCTP_STAT_DECR_BY(_x,1)
-#if defined(__FreeBSD__) && defined(SMP) && defined(SCTP_USE_PERCPU_STAT)
-#define SCTP_STAT_INCR_BY(_x,_d) (SCTP_BASE_STATS[PCPU_GET(cpuid)]._x += _d)
-#define SCTP_STAT_DECR_BY(_x,_d) (SCTP_BASE_STATS[PCPU_GET(cpuid)]._x -= _d)
-#else
-#define SCTP_STAT_INCR_BY(_x,_d) atomic_add_int(&SCTP_BASE_STAT(_x), _d)
-#define SCTP_STAT_DECR_BY(_x,_d) atomic_subtract_int(&SCTP_BASE_STAT(_x), _d)
-#endif
-/* The following macros are for handling MIB values, */
-#define SCTP_STAT_INCR_COUNTER32(_x) SCTP_STAT_INCR(_x)
-#define SCTP_STAT_INCR_COUNTER64(_x) SCTP_STAT_INCR(_x)
-#define SCTP_STAT_INCR_GAUGE32(_x) SCTP_STAT_INCR(_x)
-#define SCTP_STAT_DECR_COUNTER32(_x) SCTP_STAT_DECR(_x)
-#define SCTP_STAT_DECR_COUNTER64(_x) SCTP_STAT_DECR(_x)
-#define SCTP_STAT_DECR_GAUGE32(_x) SCTP_STAT_DECR(_x)
-
-union sctp_sockstore {
-	struct sockaddr_in sin;
-	struct sockaddr_in6 sin6;
-	struct sockaddr sa;
-};
-
-
-/***********************************/
-/* And something for us old timers */
-/***********************************/
-
-#ifndef ntohll
-#include <sys/endian.h>
-#define ntohll(x) be64toh(x)
-#endif
-
-#ifndef htonll
-#include <sys/endian.h>
-#define htonll(x) htobe64(x)
-#endif
-/***********************************/
-
-
-struct xsctp_inpcb {
-	uint32_t last;
-	uint32_t flags;
-	uint64_t features;
-	uint32_t total_sends;
-	uint32_t total_recvs;
-	uint32_t total_nospaces;
-	uint32_t fragmentation_point;
-	uint16_t local_port;
-	uint16_t qlen;
-	uint16_t maxqlen;
-	void *socket;
-#if defined(__LP64__)
-	uint32_t extra_padding[29];	/* future */
-#else
-	uint32_t extra_padding[30];	/* future */
-#endif
-};
-
-struct xsctp_tcb {
-	union sctp_sockstore primary_addr;	/* sctpAssocEntry 5/6 */
-	uint32_t last;
-	uint32_t heartbeat_interval;	/* sctpAssocEntry 7   */
-	uint32_t state;		/* sctpAssocEntry 8   */
-	uint32_t in_streams;	/* sctpAssocEntry 9   */
-	uint32_t out_streams;	/* sctpAssocEntry 10  */
-	uint32_t max_nr_retrans;/* sctpAssocEntry 11  */
-	uint32_t primary_process;	/* sctpAssocEntry 12  */
-	uint32_t T1_expireries;	/* sctpAssocEntry 13  */
-	uint32_t T2_expireries;	/* sctpAssocEntry 14  */
-	uint32_t retransmitted_tsns;	/* sctpAssocEntry 15  */
-	uint32_t total_sends;
-	uint32_t total_recvs;
-	uint32_t local_tag;
-	uint32_t remote_tag;
-	uint32_t initial_tsn;
-	uint32_t highest_tsn;
-	uint32_t cumulative_tsn;
-	uint32_t cumulative_tsn_ack;
-	uint32_t mtu;
-	uint32_t refcnt;
-	uint16_t local_port;	/* sctpAssocEntry 3   */
-	uint16_t remote_port;	/* sctpAssocEntry 4   */
-	struct sctp_timeval start_time;	/* sctpAssocEntry 16  */
-	struct sctp_timeval discontinuity_time;	/* sctpAssocEntry 17  */
-	uint32_t peers_rwnd;
-	sctp_assoc_t assoc_id;	/* sctpAssocEntry 1   */
-	uint32_t extra_padding[32];	/* future */
-};
-
-struct xsctp_laddr {
-	union sctp_sockstore address;	/* sctpAssocLocalAddrEntry 1/2 */
-	uint32_t last;
-	struct sctp_timeval start_time;	/* sctpAssocLocalAddrEntry 3   */
-	uint32_t extra_padding[32];	/* future */
-};
-
-struct xsctp_raddr {
-	union sctp_sockstore address;	/* sctpAssocLocalRemEntry 1/2 */
-	uint32_t last;
-	uint32_t rto;		/* sctpAssocLocalRemEntry 5   */
-	uint32_t max_path_rtx;	/* sctpAssocLocalRemEntry 6   */
-	uint32_t rtx;		/* sctpAssocLocalRemEntry 7   */
-	uint32_t error_counter;	/* */
-	uint32_t cwnd;		/* */
-	uint32_t flight_size;	/* */
-	uint32_t mtu;		/* */
-	uint8_t active;		/* sctpAssocLocalRemEntry 3   */
-	uint8_t confirmed;	/* */
-	uint8_t heartbeat_enabled;	/* sctpAssocLocalRemEntry 4   */
-	uint8_t potentially_failed;
-	struct sctp_timeval start_time;	/* sctpAssocLocalRemEntry 8   */
-	uint32_t rtt;
-	uint32_t heartbeat_interval;
-	uint32_t extra_padding[31];	/* future */
-};
-
-#define SCTP_MAX_LOGGING_SIZE 30000
-#define SCTP_TRACE_PARAMS 6	/* This number MUST be even   */
-
-struct sctp_log_entry {
-	uint64_t timestamp;
-	uint32_t subsys;
-	uint32_t padding;
-	uint32_t params[SCTP_TRACE_PARAMS];
-};
-
-struct sctp_log {
-	struct sctp_log_entry entry[SCTP_MAX_LOGGING_SIZE];
-	uint32_t index;
-	uint32_t padding;
-};
-
-/*
- * Kernel defined for sctp_send
- */
-#if defined(_KERNEL) || defined(__Userspace__)
-int
-sctp_lower_sosend(struct socket *so,
-    struct sockaddr *addr,
-    struct uio *uio,
-    struct mbuf *i_pak,
-    struct mbuf *control,
-    int flags,
-    struct sctp_sndrcvinfo *srcv
-    ,struct thread *p
-);
-
-int
-sctp_sorecvmsg(struct socket *so,
-    struct uio *uio,
-    struct mbuf **mp,
-    struct sockaddr *from,
-    int fromlen,
-    int *msg_flags,
-    struct sctp_sndrcvinfo *sinfo,
-    int filling_sinfo);
-
-#endif
-
-/*
- * API system calls
- */
-#if !(defined(_KERNEL)) && !(defined(__Userspace__))
-
-__BEGIN_DECLS
-int sctp_peeloff(int, sctp_assoc_t);
-int sctp_bindx(int, struct sockaddr *, int, int);
-int sctp_connectx(int, const struct sockaddr *, int, sctp_assoc_t *);
-int sctp_getaddrlen(sa_family_t);
-int sctp_getpaddrs(int, sctp_assoc_t, struct sockaddr **);
-void sctp_freepaddrs(struct sockaddr *);
-int sctp_getladdrs(int, sctp_assoc_t, struct sockaddr **);
-void sctp_freeladdrs(struct sockaddr *);
-int sctp_opt_info(int, sctp_assoc_t, int, void *, socklen_t *);
-
-/* deprecated */
-ssize_t 
-sctp_sendmsg(int, const void *, size_t, const struct sockaddr *,
-    socklen_t, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t);
-
-/* deprecated */
-ssize_t 
-sctp_send(int, const void *, size_t,
-    const struct sctp_sndrcvinfo *, int);
-
-/* deprecated */
-ssize_t 
-sctp_sendx(int, const void *, size_t, struct sockaddr *,
-    int, struct sctp_sndrcvinfo *, int);
-
-/* deprecated */
-ssize_t 
-sctp_sendmsgx(int sd, const void *, size_t, struct sockaddr *,
-    int, uint32_t, uint32_t, uint16_t, uint32_t, uint32_t);
-
-sctp_assoc_t sctp_getassocid(int, struct sockaddr *);
-
-/* deprecated */
-ssize_t 
-sctp_recvmsg(int, void *, size_t, struct sockaddr *, socklen_t *,
-    struct sctp_sndrcvinfo *, int *);
-
-ssize_t 
-sctp_sendv(int, const struct iovec *, int, struct sockaddr *,
-    int, void *, socklen_t, unsigned int, int);
-
-ssize_t 
-sctp_recvv(int, const struct iovec *, int, struct sockaddr *,
-    socklen_t *, void *, socklen_t *, unsigned int *, int *);
-
-__END_DECLS
-
-#endif				/* !_KERNEL */
-#endif				/* !__sctp_uio_h__ */
diff --git a/include.new/netinet/sctp_var.h b/include.new/netinet/sctp_var.h
deleted file mode 100644
index 902e357..0000000
--- a/include.new/netinet/sctp_var.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*-
- * Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctp_var.h 284505 2015-06-17 09:39:40Z tuexen $");
-
-#ifndef _NETINET_SCTP_VAR_H_
-#define _NETINET_SCTP_VAR_H_
-
-#include <netinet/sctp_uio.h>
-
-#if defined(_KERNEL) || defined(__Userspace__)
-
-extern struct pr_usrreqs sctp_usrreqs;
-
-
-#define sctp_feature_on(inp, feature)  (inp->sctp_features |= feature)
-#define sctp_feature_off(inp, feature) (inp->sctp_features &= ~feature)
-#define sctp_is_feature_on(inp, feature) ((inp->sctp_features & feature) == feature)
-#define sctp_is_feature_off(inp, feature) ((inp->sctp_features & feature) == 0)
-
-#define sctp_stcb_feature_on(inp, stcb, feature) {\
-	if (stcb) { \
-		stcb->asoc.sctp_features |= feature; \
-	} else if (inp) { \
-		inp->sctp_features |= feature; \
-	} \
-}
-#define sctp_stcb_feature_off(inp, stcb, feature) {\
-	if (stcb) { \
-		stcb->asoc.sctp_features &= ~feature; \
-	} else if (inp) { \
-		inp->sctp_features &= ~feature; \
-	} \
-}
-#define sctp_stcb_is_feature_on(inp, stcb, feature) \
-	(((stcb != NULL) && \
-	  ((stcb->asoc.sctp_features & feature) == feature)) || \
-	 ((stcb == NULL) && (inp != NULL) && \
-	  ((inp->sctp_features & feature) == feature)))
-#define sctp_stcb_is_feature_off(inp, stcb, feature) \
-	(((stcb != NULL) && \
-	  ((stcb->asoc.sctp_features & feature) == 0)) || \
-	 ((stcb == NULL) && (inp != NULL) && \
-	  ((inp->sctp_features & feature) == 0)) || \
-	 ((stcb == NULL) && (inp == NULL)))
-
-/* managing mobility_feature in inpcb (by micchie) */
-#define sctp_mobility_feature_on(inp, feature)  (inp->sctp_mobility_features |= feature)
-#define sctp_mobility_feature_off(inp, feature) (inp->sctp_mobility_features &= ~feature)
-#define sctp_is_mobility_feature_on(inp, feature) (inp->sctp_mobility_features & feature)
-#define sctp_is_mobility_feature_off(inp, feature) ((inp->sctp_mobility_features & feature) == 0)
-
-#define sctp_maxspace(sb) (max((sb)->sb_hiwat,SCTP_MINIMAL_RWND))
-
-#define	sctp_sbspace(asoc, sb) ((long) ((sctp_maxspace(sb) > (asoc)->sb_cc) ? (sctp_maxspace(sb) - (asoc)->sb_cc) : 0))
-
-#define	sctp_sbspace_failedmsgs(sb) ((long) ((sctp_maxspace(sb) > (sb)->sb_cc) ? (sctp_maxspace(sb) - (sb)->sb_cc) : 0))
-
-#define sctp_sbspace_sub(a,b) ((a > b) ? (a - b) : 0)
-
-/*
- * I tried to cache the readq entries at one point. But the reality
- * is that it did not add any performance since this meant we had to
- * lock the STCB on read. And at that point once you have to do an
- * extra lock, it really does not matter if the lock is in the ZONE
- * stuff or in our code. Note that this same problem would occur with
- * an mbuf cache as well so it is not really worth doing, at least
- * right now :-D
- */
-
-#define sctp_free_a_readq(_stcb, _readq) { \
-	SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_readq), (_readq)); \
-	SCTP_DECR_READQ_COUNT(); \
-}
-
-#define sctp_alloc_a_readq(_stcb, _readq) { \
-	(_readq) = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_readq), struct sctp_queued_to_read); \
-	if ((_readq)) { \
-	     SCTP_INCR_READQ_COUNT(); \
-	} \
-}
-
-#define sctp_free_a_strmoq(_stcb, _strmoq, _so_locked) { \
-	if ((_strmoq)->holds_key_ref) { \
-		sctp_auth_key_release(stcb, sp->auth_keyid, _so_locked); \
-		(_strmoq)->holds_key_ref = 0; \
-	} \
-	SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_strmoq), (_strmoq)); \
-	SCTP_DECR_STRMOQ_COUNT(); \
-}
-
-#define sctp_alloc_a_strmoq(_stcb, _strmoq) { \
-	(_strmoq) = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_strmoq), struct sctp_stream_queue_pending); \
-	if ((_strmoq)) { \
-		memset(_strmoq, 0, sizeof(struct sctp_stream_queue_pending)); \
-		SCTP_INCR_STRMOQ_COUNT(); \
-		(_strmoq)->holds_key_ref = 0; \
-	} \
-}
-
-#define sctp_free_a_chunk(_stcb, _chk, _so_locked) { \
-	if ((_chk)->holds_key_ref) {\
-		sctp_auth_key_release((_stcb), (_chk)->auth_keyid, _so_locked); \
-		(_chk)->holds_key_ref = 0; \
-	} \
-	if (_stcb) { \
-		SCTP_TCB_LOCK_ASSERT((_stcb)); \
-		if ((_chk)->whoTo) { \
-			sctp_free_remote_addr((_chk)->whoTo); \
-			(_chk)->whoTo = NULL; \
-		} \
-		if (((_stcb)->asoc.free_chunk_cnt > SCTP_BASE_SYSCTL(sctp_asoc_free_resc_limit)) || \
-		    (SCTP_BASE_INFO(ipi_free_chunks) > SCTP_BASE_SYSCTL(sctp_system_free_resc_limit))) { \
-			SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_chunk), (_chk)); \
-			SCTP_DECR_CHK_COUNT(); \
-		} else { \
-			TAILQ_INSERT_TAIL(&(_stcb)->asoc.free_chunks, (_chk), sctp_next); \
-			(_stcb)->asoc.free_chunk_cnt++; \
-			atomic_add_int(&SCTP_BASE_INFO(ipi_free_chunks), 1); \
-		} \
-	} else { \
-		SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_chunk), (_chk)); \
-		SCTP_DECR_CHK_COUNT(); \
-	} \
-}
-
-#define sctp_alloc_a_chunk(_stcb, _chk) { \
-	if (TAILQ_EMPTY(&(_stcb)->asoc.free_chunks)) { \
-		(_chk) = SCTP_ZONE_GET(SCTP_BASE_INFO(ipi_zone_chunk), struct sctp_tmit_chunk); \
-		if ((_chk)) { \
-			SCTP_INCR_CHK_COUNT(); \
-			(_chk)->whoTo = NULL; \
-			(_chk)->holds_key_ref = 0; \
-		} \
-	} else { \
-		(_chk) = TAILQ_FIRST(&(_stcb)->asoc.free_chunks); \
-		TAILQ_REMOVE(&(_stcb)->asoc.free_chunks, (_chk), sctp_next); \
-		atomic_subtract_int(&SCTP_BASE_INFO(ipi_free_chunks), 1); \
-		(_chk)->holds_key_ref = 0; \
-		SCTP_STAT_INCR(sctps_cached_chk); \
-		(_stcb)->asoc.free_chunk_cnt--; \
-	} \
-}
-
-
-#define sctp_free_remote_addr(__net) { \
-	if ((__net)) {  \
-		if (SCTP_DECREMENT_AND_CHECK_REFCOUNT(&(__net)->ref_count)) { \
-			(void)SCTP_OS_TIMER_STOP(&(__net)->rxt_timer.timer); \
-			(void)SCTP_OS_TIMER_STOP(&(__net)->pmtu_timer.timer); \
-			(void)SCTP_OS_TIMER_STOP(&(__net)->hb_timer.timer); \
-			if ((__net)->ro.ro_rt) { \
-				RTFREE((__net)->ro.ro_rt); \
-				(__net)->ro.ro_rt = NULL; \
-			} \
-			if ((__net)->src_addr_selected) { \
-				sctp_free_ifa((__net)->ro._s_addr); \
-				(__net)->ro._s_addr = NULL; \
-			} \
-			(__net)->src_addr_selected = 0; \
-			(__net)->dest_state &= ~SCTP_ADDR_REACHABLE; \
-			SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_net), (__net)); \
-			SCTP_DECR_RADDR_COUNT(); \
-		} \
-	} \
-}
-
-#define sctp_sbfree(ctl, stcb, sb, m) { \
-	SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_cc, SCTP_BUF_LEN((m))); \
-	SCTP_SAVE_ATOMIC_DECREMENT(&(sb)->sb_mbcnt, MSIZE); \
-	if (((ctl)->do_not_ref_stcb == 0) && stcb) {\
-		SCTP_SAVE_ATOMIC_DECREMENT(&(stcb)->asoc.sb_cc, SCTP_BUF_LEN((m))); \
-		SCTP_SAVE_ATOMIC_DECREMENT(&(stcb)->asoc.my_rwnd_control_len, MSIZE); \
-	} \
-	if (SCTP_BUF_TYPE(m) != MT_DATA && SCTP_BUF_TYPE(m) != MT_HEADER && \
-	    SCTP_BUF_TYPE(m) != MT_OOBDATA) \
-		atomic_subtract_int(&(sb)->sb_ctl,SCTP_BUF_LEN((m))); \
-}
-
-#define sctp_sballoc(stcb, sb, m) { \
-	atomic_add_int(&(sb)->sb_cc,SCTP_BUF_LEN((m))); \
-	atomic_add_int(&(sb)->sb_mbcnt, MSIZE); \
-	if (stcb) { \
-		atomic_add_int(&(stcb)->asoc.sb_cc,SCTP_BUF_LEN((m))); \
-		atomic_add_int(&(stcb)->asoc.my_rwnd_control_len, MSIZE); \
-	} \
-	if (SCTP_BUF_TYPE(m) != MT_DATA && SCTP_BUF_TYPE(m) != MT_HEADER && \
-	    SCTP_BUF_TYPE(m) != MT_OOBDATA) \
-		atomic_add_int(&(sb)->sb_ctl,SCTP_BUF_LEN((m))); \
-}
-
-
-#define sctp_ucount_incr(val) { \
-	val++; \
-}
-
-#define sctp_ucount_decr(val) { \
-	if (val > 0) { \
-		val--; \
-	} else { \
-		val = 0; \
-	} \
-}
-
-#define sctp_mbuf_crush(data) do { \
-	struct mbuf *_m; \
-	_m = (data); \
-	while (_m && (SCTP_BUF_LEN(_m) == 0)) { \
-		(data)  = SCTP_BUF_NEXT(_m); \
-		SCTP_BUF_NEXT(_m) = NULL; \
-		sctp_m_free(_m); \
-		_m = (data); \
-	} \
-} while (0)
-
-#define sctp_flight_size_decrease(tp1) do { \
-	if (tp1->whoTo->flight_size >= tp1->book_size) \
-		tp1->whoTo->flight_size -= tp1->book_size; \
-	else \
-		tp1->whoTo->flight_size = 0; \
-} while (0)
-
-#define sctp_flight_size_increase(tp1) do { \
-	(tp1)->whoTo->flight_size += (tp1)->book_size; \
-} while (0)
-
-#ifdef SCTP_FS_SPEC_LOG
-#define sctp_total_flight_decrease(stcb, tp1) do { \
-	if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \
-		stcb->asoc.fs_index = 0;\
-	stcb->asoc.fslog[stcb->asoc.fs_index].total_flight = stcb->asoc.total_flight; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].tsn = tp1->rec.data.TSN_seq; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].book = tp1->book_size; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].sent = tp1->sent; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].incr = 0; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].decr = 1; \
-	stcb->asoc.fs_index++; \
-	tp1->window_probe = 0; \
-	if (stcb->asoc.total_flight >= tp1->book_size) { \
-		stcb->asoc.total_flight -= tp1->book_size; \
-		if (stcb->asoc.total_flight_count > 0) \
-			stcb->asoc.total_flight_count--; \
-	} else { \
-		stcb->asoc.total_flight = 0; \
-		stcb->asoc.total_flight_count = 0; \
-	} \
-} while (0)
-
-#define sctp_total_flight_increase(stcb, tp1) do { \
-	if (stcb->asoc.fs_index > SCTP_FS_SPEC_LOG_SIZE) \
-		stcb->asoc.fs_index = 0;\
-	stcb->asoc.fslog[stcb->asoc.fs_index].total_flight = stcb->asoc.total_flight; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].tsn = tp1->rec.data.TSN_seq; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].book = tp1->book_size; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].sent = tp1->sent; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].incr = 1; \
-	stcb->asoc.fslog[stcb->asoc.fs_index].decr = 0; \
-	stcb->asoc.fs_index++; \
-	(stcb)->asoc.total_flight_count++; \
-	(stcb)->asoc.total_flight += (tp1)->book_size; \
-} while (0)
-
-#else
-
-#define sctp_total_flight_decrease(stcb, tp1) do { \
-	tp1->window_probe = 0; \
-	if (stcb->asoc.total_flight >= tp1->book_size) { \
-		stcb->asoc.total_flight -= tp1->book_size; \
-		if (stcb->asoc.total_flight_count > 0) \
-			stcb->asoc.total_flight_count--; \
-	} else { \
-		stcb->asoc.total_flight = 0; \
-		stcb->asoc.total_flight_count = 0; \
-	} \
-} while (0)
-
-#define sctp_total_flight_increase(stcb, tp1) do { \
-	(stcb)->asoc.total_flight_count++; \
-	(stcb)->asoc.total_flight += (tp1)->book_size; \
-} while (0)
-
-#endif
-
-#define SCTP_PF_ENABLED(_net) (_net->pf_threshold < _net->failure_threshold)
-#define SCTP_NET_IS_PF(_net) (_net->pf_threshold < _net->error_count)
-
-struct sctp_nets;
-struct sctp_inpcb;
-struct sctp_tcb;
-struct sctphdr;
-
-
-void sctp_close(struct socket *so);
-int sctp_disconnect(struct socket *so);
-void sctp_ctlinput(int, struct sockaddr *, void *);
-int sctp_ctloutput(struct socket *, struct sockopt *);
-
-#ifdef INET
-void sctp_input_with_port(struct mbuf *, int, uint16_t);
-void sctp_input(struct mbuf *, int);
-
-#endif
-void sctp_pathmtu_adjustment(struct sctp_tcb *, uint16_t);
-void sctp_drain(void);
-void sctp_init(void);
-void sctp_finish(void);
-int sctp_flush(struct socket *, int);
-int sctp_shutdown(struct socket *);
-void 
-sctp_notify(struct sctp_inpcb *, struct ip *ip, struct sctphdr *,
-    struct sockaddr *, struct sctp_tcb *,
-    struct sctp_nets *);
-int 
-sctp_bindx(struct socket *, int, struct sockaddr_storage *,
-    int, int, struct proc *);
-
-/* can't use sctp_assoc_t here */
-int sctp_peeloff(struct socket *, struct socket *, int, caddr_t, int *);
-int sctp_ingetaddr(struct socket *, struct sockaddr **);
-int sctp_peeraddr(struct socket *, struct sockaddr **);
-int sctp_listen(struct socket *, int, struct thread *);
-int sctp_accept(struct socket *, struct sockaddr **);
-
-#endif				/* _KERNEL */
-
-#endif				/* !_NETINET_SCTP_VAR_H_ */
diff --git a/include.new/netinet/sctputil.h b/include.new/netinet/sctputil.h
deleted file mode 100644
index cf9afd9..0000000
--- a/include.new/netinet/sctputil.h
+++ /dev/null
@@ -1,395 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet/sctputil.h 284633 2015-06-20 08:25:27Z tuexen $");
-
-#ifndef _NETINET_SCTP_UTIL_H_
-#define _NETINET_SCTP_UTIL_H_
-
-#if defined(_KERNEL) || defined(__Userspace__)
-
-#define SCTP_READ_LOCK_HELD 1
-#define SCTP_READ_LOCK_NOT_HELD 0
-
-#ifdef SCTP_ASOCLOG_OF_TSNS
-void sctp_print_out_track_log(struct sctp_tcb *stcb);
-
-#endif
-
-#ifdef SCTP_MBUF_LOGGING
-struct mbuf *sctp_m_free(struct mbuf *m);
-void sctp_m_freem(struct mbuf *m);
-
-#else
-#define sctp_m_free m_free
-#define sctp_m_freem m_freem
-#endif
-
-#if defined(SCTP_LOCAL_TRACE_BUF) || defined(__APPLE__)
-void
-     sctp_log_trace(uint32_t fr, const char *str SCTP_UNUSED, uint32_t a, uint32_t b, uint32_t c, uint32_t d, uint32_t e, uint32_t f);
-
-#endif
-
-#define sctp_get_associd(stcb) ((sctp_assoc_t)stcb->asoc.assoc_id)
-
-
-/*
- * Function prototypes
- */
-uint32_t
-sctp_get_ifa_hash_val(struct sockaddr *addr);
-
-struct sctp_ifa *
-         sctp_find_ifa_in_ep(struct sctp_inpcb *inp, struct sockaddr *addr, int hold_lock);
-
-struct sctp_ifa *
-         sctp_find_ifa_by_addr(struct sockaddr *addr, uint32_t vrf_id, int holds_lock);
-
-uint32_t sctp_select_initial_TSN(struct sctp_pcb *);
-
-uint32_t sctp_select_a_tag(struct sctp_inpcb *, uint16_t lport, uint16_t rport, int);
-
-int sctp_init_asoc(struct sctp_inpcb *, struct sctp_tcb *, uint32_t, uint32_t);
-
-void sctp_fill_random_store(struct sctp_pcb *);
-
-void
-sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin,
-    uint16_t numberout, int flag);
-void
-     sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32_t recv_tsn, int flag);
-
-void
-sctp_timer_start(int, struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-
-void
-sctp_timer_stop(int, struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *, uint32_t);
-
-int
-    sctp_dynamic_set_primary(struct sockaddr *sa, uint32_t vrf_id);
-
-void
-     sctp_mtu_size_reset(struct sctp_inpcb *, struct sctp_association *, uint32_t);
-
-void
-sctp_add_to_readq(struct sctp_inpcb *inp,
-    struct sctp_tcb *stcb,
-    struct sctp_queued_to_read *control,
-    struct sockbuf *sb,
-    int end,
-    int inpread_locked,
-    int so_locked
-#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
-    SCTP_UNUSED
-#endif
-);
-
-int
-sctp_append_to_readq(struct sctp_inpcb *inp,
-    struct sctp_tcb *stcb,
-    struct sctp_queued_to_read *control,
-    struct mbuf *m,
-    int end,
-    int new_cumack,
-    struct sockbuf *sb);
-
-
-void sctp_iterator_worker(void);
-
-uint32_t sctp_get_prev_mtu(uint32_t);
-uint32_t sctp_get_next_mtu(uint32_t);
-
-void
-     sctp_timeout_handler(void *);
-
-uint32_t
-sctp_calculate_rto(struct sctp_tcb *, struct sctp_association *,
-    struct sctp_nets *, struct timeval *, int, int);
-
-uint32_t sctp_calculate_len(struct mbuf *);
-
-caddr_t sctp_m_getptr(struct mbuf *, int, int, uint8_t *);
-
-struct sctp_paramhdr *
-sctp_get_next_param(struct mbuf *, int,
-    struct sctp_paramhdr *, int);
-
-struct mbuf *
-     sctp_add_pad_tombuf(struct mbuf *, int);
-
-struct mbuf *
-     sctp_pad_lastmbuf(struct mbuf *, int, struct mbuf *);
-
-void 
-sctp_ulp_notify(uint32_t, struct sctp_tcb *, uint32_t, void *, int
-#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
-    SCTP_UNUSED
-#endif
-);
-
-void
-sctp_pull_off_control_to_new_inp(struct sctp_inpcb *old_inp,
-    struct sctp_inpcb *new_inp,
-    struct sctp_tcb *stcb, int waitflags);
-
-
-void sctp_stop_timers_for_shutdown(struct sctp_tcb *);
-
-void 
-sctp_report_all_outbound(struct sctp_tcb *, uint16_t, int, int
-#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
-    SCTP_UNUSED
-#endif
-);
-
-int sctp_expand_mapping_array(struct sctp_association *, uint32_t);
-
-void 
-sctp_abort_notification(struct sctp_tcb *, uint8_t, uint16_t,
-    struct sctp_abort_chunk *, int
-#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
-    SCTP_UNUSED
-#endif
-);
-
-/* We abort responding to an IP packet for some reason */
-void
-sctp_abort_association(struct sctp_inpcb *, struct sctp_tcb *, struct mbuf *,
-    int, struct sockaddr *, struct sockaddr *,
-    struct sctphdr *, struct mbuf *,
-    uint8_t, uint32_t,
-    uint32_t, uint16_t);
-
-
-/* We choose to abort via user input */
-void
-sctp_abort_an_association(struct sctp_inpcb *, struct sctp_tcb *,
-    struct mbuf *, int
-#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
-    SCTP_UNUSED
-#endif
-);
-
-void 
-sctp_handle_ootb(struct mbuf *, int, int,
-    struct sockaddr *, struct sockaddr *,
-    struct sctphdr *, struct sctp_inpcb *,
-    struct mbuf *,
-    uint8_t, uint32_t, uint16_t,
-    uint32_t, uint16_t);
-
-int 
-sctp_connectx_helper_add(struct sctp_tcb *stcb, struct sockaddr *addr,
-    int totaddr, int *error);
-
-struct sctp_tcb *
-sctp_connectx_helper_find(struct sctp_inpcb *inp, struct sockaddr *addr,
-    int *totaddr, int *num_v4, int *num_v6, int *error, int limit, int *bad_addr);
-
-int sctp_is_there_an_abort_here(struct mbuf *, int, uint32_t *);
-
-#ifdef INET6
-uint32_t sctp_is_same_scope(struct sockaddr_in6 *, struct sockaddr_in6 *);
-
-struct sockaddr_in6 *
-             sctp_recover_scope(struct sockaddr_in6 *, struct sockaddr_in6 *);
-
-#define sctp_recover_scope_mac(addr, store) do { \
-	 if ((addr->sin6_family == AF_INET6) && \
-	     (IN6_IS_SCOPE_LINKLOCAL(&addr->sin6_addr))) { \
-		*store = *addr; \
-		if (addr->sin6_scope_id == 0) { \
-			if (!sa6_recoverscope(store)) { \
-				addr = store; \
-			} \
-		} else { \
-			in6_clearscope(&addr->sin6_addr); \
-			addr = store; \
-		} \
-	 } \
-} while (0)
-#endif
-
-int sctp_cmpaddr(struct sockaddr *, struct sockaddr *);
-
-void sctp_print_address(struct sockaddr *);
-
-int
-sctp_release_pr_sctp_chunk(struct sctp_tcb *, struct sctp_tmit_chunk *,
-    uint8_t, int
-#if !defined(__APPLE__) && !defined(SCTP_SO_LOCK_TESTING)
-    SCTP_UNUSED
-#endif
-);
-
-struct mbuf *sctp_generate_cause(uint16_t, char *);
-struct mbuf *sctp_generate_no_user_data_cause(uint32_t);
-
-void 
-sctp_bindx_add_address(struct socket *so, struct sctp_inpcb *inp,
-    struct sockaddr *sa, sctp_assoc_t assoc_id,
-    uint32_t vrf_id, int *error, void *p);
-void 
-sctp_bindx_delete_address(struct sctp_inpcb *inp,
-    struct sockaddr *sa, sctp_assoc_t assoc_id,
-    uint32_t vrf_id, int *error);
-
-int sctp_local_addr_count(struct sctp_tcb *stcb);
-
-#ifdef SCTP_MBCNT_LOGGING
-void
-sctp_free_bufspace(struct sctp_tcb *, struct sctp_association *,
-    struct sctp_tmit_chunk *, int);
-
-#else
-#define sctp_free_bufspace(stcb, asoc, tp1, chk_cnt)  \
-do { \
-	if (tp1->data != NULL) { \
-		atomic_subtract_int(&((asoc)->chunks_on_out_queue), chk_cnt); \
-		if ((asoc)->total_output_queue_size >= tp1->book_size) { \
-			atomic_subtract_int(&((asoc)->total_output_queue_size), tp1->book_size); \
-		} else { \
-			(asoc)->total_output_queue_size = 0; \
-		} \
-		if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \
-		    (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \
-			if (stcb->sctp_socket->so_snd.sb_cc >= tp1->book_size) { \
-				atomic_subtract_int(&((stcb)->sctp_socket->so_snd.sb_cc), tp1->book_size); \
-			} else { \
-				stcb->sctp_socket->so_snd.sb_cc = 0; \
-			} \
-		} \
-	} \
-} while (0)
-
-#endif
-
-#define sctp_free_spbufspace(stcb, asoc, sp)  \
-do { \
-	if (sp->data != NULL) { \
-		if ((asoc)->total_output_queue_size >= sp->length) { \
-			atomic_subtract_int(&(asoc)->total_output_queue_size, sp->length); \
-		} else { \
-			(asoc)->total_output_queue_size = 0; \
-		} \
-		if (stcb->sctp_socket && ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \
-		    (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \
-			if (stcb->sctp_socket->so_snd.sb_cc >= sp->length) { \
-				atomic_subtract_int(&stcb->sctp_socket->so_snd.sb_cc,sp->length); \
-			} else { \
-				stcb->sctp_socket->so_snd.sb_cc = 0; \
-			} \
-		} \
-	} \
-} while (0)
-
-#define sctp_snd_sb_alloc(stcb, sz)  \
-do { \
-	atomic_add_int(&stcb->asoc.total_output_queue_size,sz); \
-	if ((stcb->sctp_socket != NULL) && \
-	    ((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || \
-	     (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL))) { \
-		atomic_add_int(&stcb->sctp_socket->so_snd.sb_cc,sz); \
-	} \
-} while (0)
-
-/* functions to start/stop udp tunneling */
-void sctp_over_udp_stop(void);
-int sctp_over_udp_start(void);
-
-int
-sctp_soreceive(struct socket *so, struct sockaddr **psa,
-    struct uio *uio,
-    struct mbuf **mp0,
-    struct mbuf **controlp,
-    int *flagsp);
-
-void
-     sctp_misc_ints(uint8_t from, uint32_t a, uint32_t b, uint32_t c, uint32_t d);
-
-void
-sctp_wakeup_log(struct sctp_tcb *stcb,
-    uint32_t wake_cnt, int from);
-
-void sctp_log_strm_del_alt(struct sctp_tcb *stcb, uint32_t, uint16_t, uint16_t, int);
-
-void sctp_log_nagle_event(struct sctp_tcb *stcb, int action);
-
-
-#ifdef SCTP_MBUF_LOGGING
-void
-     sctp_log_mb(struct mbuf *m, int from);
-
-void
-     sctp_log_mbc(struct mbuf *m, int from);
-
-#endif
-
-void
-sctp_sblog(struct sockbuf *sb,
-    struct sctp_tcb *stcb, int from, int incr);
-
-void
-sctp_log_strm_del(struct sctp_queued_to_read *control,
-    struct sctp_queued_to_read *poschk,
-    int from);
-void sctp_log_cwnd(struct sctp_tcb *stcb, struct sctp_nets *, int, uint8_t);
-void rto_logging(struct sctp_nets *net, int from);
-
-void sctp_log_closing(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int16_t loc);
-
-void sctp_log_lock(struct sctp_inpcb *inp, struct sctp_tcb *stcb, uint8_t from);
-void sctp_log_maxburst(struct sctp_tcb *stcb, struct sctp_nets *, int, int, uint8_t);
-void sctp_log_block(uint8_t, struct sctp_association *, int);
-void sctp_log_rwnd(uint8_t, uint32_t, uint32_t, uint32_t);
-void sctp_log_rwnd_set(uint8_t, uint32_t, uint32_t, uint32_t, uint32_t);
-int sctp_fill_stat_log(void *, size_t *);
-void sctp_log_fr(uint32_t, uint32_t, uint32_t, int);
-void sctp_log_sack(uint32_t, uint32_t, uint32_t, uint16_t, uint16_t, int);
-void sctp_log_map(uint32_t, uint32_t, uint32_t, int);
-void sctp_print_mapping_array(struct sctp_association *asoc);
-void sctp_clr_stat_log(void);
-
-
-#ifdef SCTP_AUDITING_ENABLED
-void
-sctp_auditing(int, struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *);
-void sctp_audit_log(uint8_t, uint8_t);
-
-#endif
-#endif				/* _KERNEL */
-#endif
diff --git a/include.new/netinet/tcp.h b/include.new/netinet/tcp.h
deleted file mode 100644
index 524094c..0000000
--- a/include.new/netinet/tcp.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)tcp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/tcp.h 246210 2013-02-01 15:32:20Z jhb $
- */
-
-#ifndef _NETINET_TCP_H_
-#define _NETINET_TCP_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#if __BSD_VISIBLE
-
-typedef	uint32_t tcp_seq;
-
-#define tcp6_seq	tcp_seq	/* for KAME src sync over BSD*'s */
-#define tcp6hdr		tcphdr	/* for KAME src sync over BSD*'s */
-
-/*
- * TCP header.
- * Per RFC 793, September, 1981.
- */
-struct tcphdr {
-	u_short	th_sport;		/* source port */
-	u_short	th_dport;		/* destination port */
-	tcp_seq	th_seq;			/* sequence number */
-	tcp_seq	th_ack;			/* acknowledgement number */
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_char	th_x2:4,		/* (unused) */
-		th_off:4;		/* data offset */
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-	u_char	th_off:4,		/* data offset */
-		th_x2:4;		/* (unused) */
-#endif
-	u_char	th_flags;
-#define	TH_FIN	0x01
-#define	TH_SYN	0x02
-#define	TH_RST	0x04
-#define	TH_PUSH	0x08
-#define	TH_ACK	0x10
-#define	TH_URG	0x20
-#define	TH_ECE	0x40
-#define	TH_CWR	0x80
-#define	TH_FLAGS	(TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG|TH_ECE|TH_CWR)
-#define	PRINT_TH_FLAGS	"\20\1FIN\2SYN\3RST\4PUSH\5ACK\6URG\7ECE\10CWR"
-
-	u_short	th_win;			/* window */
-	u_short	th_sum;			/* checksum */
-	u_short	th_urp;			/* urgent pointer */
-};
-
-#define	TCPOPT_EOL		0
-#define	   TCPOLEN_EOL			1
-#define	TCPOPT_PAD		0		/* padding after EOL */
-#define	   TCPOLEN_PAD			1
-#define	TCPOPT_NOP		1
-#define	   TCPOLEN_NOP			1
-#define	TCPOPT_MAXSEG		2
-#define    TCPOLEN_MAXSEG		4
-#define TCPOPT_WINDOW		3
-#define    TCPOLEN_WINDOW		3
-#define TCPOPT_SACK_PERMITTED	4
-#define    TCPOLEN_SACK_PERMITTED	2
-#define TCPOPT_SACK		5
-#define	   TCPOLEN_SACKHDR		2
-#define    TCPOLEN_SACK			8	/* 2*sizeof(tcp_seq) */
-#define TCPOPT_TIMESTAMP	8
-#define    TCPOLEN_TIMESTAMP		10
-#define    TCPOLEN_TSTAMP_APPA		(TCPOLEN_TIMESTAMP+2) /* appendix A */
-#define	TCPOPT_SIGNATURE	19		/* Keyed MD5: RFC 2385 */
-#define	   TCPOLEN_SIGNATURE		18
-
-/* Miscellaneous constants */
-#define	MAX_SACK_BLKS	6	/* Max # SACK blocks stored at receiver side */
-#define	TCP_MAX_SACK	4	/* MAX # SACKs sent in any segment */
-
-
-/*
- * The default maximum segment size (MSS) to be used for new TCP connections
- * when path MTU discovery is not enabled.
- *
- * RFC879 derives the default MSS from the largest datagram size hosts are
- * minimally required to handle directly or through IP reassembly minus the
- * size of the IP and TCP header.  With IPv6 the minimum MTU is specified
- * in RFC2460.
- *
- * For IPv4 the MSS is 576 - sizeof(struct tcpiphdr)
- * For IPv6 the MSS is IPV6_MMTU - sizeof(struct ip6_hdr) - sizeof(struct tcphdr)
- *
- * We use explicit numerical definition here to avoid header pollution.
- */
-#define	TCP_MSS		536
-#define	TCP6_MSS	1220
-
-/*
- * Limit the lowest MSS we accept for path MTU discovery and the TCP SYN MSS
- * option.  Allowing low values of MSS can consume significant resources and
- * be used to mount a resource exhaustion attack.
- * Connections requesting lower MSS values will be rounded up to this value
- * and the IP_DF flag will be cleared to allow fragmentation along the path.
- *
- * See tcp_subr.c tcp_minmss SYSCTL declaration for more comments.  Setting
- * it to "0" disables the minmss check.
- *
- * The default value is fine for TCP across the Internet's smallest official
- * link MTU (256 bytes for AX.25 packet radio).  However, a connection is very
- * unlikely to come across such low MTU interfaces these days (anno domini 2003).
- */
-#define	TCP_MINMSS 216
-
-#define	TCP_MAXWIN	65535	/* largest value for (unscaled) window */
-#define	TTCP_CLIENT_SND_WND	4096	/* dflt send window for T/TCP client */
-
-#define TCP_MAX_WINSHIFT	14	/* maximum window shift */
-
-#define TCP_MAXBURST		4	/* maximum segments in a burst */
-
-#define TCP_MAXHLEN	(0xf<<2)	/* max length of header in bytes */
-#define TCP_MAXOLEN	(TCP_MAXHLEN - sizeof(struct tcphdr))
-					/* max space left for options */
-#endif /* __BSD_VISIBLE */
-
-/*
- * User-settable options (used with setsockopt).  These are discrete
- * values and are not masked together.  Some values appear to be
- * bitmasks for historical reasons.
- */
-#define	TCP_NODELAY	1	/* don't delay send to coalesce packets */
-#if __BSD_VISIBLE
-#define	TCP_MAXSEG	2	/* set maximum segment size */
-#define TCP_NOPUSH	4	/* don't push last block of write */
-#define TCP_NOOPT	8	/* don't use TCP options */
-#define TCP_MD5SIG	16	/* use MD5 digests (RFC2385) */
-#define	TCP_INFO	32	/* retrieve tcp_info structure */
-#define	TCP_CONGESTION	64	/* get/set congestion control algorithm */
-#define	TCP_KEEPINIT	128	/* N, time to establish connection */
-#define	TCP_KEEPIDLE	256	/* L,N,X start keeplives after this period */
-#define	TCP_KEEPINTVL	512	/* L,N interval between keepalives */
-#define	TCP_KEEPCNT	1024	/* L,N number of keepalives before close */
-
-/* Start of reserved space for third-party user-settable options. */
-#define	TCP_VENDOR	SO_VENDOR
-
-#define	TCP_CA_NAME_MAX	16	/* max congestion control name length */
-
-#define	TCPI_OPT_TIMESTAMPS	0x01
-#define	TCPI_OPT_SACK		0x02
-#define	TCPI_OPT_WSCALE		0x04
-#define	TCPI_OPT_ECN		0x08
-#define	TCPI_OPT_TOE		0x10
-
-/*
- * The TCP_INFO socket option comes from the Linux 2.6 TCP API, and permits
- * the caller to query certain information about the state of a TCP
- * connection.  We provide an overlapping set of fields with the Linux
- * implementation, but since this is a fixed size structure, room has been
- * left for growth.  In order to maximize potential future compatibility with
- * the Linux API, the same variable names and order have been adopted, and
- * padding left to make room for omitted fields in case they are added later.
- *
- * XXX: This is currently an unstable ABI/API, in that it is expected to
- * change.
- */
-struct tcp_info {
-	u_int8_t	tcpi_state;		/* TCP FSM state. */
-	u_int8_t	__tcpi_ca_state;
-	u_int8_t	__tcpi_retransmits;
-	u_int8_t	__tcpi_probes;
-	u_int8_t	__tcpi_backoff;
-	u_int8_t	tcpi_options;		/* Options enabled on conn. */
-	u_int8_t	tcpi_snd_wscale:4,	/* RFC1323 send shift value. */
-			tcpi_rcv_wscale:4;	/* RFC1323 recv shift value. */
-
-	uint32_t	tcpi_rto;		/* Retransmission timeout (usec). */
-	uint32_t	__tcpi_ato;
-	uint32_t	tcpi_snd_mss;		/* Max segment size for send. */
-	uint32_t	tcpi_rcv_mss;		/* Max segment size for receive. */
-
-	uint32_t	__tcpi_unacked;
-	uint32_t	__tcpi_sacked;
-	uint32_t	__tcpi_lost;
-	uint32_t	__tcpi_retrans;
-	uint32_t	__tcpi_fackets;
-
-	/* Times; measurements in usecs. */
-	uint32_t	__tcpi_last_data_sent;
-	uint32_t	__tcpi_last_ack_sent;	/* Also unimpl. on Linux? */
-	uint32_t	tcpi_last_data_recv;	/* Time since last recv data. */
-	uint32_t	__tcpi_last_ack_recv;
-
-	/* Metrics; variable units. */
-	uint32_t	__tcpi_pmtu;
-	uint32_t	__tcpi_rcv_ssthresh;
-	uint32_t	tcpi_rtt;		/* Smoothed RTT in usecs. */
-	uint32_t	tcpi_rttvar;		/* RTT variance in usecs. */
-	uint32_t	tcpi_snd_ssthresh;	/* Slow start threshold. */
-	uint32_t	tcpi_snd_cwnd;		/* Send congestion window. */
-	uint32_t	__tcpi_advmss;
-	uint32_t	__tcpi_reordering;
-
-	uint32_t	__tcpi_rcv_rtt;
-	uint32_t	tcpi_rcv_space;		/* Advertised recv window. */
-
-	/* FreeBSD extensions to tcp_info. */
-	uint32_t	tcpi_snd_wnd;		/* Advertised send window. */
-	uint32_t	tcpi_snd_bwnd;		/* No longer used. */
-	uint32_t	tcpi_snd_nxt;		/* Next egress seqno */
-	uint32_t	tcpi_rcv_nxt;		/* Next ingress seqno */
-	uint32_t	tcpi_toe_tid;		/* HWTID for TOE endpoints */
-	uint32_t	tcpi_snd_rexmitpack;	/* Retransmitted packets */
-	uint32_t	tcpi_rcv_ooopack;	/* Out-of-order packets */
-	uint32_t	tcpi_snd_zerowin;	/* Zero-sized windows sent */
-	
-	/* Padding to grow without breaking ABI. */
-	uint32_t	__tcpi_pad[26];		/* Padding. */
-};
-#endif
-
-#endif /* !_NETINET_TCP_H_ */
diff --git a/include.new/netinet/tcp_debug.h b/include.new/netinet/tcp_debug.h
deleted file mode 100644
index 17e5c6a..0000000
--- a/include.new/netinet/tcp_debug.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)tcp_debug.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/tcp_debug.h 188578 2009-02-13 15:14:43Z luigi $
- */
-
-#ifndef _NETINET_TCP_DEBUG_H_
-#define	_NETINET_TCP_DEBUG_H_
-
-struct	tcp_debug {
-	uint32_t	td_time;	/* network format */
-	short	td_act;
-	short	td_ostate;
-	caddr_t	td_tcb;
-	int	td_family;
-	/*
-	 * Co-existense of td_ti and td_ti6 below is ugly, but it is necessary
-	 * to achieve backword compatibility to some extent.
-	 */
-	struct	tcpiphdr td_ti;
-	struct {
-#define	IP6_HDR_LEN	40	/* sizeof(struct ip6_hdr) */
-#if !defined(_KERNEL) && defined(INET6)
-		struct	ip6_hdr ip6;
-#else
-		u_char	ip6buf[IP6_HDR_LEN];
-#endif
-		struct	tcphdr th;
-	} td_ti6;
-#define	td_ip6buf	td_ti6.ip6buf
-	short	td_req;
-	struct	tcpcb td_cb;
-};
-
-#define	TA_INPUT	0
-#define	TA_OUTPUT	1
-#define	TA_USER		2
-#define	TA_RESPOND	3
-#define	TA_DROP		4
-
-#ifdef TANAMES
-static const char	*tanames[] =
-    { "input", "output", "user", "respond", "drop" };
-#endif
-
-#define	TCP_NDEBUG 100
-
-#ifndef _KERNEL
-/* XXX common variables for broken applications. */
-struct	tcp_debug tcp_debug[TCP_NDEBUG];
-int	tcp_debx;
-#endif
-
-#endif /* !_NETINET_TCP_DEBUG_H_ */
diff --git a/include.new/netinet/tcp_fsm.h b/include.new/netinet/tcp_fsm.h
deleted file mode 100644
index 9ecaee0..0000000
--- a/include.new/netinet/tcp_fsm.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)tcp_fsm.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/tcp_fsm.h 171656 2007-07-30 11:06:42Z des $
- */
-
-#ifndef _NETINET_TCP_FSM_H_
-#define	_NETINET_TCP_FSM_H_
-
-/*
- * TCP FSM state definitions.
- *
- * Per RFC793, September, 1981.
- */
-
-#define	TCP_NSTATES	11
-
-#define	TCPS_CLOSED		0	/* closed */
-#define	TCPS_LISTEN		1	/* listening for connection */
-#define	TCPS_SYN_SENT		2	/* active, have sent syn */
-#define	TCPS_SYN_RECEIVED	3	/* have sent and received syn */
-/* states < TCPS_ESTABLISHED are those where connections not established */
-#define	TCPS_ESTABLISHED	4	/* established */
-#define	TCPS_CLOSE_WAIT		5	/* rcvd fin, waiting for close */
-/* states > TCPS_CLOSE_WAIT are those where user has closed */
-#define	TCPS_FIN_WAIT_1		6	/* have closed, sent fin */
-#define	TCPS_CLOSING		7	/* closed xchd FIN; await FIN ACK */
-#define	TCPS_LAST_ACK		8	/* had fin and close; await FIN ACK */
-/* states > TCPS_CLOSE_WAIT && < TCPS_FIN_WAIT_2 await ACK of FIN */
-#define	TCPS_FIN_WAIT_2		9	/* have closed, fin is acked */
-#define	TCPS_TIME_WAIT		10	/* in 2*msl quiet wait after close */
-
-/* for KAME src sync over BSD*'s */
-#define	TCP6_NSTATES		TCP_NSTATES
-#define	TCP6S_CLOSED		TCPS_CLOSED
-#define	TCP6S_LISTEN		TCPS_LISTEN
-#define	TCP6S_SYN_SENT		TCPS_SYN_SENT
-#define	TCP6S_SYN_RECEIVED	TCPS_SYN_RECEIVED
-#define	TCP6S_ESTABLISHED	TCPS_ESTABLISHED
-#define	TCP6S_CLOSE_WAIT	TCPS_CLOSE_WAIT
-#define	TCP6S_FIN_WAIT_1	TCPS_FIN_WAIT_1
-#define	TCP6S_CLOSING		TCPS_CLOSING
-#define	TCP6S_LAST_ACK		TCPS_LAST_ACK
-#define	TCP6S_FIN_WAIT_2	TCPS_FIN_WAIT_2
-#define	TCP6S_TIME_WAIT		TCPS_TIME_WAIT
-
-#define	TCPS_HAVERCVDSYN(s)	((s) >= TCPS_SYN_RECEIVED)
-#define	TCPS_HAVEESTABLISHED(s)	((s) >= TCPS_ESTABLISHED)
-#define	TCPS_HAVERCVDFIN(s)	((s) >= TCPS_TIME_WAIT)
-
-#ifdef	TCPOUTFLAGS
-/*
- * Flags used when sending segments in tcp_output.  Basic flags (TH_RST,
- * TH_ACK,TH_SYN,TH_FIN) are totally determined by state, with the proviso
- * that TH_FIN is sent only if all data queued for output is included in the
- * segment.
- */
-static u_char	tcp_outflags[TCP_NSTATES] = {
-	TH_RST|TH_ACK,		/* 0, CLOSED */
-	0,			/* 1, LISTEN */
-	TH_SYN,			/* 2, SYN_SENT */
-	TH_SYN|TH_ACK,		/* 3, SYN_RECEIVED */
-	TH_ACK,			/* 4, ESTABLISHED */
-	TH_ACK,			/* 5, CLOSE_WAIT */
-	TH_FIN|TH_ACK,		/* 6, FIN_WAIT_1 */
-	TH_FIN|TH_ACK,		/* 7, CLOSING */
-	TH_FIN|TH_ACK,		/* 8, LAST_ACK */
-	TH_ACK,			/* 9, FIN_WAIT_2 */
-	TH_ACK,			/* 10, TIME_WAIT */
-};	
-#endif
-
-#ifdef KPROF
-int	tcp_acounts[TCP_NSTATES][PRU_NREQ];
-#endif
-
-#ifdef	TCPSTATES
-static char const * const tcpstates[] = {
-	"CLOSED",	"LISTEN",	"SYN_SENT",	"SYN_RCVD",
-	"ESTABLISHED",	"CLOSE_WAIT",	"FIN_WAIT_1",	"CLOSING",
-	"LAST_ACK",	"FIN_WAIT_2",	"TIME_WAIT",
-};
-#endif
-
-#endif
diff --git a/include.new/netinet/tcp_hostcache.h b/include.new/netinet/tcp_hostcache.h
deleted file mode 100644
index 716e716..0000000
--- a/include.new/netinet/tcp_hostcache.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 2002 Andre Oppermann, Internet Business Solutions AG
- * 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: releng/10.2/sys/netinet/tcp_hostcache.h 185420 2008-11-28 23:39:25Z zec $
- */
-
-/*
- * Many thanks to jlemon for basic structure of tcp_syncache which is being
- * followed here.
- */
-
-#ifndef _NETINET_TCP_HOSTCACHE_H_
-#define _NETINET_TCP_HOSTCACHE_H_
-
-TAILQ_HEAD(hc_qhead, hc_metrics);
-
-struct hc_head {
-	struct hc_qhead	hch_bucket;
-	u_int		hch_length;
-	struct mtx	hch_mtx;
-};
-
-struct hc_metrics {
-	/* housekeeping */
-	TAILQ_ENTRY(hc_metrics) rmx_q;
-	struct	hc_head *rmx_head; /* head of bucket tail queue */
-	struct	in_addr ip4;	/* IP address */
-	struct	in6_addr ip6;	/* IP6 address */
-	/* endpoint specific values for tcp */
-	u_long	rmx_mtu;	/* MTU for this path */
-	u_long	rmx_ssthresh;	/* outbound gateway buffer limit */
-	u_long	rmx_rtt;	/* estimated round trip time */
-	u_long	rmx_rttvar;	/* estimated rtt variance */
-	u_long	rmx_bandwidth;	/* estimated bandwidth */
-	u_long	rmx_cwnd;	/* congestion window */
-	u_long	rmx_sendpipe;	/* outbound delay-bandwidth product */
-	u_long	rmx_recvpipe;	/* inbound delay-bandwidth product */
-	/* TCP hostcache internal data */
-	int	rmx_expire;	/* lifetime for object */
-	u_long	rmx_hits;	/* number of hits */
-	u_long	rmx_updates;	/* number of updates */
-};
-
-struct tcp_hostcache {
-	struct	hc_head *hashbase;
-	uma_zone_t zone;
-	u_int	hashsize;
-	u_int	hashmask;
-	u_int	bucket_limit;
-	u_int	cache_count;
-	u_int	cache_limit;
-	int	expire;
-	int	prune;
-	int	purgeall;
-};
-
-#endif /* !_NETINET_TCP_HOSTCACHE_H_*/
diff --git a/include.new/netinet/tcp_lro.h b/include.new/netinet/tcp_lro.h
deleted file mode 100644
index b595b87..0000000
--- a/include.new/netinet/tcp_lro.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 2006, Myricom Inc.
- * Copyright (c) 2008, Intel Corporation.
- * 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.
- *
- * 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: releng/10.2/sys/netinet/tcp_lro.h 255010 2013-08-28 23:00:34Z np $
- */
-
-#ifndef _TCP_LRO_H_
-#define _TCP_LRO_H_
-
-#include <sys/time.h>
-
-struct lro_entry
-{
-	SLIST_ENTRY(lro_entry)	next;
-	struct mbuf		*m_head;
-	struct mbuf		*m_tail;
-	union {
-		struct ip	*ip4;
-		struct ip6_hdr	*ip6;
-	} leip;
-	union {
-		in_addr_t	s_ip4;
-		struct in6_addr	s_ip6;
-	} lesource;
-	union {
-		in_addr_t	d_ip4;
-		struct in6_addr	d_ip6;
-	} ledest;
-	uint16_t		source_port;
-	uint16_t		dest_port;
-	uint16_t		eh_type;	/* EthernetHeader type. */
-	uint16_t		append_cnt;
-	uint32_t		p_len;		/* IP header payload length. */
-	uint32_t		ulp_csum;	/* TCP, etc. checksum. */
-	uint32_t		next_seq;	/* tcp_seq */
-	uint32_t		ack_seq;	/* tcp_seq */
-	uint32_t		tsval;
-	uint32_t		tsecr;
-	uint16_t		window;
-	uint16_t		timestamp;	/* flag, not a TCP hdr field. */
-	struct timeval		mtime;
-};
-SLIST_HEAD(lro_head, lro_entry);
-
-#define	le_ip4			leip.ip4
-#define	le_ip6			leip.ip6
-#define	source_ip4		lesource.s_ip4
-#define	dest_ip4		ledest.d_ip4
-#define	source_ip6		lesource.s_ip6
-#define	dest_ip6		ledest.d_ip6
-
-/* NB: This is part of driver structs. */
-struct lro_ctrl {
-	struct ifnet	*ifp;
-	int		lro_queued;
-	int		lro_flushed;
-	int		lro_bad_csum;
-	int		lro_cnt;
-
-	struct lro_head	lro_active;
-	struct lro_head	lro_free;
-};
-
-int tcp_lro_init(struct lro_ctrl *);
-void tcp_lro_free(struct lro_ctrl *);
-void tcp_lro_flush_inactive(struct lro_ctrl *, const struct timeval *);
-void tcp_lro_flush(struct lro_ctrl *, struct lro_entry *);
-int tcp_lro_rx(struct lro_ctrl *, struct mbuf *, uint32_t);
-
-#define	TCP_LRO_CANNOT		-1
-#define	TCP_LRO_NOT_SUPPORTED	1
-
-#endif /* _TCP_LRO_H_ */
diff --git a/include.new/netinet/tcp_offload.h b/include.new/netinet/tcp_offload.h
deleted file mode 100644
index 1e7dcf7..0000000
--- a/include.new/netinet/tcp_offload.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2012 Chelsio Communications, Inc.
- * 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.
- *
- * 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: releng/10.2/sys/netinet/tcp_offload.h 237263 2012-06-19 07:34:13Z np $
- *
- */
-
-#ifndef _NETINET_TCP_OFFLOAD_H_
-#define	_NETINET_TCP_OFFLOAD_H_
-
-#ifndef _KERNEL
-#error "no user-serviceable parts inside"
-#endif
-
-extern int registered_toedevs;
-
-int  tcp_offload_connect(struct socket *, struct sockaddr *);
-void tcp_offload_listen_start(struct tcpcb *);
-void tcp_offload_listen_stop(struct tcpcb *);
-void tcp_offload_input(struct tcpcb *, struct mbuf *);
-int  tcp_offload_output(struct tcpcb *);
-void tcp_offload_rcvd(struct tcpcb *);
-void tcp_offload_ctloutput(struct tcpcb *, int, int);
-void tcp_offload_detach(struct tcpcb *);
-
-#endif
diff --git a/include.new/netinet/tcp_seq.h b/include.new/netinet/tcp_seq.h
deleted file mode 100644
index 36ea09a..0000000
--- a/include.new/netinet/tcp_seq.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993, 1995
- *	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.
- * 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.
- *
- *	@(#)tcp_seq.h	8.3 (Berkeley) 6/21/95
- * $FreeBSD: releng/10.2/sys/netinet/tcp_seq.h 231767 2012-02-15 16:09:56Z bz $
- */
-
-#ifndef _NETINET_TCP_SEQ_H_
-#define _NETINET_TCP_SEQ_H_
-/*
- * TCP sequence numbers are 32 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	SEQ_LT(a,b)	((int)((a)-(b)) < 0)
-#define	SEQ_LEQ(a,b)	((int)((a)-(b)) <= 0)
-#define	SEQ_GT(a,b)	((int)((a)-(b)) > 0)
-#define	SEQ_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-#define	SEQ_MIN(a, b)	((SEQ_LT(a, b)) ? (a) : (b))
-#define	SEQ_MAX(a, b)	((SEQ_GT(a, b)) ? (a) : (b))
-
-/* for modulo comparisons of timestamps */
-#define TSTMP_LT(a,b)	((int)((a)-(b)) < 0)
-#define TSTMP_GT(a,b)	((int)((a)-(b)) > 0)
-#define TSTMP_GEQ(a,b)	((int)((a)-(b)) >= 0)
-
-/*
- * Macros to initialize tcp sequence numbers for
- * send and receive from initial send and receive
- * sequence numbers.
- */
-#define	tcp_rcvseqinit(tp) \
-	(tp)->rcv_adv = (tp)->rcv_nxt = (tp)->irs + 1
-
-#define	tcp_sendseqinit(tp) \
-	(tp)->snd_una = (tp)->snd_nxt = (tp)->snd_max = (tp)->snd_up = \
-	    (tp)->snd_recover = (tp)->iss
-
-#ifdef _KERNEL
-/*
- * Clock macros for RFC 1323 timestamps.
- */
-#define	TCP_TS_TO_TICKS(_t)	((_t) * hz / 1000)
-
-/* Timestamp wrap-around time, 24 days. */
-#define TCP_PAWS_IDLE	(24 * 24 * 60 * 60 * 1000)
-
-/*
- * tcp_ts_getticks() in ms, should be 1ms < x < 1000ms according to RFC 1323.
- * We always use 1ms granularity independent of hz.
- */
-static __inline u_int
-tcp_ts_getticks(void)
-{
-	struct timeval tv;
-	u_long ms;
-
-	/*
-	 * getmicrouptime() should be good enough for any 1-1000ms granularity.
-	 * Do not use getmicrotime() here as it might break nfsroot/tcp.
-	 */
-	getmicrouptime(&tv);
-	ms = tv.tv_sec * 1000 + tv.tv_usec / 1000;
-
-	return (ms);
-}
-#endif /* _KERNEL */
-
-#endif /* _NETINET_TCP_SEQ_H_ */
diff --git a/include.new/netinet/tcp_syncache.h b/include.new/netinet/tcp_syncache.h
deleted file mode 100644
index 4aeb553..0000000
--- a/include.new/netinet/tcp_syncache.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993, 1994, 1995
- *	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.
- * 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.
- *
- *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD: releng/10.2/sys/netinet/tcp_syncache.h 255759 2013-09-21 10:01:51Z bz $
- */
-
-#ifndef _NETINET_TCP_SYNCACHE_H_
-#define _NETINET_TCP_SYNCACHE_H_
-#ifdef _KERNEL
-
-void	 syncache_init(void);
-#ifdef VIMAGE
-void	syncache_destroy(void);
-#endif
-void	 syncache_unreach(struct in_conninfo *, struct tcphdr *);
-int	 syncache_expand(struct in_conninfo *, struct tcpopt *,
-	     struct tcphdr *, struct socket **, struct mbuf *);
-void	 syncache_add(struct in_conninfo *, struct tcpopt *,
-	     struct tcphdr *, struct inpcb *, struct socket **, struct mbuf *,
-	     void *, void *);
-void	 syncache_chkrst(struct in_conninfo *, struct tcphdr *);
-void	 syncache_badack(struct in_conninfo *);
-int	 syncache_pcbcount(void);
-int	 syncache_pcblist(struct sysctl_req *req, int max_pcbs, int *pcbs_exported);
-
-struct syncache {
-	TAILQ_ENTRY(syncache)	sc_hash;
-	struct		in_conninfo sc_inc;	/* addresses */
-	int		sc_rxttime;		/* retransmit time */
-	u_int16_t	sc_rxmits;		/* retransmit counter */
-	uint32_t	sc_tsreflect;		/* timestamp to reflect */
-	uint32_t	sc_ts;			/* our timestamp to send */
-	uint32_t	sc_tsoff;		/* ts offset w/ syncookies */
-	uint32_t	sc_flowlabel;		/* IPv6 flowlabel */
-	tcp_seq		sc_irs;			/* seq from peer */
-	tcp_seq		sc_iss;			/* our ISS */
-	struct		mbuf *sc_ipopts;	/* source route */
-	u_int16_t	sc_peer_mss;		/* peer's MSS */
-	u_int16_t	sc_wnd;			/* advertised window */
-	u_int8_t	sc_ip_ttl;		/* IPv4 TTL */
-	u_int8_t	sc_ip_tos;		/* IPv4 TOS */
-	u_int8_t	sc_requested_s_scale:4,
-			sc_requested_r_scale:4;
-	u_int16_t	sc_flags;
-#if defined(TCP_OFFLOAD) || !defined(TCP_OFFLOAD_DISABLE)
-	struct toedev	*sc_tod;		/* entry added by this TOE */
-	void		*sc_todctx;		/* TOE driver context */
-#endif
-	struct label	*sc_label;		/* MAC label reference */
-	struct ucred	*sc_cred;		/* cred cache for jail checks */
-
-	void		*sc_pspare;		/* TCP_SIGNATURE */
-	uint32_t	sc_spare[2];		/* UTO */
-};
-
-/*
- * Flags for the sc_flags field.
- */
-#define SCF_NOOPT	0x01			/* no TCP options */
-#define SCF_WINSCALE	0x02			/* negotiated window scaling */
-#define SCF_TIMESTAMP	0x04			/* negotiated timestamps */
-						/* MSS is implicit */
-#define SCF_UNREACH	0x10			/* icmp unreachable received */
-#define SCF_SIGNATURE	0x20			/* send MD5 digests */
-#define SCF_SACK	0x80			/* send SACK option */
-#define SCF_ECN		0x100			/* send ECN setup packet */
-
-struct syncache_head {
-	struct mtx	sch_mtx;
-	TAILQ_HEAD(sch_head, syncache)	sch_bucket;
-	struct callout	sch_timer;
-	int		sch_nextc;
-	u_int		sch_length;
-	struct tcp_syncache *sch_sc;
-};
-
-#define	SYNCOOKIE_SECRET_SIZE	16
-#define	SYNCOOKIE_LIFETIME	15		/* seconds */
-
-struct syncookie_secret {
-	volatile u_int oddeven;
-	uint8_t key[2][SYNCOOKIE_SECRET_SIZE];
-	struct callout reseed;
-	u_int lifetime;
-};
-
-struct tcp_syncache {
-	struct	syncache_head *hashbase;
-	uma_zone_t zone;
-	u_int	hashsize;
-	u_int	hashmask;
-	u_int	bucket_limit;
-	u_int	cache_limit;
-	u_int	rexmt_limit;
-	u_int	hash_secret;
-	struct vnet *vnet;
-	struct syncookie_secret secret;
-};
-
-/* Internal use for the syncookie functions. */
-union syncookie {
-	uint8_t cookie;
-	struct {
-		uint8_t odd_even:1,
-			sack_ok:1,
-			wscale_idx:3,
-			mss_idx:3;
-	} flags;
-};
-
-#endif /* _KERNEL */
-#endif /* !_NETINET_TCP_SYNCACHE_H_ */
diff --git a/include.new/netinet/tcp_timer.h b/include.new/netinet/tcp_timer.h
deleted file mode 100644
index a378249..0000000
--- a/include.new/netinet/tcp_timer.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)tcp_timer.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/tcp_timer.h 284261 2015-06-11 13:44:06Z jch $
- */
-
-#ifndef _NETINET_TCP_TIMER_H_
-#define _NETINET_TCP_TIMER_H_
-
-/*
- * The TCPT_REXMT timer is used to force retransmissions.
- * The TCP has the TCPT_REXMT timer set whenever segments
- * have been sent for which ACKs are expected but not yet
- * received.  If an ACK is received which advances tp->snd_una,
- * then the retransmit timer is cleared (if there are no more
- * outstanding segments) or reset to the base value (if there
- * are more ACKs expected).  Whenever the retransmit timer goes off,
- * we retransmit one unacknowledged segment, and do a backoff
- * on the retransmit timer.
- *
- * The TCPT_PERSIST timer is used to keep window size information
- * flowing even if the window goes shut.  If all previous transmissions
- * have been acknowledged (so that there are no retransmissions in progress),
- * and the window is too small to bother sending anything, then we start
- * the TCPT_PERSIST timer.  When it expires, if the window is nonzero,
- * we go to transmit state.  Otherwise, at intervals send a single byte
- * into the peer's window to force him to update our window information.
- * We do this at most as often as TCPT_PERSMIN time intervals,
- * but no more frequently than the current estimate of round-trip
- * packet time.  The TCPT_PERSIST timer is cleared whenever we receive
- * a window update from the peer.
- *
- * The TCPT_KEEP timer is used to keep connections alive.  If an
- * connection is idle (no segments received) for TCPTV_KEEP_INIT amount of time,
- * but not yet established, then we drop the connection.  Once the connection
- * is established, if the connection is idle for TCPTV_KEEP_IDLE time
- * (and keepalives have been enabled on the socket), we begin to probe
- * the connection.  We force the peer to send us a segment by sending:
- *	<SEQ=SND.UNA-1><ACK=RCV.NXT><CTL=ACK>
- * This segment is (deliberately) outside the window, and should elicit
- * an ack segment in response from the peer.  If, despite the TCPT_KEEP
- * initiated segments we cannot elicit a response from a peer in TCPT_MAXIDLE
- * amount of time probing, then we drop the connection.
- */
-
-/*
- * Time constants.
- */
-#define	TCPTV_MSL	( 30*hz)		/* max seg lifetime (hah!) */
-#define	TCPTV_SRTTBASE	0			/* base roundtrip time;
-						   if 0, no idea yet */
-#define	TCPTV_RTOBASE	(  3*hz)		/* assumed RTO if no info */
-#define	TCPTV_SRTTDFLT	(  3*hz)		/* assumed RTT if no info */
-
-#define	TCPTV_PERSMIN	(  5*hz)		/* retransmit persistence */
-#define	TCPTV_PERSMAX	( 60*hz)		/* maximum persist interval */
-
-#define	TCPTV_KEEP_INIT	( 75*hz)		/* initial connect keepalive */
-#define	TCPTV_KEEP_IDLE	(120*60*hz)		/* dflt time before probing */
-#define	TCPTV_KEEPINTVL	( 75*hz)		/* default probe interval */
-#define	TCPTV_KEEPCNT	8			/* max probes before drop */
-
-#define TCPTV_FINWAIT2_TIMEOUT (60*hz)         /* FIN_WAIT_2 timeout if no receiver */
-
-/*
- * Minimum retransmit timer is 3 ticks, for algorithmic stability.
- * TCPT_RANGESET() will add another TCPTV_CPU_VAR to deal with
- * the expected worst-case processing variances by the kernels
- * representing the end points.  Such variances do not always show
- * up in the srtt because the timestamp is often calculated at
- * the interface rather then at the TCP layer.  This value is
- * typically 50ms.  However, it is also possible that delayed
- * acks (typically 100ms) could create issues so we set the slop
- * to 200ms to try to cover it.  Note that, properly speaking,
- * delayed-acks should not create a major issue for interactive
- * environments which 'P'ush the last segment, at least as
- * long as implementations do the required 'at least one ack
- * for every two packets' for the non-interactive streaming case.
- * (maybe the RTO calculation should use 2*RTT instead of RTT
- * to handle the ack-every-other-packet case).
- *
- * The prior minimum of 1*hz (1 second) badly breaks throughput on any
- * networks faster then a modem that has minor (e.g. 1%) packet loss.
- */
-#define	TCPTV_MIN	( hz/33 )		/* minimum allowable value */
-#define TCPTV_CPU_VAR	( hz/5 )		/* cpu variance allowed (200ms) */
-#define	TCPTV_REXMTMAX	( 64*hz)		/* max allowable REXMT value */
-
-#define TCPTV_TWTRUNC	8			/* RTO factor to truncate TW */
-
-#define	TCP_LINGERTIME	120			/* linger at most 2 minutes */
-
-#define	TCP_MAXRXTSHIFT	12			/* maximum retransmits */
-
-#define	TCPTV_DELACK	( hz/10 )		/* 100ms timeout */
-
-#ifdef	TCPTIMERS
-static const char *tcptimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL", "DELACK" };
-#endif
-
-/*
- * Force a time value to be in a certain range.
- */
-#define	TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
-	(tv) = (value) + tcp_rexmit_slop; \
-	if ((u_long)(tv) < (u_long)(tvmin)) \
-		(tv) = (tvmin); \
-	if ((u_long)(tv) > (u_long)(tvmax)) \
-		(tv) = (tvmax); \
-} while(0)
-
-#ifdef _KERNEL
-
-struct xtcp_timer;
-
-struct tcp_timer {
-	struct	callout tt_rexmt;	/* retransmit timer */
-	struct	callout tt_persist;	/* retransmit persistence */
-	struct	callout tt_keep;	/* keepalive */
-	struct	callout tt_2msl;	/* 2*msl TIME_WAIT timer */
-	struct	callout tt_delack;	/* delayed ACK timer */
-	uint32_t	tt_flags;	/* Timers flags */
-	uint32_t	tt_spare;	/* TDB */
-};
-
-/*
- * Flags for the tt_flags field.
- */
-#define TT_DELACK	0x0001
-#define TT_REXMT	0x0002
-#define TT_PERSIST	0x0004
-#define TT_KEEP		0x0008
-#define TT_2MSL		0x0010
-#define TT_MASK		(TT_DELACK|TT_REXMT|TT_PERSIST|TT_KEEP|TT_2MSL)
-
-#define TT_DELACK_RST	0x0100
-#define TT_REXMT_RST	0x0200
-#define TT_PERSIST_RST	0x0400
-#define TT_KEEP_RST	0x0800
-#define TT_2MSL_RST	0x1000
-
-#define TT_STOPPED	0x00010000
-
-#define	TP_KEEPINIT(tp)	((tp)->t_keepinit ? (tp)->t_keepinit : tcp_keepinit)
-#define	TP_KEEPIDLE(tp)	((tp)->t_keepidle ? (tp)->t_keepidle : tcp_keepidle)
-#define	TP_KEEPINTVL(tp) ((tp)->t_keepintvl ? (tp)->t_keepintvl : tcp_keepintvl)
-#define	TP_KEEPCNT(tp)	((tp)->t_keepcnt ? (tp)->t_keepcnt : tcp_keepcnt)
-#define	TP_MAXIDLE(tp)	(TP_KEEPCNT(tp) * TP_KEEPINTVL(tp))
-
-extern int tcp_keepinit;		/* time to establish connection */
-extern int tcp_keepidle;		/* time before keepalive probes begin */
-extern int tcp_keepintvl;		/* time between keepalive probes */
-extern int tcp_keepcnt;			/* number of keepalives */
-extern int tcp_delacktime;		/* time before sending a delayed ACK */
-extern int tcp_maxpersistidle;
-extern int tcp_rexmit_min;
-extern int tcp_rexmit_slop;
-extern int tcp_msl;
-extern int tcp_ttl;			/* time to live for TCP segs */
-extern int tcp_backoff[];
-extern int tcp_syn_backoff[];
-
-extern int tcp_finwait2_timeout;
-extern int tcp_fast_finwait2_recycle;
-
-void	tcp_timer_init(void);
-void	tcp_timer_2msl(void *xtp);
-struct tcptw *
-	tcp_tw_2msl_scan(int reuse);	/* XXX temporary? */
-void	tcp_timer_keep(void *xtp);
-void	tcp_timer_persist(void *xtp);
-void	tcp_timer_rexmt(void *xtp);
-void	tcp_timer_delack(void *xtp);
-void	tcp_timer_2msl_discard(void *xtp);
-void	tcp_timer_keep_discard(void *xtp);
-void	tcp_timer_persist_discard(void *xtp);
-void	tcp_timer_rexmt_discard(void *xtp);
-void	tcp_timer_delack_discard(void *xtp);
-void	tcp_timer_to_xtimer(struct tcpcb *tp, struct tcp_timer *timer,
-	struct xtcp_timer *xtimer);
-
-#endif /* _KERNEL */
-
-#endif /* !_NETINET_TCP_TIMER_H_ */
diff --git a/include.new/netinet/tcp_var.h b/include.new/netinet/tcp_var.h
deleted file mode 100644
index 9d44be6..0000000
--- a/include.new/netinet/tcp_var.h
+++ /dev/null
@@ -1,772 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993, 1994, 1995
- *	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.
- * 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.
- *
- *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD: releng/10.2/sys/netinet/tcp_var.h 285978 2015-07-28 19:59:04Z delphij $
- */
-
-#ifndef _NETINET_TCP_VAR_H_
-#define _NETINET_TCP_VAR_H_
-
-#include <netinet/tcp.h>
-
-#ifdef _KERNEL
-#include <net/vnet.h>
-
-/*
- * Kernel variables for tcp.
- */
-VNET_DECLARE(int, tcp_do_rfc1323);
-#define	V_tcp_do_rfc1323	VNET(tcp_do_rfc1323)
-
-#endif /* _KERNEL */
-
-/* TCP segment queue entry */
-struct tseg_qent {
-	LIST_ENTRY(tseg_qent) tqe_q;
-	int	tqe_len;		/* TCP segment data length */
-	struct	tcphdr *tqe_th;		/* a pointer to tcp header */
-	struct	mbuf	*tqe_m;		/* mbuf contains packet */
-};
-LIST_HEAD(tsegqe_head, tseg_qent);
-
-struct sackblk {
-	tcp_seq start;		/* start seq no. of sack block */
-	tcp_seq end;		/* end seq no. */
-};
-
-struct sackhole {
-	tcp_seq start;		/* start seq no. of hole */
-	tcp_seq end;		/* end seq no. */
-	tcp_seq rxmit;		/* next seq. no in hole to be retransmitted */
-	TAILQ_ENTRY(sackhole) scblink;	/* scoreboard linkage */
-};
-
-struct sackhint {
-	struct sackhole	*nexthole;
-	int		sack_bytes_rexmit;
-	tcp_seq		last_sack_ack;	/* Most recent/largest sacked ack */
-
-	int		ispare;		/* explicit pad for 64bit alignment */
-	uint64_t	_pad[2];	/* 1 sacked_bytes, 1 TBD */
-};
-
-struct tcptemp {
-	u_char	tt_ipgen[40]; /* the size must be of max ip header, now IPv6 */
-	struct	tcphdr tt_t;
-};
-
-#define tcp6cb		tcpcb  /* for KAME src sync over BSD*'s */
-
-/* Neighbor Discovery, Neighbor Unreachability Detection Upper layer hint. */
-#ifdef INET6
-#define ND6_HINT(tp)						\
-do {								\
-	if ((tp) && (tp)->t_inpcb &&				\
-	    ((tp)->t_inpcb->inp_vflag & INP_IPV6) != 0)		\
-		nd6_nud_hint(NULL, NULL, 0);			\
-} while (0)
-#else
-#define ND6_HINT(tp)
-#endif
-
-/*
- * Tcp control block, one per tcp; fields:
- * Organized for 16 byte cacheline efficiency.
- */
-struct tcpcb {
-	struct	tsegqe_head t_segq;	/* segment reassembly queue */
-	void	*t_pspare[2];		/* new reassembly queue */
-	int	t_segqlen;		/* segment reassembly queue length */
-	int	t_dupacks;		/* consecutive dup acks recd */
-
-	struct tcp_timer *t_timers;	/* All the TCP timers in one struct */
-
-	struct	inpcb *t_inpcb;		/* back pointer to internet pcb */
-	int	t_state;		/* state of this connection */
-	u_int	t_flags;
-
-	struct	vnet *t_vnet;		/* back pointer to parent vnet */
-
-	tcp_seq	snd_una;		/* send unacknowledged */
-	tcp_seq	snd_max;		/* highest sequence number sent;
-					 * used to recognize retransmits
-					 */
-	tcp_seq	snd_nxt;		/* send next */
-	tcp_seq	snd_up;			/* send urgent pointer */
-
-	tcp_seq	snd_wl1;		/* window update seg seq number */
-	tcp_seq	snd_wl2;		/* window update seg ack number */
-	tcp_seq	iss;			/* initial send sequence number */
-	tcp_seq	irs;			/* initial receive sequence number */
-
-	tcp_seq	rcv_nxt;		/* receive next */
-	tcp_seq	rcv_adv;		/* advertised window */
-	u_long	rcv_wnd;		/* receive window */
-	tcp_seq	rcv_up;			/* receive urgent pointer */
-
-	u_long	snd_wnd;		/* send window */
-	u_long	snd_cwnd;		/* congestion-controlled window */
-	u_long	snd_spare1;		/* unused */
-	u_long	snd_ssthresh;		/* snd_cwnd size threshold for
-					 * for slow start exponential to
-					 * linear switch
-					 */
-	u_long	snd_spare2;		/* unused */
-	tcp_seq	snd_recover;		/* for use in NewReno Fast Recovery */
-
-	u_int	t_maxopd;		/* mss plus options */
-
-	u_int	t_rcvtime;		/* inactivity time */
-	u_int	t_starttime;		/* time connection was established */
-	u_int	t_rtttime;		/* RTT measurement start time */
-	tcp_seq	t_rtseq;		/* sequence number being timed */
-
-	u_int	t_bw_spare1;		/* unused */
-	tcp_seq	t_bw_spare2;		/* unused */
-
-	int	t_rxtcur;		/* current retransmit value (ticks) */
-	u_int	t_maxseg;		/* maximum segment size */
-	int	t_srtt;			/* smoothed round-trip time */
-	int	t_rttvar;		/* variance in round-trip time */
-
-	int	t_rxtshift;		/* log(2) of rexmt exp. backoff */
-	u_int	t_rttmin;		/* minimum rtt allowed */
-	u_int	t_rttbest;		/* best rtt we've seen */
-	u_long	t_rttupdated;		/* number of times rtt sampled */
-	u_long	max_sndwnd;		/* largest window peer has offered */
-
-	int	t_softerror;		/* possible error not yet reported */
-/* out-of-band data */
-	char	t_oobflags;		/* have some */
-	char	t_iobc;			/* input character */
-/* RFC 1323 variables */
-	u_char	snd_scale;		/* window scaling for send window */
-	u_char	rcv_scale;		/* window scaling for recv window */
-	u_char	request_r_scale;	/* pending window scaling */
-	uint32_t  ts_recent;		/* timestamp echo data */
-	u_int	ts_recent_age;		/* when last updated */
-	uint32_t  ts_offset;		/* our timestamp offset */
-
-	tcp_seq	last_ack_sent;
-/* experimental */
-	u_long	snd_cwnd_prev;		/* cwnd prior to retransmit */
-	u_long	snd_ssthresh_prev;	/* ssthresh prior to retransmit */
-	tcp_seq	snd_recover_prev;	/* snd_recover prior to retransmit */
-	int	t_sndzerowin;		/* zero-window updates sent */
-	u_int	t_badrxtwin;		/* window for retransmit recovery */
-	u_char	snd_limited;		/* segments limited transmitted */
-/* SACK related state */
-	int	snd_numholes;		/* number of holes seen by sender */
-	TAILQ_HEAD(sackhole_head, sackhole) snd_holes;
-					/* SACK scoreboard (sorted) */
-	tcp_seq	snd_fack;		/* last seq number(+1) sack'd by rcv'r*/
-	int	rcv_numsacks;		/* # distinct sack blks present */
-	struct sackblk sackblks[MAX_SACK_BLKS]; /* seq nos. of sack blocks */
-	tcp_seq sack_newdata;		/* New data xmitted in this recovery
-					   episode starts at this seq number */
-	struct sackhint	sackhint;	/* SACK scoreboard hint */
-	int	t_rttlow;		/* smallest observerved RTT */
-	uint32_t	rfbuf_ts;	/* recv buffer autoscaling timestamp */
-	int	rfbuf_cnt;		/* recv buffer autoscaling byte count */
-	struct toedev	*tod;		/* toedev handling this connection */
-	int	t_sndrexmitpack;	/* retransmit packets sent */
-	int	t_rcvoopack;		/* out-of-order packets received */
-	void	*t_toe;			/* TOE pcb pointer */
-	int	t_bytes_acked;		/* # bytes acked during current RTT */
-	struct cc_algo	*cc_algo;	/* congestion control algorithm */
-	struct cc_var	*ccv;		/* congestion control specific vars */
-	struct osd	*osd;		/* storage for Khelp module data */
-
-	u_int	t_keepinit;		/* time to establish connection */
-	u_int	t_keepidle;		/* time before keepalive probes begin */
-	u_int	t_keepintvl;		/* interval between keepalives */
-	u_int	t_keepcnt;		/* number of keepalives before close */
-
-	u_int	t_tsomax;		/* TSO total burst length limit in bytes */
-	u_int	t_pmtud_saved_maxopd;	/* pre-blackhole MSS */
-	u_int	t_flags2;		/* More tcpcb flags storage */
-
-	uint32_t t_ispare[6];		/* 5 UTO, 1 TBD */
-	void	*t_pspare2[4];		/* 1 TCP_SIGNATURE, 3 TBD */
-	uint64_t _pad[5];		/* 5 TBD (1-2 CC/RTT?) */
-	uint32_t t_tsomaxsegcount;	/* TSO maximum segment count */
-	uint32_t t_tsomaxsegsize;	/* TSO maximum segment size in bytes */
-};
-
-/*
- * Flags and utility macros for the t_flags field.
- */
-#define	TF_ACKNOW	0x000001	/* ack peer immediately */
-#define	TF_DELACK	0x000002	/* ack, but try to delay it */
-#define	TF_NODELAY	0x000004	/* don't delay packets to coalesce */
-#define	TF_NOOPT	0x000008	/* don't use tcp options */
-#define	TF_SENTFIN	0x000010	/* have sent FIN */
-#define	TF_REQ_SCALE	0x000020	/* have/will request window scaling */
-#define	TF_RCVD_SCALE	0x000040	/* other side has requested scaling */
-#define	TF_REQ_TSTMP	0x000080	/* have/will request timestamps */
-#define	TF_RCVD_TSTMP	0x000100	/* a timestamp was received in SYN */
-#define	TF_SACK_PERMIT	0x000200	/* other side said I could SACK */
-#define	TF_NEEDSYN	0x000400	/* send SYN (implicit state) */
-#define	TF_NEEDFIN	0x000800	/* send FIN (implicit state) */
-#define	TF_NOPUSH	0x001000	/* don't push */
-#define	TF_PREVVALID	0x002000	/* saved values for bad rxmit valid */
-#define	TF_MORETOCOME	0x010000	/* More data to be appended to sock */
-#define	TF_LQ_OVERFLOW	0x020000	/* listen queue overflow */
-#define	TF_LASTIDLE	0x040000	/* connection was previously idle */
-#define	TF_RXWIN0SENT	0x080000	/* sent a receiver win 0 in response */
-#define	TF_FASTRECOVERY	0x100000	/* in NewReno Fast Recovery */
-#define	TF_WASFRECOVERY	0x200000	/* was in NewReno Fast Recovery */
-#define	TF_SIGNATURE	0x400000	/* require MD5 digests (RFC2385) */
-#define	TF_FORCEDATA	0x800000	/* force out a byte */
-#define	TF_TSO		0x1000000	/* TSO enabled on this connection */
-#define	TF_TOE		0x2000000	/* this connection is offloaded */
-#define	TF_ECN_PERMIT	0x4000000	/* connection ECN-ready */
-#define	TF_ECN_SND_CWR	0x8000000	/* ECN CWR in queue */
-#define	TF_ECN_SND_ECE	0x10000000	/* ECN ECE in queue */
-#define	TF_CONGRECOVERY	0x20000000	/* congestion recovery mode */
-#define	TF_WASCRECOVERY	0x40000000	/* was in congestion recovery */
-
-#define	IN_FASTRECOVERY(t_flags)	(t_flags & TF_FASTRECOVERY)
-#define	ENTER_FASTRECOVERY(t_flags)	t_flags |= TF_FASTRECOVERY
-#define	EXIT_FASTRECOVERY(t_flags)	t_flags &= ~TF_FASTRECOVERY
-
-#define	IN_CONGRECOVERY(t_flags)	(t_flags & TF_CONGRECOVERY)
-#define	ENTER_CONGRECOVERY(t_flags)	t_flags |= TF_CONGRECOVERY
-#define	EXIT_CONGRECOVERY(t_flags)	t_flags &= ~TF_CONGRECOVERY
-
-#define	IN_RECOVERY(t_flags) (t_flags & (TF_CONGRECOVERY | TF_FASTRECOVERY))
-#define	ENTER_RECOVERY(t_flags) t_flags |= (TF_CONGRECOVERY | TF_FASTRECOVERY)
-#define	EXIT_RECOVERY(t_flags) t_flags &= ~(TF_CONGRECOVERY | TF_FASTRECOVERY)
-
-#define	BYTES_THIS_ACK(tp, th)	(th->th_ack - tp->snd_una)
-
-/*
- * Flags for the t_oobflags field.
- */
-#define	TCPOOB_HAVEDATA	0x01
-#define	TCPOOB_HADDATA	0x02
-
-#ifdef TCP_SIGNATURE
-/*
- * Defines which are needed by the xform_tcp module and tcp_[in|out]put
- * for SADB verification and lookup.
- */
-#define	TCP_SIGLEN	16	/* length of computed digest in bytes */
-#define	TCP_KEYLEN_MIN	1	/* minimum length of TCP-MD5 key */
-#define	TCP_KEYLEN_MAX	80	/* maximum length of TCP-MD5 key */
-/*
- * Only a single SA per host may be specified at this time. An SPI is
- * needed in order for the KEY_ALLOCSA() lookup to work.
- */
-#define	TCP_SIG_SPI	0x1000
-#endif /* TCP_SIGNATURE */
-
-/*
- * Flags for PLPMTU handling, t_flags2
- */
-#define	TF2_PLPMTU_BLACKHOLE	0x00000001 /* Possible PLPMTUD Black Hole. */
-#define	TF2_PLPMTU_PMTUD	0x00000002 /* Allowed to attempt PLPMTUD. */
-#define	TF2_PLPMTU_MAXSEGSNT	0x00000004 /* Last seg sent was full seg. */
-
-/*
- * Structure to hold TCP options that are only used during segment
- * processing (in tcp_input), but not held in the tcpcb.
- * It's basically used to reduce the number of parameters
- * to tcp_dooptions and tcp_addoptions.
- * The binary order of the to_flags is relevant for packing of the
- * options in tcp_addoptions.
- */
-struct tcpopt {
-	u_int64_t	to_flags;	/* which options are present */
-#define	TOF_MSS		0x0001		/* maximum segment size */
-#define	TOF_SCALE	0x0002		/* window scaling */
-#define	TOF_SACKPERM	0x0004		/* SACK permitted */
-#define	TOF_TS		0x0010		/* timestamp */
-#define	TOF_SIGNATURE	0x0040		/* TCP-MD5 signature option (RFC2385) */
-#define	TOF_SACK	0x0080		/* Peer sent SACK option */
-#define	TOF_MAXOPT	0x0100
-	uint32_t	to_tsval;	/* new timestamp */
-	uint32_t	to_tsecr;	/* reflected timestamp */
-	u_char		*to_sacks;	/* pointer to the first SACK blocks */
-	u_char		*to_signature;	/* pointer to the TCP-MD5 signature */
-	u_int16_t	to_mss;		/* maximum segment size */
-	u_int8_t	to_wscale;	/* window scaling */
-	u_int8_t	to_nsacks;	/* number of SACK blocks */
-	uint32_t	to_spare;	/* UTO */
-};
-
-/*
- * Flags for tcp_dooptions.
- */
-#define	TO_SYN		0x01		/* parse SYN-only options */
-
-struct hc_metrics_lite {	/* must stay in sync with hc_metrics */
-	u_long	rmx_mtu;	/* MTU for this path */
-	u_long	rmx_ssthresh;	/* outbound gateway buffer limit */
-	u_long	rmx_rtt;	/* estimated round trip time */
-	u_long	rmx_rttvar;	/* estimated rtt variance */
-	u_long	rmx_bandwidth;	/* estimated bandwidth */
-	u_long	rmx_cwnd;	/* congestion window */
-	u_long	rmx_sendpipe;   /* outbound delay-bandwidth product */
-	u_long	rmx_recvpipe;   /* inbound delay-bandwidth product */
-};
-
-/*
- * Used by tcp_maxmtu() to communicate interface specific features
- * and limits at the time of connection setup.
- */
-struct tcp_ifcap {
-	int	ifcap;
-	u_int	tsomax;
-	u_int	tsomaxsegcount;
-	u_int	tsomaxsegsize;
-};
-
-#ifndef _NETINET_IN_PCB_H_
-struct in_conninfo;
-#endif /* _NETINET_IN_PCB_H_ */
-
-struct tcptw {
-	struct inpcb	*tw_inpcb;	/* XXX back pointer to internet pcb */
-	tcp_seq		snd_nxt;
-	tcp_seq		rcv_nxt;
-	tcp_seq		iss;
-	tcp_seq		irs;
-	u_short		last_win;	/* cached window value */
-	u_short		tw_so_options;	/* copy of so_options */
-	struct ucred	*tw_cred;	/* user credentials */
-	uint32_t	t_recent;
-	uint32_t	ts_offset;	/* our timestamp offset */
-	u_int		t_starttime;
-	int		tw_time;
-	TAILQ_ENTRY(tcptw) tw_2msl;
-	void		*tw_pspare;	/* TCP_SIGNATURE */
-	u_int		*tw_spare;	/* TCP_SIGNATURE */
-};
-
-#define	intotcpcb(ip)	((struct tcpcb *)(ip)->inp_ppcb)
-#define	intotw(ip)	((struct tcptw *)(ip)->inp_ppcb)
-#define	sototcpcb(so)	(intotcpcb(sotoinpcb(so)))
-
-/*
- * The smoothed round-trip time and estimated variance
- * are stored as fixed point numbers scaled by the values below.
- * For convenience, these scales are also used in smoothing the average
- * (smoothed = (1/scale)sample + ((scale-1)/scale)smoothed).
- * With these scales, srtt has 3 bits to the right of the binary point,
- * and thus an "ALPHA" of 0.875.  rttvar has 2 bits to the right of the
- * binary point, and is smoothed with an ALPHA of 0.75.
- */
-#define	TCP_RTT_SCALE		32	/* multiplier for srtt; 3 bits frac. */
-#define	TCP_RTT_SHIFT		5	/* shift for srtt; 3 bits frac. */
-#define	TCP_RTTVAR_SCALE	16	/* multiplier for rttvar; 2 bits */
-#define	TCP_RTTVAR_SHIFT	4	/* shift for rttvar; 2 bits */
-#define	TCP_DELTA_SHIFT		2	/* see tcp_input.c */
-
-/*
- * The initial retransmission should happen at rtt + 4 * rttvar.
- * Because of the way we do the smoothing, srtt and rttvar
- * will each average +1/2 tick of bias.  When we compute
- * the retransmit timer, we want 1/2 tick of rounding and
- * 1 extra tick because of +-1/2 tick uncertainty in the
- * firing of the timer.  The bias will give us exactly the
- * 1.5 tick we need.  But, because the bias is
- * statistical, we have to test that we don't drop below
- * the minimum feasible timer (which is 2 ticks).
- * This version of the macro adapted from a paper by Lawrence
- * Brakmo and Larry Peterson which outlines a problem caused
- * by insufficient precision in the original implementation,
- * which results in inappropriately large RTO values for very
- * fast networks.
- */
-#define	TCP_REXMTVAL(tp) \
-	max((tp)->t_rttmin, (((tp)->t_srtt >> (TCP_RTT_SHIFT - TCP_DELTA_SHIFT))  \
-	  + (tp)->t_rttvar) >> TCP_DELTA_SHIFT)
-
-/*
- * TCP statistics.
- * Many of these should be kept per connection,
- * but that's inconvenient at the moment.
- */
-struct	tcpstat {
-	uint64_t tcps_connattempt;	/* connections initiated */
-	uint64_t tcps_accepts;		/* connections accepted */
-	uint64_t tcps_connects;		/* connections established */
-	uint64_t tcps_drops;		/* connections dropped */
-	uint64_t tcps_conndrops;	/* embryonic connections dropped */
-	uint64_t tcps_minmssdrops;	/* average minmss too low drops */
-	uint64_t tcps_closed;		/* conn. closed (includes drops) */
-	uint64_t tcps_segstimed;	/* segs where we tried to get rtt */
-	uint64_t tcps_rttupdated;	/* times we succeeded */
-	uint64_t tcps_delack;		/* delayed acks sent */
-	uint64_t tcps_timeoutdrop;	/* conn. dropped in rxmt timeout */
-	uint64_t tcps_rexmttimeo;	/* retransmit timeouts */
-	uint64_t tcps_persisttimeo;	/* persist timeouts */
-	uint64_t tcps_keeptimeo;	/* keepalive timeouts */
-	uint64_t tcps_keepprobe;	/* keepalive probes sent */
-	uint64_t tcps_keepdrops;	/* connections dropped in keepalive */
-
-	uint64_t tcps_sndtotal;		/* total packets sent */
-	uint64_t tcps_sndpack;		/* data packets sent */
-	uint64_t tcps_sndbyte;		/* data bytes sent */
-	uint64_t tcps_sndrexmitpack;	/* data packets retransmitted */
-	uint64_t tcps_sndrexmitbyte;	/* data bytes retransmitted */
-	uint64_t tcps_sndrexmitbad;	/* unnecessary packet retransmissions */
-	uint64_t tcps_sndacks;		/* ack-only packets sent */
-	uint64_t tcps_sndprobe;		/* window probes sent */
-	uint64_t tcps_sndurg;		/* packets sent with URG only */
-	uint64_t tcps_sndwinup;		/* window update-only packets sent */
-	uint64_t tcps_sndctrl;		/* control (SYN|FIN|RST) packets sent */
-
-	uint64_t tcps_rcvtotal;		/* total packets received */
-	uint64_t tcps_rcvpack;		/* packets received in sequence */
-	uint64_t tcps_rcvbyte;		/* bytes received in sequence */
-	uint64_t tcps_rcvbadsum;	/* packets received with ccksum errs */
-	uint64_t tcps_rcvbadoff;	/* packets received with bad offset */
-	uint64_t tcps_rcvmemdrop;	/* packets dropped for lack of memory */
-	uint64_t tcps_rcvshort;		/* packets received too short */
-	uint64_t tcps_rcvduppack;	/* duplicate-only packets received */
-	uint64_t tcps_rcvdupbyte;	/* duplicate-only bytes received */
-	uint64_t tcps_rcvpartduppack;	/* packets with some duplicate data */
-	uint64_t tcps_rcvpartdupbyte;	/* dup. bytes in part-dup. packets */
-	uint64_t tcps_rcvoopack;	/* out-of-order packets received */
-	uint64_t tcps_rcvoobyte;	/* out-of-order bytes received */
-	uint64_t tcps_rcvpackafterwin;	/* packets with data after window */
-	uint64_t tcps_rcvbyteafterwin;	/* bytes rcvd after window */
-	uint64_t tcps_rcvafterclose;	/* packets rcvd after "close" */
-	uint64_t tcps_rcvwinprobe;	/* rcvd window probe packets */
-	uint64_t tcps_rcvdupack;	/* rcvd duplicate acks */
-	uint64_t tcps_rcvacktoomuch;	/* rcvd acks for unsent data */
-	uint64_t tcps_rcvackpack;	/* rcvd ack packets */
-	uint64_t tcps_rcvackbyte;	/* bytes acked by rcvd acks */
-	uint64_t tcps_rcvwinupd;	/* rcvd window update packets */
-	uint64_t tcps_pawsdrop;		/* segments dropped due to PAWS */
-	uint64_t tcps_predack;		/* times hdr predict ok for acks */
-	uint64_t tcps_preddat;		/* times hdr predict ok for data pkts */
-	uint64_t tcps_pcbcachemiss;
-	uint64_t tcps_cachedrtt;	/* times cached RTT in route updated */
-	uint64_t tcps_cachedrttvar;	/* times cached rttvar updated */
-	uint64_t tcps_cachedssthresh;	/* times cached ssthresh updated */
-	uint64_t tcps_usedrtt;		/* times RTT initialized from route */
-	uint64_t tcps_usedrttvar;	/* times RTTVAR initialized from rt */
-	uint64_t tcps_usedssthresh;	/* times ssthresh initialized from rt*/
-	uint64_t tcps_persistdrop;	/* timeout in persist state */
-	uint64_t tcps_badsyn;		/* bogus SYN, e.g. premature ACK */
-	uint64_t tcps_mturesent;	/* resends due to MTU discovery */
-	uint64_t tcps_listendrop;	/* listen queue overflows */
-	uint64_t tcps_badrst;		/* ignored RSTs in the window */
-
-	uint64_t tcps_sc_added;		/* entry added to syncache */
-	uint64_t tcps_sc_retransmitted;	/* syncache entry was retransmitted */
-	uint64_t tcps_sc_dupsyn;	/* duplicate SYN packet */
-	uint64_t tcps_sc_dropped;	/* could not reply to packet */
-	uint64_t tcps_sc_completed;	/* successful extraction of entry */
-	uint64_t tcps_sc_bucketoverflow;/* syncache per-bucket limit hit */
-	uint64_t tcps_sc_cacheoverflow;	/* syncache cache limit hit */
-	uint64_t tcps_sc_reset;		/* RST removed entry from syncache */
-	uint64_t tcps_sc_stale;		/* timed out or listen socket gone */
-	uint64_t tcps_sc_aborted;	/* syncache entry aborted */
-	uint64_t tcps_sc_badack;	/* removed due to bad ACK */
-	uint64_t tcps_sc_unreach;	/* ICMP unreachable received */
-	uint64_t tcps_sc_zonefail;	/* zalloc() failed */
-	uint64_t tcps_sc_sendcookie;	/* SYN cookie sent */
-	uint64_t tcps_sc_recvcookie;	/* SYN cookie received */
-
-	uint64_t tcps_hc_added;		/* entry added to hostcache */
-	uint64_t tcps_hc_bucketoverflow;/* hostcache per bucket limit hit */
-
-	uint64_t tcps_finwait2_drops;    /* Drop FIN_WAIT_2 connection after time limit */
-
-	/* SACK related stats */
-	uint64_t tcps_sack_recovery_episode; /* SACK recovery episodes */
-	uint64_t tcps_sack_rexmits;	    /* SACK rexmit segments   */
-	uint64_t tcps_sack_rexmit_bytes;    /* SACK rexmit bytes      */
-	uint64_t tcps_sack_rcv_blocks;	    /* SACK blocks (options) received */
-	uint64_t tcps_sack_send_blocks;	    /* SACK blocks (options) sent     */
-	uint64_t tcps_sack_sboverflow;	    /* times scoreboard overflowed */
-	
-	/* ECN related stats */
-	uint64_t tcps_ecn_ce;		/* ECN Congestion Experienced */
-	uint64_t tcps_ecn_ect0;		/* ECN Capable Transport */
-	uint64_t tcps_ecn_ect1;		/* ECN Capable Transport */
-	uint64_t tcps_ecn_shs;		/* ECN successful handshakes */
-	uint64_t tcps_ecn_rcwnd;	/* # times ECN reduced the cwnd */
-
-	/* TCP_SIGNATURE related stats */
-	uint64_t tcps_sig_rcvgoodsig;	/* Total matching signature received */
-	uint64_t tcps_sig_rcvbadsig;	/* Total bad signature received */
-	uint64_t tcps_sig_err_buildsig;	/* Mismatching signature received */
-	uint64_t tcps_sig_err_sigopt;	/* No signature expected by socket */
-	uint64_t tcps_sig_err_nosigopt;	/* No signature provided by segment */
-
-	uint64_t _pad[12];		/* 6 UTO, 6 TBD */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_PCPUSTAT_DECLARE(struct tcpstat, tcpstat);	/* tcp statistics */
-/*
- * In-kernel consumers can use these accessor macros directly to update
- * stats.
- */
-#define	TCPSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct tcpstat, tcpstat, name, (val))
-#define	TCPSTAT_INC(name)	TCPSTAT_ADD(name, 1)
-
-/*
- * Kernel module consumers must use this accessor macro.
- */
-void	kmod_tcpstat_inc(int statnum);
-#define	KMOD_TCPSTAT_INC(name)						\
-    kmod_tcpstat_inc(offsetof(struct tcpstat, name) / sizeof(uint64_t))
-
-/*
- * TCP specific helper hook point identifiers.
- */
-#define	HHOOK_TCP_EST_IN		0
-#define	HHOOK_TCP_EST_OUT		1
-#define	HHOOK_TCP_LAST			HHOOK_TCP_EST_OUT
-
-struct tcp_hhook_data {
-	struct tcpcb	*tp;
-	struct tcphdr	*th;
-	struct tcpopt	*to;
-	long		len;
-	int		tso;
-	tcp_seq		curack;
-};
-#endif
-
-/*
- * TCB structure exported to user-land via sysctl(3).
- * Evil hack: declare only if in_pcb.h and sys/socketvar.h have been
- * included.  Not all of our clients do.
- */
-#if defined(_NETINET_IN_PCB_H_) && defined(_SYS_SOCKETVAR_H_)
-struct xtcp_timer {
-	int tt_rexmt;	/* retransmit timer */
-	int tt_persist;	/* retransmit persistence */
-	int tt_keep;	/* keepalive */
-	int tt_2msl;	/* 2*msl TIME_WAIT timer */
-	int tt_delack;	/* delayed ACK timer */
-	int t_rcvtime;	/* Time since last packet received */
-};
-struct	xtcpcb {
-	size_t	xt_len;
-	struct	inpcb	xt_inp;
-	struct	tcpcb	xt_tp;
-	struct	xsocket	xt_socket;
-	struct	xtcp_timer xt_timer;
-	u_quad_t	xt_alignment_hack;
-};
-#endif
-
-/*
- * Names for TCP sysctl objects
- */
-#define	TCPCTL_DO_RFC1323	1	/* use RFC-1323 extensions */
-#define	TCPCTL_MSSDFLT		3	/* MSS default */
-#define TCPCTL_STATS		4	/* statistics (read-only) */
-#define	TCPCTL_RTTDFLT		5	/* default RTT estimate */
-#define	TCPCTL_KEEPIDLE		6	/* keepalive idle timer */
-#define	TCPCTL_KEEPINTVL	7	/* interval to send keepalives */
-#define	TCPCTL_SENDSPACE	8	/* send buffer space */
-#define	TCPCTL_RECVSPACE	9	/* receive buffer space */
-#define	TCPCTL_KEEPINIT		10	/* timeout for establishing syn */
-#define	TCPCTL_PCBLIST		11	/* list of all outstanding PCBs */
-#define	TCPCTL_DELACKTIME	12	/* time before sending delayed ACK */
-#define	TCPCTL_V6MSSDFLT	13	/* MSS default for IPv6 */
-#define	TCPCTL_SACK		14	/* Selective Acknowledgement,rfc 2018 */
-#define	TCPCTL_DROP		15	/* drop tcp connection */
-#define	TCPCTL_MAXID		16
-#define TCPCTL_FINWAIT2_TIMEOUT        17
-
-#ifdef _KERNEL
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_inet_tcp);
-SYSCTL_DECL(_net_inet_tcp_sack);
-MALLOC_DECLARE(M_TCPLOG);
-#endif
-
-VNET_DECLARE(struct inpcbhead, tcb);		/* queue of active tcpcb's */
-VNET_DECLARE(struct inpcbinfo, tcbinfo);
-extern	int tcp_log_in_vain;
-VNET_DECLARE(int, tcp_mssdflt);	/* XXX */
-VNET_DECLARE(int, tcp_minmss);
-VNET_DECLARE(int, tcp_delack_enabled);
-VNET_DECLARE(int, tcp_do_rfc3390);
-VNET_DECLARE(int, tcp_do_initcwnd10);
-VNET_DECLARE(int, tcp_sendspace);
-VNET_DECLARE(int, tcp_recvspace);
-VNET_DECLARE(int, path_mtu_discovery);
-VNET_DECLARE(int, tcp_do_rfc3465);
-VNET_DECLARE(int, tcp_abc_l_var);
-#define	V_tcb			VNET(tcb)
-#define	V_tcbinfo		VNET(tcbinfo)
-#define	V_tcp_mssdflt		VNET(tcp_mssdflt)
-#define	V_tcp_minmss		VNET(tcp_minmss)
-#define	V_tcp_delack_enabled	VNET(tcp_delack_enabled)
-#define	V_tcp_do_rfc3390	VNET(tcp_do_rfc3390)
-#define	V_tcp_do_initcwnd10	VNET(tcp_do_initcwnd10)
-#define	V_tcp_sendspace		VNET(tcp_sendspace)
-#define	V_tcp_recvspace		VNET(tcp_recvspace)
-#define	V_path_mtu_discovery	VNET(path_mtu_discovery)
-#define	V_tcp_do_rfc3465	VNET(tcp_do_rfc3465)
-#define	V_tcp_abc_l_var		VNET(tcp_abc_l_var)
-
-VNET_DECLARE(int, tcp_do_sack);			/* SACK enabled/disabled */
-VNET_DECLARE(int, tcp_sc_rst_sock_fail);	/* RST on sock alloc failure */
-#define	V_tcp_do_sack		VNET(tcp_do_sack)
-#define	V_tcp_sc_rst_sock_fail	VNET(tcp_sc_rst_sock_fail)
-
-VNET_DECLARE(int, tcp_do_ecn);			/* TCP ECN enabled/disabled */
-VNET_DECLARE(int, tcp_ecn_maxretries);
-#define	V_tcp_do_ecn		VNET(tcp_do_ecn)
-#define	V_tcp_ecn_maxretries	VNET(tcp_ecn_maxretries)
-
-VNET_DECLARE(struct hhook_head *, tcp_hhh[HHOOK_TCP_LAST + 1]);
-#define	V_tcp_hhh		VNET(tcp_hhh)
-
-int	 tcp_addoptions(struct tcpopt *, u_char *);
-int	 tcp_ccalgounload(struct cc_algo *unload_algo);
-struct tcpcb *
-	 tcp_close(struct tcpcb *);
-void	 tcp_discardcb(struct tcpcb *);
-void	 tcp_twstart(struct tcpcb *);
-#if 0
-int	 tcp_twrecycleable(struct tcptw *tw);
-#endif
-void	 tcp_twclose(struct tcptw *, int);
-void	 tcp_ctlinput(int, struct sockaddr *, void *);
-int	 tcp_ctloutput(struct socket *, struct sockopt *);
-struct tcpcb *
-	 tcp_drop(struct tcpcb *, int);
-void	 tcp_drain(void);
-void	 tcp_init(void);
-#ifdef VIMAGE
-void	 tcp_destroy(void);
-#endif
-void	 tcp_fini(void *);
-char	*tcp_log_addrs(struct in_conninfo *, struct tcphdr *, void *,
-	    const void *);
-char	*tcp_log_vain(struct in_conninfo *, struct tcphdr *, void *,
-	    const void *);
-int	 tcp_reass(struct tcpcb *, struct tcphdr *, int *, struct mbuf *);
-void	 tcp_reass_global_init(void);
-void	 tcp_reass_flush(struct tcpcb *);
-void	 tcp_input(struct mbuf *, int);
-u_long	 tcp_maxmtu(struct in_conninfo *, struct tcp_ifcap *);
-u_long	 tcp_maxmtu6(struct in_conninfo *, struct tcp_ifcap *);
-void	 tcp_mss_update(struct tcpcb *, int, int, struct hc_metrics_lite *,
-	    struct tcp_ifcap *);
-void	 tcp_mss(struct tcpcb *, int);
-int	 tcp_mssopt(struct in_conninfo *);
-struct inpcb *
-	 tcp_drop_syn_sent(struct inpcb *, int);
-struct inpcb *
-	 tcp_mtudisc(struct inpcb *, int);
-struct tcpcb *
-	 tcp_newtcpcb(struct inpcb *);
-int	 tcp_output(struct tcpcb *);
-void	 tcp_state_change(struct tcpcb *, int);
-void	 tcp_respond(struct tcpcb *, void *,
-	    struct tcphdr *, struct mbuf *, tcp_seq, tcp_seq, int);
-void	 tcp_tw_init(void);
-#ifdef VIMAGE
-void	 tcp_tw_destroy(void);
-#endif
-void	 tcp_tw_zone_change(void);
-int	 tcp_twcheck(struct inpcb *, struct tcpopt *, struct tcphdr *,
-	    struct mbuf *, int);
-void	 tcp_setpersist(struct tcpcb *);
-#ifdef TCP_SIGNATURE
-int	 tcp_signature_compute(struct mbuf *, int, int, int, u_char *, u_int);
-int	 tcp_signature_verify(struct mbuf *, int, int, int, struct tcpopt *,
-	    struct tcphdr *, u_int);
-#endif
-void	 tcp_slowtimo(void);
-struct tcptemp *
-	 tcpip_maketemplate(struct inpcb *);
-void	 tcpip_fillheaders(struct inpcb *, void *, void *);
-void	 tcp_timer_activate(struct tcpcb *, uint32_t, u_int);
-int	 tcp_timer_active(struct tcpcb *, uint32_t);
-void	 tcp_timer_stop(struct tcpcb *, uint32_t);
-void	 tcp_trace(short, short, struct tcpcb *, void *, struct tcphdr *, int);
-/*
- * All tcp_hc_* functions are IPv4 and IPv6 (via in_conninfo)
- */
-void	 tcp_hc_init(void);
-#ifdef VIMAGE
-void	 tcp_hc_destroy(void);
-#endif
-void	 tcp_hc_get(struct in_conninfo *, struct hc_metrics_lite *);
-u_long	 tcp_hc_getmtu(struct in_conninfo *);
-void	 tcp_hc_updatemtu(struct in_conninfo *, u_long);
-void	 tcp_hc_update(struct in_conninfo *, struct hc_metrics_lite *);
-
-extern	struct pr_usrreqs tcp_usrreqs;
-tcp_seq tcp_new_isn(struct tcpcb *);
-
-void	 tcp_sack_doack(struct tcpcb *, struct tcpopt *, tcp_seq);
-void	 tcp_update_sack_list(struct tcpcb *tp, tcp_seq rcv_laststart, tcp_seq rcv_lastend);
-void	 tcp_clean_sackreport(struct tcpcb *tp);
-void	 tcp_sack_adjust(struct tcpcb *tp);
-struct sackhole *tcp_sack_output(struct tcpcb *tp, int *sack_bytes_rexmt);
-void	 tcp_sack_partialack(struct tcpcb *, struct tcphdr *);
-void	 tcp_free_sackholes(struct tcpcb *tp);
-int	 tcp_newreno(struct tcpcb *, struct tcphdr *);
-u_long	 tcp_seq_subtract(u_long, u_long );
-
-void	cc_cong_signal(struct tcpcb *tp, struct tcphdr *th, uint32_t type);
-
-static inline void
-tcp_fields_to_host(struct tcphdr *th)
-{
-
-	th->th_seq = ntohl(th->th_seq);
-	th->th_ack = ntohl(th->th_ack);
-	th->th_win = ntohs(th->th_win);
-	th->th_urp = ntohs(th->th_urp);
-}
-
-#ifdef TCP_SIGNATURE
-static inline void
-tcp_fields_to_net(struct tcphdr *th)
-{
-
-	th->th_seq = htonl(th->th_seq);
-	th->th_ack = htonl(th->th_ack);
-	th->th_win = htons(th->th_win);
-	th->th_urp = htons(th->th_urp);
-}
-#endif
-#endif /* _KERNEL */
-
-#endif /* _NETINET_TCP_VAR_H_ */
diff --git a/include.new/netinet/tcpip.h b/include.new/netinet/tcpip.h
deleted file mode 100644
index fb9543a..0000000
--- a/include.new/netinet/tcpip.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)tcpip.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/tcpip.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NETINET_TCPIP_H_
-#define _NETINET_TCPIP_H_
-
-/*
- * Tcp+ip header, after ip options removed.
- */
-struct tcpiphdr {
-	struct	ipovly ti_i;		/* overlaid ip structure */
-	struct	tcphdr ti_t;		/* tcp header */
-};
-#define	ti_x1		ti_i.ih_x1
-#define	ti_pr		ti_i.ih_pr
-#define	ti_len		ti_i.ih_len
-#define	ti_src		ti_i.ih_src
-#define	ti_dst		ti_i.ih_dst
-#define	ti_sport	ti_t.th_sport
-#define	ti_dport	ti_t.th_dport
-#define	ti_seq		ti_t.th_seq
-#define	ti_ack		ti_t.th_ack
-#define	ti_x2		ti_t.th_x2
-#define	ti_off		ti_t.th_off
-#define	ti_flags	ti_t.th_flags
-#define	ti_win		ti_t.th_win
-#define	ti_sum		ti_t.th_sum
-#define	ti_urp		ti_t.th_urp
-
-#endif
diff --git a/include.new/netinet/toecore.h b/include.new/netinet/toecore.h
deleted file mode 100644
index 8e27233..0000000
--- a/include.new/netinet/toecore.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 2012 Chelsio Communications, Inc.
- * 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.
- *
- * 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: releng/10.2/sys/netinet/toecore.h 239511 2012-08-21 18:09:33Z np $
- */
-
-#ifndef _NETINET_TOE_H_
-#define	_NETINET_TOE_H_
-
-#ifndef _KERNEL
-#error "no user-serviceable parts inside"
-#endif
-
-struct tcpopt;
-struct tcphdr;
-struct in_conninfo;
-
-struct toedev {
-	TAILQ_ENTRY(toedev) link;	/* glue for toedev_list */
-	void *tod_softc;		/* TOE driver private data */
-
-	/*
-	 * Active open.  If a failure occurs, it is reported back by the driver
-	 * via toe_connect_failed.
-	 */
-	int (*tod_connect)(struct toedev *, struct socket *, struct rtentry *,
-	    struct sockaddr *);
-
-	/* Passive open. */
-	int (*tod_listen_start)(struct toedev *, struct tcpcb *);
-	int (*tod_listen_stop)(struct toedev *, struct tcpcb *);
-
-	/*
-	 * The kernel uses this routine to pass on any frame it receives for an
-	 * offloaded connection to the TOE driver.  This is an unusual event.
-	 */
-	void (*tod_input)(struct toedev *, struct tcpcb *, struct mbuf *);
-
-	/*
-	 * This is called by the kernel during pru_rcvd for an offloaded TCP
-	 * connection and provides an opportunity for the TOE driver to manage
-	 * its rx window and credits.
-	 */
-	void (*tod_rcvd)(struct toedev *, struct tcpcb *);
-
-	/*
-	 * Transmit routine.  The kernel calls this to have the TOE driver
-	 * evaluate whether there is data to be transmitted, and transmit it.
-	 */
-	int (*tod_output)(struct toedev *, struct tcpcb *);
-
-	/* Immediate teardown: send RST to peer. */
-	int (*tod_send_rst)(struct toedev *, struct tcpcb *);
-
-	/* Initiate orderly disconnect by sending FIN to the peer. */
-	int (*tod_send_fin)(struct toedev *, struct tcpcb *);
-
-	/* Called to indicate that the kernel is done with this TCP PCB. */
-	void (*tod_pcb_detach)(struct toedev *, struct tcpcb *);
-
-	/*
-	 * The kernel calls this once it has information about an L2 entry that
-	 * the TOE driver enquired about previously (via toe_l2_resolve).
-	 */
-	void (*tod_l2_update)(struct toedev *, struct ifnet *,
-	    struct sockaddr *, uint8_t *, uint16_t);
-
-	/* XXX.  Route has been redirected. */
-	void (*tod_route_redirect)(struct toedev *, struct ifnet *,
-	    struct rtentry *, struct rtentry *);
-
-	/* Syncache interaction. */
-	void (*tod_syncache_added)(struct toedev *, void *);
-	void (*tod_syncache_removed)(struct toedev *, void *);
-	int (*tod_syncache_respond)(struct toedev *, void *, struct mbuf *);
-	void (*tod_offload_socket)(struct toedev *, void *, struct socket *);
-
-	/* TCP socket option */
-	void (*tod_ctloutput)(struct toedev *, struct tcpcb *, int, int);
-};
-
-#include <sys/eventhandler.h>
-typedef	void (*tcp_offload_listen_start_fn)(void *, struct tcpcb *);
-typedef	void (*tcp_offload_listen_stop_fn)(void *, struct tcpcb *);
-EVENTHANDLER_DECLARE(tcp_offload_listen_start, tcp_offload_listen_start_fn);
-EVENTHANDLER_DECLARE(tcp_offload_listen_stop, tcp_offload_listen_stop_fn);
-
-void init_toedev(struct toedev *);
-int register_toedev(struct toedev *);
-int unregister_toedev(struct toedev *);
-
-/*
- * General interface for looking up L2 information for an IP address.  If an
- * answer is not available right away then the TOE driver's tod_l2_update will
- * be called later.
- */
-int toe_l2_resolve(struct toedev *, struct ifnet *, struct sockaddr *,
-    uint8_t *, uint16_t *);
-
-void toe_connect_failed(struct toedev *, struct inpcb *, int);
-
-void toe_syncache_add(struct in_conninfo *, struct tcpopt *, struct tcphdr *,
-    struct inpcb *, void *, void *);
-int  toe_syncache_expand(struct in_conninfo *, struct tcpopt *, struct tcphdr *,
-    struct socket **);
-
-int toe_4tuple_check(struct in_conninfo *, struct tcphdr *, struct ifnet *);
-#endif
diff --git a/include.new/netinet/udp.h b/include.new/netinet/udp.h
deleted file mode 100644
index c1361bf..0000000
--- a/include.new/netinet/udp.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)udp.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/udp.h 246210 2013-02-01 15:32:20Z jhb $
- */
-
-#ifndef _NETINET_UDP_H_
-#define	_NETINET_UDP_H_
-
-/*
- * UDP protocol header.
- * Per RFC 768, September, 1981.
- */
-struct udphdr {
-	u_short	uh_sport;		/* source port */
-	u_short	uh_dport;		/* destination port */
-	u_short	uh_ulen;		/* udp length */
-	u_short	uh_sum;			/* udp checksum */
-};
-
-/* 
- * User-settable options (used with setsockopt).
- */
-#define	UDP_ENCAP			1
-
-/* Start of reserved space for third-party user-settable options. */
-#define	UDP_VENDOR			SO_VENDOR
-
-/*
- * UDP Encapsulation of IPsec Packets options.
- */
-/* Encapsulation types. */
-#define	UDP_ENCAP_ESPINUDP_NON_IKE	1 /* draft-ietf-ipsec-nat-t-ike-00/01 */
-#define	UDP_ENCAP_ESPINUDP		2 /* draft-ietf-ipsec-udp-encaps-02+ */
-
-/* Default ESP in UDP encapsulation port. */
-#define	UDP_ENCAP_ESPINUDP_PORT		500
-
-/* Maximum UDP fragment size for ESP over UDP. */
-#define	UDP_ENCAP_ESPINUDP_MAXFRAGLEN	552
-
-#endif
diff --git a/include.new/netinet/udp_var.h b/include.new/netinet/udp_var.h
deleted file mode 100644
index d85005c..0000000
--- a/include.new/netinet/udp_var.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 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.
- * 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.
- *
- *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet/udp_var.h 278812 2015-02-15 20:53:50Z marius $
- */
-
-#ifndef _NETINET_UDP_VAR_H_
-#define	_NETINET_UDP_VAR_H_
-
-/*
- * UDP kernel structures and variables.
- */
-struct udpiphdr {
-	struct ipovly	ui_i;		/* overlaid ip structure */
-	struct udphdr	ui_u;		/* udp header */
-};
-#define	ui_x1		ui_i.ih_x1
-#define	ui_v		ui_i.ih_x1[0]
-#define	ui_pr		ui_i.ih_pr
-#define	ui_len		ui_i.ih_len
-#define	ui_src		ui_i.ih_src
-#define	ui_dst		ui_i.ih_dst
-#define	ui_sport	ui_u.uh_sport
-#define	ui_dport	ui_u.uh_dport
-#define	ui_ulen		ui_u.uh_ulen
-#define	ui_sum		ui_u.uh_sum
-
-struct inpcb;
-struct mbuf;
-
-typedef void(*udp_tun_func_t)(struct mbuf *, int off, struct inpcb *,
-			      const struct sockaddr *, void *);
-
-/*
- * UDP control block; one per udp.
- */
-struct udpcb {
-	udp_tun_func_t	u_tun_func;	/* UDP kernel tunneling callback. */
-	u_int		u_flags;	/* Generic UDP flags. */
-	uint16_t	u_rxcslen;	/* Coverage for incoming datagrams. */
-	uint16_t	u_txcslen;	/* Coverage for outgoing datagrams. */
-	void 		*u_tun_ctx;	/* Tunneling callback context. */
-};
-
-#define	intoudpcb(ip)	((struct udpcb *)(ip)->inp_ppcb)
-#define	sotoudpcb(so)	(intoudpcb(sotoinpcb(so)))
-
-				/* IPsec: ESP in UDP tunneling: */
-#define	UF_ESPINUDP_NON_IKE	0x00000001	/* w/ non-IKE marker .. */
-	/* .. per draft-ietf-ipsec-nat-t-ike-0[01],
-	 * and draft-ietf-ipsec-udp-encaps-(00/)01.txt */
-#define	UF_ESPINUDP		0x00000002	/* w/ non-ESP marker. */
-
-struct udpstat {
-				/* input statistics: */
-	uint64_t udps_ipackets;		/* total input packets */
-	uint64_t udps_hdrops;		/* packet shorter than header */
-	uint64_t udps_badsum;		/* checksum error */
-	uint64_t udps_nosum;		/* no checksum */
-	uint64_t udps_badlen;		/* data length larger than packet */
-	uint64_t udps_noport;		/* no socket on port */
-	uint64_t udps_noportbcast;	/* of above, arrived as broadcast */
-	uint64_t udps_fullsock;		/* not delivered, input socket full */
-	uint64_t udpps_pcbcachemiss;	/* input packets missing pcb cache */
-	uint64_t udpps_pcbhashmiss;	/* input packets not for hashed pcb */
-				/* output statistics: */
-	uint64_t udps_opackets;		/* total output packets */
-	uint64_t udps_fastout;		/* output packets on fast path */
-	/* of no socket on port, arrived as multicast */
-	uint64_t udps_noportmcast;
-	uint64_t udps_filtermcast;	/* blocked by multicast filter */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_PCPUSTAT_DECLARE(struct udpstat, udpstat);
-/*
- * In-kernel consumers can use these accessor macros directly to update
- * stats.
- */
-#define	UDPSTAT_ADD(name, val)  \
-    VNET_PCPUSTAT_ADD(struct udpstat, udpstat, name, (val))
-#define	UDPSTAT_INC(name)	UDPSTAT_ADD(name, 1)
-
-/*
- * Kernel module consumers must use this accessor macro.
- */
-void	kmod_udpstat_inc(int statnum);
-#define	KMOD_UDPSTAT_INC(name)	\
-    kmod_udpstat_inc(offsetof(struct udpstat, name) / sizeof(uint64_t))
-#endif
-
-/*
- * Names for UDP sysctl objects.
- */
-#define	UDPCTL_CHECKSUM		1	/* checksum UDP packets */
-#define	UDPCTL_STATS		2	/* statistics (read-only) */
-#define	UDPCTL_MAXDGRAM		3	/* max datagram size */
-#define	UDPCTL_RECVSPACE	4	/* default receive buffer space */
-#define	UDPCTL_PCBLIST		5	/* list of PCBs for UDP sockets */
-#define	UDPCTL_MAXID		6
-
-#ifdef _KERNEL
-#include <netinet/in_pcb.h>
-SYSCTL_DECL(_net_inet_udp);
-
-extern struct pr_usrreqs	udp_usrreqs;
-VNET_DECLARE(struct inpcbhead, udb);
-VNET_DECLARE(struct inpcbinfo, udbinfo);
-VNET_DECLARE(struct inpcbhead, ulitecb);
-VNET_DECLARE(struct inpcbinfo, ulitecbinfo);
-#define	V_udb			VNET(udb)
-#define	V_udbinfo		VNET(udbinfo)
-#define	V_ulitecb		VNET(ulitecb)
-#define	V_ulitecbinfo		VNET(ulitecbinfo)
-
-extern u_long			udp_sendspace;
-extern u_long			udp_recvspace;
-VNET_DECLARE(int, udp_cksum);
-VNET_DECLARE(int, udp_blackhole);
-#define	V_udp_cksum		VNET(udp_cksum)
-#define	V_udp_blackhole		VNET(udp_blackhole)
-extern int			udp_log_in_vain;
-
-static __inline struct inpcbinfo *
-get_inpcbinfo(uint8_t protocol)
-{
-	return (protocol == IPPROTO_UDP) ? &V_udbinfo : &V_ulitecbinfo;
-}
-
-static __inline struct inpcbhead *
-get_pcblist(uint8_t protocol)
-{
-	return (protocol == IPPROTO_UDP) ? &V_udb : &V_ulitecb;
-}
-
-int		udp_newudpcb(struct inpcb *);
-void		udp_discardcb(struct udpcb *);
-
-void		udp_ctlinput(int, struct sockaddr *, void *);
-void		udplite_ctlinput(int, struct sockaddr *, void *);
-int		udp_ctloutput(struct socket *, struct sockopt *);
-void		udp_init(void);
-void		udplite_init(void);
-#ifdef VIMAGE
-void		udp_destroy(void);
-void		udplite_destroy(void);
-#endif
-void		udp_input(struct mbuf *, int);
-void		udplite_input(struct mbuf *, int);
-struct inpcb	*udp_notify(struct inpcb *inp, int errno);
-int		udp_shutdown(struct socket *so);
-
-int		udp_set_kernel_tunneling(struct socket *so, udp_tun_func_t f,
-					 void *ctx);
-
-#endif /* _KERNEL */
-
-#endif /* _NETINET_UDP_VAR_H_ */
diff --git a/include.new/netinet/udplite.h b/include.new/netinet/udplite.h
deleted file mode 100644
index 36c53fa..0000000
--- a/include.new/netinet/udplite.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2014, Kevin Lo
- * 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.
- *
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/netinet/udplite.h 265946 2014-05-13 06:05:53Z kevlo $
- */
-
-#ifndef _NETINET_UDPLITE_H_
-#define	_NETINET_UDPLITE_H_
-
-/* 
- * User-settable options (used with setsockopt).
- */
-#define	UDPLITE_SEND_CSCOV	2	/* Sender checksum coverage. */
-#define	UDPLITE_RECV_CSCOV	4	/* Receiver checksum coverage. */
-
-#endif	/* !_NETINET_UDPLITE_H_ */
diff --git a/include.new/netinet6/ah.h b/include.new/netinet6/ah.h
deleted file mode 100644
index 0ee33af..0000000
--- a/include.new/netinet6/ah.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ah.h,v 1.12 2005/01/07 02:30:34 imp Exp $	*/
-/*	$KAME: ah.h,v 1.20 2003/08/05 12:21:15 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * RFC1826/2402 authentication header.
- */
-
-#ifndef _NETINET6_AH_H_
-#define _NETINET6_AH_H_
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-
-struct ah {
-	u_int8_t	ah_nxt;		/* Next Header */
-	u_int8_t	ah_len;		/* Length of data, in 32bit */
-	u_int16_t	ah_reserve;	/* Reserved for future use */
-	uint32_t	ah_spi;		/* Security parameter index */
-	/* variable size, 32bit bound*/	/* Authentication data */
-};
-
-struct newah {
-	u_int8_t	ah_nxt;		/* Next Header */
-	u_int8_t	ah_len;		/* Length of data + 1, in 32bit */
-	u_int16_t	ah_reserve;	/* Reserved for future use */
-	uint32_t	ah_spi;		/* Security parameter index */
-	uint32_t	ah_seq;		/* Sequence number field */
-	/* variable size, 32bit bound*/	/* Authentication data */
-};
-
-#ifdef _KERNEL
-struct secasvar;
-
-struct ah_algorithm_state {
-	struct secasvar *sav;
-	void* foo;	/* per algorithm data - maybe */
-};
-
-struct ah_algorithm {
-	int (*sumsiz) __P((struct secasvar *));
-	int (*mature) __P((struct secasvar *));
-	int keymin;	/* in bits */
-	int keymax;	/* in bits */
-	const char *name;
-	int (*init) __P((struct ah_algorithm_state *, struct secasvar *));
-	void (*update) __P((struct ah_algorithm_state *, u_int8_t *, size_t));
-	void (*result) __P((struct ah_algorithm_state *, u_int8_t *, size_t));
-};
-
-#define	AH_MAXSUMSIZE	(512 / 8)
-
-extern const struct ah_algorithm *ah_algorithm_lookup __P((int));
-
-/* cksum routines */
-extern int ah_hdrlen __P((struct secasvar *));
-
-extern size_t ah_hdrsiz __P((struct ipsecrequest *));
-extern void ah4_input __P((struct mbuf *, int));
-extern int ah4_output __P((struct mbuf *, struct ipsecrequest *));
-extern int ah4_calccksum __P((struct mbuf *, u_int8_t *, size_t,
-	const struct ah_algorithm *, struct secasvar *));
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_AH_H_ */
diff --git a/include.new/netinet6/ah6.h b/include.new/netinet6/ah6.h
deleted file mode 100644
index d46cce9..0000000
--- a/include.new/netinet6/ah6.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ah6.h,v 1.6 2005/01/07 02:30:34 imp Exp $	*/
-/*	$KAME: ah.h,v 1.13 2000/10/18 21:28:00 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * RFC1826/2402 authentication header.
- */
-
-#ifndef _NETINET6_AH6_H_
-#define _NETINET6_AH6_H_
-
-#ifdef _KERNEL
-struct secasvar;
-
-extern int ah6_input __P((struct mbuf **, int *, int));
-extern int ah6_output __P((struct mbuf *, u_char *, struct mbuf *,
-	struct ipsecrequest *));
-extern int ah6_calccksum __P((struct mbuf *, u_int8_t *, size_t,
-	const struct ah_algorithm *, struct secasvar *));
-
-extern void ah6_ctlinput __P((int, struct sockaddr *, void *));
-#endif
-
-#endif /*_NETINET6_AH6_H_*/
diff --git a/include.new/netinet6/ah_aesxcbcmac.h b/include.new/netinet6/ah_aesxcbcmac.h
deleted file mode 100644
index 321fcf4..0000000
--- a/include.new/netinet6/ah_aesxcbcmac.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$KAME: ah_aesxcbcmac.h,v 1.3 2003/07/20 18:01:20 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, 1998 and 2003 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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/netinet6/ah_aesxcbcmac.h,v 1.2 2005/01/07 02:30:34 imp Exp $
- */
-
-extern int ah_aes_xcbc_mac_init __P((struct ah_algorithm_state *,
-	struct secasvar *));
-extern void ah_aes_xcbc_mac_loop __P((struct ah_algorithm_state *, u_int8_t *,
-	size_t));
-extern void ah_aes_xcbc_mac_result __P((struct ah_algorithm_state *,
-	u_int8_t *, size_t));
-
diff --git a/include.new/netinet6/esp.h b/include.new/netinet6/esp.h
deleted file mode 100644
index a2d7e45..0000000
--- a/include.new/netinet6/esp.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/esp.h,v 1.8 2005/01/07 02:30:34 imp Exp $	*/
-/*	$KAME: esp.h,v 1.19 2001/09/04 08:43:19 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * RFC1827/2406 Encapsulated Security Payload.
- */
-
-#ifndef _NETINET6_ESP_H_
-#define _NETINET6_ESP_H_
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-
-struct esp {
-	uint32_t	esp_spi;	/* ESP */
-	/* variable size, 32bit bound */	/* Initialization Vector */
-	/* variable size */		/* Payload data */
-	/* variable size */		/* padding */
-	/* 8bit */			/* pad size */
-	/* 8bit */			/* next header */
-	/* 8bit */			/* next header */
-	/* variable size, 32bit bound */ /* Authentication data (new IPsec) */
-};
-
-struct newesp {
-	uint32_t	esp_spi;	/* ESP */
-	uint32_t	esp_seq;	/* Sequence number */
-	/* variable size */		/* (IV and) Payload data */
-	/* variable size */		/* padding */
-	/* 8bit */			/* pad size */
-	/* 8bit */			/* next header */
-	/* 8bit */			/* next header */
-	/* variable size, 32bit bound *//* Authentication data */
-};
-
-struct esptail {
-	u_int8_t	esp_padlen;	/* pad length */
-	u_int8_t	esp_nxt;	/* Next header */
-	/* variable size, 32bit bound *//* Authentication data (new IPsec)*/
-};
-
-#ifdef _KERNEL
-struct secasvar;
-
-struct esp_algorithm {
-	size_t padbound;	/* pad boundary, in byte */
-	int ivlenval;		/* iv length, in byte */
-	int (*mature) __P((struct secasvar *));
-	int keymin;	/* in bits */
-	int keymax;	/* in bits */
-	size_t (*schedlen) __P((const struct esp_algorithm *));
-	const char *name;
-	int (*ivlen) __P((const struct esp_algorithm *, struct secasvar *));
-	int (*decrypt) __P((struct mbuf *, size_t,
-		struct secasvar *, const struct esp_algorithm *, int));
-	int (*encrypt) __P((struct mbuf *, size_t, size_t,
-		struct secasvar *, const struct esp_algorithm *, int));
-	/* not supposed to be called directly */
-	int (*schedule) __P((const struct esp_algorithm *, struct secasvar *));
-	int (*blockdecrypt) __P((const struct esp_algorithm *,
-		struct secasvar *, u_int8_t *, u_int8_t *));
-	int (*blockencrypt) __P((const struct esp_algorithm *,
-		struct secasvar *, u_int8_t *, u_int8_t *));
-};
-
-extern const struct esp_algorithm *esp_algorithm_lookup __P((int));
-extern int esp_max_ivlen __P((void));
-
-/* crypt routines */
-extern int esp4_output __P((struct mbuf *, struct ipsecrequest *));
-extern void esp4_input __P((struct mbuf *, int));
-extern size_t esp_hdrsiz __P((struct ipsecrequest *));
-
-extern int esp_schedule __P((const struct esp_algorithm *, struct secasvar *));
-extern int esp_auth __P((struct mbuf *, size_t, size_t,
-	struct secasvar *, u_char *));
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_ESP_H_ */
diff --git a/include.new/netinet6/esp6.h b/include.new/netinet6/esp6.h
deleted file mode 100644
index 6e21941..0000000
--- a/include.new/netinet6/esp6.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/esp6.h,v 1.5 2005/01/07 02:30:34 imp Exp $	*/
-/*	$KAME: esp.h,v 1.16 2000/10/18 21:28:00 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * RFC1827/2406 Encapsulated Security Payload.
- */
-
-#ifndef _NETINET6_ESP6_H_
-#define _NETINET6_ESP6_H_
-
-#ifdef _KERNEL
-extern int esp6_output __P((struct mbuf *, u_char *, struct mbuf *,
-	struct ipsecrequest *));
-extern int esp6_input __P((struct mbuf **, int *, int));
-
-extern void esp6_ctlinput __P((int, struct sockaddr *, void *));
-#endif /*_KERNEL*/
-
-#endif /*_NETINET6_ESP6_H_*/
diff --git a/include.new/netinet6/esp_aesctr.h b/include.new/netinet6/esp_aesctr.h
deleted file mode 100644
index d4c711e..0000000
--- a/include.new/netinet6/esp_aesctr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$KAME: esp_aesctr.h,v 1.2 2003/07/20 00:29:38 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, 1998 and 2003 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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/netinet6/esp_aesctr.h,v 1.2 2005/01/07 02:30:34 imp Exp $
- */
-
-extern int esp_aesctr_mature __P((struct secasvar *));
-extern size_t esp_aesctr_schedlen __P((const struct esp_algorithm *));
-extern int esp_aesctr_schedule __P((const struct esp_algorithm *,
-	struct secasvar *));
-extern int esp_aesctr_decrypt __P((struct mbuf *, size_t,
-	struct secasvar *, const struct esp_algorithm *, int));
-extern int esp_aesctr_encrypt __P((struct mbuf *, size_t, size_t,
-	struct secasvar *, const struct esp_algorithm *, int));
-
diff --git a/include.new/netinet6/esp_rijndael.h b/include.new/netinet6/esp_rijndael.h
deleted file mode 100644
index d5e66de..0000000
--- a/include.new/netinet6/esp_rijndael.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/esp_rijndael.h,v 1.4 2005/01/07 02:30:34 imp Exp $	*/
-/*	$KAME: esp_rijndael.h,v 1.2 2003/01/20 00:55:27 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-size_t esp_rijndael_schedlen __P((const struct esp_algorithm *));
-int esp_rijndael_schedule __P((const struct esp_algorithm *,
-	struct secasvar *));
-int esp_rijndael_blockdecrypt __P((const struct esp_algorithm *,
-	struct secasvar *, u_int8_t *, u_int8_t *));
-int esp_rijndael_blockencrypt __P((const struct esp_algorithm *,
-	struct secasvar *, u_int8_t *, u_int8_t *));
diff --git a/include.new/netinet6/icmp6.h b/include.new/netinet6/icmp6.h
deleted file mode 100644
index 27c1a2c..0000000
--- a/include.new/netinet6/icmp6.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netinet6/icmp6.h 62587 2000-07-04 16:35:15Z itojun $	*/
-/*	$KAME: icmp6.h,v 1.17 2000/06/11 17:23:40 jinmei Exp $	*/
-
-#error "netinet6/icmp6.h is obsolete.  use netinet/icmp6.h"
diff --git a/include.new/netinet6/in6.h b/include.new/netinet6/in6.h
deleted file mode 100644
index 8ca0845..0000000
--- a/include.new/netinet6/in6.h
+++ /dev/null
@@ -1,725 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $
- */
-
-/*-
- * Copyright (c) 1982, 1986, 1990, 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.
- * 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.
- *
- *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $FreeBSD: releng/10.2/sys/netinet6/in6.h 272662 2014-10-06 17:08:19Z tuexen $
- */
-
-#ifndef __KAME_NETINET_IN_H_INCLUDED_
-#error "do not include netinet6/in6.h directly, include netinet/in.h.  see RFC2553"
-#endif
-
-#ifndef _NETINET6_IN6_H_
-#define _NETINET6_IN6_H_
-
-/*
- * Identification of the network protocol stack
- * for *BSD-current/release: http://www.kame.net/dev/cvsweb.cgi/kame/COVERAGE
- * has the table of implementation/integration differences.
- */
-#define __KAME__
-#define __KAME_VERSION		"FreeBSD"
-
-/*
- * IPv6 port allocation rules should mirror the IPv4 rules and are controlled
- * by the net.inet.ip.portrange sysctl tree. The following defines exist
- * for compatibility with userland applications that need them.
- */
-#if __BSD_VISIBLE
-#define	IPV6PORT_RESERVED	1024
-#define	IPV6PORT_ANONMIN	49152
-#define	IPV6PORT_ANONMAX	65535
-#define	IPV6PORT_RESERVEDMIN	600
-#define	IPV6PORT_RESERVEDMAX	(IPV6PORT_RESERVED-1)
-#endif
-
-/*
- * IPv6 address
- */
-struct in6_addr {
-	union {
-		uint8_t		__u6_addr8[16];
-		uint16_t	__u6_addr16[8];
-		uint32_t	__u6_addr32[4];
-	} __u6_addr;			/* 128-bit IP6 address */
-};
-
-#define s6_addr   __u6_addr.__u6_addr8
-#ifdef _KERNEL	/* XXX nonstandard */
-#define s6_addr8  __u6_addr.__u6_addr8
-#define s6_addr16 __u6_addr.__u6_addr16
-#define s6_addr32 __u6_addr.__u6_addr32
-#endif
-
-#define INET6_ADDRSTRLEN	46
-
-/*
- * XXX missing POSIX.1-2001 macro IPPROTO_IPV6.
- */
-
-/*
- * Socket address for IPv6
- */
-#if __BSD_VISIBLE
-#define SIN6_LEN
-#endif
-
-struct sockaddr_in6 {
-	uint8_t		sin6_len;	/* length of this struct */
-	sa_family_t	sin6_family;	/* AF_INET6 */
-	in_port_t	sin6_port;	/* Transport layer port # */
-	uint32_t	sin6_flowinfo;	/* IP6 flow information */
-	struct in6_addr	sin6_addr;	/* IP6 address */
-	uint32_t	sin6_scope_id;	/* scope zone index */
-};
-
-/*
- * Local definition for masks
- */
-#ifdef _KERNEL	/* XXX nonstandard */
-#define IN6MASK0	{{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}}
-#define IN6MASK32	{{{ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, \
-			    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
-#define IN6MASK64	{{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
-			    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
-#define IN6MASK96	{{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
-			    0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }}}
-#define IN6MASK128	{{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
-			    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }}}
-#endif
-
-#ifdef _KERNEL
-extern const struct sockaddr_in6 sa6_any;
-
-extern const struct in6_addr in6mask0;
-extern const struct in6_addr in6mask32;
-extern const struct in6_addr in6mask64;
-extern const struct in6_addr in6mask96;
-extern const struct in6_addr in6mask128;
-#endif /* _KERNEL */
-
-/*
- * Macros started with IPV6_ADDR is KAME local
- */
-#ifdef _KERNEL	/* XXX nonstandard */
-#if _BYTE_ORDER == _BIG_ENDIAN
-#define IPV6_ADDR_INT32_ONE	1
-#define IPV6_ADDR_INT32_TWO	2
-#define IPV6_ADDR_INT32_MNL	0xff010000
-#define IPV6_ADDR_INT32_MLL	0xff020000
-#define IPV6_ADDR_INT32_SMP	0x0000ffff
-#define IPV6_ADDR_INT16_ULL	0xfe80
-#define IPV6_ADDR_INT16_USL	0xfec0
-#define IPV6_ADDR_INT16_MLL	0xff02
-#elif _BYTE_ORDER == _LITTLE_ENDIAN
-#define IPV6_ADDR_INT32_ONE	0x01000000
-#define IPV6_ADDR_INT32_TWO	0x02000000
-#define IPV6_ADDR_INT32_MNL	0x000001ff
-#define IPV6_ADDR_INT32_MLL	0x000002ff
-#define IPV6_ADDR_INT32_SMP	0xffff0000
-#define IPV6_ADDR_INT16_ULL	0x80fe
-#define IPV6_ADDR_INT16_USL	0xc0fe
-#define IPV6_ADDR_INT16_MLL	0x02ff
-#endif
-#endif
-
-/*
- * Definition of some useful macros to handle IP6 addresses
- */
-#if __BSD_VISIBLE
-#define IN6ADDR_ANY_INIT \
-	{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
-#define IN6ADDR_LOOPBACK_INIT \
-	{{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
-#define IN6ADDR_NODELOCAL_ALLNODES_INIT \
-	{{{ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
-#define IN6ADDR_INTFACELOCAL_ALLNODES_INIT \
-	{{{ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
-#define IN6ADDR_LINKLOCAL_ALLNODES_INIT \
-	{{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
-#define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \
-	{{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }}}
-#define IN6ADDR_LINKLOCAL_ALLV2ROUTERS_INIT \
-	{{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
-	    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16 }}}
-#endif
-
-extern const struct in6_addr in6addr_any;
-extern const struct in6_addr in6addr_loopback;
-#if __BSD_VISIBLE
-extern const struct in6_addr in6addr_nodelocal_allnodes;
-extern const struct in6_addr in6addr_linklocal_allnodes;
-extern const struct in6_addr in6addr_linklocal_allrouters;
-extern const struct in6_addr in6addr_linklocal_allv2routers;
-#endif
-
-/*
- * Equality
- * NOTE: Some of kernel programming environment (for example, openbsd/sparc)
- * does not supply memcmp().  For userland memcmp() is preferred as it is
- * in ANSI standard.
- */
-#ifdef _KERNEL
-#define IN6_ARE_ADDR_EQUAL(a, b)			\
-    (bcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0)
-#else
-#if __BSD_VISIBLE
-#define IN6_ARE_ADDR_EQUAL(a, b)			\
-    (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0)
-#endif
-#endif
-
-/*
- * Unspecified
- */
-#define IN6_IS_ADDR_UNSPECIFIED(a)	\
-	((a)->__u6_addr.__u6_addr32[0] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[1] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[2] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[3] == 0)
-
-/*
- * Loopback
- */
-#define IN6_IS_ADDR_LOOPBACK(a)		\
-	((a)->__u6_addr.__u6_addr32[0] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[1] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[2] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[3] == ntohl(1))
-
-/*
- * IPv4 compatible
- */
-#define IN6_IS_ADDR_V4COMPAT(a)		\
-	((a)->__u6_addr.__u6_addr32[0] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[1] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[2] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[3] != 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[3] != ntohl(1))
-
-/*
- * Mapped
- */
-#define IN6_IS_ADDR_V4MAPPED(a)		      \
-	((a)->__u6_addr.__u6_addr32[0] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[1] == 0 &&	\
-	 (a)->__u6_addr.__u6_addr32[2] == ntohl(0x0000ffff))
-
-/*
- * KAME Scope Values
- */
-
-#ifdef _KERNEL	/* XXX nonstandard */
-#define IPV6_ADDR_SCOPE_NODELOCAL	0x01
-#define IPV6_ADDR_SCOPE_INTFACELOCAL	0x01
-#define IPV6_ADDR_SCOPE_LINKLOCAL	0x02
-#define IPV6_ADDR_SCOPE_SITELOCAL	0x05
-#define IPV6_ADDR_SCOPE_ORGLOCAL	0x08	/* just used in this file */
-#define IPV6_ADDR_SCOPE_GLOBAL		0x0e
-#else
-#define __IPV6_ADDR_SCOPE_NODELOCAL	0x01
-#define __IPV6_ADDR_SCOPE_INTFACELOCAL	0x01
-#define __IPV6_ADDR_SCOPE_LINKLOCAL	0x02
-#define __IPV6_ADDR_SCOPE_SITELOCAL	0x05
-#define __IPV6_ADDR_SCOPE_ORGLOCAL	0x08	/* just used in this file */
-#define __IPV6_ADDR_SCOPE_GLOBAL	0x0e
-#endif
-
-/*
- * Unicast Scope
- * Note that we must check topmost 10 bits only, not 16 bits (see RFC2373).
- */
-#define IN6_IS_ADDR_LINKLOCAL(a)	\
-	(((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0x80))
-#define IN6_IS_ADDR_SITELOCAL(a)	\
-	(((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0))
-
-/*
- * Multicast
- */
-#define IN6_IS_ADDR_MULTICAST(a)	((a)->s6_addr[0] == 0xff)
-
-#ifdef _KERNEL	/* XXX nonstandard */
-#define IPV6_ADDR_MC_SCOPE(a)		((a)->s6_addr[1] & 0x0f)
-#else
-#define __IPV6_ADDR_MC_SCOPE(a)		((a)->s6_addr[1] & 0x0f)
-#endif
-
-/*
- * Multicast Scope
- */
-#ifdef _KERNEL	/* refers nonstandard items */
-#define IN6_IS_ADDR_MC_NODELOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_NODELOCAL))
-#define IN6_IS_ADDR_MC_INTFACELOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_INTFACELOCAL))
-#define IN6_IS_ADDR_MC_LINKLOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_LINKLOCAL))
-#define IN6_IS_ADDR_MC_SITELOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_SITELOCAL))
-#define IN6_IS_ADDR_MC_ORGLOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_ORGLOCAL))
-#define IN6_IS_ADDR_MC_GLOBAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_GLOBAL))
-#else
-#define IN6_IS_ADDR_MC_NODELOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_NODELOCAL))
-#define IN6_IS_ADDR_MC_LINKLOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_LINKLOCAL))
-#define IN6_IS_ADDR_MC_SITELOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_SITELOCAL))
-#define IN6_IS_ADDR_MC_ORGLOCAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_ORGLOCAL))
-#define IN6_IS_ADDR_MC_GLOBAL(a)	\
-	(IN6_IS_ADDR_MULTICAST(a) &&	\
-	 (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_GLOBAL))
-#endif
-
-#ifdef _KERNEL	/* nonstandard */
-/*
- * KAME Scope
- */
-#define IN6_IS_SCOPE_LINKLOCAL(a)	\
-	((IN6_IS_ADDR_LINKLOCAL(a)) ||	\
-	 (IN6_IS_ADDR_MC_LINKLOCAL(a)))
-#define	IN6_IS_SCOPE_EMBED(a)			\
-	((IN6_IS_ADDR_LINKLOCAL(a)) ||		\
-	 (IN6_IS_ADDR_MC_LINKLOCAL(a)) ||	\
-	 (IN6_IS_ADDR_MC_INTFACELOCAL(a)))
-
-#define IFA6_IS_DEPRECATED(a) \
-	((a)->ia6_lifetime.ia6t_pltime != ND6_INFINITE_LIFETIME && \
-	 (uint32_t)((time_uptime - (a)->ia6_updatetime)) > \
-	 (a)->ia6_lifetime.ia6t_pltime)
-#define IFA6_IS_INVALID(a) \
-	((a)->ia6_lifetime.ia6t_vltime != ND6_INFINITE_LIFETIME && \
-	 (uint32_t)((time_uptime - (a)->ia6_updatetime)) > \
-	 (a)->ia6_lifetime.ia6t_vltime)
-#endif /* _KERNEL */
-
-/*
- * IP6 route structure
- */
-#if __BSD_VISIBLE
-struct route_in6 {
-	struct	rtentry *ro_rt;
-	struct	llentry *ro_lle;
-	struct	in6_addr *ro_ia6;
-	int		ro_flags;
-	struct	sockaddr_in6 ro_dst;
-};
-#endif
-
-/*
- * Options for use with [gs]etsockopt at the IPV6 level.
- * First word of comment is data type; bool is stored in int.
- */
-/* no hdrincl */
-#if 0 /* the followings are relic in IPv4 and hence are disabled */
-#define IPV6_OPTIONS		1  /* buf/ip6_opts; set/get IP6 options */
-#define IPV6_RECVOPTS		5  /* bool; receive all IP6 opts w/dgram */
-#define IPV6_RECVRETOPTS	6  /* bool; receive IP6 opts for response */
-#define IPV6_RECVDSTADDR	7  /* bool; receive IP6 dst addr w/dgram */
-#define IPV6_RETOPTS		8  /* ip6_opts; set/get IP6 options */
-#endif
-#define IPV6_SOCKOPT_RESERVED1	3  /* reserved for future use */
-#define IPV6_UNICAST_HOPS	4  /* int; IP6 hops */
-#define IPV6_MULTICAST_IF	9  /* u_int; set/get IP6 multicast i/f  */
-#define IPV6_MULTICAST_HOPS	10 /* int; set/get IP6 multicast hops */
-#define IPV6_MULTICAST_LOOP	11 /* u_int; set/get IP6 multicast loopback */
-#define IPV6_JOIN_GROUP		12 /* ipv6_mreq; join a group membership */
-#define IPV6_LEAVE_GROUP	13 /* ipv6_mreq; leave a group membership */
-#define IPV6_PORTRANGE		14 /* int; range to choose for unspec port */
-#define ICMP6_FILTER		18 /* icmp6_filter; icmp6 filter */
-/* RFC2292 options */
-#ifdef _KERNEL
-#define IPV6_2292PKTINFO	19 /* bool; send/recv if, src/dst addr */
-#define IPV6_2292HOPLIMIT	20 /* bool; hop limit */
-#define IPV6_2292NEXTHOP	21 /* bool; next hop addr */
-#define IPV6_2292HOPOPTS	22 /* bool; hop-by-hop option */
-#define IPV6_2292DSTOPTS	23 /* bool; destinaion option */
-#define IPV6_2292RTHDR		24 /* bool; routing header */
-#define IPV6_2292PKTOPTIONS	25 /* buf/cmsghdr; set/get IPv6 options */
-#endif
-
-#define IPV6_CHECKSUM		26 /* int; checksum offset for raw socket */
-#define IPV6_V6ONLY		27 /* bool; make AF_INET6 sockets v6 only */
-#ifndef _KERNEL
-#define IPV6_BINDV6ONLY		IPV6_V6ONLY
-#endif
-
-#if 1 /* IPSEC */
-#define IPV6_IPSEC_POLICY	28 /* struct; get/set security policy */
-#endif /* IPSEC */
-
-#define IPV6_FAITH		29 /* bool; accept FAITH'ed connections */
-
-#if 1 /* IPV6FIREWALL */
-#define IPV6_FW_ADD		30 /* add a firewall rule to chain */
-#define IPV6_FW_DEL		31 /* delete a firewall rule from chain */
-#define IPV6_FW_FLUSH		32 /* flush firewall rule chain */
-#define IPV6_FW_ZERO		33 /* clear single/all firewall counter(s) */
-#define IPV6_FW_GET		34 /* get entire firewall rule chain */
-#endif
-
-/* new socket options introduced in RFC3542 */
-#define IPV6_RTHDRDSTOPTS	35 /* ip6_dest; send dst option before rthdr */
-
-#define IPV6_RECVPKTINFO	36 /* bool; recv if, dst addr */
-#define IPV6_RECVHOPLIMIT	37 /* bool; recv hop limit */
-#define IPV6_RECVRTHDR		38 /* bool; recv routing header */
-#define IPV6_RECVHOPOPTS	39 /* bool; recv hop-by-hop option */
-#define IPV6_RECVDSTOPTS	40 /* bool; recv dst option after rthdr */
-#ifdef _KERNEL
-#define IPV6_RECVRTHDRDSTOPTS	41 /* bool; recv dst option before rthdr */
-#endif
-
-#define IPV6_USE_MIN_MTU	42 /* bool; send packets at the minimum MTU */
-#define IPV6_RECVPATHMTU	43 /* bool; notify an according MTU */
-
-#define IPV6_PATHMTU		44 /* mtuinfo; get the current path MTU (sopt),
-				      4 bytes int; MTU notification (cmsg) */
-#if 0 /*obsoleted during 2292bis -> 3542*/
-#define IPV6_REACHCONF		45 /* no data; ND reachability confirm
-				      (cmsg only/not in of RFC3542) */
-#endif
-
-/* more new socket options introduced in RFC3542 */
-#define IPV6_PKTINFO		46 /* in6_pktinfo; send if, src addr */
-#define IPV6_HOPLIMIT		47 /* int; send hop limit */
-#define IPV6_NEXTHOP		48 /* sockaddr; next hop addr */
-#define IPV6_HOPOPTS		49 /* ip6_hbh; send hop-by-hop option */
-#define IPV6_DSTOPTS		50 /* ip6_dest; send dst option befor rthdr */
-#define IPV6_RTHDR		51 /* ip6_rthdr; send routing header */
-#if 0
-#define IPV6_PKTOPTIONS		52 /* buf/cmsghdr; set/get IPv6 options */
-				   /* obsoleted by RFC3542 */
-#endif
-
-#define IPV6_RECVTCLASS		57 /* bool; recv traffic class values */
-
-#define IPV6_AUTOFLOWLABEL	59 /* bool; attach flowlabel automagically */
-
-#define IPV6_TCLASS		61 /* int; send traffic class value */
-#define IPV6_DONTFRAG		62 /* bool; disable IPv6 fragmentation */
-
-#define IPV6_PREFER_TEMPADDR	63 /* int; prefer temporary addresses as
-				    * the source address.
-				    */
-
-#define	IPV6_BINDANY		64 /* bool: allow bind to any address */
-
-/*
- * The following option is private; do not use it from user applications.
- * It is deliberately defined to the same value as IP_MSFILTER.
- */
-#define	IPV6_MSFILTER		74 /* struct __msfilterreq;
-				    * set/get multicast source filter list.
-				    */
-
-/* to define items, should talk with KAME guys first, for *BSD compatibility */
-
-#define IPV6_RTHDR_LOOSE     0 /* this hop need not be a neighbor. XXX old spec */
-#define IPV6_RTHDR_STRICT    1 /* this hop must be a neighbor. XXX old spec */
-#define IPV6_RTHDR_TYPE_0    0 /* IPv6 routing header type 0 */
-
-/*
- * Defaults and limits for options
- */
-#define IPV6_DEFAULT_MULTICAST_HOPS 1	/* normally limit m'casts to 1 hop */
-#define IPV6_DEFAULT_MULTICAST_LOOP 1	/* normally hear sends if a member */
-
-/*
- * The im6o_membership vector for each socket is now dynamically allocated at
- * run-time, bounded by USHRT_MAX, and is reallocated when needed, sized
- * according to a power-of-two increment.
- */
-#define	IPV6_MIN_MEMBERSHIPS	31
-#define	IPV6_MAX_MEMBERSHIPS	4095
-
-/*
- * Default resource limits for IPv6 multicast source filtering.
- * These may be modified by sysctl.
- */
-#define	IPV6_MAX_GROUP_SRC_FILTER	512	/* sources per group */
-#define	IPV6_MAX_SOCK_SRC_FILTER	128	/* sources per socket/group */
-
-/*
- * Argument structure for IPV6_JOIN_GROUP and IPV6_LEAVE_GROUP.
- */
-struct ipv6_mreq {
-	struct in6_addr	ipv6mr_multiaddr;
-	unsigned int	ipv6mr_interface;
-};
-
-/*
- * IPV6_PKTINFO: Packet information(RFC2292 sec 5)
- */
-struct in6_pktinfo {
-	struct in6_addr	ipi6_addr;	/* src/dst IPv6 address */
-	unsigned int	ipi6_ifindex;	/* send/recv interface index */
-};
-
-/*
- * Control structure for IPV6_RECVPATHMTU socket option.
- */
-struct ip6_mtuinfo {
-	struct sockaddr_in6 ip6m_addr;	/* or sockaddr_storage? */
-	uint32_t ip6m_mtu;
-};
-
-/*
- * Argument for IPV6_PORTRANGE:
- * - which range to search when port is unspecified at bind() or connect()
- */
-#define	IPV6_PORTRANGE_DEFAULT	0	/* default range */
-#define	IPV6_PORTRANGE_HIGH	1	/* "high" - request firewall bypass */
-#define	IPV6_PORTRANGE_LOW	2	/* "low" - vouchsafe security */
-
-#if __BSD_VISIBLE
-/*
- * Definitions for inet6 sysctl operations.
- *
- * Third level is protocol number.
- * Fourth level is desired variable within that protocol.
- */
-#define IPV6PROTO_MAXID	(IPPROTO_PIM + 1)	/* don't list to IPV6PROTO_MAX */
-
-/*
- * Names for IP sysctl objects
- */
-#define IPV6CTL_FORWARDING	1	/* act as router */
-#define IPV6CTL_SENDREDIRECTS	2	/* may send redirects when forwarding*/
-#define IPV6CTL_DEFHLIM		3	/* default Hop-Limit */
-#ifdef notyet
-#define IPV6CTL_DEFMTU		4	/* default MTU */
-#endif
-#define IPV6CTL_FORWSRCRT	5	/* forward source-routed dgrams */
-#define IPV6CTL_STATS		6	/* stats */
-#define IPV6CTL_MRTSTATS	7	/* multicast forwarding stats */
-#define IPV6CTL_MRTPROTO	8	/* multicast routing protocol */
-#define IPV6CTL_MAXFRAGPACKETS	9	/* max packets reassembly queue */
-#define IPV6CTL_SOURCECHECK	10	/* verify source route and intf */
-#define IPV6CTL_SOURCECHECK_LOGINT 11	/* minimume logging interval */
-#define IPV6CTL_ACCEPT_RTADV	12
-#define IPV6CTL_KEEPFAITH	13
-#define IPV6CTL_LOG_INTERVAL	14
-#define IPV6CTL_HDRNESTLIMIT	15
-#define IPV6CTL_DAD_COUNT	16
-#define IPV6CTL_AUTO_FLOWLABEL	17
-#define IPV6CTL_DEFMCASTHLIM	18
-#define IPV6CTL_GIF_HLIM	19	/* default HLIM for gif encap packet */
-#define IPV6CTL_KAME_VERSION	20
-#define IPV6CTL_USE_DEPRECATED	21	/* use deprecated addr (RFC2462 5.5.4) */
-#define IPV6CTL_RR_PRUNE	22	/* walk timer for router renumbering */
-#if 0	/* obsolete */
-#define IPV6CTL_MAPPED_ADDR	23
-#endif
-#define IPV6CTL_V6ONLY		24
-#define IPV6CTL_RTEXPIRE	25	/* cloned route expiration time */
-#define IPV6CTL_RTMINEXPIRE	26	/* min value for expiration time */
-#define IPV6CTL_RTMAXCACHE	27	/* trigger level for dynamic expire */
-
-#define IPV6CTL_USETEMPADDR	32	/* use temporary addresses (RFC3041) */
-#define IPV6CTL_TEMPPLTIME	33	/* preferred lifetime for tmpaddrs */
-#define IPV6CTL_TEMPVLTIME	34	/* valid lifetime for tmpaddrs */
-#define IPV6CTL_AUTO_LINKLOCAL	35	/* automatic link-local addr assign */
-#define IPV6CTL_RIP6STATS	36	/* raw_ip6 stats */
-#define IPV6CTL_PREFER_TEMPADDR	37	/* prefer temporary addr as src */
-#define IPV6CTL_ADDRCTLPOLICY	38	/* get/set address selection policy */
-#define IPV6CTL_USE_DEFAULTZONE	39	/* use default scope zone */
-
-#define IPV6CTL_MAXFRAGS	41	/* max fragments */
-#if 0
-#define IPV6CTL_IFQ		42	/* ip6intrq node */
-#define IPV6CTL_ISATAPRTR	43	/* isatap router */
-#endif
-#define IPV6CTL_MCAST_PMTU	44	/* enable pMTU discovery for multicast? */
-
-/* New entries should be added here from current IPV6CTL_MAXID value. */
-/* to define items, should talk with KAME guys first, for *BSD compatibility */
-#define IPV6CTL_STEALTH		45
-
-#define	ICMPV6CTL_ND6_ONLINKNSRFC4861	47
-#define	IPV6CTL_NO_RADR		48	/* No defroute from RA */
-#define	IPV6CTL_NORBIT_RAIF	49	/* Disable R-bit in NA on RA
-					 * receiving IF. */
-#define	IPV6CTL_RFC6204W3	50	/* Accept defroute even when forwarding
-					   enabled */
-#define	IPV6CTL_MAXID		51
-#endif /* __BSD_VISIBLE */
-
-/*
- * Since both netinet/ and netinet6/ call into netipsec/ and netpfil/,
- * the protocol specific mbuf flags are shared between them.
- */
-#define	M_FASTFWD_OURS		M_PROTO1	/* changed dst to local */
-#define	M_IP6_NEXTHOP		M_PROTO2	/* explicit ip nexthop */
-#define	M_IP_NEXTHOP		M_PROTO2	/* explicit ip nexthop */
-#define	M_SKIP_FIREWALL		M_PROTO3	/* skip firewall processing */
-#define	M_AUTHIPHDR		M_PROTO4
-#define	M_DECRYPTED		M_PROTO5
-#define	M_LOOP			M_PROTO6
-#define	M_AUTHIPDGM		M_PROTO7
-#define	M_RTALERT_MLD		M_PROTO8
-
-#ifdef _KERNEL
-struct cmsghdr;
-struct ip6_hdr;
-
-int	in6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t);
-int	in6_cksum(struct mbuf *, u_int8_t, uint32_t, uint32_t);
-int	in6_cksum_partial(struct mbuf *, u_int8_t, uint32_t, uint32_t,
-			  uint32_t);
-int	in6_localaddr(struct in6_addr *);
-int	in6_localip(struct in6_addr *);
-int	in6_addrscope(struct in6_addr *);
-struct	in6_ifaddr *in6_ifawithifp(struct ifnet *, struct in6_addr *);
-extern void in6_if_up(struct ifnet *);
-struct sockaddr;
-extern	u_char	ip6_protox[];
-
-void	in6_sin6_2_sin(struct sockaddr_in *sin,
-			    struct sockaddr_in6 *sin6);
-void	in6_sin_2_v4mapsin6(struct sockaddr_in *sin,
-				 struct sockaddr_in6 *sin6);
-void	in6_sin6_2_sin_in_sock(struct sockaddr *nam);
-void	in6_sin_2_v4mapsin6_in_sock(struct sockaddr **nam);
-extern void addrsel_policy_init(void);
-
-#define	satosin6(sa)	((struct sockaddr_in6 *)(sa))
-#define	sin6tosa(sin6)	((struct sockaddr *)(sin6))
-#define	ifatoia6(ifa)	((struct in6_ifaddr *)(ifa))
-
-extern int	(*faithprefix_p)(struct in6_addr *);
-#endif /* _KERNEL */
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _SOCKLEN_T_DECLARED
-typedef	__socklen_t	socklen_t;
-#define	_SOCKLEN_T_DECLARED
-#endif
-
-#if __BSD_VISIBLE
-
-__BEGIN_DECLS
-struct cmsghdr;
-
-extern int inet6_option_space(int);
-extern int inet6_option_init(void *, struct cmsghdr **, int);
-extern int inet6_option_append(struct cmsghdr *, const uint8_t *,
-	int, int);
-extern uint8_t *inet6_option_alloc(struct cmsghdr *, int, int, int);
-extern int inet6_option_next(const struct cmsghdr *, uint8_t **);
-extern int inet6_option_find(const struct cmsghdr *, uint8_t **, int);
-
-extern size_t inet6_rthdr_space(int, int);
-extern struct cmsghdr *inet6_rthdr_init(void *, int);
-extern int inet6_rthdr_add(struct cmsghdr *, const struct in6_addr *,
-	unsigned int);
-extern int inet6_rthdr_lasthop(struct cmsghdr *, unsigned int);
-#if 0 /* not implemented yet */
-extern int inet6_rthdr_reverse(const struct cmsghdr *, struct cmsghdr *);
-#endif
-extern int inet6_rthdr_segments(const struct cmsghdr *);
-extern struct in6_addr *inet6_rthdr_getaddr(struct cmsghdr *, int);
-extern int inet6_rthdr_getflags(const struct cmsghdr *, int);
-
-extern int inet6_opt_init(void *, socklen_t);
-extern int inet6_opt_append(void *, socklen_t, int, uint8_t, socklen_t,
-	uint8_t, void **);
-extern int inet6_opt_finish(void *, socklen_t, int);
-extern int inet6_opt_set_val(void *, int, void *, socklen_t);
-
-extern int inet6_opt_next(void *, socklen_t, int, uint8_t *, socklen_t *,
-	void **);
-extern int inet6_opt_find(void *, socklen_t, int, uint8_t, socklen_t *,
-	void **);
-extern int inet6_opt_get_val(void *, int, void *, socklen_t);
-extern socklen_t inet6_rth_space(int, int);
-extern void *inet6_rth_init(void *, socklen_t, int, int);
-extern int inet6_rth_add(void *, const struct in6_addr *);
-extern int inet6_rth_reverse(const void *, void *);
-extern int inet6_rth_segments(const void *);
-extern struct in6_addr *inet6_rth_getaddr(const void *, int);
-__END_DECLS
-
-#endif /* __BSD_VISIBLE */
-
-#endif /* !_NETINET6_IN6_H_ */
diff --git a/include.new/netinet6/in6_gif.h b/include.new/netinet6/in6_gif.h
deleted file mode 100644
index ddaee1d..0000000
--- a/include.new/netinet6/in6_gif.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/in6_gif.h,v 1.7 2005/01/07 02:30:34 imp Exp $	*/
-/*	$KAME: in6_gif.h,v 1.5 2000/04/14 08:36:03 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETINET6_IN6_GIF_H_
-#define _NETINET6_IN6_GIF_H_
-
-#define GIF_HLIM	30
-
-struct gif_softc;
-int in6_gif_input __P((struct mbuf **, int *, int));
-int in6_gif_output __P((struct ifnet *, int, struct mbuf *));
-int gif_encapcheck6 __P((const struct mbuf *, int, int, void *));
-int in6_gif_attach __P((struct gif_softc *));
-int in6_gif_detach __P((struct gif_softc *));
-
-#endif /* _NETINET6_IN6_GIF_H_ */
diff --git a/include.new/netinet6/in6_ifattach.h b/include.new/netinet6/in6_ifattach.h
deleted file mode 100644
index f77ad04..0000000
--- a/include.new/netinet6/in6_ifattach.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: in6_ifattach.h,v 1.14 2001/02/08 12:48:39 jinmei Exp $
- * $FreeBSD: releng/10.2/sys/netinet6/in6_ifattach.h 250251 2013-05-04 19:16:26Z hrs $
- */
-
-#ifndef _NETINET6_IN6_IFATTACH_H_
-#define _NETINET6_IN6_IFATTACH_H_
-
-#ifdef _KERNEL
-void in6_ifattach(struct ifnet *, struct ifnet *);
-void in6_ifdetach(struct ifnet *);
-int in6_get_tmpifid(struct ifnet *, u_int8_t *, const u_int8_t *, int);
-void in6_tmpaddrtimer(void *);
-int in6_get_hw_ifid(struct ifnet *, struct in6_addr *);
-int in6_nigroup(struct ifnet *, const char *, int, struct in6_addr *);
-int in6_nigroup_oldmcprefix(struct ifnet *, const char *, int, struct in6_addr *);
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_IN6_IFATTACH_H_ */
diff --git a/include.new/netinet6/in6_pcb.h b/include.new/netinet6/in6_pcb.h
deleted file mode 100644
index d2ef560..0000000
--- a/include.new/netinet6/in6_pcb.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: in6_pcb.h,v 1.13 2001/02/06 09:16:53 itojun Exp $
- */
-
-/*-
- * Copyright (c) 1982, 1986, 1990, 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.
- * 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.
- *
- *	@(#)in_pcb.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet6/in6_pcb.h 241916 2012-10-22 21:49:56Z delphij $
- */
-
-#ifndef _NETINET6_IN6_PCB_H_
-#define	_NETINET6_IN6_PCB_H_
-
-#ifdef _KERNEL
-#define	satosin6(sa)	((struct sockaddr_in6 *)(sa))
-#define	sin6tosa(sin6)	((struct sockaddr *)(sin6))
-#define	ifatoia6(ifa)	((struct in6_ifaddr *)(ifa))
-
-struct	inpcbgroup *
-	in6_pcbgroup_byhash(struct inpcbinfo *, u_int, uint32_t);
-struct	inpcbgroup *
-	in6_pcbgroup_byinpcb(struct inpcb *);
-struct inpcbgroup *
-	in6_pcbgroup_bymbuf(struct inpcbinfo *, struct mbuf *);
-struct	inpcbgroup *
-	in6_pcbgroup_bytuple(struct inpcbinfo *, const struct in6_addr *,
-	    u_short, const struct in6_addr *, u_short);
-
-void	in6_pcbpurgeif0(struct inpcbinfo *, struct ifnet *);
-void	in6_losing(struct inpcb *);
-int	in6_pcbbind(struct inpcb *, struct sockaddr *, struct ucred *);
-int	in6_pcbconnect(struct inpcb *, struct sockaddr *, struct ucred *);
-int	in6_pcbconnect_mbuf(struct inpcb *, struct sockaddr *,
-	    struct ucred *, struct mbuf *);
-void	in6_pcbdisconnect(struct inpcb *);
-int	in6_pcbladdr(struct inpcb *, struct sockaddr *, struct in6_addr *);
-struct	inpcb *
-	in6_pcblookup_local(struct inpcbinfo *,
-				 struct in6_addr *, u_short, int,
-				 struct ucred *);
-struct	inpcb *
-	in6_pcblookup(struct inpcbinfo *, struct in6_addr *,
-			   u_int, struct in6_addr *, u_int, int,
-			   struct ifnet *);
-struct	inpcb *
-	in6_pcblookup_hash_locked(struct inpcbinfo *, struct in6_addr *,
-			   u_int, struct in6_addr *, u_int, int,
-			   struct ifnet *);
-struct	inpcb *
-	in6_pcblookup_mbuf(struct inpcbinfo *, struct in6_addr *,
-			   u_int, struct in6_addr *, u_int, int,
-			   struct ifnet *ifp, struct mbuf *);
-void	in6_pcbnotify(struct inpcbinfo *, struct sockaddr *,
-			   u_int, const struct sockaddr *, u_int, int, void *,
-			   struct inpcb *(*)(struct inpcb *, int));
-struct inpcb *
-	in6_rtchange(struct inpcb *, int);
-struct sockaddr *
-	in6_sockaddr(in_port_t port, struct in6_addr *addr_p);
-struct sockaddr *
-	in6_v4mapsin6_sockaddr(in_port_t port, struct in_addr *addr_p);
-int	in6_getpeeraddr(struct socket *so, struct sockaddr **nam);
-int	in6_getsockaddr(struct socket *so, struct sockaddr **nam);
-int	in6_mapped_sockaddr(struct socket *so, struct sockaddr **nam);
-int	in6_mapped_peeraddr(struct socket *so, struct sockaddr **nam);
-int	in6_selecthlim(struct in6pcb *, struct ifnet *);
-int	in6_pcbsetport(struct in6_addr *, struct inpcb *, struct ucred *);
-void	init_sin6(struct sockaddr_in6 *sin6, struct mbuf *m);
-#endif /* _KERNEL */
-
-#endif /* !_NETINET6_IN6_PCB_H_ */
diff --git a/include.new/netinet6/in6_var.h b/include.new/netinet6/in6_var.h
deleted file mode 100644
index de4b6a9..0000000
--- a/include.new/netinet6/in6_var.h
+++ /dev/null
@@ -1,847 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: in6_var.h,v 1.56 2001/03/29 05:34:31 itojun Exp $
- */
-
-/*-
- * Copyright (c) 1985, 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.
- * 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.
- *
- *	@(#)in_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet6/in6_var.h 272790 2014-10-09 02:49:33Z ae $
- */
-
-#ifndef _NETINET6_IN6_VAR_H_
-#define _NETINET6_IN6_VAR_H_
-
-#include <sys/tree.h>
-
-#ifdef _KERNEL
-#include <sys/fnv_hash.h>
-#include <sys/libkern.h>
-#endif
-
-/*
- * Interface address, Internet version.  One of these structures
- * is allocated for each interface with an Internet address.
- * The ifaddr structure contains the protocol-independent part
- * of the structure and is assumed to be first.
- */
-
-/*
- * pltime/vltime are just for future reference (required to implements 2
- * hour rule for hosts).  they should never be modified by nd6_timeout or
- * anywhere else.
- *	userland -> kernel: accept pltime/vltime
- *	kernel -> userland: throw up everything
- *	in kernel: modify preferred/expire only
- */
-struct in6_addrlifetime {
-	time_t ia6t_expire;	/* valid lifetime expiration time */
-	time_t ia6t_preferred;	/* preferred lifetime expiration time */
-	uint32_t ia6t_vltime;	/* valid lifetime */
-	uint32_t ia6t_pltime;	/* prefix lifetime */
-};
-
-struct nd_ifinfo;
-struct scope6_id;
-struct lltable;
-struct mld_ifinfo;
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-struct in6_ifextra {
-	counter_u64_t *in6_ifstat;
-	counter_u64_t *icmp6_ifstat;
-	struct nd_ifinfo *nd_ifinfo;
-	struct scope6_id *scope6_id;
-	struct lltable *lltable;
-	struct mld_ifinfo *mld_ifinfo;
-};
-#else
-
-struct in6_ifextra {
-	void *in6_ifstat;
-	void *icmp6_ifstat;
-	struct nd_ifinfo *nd_ifinfo;
-	struct scope6_id *scope6_id;
-	struct lltable *lltable;
-	struct mld_ifinfo *mld_ifinfo;
-};
-#endif /* !_KERNEL */
-
-#define	LLTABLE6(ifp)	(((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->lltable)
-
-struct	in6_ifaddr {
-	struct	ifaddr ia_ifa;		/* protocol-independent info */
-#define	ia_ifp		ia_ifa.ifa_ifp
-#define ia_flags	ia_ifa.ifa_flags
-	struct	sockaddr_in6 ia_addr;	/* interface address */
-	struct	sockaddr_in6 ia_net;	/* network number of interface */
-	struct	sockaddr_in6 ia_dstaddr; /* space for destination addr */
-	struct	sockaddr_in6 ia_prefixmask; /* prefix mask */
-	uint32_t ia_plen;		/* prefix length */
-	TAILQ_ENTRY(in6_ifaddr)	ia_link;	/* list of IPv6 addresses */
-	int	ia6_flags;
-
-	struct in6_addrlifetime ia6_lifetime;
-	time_t	ia6_createtime; /* the creation time of this address, which is
-				 * currently used for temporary addresses only.
-				 */
-	time_t	ia6_updatetime;
-
-	/* back pointer to the ND prefix (for autoconfigured addresses only) */
-	struct nd_prefix *ia6_ndpr;
-
-	/* multicast addresses joined from the kernel */
-	LIST_HEAD(, in6_multi_mship) ia6_memberships;
-	/* entry in bucket of inet6 addresses */
-	LIST_ENTRY(in6_ifaddr) ia6_hash;
-};
-
-/* List of in6_ifaddr's. */
-TAILQ_HEAD(in6_ifaddrhead, in6_ifaddr);
-LIST_HEAD(in6_ifaddrlisthead, in6_ifaddr);
-
-/* control structure to manage address selection policy */
-struct in6_addrpolicy {
-	struct sockaddr_in6 addr; /* prefix address */
-	struct sockaddr_in6 addrmask; /* prefix mask */
-	int preced;		/* precedence */
-	int label;		/* matching label */
-	u_quad_t use;		/* statistics */
-};
-
-/*
- * IPv6 interface statistics, as defined in RFC2465 Ipv6IfStatsEntry (p12).
- */
-struct in6_ifstat {
-	uint64_t ifs6_in_receive;	/* # of total input datagram */
-	uint64_t ifs6_in_hdrerr;	/* # of datagrams with invalid hdr */
-	uint64_t ifs6_in_toobig;	/* # of datagrams exceeded MTU */
-	uint64_t ifs6_in_noroute;	/* # of datagrams with no route */
-	uint64_t ifs6_in_addrerr;	/* # of datagrams with invalid dst */
-	uint64_t ifs6_in_protounknown;	/* # of datagrams with unknown proto */
-					/* NOTE: increment on final dst if */
-	uint64_t ifs6_in_truncated;	/* # of truncated datagrams */
-	uint64_t ifs6_in_discard;	/* # of discarded datagrams */
-					/* NOTE: fragment timeout is not here */
-	uint64_t ifs6_in_deliver;	/* # of datagrams delivered to ULP */
-					/* NOTE: increment on final dst if */
-	uint64_t ifs6_out_forward;	/* # of datagrams forwarded */
-					/* NOTE: increment on outgoing if */
-	uint64_t ifs6_out_request;	/* # of outgoing datagrams from ULP */
-					/* NOTE: does not include forwrads */
-	uint64_t ifs6_out_discard;	/* # of discarded datagrams */
-	uint64_t ifs6_out_fragok;	/* # of datagrams fragmented */
-	uint64_t ifs6_out_fragfail;	/* # of datagrams failed on fragment */
-	uint64_t ifs6_out_fragcreat;	/* # of fragment datagrams */
-					/* NOTE: this is # after fragment */
-	uint64_t ifs6_reass_reqd;	/* # of incoming fragmented packets */
-					/* NOTE: increment on final dst if */
-	uint64_t ifs6_reass_ok;		/* # of reassembled packets */
-					/* NOTE: this is # after reass */
-					/* NOTE: increment on final dst if */
-	uint64_t ifs6_reass_fail;	/* # of reass failures */
-					/* NOTE: may not be packet count */
-					/* NOTE: increment on final dst if */
-	uint64_t ifs6_in_mcast;		/* # of inbound multicast datagrams */
-	uint64_t ifs6_out_mcast;	/* # of outbound multicast datagrams */
-};
-
-/*
- * ICMPv6 interface statistics, as defined in RFC2466 Ipv6IfIcmpEntry.
- * XXX: I'm not sure if this file is the right place for this structure...
- */
-struct icmp6_ifstat {
-	/*
-	 * Input statistics
-	 */
-	/* ipv6IfIcmpInMsgs, total # of input messages */
-	uint64_t ifs6_in_msg;
-	/* ipv6IfIcmpInErrors, # of input error messages */
-	uint64_t ifs6_in_error;
-	/* ipv6IfIcmpInDestUnreachs, # of input dest unreach errors */
-	uint64_t ifs6_in_dstunreach;
-	/* ipv6IfIcmpInAdminProhibs, # of input administratively prohibited errs */
-	uint64_t ifs6_in_adminprohib;
-	/* ipv6IfIcmpInTimeExcds, # of input time exceeded errors */
-	uint64_t ifs6_in_timeexceed;
-	/* ipv6IfIcmpInParmProblems, # of input parameter problem errors */
-	uint64_t ifs6_in_paramprob;
-	/* ipv6IfIcmpInPktTooBigs, # of input packet too big errors */
-	uint64_t ifs6_in_pkttoobig;
-	/* ipv6IfIcmpInEchos, # of input echo requests */
-	uint64_t ifs6_in_echo;
-	/* ipv6IfIcmpInEchoReplies, # of input echo replies */
-	uint64_t ifs6_in_echoreply;
-	/* ipv6IfIcmpInRouterSolicits, # of input router solicitations */
-	uint64_t ifs6_in_routersolicit;
-	/* ipv6IfIcmpInRouterAdvertisements, # of input router advertisements */
-	uint64_t ifs6_in_routeradvert;
-	/* ipv6IfIcmpInNeighborSolicits, # of input neighbor solicitations */
-	uint64_t ifs6_in_neighborsolicit;
-	/* ipv6IfIcmpInNeighborAdvertisements, # of input neighbor advertisements */
-	uint64_t ifs6_in_neighboradvert;
-	/* ipv6IfIcmpInRedirects, # of input redirects */
-	uint64_t ifs6_in_redirect;
-	/* ipv6IfIcmpInGroupMembQueries, # of input MLD queries */
-	uint64_t ifs6_in_mldquery;
-	/* ipv6IfIcmpInGroupMembResponses, # of input MLD reports */
-	uint64_t ifs6_in_mldreport;
-	/* ipv6IfIcmpInGroupMembReductions, # of input MLD done */
-	uint64_t ifs6_in_mlddone;
-
-	/*
-	 * Output statistics. We should solve unresolved routing problem...
-	 */
-	/* ipv6IfIcmpOutMsgs, total # of output messages */
-	uint64_t ifs6_out_msg;
-	/* ipv6IfIcmpOutErrors, # of output error messages */
-	uint64_t ifs6_out_error;
-	/* ipv6IfIcmpOutDestUnreachs, # of output dest unreach errors */
-	uint64_t ifs6_out_dstunreach;
-	/* ipv6IfIcmpOutAdminProhibs, # of output administratively prohibited errs */
-	uint64_t ifs6_out_adminprohib;
-	/* ipv6IfIcmpOutTimeExcds, # of output time exceeded errors */
-	uint64_t ifs6_out_timeexceed;
-	/* ipv6IfIcmpOutParmProblems, # of output parameter problem errors */
-	uint64_t ifs6_out_paramprob;
-	/* ipv6IfIcmpOutPktTooBigs, # of output packet too big errors */
-	uint64_t ifs6_out_pkttoobig;
-	/* ipv6IfIcmpOutEchos, # of output echo requests */
-	uint64_t ifs6_out_echo;
-	/* ipv6IfIcmpOutEchoReplies, # of output echo replies */
-	uint64_t ifs6_out_echoreply;
-	/* ipv6IfIcmpOutRouterSolicits, # of output router solicitations */
-	uint64_t ifs6_out_routersolicit;
-	/* ipv6IfIcmpOutRouterAdvertisements, # of output router advertisements */
-	uint64_t ifs6_out_routeradvert;
-	/* ipv6IfIcmpOutNeighborSolicits, # of output neighbor solicitations */
-	uint64_t ifs6_out_neighborsolicit;
-	/* ipv6IfIcmpOutNeighborAdvertisements, # of output neighbor advertisements */
-	uint64_t ifs6_out_neighboradvert;
-	/* ipv6IfIcmpOutRedirects, # of output redirects */
-	uint64_t ifs6_out_redirect;
-	/* ipv6IfIcmpOutGroupMembQueries, # of output MLD queries */
-	uint64_t ifs6_out_mldquery;
-	/* ipv6IfIcmpOutGroupMembResponses, # of output MLD reports */
-	uint64_t ifs6_out_mldreport;
-	/* ipv6IfIcmpOutGroupMembReductions, # of output MLD done */
-	uint64_t ifs6_out_mlddone;
-};
-
-struct	in6_ifreq {
-	char	ifr_name[IFNAMSIZ];
-	union {
-		struct	sockaddr_in6 ifru_addr;
-		struct	sockaddr_in6 ifru_dstaddr;
-		int	ifru_flags;
-		int	ifru_flags6;
-		int	ifru_metric;
-		caddr_t	ifru_data;
-		struct in6_addrlifetime ifru_lifetime;
-		struct in6_ifstat ifru_stat;
-		struct icmp6_ifstat ifru_icmp6stat;
-		uint32_t ifru_scope_id[16];
-	} ifr_ifru;
-};
-
-struct	in6_aliasreq {
-	char	ifra_name[IFNAMSIZ];
-	struct	sockaddr_in6 ifra_addr;
-	struct	sockaddr_in6 ifra_dstaddr;
-	struct	sockaddr_in6 ifra_prefixmask;
-	int	ifra_flags;
-	struct in6_addrlifetime ifra_lifetime;
-	int	ifra_vhid;
-};
-
-/* pre-10.x compat */
-struct	oin6_aliasreq {
-	char	ifra_name[IFNAMSIZ];
-	struct	sockaddr_in6 ifra_addr;
-	struct	sockaddr_in6 ifra_dstaddr;
-	struct	sockaddr_in6 ifra_prefixmask;
-	int	ifra_flags;
-	struct in6_addrlifetime ifra_lifetime;
-};
-
-/* prefix type macro */
-#define IN6_PREFIX_ND	1
-#define IN6_PREFIX_RR	2
-
-/*
- * prefix related flags passed between kernel(NDP related part) and
- * user land command(ifconfig) and daemon(rtadvd).
- */
-struct in6_prflags {
-	struct prf_ra {
-		u_char onlink : 1;
-		u_char autonomous : 1;
-		u_char reserved : 6;
-	} prf_ra;
-	u_char prf_reserved1;
-	u_short prf_reserved2;
-	/* want to put this on 4byte offset */
-	struct prf_rr {
-		u_char decrvalid : 1;
-		u_char decrprefd : 1;
-		u_char reserved : 6;
-	} prf_rr;
-	u_char prf_reserved3;
-	u_short prf_reserved4;
-};
-
-struct  in6_prefixreq {
-	char	ipr_name[IFNAMSIZ];
-	u_char	ipr_origin;
-	u_char	ipr_plen;
-	uint32_t ipr_vltime;
-	uint32_t ipr_pltime;
-	struct in6_prflags ipr_flags;
-	struct	sockaddr_in6 ipr_prefix;
-};
-
-#define PR_ORIG_RA	0
-#define PR_ORIG_RR	1
-#define PR_ORIG_STATIC	2
-#define PR_ORIG_KERNEL	3
-
-#define ipr_raf_onlink		ipr_flags.prf_ra.onlink
-#define ipr_raf_auto		ipr_flags.prf_ra.autonomous
-
-#define ipr_statef_onlink	ipr_flags.prf_state.onlink
-
-#define ipr_rrf_decrvalid	ipr_flags.prf_rr.decrvalid
-#define ipr_rrf_decrprefd	ipr_flags.prf_rr.decrprefd
-
-struct	in6_rrenumreq {
-	char	irr_name[IFNAMSIZ];
-	u_char	irr_origin;
-	u_char	irr_m_len;	/* match len for matchprefix */
-	u_char	irr_m_minlen;	/* minlen for matching prefix */
-	u_char	irr_m_maxlen;	/* maxlen for matching prefix */
-	u_char	irr_u_uselen;	/* uselen for adding prefix */
-	u_char	irr_u_keeplen;	/* keeplen from matching prefix */
-	struct irr_raflagmask {
-		u_char onlink : 1;
-		u_char autonomous : 1;
-		u_char reserved : 6;
-	} irr_raflagmask;
-	uint32_t irr_vltime;
-	uint32_t irr_pltime;
-	struct in6_prflags irr_flags;
-	struct	sockaddr_in6 irr_matchprefix;
-	struct	sockaddr_in6 irr_useprefix;
-};
-
-#define irr_raf_mask_onlink	irr_raflagmask.onlink
-#define irr_raf_mask_auto	irr_raflagmask.autonomous
-#define irr_raf_mask_reserved	irr_raflagmask.reserved
-
-#define irr_raf_onlink		irr_flags.prf_ra.onlink
-#define irr_raf_auto		irr_flags.prf_ra.autonomous
-
-#define irr_statef_onlink	irr_flags.prf_state.onlink
-
-#define irr_rrf			irr_flags.prf_rr
-#define irr_rrf_decrvalid	irr_flags.prf_rr.decrvalid
-#define irr_rrf_decrprefd	irr_flags.prf_rr.decrprefd
-
-/*
- * Given a pointer to an in6_ifaddr (ifaddr),
- * return a pointer to the addr as a sockaddr_in6
- */
-#define IA6_IN6(ia)	(&((ia)->ia_addr.sin6_addr))
-#define IA6_DSTIN6(ia)	(&((ia)->ia_dstaddr.sin6_addr))
-#define IA6_MASKIN6(ia)	(&((ia)->ia_prefixmask.sin6_addr))
-#define IA6_SIN6(ia)	(&((ia)->ia_addr))
-#define IA6_DSTSIN6(ia)	(&((ia)->ia_dstaddr))
-#define IFA_IN6(x)	(&((struct sockaddr_in6 *)((x)->ifa_addr))->sin6_addr)
-#define IFA_DSTIN6(x)	(&((struct sockaddr_in6 *)((x)->ifa_dstaddr))->sin6_addr)
-
-#define IFPR_IN6(x)	(&((struct sockaddr_in6 *)((x)->ifpr_prefix))->sin6_addr)
-
-#ifdef _KERNEL
-#define IN6_ARE_MASKED_ADDR_EQUAL(d, a, m)	(	\
-	(((d)->s6_addr32[0] ^ (a)->s6_addr32[0]) & (m)->s6_addr32[0]) == 0 && \
-	(((d)->s6_addr32[1] ^ (a)->s6_addr32[1]) & (m)->s6_addr32[1]) == 0 && \
-	(((d)->s6_addr32[2] ^ (a)->s6_addr32[2]) & (m)->s6_addr32[2]) == 0 && \
-	(((d)->s6_addr32[3] ^ (a)->s6_addr32[3]) & (m)->s6_addr32[3]) == 0 )
-#endif
-
-#define SIOCSIFADDR_IN6		 _IOW('i', 12, struct in6_ifreq)
-#define SIOCGIFADDR_IN6		_IOWR('i', 33, struct in6_ifreq)
-
-#ifdef _KERNEL
-/*
- * SIOCSxxx ioctls should be unused (see comments in in6.c), but
- * we do not shift numbers for binary compatibility.
- */
-#define SIOCSIFDSTADDR_IN6	 _IOW('i', 14, struct in6_ifreq)
-#define SIOCSIFNETMASK_IN6	 _IOW('i', 22, struct in6_ifreq)
-#endif
-
-#define SIOCGIFDSTADDR_IN6	_IOWR('i', 34, struct in6_ifreq)
-#define SIOCGIFNETMASK_IN6	_IOWR('i', 37, struct in6_ifreq)
-
-#define SIOCDIFADDR_IN6		 _IOW('i', 25, struct in6_ifreq)
-#define OSIOCAIFADDR_IN6	 _IOW('i', 26, struct oin6_aliasreq)
-#define SIOCAIFADDR_IN6		 _IOW('i', 27, struct in6_aliasreq)
-
-#define SIOCSIFPHYADDR_IN6       _IOW('i', 70, struct in6_aliasreq)
-#define	SIOCGIFPSRCADDR_IN6	_IOWR('i', 71, struct in6_ifreq)
-#define	SIOCGIFPDSTADDR_IN6	_IOWR('i', 72, struct in6_ifreq)
-
-#define SIOCGIFAFLAG_IN6	_IOWR('i', 73, struct in6_ifreq)
-
-#define SIOCGDRLST_IN6		_IOWR('i', 74, struct in6_drlist)
-#ifdef _KERNEL
-/* XXX: SIOCGPRLST_IN6 is exposed in KAME but in6_oprlist is not. */
-#define SIOCGPRLST_IN6		_IOWR('i', 75, struct in6_oprlist)
-#endif
-#ifdef _KERNEL
-#define OSIOCGIFINFO_IN6	_IOWR('i', 76, struct in6_ondireq)
-#endif
-#define SIOCGIFINFO_IN6		_IOWR('i', 108, struct in6_ndireq)
-#define SIOCSIFINFO_IN6		_IOWR('i', 109, struct in6_ndireq)
-#define SIOCSNDFLUSH_IN6	_IOWR('i', 77, struct in6_ifreq)
-#define SIOCGNBRINFO_IN6	_IOWR('i', 78, struct in6_nbrinfo)
-#define SIOCSPFXFLUSH_IN6	_IOWR('i', 79, struct in6_ifreq)
-#define SIOCSRTRFLUSH_IN6	_IOWR('i', 80, struct in6_ifreq)
-
-#define SIOCGIFALIFETIME_IN6	_IOWR('i', 81, struct in6_ifreq)
-#define SIOCSIFALIFETIME_IN6	_IOWR('i', 82, struct in6_ifreq)
-#define SIOCGIFSTAT_IN6		_IOWR('i', 83, struct in6_ifreq)
-#define SIOCGIFSTAT_ICMP6	_IOWR('i', 84, struct in6_ifreq)
-
-#define SIOCSDEFIFACE_IN6	_IOWR('i', 85, struct in6_ndifreq)
-#define SIOCGDEFIFACE_IN6	_IOWR('i', 86, struct in6_ndifreq)
-
-#define SIOCSIFINFO_FLAGS	_IOWR('i', 87, struct in6_ndireq) /* XXX */
-
-#define SIOCSSCOPE6		_IOW('i', 88, struct in6_ifreq)
-#define SIOCGSCOPE6		_IOWR('i', 89, struct in6_ifreq)
-#define SIOCGSCOPE6DEF		_IOWR('i', 90, struct in6_ifreq)
-
-#define SIOCSIFPREFIX_IN6	_IOW('i', 100, struct in6_prefixreq) /* set */
-#define SIOCGIFPREFIX_IN6	_IOWR('i', 101, struct in6_prefixreq) /* get */
-#define SIOCDIFPREFIX_IN6	_IOW('i', 102, struct in6_prefixreq) /* del */
-#define SIOCAIFPREFIX_IN6	_IOW('i', 103, struct in6_rrenumreq) /* add */
-#define SIOCCIFPREFIX_IN6	_IOW('i', 104, \
-				     struct in6_rrenumreq) /* change */
-#define SIOCSGIFPREFIX_IN6	_IOW('i', 105, \
-				     struct in6_rrenumreq) /* set global */
-
-#define SIOCGETSGCNT_IN6	_IOWR('u', 106, \
-				      struct sioc_sg_req6) /* get s,g pkt cnt */
-#define SIOCGETMIFCNT_IN6	_IOWR('u', 107, \
-				      struct sioc_mif_req6) /* get pkt cnt per if */
-
-#define SIOCAADDRCTL_POLICY	_IOW('u', 108, struct in6_addrpolicy)
-#define SIOCDADDRCTL_POLICY	_IOW('u', 109, struct in6_addrpolicy)
-
-#define IN6_IFF_ANYCAST		0x01	/* anycast address */
-#define IN6_IFF_TENTATIVE	0x02	/* tentative address */
-#define IN6_IFF_DUPLICATED	0x04	/* DAD detected duplicate */
-#define IN6_IFF_DETACHED	0x08	/* may be detached from the link */
-#define IN6_IFF_DEPRECATED	0x10	/* deprecated address */
-#define IN6_IFF_NODAD		0x20	/* don't perform DAD on this address
-					 * (used only at first SIOC* call)
-					 */
-#define IN6_IFF_AUTOCONF	0x40	/* autoconfigurable address. */
-#define IN6_IFF_TEMPORARY	0x80	/* temporary (anonymous) address. */
-#define	IN6_IFF_PREFER_SOURCE	0x0100	/* preferred address for SAS */
-#define IN6_IFF_NOPFX		0x8000	/* skip kernel prefix management.
-					 * XXX: this should be temporary.
-					 */
-
-/* do not input/output */
-#define IN6_IFF_NOTREADY (IN6_IFF_TENTATIVE|IN6_IFF_DUPLICATED)
-
-#ifdef _KERNEL
-#define IN6_ARE_SCOPE_CMP(a,b) ((a)-(b))
-#define IN6_ARE_SCOPE_EQUAL(a,b) ((a)==(b))
-#endif
-
-#ifdef _KERNEL
-VNET_DECLARE(struct in6_ifaddrhead, in6_ifaddrhead);
-VNET_DECLARE(struct in6_ifaddrlisthead *, in6_ifaddrhashtbl);
-VNET_DECLARE(u_long, in6_ifaddrhmask);
-#define	V_in6_ifaddrhead		VNET(in6_ifaddrhead)
-#define	V_in6_ifaddrhashtbl		VNET(in6_ifaddrhashtbl)
-#define	V_in6_ifaddrhmask		VNET(in6_ifaddrhmask)
-
-#define	IN6ADDR_NHASH_LOG2		8
-#define	IN6ADDR_NHASH			(1 << IN6ADDR_NHASH_LOG2)
-#define	IN6ADDR_HASHVAL(x)		(in6_addrhash(x))
-#define	IN6ADDR_HASH(x) \
-    (&V_in6_ifaddrhashtbl[IN6ADDR_HASHVAL(x) & V_in6_ifaddrhmask])
-
-static __inline uint32_t
-in6_addrhash(struct in6_addr *in6)
-{
-	uint32_t x;
-
-	x = in6->s6_addr32[0] ^ in6->s6_addr32[1] ^ in6->s6_addr32[2] ^
-	    in6->s6_addr32[3];
-	return (fnv_32_buf(&x, sizeof(x), FNV1_32_INIT));
-}
-
-extern struct rwlock in6_ifaddr_lock;
-#define	IN6_IFADDR_LOCK_ASSERT(	)	rw_assert(&in6_ifaddr_lock, RA_LOCKED)
-#define	IN6_IFADDR_RLOCK()		rw_rlock(&in6_ifaddr_lock)
-#define	IN6_IFADDR_RLOCK_ASSERT()	rw_assert(&in6_ifaddr_lock, RA_RLOCKED)
-#define	IN6_IFADDR_RUNLOCK()		rw_runlock(&in6_ifaddr_lock)
-#define	IN6_IFADDR_WLOCK()		rw_wlock(&in6_ifaddr_lock)
-#define	IN6_IFADDR_WLOCK_ASSERT()	rw_assert(&in6_ifaddr_lock, RA_WLOCKED)
-#define	IN6_IFADDR_WUNLOCK()		rw_wunlock(&in6_ifaddr_lock)
-
-#define in6_ifstat_inc(ifp, tag) \
-do {								\
-	if (ifp)						\
-		counter_u64_add(((struct in6_ifextra *)		\
-		    ((ifp)->if_afdata[AF_INET6]))->in6_ifstat[	\
-		    offsetof(struct in6_ifstat, tag) / sizeof(uint64_t)], 1);\
-} while (/*CONSTCOND*/ 0)
-
-extern u_char inet6ctlerrmap[];
-VNET_DECLARE(unsigned long, in6_maxmtu);
-#define	V_in6_maxmtu			VNET(in6_maxmtu)
-#endif /* _KERNEL */
-
-/*
- * IPv6 multicast MLD-layer source entry.
- */
-struct ip6_msource {
-	RB_ENTRY(ip6_msource)	im6s_link;	/* RB tree links */
-	struct in6_addr		im6s_addr;
-	struct im6s_st {
-		uint16_t	ex;		/* # of exclusive members */
-		uint16_t	in;		/* # of inclusive members */
-	}			im6s_st[2];	/* state at t0, t1 */
-	uint8_t			im6s_stp;	/* pending query */
-};
-RB_HEAD(ip6_msource_tree, ip6_msource);
-
-/*
- * IPv6 multicast PCB-layer source entry.
- *
- * NOTE: overlapping use of struct ip6_msource fields at start.
- */
-struct in6_msource {
-	RB_ENTRY(ip6_msource)	im6s_link;	/* Common field */
-	struct in6_addr		im6s_addr;	/* Common field */
-	uint8_t			im6sl_st[2];	/* state before/at commit */
-};
-
-#ifdef _KERNEL
-/*
- * IPv6 source tree comparison function.
- *
- * An ordered predicate is necessary; bcmp() is not documented to return
- * an indication of order, memcmp() is, and is an ISO C99 requirement.
- */
-static __inline int
-ip6_msource_cmp(const struct ip6_msource *a, const struct ip6_msource *b)
-{
-
-	return (memcmp(&a->im6s_addr, &b->im6s_addr, sizeof(struct in6_addr)));
-}
-RB_PROTOTYPE(ip6_msource_tree, ip6_msource, im6s_link, ip6_msource_cmp);
-#endif /* _KERNEL */
-
-/*
- * IPv6 multicast PCB-layer group filter descriptor.
- */
-struct in6_mfilter {
-	struct ip6_msource_tree	im6f_sources; /* source list for (S,G) */
-	u_long			im6f_nsrc;    /* # of source entries */
-	uint8_t			im6f_st[2];   /* state before/at commit */
-};
-
-/*
- * Legacy KAME IPv6 multicast membership descriptor.
- */
-struct in6_multi_mship {
-	struct	in6_multi *i6mm_maddr;
-	LIST_ENTRY(in6_multi_mship) i6mm_chain;
-};
-
-/*
- * IPv6 group descriptor.
- *
- * For every entry on an ifnet's if_multiaddrs list which represents
- * an IP multicast group, there is one of these structures.
- *
- * If any source filters are present, then a node will exist in the RB-tree
- * to permit fast lookup by source whenever an operation takes place.
- * This permits pre-order traversal when we issue reports.
- * Source filter trees are kept separately from the socket layer to
- * greatly simplify locking.
- *
- * When MLDv2 is active, in6m_timer is the response to group query timer.
- * The state-change timer in6m_sctimer is separate; whenever state changes
- * for the group the state change record is generated and transmitted,
- * and kept if retransmissions are necessary.
- *
- * FUTURE: in6m_link is now only used when groups are being purged
- * on a detaching ifnet. It could be demoted to a SLIST_ENTRY, but
- * because it is at the very start of the struct, we can't do this
- * w/o breaking the ABI for ifmcstat.
- */
-struct in6_multi {
-	LIST_ENTRY(in6_multi) in6m_entry; /* list glue */
-	struct	in6_addr in6m_addr;	/* IPv6 multicast address */
-	struct	ifnet *in6m_ifp;	/* back pointer to ifnet */
-	struct	ifmultiaddr *in6m_ifma;	/* back pointer to ifmultiaddr */
-	u_int	in6m_refcount;		/* reference count */
-	u_int	in6m_state;		/* state of the membership */
-	u_int	in6m_timer;		/* MLD6 listener report timer */
-
-	/* New fields for MLDv2 follow. */
-	struct mld_ifinfo	*in6m_mli;	/* MLD info */
-	SLIST_ENTRY(in6_multi)	 in6m_nrele;	/* to-be-released by MLD */
-	struct ip6_msource_tree	 in6m_srcs;	/* tree of sources */
-	u_long			 in6m_nsrc;	/* # of tree entries */
-
-	struct ifqueue		 in6m_scq;	/* queue of pending
-						 * state-change packets */
-	struct timeval		 in6m_lastgsrtv;	/* last G-S-R query */
-	uint16_t		 in6m_sctimer;	/* state-change timer */
-	uint16_t		 in6m_scrv;	/* state-change rexmit count */
-
-	/*
-	 * SSM state counters which track state at T0 (the time the last
-	 * state-change report's RV timer went to zero) and T1
-	 * (time of pending report, i.e. now).
-	 * Used for computing MLDv2 state-change reports. Several refcounts
-	 * are maintained here to optimize for common use-cases.
-	 */
-	struct in6m_st {
-		uint16_t	iss_fmode;	/* MLD filter mode */
-		uint16_t	iss_asm;	/* # of ASM listeners */
-		uint16_t	iss_ex;		/* # of exclusive members */
-		uint16_t	iss_in;		/* # of inclusive members */
-		uint16_t	iss_rec;	/* # of recorded sources */
-	}			in6m_st[2];	/* state at t0, t1 */
-};
-
-/*
- * Helper function to derive the filter mode on a source entry
- * from its internal counters. Predicates are:
- *  A source is only excluded if all listeners exclude it.
- *  A source is only included if no listeners exclude it,
- *  and at least one listener includes it.
- * May be used by ifmcstat(8).
- */
-static __inline uint8_t
-im6s_get_mode(const struct in6_multi *inm, const struct ip6_msource *ims,
-    uint8_t t)
-{
-
-	t = !!t;
-	if (inm->in6m_st[t].iss_ex > 0 &&
-	    inm->in6m_st[t].iss_ex == ims->im6s_st[t].ex)
-		return (MCAST_EXCLUDE);
-	else if (ims->im6s_st[t].in > 0 && ims->im6s_st[t].ex == 0)
-		return (MCAST_INCLUDE);
-	return (MCAST_UNDEFINED);
-}
-
-#ifdef _KERNEL
-
-/*
- * Lock macros for IPv6 layer multicast address lists.  IPv6 lock goes
- * before link layer multicast locks in the lock order.  In most cases,
- * consumers of IN_*_MULTI() macros should acquire the locks before
- * calling them; users of the in_{add,del}multi() functions should not.
- */
-extern struct mtx in6_multi_mtx;
-#define	IN6_MULTI_LOCK()		mtx_lock(&in6_multi_mtx)
-#define	IN6_MULTI_UNLOCK()		mtx_unlock(&in6_multi_mtx)
-#define	IN6_MULTI_LOCK_ASSERT()		mtx_assert(&in6_multi_mtx, MA_OWNED)
-#define	IN6_MULTI_UNLOCK_ASSERT()	mtx_assert(&in6_multi_mtx, MA_NOTOWNED)
-
-/*
- * Look up an in6_multi record for an IPv6 multicast address
- * on the interface ifp.
- * If no record found, return NULL.
- *
- * SMPng: The IN6_MULTI_LOCK and IF_ADDR_LOCK on ifp must be held.
- */
-static __inline struct in6_multi *
-in6m_lookup_locked(struct ifnet *ifp, const struct in6_addr *mcaddr)
-{
-	struct ifmultiaddr *ifma;
-	struct in6_multi *inm;
-
-	IN6_MULTI_LOCK_ASSERT();
-	IF_ADDR_LOCK_ASSERT(ifp);
-
-	inm = NULL;
-	TAILQ_FOREACH(ifma, &((ifp)->if_multiaddrs), ifma_link) {
-		if (ifma->ifma_addr->sa_family == AF_INET6) {
-			inm = (struct in6_multi *)ifma->ifma_protospec;
-			if (IN6_ARE_ADDR_EQUAL(&inm->in6m_addr, mcaddr))
-				break;
-			inm = NULL;
-		}
-	}
-	return (inm);
-}
-
-/*
- * Wrapper for in6m_lookup_locked().
- *
- * SMPng: Assumes that neithr the IN6_MULTI_LOCK() or IF_ADDR_LOCK() are held.
- */
-static __inline struct in6_multi *
-in6m_lookup(struct ifnet *ifp, const struct in6_addr *mcaddr)
-{
-	struct in6_multi *inm;
-
-	IN6_MULTI_LOCK();
-	IF_ADDR_RLOCK(ifp);
-	inm = in6m_lookup_locked(ifp, mcaddr);
-	IF_ADDR_RUNLOCK(ifp);
-	IN6_MULTI_UNLOCK();
-
-	return (inm);
-}
-
-/* Acquire an in6_multi record. */
-static __inline void
-in6m_acquire_locked(struct in6_multi *inm)
-{
-
-	IN6_MULTI_LOCK_ASSERT();
-	++inm->in6m_refcount;
-}
-
-struct ip6_moptions;
-struct sockopt;
-
-/* Multicast KPIs. */
-int	im6o_mc_filter(const struct ip6_moptions *, const struct ifnet *,
-	    const struct sockaddr *, const struct sockaddr *);
-int	in6_mc_join(struct ifnet *, const struct in6_addr *,
-	    struct in6_mfilter *, struct in6_multi **, int);
-int	in6_mc_join_locked(struct ifnet *, const struct in6_addr *,
-	    struct in6_mfilter *, struct in6_multi **, int);
-int	in6_mc_leave(struct in6_multi *, struct in6_mfilter *);
-int	in6_mc_leave_locked(struct in6_multi *, struct in6_mfilter *);
-void	in6m_clear_recorded(struct in6_multi *);
-void	in6m_commit(struct in6_multi *);
-void	in6m_print(const struct in6_multi *);
-int	in6m_record_source(struct in6_multi *, const struct in6_addr *);
-void	in6m_release_locked(struct in6_multi *);
-void	ip6_freemoptions(struct ip6_moptions *);
-int	ip6_getmoptions(struct inpcb *, struct sockopt *);
-int	ip6_setmoptions(struct inpcb *, struct sockopt *);
-
-/* Legacy KAME multicast KPIs. */
-struct in6_multi_mship *
-	in6_joingroup(struct ifnet *, struct in6_addr *, int *, int);
-int	in6_leavegroup(struct in6_multi_mship *);
-
-/* flags to in6_update_ifa */
-#define IN6_IFAUPDATE_DADDELAY	0x1 /* first time to configure an address */
-
-int	in6_mask2len(struct in6_addr *, u_char *);
-int	in6_control(struct socket *, u_long, caddr_t, struct ifnet *,
-	struct thread *);
-int	in6_update_ifa(struct ifnet *, struct in6_aliasreq *,
-	struct in6_ifaddr *, int);
-void	in6_purgeaddr(struct ifaddr *);
-int	in6if_do_dad(struct ifnet *);
-void	in6_purgeif(struct ifnet *);
-void	in6_savemkludge(struct in6_ifaddr *);
-void	*in6_domifattach(struct ifnet *);
-void	in6_domifdetach(struct ifnet *, void *);
-void	in6_setmaxmtu(void);
-int	in6_if2idlen(struct ifnet *);
-struct in6_ifaddr *in6ifa_ifpforlinklocal(struct ifnet *, int);
-struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, struct in6_addr *);
-struct in6_ifaddr *in6ifa_llaonifp(struct ifnet *);
-char	*ip6_sprintf(char *, const struct in6_addr *);
-int	in6_addr2zoneid(struct ifnet *, struct in6_addr *, uint32_t *);
-int	in6_matchlen(struct in6_addr *, struct in6_addr *);
-int	in6_are_prefix_equal(struct in6_addr *, struct in6_addr *, int);
-void	in6_prefixlen2mask(struct in6_addr *, int);
-int	in6_prefix_ioctl(struct socket *, u_long, caddr_t,
-	struct ifnet *);
-int	in6_prefix_add_ifid(int, struct in6_ifaddr *);
-void	in6_prefix_remove_ifid(int, struct in6_ifaddr *);
-void	in6_purgeprefix(struct ifnet *);
-void	in6_ifremloop(struct ifaddr *);
-void	in6_ifaddloop(struct ifaddr *);
-
-int	in6_is_addr_deprecated(struct sockaddr_in6 *);
-int	in6_src_ioctl(u_long, caddr_t);
-
-/*
- * Extended API for IPv6 FIB support.
- */
-void	in6_rtredirect(struct sockaddr *, struct sockaddr *, struct sockaddr *,
-	    int, struct sockaddr *, u_int);
-int	in6_rtrequest(int, struct sockaddr *, struct sockaddr *,
-	    struct sockaddr *, int, struct rtentry **, u_int);
-void	in6_rtalloc(struct route_in6 *, u_int);
-void	in6_rtalloc_ign(struct route_in6 *, u_long, u_int);
-struct rtentry *in6_rtalloc1(struct sockaddr *, int, u_long, u_int);
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_IN6_VAR_H_ */
diff --git a/include.new/netinet6/ip6.h b/include.new/netinet6/ip6.h
deleted file mode 100644
index 8bfbd8f..0000000
--- a/include.new/netinet6/ip6.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netinet6/ip6.h 62587 2000-07-04 16:35:15Z itojun $	*/
-/*	$KAME: ip6.h,v 1.7 2000/03/25 07:23:36 sumikawa Exp $	*/
-
-#error "netinet6/ip6.h is obsolete.  use netinet/ip6.h"
diff --git a/include.new/netinet6/ip6_ecn.h b/include.new/netinet6/ip6_ecn.h
deleted file mode 100644
index 1ac2e8b..0000000
--- a/include.new/netinet6/ip6_ecn.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (C) 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: ip_ecn.h,v 1.5 2000/03/27 04:58:38 sumikawa Exp $
- * $FreeBSD: releng/10.2/sys/netinet6/ip6_ecn.h 174510 2007-12-10 16:03:40Z obrien $
- */
-
-/*
- * ECN consideration on tunnel ingress/egress operation.
- * http://www.aciri.org/floyd/papers/draft-ipsec-ecn-00.txt
- */
-
-#ifdef _KERNEL
-extern void ip6_ecn_ingress(int, uint32_t *, const uint32_t *);
-extern int ip6_ecn_egress(int, const uint32_t *, uint32_t *);
-#endif
diff --git a/include.new/netinet6/ip6_fw.h b/include.new/netinet6/ip6_fw.h
deleted file mode 100644
index 16bea32..0000000
--- a/include.new/netinet6/ip6_fw.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ip6_fw.h,v 1.15 2005/01/07 02:30:34 imp Exp $	*/
-/*	$KAME: ip6_fw.h,v 1.9 2001/08/01 04:29:57 sumikawa Exp $	*/
-
-/*-
- * Copyright (C) 1998, 1999, 2000 and 2001 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*-
- * Copyright (c) 1993 Daniel Boulet
- * Copyright (c) 1994 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- */
-
-#ifndef _IP6_FW_H
-#define _IP6_FW_H
-
-#include <net/if.h>
-
-/*
- * This union structure identifies an interface, either explicitly
- * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME
- * and IP_FW_F_OIFNAME say how to interpret this structure. An
- * interface unit number of -1 matches any unit number, while an
- * IP address of 0.0.0.0 indicates matches any interface.
- *
- * The receive and transmit interfaces are only compared against the
- * the packet if the corresponding bit (IP_FW_F_IIFACE or IP_FW_F_OIFACE)
- * is set. Note some packets lack a receive or transmit interface
- * (in which case the missing "interface" never matches).
- */
-
-union ip6_fw_if {
-    struct in6_addr fu_via_ip6;	/* Specified by IPv6 address */
-    struct {			/* Specified by interface name */
-#define IP6FW_IFNLEN     IFNAMSIZ
-	    char  name[IP6FW_IFNLEN];
-	    short glob;		/* Is name a pattern or a name? */
-    } fu_via_if;
-};
-
-/*
- * Format of an IP firewall descriptor
- *
- * fw_src, fw_dst, fw_smsk, fw_dmsk are always stored in network byte order.
- * fw_flg and fw_n*p are stored in host byte order (of course).
- * Port numbers are stored in HOST byte order.
- * Warning: setsockopt() will fail if sizeof(struct ip_fw) > MLEN (108)
- */
-
-struct ip6_fw {
-    u_long fw_pcnt,fw_bcnt;		/* Packet and byte counters */
-    struct in6_addr fw_src, fw_dst;	/* Source and destination IPv6 addr */
-    struct in6_addr fw_smsk, fw_dmsk;	/* Mask for src and dest IPv6 addr */
-    u_short fw_number;			/* Rule number */
-    u_short fw_flg;			/* Flags word */
-#define IPV6_FW_MAX_PORTS	10	/* A reasonable maximum */
-    u_int fw_ipflg;			/* IP flags word */
-    u_short fw_pts[IPV6_FW_MAX_PORTS];	/* Array of port numbers to match */
-    u_char fw_ip6opt,fw_ip6nopt;	/* IPv6 options set/unset */
-    u_char fw_tcpf,fw_tcpnf;		/* TCP flags set/unset */
-#define IPV6_FW_ICMPTYPES_DIM (256 / (sizeof(unsigned) * 8))
-    unsigned fw_icmp6types[IPV6_FW_ICMPTYPES_DIM]; /* ICMP types bitmap */
-    long timestamp;			/* timestamp (tv_sec) of last match */
-    union ip6_fw_if fw_in_if, fw_out_if;/* Incoming and outgoing interfaces */
-    union {
-	u_short fu_divert_port;		/* Divert/tee port (options IP6DIVERT) */
-	u_short fu_skipto_rule;		/* SKIPTO command rule number */
-	u_short fu_reject_code;		/* REJECT response code */
-    } fw_un;
-    u_char fw_prot;			/* IPv6 protocol */
-    u_char fw_nports;			/* N'of src ports and # of dst ports */
-					/* in ports array (dst ports follow */
-					/* src ports; max of 10 ports in all; */
-					/* count of 0 means match all ports) */
-};
-
-#define IPV6_FW_GETNSRCP(rule)		((rule)->fw_nports & 0x0f)
-#define IPV6_FW_SETNSRCP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0x0f;	\
-					  (rule)->fw_nports |= (n);	\
-					} while (/*CONSTCOND*/ 0)
-#define IPV6_FW_GETNDSTP(rule)		((rule)->fw_nports >> 4)
-#define IPV6_FW_SETNDSTP(rule, n)		do {				\
-					  (rule)->fw_nports &= ~0xf0;	\
-					  (rule)->fw_nports |= (n) << 4;\
-					} while (/*CONSTCOND*/ 0)
-
-#define fw_divert_port	fw_un.fu_divert_port
-#define fw_skipto_rule	fw_un.fu_skipto_rule
-#define fw_reject_code	fw_un.fu_reject_code
-
-struct ip6_fw_chain {
-        LIST_ENTRY(ip6_fw_chain) chain;
-        struct ip6_fw    *rule;
-};
-
-/*
- * Values for "flags" field .
- */
-#define IPV6_FW_F_IN	0x0001	/* Check inbound packets		*/
-#define IPV6_FW_F_OUT	0x0002	/* Check outbound packets		*/
-#define IPV6_FW_F_IIFACE	0x0004	/* Apply inbound interface test		*/
-#define IPV6_FW_F_OIFACE	0x0008	/* Apply outbound interface test	*/
-
-#define IPV6_FW_F_COMMAND 0x0070	/* Mask for type of chain entry:	*/
-#define IPV6_FW_F_DENY	0x0000	/* This is a deny rule			*/
-#define IPV6_FW_F_REJECT	0x0010	/* Deny and send a response packet	*/
-#define IPV6_FW_F_ACCEPT	0x0020	/* This is an accept rule		*/
-#define IPV6_FW_F_COUNT	0x0030	/* This is a count rule			*/
-#define IPV6_FW_F_DIVERT	0x0040	/* This is a divert rule		*/
-#define IPV6_FW_F_TEE	0x0050	/* This is a tee rule			*/
-#define IPV6_FW_F_SKIPTO	0x0060	/* This is a skipto rule		*/
-
-#define IPV6_FW_F_PRN	0x0080	/* Print if this rule matches		*/
-
-#define IPV6_FW_F_SRNG	0x0100	/* The first two src ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IPV6_FW_F_DRNG	0x0200	/* The first two dst ports are a min	*
-				 * and max range (stored in host byte	*
-				 * order).				*/
-
-#define IPV6_FW_F_IIFNAME	0x0400	/* In interface by name/unit (not IP)	*/
-#define IPV6_FW_F_OIFNAME	0x0800	/* Out interface by name/unit (not IP)	*/
-
-#define IPV6_FW_F_INVSRC	0x1000	/* Invert sense of src check		*/
-#define IPV6_FW_F_INVDST	0x2000	/* Invert sense of dst check		*/
-
-#define IPV6_FW_F_FRAG	0x4000	/* Fragment				*/
-
-#define IPV6_FW_F_ICMPBIT 0x8000	/* ICMP type bitmap is valid		*/
-
-#define IPV6_FW_F_MASK	0xFFFF	/* All possible flag bits mask		*/
-
-/*
- * Flags for the 'fw_ipflg' field, for comparing values of ip and its protocols. */
-#define	IPV6_FW_IF_TCPEST 0x00000020	/* established TCP connection	*/
-#define IPV6_FW_IF_TCPMSK 0x00000020	/* mask of all TCP values */
-
-/*
- * For backwards compatibility with rules specifying "via iface" but
- * not restricted to only "in" or "out" packets, we define this combination
- * of bits to represent this configuration.
- */
-
-#define IF6_FW_F_VIAHACK	(IPV6_FW_F_IN|IPV6_FW_F_OUT|IPV6_FW_F_IIFACE|IPV6_FW_F_OIFACE)
-
-/*
- * Definitions for REJECT response codes.
- * Values less than 256 correspond to ICMP unreachable codes.
- */
-#define IPV6_FW_REJECT_RST	0x0100		/* TCP packets: send RST */
-
-/*
- * Definitions for IPv6 option names.
- */
-#define IPV6_FW_IP6OPT_HOPOPT	0x01
-#define IPV6_FW_IP6OPT_ROUTE	0x02
-#define IPV6_FW_IP6OPT_FRAG	0x04
-#define IPV6_FW_IP6OPT_ESP	0x08
-#define IPV6_FW_IP6OPT_AH	0x10
-#define IPV6_FW_IP6OPT_NONXT	0x20
-#define IPV6_FW_IP6OPT_OPTS	0x40
-
-/*
- * Definitions for TCP flags.
- */
-#define IPV6_FW_TCPF_FIN	TH_FIN
-#define IPV6_FW_TCPF_SYN	TH_SYN
-#define IPV6_FW_TCPF_RST	TH_RST
-#define IPV6_FW_TCPF_PSH	TH_PUSH
-#define IPV6_FW_TCPF_ACK	TH_ACK
-#define IPV6_FW_TCPF_URG	TH_URG
-
-/*
- * Main firewall chains definitions and global var's definitions.
- */
-#ifdef _KERNEL
-
-/*
- * Function definitions.
- */
-void ip6_fw_init(void);
-
-/* Firewall hooks */
-struct ip6_hdr;
-typedef	int ip6_fw_chk_t __P((struct ip6_hdr**, struct ifnet*,
-	u_short *, struct mbuf**));
-typedef	int ip6_fw_ctl_t __P((int, struct mbuf**));
-extern	ip6_fw_chk_t *ip6_fw_chk_ptr;
-extern	ip6_fw_ctl_t *ip6_fw_ctl_ptr;
-extern	int ip6_fw_enable;
-
-#endif /* _KERNEL */
-
-#endif /* _IP6_FW_H */
diff --git a/include.new/netinet6/ip6_ipsec.h b/include.new/netinet6/ip6_ipsec.h
deleted file mode 100644
index 5bc9a35..0000000
--- a/include.new/netinet6/ip6_ipsec.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/netinet6/ip6_ipsec.h 274132 2014-11-05 09:23:29Z ae $
- */
-
-#ifndef _NETINET_IP6_IPSEC_H_
-#define _NETINET_IP6_IPSEC_H_
-
-int	ip6_ipsec_filtertunnel(struct mbuf *);
-int	ip6_ipsec_fwd(struct mbuf *);
-int	ip6_ipsec_input(struct mbuf *, int);
-int	ip6_ipsec_output(struct mbuf **, struct inpcb *, int *, int *,
-	    struct ifnet **);
-#if 0
-int	ip6_ipsec_mtu(struct mbuf *);
-#endif
-#endif
diff --git a/include.new/netinet6/ip6_mroute.h b/include.new/netinet6/ip6_mroute.h
deleted file mode 100644
index 6038748..0000000
--- a/include.new/netinet6/ip6_mroute.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/*-
- * Copyright (C) 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: ip6_mroute.h,v 1.19 2001/06/14 06:12:55 suz Exp $
- * $FreeBSD: releng/10.2/sys/netinet6/ip6_mroute.h 261218 2014-01-28 00:30:17Z ae $
- */
-
-/*	BSDI ip_mroute.h,v 2.5 1996/10/11 16:01:48 pjd Exp	*/
-
-/*
- * Definitions for IP multicast forwarding.
- *
- * Written by David Waitzman, BBN Labs, August 1988.
- * Modified by Steve Deering, Stanford, February 1989.
- * Modified by Ajit Thyagarajan, PARC, August 1993.
- * Modified by Ajit Thyagarajan, PARC, August 1994.
- * Modified by Ahmed Helmy, USC, September 1996.
- *
- * MROUTING Revision: 1.2
- */
-
-#ifndef _NETINET6_IP6_MROUTE_H_
-#define _NETINET6_IP6_MROUTE_H_
-
-/*
- * Multicast Routing set/getsockopt commands.
- */
-#ifdef _KERNEL
-#define MRT6_OINIT		100	/* initialize forwarder (omrt6msg) */
-#endif
-#define MRT6_DONE		101	/* shut down forwarder */
-#define MRT6_ADD_MIF		102	/* add multicast interface */
-#define MRT6_DEL_MIF		103	/* delete multicast interface */
-#define MRT6_ADD_MFC		104	/* insert forwarding cache entry */
-#define MRT6_DEL_MFC		105	/* delete forwarding cache entry */
-#define MRT6_PIM                107     /* enable pim code */
-#define MRT6_INIT		108	/* initialize forwarder (mrt6msg) */
-
-#if BSD >= 199103
-#define GET_TIME(t)	microtime(&t)
-#elif defined(sun)
-#define GET_TIME(t)	uniqtime(&t)
-#else
-#define GET_TIME(t)	((t) = time)
-#endif
-
-/*
- * Types and macros for handling bitmaps with one bit per multicast interface.
- */
-typedef u_short mifi_t;		/* type of a mif index */
-#define MAXMIFS		64
-
-#ifndef	IF_SETSIZE
-#define	IF_SETSIZE	256
-#endif
-
-typedef	uint32_t	if_mask;
-#define	NIFBITS	(sizeof(if_mask) * NBBY)	/* bits per mask */
-
-#ifndef howmany
-#define	howmany(x, y)	(((x) + ((y) - 1)) / (y))
-#endif
-
-typedef	struct if_set {
-	if_mask	ifs_bits[howmany(IF_SETSIZE, NIFBITS)];
-} if_set;
-
-#define	IF_SET(n, p)	((p)->ifs_bits[(n)/NIFBITS] |= (1 << ((n) % NIFBITS)))
-#define	IF_CLR(n, p)	((p)->ifs_bits[(n)/NIFBITS] &= ~(1 << ((n) % NIFBITS)))
-#define	IF_ISSET(n, p)	((p)->ifs_bits[(n)/NIFBITS] & (1 << ((n) % NIFBITS)))
-#define	IF_COPY(f, t)	bcopy(f, t, sizeof(*(f)))
-#define	IF_ZERO(p)	bzero(p, sizeof(*(p)))
-
-/*
- * Argument structure for MRT6_ADD_IF.
- */
-struct mif6ctl {
-	mifi_t	    mif6c_mifi;		/* the index of the mif to be added  */
-	u_char	    mif6c_flags;	/* MIFF_ flags defined below         */
-	u_short	    mif6c_pifi;		/* the index of the physical IF */
-};
-
-#define	MIFF_REGISTER	0x1	/* mif represents a register end-point */
-
-/*
- * Argument structure for MRT6_ADD_MFC and MRT6_DEL_MFC
- */
-struct mf6cctl {
-	struct sockaddr_in6 mf6cc_origin;	/* IPv6 origin of mcasts */
-	struct sockaddr_in6 mf6cc_mcastgrp; /* multicast group associated */
-	mifi_t		mf6cc_parent;	/* incoming ifindex */
-	struct if_set	mf6cc_ifset;	/* set of forwarding ifs */
-};
-
-/*
- * The kernel's multicast routing statistics.
- */
-struct mrt6stat {
-	uint64_t mrt6s_mfc_lookups;	/* # forw. cache hash table hits   */
-	uint64_t mrt6s_mfc_misses;	/* # forw. cache hash table misses */
-	uint64_t mrt6s_upcalls;		/* # calls to multicast routing daemon */
-	uint64_t mrt6s_no_route;	/* no route for packet's origin    */
-	uint64_t mrt6s_bad_tunnel;	/* malformed tunnel options        */
-	uint64_t mrt6s_cant_tunnel;	/* no room for tunnel options      */
-	uint64_t mrt6s_wrong_if;	/* arrived on wrong interface	   */
-	uint64_t mrt6s_upq_ovflw;	/* upcall Q overflow		   */
-	uint64_t mrt6s_cache_cleanups;	/* # entries with no upcalls	   */
-	uint64_t mrt6s_drop_sel;	/* pkts dropped selectively        */
-	uint64_t mrt6s_q_overflow;	/* pkts dropped - Q overflow       */
-	uint64_t mrt6s_pkt2large;	/* pkts dropped - size > BKT SIZE  */
-	uint64_t mrt6s_upq_sockfull;	/* upcalls dropped - socket full   */
-};
-
-#ifdef MRT6_OINIT
-/*
- * Struct used to communicate from kernel to multicast router
- * note the convenient similarity to an IPv6 header.
- * XXX old version, superseded by mrt6msg.
- */
-struct omrt6msg {
-	u_long	    unused1;
-	u_char	    im6_msgtype;		/* what type of message	    */
-	u_char	    im6_mbz;			/* must be zero		    */
-	u_char	    im6_mif;			/* mif rec'd on		    */
-	u_char	    unused2;
-	struct in6_addr  im6_src, im6_dst;
-};
-#endif
-
-/*
- * Structure used to communicate from kernel to multicast router.
- * We'll overlay the structure onto an MLD header (not an IPv6 header
- * like igmpmsg{} used for IPv4 implementation). This is because this
- * structure will be passed via an IPv6 raw socket, on which an application
- * will only receive the payload i.e. the data after the IPv6 header and all
- * the extension headers. (see Section 3 of RFC3542)
- */
-struct mrt6msg {
-#define MRT6MSG_NOCACHE		1
-#define MRT6MSG_WRONGMIF	2
-#define MRT6MSG_WHOLEPKT	3		/* used for user level encap*/
-	u_char	    im6_mbz;			/* must be zero		    */
-	u_char	    im6_msgtype;		/* what type of message	    */
-	u_int16_t   im6_mif;			/* mif rec'd on		    */
-	uint32_t   im6_pad;			/* padding for 64bit arch   */
-	struct in6_addr  im6_src, im6_dst;
-};
-
-/*
- * Argument structure used by multicast routing daemon to get src-grp
- * packet counts
- */
-struct sioc_sg_req6 {
-	struct sockaddr_in6 src;
-	struct sockaddr_in6 grp;
-	u_quad_t pktcnt;
-	u_quad_t bytecnt;
-	u_quad_t wrong_if;
-};
-
-/*
- * Argument structure used by mrouted to get mif pkt counts
- */
-struct sioc_mif_req6 {
-	mifi_t mifi;		/* mif number				*/
-	u_quad_t icount;	/* Input packet count on mif		*/
-	u_quad_t ocount;	/* Output packet count on mif		*/
-	u_quad_t ibytes;	/* Input byte count on mif		*/
-	u_quad_t obytes;	/* Output byte count on mif		*/
-};
-
-#if defined(_KERNEL) || defined(KERNEL)
-/*
- * The kernel's multicast-interface structure.
- */
-struct mif6 {
-        u_char		m6_flags;	/* MIFF_ flags defined above         */
-	u_int		m6_rate_limit;	/* max rate			     */
-	struct in6_addr	m6_lcl_addr;	/* local interface address           */
-	struct ifnet    *m6_ifp;	/* pointer to interface              */
-	u_quad_t	m6_pkt_in;	/* # pkts in on interface            */
-	u_quad_t	m6_pkt_out;	/* # pkts out on interface           */
-	u_quad_t	m6_bytes_in;	/* # bytes in on interface	     */
-	u_quad_t	m6_bytes_out;	/* # bytes out on interface	     */
-#ifdef notyet
-	u_int		m6_rsvp_on;	/* RSVP listening on this vif */
-	struct socket   *m6_rsvpd;	/* RSVP daemon socket */
-#endif
-};
-
-/*
- * The kernel's multicast forwarding cache entry structure
- */
-struct mf6c {
-	struct sockaddr_in6  mf6c_origin;	/* IPv6 origin of mcasts     */
-	struct sockaddr_in6  mf6c_mcastgrp;	/* multicast group associated*/
-	mifi_t		 mf6c_parent;		/* incoming IF               */
-	struct if_set	 mf6c_ifset;		/* set of outgoing IFs */
-
-	u_quad_t	mf6c_pkt_cnt;		/* pkt count for src-grp     */
-	u_quad_t	mf6c_byte_cnt;		/* byte count for src-grp    */
-	u_quad_t	mf6c_wrong_if;		/* wrong if for src-grp	     */
-	int		mf6c_expire;		/* time to clean entry up    */
-	struct timeval  mf6c_last_assert;	/* last time I sent an assert*/
-	struct rtdetq  *mf6c_stall;		/* pkts waiting for route */
-	struct mf6c    *mf6c_next;		/* hash table linkage */
-};
-
-#define MF6C_INCOMPLETE_PARENT ((mifi_t)-1)
-
-/*
- * Argument structure used for pkt info. while upcall is made
- */
-#ifndef _NETINET_IP_MROUTE_H_
-struct rtdetq {		/* XXX: rtdetq is also defined in ip_mroute.h */
-    struct mbuf		*m;		/* A copy of the packet		    */
-    struct ifnet	*ifp;		/* Interface pkt came in on	    */
-#ifdef UPCALL_TIMING
-    struct timeval	t;		/* Timestamp */
-#endif /* UPCALL_TIMING */
-    struct rtdetq	*next;
-};
-#endif /* _NETINET_IP_MROUTE_H_ */
-
-#define MF6CTBLSIZ	256
-#if (MF6CTBLSIZ & (MF6CTBLSIZ - 1)) == 0	  /* from sys:route.h */
-#define MF6CHASHMOD(h)	((h) & (MF6CTBLSIZ - 1))
-#else
-#define MF6CHASHMOD(h)	((h) % MF6CTBLSIZ)
-#endif
-
-#define MAX_UPQ6	4		/* max. no of pkts in upcall Q */
-
-extern int	(*ip6_mrouter_set)(struct socket *so, struct sockopt *sopt);
-extern int	(*ip6_mrouter_get)(struct socket *so, struct sockopt *sopt);
-extern int	(*ip6_mrouter_done)(void);
-extern int	(*mrt6_ioctl)(u_long, caddr_t);
-#endif /* _KERNEL */
-
-#endif /* !_NETINET6_IP6_MROUTE_H_ */
diff --git a/include.new/netinet6/ip6_var.h b/include.new/netinet6/ip6_var.h
deleted file mode 100644
index 7aab07e..0000000
--- a/include.new/netinet6/ip6_var.h
+++ /dev/null
@@ -1,464 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: ip6_var.h,v 1.62 2001/05/03 14:51:48 itojun Exp $
- */
-
-/*-
- * 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.
- * 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.
- *
- *	@(#)ip_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet6/ip6_var.h 284572 2015-06-18 20:40:36Z kp $
- */
-
-#ifndef _NETINET6_IP6_VAR_H_
-#define _NETINET6_IP6_VAR_H_
-
-/*
- * IP6 reassembly queue structure.  Each fragment
- * being reassembled is attached to one of these structures.
- */
-struct	ip6q {
-	struct ip6asfrag *ip6q_down;
-	struct ip6asfrag *ip6q_up;
-	uint32_t	ip6q_ident;
-	u_int8_t	ip6q_nxt;
-	u_int8_t	ip6q_ecn;
-	u_int8_t	ip6q_ttl;
-	struct in6_addr ip6q_src, ip6q_dst;
-	struct ip6q	*ip6q_next;
-	struct ip6q	*ip6q_prev;
-	int		ip6q_unfrglen;	/* len of unfragmentable part */
-#ifdef notyet
-	u_char		*ip6q_nxtp;
-#endif
-	int		ip6q_nfrag;	/* # of fragments */
-	struct label	*ip6q_label;
-};
-
-struct	ip6asfrag {
-	struct ip6asfrag *ip6af_down;
-	struct ip6asfrag *ip6af_up;
-	struct mbuf	*ip6af_m;
-	int		ip6af_offset;	/* offset in ip6af_m to next header */
-	int		ip6af_frglen;	/* fragmentable part length */
-	int		ip6af_off;	/* fragment offset */
-	u_int16_t	ip6af_mff;	/* more fragment bit in frag off */
-};
-
-#define IP6_REASS_MBUF(ip6af) (*(struct mbuf **)&((ip6af)->ip6af_m))
-
-/*
- * Structure attached to inpcb.in6p_moptions and
- * passed to ip6_output when IPv6 multicast options are in use.
- * This structure is lazy-allocated.
- */
-struct ip6_moptions {
-	struct	ifnet *im6o_multicast_ifp; /* ifp for outgoing multicasts */
-	u_char	im6o_multicast_hlim;	/* hoplimit for outgoing multicasts */
-	u_char	im6o_multicast_loop;	/* 1 >= hear sends if a member */
-	u_short	im6o_num_memberships;	/* no. memberships this socket */
-	u_short	im6o_max_memberships;	/* max memberships this socket */
-	struct	in6_multi **im6o_membership;	/* group memberships */
-	struct	in6_mfilter *im6o_mfilters;	/* source filters */
-};
-
-/*
- * Control options for outgoing packets
- */
-
-/* Routing header related info */
-struct	ip6po_rhinfo {
-	struct	ip6_rthdr *ip6po_rhi_rthdr; /* Routing header */
-	struct	route_in6 ip6po_rhi_route; /* Route to the 1st hop */
-};
-#define ip6po_rthdr	ip6po_rhinfo.ip6po_rhi_rthdr
-#define ip6po_route	ip6po_rhinfo.ip6po_rhi_route
-
-/* Nexthop related info */
-struct	ip6po_nhinfo {
-	struct	sockaddr *ip6po_nhi_nexthop;
-	struct	route_in6 ip6po_nhi_route; /* Route to the nexthop */
-};
-#define ip6po_nexthop	ip6po_nhinfo.ip6po_nhi_nexthop
-#define ip6po_nextroute	ip6po_nhinfo.ip6po_nhi_route
-
-struct	ip6_pktopts {
-	struct	mbuf *ip6po_m;	/* Pointer to mbuf storing the data */
-	int	ip6po_hlim;	/* Hoplimit for outgoing packets */
-
-	/* Outgoing IF/address information */
-	struct	in6_pktinfo *ip6po_pktinfo;
-
-	/* Next-hop address information */
-	struct	ip6po_nhinfo ip6po_nhinfo;
-
-	struct	ip6_hbh *ip6po_hbh; /* Hop-by-Hop options header */
-
-	/* Destination options header (before a routing header) */
-	struct	ip6_dest *ip6po_dest1;
-
-	/* Routing header related info. */
-	struct	ip6po_rhinfo ip6po_rhinfo;
-
-	/* Destination options header (after a routing header) */
-	struct	ip6_dest *ip6po_dest2;
-
-	int	ip6po_tclass;	/* traffic class */
-
-	int	ip6po_minmtu;  /* fragment vs PMTU discovery policy */
-#define IP6PO_MINMTU_MCASTONLY	-1 /* default; send at min MTU for multicast*/
-#define IP6PO_MINMTU_DISABLE	 0 /* always perform pmtu disc */
-#define IP6PO_MINMTU_ALL	 1 /* always send at min MTU */
-
-	int	ip6po_prefer_tempaddr;  /* whether temporary addresses are
-					   preferred as source address */
-#define IP6PO_TEMPADDR_SYSTEM	-1 /* follow the system default */
-#define IP6PO_TEMPADDR_NOTPREFER 0 /* not prefer temporary address */
-#define IP6PO_TEMPADDR_PREFER	 1 /* prefer temporary address */
-
-	int ip6po_flags;
-#if 0	/* parameters in this block is obsolete. do not reuse the values. */
-#define IP6PO_REACHCONF	0x01	/* upper-layer reachability confirmation. */
-#define IP6PO_MINMTU	0x02	/* use minimum MTU (IPV6_USE_MIN_MTU) */
-#endif
-#define IP6PO_DONTFRAG	0x04	/* disable fragmentation (IPV6_DONTFRAG) */
-#define IP6PO_USECOA	0x08	/* use care of address */
-};
-
-/*
- * Control options for incoming packets
- */
-
-struct	ip6stat {
-	uint64_t ip6s_total;		/* total packets received */
-	uint64_t ip6s_tooshort;		/* packet too short */
-	uint64_t ip6s_toosmall;		/* not enough data */
-	uint64_t ip6s_fragments;	/* fragments received */
-	uint64_t ip6s_fragdropped;	/* frags dropped(dups, out of space) */
-	uint64_t ip6s_fragtimeout;	/* fragments timed out */
-	uint64_t ip6s_fragoverflow;	/* fragments that exceeded limit */
-	uint64_t ip6s_forward;		/* packets forwarded */
-	uint64_t ip6s_cantforward;	/* packets rcvd for unreachable dest */
-	uint64_t ip6s_redirectsent;	/* packets forwarded on same net */
-	uint64_t ip6s_delivered;	/* datagrams delivered to upper level*/
-	uint64_t ip6s_localout;		/* total ip packets generated here */
-	uint64_t ip6s_odropped;		/* lost packets due to nobufs, etc. */
-	uint64_t ip6s_reassembled;	/* total packets reassembled ok */
-	uint64_t ip6s_fragmented;	/* datagrams successfully fragmented */
-	uint64_t ip6s_ofragments;	/* output fragments created */
-	uint64_t ip6s_cantfrag;		/* don't fragment flag was set, etc. */
-	uint64_t ip6s_badoptions;	/* error in option processing */
-	uint64_t ip6s_noroute;		/* packets discarded due to no route */
-	uint64_t ip6s_badvers;		/* ip6 version != 6 */
-	uint64_t ip6s_rawout;		/* total raw ip packets generated */
-	uint64_t ip6s_badscope;		/* scope error */
-	uint64_t ip6s_notmember;	/* don't join this multicast group */
-#define	IP6S_HDRCNT		256	/* headers count */
-	uint64_t ip6s_nxthist[IP6S_HDRCNT]; /* next header history */
-	uint64_t ip6s_m1;		/* one mbuf */
-#define	IP6S_M2MMAX		32
-	uint64_t ip6s_m2m[IP6S_M2MMAX];	/* two or more mbuf */
-	uint64_t ip6s_mext1;		/* one ext mbuf */
-	uint64_t ip6s_mext2m;		/* two or more ext mbuf */
-	uint64_t ip6s_exthdrtoolong;	/* ext hdr are not contiguous */
-	uint64_t ip6s_nogif;		/* no match gif found */
-	uint64_t ip6s_toomanyhdr;	/* discarded due to too many headers */
-
-	/*
-	 * statistics for improvement of the source address selection
-	 * algorithm:
-	 * XXX: hardcoded 16 = # of ip6 multicast scope types + 1
-	 */
-#define	IP6S_RULESMAX		16
-#define	IP6S_SCOPECNT		16
-	/* number of times that address selection fails */
-	uint64_t ip6s_sources_none;
-	/* number of times that an address on the outgoing I/F is chosen */
-	uint64_t ip6s_sources_sameif[IP6S_SCOPECNT];
-	/* number of times that an address on a non-outgoing I/F is chosen */
-	uint64_t ip6s_sources_otherif[IP6S_SCOPECNT];
-	/*
-	 * number of times that an address that has the same scope
-	 * from the destination is chosen.
-	 */
-	uint64_t ip6s_sources_samescope[IP6S_SCOPECNT];
-	/*
-	 * number of times that an address that has a different scope
-	 * from the destination is chosen.
-	 */
-	uint64_t ip6s_sources_otherscope[IP6S_SCOPECNT];
-	/* number of times that a deprecated address is chosen */
-	uint64_t ip6s_sources_deprecated[IP6S_SCOPECNT];
-
-	/* number of times that each rule of source selection is applied. */
-	uint64_t ip6s_sources_rule[IP6S_RULESMAX];
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_PCPUSTAT_DECLARE(struct ip6stat, ip6stat);
-#define	IP6STAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct ip6stat, ip6stat, name, (val))
-#define	IP6STAT_SUB(name, val)	IP6STAT_ADD(name, -(val))
-#define	IP6STAT_INC(name)	IP6STAT_ADD(name, 1)
-#define	IP6STAT_DEC(name)	IP6STAT_SUB(name, 1)
-#endif
-
-#ifdef _KERNEL
-/*
- * IPv6 onion peeling state.
- * it will be initialized when we come into ip6_input().
- * XXX do not make it a kitchen sink!
- */
-struct ip6aux {
-	uint32_t ip6a_flags;
-#define IP6A_SWAP	0x01		/* swapped home/care-of on packet */
-#define IP6A_HASEEN	0x02		/* HA was present */
-#define IP6A_BRUID	0x04		/* BR Unique Identifier was present */
-#define IP6A_RTALERTSEEN 0x08		/* rtalert present */
-
-	/* ip6.ip6_src */
-	struct in6_addr ip6a_careof;	/* care-of address of the peer */
-	struct in6_addr ip6a_home;	/* home address of the peer */
-	u_int16_t	ip6a_bruid;	/* BR unique identifier */
-
-	/* ip6.ip6_dst */
-	struct in6_ifaddr *ip6a_dstia6;	/* my ifaddr that matches ip6_dst */
-
-	/* rtalert */
-	u_int16_t ip6a_rtalert;		/* rtalert option value */
-
-	/*
-	 * decapsulation history will be here.
-	 * with IPsec it may not be accurate.
-	 */
-};
-#endif
-
-#ifdef _KERNEL
-/* flags passed to ip6_output as last parameter */
-#define	IPV6_UNSPECSRC		0x01	/* allow :: as the source address */
-#define	IPV6_FORWARDING		0x02	/* most of IPv6 header exists */
-#define	IPV6_MINMTU		0x04	/* use minimum MTU (IPV6_USE_MIN_MTU) */
-
-#ifdef __NO_STRICT_ALIGNMENT
-#define IP6_HDR_ALIGNED_P(ip)	1
-#else
-#define IP6_HDR_ALIGNED_P(ip)	((((intptr_t) (ip)) & 3) == 0)
-#endif
-
-VNET_DECLARE(int, ip6_defhlim);		/* default hop limit */
-VNET_DECLARE(int, ip6_defmcasthlim);	/* default multicast hop limit */
-VNET_DECLARE(int, ip6_forwarding);	/* act as router? */
-VNET_DECLARE(int, ip6_use_deprecated);	/* allow deprecated addr as source */
-VNET_DECLARE(int, ip6_rr_prune);	/* router renumbering prefix
-					 * walk list every 5 sec.    */
-VNET_DECLARE(int, ip6_mcast_pmtu);	/* enable pMTU discovery for multicast? */
-VNET_DECLARE(int, ip6_v6only);
-#define	V_ip6_defhlim			VNET(ip6_defhlim)
-#define	V_ip6_defmcasthlim		VNET(ip6_defmcasthlim)
-#define	V_ip6_forwarding		VNET(ip6_forwarding)
-#define	V_ip6_use_deprecated		VNET(ip6_use_deprecated)
-#define	V_ip6_rr_prune			VNET(ip6_rr_prune)
-#define	V_ip6_mcast_pmtu		VNET(ip6_mcast_pmtu)
-#define	V_ip6_v6only			VNET(ip6_v6only)
-
-VNET_DECLARE(struct socket *, ip6_mrouter);	/* multicast routing daemon */
-VNET_DECLARE(int, ip6_sendredirects);	/* send IP redirects when forwarding? */
-VNET_DECLARE(int, ip6_maxfragpackets);	/* Maximum packets in reassembly
-					 * queue */
-VNET_DECLARE(int, ip6_maxfrags);	/* Maximum fragments in reassembly
-					 * queue */
-VNET_DECLARE(int, ip6_accept_rtadv);	/* Acts as a host not a router */
-VNET_DECLARE(int, ip6_no_radr);		/* No defroute from RA */
-VNET_DECLARE(int, ip6_norbit_raif);	/* Disable R-bit in NA on RA
-					 * receiving IF. */
-VNET_DECLARE(int, ip6_rfc6204w3);	/* Accept defroute from RA even when
-					   forwarding enabled */
-VNET_DECLARE(int, ip6_keepfaith);	/* Firewall Aided Internet Translator */
-VNET_DECLARE(int, ip6_log_interval);
-VNET_DECLARE(time_t, ip6_log_time);
-VNET_DECLARE(int, ip6_hdrnestlimit);	/* upper limit of # of extension
-					 * headers */
-VNET_DECLARE(int, ip6_dad_count);	/* DupAddrDetectionTransmits */
-#define	V_ip6_mrouter			VNET(ip6_mrouter)
-#define	V_ip6_sendredirects		VNET(ip6_sendredirects)
-#define	V_ip6_maxfragpackets		VNET(ip6_maxfragpackets)
-#define	V_ip6_maxfrags			VNET(ip6_maxfrags)
-#define	V_ip6_accept_rtadv		VNET(ip6_accept_rtadv)
-#define	V_ip6_no_radr			VNET(ip6_no_radr)
-#define	V_ip6_norbit_raif		VNET(ip6_norbit_raif)
-#define	V_ip6_rfc6204w3			VNET(ip6_rfc6204w3)
-#define	V_ip6_keepfaith			VNET(ip6_keepfaith)
-#define	V_ip6_log_interval		VNET(ip6_log_interval)
-#define	V_ip6_log_time			VNET(ip6_log_time)
-#define	V_ip6_hdrnestlimit		VNET(ip6_hdrnestlimit)
-#define	V_ip6_dad_count			VNET(ip6_dad_count)
-
-VNET_DECLARE(int, ip6_auto_flowlabel);
-VNET_DECLARE(int, ip6_auto_linklocal);
-#define	V_ip6_auto_flowlabel		VNET(ip6_auto_flowlabel)
-#define	V_ip6_auto_linklocal		VNET(ip6_auto_linklocal)
-
-VNET_DECLARE(int, ip6_use_tempaddr);	/* Whether to use temporary addresses */
-VNET_DECLARE(int, ip6_prefer_tempaddr);	/* Whether to prefer temporary
-					 * addresses in the source address
-					 * selection */
-#define	V_ip6_use_tempaddr		VNET(ip6_use_tempaddr)
-#define	V_ip6_prefer_tempaddr		VNET(ip6_prefer_tempaddr)
-
-VNET_DECLARE(int, ip6_use_defzone);	/* Whether to use the default scope
-					 * zone when unspecified */
-#define	V_ip6_use_defzone		VNET(ip6_use_defzone)
-
-VNET_DECLARE (struct pfil_head, inet6_pfil_hook);	/* packet filter hooks */
-#define	V_inet6_pfil_hook	VNET(inet6_pfil_hook)
-#ifdef IPSTEALTH
-VNET_DECLARE(int, ip6stealth);
-#define	V_ip6stealth			VNET(ip6stealth)
-#endif
-
-extern struct	pr_usrreqs rip6_usrreqs;
-struct sockopt;
-
-struct inpcb;
-
-int	icmp6_ctloutput(struct socket *, struct sockopt *sopt);
-
-struct in6_ifaddr;
-void	ip6_init(void);
-#ifdef VIMAGE
-void	ip6_destroy(void);
-#endif
-int	ip6proto_register(short);
-int	ip6proto_unregister(short);
-
-void	ip6_input(struct mbuf *);
-struct in6_ifaddr *ip6_getdstifaddr(struct mbuf *);
-void	ip6_freepcbopts(struct ip6_pktopts *);
-
-int	ip6_unknown_opt(u_int8_t *, struct mbuf *, int);
-char *	ip6_get_prevhdr(struct mbuf *, int);
-int	ip6_nexthdr(struct mbuf *, int, int, int *);
-int	ip6_lasthdr(struct mbuf *, int, int, int *);
-
-#ifdef __notyet__
-struct ip6aux *ip6_findaux(struct mbuf *);
-#endif
-
-extern int	(*ip6_mforward)(struct ip6_hdr *, struct ifnet *,
-    struct mbuf *);
-
-int	ip6_process_hopopts(struct mbuf *, u_int8_t *, int, uint32_t *,
-				 uint32_t *);
-struct mbuf	**ip6_savecontrol_v4(struct inpcb *, struct mbuf *,
-	    struct mbuf **, int *);
-void	ip6_savecontrol(struct inpcb *, struct mbuf *, struct mbuf **);
-void	ip6_notify_pmtu(struct inpcb *, struct sockaddr_in6 *, uint32_t);
-int	ip6_sysctl(int *, u_int, void *, size_t *, void *, size_t);
-
-void	ip6_forward(struct mbuf *, int);
-
-void	ip6_mloopback(struct ifnet *, struct mbuf *, struct sockaddr_in6 *);
-int	ip6_output(struct mbuf *, struct ip6_pktopts *,
-			struct route_in6 *,
-			int,
-			struct ip6_moptions *, struct ifnet **,
-			struct inpcb *);
-int	ip6_ctloutput(struct socket *, struct sockopt *);
-int	ip6_raw_ctloutput(struct socket *, struct sockopt *);
-void	ip6_initpktopts(struct ip6_pktopts *);
-int	ip6_setpktopts(struct mbuf *, struct ip6_pktopts *,
-	struct ip6_pktopts *, struct ucred *, int);
-void	ip6_clearpktopts(struct ip6_pktopts *, int);
-struct ip6_pktopts *ip6_copypktopts(struct ip6_pktopts *, int);
-int	ip6_optlen(struct inpcb *);
-int	ip6_deletefraghdr(struct mbuf *, int, int);
-int	ip6_fragment(struct ifnet *, struct mbuf *, int, u_char, int,
-			uint32_t);
-
-int	route6_input(struct mbuf **, int *, int);
-
-void	frag6_init(void);
-int	frag6_input(struct mbuf **, int *, int);
-void	frag6_slowtimo(void);
-void	frag6_drain(void);
-
-void	rip6_init(void);
-int	rip6_input(struct mbuf **, int *, int);
-void	rip6_ctlinput(int, struct sockaddr *, void *);
-int	rip6_ctloutput(struct socket *, struct sockopt *);
-int	rip6_output(struct mbuf *, ...);
-int	rip6_usrreq(struct socket *,
-	    int, struct mbuf *, struct mbuf *, struct mbuf *, struct thread *);
-
-int	dest6_input(struct mbuf **, int *, int);
-int	none_input(struct mbuf **, int *, int);
-
-int	in6_selectsrc(struct sockaddr_in6 *, struct ip6_pktopts *,
-	struct inpcb *inp, struct route_in6 *, struct ucred *cred,
-	struct ifnet **, struct in6_addr *);
-int in6_selectroute(struct sockaddr_in6 *, struct ip6_pktopts *,
-	struct ip6_moptions *, struct route_in6 *, struct ifnet **,
-	struct rtentry **);
-int	in6_selectroute_fib(struct sockaddr_in6 *, struct ip6_pktopts *,
-	    struct ip6_moptions *, struct route_in6 *, struct ifnet **,
-	    struct rtentry **, u_int);
-uint32_t ip6_randomid(void);
-uint32_t ip6_randomflowlabel(void);
-void in6_delayed_cksum(struct mbuf *m, uint32_t plen, u_short offset);
-#endif /* _KERNEL */
-
-#endif /* !_NETINET6_IP6_VAR_H_ */
diff --git a/include.new/netinet6/ip6protosw.h b/include.new/netinet6/ip6protosw.h
deleted file mode 100644
index 1159104..0000000
--- a/include.new/netinet6/ip6protosw.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: ip6protosw.h,v 1.25 2001/09/26 06:13:03 keiichi Exp $
- */
-
-/*-
- * 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.
- * 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.
- *
- *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- *	BSDI protosw.h,v 2.3 1996/10/11 16:02:40 pjd Exp
- * $FreeBSD: releng/10.2/sys/netinet6/ip6protosw.h 241916 2012-10-22 21:49:56Z delphij $
- */
-
-#ifndef _NETINET6_IP6PROTOSW_H_
-#define _NETINET6_IP6PROTOSW_H_
-
-/*
- * Protocol switch table for IPv6.
- * All other definitions should refer to sys/protosw.h
- */
-
-struct mbuf;
-struct sockaddr;
-struct socket;
-struct domain;
-struct thread;
-struct ip6_hdr;
-struct icmp6_hdr;
-struct in6_addr;
-struct pr_usrreqs;
-
-/*
- * argument type for the last arg of pr_ctlinput().
- * should be consulted only with AF_INET6 family.
- *
- * IPv6 ICMP IPv6 [exthdrs] finalhdr payload
- * ^    ^    ^              ^
- * |    |    ip6c_ip6       ip6c_off
- * |    ip6c_icmp6
- * ip6c_m
- *
- * ip6c_finaldst usually points to ip6c_ip6->ip6_dst.  if the original
- * (internal) packet carries a routing header, it may point the final
- * dstination address in the routing header.
- *
- * ip6c_src: ip6c_ip6->ip6_src + scope info + flowlabel in ip6c_ip6
- *	(beware of flowlabel, if you try to compare it against others)
- * ip6c_dst: ip6c_finaldst + scope info
- */
-struct ip6ctlparam {
-	struct mbuf *ip6c_m;		/* start of mbuf chain */
-	struct icmp6_hdr *ip6c_icmp6;	/* icmp6 header of target packet */
-	struct ip6_hdr *ip6c_ip6;	/* ip6 header of target packet */
-	int ip6c_off;			/* offset of the target proto header */
-	struct sockaddr_in6 *ip6c_src;	/* srcaddr w/ additional info */
-	struct sockaddr_in6 *ip6c_dst;	/* (final) dstaddr w/ additional info */
-	struct in6_addr *ip6c_finaldst;	/* final destination address */
-	void *ip6c_cmdarg;		/* control command dependent data */
-	u_int8_t ip6c_nxt;		/* final next header field */
-};
-
-struct ip6protosw {
-	short	pr_type;		/* socket type used for */
-	struct	domain *pr_domain;	/* domain protocol a member of */
-	short	pr_protocol;		/* protocol number */
-	short	pr_flags;		/* see below */
-
-/* protocol-protocol hooks */
-	int	(*pr_input)		/* input to protocol (from below) */
-			(struct mbuf **, int *, int);
-	int	(*pr_output)		/* output to protocol (from above) */
-			(struct mbuf *, ...);
-	void	(*pr_ctlinput)		/* control input (from below) */
-			(int, struct sockaddr *, void *);
-	int	(*pr_ctloutput)		/* control output (from above) */
-			(struct socket *, struct sockopt *);
-
-/* utility hooks */
-	void	(*pr_init)		/* initialization hook */
-			(void);
-	void	(*pr_destroy)		/* cleanup hook */
-			(void);
-
-	void	(*pr_fasttimo)		/* fast timeout (200ms) */
-			(void);
-	void	(*pr_slowtimo)		/* slow timeout (500ms) */
-			(void);
-	void	(*pr_drain)		/* flush any excess space possible */
-			(void);
-	struct	pr_usrreqs *pr_usrreqs;	/* supersedes pr_usrreq() */
-};
-
-#ifdef _KERNEL
-extern struct ip6protosw inet6sw[];
-#endif
-
-#endif /* !_NETINET6_IP6PROTOSW_H_ */
diff --git a/include.new/netinet6/ipcomp.h b/include.new/netinet6/ipcomp.h
deleted file mode 100644
index 5398622..0000000
--- a/include.new/netinet6/ipcomp.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ipcomp.h,v 1.5 2005/01/07 02:30:34 imp Exp $	*/
-/*	$KAME: ipcomp.h,v 1.11 2001/09/04 08:43:19 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * RFC2393 IP payload compression protocol (IPComp).
- */
-
-#ifndef _NETINET6_IPCOMP_H_
-#define _NETINET6_IPCOMP_H_
-
-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_inet.h"
-#endif
-
-struct ipcomp {
-	u_int8_t comp_nxt;	/* Next Header */
-	u_int8_t comp_flags;	/* reserved, must be zero */
-	u_int16_t comp_cpi;	/* Compression parameter index */
-};
-
-/* well-known algorithm number (in CPI), from RFC2409 */
-#define IPCOMP_OUI	1	/* vendor specific */
-#define IPCOMP_DEFLATE	2	/* RFC2394 */
-#define IPCOMP_LZS	3	/* RFC2395 */
-#define IPCOMP_MAX	4
-
-#define IPCOMP_CPI_NEGOTIATE_MIN	256
-
-#ifdef _KERNEL
-struct ipcomp_algorithm {
-	int (*compress) __P((struct mbuf *, struct mbuf *, size_t *));
-	int (*decompress) __P((struct mbuf *, struct mbuf *, size_t *));
-	size_t minplen;		/* minimum required length for compression */
-};
-
-struct ipsecrequest;
-extern const struct ipcomp_algorithm *ipcomp_algorithm_lookup __P((int));
-extern void ipcomp4_input __P((struct mbuf *, int));
-extern int ipcomp4_output __P((struct mbuf *, struct ipsecrequest *));
-#endif /* KERNEL */
-
-#endif /* _NETINET6_IPCOMP_H_ */
diff --git a/include.new/netinet6/ipcomp6.h b/include.new/netinet6/ipcomp6.h
deleted file mode 100644
index f53c4a2..0000000
--- a/include.new/netinet6/ipcomp6.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ipcomp6.h,v 1.3 2005/01/07 02:30:34 imp Exp $	*/
-/*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * RFC2393 IP payload compression protocol (IPComp).
- */
-
-#ifndef _NETINET6_IPCOMP6_H_
-#define _NETINET6_IPCOMP6_H_
-
-#ifdef _KERNEL
-extern int ipcomp6_input __P((struct mbuf **, int *, int));
-extern int ipcomp6_output __P((struct mbuf *, u_char *, struct mbuf *,
-	struct ipsecrequest *));
-#endif /*KERNEL*/
-
-#endif /*_NETINET6_IPCOMP6_H_*/
diff --git a/include.new/netinet6/ipsec.h b/include.new/netinet6/ipsec.h
deleted file mode 100644
index 2600753..0000000
--- a/include.new/netinet6/ipsec.h
+++ /dev/null
@@ -1,388 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ipsec.h,v 1.18 2005/01/07 02:30:35 imp Exp $	*/
-/*	$KAME: ipsec.h,v 1.69 2003/09/10 23:49:11 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * IPsec controller part.
- */
-
-#ifndef _NETINET6_IPSEC_H_
-#define _NETINET6_IPSEC_H_
-
-#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE)
-#include "opt_inet.h"
-#include "opt_ipsec.h"
-#endif
-
-#include <net/pfkeyv2.h>
-#include <netkey/keydb.h>
-
-#ifdef _KERNEL
-
-/*
- * Security Policy Index
- * Ensure that both address families in the "src" and "dst" are same.
- * When the value of the ul_proto is ICMPv6, the port field in "src"
- * specifies ICMPv6 type, and the port field in "dst" specifies ICMPv6 code.
- */
-struct secpolicyindex {
-	struct sockaddr_storage src;	/* IP src address for SP */
-	struct sockaddr_storage dst;	/* IP dst address for SP */
-	u_int8_t prefs;			/* prefix length in bits for src */
-	u_int8_t prefd;			/* prefix length in bits for dst */
-	u_int16_t ul_proto;		/* upper layer Protocol */
-#ifdef notyet
-	uid_t uids;
-	uid_t uidd;
-	gid_t gids;
-	gid_t gidd;
-#endif
-};
-
-/* Security Policy Data Base */
-struct secpolicy {
-	TAILQ_ENTRY(secpolicy) tailq;	/* all SPD entries, both pcb/table */
-	LIST_ENTRY(secpolicy) chain;	/* SPD entries on table */
-
-	u_int8_t dir;			/* direction of packet flow */
-	int readonly;			/* write prohibited */
-	int persist;			/* will never be removed */
-	int refcnt;			/* reference count */
-	struct secpolicyindex *spidx;	/* selector - NULL if not valid */
-	uint32_t id;			/* it identifies a policy in the SPD. */
-#define IPSEC_MANUAL_POLICYID_MAX	0x3fff
-				/*
-				 * 1 - 0x3fff are reserved for user operation.
-				 * 0 are reserved.  Others are for kernel use.
-				 */
-	struct socket *so;		/* backpointer to per-socket policy */
-	u_int state;			/* 0: dead, others: alive */
-#define IPSEC_SPSTATE_DEAD	0
-#define IPSEC_SPSTATE_ALIVE	1
-
-	int policy;		/* DISCARD, NONE or IPSEC, see below */
-	struct ipsecrequest *req;
-				/* pointer to the ipsec request tree, */
-				/* if policy == IPSEC else this value == NULL.*/
-
-	/*
-	 * lifetime handler.
-	 * the policy can be used without limitiation if both lifetime and
-	 * validtime are zero.
-	 * "lifetime" is passed by sadb_lifetime.sadb_lifetime_addtime.
-	 * "validtime" is passed by sadb_lifetime.sadb_lifetime_usetime.
-	 */
-	long created;		/* time created the policy */
-	long lastused;		/* updated every when kernel sends a packet */
-	long lifetime;		/* duration of the lifetime of this policy */
-	long validtime;		/* duration this policy is valid without use */
-};
-
-/* Request for IPsec */
-struct ifnet;
-struct ipsecrequest {
-	struct ipsecrequest *next;
-				/* pointer to next structure */
-				/* If NULL, it means the end of chain. */
-	struct secasindex saidx;/* hint for search proper SA */
-				/* if __ss_len == 0 then no address specified.*/
-	u_int level;		/* IPsec level defined below. */
-
-	struct secasvar *sav;	/* place holder of SA for use */
-	struct secpolicy *sp;	/* back pointer to SP */
-
-	struct ifnet *tunifp;	/* interface for tunnelling */
-};
-
-/* security policy in PCB */
-struct inpcbpolicy {
-	struct secpolicy *sp_in;
-	struct secpolicy *sp_out;
-	int priv;			/* privileged socket ? */
-
-	/* cached policy */
-	/* XXX 3 == IPSEC_DIR_MAX */
-	struct secpolicy *cache[3];
-	struct secpolicyindex cacheidx[3];
-	int cachegen[3]; 	/* cache generation #, the time we filled it */
-	int cacheflags;
-#define IPSEC_PCBSP_CONNECTED	1
-};
-
-/* SP acquiring list table. */
-struct secspacq {
-	LIST_ENTRY(secspacq) chain;
-
-	struct secpolicyindex spidx;
-
-	long created;		/* for lifetime */
-	int count;		/* for lifetime */
-	/* XXX: here is mbuf place holder to be sent ? */
-};
-
-struct ipsecaux {
-	int hdrs;	/* # of ipsec headers */
-};
-#endif /* _KERNEL */
-
-/* according to IANA assignment, port 0x0000 and proto 0xff are reserved. */
-#define IPSEC_PORT_ANY		0
-#define IPSEC_ULPROTO_ANY	255
-#define IPSEC_PROTO_ANY		255
-
-/* mode of security protocol */
-/* NOTE: DON'T use IPSEC_MODE_ANY at SPD.  It's only use in SAD */
-#define	IPSEC_MODE_ANY		0	/* i.e. wildcard. */
-#define	IPSEC_MODE_TRANSPORT	1
-#define	IPSEC_MODE_TUNNEL	2
-#define	IPSEC_MODE_TCPMD5	3	/* TCP MD5 mode */
-
-/*
- * Direction of security policy.
- * NOTE: Since INVALID is used just as flag.
- * The other are used for loop counter too.
- */
-#define IPSEC_DIR_ANY		0
-#define IPSEC_DIR_INBOUND	1
-#define IPSEC_DIR_OUTBOUND	2
-#define IPSEC_DIR_MAX		3
-#define IPSEC_DIR_INVALID	4
-
-/* Policy level */
-/*
- * IPSEC, ENTRUST and BYPASS are allowed for setsockopt() in PCB,
- * DISCARD, IPSEC and NONE are allowed for setkey() in SPD.
- * DISCARD and NONE are allowed for system default.
- */
-#define IPSEC_POLICY_DISCARD	0	/* discard the packet */
-#define IPSEC_POLICY_NONE	1	/* bypass IPsec engine */
-#define IPSEC_POLICY_IPSEC	2	/* pass to IPsec */
-#define IPSEC_POLICY_ENTRUST	3	/* consulting SPD if present. */
-#define IPSEC_POLICY_BYPASS	4	/* only for privileged socket. */
-#define IPSEC_POLICY_TCP	5	/* TCP MD5 policy */
-
-/* Security protocol level */
-#define	IPSEC_LEVEL_DEFAULT	0	/* reference to system default */
-#define	IPSEC_LEVEL_USE		1	/* use SA if present. */
-#define	IPSEC_LEVEL_REQUIRE	2	/* require SA. */
-#define	IPSEC_LEVEL_UNIQUE	3	/* unique SA. */
-
-#define IPSEC_MANUAL_REQID_MAX	0x3fff
-				/*
-				 * if security policy level == unique, this id
-				 * indicate to a relative SA for use, else is
-				 * zero.
-				 * 1 - 0x3fff are reserved for manual keying.
-				 * 0 are reserved for above reason.  Others is
-				 * for kernel use.
-				 * Note that this id doesn't identify SA
-				 * by only itself.
-				 */
-#define IPSEC_REPLAYWSIZE  32
-
-/* statistics for ipsec processing */
-struct ipsecstat {
-	u_quad_t in_success;  /* succeeded inbound process */
-	u_quad_t in_polvio;
-			/* security policy violation for inbound process */
-	u_quad_t in_nosa;     /* inbound SA is unavailable */
-	u_quad_t in_inval;    /* inbound processing failed due to EINVAL */
-	u_quad_t in_nomem;    /* inbound processing failed due to ENOBUFS */
-	u_quad_t in_badspi;   /* failed getting a SPI */
-	u_quad_t in_ahreplay; /* AH replay check failed */
-	u_quad_t in_espreplay; /* ESP replay check failed */
-	u_quad_t in_ahauthsucc; /* AH authentication success */
-	u_quad_t in_ahauthfail; /* AH authentication failure */
-	u_quad_t in_espauthsucc; /* ESP authentication success */
-	u_quad_t in_espauthfail; /* ESP authentication failure */
-	u_quad_t in_esphist[256];
-	u_quad_t in_ahhist[256];
-	u_quad_t in_comphist[256];
-	u_quad_t out_success; /* succeeded outbound process */
-	u_quad_t out_polvio;
-			/* security policy violation for outbound process */
-	u_quad_t out_nosa;    /* outbound SA is unavailable */
-	u_quad_t out_inval;   /* outbound process failed due to EINVAL */
-	u_quad_t out_nomem;    /* inbound processing failed due to ENOBUFS */
-	u_quad_t out_noroute; /* there is no route */
-	u_quad_t out_esphist[256];
-	u_quad_t out_ahhist[256];
-	u_quad_t out_comphist[256];
-
-	u_quad_t spdcachelookup;
-	u_quad_t spdcachemiss;
-};
-
-/*
- * Definitions for IPsec & Key sysctl operations.
- */
-/*
- * Names for IPsec & Key sysctl objects
- */
-#define IPSECCTL_STATS			1	/* stats */
-#define IPSECCTL_DEF_POLICY		2
-#define IPSECCTL_DEF_ESP_TRANSLEV	3	/* int; ESP transport mode */
-#define IPSECCTL_DEF_ESP_NETLEV		4	/* int; ESP tunnel mode */
-#define IPSECCTL_DEF_AH_TRANSLEV	5	/* int; AH transport mode */
-#define IPSECCTL_DEF_AH_NETLEV		6	/* int; AH tunnel mode */
-#if 0	/* obsolete, do not reuse */
-#define IPSECCTL_INBOUND_CALL_IKE	7
-#endif
-#define	IPSECCTL_AH_CLEARTOS		8
-#define	IPSECCTL_AH_OFFSETMASK		9
-#define	IPSECCTL_DFBIT			10
-#define	IPSECCTL_ECN			11
-#define	IPSECCTL_DEBUG			12
-#define	IPSECCTL_ESP_RANDPAD		13
-#define IPSECCTL_MAXID			14
-
-#define IPSECCTL_NAMES { \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "def_policy", CTLTYPE_INT }, \
-	{ "esp_trans_deflev", CTLTYPE_INT }, \
-	{ "esp_net_deflev", CTLTYPE_INT }, \
-	{ "ah_trans_deflev", CTLTYPE_INT }, \
-	{ "ah_net_deflev", CTLTYPE_INT }, \
-	{ 0, 0 }, \
-	{ "ah_cleartos", CTLTYPE_INT }, \
-	{ "ah_offsetmask", CTLTYPE_INT }, \
-	{ "dfbit", CTLTYPE_INT }, \
-	{ "ecn", CTLTYPE_INT }, \
-	{ "debug", CTLTYPE_INT }, \
-	{ "esp_randpad", CTLTYPE_INT }, \
-}
-
-#define IPSEC6CTL_NAMES { \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "def_policy", CTLTYPE_INT }, \
-	{ "esp_trans_deflev", CTLTYPE_INT }, \
-	{ "esp_net_deflev", CTLTYPE_INT }, \
-	{ "ah_trans_deflev", CTLTYPE_INT }, \
-	{ "ah_net_deflev", CTLTYPE_INT }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "ecn", CTLTYPE_INT }, \
-	{ "debug", CTLTYPE_INT }, \
-	{ "esp_randpad", CTLTYPE_INT }, \
-}
-
-#ifdef _KERNEL
-struct ipsec_output_state {
-	struct mbuf *m;
-	struct route *ro;
-	struct sockaddr *dst;
-	int encap;
-};
-
-struct ipsec_history {
-	int ih_proto;
-	uint32_t ih_spi;
-};
-
-extern int ipsec_debug;
-
-#ifdef INET
-extern struct ipsecstat ipsecstat;
-extern struct secpolicy *ip4_def_policy;
-extern int ip4_esp_trans_deflev;
-extern int ip4_esp_net_deflev;
-extern int ip4_ah_trans_deflev;
-extern int ip4_ah_net_deflev;
-extern int ip4_ah_cleartos;
-extern int ip4_ah_offsetmask;
-extern int ip4_ipsec_dfbit;
-extern int ip4_ipsec_ecn;
-extern int ip4_esp_randpad;
-#endif
-
-#define ipseclog(x)	do { if (ipsec_debug) log x; } while (/*CONSTCOND*/ 0)
-
-extern int ipsec_pcbconn __P((struct inpcbpolicy *));
-extern int ipsec_pcbdisconn __P((struct inpcbpolicy *));
-extern int ipsec_invalpcbcacheall __P((void));
-
-struct inpcb;
-extern struct secpolicy *ipsec4_getpolicybypcb
-	__P((struct mbuf *, u_int, struct inpcb *, int *));
-extern struct secpolicy *ipsec4_getpolicybyaddr
-	__P((struct mbuf *, u_int, int, int *));
-
-extern int ipsec_init_pcbpolicy __P((struct socket *, struct inpcbpolicy **));
-extern int ipsec_copy_pcbpolicy
-	__P((struct inpcbpolicy *, struct inpcbpolicy *));
-extern u_int ipsec_get_reqlevel __P((struct ipsecrequest *, int));
-
-extern int ipsec4_set_policy __P((struct inpcb *, int, caddr_t, size_t, int));
-extern int ipsec4_get_policy __P((struct inpcb *, caddr_t, size_t,
-	struct mbuf **));
-extern int ipsec4_delete_pcbpolicy __P((struct inpcb *));
-extern int ipsec4_in_reject __P((struct mbuf *, struct inpcb *));
-
-struct secas;
-struct tcpcb;
-struct tcp6cb;
-extern int ipsec_chkreplay __P((uint32_t, struct secasvar *));
-extern int ipsec_updatereplay __P((uint32_t, struct secasvar *));
-
-extern size_t ipsec4_hdrsiz __P((struct mbuf *, u_int, struct inpcb *));
-extern size_t ipsec_hdrsiz_tcp __P((struct tcpcb *));
-
-struct ip;
-extern const char *ipsec4_logpacketstr __P((struct ip *, uint32_t));
-extern const char *ipsec_logsastr __P((struct secasvar *));
-
-extern void ipsec_dumpmbuf __P((struct mbuf *));
-
-extern int ipsec4_output __P((struct ipsec_output_state *, struct secpolicy *,
-	int));
-extern int ipsec4_tunnel_validate __P((struct mbuf *, int, u_int,
-	struct secasvar *));
-extern struct mbuf *ipsec_copypkt __P((struct mbuf *));
-extern void ipsec_delaux __P((struct mbuf *));
-extern int ipsec_addhist __P((struct mbuf *, int, uint32_t));
-extern int ipsec_getnhist __P((struct mbuf *));
-extern void ipsec_clearhist __P((struct mbuf *));
-
-#endif /* _KERNEL */
-
-#ifndef _KERNEL
-extern caddr_t ipsec_set_policy __P((char *, int));
-extern int ipsec_get_policylen __P((caddr_t));
-extern char *ipsec_dump_policy __P((caddr_t, char *));
-
-extern const char *ipsec_strerror __P((void));
-#endif /* !_KERNEL */
-
-#endif /* _NETINET6_IPSEC_H_ */
diff --git a/include.new/netinet6/ipsec6.h b/include.new/netinet6/ipsec6.h
deleted file mode 100644
index 2ae9906..0000000
--- a/include.new/netinet6/ipsec6.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*	$FreeBSD: src/sys/netinet6/ipsec6.h,v 1.10 2005/01/07 02:30:35 imp Exp $	*/
-/*	$KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * IPsec controller part.
- */
-
-#ifndef _NETINET6_IPSEC6_H_
-#define _NETINET6_IPSEC6_H_
-
-#include <net/pfkeyv2.h>
-#include <netkey/keydb.h>
-
-#ifdef _KERNEL
-extern struct ipsecstat ipsec6stat;
-extern struct secpolicy *ip6_def_policy;
-extern int ip6_esp_trans_deflev;
-extern int ip6_esp_net_deflev;
-extern int ip6_ah_trans_deflev;
-extern int ip6_ah_net_deflev;
-extern int ip6_ipsec_ecn;
-extern int ip6_esp_randpad;
-
-struct inpcb;
-extern struct secpolicy *ipsec6_getpolicybypcb
-	__P((struct mbuf *, u_int, struct inpcb *, int *));
-extern struct secpolicy *ipsec6_getpolicybyaddr
-	__P((struct mbuf *, u_int, int, int *));
-
-extern int ipsec6_delete_pcbpolicy __P((struct inpcb *));
-extern int ipsec6_set_policy __P((struct inpcb *, int, caddr_t, size_t, int));
-extern int ipsec6_get_policy __P((struct inpcb *, caddr_t, size_t,
-	struct mbuf **));
-extern int ipsec6_in_reject __P((struct mbuf *, struct inpcb *));
-
-struct tcp6cb;
-
-extern size_t ipsec6_hdrsiz __P((struct mbuf *, u_int, struct inpcb *));
-
-struct ip6_hdr;
-extern const char *ipsec6_logpacketstr __P((struct ip6_hdr *, uint32_t));
-
-extern int ipsec6_output_trans __P((struct ipsec_output_state *, u_char *,
-	struct mbuf *, struct secpolicy *, int, int *));
-extern int ipsec6_output_tunnel __P((struct ipsec_output_state *,
-	struct secpolicy *, int));
-extern int ipsec6_tunnel_validate __P((struct mbuf *, int, u_int,
-	struct secasvar *));
-#endif /*_KERNEL*/
-
-#endif /*_NETINET6_IPSEC6_H_*/
diff --git a/include.new/netinet6/mld6.h b/include.new/netinet6/mld6.h
deleted file mode 100644
index 472c805..0000000
--- a/include.new/netinet6/mld6.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * Copyright (c) 2009 Bruce Simpson.
- *
- * 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: releng/10.2/sys/netinet6/mld6.h 191666 2009-04-29 11:31:23Z bms $
- */
-
-#ifndef _NETINET6_MLD6_H_
-#define _NETINET6_MLD6_H_
-
-/*
- * Multicast Listener Discovery (MLD) definitions.
- */
-
-/* Minimum length of any MLD protocol message. */
-#define MLD_MINLEN	sizeof(struct icmp6_hdr)
-
-/*
- * MLD v2 query format.
- * See <netinet/icmp6.h> for struct mld_hdr
- * (MLDv1 query and host report format).
- */
-struct mldv2_query {
-	struct icmp6_hdr	mld_icmp6_hdr;	/* ICMPv6 header */
-	struct in6_addr		mld_addr;	/* address being queried */
-	uint8_t		mld_misc;	/* reserved/suppress/robustness   */
-	uint8_t		mld_qqi;	/* querier's query interval       */
-	uint16_t	mld_numsrc;	/* number of sources              */
-	/* followed by 1..numsrc source addresses */
-} __packed;
-#define MLD_V2_QUERY_MINLEN		sizeof(struct mldv2_query)
-#define MLD_MRC_EXP(x)			((ntohs((x)) >> 12) & 0x0007)
-#define MLD_MRC_MANT(x)			(ntohs((x)) & 0x0fff)
-#define MLD_QQIC_EXP(x)			(((x) >> 4) & 0x07)
-#define MLD_QQIC_MANT(x)		((x) & 0x0f)
-#define MLD_QRESV(x)			(((x) >> 4) & 0x0f)
-#define MLD_SFLAG(x)			(((x) >> 3) & 0x01)
-#define MLD_QRV(x)			((x) & 0x07)
-
-/*
- * MLDv2 host membership report header.
- * mld_type: MLDV2_LISTENER_REPORT
- */
-struct mldv2_report {
-	struct icmp6_hdr	mld_icmp6_hdr;
-	/* followed by 1..numgrps records */
-} __packed;
-/* overlaid on struct icmp6_hdr. */
-#define mld_numrecs	mld_icmp6_hdr.icmp6_data16[1]
-
-struct mldv2_record {
-	uint8_t			mr_type;	/* record type */
-	uint8_t			mr_datalen;	/* length of auxiliary data */
-	uint16_t		mr_numsrc;	/* number of sources */
-	struct in6_addr		mr_addr;	/* address being reported */
-	/* followed by 1..numsrc source addresses */
-} __packed;
-#define MLD_V2_REPORT_MAXRECS		65535
-
-/*
- * MLDv2 report modes.
- */
-#define MLD_DO_NOTHING			0	/* don't send a record */
-#define MLD_MODE_IS_INCLUDE		1	/* MODE_IN */
-#define MLD_MODE_IS_EXCLUDE		2	/* MODE_EX */
-#define MLD_CHANGE_TO_INCLUDE_MODE	3	/* TO_IN */
-#define MLD_CHANGE_TO_EXCLUDE_MODE	4	/* TO_EX */
-#define MLD_ALLOW_NEW_SOURCES		5	/* ALLOW_NEW */
-#define MLD_BLOCK_OLD_SOURCES		6	/* BLOCK_OLD */
-
-/*
- * MLDv2 query types.
- */
-#define MLD_V2_GENERAL_QUERY		1
-#define MLD_V2_GROUP_QUERY		2
-#define MLD_V2_GROUP_SOURCE_QUERY	3
-
-/*
- * Maximum report interval for MLDv1 host membership reports.
- */
-#define MLD_V1_MAX_RI			10
-
-/*
- * MLD_TIMER_SCALE denotes that the MLD code field specifies
- * time in milliseconds.
- */
-#define MLD_TIMER_SCALE			1000
-
-#endif /* _NETINET6_MLD6_H_ */
diff --git a/include.new/netinet6/mld6_var.h b/include.new/netinet6/mld6_var.h
deleted file mode 100644
index 8a33e86..0000000
--- a/include.new/netinet6/mld6_var.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*-
- * Copyright (c) 2009 Bruce Simpson.
- *
- * 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: releng/10.2/sys/netinet6/mld6_var.h 200871 2009-12-22 20:40:22Z bms $
- */
-#ifndef _NETINET6_MLD6_VAR_H_
-#define _NETINET6_MLD6_VAR_H_
-
-/*
- * Multicast Listener Discovery (MLD)
- * implementation-specific definitions.
- */
-
-#ifdef _KERNEL
-
-/*
- * Per-link MLD state.
- */
-struct mld_ifinfo {
-	LIST_ENTRY(mld_ifinfo) mli_link;
-	struct ifnet *mli_ifp;	/* interface this instance belongs to */
-	uint32_t mli_version;	/* MLDv1 Host Compatibility Mode */
-	uint32_t mli_v1_timer;	/* MLDv1 Querier Present timer (s) */
-	uint32_t mli_v2_timer;	/* MLDv2 General Query (interface) timer (s)*/
-	uint32_t mli_flags;	/* MLD per-interface flags */
-	uint32_t mli_rv;	/* MLDv2 Robustness Variable */
-	uint32_t mli_qi;	/* MLDv2 Query Interval (s) */
-	uint32_t mli_qri;	/* MLDv2 Query Response Interval (s) */
-	uint32_t mli_uri;	/* MLDv2 Unsolicited Report Interval (s) */
-	SLIST_HEAD(,in6_multi)	mli_relinmhead; /* released groups */
-	struct ifqueue	 mli_gq;	/* queue of general query responses */
-};
-#define MLIF_SILENT	0x00000001	/* Do not use MLD on this ifp */
-#define MLIF_USEALLOW	0x00000002	/* Use ALLOW/BLOCK for joins/leaves */
-
-#define MLD_RANDOM_DELAY(X)		(arc4random() % (X) + 1)
-#define MLD_MAX_STATE_CHANGES		24 /* Max pending changes per group */
-
-/*
- * MLD per-group states.
- */
-#define MLD_NOT_MEMBER			0 /* Can garbage collect group */
-#define MLD_SILENT_MEMBER		1 /* Do not perform MLD for group */
-#define MLD_REPORTING_MEMBER		2 /* MLDv1 we are reporter */
-#define MLD_IDLE_MEMBER			3 /* MLDv1 we reported last */
-#define MLD_LAZY_MEMBER			4 /* MLDv1 other member reporting */
-#define MLD_SLEEPING_MEMBER		5 /* MLDv1 start query response */
-#define MLD_AWAKENING_MEMBER		6 /* MLDv1 group timer will start */
-#define MLD_G_QUERY_PENDING_MEMBER	7 /* MLDv2 group query pending */
-#define MLD_SG_QUERY_PENDING_MEMBER	8 /* MLDv2 source query pending */
-#define MLD_LEAVING_MEMBER		9 /* MLDv2 dying gasp (pending last */
-					  /* retransmission of INCLUDE {}) */
-
-/*
- * MLD version tag.
- */
-#define MLD_VERSION_NONE		0 /* Invalid */
-#define MLD_VERSION_1			1
-#define MLD_VERSION_2			2 /* Default */
-
-/*
- * MLDv2 protocol control variables.
- */
-#define MLD_RV_INIT		2	/* Robustness Variable */
-#define MLD_RV_MIN		1
-#define MLD_RV_MAX		7
-
-#define MLD_QI_INIT		125	/* Query Interval (s) */
-#define MLD_QI_MIN		1
-#define MLD_QI_MAX		255
-
-#define MLD_QRI_INIT		10	/* Query Response Interval (s) */
-#define MLD_QRI_MIN		1
-#define MLD_QRI_MAX		255
-
-#define MLD_URI_INIT		3	/* Unsolicited Report Interval (s) */
-#define MLD_URI_MIN		0
-#define MLD_URI_MAX		10
-
-#define MLD_MAX_GS_SOURCES		256 /* # of sources in rx GS query */
-#define MLD_MAX_G_GS_PACKETS		8 /* # of packets to answer G/GS */
-#define MLD_MAX_STATE_CHANGE_PACKETS	8 /* # of packets per state change */
-#define MLD_MAX_RESPONSE_PACKETS	16 /* # of packets for general query */
-#define MLD_MAX_RESPONSE_BURST		4 /* # of responses to send at once */
-#define MLD_RESPONSE_BURST_INTERVAL	(PR_FASTHZ / 2)	/* 500ms */
-
-/*
- * MLD-specific mbuf flags.
- */
-#define M_MLDV1		M_PROTO1	/* Packet is MLDv1 */
-#define M_GROUPREC	M_PROTO3	/* mbuf chain is a group record */
-
-/*
- * Leading space for MLDv2 reports inside MTU.
- *
- * NOTE: This differs from IGMPv3 significantly. KAME IPv6 requires
- * that a fully formed mbuf chain *without* the Router Alert option
- * is passed to ip6_output(), however we must account for it in the
- * MTU if we need to split an MLDv2 report into several packets.
- *
- * We now put the MLDv2 report header in the initial mbuf containing
- * the IPv6 header.
- */
-#define	MLD_MTUSPACE	(sizeof(struct ip6_hdr) + sizeof(struct mld_raopt) + \
-			 sizeof(struct icmp6_hdr))
-
-/*
- * Subsystem lock macros.
- * The MLD lock is only taken with MLD. Currently it is system-wide.
- * VIMAGE: The lock could be pushed to per-VIMAGE granularity in future.
- */
-#define	MLD_LOCK_INIT()	mtx_init(&mld_mtx, "mld_mtx", NULL, MTX_DEF)
-#define	MLD_LOCK_DESTROY()	mtx_destroy(&mld_mtx)
-#define	MLD_LOCK()		mtx_lock(&mld_mtx)
-#define	MLD_LOCK_ASSERT()	mtx_assert(&mld_mtx, MA_OWNED)
-#define	MLD_UNLOCK()		mtx_unlock(&mld_mtx)
-#define	MLD_UNLOCK_ASSERT()	mtx_assert(&mld_mtx, MA_NOTOWNED)
-
-/*
- * Per-link MLD context.
- */
-#define MLD_IFINFO(ifp) \
-	(((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->mld_ifinfo)
-
-int	mld_change_state(struct in6_multi *, const int);
-struct mld_ifinfo *
-	mld_domifattach(struct ifnet *);
-void	mld_domifdetach(struct ifnet *);
-void	mld_fasttimo(void);
-void	mld_ifdetach(struct ifnet *);
-int	mld_input(struct mbuf *, int, int);
-void	mld_slowtimo(void);
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_inet6_mld);
-#endif
-
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_MLD6_VAR_H_ */
diff --git a/include.new/netinet6/nd6.h b/include.new/netinet6/nd6.h
deleted file mode 100644
index 1bbae02..0000000
--- a/include.new/netinet6/nd6.h
+++ /dev/null
@@ -1,464 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: nd6.h,v 1.76 2001/12/18 02:10:31 itojun Exp $
- * $FreeBSD: releng/10.2/sys/netinet6/nd6.h 285825 2015-07-23 19:58:56Z hrs $
- */
-
-#ifndef _NETINET6_ND6_H_
-#define _NETINET6_ND6_H_
-
-/* see net/route.h, or net/if_inarp.h */
-#ifndef RTF_ANNOUNCE
-#define RTF_ANNOUNCE	RTF_PROTO2
-#endif
-
-#include <sys/queue.h>
-#include <sys/callout.h>
-
-struct llentry;
-
-#define ND6_LLINFO_NOSTATE	-2
-/*
- * We don't need the WAITDELETE state any more, but we keep the definition
- * in a comment line instead of removing it. This is necessary to avoid
- * unintentionally reusing the value for another purpose, which might
- * affect backward compatibility with old applications.
- * (20000711 jinmei@kame.net)
- */
-/* #define ND6_LLINFO_WAITDELETE	-1 */
-#define ND6_LLINFO_INCOMPLETE	0
-#define ND6_LLINFO_REACHABLE	1
-#define ND6_LLINFO_STALE	2
-#define ND6_LLINFO_DELAY	3
-#define ND6_LLINFO_PROBE	4
-
-#define ND6_IS_LLINFO_PROBREACH(n) ((n)->ln_state > ND6_LLINFO_INCOMPLETE)
-#define ND6_LLINFO_PERMANENT(n) (((n)->la_expire == 0) && ((n)->ln_state > ND6_LLINFO_INCOMPLETE))
-
-struct nd_ifinfo {
-	uint32_t linkmtu;		/* LinkMTU */
-	uint32_t maxmtu;		/* Upper bound of LinkMTU */
-	uint32_t basereachable;	/* BaseReachableTime */
-	uint32_t reachable;		/* Reachable Time */
-	uint32_t retrans;		/* Retrans Timer */
-	uint32_t flags;		/* Flags */
-	int recalctm;			/* BaseReacable re-calculation timer */
-	u_int8_t chlim;			/* CurHopLimit */
-	u_int8_t initialized; /* Flag to see the entry is initialized */
-	/* the following 3 members are for privacy extension for addrconf */
-	u_int8_t randomseed0[8]; /* upper 64 bits of MD5 digest */
-	u_int8_t randomseed1[8]; /* lower 64 bits (usually the EUI64 IFID) */
-	u_int8_t randomid[8];	/* current random ID */
-};
-
-#define ND6_IFF_PERFORMNUD	0x1
-#define ND6_IFF_ACCEPT_RTADV	0x2
-#define ND6_IFF_PREFER_SOURCE	0x4 /* Not used in FreeBSD. */
-#define ND6_IFF_IFDISABLED	0x8 /* IPv6 operation is disabled due to
-				     * DAD failure.  (XXX: not ND-specific)
-				     */
-#define ND6_IFF_DONT_SET_IFROUTE	0x10
-#define ND6_IFF_AUTO_LINKLOCAL	0x20
-#define	ND6_IFF_NO_RADR		0x40
-#define ND6_IFF_NO_PREFER_IFACE	0x80 /* XXX: not related to ND. */
-#define ND6_IFF_NO_DAD		0x100
-
-#define	ND6_CREATE		LLE_CREATE
-#define	ND6_EXCLUSIVE		LLE_EXCLUSIVE
-
-#ifdef _KERNEL
-#define ND_IFINFO(ifp) \
-	(((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->nd_ifinfo)
-#define IN6_LINKMTU(ifp) \
-	((ND_IFINFO(ifp)->linkmtu && ND_IFINFO(ifp)->linkmtu < (ifp)->if_mtu) \
-	    ? ND_IFINFO(ifp)->linkmtu \
-	    : ((ND_IFINFO(ifp)->maxmtu && ND_IFINFO(ifp)->maxmtu < (ifp)->if_mtu) \
-		? ND_IFINFO(ifp)->maxmtu : (ifp)->if_mtu))
-#endif
-
-struct in6_nbrinfo {
-	char ifname[IFNAMSIZ];	/* if name, e.g. "en0" */
-	struct in6_addr addr;	/* IPv6 address of the neighbor */
-	long	asked;		/* number of queries already sent for this addr */
-	int	isrouter;	/* if it acts as a router */
-	int	state;		/* reachability state */
-	int	expire;		/* lifetime for NDP state transition */
-};
-
-#define DRLSTSIZ 10
-#define PRLSTSIZ 10
-struct	in6_drlist {
-	char ifname[IFNAMSIZ];
-	struct {
-		struct	in6_addr rtaddr;
-		u_char	flags;
-		u_short	rtlifetime;
-		u_long	expire;
-		u_short if_index;
-	} defrouter[DRLSTSIZ];
-};
-
-struct	in6_defrouter {
-	struct	sockaddr_in6 rtaddr;
-	u_char	flags;
-	u_short	rtlifetime;
-	u_long	expire;
-	u_short if_index;
-};
-
-#ifdef _KERNEL
-struct	in6_oprlist {
-	char ifname[IFNAMSIZ];
-	struct {
-		struct	in6_addr prefix;
-		struct prf_ra raflags;
-		u_char	prefixlen;
-		u_char	origin;
-		u_long vltime;
-		u_long pltime;
-		u_long expire;
-		u_short if_index;
-		u_short advrtrs; /* number of advertisement routers */
-		struct	in6_addr advrtr[DRLSTSIZ]; /* XXX: explicit limit */
-	} prefix[PRLSTSIZ];
-};
-#endif
-
-struct	in6_prlist {
-	char ifname[IFNAMSIZ];
-	struct {
-		struct	in6_addr prefix;
-		struct prf_ra raflags;
-		u_char	prefixlen;
-		u_char	origin;
-		uint32_t vltime;
-		uint32_t pltime;
-		time_t expire;
-		u_short if_index;
-		u_short advrtrs; /* number of advertisement routers */
-		struct	in6_addr advrtr[DRLSTSIZ]; /* XXX: explicit limit */
-	} prefix[PRLSTSIZ];
-};
-
-struct in6_prefix {
-	struct	sockaddr_in6 prefix;
-	struct prf_ra raflags;
-	u_char	prefixlen;
-	u_char	origin;
-	uint32_t vltime;
-	uint32_t pltime;
-	time_t expire;
-	uint32_t flags;
-	int refcnt;
-	u_short if_index;
-	u_short advrtrs; /* number of advertisement routers */
-	/* struct sockaddr_in6 advrtr[] */
-};
-
-#ifdef _KERNEL
-struct	in6_ondireq {
-	char ifname[IFNAMSIZ];
-	struct {
-		uint32_t linkmtu;	/* LinkMTU */
-		uint32_t maxmtu;	/* Upper bound of LinkMTU */
-		uint32_t basereachable; /* BaseReachableTime */
-		uint32_t reachable;	/* Reachable Time */
-		uint32_t retrans;	/* Retrans Timer */
-		uint32_t flags;	/* Flags */
-		int recalctm;		/* BaseReacable re-calculation timer */
-		u_int8_t chlim;		/* CurHopLimit */
-		u_int8_t receivedra;
-	} ndi;
-};
-#endif
-
-struct	in6_ndireq {
-	char ifname[IFNAMSIZ];
-	struct nd_ifinfo ndi;
-};
-
-struct	in6_ndifreq {
-	char ifname[IFNAMSIZ];
-	u_long ifindex;
-};
-
-/* Prefix status */
-#define NDPRF_ONLINK		0x1
-#define NDPRF_DETACHED		0x2
-
-/* protocol constants */
-#define MAX_RTR_SOLICITATION_DELAY	1	/* 1sec */
-#define RTR_SOLICITATION_INTERVAL	4	/* 4sec */
-#define MAX_RTR_SOLICITATIONS		3
-
-#define ND6_INFINITE_LIFETIME		0xffffffff
-
-#ifdef _KERNEL
-/* node constants */
-#define MAX_REACHABLE_TIME		3600000	/* msec */
-#define REACHABLE_TIME			30000	/* msec */
-#define RETRANS_TIMER			1000	/* msec */
-#define MIN_RANDOM_FACTOR		512	/* 1024 * 0.5 */
-#define MAX_RANDOM_FACTOR		1536	/* 1024 * 1.5 */
-#define DEF_TEMP_VALID_LIFETIME		604800	/* 1 week */
-#define DEF_TEMP_PREFERRED_LIFETIME	86400	/* 1 day */
-#define TEMPADDR_REGEN_ADVANCE		5	/* sec */
-#define MAX_TEMP_DESYNC_FACTOR		600	/* 10 min */
-#define ND_COMPUTE_RTIME(x) \
-		(((MIN_RANDOM_FACTOR * (x >> 10)) + (arc4random() & \
-		((MAX_RANDOM_FACTOR - MIN_RANDOM_FACTOR) * (x >> 10)))) /1000)
-
-TAILQ_HEAD(nd_drhead, nd_defrouter);
-struct	nd_defrouter {
-	TAILQ_ENTRY(nd_defrouter) dr_entry;
-	struct	in6_addr rtaddr;
-	u_char	flags;		/* flags on RA message */
-	u_short	rtlifetime;
-	u_long	expire;
-	struct  ifnet *ifp;
-	int	installed;	/* is installed into kernel routing table */
-};
-
-struct nd_prefixctl {
-	struct ifnet *ndpr_ifp;
-
-	/* prefix */
-	struct sockaddr_in6 ndpr_prefix;
-	u_char	ndpr_plen;
-
-	uint32_t ndpr_vltime;	/* advertised valid lifetime */
-	uint32_t ndpr_pltime;	/* advertised preferred lifetime */
-
-	struct prf_ra ndpr_flags;
-};
-
-
-struct nd_prefix {
-	struct ifnet *ndpr_ifp;
-	LIST_ENTRY(nd_prefix) ndpr_entry;
-	struct sockaddr_in6 ndpr_prefix;	/* prefix */
-	struct in6_addr ndpr_mask; /* netmask derived from the prefix */
-
-	uint32_t ndpr_vltime;	/* advertised valid lifetime */
-	uint32_t ndpr_pltime;	/* advertised preferred lifetime */
-
-	time_t ndpr_expire;	/* expiration time of the prefix */
-	time_t ndpr_preferred;	/* preferred time of the prefix */
-	time_t ndpr_lastupdate; /* reception time of last advertisement */
-
-	struct prf_ra ndpr_flags;
-	uint32_t ndpr_stateflags; /* actual state flags */
-	/* list of routers that advertise the prefix: */
-	LIST_HEAD(pr_rtrhead, nd_pfxrouter) ndpr_advrtrs;
-	u_char	ndpr_plen;
-	int	ndpr_refcnt;	/* reference couter from addresses */
-};
-
-#define ndpr_raf		ndpr_flags
-#define ndpr_raf_onlink		ndpr_flags.onlink
-#define ndpr_raf_auto		ndpr_flags.autonomous
-#define ndpr_raf_router		ndpr_flags.router
-
-/*
- * Message format for use in obtaining information about prefixes
- * from inet6 sysctl function
- */
-struct inet6_ndpr_msghdr {
-	u_short	inpm_msglen;	/* to skip over non-understood messages */
-	u_char	inpm_version;	/* future binary compatibility */
-	u_char	inpm_type;	/* message type */
-	struct in6_addr inpm_prefix;
-	u_long	prm_vltim;
-	u_long	prm_pltime;
-	u_long	prm_expire;
-	u_long	prm_preferred;
-	struct in6_prflags prm_flags;
-	u_short	prm_index;	/* index for associated ifp */
-	u_char	prm_plen;	/* length of prefix in bits */
-};
-
-#define prm_raf_onlink		prm_flags.prf_ra.onlink
-#define prm_raf_auto		prm_flags.prf_ra.autonomous
-
-#define prm_statef_onlink	prm_flags.prf_state.onlink
-
-#define prm_rrf_decrvalid	prm_flags.prf_rr.decrvalid
-#define prm_rrf_decrprefd	prm_flags.prf_rr.decrprefd
-
-struct nd_pfxrouter {
-	LIST_ENTRY(nd_pfxrouter) pfr_entry;
-	struct nd_defrouter *router;
-};
-
-LIST_HEAD(nd_prhead, nd_prefix);
-
-/* nd6.c */
-VNET_DECLARE(int, nd6_prune);
-VNET_DECLARE(int, nd6_delay);
-VNET_DECLARE(int, nd6_umaxtries);
-VNET_DECLARE(int, nd6_mmaxtries);
-VNET_DECLARE(int, nd6_useloopback);
-VNET_DECLARE(int, nd6_maxnudhint);
-VNET_DECLARE(int, nd6_gctimer);
-VNET_DECLARE(struct nd_drhead, nd_defrouter);
-VNET_DECLARE(struct nd_prhead, nd_prefix);
-VNET_DECLARE(int, nd6_debug);
-VNET_DECLARE(int, nd6_onlink_ns_rfc4861);
-#define	V_nd6_prune			VNET(nd6_prune)
-#define	V_nd6_delay			VNET(nd6_delay)
-#define	V_nd6_umaxtries			VNET(nd6_umaxtries)
-#define	V_nd6_mmaxtries			VNET(nd6_mmaxtries)
-#define	V_nd6_useloopback		VNET(nd6_useloopback)
-#define	V_nd6_maxnudhint		VNET(nd6_maxnudhint)
-#define	V_nd6_gctimer			VNET(nd6_gctimer)
-#define	V_nd_defrouter			VNET(nd_defrouter)
-#define	V_nd_prefix			VNET(nd_prefix)
-#define	V_nd6_debug			VNET(nd6_debug)
-#define	V_nd6_onlink_ns_rfc4861		VNET(nd6_onlink_ns_rfc4861)
-
-#define nd6log(x)	do { if (V_nd6_debug) log x; } while (/*CONSTCOND*/ 0)
-
-VNET_DECLARE(struct callout, nd6_timer_ch);
-#define	V_nd6_timer_ch			VNET(nd6_timer_ch)
-
-/* nd6_rtr.c */
-VNET_DECLARE(int, nd6_defifindex);
-VNET_DECLARE(int, ip6_desync_factor);	/* seconds */
-VNET_DECLARE(uint32_t, ip6_temp_preferred_lifetime); /* seconds */
-VNET_DECLARE(uint32_t, ip6_temp_valid_lifetime); /* seconds */
-VNET_DECLARE(int, ip6_temp_regen_advance); /* seconds */
-#define	V_nd6_defifindex		VNET(nd6_defifindex)
-#define	V_ip6_desync_factor		VNET(ip6_desync_factor)
-#define	V_ip6_temp_preferred_lifetime	VNET(ip6_temp_preferred_lifetime)
-#define	V_ip6_temp_valid_lifetime	VNET(ip6_temp_valid_lifetime)
-#define	V_ip6_temp_regen_advance	VNET(ip6_temp_regen_advance)
-
-union nd_opts {
-	struct nd_opt_hdr *nd_opt_array[16];	/* max = ND_OPT_NONCE */
-	struct {
-		struct nd_opt_hdr *zero;
-		struct nd_opt_hdr *src_lladdr;
-		struct nd_opt_hdr *tgt_lladdr;
-		struct nd_opt_prefix_info *pi_beg; /* multiple opts, start */
-		struct nd_opt_rd_hdr *rh;
-		struct nd_opt_mtu *mtu;
-		struct nd_opt_hdr *__res6;
-		struct nd_opt_hdr *__res7;
-		struct nd_opt_hdr *__res8;
-		struct nd_opt_hdr *__res9;
-		struct nd_opt_hdr *__res10;
-		struct nd_opt_hdr *__res11;
-		struct nd_opt_hdr *__res12;
-		struct nd_opt_hdr *__res13;
-		struct nd_opt_nonce *nonce;
-		struct nd_opt_hdr *__res15;
-		struct nd_opt_hdr *search;	/* multiple opts */
-		struct nd_opt_hdr *last;	/* multiple opts */
-		int done;
-		struct nd_opt_prefix_info *pi_end;/* multiple opts, end */
-	} nd_opt_each;
-};
-#define nd_opts_src_lladdr	nd_opt_each.src_lladdr
-#define nd_opts_tgt_lladdr	nd_opt_each.tgt_lladdr
-#define nd_opts_pi		nd_opt_each.pi_beg
-#define nd_opts_pi_end		nd_opt_each.pi_end
-#define nd_opts_rh		nd_opt_each.rh
-#define nd_opts_mtu		nd_opt_each.mtu
-#define nd_opts_nonce		nd_opt_each.nonce
-#define nd_opts_search		nd_opt_each.search
-#define nd_opts_last		nd_opt_each.last
-#define nd_opts_done		nd_opt_each.done
-
-/* XXX: need nd6_var.h?? */
-/* nd6.c */
-void nd6_init(void);
-#ifdef VIMAGE
-void nd6_destroy(void);
-#endif
-struct nd_ifinfo *nd6_ifattach(struct ifnet *);
-void nd6_ifdetach(struct nd_ifinfo *);
-int nd6_is_addr_neighbor(struct sockaddr_in6 *, struct ifnet *);
-void nd6_option_init(void *, int, union nd_opts *);
-struct nd_opt_hdr *nd6_option(union nd_opts *);
-int nd6_options(union nd_opts *);
-struct	llentry *nd6_lookup(struct in6_addr *, int, struct ifnet *);
-void nd6_setmtu(struct ifnet *);
-void nd6_llinfo_settimer(struct llentry *, long);
-void nd6_llinfo_settimer_locked(struct llentry *, long);
-void nd6_timer(void *);
-void nd6_purge(struct ifnet *);
-void nd6_nud_hint(struct rtentry *, struct in6_addr *, int);
-int nd6_resolve(struct ifnet *, struct rtentry *, struct mbuf *,
-	struct sockaddr *, u_char *);
-void nd6_rtrequest(int, struct rtentry *, struct rt_addrinfo *);
-int nd6_ioctl(u_long, caddr_t, struct ifnet *);
-struct llentry *nd6_cache_lladdr(struct ifnet *, struct in6_addr *,
-	char *, int, int, int);
-int nd6_output(struct ifnet *, struct ifnet *, struct mbuf *,
-	struct sockaddr_in6 *, struct rtentry *);
-void nd6_grab_holdchain(struct llentry *, struct mbuf **,
-    struct sockaddr_in6 *);
-int nd6_flush_holdchain(struct ifnet *, struct ifnet *, struct mbuf *,
-    struct sockaddr_in6 *);
-int nd6_need_cache(struct ifnet *);
-int nd6_storelladdr(struct ifnet *, struct mbuf *,
-	const struct sockaddr *, u_char *, struct llentry **);
-
-/* nd6_nbr.c */
-void nd6_na_input(struct mbuf *, int, int);
-void nd6_na_output(struct ifnet *, const struct in6_addr *,
-	const struct in6_addr *, u_long, int, struct sockaddr *);
-void nd6_ns_input(struct mbuf *, int, int);
-void nd6_ns_output(struct ifnet *, const struct in6_addr *,
-	const struct in6_addr *, struct llentry *, uint8_t *);
-caddr_t nd6_ifptomac(struct ifnet *);
-void nd6_dad_init(void);
-void nd6_dad_start(struct ifaddr *, int);
-void nd6_dad_stop(struct ifaddr *);
-
-/* nd6_rtr.c */
-void nd6_rs_input(struct mbuf *, int, int);
-void nd6_ra_input(struct mbuf *, int, int);
-void prelist_del(struct nd_prefix *);
-void defrouter_reset(void);
-void defrouter_select(void);
-void defrtrlist_del(struct nd_defrouter *);
-void prelist_remove(struct nd_prefix *);
-int nd6_prelist_add(struct nd_prefixctl *, struct nd_defrouter *,
-	struct nd_prefix **);
-void pfxlist_onlink_check(void);
-struct nd_defrouter *defrouter_lookup(struct in6_addr *, struct ifnet *);
-struct nd_prefix *nd6_prefix_lookup(struct nd_prefixctl *);
-void rt6_flush(struct in6_addr *, struct ifnet *);
-int nd6_setdefaultiface(int);
-int in6_tmpifadd(const struct in6_ifaddr *, int, int);
-
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_ND6_H_ */
diff --git a/include.new/netinet6/pim6.h b/include.new/netinet6/pim6.h
deleted file mode 100644
index 3f6676c..0000000
--- a/include.new/netinet6/pim6.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (C) 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: pim6.h,v 1.3 2000/03/25 07:23:58 sumikawa Exp $
- * $FreeBSD: releng/10.2/sys/netinet6/pim6.h 174510 2007-12-10 16:03:40Z obrien $
- */
-/*
- * Protocol Independent Multicast (PIM) definitions
- *
- * Written by Ahmed Helmy, SGI, July 1996
- *
- * MULTICAST
- */
-
-/*
- * PIM packet header
- */
-#define PIM_VERSION	2
-struct pim {
-#if defined(BYTE_ORDER) && (BYTE_ORDER == LITTLE_ENDIAN)
-	u_char	pim_type:4, /* the PIM message type, currently they are:
-			     * Hello, Register, Register-Stop, Join/Prune,
-			     * Bootstrap, Assert, Graft (PIM-DM only),
-			     * Graft-Ack (PIM-DM only), C-RP-Adv
-			     */
-		pim_ver:4;  /* PIM version number; 2 for PIMv2 */
-#else
-	u_char	pim_ver:4,	/* PIM version */
-		pim_type:4;	/* PIM type    */
-#endif
-	u_char  pim_rsv;	/* Reserved */
-	u_short	pim_cksum;	/* IP style check sum */
-};
-
-#define PIM_MINLEN	8		/* The header min. length is 8    */
-#define PIM6_REG_MINLEN	(PIM_MINLEN+40)	/* Register message + inner IP6 header */
-
-/*
- * Message types
- */
-#define PIM_REGISTER	1	/* PIM Register type is 1 */
-
-/* second bit in reg_head is the null bit */
-#define PIM_NULL_REGISTER 0x40000000
diff --git a/include.new/netinet6/pim6_var.h b/include.new/netinet6/pim6_var.h
deleted file mode 100644
index 8fc3712..0000000
--- a/include.new/netinet6/pim6_var.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (C) 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: pim6_var.h,v 1.8 2000/06/06 08:07:43 jinmei Exp $
- * $FreeBSD: releng/10.2/sys/netinet6/pim6_var.h 254925 2013-08-26 18:16:05Z jhb $
- */
-
-/*
- * Protocol Independent Multicast (PIM),
- * implementation-specific definitions.
- *
- * Written by George Edmond Eddy (Rusty), ISI, February 1998
- * Modified by Pavlin Ivanov Radoslavov, USC/ISI, May 1998
- */
-
-#ifndef _NETINET6_PIM6_VAR_H_
-#define _NETINET6_PIM6_VAR_H_
-
-struct pim6stat {
-	uint64_t pim6s_rcv_total;	/* total PIM messages received	*/
-	uint64_t pim6s_rcv_tooshort;	/* received with too few bytes	*/
-	uint64_t pim6s_rcv_badsum;	/* received with bad checksum	*/
-	uint64_t pim6s_rcv_badversion;	/* received bad PIM version	*/
-	uint64_t pim6s_rcv_registers;	/* received registers		*/
-	uint64_t pim6s_rcv_badregisters; /* received invalid registers	*/
-	uint64_t pim6s_snd_registers;	/* sent registers		*/
-};
-
-#if (defined(KERNEL)) || (defined(_KERNEL))
-int pim6_input(struct mbuf **, int*, int);
-#endif /* KERNEL */
-
-/*
- * Names for PIM sysctl objects
- */
-#define PIM6CTL_STATS		1	/* statistics (read-only) */
-#define PIM6CTL_MAXID		2
-
-#endif /* _NETINET6_PIM6_VAR_H_ */
diff --git a/include.new/netinet6/raw_ip6.h b/include.new/netinet6/raw_ip6.h
deleted file mode 100644
index e2a83fa..0000000
--- a/include.new/netinet6/raw_ip6.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (C) 2001 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: raw_ip6.h,v 1.2 2001/05/27 13:28:35 itojun Exp $
- * $FreeBSD: releng/10.2/sys/netinet6/raw_ip6.h 253085 2013-07-09 09:54:54Z ae $
- */
-
-#ifndef _NETINET6_RAW_IP6_H_
-#define _NETINET6_RAW_IP6_H_
-
-/*
- * ICMPv6 stat is counted separately.  see netinet/icmp6.h
- */
-struct rip6stat {
-	uint64_t rip6s_ipackets;	/* total input packets */
-	uint64_t rip6s_isum;		/* input checksum computations */
-	uint64_t rip6s_badsum;		/* of above, checksum error */
-	uint64_t rip6s_nosock;		/* no matching socket */
-	uint64_t rip6s_nosockmcast;	/* of above, arrived as multicast */
-	uint64_t rip6s_fullsock;	/* not delivered, input socket full */
-
-	uint64_t rip6s_opackets;	/* total output packets */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_PCPUSTAT_DECLARE(struct rip6stat, rip6stat);
-#define	RIP6STAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct rip6stat, rip6stat, name, (val))
-#define	RIP6STAT_INC(name)	RIP6STAT_ADD(name, 1)
-#endif /* _KERNEL */
-
-#endif
diff --git a/include.new/netinet6/scope6_var.h b/include.new/netinet6/scope6_var.h
deleted file mode 100644
index c8e22f9..0000000
--- a/include.new/netinet6/scope6_var.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (C) 2000 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- *
- *	$KAME: scope6_var.h,v 1.4 2000/05/18 15:03:27 jinmei Exp $
- * $FreeBSD: releng/10.2/sys/netinet6/scope6_var.h 271185 2014-09-06 04:39:26Z markj $
- */
-
-#ifndef _NETINET6_SCOPE6_VAR_H_
-#define _NETINET6_SCOPE6_VAR_H_
-
-#ifdef _KERNEL
-#include <net/vnet.h>
-
-struct scope6_id {
-	/*
-	 * 16 is correspondent to 4bit multicast scope field.
-	 * i.e. from node-local to global with some reserved/unassigned types.
-	 */
-	uint32_t s6id_list[16];
-};
-
-VNET_DECLARE(int, deembed_scopeid);
-#define V_deembed_scopeid       VNET(deembed_scopeid)
-
-void	scope6_init(void);
-struct scope6_id *scope6_ifattach(struct ifnet *);
-void	scope6_ifdetach(struct scope6_id *);
-int	scope6_ioctl(u_long cmd, caddr_t data, struct ifnet *);
-void	scope6_setdefault(struct ifnet *);
-int	scope6_get_default(struct scope6_id *);
-uint32_t scope6_addr2default(struct in6_addr *);
-int	sa6_embedscope(struct sockaddr_in6 *, int);
-int	sa6_recoverscope(struct sockaddr_in6 *);
-int	in6_setscope(struct in6_addr *, struct ifnet *, uint32_t *);
-int	in6_clearscope(struct in6_addr *);
-uint16_t in6_getscope(struct in6_addr *);
-#endif /* _KERNEL */
-
-#endif /* _NETINET6_SCOPE6_VAR_H_ */
diff --git a/include.new/netinet6/sctp6_var.h b/include.new/netinet6/sctp6_var.h
deleted file mode 100644
index 308ea75..0000000
--- a/include.new/netinet6/sctp6_var.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/netinet6/sctp6_var.h 243186 2012-11-17 20:04:04Z tuexen $");
-
-#ifndef _NETINET6_SCTP6_VAR_H_
-#define _NETINET6_SCTP6_VAR_H_
-
-#if defined(_KERNEL)
-
-SYSCTL_DECL(_net_inet6_sctp6);
-extern struct pr_usrreqs sctp6_usrreqs;
-
-int sctp6_input(struct mbuf **, int *, int);
-int sctp6_input_with_port(struct mbuf **, int *, uint16_t);
-int 
-sctp6_output(struct sctp_inpcb *, struct mbuf *, struct sockaddr *,
-    struct mbuf *, struct proc *);
-void sctp6_ctlinput(int, struct sockaddr *, void *);
-extern void 
-sctp6_notify(struct sctp_inpcb *, struct icmp6_hdr *,
-    struct sctphdr *, struct sockaddr *,
-    struct sctp_tcb *, struct sctp_nets *);
-
-#endif
-#endif
diff --git a/include.new/netinet6/send.h b/include.new/netinet6/send.h
deleted file mode 100644
index 580ca17..0000000
--- a/include.new/netinet6/send.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2009-2010 Ana Kukec <anchie@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.
- *
- * 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: releng/10.2/sys/netinet6/send.h 222712 2011-06-05 11:40:30Z hrs $
- */
-
-#ifndef _NETINET6_SEND_H_
-#define _NETINET6_SEND_H_
-
-#define	SND_OUT		0	/* Outgoing traffic */
-#define	SND_IN		1	/* Incoming traffic. */
-
-struct sockaddr_send {
-	uint8_t			send_len;	/* total length */
-	sa_family_t		send_family;	/* address family */
-	int			send_direction;
-	int			send_ifidx;
-	char			send_zero[8];
-};
-
-extern int (*send_sendso_input_hook)(struct mbuf *, struct ifnet *, int, int);
-
-#endif /* _NETINET6_SEND_H_ */
diff --git a/include.new/netinet6/tcp6_var.h b/include.new/netinet6/tcp6_var.h
deleted file mode 100644
index 813fc02..0000000
--- a/include.new/netinet6/tcp6_var.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*-
- * Copyright (c) 1982, 1986, 1993, 1994, 1995
- *	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.
- * 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.
- *
- *	@(#)tcp_var.h	8.4 (Berkeley) 5/24/95
- * $FreeBSD: releng/10.2/sys/netinet6/tcp6_var.h 241916 2012-10-22 21:49:56Z delphij $
- */
-
-#ifndef _NETINET_TCP6_VAR_H_
-#define _NETINET_TCP6_VAR_H_
-
-#ifdef _KERNEL
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_inet6_tcp6);
-
-VNET_DECLARE(int, tcp_v6mssdflt);	/* XXX */
-#define	V_tcp_v6mssdflt			VNET(tcp_v6mssdflt)
-#endif
-
-struct	ip6_hdr;
-void	tcp6_ctlinput(int, struct sockaddr *, void *);
-void	tcp6_init(void);
-int	tcp6_input(struct mbuf **, int *, int);
-struct	rtentry *tcp_rtlookup6(struct in_conninfo *);
-
-extern struct	pr_usrreqs tcp6_usrreqs;
-
-#endif /* _KERNEL */
-
-#endif /* _NETINET_TCP6_VAR_H_ */
diff --git a/include.new/netinet6/udp6_var.h b/include.new/netinet6/udp6_var.h
deleted file mode 100644
index 5e19bea..0000000
--- a/include.new/netinet6/udp6_var.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*-
- * Copyright (c) 1982, 1986, 1989, 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.
- * 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.
- *
- *	@(#)udp_var.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/netinet6/udp6_var.h 265946 2014-05-13 06:05:53Z kevlo $
- */
-
-#ifndef _NETINET6_UDP6_VAR_H_
-#define _NETINET6_UDP6_VAR_H_
-
-#ifdef _KERNEL
-SYSCTL_DECL(_net_inet6_udp6);
-
-extern struct pr_usrreqs	udp6_usrreqs;
-
-void	udp6_ctlinput(int, struct sockaddr *, void *);
-void	udplite6_ctlinput(int, struct sockaddr *, void *);
-int	udp6_input(struct mbuf **, int *, int);
-#endif
-
-#endif /*_NETINET6_UDP6_VAR_H_*/
diff --git a/include.new/netipsec/ah.h b/include.new/netipsec/ah.h
deleted file mode 100644
index 4991339..0000000
--- a/include.new/netipsec/ah.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/ah.h 139823 2005-01-07 01:45:51Z imp $	*/
-/*	$KAME: ah.h,v 1.13 2000/10/18 21:28:00 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * RFC1826/2402 authentication header.
- */
-
-#ifndef _NETIPSEC_AH_H_
-#define _NETIPSEC_AH_H_
-
-struct ah {
-	u_int8_t	ah_nxt;		/* Next Header */
-	u_int8_t	ah_len;		/* Length of data, in 32bit */
-	u_int16_t	ah_reserve;	/* Reserved for future use */
-	uint32_t	ah_spi;		/* Security parameter index */
-	/* variable size, 32bit bound*/	/* Authentication data */
-};
-
-struct newah {
-	u_int8_t	ah_nxt;		/* Next Header */
-	u_int8_t	ah_len;		/* Length of data + 1, in 32bit */
-	u_int16_t	ah_reserve;	/* Reserved for future use */
-	uint32_t	ah_spi;		/* Security parameter index */
-	uint32_t	ah_seq;		/* Sequence number field */
-	/* variable size, 32bit bound*/	/* Authentication data */
-};
-#endif /*_NETIPSEC_AH_H_*/
diff --git a/include.new/netipsec/ah_var.h b/include.new/netipsec/ah_var.h
deleted file mode 100644
index 2ea77fd..0000000
--- a/include.new/netipsec/ah_var.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/ah_var.h 253088 2013-07-09 10:08:13Z ae $	*/
-/*	$OpenBSD: ip_ah.h,v 1.29 2002/06/09 16:26:10 itojun Exp $	*/
-/*-
- * The authors of this code are John Ioannidis (ji@tla.org),
- * Angelos D. Keromytis (kermit@csd.uch.gr) and
- * Niels Provos (provos@physnet.uni-hamburg.de).
- *
- * The original version of this code was written by John Ioannidis
- * for BSD/OS in Athens, Greece, in November 1995.
- *
- * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
- * by Angelos D. Keromytis.
- *
- * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis
- * and Niels Provos.
- *
- * Additional features in 1999 by Angelos D. Keromytis.
- *
- * Copyright (C) 1995, 1996, 1997, 1998, 1999 John Ioannidis,
- * Angelos D. Keromytis and Niels Provos.
- * Copyright (c) 2001 Angelos D. Keromytis.
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all copies of any software which is or includes a copy or
- * modification of this software.
- * You may use this code under the GNU public license if you so wish. Please
- * contribute changes back to the authors under this freer than GPL license
- * so that we may further the use of strong encryption without limitations to
- * all.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- */
-
-#ifndef _NETIPSEC_AH_VAR_H_
-#define _NETIPSEC_AH_VAR_H_
-
-/*
- * These define the algorithm indices into the histogram.  They're
- * presently based on the PF_KEY v2 protocol values which is bogus;
- * they should be decoupled from the protocol at which time we can
- * pack them and reduce the size of the array to a minimum.
- */
-#define	AH_ALG_MAX	16
-
-struct ahstat {
-	uint64_t	ahs_hdrops;	/* Packet shorter than header shows */
-	uint64_t	ahs_nopf;	/* Protocol family not supported */
-	uint64_t	ahs_notdb;
-	uint64_t	ahs_badkcr;
-	uint64_t	ahs_badauth;
-	uint64_t	ahs_noxform;
-	uint64_t	ahs_qfull;
-	uint64_t	ahs_wrap;
-	uint64_t	ahs_replay;
-	uint64_t	ahs_badauthl;	/* Bad authenticator length */
-	uint64_t	ahs_input;	/* Input AH packets */
-	uint64_t	ahs_output;	/* Output AH packets */
-	uint64_t	ahs_invalid;	/* Trying to use an invalid TDB */
-	uint64_t	ahs_ibytes;	/* Input bytes */
-	uint64_t	ahs_obytes;	/* Output bytes */
-	uint64_t	ahs_toobig;	/* Packet got larger than IP_MAXPACKET */
-	uint64_t	ahs_pdrops;	/* Packet blocked due to policy */
-	uint64_t	ahs_crypto;	/* Crypto processing failure */
-	uint64_t	ahs_tunnel;	/* Tunnel sanity check failure */
-	uint64_t	ahs_hist[AH_ALG_MAX];	/* Per-algorithm op count */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_DECLARE(int, ah_enable);
-VNET_DECLARE(int, ah_cleartos);
-VNET_PCPUSTAT_DECLARE(struct ahstat, ahstat);
-
-#define	AHSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct ahstat, ahstat, name , (val))
-#define	AHSTAT_INC(name)	AHSTAT_ADD(name, 1)
-#define	V_ah_enable		VNET(ah_enable)
-#define	V_ah_cleartos		VNET(ah_cleartos)
-#endif /* _KERNEL */
-#endif /*_NETIPSEC_AH_VAR_H_*/
diff --git a/include.new/netipsec/esp.h b/include.new/netipsec/esp.h
deleted file mode 100644
index c121186..0000000
--- a/include.new/netipsec/esp.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/esp.h 139823 2005-01-07 01:45:51Z imp $	*/
-/*	$KAME: esp.h,v 1.16 2000/10/18 21:28:00 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * RFC1827/2406 Encapsulated Security Payload.
- */
-
-#ifndef _NETIPSEC_ESP_H_
-#define _NETIPSEC_ESP_H_
-
-struct esp {
-	uint32_t	esp_spi;	/* ESP */
-	/*variable size, 32bit bound*/	/* Initialization Vector */
-	/*variable size*/		/* Payload data */
-	/*variable size*/		/* padding */
-	/*8bit*/			/* pad size */
-	/*8bit*/			/* next header */
-	/*8bit*/			/* next header */
-	/*variable size, 32bit bound*/	/* Authentication data (new IPsec) */
-};
-
-struct newesp {
-	uint32_t	esp_spi;	/* ESP */
-	uint32_t	esp_seq;	/* Sequence number */
-	/*variable size*/		/* (IV and) Payload data */
-	/*variable size*/		/* padding */
-	/*8bit*/			/* pad size */
-	/*8bit*/			/* next header */
-	/*8bit*/			/* next header */
-	/*variable size, 32bit bound*/	/* Authentication data */
-};
-
-struct esptail {
-	u_int8_t	esp_padlen;	/* pad length */
-	u_int8_t	esp_nxt;	/* Next header */
-	/*variable size, 32bit bound*/	/* Authentication data (new IPsec)*/
-};
-	
-#define ESP_ALEN	12	/* 96-bit authenticator */
-#endif /*_NETIPSEC_ESP_H_*/
diff --git a/include.new/netipsec/esp_var.h b/include.new/netipsec/esp_var.h
deleted file mode 100644
index 8076660..0000000
--- a/include.new/netipsec/esp_var.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/esp_var.h 253088 2013-07-09 10:08:13Z ae $	*/
-/*	$OpenBSD: ip_esp.h,v 1.37 2002/06/09 16:26:10 itojun Exp $	*/
-/*-
- * The authors of this code are John Ioannidis (ji@tla.org),
- * Angelos D. Keromytis (kermit@csd.uch.gr) and
- * Niels Provos (provos@physnet.uni-hamburg.de).
- *
- * The original version of this code was written by John Ioannidis
- * for BSD/OS in Athens, Greece, in November 1995.
- *
- * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
- * by Angelos D. Keromytis.
- *
- * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis
- * and Niels Provos.
- *
- * Additional features in 1999 by Angelos D. Keromytis.
- *
- * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis,
- * Angelos D. Keromytis and Niels Provos.
- * Copyright (c) 2001 Angelos D. Keromytis.
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all copies of any software which is or includes a copy or
- * modification of this software.
- * You may use this code under the GNU public license if you so wish. Please
- * contribute changes back to the authors under this freer than GPL license
- * so that we may further the use of strong encryption without limitations to
- * all.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- */
-
-#ifndef _NETIPSEC_ESP_VAR_H_
-#define _NETIPSEC_ESP_VAR_H_
-
-/*
- * These define the algorithm indices into the histogram.  They're
- * presently based on the PF_KEY v2 protocol values which is bogus;
- * they should be decoupled from the protocol at which time we can
- * pack them and reduce the size of the array to a reasonable value.
- */
-#define	ESP_ALG_MAX	256		/* NB: could be < but skipjack is 249 */
-
-struct espstat {
-	uint64_t	esps_hdrops;	/* Packet shorter than header shows */
-	uint64_t	esps_nopf;	/* Protocol family not supported */
-	uint64_t	esps_notdb;
-	uint64_t	esps_badkcr;
-	uint64_t	esps_qfull;
-	uint64_t	esps_noxform;
-	uint64_t	esps_badilen;
-	uint64_t	esps_wrap;	/* Replay counter wrapped around */
-	uint64_t	esps_badenc;	/* Bad encryption detected */
-	uint64_t	esps_badauth;	/* Only valid for transforms with auth */
-	uint64_t	esps_replay;	/* Possible packet replay detected */
-	uint64_t	esps_input;	/* Input ESP packets */
-	uint64_t	esps_output;	/* Output ESP packets */
-	uint64_t	esps_invalid;	/* Trying to use an invalid TDB */
-	uint64_t	esps_ibytes;	/* Input bytes */
-	uint64_t	esps_obytes;	/* Output bytes */
-	uint64_t	esps_toobig;	/* Packet got larger than IP_MAXPACKET */
-	uint64_t	esps_pdrops;	/* Packet blocked due to policy */
-	uint64_t	esps_crypto;	/* Crypto processing failure */
-	uint64_t	esps_tunnel;	/* Tunnel sanity check failure */
-	uint64_t	esps_hist[ESP_ALG_MAX];	/* Per-algorithm op count */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_DECLARE(int, esp_enable);
-VNET_PCPUSTAT_DECLARE(struct espstat, espstat);
-
-#define	ESPSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct espstat, espstat, name, (val))
-#define	ESPSTAT_INC(name)	ESPSTAT_ADD(name, 1)
-#define	V_esp_enable	VNET(esp_enable)
-#endif /* _KERNEL */
-#endif /*_NETIPSEC_ESP_VAR_H_*/
diff --git a/include.new/netipsec/ipcomp.h b/include.new/netipsec/ipcomp.h
deleted file mode 100644
index 8d504f1..0000000
--- a/include.new/netipsec/ipcomp.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/ipcomp.h 139823 2005-01-07 01:45:51Z imp $	*/
-/*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * RFC2393 IP payload compression protocol (IPComp).
- */
-
-#ifndef _NETIPSEC_IPCOMP_H_
-#define _NETIPSEC_IPCOMP_H_
-
-struct ipcomp {
-	u_int8_t comp_nxt;	/* Next Header */
-	u_int8_t comp_flags;	/* reserved, must be zero */
-	u_int16_t comp_cpi;	/* Compression parameter index */
-};
-
-#define	IPCOMP_HLENGTH	4	/* Length of IPCOMP header */
-
-/* well-known algorithm number (in CPI), from RFC2409 */
-#define IPCOMP_OUI	1	/* vendor specific */
-#define IPCOMP_DEFLATE	2	/* RFC2394 */
-#define IPCOMP_LZS	3	/* RFC2395 */
-#define IPCOMP_MAX	4
-
-#define IPCOMP_CPI_NEGOTIATE_MIN	256
-#endif /*_NETIPSEC_IPCOMP_H_*/
diff --git a/include.new/netipsec/ipcomp_var.h b/include.new/netipsec/ipcomp_var.h
deleted file mode 100644
index 7b1c04b..0000000
--- a/include.new/netipsec/ipcomp_var.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/ipcomp_var.h 253088 2013-07-09 10:08:13Z ae $	*/
-/*	$KAME: ipcomp.h,v 1.8 2000/09/26 07:55:14 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETIPSEC_IPCOMP_VAR_H_
-#define _NETIPSEC_IPCOMP_VAR_H_
-
-/*
- * These define the algorithm indices into the histogram.  They're
- * presently based on the PF_KEY v2 protocol values which is bogus;
- * they should be decoupled from the protocol at which time we can
- * pack them and reduce the size of the array to a minimum.
- */
-#define	IPCOMP_ALG_MAX	8
-
-#define	IPCOMPSTAT_VERSION	2
-struct ipcompstat {
-	uint64_t	ipcomps_hdrops;	/* Packet shorter than header shows */
-	uint64_t	ipcomps_nopf;	/* Protocol family not supported */
-	uint64_t	ipcomps_notdb;
-	uint64_t	ipcomps_badkcr;
-	uint64_t	ipcomps_qfull;
-	uint64_t	ipcomps_noxform;
-	uint64_t	ipcomps_wrap;
-	uint64_t	ipcomps_input;	/* Input IPcomp packets */
-	uint64_t	ipcomps_output;	/* Output IPcomp packets */
-	uint64_t	ipcomps_invalid;/* Trying to use an invalid TDB */
-	uint64_t	ipcomps_ibytes;	/* Input bytes */
-	uint64_t	ipcomps_obytes;	/* Output bytes */
-	uint64_t	ipcomps_toobig;	/* Packet got > IP_MAXPACKET */
-	uint64_t	ipcomps_pdrops;	/* Packet blocked due to policy */
-	uint64_t	ipcomps_crypto;	/* "Crypto" processing failure */
-	uint64_t	ipcomps_hist[IPCOMP_ALG_MAX];/* Per-algorithm op count */
-	uint64_t	ipcomps_threshold; /* Packet < comp. algo. threshold. */
-	uint64_t	ipcomps_uncompr; /* Compression was useles. */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_DECLARE(int, ipcomp_enable);
-VNET_PCPUSTAT_DECLARE(struct ipcompstat, ipcompstat);
-
-#define	IPCOMPSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct ipcompstat, ipcompstat, name, (val))
-#define	IPCOMPSTAT_INC(name)		IPCOMPSTAT_ADD(name, 1)
-#define	V_ipcomp_enable		VNET(ipcomp_enable)
-#endif /* _KERNEL */
-#endif /*_NETIPSEC_IPCOMP_VAR_H_*/
diff --git a/include.new/netipsec/ipip_var.h b/include.new/netipsec/ipip_var.h
deleted file mode 100644
index afcca2d..0000000
--- a/include.new/netipsec/ipip_var.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/ipip_var.h 253088 2013-07-09 10:08:13Z ae $	*/
-/*	$OpenBSD: ip_ipip.h,v 1.5 2002/06/09 16:26:10 itojun Exp $ */
-/*-
- * The authors of this code are John Ioannidis (ji@tla.org),
- * Angelos D. Keromytis (kermit@csd.uch.gr) and
- * Niels Provos (provos@physnet.uni-hamburg.de).
- *
- * The original version of this code was written by John Ioannidis
- * for BSD/OS in Athens, Greece, in November 1995.
- *
- * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
- * by Angelos D. Keromytis.
- *
- * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis
- * and Niels Provos.
- *
- * Additional features in 1999 by Angelos D. Keromytis.
- *
- * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis,
- * Angelos D. Keromytis and Niels Provos.
- * Copyright (c) 2001, Angelos D. Keromytis.
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all copies of any software which is or includes a copy or
- * modification of this software.
- * You may use this code under the GNU public license if you so wish. Please
- * contribute changes back to the authors under this freer than GPL license
- * so that we may further the use of strong encryption without limitations to
- * all.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- */
-
-#ifndef _NETINET_IPIP_H_
-#define _NETINET_IPIP_H_
-
-/*
- * IP-inside-IP processing.
- * Not quite all the functionality of RFC-1853, but the main idea is there.
- */
-
-struct ipipstat {
-	uint64_t	ipips_ipackets;	/* total input packets */
-	uint64_t	ipips_opackets;	/* total output packets */
-	uint64_t	ipips_hdrops;	/* packet shorter than header shows */
-	uint64_t	ipips_qfull;
-	uint64_t	ipips_ibytes;
-	uint64_t	ipips_obytes;
-	uint64_t	ipips_pdrops;	/* packet dropped due to policy */
-	uint64_t	ipips_spoof;	/* IP spoofing attempts */
-	uint64_t	ipips_family;	/* Protocol family mismatch */
-	uint64_t	ipips_unspec;   /* Missing tunnel endpoint address */
-};
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_DECLARE(int, ipip_allow);
-VNET_PCPUSTAT_DECLARE(struct ipipstat, ipipstat);
-
-#define	IPIPSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct ipipstat, ipipstat, name, (val))
-#define	IPIPSTAT_INC(name)	IPIPSTAT_ADD(name, 1)
-#define	V_ipip_allow		VNET(ipip_allow)
-#endif /* _KERNEL */
-#endif /* _NETINET_IPIP_H_ */
diff --git a/include.new/netipsec/ipsec.h b/include.new/netipsec/ipsec.h
deleted file mode 100644
index 53a4655..0000000
--- a/include.new/netipsec/ipsec.h
+++ /dev/null
@@ -1,402 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/ipsec.h 283902 2015-06-02 03:43:36Z ae $	*/
-/*	$KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * IPsec controller part.
- */
-
-#ifndef _NETIPSEC_IPSEC_H_
-#define _NETIPSEC_IPSEC_H_
-
-#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE)
-#include "opt_inet.h"
-#include "opt_ipsec.h"
-#endif
-
-#include <net/pfkeyv2.h>
-#include <netipsec/keydb.h>
-
-#ifdef _KERNEL
-
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/_rwlock.h>
-
-#define	IPSEC_ASSERT(_c,_m) KASSERT(_c, _m)
-
-#define	IPSEC_IS_PRIVILEGED_SO(_so) \
-	((_so)->so_cred != NULL && \
-	 priv_check_cred((_so)->so_cred, PRIV_NETINET_IPSEC, 0) \
-	 == 0)
-
-/*
- * Security Policy Index
- * Ensure that both address families in the "src" and "dst" are same.
- * When the value of the ul_proto is ICMPv6, the port field in "src"
- * specifies ICMPv6 type, and the port field in "dst" specifies ICMPv6 code.
- */
-struct secpolicyindex {
-	u_int8_t dir;			/* direction of packet flow, see below */
-	union sockaddr_union src;	/* IP src address for SP */
-	union sockaddr_union dst;	/* IP dst address for SP */
-	u_int8_t prefs;			/* prefix length in bits for src */
-	u_int8_t prefd;			/* prefix length in bits for dst */
-	u_int16_t ul_proto;		/* upper layer Protocol */
-#ifdef notyet
-	uid_t uids;
-	uid_t uidd;
-	gid_t gids;
-	gid_t gidd;
-#endif
-};
-
-/* Security Policy Data Base */
-struct secpolicy {
-	LIST_ENTRY(secpolicy) chain;
-	struct mtx lock;
-
-	u_int refcnt;			/* reference count */
-	struct secpolicyindex spidx;	/* selector */
-	uint32_t id;			/* It's unique number on the system. */
-	u_int state;			/* 0: dead, others: alive */
-#define IPSEC_SPSTATE_DEAD	0
-#define IPSEC_SPSTATE_ALIVE	1
-	u_int policy;			/* policy_type per pfkeyv2.h */
-	u_int16_t scangen;		/* scan generation # */
-	struct ipsecrequest *req;
-				/* pointer to the ipsec request tree, */
-				/* if policy == IPSEC else this value == NULL.*/
-
-	/*
-	 * lifetime handler.
-	 * the policy can be used without limitiation if both lifetime and
-	 * validtime are zero.
-	 * "lifetime" is passed by sadb_lifetime.sadb_lifetime_addtime.
-	 * "validtime" is passed by sadb_lifetime.sadb_lifetime_usetime.
-	 */
-	time_t created;		/* time created the policy */
-	time_t lastused;	/* updated every when kernel sends a packet */
-	long lifetime;		/* duration of the lifetime of this policy */
-	long validtime;		/* duration this policy is valid without use */
-};
-
-#define	SECPOLICY_LOCK_INIT(_sp) \
-	mtx_init(&(_sp)->lock, "ipsec policy", NULL, MTX_DEF)
-#define	SECPOLICY_LOCK(_sp)		mtx_lock(&(_sp)->lock)
-#define	SECPOLICY_UNLOCK(_sp)		mtx_unlock(&(_sp)->lock)
-#define	SECPOLICY_LOCK_DESTROY(_sp)	mtx_destroy(&(_sp)->lock)
-#define	SECPOLICY_LOCK_ASSERT(_sp)	mtx_assert(&(_sp)->lock, MA_OWNED)
-
-/* Request for IPsec */
-struct ipsecrequest {
-	struct ipsecrequest *next;
-				/* pointer to next structure */
-				/* If NULL, it means the end of chain. */
-	struct secasindex saidx;/* hint for search proper SA */
-				/* if __ss_len == 0 then no address specified.*/
-	u_int level;		/* IPsec level defined below. */
-
-	struct secasvar *sav;	/* place holder of SA for use */
-	struct secpolicy *sp;	/* back pointer to SP */
-	struct rwlock lock;	/* to interlock updates */
-};
-
-/*
- * Need recursion for when crypto callbacks happen directly,
- * as in the case of software crypto.  Need to look at how
- * hard it is to remove this...
- */
-#define	IPSECREQUEST_LOCK_INIT(_isr) \
-	rw_init_flags(&(_isr)->lock, "ipsec request", RW_RECURSE)
-#define	IPSECREQUEST_LOCK(_isr)		rw_rlock(&(_isr)->lock)
-#define	IPSECREQUEST_UNLOCK(_isr)	rw_runlock(&(_isr)->lock)
-#define	IPSECREQUEST_WLOCK(_isr)	rw_wlock(&(_isr)->lock)
-#define	IPSECREQUEST_WUNLOCK(_isr)	rw_wunlock(&(_isr)->lock)
-#define	IPSECREQUEST_UPGRADE(_isr)	rw_try_upgrade(&(_isr)->lock)
-#define	IPSECREQUEST_DOWNGRADE(_isr)	rw_downgrade(&(_isr)->lock)
-#define	IPSECREQUEST_LOCK_DESTROY(_isr)	rw_destroy(&(_isr)->lock)
-#define	IPSECREQUEST_LOCK_ASSERT(_isr)	rw_assert(&(_isr)->lock, RA_LOCKED)
-
-/* security policy in PCB */
-struct inpcbpolicy {
-	struct secpolicy *sp_in;
-	struct secpolicy *sp_out;
-	int priv;			/* privileged socket ? */
-};
-
-/* SP acquiring list table. */
-struct secspacq {
-	LIST_ENTRY(secspacq) chain;
-
-	struct secpolicyindex spidx;
-
-	time_t created;		/* for lifetime */
-	int count;		/* for lifetime */
-	/* XXX: here is mbuf place holder to be sent ? */
-};
-#endif /* _KERNEL */
-
-/* according to IANA assignment, port 0x0000 and proto 0xff are reserved. */
-#define IPSEC_PORT_ANY		0
-#define IPSEC_ULPROTO_ANY	255
-#define IPSEC_PROTO_ANY		255
-
-/* mode of security protocol */
-/* NOTE: DON'T use IPSEC_MODE_ANY at SPD.  It's only use in SAD */
-#define	IPSEC_MODE_ANY		0	/* i.e. wildcard. */
-#define	IPSEC_MODE_TRANSPORT	1
-#define	IPSEC_MODE_TUNNEL	2
-#define	IPSEC_MODE_TCPMD5	3	/* TCP MD5 mode */
-
-/*
- * Direction of security policy.
- * NOTE: Since INVALID is used just as flag.
- * The other are used for loop counter too.
- */
-#define IPSEC_DIR_ANY		0
-#define IPSEC_DIR_INBOUND	1
-#define IPSEC_DIR_OUTBOUND	2
-#define IPSEC_DIR_MAX		3
-#define IPSEC_DIR_INVALID	4
-
-/* Policy level */
-/*
- * IPSEC, ENTRUST and BYPASS are allowed for setsockopt() in PCB,
- * DISCARD, IPSEC and NONE are allowed for setkey() in SPD.
- * DISCARD and NONE are allowed for system default.
- */
-#define IPSEC_POLICY_DISCARD	0	/* discarding packet */
-#define IPSEC_POLICY_NONE	1	/* through IPsec engine */
-#define IPSEC_POLICY_IPSEC	2	/* do IPsec */
-#define IPSEC_POLICY_ENTRUST	3	/* consulting SPD if present. */
-#define IPSEC_POLICY_BYPASS	4	/* only for privileged socket. */
-
-/* Security protocol level */
-#define	IPSEC_LEVEL_DEFAULT	0	/* reference to system default */
-#define	IPSEC_LEVEL_USE		1	/* use SA if present. */
-#define	IPSEC_LEVEL_REQUIRE	2	/* require SA. */
-#define	IPSEC_LEVEL_UNIQUE	3	/* unique SA. */
-
-#define IPSEC_MANUAL_REQID_MAX	0x3fff
-				/*
-				 * if security policy level == unique, this id
-				 * indicate to a relative SA for use, else is
-				 * zero.
-				 * 1 - 0x3fff are reserved for manual keying.
-				 * 0 are reserved for above reason.  Others is
-				 * for kernel use.
-				 * Note that this id doesn't identify SA
-				 * by only itself.
-				 */
-#define IPSEC_REPLAYWSIZE  32
-
-/* statistics for ipsec processing */
-struct ipsecstat {
-	uint64_t ips_in_polvio;		/* input: sec policy violation */
-	uint64_t ips_in_nomem;		/* input: no memory available */
-	uint64_t ips_in_inval;		/* input: generic error */
-
-	uint64_t ips_out_polvio;	/* output: sec policy violation */
-	uint64_t ips_out_nosa;		/* output: SA unavailable  */
-	uint64_t ips_out_nomem;		/* output: no memory available */
-	uint64_t ips_out_noroute;	/* output: no route available */
-	uint64_t ips_out_inval;		/* output: generic error */
-	uint64_t ips_out_bundlesa;	/* output: bundled SA processed */
-
-	uint64_t ips_mbcoalesced;	/* mbufs coalesced during clone */
-	uint64_t ips_clcoalesced;	/* clusters coalesced during clone */
-	uint64_t ips_clcopied;		/* clusters copied during clone */
-	uint64_t ips_mbinserted;	/* mbufs inserted during makespace */
-	/* 
-	 * Temporary statistics for performance analysis.
-	 */
-	/* See where ESP/AH/IPCOMP header land in mbuf on input */
-	uint64_t ips_input_front;
-	uint64_t ips_input_middle;
-	uint64_t ips_input_end;
-};
-
-/*
- * Definitions for IPsec & Key sysctl operations.
- */
-/*
- * Names for IPsec & Key sysctl objects
- */
-#define IPSECCTL_STATS			1	/* stats */
-#define IPSECCTL_DEF_POLICY		2
-#define IPSECCTL_DEF_ESP_TRANSLEV	3	/* int; ESP transport mode */
-#define IPSECCTL_DEF_ESP_NETLEV		4	/* int; ESP tunnel mode */
-#define IPSECCTL_DEF_AH_TRANSLEV	5	/* int; AH transport mode */
-#define IPSECCTL_DEF_AH_NETLEV		6	/* int; AH tunnel mode */
-#if 0	/* obsolete, do not reuse */
-#define IPSECCTL_INBOUND_CALL_IKE	7
-#endif
-#define	IPSECCTL_AH_CLEARTOS		8
-#define	IPSECCTL_AH_OFFSETMASK		9
-#define	IPSECCTL_DFBIT			10
-#define	IPSECCTL_ECN			11
-#define	IPSECCTL_DEBUG			12
-#define	IPSECCTL_ESP_RANDPAD		13
-#define IPSECCTL_MAXID			14
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-struct ipsec_output_state {
-	struct mbuf *m;
-	struct route *ro;
-	struct sockaddr *dst;
-};
-
-struct ipsec_history {
-	int ih_proto;
-	uint32_t ih_spi;
-};
-
-VNET_DECLARE(int, ipsec_debug);
-#define	V_ipsec_debug		VNET(ipsec_debug)
-
-#ifdef REGRESSION
-VNET_DECLARE(int, ipsec_replay);
-VNET_DECLARE(int, ipsec_integrity);
-
-#define	V_ipsec_replay		VNET(ipsec_replay)
-#define	V_ipsec_integrity	VNET(ipsec_integrity)
-#endif
-
-VNET_PCPUSTAT_DECLARE(struct ipsecstat, ipsec4stat);
-VNET_DECLARE(struct secpolicy, ip4_def_policy);
-VNET_DECLARE(int, ip4_esp_trans_deflev);
-VNET_DECLARE(int, ip4_esp_net_deflev);
-VNET_DECLARE(int, ip4_ah_trans_deflev);
-VNET_DECLARE(int, ip4_ah_net_deflev);
-VNET_DECLARE(int, ip4_ah_offsetmask);
-VNET_DECLARE(int, ip4_ipsec_dfbit);
-VNET_DECLARE(int, ip4_ipsec_ecn);
-VNET_DECLARE(int, ip4_esp_randpad);
-VNET_DECLARE(int, crypto_support);
-
-#define	IPSECSTAT_INC(name)	\
-    VNET_PCPUSTAT_ADD(struct ipsecstat, ipsec4stat, name, 1)
-#define	V_ip4_def_policy	VNET(ip4_def_policy)
-#define	V_ip4_esp_trans_deflev	VNET(ip4_esp_trans_deflev)
-#define	V_ip4_esp_net_deflev	VNET(ip4_esp_net_deflev)
-#define	V_ip4_ah_trans_deflev	VNET(ip4_ah_trans_deflev)
-#define	V_ip4_ah_net_deflev	VNET(ip4_ah_net_deflev)
-#define	V_ip4_ah_offsetmask	VNET(ip4_ah_offsetmask)
-#define	V_ip4_ipsec_dfbit	VNET(ip4_ipsec_dfbit)
-#define	V_ip4_ipsec_ecn		VNET(ip4_ipsec_ecn)
-#define	V_ip4_esp_randpad	VNET(ip4_esp_randpad)
-#define	V_crypto_support	VNET(crypto_support)
-
-#define ipseclog(x)	do { if (V_ipsec_debug) log x; } while (0)
-/* for openbsd compatibility */
-#define	DPRINTF(x)	do { if (V_ipsec_debug) printf x; } while (0)
-
-extern	struct ipsecrequest *ipsec_newisr(void);
-extern	void ipsec_delisr(struct ipsecrequest *);
-
-struct tdb_ident;
-extern struct secpolicy *ipsec_getpolicy(struct tdb_ident*, u_int);
-struct inpcb;
-extern struct secpolicy *ipsec4_checkpolicy(struct mbuf *, u_int, u_int,
-	int *, struct inpcb *);
-extern struct secpolicy * ipsec_getpolicybyaddr(struct mbuf *, u_int,
-	int, int *);
-
-struct inpcb;
-extern int ipsec_init_policy(struct socket *so, struct inpcbpolicy **);
-extern int ipsec_copy_policy(struct inpcbpolicy *, struct inpcbpolicy *);
-extern u_int ipsec_get_reqlevel(struct ipsecrequest *);
-extern int ipsec_in_reject(struct secpolicy *, struct mbuf *);
-
-extern int ipsec_set_policy(struct inpcb *inp, int optname,
-	caddr_t request, size_t len, struct ucred *cred);
-extern int ipsec_get_policy(struct inpcb *inpcb, caddr_t request,
-	size_t len, struct mbuf **mp);
-extern int ipsec_delete_pcbpolicy(struct inpcb *);
-extern int ipsec4_in_reject(struct mbuf *, struct inpcb *);
-
-struct secas;
-struct tcpcb;
-extern int ipsec_chkreplay(uint32_t, struct secasvar *);
-extern int ipsec_updatereplay(uint32_t, struct secasvar *);
-
-extern size_t ipsec_hdrsiz(struct mbuf *, u_int, struct inpcb *);
-extern size_t ipsec_hdrsiz_tcp(struct tcpcb *);
-
-union sockaddr_union;
-extern char * ipsec_address(union sockaddr_union* sa);
-extern const char *ipsec_logsastr(struct secasvar *);
-
-extern void ipsec_dumpmbuf(struct mbuf *);
-
-struct m_tag;
-extern void ah4_input(struct mbuf *m, int off);
-extern void ah4_ctlinput(int cmd, struct sockaddr *sa, void *);
-extern void esp4_input(struct mbuf *m, int off);
-extern void esp4_ctlinput(int cmd, struct sockaddr *sa, void *);
-extern void ipcomp4_input(struct mbuf *m, int off);
-extern int ipsec4_common_input(struct mbuf *m, ...);
-extern int ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
-			int skip, int protoff, struct m_tag *mt);
-extern int ipsec4_process_packet(struct mbuf *, struct ipsecrequest *,
-			int, int);
-extern int ipsec_process_done(struct mbuf *, struct ipsecrequest *);
-
-extern struct mbuf *ipsec_copypkt(struct mbuf *);
-
-extern	void m_checkalignment(const char* where, struct mbuf *m0,
-		int off, int len);
-extern	struct mbuf *m_makespace(struct mbuf *m0, int skip, int hlen, int *off);
-extern	caddr_t m_pad(struct mbuf *m, int n);
-extern	int m_striphdr(struct mbuf *m, int skip, int hlen);
-
-#ifdef DEV_ENC
-#define	ENC_BEFORE	0x0001
-#define	ENC_AFTER	0x0002
-#define	ENC_IN		0x0100
-#define	ENC_OUT		0x0200
-extern	int ipsec_filter(struct mbuf **, int, int);
-extern	void ipsec_bpf(struct mbuf *, struct secasvar *, int, int);
-#endif
-#endif /* _KERNEL */
-
-#ifndef _KERNEL
-extern caddr_t ipsec_set_policy(char *, int);
-extern int ipsec_get_policylen(caddr_t);
-extern char *ipsec_dump_policy(caddr_t, char *);
-extern const char *ipsec_strerror(void);
-
-#endif /* ! KERNEL */
-
-#endif /* _NETIPSEC_IPSEC_H_ */
diff --git a/include.new/netipsec/ipsec6.h b/include.new/netipsec/ipsec6.h
deleted file mode 100644
index 31535b3..0000000
--- a/include.new/netipsec/ipsec6.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/ipsec6.h 283902 2015-06-02 03:43:36Z ae $	*/
-/*	$KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * IPsec controller part.
- */
-
-#ifndef _NETIPSEC_IPSEC6_H_
-#define _NETIPSEC_IPSEC6_H_
-
-#include <net/pfkeyv2.h>
-#include <netipsec/keydb.h>
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-VNET_PCPUSTAT_DECLARE(struct ipsecstat, ipsec6stat);
-VNET_DECLARE(int, ip6_esp_trans_deflev);
-VNET_DECLARE(int, ip6_esp_net_deflev);
-VNET_DECLARE(int, ip6_ah_trans_deflev);
-VNET_DECLARE(int, ip6_ah_net_deflev);
-VNET_DECLARE(int, ip6_ipsec_ecn);
-
-#define	IPSEC6STAT_INC(name)	\
-    VNET_PCPUSTAT_ADD(struct ipsecstat, ipsec6stat, name, 1)
-#define	V_ip6_esp_trans_deflev	VNET(ip6_esp_trans_deflev)
-#define	V_ip6_esp_net_deflev	VNET(ip6_esp_net_deflev)
-#define	V_ip6_ah_trans_deflev	VNET(ip6_ah_trans_deflev)
-#define	V_ip6_ah_net_deflev	VNET(ip6_ah_net_deflev)
-#define	V_ip6_ipsec_ecn		VNET(ip6_ipsec_ecn)
-
-struct inpcb;
-extern int ipsec6_in_reject(struct mbuf *, struct inpcb *);
-
-struct m_tag;
-extern int ipsec6_common_input(struct mbuf **mp, int *offp, int proto);
-extern int ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav,
-			int skip, int protoff, struct m_tag *mt);
-extern void esp6_ctlinput(int, struct sockaddr *, void *);
-extern int ipsec6_process_packet(struct mbuf *, struct ipsecrequest *);
-#endif /*_KERNEL*/
-
-#endif /*_NETIPSEC_IPSEC6_H_*/
diff --git a/include.new/netipsec/ipsec_osdep.h b/include.new/netipsec/ipsec_osdep.h
deleted file mode 100644
index 12ee9c3..0000000
--- a/include.new/netipsec/ipsec_osdep.h
+++ /dev/null
@@ -1,308 +0,0 @@
-/*	$FreeBSD: src/sys/netipsec/ipsec_osdep.h,v 1.2.2.1 2006/09/04 10:36:47 pjd Exp $	*/
-/*	$NetBSD: ipsec_osdep.h,v 1.1 2003/08/13 20:06:51 jonathan Exp $	*/
-
-/*-
- * Copyright (c) 2003 Jonathan Stone (jonathan@cs.stanford.edu)
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#ifndef NETIPSEC_OSDEP_H
-#define NETIPSEC_OSDEP_H
-
-/* 
- *  Hide porting differences across different 4.4BSD-derived platforms.
- * 
- * 1.  KASSERT() differences: 
- * 2.  Kernel  Random-number API differences.
- * 3.  Is packet data in an mbuf object writeable?
- * 4.  Packet-header semantics.
- * 5.  Fast mbuf-cluster allocation.
- * 6.  Network packet-output macros.
- * 7.  Elased time, in seconds.
- * 8.  Test if a  socket object opened by  a privileged (super) user.
- * 9.  Global SLIST of all open raw sockets.
- * 10. Global SLIST of known interface addresses.
- */
-
-/*
- *  1. KASSERT and spl differences 
- *
- * FreeBSD takes an expression and  parenthesized printf() argument-list.
- * NetBSD takes one arg: the expression being asserted.
- * FreeBSD's SPLASSERT() takes an SPL level as 1st arg and a
- * parenthesized printf-format argument list as the second argument.
- *
- * This difference is hidden by two 2-argument macros and one 1-arg macro:
- *    IPSEC_ASSERT(expr, msg)
- *    IPSEC_SPLASSERT(spl, msg)
- * One further difference is the spl names:
- *    NetBSD splsoftnet equates to FreeBSD splnet;
- *    NetBSD splnet equates to FreeBSD splimp.
- * which is hidden by the macro IPSEC_SPLASSERT_SOFTNET(msg).
- */
-#ifdef __FreeBSD__
-#if __FreeBSD_version < 500000
-#define IPSEC_SPLASSERT(_x,_y) SPLASSERT(_x, _y)
-#else
-#define IPSEC_SPLASSERT(_x,_y)
-#endif
-#define IPSEC_SPLASSERT_SOFTNET(_m) IPSEC_SPLASSERT(net,_m)
-#define IPSEC_ASSERT(_c,_m) KASSERT(_c, _m)
-#endif	/* __FreeBSD__ */
-
-#ifdef	__NetBSD__
-#define IPSEC_SPLASSERT(x,y) (void)0
-#define IPSEC_ASSERT(c,m) KASSERT(c)
-#define IPSEC_SPLASSERT_SOFTNET(m) IPSEC_SPLASSERT(softnet, m)
-#endif	/* __NetBSD__ */
-
-/*
- * 2. Kernel Randomness API.
- * FreeBSD uses:
- *    u_int read_random(void *outbuf, int nbytes).
- */
-#ifdef __FreeBSD__
-#include <sys/random.h>
-/* do nothing, use native random code. */
-#endif /* __FreeBSD__ */
-
-#ifdef	__NetBSD__
-#include <sys/rnd.h>
-static __inline u_int read_random(void *p, u_int len);
-
-static __inline u_int
-read_random(void *bufp, u_int len) 
-{ 
-	return rnd_extract_data(bufp, len, RND_EXTRACT_ANY /*XXX FIXME */);
-}
-#endif	/* __NetBSD__ */
-
-/*
- * 3. Test for mbuf mutability
- * FreeBSD 4.x uses: M_EXT_WRITABLE
- * NetBSD has M_READONLY(). Use !M_READONLY().
- * Not an exact match to FreeBSD semantics, but adequate for IPsec purposes.
- * 
- */
-#ifdef __NetBSD__
-/* XXX wrong, but close enough for restricted ipsec usage. */
-#define M_EXT_WRITABLE(m) (!M_READONLY(m))
-#endif	/* __NetBSD__ */
-
-/*
- * 4. mbuf packet-header/packet-tag semantics.
- * Sam Leffler explains, in private email, some problems with
- * M_COPY_PKTHDR(), and why FreeBSD deprecated it and replaced it
- * with new, explicit macros M_MOVE_PKTHDR()/M_DUP_PKTHDR().
- * he original fast-ipsec source uses M_MOVE_PKTHDR.
- * NetBSD currently still uses M_COPY_PKTHDR(), so we define
- * M_MOVE_PKTHDR in terms of M_COPY_PKTHDR().  Fast-IPsec
- * will delete the source mbuf shortly after copying packet tags,
- * so we are safe for fast-ipsec but not in general..
- */
-#ifdef __NetBSD__
-#define M_MOVE_PKTHDR(_f, _t) M_COPY_PKTHDR(_f, _t)
-#endif /* __NetBSD__ */
-
-
-/*
- * 5. Fast mbuf-cluster allocation.
- * FreeBSD 4.6 introduce m_getcl(), which performs `fast' allocation
- * mbuf clusters from a cache of recently-freed clusters. (If the  cache
- * is empty, new clusters are allocated en-masse).
- *   On NetBSD, for now, implement the `cache' as an inline  function
- *using normal NetBSD mbuf/cluster allocation macros. Replace this
- * with fast-cache code, if and when netBSD  implements one.
- */
-#ifdef __NetBSD__
-static __inline struct mbuf *
-m_getcl(int how, short type, int flags)
-{
-	struct mbuf *mp;
-	if (flags & M_PKTHDR) 
-		MGETHDR(mp, how, type);
-	else
-		MGET(mp, how,  type);
-	if (mp == NULL)
-		return NULL;
-
-	MCLGET(mp, how);
-	return mp;
-}
-#endif /* __NetBSD__ */
-
-/*
- * 6. Network output macros
- * FreeBSD uses the  IF_HANDOFF(), which raises SPL, enqueues
- * a packet, and updates interface counters. NetBSD has IFQ_ENQUE(),
- * which leaves SPL changes up to the caller. 
- * For now, we provide an emulation of IF_HANOOFF() which works
- * for protocol input queues.
- */
-#ifdef __FreeBSD__ 
-/* nothing to do */
-#endif /* __FreeBSD__ */
-#ifdef __NetBSD__
-#define IF_HANDOFF(ifq, m, f) if_handoff(ifq, m, f, 0)
-  
-#include <net/if.h>
-
-static __inline int
-if_handoff(struct ifqueue *ifq, struct mbuf *m, struct ifnet *ifp, int adjust)
-{
-	int need_if_start = 0;
-	int s = splnet();
-
-	if (IF_QFULL(ifq)) {
-		IF_DROP(ifq);
-		splx(s);
-		m_freem(m);
-		return (0);
-	}
-	if (ifp != NULL) {
-		ifp->if_obytes += m->m_pkthdr.len + adjust;
-		if (m->m_flags & M_MCAST)
-			ifp->if_omcasts++;
-		need_if_start = !(ifp->if_flags & IFF_OACTIVE);
-	}
-	IF_ENQUEUE(ifq, m);
-	if (need_if_start)
-		(*ifp->if_start)(ifp);
-	splx(s);
-	return (1);
-}
-#endif /* __NetBSD__ */
-
-/*
- * 7. Elapsed Time: time_second as time in seconds.
- * Original FreeBSD fast-ipsec code references a FreeBSD kernel global,
- * time_second().  NetBSD: kludge #define to use time_mono_time.tv_sec.
- */
-#ifdef __NetBSD__
-#include <sys/kernel.h>
-#define time_second mono_time.tv_sec
-#endif	/* __NetBSD__ */
-
-/* protosw glue */
-#ifdef __NetBSD__
-#include <sys/protosw.h>
-#define ipprotosw protosw
-#endif	/* __NetBSD__ */
-
-/*
- * 8. Test for "privileged" socket opened by superuser.
- * FreeBSD tests  ((so)->so_cred != NULL && suser_cred((so)->so_cred, SUSER_ALLOWJAIL == 0))
- * NetBSD (1.6N) tests (so)->so_uid == 0).
- * This difference is wrapped inside  the IPSEC_PRIVILEGED_SO() macro.
- *
- */
-#ifdef __FreeBSD__ 
-#define IPSEC_IS_PRIVILEGED_SO(_so) \
-	((_so)->so_cred != NULL && \
-	 suser_cred((_so)->so_cred, SUSER_ALLOWJAIL) == 0)
-#endif	/* __FreeBSD__ */
-
-#ifdef __NetBSD__
-/* superuser opened socket? */
-#define IPSEC_IS_PRIVILEGED_SO(so) ((so)->so_uid == 0)
-#endif	/* __NetBSD__ */
-
-/*
- * 9. Raw socket list
- * FreeBSD uses: listhead = rawcb_list, SLIST()-next field "list".
- * NetBSD  uses: listhead = rawcb, SLIST()-next field "list"
- *
- * This version of fast-ipsec source code  uses rawcb_list as the head,
- *  and (to avoid namespace collisions) uses rcb_list as the "next" field.
- */
-#ifdef __FreeBSD__
-#define rcb_list list
-#endif /* __FreeBSD__ */
-#ifdef __NetBSD__
-#define rawcb_list rawcb
-#endif	/* __NetBSD__ */
-
-
-/*
- * 10. List of all known network interfaces.
- * FreeBSD has listhead in_ifaddread, with ia_link as link.
- * NetBSD has listhead in_ifaddr, with ia_list as link.
- * No name-clahses, so just #define the appropriate names on NetBSD.
- * NB: Is it worth introducing iterator (find-first-list/find-next-list)
- * functions or macros to encapsulate these?
- */
-#ifdef __FreeBSD__
-/* nothing to do for raw interface list */
-#endif	/* FreeBSD */
-#ifdef __NetBSD__
-/* For now, use FreeBSD-compatible names for raw interface list. */
-#define in_ifaddrhead in_ifaddr
-#define ia_link ia_list
-#endif	/* __NetBSD__ */
-
-
-
-
-/*
- * Differences that we don't attempt to hide:
- *
- * A. Initialization code.  This  is the largest difference of all.
- *
- *   FreeBSD uses compile/link-time perl hackery to generate special 
- * .o files  with linker sections  that give the moral equivalent of
- * C++ file-level-object constructors. NetBSD has no such facility.
- *
- * Either we implement it (ideally, in a way that can emulate
- * FreeBSD's SYSINIT() macros), or we must take other means
- * to have the per-file init functions called at some appropriate time.
- *
- * In the absence of SYSINIT(), all the file-level init functions
- * now have "extern" linkage. There is a new fast-ipsec init()
- * function which calls each of the per-file in an appropriate order. 
- * init_main will arrange to call the fast-ipsec init function
- * after the crypto framework has registered its transforms (including
- * any autoconfigured hardware crypto  accelerators) but before
- * initializing the network stack to send or receive  packet.
- *
- * B. Protosw() differences. 
- * CSRG-style BSD TCP/IP uses a generic protocol-dispatch-function
- * where the specific request is identified by an enum argument.
- * FreeBSD replaced that with an array of request-specific
- * function pointers.
- *
- * These differences affect the handlers for key-protocol user requests
- * so pervasively that I gave up on the fast-ipsec code, and re-worked the
- * NetBSD KAME code to match the (relative few) API differences
- * between NetBSD and FreeBSD's KAME netkey, and Fast-IPsec netkey.
- *
- * C. Timeout() versus callout(9):
- * The FreeBSD 4.x netipsec/ code still uses timeout().
- * FreeBSD 4.7 has callout(9), so I just replaced 
- * timeout_*() with the nearest callout_*() equivalents,
- * and added a callout handle to the ipsec context.
- *
- * D. SPL name differences.
- * FreeBSD splnet() equates directly to NetBSD's splsoftnet();
- * FreeBSD uses splimp() where (for networking) NetBSD would use splnet().
- */
-#endif /* NETIPSEC_OSDEP_H */
diff --git a/include.new/netipsec/key.h b/include.new/netipsec/key.h
deleted file mode 100644
index 852fb0d..0000000
--- a/include.new/netipsec/key.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/key.h 283902 2015-06-02 03:43:36Z ae $	*/
-/*	$KAME: key.h,v 1.21 2001/07/27 03:51:30 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETIPSEC_KEY_H_
-#define _NETIPSEC_KEY_H_
-
-#ifdef _KERNEL
-
-struct secpolicy;
-struct secpolicyindex;
-struct ipsecrequest;
-struct secasvar;
-struct sockaddr;
-struct socket;
-struct sadb_msg;
-struct sadb_x_policy;
-struct secasindex;
-union sockaddr_union;
-
-extern void key_addref(struct secpolicy *sp);
-extern	int key_havesp(u_int dir);
-extern struct secpolicy *key_allocsp(struct secpolicyindex *, u_int,
-	const char*, int);
-extern struct secpolicy *key_allocsp2(uint32_t spi, union sockaddr_union *dst,
-	u_int8_t proto, u_int dir, const char*, int);
-extern struct secpolicy *key_newsp(const char*, int);
-#if 0
-extern struct secpolicy *key_gettunnel(const struct sockaddr *,
-	const struct sockaddr *, const struct sockaddr *,
-	const struct sockaddr *, const char*, int);
-#endif
-/* NB: prepend with _ for KAME IPv6 compatbility */
-extern void _key_freesp(struct secpolicy **, const char*, int);
-
-#define	KEY_ALLOCSP(spidx, dir)					\
-	key_allocsp(spidx, dir, __FILE__, __LINE__)
-#define	KEY_ALLOCSP2(spi, dst, proto, dir)			\
-	key_allocsp2(spi, dst, proto, dir, __FILE__, __LINE__)
-#define	KEY_NEWSP()						\
-	key_newsp(__FILE__, __LINE__)
-#if 0
-#define	KEY_GETTUNNEL(osrc, odst, isrc, idst)			\
-	key_gettunnel(osrc, odst, isrc, idst, __FILE__, __LINE__)
-#endif
-#define	KEY_FREESP(spp)						\
-	_key_freesp(spp, __FILE__, __LINE__)
-
-extern struct secasvar *key_allocsa(union sockaddr_union *, u_int, uint32_t,
-	const char*, int);
-extern void key_addrefsa(struct secasvar *, const char*, int);
-extern void key_freesav(struct secasvar **, const char*, int);
-
-#define	KEY_ALLOCSA(dst, proto, spi)				\
-	key_allocsa(dst, proto, spi, __FILE__, __LINE__)
-#define	KEY_ADDREFSA(sav)					\
-	key_addrefsa(sav, __FILE__, __LINE__)
-#define	KEY_FREESAV(psav)					\
-	key_freesav(psav, __FILE__, __LINE__)
-
-extern void key_freeso(struct socket *);
-extern int key_checktunnelsanity(struct secasvar *, u_int,
-    caddr_t, caddr_t);
-extern int key_checkrequest(struct ipsecrequest *isr,
-    const struct secasindex *);
-extern struct secpolicy *key_msg2sp(struct sadb_x_policy *,
-    size_t, int *);
-extern struct mbuf *key_sp2msg(struct secpolicy *);
-extern int key_ismyaddr(struct sockaddr *);
-extern int key_spdacquire(struct secpolicy *);
-extern void key_timehandler(void);
-extern u_long key_random(void);
-extern void key_randomfill(void *, size_t);
-extern void key_freereg(struct socket *);
-extern int key_parse(struct mbuf *, struct socket *);
-extern void key_init(void);
-#ifdef VIMAGE
-extern void key_destroy(void);
-#endif
-extern void key_sa_recordxfer(struct secasvar *, struct mbuf *);
-extern void key_sa_stir_iv(struct secasvar *);
-#ifdef IPSEC_NAT_T
-u_int16_t key_portfromsaddr(struct sockaddr *);
-#define	KEY_PORTFROMSADDR(saddr)				\
-	key_portfromsaddr((struct sockaddr *)(saddr))
-#endif
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_IPSEC_SA);
-MALLOC_DECLARE(M_IPSEC_SAH);
-MALLOC_DECLARE(M_IPSEC_SP);
-MALLOC_DECLARE(M_IPSEC_SR);
-MALLOC_DECLARE(M_IPSEC_MISC);
-MALLOC_DECLARE(M_IPSEC_SAQ);
-MALLOC_DECLARE(M_IPSEC_SAR);
-MALLOC_DECLARE(M_IPSEC_INPCB);
-#endif /* MALLOC_DECLARE */
-
-#endif /* defined(_KERNEL) */
-#endif /* _NETIPSEC_KEY_H_ */
diff --git a/include.new/netipsec/key_debug.h b/include.new/netipsec/key_debug.h
deleted file mode 100644
index f8e2f57..0000000
--- a/include.new/netipsec/key_debug.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/key_debug.h 283902 2015-06-02 03:43:36Z ae $	*/
-/*	$KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETIPSEC_KEY_DEBUG_H_
-#define _NETIPSEC_KEY_DEBUG_H_
-
-#ifdef _KERNEL
-/* debug flags */
-#define KEYDEBUG_STAMP		0x00000001 /* path */
-#define KEYDEBUG_DATA		0x00000002 /* data */
-#define KEYDEBUG_DUMP		0x00000004 /* dump */
-
-#define KEYDEBUG_KEY		0x00000010 /* key processing */
-#define KEYDEBUG_ALG		0x00000020 /* ciph & auth algorithm */
-#define KEYDEBUG_IPSEC		0x00000040 /* ipsec processing */
-
-#define KEYDEBUG_KEY_STAMP	(KEYDEBUG_KEY | KEYDEBUG_STAMP)
-#define KEYDEBUG_KEY_DATA	(KEYDEBUG_KEY | KEYDEBUG_DATA)
-#define KEYDEBUG_KEY_DUMP	(KEYDEBUG_KEY | KEYDEBUG_DUMP)
-#define KEYDEBUG_ALG_STAMP	(KEYDEBUG_ALG | KEYDEBUG_STAMP)
-#define KEYDEBUG_ALG_DATA	(KEYDEBUG_ALG | KEYDEBUG_DATA)
-#define KEYDEBUG_ALG_DUMP	(KEYDEBUG_ALG | KEYDEBUG_DUMP)
-#define KEYDEBUG_IPSEC_STAMP	(KEYDEBUG_IPSEC | KEYDEBUG_STAMP)
-#define KEYDEBUG_IPSEC_DATA	(KEYDEBUG_IPSEC | KEYDEBUG_DATA)
-#define KEYDEBUG_IPSEC_DUMP	(KEYDEBUG_IPSEC | KEYDEBUG_DUMP)
-
-#define KEYDEBUG(lev,arg) \
-	do { if ((V_key_debug_level & (lev)) == (lev)) { arg; } } while (0)
-
-VNET_DECLARE(uint32_t, key_debug_level);
-#define	V_key_debug_level	VNET(key_debug_level)
-#endif /*_KERNEL*/
-
-struct sadb_msg;
-struct sadb_ext;
-extern void kdebug_sadb(struct sadb_msg *);
-extern void kdebug_sadb_x_policy(struct sadb_ext *);
-
-#ifdef _KERNEL
-struct secpolicy;
-struct secpolicyindex;
-struct secasindex;
-struct secasvar;
-struct secreplay;
-struct mbuf;
-extern void kdebug_secpolicy(struct secpolicy *);
-extern void kdebug_secpolicyindex(struct secpolicyindex *);
-extern void kdebug_secasindex(struct secasindex *);
-extern void kdebug_secasv(struct secasvar *);
-extern void kdebug_mbufhdr(struct mbuf *);
-extern void kdebug_mbuf(struct mbuf *);
-#endif /*_KERNEL*/
-
-struct sockaddr;
-extern void kdebug_sockaddr(struct sockaddr *);
-
-extern void ipsec_hexdump(caddr_t, int);
-extern void ipsec_bindump(caddr_t, int);
-
-#endif /* _NETIPSEC_KEY_DEBUG_H_ */
diff --git a/include.new/netipsec/key_var.h b/include.new/netipsec/key_var.h
deleted file mode 100644
index 7a4ba2d..0000000
--- a/include.new/netipsec/key_var.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/key_var.h 254925 2013-08-26 18:16:05Z jhb $	*/
-/*	$KAME: key_var.h,v 1.11 2001/09/12 23:05:07 sakane Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETIPSEC_KEY_VAR_H_
-#define _NETIPSEC_KEY_VAR_H_
-
-/* sysctl */
-#define KEYCTL_DEBUG_LEVEL		1
-#define KEYCTL_SPI_TRY			2
-#define KEYCTL_SPI_MIN_VALUE		3
-#define KEYCTL_SPI_MAX_VALUE		4
-#define KEYCTL_RANDOM_INT		5
-#define KEYCTL_LARVAL_LIFETIME		6
-#define KEYCTL_BLOCKACQ_COUNT		7
-#define KEYCTL_BLOCKACQ_LIFETIME	8
-#define KEYCTL_ESP_KEYMIN		9
-#define KEYCTL_ESP_AUTH			10
-#define KEYCTL_AH_KEYMIN		11
-#define KEYCTL_PREFERED_OLDSA		12
-#define KEYCTL_MAXID			13
-
-#ifdef _KERNEL
-#define _ARRAYLEN(p) (sizeof(p)/sizeof(p[0]))
-#define _KEYLEN(key) ((u_int)((key)->bits >> 3))
-#define _KEYBITS(key) ((u_int)((key)->bits))
-#define _KEYBUF(key) ((caddr_t)((caddr_t)(key) + sizeof(struct sadb_key)))
-#endif /*_KERNEL*/
-
-#endif /* _NETIPSEC_KEY_VAR_H_ */
diff --git a/include.new/netipsec/keydb.h b/include.new/netipsec/keydb.h
deleted file mode 100644
index 5b554e3..0000000
--- a/include.new/netipsec/keydb.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/keydb.h 283902 2015-06-02 03:43:36Z ae $	*/
-/*	$KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETIPSEC_KEYDB_H_
-#define _NETIPSEC_KEYDB_H_
-
-#ifdef _KERNEL
-
-#include <netipsec/key_var.h>
-
-#ifndef _SOCKADDR_UNION_DEFINED
-#define	_SOCKADDR_UNION_DEFINED
-/*
- * The union of all possible address formats we handle.
- */
-union sockaddr_union {
-	struct sockaddr		sa;
-	struct sockaddr_in	sin;
-	struct sockaddr_in6	sin6;
-};
-#endif /* _SOCKADDR_UNION_DEFINED */
-
-/* Security Assocciation Index */
-/* NOTE: Ensure to be same address family */
-struct secasindex {
-	union sockaddr_union src;	/* source address for SA */
-	union sockaddr_union dst;	/* destination address for SA */
-	u_int16_t proto;		/* IPPROTO_ESP or IPPROTO_AH */
-	u_int8_t mode;			/* mode of protocol, see ipsec.h */
-	uint32_t reqid;		/* reqid id who owned this SA */
-					/* see IPSEC_MANUAL_REQID_MAX. */
-};
-
-/* 
- * In order to split out the keydb implementation from that of the
- * PF_KEY sockets we need to define a few structures that while they
- * may seem common are likely to diverge over time. 
- */
-
-/* sadb_identity */
-struct secident {
-	u_int16_t type;
-	u_int64_t id;
-};
-
-/* sadb_key */
-struct seckey {
-	u_int16_t bits;
-	char *key_data;
-};
-
-struct seclifetime {
-	uint32_t allocations;
-	u_int64_t bytes;
-	u_int64_t addtime;
-	u_int64_t usetime;
-};
-
-/* Security Association Data Base */
-struct secashead {
-	LIST_ENTRY(secashead) chain;
-
-	struct secasindex saidx;
-
-	struct secident *idents;	/* source identity */
-	struct secident *identd;	/* destination identity */
-					/* XXX I don't know how to use them. */
-
-	u_int8_t state;			/* MATURE or DEAD. */
-	LIST_HEAD(_satree, secasvar) savtree[SADB_SASTATE_MAX+1];
-					/* SA chain */
-					/* The first of this list is newer SA */
-};
-
-struct xformsw;
-struct enc_xform;
-struct auth_hash;
-struct comp_algo;
-
-/* Security Association */
-struct secasvar {
-	LIST_ENTRY(secasvar) chain;
-	struct mtx lock;		/* update/access lock */
-
-	u_int refcnt;			/* reference count */
-	u_int8_t state;			/* Status of this Association */
-
-	u_int8_t alg_auth;		/* Authentication Algorithm Identifier*/
-	u_int8_t alg_enc;		/* Cipher Algorithm Identifier */
-	u_int8_t alg_comp;		/* Compression Algorithm Identifier */
-	uint32_t spi;			/* SPI Value, network byte order */
-	uint32_t flags;		/* holder for SADB_KEY_FLAGS */
-
-	struct seckey *key_auth;	/* Key for Authentication */
-	struct seckey *key_enc;	        /* Key for Encryption */
-	caddr_t iv;			/* Initilization Vector */
-	u_int ivlen;			/* length of IV */
-	void *sched;			/* intermediate encryption key */
-	size_t schedlen;
-
-	struct secreplay *replay;	/* replay prevention */
-	time_t created;			/* for lifetime */
-
-	struct seclifetime *lft_c;	/* CURRENT lifetime, it's constant. */
-	struct seclifetime *lft_h;	/* HARD lifetime */
-	struct seclifetime *lft_s;	/* SOFT lifetime */
-
-	uint32_t seq;			/* sequence number */
-	pid_t pid;			/* message's pid */
-
-	struct secashead *sah;		/* back pointer to the secashead */
-
-	/*
-	 * NB: Fields with a tdb_ prefix are part of the "glue" used
-	 *     to interface to the OpenBSD crypto support.  This was done
-	 *     to distinguish this code from the mainline KAME code.
-	 */
-	struct xformsw *tdb_xform;	/* transform */
-	struct enc_xform *tdb_encalgxform;	/* encoding algorithm */
-	struct auth_hash *tdb_authalgxform;	/* authentication algorithm */
-	struct comp_algo *tdb_compalgxform;	/* compression algorithm */
-	u_int64_t tdb_cryptoid;		/* crypto session id */
-
-	/*
-	 * NAT-Traversal.
-	 */
-	u_int16_t natt_type;		/* IKE/ESP-marker in output. */
-	u_int16_t natt_esp_frag_len;	/* MTU for payload fragmentation. */
-};
-
-#define	SECASVAR_LOCK_INIT(_sav) \
-	mtx_init(&(_sav)->lock, "ipsec association", NULL, MTX_DEF)
-#define	SECASVAR_LOCK(_sav)		mtx_lock(&(_sav)->lock)
-#define	SECASVAR_UNLOCK(_sav)		mtx_unlock(&(_sav)->lock)
-#define	SECASVAR_LOCK_DESTROY(_sav)	mtx_destroy(&(_sav)->lock)
-#define	SECASVAR_LOCK_ASSERT(_sav)	mtx_assert(&(_sav)->lock, MA_OWNED)
-
-/* replay prevention */
-struct secreplay {
-	uint32_t count;
-	u_int wsize;		/* window size, i.g. 4 bytes */
-	uint32_t seq;		/* used by sender */
-	uint32_t lastseq;	/* used by receiver */
-	caddr_t bitmap;		/* used by receiver */
-	int overflow;		/* overflow flag */
-};
-
-/* socket table due to send PF_KEY messages. */
-struct secreg {
-	LIST_ENTRY(secreg) chain;
-
-	struct socket *so;
-};
-
-/* acquiring list table. */
-struct secacq {
-	LIST_ENTRY(secacq) chain;
-
-	struct secasindex saidx;
-
-	uint32_t seq;		/* sequence number */
-	time_t created;		/* for lifetime */
-	int count;		/* for lifetime */
-};
-
-/* Sensitivity Level Specification */
-/* nothing */
-
-#define SADB_KILL_INTERVAL	600	/* six seconds */
-
-/* secpolicy */
-extern struct secpolicy *keydb_newsecpolicy(void);
-extern void keydb_delsecpolicy(struct secpolicy *);
-/* secashead */
-extern struct secashead *keydb_newsecashead(void);
-extern void keydb_delsecashead(struct secashead *);
-/* secasvar */
-extern struct secasvar *keydb_newsecasvar(void);
-extern void keydb_refsecasvar(struct secasvar *);
-extern void keydb_freesecasvar(struct secasvar *);
-/* secreplay */
-extern struct secreplay *keydb_newsecreplay(size_t);
-extern void keydb_delsecreplay(struct secreplay *);
-/* secreg */
-extern struct secreg *keydb_newsecreg(void);
-extern void keydb_delsecreg(struct secreg *);
-
-#endif /* _KERNEL */
-
-#endif /* _NETIPSEC_KEYDB_H_ */
diff --git a/include.new/netipsec/keysock.h b/include.new/netipsec/keysock.h
deleted file mode 100644
index 428c792..0000000
--- a/include.new/netipsec/keysock.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/keysock.h 283902 2015-06-02 03:43:36Z ae $	*/
-/*	$KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETIPSEC_KEYSOCK_H_
-#define _NETIPSEC_KEYSOCK_H_
-
-/* statistics for pfkey socket */
-struct pfkeystat {
-	/* kernel -> userland */
-	uint64_t out_total;		/* # of total calls */
-	uint64_t out_bytes;		/* total bytecount */
-	uint64_t out_msgtype[256];	/* message type histogram */
-	uint64_t out_invlen;		/* invalid length field */
-	uint64_t out_invver;		/* invalid version field */
-	uint64_t out_invmsgtype;	/* invalid message type field */
-	uint64_t out_tooshort;		/* msg too short */
-	uint64_t out_nomem;		/* memory allocation failure */
-	uint64_t out_dupext;		/* duplicate extension */
-	uint64_t out_invexttype;	/* invalid extension type */
-	uint64_t out_invsatype;		/* invalid sa type */
-	uint64_t out_invaddr;		/* invalid address extension */
-	/* userland -> kernel */
-	uint64_t in_total;		/* # of total calls */
-	uint64_t in_bytes;		/* total bytecount */
-	uint64_t in_msgtype[256];	/* message type histogram */
-	uint64_t in_msgtarget[3];	/* one/all/registered */
-	uint64_t in_nomem;		/* memory allocation failure */
-	/* others */
-	uint64_t sockerr;		/* # of socket related errors */
-};
-
-#define KEY_SENDUP_ONE		0
-#define KEY_SENDUP_ALL		1
-#define KEY_SENDUP_REGISTERED	2
-
-#ifdef _KERNEL
-#include <sys/counter.h>
-
-struct keycb {
-	struct rawcb kp_raw;	/* rawcb */
-	int kp_promisc;		/* promiscuous mode */
-	int kp_registered;	/* registered socket */
-};
-
-VNET_PCPUSTAT_DECLARE(struct pfkeystat, pfkeystat);
-#define	PFKEYSTAT_ADD(name, val)	\
-    VNET_PCPUSTAT_ADD(struct pfkeystat, pfkeystat, name, (val))
-#define	PFKEYSTAT_INC(name)		PFKEYSTAT_ADD(name, 1)
-
-extern int key_output(struct mbuf *m, struct socket *so);
-extern int key_usrreq(struct socket *, int, struct mbuf *,
-    struct mbuf *, struct mbuf *);
-
-extern int key_sendup(struct socket *, struct sadb_msg *, u_int, int);
-extern int key_sendup_mbuf(struct socket *, struct mbuf *, int);
-#endif /* _KERNEL */
-
-#endif /*_NETIPSEC_KEYSOCK_H_*/
diff --git a/include.new/netipsec/xform.h b/include.new/netipsec/xform.h
deleted file mode 100644
index b3948e0..0000000
--- a/include.new/netipsec/xform.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netipsec/xform.h 220206 2011-03-31 15:23:32Z fabient $	*/
-/*	$OpenBSD: ip_ipsp.h,v 1.119 2002/03/14 01:27:11 millert Exp $	*/
-/*-
- * The authors of this code are John Ioannidis (ji@tla.org),
- * Angelos D. Keromytis (kermit@csd.uch.gr),
- * Niels Provos (provos@physnet.uni-hamburg.de) and
- * Niklas Hallqvist (niklas@appli.se).
- *
- * The original version of this code was written by John Ioannidis
- * for BSD/OS in Athens, Greece, in November 1995.
- *
- * Ported to OpenBSD and NetBSD, with additional transforms, in December 1996,
- * by Angelos D. Keromytis.
- *
- * Additional transforms and features in 1997 and 1998 by Angelos D. Keromytis
- * and Niels Provos.
- *
- * Additional features in 1999 by Angelos D. Keromytis and Niklas Hallqvist.
- *
- * Copyright (c) 1995, 1996, 1997, 1998, 1999 by John Ioannidis,
- * Angelos D. Keromytis and Niels Provos.
- * Copyright (c) 1999 Niklas Hallqvist.
- * Copyright (c) 2001, Angelos D. Keromytis.
- *
- * Permission to use, copy, and modify this software with or without fee
- * is hereby granted, provided that this entire notice is included in
- * all copies of any software which is or includes a copy or
- * modification of this software.
- * You may use this code under the GNU public license if you so wish. Please
- * contribute changes back to the authors under this freer than GPL license
- * so that we may further the use of strong encryption without limitations to
- * all.
- *
- * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTY. IN PARTICULAR, NONE OF THE AUTHORS MAKES ANY
- * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE
- * MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
- * PURPOSE.
- */
-
-#ifndef _NETIPSEC_XFORM_H_
-#define _NETIPSEC_XFORM_H_
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <opencrypto/xform.h>
-
-#define	AH_HMAC_HASHLEN		12	/* 96 bits of authenticator */
-#define	AH_HMAC_MAXHASHLEN	(SHA2_512_HASH_LEN/2)	/* Keep this updated */
-#define	AH_HMAC_INITIAL_RPL	1	/* replay counter initial value */
-
-/*
- * Packet tag assigned on completion of IPsec processing; used
- * to speedup processing when/if the packet comes back for more
- * processing.
- */
-struct tdb_ident {
-	uint32_t spi;
-	union sockaddr_union dst;
-	u_int8_t proto;
-	/* Cache those two for enc(4) in xform_ipip. */
-	u_int8_t alg_auth;
-	u_int8_t alg_enc;
-};
-
-/*
- * Opaque data structure hung off a crypto operation descriptor.
- */
-struct tdb_crypto {
-	struct ipsecrequest	*tc_isr;	/* ipsec request state */
-	uint32_t		tc_spi;		/* associated SPI */
-	union sockaddr_union	tc_dst;		/* dst addr of packet */
-	u_int8_t		tc_proto;	/* current protocol, e.g. AH */
-	u_int8_t		tc_nxt;		/* next protocol, e.g. IPV4 */
-	int			tc_protoff;	/* current protocol offset */
-	int			tc_skip;	/* data offset */
-	caddr_t			tc_ptr;		/* associated crypto data */
-	struct secasvar 	*tc_sav;	/* related SA */
-};
-
-struct secasvar;
-struct ipescrequest;
-
-struct xformsw {
-	u_short	xf_type;		/* xform ID */
-#define	XF_IP4		1	/* IP inside IP */
-#define	XF_AH		2	/* AH */
-#define	XF_ESP		3	/* ESP */
-#define	XF_TCPSIGNATURE	5	/* TCP MD5 Signature option, RFC 2358 */
-#define	XF_IPCOMP	6	/* IPCOMP */
-	u_short	xf_flags;
-#define	XFT_AUTH	0x0001
-#define	XFT_CONF	0x0100
-#define	XFT_COMP	0x1000
-	char	*xf_name;			/* human-readable name */
-	int	(*xf_init)(struct secasvar*, struct xformsw*);	/* setup */
-	int	(*xf_zeroize)(struct secasvar*);		/* cleanup */
-	int	(*xf_input)(struct mbuf*, struct secasvar*,	/* input */
-			int, int);
-	int	(*xf_output)(struct mbuf*,	       		/* output */
-			struct ipsecrequest *, struct mbuf **, int, int);
-	struct xformsw *xf_next;		/* list of registered xforms */
-};
-
-#ifdef _KERNEL
-extern void xform_register(struct xformsw*);
-extern int xform_init(struct secasvar *sav, int xftype);
-
-struct cryptoini;
-
-/* XF_IP4 */
-extern	int ip4_input6(struct mbuf **m, int *offp, int proto);
-extern	void ip4_input(struct mbuf *m, int);
-extern	int ipip_output(struct mbuf *, struct ipsecrequest *,
-			struct mbuf **, int, int);
-
-/* XF_AH */
-extern int ah_init0(struct secasvar *, struct xformsw *, struct cryptoini *);
-extern int ah_zeroize(struct secasvar *sav);
-extern struct auth_hash *ah_algorithm_lookup(int alg);
-extern size_t ah_hdrsiz(struct secasvar *);
-
-/* XF_ESP */
-extern struct enc_xform *esp_algorithm_lookup(int alg);
-extern size_t esp_hdrsiz(struct secasvar *sav);
-
-/* XF_COMP */
-extern struct comp_algo *ipcomp_algorithm_lookup(int alg);
-
-#endif /* _KERNEL */
-#endif /* _NETIPSEC_XFORM_H_ */
diff --git a/include.new/netipx/ipx.h b/include.new/netipx/ipx.h
deleted file mode 100644
index cb04a7d..0000000
--- a/include.new/netipx/ipx.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*-
- * Copyright (c) 1984, 1985, 1986, 1987, 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.
- * 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.
- *
- * Copyright (c) 1995, Mike Mitchell
- *
- * 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.
- *
- *	@(#)ipx.h
- *
- * $FreeBSD: releng/10.2/sys/netipx/ipx.h 170664 2007-06-13 14:01:43Z rwatson $
- */
-
-#ifndef _NETIPX_IPX_H_
-#define	_NETIPX_IPX_H_
-
-/*
- * Constants and Structures
- */
-
-/*
- * Protocols
- */
-#define IPXPROTO_UNKWN		0	/* Unknown */
-#define IPXPROTO_RI		1	/* RIP Routing Information */
-#define IPXPROTO_PXP		4	/* IPX Packet Exchange Protocol */
-#define IPXPROTO_SPX		5	/* SPX Sequenced Packet */
-#define IPXPROTO_NCP		17	/* NCP NetWare Core */
-#define IPXPROTO_NETBIOS	20	/* Propagated Packet */
-#define IPXPROTO_RAW		255	/* Placemarker*/
-#define IPXPROTO_MAX		256	/* Placemarker*/
-
-/*
- * Port/Socket numbers: network standard functions
- */
-
-#define IPXPORT_RI		1	/* NS RIP Routing Information */
-#define IPXPORT_ECHO		2	/* NS Echo */
-#define IPXPORT_RE		3	/* NS Router Error */
-#define IPXPORT_NCP		0x0451	/* NW NCP Core Protocol */
-#define IPXPORT_SAP		0x0452	/* NW SAP Service Advertising */
-#define IPXPORT_RIP		0x0453	/* NW RIP Routing Information */
-#define IPXPORT_NETBIOS		0x0455	/* NW NetBIOS */
-#define IPXPORT_DIAGS		0x0456	/* NW Diagnostics */
-/*
- * Ports < IPXPORT_RESERVED are reserved for privileged
- */
-#define IPXPORT_RESERVED	0x4000
-/*
- * Ports > IPXPORT_WELLKNOWN are reserved for privileged
- * processes (e.g. root).
- */
-#define IPXPORT_WELLKNOWN	0x6000
-
-/* flags passed to ipx_outputfl as last parameter */
-
-#define	IPX_FORWARDING		0x1	/* most of ipx header exists */
-#define	IPX_ROUTETOIF		0x10	/* same as SO_DONTROUTE */
-#define	IPX_ALLOWBROADCAST	SO_BROADCAST	/* can send broadcast packets */
-
-#define IPX_MAXHOPS		15
-
-/* flags passed to get/set socket option */
-#define	SO_HEADERS_ON_INPUT	1
-#define	SO_HEADERS_ON_OUTPUT	2
-#define	SO_DEFAULT_HEADERS	3
-#define	SO_LAST_HEADER		4
-#define	SO_IPXIP_ROUTE		5	/* No longer implemented. */
-#define SO_SEQNO		6
-#define	SO_ALL_PACKETS		7
-#define SO_MTU			8
-#define SO_IPXTUN_ROUTE		9
-#define SO_IPX_CHECKSUM		10
-
-/*
- * IPX addressing
- */
-union ipx_host {
-	u_char	c_host[6];
-	u_short	s_host[3];
-};
-
-union ipx_net {
-	u_char	c_net[4];
-	u_short	s_net[2];
-};
-
-union ipx_net_u {
-	union	ipx_net	net_e;
-	u_long		long_e;
-};
-
-struct ipx_addr {
-	union ipx_net	x_net;
-	union ipx_host	x_host;
-	u_short		x_port;
-};
-
-/*
- * Socket address
- */
-struct sockaddr_ipx {
-	u_char		sipx_len;
-	u_char		sipx_family;
-	struct ipx_addr	sipx_addr;
-	char		sipx_zero[2];
-};
-#define sipx_port sipx_addr.x_port
-
-/*
- * Definitions for IPX Internetwork Packet Exchange Protocol
- */
-struct ipx {
-	u_short	ipx_sum;	/* Checksum */
-	u_short	ipx_len;	/* Length, in bytes, including header */
-	u_char	ipx_tc;		/* Transport Control (i.e. hop count) */
-	u_char	ipx_pt;		/* Packet Type (i.e. level 2 protocol) */
-	struct ipx_addr	ipx_dna;	/* Destination Network Address */
-	struct ipx_addr	ipx_sna;	/* Source Network Address */
-} __packed;
-
-#define ipx_neteqnn(a,b) \
-	(((a).s_net[0] == (b).s_net[0]) && ((a).s_net[1] == (b).s_net[1]))
-#define ipx_neteq(a,b) ipx_neteqnn((a).x_net, (b).x_net)
-#define satoipx_addr(sa) (((struct sockaddr_ipx *)&(sa))->sipx_addr)
-#define ipx_hosteqnh(s,t) ((s).s_host[0] == (t).s_host[0] && \
-	(s).s_host[1] == (t).s_host[1] && (s).s_host[2] == (t).s_host[2])
-#define ipx_hosteq(s,t) (ipx_hosteqnh((s).x_host,(t).x_host))
-#define ipx_nullnet(x) (((x).x_net.s_net[0]==0) && ((x).x_net.s_net[1]==0))
-#define ipx_nullhost(x) (((x).x_host.s_host[0] == 0) && \
-	((x).x_host.s_host[1] == 0) && ((x).x_host.s_host[2] == 0))
-#define ipx_wildnet(x) (((x).x_net.s_net[0] == 0xffff) && \
-	((x).x_net.s_net[1] == 0xffff))
-#define ipx_wildhost(x) (((x).x_host.s_host[0] == 0xffff) && \
-	((x).x_host.s_host[1] == 0xffff) && ((x).x_host.s_host[2] == 0xffff))
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-struct ipx_addr	 ipx_addr(const char *);
-char		*ipx_ntoa(struct ipx_addr);
-__END_DECLS
-
-#endif /* !_NETIPX_IPX_H_ */
diff --git a/include.new/netipx/ipx_if.h b/include.new/netipx/ipx_if.h
deleted file mode 100644
index a248cff..0000000
--- a/include.new/netipx/ipx_if.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 1984, 1985, 1986, 1987, 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.
- * 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.
-
- * Copyright (c) 1995, Mike Mitchell
- *
- * 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.
- *
- *	@(#)ipx_if.h
- *
- * $FreeBSD: releng/10.2/sys/netipx/ipx_if.h 194905 2009-06-24 20:57:50Z rwatson $
- */
-
-#ifndef _NETIPX_IPX_IF_H_
-#define	_NETIPX_IPX_IF_H_
-
-/*
- * Interface address.  One of these structures
- * is allocated for each interface with an internet address.
- * The ifaddr structure contains the protocol-independent part
- * of the structure and is assumed to be first.
- */
-
-struct ipx_ifaddr {
-	struct	ifaddr ia_ifa;		/* protocol-independent info */
-#define	ia_ifp		ia_ifa.ifa_ifp
-#define	ia_flags	ia_ifa.ifa_flags
-	TAILQ_ENTRY(ipx_ifaddr)	ia_link;	/* list of IPv6 addresses */
-	struct	sockaddr_ipx ia_addr;	/* reserve space for my address */
-	struct	sockaddr_ipx ia_dstaddr;	/* space for my broadcast address */
-#define ia_broadaddr	ia_dstaddr
-	struct	sockaddr_ipx ia_netmask;	/* space for my network mask */
-};
-
-struct	ipx_aliasreq {
-	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
-	struct	sockaddr_ipx ifra_addr;
-	struct	sockaddr_ipx ifra_broadaddr;
-#define ifra_dstaddr ifra_broadaddr
-};
-
-/*
- * List of ipx_ifaddr's.
- */
-TAILQ_HEAD(ipx_ifaddrhead, ipx_ifaddr);
-
-/*
- * Given a pointer to an ipx_ifaddr (ifaddr),
- * return a pointer to the addr as a sockadd_ipx.
- */
-
-#define	IA_SIPX(ia) (&(((struct ipx_ifaddr *)(ia))->ia_addr))
-
-/* This is not the right place for this but where is? */
-
-#define ETHERTYPE_IPX_8022	0x00e0	/* Ethernet_802.2 */
-#define ETHERTYPE_IPX_8023	0x0000	/* Ethernet_802.3 */
-#define ETHERTYPE_IPX_II	0x8137	/* Ethernet_II */
-#define ETHERTYPE_IPX_SNAP	0x8137	/* Ethernet_SNAP */
-
-#define	ETHERTYPE_IPX		0x8137	/* Only  Ethernet_II Available */
-
-#ifdef	_KERNEL
-extern struct rwlock		 ipx_ifaddr_rw;
-extern struct ipx_ifaddrhead	 ipx_ifaddrhead;
-
-#define	IPX_IFADDR_LOCK_INIT()		rw_init(&ipx_ifaddr_rw, "ipx_ifaddr_rw")
-#define	IPX_IFADDR_LOCK_ASSERT()	rw_assert(&ipx_ifaddr_rw, RA_LOCKED)
-#define	IPX_IFADDR_RLOCK()		rw_rlock(&ipx_ifaddr_rw)
-#define	IPX_IFADDR_RUNLOCK()		rw_runlock(&ipx_ifaddr_rw)
-#define	IPX_IFADDR_WLOCK()		rw_wlock(&ipx_ifaddr_rw)
-#define	IPX_IFADDR_WUNLOCK()		rw_wunlock(&ipx_ifaddr_rw)
-#define	IPX_IFADDR_RLOCK_ASSERT()	rw_assert(&ipx_ifaddr_rw, RA_WLOCKED)
-
-struct ipx_ifaddr	*ipx_iaonnetof(struct ipx_addr *dst);
-#endif
-
-#endif /* !_NETIPX_IPX_IF_H_ */
diff --git a/include.new/netipx/ipx_ip.h b/include.new/netipx/ipx_ip.h
deleted file mode 100644
index 60b4a1d..0000000
--- a/include.new/netipx/ipx_ip.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1995, Mike Mitchell
- * Copyright (c) 1984, 1985, 1986, 1987, 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.
- *
- *	@(#)ipxip.h
- *
- * $FreeBSD: src/sys/netipx/ipx_ip.h,v 1.17 2005/06/10 16:49:22 brooks Exp $
- */
-
-#ifndef _NETIPX_IPXIP_H_
-#define	_NETIPX_IPXIP_H_
-
-struct ifnet_en {
-	struct ifnet *ifen_ifp;
-	struct route ifen_route;
-	struct in_addr ifen_src;
-	struct in_addr ifen_dst;
-	struct ifnet_en *ifen_next;
-};
-
-#define LOMTU	(1024+512)	/* XXX this is TINY_LOMTU */
-
-#ifdef _KERNEL
-
-void	ipxip_ctlinput(int cmd, struct sockaddr *sa, void *arg);
-void	ipxip_input(struct mbuf *m, int hlen);
-int	ipxip_route(struct socket *so, struct sockopt *sopt);
-
-#endif
-
-#endif /* !_NETIPX_IPXIP_H_ */
diff --git a/include.new/netipx/ipx_pcb.h b/include.new/netipx/ipx_pcb.h
deleted file mode 100644
index 3d3bd5f..0000000
--- a/include.new/netipx/ipx_pcb.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * Copyright (c) 1984, 1985, 1986, 1987, 1993
- *	The Regents of the University of California.
- * Copyright (c) 2004-2006 Robert N. M. Watson
- * 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.
- * 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.
- *
- * Copyright (c) 1995, Mike Mitchell
- * 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.
- *
- *	@(#)ipx_pcb.h
- *
- * $FreeBSD: releng/10.2/sys/netipx/ipx_pcb.h 169463 2007-05-11 10:38:34Z rwatson $
- */
-
-#ifndef _NETIPX_IPX_PCB_H_
-#define	_NETIPX_IPX_PCB_H_
-
-/*
- * IPX protocol interface control block.
- */
-struct ipxpcb {
-	LIST_ENTRY(ipxpcb) ipxp_list;
-	struct	socket *ipxp_socket;	/* back pointer to socket */
-	struct	ipx_addr ipxp_faddr;	/* destination address */
-	struct	ipx_addr ipxp_laddr;	/* socket's address */
-	caddr_t	ipxp_pcb;		/* protocol specific stuff */
-	struct	route ipxp_route;	/* routing information */
-	struct	ipx_addr ipxp_lastdst;	/* validate cached route for dg socks*/
-	short	ipxp_flags;
-	u_char	ipxp_dpt;		/* default packet type for ipx_output */
-	u_char	ipxp_rpt;		/* last received packet type by ipx_input() */
-	struct	mtx ipxp_mtx;
-};
-
-/*
- * Additional IPX pcb-related types and variables.
- */
-LIST_HEAD(ipxpcbhead, ipxpcb);
-extern struct ipxpcbhead ipxpcb_list;
-extern struct ipxpcbhead ipxrawpcb_list;
-
-#ifdef _KERNEL
-extern struct mtx	ipxpcb_list_mtx;
-#endif
-
-/*
- * IPX/SPX PCB flags.
- */
-#define IPXP_IN_ABORT		0x1	/* Calling abort through socket. */
-#define IPXP_RAWIN		0x2	/* Show headers on input. */
-#define IPXP_RAWOUT		0x4	/* Show header on output. */
-#define IPXP_ALL_PACKETS	0x8	/* Turn off higher proto processing. */
-#define	IPXP_CHECKSUM		0x10	/* Use checksum on this socket. */
-#define	IPXP_DROPPED		0x20	/* Connection dropped. */
-#define	IPXP_SPX		0x40	/* SPX PCB. */
-
-#define	IPX_WILDCARD		1
-
-#define ipxp_lport ipxp_laddr.x_port
-#define ipxp_fport ipxp_faddr.x_port
-
-#define	sotoipxpcb(so)		((struct ipxpcb *)((so)->so_pcb))
-
-/*
- * Nominal space allocated to an IPX socket.
- */
-#define	IPXSNDQ		16384
-#define	IPXRCVQ		40960
-
-#ifdef _KERNEL
-int	ipx_pcballoc(struct socket *so, struct ipxpcbhead *head,
-	    struct thread *p);
-int	ipx_pcbbind(struct ipxpcb *ipxp, struct sockaddr *nam,
-	    struct thread *p);
-int	ipx_pcbconnect(struct ipxpcb *ipxp, struct sockaddr *nam,
-	    struct thread *p);
-void	ipx_pcbdetach(struct ipxpcb *ipxp);
-void	ipx_pcbdisconnect(struct ipxpcb *ipxp);
-void	ipx_pcbfree(struct ipxpcb *ipxp);
-struct ipxpcb *ipx_pcblookup(struct ipx_addr *faddr, u_short lport, int wildp);
-void	ipx_getpeeraddr(struct ipxpcb *ipxp, struct sockaddr **nam);
-void	ipx_getsockaddr(struct ipxpcb *ipxp, struct sockaddr **nam);
-
-#define	IPX_LIST_LOCK_INIT()	mtx_init(&ipxpcb_list_mtx, "ipx_list_mtx", \
-				    NULL, MTX_DEF | MTX_RECURSE)
-#define	IPX_LIST_LOCK()		mtx_lock(&ipxpcb_list_mtx)
-#define	IPX_LIST_UNLOCK()	mtx_unlock(&ipxpcb_list_mtx)
-#define	IPX_LIST_LOCK_ASSERT()	mtx_assert(&ipxpcb_list_mtx, MA_OWNED)
-
-#define	IPX_LOCK_INIT(ipx)	mtx_init(&(ipx)->ipxp_mtx, "ipx_mtx", NULL, \
-				    MTX_DEF)
-#define	IPX_LOCK_DESTROY(ipx)	mtx_destroy(&(ipx)->ipxp_mtx)
-#define	IPX_LOCK(ipx)		mtx_lock(&(ipx)->ipxp_mtx)
-#define	IPX_UNLOCK(ipx)		mtx_unlock(&(ipx)->ipxp_mtx)
-#define	IPX_LOCK_ASSERT(ipx)	mtx_assert(&(ipx)->ipxp_mtx, MA_OWNED)
-#endif /* _KERNEL */
-
-#endif /* !_NETIPX_IPX_PCB_H_ */
diff --git a/include.new/netipx/ipx_var.h b/include.new/netipx/ipx_var.h
deleted file mode 100644
index e29bc66..0000000
--- a/include.new/netipx/ipx_var.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-
- * Copyright (c) 1984, 1985, 1986, 1987, 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.
- * 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.
- *
- * Copyright (c) 1995, Mike Mitchell
- *
- * 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.
- *
- *	@(#)ipx_var.h
- *
- * $FreeBSD: releng/10.2/sys/netipx/ipx_var.h 194591 2009-06-21 16:11:40Z rwatson $
- */
-
-#ifndef _NETIPX_IPX_VAR_H_
-#define _NETIPX_IPX_VAR_H_
-
-/*
- * IPX Kernel Structures and Variables
- */
-struct	ipxstat {
-	u_long	ipxs_total;		/* total packets received */
-	u_long	ipxs_badsum;		/* checksum bad */
-	u_long	ipxs_tooshort;		/* packet too short */
-	u_long	ipxs_toosmall;		/* not enough data */
-	u_long	ipxs_forward;		/* packets forwarded */
-	u_long	ipxs_cantforward;	/* packets rcvd for unreachable dest */
-	u_long	ipxs_delivered;		/* datagrams delivered to upper level*/
-	u_long	ipxs_localout;		/* total ipx packets generated here */
-	u_long	ipxs_odropped;		/* lost packets due to nobufs, etc. */
-	u_long	ipxs_noroute;		/* packets discarded due to no route */
-	u_long	ipxs_mtutoosmall;	/* the interface mtu is too small */
-};
-
-#ifdef _KERNEL
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_ipx);
-SYSCTL_DECL(_net_ipx_ipx);
-#endif
-
-extern int ipxcksum;
-extern long ipx_pexseq;
-extern struct ipxstat ipxstat;
-extern struct pr_usrreqs ipx_usrreqs;
-extern struct pr_usrreqs ripx_usrreqs;
-extern struct sockaddr_ipx ipx_netmask;
-extern struct sockaddr_ipx ipx_hostmask;
-
-extern const union ipx_net ipx_zeronet;
-extern const union ipx_net ipx_broadnet;
-extern const union ipx_host ipx_broadhost;
-
-struct ifnet;
-struct ipx_addr;
-struct ipxpcb;
-struct mbuf;
-struct thread;
-struct route;
-struct sockaddr;
-struct socket;
-struct sockopt;
-
-u_short	ipx_cksum(struct mbuf *m, int len);
-int	ipx_control(struct socket *so, u_long cmd, caddr_t data,
-	    struct ifnet *ifp, struct thread *td);
-void	ipx_ctlinput(int cmd, struct sockaddr *arg_as_sa, void *dummy);
-int	ipx_ctloutput(struct socket *so, struct sockopt *sopt);
-void	ipx_drop(struct ipxpcb *ipxp, int errno);
-void	ipx_init(void);
-void	ipx_input(struct mbuf *m, struct ipxpcb *ipxp);
-int	ipx_outputfl(struct mbuf *m0, struct route *ro, int flags);
-int	ipx_output_type20(struct mbuf *);
-int	ipx_peeraddr(struct socket *so, struct sockaddr **nam);
-void	ipx_printhost(struct ipx_addr *addr);
-int	ipx_sockaddr(struct socket *so, struct sockaddr **nam);
-
-#endif /* _KERNEL */
-
-#endif /* !_NETIPX_IPX_VAR_H_ */
diff --git a/include.new/netipx/spx.h b/include.new/netipx/spx.h
deleted file mode 100644
index c761197..0000000
--- a/include.new/netipx/spx.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*-
- * Copyright (c) 1984, 1985, 1986, 1987, 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.
- * 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.
- *
- * Copyright (c) 1995, Mike Mitchell
- *
- * 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.
- *
- *	@(#)spx.h
- *
- * $FreeBSD: releng/10.2/sys/netipx/spx.h 194547 2009-06-20 18:24:25Z rwatson $
- */
-
-#ifndef _NETIPX_SPX_H_
-#define	_NETIPX_SPX_H_
-
-/*
- * Definitions for IPX style Sequenced Packet Protocol
- */
-
-struct spxhdr {
-	u_char	spx_cc;		/* connection control */
-	u_char	spx_dt;		/* datastream type */
-#define	SPX_SP	0x80		/* system packet */
-#define	SPX_SA	0x40		/* send acknowledgement */
-#define	SPX_OB	0x20		/* attention (out of band data) */
-#define	SPX_EM	0x10		/* end of message */
-	u_short	spx_sid;	/* source connection identifier */
-	u_short	spx_did;	/* destination connection identifier */
-	u_short	spx_seq;	/* sequence number */
-	u_short	spx_ack;	/* acknowledge number */
-	u_short	spx_alo;	/* allocation number */
-} __packed;
-
-/*
- * Definitions for NS(tm) Internet Datagram Protocol
- * containing a Sequenced Packet Protocol packet.
- */
-struct spx {
-	struct ipx	si_i;
-	struct spxhdr 	si_s;
-} __packed;
-struct spx_q {
-	struct mbuf		*sq_msi;
-	struct spx		*sq_si;
-	LIST_ENTRY(spx_q)	 sq_entry;
-};
-#define SI(x)	((struct spx *)x)
-#define si_sum	si_i.ipx_sum
-#define si_len	si_i.ipx_len
-#define si_tc	si_i.ipx_tc
-#define si_pt	si_i.ipx_pt
-#define si_dna	si_i.ipx_dna
-#define si_sna	si_i.ipx_sna
-#define si_sport	si_i.ipx_sna.x_port
-#define si_cc	si_s.spx_cc
-#define si_dt	si_s.spx_dt
-#define si_sid	si_s.spx_sid
-#define si_did	si_s.spx_did
-#define si_seq	si_s.spx_seq
-#define si_ack	si_s.spx_ack
-#define si_alo	si_s.spx_alo
-
-/*
- * SPX control block, one per connection
- */
-struct spxpcb {
-	LIST_HEAD(, spx_q)	s_q;	/* queue for out-of-order receipt */
-	struct	ipxpcb	*s_ipxpcb;	/* backpointer to internet pcb */
-	u_char	s_state;
-	u_char	s_flags;
-#define	SF_ACKNOW	0x01		/* Ack peer immediately */
-#define	SF_DELACK	0x02		/* Ack, but try to delay it */
-#define	SF_HI	0x04			/* Show headers on input */
-#define	SF_HO	0x08			/* Show headers on output */
-#define	SF_PI	0x10			/* Packet (datagram) interface */
-#define SF_WIN	0x20			/* Window info changed */
-#define SF_RXT	0x40			/* Rxt info changed */
-#define SF_RVD	0x80			/* Calling from read usrreq routine */
-	u_short s_mtu;			/* Max packet size for this stream */
-/* use sequence fields in headers to store sequence numbers for this
-   connection */
-	struct	ipx	s_ipx;
-	struct	spxhdr	s_shdr;		/* prototype header to transmit */
-#define s_cc s_shdr.spx_cc		/* connection control (for EM bit) */
-#define s_dt s_shdr.spx_dt		/* datastream type */
-#define s_sid s_shdr.spx_sid		/* source connection identifier */
-#define s_did s_shdr.spx_did		/* destination connection identifier */
-#define s_seq s_shdr.spx_seq		/* sequence number */
-#define s_ack s_shdr.spx_ack		/* acknowledge number */
-#define s_alo s_shdr.spx_alo		/* allocation number */
-#define s_dport s_ipx.ipx_dna.x_port	/* where we are sending */
-	struct spxhdr s_rhdr;		/* last received header (in effect!)*/
-	u_short s_rack;			/* their acknowledge number */
-	u_short s_ralo;			/* their allocation number */
-	u_short s_smax;			/* highest packet # we have sent */
-	u_short	s_snxt;			/* which packet to send next */
-
-/* congestion control */
-#define	CUNIT	1024			/* scaling for ... */
-	int	s_cwnd;			/* Congestion-controlled window */
-					/* in packets * CUNIT */
-	short	s_swnd;			/* == tcp snd_wnd, in packets */
-	short	s_smxw;			/* == tcp max_sndwnd */
-					/* difference of two spx_seq's can be
-					   no bigger than a short */
-	u_short	s_swl1;			/* == tcp snd_wl1 */
-	u_short	s_swl2;			/* == tcp snd_wl2 */
-	int	s_cwmx;			/* max allowable cwnd */
-	int	s_ssthresh;		/* s_cwnd size threshold for
-					 * slow start exponential-to-
-					 * linear switch */
-/* transmit timing stuff
- * srtt and rttvar are stored as fixed point, for convenience in smoothing.
- * srtt has 3 bits to the right of the binary point, rttvar has 2.
- */
-	short	s_idle;			/* time idle */
-#define	SPXT_NTIMERS	4
-	short	s_timer[SPXT_NTIMERS];	/* timers */
-	short	s_rxtshift;		/* log(2) of rexmt exp. backoff */
-	short	s_rxtcur;		/* current retransmit value */
-	u_short	s_rtseq;		/* packet being timed */
-	short	s_rtt;			/* timer for round trips */
-	short	s_srtt;			/* averaged timer */
-	short	s_rttvar;		/* variance in round trip time */
-	char	s_force;		/* which timer expired */
-	char	s_dupacks;		/* counter to intuit xmt loss */
-
-/* out of band data */
-	char	s_oobflags;
-#define SF_SOOB	0x08			/* sending out of band data */
-#define SF_IOOB 0x10			/* receiving out of band data */
-	char	s_iobc;			/* input characters */
-/* debug stuff */
-	u_short	s_want;			/* Last candidate for sending */
-	char	s_outx;			/* exit taken from spx_output */
-	char	s_inx;			/* exit taken from spx_input */
-	u_short	s_flags2;		/* more flags for testing */
-#define SF_NEWCALL	0x100		/* for new_recvmsg */
-#define SO_NEWCALL	10		/* for new_recvmsg */
-};
-
-#define	ipxtospxpcb(np)	((struct spxpcb *)(np)->ipxp_pcb)
-#define	sotospxpcb(so)	(ipxtospxpcb(sotoipxpcb(so)))
-
-#ifdef _KERNEL
-
-extern struct pr_usrreqs spx_usrreqs;
-extern struct pr_usrreqs spx_usrreq_sps;
-
-void	spx_ctlinput(int cmd, struct sockaddr *arg_as_sa, void *dummy);
-int	spx_ctloutput(struct socket *so, struct sockopt *sopt);
-void	spx_fasttimo(void);
-void	spx_init(void);
-void	spx_input(struct mbuf *m, struct ipxpcb *ipxp);
-void	spx_slowtimo(void);
-
-#endif /* _KERNEL */
-
-#endif /* !_NETIPX_SPX_H_ */
diff --git a/include.new/netipx/spx_debug.h b/include.new/netipx/spx_debug.h
deleted file mode 100644
index c239b90..0000000
--- a/include.new/netipx/spx_debug.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1984, 1985, 1986, 1987, 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.
- * 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.
- *
- * Copyright (c) 1995, Mike Mitchell
- *
- * 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.
- *
- *	@(#)spx_debug.h
- *
- * $FreeBSD: releng/10.2/sys/netipx/spx_debug.h 171656 2007-07-30 11:06:42Z des $
- */
-
-#ifndef _NETIPX_SPX_DEBUG_H_
-#define	_NETIPX_SPX_DEBUG_H_
-
-struct	spx_debug {
-	u_long	sd_time;
-	short	sd_act;
-	short	sd_ostate;
-	caddr_t	sd_cb;
-	short	sd_req;
-	struct	spx sd_si;
-	struct	spxpcb sd_sp;
-};
-
-#define	SA_INPUT 	0
-#define	SA_OUTPUT	1
-#define	SA_USER		2
-#define	SA_RESPOND	3
-#define	SA_DROP		4
-
-#ifdef SANAMES
-const char *spxnames[] =
-    { "input", "output", "user", "respond", "drop" };
-#endif
-
-#define	SPX_NDEBUG 100
-#ifndef _KERNEL
-/* XXX common variables for broken applications. */
-struct	spx_debug spx_debug[SPX_NDEBUG];
-int	spx_debx;
-#endif
-
-#ifdef _KERNEL
-extern char *prurequests[];
-extern char *sanames[];
-
-void	spx_trace(short act, u_char ostate, struct spxpcb *sp, struct spx *si,
-	    int req);
-#endif
-
-#endif /* !_NETIPX_SPX_DEBUG_H_ */
diff --git a/include.new/netipx/spx_timer.h b/include.new/netipx/spx_timer.h
deleted file mode 100644
index b2d83f7..0000000
--- a/include.new/netipx/spx_timer.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 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.
- * 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.
- *
- * Copyright (c) 1995, Mike Mitchell
- *
- * 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.
- *
- *	@(#)spx_timer.h
- *
- * $FreeBSD: releng/10.2/sys/netipx/spx_timer.h 165899 2007-01-08 22:14:00Z rwatson $
- */
-
-#ifndef _NETIPX_SPX_TIMER_H_
-#define _NETIPX_SPX_TIMER_H_
-
-/*
- * Definitions of the SPX timers.  These timers are counted
- * down PR_SLOWHZ times a second.
- */
-#define	SPXT_REXMT	0		/* retransmit */
-#define	SPXT_PERSIST	1		/* retransmit persistence */
-#define	SPXT_KEEP	2		/* keep alive */
-#define	SPXT_2MSL	3		/* 2*msl quiet time timer */
-
-/*
- * The SPXT_REXMT timer is used to force retransmissions.
- * The SPX has the SPXT_REXMT timer set whenever segments
- * have been sent for which ACKs are expected but not yet
- * received.  If an ACK is received which advances tp->snd_una,
- * then the retransmit timer is cleared (if there are no more
- * outstanding segments) or reset to the base value (if there
- * are more ACKs expected).  Whenever the retransmit timer goes off,
- * we retransmit one unacknowledged segment, and do a backoff
- * on the retransmit timer.
- *
- * The SPXT_PERSIST timer is used to keep window size information
- * flowing even if the window goes shut.  If all previous transmissions
- * have been acknowledged (so that there are no retransmissions in progress),
- * and the window is too small to bother sending anything, then we start
- * the SPXT_PERSIST timer.  When it expires, if the window is nonzero,
- * we go to transmit state.  Otherwise, at intervals send a single byte
- * into the peer's window to force him to update our window information.
- * We do this at most as often as SPXT_PERSMIN time intervals,
- * but no more frequently than the current estimate of round-trip
- * packet time.  The SPXT_PERSIST timer is cleared whenever we receive
- * a window update from the peer.
- *
- * The SPXT_KEEP timer is used to keep connections alive.  If an
- * connection is idle (no segments received) for SPXTV_KEEP amount of time,
- * but not yet established, then we drop the connection.  If the connection
- * is established, then we force the peer to send us a segment by sending:
- *	<SEQ=SND.UNA-1><ACK=RCV.NXT><CTL=ACK>
- * This segment is (deliberately) outside the window, and should elicit
- * an ack segment in response from the peer.  If, despite the SPXT_KEEP
- * initiated segments we cannot elicit a response from a peer in SPXT_MAXIDLE
- * amount of time, then we drop the connection.
- */
-
-#define	SPX_TTL		30		/* default time to live for SPX segs */
-/*
- * Time constants.
- */
-#define	SPXTV_MSL	( 15*PR_SLOWHZ)		/* max seg lifetime */
-#define	SPXTV_SRTTBASE	0			/* base roundtrip time;
-						   if 0, no idea yet */
-#define	SPXTV_SRTTDFLT	(  3*PR_SLOWHZ)		/* assumed RTT if no info */
-
-#define	SPXTV_PERSMIN	(  5*PR_SLOWHZ)		/* retransmit persistence */
-#define	SPXTV_PERSMAX	( 60*PR_SLOWHZ)		/* maximum persist interval */
-
-#define	SPXTV_KEEP	( 75*PR_SLOWHZ)		/* keep alive - 75 secs */
-#define	SPXTV_MAXIDLE	(  8*SPXTV_KEEP)	/* maximum allowable idle
-						   time before drop conn */
-
-#define	SPXTV_MIN	(  1*PR_SLOWHZ)		/* minimum allowable value */
-#define	SPXTV_REXMTMAX	( 64*PR_SLOWHZ)		/* max allowable REXMT value */
-
-#define	SPX_LINGERTIME	120			/* linger at most 2 minutes */
-
-#define	SPX_MAXRXTSHIFT	12			/* maximum retransmits */
-
-#ifdef	SPXTIMERS
-char *spxtimers[] =
-    { "REXMT", "PERSIST", "KEEP", "2MSL" };
-#endif
-
-/*
- * Force a time value to be in a certain range.
- */
-#define	SPXT_RANGESET(tv, value, tvmin, tvmax) { \
-	(tv) = (value); \
-	if ((tv) < (tvmin)) \
-		(tv) = (tvmin); \
-	else if ((tv) > (tvmax)) \
-		(tv) = (tvmax); \
-}
-
-#endif /* !_NETIPX_SPX_TIMER_H_ */
diff --git a/include.new/netipx/spx_var.h b/include.new/netipx/spx_var.h
deleted file mode 100644
index 66f653f..0000000
--- a/include.new/netipx/spx_var.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 1984, 1985, 1986, 1987, 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.
- * 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.
- *
- * Copyright (c) 1995, Mike Mitchell
- *
- * 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.
- *
- *	@(#)spx_var.h
- *
- * $FreeBSD: releng/10.2/sys/netipx/spx_var.h 194547 2009-06-20 18:24:25Z rwatson $
- */
-
-#ifndef _NETIPX_SPX_VAR_H_
-#define _NETIPX_SPX_VAR_H_
-
-struct	spxstat {
-	long	spxs_connattempt;	/* connections initiated */
-	long	spxs_accepts;		/* connections accepted */
-	long	spxs_connects;		/* connections established */
-	long	spxs_drops;		/* connections dropped */
-	long	spxs_conndrops;		/* embryonic connections dropped */
-	long	spxs_closed;		/* conn. closed (includes drops) */
-	long	spxs_segstimed;		/* segs where we tried to get rtt */
-	long	spxs_rttupdated;	/* times we succeeded */
-	long	spxs_delack;		/* delayed acks sent */
-	long	spxs_timeoutdrop;	/* conn. dropped in rxmt timeout */
-	long	spxs_rexmttimeo;	/* retransmit timeouts */
-	long	spxs_persisttimeo;	/* persist timeouts */
-	long	spxs_keeptimeo;		/* keepalive timeouts */
-	long	spxs_keepprobe;		/* keepalive probes sent */
-	long	spxs_keepdrops;		/* connections dropped in keepalive */
-
-	long	spxs_sndtotal;		/* total packets sent */
-	long	spxs_sndpack;		/* data packets sent */
-	long	spxs_sndbyte;		/* data bytes sent */
-	long	spxs_sndrexmitpack;	/* data packets retransmitted */
-	long	spxs_sndrexmitbyte;	/* data bytes retransmitted */
-	long	spxs_sndacks;		/* ack-only packets sent */
-	long	spxs_sndprobe;		/* window probes sent */
-	long	spxs_sndurg;		/* packets sent with URG only */
-	long	spxs_sndwinup;		/* window update-only packets sent */
-	long	spxs_sndctrl;		/* control (SYN|FIN|RST) packets sent */
-	long	spxs_sndvoid;		/* couldn't find requested packet*/
-
-	long	spxs_rcvtotal;		/* total packets received */
-	long	spxs_rcvpack;		/* packets received in sequence */
-	long	spxs_rcvbyte;		/* bytes received in sequence */
-	long	spxs_rcvbadsum;		/* packets received with ccksum errs */
-	long	spxs_rcvbadoff;		/* packets received with bad offset */
-	long	spxs_rcvshort;		/* packets received too short */
-	long	spxs_rcvduppack;	/* duplicate-only packets received */
-	long	spxs_rcvdupbyte;	/* duplicate-only bytes received */
-	long	spxs_rcvpartduppack;	/* packets with some duplicate data */
-	long	spxs_rcvpartdupbyte;	/* dup. bytes in part-dup. packets */
-	long	spxs_rcvoopack;		/* out-of-order packets received */
-	long	spxs_rcvoobyte;		/* out-of-order bytes received */
-	long	spxs_rcvpackafterwin;	/* packets with data after window */
-	long	spxs_rcvbyteafterwin;	/* bytes rcvd after window */
-	long	spxs_rcvafterclose;	/* packets rcvd after "close" */
-	long	spxs_rcvwinprobe;	/* rcvd window probe packets */
-	long	spxs_rcvdupack;		/* rcvd duplicate acks */
-	long	spxs_rcvacktoomuch;	/* rcvd acks for unsent data */
-	long	spxs_rcvackpack;	/* rcvd ack packets */
-	long	spxs_rcvackbyte;	/* bytes acked by rcvd acks */
-	long	spxs_rcvwinupd;		/* rcvd window update packets */
-};
-struct	spx_istat {
-	short	hdrops;
-	short	badsum;
-	short	badlen;
-	short	slotim;
-	short	fastim;
-	short	nonucn;
-	short	noconn;
-	short	notme;
-	short	wrncon;
-	short	bdreas;
-	short	gonawy;
-	short	notyet;
-	short	lstdup;
-	struct spxstat newstats;
-};
-
-#define	SPX_ISSINCR	128
-/*
- * spx sequence numbers are 16 bit integers operated
- * on with modular arithmetic.  These macros can be
- * used to compare such integers.
- */
-#define	SSEQ_LT(a,b)	(((short)((a)-(b))) < 0)
-#define	SSEQ_LEQ(a,b)	(((short)((a)-(b))) <= 0)
-#define	SSEQ_GT(a,b)	(((short)((a)-(b))) > 0)
-#define	SSEQ_GEQ(a,b)	(((short)((a)-(b))) >= 0)
-
-#ifdef _KERNEL
-/* Following was struct spxstat spxstat; */
-#ifndef spxstat
-#define	spxstat	spx_istat.newstats
-#endif
-extern struct spx_istat	spx_istat;
-extern u_short	spx_newchecks[50];
-
-int	spx_output(struct spxpcb *cb, struct mbuf *m0);
-int	spx_reass(struct spxpcb *cb, struct mbuf *msi, struct spx *si);
-void	spx_reass_flush(struct spxpcb *cb);
-void	spx_reass_init(struct spxpcb *cb);
-#endif
-
-#endif /* !_NETIPX_SPX_VAR_H_ */
diff --git a/include.new/netkey/key.h b/include.new/netkey/key.h
deleted file mode 100644
index b2fc89e..0000000
--- a/include.new/netkey/key.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$FreeBSD: src/sys/netkey/key.h,v 1.12 2005/01/07 01:45:48 imp Exp $	*/
-/*	$KAME: key.h,v 1.32 2003/09/07 05:25:20 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETKEY_KEY_H_
-#define _NETKEY_KEY_H_
-
-#ifdef _KERNEL
-
-#include <sys/queue.h>
-
-extern struct key_cb key_cb;
-
-extern TAILQ_HEAD(_satailq, secasvar) satailq;
-extern TAILQ_HEAD(_sptailq, secpolicy) sptailq;
-
-struct secpolicy;
-struct secpolicyindex;
-struct ipsecrequest;
-struct secasvar;
-struct sockaddr;
-struct socket;
-struct sadb_msg;
-struct sadb_x_policy;
-union sockaddr_union;
-
-extern struct secpolicy *key_allocsp(u_int16_t, struct secpolicyindex *,
-	u_int);
-extern struct secpolicy *key_gettunnel(struct sockaddr *,
-	struct sockaddr *, struct sockaddr *, struct sockaddr *);
-extern int key_checkrequest
-	(struct ipsecrequest *isr, struct secasindex *);
-extern struct secasvar *key_allocsa(u_int, caddr_t, caddr_t, u_int, uint32_t);
-extern void key_freesp(struct secpolicy *);
-extern void key_freesav(struct secasvar *);
-extern struct secpolicy *key_newsp(uint32_t);
-extern struct secpolicy *key_msg2sp(struct sadb_x_policy *, size_t, int *);
-extern struct mbuf *key_sp2msg(struct secpolicy *);
-extern int key_cmpspidx_exactly
-	(struct secpolicyindex *, struct secpolicyindex *);
-extern int key_cmpspidx_withmask
-	(struct secpolicyindex *, struct secpolicyindex *);
-extern int key_spdacquire(struct secpolicy *);
-extern void key_timehandler(void *);
-extern void key_randomfill(void *, size_t);
-extern void key_freereg(struct socket *);
-extern int key_parse(struct mbuf *, struct socket *);
-extern void key_init(void);
-extern int key_checktunnelsanity(struct secasvar *, u_int, caddr_t, caddr_t);
-extern void key_sa_recordxfer(struct secasvar *, struct mbuf *);
-extern void key_sa_routechange(struct sockaddr *);
-extern void key_sa_stir_iv(struct secasvar *);
-
-/* to keep compatibility with FAST_IPSEC */
-#define	KEY_ALLOCSA(dst, proto, spi)	\
-	key_allocsa(((struct sockaddr *)(dst))->sa_family,\
-		    (caddr_t)&(((struct sockaddr_in *)(dst))->sin_addr),\
-		    (caddr_t)&(((struct sockaddr_in *)(dst))->sin_addr),\
-		    proto, spi)
-#define	KEY_FREESAV(psav)					\
-	key_freesav(*psav)
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_SECA);
-#endif /* MALLOC_DECLARE */
-
-#endif /* defined(_KERNEL) */
-#endif /* _NETKEY_KEY_H_ */
diff --git a/include.new/netkey/key_debug.h b/include.new/netkey/key_debug.h
deleted file mode 100644
index c811044..0000000
--- a/include.new/netkey/key_debug.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*	$FreeBSD: src/sys/netkey/key_debug.h,v 1.12 2005/01/07 01:45:48 imp Exp $	*/
-/*	$KAME: key_debug.h,v 1.11 2002/11/05 03:48:34 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETKEY_KEY_DEBUG_H_
-#define _NETKEY_KEY_DEBUG_H_
-
-#ifdef _KERNEL
-/* debug flags */
-#define KEYDEBUG_STAMP		0x00000001 /* path */
-#define KEYDEBUG_DATA		0x00000002 /* data */
-#define KEYDEBUG_DUMP		0x00000004 /* dump */
-
-#define KEYDEBUG_KEY		0x00000010 /* key processing */
-#define KEYDEBUG_ALG		0x00000020 /* ciph & auth algorithm */
-#define KEYDEBUG_IPSEC		0x00000040 /* ipsec processing */
-
-#define KEYDEBUG_KEY_STAMP	(KEYDEBUG_KEY | KEYDEBUG_STAMP)
-#define KEYDEBUG_KEY_DATA	(KEYDEBUG_KEY | KEYDEBUG_DATA)
-#define KEYDEBUG_KEY_DUMP	(KEYDEBUG_KEY | KEYDEBUG_DUMP)
-#define KEYDEBUG_ALG_STAMP	(KEYDEBUG_ALG | KEYDEBUG_STAMP)
-#define KEYDEBUG_ALG_DATA	(KEYDEBUG_ALG | KEYDEBUG_DATA)
-#define KEYDEBUG_ALG_DUMP	(KEYDEBUG_ALG | KEYDEBUG_DUMP)
-#define KEYDEBUG_IPSEC_STAMP	(KEYDEBUG_IPSEC | KEYDEBUG_STAMP)
-#define KEYDEBUG_IPSEC_DATA	(KEYDEBUG_IPSEC | KEYDEBUG_DATA)
-#define KEYDEBUG_IPSEC_DUMP	(KEYDEBUG_IPSEC | KEYDEBUG_DUMP)
-
-#define KEYDEBUG(lev,arg) \
-	do { if ((key_debug_level & (lev)) == (lev)) { arg; } } while (/*CONSTCOND*/ 0)
-
-extern uint32_t key_debug_level;
-#endif /*_KERNEL*/
-
-struct sadb_msg;
-struct sadb_ext;
-extern void kdebug_sadb(struct sadb_msg *);
-extern void kdebug_sadb_x_policy(struct sadb_ext *);
-
-#ifdef _KERNEL
-struct secpolicy;
-struct secpolicyindex;
-struct secasindex;
-struct secasvar;
-struct secreplay;
-struct mbuf;
-extern void kdebug_secpolicy(struct secpolicy *);
-extern void kdebug_secpolicyindex(struct secpolicyindex *);
-extern void kdebug_secasindex(struct secasindex *);
-extern void kdebug_secasv(struct secasvar *);
-extern void kdebug_mbufhdr(struct mbuf *);
-extern void kdebug_mbuf(struct mbuf *);
-#endif /*_KERNEL*/
-
-struct sockaddr;
-extern void kdebug_sockaddr(struct sockaddr *);
-
-extern void ipsec_hexdump(caddr_t, int);
-extern void ipsec_bindump(caddr_t, int);
-
-#endif /* _NETKEY_KEY_DEBUG_H_ */
diff --git a/include.new/netkey/key_var.h b/include.new/netkey/key_var.h
deleted file mode 100644
index 96cb99a..0000000
--- a/include.new/netkey/key_var.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$FreeBSD: src/sys/netkey/key_var.h,v 1.8 2005/01/07 01:45:48 imp Exp $	*/
-/*	$KAME: key_var.h,v 1.12 2001/11/06 03:48:29 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETKEY_KEY_VAR_H_
-#define _NETKEY_KEY_VAR_H_
-
-/* sysctl */
-#define KEYCTL_DEBUG_LEVEL		1
-#define KEYCTL_SPI_TRY			2
-#define KEYCTL_SPI_MIN_VALUE		3
-#define KEYCTL_SPI_MAX_VALUE		4
-#define KEYCTL_RANDOM_INT		5
-#define KEYCTL_LARVAL_LIFETIME		6
-#define KEYCTL_BLOCKACQ_COUNT		7
-#define KEYCTL_BLOCKACQ_LIFETIME	8
-#define KEYCTL_ESP_KEYMIN		9
-#define KEYCTL_ESP_AUTH			10
-#define KEYCTL_AH_KEYMIN		11
-#define KEYCTL_PREFERED_OLDSA		12
-#define KEYCTL_MAXID			13
-
-#ifdef _KERNEL
-#define _ARRAYLEN(p) (sizeof(p)/sizeof(p[0]))
-#define _KEYLEN(key) ((u_int)((key)->sadb_key_bits >> 3))
-#define _KEYBITS(key) ((u_int)((key)->sadb_key_bits))
-#define _KEYBUF(key) ((caddr_t)((caddr_t)(key) + sizeof(struct sadb_key)))
-#endif /*_KERNEL*/
-
-#endif /* _NETKEY_KEY_VAR_H_ */
diff --git a/include.new/netkey/keydb.h b/include.new/netkey/keydb.h
deleted file mode 100644
index da76489..0000000
--- a/include.new/netkey/keydb.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*	$FreeBSD: src/sys/netkey/keydb.h,v 1.12 2005/01/07 01:45:48 imp Exp $	*/
-/*	$KAME: keydb.h,v 1.24 2003/09/07 15:12:10 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETKEY_KEYDB_H_
-#define _NETKEY_KEYDB_H_
-
-#ifdef _KERNEL
-
-#include <netkey/key_var.h>
-
-#ifndef _SOCKADDR_UNION_DEFINED
-#define	_SOCKADDR_UNION_DEFINED
-/*
- * The union of all possible address formats we handle.
- */
-union sockaddr_union {
-	struct sockaddr		sa;
-	struct sockaddr_in	sin;
-	struct sockaddr_in6	sin6;
-};
-#endif /* _SOCKADDR_UNION_DEFINED */
-
-/* Security Assocciation Index */
-/* NOTE: Ensure to be same address family */
-struct secasindex {
-	struct sockaddr_storage src;	/* srouce address for SA */
-	struct sockaddr_storage dst;	/* destination address for SA */
-	u_int16_t proto;		/* IPPROTO_ESP or IPPROTO_AH */
-	u_int8_t mode;			/* mode of protocol, see ipsec.h */
-	uint32_t reqid;		/* reqid id who owned this SA */
-					/* see IPSEC_MANUAL_REQID_MAX. */
-};
-
-/* Security Association Data Base */
-struct secashead {
-	LIST_ENTRY(secashead) chain;
-
-	struct secasindex saidx;
-
-	struct sadb_ident *idents;	/* source identity */
-	struct sadb_ident *identd;	/* destination identity */
-					/* XXX I don't know how to use them. */
-
-	u_int8_t state;			/* MATURE or DEAD. */
-	LIST_HEAD(_satree, secasvar) savtree[SADB_SASTATE_MAX+1];
-					/* SA chain */
-					/* The first of this list is newer SA */
-
-	union {
-		struct route sau_route;
-		struct route_in6 sau_route6;
-	} sa_u;
-#define sa_route sa_u.sau_route
-};
-
-/* Security Association */
-struct secasvar {
-	TAILQ_ENTRY(secasvar) tailq;
-	LIST_ENTRY(secasvar) chain;
-	LIST_ENTRY(secasvar) spihash;
-
-	int refcnt;			/* reference count */
-	u_int8_t state;			/* Status of this Association */
-
-	u_int8_t alg_auth;		/* Authentication Algorithm Identifier*/
-	u_int8_t alg_enc;		/* Cipher Algorithm Identifier */
-	uint32_t spi;			/* SPI Value, network byte order */
-	uint32_t flags;		/* holder for SADB_KEY_FLAGS */
-
-	struct sadb_key *key_auth;	/* Key for Authentication */
-	struct sadb_key *key_enc;	/* Key for Encryption */
-	caddr_t iv;			/* Initilization Vector */
-	u_int ivlen;			/* length of IV */
-	void *sched;			/* intermediate encryption key */
-	size_t schedlen;
-
-	struct secreplay *replay;	/* replay prevention */
-	long created;			/* for lifetime */
-
-	struct sadb_lifetime *lft_c;	/* CURRENT lifetime, it's constant. */
-	struct sadb_lifetime *lft_h;	/* HARD lifetime */
-	struct sadb_lifetime *lft_s;	/* SOFT lifetime */
-
-	u_int64_t seq;			/* sequence number */
-	pid_t pid;			/* message's pid */
-
-	struct secashead *sah;		/* back pointer to the secashead */
-
-	uint32_t id;			/* SA id */
-};
-
-/* replay prevention */
-struct secreplay {
-	u_int64_t count;
-	u_int wsize;		/* window size, i.g. 4 bytes */
-	u_int64_t seq;		/* used by sender */
-	u_int64_t lastseq;	/* used by receiver */
-	u_int8_t *bitmap;	/* used by receiver */
-	int overflow;		/* what round does the counter take. */
-};
-
-/* socket table due to send PF_KEY messages. */
-struct secreg {
-	LIST_ENTRY(secreg) chain;
-
-	struct socket *so;
-};
-
-#ifndef IPSEC_NONBLOCK_ACQUIRE
-/* acquiring list table. */
-struct secacq {
-	LIST_ENTRY(secacq) chain;
-
-	struct secasindex saidx;
-
-	uint32_t seq;		/* sequence number */
-	long created;		/* for lifetime */
-	int count;		/* for lifetime */
-};
-#endif
-
-/* Sensitivity Level Specification */
-/* nothing */
-
-#define SADB_KILL_INTERVAL	600	/* six seconds */
-
-struct key_cb {
-	int key_count;
-	int any_count;
-};
-
-/* secpolicy */
-struct secpolicy;
-struct secpolicyindex;
-extern struct secpolicy *keydb_newsecpolicy(void);
-extern uint32_t keydb_newspid(void);
-extern void keydb_delsecpolicy(struct secpolicy *);
-extern int keydb_setsecpolicyindex
-	(struct secpolicy *, struct secpolicyindex *);
-/* secashead */
-extern struct secashead *keydb_newsecashead(void);
-extern void keydb_delsecashead(struct secashead *);
-/* secasvar */
-extern struct secasvar *keydb_newsecasvar(void);
-extern void keydb_delsecasvar(struct secasvar *);
-/* secreplay */
-extern struct secreplay *keydb_newsecreplay(size_t);
-extern void keydb_delsecreplay(struct secreplay *);
-/* secreg */
-extern struct secreg *keydb_newsecreg(void);
-extern void keydb_delsecreg(struct secreg *);
-
-#endif /* _KERNEL */
-
-#endif /* _NETKEY_KEYDB_H_ */
diff --git a/include.new/netkey/keysock.h b/include.new/netkey/keysock.h
deleted file mode 100644
index 71f823f..0000000
--- a/include.new/netkey/keysock.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*	$FreeBSD: src/sys/netkey/keysock.h,v 1.8.2.1 2006/01/27 21:50:11 bz Exp $	*/
-/*	$KAME: keysock.h,v 1.9 2002/03/21 14:00:14 itojun Exp $	*/
-
-/*-
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef _NETKEY_KEYSOCK_H_
-#define _NETKEY_KEYSOCK_H_
-
-/* statistics for pfkey socket */
-struct pfkeystat {
-	/* userland -> kernel */
-	u_quad_t out_total;		/* # of total calls */
-	u_quad_t out_bytes;		/* total bytecount */
-	u_quad_t out_msgtype[256];	/* message type histogram */
-	u_quad_t out_invlen;		/* invalid length field */
-	u_quad_t out_invver;		/* invalid version field */
-	u_quad_t out_invmsgtype;	/* invalid message type field */
-	u_quad_t out_tooshort;		/* msg too short */
-	u_quad_t out_nomem;		/* memory allocation failure */
-	u_quad_t out_dupext;		/* duplicate extension */
-	u_quad_t out_invexttype;	/* invalid extension type */
-	u_quad_t out_invsatype;		/* invalid sa type */
-	u_quad_t out_invaddr;		/* invalid address extension */
-	/* kernel -> userland */
-	u_quad_t in_total;		/* # of total calls */
-	u_quad_t in_bytes;		/* total bytecount */
-	u_quad_t in_msgtype[256];	/* message type histogram */
-	u_quad_t in_msgtarget[3];	/* one/all/registered */
-	u_quad_t in_nomem;		/* memory allocation failure */
-	/* others */
-	u_quad_t sockerr;		/* # of socket related errors */
-};
-
-#define KEY_SENDUP_ONE		0
-#define KEY_SENDUP_ALL		1
-#define KEY_SENDUP_REGISTERED	2
-
-#ifdef _KERNEL
-struct keycb {
-	struct rawcb kp_raw;	/* rawcb */
-	int kp_promisc;		/* promiscuous mode */
-	int kp_registered;	/* registered socket */
-};
-
-extern struct pfkeystat pfkeystat;
-
-extern int key_output(struct mbuf *m, struct socket *so);
-extern int key_usrreq(struct socket *,
-	int, struct mbuf *, struct mbuf *, struct mbuf *);
-
-extern int key_sendup_mbuf(struct socket *, struct mbuf *, int);
-#endif /* _KERNEL */
-
-#endif /*_NETKEY_KEYSOCK_H_*/
diff --git a/include.new/netnatm/addr.h b/include.new/netnatm/addr.h
deleted file mode 100644
index c1ba20e..0000000
--- a/include.new/netnatm/addr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/addr.h,v 1.3 2004/07/08 08:21:45 brandt Exp $
- */
-#ifndef _NETNATM_ADDR_H_
-#define _NETNATM_ADDR_H_
-
-int uni_str2nsap(u_char *, const char *);
-void uni_nsap2str(char *, const u_char *, int);
-
-void uni_prefix2str(char *, const u_char *, u_int, int);
-
-int uni_e1642nsap(u_char *, const char *);
-int uni_nsap2e164(char *, const u_char *, int);
-
-#endif
diff --git a/include.new/netnatm/api/atmapi.h b/include.new/netnatm/api/atmapi.h
deleted file mode 100644
index 887f548..0000000
--- a/include.new/netnatm/api/atmapi.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Copyright (c) 2001-2002
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation 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.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHORS
- * AND ITS 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 AUTHORS OR ITS 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.
- *
- * $Begemot: libunimsg/netnatm/api/atmapi.h,v 1.1 2004/07/08 08:21:48 brandt Exp $
- *
- * ATM API as defined per af-saa-0108
- */
-#ifndef _NETNATM_API_ATMAPI_H_
-#define _NETNATM_API_ATMAPI_H_
-
-#include <sys/types.h>
-
-/* size of an endpointlen including trailing \0 */
-#define	ATM_EPNAMSIZ	65
-
-enum atmstate {
-	ATM_A0,		/* non existent */
-	ATM_A1,		/* initial */
-	ATM_A2,		/* outgoing call preparation */
-	ATM_A3,		/* outgoing call requested */
-	ATM_A4,		/* incoming call preparation */
-	ATM_A5,		/* wait incoming call */
-	ATM_A6,		/* incoming call present */
-	ATM_A7,		/* incoming call requested */
-	ATM_A8,		/* p2p data transfer */
-	ATM_A9,		/* p2mp root data transfer */
-	ATM_A10,	/* p2mp leaf data transfer */
-	ATM_A11,	/* terminated */
-};
-
-enum atmop {
-	ATMOP_RESP,				/* 0 */
-	ATMOP_ABORT_CONNECTION,
-	ATMOP_ACCEPT_INCOMING_CALL,
-	ATMOP_ADD_PARTY,
-	ATMOP_ADD_PARTY_REJECT,
-	ATMOP_ADD_PARTY_SUCCESS,		/* 5 */
-	ATMOP_ARRIVAL_OF_INCOMING_CALL,
-	ATMOP_CALL_RELEASE,
-	ATMOP_CONNECT_OUTGOING_CALL,
-	ATMOP_DROP_PARTY,
-	ATMOP_GET_LOCAL_PORT_INFO,		/* 10 */
-	ATMOP_P2MP_CALL_ACTIVE,
-	ATMOP_P2P_CALL_ACTIVE,
-	ATMOP_PREPARE_INCOMING_CALL,
-	ATMOP_PREPARE_OUTGOING_CALL,
-	ATMOP_QUERY_CONNECTION_ATTRIBUTES,	/* 15 */
-	ATMOP_REJECT_INCOMING_CALL,
-	ATMOP_SET_CONNECTION_ATTRIBUTES,
-	ATMOP_WAIT_ON_INCOMING_CALL,
-	ATMOP_SET_CONNECTION_ATTRIBUTES_X,
-	ATMOP_QUERY_CONNECTION_ATTRIBUTES_X,	/* 20 */
-	ATMOP_QUERY_STATE,
-};
-
-#define ATM_DEFINE_ERRORS						\
-   DEF(ATMERR_OK,		 0, "OK")				\
-   DEF(ATMERR_SYS,		-1, "syscall error")			\
-   DEF(ATMERR_BAD_OP,		-2, "bad operation")			\
-   DEF(ATMERR_BAD_ARGS,		-3, "bad arguments for operation")	\
-   DEF(ATMERR_BAD_STATE,	-4, "operation in bad state")		\
-   DEF(ATMERR_BAD_ATTR,		-5, "unknown attribute")		\
-   DEF(ATMERR_BAD_VALUE,	-6, "bad attribute value")		\
-   DEF(ATMERR_BUSY,		-7, "busy")				\
-   DEF(ATMERR_RDONLY,		-8, "read-only attribute")		\
-   DEF(ATMERR_BAD_SAP,		-9, "bad SAP")				\
-   DEF(ATMERR_OVERLAP,		-10,"overlaping SAP")			\
-   DEF(ATMERR_BAD_ENDPOINT,	-11,"bad ATM endpoint")			\
-   DEF(ATMERR_PREVIOUSLY_ABORTED,-12,"previously aborted")		\
-   DEF(ATMERR_NO_CALL,		-13,"no incoming call")			\
-   DEF(ATMERR_BAD_LEAF_IDENT,	-14,"bad leaf identifier")		\
-   DEF(ATMERR_BAD_PORT,		-15,"unknown port")			\
-   DEF(ATMERR_BAD_SIGNAL,	-29-UNIAPI_ERROR_BAD_SIGNAL, "bad signal")\
-   DEF(ATMERR_BADCU,		-29-UNIAPI_ERROR_BADCU, "bad coordinator state")\
-   DEF(ATMERR_BAD_CALLSTATE,	-29-UNIAPI_ERROR_BAD_CALLSTATE, "bad call state")\
-   DEF(ATMERR_BAD_EPSTATE,	-29-UNIAPI_ERROR_BAD_EPSTATE, "bad party state")\
-   DEF(ATMERR_BAD_UNIARG,	-29-UNIAPI_ERROR_BAD_ARG, "bad uni argument")\
-   DEF(ATMERR_BAD_CALL,		-29-UNIAPI_ERROR_BAD_CALL, "unknown call")\
-   DEF(ATMERR_BAD_PARTY,	-29-UNIAPI_ERROR_BAD_PARTY, "unknown party")\
-   DEF(ATMERR_BAD_CTYPE,	-29-UNIAPI_ERROR_BAD_CTYPE, "wrong call type")\
-   DEF(ATMERR_BAD_IE,		-29-UNIAPI_ERROR_BAD_IE, "bad information element")\
-   DEF(ATMERR_EPREF_INUSE,	-29-UNIAPI_ERROR_EPREF_INUSE, "endpoint reference in use")\
-   DEF(ATMERR_MISSING_IE,	-29-UNIAPI_ERROR_MISSING_IE, "missing information element")\
-   DEF(ATMERR_ENCODING,		-29-UNIAPI_ERROR_ENCODING, "encoding error")\
-   DEF(ATMERR_NOMEM,		-29-UNIAPI_ERROR_NOMEM, "no memory")\
-   DEF(ATMERR_UNIBUSY,		-29-UNIAPI_ERROR_BUSY, "uni process busy")
-
-#define ATM_MKUNIERR(E)	(-29 - (E))
-
-enum atm_error {
-#define DEF(NAME,VAL,STR)	NAME = (VAL),
-ATM_DEFINE_ERRORS
-#undef DEF
-};
-
-enum atm_attribute {
-	ATM_ATTR_NONE = 0,
-	ATM_ATTR_BLLI_SELECTOR,
-	ATM_ATTR_BLLI,
-	ATM_ATTR_BEARER,
-	ATM_ATTR_TRAFFIC,
-	ATM_ATTR_QOS,
-	ATM_ATTR_EXQOS,
-	ATM_ATTR_CALLED,
-	ATM_ATTR_CALLEDSUB,
-	ATM_ATTR_CALLING,
-	ATM_ATTR_CALLINGSUB,
-	ATM_ATTR_AAL,
-	ATM_ATTR_EPREF,
-	ATM_ATTR_CONNED,
-	ATM_ATTR_CONNEDSUB,
-	ATM_ATTR_EETD,
-	ATM_ATTR_ABRSETUP,
-	ATM_ATTR_ABRADD,
-	ATM_ATTR_CONNID,
-	ATM_ATTR_MDCR,
-};
-
-struct atm_resp {
-	int32_t		resp;
-	uint32_t	data;		/* type of attached data */
-};
-enum {
-	ATMRESP_NONE,			/* no data */
-	ATMRESP_ATTRS,			/* attribute(s) */
-	ATMRESP_PORTS,			/* port info */
-	ATMRESP_STATE,			/* endpoint state */
-	ATMRESP_EXSTAT,			/* extended status */
-};
-
-struct atm_abort_connection {
-	struct uni_ie_cause cause;
-};
-
-struct atm_query_connection_attributes {
-	uint32_t	attr;
-};
-struct atm_set_connection_attributes {
-	uint32_t	attr;
-};
-struct atm_query_connection_attributes_x {
-	uint32_t	count;
-#if defined(__GNUC__) && __GNUC__ < 3
-	uint32_t	attr[0];
-#else
-	uint32_t	attr[];
-#endif
-};
-struct atm_set_connection_attributes_x {
-	uint32_t	count;
-#if defined(__GNUC__) && __GNUC__ < 3
-	uint32_t	attr[0];
-#else
-	uint32_t	attr[];
-#endif
-};
-struct atm_prepare_incoming_call {
-	struct uni_sap	sap;
-	uint32_t	queue_size;
-};
-struct atm_connect_outgoing_call {
-	struct uni_ie_called	called;
-};
-struct atm_call_release {
-	struct uni_ie_cause	cause[2];
-};
-struct atm_p2p_call_active {
-	struct uni_ie_connid	connid;
-};
-struct atm_p2mp_call_active {
-	struct uni_ie_connid	connid;
-};
-struct atm_accept_incoming_call {
-	char	newep[ATM_EPNAMSIZ];
-};
-struct atm_reject_incoming_call {
-	struct uni_ie_cause	cause;
-};
-struct atm_add_party {
-	uint16_t		leaf_ident;
-	struct uni_ie_called	called;
-};
-struct atm_add_party_success {
-	uint16_t		leaf_ident;
-};
-struct atm_add_party_reject {
-	uint16_t		leaf_ident;
-	struct uni_ie_cause	cause;
-};
-struct atm_drop_party {
-	uint16_t		leaf_ident;
-	struct uni_ie_cause	cause;
-};
-
-/*
- * Get local port info. If port is 0, information on all ports is returned,
- * otherwise only on the named port.
- * The response consists of a header with two counters, a list of ports
- * (struct atm_port_info) and a list of addresses (struct uni_addr).
- * The port to which an address belongs is implicit in the num_addrs field
- * of the port.
- */
-struct atm_get_local_port_info {
-	uint32_t	port;
-};
-
-struct atm_port_list {
-	uint32_t	num_ports;	/* number of ports */
-	uint32_t	num_addrs;	/* total number of addresses */
-};
-
-struct atm_port_info {
-	uint32_t	port;
-	uint32_t	pcr;
-	uint32_t	max_vpi_bits;
-	uint32_t	max_vci_bits;
-	uint32_t	max_svpc_vpi;
-	uint32_t	max_svcc_vpi;
-	uint32_t	min_svcc_vci;
-	u_char		esi[6];
-	uint32_t	num_addrs;	/* number of addresses on this port */
-};
-
-/*
- * Endpoint state info
- */
-struct atm_epstate {
-	char	name[ATM_EPNAMSIZ];
-	uint8_t	state;
-};
-
-/*
- * Extended status information.
- */
-struct atm_exstatus {
-	uint32_t	neps;		/* endpoints */
-	uint32_t	nports;		/* ports */
-	uint32_t	nconns;		/* connections */
-	uint32_t	nparties;	/* number of parties */
-};
-struct atm_exstatus_ep {
-	char		name[ATM_EPNAMSIZ];
-	uint8_t		state;		/* Ux */
-};
-struct atm_exstatus_port {
-	uint32_t	portno;
-	uint8_t		state;
-};
-struct atm_exstatus_conn {
-	uint32_t	id;
-	uint32_t	cref;		/* (flag << 23) | cref */
-	uint32_t	port;
-	char		ep[ATM_EPNAMSIZ];	/* \0 - none */
-	uint8_t		state;		/* Cx */
-};
-struct atm_exstatus_party {
-	uint32_t	connid;
-	uint16_t	epref;
-	uint8_t		state;		/* Px */
-};
-#endif
diff --git a/include.new/netnatm/api/ccatm.h b/include.new/netnatm/api/ccatm.h
deleted file mode 100644
index 1b4a179..0000000
--- a/include.new/netnatm/api/ccatm.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2003-2004
- *	Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Harti Brandt <harti@freebsd.org>
- *
- * Redistribution of this software and documentation 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 or documentation 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.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR
- * AND ITS 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 ITS 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.
- *
- * $Begemot: libunimsg/netnatm/api/ccatm.h,v 1.1 2004/07/08 08:21:58 brandt Exp $
- *
- * ATM API as defined per af-saa-0108
- *
- * Interface to the supporting code.
- */
-
-#ifndef _API_CCATM_H_
-#define _API_CCATM_H_
-
-struct ccuser;
-struct ccconn;
-struct ccport;
-struct ccdata;
-
-struct cc_funcs {
-	/* send signal to API user */
-	void	(*send_user)(struct ccuser *, void *, u_int, void *, size_t);
-
-	/* respond API user */
-	void	(*respond_user)(struct ccuser *, void *, int, u_int,
-		    void *, size_t);
-
-	/* send signal to uni for connection */
-	void	(*send_uni)(struct ccconn *, void *, u_int, u_int,
-		    struct uni_msg *);
-
-	/* send global signal to uni */
-	void	(*send_uni_glob)(struct ccport *, void *, u_int, u_int,
-		    struct uni_msg *);
-
-	/* log a message */
-	void	(*log)(const char *, ...);
-};
-
-enum {
-	CCLOG_USER_STATE	= 0x00000001,
-	CCLOG_USER_INST		= 0x00000002,
-	CCLOG_USER_SIG		= 0x00000004,
-	CCLOG_CONN_STATE	= 0x00000010,
-	CCLOG_CONN_INST		= 0x00000020,
-	CCLOG_CONN_SIG		= 0x00000040,
-	CCLOG_PARTY_STATE	= 0x00000100,
-	CCLOG_PARTY_INST	= 0x00000200,
-	CCLOG_PARTY_SIG		= 0x00000400,
-	CCLOG_SIGS		= 0x00001000,
-};
-
-/* instance handling */
-struct ccdata *cc_create(const struct cc_funcs *);
-void cc_destroy(struct ccdata *);
-void cc_reset(struct ccdata *);
-
-/* input a response from the UNI layer to CC */
-int cc_uni_response(struct ccport *, u_int cookie, u_int reason, u_int state);
-
-/* Signal from UNI on this port */
-int cc_uni_signal(struct ccport *, u_int cookie, u_int sig, struct uni_msg *);
-
-/* retrieve addresses */
-int cc_get_addrs(struct ccdata *, u_int, struct uni_addr **, u_int **, u_int *);
-
-/* dump state */
-typedef int (*cc_dump_f)(struct ccdata *, void *, const char *);
-int cc_dump(struct ccdata *, size_t, cc_dump_f, void *);
-
-/* start/stop port */
-int cc_port_stop(struct ccdata *, u_int);
-int cc_port_start(struct ccdata *, u_int);
-
-/* is port running? */
-int cc_port_isrunning(struct ccdata *, u_int, int *);
-
-/* return port number */
-u_int cc_port_no(struct ccport *);
-
-/* Clear address and prefix information from the named port. */
-int cc_port_clear(struct ccdata *, u_int);
-
-/* Address registered.  */
-int cc_addr_register(struct ccdata *, u_int, const struct uni_addr *);
-
-/* Address unregistered. */
-int cc_addr_unregister(struct ccdata *, u_int, const struct uni_addr *);
-
-/* get port info */
-int cc_port_get_param(struct ccdata *, u_int, struct atm_port_info *);
-
-/* set port info */
-int cc_port_set_param(struct ccdata *, const struct atm_port_info *);
-
-/* get port list */
-int cc_port_getlist(struct ccdata *, u_int *, u_int **);
-
-/* create a port */
-struct ccport *cc_port_create(struct ccdata *, void *, u_int);
-
-/* destroy a port */
-void cc_port_destroy(struct ccport *, int);
-
-/* New endpoint created */
-struct ccuser *cc_user_create(struct ccdata *, void *, const char *);
-
-/* destroy user endpoint */
-void cc_user_destroy(struct ccuser *);
-
-/* signal from user */
-int cc_user_signal(struct ccuser *, u_int, struct uni_msg *);
-
-/* Management is given up on this node. */
-void cc_unmanage(struct ccdata *);
-
-/* handle all queued signals */
-void cc_work(struct ccdata *);
-
-/* set/get logging flags */
-void cc_set_log(struct ccdata *, u_int);
-u_int cc_get_log(const struct ccdata *);
-
-/* get extended status */
-int cc_get_extended_status(const struct ccdata *, struct atm_exstatus *,
-    struct atm_exstatus_ep **, struct atm_exstatus_port **,
-    struct atm_exstatus_conn **, struct atm_exstatus_party **);
-
-#endif
diff --git a/include.new/netnatm/api/unisap.h b/include.new/netnatm/api/unisap.h
deleted file mode 100644
index ffbfc9f..0000000
--- a/include.new/netnatm/api/unisap.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * 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.
- *
- * 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.
- *
- * $Begemot: libunimsg/netnatm/api/unisap.h,v 1.6 2005/05/23 11:49:17 brandt_h Exp $
- */
-#ifndef _NETNATM_API_UNISAP_H_
-#define _NETNATM_API_UNISAP_H_
-
-#include <netnatm/msg/uni_config.h>
-
-enum unisve_tag {
-	UNISVE_ABSENT,		/* Element is absent */
-	UNISVE_PRESENT,		/* Element is present with specific value */
-	UNISVE_ANY		/* Any values is acceptable */
-};
-
-struct unisve_addr {
-	enum unisve_tag		tag;
-	enum uni_addr_type	type;	/* type of address */
-	enum uni_addr_plan	plan;	/* addressing plan */
-	uint32_t		len;	/* length of address */
-	u_char			addr[UNI_ADDR_MAXLEN];
-};
-
-struct unisve_selector {
-	enum unisve_tag	tag;
-	uint8_t		selector;
-};
-
-struct unisve_blli_id2 {
-	enum unisve_tag	tag;
-	u_int		proto:5;	/* the protocol */
-	u_int		user:7;		/* user specific protocol */
-};
-
-struct unisve_blli_id3 {
-	enum unisve_tag	tag;
-	u_int		proto:5;	/* L3 protocol */
-	u_int		user:7;		/* user specific protocol */
-	u_int		ipi:8;		/* ISO/IEC TR 9557 IPI */
-	u_int		oui:24;		/* IEEE 802.1 OUI */
-	u_int		pid:16;		/* IEEE 802.1 PID */
-	uint32_t	noipi;		/* ISO/IEC TR 9557 per frame */
-};
-
-struct unisve_bhli {
-	enum unisve_tag	tag;
-	enum uni_bhli	type;		/* type of info */
-	uint32_t	len;		/* length of info */
-	uint8_t		info[8];	/* info itself */
-};
-
-struct uni_sap {
-	struct unisve_addr	addr;
-	struct unisve_selector	selector;
-	struct unisve_blli_id2	blli_id2;
-	struct unisve_blli_id3	blli_id3;
-	struct unisve_bhli	bhli;
-};
-
-int unisve_check_addr(const struct unisve_addr *);
-int unisve_check_selector(const struct unisve_selector *);
-int unisve_check_blli_id2(const struct unisve_blli_id2 *);
-int unisve_check_blli_id3(const struct unisve_blli_id3 *);
-int unisve_check_bhli(const struct unisve_bhli *);
-
-int unisve_check_sap(const struct uni_sap *);
-
-int unisve_overlap_addr(const struct unisve_addr *, const struct unisve_addr *);
-int unisve_overlap_selector(const struct unisve_selector *,
-    const struct unisve_selector *);
-int unisve_overlap_blli_id2(const struct unisve_blli_id2 *,
-    const struct unisve_blli_id2 *);
-int unisve_overlap_blli_id3(const struct unisve_blli_id3 *,
-    const struct unisve_blli_id3 *);
-int unisve_overlap_bhli(const struct unisve_bhli *,
-    const struct unisve_bhli *);
-int unisve_overlap_sap(const struct uni_sap *, const struct uni_sap *);
-
-int unisve_is_catchall(const struct uni_sap *);
-int unisve_match(const struct uni_sap *, const struct uni_ie_called *,
-	const struct uni_ie_blli *, const struct uni_ie_bhli *);
-
-enum {
-	UNISVE_OK = 0,
-	UNISVE_ERROR_BAD_TAG,
-	UNISVE_ERROR_TYPE_PLAN_CONFLICT,
-	UNISVE_ERROR_ADDR_SEL_CONFLICT,
-	UNISVE_ERROR_ADDR_LEN,
-	UNISVE_ERROR_BAD_ADDR_TYPE,
-	UNISVE_ERROR_BAD_BHLI_TYPE,
-	UNISVE_ERROR_BAD_BHLI_LEN,
-};
-
-#define UNISVE_ERRSTR					\
-	"no error",					\
-	"bad SVE tag",					\
-	"bad address type/plan combination",		\
-	"bad address plan/selector tag combination",	\
-	"bad address length in SVE",			\
-	"unknown address type in SVE",			\
-	"bad BHLI type in SVE",				\
-	"BHLI info too long in SVE",
-
-#endif
diff --git a/include.new/netnatm/msg/uni_config.h b/include.new/netnatm/msg/uni_config.h
deleted file mode 100644
index e53f59b..0000000
--- a/include.new/netnatm/msg/uni_config.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/uni_config.h,v 1.3 2003/09/19 11:58:15 hbb Exp $
- */
-#ifndef _uni_uni_config_h_
-#define _uni_uni_config_h_
-
-enum {
-	/* maximum number of reported error IEs */
-	UNI_MAX_ERRIE	= 50,
-
-	/* maximum number of Generic Identifier Transport IE's per message */
-	UNI_NUM_IE_GIT	= 3,
-
-	/* maximum number of BLLI's in SETUP */
-	UNI_NUM_IE_BLLI	= 3,
-
-	/* maximum number of CALLEDSUB's */
-	UNI_NUM_IE_CALLEDSUB = 2,
-
-	/* maximum number of CALLINGSUB's */
-	UNI_NUM_IE_CALLINGSUB = 2,
-
-	/* maximum number of TNS's */
-	UNI_NUM_IE_TNS = 4,
-
-	/* maximum length of TNS name */
-	UNI_TNS_MAXLEN = 4,
-
-	/* maximum info size in user-to-user signalling IE */
-	UNI_UU_MAXLEN	= 128,
-
-	/* maximum length of address */
-	UNI_ADDR_MAXLEN	= 20,
-
-	/* maximum length of subaddress */
-	UNI_SUBADDR_MAXLEN = 20,
-
-	/* maximum number of DTLs */
-	UNI_NUM_IE_DTL = 10,
-	/* maximum number of identifiers in DTL */
-	UNI_DTL_MAXNUM = 20,
-};
-#endif
diff --git a/include.new/netnatm/msg/uni_hdr.h b/include.new/netnatm/msg/uni_hdr.h
deleted file mode 100644
index c9a30f1..0000000
--- a/include.new/netnatm/msg/uni_hdr.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/uni_hdr.h,v 1.6 2004/07/08 08:22:05 brandt Exp $
- */
-#ifndef _NETNATM_MSG_UNI_HDR_H_
-#define _NETNATM_MSG_UNI_HDR_H_
-
-#include <sys/types.h>
-#ifdef _KERNEL
-#include <sys/stdint.h>
-#else
-#include <stdint.h>
-#endif
-
-#include <netnatm/msg/uni_config.h>
-
-enum {
-	UNI_PROTO	= 0x09,		/* protocol discriminator */
-	PNNI_PROTO	= 0xf0,		/* PNNI protocol discriminator */
-};
-
-/*
- * Message types
- */
-enum uni_msgtype {
-	UNI_UNKNOWN		= 0x100,/* unknown message */
-
-	UNI_ALERTING		= 0x01,	/* alerting */
-	UNI_CALL_PROC		= 0x02, /* call proceeding */
-	UNI_SETUP		= 0x05,	/* setup */
-	UNI_CONNECT		= 0x07,	/* connect */
-	UNI_CONNECT_ACK		= 0x0f,	/* connect ack */
-
-	UNI_RESTART		= 0x46,	/* restart */
-	UNI_RELEASE		= 0x4d,	/* release */
-	UNI_RESTART_ACK		= 0x4e,	/* restart acknowledgement */
-	UNI_RELEASE_COMPL	= 0x5a,	/* release complete */
-
-	UNI_NOTIFY		= 0x6e,	/* notify user */
-	UNI_STATUS_ENQ		= 0x75,	/* status enquiry */
-	UNI_STATUS		= 0x7d,	/* status */
-
-	UNI_ADD_PARTY		= 0x80,	/* add party */
-	UNI_ADD_PARTY_ACK	= 0x81,	/* add party acknowledgement */
-	UNI_ADD_PARTY_REJ	= 0x82,	/* add party reject */
-	UNI_DROP_PARTY		= 0x83,	/* drop party */
-	UNI_DROP_PARTY_ACK	= 0x84,	/* drop party acknowledgement */
-	UNI_PARTY_ALERTING	= 0x85,	/* party alerting */
-
-	UNI_LEAF_SETUP_FAIL	= 0x90,	/* leaf setup failed */
-	UNI_LEAF_SETUP_REQ	= 0x91,	/* leaf setup request */
-
-	UNI_COBISETUP		= 0x15,	/* Q.2932 COBI-setup */
-	UNI_FACILITY		= 0x62,	/* Q.2932 facility */
-
-	UNI_MODIFY_REQ		= 0x88,	/* Q.2963 Modify request */
-	UNI_MODIFY_ACK		= 0x89,	/* Q.2963 Modify acknowledgement */
-	UNI_MODIFY_REJ		= 0x8a,	/* Q.2963 Modify reject */
-	UNI_CONN_AVAIL		= 0x8b,	/* Q.2963 Connection available */
-};
-
-/*
- * Information element types
- */
-enum uni_ietype {
-	UNI_IE_CAUSE		= 0x08,	/* cause */
-	UNI_IE_CALLSTATE	= 0x14,	/* call state */
-	UNI_IE_FACILITY		= 0x1C,	/* Q.2932 facility IE */
-	UNI_IE_NOTIFY		= 0x27,	/* UNI4.0 notify */
-	UNI_IE_EETD		= 0x42,	/* UNI4.0 end-to-end transit delay */
-	UNI_IE_CONNED		= 0x4c,	/* UNI4.0/Q.2951 connected address */
-	UNI_IE_CONNEDSUB	= 0x4d,	/* UNI4.0/Q.2951 connected subaddress */
-	UNI_IE_EPREF		= 0x54,	/* endpoint reference */
-	UNI_IE_EPSTATE		= 0x55,	/* enpoint state */
-	UNI_IE_AAL		= 0x58,	/* ATM adaptation layer parameters */
-	UNI_IE_TRAFFIC		= 0x59,	/* ATM traffic descriptor */
-	UNI_IE_CONNID		= 0x5a,	/* connection identifier */
-	UNI_IE_QOS		= 0x5c,	/* quality of service parameter */
-	UNI_IE_BHLI		= 0x5d,	/* broadband higher layer information */
-	UNI_IE_BEARER		= 0x5e,	/* broadband bearer capability */
-	UNI_IE_BLLI		= 0x5f,	/* broadband lower layer information */
-	UNI_IE_LSHIFT		= 0x60,	/* broadband locking shift */
-	UNI_IE_NLSHIFT		= 0x61,	/* broadband non-locking shift */
-	UNI_IE_SCOMPL		= 0x62,	/* broadband sending complete */
-	UNI_IE_REPEAT		= 0x63,	/* broadband repeat indicator */
-	UNI_IE_CALLING		= 0x6c,	/* calling party number */
-	UNI_IE_CALLINGSUB	= 0x6d,	/* calling party subaddress */
-	UNI_IE_CALLED		= 0x70,	/* called party number */
-	UNI_IE_CALLEDSUB	= 0x71,	/* called party subaddress */
-	UNI_IE_TNS		= 0x78,	/* transit network selection */
-	UNI_IE_RESTART		= 0x79,	/* restart indicator */
-	UNI_IE_UU		= 0x7e,	/* UNI4.0/Q.2957 user-to-user info */
-	UNI_IE_GIT		= 0x7f,	/* UNI4.0 generic identifier transport*/
-	UNI_IE_MINTRAFFIC	= 0x81,	/* Q.2962 minimum traffic desc */
-	UNI_IE_ATRAFFIC		= 0x82,	/* Q.2962 alternate traffic desc */
-	UNI_IE_ABRSETUP		= 0x84,	/* UNI4.0 ABR setup parameters */
-	UNI_IE_REPORT		= 0x89,	/* Q.2963 broadband report type */
-	UNI_IE_CALLED_SOFT	= 0xe0,	/* PNNI Calling party soft PVPC */
-	UNI_IE_CRANKBACK	= 0xe1,	/* PNNI Crankback */
-	UNI_IE_DTL		= 0xe2,	/* PNNI designated transit list */
-	UNI_IE_CALLING_SOFT	= 0xe3,	/* PNNI Called party soft PVPC */
-	UNI_IE_ABRADD		= 0xe4,	/* UNI4.0 ABR additional parameters */
-	UNI_IE_LIJ_CALLID	= 0xe8,	/* UNI4.0 LIF call identifier */
-	UNI_IE_LIJ_PARAM	= 0xe9,	/* UNI4.0 LIF parameters */
-	UNI_IE_LIJ_SEQNO	= 0xea,	/* UNI4.0 LIF sequence number */
-	UNI_IE_CSCOPE		= 0xeb,	/* UNI4.0 connection scope selection */
-	UNI_IE_EXQOS		= 0xec,	/* UNI4.0 extended QoS parameters */
-	UNI_IE_MDCR		= 0xf0,	/* UNI4.0+ Minimum desired call rate */
-	UNI_IE_UNREC		= 0xfe,
-};
-
-enum uni_coding {
-	UNI_CODING_ITU = 0x0,
-	UNI_CODING_NET = 0x3,
-};
-
-enum uni_msgact {
-	UNI_MSGACT_CLEAR	= 0x0,
-	UNI_MSGACT_IGNORE	= 0x1,
-	UNI_MSGACT_REPORT	= 0x2,
-
-	UNI_MSGACT_DEFAULT	= 0x4
-};
-
-enum uni_ieact {
-	UNI_IEACT_CLEAR		= 0x00,	/* clear call */
-	UNI_IEACT_IGNORE	= 0x01,	/* ignore IE and proceed */
-	UNI_IEACT_REPORT	= 0x02,	/* ignore IE, report and proceed */
-	UNI_IEACT_MSG_IGNORE	= 0x05,	/* ignore message */
-	UNI_IEACT_MSG_REPORT	= 0x06,	/* ignore message and report */
-
-	UNI_IEACT_DEFAULT	= 0x08
-};
-
-struct uni_cref {
-	u_int	flag;
-	u_int	cref;
-};
-
-/*
- * Message header.
- */
-struct uni_msghdr {
-	struct uni_cref	cref;
-	enum uni_msgact	act;		/* action indicator */
-	u_int		pass:1;		/* PNNI pass along request */
-};
-
-enum {
-	CREF_GLOBAL	= 0,
-	CREF_DUMMY	= 0x7fffff,
-};
-
-/*
- * General information element header.
- */
-struct uni_iehdr {
-	enum uni_coding	coding;		/* coding standard */
-	enum uni_ieact	act;		/* action indicator */
-	u_int		pass : 1;	/* PNNI pass along request */
-	u_int		present;	/* which optional elements are present */
-#define UNI_IE_EMPTY	0x80000000
-#define UNI_IE_PRESENT	0x40000000
-#define UNI_IE_ERROR	0x20000000
-#define UNI_IE_XXX	0x10000000
-#define UNI_IE_MASK	0xf0000000
-};
-
-#define IE_ISPRESENT(IE) \
-	(((IE).h.present & (UNI_IE_PRESENT|UNI_IE_EMPTY)) == UNI_IE_PRESENT)
-#define IE_SETPRESENT(IE) \
-	((IE).h.present = ((IE).h.present & ~UNI_IE_MASK) | \
-		UNI_IE_PRESENT)
-
-#define IE_ADDPRESENT(IE) \
-	((IE).h.present = ((IE).h.present & ~UNI_IE_EMPTY) | \
-		UNI_IE_PRESENT)
-
-#define IE_ISEMPTY(IE) \
-	(((IE).h.present & UNI_IE_MASK) == (UNI_IE_PRESENT | UNI_IE_EMPTY))
-#define IE_SETEMPTY(IE) \
-	((IE).h.present = ((IE).h.present & ~UNI_IE_MASK) | \
-		UNI_IE_EMPTY | UNI_IE_PRESENT)
-
-#define IE_ISERROR(IE) \
-	(((IE).h.present & UNI_IE_MASK) == (UNI_IE_PRESENT | UNI_IE_ERROR))
-#define IE_SETERROR(IE) \
-	((IE).h.present = ((IE).h.present & ~UNI_IE_MASK) | \
-		UNI_IE_ERROR | UNI_IE_PRESENT)
-
-#define IE_ISGOOD(IE) \
-	(((IE).h.present & UNI_IE_MASK) == (UNI_IE_PRESENT))
-
-#endif
diff --git a/include.new/netnatm/msg/uni_ie.h b/include.new/netnatm/msg/uni_ie.h
deleted file mode 100644
index a845bff..0000000
--- a/include.new/netnatm/msg/uni_ie.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* This file was created automatically
- * Source file: $Begemot: libunimsg/atm/msg/ie.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD: releng/10.2/sys/contrib/ngatm/netnatm/msg/uni_ie.h 121936 2003-11-03 09:11:53Z harti $
- */
-
-#ifndef _NETNATM_MSG_UNI_IE_H_
-#define _NETNATM_MSG_UNI_IE_H_
-
-union uni_ieall {
-	struct uni_iehdr h;
-	struct uni_ie_cause cause;
-	struct uni_ie_callstate callstate;
-	struct uni_ie_facility facility;
-	struct uni_ie_notify notify;
-	struct uni_ie_eetd eetd;
-	struct uni_ie_conned conned;
-	struct uni_ie_connedsub connedsub;
-	struct uni_ie_epref epref;
-	struct uni_ie_epstate epstate;
-	struct uni_ie_aal aal;
-	struct uni_ie_traffic traffic;
-	struct uni_ie_connid connid;
-	struct uni_ie_qos qos;
-	struct uni_ie_bhli bhli;
-	struct uni_ie_bearer bearer;
-	struct uni_ie_blli blli;
-	struct uni_ie_lshift lshift;
-	struct uni_ie_nlshift nlshift;
-	struct uni_ie_scompl scompl;
-	struct uni_ie_repeat repeat;
-	struct uni_ie_calling calling;
-	struct uni_ie_callingsub callingsub;
-	struct uni_ie_called called;
-	struct uni_ie_calledsub calledsub;
-	struct uni_ie_tns tns;
-	struct uni_ie_restart restart;
-	struct uni_ie_uu uu;
-	struct uni_ie_git git;
-	struct uni_ie_mintraffic mintraffic;
-	struct uni_ie_atraffic atraffic;
-	struct uni_ie_abrsetup abrsetup;
-	struct uni_ie_report report;
-	struct uni_ie_called_soft called_soft;
-	struct uni_ie_crankback crankback;
-	struct uni_ie_dtl dtl;
-	struct uni_ie_calling_soft calling_soft;
-	struct uni_ie_abradd abradd;
-	struct uni_ie_lij_callid lij_callid;
-	struct uni_ie_lij_param lij_param;
-	struct uni_ie_lij_seqno lij_seqno;
-	struct uni_ie_cscope cscope;
-	struct uni_ie_exqos exqos;
-	struct uni_ie_mdcr mdcr;
-	struct uni_ie_unrec unrec;
-};
-
-#endif
diff --git a/include.new/netnatm/msg/uni_msg.h b/include.new/netnatm/msg/uni_msg.h
deleted file mode 100644
index 807b8c7..0000000
--- a/include.new/netnatm/msg/uni_msg.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/* This file was created automatically
- * Source file: $Begemot: libunimsg/atm/msg/msg.def,v 1.3 2003/09/19 11:58:15 hbb Exp $
- * $FreeBSD: releng/10.2/sys/contrib/ngatm/netnatm/msg/uni_msg.h 121936 2003-11-03 09:11:53Z harti $
- */
-
-#ifndef _NETNATM_MSG_UNI_MSG_H_
-#define _NETNATM_MSG_UNI_MSG_H_
-
-struct uni_alerting {
-	struct uni_msghdr	hdr;
-	struct uni_ie_connid	connid;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_uu	uu;
-	struct uni_ie_report	report;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_call_proc {
-	struct uni_msghdr	hdr;
-	struct uni_ie_connid	connid;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_connect {
-	struct uni_msghdr	hdr;
-	struct uni_ie_aal	aal;
-	struct uni_ie_blli	blli;
-	struct uni_ie_connid	connid;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_conned	conned;
-	struct uni_ie_connedsub	connedsub;
-	struct uni_ie_eetd	eetd;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_uu	uu;
-	struct uni_ie_traffic	traffic;
-	struct uni_ie_exqos	exqos;
-	struct uni_ie_facility	facility;
-	struct uni_ie_abrsetup	abrsetup;
-	struct uni_ie_abradd	abradd;
-	struct uni_ie_called_soft	called_soft;
-	struct uni_ie_report	report;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_connect_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_notify	notify;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_release {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause[2];
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_uu	uu;
-	struct uni_ie_facility	facility;
-	struct uni_ie_crankback	crankback;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_release_compl {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause[2];
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_uu	uu;
-	struct uni_ie_crankback	crankback;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_setup {
-	struct uni_msghdr	hdr;
-	struct uni_ie_aal	aal;
-	struct uni_ie_traffic	traffic;
-	struct uni_ie_bearer	bearer;
-	struct uni_ie_bhli	bhli;
-	struct uni_ie_repeat	blli_repeat;
-	struct uni_ie_blli	blli[UNI_NUM_IE_BLLI];
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub[UNI_NUM_IE_CALLEDSUB];
-	struct uni_ie_calling	calling;
-	struct uni_ie_callingsub	callingsub[UNI_NUM_IE_CALLINGSUB];
-	struct uni_ie_connid	connid;
-	struct uni_ie_qos	qos;
-	struct uni_ie_eetd	eetd;
-	struct uni_ie_notify	notify;
-	struct uni_ie_scompl	scompl;
-	struct uni_ie_tns	tns[UNI_NUM_IE_TNS];
-	struct uni_ie_epref	epref;
-	struct uni_ie_atraffic	atraffic;
-	struct uni_ie_mintraffic	mintraffic;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_lij_callid	lij_callid;
-	struct uni_ie_lij_param	lij_param;
-	struct uni_ie_lij_seqno	lij_seqno;
-	struct uni_ie_exqos	exqos;
-	struct uni_ie_abrsetup	abrsetup;
-	struct uni_ie_abradd	abradd;
-	struct uni_ie_cscope	cscope;
-	struct uni_ie_calling_soft	calling_soft;
-	struct uni_ie_called_soft	called_soft;
-	struct uni_ie_repeat	dtl_repeat;
-	struct uni_ie_dtl	dtl[UNI_NUM_IE_DTL];
-	struct uni_ie_report	report;
-	struct uni_ie_mdcr	mdcr;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_status {
-	struct uni_msghdr	hdr;
-	struct uni_ie_callstate	callstate;
-	struct uni_ie_cause	cause;
-	struct uni_ie_epref	epref;
-	struct uni_ie_epstate	epstate;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_status_enq {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_notify {
-	struct uni_msghdr	hdr;
-	struct uni_ie_notify	notify;
-	struct uni_ie_epref	epref;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_restart {
-	struct uni_msghdr	hdr;
-	struct uni_ie_connid	connid;
-	struct uni_ie_restart	restart;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_restart_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_connid	connid;
-	struct uni_ie_restart	restart;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_add_party {
-	struct uni_msghdr	hdr;
-	struct uni_ie_aal	aal;
-	struct uni_ie_bhli	bhli;
-	struct uni_ie_blli	blli;
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub[UNI_NUM_IE_CALLEDSUB];
-	struct uni_ie_calling	calling;
-	struct uni_ie_callingsub	callingsub[UNI_NUM_IE_CALLINGSUB];
-	struct uni_ie_scompl	scompl;
-	struct uni_ie_tns	tns[UNI_NUM_IE_TNS];
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_eetd	eetd;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_lij_seqno	lij_seqno;
-	struct uni_ie_calling_soft	calling_soft;
-	struct uni_ie_called_soft	called_soft;
-	struct uni_ie_repeat	dtl_repeat;
-	struct uni_ie_dtl	dtl[UNI_NUM_IE_DTL];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_add_party_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_aal	aal;
-	struct uni_ie_blli	blli;
-	struct uni_ie_notify	notify;
-	struct uni_ie_eetd	eetd;
-	struct uni_ie_conned	conned;
-	struct uni_ie_connedsub	connedsub;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_called_soft	called_soft;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_party_alerting {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_add_party_rej {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause;
-	struct uni_ie_epref	epref;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_crankback	crankback;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_drop_party {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause;
-	struct uni_ie_epref	epref;
-	struct uni_ie_notify	notify;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_drop_party_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_cause	cause;
-	struct uni_ie_uu	uu;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_leaf_setup_req {
-	struct uni_msghdr	hdr;
-	struct uni_ie_tns	tns[UNI_NUM_IE_TNS];
-	struct uni_ie_calling	calling;
-	struct uni_ie_callingsub	callingsub[UNI_NUM_IE_CALLINGSUB];
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub[UNI_NUM_IE_CALLEDSUB];
-	struct uni_ie_lij_callid	lij_callid;
-	struct uni_ie_lij_seqno	lij_seqno;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_leaf_setup_fail {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause;
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub;
-	struct uni_ie_lij_seqno	lij_seqno;
-	struct uni_ie_tns	tns[UNI_NUM_IE_TNS];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_cobisetup {
-	struct uni_msghdr	hdr;
-	struct uni_ie_facility	facility;
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub;
-	struct uni_ie_calling	calling;
-	struct uni_ie_notify	notify;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_facility {
-	struct uni_msghdr	hdr;
-	struct uni_ie_facility	facility;
-	struct uni_ie_called	called;
-	struct uni_ie_calledsub	calledsub;
-	struct uni_ie_calling	calling;
-	struct uni_ie_notify	notify;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_modify_req {
-	struct uni_msghdr	hdr;
-	struct uni_ie_traffic	traffic;
-	struct uni_ie_atraffic	atraffic;
-	struct uni_ie_mintraffic	mintraffic;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_modify_ack {
-	struct uni_msghdr	hdr;
-	struct uni_ie_report	report;
-	struct uni_ie_traffic	traffic;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_modify_rej {
-	struct uni_msghdr	hdr;
-	struct uni_ie_cause	cause;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_conn_avail {
-	struct uni_msghdr	hdr;
-	struct uni_ie_notify	notify;
-	struct uni_ie_git	git[UNI_NUM_IE_GIT];
-	struct uni_ie_report	report;
-	struct uni_ie_unrec	unrec;
-};
-
-struct uni_unknown {
-	struct uni_msghdr	hdr;
-	struct uni_ie_epref	epref;
-	struct uni_ie_unrec	unrec;
-};
-
-union uni_msgall {
-	struct uni_msghdr	hdr;
-	struct uni_alerting	alerting;
-	struct uni_call_proc	call_proc;
-	struct uni_connect	connect;
-	struct uni_connect_ack	connect_ack;	/* !pnni */
-	struct uni_release	release;
-	struct uni_release_compl	release_compl;
-	struct uni_setup	setup;
-	struct uni_status	status;
-	struct uni_status_enq	status_enq;
-	struct uni_notify	notify;
-	struct uni_restart	restart;
-	struct uni_restart_ack	restart_ack;
-	struct uni_add_party	add_party;
-	struct uni_add_party_ack	add_party_ack;
-	struct uni_party_alerting	party_alerting;
-	struct uni_add_party_rej	add_party_rej;
-	struct uni_drop_party	drop_party;
-	struct uni_drop_party_ack	drop_party_ack;
-	struct uni_leaf_setup_req	leaf_setup_req;	/* !pnni */
-	struct uni_leaf_setup_fail	leaf_setup_fail;	/* !pnni */
-	struct uni_cobisetup	cobisetup;	/* !pnni&&q2932 */
-	struct uni_facility	facility;	/* !pnni&&q2932 */
-	struct uni_modify_req	modify_req;	/* !pnni */
-	struct uni_modify_ack	modify_ack;	/* !pnni */
-	struct uni_modify_rej	modify_rej;	/* !pnni */
-	struct uni_conn_avail	conn_avail;	/* !pnni */
-	struct uni_unknown	unknown;
-};
-
-#endif
diff --git a/include.new/netnatm/msg/unimsglib.h b/include.new/netnatm/msg/unimsglib.h
deleted file mode 100644
index f8489db..0000000
--- a/include.new/netnatm/msg/unimsglib.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/unimsglib.h,v 1.6 2004/07/08 08:22:07 brandt Exp $
- */
-#ifndef _NETNATM_MSG_UNIMSGLIB_H_
-#define _NETNATM_MSG_UNIMSGLIB_H_
-
-#include <netnatm/msg/uni_config.h>
-
-struct uni_msg;
-
-enum uni_ierr_type {
-	UNI_IERR_UNK,	/* unknown IE */
-	UNI_IERR_LEN,	/* length error */
-	UNI_IERR_BAD,	/* content error */
-	UNI_IERR_ACC,	/* access element content error */
-	UNI_IERR_MIS,	/* mandatory IE missing (not used here) */
-};
-
-struct uni_ierr {
-	enum uni_ierr_type	err;	/* what error */
-	enum uni_ieact		act;	/* the action indicator */
-	u_int			ie:8;	/* the ie type */
-	u_int			man:1;	/* mandatory flag */
-	u_int			epref:1;/* Q.2971 9.5.3.2.1 low-pri epref */
-};
-
-/*
- * Context buffer. Needed to reduce number of arguments to routines.
- */
-struct unicx {
-	/*
-	 * globals for error handling
-	 */
-	u_int		errcnt;		/* number of bad IEs */
-	struct uni_ierr	err[UNI_MAX_ERRIE]; /* the errors */
-
-	int		q2932;		/* Enable GFP */
-	int		pnni;		/* Enable PNNI */
-
-	int		git_hard;	/* do hard check on GIT IE */
-	int		bearer_hard;	/* do hard check on BEARER IE */
-	int		cause_hard;	/* do hard check on cause */
-
-	int		multiline;	/* printing mode */
-	u_int		tabsiz;		/* tabulation size */
-
-	/*
-	 * Internal context of library -- don't touch
-	 */
-	struct uni_ie_repeat	repeat;	/* repeat IE during decoding */
-	enum uni_ietype		ielast;	/* last IE seen for repeat handling */
-
-	const char 		*prefix[20];
-	u_int			nprefix;
-	int			doindent;
-	char			*buf;
-	size_t			bufsiz;
-	u_int			indent;		/* indentation */
-	int			dont_init;
-};
-
-/*
- * Functions for all messages
- */
-void uni_print_cref(char *, size_t, const struct uni_cref *, struct unicx *);
-void uni_print_msghdr(char *, size_t, const struct uni_msghdr *, struct unicx *);
-void uni_print(char *, size_t, const struct uni_all *, struct unicx *);
-void uni_print_msg(char *, size_t, u_int _mtype, const union uni_msgall *,
-    struct unicx *);
-int uni_encode(struct uni_msg *, struct uni_all *, struct unicx *);
-int uni_decode(struct uni_msg *, struct uni_all *, struct unicx *);
-
-int uni_decode_head(struct uni_msg *, struct uni_all *, struct unicx *);
-int uni_decode_body(struct uni_msg *, struct uni_all *, struct unicx *);
-
-int uni_encode_msg_hdr(struct uni_msg *, struct uni_msghdr *, enum uni_msgtype,
-    struct unicx *, int *);
-
-
-/*
- * Functions for all information elements
- */
-void uni_print_ie(char *, size_t, enum uni_ietype, const union uni_ieall *,
-    struct unicx *);
-int uni_check_ie(enum uni_ietype, union uni_ieall *, struct unicx *);
-int uni_encode_ie(enum uni_ietype, struct uni_msg *, union uni_ieall *,
-    struct unicx *);
-int uni_decode_ie_hdr(enum uni_ietype *, struct uni_iehdr *, struct uni_msg *,
-    struct unicx *, u_int *);
-int uni_encode_ie_hdr(struct uni_msg *, enum uni_ietype, struct uni_iehdr *,
-    u_int, struct unicx *);
-int uni_decode_ie_body(enum uni_ietype, union uni_ieall *, struct uni_msg *,
-    u_int, struct unicx *);
-
-
-/*
- * Context handling
- */
-void uni_initcx(struct unicx *);
-void uni_print_cx(char *, size_t, struct unicx *);
-
-#define	UNI_SAVE_IERR(CX, IETYPE, ACT, ERRCODE)				\
-	(((CX)->errcnt < UNI_MAX_ERRIE) ?				\
-	 ((CX)->err[(CX)->errcnt].ie = (IETYPE),			\
-	  (CX)->err[(CX)->errcnt].act = (ACT),				\
-	  (CX)->err[(CX)->errcnt].err = (ERRCODE),			\
-	  (CX)->err[(CX)->errcnt].man = 0,				\
-	  (CX)->errcnt++,						\
-	  1) : 0)
-
-/*
- * Traffic classification
- */
-enum uni_traffic_class {
-	UNI_TRAFFIC_CBR1,
-	UNI_TRAFFIC_CBR2,
-	UNI_TRAFFIC_CBR3,
-	UNI_TRAFFIC_rtVBR1,
-	UNI_TRAFFIC_rtVBR2,
-	UNI_TRAFFIC_rtVBR3,
-	UNI_TRAFFIC_rtVBR4,
-	UNI_TRAFFIC_rtVBR5,
-	UNI_TRAFFIC_rtVBR6,
-	UNI_TRAFFIC_nrtVBR1,
-	UNI_TRAFFIC_nrtVBR2,
-	UNI_TRAFFIC_nrtVBR3,
-	UNI_TRAFFIC_nrtVBR4,
-	UNI_TRAFFIC_nrtVBR5,
-	UNI_TRAFFIC_nrtVBR6,
-	UNI_TRAFFIC_ABR,
-	UNI_TRAFFIC_UBR1,
-	UNI_TRAFFIC_UBR2,
-};
-
-/* classify traffic */
-int uni_classify_traffic(const struct uni_ie_bearer *,
-    const struct uni_ie_traffic *,
-    enum uni_traffic_class *, enum uni_traffic_class *,
-    char *, size_t);
-
-#endif
diff --git a/include.new/netnatm/msg/uniprint.h b/include.new/netnatm/msg/uniprint.h
deleted file mode 100644
index 239fa2d..0000000
--- a/include.new/netnatm/msg/uniprint.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/msg/uniprint.h,v 1.4 2004/07/08 08:22:08 brandt Exp $
- *
- * Print utility functions. These are only needed if you want to hook to
- * the format of the uni printing routines.
- */
-#ifndef _NETNATM_MSG_UNIPRINT_H_
-#define _NETNATM_MSG_UNIPRINT_H_
-
-#include <netnatm/msg/uni_config.h>
-
-/*
- * This structure is used to define value->string mappings.
- * It must be terminated by a { NULL, 0 } entry.
- */
-struct uni_print_tbl {
-	const char *name;
-	u_int val;
-};
-void uni_print_tbl(const char *_entry, u_int _val,
-    const struct uni_print_tbl *_tbl, struct unicx *_cx);
-
-/* initialize printing. This must be called at the start from each external
- * callable printing function. */
-void uni_print_init(char *_buf, size_t _bufsiz, struct unicx *_cx);
-
-/* End the current (semantical) line. This takes care of indendation and
- * actually print the newline in the appropriate modes. */
-void uni_print_eol(struct unicx *_cx);
-
-/* Push or pop a prefix. This takes care of indendation. */
-void uni_print_push_prefix(const char *_prefix, struct unicx *_cx);
-void uni_print_pop_prefix(struct unicx *_cx);
-
-/* Print a flag taking care of the right prefixing */
-void uni_print_flag(const char *_flag, struct unicx *_cx);
-
-/* Print an entry taking care of the right prefixing */
-void uni_print_entry(struct unicx *_cx, const char *_entry,
-    const char *_fmt, ...) __printflike(3, 4);
-
-/* Generic printf */
-void uni_printf(struct unicx *_cx, const char *_fmt, ...) __printflike(2, 3);
-
-#endif
diff --git a/include.new/netnatm/msg/unistruct.h b/include.new/netnatm/msg/unistruct.h
deleted file mode 100644
index ceb1f5b..0000000
--- a/include.new/netnatm/msg/unistruct.h
+++ /dev/null
@@ -1,1371 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * 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.
- *
- * 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.
- *
- * $Begemot: libunimsg/netnatm/msg/unistruct.h,v 1.7 2004/07/16 18:42:22 brandt Exp $
- *
- * This file defines all structures that are used by
- * API users.
- */
-#ifndef _NETNATM_MSG_UNISTRUCT_H_
-#define _NETNATM_MSG_UNISTRUCT_H_
-
-#include <netnatm/msg/uni_config.h>
-
-/*
- * define IE and MSG header
- */
-#include <netnatm/msg/uni_hdr.h>
-
-/*
- * define all IE's
- */
-/*************************************************************************
- *
- * Free FORM IE
- */
-struct uni_ie_unrec {
-	struct uni_iehdr h;
-	uint8_t id;		/* ID of this IE */
-	u_int len;		/* data length */
-	u_char data[128];	/* arbitrary maximum length */
-};
-
-/*************************************************************************
- *
- * ATM adaptation layer parameters information element
- */
-enum {
-	UNI_AAL_SUB_ID		= 0x85,
-	UNI_AAL_CBR_ID		= 0x86,
-	UNI_AAL_MULT_ID		= 0x87,
-	UNI_AAL_SCREC_ID	= 0x88,
-	UNI_AAL_ECM_ID		= 0x89,
-	UNI_AAL_BSIZE_ID	= 0x8a,
-	UNI_AAL_PART_ID		= 0x8b,
-	UNI_AAL_FWDCPCS_ID	= 0x8c,
-	UNI_AAL_BWDCPCS_ID	= 0x81,
-	UNI_AAL_MID_ID		= 0x82,
-	UNI_AAL_SSCS_ID		= 0x84,
-};
-
-enum uni_aal {
-	UNI_AAL_0	= 0x00,	/* voice */
-	UNI_AAL_1	= 0x01,
-	UNI_AAL_2	= 0x02,
-	UNI_AAL_4	= 0x03,	/* same as AAL 3 */
-	UNI_AAL_5	= 0x05,
-	UNI_AAL_USER	= 0x10,
-};
-enum uni_aal1_subtype {
-	UNI_AAL1_SUB_NULL	= 0x00,
-	UNI_AAL1_SUB_VOICE	= 0x01,
-	UNI_AAL1_SUB_CIRCUIT	= 0x02,
-	UNI_AAL1_SUB_HQAUDIO	= 0x04,
-	UNI_AAL1_SUB_VIDEO	= 0x05,
-};
-enum uni_aal1_cbr {
-	UNI_AAL1_CBR_64		= 0x01,
-	UNI_AAL1_CBR_1544	= 0x04,
-	UNI_AAL1_CBR_6312	= 0x05,
-	UNI_AAL1_CBR_32064	= 0x06,
-	UNI_AAL1_CBR_44736	= 0x07,
-	UNI_AAL1_CBR_97728	= 0x08,
-	UNI_AAL1_CBR_2048	= 0x10,
-	UNI_AAL1_CBR_8448	= 0x11,
-	UNI_AAL1_CBR_34368	= 0x12,
-	UNI_AAL1_CBR_139264	= 0x13,
-	UNI_AAL1_CBR_N64	= 0x40,
-	UNI_AAL1_CBR_N8		= 0x41,
-};
-enum uni_aal1_screc {
-	UNI_AAL1_SCREC_NULL	= 0x00,	/* synchr. circuit transport */
-	UNI_AAL1_SCREC_SRTS	= 0x01,	/* synchr. residual timestamp */
-	UNI_AAL1_SCREC_ACLK	= 0x02,	/* adaptive clock */
-};
-enum uni_aal1_ecm {
-	UNI_AAL1_ECM_NULL	= 0x00,	/* no error correction */
-	UNI_AAL1_ECM_LOSS	= 0x01,	/* for loss sensitive signals */
-	UNI_AAL1_ECM_DELAY	= 0x02,	/* for delay sensitive signals */
-};
-enum uni_aal_sscs {
-	UNI_AAL_SSCS_NULL	= 0x00,	/* Null */
-	UNI_AAL_SSCS_SSCOPA	= 0x01,	/* assured SSCOP */
-	UNI_AAL_SSCS_SSCOPU	= 0x02,	/* unassured SSCOP */
-	UNI_AAL_SSCS_FRAME	= 0x04,	/* frame relay */
-};
-
-struct uni_ie_aal {
-	struct uni_iehdr h;
-	enum uni_aal	type;		/* aal type */
-
-	union {
-#define UNI_AAL1_MULT_P	0x01
-#define UNI_AAL1_SCREC_P	0x02
-#define UNI_AAL1_ECM_P		0x04
-#define UNI_AAL1_BSIZE_P	0x08
-#define UNI_AAL1_PART_P	0x10
-	    struct {
-		enum uni_aal1_subtype subtype;	/* AAL1 subtype */
-		enum uni_aal1_cbr cbr_rate;	/* AAL1 CBR rate */
-		u_int		mult;		/* AAL1 CBR mutliplier */
-		enum uni_aal1_screc screc;	/* AAL1 source clock recovery */
-		enum uni_aal1_ecm ecm;		/* AAL1 error correction */
-		u_int	bsize;			/* AAL1 SDT blocksize */
-		u_int	part;			/* AAL1 partial cell fill */
-	    } aal1;
-
-#define UNI_AAL4_CPCS_P	0x01
-#define UNI_AAL4_MID_P		0x02
-#define UNI_AAL4_SSCS_P	0x04
-	    struct {
-		u_int	fwd_cpcs;	/* max fwd cpcs blocksize */
-		u_int	bwd_cpcs;	/* max bkw cpcs blocksize */
-		u_int	mid_low;	/* MID low range */
-		u_int	mid_high;	/* MID high range */
-		enum uni_aal_sscs sscs;	/* sscs type */
-	     } aal4;
-
-#define UNI_AAL5_CPCS_P	0x01
-#define UNI_AAL5_SSCS_P	0x02
-	    struct {
-		u_int	fwd_cpcs;	/* max fwd cpcs blocksize */
-		u_int	bwd_cpcs;	/* max bkw cpcs blocksize */
-		enum uni_aal_sscs sscs;	/* sscs type */
-	     } aal5;
-
-	    struct {
-		u_int	len;		/* number of bytes */
-		u_char	user[4];	/* user data */
-	    } aalu;
-	} u;
-};
-
-/*************************************************************************
- *
- * Called party number information element
- * Called party subaddress information element
- * Calling party number information element
- * Calling party subaddress information element
- * Q.2951/UNI4.0 Connected number information element
- * Q.2951/UNI4.0 Connected subaddress information element
- */
-enum uni_addr_type {
-	UNI_ADDR_UNKNOWN	= 0x0,
-	UNI_ADDR_INTERNATIONAL	= 0x1,
-	UNI_ADDR_NATIONAL	= 0x2,	/* not sup */
-	UNI_ADDR_NETWORK	= 0x3,	/* not sup */
-	UNI_ADDR_SUBSCR		= 0x4,	/* not sup */
-	UNI_ADDR_ABBR		= 0x6,	/* not sup */
-};
-enum uni_addr_plan {
-	/* UNI_ADDR_UNKNOWN	= 0x0, */	/* not sup */
-	UNI_ADDR_E164		= 0x1,
-	UNI_ADDR_ATME		= 0x2,
-	UNI_ADDR_DATA		= 0x3,	/* not sup */
-	UNI_ADDR_PRIVATE	= 0x9,	/* not sup */
-};
-enum uni_subaddr_type {
-	UNI_SUBADDR_NSAP	= 0x0,
-	UNI_SUBADDR_ATME	= 0x1,
-	UNI_SUBADDR_USER	= 0x2,	/* not sup */
-};
-enum uni_addr_pres {
-	UNI_ADDR_PRES		= 0x0,
-	UNI_ADDR_RESTRICT	= 0x1,
-	UNI_ADDR_NONUMBER	= 0x2,
-};
-enum uni_addr_screen {
-	UNI_ADDR_SCREEN_NOT	= 0x0,
-	UNI_ADDR_SCREEN_PASSED	= 0x1,
-	UNI_ADDR_SCREEN_FAILED	= 0x2,
-	UNI_ADDR_SCREEN_NET	= 0x3,
-};
-
-/* don't use bitfields to get a defined structure layout */
-struct uni_addr {
-	uint8_t			type;
-	uint8_t			plan;
-	uint8_t			len;
-	u_char			addr[UNI_ADDR_MAXLEN];
-};
-struct uni_subaddr {
-	enum uni_subaddr_type	type;
-	u_int			len;
-	u_char			addr[UNI_SUBADDR_MAXLEN];
-};
-
-struct uni_ie_called {
-	struct uni_iehdr	h;
-	struct uni_addr	addr;
-};
-
-struct uni_ie_calledsub {
-	struct uni_iehdr	h;
-	struct uni_subaddr	addr;
-};
-
-struct uni_ie_calling {
-	struct uni_iehdr	h;
-#define UNI_CALLING_SCREEN_P 0x0001
-
-	struct uni_addr		addr;
-	enum uni_addr_pres	pres;
-	enum uni_addr_screen	screen;
-};
-
-struct uni_ie_callingsub {
-	struct uni_iehdr	h;
-	struct uni_subaddr	addr;
-};
-
-struct uni_ie_conned {
-	struct uni_iehdr	h;
-#define UNI_CONNED_SCREEN_P 0x0001
-
-	struct uni_addr		addr;
-	enum uni_addr_pres	pres;
-	enum uni_addr_screen	screen;
-};
-
-struct uni_ie_connedsub {
-	struct uni_iehdr	h;
-	struct uni_subaddr	addr;
-};
-
-/*************************************************************************
- *
- * Broadband bearer capability descriptor
- * On reception of an old bearer descriptor, it is automatically
- * converted to a new, legal one.
- */
-enum uni_bearer_class {
-	UNI_BEARER_A		= 0x01,
-	UNI_BEARER_C		= 0x03,
-	UNI_BEARER_X		= 0x10,
-	UNI_BEARER_TVP		= 0x30,
-};
-
-enum uni_bearer_atc {
-	UNI_BEARER_ATC_CBR	= 0x05,
-	UNI_BEARER_ATC_CBR1	= 0x07,
-	UNI_BEARER_ATC_VBR	= 0x09,
-	UNI_BEARER_ATC_VBR1	= 0x13,
-	UNI_BEARER_ATC_NVBR	= 0x0a,
-	UNI_BEARER_ATC_NVBR1	= 0x0b,
-	UNI_BEARER_ATC_ABR	= 0x0c,
-
-	UNI_BEARER_ATCX_0	= 0x00,
-	UNI_BEARER_ATCX_1	= 0x01,
-	UNI_BEARER_ATCX_2	= 0x02,
-	UNI_BEARER_ATCX_4	= 0x04,
-	UNI_BEARER_ATCX_6	= 0x06,
-	UNI_BEARER_ATCX_8	= 0x08,
-};
-
-enum uni_bearer_clip {
-	UNI_BEARER_NOCLIP	= 0x0,
-	UNI_BEARER_CLIP		= 0x1,
-};
-
-enum uni_bearer_cfg {
-	UNI_BEARER_P2P		= 0x0,
-	UNI_BEARER_MP		= 0x1,
-};
-
-struct uni_ie_bearer {
-	struct uni_iehdr	h;
-#define UNI_BEARER_ATC_P	0x02
-
-	enum uni_bearer_class	bclass;		/* bearer class */
-	enum uni_bearer_atc	atc;		/* ATM transfer capability */
-	enum uni_bearer_clip	clip;		/* suspectibility to clipping */
-	enum uni_bearer_cfg	cfg;		/* u-plane configuration */
-};
-
-/*************************************************************************
- *
- * Broadband higher layer information element
- */
-enum uni_bhli {
-	UNI_BHLI_ISO	= 0x00,	/* IDO defined */
-	UNI_BHLI_USER	= 0x01,	/* user specific */
-	UNI_BHLI_VENDOR	= 0x03,	/* vendor specific */
-};
-
-struct uni_ie_bhli {
-	struct uni_iehdr	h;
-	enum uni_bhli		type;
-	u_char			info[8];
-	u_int			len;
-};
-
-/*************************************************************************
- *
- * Boradband lower layer information element
- */
-enum {
-	UNI_BLLI_L1_ID		= 0x1,
-	UNI_BLLI_L2_ID		= 0x2,
-	UNI_BLLI_L3_ID		= 0x3,
-};
-
-enum uni_blli_l2 {
-	UNI_BLLI_L2_BASIC	= 0x01,
-	UNI_BLLI_L2_Q921	= 0x02,
-	UNI_BLLI_L2_X25LL	= 0x06,
-	UNI_BLLI_L2_X25ML	= 0x07,
-	UNI_BLLI_L2_LABP	= 0x08,
-	UNI_BLLI_L2_HDLC_ARM	= 0x09,
-	UNI_BLLI_L2_HDLC_NRM	= 0x0a,
-	UNI_BLLI_L2_HDLC_ABM	= 0x0b,
-	UNI_BLLI_L2_LAN		= 0x0c,
-	UNI_BLLI_L2_X75		= 0x0d,
-	UNI_BLLI_L2_Q922	= 0x0e,
-	UNI_BLLI_L2_USER	= 0x10,
-	UNI_BLLI_L2_ISO7776	= 0x11,
-};
-
-enum uni_blli_l2_mode {
-	UNI_BLLI_L2NORM		= 0x1,
-	UNI_BLLI_L2EXT		= 0x2,
-};
-
-enum uni_blli_l3 {
-	UNI_BLLI_L3_X25		= 0x06,
-	UNI_BLLI_L3_ISO8208	= 0x07,
-	UNI_BLLI_L3_X223	= 0x08,
-	UNI_BLLI_L3_CLMP	= 0x09,
-	UNI_BLLI_L3_T70		= 0x0a,
-	UNI_BLLI_L3_TR9577	= 0x0b,
-	UNI_BLLI_L3_H310	= 0x0c,
-	UNI_BLLI_L3_H321	= 0x0d,
-	UNI_BLLI_L3_USER	= 0x10,
-};
-
-enum uni_blli_l3_mode {
-	UNI_BLLI_L3NSEQ		= 0x1,	/* normal sequence numbering */
-	UNI_BLLI_L3ESEQ		= 0x2,	/* extended sequence numbering */
-};
-
-enum uni_blli_l3_psiz {
-	UNI_BLLI_L3_16		= 0x4,	/* 16 byte packets */
-	UNI_BLLI_L3_32		= 0x5,	/* 32 byte packets */
-	UNI_BLLI_L3_64		= 0x6,	/* 64 byte packets */
-	UNI_BLLI_L3_128		= 0x7,	/* 128 byte packets */
-	UNI_BLLI_L3_256		= 0x8,	/* 256 byte packets */
-	UNI_BLLI_L3_512		= 0x9,	/* 512 byte packets */
-	UNI_BLLI_L3_1024	= 0xa,	/* 1024 byte packets */
-	UNI_BLLI_L3_2048	= 0xb,	/* 2048 byte packets */
-	UNI_BLLI_L3_4096	= 0xc,	/* 4096 byte packets */
-};
-
-enum uni_blli_l3_ttype {
-	UNI_BLLI_L3_TTYPE_RECV	= 0x1,	/* receive only */
-	UNI_BLLI_L3_TTYPE_SEND	= 0x2,	/* send only */
-	UNI_BLLI_L3_TTYPE_BOTH	= 0x3,	/* both */
-};
-
-enum uni_blli_l3_mux {
-	UNI_BLLI_L3_MUX_NOMUX	= 0,	/* no multiplexing */
-	UNI_BLLI_L3_MUX_TS	= 1,	/* transport stream */
-	UNI_BLLI_L3_MUX_TSFEC	= 2,	/* transport stream with FEC */
-	UNI_BLLI_L3_MUX_PS	= 3,	/* program stream */
-	UNI_BLLI_L3_MUX_PSFEC	= 4,	/* program stream with FEC */
-	UNI_BLLI_L3_MUX_H221	= 5,	/* H.221 */
-};
-
-enum uni_blli_l3_tcap {
-	UNI_BLLI_L3_TCAP_NOIND	= 0,	/* no indication */
-	UNI_BLLI_L3_TCAP_AAL1	= 1,	/* only AAL1 */
-	UNI_BLLI_L3_TCAP_AAL5	= 2,	/* only AAL5 */
-	UNI_BLLI_L3_TCAP_AAL15	= 3,	/* AAL1 and AAL5 */
-};
-
-/* Value for l3_ipi: */
-enum {
-	UNI_BLLI_L3_SNAP	= 0x80,	/* IEEE 802.1 SNAP */
-};
-
-struct uni_ie_blli {
-	struct uni_iehdr	h;
-#define UNI_BLLI_L1_P		0x0001
-#define UNI_BLLI_L2_P		0x0002
-#define UNI_BLLI_L2_Q933_P	0x0004
-#define UNI_BLLI_L2_WSIZ_P	0x0008
-#define UNI_BLLI_L2_USER_P	0x0010
-#define UNI_BLLI_L3_P		0x0020
-#define UNI_BLLI_L3_MODE_P	0x0040
-#define UNI_BLLI_L3_PSIZ_P	0x0080
-#define UNI_BLLI_L3_WSIZ_P	0x0100
-#define UNI_BLLI_L3_USER_P	0x0200
-#define UNI_BLLI_L3_IPI_P	0x0400
-#define UNI_BLLI_L3_SNAP_P	0x0800
-#define UNI_BLLI_L3_TTYPE_P	0x1000
-#define UNI_BLLI_L3_MUX_P	0x2000
-
-	u_int			l1:5;		/* layer 1 info */
-
-	enum uni_blli_l2	l2;		/* layer 2 info */
-	u_int			l2_q933:2;	/* layer 2 Q.933 use */
-	enum uni_blli_l2_mode	l2_mode;	/* layer 2 HDLC mode */ 
-	u_char			l2_user;	/* layer 2 user info */
-	u_char			l2_wsiz;	/* layer 2 window size */
-
-	enum uni_blli_l3	l3;		/* layer 3 info */
-	enum uni_blli_l3_mode	l3_mode;	/* layer 3 mode */
-	enum uni_blli_l3_psiz	l3_psiz;	/* layer 3 default packet size */
-	u_char			l3_wsiz;	/* layer 3 window size */
-	u_char			l3_user;	/* layer 3 user info */
-	u_char			l3_ipi;		/* IPI byte */
-	u_int			oui;		/* OUI bytes */
-	u_int			pid;		/* PID bytes */
-	enum uni_blli_l3_ttype	l3_ttype;	/* terminal bytes */
-	enum uni_blli_l3_tcap	l3_tcap;	/* terminal capability */
-	enum uni_blli_l3_mux	l3_fmux;	/* forward muxing */
-	enum uni_blli_l3_mux	l3_bmux;	/* forward muxing */
-};
-
-/*************************************************************************
- *
- * Transit network selection IE
- */
-struct uni_ie_tns {
-	struct uni_iehdr h;
-	u_char		net[UNI_TNS_MAXLEN];
-	u_int		len;
-};
-
-/*************************************************************************
- *
- * Call state information element
- */
-enum uni_callstate {
-	UNI_CALLSTATE_U0	= 0x00,
-	UNI_CALLSTATE_N0	= 0x00,
-	UNI_CALLSTATE_NN0	= 0x00,
-
-	UNI_CALLSTATE_U1	= 0x01,
-	UNI_CALLSTATE_N1	= 0x01,
-	UNI_CALLSTATE_NN1	= 0x01,
-
-	UNI_CALLSTATE_U3	= 0x03,
-	UNI_CALLSTATE_N3	= 0x03,
-	UNI_CALLSTATE_NN3	= 0x03,
-
-	UNI_CALLSTATE_U4	= 0x04,
-	UNI_CALLSTATE_N4	= 0x04,
-	UNI_CALLSTATE_NN4	= 0x04,
-
-	UNI_CALLSTATE_U6	= 0x06,
-	UNI_CALLSTATE_N6	= 0x06,
-	UNI_CALLSTATE_NN6	= 0x06,
-
-	UNI_CALLSTATE_U7	= 0x07,
-	UNI_CALLSTATE_N7	= 0x07,
-	UNI_CALLSTATE_NN7	= 0x07,
-
-	UNI_CALLSTATE_U8	= 0x08,
-	UNI_CALLSTATE_N8	= 0x08,
-
-	UNI_CALLSTATE_U9	= 0x09,
-	UNI_CALLSTATE_N9	= 0x09,
-	UNI_CALLSTATE_NN9	= 0x09,
-
-	UNI_CALLSTATE_U10	= 0x0a,
-	UNI_CALLSTATE_N10	= 0x0a,
-	UNI_CALLSTATE_NN10	= 0x0a,
-
-	UNI_CALLSTATE_U11	= 0x0b,
-	UNI_CALLSTATE_N11	= 0x0b,
-	UNI_CALLSTATE_NN11	= 0x0b,
-
-	UNI_CALLSTATE_U12	= 0x0c,
-	UNI_CALLSTATE_N12	= 0x0c,
-	UNI_CALLSTATE_NN12	= 0x0c,
-
-	UNI_CALLSTATE_REST0	= 0x00,
-	UNI_CALLSTATE_REST1	= 0x3d,
-	UNI_CALLSTATE_REST2	= 0x3e,
-
-	UNI_CALLSTATE_U13	= 0x0d,
-	UNI_CALLSTATE_N13	= 0x0d,
-
-	UNI_CALLSTATE_U14	= 0x0e,
-	UNI_CALLSTATE_N14	= 0x0e,
-};
-
-struct uni_ie_callstate {
-	struct uni_iehdr	h;
-	enum uni_callstate	state;
-};
-
-/*************************************************************************
- *
- * Cause information element
- */
-enum uni_cause_loc {
-	UNI_CAUSE_LOC_USER	= 0x0,
-	UNI_CAUSE_LOC_PRIVLOC	= 0x1,
-	UNI_CAUSE_LOC_PUBLOC	= 0x2,
-	UNI_CAUSE_LOC_TRANSIT	= 0x3,
-	UNI_CAUSE_LOC_PUBREM	= 0x4,
-	UNI_CAUSE_LOC_PRIVREM	= 0x5,
-	UNI_CAUSE_LOC_INTERNAT	= 0x6,
-	UNI_CAUSE_LOC_BEYOND	= 0x7,
-};
-
-#define UNI_DECLARE_CAUSE_VALUES \
-D(UNALL_NUM,	0x01 /*  1*/, COND,	Q.850,	"Unallocated (unassigned) number") \
-D(NOROUTE_NET,	0x02 /*  2*/, TNS,	Q.850,	"No route to specified transit network") \
-D(NOROUTE,	0x03 /*  3*/, COND,	Q.850,	"No route to destination") \
-D(SPTONE,	0x04 /*  4*/, NONE,	Q.850,	"Send special information tone") \
-D(BADTRUNK,	0x05 /*  5*/, NONE,	Q.850,	"Misdialled trunk prefix") \
-D(BADCHAN,	0x06 /*  6*/, NONE,	Q.850,	"Channel unacceptable") \
-D(CALLAWARDED,	0x07 /*  7*/, NONE,	Q.850,	"Call awarded and being delivered in an established channel") \
-D(PREEMPT,	0x08 /*  8*/, NONE,	Q.850,	"Preemption") \
-D(PREEMPT_RES,	0x09 /*  9*/, NONE,	Q.850,	"Preemption - circuit reserved for reuse") \
-D(CLEARING,	0x10 /* 16*/, COND,	Q.850,	"Normal call clearing") \
-D(BUSY,		0x11 /* 17*/, CCBS,	Q.850,	"User busy") \
-D(NO_RESPONSE,	0x12 /* 18*/, NONE,	Q.850,	"No user responding") \
-D(NO_RESP_ALERT,0x13 /* 19*/, NONE,	Q.850,	"No answer from user (user alerted)") \
-D(ABSENT,	0x14 /* 20*/, NONE,	Q.850,	"Subscriber absent") \
-D(REJECTED,	0x15 /* 21*/, REJ,	Q.850,	"Call rejected") \
-D(NUMCHG,	0x16 /* 22*/, NUMBER,	Q.850,	"Number changed") \
-D(REDIR,	0x17 /* 23*/, NONE,	Q.850,	"Redirection to new destination") \
-N(CLIR_REJECTED,0x17 /* 23*/, NONE,	UNI4.0,	"User rejects call with calling line identification restriction (CLIR)") \
-D(EXCHG_ERR,	0x19 /* 25*/, NONE,	Q.850,	"Exchange routing error") \
-D(NOSEL_CLEAR,	0x1a /* 26*/, NONE,	Q.850,	"Non-selected user clearing") \
-D(DST_OOO,	0x1b /* 27*/, NONE,	Q.850,	"Destination out of order") \
-D(INV_ADDR,	0x1c /* 28*/, NONE,	Q.850,	"Invalid number format (address incomplete)") \
-D(FAC_REJ,	0x1d /* 29*/, FAC,	Q.850,	"Facility rejected") \
-D(STATUS,	0x1e /* 30*/, NONE,	Q.850,	"Response to STATUS ENQUIRY") \
-D(UNSPEC,	0x1f /* 31*/, NONE,	Q.850,	"Normal, unspecified") \
-D(TMY_PARTY,	0x20 /* 32*/, NONE,	Q.2971,	"Too many pending add party requests") \
-D(NOCHAN,	0x22 /* 34*/, CCBS,	Q.850,	"No circuit/channel available") \
-N(SOFT_NAVL,	0x22 /* 34*/, NONE,	PNNI1.0,"Requested called party soft PVPC or PVCC not available")\
-D(VPCI_NAVL,	0x23 /* 35*/, NONE,	Q.2610,	"Requested VPCI/VCI not available") \
-D(VPCI_FAIL,	0x24 /* 36*/, NONE,	Q.2610,	"VPCI/VPI assignment failure") \
-D(CRATE_NAVL,	0x25 /* 37*/, CRATE,	Q.2610,	"User cell rate not available") \
-D(NET_OOO,	0x26 /* 38*/, NONE,	Q.850,	"Network out of order") \
-D(FRAME_OOS,	0x27 /* 39*/, NONE,	Q.850,	"Permanent frame mode connection out of service") \
-D(FRAME_OP,	0x28 /* 40*/, NONE,	Q.850,	"Permanent frame mode connection operational") \
-D(TEMP,		0x29 /* 41*/, NONE,	Q.850,	"Temporary failure") \
-D(CONG,		0x2a /* 42*/, NONE,	Q.850,	"Switching equipment congestion") \
-D(ACC_DISC,	0x2b /* 43*/, IE,	Q.850,	"Access information discarded") \
-D(REQNOCHAN,	0x2c /* 44*/, NONE,	Q.850,	"Requested circuit/channel not available") \
-D(NOVPCI,	0x2d /* 45*/, NONE,	Q.2610,	"No VPCI/VCI available") \
-D(PREC_BLOCK,	0x2e /* 46*/, NONE,	Q.850,	"Precedence call blocked") \
-D(RESRC_NAVL,	0x2f /* 47*/, NONE,	Q.850,	"Resource unavailable, unspecified") \
-D(QOS_NAVL,	0x31 /* 49*/, COND,	Q.850,	"Quality of service not available") \
-D(FAC_NOTSUB,	0x32 /* 50*/, FAC,	Q.850,	"Requested facility not subscribed") \
-D(OUT_CUG,	0x35 /* 53*/, NONE,	Q.850,	"Outgoing calls barred within CUG") \
-N(PGL_CHG,	0x35 /* 53*/, NONE,	PNNI1.0,"Call cleared due to change in PGL") \
-D(IN_CUG,	0x37 /* 55*/, NONE,	Q.850,	"Incoming call barred within CUG") \
-D(BEARER_NAUTH,	0x39 /* 57*/, ATTR,	Q.850,	"Bearer capability not authorized") \
-D(BEARER_NAVL,	0x3a /* 58*/, ATTR,	Q.850,	"Bearer capability not presently available") \
-D(INCONS,	0x3e /* 62*/, NONE,	Q.850,	"Inconsistency in designated outgoing access information and subscriber class") \
-D(OPT_NAVL,	0x3f /* 63*/, NONE,	Q.850,	"Service or option not available, unspecified") \
-D(BEARER_NIMPL,	0x41 /* 65*/, ATTR,	Q.850,	"Bearer capability not implemented") \
-D(CHANNEL_NIMPL,0x42 /* 66*/, CHANNEL,	Q.850,	"Channel type not implemented") \
-D(FAC_NIMPL,	0x45 /* 69*/, FAC,	Q.850,	"Requested facility not implemented") \
-D(RESTR_DIG,	0x46 /* 70*/, NONE,	Q.850,	"Only restricted digital information bearer capability is available") \
-D(TRAFFIC_UNSUP,0x49 /* 73*/, NONE,	Q.2971,	"Unsupported combination of traffic parameters") \
-N(AAL_UNSUP,	0x4c /* 78*/, NONE,	UNI3.1,	"AAL parameters cannot be supported") \
-D(CREF_INV,	0x51 /* 81*/, NONE,	Q.850,	"Invalid call reference value") \
-D(CHANNEL_NEX,	0x52 /* 82*/, CHANID,	Q.850,	"Identified channel does not exist") \
-D(SUSPENDED,	0x53 /* 83*/, NONE,	Q.850,	"A suspended call exists, but this call identity does not") \
-D(CID_INUSE,	0x54 /* 84*/, NONE,	Q.850,	"Call identity in use") \
-D(NOTSUSP,	0x55 /* 85*/, NONE,	Q.850,	"No call suspended") \
-D(CLEARED,	0x56 /* 86*/, CAUSE,	Q.850,	"Call having requested call identity has been cleared") \
-D(NOT_MEMBER,	0x57 /* 87*/, NONE,	Q.850,	"User not member of CUG") \
-D(INCOMP,	0x58 /* 88*/, PARAM,	Q.850,	"Incompatible destination") \
-D(ENDP_INV,	0x59 /* 89*/, IE,	UNI3.1,	"Invalid endpoint reference") \
-D(NEX_CUG,	0x5a /* 90*/, NONE,	Q.850,	"Non-existend CUG") \
-D(TRANSIT_INV,	0x5b /* 91*/, NONE,	Q.850,	"Invalid transit network selection") \
-D(AALNOTSUPP,	0x5d /* 93*/, NONE,	Q.2610,	"AAL parameters cannot be supported") \
-D(INVMSG,	0x5f /* 95*/, NONE,	Q.850,	"Invalid message, unspecified") \
-D(MANDAT,	0x60 /* 96*/, IE,	Q.850,	"Mandatory information element is missing") \
-D(MTYPE_NIMPL,	0x61 /* 97*/, MTYPE,	Q.850,	"Message type non-existent or not implemented") \
-D(MSG_NOTCOMP,	0x62 /* 98*/, MTYPE,	Q.850,	"Message not compatible with call state or message type non-existent or not implemented") \
-D(IE_NIMPL,	0x63 /* 99*/, IE,	Q.850,	"Information element/parameter non-existent or not implemented") \
-D(IE_INV,	0x64 /*100*/, IE,	Q.850,	"Invalid information element contents") \
-D(MSG_INCOMP,	0x65 /*101*/, MTYPE,	Q.850,	"Message not compatible with call state") \
-D(RECOVER,	0x66 /*102*/, TIMER,	Q.850,	"Recovery on timer expiry") \
-D(PARAM_NEX,	0x67 /*103*/, PARAM,	Q.850,	"Parameter non-existent or not implemented, passed on") \
-N(BAD_LENGTH,	0x68 /*104*/, NONE,	UNI3.1,	"Incorrect message length") \
-D(PARAM_UNREC,	0x6e /*110*/, PARAM,	Q.850,	"Message with unrecognized parameter, discarded") \
-D(PROTO,	0x6f /*111*/, NONE,	Q.850,	"Protocol error, unspecified") \
-D(INTERWORKING,	0x7f /*127*/, NONE,	Q.850,	"Interworking, unspecified")
-
-#define D(NAME,VAL,DIAG,STD,STR) UNI_CAUSE_##NAME = VAL,
-#define N(NAME,VAL,DIAG,STD,STR) UNI_CAUSE_##NAME = VAL,
-
-enum uni_cause {
-UNI_DECLARE_CAUSE_VALUES
-};
-
-#undef D
-#undef N
-
-enum uni_cause_class {
-	UNI_CAUSE_CLASS_NORM	= 0x0,
-	UNI_CAUSE_CLASS_NORM1	= 0x1,
-	UNI_CAUSE_CLASS_RES	= 0x2,
-	UNI_CAUSE_CLASS_NAVL	= 0x3,
-	UNI_CAUSE_CLASS_NIMPL	= 0x4,
-	UNI_CAUSE_CLASS_INV	= 0x5,
-	UNI_CAUSE_CLASS_PROTO	= 0x6,
-	UNI_CAUSE_CLASS_INTER	= 0x7,
-};
-enum uni_cause_pu {
-	UNI_CAUSE_PU_PROVIDER	= 0,
-	UNI_CAUSE_PU_USER	= 1,
-};
-enum uni_cause_na {
-	UNI_CAUSE_NA_NORMAL	= 0,
-	UNI_CAUSE_NA_ABNORMAL	= 1,
-};
-enum uni_cause_cond {
-	UNI_CAUSE_COND_UNKNOWN	= 0,
-	UNI_CAUSE_COND_PERM	= 1,
-	UNI_CAUSE_COND_TRANS	= 2,
-};
-enum uni_cause_reason {
-	UNI_CAUSE_REASON_USER	= 0x00,
-	UNI_CAUSE_REASON_IEMISS	= 0x01,
-	UNI_CAUSE_REASON_IESUFF	= 0x02,
-};
-
-enum uni_diag {
-	UNI_DIAG_NONE,		/* no diagnostics */
-
-	UNI_DIAG_COND,		/* Condition */
-	UNI_DIAG_TNS,		/* Transit Network Selector */
-	UNI_DIAG_REJ,		/* Call Rejected */
-	UNI_DIAG_NUMBER,	/* New Destination */
-	UNI_DIAG_CRATE,		/* Traffic descriptor subfield */
-	UNI_DIAG_ATTR,		/* Attribute idendity */
-	UNI_DIAG_PARAM,		/* Parameter, same as one IE */
-	UNI_DIAG_TIMER,		/* timer in ASCII */
-	UNI_DIAG_MTYPE,		/* Message type */
-	UNI_DIAG_IE,		/* Information element */
-	UNI_DIAG_CHANID,	/* VPCI/VCI */
-
-	UNI_DIAG_CAUSE = UNI_DIAG_NONE,		/* Not specified */
-	UNI_DIAG_CHANNEL = UNI_DIAG_NONE,	/* For N-ISDN */
-	UNI_DIAG_CCBS = UNI_DIAG_NONE,		/* Not used in Q.931 */
-	UNI_DIAG_FAC = UNI_DIAG_NONE,		/* Not specified */
-};
-
-enum {
-	UNI_CAUSE_TRAFFIC_N	= 34-6,
-	UNI_CAUSE_IE_N		= 34-6,
-	UNI_CAUSE_ATTR_N	= (34-6)/3,
-};
-
-struct uni_ie_cause {
-	struct uni_iehdr	h;
-#define UNI_CAUSE_COND_P	0x0001
-#define UNI_CAUSE_REJ_P		0x0002
-#define UNI_CAUSE_REJ_USER_P	0x0004
-#define UNI_CAUSE_REJ_IE_P	0x0008
-#define UNI_CAUSE_IE_P		0x0010
-#define UNI_CAUSE_TRAFFIC_P	0x0020
-#define UNI_CAUSE_VPCI_P	0x0040
-#define UNI_CAUSE_MTYPE_P	0x0080
-#define UNI_CAUSE_TIMER_P	0x0100
-#define UNI_CAUSE_TNS_P		0x0200
-#define UNI_CAUSE_NUMBER_P	0x0400
-#define UNI_CAUSE_ATTR_P	0x0800
-#define UNI_CAUSE_PARAM_P	0x1000
-
-	enum uni_cause_loc	loc;
-	enum uni_cause		cause;
-
-	union {
-	    struct {
-		enum uni_cause_pu	pu;
-		enum uni_cause_na	na;
-		enum uni_cause_cond	cond;
-	    } cond;
-	    struct {
-		enum uni_cause_reason	reason;
-		enum uni_cause_cond	cond;
-		u_int			user;
-		uint8_t			ie;
-	    } rej;
-	    struct {
-		uint8_t			ie[UNI_CAUSE_IE_N];
-		u_int			len;
-	    } ie;
-	    struct {
-		uint8_t			traffic[UNI_CAUSE_TRAFFIC_N];
-		u_int			len;
-	    } traffic;
-	    struct {
-		uint16_t		vpci;
-		uint16_t		vci;
-	    } vpci;
-	    uint8_t			mtype;
-	    u_char			timer[3];
-	    struct uni_ie_tns		tns;
-	    struct uni_ie_called	number;		/* TNS does not fit */
-	    uint8_t			param;
-	    struct {
-		u_int			nattr;
-	        u_char			attr[UNI_CAUSE_ATTR_N][3];
-	    }				attr;
-	} u;
-};
-enum uni_diag uni_diag(enum uni_cause, enum uni_coding);
-
-/* return a string for the cause (NULL if the coding/cause are illegal) */
-const char *uni_ie_cause2str(enum uni_coding, u_int);
-
-/*************************************************************************
- *
- * Connection identifier information element
- */
-enum uni_connid_type {
-	UNI_CONNID_VCI		= 0,
-	UNI_CONNID_ANYVCI	= 1,
-	UNI_CONNID_NOVCI	= 4,
-};
-enum uni_connid_assoc {
-	UNI_CONNID_ASSOC	= 0,
-	UNI_CONNID_NONASSOC	= 1,
-};
-struct uni_ie_connid {
-	struct uni_iehdr	h;
-	enum uni_connid_assoc	assoc;
-	enum uni_connid_type	type;
-	u_int			vpci : 16;
-	u_int			vci : 16;
-};
-
-/*************************************************************************
- *
- * End point reference IE
- */
-struct uni_ie_epref {
-	struct uni_iehdr	h;
-	u_int			flag : 1;
-	u_int			epref : 15;
-};
-
-/*************************************************************************
- *
- * End point state IE
- */
-enum uni_epstate {
-	UNI_EPSTATE_NULL	= 0x00,
-	UNI_EPSTATE_ADD_INIT	= 0x01,
-	UNI_EPSTATE_ALERT_DLVD	= 0x04,
-	UNI_EPSTATE_ADD_RCVD	= 0x06,
-	UNI_EPSTATE_ALERT_RCVD	= 0x07,
-	UNI_EPSTATE_ACTIVE	= 0x0a,
-	UNI_EPSTATE_DROP_INIT	= 0x0b,
-	UNI_EPSTATE_DROP_RCVD	= 0x0c,
-};
-
-struct uni_ie_epstate {
-	struct uni_iehdr h;
-	enum uni_epstate state;
-};
-
-/*************************************************************************
- *
- * Q.2932 Facility IE
- */
-enum {
-	UNI_FACILITY_ROSE	= 0x11,
-
-	UNI_FACILITY_MAXAPDU	= 128,
-};
-
-struct uni_ie_facility {
-	struct uni_iehdr h;
-
-	u_char		proto;
-	u_char		apdu[UNI_FACILITY_MAXAPDU];
-	u_int		len;
-};
-
-/*************************************************************************
- *
- * Notification indicator
- */
-enum {
-	UNI_NOTIFY_MAXLEN	= 128,	/* maximum info length */
-};
-struct uni_ie_notify {
-	struct uni_iehdr h;
-	u_int		len;
-	u_char		notify[UNI_NOTIFY_MAXLEN];
-};
-
-/*************************************************************************
- *
- * QoS information element
- */
-enum uni_qos {
-	UNI_QOS_CLASS0	= 0x00,
-	UNI_QOS_CLASS1	= 0x01,
-	UNI_QOS_CLASS2	= 0x02,
-	UNI_QOS_CLASS3	= 0x03,
-	UNI_QOS_CLASS4	= 0x04,
-};
-
-struct uni_ie_qos {
-	struct uni_iehdr h;
-	enum uni_qos	fwd;
-	enum uni_qos	bwd;
-};
-
-/*************************************************************************
- *
- * Broadband repeat indicator information element
- */
-enum uni_repeat_type {
-	UNI_REPEAT_PRIDESC	= 0x02,
-	UNI_REPEAT_STACK	= 0x0a,		/* PNNI */
-};
-
-struct uni_ie_repeat {
-	struct uni_iehdr h;
-	enum uni_repeat_type type;
-};
-
-/*************************************************************************
- *
- * Restart indicator information element
- */
-enum uni_restart_type {
-	UNI_RESTART_CHANNEL	= 0x0,
-	UNI_RESTART_PATH	= 0x1,
-	UNI_RESTART_ALL		= 0x2,
-};
-
-struct uni_ie_restart {
-	struct uni_iehdr h;
-	enum uni_restart_type rclass;
-};
-
-/*************************************************************************
- *
- * Broadband sending complete indicator information element
- */
-struct uni_ie_scompl {
-	struct uni_iehdr h;
-};
-
-/*************************************************************************
- *
- * ATM traffic descriptor information element
- */
-enum {
-	UNI_TRAFFIC_FMDCR_ID	= 0x00,
-	UNI_TRAFFIC_BMDCR_ID	= 0x02,
-	UNI_TRAFFIC_FPCR0_ID	= 0x82,
-	UNI_TRAFFIC_BPCR0_ID	= 0x83,
-	UNI_TRAFFIC_FPCR1_ID	= 0x84,
-	UNI_TRAFFIC_BPCR1_ID	= 0x85,
-	UNI_TRAFFIC_FSCR0_ID	= 0x88,
-	UNI_TRAFFIC_BSCR0_ID	= 0x89,
-	UNI_TRAFFIC_FSCR1_ID	= 0x90,
-	UNI_TRAFFIC_BSCR1_ID	= 0x91,
-	UNI_TRAFFIC_FABR1_ID	= 0x92,
-	UNI_TRAFFIC_BABR1_ID	= 0x93,
-	UNI_TRAFFIC_FMBS0_ID	= 0xa0,
-	UNI_TRAFFIC_BMBS0_ID	= 0xa1,
-	UNI_TRAFFIC_FMBS1_ID	= 0xb0,
-	UNI_TRAFFIC_BMBS1_ID	= 0xb1,
-	UNI_TRAFFIC_BEST_ID	= 0xbe,
-	UNI_TRAFFIC_MOPT_ID	= 0xbf,
-
-	UNI_TRAFFIC_FTAG	= 0x01,
-	UNI_TRAFFIC_BTAG	= 0x02,
-	UNI_TRAFFIC_FDISC	= 0x80,
-	UNI_TRAFFIC_BDISC	= 0x40,
-
-	UNI_MINTRAFFIC_FPCR0_ID	= 0x82,
-	UNI_MINTRAFFIC_BPCR0_ID	= 0x83,
-	UNI_MINTRAFFIC_FPCR1_ID	= 0x84,
-	UNI_MINTRAFFIC_BPCR1_ID	= 0x85,
-	UNI_MINTRAFFIC_FABR1_ID	= 0x92,
-	UNI_MINTRAFFIC_BABR1_ID	= 0x93,
-
-	UNI_MDCR_ORIGIN_USER	= 0x00,
-	UNI_MDCR_ORIGIN_NET	= 0x01,
-};
-
-#define UNI_TRAFFIC_FPCR0_P	0x0001
-#define UNI_TRAFFIC_BPCR0_P	0x0002
-#define UNI_TRAFFIC_FPCR1_P	0x0004
-#define UNI_TRAFFIC_BPCR1_P	0x0008
-#define UNI_TRAFFIC_FSCR0_P	0x0010
-#define UNI_TRAFFIC_BSCR0_P	0x0020
-#define UNI_TRAFFIC_FSCR1_P	0x0040
-#define UNI_TRAFFIC_BSCR1_P	0x0080
-#define UNI_TRAFFIC_FMBS0_P	0x0100
-#define UNI_TRAFFIC_BMBS0_P	0x0200
-#define UNI_TRAFFIC_FMBS1_P	0x0400
-#define UNI_TRAFFIC_BMBS1_P	0x0800
-#define UNI_TRAFFIC_BEST_P	0x1000
-#define UNI_TRAFFIC_MOPT_P	0x2000
-#define UNI_TRAFFIC_FABR1_P	0x4000
-#define UNI_TRAFFIC_BABR1_P	0x8000
-struct uni_xtraffic {
-	u_int	fpcr0, bpcr0;
-	u_int	fpcr1, bpcr1;
-	u_int	fscr0, bscr0;
-	u_int	fscr1, bscr1;
-	u_int	fmbs0, bmbs0;
-	u_int	fmbs1, bmbs1;
-	u_int	fabr1, babr1;
-	u_int	ftag, btag;
-	u_int	fdisc, bdisc;
-};
-
-struct uni_ie_traffic {
-	struct uni_iehdr h;
-	struct uni_xtraffic t;
-};
-struct uni_ie_atraffic {
-	struct uni_iehdr h;
-	struct uni_xtraffic t;
-};
-
-/*
- * Q.2961 minimum traffic descriptor
- */
-struct uni_ie_mintraffic {
-	struct uni_iehdr h;
-#define UNI_MINTRAFFIC_FPCR0_P	0x0001
-#define UNI_MINTRAFFIC_BPCR0_P	0x0002
-#define UNI_MINTRAFFIC_FPCR1_P	0x0004
-#define UNI_MINTRAFFIC_BPCR1_P	0x0008
-#define UNI_MINTRAFFIC_FABR1_P	0x0010
-#define UNI_MINTRAFFIC_BABR1_P	0x0020
-
-	u_int	fpcr0, bpcr0;
-	u_int	fpcr1, bpcr1;
-	u_int	fabr1, babr1;
-};
-
-/*
- * UNI4.0+ (af-cs-0147.000) Minimum Desired Cell Rate
- */
-struct uni_ie_mdcr {
-	struct uni_iehdr h;
-	u_int	origin;
-	u_int	fmdcr, bmdcr;
-};
-
-/*************************************************************************
- *
- * User-user information information element
- */
-struct uni_ie_uu {
-	struct uni_iehdr h;
-	u_int		len;
-	u_char		uu[UNI_UU_MAXLEN];
-};
-
-/*************************************************************************
- *
- * Generic identifier transport
- */
-enum uni_git_std {
-	UNI_GIT_STD_DSMCC	= 0x01,	/* DSM-CC */
-	UNI_GIT_STD_H245	= 0x02,	/* H.245 */
-};
-enum uni_git_type {
-	UNI_GIT_TYPE_SESS	= 0x01,	/* session id */
-	UNI_GIT_TYPE_RES	= 0x02,	/* resource id */
-};
-
-enum {
-	UNI_GIT_MAXSESS		= 20,	/* max session value length */
-	UNI_GIT_MAXRES		= 4,	/* max resource value length */
-
-	UNI_GIT_MAXVAL		= 20,	/* the maximum of the above */
-	UNI_GIT_MAXSUB		= 2,	/* maximum number of og. 6 */
-};
-
-struct uni_ie_git {
-	struct uni_iehdr	h;
-
-	enum uni_git_std	std;	/* identifier related standard/application */
-	u_int			numsub;
-	struct {
-		enum uni_git_type type;	
-		u_int		len;
-		u_char		val[UNI_GIT_MAXVAL];
-	}			sub[UNI_GIT_MAXSUB];
-};
-
-/*************************************************************************
- *
- * End-to-end transit delay
- */
-enum {
-	UNI_EETD_CTD_ID		= 0x01,	/* cumulative transit delay */
-	UNI_EETD_MTD_ID		= 0x03,	/* maximum transit delay */
-	UNI_EETD_NET_ID		= 0x0a,	/* network generated */
-	UNI_EETD_PMTD_ID	= 0x0b,	/* PNNI acceptable forward maximum ctd */
-	UNI_EETD_PCTD_ID	= 0x11,	/* PNNI cumulative forward maximum ctd */
-
-	UNI_EETD_ANYMAX		= 0xffff,
-	UNI_EETD_MAXVAL		= 0xffff,	/* maximum value */
-};
-
-struct uni_ie_eetd {
-	struct uni_iehdr	h;
-#define UNI_EETD_CUM_P		0x0001
-#define UNI_EETD_MAX_P		0x0002
-#define UNI_EETD_NET_P		0x0004	/* UNI4.0 9.1.2.1 */
-#define UNI_EETD_PMTD_P		0x0008	/* PNNI1.0 6.4.5.24 */
-#define UNI_EETD_PCTD_P		0x0010	/* PNNI1.0 6.4.5.24 */
-
-	u_int	cumulative;
-	u_int	maximum;
-	u_int	pmtd;
-	u_int	pctd;
-};
-
-/*************************************************************************
- * 
- * Leaf-initiated-join call identifier
- */
-enum uni_lij_idtype {
-	UNI_LIJ_IDTYPE_ROOT	= 0x0,	/* root created */
-};
-
-struct uni_ie_lij_callid {
-	struct uni_iehdr	h;
-
-	enum uni_lij_idtype	type;
-	u_int			callid;
-};
-
-/*
- * LIJ parameters
- */
-enum uni_lij_screen {
-	UNI_LIJ_SCREEN_NETJOIN	= 0x0,	/* without root notification */
-};
-
-struct uni_ie_lij_param {
-	struct uni_iehdr	h;
-
-	enum uni_lij_screen	screen;
-};
-
-/*
- * LIJ sequence number
- */
-struct uni_ie_lij_seqno {
-	struct uni_iehdr	h;
-
-	u_int			seqno;
-};
-
-/*************************************************************************
- *
- * Locking/Non-locking shift not supported
- */
-struct uni_ie_lshift {
-	struct uni_iehdr h;
-	u_int		set:3;
-};
-
-struct uni_ie_nlshift {
-	struct uni_iehdr h;
-	u_int		set:3;
-};
-
-/*************************************************************************
- *
- * Externded QoS information element
- */
-enum {
-	UNI_EXQOS_FACC_ID	= 0x94,
-	UNI_EXQOS_BACC_ID	= 0x95,
-	UNI_EXQOS_FCUM_ID	= 0x96,
-	UNI_EXQOS_BCUM_ID	= 0x97,
-	UNI_EXQOS_FCLR_ID	= 0xa2,
-	UNI_EXQOS_BCLR_ID	= 0xa3,
-};
-
-enum uni_exqos_origin {
-	UNI_EXQOS_USER	= 0,
-	UNI_EXQOS_NET	= 1,
-};
-
-enum {
-	UNI_EXQOS_ANY_CDV	= 0xffffff,
-	UNI_EXQOS_ANY_CLR	= 0xff,
-};
-
-struct uni_ie_exqos {
-	struct uni_iehdr	h;
-#define UNI_EXQOS_FACC_P	0x0001
-#define UNI_EXQOS_BACC_P	0x0002
-#define UNI_EXQOS_FCUM_P	0x0004
-#define UNI_EXQOS_BCUM_P	0x0008
-#define UNI_EXQOS_FCLR_P	0x0010
-#define UNI_EXQOS_BCLR_P	0x0020
-
-	enum uni_exqos_origin	origin;
-	u_int			facc;
-	u_int			bacc;
-	u_int			fcum;
-	u_int			bcum;
-	u_int			fclr;
-	u_int			bclr;
-};
-
-/*************************************************************************
- *
- * Additional ABR parameters
- * ABR setup parameters
- */
-enum {
-	UNI_ABRADD_FADD_ID	= 0xc2,
-	UNI_ABRADD_BADD_ID	= 0xc3,
-	UNI_ABRSETUP_FICR_ID	= 0xc2,
-	UNI_ABRSETUP_BICR_ID	= 0xc3,
-	UNI_ABRSETUP_FTBE_ID	= 0xc4,
-	UNI_ABRSETUP_BTBE_ID	= 0xc5,
-	UNI_ABRSETUP_RMFRT_ID	= 0xc6,
-	UNI_ABRSETUP_FRIF_ID	= 0xc8,
-	UNI_ABRSETUP_BRIF_ID	= 0xc9,
-	UNI_ABRSETUP_FRDF_ID	= 0xca,
-	UNI_ABRSETUP_BRDF_ID	= 0xcb,
-};
-
-struct uni_abr_rec {
-	u_int			present;
-#define UNI_ABR_REC_NRM_P	0x80000000
-#define UNI_ABR_REC_TRM_P	0x40000000
-#define UNI_ABR_REC_CDF_P	0x20000000
-#define UNI_ABR_REC_ADTF_P	0x10000000
-	u_int		nrm:3;
-	u_int		trm:3;
-	u_int		cdf:3;
-	u_int		adtf:10;
-};
-
-struct uni_ie_abradd {
-	struct uni_iehdr	h;
-	struct uni_abr_rec	fwd, bwd;
-};
-
-struct uni_ie_abrsetup {
-	struct uni_iehdr	h;
-#define UNI_ABRSETUP_FICR_P	0x0001
-#define UNI_ABRSETUP_BICR_P	0x0002
-#define UNI_ABRSETUP_FTBE_P	0x0004
-#define UNI_ABRSETUP_BTBE_P	0x0008
-#define UNI_ABRSETUP_FRIF_P	0x0010
-#define UNI_ABRSETUP_BRIF_P	0x0020
-#define UNI_ABRSETUP_FRDF_P	0x0040
-#define UNI_ABRSETUP_BRDF_P	0x0080
-#define UNI_ABRSETUP_RMFRT_P	0x0100
-
-	u_int		ficr, bicr;
-	u_int		ftbe, btbe;
-	u_int		rmfrt;
-	u_int		frif, brif;
-	u_int		frdf, brdf;
-};
-
-/*************************************************************************
- *
- * Connection scope information element
- */
-enum uni_cscope {
-	UNI_CSCOPE_ORG	= 0x01,
-};
-
-enum {
-	UNI_CSCOPE_ORG_LOC	= 0x01,
-	UNI_CSCOPE_ORG_LOC_P1	= 0x02,
-	UNI_CSCOPE_ORG_LOC_P2	= 0x03,
-	UNI_CSCOPE_ORG_SITE_M1	= 0x04,
-	UNI_CSCOPE_ORG_SITE	= 0x05,
-	UNI_CSCOPE_ORG_SITE_P1	= 0x06,
-	UNI_CSCOPE_ORG_ORG_M1	= 0x07,
-	UNI_CSCOPE_ORG_ORG	= 0x08,
-	UNI_CSCOPE_ORG_ORG_P1	= 0x09,
-	UNI_CSCOPE_ORG_COMM_M1	= 0x0a,
-	UNI_CSCOPE_ORG_COMM	= 0x0b,
-	UNI_CSCOPE_ORG_COMM_P1	= 0x0c,
-	UNI_CSCOPE_ORG_REG	= 0x0d,
-	UNI_CSCOPE_ORG_INTER	= 0x0e,
-	UNI_CSCOPE_ORG_GLOBAL	= 0x0f,
-};
-
-struct uni_ie_cscope {
-	struct uni_iehdr	h;
-	enum uni_cscope		type;
-	u_int			scope:8;
-};
-
-/*************************************************************************
- *
- * Connection scope information element
- */
-enum uni_report {
-	UNI_REPORT_MODCONF	= 0x01,
-	UNI_REPORT_CLOCK	= 0x02,
-	UNI_REPORT_EEAVAIL	= 0x04,
-	UNI_REPORT_EEREQ	= 0x05,
-	UNI_REPORT_EECOMPL	= 0x06,
-};
-
-struct uni_ie_report {
-	struct uni_iehdr h;
-	enum uni_report	report;
-};
-
-/*************************************************************************
- *
- * PNNI Designated transit list information element
- */
-enum {
-	UNI_DTL_LOGNP	= 0x01,
-	UNI_DTL_LOGNP_SIZE = 27,
-};
-
-struct uni_ie_dtl {
-	struct uni_iehdr	h;
-	u_int			ptr:16;
-	u_int			num;
-	struct {
-	  u_char		node_level;
-	  u_char		node_id[21];
-	  u_int			port_id;
-	}			dtl[UNI_DTL_MAXNUM];
-};
-
-/*************************************************************************
- *
- * PNNI Crankback information element
- */
-enum uni_crankback {
-	UNI_CRANKBACK_IF	= 0x02,
-	UNI_CRANKBACK_NODE	= 0x03,
-	UNI_CRANKBACK_LINK	= 0x04,
-};
-
-enum {
-	UNI_CAUSE_NXNODE_UNREACH = 128,
-	UNI_CAUSE_DTL_NOT_MY_ID	= 160,
-};
-
-struct uni_ie_crankback {
-	struct uni_iehdr	h;
-#define UNI_CRANKBACK_TOP_P	0x0001
-#define UNI_CRANKBACK_TOPX_P	0x0002
-#define UNI_CRANKBACK_QOS_P	0x0004
-	u_int			level:8;
-	enum uni_crankback	type;
-	union {
-	  struct {
-	    u_char		level;
-	    u_char		id[21];
-	  }			node;
-	  struct {
-	    u_char		plevel;
-	    u_char		pid[21];
-	    u_int		port;
-	    u_char		slevel;
-	    u_char		sid[21];
-	  }			link;
-	}			id;
-	u_int			cause:8;
-	union {
-	  struct {
-	    u_int		dir:8;
-	    u_int		port;
-	    u_int		avcr;
-	    u_int		crm;
-	    u_int		vf;
-	  }			top;
-	  struct {
-	    u_int		ctd:1;
-	    u_int		cdv:1;
-	    u_int		clr:1;
-	    u_int		other:1;
-	  }			qos;
-	}			diag;
-};
-
-/*************************************************************************
- *
- * PNNI Call_ing/called party soft PVPC/PVCC information element
- */
-enum uni_soft_sel {
-	UNI_SOFT_SEL_ANY	= 0x00,
-	UNI_SOFT_SEL_REQ	= 0x02,
-	UNI_SOFT_SEL_ASS	= 0x04,
-};
-
-struct uni_ie_calling_soft {
-	struct uni_iehdr h;
-#define UNI_CALLING_SOFT_VCI_P	0x0001
-	u_int		vpi:12;
-	u_int		vci:16;
-};
-struct uni_ie_called_soft {
-	struct uni_iehdr h;
-#define UNI_CALLED_SOFT_VPI_P	0x0001
-#define UNI_CALLED_SOFT_VCI_P	0x0002
-	enum uni_soft_sel sel;
-	u_int		vpi:12;
-	u_int		vci:16;
-};
-
-/*************************************************************************/
-
-#include <netnatm/msg/uni_ie.h>
-#include <netnatm/msg/uni_msg.h>
-
-struct uni_all {
-	enum uni_msgtype	mtype;
-	union uni_msgall	u;
-};
-
-struct uni_ie {
-	enum uni_ietype		ietype;
-	union uni_ieall		u;
-};
-
-#endif
diff --git a/include.new/netnatm/natm.h b/include.new/netnatm/natm.h
deleted file mode 100644
index 791a461..0000000
--- a/include.new/netnatm/natm.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * Copyright (c) 1996 Charles D. Cranor and Washington University.
- * 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 Charles D. Cranor and
- *      Washington University.
- * 4. 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 ``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 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.
- *
- * $NetBSD: natm.h,v 1.1 1996/07/04 03:20:12 chuck Exp $
- * $FreeBSD: releng/10.2/sys/netnatm/natm.h 168776 2007-04-16 12:31:35Z pjd $
- */
-
-/*
- * natm.h: native mode atm
- */
-
-/*
- * supported protocols
- */
-#define	PROTO_NATMAAL0		1
-#define	PROTO_NATMAAL5		2	
-
-/*
- * sockaddr_natm
- */
-
-struct sockaddr_natm {
-	unsigned char	snatm_len;		/* length */
-	sa_family_t	snatm_family;		/* AF_NATM */
-	char		snatm_if[IFNAMSIZ];	/* interface name */
-	u_int16_t	snatm_vci;		/* vci */
-	u_int8_t	snatm_vpi;		/* vpi */
-};
-
-#ifdef _KERNEL
-
-/*
- * natm protocol control block
- */
-struct natmpcb {
-	LIST_ENTRY(natmpcb) pcblist;	/* list pointers */
-	u_int		npcb_inq;	/* # of our pkts in proto q */
-	struct socket	*npcb_socket;	/* backpointer to socket */
-	struct ifnet	*npcb_ifp;	/* pointer to hardware */
-	struct in_addr	ipaddr;		/* remote IP address, if APCB_IP */
-	u_int16_t	npcb_vci;	/* VCI */
-	u_int8_t	npcb_vpi;	/* VPI */
-	u_int8_t	npcb_flags;	/* flags */
-};
-
-/* flags */
-#define	NPCB_FREE	0x01		/* free (not on any list) */
-#define	NPCB_CONNECTED	0x02		/* connected */
-#define	NPCB_IP		0x04		/* used by IP */
-#define	NPCB_DRAIN	0x08		/* destroy as soon as inq == 0 */
-
-/* flag arg to npcb_free */
-#define	NPCB_REMOVE	0		/* remove from global list */
-#define	NPCB_DESTROY	1		/* destroy and be free */
-
-LIST_HEAD(npcblist, natmpcb);
-
-/* global data structures */
-
-extern struct mtx natm_mtx;		/* global netnatm lock */
-extern struct npcblist natm_pcbs;	/* global list of pcbs */
-#define	NATM_STAT
-#ifdef NATM_STAT
-extern	u_int	natm_sodropcnt;
-extern	u_int	natm_sodropbytes;	/* account of droppage */
-extern	u_int	natm_sookcnt;
-extern	u_int	natm_sookbytes;		/* account of ok */
-#endif
-
-/* locking macros */
-#define	NATM_LOCK_INIT()	mtx_init(&natm_mtx, "natm_mtx", NULL, MTX_DEF)
-#define	NATM_LOCK()		mtx_lock(&natm_mtx)
-#define	NATM_UNLOCK()		mtx_unlock(&natm_mtx)
-#define	NATM_LOCK_ASSERT()	mtx_assert(&natm_mtx, MA_OWNED)
-
-/* external functions */
-
-/* natm_pcb.c */
-struct	natmpcb *npcb_alloc(int);
-void	npcb_free(struct natmpcb *, int);
-struct	natmpcb *npcb_add(struct natmpcb *, struct ifnet *, uint16_t, uint8_t);
-
-/* natm.c */
-extern struct pr_usrreqs natm_usrreqs;
-
-#ifdef SYSCTL_HANDLER_ARGS
-int	natm0_sysctl(SYSCTL_HANDLER_ARGS);
-int	natm5_sysctl(SYSCTL_HANDLER_ARGS);
-#endif
-
-void	natmintr(struct mbuf *);
-
-#endif
diff --git a/include.new/netnatm/saal/sscfu.h b/include.new/netnatm/saal/sscfu.h
deleted file mode 100644
index 3aaa927..0000000
--- a/include.new/netnatm/saal/sscfu.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscfu.h,v 1.4 2004/07/08 08:22:15 brandt Exp $
- *
- * Public include file for UNI SSCF
- */
-#ifndef _NETNATM_SAAL_SSCFU_H_
-#define _NETNATM_SAAL_SSCFU_H_
-
-#include <sys/types.h>
-#include <netnatm/saal/sscopdef.h>
-#include <netnatm/saal/sscfudef.h>
-
-/*
- * Define how a buffer looks like.
- */
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#define SSCFU_MBUF_T mbuf
-#endif
-#else
-#define SSCFU_MBUF_T uni_msg
-#endif
-
-struct SSCFU_MBUF_T;
-struct sscfu;
-
-/* functions to be supplied by the SSCOP user */
-struct sscfu_funcs {
-	/* upper (SAAL) interface output */
-	void	(*send_upper)(struct sscfu *, void *, enum saal_sig,
-		    struct SSCFU_MBUF_T *);
-
-	/* lower (SSCOP) interface output */
-	void	(*send_lower)(struct sscfu *, void *, enum sscop_aasig,
-		    struct SSCFU_MBUF_T *, u_int);
-
-	/* function to move the SSCOP window */
-	void	(*window)(struct sscfu *, void *, u_int);
-
-	/* debugging function */
-	void	(*verbose)(struct sscfu *, void *, const char *, ...)
-		    __printflike(3, 4);
-};
-
-/* Function defined by the SSCF-UNI code */
-
-/* allocate and initialize a new SSCF instance */
-struct sscfu *sscfu_create(void *, const struct sscfu_funcs *);
-
-/* destroy an SSCF instance and free all resources */
-void sscfu_destroy(struct sscfu *);
-
-/* reset the SSCF to the released state */
-void sscfu_reset(struct sscfu *);
-
-/* lower input interface (SSCOP signals) */
-void sscfu_input(struct sscfu *, enum sscop_aasig, struct SSCFU_MBUF_T *, u_int);
-
-/* upper input interface (SAAL) */
-int sscfu_saalsig(struct sscfu *, enum saal_sig, struct SSCFU_MBUF_T *);
-
-/* retrieve the current state */
-enum sscfu_state sscfu_getstate(const struct sscfu *);
-
-/* char'ify signals and states */
-const char *sscfu_signame(enum saal_sig);
-const char *sscfu_statename(enum sscfu_state);
-
-/* retrieve the default set of parameters for SSCOP */
-u_int sscfu_getdefparam(struct sscop_param *);
-
-/* get/set debugging flags */
-void sscfu_setdebug(struct sscfu *, u_int);
-u_int sscfu_getdebug(const struct sscfu *);
-
-#endif
diff --git a/include.new/netnatm/saal/sscfudef.h b/include.new/netnatm/saal/sscfudef.h
deleted file mode 100644
index 08882f2..0000000
--- a/include.new/netnatm/saal/sscfudef.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscfudef.h,v 1.4 2004/07/08 08:22:16 brandt Exp $
- *
- * Definitions of UNI SSCF constants.
- */
-#ifndef _NETNATM_SAAL_SSCFUDEF_H_
-#define _NETNATM_SAAL_SSCFUDEF_H_
-
-/*
- * Signals at the upper boundary of the SSCF.
- */
-enum saal_sig {
-	SAAL_ESTABLISH_request,		/* U -> SAAL: (UU) */
-	SAAL_ESTABLISH_indication,	/* SAAL -> U: (UU) */
-	SAAL_ESTABLISH_confirm,		/* SAAL -> U: (UU) */
-	SAAL_RELEASE_request,		/* U -> SAAL: (UU) */
-	SAAL_RELEASE_confirm,		/* SAAL -> U: */
-	SAAL_RELEASE_indication,	/* SAAL -> U: (UU) */
-	SAAL_DATA_request,		/* U -> SAAL: (DATA) */
-	SAAL_DATA_indication,		/* SAAL -> U: (DATA) */
-	SAAL_UDATA_request,		/* U -> SAAL: (UDATA) */
-	SAAL_UDATA_indication,		/* SAAL -> U: (UDATA) */
-};
-
-/*
- * States of the SSCF
- */
-enum sscfu_state {
-	SSCFU_RELEASED,			/* 1/1 */
-	SSCFU_AWAITING_ESTABLISH,	/* 2/2 */
-	SSCFU_AWAITING_RELEASE,		/* 4/10 */
-	SSCFU_ESTABLISHED,		/* 3/4 */
-	SSCFU_RESYNC,			/* 2/5 */
-};
-
-/*
- * Debugging flags
- */
-enum {
-	SSCFU_DBG_LSIG		= 0x01,
-	SSCFU_DBG_ERR		= 0x02,
-	SSCFU_DBG_STATE		= 0x04,
-	SSCFU_DBG_EXEC		= 0x08,
-};
-
-#endif
diff --git a/include.new/netnatm/saal/sscop.h b/include.new/netnatm/saal/sscop.h
deleted file mode 100644
index 8574a15..0000000
--- a/include.new/netnatm/saal/sscop.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscop.h,v 1.4 2004/07/08 08:22:16 brandt Exp $
- *
- * External interface to sscop.
- */
-#ifndef _NETNATM_SAAL_SSCOP_H_
-#define _NETNATM_SAAL_SSCOP_H_
-
-#include <netnatm/saal/sscopdef.h>
-
-/*
- * Define how a buffer looks like.
- */
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#define SSCOP_MBUF_T mbuf
-#endif
-#else
-#define SSCOP_MBUF_T uni_msg
-#endif
-
-struct SSCOP_MBUF_T;
-struct sscop;
-
-/*
- * Vector for user functions
- */
-struct sscop_funcs {
-	/* management signal from SSCOP */
-	void	(*send_manage)(struct sscop *, void *, enum sscop_maasig,
-		    struct SSCOP_MBUF_T *, u_int, u_int);
-
-	/* AAL signal from SSCOP */
-	void	(*send_upper)(struct sscop *, void *, enum sscop_aasig,
-		    struct SSCOP_MBUF_T *, u_int);
-
-	/* send a PDU to the wire */
-	void	(*send_lower)(struct sscop *, void *,
-		    struct SSCOP_MBUF_T *);
-
-	/* print a message */
-	void	(*verbose)(struct sscop *, void *, const char *, ...)
-		    __printflike(3,4);
-
-#ifndef _KERNEL
-	/* start a timer */
-	void	*(*start_timer)(struct sscop *, void *, u_int,
-		    void (*)(void *));
-
-	/* stop a timer */
-	void	(*stop_timer)(struct sscop *, void *, void *);
-#endif
-};
-
-/* Function defined by the SSCOP code */
-
-/* create a new SSCOP instance and initialize to default values */
-struct sscop *sscop_create(void *, const struct sscop_funcs *);
-
-/* destroy an SSCOP instance */
-void sscop_destroy(struct sscop *);
-
-/* get the current parameters of an SSCOP */
-void sscop_getparam(const struct sscop *, struct sscop_param *);
-
-/* set new parameters in an SSCOP */
-int sscop_setparam(struct sscop *, struct sscop_param *, u_int *);
-
-/* deliver an signal to the SSCOP */
-int sscop_aasig(struct sscop *, enum sscop_aasig, struct SSCOP_MBUF_T *, u_int);
-
-/* deliver an management signal to the SSCOP */
-int sscop_maasig(struct sscop *, enum sscop_maasig, struct SSCOP_MBUF_T *);
-
-/* SSCOP input function */
-void sscop_input(struct sscop *, struct SSCOP_MBUF_T *);
-
-/* Move the window by a given number of messages. Return the new window */
-u_int sscop_window(struct sscop *, u_int);
-
-/* declare the lower layer busy or not busy */
-u_int sscop_setbusy(struct sscop *, int);
-
-/* retrieve the state */
-enum sscop_state sscop_getstate(const struct sscop *);
-
-/* map signals to strings */
-const char *sscop_msigname(enum sscop_maasig);
-const char *sscop_signame(enum sscop_aasig);
-const char *sscop_statename(enum sscop_state);
-
-/* set/get debugging state */
-void sscop_setdebug(struct sscop *, u_int);
-u_int sscop_getdebug(const struct sscop *);
-
-/* reset the instance */
-void sscop_reset(struct sscop *);
-
-#endif
diff --git a/include.new/netnatm/saal/sscopdef.h b/include.new/netnatm/saal/sscopdef.h
deleted file mode 100644
index ec67164..0000000
--- a/include.new/netnatm/saal/sscopdef.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/saal/sscopdef.h,v 1.4 2004/07/08 08:22:17 brandt Exp $
- *
- * Definitions of SSCOP constants and parameter blocks. This is seen by
- * the outside world.
- */
-#ifndef _NETNATM_SAAL_SSCOPDEF_H_
-#define _NETNATM_SAAL_SSCOPDEF_H_
-
-#include <sys/types.h>
-#ifdef _KERNEL
-#include <sys/stdint.h>
-#else
-#include <stdint.h>
-#endif
-
-/*
- * AA-interface signals
- */
-enum sscop_aasig {
-	SSCOP_ESTABLISH_request,	/* <- UU, BR */
-	SSCOP_ESTABLISH_indication,	/* -> UU */
-	SSCOP_ESTABLISH_response,	/* <- UU, BR */
-	SSCOP_ESTABLISH_confirm,	/* -> UU */
-
-	SSCOP_RELEASE_request,		/* <- UU */
-	SSCOP_RELEASE_indication,	/* -> UU, SRC */
-	SSCOP_RELEASE_confirm,		/* -> */
-
-	SSCOP_DATA_request,		/* <- MU */
-	SSCOP_DATA_indication,		/* -> MU, SN */
-
-	SSCOP_UDATA_request,		/* <- MU */
-	SSCOP_UDATA_indication,		/* -> MU */
-
-	SSCOP_RECOVER_indication,	/* -> */
-	SSCOP_RECOVER_response,		/* <- */
-
-	SSCOP_RESYNC_request,		/* <- UU */
-	SSCOP_RESYNC_indication,	/* -> UU */
-	SSCOP_RESYNC_response,		/* <- */
-	SSCOP_RESYNC_confirm,		/* -> */
-
-	SSCOP_RETRIEVE_request,		/* <- RN */
-	SSCOP_RETRIEVE_indication,	/* -> MU */
-	SSCOP_RETRIEVE_COMPL_indication,/* -> */
-};
-
-enum sscop_maasig {
-	SSCOP_MDATA_request,		/* <- MU */
-	SSCOP_MDATA_indication,		/* -> MU */
-	SSCOP_MERROR_indication,	/* -> CODE, CNT */
-};
-
-/*
- * Values for retrieval. Numbers in SSCOP are 24bit, so
- * we can use the large values
- */
-enum {
-	SSCOP_MAXSEQNO		= 0xffffff,
-
-	SSCOP_RETRIEVE_UNKNOWN	= SSCOP_MAXSEQNO + 1,
-	SSCOP_RETRIEVE_TOTAL	= SSCOP_MAXSEQNO + 2,
-};
-
-/*
- * SSCOP states
- */
-enum sscop_state {
-	SSCOP_IDLE,		/* initial state */
-	SSCOP_OUT_PEND,		/* outgoing connection pending */
-	SSCOP_IN_PEND,		/* incoming connection pending */
-	SSCOP_OUT_DIS_PEND,	/* outgoing disconnect pending */
-	SSCOP_OUT_RESYNC_PEND,	/* outgoing resynchronisation pending */
-	SSCOP_IN_RESYNC_PEND,	/* incoming resynchronisation pending */
-	SSCOP_OUT_REC_PEND,	/* outgoing recovery pending */
-	SSCOP_REC_PEND,		/* recovery response pending */
-	SSCOP_IN_REC_PEND,	/* incoming recovery pending */
-	SSCOP_READY,		/* data transfer ready */
-};
-#define SSCOP_NSTATES 10
-
-struct sscop_param {
-	uint32_t	timer_cc;	/* timer_cc in msec */
-	uint32_t	timer_poll;	/* timer_poll im msec */
-	uint32_t	timer_keep_alive;/* timer_keep_alive in msec */
-	uint32_t	timer_no_response;/*timer_no_response in msec */
-	uint32_t	timer_idle;	/* timer_idle in msec */
-	uint32_t	maxk;		/* maximum user data in bytes */
-	uint32_t	maxj;		/* maximum u-u info in bytes */
-	uint32_t	maxcc;		/* max. retransmissions for control packets */
-	uint32_t	maxpd;		/* max. vt(pd) before sending poll */
-	uint32_t	maxstat;	/* max. number of elements in stat list */
-	uint32_t	mr;		/* initial window */
-	uint32_t	flags;		/* flags */
-};
-enum {
-	SSCOP_ROBUST 	= 0x0001,	/* atmf/97-0216 robustness */
-	SSCOP_POLLREX	= 0x0002,	/* send POLL after retransmit */
-};
-
-enum {
-	SSCOP_SET_TCC		= 0x0001,
-	SSCOP_SET_TPOLL		= 0x0002,
-	SSCOP_SET_TKA		= 0x0004,
-	SSCOP_SET_TNR		= 0x0008,
-	SSCOP_SET_TIDLE		= 0x0010,
-	SSCOP_SET_MAXK		= 0x0020,
-	SSCOP_SET_MAXJ		= 0x0040,
-	SSCOP_SET_MAXCC		= 0x0080,
-	SSCOP_SET_MAXPD		= 0x0100,
-	SSCOP_SET_MAXSTAT	= 0x0200,
-	SSCOP_SET_MR		= 0x0400,
-	SSCOP_SET_ROBUST	= 0x0800,
-	SSCOP_SET_POLLREX	= 0x1000,
-
-	SSCOP_SET_ALLMASK	= 0x1fff,
-};
-
-enum {
-	SSCOP_DBG_USIG	= 0x0001,
-	SSCOP_DBG_TIMER	= 0x0002,
-	SSCOP_DBG_BUG	= 0x0004,
-	SSCOP_DBG_INSIG	= 0x0008,
-	SSCOP_DBG_STATE	= 0x0010,
-	SSCOP_DBG_PDU	= 0x0020,
-	SSCOP_DBG_ERR	= 0x0040,
-	SSCOP_DBG_EXEC	= 0x0080,
-	SSCOP_DBG_FLOW	= 0x0100,
-};
-
-#endif
diff --git a/include.new/netnatm/sig/uni.h b/include.new/netnatm/sig/uni.h
deleted file mode 100644
index 5af6c44..0000000
--- a/include.new/netnatm/sig/uni.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/uni.h,v 1.5 2004/07/08 08:22:24 brandt Exp $
- *
- * Public UNI interface
- */
-#ifndef _NETNATM_SIG_UNI_H_
-#define _NETNATM_SIG_UNI_H_
-
-#include <netnatm/sig/unidef.h>
-
-struct uni;
-
-/* functions to be supplied by the user */
-struct uni_funcs {
-	/* output to the upper layer */
-	void	(*uni_output)(struct uni *, void *, enum uni_sig,
-		    uint32_t, struct uni_msg *);
-
-	/* output to the SAAL */
-	void	(*saal_output)(struct uni *, void *, enum saal_sig,
-		    struct uni_msg *);
-
-	/* verbosity */
-	void	(*verbose)(struct uni *, void *, enum uni_verb,
-		    const char *, ...) __printflike(4, 5);
-
-	/* function to 'print' status */
-	void	(*status)(struct uni *, void *, void *,
-		    const char *, ...) __printflike(4, 5);
-
-#ifndef _KERNEL
-	/* start a timer */
-	void	*(*start_timer)(struct uni *, void *, u_int,
-		    void (*)(void *), void *);
-
-	/* stop a timer */
-	void	(*stop_timer)(struct uni *, void *, void *);
-#endif
-};
-
-/* create a UNI instance */
-struct uni *uni_create(void *, const struct uni_funcs *);
-
-/* destroy a UNI instance, free all resources */
-void uni_destroy(struct uni *);
-
-/* generate a status report */
-void uni_status(struct uni *, void *);
-
-/* get current instance configuration */
-void uni_get_config(const struct uni *, struct uni_config *);
-
-/* set new instance configuration */
-void uni_set_config(struct uni *, const struct uni_config *,
-	uint32_t *, uint32_t *, uint32_t *);
-
-/* input from the SAAL to the instance */
-void  uni_saal_input(struct uni *, enum saal_sig, struct uni_msg *);
-
-/* input from the upper layer to the instance */
-void uni_uni_input(struct uni *, enum uni_sig, uint32_t, struct uni_msg *);
-
-/* do work on pending signals */
-void uni_work(struct uni *);
-
-/* set debuging level */
-void uni_set_debug(struct uni *, enum uni_verb, u_int level);
-u_int uni_get_debug(const struct uni *, enum uni_verb);
-
-/* reset a UNI instance */
-void uni_reset(struct uni *);
-
-/* states */
-u_int uni_getcustate(const struct uni *);
-
-/* return a reference to the coding/decoding context */
-struct unicx *uni_context(struct uni *);
-
-#endif
diff --git a/include.new/netnatm/sig/unidef.h b/include.new/netnatm/sig/unidef.h
deleted file mode 100644
index 7278db8..0000000
--- a/include.new/netnatm/sig/unidef.h
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/unidef.h,v 1.9 2004/07/08 08:22:24 brandt Exp $
- *
- * UNI public definitions.
- */
-#ifndef _ATM_SIG_UNIDEF_H_
-#define _ATM_SIG_UNIDEF_H_
-
-#ifdef _KERNEL
-#include <sys/stdint.h>
-#else
-#include <stdint.h>
-#endif
-
-/*
- * Debug facilities
- */
-#define UNI_DEBUG_FACILITIES		\
-	UNI_DEBUG_DEFINE(TIMEOUT)	\
-	UNI_DEBUG_DEFINE(RESTART)	\
-	UNI_DEBUG_DEFINE(SAAL)		\
-	UNI_DEBUG_DEFINE(PARSE)		\
-	UNI_DEBUG_DEFINE(CALL)		\
-	UNI_DEBUG_DEFINE(WARN)		\
-	UNI_DEBUG_DEFINE(COORD)		\
-	UNI_DEBUG_DEFINE(API)		\
-	UNI_DEBUG_DEFINE(MSG)		\
-	UNI_DEBUG_DEFINE(ERR)		\
-	UNI_DEBUG_DEFINE(VERIFY)	\
-
-enum uni_verb {
-#define UNI_DEBUG_DEFINE(D) UNI_FAC_##D,
-	UNI_DEBUG_FACILITIES
-#undef UNI_DEBUG_DEFINE
-
-	UNI_MAXFACILITY,
-};
-
-/*
- * Default timer values and repeat counts
- */
-#define UNI_T301_DEFAULT	180000
-#define UNI_T303_DEFAULT	4000
-#define UNI_T303_CNT_DEFAULT	2
-#define UNI_T308_DEFAULT	30000
-#define UNI_T308_CNT_DEFAULT	2
-#define UNI_T309_DEFAULT	10000
-#define UNI_T310U_DEFAULT	30000
-#define UNI_T310N_DEFAULT	10000
-#define UNI_T313_DEFAULT	4000
-#define UNI_T316_DEFAULT	120000
-#define UNI_T316_CNT_DEFAULT	2
-#define UNI_T317_DEFAULT	90000
-#define UNI_T322_DEFAULT	4000
-#define UNI_T322_CNT_DEFAULT	2
-#define UNI_T397_DEFAULT	UNI_T301_DEFAULT
-#define UNI_T398_DEFAULT	4000
-#define UNI_T399U_DEFAULT	(UNI_T303_DEFAULT + UNI_T310U_DEFAULT)
-#define UNI_T399N_DEFAULT	(UNI_T303_DEFAULT + UNI_T310N_DEFAULT)
-
-/*
- * Protocol support
- */
-enum uni_proto {
-	UNIPROTO_UNI40U,	/* UNI4.0 user side */
-	UNIPROTO_UNI40N,	/* UNI4.0 network side */
-	UNIPROTO_PNNI10,	/* PNNI1.0 */
-};
-enum uni_popt {
-	UNIPROTO_GFP	= 0x0001,	/* enable GFP */
-	UNIPROTO_SB_TB	= 0x0002,	/* Coincident Sb-Tb/Tb */
-
-	UNIPROTO_ALLMASK = 0x0003,
-};
-
-/*
- * Other options
- */
-enum uni_option {
-	UNIOPT_GIT_HARD		= 0x0001,	/* harder check of GIT IE */
-	UNIOPT_BEARER_HARD	= 0x0002,	/* harder check of BEARER IE */
-	UNIOPT_CAUSE_HARD	= 0x0004,	/* harder check of CAUSE IE */
-
-	UNIOPT_ALLMASK		= 0x0007,
-};
-
-/*
- * UNI configuration
- */
-struct uni_config {
-	uint32_t	proto;		/* which protocol */
-	uint32_t	popt;		/* protocol option */
-	uint32_t	option;		/* other options */
-	uint32_t	timer301;	/* T301 */
-	uint32_t	timer303;	/* T303 */
-	uint32_t	init303;	/* T303 retransmission count */
-	uint32_t	timer308;	/* T308 */
-	uint32_t	init308;	/* T308 retransmission count */
-	uint32_t	timer309;	/* T309 */
-	uint32_t	timer310;	/* T310 */
-	uint32_t	timer313;	/* T313 */
-	uint32_t	timer316;	/* T316 */
-	uint32_t	init316;	/* T316 retransmission count */
-	uint32_t	timer317;	/* T317 */
-	uint32_t	timer322;	/* T322 */
-	uint32_t	init322;	/* T322 retransmission count */
-	uint32_t	timer397;	/* T397 */
-	uint32_t	timer398;	/* T398 */
-	uint32_t	timer399;	/* T399 */
-};
-enum uni_config_mask {
-	UNICFG_PROTO	= 0x00000001,
-	UNICFG_TIMER301	= 0x00000002,
-	UNICFG_TIMER303	= 0x00000004,
-	UNICFG_INIT303	= 0x00000008,
-	UNICFG_TIMER308	= 0x00000010,
-	UNICFG_INIT308	= 0x00000020,
-	UNICFG_TIMER309	= 0x00000040,
-	UNICFG_TIMER310	= 0x00000080,
-	UNICFG_TIMER313	= 0x00000100,
-	UNICFG_TIMER316	= 0x00000200,
-	UNICFG_INIT316	= 0x00000400,
-	UNICFG_TIMER317	= 0x00000800,
-	UNICFG_TIMER322	= 0x00001000,
-	UNICFG_INIT322	= 0x00002000,
-	UNICFG_TIMER397	= 0x00004000,
-	UNICFG_TIMER398	= 0x00008000,
-	UNICFG_TIMER399	= 0x00010000,
-
-	UNICFG_ALLMASK	= 0x0001ffff,
-};
-
-/*
- * API signals
- */
-enum uni_sig {
-	UNIAPI_ERROR			= 0,	/* UNI -> API */
-
-	UNIAPI_CALL_CREATED		= 1,	/* UNI -> API */
-	UNIAPI_CALL_DESTROYED		= 2,	/* UNI -> API */
-	UNIAPI_PARTY_CREATED		= 3,	/* UNI -> API */
-	UNIAPI_PARTY_DESTROYED		= 4,	/* UNI -> API */
-
-	UNIAPI_LINK_ESTABLISH_request	= 5,	/* API -> UNI */
-	UNIAPI_LINK_ESTABLISH_confirm	= 6,	/* UNI -> API */
-	UNIAPI_LINK_RELEASE_request	= 7,	/* API -> UNI */
-	UNIAPI_LINK_RELEASE_confirm	= 8,	/* UNI -> API */
-
-	UNIAPI_RESET_request		= 9,	/* API -> UNI */
-	UNIAPI_RESET_confirm		= 10,	/* UNI -> API */
-	UNIAPI_RESET_indication		= 11,	/* UNI -> API */
-	UNIAPI_RESET_ERROR_indication	= 12,	/* UNI -> API */
-	UNIAPI_RESET_response		= 13,	/* API -> UNI */
-	UNIAPI_RESET_ERROR_response	= 14,	/* API -> UNI */
-	UNIAPI_RESET_STATUS_indication	= 15,	/* UNI -> API */
-
-	UNIAPI_SETUP_request		= 16,	/* API -> UNI */
-	UNIAPI_SETUP_indication		= 17,	/* UNI -> API */
-	UNIAPI_SETUP_response		= 18,	/* API -> UNI */
-	UNIAPI_SETUP_confirm		= 19,	/* UNI -> API */
-	UNIAPI_SETUP_COMPLETE_indication= 20,	/* U-UNI -> API */
-	UNIAPI_SETUP_COMPLETE_request	= 46,	/* API -> N-UNI */
-	UNIAPI_ALERTING_request		= 21,	/* API -> UNI */
-	UNIAPI_ALERTING_indication	= 22,	/* UNI -> API */
-	UNIAPI_PROCEEDING_request	= 23,	/* API -> UNI */
-	UNIAPI_PROCEEDING_indication	= 24,	/* UNI -> API */
-	UNIAPI_RELEASE_request		= 25,	/* API -> UNI */
-	UNIAPI_RELEASE_indication	= 26,	/* UNI -> API */
-	UNIAPI_RELEASE_response		= 27,	/* API -> UNI */
-	UNIAPI_RELEASE_confirm		= 28,	/* UNI -> API */
-	UNIAPI_NOTIFY_request		= 29,	/* API -> UNI */
-	UNIAPI_NOTIFY_indication	= 30,	/* UNI -> API */
-	UNIAPI_STATUS_indication	= 31,	/* UNI -> API */
-	UNIAPI_STATUS_ENQUIRY_request	= 32,	/* API -> UNI */
-
-	UNIAPI_ADD_PARTY_request	= 33,	/* API -> UNI */
-	UNIAPI_ADD_PARTY_indication	= 34,	/* UNI -> API */
-	UNIAPI_PARTY_ALERTING_request	= 35,	/* API -> UNI */
-	UNIAPI_PARTY_ALERTING_indication= 36,	/* UNI -> API */
-	UNIAPI_ADD_PARTY_ACK_request	= 37,	/* API -> UNI */
-	UNIAPI_ADD_PARTY_ACK_indication	= 38,	/* UNI -> API */
-	UNIAPI_ADD_PARTY_REJ_request	= 39,	/* API -> UNI */
-	UNIAPI_ADD_PARTY_REJ_indication	= 40,	/* UNI -> API */
-	UNIAPI_DROP_PARTY_request	= 41,	/* API -> UNI */
-	UNIAPI_DROP_PARTY_indication	= 42,	/* UNI -> API */
-	UNIAPI_DROP_PARTY_ACK_request	= 43,	/* API -> UNI */
-	UNIAPI_DROP_PARTY_ACK_indication= 44,	/* UNI -> API */
-
-	UNIAPI_ABORT_CALL_request	= 45,	/* API -> UNI */
-
-	UNIAPI_MAXSIG = 47
-};
-
-struct uniapi_error {
-	uint32_t	reason;
-	uint32_t	state;
-};
-/* keep this in sync with atmapi.h:enum atmerr */
-
-#define UNIAPI_DEF_ERRORS(MACRO)					\
-	MACRO(OK, 0, "no error")					\
-	MACRO(ERROR_BAD_SIGNAL,	1, "unknown signal")			\
-	MACRO(ERROR_BADCU,	2, "signal in bad co-ordinator state")	\
-	MACRO(ERROR_BAD_CALLSTATE, 3, "signal in bad call state")	\
-	MACRO(ERROR_BAD_EPSTATE, 4, "signal in bad endpoint state")	\
-	MACRO(ERROR_BAD_ARG,	5, "bad argument")			\
-	MACRO(ERROR_BAD_CALL,	6, "unknown call reference")		\
-	MACRO(ERROR_BAD_PARTY,	7, "unknown party")			\
-	MACRO(ERROR_BAD_CTYPE,	8, "bad type of call for signal")	\
-	MACRO(ERROR_BAD_IE,	9, "bad information element")		\
-	MACRO(ERROR_EPREF_INUSE, 10, "endpoint reference already in use") \
-	MACRO(ERROR_MISSING_IE,	11, "missing information element")	\
-	MACRO(ERROR_ENCODING,	12, "error during message encoding")	\
-	MACRO(ERROR_NOMEM,	13, "out of memory")			\
-	MACRO(ERROR_BUSY,	14, "status enquiry busy")
-
-enum {
-#define DEF(NAME, VAL, STR) UNIAPI_##NAME = VAL,
-UNIAPI_DEF_ERRORS(DEF)
-#undef DEF
-};
-
-struct uniapi_call_created {
-	struct uni_cref		cref;
-};
-struct uniapi_call_destroyed {
-	struct uni_cref		cref;
-};
-struct uniapi_party_created {
-	struct uni_cref		cref;
-	struct uni_ie_epref	epref;
-};
-struct uniapi_party_destroyed {
-	struct uni_cref		cref;
-	struct uni_ie_epref	epref;
-};
-struct uniapi_abort_call_request {
-	struct uni_cref		cref;
-};
-
-struct uniapi_reset_request {
-	struct uni_ie_restart	restart;
-	struct uni_ie_connid	connid;
-};
-
-struct uniapi_reset_confirm {
-	struct uni_ie_restart	restart;
-	struct uni_ie_connid	connid;
-};
-
-struct uniapi_reset_indication {
-	struct uni_ie_restart	restart;
-	struct uni_ie_connid	connid;
-
-};
-struct uniapi_reset_error_indication {
-	uint32_t		source;		/* 0 - start, 1 - response */
-	uint32_t		reason;
-};
-
-#define UNIAPI_DEF_RESET_ERRORS(MACRO)				\
-	MACRO(UNIAPI_RESET_ERROR_NO_CONFIRM,		0,	\
-	    "no confirmation")					\
-	MACRO(UNIAPI_RESET_ERROR_NO_RESPONSE,		1,	\
-	    "no response")					\
-	MACRO(UNIAPI_RESET_ERROR_PEER_INCOMP_STATE,	2,	\
-	    "incompatible state")
-enum {
-#define DEF(NAME, VALUE, STR) NAME = VALUE,
-UNIAPI_DEF_RESET_ERRORS(DEF)
-#undef DEF
-};
-
-struct uniapi_reset_response {
-	struct uni_ie_restart	restart;
-	struct uni_ie_connid	connid;
-};
-
-struct uniapi_reset_error_response {
-	struct uni_ie_cause	cause;
-};
-
-struct uniapi_reset_status_indication {
-	struct uni_cref		cref;		/* STATUS message CREF */
-	struct uni_ie_callstate	callstate;
-	struct uni_ie_cause	cause;
-};
-
-struct uniapi_setup_request {
-	struct uni_setup	setup;
-};
-struct uniapi_setup_indication {
-	struct uni_setup	setup;
-};
-struct uniapi_setup_response {
-	struct uni_connect	connect;
-};
-struct uniapi_setup_confirm {
-	struct uni_connect	connect;
-};
-struct uniapi_setup_complete_indication {
-	struct uni_connect_ack	connect_ack;
-};
-struct uniapi_setup_complete_request {
-	struct uni_connect_ack	connect_ack;
-};
-
-struct uniapi_alerting_request {
-	struct uni_alerting	alerting;
-};
-
-struct uniapi_alerting_indication {
-	struct uni_alerting	alerting;
-};
-
-struct uniapi_proceeding_request {
-	struct uni_call_proc	call_proc;
-};
-
-struct uniapi_proceeding_indication {
-	struct uni_call_proc	call_proc;
-};
-
-
-struct uniapi_release_request {
-	struct uni_release	release;
-};
-struct uniapi_release_indication {
-	struct uni_release	release;
-};
-struct uniapi_release_response {
-	struct uni_release_compl release_compl;
-};
-/*
- * A release confirm can come from a RELEASE COMPLETE or a RELEASE.
- * Because the IEs in a RELEASE COMPLETE are a subset of a RELEASE,
- * use the RELEASE here.
- */
-struct uniapi_release_confirm {
-	struct uni_release	release;
-};
-
-struct uniapi_notify_request {
-	struct uni_notify	notify;
-};
-struct uniapi_notify_indication {
-	struct uni_notify	notify;
-};
-
-struct uniapi_status_indication {
-	struct uni_cref		cref;
-	enum uni_callstate	my_state;
-	enum uni_cause		my_cause;
-	struct uni_ie_callstate	his_state;
-	struct uni_ie_cause	his_cause;
-	struct uni_ie_epref	epref;
-	struct uni_ie_epstate	epstate;
-};
-struct uniapi_status_enquiry_request {
-	struct uni_cref		cref;
-	struct uni_ie_epref	epref;
-};
-
-struct uniapi_add_party_request {
-	struct uni_add_party	add;
-};
-struct uniapi_add_party_indication {
-	struct uni_add_party	add;
-};
-
-struct uniapi_party_alerting_request {
-	struct uni_party_alerting alert;
-};
-struct uniapi_party_alerting_indication {
-	struct uni_party_alerting alert;
-};
-
-struct uniapi_add_party_ack_request {
-	struct uni_add_party_ack ack;
-};
-struct uniapi_add_party_ack_indication {
-	struct uni_add_party_ack ack;
-};
-struct uniapi_add_party_rej_request {
-	struct uni_add_party_rej rej;
-};
-struct uniapi_add_party_rej_indication {
-	struct uni_add_party_rej rej;
-};
-
-struct uniapi_drop_party_request {
-	struct uni_drop_party	drop;
-};
-struct uniapi_drop_party_indication {
-	struct uni_drop_party	drop;
-	struct uni_ie_cause	my_cause;
-};
-
-struct uniapi_drop_party_ack_request {
-	struct uni_drop_party_ack ack;
-};
-struct uniapi_drop_party_ack_indication {
-	struct uni_drop_party	drop;
-	struct uni_ie_crankback	crankback;
-};
-
-union uniapi_all {
-	struct uniapi_error			error;
-	struct uniapi_call_created		call_created;
-	struct uniapi_call_destroyed		call_destroyed;
-	struct uniapi_party_created		party_created;
-	struct uniapi_party_destroyed		party_destroyed;
-	struct uniapi_abort_call_request	abort_call_request;
-	struct uniapi_reset_request		reset_request;
-	struct uniapi_reset_confirm		reset_confirm;
-	struct uniapi_reset_indication		reset_indication;
-	struct uniapi_reset_error_indication	reset_error_indication;
-	struct uniapi_reset_response		reset_response;
-	struct uniapi_reset_error_response	reset_error_response;
-	struct uniapi_reset_status_indication	reset_status_indication;
-	struct uniapi_setup_request		setup_request;
-	struct uniapi_setup_indication		setup_indication;
-	struct uniapi_setup_response		setup_response;
-	struct uniapi_setup_confirm		setup_confirm;
-	struct uniapi_setup_complete_indication	setup_complete_indication;
-	struct uniapi_setup_complete_request	setup_complete_request;
-	struct uniapi_alerting_request		alerting_request;
-	struct uniapi_alerting_indication	alerting_indication;
-	struct uniapi_proceeding_request	proceeding_request;
-	struct uniapi_proceeding_indication	proceeding_indication;
-	struct uniapi_release_request		release_request;
-	struct uniapi_release_indication	release_indication;
-	struct uniapi_release_response		release_response;
-	struct uniapi_release_confirm		release_confirm;
-	struct uniapi_notify_request		notify_request;
-	struct uniapi_notify_indication		notify_indication;
-	struct uniapi_status_indication		status_indication;
-	struct uniapi_status_enquiry_request	status_enquiry_request;
-	struct uniapi_add_party_request		add_party_request;
-	struct uniapi_add_party_indication	add_party_indication;
-	struct uniapi_party_alerting_request	party_alerting_request;
-	struct uniapi_party_alerting_indication	party_alerting_indication;
-	struct uniapi_add_party_ack_request	add_party_ack_request;
-	struct uniapi_add_party_ack_indication	add_party_ack_indication;
-	struct uniapi_add_party_rej_request	add_party_rej_request;
-	struct uniapi_add_party_rej_indication	add_party_rej_indication;
-	struct uniapi_drop_party_request	drop_party_request;
-	struct uniapi_drop_party_indication	drop_party_indication;
-	struct uniapi_drop_party_ack_request	drop_party_ack_request;
-	struct uniapi_drop_party_ack_indication	drop_party_ack_indication;
-};
-
-#endif
diff --git a/include.new/netnatm/sig/unisig.h b/include.new/netnatm/sig/unisig.h
deleted file mode 100644
index 22ff671..0000000
--- a/include.new/netnatm/sig/unisig.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2001-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * $Begemot: libunimsg/netnatm/sig/unisig.h,v 1.4 2004/07/08 08:22:26 brandt Exp $
- *
- * Utility functions for signalling stuff
- */
-#ifndef _NETNATM_SIG_UNISIG_H_
-#define _NETNATM_SIG_UNISIG_H_
-
-#include <netnatm/sig/unidef.h>
-
-/* names */
-const char *uni_signame(enum uni_sig);
-const char *uni_facname(enum uni_verb);
-
-/* return a string for the error code */
-const char *uni_strerr(u_int _err);
-
-/* format an API message */
-void uni_print_api(char *_buf, size_t _bufsiz, u_int _type, u_int _cookie,
-    const void *_msg, struct unicx *_cx);
-
-#endif
diff --git a/include.new/netnatm/unimsg.h b/include.new/netnatm/unimsg.h
deleted file mode 100644
index efc91c5..0000000
--- a/include.new/netnatm/unimsg.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1996-2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	All rights reserved.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- *
- * 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.
- *
- * 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.
- *
- * $Begemot: libunimsg/netnatm/unimsg.h,v 1.4 2004/07/08 08:21:46 brandt Exp $
- *
- * This defines the structure of messages as handled by this library.
- */
-#ifndef _NETNATM_UNIMSG_H_
-#define _NETNATM_UNIMSG_H_
-
-#include <sys/types.h>
-#ifdef _KERNEL
-#ifdef __FreeBSD__
-#include <sys/systm.h>
-#endif
-#include <sys/stdint.h>
-#else
-#include <string.h>
-#include <stdint.h>
-#endif
-
-struct uni_msg {
-	u_char		*b_wptr;	/* tail pointer */
-	u_char		*b_rptr;	/* head pointer */
-	u_char		*b_buf;		/* data buffer */
-	u_char		*b_lim;		/* end of data buffer */
-};
-
-/* return the current length of the message */
-#define uni_msg_len(M)		((size_t)((M)->b_wptr - (M)->b_rptr))
-
-/* return the number of space behind the message */
-#define uni_msg_space(M)	((size_t)((M)->b_lim - (M)->b_wptr))
-
-/* return the amount of leading free space */
-#define uni_msg_leading(M)	((size_t)((M)->b_rptr - (M)->b_buf))
-
-/* return the maximum size of the message (length plus free space) */
-#define uni_msg_size(M)		((size_t)((M)->b_lim - (M)->b_buf));
-
-/* ensure that there is space for another S bytes. If reallocation fails
- * free message and return -1 */
-#define uni_msg_ensure(M, S)					\
-	((uni_msg_space(M) >= (S)) ? 0 : uni_msg_extend(M, S))
-
-int uni_msg_append(struct uni_msg *, void *, size_t);
-int uni_msg_extend(struct uni_msg *, size_t);
-
-#define uni_msg_rptr(MSG, TYPE) ((TYPE)(void *)(MSG)->b_rptr)
-#define uni_msg_wptr(MSG, TYPE) ((TYPE)(void *)(MSG)->b_wptr)
-
-int uni_msg_prepend(struct uni_msg *, size_t);
-
-#ifndef _KERNEL
-
-struct uni_msg *uni_msg_alloc(size_t);
-struct uni_msg *uni_msg_build(void *, ...);
-void uni_msg_destroy(struct uni_msg *);
-u_int uni_msg_strip32(struct uni_msg *);
-u_int uni_msg_get32(struct uni_msg *);
-int uni_msg_append32(struct uni_msg *, u_int);
-int uni_msg_append8(struct uni_msg *, u_int);
-u_int uni_msg_trail32(const struct uni_msg *, int);
-struct uni_msg *uni_msg_dup(const struct uni_msg *);
-
-#endif /* _KERNEL */
-#endif
diff --git a/include.new/netncp/ncp.h b/include.new/netncp/ncp.h
deleted file mode 100644
index 74d2315..0000000
--- a/include.new/netncp/ncp.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- *  ncp.h
- */
-/*-
- *  Copyright (C) 1995 by Volker Lendecke
- *  New version derived from original ncp.h, 1998 Boris Popov
- *
- * $FreeBSD: src/sys/netncp/ncp.h,v 1.7 2005/01/07 01:45:48 imp Exp $
- */
-
-#ifndef _NETNCP_NCP_H_
-#define _NETNCP_NCP_H_
-
-#define NCP_VERMAJ	1
-#define NCP_VERMIN	3500
-#define NCP_VERSION	(NCP_VERMAJ*100000 + NCP_VERMIN)
-
-typedef uint32_t	nwdirent;
-
-typedef char		nstr8;
-typedef	nstr8*		pnstr8;
-typedef u_int8_t	nuint8;
-typedef u_int8_t*	pnuint8;
-typedef u_int16_t	nuint16;
-typedef	nuint16*	pnuint16;
-typedef uint32_t	nuint32;
-typedef	nuint32*	pnuint32;
-
-
-#define NCP_DEFAULT_BUFSIZE 	1024
-#define NCP_MAX_BUFSIZE		1024
-#define NCP_MAX_PACKET_SIZE 	4070
-#define	NCP_MAXUSERNAMELEN	255
-#define	NCP_MAXPASSWORDLEN	255
-#define NCP_MAXPATHLEN		255
-#define NCP_MAX_FILENAME 	14
-#define NCP_FILE_ID_LEN		6
-
-#define NCP_BINDERY_USER	0x0001
-#define NCP_BINDERY_UGROUP	0x0002
-#define NCP_BINDERY_PQUEUE	0x0003
-#define NCP_BINDERY_FSERVER	0x0004
-#define NCP_BINDERY_PSERVER	0x0007
-#define NCP_BINDERY_NAME_LEN	48
-
-/* Handle Flags */
-#define	NCP_HF_DIRSHORT		0		/* short directory handle */
-#define	NCP_HF_DIRBASE		1		/* directory base */
-#define	NCP_HF_NONE		0xff		/* no handle or dirbase */
-
-/* Options to negotiate */
-#define	NCP_IPX_CHECKSUM		1
-#define	NCP_SECURITY_LEVEL_SIGN_HEADERS	2
-
-#ifndef NWCONN_HANDLE
-#define NWCONN_HANDLE   unsigned int
-#define pNWCONN_HANDLE  (unsigned int*)
-#define NWCONN_NUM      u_int16_t
-#define NWCCODE         unsigned int
-#define NWDIR_HANDLE    u_int8_t
-#define NWFILE_HANDLE   int
-#endif
-
-struct ncp_fh_s {
-	u_int16_t val1; 
-	union {
-		uint32_t val32;
-		u_int16_t val16;
-	} val;
-} __packed;
-
-typedef	struct ncp_fh_s ncp_fh;
-
-typedef struct ncpfid_s {
-	nwdirent	f_parent;
-	nwdirent	f_id;
-} ncpfid;
-
-/* -- Bindery properties -- */
-struct ncp_bindery_object {
-	uint32_t	object_id;
-	u_int16_t	object_type;
-	u_int8_t	object_name[NCP_BINDERY_NAME_LEN];
-	u_int8_t	object_flags;
-	u_int8_t	object_security;
-	u_int8_t	object_has_prop;
-};
-
-struct nw_property {
-	u_int8_t	value[128];
-	u_int8_t	more_flag;
-	u_int8_t	property_flag;
-};
-
-struct ncp_filesearch_info {
-	u_int8_t	volume_number;
-	u_int16_t	directory_id;
-	u_int16_t	sequence_no;
-	u_int8_t	access_rights;
-};
-
-
-struct ncp_file_info {
-	u_int8_t	file_id[NCP_FILE_ID_LEN];
-	char		file_name[NCP_MAX_FILENAME + 1];
-	u_int8_t	file_attributes;
-	u_int8_t	file_mode;
-	uint32_t	file_length;
-	u_int16_t	creation_date;
-	u_int16_t	access_date;
-	u_int16_t	update_date;
-	u_int16_t	update_time;
-};
-
-struct nw_queue_job_entry {
-	u_int16_t	InUse;
-	uint32_t	prev;
-	uint32_t	next;
-	uint32_t	ClientStation;
-	uint32_t	ClientTask;
-	uint32_t	ClientObjectID;
-	uint32_t	TargetServerID;
-	u_int8_t	TargetExecTime[6];
-	u_int8_t	JobEntryTime[6];
-	uint32_t	JobNumber;
-	u_int16_t	JobType;
-	u_int16_t	JobPosition;
-	u_int16_t	JobControlFlags;
-	u_int8_t	FileNameLen;
-	char		JobFileName[13];
-	uint32_t	JobFileHandle;
-	uint32_t	ServerStation;
-	uint32_t	ServerTaskNumber;
-	uint32_t	ServerObjectID;
-	char		JobTextDescription[50];
-	char		ClientRecordArea[152];
-} __packed;
-
-struct queue_job {
-	struct nw_queue_job_entry j;
-	ncp_fh file_handle;
-};
-
-#define QJE_OPER_HOLD	0x80
-#define QJE_USER_HOLD	0x40
-#define QJE_ENTRYOPEN	0x20
-#define QJE_SERV_RESTART    0x10
-#define QJE_SERV_AUTO	    0x08
-
-/* ClientRecordArea for print jobs */
-
-#define   KEEP_ON        0x0400
-#define   NO_FORM_FEED   0x0800
-#define   NOTIFICATION   0x1000
-#define   DELETE_FILE    0x2000
-#define   EXPAND_TABS    0x4000
-#define   PRINT_BANNER   0x8000
-
-struct print_job_record {
-	u_int8_t	Version;
-	u_int8_t	TabSize;
-	u_int16_t	Copies;
-	u_int16_t	CtrlFlags;
-	u_int16_t	Lines;
-	u_int16_t	Rows;
-	char		FormName[16];
-	u_int8_t	Reserved[6];
-	char		BannerName[13];
-	char		FnameBanner[13];
-	char		FnameHeader[14];
-	char		Path[80];
-} __packed;
-
-struct ncp_station_addr {
-	uint32_t	NetWork;
-	u_int8_t	Node[6];
-	u_int16_t	Socket;
-} __packed;
-
-struct ncp_prop_login_control {
-	u_int8_t	AccountExpireDate[3];
-	u_int8_t	Disabled;
-	u_int8_t	PasswordExpireDate[3];
-	u_int8_t	GraceLogins;
-	u_int16_t	PasswordExpireInterval;
-	u_int8_t	MaxGraceLogins;
-	u_int8_t	MinPasswordLength;
-	u_int16_t	MaxConnections;
-	u_int8_t	ConnectionTimeMask[42];
-	u_int8_t	LastLogin[6];
-	u_int8_t	RestrictionMask;
-	u_int8_t	reserved;
-	uint32_t	MaxDiskUsage;
-	u_int16_t	BadLoginCount;
-	uint32_t	BadLoginCountDown;
-	struct ncp_station_addr LastIntruder;
-} __packed;
-
-#define NCP_VOLNAME_LEN (16)
-#define NCP_NUMBER_OF_VOLUMES (64)
-struct ncp_volume_info {
-	uint32_t total_blocks;
-	uint32_t free_blocks;
-	uint32_t purgeable_blocks;
-	uint32_t not_yet_purgeable_blocks;
-	uint32_t total_dir_entries;
-	uint32_t available_dir_entries;
-	u_int8_t sectors_per_block;
-	char volume_name[NCP_VOLNAME_LEN + 1];
-};
-/*
- * Name space constants, taken from NDK
- */
-#define aRONLY     (ntohl(0x01000000))
-#define aHIDDEN    (ntohl(0x02000000))
-#define aSYSTEM    (ntohl(0x04000000))
-#define aEXECUTE   (ntohl(0x08000000))
-#define aDIR       (ntohl(0x10000000))
-#define aARCH      (ntohl(0x20000000))
-
-/* Defines for Name Spaces */
-#define NW_NS_DOS     0
-#define NW_NS_MAC     1
-#define NW_NS_NFS     2
-#define NW_NS_FTAM    3
-#define NW_NS_OS2     4
-
-/* for _ScanNSEntryInfo */
-#define	IM_NAME			0x00000001
-#define	IM_SPACE_ALLOCATED	0x00000002
-#define IM_ATTRIBUTES		0x00000004
-#define IM_SIZE			0x00000008
-#define IM_TOTAL_SIZE		0x00000010
-#define IM_EA			0x00000020
-#define IM_ARCHIVE		0x00000040
-#define IM_MODIFY		0x00000080
-#define IM_CREATION		0x00000100
-#define IM_OWNING_NAMESPACE	0x00000200
-#define IM_DIRECTORY		0x00000400
-#define IM_RIGHTS		0x00000800
-#define	IM_ALMOST_ALL		0x00000FED
-#define IM_ALL			0x00000FFF
-#define	IM_REFERENCE_ID		0x00001000
-#define	IM_NS_ATTRIBUTES	0x00002000
-#define IM_COMPRESSED_INFO	0x80000000UL
-
-/* open/create modes */
-#define OC_MODE_OPEN		0x01
-#define OC_MODE_TRUNCATE	0x02
-#define OC_MODE_REPLACE		0x02
-#define OC_MODE_CREATE		0x08
-
-/* open/create results */
-#define OC_ACTION_NONE		0x00
-#define OC_ACTION_OPEN		0x01
-#define OC_ACTION_CREATE	0x02
-#define OC_ACTION_TRUNCATE	0x04
-#define OC_ACTION_REPLACE	0x04
-
-/* renameFlag in NSRename */
-#define	NW_TYPE_FILE		0x8000
-#define	NW_TYPE_SUBDIR		0x0010
-
-#define	NW_NAME_CONVERT		0x0003	/* don't report error and set comp mode */
-#define	NW_NO_NAME_CONVERT	0x0004	/* only in specified name space */
-
-/* search attributes */
-#ifndef SA_HIDDEN
-#define SA_NORMAL         0x0000
-#define SA_HIDDEN         0x0002
-#define SA_SYSTEM         0x0004
-#define SA_SUBDIR_ONLY    0x0010
-#define SA_SUBDIR_FILES   0x8000
-#define SA_ALL            0x8006
-#endif
-
-/* access rights attributes */
-#ifndef AR_READ
-#define AR_READ			0x0001
-#define AR_WRITE		0x0002
-#define AR_READ_ONLY		0x0001
-#define AR_WRITE_ONLY		0x0002
-#define AR_DENY_READ		0x0004
-#define AR_DENY_WRITE		0x0008
-#define AR_COMPATIBILITY	0x0010
-#define AR_WRITE_THROUGH	0x0040
-#define AR_OPEN_COMPRESSED	0x0100
-#endif
-
-struct nw_entry_info {
-	uint32_t	spaceAlloc;
-	uint32_t	attributes;	/* LH */
-	u_int16_t	flags;		/* internal */
-	uint32_t	dataStreamSize;
-	uint32_t	totalStreamSize;
-	u_int16_t	numberOfStreams;
-	u_int16_t	creationTime;	/* LH */
-	u_int16_t	creationDate;	/* LH */
-	uint32_t	creatorID;	/* HL */
-	u_int16_t	modifyTime;	/* LH */
-	u_int16_t	modifyDate;	/* LH */
-	uint32_t	modifierID;	/* HL */
-	u_int16_t	lastAccessDate;	/* LH */
-	u_int16_t	archiveTime;	/* LH */
-	u_int16_t	archiveDate;	/* LH */
-	uint32_t	archiverID;	/* HL */
-	u_int16_t	inheritedRightsMask;	/* LH */
-	uint32_t	dirEntNum;
-	uint32_t	DosDirNum;
-	uint32_t	volNumber;
-	uint32_t	EADataSize;
-	uint32_t	EAKeyCount;
-	uint32_t	EAKeySize;
-	uint32_t	NSCreator;
-	u_int8_t	nameLen;
-	u_int8_t	entryName[256];
-} __packed;
-
-typedef struct nw_entry_info NW_ENTRY_INFO;
-
-/* modify mask - use with MODIFY_DOS_INFO structure */
-#define DM_ATTRIBUTES		0x0002L
-#define DM_CREATE_DATE		0x0004L
-#define DM_CREATE_TIME		0x0008L
-#define DM_CREATOR_ID		0x0010L
-#define DM_ARCHIVE_DATE		0x0020L
-#define DM_ARCHIVE_TIME		0x0040L
-#define DM_ARCHIVER_ID		0x0080L
-#define DM_MODIFY_DATE		0x0100L
-#define DM_MODIFY_TIME		0x0200L
-#define DM_MODIFIER_ID		0x0400L
-#define DM_LAST_ACCESS_DATE	0x0800L
-#define DM_INHERITED_RIGHTS_MASK	0x1000L
-#define DM_MAXIMUM_SPACE	0x2000L
-
-struct nw_modify_dos_info {
-	uint32_t attributes;
-	u_int16_t creationDate;
-	u_int16_t creationTime;
-	uint32_t creatorID;
-	u_int16_t modifyDate;
-	u_int16_t modifyTime;
-	uint32_t modifierID;
-	u_int16_t archiveDate;
-	u_int16_t archiveTime;
-	uint32_t archiverID;
-	u_int16_t lastAccessDate;
-	u_int16_t inheritanceGrantMask;
-	u_int16_t inheritanceRevokeMask;
-	uint32_t maximumSpace;
-}  __packed;
-
-struct nw_search_seq {
-	u_int8_t	volNumber;
-	uint32_t	dirNumber;
-	uint32_t	searchDirNumber;
-}  __packed;
-
-typedef struct nw_search_seq SEARCH_SEQUENCE;
-
-struct ncp_file_server_info {
-	u_int8_t	ServerName[48];
-	u_int8_t	FileServiceVersion;
-	u_int8_t	FileServiceSubVersion;
-	u_int16_t	MaximumServiceConnections;
-	u_int16_t	ConnectionsInUse;
-	u_int16_t	NumberMountedVolumes;
-	u_int8_t	Revision;
-	u_int8_t	SFTLevel;
-	u_int8_t	TTSLevel;
-	u_int16_t	MaxConnectionsEverUsed;
-	u_int8_t	AccountVersion;
-	u_int8_t	VAPVersion;
-	u_int8_t	QueueVersion;
-	u_int8_t	PrintVersion;
-	u_int8_t	VirtualConsoleVersion;
-	u_int8_t	RestrictionLevel;
-	u_int8_t	InternetBridge;
-	u_int8_t	Reserved[60];
-} __packed;
-
-struct nw_time_buffer {
-	u_int8_t	year;
-	u_int8_t	month;
-	u_int8_t	day;
-	u_int8_t	hour;
-	u_int8_t	minute;
-	u_int8_t	second;
-	u_int8_t	wday;
-} __packed;
-
-#endif /*_NCP_H_ */
diff --git a/include.new/netncp/ncp_cfg.h b/include.new/netncp/ncp_cfg.h
deleted file mode 100644
index 748af5a..0000000
--- a/include.new/netncp/ncp_cfg.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* 
- * static configuration for libncp
- *
- * $FreeBSD: src/sys/netncp/ncp_cfg.h,v 1.1 1999/10/12 11:56:38 bp Exp $
- */
-
-#define NCP_NLS_KOI2CP866
-#define NCP_NLS_DEFAULT NCP_NLS_KOI_866
-#define NCP_PREFIX	""
diff --git a/include.new/netncp/ncp_conn.h b/include.new/netncp/ncp_conn.h
deleted file mode 100644
index 26e7b4a..0000000
--- a/include.new/netncp/ncp_conn.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_conn.h,v 1.12 2005/01/07 01:45:48 imp Exp $
- */
-#ifndef _NETNCP_NCP_CONN_H_
-#define _NETNCP_NCP_CONN_H_
-
-#ifndef _NETINET_IN_H_
-#include <netinet/in.h>
-#endif
-
-#ifndef _NETIPX_IPX_H_
-#include <netipx/ipx.h>
-#endif
-
-#ifndef _SYS_SOCKET_H_
-#include <sys/socket.h>
-#endif
-
-/* type of transport we use */
-/*#define	NCP_ON_IPX	0
-#define	NCP_ON_TCP	1*/
-
-/* flags field in conn structure */
-#define	NCPFL_SOCONN		0x0001	/* socket layer is up */
-#define	NCPFL_ATTACHED		0x0002	/* ncp layer is up */
-#define	NCPFL_LOGGED		0x0004	/* logged in to server */
-#define NCPFL_INVALID		0x0008	/* last request was not completed */
-#define	NCPFL_INTR		0x0010	/* interrupted call */
-#define	NCPFL_RESTORING		0x0020	/* trying to reconnect */
-#define	NCPFL_PERMANENT		0x0040	/* no way to kill conn, when this set */
-#define	NCPFL_PRIMARY		0x0080	/* have meaning only for owner */
-#define	NCPFL_WASATTACHED	0x0100	/* there was at least one successfull connect */
-#define	NCPFL_WASLOGGED		0x0200	/* there was at least one successfull login */
-#define	NCPFL_SIGNACTIVE	0x1000	/* packet signing active */
-#define	NCPFL_SIGNWANTED	0x2000	/* signing should start */
-
-/* access mode for connection */
-#define	NCPM_READ		0400	/* able to fetch conn params */
-#define	NCPM_WRITE		0200	/* modify/close */
-#define	NCPM_EXECUTE		0100	/* run requests */
-
-#define	NCP_DEFAULT_OWNER	((uid_t)-1)
-#define	NCP_DEFAULT_GROUP	((uid_t)-1)
-
-
-/* args used to create connection */
-#define	ncp_conn_loginfo	ncp_conn_args
-struct ncp_conn_args {
-	int		opt;
-#define	NCP_OPT_WDOG		1	/* need watch dog socket */
-#define	NCP_OPT_MSG		2	/* need message socket */
-#define	NCP_OPT_SIGN		4	/* signatures wanted */
-#define NCP_OPT_BIND		8	/* force bindery login */
-#define NCP_OPT_PERMANENT	0x10	/* only for refernce, completly ignored */
-#define	NCP_OPT_NOUPCASEPASS	0x20	/* leave password as is */
-	int		sig_level;	/* wanted signature level */
-	char 		server[NCP_BINDERY_NAME_LEN+1];
-	char		*user;
-	char		*password;
-	uint32_t	objtype;
-	union {
-		struct sockaddr	addr;
-		struct sockaddr_ipx ipxaddr;
-		struct sockaddr_in inaddr;
-	} addr;
-	int	 	timeout;	/* ncp rq timeout */
-	int	 	retry_count;	/* counts to give an error */
-	uid_t		owner;		/* proposed owner of connection */
-	gid_t		group;		/* proposed group of connection */
-	mode_t		access_mode;	/* R/W - can do rq's, X - can see the conn */
-};
-
-#define ipxaddr		addr.ipxaddr
-#define	inaddr		addr.inaddr
-#define	saddr		addr.addr
-
-/* user side structure to issue ncp calls */
-struct ncp_buf {
-	int	rqsize;			/* request size without ncp header */
-	int	rpsize;			/* reply size minus ncp header */
-	int	cc;			/* completion code */
-	int	cs;			/* connection state */
-	char	packet[NCP_MAX_PACKET_SIZE];/* Here we prepare requests and receive replies */
-};
-
-/*
- * Connection status, returned via sysctl(vfs.nwfs.connstat)
- */
-struct ncp_conn_stat {
-	struct ncp_conn_args li;
-	int		connRef;
-	int 		ref_cnt;
-	int 		connid;
-	int		buffer_size;
-	int		flags;
-	int 		sign_active;
-	uid_t		owner;
-	gid_t		group;
-	char		user[NCP_MAXUSERNAMELEN+1];
-};
-
-#ifdef _KERNEL
-
-#ifndef LK_SHARED
-#include <sys/lockmgr.h>
-#endif
-
-struct socket;
-struct u_cred;
-
-SLIST_HEAD(ncp_conn_head,ncp_conn);
-
-struct ncp_rq;
-struct ncp_conn;
-
-/*
- * External and internal processes can reference connection only by handle.
- * This gives us a freedom in maintance of underlying connections.
- */
-struct ncp_handle {
-	SLIST_ENTRY(ncp_handle)	nh_next;
-	int		nh_id;		/* handle id */
-	struct ncp_conn*nh_conn;	/* which conn we are refernce */
-	struct thread *	nh_td;		/* who owns the handle	*/
-	int		nh_ref;		/* one process can asquire many handles, but we return the one */
-};
-
-/* 
- * Describes any connection to server 
- */
-struct ncp_conn {
-	SLIST_ENTRY(ncp_conn) nc_next;
-	struct ncp_conn_args li;
-	struct ucred 	*nc_owner;
-	gid_t		nc_group;
-	int		flags;
-	int		nc_id;
-	struct socket 	*ncp_so;
-	struct socket 	*wdg_so;
-	struct socket	*msg_so;
-	struct socket 	*bc_so;
-	int 		ref_cnt;		/* how many handles leased */
-	SLIST_HEAD(ncp_ref_hd,ncp_ref) ref_list;/* list of handles */
-	struct lock	nc_lock;		/* excl locks */
-	int		nc_lwant;		/* number of wanted locks */
-	struct thread	*td;			/* pid currently operates */
-	struct ucred	*ucred;			/* usr currently operates */
-	/* Fields used to process ncp requests */
-	int 		connid;			/* assigned by server */
-	u_int8_t	seq;
-	int		buffer_size;		/* Negotiated bufsize */
-	/* Fields used to make packet signatures */
-	uint32_t	sign_root[2];
-	uint32_t	sign_state[4];		/* md4 state */
-#ifdef NCPBURST
-	/* Fields used for packet bursting */
-	u_long		bc_pktseq;		/* raw packet sequence */
-	u_short		bc_seq;			/* burst sequence */
-	u_long		bc_locid;		/* local connection id */
-	u_long		bc_remid;		/* remote connection id */
-	u_long		bc_pktsize;		/* negotiated burst packet size */
-#endif
-};
-
-int  ncp_conn_init(void);
-int  ncp_conn_destroy(void);
-int  ncp_conn_alloc(struct ncp_conn_args *cap,
-	struct thread *td, struct ucred *cred, struct ncp_conn **connid);
-int  ncp_conn_free(struct ncp_conn *conn);
-int  ncp_conn_access(struct ncp_conn *conn,struct ucred *cred,mode_t mode);
-int  ncp_conn_lock(struct ncp_conn *conn,struct thread *td, struct ucred *cred,int mode);
-void ncp_conn_unlock(struct ncp_conn *conn,struct thread *td);
-int  ncp_conn_assert_locked(struct ncp_conn *conn,const char *checker,struct thread *td);
-void ncp_conn_invalidate(struct ncp_conn *ncp);
-int  ncp_conn_invalid(struct ncp_conn *ncp);
-/*int  ncp_conn_ref(struct ncp_conn *conn, pid_t pid);
-int  ncp_conn_rm_ref(struct ncp_conn *conn, pid_t pid, int force);
-void ncp_conn_list_rm_ref(pid_t pid);*/
-int  ncp_conn_getbyref(int connRef,struct thread *td, struct ucred *cred, int mode,
-	struct ncp_conn **connpp);
-int  ncp_conn_getbyli(struct ncp_conn_loginfo *li,struct thread *td, struct ucred *cred, 
-	int mode, struct ncp_conn **connpp);
-int  ncp_conn_setprimary(struct ncp_conn *conn, int on);
-int  ncp_conn_locklist(int flags, struct thread *td);
-void ncp_conn_unlocklist(struct thread *td);
-int  ncp_conn_gethandle(struct ncp_conn *conn, struct thread *td, struct ncp_handle **handle);
-int  ncp_conn_puthandle(struct ncp_handle *handle, struct thread *td, int force);
-int  ncp_conn_findhandle(int connHandle, struct thread *td, struct ncp_handle **handle);
-int  ncp_conn_getattached(struct ncp_conn_args *li,struct thread *td, struct ucred *cred,int mode, struct ncp_conn **connpp);
-int  ncp_conn_putprochandles(struct thread *td);
-int  ncp_conn_getinfo(struct ncp_conn *ncp, struct ncp_conn_stat *ncs);
-
-int  ncp_conn_reconnect(struct ncp_conn *ncp);
-int  ncp_conn_login(struct ncp_conn *conn, struct thread *td, struct ucred *cred);
-
-extern struct ncp_conn_head conn_list;
-extern int ncp_burst_enabled;
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_NCPDATA);
-#endif
-
-#endif /* _KERNEL */
-#endif /* _NCP_CONN_H_ */
diff --git a/include.new/netncp/ncp_file.h b/include.new/netncp/ncp_file.h
deleted file mode 100644
index f902ba3..0000000
--- a/include.new/netncp/ncp_file.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_file.h,v 1.4 2005/01/07 01:45:48 imp Exp $
- */
-
-#ifndef _NETNCP_NCP_FILE_H_
-#define _NETNCP_NCP_FILE_H_
-
-typedef struct {
-   nuint32  sequence;
-   nuint32  parent;
-   nuint32  attributes;
-   nuint8   uniqueID;
-   nuint8   flags;
-   nuint8   nameSpace;
-   nuint8   nameLength;
-   nuint8   name [256];
-   nuint32  creationDateAndTime;
-   nuint32  ownerID;
-   nuint32  lastArchiveDateAndTime;
-   nuint32  lastArchiverID;
-   nuint32  updateDateAndTime;
-   nuint32  updatorID;
-   nuint32  fileSize;
-   nuint8   reserved[44];
-   nuint16  inheritedRightsMask;
-   nuint16  lastAccessDate;
-   nuint32  deletedTime;
-   nuint32  deletedDateAndTime;
-   nuint32  deletorID;
-   nuint8   reserved3 [16];
-} __packed NWDELETED_INFO;
-
-__BEGIN_DECLS
-
-int	ncp_AllocTempDirHandle(char *, NWDIR_HANDLE *);
-int	ncp_DeallocateDirHandle(NWDIR_HANDLE);
-int	ncp_GetNSEntryInfo(NWDIR_HANDLE, struct nw_entry_info *, int *);
-
-NWCCODE	ncp_ScanNSEntryInfo(NWCONN_HANDLE, nuint8, nuint16,
-	SEARCH_SEQUENCE *, pnstr8, nuint32, NW_ENTRY_INFO *);
-
-NWCCODE ncp_PurgeDeletedFile(NWCONN_HANDLE, nuint32, nuint32, nuint32, nuint8);
-
-NWCCODE NWRecoverDeletedFile(NWCONN_HANDLE, NWDIR_HANDLE,
-	nuint32, nuint32, nuint32, pnstr8, pnstr8);
-
-NWCCODE ncp_ScanForDeletedFiles(NWCONN_HANDLE, pnuint32, pnuint32, pnuint32,
-	nuint8,	NWDELETED_INFO *);
-
-__END_DECLS
-
-#endif /* _NCP_NCP_FILE_ */
diff --git a/include.new/netncp/ncp_lib.h b/include.new/netncp/ncp_lib.h
deleted file mode 100644
index 7d49627..0000000
--- a/include.new/netncp/ncp_lib.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_lib.h,v 1.7 2005/01/07 01:45:48 imp Exp $
- */
-
-#ifndef _NETNCP_NCP_LIB_H_
-#define _NETNCP_NCP_LIB_H_
-
-#define IPX
-#define INET
-
-#include <netncp/ncp.h>
-#include <netncp/ncp_conn.h>
-#include <netncp/ncp_user.h>
-#include <netncp/ncp_rq.h>
-
-#define ncp_printf printf
-
-#define sipx_cnetwork	sipx_addr.x_net.c_net
-#define sipx_node	sipx_addr.x_host.c_host
-#define ipx_netlong(iaddr) (((union ipx_net_u *)(&((iaddr).x_net)))->long_e)
-
-#define	STDPARAM_ARGS	'A':case 'B':case 'C':case 'I':case 'M': \
-		   case 'N':case 'U':case 'R':case 'S':case 'T': \
-		   case 'W':case 'O':case 'P'
-
-#define STDPARAM_OPT	"A:BCI:M:NO:P:U:R:S:T:W:"
-
-#ifndef min
-#define	min(a,b)	(((a)<(b)) ? (a) : (b))
-#endif
-
-
-/*
- * An attempt to do a unified options parser
- */
-enum ncp_argtype {NCA_STR,NCA_INT,NCA_BOOL};
-
-struct ncp_args;
-
-typedef int ncp_setopt_t (struct ncp_args*);
-
-#define	NAFL_NONE	0x0000
-#define	NAFL_HAVEMIN	0x0001
-#define	NAFL_HAVEMAX	0x0002
-#define	NAFL_MINMAX	NAFL_HAVEMIN | NAFL_HAVEMAX
-
-struct ncp_args {
-	enum ncp_argtype at;
-	int	opt;	/* command line option */
-	char	*name;	/* rc file equiv */
-	int	flag;	/* NAFL_* */
-	int	ival;	/* int/bool values, or max len for str value */
-	char	*str;	/* string value */
-	int	min;	/* min for ival */
-	int	max;	/* max for ival */
-	ncp_setopt_t *fn;/* call back to validate */
-};
-
-typedef struct {
-  nuint8    day;
-  nuint8    month;
-  nuint16   year;
-} NW_DATE;
-
-/* hours is a nuint16  so that this structure will be the same length as a dword */
-typedef struct {
-  nuint8    seconds;
-  nuint8    minutes;
-  nuint16   hours;
-} NW_TIME;
-
-struct ncp_bitname {
-	u_int	bn_bit;
-	const char	*bn_name;
-};
-
-__BEGIN_DECLS
-
-int ncp_args_parserc(struct ncp_args *, char *, ncp_setopt_t *);
-int ncp_args_parseopt(struct ncp_args *, int, char *, ncp_setopt_t *);
-
-
-struct sockaddr_ipx;
-struct ipx_addr;
-struct sockaddr;
-struct ncp_buf;
-struct rcfile;
-
-int  ncp_initlib(void);
-int  ncp_connect(struct ncp_conn_args *, int *);
-int  ncp_connect_addr(struct sockaddr *, NWCONN_HANDLE *);
-int  ncp_disconnect(int);
-int  ncp_request(int, int, struct ncp_buf *);
-int  ncp_conn_request(int, struct ncp_buf *);
-int  ncp_login(int, const char *, int, const char *);
-int  ncp_conn_scan(struct ncp_conn_loginfo *, int *);
-int  ncp_conn_cnt(void);
-void *ncp_conn_list(void);
-int  ncp_conn_getinfo(int, struct ncp_conn_stat *);
-int  ncp_conn_getuser(int, char **);
-int  ncp_conn2ref(int, int *);
-int  ncp_conn_dup(NWCONN_HANDLE, NWCONN_HANDLE *);
-int  ncp_path2conn(char *, int *);
-int  ncp_li_init(struct ncp_conn_loginfo *, int, char *[]);
-void ncp_li_done(struct ncp_conn_loginfo *);
-int  ncp_li_login(struct ncp_conn_loginfo *, int *);
-int  ncp_li_readrc(struct ncp_conn_loginfo *);
-int  ncp_li_check(struct ncp_conn_loginfo *);
-int  ncp_li_arg(struct ncp_conn_loginfo *, int, char *);
-int  ncp_li_setserver(struct ncp_conn_loginfo *, const char *);
-int  ncp_li_setuser(struct ncp_conn_loginfo *, char *);
-int  ncp_li_setpassword(struct ncp_conn_loginfo *, const char *);
-int  ncp_conn_setflags(int, u_int16_t, u_int16_t);
-int  ncp_conn_find(char *, char *);
-NWCCODE NWRequest(NWCONN_HANDLE, nuint16, nuint16, NW_FRAGMENT *,
-    nuint16, NW_FRAGMENT *);
-
-#define ncp_setpermanent(connHandle,on)	ncp_conn_setflags(connHandle, NCPFL_PERMANENT, (on) ? NCPFL_PERMANENT : 0)
-#define ncp_setprimary(connHandle,on)	ncp_conn_setflags(connHandle, NCPFL_PRIMARY, (on) ? NCPFL_PRIMARY : 0)
-
-int  ncp_find_fileserver(struct ncp_conn_loginfo *, int, char *);
-int  ncp_find_server(struct ncp_conn_loginfo *, int, int, char *);
-
-/* misc rotines */
-char* ncp_str_upper(char *);
-int  ncp_open_rcfile(void);
-int  ncp_getopt(int, char * const *, const char *);
-void NWUnpackDateTime(nuint32, NW_DATE *, NW_TIME *);
-void NWUnpackDate(nuint16, NW_DATE *);
-void NWUnpackTime(nuint16, NW_TIME *);
-time_t ncp_UnpackDateTime(nuint32);
-int  ncp_GetFileServerDateAndTime(NWCONN_HANDLE, time_t *);
-int  ncp_SetFileServerDateAndTime(NWCONN_HANDLE, time_t *);
-NWCCODE NWDownFileServer(NWCONN_HANDLE, int);
-NWCCODE NWCloseBindery(NWCONN_HANDLE);
-NWCCODE NWOpenBindery(NWCONN_HANDLE);
-NWCCODE NWDisableTTS(NWCONN_HANDLE);
-NWCCODE NWEnableTTS(NWCONN_HANDLE);
-NWCCODE NWDisableFileServerLogin(NWCONN_HANDLE);
-NWCCODE NWEnableFileServerLogin(NWCONN_HANDLE);
-void ncp_error(const char *, int, ...) __printf0like(1, 3);
-char *ncp_printb(char *, int, const struct ncp_bitname *);
-void nw_keyhash(const u_char *, const u_char *, int, u_char *);
-void nw_encrypt(const u_char *, const u_char *, u_char *);
-void ipx_print_addr(struct ipx_addr *);
-
-/* bindery calls */
-int  ncp_get_bindery_object_id(NWCONN_HANDLE, u_int16_t, const char *,
-		struct ncp_bindery_object *);
-int  ncp_get_bindery_object_name(NWCONN_HANDLE, uint32_t,
-		struct ncp_bindery_object *);
-int  ncp_scan_bindery_object(NWCONN_HANDLE, uint32_t, u_int16_t, 
-		char *, struct ncp_bindery_object *);
-int  ncp_read_property_value(NWCONN_HANDLE, int object_type, const char *,
-		int, const char *, struct nw_property *);
-int  ncp_get_encryption_key(NWCONN_HANDLE, char *);
-int  ncp_change_obj_passwd(NWCONN_HANDLE, 
-	const struct ncp_bindery_object *, const u_char *,
-	const u_char *, const u_char *);
-int  ncp_keyed_verify_password(NWCONN_HANDLE, char *, char *,
-		struct ncp_bindery_object *);
-
-/* queue calls */
-int  ncp_create_queue_job_and_file(NWCONN_HANDLE, uint32_t, struct queue_job *);
-int  ncp_close_file_and_start_job(NWCONN_HANDLE, uint32_t, struct queue_job *);
-int  ncp_attach_to_queue(NWCONN_HANDLE, uint32_t);
-int  ncp_detach_from_queue(NWCONN_HANDLE, uint32_t);
-int  ncp_service_queue_job(NWCONN_HANDLE, uint32_t, u_int16_t,
-		struct queue_job *);
-int  ncp_finish_servicing_job(NWCONN_HANDLE, uint32_t, uint32_t, uint32_t);
-int  ncp_abort_servicing_job(NWCONN_HANDLE, uint32_t, uint32_t);
-int  ncp_get_queue_length(NWCONN_HANDLE, uint32_t, uint32_t *);
-int  ncp_get_queue_job_ids(NWCONN_HANDLE, uint32_t, uint32_t,
-		uint32_t *, uint32_t *, uint32_t []);
-int  ncp_get_queue_job_info(NWCONN_HANDLE, uint32_t, uint32_t,
-		struct nw_queue_job_entry *);
-/*
- * filesystem and volume calls 
- */
-int  ncp_read(NWCONN_HANDLE, ncp_fh *, off_t, size_t, char *);
-int  ncp_write(NWCONN_HANDLE, ncp_fh *, off_t, size_t, char *);
-int  ncp_geteinfo(char *, struct nw_entry_info *);
-int  ncp_NSEntryInfo(NWCONN_HANDLE, nuint8, nuint8, nuint32, NW_ENTRY_INFO *);
-
-NWCCODE NWGetVolumeName(NWCONN_HANDLE, u_char, char *);
-
-/* misc ncp calls */
-int  ncp_get_file_server_information(NWCONN_HANDLE, struct ncp_file_server_info *);
-int  ncp_get_stations_logged_info(NWCONN_HANDLE, uint32_t,
-		struct ncp_bindery_object *, time_t *);
-int  ncp_get_internet_address(NWCONN_HANDLE, uint32_t, struct ipx_addr *,
-		u_int8_t *);
-NWCCODE NWGetObjectConnectionNumbers(NWCONN_HANDLE, pnstr8, nuint16,
-		pnuint16, pnuint16, nuint16);
-/*
- * Message broadcast
- */
-NWCCODE NWDisableBroadcasts(NWCONN_HANDLE);
-NWCCODE	NWEnableBroadcasts(NWCONN_HANDLE);
-NWCCODE	NWBroadcastToConsole(NWCONN_HANDLE, pnstr8);
-NWCCODE NWSendBroadcastMessage(NWCONN_HANDLE, pnstr8, nuint16, pnuint16, pnuint8);
-NWCCODE NWGetBroadcastMessage(NWCONN_HANDLE, pnstr8);
-
-/*
- * RPC calls
- */
-NWCCODE	NWSMExecuteNCFFile(NWCONN_HANDLE, pnstr8);
-NWCCODE	NWSMLoadNLM(NWCONN_HANDLE, pnstr8);
-NWCCODE NWSMUnloadNLM(NWCONN_HANDLE, pnstr8);
-NWCCODE NWSMMountVolume(NWCONN_HANDLE, pnstr8, nuint32 *);
-NWCCODE NWSMDismountVolumeByName(NWCONN_HANDLE, pnstr8);
-NWCCODE NWSMSetDynamicCmdIntValue(NWCONN_HANDLE, pnstr8, nuint32);
-NWCCODE NWSMSetDynamicCmdStrValue(NWCONN_HANDLE, pnstr8, pnstr8);
-
-__END_DECLS
-
-extern int ncp_opterr, ncp_optind, ncp_optopt, ncp_optreset;
-extern char *ncp_optarg;
-
-extern struct rcfile *ncp_rc;
-extern int sysentoffset;
-#endif /* _NETNCP_NCP_LIB_H_ */
diff --git a/include.new/netncp/ncp_ncp.h b/include.new/netncp/ncp_ncp.h
deleted file mode 100644
index 98837e0..0000000
--- a/include.new/netncp/ncp_ncp.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_ncp.h,v 1.8 2005/01/07 01:45:48 imp Exp $
- */
-#ifndef _NETNCP_NCP_NCP_H_
-#define _NETNCP_NCP_NCP_H_
-
-#define NCP_ALLOC_SLOT		0x1111
-#define NCP_REQUEST		0x2222
-#define NCP_REPLY		0x3333
-#define NCP_FREE_SLOT		0x5555
-#define	NCP_PACKET_BURST	0x7777
-#define NCP_POSITIVE_ACK	0x9999
-
-/*
- * Bits for connection state field in ncp_rphdr
- */
-#define	NCP_CS_BAD_CONN		0x01	/* no such connection */
-#define	NCP_CS_NO_SLOTS		0x04	/* no connection slots available */
-#define	NCP_CS_SERVER_DOWN	0x10	/* server in down state */
-#define	NCP_CS_HAVE_BROADCAST	0x40	/* server holds broadcast for us */
-
-#define NCP_RETRY_COUNT		5
-#define	NCP_RETRY_TIMEOUT	10
-#define	NCP_RESTORE_COUNT	2	/* how many times try to restore per 
-					 * single request, should be an _even_ */
-
-struct ncp_rqhdr {
-	u_int16_t type;
-	u_int8_t  seq;
-	u_int8_t  conn_low;
-	u_int8_t  task;
-	u_int8_t  conn_high;
-	u_int8_t  fn;
-	u_int8_t  data[0];
-} __packed;
-
-
-struct ncp_rphdr {
-	u_int16_t	type;
-	u_int8_t	seq;
-	u_int8_t	conn_low;
-	u_int8_t	task;
-	u_int8_t	conn_high;
-	u_int8_t	completion_code;
-	u_int8_t	connection_state;
-	u_int8_t	data[0];
-}__packed;
-
-#define	BFL_ABT		0x04
-#define	BFL_EOB		0x10
-#define	BFL_SYS		0x80
-
-#define	BOP_READ	1L
-#define	BOP_WRITE	2L
-
-#define	BERR_NONE	0
-#define	BERR_INIT	1
-#define	BERR_IO		2
-#define	BERR_NODATA	3
-#define	BERR_WRITE	4
-
-struct ncp_bursthdr {
-	u_short	bh_type;
-	u_char	bh_flags;
-	u_char	bh_streamtype;
-	u_long	bh_srcid;
-	u_long	bh_dstid;
-	u_long	bh_seq;			/* HL */
-	u_long	bh_send_delay;		/* HL */
-	u_short	bh_bseq;		/* HL */
-	u_short	bh_aseq;		/* HL */
-	u_long	bh_blen;		/* HL */
-	u_long	bh_dofs;		/* HL */
-	u_short	bh_dlen;		/* HL */
-	u_short	bh_misfrags;		/* HL */
-} __packed;
-
-struct ncp_conn;
-struct ncp_conn_args;
-struct ncp_rq;
-struct ucred;
-
-int  ncp_ncp_connect(struct ncp_conn *conn);
-int  ncp_ncp_disconnect(struct ncp_conn *conn);
-int  ncp_negotiate_buffersize(struct ncp_conn *conn, int size, int *target);
-int  ncp_renegotiate_connparam(struct ncp_conn *conn, int buffsize,
-	u_int8_t in_options);
-int  ncp_get_bindery_object_id(struct ncp_conn *conn, 
-		u_int16_t object_type, char *object_name, 
-		struct ncp_bindery_object *target,
-		struct thread *td,struct ucred *cred);
-int  ncp_get_encryption_key(struct ncp_conn *conn, char *target);
-int  ncp_login_encrypted(struct ncp_conn *conn,
-	struct ncp_bindery_object *object,
-	const u_char *key, const u_char *passwd,
-	struct thread *td, struct ucred *cred);
-int ncp_login_unencrypted(struct ncp_conn *conn, u_int16_t object_type, 
-	const char *object_name, const u_char *passwd,
-	struct thread *td, struct ucred *cred);
-int  ncp_read(struct ncp_conn *conn, ncp_fh *file, struct uio *uiop, struct ucred *cred);
-int  ncp_write(struct ncp_conn *conn, ncp_fh *file, struct uio *uiop, struct ucred *cred);
-
-#endif /* _NCP_NCP_H_ */
diff --git a/include.new/netncp/ncp_nls.h b/include.new/netncp/ncp_nls.h
deleted file mode 100644
index 5110702..0000000
--- a/include.new/netncp/ncp_nls.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_nls.h,v 1.7 2005/01/07 01:45:49 imp Exp $
- */
-#ifndef _NETNCP_NCP_NLS_H_
-#define _NETNCP_NCP_NLS_H_
-
-/* options for handle path & caseopt in mount struct */
-#define NWHP_HDB	0x01	/* have dir base */
-#define	NWHP_UPPER	0x02	/* local names has upper case */
-#define	NWHP_LOWER	0x04	/* --"-- lower case */
-#define	NWHP_DOS	0x08	/* using dos name space */
-#define	NWHP_NLS	0x10	/* do name translation via tables, any nmspc */
-#define	NWHP_NOSTRICT	0x20	/* pretend to be a case insensitive */
-
-struct ncp_nlstables {
-	u_char	*to_lower;	/* local charset to lower case */
-	u_char	*to_upper;	/* local charset to upper case */
-	u_char	*n2u;		/* NetWare to Unix */
-	u_char	*u2n;
-	int	opt;		/* may depend on context */
-};
-
-#ifndef _KERNEL
-/*
- * NLS, supported character conversion schemes.
- * NCP_NLS_UNIXCHARSET_NETWARECHARSET
- */
-#define	NCP_NLS_AS_IS		1
-#define	NCP_NLS_AS_IS_NAME	"asis"
-#define	NCP_NLS_KOI_866		2
-#define	NCP_NLS_SE		3
-#define	NCP_NLS_KOI_866_NAME	"koi2cp866"
-#define	NCP_NLS_SE_NAME		"se"
-
-extern struct ncp_nlstables ncp_nls;	/* active nls */
-
-__BEGIN_DECLS
-
-int   ncp_nls_setrecode(int scheme);
-int   ncp_nls_setrecodebyname(char *name);
-int   ncp_nls_setlocale(char *name);
-char* ncp_nls_str_n2u(char *dst, const char *src);
-char* ncp_nls_str_u2n(char *dst, const char *src);
-char* ncp_nls_mem_n2u(char *dst, const char *src, int size);
-char* ncp_nls_mem_u2n(char *dst, const char *src, int size);
-
-__END_DECLS
-
-#else /* !_KERNEL */
-
-
-extern struct ncp_nlstables ncp_defnls;
-
-void ncp_str_upper(char *name);
-void ncp_str_lower(char *name);
-void ncp_pathcopy(const char *src, char *dst, int len, struct ncp_nlstables *nt);
-int  ncp_pathcheck(char *s, int len, struct ncp_nlstables *nt, int strict);
-void ncp_path2unix(char *src, char *dst, int len, struct ncp_nlstables *nt);
-
-#endif /* !_KERNEL */
-
-#endif /* _NCP_NCP_NLS_H_ */
diff --git a/include.new/netncp/ncp_rcfile.h b/include.new/netncp/ncp_rcfile.h
deleted file mode 100644
index daa09fd..0000000
--- a/include.new/netncp/ncp_rcfile.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_rcfile.h,v 1.5 2005/01/07 01:45:49 imp Exp $
- */
-#ifndef _NETNCP_NCP_RCFILE_H_
-#define _NETNCP_NCP_RCFILE_H_
-#include <sys/queue.h>
-
-struct rckey {
-	SLIST_ENTRY(rckey)	rk_next;
-	char 			*rk_name;
-	char			*rk_value;
-};
-
-struct rcsection {
-	SLIST_ENTRY(rcsection)	rs_next;
-	SLIST_HEAD(rckey_head,rckey) rs_keys;
-	char			*rs_name;
-};
-    
-struct rcfile {
-	SLIST_ENTRY(rcfile)	rf_next;
-	SLIST_HEAD(rcsec_head, rcsection) rf_sect;
-	char			*rf_name;
-	FILE			*rf_f;
-};
-
-__BEGIN_DECLS
-
-int  rc_open(char *, char *,struct rcfile **);
-int  rc_close(struct rcfile *);
-int  rc_getstringptr(struct rcfile *, char *, char *, char **);
-int  rc_getstring(struct rcfile *, char *, char *, int, char *);
-int  rc_getint(struct rcfile *, char *, char *, int *);
-int  rc_getbool(struct rcfile *, char *, char *, int *);
-
-__END_DECLS
-
-#endif	/* _NETNCP_NCP_RCFILE_H_ */
diff --git a/include.new/netncp/ncp_rq.h b/include.new/netncp/ncp_rq.h
deleted file mode 100644
index 3c7ed07..0000000
--- a/include.new/netncp/ncp_rq.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_rq.h,v 1.9 2005/01/07 01:45:49 imp Exp $
- */
-#ifndef _NETNCP_NCP_RQ_H_
-#define _NETNCP_NCP_RQ_H_
-
-#include <sys/endian.h>
-
-#define getb(buf,ofs) 		(((const u_int8_t *)(buf))[ofs])
-#define setb(buf,ofs,val)	(((u_int8_t*)(buf))[ofs])=val
-#define getbw(buf,ofs)		((u_int16_t)(getb(buf,ofs)))
-
-#define	getwle(buf,ofs) (le16toh(*((u_int16_t*)(&((u_int8_t*)(buf))[ofs]))))
-#define	getdle(buf,ofs) (le32toh(*((uint32_t*)(&((u_int8_t*)(buf))[ofs]))))
-#define	getwbe(buf,ofs) (be16toh(*((u_int16_t*)(&((u_int8_t*)(buf))[ofs]))))
-#define	getdbe(buf,ofs) (be32toh(*((uint32_t*)(&((u_int8_t*)(buf))[ofs]))))
-
-#define	setwle(buf,ofs,val) \
-	(*((u_int16_t*)(&((u_int8_t*)(buf))[ofs])))=htole16(val)
-#define	setdle(buf,ofs,val) \
-	(*((uint32_t*)(&((u_int8_t*)(buf))[ofs])))=htole32(val)
-#define	setwbe(buf,ofs,val) \
-	(*((u_int16_t*)(&((u_int8_t*)(buf))[ofs])))=htobe16(val)
-#define	setdbe(buf,ofs,val) \
-	(*((uint32_t*)(&((u_int8_t*)(buf))[ofs])))=htobe32(val)
-
-#ifdef _KERNEL
-
-#include <sys/mchain.h>
-
-#define	NCPR_ALLOCED		0x0001	/* request structure was allocated */
-#define	NCPR_DONTFREEONERR	0x0002	/* do not free structure on error */
-
-/* 
- * Structure to prepare ncp request and receive reply 
- */
-struct ncp_rq {
-	int		nr_flags;
-	struct mbchain	rq;
-	struct mdchain	rp;
-	int		nr_minrplen;	/* minimal rp size (-1 if not known) */
-	int		nr_rpsize;	/* reply size minus ncp header */
-	int		nr_cc;		/* completion code */
-	int		nr_cs;		/* connection state */
-	struct thread *	nr_td;		/* thread that did rq */
-	struct ucred *	nr_cred;	/* user that did rq */
-	int		rexmit;
-	struct ncp_conn*nr_conn;	/* back link */
-};
-
-int  ncp_rq_alloc(u_int8_t fn, struct ncp_conn *ncp, struct thread *td,
-	struct ucred *cred, struct ncp_rq **rqpp);
-int  ncp_rq_alloc_any(uint32_t ptype, u_int8_t fn, struct ncp_conn *ncp,
-	struct thread *td,	struct ucred *cred, struct ncp_rq **rqpp);
-int  ncp_rq_alloc_subfn(u_int8_t fn, u_int8_t subfn, struct ncp_conn *ncp,
-	struct thread *td,	struct ucred *cred, struct ncp_rq **rqpp);
-int  ncp_rq_init_any(struct ncp_rq *rqp, uint32_t ptype, u_int8_t fn,
-	struct ncp_conn *ncp, 
-	struct thread *td, struct ucred *cred);
-void ncp_rq_done(struct ncp_rq *rqp);
-int  ncp_request(struct ncp_rq *rqp);
-int  ncp_request_int(struct ncp_rq *rqp);
-
-struct ncp_nlstables;
-
-int  ncp_rq_pathstring(struct ncp_rq *rqp, int size, const char *name, struct ncp_nlstables*);
-int  ncp_rq_dbase_path(struct ncp_rq *, u_int8_t vol_num,
-		    uint32_t dir_base, int namelen, u_char *name, struct ncp_nlstables *nt);
-int  ncp_rq_pstring(struct ncp_rq *rqp, const char *s);
-
-void ncp_sign_init(const char *logindata, char *sign_root);
-
-#else /* ifdef _KERNEL */
-
-#define	DECLARE_RQ	struct ncp_buf conn1, *conn=&conn1
-
-#define	ncp_add_byte(conn,x) (conn)->packet[(conn)->rqsize++]=x
-
-struct ncp_buf;
-
-__BEGIN_DECLS
-
-void ncp_init_request(struct ncp_buf *);
-void ncp_init_request_s(struct ncp_buf *, int);
-void ncp_add_word_lh(struct ncp_buf *, u_int16_t);
-void ncp_add_dword_lh(struct ncp_buf *, uint32_t);
-void ncp_add_word_hl(struct ncp_buf *, u_int16_t);
-void ncp_add_dword_hl(struct ncp_buf *, uint32_t);
-void ncp_add_mem(struct ncp_buf *, const void *, int);
-void ncp_add_mem_nls(struct ncp_buf *, const void *, int);
-void ncp_add_pstring(struct ncp_buf *, const char *);
-void ncp_add_handle_path(struct ncp_buf *, nuint32, nuint32, int, const char *);
-
-#define ncp_reply_data(conn,offset) ((conn)->packet+offset)
-#define ncp_reply_byte(conn,offset) (*(u_int8_t*)(ncp_reply_data(conn, offset)))
-
-u_int16_t ncp_reply_word_hl(struct ncp_buf *, int);
-u_int16_t ncp_reply_word_lh(struct ncp_buf *, int);
-uint32_t ncp_reply_dword_hl(struct ncp_buf *, int);
-uint32_t ncp_reply_dword_lh(struct ncp_buf *, int);
-
-static __inline void
-ConvertToNWfromDWORD(uint32_t sfd, ncp_fh *fh) {
-	fh->val1 = (fh->val.val32 = sfd);
-	return;
-}
-
-__END_DECLS
-
-#endif /* ifdef _KERNEL */
-
-#endif	/* !_NETNCP_NCP_RQ_H_ */
diff --git a/include.new/netncp/ncp_sock.h b/include.new/netncp/ncp_sock.h
deleted file mode 100644
index aeeb974..0000000
--- a/include.new/netncp/ncp_sock.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_sock.h,v 1.6 2005/01/07 01:45:49 imp Exp $
- */
-#ifndef _NETNCP_NCP_SOCK_H_
-#define _NETNCP_NCP_SOCK_H_
-
-struct ncp_conn;
-struct mbuf;
-struct ncp_rq;
-struct proc;
-struct socket;
-struct timeval;
-
-int  ncp_sock_connect(struct ncp_conn *ncp);
-int  ncp_sock_recv(struct socket *so, struct mbuf **mp, int *rlen);
-int  ncp_sock_send(struct socket *so, struct mbuf *data, struct ncp_rq *rqp);
-int  ncp_sock_disconnect(struct ncp_conn *conn);
-int  ncp_poll(struct socket *so, int events);
-int  ncp_sock_rselect(struct socket *so, struct thread *td, struct timeval *tv,
-		      int events);
-int  ncp_sock_checksum(struct ncp_conn *conn, int enable);
-
-void ncp_check_rq(struct ncp_conn *conn);
-void ncp_check_conn(struct ncp_conn *conn);
-
-void ncp_check_wd(struct ncp_conn *conn);
-
-#endif /* _NCP_SOCK_H_ */
diff --git a/include.new/netncp/ncp_subr.h b/include.new/netncp/ncp_subr.h
deleted file mode 100644
index 395d176..0000000
--- a/include.new/netncp/ncp_subr.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_subr.h,v 1.9 2005/01/07 01:45:49 imp Exp $
- */
-#ifndef _NETNCP_NCP_SUBR_H_
-#define _NETNCP_NCP_SUBR_H_
-
-#define NCP_TIMER_TICK	2*hz	/* 1sec */
-#define	NCP_SIGMASK(set) 						\
-	(SIGISMEMBER(set, SIGINT) || SIGISMEMBER(set, SIGTERM) ||	\
-	 SIGISMEMBER(set, SIGHUP) || SIGISMEMBER(set, SIGKILL) ||	\
-	 SIGISMEMBER(set, SIGQUIT))
-
-
-#define	NCP_PRINT(format, args...) printf("FATAL: %s: "format, __func__ ,## args)
-#define nwfs_printf	NCP_PRINT
-/* Maybe this should panic, but I dont like that */
-#define NCPFATAL	NCP_PRINT
-#define NCPERROR	NCP_PRINT
-
-/* socket debugging */
-#ifdef NCP_SOCKET_DEBUG
-#define NCPSDEBUG(format, args...) printf("%s: "format, __func__ ,## args)
-#else
-#define NCPSDEBUG(format, args...)
-#endif
-
-/* NCP calls debug */
-#ifdef NCP_NCP_DEBUG
-#define NCPNDEBUG(format, args...) printf("%s: "format, __func__ ,## args)
-#else
-#define NCPNDEBUG(format, args...)
-#endif
-
-/* NCP data dump */
-#ifdef NCP_DATA_DEBUG
-#define NCPDDEBUG(m) m_dumpm(m)
-#else
-#define NCPDDEBUG(m)
-#endif
-
-/* FS VOPS debug */
-#ifdef NWFS_VOPS_DEBUG
-#define NCPVODEBUG(format, args...) printf("%s: "format, __func__ ,## args)
-#else
-#define NCPVODEBUG(format, args...)
-#endif
-
-/* FS VNOPS debug */
-#ifdef NWFS_VNOPS_DEBUG
-#define NCPVNDEBUG(format, args...) printf("%s: "format, __func__ ,## args)
-#else
-#define NCPVNDEBUG(format, args...)
-#endif
-
-#define checkbad(fn) {error=(fn);if(error) goto bad;}
-
-#define	ncp_suser(cred)	suser_cred(cred, 0)
-
-#define ncp_isowner(conn,cred) ((cred)->cr_uid == (conn)->nc_owner->cr_uid)
-
-struct ncp_conn;
-
-struct nwmount;
-struct vnode;
-struct nwnode;
-struct vattr;
-struct uio;
-struct ncp_nlstables;
-
-struct ncp_open_info {
-	uint32_t 		origfh;
-	ncp_fh			fh;
-	u_int8_t 		action;
-	struct nw_entry_info	fattr;
-};
-
-extern int ncp_debuglevel;
-
-struct proc;
-struct ucred;
-
-int  ncp_init(void);
-int  ncp_done(void);
-int  ncp_chkintr(struct ncp_conn *conn, struct thread *td);
-char*ncp_str_dup(char *s);
-
-/* ncp_crypt.c */
-void nw_keyhash(const u_char *key, const u_char *buf, int buflen, u_char *target);
-void nw_encrypt(const u_char *fra, const u_char *buf, u_char *target);
-void ncp_sign(const uint32_t *state, const char *x, uint32_t *ostate);
-
-#endif /* _NCP_SUBR_H_ */
diff --git a/include.new/netncp/ncp_user.h b/include.new/netncp/ncp_user.h
deleted file mode 100644
index a3b81f7..0000000
--- a/include.new/netncp/ncp_user.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1999, Boris Popov
- * 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 Boris Popov.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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/netncp/ncp_user.h,v 1.3 2005/01/07 01:45:49 imp Exp $
- */
-#ifndef _NETNCP_NCP_USER_H_
-#define _NETNCP_NCP_USER_H_
-
-/* 
- * "ncp" interface to kernel, this can be done via syscalls but may eat
- * a lot of them, so we select internal code, define req's and replays
- * as necessary. Structure for call is simple:
- * byte=NCP_CONN
- * byte=NCP_CONN_SUBFN
- * ....=data
- */
-#define	NCP_CONN		0xF5	/* change if that will occupied */
-#define	NCP_CONN_READ		0x01	/* read from file handle */
-#define	NCP_CONN_WRITE		0x02	/* write to file handle */
-#define	NCP_CONN_SETFLAGS	0x03	/* word mask, word flags */
-#define	NCP_CONN_LOGIN		0x04	/* bind login on handle */
-#define	NCP_CONN_GETINFO	0x05	/* get information about connection */
-#define	NCP_CONN_GETUSER	0x06	/* get user name for connection */
-#define	NCP_CONN_CONN2REF	0x07	/* convert handle to reference */
-#define	NCP_CONN_CONNCLOSE	0x08	/* release connection handle */
-#define	NCP_CONN_FRAG		0x09	/* ncp fragmented request */
-#define	NCP_CONN_DUP		0x0A	/* get an additional handle */
-#define	NCP_CONN_GETDATA	0x0B	/* retrieve NCP_CD_* vals */
-#define	NCP_CONN_SETDATA	0x0C	/* store NCP_CD_* vals */
-
-/*
- * Internal connection data can be set by owner or superuser and retrieved
- * only by superuser
- */
-#define	NCP_CD_NDSLOGINKEY	0x01
-#define	NCP_CD_NDSPRIVATEKEY	0x02
-#define NCP_CD_NDSUFLAGS	0x03
-
-/* user side structures to issue fragmented ncp calls */
-typedef struct {
-	char	*fragAddress;
-	uint32_t fragSize;
-} NW_FRAGMENT;
-
-
-struct ncp_rw {
-	ncp_fh	nrw_fh;
-	char 	*nrw_base;
-	off_t	nrw_offset;
-	int	nrw_cnt;
-};
-
-struct ncp_conn_login {
-	char	*username;
-	int	objtype;
-	char	*password;
-};
-
-struct ncp_conn_frag {
-	int		cc;		/* completion code */
-	int		cs;		/* connection state */
-	int		fn;
-	int		rqfcnt;
-	NW_FRAGMENT	*rqf;
-	int		rpfcnt;
-	NW_FRAGMENT	*rpf;
-};
-
-#endif
diff --git a/include.new/netncp/ncpio.h b/include.new/netncp/ncpio.h
deleted file mode 100644
index b9a4240..0000000
--- a/include.new/netncp/ncpio.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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/netncp/ncpio.h,v 1.1 2003/02/28 04:31:29 tjr Exp $
- */
-
-#ifndef _NETNCP_NCPIO_H_
-#define _NETNCP_NCPIO_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-#define	NCP_NAME	"ncp"
-
-struct ncp_conn_args;
-struct ncp_buf;
-
-struct ncpioc_connect {
-	struct ncp_conn_args	*ioc_li;
-	int			*ioc_connhandle;
-};
-
-struct ncpioc_request {
-	int			ioc_connhandle;
-	int			ioc_fn;
-	struct ncp_buf		*ioc_ncpbuf;
-};
-
-struct ncpioc_connscan {
-	struct ncp_conn_args	*ioc_li;
-	int			*ioc_connhandle;
-};
-
-#define	NCPIOC_CONNECT		_IOW('N',  100, struct ncpioc_connect)
-#define	NCPIOC_REQUEST		_IOW('N',  101, struct ncpioc_request)
-#define	NCPIOC_CONNSCAN		_IOW('N',  102, struct ncpioc_connscan)
-
-#endif /* _NETNCP_NCPIO_H_ */
diff --git a/include.new/netncp/nwerror.h b/include.new/netncp/nwerror.h
deleted file mode 100644
index 93fb510..0000000
--- a/include.new/netncp/nwerror.h
+++ /dev/null
@@ -1,634 +0,0 @@
-/*
- * NetWare requestor error codes, they taken from NDK
- *
- * $FreeBSD: src/sys/netncp/nwerror.h,v 1.2 1999/12/12 05:50:07 bp Exp $
- */
-#ifndef _NETNCP_NWERROR_H_
-#define _NETNCP_NWERROR_H_
-
-#ifndef SUCCESS
-#define SUCCESS                        0
-#endif
-
-#define SHELL_ERROR                    0x8800
-#define VLM_ERROR                      0x8800
-#define ALREADY_ATTACHED               0x8800  /* 0  - Attach attempted to server with valid, existing connection */
-#define INVALID_CONNECTION             0x8801  /* 1  - Request attempted with invalid or non-attached connection handle */
-#define DRIVE_IN_USE                   0x8802  /* 2  - OS/2 only (NOT USED) */
-#define CANT_ADD_CDS                   0x8803  /* 3  - Map drive attempted but unable to add new current directory structure */
-#define DRIVE_CANNOT_MAP               0x8803
-#define BAD_DRIVE_BASE                 0x8804  /* 4  - Map drive attempted with invalid path specification */
-#define NET_READ_ERROR                 0x8805  /* 5  - Attempt to receive from the selected transport failed */
-#define NET_RECV_ERROR                 0x8805  /* 5  */
-#define UNKNOWN_NET_ERROR              0x8806  /* 6  - Network send attempted with an un-specific network error */
-#define SERVER_INVALID_SLOT            0x8807  /* 7  - Server request attempted with invalid server connection slot */
-#define BAD_SERVER_SLOT                0x8807  /* 7  */
-#define NO_SERVER_SLOTS                0x8808  /* 8  - Attach attempted to server with no connection slots available */
-#define NET_WRITE_ERROR                0x8809  /* 9  - Attempt to send on the selected transport failed */
-#define CONNECTION_IN_ERROR_STATE      0x8809  /* Client-32 */
-#define NET_SEND_ERROR                 0x8809  /* 9  */
-#define SERVER_NO_ROUTE                0x880A  /* 10 - Attempted to find route to server where no route exists */
-#define BAD_LOCAL_TARGET               0x880B  /* 11 - OS/2 only */
-#define TOO_MANY_REQ_FRAGS             0x880C  /* 12 - Attempted request with too many request fragments specified */
-#define CONNECT_LIST_OVERFLOW          0x880D  /* 13 */
-#define BUFFER_OVERFLOW                0x880E  /* 14 - Attempt to receive more data than the reply buffer had room for */
-#define MORE_DATA_ERROR                0x880E  /* Client-32 */
-#define NO_CONN_TO_SERVER              0x880F  /* 15 */
-#define NO_CONNECTION_TO_SERVER        0x880F  /* 15 - Attempt to get connection for a server not connected */
-#define NO_ROUTER_FOUND                0x8810  /* 16 - OS/2 only */
-#define BAD_FUNC_ERROR                 0x8811  /* 17 */
-#define INVALID_SHELL_CALL             0x8811  /* 17 - Attempted function call to non- existent or illegal function */
-#define SCAN_COMPLETE                  0x8812
-#define LIP_RESIZE_ERROR               0x8812  /* Client-32 */
-#define UNSUPPORTED_NAME_FORMAT_TYPE   0x8813
-#define INVALID_DIR_HANDLE             0x8813  /* Client-32 */
-#define HANDLE_ALREADY_LICENSED        0x8814
-#define OUT_OF_CLIENT_MEMORY           0x8814  /* Client-32 */
-#define HANDLE_ALREADY_UNLICENSED      0x8815
-#define PATH_NOT_OURS                  0x8815  /* Client-32 */
-#define INVALID_NCP_PACKET_LENGTH      0x8816
-#define PATH_IS_PRINT_DEVICE           0x8816  /* Client-32 */
-#define SETTING_UP_TIMEOUT             0x8817
-#define PATH_IS_EXCLUDED_DEVICE        0x8817  /* Client-32 */
-#define SETTING_SIGNALS                0x8818
-#define PATH_IS_INVALID                0x8818  /* Client-32 */
-#define SERVER_CONNECTION_LOST         0x8819
-#define NOT_SAME_DEVICE                0x8819  /* Client-32 */
-#define OUT_OF_HEAP_SPACE              0x881A
-#define INVALID_SERVICE_REQUEST        0x881B
-#define INVALID_SEARCH_HANDLE          0x881B  /* Client-32 */
-#define INVALID_TASK_NUMBER            0x881C
-#define INVALID_DEVICE_HANDLE          0x881C  /* Client-32 */
-#define INVALID_MESSAGE_LENGTH         0x881D
-#define INVALID_SEM_HANDLE             0x881D  /* Client-32 */
-#define EA_SCAN_DONE                   0x881E
-#define INVALID_CFG_HANDLE             0x881E  /* Client-32 */
-#define BAD_CONNECTION_NUMBER          0x881F
-#define INVALID_MOD_HANDLE             0x881F  /* Client-32 */
-#define ASYN_FIRST_PASS                0x8820
-#define INVALID_DEVICE_INDEX           0x8821
-#define INVALID_CONN_HANDLE            0x8822
-#define INVALID_QUEUE_ID               0x8823
-#define INVALID_PDEVICE_HANDLE         0x8824
-#define INVALID_JOB_HANDLE             0x8825
-#define INVALID_ELEMENT_ID             0x8826
-#define ALIAS_NOT_FOUND                0x8827
-#define RESOURCE_SUSPENDED             0x8828
-#define INVALID_QUEUE_SPECIFIED        0x8829
-#define DEVICE_ALREADY_OPEN            0x882A
-#define JOB_ALREADY_OPEN               0x882B
-#define QUEUE_NAME_ID_MISMATCH         0x882C
-#define JOB_ALREADY_STARTED            0x882D
-#define SPECT_DAA_TYPE_NOT_SUPPORTED   0x882E
-#define INVALID_ENVIR_HANDLE           0x882F
-#define NOT_SAME_CONNECTION            0x8830  /* 48 - Internal server request attempted accross different server connections */
-#define PRIMARY_CONNECTION_NOT_SET     0x8831  /* 49 - Attempt to retrieve default connection with no primary connection set */
-#define NO_PRIMARY_SET                 0x8831  /* 49 */
-#define KEYWORD_NOT_FOUND              0x8832  /* Client-32 */
-#define PRINT_CAPTURE_NOT_IN_PROGRESS  0x8832  /* Client-32 */
-#define NO_CAPTURE_SET                 0x8832  /* 50 */
-#define NO_CAPTURE_IN_PROGRESS         0x8832  /* 50 - Capture information requested on port with no capture in progress */
-#define BAD_BUFFER_LENGTH              0x8833  /* 51 */
-#define INVALID_BUFFER_LENGTH          0x8833  /* 51 - Used to indicate length which caller requested on a GetDNC or SetDNC was too large */
-#define NO_USER_NAME                   0x8834  /* 52 */
-#define NO_NETWARE_PRINT_SPOOLER       0x8835  /* 53 - Capture requested without having the local print spooler installed */
-#define INVALID_PARAMETER              0x8836  /* 54 - Attempted function with an invalid function parameter specified */
-#define CONFIG_FILE_OPEN_FAILED        0x8837  /* 55 - OS/2 only */
-#define NO_CONFIG_FILE                 0x8838  /* 56 - OS/2 only */
-#define CONFIG_FILE_READ_FAILED        0x8839  /* 57 - OS/2 only */
-#define CONFIG_LINE_TOO_LONG           0x883A  /* 58 - OS/2 only */
-#define CONFIG_LINES_IGNORED           0x883B  /* 59 - OS/2 only */
-#define NOT_MY_RESOURCE                0x883C  /* 60 - Attempted request made with a parameter using foriegn resource */
-#define DAEMON_INSTALLED               0x883D  /* 61 - OS/2 only */
-#define SPOOLER_INSTALLED              0x883E  /* 62 - Attempted load of print spooler with print spooler already installed */
-#define CONN_TABLE_FULL                0x883F  /* 63 */
-#define CONNECTION_TABLE_FULL          0x883F  /* 63 - Attempted to allocate a connection handle with no more local connection table entries */
-#define CONFIG_SECTION_NOT_FOUND       0x8840  /* 64 - OS/2 only */
-#define BAD_TRAN_TYPE                  0x8841  /* 65 */
-#define INVALID_TRANSPORT_TYPE         0x8841  /* 65 - Attempted function on a connection with an invalid transport selected */
-#define TDS_TAG_IN_USE                 0x8842  /* 66 - OS/2 only */
-#define TDS_OUT_OF_MEMORY              0x8843  /* 67 - OS/2 only */
-#define TDS_INVALID_TAG                0x8844  /* 68 - Attempted TDS function with invalid tag */
-#define TDS_WRITE_TRUNCATED            0x8845  /* 69 - Attempted TDS write with buffer that exceeded buffer */
-#define NO_CONNECTION_TO_DS            0x8846  /* Client-32 */
-#define NO_DIRECTORY_SERVICE_CONNECTION 0x8846  /* 70 */
-#define SERVICE_BUSY                   0x8846  /* 70 - Attempted request made to partially asynchronous function in busy state */
-#define NO_SERVER_ERROR                0x8847  /* 71 - Attempted connect failed to find any servers responding */
-#define BAD_VLM_ERROR                  0x8848  /* 72 - Attempted function call to non-existant or not-loaded overlay */
-#define NETWORK_DRIVE_IN_USE           0x8849  /* 73 - Attempted map to network drive that was already mapped */
-#define LOCAL_DRIVE_IN_USE             0x884A  /* 74 - Attempted map to local drive that was in use */
-#define NO_DRIVES_AVAILABLE            0x884B  /* 75 - Attempted map to next available drive when none were available */
-#define DEVICE_NOT_REDIRECTED          0x884C  /* 76 - The device is not redirected */
-#define NO_MORE_SFT_ENTRIES            0x884D  /* 77 - Maximum number of files was reached */
-#define UNLOAD_ERROR                   0x884E  /* 78 - Attempted unload failed */
-#define IN_USE_ERROR                   0x884F  /* 79 - Attempted re-use of already in use connection entry */
-#define TOO_MANY_REP_FRAGS             0x8850  /* 80 - Attempted request with too many reply fragments specified */
-#define TABLE_FULL                     0x8851  /* 81 - Attempted to add a name into the name table after it was full */
-#ifndef SOCKET_NOT_OPEN
-#define SOCKET_NOT_OPEN                0x8852  /* 82 - Listen was posted on unopened socket */
-#endif
-#define MEM_MGR_ERROR                  0x8853  /* 83 - Attempted enhanced memory operation failed */
-#define SFT3_ERROR                     0x8854  /* 84 - An SFT3 switch occured mid-transfer */
-#define PREFERRED_NOT_FOUND            0x8855  /* 85 - the preferred directory server was not established but another directory server was returned */
-#define DEVICE_NOT_RECOGNIZED          0x8856  /* 86 - used to determine if the device is not used by VISE so pass it on to the next redirector, if any. */
-#define BAD_NET_TYPE                   0x8857  /* 87 - the network type (Bind/NDS) does not match the server version */
-#define ERROR_OPENING_FILE             0x8858  /* 88 - generic open failure error, invalid path, access denied, etc.. */
-#define NO_PREFERRED_SPECIFIED         0x8859  /* 89 - no preferred name specified */
-#define ERROR_OPENING_SOCKET           0x885A  /* 90 - error opening a socket */
-#define REQUESTER_FAILURE              0x885A  /* Client-32 */
-#define RESOURCE_ACCESS_DENIED         0x885B  /* Client-32 */
-#define SIGNATURE_LEVEL_CONFLICT       0x8861
-#define NO_LOCK_FOUND                  0x8862  /* OS/2 - process lock on conn handle failed, process ID not recognized */
-#define LOCK_TABLE_FULL                0x8863  /* OS/2 - process lock on conn handle failed, process lock table full */
-#define INVALID_MATCH_DATA             0x8864
-#define MATCH_FAILED                   0x8865
-#define NO_MORE_ENTRIES                0x8866
-#define INSUFFICIENT_RESOURCES         0x8867
-#define STRING_TRANSLATION             0x8868
-#define STRING_TRANSLATION_NEEDED      0x8868  /* Client-32 */
-#define ACCESS_VIOLATION               0x8869
-#define NOT_AUTHENTICATED              0x886A
-#define INVALID_LEVEL                  0x886B
-#define RESOURCE_LOCK_ERROR            0x886C
-#define INVALID_NAME_FORMAT            0x886D
-#define OBJECT_EXISTS                  0x886E
-#define OBJECT_NOT_FOUND               0x886F
-#define UNSUPPORTED_TRAN_TYPE          0x8870
-#define INVALID_STRING_TYPE            0x8871
-#define INVALID_OWNER                  0x8872
-#define UNSUPPORTED_AUTHENTICATOR      0x8873
-#define IO_PENDING                     0x8874
-#define INVALID_DRIVE_NUM              0x8875
-#define SHELL_FAILURE                  0x88FF
-#define VLM_FAILURE                    0x88FF
-
-#define  SVC_ALREADY_REGISTERED        0x8880 /* Client-32 */
-#define  SVC_REGISTRY_FULL             0x8881 /* Client-32 */
-#define  SVC_NOT_REGISTERED            0x8882 /* Client-32 */
-#define  OUT_OF_RESOURCES              0x8883 /* Client-32 */
-#define  RESOLVE_SVC_FAILED            0x8884 /* Client-32 */
-#define  CONNECT_FAILED                0x8885 /* Client-32 */
-#define  PROTOCOL_NOT_BOUND            0x8886 /* Client-32 */
-#define  AUTHENTICATION_FAILED         0x8887 /* Client-32 */
-#define  INVALID_AUTHEN_HANDLE         0x8888 /* Client-32 */
-#define  AUTHEN_HANDLE_ALREADY_EXISTS  0x8889 /* Client-32 */
-
-#define  DIFF_OBJECT_ALREADY_AUTHEN    0x8890 /* Client-32 */
-#define  REQUEST_NOT_SERVICEABLE       0x8891 /* Client-32 */
-#define  AUTO_RECONNECT_SO_REBUILD     0x8892 /* Client-32 */
-#define  AUTO_RECONNECT_RETRY_REQUEST  0x8893 /* Client-32 */
-#define  ASYNC_REQUEST_IN_USE          0x8894 /* Client-32 */
-#define  ASYNC_REQUEST_CANCELED        0x8895 /* Client-32 */
-#define  SESS_SVC_ALREADY_REGISTERED   0x8896 /* Client-32 */
-#define  SESS_SVC_NOT_REGISTERED       0x8897 /* Client-32 */
-#define  PREVIOUSLY_AUTHENTICATED      0x8899 /* Client-32 */
-#define  RESOLVE_SVC_PARTIAL           0x889A /* Client-32 */
-#define  NO_DEFAULT_SPECIFIED          0x889B /* Client-32 */
-#define  HOOK_REQUEST_NOT_HANDLED      0x889C /* Client-32 */
-#define  HOOK_REQUEST_BUSY             0x889D /* Client-32 */
-#define  HOOK_REQUEST_QUEUED           0x889D /* Client-32 */
-#define  AUTO_RECONNECT_SO_IGNORE      0x889E /* Client-32 */
-#define  ASYNC_REQUEST_NOT_IN_USE      0x889F /* Client-32 */
-#define  AUTO_RECONNECT_FAILURE        0x88A0 /* Client-32 */
-#define  NET_ERROR_ABORT_APPLICATION   0x88A1 /* Client-32 */
-#define  NET_ERROR_SUSPEND_APPLICATION 0x88A2 /* Client-32 */
-#define  NET_ERROR_ABORTED_PROCESS_GROUP  0x88A3 /* Client-32 */
-#define  NET_ERROR_PASSWORD_HAS_EXPIRED   0x88A5 /* Client-32 */
-#define  NET_ERROR_NETWORK_INACTIVE       0x88A6 /* Client-32 */
-#define  REPLY_TRUNCATED            0x88e6    /* 230 NLM */
-
-
-/* Server Errors */
-
-#define ERR_INSUFFICIENT_SPACE          0x8901  /* 001 */
-#define ERR_NO_MORE_ENTRY           0x8914   /* 020 */
-#define NLM_INVALID_CONNECTION         0x890a   /* 010 */
-#define ERR_BUFFER_TOO_SMALL            0x8977  /* 119 */
-#define ERR_VOLUME_FLAG_NOT_SET         0x8978  /* 120 the service requested, not avail. on the selected vol. */
-#define ERR_NO_ITEMS_FOUND              0x8979  /* 121 */
-#define ERR_CONN_ALREADY_TEMP           0x897a  /* 122 */
-#define ERR_CONN_ALREADY_LOGGED_IN      0x897b  /* 123 */
-#define ERR_CONN_NOT_AUTHENTICATED      0x897c  /* 124 */
-#define ERR_CONN_NOT_LOGGED_IN          0x897d  /* 125 */
-#define NCP_BOUNDARY_CHECK_FAILED       0x897e  /* 126 */
-#define ERR_LOCK_WAITING                0x897f  /* 127 */
-#define ERR_LOCK_FAIL                   0x8980  /* 128 */
-#define FILE_IN_USE_ERROR               0x8980  /* 128 */
-#define NO_MORE_FILE_HANDLES            0x8981  /* 129 */
-#define NO_OPEN_PRIVILEGES              0x8982  /* 130 */
-#define IO_ERROR_NETWORK_DISK           0x8983  /* 131 */
-#define ERR_AUDITING_HARD_IO_ERROR      0x8983  /* 131 */
-#define NO_CREATE_PRIVILEGES            0x8984  /* 132 */
-#define ERR_AUDITING_NOT_SUPV           0x8984  /* 132 */
-#define NO_CREATE_DELETE_PRIVILEGES     0x8985  /* 133 */
-#define CREATE_FILE_EXISTS_READ_ONLY    0x8986  /* 134 */
-#define WILD_CARDS_IN_CREATE_FILE_NAME  0x8987  /* 135 */
-#define CREATE_FILENAME_ERROR           0x8987  /* 135 */
-#define INVALID_FILE_HANDLE             0x8988  /* 136 */
-#define NO_SEARCH_PRIVILEGES            0x8989  /* 137 */
-#define NO_DELETE_PRIVILEGES            0x898A  /* 138 */
-#define NO_RENAME_PRIVILEGES            0x898B  /* 139 */
-#define NO_MODIFY_PRIVILEGES            0x898C  /* 140 */
-#define SOME_FILES_AFFECTED_IN_USE      0x898D  /* 141 */
-#define NO_FILES_AFFECTED_IN_USE        0x898E  /* 142 */
-#define SOME_FILES_AFFECTED_READ_ONLY   0x898F  /* 143 */
-#define NO_FILES_AFFECTED_READ_ONLY     0x8990  /* 144 */
-#define SOME_FILES_RENAMED_NAME_EXISTS  0x8991  /* 145 */
-#define NO_FILES_RENAMED_NAME_EXISTS    0x8992  /* 146 */
-#define NO_READ_PRIVILEGES              0x8993  /* 147 */
-#define NO_WRITE_PRIVILEGES_OR_READONLY 0x8994  /* 148 */
-#define FILE_DETACHED                   0x8995  /* 149 */
-#define SERVER_OUT_OF_MEMORY            0x8996  /* 150 */
-#define ERR_TARGET_NOT_A_SUBDIRECTORY   0x8996  /* 150 can be changed later (note written by server people). */
-#define NO_DISK_SPACE_FOR_SPOOL_FILE    0x8997  /* 151 */
-#define ERR_AUDITING_NOT_ENABLED        0x8997  /* 151 */
-#define VOLUME_DOES_NOT_EXIST           0x8998  /* 152 */
-#define DIRECTORY_FULL                  0x8999  /* 153 */
-#define RENAMING_ACROSS_VOLUMES         0x899A  /* 154 */
-#define BAD_DIRECTORY_HANDLE            0x899B  /* 155 */
-#define INVALID_PATH                    0x899C  /* 156 */
-#define NO_MORE_TRUSTEES                0x899C  /* 156 */
-#define NO_MORE_DIRECTORY_HANDLES       0x899D  /* 157 */
-#define INVALID_FILENAME                0x899E  /* 158 */
-#define DIRECTORY_ACTIVE                0x899F  /* 159 */
-#define DIRECTORY_NOT_EMPTY             0x89A0  /* 160 */
-#define DIRECTORY_IO_ERROR              0x89A1  /* 161 */
-#define READ_FILE_WITH_RECORD_LOCKED    0x89A2  /* 162 */
-#define ERR_TRANSACTION_RESTARTED       0x89A3  /* 163 */
-#define ERR_RENAME_DIR_INVALID          0x89A4  /* 164 */
-#define ERR_INVALID_OPENCREATE_MODE     0x89A5  /* 165 */
-#define ERR_ALREADY_IN_USE              0x89A6  /* 166 */
-#define ERR_AUDITING_ACTIVE             0x89A6  /* 166 */
-#define ERR_INVALID_RESOURCE_TAG        0x89A7  /* 167 */
-#define ERR_ACCESS_DENIED               0x89A8  /* 168 */
-#define ERR_AUDITING_NO_RIGHTS          0x89A8  /* 168 */
-#define INVALID_DATA_STREAM             0x89BE  /* 190 */
-#define INVALID_NAME_SPACE              0x89BF  /* 191 */
-#define NO_ACCOUNTING_PRIVILEGES        0x89C0  /* 192 */
-#define LOGIN_DENIED_NO_ACCOUNT_BALANCE 0x89C1  /* 193 */
-#define LOGIN_DENIED_NO_CREDIT          0x89C2  /* 194 */
-#define ERR_AUDITING_RECORD_SIZE        0x89C2  /* 194 */
-#define ERR_TOO_MANY_HOLDS              0x89C3  /* 195 */
-#define ACCOUNTING_DISABLED             0x89C4  /* 196 */
-#define INTRUDER_DETECTION_LOCK         0x89C5  /* 197 */
-#define NO_CONSOLE_OPERATOR             0x89C6  /* 198 */
-#define NO_CONSOLE_PRIVILEGES           0x89C6  /* 198 */
-#define ERR_Q_IO_FAILURE                0x89D0  /* 208 */
-#define ERR_NO_QUEUE                    0x89D1  /* 209 */
-#define ERR_NO_Q_SERVER                 0x89D2  /* 210 */
-#define ERR_NO_Q_RIGHTS                 0x89D3  /* 211 */
-#define ERR_Q_FULL                      0x89D4  /* 212 */
-#define ERR_NO_Q_JOB                    0x89D5  /* 213 */
-#define ERR_NO_Q_JOB_RIGHTS             0x89D6  /* 214 */
-#define ERR_Q_IN_SERVICE                0x89D7  /* 215 */
-#define PASSWORD_NOT_UNIQUE             0x89D7  /* 215 */
-#define ERR_Q_NOT_ACTIVE                0x89D8  /* 216 */
-#define PASSWORD_TOO_SHORT              0x89D8  /* 216 */
-#define ERR_Q_STN_NOT_SERVER            0x89D9  /* 217 */
-#define LOGIN_DENIED_NO_CONNECTION      0x89D9  /* 217 */
-#define ERR_MAXIMUM_LOGINS_EXCEEDED     0x89D9  /* 217 */
-#define ERR_Q_HALTED                    0x89DA  /* 218 */
-#define UNAUTHORIZED_LOGIN_TIME         0x89DA  /* 218 */
-#define UNAUTHORIZED_LOGIN_STATION      0x89DB  /* 219 */
-#define ERR_Q_MAX_SERVERS               0x89DB  /* 219 */
-#define ACCOUNT_DISABLED                0x89DC  /* 220 */
-#define PASSWORD_HAS_EXPIRED_NO_GRACE   0x89DE  /* 222 */
-#define PASSWORD_HAS_EXPIRED            0x89DF  /* 223 */
-#define E_NO_MORE_USERS                 0x89E7  /* 231 */
-#define NOT_ITEM_PROPERTY               0x89E8  /* 232 */
-#define WRITE_PROPERTY_TO_GROUP         0x89E8  /* 232 */
-#define MEMBER_ALREADY_EXISTS           0x89E9  /* 233 */
-#define NO_SUCH_MEMBER                  0x89EA  /* 234 */
-#define NOT_GROUP_PROPERTY              0x89EB  /* 235 */
-#define NO_SUCH_SEGMENT                 0x89EC  /* 236 */
-#define PROPERTY_ALREADY_EXISTS         0x89ED  /* 237 */
-#define OBJECT_ALREADY_EXISTS           0x89EE  /* 238 */
-#define INVALID_NAME                    0x89EF  /* 239 */
-#define WILD_CARD_NOT_ALLOWED           0x89F0  /* 240 */
-#define INVALID_BINDERY_SECURITY        0x89F1  /* 241 */
-#define NO_OBJECT_READ_PRIVILEGE        0x89F2  /* 242 */
-#define NO_OBJECT_RENAME_PRIVILEGE      0x89F3  /* 243 */
-#define NO_OBJECT_DELETE_PRIVILEGE      0x89F4  /* 244 */
-#define NO_OBJECT_CREATE_PRIVILEGE      0x89F5  /* 245 */
-#define NO_PROPERTY_DELETE_PRIVILEGE    0x89F6  /* 246 */
-#define NO_PROPERTY_CREATE_PRIVILEGE    0x89F7  /* 247 */
-#define NO_PROPERTY_WRITE_PRIVILEGE     0x89F8  /* 248 */
-#define NO_FREE_CONNECTION_SLOTS        0x89F9  /* 249 */
-#define NO_PROPERTY_READ_PRIVILEGE      0x89F9  /* 249 */
-#define NO_MORE_SERVER_SLOTS            0x89FA  /* 250 */
-#define TEMP_REMAP_ERROR                0x89FA  /* 250 */
-#define INVALID_PARAMETERS              0x89FB  /* 251 */
-#define NO_SUCH_PROPERTY                0x89FB  /* 251 */
-#define ERR_NCP_NOT_SUPPORTED           0x89FB  /* 251 */
-#define INTERNET_PACKET_REQT_CANCELED   0x89FC  /* 252 */
-#define UNKNOWN_FILE_SERVER             0x89FC  /* 252 */
-#define MESSAGE_QUEUE_FULL              0x89FC  /* 252 */
-#define NO_SUCH_OBJECT                  0x89FC  /* 252 */
-#define LOCK_COLLISION                  0x89FD  /* 253 */
-#define BAD_STATION_NUMBER              0x89FD  /* 253 */
-#define INVALID_PACKET_LENGTH           0x89FD  /* 253 */
-#define UNKNOWN_REQUEST                 0x89FD  /* 253 */
-#define BINDERY_LOCKED                  0x89FE  /* 254 */
-#define TRUSTEE_NOT_FOUND               0x89FE  /* 254 */
-#define DIRECTORY_LOCKED                0x89FE  /* 254 */
-#define INVALID_SEMAPHORE_NAME_LENGTH   0x89FE  /* 254 */
-#define PACKET_NOT_DELIVERABLE          0x89FE  /* 254 */
-#define SERVER_BINDERY_LOCKED           0x89FE  /* 254 */
-#define SOCKET_TABLE_FULL               0x89FE  /* 254 */
-#define SPOOL_DIRECTORY_ERROR           0x89FE  /* 254 */
-#define SUPERVISOR_HAS_DISABLED_LOGIN   0x89FE  /* 254 */
-#define TIMEOUT_FAILURE                 0x89FE  /* 254 */
-#define BAD_PRINTER_ERROR               0x89FF  /* 255 */
-#define BAD_RECORD_OFFSET               0x89FF  /* 255 */
-#define CLOSE_FCB_ERROR                 0x89FF  /* 255 */
-#define FILE_EXTENSION_ERROR            0x89FF  /* 255 */
-#define FILE_NAME_ERROR                 0x89FF  /* 255 */
-#define HARDWARE_FAILURE                0x89FF  /* 255 */
-#define INVALID_DRIVE_NUMBER            0x89FF  /* 255 */
-#define DOS_INVALID_DRIVE               0x000F  /* 255 */
-#define INVALID_INITIAL_SEMAPHORE_VALUE 0x89FF  /* 255 */
-#define INVALID_SEMAPHORE_HANDLE        0x89FF  /* 255 */
-#define IO_BOUND_ERROR                  0x89FF  /* 255 */
-#define NO_FILES_FOUND_ERROR            0x89FF  /* 255 */
-#define NO_RESPONSE_FROM_SERVER         0x89FF  /* 255 */
-#define NO_SUCH_OBJECT_OR_BAD_PASSWORD  0x89FF  /* 255 */
-#define PATH_NOT_LOCATABLE              0x89FF  /* 255 */
-#define QUEUE_FULL_ERROR                0x89FF  /* 255 */
-#define REQUEST_NOT_OUTSTANDING         0x89FF  /* 255 */
-#ifndef SOCKET_ALREADY_OPEN
-#define SOCKET_ALREADY_OPEN             0x89FF  /* 255 */
-#endif
-#define LOCK_ERROR                      0x89FF  /* 255 */
-#ifndef FAILURE
-#define FAILURE                         0x89FF  /* 255 Generic Failure */
-#endif
-
-/* #define NOT_SAME_LOCAL_DRIVE         0x89F6 */
-/* #define TARGET_DRIVE_NOT_LOCAL       0x89F7 */
-/* #define ALREADY_ATTACHED_TO_SERVER   0x89F8 */ /* 248 */
-/* #define NOT_ATTACHED_TO_SERVER       0x89F8 */
-
-/**** Network errors ****/
-/* Decimal values at end of line are 32768 lower than actual */
-
-#define NWE_ALREADY_ATTACHED            0x8800  /* 0  - Attach attempted to server with valid, existing connection */
-#define NWE_CONN_INVALID                0x8801  /* 1  - Request attempted with invalid or non-attached connection handle */
-#define NWE_DRIVE_IN_USE                0x8802  /* 2  - OS/2 only (NOT USED) */
-#define NWE_DRIVE_CANNOT_MAP            0x8803  /* 3  - Map drive attempted but unable to add new current directory structure */
-#define NWE_DRIVE_BAD_PATH              0x8804  /* 4  - Map drive attempted with invalid path specification */
-#define NWE_NET_RECEIVE                 0x8805  /* 5  - Attempt to receive from the selected transport failed */
-#define NWE_NET_UNKNOWN                 0x8806  /* 6  - Network send attempted with an un-specific network error */
-#define NWE_SERVER_BAD_SLOT             0x8807  /* 7  - Server request attempted with invalid server connection slot */
-#define NWE_SERVER_NO_SLOTS             0x8808  /* 8  - Attach attempted to server with no connection slots available */
-#define NWE_NET_SEND                    0x8809  /* 9  - Attempt to send on the selected transport failed */
-#define NWE_SERVER_NO_ROUTE             0x880A  /* 10 - Attempted to find route to server where no route exists */
-#define NWE_BAD_LOCAL_TARGET            0x880B  /* 11 - OS/2 only */
-#define NWE_REQ_TOO_MANY_REQ_FRAGS      0x880C  /* 12 - Attempted request with too many request fragments specified */
-#define NWE_CONN_LIST_OVERFLOW          0x880D  /* 13 */
-#define NWE_BUFFER_OVERFLOW             0x880E  /* 14 - Attempt to receive more data than the reply buffer had room for */
-#define NWE_SERVER_NO_CONN              0x880F  /* 15 - Attempt to get connection for a server not connected */
-#define NWE_NO_ROUTER_FOUND             0x8810  /* 16 - OS/2 only */
-#define NWE_FUNCTION_INVALID            0x8811  /* 17 - Attempted function call to non- existent or illegal function */
-#define NWE_SCAN_COMPLETE               0x8812
-#define NWE_UNSUPPORTED_NAME_FORMAT_TYP 0x8813
-#define NWE_HANDLE_ALREADY_LICENSED     0x8814
-#define NWE_HANDLE_ALREADY_UNLICENSED   0x8815
-#define NWE_INVALID_NCP_PACKET_LENGTH   0x8816
-#define NWE_SETTING_UP_TIMEOUT          0x8817
-#define NWE_SETTING_SIGNALS             0x8818
-#define NWE_SERVER_CONNECTION_LOST      0x8819
-#define NWE_OUT_OF_HEAP_SPACE           0x881A
-#define NWE_INVALID_SERVICE_REQUEST     0x881B
-#define NWE_INVALID_TASK_NUMBER         0x881C
-#define NWE_INVALID_MESSAGE_LENGTH      0x881D
-#define NWE_EA_SCAN_DONE                0x881E
-#define NWE_BAD_CONNECTION_NUMBER       0x881F
-#define NWE_MULT_TREES_NOT_SUPPORTED    0x8820  /* 32 - Attempt to open a connection to a DS tree other than the default tree */
-#define NWE_CONN_NOT_SAME               0x8830  /* 48 - Internal server request attempted across different server connections */
-#define NWE_CONN_PRIMARY_NOT_SET        0x8831  /* 49 - Attempt to retrieve default connection with no primary connection set */
-#define NWE_PRN_CAPTURE_NOT_IN_PROGRESS 0x8832  /* 50 - Capture information requested on port with no capture in progress */
-#define NWE_BUFFER_INVALID_LEN          0x8833  /* 51 - Used to indicate length which caller requested on a GetDNC or SetDNC was too large */
-#define NWE_USER_NO_NAME                0x8834  /* 52 */
-#define NWE_PRN_NO_LOCAL_SPOOLER        0x8835  /* 53 - Capture requested without having the local print spooler installed */
-#define NWE_PARAM_INVALID               0x8836  /* 54 - Attempted function with an invalid function parameter specified */
-#define NWE_CFG_OPEN_FAILED             0x8837  /* 55 - OS/2 only */
-#define NWE_CFG_NO_FILE                 0x8838  /* 56 - OS/2 only */
-#define NWE_CFG_READ_FAILED             0x8839  /* 57 - OS/2 only */
-#define NWE_CFG_LINE_TOO_LONG           0x883A  /* 58 - OS/2 only */
-#define NWE_CFG_LINES_IGNORED           0x883B  /* 59 - OS/2 only */
-#define NWE_RESOURCE_NOT_OWNED          0x883C  /* 60 - Attempted request made with a parameter using foriegn resource */
-#define NWE_DAEMON_INSTALLED            0x883D  /* 61 - OS/2 only */
-#define NWE_PRN_SPOOLER_INSTALLED       0x883E  /* 62 - Attempted load of print spooler with print spooler already installed */
-#define NWE_CONN_TABLE_FULL             0x883F  /* 63 - Attempted to allocate a connection handle with no more local connection table entries */
-#define NWE_CFG_SECTION_NOT_FOUND       0x8840  /* 64 - OS/2 only */
-#define NWE_TRAN_INVALID_TYPE           0x8841  /* 65 - Attempted function on a connection with an invalid transport selected */
-#define NWE_TDS_TAG_IN_USE              0x8842  /* 66 - OS/2 only */
-#define NWE_TDS_OUT_OF_MEMORY           0x8843  /* 67 - OS/2 only */
-#define NWE_TDS_INVALID_TAG             0x8844  /* 68 - Attempted TDS function with invalid tag */
-#define NWE_TDS_WRITE_TRUNCATED         0x8845  /* 69 - Attempted TDS write with buffer that exceeded buffer */
-#define NWE_DS_NO_CONN                  0x8846  /* 70 */
-#define NWE_SERVICE_BUSY                0x8846  /* 70 - Attempted request made to partially asynchronous function in busy state */
-#define NWE_SERVER_NOT_FOUND            0x8847  /* 71 - Attempted connect failed to find any servers responding */
-#define NWE_VLM_INVALID                 0x8848  /* 72 - Attempted function call to non-existant or not-loaded overlay */
-#define NWE_DRIVE_ALREADY_MAPPED        0x8849  /* 73 - Attempted map to network drive that was already mapped */
-#define NWE_DRIVE_LOCAL_IN_USE          0x884A  /* 74 - Attempted map to local drive that was in use */
-#define NWE_DRIVE_NONE_AVAILABLE        0x884B  /* 75 - Attempted map to next available drive when none were available */
-#define NWE_DEVICE_NOT_REDIRECTED       0x884C  /* 76 - The device is not redirected */
-#define NWE_FILE_MAX_REACHED            0x884D  /* 77 - Maximum number of files was reached */
-#define NWE_UNLOAD_FAILED               0x884E  /* 78 - Attempted unload failed */
-#define NWE_CONN_IN_USE                 0x884F  /* 79 - Attempted re-use of already in use connection entry */
-#define NWE_REQ_TOO_MANY_REP_FRAGS      0x8850  /* 80 - Attempted request with too many reply fragments specified */
-#define NWE_NAME_TABLE_FULL             0x8851  /* 81 - Attempted to add a name into the name table after it was full */
-#define NWE_SOCKET_NOT_OPEN             0x8852  /* 82 - Listen was posted on unopened socket */
-#define NWE_MEMORY_MGR_ERROR            0x8853  /* 83 - Attempted enhanced memory operation failed */
-#define NWE_SFT3_ERROR                  0x8854  /* 84 - An SFT3 switch occured mid-transfer */
-#define NWE_DS_PREFERRED_NOT_FOUND      0x8855  /* 85 - the preferred directory server was not established but another directory server was returned */
-#define NWE_DEVICE_NOT_RECOGNIZED       0x8856  /* 86 - used to determine if the device is not used by VISE so pass it on to the next redirector, if any. */
-#define NWE_NET_INVALID_TYPE            0x8857  /* 87 - the network type (Bind/NDS) does not match the server version */
-#define NWE_FILE_OPEN_FAILED            0x8858  /* 88 - generic open failure error, invalid path, access denied, etc.. */
-#define NWE_DS_PREFERRED_NOT_SPECIFIED  0x8859  /* 89 - no preferred name specified */
-#define NWE_SOCKET_OPEN_FAILED          0x885A  /* 90 - error opening a socket */
-#define NWE_SIGNATURE_LEVEL_CONFLICT    0x8861
-#define NWE_NO_LOCK_FOUND               0x8862  /* OS/2 - process lock on conn handle failed, process ID not recognized */
-#define NWE_LOCK_TABLE_FULL             0x8863  /* OS/2 - process lock on conn handle failed, process lock table full */
-#define NWE_INVALID_MATCH_DATA          0x8864
-#define NWE_MATCH_FAILED                0x8865
-#define NWE_NO_MORE_ENTRIES             0x8866
-#define NWE_INSUFFICIENT_RESOURCES      0x8867
-#define NWE_STRING_TRANSLATION          0x8868
-#define NWE_ACCESS_VIOLATION            0x8869
-#define NWE_NOT_AUTHENTICATED           0x886A
-#define NWE_INVALID_LEVEL               0x886B
-#define NWE_RESOURCE_LOCK               0x886C
-#define NWE_INVALID_NAME_FORMAT         0x886D
-#define NWE_OBJECT_EXISTS               0x886E
-#define NWE_OBJECT_NOT_FOUND            0x886F
-#define NWE_UNSUPPORTED_TRAN_TYPE       0x8870
-#define NWE_INVALID_STRING_TYPE         0x8871
-#define NWE_INVALID_OWNER               0x8872
-#define NWE_UNSUPPORTED_AUTHENTICATOR   0x8873
-#define NWE_IO_PENDING                  0x8874
-#define NWE_INVALID_DRIVE_NUMBER        0x8875
-#define NWE_REPLY_TRUNCATED            0x88e6    /* 230 NLM */
-#define NWE_REQUESTER_FAILURE           0x88FF
-
-/* Server Errors */
-
-#define NWE_INSUFFICIENT_SPACE          0x8901  /* 001 */
-#define NWE_BUFFER_TOO_SMALL            0x8977  /* 119 */
-#define NWE_VOL_FLAG_NOT_SET            0x8978  /* 120 the service requested, not avail. on the selected vol. */
-#define NWE_NO_ITEMS_FOUND              0x8979  /* 121 */
-#define NWE_CONN_ALREADY_TEMP           0x897a  /* 122 */
-#define NWE_CONN_ALREADY_LOGGED_IN      0x897b  /* 123 */
-#define NWE_CONN_NOT_AUTHENTICATED      0x897c  /* 124 */
-#define NWE_CONN_NOT_LOGGED_IN          0x897d  /* 125 */
-#define NWE_NCP_BOUNDARY_CHECK_FAILED   0x897e  /* 126 */
-#define NWE_LOCK_WAITING                0x897f  /* 127 */
-#define NWE_LOCK_FAIL                   0x8980  /* 128 */
-#define NWE_FILE_IN_USE                 0x8980  /* 128 */
-#define NWE_FILE_NO_HANDLES             0x8981  /* 129 */
-#define NWE_FILE_NO_OPEN_PRIV           0x8982  /* 130 */
-#define NWE_DISK_IO_ERROR               0x8983  /* 131 */
-#define NWE_AUDITING_HARD_IO_ERROR      0x8983  /* 131 */
-#define NWE_FILE_NO_CREATE_PRIV         0x8984  /* 132 */
-#define NWE_AUDITING_NOT_SUPV           0x8984  /* 132 */
-#define NWE_FILE_NO_CREATE_DEL_PRIV     0x8985  /* 133 */
-#define NWE_FILE_EXISTS_READ_ONLY       0x8986  /* 134 */
-#define NWE_FILE_WILD_CARDS_IN_NAME     0x8987  /* 135 */
-#define NWE_FILE_INVALID_HANDLE         0x8988  /* 136 */
-#define NWE_FILE_NO_SRCH_PRIV           0x8989  /* 137 */
-#define NWE_FILE_NO_DEL_PRIV            0x898A  /* 138 */
-#define NWE_FILE_NO_RENAME_PRIV         0x898B  /* 139 */
-#define NWE_FILE_NO_MOD_PRIV            0x898C  /* 140 */
-#define NWE_FILE_SOME_IN_USE            0x898D  /* 141 */
-#define NWE_FILE_NONE_IN_USE            0x898E  /* 142 */
-#define NWE_FILE_SOME_READ_ONLY         0x898F  /* 143 */
-#define NWE_FILE_NONE_READ_ONLY         0x8990  /* 144 */
-#define NWE_FILE_SOME_RENAMED_EXIST     0x8991  /* 145 */
-#define NWE_FILE_NONE_RENAMED_EXIST     0x8992  /* 146 */
-#define NWE_FILE_NO_READ_PRIV           0x8993  /* 147 */
-#define NWE_FILE_NO_WRITE_PRIV          0x8994  /* 148 */
-#define NWE_FILE_READ_ONLY              0x8994  /* 148 */
-#define NWE_FILE_DETACHED               0x8995  /* 149 */
-#define NWE_SERVER_OUT_OF_MEMORY        0x8996  /* 150 */
-#define NWE_DIR_TARGET_INVALID          0x8996  /* 150 */
-#define NWE_DISK_NO_SPOOL_SPACE         0x8997  /* 151 */
-#define NWE_AUDITING_NOT_ENABLED        0x8997  /* 151 */
-#define NWE_VOL_INVALID                 0x8998  /* 152 */
-#define NWE_DIR_FULL                    0x8999  /* 153 */
-#define NWE_VOL_RENAMING_ACROSS         0x899A  /* 154 */
-#define NWE_DIRHANDLE_INVALID           0x899B  /* 155 */
-#define NWE_PATH_INVALID                0x899C  /* 156 */
-#define NWE_TRUSTEES_NO_MORE            0x899C  /* 156 */
-#define NWE_DIRHANDLE_NO_MORE           0x899D  /* 157 */
-#define NWE_FILE_NAME_INVALID           0x899E  /* 158 */
-#define NWE_DIR_ACTIVE                  0x899F  /* 159 */
-#define NWE_DIR_NOT_EMPTY               0x89A0  /* 160 */
-#define NWE_DIR_IO_ERROR                0x89A1  /* 161 */
-#define NWE_FILE_IO_LOCKED              0x89A2  /* 162 */
-#define NWE_TTS_RANSACTION_RESTARTED    0x89A3  /* 163 */
-#define NWE_TTS_TRANSACTION_RESTARTED   0x89A3  /* 163 */
-#define NWE_DIR_RENAME_INVALID          0x89A4  /* 164 */
-#define NWE_FILE_OPENCREAT_MODE_INVALID 0x89A5  /* 165 */
-#define NWE_ALREADY_IN_USE              0x89A6  /* 166 */
-#define NWE_AUDITING_ACTIVE             0x89A6  /* 166 */
-#define NWE_RESOURCE_TAG_INVALID        0x89A7  /* 167 */
-#define NWE_ACCESS_DENIED               0x89A8  /* 168 */
-#define NWE_AUDITING_NO_RIGHTS          0x89A8  /* 168 */
-#define NWE_DATA_STREAM_INVALID         0x89BE  /* 190 */
-#define NWE_NAME_SPACE_INVALID          0x89BF  /* 191 */
-#define NWE_ACCTING_NO_PRIV             0x89C0  /* 192 */
-#define NWE_ACCTING_NO_BALANCE          0x89C1  /* 193 */
-#define NWE_ACCTING_NO_CREDIT           0x89C2  /* 194 */
-#define NWE_AUDITING_RECORD_SIZE        0x89C2  /* 194 */
-#define NWE_ACCTING_TOO_MANY_HOLDS      0x89C3  /* 195 */
-#define NWE_ACCTING_DISABLED            0x89C4  /* 196 */
-#define NWE_LOGIN_LOCKOUT               0x89C5  /* 197 */
-#define NWE_CONSOLE_NO_PRIV             0x89C6  /* 198 */
-#define NWE_Q_IO_FAILURE                0x89D0  /* 208 */
-#define NWE_Q_NONE                      0x89D1  /* 209 */
-#define NWE_Q_NO_SERVER                 0x89D2  /* 210 */
-#define NWE_Q_NO_RIGHTS                 0x89D3  /* 211 */
-#define NWE_Q_FULL                      0x89D4  /* 212 */
-#define NWE_Q_NO_JOB                    0x89D5  /* 213 */
-#define NWE_Q_NO_JOB_RIGHTS             0x89D6  /* 214 */
-#define NWE_PASSWORD_UNENCRYPTED        0x89D6  /* 214 */
-#define NWE_Q_IN_SERVICE                0x89D7  /* 215 */
-#define NWE_PASSWORD_NOT_UNIQUE         0x89D7  /* 215 */
-#define NWE_Q_NOT_ACTIVE                0x89D8  /* 216 */
-#define NWE_PASSWORD_TOO_SHORT          0x89D8  /* 216 */
-#define NWE_Q_STN_NOT_SERVER            0x89D9  /* 217 */
-#define NWE_LOGIN_NO_CONN               0x89D9  /* 217 */
-#define NWE_LOGIN_MAX_EXCEEDED          0x89D9  /* 217 */
-#define NWE_Q_HALTED                    0x89DA  /* 218 */
-#define NWE_LOGIN_UNAUTHORIZED_TIME     0x89DA  /* 218 */
-#define NWE_LOGIN_UNAUTHORIZED_STATION  0x89DB  /* 219 */
-#define NWE_Q_MAX_SERVERS               0x89DB  /* 219 */
-#define NWE_ACCT_DISABLED               0x89DC  /* 220 */
-#define NWE_PASSWORD_INVALID            0x89DE  /* 222 */
-#define NWE_PASSWORD_EXPIRED            0x89DF  /* 223 */
-#define NWE_LOGIN_NO_CONN_AVAIL         0x89E0  /* 224 */
-#define NWE_E_NO_MORE_USERS             0x89E7  /* 231 */
-#define NWE_BIND_NOT_ITEM_PROP          0x89E8  /* 232 */
-#define NWE_BIND_WRITE_TO_GROUP_PROP    0x89E8  /* 232 */
-#define NWE_BIND_MEMBER_ALREADY_EXISTS  0x89E9  /* 233 */
-#define NWE_BIND_NO_SUCH_MEMBER         0x89EA  /* 234 */
-#define NWE_BIND_NOT_GROUP_PROP         0x89EB  /* 235 */
-#define NWE_BIND_NO_SUCH_SEGMENT        0x89EC  /* 236 */
-#define NWE_BIND_PROP_ALREADY_EXISTS    0x89ED  /* 237 */
-#define NWE_BIND_OBJ_ALREADY_EXISTS     0x89EE  /* 238 */
-#define NWE_BIND_NAME_INVALID           0x89EF  /* 239 */
-#define NWE_BIND_WILDCARD_INVALID       0x89F0  /* 240 */
-#define NWE_BIND_SECURITY_INVALID       0x89F1  /* 241 */
-#define NWE_BIND_OBJ_NO_READ_PRIV       0x89F2  /* 242 */
-#define NWE_BIND_OBJ_NO_RENAME_PRIV     0x89F3  /* 243 */
-#define NWE_BIND_OBJ_NO_DELETE_PRIV     0x89F4  /* 244 */
-#define NWE_BIND_OBJ_NO_CREATE_PRIV     0x89F5  /* 245 */
-#define NWE_BIND_PROP_NO_DELETE_PRIV    0x89F6  /* 246 */
-#define NWE_BIND_PROP_NO_CREATE_PRIV    0x89F7  /* 247 */
-#define NWE_BIND_PROP_NO_WRITE_PRIV     0x89F8  /* 248 */
-#define NWE_BIND_PROP_NO_READ_PRIV      0x89F9  /* 249 */
-#define NWE_NO_FREE_CONN_SLOTS          0x89F9  /* 249 */
-#define NWE_NO_MORE_SERVER_SLOTS        0x89FA  /* 250 */
-#define NWE_TEMP_REMAP_ERROR            0x89FA  /* 250 */
-#define NWE_PARAMETERS_INVALID          0x89FB  /* 251 */
-#define NWE_BIND_NO_SUCH_PROP           0x89FB  /* 251 */
-#define NWE_NCP_NOT_SUPPORTED           0x89FB  /* 251 */
-#define NWE_INET_PACKET_REQ_CANCELED    0x89FC  /* 252 */
-#define NWE_SERVER_UNKNOWN              0x89FC  /* 252 */
-#define NWE_MSG_Q_FULL                  0x89FC  /* 252 */
-#define NWE_BIND_NO_SUCH_OBJ            0x89FC  /* 252 */
-#define NWE_LOCK_COLLISION              0x89FD  /* 253 */
-#define NWE_CONN_NUM_INVALID            0x89FD  /* 253 */
-#define NWE_PACKET_LEN_INVALID          0x89FD  /* 253 */
-#define NWE_UNKNOWN_REQ                 0x89FD  /* 253 */
-#define NWE_BIND_LOCKED                 0x89FE  /* 254 */
-#define NWE_TRUSTEE_NOT_FOUND           0x89FE  /* 254 */
-#define NWE_DIR_LOCKED                  0x89FE  /* 254 */
-#define NWE_SEM_INVALID_NAME_LEN        0x89FE  /* 254 */
-#define NWE_PACKET_NOT_DELIVERABLE      0x89FE  /* 254 */
-#define NWE_SOCKET_TABLE_FULL           0x89FE  /* 254 */
-#define NWE_SPOOL_DIR_ERROR             0x89FE  /* 254 */
-#define NWE_LOGIN_DISABLED_BY_SUPER     0x89FE  /* 254 */
-#define NWE_TIMEOUT_FAILURE             0x89FE  /* 254 */
-#define NWE_FILE_EXT                    0x89FF  /* 255 */
-#define NWE_FILE_NAME                   0x89FF  /* 255 */
-#define NWE_HARD_FAILURE                0x89FF  /* 255 */
-#define NWE_FCB_CLOSE                   0x89FF  /* 255 */
-#define NWE_IO_BOUND                    0x89FF  /* 255 */
-#define NWE_BAD_SPOOL_PRINTER           0x89FF  /* 255 */
-#define NWE_BAD_RECORD_OFFSET           0x89FF  /* 255 */
-#define NWE_DRIVE_INVALID_NUM           0x89FF  /* 255 */
-#define NWE_SEM_INVALID_INIT_VAL        0x89FF  /* 255 */
-#define NWE_SEM_INVALID_HANDLE          0x89FF  /* 255 */
-#define NWE_NO_FILES_FOUND_ERROR        0x89FF  /* 255 */
-#define NWE_NO_RESPONSE_FROM_SERVER     0x89FF  /* 255 */
-#define NWE_NO_OBJ_OR_BAD_PASSWORD      0x89FF  /* 255 */
-#define NWE_PATH_NOT_LOCATABLE          0x89FF  /* 255 */
-#define NWE_Q_FULL_ERROR                0x89FF  /* 255 */
-#define NWE_REQ_NOT_OUTSTANDING         0x89FF  /* 255 */
-#define NWE_SOCKET_ALREADY_OPEN         0x89FF  /* 255 */
-#define NWE_LOCK_ERROR                  0x89FF  /* 255 */
-#define NWE_FAILURE                     0x89FF  /* 255 Generic Failure */
-
-#endif /* !_NWERROR_H_ */
diff --git a/include.new/netpfil/pf/pf.h b/include.new/netpfil/pf/pf.h
deleted file mode 100644
index 63bd265..0000000
--- a/include.new/netpfil/pf/pf.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Hartmeier
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
- * COPYRIGHT HOLDERS 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.
- *
- *	$OpenBSD: pfvar.h,v 1.282 2009/01/29 15:12:28 pyr Exp $
- *	$FreeBSD: releng/10.2/sys/netpfil/pf/pf.h 284571 2015-06-18 20:34:39Z kp $
- */
-
-#ifndef	_NET_PF_H_
-#define	_NET_PF_H_
-
-#define	PF_TCPS_PROXY_SRC	((TCP_NSTATES)+0)
-#define	PF_TCPS_PROXY_DST	((TCP_NSTATES)+1)
-
-#define	PF_MD5_DIGEST_LENGTH	16
-#ifdef MD5_DIGEST_LENGTH
-#if PF_MD5_DIGEST_LENGTH != MD5_DIGEST_LENGTH
-#error
-#endif
-#endif
-
-enum	{ PF_INOUT, PF_IN, PF_OUT, PF_FWD };
-enum	{ PF_PASS, PF_DROP, PF_SCRUB, PF_NOSCRUB, PF_NAT, PF_NONAT,
-	  PF_BINAT, PF_NOBINAT, PF_RDR, PF_NORDR, PF_SYNPROXY_DROP, PF_DEFER };
-enum	{ PF_RULESET_SCRUB, PF_RULESET_FILTER, PF_RULESET_NAT,
-	  PF_RULESET_BINAT, PF_RULESET_RDR, PF_RULESET_MAX };
-enum	{ PF_OP_NONE, PF_OP_IRG, PF_OP_EQ, PF_OP_NE, PF_OP_LT,
-	  PF_OP_LE, PF_OP_GT, PF_OP_GE, PF_OP_XRG, PF_OP_RRG };
-enum	{ PF_DEBUG_NONE, PF_DEBUG_URGENT, PF_DEBUG_MISC, PF_DEBUG_NOISY };
-enum	{ PF_CHANGE_NONE, PF_CHANGE_ADD_HEAD, PF_CHANGE_ADD_TAIL,
-	  PF_CHANGE_ADD_BEFORE, PF_CHANGE_ADD_AFTER,
-	  PF_CHANGE_REMOVE, PF_CHANGE_GET_TICKET };
-enum	{ PF_GET_NONE, PF_GET_CLR_CNTR };
-enum	{ PF_SK_WIRE, PF_SK_STACK, PF_SK_BOTH };
-
-/*
- * Note about PFTM_*: real indices into pf_rule.timeout[] come before
- * PFTM_MAX, special cases afterwards. See pf_state_expires().
- */
-enum	{ PFTM_TCP_FIRST_PACKET, PFTM_TCP_OPENING, PFTM_TCP_ESTABLISHED,
-	  PFTM_TCP_CLOSING, PFTM_TCP_FIN_WAIT, PFTM_TCP_CLOSED,
-	  PFTM_UDP_FIRST_PACKET, PFTM_UDP_SINGLE, PFTM_UDP_MULTIPLE,
-	  PFTM_ICMP_FIRST_PACKET, PFTM_ICMP_ERROR_REPLY,
-	  PFTM_OTHER_FIRST_PACKET, PFTM_OTHER_SINGLE,
-	  PFTM_OTHER_MULTIPLE, PFTM_FRAG, PFTM_INTERVAL,
-	  PFTM_ADAPTIVE_START, PFTM_ADAPTIVE_END, PFTM_SRC_NODE,
-	  PFTM_TS_DIFF, PFTM_MAX, PFTM_PURGE, PFTM_UNLINKED,
-	  PFTM_UNTIL_PACKET };
-
-/* PFTM default values */
-#define PFTM_TCP_FIRST_PACKET_VAL	120	/* First TCP packet */
-#define PFTM_TCP_OPENING_VAL		30	/* No response yet */
-#define PFTM_TCP_ESTABLISHED_VAL	24*60*60/* Established */
-#define PFTM_TCP_CLOSING_VAL		15 * 60	/* Half closed */
-#define PFTM_TCP_FIN_WAIT_VAL		45	/* Got both FINs */
-#define PFTM_TCP_CLOSED_VAL		90	/* Got a RST */
-#define PFTM_UDP_FIRST_PACKET_VAL	60	/* First UDP packet */
-#define PFTM_UDP_SINGLE_VAL		30	/* Unidirectional */
-#define PFTM_UDP_MULTIPLE_VAL		60	/* Bidirectional */
-#define PFTM_ICMP_FIRST_PACKET_VAL	20	/* First ICMP packet */
-#define PFTM_ICMP_ERROR_REPLY_VAL	10	/* Got error response */
-#define PFTM_OTHER_FIRST_PACKET_VAL	60	/* First packet */
-#define PFTM_OTHER_SINGLE_VAL		30	/* Unidirectional */
-#define PFTM_OTHER_MULTIPLE_VAL		60	/* Bidirectional */
-#define PFTM_FRAG_VAL			30	/* Fragment expire */
-#define PFTM_INTERVAL_VAL		10	/* Expire interval */
-#define PFTM_SRC_NODE_VAL		0	/* Source tracking */
-#define PFTM_TS_DIFF_VAL		30	/* Allowed TS diff */
-
-enum	{ PF_NOPFROUTE, PF_FASTROUTE, PF_ROUTETO, PF_DUPTO, PF_REPLYTO };
-enum	{ PF_LIMIT_STATES, PF_LIMIT_SRC_NODES, PF_LIMIT_FRAGS,
-	  PF_LIMIT_TABLE_ENTRIES, PF_LIMIT_MAX };
-#define PF_POOL_IDMASK		0x0f
-enum	{ PF_POOL_NONE, PF_POOL_BITMASK, PF_POOL_RANDOM,
-	  PF_POOL_SRCHASH, PF_POOL_ROUNDROBIN };
-enum	{ PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE, PF_ADDR_DYNIFTL,
-	  PF_ADDR_TABLE, PF_ADDR_URPFFAILED,
-	  PF_ADDR_RANGE };
-#define PF_POOL_TYPEMASK	0x0f
-#define PF_POOL_STICKYADDR	0x20
-#define	PF_WSCALE_FLAG		0x80
-#define	PF_WSCALE_MASK		0x0f
-
-#define	PF_LOG			0x01
-#define	PF_LOG_ALL		0x02
-#define	PF_LOG_SOCKET_LOOKUP	0x04
-
-/* Reasons code for passing/dropping a packet */
-#define PFRES_MATCH	0		/* Explicit match of a rule */
-#define PFRES_BADOFF	1		/* Bad offset for pull_hdr */
-#define PFRES_FRAG	2		/* Dropping following fragment */
-#define PFRES_SHORT	3		/* Dropping short packet */
-#define PFRES_NORM	4		/* Dropping by normalizer */
-#define PFRES_MEMORY	5		/* Dropped due to lacking mem */
-#define PFRES_TS	6		/* Bad TCP Timestamp (RFC1323) */
-#define PFRES_CONGEST	7		/* Congestion (of ipintrq) */
-#define PFRES_IPOPTIONS 8		/* IP option */
-#define PFRES_PROTCKSUM 9		/* Protocol checksum invalid */
-#define PFRES_BADSTATE	10		/* State mismatch */
-#define PFRES_STATEINS	11		/* State insertion failure */
-#define PFRES_MAXSTATES	12		/* State limit */
-#define PFRES_SRCLIMIT	13		/* Source node/conn limit */
-#define PFRES_SYNPROXY	14		/* SYN proxy */
-#define PFRES_MAX	15		/* total+1 */
-
-#define PFRES_NAMES { \
-	"match", \
-	"bad-offset", \
-	"fragment", \
-	"short", \
-	"normalize", \
-	"memory", \
-	"bad-timestamp", \
-	"congestion", \
-	"ip-option", \
-	"proto-cksum", \
-	"state-mismatch", \
-	"state-insert", \
-	"state-limit", \
-	"src-limit", \
-	"synproxy", \
-	NULL \
-}
-
-/* Counters for other things we want to keep track of */
-#define LCNT_STATES		0	/* states */
-#define LCNT_SRCSTATES		1	/* max-src-states */
-#define LCNT_SRCNODES		2	/* max-src-nodes */
-#define LCNT_SRCCONN		3	/* max-src-conn */
-#define LCNT_SRCCONNRATE	4	/* max-src-conn-rate */
-#define LCNT_OVERLOAD_TABLE	5	/* entry added to overload table */
-#define LCNT_OVERLOAD_FLUSH	6	/* state entries flushed */
-#define LCNT_MAX		7	/* total+1 */
-
-#define LCNT_NAMES { \
-	"max states per rule", \
-	"max-src-states", \
-	"max-src-nodes", \
-	"max-src-conn", \
-	"max-src-conn-rate", \
-	"overload table insertion", \
-	"overload flush states", \
-	NULL \
-}
-
-/* state operation counters */
-#define FCNT_STATE_SEARCH	0
-#define FCNT_STATE_INSERT	1
-#define FCNT_STATE_REMOVALS	2
-#define FCNT_MAX		3
-
-/* src_node operation counters */
-#define SCNT_SRC_NODE_SEARCH	0
-#define SCNT_SRC_NODE_INSERT	1
-#define SCNT_SRC_NODE_REMOVALS	2
-#define SCNT_MAX		3
-
-#define	PF_TABLE_NAME_SIZE	32
-#define	PF_QNAME_SIZE		64
-
-struct pf_status {
-	uint64_t	counters[PFRES_MAX];
-	uint64_t	lcounters[LCNT_MAX];
-	uint64_t	fcounters[FCNT_MAX];
-	uint64_t	scounters[SCNT_MAX];
-	uint64_t	pcounters[2][2][3];
-	uint64_t	bcounters[2][2];
-	uint32_t	running;
-	uint32_t	states;
-	uint32_t	src_nodes;
-	uint32_t	since;
-	uint32_t	debug;
-	uint32_t	hostid;
-	char		ifname[IFNAMSIZ];
-	uint8_t		pf_chksum[PF_MD5_DIGEST_LENGTH];
-};
-
-#endif	/* _NET_PF_H_ */
diff --git a/include.new/netpfil/pf/pf_altq.h b/include.new/netpfil/pf/pf_altq.h
deleted file mode 100644
index bc8c197..0000000
--- a/include.new/netpfil/pf/pf_altq.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Hartmeier
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
- * COPYRIGHT HOLDERS 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.
- *
- *	$OpenBSD: pfvar.h,v 1.282 2009/01/29 15:12:28 pyr Exp $
- *	$FreeBSD: releng/10.2/sys/netpfil/pf/pf_altq.h 263086 2014-03-12 10:45:58Z glebius $
- */
-
-#ifndef	_NET_PF_ALTQ_H_
-#define	_NET_PF_ALTQ_H_
-
-struct cbq_opts {
-	u_int		minburst;
-	u_int		maxburst;
-	u_int		pktsize;
-	u_int		maxpktsize;
-	u_int		ns_per_byte;
-	u_int		maxidle;
-	int		minidle;
-	u_int		offtime;
-	int		flags;
-};
-
-struct priq_opts {
-	int		flags;
-};
-
-struct hfsc_opts {
-	/* real-time service curve */
-	u_int		rtsc_m1;	/* slope of the 1st segment in bps */
-	u_int		rtsc_d;		/* the x-projection of m1 in msec */
-	u_int		rtsc_m2;	/* slope of the 2nd segment in bps */
-	/* link-sharing service curve */
-	u_int		lssc_m1;
-	u_int		lssc_d;
-	u_int		lssc_m2;
-	/* upper-limit service curve */
-	u_int		ulsc_m1;
-	u_int		ulsc_d;
-	u_int		ulsc_m2;
-	int		flags;
-};
-
-struct pf_altq {
-	char			 ifname[IFNAMSIZ];
-
-	void			*altq_disc;	/* discipline-specific state */
-	TAILQ_ENTRY(pf_altq)	 entries;
-
-	/* scheduler spec */
-	uint8_t			 scheduler;	/* scheduler type */
-	uint16_t		 tbrsize;	/* tokenbucket regulator size */
-	uint32_t		 ifbandwidth;	/* interface bandwidth */
-
-	/* queue spec */
-	char			 qname[PF_QNAME_SIZE];	/* queue name */
-	char			 parent[PF_QNAME_SIZE];	/* parent name */
-	uint32_t		 parent_qid;	/* parent queue id */
-	uint32_t		 bandwidth;	/* queue bandwidth */
-	uint8_t			 priority;	/* priority */
-	uint8_t			 local_flags;	/* dynamic interface */
-#define	PFALTQ_FLAG_IF_REMOVED		0x01
-
-	uint16_t		 qlimit;	/* queue size limit */
-	uint16_t		 flags;		/* misc flags */
-	union {
-		struct cbq_opts		 cbq_opts;
-		struct priq_opts	 priq_opts;
-		struct hfsc_opts	 hfsc_opts;
-	} pq_u;
-
-	uint32_t		 qid;		/* return value */
-};
-
-#endif	/* _NET_PF_ALTQ_H_ */
diff --git a/include.new/netpfil/pf/pf_mtag.h b/include.new/netpfil/pf/pf_mtag.h
deleted file mode 100644
index b0473ca..0000000
--- a/include.new/netpfil/pf/pf_mtag.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$FreeBSD: releng/10.2/sys/netpfil/pf/pf_mtag.h 284571 2015-06-18 20:34:39Z kp $	*/
-/*
- * Copyright (c) 2001 Daniel Hartmeier
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    - Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    - 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
- * COPYRIGHT HOLDERS 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.
- *
- */
-
-#ifndef _NET_PF_MTAG_H_
-#define _NET_PF_MTAG_H_
-
-#ifdef _KERNEL
-
-#define	PF_TAG_GENERATED		0x01
-#define	PF_TAG_FRAGCACHE		0x02
-#define	PF_TAG_TRANSLATE_LOCALHOST	0x04
-#define	PF_PACKET_LOOPED		0x08
-#define	PF_FASTFWD_OURS_PRESENT		0x10
-#define	PF_REASSEMBLED			0x20
-
-struct pf_mtag {
-	void		*hdr;		/* saved hdr pos in mbuf, for ECN */
-	uint32_t	 qid;		/* queue id */
-	u_int16_t	 tag;		/* tag id */
-	u_int8_t	 flags;
-	u_int8_t	 routed;
-};
-
-static __inline struct pf_mtag *
-pf_find_mtag(struct mbuf *m)
-{
-	struct m_tag	*mtag;
-
-	if ((mtag = m_tag_find(m, PACKET_TAG_PF, NULL)) == NULL)
-		return (NULL);
-
-	return ((struct pf_mtag *)(mtag + 1));
-}
-#endif /* _KERNEL */
-#endif /* _NET_PF_MTAG_H_ */
diff --git a/include.new/netsmb/netbios.h b/include.new/netsmb/netbios.h
deleted file mode 100644
index b855c4a..0000000
--- a/include.new/netsmb/netbios.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/netsmb/netbios.h 206361 2010-04-07 16:50:38Z joel $
- */
-#ifndef _NETSMB_NETBIOS_H_
-#define	_NETSMB_NETBIOS_H_
-
-/*
- * make this file dirty...
- */
-#ifndef _NETINET_IN_H_
-#include <netinet/in.h>
-#endif
-
-#ifndef _NETIPX_IPX_H_
-#include <netipx/ipx.h>
-#endif
-
-#define	NMB_TCP_PORT	137
-
-#define	NBPROTO_TCPSSN	1		/* NETBIOS session over TCP */
-#define	NBPROTO_IPXSSN	11		/* NETBIOS over IPX */
-
-#define NB_NAMELEN	16
-#define	NB_ENCNAMELEN	NB_NAMELEN * 2
-#define	NB_MAXLABLEN	63
-
-#define	NB_MINSALEN	(sizeof(struct sockaddr_nb))
-
-/*
- * name types
- */
-#define	NBT_WKSTA		0x00
-#define	NBT_MESSENGER		0x03
-#define	NBT_RAS_SERVER		0x06
-#define	NBT_DOMAIN_MASTER_BROWSER	0x1B
-#define	NBT_DOMAIN_CONTROLLER	0x1C
-#define	NBT_MASTER_BROWSER	0x1D
-#define	NBT_NETDDE		0x1F
-#define	NBT_SERVER		0x20
-#define	NBT_RAS_CLIENT		0x21
-
-/*
- * Session packet types
- */
-#define	NB_SSN_MESSAGE		0x0
-#define	NB_SSN_REQUEST		0x81
-#define	NB_SSN_POSRESP		0x82
-#define	NB_SSN_NEGRESP		0x83
-#define	NB_SSN_RTGRESP		0x84
-#define	NB_SSN_KEEPALIVE	0x85
-
-/*
- * resolver: Opcodes
- */
-#define	NBNS_OPCODE_QUERY	0x00
-#define	NBNS_OPCODE_REGISTER	0x05
-#define	NBNS_OPCODE_RELEASE	0x06
-#define	NBNS_OPCODE_WACK	0x07
-#define	NBNS_OPCODE_REFRESH	0x08
-#define	NBNS_OPCODE_RESPONSE	0x10	/* or'ed with other opcodes */
-
-/*
- * resolver: NM_FLAGS
- */
-#define	NBNS_NMFLAG_BCAST	0x01
-#define	NBNS_NMFLAG_RA		0x08	/* recursion available */
-#define	NBNS_NMFLAG_RD		0x10	/* recursion desired */
-#define	NBNS_NMFLAG_TC		0x20	/* truncation occurred */
-#define	NBNS_NMFLAG_AA		0x40	/* authoritative answer */
-
-/* 
- * resolver: Question types
- */
-#define	NBNS_QUESTION_TYPE_NB		0x0020
-#define NBNS_QUESTION_TYPE_NBSTAT	0x0021
-
-/* 
- * resolver: Question class 
- */
-#define NBNS_QUESTION_CLASS_IN	0x0001
-
-/*
- * resolver: Limits
- */
-#define	NBNS_MAXREDIRECTS	3	/* maximum number of accepted redirects */
-#define	NBDG_MAXSIZE		576	/* maximum nbns datagram size */
-
-/*
- * NETBIOS addressing
- */
-union nb_tran {
-	struct sockaddr_in	x_in;
-	struct sockaddr_ipx	x_ipx;
-};
-
-struct nb_name {
-	u_int		nn_type;
-	u_char		nn_name[NB_NAMELEN + 1];
-	u_char *	nn_scope;
-};
-
-/*
- * Socket address
- */
-struct sockaddr_nb {
-	u_char		snb_len;
-	u_char		snb_family;
-	union nb_tran	snb_tran;		/* transport */
-	u_char		snb_name[1 + NB_ENCNAMELEN + 1];	/* encoded */
-};
-
-#define	snb_addrin	snb_tran.x_in
-
-#endif /* !_NETSMB_NETBIOS_H_ */
diff --git a/include.new/netsmb/smb.h b/include.new/netsmb/smb.h
deleted file mode 100644
index f06b524..0000000
--- a/include.new/netsmb/smb.h
+++ /dev/null
@@ -1,445 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/netsmb/smb.h 206361 2010-04-07 16:50:38Z joel $
- */
-
-/*
- * Common definitions and structures for SMB/CIFS protocol
- */
- 
-#ifndef _NETSMB_SMB_H_
-#define _NETSMB_SMB_H_
-
-#define	SMB_TCP_PORT	139
-/*
- * SMB dialects that we have to deal with.
- */
-enum smb_dialects { 
-	SMB_DIALECT_NONE,
-	SMB_DIALECT_CORE,		/* PC NETWORK PROGRAM 1.0, PCLAN1.0 */
-	SMB_DIALECT_COREPLUS,		/* MICROSOFT NETWORKS 1.03 */
-	SMB_DIALECT_LANMAN1_0,		/* MICROSOFT NETWORKS 3.0, LANMAN1.0 */
-	SMB_DIALECT_LANMAN2_0,		/* LM1.2X002, DOS LM1.2X002, Samba */
-	SMB_DIALECT_LANMAN2_1,		/* DOS LANMAN2.1, LANMAN2.1 */
-	SMB_DIALECT_NTLM0_12		/* NT LM 0.12, Windows for Workgroups 3.1a,
-					 * NT LANMAN 1.0 */
-};
-
-/*
- * Formats of data/string buffers
- */
-#define	SMB_DT_DATA		1
-#define	SMB_DT_DIALECT		2
-#define	SMB_DT_PATHNAME		3
-#define	SMB_DT_ASCII		4
-#define	SMB_DT_VARIABLE		5
-
-/*
- * SMB header
- */
-#define	SMB_SIGNATURE		"\xFFSMB"
-#define	SMB_SIGLEN		4
-#define	SMB_HDRMID(p)		(le16toh(*(u_short*)((u_char*)(p) + 30)))
-#define	SMB_HDRLEN		32
-/*
- * bits in the smb_flags field
- */
-#define	SMB_FLAGS_CASELESS	0x08
-#define SMB_FLAGS_SERVER_RESP	0x80	/* indicates a response */
-
-/*
- * bits in the smb_flags2 field
- */
-#define	SMB_FLAGS2_KNOWS_LONG_NAMES	0x0001
-#define	SMB_FLAGS2_KNOWS_EAS		0x0002	/* client know about EAs */
-#define	SMB_FLAGS2_SECURITY_SIGNATURE	0x0004	/* check SMB integrity */
-#define	SMB_FLAGS2_IS_LONG_NAME		0x0040	/* any path name is a long name */
-#define	SMB_FLAGS2_EXT_SEC		0x0800	/* client aware of Extended
-						 * Security negotiation */
-#define	SMB_FLAGS2_DFS			0x1000	/* resolve paths in DFS */
-#define	SMB_FLAGS2_PAGING_IO		0x2000	/* for exec */
-#define	SMB_FLAGS2_ERR_STATUS		0x4000	/* 1 - status.status */
-#define	SMB_FLAGS2_UNICODE		0x8000	/* use Unicode for all strings */
-
-#define	SMB_UID_UNKNOWN		0xffff
-#define	SMB_TID_UNKNOWN		0xffff
-
-/*
- * Security mode bits
- */
-#define SMB_SM_USER		0x01		/* server in the user security mode */
-#define	SMB_SM_ENCRYPT		0x02		/* use challenge/response */
-#define	SMB_SM_SIGS		0x04
-#define	SMB_SM_SIGS_REQUIRE	0x08
-
-/*
- * NTLM capabilities
- */
-#define	SMB_CAP_RAW_MODE		0x0001
-#define	SMB_CAP_MPX_MODE		0x0002
-#define	SMB_CAP_UNICODE			0x0004
-#define	SMB_CAP_LARGE_FILES		0x0008		/* 64 bit offsets supported */
-#define	SMB_CAP_NT_SMBS			0x0010
-#define	SMB_CAP_RPC_REMOTE_APIS		0x0020
-#define	SMB_CAP_STATUS32		0x0040
-#define	SMB_CAP_LEVEL_II_OPLOCKS	0x0080
-#define	SMB_CAP_LOCK_AND_READ		0x0100
-#define	SMB_CAP_NT_FIND			0x0200
-#define	SMB_CAP_DFS			0x1000
-#define	SMB_CAP_INFOLEVEL_PASSTHRU	0x2000
-#define	SMB_CAP_LARGE_READX		0x4000
-#define	SMB_CAP_LARGE_WRITEX		0x8000
-#define	SMB_CAP_UNIX			0x00800000
-#define	SMB_CAP_BULK_TRANSFER		0x20000000
-#define	SMB_CAP_COMPRESSED_DATA		0x40000000
-#define	SMB_CAP_EXT_SECURITY		0x80000000
-
-/*
- * File attributes
- */
-#define	SMB_FA_RDONLY		0x01
-#define	SMB_FA_HIDDEN		0x02
-#define	SMB_FA_SYSTEM		0x04
-#define	SMB_FA_VOLUME		0x08
-#define	SMB_FA_DIR		0x10
-#define	SMB_FA_ARCHIVE		0x20
-
-/*
- * Extended file attributes
- */
-#define	SMB_EFA_RDONLY		0x0001
-#define	SMB_EFA_HIDDEN		0x0002
-#define	SMB_EFA_SYSTEM		0x0004
-#define	SMB_EFA_DIRECTORY	0x0010
-#define	SMB_EFA_ARCHIVE		0x0020
-#define	SMB_EFA_NORMAL		0x0080
-#define	SMB_EFA_TEMPORARY	0x0100
-#define	SMB_EFA_COMPRESSED	0x0800
-#define	SMB_EFA_POSIX_SEMANTICS	0x01000000
-#define	SMB_EFA_BACKUP_SEMANTICS 0x02000000
-#define	SMB_EFA_DELETE_ON_CLOSE	0x04000000
-#define	SMB_EFA_SEQUENTIAL_SCAN	0x08000000
-#define	SMB_EFA_RANDOM_ACCESS	0x10000000
-#define	SMB_EFA_NO_BUFFERING	0x20000000
-#define	SMB_EFA_WRITE_THROUGH	0x80000000
-
-/*
- * Access Mode Encoding
- */
-#define	SMB_AM_OPENREAD		0x0000
-#define	SMB_AM_OPENWRITE	0x0001
-#define	SMB_AM_OPENRW		0x0002
-#define	SMB_AM_OPENEXEC		0x0003
-#define	SMB_SM_COMPAT		0x0000
-#define	SMB_SM_EXCLUSIVE	0x0010
-#define	SMB_SM_DENYWRITE	0x0020
-#define	SMB_SM_DENYREADEXEC	0x0030
-#define	SMB_SM_DENYNONE		0x0040
-
-/*
- * SMB commands
- */
-#define	SMB_COM_CREATE_DIRECTORY        0x00
-#define	SMB_COM_DELETE_DIRECTORY        0x01
-#define	SMB_COM_OPEN                    0x02
-#define	SMB_COM_CREATE                  0x03
-#define	SMB_COM_CLOSE                   0x04
-#define	SMB_COM_FLUSH                   0x05
-#define	SMB_COM_DELETE                  0x06
-#define	SMB_COM_RENAME                  0x07
-#define	SMB_COM_QUERY_INFORMATION       0x08
-#define	SMB_COM_SET_INFORMATION         0x09
-#define	SMB_COM_READ                    0x0A
-#define	SMB_COM_WRITE                   0x0B
-#define	SMB_COM_LOCK_BYTE_RANGE         0x0C
-#define	SMB_COM_UNLOCK_BYTE_RANGE       0x0D
-#define	SMB_COM_CREATE_TEMPORARY        0x0E
-#define	SMB_COM_CREATE_NEW              0x0F
-#define	SMB_COM_CHECK_DIRECTORY         0x10
-#define	SMB_COM_PROCESS_EXIT            0x11
-#define	SMB_COM_SEEK                    0x12
-#define	SMB_COM_LOCK_AND_READ           0x13
-#define	SMB_COM_WRITE_AND_UNLOCK        0x14
-#define	SMB_COM_READ_RAW                0x1A
-#define	SMB_COM_READ_MPX                0x1B
-#define	SMB_COM_READ_MPX_SECONDARY      0x1C
-#define	SMB_COM_WRITE_RAW               0x1D
-#define	SMB_COM_WRITE_MPX               0x1E
-#define	SMB_COM_WRITE_COMPLETE          0x20
-#define	SMB_COM_SET_INFORMATION2        0x22
-#define	SMB_COM_QUERY_INFORMATION2      0x23
-#define	SMB_COM_LOCKING_ANDX            0x24
-#define	SMB_COM_TRANSACTION             0x25
-#define	SMB_COM_TRANSACTION_SECONDARY   0x26
-#define	SMB_COM_IOCTL                   0x27
-#define	SMB_COM_IOCTL_SECONDARY         0x28
-#define	SMB_COM_COPY                    0x29
-#define	SMB_COM_MOVE                    0x2A
-#define	SMB_COM_ECHO                    0x2B
-#define	SMB_COM_WRITE_AND_CLOSE         0x2C
-#define	SMB_COM_OPEN_ANDX               0x2D
-#define	SMB_COM_READ_ANDX               0x2E
-#define	SMB_COM_WRITE_ANDX              0x2F
-#define	SMB_COM_CLOSE_AND_TREE_DISC     0x31
-#define	SMB_COM_TRANSACTION2            0x32
-#define	SMB_COM_TRANSACTION2_SECONDARY  0x33
-#define	SMB_COM_FIND_CLOSE2             0x34
-#define	SMB_COM_FIND_NOTIFY_CLOSE       0x35
-#define	SMB_COM_TREE_CONNECT		0x70
-#define	SMB_COM_TREE_DISCONNECT         0x71
-#define	SMB_COM_NEGOTIATE               0x72
-#define	SMB_COM_SESSION_SETUP_ANDX      0x73
-#define	SMB_COM_LOGOFF_ANDX             0x74
-#define	SMB_COM_TREE_CONNECT_ANDX       0x75
-#define	SMB_COM_QUERY_INFORMATION_DISK  0x80
-#define	SMB_COM_SEARCH                  0x81
-#define	SMB_COM_FIND                    0x82
-#define	SMB_COM_FIND_UNIQUE             0x83
-#define	SMB_COM_NT_TRANSACT             0xA0
-#define	SMB_COM_NT_TRANSACT_SECONDARY   0xA1
-#define	SMB_COM_NT_CREATE_ANDX          0xA2
-#define	SMB_COM_NT_CANCEL               0xA4
-#define	SMB_COM_OPEN_PRINT_FILE         0xC0
-#define	SMB_COM_WRITE_PRINT_FILE        0xC1
-#define	SMB_COM_CLOSE_PRINT_FILE        0xC2
-#define	SMB_COM_GET_PRINT_QUEUE         0xC3
-#define	SMB_COM_READ_BULK               0xD8
-#define	SMB_COM_WRITE_BULK              0xD9
-#define	SMB_COM_WRITE_BULK_DATA         0xDA
-
-/*
- * TRANS2 commands
- */
-#define	SMB_TRANS2_OPEN2			0x00
-#define	SMB_TRANS2_FIND_FIRST2			0x01
-#define	SMB_TRANS2_FIND_NEXT2			0x02
-#define	SMB_TRANS2_QUERY_FS_INFORMATION		0x03
-#define	SMB_TRANS2_QUERY_PATH_INFORMATION	0x05
-#define	SMB_TRANS2_SET_PATH_INFORMATION		0x06
-#define	SMB_TRANS2_QUERY_FILE_INFORMATION	0x07
-#define	SMB_TRANS2_SET_FILE_INFORMATION		0x08
-#define	SMB_TRANS2_FSCTL			0x09
-#define	SMB_TRANS2_IOCTL2			0x0A
-#define	SMB_TRANS2_FIND_NOTIFY_FIRST		0x0B
-#define	SMB_TRANS2_FIND_NOTIFY_NEXT		0x0C
-#define	SMB_TRANS2_CREATE_DIRECTORY		0x0D
-#define	SMB_TRANS2_SESSION_SETUP		0x0E
-#define	SMB_TRANS2_GET_DFS_REFERRAL		0x10
-#define	SMB_TRANS2_REPORT_DFS_INCONSISTENCY	0x11
-
-/*
- * SMB_TRANS2_QUERY_FS_INFORMATION levels
- */
-#define SMB_INFO_ALLOCATION		1
-#define SMB_INFO_VOLUME			2
-#define SMB_QUERY_FS_VOLUME_INFO	0x102
-#define SMB_QUERY_FS_SIZE_INFO		0x103
-#define SMB_QUERY_FS_DEVICE_INFO	0x104
-#define SMB_QUERY_FS_ATTRIBUTE_INFO	0x105
-
-/*
- * SMB_TRANS2_QUERY_PATH levels
- */
-#define	SMB_QUERY_FILE_STANDARD			1
-#define	SMB_QUERY_FILE_EA_SIZE			2
-#define	SMB_QUERY_FILE_EAS_FROM_LIST		3
-#define	SMB_QUERY_FILE_ALL_EAS			4
-#define	SMB_QUERY_FILE_IS_NAME_VALID		6
-#define	SMB_QUERY_FILE_BASIC_INFO		0x101
-#define	SMB_QUERY_FILE_STANDARD_INFO		0x102
-#define	SMB_QUERY_FILE_EA_INFO			0x103
-#define	SMB_QUERY_FILE_NAME_INFO		0x104
-#define	SMB_QUERY_FILE_ALL_INFO			0x107
-#define	SMB_QUERY_FILE_ALT_NAME_INFO		0x108
-#define	SMB_QUERY_FILE_STREAM_INFO		0x109
-#define	SMB_QUERY_FILE_COMPRESSION_INFO		0x10b
-#define	SMB_QUERY_FILE_UNIX_BASIC		0x200
-#define	SMB_QUERY_FILE_UNIX_LINK		0x201
-#define	SMB_QUERY_FILE_MAC_DT_GET_APPL		0x306
-#define	SMB_QUERY_FILE_MAC_DT_GET_ICON		0x307
-#define	SMB_QUERY_FILE_MAC_DT_GET_ICON_INFO	0x308
-
-/*
- * SMB_TRANS2_FIND_FIRST2 information levels
- */
-#define SMB_INFO_STANDARD		1
-#define SMB_INFO_QUERY_EA_SIZE		2
-#define SMB_INFO_QUERY_EAS_FROM_LIST	3
-#define SMB_FIND_FILE_DIRECTORY_INFO	0x101
-#define SMB_FIND_FULL_DIRECTORY_INFO	0x102
-#define SMB_FIND_FILE_NAMES_INFO	0x103
-#define SMB_FIND_BOTH_DIRECTORY_INFO	0x104
-
-/*
- * Set PATH/FILE information levels
- */
-#define	SMB_SET_FILE_BASIC_INFO		0x101
-#define	SMB_SET_FILE_END_OF_FILE_INFO	0x104
-
-/*
- * LOCKING_ANDX LockType flags
- */
-#define SMB_LOCKING_ANDX_SHARED_LOCK	0x01
-#define SMB_LOCKING_ANDX_OPLOCK_RELEASE	0x02
-#define SMB_LOCKING_ANDX_CHANGE_LOCKTYPE 0x04
-#define SMB_LOCKING_ANDX_CANCEL_LOCK	0x08
-#define SMB_LOCKING_ANDX_LARGE_FILES	0x10
-
-/*
- * Some names length limitations. Some of them aren't declared by specs,
- * but we need reasonable limits.
- */
-#define SMB_MAXSRVNAMELEN	15	/* NetBIOS limit */
-#define SMB_MAXUSERNAMELEN	128
-#define SMB_MAXPASSWORDLEN	128
-#define	SMB_MAXSHARENAMELEN	128
-#define	SMB_MAXPKTLEN		0x1FFFF
-#define	SMB_MAXCHALLENGELEN	8
-#define	SMB_MAXFNAMELEN		255	/* Keep in sync with MAXNAMLEN */
-
-#define	SMB_MAXRCN		3	/* number of reconnect attempts */
-
-/*
- * Error classes
- */
-#define SMBSUCCESS	0x00
-#define ERRDOS		0x01
-#define ERRSRV		0x02
-#define ERRHRD		0x03	/* Error is a hardware error. */
-#define ERRCMD		0xFF	/* Command was not in the "SMB" format. */
-
-/*
- * Error codes for the ERRDOS class
- */
-#define ERRbadfunc	1	/* Invalid function */
-#define ERRbadfile	2	/* File not found (last component) */
-#define ERRbadpath	3	/* Directory invalid */
-#define ERRnofids	4	/* Too many open files */
-#define ERRnoaccess	5	/* Access denied */
-#define ERRbadfid	6	/* Invalid file handle */
-#define ERRbadmcb	7	/* Memory control blocks destroyed (huh ?) */
-#define ERRnomem	8	/* Insufficient memory */
-#define ERRbadmem	9	/* Invalid memory block address */
-#define ERRbadenv	10	/* Invalid environment */
-#define ERRbadformat	11	/* Invalid format */
-#define ERRbadaccess	12	/* Invalid open mode */
-#define ERRbaddata	13	/* Invalid data */
-#define ERRbaddrive	15	/* Invalid drive specified */
-#define ERRremcd	16	/* An attempt to delete current directory */
-#define ERRdiffdevice	17	/* cross fs rename/move */
-#define ERRnofiles	18	/* no more files found in file search */
-#define ERRbadshare	32	/* Share mode can't be granted */
-#define ERRlock		33	/* A lock request conflicts with existing lock */
-#define ERRunsup	50	/* unsupported - Win 95 */
-#define ERRnoipc	66	/* ipc unsupported */
-#define ERRnosuchshare	67	/* invalid share name */
-#define ERRfilexists	80	/* The file named in the request already exists */
-#define	ERRquota	112	/* W2K returns this if quota space exceeds */
-#define ERRcannotopen	110	/* cannot open the file */
-#define ERRinvalidname	123
-#define ERRunknownlevel 124
-#define ERRnotlocked	158	/* region was not locked by this context */
-#define ERRrename	183
-#define ERRbadpipe	230	/* named pipe invalid */
-#define ERRpipebusy	231	/* all pipe instances are busy */
-#define ERRpipeclosing	232	/* close in progress */
-#define ERRnotconnected	233	/* nobody on other end of pipe */
-#define ERRmoredata	234	/* more data to be returned */
-#define ERRbaddirectory	267	/* invalid directory name */
-#define ERReasunsupported	282	/* extended attributes not supported */
-#define ERRunknownipc	2142
-#define ERRbuftoosmall	2123
-#define ERRnosuchprintjob	2151
-
-/*
- * Error codes for the ERRSRV class
- */
-#define ERRerror	1	/* Non-specific error code */
-#define ERRbadpw	2	/* Bad password */
-#define ERRbadtype	3	/* reserved */
-#define ERRaccess	4	/* The client doesn't have enough access rights */
-#define ERRinvnid	5	/* The Tid specified in a command is invalid */
-#define ERRinvnetname	6	/* Invalid server name in the tree connect */
-#define ERRinvdevice	7	/* Printer and not printer devices are mixed */
-#define ERRqfull	49	/* Print queue full */
-#define ERRqtoobig	50	/* Print queue full - no space */
-#define ERRinvpfid	52	/* Invalid print file FID */
-#define ERRsmbcmd	64	/* The server did not recognize the command */
-#define ERRsrverror	65	/* The server encountered and internal error */
-#define ERRfilespecs	67	/* The Fid and path name contains an invalid combination */
-#define ERRbadpermits	69	/* Access mode invalid */
-#define ERRsetattrmode	71	/* Attribute mode invalid */
-#define ERRpaused	81	/* Server is paused */
-#define ERRmsgoff	82	/* Not receiving messages */
-#define ERRnoroom	83	/* No room to buffer message */
-#define ERRrmuns	87	/* Too many remote user names */
-#define ERRtimeout	88	/* Operation timed out */
-#define ERRnoresource	89	/* No resources currently available for request */
-#define ERRtoomanyuids	90      /* Too many UIDs active on this session */
-#define ERRbaduid	91	/* The UID is not known in this session */
-#define ERRusempx	250	/* Temporarily unable to support Raw, use MPX mode */
-#define ERRusestd	251	/* Temporarily unable to support Raw, use standard r/w */
-#define ERRcontmpx	252	/* Continue in MPX mode */
-#define ERRbadPassword	254
-#define	ERRaccountExpired 2239
-#define	ERRbadClient	2240	/* Cannot access the server from this workstation */
-#define	ERRbadLogonTime	2241	/* Cannot access the server at this time **/
-#define	ERRpasswordExpired 2242
-#define ERRnosupport	65535	/* Invalid function */
-
-/*
- * Error codes for the ERRHRD class
- */
-#define ERRnowrite	19	/* write protected media */
-#define ERRbadunit	20	/* Unknown unit */
-#define ERRnotready	21	/* Drive not ready */
-#define ERRbadcmd	22	/* Unknown command */
-#define ERRdata		23	/* Data error (CRC) */
-#define ERRbadreq	24	/* Bad request structure length */
-#define ERRseek		25	/* Seek error */
-#define ERRbadmedia	26	/* Unknown media type */
-#define ERRbadsector	27	/* Sector not found */
-#define ERRnopaper	28	/* Printer out of paper */
-#define ERRwrite	29	/* Write fault */
-#define ERRread		30	/* Read fault */
-#define ERRgeneral	31	/* General failure */
-#define	ERRbadshare	32	/* An open conflicts with an existing open */
-#define	ERRlock		33	/* lock/unlock conflict */
-#define ERRwrongdisk	34	/* The wrong disk was found in a drive */
-#define ERRFCBunavail	35	/* No FCBs available */
-#define ERRsharebufexc	36	/* A sharing buffer has been exceeded */
-#define ERRdiskfull	39
-
-/*
- * RAP error codes (it seems that they returned not only by RAP)
- */
-#define	SMB_ERROR_ACCESS_DENIED		5
-#define	SMB_ERROR_NETWORK_ACCESS_DENIED	65
-#define	SMB_ERROR_MORE_DATA		234
-
-typedef u_int16_t	smbfh;
-
-#endif /* _NETSMB_SMB_H_ */
diff --git a/include.new/netsmb/smb_conn.h b/include.new/netsmb/smb_conn.h
deleted file mode 100644
index 0523848..0000000
--- a/include.new/netsmb/smb_conn.h
+++ /dev/null
@@ -1,467 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/netsmb/smb_conn.h 250237 2013-05-04 14:18:10Z davide $
- */
-
-/*
- * Two levels of connection hierarchy
- */
-#define	SMBL_SM		0
-#define SMBL_VC		1
-#define SMBL_SHARE	2
-#define SMBL_NUM	3
-#define SMBL_NONE	(-1)
-
-#define	SMB_CS_NONE	0x0000
-#define	SMB_CS_UPPER	0x0001		/* convert passed string to upper case */
-#define	SMB_CS_LOWER	0x0002		/* convert passed string to lower case */
-
-/*
- * Common object flags
- */
-#define SMBO_GONE		0x1000000
-
-/*
- * access modes
- */
-#define	SMBM_READ		0400	/* read conn attrs.(like list shares) */
-#define	SMBM_WRITE		0200	/* modify conn attrs */
-#define	SMBM_EXEC		0100	/* can send SMB requests */
-#define	SMBM_READGRP		0040
-#define	SMBM_WRITEGRP		0020
-#define	SMBM_EXECGRP		0010
-#define	SMBM_READOTH		0004
-#define	SMBM_WRITEOTH		0002
-#define	SMBM_EXECOTH		0001
-#define	SMBM_MASK		0777
-#define	SMBM_EXACT		010000	/* check for specified mode exactly */
-#define	SMBM_ALL		(SMBM_READ | SMBM_WRITE | SMBM_EXEC)
-#define	SMBM_DEFAULT		(SMBM_READ | SMBM_WRITE | SMBM_EXEC)
-#define	SMBM_ANY_OWNER		((uid_t)-1)
-#define	SMBM_ANY_GROUP		((gid_t)-1)
-
-/*
- * VC flags
- */
-#define SMBV_PERMANENT		0x0002
-#define SMBV_LONGNAMES		0x0004	/* connection is configured to use long names */
-#define	SMBV_ENCRYPT		0x0008	/* server asked for encrypted password */
-#define	SMBV_WIN95		0x0010	/* used to apply bugfixes for this OS */
-#define	SMBV_PRIVATE		0x0020	/* connection can be used only by creator */
-#define	SMBV_RECONNECTING	0x0040	/* conn is in the process of reconnection */
-#define SMBV_SINGLESHARE	0x0080	/* only one share connecting should be allowed */
-#define SMBV_CREATE		0x0100	/* lookup for create operation */
-/*#define SMBV_FAILED		0x0200*/	/* last reconnect attempt has failed */
-#define SMBV_UNICODE		0x0400	/* connection is configured to use Unicode */
-
-
-/*
- * smb_share flags
- */
-#define SMBS_PERMANENT		0x0001
-#define SMBS_RECONNECTING	0x0002
-#define SMBS_CONNECTED		0x0004
-
-/*
- * share types
- */
-#define	SMB_ST_DISK		0x0	/* A: */
-#define	SMB_ST_PRINTER		0x1	/* LPT: */
-#define	SMB_ST_PIPE		0x2	/* IPC */
-#define	SMB_ST_COMM		0x3	/* COMM */
-#define	SMB_ST_ANY		0x4
-#define	SMB_ST_MAX		0x4
-#define SMB_ST_NONE		0xff	/* not a part of protocol */
-
-/*
- * Negotiated protocol parameters
- */
-struct smb_sopt {
-	int		sv_proto;
-	int16_t		sv_tz;		/* offset in min relative to UTC */
-	uint32_t	sv_maxtx;	/* maximum transmit buf size */
-	u_char		sv_sm;		/* security mode */
-	u_int16_t	sv_maxmux;	/* max number of outstanding rq's */
-	u_int16_t 	sv_maxvcs;	/* max number of VCs */
-	u_int16_t	sv_rawmode;
-	uint32_t	sv_maxraw;	/* maximum raw-buffer size */
-	uint32_t	sv_skey;	/* session key */
-	uint32_t	sv_caps;	/* capabilities SMB_CAP_ */
-};
-
-/*
- * network IO daemon states
- */
-enum smbiod_state {
-	SMBIOD_ST_NOTCONN,	/* no connect request was made */
-	SMBIOD_ST_RECONNECT,	/* a [re]connect attempt is in progress */
-	SMBIOD_ST_TRANACTIVE,	/* transport level is up */
-	SMBIOD_ST_VCACTIVE,	/* session established */
-	SMBIOD_ST_DEAD		/* connection broken, transport is down */
-};
-
-
-/*
- * Info structures
- */
-#define	SMB_INFO_NONE		0
-#define	SMB_INFO_VC		2
-#define	SMB_INFO_SHARE		3
-
-struct smb_vc_info {
-	int		itype;
-	int		usecount;
-	uid_t		uid;		/* user id of connection */
-	gid_t		gid;		/* group of connection */
-	mode_t		mode;		/* access mode */
-	int		flags;
-	enum smbiod_state iodstate;
-	struct smb_sopt	sopt;
-	char		srvname[SMB_MAXSRVNAMELEN + 1];
-	char		vcname[128];
-};
-
-struct smb_share_info {
-	int		itype;
-	int		usecount;
-	u_short		tid;		/* TID */
-	int		type;		/* share type */
-	uid_t		uid;		/* user id of connection */
-	gid_t		gid;		/* group of connection */
-	mode_t		mode;		/* access mode */
-	int		flags;
-	char		sname[128];
-};
-
-#ifdef _KERNEL
-
-#include <netsmb/smb_subr.h>
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/condvar.h>
-#include <sys/sx.h>
-
-#define CONNADDREQ(a1,a2)	((a1)->sa_len == (a2)->sa_len && \
-				 bcmp(a1, a2, (a1)->sa_len) == 0)
-
-struct smb_vc;
-struct smb_share;
-struct smb_cred;
-struct smb_rq;
-struct mbdata;
-struct smbioc_oshare;
-struct smbioc_ossn;
-struct uio;
-
-TAILQ_HEAD(smb_rqhead, smb_rq);
-
-#define SMB_DEFRQTIMO	5
-
-#define SMB_DIALECT(vcp)	((vcp)->vc_sopt.sv_proto)
-
-struct smb_tran_desc;
-
-/*
- * Connection object
- */
-struct smb_connobj;
-
-typedef void smb_co_gone_t (struct smb_connobj *cp, struct smb_cred *scred);
-typedef void smb_co_free_t (struct smb_connobj *cp);
-
-struct smb_connobj {
-	struct cv		co_lock;
-	struct thread		*co_locker;
-	struct sx		co_interlock;
-	int			co_lockcnt;
-	int			co_level;	/* SMBL_ */
-	int			co_flags;
-	int			co_usecount;
-	struct smb_connobj *	co_parent;
-	SLIST_HEAD(,smb_connobj)co_children;
-	SLIST_ENTRY(smb_connobj)co_next;
-	smb_co_gone_t *		co_gone;
-	smb_co_free_t *		co_free;
-};
-
-#define	SMBCO_FOREACH(var, cp)	SLIST_FOREACH((var), &(cp)->co_children, co_next)
-
-/*
- * Virtual Circuit (session) to a server.
- * This is the most (over)complicated part of SMB protocol.
- * For the user security level (usl), each session with different remote
- * user name has its own VC.
- * It is unclear however, should share security level (ssl) allow additional
- * VCs, because user name is not used and can be the same. On other hand,
- * multiple VCs allows us to create separate sessions to server on a per
- * user basis.
- */
-
-/*
- * This lock protects vc_flags
- */
-#define	SMBC_ST_LOCK(vcp)	smb_sl_lock(&(vcp)->vc_stlock)
-#define	SMBC_ST_UNLOCK(vcp)	smb_sl_unlock(&(vcp)->vc_stlock)
-
-struct smb_vc {
-	struct smb_connobj obj;
-	char *		vc_srvname;
-	struct sockaddr*vc_paddr;	/* server addr */
-	struct sockaddr*vc_laddr;	/* local addr, if any */
-	char *		vc_username;
-	char *		vc_pass;	/* password for usl case */
-	char *		vc_domain;	/* workgroup/primary domain */
-
-	u_int		vc_timo;	/* default request timeout */
-	int		vc_maxvcs;	/* maximum number of VC per connection */
-
-	void *		vc_tolower;	/* local charset */
-	void *		vc_toupper;	/* local charset */
-	void *		vc_toserver;	/* local charset to server one */
-	void *		vc_tolocal;	/* server charset to local one */
-	void *		vc_cp_toserver;	/* local charset to server one (using CodePage) */
-	void *		vc_cp_tolocal;	/* server charset to local one (using CodePage) */
-	void *		vc_ucs_toserver; /* local charset to server one (using UCS-2) */
-	void *		vc_ucs_tolocal;	/* server charset to local one (using UCS-2) */
-	int		vc_number;	/* number of this VC from the client side */
-	int		vc_genid;
-	uid_t		vc_uid;		/* user id of connection */
-	gid_t		vc_grp;		/* group of connection */
-	mode_t		vc_mode;	/* access mode */
-	u_short		vc_smbuid;	/* unique vc id assigned by server */
-
-	u_char		vc_hflags;	/* or'ed with flags in the smb header */
-	u_short		vc_hflags2;	/* or'ed with flags in the smb header */
-	void *		vc_tdata;	/* transport control block */
-	struct smb_tran_desc *vc_tdesc;
-	int		vc_chlen;	/* actual challenge length */
-	u_char 		vc_ch[SMB_MAXCHALLENGELEN];
-	u_short		vc_mid;		/* multiplex id */
-	struct smb_sopt	vc_sopt;	/* server options */
-	int		vc_txmax;	/* max tx/rx packet size */
-	int		vc_rxmax;	/* max readx data size */
-	int		vc_wxmax;	/* max writex data size */
-	struct smbiod *	vc_iod;
-	struct smb_slock vc_stlock;
-	uint32_t	vc_seqno;	/* my next sequence number */
-	u_int8_t	*vc_mackey;	/* MAC key */
-	int		vc_mackeylen;	/* length of MAC key */
-};
-
-#define vc_maxmux	vc_sopt.sv_maxmux
-#define	vc_flags	obj.co_flags
-
-#define SMB_UNICODE_STRINGS(vcp)	((vcp)->vc_hflags2 & SMB_FLAGS2_UNICODE)
-
-#define	SMB_UNICODE_NAME	"UCS-2LE"
-
-/*
- * smb_share structure describes connection to the given SMB share (tree).
- * Connection to share is always built on top of the VC.
- */
-
-/*
- * This lock protects ss_flags
- */
-#define	SMBS_ST_LOCK(ssp)	smb_sl_lock(&(ssp)->ss_stlock)
-#define	SMBS_ST_LOCKPTR(ssp)	(&(ssp)->ss_stlock)
-#define	SMBS_ST_UNLOCK(ssp)	smb_sl_unlock(&(ssp)->ss_stlock)
-
-struct smb_share {
-	struct smb_connobj obj;
-	char *		ss_name;
-	u_short		ss_tid;		/* TID */
-	int		ss_type;	/* share type */
-	uid_t		ss_uid;		/* user id of connection */
-	gid_t		ss_grp;		/* group of connection */
-	mode_t		ss_mode;	/* access mode */
-	int		ss_vcgenid;
-	char *		ss_pass;	/* password to a share, can be null */
-	struct smb_slock ss_stlock;
-};
-
-#define	ss_flags	obj.co_flags
-
-#define CPTOVC(cp)	((struct smb_vc*)(cp))
-#define VCTOCP(vcp)	(&(vcp)->obj)
-#define CPTOSS(cp)	((struct smb_share*)(cp))
-#define	SSTOVC(ssp)	CPTOVC(((ssp)->obj.co_parent))
-#define SSTOCP(ssp)	(&(ssp)->obj)
-
-struct smb_vcspec {
-	char *		srvname;
-	struct sockaddr*sap;
-	struct sockaddr*lap;
-	int		flags;
-	char *		username;
-	char *		pass;
-	char *		domain;
-	mode_t		mode;
-	mode_t		rights;
-	uid_t		owner;
-	gid_t		group;
-	char *		localcs;
-	char *		servercs;
-	struct smb_sharespec *shspec;
-	struct smb_share *ssp;		/* returned */
-	/*
-	 * The rest is an internal data
-	 */
-	struct smb_cred *scred;
-};
-
-struct smb_sharespec {
-	char *		name;
-	char *		pass;
-	mode_t		mode;
-	mode_t		rights;
-	uid_t		owner;
-	gid_t		group;
-	int		stype;
-	/*
-	 * The rest is an internal data
-	 */
-	struct smb_cred *scred;
-};
-
-/*
- * Session level functions
- */
-int  smb_sm_init(void);
-int  smb_sm_done(void);
-int  smb_sm_lookup(struct smb_vcspec *vcspec,
-	struct smb_sharespec *shspec, struct smb_cred *scred,
-	struct smb_vc **vcpp);
-
-/*
- * Connection object
- */
-void smb_co_ref(struct smb_connobj *cp);
-void smb_co_rele(struct smb_connobj *cp, struct smb_cred *scred);
-int  smb_co_get(struct smb_connobj *cp, struct smb_cred *scred);
-void smb_co_put(struct smb_connobj *cp, struct smb_cred *scred);
-int  smb_co_lock(struct smb_connobj *cp);
-void smb_co_unlock(struct smb_connobj *cp);
-
-/*
- * session level functions
- */
-int  smb_vc_create(struct smb_vcspec *vcspec,
-	struct smb_cred *scred, struct smb_vc **vcpp);
-int  smb_vc_connect(struct smb_vc *vcp, struct smb_cred *scred);
-int  smb_vc_access(struct smb_vc *vcp, struct smb_cred *scred, mode_t mode);
-int  smb_vc_get(struct smb_vc *vcp, struct smb_cred *scred);
-void smb_vc_put(struct smb_vc *vcp, struct smb_cred *scred);
-void smb_vc_ref(struct smb_vc *vcp);
-void smb_vc_rele(struct smb_vc *vcp, struct smb_cred *scred);
-int  smb_vc_lock(struct smb_vc *vcp);
-void smb_vc_unlock(struct smb_vc *vcp);
-int  smb_vc_lookupshare(struct smb_vc *vcp, struct smb_sharespec *shspec,
-	struct smb_cred *scred, struct smb_share **sspp);
-const char * smb_vc_getpass(struct smb_vc *vcp);
-u_short smb_vc_nextmid(struct smb_vc *vcp);
-
-/*
- * share level functions
- */
-int  smb_share_create(struct smb_vc *vcp, struct smb_sharespec *shspec,
-	struct smb_cred *scred, struct smb_share **sspp);
-int  smb_share_access(struct smb_share *ssp, struct smb_cred *scred, mode_t mode);
-void smb_share_ref(struct smb_share *ssp);
-void smb_share_rele(struct smb_share *ssp, struct smb_cred *scred);
-int  smb_share_get(struct smb_share *ssp, struct smb_cred *scred);
-void smb_share_put(struct smb_share *ssp, struct smb_cred *scred);
-int  smb_share_lock(struct smb_share *ssp);
-void smb_share_unlock(struct smb_share *ssp);
-void smb_share_invalidate(struct smb_share *ssp);
-int  smb_share_valid(struct smb_share *ssp);
-const char * smb_share_getpass(struct smb_share *ssp);
-
-/*
- * SMB protocol level functions
- */
-int  smb_smb_negotiate(struct smb_vc *vcp, struct smb_cred *scred);
-int  smb_smb_ssnsetup(struct smb_vc *vcp, struct smb_cred *scred);
-int  smb_smb_ssnclose(struct smb_vc *vcp, struct smb_cred *scred);
-int  smb_smb_treeconnect(struct smb_share *ssp, struct smb_cred *scred);
-int  smb_smb_treedisconnect(struct smb_share *ssp, struct smb_cred *scred);
-int  smb_read(struct smb_share *ssp, u_int16_t fid, struct uio *uio,
-	struct smb_cred *scred);
-int  smb_write(struct smb_share *ssp, u_int16_t fid, struct uio *uio,
-	struct smb_cred *scred);
-int  smb_smb_echo(struct smb_vc *vcp, struct smb_cred *scred);
-
-/*
- * smbiod thread
- */
-
-#define	SMBIOD_EV_NEWRQ		0x0001
-#define	SMBIOD_EV_SHUTDOWN	0x0002
-#define	SMBIOD_EV_CONNECT	0x0003
-#define	SMBIOD_EV_DISCONNECT	0x0004
-#define	SMBIOD_EV_TREECONNECT	0x0005
-#define	SMBIOD_EV_MASK		0x00ff
-#define	SMBIOD_EV_SYNC		0x0100
-#define	SMBIOD_EV_PROCESSING	0x0200
-
-struct smbiod_event {
-	int	ev_type;
-	int	ev_error;
-	void *	ev_ident;
-	STAILQ_ENTRY(smbiod_event)	ev_link;
-};
-
-#define	SMBIOD_SHUTDOWN		0x0001
-
-struct smbiod {
-	int			iod_id;
-	int			iod_flags;
-	enum smbiod_state	iod_state;
-	int			iod_muxcnt;	/* number of active outstanding requests */
-	int			iod_sleeptimo;
-	struct smb_vc *		iod_vc;
-	struct smb_slock	iod_rqlock;	/* iod_rqlist, iod_muxwant */
-	struct smb_rqhead	iod_rqlist;	/* list of outstanding requests */
-	int			iod_muxwant;
-	struct proc *		iod_p;
-	struct thread *		iod_td;
-	struct smb_cred		iod_scred;
-	struct smb_slock	iod_evlock;	/* iod_evlist */
-	STAILQ_HEAD(,smbiod_event) iod_evlist;
-	struct timespec 	iod_lastrqsent;
-	struct timespec 	iod_pingtimo;
-};
-
-int  smb_iod_init(void);
-int  smb_iod_done(void);
-int  smb_iod_create(struct smb_vc *vcp);
-int  smb_iod_destroy(struct smbiod *iod);
-int  smb_iod_request(struct smbiod *iod, int event, void *ident);
-int  smb_iod_addrq(struct smb_rq *rqp);
-int  smb_iod_waitrq(struct smb_rq *rqp);
-int  smb_iod_removerq(struct smb_rq *rqp);
-
-#endif /* _KERNEL */
diff --git a/include.new/netsmb/smb_dev.h b/include.new/netsmb/smb_dev.h
deleted file mode 100644
index 57fc7b5..0000000
--- a/include.new/netsmb/smb_dev.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/netsmb/smb_dev.h 250236 2013-05-04 14:03:18Z davide $
- */
-#ifndef _NETSMB_DEV_H_
-#define _NETSMB_DEV_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-#include <netsmb/smb.h>
-
-#define	NSMB_NAME		"nsmb"
-
-#define NSMB_VERMAJ	1
-#define NSMB_VERMIN	3006
-#define NSMB_VERSION	(NSMB_VERMAJ * 100000 + NSMB_VERMIN)
-
-#define NSMBFL_OPEN		0x0001
-
-#define	SMBVOPT_CREATE		0x0001	/* create object if necessary */
-#define	SMBVOPT_PRIVATE		0x0002	/* connection should be private */
-#define	SMBVOPT_SINGLESHARE	0x0004	/* keep only one share at this VC */
-#define	SMBVOPT_PERMANENT	0x0010	/* object will keep last reference */
-
-#define	SMBSOPT_CREATE		0x0001	/* create object if necessary */
-#define	SMBSOPT_PERMANENT	0x0010	/* object will keep last reference */
-
-/*
- * SMBIOC_LOOKUP flags
- */
-#define SMBLK_CREATE		0x0001
-
-struct smbioc_ossn {
-	int		ioc_opt;
-	uint32_t	ioc_svlen;	/* size of ioc_server address */
-	struct sockaddr*ioc_server;
-	uint32_t	ioc_lolen;	/* size of ioc_local address */
-	struct sockaddr*ioc_local;
-	char		ioc_srvname[SMB_MAXSRVNAMELEN + 1];
-	int		ioc_timeout;
-	int		ioc_retrycount;	/* number of retries before giveup */
-	char		ioc_localcs[16];/* local charset */
-	char		ioc_servercs[16];/* server charset */
-	char		ioc_user[SMB_MAXUSERNAMELEN + 1];
-	char		ioc_workgroup[SMB_MAXUSERNAMELEN + 1];
-	char		ioc_password[SMB_MAXPASSWORDLEN + 1];
-	uid_t		ioc_owner;	/* proposed owner */
-	gid_t		ioc_group;	/* proposed group */
-	mode_t		ioc_mode;	/* desired access mode */
-	mode_t		ioc_rights;	/* SMBM_* */
-};
-
-struct smbioc_oshare {
-	int		ioc_opt;
-	int		ioc_stype;	/* share type */
-	char		ioc_share[SMB_MAXSHARENAMELEN + 1];
-	char		ioc_password[SMB_MAXPASSWORDLEN + 1];
-	uid_t		ioc_owner;	/* proposed owner of share */
-	gid_t		ioc_group;	/* proposed group of share */
-	mode_t		ioc_mode;	/* desired access mode to share */
-	mode_t		ioc_rights;	/* SMBM_* */
-};
-
-struct smbioc_rq {
-	u_char		ioc_cmd;
-	u_char		ioc_twc;
-	void *		ioc_twords;
-	u_short		ioc_tbc;
-	void *		ioc_tbytes;
-	int		ioc_rpbufsz;
-	char *		ioc_rpbuf;
-	u_char		ioc_rwc;
-	u_short		ioc_rbc;
-	u_int8_t	ioc_errclass;
-	u_int16_t	ioc_serror;
-	uint32_t	ioc_error;
-};
-
-struct smbioc_t2rq {
-	u_int16_t	ioc_setup[3];
-	int		ioc_setupcnt;
-	char *		ioc_name;
-	u_short		ioc_tparamcnt;
-	void *		ioc_tparam;
-	u_short		ioc_tdatacnt;
-	void *		ioc_tdata;
-	u_short		ioc_rparamcnt;
-	void *		ioc_rparam;
-	u_short		ioc_rdatacnt;
-	void *		ioc_rdata;
-};
-
-struct smbioc_flags {
-	int		ioc_level;	/* 0 - session, 1 - share */
-	int		ioc_mask;
-	int		ioc_flags;
-};
-
-struct smbioc_lookup {
-	int		ioc_level;
-	int		ioc_flags;
-	struct smbioc_ossn	ioc_ssn;
-	struct smbioc_oshare	ioc_sh;
-};
-
-struct smbioc_rw {
-	smbfh	ioc_fh;
-	char *	ioc_base;
-	off_t	ioc_offset;
-	int	ioc_cnt;
-};
-
-/*
- * Device IOCTLs
- */
-#define	SMBIOC_OPENSESSION	_IOW('n',  100, struct smbioc_ossn)
-#define	SMBIOC_OPENSHARE	_IOW('n',  101, struct smbioc_oshare)
-#define	SMBIOC_REQUEST		_IOWR('n', 102, struct smbioc_rq)
-#define	SMBIOC_T2RQ		_IOWR('n', 103, struct smbioc_t2rq)
-#define	SMBIOC_SETFLAGS		_IOW('n',  104, struct smbioc_flags)
-#define	SMBIOC_LOOKUP		_IOW('n',  106, struct smbioc_lookup)
-#define	SMBIOC_READ		_IOWR('n', 107, struct smbioc_rw)
-#define	SMBIOC_WRITE		_IOWR('n', 108, struct smbioc_rw)
-
-#ifdef _KERNEL
-
-#define SMBST_CONNECTED	1
-
-STAILQ_HEAD(smbrqh, smb_rq);
-
-struct smb_dev {
-	struct cdev *	dev;
-	int		sd_opened;
-	int		sd_level;
-	struct smb_vc * sd_vc;		/* reference to VC */
-	struct smb_share *sd_share;	/* reference to share if any */
-	int		sd_poll;
-	int		sd_seq;
-	int		sd_flags;
-	int		refcount;
-	int		usecount;
-};
-
-extern struct sx smb_lock;
-#define	SMB_LOCK()		sx_xlock(&smb_lock)
-#define	SMB_UNLOCK() 		sx_unlock(&smb_lock)
-#define	SMB_LOCKASSERT()	sx_assert(&smb_lock, SA_XLOCKED)
-
-struct smb_cred;
-
-void sdp_dtor(void *arg);
-void sdp_trydestroy(struct smb_dev *dev);
-
-/*
- * Compound user interface
- */
-int  smb_usr_lookup(struct smbioc_lookup *dp, struct smb_cred *scred,
-	struct smb_vc **vcpp, struct smb_share **sspp);
-int  smb_usr_opensession(struct smbioc_ossn *data,
-	struct smb_cred *scred,	struct smb_vc **vcpp);
-int  smb_usr_openshare(struct smb_vc *vcp, struct smbioc_oshare *data,
-	struct smb_cred *scred, struct smb_share **sspp);
-int  smb_usr_simplerequest(struct smb_share *ssp, struct smbioc_rq *data,
-	struct smb_cred *scred);
-int  smb_usr_t2request(struct smb_share *ssp, struct smbioc_t2rq *data,
-	struct smb_cred *scred);
-int  smb_dev2share(int fd, int mode, struct smb_cred *scred,
-	struct smb_share **sspp, struct smb_dev **ssdp);
-
-
-#endif /* _KERNEL */
-
-#endif /* _NETSMB_DEV_H_ */
diff --git a/include.new/netsmb/smb_rq.h b/include.new/netsmb/smb_rq.h
deleted file mode 100644
index b2c154c..0000000
--- a/include.new/netsmb/smb_rq.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/netsmb/smb_rq.h 206361 2010-04-07 16:50:38Z joel $
- */
-#ifndef _NETSMB_SMB_RQ_H_
-#define	_NETSMB_SMB_RQ_H_
-
-#ifndef MB_MSYSTEM
-#include <sys/mchain.h>
-#endif
-
-#define	SMBR_ALLOCED		0x0001	/* structure was malloced */
-#define	SMBR_SENT		0x0002	/* request successfully transmitted */
-#define	SMBR_REXMIT		0x0004	/* request should be retransmitted */
-#define	SMBR_INTR		0x0008	/* request interrupted */
-#define	SMBR_RESTART		0x0010	/* request should be repeated if possible */
-#define	SMBR_NORESTART		0x0020	/* request is not restartable */
-#define	SMBR_MULTIPACKET	0x0040	/* multiple packets can be sent and received */
-#define	SMBR_INTERNAL		0x0080	/* request is internal to smbrqd */
-#define	SMBR_XLOCK		0x0100	/* request locked and can't be moved */
-#define	SMBR_XLOCKWANT		0x0200	/* waiter on XLOCK */
-
-#define SMBT2_ALLSENT		0x0001	/* all data and params are sent */
-#define SMBT2_ALLRECV		0x0002	/* all data and params are received */
-#define	SMBT2_ALLOCED		0x0004
-#define	SMBT2_RESTART		0x0008
-#define	SMBT2_NORESTART		0x0010
-#define	SMBT2_SECONDARY		0x0020	/* secondary request */
-
-#define SMBRQ_SLOCK(rqp)	smb_sl_lock(&(rqp)->sr_slock)
-#define SMBRQ_SUNLOCK(rqp)	smb_sl_unlock(&(rqp)->sr_slock)
-#define SMBRQ_SLOCKPTR(rqp)	(&(rqp)->sr_slock)
-
-
-enum smbrq_state {
-	SMBRQ_NOTSENT,		/* rq have data to send */
-	SMBRQ_SENT,		/* send procedure completed */
-	SMBRQ_REPLYRECEIVED,
-	SMBRQ_NOTIFIED		/* owner notified about completion */
-};
-
-struct smb_vc;
-struct smb_t2rq;
-
-struct smb_rq {
-	enum smbrq_state	sr_state;
-	struct smb_vc * 	sr_vc;
-	struct smb_share*	sr_share;
-	u_short			sr_mid;
-	uint32_t		sr_seqno;
-	uint32_t		sr_rseqno;
-	struct mbchain		sr_rq;
-	u_int8_t		sr_rqflags;
-	u_int16_t		sr_rqflags2;
-	u_char *		sr_wcount;
-	void *			sr_bcount;	/* Points to 2-byte buffer. */
-	struct mdchain		sr_rp;
-	int			sr_rpgen;
-	int			sr_rplast;
-	int			sr_flags;	/* SMBR_* */
-	int			sr_rpsize;
-	struct smb_cred *	sr_cred;
-	int			sr_timo;
-	int			sr_rexmit;
-	int			sr_sendcnt;
-	struct timespec 	sr_timesent;
-	int			sr_lerror;
-	u_int8_t *		sr_rqsig;
-	void *			sr_rqtid;	/* Points to 2-byte buffer. */
-	void *			sr_rquid;	/* Points to 2-byte buffer. */
-	u_int8_t		sr_errclass;
-	u_int16_t		sr_serror;
-	uint32_t		sr_error;
-	u_int8_t		sr_rpflags;
-	u_int16_t		sr_rpflags2;
-	u_int16_t		sr_rptid;
-	u_int16_t		sr_rppid;
-	u_int16_t		sr_rpuid;
-	u_int16_t		sr_rpmid;
-	struct smb_slock	sr_slock;	/* short term locks */
-	struct smb_t2rq *	sr_t2;
-	TAILQ_ENTRY(smb_rq)	sr_link;
-};
-
-struct smb_t2rq {
-	u_int16_t	t2_setupcount;
-	u_int16_t *	t2_setupdata;
-	u_int16_t	t2_setup[2];	/* most of rqs has setupcount of 1 */
-	u_int8_t	t2_maxscount;	/* max setup words to return */
-	u_int16_t	t2_maxpcount;	/* max param bytes to return */
-	u_int16_t	t2_maxdcount;	/* max data bytes to return */
-	u_int16_t	t2_fid;		/* for T2 request */
-	char *		t_name;		/* for T request, should be zero for T2 */
-	int		t2_flags;	/* SMBT2_ */
-	struct mbchain	t2_tparam;	/* parameters to transmit */
-	struct mbchain	t2_tdata;	/* data to transmit */
-	struct mdchain	t2_rparam;	/* received parameters */
-	struct mdchain	t2_rdata;	/* received data */
-	struct smb_cred*t2_cred;
-	struct smb_connobj *t2_source;
-	struct smb_rq *	t2_rq;
-	struct smb_vc * t2_vc;
-};
-
-int  smb_rq_alloc(struct smb_connobj *layer, u_char cmd,
-	struct smb_cred *scred, struct smb_rq **rqpp);
-int  smb_rq_init(struct smb_rq *rqp, struct smb_connobj *layer, u_char cmd,
-	struct smb_cred *scred);
-void smb_rq_done(struct smb_rq *rqp);
-int  smb_rq_getrequest(struct smb_rq *rqp, struct mbchain **mbpp);
-int  smb_rq_getreply(struct smb_rq *rqp, struct mdchain **mbpp);
-void smb_rq_wstart(struct smb_rq *rqp);
-void smb_rq_wend(struct smb_rq *rqp);
-void smb_rq_bstart(struct smb_rq *rqp);
-void smb_rq_bend(struct smb_rq *rqp);
-int  smb_rq_intr(struct smb_rq *rqp);
-int  smb_rq_simple(struct smb_rq *rqp);
-
-int  smb_t2_alloc(struct smb_connobj *layer, u_short setup, struct smb_cred *scred,
-	struct smb_t2rq **rqpp);
-int  smb_t2_init(struct smb_t2rq *rqp, struct smb_connobj *layer, u_short setup,
-	struct smb_cred *scred);
-void smb_t2_done(struct smb_t2rq *t2p);
-int  smb_t2_request(struct smb_t2rq *t2p);
-
-#endif /* !_NETSMB_SMB_RQ_H_ */
diff --git a/include.new/netsmb/smb_subr.h b/include.new/netsmb/smb_subr.h
deleted file mode 100644
index 55cbc81..0000000
--- a/include.new/netsmb/smb_subr.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/netsmb/smb_subr.h 217174 2011-01-08 23:06:54Z csjp $
- */
-#ifndef _NETSMB_SMB_SUBR_H_
-#define _NETSMB_SMB_SUBR_H_
-
-#ifndef _KERNEL
-#error "This file shouldn't be included from userland programs"
-#endif
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_SMBTEMP);
-#endif
-
-#define SMBERROR(format, args...) printf("%s: "format, __func__ ,## args)
-#define SMBPANIC(format, args...) printf("%s: "format, __func__ ,## args)
-
-#ifdef SMB_SOCKET_DEBUG
-#define SMBSDEBUG(format, args...) printf("%s: "format, __func__ ,## args)
-#else
-#define SMBSDEBUG(format, args...)
-#endif
-
-#ifdef SMB_IOD_DEBUG
-#define SMBIODEBUG(format, args...) printf("%s: "format, __func__ ,## args)
-#else
-#define SMBIODEBUG(format, args...)
-#endif
-
-#ifdef SMB_SOCKETDATA_DEBUG
-void m_dumpm(struct mbuf *m);
-#else
-#define m_dumpm(m)
-#endif
-
-#define	SMB_SIGMASK(set) 						\
-	(SIGISMEMBER(set, SIGINT) || SIGISMEMBER(set, SIGTERM) ||	\
-	 SIGISMEMBER(set, SIGHUP) || SIGISMEMBER(set, SIGKILL) ||	\
-	 SIGISMEMBER(set, SIGQUIT))
-
-#define	smb_suser(cred)	priv_check_cred(cred, PRIV_NETSMB, 0)
-
-/*
- * Compatibility wrappers for simple locks
- */
-
-#include <sys/lock.h>
-#include <sys/mutex.h>
-
-#define	smb_slock			mtx
-#define	smb_sl_init(mtx, desc)		mtx_init(mtx, desc, NULL, MTX_DEF)
-#define	smb_sl_destroy(mtx)		mtx_destroy(mtx)
-#define	smb_sl_lock(mtx)		mtx_lock(mtx)
-#define	smb_sl_unlock(mtx)		mtx_unlock(mtx)
-
-
-#define SMB_STRFREE(p)	do { if (p) smb_strfree(p); } while(0)
-
-typedef u_int16_t	smb_unichar;
-typedef	smb_unichar	*smb_uniptr;
-
-/*
- * Crediantials of user/process being processing in the connection procedures
- */
-struct smb_cred {
-	struct thread *	scr_td;
-	struct ucred *	scr_cred;
-};
-
-extern smb_unichar smb_unieol;
-
-struct mbchain;
-struct smb_vc;
-struct smb_rq;
-
-void smb_makescred(struct smb_cred *scred, struct thread *td, struct ucred *cred);
-int  smb_td_intr(struct thread *);
-char *smb_strdup(const char *s);
-void *smb_memdup(const void *umem, int len);
-char *smb_strdupin(char *s, size_t maxlen);
-void *smb_memdupin(void *umem, size_t len);
-void smb_strtouni(u_int16_t *dst, const char *src);
-void smb_strfree(char *s);
-void smb_memfree(void *s);
-void *smb_zmalloc(size_t size, struct malloc_type *type, int flags);
-
-int  smb_calcmackey(struct smb_vc *vcp);
-int  smb_encrypt(const u_char *apwd, u_char *C8, u_char *RN);
-int  smb_ntencrypt(const u_char *apwd, u_char *C8, u_char *RN);
-int  smb_maperror(int eclass, int eno);
-int  smb_put_dmem(struct mbchain *mbp, struct smb_vc *vcp,
-	const char *src, size_t len, int caseopt);
-int  smb_put_dstring(struct mbchain *mbp, struct smb_vc *vcp,
-	const char *src, int caseopt);
-int  smb_put_string(struct smb_rq *rqp, const char *src);
-int  smb_put_asunistring(struct smb_rq *rqp, const char *src);
-int  smb_rq_sign(struct smb_rq *rqp);
-int  smb_rq_verify(struct smb_rq *rqp);
-
-#endif /* !_NETSMB_SMB_SUBR_H_ */
diff --git a/include.new/netsmb/smb_tran.h b/include.new/netsmb/smb_tran.h
deleted file mode 100644
index 00a52b9..0000000
--- a/include.new/netsmb/smb_tran.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/netsmb/smb_tran.h 206361 2010-04-07 16:50:38Z joel $
- */
-
-#ifndef _NETSMB_SMB_TRAN_H_
-#define	_NETSMB_SMB_TRAN_H_
-
-#include <sys/socket.h>
-
-/*
- * Known transports
- */
-#define	SMBT_NBTCP	1
-
-/*
- * Transport parameters
- */
-#define	SMBTP_SNDSZ	1		/* R  - int */
-#define	SMBTP_RCVSZ	2		/* R  - int */
-#define	SMBTP_TIMEOUT	3		/* RW - struct timespec */
-#define	SMBTP_SELECTID	4		/* RW - (void *) */
-#define SMBTP_UPCALL	5		/* RW - (* void)(void *) */
-
-struct smb_tran_ops;
-
-struct smb_tran_desc {
-	sa_family_t	tr_type;
-	int	(*tr_create)(struct smb_vc *vcp, struct thread *td);
-	int	(*tr_done)(struct smb_vc *vcp, struct thread *td);
-	int	(*tr_bind)(struct smb_vc *vcp, struct sockaddr *sap, struct thread *td);
-	int	(*tr_connect)(struct smb_vc *vcp, struct sockaddr *sap, struct thread *td);
-	int	(*tr_disconnect)(struct smb_vc *vcp, struct thread *td);
-	int	(*tr_send)(struct smb_vc *vcp, struct mbuf *m0, struct thread *td);
-	int	(*tr_recv)(struct smb_vc *vcp, struct mbuf **mpp, struct thread *td);
-	void	(*tr_timo)(struct smb_vc *vcp);
-	void	(*tr_intr)(struct smb_vc *vcp);
-	int	(*tr_getparam)(struct smb_vc *vcp, int param, void *data);
-	int	(*tr_setparam)(struct smb_vc *vcp, int param, void *data);
-	int	(*tr_fatal)(struct smb_vc *vcp, int error);
-#ifdef notyet
-	int	(*tr_poll)(struct smb_vc *vcp, struct thread *td);
-	int	(*tr_cmpaddr)(void *addr1, void *addr2);
-#endif
-	LIST_ENTRY(smb_tran_desc)	tr_link;
-};
-
-#define SMB_TRAN_CREATE(vcp,p)		(vcp)->vc_tdesc->tr_create(vcp,p)
-#define SMB_TRAN_DONE(vcp,p)		(vcp)->vc_tdesc->tr_done(vcp,p)
-#define	SMB_TRAN_BIND(vcp,sap,p)	(vcp)->vc_tdesc->tr_bind(vcp,sap,p)
-#define	SMB_TRAN_CONNECT(vcp,sap,p)	(vcp)->vc_tdesc->tr_connect(vcp,sap,p)
-#define	SMB_TRAN_DISCONNECT(vcp,p)	(vcp)->vc_tdesc->tr_disconnect(vcp,p)
-#define	SMB_TRAN_SEND(vcp,m0,p)		(vcp)->vc_tdesc->tr_send(vcp,m0,p)
-#define	SMB_TRAN_RECV(vcp,m,p)		(vcp)->vc_tdesc->tr_recv(vcp,m,p)
-#define	SMB_TRAN_TIMO(vcp)		(vcp)->vc_tdesc->tr_timo(vcp)
-#define	SMB_TRAN_INTR(vcp)		(vcp)->vc_tdesc->tr_intr(vcp)
-#define	SMB_TRAN_GETPARAM(vcp,par,data)	(vcp)->vc_tdesc->tr_getparam(vcp, par, data)
-#define	SMB_TRAN_SETPARAM(vcp,par,data)	(vcp)->vc_tdesc->tr_setparam(vcp, par, data)
-#define	SMB_TRAN_FATAL(vcp, error)	(vcp)->vc_tdesc->tr_fatal(vcp, error)
-
-#endif /* _NETSMB_SMB_TRAN_H_ */
diff --git a/include.new/netsmb/smb_trantcp.h b/include.new/netsmb/smb_trantcp.h
deleted file mode 100644
index 281e153..0000000
--- a/include.new/netsmb/smb_trantcp.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/netsmb/smb_trantcp.h 206361 2010-04-07 16:50:38Z joel $
- */
-#ifndef _NETSMB_SMB_TRANTCP_H_
-#define	_NETSMB_SMB_TRANTCP_H_
-
-#ifdef _KERNEL
-
-#ifdef NB_DEBUG
-#define NBDEBUG(format, args...)	 printf("%s(%d): "format,	\
-					    __func__ , __LINE__ ,## args)
-#else
-#define NBDEBUG(format, args...)
-#endif
-
-enum nbstate {
-	NBST_CLOSED,
-	NBST_RQSENT,
-	NBST_SESSION,
-	NBST_RETARGET,
-	NBST_REFUSED
-};
-
-
-/*
- * socket specific data
- */
-struct nbpcb {
-	struct smb_vc *	nbp_vc;
-	struct socket *	nbp_tso;	/* transport socket */
-	struct sockaddr_nb *nbp_laddr;	/* local address */
-	struct sockaddr_nb *nbp_paddr;	/* peer address */
-
-	int		nbp_flags;
-#define	NBF_LOCADDR	0x0001		/* has local addr */
-#define	NBF_CONNECTED	0x0002
-#define	NBF_RECVLOCK	0x0004
-
-	enum nbstate	nbp_state;
-	struct timespec	nbp_timo;
-	int		nbp_sndbuf;
-	int		nbp_rcvbuf;
-	void *		nbp_selectid;
-
-/*	LIST_ENTRY(nbpcb) nbp_link;*/
-};
-
-/*
- * Nominal space allocated per a NETBIOS socket.
- */
-#define	NB_SNDQ		(64 * 1024)
-#define	NB_RCVQ		(64 * 1024)
-
-/*
- * TCP slowstart presents a problem in conjunction with large
- * reads.  To ensure a steady stream of ACKs while reading using
- * large transaction sizes, we call soreceive() with a smaller
- * buffer size.  See nbssn_recv().
- */
-#define NB_SORECEIVE_CHUNK	(8 * 1024)
-
-extern struct smb_tran_desc smb_tran_nbtcp_desc;
-
-#endif /* _KERNEL */
-
-#endif /* !_NETSMB_SMB_TRANTCP_H_ */
diff --git a/include.new/nfs/krpc.h b/include.new/nfs/krpc.h
deleted file mode 100644
index d6c29c2..0000000
--- a/include.new/nfs/krpc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/* $FreeBSD: releng/10.2/sys/nfs/krpc.h 221032 2011-04-25 22:22:51Z rmacklem $	*/
-
-#include <sys/cdefs.h>
-
-struct mbuf;
-struct thread;
-struct sockaddr;
-struct sockaddr_in;
-
-int krpc_call(struct sockaddr_in *_sin,
-	u_int prog, u_int vers, u_int func,
-	struct mbuf **data, struct sockaddr **from, struct thread *td);
-
-int krpc_portmap(struct sockaddr_in *_sin,
-	u_int prog, u_int vers, u_int16_t *portp, struct thread *td);
-
-struct mbuf *xdr_string_encode(char *str, int len);
-
-/*
- * RPC definitions for the portmapper
- */
-#define	PMAPPORT		111
-#define	PMAPPROG		100000
-#define	PMAPVERS		2
-#define	PMAPPROC_NULL		0
-#define	PMAPPROC_SET		1
-#define	PMAPPROC_UNSET		2
-#define	PMAPPROC_GETPORT	3
-#define	PMAPPROC_DUMP		4
-#define	PMAPPROC_CALLIT		5
diff --git a/include.new/nfs/nfs_common.h b/include.new/nfs/nfs_common.h
deleted file mode 100644
index ae3537a..0000000
--- a/include.new/nfs/nfs_common.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/nfs/nfs_common.h 245568 2013-01-17 19:03:24Z jhb $
- */
-
-#ifndef _NFS_NFS_COMMON_H_
-#define _NFS_NFS_COMMON_H_
-
-extern enum vtype nv3tov_type[];
-extern nfstype nfsv3_type[];
-
-#define	vtonfsv2_mode(t, m) \
-    txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : MAKEIMODE((t), (m)))
-
-#define	nfsv3tov_type(a)	nv3tov_type[fxdr_unsigned(uint32_t,(a))&0x7]
-#define	vtonfsv3_type(a)	txdr_unsigned(nfsv3_type[((int32_t)(a))])
-
-int	nfs_adv(struct mbuf **, caddr_t *, int, int);
-void	*nfsm_disct(struct mbuf **, caddr_t *, int, int, int);
-int	nfs_realign(struct mbuf **, int);
-
-/* ****************************** */
-/* Build request/reply phase macros */
-
-void	*nfsm_build_xx(int s, struct mbuf **mb, caddr_t *bpos);
-
-#define	nfsm_build(c, s) \
-	(c)nfsm_build_xx((s), &mb, &bpos)
-
-/* ****************************** */
-/* Interpretation phase macros */
-
-void	*nfsm_dissect_xx(int s, struct mbuf **md, caddr_t *dpos);
-void	*nfsm_dissect_xx_nonblock(int s, struct mbuf **md, caddr_t *dpos);
-int	nfsm_strsiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
-int	nfsm_adv_xx(int s, struct mbuf **md, caddr_t *dpos);
-
-/* Error check helpers */
-#define nfsm_dcheck(t1, mrep) \
-do { \
-	if (t1 != 0) { \
-		error = t1; \
-		m_freem((mrep)); \
-		(mrep) = NULL; \
-		goto nfsmout; \
-	} \
-} while (0)
-
-#define nfsm_dcheckp(retp, mrep) \
-do { \
-	if (retp == NULL) { \
-		error = EBADRPC; \
-		m_freem((mrep)); \
-		(mrep) = NULL; \
-		goto nfsmout; \
-	} \
-} while (0)
-
-#define	nfsm_dissect(c, s) \
-({ \
-	void *ret; \
-	ret = nfsm_dissect_xx((s), &md, &dpos); \
-	nfsm_dcheckp(ret, mrep); \
-	(c)ret; \
-})
-
-#define	nfsm_dissect_nonblock(c, s) \
-({ \
-	void *ret; \
-	ret = nfsm_dissect_xx_nonblock((s), &md, &dpos); \
-	nfsm_dcheckp(ret, mrep); \
-	(c)ret; \
-})
-
-#define	nfsm_strsiz(s,m) \
-do { \
-	int t1; \
-	t1 = nfsm_strsiz_xx(&(s), (m), &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while(0)
-
-#define nfsm_mtouio(p,s) \
-do {\
-	int32_t t1 = 0; \
-	if ((s) > 0) \
-		t1 = nfsm_mbuftouio(&md, (p), (s), &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define nfsm_rndup(a)	(((a)+3)&(~0x3))
-
-#define	nfsm_adv(s) \
-do { \
-	int t1; \
-	t1 = nfsm_adv_xx((s), &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#ifdef __NO_STRICT_ALIGNMENT
-#define nfsm_aligned(p, t)	1
-#else
-#define nfsm_aligned(p, t)	((((u_long)(p)) & (sizeof(t) - 1)) == 0)
-#endif
-
-#endif
diff --git a/include.new/nfs/nfs_fha.h b/include.new/nfs/nfs_fha.h
deleted file mode 100644
index 2870951..0000000
--- a/include.new/nfs/nfs_fha.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
- *
- * 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.
- *
- * 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: releng/10.2/sys/nfs/nfs_fha.h 261054 2014-01-22 23:52:20Z mav $ */
-
-#ifndef	_NFS_FHA_H
-#define	_NFS_FHA_H 1
-
-#ifdef	_KERNEL
-
-/* Sysctl defaults. */
-#define FHA_DEF_ENABLE			1
-#define FHA_DEF_BIN_SHIFT		22 /* 4MB */
-#define FHA_DEF_MAX_NFSDS_PER_FH	8
-#define FHA_DEF_MAX_REQS_PER_NFSD	0  /* Unlimited */
-
-#define FHA_HASH_SIZE	251
-
-struct fha_ctls {
-	int	 enable;
-	uint32_t bin_shift;
-	uint32_t max_nfsds_per_fh;
-	uint32_t max_reqs_per_nfsd;
-};
-
-/*
- * These are the entries in the filehandle hash.  They talk about a specific
- * file, requests against which are being handled by one or more nfsds.  We
- * keep a chain of nfsds against the file. We only have more than one if reads
- * are ongoing, and then only if the reads affect disparate regions of the
- * file.
- *
- * In general, we want to assign a new request to an existing nfsd if it is
- * going to contend with work happening already on that nfsd, or if the
- * operation is a read and the nfsd is already handling a proximate read.  We
- * do this to avoid jumping around in the read stream unnecessarily, and to
- * avoid contention between threads over single files.
- */
-struct fha_hash_entry {
-	struct mtx *mtx;
-	LIST_ENTRY(fha_hash_entry) link;
-	u_int64_t fh;
-	uint32_t num_rw;
-	uint32_t num_exclusive;
-	u_int8_t num_threads;
-	struct svcthread_list threads;
-};
-
-LIST_HEAD(fha_hash_entry_list, fha_hash_entry);
-
-struct fha_hash_slot {
-	struct fha_hash_entry_list list;
-	struct mtx mtx;
-};
-
-/* A structure used for passing around data internally. */
-struct fha_info {
-	u_int64_t fh;
-	off_t offset;
-	int locktype;
-};
-
-struct fha_callbacks {
-	rpcproc_t (*get_procnum)(rpcproc_t procnum);
-	int (*realign)(struct mbuf **mb, int malloc_flags);
-	int (*get_fh)(uint64_t *fh, int v3, struct mbuf **md, caddr_t *dpos);
-	int (*is_read)(rpcproc_t procnum);
-	int (*is_write)(rpcproc_t procnum);
-	int (*get_offset)(struct mbuf **md, caddr_t *dpos, int v3, struct
-			  fha_info *info);
-	int (*no_offset)(rpcproc_t procnum);
-	void (*set_locktype)(rpcproc_t procnum, struct fha_info *info);
-	int (*fhe_stats_sysctl)(SYSCTL_HANDLER_ARGS);
-};
-
-struct fha_params {
-	struct fha_hash_slot fha_hash[FHA_HASH_SIZE];
-	struct sysctl_ctx_list sysctl_ctx;
-	struct sysctl_oid *sysctl_tree;
-	struct fha_ctls ctls;
-	struct fha_callbacks callbacks;
-	char server_name[32];
-	SVCPOOL **pool;
-};
-
-void fha_nd_complete(SVCTHREAD *, struct svc_req *);
-SVCTHREAD *fha_assign(SVCTHREAD *, struct svc_req *, struct fha_params *);
-void fha_init(struct fha_params *softc);
-void fha_uninit(struct fha_params *softc);
-int fhe_stats_sysctl(SYSCTL_HANDLER_ARGS, struct fha_params *softc);
-
-#endif /* _KERNEL */
-#endif /* _NFS_FHA_H_ */
diff --git a/include.new/nfs/nfs_kdtrace.h b/include.new/nfs/nfs_kdtrace.h
deleted file mode 100644
index 07b0d78..0000000
--- a/include.new/nfs/nfs_kdtrace.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * Copyright (c) 2009 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed at the University of Cambridge Computer
- * Laboratory with support from a grant from Google, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/nfs/nfs_kdtrace.h 222813 2011-06-07 08:46:13Z attilio $
- */
-
-#ifndef _NFSCLIENT_NFS_KDTRACE_H_
-#define	_NFSCLIENT_NFS_KDTRACE_H_
-
-#ifdef KDTRACE_HOOKS
-#include <sys/dtrace_bsd.h>
-
-/*
- * Definitions for NFS access cache probes.
- */
-extern uint32_t nfsclient_accesscache_flush_done_id;
-extern uint32_t nfsclient_accesscache_get_hit_id;
-extern uint32_t nfsclient_accesscache_get_miss_id;
-extern uint32_t nfsclient_accesscache_load_done_id;
-
-#define	KDTRACE_NFS_ACCESSCACHE_FLUSH_DONE(vp)	do {			\
-	if (dtrace_nfsclient_accesscache_flush_done_probe != NULL)	\
-		(dtrace_nfsclient_accesscache_flush_done_probe)(	\
-		    nfsclient_accesscache_flush_done_id, (vp));		\
-} while (0)
-
-#define	KDTRACE_NFS_ACCESSCACHE_GET_HIT(vp, uid, mode)	do {		\
-	if (dtrace_nfsclient_accesscache_get_hit_probe != NULL)		\
-		(dtrace_nfsclient_accesscache_get_hit_probe)(		\
-		    nfsclient_accesscache_get_hit_id, (vp), (uid),	\
-		    (mode));						\
-} while (0)
-	
-#define	KDTRACE_NFS_ACCESSCACHE_GET_MISS(vp, uid, mode)	do {		\
-	if (dtrace_nfsclient_accesscache_get_miss_probe != NULL)	\
-		(dtrace_nfsclient_accesscache_get_miss_probe)(		\
-		    nfsclient_accesscache_get_miss_id, (vp), (uid),	\
-		    (mode));						\
-} while (0)
-
-#define	KDTRACE_NFS_ACCESSCACHE_LOAD_DONE(vp, uid, rmode, error) do {	\
-	if (dtrace_nfsclient_accesscache_load_done_probe != NULL)	\
-		(dtrace_nfsclient_accesscache_load_done_probe)(		\
-		    nfsclient_accesscache_load_done_id, (vp), (uid),	\
-		    (rmode), (error));					\
-} while (0)
-
-/*
- * Definitions for NFS attribute cache probes.
- */
-extern uint32_t nfsclient_attrcache_flush_done_id;
-extern uint32_t nfsclient_attrcache_get_hit_id;
-extern uint32_t nfsclient_attrcache_get_miss_id;
-extern uint32_t nfsclient_attrcache_load_done_id;
-
-#define	KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp)	do {			\
-	if (dtrace_nfsclient_attrcache_flush_done_probe != NULL)	\
-		(dtrace_nfsclient_attrcache_flush_done_probe)(		\
-		    nfsclient_attrcache_flush_done_id, (vp));		\
-} while (0)
-
-#define	KDTRACE_NFS_ATTRCACHE_GET_HIT(vp, vap)	do {			\
-	if (dtrace_nfsclient_attrcache_get_hit_probe != NULL)		\
-		(dtrace_nfsclient_attrcache_get_hit_probe)(		\
-		    nfsclient_attrcache_get_hit_id, (vp), (vap));	\
-} while (0)
-
-#define	KDTRACE_NFS_ATTRCACHE_GET_MISS(vp)	do {			\
-	if (dtrace_nfsclient_attrcache_get_miss_probe != NULL)		\
-		(dtrace_nfsclient_attrcache_get_miss_probe)(		\
-			    nfsclient_attrcache_get_miss_id, (vp));	\
-} while (0)
-
-#define	KDTRACE_NFS_ATTRCACHE_LOAD_DONE(vp, vap, error)	do {		\
-	if (dtrace_nfsclient_attrcache_load_done_probe != NULL)		\
-		(dtrace_nfsclient_attrcache_load_done_probe)(		\
-		    nfsclient_attrcache_load_done_id, (vp), (vap),	\
-		    (error));						\
-} while (0)
-
-#else /* !KDTRACE_HOOKS */
-
-#define	KDTRACE_NFS_ACCESSCACHE_FLUSH_DONE(vp)
-#define	KDTRACE_NFS_ACCESSCACHE_GET_HIT(vp, uid, mode)
-#define	KDTRACE_NFS_ACCESSCACHE_GET_MISS(vp, uid, mode)
-#define	KDTRACE_NFS_ACCESSCACHE_LOAD_DONE(vp, uid, rmode, error)
-
-#define	KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp)
-#define	KDTRACE_NFS_ATTRCACHE_GET_HIT(vp, vap)
-#define	KDTRACE_NFS_ATTRCACHE_GET_MISS(vp)
-#define	KDTRACE_NFS_ATTRCACHE_LOAD_DONE(vp, vap, error)
-
-#endif /* KDTRACE_HOOKS */
-
-#endif /* !_NFSCLIENT_NFS_KDTRACE_H_ */
diff --git a/include.new/nfs/nfs_lock.h b/include.new/nfs/nfs_lock.h
deleted file mode 100644
index 8957120..0000000
--- a/include.new/nfs/nfs_lock.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1998 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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.
- *
- *      from nfs_lock.h,v 2.2 1998/04/28 19:38:41 don Exp
- * $FreeBSD: releng/10.2/sys/nfs/nfs_lock.h 214048 2010-10-19 00:20:00Z rmacklem $
- */
-
-/*
- * lockd uses the nfssvc system call to get the unique kernel services it needs.
- * It passes in a request structure with a version number at the start.
- * This prevents libc from needing to change if the information passed
- * between lockd and the kernel needs to change.
- *
- * If a structure changes, you must bump the version number.
- */
-
-/*
- * The fifo where the kernel writes requests for locks on remote NFS files,
- * and where lockd reads these requests.
- *
- */
-#define	_PATH_NFSLCKDEV	"nfslock"
-
-/*
- * This structure is used to uniquely identify the process which originated
- * a particular message to lockd.  A sequence number is used to differentiate
- * multiple messages from the same process.  A process start time is used to
- * detect the unlikely, but possible, event of the recycling of a pid.
- */
-struct lockd_msg_ident {
-	pid_t		pid;            /* The process ID. */
-	struct timeval	pid_start;	/* Start time of process id */
-	int		msg_seq;	/* Sequence number of message */
-};
-
-#define LOCKD_MSG_VERSION	3
-
-/*
- * The structure that the kernel hands us for each lock request.
- */
-typedef struct __lock_msg {
-	TAILQ_ENTRY(__lock_msg)	lm_link;	/* internal linkage */
-	int			lm_version;	/* which version is this */
-	struct lockd_msg_ident	lm_msg_ident;	/* originator of the message */
-	struct flock		lm_fl;             /* The lock request. */
-	int			lm_wait;           /* The F_WAIT flag. */
-	int			lm_getlk;		/* is this a F_GETLK request */
-	struct sockaddr_storage lm_addr;		/* The address. */
-	int			lm_nfsv3;		/* If NFS version 3. */
-	size_t			lm_fh_len;		/* The file handle length. */
-	struct xucred		lm_cred;		/* user cred for lock req */
-	u_int8_t		lm_fh[NFSX_V3FHMAX];/* The file handle. */
-} LOCKD_MSG;
-
-#define LOCKD_ANS_VERSION	1
-
-struct lockd_ans {
-	int		la_vers;
-	struct lockd_msg_ident	la_msg_ident;	/* originator of the message */
-	int		la_errno;
-	int		la_set_getlk_pid;		/* use returned pid */
-	int		la_getlk_pid;		/* returned pid for F_GETLK */
-};
-
-#ifdef _KERNEL
-int	nfs_dolock(struct vop_advlock_args *ap);
-extern	vop_advlock_t *nfs_advlock_p;
-extern	vop_reclaim_t *nfs_reclaim_p;
-#endif
diff --git a/include.new/nfs/nfs_mountcommon.h b/include.new/nfs/nfs_mountcommon.h
deleted file mode 100644
index 1b1f74e..0000000
--- a/include.new/nfs/nfs_mountcommon.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2009 Rick Macklem, University of Guelph
- * 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.
- *
- * 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: releng/10.2/sys/nfs/nfs_mountcommon.h 216931 2011-01-03 20:37:31Z rmacklem $
- */
-
-#ifndef _NFS_MOUNTCOMMON_H_
-#define	_NFS_MOUNTCOMMON_H_
-
-/*
- * The common fields of the nfsmount structure for the two clients
- * used by the nlm. It includes a function pointer that provides
- * a mechanism for getting the client specific info for an nfs vnode.
- */
-typedef void	nfs_getinfofromvp_ftype(struct vnode *, uint8_t *, size_t *,
-		    struct sockaddr_storage *, int *, off_t *,
-		    struct timeval *);
-typedef int	nfs_vinvalbuf_ftype(struct vnode *, int, struct thread *, int);
-
-struct	nfsmount_common {
-	struct mtx	nmcom_mtx;
-	int	nmcom_flag;		/* Flags for soft/hard... */
-	int	nmcom_state;		/* Internal state flags */
-	struct	mount *nmcom_mountp;	/* Vfs structure for this filesystem */
-	int	nmcom_timeo;		/* Init timer for NFSMNT_DUMBTIMR */
-	int	nmcom_retry;		/* Max retries */
-	char	nmcom_hostname[MNAMELEN];	/* server's name */
-	nfs_getinfofromvp_ftype	*nmcom_getinfo;	/* Get info from nfsnode */
-	nfs_vinvalbuf_ftype	*nmcom_vinvalbuf; /* Invalidate buffers */
-};
-
-#endif	/* _NFS_MOUNTCOMMON_H_ */
diff --git a/include.new/nfs/nfsdiskless.h b/include.new/nfs/nfsdiskless.h
deleted file mode 100644
index aa3bd75..0000000
--- a/include.new/nfs/nfsdiskless.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/nfs/nfsdiskless.h 221032 2011-04-25 22:22:51Z rmacklem $
- */
-
-#ifndef _NFSCLIENT_NFSDISKLESS_H_
-#define _NFSCLIENT_NFSDISKLESS_H_
-
-/*
- * Structure that must be initialized for a diskless nfs client.
- * This structure is used by nfs_mountroot() to set up the root vnode,
- * and to do a partial ifconfig(8) and route(8) so that the critical net
- * interface can communicate with the server.
- * The primary bootstrap is expected to fill in the appropriate fields before
- * starting the kernel.
- * Currently only works for AF_INET protocols.
- * NB: All fields are stored in net byte order to avoid hassles with
- * client/server byte ordering differences.
- */
-
-/*
- * I have defined a new structure that can handle an NFS Version 3 file handle
- * but the kernel still expects the old Version 2 one to be provided. The
- * changes required in nfs_vfsops.c for using the new are documented there in
- * comments. (I felt that breaking network booting code by changing this
- * structure would not be prudent at this time, since almost all servers are
- * still Version 2 anyhow.)
- */
-struct nfsv3_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct nfs_args	root_args;		/* Mount args for root fs */
-	int		root_fhsize;		/* Size of root file handle */
-	u_char		root_fh[NFSX_V3FHMAX];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-/*
- * Old arguments to mount NFS
- */
-struct onfs_args {
-	struct sockaddr	*addr;		/* file server address */
-	int		addrlen;	/* length of address */
-	int		sotype;		/* Socket type */
-	int		proto;		/* and Protocol */
-	u_char		*fh;		/* File handle to be mounted */
-	int		fhsize;		/* Size, in bytes, of fh */
-	int		flags;		/* flags */
-	int		wsize;		/* write size in bytes */
-	int		rsize;		/* read size in bytes */
-	int		readdirsize;	/* readdir size in bytes */
-	int		timeo;		/* initial timeout in .1 secs */
-	int		retrans;	/* times to retry send */
-	int		maxgrouplist;	/* Max. size of group list */
-	int		readahead;	/* # of blocks to readahead */
-	int		leaseterm;	/* Term (sec) of lease */
-	int		deadthresh;	/* Retrans threshold */
-	char		*hostname;	/* server's name */
-};
-
-struct nfs_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct onfs_args root_args;		/* Mount args for root fs */
-	u_char		root_fh[NFSX_V2FH];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-#ifdef _KERNEL
-extern struct nfsv3_diskless nfsv3_diskless;
-extern struct nfs_diskless nfs_diskless;
-extern int	nfs_diskless_valid;
-void bootpc_init(void);
-void nfs_setup_diskless(void);
-void nfs_parse_options(const char *, struct nfs_args *);
-#endif
-
-#endif
diff --git a/include.new/nfs/nfsproto.h b/include.new/nfs/nfsproto.h
deleted file mode 100644
index ef45af2..0000000
--- a/include.new/nfs/nfsproto.h
+++ /dev/null
@@ -1,699 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfsproto.h  8.2 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/nfs/nfsproto.h 164725 2006-11-28 19:33:28Z rees $
- */
-
-#ifndef _NFS_NFSPROTO_H_
-#define _NFS_NFSPROTO_H_
-
-/*
- * nfs definitions as per the Version 2 and 3 specs
- */
-
-/*
- * Constants as defined in the Sun NFS Version 2 and 3 specs.
- * "NFS: Network File System Protocol Specification" RFC1094
- * and in the "NFS: Network File System Version 3 Protocol
- * Specification"
- */
-
-#define NFS_PORT	2049
-#define	NFS_PROG	100003
-#define NFS_VER2	2
-#define	NFS_VER3	3
-#define NFS_VER4	4
-
-#define NFS_V2MAXDATA	8192
-#define	NFS_MAXDGRAMDATA 16384
-#define	NFS_MAXDATA	32768
-#define	NFS_MAXPATHLEN	1024
-#define	NFS_MAXNAMLEN	255
-#define	NFS_MAXPKTHDR	404	/* XXXv4 this needs to be adjust for v4 */
-#define NFS_MAXPACKET	(NFS_MAXPKTHDR + NFS_MAXDATA)
-#define	NFS_MINPACKET	20
-#define	NFS_FABLKSIZE	512	/* Size in bytes of a block wrt fa_blocks */
-
-/* Stat numbers for rpc returns (version 2, 3 and 4) */
-#define	NFS_OK			0
-#define	NFSERR_PERM		1
-#define	NFSERR_NOENT		2
-#define	NFSERR_IO		5
-#define	NFSERR_NXIO		6
-#define	NFSERR_ACCES		13
-#define	NFSERR_EXIST		17
-#define	NFSERR_XDEV		18	/* Version 3 only */
-#define	NFSERR_NODEV		19
-#define	NFSERR_NOTDIR		20
-#define	NFSERR_ISDIR		21
-#define	NFSERR_INVAL		22	/* Version 3 only */
-#define	NFSERR_FBIG		27
-#define	NFSERR_NOSPC		28
-#define	NFSERR_ROFS		30
-#define	NFSERR_MLINK		31	/* Version 3 only */
-#define	NFSERR_NAMETOL		63
-#define	NFSERR_NOTEMPTY		66
-#define	NFSERR_DQUOT		69
-#define	NFSERR_STALE		70
-#define	NFSERR_REMOTE		71	/* Version 3 only */
-#define	NFSERR_WFLUSH		99	/* Version 2 only */
-#define	NFSERR_BADHANDLE	10001	/* The rest Version 3, 4 only */
-#define	NFSERR_NOT_SYNC		10002
-#define	NFSERR_BAD_COOKIE	10003
-#define	NFSERR_NOTSUPP		10004
-#define	NFSERR_TOOSMALL		10005
-#define	NFSERR_SERVERFAULT	10006
-#define	NFSERR_BADTYPE		10007
-#define	NFSERR_JUKEBOX		10008
-#define NFSERR_TRYLATER		NFSERR_JUKEBOX
-#define	NFSERR_SAME		10009   /* The rest Version 4 only */
-#define	NFSERR_DENIED		10010
-#define	NFSERR_EXPIRED		10011
-#define	NFSERR_LOCKED		10012
-#define	NFSERR_GRACE		10013
-#define	NFSERR_FHEXPIRED	10014
-#define	NFSERR_SHARDE_DENIED	10015
-#define	NFSERR_WRONGSEC		10016
-#define	NFSERR_CLID_INUSE	10017
-#define	NFSERR_RESOURCE		10018
-#define	NFSERR_MOVED		10019
-#define	NFSERR_NOFILEHANDLE	10020
-#define	NFSERR_MINOR_VERS_MISMATCH 10021
-#define	NFSERR_STALE_CLIENTID	10022
-#define	NFSERR_STALE_STATEID	10023
-#define	NFSERR_OLD_STATEID	10024
-#define	NFSERR_BAD_STATEID	10025
-#define	NFSERR_BAD_SEQID	10026
-#define	NFSERR_NOT_SAME		10027
-#define	NFSERR_LOCK_RANGE	10028
-#define	NFSERR_SYMLINK		10029
-#define	NFSERR_READDIR_NOSPC	10030
-#define	NFSERR_LEASE_MOVED	10031
-#define	NFSERR_ATTRNOTSUPP	10032
-#define	NFSERR_NO_GRACE		10033
-#define	NFSERR_RECLAIM_BAD	10034
-#define	NFSERR_RECLAIM_CONFLICT	10035
-#define	NFSERR_BADXDR		10036
-#define	NFSERR_LOCKS_HELD	10037
-#define	NFSERR_OPENMODE		10038
-#define	NFSERR_BADOWNER		10039
-#define	NFSERR_BADCHAR		10040
-#define	NFSERR_BADNAME		10041
-#define	NFSERR_BAD_RANGE	10042
-#define	NFSERR_LOCK_NOTSUPP	10043
-#define	NFSERR_OP_ILLEGAL	10044
-#define	NFSERR_DEADLOCK		10045
-#define	NFSERR_FILE_OPEN	10046
-#define	NFSERR_STALEWRITEVERF	30001	/* Fake return for nfs_commit() */
-
-
-
-#define NFSERR_RETVOID		0x20000000 /* Return void, not error */
-#define NFSERR_AUTHERR		0x40000000 /* Mark an authentication error */
-#define NFSERR_RETERR		0x80000000 /* Mark an error return for V3 */
-
-/* Sizes in bytes of various nfs rpc components */
-#define	NFSX_UNSIGNED	4
-
-/* specific to NFS Version 2 */
-#define	NFSX_V2FH	32
-#define	NFSX_V2FATTR	68
-#define	NFSX_V2SATTR	32
-#define	NFSX_V2COOKIE	4
-#define NFSX_V2STATFS	20
-
-/* specific to NFS Version 3 */
-#define NFSX_V3FH		(sizeof (fhandle_t)) /* size this server uses */
-#define	NFSX_V3FHMAX		64	/* max. allowed by protocol */
-#define NFSX_V3FATTR		84
-#define NFSX_V3SATTR		60	/* max. all fields filled in */
-#define NFSX_V3SRVSATTR		(sizeof (struct nfsv3_sattr))
-#define NFSX_V3POSTOPATTR	(NFSX_V3FATTR + NFSX_UNSIGNED)
-#define NFSX_V3WCCDATA		(NFSX_V3POSTOPATTR + 8 * NFSX_UNSIGNED)
-#define NFSX_V3COOKIEVERF 	8
-#define NFSX_V3WRITEVERF 	8
-#define NFSX_V3CREATEVERF	8
-#define NFSX_V3STATFS		52
-#define NFSX_V3FSINFO		48
-#define NFSX_V3PATHCONF		24
-
-/* specific to NFS Version 4 */
-#define NFSX_V4VERF		8
-#define NFSX_V4FH		128
-#define NFSX_V4STATEID		16
-
-/* variants for both versions */
-#define NFSX_FH(v3)		((v3) ? (NFSX_V3FHMAX + NFSX_UNSIGNED) : \
-					NFSX_V2FH)
-#define NFSX_SRVFH(v3)		((v3) ? NFSX_V3FH : NFSX_V2FH)
-#define	NFSX_FATTR(v3)		((v3) ? NFSX_V3FATTR : NFSX_V2FATTR)
-#define NFSX_PREOPATTR(v3)	((v3) ? (7 * NFSX_UNSIGNED) : 0)
-#define NFSX_POSTOPATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : 0)
-#define NFSX_POSTOPORFATTR(v3)	((v3) ? (NFSX_V3FATTR + NFSX_UNSIGNED) : \
-					NFSX_V2FATTR)
-#define NFSX_WCCDATA(v3)	((v3) ? NFSX_V3WCCDATA : 0)
-#define NFSX_WCCORFATTR(v3)	((v3) ? NFSX_V3WCCDATA : NFSX_V2FATTR)
-#define	NFSX_SATTR(v3)		((v3) ? NFSX_V3SATTR : NFSX_V2SATTR)
-#define	NFSX_COOKIEVERF(v3)	((v3) ? NFSX_V3COOKIEVERF : 0)
-#define	NFSX_WRITEVERF(v3)	((v3) ? NFSX_V3WRITEVERF : 0)
-#define NFSX_READDIR(v3)	((v3) ? (5 * NFSX_UNSIGNED) : \
-					(2 * NFSX_UNSIGNED))
-#define	NFSX_STATFS(v3)		((v3) ? NFSX_V3STATFS : NFSX_V2STATFS)
-
-/* nfs rpc procedure numbers (before version mapping) */
-#define	NFSPROC_NULL		0
-#define	NFSPROC_GETATTR		1
-#define	NFSPROC_SETATTR		2
-#define	NFSPROC_LOOKUP		3
-#define	NFSPROC_ACCESS		4
-#define	NFSPROC_READLINK	5
-#define	NFSPROC_READ		6
-#define	NFSPROC_WRITE		7
-#define	NFSPROC_CREATE		8
-#define	NFSPROC_MKDIR		9
-#define	NFSPROC_SYMLINK		10
-#define	NFSPROC_MKNOD		11
-#define	NFSPROC_REMOVE		12
-#define	NFSPROC_RMDIR		13
-#define	NFSPROC_RENAME		14
-#define	NFSPROC_LINK		15
-#define	NFSPROC_READDIR		16
-#define	NFSPROC_READDIRPLUS	17
-#define	NFSPROC_FSSTAT		18
-#define	NFSPROC_FSINFO		19
-#define	NFSPROC_PATHCONF	20
-#define	NFSPROC_COMMIT		21
-#define NFSPROC_NOOP		22
-#define	NFS_NPROCS		23
-
-/* Actual Version 2 procedure numbers */
-#define	NFSV2PROC_NULL		0
-#define	NFSV2PROC_GETATTR	1
-#define	NFSV2PROC_SETATTR	2
-#define	NFSV2PROC_NOOP		3
-#define	NFSV2PROC_ROOT		NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_LOOKUP	4
-#define	NFSV2PROC_READLINK	5
-#define	NFSV2PROC_READ		6
-#define	NFSV2PROC_WRITECACHE	NFSV2PROC_NOOP	/* Obsolete */
-#define	NFSV2PROC_WRITE		8
-#define	NFSV2PROC_CREATE	9
-#define	NFSV2PROC_REMOVE	10
-#define	NFSV2PROC_RENAME	11
-#define	NFSV2PROC_LINK		12
-#define	NFSV2PROC_SYMLINK	13
-#define	NFSV2PROC_MKDIR		14
-#define	NFSV2PROC_RMDIR		15
-#define	NFSV2PROC_READDIR	16
-#define	NFSV2PROC_STATFS	17
-
-/* Version 4 procedure numbers */
-#define NFSV4PROC_NULL         0
-#define NFSV4PROC_COMPOUND     1
-
-/* Version 4 operation numbers */
-#define NFSV4OP_ACCESS		3
-#define NFSV4OP_CLOSE		4
-#define NFSV4OP_COMMIT		5
-#define NFSV4OP_CREATE		6
-#define NFSV4OP_DELEGPURGE	7
-#define NFSV4OP_DELEGRETURN	8
-#define NFSV4OP_GETATTR		9
-#define NFSV4OP_GETFH		10
-#define NFSV4OP_LINK		11
-#define NFSV4OP_LOCK		12
-#define NFSV4OP_LOCKT		13
-#define NFSV4OP_LOCKU		14
-#define NFSV4OP_LOOKUP		15
-#define NFSV4OP_LOOKUPP		16
-#define NFSV4OP_NVERIFY		17
-#define NFSV4OP_OPEN		18
-#define NFSV4OP_OPENATTR	19
-#define NFSV4OP_OPEN_CONFIRM	20
-#define NFSV4OP_OPEN_DOWNGRADE	21
-#define NFSV4OP_PUTFH		22
-#define NFSV4OP_PUTPUBFH	23
-#define NFSV4OP_PUTROOTFH	24
-#define NFSV4OP_READ		25
-#define NFSV4OP_READDIR		26
-#define NFSV4OP_READLINK	27
-#define NFSV4OP_REMOVE		28
-#define NFSV4OP_RENAME		29
-#define NFSV4OP_RENEW		30
-#define NFSV4OP_RESTOREFH	31
-#define NFSV4OP_SAVEFH		32
-#define NFSV4OP_SECINFO		33
-#define NFSV4OP_SETATTR		34
-#define NFSV4OP_SETCLIENTID	35
-#define NFSV4OP_SETCLIENTID_CONFIRM 36
-#define NFSV4OP_VERIFY		37
-#define NFSV4OP_WRITE		38
-
-/*
- * Constants used by the Version 3 protocol for various RPCs
- */
-#define NFSV3SATTRTIME_DONTCHANGE	0
-#define NFSV3SATTRTIME_TOSERVER		1
-#define NFSV3SATTRTIME_TOCLIENT		2
-
-#define NFSV3ACCESS_READ		0x01
-#define NFSV3ACCESS_LOOKUP		0x02
-#define NFSV3ACCESS_MODIFY		0x04
-#define NFSV3ACCESS_EXTEND		0x08
-#define NFSV3ACCESS_DELETE		0x10
-#define NFSV3ACCESS_EXECUTE		0x20
-
-#define NFSV3WRITE_UNSTABLE		0
-#define NFSV3WRITE_DATASYNC		1
-#define NFSV3WRITE_FILESYNC		2
-
-#define NFSV3CREATE_UNCHECKED		0
-#define NFSV3CREATE_GUARDED		1
-#define NFSV3CREATE_EXCLUSIVE		2
-
-#define NFSV3FSINFO_LINK		0x01
-#define NFSV3FSINFO_SYMLINK		0x02
-#define NFSV3FSINFO_HOMOGENEOUS		0x08
-#define NFSV3FSINFO_CANSETTIME		0x10
-
-/*
- * Constants used by the Version 4 protocol for various RPCs
- */
-
-#define NFSV4ACCESS_READ		0x01
-#define NFSV4ACCESS_LOOKUP		0x02
-#define NFSV4ACCESS_MODIFY		0x04
-#define NFSV4ACCESS_EXTEND		0x08
-#define NFSV4ACCESS_DELETE		0x10
-#define NFSV4ACCESS_EXECUTE		0x20
-
-#define NFSV4OPENRES_MLOCK		0x01
-#define NFSV4OPENRES_CONFIRM		0x02
-
-#define NFSV4OPENSHARE_ACCESS_READ	0x01
-#define NFSV4OPENSHARE_ACCESS_WRITE	0x02
-#define NFSV4OPENSHARE_ACCESS_BOTH	0x03
-#define NFSV4OPENSHARE_DENY_NONE	0x00
-#define NFSV4OPENSHARE_DENY_READ	0x01
-#define NFSV4OPENSHARE_DENY_WRITE	0x02
-#define NFSV4OPENSHARE_DENY_BOTH	0x03
-
-/* File types */
-typedef enum {
-	NFNON=0,
-	NFREG=1,
-	NFDIR=2,
-	NFBLK=3,
-	NFCHR=4,
-	NFLNK=5,
-	NFSOCK=6,
-	NFFIFO=7,
-	NFATTRDIR = 8,
-	NFNAMEDATTR = 9,
-	NFBAD = 10,
-} nfstype;	
-
-/* NFSv4 claim type */
-typedef enum {
-	NCLNULL = 0,
-	NCLPREV = 1,
-	NCLDELEGCUR = 2,
-	NCLDELEGPREV = 3,
-} nfsv4cltype;
-
-/* Other NFSv4 types */
-typedef enum {
-	NSHUNSTABLE = 0,
-	NSHDATASYNC = 1,
-	NSHFILESYNC = 2,
-} nfsv4stablehow;
-
-typedef enum { OTNOCREATE = 0, OTCREATE = 1 } nfsv4opentype;
-typedef enum { CMUNCHECKED = 0, CMGUARDED = 1, CMEXCLUSIVE = 2 } nfsv4createmode;
-typedef enum { THSERVERTIME = 0, THCLIENTTIME = 1 } nfsv4timehow;
-typedef enum { ODNONE = 0, ODREAD = 1, ODWRITE = 2 } nfsv4opendelegtype;
-
-/* Structs for common parts of the rpc's */
-
-/*
- * File Handle (32 bytes for version 2), variable up to 64 for version 3.
- * File Handles of up to NFS_SMALLFH in size are stored directly in the
- * nfs node, whereas larger ones are malloc'd. (This never happens when
- * NFS_SMALLFH is set to 64.)
- * NFS_SMALLFH should be in the range of 32 to 64 and be divisible by 4.
- */
-#ifndef NFS_SMALLFH
-#define NFS_SMALLFH	128
-#endif
-union nfsfh {
-	fhandle_t	fh_generic;
-	u_char		fh_bytes[NFS_SMALLFH];
-};
-typedef union nfsfh nfsfh_t;
-
-struct nfsv2_time {
-	uint32_t	nfsv2_sec;
-	uint32_t	nfsv2_usec;
-};
-typedef struct nfsv2_time	nfstime2;
-
-struct nfsv3_time {
-	uint32_t	nfsv3_sec;
-	uint32_t	nfsv3_nsec;
-};
-typedef struct nfsv3_time	nfstime3;
-
-/*
- * Quads are defined as arrays of 2 longs to ensure dense packing for the
- * protocol and to facilitate xdr conversion.
- */
-struct nfs_uquad {
-	uint32_t	nfsuquad[2];
-};
-typedef	struct nfs_uquad	nfsuint64;
-
-/*
- * Used to convert between two u_longs and a u_quad_t.
- */
-union nfs_quadconvert {
-	uint32_t	lval[2];
-	u_quad_t	qval;
-};
-typedef union nfs_quadconvert	nfsquad_t;
-
-/*
- * NFS Version 3 special file number.
- */
-struct nfsv3_spec {
-	uint32_t	specdata1;
-	uint32_t	specdata2;
-};
-typedef	struct nfsv3_spec	nfsv3spec;
-
-/*
- * NFS Version 4 bitmap.
- */
-struct nfsv4_bitmap {
-	uint32_t	bmlen;
-	uint32_t	*bmval;
-};
-typedef struct nfsv4_bitmap nfsv4bitmap;
-
-struct nfsv4_changeinfo {
-	u_int		ciatomic;
-	uint64_t	cibefore;
-	uint64_t	ciafter;
-};
-typedef struct nfsv4_changeinfo nfsv4changeinfo;
-
-/*
- * File attributes and setable attributes. These structures cover both
- * NFS version 2 and the version 3 protocol. Note that the union is only
- * used so that one pointer can refer to both variants. These structures
- * go out on the wire and must be densely packed, so no quad data types
- * are used. (all fields are longs or u_longs or structures of same)
- * NB: You can't do sizeof(struct nfs_fattr), you must use the
- *     NFSX_FATTR(v3) macro.
- */
-struct nfs_fattr {
-	uint32_t	fa_type;
-	uint32_t	fa_mode;
-	uint32_t	fa_nlink;
-	uint32_t	fa_uid;
-	uint32_t	fa_gid;
-	union {
-		struct {
-			uint32_t	nfsv2fa_size;
-			uint32_t	nfsv2fa_blocksize;
-			uint32_t	nfsv2fa_rdev;
-			uint32_t	nfsv2fa_blocks;
-			uint32_t	nfsv2fa_fsid;
-			uint32_t	nfsv2fa_fileid;
-			nfstime2	nfsv2fa_atime;
-			nfstime2	nfsv2fa_mtime;
-			nfstime2	nfsv2fa_ctime;
-		} fa_nfsv2;
-		struct {
-			nfsuint64	nfsv3fa_size;
-			nfsuint64	nfsv3fa_used;
-			nfsv3spec	nfsv3fa_rdev;
-			nfsuint64	nfsv3fa_fsid;
-			nfsuint64	nfsv3fa_fileid;
-			nfstime3	nfsv3fa_atime;
-			nfstime3	nfsv3fa_mtime;
-			nfstime3	nfsv3fa_ctime;
-		} fa_nfsv3;
-	} fa_un;
-};
-
-/* and some ugly defines for accessing union components */
-#define	fa2_size		fa_un.fa_nfsv2.nfsv2fa_size
-#define	fa2_blocksize		fa_un.fa_nfsv2.nfsv2fa_blocksize
-#define	fa2_rdev		fa_un.fa_nfsv2.nfsv2fa_rdev
-#define	fa2_blocks		fa_un.fa_nfsv2.nfsv2fa_blocks
-#define	fa2_fsid		fa_un.fa_nfsv2.nfsv2fa_fsid
-#define	fa2_fileid		fa_un.fa_nfsv2.nfsv2fa_fileid
-#define	fa2_atime		fa_un.fa_nfsv2.nfsv2fa_atime
-#define	fa2_mtime		fa_un.fa_nfsv2.nfsv2fa_mtime
-#define	fa2_ctime		fa_un.fa_nfsv2.nfsv2fa_ctime
-#define	fa3_size		fa_un.fa_nfsv3.nfsv3fa_size
-#define	fa3_used		fa_un.fa_nfsv3.nfsv3fa_used
-#define	fa3_rdev		fa_un.fa_nfsv3.nfsv3fa_rdev
-#define	fa3_fsid		fa_un.fa_nfsv3.nfsv3fa_fsid
-#define	fa3_fileid		fa_un.fa_nfsv3.nfsv3fa_fileid
-#define	fa3_atime		fa_un.fa_nfsv3.nfsv3fa_atime
-#define	fa3_mtime		fa_un.fa_nfsv3.nfsv3fa_mtime
-#define	fa3_ctime		fa_un.fa_nfsv3.nfsv3fa_ctime
-
-struct nfsv4_fattr {
-	u_int		fa4_valid;
-	nfstype		fa4_type;
-	off_t		fa4_size;
-	uint64_t	fa4_fsid_major;
-	uint64_t	fa4_fsid_minor;
-	uint64_t	fa4_fileid;
-	mode_t		fa4_mode;
-	nlink_t		fa4_nlink;
-	uid_t		fa4_uid;
-	gid_t		fa4_gid;
-	uint32_t	fa4_rdev_major;
-	uint32_t	fa4_rdev_minor;
-	struct timespec	fa4_atime;
-	struct timespec	fa4_btime;
-	struct timespec	fa4_ctime;
-	struct timespec	fa4_mtime;
-	uint64_t	fa4_maxread;
-	uint64_t	fa4_maxwrite;
-	uint64_t	fa4_ffree;
-	uint64_t	fa4_ftotal;
-	uint32_t	fa4_maxname;
-	uint64_t	fa4_savail;
-	uint64_t	fa4_sfree;
-	uint64_t	fa4_stotal;
-	uint64_t	fa4_changeid;
-	uint32_t	fa4_lease_time;
-	uint64_t	fa4_maxfilesize;
-};
-
-/* Flags for fa4_valid */
-#define FA4V_SIZE	0x00000001
-#define FA4V_FSID	0x00000002
-#define FA4V_FILEID	0x00000004
-#define FA4V_MODE	0x00000008
-#define FA4V_NLINK	0x00000010
-#define FA4V_UID	0x00000020
-#define FA4V_GID	0x00000040
-#define FA4V_RDEV	0x00000080
-#define FA4V_ATIME	0x00000100
-#define FA4V_BTIME	0x00000200
-#define FA4V_CTIME	0x00000400
-#define FA4V_MTIME	0x00000800
-#define FA4V_MAXREAD	0x00001000
-#define FA4V_MAXWRITE	0x00002000
-#define FA4V_TYPE	0x00004000
-#define FA4V_FFREE	0x00008000
-#define FA4V_FTOTAL	0x00010000
-#define FA4V_MAXNAME	0x00020000
-#define FA4V_SAVAIL	0x00040000
-#define FA4V_SFREE	0x00080000
-#define FA4V_STOTAL	0x00100000
-#define FA4V_CHANGEID	0x00200000
-#define FA4V_LEASE_TIME	0x00400000
-#define FA4V_MAXFILESIZE 0x00800000
-#define FA4V_ACL	0x01000000
-
-/* Offsets into bitmask */
-#define FA4_SUPPORTED_ATTRS	0
-#define FA4_TYPE		1
-#define FA4_FH_EXPIRE_TYPE	2
-#define FA4_CHANGE		3
-#define FA4_SIZE		4
-#define FA4_LINK_SUPPORT	5
-#define FA4_SYMLINK_SUPPORT	6
-#define FA4_NAMED_ATTR		7
-#define FA4_FSID		8
-#define FA4_UNIQUE_HANDLES	9
-#define FA4_LEASE_TIME		10
-#define FA4_RDATTR_ERROR	11
-#define FA4_ACL			12
-#define FA4_ACLSUPPORT		13
-#define FA4_ARCHIVE		14
-#define FA4_CANSETTIME		15
-#define FA4_CASE_INSENSITIVE	16
-#define FA4_CASE_PRESERVING	17 
-#define FA4_CHOWN_RESTRICTED	18
-#define FA4_FILEHANDLE		19
-#define FA4_FILEID		20
-#define FA4_FILES_AVAIL		21
-#define FA4_FILES_FREE		22
-#define FA4_FILES_TOTAL		23
-#define FA4_FS_LOCATIONS	24
-#define FA4_HIDDEN		25
-#define FA4_HOMOGENEOUS		26
-#define FA4_MAXFILESIZE		27
-#define FA4_MAXLINK		28
-#define FA4_MAXNAME		29
-#define FA4_MAXREAD		30
-#define FA4_MAXWRITE		31
-#define FA4_MIMETYPE		32
-#define FA4_MODE		33
-#define FA4_NO_TRUNC		34
-#define FA4_NUMLINKS		35
-#define FA4_OWNER		36
-#define FA4_OWNER_GROUP		37
-#define FA4_QUOTA_HARD		38
-#define FA4_QUOTA_SOFT		39
-#define FA4_QUOTA_USED		40
-#define FA4_RAWDEV		41
-#define FA4_SPACE_AVAIL		42
-#define FA4_SPACE_FREE		43
-#define FA4_SPACE_TOTAL		44
-#define FA4_SPACE_USED		45
-#define FA4_SYSTEM		46
-#define FA4_TIME_ACCESS		47
-#define FA4_TIME_ACCESS_SET	48
-#define FA4_TIME_BACKUP		49
-#define FA4_TIME_CREATE		50
-#define FA4_TIME_DELTA		51
-#define FA4_TIME_METADATA	52
-#define FA4_TIME_MODIFY		53
-#define FA4_TIME_MODIFY_SET	54
-#define FA4_ATTR_MAX		55
-
-/* Macros for v4 fattr manipulation */
-#define FA4_SET(n, p)	((p)[(n)/32] |= (1 << ((n) % 32)))
-#define FA4_CLR(n, p)	((p)[(n)/32] &= ~(1 << ((n) % 32)))
-#define FA4_ISSET(n, p)	((p)[(n)/32] & (1 << ((n) % 32)))
-#define FA4_ZERO(p)	bzero((p), 8)
-#define FA4_SKIP(p)	((p) += 2)
-
-struct nfsv2_sattr {
-	uint32_t	sa_mode;
-	uint32_t	sa_uid;
-	uint32_t	sa_gid;
-	uint32_t	sa_size;
-	nfstime2	sa_atime;
-	nfstime2	sa_mtime;
-};
-
-/*
- * NFS Version 3 sattr structure for the new node creation case.
- */
-struct nfsv3_sattr {
-	uint32_t	sa_modetrue;
-	uint32_t	sa_mode;
-	uint32_t	sa_uidfalse;
-	uint32_t	sa_gidfalse;
-	uint32_t	sa_sizefalse;
-	uint32_t	sa_atimetype;
-	nfstime3	sa_atime;
-	uint32_t	sa_mtimetype;
-	nfstime3	sa_mtime;
-};
-
-struct nfs_statfs {
-	union {
-		struct {
-			uint32_t	nfsv2sf_tsize;
-			uint32_t	nfsv2sf_bsize;
-			uint32_t	nfsv2sf_blocks;
-			uint32_t	nfsv2sf_bfree;
-			uint32_t	nfsv2sf_bavail;
-		} sf_nfsv2;
-		struct {
-			nfsuint64	nfsv3sf_tbytes;
-			nfsuint64	nfsv3sf_fbytes;
-			nfsuint64	nfsv3sf_abytes;
-			nfsuint64	nfsv3sf_tfiles;
-			nfsuint64	nfsv3sf_ffiles;
-			nfsuint64	nfsv3sf_afiles;
-			uint32_t	nfsv3sf_invarsec;
-		} sf_nfsv3;
-	} sf_un;
-};
-
-#define sf_tsize	sf_un.sf_nfsv2.nfsv2sf_tsize
-#define sf_bsize	sf_un.sf_nfsv2.nfsv2sf_bsize
-#define sf_blocks	sf_un.sf_nfsv2.nfsv2sf_blocks
-#define sf_bfree	sf_un.sf_nfsv2.nfsv2sf_bfree
-#define sf_bavail	sf_un.sf_nfsv2.nfsv2sf_bavail
-#define sf_tbytes	sf_un.sf_nfsv3.nfsv3sf_tbytes
-#define sf_fbytes	sf_un.sf_nfsv3.nfsv3sf_fbytes
-#define sf_abytes	sf_un.sf_nfsv3.nfsv3sf_abytes
-#define sf_tfiles	sf_un.sf_nfsv3.nfsv3sf_tfiles
-#define sf_ffiles	sf_un.sf_nfsv3.nfsv3sf_ffiles
-#define sf_afiles	sf_un.sf_nfsv3.nfsv3sf_afiles
-#define sf_invarsec	sf_un.sf_nfsv3.nfsv3sf_invarsec
-
-struct nfsv3_fsinfo {
-	uint32_t	fs_rtmax;
-	uint32_t	fs_rtpref;
-	uint32_t	fs_rtmult;
-	uint32_t	fs_wtmax;
-	uint32_t	fs_wtpref;
-	uint32_t	fs_wtmult;
-	uint32_t	fs_dtpref;
-	nfsuint64	fs_maxfilesize;
-	nfstime3	fs_timedelta;
-	uint32_t	fs_properties;
-};
-
-struct nfsv3_pathconf {
-	uint32_t	pc_linkmax;
-	uint32_t	pc_namemax;
-	uint32_t	pc_notrunc;
-	uint32_t	pc_chownrestricted;
-	uint32_t	pc_caseinsensitive;
-	uint32_t	pc_casepreserving;
-};
-
-#endif
diff --git a/include.new/nfs/nfssvc.h b/include.new/nfs/nfssvc.h
deleted file mode 100644
index 918e8cc..0000000
--- a/include.new/nfs/nfssvc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/nfs/nfssvc.h 243782 2012-12-02 01:16:04Z rmacklem $
- */
-
-#ifndef _NFS_NFSSVC_H_
-#define _NFS_NFSSVC_H_
-
-/*
- * Flags for nfssvc() system call.
- */
-#define	NFSSVC_OLDNFSD	0x004
-#define	NFSSVC_ADDSOCK	0x008
-#define	NFSSVC_NFSD	0x010
-
-/*
- * and ones for nfsv4.
- */
-#define	NFSSVC_NOPUBLICFH	0x00000020
-#define	NFSSVC_STABLERESTART	0x00000040
-#define	NFSSVC_NFSDNFSD		0x00000080
-#define	NFSSVC_NFSDADDSOCK	0x00000100
-#define	NFSSVC_IDNAME		0x00000200
-#define	NFSSVC_GSSDDELETEALL	0x00000400
-#define	NFSSVC_GSSDADDPORT	0x00000800
-#define	NFSSVC_NFSUSERDPORT	0x00001000
-#define	NFSSVC_NFSUSERDDELPORT	0x00002000
-#define	NFSSVC_V4ROOTEXPORT	0x00004000
-#define	NFSSVC_ADMINREVOKE	0x00008000
-#define	NFSSVC_DUMPCLIENTS	0x00010000
-#define	NFSSVC_DUMPLOCKS	0x00020000
-#define	NFSSVC_GSSDADDFIRST	0x00040000
-#define	NFSSVC_PUBLICFH		0x00080000
-#define	NFSSVC_NFSCBD		0x00100000
-#define	NFSSVC_CBADDSOCK	0x00200000
-#define	NFSSVC_GETSTATS		0x00400000
-#define	NFSSVC_BACKUPSTABLE	0x00800000
-#define	NFSSVC_ZEROCLTSTATS	0x01000000	/* modifier for GETSTATS */
-#define	NFSSVC_ZEROSRVSTATS	0x02000000	/* modifier for GETSTATS */
-#define	NFSSVC_SUSPENDNFSD	0x04000000
-#define	NFSSVC_RESUMENFSD	0x08000000
-#define	NFSSVC_DUMPMNTOPTS	0x10000000
-
-/* Argument structure for NFSSVC_DUMPMNTOPTS. */
-struct nfscl_dumpmntopts {
-	char	*ndmnt_fname;		/* File Name */
-	size_t	ndmnt_blen;		/* Size of buffer */
-	void	*ndmnt_buf;		/* and the buffer */
-};
-
-#endif /* _NFS_NFSSVC_H */
diff --git a/include.new/nfs/rpcv2.h b/include.new/nfs/rpcv2.h
deleted file mode 100644
index 15d639c..0000000
--- a/include.new/nfs/rpcv2.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)rpcv2.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfs/rpcv2.h,v 1.14 2005/01/07 01:45:50 imp Exp $
- */
-
-
-#ifndef _NFS_RPCV2_H_
-#define _NFS_RPCV2_H_
-
-/*
- * Definitions for Sun RPC Version 2, from
- * "RPC: Remote Procedure Call Protocol Specification" RFC1057
- */
-
-/* Version # */
-#define	RPC_VER2	2
-
-/* Authentication */
-#define	RPCAUTH_NULL	0
-#define	RPCAUTH_UNIX	1
-#define	RPCAUTH_SHORT	2
-#define	RPCAUTH_KERB4	4
-#define	RPCAUTH_MAXSIZ	400
-#define	RPCVERF_MAXSIZ	12	/* For Kerb, can actually be 400 */
-#define	RPCAUTH_UNIXGIDS 16
-
-/*
- * Constants associated with authentication flavours.
- */
-#define RPCAKN_FULLNAME	0
-#define RPCAKN_NICKNAME	1
-
-/* msg type */
-#define	RPC_CALL	0
-#define	RPC_REPLY	1
-
-/* reply status */
-#define	RPC_MSGACCEPTED	0
-#define	RPC_MSGDENIED	1
-
-/* accepted status */
-#define	RPC_SUCCESS	0
-#define	RPC_PROGUNAVAIL	1
-#define	RPC_PROGMISMATCH	2
-#define	RPC_PROCUNAVAIL	3
-#define	RPC_GARBAGE	4		/* I like this one */
-#define	RPC_SYSTEMERR	5
-
-/* rejected status */
-#define	RPC_MISMATCH	0
-#define	RPC_AUTHERR	1
-
-/* Authentication failures */
-#define	AUTH_OK		0
-#define	AUTH_BADCRED	1
-#define	AUTH_REJECTCRED	2
-#define	AUTH_BADVERF	3
-#define	AUTH_REJECTVERF	4
-#define	AUTH_TOOWEAK	5		/* Give em wheaties */
-
-/* Sizes of rpc header parts */
-#define	RPC_SIZ		24
-#define	RPC_REPLYSIZ	28
-
-/* RPC Prog definitions */
-#define	RPCPROG_MNT	100005
-#define	RPCMNT_VER1	1
-#define RPCMNT_VER3	3
-#define	RPCMNT_MOUNT	1
-#define	RPCMNT_DUMP	2
-#define	RPCMNT_UMOUNT	3
-#define	RPCMNT_UMNTALL	4
-#define	RPCMNT_EXPORT	5
-#define	RPCMNT_NAMELEN	255
-#define	RPCMNT_PATHLEN	1024
-#define	RPCPROG_NFS	100003
-
-#endif
diff --git a/include.new/nfs/xdr_subs.h b/include.new/nfs/xdr_subs.h
deleted file mode 100644
index b6cb5f0..0000000
--- a/include.new/nfs/xdr_subs.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)xdr_subs.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/nfs/xdr_subs.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-
-#ifndef _NFS_XDR_SUBS_H_
-#define _NFS_XDR_SUBS_H_
-
-/*
- * Macros used for conversion to/from xdr representation by nfs...
- * These use the MACHINE DEPENDENT routines ntohl, htonl
- * As defined by "XDR: External Data Representation Standard" RFC1014
- *
- * To simplify the implementation, we use ntohl/htonl even on big-endian
- * machines, and count on them being `#define'd away.  Some of these
- * might be slightly more efficient as quad_t copies on a big-endian,
- * but we cannot count on their alignment anyway.
- */
-
-#define	fxdr_unsigned(t, v)	((t)ntohl((int32_t)(v)))
-#define	txdr_unsigned(v)	(htonl((int32_t)(v)))
-
-#define	fxdr_nfsv2time(f, t) \
-do { \
-	(t)->tv_sec = ntohl(((struct nfsv2_time *)(f))->nfsv2_sec); \
-	if (((struct nfsv2_time *)(f))->nfsv2_usec != 0xffffffff) \
-		(t)->tv_nsec = 1000 * ntohl(((struct nfsv2_time *)(f))->nfsv2_usec); \
-	else \
-		(t)->tv_nsec = 0; \
-} while (0)
-#define	txdr_nfsv2time(f, t) \
-do { \
-	((struct nfsv2_time *)(t))->nfsv2_sec = htonl((f)->tv_sec); \
-	if ((f)->tv_nsec != -1) \
-		((struct nfsv2_time *)(t))->nfsv2_usec = htonl((f)->tv_nsec / 1000); \
-	else \
-		((struct nfsv2_time *)(t))->nfsv2_usec = 0xffffffff; \
-} while (0)
-
-#define	fxdr_nfsv3time(f, t) \
-do { \
-	(t)->tv_sec = ntohl(((struct nfsv3_time *)(f))->nfsv3_sec); \
-	(t)->tv_nsec = ntohl(((struct nfsv3_time *)(f))->nfsv3_nsec); \
-} while (0)
-#define	txdr_nfsv3time(f, t) \
-do { \
-	((struct nfsv3_time *)(t))->nfsv3_sec = htonl((f)->tv_sec); \
-	((struct nfsv3_time *)(t))->nfsv3_nsec = htonl((f)->tv_nsec); \
-} while (0)
-
-#define	fxdr_hyper(f) \
-	((((u_quad_t)ntohl(((uint32_t *)(f))[0])) << 32) | \
-	 (u_quad_t)(ntohl(((uint32_t *)(f))[1])))
-#define	txdr_hyper(f, t) \
-do { \
-	((uint32_t *)(t))[0] = htonl((uint32_t)((f) >> 32)); \
-	((uint32_t *)(t))[1] = htonl((uint32_t)((f) & 0xffffffff)); \
-} while (0)
-
-#endif
diff --git a/include.new/nfsclient/krpc.h b/include.new/nfsclient/krpc.h
deleted file mode 100644
index 7778f23..0000000
--- a/include.new/nfsclient/krpc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*	$NetBSD: krpc.h,v 1.4 1995/12/19 23:07:11 cgd Exp $	*/
-/* $FreeBSD: src/sys/nfsclient/krpc.h,v 1.8 2001/09/18 23:31:50 peter Exp $	*/
-
-#include <sys/cdefs.h>
-
-struct mbuf;
-struct thread;
-struct sockaddr;
-struct sockaddr_in;
-
-int krpc_call(struct sockaddr_in *_sin,
-	u_int prog, u_int vers, u_int func,
-	struct mbuf **data, struct sockaddr **from, struct thread *td);
-
-int krpc_portmap(struct sockaddr_in *_sin,
-	u_int prog, u_int vers, u_int16_t *portp, struct thread *td);
-
-struct mbuf *xdr_string_encode(char *str, int len);
-
-/*
- * RPC definitions for the portmapper
- */
-#define	PMAPPORT		111
-#define	PMAPPROG		100000
-#define	PMAPVERS		2
-#define	PMAPPROC_NULL		0
-#define	PMAPPROC_SET		1
-#define	PMAPPROC_UNSET		2
-#define	PMAPPROC_GETPORT	3
-#define	PMAPPROC_DUMP		4
-#define	PMAPPROC_CALLIT		5
diff --git a/include.new/nfsclient/nfs.h b/include.new/nfsclient/nfs.h
deleted file mode 100644
index 6aa8faf..0000000
--- a/include.new/nfsclient/nfs.h
+++ /dev/null
@@ -1,296 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: releng/10.2/sys/nfsclient/nfs.h 221986 2011-05-16 13:12:09Z rmacklem $
- */
-
-#ifndef _NFSCLIENT_NFS_H_
-#define _NFSCLIENT_NFS_H_
-
-#ifdef _KERNEL
-#include "opt_nfs.h"
-#endif
-
-#include <nfsclient/nfsargs.h>
-
-/*
- * Tunable constants for nfs
- */
-
-#define NFS_TICKINTVL	10		/* Desired time for a tick (msec) */
-#define NFS_HZ		(hz / nfs_ticks) /* Ticks/sec */
-#define	NFS_TIMEO	(1 * NFS_HZ)	/* Default timeout = 1 second */
-#define	NFS_MINTIMEO	(1 * NFS_HZ)	/* Min timeout to use */
-#define	NFS_MAXTIMEO	(60 * NFS_HZ)	/* Max timeout to backoff to */
-#define	NFS_MINIDEMTIMEO (5 * NFS_HZ)	/* Min timeout for non-idempotent ops*/
-#define	NFS_MAXREXMIT	100		/* Stop counting after this many */
-#define	NFS_RETRANS	10		/* Num of retrans for UDP soft mounts */
-#define	NFS_RETRANS_TCP	2		/* Num of retrans for TCP soft mounts */
-#define	NFS_MAXGRPS	16		/* Max. size of groups list */
-#ifndef NFS_MINATTRTIMO
-#define	NFS_MINATTRTIMO 3		/* VREG attrib cache timeout in sec */
-#endif
-#ifndef NFS_MAXATTRTIMO
-#define	NFS_MAXATTRTIMO 60
-#endif
-#ifndef NFS_MINDIRATTRTIMO
-#define	NFS_MINDIRATTRTIMO 3		/* VDIR attrib cache timeout in sec */
-#endif
-#ifndef NFS_MAXDIRATTRTIMO
-#define	NFS_MAXDIRATTRTIMO 60
-#endif
-#ifndef	NFS_ACCESSCACHESIZE
-#define	NFS_ACCESSCACHESIZE 8		/* Per-node access cache entries */
-#endif
-#define	NFS_WSIZE	8192		/* Def. write data size <= 8192 */
-#define	NFS_RSIZE	8192		/* Def. read data size <= 8192 */
-#define NFS_READDIRSIZE	8192		/* Def. readdir size */
-#define	NFS_DEFRAHEAD	1		/* Def. read ahead # blocks */
-#define	NFS_MAXRAHEAD	4		/* Max. read ahead # blocks */
-#define	NFS_MAXASYNCDAEMON 	64	/* Max. number async_daemons runnable */
-#define	NFS_DIRBLKSIZ	4096		/* Must be a multiple of DIRBLKSIZ */
-#ifdef _KERNEL
-#define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
-#endif
-#define NFS_MAXDEADTHRESH	9	/* How long till we say 'server not responding' */
-
-/*
- * Oddballs
- */
-#define NFS_CMPFH(n, f, s) \
-	((n)->n_fhsize == (s) && !bcmp((caddr_t)(n)->n_fhp, (caddr_t)(f), (s)))
-#define NFS_ISV3(v)	(VFSTONFS((v)->v_mount)->nm_flag & NFSMNT_NFSV3)
-#define NFS_ISV4(v)	(VFSTONFS((v)->v_mount)->nm_flag & NFSMNT_NFSV4)
-
-#define NFSSTA_HASWRITEVERF	0x00040000  /* Has write verifier for V3 */
-#define NFSSTA_GOTFSINFO	0x00100000  /* Got the V3 fsinfo */
-#define	NFSSTA_SNDLOCK		0x01000000  /* Send socket lock */
-#define	NFSSTA_WANTSND		0x02000000  /* Want above */
-#define	NFSSTA_TIMEO		0x10000000  /* Experiencing a timeout */
-#define	NFSSTA_LOCKTIMEO	0x20000000  /* Experiencing a lockd timeout */
-
-
-/*
- * XXX to allow amd to include nfs.h without nfsproto.h
- */
-#ifdef NFS_NPROCS
-#include <nfsclient/nfsstats.h>
-#endif
-
-/*
- * vfs.oldnfs sysctl(3) identifiers
- */
-#define NFS_NFSSTATS	1		/* struct: struct nfsstats */
-
-#ifdef _KERNEL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_NFSREQ);
-MALLOC_DECLARE(M_NFSDIROFF);
-MALLOC_DECLARE(M_NFSBIGFH);
-MALLOC_DECLARE(M_NFSHASH);
-MALLOC_DECLARE(M_NFSDIRECTIO);
-#endif
-
-extern struct uma_zone *nfsmount_zone;
-
-extern struct nfsstats nfsstats;
-extern struct mtx nfs_iod_mtx;
-extern struct task nfs_nfsiodnew_task;
-
-extern int nfs_numasync;
-extern unsigned int nfs_iodmax;
-extern int nfs_pbuf_freecnt;
-extern int nfs_ticks;
-
-/* Data constants in XDR form */
-extern uint32_t nfs_true, nfs_false, nfs_xdrneg1;
-extern uint32_t rpc_reply, rpc_msgdenied, rpc_mismatch, rpc_vers;
-extern uint32_t rpc_auth_unix, rpc_msgaccepted, rpc_call, rpc_autherr;
-
-extern int nfsv3_procid[NFS_NPROCS];
-
-/*
- * Socket errors ignored for connectionless sockets??
- * For now, ignore them all
- */
-#define	NFSIGNORE_SOERROR(s, e) \
-		((e) != EINTR && (e) != EIO && \
-		(e) != ERESTART && (e) != EWOULDBLOCK && \
-		((s) & PR_CONNREQUIRED) == 0)
-
-struct nfsmount;
-
-struct buf;
-struct socket;
-struct uio;
-struct vattr;
-
-/*
- * Pointers to ops that differ from v3 to v4
- */
-struct nfs_rpcops {
-	int	(*nr_readrpc)(struct vnode *vp, struct uio *uiop,
-		    struct ucred *cred);
-	int	(*nr_writerpc)(struct vnode *vp, struct uio *uiop,
-		    struct ucred *cred, int *iomode, int *must_commit);
-	int	(*nr_writebp)(struct buf *bp, int force, struct thread *td);
-	int	(*nr_readlinkrpc)(struct vnode *vp, struct uio *uiop,
-		    struct ucred *cred);
-	void	(*nr_invaldir)(struct vnode *vp);
-	int	(*nr_commit)(struct vnode *vp, u_quad_t offset, int cnt,
-		    struct ucred *cred, struct thread *td);
-};
-
-/*
- * Defines for WebNFS
- */
-
-#define WEBNFS_ESC_CHAR		'%'
-#define WEBNFS_SPECCHAR_START	0x80
-
-#define WEBNFS_NATIVE_CHAR	0x80
-/*
- * ..
- * Possibly more here in the future.
- */
-
-/*
- * Macro for converting escape characters in WebNFS pathnames.
- * Should really be in libkern.
- */
-
-#define HEXTOC(c) \
-	((c) >= 'a' ? ((c) - ('a' - 10)) : \
-	    ((c) >= 'A' ? ((c) - ('A' - 10)) : ((c) - '0')))
-#define HEXSTRTOI(p) \
-	((HEXTOC(p[0]) << 4) + HEXTOC(p[1]))
-
-/* nfs_sigintr() helper, when 'rep' has all we need */
-#define NFS_SIGREP(rep)		nfs_sigintr((rep)->r_nmp, (rep), (rep)->r_td)
-
-#ifdef NFS_DEBUG
-
-extern int nfs_debug;
-#define NFS_DEBUG_ASYNCIO	1 /* asynchronous i/o */
-#define NFS_DEBUG_WG		2 /* server write gathering */
-#define NFS_DEBUG_RC		4 /* server request caching */
-
-#define NFS_DPF(cat, args)					\
-	do {							\
-		if (nfs_debug & NFS_DEBUG_##cat) printf args;	\
-	} while (0)
-
-#else
-
-#define NFS_DPF(cat, args)
-
-#endif
-
-/*
- * On fast networks, the estimator will try to reduce the
- * timeout lower than the latency of the server's disks,
- * which results in too many timeouts, so cap the lower
- * bound.
- */
-#define NFS_MINRTO	(NFS_HZ >> 2)
-
-/*
- * Keep the RTO from increasing to unreasonably large values
- * when a server is not responding.
- */
-#define NFS_MAXRTO	(20 * NFS_HZ)
-
-enum nfs_rto_timer_t {
-	NFS_DEFAULT_TIMER,
-	NFS_GETATTR_TIMER,
-	NFS_LOOKUP_TIMER,
-	NFS_READ_TIMER,
-	NFS_WRITE_TIMER,
-};
-#define NFS_MAX_TIMER	(NFS_WRITE_TIMER)
-
-#define NFS_INITRTT	(NFS_HZ << 3)
-
-vfs_init_t nfs_init;
-vfs_uninit_t nfs_uninit;
-int	nfs_mountroot(struct mount *mp);
-
-void	nfs_purgecache(struct vnode *);
-int	nfs_vinvalbuf(struct vnode *, int, struct thread *, int);
-int	nfs_readrpc(struct vnode *, struct uio *, struct ucred *);
-int	nfs_writerpc(struct vnode *, struct uio *, struct ucred *, int *,
-	    int *);
-int	nfs_commit(struct vnode *vp, u_quad_t offset, int cnt,
-	    struct ucred *cred, struct thread *td);
-int	nfs_readdirrpc(struct vnode *, struct uio *, struct ucred *);
-void	nfs_nfsiodnew(void);
-void	nfs_nfsiodnew_tq(__unused void *, int);
-int	nfs_asyncio(struct nfsmount *, struct buf *, struct ucred *, struct thread *);
-int	nfs_doio(struct vnode *, struct buf *, struct ucred *, struct thread *);
-void	nfs_doio_directwrite (struct buf *);
-int	nfs_readlinkrpc(struct vnode *, struct uio *, struct ucred *);
-int	nfs_sigintr(struct nfsmount *, struct thread *);
-int	nfs_readdirplusrpc(struct vnode *, struct uio *, struct ucred *);
-int	nfs_request(struct vnode *, struct mbuf *, int, struct thread *,
-	    struct ucred *, struct mbuf **, struct mbuf **, caddr_t *);
-int	nfs_loadattrcache(struct vnode **, struct mbuf **, caddr_t *,
-	    struct vattr *, int);
-int	nfsm_mbuftouio(struct mbuf **, struct uio *, int, caddr_t *);
-void	nfs_nhinit(void);
-void	nfs_nhuninit(void);
-int	nfs_nmcancelreqs(struct nfsmount *);
-void	nfs_timer(void*);
-
-int	nfs_connect(struct nfsmount *);
-void	nfs_disconnect(struct nfsmount *);
-void	nfs_safedisconnect(struct nfsmount *);
-int	nfs_getattrcache(struct vnode *, struct vattr *);
-int	nfs_iosize(struct nfsmount *nmp);
-int	nfsm_strtmbuf(struct mbuf **, char **, const char *, long);
-int	nfs_bioread(struct vnode *, struct uio *, int, struct ucred *);
-int	nfsm_uiotombuf(struct uio *, struct mbuf **, int, caddr_t *);
-void	nfs_clearcommit(struct mount *);
-int	nfs_writebp(struct buf *, int, struct thread *);
-int	nfs_fsinfo(struct nfsmount *, struct vnode *, struct ucred *,
-	    struct thread *);
-int	nfs_meta_setsize (struct vnode *, struct ucred *,
-	    struct thread *, u_quad_t);
-
-void	nfs_set_sigmask(struct thread *td, sigset_t *oldset);
-void	nfs_restore_sigmask(struct thread *td, sigset_t *set);
-int	nfs_msleep(struct thread *td, void *ident, struct mtx *mtx,
-	    int priority, char *wmesg, int timo);
-
-#endif	/* _KERNEL */
-
-#endif
diff --git a/include.new/nfsclient/nfs_lock.h b/include.new/nfsclient/nfs_lock.h
deleted file mode 100644
index e47f73b..0000000
--- a/include.new/nfsclient/nfs_lock.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1998 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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.
- *
- *      from nfs_lock.h,v 2.2 1998/04/28 19:38:41 don Exp
- * $FreeBSD: src/sys/nfsclient/nfs_lock.h,v 1.6 2004/12/06 08:31:32 phk Exp $
- */
-
-/*
- * lockd uses the nfssvc system call to get the unique kernel services it needs.
- * It passes in a request structure with a version number at the start.
- * This prevents libc from needing to change if the information passed
- * between lockd and the kernel needs to change.
- *
- * If a structure changes, you must bump the version number.
- */
-
-#include <nfs/nfsproto.h>
-
-/*
- * The fifo where the kernel writes requests for locks on remote NFS files,
- * and where lockd reads these requests.
- *
- */
-#define	_PATH_NFSLCKDEV	"nfslock"
-
-/*
- * This structure is used to uniquely identify the process which originated
- * a particular message to lockd.  A sequence number is used to differentiate
- * multiple messages from the same process.  A process start time is used to
- * detect the unlikely, but possible, event of the recycling of a pid.
- */
-struct lockd_msg_ident {
-	pid_t		pid;            /* The process ID. */
-	struct timeval	pid_start;	/* Start time of process id */
-	int		msg_seq;	/* Sequence number of message */
-};
-
-#define LOCKD_MSG_VERSION	3
-
-/*
- * The structure that the kernel hands us for each lock request.
- */
-typedef struct __lock_msg {
-	TAILQ_ENTRY(__lock_msg)	lm_link;	/* internal linkage */
-	int			lm_version;	/* which version is this */
-	struct lockd_msg_ident	lm_msg_ident;	/* originator of the message */
-	struct flock		lm_fl;             /* The lock request. */
-	int			lm_wait;           /* The F_WAIT flag. */
-	int			lm_getlk;		/* is this a F_GETLK request */
-	struct sockaddr_storage lm_addr;		/* The address. */
-	int			lm_nfsv3;		/* If NFS version 3. */
-	size_t			lm_fh_len;		/* The file handle length. */
-	struct xucred		lm_cred;		/* user cred for lock req */
-	u_int8_t		lm_fh[NFS_SMALLFH];/* The file handle. */
-} LOCKD_MSG;
-
-#define LOCKD_ANS_VERSION	1
-
-struct lockd_ans {
-	int		la_vers;
-	struct lockd_msg_ident	la_msg_ident;	/* originator of the message */
-	int		la_errno;
-	int		la_set_getlk_pid;		/* use returned pid */
-	int		la_getlk_pid;		/* returned pid for F_GETLK */
-};
-
-#ifdef _KERNEL
-int	nfs_dolock(struct vop_advlock_args *ap);
-#endif
diff --git a/include.new/nfsclient/nfsargs.h b/include.new/nfsclient/nfsargs.h
deleted file mode 100644
index d2e7da7..0000000
--- a/include.new/nfsclient/nfsargs.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: releng/10.2/sys/nfsclient/nfsargs.h 260107 2013-12-30 21:17:20Z rmacklem $
- */
-
-#ifndef _NFSCLIENT_NFSARGS_H_
-#define _NFSCLIENT_NFSARGS_H_
-
-/*
- * Arguments to mount NFS
- */
-#define NFS_ARGSVERSION	3		/* change when nfs_args changes */
-struct nfs_args {
-	int		version;	/* args structure version number */
-	struct sockaddr	*addr;		/* file server address */
-	int		addrlen;	/* length of address */
-	int		sotype;		/* Socket type */
-	int		proto;		/* and Protocol */
-	u_char		*fh;		/* File handle to be mounted */
-	int		fhsize;		/* Size, in bytes, of fh */
-	int		flags;		/* flags */
-	int		wsize;		/* write size in bytes */
-	int		rsize;		/* read size in bytes */
-	int		readdirsize;	/* readdir size in bytes */
-	int		timeo;		/* initial timeout in .1 secs */
-	int		retrans;	/* times to retry send */
-	int		maxgrouplist;	/* Max. size of group list */
-	int		readahead;	/* # of blocks to readahead */
-	int		wcommitsize;	/* Max. write commit size in bytes */
-	int		deadthresh;	/* Retrans threshold */
-	char		*hostname;	/* server's name */
-	int		acregmin;	/* cache attrs for reg files min time */
-	int		acregmax;	/* cache attrs for reg files max time */
-	int		acdirmin;	/* cache attrs for dirs min time */
-	int		acdirmax;	/* cache attrs for dirs max time */
-};
-
-/*
- * NFS mount option flags
- */
-#define	NFSMNT_SOFT		0x00000001  /* soft mount (hard is default) */
-#define	NFSMNT_WSIZE		0x00000002  /* set write size */
-#define	NFSMNT_RSIZE		0x00000004  /* set read size */
-#define	NFSMNT_TIMEO		0x00000008  /* set initial timeout */
-#define	NFSMNT_RETRANS		0x00000010  /* set number of request retries */
-#define	NFSMNT_MAXGRPS		0x00000020  /* set maximum grouplist size */
-#define	NFSMNT_INT		0x00000040  /* allow interrupts on hard mount */
-#define	NFSMNT_NOCONN		0x00000080  /* Don't Connect the socket */
-/* 0x100 free, was NFSMNT_NQNFS */
-#define	NFSMNT_NFSV3		0x00000200  /* Use NFS Version 3 protocol */
-#define	NFSMNT_KERB		0x00000400  /* Use RPCSEC_GSS/Krb5 */
-#define	NFSMNT_DUMBTIMR		0x00000800  /* Don't estimate rtt dynamically */
-#define	NFSMNT_WCOMMITSIZE	0x00001000  /* set max write commit size */
-#define	NFSMNT_READAHEAD	0x00002000  /* set read ahead */
-#define	NFSMNT_DEADTHRESH	0x00004000  /* set dead server retry thresh */
-#define	NFSMNT_RESVPORT		0x00008000  /* Allocate a reserved port */
-#define	NFSMNT_RDIRPLUS		0x00010000  /* Use Readdirplus for V3 */
-#define	NFSMNT_READDIRSIZE	0x00020000  /* Set readdir size */
-#define	NFSMNT_ACREGMIN		0x00040000
-#define	NFSMNT_ACREGMAX		0x00080000
-#define	NFSMNT_ACDIRMIN		0x00100000
-#define	NFSMNT_ACDIRMAX		0x00200000
-#define	NFSMNT_NOLOCKD		0x00400000 /* Locks are local */
-#define	NFSMNT_NFSV4		0x00800000 /* Use NFS Version 4 protocol */
-#define	NFSMNT_HASWRITEVERF	0x01000000 /* NFSv4 Write verifier */
-#define	NFSMNT_INTEGRITY	0x02000000 /* Use integrity with RPCSEC_GSS */
-#define	NFSMNT_PRIVACY		0x04000000 /* Use privacy with RPCSEC_GSS */
-#define	NFSMNT_ALLGSSNAME	0x08000000 /* Use principal for all accesses */
-#define	NFSMNT_STRICT3530	0x10000000 /* Adhere strictly to RFC3530 */
-#define	NFSMNT_NOCTO		0x20000000 /* Don't flush attrcache on open */
-#define	NFSMNT_PNFS		0x40000000 /* Enable pNFS support */
-#define	NFSMNT_NONCONTIGWR	0x80000000 /* Enable non-contiguous writes */
-
-#endif
diff --git a/include.new/nfsclient/nfsdiskless.h b/include.new/nfsclient/nfsdiskless.h
deleted file mode 100644
index b880883..0000000
--- a/include.new/nfsclient/nfsdiskless.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfsdiskless.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/nfsclient/nfsdiskless.h,v 1.17 2005/01/07 01:45:51 imp Exp $
- */
-
-#ifndef _NFSCLIENT_NFSDISKLESS_H_
-#define _NFSCLIENT_NFSDISKLESS_H_
-
-/*
- * Structure that must be initialized for a diskless nfs client.
- * This structure is used by nfs_mountroot() to set up the root vnode,
- * and to do a partial ifconfig(8) and route(8) so that the critical net
- * interface can communicate with the server.
- * The primary bootstrap is expected to fill in the appropriate fields before
- * starting the kernel.
- * Currently only works for AF_INET protocols.
- * NB: All fields are stored in net byte order to avoid hassles with
- * client/server byte ordering differences.
- */
-
-/*
- * I have defined a new structure that can handle an NFS Version 3 file handle
- * but the kernel still expects the old Version 2 one to be provided. The
- * changes required in nfs_vfsops.c for using the new are documented there in
- * comments. (I felt that breaking network booting code by changing this
- * structure would not be prudent at this time, since almost all servers are
- * still Version 2 anyhow.)
- */
-struct nfsv3_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct nfs_args	root_args;		/* Mount args for root fs */
-	int		root_fhsize;		/* Size of root file handle */
-	u_char		root_fh[NFSX_V3FHMAX];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-/*
- * Old arguments to mount NFS
- */
-struct onfs_args {
-	struct sockaddr	*addr;		/* file server address */
-	int		addrlen;	/* length of address */
-	int		sotype;		/* Socket type */
-	int		proto;		/* and Protocol */
-	u_char		*fh;		/* File handle to be mounted */
-	int		fhsize;		/* Size, in bytes, of fh */
-	int		flags;		/* flags */
-	int		wsize;		/* write size in bytes */
-	int		rsize;		/* read size in bytes */
-	int		readdirsize;	/* readdir size in bytes */
-	int		timeo;		/* initial timeout in .1 secs */
-	int		retrans;	/* times to retry send */
-	int		maxgrouplist;	/* Max. size of group list */
-	int		readahead;	/* # of blocks to readahead */
-	int		leaseterm;	/* Term (sec) of lease */
-	int		deadthresh;	/* Retrans threshold */
-	char		*hostname;	/* server's name */
-};
-
-struct nfs_diskless {
-	struct ifaliasreq myif;			/* Default interface */
-	struct sockaddr_in mygateway;		/* Default gateway */
-	struct onfs_args root_args;		/* Mount args for root fs */
-	u_char		root_fh[NFSX_V2FH];	/* File handle of root dir */
-	struct sockaddr_in root_saddr;		/* Address of root server */
-	char		root_hostnam[MNAMELEN];	/* Host name for mount pt */
-	long		root_time;		/* Timestamp of root fs */
-	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
-};
-
-#ifdef _KERNEL
-extern struct nfsv3_diskless nfsv3_diskless;
-extern struct nfs_diskless nfs_diskless;
-extern int	nfs_diskless_valid;
-void bootpc_init(void);
-void nfs_setup_diskless(void);
-#endif
-
-#endif
diff --git a/include.new/nfsclient/nfsm_subs.h b/include.new/nfsclient/nfsm_subs.h
deleted file mode 100644
index 71ec887..0000000
--- a/include.new/nfsclient/nfsm_subs.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/nfsclient/nfsm_subs.h 248198 2013-03-12 12:23:47Z glebius $
- */
-
-#ifndef _NFSCLIENT_NFSM_SUBS_H_
-#define _NFSCLIENT_NFSM_SUBS_H_
-
-#include <nfs/nfs_common.h>
-
-#define	nfsv2tov_type(a)	nv2tov_type[fxdr_unsigned(uint32_t,(a))&0x7]
-
-struct ucred;
-struct vnode;
-
-/*
- * These macros do strange and peculiar things to mbuf chains for
- * the assistance of the nfs code. To attempt to use them for any
- * other purpose will be dangerous. (they make weird assumptions)
- */
-
-/*
- * First define what the actual subs. return
- */
-uint32_t nfs_xid_gen(void);
-
-/* *********************************** */
-/* Request generation phase macros */
-
-int	nfsm_fhtom_xx(struct vnode *v, int v3, struct mbuf **mb,
-	    caddr_t *bpos);
-void	nfsm_v3attrbuild_xx(struct vattr *va, int full, struct mbuf **mb,
-	    caddr_t *bpos);
-int	nfsm_strtom_xx(const char *a, int s, int m, struct mbuf **mb,
-	    caddr_t *bpos);
-
-#define nfsm_bcheck(t1, mreq) \
-do { \
-	if (t1) { \
-		error = t1; \
-		m_freem(mreq); \
-		goto nfsmout; \
-	} \
-} while (0)
-
-#define nfsm_fhtom(v, v3) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_fhtom_xx((v), (v3), &mb, &bpos); \
-	nfsm_bcheck(t1, mreq); \
-} while (0)
-
-/* If full is true, set all fields, otherwise just set mode and time fields */
-#define nfsm_v3attrbuild(a, full) \
-	nfsm_v3attrbuild_xx(a, full, &mb, &bpos)
-
-#define nfsm_uiotom(p, s) \
-do { \
-	int t1; \
-	t1 = nfsm_uiotombuf((p), &mb, (s), &bpos); \
-	nfsm_bcheck(t1, mreq); \
-} while (0)
-
-#define	nfsm_strtom(a, s, m) \
-do { \
-	int t1; \
-	t1 = nfsm_strtom_xx((a), (s), (m), &mb, &bpos); \
-	nfsm_bcheck(t1, mreq); \
-} while (0)
-
-/* *********************************** */
-/* Send the request */
-
-#define	nfsm_request(v, t, p, c) \
-do { \
-	sigset_t oldset; \
-	nfs_set_sigmask(p, &oldset); \
-	error = nfs_request((v), mreq, (t), (p), (c), &mrep, &md, &dpos); \
-	nfs_restore_sigmask(p, &oldset); \
-	if (error != 0) { \
-		if (error & NFSERR_RETERR) \
-			error &= ~NFSERR_RETERR; \
-		else \
-			goto nfsmout; \
-	} \
-} while (0)
-
-/* *********************************** */
-/* Reply interpretation phase macros */
-
-int	nfsm_mtofh_xx(struct vnode *d, struct vnode **v, int v3, int *f,
-	    struct mbuf **md, caddr_t *dpos);
-int	nfsm_getfh_xx(nfsfh_t **f, int *s, int v3, struct mbuf **md,
-	    caddr_t *dpos);
-int	nfsm_loadattr_xx(struct vnode **v, struct vattr *va, struct mbuf **md,
-	    caddr_t *dpos);
-int	nfsm_postop_attr_xx(struct vnode **v, int *f, struct vattr *va,
-	    struct mbuf **md, caddr_t *dpos);
-int	nfsm_wcc_data_xx(struct vnode **v, int *f, struct mbuf **md,
-	    caddr_t *dpos);
-
-#define nfsm_mtofh(d, v, v3, f) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_mtofh_xx((d), &(v), (v3), &(f), &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define nfsm_getfh(f, s, v3) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_getfh_xx(&(f), &(s), (v3), &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define	nfsm_loadattr(v, a) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_loadattr_xx(&v, a, &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define	nfsm_postop_attr(v, f) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_postop_attr_xx(&v, &f, NULL, &md, &dpos);	\
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#define	nfsm_postop_attr_va(v, f, va)		\
-do { \
-	int32_t t1; \
-	t1 = nfsm_postop_attr_xx(&v, &f, va, &md, &dpos);	\
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-/* Used as (f) for nfsm_wcc_data() */
-#define NFSV3_WCCRATTR	0
-#define NFSV3_WCCCHK	1
-
-#define	nfsm_wcc_data(v, f) \
-do { \
-	int32_t t1; \
-	t1 = nfsm_wcc_data_xx(&v, &f, &md, &dpos); \
-	nfsm_dcheck(t1, mrep); \
-} while (0)
-
-#endif
diff --git a/include.new/nfsclient/nfsmount.h b/include.new/nfsclient/nfsmount.h
deleted file mode 100644
index 49fbaf2..0000000
--- a/include.new/nfsclient/nfsmount.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfsmount.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/nfsclient/nfsmount.h 248255 2013-03-13 21:06:03Z jhb $
- */
-
-#ifndef _NFSCLIENT_NFSMOUNT_H_
-#define _NFSCLIENT_NFSMOUNT_H_
-
-#include <sys/socket.h>
-
-#include <nfs/nfs_mountcommon.h>
-
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/clnt.h>
-#include <rpc/rpcsec_gss.h>
-
-/*
- * Mount structure.
- * One allocated on every NFS mount.
- * Holds NFS specific information for mount.
- */
-struct	nfsmount {
-	struct	nfsmount_common nm_com;	/* Common fields for nlm */
-	int	nm_numgrps;		/* Max. size of groupslist */
-	u_char	nm_fh[NFSX_V4FH];	/* File handle of root dir */
-	int	nm_fhsize;		/* Size of root file handle */
-	int	nm_sotype;		/* Type of socket */
-	int	nm_soproto;		/* and protocol */
-	int	nm_soflags;		/* pr_flags for socket protocol */
-	struct	sockaddr *nm_nam;	/* Addr of server */
-	int	nm_deadthresh;		/* Threshold of timeouts-->dead server*/
-	int	nm_rsize;		/* Max size of read rpc */
-	int	nm_wsize;		/* Max size of write rpc */
-	int	nm_readdirsize;		/* Size of a readdir rpc */
-	int	nm_readahead;		/* Num. of blocks to readahead */
-	int	nm_wcommitsize;		/* Max size of commit for write */
-	int	nm_acdirmin;		/* Directory attr cache min lifetime */
-	int	nm_acdirmax;		/* Directory attr cache max lifetime */
-	int	nm_acregmin;		/* Reg file attr cache min lifetime */
-	int	nm_acregmax;		/* Reg file attr cache max lifetime */
-	u_char	nm_verf[NFSX_V3WRITEVERF]; /* V3 write verifier */
-	TAILQ_HEAD(, buf) nm_bufq;	/* async io buffer queue */
-	short	nm_bufqlen;		/* number of buffers in queue */
-	short	nm_bufqwant;		/* process wants to add to the queue */
-	int	nm_bufqiods;		/* number of iods processing queue */
-	u_int64_t nm_maxfilesize;	/* maximum file size */
-	struct nfs_rpcops *nm_rpcops;
-	int	nm_tprintf_initial_delay;	/* initial delay */
-	int	nm_tprintf_delay;		/* interval for messages */
-	int	nm_secflavor;		 /* auth flavor to use for rpc */
-	struct __rpc_client *nm_client;
-	struct rpc_timers nm_timers[NFS_MAX_TIMER]; /* RTT Timers for rpcs */
-	char	nm_principal[MNAMELEN];	/* GSS-API principal of server */
-	gss_OID	nm_mech_oid;		/* OID of selected GSS-API mechanism */
-	int	nm_nametimeo;		/* timeout for +ve entries (sec) */
-	int	nm_negnametimeo;	/* timeout for -ve entries (sec) */
-
-	/* NFSv4 */
-	uint64_t nm_clientid;
-	fsid_t	nm_fsid;
-	u_int	nm_lease_time;
-	time_t	nm_last_renewal;
-};
-
-#define	nm_mtx		nm_com.nmcom_mtx
-#define	nm_flag		nm_com.nmcom_flag
-#define	nm_state	nm_com.nmcom_state
-#define	nm_mountp	nm_com.nmcom_mountp
-#define	nm_timeo	nm_com.nmcom_timeo
-#define	nm_retry	nm_com.nmcom_retry
-#define	nm_hostname	nm_com.nmcom_hostname
-#define	nm_getinfo	nm_com.nmcom_getinfo
-#define	nm_vinvalbuf	nm_com.nmcom_vinvalbuf
-
-#if defined(_KERNEL)
-/*
- * Convert mount ptr to nfsmount ptr.
- */
-#define VFSTONFS(mp)	((struct nfsmount *)((mp)->mnt_data))
-
-#ifndef NFS_TPRINTF_INITIAL_DELAY
-#define NFS_TPRINTF_INITIAL_DELAY       12
-#endif
-
-#ifndef NFS_TPRINTF_DELAY
-#define NFS_TPRINTF_DELAY               30
-#endif
-
-#ifndef NFS_DEFAULT_NAMETIMEO
-#define NFS_DEFAULT_NAMETIMEO		60
-#endif
-
-#ifndef NFS_DEFAULT_NEGNAMETIMEO
-#define NFS_DEFAULT_NEGNAMETIMEO	60
-#endif
-
-#endif
-
-#endif
diff --git a/include.new/nfsclient/nfsnode.h b/include.new/nfsclient/nfsnode.h
deleted file mode 100644
index 1cb3ac0..0000000
--- a/include.new/nfsclient/nfsnode.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfsnode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD: releng/10.2/sys/nfsclient/nfsnode.h 235332 2012-05-12 12:02:51Z rmacklem $
- */
-
-#ifndef _NFSCLIENT_NFSNODE_H_
-#define _NFSCLIENT_NFSNODE_H_
-
-#include <sys/_task.h>
-#if !defined(_NFSCLIENT_NFS_H_) && !defined(_KERNEL)
-#include <nfs/nfs.h>
-#endif
-
-/*
- * Silly rename structure that hangs off the nfsnode until the name
- * can be removed by nfs_inactive()
- */
-struct sillyrename {
-	struct	task s_task;
-	struct	ucred *s_cred;
-	struct	vnode *s_dvp;
-	int	(*s_removeit)(struct sillyrename *sp);
-	long	s_namlen;
-	char	s_name[32];
-};
-
-/*
- * This structure is used to save the logical directory offset to
- * NFS cookie mappings.
- * The mappings are stored in a list headed
- * by n_cookies, as required.
- * There is one mapping for each NFS_DIRBLKSIZ bytes of directory information
- * stored in increasing logical offset byte order.
- */
-#define NFSNUMCOOKIES		31
-
-struct nfsdmap {
-	LIST_ENTRY(nfsdmap)	ndm_list;
-	int			ndm_eocookie;
-	union {
-		nfsuint64	ndmu3_cookies[NFSNUMCOOKIES];
-		uint64_t	ndmu4_cookies[NFSNUMCOOKIES];
-	} ndm_un1;
-};
-
-#define ndm_cookies	ndm_un1.ndmu3_cookies
-#define ndm4_cookies	ndm_un1.ndmu4_cookies
-
-struct nfs_accesscache {
-	uint32_t		mode;		/* ACCESS mode cache */
-	uid_t			uid;		/* credentials having mode */
-	time_t			stamp;		/* mode cache timestamp */
-};
-	
-/*
- * The nfsnode is the nfs equivalent to ufs's inode. Any similarity
- * is purely coincidental.
- * There is a unique nfsnode allocated for each active file,
- * each current directory, each mounted-on file, text file, and the root.
- * An nfsnode is 'named' by its file handle. (nget/nfs_node.c)
- * If this structure exceeds 256 bytes (it is currently 256 using 4.4BSD-Lite
- * type definitions), file handles of > 32 bytes should probably be split out
- * into a separate MALLOC()'d data structure. (Reduce the size of nfsfh_t by
- * changing the definition in nfsproto.h of NFS_SMALLFH.)
- * NB: Hopefully the current order of the fields is such that everything will
- *     be well aligned and, therefore, tightly packed.
- */
-struct nfsnode {
-	struct mtx 		n_mtx;		/* Protects all of these members */
-	u_quad_t		n_size;		/* Current size of file */
-	u_quad_t		n_brev;		/* Modify rev when cached */
-	u_quad_t		n_lrev;		/* Modify rev for lease */
-	struct vattr		n_vattr;	/* Vnode attribute cache */
-	time_t			n_attrstamp;	/* Attr. cache timestamp */
-	struct nfs_accesscache	n_accesscache[NFS_ACCESSCACHESIZE];
-	struct timespec		n_mtime;	/* Prev modify time. */
-	nfsfh_t			*n_fhp;		/* NFS File Handle */
-	struct vnode		*n_vnode;	/* associated vnode */
-	struct vnode		*n_dvp;		/* parent vnode */
-	int			n_error;	/* Save write error value */
-	union {
-		struct timespec	nf_atim;	/* Special file times */
-		nfsuint64	nd_cookieverf;	/* Cookie verifier (dir only) */
-		u_char		nd4_cookieverf[NFSX_V4VERF];
-	} n_un1;
-	union {
-		struct timespec	nf_mtim;
-		off_t		nd_direof;	/* Dir. EOF offset cache */
-	} n_un2;
-	union {
-		struct sillyrename *nf_silly;	/* Ptr to silly rename struct */
-		LIST_HEAD(, nfsdmap) nd_cook;	/* cookies */
-	} n_un3;
-	short			n_fhsize;	/* size in bytes, of fh */
-	short			n_flag;		/* Flag for locking.. */
-	nfsfh_t			n_fh;		/* Small File Handle */
-	u_char			*n_name;	/* leaf name, for v4 OPEN op */
-	uint32_t		n_namelen;
-	int			n_directio_opens;
-	int                     n_directio_asyncwr;
-	struct ucred		*n_writecred;	/* Cred. for putpages */
-};
-
-#define n_atim		n_un1.nf_atim
-#define n_mtim		n_un2.nf_mtim
-#define n_sillyrename	n_un3.nf_silly
-#define n_cookieverf	n_un1.nd_cookieverf
-#define n4_cookieverf	n_un1.nd4_cookieverf
-#define n_direofoffset	n_un2.nd_direof
-#define n_cookies	n_un3.nd_cook
-
-/*
- * Flags for n_flag
- */
-#define NFSYNCWAIT      0x0002  /* fsync waiting for all directio async writes
-				  to drain */
-#define	NMODIFIED	0x0004	/* Might have a modified buffer in bio */
-#define	NWRITEERR	0x0008	/* Flag write errors so close will know */
-/* 0x20, 0x40, 0x80 free */
-#define	NACC		0x0100	/* Special file accessed */
-#define	NUPD		0x0200	/* Special file updated */
-#define	NCHG		0x0400	/* Special file times changed */
-#define	NCREATED	0x0800	/* Opened by nfs_create() */
-#define	NTRUNCATE	0x1000	/* Opened by nfs_setattr() */
-#define	NSIZECHANGED	0x2000  /* File size has changed: need cache inval */
-#define NNONCACHE	0x4000  /* Node marked as noncacheable */
-#define NDIRCOOKIELK	0x8000	/* Lock to serialize access to directory cookies */
-
-/*
- * Convert between nfsnode pointers and vnode pointers
- */
-#define VTONFS(vp)	((struct nfsnode *)(vp)->v_data)
-#define NFSTOV(np)	((struct vnode *)(np)->n_vnode)
-
-#define NFS_TIMESPEC_COMPARE(T1, T2)	(((T1)->tv_sec != (T2)->tv_sec) || ((T1)->tv_nsec != (T2)->tv_nsec))
-
-/*
- * NFS iod threads can be in one of these two states once spawned.
- * NFSIOD_NOT_AVAILABLE - Cannot be assigned an I/O operation at this time.
- * NFSIOD_AVAILABLE - Available to be assigned an I/O operation.
- */
-enum nfsiod_state {
-	NFSIOD_NOT_AVAILABLE = 0,
-	NFSIOD_AVAILABLE = 1,
-};
-
-/*
- * Queue head for nfsiod's
- */
-extern TAILQ_HEAD(nfs_bufq, buf) nfs_bufq;
-extern enum nfsiod_state nfs_iodwant[NFS_MAXASYNCDAEMON];
-extern struct nfsmount *nfs_iodmount[NFS_MAXASYNCDAEMON];
-
-#if defined(_KERNEL)
-
-extern	struct vop_vector	nfs_fifoops;
-extern	struct vop_vector	nfs_vnodeops;
-extern struct buf_ops buf_ops_nfs;
-
-/*
- * Prototypes for NFS vnode operations
- */
-int	nfs_getpages(struct vop_getpages_args *);
-int	nfs_putpages(struct vop_putpages_args *);
-int	nfs_write(struct vop_write_args *);
-int	nfs_inactive(struct vop_inactive_args *);
-int	nfs_reclaim(struct vop_reclaim_args *);
-
-/* other stuff */
-int	nfs_removeit(struct sillyrename *);
-int	nfs_nget(struct mount *, nfsfh_t *, int, struct nfsnode **, int flags);
-nfsuint64 *nfs_getcookie(struct nfsnode *, off_t, int);
-void	nfs_invaldir(struct vnode *);
-int	nfs_upgrade_vnlock(struct vnode *vp);
-void	nfs_downgrade_vnlock(struct vnode *vp, int old_lock);
-void	nfs_printf(const char *fmt, ...);
-
-void nfs_dircookie_lock(struct nfsnode *np);
-void nfs_dircookie_unlock(struct nfsnode *np);
-
-#endif /* _KERNEL */
-
-#endif
diff --git a/include.new/nfsclient/nfsstats.h b/include.new/nfsclient/nfsstats.h
deleted file mode 100644
index 1dbfc78..0000000
--- a/include.new/nfsclient/nfsstats.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: releng/10.2/sys/nfsclient/nfsstats.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NFSCLIENT_NFSSTATS_H_
-#define _NFSCLIENT_NFSSTATS_H_
-
-/*
- * Stats structure
- */
-struct nfsstats {
-	int	attrcache_hits;
-	int	attrcache_misses;
-	int	lookupcache_hits;
-	int	lookupcache_misses;
-	int	direofcache_hits;
-	int	direofcache_misses;
-	int	accesscache_hits;
-	int	accesscache_misses;
-	int	biocache_reads;
-	int	read_bios;
-	int	read_physios;
-	int	biocache_writes;
-	int	write_bios;
-	int	write_physios;
-	int	biocache_readlinks;
-	int	readlink_bios;
-	int	biocache_readdirs;
-	int	readdir_bios;
-	int	rpcretries;
-	int	rpcrequests;
-	int	rpctimeouts;
-	int	rpcunexpected;
-	int	rpcinvalid;
-	int	rpccnt[NFS_NPROCS];
-};
-
-#endif
diff --git a/include.new/nfsclient/nlminfo.h b/include.new/nfsclient/nlminfo.h
deleted file mode 100644
index 86dc1d0..0000000
--- a/include.new/nfsclient/nlminfo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 1998 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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.
- *
- *      from BSDI nlminfo.h,v 2.1 1998/03/18 01:30:38 don Exp
- * $FreeBSD: releng/10.2/sys/nfsclient/nlminfo.h 151695 2005-10-26 07:18:37Z glebius $
- */
-
-/*
- * Misc NLM informationi, some needed for the master lockd process, and some
- * needed by every process doing nlm based locking.
- */
-struct  nlminfo {
-	/* these are used by any process doing nlm locking */
-        int             msg_seq;        /* sequence counter for lock requests */
-        int             retcode;        /* return code for lock requests */
-	int		set_getlk_pid;
-	int		getlk_pid;
-        struct  timeval pid_start;      /* process starting time */
-};
diff --git a/include.new/nfsserver/nfs.h b/include.new/nfsserver/nfs.h
deleted file mode 100644
index accef32..0000000
--- a/include.new/nfsserver/nfs.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: releng/10.2/sys/nfsserver/nfs.h 241896 2012-10-22 17:50:54Z kib $
- */
-
-#ifndef _NFSSERVER_NFS_H_
-#define _NFSSERVER_NFS_H_
-
-#ifdef _KERNEL
-#include "opt_nfs.h"
-#endif
-
-#include <nfs/nfssvc.h>
-
-/*
- * Tunable constants for nfs
- */
-
-#define NFS_TICKINTVL	10		/* Desired time for a tick (msec) */
-#define NFS_HZ		(hz / nfs_ticks) /* Ticks/sec */
-#define	NFS_TIMEO	(1 * NFS_HZ)	/* Default timeout = 1 second */
-#define	NFS_MINTIMEO	(1 * NFS_HZ)	/* Min timeout to use */
-#define	NFS_MAXTIMEO	(60 * NFS_HZ)	/* Max timeout to backoff to */
-#define	NFS_MINIDEMTIMEO (5 * NFS_HZ)	/* Min timeout for non-idempotent ops*/
-#define	NFS_MAXUIDHASH	64		/* Max. # of hashed uid entries/mp */
-#ifndef NFS_GATHERDELAY
-#define NFS_GATHERDELAY		10	/* Default write gather delay (msec) */
-#endif
-#ifdef _KERNEL
-#define	DIRBLKSIZ	512		/* XXX we used to use ufs's DIRBLKSIZ */
-#endif
-
-/*
- * Oddballs
- */
-#define NFS_SRVMAXDATA(n) \
-		(((n)->nd_flag & ND_NFSV3) ? (((n)->nd_nam2) ? \
-		 NFS_MAXDGRAMDATA : NFS_MAXDATA) : NFS_V2MAXDATA)
-
-/*
- * XXX
- * The B_INVAFTERWRITE flag should be set to whatever is required by the
- * buffer cache code to say "Invalidate the block after it is written back".
- */
-#define	B_INVAFTERWRITE	B_NOCACHE
-
-/*
- * The IO_METASYNC flag should be implemented for local filesystems.
- * (Until then, it is nothin at all.)
- */
-#ifndef IO_METASYNC
-#define IO_METASYNC	0
-#endif
-
-/* NFS state flags XXX -Wunused */
-#define	NFSRV_SNDLOCK		0x01000000  /* Send socket lock */
-#define	NFSRV_WANTSND		0x02000000  /* Want above */
-
-/*
- * Structures for the nfssvc(2) syscall.  Not that anyone but nfsd and
- * mount_nfs should ever try and use it.
- */
-
-/*
- * Add a socket to monitor for NFS requests.
- */
-struct nfsd_addsock_args {
-	int	sock;		/* Socket to serve */
-	caddr_t	name;		/* Client addr for connection based sockets */
-	int	namelen;	/* Length of name */
-};
-
-/*
- * Start processing requests.
- */
-struct nfsd_nfsd_args {
-	const char *principal;	/* GSS-API service principal name */
-	int	minthreads;	/* minimum service thread count */
-	int	maxthreads;	/* maximum service thread count */
-};
-
-/*
- * XXX to allow amd to include nfs.h without nfsproto.h
- */
-#ifdef NFS_NPROCS
-#include <nfsserver/nfsrvstats.h>
-#endif
-
-/*
- * vfs.nfsrv sysctl(3) identifiers
- */
-#define NFS_NFSRVSTATS	1		/* struct: struct nfsrvstats */
-#define NFS_NFSPRIVPORT	2		/* int: prohibit nfs to resvports */
-
-#ifdef _KERNEL
-
-extern struct mtx nfsd_mtx;
-#define	NFSD_LOCK_ASSERT()	mtx_assert(&nfsd_mtx, MA_OWNED)
-#define	NFSD_UNLOCK_ASSERT()	mtx_assert(&nfsd_mtx, MA_NOTOWNED)
-#define	NFSD_LOCK_DONTCARE()
-#define	NFSD_LOCK()	mtx_lock(&nfsd_mtx)
-#define	NFSD_UNLOCK()	mtx_unlock(&nfsd_mtx)
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_NFSRVDESC);
-MALLOC_DECLARE(M_NFSD);
-#endif
-
-/* Forward declarations */
-struct nfssvc_sock;
-struct nfsrv_descript;
-struct uio;
-struct vattr;
-struct nameidata;
-
-extern struct callout nfsrv_callout;
-extern struct nfsrvstats nfsrvstats;
-
-extern int	nfsrv_ticks;
-extern int	nfsrvw_procrastinate;
-extern int	nfsrvw_procrastinate_v3;
-extern int 	nfsrv_numnfsd;
-
-/* Various values converted to XDR form. */
-extern uint32_t nfsrv_nfs_false, nfsrv_nfs_true, nfsrv_nfs_xdrneg1,
-	nfsrv_nfs_prog;
-extern uint32_t nfsrv_rpc_reply, nfsrv_rpc_msgdenied, nfsrv_rpc_mismatch,
-	nfsrv_rpc_vers;
-extern uint32_t nfsrv_rpc_auth_unix, nfsrv_rpc_msgaccepted, nfsrv_rpc_call,
-	nfsrv_rpc_autherr;
-
-/* Procedure table data */
-extern const int	nfsrvv2_procid[NFS_NPROCS];
-extern const int	nfsrv_nfsv3_procid[NFS_NPROCS];
-extern int32_t (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *nd,
-		    struct nfssvc_sock *slp, struct mbuf **mreqp);
-
-/*
- * A list of nfssvc_sock structures is maintained with all the sockets
- * that require service by the nfsd.
- */
-#ifndef NFS_WDELAYHASHSIZ
-#define	NFS_WDELAYHASHSIZ 16	/* and with this */
-#endif
-#define	NWDELAYHASH(sock, f) \
-	(&(sock)->ns_wdelayhashtbl[(*((uint32_t *)(f))) % NFS_WDELAYHASHSIZ])
-
-/*
- * This structure is used by the server for describing each request.
- */
-struct nfsrv_descript {
-	struct mbuf		*nd_mrep;	/* Request mbuf list */
-	struct mbuf		*nd_md;		/* Current dissect mbuf */
-	struct mbuf		*nd_mreq;	/* Reply mbuf list */
-	struct sockaddr		*nd_nam;	/* and socket addr */
-	struct sockaddr		*nd_nam2;	/* return socket addr */
-	caddr_t			nd_dpos;	/* Current dissect pos */
-	uint32_t		nd_procnum;	/* RPC # */
-	int			nd_stable;	/* storage type */
-	int			nd_flag;	/* nd_flag */
-	int			nd_repstat;	/* Reply status */
-	fhandle_t		nd_fh;		/* File handle */
-	struct ucred		*nd_cr;		/* Credentials */
-	int			nd_credflavor;	/* Security flavor */
-};
-
-/* Bits for "nd_flag" */
-#define ND_NFSV3	0x08
-
-/*
- * Defines for WebNFS
- */
-
-#define WEBNFS_ESC_CHAR		'%'
-#define WEBNFS_SPECCHAR_START	0x80
-
-#define WEBNFS_NATIVE_CHAR	0x80
-/*
- * ..
- * Possibly more here in the future.
- */
-
-/*
- * Macro for converting escape characters in WebNFS pathnames.
- * Should really be in libkern.
- */
-
-#define HEXTOC(c) \
-	((c) >= 'a' ? ((c) - ('a' - 10)) : \
-	    ((c) >= 'A' ? ((c) - ('A' - 10)) : ((c) - '0')))
-#define HEXSTRTOI(p) \
-	((HEXTOC(p[0]) << 4) + HEXTOC(p[1]))
-
-#ifdef NFS_DEBUG
-
-extern int nfs_debug;
-#define NFS_DEBUG_ASYNCIO	1 /* asynchronous i/o */
-#define NFS_DEBUG_WG		2 /* server write gathering */
-#define NFS_DEBUG_RC		4 /* server request caching */
-
-#define NFS_DPF(cat, args)					\
-	do {							\
-		if (nfs_debug & NFS_DEBUG_##cat) printf args;	\
-	} while (0)
-
-#else
-
-#define NFS_DPF(cat, args)
-
-#endif
-
-/*
- * The following flags can be passed to nfsrv_fhtovp() function.
- */
-/* Leave file system busy on success. */
-#define	NFSRV_FLAG_BUSY		0x01
-
-struct mbuf *nfs_rephead(int, struct nfsrv_descript *, int, struct mbuf **,
-	    caddr_t *);
-void	nfsm_srvfattr(struct nfsrv_descript *, struct vattr *,
-	    struct nfs_fattr *);
-void	nfsm_srvwcc(struct nfsrv_descript *, int, struct vattr *, int,
-	    struct vattr *, struct mbuf **, char **);
-void	nfsm_srvpostopattr(struct nfsrv_descript *, int, struct vattr *,
-	    struct mbuf **, char **);
-int	nfs_namei(struct nameidata *, struct nfsrv_descript *, fhandle_t *,
-	    int, struct nfssvc_sock *, struct sockaddr *, struct mbuf **,
-	    caddr_t *, struct vnode **, int, struct vattr *, int *, int);
-void	nfsm_adj(struct mbuf *, int, int);
-int	nfsm_mbuftouio(struct mbuf **, struct uio *, int, caddr_t *);
-void	nfsrv_init(int);
-int	nfsrv_errmap(struct nfsrv_descript *, int);
-void	nfsrvw_sort(gid_t *, int);
-
-int	nfsrv3_access(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_commit(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_create(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_fhtovp(fhandle_t *, int, struct vnode **,
-	    struct nfsrv_descript *, struct nfssvc_sock *, struct sockaddr *,
-	    int *);
-int	nfsrv_setpublicfs(struct mount *, struct netexport *,
-	    struct export_args *);
-int	nfs_ispublicfh(fhandle_t *);
-int	nfsrv_fsinfo(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_getattr(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_link(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_lookup(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_mkdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_mknod(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_noop(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_null(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_pathconf(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_read(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_readdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_readdirplus(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_readlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_remove(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_rename(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_rmdir(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_setattr(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_statfs(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_symlink(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-int	nfsrv_write(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp,
-	    struct mbuf **mrq);
-/*
- * #ifdef _SYS_SYSPROTO_H_ so that it is only defined when sysproto.h
- * has been included, so that "struct nfssvc_args" is defined.
- */
-#ifdef _SYS_SYSPROTO_H_
-int nfssvc_nfsserver(struct thread *, struct nfssvc_args *);
-#endif
-#endif	/* _KERNEL */
-
-#endif
diff --git a/include.new/nfsserver/nfs_fha_old.h b/include.new/nfsserver/nfs_fha_old.h
deleted file mode 100644
index cbeb23e..0000000
--- a/include.new/nfsserver/nfs_fha_old.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
- * Copyright (c) 2013 Spectra Logic Corporation
- *
- * 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.
- *
- * 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: releng/10.2/sys/nfsserver/nfs_fha_old.h 249592 2013-04-17 21:00:22Z ken $ */
-
-#ifndef	_NFS_FHA_OLD_H
-#define	_NFS_FHA_OLD_H 1
-
-#ifdef	_KERNEL
-
-#define	FHAOLD_SERVER_NAME	"nfsrv"
-
-SVCTHREAD *fhaold_assign(SVCTHREAD *this_thread, struct svc_req *req);
-#endif /* _KERNEL */
-
-#endif /* _NFS_FHA_OLD_H */
diff --git a/include.new/nfsserver/nfsm_subs.h b/include.new/nfsserver/nfsm_subs.h
deleted file mode 100644
index 44af494..0000000
--- a/include.new/nfsserver/nfsm_subs.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfsm_subs.h	8.2 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/nfsserver/nfsm_subs.h 184588 2008-11-03 10:38:00Z dfr $
- */
-
-#ifndef _NFSSERVER_NFSM_SUBS_H_
-#define _NFSSERVER_NFSM_SUBS_H_
-
-#include <nfs/nfs_common.h>
-
-#define	nfstov_mode(a)	(fxdr_unsigned(uint32_t, (a)) & ALLPERMS)
-
-/*
- * These macros do strange and peculiar things to mbuf chains for
- * the assistance of the nfs code. To attempt to use them for any
- * other purpose will be dangerous. (they make weird assumptions)
- */
-
-/*
- * First define what the actual subs. return
- */
-
-#define	M_HASCL(m)	((m)->m_flags & M_EXT)
-#define	NFSMSIZ(m)	((M_HASCL(m))?MCLBYTES: \
-				(((m)->m_flags & M_PKTHDR)?MHLEN:MLEN))
-
-/*
- * Now for the macros that do the simple stuff and call the functions
- * for the hard stuff.
- * These macros use several vars. declared in nfsm_reqhead and these
- * vars. must not be used elsewhere unless you are careful not to corrupt
- * them. The vars. starting with pN and tN (N=1,2,3,..) are temporaries
- * that may be used so long as the value is not expected to retained
- * after a macro.
- * I know, this is kind of dorkey, but it makes the actual op functions
- * fairly clean and deals with the mess caused by the xdr discriminating
- * unions.
- */
-
-
-
-/* ************************************* */
-/* Dissection phase macros */
-
-int	nfsm_srvstrsiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
-int	nfsm_srvnamesiz_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
-int	nfsm_srvnamesiz0_xx(int *s, int m, struct mbuf **md, caddr_t *dpos);
-int	nfsm_srvmtofh_xx(fhandle_t *f, int v3, struct mbuf **md, caddr_t *dpos);
-int	nfsm_srvsattr_xx(struct vattr *a, struct mbuf **md, caddr_t *dpos);
-
-#define	nfsm_srvstrsiz(s, m) \
-do { \
-	int t1; \
-	t1 = nfsm_srvstrsiz_xx(&(s), (m), &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		nfsm_reply(0); \
-	} \
-} while (0)
-
-#define	nfsm_srvnamesiz(s) \
-do { \
-	int t1; \
-	t1 = nfsm_srvnamesiz_xx(&(s), NFS_MAXNAMLEN, &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		nfsm_reply(0); \
-	} \
-} while (0)
-
-#define	nfsm_srvpathsiz(s) \
-do { \
-	int t1; \
-	t1 = nfsm_srvnamesiz0_xx(&(s), NFS_MAXPATHLEN, &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		nfsm_reply(0); \
-	} \
-} while (0)
-
-#define nfsm_srvmtofh(f) \
-do { \
-	int t1; \
-	t1 = nfsm_srvmtofh_xx((f), nfsd->nd_flag & ND_NFSV3, &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		nfsm_reply(0); \
-	} \
-} while (0)
-
-/* XXX why is this different? */
-#define nfsm_srvsattr(a) \
-do { \
-	int t1; \
-	t1 = nfsm_srvsattr_xx((a), &md, &dpos); \
-	if (t1) { \
-		error = t1; \
-		m_freem(mrep); \
-		mrep = NULL; \
-		goto nfsmout; \
-	} \
-} while (0)
-
-/* ************************************* */
-/* Prepare the reply */
-
-#define	nfsm_reply(s) \
-do { \
-	if (mrep != NULL) { \
-		m_freem(mrep); \
-		mrep = NULL; \
-	} \
-	mreq = nfs_rephead((s), nfsd, error, &mb, &bpos); \
-	*mrq = mreq; \
-	if (error == EBADRPC) { \
-		error = 0; \
-		goto nfsmout; \
-	} \
-} while (0)
-
-#define	nfsm_writereply(s) \
-do { \
-	mreq = nfs_rephead((s), nfsd, error, &mb, &bpos); \
-} while(0)
-
-/* ************************************* */
-/* Reply phase macros - add additional reply info */
-
-void	nfsm_srvfhtom_xx(fhandle_t *f, int v3, struct mbuf **mb,
-	    caddr_t *bpos);
-void	nfsm_srvpostop_fh_xx(fhandle_t *f, struct mbuf **mb, caddr_t *bpos);
-void	nfsm_clget_xx(uint32_t **tl, struct mbuf *mb, struct mbuf **mp,
-	    char **bp, char **be, caddr_t bpos);
-
-#define nfsm_srvfhtom(f, v3) \
-	nfsm_srvfhtom_xx((f), (v3), &mb, &bpos)
-
-#define nfsm_srvpostop_fh(f) \
-	nfsm_srvpostop_fh_xx((f), &mb, &bpos)
-
-#define nfsm_srvwcc_data(br, b, ar, a) \
-	nfsm_srvwcc(nfsd, (br), (b), (ar), (a), &mb, &bpos)
-
-#define nfsm_srvpostop_attr(r, a) \
-	nfsm_srvpostopattr(nfsd, (r), (a), &mb, &bpos)
-
-#define	nfsm_srvfillattr(a, f) \
-	nfsm_srvfattr(nfsd, (a), (f))
-
-#define nfsm_clget \
-	nfsm_clget_xx(&tl, mb, &mp, &bp, &be, bpos)
-
-#endif
diff --git a/include.new/nfsserver/nfsrvcache.h b/include.new/nfsserver/nfsrvcache.h
deleted file mode 100644
index d8064de..0000000
--- a/include.new/nfsserver/nfsrvcache.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfsrvcache.h	8.3 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/nfsserver/nfsrvcache.h 195202 2009-06-30 19:03:27Z dfr $
- */
-
-#ifndef _NFSSERVER_NFSRVCACHE_H_
-#define _NFSSERVER_NFSRVCACHE_H_
-
-#include <sys/queue.h>
-
-/*
- * Definitions for the server recent request cache
- */
-#define NFSRVCACHE_MAX_SIZE	2048
-#define NFSRVCACHE_MIN_SIZE	  64
-
-#endif
diff --git a/include.new/nfsserver/nfsrvstats.h b/include.new/nfsserver/nfsrvstats.h
deleted file mode 100644
index 8265da5..0000000
--- a/include.new/nfsserver/nfsrvstats.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993, 1995
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- *
- *	@(#)nfs.h	8.4 (Berkeley) 5/1/95
- * $FreeBSD: releng/10.2/sys/nfsserver/nfsrvstats.h 139823 2005-01-07 01:45:51Z imp $
- */
-
-#ifndef _NFSSERVER_NFSRVSTATS_H_
-#define _NFSSERVER_NFSRVSTATS_H_
-
-/*
- * Server stats structure
- */
-struct nfsrvstats {
-	int	srvrpc_errs;
-	int	srv_errs;
-	int	srvcache_inproghits;
-	int	srvcache_idemdonehits;
-	int	srvcache_nonidemdonehits;
-	int	srvcache_misses;
-	int	srvvop_writes;
-	int	srvrpccnt[NFS_NPROCS];
-};
-
-#endif
diff --git a/include.new/nl_types.h b/include.new/nl_types.h
deleted file mode 100644
index c505961..0000000
--- a/include.new/nl_types.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: nl_types.h,v 1.9 2000/10/03 19:53:32 sommerfeld Exp $	*/
-
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/include/nl_types.h 203963 2010-02-16 19:28:10Z imp $
- */
-
-#ifndef _NL_TYPES_H_
-#define _NL_TYPES_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#ifdef _NLS_PRIVATE
-/*
- * MESSAGE CATALOG FILE FORMAT.
- *
- * The NetBSD/FreeBSD message catalog format is similar to the format used by
- * Svr4 systems.  The differences are:
- *   * fixed byte order (big endian)
- *   * fixed data field sizes
- *
- * A message catalog contains four data types: a catalog header, one
- * or more set headers, one or more message headers, and one or more
- * text strings.
- */
-
-#define _NLS_MAGIC	0xff88ff89
-
-struct _nls_cat_hdr {
-	int32_t __magic;
-	int32_t __nsets;
-	int32_t __mem;
-	int32_t __msg_hdr_offset;
-	int32_t __msg_txt_offset;
-} ;
-
-struct _nls_set_hdr {
-	int32_t __setno;	/* set number: 0 < x <= NL_SETMAX */
-	int32_t __nmsgs;	/* number of messages in the set  */
-	int32_t __index;	/* index of first msg_hdr in msg_hdr table */
-} ;
-
-struct _nls_msg_hdr {
-	int32_t __msgno;	/* msg number: 0 < x <= NL_MSGMAX */
-	int32_t __msglen;
-	int32_t __offset;
-} ;
-
-#endif	/* _NLS_PRIVATE */
-
-#define	NL_SETD		0
-#define	NL_CAT_LOCALE	1
-
-typedef struct __nl_cat_d {
-	void	*__data;
-	int	__size;
-} *nl_catd;
-
-#ifndef _NL_ITEM_DECLARED
-typedef	__nl_item	nl_item;
-#define	_NL_ITEM_DECLARED
-#endif
-
-__BEGIN_DECLS
-nl_catd  catopen(const char *, int);
-char    *catgets(nl_catd, int, int, const char *) __format_arg(4);
-int	 catclose(nl_catd);
-__END_DECLS
-
-#endif	/* _NL_TYPES_H_ */
diff --git a/include.new/nlist.h b/include.new/nlist.h
deleted file mode 100644
index b57da3d..0000000
--- a/include.new/nlist.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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. 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.
- *
- *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
- *
- * $FreeBSD: releng/10.2/include/nlist.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _NLIST_H_
-#define	_NLIST_H_
-
-#include <sys/nlist_aout.h>
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int nlist(const char *, struct nlist *);
-__END_DECLS
-
-#endif /* !_NLIST_H_ */
diff --git a/include.new/nss.h b/include.new/nss.h
deleted file mode 100644
index 7d8e957..0000000
--- a/include.new/nss.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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: releng/10.2/include/nss.h 124289 2004-01-09 13:43:49Z nectar $
- *
- * Compatibility header for the GNU C Library-style nsswitch interface.
- */
-#ifndef _NSS_H_
-#define _NSS_H_
-
-#include <nsswitch.h>
-
-enum nss_status {
-	NSS_STATUS_TRYAGAIN = -2,
-	NSS_STATUS_UNAVAIL,
-	NSS_STATUS_NOTFOUND,
-	NSS_STATUS_SUCCESS,
-	NSS_STATUS_RETURN
-};
-
-#define __nss_compat_result(rv, err)		\
-((rv == NSS_STATUS_TRYAGAIN && err == ERANGE) ? NS_RETURN : \
- (rv == NSS_STATUS_TRYAGAIN) ? NS_TRYAGAIN :	\
- (rv == NSS_STATUS_UNAVAIL)  ? NS_UNAVAIL  :	\
- (rv == NSS_STATUS_NOTFOUND) ? NS_NOTFOUND :	\
- (rv == NSS_STATUS_SUCCESS)  ? NS_SUCCESS  :	\
- (rv == NSS_STATUS_RETURN)   ? NS_RETURN   : 0)
-
-#endif
diff --git a/include.new/nsswitch.h b/include.new/nsswitch.h
deleted file mode 100644
index e7c5488..0000000
--- a/include.new/nsswitch.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/*	$NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $	*/
-/*	$FreeBSD: releng/10.2/include/nsswitch.h 206155 2010-04-04 08:31:03Z ume $ */
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifndef _NSSWITCH_H
-#define _NSSWITCH_H	1
-
-#include <sys/types.h>
-#include <stdarg.h>
-
-#define NSS_MODULE_INTERFACE_VERSION 1
-
-#ifndef _PATH_NS_CONF
-#define _PATH_NS_CONF	"/etc/nsswitch.conf"
-#endif
-
-/* NSS source actions */
-#define	NS_ACTION_CONTINUE	0	/* try the next source */
-#define	NS_ACTION_RETURN	1	/* look no further */
-
-#define	NS_SUCCESS	(1<<0)		/* entry was found */
-#define	NS_UNAVAIL	(1<<1)		/* source not responding, or corrupt */
-#define	NS_NOTFOUND	(1<<2)		/* source responded 'no such entry' */
-#define	NS_TRYAGAIN	(1<<3)		/* source busy, may respond to retry */
-#define NS_RETURN	(1<<4)		/* stop search, e.g. for ERANGE */
-#define NS_TERMINATE	(NS_SUCCESS|NS_RETURN) /* flags that end search */
-#define	NS_STATUSMASK	0x000000ff	/* bitmask to get the status flags */
-
-/*
- * currently implemented sources
- */
-#define NSSRC_FILES	"files"		/* local files */
-#define	NSSRC_DB	"db"		/* database */
-#define	NSSRC_DNS	"dns"		/* DNS; IN for hosts, HS for others */
-#define	NSSRC_NIS	"nis"		/* YP/NIS */
-#define	NSSRC_COMPAT	"compat"	/* passwd,group in YP compat mode */
-#define	NSSRC_CACHE	"cache"		/* nscd daemon */
-#define NSSRC_FALLBACK	"__fallback"	/* internal fallback source */
-
-/*
- * currently implemented databases
- */
-#define NSDB_HOSTS		"hosts"
-#define NSDB_GROUP		"group"
-#define NSDB_GROUP_COMPAT	"group_compat"
-#define NSDB_NETGROUP		"netgroup"
-#define NSDB_NETWORKS		"networks"
-#define NSDB_PASSWD		"passwd"
-#define NSDB_PASSWD_COMPAT	"passwd_compat"
-#define NSDB_SHELLS		"shells"
-#define NSDB_SERVICES		"services"
-#define NSDB_SERVICES_COMPAT	"services_compat"
-#define NSDB_SSH_HOSTKEYS	"ssh_hostkeys"
-#define NSDB_PROTOCOLS		"protocols"
-#define NSDB_RPC		"rpc"
-
-/*
- * suggested databases to implement
- */
-#define NSDB_ALIASES		"aliases"
-#define NSDB_AUTH		"auth"
-#define NSDB_AUTOMOUNT		"automount"
-#define NSDB_BOOTPARAMS		"bootparams"
-#define NSDB_ETHERS		"ethers"
-#define NSDB_EXPORTS		"exports"
-#define NSDB_NETMASKS		"netmasks"
-#define NSDB_PHONES		"phones"
-#define NSDB_PRINTCAP		"printcap"
-#define NSDB_REMOTE		"remote"
-#define NSDB_SENDMAILVARS	"sendmailvars"
-#define NSDB_TERMCAP		"termcap"
-#define NSDB_TTYS		"ttys"
-
-/*
- * ns_dtab `method' function signature.
- */ 
-typedef int (*nss_method)(void *_retval, void *_mdata, va_list _ap);
-
-/*
- * Macro for generating method prototypes.
- */
-#define NSS_METHOD_PROTOTYPE(method) \
-	int method(void *, void *, va_list)
-
-/*
- * ns_dtab - `nsswitch dispatch table'
- * Contains an entry for each source and the appropriate function to
- * call.  ns_dtabs are used in the nsdispatch() API in order to allow
- * the application to override built-in actions.
- */
-typedef struct _ns_dtab {
-	const char	 *src;		/* Source this entry implements */
-	nss_method	  method;	/* Method to be called */
-	void		 *mdata;	/* Data passed to method */
-} ns_dtab;
-
-/*
- * macros to help build an ns_dtab[]
- */
-#define NS_FILES_CB(F,C)	{ NSSRC_FILES,	F,	C },
-#define NS_COMPAT_CB(F,C)	{ NSSRC_COMPAT,	F,	C },
-#define NS_FALLBACK_CB(F)	{ NSSRC_FALLBACK, F,	NULL },
- 
-#ifdef HESIOD
-#   define NS_DNS_CB(F,C)	{ NSSRC_DNS,	F,	C },
-#else
-#   define NS_DNS_CB(F,C)
-#endif
-
-#ifdef YP
-#   define NS_NIS_CB(F,C)	{ NSSRC_NIS,	F,	C },
-#else
-#   define NS_NIS_CB(F,C)
-#endif
-
-/*
- * ns_src - `nsswitch source'
- * used by the nsparser routines to store a mapping between a source
- * and its dispatch control flags for a given database.
- */
-typedef struct _ns_src {
-	const char	*name;
-	uint32_t	 flags;
-} ns_src;
-
-
-/*
- * default sourcelist (if nsswitch.conf is missing, corrupt,
- * or the requested database doesn't have an entry.
- */
-extern const ns_src __nsdefaultsrc[];
-
-/*
- * ns_mtab - NSS method table
- * An NSS module provides a mapping from (database name, method name)
- * tuples to the nss_method and associated data.
- */
-typedef struct _ns_mtab {
-	const char	*database;
-	const char	*name;
-	nss_method	 method;
-	void		*mdata;
-} ns_mtab;
-
-/*
- * NSS module de-registration, called at module unload.
- */
-typedef void	 (*nss_module_unregister_fn)(ns_mtab *, unsigned int);
-
-/*
- * NSS module registration, called at module load.
- */
-typedef ns_mtab *(*nss_module_register_fn)(const char *, unsigned int *,
-		       nss_module_unregister_fn *);
-
-/* 
- * Many NSS interfaces follow the getXXnam, getXXid, getXXent pattern.
- * Developers are encouraged to use nss_lookup_type where approriate.
- */
-enum nss_lookup_type {
-	nss_lt_name = 1,
-	nss_lt_id   = 2,
-	nss_lt_all  = 3
-};
-
-#ifdef _NS_PRIVATE
-/*
- * private data structures for back-end nsswitch implementation
- */
-
-/*
- * ns_dbt - `nsswitch database thang'
- * for each database in /etc/nsswitch.conf there is a ns_dbt, with its
- * name and a list of ns_src's containing the source information.
- */
-typedef struct _ns_dbt {
-	const char	*name;		/* name of database */
-	ns_src		*srclist;	/* list of sources */
-	int		 srclistsize;	/* size of srclist */
-} ns_dbt;
-
-/*
- * ns_mod - NSS module
- */
-typedef struct _ns_mod {
-	char		*name;		/* module name */
-	void		*handle;	/* handle from dlopen */
-	ns_mtab		*mtab;		/* method table */
-	unsigned int	 mtabsize;	/* count of entries in method table */
-	nss_module_unregister_fn unregister; /* called to unload module */
-} ns_mod;
-
-#endif /* _NS_PRIVATE */
-
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern	int	nsdispatch(void *, const ns_dtab [], const char *,
-			   const char *, const ns_src [], ...);
-
-#ifdef _NS_PRIVATE
-extern	void		 _nsdbtaddsrc(ns_dbt *, const ns_src *);
-extern	void		 _nsdbtput(const ns_dbt *);
-extern	void		 _nsyyerror(const char *);
-extern	int		 _nsyylex(void);
-extern	int		 _nsyyparse(void);
-extern	int		 _nsyylineno;
-#ifdef _NSS_DEBUG
-extern	void		 _nsdbtdump(const ns_dbt *);
-#endif
-#endif /* _NS_PRIVATE */
-
-__END_DECLS
-
-#endif /* !_NSSWITCH_H */
diff --git a/include.new/ntlm_err.h b/include.new/ntlm_err.h
deleted file mode 100644
index ddef6ac..0000000
--- a/include.new/ntlm_err.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libheimntlm/../../../crypto/heimdal/lib/ntlm/ntlm_err.et */
-
-#ifndef __ntlm_err_h__
-#define __ntlm_err_h__
-
-struct et_list;
-
-void initialize_ntlm_error_table_r(struct et_list **);
-
-void initialize_ntlm_error_table(void);
-#define init_ntlm_err_tbl initialize_ntlm_error_table
-
-typedef enum ntlm_error_number{
-	HNTLM_ERR_DECODE = -1561745664,
-	HNTLM_ERR_INVALID_LENGTH = -1561745663,
-	HNTLM_ERR_CRYPTO = -1561745662,
-	HNTLM_ERR_RAND = -1561745661,
-	HNTLM_ERR_AUTH = -1561745660,
-	HNTLM_ERR_TIME_SKEW = -1561745659,
-	HNTLM_ERR_OEM = -1561745658,
-	HNTLM_ERR_MISSING_NAME_SEPARATOR = -1561745657,
-	HNTLM_ERR_MISSING_BUFFER = -1561745656,
-	HNTLM_ERR_INVALID_APOP = -1561745655,
-	HNTLM_ERR_INVALID_CRAM_MD5 = -1561745654,
-	HNTLM_ERR_INVALID_DIGEST_MD5 = -1561745653,
-	HNTLM_ERR_INVALID_DIGEST_MD5_RSPAUTH = -1561745652
-} ntlm_error_number;
-
-#define ERROR_TABLE_BASE_ntlm -1561745664
-
-#define COM_ERR_BINDDOMAIN_ntlm "heim_com_err-1561745664"
-
-#endif /* __ntlm_err_h__ */
diff --git a/include.new/objc/NXConstStr.h b/include.new/objc/NXConstStr.h
deleted file mode 100644
index f87c05e..0000000
--- a/include.new/objc/NXConstStr.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Interface for the NXConstantString class for Objective-C.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Contributed by Pieter J. Schoenmakers <tiggr@es.ele.tue.nl>
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
- 
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef __nxconstantstring_INCLUDE_GNU
-#define __nxconstantstring_INCLUDE_GNU
-
-#include "objc/Object.h"
-
-@interface NXConstantString: Object
-{
-  char *c_string;
-  unsigned int len;
-}
-
--(const char *) cString;
--(unsigned int) length;
-
-@end
-
-#endif
diff --git a/include.new/objc/Object.h b/include.new/objc/Object.h
deleted file mode 100644
index ea3e7d7..0000000
--- a/include.new/objc/Object.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Interface for the Object class for Objective-C.
-   Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files compiled
-   with GCC to produce an executable, this does not cause the resulting
-   executable to be covered by the GNU General Public License.  This
-   exception does not however invalidate any other reasons why the
-   executable file might be covered by the GNU General Public License. */
-
-#ifndef __object_INCLUDE_GNU
-#define __object_INCLUDE_GNU
-
-#include <objc/objc.h>
-#include <objc/typedstream.h>
-
-/*
- * All classes are derived from Object.  As such,
- * this is the overhead tacked onto those objects.
- */
-@interface Object
-{
-    Class	isa;	/* A pointer to the instance's class structure */
-}
-
-        /* Initializing classes and instances */
-+ initialize;
-- init;
-
-        /* Creating, freeing, and copying instances */
-+ new;
-+ alloc;
-- free;
-- copy;
-- shallowCopy;
-- deepen;
-- deepCopy;
-
-        /* Identifying classes */
-- (Class)class;
-- (Class)superClass;
-- (MetaClass)metaClass;
-- (const char *)name;
-
-        /* Identifying and comparing objects */
-- self;
-- (unsigned int)hash;
-- (BOOL)isEqual:anObject;
-- (int)compare:anotherObject;
-
-        /* Testing object type */
-- (BOOL)isMetaClass;
-- (BOOL)isClass;
-- (BOOL)isInstance;
-
-        /* Testing inheritance relationships */
-- (BOOL)isKindOf:(Class)aClassObject;
-- (BOOL)isMemberOf:(Class)aClassObject;
-- (BOOL)isKindOfClassNamed:(const char *)aClassName;
-- (BOOL)isMemberOfClassNamed:(const char *)aClassName;
-
-        /* Testing class functionality */
-+ (BOOL)instancesRespondTo:(SEL)aSel;
-- (BOOL)respondsTo:(SEL)aSel;
-
-	/* Testing protocol conformance */
-- (BOOL)conformsTo:(Protocol*)aProtocol;
-
-        /* Introspection */
-+ (IMP)instanceMethodFor:(SEL)aSel;
-- (IMP)methodFor:(SEL)aSel;
-+ (struct objc_method_description *)descriptionForInstanceMethod:(SEL)aSel;
-- (struct objc_method_description *)descriptionForMethod:(SEL)aSel;
-
-        /* Sending messages determined at run time */
-- perform:(SEL)aSel;
-- perform:(SEL)aSel with:anObject;
-- perform:(SEL)aSel with:anObject1 with:anObject2;
-
-        /* Forwarding */
-- (retval_t)forward:(SEL)aSel :(arglist_t)argFrame;
-- (retval_t)performv:(SEL)aSel :(arglist_t)argFrame;
-
-        /* Posing */
-+ poseAs:(Class)aClassObject;
-- (Class)transmuteClassTo:(Class)aClassObject;
-
-        /* Enforcing intentions */
-- subclassResponsibility:(SEL)aSel;
-- notImplemented:(SEL)aSel;
-- shouldNotImplement:(SEL)aSel;
-
-        /* Error handling */
-- doesNotRecognize:(SEL)aSel;
-- error:(const char *)aString, ...;
-
-        /* Archiving */
-+ (int)version;
-+ setVersion:(int)aVersion;
-+ (int)streamVersion: (TypedStream*)aStream;
-
-- read: (TypedStream*)aStream;
-- write: (TypedStream*)aStream;
-- awake;
-
-@end
-
-#endif
diff --git a/include.new/objc/Protocol.h b/include.new/objc/Protocol.h
deleted file mode 100644
index b39edf8..0000000
--- a/include.new/objc/Protocol.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Declare the class Protocol for Objective C programs.
-   Copyright (C) 1993 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef __Protocol_INCLUDE_GNU
-#define __Protocol_INCLUDE_GNU
-
-#include "objc/Object.h"
-
-@interface Protocol : Object
-{
-@private
-        char *protocol_name;
-        struct objc_protocol_list *protocol_list;
-        struct objc_method_description_list *instance_methods, *class_methods; 
-}
-
-/* Obtaining attributes intrinsic to the protocol */
-
-- (const char *)name;
-
-/* Testing protocol conformance */
-
-- (BOOL) conformsTo: (Protocol *)aProtocolObject;
-
-/* Looking up information specific to a protocol */
-
-- (struct objc_method_description *) descriptionForInstanceMethod:(SEL)aSel;
-- (struct objc_method_description *) descriptionForClassMethod:(SEL)aSel;
-
-@end
-
-
-
-
-#endif /* not __Protocol_INCLUDE_GNU */
diff --git a/include.new/objc/encoding.h b/include.new/objc/encoding.h
deleted file mode 100644
index 684d70d..0000000
--- a/include.new/objc/encoding.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* Encoding of types for Objective C.
-   Copyright (C) 1993, 1997, 2002 Free Software Foundation, Inc.
-
-Author: Kresten Krab Thorup
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef __encoding_INCLUDE_GNU
-#define __encoding_INCLUDE_GNU
-
-#include <ctype.h>
-#include "objc/objc-api.h"
-
-#define _C_CONST	'r'
-#define _C_IN		'n'
-#define _C_INOUT	'N'
-#define _C_OUT      	'o'
-#define _C_BYCOPY	'O'
-#define _C_BYREF	'R'
-#define _C_ONEWAY	'V'
-#define _C_GCINVISIBLE	'!'
-
-#define _F_CONST	0x01
-#define _F_IN		0x01
-#define _F_OUT		0x02
-#define _F_INOUT	0x03
-#define _F_BYCOPY	0x04
-#define _F_BYREF	0x08
-#define _F_ONEWAY	0x10
-#define _F_GCINVISIBLE	0x20
-
-int objc_aligned_size (const char *type);
-int objc_sizeof_type (const char *type);
-int objc_alignof_type (const char *type);
-int objc_aligned_size (const char *type);
-int objc_promoted_size (const char *type);
-
-const char *objc_skip_type_qualifiers (const char *type);
-const char *objc_skip_typespec (const char *type);
-const char *objc_skip_offset (const char *type);
-const char *objc_skip_argspec (const char *type);
-int method_get_number_of_arguments (struct objc_method *);
-int method_get_sizeof_arguments (struct objc_method *);
-
-char *method_get_first_argument (struct objc_method *,
-				 arglist_t argframe, 
-				 const char **type);
-char *method_get_next_argument (arglist_t argframe, 
-				const char **type);
-char *method_get_nth_argument (struct objc_method *m, 
-			       arglist_t argframe,
-			       int arg, 
-			       const char **type);
-
-unsigned objc_get_type_qualifiers (const char *type);
-
-
-struct objc_struct_layout 
-{
-  const char *original_type;
-  const char *type;
-  const char *prev_type;
-  unsigned int record_size;
-  unsigned int record_align;
-};
-
-void objc_layout_structure (const char *type,
-                            struct objc_struct_layout *layout);
-BOOL  objc_layout_structure_next_member (struct objc_struct_layout *layout);
-void objc_layout_finish_structure (struct objc_struct_layout *layout,
-                                   unsigned int *size,
-                                   unsigned int *align);
-void objc_layout_structure_get_info (struct objc_struct_layout *layout,
-                                     unsigned int *offset,
-                                     unsigned int *align,
-                                     const char **type);
-
-#endif /* __encoding_INCLUDE_GNU */
diff --git a/include.new/objc/hash.h b/include.new/objc/hash.h
deleted file mode 100644
index 02aca6e..0000000
--- a/include.new/objc/hash.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* Hash tables for Objective C method dispatch.
-   Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-
-#ifndef __hash_INCLUDE_GNU
-#define __hash_INCLUDE_GNU
-
-#include <stddef.h>
-#include <string.h>
-#include <objc/objc.h>
-
-/*
- * This data structure is used to hold items
- *  stored in a hash table.  Each node holds 
- *  a key/value pair.
- *
- * Items in the cache are really of type void *.
- */
-typedef struct cache_node
-{
-  struct cache_node *next;	/* Pointer to next entry on the list.
-				   NULL indicates end of list. */
-  const void *key;		/* Key used to locate the value.  Used
-				   to locate value when more than one
-				   key computes the same hash
-				   value. */
-  void *value;			/* Value stored for the key. */
-} *node_ptr;
-
-
-/*
- * This data type is the function that computes a hash code given a key.
- * Therefore, the key can be a pointer to anything and the function specific
- * to the key type. 
- *
- * Unfortunately there is a mutual data structure reference problem with this
- * typedef.  Therefore, to remove compiler warnings the functions passed to
- * hash_new will have to be casted to this type. 
- */
-typedef unsigned int (*hash_func_type) (void *, const void *);
-
-/*
- * This data type is the function that compares two hash keys and returns an
- * integer greater than, equal to, or less than 0, according as the first
- * parameter is lexicographically greater than, equal to, or less than the
- * second. 
- */
-
-typedef int (*compare_func_type) (const void *, const void *);
-
-
-/*
- * This data structure is the cache.
- *
- * It must be passed to all of the hashing routines
- *   (except for new).
- */
-typedef struct cache
-{
-  /* Variables used to implement the hash itself.  */
-  node_ptr *node_table; /* Pointer to an array of hash nodes.  */
-  /* Variables used to track the size of the hash table so to determine
-    when to resize it.  */
-  unsigned int size; /* Number of buckets allocated for the hash table
-			(number of array entries allocated for
-			"node_table").  Must be a power of two.  */
-  unsigned int used; /* Current number of entries in the hash table.  */
-  unsigned int mask; /* Precomputed mask.  */
-
-  /* Variables used to implement indexing through the hash table.  */
-
-  unsigned int last_bucket; /* Tracks which entry in the array where
-			       the last value was returned.  */
-  /* Function used to compute a hash code given a key. 
-     This function is specified when the hash table is created.  */
-  hash_func_type    hash_func;
-  /* Function used to compare two hash keys to see if they are equal.  */
-  compare_func_type compare_func;
-} *cache_ptr;
-
-
-/* Two important hash tables.  */
-extern cache_ptr module_hash_table, class_hash_table;
-
-/* Allocate and initialize a hash table.  */ 
-
-cache_ptr hash_new (unsigned int size,
-		    hash_func_type hash_func,
-		    compare_func_type compare_func);
-                       
-/* Deallocate all of the hash nodes and the cache itself.  */
-
-void hash_delete (cache_ptr cache);
-
-/* Add the key/value pair to the hash table.  If the
-   hash table reaches a level of fullness then it will be resized. 
-                                                   
-   assert if the key is already in the hash.  */
-
-void hash_add (cache_ptr *cachep, const void *key, void *value);
-     
-/* Remove the key/value pair from the hash table.  
-   assert if the key isn't in the table.  */
-
-void hash_remove (cache_ptr cache, const void *key);
-
-/* Used to index through the hash table.  Start with NULL
-   to get the first entry.
-                                                  
-   Successive calls pass the value returned previously.
-   ** Don't modify the hash during this operation *** 
-                                                  
-   Cache nodes are returned such that key or value can
-   be extracted.  */
-
-node_ptr hash_next (cache_ptr cache, node_ptr node);
-
-/* Used to return a value from a hash table using a given key.  */
-
-void *hash_value_for_key (cache_ptr cache, const void *key);
-
-/* Used to determine if the given key exists in the hash table */
-
-BOOL hash_is_key_in_hash (cache_ptr cache, const void *key);
-
-/************************************************
-
-        Useful hashing functions.  
-        
-        Declared inline for your pleasure.
-        
-************************************************/
-
-/* Calculate a hash code by performing some 
-   manipulation of the key pointer.  (Use the lowest bits
-   except for those likely to be 0 due to alignment.)  */
-
-static inline unsigned int
-hash_ptr (cache_ptr cache, const void *key)
-{
-  return ((size_t)key / sizeof (void *)) & cache->mask;
-}
-
-
-/* Calculate a hash code by iterating over a NULL 
-   terminate string.  */
-static inline unsigned int 
-hash_string (cache_ptr cache, const void *key)
-{
-  unsigned int ret = 0;
-  unsigned int ctr = 0;
-  const char *ckey = key;
-        
-  while (*ckey) {
-    ret ^= *ckey++ << ctr;
-    ctr = (ctr + 1) % sizeof (void *);
-  }
-
-  return ret & cache->mask;
-}
-
-
-/* Compare two pointers for equality.  */
-static inline int 
-compare_ptrs (const void *k1, const void *k2)
-{
-  return (k1 == k2);
-}
-
-
-/* Compare two strings.  */
-static inline int 
-compare_strings (const void *k1, const void *k2)
-{
-  if (k1 == k2)
-    return 1;
-  else if (k1 == 0 || k2 == 0)
-    return 0;
-  else
-    return ! strcmp (k1, k2);
-}
-
-
-#endif /* not __hash_INCLUDE_GNU */
diff --git a/include.new/objc/objc-api.h b/include.new/objc/objc-api.h
deleted file mode 100644
index b50fa1b..0000000
--- a/include.new/objc/objc-api.h
+++ /dev/null
@@ -1,607 +0,0 @@
-/* GNU Objective-C Runtime API.
-   Copyright (C) 1993, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files compiled
-   with GCC to produce an executable, this does not cause the resulting
-   executable to be covered by the GNU General Public License.  This
-   exception does not however invalidate any other reasons why the
-   executable file might be covered by the GNU General Public License. */
-
-#ifndef __objc_api_INCLUDE_GNU
-#define __objc_api_INCLUDE_GNU
-
-#include "objc/objc.h"
-#include "objc/hash.h"
-#include "objc/thr.h"
-#include <stdio.h>
-#include <stdarg.h>
-
-/* For functions which return Method_t */
-#define METHOD_NULL	(Method_t)0
-                                                /* Boolean typedefs */
-/*
-** Method descriptor returned by introspective Object methods.
-** This is really just the first part of the more complete objc_method
-** structure defined below and used internally by the runtime.
-*/
-struct objc_method_description
-{
-    SEL name;			/* this is a selector, not a string */
-    char *types;		/* type encoding */
-};
-
-/* Filer types used to describe Ivars and Methods.  */
-#define _C_ID       '@'
-#define _C_CLASS    '#'
-#define _C_SEL      ':'
-#define _C_CHR      'c'
-#define _C_UCHR     'C'
-#define _C_SHT      's'
-#define _C_USHT     'S'
-#define _C_INT      'i'
-#define _C_UINT     'I'
-#define _C_LNG      'l'
-#define _C_ULNG     'L'
-#define _C_LNG_LNG  'q'
-#define _C_ULNG_LNG 'Q'
-#define _C_FLT      'f'
-#define _C_DBL      'd'
-#define _C_BFLD     'b'
-#define _C_VOID     'v'
-#define _C_UNDEF    '?'
-#define _C_PTR      '^'
-#define _C_CHARPTR  '*'
-#define _C_ATOM     '%'
-#define _C_ARY_B    '['
-#define _C_ARY_E    ']'
-#define _C_UNION_B  '('
-#define _C_UNION_E  ')'
-#define _C_STRUCT_B '{'
-#define _C_STRUCT_E '}'
-#define _C_VECTOR   '!'
-
-
-/*
-** Error handling
-**
-** Call objc_error() or objc_verror() to record an error; this error
-** routine will generally exit the program but not necessarily if the
-** user has installed his own error handler.
-**
-** Call objc_set_error_handler to assign your own function for
-** handling errors.  The function should return YES if it is ok
-** to continue execution, or return NO or just abort if the
-** program should be stopped.  The default error handler is just to
-** print a message on stderr.
-**
-** The error handler function should be of type objc_error_handler
-** The first parameter is an object instance of relevance.
-** The second parameter is an error code.
-** The third parameter is a format string in the printf style.
-** The fourth parameter is a variable list of arguments.
-*/
-extern void objc_error(id object, int code, const char* fmt, ...);
-extern void objc_verror(id object, int code, const char* fmt, va_list ap);
-typedef BOOL (*objc_error_handler)(id, int code, const char *fmt, va_list ap);
-objc_error_handler objc_set_error_handler(objc_error_handler func);
-
-/*
-** Error codes
-** These are used by the runtime library, and your
-** error handling may use them to determine if the error is
-** hard or soft thus whether execution can continue or abort.
-*/
-#define OBJC_ERR_UNKNOWN 0             /* Generic error */
-
-#define OBJC_ERR_OBJC_VERSION 1        /* Incorrect runtime version */
-#define OBJC_ERR_GCC_VERSION 2         /* Incorrect compiler version */
-#define OBJC_ERR_MODULE_SIZE 3         /* Bad module size */
-#define OBJC_ERR_PROTOCOL_VERSION 4    /* Incorrect protocol version */
-
-#define OBJC_ERR_MEMORY 10             /* Out of memory */
-
-#define OBJC_ERR_RECURSE_ROOT 20       /* Attempt to archive the root
-					  object more than once. */
-#define OBJC_ERR_BAD_DATA 21           /* Didn't read expected data */
-#define OBJC_ERR_BAD_KEY 22            /* Bad key for object */
-#define OBJC_ERR_BAD_CLASS 23          /* Unknown class */
-#define OBJC_ERR_BAD_TYPE 24           /* Bad type specification */
-#define OBJC_ERR_NO_READ 25            /* Cannot read stream */
-#define OBJC_ERR_NO_WRITE 26           /* Cannot write stream */
-#define OBJC_ERR_STREAM_VERSION 27     /* Incorrect stream version */
-#define OBJC_ERR_BAD_OPCODE 28         /* Bad opcode */
-
-#define OBJC_ERR_UNIMPLEMENTED 30      /* Method is not implemented */
-
-#define OBJC_ERR_BAD_STATE 40          /* Bad thread state */
-
-/*
-** Set this variable nonzero to print a line describing each
-** message that is sent.  (this is currently disabled)
-*/
-extern BOOL objc_trace;
-
-
-/* For every class which happens to have statically allocated instances in
-   this module, one OBJC_STATIC_INSTANCES is allocated by the compiler.
-   INSTANCES is NULL terminated and points to all statically allocated
-   instances of this class.  */
-struct objc_static_instances
-{
-  char *class_name;
-  id instances[0];
-};
-
-/*
-** Whereas a Module (defined further down) is the root (typically) of a file,
-** a Symtab is the root of the class and category definitions within the
-** module.  
-** 
-** A Symtab contains a variable length array of pointers to classes and
-** categories  defined in the module. 
-*/
-typedef struct objc_symtab {
-  unsigned long sel_ref_cnt;                     /* Unknown. */
-  SEL        refs;                              /* Unknown. */
-  unsigned short cls_def_cnt;                   /* Number of classes compiled
-                                                  (defined) in the module. */
-  unsigned short cat_def_cnt;                   /* Number of categories 
-                                                  compiled (defined) in the 
-                                                  module. */
-
-  void      *defs[1];                           /* Variable array of pointers.
-                                                  cls_def_cnt of type Class 
-                                                  followed by cat_def_cnt of
-                                                  type Category_t, followed
-						  by a NULL terminated array
-						  of objc_static_instances. */
-} Symtab,   *Symtab_t;
-
-
-/*
-** The compiler generates one of these structures for each module that
-** composes the executable (eg main.m).  
-** 
-** This data structure is the root of the definition tree for the module.  
-** 
-** A collect program runs between ld stages and creates a ObjC ctor array. 
-** That array holds a pointer to each module structure of the executable. 
-*/
-typedef struct objc_module {
-  unsigned long version;                        /* Compiler revision. */
-  unsigned long size;                           /* sizeof(Module). */
-  const char* name;                             /* Name of the file where the 
-                                                  module was generated.   The 
-                                                  name includes the path. */
-
-  Symtab_t    symtab;                           /* Pointer to the Symtab of
-                                                  the module.  The Symtab
-                                                  holds an array of 
-						  pointers to 
-                                                  the classes and categories 
-                                                  defined in the module. */
-} Module, *Module_t;
-
-
-/*
-** The compiler generates one of these structures for a class that has
-** instance variables defined in its specification. 
-*/
-typedef struct objc_ivar* Ivar_t;
-typedef struct objc_ivar_list {
-  int   ivar_count;                             /* Number of structures (Ivar) 
-                                                  contained in the list.  One
-                                                  structure per instance 
-                                                  variable defined in the
-                                                  class. */
-  struct objc_ivar {
-    const char* ivar_name;                      /* Name of the instance
-                                                  variable as entered in the
-                                                  class definition. */
-    const char* ivar_type;                      /* Description of the Ivar's
-                                                  type.  Useful for 
-                                                  debuggers. */
-    int        ivar_offset;                    /* Byte offset from the base 
-                                                  address of the instance 
-                                                  structure to the variable. */
-
-  } ivar_list[1];                               /* Variable length 
-                                                  structure. */
-} IvarList, *IvarList_t;
-
-
-/*
-** The compiler generates one (or more) of these structures for a class that
-** has methods defined in its specification. 
-** 
-** The implementation of a class can be broken into separate pieces in a file
-** and categories can break them across modules. To handle this problem is a
-** singly linked list of methods. 
-*/
-typedef struct objc_method Method;
-typedef Method* Method_t;
-typedef struct objc_method_list {
-  struct objc_method_list*  method_next;      /* This variable is used to link 
-                                                a method list to another.  It 
-                                                is a singly linked list. */
-  int            method_count;               /* Number of methods defined in 
-                                                this structure. */
-  struct objc_method {
-    SEL         method_name;                  /* This variable is the method's 
-                                                name.  It is a char*. 
-                                                  The unique integer passed to 
-                                                objc_msg_send is a char* too.  
-                                                It is compared against 
-                                                method_name using strcmp. */
-    const char* method_types;                 /* Description of the method's
-                                                parameter list.  Useful for
-                                                debuggers. */
-    IMP         method_imp;                   /* Address of the method in the 
-                                                executable. */
-  } method_list[1];                           /* Variable length 
-                                                structure. */
-} MethodList, *MethodList_t;
-
-struct objc_protocol_list {
-  struct objc_protocol_list *next;
-  size_t count;
-  Protocol *list[1];
-};
-
-/*
-** This is used to assure consistent access to the info field of 
-** classes
-*/
-#ifndef HOST_BITS_PER_LONG
-#define HOST_BITS_PER_LONG  (sizeof(long)*8)
-#endif 
-
-#define __CLS_INFO(cls) ((cls)->info)
-#define __CLS_ISINFO(cls, mask) ((__CLS_INFO(cls)&mask)==mask)
-#define __CLS_SETINFO(cls, mask) (__CLS_INFO(cls) |= mask)
-
-/* The structure is of type MetaClass */
-#define _CLS_META 0x2L
-#define CLS_ISMETA(cls) ((cls)&&__CLS_ISINFO(cls, _CLS_META))
-
-
-/* The structure is of type Class */
-#define _CLS_CLASS 0x1L
-#define CLS_ISCLASS(cls) ((cls)&&__CLS_ISINFO(cls, _CLS_CLASS))
-
-/*
-** The class is initialized within the runtime.  This means that 
-** it has had correct super and sublinks assigned
-*/
-#define _CLS_RESOLV 0x8L
-#define CLS_ISRESOLV(cls) __CLS_ISINFO(cls, _CLS_RESOLV)
-#define CLS_SETRESOLV(cls) __CLS_SETINFO(cls, _CLS_RESOLV)
-
-/*
-** The class has been send a +initialize message or a such is not 
-** defined for this class
-*/
-#define _CLS_INITIALIZED 0x04L
-#define CLS_ISINITIALIZED(cls) __CLS_ISINFO(cls, _CLS_INITIALIZED)
-#define CLS_SETINITIALIZED(cls) __CLS_SETINFO(cls, _CLS_INITIALIZED)
-
-/*
-** The class number of this class.  This must be the same for both the 
-** class and its meta class object
-*/
-#define CLS_GETNUMBER(cls) (__CLS_INFO(cls) >> (HOST_BITS_PER_LONG/2))
-#define CLS_SETNUMBER(cls, num) \
-  ({ (cls)->info <<= (HOST_BITS_PER_LONG/2); \
-     (cls)->info >>= (HOST_BITS_PER_LONG/2); \
-     __CLS_SETINFO(cls, (((unsigned long)num) << (HOST_BITS_PER_LONG/2))); })
-
-/*
-** The compiler generates one of these structures for each category.  A class
-** may have many categories and contain both instance and factory methods.  
-*/
-typedef struct objc_category {
-  const char*   category_name;                /* Name of the category.  Name
-                                                contained in the () of the
-                                                category definition. */
-  const char*   class_name;                   /* Name of the class to which
-                                                the category belongs. */
-  MethodList_t  instance_methods;             /* Linked list of instance
-                                                methods defined in the 
-                                                category. NULL indicates no
-                                                instance methods defined. */
-  MethodList_t  class_methods;                /* Linked list of factory 
-                                                methods defined in the
-                                                category.  NULL indicates no
-                                                class methods defined. */
-  struct objc_protocol_list *protocols;	      /* List of Protocols 
-					         conformed to */
-} Category, *Category_t;
-
-/*
-** Structure used when a message is send to a class's super class.  The
-** compiler generates one of these structures and passes it to
-** objc_msg_super.
-*/
-typedef struct objc_super {
-  id      self;                           /* Id of the object sending
-                                                the message. */
-  Class class;                              /* Object's super class. */
-} Super, *Super_t;
-
-IMP objc_msg_lookup_super(Super_t super, SEL sel);
-
-retval_t objc_msg_sendv(id, SEL, arglist_t);
-
-
-
-/*
-** This is a hook which is called by objc_lookup_class and
-** objc_get_class if the runtime is not able to find the class.
-** This may e.g. try to load in the class using dynamic loading.
-** The function is guaranteed to be passed a non-NULL name string.
-*/
-extern Class (*_objc_lookup_class)(const char *name);
-
-/*
-** This is a hook which is called by __objc_exec_class every time a class
-** or a category is loaded into the runtime.  This may e.g. help a
-** dynamic loader determine the classes that have been loaded when
-** an object file is dynamically linked in.
-*/
-extern void (*_objc_load_callback)(Class class, Category* category);
-
-/*
-** Hook functions for allocating, copying and disposing of instances
-*/
-extern id (*_objc_object_alloc)(Class class);
-extern id (*_objc_object_copy)(id object);
-extern id (*_objc_object_dispose)(id object);
-
-/*
-** Standard functions for memory allocation and disposal.
-** Users should use these functions in their ObjC programs so
-** that they work properly with garbage collectors as well as
-** can take advantage of the exception/error handling available.
-*/
-void *
-objc_malloc(size_t size);
-
-void *
-objc_atomic_malloc(size_t size);
-
-void *
-objc_valloc(size_t size);
-
-void *
-objc_realloc(void *mem, size_t size);
-
-void *
-objc_calloc(size_t nelem, size_t size);
-
-void
-objc_free(void *mem);
-
-/*
-** Hook functions for memory allocation and disposal.
-** This makes it easy to substitute garbage collection systems
-** such as Boehm's GC by assigning these function pointers
-** to the GC's allocation routines.  By default these point
-** to the ANSI standard malloc, realloc, free, etc.
-**
-** Users should call the normal objc routines above for
-** memory allocation and disposal within their programs.
-*/
-extern void *(*_objc_malloc)(size_t);
-extern void *(*_objc_atomic_malloc)(size_t);
-extern void *(*_objc_valloc)(size_t);
-extern void *(*_objc_realloc)(void *, size_t);
-extern void *(*_objc_calloc)(size_t, size_t);
-extern void (*_objc_free)(void *);
-
-/*
-**  Hook for method forwarding. This makes it easy to substitute a
-**  library, such as ffcall, that implements closures, thereby avoiding
-**  gcc's __builtin_apply problems.
-*/
-extern IMP (*__objc_msg_forward)(SEL);
-
-Method_t class_get_class_method(MetaClass class, SEL aSel);
-
-Method_t class_get_instance_method(Class class, SEL aSel);
-
-Class class_pose_as(Class impostor, Class superclass);
-
-Class objc_get_class(const char *name);
-
-Class objc_lookup_class(const char *name);
-
-Class objc_next_class(void **enum_state);
-
-const char *sel_get_name(SEL selector);
-
-const char *sel_get_type(SEL selector);
-
-SEL sel_get_uid(const char *name);
-
-SEL sel_get_any_uid(const char *name);
-
-SEL sel_get_any_typed_uid(const char *name);
-
-SEL sel_get_typed_uid(const char *name, const char*);
-
-SEL sel_register_name(const char *name);
-
-SEL sel_register_typed_name(const char *name, const char*type);
-
-
-BOOL sel_is_mapped (SEL aSel);
-
-extern id class_create_instance(Class class);
-
-static inline const char *
-class_get_class_name(Class class)
-{
-  return CLS_ISCLASS(class)?class->name:((class==Nil)?"Nil":0);
-}
-
-static inline long
-class_get_instance_size(Class class)
-{
-  return CLS_ISCLASS(class)?class->instance_size:0;
-}
-
-static inline MetaClass
-class_get_meta_class(Class class)
-{
-  return CLS_ISCLASS(class)?class->class_pointer:Nil;
-}
-
-static inline Class
-class_get_super_class(Class class)
-{
-  return CLS_ISCLASS(class)?class->super_class:Nil;
-}
-
-static inline int
-class_get_version(Class class)
-{
-  return CLS_ISCLASS(class)?class->version:-1;
-}
-
-static inline BOOL
-class_is_class(Class class)
-{
-  return CLS_ISCLASS(class);
-}
-
-static inline BOOL
-class_is_meta_class(Class class)
-{
-  return CLS_ISMETA(class);
-}
-
-
-static inline void
-class_set_version(Class class, long version)
-{
-  if (CLS_ISCLASS(class))
-    class->version = version;
-}
-
-static inline void *
-class_get_gc_object_type (Class class)
-{
-  return CLS_ISCLASS(class) ? class->gc_object_type : NULL;
-}
-
-/* Mark the instance variable as innaccessible to the garbage collector */
-extern void class_ivar_set_gcinvisible (Class class,
-					const char* ivarname,
-					BOOL gcInvisible);
-
-static inline IMP
-method_get_imp(Method_t method)
-{
-  return (method!=METHOD_NULL)?method->method_imp:(IMP)0;
-}
-
-IMP get_imp (Class class, SEL sel);
-
-/* Redefine on NeXTSTEP so as not to conflict with system function */
-#ifdef __NeXT__
-#define object_copy	gnu_object_copy
-#define object_dispose	gnu_object_dispose
-#endif
-
-id object_copy(id object);
-
-id object_dispose(id object);
-
-static inline Class
-object_get_class(id object)
-{
-  return ((object!=nil)
-	  ? (CLS_ISCLASS(object->class_pointer)
-	     ? object->class_pointer
-	     : (CLS_ISMETA(object->class_pointer)
-		? (Class)object
-		: Nil))
-	  : Nil);
-}
-
-static inline const char *
-object_get_class_name(id object)
-{
-  return ((object!=nil)?(CLS_ISCLASS(object->class_pointer)
-                         ?object->class_pointer->name
-                         :((Class)object)->name)
-                       :"Nil");
-}
-
-static inline MetaClass
-object_get_meta_class(id object)
-{
-  return ((object!=nil)?(CLS_ISCLASS(object->class_pointer)
-                         ?object->class_pointer->class_pointer
-                         :(CLS_ISMETA(object->class_pointer)
-                           ?object->class_pointer
-                           :Nil))
-                       :Nil);
-}
-
-static inline Class
-object_get_super_class
-(id object)
-{
-  return ((object!=nil)?(CLS_ISCLASS(object->class_pointer)
-                         ?object->class_pointer->super_class
-                         :(CLS_ISMETA(object->class_pointer)
-                           ?((Class)object)->super_class
-                           :Nil))
-                       :Nil);
-}
-
-static inline BOOL
-object_is_class (id object)
-{
-  return ((object != nil)  &&  CLS_ISMETA (object->class_pointer));
-}
- 
-static inline BOOL
-object_is_instance (id object)
-{
-  return ((object != nil)  &&  CLS_ISCLASS (object->class_pointer));
-}
-
-static inline BOOL
-object_is_meta_class (id object)
-{
-  return ((object != nil)
-	  &&  !object_is_instance (object)  
-	  &&  !object_is_class (object));
-}
-
-struct sarray* 
-objc_get_uninstalled_dtable(void);
-
-#endif /* not __objc_api_INCLUDE_GNU */
-
-
-
diff --git a/include.new/objc/objc-list.h b/include.new/objc/objc-list.h
deleted file mode 100644
index 06dbb39..0000000
--- a/include.new/objc/objc-list.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* Generic single linked list to keep various information 
-   Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc.
-   Contributed by Kresten Krab Thorup.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files compiled with
-   GCC to produce an executable, this does not cause the resulting executable
-   to be covered by the GNU General Public License. This exception does not
-   however invalidate any other reasons why the executable file might be
-   covered by the GNU General Public License.  */
-
-#ifndef __GNU_OBJC_LIST_H
-#define __GNU_OBJC_LIST_H
-
-struct objc_list {
-  void *head;
-  struct objc_list *tail;
-};
-
-/* Return a cons cell produced from (head . tail) */
-
-static inline struct objc_list* 
-list_cons(void* head, struct objc_list* tail)
-{
-  struct objc_list* cell;
-
-  cell = (struct objc_list*)objc_malloc(sizeof(struct objc_list));
-  cell->head = head;
-  cell->tail = tail;
-  return cell;
-}
-
-/* Return the length of a list, list_length(NULL) returns zero */
-
-static inline int
-list_length(struct objc_list* list)
-{
-  int i = 0;
-  while(list)
-    {
-      i += 1;
-      list = list->tail;
-    }
-  return i;
-}
-
-/* Return the Nth element of LIST, where N count from zero.  If N 
-   larger than the list length, NULL is returned  */
-
-static inline void*
-list_nth(int indx, struct objc_list* list)
-{
-  while(indx-- != 0)
-    {
-      if(list->tail)
-	list = list->tail;
-      else
-	return 0;
-    }
-  return list->head;
-}
-
-/* Remove the element at the head by replacing it by its successor */
-
-static inline void
-list_remove_head(struct objc_list** list)
-{
-  if ((*list)->tail)
-    {
-      struct objc_list* tail = (*list)->tail; /* fetch next */
-      *(*list) = *tail;		/* copy next to list head */
-      objc_free(tail);			/* free next */
-    }
-  else				/* only one element in list */
-    {
-      objc_free(*list);
-      (*list) = 0;
-    }
-}
-
-
-/* Remove the element with `car' set to ELEMENT */
-
-static inline void
-list_remove_elem(struct objc_list** list, void* elem)
-{
-  while (*list) {
-    if ((*list)->head == elem)
-      list_remove_head(list);
-    list = &((*list)->tail);
-  }
-}
-
-/* Map FUNCTION over all elements in LIST */
-
-static inline void
-list_mapcar(struct objc_list* list, void(*function)(void*))
-{
-  while(list)
-    {
-      (*function)(list->head);
-      list = list->tail;
-    }
-}
-
-/* Return element that has ELEM as car */
-
-static inline struct objc_list**
-list_find(struct objc_list** list, void* elem)
-{
-  while(*list)
-    {
-    if ((*list)->head == elem)
-      return list;
-    list = &((*list)->tail);
-    }
-  return NULL;
-}
-
-/* Free list (backwards recursive) */
-
-static void
-list_free(struct objc_list* list)
-{
-  if(list)
-    {
-      list_free(list->tail);
-      objc_free(list);
-    }
-}
-#endif /* not __GNU_OBJC_LIST_H */
diff --git a/include.new/objc/objc.h b/include.new/objc/objc.h
deleted file mode 100644
index 3b57900..0000000
--- a/include.new/objc/objc.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* Basic data types for Objective C.
-   Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef __objc_INCLUDE_GNU
-#define __objc_INCLUDE_GNU
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stddef.h>
-
-/*
-** Definition of the boolean type.  
-*/
-#ifdef __vxworks
-typedef int BOOL;
-#else
-typedef unsigned char  BOOL;
-#endif
-#define YES   (BOOL)1
-#define NO    (BOOL)0
-
-/*
-** Definition of a selector.  Selectors themselves are not unique, but
-** the sel_id is a unique identifier.
-*/
-typedef const struct objc_selector 
-{
-  void *sel_id;
-  const char *sel_types;
-} *SEL;
-
-inline static BOOL
-sel_eq (SEL s1, SEL s2)
-{
-  if (s1 == 0 || s2 == 0)
-    return s1 == s2;
-  else
-    return s1->sel_id == s2->sel_id;
-}
-
-
-/*
-** ObjC uses this typedef for untyped instances.
-*/
-typedef struct objc_object {
-  struct objc_class*  class_pointer;
-} *id;
-
-/*
-** Definition of method type.  When retrieving the implementation of a
-** method, this is type of the pointer returned.  The idea of the
-** definition of IMP is to represent a 'pointer to a general function
-** taking an id, a SEL, followed by other unspecified arguments'.  You
-** must always cast an IMP to a pointer to a function taking the
-** appropriate, specific types for that function, before calling it -
-** to make sure the appropriate arguments are passed to it.  The code
-** generated by the compiler to perform method calls automatically
-** does this cast inside method calls.
-*/
-typedef id (*IMP)(id, SEL, ...); 
-
-/*
-** More simple types...
-*/
-#define nil (id)0                               /* id of Nil instance */
-#define Nil (Class)0                            /* id of Nil class */
-typedef char *STR;                              /* String alias */
-
-/*
-** The compiler generates one of these structures for each class.  
-** 
-** This structure is the definition for classes. 
-** 
-** This structure is generated by the compiler in the executable and used by
-** the run-time during normal messaging operations.  Therefore some members
-** change type. The compiler generates "char* const" and places a string in
-** the following member variables:  super_class. 
-*/
-typedef struct objc_class *MetaClass;
-typedef struct objc_class *Class;
-struct objc_class {     
-  MetaClass           class_pointer;          /* Pointer to the class's
-                                                meta class. */
-  struct objc_class*  super_class;            /* Pointer to the super 
-                                                class. NULL for class 
-                                                Object. */
-  const char*         name;                   /* Name of the class. */
-  long                version;                /* Unknown. */
-  unsigned long       info;                   /* Bit mask.  See class masks 
-                                                defined above. */
-  long                instance_size;          /* Size in bytes of the class.  
-                                                The sum of the class 
-						definition and all super 
-						class definitions. */
-  struct objc_ivar_list* ivars;               /* Pointer to a structure that
-                                                describes the instance 
-                                                variables in the class
-                                                definition.  NULL indicates
-                                                no instance variables.  Does
-                                                not include super class
-                                                variables. */
-  struct objc_method_list*  methods;          /* Linked list of instance
-                                                methods defined for the 
-                                                class. */
-  struct sarray *    dtable;                  /* Pointer to instance 
-					         method dispatch table. */  
-  struct objc_class* subclass_list;           /* Subclasses */
-  struct objc_class* sibling_class;
-
-  struct objc_protocol_list *protocols;	      /* Protocols conformed to */
-  void* gc_object_type;
-};
-
-#ifndef __OBJC__
-typedef struct objc_protocol {
-  struct objc_class* class_pointer;
-  char *protocol_name;
-  struct objc_protocol_list *protocol_list;
-  struct objc_method_description_list *instance_methods, *class_methods; 
-} Protocol; 
-
-#else /* __OBJC__ */
-@class Protocol;
-#endif 
-
-typedef void* retval_t;		/* return value */
-typedef void(*apply_t)(void);	/* function pointer */
-typedef union {
-  char *arg_ptr;
-  char arg_regs[sizeof (char*)];
-} *arglist_t;			/* argument frame */
-
-
-IMP objc_msg_lookup(id receiver, SEL op);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* not __objc_INCLUDE_GNU */
diff --git a/include.new/objc/runtime.h b/include.new/objc/runtime.h
deleted file mode 100644
index 72e79be..0000000
--- a/include.new/objc/runtime.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* GNU Objective C Runtime internal declarations
-   Copyright (C) 1993, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
-   Contributed by Kresten Krab Thorup
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-details.
-
-You should have received a copy of the GNU General Public License along with
-GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files compiled with
-   GCC to produce an executable, this does not cause the resulting executable
-   to be covered by the GNU General Public License. This exception does not
-   however invalidate any other reasons why the executable file might be
-   covered by the GNU General Public License.  */
-
-#ifndef __objc_runtime_INCLUDE_GNU
-#define __objc_runtime_INCLUDE_GNU
-
-#include <stdarg.h>		/* for varargs and va_list's */
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include <stddef.h>		/* so noone else will get system versions */
-#include "assert.h"
-
-#include "objc/objc.h"		/* core data types */
-#include "objc/objc-api.h"	/* runtime api functions */
-
-#include "objc/thr.h"		/* thread and mutex support */
-
-#include "objc/hash.h"		/* hash structures */
-#include "objc/objc-list.h"	/* linear lists */
-
-extern void __objc_add_class_to_hash(Class);   /* (objc-class.c) */
-extern void __objc_init_selector_tables(void); /* (objc-sel.c) */
-extern void __objc_init_class_tables(void);    /* (objc-class.c) */
-extern void __objc_init_dispatch_tables(void); /* (objc-dispatch.c) */
-extern void __objc_install_premature_dtable(Class); /* (objc-dispatch.c) */
-extern void __objc_resolve_class_links(void);  /* (objc-class.c) */
-extern void __objc_register_selectors_from_class(Class); /* (objc-sel.c) */
-extern void __objc_update_dispatch_table_for_class (Class);/* (objc-msg.c) */
-
-extern int  __objc_init_thread_system(void);    /* thread.c */
-extern int  __objc_fini_thread_system(void);    /* thread.c */
-extern void __objc_print_dtable_stats(void);    /* sendmsg.c */
-
-extern void class_add_method_list(Class, MethodList_t);
-
-/* Registering instance methods as class methods for root classes */
-extern void __objc_register_instance_methods_to_class(Class);
-extern Method_t search_for_method_in_list(MethodList_t list, SEL op);
-
-/* True when class links has been resolved */     
-extern BOOL __objc_class_links_resolved;
-
-/* Number of selectors stored in each of the selector  tables */
-extern unsigned int __objc_selector_max_index;
-
-/* Mutex locking __objc_selector_max_index and its arrays. */
-extern objc_mutex_t __objc_runtime_mutex;
-
-/* Number of threads which are alive. */
-extern int __objc_runtime_threads_alive;
-
-#ifdef DEBUG
-#define DEBUG_PRINTF(format, args...) printf (format, ## args)
-#else
-#define DEBUG_PRINTF(format, args...)
-#endif 
-
-BOOL __objc_responds_to (id object, SEL sel); /* for internal use only! */
-SEL  __sel_register_typed_name (const char*, const char*, 
-				struct objc_selector*, BOOL is_const);
-extern void __objc_generate_gc_type_description (Class);
-
-#endif /* not __objc_runtime_INCLUDE_GNU */
-
-
diff --git a/include.new/objc/sarray.h b/include.new/objc/sarray.h
deleted file mode 100644
index a94a98a..0000000
--- a/include.new/objc/sarray.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* Sparse Arrays for Objective C dispatch tables
-   Copyright (C) 1993, 1995, 1996 Free Software Foundation, Inc.
-   Contributed by Kresten Krab Thorup.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-#ifndef __sarray_INCLUDE_GNU
-#define __sarray_INCLUDE_GNU
-
-#define OBJC_SPARSE2		/* 2-level sparse array */
-/* #define OBJC_SPARSE3 */      /* 3-level sparse array */
-
-#ifdef OBJC_SPARSE2
-extern const char* __objc_sparse2_id;
-#endif
-
-#ifdef OBJC_SPARSE3
-extern const char* __objc_sparse3_id;
-#endif
-
-#include <stddef.h>
-
-#include "objc/thr.h"
-
-extern int nbuckets;		/* for stats */
-extern int nindices;
-extern int narrays;
-extern int idxsize;
-
-#include <assert.h>
-
-/* An unsigned integer of same size as a pointer */
-#define SIZET_BITS (sizeof(size_t)*8)
-
-#if defined(__sparc__) || defined(OBJC_SPARSE2)
-#define PRECOMPUTE_SELECTORS
-#endif
-
-#ifdef OBJC_SPARSE3
-
-/* Buckets are 8 words each */
-#define BUCKET_BITS 3
-#define BUCKET_SIZE (1<<BUCKET_BITS)
-#define BUCKET_MASK (BUCKET_SIZE-1)
-
-/* Indices are 16 words each */
-#define INDEX_BITS 4
-#define INDEX_SIZE (1<<INDEX_BITS)
-#define INDEX_MASK (INDEX_SIZE-1)
-
-#define INDEX_CAPACITY (BUCKET_SIZE*INDEX_SIZE)
-
-#else /* OBJC_SPARSE2 */
-
-/* Buckets are 32 words each */
-#define BUCKET_BITS 5
-#define BUCKET_SIZE (1<<BUCKET_BITS)
-#define BUCKET_MASK (BUCKET_SIZE-1)
-
-#endif /* OBJC_SPARSE2 */
-
-typedef size_t sidx;
-
-#ifdef PRECOMPUTE_SELECTORS
-
-struct soffset {
-#ifdef OBJC_SPARSE3
-  unsigned int unused : SIZET_BITS/4;
-  unsigned int eoffset : SIZET_BITS/4;
-  unsigned int boffset : SIZET_BITS/4;
-  unsigned int ioffset : SIZET_BITS/4;
-#else /* OBJC_SPARSE2 */
-#ifdef __sparc__
-  unsigned long boffset : (SIZET_BITS - 2) - BUCKET_BITS;
-  unsigned int eoffset : BUCKET_BITS;
-  unsigned int unused  : 2;
-#else
-  unsigned int boffset : SIZET_BITS/2;
-  unsigned int eoffset : SIZET_BITS/2;
-#endif
-#endif /* OBJC_SPARSE2 */
-};
-
-union sofftype {
-  struct soffset off;
-  sidx idx;
-};
-
-#endif /* not PRECOMPUTE_SELECTORS */
-
-union sversion {
-  int	version;
-  void *next_free;
-};
-
-struct sbucket {
-  void* elems[BUCKET_SIZE];	/* elements stored in array */
-  union sversion	version;		/* used for copy-on-write */
-};
-
-#ifdef OBJC_SPARSE3
-
-struct sindex {
-  struct sbucket* buckets[INDEX_SIZE];
-  union sversion	version;		/* used for copy-on-write */
-};
-
-#endif /* OBJC_SPARSE3 */
-
-struct sarray {
-#ifdef OBJC_SPARSE3
-  struct sindex** indices;
-  struct sindex* empty_index;
-#else /* OBJC_SPARSE2 */
-  struct sbucket** buckets;
-#endif  /* OBJC_SPARSE2 */
-  struct sbucket* empty_bucket;
-  union sversion	version;		/* used for copy-on-write */
-  short ref_count;
-  struct sarray* is_copy_of;
-  size_t capacity;
-};
-
-struct sarray* sarray_new(int, void* default_element);
-void sarray_free(struct sarray*);
-struct sarray* sarray_lazy_copy(struct sarray*);
-void sarray_realloc(struct sarray*, int new_size);
-void sarray_at_put(struct sarray*, sidx indx, void* elem);
-void sarray_at_put_safe(struct sarray*, sidx indx, void* elem);
-
-struct sarray* sarray_hard_copy(struct sarray*); /* ... like the name? */
-void sarray_remove_garbage(void);
-
-
-#ifdef PRECOMPUTE_SELECTORS
-/* Transform soffset values to ints and vica verca */
-static inline unsigned int
-soffset_decode(sidx indx)
-{
-  union sofftype x;
-  x.idx = indx;
-#ifdef OBJC_SPARSE3
-  return x.off.eoffset
-    + (x.off.boffset*BUCKET_SIZE)
-      + (x.off.ioffset*INDEX_CAPACITY);
-#else /* OBJC_SPARSE2 */
-  return x.off.eoffset + (x.off.boffset*BUCKET_SIZE);
-#endif /* OBJC_SPARSE2 */
-}
-
-static inline sidx
-soffset_encode(size_t offset)
-{
-  union sofftype x;
-  x.off.eoffset = offset%BUCKET_SIZE;
-#ifdef OBJC_SPARSE3
-  x.off.boffset = (offset/BUCKET_SIZE)%INDEX_SIZE;
-  x.off.ioffset = offset/INDEX_CAPACITY;
-#else /* OBJC_SPARSE2 */
-  x.off.boffset = offset/BUCKET_SIZE;
-#endif
-  return (sidx)x.idx;
-}
-
-#else /* not PRECOMPUTE_SELECTORS */
-
-static inline size_t
-soffset_decode(sidx indx)
-{
-  return indx;
-}
-
-static inline sidx
-soffset_encode(size_t offset)
-{
-  return offset;
-}
-#endif /* not PRECOMPUTE_SELECTORS */
-
-/* Get element from the Sparse array `array' at offset `indx' */
-
-static inline void* sarray_get(struct sarray* array, sidx indx)
-{
-#ifdef PRECOMPUTE_SELECTORS
-  union sofftype x;
-  x.idx = indx;
-#ifdef OBJC_SPARSE3
-  return 
-    array->
-      indices[x.off.ioffset]->
-	buckets[x.off.boffset]->
-	  elems[x.off.eoffset];
-#else /* OBJC_SPARSE2 */
-  return array->buckets[x.off.boffset]->elems[x.off.eoffset];
-#endif /* OBJC_SPARSE2 */
-#else /* not PRECOMPUTE_SELECTORS */
-#ifdef OBJC_SPARSE3
-  return array->
-    indices[indx/INDEX_CAPACITY]->
-      buckets[(indx/BUCKET_SIZE)%INDEX_SIZE]->
-	elems[indx%BUCKET_SIZE];
-#else /* OBJC_SPARSE2 */
-  return array->buckets[indx/BUCKET_SIZE]->elems[indx%BUCKET_SIZE];
-#endif /* not OBJC_SPARSE3 */
-#endif /* not PRECOMPUTE_SELECTORS */
-}
-
-static inline void* sarray_get_safe(struct sarray* array, sidx indx)
-{
-  if(soffset_decode(indx) < array->capacity)
-    return sarray_get(array, indx);
-  else
-    return (array->empty_bucket->elems[0]);
-}
-
-#endif /* __sarray_INCLUDE_GNU */
diff --git a/include.new/objc/thr.h b/include.new/objc/thr.h
deleted file mode 100644
index 1178f2e..0000000
--- a/include.new/objc/thr.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* Thread and mutex controls for Objective C.
-   Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
-   Contributed by Galen C. Hunt (gchunt@cs.rochester.edu)
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GCC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-GCC is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2, or (at your option) any later version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-details.
-
-You should have received a copy of the GNU General Public License along with
-GCC; see the file COPYING.  If not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files
-   compiled with GCC to produce an executable, this does not cause
-   the resulting executable to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
-
-
-#ifndef __thread_INCLUDE_GNU
-#define __thread_INCLUDE_GNU
-
-#include "objc/objc.h"
-
-/*************************************************************************
- *  Universal static variables:
- */
-extern int __objc_thread_exit_status;      /* Global exit status.   */
-
-/********
- *  Thread safe implementation types and functions.  
- */
-
-/* Thread priorities */
-#define OBJC_THREAD_INTERACTIVE_PRIORITY        2
-#define OBJC_THREAD_BACKGROUND_PRIORITY         1
-#define OBJC_THREAD_LOW_PRIORITY                0
-
-/* A thread */
-typedef void * objc_thread_t;
-
-/* This structure represents a single mutual exclusion lock. */
-struct objc_mutex
-{
-  volatile objc_thread_t owner;     /* Id of thread that owns. */
-  volatile int depth;               /* # of acquires. */
-  void * backend;                   /* Specific to backend */
-};
-typedef struct objc_mutex *objc_mutex_t;
-
-/* This structure represents a single condition mutex */
-struct objc_condition
-{
-  void * backend;                   /* Specific to backend */
-};
-typedef struct objc_condition *objc_condition_t;
-
-/* Frontend mutex functions */
-objc_mutex_t objc_mutex_allocate (void);
-int objc_mutex_deallocate (objc_mutex_t mutex);
-int objc_mutex_lock (objc_mutex_t mutex);
-int objc_mutex_unlock (objc_mutex_t mutex);
-int objc_mutex_trylock (objc_mutex_t mutex);
-
-/* Frontend condition mutex functions */
-objc_condition_t objc_condition_allocate (void);
-int objc_condition_deallocate (objc_condition_t condition);
-int objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex);
-int objc_condition_signal (objc_condition_t condition);
-int objc_condition_broadcast (objc_condition_t condition);
-
-/* Frontend thread functions */
-objc_thread_t objc_thread_detach (SEL selector, id object, id argument);
-void objc_thread_yield (void);
-int objc_thread_exit (void);
-int objc_thread_set_priority (int priority);
-int objc_thread_get_priority (void);
-void * objc_thread_get_data (void);
-int objc_thread_set_data (void *value);
-objc_thread_t objc_thread_id (void);
-void objc_thread_add (void);
-void objc_thread_remove (void);
-
-/*
-  Use this to set the hook function that will be called when the 
-  runtime initially becomes multi threaded.
-  The hook function is only called once, meaning only when the 
-  2nd thread is spawned, not for each and every thread.
-
-  It returns the previous hook function or NULL if there is none.
-
-  A program outside of the runtime could set this to some function so
-  it can be informed; for example, the GNUstep Base Library sets it 
-  so it can implement the NSBecomingMultiThreaded notification.
-  */
-typedef void (*objc_thread_callback) (void);
-objc_thread_callback objc_set_thread_callback (objc_thread_callback func);
-
-/* Backend initialization functions */
-int __objc_init_thread_system (void);
-int __objc_fini_thread_system (void);
-
-/* Backend mutex functions */
-int __objc_mutex_allocate (objc_mutex_t mutex);
-int __objc_mutex_deallocate (objc_mutex_t mutex);
-int __objc_mutex_lock (objc_mutex_t mutex);
-int __objc_mutex_trylock (objc_mutex_t mutex);
-int __objc_mutex_unlock (objc_mutex_t mutex);
-
-/* Backend condition mutex functions */
-int __objc_condition_allocate (objc_condition_t condition);
-int __objc_condition_deallocate (objc_condition_t condition);
-int __objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex);
-int __objc_condition_broadcast (objc_condition_t condition);
-int __objc_condition_signal (objc_condition_t condition);
-
-/* Backend thread functions */
-objc_thread_t __objc_thread_detach (void (*func) (void *arg), void *arg);
-int __objc_thread_set_priority (int priority);
-int __objc_thread_get_priority (void);
-void __objc_thread_yield (void);
-int __objc_thread_exit (void);
-objc_thread_t __objc_thread_id (void);
-int __objc_thread_set_data (void *value);
-void * __objc_thread_get_data (void);
-
-#endif /* not __thread_INCLUDE_GNU */
diff --git a/include.new/objc/typedstream.h b/include.new/objc/typedstream.h
deleted file mode 100644
index ed78bf7..0000000
--- a/include.new/objc/typedstream.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* GNU Objective-C Typed Streams interface.
-   Copyright (C) 1993, 1995 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
-later version.
-
-GCC is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you link this library with files compiled
-   with GCC to produce an executable, this does not cause the resulting
-   executable to be covered by the GNU General Public License.  This
-   exception does not however invalidate any other reasons why the
-   executable file might be covered by the GNU General Public License. */
-
-#ifndef __typedstream_INCLUDE_GNU
-#define __typedstream_INCLUDE_GNU
-
-#include "objc/objc.h"
-#include "objc/hash.h"
-#include <stdio.h>
-
-typedef int (*objc_typed_read_func)(void*, char*, int);
-typedef int (*objc_typed_write_func)(void*, const char*, int);
-typedef int (*objc_typed_flush_func)(void*);
-typedef int (*objc_typed_eof_func)(void*);
-
-#define OBJC_READONLY   0x01
-#define OBJC_WRITEONLY  0x02
-
-#define OBJC_MANAGED_STREAM  0x01
-#define OBJC_FILE_STREAM     0x02
-#define OBJC_MEMORY_STREAM   0x04
-
-#define OBJC_TYPED_STREAM_VERSION 0x01
-
-typedef struct objc_typed_stream {
-  void* physical;
-  cache_ptr object_table;	/* read/written objects */
-  cache_ptr stream_table;	/* other read/written but shared things.. */
-  cache_ptr class_table;	/* class version mapping */
-  cache_ptr object_refs;	/* forward references */
-  int mode;			/* OBJC_READONLY or OBJC_WRITEONLY */
-  int type;			/* MANAGED, FILE, MEMORY etc bit string */
-  int version;			/* version used when writing */
-  int writing_root_p;
-  objc_typed_read_func read;
-  objc_typed_write_func write;
-  objc_typed_eof_func eof;
-  objc_typed_flush_func flush;
-} TypedStream;
-
-/* opcode masks */
-#define _B_VALUE   0x1fU
-#define _B_CODE    0xe0U
-#define _B_SIGN    0x10U
-#define _B_NUMBER  0x0fU
-
-/* standard opcodes */
-#define _B_INVALID 0x00U
-#define _B_SINT    0x20U
-#define _B_NINT    0x40U
-#define _B_SSTR    0x60U
-#define _B_NSTR    0x80U
-#define _B_RCOMM   0xa0U
-#define _B_UCOMM   0xc0U
-#define _B_EXT     0xe0U
-
-/* eXtension opcodes */
-#define _BX_OBJECT  0x00U
-#define _BX_CLASS   0x01U
-#define _BX_SEL     0x02U
-#define _BX_OBJREF  0x03U
-#define _BX_OBJROOT 0x04U
-#define _BX_EXT     0x1fU
-
-/*
-** Read and write objects as specified by TYPE.  All the `last'
-** arguments are pointers to the objects to read/write.  
-*/
-
-int objc_write_type (TypedStream* stream, const char* type, const void* data);
-int objc_read_type (TypedStream* stream, const char* type, void* data);
-
-int objc_write_types (TypedStream* stream, const char* type, ...);
-int objc_read_types (TypedStream* stream, const char* type, ...);
-
-int objc_write_object_reference (TypedStream* stream, id object);
-int objc_write_root_object (TypedStream* stream, id object);
-
-long objc_get_stream_class_version (TypedStream* stream, Class class);
-
-
-/*
-** Convenience functions
-*/
-
-int objc_write_array (TypedStream* stream, const char* type,
-		      int count, const void* data);
-int objc_read_array (TypedStream* stream, const char* type,
-		     int count, void* data);
-
-int objc_write_object (TypedStream* stream, id object);
-int objc_read_object (TypedStream* stream, id* object);
-
-
-
-/*
-** Open a typed stream for reading or writing.  MODE may be either of
-** OBJC_READONLY or OBJC_WRITEONLY.  
-*/
-
-TypedStream* objc_open_typed_stream (FILE* physical, int mode);
-TypedStream* objc_open_typed_stream_for_file (const char* file_name, int mode);
-
-void objc_close_typed_stream (TypedStream* stream);
-
-BOOL objc_end_of_typed_stream (TypedStream* stream);
-void objc_flush_typed_stream (TypedStream* stream);
-
-#endif /* not __typedstream_INCLUDE_GNU */
diff --git a/include.new/objformat.h b/include.new/objformat.h
deleted file mode 100644
index e894323..0000000
--- a/include.new/objformat.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 1998 John D. Polstra
- * 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.
- *
- * 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/include/objformat.h,v 1.2 1999/08/27 23:44:51 peter Exp $
- */
-
-#ifndef _OBJFORMAT_H_
-#define _OBJFORMAT_H_
-
-#include <sys/cdefs.h>
-#include <stddef.h>
-
-__BEGIN_DECLS
-int getobjformat(char *, size_t, int *, char **);
-__END_DECLS
-
-#endif /* _OBJFORMAT_H_ */
diff --git a/include.new/ocsp_asn1.h b/include.new/ocsp_asn1.h
deleted file mode 100644
index a900900..0000000
--- a/include.new/ocsp_asn1.h
+++ /dev/null
@@ -1,449 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libhx509/../../../crypto/heimdal/lib/hx509/ocsp.asn1 */
-/* Do not edit */
-
-#ifndef __ocsp_asn1_h__
-#define __ocsp_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <rfc2459_asn1.h>
-/*
-OCSPVersion ::= INTEGER {
-  ocsp_v1(0)
-}
-*/
-
-typedef enum OCSPVersion {
-  ocsp_v1 = 0
-} OCSPVersion;
-
-ASN1EXP int    ASN1CALL decode_OCSPVersion(const unsigned char *, size_t, OCSPVersion *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPVersion(unsigned char *, size_t, const OCSPVersion *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPVersion(const OCSPVersion *);
-ASN1EXP int    ASN1CALL copy_OCSPVersion  (const OCSPVersion *, OCSPVersion *);
-ASN1EXP void   ASN1CALL free_OCSPVersion  (OCSPVersion *);
-
-
-/*
-OCSPCertStatus ::= CHOICE {
-  good            [0] IMPLICIT   NULL,
-  revoked         [1] IMPLICIT SEQUENCE {
-    revocationTime     GeneralizedTime,
-    revocationReason   [0] CRLReason OPTIONAL,
-  },
-  unknown         [2] IMPLICIT   NULL,
-}
-*/
-
-typedef struct OCSPCertStatus {
-  enum {
-    choice_OCSPCertStatus_good = 1,
-    choice_OCSPCertStatus_revoked,
-    choice_OCSPCertStatus_unknown
-  } element;
-  union {
-    int good;
-    struct OCSPCertStatus_revoked {
-      time_t revocationTime;
-      CRLReason *revocationReason;
-    } revoked;
-    int unknown;
-  } u;
-} OCSPCertStatus;
-
-ASN1EXP int    ASN1CALL decode_OCSPCertStatus(const unsigned char *, size_t, OCSPCertStatus *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPCertStatus(unsigned char *, size_t, const OCSPCertStatus *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPCertStatus(const OCSPCertStatus *);
-ASN1EXP int    ASN1CALL copy_OCSPCertStatus  (const OCSPCertStatus *, OCSPCertStatus *);
-ASN1EXP void   ASN1CALL free_OCSPCertStatus  (OCSPCertStatus *);
-
-
-/*
-OCSPCertID ::= SEQUENCE {
-  hashAlgorithm    AlgorithmIdentifier,
-  issuerNameHash   OCTET STRING,
-  issuerKeyHash    OCTET STRING,
-  serialNumber     CertificateSerialNumber,
-}
-*/
-
-typedef struct OCSPCertID {
-  AlgorithmIdentifier hashAlgorithm;
-  heim_octet_string issuerNameHash;
-  heim_octet_string issuerKeyHash;
-  CertificateSerialNumber serialNumber;
-} OCSPCertID;
-
-ASN1EXP int    ASN1CALL decode_OCSPCertID(const unsigned char *, size_t, OCSPCertID *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPCertID(unsigned char *, size_t, const OCSPCertID *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPCertID(const OCSPCertID *);
-ASN1EXP int    ASN1CALL copy_OCSPCertID  (const OCSPCertID *, OCSPCertID *);
-ASN1EXP void   ASN1CALL free_OCSPCertID  (OCSPCertID *);
-
-
-/*
-OCSPSingleResponse ::= SEQUENCE {
-  certID             OCSPCertID,
-  certStatus         OCSPCertStatus,
-  thisUpdate         GeneralizedTime,
-  nextUpdate         [0] GeneralizedTime OPTIONAL,
-  singleExtensions   [1] Extensions OPTIONAL,
-}
-*/
-
-typedef struct OCSPSingleResponse {
-  OCSPCertID certID;
-  OCSPCertStatus certStatus;
-  time_t thisUpdate;
-  time_t *nextUpdate;
-  Extensions *singleExtensions;
-} OCSPSingleResponse;
-
-ASN1EXP int    ASN1CALL decode_OCSPSingleResponse(const unsigned char *, size_t, OCSPSingleResponse *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPSingleResponse(unsigned char *, size_t, const OCSPSingleResponse *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPSingleResponse(const OCSPSingleResponse *);
-ASN1EXP int    ASN1CALL copy_OCSPSingleResponse  (const OCSPSingleResponse *, OCSPSingleResponse *);
-ASN1EXP void   ASN1CALL free_OCSPSingleResponse  (OCSPSingleResponse *);
-
-
-/*
-OCSPInnerRequest ::= SEQUENCE {
-  reqCert                   OCSPCertID,
-  singleRequestExtensions   [0] Extensions OPTIONAL,
-}
-*/
-
-typedef struct OCSPInnerRequest {
-  OCSPCertID reqCert;
-  Extensions *singleRequestExtensions;
-} OCSPInnerRequest;
-
-ASN1EXP int    ASN1CALL decode_OCSPInnerRequest(const unsigned char *, size_t, OCSPInnerRequest *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPInnerRequest(unsigned char *, size_t, const OCSPInnerRequest *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPInnerRequest(const OCSPInnerRequest *);
-ASN1EXP int    ASN1CALL copy_OCSPInnerRequest  (const OCSPInnerRequest *, OCSPInnerRequest *);
-ASN1EXP void   ASN1CALL free_OCSPInnerRequest  (OCSPInnerRequest *);
-
-
-/*
-OCSPTBSRequest ::= SEQUENCE {
-  version             [0] OCSPVersion OPTIONAL,
-  requestorName       [1] GeneralName OPTIONAL,
-  requestList         SEQUENCE OF OCSPInnerRequest,
-  requestExtensions   [2] Extensions OPTIONAL,
-}
-*/
-
-typedef struct OCSPTBSRequest {
-  heim_octet_string _save;
-  OCSPVersion *version;
-  GeneralName *requestorName;
-  struct OCSPTBSRequest_requestList {
-    unsigned int len;
-    OCSPInnerRequest *val;
-  } requestList;
-  Extensions *requestExtensions;
-} OCSPTBSRequest;
-
-ASN1EXP int    ASN1CALL decode_OCSPTBSRequest(const unsigned char *, size_t, OCSPTBSRequest *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPTBSRequest(unsigned char *, size_t, const OCSPTBSRequest *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPTBSRequest(const OCSPTBSRequest *);
-ASN1EXP int    ASN1CALL copy_OCSPTBSRequest  (const OCSPTBSRequest *, OCSPTBSRequest *);
-ASN1EXP void   ASN1CALL free_OCSPTBSRequest  (OCSPTBSRequest *);
-
-
-/*
-OCSPSignature ::= SEQUENCE {
-  signatureAlgorithm   AlgorithmIdentifier,
-  signature              BIT STRING {
-  },
-  certs                [0] SEQUENCE OF Certificate OPTIONAL,
-}
-*/
-
-typedef struct OCSPSignature {
-  AlgorithmIdentifier signatureAlgorithm;
-  heim_bit_string signature;
-  struct OCSPSignature_certs {
-    unsigned int len;
-    Certificate *val;
-  } *certs;
-} OCSPSignature;
-
-ASN1EXP int    ASN1CALL decode_OCSPSignature(const unsigned char *, size_t, OCSPSignature *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPSignature(unsigned char *, size_t, const OCSPSignature *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPSignature(const OCSPSignature *);
-ASN1EXP int    ASN1CALL copy_OCSPSignature  (const OCSPSignature *, OCSPSignature *);
-ASN1EXP void   ASN1CALL free_OCSPSignature  (OCSPSignature *);
-
-
-/*
-OCSPRequest ::= SEQUENCE {
-  tbsRequest          OCSPTBSRequest,
-  optionalSignature   [0] OCSPSignature OPTIONAL,
-}
-*/
-
-typedef struct OCSPRequest {
-  OCSPTBSRequest tbsRequest;
-  OCSPSignature *optionalSignature;
-} OCSPRequest;
-
-ASN1EXP int    ASN1CALL decode_OCSPRequest(const unsigned char *, size_t, OCSPRequest *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPRequest(unsigned char *, size_t, const OCSPRequest *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPRequest(const OCSPRequest *);
-ASN1EXP int    ASN1CALL copy_OCSPRequest  (const OCSPRequest *, OCSPRequest *);
-ASN1EXP void   ASN1CALL free_OCSPRequest  (OCSPRequest *);
-
-
-/*
-OCSPResponseBytes ::= SEQUENCE {
-  responseType      OBJECT IDENTIFIER,
-  response        OCTET STRING,
-}
-*/
-
-typedef struct OCSPResponseBytes {
-  heim_oid responseType;
-  heim_octet_string response;
-} OCSPResponseBytes;
-
-ASN1EXP int    ASN1CALL decode_OCSPResponseBytes(const unsigned char *, size_t, OCSPResponseBytes *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPResponseBytes(unsigned char *, size_t, const OCSPResponseBytes *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPResponseBytes(const OCSPResponseBytes *);
-ASN1EXP int    ASN1CALL copy_OCSPResponseBytes  (const OCSPResponseBytes *, OCSPResponseBytes *);
-ASN1EXP void   ASN1CALL free_OCSPResponseBytes  (OCSPResponseBytes *);
-
-
-/*
-OCSPResponseStatus ::= INTEGER {
-  successful(0),
-  malformedRequest(1),
-  internalError(2),
-  tryLater(3),
-  sigRequired(5),
-  unauthorized(6)
-}
-*/
-
-typedef enum OCSPResponseStatus {
-  successful = 0,
-  malformedRequest = 1,
-  internalError = 2,
-  tryLater = 3,
-  sigRequired = 5,
-  unauthorized = 6
-} OCSPResponseStatus;
-
-ASN1EXP int    ASN1CALL decode_OCSPResponseStatus(const unsigned char *, size_t, OCSPResponseStatus *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPResponseStatus(unsigned char *, size_t, const OCSPResponseStatus *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPResponseStatus(const OCSPResponseStatus *);
-ASN1EXP int    ASN1CALL copy_OCSPResponseStatus  (const OCSPResponseStatus *, OCSPResponseStatus *);
-ASN1EXP void   ASN1CALL free_OCSPResponseStatus  (OCSPResponseStatus *);
-
-
-/*
-OCSPResponse ::= SEQUENCE {
-  responseStatus   OCSPResponseStatus,
-  responseBytes    [0] OCSPResponseBytes OPTIONAL,
-}
-*/
-
-typedef struct OCSPResponse {
-  OCSPResponseStatus responseStatus;
-  OCSPResponseBytes *responseBytes;
-} OCSPResponse;
-
-ASN1EXP int    ASN1CALL decode_OCSPResponse(const unsigned char *, size_t, OCSPResponse *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPResponse(unsigned char *, size_t, const OCSPResponse *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPResponse(const OCSPResponse *);
-ASN1EXP int    ASN1CALL copy_OCSPResponse  (const OCSPResponse *, OCSPResponse *);
-ASN1EXP void   ASN1CALL free_OCSPResponse  (OCSPResponse *);
-
-
-/*
-OCSPKeyHash ::= OCTET STRING
-*/
-
-typedef heim_octet_string OCSPKeyHash;
-
-ASN1EXP int    ASN1CALL decode_OCSPKeyHash(const unsigned char *, size_t, OCSPKeyHash *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPKeyHash(unsigned char *, size_t, const OCSPKeyHash *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPKeyHash(const OCSPKeyHash *);
-ASN1EXP int    ASN1CALL copy_OCSPKeyHash  (const OCSPKeyHash *, OCSPKeyHash *);
-ASN1EXP void   ASN1CALL free_OCSPKeyHash  (OCSPKeyHash *);
-
-
-/*
-OCSPResponderID ::= CHOICE {
-  byName          [1] Name,
-  byKey           [2] OCSPKeyHash,
-}
-*/
-
-typedef struct OCSPResponderID {
-  enum {
-    choice_OCSPResponderID_byName = 1,
-    choice_OCSPResponderID_byKey
-  } element;
-  union {
-    Name byName;
-    OCSPKeyHash byKey;
-  } u;
-} OCSPResponderID;
-
-ASN1EXP int    ASN1CALL decode_OCSPResponderID(const unsigned char *, size_t, OCSPResponderID *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPResponderID(unsigned char *, size_t, const OCSPResponderID *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPResponderID(const OCSPResponderID *);
-ASN1EXP int    ASN1CALL copy_OCSPResponderID  (const OCSPResponderID *, OCSPResponderID *);
-ASN1EXP void   ASN1CALL free_OCSPResponderID  (OCSPResponderID *);
-
-
-/*
-OCSPResponseData ::= SEQUENCE {
-  version              [0] OCSPVersion OPTIONAL,
-  responderID          OCSPResponderID,
-  producedAt           GeneralizedTime,
-  responses            SEQUENCE OF OCSPSingleResponse,
-  responseExtensions   [1] Extensions OPTIONAL,
-}
-*/
-
-typedef struct OCSPResponseData {
-  heim_octet_string _save;
-  OCSPVersion *version;
-  OCSPResponderID responderID;
-  time_t producedAt;
-  struct OCSPResponseData_responses {
-    unsigned int len;
-    OCSPSingleResponse *val;
-  } responses;
-  Extensions *responseExtensions;
-} OCSPResponseData;
-
-ASN1EXP int    ASN1CALL decode_OCSPResponseData(const unsigned char *, size_t, OCSPResponseData *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPResponseData(unsigned char *, size_t, const OCSPResponseData *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPResponseData(const OCSPResponseData *);
-ASN1EXP int    ASN1CALL copy_OCSPResponseData  (const OCSPResponseData *, OCSPResponseData *);
-ASN1EXP void   ASN1CALL free_OCSPResponseData  (OCSPResponseData *);
-
-
-/*
-OCSPBasicOCSPResponse ::= SEQUENCE {
-  tbsResponseData      OCSPResponseData,
-  signatureAlgorithm   AlgorithmIdentifier,
-  signature              BIT STRING {
-  },
-  certs                [0] SEQUENCE OF Certificate OPTIONAL,
-}
-*/
-
-typedef struct OCSPBasicOCSPResponse {
-  OCSPResponseData tbsResponseData;
-  AlgorithmIdentifier signatureAlgorithm;
-  heim_bit_string signature;
-  struct OCSPBasicOCSPResponse_certs {
-    unsigned int len;
-    Certificate *val;
-  } *certs;
-} OCSPBasicOCSPResponse;
-
-ASN1EXP int    ASN1CALL decode_OCSPBasicOCSPResponse(const unsigned char *, size_t, OCSPBasicOCSPResponse *, size_t *);
-ASN1EXP int    ASN1CALL encode_OCSPBasicOCSPResponse(unsigned char *, size_t, const OCSPBasicOCSPResponse *, size_t *);
-ASN1EXP size_t ASN1CALL length_OCSPBasicOCSPResponse(const OCSPBasicOCSPResponse *);
-ASN1EXP int    ASN1CALL copy_OCSPBasicOCSPResponse  (const OCSPBasicOCSPResponse *, OCSPBasicOCSPResponse *);
-ASN1EXP void   ASN1CALL free_OCSPBasicOCSPResponse  (OCSPBasicOCSPResponse *);
-
-
-/* OBJECT IDENTIFIER id-pkix-ocsp ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) pkix-ad(48) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_ocsp;
-#define ASN1_OID_ID_PKIX_OCSP (&asn1_oid_id_pkix_ocsp)
-
-/* OBJECT IDENTIFIER id-pkix-ocsp-basic ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) pkix-ad(48) label-less(1) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_ocsp_basic;
-#define ASN1_OID_ID_PKIX_OCSP_BASIC (&asn1_oid_id_pkix_ocsp_basic)
-
-/* OBJECT IDENTIFIER id-pkix-ocsp-nonce ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) pkix-ad(48) label-less(1) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_ocsp_nonce;
-#define ASN1_OID_ID_PKIX_OCSP_NONCE (&asn1_oid_id_pkix_ocsp_nonce)
-
-#endif /* __ocsp_asn1_h__ */
diff --git a/include.new/omp.h b/include.new/omp.h
deleted file mode 100644
index b6cd0f8..0000000
--- a/include.new/omp.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* Copyright (C) 2005, 2007 Free Software Foundation, Inc.
-   Contributed by Richard Henderson <rth@redhat.com>.
-
-   This file is part of the GNU OpenMP Library (libgomp).
-
-   Libgomp is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
-
-   Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY
-   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-   FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for
-   more details.
-
-   You should have received a copy of the GNU Lesser General Public License 
-   along with libgomp; see the file COPYING.LIB.  If not, write to the
-   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-/* As a special exception, if you link this library with other files, some
-   of which are compiled with GCC, to produce an executable, this library
-   does not by itself cause the resulting executable to be covered by the
-   GNU General Public License.  This exception does not however invalidate
-   any other reasons why the executable file might be covered by the GNU
-   General Public License.  */
-
-#ifndef OMP_H
-#define OMP_H 1
-
-#ifndef _LIBGOMP_OMP_LOCK_DEFINED
-#define _LIBGOMP_OMP_LOCK_DEFINED 1
-/* These two structures get edited by the libgomp build process to 
-   reflect the shape of the two types.  Their internals are private
-   to the library.  */
-
-typedef struct
-{
-  unsigned char _x[4] 
-    __attribute__((__aligned__(4)));
-} omp_lock_t;
-
-typedef struct
-{
-  unsigned char _x[8] 
-    __attribute__((__aligned__(4)));
-} omp_nest_lock_t;
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-# define __GOMP_NOTHROW throw ()
-#else
-# define __GOMP_NOTHROW __attribute__((__nothrow__))
-#endif
-
-extern void omp_set_num_threads (int) __GOMP_NOTHROW;
-extern int omp_get_num_threads (void) __GOMP_NOTHROW;
-extern int omp_get_max_threads (void) __GOMP_NOTHROW;
-extern int omp_get_thread_num (void) __GOMP_NOTHROW;
-extern int omp_get_num_procs (void) __GOMP_NOTHROW;
-
-extern int omp_in_parallel (void) __GOMP_NOTHROW;
-
-extern void omp_set_dynamic (int) __GOMP_NOTHROW;
-extern int omp_get_dynamic (void) __GOMP_NOTHROW;
-
-extern void omp_set_nested (int) __GOMP_NOTHROW;
-extern int omp_get_nested (void) __GOMP_NOTHROW;
-
-extern void omp_init_lock (omp_lock_t *) __GOMP_NOTHROW;
-extern void omp_destroy_lock (omp_lock_t *) __GOMP_NOTHROW;
-extern void omp_set_lock (omp_lock_t *) __GOMP_NOTHROW;
-extern void omp_unset_lock (omp_lock_t *) __GOMP_NOTHROW;
-extern int omp_test_lock (omp_lock_t *) __GOMP_NOTHROW;
-
-extern void omp_init_nest_lock (omp_nest_lock_t *) __GOMP_NOTHROW;
-extern void omp_destroy_nest_lock (omp_nest_lock_t *) __GOMP_NOTHROW;
-extern void omp_set_nest_lock (omp_nest_lock_t *) __GOMP_NOTHROW;
-extern void omp_unset_nest_lock (omp_nest_lock_t *) __GOMP_NOTHROW;
-extern int omp_test_nest_lock (omp_nest_lock_t *) __GOMP_NOTHROW;
-
-extern double omp_get_wtime (void) __GOMP_NOTHROW;
-extern double omp_get_wtick (void) __GOMP_NOTHROW;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* OMP_H */
diff --git a/include.new/openssl/aes.h b/include.new/openssl/aes.h
deleted file mode 100644
index 87bf60f..0000000
--- a/include.new/openssl/aes.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_AES_H
-# define HEADER_AES_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_AES
-#  error AES is disabled.
-# endif
-
-# include <stddef.h>
-
-# define AES_ENCRYPT     1
-# define AES_DECRYPT     0
-
-/*
- * Because array size can't be a const in C, the following two are macros.
- * Both sizes are in bytes.
- */
-# define AES_MAXNR 14
-# define AES_BLOCK_SIZE 16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* This should be a hidden type, but EVP requires that the size be known */
-struct aes_key_st {
-# ifdef AES_LONG
-    unsigned long rd_key[4 * (AES_MAXNR + 1)];
-# else
-    unsigned int rd_key[4 * (AES_MAXNR + 1)];
-# endif
-    int rounds;
-};
-typedef struct aes_key_st AES_KEY;
-
-const char *AES_options(void);
-
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key);
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key);
-
-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                                AES_KEY *key);
-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                                AES_KEY *key);
-
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key);
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-                 const AES_KEY *key);
-
-void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                     const AES_KEY *key, const int enc);
-void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, const int enc);
-void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char *ivec, int *num, const int enc);
-void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                      size_t length, const AES_KEY *key,
-                      unsigned char *ivec, int *num, const int enc);
-void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                      size_t length, const AES_KEY *key,
-                      unsigned char *ivec, int *num, const int enc);
-void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char *ivec, int *num);
-void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        unsigned char ivec[AES_BLOCK_SIZE],
-                        unsigned char ecount_buf[AES_BLOCK_SIZE],
-                        unsigned int *num);
-/* NB: the IV is _two_ blocks long */
-void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, const int enc);
-/* NB: the IV is _four_ blocks long */
-void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                        size_t length, const AES_KEY *key,
-                        const AES_KEY *key2, const unsigned char *ivec,
-                        const int enc);
-
-int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-                 unsigned char *out,
-                 const unsigned char *in, unsigned int inlen);
-int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-                   unsigned char *out,
-                   const unsigned char *in, unsigned int inlen);
-
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif                          /* !HEADER_AES_H */
diff --git a/include.new/openssl/aes_locl.h b/include.new/openssl/aes_locl.h
deleted file mode 100644
index 4184729..0000000
--- a/include.new/openssl/aes_locl.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* crypto/aes/aes.h -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_AES_LOCL_H
-#define HEADER_AES_LOCL_H
-
-#include <openssl/e_os2.h>
-
-#ifdef OPENSSL_NO_AES
-#error AES is disabled.
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#if defined(_MSC_VER) && !defined(_M_IA64) && !defined(OPENSSL_SYS_WINCE)
-# define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
-# define GETU32(p) SWAP(*((u32 *)(p)))
-# define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }
-#else
-# define GETU32(pt) (((u32)(pt)[0] << 24) ^ ((u32)(pt)[1] << 16) ^ ((u32)(pt)[2] <<  8) ^ ((u32)(pt)[3]))
-# define PUTU32(ct, st) { (ct)[0] = (u8)((st) >> 24); (ct)[1] = (u8)((st) >> 16); (ct)[2] = (u8)((st) >>  8); (ct)[3] = (u8)(st); }
-#endif
-
-typedef unsigned long u32;
-typedef unsigned short u16;
-typedef unsigned char u8;
-
-#define MAXKC   (256/32)
-#define MAXKB   (256/8)
-#define MAXNR   14
-
-/* This controls loop-unrolling in aes_core.c */
-#undef FULL_UNROLL
-
-#endif /* !HEADER_AES_LOCL_H */
diff --git a/include.new/openssl/asn1.h b/include.new/openssl/asn1.h
deleted file mode 100644
index 39b7833..0000000
--- a/include.new/openssl/asn1.h
+++ /dev/null
@@ -1,1417 +0,0 @@
-/* crypto/asn1/asn1.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_ASN1_H
-# define HEADER_ASN1_H
-
-# include <time.h>
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/stack.h>
-# include <openssl/safestack.h>
-
-# include <openssl/symhacks.h>
-
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define V_ASN1_UNIVERSAL                0x00
-# define V_ASN1_APPLICATION              0x40
-# define V_ASN1_CONTEXT_SPECIFIC         0x80
-# define V_ASN1_PRIVATE                  0xc0
-
-# define V_ASN1_CONSTRUCTED              0x20
-# define V_ASN1_PRIMITIVE_TAG            0x1f
-# define V_ASN1_PRIMATIVE_TAG            0x1f
-
-# define V_ASN1_APP_CHOOSE               -2/* let the recipient choose */
-# define V_ASN1_OTHER                    -3/* used in ASN1_TYPE */
-# define V_ASN1_ANY                      -4/* used in ASN1 template code */
-
-# define V_ASN1_NEG                      0x100/* negative flag */
-
-# define V_ASN1_UNDEF                    -1
-# define V_ASN1_EOC                      0
-# define V_ASN1_BOOLEAN                  1 /**/
-# define V_ASN1_INTEGER                  2
-# define V_ASN1_NEG_INTEGER              (2 | V_ASN1_NEG)
-# define V_ASN1_BIT_STRING               3
-# define V_ASN1_OCTET_STRING             4
-# define V_ASN1_NULL                     5
-# define V_ASN1_OBJECT                   6
-# define V_ASN1_OBJECT_DESCRIPTOR        7
-# define V_ASN1_EXTERNAL                 8
-# define V_ASN1_REAL                     9
-# define V_ASN1_ENUMERATED               10
-# define V_ASN1_NEG_ENUMERATED           (10 | V_ASN1_NEG)
-# define V_ASN1_UTF8STRING               12
-# define V_ASN1_SEQUENCE                 16
-# define V_ASN1_SET                      17
-# define V_ASN1_NUMERICSTRING            18 /**/
-# define V_ASN1_PRINTABLESTRING          19
-# define V_ASN1_T61STRING                20
-# define V_ASN1_TELETEXSTRING            20/* alias */
-# define V_ASN1_VIDEOTEXSTRING           21 /**/
-# define V_ASN1_IA5STRING                22
-# define V_ASN1_UTCTIME                  23
-# define V_ASN1_GENERALIZEDTIME          24 /**/
-# define V_ASN1_GRAPHICSTRING            25 /**/
-# define V_ASN1_ISO64STRING              26 /**/
-# define V_ASN1_VISIBLESTRING            26/* alias */
-# define V_ASN1_GENERALSTRING            27 /**/
-# define V_ASN1_UNIVERSALSTRING          28 /**/
-# define V_ASN1_BMPSTRING                30
-/* For use with d2i_ASN1_type_bytes() */
-# define B_ASN1_NUMERICSTRING    0x0001
-# define B_ASN1_PRINTABLESTRING  0x0002
-# define B_ASN1_T61STRING        0x0004
-# define B_ASN1_TELETEXSTRING    0x0004
-# define B_ASN1_VIDEOTEXSTRING   0x0008
-# define B_ASN1_IA5STRING        0x0010
-# define B_ASN1_GRAPHICSTRING    0x0020
-# define B_ASN1_ISO64STRING      0x0040
-# define B_ASN1_VISIBLESTRING    0x0040
-# define B_ASN1_GENERALSTRING    0x0080
-# define B_ASN1_UNIVERSALSTRING  0x0100
-# define B_ASN1_OCTET_STRING     0x0200
-# define B_ASN1_BIT_STRING       0x0400
-# define B_ASN1_BMPSTRING        0x0800
-# define B_ASN1_UNKNOWN          0x1000
-# define B_ASN1_UTF8STRING       0x2000
-# define B_ASN1_UTCTIME          0x4000
-# define B_ASN1_GENERALIZEDTIME  0x8000
-# define B_ASN1_SEQUENCE         0x10000
-/* For use with ASN1_mbstring_copy() */
-# define MBSTRING_FLAG           0x1000
-# define MBSTRING_UTF8           (MBSTRING_FLAG)
-# define MBSTRING_ASC            (MBSTRING_FLAG|1)
-# define MBSTRING_BMP            (MBSTRING_FLAG|2)
-# define MBSTRING_UNIV           (MBSTRING_FLAG|4)
-# define SMIME_OLDMIME           0x400
-# define SMIME_CRLFEOL           0x800
-# define SMIME_STREAM            0x1000
-    struct X509_algor_st;
-DECLARE_STACK_OF(X509_ALGOR)
-
-# define DECLARE_ASN1_SET_OF(type)/* filled in by mkstack.pl */
-# define IMPLEMENT_ASN1_SET_OF(type)/* nothing, no longer needed */
-
-/*
- * We MUST make sure that, except for constness, asn1_ctx_st and
- * asn1_const_ctx are exactly the same.  Fortunately, as soon as the old ASN1
- * parsing macros are gone, we can throw this away as well...
- */
-typedef struct asn1_ctx_st {
-    unsigned char *p;           /* work char pointer */
-    int eos;                    /* end of sequence read for indefinite
-                                 * encoding */
-    int error;                  /* error code to use when returning an error */
-    int inf;                    /* constructed if 0x20, indefinite is 0x21 */
-    int tag;                    /* tag from last 'get object' */
-    int xclass;                 /* class from last 'get object' */
-    long slen;                  /* length of last 'get object' */
-    unsigned char *max;         /* largest value of p allowed */
-    unsigned char *q;           /* temporary variable */
-    unsigned char **pp;         /* variable */
-    int line;                   /* used in error processing */
-} ASN1_CTX;
-
-typedef struct asn1_const_ctx_st {
-    const unsigned char *p;     /* work char pointer */
-    int eos;                    /* end of sequence read for indefinite
-                                 * encoding */
-    int error;                  /* error code to use when returning an error */
-    int inf;                    /* constructed if 0x20, indefinite is 0x21 */
-    int tag;                    /* tag from last 'get object' */
-    int xclass;                 /* class from last 'get object' */
-    long slen;                  /* length of last 'get object' */
-    const unsigned char *max;   /* largest value of p allowed */
-    const unsigned char *q;     /* temporary variable */
-    const unsigned char **pp;   /* variable */
-    int line;                   /* used in error processing */
-} ASN1_const_CTX;
-
-/*
- * These are used internally in the ASN1_OBJECT to keep track of whether the
- * names and data need to be free()ed
- */
-# define ASN1_OBJECT_FLAG_DYNAMIC         0x01/* internal use */
-# define ASN1_OBJECT_FLAG_CRITICAL        0x02/* critical x509v3 object id */
-# define ASN1_OBJECT_FLAG_DYNAMIC_STRINGS 0x04/* internal use */
-# define ASN1_OBJECT_FLAG_DYNAMIC_DATA    0x08/* internal use */
-typedef struct asn1_object_st {
-    const char *sn, *ln;
-    int nid;
-    int length;
-    const unsigned char *data;  /* data remains const after init */
-    int flags;                  /* Should we free this one */
-} ASN1_OBJECT;
-
-# define ASN1_STRING_FLAG_BITS_LEFT 0x08/* Set if 0x07 has bits left value */
-/*
- * This indicates that the ASN1_STRING is not a real value but just a place
- * holder for the location where indefinite length constructed data should be
- * inserted in the memory buffer
- */
-# define ASN1_STRING_FLAG_NDEF 0x010
-
-/*
- * This flag is used by the CMS code to indicate that a string is not
- * complete and is a place holder for content when it had all been accessed.
- * The flag will be reset when content has been written to it.
- */
-
-# define ASN1_STRING_FLAG_CONT 0x020
-/*
- * This flag is used by ASN1 code to indicate an ASN1_STRING is an MSTRING
- * type.
- */
-# define ASN1_STRING_FLAG_MSTRING 0x040
-/* This is the base type that holds just about everything :-) */
-struct asn1_string_st {
-    int length;
-    int type;
-    unsigned char *data;
-    /*
-     * The value of the following field depends on the type being held.  It
-     * is mostly being used for BIT_STRING so if the input data has a
-     * non-zero 'unused bits' value, it will be handled correctly
-     */
-    long flags;
-};
-
-/*
- * ASN1_ENCODING structure: this is used to save the received encoding of an
- * ASN1 type. This is useful to get round problems with invalid encodings
- * which can break signatures.
- */
-
-typedef struct ASN1_ENCODING_st {
-    unsigned char *enc;         /* DER encoding */
-    long len;                   /* Length of encoding */
-    int modified;               /* set to 1 if 'enc' is invalid */
-} ASN1_ENCODING;
-
-/* Used with ASN1 LONG type: if a long is set to this it is omitted */
-# define ASN1_LONG_UNDEF 0x7fffffffL
-
-# define STABLE_FLAGS_MALLOC     0x01
-# define STABLE_NO_MASK          0x02
-# define DIRSTRING_TYPE  \
- (B_ASN1_PRINTABLESTRING|B_ASN1_T61STRING|B_ASN1_BMPSTRING|B_ASN1_UTF8STRING)
-# define PKCS9STRING_TYPE (DIRSTRING_TYPE|B_ASN1_IA5STRING)
-
-typedef struct asn1_string_table_st {
-    int nid;
-    long minsize;
-    long maxsize;
-    unsigned long mask;
-    unsigned long flags;
-} ASN1_STRING_TABLE;
-
-DECLARE_STACK_OF(ASN1_STRING_TABLE)
-
-/* size limits: this stuff is taken straight from RFC2459 */
-
-# define ub_name                         32768
-# define ub_common_name                  64
-# define ub_locality_name                128
-# define ub_state_name                   128
-# define ub_organization_name            64
-# define ub_organization_unit_name       64
-# define ub_title                        64
-# define ub_email_address                128
-
-/*
- * Declarations for template structures: for full definitions see asn1t.h
- */
-typedef struct ASN1_TEMPLATE_st ASN1_TEMPLATE;
-typedef struct ASN1_TLC_st ASN1_TLC;
-/* This is just an opaque pointer */
-typedef struct ASN1_VALUE_st ASN1_VALUE;
-
-/* Declare ASN1 functions: the implement macro in in asn1t.h */
-
-# define DECLARE_ASN1_FUNCTIONS(type) DECLARE_ASN1_FUNCTIONS_name(type, type)
-
-# define DECLARE_ASN1_ALLOC_FUNCTIONS(type) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, type)
-
-# define DECLARE_ASN1_FUNCTIONS_name(type, name) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-        DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name)
-
-# define DECLARE_ASN1_FUNCTIONS_fname(type, itname, name) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-        DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name)
-
-# define DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) \
-        type *d2i_##name(type **a, const unsigned char **in, long len); \
-        int i2d_##name(type *a, unsigned char **out); \
-        DECLARE_ASN1_ITEM(itname)
-
-# define DECLARE_ASN1_ENCODE_FUNCTIONS_const(type, name) \
-        type *d2i_##name(type **a, const unsigned char **in, long len); \
-        int i2d_##name(const type *a, unsigned char **out); \
-        DECLARE_ASN1_ITEM(name)
-
-# define DECLARE_ASN1_NDEF_FUNCTION(name) \
-        int i2d_##name##_NDEF(name *a, unsigned char **out);
-
-# define DECLARE_ASN1_FUNCTIONS_const(name) \
-        DECLARE_ASN1_ALLOC_FUNCTIONS(name) \
-        DECLARE_ASN1_ENCODE_FUNCTIONS_const(name, name)
-
-# define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
-        type *name##_new(void); \
-        void name##_free(type *a);
-
-# define DECLARE_ASN1_PRINT_FUNCTION(stname) \
-        DECLARE_ASN1_PRINT_FUNCTION_fname(stname, stname)
-
-# define DECLARE_ASN1_PRINT_FUNCTION_fname(stname, fname) \
-        int fname##_print_ctx(BIO *out, stname *x, int indent, \
-                                         const ASN1_PCTX *pctx);
-
-# define D2I_OF(type) type *(*)(type **,const unsigned char **,long)
-# define I2D_OF(type) int (*)(type *,unsigned char **)
-# define I2D_OF_const(type) int (*)(const type *,unsigned char **)
-
-# define CHECKED_D2I_OF(type, d2i) \
-    ((d2i_of_void*) (1 ? d2i : ((D2I_OF(type))0)))
-# define CHECKED_I2D_OF(type, i2d) \
-    ((i2d_of_void*) (1 ? i2d : ((I2D_OF(type))0)))
-# define CHECKED_NEW_OF(type, xnew) \
-    ((void *(*)(void)) (1 ? xnew : ((type *(*)(void))0)))
-# define CHECKED_PTR_OF(type, p) \
-    ((void*) (1 ? p : (type*)0))
-# define CHECKED_PPTR_OF(type, p) \
-    ((void**) (1 ? p : (type**)0))
-
-# define TYPEDEF_D2I_OF(type) typedef type *d2i_of_##type(type **,const unsigned char **,long)
-# define TYPEDEF_I2D_OF(type) typedef int i2d_of_##type(type *,unsigned char **)
-# define TYPEDEF_D2I2D_OF(type) TYPEDEF_D2I_OF(type); TYPEDEF_I2D_OF(type)
-
-TYPEDEF_D2I2D_OF(void);
-
-/*-
- * The following macros and typedefs allow an ASN1_ITEM
- * to be embedded in a structure and referenced. Since
- * the ASN1_ITEM pointers need to be globally accessible
- * (possibly from shared libraries) they may exist in
- * different forms. On platforms that support it the
- * ASN1_ITEM structure itself will be globally exported.
- * Other platforms will export a function that returns
- * an ASN1_ITEM pointer.
- *
- * To handle both cases transparently the macros below
- * should be used instead of hard coding an ASN1_ITEM
- * pointer in a structure.
- *
- * The structure will look like this:
- *
- * typedef struct SOMETHING_st {
- *      ...
- *      ASN1_ITEM_EXP *iptr;
- *      ...
- * } SOMETHING;
- *
- * It would be initialised as e.g.:
- *
- * SOMETHING somevar = {...,ASN1_ITEM_ref(X509),...};
- *
- * and the actual pointer extracted with:
- *
- * const ASN1_ITEM *it = ASN1_ITEM_ptr(somevar.iptr);
- *
- * Finally an ASN1_ITEM pointer can be extracted from an
- * appropriate reference with: ASN1_ITEM_rptr(X509). This
- * would be used when a function takes an ASN1_ITEM * argument.
- *
- */
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM ASN1_ITEM_EXP;
-
-/* Macro to obtain ASN1_ITEM pointer from exported type */
-#  define ASN1_ITEM_ptr(iptr) (iptr)
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#  define ASN1_ITEM_ref(iptr) (&(iptr##_it))
-
-#  define ASN1_ITEM_rptr(ref) (&(ref##_it))
-
-#  define DECLARE_ASN1_ITEM(name) \
-        OPENSSL_EXTERN const ASN1_ITEM name##_it;
-
-# else
-
-/*
- * Platforms that can't easily handle shared global variables are declared as
- * functions returning ASN1_ITEM pointers.
- */
-
-/* ASN1_ITEM pointer exported type */
-typedef const ASN1_ITEM *ASN1_ITEM_EXP (void);
-
-/* Macro to obtain ASN1_ITEM pointer from exported type */
-#  define ASN1_ITEM_ptr(iptr) (iptr())
-
-/* Macro to include ASN1_ITEM pointer from base type */
-#  define ASN1_ITEM_ref(iptr) (iptr##_it)
-
-#  define ASN1_ITEM_rptr(ref) (ref##_it())
-
-#  define DECLARE_ASN1_ITEM(name) \
-        const ASN1_ITEM * name##_it(void);
-
-# endif
-
-/* Parameters used by ASN1_STRING_print_ex() */
-
-/*
- * These determine which characters to escape: RFC2253 special characters,
- * control characters and MSB set characters
- */
-
-# define ASN1_STRFLGS_ESC_2253           1
-# define ASN1_STRFLGS_ESC_CTRL           2
-# define ASN1_STRFLGS_ESC_MSB            4
-
-/*
- * This flag determines how we do escaping: normally RC2253 backslash only,
- * set this to use backslash and quote.
- */
-
-# define ASN1_STRFLGS_ESC_QUOTE          8
-
-/* These three flags are internal use only. */
-
-/* Character is a valid PrintableString character */
-# define CHARTYPE_PRINTABLESTRING        0x10
-/* Character needs escaping if it is the first character */
-# define CHARTYPE_FIRST_ESC_2253         0x20
-/* Character needs escaping if it is the last character */
-# define CHARTYPE_LAST_ESC_2253          0x40
-
-/*
- * NB the internal flags are safely reused below by flags handled at the top
- * level.
- */
-
-/*
- * If this is set we convert all character strings to UTF8 first
- */
-
-# define ASN1_STRFLGS_UTF8_CONVERT       0x10
-
-/*
- * If this is set we don't attempt to interpret content: just assume all
- * strings are 1 byte per character. This will produce some pretty odd
- * looking output!
- */
-
-# define ASN1_STRFLGS_IGNORE_TYPE        0x20
-
-/* If this is set we include the string type in the output */
-# define ASN1_STRFLGS_SHOW_TYPE          0x40
-
-/*
- * This determines which strings to display and which to 'dump' (hex dump of
- * content octets or DER encoding). We can only dump non character strings or
- * everything. If we don't dump 'unknown' they are interpreted as character
- * strings with 1 octet per character and are subject to the usual escaping
- * options.
- */
-
-# define ASN1_STRFLGS_DUMP_ALL           0x80
-# define ASN1_STRFLGS_DUMP_UNKNOWN       0x100
-
-/*
- * These determine what 'dumping' does, we can dump the content octets or the
- * DER encoding: both use the RFC2253 #XXXXX notation.
- */
-
-# define ASN1_STRFLGS_DUMP_DER           0x200
-
-/*
- * All the string flags consistent with RFC2253, escaping control characters
- * isn't essential in RFC2253 but it is advisable anyway.
- */
-
-# define ASN1_STRFLGS_RFC2253    (ASN1_STRFLGS_ESC_2253 | \
-                                ASN1_STRFLGS_ESC_CTRL | \
-                                ASN1_STRFLGS_ESC_MSB | \
-                                ASN1_STRFLGS_UTF8_CONVERT | \
-                                ASN1_STRFLGS_DUMP_UNKNOWN | \
-                                ASN1_STRFLGS_DUMP_DER)
-
-DECLARE_STACK_OF(ASN1_INTEGER)
-DECLARE_ASN1_SET_OF(ASN1_INTEGER)
-
-DECLARE_STACK_OF(ASN1_GENERALSTRING)
-
-typedef struct asn1_type_st {
-    int type;
-    union {
-        char *ptr;
-        ASN1_BOOLEAN boolean;
-        ASN1_STRING *asn1_string;
-        ASN1_OBJECT *object;
-        ASN1_INTEGER *integer;
-        ASN1_ENUMERATED *enumerated;
-        ASN1_BIT_STRING *bit_string;
-        ASN1_OCTET_STRING *octet_string;
-        ASN1_PRINTABLESTRING *printablestring;
-        ASN1_T61STRING *t61string;
-        ASN1_IA5STRING *ia5string;
-        ASN1_GENERALSTRING *generalstring;
-        ASN1_BMPSTRING *bmpstring;
-        ASN1_UNIVERSALSTRING *universalstring;
-        ASN1_UTCTIME *utctime;
-        ASN1_GENERALIZEDTIME *generalizedtime;
-        ASN1_VISIBLESTRING *visiblestring;
-        ASN1_UTF8STRING *utf8string;
-        /*
-         * set and sequence are left complete and still contain the set or
-         * sequence bytes
-         */
-        ASN1_STRING *set;
-        ASN1_STRING *sequence;
-        ASN1_VALUE *asn1_value;
-    } value;
-} ASN1_TYPE;
-
-DECLARE_STACK_OF(ASN1_TYPE)
-DECLARE_ASN1_SET_OF(ASN1_TYPE)
-
-typedef STACK_OF(ASN1_TYPE) ASN1_SEQUENCE_ANY;
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SEQUENCE_ANY)
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(ASN1_SEQUENCE_ANY, ASN1_SET_ANY)
-
-typedef struct NETSCAPE_X509_st {
-    ASN1_OCTET_STRING *header;
-    X509 *cert;
-} NETSCAPE_X509;
-
-/* This is used to contain a list of bit names */
-typedef struct BIT_STRING_BITNAME_st {
-    int bitnum;
-    const char *lname;
-    const char *sname;
-} BIT_STRING_BITNAME;
-
-# define M_ASN1_STRING_length(x) ((x)->length)
-# define M_ASN1_STRING_length_set(x, n)  ((x)->length = (n))
-# define M_ASN1_STRING_type(x)   ((x)->type)
-# define M_ASN1_STRING_data(x)   ((x)->data)
-
-/* Macros for string operations */
-# define M_ASN1_BIT_STRING_new() (ASN1_BIT_STRING *)\
-                ASN1_STRING_type_new(V_ASN1_BIT_STRING)
-# define M_ASN1_BIT_STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_BIT_STRING_dup(a) (ASN1_BIT_STRING *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_BIT_STRING_cmp(a,b) ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-# define M_ASN1_BIT_STRING_set(a,b,c) ASN1_STRING_set((ASN1_STRING *)a,b,c)
-
-# define M_ASN1_INTEGER_new()    (ASN1_INTEGER *)\
-                ASN1_STRING_type_new(V_ASN1_INTEGER)
-# define M_ASN1_INTEGER_free(a)          ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_INTEGER_dup(a) (ASN1_INTEGER *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_INTEGER_cmp(a,b) ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-# define M_ASN1_ENUMERATED_new() (ASN1_ENUMERATED *)\
-                ASN1_STRING_type_new(V_ASN1_ENUMERATED)
-# define M_ASN1_ENUMERATED_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_ENUMERATED_dup(a) (ASN1_ENUMERATED *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_ENUMERATED_cmp(a,b)      ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-
-# define M_ASN1_OCTET_STRING_new()       (ASN1_OCTET_STRING *)\
-                ASN1_STRING_type_new(V_ASN1_OCTET_STRING)
-# define M_ASN1_OCTET_STRING_free(a)     ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_OCTET_STRING_dup(a) (ASN1_OCTET_STRING *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_ASN1_OCTET_STRING_cmp(a,b) ASN1_STRING_cmp(\
-                (const ASN1_STRING *)a,(const ASN1_STRING *)b)
-# define M_ASN1_OCTET_STRING_set(a,b,c)  ASN1_STRING_set((ASN1_STRING *)a,b,c)
-# define M_ASN1_OCTET_STRING_print(a,b)  ASN1_STRING_print(a,(ASN1_STRING *)b)
-# define M_i2d_ASN1_OCTET_STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_OCTET_STRING,\
-                V_ASN1_UNIVERSAL)
-
-# define B_ASN1_TIME \
-                        B_ASN1_UTCTIME | \
-                        B_ASN1_GENERALIZEDTIME
-
-# define B_ASN1_PRINTABLE \
-                        B_ASN1_NUMERICSTRING| \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_T61STRING| \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_BIT_STRING| \
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING|\
-                        B_ASN1_SEQUENCE|\
-                        B_ASN1_UNKNOWN
-
-# define B_ASN1_DIRECTORYSTRING \
-                        B_ASN1_PRINTABLESTRING| \
-                        B_ASN1_TELETEXSTRING|\
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UNIVERSALSTRING|\
-                        B_ASN1_UTF8STRING
-
-# define B_ASN1_DISPLAYTEXT \
-                        B_ASN1_IA5STRING| \
-                        B_ASN1_VISIBLESTRING| \
-                        B_ASN1_BMPSTRING|\
-                        B_ASN1_UTF8STRING
-
-# define M_ASN1_PRINTABLE_new()  ASN1_STRING_type_new(V_ASN1_T61STRING)
-# define M_ASN1_PRINTABLE_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_PRINTABLE(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                pp,a->type,V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_PRINTABLE(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_PRINTABLE)
-
-# define M_DIRECTORYSTRING_new() ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-# define M_DIRECTORYSTRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_DIRECTORYSTRING(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                                                pp,a->type,V_ASN1_UNIVERSAL)
-# define M_d2i_DIRECTORYSTRING(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_DIRECTORYSTRING)
-
-# define M_DISPLAYTEXT_new() ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-# define M_DISPLAYTEXT_free(a) ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_DISPLAYTEXT(a,pp) i2d_ASN1_bytes((ASN1_STRING *)a,\
-                                                pp,a->type,V_ASN1_UNIVERSAL)
-# define M_d2i_DISPLAYTEXT(a,pp,l) \
-                d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l, \
-                        B_ASN1_DISPLAYTEXT)
-
-# define M_ASN1_PRINTABLESTRING_new() (ASN1_PRINTABLESTRING *)\
-                ASN1_STRING_type_new(V_ASN1_PRINTABLESTRING)
-# define M_ASN1_PRINTABLESTRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_PRINTABLESTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_PRINTABLESTRING,\
-                V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_PRINTABLESTRING(a,pp,l) \
-                (ASN1_PRINTABLESTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_PRINTABLESTRING)
-
-# define M_ASN1_T61STRING_new()  (ASN1_T61STRING *)\
-                ASN1_STRING_type_new(V_ASN1_T61STRING)
-# define M_ASN1_T61STRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_T61STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_T61STRING,\
-                V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_T61STRING(a,pp,l) \
-                (ASN1_T61STRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_T61STRING)
-
-# define M_ASN1_IA5STRING_new()  (ASN1_IA5STRING *)\
-                ASN1_STRING_type_new(V_ASN1_IA5STRING)
-# define M_ASN1_IA5STRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_IA5STRING_dup(a) \
-                (ASN1_IA5STRING *)ASN1_STRING_dup((const ASN1_STRING *)a)
-# define M_i2d_ASN1_IA5STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_IA5STRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_IA5STRING(a,pp,l) \
-                (ASN1_IA5STRING *)d2i_ASN1_type_bytes((ASN1_STRING **)a,pp,l,\
-                        B_ASN1_IA5STRING)
-
-# define M_ASN1_UTCTIME_new()    (ASN1_UTCTIME *)\
-                ASN1_STRING_type_new(V_ASN1_UTCTIME)
-# define M_ASN1_UTCTIME_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_UTCTIME_dup(a) (ASN1_UTCTIME *)\
-                ASN1_STRING_dup((const ASN1_STRING *)a)
-
-# define M_ASN1_GENERALIZEDTIME_new()    (ASN1_GENERALIZEDTIME *)\
-                ASN1_STRING_type_new(V_ASN1_GENERALIZEDTIME)
-# define M_ASN1_GENERALIZEDTIME_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_GENERALIZEDTIME_dup(a) (ASN1_GENERALIZEDTIME *)ASN1_STRING_dup(\
-        (const ASN1_STRING *)a)
-
-# define M_ASN1_TIME_new()       (ASN1_TIME *)\
-                ASN1_STRING_type_new(V_ASN1_UTCTIME)
-# define M_ASN1_TIME_free(a)     ASN1_STRING_free((ASN1_STRING *)a)
-# define M_ASN1_TIME_dup(a) (ASN1_TIME *)\
-        ASN1_STRING_dup((const ASN1_STRING *)a)
-
-# define M_ASN1_GENERALSTRING_new()      (ASN1_GENERALSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_GENERALSTRING)
-# define M_ASN1_GENERALSTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_GENERALSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_GENERALSTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_GENERALSTRING(a,pp,l) \
-                (ASN1_GENERALSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_GENERALSTRING)
-
-# define M_ASN1_UNIVERSALSTRING_new()    (ASN1_UNIVERSALSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_UNIVERSALSTRING)
-# define M_ASN1_UNIVERSALSTRING_free(a)  ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_UNIVERSALSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UNIVERSALSTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_UNIVERSALSTRING(a,pp,l) \
-                (ASN1_UNIVERSALSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_UNIVERSALSTRING)
-
-# define M_ASN1_BMPSTRING_new()  (ASN1_BMPSTRING *)\
-                ASN1_STRING_type_new(V_ASN1_BMPSTRING)
-# define M_ASN1_BMPSTRING_free(a)        ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_BMPSTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_BMPSTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_BMPSTRING(a,pp,l) \
-                (ASN1_BMPSTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_BMPSTRING)
-
-# define M_ASN1_VISIBLESTRING_new()      (ASN1_VISIBLESTRING *)\
-                ASN1_STRING_type_new(V_ASN1_VISIBLESTRING)
-# define M_ASN1_VISIBLESTRING_free(a)    ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_VISIBLESTRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_VISIBLESTRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_VISIBLESTRING(a,pp,l) \
-                (ASN1_VISIBLESTRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_VISIBLESTRING)
-
-# define M_ASN1_UTF8STRING_new() (ASN1_UTF8STRING *)\
-                ASN1_STRING_type_new(V_ASN1_UTF8STRING)
-# define M_ASN1_UTF8STRING_free(a)       ASN1_STRING_free((ASN1_STRING *)a)
-# define M_i2d_ASN1_UTF8STRING(a,pp) \
-                i2d_ASN1_bytes((ASN1_STRING *)a,pp,V_ASN1_UTF8STRING,\
-                        V_ASN1_UNIVERSAL)
-# define M_d2i_ASN1_UTF8STRING(a,pp,l) \
-                (ASN1_UTF8STRING *)d2i_ASN1_type_bytes\
-                ((ASN1_STRING **)a,pp,l,B_ASN1_UTF8STRING)
-
-  /* for the is_set parameter to i2d_ASN1_SET */
-# define IS_SEQUENCE     0
-# define IS_SET          1
-
-DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE)
-
-int ASN1_TYPE_get(ASN1_TYPE *a);
-void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value);
-int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value);
-int ASN1_TYPE_cmp(const ASN1_TYPE *a, const ASN1_TYPE *b);
-
-ASN1_OBJECT *ASN1_OBJECT_new(void);
-void ASN1_OBJECT_free(ASN1_OBJECT *a);
-int i2d_ASN1_OBJECT(ASN1_OBJECT *a, unsigned char **pp);
-ASN1_OBJECT *c2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-                             long length);
-ASN1_OBJECT *d2i_ASN1_OBJECT(ASN1_OBJECT **a, const unsigned char **pp,
-                             long length);
-
-DECLARE_ASN1_ITEM(ASN1_OBJECT)
-
-DECLARE_STACK_OF(ASN1_OBJECT)
-DECLARE_ASN1_SET_OF(ASN1_OBJECT)
-
-ASN1_STRING *ASN1_STRING_new(void);
-void ASN1_STRING_free(ASN1_STRING *a);
-void ASN1_STRING_clear_free(ASN1_STRING *a);
-int ASN1_STRING_copy(ASN1_STRING *dst, const ASN1_STRING *str);
-ASN1_STRING *ASN1_STRING_dup(const ASN1_STRING *a);
-ASN1_STRING *ASN1_STRING_type_new(int type);
-int ASN1_STRING_cmp(const ASN1_STRING *a, const ASN1_STRING *b);
-  /*
-   * Since this is used to store all sorts of things, via macros, for now,
-   * make its data void *
-   */
-int ASN1_STRING_set(ASN1_STRING *str, const void *data, int len);
-void ASN1_STRING_set0(ASN1_STRING *str, void *data, int len);
-int ASN1_STRING_length(const ASN1_STRING *x);
-void ASN1_STRING_length_set(ASN1_STRING *x, int n);
-int ASN1_STRING_type(ASN1_STRING *x);
-unsigned char *ASN1_STRING_data(ASN1_STRING *x);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_BIT_STRING)
-int i2c_ASN1_BIT_STRING(ASN1_BIT_STRING *a, unsigned char **pp);
-ASN1_BIT_STRING *c2i_ASN1_BIT_STRING(ASN1_BIT_STRING **a,
-                                     const unsigned char **pp, long length);
-int ASN1_BIT_STRING_set(ASN1_BIT_STRING *a, unsigned char *d, int length);
-int ASN1_BIT_STRING_set_bit(ASN1_BIT_STRING *a, int n, int value);
-int ASN1_BIT_STRING_get_bit(ASN1_BIT_STRING *a, int n);
-int ASN1_BIT_STRING_check(ASN1_BIT_STRING *a,
-                          unsigned char *flags, int flags_len);
-
-# ifndef OPENSSL_NO_BIO
-int ASN1_BIT_STRING_name_print(BIO *out, ASN1_BIT_STRING *bs,
-                               BIT_STRING_BITNAME *tbl, int indent);
-# endif
-int ASN1_BIT_STRING_num_asc(char *name, BIT_STRING_BITNAME *tbl);
-int ASN1_BIT_STRING_set_asc(ASN1_BIT_STRING *bs, char *name, int value,
-                            BIT_STRING_BITNAME *tbl);
-
-int i2d_ASN1_BOOLEAN(int a, unsigned char **pp);
-int d2i_ASN1_BOOLEAN(int *a, const unsigned char **pp, long length);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_INTEGER)
-int i2c_ASN1_INTEGER(ASN1_INTEGER *a, unsigned char **pp);
-ASN1_INTEGER *c2i_ASN1_INTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                               long length);
-ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INTEGER **a, const unsigned char **pp,
-                                long length);
-ASN1_INTEGER *ASN1_INTEGER_dup(const ASN1_INTEGER *x);
-int ASN1_INTEGER_cmp(const ASN1_INTEGER *x, const ASN1_INTEGER *y);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_ENUMERATED)
-
-int ASN1_UTCTIME_check(ASN1_UTCTIME *a);
-ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t);
-ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
-                               int offset_day, long offset_sec);
-int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
-int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
-# if 0
-time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);
-# endif
-
-int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
-                                               time_t t);
-ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
-                                               time_t t, int offset_day,
-                                               long offset_sec);
-int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_OCTET_STRING)
-ASN1_OCTET_STRING *ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *a);
-int ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a,
-                          const ASN1_OCTET_STRING *b);
-int ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *str, const unsigned char *data,
-                          int len);
-
-DECLARE_ASN1_FUNCTIONS(ASN1_VISIBLESTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UNIVERSALSTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UTF8STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_NULL)
-DECLARE_ASN1_FUNCTIONS(ASN1_BMPSTRING)
-
-int UTF8_getc(const unsigned char *str, int len, unsigned long *val);
-int UTF8_putc(unsigned char *str, int len, unsigned long value);
-
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, ASN1_PRINTABLE)
-
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DIRECTORYSTRING)
-DECLARE_ASN1_FUNCTIONS_name(ASN1_STRING, DISPLAYTEXT)
-DECLARE_ASN1_FUNCTIONS(ASN1_PRINTABLESTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_T61STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_IA5STRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALSTRING)
-DECLARE_ASN1_FUNCTIONS(ASN1_UTCTIME)
-DECLARE_ASN1_FUNCTIONS(ASN1_GENERALIZEDTIME)
-DECLARE_ASN1_FUNCTIONS(ASN1_TIME)
-
-DECLARE_ASN1_ITEM(ASN1_OCTET_STRING_NDEF)
-
-ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t);
-ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
-                         int offset_day, long offset_sec);
-int ASN1_TIME_check(ASN1_TIME *t);
-ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME
-                                                   **out);
-int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
-
-int i2d_ASN1_SET(STACK_OF(OPENSSL_BLOCK) *a, unsigned char **pp,
-                 i2d_of_void *i2d, int ex_tag, int ex_class, int is_set);
-STACK_OF(OPENSSL_BLOCK) *d2i_ASN1_SET(STACK_OF(OPENSSL_BLOCK) **a,
-                                      const unsigned char **pp,
-                                      long length, d2i_of_void *d2i,
-                                      void (*free_func) (OPENSSL_BLOCK),
-                                      int ex_tag, int ex_class);
-
-# ifndef OPENSSL_NO_BIO
-int i2a_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *a);
-int a2i_ASN1_INTEGER(BIO *bp, ASN1_INTEGER *bs, char *buf, int size);
-int i2a_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *a);
-int a2i_ASN1_ENUMERATED(BIO *bp, ASN1_ENUMERATED *bs, char *buf, int size);
-int i2a_ASN1_OBJECT(BIO *bp, ASN1_OBJECT *a);
-int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size);
-int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type);
-# endif
-int i2t_ASN1_OBJECT(char *buf, int buf_len, ASN1_OBJECT *a);
-
-int a2d_ASN1_OBJECT(unsigned char *out, int olen, const char *buf, int num);
-ASN1_OBJECT *ASN1_OBJECT_create(int nid, unsigned char *data, int len,
-                                const char *sn, const char *ln);
-
-int ASN1_INTEGER_set(ASN1_INTEGER *a, long v);
-long ASN1_INTEGER_get(const ASN1_INTEGER *a);
-ASN1_INTEGER *BN_to_ASN1_INTEGER(const BIGNUM *bn, ASN1_INTEGER *ai);
-BIGNUM *ASN1_INTEGER_to_BN(const ASN1_INTEGER *ai, BIGNUM *bn);
-
-int ASN1_ENUMERATED_set(ASN1_ENUMERATED *a, long v);
-long ASN1_ENUMERATED_get(ASN1_ENUMERATED *a);
-ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai);
-BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn);
-
-/* General */
-/* given a string, return the correct type, max is the maximum length */
-int ASN1_PRINTABLE_type(const unsigned char *s, int max);
-
-int i2d_ASN1_bytes(ASN1_STRING *a, unsigned char **pp, int tag, int xclass);
-ASN1_STRING *d2i_ASN1_bytes(ASN1_STRING **a, const unsigned char **pp,
-                            long length, int Ptag, int Pclass);
-unsigned long ASN1_tag2bit(int tag);
-/* type is one or more of the B_ASN1_ values. */
-ASN1_STRING *d2i_ASN1_type_bytes(ASN1_STRING **a, const unsigned char **pp,
-                                 long length, int type);
-
-/* PARSING */
-int asn1_Finish(ASN1_CTX *c);
-int asn1_const_Finish(ASN1_const_CTX *c);
-
-/* SPECIALS */
-int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag,
-                    int *pclass, long omax);
-int ASN1_check_infinite_end(unsigned char **p, long len);
-int ASN1_const_check_infinite_end(const unsigned char **p, long len);
-void ASN1_put_object(unsigned char **pp, int constructed, int length,
-                     int tag, int xclass);
-int ASN1_put_eoc(unsigned char **pp);
-int ASN1_object_size(int constructed, int length, int tag);
-
-/* Used to implement other functions */
-void *ASN1_dup(i2d_of_void *i2d, d2i_of_void *d2i, void *x);
-
-# define ASN1_dup_of(type,i2d,d2i,x) \
-    ((type*)ASN1_dup(CHECKED_I2D_OF(type, i2d), \
-                     CHECKED_D2I_OF(type, d2i), \
-                     CHECKED_PTR_OF(type, x)))
-
-# define ASN1_dup_of_const(type,i2d,d2i,x) \
-    ((type*)ASN1_dup(CHECKED_I2D_OF(const type, i2d), \
-                     CHECKED_D2I_OF(type, d2i), \
-                     CHECKED_PTR_OF(const type, x)))
-
-void *ASN1_item_dup(const ASN1_ITEM *it, void *x);
-
-/* ASN1 alloc/free macros for when a type is only used internally */
-
-# define M_ASN1_new_of(type) (type *)ASN1_item_new(ASN1_ITEM_rptr(type))
-# define M_ASN1_free_of(x, type) \
-                ASN1_item_free(CHECKED_PTR_OF(type, x), ASN1_ITEM_rptr(type))
-
-# ifndef OPENSSL_NO_FP_API
-void *ASN1_d2i_fp(void *(*xnew) (void), d2i_of_void *d2i, FILE *in, void **x);
-
-#  define ASN1_d2i_fp_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_fp(CHECKED_NEW_OF(type, xnew), \
-                        CHECKED_D2I_OF(type, d2i), \
-                        in, \
-                        CHECKED_PPTR_OF(type, x)))
-
-void *ASN1_item_d2i_fp(const ASN1_ITEM *it, FILE *in, void *x);
-int ASN1_i2d_fp(i2d_of_void *i2d, FILE *out, void *x);
-
-#  define ASN1_i2d_fp_of(type,i2d,out,x) \
-    (ASN1_i2d_fp(CHECKED_I2D_OF(type, i2d), \
-                 out, \
-                 CHECKED_PTR_OF(type, x)))
-
-#  define ASN1_i2d_fp_of_const(type,i2d,out,x) \
-    (ASN1_i2d_fp(CHECKED_I2D_OF(const type, i2d), \
-                 out, \
-                 CHECKED_PTR_OF(const type, x)))
-
-int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x);
-int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags);
-# endif
-
-int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in);
-
-# ifndef OPENSSL_NO_BIO
-void *ASN1_d2i_bio(void *(*xnew) (void), d2i_of_void *d2i, BIO *in, void **x);
-
-#  define ASN1_d2i_bio_of(type,xnew,d2i,in,x) \
-    ((type*)ASN1_d2i_bio( CHECKED_NEW_OF(type, xnew), \
-                          CHECKED_D2I_OF(type, d2i), \
-                          in, \
-                          CHECKED_PPTR_OF(type, x)))
-
-void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
-int ASN1_i2d_bio(i2d_of_void *i2d, BIO *out, unsigned char *x);
-
-#  define ASN1_i2d_bio_of(type,i2d,out,x) \
-    (ASN1_i2d_bio(CHECKED_I2D_OF(type, i2d), \
-                  out, \
-                  CHECKED_PTR_OF(type, x)))
-
-#  define ASN1_i2d_bio_of_const(type,i2d,out,x) \
-    (ASN1_i2d_bio(CHECKED_I2D_OF(const type, i2d), \
-                  out, \
-                  CHECKED_PTR_OF(const type, x)))
-
-int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x);
-int ASN1_UTCTIME_print(BIO *fp, const ASN1_UTCTIME *a);
-int ASN1_GENERALIZEDTIME_print(BIO *fp, const ASN1_GENERALIZEDTIME *a);
-int ASN1_TIME_print(BIO *fp, const ASN1_TIME *a);
-int ASN1_STRING_print(BIO *bp, const ASN1_STRING *v);
-int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags);
-int ASN1_bn_print(BIO *bp, const char *number, const BIGNUM *num,
-                  unsigned char *buf, int off);
-int ASN1_parse(BIO *bp, const unsigned char *pp, long len, int indent);
-int ASN1_parse_dump(BIO *bp, const unsigned char *pp, long len, int indent,
-                    int dump);
-# endif
-const char *ASN1_tag2str(int tag);
-
-/* Used to load and write netscape format cert */
-
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_X509)
-
-int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s);
-
-int ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len);
-int ASN1_TYPE_get_octetstring(ASN1_TYPE *a, unsigned char *data, int max_len);
-int ASN1_TYPE_set_int_octetstring(ASN1_TYPE *a, long num,
-                                  unsigned char *data, int len);
-int ASN1_TYPE_get_int_octetstring(ASN1_TYPE *a, long *num,
-                                  unsigned char *data, int max_len);
-
-STACK_OF(OPENSSL_BLOCK) *ASN1_seq_unpack(const unsigned char *buf, int len,
-                                         d2i_of_void *d2i,
-                                         void (*free_func) (OPENSSL_BLOCK));
-unsigned char *ASN1_seq_pack(STACK_OF(OPENSSL_BLOCK) *safes, i2d_of_void *i2d,
-                             unsigned char **buf, int *len);
-void *ASN1_unpack_string(ASN1_STRING *oct, d2i_of_void *d2i);
-void *ASN1_item_unpack(ASN1_STRING *oct, const ASN1_ITEM *it);
-ASN1_STRING *ASN1_pack_string(void *obj, i2d_of_void *i2d,
-                              ASN1_OCTET_STRING **oct);
-
-# define ASN1_pack_string_of(type,obj,i2d,oct) \
-    (ASN1_pack_string(CHECKED_PTR_OF(type, obj), \
-                      CHECKED_I2D_OF(type, i2d), \
-                      oct))
-
-ASN1_STRING *ASN1_item_pack(void *obj, const ASN1_ITEM *it,
-                            ASN1_OCTET_STRING **oct);
-
-void ASN1_STRING_set_default_mask(unsigned long mask);
-int ASN1_STRING_set_default_mask_asc(const char *p);
-unsigned long ASN1_STRING_get_default_mask(void);
-int ASN1_mbstring_copy(ASN1_STRING **out, const unsigned char *in, int len,
-                       int inform, unsigned long mask);
-int ASN1_mbstring_ncopy(ASN1_STRING **out, const unsigned char *in, int len,
-                        int inform, unsigned long mask,
-                        long minsize, long maxsize);
-
-ASN1_STRING *ASN1_STRING_set_by_NID(ASN1_STRING **out,
-                                    const unsigned char *in, int inlen,
-                                    int inform, int nid);
-ASN1_STRING_TABLE *ASN1_STRING_TABLE_get(int nid);
-int ASN1_STRING_TABLE_add(int, long, long, unsigned long, unsigned long);
-void ASN1_STRING_TABLE_cleanup(void);
-
-/* ASN1 template functions */
-
-/* Old API compatible functions */
-ASN1_VALUE *ASN1_item_new(const ASN1_ITEM *it);
-void ASN1_item_free(ASN1_VALUE *val, const ASN1_ITEM *it);
-ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in,
-                          long len, const ASN1_ITEM *it);
-int ASN1_item_i2d(ASN1_VALUE *val, unsigned char **out, const ASN1_ITEM *it);
-int ASN1_item_ndef_i2d(ASN1_VALUE *val, unsigned char **out,
-                       const ASN1_ITEM *it);
-
-void ASN1_add_oid_module(void);
-
-ASN1_TYPE *ASN1_generate_nconf(char *str, CONF *nconf);
-ASN1_TYPE *ASN1_generate_v3(char *str, X509V3_CTX *cnf);
-
-/* ASN1 Print flags */
-
-/* Indicate missing OPTIONAL fields */
-# define ASN1_PCTX_FLAGS_SHOW_ABSENT             0x001
-/* Mark start and end of SEQUENCE */
-# define ASN1_PCTX_FLAGS_SHOW_SEQUENCE           0x002
-/* Mark start and end of SEQUENCE/SET OF */
-# define ASN1_PCTX_FLAGS_SHOW_SSOF               0x004
-/* Show the ASN1 type of primitives */
-# define ASN1_PCTX_FLAGS_SHOW_TYPE               0x008
-/* Don't show ASN1 type of ANY */
-# define ASN1_PCTX_FLAGS_NO_ANY_TYPE             0x010
-/* Don't show ASN1 type of MSTRINGs */
-# define ASN1_PCTX_FLAGS_NO_MSTRING_TYPE         0x020
-/* Don't show field names in SEQUENCE */
-# define ASN1_PCTX_FLAGS_NO_FIELD_NAME           0x040
-/* Show structure names of each SEQUENCE field */
-# define ASN1_PCTX_FLAGS_SHOW_FIELD_STRUCT_NAME  0x080
-/* Don't show structure name even at top level */
-# define ASN1_PCTX_FLAGS_NO_STRUCT_NAME          0x100
-
-int ASN1_item_print(BIO *out, ASN1_VALUE *ifld, int indent,
-                    const ASN1_ITEM *it, const ASN1_PCTX *pctx);
-ASN1_PCTX *ASN1_PCTX_new(void);
-void ASN1_PCTX_free(ASN1_PCTX *p);
-unsigned long ASN1_PCTX_get_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_nm_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_nm_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_cert_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_cert_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_oid_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_oid_flags(ASN1_PCTX *p, unsigned long flags);
-unsigned long ASN1_PCTX_get_str_flags(ASN1_PCTX *p);
-void ASN1_PCTX_set_str_flags(ASN1_PCTX *p, unsigned long flags);
-
-BIO_METHOD *BIO_f_asn1(void);
-
-BIO *BIO_new_NDEF(BIO *out, ASN1_VALUE *val, const ASN1_ITEM *it);
-
-int i2d_ASN1_bio_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                        const ASN1_ITEM *it);
-int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
-                              const char *hdr, const ASN1_ITEM *it);
-int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
-                     int ctype_nid, int econt_nid,
-                     STACK_OF(X509_ALGOR) *mdalgs, const ASN1_ITEM *it);
-ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
-int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
-int SMIME_text(BIO *in, BIO *out);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ASN1_strings(void);
-
-/* Error codes for the ASN1 functions. */
-
-/* Function codes. */
-# define ASN1_F_A2D_ASN1_OBJECT                           100
-# define ASN1_F_A2I_ASN1_ENUMERATED                       101
-# define ASN1_F_A2I_ASN1_INTEGER                          102
-# define ASN1_F_A2I_ASN1_STRING                           103
-# define ASN1_F_APPEND_EXP                                176
-# define ASN1_F_ASN1_BIT_STRING_SET_BIT                   183
-# define ASN1_F_ASN1_CB                                   177
-# define ASN1_F_ASN1_CHECK_TLEN                           104
-# define ASN1_F_ASN1_COLLATE_PRIMITIVE                    105
-# define ASN1_F_ASN1_COLLECT                              106
-# define ASN1_F_ASN1_D2I_EX_PRIMITIVE                     108
-# define ASN1_F_ASN1_D2I_FP                               109
-# define ASN1_F_ASN1_D2I_READ_BIO                         107
-# define ASN1_F_ASN1_DIGEST                               184
-# define ASN1_F_ASN1_DO_ADB                               110
-# define ASN1_F_ASN1_DUP                                  111
-# define ASN1_F_ASN1_ENUMERATED_SET                       112
-# define ASN1_F_ASN1_ENUMERATED_TO_BN                     113
-# define ASN1_F_ASN1_EX_C2I                               204
-# define ASN1_F_ASN1_FIND_END                             190
-# define ASN1_F_ASN1_GENERALIZEDTIME_ADJ                  216
-# define ASN1_F_ASN1_GENERALIZEDTIME_SET                  185
-# define ASN1_F_ASN1_GENERATE_V3                          178
-# define ASN1_F_ASN1_GET_OBJECT                           114
-# define ASN1_F_ASN1_HEADER_NEW                           115
-# define ASN1_F_ASN1_I2D_BIO                              116
-# define ASN1_F_ASN1_I2D_FP                               117
-# define ASN1_F_ASN1_INTEGER_SET                          118
-# define ASN1_F_ASN1_INTEGER_TO_BN                        119
-# define ASN1_F_ASN1_ITEM_D2I_FP                          206
-# define ASN1_F_ASN1_ITEM_DUP                             191
-# define ASN1_F_ASN1_ITEM_EX_COMBINE_NEW                  121
-# define ASN1_F_ASN1_ITEM_EX_D2I                          120
-# define ASN1_F_ASN1_ITEM_I2D_BIO                         192
-# define ASN1_F_ASN1_ITEM_I2D_FP                          193
-# define ASN1_F_ASN1_ITEM_PACK                            198
-# define ASN1_F_ASN1_ITEM_SIGN                            195
-# define ASN1_F_ASN1_ITEM_SIGN_CTX                        220
-# define ASN1_F_ASN1_ITEM_UNPACK                          199
-# define ASN1_F_ASN1_ITEM_VERIFY                          197
-# define ASN1_F_ASN1_MBSTRING_NCOPY                       122
-# define ASN1_F_ASN1_OBJECT_NEW                           123
-# define ASN1_F_ASN1_OUTPUT_DATA                          214
-# define ASN1_F_ASN1_PACK_STRING                          124
-# define ASN1_F_ASN1_PCTX_NEW                             205
-# define ASN1_F_ASN1_PKCS5_PBE_SET                        125
-# define ASN1_F_ASN1_SEQ_PACK                             126
-# define ASN1_F_ASN1_SEQ_UNPACK                           127
-# define ASN1_F_ASN1_SIGN                                 128
-# define ASN1_F_ASN1_STR2TYPE                             179
-# define ASN1_F_ASN1_STRING_SET                           186
-# define ASN1_F_ASN1_STRING_TABLE_ADD                     129
-# define ASN1_F_ASN1_STRING_TYPE_NEW                      130
-# define ASN1_F_ASN1_TEMPLATE_EX_D2I                      132
-# define ASN1_F_ASN1_TEMPLATE_NEW                         133
-# define ASN1_F_ASN1_TEMPLATE_NOEXP_D2I                   131
-# define ASN1_F_ASN1_TIME_ADJ                             217
-# define ASN1_F_ASN1_TIME_SET                             175
-# define ASN1_F_ASN1_TYPE_GET_INT_OCTETSTRING             134
-# define ASN1_F_ASN1_TYPE_GET_OCTETSTRING                 135
-# define ASN1_F_ASN1_UNPACK_STRING                        136
-# define ASN1_F_ASN1_UTCTIME_ADJ                          218
-# define ASN1_F_ASN1_UTCTIME_SET                          187
-# define ASN1_F_ASN1_VERIFY                               137
-# define ASN1_F_B64_READ_ASN1                             209
-# define ASN1_F_B64_WRITE_ASN1                            210
-# define ASN1_F_BIO_NEW_NDEF                              208
-# define ASN1_F_BITSTR_CB                                 180
-# define ASN1_F_BN_TO_ASN1_ENUMERATED                     138
-# define ASN1_F_BN_TO_ASN1_INTEGER                        139
-# define ASN1_F_C2I_ASN1_BIT_STRING                       189
-# define ASN1_F_C2I_ASN1_INTEGER                          194
-# define ASN1_F_C2I_ASN1_OBJECT                           196
-# define ASN1_F_COLLECT_DATA                              140
-# define ASN1_F_D2I_ASN1_BIT_STRING                       141
-# define ASN1_F_D2I_ASN1_BOOLEAN                          142
-# define ASN1_F_D2I_ASN1_BYTES                            143
-# define ASN1_F_D2I_ASN1_GENERALIZEDTIME                  144
-# define ASN1_F_D2I_ASN1_HEADER                           145
-# define ASN1_F_D2I_ASN1_INTEGER                          146
-# define ASN1_F_D2I_ASN1_OBJECT                           147
-# define ASN1_F_D2I_ASN1_SET                              148
-# define ASN1_F_D2I_ASN1_TYPE_BYTES                       149
-# define ASN1_F_D2I_ASN1_UINTEGER                         150
-# define ASN1_F_D2I_ASN1_UTCTIME                          151
-# define ASN1_F_D2I_AUTOPRIVATEKEY                        207
-# define ASN1_F_D2I_NETSCAPE_RSA                          152
-# define ASN1_F_D2I_NETSCAPE_RSA_2                        153
-# define ASN1_F_D2I_PRIVATEKEY                            154
-# define ASN1_F_D2I_PUBLICKEY                             155
-# define ASN1_F_D2I_RSA_NET                               200
-# define ASN1_F_D2I_RSA_NET_2                             201
-# define ASN1_F_D2I_X509                                  156
-# define ASN1_F_D2I_X509_CINF                             157
-# define ASN1_F_D2I_X509_PKEY                             159
-# define ASN1_F_I2D_ASN1_BIO_STREAM                       211
-# define ASN1_F_I2D_ASN1_SET                              188
-# define ASN1_F_I2D_ASN1_TIME                             160
-# define ASN1_F_I2D_DSA_PUBKEY                            161
-# define ASN1_F_I2D_EC_PUBKEY                             181
-# define ASN1_F_I2D_PRIVATEKEY                            163
-# define ASN1_F_I2D_PUBLICKEY                             164
-# define ASN1_F_I2D_RSA_NET                               162
-# define ASN1_F_I2D_RSA_PUBKEY                            165
-# define ASN1_F_LONG_C2I                                  166
-# define ASN1_F_OID_MODULE_INIT                           174
-# define ASN1_F_PARSE_TAGGING                             182
-# define ASN1_F_PKCS5_PBE2_SET_IV                         167
-# define ASN1_F_PKCS5_PBE_SET                             202
-# define ASN1_F_PKCS5_PBE_SET0_ALGOR                      215
-# define ASN1_F_PKCS5_PBKDF2_SET                          219
-# define ASN1_F_SMIME_READ_ASN1                           212
-# define ASN1_F_SMIME_TEXT                                213
-# define ASN1_F_X509_CINF_NEW                             168
-# define ASN1_F_X509_CRL_ADD0_REVOKED                     169
-# define ASN1_F_X509_INFO_NEW                             170
-# define ASN1_F_X509_NAME_ENCODE                          203
-# define ASN1_F_X509_NAME_EX_D2I                          158
-# define ASN1_F_X509_NAME_EX_NEW                          171
-# define ASN1_F_X509_NEW                                  172
-# define ASN1_F_X509_PKEY_NEW                             173
-
-/* Reason codes. */
-# define ASN1_R_ADDING_OBJECT                             171
-# define ASN1_R_ASN1_PARSE_ERROR                          203
-# define ASN1_R_ASN1_SIG_PARSE_ERROR                      204
-# define ASN1_R_AUX_ERROR                                 100
-# define ASN1_R_BAD_CLASS                                 101
-# define ASN1_R_BAD_OBJECT_HEADER                         102
-# define ASN1_R_BAD_PASSWORD_READ                         103
-# define ASN1_R_BAD_TAG                                   104
-# define ASN1_R_BMPSTRING_IS_WRONG_LENGTH                 214
-# define ASN1_R_BN_LIB                                    105
-# define ASN1_R_BOOLEAN_IS_WRONG_LENGTH                   106
-# define ASN1_R_BUFFER_TOO_SMALL                          107
-# define ASN1_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER           108
-# define ASN1_R_CONTEXT_NOT_INITIALISED                   217
-# define ASN1_R_DATA_IS_WRONG                             109
-# define ASN1_R_DECODE_ERROR                              110
-# define ASN1_R_DECODING_ERROR                            111
-# define ASN1_R_DEPTH_EXCEEDED                            174
-# define ASN1_R_DIGEST_AND_KEY_TYPE_NOT_SUPPORTED         198
-# define ASN1_R_ENCODE_ERROR                              112
-# define ASN1_R_ERROR_GETTING_TIME                        173
-# define ASN1_R_ERROR_LOADING_SECTION                     172
-# define ASN1_R_ERROR_PARSING_SET_ELEMENT                 113
-# define ASN1_R_ERROR_SETTING_CIPHER_PARAMS               114
-# define ASN1_R_EXPECTING_AN_INTEGER                      115
-# define ASN1_R_EXPECTING_AN_OBJECT                       116
-# define ASN1_R_EXPECTING_A_BOOLEAN                       117
-# define ASN1_R_EXPECTING_A_TIME                          118
-# define ASN1_R_EXPLICIT_LENGTH_MISMATCH                  119
-# define ASN1_R_EXPLICIT_TAG_NOT_CONSTRUCTED              120
-# define ASN1_R_FIELD_MISSING                             121
-# define ASN1_R_FIRST_NUM_TOO_LARGE                       122
-# define ASN1_R_HEADER_TOO_LONG                           123
-# define ASN1_R_ILLEGAL_BITSTRING_FORMAT                  175
-# define ASN1_R_ILLEGAL_BOOLEAN                           176
-# define ASN1_R_ILLEGAL_CHARACTERS                        124
-# define ASN1_R_ILLEGAL_FORMAT                            177
-# define ASN1_R_ILLEGAL_HEX                               178
-# define ASN1_R_ILLEGAL_IMPLICIT_TAG                      179
-# define ASN1_R_ILLEGAL_INTEGER                           180
-# define ASN1_R_ILLEGAL_NESTED_TAGGING                    181
-# define ASN1_R_ILLEGAL_NULL                              125
-# define ASN1_R_ILLEGAL_NULL_VALUE                        182
-# define ASN1_R_ILLEGAL_OBJECT                            183
-# define ASN1_R_ILLEGAL_OPTIONAL_ANY                      126
-# define ASN1_R_ILLEGAL_OPTIONS_ON_ITEM_TEMPLATE          170
-# define ASN1_R_ILLEGAL_TAGGED_ANY                        127
-# define ASN1_R_ILLEGAL_TIME_VALUE                        184
-# define ASN1_R_INTEGER_NOT_ASCII_FORMAT                  185
-# define ASN1_R_INTEGER_TOO_LARGE_FOR_LONG                128
-# define ASN1_R_INVALID_BIT_STRING_BITS_LEFT              220
-# define ASN1_R_INVALID_BMPSTRING_LENGTH                  129
-# define ASN1_R_INVALID_DIGIT                             130
-# define ASN1_R_INVALID_MIME_TYPE                         205
-# define ASN1_R_INVALID_MODIFIER                          186
-# define ASN1_R_INVALID_NUMBER                            187
-# define ASN1_R_INVALID_OBJECT_ENCODING                   216
-# define ASN1_R_INVALID_SEPARATOR                         131
-# define ASN1_R_INVALID_TIME_FORMAT                       132
-# define ASN1_R_INVALID_UNIVERSALSTRING_LENGTH            133
-# define ASN1_R_INVALID_UTF8STRING                        134
-# define ASN1_R_IV_TOO_LARGE                              135
-# define ASN1_R_LENGTH_ERROR                              136
-# define ASN1_R_LIST_ERROR                                188
-# define ASN1_R_MIME_NO_CONTENT_TYPE                      206
-# define ASN1_R_MIME_PARSE_ERROR                          207
-# define ASN1_R_MIME_SIG_PARSE_ERROR                      208
-# define ASN1_R_MISSING_EOC                               137
-# define ASN1_R_MISSING_SECOND_NUMBER                     138
-# define ASN1_R_MISSING_VALUE                             189
-# define ASN1_R_MSTRING_NOT_UNIVERSAL                     139
-# define ASN1_R_MSTRING_WRONG_TAG                         140
-# define ASN1_R_NESTED_ASN1_STRING                        197
-# define ASN1_R_NON_HEX_CHARACTERS                        141
-# define ASN1_R_NOT_ASCII_FORMAT                          190
-# define ASN1_R_NOT_ENOUGH_DATA                           142
-# define ASN1_R_NO_CONTENT_TYPE                           209
-# define ASN1_R_NO_DEFAULT_DIGEST                         201
-# define ASN1_R_NO_MATCHING_CHOICE_TYPE                   143
-# define ASN1_R_NO_MULTIPART_BODY_FAILURE                 210
-# define ASN1_R_NO_MULTIPART_BOUNDARY                     211
-# define ASN1_R_NO_SIG_CONTENT_TYPE                       212
-# define ASN1_R_NULL_IS_WRONG_LENGTH                      144
-# define ASN1_R_OBJECT_NOT_ASCII_FORMAT                   191
-# define ASN1_R_ODD_NUMBER_OF_CHARS                       145
-# define ASN1_R_PRIVATE_KEY_HEADER_MISSING                146
-# define ASN1_R_SECOND_NUMBER_TOO_LARGE                   147
-# define ASN1_R_SEQUENCE_LENGTH_MISMATCH                  148
-# define ASN1_R_SEQUENCE_NOT_CONSTRUCTED                  149
-# define ASN1_R_SEQUENCE_OR_SET_NEEDS_CONFIG              192
-# define ASN1_R_SHORT_LINE                                150
-# define ASN1_R_SIG_INVALID_MIME_TYPE                     213
-# define ASN1_R_STREAMING_NOT_SUPPORTED                   202
-# define ASN1_R_STRING_TOO_LONG                           151
-# define ASN1_R_STRING_TOO_SHORT                          152
-# define ASN1_R_TAG_VALUE_TOO_HIGH                        153
-# define ASN1_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 154
-# define ASN1_R_TIME_NOT_ASCII_FORMAT                     193
-# define ASN1_R_TOO_LONG                                  155
-# define ASN1_R_TYPE_NOT_CONSTRUCTED                      156
-# define ASN1_R_TYPE_NOT_PRIMITIVE                        218
-# define ASN1_R_UNABLE_TO_DECODE_RSA_KEY                  157
-# define ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY          158
-# define ASN1_R_UNEXPECTED_EOC                            159
-# define ASN1_R_UNIVERSALSTRING_IS_WRONG_LENGTH           215
-# define ASN1_R_UNKNOWN_FORMAT                            160
-# define ASN1_R_UNKNOWN_MESSAGE_DIGEST_ALGORITHM          161
-# define ASN1_R_UNKNOWN_OBJECT_TYPE                       162
-# define ASN1_R_UNKNOWN_PUBLIC_KEY_TYPE                   163
-# define ASN1_R_UNKNOWN_SIGNATURE_ALGORITHM               199
-# define ASN1_R_UNKNOWN_TAG                               194
-# define ASN1_R_UNKOWN_FORMAT                             195
-# define ASN1_R_UNSUPPORTED_ANY_DEFINED_BY_TYPE           164
-# define ASN1_R_UNSUPPORTED_CIPHER                        165
-# define ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM          166
-# define ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE               167
-# define ASN1_R_UNSUPPORTED_TYPE                          196
-# define ASN1_R_WRONG_PUBLIC_KEY_TYPE                     200
-# define ASN1_R_WRONG_TAG                                 168
-# define ASN1_R_WRONG_TYPE                                169
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/asn1_mac.h b/include.new/openssl/asn1_mac.h
deleted file mode 100644
index abc6dc3..0000000
--- a/include.new/openssl/asn1_mac.h
+++ /dev/null
@@ -1,579 +0,0 @@
-/* crypto/asn1/asn1_mac.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_ASN1_MAC_H
-# define HEADER_ASN1_MAC_H
-
-# include <openssl/asn1.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifndef ASN1_MAC_ERR_LIB
-#  define ASN1_MAC_ERR_LIB        ERR_LIB_ASN1
-# endif
-
-# define ASN1_MAC_H_err(f,r,line) \
-        ERR_PUT_error(ASN1_MAC_ERR_LIB,(f),(r),__FILE__,(line))
-
-# define M_ASN1_D2I_vars(a,type,func) \
-        ASN1_const_CTX c; \
-        type ret=NULL; \
-        \
-        c.pp=(const unsigned char **)pp; \
-        c.q= *(const unsigned char **)pp; \
-        c.error=ERR_R_NESTED_ASN1_ERROR; \
-        if ((a == NULL) || ((*a) == NULL)) \
-                { if ((ret=(type)func()) == NULL) \
-                        { c.line=__LINE__; goto err; } } \
-        else    ret=(*a);
-
-# define M_ASN1_D2I_Init() \
-        c.p= *(const unsigned char **)pp; \
-        c.max=(length == 0)?0:(c.p+length);
-
-# define M_ASN1_D2I_Finish_2(a) \
-        if (!asn1_const_Finish(&c)) \
-                { c.line=__LINE__; goto err; } \
-        *(const unsigned char **)pp=c.p; \
-        if (a != NULL) (*a)=ret; \
-        return(ret);
-
-# define M_ASN1_D2I_Finish(a,func,e) \
-        M_ASN1_D2I_Finish_2(a); \
-err:\
-        ASN1_MAC_H_err((e),c.error,c.line); \
-        asn1_add_error(*(const unsigned char **)pp,(int)(c.q- *pp)); \
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) func(ret); \
-        return(NULL)
-
-# define M_ASN1_D2I_start_sequence() \
-        if (!asn1_GetSequence(&c,&length)) \
-                { c.line=__LINE__; goto err; }
-/* Begin reading ASN1 without a surrounding sequence */
-# define M_ASN1_D2I_begin() \
-        c.slen = length;
-
-/* End reading ASN1 with no check on length */
-# define M_ASN1_D2I_Finish_nolen(a, func, e) \
-        *pp=c.p; \
-        if (a != NULL) (*a)=ret; \
-        return(ret); \
-err:\
-        ASN1_MAC_H_err((e),c.error,c.line); \
-        asn1_add_error(*pp,(int)(c.q- *pp)); \
-        if ((ret != NULL) && ((a == NULL) || (*a != ret))) func(ret); \
-        return(NULL)
-
-# define M_ASN1_D2I_end_sequence() \
-        (((c.inf&1) == 0)?(c.slen <= 0): \
-                (c.eos=ASN1_const_check_infinite_end(&c.p,c.slen)))
-
-/* Don't use this with d2i_ASN1_BOOLEAN() */
-# define M_ASN1_D2I_get(b, func) \
-        c.q=c.p; \
-        if (func(&(b),&c.p,c.slen) == NULL) \
-                {c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-/* Don't use this with d2i_ASN1_BOOLEAN() */
-# define M_ASN1_D2I_get_x(type,b,func) \
-        c.q=c.p; \
-        if (((D2I_OF(type))func)(&(b),&c.p,c.slen) == NULL) \
-                {c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-/* use this instead () */
-# define M_ASN1_D2I_get_int(b,func) \
-        c.q=c.p; \
-        if (func(&(b),&c.p,c.slen) < 0) \
-                {c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-# define M_ASN1_D2I_get_opt(b,func,type) \
-        if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) \
-                == (V_ASN1_UNIVERSAL|(type)))) \
-                { \
-                M_ASN1_D2I_get(b,func); \
-                }
-
-# define M_ASN1_D2I_get_int_opt(b,func,type) \
-        if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) \
-                == (V_ASN1_UNIVERSAL|(type)))) \
-                { \
-                M_ASN1_D2I_get_int(b,func); \
-                }
-
-# define M_ASN1_D2I_get_imp(b,func, type) \
-        M_ASN1_next=(_tmp& V_ASN1_CONSTRUCTED)|type; \
-        c.q=c.p; \
-        if (func(&(b),&c.p,c.slen) == NULL) \
-                {c.line=__LINE__; M_ASN1_next_prev = _tmp; goto err; } \
-        c.slen-=(c.p-c.q);\
-        M_ASN1_next_prev=_tmp;
-
-# define M_ASN1_D2I_get_IMP_opt(b,func,tag,type) \
-        if ((c.slen != 0) && ((M_ASN1_next & (~V_ASN1_CONSTRUCTED)) == \
-                (V_ASN1_CONTEXT_SPECIFIC|(tag)))) \
-                { \
-                unsigned char _tmp = M_ASN1_next; \
-                M_ASN1_D2I_get_imp(b,func, type);\
-                }
-
-# define M_ASN1_D2I_get_set(r,func,free_func) \
-                M_ASN1_D2I_get_imp_set(r,func,free_func, \
-                        V_ASN1_SET,V_ASN1_UNIVERSAL);
-
-# define M_ASN1_D2I_get_set_type(type,r,func,free_func) \
-                M_ASN1_D2I_get_imp_set_type(type,r,func,free_func, \
-                        V_ASN1_SET,V_ASN1_UNIVERSAL);
-
-# define M_ASN1_D2I_get_set_opt(r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
-                { M_ASN1_D2I_get_set(r,func,free_func); }
-
-# define M_ASN1_D2I_get_set_opt_type(type,r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SET)))\
-                { M_ASN1_D2I_get_set_type(type,r,func,free_func); }
-
-# define M_ASN1_I2D_len_SET_opt(a,f) \
-        if ((a != NULL) && (sk_num(a) != 0)) \
-                M_ASN1_I2D_len_SET(a,f);
-
-# define M_ASN1_I2D_put_SET_opt(a,f) \
-        if ((a != NULL) && (sk_num(a) != 0)) \
-                M_ASN1_I2D_put_SET(a,f);
-
-# define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
-        if ((a != NULL) && (sk_num(a) != 0)) \
-                M_ASN1_I2D_put_SEQUENCE(a,f);
-
-# define M_ASN1_I2D_put_SEQUENCE_opt_type(type,a,f) \
-        if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                M_ASN1_I2D_put_SEQUENCE_type(type,a,f);
-
-# define M_ASN1_D2I_get_IMP_set_opt(b,func,free_func,tag) \
-        if ((c.slen != 0) && \
-                (M_ASN1_next == \
-                (V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
-                { \
-                M_ASN1_D2I_get_imp_set(b,func,free_func,\
-                        tag,V_ASN1_CONTEXT_SPECIFIC); \
-                }
-
-# define M_ASN1_D2I_get_IMP_set_opt_type(type,b,func,free_func,tag) \
-        if ((c.slen != 0) && \
-                (M_ASN1_next == \
-                (V_ASN1_CONTEXT_SPECIFIC|V_ASN1_CONSTRUCTED|(tag))))\
-                { \
-                M_ASN1_D2I_get_imp_set_type(type,b,func,free_func,\
-                        tag,V_ASN1_CONTEXT_SPECIFIC); \
-                }
-
-# define M_ASN1_D2I_get_seq(r,func,free_func) \
-                M_ASN1_D2I_get_imp_set(r,func,free_func,\
-                        V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL);
-
-# define M_ASN1_D2I_get_seq_type(type,r,func,free_func) \
-                M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
-                                            V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
-
-# define M_ASN1_D2I_get_seq_opt(r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
-                { M_ASN1_D2I_get_seq(r,func,free_func); }
-
-# define M_ASN1_D2I_get_seq_opt_type(type,r,func,free_func) \
-        if ((c.slen != 0) && (M_ASN1_next == (V_ASN1_UNIVERSAL| \
-                V_ASN1_CONSTRUCTED|V_ASN1_SEQUENCE)))\
-                { M_ASN1_D2I_get_seq_type(type,r,func,free_func); }
-
-# define M_ASN1_D2I_get_IMP_set(r,func,free_func,x) \
-                M_ASN1_D2I_get_imp_set(r,func,free_func,\
-                        x,V_ASN1_CONTEXT_SPECIFIC);
-
-# define M_ASN1_D2I_get_IMP_set_type(type,r,func,free_func,x) \
-                M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,\
-                        x,V_ASN1_CONTEXT_SPECIFIC);
-
-# define M_ASN1_D2I_get_imp_set(r,func,free_func,a,b) \
-        c.q=c.p; \
-        if (d2i_ASN1_SET(&(r),&c.p,c.slen,(char *(*)())func,\
-                (void (*)())free_func,a,b) == NULL) \
-                { c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-# define M_ASN1_D2I_get_imp_set_type(type,r,func,free_func,a,b) \
-        c.q=c.p; \
-        if (d2i_ASN1_SET_OF_##type(&(r),&c.p,c.slen,func,\
-                                   free_func,a,b) == NULL) \
-                { c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-# define M_ASN1_D2I_get_set_strings(r,func,a,b) \
-        c.q=c.p; \
-        if (d2i_ASN1_STRING_SET(&(r),&c.p,c.slen,a,b) == NULL) \
-                { c.line=__LINE__; goto err; } \
-        c.slen-=(c.p-c.q);
-
-# define M_ASN1_D2I_get_EXP_opt(r,func,tag) \
-        if ((c.slen != 0L) && (M_ASN1_next == \
-                (V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-                { \
-                int Tinf,Ttag,Tclass; \
-                long Tlen; \
-                \
-                c.q=c.p; \
-                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-                if (Tinf & 0x80) \
-                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-                        c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-                                        Tlen = c.slen - (c.p - c.q) - 2; \
-                if (func(&(r),&c.p,Tlen) == NULL) \
-                        { c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-                        Tlen = c.slen - (c.p - c.q); \
-                        if(!ASN1_const_check_infinite_end(&c.p, Tlen)) \
-                                { c.error=ERR_R_MISSING_ASN1_EOS; \
-                                c.line=__LINE__; goto err; } \
-                }\
-                c.slen-=(c.p-c.q); \
-                }
-
-# define M_ASN1_D2I_get_EXP_set_opt(r,func,free_func,tag,b) \
-        if ((c.slen != 0) && (M_ASN1_next == \
-                (V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-                { \
-                int Tinf,Ttag,Tclass; \
-                long Tlen; \
-                \
-                c.q=c.p; \
-                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-                if (Tinf & 0x80) \
-                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-                        c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-                                        Tlen = c.slen - (c.p - c.q) - 2; \
-                if (d2i_ASN1_SET(&(r),&c.p,Tlen,(char *(*)())func, \
-                        (void (*)())free_func, \
-                        b,V_ASN1_UNIVERSAL) == NULL) \
-                        { c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-                        Tlen = c.slen - (c.p - c.q); \
-                        if(!ASN1_check_infinite_end(&c.p, Tlen)) \
-                                { c.error=ERR_R_MISSING_ASN1_EOS; \
-                                c.line=__LINE__; goto err; } \
-                }\
-                c.slen-=(c.p-c.q); \
-                }
-
-# define M_ASN1_D2I_get_EXP_set_opt_type(type,r,func,free_func,tag,b) \
-        if ((c.slen != 0) && (M_ASN1_next == \
-                (V_ASN1_CONSTRUCTED|V_ASN1_CONTEXT_SPECIFIC|tag))) \
-                { \
-                int Tinf,Ttag,Tclass; \
-                long Tlen; \
-                \
-                c.q=c.p; \
-                Tinf=ASN1_get_object(&c.p,&Tlen,&Ttag,&Tclass,c.slen); \
-                if (Tinf & 0x80) \
-                        { c.error=ERR_R_BAD_ASN1_OBJECT_HEADER; \
-                        c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) \
-                                        Tlen = c.slen - (c.p - c.q) - 2; \
-                if (d2i_ASN1_SET_OF_##type(&(r),&c.p,Tlen,func, \
-                        free_func,b,V_ASN1_UNIVERSAL) == NULL) \
-                        { c.line=__LINE__; goto err; } \
-                if (Tinf == (V_ASN1_CONSTRUCTED+1)) { \
-                        Tlen = c.slen - (c.p - c.q); \
-                        if(!ASN1_check_infinite_end(&c.p, Tlen)) \
-                                { c.error=ERR_R_MISSING_ASN1_EOS; \
-                                c.line=__LINE__; goto err; } \
-                }\
-                c.slen-=(c.p-c.q); \
-                }
-
-/* New macros */
-# define M_ASN1_New_Malloc(ret,type) \
-        if ((ret=(type *)OPENSSL_malloc(sizeof(type))) == NULL) \
-                { c.line=__LINE__; goto err2; }
-
-# define M_ASN1_New(arg,func) \
-        if (((arg)=func()) == NULL) return(NULL)
-
-# define M_ASN1_New_Error(a) \
-/*-     err:    ASN1_MAC_H_err((a),ERR_R_NESTED_ASN1_ERROR,c.line); \
-                return(NULL);*/ \
-        err2:   ASN1_MAC_H_err((a),ERR_R_MALLOC_FAILURE,c.line); \
-                return(NULL)
-
-/*
- * BIG UGLY WARNING! This is so damn ugly I wanna puke.  Unfortunately, some
- * macros that use ASN1_const_CTX still insist on writing in the input
- * stream.  ARGH! ARGH! ARGH! Let's get rid of this macro package. Please? --
- * Richard Levitte
- */
-# define M_ASN1_next             (*((unsigned char *)(c.p)))
-# define M_ASN1_next_prev        (*((unsigned char *)(c.q)))
-
-/*************************************************/
-
-# define M_ASN1_I2D_vars(a)      int r=0,ret=0; \
-                                unsigned char *p; \
-                                if (a == NULL) return(0)
-
-/* Length Macros */
-# define M_ASN1_I2D_len(a,f)     ret+=f(a,NULL)
-# define M_ASN1_I2D_len_IMP_opt(a,f)     if (a != NULL) M_ASN1_I2D_len(a,f)
-
-# define M_ASN1_I2D_len_SET(a,f) \
-                ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET);
-
-# define M_ASN1_I2D_len_SET_type(type,a,f) \
-                ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SET, \
-                                            V_ASN1_UNIVERSAL,IS_SET);
-
-# define M_ASN1_I2D_len_SEQUENCE(a,f) \
-                ret+=i2d_ASN1_SET(a,NULL,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
-                                  IS_SEQUENCE);
-
-# define M_ASN1_I2D_len_SEQUENCE_type(type,a,f) \
-                ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,V_ASN1_SEQUENCE, \
-                                            V_ASN1_UNIVERSAL,IS_SEQUENCE)
-
-# define M_ASN1_I2D_len_SEQUENCE_opt(a,f) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        M_ASN1_I2D_len_SEQUENCE(a,f);
-
-# define M_ASN1_I2D_len_SEQUENCE_opt_type(type,a,f) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        M_ASN1_I2D_len_SEQUENCE_type(type,a,f);
-
-# define M_ASN1_I2D_len_IMP_SET(a,f,x) \
-                ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-# define M_ASN1_I2D_len_IMP_SET_type(type,a,f,x) \
-                ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-                                            V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-# define M_ASN1_I2D_len_IMP_SET_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                          IS_SET);
-
-# define M_ASN1_I2D_len_IMP_SET_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-                                               V_ASN1_CONTEXT_SPECIFIC,IS_SET);
-
-# define M_ASN1_I2D_len_IMP_SEQUENCE(a,f,x) \
-                ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                  IS_SEQUENCE);
-
-# define M_ASN1_I2D_len_IMP_SEQUENCE_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET(a,NULL,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                          IS_SEQUENCE);
-
-# define M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        ret+=i2d_ASN1_SET_OF_##type(a,NULL,f,x, \
-                                                    V_ASN1_CONTEXT_SPECIFIC, \
-                                                    IS_SEQUENCE);
-
-# define M_ASN1_I2D_len_EXP_opt(a,f,mtag,v) \
-                if (a != NULL)\
-                        { \
-                        v=f(a,NULL); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-# define M_ASN1_I2D_len_EXP_SET_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0))\
-                        { \
-                        v=i2d_ASN1_SET(a,NULL,f,tag,V_ASN1_UNIVERSAL,IS_SET); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-# define M_ASN1_I2D_len_EXP_SEQUENCE_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0))\
-                        { \
-                        v=i2d_ASN1_SET(a,NULL,f,tag,V_ASN1_UNIVERSAL, \
-                                       IS_SEQUENCE); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-# define M_ASN1_I2D_len_EXP_SEQUENCE_opt_type(type,a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0))\
-                        { \
-                        v=i2d_ASN1_SET_OF_##type(a,NULL,f,tag, \
-                                                 V_ASN1_UNIVERSAL, \
-                                                 IS_SEQUENCE); \
-                        ret+=ASN1_object_size(1,v,mtag); \
-                        }
-
-/* Put Macros */
-# define M_ASN1_I2D_put(a,f)     f(a,&p)
-
-# define M_ASN1_I2D_put_IMP_opt(a,f,t)   \
-                if (a != NULL) \
-                        { \
-                        unsigned char *q=p; \
-                        f(a,&p); \
-                        *q=(V_ASN1_CONTEXT_SPECIFIC|t|(*q&V_ASN1_CONSTRUCTED));\
-                        }
-
-# define M_ASN1_I2D_put_SET(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SET,\
-                        V_ASN1_UNIVERSAL,IS_SET)
-# define M_ASN1_I2D_put_SET_type(type,a,f) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SET,V_ASN1_UNIVERSAL,IS_SET)
-# define M_ASN1_I2D_put_IMP_SET(a,f,x) i2d_ASN1_SET(a,&p,f,x,\
-                        V_ASN1_CONTEXT_SPECIFIC,IS_SET)
-# define M_ASN1_I2D_put_IMP_SET_type(type,a,f,x) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC,IS_SET)
-# define M_ASN1_I2D_put_IMP_SEQUENCE(a,f,x) i2d_ASN1_SET(a,&p,f,x,\
-                        V_ASN1_CONTEXT_SPECIFIC,IS_SEQUENCE)
-
-# define M_ASN1_I2D_put_SEQUENCE(a,f) i2d_ASN1_SET(a,&p,f,V_ASN1_SEQUENCE,\
-                                             V_ASN1_UNIVERSAL,IS_SEQUENCE)
-
-# define M_ASN1_I2D_put_SEQUENCE_type(type,a,f) \
-     i2d_ASN1_SET_OF_##type(a,&p,f,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL, \
-                            IS_SEQUENCE)
-
-# define M_ASN1_I2D_put_SEQUENCE_opt(a,f) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        M_ASN1_I2D_put_SEQUENCE(a,f);
-
-# define M_ASN1_I2D_put_IMP_SET_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                       IS_SET); }
-
-# define M_ASN1_I2D_put_IMP_SET_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        { i2d_ASN1_SET_OF_##type(a,&p,f,x, \
-                                                 V_ASN1_CONTEXT_SPECIFIC, \
-                                                 IS_SET); }
-
-# define M_ASN1_I2D_put_IMP_SEQUENCE_opt(a,f,x) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { i2d_ASN1_SET(a,&p,f,x,V_ASN1_CONTEXT_SPECIFIC, \
-                                       IS_SEQUENCE); }
-
-# define M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(type,a,f,x) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        { i2d_ASN1_SET_OF_##type(a,&p,f,x, \
-                                                 V_ASN1_CONTEXT_SPECIFIC, \
-                                                 IS_SEQUENCE); }
-
-# define M_ASN1_I2D_put_EXP_opt(a,f,tag,v) \
-                if (a != NULL) \
-                        { \
-                        ASN1_put_object(&p,1,v,tag,V_ASN1_CONTEXT_SPECIFIC); \
-                        f(a,&p); \
-                        }
-
-# define M_ASN1_I2D_put_EXP_SET_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { \
-                        ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-                        i2d_ASN1_SET(a,&p,f,tag,V_ASN1_UNIVERSAL,IS_SET); \
-                        }
-
-# define M_ASN1_I2D_put_EXP_SEQUENCE_opt(a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_num(a) != 0)) \
-                        { \
-                        ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-                        i2d_ASN1_SET(a,&p,f,tag,V_ASN1_UNIVERSAL,IS_SEQUENCE); \
-                        }
-
-# define M_ASN1_I2D_put_EXP_SEQUENCE_opt_type(type,a,f,mtag,tag,v) \
-                if ((a != NULL) && (sk_##type##_num(a) != 0)) \
-                        { \
-                        ASN1_put_object(&p,1,v,mtag,V_ASN1_CONTEXT_SPECIFIC); \
-                        i2d_ASN1_SET_OF_##type(a,&p,f,tag,V_ASN1_UNIVERSAL, \
-                                               IS_SEQUENCE); \
-                        }
-
-# define M_ASN1_I2D_seq_total() \
-                r=ASN1_object_size(1,ret,V_ASN1_SEQUENCE); \
-                if (pp == NULL) return(r); \
-                p= *pp; \
-                ASN1_put_object(&p,1,ret,V_ASN1_SEQUENCE,V_ASN1_UNIVERSAL)
-
-# define M_ASN1_I2D_INF_seq_start(tag,ctx) \
-                *(p++)=(V_ASN1_CONSTRUCTED|(tag)|(ctx)); \
-                *(p++)=0x80
-
-# define M_ASN1_I2D_INF_seq_end() *(p++)=0x00; *(p++)=0x00
-
-# define M_ASN1_I2D_finish()     *pp=p; \
-                                return(r);
-
-int asn1_GetSequence(ASN1_const_CTX *c, long *length);
-void asn1_add_error(const unsigned char *address, int offset);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/asn1t.h b/include.new/openssl/asn1t.h
deleted file mode 100644
index 99bc0ee..0000000
--- a/include.new/openssl/asn1t.h
+++ /dev/null
@@ -1,973 +0,0 @@
-/* asn1t.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
- * 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000-2005 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ASN1T_H
-# define HEADER_ASN1T_H
-
-# include <stddef.h>
-# include <openssl/e_os2.h>
-# include <openssl/asn1.h>
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-/* ASN1 template defines, structures and functions */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr))
-
-/* Macros for start and end of ASN1_ITEM definition */
-
-#  define ASN1_ITEM_start(itname) \
-        OPENSSL_GLOBAL const ASN1_ITEM itname##_it = {
-
-#  define ASN1_ITEM_end(itname) \
-                };
-
-# else
-
-/* Macro to obtain ASN1_ADB pointer from a type (only used internally) */
-#  define ASN1_ADB_ptr(iptr) ((const ASN1_ADB *)(iptr()))
-
-/* Macros for start and end of ASN1_ITEM definition */
-
-#  define ASN1_ITEM_start(itname) \
-        const ASN1_ITEM * itname##_it(void) \
-        { \
-                static const ASN1_ITEM local_it = {
-
-#  define ASN1_ITEM_end(itname) \
-                }; \
-        return &local_it; \
-        }
-
-# endif
-
-/* Macros to aid ASN1 template writing */
-
-# define ASN1_ITEM_TEMPLATE(tname) \
-        static const ASN1_TEMPLATE tname##_item_tt
-
-# define ASN1_ITEM_TEMPLATE_END(tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_PRIMITIVE,\
-                -1,\
-                &tname##_item_tt,\
-                0,\
-                NULL,\
-                0,\
-                #tname \
-        ASN1_ITEM_end(tname)
-
-/* This is a ASN1 type which just embeds a template */
-
-/*-
- * This pair helps declare a SEQUENCE. We can do:
- *
- *      ASN1_SEQUENCE(stname) = {
- *              ... SEQUENCE components ...
- *      } ASN1_SEQUENCE_END(stname)
- *
- *      This will produce an ASN1_ITEM called stname_it
- *      for a structure called stname.
- *
- *      If you want the same structure but a different
- *      name then use:
- *
- *      ASN1_SEQUENCE(itname) = {
- *              ... SEQUENCE components ...
- *      } ASN1_SEQUENCE_END_name(stname, itname)
- *
- *      This will create an item called itname_it using
- *      a structure called stname.
- */
-
-# define ASN1_SEQUENCE(tname) \
-        static const ASN1_TEMPLATE tname##_seq_tt[]
-
-# define ASN1_SEQUENCE_END(stname) ASN1_SEQUENCE_END_name(stname, stname)
-
-# define ASN1_SEQUENCE_END_name(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_NDEF_SEQUENCE(tname) \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_NDEF_SEQUENCE_cb(tname, cb) \
-        ASN1_SEQUENCE_cb(tname, cb)
-
-# define ASN1_SEQUENCE_cb(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_BROKEN_SEQUENCE(tname) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_BROKEN, 0, 0, 0, 0}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_SEQUENCE_ref(tname, cb, lck) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_REFCOUNT, offsetof(tname, references), lck, cb, 0}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_SEQUENCE_enc(tname, enc, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, ASN1_AFLG_ENCODING, 0, 0, cb, offsetof(tname, enc)}; \
-        ASN1_SEQUENCE(tname)
-
-# define ASN1_NDEF_SEQUENCE_END(tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(tname),\
-                #tname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_BROKEN_SEQUENCE_END(stname) ASN1_SEQUENCE_END_ref(stname, stname)
-
-# define ASN1_SEQUENCE_END_enc(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
-
-# define ASN1_SEQUENCE_END_cb(stname, tname) ASN1_SEQUENCE_END_ref(stname, tname)
-
-# define ASN1_SEQUENCE_END_ref(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_NDEF_SEQUENCE_END_cb(stname, tname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_NDEF_SEQUENCE,\
-                V_ASN1_SEQUENCE,\
-                tname##_seq_tt,\
-                sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-/*-
- * This pair helps declare a CHOICE type. We can do:
- *
- *      ASN1_CHOICE(chname) = {
- *              ... CHOICE options ...
- *      ASN1_CHOICE_END(chname)
- *
- *      This will produce an ASN1_ITEM called chname_it
- *      for a structure called chname. The structure
- *      definition must look like this:
- *      typedef struct {
- *              int type;
- *              union {
- *                      ASN1_SOMETHING *opt1;
- *                      ASN1_SOMEOTHER *opt2;
- *              } value;
- *      } chname;
- *
- *      the name of the selector must be 'type'.
- *      to use an alternative selector name use the
- *      ASN1_CHOICE_END_selector() version.
- */
-
-# define ASN1_CHOICE(tname) \
-        static const ASN1_TEMPLATE tname##_ch_tt[]
-
-# define ASN1_CHOICE_cb(tname, cb) \
-        static const ASN1_AUX tname##_aux = {NULL, 0, 0, 0, cb, 0}; \
-        ASN1_CHOICE(tname)
-
-# define ASN1_CHOICE_END(stname) ASN1_CHOICE_END_name(stname, stname)
-
-# define ASN1_CHOICE_END_name(stname, tname) ASN1_CHOICE_END_selector(stname, tname, type)
-
-# define ASN1_CHOICE_END_selector(stname, tname, selname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                NULL,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-# define ASN1_CHOICE_END_cb(stname, tname, selname) \
-        ;\
-        ASN1_ITEM_start(tname) \
-                ASN1_ITYPE_CHOICE,\
-                offsetof(stname,selname) ,\
-                tname##_ch_tt,\
-                sizeof(tname##_ch_tt) / sizeof(ASN1_TEMPLATE),\
-                &tname##_aux,\
-                sizeof(stname),\
-                #stname \
-        ASN1_ITEM_end(tname)
-
-/* This helps with the template wrapper form of ASN1_ITEM */
-
-# define ASN1_EX_TEMPLATE_TYPE(flags, tag, name, type) { \
-        (flags), (tag), 0,\
-        #name, ASN1_ITEM_ref(type) }
-
-/* These help with SEQUENCE or CHOICE components */
-
-/* used to declare other types */
-
-# define ASN1_EX_TYPE(flags, tag, stname, field, type) { \
-        (flags), (tag), offsetof(stname, field),\
-        #field, ASN1_ITEM_ref(type) }
-
-/* used when the structure is combined with the parent */
-
-# define ASN1_EX_COMBINE(flags, tag, type) { \
-        (flags)|ASN1_TFLG_COMBINE, (tag), 0, NULL, ASN1_ITEM_ref(type) }
-
-/* implicit and explicit helper macros */
-
-# define ASN1_IMP_EX(stname, field, type, tag, ex) \
-                ASN1_EX_TYPE(ASN1_TFLG_IMPLICIT | ex, tag, stname, field, type)
-
-# define ASN1_EXP_EX(stname, field, type, tag, ex) \
-                ASN1_EX_TYPE(ASN1_TFLG_EXPLICIT | ex, tag, stname, field, type)
-
-/* Any defined by macros: the field used is in the table itself */
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#  define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-#  define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, (const ASN1_ITEM *)&(tblname##_adb) }
-# else
-#  define ASN1_ADB_OBJECT(tblname) { ASN1_TFLG_ADB_OID, -1, 0, #tblname, tblname##_adb }
-#  define ASN1_ADB_INTEGER(tblname) { ASN1_TFLG_ADB_INT, -1, 0, #tblname, tblname##_adb }
-# endif
-/* Plain simple type */
-# define ASN1_SIMPLE(stname, field, type) ASN1_EX_TYPE(0,0, stname, field, type)
-
-/* OPTIONAL simple type */
-# define ASN1_OPT(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* IMPLICIT tagged simple type */
-# define ASN1_IMP(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, 0)
-
-/* IMPLICIT tagged OPTIONAL simple type */
-# define ASN1_IMP_OPT(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-
-/* Same as above but EXPLICIT */
-
-# define ASN1_EXP(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, 0)
-# define ASN1_EXP_OPT(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
-
-/* SEQUENCE OF type */
-# define ASN1_SEQUENCE_OF(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF, 0, stname, field, type)
-
-/* OPTIONAL SEQUENCE OF */
-# define ASN1_SEQUENCE_OF_OPT(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* Same as above but for SET OF */
-
-# define ASN1_SET_OF(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SET_OF, 0, stname, field, type)
-
-# define ASN1_SET_OF_OPT(stname, field, type) \
-                ASN1_EX_TYPE(ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL, 0, stname, field, type)
-
-/* Finally compound types of SEQUENCE, SET, IMPLICIT, EXPLICIT and OPTIONAL */
-
-# define ASN1_IMP_SET_OF(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
-
-# define ASN1_EXP_SET_OF(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF)
-
-# define ASN1_IMP_SET_OF_OPT(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
-
-# define ASN1_EXP_SET_OF_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SET_OF|ASN1_TFLG_OPTIONAL)
-
-# define ASN1_IMP_SEQUENCE_OF(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
-
-# define ASN1_IMP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-                        ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
-
-# define ASN1_EXP_SEQUENCE_OF(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF)
-
-# define ASN1_EXP_SEQUENCE_OF_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_SEQUENCE_OF|ASN1_TFLG_OPTIONAL)
-
-/* EXPLICIT using indefinite length constructed form */
-# define ASN1_NDEF_EXP(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_NDEF)
-
-/* EXPLICIT OPTIONAL using indefinite length constructed form */
-# define ASN1_NDEF_EXP_OPT(stname, field, type, tag) \
-                        ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_NDEF)
-
-/* Macros for the ASN1_ADB structure */
-
-# define ASN1_ADB(name) \
-        static const ASN1_ADB_TABLE name##_adbtbl[]
-
-# ifndef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#  define ASN1_ADB_END(name, flags, field, app_table, def, none) \
-        ;\
-        static const ASN1_ADB name##_adb = {\
-                flags,\
-                offsetof(name, field),\
-                app_table,\
-                name##_adbtbl,\
-                sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-                def,\
-                none\
-        }
-
-# else
-
-#  define ASN1_ADB_END(name, flags, field, app_table, def, none) \
-        ;\
-        static const ASN1_ITEM *name##_adb(void) \
-        { \
-        static const ASN1_ADB internal_adb = \
-                {\
-                flags,\
-                offsetof(name, field),\
-                app_table,\
-                name##_adbtbl,\
-                sizeof(name##_adbtbl) / sizeof(ASN1_ADB_TABLE),\
-                def,\
-                none\
-                }; \
-                return (const ASN1_ITEM *) &internal_adb; \
-        } \
-        void dummy_function(void)
-
-# endif
-
-# define ADB_ENTRY(val, template) {val, template}
-
-# define ASN1_ADB_TEMPLATE(name) \
-        static const ASN1_TEMPLATE name##_tt
-
-/*
- * This is the ASN1 template structure that defines a wrapper round the
- * actual type. It determines the actual position of the field in the value
- * structure, various flags such as OPTIONAL and the field name.
- */
-
-struct ASN1_TEMPLATE_st {
-    unsigned long flags;        /* Various flags */
-    long tag;                   /* tag, not used if no tagging */
-    unsigned long offset;       /* Offset of this field in structure */
-# ifndef NO_ASN1_FIELD_NAMES
-    const char *field_name;     /* Field name */
-# endif
-    ASN1_ITEM_EXP *item;        /* Relevant ASN1_ITEM or ASN1_ADB */
-};
-
-/* Macro to extract ASN1_ITEM and ASN1_ADB pointer from ASN1_TEMPLATE */
-
-# define ASN1_TEMPLATE_item(t) (t->item_ptr)
-# define ASN1_TEMPLATE_adb(t) (t->item_ptr)
-
-typedef struct ASN1_ADB_TABLE_st ASN1_ADB_TABLE;
-typedef struct ASN1_ADB_st ASN1_ADB;
-
-struct ASN1_ADB_st {
-    unsigned long flags;        /* Various flags */
-    unsigned long offset;       /* Offset of selector field */
-    STACK_OF(ASN1_ADB_TABLE) **app_items; /* Application defined items */
-    const ASN1_ADB_TABLE *tbl;  /* Table of possible types */
-    long tblcount;              /* Number of entries in tbl */
-    const ASN1_TEMPLATE *default_tt; /* Type to use if no match */
-    const ASN1_TEMPLATE *null_tt; /* Type to use if selector is NULL */
-};
-
-struct ASN1_ADB_TABLE_st {
-    long value;                 /* NID for an object or value for an int */
-    const ASN1_TEMPLATE tt;     /* item for this value */
-};
-
-/* template flags */
-
-/* Field is optional */
-# define ASN1_TFLG_OPTIONAL      (0x1)
-
-/* Field is a SET OF */
-# define ASN1_TFLG_SET_OF        (0x1 << 1)
-
-/* Field is a SEQUENCE OF */
-# define ASN1_TFLG_SEQUENCE_OF   (0x2 << 1)
-
-/*
- * Special case: this refers to a SET OF that will be sorted into DER order
- * when encoded *and* the corresponding STACK will be modified to match the
- * new order.
- */
-# define ASN1_TFLG_SET_ORDER     (0x3 << 1)
-
-/* Mask for SET OF or SEQUENCE OF */
-# define ASN1_TFLG_SK_MASK       (0x3 << 1)
-
-/*
- * These flags mean the tag should be taken from the tag field. If EXPLICIT
- * then the underlying type is used for the inner tag.
- */
-
-/* IMPLICIT tagging */
-# define ASN1_TFLG_IMPTAG        (0x1 << 3)
-
-/* EXPLICIT tagging, inner tag from underlying type */
-# define ASN1_TFLG_EXPTAG        (0x2 << 3)
-
-# define ASN1_TFLG_TAG_MASK      (0x3 << 3)
-
-/* context specific IMPLICIT */
-# define ASN1_TFLG_IMPLICIT      ASN1_TFLG_IMPTAG|ASN1_TFLG_CONTEXT
-
-/* context specific EXPLICIT */
-# define ASN1_TFLG_EXPLICIT      ASN1_TFLG_EXPTAG|ASN1_TFLG_CONTEXT
-
-/*
- * If tagging is in force these determine the type of tag to use. Otherwise
- * the tag is determined by the underlying type. These values reflect the
- * actual octet format.
- */
-
-/* Universal tag */
-# define ASN1_TFLG_UNIVERSAL     (0x0<<6)
-/* Application tag */
-# define ASN1_TFLG_APPLICATION   (0x1<<6)
-/* Context specific tag */
-# define ASN1_TFLG_CONTEXT       (0x2<<6)
-/* Private tag */
-# define ASN1_TFLG_PRIVATE       (0x3<<6)
-
-# define ASN1_TFLG_TAG_CLASS     (0x3<<6)
-
-/*
- * These are for ANY DEFINED BY type. In this case the 'item' field points to
- * an ASN1_ADB structure which contains a table of values to decode the
- * relevant type
- */
-
-# define ASN1_TFLG_ADB_MASK      (0x3<<8)
-
-# define ASN1_TFLG_ADB_OID       (0x1<<8)
-
-# define ASN1_TFLG_ADB_INT       (0x1<<9)
-
-/*
- * This flag means a parent structure is passed instead of the field: this is
- * useful is a SEQUENCE is being combined with a CHOICE for example. Since
- * this means the structure and item name will differ we need to use the
- * ASN1_CHOICE_END_name() macro for example.
- */
-
-# define ASN1_TFLG_COMBINE       (0x1<<10)
-
-/*
- * This flag when present in a SEQUENCE OF, SET OF or EXPLICIT causes
- * indefinite length constructed encoding to be used if required.
- */
-
-# define ASN1_TFLG_NDEF          (0x1<<11)
-
-/* This is the actual ASN1 item itself */
-
-struct ASN1_ITEM_st {
-    char itype;                 /* The item type, primitive, SEQUENCE, CHOICE
-                                 * or extern */
-    long utype;                 /* underlying type */
-    const ASN1_TEMPLATE *templates; /* If SEQUENCE or CHOICE this contains
-                                     * the contents */
-    long tcount;                /* Number of templates if SEQUENCE or CHOICE */
-    const void *funcs;          /* functions that handle this type */
-    long size;                  /* Structure size (usually) */
-# ifndef NO_ASN1_FIELD_NAMES
-    const char *sname;          /* Structure name */
-# endif
-};
-
-/*-
- * These are values for the itype field and
- * determine how the type is interpreted.
- *
- * For PRIMITIVE types the underlying type
- * determines the behaviour if items is NULL.
- *
- * Otherwise templates must contain a single
- * template and the type is treated in the
- * same way as the type specified in the template.
- *
- * For SEQUENCE types the templates field points
- * to the members, the size field is the
- * structure size.
- *
- * For CHOICE types the templates field points
- * to each possible member (typically a union)
- * and the 'size' field is the offset of the
- * selector.
- *
- * The 'funcs' field is used for application
- * specific functions.
- *
- * For COMPAT types the funcs field gives a
- * set of functions that handle this type, this
- * supports the old d2i, i2d convention.
- *
- * The EXTERN type uses a new style d2i/i2d.
- * The new style should be used where possible
- * because it avoids things like the d2i IMPLICIT
- * hack.
- *
- * MSTRING is a multiple string type, it is used
- * for a CHOICE of character strings where the
- * actual strings all occupy an ASN1_STRING
- * structure. In this case the 'utype' field
- * has a special meaning, it is used as a mask
- * of acceptable types using the B_ASN1 constants.
- *
- * NDEF_SEQUENCE is the same as SEQUENCE except
- * that it will use indefinite length constructed
- * encoding if requested.
- *
- */
-
-# define ASN1_ITYPE_PRIMITIVE            0x0
-
-# define ASN1_ITYPE_SEQUENCE             0x1
-
-# define ASN1_ITYPE_CHOICE               0x2
-
-# define ASN1_ITYPE_COMPAT               0x3
-
-# define ASN1_ITYPE_EXTERN               0x4
-
-# define ASN1_ITYPE_MSTRING              0x5
-
-# define ASN1_ITYPE_NDEF_SEQUENCE        0x6
-
-/*
- * Cache for ASN1 tag and length, so we don't keep re-reading it for things
- * like CHOICE
- */
-
-struct ASN1_TLC_st {
-    char valid;                 /* Values below are valid */
-    int ret;                    /* return value */
-    long plen;                  /* length */
-    int ptag;                   /* class value */
-    int pclass;                 /* class value */
-    int hdrlen;                 /* header length */
-};
-
-/* Typedefs for ASN1 function pointers */
-
-typedef ASN1_VALUE *ASN1_new_func(void);
-typedef void ASN1_free_func(ASN1_VALUE *a);
-typedef ASN1_VALUE *ASN1_d2i_func(ASN1_VALUE **a, const unsigned char **in,
-                                  long length);
-typedef int ASN1_i2d_func(ASN1_VALUE *a, unsigned char **in);
-
-typedef int ASN1_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                        const ASN1_ITEM *it, int tag, int aclass, char opt,
-                        ASN1_TLC *ctx);
-
-typedef int ASN1_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-                        const ASN1_ITEM *it, int tag, int aclass);
-typedef int ASN1_ex_new_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
-typedef void ASN1_ex_free_func(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-typedef int ASN1_ex_print_func(BIO *out, ASN1_VALUE **pval,
-                               int indent, const char *fname,
-                               const ASN1_PCTX *pctx);
-
-typedef int ASN1_primitive_i2c(ASN1_VALUE **pval, unsigned char *cont,
-                               int *putype, const ASN1_ITEM *it);
-typedef int ASN1_primitive_c2i(ASN1_VALUE **pval, const unsigned char *cont,
-                               int len, int utype, char *free_cont,
-                               const ASN1_ITEM *it);
-typedef int ASN1_primitive_print(BIO *out, ASN1_VALUE **pval,
-                                 const ASN1_ITEM *it, int indent,
-                                 const ASN1_PCTX *pctx);
-
-typedef struct ASN1_COMPAT_FUNCS_st {
-    ASN1_new_func *asn1_new;
-    ASN1_free_func *asn1_free;
-    ASN1_d2i_func *asn1_d2i;
-    ASN1_i2d_func *asn1_i2d;
-} ASN1_COMPAT_FUNCS;
-
-typedef struct ASN1_EXTERN_FUNCS_st {
-    void *app_data;
-    ASN1_ex_new_func *asn1_ex_new;
-    ASN1_ex_free_func *asn1_ex_free;
-    ASN1_ex_free_func *asn1_ex_clear;
-    ASN1_ex_d2i *asn1_ex_d2i;
-    ASN1_ex_i2d *asn1_ex_i2d;
-    ASN1_ex_print_func *asn1_ex_print;
-} ASN1_EXTERN_FUNCS;
-
-typedef struct ASN1_PRIMITIVE_FUNCS_st {
-    void *app_data;
-    unsigned long flags;
-    ASN1_ex_new_func *prim_new;
-    ASN1_ex_free_func *prim_free;
-    ASN1_ex_free_func *prim_clear;
-    ASN1_primitive_c2i *prim_c2i;
-    ASN1_primitive_i2c *prim_i2c;
-    ASN1_primitive_print *prim_print;
-} ASN1_PRIMITIVE_FUNCS;
-
-/*
- * This is the ASN1_AUX structure: it handles various miscellaneous
- * requirements. For example the use of reference counts and an informational
- * callback. The "informational callback" is called at various points during
- * the ASN1 encoding and decoding. It can be used to provide minor
- * customisation of the structures used. This is most useful where the
- * supplied routines *almost* do the right thing but need some extra help at
- * a few points. If the callback returns zero then it is assumed a fatal
- * error has occurred and the main operation should be abandoned. If major
- * changes in the default behaviour are required then an external type is
- * more appropriate.
- */
-
-typedef int ASN1_aux_cb(int operation, ASN1_VALUE **in, const ASN1_ITEM *it,
-                        void *exarg);
-
-typedef struct ASN1_AUX_st {
-    void *app_data;
-    int flags;
-    int ref_offset;             /* Offset of reference value */
-    int ref_lock;               /* Lock type to use */
-    ASN1_aux_cb *asn1_cb;
-    int enc_offset;             /* Offset of ASN1_ENCODING structure */
-} ASN1_AUX;
-
-/* For print related callbacks exarg points to this structure */
-typedef struct ASN1_PRINT_ARG_st {
-    BIO *out;
-    int indent;
-    const ASN1_PCTX *pctx;
-} ASN1_PRINT_ARG;
-
-/* For streaming related callbacks exarg points to this structure */
-typedef struct ASN1_STREAM_ARG_st {
-    /* BIO to stream through */
-    BIO *out;
-    /* BIO with filters appended */
-    BIO *ndef_bio;
-    /* Streaming I/O boundary */
-    unsigned char **boundary;
-} ASN1_STREAM_ARG;
-
-/* Flags in ASN1_AUX */
-
-/* Use a reference count */
-# define ASN1_AFLG_REFCOUNT      1
-/* Save the encoding of structure (useful for signatures) */
-# define ASN1_AFLG_ENCODING      2
-/* The Sequence length is invalid */
-# define ASN1_AFLG_BROKEN        4
-
-/* operation values for asn1_cb */
-
-# define ASN1_OP_NEW_PRE         0
-# define ASN1_OP_NEW_POST        1
-# define ASN1_OP_FREE_PRE        2
-# define ASN1_OP_FREE_POST       3
-# define ASN1_OP_D2I_PRE         4
-# define ASN1_OP_D2I_POST        5
-# define ASN1_OP_I2D_PRE         6
-# define ASN1_OP_I2D_POST        7
-# define ASN1_OP_PRINT_PRE       8
-# define ASN1_OP_PRINT_POST      9
-# define ASN1_OP_STREAM_PRE      10
-# define ASN1_OP_STREAM_POST     11
-# define ASN1_OP_DETACHED_PRE    12
-# define ASN1_OP_DETACHED_POST   13
-
-/* Macro to implement a primitive type */
-# define IMPLEMENT_ASN1_TYPE(stname) IMPLEMENT_ASN1_TYPE_ex(stname, stname, 0)
-# define IMPLEMENT_ASN1_TYPE_ex(itname, vname, ex) \
-                                ASN1_ITEM_start(itname) \
-                                        ASN1_ITYPE_PRIMITIVE, V_##vname, NULL, 0, NULL, ex, #itname \
-                                ASN1_ITEM_end(itname)
-
-/* Macro to implement a multi string type */
-# define IMPLEMENT_ASN1_MSTRING(itname, mask) \
-                                ASN1_ITEM_start(itname) \
-                                        ASN1_ITYPE_MSTRING, mask, NULL, 0, NULL, sizeof(ASN1_STRING), #itname \
-                                ASN1_ITEM_end(itname)
-
-/* Macro to implement an ASN1_ITEM in terms of old style funcs */
-
-# define IMPLEMENT_COMPAT_ASN1(sname) IMPLEMENT_COMPAT_ASN1_type(sname, V_ASN1_SEQUENCE)
-
-# define IMPLEMENT_COMPAT_ASN1_type(sname, tag) \
-        static const ASN1_COMPAT_FUNCS sname##_ff = { \
-                (ASN1_new_func *)sname##_new, \
-                (ASN1_free_func *)sname##_free, \
-                (ASN1_d2i_func *)d2i_##sname, \
-                (ASN1_i2d_func *)i2d_##sname, \
-        }; \
-        ASN1_ITEM_start(sname) \
-                ASN1_ITYPE_COMPAT, \
-                tag, \
-                NULL, \
-                0, \
-                &sname##_ff, \
-                0, \
-                #sname \
-        ASN1_ITEM_end(sname)
-
-# define IMPLEMENT_EXTERN_ASN1(sname, tag, fptrs) \
-        ASN1_ITEM_start(sname) \
-                ASN1_ITYPE_EXTERN, \
-                tag, \
-                NULL, \
-                0, \
-                &fptrs, \
-                0, \
-                #sname \
-        ASN1_ITEM_end(sname)
-
-/* Macro to implement standard functions in terms of ASN1_ITEM structures */
-
-# define IMPLEMENT_ASN1_FUNCTIONS(stname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, stname, stname)
-
-# define IMPLEMENT_ASN1_FUNCTIONS_name(stname, itname) IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, itname)
-
-# define IMPLEMENT_ASN1_FUNCTIONS_ENCODE_name(stname, itname) \
-                        IMPLEMENT_ASN1_FUNCTIONS_ENCODE_fname(stname, itname, itname)
-
-# define IMPLEMENT_STATIC_ASN1_ALLOC_FUNCTIONS(stname) \
-                IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(static, stname, stname, stname)
-
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS(stname) \
-                IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, stname, stname)
-
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_pfname(pre, stname, itname, fname) \
-        pre stname *fname##_new(void) \
-        { \
-                return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-        } \
-        pre void fname##_free(stname *a) \
-        { \
-                ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-        }
-
-# define IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname) \
-        stname *fname##_new(void) \
-        { \
-                return (stname *)ASN1_item_new(ASN1_ITEM_rptr(itname)); \
-        } \
-        void fname##_free(stname *a) \
-        { \
-                ASN1_item_free((ASN1_VALUE *)a, ASN1_ITEM_rptr(itname)); \
-        }
-
-# define IMPLEMENT_ASN1_FUNCTIONS_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
-
-# define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_fname(stname, itname, fname) \
-        stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
-        { \
-                return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
-        } \
-        int i2d_##fname(stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
-        }
-
-# define IMPLEMENT_ASN1_NDEF_FUNCTION(stname) \
-        int i2d_##stname##_NDEF(stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_ndef_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(stname));\
-        }
-
-/*
- * This includes evil casts to remove const: they will go away when full ASN1
- * constification is done.
- */
-# define IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
-        stname *d2i_##fname(stname **a, const unsigned char **in, long len) \
-        { \
-                return (stname *)ASN1_item_d2i((ASN1_VALUE **)a, in, len, ASN1_ITEM_rptr(itname));\
-        } \
-        int i2d_##fname(const stname *a, unsigned char **out) \
-        { \
-                return ASN1_item_i2d((ASN1_VALUE *)a, out, ASN1_ITEM_rptr(itname));\
-        }
-
-# define IMPLEMENT_ASN1_DUP_FUNCTION(stname) \
-        stname * stname##_dup(stname *x) \
-        { \
-        return ASN1_item_dup(ASN1_ITEM_rptr(stname), x); \
-        }
-
-# define IMPLEMENT_ASN1_PRINT_FUNCTION(stname) \
-        IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, stname, stname)
-
-# define IMPLEMENT_ASN1_PRINT_FUNCTION_fname(stname, itname, fname) \
-        int fname##_print_ctx(BIO *out, stname *x, int indent, \
-                                                const ASN1_PCTX *pctx) \
-        { \
-                return ASN1_item_print(out, (ASN1_VALUE *)x, indent, \
-                        ASN1_ITEM_rptr(itname), pctx); \
-        }
-
-# define IMPLEMENT_ASN1_FUNCTIONS_const(name) \
-                IMPLEMENT_ASN1_FUNCTIONS_const_fname(name, name, name)
-
-# define IMPLEMENT_ASN1_FUNCTIONS_const_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(stname, itname, fname) \
-        IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(stname, itname, fname)
-
-/* external definitions for primitive types */
-
-DECLARE_ASN1_ITEM(ASN1_BOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_TBOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_FBOOLEAN)
-DECLARE_ASN1_ITEM(ASN1_SEQUENCE)
-DECLARE_ASN1_ITEM(CBIGNUM)
-DECLARE_ASN1_ITEM(BIGNUM)
-DECLARE_ASN1_ITEM(LONG)
-DECLARE_ASN1_ITEM(ZLONG)
-
-DECLARE_STACK_OF(ASN1_VALUE)
-
-/* Functions used internally by the ASN1 code */
-
-int ASN1_item_ex_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
-void ASN1_item_ex_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int ASN1_template_new(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-int ASN1_primitive_new(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-void ASN1_template_free(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-int ASN1_template_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                      const ASN1_TEMPLATE *tt);
-int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len,
-                     const ASN1_ITEM *it, int tag, int aclass, char opt,
-                     ASN1_TLC *ctx);
-
-int ASN1_item_ex_i2d(ASN1_VALUE **pval, unsigned char **out,
-                     const ASN1_ITEM *it, int tag, int aclass);
-int ASN1_template_i2d(ASN1_VALUE **pval, unsigned char **out,
-                      const ASN1_TEMPLATE *tt);
-void ASN1_primitive_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-
-int asn1_ex_i2c(ASN1_VALUE **pval, unsigned char *cont, int *putype,
-                const ASN1_ITEM *it);
-int asn1_ex_c2i(ASN1_VALUE **pval, const unsigned char *cont, int len,
-                int utype, char *free_cont, const ASN1_ITEM *it);
-
-int asn1_get_choice_selector(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int asn1_set_choice_selector(ASN1_VALUE **pval, int value,
-                             const ASN1_ITEM *it);
-
-ASN1_VALUE **asn1_get_field_ptr(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt);
-
-const ASN1_TEMPLATE *asn1_do_adb(ASN1_VALUE **pval, const ASN1_TEMPLATE *tt,
-                                 int nullerr);
-
-int asn1_do_lock(ASN1_VALUE **pval, int op, const ASN1_ITEM *it);
-
-void asn1_enc_init(ASN1_VALUE **pval, const ASN1_ITEM *it);
-void asn1_enc_free(ASN1_VALUE **pval, const ASN1_ITEM *it);
-int asn1_enc_restore(int *len, unsigned char **out, ASN1_VALUE **pval,
-                     const ASN1_ITEM *it);
-int asn1_enc_save(ASN1_VALUE **pval, const unsigned char *in, int inlen,
-                  const ASN1_ITEM *it);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/bio.h b/include.new/openssl/bio.h
deleted file mode 100644
index d583cc1..0000000
--- a/include.new/openssl/bio.h
+++ /dev/null
@@ -1,875 +0,0 @@
-/* crypto/bio/bio.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BIO_H
-# define HEADER_BIO_H
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>
-# endif
-# include <stdarg.h>
-
-# include <openssl/crypto.h>
-
-# ifndef OPENSSL_NO_SCTP
-#  ifndef OPENSSL_SYS_VMS
-#   include <stdint.h>
-#  else
-#   include <inttypes.h>
-#  endif
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* These are the 'types' of BIOs */
-# define BIO_TYPE_NONE           0
-# define BIO_TYPE_MEM            (1|0x0400)
-# define BIO_TYPE_FILE           (2|0x0400)
-
-# define BIO_TYPE_FD             (4|0x0400|0x0100)
-# define BIO_TYPE_SOCKET         (5|0x0400|0x0100)
-# define BIO_TYPE_NULL           (6|0x0400)
-# define BIO_TYPE_SSL            (7|0x0200)
-# define BIO_TYPE_MD             (8|0x0200)/* passive filter */
-# define BIO_TYPE_BUFFER         (9|0x0200)/* filter */
-# define BIO_TYPE_CIPHER         (10|0x0200)/* filter */
-# define BIO_TYPE_BASE64         (11|0x0200)/* filter */
-# define BIO_TYPE_CONNECT        (12|0x0400|0x0100)/* socket - connect */
-# define BIO_TYPE_ACCEPT         (13|0x0400|0x0100)/* socket for accept */
-# define BIO_TYPE_PROXY_CLIENT   (14|0x0200)/* client proxy BIO */
-# define BIO_TYPE_PROXY_SERVER   (15|0x0200)/* server proxy BIO */
-# define BIO_TYPE_NBIO_TEST      (16|0x0200)/* server proxy BIO */
-# define BIO_TYPE_NULL_FILTER    (17|0x0200)
-# define BIO_TYPE_BER            (18|0x0200)/* BER -> bin filter */
-# define BIO_TYPE_BIO            (19|0x0400)/* (half a) BIO pair */
-# define BIO_TYPE_LINEBUFFER     (20|0x0200)/* filter */
-# define BIO_TYPE_DGRAM          (21|0x0400|0x0100)
-# ifndef OPENSSL_NO_SCTP
-#  define BIO_TYPE_DGRAM_SCTP     (24|0x0400|0x0100)
-# endif
-# define BIO_TYPE_ASN1           (22|0x0200)/* filter */
-# define BIO_TYPE_COMP           (23|0x0200)/* filter */
-
-# define BIO_TYPE_DESCRIPTOR     0x0100/* socket, fd, connect or accept */
-# define BIO_TYPE_FILTER         0x0200
-# define BIO_TYPE_SOURCE_SINK    0x0400
-
-/*
- * BIO_FILENAME_READ|BIO_CLOSE to open or close on free.
- * BIO_set_fp(in,stdin,BIO_NOCLOSE);
- */
-# define BIO_NOCLOSE             0x00
-# define BIO_CLOSE               0x01
-
-/*
- * These are used in the following macros and are passed to BIO_ctrl()
- */
-# define BIO_CTRL_RESET          1/* opt - rewind/zero etc */
-# define BIO_CTRL_EOF            2/* opt - are we at the eof */
-# define BIO_CTRL_INFO           3/* opt - extra tit-bits */
-# define BIO_CTRL_SET            4/* man - set the 'IO' type */
-# define BIO_CTRL_GET            5/* man - get the 'IO' type */
-# define BIO_CTRL_PUSH           6/* opt - internal, used to signify change */
-# define BIO_CTRL_POP            7/* opt - internal, used to signify change */
-# define BIO_CTRL_GET_CLOSE      8/* man - set the 'close' on free */
-# define BIO_CTRL_SET_CLOSE      9/* man - set the 'close' on free */
-# define BIO_CTRL_PENDING        10/* opt - is their more data buffered */
-# define BIO_CTRL_FLUSH          11/* opt - 'flush' buffered output */
-# define BIO_CTRL_DUP            12/* man - extra stuff for 'duped' BIO */
-# define BIO_CTRL_WPENDING       13/* opt - number of bytes still to write */
-/* callback is int cb(BIO *bio,state,ret); */
-# define BIO_CTRL_SET_CALLBACK   14/* opt - set callback function */
-# define BIO_CTRL_GET_CALLBACK   15/* opt - set callback function */
-
-# define BIO_CTRL_SET_FILENAME   30/* BIO_s_file special */
-
-/* dgram BIO stuff */
-# define BIO_CTRL_DGRAM_CONNECT       31/* BIO dgram special */
-# define BIO_CTRL_DGRAM_SET_CONNECTED 32/* allow for an externally connected
-                                         * socket to be passed in */
-# define BIO_CTRL_DGRAM_SET_RECV_TIMEOUT 33/* setsockopt, essentially */
-# define BIO_CTRL_DGRAM_GET_RECV_TIMEOUT 34/* getsockopt, essentially */
-# define BIO_CTRL_DGRAM_SET_SEND_TIMEOUT 35/* setsockopt, essentially */
-# define BIO_CTRL_DGRAM_GET_SEND_TIMEOUT 36/* getsockopt, essentially */
-
-# define BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP 37/* flag whether the last */
-# define BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP 38/* I/O operation tiemd out */
-
-/* #ifdef IP_MTU_DISCOVER */
-# define BIO_CTRL_DGRAM_MTU_DISCOVER       39/* set DF bit on egress packets */
-/* #endif */
-
-# define BIO_CTRL_DGRAM_QUERY_MTU          40/* as kernel for current MTU */
-# define BIO_CTRL_DGRAM_GET_FALLBACK_MTU   47
-# define BIO_CTRL_DGRAM_GET_MTU            41/* get cached value for MTU */
-# define BIO_CTRL_DGRAM_SET_MTU            42/* set cached value for MTU.
-                                              * want to use this if asking
-                                              * the kernel fails */
-
-# define BIO_CTRL_DGRAM_MTU_EXCEEDED       43/* check whether the MTU was
-                                              * exceed in the previous write
-                                              * operation */
-
-# define BIO_CTRL_DGRAM_GET_PEER           46
-# define BIO_CTRL_DGRAM_SET_PEER           44/* Destination for the data */
-
-# define BIO_CTRL_DGRAM_SET_NEXT_TIMEOUT   45/* Next DTLS handshake timeout
-                                              * to adjust socket timeouts */
-
-# define BIO_CTRL_DGRAM_GET_MTU_OVERHEAD   49
-
-# ifndef OPENSSL_NO_SCTP
-/* SCTP stuff */
-#  define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE    50
-#  define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY                51
-#  define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY               52
-#  define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD               53
-#  define BIO_CTRL_DGRAM_SCTP_GET_SNDINFO         60
-#  define BIO_CTRL_DGRAM_SCTP_SET_SNDINFO         61
-#  define BIO_CTRL_DGRAM_SCTP_GET_RCVINFO         62
-#  define BIO_CTRL_DGRAM_SCTP_SET_RCVINFO         63
-#  define BIO_CTRL_DGRAM_SCTP_GET_PRINFO                  64
-#  define BIO_CTRL_DGRAM_SCTP_SET_PRINFO                  65
-#  define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN               70
-# endif
-
-/* modifiers */
-# define BIO_FP_READ             0x02
-# define BIO_FP_WRITE            0x04
-# define BIO_FP_APPEND           0x08
-# define BIO_FP_TEXT             0x10
-
-# define BIO_FLAGS_READ          0x01
-# define BIO_FLAGS_WRITE         0x02
-# define BIO_FLAGS_IO_SPECIAL    0x04
-# define BIO_FLAGS_RWS (BIO_FLAGS_READ|BIO_FLAGS_WRITE|BIO_FLAGS_IO_SPECIAL)
-# define BIO_FLAGS_SHOULD_RETRY  0x08
-# ifndef BIO_FLAGS_UPLINK
-/*
- * "UPLINK" flag denotes file descriptors provided by application. It
- * defaults to 0, as most platforms don't require UPLINK interface.
- */
-#  define BIO_FLAGS_UPLINK        0
-# endif
-
-/* Used in BIO_gethostbyname() */
-# define BIO_GHBN_CTRL_HITS              1
-# define BIO_GHBN_CTRL_MISSES            2
-# define BIO_GHBN_CTRL_CACHE_SIZE        3
-# define BIO_GHBN_CTRL_GET_ENTRY         4
-# define BIO_GHBN_CTRL_FLUSH             5
-
-/* Mostly used in the SSL BIO */
-/*-
- * Not used anymore
- * #define BIO_FLAGS_PROTOCOL_DELAYED_READ 0x10
- * #define BIO_FLAGS_PROTOCOL_DELAYED_WRITE 0x20
- * #define BIO_FLAGS_PROTOCOL_STARTUP   0x40
- */
-
-# define BIO_FLAGS_BASE64_NO_NL  0x100
-
-/*
- * This is used with memory BIOs: it means we shouldn't free up or change the
- * data in any way.
- */
-# define BIO_FLAGS_MEM_RDONLY    0x200
-
-typedef struct bio_st BIO;
-
-void BIO_set_flags(BIO *b, int flags);
-int BIO_test_flags(const BIO *b, int flags);
-void BIO_clear_flags(BIO *b, int flags);
-
-# define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
-# define BIO_set_retry_special(b) \
-                BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_set_retry_read(b) \
-                BIO_set_flags(b, (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_set_retry_write(b) \
-                BIO_set_flags(b, (BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
-
-/* These are normally used internally in BIOs */
-# define BIO_clear_retry_flags(b) \
-                BIO_clear_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-# define BIO_get_retry_flags(b) \
-                BIO_test_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-
-/* These should be used by the application to tell why we should retry */
-# define BIO_should_read(a)              BIO_test_flags(a, BIO_FLAGS_READ)
-# define BIO_should_write(a)             BIO_test_flags(a, BIO_FLAGS_WRITE)
-# define BIO_should_io_special(a)        BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
-# define BIO_retry_type(a)               BIO_test_flags(a, BIO_FLAGS_RWS)
-# define BIO_should_retry(a)             BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)
-
-/*
- * The next three are used in conjunction with the BIO_should_io_special()
- * condition.  After this returns true, BIO *BIO_get_retry_BIO(BIO *bio, int
- * *reason); will walk the BIO stack and return the 'reason' for the special
- * and the offending BIO. Given a BIO, BIO_get_retry_reason(bio) will return
- * the code.
- */
-/*
- * Returned from the SSL bio when the certificate retrieval code had an error
- */
-# define BIO_RR_SSL_X509_LOOKUP          0x01
-/* Returned from the connect BIO when a connect would have blocked */
-# define BIO_RR_CONNECT                  0x02
-/* Returned from the accept BIO when an accept would have blocked */
-# define BIO_RR_ACCEPT                   0x03
-
-/* These are passed by the BIO callback */
-# define BIO_CB_FREE     0x01
-# define BIO_CB_READ     0x02
-# define BIO_CB_WRITE    0x03
-# define BIO_CB_PUTS     0x04
-# define BIO_CB_GETS     0x05
-# define BIO_CB_CTRL     0x06
-
-/*
- * The callback is called before and after the underling operation, The
- * BIO_CB_RETURN flag indicates if it is after the call
- */
-# define BIO_CB_RETURN   0x80
-# define BIO_CB_return(a) ((a)|BIO_CB_RETURN)
-# define BIO_cb_pre(a)   (!((a)&BIO_CB_RETURN))
-# define BIO_cb_post(a)  ((a)&BIO_CB_RETURN)
-
-long (*BIO_get_callback(const BIO *b)) (struct bio_st *, int, const char *,
-                                        int, long, long);
-void BIO_set_callback(BIO *b,
-                      long (*callback) (struct bio_st *, int, const char *,
-                                        int, long, long));
-char *BIO_get_callback_arg(const BIO *b);
-void BIO_set_callback_arg(BIO *b, char *arg);
-
-const char *BIO_method_name(const BIO *b);
-int BIO_method_type(const BIO *b);
-
-typedef void bio_info_cb (struct bio_st *, int, const char *, int, long,
-                          long);
-
-typedef struct bio_method_st {
-    int type;
-    const char *name;
-    int (*bwrite) (BIO *, const char *, int);
-    int (*bread) (BIO *, char *, int);
-    int (*bputs) (BIO *, const char *);
-    int (*bgets) (BIO *, char *, int);
-    long (*ctrl) (BIO *, int, long, void *);
-    int (*create) (BIO *);
-    int (*destroy) (BIO *);
-    long (*callback_ctrl) (BIO *, int, bio_info_cb *);
-} BIO_METHOD;
-
-struct bio_st {
-    BIO_METHOD *method;
-    /* bio, mode, argp, argi, argl, ret */
-    long (*callback) (struct bio_st *, int, const char *, int, long, long);
-    char *cb_arg;               /* first argument for the callback */
-    int init;
-    int shutdown;
-    int flags;                  /* extra storage */
-    int retry_reason;
-    int num;
-    void *ptr;
-    struct bio_st *next_bio;    /* used by filter BIOs */
-    struct bio_st *prev_bio;    /* used by filter BIOs */
-    int references;
-    unsigned long num_read;
-    unsigned long num_write;
-    CRYPTO_EX_DATA ex_data;
-};
-
-DECLARE_STACK_OF(BIO)
-
-typedef struct bio_f_buffer_ctx_struct {
-    /*-
-     * Buffers are setup like this:
-     *
-     * <---------------------- size ----------------------->
-     * +---------------------------------------------------+
-     * | consumed | remaining          | free space        |
-     * +---------------------------------------------------+
-     * <-- off --><------- len ------->
-     */
-    /*- BIO *bio; *//*
-     * this is now in the BIO struct
-     */
-    int ibuf_size;              /* how big is the input buffer */
-    int obuf_size;              /* how big is the output buffer */
-    char *ibuf;                 /* the char array */
-    int ibuf_len;               /* how many bytes are in it */
-    int ibuf_off;               /* write/read offset */
-    char *obuf;                 /* the char array */
-    int obuf_len;               /* how many bytes are in it */
-    int obuf_off;               /* write/read offset */
-} BIO_F_BUFFER_CTX;
-
-/* Prefix and suffix callback in ASN1 BIO */
-typedef int asn1_ps_func (BIO *b, unsigned char **pbuf, int *plen,
-                          void *parg);
-
-# ifndef OPENSSL_NO_SCTP
-/* SCTP parameter structs */
-struct bio_dgram_sctp_sndinfo {
-    uint16_t snd_sid;
-    uint16_t snd_flags;
-    uint32_t snd_ppid;
-    uint32_t snd_context;
-};
-
-struct bio_dgram_sctp_rcvinfo {
-    uint16_t rcv_sid;
-    uint16_t rcv_ssn;
-    uint16_t rcv_flags;
-    uint32_t rcv_ppid;
-    uint32_t rcv_tsn;
-    uint32_t rcv_cumtsn;
-    uint32_t rcv_context;
-};
-
-struct bio_dgram_sctp_prinfo {
-    uint16_t pr_policy;
-    uint32_t pr_value;
-};
-# endif
-
-/* connect BIO stuff */
-# define BIO_CONN_S_BEFORE               1
-# define BIO_CONN_S_GET_IP               2
-# define BIO_CONN_S_GET_PORT             3
-# define BIO_CONN_S_CREATE_SOCKET        4
-# define BIO_CONN_S_CONNECT              5
-# define BIO_CONN_S_OK                   6
-# define BIO_CONN_S_BLOCKED_CONNECT      7
-# define BIO_CONN_S_NBIO                 8
-/*
- * #define BIO_CONN_get_param_hostname BIO_ctrl
- */
-
-# define BIO_C_SET_CONNECT                       100
-# define BIO_C_DO_STATE_MACHINE                  101
-# define BIO_C_SET_NBIO                          102
-# define BIO_C_SET_PROXY_PARAM                   103
-# define BIO_C_SET_FD                            104
-# define BIO_C_GET_FD                            105
-# define BIO_C_SET_FILE_PTR                      106
-# define BIO_C_GET_FILE_PTR                      107
-# define BIO_C_SET_FILENAME                      108
-# define BIO_C_SET_SSL                           109
-# define BIO_C_GET_SSL                           110
-# define BIO_C_SET_MD                            111
-# define BIO_C_GET_MD                            112
-# define BIO_C_GET_CIPHER_STATUS                 113
-# define BIO_C_SET_BUF_MEM                       114
-# define BIO_C_GET_BUF_MEM_PTR                   115
-# define BIO_C_GET_BUFF_NUM_LINES                116
-# define BIO_C_SET_BUFF_SIZE                     117
-# define BIO_C_SET_ACCEPT                        118
-# define BIO_C_SSL_MODE                          119
-# define BIO_C_GET_MD_CTX                        120
-# define BIO_C_GET_PROXY_PARAM                   121
-# define BIO_C_SET_BUFF_READ_DATA                122/* data to read first */
-# define BIO_C_GET_CONNECT                       123
-# define BIO_C_GET_ACCEPT                        124
-# define BIO_C_SET_SSL_RENEGOTIATE_BYTES         125
-# define BIO_C_GET_SSL_NUM_RENEGOTIATES          126
-# define BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT       127
-# define BIO_C_FILE_SEEK                         128
-# define BIO_C_GET_CIPHER_CTX                    129
-# define BIO_C_SET_BUF_MEM_EOF_RETURN            130/* return end of input
-                                                     * value */
-# define BIO_C_SET_BIND_MODE                     131
-# define BIO_C_GET_BIND_MODE                     132
-# define BIO_C_FILE_TELL                         133
-# define BIO_C_GET_SOCKS                         134
-# define BIO_C_SET_SOCKS                         135
-
-# define BIO_C_SET_WRITE_BUF_SIZE                136/* for BIO_s_bio */
-# define BIO_C_GET_WRITE_BUF_SIZE                137
-# define BIO_C_MAKE_BIO_PAIR                     138
-# define BIO_C_DESTROY_BIO_PAIR                  139
-# define BIO_C_GET_WRITE_GUARANTEE               140
-# define BIO_C_GET_READ_REQUEST                  141
-# define BIO_C_SHUTDOWN_WR                       142
-# define BIO_C_NREAD0                            143
-# define BIO_C_NREAD                             144
-# define BIO_C_NWRITE0                           145
-# define BIO_C_NWRITE                            146
-# define BIO_C_RESET_READ_REQUEST                147
-# define BIO_C_SET_MD_CTX                        148
-
-# define BIO_C_SET_PREFIX                        149
-# define BIO_C_GET_PREFIX                        150
-# define BIO_C_SET_SUFFIX                        151
-# define BIO_C_GET_SUFFIX                        152
-
-# define BIO_C_SET_EX_ARG                        153
-# define BIO_C_GET_EX_ARG                        154
-
-# define BIO_set_app_data(s,arg)         BIO_set_ex_data(s,0,arg)
-# define BIO_get_app_data(s)             BIO_get_ex_data(s,0)
-
-/* BIO_s_connect() and BIO_s_socks4a_connect() */
-# define BIO_set_conn_hostname(b,name) BIO_ctrl(b,BIO_C_SET_CONNECT,0,(char *)name)
-# define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
-# define BIO_set_conn_ip(b,ip)     BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)ip)
-# define BIO_set_conn_int_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,3,(char *)port)
-# define BIO_get_conn_hostname(b)  BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0)
-# define BIO_get_conn_port(b)      BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1)
-# define BIO_get_conn_ip(b)               BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2)
-# define BIO_get_conn_int_port(b) BIO_int_ctrl(b,BIO_C_GET_CONNECT,3,0)
-
-# define BIO_set_nbio(b,n)       BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL)
-
-/* BIO_s_accept_socket() */
-# define BIO_set_accept_port(b,name) BIO_ctrl(b,BIO_C_SET_ACCEPT,0,(char *)name)
-# define BIO_get_accept_port(b)  BIO_ptr_ctrl(b,BIO_C_GET_ACCEPT,0)
-/* #define BIO_set_nbio(b,n)    BIO_ctrl(b,BIO_C_SET_NBIO,(n),NULL) */
-# define BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(n)?(void *)"a":NULL)
-# define BIO_set_accept_bios(b,bio) BIO_ctrl(b,BIO_C_SET_ACCEPT,2,(char *)bio)
-
-# define BIO_BIND_NORMAL                 0
-# define BIO_BIND_REUSEADDR_IF_UNUSED    1
-# define BIO_BIND_REUSEADDR              2
-# define BIO_set_bind_mode(b,mode) BIO_ctrl(b,BIO_C_SET_BIND_MODE,mode,NULL)
-# define BIO_get_bind_mode(b,mode) BIO_ctrl(b,BIO_C_GET_BIND_MODE,0,NULL)
-
-# define BIO_do_connect(b)       BIO_do_handshake(b)
-# define BIO_do_accept(b)        BIO_do_handshake(b)
-# define BIO_do_handshake(b)     BIO_ctrl(b,BIO_C_DO_STATE_MACHINE,0,NULL)
-
-/* BIO_s_proxy_client() */
-# define BIO_set_url(b,url)      BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,0,(char *)(url))
-# define BIO_set_proxies(b,p)    BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,1,(char *)(p))
-/* BIO_set_nbio(b,n) */
-# define BIO_set_filter_bio(b,s) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,2,(char *)(s))
-/* BIO *BIO_get_filter_bio(BIO *bio); */
-# define BIO_set_proxy_cb(b,cb) BIO_callback_ctrl(b,BIO_C_SET_PROXY_PARAM,3,(void *(*cb)()))
-# define BIO_set_proxy_header(b,sk) BIO_ctrl(b,BIO_C_SET_PROXY_PARAM,4,(char *)sk)
-# define BIO_set_no_connect_return(b,bool) BIO_int_ctrl(b,BIO_C_SET_PROXY_PARAM,5,bool)
-
-# define BIO_get_proxy_header(b,skp) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,0,(char *)skp)
-# define BIO_get_proxies(b,pxy_p) BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,1,(char *)(pxy_p))
-# define BIO_get_url(b,url)      BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,2,(char *)(url))
-# define BIO_get_no_connect_return(b)    BIO_ctrl(b,BIO_C_GET_PROXY_PARAM,5,NULL)
-
-# define BIO_set_fd(b,fd,c)      BIO_int_ctrl(b,BIO_C_SET_FD,c,fd)
-# define BIO_get_fd(b,c)         BIO_ctrl(b,BIO_C_GET_FD,0,(char *)c)
-
-# define BIO_set_fp(b,fp,c)      BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
-# define BIO_get_fp(b,fpp)       BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
-
-# define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
-# define BIO_tell(b)     (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)
-
-/*
- * name is cast to lose const, but might be better to route through a
- * function so we can do it safely
- */
-# ifdef CONST_STRICT
-/*
- * If you are wondering why this isn't defined, its because CONST_STRICT is
- * purely a compile-time kludge to allow const to be checked.
- */
-int BIO_read_filename(BIO *b, const char *name);
-# else
-#  define BIO_read_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ,(char *)name)
-# endif
-# define BIO_write_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_WRITE,name)
-# define BIO_append_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_APPEND,name)
-# define BIO_rw_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \
-                BIO_CLOSE|BIO_FP_READ|BIO_FP_WRITE,name)
-
-/*
- * WARNING WARNING, this ups the reference count on the read bio of the SSL
- * structure.  This is because the ssl read BIO is now pointed to by the
- * next_bio field in the bio.  So when you free the BIO, make sure you are
- * doing a BIO_free_all() to catch the underlying BIO.
- */
-# define BIO_set_ssl(b,ssl,c)    BIO_ctrl(b,BIO_C_SET_SSL,c,(char *)ssl)
-# define BIO_get_ssl(b,sslp)     BIO_ctrl(b,BIO_C_GET_SSL,0,(char *)sslp)
-# define BIO_set_ssl_mode(b,client)      BIO_ctrl(b,BIO_C_SSL_MODE,client,NULL)
-# define BIO_set_ssl_renegotiate_bytes(b,num) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_BYTES,num,NULL);
-# define BIO_get_num_renegotiates(b) \
-        BIO_ctrl(b,BIO_C_GET_SSL_NUM_RENEGOTIATES,0,NULL);
-# define BIO_set_ssl_renegotiate_timeout(b,seconds) \
-        BIO_ctrl(b,BIO_C_SET_SSL_RENEGOTIATE_TIMEOUT,seconds,NULL);
-
-/* defined in evp.h */
-/* #define BIO_set_md(b,md)     BIO_ctrl(b,BIO_C_SET_MD,1,(char *)md) */
-
-# define BIO_get_mem_data(b,pp)  BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
-# define BIO_set_mem_buf(b,bm,c) BIO_ctrl(b,BIO_C_SET_BUF_MEM,c,(char *)bm)
-# define BIO_get_mem_ptr(b,pp)   BIO_ctrl(b,BIO_C_GET_BUF_MEM_PTR,0,(char *)pp)
-# define BIO_set_mem_eof_return(b,v) \
-                                BIO_ctrl(b,BIO_C_SET_BUF_MEM_EOF_RETURN,v,NULL)
-
-/* For the BIO_f_buffer() type */
-# define BIO_get_buffer_num_lines(b)     BIO_ctrl(b,BIO_C_GET_BUFF_NUM_LINES,0,NULL)
-# define BIO_set_buffer_size(b,size)     BIO_ctrl(b,BIO_C_SET_BUFF_SIZE,size,NULL)
-# define BIO_set_read_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,0)
-# define BIO_set_write_buffer_size(b,size) BIO_int_ctrl(b,BIO_C_SET_BUFF_SIZE,size,1)
-# define BIO_set_buffer_read_data(b,buf,num) BIO_ctrl(b,BIO_C_SET_BUFF_READ_DATA,num,buf)
-
-/* Don't use the next one unless you know what you are doing :-) */
-# define BIO_dup_state(b,ret)    BIO_ctrl(b,BIO_CTRL_DUP,0,(char *)(ret))
-
-# define BIO_reset(b)            (int)BIO_ctrl(b,BIO_CTRL_RESET,0,NULL)
-# define BIO_eof(b)              (int)BIO_ctrl(b,BIO_CTRL_EOF,0,NULL)
-# define BIO_set_close(b,c)      (int)BIO_ctrl(b,BIO_CTRL_SET_CLOSE,(c),NULL)
-# define BIO_get_close(b)        (int)BIO_ctrl(b,BIO_CTRL_GET_CLOSE,0,NULL)
-# define BIO_pending(b)          (int)BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
-# define BIO_wpending(b)         (int)BIO_ctrl(b,BIO_CTRL_WPENDING,0,NULL)
-/* ...pending macros have inappropriate return type */
-size_t BIO_ctrl_pending(BIO *b);
-size_t BIO_ctrl_wpending(BIO *b);
-# define BIO_flush(b)            (int)BIO_ctrl(b,BIO_CTRL_FLUSH,0,NULL)
-# define BIO_get_info_callback(b,cbp) (int)BIO_ctrl(b,BIO_CTRL_GET_CALLBACK,0, \
-                                                   cbp)
-# define BIO_set_info_callback(b,cb) (int)BIO_callback_ctrl(b,BIO_CTRL_SET_CALLBACK,cb)
-
-/* For the BIO_f_buffer() type */
-# define BIO_buffer_get_num_lines(b) BIO_ctrl(b,BIO_CTRL_GET,0,NULL)
-
-/* For BIO_s_bio() */
-# define BIO_set_write_buf_size(b,size) (int)BIO_ctrl(b,BIO_C_SET_WRITE_BUF_SIZE,size,NULL)
-# define BIO_get_write_buf_size(b,size) (size_t)BIO_ctrl(b,BIO_C_GET_WRITE_BUF_SIZE,size,NULL)
-# define BIO_make_bio_pair(b1,b2)   (int)BIO_ctrl(b1,BIO_C_MAKE_BIO_PAIR,0,b2)
-# define BIO_destroy_bio_pair(b)    (int)BIO_ctrl(b,BIO_C_DESTROY_BIO_PAIR,0,NULL)
-# define BIO_shutdown_wr(b) (int)BIO_ctrl(b, BIO_C_SHUTDOWN_WR, 0, NULL)
-/* macros with inappropriate type -- but ...pending macros use int too: */
-# define BIO_get_write_guarantee(b) (int)BIO_ctrl(b,BIO_C_GET_WRITE_GUARANTEE,0,NULL)
-# define BIO_get_read_request(b)    (int)BIO_ctrl(b,BIO_C_GET_READ_REQUEST,0,NULL)
-size_t BIO_ctrl_get_write_guarantee(BIO *b);
-size_t BIO_ctrl_get_read_request(BIO *b);
-int BIO_ctrl_reset_read_request(BIO *b);
-
-/* ctrl macros for dgram */
-# define BIO_ctrl_dgram_connect(b,peer)  \
-                     (int)BIO_ctrl(b,BIO_CTRL_DGRAM_CONNECT,0, (char *)peer)
-# define BIO_ctrl_set_connected(b, state, peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_CONNECTED, state, (char *)peer)
-# define BIO_dgram_recv_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_RECV_TIMER_EXP, 0, NULL)
-# define BIO_dgram_send_timedout(b) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_SEND_TIMER_EXP, 0, NULL)
-# define BIO_dgram_get_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_GET_PEER, 0, (char *)peer)
-# define BIO_dgram_set_peer(b,peer) \
-         (int)BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, (char *)peer)
-# define BIO_dgram_get_mtu_overhead(b) \
-         (unsigned int)BIO_ctrl((b), BIO_CTRL_DGRAM_GET_MTU_OVERHEAD, 0, NULL)
-
-/* These two aren't currently implemented */
-/* int BIO_get_ex_num(BIO *bio); */
-/* void BIO_set_ex_free_func(BIO *bio,int idx,void (*cb)()); */
-int BIO_set_ex_data(BIO *bio, int idx, void *data);
-void *BIO_get_ex_data(BIO *bio, int idx);
-int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                         CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-unsigned long BIO_number_read(BIO *bio);
-unsigned long BIO_number_written(BIO *bio);
-
-/* For BIO_f_asn1() */
-int BIO_asn1_set_prefix(BIO *b, asn1_ps_func *prefix,
-                        asn1_ps_func *prefix_free);
-int BIO_asn1_get_prefix(BIO *b, asn1_ps_func **pprefix,
-                        asn1_ps_func **pprefix_free);
-int BIO_asn1_set_suffix(BIO *b, asn1_ps_func *suffix,
-                        asn1_ps_func *suffix_free);
-int BIO_asn1_get_suffix(BIO *b, asn1_ps_func **psuffix,
-                        asn1_ps_func **psuffix_free);
-
-# ifndef OPENSSL_NO_FP_API
-BIO_METHOD *BIO_s_file(void);
-BIO *BIO_new_file(const char *filename, const char *mode);
-BIO *BIO_new_fp(FILE *stream, int close_flag);
-#  define BIO_s_file_internal    BIO_s_file
-# endif
-BIO *BIO_new(BIO_METHOD *type);
-int BIO_set(BIO *a, BIO_METHOD *type);
-int BIO_free(BIO *a);
-void BIO_vfree(BIO *a);
-int BIO_read(BIO *b, void *data, int len);
-int BIO_gets(BIO *bp, char *buf, int size);
-int BIO_write(BIO *b, const void *data, int len);
-int BIO_puts(BIO *bp, const char *buf);
-int BIO_indent(BIO *b, int indent, int max);
-long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg);
-long BIO_callback_ctrl(BIO *b, int cmd,
-                       void (*fp) (struct bio_st *, int, const char *, int,
-                                   long, long));
-char *BIO_ptr_ctrl(BIO *bp, int cmd, long larg);
-long BIO_int_ctrl(BIO *bp, int cmd, long larg, int iarg);
-BIO *BIO_push(BIO *b, BIO *append);
-BIO *BIO_pop(BIO *b);
-void BIO_free_all(BIO *a);
-BIO *BIO_find_type(BIO *b, int bio_type);
-BIO *BIO_next(BIO *b);
-BIO *BIO_get_retry_BIO(BIO *bio, int *reason);
-int BIO_get_retry_reason(BIO *bio);
-BIO *BIO_dup_chain(BIO *in);
-
-int BIO_nread0(BIO *bio, char **buf);
-int BIO_nread(BIO *bio, char **buf, int num);
-int BIO_nwrite0(BIO *bio, char **buf);
-int BIO_nwrite(BIO *bio, char **buf, int num);
-
-long BIO_debug_callback(BIO *bio, int cmd, const char *argp, int argi,
-                        long argl, long ret);
-
-BIO_METHOD *BIO_s_mem(void);
-BIO *BIO_new_mem_buf(void *buf, int len);
-BIO_METHOD *BIO_s_socket(void);
-BIO_METHOD *BIO_s_connect(void);
-BIO_METHOD *BIO_s_accept(void);
-BIO_METHOD *BIO_s_fd(void);
-# ifndef OPENSSL_SYS_OS2
-BIO_METHOD *BIO_s_log(void);
-# endif
-BIO_METHOD *BIO_s_bio(void);
-BIO_METHOD *BIO_s_null(void);
-BIO_METHOD *BIO_f_null(void);
-BIO_METHOD *BIO_f_buffer(void);
-# ifdef OPENSSL_SYS_VMS
-BIO_METHOD *BIO_f_linebuffer(void);
-# endif
-BIO_METHOD *BIO_f_nbio_test(void);
-# ifndef OPENSSL_NO_DGRAM
-BIO_METHOD *BIO_s_datagram(void);
-#  ifndef OPENSSL_NO_SCTP
-BIO_METHOD *BIO_s_datagram_sctp(void);
-#  endif
-# endif
-
-/* BIO_METHOD *BIO_f_ber(void); */
-
-int BIO_sock_should_retry(int i);
-int BIO_sock_non_fatal_error(int error);
-int BIO_dgram_non_fatal_error(int error);
-
-int BIO_fd_should_retry(int i);
-int BIO_fd_non_fatal_error(int error);
-int BIO_dump_cb(int (*cb) (const void *data, size_t len, void *u),
-                void *u, const char *s, int len);
-int BIO_dump_indent_cb(int (*cb) (const void *data, size_t len, void *u),
-                       void *u, const char *s, int len, int indent);
-int BIO_dump(BIO *b, const char *bytes, int len);
-int BIO_dump_indent(BIO *b, const char *bytes, int len, int indent);
-# ifndef OPENSSL_NO_FP_API
-int BIO_dump_fp(FILE *fp, const char *s, int len);
-int BIO_dump_indent_fp(FILE *fp, const char *s, int len, int indent);
-# endif
-struct hostent *BIO_gethostbyname(const char *name);
-/*-
- * We might want a thread-safe interface too:
- * struct hostent *BIO_gethostbyname_r(const char *name,
- *     struct hostent *result, void *buffer, size_t buflen);
- * or something similar (caller allocates a struct hostent,
- * pointed to by "result", and additional buffer space for the various
- * substructures; if the buffer does not suffice, NULL is returned
- * and an appropriate error code is set).
- */
-int BIO_sock_error(int sock);
-int BIO_socket_ioctl(int fd, long type, void *arg);
-int BIO_socket_nbio(int fd, int mode);
-int BIO_get_port(const char *str, unsigned short *port_ptr);
-int BIO_get_host_ip(const char *str, unsigned char *ip);
-int BIO_get_accept_socket(char *host_port, int mode);
-int BIO_accept(int sock, char **ip_port);
-int BIO_sock_init(void);
-void BIO_sock_cleanup(void);
-int BIO_set_tcp_ndelay(int sock, int turn_on);
-
-BIO *BIO_new_socket(int sock, int close_flag);
-BIO *BIO_new_dgram(int fd, int close_flag);
-# ifndef OPENSSL_NO_SCTP
-BIO *BIO_new_dgram_sctp(int fd, int close_flag);
-int BIO_dgram_is_sctp(BIO *bio);
-int BIO_dgram_sctp_notification_cb(BIO *b,
-                                   void (*handle_notifications) (BIO *bio,
-                                                                 void
-                                                                 *context,
-                                                                 void *buf),
-                                   void *context);
-int BIO_dgram_sctp_wait_for_dry(BIO *b);
-int BIO_dgram_sctp_msg_waiting(BIO *b);
-# endif
-BIO *BIO_new_fd(int fd, int close_flag);
-BIO *BIO_new_connect(char *host_port);
-BIO *BIO_new_accept(char *host_port);
-
-int BIO_new_bio_pair(BIO **bio1, size_t writebuf1,
-                     BIO **bio2, size_t writebuf2);
-/*
- * If successful, returns 1 and in *bio1, *bio2 two BIO pair endpoints.
- * Otherwise returns 0 and sets *bio1 and *bio2 to NULL. Size 0 uses default
- * value.
- */
-
-void BIO_copy_next_retry(BIO *b);
-
-/*
- * long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);
- */
-
-# ifdef __GNUC__
-#  define __bio_h__attr__ __attribute__
-# else
-#  define __bio_h__attr__(x)
-# endif
-int BIO_printf(BIO *bio, const char *format, ...)
-__bio_h__attr__((__format__(__printf__, 2, 3)));
-int BIO_vprintf(BIO *bio, const char *format, va_list args)
-__bio_h__attr__((__format__(__printf__, 2, 0)));
-int BIO_snprintf(char *buf, size_t n, const char *format, ...)
-__bio_h__attr__((__format__(__printf__, 3, 4)));
-int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-__bio_h__attr__((__format__(__printf__, 3, 0)));
-# undef __bio_h__attr__
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_BIO_strings(void);
-
-/* Error codes for the BIO functions. */
-
-/* Function codes. */
-# define BIO_F_ACPT_STATE                                 100
-# define BIO_F_BIO_ACCEPT                                 101
-# define BIO_F_BIO_BER_GET_HEADER                         102
-# define BIO_F_BIO_CALLBACK_CTRL                          131
-# define BIO_F_BIO_CTRL                                   103
-# define BIO_F_BIO_GETHOSTBYNAME                          120
-# define BIO_F_BIO_GETS                                   104
-# define BIO_F_BIO_GET_ACCEPT_SOCKET                      105
-# define BIO_F_BIO_GET_HOST_IP                            106
-# define BIO_F_BIO_GET_PORT                               107
-# define BIO_F_BIO_MAKE_PAIR                              121
-# define BIO_F_BIO_NEW                                    108
-# define BIO_F_BIO_NEW_FILE                               109
-# define BIO_F_BIO_NEW_MEM_BUF                            126
-# define BIO_F_BIO_NREAD                                  123
-# define BIO_F_BIO_NREAD0                                 124
-# define BIO_F_BIO_NWRITE                                 125
-# define BIO_F_BIO_NWRITE0                                122
-# define BIO_F_BIO_PUTS                                   110
-# define BIO_F_BIO_READ                                   111
-# define BIO_F_BIO_SOCK_INIT                              112
-# define BIO_F_BIO_WRITE                                  113
-# define BIO_F_BUFFER_CTRL                                114
-# define BIO_F_CONN_CTRL                                  127
-# define BIO_F_CONN_STATE                                 115
-# define BIO_F_DGRAM_SCTP_READ                            132
-# define BIO_F_DGRAM_SCTP_WRITE                           133
-# define BIO_F_FILE_CTRL                                  116
-# define BIO_F_FILE_READ                                  130
-# define BIO_F_LINEBUFFER_CTRL                            129
-# define BIO_F_MEM_READ                                   128
-# define BIO_F_MEM_WRITE                                  117
-# define BIO_F_SSL_NEW                                    118
-# define BIO_F_WSASTARTUP                                 119
-
-/* Reason codes. */
-# define BIO_R_ACCEPT_ERROR                               100
-# define BIO_R_BAD_FOPEN_MODE                             101
-# define BIO_R_BAD_HOSTNAME_LOOKUP                        102
-# define BIO_R_BROKEN_PIPE                                124
-# define BIO_R_CONNECT_ERROR                              103
-# define BIO_R_EOF_ON_MEMORY_BIO                          127
-# define BIO_R_ERROR_SETTING_NBIO                         104
-# define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET      105
-# define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET        106
-# define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET          107
-# define BIO_R_INVALID_ARGUMENT                           125
-# define BIO_R_INVALID_IP_ADDRESS                         108
-# define BIO_R_IN_USE                                     123
-# define BIO_R_KEEPALIVE                                  109
-# define BIO_R_NBIO_CONNECT_ERROR                         110
-# define BIO_R_NO_ACCEPT_PORT_SPECIFIED                   111
-# define BIO_R_NO_HOSTNAME_SPECIFIED                      112
-# define BIO_R_NO_PORT_DEFINED                            113
-# define BIO_R_NO_PORT_SPECIFIED                          114
-# define BIO_R_NO_SUCH_FILE                               128
-# define BIO_R_NULL_PARAMETER                             115
-# define BIO_R_TAG_MISMATCH                               116
-# define BIO_R_UNABLE_TO_BIND_SOCKET                      117
-# define BIO_R_UNABLE_TO_CREATE_SOCKET                    118
-# define BIO_R_UNABLE_TO_LISTEN_SOCKET                    119
-# define BIO_R_UNINITIALIZED                              120
-# define BIO_R_UNSUPPORTED_METHOD                         121
-# define BIO_R_WRITE_TO_READ_ONLY_BIO                     126
-# define BIO_R_WSASTARTUP                                 122
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/blowfish.h b/include.new/openssl/blowfish.h
deleted file mode 100644
index 8329302..0000000
--- a/include.new/openssl/blowfish.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* crypto/bf/blowfish.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BLOWFISH_H
-# define HEADER_BLOWFISH_H
-
-# include <openssl/e_os2.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_BF
-#  error BF is disabled.
-# endif
-
-# define BF_ENCRYPT      1
-# define BF_DECRYPT      0
-
-/*-
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! BF_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! BF_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-# if defined(__LP32__)
-#  define BF_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define BF_LONG unsigned long
-#  define BF_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *                                      <appro@fy.chalmers.se>
- */
-# else
-#  define BF_LONG unsigned int
-# endif
-
-# define BF_ROUNDS       16
-# define BF_BLOCK        8
-
-typedef struct bf_key_st {
-    BF_LONG P[BF_ROUNDS + 2];
-    BF_LONG S[4 * 256];
-} BF_KEY;
-
-# ifdef OPENSSL_FIPS
-void private_BF_set_key(BF_KEY *key, int len, const unsigned char *data);
-# endif
-void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
-
-void BF_encrypt(BF_LONG *data, const BF_KEY *key);
-void BF_decrypt(BF_LONG *data, const BF_KEY *key);
-
-void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                    const BF_KEY *key, int enc);
-void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                    const BF_KEY *schedule, unsigned char *ivec, int enc);
-void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const BF_KEY *schedule,
-                      unsigned char *ivec, int *num, int enc);
-void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const BF_KEY *schedule,
-                      unsigned char *ivec, int *num);
-const char *BF_options(void);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/bn.h b/include.new/openssl/bn.h
deleted file mode 100644
index 47d8c71..0000000
--- a/include.new/openssl/bn.h
+++ /dev/null
@@ -1,957 +0,0 @@
-/* crypto/bn/bn.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the Eric Young open source
- * license provided above.
- *
- * The binary polynomial arithmetic software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#ifndef HEADER_BN_H
-# define HEADER_BN_H
-
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>            /* FILE */
-# endif
-# include <openssl/ossl_typ.h>
-# include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * These preprocessor symbols control various aspects of the bignum headers
- * and library code. They're not defined by any "normal" configuration, as
- * they are intended for development and testing purposes. NB: defining all
- * three can be useful for debugging application code as well as openssl
- * itself. BN_DEBUG - turn on various debugging alterations to the bignum
- * code BN_DEBUG_RAND - uses random poisoning of unused words to trip up
- * mismanagement of bignum internals. You must also define BN_DEBUG.
- */
-/* #define BN_DEBUG */
-/* #define BN_DEBUG_RAND */
-
-# ifndef OPENSSL_SMALL_FOOTPRINT
-#  define BN_MUL_COMBA
-#  define BN_SQR_COMBA
-#  define BN_RECURSION
-# endif
-
-/*
- * This next option uses the C libraries (2 word)/(1 word) function. If it is
- * not defined, I use my C version (which is slower). The reason for this
- * flag is that when the particular C compiler library routine is used, and
- * the library is linked with a different compiler, the library is missing.
- * This mostly happens when the library is built with gcc and then linked
- * using normal cc.  This would be a common occurrence because gcc normally
- * produces code that is 2 times faster than system compilers for the big
- * number stuff. For machines with only one compiler (or shared libraries),
- * this should be on.  Again this in only really a problem on machines using
- * "long long's", are 32bit, and are not using my assembler code.
- */
-# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || \
-    defined(OPENSSL_SYS_WIN32) || defined(linux)
-#  ifndef BN_DIV2W
-#   define BN_DIV2W
-#  endif
-# endif
-
-/*
- * assuming long is 64bit - this is the DEC Alpha unsigned long long is only
- * 64 bits :-(, don't define BN_LLONG for the DEC Alpha
- */
-# ifdef SIXTY_FOUR_BIT_LONG
-#  define BN_ULLONG       unsigned long long
-#  define BN_ULONG        unsigned long
-#  define BN_LONG         long
-#  define BN_BITS         128
-#  define BN_BYTES        8
-#  define BN_BITS2        64
-#  define BN_BITS4        32
-#  define BN_MASK         (0xffffffffffffffffffffffffffffffffLL)
-#  define BN_MASK2        (0xffffffffffffffffL)
-#  define BN_MASK2l       (0xffffffffL)
-#  define BN_MASK2h       (0xffffffff00000000L)
-#  define BN_MASK2h1      (0xffffffff80000000L)
-#  define BN_TBIT         (0x8000000000000000L)
-#  define BN_DEC_CONV     (10000000000000000000UL)
-#  define BN_DEC_FMT1     "%lu"
-#  define BN_DEC_FMT2     "%019lu"
-#  define BN_DEC_NUM      19
-#  define BN_HEX_FMT1     "%lX"
-#  define BN_HEX_FMT2     "%016lX"
-# endif
-
-/*
- * This is where the long long data type is 64 bits, but long is 32. For
- * machines where there are 64bit registers, this is the mode to use. IRIX,
- * on R4000 and above should use this mode, along with the relevant assembler
- * code :-).  Do NOT define BN_LLONG.
- */
-# ifdef SIXTY_FOUR_BIT
-#  undef BN_LLONG
-#  undef BN_ULLONG
-#  define BN_ULONG        unsigned long long
-#  define BN_LONG         long long
-#  define BN_BITS         128
-#  define BN_BYTES        8
-#  define BN_BITS2        64
-#  define BN_BITS4        32
-#  define BN_MASK2        (0xffffffffffffffffLL)
-#  define BN_MASK2l       (0xffffffffL)
-#  define BN_MASK2h       (0xffffffff00000000LL)
-#  define BN_MASK2h1      (0xffffffff80000000LL)
-#  define BN_TBIT         (0x8000000000000000LL)
-#  define BN_DEC_CONV     (10000000000000000000ULL)
-#  define BN_DEC_FMT1     "%llu"
-#  define BN_DEC_FMT2     "%019llu"
-#  define BN_DEC_NUM      19
-#  define BN_HEX_FMT1     "%llX"
-#  define BN_HEX_FMT2     "%016llX"
-# endif
-
-# ifdef THIRTY_TWO_BIT
-#  ifdef BN_LLONG
-#   if defined(_WIN32) && !defined(__GNUC__)
-#    define BN_ULLONG     unsigned __int64
-#    define BN_MASK       (0xffffffffffffffffI64)
-#   else
-#    define BN_ULLONG     unsigned long long
-#    define BN_MASK       (0xffffffffffffffffLL)
-#   endif
-#  endif
-#  define BN_ULONG        unsigned int
-#  define BN_LONG         int
-#  define BN_BITS         64
-#  define BN_BYTES        4
-#  define BN_BITS2        32
-#  define BN_BITS4        16
-#  define BN_MASK2        (0xffffffffL)
-#  define BN_MASK2l       (0xffff)
-#  define BN_MASK2h1      (0xffff8000L)
-#  define BN_MASK2h       (0xffff0000L)
-#  define BN_TBIT         (0x80000000L)
-#  define BN_DEC_CONV     (1000000000L)
-#  define BN_DEC_FMT1     "%u"
-#  define BN_DEC_FMT2     "%09u"
-#  define BN_DEC_NUM      9
-#  define BN_HEX_FMT1     "%X"
-#  define BN_HEX_FMT2     "%08X"
-# endif
-
-/*
- * 2011-02-22 SMS. In various places, a size_t variable or a type cast to
- * size_t was used to perform integer-only operations on pointers.  This
- * failed on VMS with 64-bit pointers (CC /POINTER_SIZE = 64) because size_t
- * is still only 32 bits.  What's needed in these cases is an integer type
- * with the same size as a pointer, which size_t is not certain to be. The
- * only fix here is VMS-specific.
- */
-# if defined(OPENSSL_SYS_VMS)
-#  if __INITIAL_POINTER_SIZE == 64
-#   define PTR_SIZE_INT long long
-#  else                         /* __INITIAL_POINTER_SIZE == 64 */
-#   define PTR_SIZE_INT int
-#  endif                        /* __INITIAL_POINTER_SIZE == 64 [else] */
-# else                          /* defined(OPENSSL_SYS_VMS) */
-#  define PTR_SIZE_INT size_t
-# endif                         /* defined(OPENSSL_SYS_VMS) [else] */
-
-# define BN_DEFAULT_BITS 1280
-
-# define BN_FLG_MALLOCED         0x01
-# define BN_FLG_STATIC_DATA      0x02
-
-/*
- * avoid leaking exponent information through timing,
- * BN_mod_exp_mont() will call BN_mod_exp_mont_consttime,
- * BN_div() will call BN_div_no_branch,
- * BN_mod_inverse() will call BN_mod_inverse_no_branch.
- */
-# define BN_FLG_CONSTTIME        0x04
-
-# ifdef OPENSSL_NO_DEPRECATED
-/* deprecated name for the flag */
-#  define BN_FLG_EXP_CONSTTIME BN_FLG_CONSTTIME
-/*
- * avoid leaking exponent information through timings
- * (BN_mod_exp_mont() will call BN_mod_exp_mont_consttime)
- */
-# endif
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  define BN_FLG_FREE             0x8000
-                                       /* used for debuging */
-# endif
-# define BN_set_flags(b,n)       ((b)->flags|=(n))
-# define BN_get_flags(b,n)       ((b)->flags&(n))
-
-/*
- * get a clone of a BIGNUM with changed flags, for *temporary* use only (the
- * two BIGNUMs cannot not be used in parallel!)
- */
-# define BN_with_flags(dest,b,n)  ((dest)->d=(b)->d, \
-                                  (dest)->top=(b)->top, \
-                                  (dest)->dmax=(b)->dmax, \
-                                  (dest)->neg=(b)->neg, \
-                                  (dest)->flags=(((dest)->flags & BN_FLG_MALLOCED) \
-                                                 |  ((b)->flags & ~BN_FLG_MALLOCED) \
-                                                 |  BN_FLG_STATIC_DATA \
-                                                 |  (n)))
-
-/* Already declared in ossl_typ.h */
-# if 0
-typedef struct bignum_st BIGNUM;
-/* Used for temp variables (declaration hidden in bn_lcl.h) */
-typedef struct bignum_ctx BN_CTX;
-typedef struct bn_blinding_st BN_BLINDING;
-typedef struct bn_mont_ctx_st BN_MONT_CTX;
-typedef struct bn_recp_ctx_st BN_RECP_CTX;
-typedef struct bn_gencb_st BN_GENCB;
-# endif
-
-struct bignum_st {
-    BN_ULONG *d;                /* Pointer to an array of 'BN_BITS2' bit
-                                 * chunks. */
-    int top;                    /* Index of last used d +1. */
-    /* The next are internal book keeping for bn_expand. */
-    int dmax;                   /* Size of the d array. */
-    int neg;                    /* one if the number is negative */
-    int flags;
-};
-
-/* Used for montgomery multiplication */
-struct bn_mont_ctx_st {
-    int ri;                     /* number of bits in R */
-    BIGNUM RR;                  /* used to convert to montgomery form */
-    BIGNUM N;                   /* The modulus */
-    BIGNUM Ni;                  /* R*(1/R mod N) - N*Ni = 1 (Ni is only
-                                 * stored for bignum algorithm) */
-    BN_ULONG n0[2];             /* least significant word(s) of Ni; (type
-                                 * changed with 0.9.9, was "BN_ULONG n0;"
-                                 * before) */
-    int flags;
-};
-
-/*
- * Used for reciprocal division/mod functions It cannot be shared between
- * threads
- */
-struct bn_recp_ctx_st {
-    BIGNUM N;                   /* the divisor */
-    BIGNUM Nr;                  /* the reciprocal */
-    int num_bits;
-    int shift;
-    int flags;
-};
-
-/* Used for slow "generation" functions. */
-struct bn_gencb_st {
-    unsigned int ver;           /* To handle binary (in)compatibility */
-    void *arg;                  /* callback-specific data */
-    union {
-        /* if(ver==1) - handles old style callbacks */
-        void (*cb_1) (int, int, void *);
-        /* if(ver==2) - new callback style */
-        int (*cb_2) (int, int, BN_GENCB *);
-    } cb;
-};
-/* Wrapper function to make using BN_GENCB easier,  */
-int BN_GENCB_call(BN_GENCB *cb, int a, int b);
-/* Macro to populate a BN_GENCB structure with an "old"-style callback */
-# define BN_GENCB_set_old(gencb, callback, cb_arg) { \
-                BN_GENCB *tmp_gencb = (gencb); \
-                tmp_gencb->ver = 1; \
-                tmp_gencb->arg = (cb_arg); \
-                tmp_gencb->cb.cb_1 = (callback); }
-/* Macro to populate a BN_GENCB structure with a "new"-style callback */
-# define BN_GENCB_set(gencb, callback, cb_arg) { \
-                BN_GENCB *tmp_gencb = (gencb); \
-                tmp_gencb->ver = 2; \
-                tmp_gencb->arg = (cb_arg); \
-                tmp_gencb->cb.cb_2 = (callback); }
-
-# define BN_prime_checks 0      /* default: select number of iterations based
-                                 * on the size of the number */
-
-/*
- * number of Miller-Rabin iterations for an error rate of less than 2^-80 for
- * random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook of
- * Applied Cryptography [Menezes, van Oorschot, Vanstone; CRC Press 1996];
- * original paper: Damgaard, Landrock, Pomerance: Average case error
- * estimates for the strong probable prime test. -- Math. Comp. 61 (1993)
- * 177-194)
- */
-# define BN_prime_checks_for_size(b) ((b) >= 1300 ?  2 : \
-                                (b) >=  850 ?  3 : \
-                                (b) >=  650 ?  4 : \
-                                (b) >=  550 ?  5 : \
-                                (b) >=  450 ?  6 : \
-                                (b) >=  400 ?  7 : \
-                                (b) >=  350 ?  8 : \
-                                (b) >=  300 ?  9 : \
-                                (b) >=  250 ? 12 : \
-                                (b) >=  200 ? 15 : \
-                                (b) >=  150 ? 18 : \
-                                /* b >= 100 */ 27)
-
-# define BN_num_bytes(a) ((BN_num_bits(a)+7)/8)
-
-/* Note that BN_abs_is_word didn't work reliably for w == 0 until 0.9.8 */
-# define BN_abs_is_word(a,w) ((((a)->top == 1) && ((a)->d[0] == (BN_ULONG)(w))) || \
-                                (((w) == 0) && ((a)->top == 0)))
-# define BN_is_zero(a)       ((a)->top == 0)
-# define BN_is_one(a)        (BN_abs_is_word((a),1) && !(a)->neg)
-# define BN_is_word(a,w)     (BN_abs_is_word((a),(w)) && (!(w) || !(a)->neg))
-# define BN_is_odd(a)        (((a)->top > 0) && ((a)->d[0] & 1))
-
-# define BN_one(a)       (BN_set_word((a),1))
-# define BN_zero_ex(a) \
-        do { \
-                BIGNUM *_tmp_bn = (a); \
-                _tmp_bn->top = 0; \
-                _tmp_bn->neg = 0; \
-        } while(0)
-# ifdef OPENSSL_NO_DEPRECATED
-#  define BN_zero(a)      BN_zero_ex(a)
-# else
-#  define BN_zero(a)      (BN_set_word((a),0))
-# endif
-
-const BIGNUM *BN_value_one(void);
-char *BN_options(void);
-BN_CTX *BN_CTX_new(void);
-# ifndef OPENSSL_NO_DEPRECATED
-void BN_CTX_init(BN_CTX *c);
-# endif
-void BN_CTX_free(BN_CTX *c);
-void BN_CTX_start(BN_CTX *ctx);
-BIGNUM *BN_CTX_get(BN_CTX *ctx);
-void BN_CTX_end(BN_CTX *ctx);
-int BN_rand(BIGNUM *rnd, int bits, int top, int bottom);
-int BN_pseudo_rand(BIGNUM *rnd, int bits, int top, int bottom);
-int BN_rand_range(BIGNUM *rnd, const BIGNUM *range);
-int BN_pseudo_rand_range(BIGNUM *rnd, const BIGNUM *range);
-int BN_num_bits(const BIGNUM *a);
-int BN_num_bits_word(BN_ULONG);
-BIGNUM *BN_new(void);
-void BN_init(BIGNUM *);
-void BN_clear_free(BIGNUM *a);
-BIGNUM *BN_copy(BIGNUM *a, const BIGNUM *b);
-void BN_swap(BIGNUM *a, BIGNUM *b);
-BIGNUM *BN_bin2bn(const unsigned char *s, int len, BIGNUM *ret);
-int BN_bn2bin(const BIGNUM *a, unsigned char *to);
-BIGNUM *BN_mpi2bn(const unsigned char *s, int len, BIGNUM *ret);
-int BN_bn2mpi(const BIGNUM *a, unsigned char *to);
-int BN_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_usub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_uadd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-int BN_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
-/** BN_set_negative sets sign of a BIGNUM
- * \param  b  pointer to the BIGNUM object
- * \param  n  0 if the BIGNUM b should be positive and a value != 0 otherwise
- */
-void BN_set_negative(BIGNUM *b, int n);
-/** BN_is_negative returns 1 if the BIGNUM is negative
- * \param  a  pointer to the BIGNUM object
- * \return 1 if a < 0 and 0 otherwise
- */
-# define BN_is_negative(a) ((a)->neg != 0)
-
-int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,
-           BN_CTX *ctx);
-# define BN_mod(rem,m,d,ctx) BN_div(NULL,(rem),(m),(d),(ctx))
-int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx);
-int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
-int BN_mod_add_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m);
-int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
-int BN_mod_sub_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                     const BIGNUM *m);
-int BN_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m,
-               BN_CTX *ctx);
-int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_lshift1(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_lshift1_quick(BIGNUM *r, const BIGNUM *a, const BIGNUM *m);
-int BN_mod_lshift(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m,
-                  BN_CTX *ctx);
-int BN_mod_lshift_quick(BIGNUM *r, const BIGNUM *a, int n, const BIGNUM *m);
-
-BN_ULONG BN_mod_word(const BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_div_word(BIGNUM *a, BN_ULONG w);
-int BN_mul_word(BIGNUM *a, BN_ULONG w);
-int BN_add_word(BIGNUM *a, BN_ULONG w);
-int BN_sub_word(BIGNUM *a, BN_ULONG w);
-int BN_set_word(BIGNUM *a, BN_ULONG w);
-BN_ULONG BN_get_word(const BIGNUM *a);
-
-int BN_cmp(const BIGNUM *a, const BIGNUM *b);
-void BN_free(BIGNUM *a);
-int BN_is_bit_set(const BIGNUM *a, int n);
-int BN_lshift(BIGNUM *r, const BIGNUM *a, int n);
-int BN_lshift1(BIGNUM *r, const BIGNUM *a);
-int BN_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-
-int BN_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-               const BIGNUM *m, BN_CTX *ctx);
-int BN_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp_mont_consttime(BIGNUM *rr, const BIGNUM *a, const BIGNUM *p,
-                              const BIGNUM *m, BN_CTX *ctx,
-                              BN_MONT_CTX *in_mont);
-int BN_mod_exp_mont_word(BIGNUM *r, BN_ULONG a, const BIGNUM *p,
-                         const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp2_mont(BIGNUM *r, const BIGNUM *a1, const BIGNUM *p1,
-                     const BIGNUM *a2, const BIGNUM *p2, const BIGNUM *m,
-                     BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                      const BIGNUM *m, BN_CTX *ctx);
-
-int BN_mask_bits(BIGNUM *a, int n);
-# ifndef OPENSSL_NO_FP_API
-int BN_print_fp(FILE *fp, const BIGNUM *a);
-# endif
-# ifdef HEADER_BIO_H
-int BN_print(BIO *fp, const BIGNUM *a);
-# else
-int BN_print(void *fp, const BIGNUM *a);
-# endif
-int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx);
-int BN_rshift(BIGNUM *r, const BIGNUM *a, int n);
-int BN_rshift1(BIGNUM *r, const BIGNUM *a);
-void BN_clear(BIGNUM *a);
-BIGNUM *BN_dup(const BIGNUM *a);
-int BN_ucmp(const BIGNUM *a, const BIGNUM *b);
-int BN_set_bit(BIGNUM *a, int n);
-int BN_clear_bit(BIGNUM *a, int n);
-char *BN_bn2hex(const BIGNUM *a);
-char *BN_bn2dec(const BIGNUM *a);
-int BN_hex2bn(BIGNUM **a, const char *str);
-int BN_dec2bn(BIGNUM **a, const char *str);
-int BN_asc2bn(BIGNUM **a, const char *str);
-int BN_gcd(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);
-int BN_kronecker(const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx); /* returns
-                                                                  * -2 for
-                                                                  * error */
-BIGNUM *BN_mod_inverse(BIGNUM *ret,
-                       const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
-BIGNUM *BN_mod_sqrt(BIGNUM *ret,
-                    const BIGNUM *a, const BIGNUM *n, BN_CTX *ctx);
-
-void BN_consttime_swap(BN_ULONG swap, BIGNUM *a, BIGNUM *b, int nwords);
-
-/* Deprecated versions */
-# ifndef OPENSSL_NO_DEPRECATED
-BIGNUM *BN_generate_prime(BIGNUM *ret, int bits, int safe,
-                          const BIGNUM *add, const BIGNUM *rem,
-                          void (*callback) (int, int, void *), void *cb_arg);
-int BN_is_prime(const BIGNUM *p, int nchecks,
-                void (*callback) (int, int, void *),
-                BN_CTX *ctx, void *cb_arg);
-int BN_is_prime_fasttest(const BIGNUM *p, int nchecks,
-                         void (*callback) (int, int, void *), BN_CTX *ctx,
-                         void *cb_arg, int do_trial_division);
-# endif                         /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* Newer versions */
-int BN_generate_prime_ex(BIGNUM *ret, int bits, int safe, const BIGNUM *add,
-                         const BIGNUM *rem, BN_GENCB *cb);
-int BN_is_prime_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx, BN_GENCB *cb);
-int BN_is_prime_fasttest_ex(const BIGNUM *p, int nchecks, BN_CTX *ctx,
-                            int do_trial_division, BN_GENCB *cb);
-
-int BN_X931_generate_Xpq(BIGNUM *Xp, BIGNUM *Xq, int nbits, BN_CTX *ctx);
-
-int BN_X931_derive_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2,
-                            const BIGNUM *Xp, const BIGNUM *Xp1,
-                            const BIGNUM *Xp2, const BIGNUM *e, BN_CTX *ctx,
-                            BN_GENCB *cb);
-int BN_X931_generate_prime_ex(BIGNUM *p, BIGNUM *p1, BIGNUM *p2, BIGNUM *Xp1,
-                              BIGNUM *Xp2, const BIGNUM *Xp, const BIGNUM *e,
-                              BN_CTX *ctx, BN_GENCB *cb);
-
-BN_MONT_CTX *BN_MONT_CTX_new(void);
-void BN_MONT_CTX_init(BN_MONT_CTX *ctx);
-int BN_mod_mul_montgomery(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                          BN_MONT_CTX *mont, BN_CTX *ctx);
-# define BN_to_montgomery(r,a,mont,ctx)  BN_mod_mul_montgomery(\
-        (r),(a),&((mont)->RR),(mont),(ctx))
-int BN_from_montgomery(BIGNUM *r, const BIGNUM *a,
-                       BN_MONT_CTX *mont, BN_CTX *ctx);
-void BN_MONT_CTX_free(BN_MONT_CTX *mont);
-int BN_MONT_CTX_set(BN_MONT_CTX *mont, const BIGNUM *mod, BN_CTX *ctx);
-BN_MONT_CTX *BN_MONT_CTX_copy(BN_MONT_CTX *to, BN_MONT_CTX *from);
-BN_MONT_CTX *BN_MONT_CTX_set_locked(BN_MONT_CTX **pmont, int lock,
-                                    const BIGNUM *mod, BN_CTX *ctx);
-
-/* BN_BLINDING flags */
-# define BN_BLINDING_NO_UPDATE   0x00000001
-# define BN_BLINDING_NO_RECREATE 0x00000002
-
-BN_BLINDING *BN_BLINDING_new(const BIGNUM *A, const BIGNUM *Ai, BIGNUM *mod);
-void BN_BLINDING_free(BN_BLINDING *b);
-int BN_BLINDING_update(BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_convert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_invert(BIGNUM *n, BN_BLINDING *b, BN_CTX *ctx);
-int BN_BLINDING_convert_ex(BIGNUM *n, BIGNUM *r, BN_BLINDING *b, BN_CTX *);
-int BN_BLINDING_invert_ex(BIGNUM *n, const BIGNUM *r, BN_BLINDING *b,
-                          BN_CTX *);
-# ifndef OPENSSL_NO_DEPRECATED
-unsigned long BN_BLINDING_get_thread_id(const BN_BLINDING *);
-void BN_BLINDING_set_thread_id(BN_BLINDING *, unsigned long);
-# endif
-CRYPTO_THREADID *BN_BLINDING_thread_id(BN_BLINDING *);
-unsigned long BN_BLINDING_get_flags(const BN_BLINDING *);
-void BN_BLINDING_set_flags(BN_BLINDING *, unsigned long);
-BN_BLINDING *BN_BLINDING_create_param(BN_BLINDING *b,
-                                      const BIGNUM *e, BIGNUM *m, BN_CTX *ctx,
-                                      int (*bn_mod_exp) (BIGNUM *r,
-                                                         const BIGNUM *a,
-                                                         const BIGNUM *p,
-                                                         const BIGNUM *m,
-                                                         BN_CTX *ctx,
-                                                         BN_MONT_CTX *m_ctx),
-                                      BN_MONT_CTX *m_ctx);
-
-# ifndef OPENSSL_NO_DEPRECATED
-void BN_set_params(int mul, int high, int low, int mont);
-int BN_get_params(int which);   /* 0, mul, 1 high, 2 low, 3 mont */
-# endif
-
-void BN_RECP_CTX_init(BN_RECP_CTX *recp);
-BN_RECP_CTX *BN_RECP_CTX_new(void);
-void BN_RECP_CTX_free(BN_RECP_CTX *recp);
-int BN_RECP_CTX_set(BN_RECP_CTX *recp, const BIGNUM *rdiv, BN_CTX *ctx);
-int BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
-                          BN_RECP_CTX *recp, BN_CTX *ctx);
-int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                    const BIGNUM *m, BN_CTX *ctx);
-int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m,
-                BN_RECP_CTX *recp, BN_CTX *ctx);
-
-# ifndef OPENSSL_NO_EC2M
-
-/*
- * Functions for arithmetic over binary polynomials represented by BIGNUMs.
- * The BIGNUM::neg property of BIGNUMs representing binary polynomials is
- * ignored. Note that input arguments are not const so that their bit arrays
- * can be expanded to the appropriate size if needed.
- */
-
-/*
- * r = a + b
- */
-int BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b);
-#  define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)
-/*
- * r=a mod p
- */
-int BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p);
-/* r = (a * b) mod p */
-int BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
-/* r = (a * a) mod p */
-int BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-/* r = (1 / b) mod p */
-int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx);
-/* r = (a / b) mod p */
-int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
-/* r = (a ^ b) mod p */
-int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                    const BIGNUM *p, BN_CTX *ctx);
-/* r = sqrt(a) mod p */
-int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                     BN_CTX *ctx);
-/* r^2 + r = a mod p */
-int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                           BN_CTX *ctx);
-#  define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))
-/*-
- * Some functions allow for representation of the irreducible polynomials
- * as an unsigned int[], say p.  The irreducible f(t) is then of the form:
- *     t^p[0] + t^p[1] + ... + t^p[k]
- * where m = p[0] > p[1] > ... > p[k] = 0.
- */
-/* r = a mod p */
-int BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const int p[]);
-/* r = (a * b) mod p */
-int BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p[], BN_CTX *ctx);
-/* r = (a * a) mod p */
-int BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const int p[],
-                        BN_CTX *ctx);
-/* r = (1 / b) mod p */
-int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const int p[],
-                        BN_CTX *ctx);
-/* r = (a / b) mod p */
-int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p[], BN_CTX *ctx);
-/* r = (a ^ b) mod p */
-int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,
-                        const int p[], BN_CTX *ctx);
-/* r = sqrt(a) mod p */
-int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a,
-                         const int p[], BN_CTX *ctx);
-/* r^2 + r = a mod p */
-int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,
-                               const int p[], BN_CTX *ctx);
-int BN_GF2m_poly2arr(const BIGNUM *a, int p[], int max);
-int BN_GF2m_arr2poly(const int p[], BIGNUM *a);
-
-# endif
-
-/*
- * faster mod functions for the 'NIST primes' 0 <= a < p^2
- */
-int BN_nist_mod_192(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_224(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_256(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_384(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx);
-
-const BIGNUM *BN_get0_nist_prime_192(void);
-const BIGNUM *BN_get0_nist_prime_224(void);
-const BIGNUM *BN_get0_nist_prime_256(void);
-const BIGNUM *BN_get0_nist_prime_384(void);
-const BIGNUM *BN_get0_nist_prime_521(void);
-
-/* library internal functions */
-
-# define bn_expand(a,bits) ((((((bits+BN_BITS2-1))/BN_BITS2)) <= (a)->dmax)?\
-        (a):bn_expand2((a),(bits+BN_BITS2-1)/BN_BITS2))
-# define bn_wexpand(a,words) (((words) <= (a)->dmax)?(a):bn_expand2((a),(words)))
-BIGNUM *bn_expand2(BIGNUM *a, int words);
-# ifndef OPENSSL_NO_DEPRECATED
-BIGNUM *bn_dup_expand(const BIGNUM *a, int words); /* unused */
-# endif
-
-/*-
- * Bignum consistency macros
- * There is one "API" macro, bn_fix_top(), for stripping leading zeroes from
- * bignum data after direct manipulations on the data. There is also an
- * "internal" macro, bn_check_top(), for verifying that there are no leading
- * zeroes. Unfortunately, some auditing is required due to the fact that
- * bn_fix_top() has become an overabused duct-tape because bignum data is
- * occasionally passed around in an inconsistent state. So the following
- * changes have been made to sort this out;
- * - bn_fix_top()s implementation has been moved to bn_correct_top()
- * - if BN_DEBUG isn't defined, bn_fix_top() maps to bn_correct_top(), and
- *   bn_check_top() is as before.
- * - if BN_DEBUG *is* defined;
- *   - bn_check_top() tries to pollute unused words even if the bignum 'top' is
- *     consistent. (ed: only if BN_DEBUG_RAND is defined)
- *   - bn_fix_top() maps to bn_check_top() rather than "fixing" anything.
- * The idea is to have debug builds flag up inconsistent bignums when they
- * occur. If that occurs in a bn_fix_top(), we examine the code in question; if
- * the use of bn_fix_top() was appropriate (ie. it follows directly after code
- * that manipulates the bignum) it is converted to bn_correct_top(), and if it
- * was not appropriate, we convert it permanently to bn_check_top() and track
- * down the cause of the bug. Eventually, no internal code should be using the
- * bn_fix_top() macro. External applications and libraries should try this with
- * their own code too, both in terms of building against the openssl headers
- * with BN_DEBUG defined *and* linking with a version of OpenSSL built with it
- * defined. This not only improves external code, it provides more test
- * coverage for openssl's own code.
- */
-
-# ifdef BN_DEBUG
-
-/* We only need assert() when debugging */
-#  include <assert.h>
-
-#  ifdef BN_DEBUG_RAND
-/* To avoid "make update" cvs wars due to BN_DEBUG, use some tricks */
-#   ifndef RAND_pseudo_bytes
-int RAND_pseudo_bytes(unsigned char *buf, int num);
-#    define BN_DEBUG_TRIX
-#   endif
-#   define bn_pollute(a) \
-        do { \
-                const BIGNUM *_bnum1 = (a); \
-                if(_bnum1->top < _bnum1->dmax) { \
-                        unsigned char _tmp_char; \
-                        /* We cast away const without the compiler knowing, any \
-                         * *genuinely* constant variables that aren't mutable \
-                         * wouldn't be constructed with top!=dmax. */ \
-                        BN_ULONG *_not_const; \
-                        memcpy(&_not_const, &_bnum1->d, sizeof(BN_ULONG*)); \
-                        /* Debug only - safe to ignore error return */ \
-                        RAND_pseudo_bytes(&_tmp_char, 1); \
-                        memset((unsigned char *)(_not_const + _bnum1->top), _tmp_char, \
-                                (_bnum1->dmax - _bnum1->top) * sizeof(BN_ULONG)); \
-                } \
-        } while(0)
-#   ifdef BN_DEBUG_TRIX
-#    undef RAND_pseudo_bytes
-#   endif
-#  else
-#   define bn_pollute(a)
-#  endif
-#  define bn_check_top(a) \
-        do { \
-                const BIGNUM *_bnum2 = (a); \
-                if (_bnum2 != NULL) { \
-                        assert((_bnum2->top == 0) || \
-                                (_bnum2->d[_bnum2->top - 1] != 0)); \
-                        bn_pollute(_bnum2); \
-                } \
-        } while(0)
-
-#  define bn_fix_top(a)           bn_check_top(a)
-
-#  define bn_check_size(bn, bits) bn_wcheck_size(bn, ((bits+BN_BITS2-1))/BN_BITS2)
-#  define bn_wcheck_size(bn, words) \
-        do { \
-                const BIGNUM *_bnum2 = (bn); \
-                assert((words) <= (_bnum2)->dmax && (words) >= (_bnum2)->top); \
-                /* avoid unused variable warning with NDEBUG */ \
-                (void)(_bnum2); \
-        } while(0)
-
-# else                          /* !BN_DEBUG */
-
-#  define bn_pollute(a)
-#  define bn_check_top(a)
-#  define bn_fix_top(a)           bn_correct_top(a)
-#  define bn_check_size(bn, bits)
-#  define bn_wcheck_size(bn, words)
-
-# endif
-
-# define bn_correct_top(a) \
-        { \
-        BN_ULONG *ftl; \
-        int tmp_top = (a)->top; \
-        if (tmp_top > 0) \
-                { \
-                for (ftl= &((a)->d[tmp_top-1]); tmp_top > 0; tmp_top--) \
-                        if (*(ftl--)) break; \
-                (a)->top = tmp_top; \
-                } \
-        bn_pollute(a); \
-        }
-
-BN_ULONG bn_mul_add_words(BN_ULONG *rp, const BN_ULONG *ap, int num,
-                          BN_ULONG w);
-BN_ULONG bn_mul_words(BN_ULONG *rp, const BN_ULONG *ap, int num, BN_ULONG w);
-void bn_sqr_words(BN_ULONG *rp, const BN_ULONG *ap, int num);
-BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d);
-BN_ULONG bn_add_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                      int num);
-BN_ULONG bn_sub_words(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,
-                      int num);
-
-/* Primes from RFC 2409 */
-BIGNUM *get_rfc2409_prime_768(BIGNUM *bn);
-BIGNUM *get_rfc2409_prime_1024(BIGNUM *bn);
-
-/* Primes from RFC 3526 */
-BIGNUM *get_rfc3526_prime_1536(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_2048(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_3072(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_4096(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_6144(BIGNUM *bn);
-BIGNUM *get_rfc3526_prime_8192(BIGNUM *bn);
-
-int BN_bntest_rand(BIGNUM *rnd, int bits, int top, int bottom);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_BN_strings(void);
-
-/* Error codes for the BN functions. */
-
-/* Function codes. */
-# define BN_F_BNRAND                                      127
-# define BN_F_BN_BLINDING_CONVERT_EX                      100
-# define BN_F_BN_BLINDING_CREATE_PARAM                    128
-# define BN_F_BN_BLINDING_INVERT_EX                       101
-# define BN_F_BN_BLINDING_NEW                             102
-# define BN_F_BN_BLINDING_UPDATE                          103
-# define BN_F_BN_BN2DEC                                   104
-# define BN_F_BN_BN2HEX                                   105
-# define BN_F_BN_CTX_GET                                  116
-# define BN_F_BN_CTX_NEW                                  106
-# define BN_F_BN_CTX_START                                129
-# define BN_F_BN_DIV                                      107
-# define BN_F_BN_DIV_NO_BRANCH                            138
-# define BN_F_BN_DIV_RECP                                 130
-# define BN_F_BN_EXP                                      123
-# define BN_F_BN_EXPAND2                                  108
-# define BN_F_BN_EXPAND_INTERNAL                          120
-# define BN_F_BN_GF2M_MOD                                 131
-# define BN_F_BN_GF2M_MOD_EXP                             132
-# define BN_F_BN_GF2M_MOD_MUL                             133
-# define BN_F_BN_GF2M_MOD_SOLVE_QUAD                      134
-# define BN_F_BN_GF2M_MOD_SOLVE_QUAD_ARR                  135
-# define BN_F_BN_GF2M_MOD_SQR                             136
-# define BN_F_BN_GF2M_MOD_SQRT                            137
-# define BN_F_BN_LSHIFT                                   145
-# define BN_F_BN_MOD_EXP2_MONT                            118
-# define BN_F_BN_MOD_EXP_MONT                             109
-# define BN_F_BN_MOD_EXP_MONT_CONSTTIME                   124
-# define BN_F_BN_MOD_EXP_MONT_WORD                        117
-# define BN_F_BN_MOD_EXP_RECP                             125
-# define BN_F_BN_MOD_EXP_SIMPLE                           126
-# define BN_F_BN_MOD_INVERSE                              110
-# define BN_F_BN_MOD_INVERSE_NO_BRANCH                    139
-# define BN_F_BN_MOD_LSHIFT_QUICK                         119
-# define BN_F_BN_MOD_MUL_RECIPROCAL                       111
-# define BN_F_BN_MOD_SQRT                                 121
-# define BN_F_BN_MPI2BN                                   112
-# define BN_F_BN_NEW                                      113
-# define BN_F_BN_RAND                                     114
-# define BN_F_BN_RAND_RANGE                               122
-# define BN_F_BN_RSHIFT                                   146
-# define BN_F_BN_USUB                                     115
-
-/* Reason codes. */
-# define BN_R_ARG2_LT_ARG3                                100
-# define BN_R_BAD_RECIPROCAL                              101
-# define BN_R_BIGNUM_TOO_LONG                             114
-# define BN_R_BITS_TOO_SMALL                              118
-# define BN_R_CALLED_WITH_EVEN_MODULUS                    102
-# define BN_R_DIV_BY_ZERO                                 103
-# define BN_R_ENCODING_ERROR                              104
-# define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA                105
-# define BN_R_INPUT_NOT_REDUCED                           110
-# define BN_R_INVALID_LENGTH                              106
-# define BN_R_INVALID_RANGE                               115
-# define BN_R_INVALID_SHIFT                               119
-# define BN_R_NOT_A_SQUARE                                111
-# define BN_R_NOT_INITIALIZED                             107
-# define BN_R_NO_INVERSE                                  108
-# define BN_R_NO_SOLUTION                                 116
-# define BN_R_P_IS_NOT_PRIME                              112
-# define BN_R_TOO_MANY_ITERATIONS                         113
-# define BN_R_TOO_MANY_TEMPORARY_VARIABLES                109
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/buffer.h b/include.new/openssl/buffer.h
deleted file mode 100644
index 632df93..0000000
--- a/include.new/openssl/buffer.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/* crypto/buffer/buffer.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_BUFFER_H
-# define HEADER_BUFFER_H
-
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# include <stddef.h>
-
-# if !defined(NO_SYS_TYPES_H)
-#  include <sys/types.h>
-# endif
-
-/* Already declared in ossl_typ.h */
-/* typedef struct buf_mem_st BUF_MEM; */
-
-struct buf_mem_st {
-    size_t length;              /* current number of bytes */
-    char *data;
-    size_t max;                 /* size of buffer */
-};
-
-BUF_MEM *BUF_MEM_new(void);
-void BUF_MEM_free(BUF_MEM *a);
-int BUF_MEM_grow(BUF_MEM *str, size_t len);
-int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
-char *BUF_strdup(const char *str);
-char *BUF_strndup(const char *str, size_t siz);
-void *BUF_memdup(const void *data, size_t siz);
-void BUF_reverse(unsigned char *out, const unsigned char *in, size_t siz);
-
-/* safe string functions */
-size_t BUF_strlcpy(char *dst, const char *src, size_t siz);
-size_t BUF_strlcat(char *dst, const char *src, size_t siz);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_BUF_strings(void);
-
-/* Error codes for the BUF functions. */
-
-/* Function codes. */
-# define BUF_F_BUF_MEMDUP                                 103
-# define BUF_F_BUF_MEM_GROW                               100
-# define BUF_F_BUF_MEM_GROW_CLEAN                         105
-# define BUF_F_BUF_MEM_NEW                                101
-# define BUF_F_BUF_STRDUP                                 102
-# define BUF_F_BUF_STRNDUP                                104
-
-/* Reason codes. */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/camellia.h b/include.new/openssl/camellia.h
deleted file mode 100644
index 9be7c0f..0000000
--- a/include.new/openssl/camellia.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* crypto/camellia/camellia.h -*- mode:C; c-file-style: "eay" -*- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- */
-
-#ifndef HEADER_CAMELLIA_H
-# define HEADER_CAMELLIA_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_CAMELLIA
-#  error CAMELLIA is disabled.
-# endif
-
-# include <stddef.h>
-
-# define CAMELLIA_ENCRYPT        1
-# define CAMELLIA_DECRYPT        0
-
-/*
- * Because array size can't be a const in C, the following two are macros.
- * Both sizes are in bytes.
- */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* This should be a hidden type, but EVP requires that the size be known */
-
-# define CAMELLIA_BLOCK_SIZE 16
-# define CAMELLIA_TABLE_BYTE_LEN 272
-# define CAMELLIA_TABLE_WORD_LEN (CAMELLIA_TABLE_BYTE_LEN / 4)
-
-typedef unsigned int KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN]; /* to match
-                                                               * with WORD */
-
-struct camellia_key_st {
-    union {
-        double d;               /* ensures 64-bit align */
-        KEY_TABLE_TYPE rd_key;
-    } u;
-    int grand_rounds;
-};
-typedef struct camellia_key_st CAMELLIA_KEY;
-
-# ifdef OPENSSL_FIPS
-int private_Camellia_set_key(const unsigned char *userKey, const int bits,
-                             CAMELLIA_KEY *key);
-# endif
-int Camellia_set_key(const unsigned char *userKey, const int bits,
-                     CAMELLIA_KEY *key);
-
-void Camellia_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key);
-void Camellia_decrypt(const unsigned char *in, unsigned char *out,
-                      const CAMELLIA_KEY *key);
-
-void Camellia_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                          const CAMELLIA_KEY *key, const int enc);
-void Camellia_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                          size_t length, const CAMELLIA_KEY *key,
-                          unsigned char *ivec, const int enc);
-void Camellia_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char *ivec, int *num, const int enc);
-void Camellia_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t length, const CAMELLIA_KEY *key,
-                           unsigned char *ivec, int *num, const int enc);
-void Camellia_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t length, const CAMELLIA_KEY *key,
-                           unsigned char *ivec, int *num, const int enc);
-void Camellia_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char *ivec, int *num);
-void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const CAMELLIA_KEY *key,
-                             unsigned char ivec[CAMELLIA_BLOCK_SIZE],
-                             unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE],
-                             unsigned int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif                          /* !HEADER_Camellia_H */
diff --git a/include.new/openssl/cast.h b/include.new/openssl/cast.h
deleted file mode 100644
index 0003ec9..0000000
--- a/include.new/openssl/cast.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* crypto/cast/cast.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_CAST_H
-# define HEADER_CAST_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_CAST
-#  error CAST is disabled.
-# endif
-
-# define CAST_ENCRYPT    1
-# define CAST_DECRYPT    0
-
-# define CAST_LONG unsigned int
-
-# define CAST_BLOCK      8
-# define CAST_KEY_LENGTH 16
-
-typedef struct cast_key_st {
-    CAST_LONG data[32];
-    int short_key;              /* Use reduced rounds for short key */
-} CAST_KEY;
-
-# ifdef OPENSSL_FIPS
-void private_CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
-# endif
-void CAST_set_key(CAST_KEY *key, int len, const unsigned char *data);
-void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      const CAST_KEY *key, int enc);
-void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key);
-void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key);
-void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, const CAST_KEY *ks, unsigned char *iv,
-                      int enc);
-void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, const CAST_KEY *schedule,
-                        unsigned char *ivec, int *num, int enc);
-void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, const CAST_KEY *schedule,
-                        unsigned char *ivec, int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/cmac.h b/include.new/openssl/cmac.h
deleted file mode 100644
index 175be83..0000000
--- a/include.new/openssl/cmac.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* crypto/cmac/cmac.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project.
- */
-/* ====================================================================
- * Copyright (c) 2010 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- */
-
-#ifndef HEADER_CMAC_H
-# define HEADER_CMAC_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# include <openssl/evp.h>
-
-/* Opaque */
-typedef struct CMAC_CTX_st CMAC_CTX;
-
-CMAC_CTX *CMAC_CTX_new(void);
-void CMAC_CTX_cleanup(CMAC_CTX *ctx);
-void CMAC_CTX_free(CMAC_CTX *ctx);
-EVP_CIPHER_CTX *CMAC_CTX_get0_cipher_ctx(CMAC_CTX *ctx);
-int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in);
-
-int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen,
-              const EVP_CIPHER *cipher, ENGINE *impl);
-int CMAC_Update(CMAC_CTX *ctx, const void *data, size_t dlen);
-int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen);
-int CMAC_resume(CMAC_CTX *ctx);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/cms.h b/include.new/openssl/cms.h
deleted file mode 100644
index a2281ed..0000000
--- a/include.new/openssl/cms.h
+++ /dev/null
@@ -1,505 +0,0 @@
-/* crypto/cms/cms.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- * project.
- */
-/* ====================================================================
- * Copyright (c) 2008 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- */
-
-#ifndef HEADER_CMS_H
-# define HEADER_CMS_H
-
-# include <openssl/x509.h>
-
-# ifdef OPENSSL_NO_CMS
-#  error CMS is disabled.
-# endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct CMS_ContentInfo_st CMS_ContentInfo;
-typedef struct CMS_SignerInfo_st CMS_SignerInfo;
-typedef struct CMS_CertificateChoices CMS_CertificateChoices;
-typedef struct CMS_RevocationInfoChoice_st CMS_RevocationInfoChoice;
-typedef struct CMS_RecipientInfo_st CMS_RecipientInfo;
-typedef struct CMS_ReceiptRequest_st CMS_ReceiptRequest;
-typedef struct CMS_Receipt_st CMS_Receipt;
-
-DECLARE_STACK_OF(CMS_SignerInfo)
-DECLARE_STACK_OF(GENERAL_NAMES)
-DECLARE_ASN1_FUNCTIONS(CMS_ContentInfo)
-DECLARE_ASN1_FUNCTIONS(CMS_ReceiptRequest)
-DECLARE_ASN1_PRINT_FUNCTION(CMS_ContentInfo)
-
-# define CMS_SIGNERINFO_ISSUER_SERIAL    0
-# define CMS_SIGNERINFO_KEYIDENTIFIER    1
-
-# define CMS_RECIPINFO_TRANS             0
-# define CMS_RECIPINFO_AGREE             1
-# define CMS_RECIPINFO_KEK               2
-# define CMS_RECIPINFO_PASS              3
-# define CMS_RECIPINFO_OTHER             4
-
-/* S/MIME related flags */
-
-# define CMS_TEXT                        0x1
-# define CMS_NOCERTS                     0x2
-# define CMS_NO_CONTENT_VERIFY           0x4
-# define CMS_NO_ATTR_VERIFY              0x8
-# define CMS_NOSIGS                      \
-                        (CMS_NO_CONTENT_VERIFY|CMS_NO_ATTR_VERIFY)
-# define CMS_NOINTERN                    0x10
-# define CMS_NO_SIGNER_CERT_VERIFY       0x20
-# define CMS_NOVERIFY                    0x20
-# define CMS_DETACHED                    0x40
-# define CMS_BINARY                      0x80
-# define CMS_NOATTR                      0x100
-# define CMS_NOSMIMECAP                  0x200
-# define CMS_NOOLDMIMETYPE               0x400
-# define CMS_CRLFEOL                     0x800
-# define CMS_STREAM                      0x1000
-# define CMS_NOCRL                       0x2000
-# define CMS_PARTIAL                     0x4000
-# define CMS_REUSE_DIGEST                0x8000
-# define CMS_USE_KEYID                   0x10000
-# define CMS_DEBUG_DECRYPT               0x20000
-
-const ASN1_OBJECT *CMS_get0_type(CMS_ContentInfo *cms);
-
-BIO *CMS_dataInit(CMS_ContentInfo *cms, BIO *icont);
-int CMS_dataFinal(CMS_ContentInfo *cms, BIO *bio);
-
-ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
-int CMS_is_detached(CMS_ContentInfo *cms);
-int CMS_set_detached(CMS_ContentInfo *cms, int detached);
-
-# ifdef HEADER_PEM_H
-DECLARE_PEM_rw_const(CMS, CMS_ContentInfo)
-# endif
-int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms);
-CMS_ContentInfo *d2i_CMS_bio(BIO *bp, CMS_ContentInfo **cms);
-int i2d_CMS_bio(BIO *bp, CMS_ContentInfo *cms);
-
-BIO *BIO_new_CMS(BIO *out, CMS_ContentInfo *cms);
-int i2d_CMS_bio_stream(BIO *out, CMS_ContentInfo *cms, BIO *in, int flags);
-int PEM_write_bio_CMS_stream(BIO *out, CMS_ContentInfo *cms, BIO *in,
-                             int flags);
-CMS_ContentInfo *SMIME_read_CMS(BIO *bio, BIO **bcont);
-int SMIME_write_CMS(BIO *bio, CMS_ContentInfo *cms, BIO *data, int flags);
-
-int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont,
-              unsigned int flags);
-
-CMS_ContentInfo *CMS_sign(X509 *signcert, EVP_PKEY *pkey,
-                          STACK_OF(X509) *certs, BIO *data,
-                          unsigned int flags);
-
-CMS_ContentInfo *CMS_sign_receipt(CMS_SignerInfo *si,
-                                  X509 *signcert, EVP_PKEY *pkey,
-                                  STACK_OF(X509) *certs, unsigned int flags);
-
-int CMS_data(CMS_ContentInfo *cms, BIO *out, unsigned int flags);
-CMS_ContentInfo *CMS_data_create(BIO *in, unsigned int flags);
-
-int CMS_digest_verify(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                      unsigned int flags);
-CMS_ContentInfo *CMS_digest_create(BIO *in, const EVP_MD *md,
-                                   unsigned int flags);
-
-int CMS_EncryptedData_decrypt(CMS_ContentInfo *cms,
-                              const unsigned char *key, size_t keylen,
-                              BIO *dcont, BIO *out, unsigned int flags);
-
-CMS_ContentInfo *CMS_EncryptedData_encrypt(BIO *in, const EVP_CIPHER *cipher,
-                                           const unsigned char *key,
-                                           size_t keylen, unsigned int flags);
-
-int CMS_EncryptedData_set1_key(CMS_ContentInfo *cms, const EVP_CIPHER *ciph,
-                               const unsigned char *key, size_t keylen);
-
-int CMS_verify(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-               X509_STORE *store, BIO *dcont, BIO *out, unsigned int flags);
-
-int CMS_verify_receipt(CMS_ContentInfo *rcms, CMS_ContentInfo *ocms,
-                       STACK_OF(X509) *certs,
-                       X509_STORE *store, unsigned int flags);
-
-STACK_OF(X509) *CMS_get0_signers(CMS_ContentInfo *cms);
-
-CMS_ContentInfo *CMS_encrypt(STACK_OF(X509) *certs, BIO *in,
-                             const EVP_CIPHER *cipher, unsigned int flags);
-
-int CMS_decrypt(CMS_ContentInfo *cms, EVP_PKEY *pkey, X509 *cert,
-                BIO *dcont, BIO *out, unsigned int flags);
-
-int CMS_decrypt_set1_pkey(CMS_ContentInfo *cms, EVP_PKEY *pk, X509 *cert);
-int CMS_decrypt_set1_key(CMS_ContentInfo *cms,
-                         unsigned char *key, size_t keylen,
-                         unsigned char *id, size_t idlen);
-int CMS_decrypt_set1_password(CMS_ContentInfo *cms,
-                              unsigned char *pass, ossl_ssize_t passlen);
-
-STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms);
-int CMS_RecipientInfo_type(CMS_RecipientInfo *ri);
-CMS_ContentInfo *CMS_EnvelopedData_create(const EVP_CIPHER *cipher);
-CMS_RecipientInfo *CMS_add1_recipient_cert(CMS_ContentInfo *cms,
-                                           X509 *recip, unsigned int flags);
-int CMS_RecipientInfo_set0_pkey(CMS_RecipientInfo *ri, EVP_PKEY *pkey);
-int CMS_RecipientInfo_ktri_cert_cmp(CMS_RecipientInfo *ri, X509 *cert);
-int CMS_RecipientInfo_ktri_get0_algs(CMS_RecipientInfo *ri,
-                                     EVP_PKEY **pk, X509 **recip,
-                                     X509_ALGOR **palg);
-int CMS_RecipientInfo_ktri_get0_signer_id(CMS_RecipientInfo *ri,
-                                          ASN1_OCTET_STRING **keyid,
-                                          X509_NAME **issuer,
-                                          ASN1_INTEGER **sno);
-
-CMS_RecipientInfo *CMS_add0_recipient_key(CMS_ContentInfo *cms, int nid,
-                                          unsigned char *key, size_t keylen,
-                                          unsigned char *id, size_t idlen,
-                                          ASN1_GENERALIZEDTIME *date,
-                                          ASN1_OBJECT *otherTypeId,
-                                          ASN1_TYPE *otherType);
-
-int CMS_RecipientInfo_kekri_get0_id(CMS_RecipientInfo *ri,
-                                    X509_ALGOR **palg,
-                                    ASN1_OCTET_STRING **pid,
-                                    ASN1_GENERALIZEDTIME **pdate,
-                                    ASN1_OBJECT **potherid,
-                                    ASN1_TYPE **pothertype);
-
-int CMS_RecipientInfo_set0_key(CMS_RecipientInfo *ri,
-                               unsigned char *key, size_t keylen);
-
-int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri,
-                                   const unsigned char *id, size_t idlen);
-
-int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri,
-                                    unsigned char *pass,
-                                    ossl_ssize_t passlen);
-
-CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
-                                               int iter, int wrap_nid,
-                                               int pbe_nid,
-                                               unsigned char *pass,
-                                               ossl_ssize_t passlen,
-                                               const EVP_CIPHER *kekciph);
-
-int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri);
-
-int CMS_uncompress(CMS_ContentInfo *cms, BIO *dcont, BIO *out,
-                   unsigned int flags);
-CMS_ContentInfo *CMS_compress(BIO *in, int comp_nid, unsigned int flags);
-
-int CMS_set1_eContentType(CMS_ContentInfo *cms, const ASN1_OBJECT *oid);
-const ASN1_OBJECT *CMS_get0_eContentType(CMS_ContentInfo *cms);
-
-CMS_CertificateChoices *CMS_add0_CertificateChoices(CMS_ContentInfo *cms);
-int CMS_add0_cert(CMS_ContentInfo *cms, X509 *cert);
-int CMS_add1_cert(CMS_ContentInfo *cms, X509 *cert);
-STACK_OF(X509) *CMS_get1_certs(CMS_ContentInfo *cms);
-
-CMS_RevocationInfoChoice *CMS_add0_RevocationInfoChoice(CMS_ContentInfo *cms);
-int CMS_add0_crl(CMS_ContentInfo *cms, X509_CRL *crl);
-int CMS_add1_crl(CMS_ContentInfo *cms, X509_CRL *crl);
-STACK_OF(X509_CRL) *CMS_get1_crls(CMS_ContentInfo *cms);
-
-int CMS_SignedData_init(CMS_ContentInfo *cms);
-CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
-                                X509 *signer, EVP_PKEY *pk, const EVP_MD *md,
-                                unsigned int flags);
-STACK_OF(CMS_SignerInfo) *CMS_get0_SignerInfos(CMS_ContentInfo *cms);
-
-void CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer);
-int CMS_SignerInfo_get0_signer_id(CMS_SignerInfo *si,
-                                  ASN1_OCTET_STRING **keyid,
-                                  X509_NAME **issuer, ASN1_INTEGER **sno);
-int CMS_SignerInfo_cert_cmp(CMS_SignerInfo *si, X509 *cert);
-int CMS_set1_signers_certs(CMS_ContentInfo *cms, STACK_OF(X509) *certs,
-                           unsigned int flags);
-void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk,
-                              X509 **signer, X509_ALGOR **pdig,
-                              X509_ALGOR **psig);
-int CMS_SignerInfo_sign(CMS_SignerInfo *si);
-int CMS_SignerInfo_verify(CMS_SignerInfo *si);
-int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain);
-
-int CMS_add_smimecap(CMS_SignerInfo *si, STACK_OF(X509_ALGOR) *algs);
-int CMS_add_simple_smimecap(STACK_OF(X509_ALGOR) **algs,
-                            int algnid, int keysize);
-int CMS_add_standard_smimecap(STACK_OF(X509_ALGOR) **smcap);
-
-int CMS_signed_get_attr_count(const CMS_SignerInfo *si);
-int CMS_signed_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-                               int lastpos);
-int CMS_signed_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
-                               int lastpos);
-X509_ATTRIBUTE *CMS_signed_get_attr(const CMS_SignerInfo *si, int loc);
-X509_ATTRIBUTE *CMS_signed_delete_attr(CMS_SignerInfo *si, int loc);
-int CMS_signed_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
-int CMS_signed_add1_attr_by_OBJ(CMS_SignerInfo *si,
-                                const ASN1_OBJECT *obj, int type,
-                                const void *bytes, int len);
-int CMS_signed_add1_attr_by_NID(CMS_SignerInfo *si,
-                                int nid, int type,
-                                const void *bytes, int len);
-int CMS_signed_add1_attr_by_txt(CMS_SignerInfo *si,
-                                const char *attrname, int type,
-                                const void *bytes, int len);
-void *CMS_signed_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
-                                  int lastpos, int type);
-
-int CMS_unsigned_get_attr_count(const CMS_SignerInfo *si);
-int CMS_unsigned_get_attr_by_NID(const CMS_SignerInfo *si, int nid,
-                                 int lastpos);
-int CMS_unsigned_get_attr_by_OBJ(const CMS_SignerInfo *si, ASN1_OBJECT *obj,
-                                 int lastpos);
-X509_ATTRIBUTE *CMS_unsigned_get_attr(const CMS_SignerInfo *si, int loc);
-X509_ATTRIBUTE *CMS_unsigned_delete_attr(CMS_SignerInfo *si, int loc);
-int CMS_unsigned_add1_attr(CMS_SignerInfo *si, X509_ATTRIBUTE *attr);
-int CMS_unsigned_add1_attr_by_OBJ(CMS_SignerInfo *si,
-                                  const ASN1_OBJECT *obj, int type,
-                                  const void *bytes, int len);
-int CMS_unsigned_add1_attr_by_NID(CMS_SignerInfo *si,
-                                  int nid, int type,
-                                  const void *bytes, int len);
-int CMS_unsigned_add1_attr_by_txt(CMS_SignerInfo *si,
-                                  const char *attrname, int type,
-                                  const void *bytes, int len);
-void *CMS_unsigned_get0_data_by_OBJ(CMS_SignerInfo *si, ASN1_OBJECT *oid,
-                                    int lastpos, int type);
-
-# ifdef HEADER_X509V3_H
-
-int CMS_get1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest **prr);
-CMS_ReceiptRequest *CMS_ReceiptRequest_create0(unsigned char *id, int idlen,
-                                               int allorfirst,
-                                               STACK_OF(GENERAL_NAMES)
-                                               *receiptList, STACK_OF(GENERAL_NAMES)
-                                               *receiptsTo);
-int CMS_add1_ReceiptRequest(CMS_SignerInfo *si, CMS_ReceiptRequest *rr);
-void CMS_ReceiptRequest_get0_values(CMS_ReceiptRequest *rr,
-                                    ASN1_STRING **pcid,
-                                    int *pallorfirst,
-                                    STACK_OF(GENERAL_NAMES) **plist,
-                                    STACK_OF(GENERAL_NAMES) **prto);
-
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_CMS_strings(void);
-
-/* Error codes for the CMS functions. */
-
-/* Function codes. */
-# define CMS_F_CHECK_CONTENT                              99
-# define CMS_F_CMS_ADD0_CERT                              164
-# define CMS_F_CMS_ADD0_RECIPIENT_KEY                     100
-# define CMS_F_CMS_ADD0_RECIPIENT_PASSWORD                165
-# define CMS_F_CMS_ADD1_RECEIPTREQUEST                    158
-# define CMS_F_CMS_ADD1_RECIPIENT_CERT                    101
-# define CMS_F_CMS_ADD1_SIGNER                            102
-# define CMS_F_CMS_ADD1_SIGNINGTIME                       103
-# define CMS_F_CMS_COMPRESS                               104
-# define CMS_F_CMS_COMPRESSEDDATA_CREATE                  105
-# define CMS_F_CMS_COMPRESSEDDATA_INIT_BIO                106
-# define CMS_F_CMS_COPY_CONTENT                           107
-# define CMS_F_CMS_COPY_MESSAGEDIGEST                     108
-# define CMS_F_CMS_DATA                                   109
-# define CMS_F_CMS_DATAFINAL                              110
-# define CMS_F_CMS_DATAINIT                               111
-# define CMS_F_CMS_DECRYPT                                112
-# define CMS_F_CMS_DECRYPT_SET1_KEY                       113
-# define CMS_F_CMS_DECRYPT_SET1_PASSWORD                  166
-# define CMS_F_CMS_DECRYPT_SET1_PKEY                      114
-# define CMS_F_CMS_DIGESTALGORITHM_FIND_CTX               115
-# define CMS_F_CMS_DIGESTALGORITHM_INIT_BIO               116
-# define CMS_F_CMS_DIGESTEDDATA_DO_FINAL                  117
-# define CMS_F_CMS_DIGEST_VERIFY                          118
-# define CMS_F_CMS_ENCODE_RECEIPT                         161
-# define CMS_F_CMS_ENCRYPT                                119
-# define CMS_F_CMS_ENCRYPTEDCONTENT_INIT_BIO              120
-# define CMS_F_CMS_ENCRYPTEDDATA_DECRYPT                  121
-# define CMS_F_CMS_ENCRYPTEDDATA_ENCRYPT                  122
-# define CMS_F_CMS_ENCRYPTEDDATA_SET1_KEY                 123
-# define CMS_F_CMS_ENVELOPEDDATA_CREATE                   124
-# define CMS_F_CMS_ENVELOPEDDATA_INIT_BIO                 125
-# define CMS_F_CMS_ENVELOPED_DATA_INIT                    126
-# define CMS_F_CMS_FINAL                                  127
-# define CMS_F_CMS_GET0_CERTIFICATE_CHOICES               128
-# define CMS_F_CMS_GET0_CONTENT                           129
-# define CMS_F_CMS_GET0_ECONTENT_TYPE                     130
-# define CMS_F_CMS_GET0_ENVELOPED                         131
-# define CMS_F_CMS_GET0_REVOCATION_CHOICES                132
-# define CMS_F_CMS_GET0_SIGNED                            133
-# define CMS_F_CMS_MSGSIGDIGEST_ADD1                      162
-# define CMS_F_CMS_RECEIPTREQUEST_CREATE0                 159
-# define CMS_F_CMS_RECEIPT_VERIFY                         160
-# define CMS_F_CMS_RECIPIENTINFO_DECRYPT                  134
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_DECRYPT            135
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_ENCRYPT            136
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_GET0_ID            137
-# define CMS_F_CMS_RECIPIENTINFO_KEKRI_ID_CMP             138
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_CERT_CMP            139
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_DECRYPT             140
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_ENCRYPT             141
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_ALGS           142
-# define CMS_F_CMS_RECIPIENTINFO_KTRI_GET0_SIGNER_ID      143
-# define CMS_F_CMS_RECIPIENTINFO_PWRI_CRYPT               167
-# define CMS_F_CMS_RECIPIENTINFO_SET0_KEY                 144
-# define CMS_F_CMS_RECIPIENTINFO_SET0_PASSWORD            168
-# define CMS_F_CMS_RECIPIENTINFO_SET0_PKEY                145
-# define CMS_F_CMS_SET1_SIGNERIDENTIFIER                  146
-# define CMS_F_CMS_SET_DETACHED                           147
-# define CMS_F_CMS_SIGN                                   148
-# define CMS_F_CMS_SIGNED_DATA_INIT                       149
-# define CMS_F_CMS_SIGNERINFO_CONTENT_SIGN                150
-# define CMS_F_CMS_SIGNERINFO_SIGN                        151
-# define CMS_F_CMS_SIGNERINFO_VERIFY                      152
-# define CMS_F_CMS_SIGNERINFO_VERIFY_CERT                 153
-# define CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT              154
-# define CMS_F_CMS_SIGN_RECEIPT                           163
-# define CMS_F_CMS_STREAM                                 155
-# define CMS_F_CMS_UNCOMPRESS                             156
-# define CMS_F_CMS_VERIFY                                 157
-
-/* Reason codes. */
-# define CMS_R_ADD_SIGNER_ERROR                           99
-# define CMS_R_CERTIFICATE_ALREADY_PRESENT                175
-# define CMS_R_CERTIFICATE_HAS_NO_KEYID                   160
-# define CMS_R_CERTIFICATE_VERIFY_ERROR                   100
-# define CMS_R_CIPHER_INITIALISATION_ERROR                101
-# define CMS_R_CIPHER_PARAMETER_INITIALISATION_ERROR      102
-# define CMS_R_CMS_DATAFINAL_ERROR                        103
-# define CMS_R_CMS_LIB                                    104
-# define CMS_R_CONTENTIDENTIFIER_MISMATCH                 170
-# define CMS_R_CONTENT_NOT_FOUND                          105
-# define CMS_R_CONTENT_TYPE_MISMATCH                      171
-# define CMS_R_CONTENT_TYPE_NOT_COMPRESSED_DATA           106
-# define CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA            107
-# define CMS_R_CONTENT_TYPE_NOT_SIGNED_DATA               108
-# define CMS_R_CONTENT_VERIFY_ERROR                       109
-# define CMS_R_CTRL_ERROR                                 110
-# define CMS_R_CTRL_FAILURE                               111
-# define CMS_R_DECRYPT_ERROR                              112
-# define CMS_R_DIGEST_ERROR                               161
-# define CMS_R_ERROR_GETTING_PUBLIC_KEY                   113
-# define CMS_R_ERROR_READING_MESSAGEDIGEST_ATTRIBUTE      114
-# define CMS_R_ERROR_SETTING_KEY                          115
-# define CMS_R_ERROR_SETTING_RECIPIENTINFO                116
-# define CMS_R_INVALID_ENCRYPTED_KEY_LENGTH               117
-# define CMS_R_INVALID_KEY_ENCRYPTION_PARAMETER           176
-# define CMS_R_INVALID_KEY_LENGTH                         118
-# define CMS_R_MD_BIO_INIT_ERROR                          119
-# define CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH       120
-# define CMS_R_MESSAGEDIGEST_WRONG_LENGTH                 121
-# define CMS_R_MSGSIGDIGEST_ERROR                         172
-# define CMS_R_MSGSIGDIGEST_VERIFICATION_FAILURE          162
-# define CMS_R_MSGSIGDIGEST_WRONG_LENGTH                  163
-# define CMS_R_NEED_ONE_SIGNER                            164
-# define CMS_R_NOT_A_SIGNED_RECEIPT                       165
-# define CMS_R_NOT_ENCRYPTED_DATA                         122
-# define CMS_R_NOT_KEK                                    123
-# define CMS_R_NOT_KEY_TRANSPORT                          124
-# define CMS_R_NOT_PWRI                                   177
-# define CMS_R_NOT_SUPPORTED_FOR_THIS_KEY_TYPE            125
-# define CMS_R_NO_CIPHER                                  126
-# define CMS_R_NO_CONTENT                                 127
-# define CMS_R_NO_CONTENT_TYPE                            173
-# define CMS_R_NO_DEFAULT_DIGEST                          128
-# define CMS_R_NO_DIGEST_SET                              129
-# define CMS_R_NO_KEY                                     130
-# define CMS_R_NO_KEY_OR_CERT                             174
-# define CMS_R_NO_MATCHING_DIGEST                         131
-# define CMS_R_NO_MATCHING_RECIPIENT                      132
-# define CMS_R_NO_MATCHING_SIGNATURE                      166
-# define CMS_R_NO_MSGSIGDIGEST                            167
-# define CMS_R_NO_PASSWORD                                178
-# define CMS_R_NO_PRIVATE_KEY                             133
-# define CMS_R_NO_PUBLIC_KEY                              134
-# define CMS_R_NO_RECEIPT_REQUEST                         168
-# define CMS_R_NO_SIGNERS                                 135
-# define CMS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE     136
-# define CMS_R_RECEIPT_DECODE_ERROR                       169
-# define CMS_R_RECIPIENT_ERROR                            137
-# define CMS_R_SIGNER_CERTIFICATE_NOT_FOUND               138
-# define CMS_R_SIGNFINAL_ERROR                            139
-# define CMS_R_SMIME_TEXT_ERROR                           140
-# define CMS_R_STORE_INIT_ERROR                           141
-# define CMS_R_TYPE_NOT_COMPRESSED_DATA                   142
-# define CMS_R_TYPE_NOT_DATA                              143
-# define CMS_R_TYPE_NOT_DIGESTED_DATA                     144
-# define CMS_R_TYPE_NOT_ENCRYPTED_DATA                    145
-# define CMS_R_TYPE_NOT_ENVELOPED_DATA                    146
-# define CMS_R_UNABLE_TO_FINALIZE_CONTEXT                 147
-# define CMS_R_UNKNOWN_CIPHER                             148
-# define CMS_R_UNKNOWN_DIGEST_ALGORIHM                    149
-# define CMS_R_UNKNOWN_ID                                 150
-# define CMS_R_UNSUPPORTED_COMPRESSION_ALGORITHM          151
-# define CMS_R_UNSUPPORTED_CONTENT_TYPE                   152
-# define CMS_R_UNSUPPORTED_KEK_ALGORITHM                  153
-# define CMS_R_UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM       179
-# define CMS_R_UNSUPPORTED_RECIPIENT_TYPE                 154
-# define CMS_R_UNSUPPORTED_RECPIENTINFO_TYPE              155
-# define CMS_R_UNSUPPORTED_TYPE                           156
-# define CMS_R_UNWRAP_ERROR                               157
-# define CMS_R_UNWRAP_FAILURE                             180
-# define CMS_R_VERIFICATION_FAILURE                       158
-# define CMS_R_WRAP_ERROR                                 159
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/comp.h b/include.new/openssl/comp.h
deleted file mode 100644
index 406c428..0000000
--- a/include.new/openssl/comp.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-#ifndef HEADER_COMP_H
-# define HEADER_COMP_H
-
-# include <openssl/crypto.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct comp_ctx_st COMP_CTX;
-
-typedef struct comp_method_st {
-    int type;                   /* NID for compression library */
-    const char *name;           /* A text string to identify the library */
-    int (*init) (COMP_CTX *ctx);
-    void (*finish) (COMP_CTX *ctx);
-    int (*compress) (COMP_CTX *ctx,
-                     unsigned char *out, unsigned int olen,
-                     unsigned char *in, unsigned int ilen);
-    int (*expand) (COMP_CTX *ctx,
-                   unsigned char *out, unsigned int olen,
-                   unsigned char *in, unsigned int ilen);
-    /*
-     * The following two do NOTHING, but are kept for backward compatibility
-     */
-    long (*ctrl) (void);
-    long (*callback_ctrl) (void);
-} COMP_METHOD;
-
-struct comp_ctx_st {
-    COMP_METHOD *meth;
-    unsigned long compress_in;
-    unsigned long compress_out;
-    unsigned long expand_in;
-    unsigned long expand_out;
-    CRYPTO_EX_DATA ex_data;
-};
-
-COMP_CTX *COMP_CTX_new(COMP_METHOD *meth);
-void COMP_CTX_free(COMP_CTX *ctx);
-int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
-                        unsigned char *in, int ilen);
-int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
-                      unsigned char *in, int ilen);
-COMP_METHOD *COMP_rle(void);
-COMP_METHOD *COMP_zlib(void);
-void COMP_zlib_cleanup(void);
-
-# ifdef HEADER_BIO_H
-#  ifdef ZLIB
-BIO_METHOD *BIO_f_zlib(void);
-#  endif
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_COMP_strings(void);
-
-/* Error codes for the COMP functions. */
-
-/* Function codes. */
-# define COMP_F_BIO_ZLIB_FLUSH                            99
-# define COMP_F_BIO_ZLIB_NEW                              100
-# define COMP_F_BIO_ZLIB_READ                             101
-# define COMP_F_BIO_ZLIB_WRITE                            102
-
-/* Reason codes. */
-# define COMP_R_ZLIB_DEFLATE_ERROR                        99
-# define COMP_R_ZLIB_INFLATE_ERROR                        100
-# define COMP_R_ZLIB_NOT_SUPPORTED                        101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/conf.h b/include.new/openssl/conf.h
deleted file mode 100644
index 8d926d5..0000000
--- a/include.new/openssl/conf.h
+++ /dev/null
@@ -1,267 +0,0 @@
-/* crypto/conf/conf.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef  HEADER_CONF_H
-# define HEADER_CONF_H
-
-# include <openssl/bio.h>
-# include <openssl/lhash.h>
-# include <openssl/stack.h>
-# include <openssl/safestack.h>
-# include <openssl/e_os2.h>
-
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct {
-    char *section;
-    char *name;
-    char *value;
-} CONF_VALUE;
-
-DECLARE_STACK_OF(CONF_VALUE)
-DECLARE_LHASH_OF(CONF_VALUE);
-
-struct conf_st;
-struct conf_method_st;
-typedef struct conf_method_st CONF_METHOD;
-
-struct conf_method_st {
-    const char *name;
-    CONF *(*create) (CONF_METHOD *meth);
-    int (*init) (CONF *conf);
-    int (*destroy) (CONF *conf);
-    int (*destroy_data) (CONF *conf);
-    int (*load_bio) (CONF *conf, BIO *bp, long *eline);
-    int (*dump) (const CONF *conf, BIO *bp);
-    int (*is_number) (const CONF *conf, char c);
-    int (*to_int) (const CONF *conf, char c);
-    int (*load) (CONF *conf, const char *name, long *eline);
-};
-
-/* Module definitions */
-
-typedef struct conf_imodule_st CONF_IMODULE;
-typedef struct conf_module_st CONF_MODULE;
-
-DECLARE_STACK_OF(CONF_MODULE)
-DECLARE_STACK_OF(CONF_IMODULE)
-
-/* DSO module function typedefs */
-typedef int conf_init_func (CONF_IMODULE *md, const CONF *cnf);
-typedef void conf_finish_func (CONF_IMODULE *md);
-
-# define CONF_MFLAGS_IGNORE_ERRORS       0x1
-# define CONF_MFLAGS_IGNORE_RETURN_CODES 0x2
-# define CONF_MFLAGS_SILENT              0x4
-# define CONF_MFLAGS_NO_DSO              0x8
-# define CONF_MFLAGS_IGNORE_MISSING_FILE 0x10
-# define CONF_MFLAGS_DEFAULT_SECTION     0x20
-
-int CONF_set_default_method(CONF_METHOD *meth);
-void CONF_set_nconf(CONF *conf, LHASH_OF(CONF_VALUE) *hash);
-LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
-                                long *eline);
-# ifndef OPENSSL_NO_FP_API
-LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
-                                   long *eline);
-# endif
-LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
-                                    long *eline);
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
-                                       const char *section);
-char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                      const char *name);
-long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group,
-                     const char *name);
-void CONF_free(LHASH_OF(CONF_VALUE) *conf);
-int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out);
-int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out);
-
-void OPENSSL_config(const char *config_name);
-void OPENSSL_no_config(void);
-
-/*
- * New conf code.  The semantics are different from the functions above. If
- * that wasn't the case, the above functions would have been replaced
- */
-
-struct conf_st {
-    CONF_METHOD *meth;
-    void *meth_data;
-    LHASH_OF(CONF_VALUE) *data;
-};
-
-CONF *NCONF_new(CONF_METHOD *meth);
-CONF_METHOD *NCONF_default(void);
-CONF_METHOD *NCONF_WIN32(void);
-# if 0                          /* Just to give you an idea of what I have in
-                                 * mind */
-CONF_METHOD *NCONF_XML(void);
-# endif
-void NCONF_free(CONF *conf);
-void NCONF_free_data(CONF *conf);
-
-int NCONF_load(CONF *conf, const char *file, long *eline);
-# ifndef OPENSSL_NO_FP_API
-int NCONF_load_fp(CONF *conf, FILE *fp, long *eline);
-# endif
-int NCONF_load_bio(CONF *conf, BIO *bp, long *eline);
-STACK_OF(CONF_VALUE) *NCONF_get_section(const CONF *conf,
-                                        const char *section);
-char *NCONF_get_string(const CONF *conf, const char *group, const char *name);
-int NCONF_get_number_e(const CONF *conf, const char *group, const char *name,
-                       long *result);
-int NCONF_dump_fp(const CONF *conf, FILE *out);
-int NCONF_dump_bio(const CONF *conf, BIO *out);
-
-# if 0                          /* The following function has no error
-                                 * checking, and should therefore be avoided */
-long NCONF_get_number(CONF *conf, char *group, char *name);
-# else
-#  define NCONF_get_number(c,g,n,r) NCONF_get_number_e(c,g,n,r)
-# endif
-
-/* Module functions */
-
-int CONF_modules_load(const CONF *cnf, const char *appname,
-                      unsigned long flags);
-int CONF_modules_load_file(const char *filename, const char *appname,
-                           unsigned long flags);
-void CONF_modules_unload(int all);
-void CONF_modules_finish(void);
-void CONF_modules_free(void);
-int CONF_module_add(const char *name, conf_init_func *ifunc,
-                    conf_finish_func *ffunc);
-
-const char *CONF_imodule_get_name(const CONF_IMODULE *md);
-const char *CONF_imodule_get_value(const CONF_IMODULE *md);
-void *CONF_imodule_get_usr_data(const CONF_IMODULE *md);
-void CONF_imodule_set_usr_data(CONF_IMODULE *md, void *usr_data);
-CONF_MODULE *CONF_imodule_get_module(const CONF_IMODULE *md);
-unsigned long CONF_imodule_get_flags(const CONF_IMODULE *md);
-void CONF_imodule_set_flags(CONF_IMODULE *md, unsigned long flags);
-void *CONF_module_get_usr_data(CONF_MODULE *pmod);
-void CONF_module_set_usr_data(CONF_MODULE *pmod, void *usr_data);
-
-char *CONF_get1_default_config_file(void);
-
-int CONF_parse_list(const char *list, int sep, int nospc,
-                    int (*list_cb) (const char *elem, int len, void *usr),
-                    void *arg);
-
-void OPENSSL_load_builtin_modules(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_CONF_strings(void);
-
-/* Error codes for the CONF functions. */
-
-/* Function codes. */
-# define CONF_F_CONF_DUMP_FP                              104
-# define CONF_F_CONF_LOAD                                 100
-# define CONF_F_CONF_LOAD_BIO                             102
-# define CONF_F_CONF_LOAD_FP                              103
-# define CONF_F_CONF_MODULES_LOAD                         116
-# define CONF_F_CONF_PARSE_LIST                           119
-# define CONF_F_DEF_LOAD                                  120
-# define CONF_F_DEF_LOAD_BIO                              121
-# define CONF_F_MODULE_INIT                               115
-# define CONF_F_MODULE_LOAD_DSO                           117
-# define CONF_F_MODULE_RUN                                118
-# define CONF_F_NCONF_DUMP_BIO                            105
-# define CONF_F_NCONF_DUMP_FP                             106
-# define CONF_F_NCONF_GET_NUMBER                          107
-# define CONF_F_NCONF_GET_NUMBER_E                        112
-# define CONF_F_NCONF_GET_SECTION                         108
-# define CONF_F_NCONF_GET_STRING                          109
-# define CONF_F_NCONF_LOAD                                113
-# define CONF_F_NCONF_LOAD_BIO                            110
-# define CONF_F_NCONF_LOAD_FP                             114
-# define CONF_F_NCONF_NEW                                 111
-# define CONF_F_STR_COPY                                  101
-
-/* Reason codes. */
-# define CONF_R_ERROR_LOADING_DSO                         110
-# define CONF_R_LIST_CANNOT_BE_NULL                       115
-# define CONF_R_MISSING_CLOSE_SQUARE_BRACKET              100
-# define CONF_R_MISSING_EQUAL_SIGN                        101
-# define CONF_R_MISSING_FINISH_FUNCTION                   111
-# define CONF_R_MISSING_INIT_FUNCTION                     112
-# define CONF_R_MODULE_INITIALIZATION_ERROR               109
-# define CONF_R_NO_CLOSE_BRACE                            102
-# define CONF_R_NO_CONF                                   105
-# define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE           106
-# define CONF_R_NO_SECTION                                107
-# define CONF_R_NO_SUCH_FILE                              114
-# define CONF_R_NO_VALUE                                  108
-# define CONF_R_UNABLE_TO_CREATE_NEW_SECTION              103
-# define CONF_R_UNKNOWN_MODULE_NAME                       113
-# define CONF_R_VARIABLE_HAS_NO_VALUE                     104
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/conf_api.h b/include.new/openssl/conf_api.h
deleted file mode 100644
index e478f7d..0000000
--- a/include.new/openssl/conf_api.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* conf_api.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef  HEADER_CONF_API_H
-# define HEADER_CONF_API_H
-
-# include <openssl/lhash.h>
-# include <openssl/conf.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Up until OpenSSL 0.9.5a, this was new_section */
-CONF_VALUE *_CONF_new_section(CONF *conf, const char *section);
-/* Up until OpenSSL 0.9.5a, this was get_section */
-CONF_VALUE *_CONF_get_section(const CONF *conf, const char *section);
-/* Up until OpenSSL 0.9.5a, this was CONF_get_section */
-STACK_OF(CONF_VALUE) *_CONF_get_section_values(const CONF *conf,
-                                               const char *section);
-
-int _CONF_add_string(CONF *conf, CONF_VALUE *section, CONF_VALUE *value);
-char *_CONF_get_string(const CONF *conf, const char *section,
-                       const char *name);
-long _CONF_get_number(const CONF *conf, const char *section,
-                      const char *name);
-
-int _CONF_new_data(CONF *conf);
-void _CONF_free_data(CONF *conf);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/crypto.h b/include.new/openssl/crypto.h
deleted file mode 100644
index c450d7a..0000000
--- a/include.new/openssl/crypto.h
+++ /dev/null
@@ -1,661 +0,0 @@
-/* crypto/crypto.h */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_CRYPTO_H
-# define HEADER_CRYPTO_H
-
-# include <stdlib.h>
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>
-# endif
-
-# include <openssl/stack.h>
-# include <openssl/safestack.h>
-# include <openssl/opensslv.h>
-# include <openssl/ossl_typ.h>
-
-# ifdef CHARSET_EBCDIC
-#  include <openssl/ebcdic.h>
-# endif
-
-/*
- * Resolve problems on some operating systems with symbol names that clash
- * one way or another
- */
-# include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Backward compatibility to SSLeay */
-/*
- * This is more to be used to check the correct DLL is being used in the MS
- * world.
- */
-# define SSLEAY_VERSION_NUMBER   OPENSSL_VERSION_NUMBER
-# define SSLEAY_VERSION          0
-/* #define SSLEAY_OPTIONS       1 no longer supported */
-# define SSLEAY_CFLAGS           2
-# define SSLEAY_BUILT_ON         3
-# define SSLEAY_PLATFORM         4
-# define SSLEAY_DIR              5
-
-/* Already declared in ossl_typ.h */
-# if 0
-typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-/* Called when a new object is created */
-typedef int CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                           int idx, long argl, void *argp);
-/* Called when an object is free()ed */
-typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                             int idx, long argl, void *argp);
-/* Called when we need to dup an object */
-typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,
-                           void *from_d, int idx, long argl, void *argp);
-# endif
-
-/* A generic structure to pass assorted data in a expandable way */
-typedef struct openssl_item_st {
-    int code;
-    void *value;                /* Not used for flag attributes */
-    size_t value_size;          /* Max size of value for output, length for
-                                 * input */
-    size_t *value_length;       /* Returned length of value for output */
-} OPENSSL_ITEM;
-
-/*
- * When changing the CRYPTO_LOCK_* list, be sure to maintin the text lock
- * names in cryptlib.c
- */
-
-# define CRYPTO_LOCK_ERR                 1
-# define CRYPTO_LOCK_EX_DATA             2
-# define CRYPTO_LOCK_X509                3
-# define CRYPTO_LOCK_X509_INFO           4
-# define CRYPTO_LOCK_X509_PKEY           5
-# define CRYPTO_LOCK_X509_CRL            6
-# define CRYPTO_LOCK_X509_REQ            7
-# define CRYPTO_LOCK_DSA                 8
-# define CRYPTO_LOCK_RSA                 9
-# define CRYPTO_LOCK_EVP_PKEY            10
-# define CRYPTO_LOCK_X509_STORE          11
-# define CRYPTO_LOCK_SSL_CTX             12
-# define CRYPTO_LOCK_SSL_CERT            13
-# define CRYPTO_LOCK_SSL_SESSION         14
-# define CRYPTO_LOCK_SSL_SESS_CERT       15
-# define CRYPTO_LOCK_SSL                 16
-# define CRYPTO_LOCK_SSL_METHOD          17
-# define CRYPTO_LOCK_RAND                18
-# define CRYPTO_LOCK_RAND2               19
-# define CRYPTO_LOCK_MALLOC              20
-# define CRYPTO_LOCK_BIO                 21
-# define CRYPTO_LOCK_GETHOSTBYNAME       22
-# define CRYPTO_LOCK_GETSERVBYNAME       23
-# define CRYPTO_LOCK_READDIR             24
-# define CRYPTO_LOCK_RSA_BLINDING        25
-# define CRYPTO_LOCK_DH                  26
-# define CRYPTO_LOCK_MALLOC2             27
-# define CRYPTO_LOCK_DSO                 28
-# define CRYPTO_LOCK_DYNLOCK             29
-# define CRYPTO_LOCK_ENGINE              30
-# define CRYPTO_LOCK_UI                  31
-# define CRYPTO_LOCK_ECDSA               32
-# define CRYPTO_LOCK_EC                  33
-# define CRYPTO_LOCK_ECDH                34
-# define CRYPTO_LOCK_BN                  35
-# define CRYPTO_LOCK_EC_PRE_COMP         36
-# define CRYPTO_LOCK_STORE               37
-# define CRYPTO_LOCK_COMP                38
-# define CRYPTO_LOCK_FIPS                39
-# define CRYPTO_LOCK_FIPS2               40
-# define CRYPTO_NUM_LOCKS                41
-
-# define CRYPTO_LOCK             1
-# define CRYPTO_UNLOCK           2
-# define CRYPTO_READ             4
-# define CRYPTO_WRITE            8
-
-# ifndef OPENSSL_NO_LOCKING
-#  ifndef CRYPTO_w_lock
-#   define CRYPTO_w_lock(type)     \
-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#   define CRYPTO_w_unlock(type)   \
-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__)
-#   define CRYPTO_r_lock(type)     \
-        CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#   define CRYPTO_r_unlock(type)   \
-        CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__)
-#   define CRYPTO_add(addr,amount,type)    \
-        CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__)
-#  endif
-# else
-#  define CRYPTO_w_lock(a)
-#  define CRYPTO_w_unlock(a)
-#  define CRYPTO_r_lock(a)
-#  define CRYPTO_r_unlock(a)
-#  define CRYPTO_add(a,b,c)       ((*(a))+=(b))
-# endif
-
-/*
- * Some applications as well as some parts of OpenSSL need to allocate and
- * deallocate locks in a dynamic fashion.  The following typedef makes this
- * possible in a type-safe manner.
- */
-/* struct CRYPTO_dynlock_value has to be defined by the application. */
-typedef struct {
-    int references;
-    struct CRYPTO_dynlock_value *data;
-} CRYPTO_dynlock;
-
-/*
- * The following can be used to detect memory leaks in the SSLeay library. It
- * used, it turns on malloc checking
- */
-
-# define CRYPTO_MEM_CHECK_OFF    0x0/* an enume */
-# define CRYPTO_MEM_CHECK_ON     0x1/* a bit */
-# define CRYPTO_MEM_CHECK_ENABLE 0x2/* a bit */
-# define CRYPTO_MEM_CHECK_DISABLE 0x3/* an enume */
-
-/*
- * The following are bit values to turn on or off options connected to the
- * malloc checking functionality
- */
-
-/* Adds time to the memory checking information */
-# define V_CRYPTO_MDEBUG_TIME    0x1/* a bit */
-/* Adds thread number to the memory checking information */
-# define V_CRYPTO_MDEBUG_THREAD  0x2/* a bit */
-
-# define V_CRYPTO_MDEBUG_ALL (V_CRYPTO_MDEBUG_TIME | V_CRYPTO_MDEBUG_THREAD)
-
-/* predec of the BIO type */
-typedef struct bio_st BIO_dummy;
-
-struct crypto_ex_data_st {
-    STACK_OF(void) *sk;
-    /* gcc is screwing up this data structure :-( */
-    int dummy;
-};
-DECLARE_STACK_OF(void)
-
-/*
- * This stuff is basically class callback functions The current classes are
- * SSL_CTX, SSL, SSL_SESSION, and a few more
- */
-
-typedef struct crypto_ex_data_func_st {
-    long argl;                  /* Arbitary long */
-    void *argp;                 /* Arbitary void * */
-    CRYPTO_EX_new *new_func;
-    CRYPTO_EX_free *free_func;
-    CRYPTO_EX_dup *dup_func;
-} CRYPTO_EX_DATA_FUNCS;
-
-DECLARE_STACK_OF(CRYPTO_EX_DATA_FUNCS)
-
-/*
- * Per class, we have a STACK of CRYPTO_EX_DATA_FUNCS for each CRYPTO_EX_DATA
- * entry.
- */
-
-# define CRYPTO_EX_INDEX_BIO             0
-# define CRYPTO_EX_INDEX_SSL             1
-# define CRYPTO_EX_INDEX_SSL_CTX         2
-# define CRYPTO_EX_INDEX_SSL_SESSION     3
-# define CRYPTO_EX_INDEX_X509_STORE      4
-# define CRYPTO_EX_INDEX_X509_STORE_CTX  5
-# define CRYPTO_EX_INDEX_RSA             6
-# define CRYPTO_EX_INDEX_DSA             7
-# define CRYPTO_EX_INDEX_DH              8
-# define CRYPTO_EX_INDEX_ENGINE          9
-# define CRYPTO_EX_INDEX_X509            10
-# define CRYPTO_EX_INDEX_UI              11
-# define CRYPTO_EX_INDEX_ECDSA           12
-# define CRYPTO_EX_INDEX_ECDH            13
-# define CRYPTO_EX_INDEX_COMP            14
-# define CRYPTO_EX_INDEX_STORE           15
-
-/*
- * Dynamically assigned indexes start from this value (don't use directly,
- * use via CRYPTO_ex_data_new_class).
- */
-# define CRYPTO_EX_INDEX_USER            100
-
-/*
- * This is the default callbacks, but we can have others as well: this is
- * needed in Win32 where the application malloc and the library malloc may
- * not be the same.
- */
-# define CRYPTO_malloc_init()    CRYPTO_set_mem_functions(\
-        malloc, realloc, free)
-
-# if defined CRYPTO_MDEBUG_ALL || defined CRYPTO_MDEBUG_TIME || defined CRYPTO_MDEBUG_THREAD
-#  ifndef CRYPTO_MDEBUG         /* avoid duplicate #define */
-#   define CRYPTO_MDEBUG
-#  endif
-# endif
-
-/*
- * Set standard debugging functions (not done by default unless CRYPTO_MDEBUG
- * is defined)
- */
-# define CRYPTO_malloc_debug_init()      do {\
-        CRYPTO_set_mem_debug_functions(\
-                CRYPTO_dbg_malloc,\
-                CRYPTO_dbg_realloc,\
-                CRYPTO_dbg_free,\
-                CRYPTO_dbg_set_options,\
-                CRYPTO_dbg_get_options);\
-        } while(0)
-
-int CRYPTO_mem_ctrl(int mode);
-int CRYPTO_is_mem_check_on(void);
-
-/* for applications */
-# define MemCheck_start() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON)
-# define MemCheck_stop() CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF)
-
-/* for library-internal use */
-# define MemCheck_on()   CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE)
-# define MemCheck_off()  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE)
-# define is_MemCheck_on() CRYPTO_is_mem_check_on()
-
-# define OPENSSL_malloc(num)     CRYPTO_malloc((int)num,__FILE__,__LINE__)
-# define OPENSSL_strdup(str)     CRYPTO_strdup((str),__FILE__,__LINE__)
-# define OPENSSL_realloc(addr,num) \
-        CRYPTO_realloc((char *)addr,(int)num,__FILE__,__LINE__)
-# define OPENSSL_realloc_clean(addr,old_num,num) \
-        CRYPTO_realloc_clean(addr,old_num,num,__FILE__,__LINE__)
-# define OPENSSL_remalloc(addr,num) \
-        CRYPTO_remalloc((char **)addr,(int)num,__FILE__,__LINE__)
-# define OPENSSL_freeFunc        CRYPTO_free
-# define OPENSSL_free(addr)      CRYPTO_free(addr)
-
-# define OPENSSL_malloc_locked(num) \
-        CRYPTO_malloc_locked((int)num,__FILE__,__LINE__)
-# define OPENSSL_free_locked(addr) CRYPTO_free_locked(addr)
-
-const char *SSLeay_version(int type);
-unsigned long SSLeay(void);
-
-int OPENSSL_issetugid(void);
-
-/* An opaque type representing an implementation of "ex_data" support */
-typedef struct st_CRYPTO_EX_DATA_IMPL CRYPTO_EX_DATA_IMPL;
-/* Return an opaque pointer to the current "ex_data" implementation */
-const CRYPTO_EX_DATA_IMPL *CRYPTO_get_ex_data_implementation(void);
-/* Sets the "ex_data" implementation to be used (if it's not too late) */
-int CRYPTO_set_ex_data_implementation(const CRYPTO_EX_DATA_IMPL *i);
-/* Get a new "ex_data" class, and return the corresponding "class_index" */
-int CRYPTO_ex_data_new_class(void);
-/* Within a given class, get/register a new index */
-int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
-                            CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
-                            CRYPTO_EX_free *free_func);
-/*
- * Initialise/duplicate/free CRYPTO_EX_DATA variables corresponding to a
- * given class (invokes whatever per-class callbacks are applicable)
- */
-int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
-int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
-                       CRYPTO_EX_DATA *from);
-void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);
-/*
- * Get/set data in a CRYPTO_EX_DATA variable corresponding to a particular
- * index (relative to the class type involved)
- */
-int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val);
-void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx);
-/*
- * This function cleans up all "ex_data" state. It mustn't be called under
- * potential race-conditions.
- */
-void CRYPTO_cleanup_all_ex_data(void);
-
-int CRYPTO_get_new_lockid(char *name);
-
-int CRYPTO_num_locks(void);     /* return CRYPTO_NUM_LOCKS (shared libs!) */
-void CRYPTO_lock(int mode, int type, const char *file, int line);
-void CRYPTO_set_locking_callback(void (*func) (int mode, int type,
-                                               const char *file, int line));
-void (*CRYPTO_get_locking_callback(void)) (int mode, int type,
-                                           const char *file, int line);
-void CRYPTO_set_add_lock_callback(int (*func)
-                                   (int *num, int mount, int type,
-                                    const char *file, int line));
-int (*CRYPTO_get_add_lock_callback(void)) (int *num, int mount, int type,
-                                           const char *file, int line);
-
-/* Don't use this structure directly. */
-typedef struct crypto_threadid_st {
-    void *ptr;
-    unsigned long val;
-} CRYPTO_THREADID;
-/* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */
-void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val);
-void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr);
-int CRYPTO_THREADID_set_callback(void (*threadid_func) (CRYPTO_THREADID *));
-void (*CRYPTO_THREADID_get_callback(void)) (CRYPTO_THREADID *);
-void CRYPTO_THREADID_current(CRYPTO_THREADID *id);
-int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, const CRYPTO_THREADID *b);
-void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, const CRYPTO_THREADID *src);
-unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id);
-# ifndef OPENSSL_NO_DEPRECATED
-void CRYPTO_set_id_callback(unsigned long (*func) (void));
-unsigned long (*CRYPTO_get_id_callback(void)) (void);
-unsigned long CRYPTO_thread_id(void);
-# endif
-
-const char *CRYPTO_get_lock_name(int type);
-int CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
-                    int line);
-
-int CRYPTO_get_new_dynlockid(void);
-void CRYPTO_destroy_dynlockid(int i);
-struct CRYPTO_dynlock_value *CRYPTO_get_dynlock_value(int i);
-void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value
-                                        *(*dyn_create_function) (const char
-                                                                 *file,
-                                                                 int line));
-void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function)
-                                       (int mode,
-                                        struct CRYPTO_dynlock_value *l,
-                                        const char *file, int line));
-void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function)
-                                          (struct CRYPTO_dynlock_value *l,
-                                           const char *file, int line));
-struct CRYPTO_dynlock_value
-*(*CRYPTO_get_dynlock_create_callback(void)) (const char *file, int line);
-void (*CRYPTO_get_dynlock_lock_callback(void)) (int mode,
-                                                struct CRYPTO_dynlock_value
-                                                *l, const char *file,
-                                                int line);
-void (*CRYPTO_get_dynlock_destroy_callback(void)) (struct CRYPTO_dynlock_value
-                                                   *l, const char *file,
-                                                   int line);
-
-/*
- * CRYPTO_set_mem_functions includes CRYPTO_set_locked_mem_functions -- call
- * the latter last if you need different functions
- */
-int CRYPTO_set_mem_functions(void *(*m) (size_t), void *(*r) (void *, size_t),
-                             void (*f) (void *));
-int CRYPTO_set_locked_mem_functions(void *(*m) (size_t),
-                                    void (*free_func) (void *));
-int CRYPTO_set_mem_ex_functions(void *(*m) (size_t, const char *, int),
-                                void *(*r) (void *, size_t, const char *,
-                                            int), void (*f) (void *));
-int CRYPTO_set_locked_mem_ex_functions(void *(*m) (size_t, const char *, int),
-                                       void (*free_func) (void *));
-int CRYPTO_set_mem_debug_functions(void (*m)
-                                    (void *, int, const char *, int, int),
-                                   void (*r) (void *, void *, int,
-                                              const char *, int, int),
-                                   void (*f) (void *, int), void (*so) (long),
-                                   long (*go) (void));
-void CRYPTO_get_mem_functions(void *(**m) (size_t),
-                              void *(**r) (void *, size_t),
-                              void (**f) (void *));
-void CRYPTO_get_locked_mem_functions(void *(**m) (size_t),
-                                     void (**f) (void *));
-void CRYPTO_get_mem_ex_functions(void *(**m) (size_t, const char *, int),
-                                 void *(**r) (void *, size_t, const char *,
-                                              int), void (**f) (void *));
-void CRYPTO_get_locked_mem_ex_functions(void
-                                        *(**m) (size_t, const char *, int),
-                                        void (**f) (void *));
-void CRYPTO_get_mem_debug_functions(void (**m)
-                                     (void *, int, const char *, int, int),
-                                    void (**r) (void *, void *, int,
-                                                const char *, int, int),
-                                    void (**f) (void *, int),
-                                    void (**so) (long), long (**go) (void));
-
-void *CRYPTO_malloc_locked(int num, const char *file, int line);
-void CRYPTO_free_locked(void *ptr);
-void *CRYPTO_malloc(int num, const char *file, int line);
-char *CRYPTO_strdup(const char *str, const char *file, int line);
-void CRYPTO_free(void *ptr);
-void *CRYPTO_realloc(void *addr, int num, const char *file, int line);
-void *CRYPTO_realloc_clean(void *addr, int old_num, int num, const char *file,
-                           int line);
-void *CRYPTO_remalloc(void *addr, int num, const char *file, int line);
-
-void OPENSSL_cleanse(void *ptr, size_t len);
-
-void CRYPTO_set_mem_debug_options(long bits);
-long CRYPTO_get_mem_debug_options(void);
-
-# define CRYPTO_push_info(info) \
-        CRYPTO_push_info_(info, __FILE__, __LINE__);
-int CRYPTO_push_info_(const char *info, const char *file, int line);
-int CRYPTO_pop_info(void);
-int CRYPTO_remove_all_info(void);
-
-/*
- * Default debugging functions (enabled by CRYPTO_malloc_debug_init() macro;
- * used as default in CRYPTO_MDEBUG compilations):
- */
-/*-
- * The last argument has the following significance:
- *
- * 0:   called before the actual memory allocation has taken place
- * 1:   called after the actual memory allocation has taken place
- */
-void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
-                       int before_p);
-void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num, const char *file,
-                        int line, int before_p);
-void CRYPTO_dbg_free(void *addr, int before_p);
-/*-
- * Tell the debugging code about options.  By default, the following values
- * apply:
- *
- * 0:                           Clear all options.
- * V_CRYPTO_MDEBUG_TIME (1):    Set the "Show Time" option.
- * V_CRYPTO_MDEBUG_THREAD (2):  Set the "Show Thread Number" option.
- * V_CRYPTO_MDEBUG_ALL (3):     1 + 2
- */
-void CRYPTO_dbg_set_options(long bits);
-long CRYPTO_dbg_get_options(void);
-
-# ifndef OPENSSL_NO_FP_API
-void CRYPTO_mem_leaks_fp(FILE *);
-# endif
-void CRYPTO_mem_leaks(struct bio_st *bio);
-/* unsigned long order, char *file, int line, int num_bytes, char *addr */
-typedef void *CRYPTO_MEM_LEAK_CB (unsigned long, const char *, int, int,
-                                  void *);
-void CRYPTO_mem_leaks_cb(CRYPTO_MEM_LEAK_CB *cb);
-
-/* die if we have to */
-void OpenSSLDie(const char *file, int line, const char *assertion);
-# define OPENSSL_assert(e)       (void)((e) ? 0 : (OpenSSLDie(__FILE__, __LINE__, #e),1))
-
-unsigned long *OPENSSL_ia32cap_loc(void);
-# define OPENSSL_ia32cap (*(OPENSSL_ia32cap_loc()))
-int OPENSSL_isservice(void);
-
-int FIPS_mode(void);
-int FIPS_mode_set(int r);
-
-void OPENSSL_init(void);
-
-# define fips_md_init(alg) fips_md_init_ctx(alg, alg)
-
-# ifdef OPENSSL_FIPS
-#  define fips_md_init_ctx(alg, cx) \
-        int alg##_Init(cx##_CTX *c) \
-        { \
-        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \
-                "Low level API call to digest " #alg " forbidden in FIPS mode!"); \
-        return private_##alg##_Init(c); \
-        } \
-        int private_##alg##_Init(cx##_CTX *c)
-
-#  define fips_cipher_abort(alg) \
-        if (FIPS_mode()) OpenSSLDie(__FILE__, __LINE__, \
-                "Low level API call to cipher " #alg " forbidden in FIPS mode!")
-
-# else
-#  define fips_md_init_ctx(alg, cx) \
-        int alg##_Init(cx##_CTX *c)
-#  define fips_cipher_abort(alg) while(0)
-# endif
-
-/*
- * CRYPTO_memcmp returns zero iff the |len| bytes at |a| and |b| are equal.
- * It takes an amount of time dependent on |len|, but independent of the
- * contents of |a| and |b|. Unlike memcmp, it cannot be used to put elements
- * into a defined order as the return value when a != b is undefined, other
- * than to be non-zero.
- */
-int CRYPTO_memcmp(const void *a, const void *b, size_t len);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_CRYPTO_strings(void);
-
-/* Error codes for the CRYPTO functions. */
-
-/* Function codes. */
-# define CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX                 100
-# define CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID                103
-# define CRYPTO_F_CRYPTO_GET_NEW_LOCKID                   101
-# define CRYPTO_F_CRYPTO_SET_EX_DATA                      102
-# define CRYPTO_F_DEF_ADD_INDEX                           104
-# define CRYPTO_F_DEF_GET_CLASS                           105
-# define CRYPTO_F_FIPS_MODE_SET                           109
-# define CRYPTO_F_INT_DUP_EX_DATA                         106
-# define CRYPTO_F_INT_FREE_EX_DATA                        107
-# define CRYPTO_F_INT_NEW_EX_DATA                         108
-
-/* Reason codes. */
-# define CRYPTO_R_FIPS_MODE_NOT_SUPPORTED                 101
-# define CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK              100
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/des.h b/include.new/openssl/des.h
deleted file mode 100644
index 1b40144..0000000
--- a/include.new/openssl/des.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/* crypto/des/des.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_NEW_DES_H
-# define HEADER_NEW_DES_H
-
-# include <openssl/e_os2.h>     /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG
-                                 * (via openssl/opensslconf.h */
-
-# ifdef OPENSSL_NO_DES
-#  error DES is disabled.
-# endif
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef unsigned char DES_cblock[8];
-typedef /* const */ unsigned char const_DES_cblock[8];
-/*
- * With "const", gcc 2.8.1 on Solaris thinks that DES_cblock * and
- * const_DES_cblock * are incompatible pointer types.
- */
-
-typedef struct DES_ks {
-    union {
-        DES_cblock cblock;
-        /*
-         * make sure things are correct size on machines with 8 byte longs
-         */
-        DES_LONG deslong[2];
-    } ks[16];
-} DES_key_schedule;
-
-# ifndef OPENSSL_DISABLE_OLD_DES_SUPPORT
-#  ifndef OPENSSL_ENABLE_OLD_DES_SUPPORT
-#   define OPENSSL_ENABLE_OLD_DES_SUPPORT
-#  endif
-# endif
-
-# ifdef OPENSSL_ENABLE_OLD_DES_SUPPORT
-#  include <openssl/des_old.h>
-# endif
-
-# define DES_KEY_SZ      (sizeof(DES_cblock))
-# define DES_SCHEDULE_SZ (sizeof(DES_key_schedule))
-
-# define DES_ENCRYPT     1
-# define DES_DECRYPT     0
-
-# define DES_CBC_MODE    0
-# define DES_PCBC_MODE   1
-
-# define DES_ecb2_encrypt(i,o,k1,k2,e) \
-        DES_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-# define DES_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-        DES_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-# define DES_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-        DES_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-# define DES_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-        DES_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-OPENSSL_DECLARE_GLOBAL(int, DES_check_key); /* defaults to false */
-# define DES_check_key OPENSSL_GLOBAL_REF(DES_check_key)
-OPENSSL_DECLARE_GLOBAL(int, DES_rw_mode); /* defaults to DES_PCBC_MODE */
-# define DES_rw_mode OPENSSL_GLOBAL_REF(DES_rw_mode)
-
-const char *DES_options(void);
-void DES_ecb3_encrypt(const_DES_cblock *input, DES_cblock *output,
-                      DES_key_schedule *ks1, DES_key_schedule *ks2,
-                      DES_key_schedule *ks3, int enc);
-DES_LONG DES_cbc_cksum(const unsigned char *input, DES_cblock *output,
-                       long length, DES_key_schedule *schedule,
-                       const_DES_cblock *ivec);
-/* DES_cbc_encrypt does not update the IV!  Use DES_ncbc_encrypt instead. */
-void DES_cbc_encrypt(const unsigned char *input, unsigned char *output,
-                     long length, DES_key_schedule *schedule,
-                     DES_cblock *ivec, int enc);
-void DES_ncbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, int enc);
-void DES_xcbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, const_DES_cblock *inw,
-                      const_DES_cblock *outw, int enc);
-void DES_cfb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-                     long length, DES_key_schedule *schedule,
-                     DES_cblock *ivec, int enc);
-void DES_ecb_encrypt(const_DES_cblock *input, DES_cblock *output,
-                     DES_key_schedule *ks, int enc);
-
-/*
- * This is the DES encryption function that gets called by just about every
- * other DES routine in the library.  You should not use this function except
- * to implement 'modes' of DES.  I say this because the functions that call
- * this routine do the conversion from 'char *' to long, and this needs to be
- * done to make sure 'non-aligned' memory access do not occur.  The
- * characters are loaded 'little endian'. Data is a pointer to 2 unsigned
- * long's and ks is the DES_key_schedule to use.  enc, is non zero specifies
- * encryption, zero if decryption.
- */
-void DES_encrypt1(DES_LONG *data, DES_key_schedule *ks, int enc);
-
-/*
- * This functions is the same as DES_encrypt1() except that the DES initial
- * permutation (IP) and final permutation (FP) have been left out.  As for
- * DES_encrypt1(), you should not use this function. It is used by the
- * routines in the library that implement triple DES. IP() DES_encrypt2()
- * DES_encrypt2() DES_encrypt2() FP() is the same as DES_encrypt1()
- * DES_encrypt1() DES_encrypt1() except faster :-).
- */
-void DES_encrypt2(DES_LONG *data, DES_key_schedule *ks, int enc);
-
-void DES_encrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3);
-void DES_decrypt3(DES_LONG *data, DES_key_schedule *ks1,
-                  DES_key_schedule *ks2, DES_key_schedule *ks3);
-void DES_ede3_cbc_encrypt(const unsigned char *input, unsigned char *output,
-                          long length,
-                          DES_key_schedule *ks1, DES_key_schedule *ks2,
-                          DES_key_schedule *ks3, DES_cblock *ivec, int enc);
-void DES_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
-                           long length,
-                           DES_key_schedule *ks1, DES_key_schedule *ks2,
-                           DES_key_schedule *ks3,
-                           DES_cblock *ivec1, DES_cblock *ivec2, int enc);
-void DES_ede3_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                            long length, DES_key_schedule *ks1,
-                            DES_key_schedule *ks2, DES_key_schedule *ks3,
-                            DES_cblock *ivec, int *num, int enc);
-void DES_ede3_cfb_encrypt(const unsigned char *in, unsigned char *out,
-                          int numbits, long length, DES_key_schedule *ks1,
-                          DES_key_schedule *ks2, DES_key_schedule *ks3,
-                          DES_cblock *ivec, int enc);
-void DES_ede3_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                            long length, DES_key_schedule *ks1,
-                            DES_key_schedule *ks2, DES_key_schedule *ks3,
-                            DES_cblock *ivec, int *num);
-# if 0
-void DES_xwhite_in2out(const_DES_cblock *DES_key, const_DES_cblock *in_white,
-                       DES_cblock *out_white);
-# endif
-
-int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
-                 DES_cblock *iv);
-int DES_enc_write(int fd, const void *buf, int len, DES_key_schedule *sched,
-                  DES_cblock *iv);
-char *DES_fcrypt(const char *buf, const char *salt, char *ret);
-char *DES_crypt(const char *buf, const char *salt);
-void DES_ofb_encrypt(const unsigned char *in, unsigned char *out, int numbits,
-                     long length, DES_key_schedule *schedule,
-                     DES_cblock *ivec);
-void DES_pcbc_encrypt(const unsigned char *input, unsigned char *output,
-                      long length, DES_key_schedule *schedule,
-                      DES_cblock *ivec, int enc);
-DES_LONG DES_quad_cksum(const unsigned char *input, DES_cblock output[],
-                        long length, int out_count, DES_cblock *seed);
-int DES_random_key(DES_cblock *ret);
-void DES_set_odd_parity(DES_cblock *key);
-int DES_check_key_parity(const_DES_cblock *key);
-int DES_is_weak_key(const_DES_cblock *key);
-/*
- * DES_set_key (= set_key = DES_key_sched = key_sched) calls
- * DES_set_key_checked if global variable DES_check_key is set,
- * DES_set_key_unchecked otherwise.
- */
-int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule);
-int DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule);
-int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule);
-void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule);
-# ifdef OPENSSL_FIPS
-void private_DES_set_key_unchecked(const_DES_cblock *key,
-                                   DES_key_schedule *schedule);
-# endif
-void DES_string_to_key(const char *str, DES_cblock *key);
-void DES_string_to_2keys(const char *str, DES_cblock *key1, DES_cblock *key2);
-void DES_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, DES_key_schedule *schedule,
-                       DES_cblock *ivec, int *num, int enc);
-void DES_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, DES_key_schedule *schedule,
-                       DES_cblock *ivec, int *num);
-
-int DES_read_password(DES_cblock *key, const char *prompt, int verify);
-int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2,
-                        const char *prompt, int verify);
-
-# define DES_fixup_key_parity DES_set_odd_parity
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/des_old.h b/include.new/openssl/des_old.h
deleted file mode 100644
index f1e1e2c..0000000
--- a/include.new/openssl/des_old.h
+++ /dev/null
@@ -1,497 +0,0 @@
-/* crypto/des/des_old.h -*- mode:C; c-file-style: "eay" -*- */
-
-/*-
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- *
- * The function names in here are deprecated and are only present to
- * provide an interface compatible with openssl 0.9.6 and older as
- * well as libdes.  OpenSSL now provides functions where "des_" has
- * been replaced with "DES_" in the names, to make it possible to
- * make incompatible changes that are needed for C type security and
- * other stuff.
- *
- * This include files has two compatibility modes:
- *
- *   - If OPENSSL_DES_LIBDES_COMPATIBILITY is defined, you get an API
- *     that is compatible with libdes and SSLeay.
- *   - If OPENSSL_DES_LIBDES_COMPATIBILITY isn't defined, you get an
- *     API that is compatible with OpenSSL 0.9.5x to 0.9.6x.
- *
- * Note that these modes break earlier snapshots of OpenSSL, where
- * libdes compatibility was the only available mode or (later on) the
- * prefered compatibility mode.  However, after much consideration
- * (and more or less violent discussions with external parties), it
- * was concluded that OpenSSL should be compatible with earlier versions
- * of itself before anything else.  Also, in all honesty, libdes is
- * an old beast that shouldn't really be used any more.
- *
- * Please consider starting to use the DES_ functions rather than the
- * des_ ones.  The des_ functions will disappear completely before
- * OpenSSL 1.0!
- *
- * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
- */
-
-/*
- * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
- * 2001.
- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_DES_H
-# define HEADER_DES_H
-
-# include <openssl/e_os2.h>     /* OPENSSL_EXTERN, OPENSSL_NO_DES, DES_LONG */
-
-# ifdef OPENSSL_NO_DES
-#  error DES is disabled.
-# endif
-
-# ifndef HEADER_NEW_DES_H
-#  error You must include des.h, not des_old.h directly.
-# endif
-
-# ifdef _KERBEROS_DES_H
-#  error <openssl/des_old.h> replaces <kerberos/des.h>.
-# endif
-
-# include <openssl/symhacks.h>
-
-# ifdef OPENSSL_BUILD_SHLIBCRYPTO
-#  undef OPENSSL_EXTERN
-#  define OPENSSL_EXTERN OPENSSL_EXPORT
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef _
-#  undef _
-# endif
-
-typedef unsigned char _ossl_old_des_cblock[8];
-typedef struct _ossl_old_des_ks_struct {
-    union {
-        _ossl_old_des_cblock _;
-        /*
-         * make sure things are correct size on machines with 8 byte longs
-         */
-        DES_LONG pad[2];
-    } ks;
-} _ossl_old_des_key_schedule[16];
-
-# ifndef OPENSSL_DES_LIBDES_COMPATIBILITY
-#  define des_cblock DES_cblock
-#  define const_des_cblock const_DES_cblock
-#  define des_key_schedule DES_key_schedule
-#  define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
-        DES_ecb3_encrypt((i),(o),&(k1),&(k2),&(k3),(e))
-#  define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
-        DES_ede3_cbc_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(e))
-#  define des_ede3_cbcm_encrypt(i,o,l,k1,k2,k3,iv1,iv2,e)\
-        DES_ede3_cbcm_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv1),(iv2),(e))
-#  define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
-        DES_ede3_cfb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n),(e))
-#  define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
-        DES_ede3_ofb64_encrypt((i),(o),(l),&(k1),&(k2),&(k3),(iv),(n))
-#  define des_options()\
-        DES_options()
-#  define des_cbc_cksum(i,o,l,k,iv)\
-        DES_cbc_cksum((i),(o),(l),&(k),(iv))
-#  define des_cbc_encrypt(i,o,l,k,iv,e)\
-        DES_cbc_encrypt((i),(o),(l),&(k),(iv),(e))
-#  define des_ncbc_encrypt(i,o,l,k,iv,e)\
-        DES_ncbc_encrypt((i),(o),(l),&(k),(iv),(e))
-#  define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
-        DES_xcbc_encrypt((i),(o),(l),&(k),(iv),(inw),(outw),(e))
-#  define des_cfb_encrypt(i,o,n,l,k,iv,e)\
-        DES_cfb_encrypt((i),(o),(n),(l),&(k),(iv),(e))
-#  define des_ecb_encrypt(i,o,k,e)\
-        DES_ecb_encrypt((i),(o),&(k),(e))
-#  define des_encrypt1(d,k,e)\
-        DES_encrypt1((d),&(k),(e))
-#  define des_encrypt2(d,k,e)\
-        DES_encrypt2((d),&(k),(e))
-#  define des_encrypt3(d,k1,k2,k3)\
-        DES_encrypt3((d),&(k1),&(k2),&(k3))
-#  define des_decrypt3(d,k1,k2,k3)\
-        DES_decrypt3((d),&(k1),&(k2),&(k3))
-#  define des_xwhite_in2out(k,i,o)\
-        DES_xwhite_in2out((k),(i),(o))
-#  define des_enc_read(f,b,l,k,iv)\
-        DES_enc_read((f),(b),(l),&(k),(iv))
-#  define des_enc_write(f,b,l,k,iv)\
-        DES_enc_write((f),(b),(l),&(k),(iv))
-#  define des_fcrypt(b,s,r)\
-        DES_fcrypt((b),(s),(r))
-#  if 0
-#   define des_crypt(b,s)\
-        DES_crypt((b),(s))
-#   if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
-#    define crypt(b,s)\
-        DES_crypt((b),(s))
-#   endif
-#  endif
-#  define des_ofb_encrypt(i,o,n,l,k,iv)\
-        DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv))
-#  define des_pcbc_encrypt(i,o,l,k,iv,e)\
-        DES_pcbc_encrypt((i),(o),(l),&(k),(iv),(e))
-#  define des_quad_cksum(i,o,l,c,s)\
-        DES_quad_cksum((i),(o),(l),(c),(s))
-#  define des_random_seed(k)\
-        _ossl_096_des_random_seed((k))
-#  define des_random_key(r)\
-        DES_random_key((r))
-#  define des_read_password(k,p,v) \
-        DES_read_password((k),(p),(v))
-#  define des_read_2passwords(k1,k2,p,v) \
-        DES_read_2passwords((k1),(k2),(p),(v))
-#  define des_set_odd_parity(k)\
-        DES_set_odd_parity((k))
-#  define des_check_key_parity(k)\
-        DES_check_key_parity((k))
-#  define des_is_weak_key(k)\
-        DES_is_weak_key((k))
-#  define des_set_key(k,ks)\
-        DES_set_key((k),&(ks))
-#  define des_key_sched(k,ks)\
-        DES_key_sched((k),&(ks))
-#  define des_set_key_checked(k,ks)\
-        DES_set_key_checked((k),&(ks))
-#  define des_set_key_unchecked(k,ks)\
-        DES_set_key_unchecked((k),&(ks))
-#  define des_string_to_key(s,k)\
-        DES_string_to_key((s),(k))
-#  define des_string_to_2keys(s,k1,k2)\
-        DES_string_to_2keys((s),(k1),(k2))
-#  define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
-        DES_cfb64_encrypt((i),(o),(l),&(ks),(iv),(n),(e))
-#  define des_ofb64_encrypt(i,o,l,ks,iv,n)\
-        DES_ofb64_encrypt((i),(o),(l),&(ks),(iv),(n))
-
-#  define des_ecb2_encrypt(i,o,k1,k2,e) \
-        des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-#  define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-        des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-#  define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-        des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-#  define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-        des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-#  define des_check_key DES_check_key
-#  define des_rw_mode DES_rw_mode
-# else                          /* libdes compatibility */
-/*
- * Map all symbol names to _ossl_old_des_* form, so we avoid all clashes with
- * libdes
- */
-#  define des_cblock _ossl_old_des_cblock
-#  define des_key_schedule _ossl_old_des_key_schedule
-#  define des_ecb3_encrypt(i,o,k1,k2,k3,e)\
-        _ossl_old_des_ecb3_encrypt((i),(o),(k1),(k2),(k3),(e))
-#  define des_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e)\
-        _ossl_old_des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(e))
-#  define des_ede3_cfb64_encrypt(i,o,l,k1,k2,k3,iv,n,e)\
-        _ossl_old_des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n),(e))
-#  define des_ede3_ofb64_encrypt(i,o,l,k1,k2,k3,iv,n)\
-        _ossl_old_des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k3),(iv),(n))
-#  define des_options()\
-        _ossl_old_des_options()
-#  define des_cbc_cksum(i,o,l,k,iv)\
-        _ossl_old_des_cbc_cksum((i),(o),(l),(k),(iv))
-#  define des_cbc_encrypt(i,o,l,k,iv,e)\
-        _ossl_old_des_cbc_encrypt((i),(o),(l),(k),(iv),(e))
-#  define des_ncbc_encrypt(i,o,l,k,iv,e)\
-        _ossl_old_des_ncbc_encrypt((i),(o),(l),(k),(iv),(e))
-#  define des_xcbc_encrypt(i,o,l,k,iv,inw,outw,e)\
-        _ossl_old_des_xcbc_encrypt((i),(o),(l),(k),(iv),(inw),(outw),(e))
-#  define des_cfb_encrypt(i,o,n,l,k,iv,e)\
-        _ossl_old_des_cfb_encrypt((i),(o),(n),(l),(k),(iv),(e))
-#  define des_ecb_encrypt(i,o,k,e)\
-        _ossl_old_des_ecb_encrypt((i),(o),(k),(e))
-#  define des_encrypt(d,k,e)\
-        _ossl_old_des_encrypt((d),(k),(e))
-#  define des_encrypt2(d,k,e)\
-        _ossl_old_des_encrypt2((d),(k),(e))
-#  define des_encrypt3(d,k1,k2,k3)\
-        _ossl_old_des_encrypt3((d),(k1),(k2),(k3))
-#  define des_decrypt3(d,k1,k2,k3)\
-        _ossl_old_des_decrypt3((d),(k1),(k2),(k3))
-#  define des_xwhite_in2out(k,i,o)\
-        _ossl_old_des_xwhite_in2out((k),(i),(o))
-#  define des_enc_read(f,b,l,k,iv)\
-        _ossl_old_des_enc_read((f),(b),(l),(k),(iv))
-#  define des_enc_write(f,b,l,k,iv)\
-        _ossl_old_des_enc_write((f),(b),(l),(k),(iv))
-#  define des_fcrypt(b,s,r)\
-        _ossl_old_des_fcrypt((b),(s),(r))
-#  define des_crypt(b,s)\
-        _ossl_old_des_crypt((b),(s))
-#  if 0
-#   define crypt(b,s)\
-        _ossl_old_crypt((b),(s))
-#  endif
-#  define des_ofb_encrypt(i,o,n,l,k,iv)\
-        _ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv))
-#  define des_pcbc_encrypt(i,o,l,k,iv,e)\
-        _ossl_old_des_pcbc_encrypt((i),(o),(l),(k),(iv),(e))
-#  define des_quad_cksum(i,o,l,c,s)\
-        _ossl_old_des_quad_cksum((i),(o),(l),(c),(s))
-#  define des_random_seed(k)\
-        _ossl_old_des_random_seed((k))
-#  define des_random_key(r)\
-        _ossl_old_des_random_key((r))
-#  define des_read_password(k,p,v) \
-        _ossl_old_des_read_password((k),(p),(v))
-#  define des_read_2passwords(k1,k2,p,v) \
-        _ossl_old_des_read_2passwords((k1),(k2),(p),(v))
-#  define des_set_odd_parity(k)\
-        _ossl_old_des_set_odd_parity((k))
-#  define des_is_weak_key(k)\
-        _ossl_old_des_is_weak_key((k))
-#  define des_set_key(k,ks)\
-        _ossl_old_des_set_key((k),(ks))
-#  define des_key_sched(k,ks)\
-        _ossl_old_des_key_sched((k),(ks))
-#  define des_string_to_key(s,k)\
-        _ossl_old_des_string_to_key((s),(k))
-#  define des_string_to_2keys(s,k1,k2)\
-        _ossl_old_des_string_to_2keys((s),(k1),(k2))
-#  define des_cfb64_encrypt(i,o,l,ks,iv,n,e)\
-        _ossl_old_des_cfb64_encrypt((i),(o),(l),(ks),(iv),(n),(e))
-#  define des_ofb64_encrypt(i,o,l,ks,iv,n)\
-        _ossl_old_des_ofb64_encrypt((i),(o),(l),(ks),(iv),(n))
-
-#  define des_ecb2_encrypt(i,o,k1,k2,e) \
-        des_ecb3_encrypt((i),(o),(k1),(k2),(k1),(e))
-
-#  define des_ede2_cbc_encrypt(i,o,l,k1,k2,iv,e) \
-        des_ede3_cbc_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(e))
-
-#  define des_ede2_cfb64_encrypt(i,o,l,k1,k2,iv,n,e) \
-        des_ede3_cfb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n),(e))
-
-#  define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
-        des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n))
-
-#  define des_check_key DES_check_key
-#  define des_rw_mode DES_rw_mode
-# endif
-
-const char *_ossl_old_des_options(void);
-void _ossl_old_des_ecb3_encrypt(_ossl_old_des_cblock *input,
-                                _ossl_old_des_cblock *output,
-                                _ossl_old_des_key_schedule ks1,
-                                _ossl_old_des_key_schedule ks2,
-                                _ossl_old_des_key_schedule ks3, int enc);
-DES_LONG _ossl_old_des_cbc_cksum(_ossl_old_des_cblock *input,
-                                 _ossl_old_des_cblock *output, long length,
-                                 _ossl_old_des_key_schedule schedule,
-                                 _ossl_old_des_cblock *ivec);
-void _ossl_old_des_cbc_encrypt(_ossl_old_des_cblock *input,
-                               _ossl_old_des_cblock *output, long length,
-                               _ossl_old_des_key_schedule schedule,
-                               _ossl_old_des_cblock *ivec, int enc);
-void _ossl_old_des_ncbc_encrypt(_ossl_old_des_cblock *input,
-                                _ossl_old_des_cblock *output, long length,
-                                _ossl_old_des_key_schedule schedule,
-                                _ossl_old_des_cblock *ivec, int enc);
-void _ossl_old_des_xcbc_encrypt(_ossl_old_des_cblock *input,
-                                _ossl_old_des_cblock *output, long length,
-                                _ossl_old_des_key_schedule schedule,
-                                _ossl_old_des_cblock *ivec,
-                                _ossl_old_des_cblock *inw,
-                                _ossl_old_des_cblock *outw, int enc);
-void _ossl_old_des_cfb_encrypt(unsigned char *in, unsigned char *out,
-                               int numbits, long length,
-                               _ossl_old_des_key_schedule schedule,
-                               _ossl_old_des_cblock *ivec, int enc);
-void _ossl_old_des_ecb_encrypt(_ossl_old_des_cblock *input,
-                               _ossl_old_des_cblock *output,
-                               _ossl_old_des_key_schedule ks, int enc);
-void _ossl_old_des_encrypt(DES_LONG *data, _ossl_old_des_key_schedule ks,
-                           int enc);
-void _ossl_old_des_encrypt2(DES_LONG *data, _ossl_old_des_key_schedule ks,
-                            int enc);
-void _ossl_old_des_encrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
-                            _ossl_old_des_key_schedule ks2,
-                            _ossl_old_des_key_schedule ks3);
-void _ossl_old_des_decrypt3(DES_LONG *data, _ossl_old_des_key_schedule ks1,
-                            _ossl_old_des_key_schedule ks2,
-                            _ossl_old_des_key_schedule ks3);
-void _ossl_old_des_ede3_cbc_encrypt(_ossl_old_des_cblock *input,
-                                    _ossl_old_des_cblock *output, long length,
-                                    _ossl_old_des_key_schedule ks1,
-                                    _ossl_old_des_key_schedule ks2,
-                                    _ossl_old_des_key_schedule ks3,
-                                    _ossl_old_des_cblock *ivec, int enc);
-void _ossl_old_des_ede3_cfb64_encrypt(unsigned char *in, unsigned char *out,
-                                      long length,
-                                      _ossl_old_des_key_schedule ks1,
-                                      _ossl_old_des_key_schedule ks2,
-                                      _ossl_old_des_key_schedule ks3,
-                                      _ossl_old_des_cblock *ivec, int *num,
-                                      int enc);
-void _ossl_old_des_ede3_ofb64_encrypt(unsigned char *in, unsigned char *out,
-                                      long length,
-                                      _ossl_old_des_key_schedule ks1,
-                                      _ossl_old_des_key_schedule ks2,
-                                      _ossl_old_des_key_schedule ks3,
-                                      _ossl_old_des_cblock *ivec, int *num);
-# if 0
-void _ossl_old_des_xwhite_in2out(_ossl_old_des_cblock (*des_key),
-                                 _ossl_old_des_cblock (*in_white),
-                                 _ossl_old_des_cblock (*out_white));
-# endif
-
-int _ossl_old_des_enc_read(int fd, char *buf, int len,
-                           _ossl_old_des_key_schedule sched,
-                           _ossl_old_des_cblock *iv);
-int _ossl_old_des_enc_write(int fd, char *buf, int len,
-                            _ossl_old_des_key_schedule sched,
-                            _ossl_old_des_cblock *iv);
-char *_ossl_old_des_fcrypt(const char *buf, const char *salt, char *ret);
-char *_ossl_old_des_crypt(const char *buf, const char *salt);
-# if !defined(PERL5) && !defined(NeXT)
-char *_ossl_old_crypt(const char *buf, const char *salt);
-# endif
-void _ossl_old_des_ofb_encrypt(unsigned char *in, unsigned char *out,
-                               int numbits, long length,
-                               _ossl_old_des_key_schedule schedule,
-                               _ossl_old_des_cblock *ivec);
-void _ossl_old_des_pcbc_encrypt(_ossl_old_des_cblock *input,
-                                _ossl_old_des_cblock *output, long length,
-                                _ossl_old_des_key_schedule schedule,
-                                _ossl_old_des_cblock *ivec, int enc);
-DES_LONG _ossl_old_des_quad_cksum(_ossl_old_des_cblock *input,
-                                  _ossl_old_des_cblock *output, long length,
-                                  int out_count, _ossl_old_des_cblock *seed);
-void _ossl_old_des_random_seed(_ossl_old_des_cblock key);
-void _ossl_old_des_random_key(_ossl_old_des_cblock ret);
-int _ossl_old_des_read_password(_ossl_old_des_cblock *key, const char *prompt,
-                                int verify);
-int _ossl_old_des_read_2passwords(_ossl_old_des_cblock *key1,
-                                  _ossl_old_des_cblock *key2,
-                                  const char *prompt, int verify);
-void _ossl_old_des_set_odd_parity(_ossl_old_des_cblock *key);
-int _ossl_old_des_is_weak_key(_ossl_old_des_cblock *key);
-int _ossl_old_des_set_key(_ossl_old_des_cblock *key,
-                          _ossl_old_des_key_schedule schedule);
-int _ossl_old_des_key_sched(_ossl_old_des_cblock *key,
-                            _ossl_old_des_key_schedule schedule);
-void _ossl_old_des_string_to_key(char *str, _ossl_old_des_cblock *key);
-void _ossl_old_des_string_to_2keys(char *str, _ossl_old_des_cblock *key1,
-                                   _ossl_old_des_cblock *key2);
-void _ossl_old_des_cfb64_encrypt(unsigned char *in, unsigned char *out,
-                                 long length,
-                                 _ossl_old_des_key_schedule schedule,
-                                 _ossl_old_des_cblock *ivec, int *num,
-                                 int enc);
-void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out,
-                                 long length,
-                                 _ossl_old_des_key_schedule schedule,
-                                 _ossl_old_des_cblock *ivec, int *num);
-
-void _ossl_096_des_random_seed(des_cblock *key);
-
-/*
- * The following definitions provide compatibility with the MIT Kerberos
- * library. The _ossl_old_des_key_schedule structure is not binary
- * compatible.
- */
-
-# define _KERBEROS_DES_H
-
-# define KRBDES_ENCRYPT DES_ENCRYPT
-# define KRBDES_DECRYPT DES_DECRYPT
-
-# ifdef KERBEROS
-#  define ENCRYPT DES_ENCRYPT
-#  define DECRYPT DES_DECRYPT
-# endif
-
-# ifndef NCOMPAT
-#  define C_Block des_cblock
-#  define Key_schedule des_key_schedule
-#  define KEY_SZ DES_KEY_SZ
-#  define string_to_key des_string_to_key
-#  define read_pw_string des_read_pw_string
-#  define random_key des_random_key
-#  define pcbc_encrypt des_pcbc_encrypt
-#  define set_key des_set_key
-#  define key_sched des_key_sched
-#  define ecb_encrypt des_ecb_encrypt
-#  define cbc_encrypt des_cbc_encrypt
-#  define ncbc_encrypt des_ncbc_encrypt
-#  define xcbc_encrypt des_xcbc_encrypt
-#  define cbc_cksum des_cbc_cksum
-#  define quad_cksum des_quad_cksum
-#  define check_parity des_check_key_parity
-# endif
-
-# define des_fixup_key_parity DES_fixup_key_parity
-
-#ifdef  __cplusplus
-}
-#endif
-
-/* for DES_read_pw_string et al */
-# include <openssl/ui_compat.h>
-
-#endif
diff --git a/include.new/openssl/dh.h b/include.new/openssl/dh.h
deleted file mode 100644
index 4cbaa97..0000000
--- a/include.new/openssl/dh.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/* crypto/dh/dh.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_DH_H
-# define HEADER_DH_H
-
-# include <openssl/e_os2.h>
-
-# ifdef OPENSSL_NO_DH
-#  error DH is disabled.
-# endif
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-# ifndef OPENSSL_DH_MAX_MODULUS_BITS
-#  define OPENSSL_DH_MAX_MODULUS_BITS    10000
-# endif
-
-# define DH_FLAG_CACHE_MONT_P     0x01
-
-/*
- * new with 0.9.7h; the built-in DH
- * implementation now uses constant time
- * modular exponentiation for secret exponents
- * by default. This flag causes the
- * faster variable sliding window method to
- * be used for all exponents.
- */
-# define DH_FLAG_NO_EXP_CONSTTIME 0x02
-
-/*
- * If this flag is set the DH method is FIPS compliant and can be used in
- * FIPS mode. This is set in the validated module method. If an application
- * sets this flag in its own methods it is its reposibility to ensure the
- * result is compliant.
- */
-
-# define DH_FLAG_FIPS_METHOD                     0x0400
-
-/*
- * If this flag is set the operations normally disabled in FIPS mode are
- * permitted it is then the applications responsibility to ensure that the
- * usage is compliant.
- */
-
-# define DH_FLAG_NON_FIPS_ALLOW                  0x0400
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct dh_st DH; */
-/* typedef struct dh_method DH_METHOD; */
-
-struct dh_method {
-    const char *name;
-    /* Methods here */
-    int (*generate_key) (DH *dh);
-    int (*compute_key) (unsigned char *key, const BIGNUM *pub_key, DH *dh);
-    /* Can be null */
-    int (*bn_mod_exp) (const DH *dh, BIGNUM *r, const BIGNUM *a,
-                       const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
-                       BN_MONT_CTX *m_ctx);
-    int (*init) (DH *dh);
-    int (*finish) (DH *dh);
-    int flags;
-    char *app_data;
-    /* If this is non-NULL, it will be used to generate parameters */
-    int (*generate_params) (DH *dh, int prime_len, int generator,
-                            BN_GENCB *cb);
-};
-
-struct dh_st {
-    /*
-     * This first argument is used to pick up errors when a DH is passed
-     * instead of a EVP_PKEY
-     */
-    int pad;
-    int version;
-    BIGNUM *p;
-    BIGNUM *g;
-    long length;                /* optional */
-    BIGNUM *pub_key;            /* g^x */
-    BIGNUM *priv_key;           /* x */
-    int flags;
-    BN_MONT_CTX *method_mont_p;
-    /* Place holders if we want to do X9.42 DH */
-    BIGNUM *q;
-    BIGNUM *j;
-    unsigned char *seed;
-    int seedlen;
-    BIGNUM *counter;
-    int references;
-    CRYPTO_EX_DATA ex_data;
-    const DH_METHOD *meth;
-    ENGINE *engine;
-};
-
-# define DH_GENERATOR_2          2
-/* #define DH_GENERATOR_3       3 */
-# define DH_GENERATOR_5          5
-
-/* DH_check error codes */
-# define DH_CHECK_P_NOT_PRIME            0x01
-# define DH_CHECK_P_NOT_SAFE_PRIME       0x02
-# define DH_UNABLE_TO_CHECK_GENERATOR    0x04
-# define DH_NOT_SUITABLE_GENERATOR       0x08
-
-/* DH_check_pub_key error codes */
-# define DH_CHECK_PUBKEY_TOO_SMALL       0x01
-# define DH_CHECK_PUBKEY_TOO_LARGE       0x02
-
-/*
- * primes p where (p-1)/2 is prime too are called "safe"; we define this for
- * backward compatibility:
- */
-# define DH_CHECK_P_NOT_STRONG_PRIME     DH_CHECK_P_NOT_SAFE_PRIME
-
-# define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
-                (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x))
-# define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \
-                (unsigned char *)(x))
-# define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x)
-# define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x)
-
-DH *DHparams_dup(DH *);
-
-const DH_METHOD *DH_OpenSSL(void);
-
-void DH_set_default_method(const DH_METHOD *meth);
-const DH_METHOD *DH_get_default_method(void);
-int DH_set_method(DH *dh, const DH_METHOD *meth);
-DH *DH_new_method(ENGINE *engine);
-
-DH *DH_new(void);
-void DH_free(DH *dh);
-int DH_up_ref(DH *dh);
-int DH_size(const DH *dh);
-int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                        CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int DH_set_ex_data(DH *d, int idx, void *arg);
-void *DH_get_ex_data(DH *d, int idx);
-
-/* Deprecated version */
-# ifndef OPENSSL_NO_DEPRECATED
-DH *DH_generate_parameters(int prime_len, int generator,
-                           void (*callback) (int, int, void *), void *cb_arg);
-# endif                         /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* New version */
-int DH_generate_parameters_ex(DH *dh, int prime_len, int generator,
-                              BN_GENCB *cb);
-
-int DH_check(const DH *dh, int *codes);
-int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *codes);
-int DH_generate_key(DH *dh);
-int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
-DH *d2i_DHparams(DH **a, const unsigned char **pp, long length);
-int i2d_DHparams(const DH *a, unsigned char **pp);
-# ifndef OPENSSL_NO_FP_API
-int DHparams_print_fp(FILE *fp, const DH *x);
-# endif
-# ifndef OPENSSL_NO_BIO
-int DHparams_print(BIO *bp, const DH *x);
-# else
-int DHparams_print(char *bp, const DH *x);
-# endif
-
-# define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, len, NULL)
-
-# define EVP_PKEY_CTX_set_dh_paramgen_generator(ctx, gen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \
-                        EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR, gen, NULL)
-
-# define EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN     (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR     (EVP_PKEY_ALG_CTRL + 2)
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_DH_strings(void);
-
-/* Error codes for the DH functions. */
-
-/* Function codes. */
-# define DH_F_COMPUTE_KEY                                 102
-# define DH_F_DHPARAMS_PRINT_FP                           101
-# define DH_F_DH_BUILTIN_GENPARAMS                        106
-# define DH_F_DH_COMPUTE_KEY                              114
-# define DH_F_DH_GENERATE_KEY                             115
-# define DH_F_DH_GENERATE_PARAMETERS_EX                   116
-# define DH_F_DH_NEW_METHOD                               105
-# define DH_F_DH_PARAM_DECODE                             107
-# define DH_F_DH_PRIV_DECODE                              110
-# define DH_F_DH_PRIV_ENCODE                              111
-# define DH_F_DH_PUB_DECODE                               108
-# define DH_F_DH_PUB_ENCODE                               109
-# define DH_F_DO_DH_PRINT                                 100
-# define DH_F_GENERATE_KEY                                103
-# define DH_F_GENERATE_PARAMETERS                         104
-# define DH_F_PKEY_DH_DERIVE                              112
-# define DH_F_PKEY_DH_KEYGEN                              113
-
-/* Reason codes. */
-# define DH_R_BAD_GENERATOR                               101
-# define DH_R_BN_DECODE_ERROR                             109
-# define DH_R_BN_ERROR                                    106
-# define DH_R_DECODE_ERROR                                104
-# define DH_R_INVALID_PUBKEY                              102
-# define DH_R_KEYS_NOT_SET                                108
-# define DH_R_KEY_SIZE_TOO_SMALL                          110
-# define DH_R_MODULUS_TOO_LARGE                           103
-# define DH_R_NON_FIPS_METHOD                             111
-# define DH_R_NO_PARAMETERS_SET                           107
-# define DH_R_NO_PRIVATE_VALUE                            100
-# define DH_R_PARAMETER_ENCODING_ERROR                    105
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/dsa.h b/include.new/openssl/dsa.h
deleted file mode 100644
index a2f0ee7..0000000
--- a/include.new/openssl/dsa.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/* crypto/dsa/dsa.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*
- * The DSS routines are based on patches supplied by
- * Steven Schoch <schoch@sheba.arc.nasa.gov>.  He basically did the
- * work and I have just tweaked them a little to fit into my
- * stylistic vision for SSLeay :-) */
-
-#ifndef HEADER_DSA_H
-# define HEADER_DSA_H
-
-# include <openssl/e_os2.h>
-
-# ifdef OPENSSL_NO_DSA
-#  error DSA is disabled.
-# endif
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/crypto.h>
-# include <openssl/ossl_typ.h>
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-#  ifndef OPENSSL_NO_DH
-#   include <openssl/dh.h>
-#  endif
-# endif
-
-# ifndef OPENSSL_DSA_MAX_MODULUS_BITS
-#  define OPENSSL_DSA_MAX_MODULUS_BITS   10000
-# endif
-
-# define DSA_FLAG_CACHE_MONT_P   0x01
-/*
- * new with 0.9.7h; the built-in DSA implementation now uses constant time
- * modular exponentiation for secret exponents by default. This flag causes
- * the faster variable sliding window method to be used for all exponents.
- */
-# define DSA_FLAG_NO_EXP_CONSTTIME       0x02
-
-/*
- * If this flag is set the DSA method is FIPS compliant and can be used in
- * FIPS mode. This is set in the validated module method. If an application
- * sets this flag in its own methods it is its reposibility to ensure the
- * result is compliant.
- */
-
-# define DSA_FLAG_FIPS_METHOD                    0x0400
-
-/*
- * If this flag is set the operations normally disabled in FIPS mode are
- * permitted it is then the applications responsibility to ensure that the
- * usage is compliant.
- */
-
-# define DSA_FLAG_NON_FIPS_ALLOW                 0x0400
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct dsa_st DSA; */
-/* typedef struct dsa_method DSA_METHOD; */
-
-typedef struct DSA_SIG_st {
-    BIGNUM *r;
-    BIGNUM *s;
-} DSA_SIG;
-
-struct dsa_method {
-    const char *name;
-    DSA_SIG *(*dsa_do_sign) (const unsigned char *dgst, int dlen, DSA *dsa);
-    int (*dsa_sign_setup) (DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp,
-                           BIGNUM **rp);
-    int (*dsa_do_verify) (const unsigned char *dgst, int dgst_len,
-                          DSA_SIG *sig, DSA *dsa);
-    int (*dsa_mod_exp) (DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1,
-                        BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx,
-                        BN_MONT_CTX *in_mont);
-    /* Can be null */
-    int (*bn_mod_exp) (DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
-                       const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-    int (*init) (DSA *dsa);
-    int (*finish) (DSA *dsa);
-    int flags;
-    char *app_data;
-    /* If this is non-NULL, it is used to generate DSA parameters */
-    int (*dsa_paramgen) (DSA *dsa, int bits,
-                         const unsigned char *seed, int seed_len,
-                         int *counter_ret, unsigned long *h_ret,
-                         BN_GENCB *cb);
-    /* If this is non-NULL, it is used to generate DSA keys */
-    int (*dsa_keygen) (DSA *dsa);
-};
-
-struct dsa_st {
-    /*
-     * This first variable is used to pick up errors where a DSA is passed
-     * instead of of a EVP_PKEY
-     */
-    int pad;
-    long version;
-    int write_params;
-    BIGNUM *p;
-    BIGNUM *q;                  /* == 20 */
-    BIGNUM *g;
-    BIGNUM *pub_key;            /* y public key */
-    BIGNUM *priv_key;           /* x private key */
-    BIGNUM *kinv;               /* Signing pre-calc */
-    BIGNUM *r;                  /* Signing pre-calc */
-    int flags;
-    /* Normally used to cache montgomery values */
-    BN_MONT_CTX *method_mont_p;
-    int references;
-    CRYPTO_EX_DATA ex_data;
-    const DSA_METHOD *meth;
-    /* functional reference if 'meth' is ENGINE-provided */
-    ENGINE *engine;
-};
-
-# define d2i_DSAparams_fp(fp,x) (DSA *)ASN1_d2i_fp((char *(*)())DSA_new, \
-                (char *(*)())d2i_DSAparams,(fp),(unsigned char **)(x))
-# define i2d_DSAparams_fp(fp,x) ASN1_i2d_fp(i2d_DSAparams,(fp), \
-                (unsigned char *)(x))
-# define d2i_DSAparams_bio(bp,x) ASN1_d2i_bio_of(DSA,DSA_new,d2i_DSAparams,bp,x)
-# define i2d_DSAparams_bio(bp,x) ASN1_i2d_bio_of_const(DSA,i2d_DSAparams,bp,x)
-
-DSA *DSAparams_dup(DSA *x);
-DSA_SIG *DSA_SIG_new(void);
-void DSA_SIG_free(DSA_SIG *a);
-int i2d_DSA_SIG(const DSA_SIG *a, unsigned char **pp);
-DSA_SIG *d2i_DSA_SIG(DSA_SIG **v, const unsigned char **pp, long length);
-
-DSA_SIG *DSA_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
-int DSA_do_verify(const unsigned char *dgst, int dgst_len,
-                  DSA_SIG *sig, DSA *dsa);
-
-const DSA_METHOD *DSA_OpenSSL(void);
-
-void DSA_set_default_method(const DSA_METHOD *);
-const DSA_METHOD *DSA_get_default_method(void);
-int DSA_set_method(DSA *dsa, const DSA_METHOD *);
-
-DSA *DSA_new(void);
-DSA *DSA_new_method(ENGINE *engine);
-void DSA_free(DSA *r);
-/* "up" the DSA object's reference count */
-int DSA_up_ref(DSA *r);
-int DSA_size(const DSA *);
-        /* next 4 return -1 on error */
-int DSA_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
-int DSA_sign(int type, const unsigned char *dgst, int dlen,
-             unsigned char *sig, unsigned int *siglen, DSA *dsa);
-int DSA_verify(int type, const unsigned char *dgst, int dgst_len,
-               const unsigned char *sigbuf, int siglen, DSA *dsa);
-int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                         CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int DSA_set_ex_data(DSA *d, int idx, void *arg);
-void *DSA_get_ex_data(DSA *d, int idx);
-
-DSA *d2i_DSAPublicKey(DSA **a, const unsigned char **pp, long length);
-DSA *d2i_DSAPrivateKey(DSA **a, const unsigned char **pp, long length);
-DSA *d2i_DSAparams(DSA **a, const unsigned char **pp, long length);
-
-/* Deprecated version */
-# ifndef OPENSSL_NO_DEPRECATED
-DSA *DSA_generate_parameters(int bits,
-                             unsigned char *seed, int seed_len,
-                             int *counter_ret, unsigned long *h_ret, void
-                              (*callback) (int, int, void *), void *cb_arg);
-# endif                         /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* New version */
-int DSA_generate_parameters_ex(DSA *dsa, int bits,
-                               const unsigned char *seed, int seed_len,
-                               int *counter_ret, unsigned long *h_ret,
-                               BN_GENCB *cb);
-
-int DSA_generate_key(DSA *a);
-int i2d_DSAPublicKey(const DSA *a, unsigned char **pp);
-int i2d_DSAPrivateKey(const DSA *a, unsigned char **pp);
-int i2d_DSAparams(const DSA *a, unsigned char **pp);
-
-# ifndef OPENSSL_NO_BIO
-int DSAparams_print(BIO *bp, const DSA *x);
-int DSA_print(BIO *bp, const DSA *x, int off);
-# endif
-# ifndef OPENSSL_NO_FP_API
-int DSAparams_print_fp(FILE *fp, const DSA *x);
-int DSA_print_fp(FILE *bp, const DSA *x, int off);
-# endif
-
-# define DSS_prime_checks 50
-/*
- * Primality test according to FIPS PUB 186[-1], Appendix 2.1: 50 rounds of
- * Rabin-Miller
- */
-# define DSA_is_prime(n, callback, cb_arg) \
-        BN_is_prime(n, DSS_prime_checks, callback, NULL, cb_arg)
-
-# ifndef OPENSSL_NO_DH
-/*
- * Convert DSA structure (key or just parameters) into DH structure (be
- * careful to avoid small subgroup attacks when using this!)
- */
-DH *DSA_dup_DH(const DSA *r);
-# endif
-
-# define EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, \
-                                EVP_PKEY_CTRL_DSA_PARAMGEN_BITS, nbits, NULL)
-
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_BITS         (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS       (EVP_PKEY_ALG_CTRL + 2)
-# define EVP_PKEY_CTRL_DSA_PARAMGEN_MD           (EVP_PKEY_ALG_CTRL + 3)
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_DSA_strings(void);
-
-/* Error codes for the DSA functions. */
-
-/* Function codes. */
-# define DSA_F_D2I_DSA_SIG                                110
-# define DSA_F_DO_DSA_PRINT                               104
-# define DSA_F_DSAPARAMS_PRINT                            100
-# define DSA_F_DSAPARAMS_PRINT_FP                         101
-# define DSA_F_DSA_DO_SIGN                                112
-# define DSA_F_DSA_DO_VERIFY                              113
-# define DSA_F_DSA_GENERATE_KEY                           124
-# define DSA_F_DSA_GENERATE_PARAMETERS_EX                 123
-# define DSA_F_DSA_NEW_METHOD                             103
-# define DSA_F_DSA_PARAM_DECODE                           119
-# define DSA_F_DSA_PRINT_FP                               105
-# define DSA_F_DSA_PRIV_DECODE                            115
-# define DSA_F_DSA_PRIV_ENCODE                            116
-# define DSA_F_DSA_PUB_DECODE                             117
-# define DSA_F_DSA_PUB_ENCODE                             118
-# define DSA_F_DSA_SIGN                                   106
-# define DSA_F_DSA_SIGN_SETUP                             107
-# define DSA_F_DSA_SIG_NEW                                109
-# define DSA_F_DSA_SIG_PRINT                              125
-# define DSA_F_DSA_VERIFY                                 108
-# define DSA_F_I2D_DSA_SIG                                111
-# define DSA_F_OLD_DSA_PRIV_DECODE                        122
-# define DSA_F_PKEY_DSA_CTRL                              120
-# define DSA_F_PKEY_DSA_KEYGEN                            121
-# define DSA_F_SIG_CB                                     114
-
-/* Reason codes. */
-# define DSA_R_BAD_Q_VALUE                                102
-# define DSA_R_BN_DECODE_ERROR                            108
-# define DSA_R_BN_ERROR                                   109
-# define DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                100
-# define DSA_R_DECODE_ERROR                               104
-# define DSA_R_INVALID_DIGEST_TYPE                        106
-# define DSA_R_MISSING_PARAMETERS                         101
-# define DSA_R_MODULUS_TOO_LARGE                          103
-# define DSA_R_NEED_NEW_SETUP_VALUES                      110
-# define DSA_R_NON_FIPS_DSA_METHOD                        111
-# define DSA_R_NO_PARAMETERS_SET                          107
-# define DSA_R_PARAMETER_ENCODING_ERROR                   105
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/dso.h b/include.new/openssl/dso.h
deleted file mode 100644
index 7c4a1dc..0000000
--- a/include.new/openssl/dso.h
+++ /dev/null
@@ -1,451 +0,0 @@
-/* dso.h -*- mode:C; c-file-style: "eay" -*- */
-/*
- * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL project
- * 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_DSO_H
-# define HEADER_DSO_H
-
-# include <openssl/crypto.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* These values are used as commands to DSO_ctrl() */
-# define DSO_CTRL_GET_FLAGS      1
-# define DSO_CTRL_SET_FLAGS      2
-# define DSO_CTRL_OR_FLAGS       3
-
-/*
- * By default, DSO_load() will translate the provided filename into a form
- * typical for the platform (more specifically the DSO_METHOD) using the
- * dso_name_converter function of the method. Eg. win32 will transform "blah"
- * into "blah.dll", and dlfcn will transform it into "libblah.so". The
- * behaviour can be overriden by setting the name_converter callback in the
- * DSO object (using DSO_set_name_converter()). This callback could even
- * utilise the DSO_METHOD's converter too if it only wants to override
- * behaviour for one or two possible DSO methods. However, the following flag
- * can be set in a DSO to prevent *any* native name-translation at all - eg.
- * if the caller has prompted the user for a path to a driver library so the
- * filename should be interpreted as-is.
- */
-# define DSO_FLAG_NO_NAME_TRANSLATION            0x01
-/*
- * An extra flag to give if only the extension should be added as
- * translation.  This is obviously only of importance on Unix and other
- * operating systems where the translation also may prefix the name with
- * something, like 'lib', and ignored everywhere else. This flag is also
- * ignored if DSO_FLAG_NO_NAME_TRANSLATION is used at the same time.
- */
-# define DSO_FLAG_NAME_TRANSLATION_EXT_ONLY      0x02
-
-/*
- * The following flag controls the translation of symbol names to upper case.
- * This is currently only being implemented for OpenVMS.
- */
-# define DSO_FLAG_UPCASE_SYMBOL                  0x10
-
-/*
- * This flag loads the library with public symbols. Meaning: The exported
- * symbols of this library are public to all libraries loaded after this
- * library. At the moment only implemented in unix.
- */
-# define DSO_FLAG_GLOBAL_SYMBOLS                 0x20
-
-typedef void (*DSO_FUNC_TYPE) (void);
-
-typedef struct dso_st DSO;
-
-/*
- * The function prototype used for method functions (or caller-provided
- * callbacks) that transform filenames. They are passed a DSO structure
- * pointer (or NULL if they are to be used independantly of a DSO object) and
- * a filename to transform. They should either return NULL (if there is an
- * error condition) or a newly allocated string containing the transformed
- * form that the caller will need to free with OPENSSL_free() when done.
- */
-typedef char *(*DSO_NAME_CONVERTER_FUNC)(DSO *, const char *);
-/*
- * The function prototype used for method functions (or caller-provided
- * callbacks) that merge two file specifications. They are passed a DSO
- * structure pointer (or NULL if they are to be used independantly of a DSO
- * object) and two file specifications to merge. They should either return
- * NULL (if there is an error condition) or a newly allocated string
- * containing the result of merging that the caller will need to free with
- * OPENSSL_free() when done. Here, merging means that bits and pieces are
- * taken from each of the file specifications and added together in whatever
- * fashion that is sensible for the DSO method in question.  The only rule
- * that really applies is that if the two specification contain pieces of the
- * same type, the copy from the first string takes priority.  One could see
- * it as the first specification is the one given by the user and the second
- * being a bunch of defaults to add on if they're missing in the first.
- */
-typedef char *(*DSO_MERGER_FUNC)(DSO *, const char *, const char *);
-
-typedef struct dso_meth_st {
-    const char *name;
-    /*
-     * Loads a shared library, NB: new DSO_METHODs must ensure that a
-     * successful load populates the loaded_filename field, and likewise a
-     * successful unload OPENSSL_frees and NULLs it out.
-     */
-    int (*dso_load) (DSO *dso);
-    /* Unloads a shared library */
-    int (*dso_unload) (DSO *dso);
-    /* Binds a variable */
-    void *(*dso_bind_var) (DSO *dso, const char *symname);
-    /*
-     * Binds a function - assumes a return type of DSO_FUNC_TYPE. This should
-     * be cast to the real function prototype by the caller. Platforms that
-     * don't have compatible representations for different prototypes (this
-     * is possible within ANSI C) are highly unlikely to have shared
-     * libraries at all, let alone a DSO_METHOD implemented for them.
-     */
-    DSO_FUNC_TYPE (*dso_bind_func) (DSO *dso, const char *symname);
-/* I don't think this would actually be used in any circumstances. */
-# if 0
-    /* Unbinds a variable */
-    int (*dso_unbind_var) (DSO *dso, char *symname, void *symptr);
-    /* Unbinds a function */
-    int (*dso_unbind_func) (DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
-# endif
-    /*
-     * The generic (yuck) "ctrl()" function. NB: Negative return values
-     * (rather than zero) indicate errors.
-     */
-    long (*dso_ctrl) (DSO *dso, int cmd, long larg, void *parg);
-    /*
-     * The default DSO_METHOD-specific function for converting filenames to a
-     * canonical native form.
-     */
-    DSO_NAME_CONVERTER_FUNC dso_name_converter;
-    /*
-     * The default DSO_METHOD-specific function for converting filenames to a
-     * canonical native form.
-     */
-    DSO_MERGER_FUNC dso_merger;
-    /* [De]Initialisation handlers. */
-    int (*init) (DSO *dso);
-    int (*finish) (DSO *dso);
-    /* Return pathname of the module containing location */
-    int (*pathbyaddr) (void *addr, char *path, int sz);
-    /* Perform global symbol lookup, i.e. among *all* modules */
-    void *(*globallookup) (const char *symname);
-} DSO_METHOD;
-
-/**********************************************************************/
-/* The low-level handle type used to refer to a loaded shared library */
-
-struct dso_st {
-    DSO_METHOD *meth;
-    /*
-     * Standard dlopen uses a (void *). Win32 uses a HANDLE. VMS doesn't use
-     * anything but will need to cache the filename for use in the dso_bind
-     * handler. All in all, let each method control its own destiny.
-     * "Handles" and such go in a STACK.
-     */
-    STACK_OF(void) *meth_data;
-    int references;
-    int flags;
-    /*
-     * For use by applications etc ... use this for your bits'n'pieces, don't
-     * touch meth_data!
-     */
-    CRYPTO_EX_DATA ex_data;
-    /*
-     * If this callback function pointer is set to non-NULL, then it will be
-     * used in DSO_load() in place of meth->dso_name_converter. NB: This
-     * should normally set using DSO_set_name_converter().
-     */
-    DSO_NAME_CONVERTER_FUNC name_converter;
-    /*
-     * If this callback function pointer is set to non-NULL, then it will be
-     * used in DSO_load() in place of meth->dso_merger. NB: This should
-     * normally set using DSO_set_merger().
-     */
-    DSO_MERGER_FUNC merger;
-    /*
-     * This is populated with (a copy of) the platform-independant filename
-     * used for this DSO.
-     */
-    char *filename;
-    /*
-     * This is populated with (a copy of) the translated filename by which
-     * the DSO was actually loaded. It is NULL iff the DSO is not currently
-     * loaded. NB: This is here because the filename translation process may
-     * involve a callback being invoked more than once not only to convert to
-     * a platform-specific form, but also to try different filenames in the
-     * process of trying to perform a load. As such, this variable can be
-     * used to indicate (a) whether this DSO structure corresponds to a
-     * loaded library or not, and (b) the filename with which it was actually
-     * loaded.
-     */
-    char *loaded_filename;
-};
-
-DSO *DSO_new(void);
-DSO *DSO_new_method(DSO_METHOD *method);
-int DSO_free(DSO *dso);
-int DSO_flags(DSO *dso);
-int DSO_up_ref(DSO *dso);
-long DSO_ctrl(DSO *dso, int cmd, long larg, void *parg);
-
-/*
- * This function sets the DSO's name_converter callback. If it is non-NULL,
- * then it will be used instead of the associated DSO_METHOD's function. If
- * oldcb is non-NULL then it is set to the function pointer value being
- * replaced. Return value is non-zero for success.
- */
-int DSO_set_name_converter(DSO *dso, DSO_NAME_CONVERTER_FUNC cb,
-                           DSO_NAME_CONVERTER_FUNC *oldcb);
-/*
- * These functions can be used to get/set the platform-independant filename
- * used for a DSO. NB: set will fail if the DSO is already loaded.
- */
-const char *DSO_get_filename(DSO *dso);
-int DSO_set_filename(DSO *dso, const char *filename);
-/*
- * This function will invoke the DSO's name_converter callback to translate a
- * filename, or if the callback isn't set it will instead use the DSO_METHOD's
- * converter. If "filename" is NULL, the "filename" in the DSO itself will be
- * used. If the DSO_FLAG_NO_NAME_TRANSLATION flag is set, then the filename is
- * simply duplicated. NB: This function is usually called from within a
- * DSO_METHOD during the processing of a DSO_load() call, and is exposed so
- * that caller-created DSO_METHODs can do the same thing. A non-NULL return
- * value will need to be OPENSSL_free()'d.
- */
-char *DSO_convert_filename(DSO *dso, const char *filename);
-/*
- * This function will invoke the DSO's merger callback to merge two file
- * specifications, or if the callback isn't set it will instead use the
- * DSO_METHOD's merger.  A non-NULL return value will need to be
- * OPENSSL_free()'d.
- */
-char *DSO_merge(DSO *dso, const char *filespec1, const char *filespec2);
-/*
- * If the DSO is currently loaded, this returns the filename that it was
- * loaded under, otherwise it returns NULL. So it is also useful as a test as
- * to whether the DSO is currently loaded. NB: This will not necessarily
- * return the same value as DSO_convert_filename(dso, dso->filename), because
- * the DSO_METHOD's load function may have tried a variety of filenames (with
- * and/or without the aid of the converters) before settling on the one it
- * actually loaded.
- */
-const char *DSO_get_loaded_filename(DSO *dso);
-
-void DSO_set_default_method(DSO_METHOD *meth);
-DSO_METHOD *DSO_get_default_method(void);
-DSO_METHOD *DSO_get_method(DSO *dso);
-DSO_METHOD *DSO_set_method(DSO *dso, DSO_METHOD *meth);
-
-/*
- * The all-singing all-dancing load function, you normally pass NULL for the
- * first and third parameters. Use DSO_up and DSO_free for subsequent
- * reference count handling. Any flags passed in will be set in the
- * constructed DSO after its init() function but before the load operation.
- * If 'dso' is non-NULL, 'flags' is ignored.
- */
-DSO *DSO_load(DSO *dso, const char *filename, DSO_METHOD *meth, int flags);
-
-/* This function binds to a variable inside a shared library. */
-void *DSO_bind_var(DSO *dso, const char *symname);
-
-/* This function binds to a function inside a shared library. */
-DSO_FUNC_TYPE DSO_bind_func(DSO *dso, const char *symname);
-
-/*
- * This method is the default, but will beg, borrow, or steal whatever method
- * should be the default on any particular platform (including
- * DSO_METH_null() if necessary).
- */
-DSO_METHOD *DSO_METHOD_openssl(void);
-
-/*
- * This method is defined for all platforms - if a platform has no DSO
- * support then this will be the only method!
- */
-DSO_METHOD *DSO_METHOD_null(void);
-
-/*
- * If DSO_DLFCN is defined, the standard dlfcn.h-style functions (dlopen,
- * dlclose, dlsym, etc) will be used and incorporated into this method. If
- * not, this method will return NULL.
- */
-DSO_METHOD *DSO_METHOD_dlfcn(void);
-
-/*
- * If DSO_DL is defined, the standard dl.h-style functions (shl_load,
- * shl_unload, shl_findsym, etc) will be used and incorporated into this
- * method. If not, this method will return NULL.
- */
-DSO_METHOD *DSO_METHOD_dl(void);
-
-/* If WIN32 is defined, use DLLs. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_win32(void);
-
-/* If VMS is defined, use shared images. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_vms(void);
-
-/*
- * This function writes null-terminated pathname of DSO module containing
- * 'addr' into 'sz' large caller-provided 'path' and returns the number of
- * characters [including trailing zero] written to it. If 'sz' is 0 or
- * negative, 'path' is ignored and required amount of charachers [including
- * trailing zero] to accomodate pathname is returned. If 'addr' is NULL, then
- * pathname of cryptolib itself is returned. Negative or zero return value
- * denotes error.
- */
-int DSO_pathbyaddr(void *addr, char *path, int sz);
-
-/*
- * This function should be used with caution! It looks up symbols in *all*
- * loaded modules and if module gets unloaded by somebody else attempt to
- * dereference the pointer is doomed to have fatal consequences. Primary
- * usage for this function is to probe *core* system functionality, e.g.
- * check if getnameinfo(3) is available at run-time without bothering about
- * OS-specific details such as libc.so.versioning or where does it actually
- * reside: in libc itself or libsocket.
- */
-void *DSO_global_lookup(const char *name);
-
-/* If BeOS is defined, use shared images. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_beos(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_DSO_strings(void);
-
-/* Error codes for the DSO functions. */
-
-/* Function codes. */
-# define DSO_F_BEOS_BIND_FUNC                             144
-# define DSO_F_BEOS_BIND_VAR                              145
-# define DSO_F_BEOS_LOAD                                  146
-# define DSO_F_BEOS_NAME_CONVERTER                        147
-# define DSO_F_BEOS_UNLOAD                                148
-# define DSO_F_DLFCN_BIND_FUNC                            100
-# define DSO_F_DLFCN_BIND_VAR                             101
-# define DSO_F_DLFCN_LOAD                                 102
-# define DSO_F_DLFCN_MERGER                               130
-# define DSO_F_DLFCN_NAME_CONVERTER                       123
-# define DSO_F_DLFCN_UNLOAD                               103
-# define DSO_F_DL_BIND_FUNC                               104
-# define DSO_F_DL_BIND_VAR                                105
-# define DSO_F_DL_LOAD                                    106
-# define DSO_F_DL_MERGER                                  131
-# define DSO_F_DL_NAME_CONVERTER                          124
-# define DSO_F_DL_UNLOAD                                  107
-# define DSO_F_DSO_BIND_FUNC                              108
-# define DSO_F_DSO_BIND_VAR                               109
-# define DSO_F_DSO_CONVERT_FILENAME                       126
-# define DSO_F_DSO_CTRL                                   110
-# define DSO_F_DSO_FREE                                   111
-# define DSO_F_DSO_GET_FILENAME                           127
-# define DSO_F_DSO_GET_LOADED_FILENAME                    128
-# define DSO_F_DSO_GLOBAL_LOOKUP                          139
-# define DSO_F_DSO_LOAD                                   112
-# define DSO_F_DSO_MERGE                                  132
-# define DSO_F_DSO_NEW_METHOD                             113
-# define DSO_F_DSO_PATHBYADDR                             140
-# define DSO_F_DSO_SET_FILENAME                           129
-# define DSO_F_DSO_SET_NAME_CONVERTER                     122
-# define DSO_F_DSO_UP_REF                                 114
-# define DSO_F_GLOBAL_LOOKUP_FUNC                         138
-# define DSO_F_PATHBYADDR                                 137
-# define DSO_F_VMS_BIND_SYM                               115
-# define DSO_F_VMS_LOAD                                   116
-# define DSO_F_VMS_MERGER                                 133
-# define DSO_F_VMS_UNLOAD                                 117
-# define DSO_F_WIN32_BIND_FUNC                            118
-# define DSO_F_WIN32_BIND_VAR                             119
-# define DSO_F_WIN32_GLOBALLOOKUP                         142
-# define DSO_F_WIN32_GLOBALLOOKUP_FUNC                    143
-# define DSO_F_WIN32_JOINER                               135
-# define DSO_F_WIN32_LOAD                                 120
-# define DSO_F_WIN32_MERGER                               134
-# define DSO_F_WIN32_NAME_CONVERTER                       125
-# define DSO_F_WIN32_PATHBYADDR                           141
-# define DSO_F_WIN32_SPLITTER                             136
-# define DSO_F_WIN32_UNLOAD                               121
-
-/* Reason codes. */
-# define DSO_R_CTRL_FAILED                                100
-# define DSO_R_DSO_ALREADY_LOADED                         110
-# define DSO_R_EMPTY_FILE_STRUCTURE                       113
-# define DSO_R_FAILURE                                    114
-# define DSO_R_FILENAME_TOO_BIG                           101
-# define DSO_R_FINISH_FAILED                              102
-# define DSO_R_INCORRECT_FILE_SYNTAX                      115
-# define DSO_R_LOAD_FAILED                                103
-# define DSO_R_NAME_TRANSLATION_FAILED                    109
-# define DSO_R_NO_FILENAME                                111
-# define DSO_R_NO_FILE_SPECIFICATION                      116
-# define DSO_R_NULL_HANDLE                                104
-# define DSO_R_SET_FILENAME_FAILED                        112
-# define DSO_R_STACK_ERROR                                105
-# define DSO_R_SYM_FAILURE                                106
-# define DSO_R_UNLOAD_FAILED                              107
-# define DSO_R_UNSUPPORTED                                108
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/dtls1.h b/include.new/openssl/dtls1.h
deleted file mode 100644
index 8deb299..0000000
--- a/include.new/openssl/dtls1.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/* ssl/dtls1.h */
-/*
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_DTLS1_H
-# define HEADER_DTLS1_H
-
-# include <openssl/buffer.h>
-# include <openssl/pqueue.h>
-# ifdef OPENSSL_SYS_VMS
-#  include <resource.h>
-#  include <sys/timeb.h>
-# endif
-# ifdef OPENSSL_SYS_WIN32
-/* Needed for struct timeval */
-#  include <winsock.h>
-# elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_)
-#  include <sys/timeval.h>
-# else
-#  if defined(OPENSSL_SYS_VXWORKS)
-#   include <sys/times.h>
-#  else
-#   include <sys/time.h>
-#  endif
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define DTLS1_VERSION                   0xFEFF
-# define DTLS_MAX_VERSION                DTLS1_VERSION
-# define DTLS1_VERSION_MAJOR             0xFE
-
-# define DTLS1_BAD_VER                   0x0100
-
-# if 0
-/* this alert description is not specified anywhere... */
-#  define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE    110
-# endif
-
-/* lengths of messages */
-# define DTLS1_COOKIE_LENGTH                     256
-
-# define DTLS1_RT_HEADER_LENGTH                  13
-
-# define DTLS1_HM_HEADER_LENGTH                  12
-
-# define DTLS1_HM_BAD_FRAGMENT                   -2
-# define DTLS1_HM_FRAGMENT_RETRY                 -3
-
-# define DTLS1_CCS_HEADER_LENGTH                  1
-
-# ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
-#  define DTLS1_AL_HEADER_LENGTH                   7
-# else
-#  define DTLS1_AL_HEADER_LENGTH                   2
-# endif
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-#  ifndef OPENSSL_NO_SCTP
-#   define DTLS1_SCTP_AUTH_LABEL   "EXPORTER_DTLS_OVER_SCTP"
-#  endif
-
-/* Max MTU overhead we know about so far is 40 for IPv6 + 8 for UDP */
-#  define DTLS1_MAX_MTU_OVERHEAD                   48
-
-typedef struct dtls1_bitmap_st {
-    unsigned long map;          /* track 32 packets on 32-bit systems and 64
-                                 * - on 64-bit systems */
-    unsigned char max_seq_num[8]; /* max record number seen so far, 64-bit
-                                   * value in big-endian encoding */
-} DTLS1_BITMAP;
-
-struct dtls1_retransmit_state {
-    EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */
-    EVP_MD_CTX *write_hash;     /* used for mac generation */
-#  ifndef OPENSSL_NO_COMP
-    COMP_CTX *compress;         /* compression */
-#  else
-    char *compress;
-#  endif
-    SSL_SESSION *session;
-    unsigned short epoch;
-};
-
-struct hm_header_st {
-    unsigned char type;
-    unsigned long msg_len;
-    unsigned short seq;
-    unsigned long frag_off;
-    unsigned long frag_len;
-    unsigned int is_ccs;
-    struct dtls1_retransmit_state saved_retransmit_state;
-};
-
-struct ccs_header_st {
-    unsigned char type;
-    unsigned short seq;
-};
-
-struct dtls1_timeout_st {
-    /* Number of read timeouts so far */
-    unsigned int read_timeouts;
-    /* Number of write timeouts so far */
-    unsigned int write_timeouts;
-    /* Number of alerts received so far */
-    unsigned int num_alerts;
-};
-
-typedef struct record_pqueue_st {
-    unsigned short epoch;
-    pqueue q;
-} record_pqueue;
-
-typedef struct hm_fragment_st {
-    struct hm_header_st msg_header;
-    unsigned char *fragment;
-    unsigned char *reassembly;
-} hm_fragment;
-
-typedef struct dtls1_state_st {
-    unsigned int send_cookie;
-    unsigned char cookie[DTLS1_COOKIE_LENGTH];
-    unsigned char rcvd_cookie[DTLS1_COOKIE_LENGTH];
-    unsigned int cookie_len;
-    /*
-     * The current data and handshake epoch.  This is initially
-     * undefined, and starts at zero once the initial handshake is
-     * completed
-     */
-    unsigned short r_epoch;
-    unsigned short w_epoch;
-    /* records being received in the current epoch */
-    DTLS1_BITMAP bitmap;
-    /* renegotiation starts a new set of sequence numbers */
-    DTLS1_BITMAP next_bitmap;
-    /* handshake message numbers */
-    unsigned short handshake_write_seq;
-    unsigned short next_handshake_write_seq;
-    unsigned short handshake_read_seq;
-    /* save last sequence number for retransmissions */
-    unsigned char last_write_sequence[8];
-    /* Received handshake records (processed and unprocessed) */
-    record_pqueue unprocessed_rcds;
-    record_pqueue processed_rcds;
-    /* Buffered handshake messages */
-    pqueue buffered_messages;
-    /* Buffered (sent) handshake records */
-    pqueue sent_messages;
-    /*
-     * Buffered application records. Only for records between CCS and
-     * Finished to prevent either protocol violation or unnecessary message
-     * loss.
-     */
-    record_pqueue buffered_app_data;
-    /* Is set when listening for new connections with dtls1_listen() */
-    unsigned int listen;
-    unsigned int link_mtu;      /* max on-the-wire DTLS packet size */
-    unsigned int mtu;           /* max DTLS packet size */
-    struct hm_header_st w_msg_hdr;
-    struct hm_header_st r_msg_hdr;
-    struct dtls1_timeout_st timeout;
-    /*
-     * Indicates when the last handshake msg or heartbeat sent will timeout
-     */
-    struct timeval next_timeout;
-    /* Timeout duration */
-    unsigned short timeout_duration;
-    /*
-     * storage for Alert/Handshake protocol data received but not yet
-     * processed by ssl3_read_bytes:
-     */
-    unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
-    unsigned int alert_fragment_len;
-    unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];
-    unsigned int handshake_fragment_len;
-    unsigned int retransmitting;
-    /*
-     * Set when the handshake is ready to process peer's ChangeCipherSpec message.
-     * Cleared after the message has been processed.
-     */
-    unsigned int change_cipher_spec_ok;
-#  ifndef OPENSSL_NO_SCTP
-    /* used when SSL_ST_XX_FLUSH is entered */
-    int next_state;
-    int shutdown_received;
-#  endif
-} DTLS1_STATE;
-
-typedef struct dtls1_record_data_st {
-    unsigned char *packet;
-    unsigned int packet_length;
-    SSL3_BUFFER rbuf;
-    SSL3_RECORD rrec;
-#  ifndef OPENSSL_NO_SCTP
-    struct bio_dgram_sctp_rcvinfo recordinfo;
-#  endif
-} DTLS1_RECORD_DATA;
-
-# endif
-
-/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */
-# define DTLS1_TMO_READ_COUNT                      2
-# define DTLS1_TMO_WRITE_COUNT                     2
-
-# define DTLS1_TMO_ALERT_COUNT                     12
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/e_os.h b/include.new/openssl/e_os.h
deleted file mode 100644
index 3c7a496..0000000
--- a/include.new/openssl/e_os.h
+++ /dev/null
@@ -1,570 +0,0 @@
-/* e_os.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_E_OS_H
-#define HEADER_E_OS_H
-
-#include <openssl/opensslconf.h>
-
-#include <openssl/e_os2.h>
-/* <openssl/e_os2.h> contains what we can justify to make visible
- * to the outside; this file e_os.h is not part of the exported
- * interface. */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Used to checking reference counts, most while doing perl5 stuff :-) */
-#ifdef REF_PRINT
-#undef REF_PRINT
-#define REF_PRINT(a,b)	fprintf(stderr,"%08X:%4d:%s\n",(int)b,b->references,a)
-#endif
-
-#ifndef DEVRANDOM
-/* set this to a comma-separated list of 'random' device files to try out.
- * My default, we will try to read at least one of these files */
-#define DEVRANDOM "/dev/urandom","/dev/random","/dev/srandom"
-#endif
-#ifndef DEVRANDOM_EGD
-/* set this to a comma-seperated list of 'egd' sockets to try out. These
- * sockets will be tried in the order listed in case accessing the device files
- * listed in DEVRANDOM did not return enough entropy. */
-#define DEVRANDOM_EGD "/var/run/egd-pool","/dev/egd-pool","/etc/egd-pool","/etc/entropy"
-#endif
-
-#if defined(OPENSSL_SYS_VXWORKS)
-#  define NO_SYS_PARAM_H
-#  define NO_CHMOD
-#  define NO_SYSLOG
-#endif
-  
-#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC)
-# if macintosh==1
-#  ifndef MAC_OS_GUSI_SOURCE
-#    define MAC_OS_pre_X
-#    define NO_SYS_TYPES_H
-     typedef long ssize_t;
-#  endif
-#  define NO_SYS_PARAM_H
-#  define NO_CHMOD
-#  define NO_SYSLOG
-#  undef  DEVRANDOM
-#  define GETPID_IS_MEANINGLESS
-# endif
-#endif
-
-/********************************************************************
- The Microsoft section
- ********************************************************************/
-/* The following is used becaue of the small stack in some
- * Microsoft operating systems */
-#if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYSNAME_WIN32)
-#  define MS_STATIC	static
-#else
-#  define MS_STATIC
-#endif
-
-#if defined(OPENSSL_SYS_WIN32) && !defined(WIN32)
-#  define WIN32
-#endif
-#if defined(OPENSSL_SYS_WIN16) && !defined(WIN16)
-#  define WIN16
-#endif
-#if defined(OPENSSL_SYS_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(OPENSSL_SYS_MSDOS) && !defined(MSDOS)
-#  define MSDOS
-#endif
-
-#if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS)
-#  define GETPID_IS_MEANINGLESS
-#endif
-
-#ifdef WIN32
-#define get_last_sys_error()	GetLastError()
-#define clear_sys_error()	SetLastError(0)
-#if !defined(WINNT)
-#define WIN_CONSOLE_BUG
-#endif
-#else
-#define get_last_sys_error()	errno
-#define clear_sys_error()	errno=0
-#endif
-
-#if defined(WINDOWS)
-#define get_last_socket_error()	WSAGetLastError()
-#define clear_socket_error()	WSASetLastError(0)
-#define readsocket(s,b,n)	recv((s),(b),(n),0)
-#define writesocket(s,b,n)	send((s),(b),(n),0)
-#define EADDRINUSE		WSAEADDRINUSE
-#elif defined(__DJGPP__)
-#define WATT32
-#define get_last_socket_error()	errno
-#define clear_socket_error()	errno=0
-#define closesocket(s)		close_s(s)
-#define readsocket(s,b,n)	read_s(s,b,n)
-#define writesocket(s,b,n)	send(s,b,n,0)
-#elif defined(MAC_OS_pre_X)
-#define get_last_socket_error()	errno
-#define clear_socket_error()	errno=0
-#define closesocket(s)		MacSocket_close(s)
-#define readsocket(s,b,n)	MacSocket_recv((s),(b),(n),true)
-#define writesocket(s,b,n)	MacSocket_send((s),(b),(n))
-#elif defined(OPENSSL_SYS_VMS)
-#define get_last_socket_error() errno
-#define clear_socket_error()    errno=0
-#define ioctlsocket(a,b,c)      ioctl(a,b,c)
-#define closesocket(s)          close(s)
-#define readsocket(s,b,n)       recv((s),(b),(n),0)
-#define writesocket(s,b,n)      send((s),(b),(n),0)
-#elif defined(OPENSSL_SYS_VXWORKS)
-#define get_last_socket_error()	errno
-#define clear_socket_error()	errno=0
-#define ioctlsocket(a,b,c)	    ioctl((a),(b),(int)(c))
-#define closesocket(s)		    close(s)
-#define readsocket(s,b,n)	    read((s),(b),(n))
-#define writesocket(s,b,n)	    write((s),(char *)(b),(n))
-#else
-#define get_last_socket_error()	errno
-#define clear_socket_error()	errno=0
-#define ioctlsocket(a,b,c)	ioctl(a,b,c)
-#define closesocket(s)		close(s)
-#define readsocket(s,b,n)	read((s),(b),(n))
-#define writesocket(s,b,n)	write((s),(b),(n))
-#endif
-
-#ifdef WIN16
-#  define OPENSSL_NO_FP_API
-#  define MS_CALLBACK	_far _loadds
-#  define MS_FAR	_far
-#else
-#  define MS_CALLBACK
-#  define MS_FAR
-#endif
-
-#ifdef OPENSSL_NO_STDIO
-#  define OPENSSL_NO_FP_API
-#endif
-
-#if (defined(WINDOWS) || defined(MSDOS))
-
-#  ifdef __DJGPP__
-#    include <unistd.h>
-#    include <sys/stat.h>
-#    include <sys/socket.h>
-#    include <tcp.h>
-#    include <netdb.h>
-#    define _setmode setmode
-#    define _O_TEXT O_TEXT
-#    define _O_BINARY O_BINARY
-#  endif /* __DJGPP__ */
-
-#  ifndef S_IFDIR
-#    define S_IFDIR	_S_IFDIR
-#  endif
-
-#  ifndef S_IFMT
-#    define S_IFMT	_S_IFMT
-#  endif
-
-#  if !defined(WINNT) && !defined(__DJGPP__)
-#    define NO_SYSLOG
-#  endif
-#  define NO_DIRENT
-
-#  ifdef WINDOWS
-#    include <windows.h>
-#    include <stddef.h>
-#    include <errno.h>
-#    include <string.h>
-#    include <malloc.h>
-#  endif
-#  include <io.h>
-#  include <fcntl.h>
-
-#  ifdef OPENSSL_SYS_WINCE
-#    include <winsock_extras.h>
-#  endif
-
-#  define ssize_t long
-
-#  if defined (__BORLANDC__)
-#    define _setmode setmode
-#    define _O_TEXT O_TEXT
-#    define _O_BINARY O_BINARY
-#    define _int64 __int64
-#    define _kbhit kbhit
-#  endif
-
-#  if defined(WIN16) && defined(SSLEAY) && defined(_WINEXITNOPERSIST)
-#    define EXIT(n) _wsetexit(_WINEXITNOPERSIST)
-#    define OPENSSL_EXIT(n) do { if (n == 0) EXIT(n); return(n); } while(0)
-#  else
-#    define EXIT(n) exit(n)
-#  endif
-#  define LIST_SEPARATOR_CHAR ';'
-#  ifndef X_OK
-#    define X_OK	0
-#  endif
-#  ifndef W_OK
-#    define W_OK	2
-#  endif
-#  ifndef R_OK
-#    define R_OK	4
-#  endif
-#  define OPENSSL_CONF	"openssl.cnf"
-#  define SSLEAY_CONF	OPENSSL_CONF
-#  define NUL_DEV	"nul"
-#  define RFILE		".rnd"
-#  ifdef OPENSSL_SYS_WINCE
-#    define DEFAULT_HOME  ""
-#  else
-#    define DEFAULT_HOME  "C:"
-#  endif
-
-#else /* The non-microsoft world world */
-
-#  ifdef OPENSSL_SYS_VMS
-#    define VMS 1
-  /* some programs don't include stdlib, so exit() and others give implicit 
-     function warnings */
-#    include <stdlib.h>
-#    if defined(__DECC)
-#      include <unistd.h>
-#    else
-#      include <unixlib.h>
-#    endif
-#    define OPENSSL_CONF	"openssl.cnf"
-#    define SSLEAY_CONF		OPENSSL_CONF
-#    define RFILE		".rnd"
-#    define LIST_SEPARATOR_CHAR ','
-#    define NUL_DEV		"NLA0:"
-  /* We don't have any well-defined random devices on VMS, yet... */
-#    undef DEVRANDOM
-  /* We need to do this since VMS has the following coding on status codes:
-
-     Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ...
-               The important thing to know is that odd numbers are considered
-	       good, while even ones are considered errors.
-     Bits 3-15: actual status number
-     Bits 16-27: facility number.  0 is considered "unknown"
-     Bits 28-31: control bits.  If bit 28 is set, the shell won't try to
-                 output the message (which, for random codes, just looks ugly)
-
-     So, what we do here is to change 0 to 1 to get the default success status,
-     and everything else is shifted up to fit into the status number field, and
-     the status is tagged as an error, which I believe is what is wanted here.
-     -- Richard Levitte
-  */
-#    define EXIT(n)		do { int __VMS_EXIT = n; \
-                                     if (__VMS_EXIT == 0) \
-				       __VMS_EXIT = 1; \
-				     else \
-				       __VMS_EXIT = (n << 3) | 2; \
-                                     __VMS_EXIT |= 0x10000000; \
-				     exit(__VMS_EXIT); } while(0)
-#    define NO_SYS_PARAM_H
-#  else
-     /* !defined VMS */
-#    ifdef OPENSSL_SYS_MPE
-#      define NO_SYS_PARAM_H
-#    endif
-#    ifdef OPENSSL_UNISTD
-#      include OPENSSL_UNISTD
-#    else
-#      include <unistd.h>
-#    endif
-#    ifndef NO_SYS_TYPES_H
-#      include <sys/types.h>
-#    endif
-#    if defined(NeXT) || defined(OPENSSL_SYS_NEWS4)
-#      define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP
-                         * (unless when compiling with -D_POSIX_SOURCE,
-                         * which doesn't work for us) */
-#    endif
-#    if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) || defined(OPENSSL_SYS_SUNOS)
-#      define ssize_t int /* ditto */
-#    endif
-#    ifdef OPENSSL_SYS_NEWS4 /* setvbuf is missing on mips-sony-bsd */
-#      define setvbuf(a, b, c, d) setbuffer((a), (b), (d))
-       typedef unsigned long clock_t;
-#    endif
-
-#    define OPENSSL_CONF	"openssl.cnf"
-#    define SSLEAY_CONF		OPENSSL_CONF
-#    define RFILE		".rnd"
-#    define LIST_SEPARATOR_CHAR ':'
-#    define NUL_DEV		"/dev/null"
-#    define EXIT(n)		exit(n)
-#  endif
-
-#  define SSLeay_getpid()	getpid()
-
-#endif
-
-
-/*************/
-
-#ifdef USE_SOCKETS
-#  if defined(WINDOWS) || defined(MSDOS)
-      /* windows world */
-
-#    ifdef OPENSSL_NO_SOCK
-#      define SSLeay_Write(a,b,c)	(-1)
-#      define SSLeay_Read(a,b,c)	(-1)
-#      define SHUTDOWN(fd)		close(fd)
-#      define SHUTDOWN2(fd)		close(fd)
-#    elif !defined(__DJGPP__)
-#      include <winsock.h>
-extern HINSTANCE _hInstance;
-#      define SSLeay_Write(a,b,c)	send((a),(b),(c),0)
-#      define SSLeay_Read(a,b,c)	recv((a),(b),(c),0)
-#      define SHUTDOWN(fd)		{ shutdown((fd),0); closesocket(fd); }
-#      define SHUTDOWN2(fd)		{ shutdown((fd),2); closesocket(fd); }
-#    else
-#      define SSLeay_Write(a,b,c)	write_s(a,b,c,0)
-#      define SSLeay_Read(a,b,c)	read_s(a,b,c)
-#      define SHUTDOWN(fd)		close_s(fd)
-#      define SHUTDOWN2(fd)		close_s(fd)
-#    endif
-
-#  elif defined(MAC_OS_pre_X)
-
-#    include "MacSocket.h"
-#    define SSLeay_Write(a,b,c)		MacSocket_send((a),(b),(c))
-#    define SSLeay_Read(a,b,c)		MacSocket_recv((a),(b),(c),true)
-#    define SHUTDOWN(fd)		MacSocket_close(fd)
-#    define SHUTDOWN2(fd)		MacSocket_close(fd)
-
-#  else
-
-#    ifndef NO_SYS_PARAM_H
-#      include <sys/param.h>
-#    endif
-#    ifdef OPENSSL_SYS_VXWORKS
-#      include <time.h> 
-#    elif !defined(OPENSSL_SYS_MPE)
-#      include <sys/time.h> /* Needed under linux for FD_XXX */
-#    endif
-
-#    include <netdb.h>
-#    if defined(OPENSSL_SYS_VMS_NODECC)
-#      include <socket.h>
-#      include <in.h>
-#      include <inet.h>
-#    else
-#      include <sys/socket.h>
-#      ifdef FILIO_H
-#        include <sys/filio.h> /* Added for FIONBIO under unixware */
-#      endif
-#      include <netinet/in.h>
-#      include <arpa/inet.h>
-#    endif
-
-#    if defined(NeXT) || defined(_NEXT_SOURCE)
-#      include <sys/fcntl.h>
-#      include <sys/types.h>
-#    endif
-
-#    ifdef OPENSSL_SYS_AIX
-#      include <sys/select.h>
-#    endif
-
-#    ifdef __QNX__
-#      include <sys/select.h>
-#    endif
-
-#    if defined(sun)
-#      include <sys/filio.h>
-#    else
-#      ifndef VMS
-#        include <sys/ioctl.h>
-#      else
-	 /* ioctl is only in VMS > 7.0 and when socketshr is not used */
-#        if !defined(TCPIP_TYPE_SOCKETSHR) && defined(__VMS_VER) && (__VMS_VER > 70000000)
-#          include <sys/ioctl.h>
-#        endif
-#      endif
-#    endif
-
-#    ifdef VMS
-#      include <unixio.h>
-#      if defined(TCPIP_TYPE_SOCKETSHR)
-#        include <socketshr.h>
-#      endif
-#    endif
-
-#    define SSLeay_Read(a,b,c)     read((a),(b),(c))
-#    define SSLeay_Write(a,b,c)    write((a),(b),(c))
-#    define SHUTDOWN(fd)    { shutdown((fd),0); closesocket((fd)); }
-#    define SHUTDOWN2(fd)   { shutdown((fd),2); closesocket((fd)); }
-#    ifndef INVALID_SOCKET
-#    define INVALID_SOCKET	(-1)
-#    endif /* INVALID_SOCKET */
-#  endif
-#endif
-
-#if defined(__ultrix)
-#  ifndef ssize_t
-#    define ssize_t int 
-#  endif
-#endif
-
-#if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
-  /* include headers first, so our defines don't break it */
-#include <stdlib.h>
-#include <string.h>
-  /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */
-# define memmove(s1,s2,n) bcopy((s2),(s1),(n))
-# define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b)))
-extern char *sys_errlist[]; extern int sys_nerr;
-# define strerror(errnum) \
-	(((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
-#endif
-
-#ifndef OPENSSL_EXIT
-# if defined(MONOLITH) && !defined(OPENSSL_C)
-#  define OPENSSL_EXIT(n) return(n)
-# else
-#  define OPENSSL_EXIT(n) do { EXIT(n); return(n); } while(0)
-# endif
-#endif
-
-/***********************************************/
-
-/* do we need to do this for getenv.
- * Just define getenv for use under windows */
-
-#ifdef WIN16
-/* How to do this needs to be thought out a bit more.... */
-/*char *GETENV(char *);
-#define Getenv	GETENV*/
-#define Getenv	getenv
-#else
-#define Getenv getenv
-#endif
-
-#define DG_GCC_BUG	/* gcc < 2.6.3 on DGUX */
-
-#ifdef sgi
-#define IRIX_CC_BUG	/* all version of IRIX I've tested (4.* 5.*) */
-#endif
-#ifdef OPENSSL_SYS_SNI
-#define IRIX_CC_BUG	/* CDS++ up to V2.0Bsomething suffered from the same bug.*/
-#endif
-
-#if defined(OPENSSL_SYS_WINDOWS)
-#  define strcasecmp _stricmp
-#  define strncasecmp _strnicmp
-#elif defined(OPENSSL_SYS_VMS)
-/* VMS below version 7.0 doesn't have strcasecmp() */
-#  include "o_str.h"
-#  define strcasecmp OPENSSL_strcasecmp
-#  define strncasecmp OPENSSL_strncasecmp
-#elif defined(OPENSSL_SYS_OS2) && defined(__EMX__)
-#  define strcasecmp stricmp
-#  define strncasecmp strnicmp
-#else
-#  ifdef NO_STRINGS_H
-    int	strcasecmp();
-    int	strncasecmp();
-#  else
-#    include <strings.h>
-#  endif /* NO_STRINGS_H */
-#endif
-
-#if defined(OPENSSL_SYS_OS2) && defined(__EMX__)
-# include <io.h>
-# include <fcntl.h>
-# define NO_SYSLOG
-#endif
-
-/* vxworks */
-#if defined(OPENSSL_SYS_VXWORKS)
-#include <ioLib.h>
-#include <tickLib.h>
-#include <sysLib.h>
-
-#define TTY_STRUCT int
-
-#define sleep(a) taskDelay((a) * sysClkRateGet())
-
-#include <vxWorks.h>
-#include <sockLib.h>
-#include <taskLib.h>
-
-#define getpid taskIdSelf
-
-/* NOTE: these are implemented by helpers in database app!
- * if the database is not linked, we need to implement them
- * elswhere */
-struct hostent *gethostbyname(const char *name);
-struct hostent *gethostbyaddr(const char *addr, int length, int type);
-struct servent *getservbyname(const char *name, const char *proto);
-
-#endif
-/* end vxworks */
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/include.new/openssl/e_os2.h b/include.new/openssl/e_os2.h
deleted file mode 100644
index 2b1b78f..0000000
--- a/include.new/openssl/e_os2.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/* e_os2.h */
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <openssl/opensslconf.h>
-
-#ifndef HEADER_E_OS2_H
-# define HEADER_E_OS2_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************
- * Detect operating systems.  This probably needs completing.
- * The result is that at least one OPENSSL_SYS_os macro should be defined.
- * However, if none is defined, Unix is assumed.
- **/
-
-# define OPENSSL_SYS_UNIX
-
-/* ---------------------- Macintosh, before MacOS X ----------------------- */
-# if defined(__MWERKS__) && defined(macintosh) || defined(OPENSSL_SYSNAME_MAC)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_MACINTOSH_CLASSIC
-# endif
-
-/* ---------------------- NetWare ----------------------------------------- */
-# if defined(NETWARE) || defined(OPENSSL_SYSNAME_NETWARE)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_NETWARE
-# endif
-
-/* --------------------- Microsoft operating systems ---------------------- */
-
-/*
- * Note that MSDOS actually denotes 32-bit environments running on top of
- * MS-DOS, such as DJGPP one.
- */
-# if defined(OPENSSL_SYSNAME_MSDOS)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_MSDOS
-# endif
-
-/*
- * For 32 bit environment, there seems to be the CygWin environment and then
- * all the others that try to do the same thing Microsoft does...
- */
-# if defined(OPENSSL_SYSNAME_UWIN)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_WIN32_UWIN
-# else
-#  if defined(__CYGWIN32__) || defined(OPENSSL_SYSNAME_CYGWIN32)
-#   undef OPENSSL_SYS_UNIX
-#   define OPENSSL_SYS_WIN32_CYGWIN
-#  else
-#   if defined(_WIN32) || defined(OPENSSL_SYSNAME_WIN32)
-#    undef OPENSSL_SYS_UNIX
-#    define OPENSSL_SYS_WIN32
-#   endif
-#   if defined(_WIN64) || defined(OPENSSL_SYSNAME_WIN64)
-#    undef OPENSSL_SYS_UNIX
-#    if !defined(OPENSSL_SYS_WIN64)
-#     define OPENSSL_SYS_WIN64
-#    endif
-#   endif
-#   if defined(OPENSSL_SYSNAME_WINNT)
-#    undef OPENSSL_SYS_UNIX
-#    define OPENSSL_SYS_WINNT
-#   endif
-#   if defined(OPENSSL_SYSNAME_WINCE)
-#    undef OPENSSL_SYS_UNIX
-#    define OPENSSL_SYS_WINCE
-#   endif
-#  endif
-# endif
-
-/* Anything that tries to look like Microsoft is "Windows" */
-# if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN64) || defined(OPENSSL_SYS_WINNT) || defined(OPENSSL_SYS_WINCE)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_WINDOWS
-#  ifndef OPENSSL_SYS_MSDOS
-#   define OPENSSL_SYS_MSDOS
-#  endif
-# endif
-
-/*
- * DLL settings.  This part is a bit tough, because it's up to the
- * application implementor how he or she will link the application, so it
- * requires some macro to be used.
- */
-# ifdef OPENSSL_SYS_WINDOWS
-#  ifndef OPENSSL_OPT_WINDLL
-#   if defined(_WINDLL)         /* This is used when building OpenSSL to
-                                 * indicate that DLL linkage should be used */
-#    define OPENSSL_OPT_WINDLL
-#   endif
-#  endif
-# endif
-
-/* ------------------------------- OpenVMS -------------------------------- */
-# if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYSNAME_VMS)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_VMS
-#  if defined(__DECC)
-#   define OPENSSL_SYS_VMS_DECC
-#  elif defined(__DECCXX)
-#   define OPENSSL_SYS_VMS_DECC
-#   define OPENSSL_SYS_VMS_DECCXX
-#  else
-#   define OPENSSL_SYS_VMS_NODECC
-#  endif
-# endif
-
-/* -------------------------------- OS/2 ---------------------------------- */
-# if defined(__EMX__) || defined(__OS2__)
-#  undef OPENSSL_SYS_UNIX
-#  define OPENSSL_SYS_OS2
-# endif
-
-/* -------------------------------- Unix ---------------------------------- */
-# ifdef OPENSSL_SYS_UNIX
-#  if defined(linux) || defined(__linux__) || defined(OPENSSL_SYSNAME_LINUX)
-#   define OPENSSL_SYS_LINUX
-#  endif
-#  ifdef OPENSSL_SYSNAME_MPE
-#   define OPENSSL_SYS_MPE
-#  endif
-#  ifdef OPENSSL_SYSNAME_SNI
-#   define OPENSSL_SYS_SNI
-#  endif
-#  ifdef OPENSSL_SYSNAME_ULTRASPARC
-#   define OPENSSL_SYS_ULTRASPARC
-#  endif
-#  ifdef OPENSSL_SYSNAME_NEWS4
-#   define OPENSSL_SYS_NEWS4
-#  endif
-#  ifdef OPENSSL_SYSNAME_MACOSX
-#   define OPENSSL_SYS_MACOSX
-#  endif
-#  ifdef OPENSSL_SYSNAME_MACOSX_RHAPSODY
-#   define OPENSSL_SYS_MACOSX_RHAPSODY
-#   define OPENSSL_SYS_MACOSX
-#  endif
-#  ifdef OPENSSL_SYSNAME_SUNOS
-#   define OPENSSL_SYS_SUNOS
-#  endif
-#  if defined(_CRAY) || defined(OPENSSL_SYSNAME_CRAY)
-#   define OPENSSL_SYS_CRAY
-#  endif
-#  if defined(_AIX) || defined(OPENSSL_SYSNAME_AIX)
-#   define OPENSSL_SYS_AIX
-#  endif
-# endif
-
-/* -------------------------------- VOS ----------------------------------- */
-# if defined(__VOS__) || defined(OPENSSL_SYSNAME_VOS)
-#  define OPENSSL_SYS_VOS
-#  ifdef __HPPA__
-#   define OPENSSL_SYS_VOS_HPPA
-#  endif
-#  ifdef __IA32__
-#   define OPENSSL_SYS_VOS_IA32
-#  endif
-# endif
-
-/* ------------------------------ VxWorks --------------------------------- */
-# ifdef OPENSSL_SYSNAME_VXWORKS
-#  define OPENSSL_SYS_VXWORKS
-# endif
-
-/* -------------------------------- BeOS ---------------------------------- */
-# if defined(__BEOS__)
-#  define OPENSSL_SYS_BEOS
-#  include <sys/socket.h>
-#  if defined(BONE_VERSION)
-#   define OPENSSL_SYS_BEOS_BONE
-#  else
-#   define OPENSSL_SYS_BEOS_R5
-#  endif
-# endif
-
-/**
- * That's it for OS-specific stuff
- *****************************************************************************/
-
-/* Specials for I/O an exit */
-# ifdef OPENSSL_SYS_MSDOS
-#  define OPENSSL_UNISTD_IO <io.h>
-#  define OPENSSL_DECLARE_EXIT extern void exit(int);
-# else
-#  define OPENSSL_UNISTD_IO OPENSSL_UNISTD
-#  define OPENSSL_DECLARE_EXIT  /* declared in unistd.h */
-# endif
-
-/*-
- * Definitions of OPENSSL_GLOBAL and OPENSSL_EXTERN, to define and declare
- * certain global symbols that, with some compilers under VMS, have to be
- * defined and declared explicitely with globaldef and globalref.
- * Definitions of OPENSSL_EXPORT and OPENSSL_IMPORT, to define and declare
- * DLL exports and imports for compilers under Win32.  These are a little
- * more complicated to use.  Basically, for any library that exports some
- * global variables, the following code must be present in the header file
- * that declares them, before OPENSSL_EXTERN is used:
- *
- * #ifdef SOME_BUILD_FLAG_MACRO
- * # undef OPENSSL_EXTERN
- * # define OPENSSL_EXTERN OPENSSL_EXPORT
- * #endif
- *
- * The default is to have OPENSSL_EXPORT, OPENSSL_IMPORT and OPENSSL_GLOBAL
- * have some generally sensible values, and for OPENSSL_EXTERN to have the
- * value OPENSSL_IMPORT.
- */
-
-# if defined(OPENSSL_SYS_VMS_NODECC)
-#  define OPENSSL_EXPORT globalref
-#  define OPENSSL_IMPORT globalref
-#  define OPENSSL_GLOBAL globaldef
-# elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
-#  define OPENSSL_EXPORT extern __declspec(dllexport)
-#  define OPENSSL_IMPORT extern __declspec(dllimport)
-#  define OPENSSL_GLOBAL
-# else
-#  define OPENSSL_EXPORT extern
-#  define OPENSSL_IMPORT extern
-#  define OPENSSL_GLOBAL
-# endif
-# define OPENSSL_EXTERN OPENSSL_IMPORT
-
-/*-
- * Macros to allow global variables to be reached through function calls when
- * required (if a shared library version requires it, for example.
- * The way it's done allows definitions like this:
- *
- *      // in foobar.c
- *      OPENSSL_IMPLEMENT_GLOBAL(int,foobar,0)
- *      // in foobar.h
- *      OPENSSL_DECLARE_GLOBAL(int,foobar);
- *      #define foobar OPENSSL_GLOBAL_REF(foobar)
- */
-# ifdef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#  define OPENSSL_IMPLEMENT_GLOBAL(type,name,value)                      \
-        type *_shadow_##name(void)                                      \
-        { static type _hide_##name=value; return &_hide_##name; }
-#  define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
-#  define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
-# else
-#  define OPENSSL_IMPLEMENT_GLOBAL(type,name,value) OPENSSL_GLOBAL type _shadow_##name=value;
-#  define OPENSSL_DECLARE_GLOBAL(type,name) OPENSSL_EXPORT type _shadow_##name
-#  define OPENSSL_GLOBAL_REF(name) _shadow_##name
-# endif
-
-# if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) && macintosh==1 && !defined(MAC_OS_GUSI_SOURCE)
-#  define ossl_ssize_t long
-# endif
-
-# ifdef OPENSSL_SYS_MSDOS
-#  define ossl_ssize_t long
-# endif
-
-# if defined(NeXT) || defined(OPENSSL_SYS_NEWS4) || defined(OPENSSL_SYS_SUNOS)
-#  define ssize_t int
-# endif
-
-# if defined(__ultrix) && !defined(ssize_t)
-#  define ossl_ssize_t int
-# endif
-
-# ifndef ossl_ssize_t
-#  define ossl_ssize_t ssize_t
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ebcdic.h b/include.new/openssl/ebcdic.h
deleted file mode 100644
index 4cbdfeb..0000000
--- a/include.new/openssl/ebcdic.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* crypto/ebcdic.h */
-
-#ifndef HEADER_EBCDIC_H
-# define HEADER_EBCDIC_H
-
-# include <sys/types.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Avoid name clashes with other applications */
-# define os_toascii   _openssl_os_toascii
-# define os_toebcdic  _openssl_os_toebcdic
-# define ebcdic2ascii _openssl_ebcdic2ascii
-# define ascii2ebcdic _openssl_ascii2ebcdic
-
-extern const unsigned char os_toascii[256];
-extern const unsigned char os_toebcdic[256];
-void *ebcdic2ascii(void *dest, const void *srce, size_t count);
-void *ascii2ebcdic(void *dest, const void *srce, size_t count);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ec.h b/include.new/openssl/ec.h
deleted file mode 100644
index c4e7aea..0000000
--- a/include.new/openssl/ec.h
+++ /dev/null
@@ -1,1193 +0,0 @@
-/* crypto/ec/ec.h */
-/*
- * Originally written by Bodo Moeller for the OpenSSL project.
- */
-/**
- * \file crypto/ec/ec.h Include file for the OpenSSL EC functions
- * \author Originally written by Bodo Moeller for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 1998-2005 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * The elliptic curve binary polynomial software is originally written by
- * Sheueling Chang Shantz and Douglas Stebila of Sun Microsystems Laboratories.
- *
- */
-
-#ifndef HEADER_EC_H
-# define HEADER_EC_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_EC
-#  error EC is disabled.
-# endif
-
-# include <openssl/asn1.h>
-# include <openssl/symhacks.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-# ifdef  __cplusplus
-extern "C" {
-# elif defined(__SUNPRO_C)
-#  if __SUNPRO_C >= 0x520
-#   pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-#  endif
-# endif
-
-# ifndef OPENSSL_ECC_MAX_FIELD_BITS
-#  define OPENSSL_ECC_MAX_FIELD_BITS 661
-# endif
-
-/** Enum for the point conversion form as defined in X9.62 (ECDSA)
- *  for the encoding of a elliptic curve point (x,y) */
-typedef enum {
-        /** the point is encoded as z||x, where the octet z specifies
-         *  which solution of the quadratic equation y is  */
-    POINT_CONVERSION_COMPRESSED = 2,
-        /** the point is encoded as z||x||y, where z is the octet 0x02  */
-    POINT_CONVERSION_UNCOMPRESSED = 4,
-        /** the point is encoded as z||x||y, where the octet z specifies
-         *  which solution of the quadratic equation y is  */
-    POINT_CONVERSION_HYBRID = 6
-} point_conversion_form_t;
-
-typedef struct ec_method_st EC_METHOD;
-
-typedef struct ec_group_st
-    /*-
-     EC_METHOD *meth;
-     -- field definition
-     -- curve coefficients
-     -- optional generator with associated information (order, cofactor)
-     -- optional extra data (precomputed table for fast computation of multiples of generator)
-     -- ASN1 stuff
-    */
-    EC_GROUP;
-
-typedef struct ec_point_st EC_POINT;
-
-/********************************************************************/
-/*               EC_METHODs for curves over GF(p)                   */
-/********************************************************************/
-
-/** Returns the basic GFp ec methods which provides the basis for the
- *  optimized methods.
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_simple_method(void);
-
-/** Returns GFp methods using montgomery multiplication.
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_mont_method(void);
-
-/** Returns GFp methods using optimized methods for NIST recommended curves
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nist_method(void);
-
-# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-/** Returns 64-bit optimized methods for nistp224
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nistp224_method(void);
-
-/** Returns 64-bit optimized methods for nistp256
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nistp256_method(void);
-
-/** Returns 64-bit optimized methods for nistp521
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GFp_nistp521_method(void);
-# endif
-
-# ifndef OPENSSL_NO_EC2M
-/********************************************************************/
-/*           EC_METHOD for curves over GF(2^m)                      */
-/********************************************************************/
-
-/** Returns the basic GF2m ec method
- *  \return  EC_METHOD object
- */
-const EC_METHOD *EC_GF2m_simple_method(void);
-
-# endif
-
-/********************************************************************/
-/*                   EC_GROUP functions                             */
-/********************************************************************/
-
-/** Creates a new EC_GROUP object
- *  \param   meth  EC_METHOD to use
- *  \return  newly created EC_GROUP object or NULL in case of an error.
- */
-EC_GROUP *EC_GROUP_new(const EC_METHOD *meth);
-
-/** Frees a EC_GROUP object
- *  \param  group  EC_GROUP object to be freed.
- */
-void EC_GROUP_free(EC_GROUP *group);
-
-/** Clears and frees a EC_GROUP object
- *  \param  group  EC_GROUP object to be cleared and freed.
- */
-void EC_GROUP_clear_free(EC_GROUP *group);
-
-/** Copies EC_GROUP objects. Note: both EC_GROUPs must use the same EC_METHOD.
- *  \param  dst  destination EC_GROUP object
- *  \param  src  source EC_GROUP object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_GROUP_copy(EC_GROUP *dst, const EC_GROUP *src);
-
-/** Creates a new EC_GROUP object and copies the copies the content
- *  form src to the newly created EC_KEY object
- *  \param  src  source EC_GROUP object
- *  \return newly created EC_GROUP object or NULL in case of an error.
- */
-EC_GROUP *EC_GROUP_dup(const EC_GROUP *src);
-
-/** Returns the EC_METHOD of the EC_GROUP object.
- *  \param  group  EC_GROUP object
- *  \return EC_METHOD used in this EC_GROUP object.
- */
-const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group);
-
-/** Returns the field type of the EC_METHOD.
- *  \param  meth  EC_METHOD object
- *  \return NID of the underlying field type OID.
- */
-int EC_METHOD_get_field_type(const EC_METHOD *meth);
-
-/** Sets the generator and it's order/cofactor of a EC_GROUP object.
- *  \param  group      EC_GROUP object
- *  \param  generator  EC_POINT object with the generator.
- *  \param  order      the order of the group generated by the generator.
- *  \param  cofactor   the index of the sub-group generated by the generator
- *                     in the group of all points on the elliptic curve.
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
-                           const BIGNUM *order, const BIGNUM *cofactor);
-
-/** Returns the generator of a EC_GROUP object.
- *  \param  group  EC_GROUP object
- *  \return the currently used generator (possibly NULL).
- */
-const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group);
-
-/** Gets the order of a EC_GROUP
- *  \param  group  EC_GROUP object
- *  \param  order  BIGNUM to which the order is copied
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_order(const EC_GROUP *group, BIGNUM *order, BN_CTX *ctx);
-
-/** Gets the cofactor of a EC_GROUP
- *  \param  group     EC_GROUP object
- *  \param  cofactor  BIGNUM to which the cofactor is copied
- *  \param  ctx       BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor,
-                          BN_CTX *ctx);
-
-/** Sets the name of a EC_GROUP object
- *  \param  group  EC_GROUP object
- *  \param  nid    NID of the curve name OID
- */
-void EC_GROUP_set_curve_name(EC_GROUP *group, int nid);
-
-/** Returns the curve name of a EC_GROUP object
- *  \param  group  EC_GROUP object
- *  \return NID of the curve name OID or 0 if not set.
- */
-int EC_GROUP_get_curve_name(const EC_GROUP *group);
-
-void EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag);
-int EC_GROUP_get_asn1_flag(const EC_GROUP *group);
-
-void EC_GROUP_set_point_conversion_form(EC_GROUP *group,
-                                        point_conversion_form_t form);
-point_conversion_form_t EC_GROUP_get_point_conversion_form(const EC_GROUP *);
-
-unsigned char *EC_GROUP_get0_seed(const EC_GROUP *x);
-size_t EC_GROUP_get_seed_len(const EC_GROUP *);
-size_t EC_GROUP_set_seed(EC_GROUP *, const unsigned char *, size_t len);
-
-/** Sets the parameter of a ec over GFp defined by y^2 = x^3 + a*x + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM with the prime number
- *  \param  a      BIGNUM with parameter a of the equation
- *  \param  b      BIGNUM with parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_set_curve_GFp(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
-                           const BIGNUM *b, BN_CTX *ctx);
-
-/** Gets the parameter of the ec over GFp defined by y^2 = x^3 + a*x + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM for the prime number
- *  \param  a      BIGNUM for parameter a of the equation
- *  \param  b      BIGNUM for parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
-                           BIGNUM *b, BN_CTX *ctx);
-
-# ifndef OPENSSL_NO_EC2M
-/** Sets the parameter of a ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM with the polynomial defining the underlying field
- *  \param  a      BIGNUM with parameter a of the equation
- *  \param  b      BIGNUM with parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_set_curve_GF2m(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
-                            const BIGNUM *b, BN_CTX *ctx);
-
-/** Gets the parameter of the ec over GF2m defined by y^2 + x*y = x^3 + a*x^2 + b
- *  \param  group  EC_GROUP object
- *  \param  p      BIGNUM for the polynomial defining the underlying field
- *  \param  a      BIGNUM for parameter a of the equation
- *  \param  b      BIGNUM for parameter b of the equation
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_get_curve_GF2m(const EC_GROUP *group, BIGNUM *p, BIGNUM *a,
-                            BIGNUM *b, BN_CTX *ctx);
-# endif
-/** Returns the number of bits needed to represent a field element
- *  \param  group  EC_GROUP object
- *  \return number of bits needed to represent a field element
- */
-int EC_GROUP_get_degree(const EC_GROUP *group);
-
-/** Checks whether the parameter in the EC_GROUP define a valid ec group
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if group is a valid ec group and 0 otherwise
- */
-int EC_GROUP_check(const EC_GROUP *group, BN_CTX *ctx);
-
-/** Checks whether the discriminant of the elliptic curve is zero or not
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if the discriminant is not zero and 0 otherwise
- */
-int EC_GROUP_check_discriminant(const EC_GROUP *group, BN_CTX *ctx);
-
-/** Compares two EC_GROUP objects
- *  \param  a    first EC_GROUP object
- *  \param  b    second EC_GROUP object
- *  \param  ctx  BN_CTX object (optional)
- *  \return 0 if both groups are equal and 1 otherwise
- */
-int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx);
-
-/*
- * EC_GROUP_new_GF*() calls EC_GROUP_new() and EC_GROUP_set_GF*() after
- * choosing an appropriate EC_METHOD
- */
-
-/** Creates a new EC_GROUP object with the specified parameters defined
- *  over GFp (defined by the equation y^2 = x^3 + a*x + b)
- *  \param  p    BIGNUM with the prime number
- *  \param  a    BIGNUM with the parameter a of the equation
- *  \param  b    BIGNUM with the parameter b of the equation
- *  \param  ctx  BN_CTX object (optional)
- *  \return newly created EC_GROUP object with the specified parameters
- */
-EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
-                                 const BIGNUM *b, BN_CTX *ctx);
-# ifndef OPENSSL_NO_EC2M
-/** Creates a new EC_GROUP object with the specified parameters defined
- *  over GF2m (defined by the equation y^2 + x*y = x^3 + a*x^2 + b)
- *  \param  p    BIGNUM with the polynomial defining the underlying field
- *  \param  a    BIGNUM with the parameter a of the equation
- *  \param  b    BIGNUM with the parameter b of the equation
- *  \param  ctx  BN_CTX object (optional)
- *  \return newly created EC_GROUP object with the specified parameters
- */
-EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a,
-                                  const BIGNUM *b, BN_CTX *ctx);
-# endif
-/** Creates a EC_GROUP object with a curve specified by a NID
- *  \param  nid  NID of the OID of the curve name
- *  \return newly created EC_GROUP object with specified curve or NULL
- *          if an error occurred
- */
-EC_GROUP *EC_GROUP_new_by_curve_name(int nid);
-
-/********************************************************************/
-/*               handling of internal curves                        */
-/********************************************************************/
-
-typedef struct {
-    int nid;
-    const char *comment;
-} EC_builtin_curve;
-
-/*
- * EC_builtin_curves(EC_builtin_curve *r, size_t size) returns number of all
- * available curves or zero if a error occurred. In case r ist not zero
- * nitems EC_builtin_curve structures are filled with the data of the first
- * nitems internal groups
- */
-size_t EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
-
-/********************************************************************/
-/*                    EC_POINT functions                            */
-/********************************************************************/
-
-/** Creates a new EC_POINT object for the specified EC_GROUP
- *  \param  group  EC_GROUP the underlying EC_GROUP object
- *  \return newly created EC_POINT object or NULL if an error occurred
- */
-EC_POINT *EC_POINT_new(const EC_GROUP *group);
-
-/** Frees a EC_POINT object
- *  \param  point  EC_POINT object to be freed
- */
-void EC_POINT_free(EC_POINT *point);
-
-/** Clears and frees a EC_POINT object
- *  \param  point  EC_POINT object to be cleared and freed
- */
-void EC_POINT_clear_free(EC_POINT *point);
-
-/** Copies EC_POINT object
- *  \param  dst  destination EC_POINT object
- *  \param  src  source EC_POINT object
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_copy(EC_POINT *dst, const EC_POINT *src);
-
-/** Creates a new EC_POINT object and copies the content of the supplied
- *  EC_POINT
- *  \param  src    source EC_POINT object
- *  \param  group  underlying the EC_GROUP object
- *  \return newly created EC_POINT object or NULL if an error occurred
- */
-EC_POINT *EC_POINT_dup(const EC_POINT *src, const EC_GROUP *group);
-
-/** Returns the EC_METHOD used in EC_POINT object
- *  \param  point  EC_POINT object
- *  \return the EC_METHOD used
- */
-const EC_METHOD *EC_POINT_method_of(const EC_POINT *point);
-
-/** Sets a point to infinity (neutral element)
- *  \param  group  underlying EC_GROUP object
- *  \param  point  EC_POINT to set to infinity
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_to_infinity(const EC_GROUP *group, EC_POINT *point);
-
-/** Sets the jacobian projective coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  z      BIGNUM with the z-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                             EC_POINT *p, const BIGNUM *x,
-                                             const BIGNUM *y, const BIGNUM *z,
-                                             BN_CTX *ctx);
-
-/** Gets the jacobian projective coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  z      BIGNUM for the z-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_get_Jprojective_coordinates_GFp(const EC_GROUP *group,
-                                             const EC_POINT *p, BIGNUM *x,
-                                             BIGNUM *y, BIGNUM *z,
-                                             BN_CTX *ctx);
-
-/** Sets the affine coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_affine_coordinates_GFp(const EC_GROUP *group, EC_POINT *p,
-                                        const BIGNUM *x, const BIGNUM *y,
-                                        BN_CTX *ctx);
-
-/** Gets the affine coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_get_affine_coordinates_GFp(const EC_GROUP *group,
-                                        const EC_POINT *p, BIGNUM *x,
-                                        BIGNUM *y, BN_CTX *ctx);
-
-/** Sets the x9.62 compressed coordinates of a EC_POINT over GFp
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with x-coordinate
- *  \param  y_bit  integer with the y-Bit (either 0 or 1)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group,
-                                            EC_POINT *p, const BIGNUM *x,
-                                            int y_bit, BN_CTX *ctx);
-# ifndef OPENSSL_NO_EC2M
-/** Sets the affine coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with the x-coordinate
- *  \param  y      BIGNUM with the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_affine_coordinates_GF2m(const EC_GROUP *group, EC_POINT *p,
-                                         const BIGNUM *x, const BIGNUM *y,
-                                         BN_CTX *ctx);
-
-/** Gets the affine coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM for the x-coordinate
- *  \param  y      BIGNUM for the y-coordinate
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_get_affine_coordinates_GF2m(const EC_GROUP *group,
-                                         const EC_POINT *p, BIGNUM *x,
-                                         BIGNUM *y, BN_CTX *ctx);
-
-/** Sets the x9.62 compressed coordinates of a EC_POINT over GF2m
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  x      BIGNUM with x-coordinate
- *  \param  y_bit  integer with the y-Bit (either 0 or 1)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_set_compressed_coordinates_GF2m(const EC_GROUP *group,
-                                             EC_POINT *p, const BIGNUM *x,
-                                             int y_bit, BN_CTX *ctx);
-# endif
-/** Encodes a EC_POINT object to a octet string
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  form   point conversion form
- *  \param  buf    memory buffer for the result. If NULL the function returns
- *                 required buffer size.
- *  \param  len    length of the memory buffer
- *  \param  ctx    BN_CTX object (optional)
- *  \return the length of the encoded octet string or 0 if an error occurred
- */
-size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *p,
-                          point_conversion_form_t form,
-                          unsigned char *buf, size_t len, BN_CTX *ctx);
-
-/** Decodes a EC_POINT from a octet string
- *  \param  group  underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \param  buf    memory buffer with the encoded ec point
- *  \param  len    length of the encoded ec point
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p,
-                       const unsigned char *buf, size_t len, BN_CTX *ctx);
-
-/* other interfaces to point2oct/oct2point: */
-BIGNUM *EC_POINT_point2bn(const EC_GROUP *, const EC_POINT *,
-                          point_conversion_form_t form, BIGNUM *, BN_CTX *);
-EC_POINT *EC_POINT_bn2point(const EC_GROUP *, const BIGNUM *,
-                            EC_POINT *, BN_CTX *);
-char *EC_POINT_point2hex(const EC_GROUP *, const EC_POINT *,
-                         point_conversion_form_t form, BN_CTX *);
-EC_POINT *EC_POINT_hex2point(const EC_GROUP *, const char *,
-                             EC_POINT *, BN_CTX *);
-
-/********************************************************************/
-/*         functions for doing EC_POINT arithmetic                  */
-/********************************************************************/
-
-/** Computes the sum of two EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result (r = a + b)
- *  \param  a      EC_POINT object with the first summand
- *  \param  b      EC_POINT object with the second summand
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                 const EC_POINT *b, BN_CTX *ctx);
-
-/** Computes the double of a EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result (r = 2 * a)
- *  \param  a      EC_POINT object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_dbl(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
-                 BN_CTX *ctx);
-
-/** Computes the inverse of a EC_POINT
- *  \param  group  underlying EC_GROUP object
- *  \param  a      EC_POINT object to be inverted (it's used for the result as well)
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_invert(const EC_GROUP *group, EC_POINT *a, BN_CTX *ctx);
-
-/** Checks whether the point is the neutral element of the group
- *  \param  group  the underlying EC_GROUP object
- *  \param  p      EC_POINT object
- *  \return 1 if the point is the neutral element and 0 otherwise
- */
-int EC_POINT_is_at_infinity(const EC_GROUP *group, const EC_POINT *p);
-
-/** Checks whether the point is on the curve
- *  \param  group  underlying EC_GROUP object
- *  \param  point  EC_POINT object to check
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 if point if on the curve and 0 otherwise
- */
-int EC_POINT_is_on_curve(const EC_GROUP *group, const EC_POINT *point,
-                         BN_CTX *ctx);
-
-/** Compares two EC_POINTs
- *  \param  group  underlying EC_GROUP object
- *  \param  a      first EC_POINT object
- *  \param  b      second EC_POINT object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 0 if both points are equal and a value != 0 otherwise
- */
-int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b,
-                 BN_CTX *ctx);
-
-int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx);
-int EC_POINTs_make_affine(const EC_GROUP *group, size_t num,
-                          EC_POINT *points[], BN_CTX *ctx);
-
-/** Computes r = generator * n sum_{i=0}^{num-1} p[i] * m[i]
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result
- *  \param  n      BIGNUM with the multiplier for the group generator (optional)
- *  \param  num    number futher summands
- *  \param  p      array of size num of EC_POINT objects
- *  \param  m      array of size num of BIGNUM objects
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
-                  size_t num, const EC_POINT *p[], const BIGNUM *m[],
-                  BN_CTX *ctx);
-
-/** Computes r = generator * n + q * m
- *  \param  group  underlying EC_GROUP object
- *  \param  r      EC_POINT object for the result
- *  \param  n      BIGNUM with the multiplier for the group generator (optional)
- *  \param  q      EC_POINT object with the first factor of the second summand
- *  \param  m      BIGNUM with the second factor of the second summand
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_POINT_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *n,
-                 const EC_POINT *q, const BIGNUM *m, BN_CTX *ctx);
-
-/** Stores multiples of generator for faster point multiplication
- *  \param  group  EC_GROUP object
- *  \param  ctx    BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occured
- */
-int EC_GROUP_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
-
-/** Reports whether a precomputation has been done
- *  \param  group  EC_GROUP object
- *  \return 1 if a pre-computation has been done and 0 otherwise
- */
-int EC_GROUP_have_precompute_mult(const EC_GROUP *group);
-
-/********************************************************************/
-/*                       ASN1 stuff                                 */
-/********************************************************************/
-
-/*
- * EC_GROUP_get_basis_type() returns the NID of the basis type used to
- * represent the field elements
- */
-int EC_GROUP_get_basis_type(const EC_GROUP *);
-# ifndef OPENSSL_NO_EC2M
-int EC_GROUP_get_trinomial_basis(const EC_GROUP *, unsigned int *k);
-int EC_GROUP_get_pentanomial_basis(const EC_GROUP *, unsigned int *k1,
-                                   unsigned int *k2, unsigned int *k3);
-# endif
-
-# define OPENSSL_EC_NAMED_CURVE  0x001
-
-typedef struct ecpk_parameters_st ECPKPARAMETERS;
-
-EC_GROUP *d2i_ECPKParameters(EC_GROUP **, const unsigned char **in, long len);
-int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
-
-# define d2i_ECPKParameters_bio(bp,x) ASN1_d2i_bio_of(EC_GROUP,NULL,d2i_ECPKParameters,bp,x)
-# define i2d_ECPKParameters_bio(bp,x) ASN1_i2d_bio_of_const(EC_GROUP,i2d_ECPKParameters,bp,x)
-# define d2i_ECPKParameters_fp(fp,x) (EC_GROUP *)ASN1_d2i_fp(NULL, \
-                (char *(*)())d2i_ECPKParameters,(fp),(unsigned char **)(x))
-# define i2d_ECPKParameters_fp(fp,x) ASN1_i2d_fp(i2d_ECPKParameters,(fp), \
-                (unsigned char *)(x))
-
-# ifndef OPENSSL_NO_BIO
-int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
-# endif
-# ifndef OPENSSL_NO_FP_API
-int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
-# endif
-
-/********************************************************************/
-/*                      EC_KEY functions                            */
-/********************************************************************/
-
-typedef struct ec_key_st EC_KEY;
-
-/* some values for the encoding_flag */
-# define EC_PKEY_NO_PARAMETERS   0x001
-# define EC_PKEY_NO_PUBKEY       0x002
-
-/* some values for the flags field */
-# define EC_FLAG_NON_FIPS_ALLOW  0x1
-# define EC_FLAG_FIPS_CHECKED    0x2
-
-/** Creates a new EC_KEY object.
- *  \return EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_new(void);
-
-int EC_KEY_get_flags(const EC_KEY *key);
-
-void EC_KEY_set_flags(EC_KEY *key, int flags);
-
-void EC_KEY_clear_flags(EC_KEY *key, int flags);
-
-/** Creates a new EC_KEY object using a named curve as underlying
- *  EC_GROUP object.
- *  \param  nid  NID of the named curve.
- *  \return EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_new_by_curve_name(int nid);
-
-/** Frees a EC_KEY object.
- *  \param  key  EC_KEY object to be freed.
- */
-void EC_KEY_free(EC_KEY *key);
-
-/** Copies a EC_KEY object.
- *  \param  dst  destination EC_KEY object
- *  \param  src  src EC_KEY object
- *  \return dst or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_copy(EC_KEY *dst, const EC_KEY *src);
-
-/** Creates a new EC_KEY object and copies the content from src to it.
- *  \param  src  the source EC_KEY object
- *  \return newly created EC_KEY object or NULL if an error occurred.
- */
-EC_KEY *EC_KEY_dup(const EC_KEY *src);
-
-/** Increases the internal reference count of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_up_ref(EC_KEY *key);
-
-/** Returns the EC_GROUP object of a EC_KEY object
- *  \param  key  EC_KEY object
- *  \return the EC_GROUP object (possibly NULL).
- */
-const EC_GROUP *EC_KEY_get0_group(const EC_KEY *key);
-
-/** Sets the EC_GROUP of a EC_KEY object.
- *  \param  key    EC_KEY object
- *  \param  group  EC_GROUP to use in the EC_KEY object (note: the EC_KEY
- *                 object will use an own copy of the EC_GROUP).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_group(EC_KEY *key, const EC_GROUP *group);
-
-/** Returns the private key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \return a BIGNUM with the private key (possibly NULL).
- */
-const BIGNUM *EC_KEY_get0_private_key(const EC_KEY *key);
-
-/** Sets the private key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \param  prv  BIGNUM with the private key (note: the EC_KEY object
- *               will use an own copy of the BIGNUM).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_private_key(EC_KEY *key, const BIGNUM *prv);
-
-/** Returns the public key of a EC_KEY object.
- *  \param  key  the EC_KEY object
- *  \return a EC_POINT object with the public key (possibly NULL)
- */
-const EC_POINT *EC_KEY_get0_public_key(const EC_KEY *key);
-
-/** Sets the public key of a EC_KEY object.
- *  \param  key  EC_KEY object
- *  \param  pub  EC_POINT object with the public key (note: the EC_KEY object
- *               will use an own copy of the EC_POINT object).
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_set_public_key(EC_KEY *key, const EC_POINT *pub);
-
-unsigned EC_KEY_get_enc_flags(const EC_KEY *key);
-void EC_KEY_set_enc_flags(EC_KEY *eckey, unsigned int flags);
-point_conversion_form_t EC_KEY_get_conv_form(const EC_KEY *key);
-void EC_KEY_set_conv_form(EC_KEY *eckey, point_conversion_form_t cform);
-/* functions to set/get method specific data  */
-void *EC_KEY_get_key_method_data(EC_KEY *key,
-                                 void *(*dup_func) (void *),
-                                 void (*free_func) (void *),
-                                 void (*clear_free_func) (void *));
-/** Sets the key method data of an EC_KEY object, if none has yet been set.
- *  \param  key              EC_KEY object
- *  \param  data             opaque data to install.
- *  \param  dup_func         a function that duplicates |data|.
- *  \param  free_func        a function that frees |data|.
- *  \param  clear_free_func  a function that wipes and frees |data|.
- *  \return the previously set data pointer, or NULL if |data| was inserted.
- */
-void *EC_KEY_insert_key_method_data(EC_KEY *key, void *data,
-                                    void *(*dup_func) (void *),
-                                    void (*free_func) (void *),
-                                    void (*clear_free_func) (void *));
-/* wrapper functions for the underlying EC_GROUP object */
-void EC_KEY_set_asn1_flag(EC_KEY *eckey, int asn1_flag);
-
-/** Creates a table of pre-computed multiples of the generator to
- *  accelerate further EC_KEY operations.
- *  \param  key  EC_KEY object
- *  \param  ctx  BN_CTX object (optional)
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_precompute_mult(EC_KEY *key, BN_CTX *ctx);
-
-/** Creates a new ec private (and optional a new public) key.
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred.
- */
-int EC_KEY_generate_key(EC_KEY *key);
-
-/** Verifies that a private and/or public key is valid.
- *  \param  key  the EC_KEY object
- *  \return 1 on success and 0 otherwise.
- */
-int EC_KEY_check_key(const EC_KEY *key);
-
-/** Sets a public key from affine coordindates performing
- *  neccessary NIST PKV tests.
- *  \param  key  the EC_KEY object
- *  \param  x    public key x coordinate
- *  \param  y    public key y coordinate
- *  \return 1 on success and 0 otherwise.
- */
-int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
-                                             BIGNUM *y);
-
-/********************************************************************/
-/*        de- and encoding functions for SEC1 ECPrivateKey          */
-/********************************************************************/
-
-/** Decodes a private key from a memory buffer.
- *  \param  key  a pointer to a EC_KEY object which should be used (or NULL)
- *  \param  in   pointer to memory with the DER encoded private key
- *  \param  len  length of the DER encoded private key
- *  \return the decoded private key or NULL if an error occurred.
- */
-EC_KEY *d2i_ECPrivateKey(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes a private key object and stores the result in a buffer.
- *  \param  key  the EC_KEY object to encode
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred.
- */
-int i2d_ECPrivateKey(EC_KEY *key, unsigned char **out);
-
-/********************************************************************/
-/*        de- and encoding functions for EC parameters              */
-/********************************************************************/
-
-/** Decodes ec parameter from a memory buffer.
- *  \param  key  a pointer to a EC_KEY object which should be used (or NULL)
- *  \param  in   pointer to memory with the DER encoded ec parameters
- *  \param  len  length of the DER encoded ec parameters
- *  \return a EC_KEY object with the decoded parameters or NULL if an error
- *          occurred.
- */
-EC_KEY *d2i_ECParameters(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes ec parameter and stores the result in a buffer.
- *  \param  key  the EC_KEY object with ec paramters to encode
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred.
- */
-int i2d_ECParameters(EC_KEY *key, unsigned char **out);
-
-/********************************************************************/
-/*         de- and encoding functions for EC public key             */
-/*         (octet string, not DER -- hence 'o2i' and 'i2o')         */
-/********************************************************************/
-
-/** Decodes a ec public key from a octet string.
- *  \param  key  a pointer to a EC_KEY object which should be used
- *  \param  in   memory buffer with the encoded public key
- *  \param  len  length of the encoded public key
- *  \return EC_KEY object with decoded public key or NULL if an error
- *          occurred.
- */
-EC_KEY *o2i_ECPublicKey(EC_KEY **key, const unsigned char **in, long len);
-
-/** Encodes a ec public key in an octet string.
- *  \param  key  the EC_KEY object with the public key
- *  \param  out  the buffer for the result (if NULL the function returns number
- *               of bytes needed).
- *  \return 1 on success and 0 if an error occurred
- */
-int i2o_ECPublicKey(EC_KEY *key, unsigned char **out);
-
-# ifndef OPENSSL_NO_BIO
-/** Prints out the ec parameters on human readable form.
- *  \param  bp   BIO object to which the information is printed
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred
- */
-int ECParameters_print(BIO *bp, const EC_KEY *key);
-
-/** Prints out the contents of a EC_KEY object
- *  \param  bp   BIO object to which the information is printed
- *  \param  key  EC_KEY object
- *  \param  off  line offset
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
-
-# endif
-# ifndef OPENSSL_NO_FP_API
-/** Prints out the ec parameters on human readable form.
- *  \param  fp   file descriptor to which the information is printed
- *  \param  key  EC_KEY object
- *  \return 1 on success and 0 if an error occurred
- */
-int ECParameters_print_fp(FILE *fp, const EC_KEY *key);
-
-/** Prints out the contents of a EC_KEY object
- *  \param  fp   file descriptor to which the information is printed
- *  \param  key  EC_KEY object
- *  \param  off  line offset
- *  \return 1 on success and 0 if an error occurred
- */
-int EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
-
-# endif
-
-# define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
-
-# ifndef __cplusplus
-#  if defined(__SUNPRO_C)
-#   if __SUNPRO_C >= 0x520
-#    pragma error_messages (default,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE)
-#   endif
-#  endif
-# endif
-
-# define EVP_PKEY_CTX_set_ec_paramgen_curve_nid(ctx, nid) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_EC, EVP_PKEY_OP_PARAMGEN, \
-                                EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID, nid, NULL)
-
-# define EVP_PKEY_CTRL_EC_PARAMGEN_CURVE_NID             (EVP_PKEY_ALG_CTRL + 1)
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_EC_strings(void);
-
-/* Error codes for the EC functions. */
-
-/* Function codes. */
-# define EC_F_BN_TO_FELEM                                 224
-# define EC_F_COMPUTE_WNAF                                143
-# define EC_F_D2I_ECPARAMETERS                            144
-# define EC_F_D2I_ECPKPARAMETERS                          145
-# define EC_F_D2I_ECPRIVATEKEY                            146
-# define EC_F_DO_EC_KEY_PRINT                             221
-# define EC_F_ECKEY_PARAM2TYPE                            223
-# define EC_F_ECKEY_PARAM_DECODE                          212
-# define EC_F_ECKEY_PRIV_DECODE                           213
-# define EC_F_ECKEY_PRIV_ENCODE                           214
-# define EC_F_ECKEY_PUB_DECODE                            215
-# define EC_F_ECKEY_PUB_ENCODE                            216
-# define EC_F_ECKEY_TYPE2PARAM                            220
-# define EC_F_ECPARAMETERS_PRINT                          147
-# define EC_F_ECPARAMETERS_PRINT_FP                       148
-# define EC_F_ECPKPARAMETERS_PRINT                        149
-# define EC_F_ECPKPARAMETERS_PRINT_FP                     150
-# define EC_F_ECP_NIST_MOD_192                            203
-# define EC_F_ECP_NIST_MOD_224                            204
-# define EC_F_ECP_NIST_MOD_256                            205
-# define EC_F_ECP_NIST_MOD_521                            206
-# define EC_F_EC_ASN1_GROUP2CURVE                         153
-# define EC_F_EC_ASN1_GROUP2FIELDID                       154
-# define EC_F_EC_ASN1_GROUP2PARAMETERS                    155
-# define EC_F_EC_ASN1_GROUP2PKPARAMETERS                  156
-# define EC_F_EC_ASN1_PARAMETERS2GROUP                    157
-# define EC_F_EC_ASN1_PKPARAMETERS2GROUP                  158
-# define EC_F_EC_EX_DATA_SET_DATA                         211
-# define EC_F_EC_GF2M_MONTGOMERY_POINT_MULTIPLY           208
-# define EC_F_EC_GF2M_SIMPLE_GROUP_CHECK_DISCRIMINANT     159
-# define EC_F_EC_GF2M_SIMPLE_GROUP_SET_CURVE              195
-# define EC_F_EC_GF2M_SIMPLE_OCT2POINT                    160
-# define EC_F_EC_GF2M_SIMPLE_POINT2OCT                    161
-# define EC_F_EC_GF2M_SIMPLE_POINT_GET_AFFINE_COORDINATES 162
-# define EC_F_EC_GF2M_SIMPLE_POINT_SET_AFFINE_COORDINATES 163
-# define EC_F_EC_GF2M_SIMPLE_SET_COMPRESSED_COORDINATES   164
-# define EC_F_EC_GFP_MONT_FIELD_DECODE                    133
-# define EC_F_EC_GFP_MONT_FIELD_ENCODE                    134
-# define EC_F_EC_GFP_MONT_FIELD_MUL                       131
-# define EC_F_EC_GFP_MONT_FIELD_SET_TO_ONE                209
-# define EC_F_EC_GFP_MONT_FIELD_SQR                       132
-# define EC_F_EC_GFP_MONT_GROUP_SET_CURVE                 189
-# define EC_F_EC_GFP_MONT_GROUP_SET_CURVE_GFP             135
-# define EC_F_EC_GFP_NISTP224_GROUP_SET_CURVE             225
-# define EC_F_EC_GFP_NISTP224_POINTS_MUL                  228
-# define EC_F_EC_GFP_NISTP224_POINT_GET_AFFINE_COORDINATES 226
-# define EC_F_EC_GFP_NISTP256_GROUP_SET_CURVE             230
-# define EC_F_EC_GFP_NISTP256_POINTS_MUL                  231
-# define EC_F_EC_GFP_NISTP256_POINT_GET_AFFINE_COORDINATES 232
-# define EC_F_EC_GFP_NISTP521_GROUP_SET_CURVE             233
-# define EC_F_EC_GFP_NISTP521_POINTS_MUL                  234
-# define EC_F_EC_GFP_NISTP521_POINT_GET_AFFINE_COORDINATES 235
-# define EC_F_EC_GFP_NIST_FIELD_MUL                       200
-# define EC_F_EC_GFP_NIST_FIELD_SQR                       201
-# define EC_F_EC_GFP_NIST_GROUP_SET_CURVE                 202
-# define EC_F_EC_GFP_SIMPLE_GROUP_CHECK_DISCRIMINANT      165
-# define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE               166
-# define EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE_GFP           100
-# define EC_F_EC_GFP_SIMPLE_GROUP_SET_GENERATOR           101
-# define EC_F_EC_GFP_SIMPLE_MAKE_AFFINE                   102
-# define EC_F_EC_GFP_SIMPLE_OCT2POINT                     103
-# define EC_F_EC_GFP_SIMPLE_POINT2OCT                     104
-# define EC_F_EC_GFP_SIMPLE_POINTS_MAKE_AFFINE            137
-# define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES  167
-# define EC_F_EC_GFP_SIMPLE_POINT_GET_AFFINE_COORDINATES_GFP 105
-# define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES  168
-# define EC_F_EC_GFP_SIMPLE_POINT_SET_AFFINE_COORDINATES_GFP 128
-# define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES    169
-# define EC_F_EC_GFP_SIMPLE_SET_COMPRESSED_COORDINATES_GFP 129
-# define EC_F_EC_GROUP_CHECK                              170
-# define EC_F_EC_GROUP_CHECK_DISCRIMINANT                 171
-# define EC_F_EC_GROUP_COPY                               106
-# define EC_F_EC_GROUP_GET0_GENERATOR                     139
-# define EC_F_EC_GROUP_GET_COFACTOR                       140
-# define EC_F_EC_GROUP_GET_CURVE_GF2M                     172
-# define EC_F_EC_GROUP_GET_CURVE_GFP                      130
-# define EC_F_EC_GROUP_GET_DEGREE                         173
-# define EC_F_EC_GROUP_GET_ORDER                          141
-# define EC_F_EC_GROUP_GET_PENTANOMIAL_BASIS              193
-# define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS                194
-# define EC_F_EC_GROUP_NEW                                108
-# define EC_F_EC_GROUP_NEW_BY_CURVE_NAME                  174
-# define EC_F_EC_GROUP_NEW_FROM_DATA                      175
-# define EC_F_EC_GROUP_PRECOMPUTE_MULT                    142
-# define EC_F_EC_GROUP_SET_CURVE_GF2M                     176
-# define EC_F_EC_GROUP_SET_CURVE_GFP                      109
-# define EC_F_EC_GROUP_SET_EXTRA_DATA                     110
-# define EC_F_EC_GROUP_SET_GENERATOR                      111
-# define EC_F_EC_KEY_CHECK_KEY                            177
-# define EC_F_EC_KEY_COPY                                 178
-# define EC_F_EC_KEY_GENERATE_KEY                         179
-# define EC_F_EC_KEY_NEW                                  182
-# define EC_F_EC_KEY_PRINT                                180
-# define EC_F_EC_KEY_PRINT_FP                             181
-# define EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES    229
-# define EC_F_EC_POINTS_MAKE_AFFINE                       136
-# define EC_F_EC_POINT_ADD                                112
-# define EC_F_EC_POINT_CMP                                113
-# define EC_F_EC_POINT_COPY                               114
-# define EC_F_EC_POINT_DBL                                115
-# define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GF2M        183
-# define EC_F_EC_POINT_GET_AFFINE_COORDINATES_GFP         116
-# define EC_F_EC_POINT_GET_JPROJECTIVE_COORDINATES_GFP    117
-# define EC_F_EC_POINT_INVERT                             210
-# define EC_F_EC_POINT_IS_AT_INFINITY                     118
-# define EC_F_EC_POINT_IS_ON_CURVE                        119
-# define EC_F_EC_POINT_MAKE_AFFINE                        120
-# define EC_F_EC_POINT_MUL                                184
-# define EC_F_EC_POINT_NEW                                121
-# define EC_F_EC_POINT_OCT2POINT                          122
-# define EC_F_EC_POINT_POINT2OCT                          123
-# define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GF2M        185
-# define EC_F_EC_POINT_SET_AFFINE_COORDINATES_GFP         124
-# define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GF2M    186
-# define EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP     125
-# define EC_F_EC_POINT_SET_JPROJECTIVE_COORDINATES_GFP    126
-# define EC_F_EC_POINT_SET_TO_INFINITY                    127
-# define EC_F_EC_PRE_COMP_DUP                             207
-# define EC_F_EC_PRE_COMP_NEW                             196
-# define EC_F_EC_WNAF_MUL                                 187
-# define EC_F_EC_WNAF_PRECOMPUTE_MULT                     188
-# define EC_F_I2D_ECPARAMETERS                            190
-# define EC_F_I2D_ECPKPARAMETERS                          191
-# define EC_F_I2D_ECPRIVATEKEY                            192
-# define EC_F_I2O_ECPUBLICKEY                             151
-# define EC_F_NISTP224_PRE_COMP_NEW                       227
-# define EC_F_NISTP256_PRE_COMP_NEW                       236
-# define EC_F_NISTP521_PRE_COMP_NEW                       237
-# define EC_F_O2I_ECPUBLICKEY                             152
-# define EC_F_OLD_EC_PRIV_DECODE                          222
-# define EC_F_PKEY_EC_CTRL                                197
-# define EC_F_PKEY_EC_CTRL_STR                            198
-# define EC_F_PKEY_EC_DERIVE                              217
-# define EC_F_PKEY_EC_KEYGEN                              199
-# define EC_F_PKEY_EC_PARAMGEN                            219
-# define EC_F_PKEY_EC_SIGN                                218
-
-/* Reason codes. */
-# define EC_R_ASN1_ERROR                                  115
-# define EC_R_ASN1_UNKNOWN_FIELD                          116
-# define EC_R_BIGNUM_OUT_OF_RANGE                         144
-# define EC_R_BUFFER_TOO_SMALL                            100
-# define EC_R_COORDINATES_OUT_OF_RANGE                    146
-# define EC_R_D2I_ECPKPARAMETERS_FAILURE                  117
-# define EC_R_DECODE_ERROR                                142
-# define EC_R_DISCRIMINANT_IS_ZERO                        118
-# define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE                119
-# define EC_R_FIELD_TOO_LARGE                             143
-# define EC_R_GF2M_NOT_SUPPORTED                          147
-# define EC_R_GROUP2PKPARAMETERS_FAILURE                  120
-# define EC_R_I2D_ECPKPARAMETERS_FAILURE                  121
-# define EC_R_INCOMPATIBLE_OBJECTS                        101
-# define EC_R_INVALID_ARGUMENT                            112
-# define EC_R_INVALID_COMPRESSED_POINT                    110
-# define EC_R_INVALID_COMPRESSION_BIT                     109
-# define EC_R_INVALID_CURVE                               141
-# define EC_R_INVALID_DIGEST_TYPE                         138
-# define EC_R_INVALID_ENCODING                            102
-# define EC_R_INVALID_FIELD                               103
-# define EC_R_INVALID_FORM                                104
-# define EC_R_INVALID_GROUP_ORDER                         122
-# define EC_R_INVALID_PENTANOMIAL_BASIS                   132
-# define EC_R_INVALID_PRIVATE_KEY                         123
-# define EC_R_INVALID_TRINOMIAL_BASIS                     137
-# define EC_R_KEYS_NOT_SET                                140
-# define EC_R_MISSING_PARAMETERS                          124
-# define EC_R_MISSING_PRIVATE_KEY                         125
-# define EC_R_NOT_A_NIST_PRIME                            135
-# define EC_R_NOT_A_SUPPORTED_NIST_PRIME                  136
-# define EC_R_NOT_IMPLEMENTED                             126
-# define EC_R_NOT_INITIALIZED                             111
-# define EC_R_NO_FIELD_MOD                                133
-# define EC_R_NO_PARAMETERS_SET                           139
-# define EC_R_PASSED_NULL_PARAMETER                       134
-# define EC_R_PKPARAMETERS2GROUP_FAILURE                  127
-# define EC_R_POINT_AT_INFINITY                           106
-# define EC_R_POINT_IS_NOT_ON_CURVE                       107
-# define EC_R_SLOT_FULL                                   108
-# define EC_R_UNDEFINED_GENERATOR                         113
-# define EC_R_UNDEFINED_ORDER                             128
-# define EC_R_UNKNOWN_GROUP                               129
-# define EC_R_UNKNOWN_ORDER                               114
-# define EC_R_UNSUPPORTED_FIELD                           131
-# define EC_R_WRONG_CURVE_PARAMETERS                      145
-# define EC_R_WRONG_ORDER                                 130
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ecdh.h b/include.new/openssl/ecdh.h
deleted file mode 100644
index a9b811a..0000000
--- a/include.new/openssl/ecdh.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* crypto/ecdh/ecdh.h */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * The Elliptic Curve Public-Key Crypto Library (ECC Code) included
- * herein is developed by SUN MICROSYSTEMS, INC., and is contributed
- * to the OpenSSL project.
- *
- * The ECC Code is licensed pursuant to the OpenSSL open source
- * license provided below.
- *
- * The ECDH software is originally written by Douglas Stebila of
- * Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright (c) 2000-2002 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ECDH_H
-# define HEADER_ECDH_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_ECDH
-#  error ECDH is disabled.
-# endif
-
-# include <openssl/ec.h>
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const ECDH_METHOD *ECDH_OpenSSL(void);
-
-void ECDH_set_default_method(const ECDH_METHOD *);
-const ECDH_METHOD *ECDH_get_default_method(void);
-int ECDH_set_method(EC_KEY *, const ECDH_METHOD *);
-
-int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,
-                     EC_KEY *ecdh, void *(*KDF) (const void *in, size_t inlen,
-                                                 void *out, size_t *outlen));
-
-int ECDH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new
-                          *new_func, CRYPTO_EX_dup *dup_func,
-                          CRYPTO_EX_free *free_func);
-int ECDH_set_ex_data(EC_KEY *d, int idx, void *arg);
-void *ECDH_get_ex_data(EC_KEY *d, int idx);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ECDH_strings(void);
-
-/* Error codes for the ECDH functions. */
-
-/* Function codes. */
-# define ECDH_F_ECDH_CHECK                                102
-# define ECDH_F_ECDH_COMPUTE_KEY                          100
-# define ECDH_F_ECDH_DATA_NEW_METHOD                      101
-
-/* Reason codes. */
-# define ECDH_R_KDF_FAILED                                102
-# define ECDH_R_NON_FIPS_METHOD                           103
-# define ECDH_R_NO_PRIVATE_VALUE                          100
-# define ECDH_R_POINT_ARITHMETIC_FAILURE                  101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ecdsa.h b/include.new/openssl/ecdsa.h
deleted file mode 100644
index faf76b1..0000000
--- a/include.new/openssl/ecdsa.h
+++ /dev/null
@@ -1,260 +0,0 @@
-/* crypto/ecdsa/ecdsa.h */
-/**
- * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
- * \author Written by Nils Larsch for the OpenSSL project
- */
-/* ====================================================================
- * Copyright (c) 2000-2005 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_ECDSA_H
-# define HEADER_ECDSA_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_ECDSA
-#  error ECDSA is disabled.
-# endif
-
-# include <openssl/ec.h>
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct ECDSA_SIG_st {
-    BIGNUM *r;
-    BIGNUM *s;
-} ECDSA_SIG;
-
-/** Allocates and initialize a ECDSA_SIG structure
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_SIG_new(void);
-
-/** frees a ECDSA_SIG structure
- *  \param  sig  pointer to the ECDSA_SIG structure
- */
-void ECDSA_SIG_free(ECDSA_SIG *sig);
-
-/** DER encode content of ECDSA_SIG object (note: this function modifies *pp
- *  (*pp += length of the DER encoded signature)).
- *  \param  sig  pointer to the ECDSA_SIG object
- *  \param  pp   pointer to a unsigned char pointer for the output or NULL
- *  \return the length of the DER encoded ECDSA_SIG object or 0
- */
-int i2d_ECDSA_SIG(const ECDSA_SIG *sig, unsigned char **pp);
-
-/** Decodes a DER encoded ECDSA signature (note: this function changes *pp
- *  (*pp += len)).
- *  \param  sig  pointer to ECDSA_SIG pointer (may be NULL)
- *  \param  pp   memory buffer with the DER encoded signature
- *  \param  len  length of the buffer
- *  \return pointer to the decoded ECDSA_SIG structure (or NULL)
- */
-ECDSA_SIG *d2i_ECDSA_SIG(ECDSA_SIG **sig, const unsigned char **pp, long len);
-
-/** Computes the ECDSA signature of the given hash value using
- *  the supplied private key and returns the created signature.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  eckey     EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_do_sign(const unsigned char *dgst, int dgst_len,
-                         EC_KEY *eckey);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optioanl),
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return pointer to a ECDSA_SIG structure or NULL if an error occurred
- */
-ECDSA_SIG *ECDSA_do_sign_ex(const unsigned char *dgst, int dgstlen,
-                            const BIGNUM *kinv, const BIGNUM *rp,
-                            EC_KEY *eckey);
-
-/** Verifies that the supplied signature is a valid ECDSA
- *  signature of the supplied hash value using the supplied public key.
- *  \param  dgst      pointer to the hash value
- *  \param  dgst_len  length of the hash value
- *  \param  sig       ECDSA_SIG structure
- *  \param  eckey     EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
-int ECDSA_do_verify(const unsigned char *dgst, int dgst_len,
-                    const ECDSA_SIG *sig, EC_KEY *eckey);
-
-const ECDSA_METHOD *ECDSA_OpenSSL(void);
-
-/** Sets the default ECDSA method
- *  \param  meth  new default ECDSA_METHOD
- */
-void ECDSA_set_default_method(const ECDSA_METHOD *meth);
-
-/** Returns the default ECDSA method
- *  \return pointer to ECDSA_METHOD structure containing the default method
- */
-const ECDSA_METHOD *ECDSA_get_default_method(void);
-
-/** Sets method to be used for the ECDSA operations
- *  \param  eckey  EC_KEY object
- *  \param  meth   new method
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_set_method(EC_KEY *eckey, const ECDSA_METHOD *meth);
-
-/** Returns the maximum length of the DER encoded signature
- *  \param  eckey  EC_KEY object
- *  \return numbers of bytes required for the DER encoded signature
- */
-int ECDSA_size(const EC_KEY *eckey);
-
-/** Precompute parts of the signing operation
- *  \param  eckey  EC_KEY object containing a private EC key
- *  \param  ctx    BN_CTX object (optional)
- *  \param  kinv   BIGNUM pointer for the inverse of k
- *  \param  rp     BIGNUM pointer for x coordinate of k * generator
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_sign_setup(EC_KEY *eckey, BN_CTX *ctx, BIGNUM **kinv, BIGNUM **rp);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      memory for the DER encoded created signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_sign(int type, const unsigned char *dgst, int dgstlen,
-               unsigned char *sig, unsigned int *siglen, EC_KEY *eckey);
-
-/** Computes ECDSA signature of a given hash value using the supplied
- *  private key (note: sig must point to ECDSA_size(eckey) bytes of memory).
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value to sign
- *  \param  dgstlen  length of the hash value
- *  \param  sig      buffer to hold the DER encoded signature
- *  \param  siglen   pointer to the length of the returned signature
- *  \param  kinv     BIGNUM with a pre-computed inverse k (optional)
- *  \param  rp       BIGNUM with a pre-computed rp value (optioanl),
- *                   see ECDSA_sign_setup
- *  \param  eckey    EC_KEY object containing a private EC key
- *  \return 1 on success and 0 otherwise
- */
-int ECDSA_sign_ex(int type, const unsigned char *dgst, int dgstlen,
-                  unsigned char *sig, unsigned int *siglen,
-                  const BIGNUM *kinv, const BIGNUM *rp, EC_KEY *eckey);
-
-/** Verifies that the given signature is valid ECDSA signature
- *  of the supplied hash value using the specified public key.
- *  \param  type     this parameter is ignored
- *  \param  dgst     pointer to the hash value
- *  \param  dgstlen  length of the hash value
- *  \param  sig      pointer to the DER encoded signature
- *  \param  siglen   length of the DER encoded signature
- *  \param  eckey    EC_KEY object containing a public EC key
- *  \return 1 if the signature is valid, 0 if the signature is invalid
- *          and -1 on error
- */
-int ECDSA_verify(int type, const unsigned char *dgst, int dgstlen,
-                 const unsigned char *sig, int siglen, EC_KEY *eckey);
-
-/* the standard ex_data functions */
-int ECDSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new
-                           *new_func, CRYPTO_EX_dup *dup_func,
-                           CRYPTO_EX_free *free_func);
-int ECDSA_set_ex_data(EC_KEY *d, int idx, void *arg);
-void *ECDSA_get_ex_data(EC_KEY *d, int idx);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ECDSA_strings(void);
-
-/* Error codes for the ECDSA functions. */
-
-/* Function codes. */
-# define ECDSA_F_ECDSA_CHECK                              104
-# define ECDSA_F_ECDSA_DATA_NEW_METHOD                    100
-# define ECDSA_F_ECDSA_DO_SIGN                            101
-# define ECDSA_F_ECDSA_DO_VERIFY                          102
-# define ECDSA_F_ECDSA_SIGN_SETUP                         103
-
-/* Reason codes. */
-# define ECDSA_R_BAD_SIGNATURE                            100
-# define ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE              101
-# define ECDSA_R_ERR_EC_LIB                               102
-# define ECDSA_R_MISSING_PARAMETERS                       103
-# define ECDSA_R_NEED_NEW_SETUP_VALUES                    106
-# define ECDSA_R_NON_FIPS_METHOD                          107
-# define ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED          104
-# define ECDSA_R_SIGNATURE_MALLOC_FAILED                  105
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/eng_int.h b/include.new/openssl/eng_int.h
deleted file mode 100644
index 38335f9..0000000
--- a/include.new/openssl/eng_int.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* crypto/engine/eng_int.h */
-/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 1999-2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_ENGINE_INT_H
-#define HEADER_ENGINE_INT_H
-
-/* Take public definitions from engine.h */
-#include <openssl/engine.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* If we compile with this symbol defined, then both reference counts in the
- * ENGINE structure will be monitored with a line of output on stderr for each
- * change. This prints the engine's pointer address (truncated to unsigned int),
- * "struct" or "funct" to indicate the reference type, the before and after
- * reference count, and the file:line-number pair. The "engine_ref_debug"
- * statements must come *after* the change. */
-#ifdef ENGINE_REF_COUNT_DEBUG
-
-#define engine_ref_debug(e, isfunct, diff) \
-	fprintf(stderr, "engine: %08x %s from %d to %d (%s:%d)\n", \
-		(unsigned int)(e), (isfunct ? "funct" : "struct"), \
-		((isfunct) ? ((e)->funct_ref - (diff)) : ((e)->struct_ref - (diff))), \
-		((isfunct) ? (e)->funct_ref : (e)->struct_ref), \
-		(__FILE__), (__LINE__));
-
-#else
-
-#define engine_ref_debug(e, isfunct, diff)
-
-#endif
-
-/* Any code that will need cleanup operations should use these functions to
- * register callbacks. ENGINE_cleanup() will call all registered callbacks in
- * order. NB: both the "add" functions assume CRYPTO_LOCK_ENGINE to already be
- * held (in "write" mode). */
-typedef void (ENGINE_CLEANUP_CB)(void);
-typedef struct st_engine_cleanup_item
-	{
-	ENGINE_CLEANUP_CB *cb;
-	} ENGINE_CLEANUP_ITEM;
-DECLARE_STACK_OF(ENGINE_CLEANUP_ITEM)
-void engine_cleanup_add_first(ENGINE_CLEANUP_CB *cb);
-void engine_cleanup_add_last(ENGINE_CLEANUP_CB *cb);
-
-/* We need stacks of ENGINEs for use in eng_table.c */
-DECLARE_STACK_OF(ENGINE)
-
-/* If this symbol is defined then engine_table_select(), the function that is
- * used by RSA, DSA (etc) code to select registered ENGINEs, cache defaults and
- * functional references (etc), will display debugging summaries to stderr. */
-/* #define ENGINE_TABLE_DEBUG */
-
-/* This represents an implementation table. Dependent code should instantiate it
- * as a (ENGINE_TABLE *) pointer value set initially to NULL. */
-typedef struct st_engine_table ENGINE_TABLE;
-int engine_table_register(ENGINE_TABLE **table, ENGINE_CLEANUP_CB *cleanup,
-		ENGINE *e, const int *nids, int num_nids, int setdefault);
-void engine_table_unregister(ENGINE_TABLE **table, ENGINE *e);
-void engine_table_cleanup(ENGINE_TABLE **table);
-#ifndef ENGINE_TABLE_DEBUG
-ENGINE *engine_table_select(ENGINE_TABLE **table, int nid);
-#else
-ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f, int l);
-#define engine_table_select(t,n) engine_table_select_tmp(t,n,__FILE__,__LINE__)
-#endif
-
-/* Internal versions of API functions that have control over locking. These are
- * used between C files when functionality needs to be shared but the caller may
- * already be controlling of the CRYPTO_LOCK_ENGINE lock. */
-int engine_unlocked_init(ENGINE *e);
-int engine_unlocked_finish(ENGINE *e, int unlock_for_handlers);
-int engine_free_util(ENGINE *e, int locked);
-
-/* This function will reset all "set"able values in an ENGINE to NULL. This
- * won't touch reference counts or ex_data, but is equivalent to calling all the
- * ENGINE_set_***() functions with a NULL value. */
-void engine_set_all_null(ENGINE *e);
-
-/* NB: Bitwise OR-able values for the "flags" variable in ENGINE are now exposed
- * in engine.h. */
-
-/* This is a structure for storing implementations of various crypto
- * algorithms and functions. */
-struct engine_st
-	{
-	const char *id;
-	const char *name;
-	const RSA_METHOD *rsa_meth;
-	const DSA_METHOD *dsa_meth;
-	const DH_METHOD *dh_meth;
-	const RAND_METHOD *rand_meth;
-	/* Cipher handling is via this callback */
-	ENGINE_CIPHERS_PTR ciphers;
-	/* Digest handling is via this callback */
-	ENGINE_DIGESTS_PTR digests;
-
-
-	ENGINE_GEN_INT_FUNC_PTR	destroy;
-
-	ENGINE_GEN_INT_FUNC_PTR init;
-	ENGINE_GEN_INT_FUNC_PTR finish;
-	ENGINE_CTRL_FUNC_PTR ctrl;
-	ENGINE_LOAD_KEY_PTR load_privkey;
-	ENGINE_LOAD_KEY_PTR load_pubkey;
-
-	const ENGINE_CMD_DEFN *cmd_defns;
-	int flags;
-	/* reference count on the structure itself */
-	int struct_ref;
-	/* reference count on usability of the engine type. NB: This
-	 * controls the loading and initialisation of any functionlity
-	 * required by this engine, whereas the previous count is
-	 * simply to cope with (de)allocation of this structure. Hence,
-	 * running_ref <= struct_ref at all times. */
-	int funct_ref;
-	/* A place to store per-ENGINE data */
-	CRYPTO_EX_DATA ex_data;
-	/* Used to maintain the linked-list of engines. */
-	struct engine_st *prev;
-	struct engine_st *next;
-	};
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif /* HEADER_ENGINE_INT_H */
diff --git a/include.new/openssl/engine.h b/include.new/openssl/engine.h
deleted file mode 100644
index e81096a..0000000
--- a/include.new/openssl/engine.h
+++ /dev/null
@@ -1,961 +0,0 @@
-/* openssl/engine.h */
-/*
- * Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL project
- * 2000.
- */
-/* ====================================================================
- * Copyright (c) 1999-2004 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_ENGINE_H
-# define HEADER_ENGINE_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_ENGINE
-#  error ENGINE is disabled.
-# endif
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-#  ifndef OPENSSL_NO_RSA
-#   include <openssl/rsa.h>
-#  endif
-#  ifndef OPENSSL_NO_DSA
-#   include <openssl/dsa.h>
-#  endif
-#  ifndef OPENSSL_NO_DH
-#   include <openssl/dh.h>
-#  endif
-#  ifndef OPENSSL_NO_ECDH
-#   include <openssl/ecdh.h>
-#  endif
-#  ifndef OPENSSL_NO_ECDSA
-#   include <openssl/ecdsa.h>
-#  endif
-#  include <openssl/rand.h>
-#  include <openssl/ui.h>
-#  include <openssl/err.h>
-# endif
-
-# include <openssl/ossl_typ.h>
-# include <openssl/symhacks.h>
-
-# include <openssl/x509.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * These flags are used to control combinations of algorithm (methods) by
- * bitwise "OR"ing.
- */
-# define ENGINE_METHOD_RSA               (unsigned int)0x0001
-# define ENGINE_METHOD_DSA               (unsigned int)0x0002
-# define ENGINE_METHOD_DH                (unsigned int)0x0004
-# define ENGINE_METHOD_RAND              (unsigned int)0x0008
-# define ENGINE_METHOD_ECDH              (unsigned int)0x0010
-# define ENGINE_METHOD_ECDSA             (unsigned int)0x0020
-# define ENGINE_METHOD_CIPHERS           (unsigned int)0x0040
-# define ENGINE_METHOD_DIGESTS           (unsigned int)0x0080
-# define ENGINE_METHOD_STORE             (unsigned int)0x0100
-# define ENGINE_METHOD_PKEY_METHS        (unsigned int)0x0200
-# define ENGINE_METHOD_PKEY_ASN1_METHS   (unsigned int)0x0400
-/* Obvious all-or-nothing cases. */
-# define ENGINE_METHOD_ALL               (unsigned int)0xFFFF
-# define ENGINE_METHOD_NONE              (unsigned int)0x0000
-
-/*
- * This(ese) flag(s) controls behaviour of the ENGINE_TABLE mechanism used
- * internally to control registration of ENGINE implementations, and can be
- * set by ENGINE_set_table_flags(). The "NOINIT" flag prevents attempts to
- * initialise registered ENGINEs if they are not already initialised.
- */
-# define ENGINE_TABLE_FLAG_NOINIT        (unsigned int)0x0001
-
-/* ENGINE flags that can be set by ENGINE_set_flags(). */
-/* Not used */
-/* #define ENGINE_FLAGS_MALLOCED        0x0001 */
-
-/*
- * This flag is for ENGINEs that wish to handle the various 'CMD'-related
- * control commands on their own. Without this flag, ENGINE_ctrl() handles
- * these control commands on behalf of the ENGINE using their "cmd_defns"
- * data.
- */
-# define ENGINE_FLAGS_MANUAL_CMD_CTRL    (int)0x0002
-
-/*
- * This flag is for ENGINEs who return new duplicate structures when found
- * via "ENGINE_by_id()". When an ENGINE must store state (eg. if
- * ENGINE_ctrl() commands are called in sequence as part of some stateful
- * process like key-generation setup and execution), it can set this flag -
- * then each attempt to obtain the ENGINE will result in it being copied into
- * a new structure. Normally, ENGINEs don't declare this flag so
- * ENGINE_by_id() just increments the existing ENGINE's structural reference
- * count.
- */
-# define ENGINE_FLAGS_BY_ID_COPY         (int)0x0004
-
-/*
- * This flag if for an ENGINE that does not want its methods registered as
- * part of ENGINE_register_all_complete() for example if the methods are not
- * usable as default methods.
- */
-
-# define ENGINE_FLAGS_NO_REGISTER_ALL    (int)0x0008
-
-/*
- * ENGINEs can support their own command types, and these flags are used in
- * ENGINE_CTRL_GET_CMD_FLAGS to indicate to the caller what kind of input
- * each command expects. Currently only numeric and string input is
- * supported. If a control command supports none of the _NUMERIC, _STRING, or
- * _NO_INPUT options, then it is regarded as an "internal" control command -
- * and not for use in config setting situations. As such, they're not
- * available to the ENGINE_ctrl_cmd_string() function, only raw ENGINE_ctrl()
- * access. Changes to this list of 'command types' should be reflected
- * carefully in ENGINE_cmd_is_executable() and ENGINE_ctrl_cmd_string().
- */
-
-/* accepts a 'long' input value (3rd parameter to ENGINE_ctrl) */
-# define ENGINE_CMD_FLAG_NUMERIC         (unsigned int)0x0001
-/*
- * accepts string input (cast from 'void*' to 'const char *', 4th parameter
- * to ENGINE_ctrl)
- */
-# define ENGINE_CMD_FLAG_STRING          (unsigned int)0x0002
-/*
- * Indicates that the control command takes *no* input. Ie. the control
- * command is unparameterised.
- */
-# define ENGINE_CMD_FLAG_NO_INPUT        (unsigned int)0x0004
-/*
- * Indicates that the control command is internal. This control command won't
- * be shown in any output, and is only usable through the ENGINE_ctrl_cmd()
- * function.
- */
-# define ENGINE_CMD_FLAG_INTERNAL        (unsigned int)0x0008
-
-/*
- * NB: These 3 control commands are deprecated and should not be used.
- * ENGINEs relying on these commands should compile conditional support for
- * compatibility (eg. if these symbols are defined) but should also migrate
- * the same functionality to their own ENGINE-specific control functions that
- * can be "discovered" by calling applications. The fact these control
- * commands wouldn't be "executable" (ie. usable by text-based config)
- * doesn't change the fact that application code can find and use them
- * without requiring per-ENGINE hacking.
- */
-
-/*
- * These flags are used to tell the ctrl function what should be done. All
- * command numbers are shared between all engines, even if some don't make
- * sense to some engines.  In such a case, they do nothing but return the
- * error ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED.
- */
-# define ENGINE_CTRL_SET_LOGSTREAM               1
-# define ENGINE_CTRL_SET_PASSWORD_CALLBACK       2
-# define ENGINE_CTRL_HUP                         3/* Close and reinitialise
-                                                   * any handles/connections
-                                                   * etc. */
-# define ENGINE_CTRL_SET_USER_INTERFACE          4/* Alternative to callback */
-# define ENGINE_CTRL_SET_CALLBACK_DATA           5/* User-specific data, used
-                                                   * when calling the password
-                                                   * callback and the user
-                                                   * interface */
-# define ENGINE_CTRL_LOAD_CONFIGURATION          6/* Load a configuration,
-                                                   * given a string that
-                                                   * represents a file name
-                                                   * or so */
-# define ENGINE_CTRL_LOAD_SECTION                7/* Load data from a given
-                                                   * section in the already
-                                                   * loaded configuration */
-
-/*
- * These control commands allow an application to deal with an arbitrary
- * engine in a dynamic way. Warn: Negative return values indicate errors FOR
- * THESE COMMANDS because zero is used to indicate 'end-of-list'. Other
- * commands, including ENGINE-specific command types, return zero for an
- * error. An ENGINE can choose to implement these ctrl functions, and can
- * internally manage things however it chooses - it does so by setting the
- * ENGINE_FLAGS_MANUAL_CMD_CTRL flag (using ENGINE_set_flags()). Otherwise
- * the ENGINE_ctrl() code handles this on the ENGINE's behalf using the
- * cmd_defns data (set using ENGINE_set_cmd_defns()). This means an ENGINE's
- * ctrl() handler need only implement its own commands - the above "meta"
- * commands will be taken care of.
- */
-
-/*
- * Returns non-zero if the supplied ENGINE has a ctrl() handler. If "not",
- * then all the remaining control commands will return failure, so it is
- * worth checking this first if the caller is trying to "discover" the
- * engine's capabilities and doesn't want errors generated unnecessarily.
- */
-# define ENGINE_CTRL_HAS_CTRL_FUNCTION           10
-/*
- * Returns a positive command number for the first command supported by the
- * engine. Returns zero if no ctrl commands are supported.
- */
-# define ENGINE_CTRL_GET_FIRST_CMD_TYPE          11
-/*
- * The 'long' argument specifies a command implemented by the engine, and the
- * return value is the next command supported, or zero if there are no more.
- */
-# define ENGINE_CTRL_GET_NEXT_CMD_TYPE           12
-/*
- * The 'void*' argument is a command name (cast from 'const char *'), and the
- * return value is the command that corresponds to it.
- */
-# define ENGINE_CTRL_GET_CMD_FROM_NAME           13
-/*
- * The next two allow a command to be converted into its corresponding string
- * form. In each case, the 'long' argument supplies the command. In the
- * NAME_LEN case, the return value is the length of the command name (not
- * counting a trailing EOL). In the NAME case, the 'void*' argument must be a
- * string buffer large enough, and it will be populated with the name of the
- * command (WITH a trailing EOL).
- */
-# define ENGINE_CTRL_GET_NAME_LEN_FROM_CMD       14
-# define ENGINE_CTRL_GET_NAME_FROM_CMD           15
-/* The next two are similar but give a "short description" of a command. */
-# define ENGINE_CTRL_GET_DESC_LEN_FROM_CMD       16
-# define ENGINE_CTRL_GET_DESC_FROM_CMD           17
-/*
- * With this command, the return value is the OR'd combination of
- * ENGINE_CMD_FLAG_*** values that indicate what kind of input a given
- * engine-specific ctrl command expects.
- */
-# define ENGINE_CTRL_GET_CMD_FLAGS               18
-
-/*
- * ENGINE implementations should start the numbering of their own control
- * commands from this value. (ie. ENGINE_CMD_BASE, ENGINE_CMD_BASE + 1, etc).
- */
-# define ENGINE_CMD_BASE                         200
-
-/*
- * NB: These 2 nCipher "chil" control commands are deprecated, and their
- * functionality is now available through ENGINE-specific control commands
- * (exposed through the above-mentioned 'CMD'-handling). Code using these 2
- * commands should be migrated to the more general command handling before
- * these are removed.
- */
-
-/* Flags specific to the nCipher "chil" engine */
-# define ENGINE_CTRL_CHIL_SET_FORKCHECK          100
-        /*
-         * Depending on the value of the (long)i argument, this sets or
-         * unsets the SimpleForkCheck flag in the CHIL API to enable or
-         * disable checking and workarounds for applications that fork().
-         */
-# define ENGINE_CTRL_CHIL_NO_LOCKING             101
-        /*
-         * This prevents the initialisation function from providing mutex
-         * callbacks to the nCipher library.
-         */
-
-/*
- * If an ENGINE supports its own specific control commands and wishes the
- * framework to handle the above 'ENGINE_CMD_***'-manipulation commands on
- * its behalf, it should supply a null-terminated array of ENGINE_CMD_DEFN
- * entries to ENGINE_set_cmd_defns(). It should also implement a ctrl()
- * handler that supports the stated commands (ie. the "cmd_num" entries as
- * described by the array). NB: The array must be ordered in increasing order
- * of cmd_num. "null-terminated" means that the last ENGINE_CMD_DEFN element
- * has cmd_num set to zero and/or cmd_name set to NULL.
- */
-typedef struct ENGINE_CMD_DEFN_st {
-    unsigned int cmd_num;       /* The command number */
-    const char *cmd_name;       /* The command name itself */
-    const char *cmd_desc;       /* A short description of the command */
-    unsigned int cmd_flags;     /* The input the command expects */
-} ENGINE_CMD_DEFN;
-
-/* Generic function pointer */
-typedef int (*ENGINE_GEN_FUNC_PTR) (void);
-/* Generic function pointer taking no arguments */
-typedef int (*ENGINE_GEN_INT_FUNC_PTR) (ENGINE *);
-/* Specific control function pointer */
-typedef int (*ENGINE_CTRL_FUNC_PTR) (ENGINE *, int, long, void *,
-                                     void (*f) (void));
-/* Generic load_key function pointer */
-typedef EVP_PKEY *(*ENGINE_LOAD_KEY_PTR)(ENGINE *, const char *,
-                                         UI_METHOD *ui_method,
-                                         void *callback_data);
-typedef int (*ENGINE_SSL_CLIENT_CERT_PTR) (ENGINE *, SSL *ssl,
-                                           STACK_OF(X509_NAME) *ca_dn,
-                                           X509 **pcert, EVP_PKEY **pkey,
-                                           STACK_OF(X509) **pother,
-                                           UI_METHOD *ui_method,
-                                           void *callback_data);
-/*-
- * These callback types are for an ENGINE's handler for cipher and digest logic.
- * These handlers have these prototypes;
- *   int foo(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid);
- *   int foo(ENGINE *e, const EVP_MD **digest, const int **nids, int nid);
- * Looking at how to implement these handlers in the case of cipher support, if
- * the framework wants the EVP_CIPHER for 'nid', it will call;
- *   foo(e, &p_evp_cipher, NULL, nid);    (return zero for failure)
- * If the framework wants a list of supported 'nid's, it will call;
- *   foo(e, NULL, &p_nids, 0); (returns number of 'nids' or -1 for error)
- */
-/*
- * Returns to a pointer to the array of supported cipher 'nid's. If the
- * second parameter is non-NULL it is set to the size of the returned array.
- */
-typedef int (*ENGINE_CIPHERS_PTR) (ENGINE *, const EVP_CIPHER **,
-                                   const int **, int);
-typedef int (*ENGINE_DIGESTS_PTR) (ENGINE *, const EVP_MD **, const int **,
-                                   int);
-typedef int (*ENGINE_PKEY_METHS_PTR) (ENGINE *, EVP_PKEY_METHOD **,
-                                      const int **, int);
-typedef int (*ENGINE_PKEY_ASN1_METHS_PTR) (ENGINE *, EVP_PKEY_ASN1_METHOD **,
-                                           const int **, int);
-/*
- * STRUCTURE functions ... all of these functions deal with pointers to
- * ENGINE structures where the pointers have a "structural reference". This
- * means that their reference is to allowed access to the structure but it
- * does not imply that the structure is functional. To simply increment or
- * decrement the structural reference count, use ENGINE_by_id and
- * ENGINE_free. NB: This is not required when iterating using ENGINE_get_next
- * as it will automatically decrement the structural reference count of the
- * "current" ENGINE and increment the structural reference count of the
- * ENGINE it returns (unless it is NULL).
- */
-
-/* Get the first/last "ENGINE" type available. */
-ENGINE *ENGINE_get_first(void);
-ENGINE *ENGINE_get_last(void);
-/* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */
-ENGINE *ENGINE_get_next(ENGINE *e);
-ENGINE *ENGINE_get_prev(ENGINE *e);
-/* Add another "ENGINE" type into the array. */
-int ENGINE_add(ENGINE *e);
-/* Remove an existing "ENGINE" type from the array. */
-int ENGINE_remove(ENGINE *e);
-/* Retrieve an engine from the list by its unique "id" value. */
-ENGINE *ENGINE_by_id(const char *id);
-/* Add all the built-in engines. */
-void ENGINE_load_openssl(void);
-void ENGINE_load_dynamic(void);
-# ifndef OPENSSL_NO_STATIC_ENGINE
-void ENGINE_load_4758cca(void);
-void ENGINE_load_aep(void);
-void ENGINE_load_atalla(void);
-void ENGINE_load_chil(void);
-void ENGINE_load_cswift(void);
-void ENGINE_load_nuron(void);
-void ENGINE_load_sureware(void);
-void ENGINE_load_ubsec(void);
-void ENGINE_load_padlock(void);
-void ENGINE_load_capi(void);
-#  ifndef OPENSSL_NO_GMP
-void ENGINE_load_gmp(void);
-#  endif
-#  ifndef OPENSSL_NO_GOST
-void ENGINE_load_gost(void);
-#  endif
-# endif
-void ENGINE_load_cryptodev(void);
-void ENGINE_load_rsax(void);
-void ENGINE_load_rdrand(void);
-void ENGINE_load_builtin_engines(void);
-
-/*
- * Get and set global flags (ENGINE_TABLE_FLAG_***) for the implementation
- * "registry" handling.
- */
-unsigned int ENGINE_get_table_flags(void);
-void ENGINE_set_table_flags(unsigned int flags);
-
-/*- Manage registration of ENGINEs per "table". For each type, there are 3
- * functions;
- *   ENGINE_register_***(e) - registers the implementation from 'e' (if it has one)
- *   ENGINE_unregister_***(e) - unregister the implementation from 'e'
- *   ENGINE_register_all_***() - call ENGINE_register_***() for each 'e' in the list
- * Cleanup is automatically registered from each table when required, so
- * ENGINE_cleanup() will reverse any "register" operations.
- */
-
-int ENGINE_register_RSA(ENGINE *e);
-void ENGINE_unregister_RSA(ENGINE *e);
-void ENGINE_register_all_RSA(void);
-
-int ENGINE_register_DSA(ENGINE *e);
-void ENGINE_unregister_DSA(ENGINE *e);
-void ENGINE_register_all_DSA(void);
-
-int ENGINE_register_ECDH(ENGINE *e);
-void ENGINE_unregister_ECDH(ENGINE *e);
-void ENGINE_register_all_ECDH(void);
-
-int ENGINE_register_ECDSA(ENGINE *e);
-void ENGINE_unregister_ECDSA(ENGINE *e);
-void ENGINE_register_all_ECDSA(void);
-
-int ENGINE_register_DH(ENGINE *e);
-void ENGINE_unregister_DH(ENGINE *e);
-void ENGINE_register_all_DH(void);
-
-int ENGINE_register_RAND(ENGINE *e);
-void ENGINE_unregister_RAND(ENGINE *e);
-void ENGINE_register_all_RAND(void);
-
-int ENGINE_register_STORE(ENGINE *e);
-void ENGINE_unregister_STORE(ENGINE *e);
-void ENGINE_register_all_STORE(void);
-
-int ENGINE_register_ciphers(ENGINE *e);
-void ENGINE_unregister_ciphers(ENGINE *e);
-void ENGINE_register_all_ciphers(void);
-
-int ENGINE_register_digests(ENGINE *e);
-void ENGINE_unregister_digests(ENGINE *e);
-void ENGINE_register_all_digests(void);
-
-int ENGINE_register_pkey_meths(ENGINE *e);
-void ENGINE_unregister_pkey_meths(ENGINE *e);
-void ENGINE_register_all_pkey_meths(void);
-
-int ENGINE_register_pkey_asn1_meths(ENGINE *e);
-void ENGINE_unregister_pkey_asn1_meths(ENGINE *e);
-void ENGINE_register_all_pkey_asn1_meths(void);
-
-/*
- * These functions register all support from the above categories. Note, use
- * of these functions can result in static linkage of code your application
- * may not need. If you only need a subset of functionality, consider using
- * more selective initialisation.
- */
-int ENGINE_register_complete(ENGINE *e);
-int ENGINE_register_all_complete(void);
-
-/*
- * Send parametrised control commands to the engine. The possibilities to
- * send down an integer, a pointer to data or a function pointer are
- * provided. Any of the parameters may or may not be NULL, depending on the
- * command number. In actuality, this function only requires a structural
- * (rather than functional) reference to an engine, but many control commands
- * may require the engine be functional. The caller should be aware of trying
- * commands that require an operational ENGINE, and only use functional
- * references in such situations.
- */
-int ENGINE_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void));
-
-/*
- * This function tests if an ENGINE-specific command is usable as a
- * "setting". Eg. in an application's config file that gets processed through
- * ENGINE_ctrl_cmd_string(). If this returns zero, it is not available to
- * ENGINE_ctrl_cmd_string(), only ENGINE_ctrl().
- */
-int ENGINE_cmd_is_executable(ENGINE *e, int cmd);
-
-/*
- * This function works like ENGINE_ctrl() with the exception of taking a
- * command name instead of a command number, and can handle optional
- * commands. See the comment on ENGINE_ctrl_cmd_string() for an explanation
- * on how to use the cmd_name and cmd_optional.
- */
-int ENGINE_ctrl_cmd(ENGINE *e, const char *cmd_name,
-                    long i, void *p, void (*f) (void), int cmd_optional);
-
-/*
- * This function passes a command-name and argument to an ENGINE. The
- * cmd_name is converted to a command number and the control command is
- * called using 'arg' as an argument (unless the ENGINE doesn't support such
- * a command, in which case no control command is called). The command is
- * checked for input flags, and if necessary the argument will be converted
- * to a numeric value. If cmd_optional is non-zero, then if the ENGINE
- * doesn't support the given cmd_name the return value will be success
- * anyway. This function is intended for applications to use so that users
- * (or config files) can supply engine-specific config data to the ENGINE at
- * run-time to control behaviour of specific engines. As such, it shouldn't
- * be used for calling ENGINE_ctrl() functions that return data, deal with
- * binary data, or that are otherwise supposed to be used directly through
- * ENGINE_ctrl() in application code. Any "return" data from an ENGINE_ctrl()
- * operation in this function will be lost - the return value is interpreted
- * as failure if the return value is zero, success otherwise, and this
- * function returns a boolean value as a result. In other words, vendors of
- * 'ENGINE'-enabled devices should write ENGINE implementations with
- * parameterisations that work in this scheme, so that compliant ENGINE-based
- * applications can work consistently with the same configuration for the
- * same ENGINE-enabled devices, across applications.
- */
-int ENGINE_ctrl_cmd_string(ENGINE *e, const char *cmd_name, const char *arg,
-                           int cmd_optional);
-
-/*
- * These functions are useful for manufacturing new ENGINE structures. They
- * don't address reference counting at all - one uses them to populate an
- * ENGINE structure with personalised implementations of things prior to
- * using it directly or adding it to the builtin ENGINE list in OpenSSL.
- * These are also here so that the ENGINE structure doesn't have to be
- * exposed and break binary compatibility!
- */
-ENGINE *ENGINE_new(void);
-int ENGINE_free(ENGINE *e);
-int ENGINE_up_ref(ENGINE *e);
-int ENGINE_set_id(ENGINE *e, const char *id);
-int ENGINE_set_name(ENGINE *e, const char *name);
-int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
-int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
-int ENGINE_set_ECDH(ENGINE *e, const ECDH_METHOD *ecdh_meth);
-int ENGINE_set_ECDSA(ENGINE *e, const ECDSA_METHOD *ecdsa_meth);
-int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
-int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth);
-int ENGINE_set_STORE(ENGINE *e, const STORE_METHOD *store_meth);
-int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f);
-int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f);
-int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f);
-int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f);
-int ENGINE_set_load_privkey_function(ENGINE *e,
-                                     ENGINE_LOAD_KEY_PTR loadpriv_f);
-int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f);
-int ENGINE_set_load_ssl_client_cert_function(ENGINE *e,
-                                             ENGINE_SSL_CLIENT_CERT_PTR
-                                             loadssl_f);
-int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f);
-int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f);
-int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f);
-int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f);
-int ENGINE_set_flags(ENGINE *e, int flags);
-int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns);
-/* These functions allow control over any per-structure ENGINE data. */
-int ENGINE_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                            CRYPTO_EX_dup *dup_func,
-                            CRYPTO_EX_free *free_func);
-int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg);
-void *ENGINE_get_ex_data(const ENGINE *e, int idx);
-
-/*
- * This function cleans up anything that needs it. Eg. the ENGINE_add()
- * function automatically ensures the list cleanup function is registered to
- * be called from ENGINE_cleanup(). Similarly, all ENGINE_register_***
- * functions ensure ENGINE_cleanup() will clean up after them.
- */
-void ENGINE_cleanup(void);
-
-/*
- * These return values from within the ENGINE structure. These can be useful
- * with functional references as well as structural references - it depends
- * which you obtained. Using the result for functional purposes if you only
- * obtained a structural reference may be problematic!
- */
-const char *ENGINE_get_id(const ENGINE *e);
-const char *ENGINE_get_name(const ENGINE *e);
-const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e);
-const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e);
-const ECDH_METHOD *ENGINE_get_ECDH(const ENGINE *e);
-const ECDSA_METHOD *ENGINE_get_ECDSA(const ENGINE *e);
-const DH_METHOD *ENGINE_get_DH(const ENGINE *e);
-const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e);
-const STORE_METHOD *ENGINE_get_STORE(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_destroy_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_init_function(const ENGINE *e);
-ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e);
-ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e);
-ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e);
-ENGINE_SSL_CLIENT_CERT_PTR ENGINE_get_ssl_client_cert_function(const ENGINE
-                                                               *e);
-ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e);
-ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e);
-ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e);
-ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths(const ENGINE *e);
-const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid);
-const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid);
-const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid);
-const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e,
-                                                          const char *str,
-                                                          int len);
-const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe,
-                                                      const char *str,
-                                                      int len);
-const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e);
-int ENGINE_get_flags(const ENGINE *e);
-
-/*
- * FUNCTIONAL functions. These functions deal with ENGINE structures that
- * have (or will) be initialised for use. Broadly speaking, the structural
- * functions are useful for iterating the list of available engine types,
- * creating new engine types, and other "list" operations. These functions
- * actually deal with ENGINEs that are to be used. As such these functions
- * can fail (if applicable) when particular engines are unavailable - eg. if
- * a hardware accelerator is not attached or not functioning correctly. Each
- * ENGINE has 2 reference counts; structural and functional. Every time a
- * functional reference is obtained or released, a corresponding structural
- * reference is automatically obtained or released too.
- */
-
-/*
- * Initialise a engine type for use (or up its reference count if it's
- * already in use). This will fail if the engine is not currently operational
- * and cannot initialise.
- */
-int ENGINE_init(ENGINE *e);
-/*
- * Free a functional reference to a engine type. This does not require a
- * corresponding call to ENGINE_free as it also releases a structural
- * reference.
- */
-int ENGINE_finish(ENGINE *e);
-
-/*
- * The following functions handle keys that are stored in some secondary
- * location, handled by the engine.  The storage may be on a card or
- * whatever.
- */
-EVP_PKEY *ENGINE_load_private_key(ENGINE *e, const char *key_id,
-                                  UI_METHOD *ui_method, void *callback_data);
-EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id,
-                                 UI_METHOD *ui_method, void *callback_data);
-int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s,
-                                STACK_OF(X509_NAME) *ca_dn, X509 **pcert,
-                                EVP_PKEY **ppkey, STACK_OF(X509) **pother,
-                                UI_METHOD *ui_method, void *callback_data);
-
-/*
- * This returns a pointer for the current ENGINE structure that is (by
- * default) performing any RSA operations. The value returned is an
- * incremented reference, so it should be free'd (ENGINE_finish) before it is
- * discarded.
- */
-ENGINE *ENGINE_get_default_RSA(void);
-/* Same for the other "methods" */
-ENGINE *ENGINE_get_default_DSA(void);
-ENGINE *ENGINE_get_default_ECDH(void);
-ENGINE *ENGINE_get_default_ECDSA(void);
-ENGINE *ENGINE_get_default_DH(void);
-ENGINE *ENGINE_get_default_RAND(void);
-/*
- * These functions can be used to get a functional reference to perform
- * ciphering or digesting corresponding to "nid".
- */
-ENGINE *ENGINE_get_cipher_engine(int nid);
-ENGINE *ENGINE_get_digest_engine(int nid);
-ENGINE *ENGINE_get_pkey_meth_engine(int nid);
-ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid);
-
-/*
- * This sets a new default ENGINE structure for performing RSA operations. If
- * the result is non-zero (success) then the ENGINE structure will have had
- * its reference count up'd so the caller should still free their own
- * reference 'e'.
- */
-int ENGINE_set_default_RSA(ENGINE *e);
-int ENGINE_set_default_string(ENGINE *e, const char *def_list);
-/* Same for the other "methods" */
-int ENGINE_set_default_DSA(ENGINE *e);
-int ENGINE_set_default_ECDH(ENGINE *e);
-int ENGINE_set_default_ECDSA(ENGINE *e);
-int ENGINE_set_default_DH(ENGINE *e);
-int ENGINE_set_default_RAND(ENGINE *e);
-int ENGINE_set_default_ciphers(ENGINE *e);
-int ENGINE_set_default_digests(ENGINE *e);
-int ENGINE_set_default_pkey_meths(ENGINE *e);
-int ENGINE_set_default_pkey_asn1_meths(ENGINE *e);
-
-/*
- * The combination "set" - the flags are bitwise "OR"d from the
- * ENGINE_METHOD_*** defines above. As with the "ENGINE_register_complete()"
- * function, this function can result in unnecessary static linkage. If your
- * application requires only specific functionality, consider using more
- * selective functions.
- */
-int ENGINE_set_default(ENGINE *e, unsigned int flags);
-
-void ENGINE_add_conf_module(void);
-
-/* Deprecated functions ... */
-/* int ENGINE_clear_defaults(void); */
-
-/**************************/
-/* DYNAMIC ENGINE SUPPORT */
-/**************************/
-
-/* Binary/behaviour compatibility levels */
-# define OSSL_DYNAMIC_VERSION            (unsigned long)0x00020000
-/*
- * Binary versions older than this are too old for us (whether we're a loader
- * or a loadee)
- */
-# define OSSL_DYNAMIC_OLDEST             (unsigned long)0x00020000
-
-/*
- * When compiling an ENGINE entirely as an external shared library, loadable
- * by the "dynamic" ENGINE, these types are needed. The 'dynamic_fns'
- * structure type provides the calling application's (or library's) error
- * functionality and memory management function pointers to the loaded
- * library. These should be used/set in the loaded library code so that the
- * loading application's 'state' will be used/changed in all operations. The
- * 'static_state' pointer allows the loaded library to know if it shares the
- * same static data as the calling application (or library), and thus whether
- * these callbacks need to be set or not.
- */
-typedef void *(*dyn_MEM_malloc_cb) (size_t);
-typedef void *(*dyn_MEM_realloc_cb) (void *, size_t);
-typedef void (*dyn_MEM_free_cb) (void *);
-typedef struct st_dynamic_MEM_fns {
-    dyn_MEM_malloc_cb malloc_cb;
-    dyn_MEM_realloc_cb realloc_cb;
-    dyn_MEM_free_cb free_cb;
-} dynamic_MEM_fns;
-/*
- * FIXME: Perhaps the memory and locking code (crypto.h) should declare and
- * use these types so we (and any other dependant code) can simplify a bit??
- */
-typedef void (*dyn_lock_locking_cb) (int, int, const char *, int);
-typedef int (*dyn_lock_add_lock_cb) (int *, int, int, const char *, int);
-typedef struct CRYPTO_dynlock_value *(*dyn_dynlock_create_cb) (const char *,
-                                                               int);
-typedef void (*dyn_dynlock_lock_cb) (int, struct CRYPTO_dynlock_value *,
-                                     const char *, int);
-typedef void (*dyn_dynlock_destroy_cb) (struct CRYPTO_dynlock_value *,
-                                        const char *, int);
-typedef struct st_dynamic_LOCK_fns {
-    dyn_lock_locking_cb lock_locking_cb;
-    dyn_lock_add_lock_cb lock_add_lock_cb;
-    dyn_dynlock_create_cb dynlock_create_cb;
-    dyn_dynlock_lock_cb dynlock_lock_cb;
-    dyn_dynlock_destroy_cb dynlock_destroy_cb;
-} dynamic_LOCK_fns;
-/* The top-level structure */
-typedef struct st_dynamic_fns {
-    void *static_state;
-    const ERR_FNS *err_fns;
-    const CRYPTO_EX_DATA_IMPL *ex_data_fns;
-    dynamic_MEM_fns mem_fns;
-    dynamic_LOCK_fns lock_fns;
-} dynamic_fns;
-
-/*
- * The version checking function should be of this prototype. NB: The
- * ossl_version value passed in is the OSSL_DYNAMIC_VERSION of the loading
- * code. If this function returns zero, it indicates a (potential) version
- * incompatibility and the loaded library doesn't believe it can proceed.
- * Otherwise, the returned value is the (latest) version supported by the
- * loading library. The loader may still decide that the loaded code's
- * version is unsatisfactory and could veto the load. The function is
- * expected to be implemented with the symbol name "v_check", and a default
- * implementation can be fully instantiated with
- * IMPLEMENT_DYNAMIC_CHECK_FN().
- */
-typedef unsigned long (*dynamic_v_check_fn) (unsigned long ossl_version);
-# define IMPLEMENT_DYNAMIC_CHECK_FN() \
-        OPENSSL_EXPORT unsigned long v_check(unsigned long v); \
-        OPENSSL_EXPORT unsigned long v_check(unsigned long v) { \
-                if(v >= OSSL_DYNAMIC_OLDEST) return OSSL_DYNAMIC_VERSION; \
-                return 0; }
-
-/*
- * This function is passed the ENGINE structure to initialise with its own
- * function and command settings. It should not adjust the structural or
- * functional reference counts. If this function returns zero, (a) the load
- * will be aborted, (b) the previous ENGINE state will be memcpy'd back onto
- * the structure, and (c) the shared library will be unloaded. So
- * implementations should do their own internal cleanup in failure
- * circumstances otherwise they could leak. The 'id' parameter, if non-NULL,
- * represents the ENGINE id that the loader is looking for. If this is NULL,
- * the shared library can choose to return failure or to initialise a
- * 'default' ENGINE. If non-NULL, the shared library must initialise only an
- * ENGINE matching the passed 'id'. The function is expected to be
- * implemented with the symbol name "bind_engine". A standard implementation
- * can be instantiated with IMPLEMENT_DYNAMIC_BIND_FN(fn) where the parameter
- * 'fn' is a callback function that populates the ENGINE structure and
- * returns an int value (zero for failure). 'fn' should have prototype;
- * [static] int fn(ENGINE *e, const char *id);
- */
-typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id,
-                                    const dynamic_fns *fns);
-# define IMPLEMENT_DYNAMIC_BIND_FN(fn) \
-        OPENSSL_EXPORT \
-        int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns); \
-        OPENSSL_EXPORT \
-        int bind_engine(ENGINE *e, const char *id, const dynamic_fns *fns) { \
-                if(ENGINE_get_static_state() == fns->static_state) goto skip_cbs; \
-                if(!CRYPTO_set_mem_functions(fns->mem_fns.malloc_cb, \
-                        fns->mem_fns.realloc_cb, fns->mem_fns.free_cb)) \
-                        return 0; \
-                CRYPTO_set_locking_callback(fns->lock_fns.lock_locking_cb); \
-                CRYPTO_set_add_lock_callback(fns->lock_fns.lock_add_lock_cb); \
-                CRYPTO_set_dynlock_create_callback(fns->lock_fns.dynlock_create_cb); \
-                CRYPTO_set_dynlock_lock_callback(fns->lock_fns.dynlock_lock_cb); \
-                CRYPTO_set_dynlock_destroy_callback(fns->lock_fns.dynlock_destroy_cb); \
-                if(!CRYPTO_set_ex_data_implementation(fns->ex_data_fns)) \
-                        return 0; \
-                if(!ERR_set_implementation(fns->err_fns)) return 0; \
-        skip_cbs: \
-                if(!fn(e,id)) return 0; \
-                return 1; }
-
-/*
- * If the loading application (or library) and the loaded ENGINE library
- * share the same static data (eg. they're both dynamically linked to the
- * same libcrypto.so) we need a way to avoid trying to set system callbacks -
- * this would fail, and for the same reason that it's unnecessary to try. If
- * the loaded ENGINE has (or gets from through the loader) its own copy of
- * the libcrypto static data, we will need to set the callbacks. The easiest
- * way to detect this is to have a function that returns a pointer to some
- * static data and let the loading application and loaded ENGINE compare
- * their respective values.
- */
-void *ENGINE_get_static_state(void);
-
-# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
-void ENGINE_setup_bsd_cryptodev(void);
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_ENGINE_strings(void);
-
-/* Error codes for the ENGINE functions. */
-
-/* Function codes. */
-# define ENGINE_F_DYNAMIC_CTRL                            180
-# define ENGINE_F_DYNAMIC_GET_DATA_CTX                    181
-# define ENGINE_F_DYNAMIC_LOAD                            182
-# define ENGINE_F_DYNAMIC_SET_DATA_CTX                    183
-# define ENGINE_F_ENGINE_ADD                              105
-# define ENGINE_F_ENGINE_BY_ID                            106
-# define ENGINE_F_ENGINE_CMD_IS_EXECUTABLE                170
-# define ENGINE_F_ENGINE_CTRL                             142
-# define ENGINE_F_ENGINE_CTRL_CMD                         178
-# define ENGINE_F_ENGINE_CTRL_CMD_STRING                  171
-# define ENGINE_F_ENGINE_FINISH                           107
-# define ENGINE_F_ENGINE_FREE_UTIL                        108
-# define ENGINE_F_ENGINE_GET_CIPHER                       185
-# define ENGINE_F_ENGINE_GET_DEFAULT_TYPE                 177
-# define ENGINE_F_ENGINE_GET_DIGEST                       186
-# define ENGINE_F_ENGINE_GET_NEXT                         115
-# define ENGINE_F_ENGINE_GET_PKEY_ASN1_METH               193
-# define ENGINE_F_ENGINE_GET_PKEY_METH                    192
-# define ENGINE_F_ENGINE_GET_PREV                         116
-# define ENGINE_F_ENGINE_INIT                             119
-# define ENGINE_F_ENGINE_LIST_ADD                         120
-# define ENGINE_F_ENGINE_LIST_REMOVE                      121
-# define ENGINE_F_ENGINE_LOAD_PRIVATE_KEY                 150
-# define ENGINE_F_ENGINE_LOAD_PUBLIC_KEY                  151
-# define ENGINE_F_ENGINE_LOAD_SSL_CLIENT_CERT             194
-# define ENGINE_F_ENGINE_NEW                              122
-# define ENGINE_F_ENGINE_REMOVE                           123
-# define ENGINE_F_ENGINE_SET_DEFAULT_STRING               189
-# define ENGINE_F_ENGINE_SET_DEFAULT_TYPE                 126
-# define ENGINE_F_ENGINE_SET_ID                           129
-# define ENGINE_F_ENGINE_SET_NAME                         130
-# define ENGINE_F_ENGINE_TABLE_REGISTER                   184
-# define ENGINE_F_ENGINE_UNLOAD_KEY                       152
-# define ENGINE_F_ENGINE_UNLOCKED_FINISH                  191
-# define ENGINE_F_ENGINE_UP_REF                           190
-# define ENGINE_F_INT_CTRL_HELPER                         172
-# define ENGINE_F_INT_ENGINE_CONFIGURE                    188
-# define ENGINE_F_INT_ENGINE_MODULE_INIT                  187
-# define ENGINE_F_LOG_MESSAGE                             141
-
-/* Reason codes. */
-# define ENGINE_R_ALREADY_LOADED                          100
-# define ENGINE_R_ARGUMENT_IS_NOT_A_NUMBER                133
-# define ENGINE_R_CMD_NOT_EXECUTABLE                      134
-# define ENGINE_R_COMMAND_TAKES_INPUT                     135
-# define ENGINE_R_COMMAND_TAKES_NO_INPUT                  136
-# define ENGINE_R_CONFLICTING_ENGINE_ID                   103
-# define ENGINE_R_CTRL_COMMAND_NOT_IMPLEMENTED            119
-# define ENGINE_R_DH_NOT_IMPLEMENTED                      139
-# define ENGINE_R_DSA_NOT_IMPLEMENTED                     140
-# define ENGINE_R_DSO_FAILURE                             104
-# define ENGINE_R_DSO_NOT_FOUND                           132
-# define ENGINE_R_ENGINES_SECTION_ERROR                   148
-# define ENGINE_R_ENGINE_CONFIGURATION_ERROR              102
-# define ENGINE_R_ENGINE_IS_NOT_IN_LIST                   105
-# define ENGINE_R_ENGINE_SECTION_ERROR                    149
-# define ENGINE_R_FAILED_LOADING_PRIVATE_KEY              128
-# define ENGINE_R_FAILED_LOADING_PUBLIC_KEY               129
-# define ENGINE_R_FINISH_FAILED                           106
-# define ENGINE_R_GET_HANDLE_FAILED                       107
-# define ENGINE_R_ID_OR_NAME_MISSING                      108
-# define ENGINE_R_INIT_FAILED                             109
-# define ENGINE_R_INTERNAL_LIST_ERROR                     110
-# define ENGINE_R_INVALID_ARGUMENT                        143
-# define ENGINE_R_INVALID_CMD_NAME                        137
-# define ENGINE_R_INVALID_CMD_NUMBER                      138
-# define ENGINE_R_INVALID_INIT_VALUE                      151
-# define ENGINE_R_INVALID_STRING                          150
-# define ENGINE_R_NOT_INITIALISED                         117
-# define ENGINE_R_NOT_LOADED                              112
-# define ENGINE_R_NO_CONTROL_FUNCTION                     120
-# define ENGINE_R_NO_INDEX                                144
-# define ENGINE_R_NO_LOAD_FUNCTION                        125
-# define ENGINE_R_NO_REFERENCE                            130
-# define ENGINE_R_NO_SUCH_ENGINE                          116
-# define ENGINE_R_NO_UNLOAD_FUNCTION                      126
-# define ENGINE_R_PROVIDE_PARAMETERS                      113
-# define ENGINE_R_RSA_NOT_IMPLEMENTED                     141
-# define ENGINE_R_UNIMPLEMENTED_CIPHER                    146
-# define ENGINE_R_UNIMPLEMENTED_DIGEST                    147
-# define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD         101
-# define ENGINE_R_VERSION_INCOMPATIBILITY                 145
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/err.h b/include.new/openssl/err.h
deleted file mode 100644
index 585aa8b..0000000
--- a/include.new/openssl/err.h
+++ /dev/null
@@ -1,389 +0,0 @@
-/* crypto/err/err.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_ERR_H
-# define HEADER_ERR_H
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>
-#  include <stdlib.h>
-# endif
-
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# ifndef OPENSSL_NO_LHASH
-#  include <openssl/lhash.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifndef OPENSSL_NO_ERR
-#  define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,d,e)
-# else
-#  define ERR_PUT_error(a,b,c,d,e)        ERR_put_error(a,b,c,NULL,0)
-# endif
-
-# include <errno.h>
-
-# define ERR_TXT_MALLOCED        0x01
-# define ERR_TXT_STRING          0x02
-
-# define ERR_FLAG_MARK           0x01
-
-# define ERR_NUM_ERRORS  16
-typedef struct err_state_st {
-    CRYPTO_THREADID tid;
-    int err_flags[ERR_NUM_ERRORS];
-    unsigned long err_buffer[ERR_NUM_ERRORS];
-    char *err_data[ERR_NUM_ERRORS];
-    int err_data_flags[ERR_NUM_ERRORS];
-    const char *err_file[ERR_NUM_ERRORS];
-    int err_line[ERR_NUM_ERRORS];
-    int top, bottom;
-} ERR_STATE;
-
-/* library */
-# define ERR_LIB_NONE            1
-# define ERR_LIB_SYS             2
-# define ERR_LIB_BN              3
-# define ERR_LIB_RSA             4
-# define ERR_LIB_DH              5
-# define ERR_LIB_EVP             6
-# define ERR_LIB_BUF             7
-# define ERR_LIB_OBJ             8
-# define ERR_LIB_PEM             9
-# define ERR_LIB_DSA             10
-# define ERR_LIB_X509            11
-/* #define ERR_LIB_METH         12 */
-# define ERR_LIB_ASN1            13
-# define ERR_LIB_CONF            14
-# define ERR_LIB_CRYPTO          15
-# define ERR_LIB_EC              16
-# define ERR_LIB_SSL             20
-/* #define ERR_LIB_SSL23        21 */
-/* #define ERR_LIB_SSL2         22 */
-/* #define ERR_LIB_SSL3         23 */
-/* #define ERR_LIB_RSAREF       30 */
-/* #define ERR_LIB_PROXY        31 */
-# define ERR_LIB_BIO             32
-# define ERR_LIB_PKCS7           33
-# define ERR_LIB_X509V3          34
-# define ERR_LIB_PKCS12          35
-# define ERR_LIB_RAND            36
-# define ERR_LIB_DSO             37
-# define ERR_LIB_ENGINE          38
-# define ERR_LIB_OCSP            39
-# define ERR_LIB_UI              40
-# define ERR_LIB_COMP            41
-# define ERR_LIB_ECDSA           42
-# define ERR_LIB_ECDH            43
-# define ERR_LIB_STORE           44
-# define ERR_LIB_FIPS            45
-# define ERR_LIB_CMS             46
-# define ERR_LIB_TS              47
-# define ERR_LIB_HMAC            48
-# define ERR_LIB_JPAKE           49
-
-# define ERR_LIB_USER            128
-
-# define SYSerr(f,r)  ERR_PUT_error(ERR_LIB_SYS,(f),(r),__FILE__,__LINE__)
-# define BNerr(f,r)   ERR_PUT_error(ERR_LIB_BN,(f),(r),__FILE__,__LINE__)
-# define RSAerr(f,r)  ERR_PUT_error(ERR_LIB_RSA,(f),(r),__FILE__,__LINE__)
-# define DHerr(f,r)   ERR_PUT_error(ERR_LIB_DH,(f),(r),__FILE__,__LINE__)
-# define EVPerr(f,r)  ERR_PUT_error(ERR_LIB_EVP,(f),(r),__FILE__,__LINE__)
-# define BUFerr(f,r)  ERR_PUT_error(ERR_LIB_BUF,(f),(r),__FILE__,__LINE__)
-# define OBJerr(f,r)  ERR_PUT_error(ERR_LIB_OBJ,(f),(r),__FILE__,__LINE__)
-# define PEMerr(f,r)  ERR_PUT_error(ERR_LIB_PEM,(f),(r),__FILE__,__LINE__)
-# define DSAerr(f,r)  ERR_PUT_error(ERR_LIB_DSA,(f),(r),__FILE__,__LINE__)
-# define X509err(f,r) ERR_PUT_error(ERR_LIB_X509,(f),(r),__FILE__,__LINE__)
-# define ASN1err(f,r) ERR_PUT_error(ERR_LIB_ASN1,(f),(r),__FILE__,__LINE__)
-# define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__)
-# define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__)
-# define ECerr(f,r)   ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__)
-# define SSLerr(f,r)  ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)
-# define BIOerr(f,r)  ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__)
-# define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__)
-# define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__)
-# define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),__FILE__,__LINE__)
-# define RANDerr(f,r) ERR_PUT_error(ERR_LIB_RAND,(f),(r),__FILE__,__LINE__)
-# define DSOerr(f,r) ERR_PUT_error(ERR_LIB_DSO,(f),(r),__FILE__,__LINE__)
-# define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__)
-# define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__)
-# define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__)
-# define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__)
-# define ECDSAerr(f,r)  ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)
-# define ECDHerr(f,r)  ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)
-# define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)
-# define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)
-# define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
-# define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)
-# define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
-# define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)
-
-/*
- * Borland C seems too stupid to be able to shift and do longs in the
- * pre-processor :-(
- */
-# define ERR_PACK(l,f,r)         (((((unsigned long)l)&0xffL)*0x1000000)| \
-                                ((((unsigned long)f)&0xfffL)*0x1000)| \
-                                ((((unsigned long)r)&0xfffL)))
-# define ERR_GET_LIB(l)          (int)((((unsigned long)l)>>24L)&0xffL)
-# define ERR_GET_FUNC(l)         (int)((((unsigned long)l)>>12L)&0xfffL)
-# define ERR_GET_REASON(l)       (int)((l)&0xfffL)
-# define ERR_FATAL_ERROR(l)      (int)((l)&ERR_R_FATAL)
-
-/* OS functions */
-# define SYS_F_FOPEN             1
-# define SYS_F_CONNECT           2
-# define SYS_F_GETSERVBYNAME     3
-# define SYS_F_SOCKET            4
-# define SYS_F_IOCTLSOCKET       5
-# define SYS_F_BIND              6
-# define SYS_F_LISTEN            7
-# define SYS_F_ACCEPT            8
-# define SYS_F_WSASTARTUP        9/* Winsock stuff */
-# define SYS_F_OPENDIR           10
-# define SYS_F_FREAD             11
-
-/* reasons */
-# define ERR_R_SYS_LIB   ERR_LIB_SYS/* 2 */
-# define ERR_R_BN_LIB    ERR_LIB_BN/* 3 */
-# define ERR_R_RSA_LIB   ERR_LIB_RSA/* 4 */
-# define ERR_R_DH_LIB    ERR_LIB_DH/* 5 */
-# define ERR_R_EVP_LIB   ERR_LIB_EVP/* 6 */
-# define ERR_R_BUF_LIB   ERR_LIB_BUF/* 7 */
-# define ERR_R_OBJ_LIB   ERR_LIB_OBJ/* 8 */
-# define ERR_R_PEM_LIB   ERR_LIB_PEM/* 9 */
-# define ERR_R_DSA_LIB   ERR_LIB_DSA/* 10 */
-# define ERR_R_X509_LIB  ERR_LIB_X509/* 11 */
-# define ERR_R_ASN1_LIB  ERR_LIB_ASN1/* 13 */
-# define ERR_R_CONF_LIB  ERR_LIB_CONF/* 14 */
-# define ERR_R_CRYPTO_LIB ERR_LIB_CRYPTO/* 15 */
-# define ERR_R_EC_LIB    ERR_LIB_EC/* 16 */
-# define ERR_R_SSL_LIB   ERR_LIB_SSL/* 20 */
-# define ERR_R_BIO_LIB   ERR_LIB_BIO/* 32 */
-# define ERR_R_PKCS7_LIB ERR_LIB_PKCS7/* 33 */
-# define ERR_R_X509V3_LIB ERR_LIB_X509V3/* 34 */
-# define ERR_R_PKCS12_LIB ERR_LIB_PKCS12/* 35 */
-# define ERR_R_RAND_LIB  ERR_LIB_RAND/* 36 */
-# define ERR_R_DSO_LIB   ERR_LIB_DSO/* 37 */
-# define ERR_R_ENGINE_LIB ERR_LIB_ENGINE/* 38 */
-# define ERR_R_OCSP_LIB  ERR_LIB_OCSP/* 39 */
-# define ERR_R_UI_LIB    ERR_LIB_UI/* 40 */
-# define ERR_R_COMP_LIB  ERR_LIB_COMP/* 41 */
-# define ERR_R_ECDSA_LIB ERR_LIB_ECDSA/* 42 */
-# define ERR_R_ECDH_LIB  ERR_LIB_ECDH/* 43 */
-# define ERR_R_STORE_LIB ERR_LIB_STORE/* 44 */
-# define ERR_R_TS_LIB    ERR_LIB_TS/* 45 */
-
-# define ERR_R_NESTED_ASN1_ERROR                 58
-# define ERR_R_BAD_ASN1_OBJECT_HEADER            59
-# define ERR_R_BAD_GET_ASN1_OBJECT_CALL          60
-# define ERR_R_EXPECTING_AN_ASN1_SEQUENCE        61
-# define ERR_R_ASN1_LENGTH_MISMATCH              62
-# define ERR_R_MISSING_ASN1_EOS                  63
-
-/* fatal error */
-# define ERR_R_FATAL                             64
-# define ERR_R_MALLOC_FAILURE                    (1|ERR_R_FATAL)
-# define ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED       (2|ERR_R_FATAL)
-# define ERR_R_PASSED_NULL_PARAMETER             (3|ERR_R_FATAL)
-# define ERR_R_INTERNAL_ERROR                    (4|ERR_R_FATAL)
-# define ERR_R_DISABLED                          (5|ERR_R_FATAL)
-
-/*
- * 99 is the maximum possible ERR_R_... code, higher values are reserved for
- * the individual libraries
- */
-
-typedef struct ERR_string_data_st {
-    unsigned long error;
-    const char *string;
-} ERR_STRING_DATA;
-
-void ERR_put_error(int lib, int func, int reason, const char *file, int line);
-void ERR_set_error_data(char *data, int flags);
-
-unsigned long ERR_get_error(void);
-unsigned long ERR_get_error_line(const char **file, int *line);
-unsigned long ERR_get_error_line_data(const char **file, int *line,
-                                      const char **data, int *flags);
-unsigned long ERR_peek_error(void);
-unsigned long ERR_peek_error_line(const char **file, int *line);
-unsigned long ERR_peek_error_line_data(const char **file, int *line,
-                                       const char **data, int *flags);
-unsigned long ERR_peek_last_error(void);
-unsigned long ERR_peek_last_error_line(const char **file, int *line);
-unsigned long ERR_peek_last_error_line_data(const char **file, int *line,
-                                            const char **data, int *flags);
-void ERR_clear_error(void);
-char *ERR_error_string(unsigned long e, char *buf);
-void ERR_error_string_n(unsigned long e, char *buf, size_t len);
-const char *ERR_lib_error_string(unsigned long e);
-const char *ERR_func_error_string(unsigned long e);
-const char *ERR_reason_error_string(unsigned long e);
-void ERR_print_errors_cb(int (*cb) (const char *str, size_t len, void *u),
-                         void *u);
-# ifndef OPENSSL_NO_FP_API
-void ERR_print_errors_fp(FILE *fp);
-# endif
-# ifndef OPENSSL_NO_BIO
-void ERR_print_errors(BIO *bp);
-# endif
-void ERR_add_error_data(int num, ...);
-void ERR_add_error_vdata(int num, va_list args);
-void ERR_load_strings(int lib, ERR_STRING_DATA str[]);
-void ERR_unload_strings(int lib, ERR_STRING_DATA str[]);
-void ERR_load_ERR_strings(void);
-void ERR_load_crypto_strings(void);
-void ERR_free_strings(void);
-
-void ERR_remove_thread_state(const CRYPTO_THREADID *tid);
-# ifndef OPENSSL_NO_DEPRECATED
-void ERR_remove_state(unsigned long pid); /* if zero we look it up */
-# endif
-ERR_STATE *ERR_get_state(void);
-
-# ifndef OPENSSL_NO_LHASH
-LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void);
-LHASH_OF(ERR_STATE) *ERR_get_err_state_table(void);
-void ERR_release_err_state_table(LHASH_OF(ERR_STATE) **hash);
-# endif
-
-int ERR_get_next_error_library(void);
-
-int ERR_set_mark(void);
-int ERR_pop_to_mark(void);
-
-/* Already defined in ossl_typ.h */
-/* typedef struct st_ERR_FNS ERR_FNS; */
-/*
- * An application can use this function and provide the return value to
- * loaded modules that should use the application's ERR state/functionality
- */
-const ERR_FNS *ERR_get_implementation(void);
-/*
- * A loaded module should call this function prior to any ERR operations
- * using the application's "ERR_FNS".
- */
-int ERR_set_implementation(const ERR_FNS *fns);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/evp.h b/include.new/openssl/evp.h
deleted file mode 100644
index 6cf98ac..0000000
--- a/include.new/openssl/evp.h
+++ /dev/null
@@ -1,1480 +0,0 @@
-/* crypto/evp/evp.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_ENVELOPE_H
-# define HEADER_ENVELOPE_H
-
-# ifdef OPENSSL_ALGORITHM_DEFINES
-#  include <openssl/opensslconf.h>
-# else
-#  define OPENSSL_ALGORITHM_DEFINES
-#  include <openssl/opensslconf.h>
-#  undef OPENSSL_ALGORITHM_DEFINES
-# endif
-
-# include <openssl/ossl_typ.h>
-
-# include <openssl/symhacks.h>
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-
-/*-
-#define EVP_RC2_KEY_SIZE                16
-#define EVP_RC4_KEY_SIZE                16
-#define EVP_BLOWFISH_KEY_SIZE           16
-#define EVP_CAST5_KEY_SIZE              16
-#define EVP_RC5_32_12_16_KEY_SIZE       16
-*/
-# define EVP_MAX_MD_SIZE                 64/* longest known is SHA512 */
-# define EVP_MAX_KEY_LENGTH              64
-# define EVP_MAX_IV_LENGTH               16
-# define EVP_MAX_BLOCK_LENGTH            32
-
-# define PKCS5_SALT_LEN                  8
-/* Default PKCS#5 iteration count */
-# define PKCS5_DEFAULT_ITER              2048
-
-# include <openssl/objects.h>
-
-# define EVP_PK_RSA      0x0001
-# define EVP_PK_DSA      0x0002
-# define EVP_PK_DH       0x0004
-# define EVP_PK_EC       0x0008
-# define EVP_PKT_SIGN    0x0010
-# define EVP_PKT_ENC     0x0020
-# define EVP_PKT_EXCH    0x0040
-# define EVP_PKS_RSA     0x0100
-# define EVP_PKS_DSA     0x0200
-# define EVP_PKS_EC      0x0400
-
-# define EVP_PKEY_NONE   NID_undef
-# define EVP_PKEY_RSA    NID_rsaEncryption
-# define EVP_PKEY_RSA2   NID_rsa
-# define EVP_PKEY_DSA    NID_dsa
-# define EVP_PKEY_DSA1   NID_dsa_2
-# define EVP_PKEY_DSA2   NID_dsaWithSHA
-# define EVP_PKEY_DSA3   NID_dsaWithSHA1
-# define EVP_PKEY_DSA4   NID_dsaWithSHA1_2
-# define EVP_PKEY_DH     NID_dhKeyAgreement
-# define EVP_PKEY_EC     NID_X9_62_id_ecPublicKey
-# define EVP_PKEY_HMAC   NID_hmac
-# define EVP_PKEY_CMAC   NID_cmac
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * Type needs to be a bit field Sub-type needs to be for variations on the
- * method, as in, can it do arbitrary encryption....
- */
-struct evp_pkey_st {
-    int type;
-    int save_type;
-    int references;
-    const EVP_PKEY_ASN1_METHOD *ameth;
-    ENGINE *engine;
-    union {
-        char *ptr;
-# ifndef OPENSSL_NO_RSA
-        struct rsa_st *rsa;     /* RSA */
-# endif
-# ifndef OPENSSL_NO_DSA
-        struct dsa_st *dsa;     /* DSA */
-# endif
-# ifndef OPENSSL_NO_DH
-        struct dh_st *dh;       /* DH */
-# endif
-# ifndef OPENSSL_NO_EC
-        struct ec_key_st *ec;   /* ECC */
-# endif
-    } pkey;
-    int save_parameters;
-    STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-} /* EVP_PKEY */ ;
-
-# define EVP_PKEY_MO_SIGN        0x0001
-# define EVP_PKEY_MO_VERIFY      0x0002
-# define EVP_PKEY_MO_ENCRYPT     0x0004
-# define EVP_PKEY_MO_DECRYPT     0x0008
-
-# ifndef EVP_MD
-struct env_md_st {
-    int type;
-    int pkey_type;
-    int md_size;
-    unsigned long flags;
-    int (*init) (EVP_MD_CTX *ctx);
-    int (*update) (EVP_MD_CTX *ctx, const void *data, size_t count);
-    int (*final) (EVP_MD_CTX *ctx, unsigned char *md);
-    int (*copy) (EVP_MD_CTX *to, const EVP_MD_CTX *from);
-    int (*cleanup) (EVP_MD_CTX *ctx);
-    /* FIXME: prototype these some day */
-    int (*sign) (int type, const unsigned char *m, unsigned int m_length,
-                 unsigned char *sigret, unsigned int *siglen, void *key);
-    int (*verify) (int type, const unsigned char *m, unsigned int m_length,
-                   const unsigned char *sigbuf, unsigned int siglen,
-                   void *key);
-    int required_pkey_type[5];  /* EVP_PKEY_xxx */
-    int block_size;
-    int ctx_size;               /* how big does the ctx->md_data need to be */
-    /* control function */
-    int (*md_ctrl) (EVP_MD_CTX *ctx, int cmd, int p1, void *p2);
-} /* EVP_MD */ ;
-
-typedef int evp_sign_method(int type, const unsigned char *m,
-                            unsigned int m_length, unsigned char *sigret,
-                            unsigned int *siglen, void *key);
-typedef int evp_verify_method(int type, const unsigned char *m,
-                              unsigned int m_length,
-                              const unsigned char *sigbuf,
-                              unsigned int siglen, void *key);
-
-/* digest can only handle a single block */
-#  define EVP_MD_FLAG_ONESHOT     0x0001
-
-/*
- * digest is a "clone" digest used
- * which is a copy of an existing
- * one for a specific public key type.
- * EVP_dss1() etc
- */
-#  define EVP_MD_FLAG_PKEY_DIGEST 0x0002
-
-/* Digest uses EVP_PKEY_METHOD for signing instead of MD specific signing */
-
-#  define EVP_MD_FLAG_PKEY_METHOD_SIGNATURE       0x0004
-
-/* DigestAlgorithmIdentifier flags... */
-
-#  define EVP_MD_FLAG_DIGALGID_MASK               0x0018
-
-/* NULL or absent parameter accepted. Use NULL */
-
-#  define EVP_MD_FLAG_DIGALGID_NULL               0x0000
-
-/* NULL or absent parameter accepted. Use NULL for PKCS#1 otherwise absent */
-
-#  define EVP_MD_FLAG_DIGALGID_ABSENT             0x0008
-
-/* Custom handling via ctrl */
-
-#  define EVP_MD_FLAG_DIGALGID_CUSTOM             0x0018
-
-/* Note if suitable for use in FIPS mode */
-#  define EVP_MD_FLAG_FIPS        0x0400
-
-/* Digest ctrls */
-
-#  define EVP_MD_CTRL_DIGALGID                    0x1
-#  define EVP_MD_CTRL_MICALG                      0x2
-
-/* Minimum Algorithm specific ctrl value */
-
-#  define EVP_MD_CTRL_ALG_CTRL                    0x1000
-
-#  define EVP_PKEY_NULL_method    NULL,NULL,{0,0,0,0}
-
-#  ifndef OPENSSL_NO_DSA
-#   define EVP_PKEY_DSA_method     (evp_sign_method *)DSA_sign, \
-                                (evp_verify_method *)DSA_verify, \
-                                {EVP_PKEY_DSA,EVP_PKEY_DSA2,EVP_PKEY_DSA3, \
-                                        EVP_PKEY_DSA4,0}
-#  else
-#   define EVP_PKEY_DSA_method     EVP_PKEY_NULL_method
-#  endif
-
-#  ifndef OPENSSL_NO_ECDSA
-#   define EVP_PKEY_ECDSA_method   (evp_sign_method *)ECDSA_sign, \
-                                (evp_verify_method *)ECDSA_verify, \
-                                 {EVP_PKEY_EC,0,0,0}
-#  else
-#   define EVP_PKEY_ECDSA_method   EVP_PKEY_NULL_method
-#  endif
-
-#  ifndef OPENSSL_NO_RSA
-#   define EVP_PKEY_RSA_method     (evp_sign_method *)RSA_sign, \
-                                (evp_verify_method *)RSA_verify, \
-                                {EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#   define EVP_PKEY_RSA_ASN1_OCTET_STRING_method \
-                                (evp_sign_method *)RSA_sign_ASN1_OCTET_STRING, \
-                                (evp_verify_method *)RSA_verify_ASN1_OCTET_STRING, \
-                                {EVP_PKEY_RSA,EVP_PKEY_RSA2,0,0}
-#  else
-#   define EVP_PKEY_RSA_method     EVP_PKEY_NULL_method
-#   define EVP_PKEY_RSA_ASN1_OCTET_STRING_method EVP_PKEY_NULL_method
-#  endif
-
-# endif                         /* !EVP_MD */
-
-struct env_md_ctx_st {
-    const EVP_MD *digest;
-    ENGINE *engine;             /* functional reference if 'digest' is
-                                 * ENGINE-provided */
-    unsigned long flags;
-    void *md_data;
-    /* Public key context for sign/verify */
-    EVP_PKEY_CTX *pctx;
-    /* Update function: usually copied from EVP_MD */
-    int (*update) (EVP_MD_CTX *ctx, const void *data, size_t count);
-} /* EVP_MD_CTX */ ;
-
-/* values for EVP_MD_CTX flags */
-
-# define EVP_MD_CTX_FLAG_ONESHOT         0x0001/* digest update will be
-                                                * called once only */
-# define EVP_MD_CTX_FLAG_CLEANED         0x0002/* context has already been
-                                                * cleaned */
-# define EVP_MD_CTX_FLAG_REUSE           0x0004/* Don't free up ctx->md_data
-                                                * in EVP_MD_CTX_cleanup */
-/*
- * FIPS and pad options are ignored in 1.0.0, definitions are here so we
- * don't accidentally reuse the values for other purposes.
- */
-
-# define EVP_MD_CTX_FLAG_NON_FIPS_ALLOW  0x0008/* Allow use of non FIPS
-                                                * digest in FIPS mode */
-
-/*
- * The following PAD options are also currently ignored in 1.0.0, digest
- * parameters are handled through EVP_DigestSign*() and EVP_DigestVerify*()
- * instead.
- */
-# define EVP_MD_CTX_FLAG_PAD_MASK        0xF0/* RSA mode to use */
-# define EVP_MD_CTX_FLAG_PAD_PKCS1       0x00/* PKCS#1 v1.5 mode */
-# define EVP_MD_CTX_FLAG_PAD_X931        0x10/* X9.31 mode */
-# define EVP_MD_CTX_FLAG_PAD_PSS         0x20/* PSS mode */
-
-# define EVP_MD_CTX_FLAG_NO_INIT         0x0100/* Don't initialize md_data */
-
-struct evp_cipher_st {
-    int nid;
-    int block_size;
-    /* Default value for variable length ciphers */
-    int key_len;
-    int iv_len;
-    /* Various flags */
-    unsigned long flags;
-    /* init key */
-    int (*init) (EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                 const unsigned char *iv, int enc);
-    /* encrypt/decrypt data */
-    int (*do_cipher) (EVP_CIPHER_CTX *ctx, unsigned char *out,
-                      const unsigned char *in, size_t inl);
-    /* cleanup ctx */
-    int (*cleanup) (EVP_CIPHER_CTX *);
-    /* how big ctx->cipher_data needs to be */
-    int ctx_size;
-    /* Populate a ASN1_TYPE with parameters */
-    int (*set_asn1_parameters) (EVP_CIPHER_CTX *, ASN1_TYPE *);
-    /* Get parameters from a ASN1_TYPE */
-    int (*get_asn1_parameters) (EVP_CIPHER_CTX *, ASN1_TYPE *);
-    /* Miscellaneous operations */
-    int (*ctrl) (EVP_CIPHER_CTX *, int type, int arg, void *ptr);
-    /* Application data */
-    void *app_data;
-} /* EVP_CIPHER */ ;
-
-/* Values for cipher flags */
-
-/* Modes for ciphers */
-
-# define         EVP_CIPH_STREAM_CIPHER          0x0
-# define         EVP_CIPH_ECB_MODE               0x1
-# define         EVP_CIPH_CBC_MODE               0x2
-# define         EVP_CIPH_CFB_MODE               0x3
-# define         EVP_CIPH_OFB_MODE               0x4
-# define         EVP_CIPH_CTR_MODE               0x5
-# define         EVP_CIPH_GCM_MODE               0x6
-# define         EVP_CIPH_CCM_MODE               0x7
-# define         EVP_CIPH_XTS_MODE               0x10001
-# define         EVP_CIPH_MODE                   0xF0007
-/* Set if variable length cipher */
-# define         EVP_CIPH_VARIABLE_LENGTH        0x8
-/* Set if the iv handling should be done by the cipher itself */
-# define         EVP_CIPH_CUSTOM_IV              0x10
-/* Set if the cipher's init() function should be called if key is NULL */
-# define         EVP_CIPH_ALWAYS_CALL_INIT       0x20
-/* Call ctrl() to init cipher parameters */
-# define         EVP_CIPH_CTRL_INIT              0x40
-/* Don't use standard key length function */
-# define         EVP_CIPH_CUSTOM_KEY_LENGTH      0x80
-/* Don't use standard block padding */
-# define         EVP_CIPH_NO_PADDING             0x100
-/* cipher handles random key generation */
-# define         EVP_CIPH_RAND_KEY               0x200
-/* cipher has its own additional copying logic */
-# define         EVP_CIPH_CUSTOM_COPY            0x400
-/* Allow use default ASN1 get/set iv */
-# define         EVP_CIPH_FLAG_DEFAULT_ASN1      0x1000
-/* Buffer length in bits not bytes: CFB1 mode only */
-# define         EVP_CIPH_FLAG_LENGTH_BITS       0x2000
-/* Note if suitable for use in FIPS mode */
-# define         EVP_CIPH_FLAG_FIPS              0x4000
-/* Allow non FIPS cipher in FIPS mode */
-# define         EVP_CIPH_FLAG_NON_FIPS_ALLOW    0x8000
-/*
- * Cipher handles any and all padding logic as well as finalisation.
- */
-# define         EVP_CIPH_FLAG_CUSTOM_CIPHER     0x100000
-# define         EVP_CIPH_FLAG_AEAD_CIPHER       0x200000
-
-/* ctrl() values */
-
-# define         EVP_CTRL_INIT                   0x0
-# define         EVP_CTRL_SET_KEY_LENGTH         0x1
-# define         EVP_CTRL_GET_RC2_KEY_BITS       0x2
-# define         EVP_CTRL_SET_RC2_KEY_BITS       0x3
-# define         EVP_CTRL_GET_RC5_ROUNDS         0x4
-# define         EVP_CTRL_SET_RC5_ROUNDS         0x5
-# define         EVP_CTRL_RAND_KEY               0x6
-# define         EVP_CTRL_PBE_PRF_NID            0x7
-# define         EVP_CTRL_COPY                   0x8
-# define         EVP_CTRL_GCM_SET_IVLEN          0x9
-# define         EVP_CTRL_GCM_GET_TAG            0x10
-# define         EVP_CTRL_GCM_SET_TAG            0x11
-# define         EVP_CTRL_GCM_SET_IV_FIXED       0x12
-# define         EVP_CTRL_GCM_IV_GEN             0x13
-# define         EVP_CTRL_CCM_SET_IVLEN          EVP_CTRL_GCM_SET_IVLEN
-# define         EVP_CTRL_CCM_GET_TAG            EVP_CTRL_GCM_GET_TAG
-# define         EVP_CTRL_CCM_SET_TAG            EVP_CTRL_GCM_SET_TAG
-# define         EVP_CTRL_CCM_SET_L              0x14
-# define         EVP_CTRL_CCM_SET_MSGLEN         0x15
-/*
- * AEAD cipher deduces payload length and returns number of bytes required to
- * store MAC and eventual padding. Subsequent call to EVP_Cipher even
- * appends/verifies MAC.
- */
-# define         EVP_CTRL_AEAD_TLS1_AAD          0x16
-/* Used by composite AEAD ciphers, no-op in GCM, CCM... */
-# define         EVP_CTRL_AEAD_SET_MAC_KEY       0x17
-/* Set the GCM invocation field, decrypt only */
-# define         EVP_CTRL_GCM_SET_IV_INV         0x18
-
-/* RFC 5246 defines additional data to be 13 bytes in length */
-# define         EVP_AEAD_TLS1_AAD_LEN           13
-
-/* GCM TLS constants */
-/* Length of fixed part of IV derived from PRF */
-# define EVP_GCM_TLS_FIXED_IV_LEN                        4
-/* Length of explicit part of IV part of TLS records */
-# define EVP_GCM_TLS_EXPLICIT_IV_LEN                     8
-/* Length of tag for TLS */
-# define EVP_GCM_TLS_TAG_LEN                             16
-
-typedef struct evp_cipher_info_st {
-    const EVP_CIPHER *cipher;
-    unsigned char iv[EVP_MAX_IV_LENGTH];
-} EVP_CIPHER_INFO;
-
-struct evp_cipher_ctx_st {
-    const EVP_CIPHER *cipher;
-    ENGINE *engine;             /* functional reference if 'cipher' is
-                                 * ENGINE-provided */
-    int encrypt;                /* encrypt or decrypt */
-    int buf_len;                /* number we have left */
-    unsigned char oiv[EVP_MAX_IV_LENGTH]; /* original iv */
-    unsigned char iv[EVP_MAX_IV_LENGTH]; /* working iv */
-    unsigned char buf[EVP_MAX_BLOCK_LENGTH]; /* saved partial block */
-    int num;                    /* used by cfb/ofb/ctr mode */
-    void *app_data;             /* application stuff */
-    int key_len;                /* May change for variable length cipher */
-    unsigned long flags;        /* Various flags */
-    void *cipher_data;          /* per EVP data */
-    int final_used;
-    int block_mask;
-    unsigned char final[EVP_MAX_BLOCK_LENGTH]; /* possible final block */
-} /* EVP_CIPHER_CTX */ ;
-
-typedef struct evp_Encode_Ctx_st {
-    /* number saved in a partial encode/decode */
-    int num;
-    /*
-     * The length is either the output line length (in input bytes) or the
-     * shortest input line length that is ok.  Once decoding begins, the
-     * length is adjusted up each time a longer line is decoded
-     */
-    int length;
-    /* data to encode */
-    unsigned char enc_data[80];
-    /* number read on current line */
-    int line_num;
-    int expect_nl;
-} EVP_ENCODE_CTX;
-
-/* Password based encryption function */
-typedef int (EVP_PBE_KEYGEN) (EVP_CIPHER_CTX *ctx, const char *pass,
-                              int passlen, ASN1_TYPE *param,
-                              const EVP_CIPHER *cipher, const EVP_MD *md,
-                              int en_de);
-
-# ifndef OPENSSL_NO_RSA
-#  define EVP_PKEY_assign_RSA(pkey,rsa) EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
-                                        (char *)(rsa))
-# endif
-
-# ifndef OPENSSL_NO_DSA
-#  define EVP_PKEY_assign_DSA(pkey,dsa) EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
-                                        (char *)(dsa))
-# endif
-
-# ifndef OPENSSL_NO_DH
-#  define EVP_PKEY_assign_DH(pkey,dh) EVP_PKEY_assign((pkey),EVP_PKEY_DH,\
-                                        (char *)(dh))
-# endif
-
-# ifndef OPENSSL_NO_EC
-#  define EVP_PKEY_assign_EC_KEY(pkey,eckey) EVP_PKEY_assign((pkey),EVP_PKEY_EC,\
-                                        (char *)(eckey))
-# endif
-
-/* Add some extra combinations */
-# define EVP_get_digestbynid(a) EVP_get_digestbyname(OBJ_nid2sn(a))
-# define EVP_get_digestbyobj(a) EVP_get_digestbynid(OBJ_obj2nid(a))
-# define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
-# define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
-
-int EVP_MD_type(const EVP_MD *md);
-# define EVP_MD_nid(e)                   EVP_MD_type(e)
-# define EVP_MD_name(e)                  OBJ_nid2sn(EVP_MD_nid(e))
-int EVP_MD_pkey_type(const EVP_MD *md);
-int EVP_MD_size(const EVP_MD *md);
-int EVP_MD_block_size(const EVP_MD *md);
-unsigned long EVP_MD_flags(const EVP_MD *md);
-
-const EVP_MD *EVP_MD_CTX_md(const EVP_MD_CTX *ctx);
-# define EVP_MD_CTX_size(e)              EVP_MD_size(EVP_MD_CTX_md(e))
-# define EVP_MD_CTX_block_size(e)        EVP_MD_block_size(EVP_MD_CTX_md(e))
-# define EVP_MD_CTX_type(e)              EVP_MD_type(EVP_MD_CTX_md(e))
-
-int EVP_CIPHER_nid(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_name(e)              OBJ_nid2sn(EVP_CIPHER_nid(e))
-int EVP_CIPHER_block_size(const EVP_CIPHER *cipher);
-int EVP_CIPHER_key_length(const EVP_CIPHER *cipher);
-int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher);
-unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher);
-# define EVP_CIPHER_mode(e)              (EVP_CIPHER_flags(e) & EVP_CIPH_MODE)
-
-const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);
-int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in);
-void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
-void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
-# define EVP_CIPHER_CTX_type(c)         EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
-unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx);
-# define EVP_CIPHER_CTX_mode(e)          (EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE)
-
-# define EVP_ENCODE_LENGTH(l)    (((l+2)/3*4)+(l/48+1)*2+80)
-# define EVP_DECODE_LENGTH(l)    ((l+3)/4*3+80)
-
-# define EVP_SignInit_ex(a,b,c)          EVP_DigestInit_ex(a,b,c)
-# define EVP_SignInit(a,b)               EVP_DigestInit(a,b)
-# define EVP_SignUpdate(a,b,c)           EVP_DigestUpdate(a,b,c)
-# define EVP_VerifyInit_ex(a,b,c)        EVP_DigestInit_ex(a,b,c)
-# define EVP_VerifyInit(a,b)             EVP_DigestInit(a,b)
-# define EVP_VerifyUpdate(a,b,c)         EVP_DigestUpdate(a,b,c)
-# define EVP_OpenUpdate(a,b,c,d,e)       EVP_DecryptUpdate(a,b,c,d,e)
-# define EVP_SealUpdate(a,b,c,d,e)       EVP_EncryptUpdate(a,b,c,d,e)
-# define EVP_DigestSignUpdate(a,b,c)     EVP_DigestUpdate(a,b,c)
-# define EVP_DigestVerifyUpdate(a,b,c)   EVP_DigestUpdate(a,b,c)
-
-# ifdef CONST_STRICT
-void BIO_set_md(BIO *, const EVP_MD *md);
-# else
-#  define BIO_set_md(b,md)               BIO_ctrl(b,BIO_C_SET_MD,0,(char *)md)
-# endif
-# define BIO_get_md(b,mdp)               BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp)
-# define BIO_get_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp)
-# define BIO_set_md_ctx(b,mdcp)     BIO_ctrl(b,BIO_C_SET_MD_CTX,0,(char *)mdcp)
-# define BIO_get_cipher_status(b)        BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)
-# define BIO_get_cipher_ctx(b,c_pp)      BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp)
-
-int EVP_Cipher(EVP_CIPHER_CTX *c,
-               unsigned char *out, const unsigned char *in, unsigned int inl);
-
-# define EVP_add_cipher_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n))
-# define EVP_add_digest_alias(n,alias) \
-        OBJ_NAME_add((alias),OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,(n))
-# define EVP_delete_cipher_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS);
-# define EVP_delete_digest_alias(alias) \
-        OBJ_NAME_remove(alias,OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS);
-
-void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-EVP_MD_CTX *EVP_MD_CTX_create(void);
-void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out, const EVP_MD_CTX *in);
-void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags);
-void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags);
-int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx, int flags);
-int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);
-int EVP_DigestUpdate(EVP_MD_CTX *ctx, const void *d, size_t cnt);
-int EVP_DigestFinal_ex(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s);
-int EVP_Digest(const void *data, size_t count,
-               unsigned char *md, unsigned int *size, const EVP_MD *type,
-               ENGINE *impl);
-
-int EVP_MD_CTX_copy(EVP_MD_CTX *out, const EVP_MD_CTX *in);
-int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type);
-int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s);
-
-int EVP_read_pw_string(char *buf, int length, const char *prompt, int verify);
-int EVP_read_pw_string_min(char *buf, int minlen, int maxlen,
-                           const char *prompt, int verify);
-void EVP_set_pw_prompt(const char *prompt);
-char *EVP_get_pw_prompt(void);
-
-int EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
-                   const unsigned char *salt, const unsigned char *data,
-                   int datal, int count, unsigned char *key,
-                   unsigned char *iv);
-
-void EVP_CIPHER_CTX_set_flags(EVP_CIPHER_CTX *ctx, int flags);
-void EVP_CIPHER_CTX_clear_flags(EVP_CIPHER_CTX *ctx, int flags);
-int EVP_CIPHER_CTX_test_flags(const EVP_CIPHER_CTX *ctx, int flags);
-
-int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                    const unsigned char *key, const unsigned char *iv);
-int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                       ENGINE *impl, const unsigned char *key,
-                       const unsigned char *iv);
-int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-                      const unsigned char *in, int inl);
-int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                    const unsigned char *key, const unsigned char *iv);
-int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                       ENGINE *impl, const unsigned char *key,
-                       const unsigned char *iv);
-int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-                      const unsigned char *in, int inl);
-int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                   const unsigned char *key, const unsigned char *iv,
-                   int enc);
-int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher,
-                      ENGINE *impl, const unsigned char *key,
-                      const unsigned char *iv, int enc);
-int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl);
-int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
-
-int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s,
-                  EVP_PKEY *pkey);
-
-int EVP_VerifyFinal(EVP_MD_CTX *ctx, const unsigned char *sigbuf,
-                    unsigned int siglen, EVP_PKEY *pkey);
-
-int EVP_DigestSignInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                       const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey);
-int EVP_DigestSignFinal(EVP_MD_CTX *ctx,
-                        unsigned char *sigret, size_t *siglen);
-
-int EVP_DigestVerifyInit(EVP_MD_CTX *ctx, EVP_PKEY_CTX **pctx,
-                         const EVP_MD *type, ENGINE *e, EVP_PKEY *pkey);
-int EVP_DigestVerifyFinal(EVP_MD_CTX *ctx, unsigned char *sig, size_t siglen);
-
-int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-                 const unsigned char *ek, int ekl, const unsigned char *iv,
-                 EVP_PKEY *priv);
-int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-                 unsigned char **ek, int *ekl, unsigned char *iv,
-                 EVP_PKEY **pubk, int npubk);
-int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
-
-void EVP_EncodeInit(EVP_ENCODE_CTX *ctx);
-void EVP_EncodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-                      const unsigned char *in, int inl);
-void EVP_EncodeFinal(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl);
-int EVP_EncodeBlock(unsigned char *t, const unsigned char *f, int n);
-
-void EVP_DecodeInit(EVP_ENCODE_CTX *ctx);
-int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
-                     const unsigned char *in, int inl);
-int EVP_DecodeFinal(EVP_ENCODE_CTX *ctx, unsigned
-                    char *out, int *outl);
-int EVP_DecodeBlock(unsigned char *t, const unsigned char *f, int n);
-
-void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
-int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
-EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
-void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *a);
-int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
-int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *c, int pad);
-int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
-int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key);
-
-# ifndef OPENSSL_NO_BIO
-BIO_METHOD *BIO_f_md(void);
-BIO_METHOD *BIO_f_base64(void);
-BIO_METHOD *BIO_f_cipher(void);
-BIO_METHOD *BIO_f_reliable(void);
-void BIO_set_cipher(BIO *b, const EVP_CIPHER *c, const unsigned char *k,
-                    const unsigned char *i, int enc);
-# endif
-
-const EVP_MD *EVP_md_null(void);
-# ifndef OPENSSL_NO_MD2
-const EVP_MD *EVP_md2(void);
-# endif
-# ifndef OPENSSL_NO_MD4
-const EVP_MD *EVP_md4(void);
-# endif
-# ifndef OPENSSL_NO_MD5
-const EVP_MD *EVP_md5(void);
-# endif
-# ifndef OPENSSL_NO_SHA
-const EVP_MD *EVP_sha(void);
-const EVP_MD *EVP_sha1(void);
-const EVP_MD *EVP_dss(void);
-const EVP_MD *EVP_dss1(void);
-const EVP_MD *EVP_ecdsa(void);
-# endif
-# ifndef OPENSSL_NO_SHA256
-const EVP_MD *EVP_sha224(void);
-const EVP_MD *EVP_sha256(void);
-# endif
-# ifndef OPENSSL_NO_SHA512
-const EVP_MD *EVP_sha384(void);
-const EVP_MD *EVP_sha512(void);
-# endif
-# ifndef OPENSSL_NO_MDC2
-const EVP_MD *EVP_mdc2(void);
-# endif
-# ifndef OPENSSL_NO_RIPEMD
-const EVP_MD *EVP_ripemd160(void);
-# endif
-# ifndef OPENSSL_NO_WHIRLPOOL
-const EVP_MD *EVP_whirlpool(void);
-# endif
-const EVP_CIPHER *EVP_enc_null(void); /* does nothing :-) */
-# ifndef OPENSSL_NO_DES
-const EVP_CIPHER *EVP_des_ecb(void);
-const EVP_CIPHER *EVP_des_ede(void);
-const EVP_CIPHER *EVP_des_ede3(void);
-const EVP_CIPHER *EVP_des_ede_ecb(void);
-const EVP_CIPHER *EVP_des_ede3_ecb(void);
-const EVP_CIPHER *EVP_des_cfb64(void);
-#  define EVP_des_cfb EVP_des_cfb64
-const EVP_CIPHER *EVP_des_cfb1(void);
-const EVP_CIPHER *EVP_des_cfb8(void);
-const EVP_CIPHER *EVP_des_ede_cfb64(void);
-#  define EVP_des_ede_cfb EVP_des_ede_cfb64
-#  if 0
-const EVP_CIPHER *EVP_des_ede_cfb1(void);
-const EVP_CIPHER *EVP_des_ede_cfb8(void);
-#  endif
-const EVP_CIPHER *EVP_des_ede3_cfb64(void);
-#  define EVP_des_ede3_cfb EVP_des_ede3_cfb64
-const EVP_CIPHER *EVP_des_ede3_cfb1(void);
-const EVP_CIPHER *EVP_des_ede3_cfb8(void);
-const EVP_CIPHER *EVP_des_ofb(void);
-const EVP_CIPHER *EVP_des_ede_ofb(void);
-const EVP_CIPHER *EVP_des_ede3_ofb(void);
-const EVP_CIPHER *EVP_des_cbc(void);
-const EVP_CIPHER *EVP_des_ede_cbc(void);
-const EVP_CIPHER *EVP_des_ede3_cbc(void);
-const EVP_CIPHER *EVP_desx_cbc(void);
-/*
- * This should now be supported through the dev_crypto ENGINE. But also, why
- * are rc4 and md5 declarations made here inside a "NO_DES" precompiler
- * branch?
- */
-#  if 0
-#   ifdef OPENSSL_OPENBSD_DEV_CRYPTO
-const EVP_CIPHER *EVP_dev_crypto_des_ede3_cbc(void);
-const EVP_CIPHER *EVP_dev_crypto_rc4(void);
-const EVP_MD *EVP_dev_crypto_md5(void);
-#   endif
-#  endif
-# endif
-# ifndef OPENSSL_NO_RC4
-const EVP_CIPHER *EVP_rc4(void);
-const EVP_CIPHER *EVP_rc4_40(void);
-#  ifndef OPENSSL_NO_MD5
-const EVP_CIPHER *EVP_rc4_hmac_md5(void);
-#  endif
-# endif
-# ifndef OPENSSL_NO_IDEA
-const EVP_CIPHER *EVP_idea_ecb(void);
-const EVP_CIPHER *EVP_idea_cfb64(void);
-#  define EVP_idea_cfb EVP_idea_cfb64
-const EVP_CIPHER *EVP_idea_ofb(void);
-const EVP_CIPHER *EVP_idea_cbc(void);
-# endif
-# ifndef OPENSSL_NO_RC2
-const EVP_CIPHER *EVP_rc2_ecb(void);
-const EVP_CIPHER *EVP_rc2_cbc(void);
-const EVP_CIPHER *EVP_rc2_40_cbc(void);
-const EVP_CIPHER *EVP_rc2_64_cbc(void);
-const EVP_CIPHER *EVP_rc2_cfb64(void);
-#  define EVP_rc2_cfb EVP_rc2_cfb64
-const EVP_CIPHER *EVP_rc2_ofb(void);
-# endif
-# ifndef OPENSSL_NO_BF
-const EVP_CIPHER *EVP_bf_ecb(void);
-const EVP_CIPHER *EVP_bf_cbc(void);
-const EVP_CIPHER *EVP_bf_cfb64(void);
-#  define EVP_bf_cfb EVP_bf_cfb64
-const EVP_CIPHER *EVP_bf_ofb(void);
-# endif
-# ifndef OPENSSL_NO_CAST
-const EVP_CIPHER *EVP_cast5_ecb(void);
-const EVP_CIPHER *EVP_cast5_cbc(void);
-const EVP_CIPHER *EVP_cast5_cfb64(void);
-#  define EVP_cast5_cfb EVP_cast5_cfb64
-const EVP_CIPHER *EVP_cast5_ofb(void);
-# endif
-# ifndef OPENSSL_NO_RC5
-const EVP_CIPHER *EVP_rc5_32_12_16_cbc(void);
-const EVP_CIPHER *EVP_rc5_32_12_16_ecb(void);
-const EVP_CIPHER *EVP_rc5_32_12_16_cfb64(void);
-#  define EVP_rc5_32_12_16_cfb EVP_rc5_32_12_16_cfb64
-const EVP_CIPHER *EVP_rc5_32_12_16_ofb(void);
-# endif
-# ifndef OPENSSL_NO_AES
-const EVP_CIPHER *EVP_aes_128_ecb(void);
-const EVP_CIPHER *EVP_aes_128_cbc(void);
-const EVP_CIPHER *EVP_aes_128_cfb1(void);
-const EVP_CIPHER *EVP_aes_128_cfb8(void);
-const EVP_CIPHER *EVP_aes_128_cfb128(void);
-#  define EVP_aes_128_cfb EVP_aes_128_cfb128
-const EVP_CIPHER *EVP_aes_128_ofb(void);
-const EVP_CIPHER *EVP_aes_128_ctr(void);
-const EVP_CIPHER *EVP_aes_128_ccm(void);
-const EVP_CIPHER *EVP_aes_128_gcm(void);
-const EVP_CIPHER *EVP_aes_128_xts(void);
-const EVP_CIPHER *EVP_aes_192_ecb(void);
-const EVP_CIPHER *EVP_aes_192_cbc(void);
-const EVP_CIPHER *EVP_aes_192_cfb1(void);
-const EVP_CIPHER *EVP_aes_192_cfb8(void);
-const EVP_CIPHER *EVP_aes_192_cfb128(void);
-#  define EVP_aes_192_cfb EVP_aes_192_cfb128
-const EVP_CIPHER *EVP_aes_192_ofb(void);
-const EVP_CIPHER *EVP_aes_192_ctr(void);
-const EVP_CIPHER *EVP_aes_192_ccm(void);
-const EVP_CIPHER *EVP_aes_192_gcm(void);
-const EVP_CIPHER *EVP_aes_256_ecb(void);
-const EVP_CIPHER *EVP_aes_256_cbc(void);
-const EVP_CIPHER *EVP_aes_256_cfb1(void);
-const EVP_CIPHER *EVP_aes_256_cfb8(void);
-const EVP_CIPHER *EVP_aes_256_cfb128(void);
-#  define EVP_aes_256_cfb EVP_aes_256_cfb128
-const EVP_CIPHER *EVP_aes_256_ofb(void);
-const EVP_CIPHER *EVP_aes_256_ctr(void);
-const EVP_CIPHER *EVP_aes_256_ccm(void);
-const EVP_CIPHER *EVP_aes_256_gcm(void);
-const EVP_CIPHER *EVP_aes_256_xts(void);
-#  if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
-const EVP_CIPHER *EVP_aes_128_cbc_hmac_sha1(void);
-const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha1(void);
-#  endif
-# endif
-# ifndef OPENSSL_NO_CAMELLIA
-const EVP_CIPHER *EVP_camellia_128_ecb(void);
-const EVP_CIPHER *EVP_camellia_128_cbc(void);
-const EVP_CIPHER *EVP_camellia_128_cfb1(void);
-const EVP_CIPHER *EVP_camellia_128_cfb8(void);
-const EVP_CIPHER *EVP_camellia_128_cfb128(void);
-#  define EVP_camellia_128_cfb EVP_camellia_128_cfb128
-const EVP_CIPHER *EVP_camellia_128_ofb(void);
-const EVP_CIPHER *EVP_camellia_192_ecb(void);
-const EVP_CIPHER *EVP_camellia_192_cbc(void);
-const EVP_CIPHER *EVP_camellia_192_cfb1(void);
-const EVP_CIPHER *EVP_camellia_192_cfb8(void);
-const EVP_CIPHER *EVP_camellia_192_cfb128(void);
-#  define EVP_camellia_192_cfb EVP_camellia_192_cfb128
-const EVP_CIPHER *EVP_camellia_192_ofb(void);
-const EVP_CIPHER *EVP_camellia_256_ecb(void);
-const EVP_CIPHER *EVP_camellia_256_cbc(void);
-const EVP_CIPHER *EVP_camellia_256_cfb1(void);
-const EVP_CIPHER *EVP_camellia_256_cfb8(void);
-const EVP_CIPHER *EVP_camellia_256_cfb128(void);
-#  define EVP_camellia_256_cfb EVP_camellia_256_cfb128
-const EVP_CIPHER *EVP_camellia_256_ofb(void);
-# endif
-
-# ifndef OPENSSL_NO_SEED
-const EVP_CIPHER *EVP_seed_ecb(void);
-const EVP_CIPHER *EVP_seed_cbc(void);
-const EVP_CIPHER *EVP_seed_cfb128(void);
-#  define EVP_seed_cfb EVP_seed_cfb128
-const EVP_CIPHER *EVP_seed_ofb(void);
-# endif
-
-void OPENSSL_add_all_algorithms_noconf(void);
-void OPENSSL_add_all_algorithms_conf(void);
-
-# ifdef OPENSSL_LOAD_CONF
-#  define OpenSSL_add_all_algorithms() \
-                OPENSSL_add_all_algorithms_conf()
-# else
-#  define OpenSSL_add_all_algorithms() \
-                OPENSSL_add_all_algorithms_noconf()
-# endif
-
-void OpenSSL_add_all_ciphers(void);
-void OpenSSL_add_all_digests(void);
-# define SSLeay_add_all_algorithms() OpenSSL_add_all_algorithms()
-# define SSLeay_add_all_ciphers() OpenSSL_add_all_ciphers()
-# define SSLeay_add_all_digests() OpenSSL_add_all_digests()
-
-int EVP_add_cipher(const EVP_CIPHER *cipher);
-int EVP_add_digest(const EVP_MD *digest);
-
-const EVP_CIPHER *EVP_get_cipherbyname(const char *name);
-const EVP_MD *EVP_get_digestbyname(const char *name);
-void EVP_cleanup(void);
-
-void EVP_CIPHER_do_all(void (*fn) (const EVP_CIPHER *ciph,
-                                   const char *from, const char *to, void *x),
-                       void *arg);
-void EVP_CIPHER_do_all_sorted(void (*fn)
-                               (const EVP_CIPHER *ciph, const char *from,
-                                const char *to, void *x), void *arg);
-
-void EVP_MD_do_all(void (*fn) (const EVP_MD *ciph,
-                               const char *from, const char *to, void *x),
-                   void *arg);
-void EVP_MD_do_all_sorted(void (*fn)
-                           (const EVP_MD *ciph, const char *from,
-                            const char *to, void *x), void *arg);
-
-int EVP_PKEY_decrypt_old(unsigned char *dec_key,
-                         const unsigned char *enc_key, int enc_key_len,
-                         EVP_PKEY *private_key);
-int EVP_PKEY_encrypt_old(unsigned char *enc_key,
-                         const unsigned char *key, int key_len,
-                         EVP_PKEY *pub_key);
-int EVP_PKEY_type(int type);
-int EVP_PKEY_id(const EVP_PKEY *pkey);
-int EVP_PKEY_base_id(const EVP_PKEY *pkey);
-int EVP_PKEY_bits(EVP_PKEY *pkey);
-int EVP_PKEY_size(EVP_PKEY *pkey);
-int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
-int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
-int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
-void *EVP_PKEY_get0(EVP_PKEY *pkey);
-
-# ifndef OPENSSL_NO_RSA
-struct rsa_st;
-int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, struct rsa_st *key);
-struct rsa_st *EVP_PKEY_get1_RSA(EVP_PKEY *pkey);
-# endif
-# ifndef OPENSSL_NO_DSA
-struct dsa_st;
-int EVP_PKEY_set1_DSA(EVP_PKEY *pkey, struct dsa_st *key);
-struct dsa_st *EVP_PKEY_get1_DSA(EVP_PKEY *pkey);
-# endif
-# ifndef OPENSSL_NO_DH
-struct dh_st;
-int EVP_PKEY_set1_DH(EVP_PKEY *pkey, struct dh_st *key);
-struct dh_st *EVP_PKEY_get1_DH(EVP_PKEY *pkey);
-# endif
-# ifndef OPENSSL_NO_EC
-struct ec_key_st;
-int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, struct ec_key_st *key);
-struct ec_key_st *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey);
-# endif
-
-EVP_PKEY *EVP_PKEY_new(void);
-void EVP_PKEY_free(EVP_PKEY *pkey);
-
-EVP_PKEY *d2i_PublicKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                        long length);
-int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp);
-
-EVP_PKEY *d2i_PrivateKey(int type, EVP_PKEY **a, const unsigned char **pp,
-                         long length);
-EVP_PKEY *d2i_AutoPrivateKey(EVP_PKEY **a, const unsigned char **pp,
-                             long length);
-int i2d_PrivateKey(EVP_PKEY *a, unsigned char **pp);
-
-int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from);
-int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey);
-int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode);
-int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b);
-
-int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b);
-
-int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx);
-int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey,
-                           int indent, ASN1_PCTX *pctx);
-int EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey,
-                          int indent, ASN1_PCTX *pctx);
-
-int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid);
-
-int EVP_CIPHER_type(const EVP_CIPHER *ctx);
-
-/* calls methods */
-int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-
-/* These are used by EVP_CIPHER methods */
-int EVP_CIPHER_set_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-int EVP_CIPHER_get_asn1_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-
-/* PKCS5 password based encryption */
-int PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                       ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                       const EVP_MD *md, int en_de);
-int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
-                           const unsigned char *salt, int saltlen, int iter,
-                           int keylen, unsigned char *out);
-int PKCS5_PBKDF2_HMAC(const char *pass, int passlen,
-                      const unsigned char *salt, int saltlen, int iter,
-                      const EVP_MD *digest, int keylen, unsigned char *out);
-int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                          ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                          const EVP_MD *md, int en_de);
-
-void PKCS5_PBE_add(void);
-
-int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen,
-                       ASN1_TYPE *param, EVP_CIPHER_CTX *ctx, int en_de);
-
-/* PBE type */
-
-/* Can appear as the outermost AlgorithmIdentifier */
-# define EVP_PBE_TYPE_OUTER      0x0
-/* Is an PRF type OID */
-# define EVP_PBE_TYPE_PRF        0x1
-
-int EVP_PBE_alg_add_type(int pbe_type, int pbe_nid, int cipher_nid,
-                         int md_nid, EVP_PBE_KEYGEN *keygen);
-int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
-                    EVP_PBE_KEYGEN *keygen);
-int EVP_PBE_find(int type, int pbe_nid, int *pcnid, int *pmnid,
-                 EVP_PBE_KEYGEN **pkeygen);
-void EVP_PBE_cleanup(void);
-
-# define ASN1_PKEY_ALIAS         0x1
-# define ASN1_PKEY_DYNAMIC       0x2
-# define ASN1_PKEY_SIGPARAM_NULL 0x4
-
-# define ASN1_PKEY_CTRL_PKCS7_SIGN       0x1
-# define ASN1_PKEY_CTRL_PKCS7_ENCRYPT    0x2
-# define ASN1_PKEY_CTRL_DEFAULT_MD_NID   0x3
-# define ASN1_PKEY_CTRL_CMS_SIGN         0x5
-# define ASN1_PKEY_CTRL_CMS_ENVELOPE     0x7
-
-int EVP_PKEY_asn1_get_count(void);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(ENGINE **pe, int type);
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
-                                                   const char *str, int len);
-int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth);
-int EVP_PKEY_asn1_add_alias(int to, int from);
-int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *pkey_base_id,
-                            int *ppkey_flags, const char **pinfo,
-                            const char **ppem_str,
-                            const EVP_PKEY_ASN1_METHOD *ameth);
-
-const EVP_PKEY_ASN1_METHOD *EVP_PKEY_get0_asn1(EVP_PKEY *pkey);
-EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags,
-                                        const char *pem_str,
-                                        const char *info);
-void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
-                        const EVP_PKEY_ASN1_METHOD *src);
-void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth);
-void EVP_PKEY_asn1_set_public(EVP_PKEY_ASN1_METHOD *ameth,
-                              int (*pub_decode) (EVP_PKEY *pk,
-                                                 X509_PUBKEY *pub),
-                              int (*pub_encode) (X509_PUBKEY *pub,
-                                                 const EVP_PKEY *pk),
-                              int (*pub_cmp) (const EVP_PKEY *a,
-                                              const EVP_PKEY *b),
-                              int (*pub_print) (BIO *out,
-                                                const EVP_PKEY *pkey,
-                                                int indent, ASN1_PCTX *pctx),
-                              int (*pkey_size) (const EVP_PKEY *pk),
-                              int (*pkey_bits) (const EVP_PKEY *pk));
-void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
-                               int (*priv_decode) (EVP_PKEY *pk,
-                                                   PKCS8_PRIV_KEY_INFO
-                                                   *p8inf),
-                               int (*priv_encode) (PKCS8_PRIV_KEY_INFO *p8,
-                                                   const EVP_PKEY *pk),
-                               int (*priv_print) (BIO *out,
-                                                  const EVP_PKEY *pkey,
-                                                  int indent,
-                                                  ASN1_PCTX *pctx));
-void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
-                             int (*param_decode) (EVP_PKEY *pkey,
-                                                  const unsigned char **pder,
-                                                  int derlen),
-                             int (*param_encode) (const EVP_PKEY *pkey,
-                                                  unsigned char **pder),
-                             int (*param_missing) (const EVP_PKEY *pk),
-                             int (*param_copy) (EVP_PKEY *to,
-                                                const EVP_PKEY *from),
-                             int (*param_cmp) (const EVP_PKEY *a,
-                                               const EVP_PKEY *b),
-                             int (*param_print) (BIO *out,
-                                                 const EVP_PKEY *pkey,
-                                                 int indent,
-                                                 ASN1_PCTX *pctx));
-
-void EVP_PKEY_asn1_set_free(EVP_PKEY_ASN1_METHOD *ameth,
-                            void (*pkey_free) (EVP_PKEY *pkey));
-void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
-                            int (*pkey_ctrl) (EVP_PKEY *pkey, int op,
-                                              long arg1, void *arg2));
-
-# define EVP_PKEY_OP_UNDEFINED           0
-# define EVP_PKEY_OP_PARAMGEN            (1<<1)
-# define EVP_PKEY_OP_KEYGEN              (1<<2)
-# define EVP_PKEY_OP_SIGN                (1<<3)
-# define EVP_PKEY_OP_VERIFY              (1<<4)
-# define EVP_PKEY_OP_VERIFYRECOVER       (1<<5)
-# define EVP_PKEY_OP_SIGNCTX             (1<<6)
-# define EVP_PKEY_OP_VERIFYCTX           (1<<7)
-# define EVP_PKEY_OP_ENCRYPT             (1<<8)
-# define EVP_PKEY_OP_DECRYPT             (1<<9)
-# define EVP_PKEY_OP_DERIVE              (1<<10)
-
-# define EVP_PKEY_OP_TYPE_SIG    \
-        (EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY | EVP_PKEY_OP_VERIFYRECOVER \
-                | EVP_PKEY_OP_SIGNCTX | EVP_PKEY_OP_VERIFYCTX)
-
-# define EVP_PKEY_OP_TYPE_CRYPT \
-        (EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT)
-
-# define EVP_PKEY_OP_TYPE_NOGEN \
-        (EVP_PKEY_OP_SIG | EVP_PKEY_OP_CRYPT | EVP_PKEY_OP_DERIVE)
-
-# define EVP_PKEY_OP_TYPE_GEN \
-                (EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN)
-
-# define  EVP_PKEY_CTX_set_signature_md(ctx, md) \
-                EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,  \
-                                        EVP_PKEY_CTRL_MD, 0, (void *)md)
-
-# define EVP_PKEY_CTRL_MD                1
-# define EVP_PKEY_CTRL_PEER_KEY          2
-
-# define EVP_PKEY_CTRL_PKCS7_ENCRYPT     3
-# define EVP_PKEY_CTRL_PKCS7_DECRYPT     4
-
-# define EVP_PKEY_CTRL_PKCS7_SIGN        5
-
-# define EVP_PKEY_CTRL_SET_MAC_KEY       6
-
-# define EVP_PKEY_CTRL_DIGESTINIT        7
-
-/* Used by GOST key encryption in TLS */
-# define EVP_PKEY_CTRL_SET_IV            8
-
-# define EVP_PKEY_CTRL_CMS_ENCRYPT       9
-# define EVP_PKEY_CTRL_CMS_DECRYPT       10
-# define EVP_PKEY_CTRL_CMS_SIGN          11
-
-# define EVP_PKEY_CTRL_CIPHER            12
-
-# define EVP_PKEY_ALG_CTRL               0x1000
-
-# define EVP_PKEY_FLAG_AUTOARGLEN        2
-/*
- * Method handles all operations: don't assume any digest related defaults.
- */
-# define EVP_PKEY_FLAG_SIGCTX_CUSTOM     4
-
-const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type);
-EVP_PKEY_METHOD *EVP_PKEY_meth_new(int id, int flags);
-void EVP_PKEY_meth_get0_info(int *ppkey_id, int *pflags,
-                             const EVP_PKEY_METHOD *meth);
-void EVP_PKEY_meth_copy(EVP_PKEY_METHOD *dst, const EVP_PKEY_METHOD *src);
-void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth);
-int EVP_PKEY_meth_add0(const EVP_PKEY_METHOD *pmeth);
-
-EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey, ENGINE *e);
-EVP_PKEY_CTX *EVP_PKEY_CTX_new_id(int id, ENGINE *e);
-EVP_PKEY_CTX *EVP_PKEY_CTX_dup(EVP_PKEY_CTX *ctx);
-void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
-                      int cmd, int p1, void *p2);
-int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
-                          const char *value);
-
-int EVP_PKEY_CTX_get_operation(EVP_PKEY_CTX *ctx);
-void EVP_PKEY_CTX_set0_keygen_info(EVP_PKEY_CTX *ctx, int *dat, int datlen);
-
-EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
-                               const unsigned char *key, int keylen);
-
-void EVP_PKEY_CTX_set_data(EVP_PKEY_CTX *ctx, void *data);
-void *EVP_PKEY_CTX_get_data(EVP_PKEY_CTX *ctx);
-EVP_PKEY *EVP_PKEY_CTX_get0_pkey(EVP_PKEY_CTX *ctx);
-
-EVP_PKEY *EVP_PKEY_CTX_get0_peerkey(EVP_PKEY_CTX *ctx);
-
-void EVP_PKEY_CTX_set_app_data(EVP_PKEY_CTX *ctx, void *data);
-void *EVP_PKEY_CTX_get_app_data(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_sign(EVP_PKEY_CTX *ctx,
-                  unsigned char *sig, size_t *siglen,
-                  const unsigned char *tbs, size_t tbslen);
-int EVP_PKEY_verify_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_verify(EVP_PKEY_CTX *ctx,
-                    const unsigned char *sig, size_t siglen,
-                    const unsigned char *tbs, size_t tbslen);
-int EVP_PKEY_verify_recover_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_verify_recover(EVP_PKEY_CTX *ctx,
-                            unsigned char *rout, size_t *routlen,
-                            const unsigned char *sig, size_t siglen);
-int EVP_PKEY_encrypt_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_encrypt(EVP_PKEY_CTX *ctx,
-                     unsigned char *out, size_t *outlen,
-                     const unsigned char *in, size_t inlen);
-int EVP_PKEY_decrypt_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_decrypt(EVP_PKEY_CTX *ctx,
-                     unsigned char *out, size_t *outlen,
-                     const unsigned char *in, size_t inlen);
-
-int EVP_PKEY_derive_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_derive_set_peer(EVP_PKEY_CTX *ctx, EVP_PKEY *peer);
-int EVP_PKEY_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen);
-
-typedef int EVP_PKEY_gen_cb (EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
-int EVP_PKEY_keygen_init(EVP_PKEY_CTX *ctx);
-int EVP_PKEY_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
-
-void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb);
-EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx);
-
-int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx);
-
-void EVP_PKEY_meth_set_init(EVP_PKEY_METHOD *pmeth,
-                            int (*init) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_copy(EVP_PKEY_METHOD *pmeth,
-                            int (*copy) (EVP_PKEY_CTX *dst,
-                                         EVP_PKEY_CTX *src));
-
-void EVP_PKEY_meth_set_cleanup(EVP_PKEY_METHOD *pmeth,
-                               void (*cleanup) (EVP_PKEY_CTX *ctx));
-
-void EVP_PKEY_meth_set_paramgen(EVP_PKEY_METHOD *pmeth,
-                                int (*paramgen_init) (EVP_PKEY_CTX *ctx),
-                                int (*paramgen) (EVP_PKEY_CTX *ctx,
-                                                 EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_keygen(EVP_PKEY_METHOD *pmeth,
-                              int (*keygen_init) (EVP_PKEY_CTX *ctx),
-                              int (*keygen) (EVP_PKEY_CTX *ctx,
-                                             EVP_PKEY *pkey));
-
-void EVP_PKEY_meth_set_sign(EVP_PKEY_METHOD *pmeth,
-                            int (*sign_init) (EVP_PKEY_CTX *ctx),
-                            int (*sign) (EVP_PKEY_CTX *ctx,
-                                         unsigned char *sig, size_t *siglen,
-                                         const unsigned char *tbs,
-                                         size_t tbslen));
-
-void EVP_PKEY_meth_set_verify(EVP_PKEY_METHOD *pmeth,
-                              int (*verify_init) (EVP_PKEY_CTX *ctx),
-                              int (*verify) (EVP_PKEY_CTX *ctx,
-                                             const unsigned char *sig,
-                                             size_t siglen,
-                                             const unsigned char *tbs,
-                                             size_t tbslen));
-
-void EVP_PKEY_meth_set_verify_recover(EVP_PKEY_METHOD *pmeth,
-                                      int (*verify_recover_init) (EVP_PKEY_CTX
-                                                                  *ctx),
-                                      int (*verify_recover) (EVP_PKEY_CTX
-                                                             *ctx,
-                                                             unsigned char
-                                                             *sig,
-                                                             size_t *siglen,
-                                                             const unsigned
-                                                             char *tbs,
-                                                             size_t tbslen));
-
-void EVP_PKEY_meth_set_signctx(EVP_PKEY_METHOD *pmeth,
-                               int (*signctx_init) (EVP_PKEY_CTX *ctx,
-                                                    EVP_MD_CTX *mctx),
-                               int (*signctx) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *sig,
-                                               size_t *siglen,
-                                               EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_verifyctx(EVP_PKEY_METHOD *pmeth,
-                                 int (*verifyctx_init) (EVP_PKEY_CTX *ctx,
-                                                        EVP_MD_CTX *mctx),
-                                 int (*verifyctx) (EVP_PKEY_CTX *ctx,
-                                                   const unsigned char *sig,
-                                                   int siglen,
-                                                   EVP_MD_CTX *mctx));
-
-void EVP_PKEY_meth_set_encrypt(EVP_PKEY_METHOD *pmeth,
-                               int (*encrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (*encryptfn) (EVP_PKEY_CTX *ctx,
-                                                 unsigned char *out,
-                                                 size_t *outlen,
-                                                 const unsigned char *in,
-                                                 size_t inlen));
-
-void EVP_PKEY_meth_set_decrypt(EVP_PKEY_METHOD *pmeth,
-                               int (*decrypt_init) (EVP_PKEY_CTX *ctx),
-                               int (*decrypt) (EVP_PKEY_CTX *ctx,
-                                               unsigned char *out,
-                                               size_t *outlen,
-                                               const unsigned char *in,
-                                               size_t inlen));
-
-void EVP_PKEY_meth_set_derive(EVP_PKEY_METHOD *pmeth,
-                              int (*derive_init) (EVP_PKEY_CTX *ctx),
-                              int (*derive) (EVP_PKEY_CTX *ctx,
-                                             unsigned char *key,
-                                             size_t *keylen));
-
-void EVP_PKEY_meth_set_ctrl(EVP_PKEY_METHOD *pmeth,
-                            int (*ctrl) (EVP_PKEY_CTX *ctx, int type, int p1,
-                                         void *p2),
-                            int (*ctrl_str) (EVP_PKEY_CTX *ctx,
-                                             const char *type,
-                                             const char *value));
-
-void EVP_add_alg_module(void);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_EVP_strings(void);
-
-/* Error codes for the EVP functions. */
-
-/* Function codes. */
-# define EVP_F_AESNI_INIT_KEY                             165
-# define EVP_F_AESNI_XTS_CIPHER                           176
-# define EVP_F_AES_INIT_KEY                               133
-# define EVP_F_AES_XTS                                    172
-# define EVP_F_AES_XTS_CIPHER                             175
-# define EVP_F_ALG_MODULE_INIT                            177
-# define EVP_F_CAMELLIA_INIT_KEY                          159
-# define EVP_F_CMAC_INIT                                  173
-# define EVP_F_D2I_PKEY                                   100
-# define EVP_F_DO_SIGVER_INIT                             161
-# define EVP_F_DSAPKEY2PKCS8                              134
-# define EVP_F_DSA_PKEY2PKCS8                             135
-# define EVP_F_ECDSA_PKEY2PKCS8                           129
-# define EVP_F_ECKEY_PKEY2PKCS8                           132
-# define EVP_F_EVP_CIPHERINIT_EX                          123
-# define EVP_F_EVP_CIPHER_CTX_COPY                        163
-# define EVP_F_EVP_CIPHER_CTX_CTRL                        124
-# define EVP_F_EVP_CIPHER_CTX_SET_KEY_LENGTH              122
-# define EVP_F_EVP_DECRYPTFINAL_EX                        101
-# define EVP_F_EVP_DIGESTINIT_EX                          128
-# define EVP_F_EVP_ENCRYPTFINAL_EX                        127
-# define EVP_F_EVP_MD_CTX_COPY_EX                         110
-# define EVP_F_EVP_MD_SIZE                                162
-# define EVP_F_EVP_OPENINIT                               102
-# define EVP_F_EVP_PBE_ALG_ADD                            115
-# define EVP_F_EVP_PBE_ALG_ADD_TYPE                       160
-# define EVP_F_EVP_PBE_CIPHERINIT                         116
-# define EVP_F_EVP_PKCS82PKEY                             111
-# define EVP_F_EVP_PKCS82PKEY_BROKEN                      136
-# define EVP_F_EVP_PKEY2PKCS8_BROKEN                      113
-# define EVP_F_EVP_PKEY_COPY_PARAMETERS                   103
-# define EVP_F_EVP_PKEY_CTX_CTRL                          137
-# define EVP_F_EVP_PKEY_CTX_CTRL_STR                      150
-# define EVP_F_EVP_PKEY_CTX_DUP                           156
-# define EVP_F_EVP_PKEY_DECRYPT                           104
-# define EVP_F_EVP_PKEY_DECRYPT_INIT                      138
-# define EVP_F_EVP_PKEY_DECRYPT_OLD                       151
-# define EVP_F_EVP_PKEY_DERIVE                            153
-# define EVP_F_EVP_PKEY_DERIVE_INIT                       154
-# define EVP_F_EVP_PKEY_DERIVE_SET_PEER                   155
-# define EVP_F_EVP_PKEY_ENCRYPT                           105
-# define EVP_F_EVP_PKEY_ENCRYPT_INIT                      139
-# define EVP_F_EVP_PKEY_ENCRYPT_OLD                       152
-# define EVP_F_EVP_PKEY_GET1_DH                           119
-# define EVP_F_EVP_PKEY_GET1_DSA                          120
-# define EVP_F_EVP_PKEY_GET1_ECDSA                        130
-# define EVP_F_EVP_PKEY_GET1_EC_KEY                       131
-# define EVP_F_EVP_PKEY_GET1_RSA                          121
-# define EVP_F_EVP_PKEY_KEYGEN                            146
-# define EVP_F_EVP_PKEY_KEYGEN_INIT                       147
-# define EVP_F_EVP_PKEY_NEW                               106
-# define EVP_F_EVP_PKEY_PARAMGEN                          148
-# define EVP_F_EVP_PKEY_PARAMGEN_INIT                     149
-# define EVP_F_EVP_PKEY_SIGN                              140
-# define EVP_F_EVP_PKEY_SIGN_INIT                         141
-# define EVP_F_EVP_PKEY_VERIFY                            142
-# define EVP_F_EVP_PKEY_VERIFY_INIT                       143
-# define EVP_F_EVP_PKEY_VERIFY_RECOVER                    144
-# define EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT               145
-# define EVP_F_EVP_RIJNDAEL                               126
-# define EVP_F_EVP_SIGNFINAL                              107
-# define EVP_F_EVP_VERIFYFINAL                            108
-# define EVP_F_FIPS_CIPHERINIT                            166
-# define EVP_F_FIPS_CIPHER_CTX_COPY                       170
-# define EVP_F_FIPS_CIPHER_CTX_CTRL                       167
-# define EVP_F_FIPS_CIPHER_CTX_SET_KEY_LENGTH             171
-# define EVP_F_FIPS_DIGESTINIT                            168
-# define EVP_F_FIPS_MD_CTX_COPY                           169
-# define EVP_F_HMAC_INIT_EX                               174
-# define EVP_F_INT_CTX_NEW                                157
-# define EVP_F_PKCS5_PBE_KEYIVGEN                         117
-# define EVP_F_PKCS5_V2_PBE_KEYIVGEN                      118
-# define EVP_F_PKCS5_V2_PBKDF2_KEYIVGEN                   164
-# define EVP_F_PKCS8_SET_BROKEN                           112
-# define EVP_F_PKEY_SET_TYPE                              158
-# define EVP_F_RC2_MAGIC_TO_METH                          109
-# define EVP_F_RC5_CTRL                                   125
-
-/* Reason codes. */
-# define EVP_R_AES_IV_SETUP_FAILED                        162
-# define EVP_R_AES_KEY_SETUP_FAILED                       143
-# define EVP_R_ASN1_LIB                                   140
-# define EVP_R_BAD_BLOCK_LENGTH                           136
-# define EVP_R_BAD_DECRYPT                                100
-# define EVP_R_BAD_KEY_LENGTH                             137
-# define EVP_R_BN_DECODE_ERROR                            112
-# define EVP_R_BN_PUBKEY_ERROR                            113
-# define EVP_R_BUFFER_TOO_SMALL                           155
-# define EVP_R_CAMELLIA_KEY_SETUP_FAILED                  157
-# define EVP_R_CIPHER_PARAMETER_ERROR                     122
-# define EVP_R_COMMAND_NOT_SUPPORTED                      147
-# define EVP_R_CTRL_NOT_IMPLEMENTED                       132
-# define EVP_R_CTRL_OPERATION_NOT_IMPLEMENTED             133
-# define EVP_R_DATA_NOT_MULTIPLE_OF_BLOCK_LENGTH          138
-# define EVP_R_DECODE_ERROR                               114
-# define EVP_R_DIFFERENT_KEY_TYPES                        101
-# define EVP_R_DIFFERENT_PARAMETERS                       153
-# define EVP_R_DISABLED_FOR_FIPS                          163
-# define EVP_R_ENCODE_ERROR                               115
-# define EVP_R_ERROR_LOADING_SECTION                      165
-# define EVP_R_ERROR_SETTING_FIPS_MODE                    166
-# define EVP_R_EVP_PBE_CIPHERINIT_ERROR                   119
-# define EVP_R_EXPECTING_AN_RSA_KEY                       127
-# define EVP_R_EXPECTING_A_DH_KEY                         128
-# define EVP_R_EXPECTING_A_DSA_KEY                        129
-# define EVP_R_EXPECTING_A_ECDSA_KEY                      141
-# define EVP_R_EXPECTING_A_EC_KEY                         142
-# define EVP_R_FIPS_MODE_NOT_SUPPORTED                    167
-# define EVP_R_INITIALIZATION_ERROR                       134
-# define EVP_R_INPUT_NOT_INITIALIZED                      111
-# define EVP_R_INVALID_DIGEST                             152
-# define EVP_R_INVALID_FIPS_MODE                          168
-# define EVP_R_INVALID_KEY_LENGTH                         130
-# define EVP_R_INVALID_OPERATION                          148
-# define EVP_R_IV_TOO_LARGE                               102
-# define EVP_R_KEYGEN_FAILURE                             120
-# define EVP_R_MESSAGE_DIGEST_IS_NULL                     159
-# define EVP_R_METHOD_NOT_SUPPORTED                       144
-# define EVP_R_MISSING_PARAMETERS                         103
-# define EVP_R_NO_CIPHER_SET                              131
-# define EVP_R_NO_DEFAULT_DIGEST                          158
-# define EVP_R_NO_DIGEST_SET                              139
-# define EVP_R_NO_DSA_PARAMETERS                          116
-# define EVP_R_NO_KEY_SET                                 154
-# define EVP_R_NO_OPERATION_SET                           149
-# define EVP_R_NO_SIGN_FUNCTION_CONFIGURED                104
-# define EVP_R_NO_VERIFY_FUNCTION_CONFIGURED              105
-# define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   150
-# define EVP_R_OPERATON_NOT_INITIALIZED                   151
-# define EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE                  117
-# define EVP_R_PRIVATE_KEY_DECODE_ERROR                   145
-# define EVP_R_PRIVATE_KEY_ENCODE_ERROR                   146
-# define EVP_R_PUBLIC_KEY_NOT_RSA                         106
-# define EVP_R_TOO_LARGE                                  164
-# define EVP_R_UNKNOWN_CIPHER                             160
-# define EVP_R_UNKNOWN_DIGEST                             161
-# define EVP_R_UNKNOWN_OPTION                             169
-# define EVP_R_UNKNOWN_PBE_ALGORITHM                      121
-# define EVP_R_UNSUPORTED_NUMBER_OF_ROUNDS                135
-# define EVP_R_UNSUPPORTED_ALGORITHM                      156
-# define EVP_R_UNSUPPORTED_CIPHER                         107
-# define EVP_R_UNSUPPORTED_KEYLENGTH                      123
-# define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION        124
-# define EVP_R_UNSUPPORTED_KEY_SIZE                       108
-# define EVP_R_UNSUPPORTED_PRF                            125
-# define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM          118
-# define EVP_R_UNSUPPORTED_SALT_TYPE                      126
-# define EVP_R_WRONG_FINAL_BLOCK_LENGTH                   109
-# define EVP_R_WRONG_PUBLIC_KEY_TYPE                      110
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/fips.h b/include.new/openssl/fips.h
deleted file mode 100644
index 320feb0..0000000
--- a/include.new/openssl/fips.h
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy fips.h */
diff --git a/include.new/openssl/fips_rand.h b/include.new/openssl/fips_rand.h
deleted file mode 100644
index 26d8090..0000000
--- a/include.new/openssl/fips_rand.h
+++ /dev/null
@@ -1 +0,0 @@
-/* dummy fips_rand.h */
diff --git a/include.new/openssl/hmac.h b/include.new/openssl/hmac.h
deleted file mode 100644
index b8b55cd..0000000
--- a/include.new/openssl/hmac.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* crypto/hmac/hmac.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-#ifndef HEADER_HMAC_H
-# define HEADER_HMAC_H
-
-# include <openssl/opensslconf.h>
-
-# ifdef OPENSSL_NO_HMAC
-#  error HMAC is disabled.
-# endif
-
-# include <openssl/evp.h>
-
-# define HMAC_MAX_MD_CBLOCK      128/* largest known is SHA512 */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct hmac_ctx_st {
-    const EVP_MD *md;
-    EVP_MD_CTX md_ctx;
-    EVP_MD_CTX i_ctx;
-    EVP_MD_CTX o_ctx;
-    unsigned int key_length;
-    unsigned char key[HMAC_MAX_MD_CBLOCK];
-} HMAC_CTX;
-
-# define HMAC_size(e)    (EVP_MD_size((e)->md))
-
-void HMAC_CTX_init(HMAC_CTX *ctx);
-void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-
-/* deprecated */
-# define HMAC_cleanup(ctx) HMAC_CTX_cleanup(ctx)
-
-/* deprecated */
-int HMAC_Init(HMAC_CTX *ctx, const void *key, int len, const EVP_MD *md);
-int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-                 const EVP_MD *md, ENGINE *impl);
-int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len);
-int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len);
-unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-                    const unsigned char *d, size_t n, unsigned char *md,
-                    unsigned int *md_len);
-int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx);
-
-void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/hw_4758_cca_err.h b/include.new/openssl/hw_4758_cca_err.h
deleted file mode 100644
index 2fc563a..0000000
--- a/include.new/openssl/hw_4758_cca_err.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_CCA4758_ERR_H
-#define HEADER_CCA4758_ERR_H
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_CCA4758_strings(void);
-static void ERR_unload_CCA4758_strings(void);
-static void ERR_CCA4758_error(int function, int reason, char *file, int line);
-#define CCA4758err(f,r) ERR_CCA4758_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the CCA4758 functions. */
-
-/* Function codes. */
-#define CCA4758_F_IBM_4758_CCA_CTRL			 100
-#define CCA4758_F_IBM_4758_CCA_FINISH			 101
-#define CCA4758_F_IBM_4758_CCA_INIT			 102
-#define CCA4758_F_IBM_4758_CCA_LOAD_PRIVKEY		 103
-#define CCA4758_F_IBM_4758_CCA_LOAD_PUBKEY		 104
-#define CCA4758_F_IBM_4758_CCA_SIGN			 105
-#define CCA4758_F_IBM_4758_CCA_VERIFY			 106
-
-/* Reason codes. */
-#define CCA4758_R_ALREADY_LOADED			 100
-#define CCA4758_R_ASN1_OID_UNKNOWN_FOR_MD		 101
-#define CCA4758_R_COMMAND_NOT_IMPLEMENTED		 102
-#define CCA4758_R_DSO_FAILURE				 103
-#define CCA4758_R_FAILED_LOADING_PRIVATE_KEY		 104
-#define CCA4758_R_FAILED_LOADING_PUBLIC_KEY		 105
-#define CCA4758_R_NOT_LOADED				 106
-#define CCA4758_R_SIZE_TOO_LARGE_OR_TOO_SMALL		 107
-#define CCA4758_R_UNIT_FAILURE				 108
-#define CCA4758_R_UNKNOWN_ALGORITHM_TYPE		 109
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/hw_aep_err.h b/include.new/openssl/hw_aep_err.h
deleted file mode 100644
index 8fe4cf9..0000000
--- a/include.new/openssl/hw_aep_err.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_AEPHK_ERR_H
-#define HEADER_AEPHK_ERR_H
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_AEPHK_strings(void);
-static void ERR_unload_AEPHK_strings(void);
-static void ERR_AEPHK_error(int function, int reason, char *file, int line);
-#define AEPHKerr(f,r) ERR_AEPHK_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the AEPHK functions. */
-
-/* Function codes. */
-#define AEPHK_F_AEP_CTRL				 100
-#define AEPHK_F_AEP_FINISH				 101
-#define AEPHK_F_AEP_GET_CONNECTION			 102
-#define AEPHK_F_AEP_INIT				 103
-#define AEPHK_F_AEP_MOD_EXP				 104
-#define AEPHK_F_AEP_MOD_EXP_CRT				 105
-#define AEPHK_F_AEP_RAND				 106
-#define AEPHK_F_AEP_RSA_MOD_EXP				 107
-
-/* Reason codes. */
-#define AEPHK_R_ALREADY_LOADED				 100
-#define AEPHK_R_CLOSE_HANDLES_FAILED			 101
-#define AEPHK_R_CONNECTIONS_IN_USE			 102
-#define AEPHK_R_CTRL_COMMAND_NOT_IMPLEMENTED		 103
-#define AEPHK_R_FINALIZE_FAILED				 104
-#define AEPHK_R_GET_HANDLE_FAILED			 105
-#define AEPHK_R_GET_RANDOM_FAILED			 106
-#define AEPHK_R_INIT_FAILURE				 107
-#define AEPHK_R_MISSING_KEY_COMPONENTS			 108
-#define AEPHK_R_MOD_EXP_CRT_FAILED			 109
-#define AEPHK_R_MOD_EXP_FAILED				 110
-#define AEPHK_R_NOT_LOADED				 111
-#define AEPHK_R_OK					 112
-#define AEPHK_R_RETURN_CONNECTION_FAILED		 113
-#define AEPHK_R_SETBNCALLBACK_FAILURE			 114
-#define AEPHK_R_SIZE_TOO_LARGE_OR_TOO_SMALL		 116
-#define AEPHK_R_UNIT_FAILURE				 115
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/hw_atalla_err.h b/include.new/openssl/hw_atalla_err.h
deleted file mode 100644
index cdac052..0000000
--- a/include.new/openssl/hw_atalla_err.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_ATALLA_ERR_H
-#define HEADER_ATALLA_ERR_H
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_ATALLA_strings(void);
-static void ERR_unload_ATALLA_strings(void);
-static void ERR_ATALLA_error(int function, int reason, char *file, int line);
-#define ATALLAerr(f,r) ERR_ATALLA_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the ATALLA functions. */
-
-/* Function codes. */
-#define ATALLA_F_ATALLA_CTRL				 100
-#define ATALLA_F_ATALLA_FINISH				 101
-#define ATALLA_F_ATALLA_INIT				 102
-#define ATALLA_F_ATALLA_MOD_EXP				 103
-#define ATALLA_F_ATALLA_RSA_MOD_EXP			 104
-
-/* Reason codes. */
-#define ATALLA_R_ALREADY_LOADED				 100
-#define ATALLA_R_BN_CTX_FULL				 101
-#define ATALLA_R_BN_EXPAND_FAIL				 102
-#define ATALLA_R_CTRL_COMMAND_NOT_IMPLEMENTED		 103
-#define ATALLA_R_MISSING_KEY_COMPONENTS			 104
-#define ATALLA_R_NOT_LOADED				 105
-#define ATALLA_R_REQUEST_FAILED				 106
-#define ATALLA_R_UNIT_FAILURE				 107
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/hw_cswift_err.h b/include.new/openssl/hw_cswift_err.h
deleted file mode 100644
index 7120c32..0000000
--- a/include.new/openssl/hw_cswift_err.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_CSWIFT_ERR_H
-#define HEADER_CSWIFT_ERR_H
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_CSWIFT_strings(void);
-static void ERR_unload_CSWIFT_strings(void);
-static void ERR_CSWIFT_error(int function, int reason, char *file, int line);
-#define CSWIFTerr(f,r) ERR_CSWIFT_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the CSWIFT functions. */
-
-/* Function codes. */
-#define CSWIFT_F_CSWIFT_CTRL				 100
-#define CSWIFT_F_CSWIFT_DSA_SIGN			 101
-#define CSWIFT_F_CSWIFT_DSA_VERIFY			 102
-#define CSWIFT_F_CSWIFT_FINISH				 103
-#define CSWIFT_F_CSWIFT_INIT				 104
-#define CSWIFT_F_CSWIFT_MOD_EXP				 105
-#define CSWIFT_F_CSWIFT_MOD_EXP_CRT			 106
-#define CSWIFT_F_CSWIFT_RSA_MOD_EXP			 107
-
-/* Reason codes. */
-#define CSWIFT_R_ALREADY_LOADED				 100
-#define CSWIFT_R_BAD_KEY_SIZE				 101
-#define CSWIFT_R_BN_CTX_FULL				 102
-#define CSWIFT_R_BN_EXPAND_FAIL				 103
-#define CSWIFT_R_CTRL_COMMAND_NOT_IMPLEMENTED		 104
-#define CSWIFT_R_MISSING_KEY_COMPONENTS			 105
-#define CSWIFT_R_NOT_LOADED				 106
-#define CSWIFT_R_REQUEST_FAILED				 107
-#define CSWIFT_R_UNIT_FAILURE				 108
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/hw_ncipher_err.h b/include.new/openssl/hw_ncipher_err.h
deleted file mode 100644
index d232d02..0000000
--- a/include.new/openssl/hw_ncipher_err.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_HWCRHK_ERR_H
-#define HEADER_HWCRHK_ERR_H
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_HWCRHK_strings(void);
-static void ERR_unload_HWCRHK_strings(void);
-static void ERR_HWCRHK_error(int function, int reason, char *file, int line);
-#define HWCRHKerr(f,r) ERR_HWCRHK_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the HWCRHK functions. */
-
-/* Function codes. */
-#define HWCRHK_F_HWCRHK_CTRL				 100
-#define HWCRHK_F_HWCRHK_FINISH				 101
-#define HWCRHK_F_HWCRHK_GET_PASS			 102
-#define HWCRHK_F_HWCRHK_INIT				 103
-#define HWCRHK_F_HWCRHK_INSERT_CARD			 104
-#define HWCRHK_F_HWCRHK_LOAD_PRIVKEY			 105
-#define HWCRHK_F_HWCRHK_LOAD_PUBKEY			 106
-#define HWCRHK_F_HWCRHK_MOD_EXP				 107
-#define HWCRHK_F_HWCRHK_RAND_BYTES			 108
-#define HWCRHK_F_HWCRHK_RSA_MOD_EXP			 109
-
-/* Reason codes. */
-#define HWCRHK_R_ALREADY_LOADED				 100
-#define HWCRHK_R_BIO_WAS_FREED				 101
-#define HWCRHK_R_CHIL_ERROR				 102
-#define HWCRHK_R_CTRL_COMMAND_NOT_IMPLEMENTED		 103
-#define HWCRHK_R_DSO_FAILURE				 104
-#define HWCRHK_R_DYNAMIC_LOCKING_MISSING		 114
-#define HWCRHK_R_MISSING_KEY_COMPONENTS			 105
-#define HWCRHK_R_NOT_INITIALISED			 106
-#define HWCRHK_R_NOT_LOADED				 107
-#define HWCRHK_R_NO_CALLBACK				 108
-#define HWCRHK_R_NO_KEY					 109
-#define HWCRHK_R_PRIVATE_KEY_ALGORITHMS_DISABLED	 110
-#define HWCRHK_R_REQUEST_FAILED				 111
-#define HWCRHK_R_REQUEST_FALLBACK			 112
-#define HWCRHK_R_UNIT_FAILURE				 113
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/hw_nuron_err.h b/include.new/openssl/hw_nuron_err.h
deleted file mode 100644
index a56bfdf..0000000
--- a/include.new/openssl/hw_nuron_err.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_NURON_ERR_H
-#define HEADER_NURON_ERR_H
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_NURON_strings(void);
-static void ERR_unload_NURON_strings(void);
-static void ERR_NURON_error(int function, int reason, char *file, int line);
-#define NURONerr(f,r) ERR_NURON_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the NURON functions. */
-
-/* Function codes. */
-#define NURON_F_NURON_CTRL				 100
-#define NURON_F_NURON_FINISH				 101
-#define NURON_F_NURON_INIT				 102
-#define NURON_F_NURON_MOD_EXP				 103
-
-/* Reason codes. */
-#define NURON_R_ALREADY_LOADED				 100
-#define NURON_R_CTRL_COMMAND_NOT_IMPLEMENTED		 101
-#define NURON_R_DSO_FAILURE				 102
-#define NURON_R_DSO_FUNCTION_NOT_FOUND			 103
-#define NURON_R_DSO_NOT_FOUND				 104
-#define NURON_R_NOT_LOADED				 105
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/hw_sureware_err.h b/include.new/openssl/hw_sureware_err.h
deleted file mode 100644
index bc52af5..0000000
--- a/include.new/openssl/hw_sureware_err.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SUREWARE_ERR_H
-#define HEADER_SUREWARE_ERR_H
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_SUREWARE_strings(void);
-static void ERR_unload_SUREWARE_strings(void);
-static void ERR_SUREWARE_error(int function, int reason, char *file, int line);
-#define SUREWAREerr(f,r) ERR_SUREWARE_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the SUREWARE functions. */
-
-/* Function codes. */
-#define SUREWARE_F_SUREWAREHK_CTRL			 100
-#define SUREWARE_F_SUREWAREHK_DSA_DO_SIGN		 101
-#define SUREWARE_F_SUREWAREHK_EX_FREE			 102
-#define SUREWARE_F_SUREWAREHK_FINISH			 103
-#define SUREWARE_F_SUREWAREHK_INIT			 104
-#define SUREWARE_F_SUREWAREHK_LOAD_PRIVATE_KEY		 105
-#define SUREWARE_F_SUREWAREHK_LOAD_PUBLIC_KEY		 106
-#define SUREWARE_F_SUREWAREHK_MOD_EXP			 107
-#define SUREWARE_F_SUREWAREHK_RAND_BYTES		 108
-#define SUREWARE_F_SUREWAREHK_RAND_SEED			 109
-#define SUREWARE_F_SUREWAREHK_RSA_PRIV_DEC		 110
-#define SUREWARE_F_SUREWAREHK_RSA_PRIV_ENC		 111
-
-/* Reason codes. */
-#define SUREWARE_R_BIO_WAS_FREED			 100
-#define SUREWARE_R_MISSING_KEY_COMPONENTS		 105
-#define SUREWARE_R_REQUEST_FAILED			 101
-#define SUREWARE_R_REQUEST_FALLBACK			 102
-#define SUREWARE_R_SIZE_TOO_LARGE_OR_TOO_SMALL		 103
-#define SUREWARE_R_UNIT_FAILURE				 104
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/hw_ubsec_err.h b/include.new/openssl/hw_ubsec_err.h
deleted file mode 100644
index 023d3be..0000000
--- a/include.new/openssl/hw_ubsec_err.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_UBSEC_ERR_H
-#define HEADER_UBSEC_ERR_H
-
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-static void ERR_load_UBSEC_strings(void);
-static void ERR_unload_UBSEC_strings(void);
-static void ERR_UBSEC_error(int function, int reason, char *file, int line);
-#define UBSECerr(f,r) ERR_UBSEC_error((f),(r),__FILE__,__LINE__)
-
-/* Error codes for the UBSEC functions. */
-
-/* Function codes. */
-#define UBSEC_F_UBSEC_CTRL				 100
-#define UBSEC_F_UBSEC_DH_COMPUTE_KEY			 101
-#define UBSEC_F_UBSEC_DSA_SIGN				 102
-#define UBSEC_F_UBSEC_DSA_VERIFY			 103
-#define UBSEC_F_UBSEC_FINISH				 104
-#define UBSEC_F_UBSEC_INIT				 105
-#define UBSEC_F_UBSEC_MOD_EXP				 106
-#define UBSEC_F_UBSEC_RNG_BYTES				 107
-#define UBSEC_F_UBSEC_RSA_MOD_EXP			 108
-#define UBSEC_F_UBSEC_RSA_MOD_EXP_CRT			 109
-
-/* Reason codes. */
-#define UBSEC_R_ALREADY_LOADED				 100
-#define UBSEC_R_BN_EXPAND_FAIL				 101
-#define UBSEC_R_CTRL_COMMAND_NOT_IMPLEMENTED		 102
-#define UBSEC_R_DSO_FAILURE				 103
-#define UBSEC_R_MISSING_KEY_COMPONENTS			 104
-#define UBSEC_R_NOT_LOADED				 105
-#define UBSEC_R_REQUEST_FAILED				 106
-#define UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL		 107
-#define UBSEC_R_UNIT_FAILURE				 108
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/idea.h b/include.new/openssl/idea.h
deleted file mode 100644
index 6075984..0000000
--- a/include.new/openssl/idea.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* crypto/idea/idea.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_IDEA_H
-# define HEADER_IDEA_H
-
-# include <openssl/opensslconf.h>/* IDEA_INT, OPENSSL_NO_IDEA */
-
-# ifdef OPENSSL_NO_IDEA
-#  error IDEA is disabled.
-# endif
-
-# define IDEA_ENCRYPT    1
-# define IDEA_DECRYPT    0
-
-# define IDEA_BLOCK      8
-# define IDEA_KEY_LENGTH 16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct idea_key_st {
-    IDEA_INT data[9][6];
-} IDEA_KEY_SCHEDULE;
-
-const char *idea_options(void);
-void idea_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      IDEA_KEY_SCHEDULE *ks);
-# ifdef OPENSSL_FIPS
-void private_idea_set_encrypt_key(const unsigned char *key,
-                                  IDEA_KEY_SCHEDULE *ks);
-# endif
-void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks);
-void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk);
-void idea_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                      long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                      int enc);
-void idea_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                        int *num, int enc);
-void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv,
-                        int *num);
-void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/krb5_asn.h b/include.new/openssl/krb5_asn.h
deleted file mode 100644
index 9cf5a26..0000000
--- a/include.new/openssl/krb5_asn.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* krb5_asn.h */
-/*
- * Written by Vern Staats <staatsvr@asc.hpc.mil> for the OpenSSL project, **
- * using ocsp/{*.h,*asn*.c} as a starting point
- */
-
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_KRB5_ASN_H
-# define HEADER_KRB5_ASN_H
-
-/*
- * #include <krb5.h>
- */
-# include <openssl/safestack.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * ASN.1 from Kerberos RFC 1510
- */
-
-/*-     EncryptedData ::=   SEQUENCE {
- *              etype[0]                      INTEGER, -- EncryptionType
- *              kvno[1]                       INTEGER OPTIONAL,
- *              cipher[2]                     OCTET STRING -- ciphertext
- *      }
- */
-typedef struct krb5_encdata_st {
-    ASN1_INTEGER *etype;
-    ASN1_INTEGER *kvno;
-    ASN1_OCTET_STRING *cipher;
-} KRB5_ENCDATA;
-
-DECLARE_STACK_OF(KRB5_ENCDATA)
-
-/*-     PrincipalName ::=   SEQUENCE {
- *              name-type[0]                  INTEGER,
- *              name-string[1]                SEQUENCE OF GeneralString
- *      }
- */
-typedef struct krb5_princname_st {
-    ASN1_INTEGER *nametype;
-    STACK_OF(ASN1_GENERALSTRING) *namestring;
-} KRB5_PRINCNAME;
-
-DECLARE_STACK_OF(KRB5_PRINCNAME)
-
-/*-     Ticket ::=      [APPLICATION 1] SEQUENCE {
- *              tkt-vno[0]                    INTEGER,
- *              realm[1]                      Realm,
- *              sname[2]                      PrincipalName,
- *              enc-part[3]                   EncryptedData
- *      }
- */
-typedef struct krb5_tktbody_st {
-    ASN1_INTEGER *tktvno;
-    ASN1_GENERALSTRING *realm;
-    KRB5_PRINCNAME *sname;
-    KRB5_ENCDATA *encdata;
-} KRB5_TKTBODY;
-
-typedef STACK_OF(KRB5_TKTBODY) KRB5_TICKET;
-DECLARE_STACK_OF(KRB5_TKTBODY)
-
-/*-     AP-REQ ::=      [APPLICATION 14] SEQUENCE {
- *              pvno[0]                       INTEGER,
- *              msg-type[1]                   INTEGER,
- *              ap-options[2]                 APOptions,
- *              ticket[3]                     Ticket,
- *              authenticator[4]              EncryptedData
- *      }
- *
- *      APOptions ::=   BIT STRING {
- *              reserved(0), use-session-key(1), mutual-required(2) }
- */
-typedef struct krb5_ap_req_st {
-    ASN1_INTEGER *pvno;
-    ASN1_INTEGER *msgtype;
-    ASN1_BIT_STRING *apoptions;
-    KRB5_TICKET *ticket;
-    KRB5_ENCDATA *authenticator;
-} KRB5_APREQBODY;
-
-typedef STACK_OF(KRB5_APREQBODY) KRB5_APREQ;
-DECLARE_STACK_OF(KRB5_APREQBODY)
-
-/*      Authenticator Stuff     */
-
-/*-     Checksum ::=   SEQUENCE {
- *              cksumtype[0]                  INTEGER,
- *              checksum[1]                   OCTET STRING
- *      }
- */
-typedef struct krb5_checksum_st {
-    ASN1_INTEGER *ctype;
-    ASN1_OCTET_STRING *checksum;
-} KRB5_CHECKSUM;
-
-DECLARE_STACK_OF(KRB5_CHECKSUM)
-
-/*-     EncryptionKey ::=   SEQUENCE {
- *              keytype[0]                    INTEGER,
- *              keyvalue[1]                   OCTET STRING
- *      }
- */
-typedef struct krb5_encryptionkey_st {
-    ASN1_INTEGER *ktype;
-    ASN1_OCTET_STRING *keyvalue;
-} KRB5_ENCKEY;
-
-DECLARE_STACK_OF(KRB5_ENCKEY)
-
-/*-     AuthorizationData ::=   SEQUENCE OF SEQUENCE {
- *              ad-type[0]                    INTEGER,
- *              ad-data[1]                    OCTET STRING
- *      }
- */
-typedef struct krb5_authorization_st {
-    ASN1_INTEGER *adtype;
-    ASN1_OCTET_STRING *addata;
-} KRB5_AUTHDATA;
-
-DECLARE_STACK_OF(KRB5_AUTHDATA)
-
-/*-     -- Unencrypted authenticator
- *      Authenticator ::=    [APPLICATION 2] SEQUENCE    {
- *              authenticator-vno[0]          INTEGER,
- *              crealm[1]                     Realm,
- *              cname[2]                      PrincipalName,
- *              cksum[3]                      Checksum OPTIONAL,
- *              cusec[4]                      INTEGER,
- *              ctime[5]                      KerberosTime,
- *              subkey[6]                     EncryptionKey OPTIONAL,
- *              seq-number[7]                 INTEGER OPTIONAL,
- *              authorization-data[8]         AuthorizationData OPTIONAL
- *      }
- */
-typedef struct krb5_authenticator_st {
-    ASN1_INTEGER *avno;
-    ASN1_GENERALSTRING *crealm;
-    KRB5_PRINCNAME *cname;
-    KRB5_CHECKSUM *cksum;
-    ASN1_INTEGER *cusec;
-    ASN1_GENERALIZEDTIME *ctime;
-    KRB5_ENCKEY *subkey;
-    ASN1_INTEGER *seqnum;
-    KRB5_AUTHDATA *authorization;
-} KRB5_AUTHENTBODY;
-
-typedef STACK_OF(KRB5_AUTHENTBODY) KRB5_AUTHENT;
-DECLARE_STACK_OF(KRB5_AUTHENTBODY)
-
-/*-  DECLARE_ASN1_FUNCTIONS(type) = DECLARE_ASN1_FUNCTIONS_name(type, type) =
- *      type *name##_new(void);
- *      void name##_free(type *a);
- *      DECLARE_ASN1_ENCODE_FUNCTIONS(type, name, name) =
- *       DECLARE_ASN1_ENCODE_FUNCTIONS(type, itname, name) =
- *        type *d2i_##name(type **a, const unsigned char **in, long len);
- *        int i2d_##name(type *a, unsigned char **out);
- *        DECLARE_ASN1_ITEM(itname) = OPENSSL_EXTERN const ASN1_ITEM itname##_it
- */
-
-DECLARE_ASN1_FUNCTIONS(KRB5_ENCDATA)
-DECLARE_ASN1_FUNCTIONS(KRB5_PRINCNAME)
-DECLARE_ASN1_FUNCTIONS(KRB5_TKTBODY)
-DECLARE_ASN1_FUNCTIONS(KRB5_APREQBODY)
-DECLARE_ASN1_FUNCTIONS(KRB5_TICKET)
-DECLARE_ASN1_FUNCTIONS(KRB5_APREQ)
-
-DECLARE_ASN1_FUNCTIONS(KRB5_CHECKSUM)
-DECLARE_ASN1_FUNCTIONS(KRB5_ENCKEY)
-DECLARE_ASN1_FUNCTIONS(KRB5_AUTHDATA)
-DECLARE_ASN1_FUNCTIONS(KRB5_AUTHENTBODY)
-DECLARE_ASN1_FUNCTIONS(KRB5_AUTHENT)
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/kssl.h b/include.new/openssl/kssl.h
deleted file mode 100644
index 9a57672..0000000
--- a/include.new/openssl/kssl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/* ssl/kssl.h -*- mode: C; c-file-style: "eay" -*- */
-/*
- * Written by Vern Staats <staatsvr@asc.hpc.mil> for the OpenSSL project
- * 2000. project 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
- **      19990701        VRS     Started.
- */
-
-#ifndef KSSL_H
-# define KSSL_H
-
-# include <openssl/opensslconf.h>
-
-# ifndef OPENSSL_NO_KRB5
-
-#  include <stdio.h>
-#  include <ctype.h>
-#  include <krb5.h>
-#  ifdef OPENSSL_SYS_WIN32
-/*
- * These can sometimes get redefined indirectly by krb5 header files after
- * they get undefed in ossl_typ.h
- */
-#   undef X509_NAME
-#   undef X509_EXTENSIONS
-#   undef OCSP_REQUEST
-#   undef OCSP_RESPONSE
-#  endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- *      Depending on which KRB5 implementation used, some types from
- *      the other may be missing.  Resolve that here and now
- */
-#  ifdef KRB5_HEIMDAL
-typedef unsigned char krb5_octet;
-#   define FAR
-#  else
-
-#   ifndef FAR
-#    define FAR
-#   endif
-
-#  endif
-
-/*-
- *      Uncomment this to debug kssl problems or
- *      to trace usage of the Kerberos session key
- *
- *      #define         KSSL_DEBUG
- */
-
-#  ifndef KRB5SVC
-#   define KRB5SVC "host"
-#  endif
-
-#  ifndef KRB5KEYTAB
-#   define KRB5KEYTAB      "/etc/krb5.keytab"
-#  endif
-
-#  ifndef KRB5SENDAUTH
-#   define KRB5SENDAUTH    1
-#  endif
-
-#  ifndef KRB5CHECKAUTH
-#   define KRB5CHECKAUTH   1
-#  endif
-
-#  ifndef KSSL_CLOCKSKEW
-#   define KSSL_CLOCKSKEW  300;
-#  endif
-
-#  define KSSL_ERR_MAX    255
-typedef struct kssl_err_st {
-    int reason;
-    char text[KSSL_ERR_MAX + 1];
-} KSSL_ERR;
-
-/*-     Context for passing
- *              (1) Kerberos session key to SSL, and
- *              (2)     Config data between application and SSL lib
- */
-typedef struct kssl_ctx_st {
-    /*      used by:    disposition:            */
-    char *service_name;         /* C,S default ok (kssl) */
-    char *service_host;         /* C input, REQUIRED */
-    char *client_princ;         /* S output from krb5 ticket */
-    char *keytab_file;          /* S NULL (/etc/krb5.keytab) */
-    char *cred_cache;           /* C NULL (default) */
-    krb5_enctype enctype;
-    int length;
-    krb5_octet FAR *key;
-} KSSL_CTX;
-
-#  define KSSL_CLIENT     1
-#  define KSSL_SERVER     2
-#  define KSSL_SERVICE    3
-#  define KSSL_KEYTAB     4
-
-#  define KSSL_CTX_OK     0
-#  define KSSL_CTX_ERR    1
-#  define KSSL_NOMEM      2
-
-/* Public (for use by applications that use OpenSSL with Kerberos 5 support */
-krb5_error_code kssl_ctx_setstring(KSSL_CTX *kssl_ctx, int which, char *text);
-KSSL_CTX *kssl_ctx_new(void);
-KSSL_CTX *kssl_ctx_free(KSSL_CTX *kssl_ctx);
-void kssl_ctx_show(KSSL_CTX *kssl_ctx);
-krb5_error_code kssl_ctx_setprinc(KSSL_CTX *kssl_ctx, int which,
-                                  krb5_data *realm, krb5_data *entity,
-                                  int nentities);
-krb5_error_code kssl_cget_tkt(KSSL_CTX *kssl_ctx, krb5_data **enc_tktp,
-                              krb5_data *authenp, KSSL_ERR *kssl_err);
-krb5_error_code kssl_sget_tkt(KSSL_CTX *kssl_ctx, krb5_data *indata,
-                              krb5_ticket_times *ttimes, KSSL_ERR *kssl_err);
-krb5_error_code kssl_ctx_setkey(KSSL_CTX *kssl_ctx, krb5_keyblock *session);
-void kssl_err_set(KSSL_ERR *kssl_err, int reason, char *text);
-void kssl_krb5_free_data_contents(krb5_context context, krb5_data *data);
-krb5_error_code kssl_build_principal_2(krb5_context context,
-                                       krb5_principal *princ, int rlen,
-                                       const char *realm, int slen,
-                                       const char *svc, int hlen,
-                                       const char *host);
-krb5_error_code kssl_validate_times(krb5_timestamp atime,
-                                    krb5_ticket_times *ttimes);
-krb5_error_code kssl_check_authent(KSSL_CTX *kssl_ctx, krb5_data *authentp,
-                                   krb5_timestamp *atimep,
-                                   KSSL_ERR *kssl_err);
-unsigned char *kssl_skip_confound(krb5_enctype enctype, unsigned char *authn);
-
-void SSL_set0_kssl_ctx(SSL *s, KSSL_CTX *kctx);
-KSSL_CTX *SSL_get0_kssl_ctx(SSL *s);
-char *kssl_ctx_get0_client_princ(KSSL_CTX *kctx);
-
-#ifdef  __cplusplus
-}
-#endif
-# endif                         /* OPENSSL_NO_KRB5 */
-#endif                          /* KSSL_H */
diff --git a/include.new/openssl/lhash.h b/include.new/openssl/lhash.h
deleted file mode 100644
index b6c328b..0000000
--- a/include.new/openssl/lhash.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/* crypto/lhash/lhash.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*
- * Header for dynamic hash table routines Author - Eric Young
- */
-
-#ifndef HEADER_LHASH_H
-# define HEADER_LHASH_H
-
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_FP_API
-#  include <stdio.h>
-# endif
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct lhash_node_st {
-    void *data;
-    struct lhash_node_st *next;
-# ifndef OPENSSL_NO_HASH_COMP
-    unsigned long hash;
-# endif
-} LHASH_NODE;
-
-typedef int (*LHASH_COMP_FN_TYPE) (const void *, const void *);
-typedef unsigned long (*LHASH_HASH_FN_TYPE) (const void *);
-typedef void (*LHASH_DOALL_FN_TYPE) (void *);
-typedef void (*LHASH_DOALL_ARG_FN_TYPE) (void *, void *);
-
-/*
- * Macros for declaring and implementing type-safe wrappers for LHASH
- * callbacks. This way, callbacks can be provided to LHASH structures without
- * function pointer casting and the macro-defined callbacks provide
- * per-variable casting before deferring to the underlying type-specific
- * callbacks. NB: It is possible to place a "static" in front of both the
- * DECLARE and IMPLEMENT macros if the functions are strictly internal.
- */
-
-/* First: "hash" functions */
-# define DECLARE_LHASH_HASH_FN(name, o_type) \
-        unsigned long name##_LHASH_HASH(const void *);
-# define IMPLEMENT_LHASH_HASH_FN(name, o_type) \
-        unsigned long name##_LHASH_HASH(const void *arg) { \
-                const o_type *a = arg; \
-                return name##_hash(a); }
-# define LHASH_HASH_FN(name) name##_LHASH_HASH
-
-/* Second: "compare" functions */
-# define DECLARE_LHASH_COMP_FN(name, o_type) \
-        int name##_LHASH_COMP(const void *, const void *);
-# define IMPLEMENT_LHASH_COMP_FN(name, o_type) \
-        int name##_LHASH_COMP(const void *arg1, const void *arg2) { \
-                const o_type *a = arg1;             \
-                const o_type *b = arg2; \
-                return name##_cmp(a,b); }
-# define LHASH_COMP_FN(name) name##_LHASH_COMP
-
-/* Third: "doall" functions */
-# define DECLARE_LHASH_DOALL_FN(name, o_type) \
-        void name##_LHASH_DOALL(void *);
-# define IMPLEMENT_LHASH_DOALL_FN(name, o_type) \
-        void name##_LHASH_DOALL(void *arg) { \
-                o_type *a = arg; \
-                name##_doall(a); }
-# define LHASH_DOALL_FN(name) name##_LHASH_DOALL
-
-/* Fourth: "doall_arg" functions */
-# define DECLARE_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-        void name##_LHASH_DOALL_ARG(void *, void *);
-# define IMPLEMENT_LHASH_DOALL_ARG_FN(name, o_type, a_type) \
-        void name##_LHASH_DOALL_ARG(void *arg1, void *arg2) { \
-                o_type *a = arg1; \
-                a_type *b = arg2; \
-                name##_doall_arg(a, b); }
-# define LHASH_DOALL_ARG_FN(name) name##_LHASH_DOALL_ARG
-
-typedef struct lhash_st {
-    LHASH_NODE **b;
-    LHASH_COMP_FN_TYPE comp;
-    LHASH_HASH_FN_TYPE hash;
-    unsigned int num_nodes;
-    unsigned int num_alloc_nodes;
-    unsigned int p;
-    unsigned int pmax;
-    unsigned long up_load;      /* load times 256 */
-    unsigned long down_load;    /* load times 256 */
-    unsigned long num_items;
-    unsigned long num_expands;
-    unsigned long num_expand_reallocs;
-    unsigned long num_contracts;
-    unsigned long num_contract_reallocs;
-    unsigned long num_hash_calls;
-    unsigned long num_comp_calls;
-    unsigned long num_insert;
-    unsigned long num_replace;
-    unsigned long num_delete;
-    unsigned long num_no_delete;
-    unsigned long num_retrieve;
-    unsigned long num_retrieve_miss;
-    unsigned long num_hash_comps;
-    int error;
-} _LHASH;                       /* Do not use _LHASH directly, use LHASH_OF
-                                 * and friends */
-
-# define LH_LOAD_MULT    256
-
-/*
- * Indicates a malloc() error in the last call, this is only bad in
- * lh_insert().
- */
-# define lh_error(lh)    ((lh)->error)
-
-_LHASH *lh_new(LHASH_HASH_FN_TYPE h, LHASH_COMP_FN_TYPE c);
-void lh_free(_LHASH *lh);
-void *lh_insert(_LHASH *lh, void *data);
-void *lh_delete(_LHASH *lh, const void *data);
-void *lh_retrieve(_LHASH *lh, const void *data);
-void lh_doall(_LHASH *lh, LHASH_DOALL_FN_TYPE func);
-void lh_doall_arg(_LHASH *lh, LHASH_DOALL_ARG_FN_TYPE func, void *arg);
-unsigned long lh_strhash(const char *c);
-unsigned long lh_num_items(const _LHASH *lh);
-
-# ifndef OPENSSL_NO_FP_API
-void lh_stats(const _LHASH *lh, FILE *out);
-void lh_node_stats(const _LHASH *lh, FILE *out);
-void lh_node_usage_stats(const _LHASH *lh, FILE *out);
-# endif
-
-# ifndef OPENSSL_NO_BIO
-void lh_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_stats_bio(const _LHASH *lh, BIO *out);
-void lh_node_usage_stats_bio(const _LHASH *lh, BIO *out);
-# endif
-
-/* Type checking... */
-
-# define LHASH_OF(type) struct lhash_st_##type
-
-# define DECLARE_LHASH_OF(type) LHASH_OF(type) { int dummy; }
-
-# define CHECKED_LHASH_OF(type,lh) \
-  ((_LHASH *)CHECKED_PTR_OF(LHASH_OF(type),lh))
-
-/* Define wrapper functions. */
-# define LHM_lh_new(type, name) \
-  ((LHASH_OF(type) *)lh_new(LHASH_HASH_FN(name), LHASH_COMP_FN(name)))
-# define LHM_lh_error(type, lh) \
-  lh_error(CHECKED_LHASH_OF(type,lh))
-# define LHM_lh_insert(type, lh, inst) \
-  ((type *)lh_insert(CHECKED_LHASH_OF(type, lh), \
-                     CHECKED_PTR_OF(type, inst)))
-# define LHM_lh_retrieve(type, lh, inst) \
-  ((type *)lh_retrieve(CHECKED_LHASH_OF(type, lh), \
-                       CHECKED_PTR_OF(type, inst)))
-# define LHM_lh_delete(type, lh, inst) \
-  ((type *)lh_delete(CHECKED_LHASH_OF(type, lh),                        \
-                     CHECKED_PTR_OF(type, inst)))
-# define LHM_lh_doall(type, lh,fn) lh_doall(CHECKED_LHASH_OF(type, lh), fn)
-# define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \
-  lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
-# define LHM_lh_num_items(type, lh) lh_num_items(CHECKED_LHASH_OF(type, lh))
-# define LHM_lh_down_load(type, lh) (CHECKED_LHASH_OF(type, lh)->down_load)
-# define LHM_lh_node_stats_bio(type, lh, out) \
-  lh_node_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-# define LHM_lh_node_usage_stats_bio(type, lh, out) \
-  lh_node_usage_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-# define LHM_lh_stats_bio(type, lh, out) \
-  lh_stats_bio(CHECKED_LHASH_OF(type, lh), out)
-# define LHM_lh_free(type, lh) lh_free(CHECKED_LHASH_OF(type, lh))
-
-DECLARE_LHASH_OF(OPENSSL_STRING);
-DECLARE_LHASH_OF(OPENSSL_CSTRING);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/md2.h b/include.new/openssl/md2.h
deleted file mode 100644
index ad92414..0000000
--- a/include.new/openssl/md2.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* crypto/md/md2.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MD2_H
-#define HEADER_MD2_H
-
-#ifdef OPENSSL_NO_MD2
-#error MD2 is disabled.
-#endif
-
-#define MD2_DIGEST_LENGTH	16
-#define MD2_BLOCK       	16
-#include <openssl/opensslconf.h> /* MD2_INT */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct MD2state_st
-	{
-	int num;
-	unsigned char data[MD2_BLOCK];
-	MD2_INT cksm[MD2_BLOCK];
-	MD2_INT state[MD2_BLOCK];
-	} MD2_CTX;
-
-const char *MD2_options(void);
-int MD2_Init(MD2_CTX *c);
-int MD2_Update(MD2_CTX *c, const unsigned char *data, unsigned long len);
-int MD2_Final(unsigned char *md, MD2_CTX *c);
-unsigned char *MD2(const unsigned char *d, unsigned long n,unsigned char *md);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/md4.h b/include.new/openssl/md4.h
deleted file mode 100644
index 11fd712..0000000
--- a/include.new/openssl/md4.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* crypto/md4/md4.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MD4_H
-# define HEADER_MD4_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_MD4
-#  error MD4 is disabled.
-# endif
-
-/*-
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD4_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD4_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-# if defined(__LP32__)
-#  define MD4_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define MD4_LONG unsigned long
-#  define MD4_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *                                      <appro@fy.chalmers.se>
- */
-# else
-#  define MD4_LONG unsigned int
-# endif
-
-# define MD4_CBLOCK      64
-# define MD4_LBLOCK      (MD4_CBLOCK/4)
-# define MD4_DIGEST_LENGTH 16
-
-typedef struct MD4state_st {
-    MD4_LONG A, B, C, D;
-    MD4_LONG Nl, Nh;
-    MD4_LONG data[MD4_LBLOCK];
-    unsigned int num;
-} MD4_CTX;
-
-# ifdef OPENSSL_FIPS
-int private_MD4_Init(MD4_CTX *c);
-# endif
-int MD4_Init(MD4_CTX *c);
-int MD4_Update(MD4_CTX *c, const void *data, size_t len);
-int MD4_Final(unsigned char *md, MD4_CTX *c);
-unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md);
-void MD4_Transform(MD4_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/md5.h b/include.new/openssl/md5.h
deleted file mode 100644
index 2659038..0000000
--- a/include.new/openssl/md5.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* crypto/md5/md5.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MD5_H
-# define HEADER_MD5_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_MD5
-#  error MD5 is disabled.
-# endif
-
-/*
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! MD5_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! MD5_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-# if defined(__LP32__)
-#  define MD5_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define MD5_LONG unsigned long
-#  define MD5_LONG_LOG2 3
-/*
- * _CRAY note. I could declare short, but I have no idea what impact
- * does it have on performance on none-T3E machines. I could declare
- * int, but at least on C90 sizeof(int) can be chosen at compile time.
- * So I've chosen long...
- *                                      <appro@fy.chalmers.se>
- */
-# else
-#  define MD5_LONG unsigned int
-# endif
-
-# define MD5_CBLOCK      64
-# define MD5_LBLOCK      (MD5_CBLOCK/4)
-# define MD5_DIGEST_LENGTH 16
-
-typedef struct MD5state_st {
-    MD5_LONG A, B, C, D;
-    MD5_LONG Nl, Nh;
-    MD5_LONG data[MD5_LBLOCK];
-    unsigned int num;
-} MD5_CTX;
-
-# ifdef OPENSSL_FIPS
-int private_MD5_Init(MD5_CTX *c);
-# endif
-int MD5_Init(MD5_CTX *c);
-int MD5_Update(MD5_CTX *c, const void *data, size_t len);
-int MD5_Final(unsigned char *md, MD5_CTX *c);
-unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md);
-void MD5_Transform(MD5_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/mdc2.h b/include.new/openssl/mdc2.h
deleted file mode 100644
index 7efe53b..0000000
--- a/include.new/openssl/mdc2.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* crypto/mdc2/mdc2.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_MDC2_H
-# define HEADER_MDC2_H
-
-# include <openssl/des.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_MDC2
-#  error MDC2 is disabled.
-# endif
-
-# define MDC2_BLOCK              8
-# define MDC2_DIGEST_LENGTH      16
-
-typedef struct mdc2_ctx_st {
-    unsigned int num;
-    unsigned char data[MDC2_BLOCK];
-    DES_cblock h, hh;
-    int pad_type;               /* either 1 or 2, default 1 */
-} MDC2_CTX;
-
-# ifdef OPENSSL_FIPS
-int private_MDC2_Init(MDC2_CTX *c);
-# endif
-int MDC2_Init(MDC2_CTX *c);
-int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len);
-int MDC2_Final(unsigned char *md, MDC2_CTX *c);
-unsigned char *MDC2(const unsigned char *d, size_t n, unsigned char *md);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/modes.h b/include.new/openssl/modes.h
deleted file mode 100644
index 880f020..0000000
--- a/include.new/openssl/modes.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* ====================================================================
- * Copyright (c) 2008 The OpenSSL Project. All rights reserved.
- *
- * Rights for redistribution and usage in source and binary
- * forms are granted according to the OpenSSL license.
- */
-
-#include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-typedef void (*block128_f) (const unsigned char in[16],
-                            unsigned char out[16], const void *key);
-
-typedef void (*cbc128_f) (const unsigned char *in, unsigned char *out,
-                          size_t len, const void *key,
-                          unsigned char ivec[16], int enc);
-
-typedef void (*ctr128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          const unsigned char ivec[16]);
-
-typedef void (*ccm128_f) (const unsigned char *in, unsigned char *out,
-                          size_t blocks, const void *key,
-                          const unsigned char ivec[16],
-                          unsigned char cmac[16]);
-
-void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], block128_f block);
-void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], block128_f block);
-
-void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16],
-                           unsigned char ecount_buf[16], unsigned int *num,
-                           block128_f block);
-
-void CRYPTO_ctr128_encrypt_ctr32(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec[16],
-                                 unsigned char ecount_buf[16],
-                                 unsigned int *num, ctr128_f ctr);
-
-void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], int *num,
-                           block128_f block);
-
-void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                           size_t len, const void *key,
-                           unsigned char ivec[16], int *num,
-                           int enc, block128_f block);
-void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t length, const void *key,
-                             unsigned char ivec[16], int *num,
-                             int enc, block128_f block);
-void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t bits, const void *key,
-                             unsigned char ivec[16], int *num,
-                             int enc, block128_f block);
-
-size_t CRYPTO_cts128_encrypt_block(const unsigned char *in,
-                                   unsigned char *out, size_t len,
-                                   const void *key, unsigned char ivec[16],
-                                   block128_f block);
-size_t CRYPTO_cts128_encrypt(const unsigned char *in, unsigned char *out,
-                             size_t len, const void *key,
-                             unsigned char ivec[16], cbc128_f cbc);
-size_t CRYPTO_cts128_decrypt_block(const unsigned char *in,
-                                   unsigned char *out, size_t len,
-                                   const void *key, unsigned char ivec[16],
-                                   block128_f block);
-size_t CRYPTO_cts128_decrypt(const unsigned char *in, unsigned char *out,
-                             size_t len, const void *key,
-                             unsigned char ivec[16], cbc128_f cbc);
-
-size_t CRYPTO_nistcts128_encrypt_block(const unsigned char *in,
-                                       unsigned char *out, size_t len,
-                                       const void *key,
-                                       unsigned char ivec[16],
-                                       block128_f block);
-size_t CRYPTO_nistcts128_encrypt(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec[16], cbc128_f cbc);
-size_t CRYPTO_nistcts128_decrypt_block(const unsigned char *in,
-                                       unsigned char *out, size_t len,
-                                       const void *key,
-                                       unsigned char ivec[16],
-                                       block128_f block);
-size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out,
-                                 size_t len, const void *key,
-                                 unsigned char ivec[16], cbc128_f cbc);
-
-typedef struct gcm128_context GCM128_CONTEXT;
-
-GCM128_CONTEXT *CRYPTO_gcm128_new(void *key, block128_f block);
-void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx, void *key, block128_f block);
-void CRYPTO_gcm128_setiv(GCM128_CONTEXT *ctx, const unsigned char *iv,
-                         size_t len);
-int CRYPTO_gcm128_aad(GCM128_CONTEXT *ctx, const unsigned char *aad,
-                      size_t len);
-int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len);
-int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
-                          const unsigned char *in, unsigned char *out,
-                          size_t len);
-int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
-                                const unsigned char *in, unsigned char *out,
-                                size_t len, ctr128_f stream);
-int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
-                                const unsigned char *in, unsigned char *out,
-                                size_t len, ctr128_f stream);
-int CRYPTO_gcm128_finish(GCM128_CONTEXT *ctx, const unsigned char *tag,
-                         size_t len);
-void CRYPTO_gcm128_tag(GCM128_CONTEXT *ctx, unsigned char *tag, size_t len);
-void CRYPTO_gcm128_release(GCM128_CONTEXT *ctx);
-
-typedef struct ccm128_context CCM128_CONTEXT;
-
-void CRYPTO_ccm128_init(CCM128_CONTEXT *ctx,
-                        unsigned int M, unsigned int L, void *key,
-                        block128_f block);
-int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx, const unsigned char *nonce,
-                        size_t nlen, size_t mlen);
-void CRYPTO_ccm128_aad(CCM128_CONTEXT *ctx, const unsigned char *aad,
-                       size_t alen);
-int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                          unsigned char *out, size_t len);
-int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                          unsigned char *out, size_t len);
-int CRYPTO_ccm128_encrypt_ccm64(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                                unsigned char *out, size_t len,
-                                ccm128_f stream);
-int CRYPTO_ccm128_decrypt_ccm64(CCM128_CONTEXT *ctx, const unsigned char *inp,
-                                unsigned char *out, size_t len,
-                                ccm128_f stream);
-size_t CRYPTO_ccm128_tag(CCM128_CONTEXT *ctx, unsigned char *tag, size_t len);
-
-typedef struct xts128_context XTS128_CONTEXT;
-
-int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx,
-                          const unsigned char iv[16],
-                          const unsigned char *inp, unsigned char *out,
-                          size_t len, int enc);
-
-#ifdef  __cplusplus
-}
-#endif
diff --git a/include.new/openssl/obj_mac.h b/include.new/openssl/obj_mac.h
deleted file mode 100644
index f752aef..0000000
--- a/include.new/openssl/obj_mac.h
+++ /dev/null
@@ -1,4031 +0,0 @@
-/* crypto/objects/obj_mac.h */
-
-/*
- * THIS FILE IS GENERATED FROM objects.txt by objects.pl via the following
- * command: perl objects.pl objects.txt obj_mac.num obj_mac.h
- */
-
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#define SN_undef                        "UNDEF"
-#define LN_undef                        "undefined"
-#define NID_undef                       0
-#define OBJ_undef                       0L
-
-#define SN_itu_t                "ITU-T"
-#define LN_itu_t                "itu-t"
-#define NID_itu_t               645
-#define OBJ_itu_t               0L
-
-#define NID_ccitt               404
-#define OBJ_ccitt               OBJ_itu_t
-
-#define SN_iso          "ISO"
-#define LN_iso          "iso"
-#define NID_iso         181
-#define OBJ_iso         1L
-
-#define SN_joint_iso_itu_t              "JOINT-ISO-ITU-T"
-#define LN_joint_iso_itu_t              "joint-iso-itu-t"
-#define NID_joint_iso_itu_t             646
-#define OBJ_joint_iso_itu_t             2L
-
-#define NID_joint_iso_ccitt             393
-#define OBJ_joint_iso_ccitt             OBJ_joint_iso_itu_t
-
-#define SN_member_body          "member-body"
-#define LN_member_body          "ISO Member Body"
-#define NID_member_body         182
-#define OBJ_member_body         OBJ_iso,2L
-
-#define SN_identified_organization              "identified-organization"
-#define NID_identified_organization             676
-#define OBJ_identified_organization             OBJ_iso,3L
-
-#define SN_hmac_md5             "HMAC-MD5"
-#define LN_hmac_md5             "hmac-md5"
-#define NID_hmac_md5            780
-#define OBJ_hmac_md5            OBJ_identified_organization,6L,1L,5L,5L,8L,1L,1L
-
-#define SN_hmac_sha1            "HMAC-SHA1"
-#define LN_hmac_sha1            "hmac-sha1"
-#define NID_hmac_sha1           781
-#define OBJ_hmac_sha1           OBJ_identified_organization,6L,1L,5L,5L,8L,1L,2L
-
-#define SN_certicom_arc         "certicom-arc"
-#define NID_certicom_arc                677
-#define OBJ_certicom_arc                OBJ_identified_organization,132L
-
-#define SN_international_organizations          "international-organizations"
-#define LN_international_organizations          "International Organizations"
-#define NID_international_organizations         647
-#define OBJ_international_organizations         OBJ_joint_iso_itu_t,23L
-
-#define SN_wap          "wap"
-#define NID_wap         678
-#define OBJ_wap         OBJ_international_organizations,43L
-
-#define SN_wap_wsg              "wap-wsg"
-#define NID_wap_wsg             679
-#define OBJ_wap_wsg             OBJ_wap,1L
-
-#define SN_selected_attribute_types             "selected-attribute-types"
-#define LN_selected_attribute_types             "Selected Attribute Types"
-#define NID_selected_attribute_types            394
-#define OBJ_selected_attribute_types            OBJ_joint_iso_itu_t,5L,1L,5L
-
-#define SN_clearance            "clearance"
-#define NID_clearance           395
-#define OBJ_clearance           OBJ_selected_attribute_types,55L
-
-#define SN_ISO_US               "ISO-US"
-#define LN_ISO_US               "ISO US Member Body"
-#define NID_ISO_US              183
-#define OBJ_ISO_US              OBJ_member_body,840L
-
-#define SN_X9_57                "X9-57"
-#define LN_X9_57                "X9.57"
-#define NID_X9_57               184
-#define OBJ_X9_57               OBJ_ISO_US,10040L
-
-#define SN_X9cm         "X9cm"
-#define LN_X9cm         "X9.57 CM ?"
-#define NID_X9cm                185
-#define OBJ_X9cm                OBJ_X9_57,4L
-
-#define SN_dsa          "DSA"
-#define LN_dsa          "dsaEncryption"
-#define NID_dsa         116
-#define OBJ_dsa         OBJ_X9cm,1L
-
-#define SN_dsaWithSHA1          "DSA-SHA1"
-#define LN_dsaWithSHA1          "dsaWithSHA1"
-#define NID_dsaWithSHA1         113
-#define OBJ_dsaWithSHA1         OBJ_X9cm,3L
-
-#define SN_ansi_X9_62           "ansi-X9-62"
-#define LN_ansi_X9_62           "ANSI X9.62"
-#define NID_ansi_X9_62          405
-#define OBJ_ansi_X9_62          OBJ_ISO_US,10045L
-
-#define OBJ_X9_62_id_fieldType          OBJ_ansi_X9_62,1L
-
-#define SN_X9_62_prime_field            "prime-field"
-#define NID_X9_62_prime_field           406
-#define OBJ_X9_62_prime_field           OBJ_X9_62_id_fieldType,1L
-
-#define SN_X9_62_characteristic_two_field               "characteristic-two-field"
-#define NID_X9_62_characteristic_two_field              407
-#define OBJ_X9_62_characteristic_two_field              OBJ_X9_62_id_fieldType,2L
-
-#define SN_X9_62_id_characteristic_two_basis            "id-characteristic-two-basis"
-#define NID_X9_62_id_characteristic_two_basis           680
-#define OBJ_X9_62_id_characteristic_two_basis           OBJ_X9_62_characteristic_two_field,3L
-
-#define SN_X9_62_onBasis                "onBasis"
-#define NID_X9_62_onBasis               681
-#define OBJ_X9_62_onBasis               OBJ_X9_62_id_characteristic_two_basis,1L
-
-#define SN_X9_62_tpBasis                "tpBasis"
-#define NID_X9_62_tpBasis               682
-#define OBJ_X9_62_tpBasis               OBJ_X9_62_id_characteristic_two_basis,2L
-
-#define SN_X9_62_ppBasis                "ppBasis"
-#define NID_X9_62_ppBasis               683
-#define OBJ_X9_62_ppBasis               OBJ_X9_62_id_characteristic_two_basis,3L
-
-#define OBJ_X9_62_id_publicKeyType              OBJ_ansi_X9_62,2L
-
-#define SN_X9_62_id_ecPublicKey         "id-ecPublicKey"
-#define NID_X9_62_id_ecPublicKey                408
-#define OBJ_X9_62_id_ecPublicKey                OBJ_X9_62_id_publicKeyType,1L
-
-#define OBJ_X9_62_ellipticCurve         OBJ_ansi_X9_62,3L
-
-#define OBJ_X9_62_c_TwoCurve            OBJ_X9_62_ellipticCurve,0L
-
-#define SN_X9_62_c2pnb163v1             "c2pnb163v1"
-#define NID_X9_62_c2pnb163v1            684
-#define OBJ_X9_62_c2pnb163v1            OBJ_X9_62_c_TwoCurve,1L
-
-#define SN_X9_62_c2pnb163v2             "c2pnb163v2"
-#define NID_X9_62_c2pnb163v2            685
-#define OBJ_X9_62_c2pnb163v2            OBJ_X9_62_c_TwoCurve,2L
-
-#define SN_X9_62_c2pnb163v3             "c2pnb163v3"
-#define NID_X9_62_c2pnb163v3            686
-#define OBJ_X9_62_c2pnb163v3            OBJ_X9_62_c_TwoCurve,3L
-
-#define SN_X9_62_c2pnb176v1             "c2pnb176v1"
-#define NID_X9_62_c2pnb176v1            687
-#define OBJ_X9_62_c2pnb176v1            OBJ_X9_62_c_TwoCurve,4L
-
-#define SN_X9_62_c2tnb191v1             "c2tnb191v1"
-#define NID_X9_62_c2tnb191v1            688
-#define OBJ_X9_62_c2tnb191v1            OBJ_X9_62_c_TwoCurve,5L
-
-#define SN_X9_62_c2tnb191v2             "c2tnb191v2"
-#define NID_X9_62_c2tnb191v2            689
-#define OBJ_X9_62_c2tnb191v2            OBJ_X9_62_c_TwoCurve,6L
-
-#define SN_X9_62_c2tnb191v3             "c2tnb191v3"
-#define NID_X9_62_c2tnb191v3            690
-#define OBJ_X9_62_c2tnb191v3            OBJ_X9_62_c_TwoCurve,7L
-
-#define SN_X9_62_c2onb191v4             "c2onb191v4"
-#define NID_X9_62_c2onb191v4            691
-#define OBJ_X9_62_c2onb191v4            OBJ_X9_62_c_TwoCurve,8L
-
-#define SN_X9_62_c2onb191v5             "c2onb191v5"
-#define NID_X9_62_c2onb191v5            692
-#define OBJ_X9_62_c2onb191v5            OBJ_X9_62_c_TwoCurve,9L
-
-#define SN_X9_62_c2pnb208w1             "c2pnb208w1"
-#define NID_X9_62_c2pnb208w1            693
-#define OBJ_X9_62_c2pnb208w1            OBJ_X9_62_c_TwoCurve,10L
-
-#define SN_X9_62_c2tnb239v1             "c2tnb239v1"
-#define NID_X9_62_c2tnb239v1            694
-#define OBJ_X9_62_c2tnb239v1            OBJ_X9_62_c_TwoCurve,11L
-
-#define SN_X9_62_c2tnb239v2             "c2tnb239v2"
-#define NID_X9_62_c2tnb239v2            695
-#define OBJ_X9_62_c2tnb239v2            OBJ_X9_62_c_TwoCurve,12L
-
-#define SN_X9_62_c2tnb239v3             "c2tnb239v3"
-#define NID_X9_62_c2tnb239v3            696
-#define OBJ_X9_62_c2tnb239v3            OBJ_X9_62_c_TwoCurve,13L
-
-#define SN_X9_62_c2onb239v4             "c2onb239v4"
-#define NID_X9_62_c2onb239v4            697
-#define OBJ_X9_62_c2onb239v4            OBJ_X9_62_c_TwoCurve,14L
-
-#define SN_X9_62_c2onb239v5             "c2onb239v5"
-#define NID_X9_62_c2onb239v5            698
-#define OBJ_X9_62_c2onb239v5            OBJ_X9_62_c_TwoCurve,15L
-
-#define SN_X9_62_c2pnb272w1             "c2pnb272w1"
-#define NID_X9_62_c2pnb272w1            699
-#define OBJ_X9_62_c2pnb272w1            OBJ_X9_62_c_TwoCurve,16L
-
-#define SN_X9_62_c2pnb304w1             "c2pnb304w1"
-#define NID_X9_62_c2pnb304w1            700
-#define OBJ_X9_62_c2pnb304w1            OBJ_X9_62_c_TwoCurve,17L
-
-#define SN_X9_62_c2tnb359v1             "c2tnb359v1"
-#define NID_X9_62_c2tnb359v1            701
-#define OBJ_X9_62_c2tnb359v1            OBJ_X9_62_c_TwoCurve,18L
-
-#define SN_X9_62_c2pnb368w1             "c2pnb368w1"
-#define NID_X9_62_c2pnb368w1            702
-#define OBJ_X9_62_c2pnb368w1            OBJ_X9_62_c_TwoCurve,19L
-
-#define SN_X9_62_c2tnb431r1             "c2tnb431r1"
-#define NID_X9_62_c2tnb431r1            703
-#define OBJ_X9_62_c2tnb431r1            OBJ_X9_62_c_TwoCurve,20L
-
-#define OBJ_X9_62_primeCurve            OBJ_X9_62_ellipticCurve,1L
-
-#define SN_X9_62_prime192v1             "prime192v1"
-#define NID_X9_62_prime192v1            409
-#define OBJ_X9_62_prime192v1            OBJ_X9_62_primeCurve,1L
-
-#define SN_X9_62_prime192v2             "prime192v2"
-#define NID_X9_62_prime192v2            410
-#define OBJ_X9_62_prime192v2            OBJ_X9_62_primeCurve,2L
-
-#define SN_X9_62_prime192v3             "prime192v3"
-#define NID_X9_62_prime192v3            411
-#define OBJ_X9_62_prime192v3            OBJ_X9_62_primeCurve,3L
-
-#define SN_X9_62_prime239v1             "prime239v1"
-#define NID_X9_62_prime239v1            412
-#define OBJ_X9_62_prime239v1            OBJ_X9_62_primeCurve,4L
-
-#define SN_X9_62_prime239v2             "prime239v2"
-#define NID_X9_62_prime239v2            413
-#define OBJ_X9_62_prime239v2            OBJ_X9_62_primeCurve,5L
-
-#define SN_X9_62_prime239v3             "prime239v3"
-#define NID_X9_62_prime239v3            414
-#define OBJ_X9_62_prime239v3            OBJ_X9_62_primeCurve,6L
-
-#define SN_X9_62_prime256v1             "prime256v1"
-#define NID_X9_62_prime256v1            415
-#define OBJ_X9_62_prime256v1            OBJ_X9_62_primeCurve,7L
-
-#define OBJ_X9_62_id_ecSigType          OBJ_ansi_X9_62,4L
-
-#define SN_ecdsa_with_SHA1              "ecdsa-with-SHA1"
-#define NID_ecdsa_with_SHA1             416
-#define OBJ_ecdsa_with_SHA1             OBJ_X9_62_id_ecSigType,1L
-
-#define SN_ecdsa_with_Recommended               "ecdsa-with-Recommended"
-#define NID_ecdsa_with_Recommended              791
-#define OBJ_ecdsa_with_Recommended              OBJ_X9_62_id_ecSigType,2L
-
-#define SN_ecdsa_with_Specified         "ecdsa-with-Specified"
-#define NID_ecdsa_with_Specified                792
-#define OBJ_ecdsa_with_Specified                OBJ_X9_62_id_ecSigType,3L
-
-#define SN_ecdsa_with_SHA224            "ecdsa-with-SHA224"
-#define NID_ecdsa_with_SHA224           793
-#define OBJ_ecdsa_with_SHA224           OBJ_ecdsa_with_Specified,1L
-
-#define SN_ecdsa_with_SHA256            "ecdsa-with-SHA256"
-#define NID_ecdsa_with_SHA256           794
-#define OBJ_ecdsa_with_SHA256           OBJ_ecdsa_with_Specified,2L
-
-#define SN_ecdsa_with_SHA384            "ecdsa-with-SHA384"
-#define NID_ecdsa_with_SHA384           795
-#define OBJ_ecdsa_with_SHA384           OBJ_ecdsa_with_Specified,3L
-
-#define SN_ecdsa_with_SHA512            "ecdsa-with-SHA512"
-#define NID_ecdsa_with_SHA512           796
-#define OBJ_ecdsa_with_SHA512           OBJ_ecdsa_with_Specified,4L
-
-#define OBJ_secg_ellipticCurve          OBJ_certicom_arc,0L
-
-#define SN_secp112r1            "secp112r1"
-#define NID_secp112r1           704
-#define OBJ_secp112r1           OBJ_secg_ellipticCurve,6L
-
-#define SN_secp112r2            "secp112r2"
-#define NID_secp112r2           705
-#define OBJ_secp112r2           OBJ_secg_ellipticCurve,7L
-
-#define SN_secp128r1            "secp128r1"
-#define NID_secp128r1           706
-#define OBJ_secp128r1           OBJ_secg_ellipticCurve,28L
-
-#define SN_secp128r2            "secp128r2"
-#define NID_secp128r2           707
-#define OBJ_secp128r2           OBJ_secg_ellipticCurve,29L
-
-#define SN_secp160k1            "secp160k1"
-#define NID_secp160k1           708
-#define OBJ_secp160k1           OBJ_secg_ellipticCurve,9L
-
-#define SN_secp160r1            "secp160r1"
-#define NID_secp160r1           709
-#define OBJ_secp160r1           OBJ_secg_ellipticCurve,8L
-
-#define SN_secp160r2            "secp160r2"
-#define NID_secp160r2           710
-#define OBJ_secp160r2           OBJ_secg_ellipticCurve,30L
-
-#define SN_secp192k1            "secp192k1"
-#define NID_secp192k1           711
-#define OBJ_secp192k1           OBJ_secg_ellipticCurve,31L
-
-#define SN_secp224k1            "secp224k1"
-#define NID_secp224k1           712
-#define OBJ_secp224k1           OBJ_secg_ellipticCurve,32L
-
-#define SN_secp224r1            "secp224r1"
-#define NID_secp224r1           713
-#define OBJ_secp224r1           OBJ_secg_ellipticCurve,33L
-
-#define SN_secp256k1            "secp256k1"
-#define NID_secp256k1           714
-#define OBJ_secp256k1           OBJ_secg_ellipticCurve,10L
-
-#define SN_secp384r1            "secp384r1"
-#define NID_secp384r1           715
-#define OBJ_secp384r1           OBJ_secg_ellipticCurve,34L
-
-#define SN_secp521r1            "secp521r1"
-#define NID_secp521r1           716
-#define OBJ_secp521r1           OBJ_secg_ellipticCurve,35L
-
-#define SN_sect113r1            "sect113r1"
-#define NID_sect113r1           717
-#define OBJ_sect113r1           OBJ_secg_ellipticCurve,4L
-
-#define SN_sect113r2            "sect113r2"
-#define NID_sect113r2           718
-#define OBJ_sect113r2           OBJ_secg_ellipticCurve,5L
-
-#define SN_sect131r1            "sect131r1"
-#define NID_sect131r1           719
-#define OBJ_sect131r1           OBJ_secg_ellipticCurve,22L
-
-#define SN_sect131r2            "sect131r2"
-#define NID_sect131r2           720
-#define OBJ_sect131r2           OBJ_secg_ellipticCurve,23L
-
-#define SN_sect163k1            "sect163k1"
-#define NID_sect163k1           721
-#define OBJ_sect163k1           OBJ_secg_ellipticCurve,1L
-
-#define SN_sect163r1            "sect163r1"
-#define NID_sect163r1           722
-#define OBJ_sect163r1           OBJ_secg_ellipticCurve,2L
-
-#define SN_sect163r2            "sect163r2"
-#define NID_sect163r2           723
-#define OBJ_sect163r2           OBJ_secg_ellipticCurve,15L
-
-#define SN_sect193r1            "sect193r1"
-#define NID_sect193r1           724
-#define OBJ_sect193r1           OBJ_secg_ellipticCurve,24L
-
-#define SN_sect193r2            "sect193r2"
-#define NID_sect193r2           725
-#define OBJ_sect193r2           OBJ_secg_ellipticCurve,25L
-
-#define SN_sect233k1            "sect233k1"
-#define NID_sect233k1           726
-#define OBJ_sect233k1           OBJ_secg_ellipticCurve,26L
-
-#define SN_sect233r1            "sect233r1"
-#define NID_sect233r1           727
-#define OBJ_sect233r1           OBJ_secg_ellipticCurve,27L
-
-#define SN_sect239k1            "sect239k1"
-#define NID_sect239k1           728
-#define OBJ_sect239k1           OBJ_secg_ellipticCurve,3L
-
-#define SN_sect283k1            "sect283k1"
-#define NID_sect283k1           729
-#define OBJ_sect283k1           OBJ_secg_ellipticCurve,16L
-
-#define SN_sect283r1            "sect283r1"
-#define NID_sect283r1           730
-#define OBJ_sect283r1           OBJ_secg_ellipticCurve,17L
-
-#define SN_sect409k1            "sect409k1"
-#define NID_sect409k1           731
-#define OBJ_sect409k1           OBJ_secg_ellipticCurve,36L
-
-#define SN_sect409r1            "sect409r1"
-#define NID_sect409r1           732
-#define OBJ_sect409r1           OBJ_secg_ellipticCurve,37L
-
-#define SN_sect571k1            "sect571k1"
-#define NID_sect571k1           733
-#define OBJ_sect571k1           OBJ_secg_ellipticCurve,38L
-
-#define SN_sect571r1            "sect571r1"
-#define NID_sect571r1           734
-#define OBJ_sect571r1           OBJ_secg_ellipticCurve,39L
-
-#define OBJ_wap_wsg_idm_ecid            OBJ_wap_wsg,4L
-
-#define SN_wap_wsg_idm_ecid_wtls1               "wap-wsg-idm-ecid-wtls1"
-#define NID_wap_wsg_idm_ecid_wtls1              735
-#define OBJ_wap_wsg_idm_ecid_wtls1              OBJ_wap_wsg_idm_ecid,1L
-
-#define SN_wap_wsg_idm_ecid_wtls3               "wap-wsg-idm-ecid-wtls3"
-#define NID_wap_wsg_idm_ecid_wtls3              736
-#define OBJ_wap_wsg_idm_ecid_wtls3              OBJ_wap_wsg_idm_ecid,3L
-
-#define SN_wap_wsg_idm_ecid_wtls4               "wap-wsg-idm-ecid-wtls4"
-#define NID_wap_wsg_idm_ecid_wtls4              737
-#define OBJ_wap_wsg_idm_ecid_wtls4              OBJ_wap_wsg_idm_ecid,4L
-
-#define SN_wap_wsg_idm_ecid_wtls5               "wap-wsg-idm-ecid-wtls5"
-#define NID_wap_wsg_idm_ecid_wtls5              738
-#define OBJ_wap_wsg_idm_ecid_wtls5              OBJ_wap_wsg_idm_ecid,5L
-
-#define SN_wap_wsg_idm_ecid_wtls6               "wap-wsg-idm-ecid-wtls6"
-#define NID_wap_wsg_idm_ecid_wtls6              739
-#define OBJ_wap_wsg_idm_ecid_wtls6              OBJ_wap_wsg_idm_ecid,6L
-
-#define SN_wap_wsg_idm_ecid_wtls7               "wap-wsg-idm-ecid-wtls7"
-#define NID_wap_wsg_idm_ecid_wtls7              740
-#define OBJ_wap_wsg_idm_ecid_wtls7              OBJ_wap_wsg_idm_ecid,7L
-
-#define SN_wap_wsg_idm_ecid_wtls8               "wap-wsg-idm-ecid-wtls8"
-#define NID_wap_wsg_idm_ecid_wtls8              741
-#define OBJ_wap_wsg_idm_ecid_wtls8              OBJ_wap_wsg_idm_ecid,8L
-
-#define SN_wap_wsg_idm_ecid_wtls9               "wap-wsg-idm-ecid-wtls9"
-#define NID_wap_wsg_idm_ecid_wtls9              742
-#define OBJ_wap_wsg_idm_ecid_wtls9              OBJ_wap_wsg_idm_ecid,9L
-
-#define SN_wap_wsg_idm_ecid_wtls10              "wap-wsg-idm-ecid-wtls10"
-#define NID_wap_wsg_idm_ecid_wtls10             743
-#define OBJ_wap_wsg_idm_ecid_wtls10             OBJ_wap_wsg_idm_ecid,10L
-
-#define SN_wap_wsg_idm_ecid_wtls11              "wap-wsg-idm-ecid-wtls11"
-#define NID_wap_wsg_idm_ecid_wtls11             744
-#define OBJ_wap_wsg_idm_ecid_wtls11             OBJ_wap_wsg_idm_ecid,11L
-
-#define SN_wap_wsg_idm_ecid_wtls12              "wap-wsg-idm-ecid-wtls12"
-#define NID_wap_wsg_idm_ecid_wtls12             745
-#define OBJ_wap_wsg_idm_ecid_wtls12             OBJ_wap_wsg_idm_ecid,12L
-
-#define SN_cast5_cbc            "CAST5-CBC"
-#define LN_cast5_cbc            "cast5-cbc"
-#define NID_cast5_cbc           108
-#define OBJ_cast5_cbc           OBJ_ISO_US,113533L,7L,66L,10L
-
-#define SN_cast5_ecb            "CAST5-ECB"
-#define LN_cast5_ecb            "cast5-ecb"
-#define NID_cast5_ecb           109
-
-#define SN_cast5_cfb64          "CAST5-CFB"
-#define LN_cast5_cfb64          "cast5-cfb"
-#define NID_cast5_cfb64         110
-
-#define SN_cast5_ofb64          "CAST5-OFB"
-#define LN_cast5_ofb64          "cast5-ofb"
-#define NID_cast5_ofb64         111
-
-#define LN_pbeWithMD5AndCast5_CBC               "pbeWithMD5AndCast5CBC"
-#define NID_pbeWithMD5AndCast5_CBC              112
-#define OBJ_pbeWithMD5AndCast5_CBC              OBJ_ISO_US,113533L,7L,66L,12L
-
-#define SN_id_PasswordBasedMAC          "id-PasswordBasedMAC"
-#define LN_id_PasswordBasedMAC          "password based MAC"
-#define NID_id_PasswordBasedMAC         782
-#define OBJ_id_PasswordBasedMAC         OBJ_ISO_US,113533L,7L,66L,13L
-
-#define SN_id_DHBasedMac                "id-DHBasedMac"
-#define LN_id_DHBasedMac                "Diffie-Hellman based MAC"
-#define NID_id_DHBasedMac               783
-#define OBJ_id_DHBasedMac               OBJ_ISO_US,113533L,7L,66L,30L
-
-#define SN_rsadsi               "rsadsi"
-#define LN_rsadsi               "RSA Data Security, Inc."
-#define NID_rsadsi              1
-#define OBJ_rsadsi              OBJ_ISO_US,113549L
-
-#define SN_pkcs         "pkcs"
-#define LN_pkcs         "RSA Data Security, Inc. PKCS"
-#define NID_pkcs                2
-#define OBJ_pkcs                OBJ_rsadsi,1L
-
-#define SN_pkcs1                "pkcs1"
-#define NID_pkcs1               186
-#define OBJ_pkcs1               OBJ_pkcs,1L
-
-#define LN_rsaEncryption                "rsaEncryption"
-#define NID_rsaEncryption               6
-#define OBJ_rsaEncryption               OBJ_pkcs1,1L
-
-#define SN_md2WithRSAEncryption         "RSA-MD2"
-#define LN_md2WithRSAEncryption         "md2WithRSAEncryption"
-#define NID_md2WithRSAEncryption                7
-#define OBJ_md2WithRSAEncryption                OBJ_pkcs1,2L
-
-#define SN_md4WithRSAEncryption         "RSA-MD4"
-#define LN_md4WithRSAEncryption         "md4WithRSAEncryption"
-#define NID_md4WithRSAEncryption                396
-#define OBJ_md4WithRSAEncryption                OBJ_pkcs1,3L
-
-#define SN_md5WithRSAEncryption         "RSA-MD5"
-#define LN_md5WithRSAEncryption         "md5WithRSAEncryption"
-#define NID_md5WithRSAEncryption                8
-#define OBJ_md5WithRSAEncryption                OBJ_pkcs1,4L
-
-#define SN_sha1WithRSAEncryption                "RSA-SHA1"
-#define LN_sha1WithRSAEncryption                "sha1WithRSAEncryption"
-#define NID_sha1WithRSAEncryption               65
-#define OBJ_sha1WithRSAEncryption               OBJ_pkcs1,5L
-
-#define SN_rsaesOaep            "RSAES-OAEP"
-#define LN_rsaesOaep            "rsaesOaep"
-#define NID_rsaesOaep           919
-#define OBJ_rsaesOaep           OBJ_pkcs1,7L
-
-#define SN_mgf1         "MGF1"
-#define LN_mgf1         "mgf1"
-#define NID_mgf1                911
-#define OBJ_mgf1                OBJ_pkcs1,8L
-
-#define SN_rsassaPss            "RSASSA-PSS"
-#define LN_rsassaPss            "rsassaPss"
-#define NID_rsassaPss           912
-#define OBJ_rsassaPss           OBJ_pkcs1,10L
-
-#define SN_sha256WithRSAEncryption              "RSA-SHA256"
-#define LN_sha256WithRSAEncryption              "sha256WithRSAEncryption"
-#define NID_sha256WithRSAEncryption             668
-#define OBJ_sha256WithRSAEncryption             OBJ_pkcs1,11L
-
-#define SN_sha384WithRSAEncryption              "RSA-SHA384"
-#define LN_sha384WithRSAEncryption              "sha384WithRSAEncryption"
-#define NID_sha384WithRSAEncryption             669
-#define OBJ_sha384WithRSAEncryption             OBJ_pkcs1,12L
-
-#define SN_sha512WithRSAEncryption              "RSA-SHA512"
-#define LN_sha512WithRSAEncryption              "sha512WithRSAEncryption"
-#define NID_sha512WithRSAEncryption             670
-#define OBJ_sha512WithRSAEncryption             OBJ_pkcs1,13L
-
-#define SN_sha224WithRSAEncryption              "RSA-SHA224"
-#define LN_sha224WithRSAEncryption              "sha224WithRSAEncryption"
-#define NID_sha224WithRSAEncryption             671
-#define OBJ_sha224WithRSAEncryption             OBJ_pkcs1,14L
-
-#define SN_pkcs3                "pkcs3"
-#define NID_pkcs3               27
-#define OBJ_pkcs3               OBJ_pkcs,3L
-
-#define LN_dhKeyAgreement               "dhKeyAgreement"
-#define NID_dhKeyAgreement              28
-#define OBJ_dhKeyAgreement              OBJ_pkcs3,1L
-
-#define SN_pkcs5                "pkcs5"
-#define NID_pkcs5               187
-#define OBJ_pkcs5               OBJ_pkcs,5L
-
-#define SN_pbeWithMD2AndDES_CBC         "PBE-MD2-DES"
-#define LN_pbeWithMD2AndDES_CBC         "pbeWithMD2AndDES-CBC"
-#define NID_pbeWithMD2AndDES_CBC                9
-#define OBJ_pbeWithMD2AndDES_CBC                OBJ_pkcs5,1L
-
-#define SN_pbeWithMD5AndDES_CBC         "PBE-MD5-DES"
-#define LN_pbeWithMD5AndDES_CBC         "pbeWithMD5AndDES-CBC"
-#define NID_pbeWithMD5AndDES_CBC                10
-#define OBJ_pbeWithMD5AndDES_CBC                OBJ_pkcs5,3L
-
-#define SN_pbeWithMD2AndRC2_CBC         "PBE-MD2-RC2-64"
-#define LN_pbeWithMD2AndRC2_CBC         "pbeWithMD2AndRC2-CBC"
-#define NID_pbeWithMD2AndRC2_CBC                168
-#define OBJ_pbeWithMD2AndRC2_CBC                OBJ_pkcs5,4L
-
-#define SN_pbeWithMD5AndRC2_CBC         "PBE-MD5-RC2-64"
-#define LN_pbeWithMD5AndRC2_CBC         "pbeWithMD5AndRC2-CBC"
-#define NID_pbeWithMD5AndRC2_CBC                169
-#define OBJ_pbeWithMD5AndRC2_CBC                OBJ_pkcs5,6L
-
-#define SN_pbeWithSHA1AndDES_CBC                "PBE-SHA1-DES"
-#define LN_pbeWithSHA1AndDES_CBC                "pbeWithSHA1AndDES-CBC"
-#define NID_pbeWithSHA1AndDES_CBC               170
-#define OBJ_pbeWithSHA1AndDES_CBC               OBJ_pkcs5,10L
-
-#define SN_pbeWithSHA1AndRC2_CBC                "PBE-SHA1-RC2-64"
-#define LN_pbeWithSHA1AndRC2_CBC                "pbeWithSHA1AndRC2-CBC"
-#define NID_pbeWithSHA1AndRC2_CBC               68
-#define OBJ_pbeWithSHA1AndRC2_CBC               OBJ_pkcs5,11L
-
-#define LN_id_pbkdf2            "PBKDF2"
-#define NID_id_pbkdf2           69
-#define OBJ_id_pbkdf2           OBJ_pkcs5,12L
-
-#define LN_pbes2                "PBES2"
-#define NID_pbes2               161
-#define OBJ_pbes2               OBJ_pkcs5,13L
-
-#define LN_pbmac1               "PBMAC1"
-#define NID_pbmac1              162
-#define OBJ_pbmac1              OBJ_pkcs5,14L
-
-#define SN_pkcs7                "pkcs7"
-#define NID_pkcs7               20
-#define OBJ_pkcs7               OBJ_pkcs,7L
-
-#define LN_pkcs7_data           "pkcs7-data"
-#define NID_pkcs7_data          21
-#define OBJ_pkcs7_data          OBJ_pkcs7,1L
-
-#define LN_pkcs7_signed         "pkcs7-signedData"
-#define NID_pkcs7_signed                22
-#define OBJ_pkcs7_signed                OBJ_pkcs7,2L
-
-#define LN_pkcs7_enveloped              "pkcs7-envelopedData"
-#define NID_pkcs7_enveloped             23
-#define OBJ_pkcs7_enveloped             OBJ_pkcs7,3L
-
-#define LN_pkcs7_signedAndEnveloped             "pkcs7-signedAndEnvelopedData"
-#define NID_pkcs7_signedAndEnveloped            24
-#define OBJ_pkcs7_signedAndEnveloped            OBJ_pkcs7,4L
-
-#define LN_pkcs7_digest         "pkcs7-digestData"
-#define NID_pkcs7_digest                25
-#define OBJ_pkcs7_digest                OBJ_pkcs7,5L
-
-#define LN_pkcs7_encrypted              "pkcs7-encryptedData"
-#define NID_pkcs7_encrypted             26
-#define OBJ_pkcs7_encrypted             OBJ_pkcs7,6L
-
-#define SN_pkcs9                "pkcs9"
-#define NID_pkcs9               47
-#define OBJ_pkcs9               OBJ_pkcs,9L
-
-#define LN_pkcs9_emailAddress           "emailAddress"
-#define NID_pkcs9_emailAddress          48
-#define OBJ_pkcs9_emailAddress          OBJ_pkcs9,1L
-
-#define LN_pkcs9_unstructuredName               "unstructuredName"
-#define NID_pkcs9_unstructuredName              49
-#define OBJ_pkcs9_unstructuredName              OBJ_pkcs9,2L
-
-#define LN_pkcs9_contentType            "contentType"
-#define NID_pkcs9_contentType           50
-#define OBJ_pkcs9_contentType           OBJ_pkcs9,3L
-
-#define LN_pkcs9_messageDigest          "messageDigest"
-#define NID_pkcs9_messageDigest         51
-#define OBJ_pkcs9_messageDigest         OBJ_pkcs9,4L
-
-#define LN_pkcs9_signingTime            "signingTime"
-#define NID_pkcs9_signingTime           52
-#define OBJ_pkcs9_signingTime           OBJ_pkcs9,5L
-
-#define LN_pkcs9_countersignature               "countersignature"
-#define NID_pkcs9_countersignature              53
-#define OBJ_pkcs9_countersignature              OBJ_pkcs9,6L
-
-#define LN_pkcs9_challengePassword              "challengePassword"
-#define NID_pkcs9_challengePassword             54
-#define OBJ_pkcs9_challengePassword             OBJ_pkcs9,7L
-
-#define LN_pkcs9_unstructuredAddress            "unstructuredAddress"
-#define NID_pkcs9_unstructuredAddress           55
-#define OBJ_pkcs9_unstructuredAddress           OBJ_pkcs9,8L
-
-#define LN_pkcs9_extCertAttributes              "extendedCertificateAttributes"
-#define NID_pkcs9_extCertAttributes             56
-#define OBJ_pkcs9_extCertAttributes             OBJ_pkcs9,9L
-
-#define SN_ext_req              "extReq"
-#define LN_ext_req              "Extension Request"
-#define NID_ext_req             172
-#define OBJ_ext_req             OBJ_pkcs9,14L
-
-#define SN_SMIMECapabilities            "SMIME-CAPS"
-#define LN_SMIMECapabilities            "S/MIME Capabilities"
-#define NID_SMIMECapabilities           167
-#define OBJ_SMIMECapabilities           OBJ_pkcs9,15L
-
-#define SN_SMIME                "SMIME"
-#define LN_SMIME                "S/MIME"
-#define NID_SMIME               188
-#define OBJ_SMIME               OBJ_pkcs9,16L
-
-#define SN_id_smime_mod         "id-smime-mod"
-#define NID_id_smime_mod                189
-#define OBJ_id_smime_mod                OBJ_SMIME,0L
-
-#define SN_id_smime_ct          "id-smime-ct"
-#define NID_id_smime_ct         190
-#define OBJ_id_smime_ct         OBJ_SMIME,1L
-
-#define SN_id_smime_aa          "id-smime-aa"
-#define NID_id_smime_aa         191
-#define OBJ_id_smime_aa         OBJ_SMIME,2L
-
-#define SN_id_smime_alg         "id-smime-alg"
-#define NID_id_smime_alg                192
-#define OBJ_id_smime_alg                OBJ_SMIME,3L
-
-#define SN_id_smime_cd          "id-smime-cd"
-#define NID_id_smime_cd         193
-#define OBJ_id_smime_cd         OBJ_SMIME,4L
-
-#define SN_id_smime_spq         "id-smime-spq"
-#define NID_id_smime_spq                194
-#define OBJ_id_smime_spq                OBJ_SMIME,5L
-
-#define SN_id_smime_cti         "id-smime-cti"
-#define NID_id_smime_cti                195
-#define OBJ_id_smime_cti                OBJ_SMIME,6L
-
-#define SN_id_smime_mod_cms             "id-smime-mod-cms"
-#define NID_id_smime_mod_cms            196
-#define OBJ_id_smime_mod_cms            OBJ_id_smime_mod,1L
-
-#define SN_id_smime_mod_ess             "id-smime-mod-ess"
-#define NID_id_smime_mod_ess            197
-#define OBJ_id_smime_mod_ess            OBJ_id_smime_mod,2L
-
-#define SN_id_smime_mod_oid             "id-smime-mod-oid"
-#define NID_id_smime_mod_oid            198
-#define OBJ_id_smime_mod_oid            OBJ_id_smime_mod,3L
-
-#define SN_id_smime_mod_msg_v3          "id-smime-mod-msg-v3"
-#define NID_id_smime_mod_msg_v3         199
-#define OBJ_id_smime_mod_msg_v3         OBJ_id_smime_mod,4L
-
-#define SN_id_smime_mod_ets_eSignature_88               "id-smime-mod-ets-eSignature-88"
-#define NID_id_smime_mod_ets_eSignature_88              200
-#define OBJ_id_smime_mod_ets_eSignature_88              OBJ_id_smime_mod,5L
-
-#define SN_id_smime_mod_ets_eSignature_97               "id-smime-mod-ets-eSignature-97"
-#define NID_id_smime_mod_ets_eSignature_97              201
-#define OBJ_id_smime_mod_ets_eSignature_97              OBJ_id_smime_mod,6L
-
-#define SN_id_smime_mod_ets_eSigPolicy_88               "id-smime-mod-ets-eSigPolicy-88"
-#define NID_id_smime_mod_ets_eSigPolicy_88              202
-#define OBJ_id_smime_mod_ets_eSigPolicy_88              OBJ_id_smime_mod,7L
-
-#define SN_id_smime_mod_ets_eSigPolicy_97               "id-smime-mod-ets-eSigPolicy-97"
-#define NID_id_smime_mod_ets_eSigPolicy_97              203
-#define OBJ_id_smime_mod_ets_eSigPolicy_97              OBJ_id_smime_mod,8L
-
-#define SN_id_smime_ct_receipt          "id-smime-ct-receipt"
-#define NID_id_smime_ct_receipt         204
-#define OBJ_id_smime_ct_receipt         OBJ_id_smime_ct,1L
-
-#define SN_id_smime_ct_authData         "id-smime-ct-authData"
-#define NID_id_smime_ct_authData                205
-#define OBJ_id_smime_ct_authData                OBJ_id_smime_ct,2L
-
-#define SN_id_smime_ct_publishCert              "id-smime-ct-publishCert"
-#define NID_id_smime_ct_publishCert             206
-#define OBJ_id_smime_ct_publishCert             OBJ_id_smime_ct,3L
-
-#define SN_id_smime_ct_TSTInfo          "id-smime-ct-TSTInfo"
-#define NID_id_smime_ct_TSTInfo         207
-#define OBJ_id_smime_ct_TSTInfo         OBJ_id_smime_ct,4L
-
-#define SN_id_smime_ct_TDTInfo          "id-smime-ct-TDTInfo"
-#define NID_id_smime_ct_TDTInfo         208
-#define OBJ_id_smime_ct_TDTInfo         OBJ_id_smime_ct,5L
-
-#define SN_id_smime_ct_contentInfo              "id-smime-ct-contentInfo"
-#define NID_id_smime_ct_contentInfo             209
-#define OBJ_id_smime_ct_contentInfo             OBJ_id_smime_ct,6L
-
-#define SN_id_smime_ct_DVCSRequestData          "id-smime-ct-DVCSRequestData"
-#define NID_id_smime_ct_DVCSRequestData         210
-#define OBJ_id_smime_ct_DVCSRequestData         OBJ_id_smime_ct,7L
-
-#define SN_id_smime_ct_DVCSResponseData         "id-smime-ct-DVCSResponseData"
-#define NID_id_smime_ct_DVCSResponseData                211
-#define OBJ_id_smime_ct_DVCSResponseData                OBJ_id_smime_ct,8L
-
-#define SN_id_smime_ct_compressedData           "id-smime-ct-compressedData"
-#define NID_id_smime_ct_compressedData          786
-#define OBJ_id_smime_ct_compressedData          OBJ_id_smime_ct,9L
-
-#define SN_id_ct_asciiTextWithCRLF              "id-ct-asciiTextWithCRLF"
-#define NID_id_ct_asciiTextWithCRLF             787
-#define OBJ_id_ct_asciiTextWithCRLF             OBJ_id_smime_ct,27L
-
-#define SN_id_smime_aa_receiptRequest           "id-smime-aa-receiptRequest"
-#define NID_id_smime_aa_receiptRequest          212
-#define OBJ_id_smime_aa_receiptRequest          OBJ_id_smime_aa,1L
-
-#define SN_id_smime_aa_securityLabel            "id-smime-aa-securityLabel"
-#define NID_id_smime_aa_securityLabel           213
-#define OBJ_id_smime_aa_securityLabel           OBJ_id_smime_aa,2L
-
-#define SN_id_smime_aa_mlExpandHistory          "id-smime-aa-mlExpandHistory"
-#define NID_id_smime_aa_mlExpandHistory         214
-#define OBJ_id_smime_aa_mlExpandHistory         OBJ_id_smime_aa,3L
-
-#define SN_id_smime_aa_contentHint              "id-smime-aa-contentHint"
-#define NID_id_smime_aa_contentHint             215
-#define OBJ_id_smime_aa_contentHint             OBJ_id_smime_aa,4L
-
-#define SN_id_smime_aa_msgSigDigest             "id-smime-aa-msgSigDigest"
-#define NID_id_smime_aa_msgSigDigest            216
-#define OBJ_id_smime_aa_msgSigDigest            OBJ_id_smime_aa,5L
-
-#define SN_id_smime_aa_encapContentType         "id-smime-aa-encapContentType"
-#define NID_id_smime_aa_encapContentType                217
-#define OBJ_id_smime_aa_encapContentType                OBJ_id_smime_aa,6L
-
-#define SN_id_smime_aa_contentIdentifier                "id-smime-aa-contentIdentifier"
-#define NID_id_smime_aa_contentIdentifier               218
-#define OBJ_id_smime_aa_contentIdentifier               OBJ_id_smime_aa,7L
-
-#define SN_id_smime_aa_macValue         "id-smime-aa-macValue"
-#define NID_id_smime_aa_macValue                219
-#define OBJ_id_smime_aa_macValue                OBJ_id_smime_aa,8L
-
-#define SN_id_smime_aa_equivalentLabels         "id-smime-aa-equivalentLabels"
-#define NID_id_smime_aa_equivalentLabels                220
-#define OBJ_id_smime_aa_equivalentLabels                OBJ_id_smime_aa,9L
-
-#define SN_id_smime_aa_contentReference         "id-smime-aa-contentReference"
-#define NID_id_smime_aa_contentReference                221
-#define OBJ_id_smime_aa_contentReference                OBJ_id_smime_aa,10L
-
-#define SN_id_smime_aa_encrypKeyPref            "id-smime-aa-encrypKeyPref"
-#define NID_id_smime_aa_encrypKeyPref           222
-#define OBJ_id_smime_aa_encrypKeyPref           OBJ_id_smime_aa,11L
-
-#define SN_id_smime_aa_signingCertificate               "id-smime-aa-signingCertificate"
-#define NID_id_smime_aa_signingCertificate              223
-#define OBJ_id_smime_aa_signingCertificate              OBJ_id_smime_aa,12L
-
-#define SN_id_smime_aa_smimeEncryptCerts                "id-smime-aa-smimeEncryptCerts"
-#define NID_id_smime_aa_smimeEncryptCerts               224
-#define OBJ_id_smime_aa_smimeEncryptCerts               OBJ_id_smime_aa,13L
-
-#define SN_id_smime_aa_timeStampToken           "id-smime-aa-timeStampToken"
-#define NID_id_smime_aa_timeStampToken          225
-#define OBJ_id_smime_aa_timeStampToken          OBJ_id_smime_aa,14L
-
-#define SN_id_smime_aa_ets_sigPolicyId          "id-smime-aa-ets-sigPolicyId"
-#define NID_id_smime_aa_ets_sigPolicyId         226
-#define OBJ_id_smime_aa_ets_sigPolicyId         OBJ_id_smime_aa,15L
-
-#define SN_id_smime_aa_ets_commitmentType               "id-smime-aa-ets-commitmentType"
-#define NID_id_smime_aa_ets_commitmentType              227
-#define OBJ_id_smime_aa_ets_commitmentType              OBJ_id_smime_aa,16L
-
-#define SN_id_smime_aa_ets_signerLocation               "id-smime-aa-ets-signerLocation"
-#define NID_id_smime_aa_ets_signerLocation              228
-#define OBJ_id_smime_aa_ets_signerLocation              OBJ_id_smime_aa,17L
-
-#define SN_id_smime_aa_ets_signerAttr           "id-smime-aa-ets-signerAttr"
-#define NID_id_smime_aa_ets_signerAttr          229
-#define OBJ_id_smime_aa_ets_signerAttr          OBJ_id_smime_aa,18L
-
-#define SN_id_smime_aa_ets_otherSigCert         "id-smime-aa-ets-otherSigCert"
-#define NID_id_smime_aa_ets_otherSigCert                230
-#define OBJ_id_smime_aa_ets_otherSigCert                OBJ_id_smime_aa,19L
-
-#define SN_id_smime_aa_ets_contentTimestamp             "id-smime-aa-ets-contentTimestamp"
-#define NID_id_smime_aa_ets_contentTimestamp            231
-#define OBJ_id_smime_aa_ets_contentTimestamp            OBJ_id_smime_aa,20L
-
-#define SN_id_smime_aa_ets_CertificateRefs              "id-smime-aa-ets-CertificateRefs"
-#define NID_id_smime_aa_ets_CertificateRefs             232
-#define OBJ_id_smime_aa_ets_CertificateRefs             OBJ_id_smime_aa,21L
-
-#define SN_id_smime_aa_ets_RevocationRefs               "id-smime-aa-ets-RevocationRefs"
-#define NID_id_smime_aa_ets_RevocationRefs              233
-#define OBJ_id_smime_aa_ets_RevocationRefs              OBJ_id_smime_aa,22L
-
-#define SN_id_smime_aa_ets_certValues           "id-smime-aa-ets-certValues"
-#define NID_id_smime_aa_ets_certValues          234
-#define OBJ_id_smime_aa_ets_certValues          OBJ_id_smime_aa,23L
-
-#define SN_id_smime_aa_ets_revocationValues             "id-smime-aa-ets-revocationValues"
-#define NID_id_smime_aa_ets_revocationValues            235
-#define OBJ_id_smime_aa_ets_revocationValues            OBJ_id_smime_aa,24L
-
-#define SN_id_smime_aa_ets_escTimeStamp         "id-smime-aa-ets-escTimeStamp"
-#define NID_id_smime_aa_ets_escTimeStamp                236
-#define OBJ_id_smime_aa_ets_escTimeStamp                OBJ_id_smime_aa,25L
-
-#define SN_id_smime_aa_ets_certCRLTimestamp             "id-smime-aa-ets-certCRLTimestamp"
-#define NID_id_smime_aa_ets_certCRLTimestamp            237
-#define OBJ_id_smime_aa_ets_certCRLTimestamp            OBJ_id_smime_aa,26L
-
-#define SN_id_smime_aa_ets_archiveTimeStamp             "id-smime-aa-ets-archiveTimeStamp"
-#define NID_id_smime_aa_ets_archiveTimeStamp            238
-#define OBJ_id_smime_aa_ets_archiveTimeStamp            OBJ_id_smime_aa,27L
-
-#define SN_id_smime_aa_signatureType            "id-smime-aa-signatureType"
-#define NID_id_smime_aa_signatureType           239
-#define OBJ_id_smime_aa_signatureType           OBJ_id_smime_aa,28L
-
-#define SN_id_smime_aa_dvcs_dvc         "id-smime-aa-dvcs-dvc"
-#define NID_id_smime_aa_dvcs_dvc                240
-#define OBJ_id_smime_aa_dvcs_dvc                OBJ_id_smime_aa,29L
-
-#define SN_id_smime_alg_ESDHwith3DES            "id-smime-alg-ESDHwith3DES"
-#define NID_id_smime_alg_ESDHwith3DES           241
-#define OBJ_id_smime_alg_ESDHwith3DES           OBJ_id_smime_alg,1L
-
-#define SN_id_smime_alg_ESDHwithRC2             "id-smime-alg-ESDHwithRC2"
-#define NID_id_smime_alg_ESDHwithRC2            242
-#define OBJ_id_smime_alg_ESDHwithRC2            OBJ_id_smime_alg,2L
-
-#define SN_id_smime_alg_3DESwrap                "id-smime-alg-3DESwrap"
-#define NID_id_smime_alg_3DESwrap               243
-#define OBJ_id_smime_alg_3DESwrap               OBJ_id_smime_alg,3L
-
-#define SN_id_smime_alg_RC2wrap         "id-smime-alg-RC2wrap"
-#define NID_id_smime_alg_RC2wrap                244
-#define OBJ_id_smime_alg_RC2wrap                OBJ_id_smime_alg,4L
-
-#define SN_id_smime_alg_ESDH            "id-smime-alg-ESDH"
-#define NID_id_smime_alg_ESDH           245
-#define OBJ_id_smime_alg_ESDH           OBJ_id_smime_alg,5L
-
-#define SN_id_smime_alg_CMS3DESwrap             "id-smime-alg-CMS3DESwrap"
-#define NID_id_smime_alg_CMS3DESwrap            246
-#define OBJ_id_smime_alg_CMS3DESwrap            OBJ_id_smime_alg,6L
-
-#define SN_id_smime_alg_CMSRC2wrap              "id-smime-alg-CMSRC2wrap"
-#define NID_id_smime_alg_CMSRC2wrap             247
-#define OBJ_id_smime_alg_CMSRC2wrap             OBJ_id_smime_alg,7L
-
-#define SN_id_alg_PWRI_KEK              "id-alg-PWRI-KEK"
-#define NID_id_alg_PWRI_KEK             893
-#define OBJ_id_alg_PWRI_KEK             OBJ_id_smime_alg,9L
-
-#define SN_id_smime_cd_ldap             "id-smime-cd-ldap"
-#define NID_id_smime_cd_ldap            248
-#define OBJ_id_smime_cd_ldap            OBJ_id_smime_cd,1L
-
-#define SN_id_smime_spq_ets_sqt_uri             "id-smime-spq-ets-sqt-uri"
-#define NID_id_smime_spq_ets_sqt_uri            249
-#define OBJ_id_smime_spq_ets_sqt_uri            OBJ_id_smime_spq,1L
-
-#define SN_id_smime_spq_ets_sqt_unotice         "id-smime-spq-ets-sqt-unotice"
-#define NID_id_smime_spq_ets_sqt_unotice                250
-#define OBJ_id_smime_spq_ets_sqt_unotice                OBJ_id_smime_spq,2L
-
-#define SN_id_smime_cti_ets_proofOfOrigin               "id-smime-cti-ets-proofOfOrigin"
-#define NID_id_smime_cti_ets_proofOfOrigin              251
-#define OBJ_id_smime_cti_ets_proofOfOrigin              OBJ_id_smime_cti,1L
-
-#define SN_id_smime_cti_ets_proofOfReceipt              "id-smime-cti-ets-proofOfReceipt"
-#define NID_id_smime_cti_ets_proofOfReceipt             252
-#define OBJ_id_smime_cti_ets_proofOfReceipt             OBJ_id_smime_cti,2L
-
-#define SN_id_smime_cti_ets_proofOfDelivery             "id-smime-cti-ets-proofOfDelivery"
-#define NID_id_smime_cti_ets_proofOfDelivery            253
-#define OBJ_id_smime_cti_ets_proofOfDelivery            OBJ_id_smime_cti,3L
-
-#define SN_id_smime_cti_ets_proofOfSender               "id-smime-cti-ets-proofOfSender"
-#define NID_id_smime_cti_ets_proofOfSender              254
-#define OBJ_id_smime_cti_ets_proofOfSender              OBJ_id_smime_cti,4L
-
-#define SN_id_smime_cti_ets_proofOfApproval             "id-smime-cti-ets-proofOfApproval"
-#define NID_id_smime_cti_ets_proofOfApproval            255
-#define OBJ_id_smime_cti_ets_proofOfApproval            OBJ_id_smime_cti,5L
-
-#define SN_id_smime_cti_ets_proofOfCreation             "id-smime-cti-ets-proofOfCreation"
-#define NID_id_smime_cti_ets_proofOfCreation            256
-#define OBJ_id_smime_cti_ets_proofOfCreation            OBJ_id_smime_cti,6L
-
-#define LN_friendlyName         "friendlyName"
-#define NID_friendlyName                156
-#define OBJ_friendlyName                OBJ_pkcs9,20L
-
-#define LN_localKeyID           "localKeyID"
-#define NID_localKeyID          157
-#define OBJ_localKeyID          OBJ_pkcs9,21L
-
-#define SN_ms_csp_name          "CSPName"
-#define LN_ms_csp_name          "Microsoft CSP Name"
-#define NID_ms_csp_name         417
-#define OBJ_ms_csp_name         1L,3L,6L,1L,4L,1L,311L,17L,1L
-
-#define SN_LocalKeySet          "LocalKeySet"
-#define LN_LocalKeySet          "Microsoft Local Key set"
-#define NID_LocalKeySet         856
-#define OBJ_LocalKeySet         1L,3L,6L,1L,4L,1L,311L,17L,2L
-
-#define OBJ_certTypes           OBJ_pkcs9,22L
-
-#define LN_x509Certificate              "x509Certificate"
-#define NID_x509Certificate             158
-#define OBJ_x509Certificate             OBJ_certTypes,1L
-
-#define LN_sdsiCertificate              "sdsiCertificate"
-#define NID_sdsiCertificate             159
-#define OBJ_sdsiCertificate             OBJ_certTypes,2L
-
-#define OBJ_crlTypes            OBJ_pkcs9,23L
-
-#define LN_x509Crl              "x509Crl"
-#define NID_x509Crl             160
-#define OBJ_x509Crl             OBJ_crlTypes,1L
-
-#define OBJ_pkcs12              OBJ_pkcs,12L
-
-#define OBJ_pkcs12_pbeids               OBJ_pkcs12,1L
-
-#define SN_pbe_WithSHA1And128BitRC4             "PBE-SHA1-RC4-128"
-#define LN_pbe_WithSHA1And128BitRC4             "pbeWithSHA1And128BitRC4"
-#define NID_pbe_WithSHA1And128BitRC4            144
-#define OBJ_pbe_WithSHA1And128BitRC4            OBJ_pkcs12_pbeids,1L
-
-#define SN_pbe_WithSHA1And40BitRC4              "PBE-SHA1-RC4-40"
-#define LN_pbe_WithSHA1And40BitRC4              "pbeWithSHA1And40BitRC4"
-#define NID_pbe_WithSHA1And40BitRC4             145
-#define OBJ_pbe_WithSHA1And40BitRC4             OBJ_pkcs12_pbeids,2L
-
-#define SN_pbe_WithSHA1And3_Key_TripleDES_CBC           "PBE-SHA1-3DES"
-#define LN_pbe_WithSHA1And3_Key_TripleDES_CBC           "pbeWithSHA1And3-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And3_Key_TripleDES_CBC          146
-#define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC          OBJ_pkcs12_pbeids,3L
-
-#define SN_pbe_WithSHA1And2_Key_TripleDES_CBC           "PBE-SHA1-2DES"
-#define LN_pbe_WithSHA1And2_Key_TripleDES_CBC           "pbeWithSHA1And2-KeyTripleDES-CBC"
-#define NID_pbe_WithSHA1And2_Key_TripleDES_CBC          147
-#define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC          OBJ_pkcs12_pbeids,4L
-
-#define SN_pbe_WithSHA1And128BitRC2_CBC         "PBE-SHA1-RC2-128"
-#define LN_pbe_WithSHA1And128BitRC2_CBC         "pbeWithSHA1And128BitRC2-CBC"
-#define NID_pbe_WithSHA1And128BitRC2_CBC                148
-#define OBJ_pbe_WithSHA1And128BitRC2_CBC                OBJ_pkcs12_pbeids,5L
-
-#define SN_pbe_WithSHA1And40BitRC2_CBC          "PBE-SHA1-RC2-40"
-#define LN_pbe_WithSHA1And40BitRC2_CBC          "pbeWithSHA1And40BitRC2-CBC"
-#define NID_pbe_WithSHA1And40BitRC2_CBC         149
-#define OBJ_pbe_WithSHA1And40BitRC2_CBC         OBJ_pkcs12_pbeids,6L
-
-#define OBJ_pkcs12_Version1             OBJ_pkcs12,10L
-
-#define OBJ_pkcs12_BagIds               OBJ_pkcs12_Version1,1L
-
-#define LN_keyBag               "keyBag"
-#define NID_keyBag              150
-#define OBJ_keyBag              OBJ_pkcs12_BagIds,1L
-
-#define LN_pkcs8ShroudedKeyBag          "pkcs8ShroudedKeyBag"
-#define NID_pkcs8ShroudedKeyBag         151
-#define OBJ_pkcs8ShroudedKeyBag         OBJ_pkcs12_BagIds,2L
-
-#define LN_certBag              "certBag"
-#define NID_certBag             152
-#define OBJ_certBag             OBJ_pkcs12_BagIds,3L
-
-#define LN_crlBag               "crlBag"
-#define NID_crlBag              153
-#define OBJ_crlBag              OBJ_pkcs12_BagIds,4L
-
-#define LN_secretBag            "secretBag"
-#define NID_secretBag           154
-#define OBJ_secretBag           OBJ_pkcs12_BagIds,5L
-
-#define LN_safeContentsBag              "safeContentsBag"
-#define NID_safeContentsBag             155
-#define OBJ_safeContentsBag             OBJ_pkcs12_BagIds,6L
-
-#define SN_md2          "MD2"
-#define LN_md2          "md2"
-#define NID_md2         3
-#define OBJ_md2         OBJ_rsadsi,2L,2L
-
-#define SN_md4          "MD4"
-#define LN_md4          "md4"
-#define NID_md4         257
-#define OBJ_md4         OBJ_rsadsi,2L,4L
-
-#define SN_md5          "MD5"
-#define LN_md5          "md5"
-#define NID_md5         4
-#define OBJ_md5         OBJ_rsadsi,2L,5L
-
-#define SN_md5_sha1             "MD5-SHA1"
-#define LN_md5_sha1             "md5-sha1"
-#define NID_md5_sha1            114
-
-#define LN_hmacWithMD5          "hmacWithMD5"
-#define NID_hmacWithMD5         797
-#define OBJ_hmacWithMD5         OBJ_rsadsi,2L,6L
-
-#define LN_hmacWithSHA1         "hmacWithSHA1"
-#define NID_hmacWithSHA1                163
-#define OBJ_hmacWithSHA1                OBJ_rsadsi,2L,7L
-
-#define LN_hmacWithSHA224               "hmacWithSHA224"
-#define NID_hmacWithSHA224              798
-#define OBJ_hmacWithSHA224              OBJ_rsadsi,2L,8L
-
-#define LN_hmacWithSHA256               "hmacWithSHA256"
-#define NID_hmacWithSHA256              799
-#define OBJ_hmacWithSHA256              OBJ_rsadsi,2L,9L
-
-#define LN_hmacWithSHA384               "hmacWithSHA384"
-#define NID_hmacWithSHA384              800
-#define OBJ_hmacWithSHA384              OBJ_rsadsi,2L,10L
-
-#define LN_hmacWithSHA512               "hmacWithSHA512"
-#define NID_hmacWithSHA512              801
-#define OBJ_hmacWithSHA512              OBJ_rsadsi,2L,11L
-
-#define SN_rc2_cbc              "RC2-CBC"
-#define LN_rc2_cbc              "rc2-cbc"
-#define NID_rc2_cbc             37
-#define OBJ_rc2_cbc             OBJ_rsadsi,3L,2L
-
-#define SN_rc2_ecb              "RC2-ECB"
-#define LN_rc2_ecb              "rc2-ecb"
-#define NID_rc2_ecb             38
-
-#define SN_rc2_cfb64            "RC2-CFB"
-#define LN_rc2_cfb64            "rc2-cfb"
-#define NID_rc2_cfb64           39
-
-#define SN_rc2_ofb64            "RC2-OFB"
-#define LN_rc2_ofb64            "rc2-ofb"
-#define NID_rc2_ofb64           40
-
-#define SN_rc2_40_cbc           "RC2-40-CBC"
-#define LN_rc2_40_cbc           "rc2-40-cbc"
-#define NID_rc2_40_cbc          98
-
-#define SN_rc2_64_cbc           "RC2-64-CBC"
-#define LN_rc2_64_cbc           "rc2-64-cbc"
-#define NID_rc2_64_cbc          166
-
-#define SN_rc4          "RC4"
-#define LN_rc4          "rc4"
-#define NID_rc4         5
-#define OBJ_rc4         OBJ_rsadsi,3L,4L
-
-#define SN_rc4_40               "RC4-40"
-#define LN_rc4_40               "rc4-40"
-#define NID_rc4_40              97
-
-#define SN_des_ede3_cbc         "DES-EDE3-CBC"
-#define LN_des_ede3_cbc         "des-ede3-cbc"
-#define NID_des_ede3_cbc                44
-#define OBJ_des_ede3_cbc                OBJ_rsadsi,3L,7L
-
-#define SN_rc5_cbc              "RC5-CBC"
-#define LN_rc5_cbc              "rc5-cbc"
-#define NID_rc5_cbc             120
-#define OBJ_rc5_cbc             OBJ_rsadsi,3L,8L
-
-#define SN_rc5_ecb              "RC5-ECB"
-#define LN_rc5_ecb              "rc5-ecb"
-#define NID_rc5_ecb             121
-
-#define SN_rc5_cfb64            "RC5-CFB"
-#define LN_rc5_cfb64            "rc5-cfb"
-#define NID_rc5_cfb64           122
-
-#define SN_rc5_ofb64            "RC5-OFB"
-#define LN_rc5_ofb64            "rc5-ofb"
-#define NID_rc5_ofb64           123
-
-#define SN_ms_ext_req           "msExtReq"
-#define LN_ms_ext_req           "Microsoft Extension Request"
-#define NID_ms_ext_req          171
-#define OBJ_ms_ext_req          1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
-
-#define SN_ms_code_ind          "msCodeInd"
-#define LN_ms_code_ind          "Microsoft Individual Code Signing"
-#define NID_ms_code_ind         134
-#define OBJ_ms_code_ind         1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-
-#define SN_ms_code_com          "msCodeCom"
-#define LN_ms_code_com          "Microsoft Commercial Code Signing"
-#define NID_ms_code_com         135
-#define OBJ_ms_code_com         1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-
-#define SN_ms_ctl_sign          "msCTLSign"
-#define LN_ms_ctl_sign          "Microsoft Trust List Signing"
-#define NID_ms_ctl_sign         136
-#define OBJ_ms_ctl_sign         1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-
-#define SN_ms_sgc               "msSGC"
-#define LN_ms_sgc               "Microsoft Server Gated Crypto"
-#define NID_ms_sgc              137
-#define OBJ_ms_sgc              1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-
-#define SN_ms_efs               "msEFS"
-#define LN_ms_efs               "Microsoft Encrypted File System"
-#define NID_ms_efs              138
-#define OBJ_ms_efs              1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-
-#define SN_ms_smartcard_login           "msSmartcardLogin"
-#define LN_ms_smartcard_login           "Microsoft Smartcardlogin"
-#define NID_ms_smartcard_login          648
-#define OBJ_ms_smartcard_login          1L,3L,6L,1L,4L,1L,311L,20L,2L,2L
-
-#define SN_ms_upn               "msUPN"
-#define LN_ms_upn               "Microsoft Universal Principal Name"
-#define NID_ms_upn              649
-#define OBJ_ms_upn              1L,3L,6L,1L,4L,1L,311L,20L,2L,3L
-
-#define SN_idea_cbc             "IDEA-CBC"
-#define LN_idea_cbc             "idea-cbc"
-#define NID_idea_cbc            34
-#define OBJ_idea_cbc            1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
-
-#define SN_idea_ecb             "IDEA-ECB"
-#define LN_idea_ecb             "idea-ecb"
-#define NID_idea_ecb            36
-
-#define SN_idea_cfb64           "IDEA-CFB"
-#define LN_idea_cfb64           "idea-cfb"
-#define NID_idea_cfb64          35
-
-#define SN_idea_ofb64           "IDEA-OFB"
-#define LN_idea_ofb64           "idea-ofb"
-#define NID_idea_ofb64          46
-
-#define SN_bf_cbc               "BF-CBC"
-#define LN_bf_cbc               "bf-cbc"
-#define NID_bf_cbc              91
-#define OBJ_bf_cbc              1L,3L,6L,1L,4L,1L,3029L,1L,2L
-
-#define SN_bf_ecb               "BF-ECB"
-#define LN_bf_ecb               "bf-ecb"
-#define NID_bf_ecb              92
-
-#define SN_bf_cfb64             "BF-CFB"
-#define LN_bf_cfb64             "bf-cfb"
-#define NID_bf_cfb64            93
-
-#define SN_bf_ofb64             "BF-OFB"
-#define LN_bf_ofb64             "bf-ofb"
-#define NID_bf_ofb64            94
-
-#define SN_id_pkix              "PKIX"
-#define NID_id_pkix             127
-#define OBJ_id_pkix             1L,3L,6L,1L,5L,5L,7L
-
-#define SN_id_pkix_mod          "id-pkix-mod"
-#define NID_id_pkix_mod         258
-#define OBJ_id_pkix_mod         OBJ_id_pkix,0L
-
-#define SN_id_pe                "id-pe"
-#define NID_id_pe               175
-#define OBJ_id_pe               OBJ_id_pkix,1L
-
-#define SN_id_qt                "id-qt"
-#define NID_id_qt               259
-#define OBJ_id_qt               OBJ_id_pkix,2L
-
-#define SN_id_kp                "id-kp"
-#define NID_id_kp               128
-#define OBJ_id_kp               OBJ_id_pkix,3L
-
-#define SN_id_it                "id-it"
-#define NID_id_it               260
-#define OBJ_id_it               OBJ_id_pkix,4L
-
-#define SN_id_pkip              "id-pkip"
-#define NID_id_pkip             261
-#define OBJ_id_pkip             OBJ_id_pkix,5L
-
-#define SN_id_alg               "id-alg"
-#define NID_id_alg              262
-#define OBJ_id_alg              OBJ_id_pkix,6L
-
-#define SN_id_cmc               "id-cmc"
-#define NID_id_cmc              263
-#define OBJ_id_cmc              OBJ_id_pkix,7L
-
-#define SN_id_on                "id-on"
-#define NID_id_on               264
-#define OBJ_id_on               OBJ_id_pkix,8L
-
-#define SN_id_pda               "id-pda"
-#define NID_id_pda              265
-#define OBJ_id_pda              OBJ_id_pkix,9L
-
-#define SN_id_aca               "id-aca"
-#define NID_id_aca              266
-#define OBJ_id_aca              OBJ_id_pkix,10L
-
-#define SN_id_qcs               "id-qcs"
-#define NID_id_qcs              267
-#define OBJ_id_qcs              OBJ_id_pkix,11L
-
-#define SN_id_cct               "id-cct"
-#define NID_id_cct              268
-#define OBJ_id_cct              OBJ_id_pkix,12L
-
-#define SN_id_ppl               "id-ppl"
-#define NID_id_ppl              662
-#define OBJ_id_ppl              OBJ_id_pkix,21L
-
-#define SN_id_ad                "id-ad"
-#define NID_id_ad               176
-#define OBJ_id_ad               OBJ_id_pkix,48L
-
-#define SN_id_pkix1_explicit_88         "id-pkix1-explicit-88"
-#define NID_id_pkix1_explicit_88                269
-#define OBJ_id_pkix1_explicit_88                OBJ_id_pkix_mod,1L
-
-#define SN_id_pkix1_implicit_88         "id-pkix1-implicit-88"
-#define NID_id_pkix1_implicit_88                270
-#define OBJ_id_pkix1_implicit_88                OBJ_id_pkix_mod,2L
-
-#define SN_id_pkix1_explicit_93         "id-pkix1-explicit-93"
-#define NID_id_pkix1_explicit_93                271
-#define OBJ_id_pkix1_explicit_93                OBJ_id_pkix_mod,3L
-
-#define SN_id_pkix1_implicit_93         "id-pkix1-implicit-93"
-#define NID_id_pkix1_implicit_93                272
-#define OBJ_id_pkix1_implicit_93                OBJ_id_pkix_mod,4L
-
-#define SN_id_mod_crmf          "id-mod-crmf"
-#define NID_id_mod_crmf         273
-#define OBJ_id_mod_crmf         OBJ_id_pkix_mod,5L
-
-#define SN_id_mod_cmc           "id-mod-cmc"
-#define NID_id_mod_cmc          274
-#define OBJ_id_mod_cmc          OBJ_id_pkix_mod,6L
-
-#define SN_id_mod_kea_profile_88                "id-mod-kea-profile-88"
-#define NID_id_mod_kea_profile_88               275
-#define OBJ_id_mod_kea_profile_88               OBJ_id_pkix_mod,7L
-
-#define SN_id_mod_kea_profile_93                "id-mod-kea-profile-93"
-#define NID_id_mod_kea_profile_93               276
-#define OBJ_id_mod_kea_profile_93               OBJ_id_pkix_mod,8L
-
-#define SN_id_mod_cmp           "id-mod-cmp"
-#define NID_id_mod_cmp          277
-#define OBJ_id_mod_cmp          OBJ_id_pkix_mod,9L
-
-#define SN_id_mod_qualified_cert_88             "id-mod-qualified-cert-88"
-#define NID_id_mod_qualified_cert_88            278
-#define OBJ_id_mod_qualified_cert_88            OBJ_id_pkix_mod,10L
-
-#define SN_id_mod_qualified_cert_93             "id-mod-qualified-cert-93"
-#define NID_id_mod_qualified_cert_93            279
-#define OBJ_id_mod_qualified_cert_93            OBJ_id_pkix_mod,11L
-
-#define SN_id_mod_attribute_cert                "id-mod-attribute-cert"
-#define NID_id_mod_attribute_cert               280
-#define OBJ_id_mod_attribute_cert               OBJ_id_pkix_mod,12L
-
-#define SN_id_mod_timestamp_protocol            "id-mod-timestamp-protocol"
-#define NID_id_mod_timestamp_protocol           281
-#define OBJ_id_mod_timestamp_protocol           OBJ_id_pkix_mod,13L
-
-#define SN_id_mod_ocsp          "id-mod-ocsp"
-#define NID_id_mod_ocsp         282
-#define OBJ_id_mod_ocsp         OBJ_id_pkix_mod,14L
-
-#define SN_id_mod_dvcs          "id-mod-dvcs"
-#define NID_id_mod_dvcs         283
-#define OBJ_id_mod_dvcs         OBJ_id_pkix_mod,15L
-
-#define SN_id_mod_cmp2000               "id-mod-cmp2000"
-#define NID_id_mod_cmp2000              284
-#define OBJ_id_mod_cmp2000              OBJ_id_pkix_mod,16L
-
-#define SN_info_access          "authorityInfoAccess"
-#define LN_info_access          "Authority Information Access"
-#define NID_info_access         177
-#define OBJ_info_access         OBJ_id_pe,1L
-
-#define SN_biometricInfo                "biometricInfo"
-#define LN_biometricInfo                "Biometric Info"
-#define NID_biometricInfo               285
-#define OBJ_biometricInfo               OBJ_id_pe,2L
-
-#define SN_qcStatements         "qcStatements"
-#define NID_qcStatements                286
-#define OBJ_qcStatements                OBJ_id_pe,3L
-
-#define SN_ac_auditEntity               "ac-auditEntity"
-#define NID_ac_auditEntity              287
-#define OBJ_ac_auditEntity              OBJ_id_pe,4L
-
-#define SN_ac_targeting         "ac-targeting"
-#define NID_ac_targeting                288
-#define OBJ_ac_targeting                OBJ_id_pe,5L
-
-#define SN_aaControls           "aaControls"
-#define NID_aaControls          289
-#define OBJ_aaControls          OBJ_id_pe,6L
-
-#define SN_sbgp_ipAddrBlock             "sbgp-ipAddrBlock"
-#define NID_sbgp_ipAddrBlock            290
-#define OBJ_sbgp_ipAddrBlock            OBJ_id_pe,7L
-
-#define SN_sbgp_autonomousSysNum                "sbgp-autonomousSysNum"
-#define NID_sbgp_autonomousSysNum               291
-#define OBJ_sbgp_autonomousSysNum               OBJ_id_pe,8L
-
-#define SN_sbgp_routerIdentifier                "sbgp-routerIdentifier"
-#define NID_sbgp_routerIdentifier               292
-#define OBJ_sbgp_routerIdentifier               OBJ_id_pe,9L
-
-#define SN_ac_proxying          "ac-proxying"
-#define NID_ac_proxying         397
-#define OBJ_ac_proxying         OBJ_id_pe,10L
-
-#define SN_sinfo_access         "subjectInfoAccess"
-#define LN_sinfo_access         "Subject Information Access"
-#define NID_sinfo_access                398
-#define OBJ_sinfo_access                OBJ_id_pe,11L
-
-#define SN_proxyCertInfo                "proxyCertInfo"
-#define LN_proxyCertInfo                "Proxy Certificate Information"
-#define NID_proxyCertInfo               663
-#define OBJ_proxyCertInfo               OBJ_id_pe,14L
-
-#define SN_id_qt_cps            "id-qt-cps"
-#define LN_id_qt_cps            "Policy Qualifier CPS"
-#define NID_id_qt_cps           164
-#define OBJ_id_qt_cps           OBJ_id_qt,1L
-
-#define SN_id_qt_unotice                "id-qt-unotice"
-#define LN_id_qt_unotice                "Policy Qualifier User Notice"
-#define NID_id_qt_unotice               165
-#define OBJ_id_qt_unotice               OBJ_id_qt,2L
-
-#define SN_textNotice           "textNotice"
-#define NID_textNotice          293
-#define OBJ_textNotice          OBJ_id_qt,3L
-
-#define SN_server_auth          "serverAuth"
-#define LN_server_auth          "TLS Web Server Authentication"
-#define NID_server_auth         129
-#define OBJ_server_auth         OBJ_id_kp,1L
-
-#define SN_client_auth          "clientAuth"
-#define LN_client_auth          "TLS Web Client Authentication"
-#define NID_client_auth         130
-#define OBJ_client_auth         OBJ_id_kp,2L
-
-#define SN_code_sign            "codeSigning"
-#define LN_code_sign            "Code Signing"
-#define NID_code_sign           131
-#define OBJ_code_sign           OBJ_id_kp,3L
-
-#define SN_email_protect                "emailProtection"
-#define LN_email_protect                "E-mail Protection"
-#define NID_email_protect               132
-#define OBJ_email_protect               OBJ_id_kp,4L
-
-#define SN_ipsecEndSystem               "ipsecEndSystem"
-#define LN_ipsecEndSystem               "IPSec End System"
-#define NID_ipsecEndSystem              294
-#define OBJ_ipsecEndSystem              OBJ_id_kp,5L
-
-#define SN_ipsecTunnel          "ipsecTunnel"
-#define LN_ipsecTunnel          "IPSec Tunnel"
-#define NID_ipsecTunnel         295
-#define OBJ_ipsecTunnel         OBJ_id_kp,6L
-
-#define SN_ipsecUser            "ipsecUser"
-#define LN_ipsecUser            "IPSec User"
-#define NID_ipsecUser           296
-#define OBJ_ipsecUser           OBJ_id_kp,7L
-
-#define SN_time_stamp           "timeStamping"
-#define LN_time_stamp           "Time Stamping"
-#define NID_time_stamp          133
-#define OBJ_time_stamp          OBJ_id_kp,8L
-
-#define SN_OCSP_sign            "OCSPSigning"
-#define LN_OCSP_sign            "OCSP Signing"
-#define NID_OCSP_sign           180
-#define OBJ_OCSP_sign           OBJ_id_kp,9L
-
-#define SN_dvcs         "DVCS"
-#define LN_dvcs         "dvcs"
-#define NID_dvcs                297
-#define OBJ_dvcs                OBJ_id_kp,10L
-
-#define SN_id_it_caProtEncCert          "id-it-caProtEncCert"
-#define NID_id_it_caProtEncCert         298
-#define OBJ_id_it_caProtEncCert         OBJ_id_it,1L
-
-#define SN_id_it_signKeyPairTypes               "id-it-signKeyPairTypes"
-#define NID_id_it_signKeyPairTypes              299
-#define OBJ_id_it_signKeyPairTypes              OBJ_id_it,2L
-
-#define SN_id_it_encKeyPairTypes                "id-it-encKeyPairTypes"
-#define NID_id_it_encKeyPairTypes               300
-#define OBJ_id_it_encKeyPairTypes               OBJ_id_it,3L
-
-#define SN_id_it_preferredSymmAlg               "id-it-preferredSymmAlg"
-#define NID_id_it_preferredSymmAlg              301
-#define OBJ_id_it_preferredSymmAlg              OBJ_id_it,4L
-
-#define SN_id_it_caKeyUpdateInfo                "id-it-caKeyUpdateInfo"
-#define NID_id_it_caKeyUpdateInfo               302
-#define OBJ_id_it_caKeyUpdateInfo               OBJ_id_it,5L
-
-#define SN_id_it_currentCRL             "id-it-currentCRL"
-#define NID_id_it_currentCRL            303
-#define OBJ_id_it_currentCRL            OBJ_id_it,6L
-
-#define SN_id_it_unsupportedOIDs                "id-it-unsupportedOIDs"
-#define NID_id_it_unsupportedOIDs               304
-#define OBJ_id_it_unsupportedOIDs               OBJ_id_it,7L
-
-#define SN_id_it_subscriptionRequest            "id-it-subscriptionRequest"
-#define NID_id_it_subscriptionRequest           305
-#define OBJ_id_it_subscriptionRequest           OBJ_id_it,8L
-
-#define SN_id_it_subscriptionResponse           "id-it-subscriptionResponse"
-#define NID_id_it_subscriptionResponse          306
-#define OBJ_id_it_subscriptionResponse          OBJ_id_it,9L
-
-#define SN_id_it_keyPairParamReq                "id-it-keyPairParamReq"
-#define NID_id_it_keyPairParamReq               307
-#define OBJ_id_it_keyPairParamReq               OBJ_id_it,10L
-
-#define SN_id_it_keyPairParamRep                "id-it-keyPairParamRep"
-#define NID_id_it_keyPairParamRep               308
-#define OBJ_id_it_keyPairParamRep               OBJ_id_it,11L
-
-#define SN_id_it_revPassphrase          "id-it-revPassphrase"
-#define NID_id_it_revPassphrase         309
-#define OBJ_id_it_revPassphrase         OBJ_id_it,12L
-
-#define SN_id_it_implicitConfirm                "id-it-implicitConfirm"
-#define NID_id_it_implicitConfirm               310
-#define OBJ_id_it_implicitConfirm               OBJ_id_it,13L
-
-#define SN_id_it_confirmWaitTime                "id-it-confirmWaitTime"
-#define NID_id_it_confirmWaitTime               311
-#define OBJ_id_it_confirmWaitTime               OBJ_id_it,14L
-
-#define SN_id_it_origPKIMessage         "id-it-origPKIMessage"
-#define NID_id_it_origPKIMessage                312
-#define OBJ_id_it_origPKIMessage                OBJ_id_it,15L
-
-#define SN_id_it_suppLangTags           "id-it-suppLangTags"
-#define NID_id_it_suppLangTags          784
-#define OBJ_id_it_suppLangTags          OBJ_id_it,16L
-
-#define SN_id_regCtrl           "id-regCtrl"
-#define NID_id_regCtrl          313
-#define OBJ_id_regCtrl          OBJ_id_pkip,1L
-
-#define SN_id_regInfo           "id-regInfo"
-#define NID_id_regInfo          314
-#define OBJ_id_regInfo          OBJ_id_pkip,2L
-
-#define SN_id_regCtrl_regToken          "id-regCtrl-regToken"
-#define NID_id_regCtrl_regToken         315
-#define OBJ_id_regCtrl_regToken         OBJ_id_regCtrl,1L
-
-#define SN_id_regCtrl_authenticator             "id-regCtrl-authenticator"
-#define NID_id_regCtrl_authenticator            316
-#define OBJ_id_regCtrl_authenticator            OBJ_id_regCtrl,2L
-
-#define SN_id_regCtrl_pkiPublicationInfo                "id-regCtrl-pkiPublicationInfo"
-#define NID_id_regCtrl_pkiPublicationInfo               317
-#define OBJ_id_regCtrl_pkiPublicationInfo               OBJ_id_regCtrl,3L
-
-#define SN_id_regCtrl_pkiArchiveOptions         "id-regCtrl-pkiArchiveOptions"
-#define NID_id_regCtrl_pkiArchiveOptions                318
-#define OBJ_id_regCtrl_pkiArchiveOptions                OBJ_id_regCtrl,4L
-
-#define SN_id_regCtrl_oldCertID         "id-regCtrl-oldCertID"
-#define NID_id_regCtrl_oldCertID                319
-#define OBJ_id_regCtrl_oldCertID                OBJ_id_regCtrl,5L
-
-#define SN_id_regCtrl_protocolEncrKey           "id-regCtrl-protocolEncrKey"
-#define NID_id_regCtrl_protocolEncrKey          320
-#define OBJ_id_regCtrl_protocolEncrKey          OBJ_id_regCtrl,6L
-
-#define SN_id_regInfo_utf8Pairs         "id-regInfo-utf8Pairs"
-#define NID_id_regInfo_utf8Pairs                321
-#define OBJ_id_regInfo_utf8Pairs                OBJ_id_regInfo,1L
-
-#define SN_id_regInfo_certReq           "id-regInfo-certReq"
-#define NID_id_regInfo_certReq          322
-#define OBJ_id_regInfo_certReq          OBJ_id_regInfo,2L
-
-#define SN_id_alg_des40         "id-alg-des40"
-#define NID_id_alg_des40                323
-#define OBJ_id_alg_des40                OBJ_id_alg,1L
-
-#define SN_id_alg_noSignature           "id-alg-noSignature"
-#define NID_id_alg_noSignature          324
-#define OBJ_id_alg_noSignature          OBJ_id_alg,2L
-
-#define SN_id_alg_dh_sig_hmac_sha1              "id-alg-dh-sig-hmac-sha1"
-#define NID_id_alg_dh_sig_hmac_sha1             325
-#define OBJ_id_alg_dh_sig_hmac_sha1             OBJ_id_alg,3L
-
-#define SN_id_alg_dh_pop                "id-alg-dh-pop"
-#define NID_id_alg_dh_pop               326
-#define OBJ_id_alg_dh_pop               OBJ_id_alg,4L
-
-#define SN_id_cmc_statusInfo            "id-cmc-statusInfo"
-#define NID_id_cmc_statusInfo           327
-#define OBJ_id_cmc_statusInfo           OBJ_id_cmc,1L
-
-#define SN_id_cmc_identification                "id-cmc-identification"
-#define NID_id_cmc_identification               328
-#define OBJ_id_cmc_identification               OBJ_id_cmc,2L
-
-#define SN_id_cmc_identityProof         "id-cmc-identityProof"
-#define NID_id_cmc_identityProof                329
-#define OBJ_id_cmc_identityProof                OBJ_id_cmc,3L
-
-#define SN_id_cmc_dataReturn            "id-cmc-dataReturn"
-#define NID_id_cmc_dataReturn           330
-#define OBJ_id_cmc_dataReturn           OBJ_id_cmc,4L
-
-#define SN_id_cmc_transactionId         "id-cmc-transactionId"
-#define NID_id_cmc_transactionId                331
-#define OBJ_id_cmc_transactionId                OBJ_id_cmc,5L
-
-#define SN_id_cmc_senderNonce           "id-cmc-senderNonce"
-#define NID_id_cmc_senderNonce          332
-#define OBJ_id_cmc_senderNonce          OBJ_id_cmc,6L
-
-#define SN_id_cmc_recipientNonce                "id-cmc-recipientNonce"
-#define NID_id_cmc_recipientNonce               333
-#define OBJ_id_cmc_recipientNonce               OBJ_id_cmc,7L
-
-#define SN_id_cmc_addExtensions         "id-cmc-addExtensions"
-#define NID_id_cmc_addExtensions                334
-#define OBJ_id_cmc_addExtensions                OBJ_id_cmc,8L
-
-#define SN_id_cmc_encryptedPOP          "id-cmc-encryptedPOP"
-#define NID_id_cmc_encryptedPOP         335
-#define OBJ_id_cmc_encryptedPOP         OBJ_id_cmc,9L
-
-#define SN_id_cmc_decryptedPOP          "id-cmc-decryptedPOP"
-#define NID_id_cmc_decryptedPOP         336
-#define OBJ_id_cmc_decryptedPOP         OBJ_id_cmc,10L
-
-#define SN_id_cmc_lraPOPWitness         "id-cmc-lraPOPWitness"
-#define NID_id_cmc_lraPOPWitness                337
-#define OBJ_id_cmc_lraPOPWitness                OBJ_id_cmc,11L
-
-#define SN_id_cmc_getCert               "id-cmc-getCert"
-#define NID_id_cmc_getCert              338
-#define OBJ_id_cmc_getCert              OBJ_id_cmc,15L
-
-#define SN_id_cmc_getCRL                "id-cmc-getCRL"
-#define NID_id_cmc_getCRL               339
-#define OBJ_id_cmc_getCRL               OBJ_id_cmc,16L
-
-#define SN_id_cmc_revokeRequest         "id-cmc-revokeRequest"
-#define NID_id_cmc_revokeRequest                340
-#define OBJ_id_cmc_revokeRequest                OBJ_id_cmc,17L
-
-#define SN_id_cmc_regInfo               "id-cmc-regInfo"
-#define NID_id_cmc_regInfo              341
-#define OBJ_id_cmc_regInfo              OBJ_id_cmc,18L
-
-#define SN_id_cmc_responseInfo          "id-cmc-responseInfo"
-#define NID_id_cmc_responseInfo         342
-#define OBJ_id_cmc_responseInfo         OBJ_id_cmc,19L
-
-#define SN_id_cmc_queryPending          "id-cmc-queryPending"
-#define NID_id_cmc_queryPending         343
-#define OBJ_id_cmc_queryPending         OBJ_id_cmc,21L
-
-#define SN_id_cmc_popLinkRandom         "id-cmc-popLinkRandom"
-#define NID_id_cmc_popLinkRandom                344
-#define OBJ_id_cmc_popLinkRandom                OBJ_id_cmc,22L
-
-#define SN_id_cmc_popLinkWitness                "id-cmc-popLinkWitness"
-#define NID_id_cmc_popLinkWitness               345
-#define OBJ_id_cmc_popLinkWitness               OBJ_id_cmc,23L
-
-#define SN_id_cmc_confirmCertAcceptance         "id-cmc-confirmCertAcceptance"
-#define NID_id_cmc_confirmCertAcceptance                346
-#define OBJ_id_cmc_confirmCertAcceptance                OBJ_id_cmc,24L
-
-#define SN_id_on_personalData           "id-on-personalData"
-#define NID_id_on_personalData          347
-#define OBJ_id_on_personalData          OBJ_id_on,1L
-
-#define SN_id_on_permanentIdentifier            "id-on-permanentIdentifier"
-#define LN_id_on_permanentIdentifier            "Permanent Identifier"
-#define NID_id_on_permanentIdentifier           858
-#define OBJ_id_on_permanentIdentifier           OBJ_id_on,3L
-
-#define SN_id_pda_dateOfBirth           "id-pda-dateOfBirth"
-#define NID_id_pda_dateOfBirth          348
-#define OBJ_id_pda_dateOfBirth          OBJ_id_pda,1L
-
-#define SN_id_pda_placeOfBirth          "id-pda-placeOfBirth"
-#define NID_id_pda_placeOfBirth         349
-#define OBJ_id_pda_placeOfBirth         OBJ_id_pda,2L
-
-#define SN_id_pda_gender                "id-pda-gender"
-#define NID_id_pda_gender               351
-#define OBJ_id_pda_gender               OBJ_id_pda,3L
-
-#define SN_id_pda_countryOfCitizenship          "id-pda-countryOfCitizenship"
-#define NID_id_pda_countryOfCitizenship         352
-#define OBJ_id_pda_countryOfCitizenship         OBJ_id_pda,4L
-
-#define SN_id_pda_countryOfResidence            "id-pda-countryOfResidence"
-#define NID_id_pda_countryOfResidence           353
-#define OBJ_id_pda_countryOfResidence           OBJ_id_pda,5L
-
-#define SN_id_aca_authenticationInfo            "id-aca-authenticationInfo"
-#define NID_id_aca_authenticationInfo           354
-#define OBJ_id_aca_authenticationInfo           OBJ_id_aca,1L
-
-#define SN_id_aca_accessIdentity                "id-aca-accessIdentity"
-#define NID_id_aca_accessIdentity               355
-#define OBJ_id_aca_accessIdentity               OBJ_id_aca,2L
-
-#define SN_id_aca_chargingIdentity              "id-aca-chargingIdentity"
-#define NID_id_aca_chargingIdentity             356
-#define OBJ_id_aca_chargingIdentity             OBJ_id_aca,3L
-
-#define SN_id_aca_group         "id-aca-group"
-#define NID_id_aca_group                357
-#define OBJ_id_aca_group                OBJ_id_aca,4L
-
-#define SN_id_aca_role          "id-aca-role"
-#define NID_id_aca_role         358
-#define OBJ_id_aca_role         OBJ_id_aca,5L
-
-#define SN_id_aca_encAttrs              "id-aca-encAttrs"
-#define NID_id_aca_encAttrs             399
-#define OBJ_id_aca_encAttrs             OBJ_id_aca,6L
-
-#define SN_id_qcs_pkixQCSyntax_v1               "id-qcs-pkixQCSyntax-v1"
-#define NID_id_qcs_pkixQCSyntax_v1              359
-#define OBJ_id_qcs_pkixQCSyntax_v1              OBJ_id_qcs,1L
-
-#define SN_id_cct_crs           "id-cct-crs"
-#define NID_id_cct_crs          360
-#define OBJ_id_cct_crs          OBJ_id_cct,1L
-
-#define SN_id_cct_PKIData               "id-cct-PKIData"
-#define NID_id_cct_PKIData              361
-#define OBJ_id_cct_PKIData              OBJ_id_cct,2L
-
-#define SN_id_cct_PKIResponse           "id-cct-PKIResponse"
-#define NID_id_cct_PKIResponse          362
-#define OBJ_id_cct_PKIResponse          OBJ_id_cct,3L
-
-#define SN_id_ppl_anyLanguage           "id-ppl-anyLanguage"
-#define LN_id_ppl_anyLanguage           "Any language"
-#define NID_id_ppl_anyLanguage          664
-#define OBJ_id_ppl_anyLanguage          OBJ_id_ppl,0L
-
-#define SN_id_ppl_inheritAll            "id-ppl-inheritAll"
-#define LN_id_ppl_inheritAll            "Inherit all"
-#define NID_id_ppl_inheritAll           665
-#define OBJ_id_ppl_inheritAll           OBJ_id_ppl,1L
-
-#define SN_Independent          "id-ppl-independent"
-#define LN_Independent          "Independent"
-#define NID_Independent         667
-#define OBJ_Independent         OBJ_id_ppl,2L
-
-#define SN_ad_OCSP              "OCSP"
-#define LN_ad_OCSP              "OCSP"
-#define NID_ad_OCSP             178
-#define OBJ_ad_OCSP             OBJ_id_ad,1L
-
-#define SN_ad_ca_issuers                "caIssuers"
-#define LN_ad_ca_issuers                "CA Issuers"
-#define NID_ad_ca_issuers               179
-#define OBJ_ad_ca_issuers               OBJ_id_ad,2L
-
-#define SN_ad_timeStamping              "ad_timestamping"
-#define LN_ad_timeStamping              "AD Time Stamping"
-#define NID_ad_timeStamping             363
-#define OBJ_ad_timeStamping             OBJ_id_ad,3L
-
-#define SN_ad_dvcs              "AD_DVCS"
-#define LN_ad_dvcs              "ad dvcs"
-#define NID_ad_dvcs             364
-#define OBJ_ad_dvcs             OBJ_id_ad,4L
-
-#define SN_caRepository         "caRepository"
-#define LN_caRepository         "CA Repository"
-#define NID_caRepository                785
-#define OBJ_caRepository                OBJ_id_ad,5L
-
-#define OBJ_id_pkix_OCSP                OBJ_ad_OCSP
-
-#define SN_id_pkix_OCSP_basic           "basicOCSPResponse"
-#define LN_id_pkix_OCSP_basic           "Basic OCSP Response"
-#define NID_id_pkix_OCSP_basic          365
-#define OBJ_id_pkix_OCSP_basic          OBJ_id_pkix_OCSP,1L
-
-#define SN_id_pkix_OCSP_Nonce           "Nonce"
-#define LN_id_pkix_OCSP_Nonce           "OCSP Nonce"
-#define NID_id_pkix_OCSP_Nonce          366
-#define OBJ_id_pkix_OCSP_Nonce          OBJ_id_pkix_OCSP,2L
-
-#define SN_id_pkix_OCSP_CrlID           "CrlID"
-#define LN_id_pkix_OCSP_CrlID           "OCSP CRL ID"
-#define NID_id_pkix_OCSP_CrlID          367
-#define OBJ_id_pkix_OCSP_CrlID          OBJ_id_pkix_OCSP,3L
-
-#define SN_id_pkix_OCSP_acceptableResponses             "acceptableResponses"
-#define LN_id_pkix_OCSP_acceptableResponses             "Acceptable OCSP Responses"
-#define NID_id_pkix_OCSP_acceptableResponses            368
-#define OBJ_id_pkix_OCSP_acceptableResponses            OBJ_id_pkix_OCSP,4L
-
-#define SN_id_pkix_OCSP_noCheck         "noCheck"
-#define LN_id_pkix_OCSP_noCheck         "OCSP No Check"
-#define NID_id_pkix_OCSP_noCheck                369
-#define OBJ_id_pkix_OCSP_noCheck                OBJ_id_pkix_OCSP,5L
-
-#define SN_id_pkix_OCSP_archiveCutoff           "archiveCutoff"
-#define LN_id_pkix_OCSP_archiveCutoff           "OCSP Archive Cutoff"
-#define NID_id_pkix_OCSP_archiveCutoff          370
-#define OBJ_id_pkix_OCSP_archiveCutoff          OBJ_id_pkix_OCSP,6L
-
-#define SN_id_pkix_OCSP_serviceLocator          "serviceLocator"
-#define LN_id_pkix_OCSP_serviceLocator          "OCSP Service Locator"
-#define NID_id_pkix_OCSP_serviceLocator         371
-#define OBJ_id_pkix_OCSP_serviceLocator         OBJ_id_pkix_OCSP,7L
-
-#define SN_id_pkix_OCSP_extendedStatus          "extendedStatus"
-#define LN_id_pkix_OCSP_extendedStatus          "Extended OCSP Status"
-#define NID_id_pkix_OCSP_extendedStatus         372
-#define OBJ_id_pkix_OCSP_extendedStatus         OBJ_id_pkix_OCSP,8L
-
-#define SN_id_pkix_OCSP_valid           "valid"
-#define NID_id_pkix_OCSP_valid          373
-#define OBJ_id_pkix_OCSP_valid          OBJ_id_pkix_OCSP,9L
-
-#define SN_id_pkix_OCSP_path            "path"
-#define NID_id_pkix_OCSP_path           374
-#define OBJ_id_pkix_OCSP_path           OBJ_id_pkix_OCSP,10L
-
-#define SN_id_pkix_OCSP_trustRoot               "trustRoot"
-#define LN_id_pkix_OCSP_trustRoot               "Trust Root"
-#define NID_id_pkix_OCSP_trustRoot              375
-#define OBJ_id_pkix_OCSP_trustRoot              OBJ_id_pkix_OCSP,11L
-
-#define SN_algorithm            "algorithm"
-#define LN_algorithm            "algorithm"
-#define NID_algorithm           376
-#define OBJ_algorithm           1L,3L,14L,3L,2L
-
-#define SN_md5WithRSA           "RSA-NP-MD5"
-#define LN_md5WithRSA           "md5WithRSA"
-#define NID_md5WithRSA          104
-#define OBJ_md5WithRSA          OBJ_algorithm,3L
-
-#define SN_des_ecb              "DES-ECB"
-#define LN_des_ecb              "des-ecb"
-#define NID_des_ecb             29
-#define OBJ_des_ecb             OBJ_algorithm,6L
-
-#define SN_des_cbc              "DES-CBC"
-#define LN_des_cbc              "des-cbc"
-#define NID_des_cbc             31
-#define OBJ_des_cbc             OBJ_algorithm,7L
-
-#define SN_des_ofb64            "DES-OFB"
-#define LN_des_ofb64            "des-ofb"
-#define NID_des_ofb64           45
-#define OBJ_des_ofb64           OBJ_algorithm,8L
-
-#define SN_des_cfb64            "DES-CFB"
-#define LN_des_cfb64            "des-cfb"
-#define NID_des_cfb64           30
-#define OBJ_des_cfb64           OBJ_algorithm,9L
-
-#define SN_rsaSignature         "rsaSignature"
-#define NID_rsaSignature                377
-#define OBJ_rsaSignature                OBJ_algorithm,11L
-
-#define SN_dsa_2                "DSA-old"
-#define LN_dsa_2                "dsaEncryption-old"
-#define NID_dsa_2               67
-#define OBJ_dsa_2               OBJ_algorithm,12L
-
-#define SN_dsaWithSHA           "DSA-SHA"
-#define LN_dsaWithSHA           "dsaWithSHA"
-#define NID_dsaWithSHA          66
-#define OBJ_dsaWithSHA          OBJ_algorithm,13L
-
-#define SN_shaWithRSAEncryption         "RSA-SHA"
-#define LN_shaWithRSAEncryption         "shaWithRSAEncryption"
-#define NID_shaWithRSAEncryption                42
-#define OBJ_shaWithRSAEncryption                OBJ_algorithm,15L
-
-#define SN_des_ede_ecb          "DES-EDE"
-#define LN_des_ede_ecb          "des-ede"
-#define NID_des_ede_ecb         32
-#define OBJ_des_ede_ecb         OBJ_algorithm,17L
-
-#define SN_des_ede3_ecb         "DES-EDE3"
-#define LN_des_ede3_ecb         "des-ede3"
-#define NID_des_ede3_ecb                33
-
-#define SN_des_ede_cbc          "DES-EDE-CBC"
-#define LN_des_ede_cbc          "des-ede-cbc"
-#define NID_des_ede_cbc         43
-
-#define SN_des_ede_cfb64                "DES-EDE-CFB"
-#define LN_des_ede_cfb64                "des-ede-cfb"
-#define NID_des_ede_cfb64               60
-
-#define SN_des_ede3_cfb64               "DES-EDE3-CFB"
-#define LN_des_ede3_cfb64               "des-ede3-cfb"
-#define NID_des_ede3_cfb64              61
-
-#define SN_des_ede_ofb64                "DES-EDE-OFB"
-#define LN_des_ede_ofb64                "des-ede-ofb"
-#define NID_des_ede_ofb64               62
-
-#define SN_des_ede3_ofb64               "DES-EDE3-OFB"
-#define LN_des_ede3_ofb64               "des-ede3-ofb"
-#define NID_des_ede3_ofb64              63
-
-#define SN_desx_cbc             "DESX-CBC"
-#define LN_desx_cbc             "desx-cbc"
-#define NID_desx_cbc            80
-
-#define SN_sha          "SHA"
-#define LN_sha          "sha"
-#define NID_sha         41
-#define OBJ_sha         OBJ_algorithm,18L
-
-#define SN_sha1         "SHA1"
-#define LN_sha1         "sha1"
-#define NID_sha1                64
-#define OBJ_sha1                OBJ_algorithm,26L
-
-#define SN_dsaWithSHA1_2                "DSA-SHA1-old"
-#define LN_dsaWithSHA1_2                "dsaWithSHA1-old"
-#define NID_dsaWithSHA1_2               70
-#define OBJ_dsaWithSHA1_2               OBJ_algorithm,27L
-
-#define SN_sha1WithRSA          "RSA-SHA1-2"
-#define LN_sha1WithRSA          "sha1WithRSA"
-#define NID_sha1WithRSA         115
-#define OBJ_sha1WithRSA         OBJ_algorithm,29L
-
-#define SN_ripemd160            "RIPEMD160"
-#define LN_ripemd160            "ripemd160"
-#define NID_ripemd160           117
-#define OBJ_ripemd160           1L,3L,36L,3L,2L,1L
-
-#define SN_ripemd160WithRSA             "RSA-RIPEMD160"
-#define LN_ripemd160WithRSA             "ripemd160WithRSA"
-#define NID_ripemd160WithRSA            119
-#define OBJ_ripemd160WithRSA            1L,3L,36L,3L,3L,1L,2L
-
-#define SN_sxnet                "SXNetID"
-#define LN_sxnet                "Strong Extranet ID"
-#define NID_sxnet               143
-#define OBJ_sxnet               1L,3L,101L,1L,4L,1L
-
-#define SN_X500         "X500"
-#define LN_X500         "directory services (X.500)"
-#define NID_X500                11
-#define OBJ_X500                2L,5L
-
-#define SN_X509         "X509"
-#define NID_X509                12
-#define OBJ_X509                OBJ_X500,4L
-
-#define SN_commonName           "CN"
-#define LN_commonName           "commonName"
-#define NID_commonName          13
-#define OBJ_commonName          OBJ_X509,3L
-
-#define SN_surname              "SN"
-#define LN_surname              "surname"
-#define NID_surname             100
-#define OBJ_surname             OBJ_X509,4L
-
-#define LN_serialNumber         "serialNumber"
-#define NID_serialNumber                105
-#define OBJ_serialNumber                OBJ_X509,5L
-
-#define SN_countryName          "C"
-#define LN_countryName          "countryName"
-#define NID_countryName         14
-#define OBJ_countryName         OBJ_X509,6L
-
-#define SN_localityName         "L"
-#define LN_localityName         "localityName"
-#define NID_localityName                15
-#define OBJ_localityName                OBJ_X509,7L
-
-#define SN_stateOrProvinceName          "ST"
-#define LN_stateOrProvinceName          "stateOrProvinceName"
-#define NID_stateOrProvinceName         16
-#define OBJ_stateOrProvinceName         OBJ_X509,8L
-
-#define SN_streetAddress                "street"
-#define LN_streetAddress                "streetAddress"
-#define NID_streetAddress               660
-#define OBJ_streetAddress               OBJ_X509,9L
-
-#define SN_organizationName             "O"
-#define LN_organizationName             "organizationName"
-#define NID_organizationName            17
-#define OBJ_organizationName            OBJ_X509,10L
-
-#define SN_organizationalUnitName               "OU"
-#define LN_organizationalUnitName               "organizationalUnitName"
-#define NID_organizationalUnitName              18
-#define OBJ_organizationalUnitName              OBJ_X509,11L
-
-#define SN_title                "title"
-#define LN_title                "title"
-#define NID_title               106
-#define OBJ_title               OBJ_X509,12L
-
-#define LN_description          "description"
-#define NID_description         107
-#define OBJ_description         OBJ_X509,13L
-
-#define LN_searchGuide          "searchGuide"
-#define NID_searchGuide         859
-#define OBJ_searchGuide         OBJ_X509,14L
-
-#define LN_businessCategory             "businessCategory"
-#define NID_businessCategory            860
-#define OBJ_businessCategory            OBJ_X509,15L
-
-#define LN_postalAddress                "postalAddress"
-#define NID_postalAddress               861
-#define OBJ_postalAddress               OBJ_X509,16L
-
-#define LN_postalCode           "postalCode"
-#define NID_postalCode          661
-#define OBJ_postalCode          OBJ_X509,17L
-
-#define LN_postOfficeBox                "postOfficeBox"
-#define NID_postOfficeBox               862
-#define OBJ_postOfficeBox               OBJ_X509,18L
-
-#define LN_physicalDeliveryOfficeName           "physicalDeliveryOfficeName"
-#define NID_physicalDeliveryOfficeName          863
-#define OBJ_physicalDeliveryOfficeName          OBJ_X509,19L
-
-#define LN_telephoneNumber              "telephoneNumber"
-#define NID_telephoneNumber             864
-#define OBJ_telephoneNumber             OBJ_X509,20L
-
-#define LN_telexNumber          "telexNumber"
-#define NID_telexNumber         865
-#define OBJ_telexNumber         OBJ_X509,21L
-
-#define LN_teletexTerminalIdentifier            "teletexTerminalIdentifier"
-#define NID_teletexTerminalIdentifier           866
-#define OBJ_teletexTerminalIdentifier           OBJ_X509,22L
-
-#define LN_facsimileTelephoneNumber             "facsimileTelephoneNumber"
-#define NID_facsimileTelephoneNumber            867
-#define OBJ_facsimileTelephoneNumber            OBJ_X509,23L
-
-#define LN_x121Address          "x121Address"
-#define NID_x121Address         868
-#define OBJ_x121Address         OBJ_X509,24L
-
-#define LN_internationaliSDNNumber              "internationaliSDNNumber"
-#define NID_internationaliSDNNumber             869
-#define OBJ_internationaliSDNNumber             OBJ_X509,25L
-
-#define LN_registeredAddress            "registeredAddress"
-#define NID_registeredAddress           870
-#define OBJ_registeredAddress           OBJ_X509,26L
-
-#define LN_destinationIndicator         "destinationIndicator"
-#define NID_destinationIndicator                871
-#define OBJ_destinationIndicator                OBJ_X509,27L
-
-#define LN_preferredDeliveryMethod              "preferredDeliveryMethod"
-#define NID_preferredDeliveryMethod             872
-#define OBJ_preferredDeliveryMethod             OBJ_X509,28L
-
-#define LN_presentationAddress          "presentationAddress"
-#define NID_presentationAddress         873
-#define OBJ_presentationAddress         OBJ_X509,29L
-
-#define LN_supportedApplicationContext          "supportedApplicationContext"
-#define NID_supportedApplicationContext         874
-#define OBJ_supportedApplicationContext         OBJ_X509,30L
-
-#define SN_member               "member"
-#define NID_member              875
-#define OBJ_member              OBJ_X509,31L
-
-#define SN_owner                "owner"
-#define NID_owner               876
-#define OBJ_owner               OBJ_X509,32L
-
-#define LN_roleOccupant         "roleOccupant"
-#define NID_roleOccupant                877
-#define OBJ_roleOccupant                OBJ_X509,33L
-
-#define SN_seeAlso              "seeAlso"
-#define NID_seeAlso             878
-#define OBJ_seeAlso             OBJ_X509,34L
-
-#define LN_userPassword         "userPassword"
-#define NID_userPassword                879
-#define OBJ_userPassword                OBJ_X509,35L
-
-#define LN_userCertificate              "userCertificate"
-#define NID_userCertificate             880
-#define OBJ_userCertificate             OBJ_X509,36L
-
-#define LN_cACertificate                "cACertificate"
-#define NID_cACertificate               881
-#define OBJ_cACertificate               OBJ_X509,37L
-
-#define LN_authorityRevocationList              "authorityRevocationList"
-#define NID_authorityRevocationList             882
-#define OBJ_authorityRevocationList             OBJ_X509,38L
-
-#define LN_certificateRevocationList            "certificateRevocationList"
-#define NID_certificateRevocationList           883
-#define OBJ_certificateRevocationList           OBJ_X509,39L
-
-#define LN_crossCertificatePair         "crossCertificatePair"
-#define NID_crossCertificatePair                884
-#define OBJ_crossCertificatePair                OBJ_X509,40L
-
-#define SN_name         "name"
-#define LN_name         "name"
-#define NID_name                173
-#define OBJ_name                OBJ_X509,41L
-
-#define SN_givenName            "GN"
-#define LN_givenName            "givenName"
-#define NID_givenName           99
-#define OBJ_givenName           OBJ_X509,42L
-
-#define SN_initials             "initials"
-#define LN_initials             "initials"
-#define NID_initials            101
-#define OBJ_initials            OBJ_X509,43L
-
-#define LN_generationQualifier          "generationQualifier"
-#define NID_generationQualifier         509
-#define OBJ_generationQualifier         OBJ_X509,44L
-
-#define LN_x500UniqueIdentifier         "x500UniqueIdentifier"
-#define NID_x500UniqueIdentifier                503
-#define OBJ_x500UniqueIdentifier                OBJ_X509,45L
-
-#define SN_dnQualifier          "dnQualifier"
-#define LN_dnQualifier          "dnQualifier"
-#define NID_dnQualifier         174
-#define OBJ_dnQualifier         OBJ_X509,46L
-
-#define LN_enhancedSearchGuide          "enhancedSearchGuide"
-#define NID_enhancedSearchGuide         885
-#define OBJ_enhancedSearchGuide         OBJ_X509,47L
-
-#define LN_protocolInformation          "protocolInformation"
-#define NID_protocolInformation         886
-#define OBJ_protocolInformation         OBJ_X509,48L
-
-#define LN_distinguishedName            "distinguishedName"
-#define NID_distinguishedName           887
-#define OBJ_distinguishedName           OBJ_X509,49L
-
-#define LN_uniqueMember         "uniqueMember"
-#define NID_uniqueMember                888
-#define OBJ_uniqueMember                OBJ_X509,50L
-
-#define LN_houseIdentifier              "houseIdentifier"
-#define NID_houseIdentifier             889
-#define OBJ_houseIdentifier             OBJ_X509,51L
-
-#define LN_supportedAlgorithms          "supportedAlgorithms"
-#define NID_supportedAlgorithms         890
-#define OBJ_supportedAlgorithms         OBJ_X509,52L
-
-#define LN_deltaRevocationList          "deltaRevocationList"
-#define NID_deltaRevocationList         891
-#define OBJ_deltaRevocationList         OBJ_X509,53L
-
-#define SN_dmdName              "dmdName"
-#define NID_dmdName             892
-#define OBJ_dmdName             OBJ_X509,54L
-
-#define LN_pseudonym            "pseudonym"
-#define NID_pseudonym           510
-#define OBJ_pseudonym           OBJ_X509,65L
-
-#define SN_role         "role"
-#define LN_role         "role"
-#define NID_role                400
-#define OBJ_role                OBJ_X509,72L
-
-#define SN_X500algorithms               "X500algorithms"
-#define LN_X500algorithms               "directory services - algorithms"
-#define NID_X500algorithms              378
-#define OBJ_X500algorithms              OBJ_X500,8L
-
-#define SN_rsa          "RSA"
-#define LN_rsa          "rsa"
-#define NID_rsa         19
-#define OBJ_rsa         OBJ_X500algorithms,1L,1L
-
-#define SN_mdc2WithRSA          "RSA-MDC2"
-#define LN_mdc2WithRSA          "mdc2WithRSA"
-#define NID_mdc2WithRSA         96
-#define OBJ_mdc2WithRSA         OBJ_X500algorithms,3L,100L
-
-#define SN_mdc2         "MDC2"
-#define LN_mdc2         "mdc2"
-#define NID_mdc2                95
-#define OBJ_mdc2                OBJ_X500algorithms,3L,101L
-
-#define SN_id_ce                "id-ce"
-#define NID_id_ce               81
-#define OBJ_id_ce               OBJ_X500,29L
-
-#define SN_subject_directory_attributes         "subjectDirectoryAttributes"
-#define LN_subject_directory_attributes         "X509v3 Subject Directory Attributes"
-#define NID_subject_directory_attributes                769
-#define OBJ_subject_directory_attributes                OBJ_id_ce,9L
-
-#define SN_subject_key_identifier               "subjectKeyIdentifier"
-#define LN_subject_key_identifier               "X509v3 Subject Key Identifier"
-#define NID_subject_key_identifier              82
-#define OBJ_subject_key_identifier              OBJ_id_ce,14L
-
-#define SN_key_usage            "keyUsage"
-#define LN_key_usage            "X509v3 Key Usage"
-#define NID_key_usage           83
-#define OBJ_key_usage           OBJ_id_ce,15L
-
-#define SN_private_key_usage_period             "privateKeyUsagePeriod"
-#define LN_private_key_usage_period             "X509v3 Private Key Usage Period"
-#define NID_private_key_usage_period            84
-#define OBJ_private_key_usage_period            OBJ_id_ce,16L
-
-#define SN_subject_alt_name             "subjectAltName"
-#define LN_subject_alt_name             "X509v3 Subject Alternative Name"
-#define NID_subject_alt_name            85
-#define OBJ_subject_alt_name            OBJ_id_ce,17L
-
-#define SN_issuer_alt_name              "issuerAltName"
-#define LN_issuer_alt_name              "X509v3 Issuer Alternative Name"
-#define NID_issuer_alt_name             86
-#define OBJ_issuer_alt_name             OBJ_id_ce,18L
-
-#define SN_basic_constraints            "basicConstraints"
-#define LN_basic_constraints            "X509v3 Basic Constraints"
-#define NID_basic_constraints           87
-#define OBJ_basic_constraints           OBJ_id_ce,19L
-
-#define SN_crl_number           "crlNumber"
-#define LN_crl_number           "X509v3 CRL Number"
-#define NID_crl_number          88
-#define OBJ_crl_number          OBJ_id_ce,20L
-
-#define SN_crl_reason           "CRLReason"
-#define LN_crl_reason           "X509v3 CRL Reason Code"
-#define NID_crl_reason          141
-#define OBJ_crl_reason          OBJ_id_ce,21L
-
-#define SN_invalidity_date              "invalidityDate"
-#define LN_invalidity_date              "Invalidity Date"
-#define NID_invalidity_date             142
-#define OBJ_invalidity_date             OBJ_id_ce,24L
-
-#define SN_delta_crl            "deltaCRL"
-#define LN_delta_crl            "X509v3 Delta CRL Indicator"
-#define NID_delta_crl           140
-#define OBJ_delta_crl           OBJ_id_ce,27L
-
-#define SN_issuing_distribution_point           "issuingDistributionPoint"
-#define LN_issuing_distribution_point           "X509v3 Issuing Distrubution Point"
-#define NID_issuing_distribution_point          770
-#define OBJ_issuing_distribution_point          OBJ_id_ce,28L
-
-#define SN_certificate_issuer           "certificateIssuer"
-#define LN_certificate_issuer           "X509v3 Certificate Issuer"
-#define NID_certificate_issuer          771
-#define OBJ_certificate_issuer          OBJ_id_ce,29L
-
-#define SN_name_constraints             "nameConstraints"
-#define LN_name_constraints             "X509v3 Name Constraints"
-#define NID_name_constraints            666
-#define OBJ_name_constraints            OBJ_id_ce,30L
-
-#define SN_crl_distribution_points              "crlDistributionPoints"
-#define LN_crl_distribution_points              "X509v3 CRL Distribution Points"
-#define NID_crl_distribution_points             103
-#define OBJ_crl_distribution_points             OBJ_id_ce,31L
-
-#define SN_certificate_policies         "certificatePolicies"
-#define LN_certificate_policies         "X509v3 Certificate Policies"
-#define NID_certificate_policies                89
-#define OBJ_certificate_policies                OBJ_id_ce,32L
-
-#define SN_any_policy           "anyPolicy"
-#define LN_any_policy           "X509v3 Any Policy"
-#define NID_any_policy          746
-#define OBJ_any_policy          OBJ_certificate_policies,0L
-
-#define SN_policy_mappings              "policyMappings"
-#define LN_policy_mappings              "X509v3 Policy Mappings"
-#define NID_policy_mappings             747
-#define OBJ_policy_mappings             OBJ_id_ce,33L
-
-#define SN_authority_key_identifier             "authorityKeyIdentifier"
-#define LN_authority_key_identifier             "X509v3 Authority Key Identifier"
-#define NID_authority_key_identifier            90
-#define OBJ_authority_key_identifier            OBJ_id_ce,35L
-
-#define SN_policy_constraints           "policyConstraints"
-#define LN_policy_constraints           "X509v3 Policy Constraints"
-#define NID_policy_constraints          401
-#define OBJ_policy_constraints          OBJ_id_ce,36L
-
-#define SN_ext_key_usage                "extendedKeyUsage"
-#define LN_ext_key_usage                "X509v3 Extended Key Usage"
-#define NID_ext_key_usage               126
-#define OBJ_ext_key_usage               OBJ_id_ce,37L
-
-#define SN_freshest_crl         "freshestCRL"
-#define LN_freshest_crl         "X509v3 Freshest CRL"
-#define NID_freshest_crl                857
-#define OBJ_freshest_crl                OBJ_id_ce,46L
-
-#define SN_inhibit_any_policy           "inhibitAnyPolicy"
-#define LN_inhibit_any_policy           "X509v3 Inhibit Any Policy"
-#define NID_inhibit_any_policy          748
-#define OBJ_inhibit_any_policy          OBJ_id_ce,54L
-
-#define SN_target_information           "targetInformation"
-#define LN_target_information           "X509v3 AC Targeting"
-#define NID_target_information          402
-#define OBJ_target_information          OBJ_id_ce,55L
-
-#define SN_no_rev_avail         "noRevAvail"
-#define LN_no_rev_avail         "X509v3 No Revocation Available"
-#define NID_no_rev_avail                403
-#define OBJ_no_rev_avail                OBJ_id_ce,56L
-
-#define SN_anyExtendedKeyUsage          "anyExtendedKeyUsage"
-#define LN_anyExtendedKeyUsage          "Any Extended Key Usage"
-#define NID_anyExtendedKeyUsage         910
-#define OBJ_anyExtendedKeyUsage         OBJ_ext_key_usage,0L
-
-#define SN_netscape             "Netscape"
-#define LN_netscape             "Netscape Communications Corp."
-#define NID_netscape            57
-#define OBJ_netscape            2L,16L,840L,1L,113730L
-
-#define SN_netscape_cert_extension              "nsCertExt"
-#define LN_netscape_cert_extension              "Netscape Certificate Extension"
-#define NID_netscape_cert_extension             58
-#define OBJ_netscape_cert_extension             OBJ_netscape,1L
-
-#define SN_netscape_data_type           "nsDataType"
-#define LN_netscape_data_type           "Netscape Data Type"
-#define NID_netscape_data_type          59
-#define OBJ_netscape_data_type          OBJ_netscape,2L
-
-#define SN_netscape_cert_type           "nsCertType"
-#define LN_netscape_cert_type           "Netscape Cert Type"
-#define NID_netscape_cert_type          71
-#define OBJ_netscape_cert_type          OBJ_netscape_cert_extension,1L
-
-#define SN_netscape_base_url            "nsBaseUrl"
-#define LN_netscape_base_url            "Netscape Base Url"
-#define NID_netscape_base_url           72
-#define OBJ_netscape_base_url           OBJ_netscape_cert_extension,2L
-
-#define SN_netscape_revocation_url              "nsRevocationUrl"
-#define LN_netscape_revocation_url              "Netscape Revocation Url"
-#define NID_netscape_revocation_url             73
-#define OBJ_netscape_revocation_url             OBJ_netscape_cert_extension,3L
-
-#define SN_netscape_ca_revocation_url           "nsCaRevocationUrl"
-#define LN_netscape_ca_revocation_url           "Netscape CA Revocation Url"
-#define NID_netscape_ca_revocation_url          74
-#define OBJ_netscape_ca_revocation_url          OBJ_netscape_cert_extension,4L
-
-#define SN_netscape_renewal_url         "nsRenewalUrl"
-#define LN_netscape_renewal_url         "Netscape Renewal Url"
-#define NID_netscape_renewal_url                75
-#define OBJ_netscape_renewal_url                OBJ_netscape_cert_extension,7L
-
-#define SN_netscape_ca_policy_url               "nsCaPolicyUrl"
-#define LN_netscape_ca_policy_url               "Netscape CA Policy Url"
-#define NID_netscape_ca_policy_url              76
-#define OBJ_netscape_ca_policy_url              OBJ_netscape_cert_extension,8L
-
-#define SN_netscape_ssl_server_name             "nsSslServerName"
-#define LN_netscape_ssl_server_name             "Netscape SSL Server Name"
-#define NID_netscape_ssl_server_name            77
-#define OBJ_netscape_ssl_server_name            OBJ_netscape_cert_extension,12L
-
-#define SN_netscape_comment             "nsComment"
-#define LN_netscape_comment             "Netscape Comment"
-#define NID_netscape_comment            78
-#define OBJ_netscape_comment            OBJ_netscape_cert_extension,13L
-
-#define SN_netscape_cert_sequence               "nsCertSequence"
-#define LN_netscape_cert_sequence               "Netscape Certificate Sequence"
-#define NID_netscape_cert_sequence              79
-#define OBJ_netscape_cert_sequence              OBJ_netscape_data_type,5L
-
-#define SN_ns_sgc               "nsSGC"
-#define LN_ns_sgc               "Netscape Server Gated Crypto"
-#define NID_ns_sgc              139
-#define OBJ_ns_sgc              OBJ_netscape,4L,1L
-
-#define SN_org          "ORG"
-#define LN_org          "org"
-#define NID_org         379
-#define OBJ_org         OBJ_iso,3L
-
-#define SN_dod          "DOD"
-#define LN_dod          "dod"
-#define NID_dod         380
-#define OBJ_dod         OBJ_org,6L
-
-#define SN_iana         "IANA"
-#define LN_iana         "iana"
-#define NID_iana                381
-#define OBJ_iana                OBJ_dod,1L
-
-#define OBJ_internet            OBJ_iana
-
-#define SN_Directory            "directory"
-#define LN_Directory            "Directory"
-#define NID_Directory           382
-#define OBJ_Directory           OBJ_internet,1L
-
-#define SN_Management           "mgmt"
-#define LN_Management           "Management"
-#define NID_Management          383
-#define OBJ_Management          OBJ_internet,2L
-
-#define SN_Experimental         "experimental"
-#define LN_Experimental         "Experimental"
-#define NID_Experimental                384
-#define OBJ_Experimental                OBJ_internet,3L
-
-#define SN_Private              "private"
-#define LN_Private              "Private"
-#define NID_Private             385
-#define OBJ_Private             OBJ_internet,4L
-
-#define SN_Security             "security"
-#define LN_Security             "Security"
-#define NID_Security            386
-#define OBJ_Security            OBJ_internet,5L
-
-#define SN_SNMPv2               "snmpv2"
-#define LN_SNMPv2               "SNMPv2"
-#define NID_SNMPv2              387
-#define OBJ_SNMPv2              OBJ_internet,6L
-
-#define LN_Mail         "Mail"
-#define NID_Mail                388
-#define OBJ_Mail                OBJ_internet,7L
-
-#define SN_Enterprises          "enterprises"
-#define LN_Enterprises          "Enterprises"
-#define NID_Enterprises         389
-#define OBJ_Enterprises         OBJ_Private,1L
-
-#define SN_dcObject             "dcobject"
-#define LN_dcObject             "dcObject"
-#define NID_dcObject            390
-#define OBJ_dcObject            OBJ_Enterprises,1466L,344L
-
-#define SN_mime_mhs             "mime-mhs"
-#define LN_mime_mhs             "MIME MHS"
-#define NID_mime_mhs            504
-#define OBJ_mime_mhs            OBJ_Mail,1L
-
-#define SN_mime_mhs_headings            "mime-mhs-headings"
-#define LN_mime_mhs_headings            "mime-mhs-headings"
-#define NID_mime_mhs_headings           505
-#define OBJ_mime_mhs_headings           OBJ_mime_mhs,1L
-
-#define SN_mime_mhs_bodies              "mime-mhs-bodies"
-#define LN_mime_mhs_bodies              "mime-mhs-bodies"
-#define NID_mime_mhs_bodies             506
-#define OBJ_mime_mhs_bodies             OBJ_mime_mhs,2L
-
-#define SN_id_hex_partial_message               "id-hex-partial-message"
-#define LN_id_hex_partial_message               "id-hex-partial-message"
-#define NID_id_hex_partial_message              507
-#define OBJ_id_hex_partial_message              OBJ_mime_mhs_headings,1L
-
-#define SN_id_hex_multipart_message             "id-hex-multipart-message"
-#define LN_id_hex_multipart_message             "id-hex-multipart-message"
-#define NID_id_hex_multipart_message            508
-#define OBJ_id_hex_multipart_message            OBJ_mime_mhs_headings,2L
-
-#define SN_rle_compression              "RLE"
-#define LN_rle_compression              "run length compression"
-#define NID_rle_compression             124
-#define OBJ_rle_compression             1L,1L,1L,1L,666L,1L
-
-#define SN_zlib_compression             "ZLIB"
-#define LN_zlib_compression             "zlib compression"
-#define NID_zlib_compression            125
-#define OBJ_zlib_compression            OBJ_id_smime_alg,8L
-
-#define OBJ_csor                2L,16L,840L,1L,101L,3L
-
-#define OBJ_nistAlgorithms              OBJ_csor,4L
-
-#define OBJ_aes         OBJ_nistAlgorithms,1L
-
-#define SN_aes_128_ecb          "AES-128-ECB"
-#define LN_aes_128_ecb          "aes-128-ecb"
-#define NID_aes_128_ecb         418
-#define OBJ_aes_128_ecb         OBJ_aes,1L
-
-#define SN_aes_128_cbc          "AES-128-CBC"
-#define LN_aes_128_cbc          "aes-128-cbc"
-#define NID_aes_128_cbc         419
-#define OBJ_aes_128_cbc         OBJ_aes,2L
-
-#define SN_aes_128_ofb128               "AES-128-OFB"
-#define LN_aes_128_ofb128               "aes-128-ofb"
-#define NID_aes_128_ofb128              420
-#define OBJ_aes_128_ofb128              OBJ_aes,3L
-
-#define SN_aes_128_cfb128               "AES-128-CFB"
-#define LN_aes_128_cfb128               "aes-128-cfb"
-#define NID_aes_128_cfb128              421
-#define OBJ_aes_128_cfb128              OBJ_aes,4L
-
-#define SN_id_aes128_wrap               "id-aes128-wrap"
-#define NID_id_aes128_wrap              788
-#define OBJ_id_aes128_wrap              OBJ_aes,5L
-
-#define SN_aes_128_gcm          "id-aes128-GCM"
-#define LN_aes_128_gcm          "aes-128-gcm"
-#define NID_aes_128_gcm         895
-#define OBJ_aes_128_gcm         OBJ_aes,6L
-
-#define SN_aes_128_ccm          "id-aes128-CCM"
-#define LN_aes_128_ccm          "aes-128-ccm"
-#define NID_aes_128_ccm         896
-#define OBJ_aes_128_ccm         OBJ_aes,7L
-
-#define SN_id_aes128_wrap_pad           "id-aes128-wrap-pad"
-#define NID_id_aes128_wrap_pad          897
-#define OBJ_id_aes128_wrap_pad          OBJ_aes,8L
-
-#define SN_aes_192_ecb          "AES-192-ECB"
-#define LN_aes_192_ecb          "aes-192-ecb"
-#define NID_aes_192_ecb         422
-#define OBJ_aes_192_ecb         OBJ_aes,21L
-
-#define SN_aes_192_cbc          "AES-192-CBC"
-#define LN_aes_192_cbc          "aes-192-cbc"
-#define NID_aes_192_cbc         423
-#define OBJ_aes_192_cbc         OBJ_aes,22L
-
-#define SN_aes_192_ofb128               "AES-192-OFB"
-#define LN_aes_192_ofb128               "aes-192-ofb"
-#define NID_aes_192_ofb128              424
-#define OBJ_aes_192_ofb128              OBJ_aes,23L
-
-#define SN_aes_192_cfb128               "AES-192-CFB"
-#define LN_aes_192_cfb128               "aes-192-cfb"
-#define NID_aes_192_cfb128              425
-#define OBJ_aes_192_cfb128              OBJ_aes,24L
-
-#define SN_id_aes192_wrap               "id-aes192-wrap"
-#define NID_id_aes192_wrap              789
-#define OBJ_id_aes192_wrap              OBJ_aes,25L
-
-#define SN_aes_192_gcm          "id-aes192-GCM"
-#define LN_aes_192_gcm          "aes-192-gcm"
-#define NID_aes_192_gcm         898
-#define OBJ_aes_192_gcm         OBJ_aes,26L
-
-#define SN_aes_192_ccm          "id-aes192-CCM"
-#define LN_aes_192_ccm          "aes-192-ccm"
-#define NID_aes_192_ccm         899
-#define OBJ_aes_192_ccm         OBJ_aes,27L
-
-#define SN_id_aes192_wrap_pad           "id-aes192-wrap-pad"
-#define NID_id_aes192_wrap_pad          900
-#define OBJ_id_aes192_wrap_pad          OBJ_aes,28L
-
-#define SN_aes_256_ecb          "AES-256-ECB"
-#define LN_aes_256_ecb          "aes-256-ecb"
-#define NID_aes_256_ecb         426
-#define OBJ_aes_256_ecb         OBJ_aes,41L
-
-#define SN_aes_256_cbc          "AES-256-CBC"
-#define LN_aes_256_cbc          "aes-256-cbc"
-#define NID_aes_256_cbc         427
-#define OBJ_aes_256_cbc         OBJ_aes,42L
-
-#define SN_aes_256_ofb128               "AES-256-OFB"
-#define LN_aes_256_ofb128               "aes-256-ofb"
-#define NID_aes_256_ofb128              428
-#define OBJ_aes_256_ofb128              OBJ_aes,43L
-
-#define SN_aes_256_cfb128               "AES-256-CFB"
-#define LN_aes_256_cfb128               "aes-256-cfb"
-#define NID_aes_256_cfb128              429
-#define OBJ_aes_256_cfb128              OBJ_aes,44L
-
-#define SN_id_aes256_wrap               "id-aes256-wrap"
-#define NID_id_aes256_wrap              790
-#define OBJ_id_aes256_wrap              OBJ_aes,45L
-
-#define SN_aes_256_gcm          "id-aes256-GCM"
-#define LN_aes_256_gcm          "aes-256-gcm"
-#define NID_aes_256_gcm         901
-#define OBJ_aes_256_gcm         OBJ_aes,46L
-
-#define SN_aes_256_ccm          "id-aes256-CCM"
-#define LN_aes_256_ccm          "aes-256-ccm"
-#define NID_aes_256_ccm         902
-#define OBJ_aes_256_ccm         OBJ_aes,47L
-
-#define SN_id_aes256_wrap_pad           "id-aes256-wrap-pad"
-#define NID_id_aes256_wrap_pad          903
-#define OBJ_id_aes256_wrap_pad          OBJ_aes,48L
-
-#define SN_aes_128_cfb1         "AES-128-CFB1"
-#define LN_aes_128_cfb1         "aes-128-cfb1"
-#define NID_aes_128_cfb1                650
-
-#define SN_aes_192_cfb1         "AES-192-CFB1"
-#define LN_aes_192_cfb1         "aes-192-cfb1"
-#define NID_aes_192_cfb1                651
-
-#define SN_aes_256_cfb1         "AES-256-CFB1"
-#define LN_aes_256_cfb1         "aes-256-cfb1"
-#define NID_aes_256_cfb1                652
-
-#define SN_aes_128_cfb8         "AES-128-CFB8"
-#define LN_aes_128_cfb8         "aes-128-cfb8"
-#define NID_aes_128_cfb8                653
-
-#define SN_aes_192_cfb8         "AES-192-CFB8"
-#define LN_aes_192_cfb8         "aes-192-cfb8"
-#define NID_aes_192_cfb8                654
-
-#define SN_aes_256_cfb8         "AES-256-CFB8"
-#define LN_aes_256_cfb8         "aes-256-cfb8"
-#define NID_aes_256_cfb8                655
-
-#define SN_aes_128_ctr          "AES-128-CTR"
-#define LN_aes_128_ctr          "aes-128-ctr"
-#define NID_aes_128_ctr         904
-
-#define SN_aes_192_ctr          "AES-192-CTR"
-#define LN_aes_192_ctr          "aes-192-ctr"
-#define NID_aes_192_ctr         905
-
-#define SN_aes_256_ctr          "AES-256-CTR"
-#define LN_aes_256_ctr          "aes-256-ctr"
-#define NID_aes_256_ctr         906
-
-#define SN_aes_128_xts          "AES-128-XTS"
-#define LN_aes_128_xts          "aes-128-xts"
-#define NID_aes_128_xts         913
-
-#define SN_aes_256_xts          "AES-256-XTS"
-#define LN_aes_256_xts          "aes-256-xts"
-#define NID_aes_256_xts         914
-
-#define SN_des_cfb1             "DES-CFB1"
-#define LN_des_cfb1             "des-cfb1"
-#define NID_des_cfb1            656
-
-#define SN_des_cfb8             "DES-CFB8"
-#define LN_des_cfb8             "des-cfb8"
-#define NID_des_cfb8            657
-
-#define SN_des_ede3_cfb1                "DES-EDE3-CFB1"
-#define LN_des_ede3_cfb1                "des-ede3-cfb1"
-#define NID_des_ede3_cfb1               658
-
-#define SN_des_ede3_cfb8                "DES-EDE3-CFB8"
-#define LN_des_ede3_cfb8                "des-ede3-cfb8"
-#define NID_des_ede3_cfb8               659
-
-#define OBJ_nist_hashalgs               OBJ_nistAlgorithms,2L
-
-#define SN_sha256               "SHA256"
-#define LN_sha256               "sha256"
-#define NID_sha256              672
-#define OBJ_sha256              OBJ_nist_hashalgs,1L
-
-#define SN_sha384               "SHA384"
-#define LN_sha384               "sha384"
-#define NID_sha384              673
-#define OBJ_sha384              OBJ_nist_hashalgs,2L
-
-#define SN_sha512               "SHA512"
-#define LN_sha512               "sha512"
-#define NID_sha512              674
-#define OBJ_sha512              OBJ_nist_hashalgs,3L
-
-#define SN_sha224               "SHA224"
-#define LN_sha224               "sha224"
-#define NID_sha224              675
-#define OBJ_sha224              OBJ_nist_hashalgs,4L
-
-#define OBJ_dsa_with_sha2               OBJ_nistAlgorithms,3L
-
-#define SN_dsa_with_SHA224              "dsa_with_SHA224"
-#define NID_dsa_with_SHA224             802
-#define OBJ_dsa_with_SHA224             OBJ_dsa_with_sha2,1L
-
-#define SN_dsa_with_SHA256              "dsa_with_SHA256"
-#define NID_dsa_with_SHA256             803
-#define OBJ_dsa_with_SHA256             OBJ_dsa_with_sha2,2L
-
-#define SN_hold_instruction_code                "holdInstructionCode"
-#define LN_hold_instruction_code                "Hold Instruction Code"
-#define NID_hold_instruction_code               430
-#define OBJ_hold_instruction_code               OBJ_id_ce,23L
-
-#define OBJ_holdInstruction             OBJ_X9_57,2L
-
-#define SN_hold_instruction_none                "holdInstructionNone"
-#define LN_hold_instruction_none                "Hold Instruction None"
-#define NID_hold_instruction_none               431
-#define OBJ_hold_instruction_none               OBJ_holdInstruction,1L
-
-#define SN_hold_instruction_call_issuer         "holdInstructionCallIssuer"
-#define LN_hold_instruction_call_issuer         "Hold Instruction Call Issuer"
-#define NID_hold_instruction_call_issuer                432
-#define OBJ_hold_instruction_call_issuer                OBJ_holdInstruction,2L
-
-#define SN_hold_instruction_reject              "holdInstructionReject"
-#define LN_hold_instruction_reject              "Hold Instruction Reject"
-#define NID_hold_instruction_reject             433
-#define OBJ_hold_instruction_reject             OBJ_holdInstruction,3L
-
-#define SN_data         "data"
-#define NID_data                434
-#define OBJ_data                OBJ_itu_t,9L
-
-#define SN_pss          "pss"
-#define NID_pss         435
-#define OBJ_pss         OBJ_data,2342L
-
-#define SN_ucl          "ucl"
-#define NID_ucl         436
-#define OBJ_ucl         OBJ_pss,19200300L
-
-#define SN_pilot                "pilot"
-#define NID_pilot               437
-#define OBJ_pilot               OBJ_ucl,100L
-
-#define LN_pilotAttributeType           "pilotAttributeType"
-#define NID_pilotAttributeType          438
-#define OBJ_pilotAttributeType          OBJ_pilot,1L
-
-#define LN_pilotAttributeSyntax         "pilotAttributeSyntax"
-#define NID_pilotAttributeSyntax                439
-#define OBJ_pilotAttributeSyntax                OBJ_pilot,3L
-
-#define LN_pilotObjectClass             "pilotObjectClass"
-#define NID_pilotObjectClass            440
-#define OBJ_pilotObjectClass            OBJ_pilot,4L
-
-#define LN_pilotGroups          "pilotGroups"
-#define NID_pilotGroups         441
-#define OBJ_pilotGroups         OBJ_pilot,10L
-
-#define LN_iA5StringSyntax              "iA5StringSyntax"
-#define NID_iA5StringSyntax             442
-#define OBJ_iA5StringSyntax             OBJ_pilotAttributeSyntax,4L
-
-#define LN_caseIgnoreIA5StringSyntax            "caseIgnoreIA5StringSyntax"
-#define NID_caseIgnoreIA5StringSyntax           443
-#define OBJ_caseIgnoreIA5StringSyntax           OBJ_pilotAttributeSyntax,5L
-
-#define LN_pilotObject          "pilotObject"
-#define NID_pilotObject         444
-#define OBJ_pilotObject         OBJ_pilotObjectClass,3L
-
-#define LN_pilotPerson          "pilotPerson"
-#define NID_pilotPerson         445
-#define OBJ_pilotPerson         OBJ_pilotObjectClass,4L
-
-#define SN_account              "account"
-#define NID_account             446
-#define OBJ_account             OBJ_pilotObjectClass,5L
-
-#define SN_document             "document"
-#define NID_document            447
-#define OBJ_document            OBJ_pilotObjectClass,6L
-
-#define SN_room         "room"
-#define NID_room                448
-#define OBJ_room                OBJ_pilotObjectClass,7L
-
-#define LN_documentSeries               "documentSeries"
-#define NID_documentSeries              449
-#define OBJ_documentSeries              OBJ_pilotObjectClass,9L
-
-#define SN_Domain               "domain"
-#define LN_Domain               "Domain"
-#define NID_Domain              392
-#define OBJ_Domain              OBJ_pilotObjectClass,13L
-
-#define LN_rFC822localPart              "rFC822localPart"
-#define NID_rFC822localPart             450
-#define OBJ_rFC822localPart             OBJ_pilotObjectClass,14L
-
-#define LN_dNSDomain            "dNSDomain"
-#define NID_dNSDomain           451
-#define OBJ_dNSDomain           OBJ_pilotObjectClass,15L
-
-#define LN_domainRelatedObject          "domainRelatedObject"
-#define NID_domainRelatedObject         452
-#define OBJ_domainRelatedObject         OBJ_pilotObjectClass,17L
-
-#define LN_friendlyCountry              "friendlyCountry"
-#define NID_friendlyCountry             453
-#define OBJ_friendlyCountry             OBJ_pilotObjectClass,18L
-
-#define LN_simpleSecurityObject         "simpleSecurityObject"
-#define NID_simpleSecurityObject                454
-#define OBJ_simpleSecurityObject                OBJ_pilotObjectClass,19L
-
-#define LN_pilotOrganization            "pilotOrganization"
-#define NID_pilotOrganization           455
-#define OBJ_pilotOrganization           OBJ_pilotObjectClass,20L
-
-#define LN_pilotDSA             "pilotDSA"
-#define NID_pilotDSA            456
-#define OBJ_pilotDSA            OBJ_pilotObjectClass,21L
-
-#define LN_qualityLabelledData          "qualityLabelledData"
-#define NID_qualityLabelledData         457
-#define OBJ_qualityLabelledData         OBJ_pilotObjectClass,22L
-
-#define SN_userId               "UID"
-#define LN_userId               "userId"
-#define NID_userId              458
-#define OBJ_userId              OBJ_pilotAttributeType,1L
-
-#define LN_textEncodedORAddress         "textEncodedORAddress"
-#define NID_textEncodedORAddress                459
-#define OBJ_textEncodedORAddress                OBJ_pilotAttributeType,2L
-
-#define SN_rfc822Mailbox                "mail"
-#define LN_rfc822Mailbox                "rfc822Mailbox"
-#define NID_rfc822Mailbox               460
-#define OBJ_rfc822Mailbox               OBJ_pilotAttributeType,3L
-
-#define SN_info         "info"
-#define NID_info                461
-#define OBJ_info                OBJ_pilotAttributeType,4L
-
-#define LN_favouriteDrink               "favouriteDrink"
-#define NID_favouriteDrink              462
-#define OBJ_favouriteDrink              OBJ_pilotAttributeType,5L
-
-#define LN_roomNumber           "roomNumber"
-#define NID_roomNumber          463
-#define OBJ_roomNumber          OBJ_pilotAttributeType,6L
-
-#define SN_photo                "photo"
-#define NID_photo               464
-#define OBJ_photo               OBJ_pilotAttributeType,7L
-
-#define LN_userClass            "userClass"
-#define NID_userClass           465
-#define OBJ_userClass           OBJ_pilotAttributeType,8L
-
-#define SN_host         "host"
-#define NID_host                466
-#define OBJ_host                OBJ_pilotAttributeType,9L
-
-#define SN_manager              "manager"
-#define NID_manager             467
-#define OBJ_manager             OBJ_pilotAttributeType,10L
-
-#define LN_documentIdentifier           "documentIdentifier"
-#define NID_documentIdentifier          468
-#define OBJ_documentIdentifier          OBJ_pilotAttributeType,11L
-
-#define LN_documentTitle                "documentTitle"
-#define NID_documentTitle               469
-#define OBJ_documentTitle               OBJ_pilotAttributeType,12L
-
-#define LN_documentVersion              "documentVersion"
-#define NID_documentVersion             470
-#define OBJ_documentVersion             OBJ_pilotAttributeType,13L
-
-#define LN_documentAuthor               "documentAuthor"
-#define NID_documentAuthor              471
-#define OBJ_documentAuthor              OBJ_pilotAttributeType,14L
-
-#define LN_documentLocation             "documentLocation"
-#define NID_documentLocation            472
-#define OBJ_documentLocation            OBJ_pilotAttributeType,15L
-
-#define LN_homeTelephoneNumber          "homeTelephoneNumber"
-#define NID_homeTelephoneNumber         473
-#define OBJ_homeTelephoneNumber         OBJ_pilotAttributeType,20L
-
-#define SN_secretary            "secretary"
-#define NID_secretary           474
-#define OBJ_secretary           OBJ_pilotAttributeType,21L
-
-#define LN_otherMailbox         "otherMailbox"
-#define NID_otherMailbox                475
-#define OBJ_otherMailbox                OBJ_pilotAttributeType,22L
-
-#define LN_lastModifiedTime             "lastModifiedTime"
-#define NID_lastModifiedTime            476
-#define OBJ_lastModifiedTime            OBJ_pilotAttributeType,23L
-
-#define LN_lastModifiedBy               "lastModifiedBy"
-#define NID_lastModifiedBy              477
-#define OBJ_lastModifiedBy              OBJ_pilotAttributeType,24L
-
-#define SN_domainComponent              "DC"
-#define LN_domainComponent              "domainComponent"
-#define NID_domainComponent             391
-#define OBJ_domainComponent             OBJ_pilotAttributeType,25L
-
-#define LN_aRecord              "aRecord"
-#define NID_aRecord             478
-#define OBJ_aRecord             OBJ_pilotAttributeType,26L
-
-#define LN_pilotAttributeType27         "pilotAttributeType27"
-#define NID_pilotAttributeType27                479
-#define OBJ_pilotAttributeType27                OBJ_pilotAttributeType,27L
-
-#define LN_mXRecord             "mXRecord"
-#define NID_mXRecord            480
-#define OBJ_mXRecord            OBJ_pilotAttributeType,28L
-
-#define LN_nSRecord             "nSRecord"
-#define NID_nSRecord            481
-#define OBJ_nSRecord            OBJ_pilotAttributeType,29L
-
-#define LN_sOARecord            "sOARecord"
-#define NID_sOARecord           482
-#define OBJ_sOARecord           OBJ_pilotAttributeType,30L
-
-#define LN_cNAMERecord          "cNAMERecord"
-#define NID_cNAMERecord         483
-#define OBJ_cNAMERecord         OBJ_pilotAttributeType,31L
-
-#define LN_associatedDomain             "associatedDomain"
-#define NID_associatedDomain            484
-#define OBJ_associatedDomain            OBJ_pilotAttributeType,37L
-
-#define LN_associatedName               "associatedName"
-#define NID_associatedName              485
-#define OBJ_associatedName              OBJ_pilotAttributeType,38L
-
-#define LN_homePostalAddress            "homePostalAddress"
-#define NID_homePostalAddress           486
-#define OBJ_homePostalAddress           OBJ_pilotAttributeType,39L
-
-#define LN_personalTitle                "personalTitle"
-#define NID_personalTitle               487
-#define OBJ_personalTitle               OBJ_pilotAttributeType,40L
-
-#define LN_mobileTelephoneNumber                "mobileTelephoneNumber"
-#define NID_mobileTelephoneNumber               488
-#define OBJ_mobileTelephoneNumber               OBJ_pilotAttributeType,41L
-
-#define LN_pagerTelephoneNumber         "pagerTelephoneNumber"
-#define NID_pagerTelephoneNumber                489
-#define OBJ_pagerTelephoneNumber                OBJ_pilotAttributeType,42L
-
-#define LN_friendlyCountryName          "friendlyCountryName"
-#define NID_friendlyCountryName         490
-#define OBJ_friendlyCountryName         OBJ_pilotAttributeType,43L
-
-#define LN_organizationalStatus         "organizationalStatus"
-#define NID_organizationalStatus                491
-#define OBJ_organizationalStatus                OBJ_pilotAttributeType,45L
-
-#define LN_janetMailbox         "janetMailbox"
-#define NID_janetMailbox                492
-#define OBJ_janetMailbox                OBJ_pilotAttributeType,46L
-
-#define LN_mailPreferenceOption         "mailPreferenceOption"
-#define NID_mailPreferenceOption                493
-#define OBJ_mailPreferenceOption                OBJ_pilotAttributeType,47L
-
-#define LN_buildingName         "buildingName"
-#define NID_buildingName                494
-#define OBJ_buildingName                OBJ_pilotAttributeType,48L
-
-#define LN_dSAQuality           "dSAQuality"
-#define NID_dSAQuality          495
-#define OBJ_dSAQuality          OBJ_pilotAttributeType,49L
-
-#define LN_singleLevelQuality           "singleLevelQuality"
-#define NID_singleLevelQuality          496
-#define OBJ_singleLevelQuality          OBJ_pilotAttributeType,50L
-
-#define LN_subtreeMinimumQuality                "subtreeMinimumQuality"
-#define NID_subtreeMinimumQuality               497
-#define OBJ_subtreeMinimumQuality               OBJ_pilotAttributeType,51L
-
-#define LN_subtreeMaximumQuality                "subtreeMaximumQuality"
-#define NID_subtreeMaximumQuality               498
-#define OBJ_subtreeMaximumQuality               OBJ_pilotAttributeType,52L
-
-#define LN_personalSignature            "personalSignature"
-#define NID_personalSignature           499
-#define OBJ_personalSignature           OBJ_pilotAttributeType,53L
-
-#define LN_dITRedirect          "dITRedirect"
-#define NID_dITRedirect         500
-#define OBJ_dITRedirect         OBJ_pilotAttributeType,54L
-
-#define SN_audio                "audio"
-#define NID_audio               501
-#define OBJ_audio               OBJ_pilotAttributeType,55L
-
-#define LN_documentPublisher            "documentPublisher"
-#define NID_documentPublisher           502
-#define OBJ_documentPublisher           OBJ_pilotAttributeType,56L
-
-#define SN_id_set               "id-set"
-#define LN_id_set               "Secure Electronic Transactions"
-#define NID_id_set              512
-#define OBJ_id_set              OBJ_international_organizations,42L
-
-#define SN_set_ctype            "set-ctype"
-#define LN_set_ctype            "content types"
-#define NID_set_ctype           513
-#define OBJ_set_ctype           OBJ_id_set,0L
-
-#define SN_set_msgExt           "set-msgExt"
-#define LN_set_msgExt           "message extensions"
-#define NID_set_msgExt          514
-#define OBJ_set_msgExt          OBJ_id_set,1L
-
-#define SN_set_attr             "set-attr"
-#define NID_set_attr            515
-#define OBJ_set_attr            OBJ_id_set,3L
-
-#define SN_set_policy           "set-policy"
-#define NID_set_policy          516
-#define OBJ_set_policy          OBJ_id_set,5L
-
-#define SN_set_certExt          "set-certExt"
-#define LN_set_certExt          "certificate extensions"
-#define NID_set_certExt         517
-#define OBJ_set_certExt         OBJ_id_set,7L
-
-#define SN_set_brand            "set-brand"
-#define NID_set_brand           518
-#define OBJ_set_brand           OBJ_id_set,8L
-
-#define SN_setct_PANData                "setct-PANData"
-#define NID_setct_PANData               519
-#define OBJ_setct_PANData               OBJ_set_ctype,0L
-
-#define SN_setct_PANToken               "setct-PANToken"
-#define NID_setct_PANToken              520
-#define OBJ_setct_PANToken              OBJ_set_ctype,1L
-
-#define SN_setct_PANOnly                "setct-PANOnly"
-#define NID_setct_PANOnly               521
-#define OBJ_setct_PANOnly               OBJ_set_ctype,2L
-
-#define SN_setct_OIData         "setct-OIData"
-#define NID_setct_OIData                522
-#define OBJ_setct_OIData                OBJ_set_ctype,3L
-
-#define SN_setct_PI             "setct-PI"
-#define NID_setct_PI            523
-#define OBJ_setct_PI            OBJ_set_ctype,4L
-
-#define SN_setct_PIData         "setct-PIData"
-#define NID_setct_PIData                524
-#define OBJ_setct_PIData                OBJ_set_ctype,5L
-
-#define SN_setct_PIDataUnsigned         "setct-PIDataUnsigned"
-#define NID_setct_PIDataUnsigned                525
-#define OBJ_setct_PIDataUnsigned                OBJ_set_ctype,6L
-
-#define SN_setct_HODInput               "setct-HODInput"
-#define NID_setct_HODInput              526
-#define OBJ_setct_HODInput              OBJ_set_ctype,7L
-
-#define SN_setct_AuthResBaggage         "setct-AuthResBaggage"
-#define NID_setct_AuthResBaggage                527
-#define OBJ_setct_AuthResBaggage                OBJ_set_ctype,8L
-
-#define SN_setct_AuthRevReqBaggage              "setct-AuthRevReqBaggage"
-#define NID_setct_AuthRevReqBaggage             528
-#define OBJ_setct_AuthRevReqBaggage             OBJ_set_ctype,9L
-
-#define SN_setct_AuthRevResBaggage              "setct-AuthRevResBaggage"
-#define NID_setct_AuthRevResBaggage             529
-#define OBJ_setct_AuthRevResBaggage             OBJ_set_ctype,10L
-
-#define SN_setct_CapTokenSeq            "setct-CapTokenSeq"
-#define NID_setct_CapTokenSeq           530
-#define OBJ_setct_CapTokenSeq           OBJ_set_ctype,11L
-
-#define SN_setct_PInitResData           "setct-PInitResData"
-#define NID_setct_PInitResData          531
-#define OBJ_setct_PInitResData          OBJ_set_ctype,12L
-
-#define SN_setct_PI_TBS         "setct-PI-TBS"
-#define NID_setct_PI_TBS                532
-#define OBJ_setct_PI_TBS                OBJ_set_ctype,13L
-
-#define SN_setct_PResData               "setct-PResData"
-#define NID_setct_PResData              533
-#define OBJ_setct_PResData              OBJ_set_ctype,14L
-
-#define SN_setct_AuthReqTBS             "setct-AuthReqTBS"
-#define NID_setct_AuthReqTBS            534
-#define OBJ_setct_AuthReqTBS            OBJ_set_ctype,16L
-
-#define SN_setct_AuthResTBS             "setct-AuthResTBS"
-#define NID_setct_AuthResTBS            535
-#define OBJ_setct_AuthResTBS            OBJ_set_ctype,17L
-
-#define SN_setct_AuthResTBSX            "setct-AuthResTBSX"
-#define NID_setct_AuthResTBSX           536
-#define OBJ_setct_AuthResTBSX           OBJ_set_ctype,18L
-
-#define SN_setct_AuthTokenTBS           "setct-AuthTokenTBS"
-#define NID_setct_AuthTokenTBS          537
-#define OBJ_setct_AuthTokenTBS          OBJ_set_ctype,19L
-
-#define SN_setct_CapTokenData           "setct-CapTokenData"
-#define NID_setct_CapTokenData          538
-#define OBJ_setct_CapTokenData          OBJ_set_ctype,20L
-
-#define SN_setct_CapTokenTBS            "setct-CapTokenTBS"
-#define NID_setct_CapTokenTBS           539
-#define OBJ_setct_CapTokenTBS           OBJ_set_ctype,21L
-
-#define SN_setct_AcqCardCodeMsg         "setct-AcqCardCodeMsg"
-#define NID_setct_AcqCardCodeMsg                540
-#define OBJ_setct_AcqCardCodeMsg                OBJ_set_ctype,22L
-
-#define SN_setct_AuthRevReqTBS          "setct-AuthRevReqTBS"
-#define NID_setct_AuthRevReqTBS         541
-#define OBJ_setct_AuthRevReqTBS         OBJ_set_ctype,23L
-
-#define SN_setct_AuthRevResData         "setct-AuthRevResData"
-#define NID_setct_AuthRevResData                542
-#define OBJ_setct_AuthRevResData                OBJ_set_ctype,24L
-
-#define SN_setct_AuthRevResTBS          "setct-AuthRevResTBS"
-#define NID_setct_AuthRevResTBS         543
-#define OBJ_setct_AuthRevResTBS         OBJ_set_ctype,25L
-
-#define SN_setct_CapReqTBS              "setct-CapReqTBS"
-#define NID_setct_CapReqTBS             544
-#define OBJ_setct_CapReqTBS             OBJ_set_ctype,26L
-
-#define SN_setct_CapReqTBSX             "setct-CapReqTBSX"
-#define NID_setct_CapReqTBSX            545
-#define OBJ_setct_CapReqTBSX            OBJ_set_ctype,27L
-
-#define SN_setct_CapResData             "setct-CapResData"
-#define NID_setct_CapResData            546
-#define OBJ_setct_CapResData            OBJ_set_ctype,28L
-
-#define SN_setct_CapRevReqTBS           "setct-CapRevReqTBS"
-#define NID_setct_CapRevReqTBS          547
-#define OBJ_setct_CapRevReqTBS          OBJ_set_ctype,29L
-
-#define SN_setct_CapRevReqTBSX          "setct-CapRevReqTBSX"
-#define NID_setct_CapRevReqTBSX         548
-#define OBJ_setct_CapRevReqTBSX         OBJ_set_ctype,30L
-
-#define SN_setct_CapRevResData          "setct-CapRevResData"
-#define NID_setct_CapRevResData         549
-#define OBJ_setct_CapRevResData         OBJ_set_ctype,31L
-
-#define SN_setct_CredReqTBS             "setct-CredReqTBS"
-#define NID_setct_CredReqTBS            550
-#define OBJ_setct_CredReqTBS            OBJ_set_ctype,32L
-
-#define SN_setct_CredReqTBSX            "setct-CredReqTBSX"
-#define NID_setct_CredReqTBSX           551
-#define OBJ_setct_CredReqTBSX           OBJ_set_ctype,33L
-
-#define SN_setct_CredResData            "setct-CredResData"
-#define NID_setct_CredResData           552
-#define OBJ_setct_CredResData           OBJ_set_ctype,34L
-
-#define SN_setct_CredRevReqTBS          "setct-CredRevReqTBS"
-#define NID_setct_CredRevReqTBS         553
-#define OBJ_setct_CredRevReqTBS         OBJ_set_ctype,35L
-
-#define SN_setct_CredRevReqTBSX         "setct-CredRevReqTBSX"
-#define NID_setct_CredRevReqTBSX                554
-#define OBJ_setct_CredRevReqTBSX                OBJ_set_ctype,36L
-
-#define SN_setct_CredRevResData         "setct-CredRevResData"
-#define NID_setct_CredRevResData                555
-#define OBJ_setct_CredRevResData                OBJ_set_ctype,37L
-
-#define SN_setct_PCertReqData           "setct-PCertReqData"
-#define NID_setct_PCertReqData          556
-#define OBJ_setct_PCertReqData          OBJ_set_ctype,38L
-
-#define SN_setct_PCertResTBS            "setct-PCertResTBS"
-#define NID_setct_PCertResTBS           557
-#define OBJ_setct_PCertResTBS           OBJ_set_ctype,39L
-
-#define SN_setct_BatchAdminReqData              "setct-BatchAdminReqData"
-#define NID_setct_BatchAdminReqData             558
-#define OBJ_setct_BatchAdminReqData             OBJ_set_ctype,40L
-
-#define SN_setct_BatchAdminResData              "setct-BatchAdminResData"
-#define NID_setct_BatchAdminResData             559
-#define OBJ_setct_BatchAdminResData             OBJ_set_ctype,41L
-
-#define SN_setct_CardCInitResTBS                "setct-CardCInitResTBS"
-#define NID_setct_CardCInitResTBS               560
-#define OBJ_setct_CardCInitResTBS               OBJ_set_ctype,42L
-
-#define SN_setct_MeAqCInitResTBS                "setct-MeAqCInitResTBS"
-#define NID_setct_MeAqCInitResTBS               561
-#define OBJ_setct_MeAqCInitResTBS               OBJ_set_ctype,43L
-
-#define SN_setct_RegFormResTBS          "setct-RegFormResTBS"
-#define NID_setct_RegFormResTBS         562
-#define OBJ_setct_RegFormResTBS         OBJ_set_ctype,44L
-
-#define SN_setct_CertReqData            "setct-CertReqData"
-#define NID_setct_CertReqData           563
-#define OBJ_setct_CertReqData           OBJ_set_ctype,45L
-
-#define SN_setct_CertReqTBS             "setct-CertReqTBS"
-#define NID_setct_CertReqTBS            564
-#define OBJ_setct_CertReqTBS            OBJ_set_ctype,46L
-
-#define SN_setct_CertResData            "setct-CertResData"
-#define NID_setct_CertResData           565
-#define OBJ_setct_CertResData           OBJ_set_ctype,47L
-
-#define SN_setct_CertInqReqTBS          "setct-CertInqReqTBS"
-#define NID_setct_CertInqReqTBS         566
-#define OBJ_setct_CertInqReqTBS         OBJ_set_ctype,48L
-
-#define SN_setct_ErrorTBS               "setct-ErrorTBS"
-#define NID_setct_ErrorTBS              567
-#define OBJ_setct_ErrorTBS              OBJ_set_ctype,49L
-
-#define SN_setct_PIDualSignedTBE                "setct-PIDualSignedTBE"
-#define NID_setct_PIDualSignedTBE               568
-#define OBJ_setct_PIDualSignedTBE               OBJ_set_ctype,50L
-
-#define SN_setct_PIUnsignedTBE          "setct-PIUnsignedTBE"
-#define NID_setct_PIUnsignedTBE         569
-#define OBJ_setct_PIUnsignedTBE         OBJ_set_ctype,51L
-
-#define SN_setct_AuthReqTBE             "setct-AuthReqTBE"
-#define NID_setct_AuthReqTBE            570
-#define OBJ_setct_AuthReqTBE            OBJ_set_ctype,52L
-
-#define SN_setct_AuthResTBE             "setct-AuthResTBE"
-#define NID_setct_AuthResTBE            571
-#define OBJ_setct_AuthResTBE            OBJ_set_ctype,53L
-
-#define SN_setct_AuthResTBEX            "setct-AuthResTBEX"
-#define NID_setct_AuthResTBEX           572
-#define OBJ_setct_AuthResTBEX           OBJ_set_ctype,54L
-
-#define SN_setct_AuthTokenTBE           "setct-AuthTokenTBE"
-#define NID_setct_AuthTokenTBE          573
-#define OBJ_setct_AuthTokenTBE          OBJ_set_ctype,55L
-
-#define SN_setct_CapTokenTBE            "setct-CapTokenTBE"
-#define NID_setct_CapTokenTBE           574
-#define OBJ_setct_CapTokenTBE           OBJ_set_ctype,56L
-
-#define SN_setct_CapTokenTBEX           "setct-CapTokenTBEX"
-#define NID_setct_CapTokenTBEX          575
-#define OBJ_setct_CapTokenTBEX          OBJ_set_ctype,57L
-
-#define SN_setct_AcqCardCodeMsgTBE              "setct-AcqCardCodeMsgTBE"
-#define NID_setct_AcqCardCodeMsgTBE             576
-#define OBJ_setct_AcqCardCodeMsgTBE             OBJ_set_ctype,58L
-
-#define SN_setct_AuthRevReqTBE          "setct-AuthRevReqTBE"
-#define NID_setct_AuthRevReqTBE         577
-#define OBJ_setct_AuthRevReqTBE         OBJ_set_ctype,59L
-
-#define SN_setct_AuthRevResTBE          "setct-AuthRevResTBE"
-#define NID_setct_AuthRevResTBE         578
-#define OBJ_setct_AuthRevResTBE         OBJ_set_ctype,60L
-
-#define SN_setct_AuthRevResTBEB         "setct-AuthRevResTBEB"
-#define NID_setct_AuthRevResTBEB                579
-#define OBJ_setct_AuthRevResTBEB                OBJ_set_ctype,61L
-
-#define SN_setct_CapReqTBE              "setct-CapReqTBE"
-#define NID_setct_CapReqTBE             580
-#define OBJ_setct_CapReqTBE             OBJ_set_ctype,62L
-
-#define SN_setct_CapReqTBEX             "setct-CapReqTBEX"
-#define NID_setct_CapReqTBEX            581
-#define OBJ_setct_CapReqTBEX            OBJ_set_ctype,63L
-
-#define SN_setct_CapResTBE              "setct-CapResTBE"
-#define NID_setct_CapResTBE             582
-#define OBJ_setct_CapResTBE             OBJ_set_ctype,64L
-
-#define SN_setct_CapRevReqTBE           "setct-CapRevReqTBE"
-#define NID_setct_CapRevReqTBE          583
-#define OBJ_setct_CapRevReqTBE          OBJ_set_ctype,65L
-
-#define SN_setct_CapRevReqTBEX          "setct-CapRevReqTBEX"
-#define NID_setct_CapRevReqTBEX         584
-#define OBJ_setct_CapRevReqTBEX         OBJ_set_ctype,66L
-
-#define SN_setct_CapRevResTBE           "setct-CapRevResTBE"
-#define NID_setct_CapRevResTBE          585
-#define OBJ_setct_CapRevResTBE          OBJ_set_ctype,67L
-
-#define SN_setct_CredReqTBE             "setct-CredReqTBE"
-#define NID_setct_CredReqTBE            586
-#define OBJ_setct_CredReqTBE            OBJ_set_ctype,68L
-
-#define SN_setct_CredReqTBEX            "setct-CredReqTBEX"
-#define NID_setct_CredReqTBEX           587
-#define OBJ_setct_CredReqTBEX           OBJ_set_ctype,69L
-
-#define SN_setct_CredResTBE             "setct-CredResTBE"
-#define NID_setct_CredResTBE            588
-#define OBJ_setct_CredResTBE            OBJ_set_ctype,70L
-
-#define SN_setct_CredRevReqTBE          "setct-CredRevReqTBE"
-#define NID_setct_CredRevReqTBE         589
-#define OBJ_setct_CredRevReqTBE         OBJ_set_ctype,71L
-
-#define SN_setct_CredRevReqTBEX         "setct-CredRevReqTBEX"
-#define NID_setct_CredRevReqTBEX                590
-#define OBJ_setct_CredRevReqTBEX                OBJ_set_ctype,72L
-
-#define SN_setct_CredRevResTBE          "setct-CredRevResTBE"
-#define NID_setct_CredRevResTBE         591
-#define OBJ_setct_CredRevResTBE         OBJ_set_ctype,73L
-
-#define SN_setct_BatchAdminReqTBE               "setct-BatchAdminReqTBE"
-#define NID_setct_BatchAdminReqTBE              592
-#define OBJ_setct_BatchAdminReqTBE              OBJ_set_ctype,74L
-
-#define SN_setct_BatchAdminResTBE               "setct-BatchAdminResTBE"
-#define NID_setct_BatchAdminResTBE              593
-#define OBJ_setct_BatchAdminResTBE              OBJ_set_ctype,75L
-
-#define SN_setct_RegFormReqTBE          "setct-RegFormReqTBE"
-#define NID_setct_RegFormReqTBE         594
-#define OBJ_setct_RegFormReqTBE         OBJ_set_ctype,76L
-
-#define SN_setct_CertReqTBE             "setct-CertReqTBE"
-#define NID_setct_CertReqTBE            595
-#define OBJ_setct_CertReqTBE            OBJ_set_ctype,77L
-
-#define SN_setct_CertReqTBEX            "setct-CertReqTBEX"
-#define NID_setct_CertReqTBEX           596
-#define OBJ_setct_CertReqTBEX           OBJ_set_ctype,78L
-
-#define SN_setct_CertResTBE             "setct-CertResTBE"
-#define NID_setct_CertResTBE            597
-#define OBJ_setct_CertResTBE            OBJ_set_ctype,79L
-
-#define SN_setct_CRLNotificationTBS             "setct-CRLNotificationTBS"
-#define NID_setct_CRLNotificationTBS            598
-#define OBJ_setct_CRLNotificationTBS            OBJ_set_ctype,80L
-
-#define SN_setct_CRLNotificationResTBS          "setct-CRLNotificationResTBS"
-#define NID_setct_CRLNotificationResTBS         599
-#define OBJ_setct_CRLNotificationResTBS         OBJ_set_ctype,81L
-
-#define SN_setct_BCIDistributionTBS             "setct-BCIDistributionTBS"
-#define NID_setct_BCIDistributionTBS            600
-#define OBJ_setct_BCIDistributionTBS            OBJ_set_ctype,82L
-
-#define SN_setext_genCrypt              "setext-genCrypt"
-#define LN_setext_genCrypt              "generic cryptogram"
-#define NID_setext_genCrypt             601
-#define OBJ_setext_genCrypt             OBJ_set_msgExt,1L
-
-#define SN_setext_miAuth                "setext-miAuth"
-#define LN_setext_miAuth                "merchant initiated auth"
-#define NID_setext_miAuth               602
-#define OBJ_setext_miAuth               OBJ_set_msgExt,3L
-
-#define SN_setext_pinSecure             "setext-pinSecure"
-#define NID_setext_pinSecure            603
-#define OBJ_setext_pinSecure            OBJ_set_msgExt,4L
-
-#define SN_setext_pinAny                "setext-pinAny"
-#define NID_setext_pinAny               604
-#define OBJ_setext_pinAny               OBJ_set_msgExt,5L
-
-#define SN_setext_track2                "setext-track2"
-#define NID_setext_track2               605
-#define OBJ_setext_track2               OBJ_set_msgExt,7L
-
-#define SN_setext_cv            "setext-cv"
-#define LN_setext_cv            "additional verification"
-#define NID_setext_cv           606
-#define OBJ_setext_cv           OBJ_set_msgExt,8L
-
-#define SN_set_policy_root              "set-policy-root"
-#define NID_set_policy_root             607
-#define OBJ_set_policy_root             OBJ_set_policy,0L
-
-#define SN_setCext_hashedRoot           "setCext-hashedRoot"
-#define NID_setCext_hashedRoot          608
-#define OBJ_setCext_hashedRoot          OBJ_set_certExt,0L
-
-#define SN_setCext_certType             "setCext-certType"
-#define NID_setCext_certType            609
-#define OBJ_setCext_certType            OBJ_set_certExt,1L
-
-#define SN_setCext_merchData            "setCext-merchData"
-#define NID_setCext_merchData           610
-#define OBJ_setCext_merchData           OBJ_set_certExt,2L
-
-#define SN_setCext_cCertRequired                "setCext-cCertRequired"
-#define NID_setCext_cCertRequired               611
-#define OBJ_setCext_cCertRequired               OBJ_set_certExt,3L
-
-#define SN_setCext_tunneling            "setCext-tunneling"
-#define NID_setCext_tunneling           612
-#define OBJ_setCext_tunneling           OBJ_set_certExt,4L
-
-#define SN_setCext_setExt               "setCext-setExt"
-#define NID_setCext_setExt              613
-#define OBJ_setCext_setExt              OBJ_set_certExt,5L
-
-#define SN_setCext_setQualf             "setCext-setQualf"
-#define NID_setCext_setQualf            614
-#define OBJ_setCext_setQualf            OBJ_set_certExt,6L
-
-#define SN_setCext_PGWYcapabilities             "setCext-PGWYcapabilities"
-#define NID_setCext_PGWYcapabilities            615
-#define OBJ_setCext_PGWYcapabilities            OBJ_set_certExt,7L
-
-#define SN_setCext_TokenIdentifier              "setCext-TokenIdentifier"
-#define NID_setCext_TokenIdentifier             616
-#define OBJ_setCext_TokenIdentifier             OBJ_set_certExt,8L
-
-#define SN_setCext_Track2Data           "setCext-Track2Data"
-#define NID_setCext_Track2Data          617
-#define OBJ_setCext_Track2Data          OBJ_set_certExt,9L
-
-#define SN_setCext_TokenType            "setCext-TokenType"
-#define NID_setCext_TokenType           618
-#define OBJ_setCext_TokenType           OBJ_set_certExt,10L
-
-#define SN_setCext_IssuerCapabilities           "setCext-IssuerCapabilities"
-#define NID_setCext_IssuerCapabilities          619
-#define OBJ_setCext_IssuerCapabilities          OBJ_set_certExt,11L
-
-#define SN_setAttr_Cert         "setAttr-Cert"
-#define NID_setAttr_Cert                620
-#define OBJ_setAttr_Cert                OBJ_set_attr,0L
-
-#define SN_setAttr_PGWYcap              "setAttr-PGWYcap"
-#define LN_setAttr_PGWYcap              "payment gateway capabilities"
-#define NID_setAttr_PGWYcap             621
-#define OBJ_setAttr_PGWYcap             OBJ_set_attr,1L
-
-#define SN_setAttr_TokenType            "setAttr-TokenType"
-#define NID_setAttr_TokenType           622
-#define OBJ_setAttr_TokenType           OBJ_set_attr,2L
-
-#define SN_setAttr_IssCap               "setAttr-IssCap"
-#define LN_setAttr_IssCap               "issuer capabilities"
-#define NID_setAttr_IssCap              623
-#define OBJ_setAttr_IssCap              OBJ_set_attr,3L
-
-#define SN_set_rootKeyThumb             "set-rootKeyThumb"
-#define NID_set_rootKeyThumb            624
-#define OBJ_set_rootKeyThumb            OBJ_setAttr_Cert,0L
-
-#define SN_set_addPolicy                "set-addPolicy"
-#define NID_set_addPolicy               625
-#define OBJ_set_addPolicy               OBJ_setAttr_Cert,1L
-
-#define SN_setAttr_Token_EMV            "setAttr-Token-EMV"
-#define NID_setAttr_Token_EMV           626
-#define OBJ_setAttr_Token_EMV           OBJ_setAttr_TokenType,1L
-
-#define SN_setAttr_Token_B0Prime                "setAttr-Token-B0Prime"
-#define NID_setAttr_Token_B0Prime               627
-#define OBJ_setAttr_Token_B0Prime               OBJ_setAttr_TokenType,2L
-
-#define SN_setAttr_IssCap_CVM           "setAttr-IssCap-CVM"
-#define NID_setAttr_IssCap_CVM          628
-#define OBJ_setAttr_IssCap_CVM          OBJ_setAttr_IssCap,3L
-
-#define SN_setAttr_IssCap_T2            "setAttr-IssCap-T2"
-#define NID_setAttr_IssCap_T2           629
-#define OBJ_setAttr_IssCap_T2           OBJ_setAttr_IssCap,4L
-
-#define SN_setAttr_IssCap_Sig           "setAttr-IssCap-Sig"
-#define NID_setAttr_IssCap_Sig          630
-#define OBJ_setAttr_IssCap_Sig          OBJ_setAttr_IssCap,5L
-
-#define SN_setAttr_GenCryptgrm          "setAttr-GenCryptgrm"
-#define LN_setAttr_GenCryptgrm          "generate cryptogram"
-#define NID_setAttr_GenCryptgrm         631
-#define OBJ_setAttr_GenCryptgrm         OBJ_setAttr_IssCap_CVM,1L
-
-#define SN_setAttr_T2Enc                "setAttr-T2Enc"
-#define LN_setAttr_T2Enc                "encrypted track 2"
-#define NID_setAttr_T2Enc               632
-#define OBJ_setAttr_T2Enc               OBJ_setAttr_IssCap_T2,1L
-
-#define SN_setAttr_T2cleartxt           "setAttr-T2cleartxt"
-#define LN_setAttr_T2cleartxt           "cleartext track 2"
-#define NID_setAttr_T2cleartxt          633
-#define OBJ_setAttr_T2cleartxt          OBJ_setAttr_IssCap_T2,2L
-
-#define SN_setAttr_TokICCsig            "setAttr-TokICCsig"
-#define LN_setAttr_TokICCsig            "ICC or token signature"
-#define NID_setAttr_TokICCsig           634
-#define OBJ_setAttr_TokICCsig           OBJ_setAttr_IssCap_Sig,1L
-
-#define SN_setAttr_SecDevSig            "setAttr-SecDevSig"
-#define LN_setAttr_SecDevSig            "secure device signature"
-#define NID_setAttr_SecDevSig           635
-#define OBJ_setAttr_SecDevSig           OBJ_setAttr_IssCap_Sig,2L
-
-#define SN_set_brand_IATA_ATA           "set-brand-IATA-ATA"
-#define NID_set_brand_IATA_ATA          636
-#define OBJ_set_brand_IATA_ATA          OBJ_set_brand,1L
-
-#define SN_set_brand_Diners             "set-brand-Diners"
-#define NID_set_brand_Diners            637
-#define OBJ_set_brand_Diners            OBJ_set_brand,30L
-
-#define SN_set_brand_AmericanExpress            "set-brand-AmericanExpress"
-#define NID_set_brand_AmericanExpress           638
-#define OBJ_set_brand_AmericanExpress           OBJ_set_brand,34L
-
-#define SN_set_brand_JCB                "set-brand-JCB"
-#define NID_set_brand_JCB               639
-#define OBJ_set_brand_JCB               OBJ_set_brand,35L
-
-#define SN_set_brand_Visa               "set-brand-Visa"
-#define NID_set_brand_Visa              640
-#define OBJ_set_brand_Visa              OBJ_set_brand,4L
-
-#define SN_set_brand_MasterCard         "set-brand-MasterCard"
-#define NID_set_brand_MasterCard                641
-#define OBJ_set_brand_MasterCard                OBJ_set_brand,5L
-
-#define SN_set_brand_Novus              "set-brand-Novus"
-#define NID_set_brand_Novus             642
-#define OBJ_set_brand_Novus             OBJ_set_brand,6011L
-
-#define SN_des_cdmf             "DES-CDMF"
-#define LN_des_cdmf             "des-cdmf"
-#define NID_des_cdmf            643
-#define OBJ_des_cdmf            OBJ_rsadsi,3L,10L
-
-#define SN_rsaOAEPEncryptionSET         "rsaOAEPEncryptionSET"
-#define NID_rsaOAEPEncryptionSET                644
-#define OBJ_rsaOAEPEncryptionSET                OBJ_rsadsi,1L,1L,6L
-
-#define SN_ipsec3               "Oakley-EC2N-3"
-#define LN_ipsec3               "ipsec3"
-#define NID_ipsec3              749
-
-#define SN_ipsec4               "Oakley-EC2N-4"
-#define LN_ipsec4               "ipsec4"
-#define NID_ipsec4              750
-
-#define SN_whirlpool            "whirlpool"
-#define NID_whirlpool           804
-#define OBJ_whirlpool           OBJ_iso,0L,10118L,3L,0L,55L
-
-#define SN_cryptopro            "cryptopro"
-#define NID_cryptopro           805
-#define OBJ_cryptopro           OBJ_member_body,643L,2L,2L
-
-#define SN_cryptocom            "cryptocom"
-#define NID_cryptocom           806
-#define OBJ_cryptocom           OBJ_member_body,643L,2L,9L
-
-#define SN_id_GostR3411_94_with_GostR3410_2001          "id-GostR3411-94-with-GostR3410-2001"
-#define LN_id_GostR3411_94_with_GostR3410_2001          "GOST R 34.11-94 with GOST R 34.10-2001"
-#define NID_id_GostR3411_94_with_GostR3410_2001         807
-#define OBJ_id_GostR3411_94_with_GostR3410_2001         OBJ_cryptopro,3L
-
-#define SN_id_GostR3411_94_with_GostR3410_94            "id-GostR3411-94-with-GostR3410-94"
-#define LN_id_GostR3411_94_with_GostR3410_94            "GOST R 34.11-94 with GOST R 34.10-94"
-#define NID_id_GostR3411_94_with_GostR3410_94           808
-#define OBJ_id_GostR3411_94_with_GostR3410_94           OBJ_cryptopro,4L
-
-#define SN_id_GostR3411_94              "md_gost94"
-#define LN_id_GostR3411_94              "GOST R 34.11-94"
-#define NID_id_GostR3411_94             809
-#define OBJ_id_GostR3411_94             OBJ_cryptopro,9L
-
-#define SN_id_HMACGostR3411_94          "id-HMACGostR3411-94"
-#define LN_id_HMACGostR3411_94          "HMAC GOST 34.11-94"
-#define NID_id_HMACGostR3411_94         810
-#define OBJ_id_HMACGostR3411_94         OBJ_cryptopro,10L
-
-#define SN_id_GostR3410_2001            "gost2001"
-#define LN_id_GostR3410_2001            "GOST R 34.10-2001"
-#define NID_id_GostR3410_2001           811
-#define OBJ_id_GostR3410_2001           OBJ_cryptopro,19L
-
-#define SN_id_GostR3410_94              "gost94"
-#define LN_id_GostR3410_94              "GOST R 34.10-94"
-#define NID_id_GostR3410_94             812
-#define OBJ_id_GostR3410_94             OBJ_cryptopro,20L
-
-#define SN_id_Gost28147_89              "gost89"
-#define LN_id_Gost28147_89              "GOST 28147-89"
-#define NID_id_Gost28147_89             813
-#define OBJ_id_Gost28147_89             OBJ_cryptopro,21L
-
-#define SN_gost89_cnt           "gost89-cnt"
-#define NID_gost89_cnt          814
-
-#define SN_id_Gost28147_89_MAC          "gost-mac"
-#define LN_id_Gost28147_89_MAC          "GOST 28147-89 MAC"
-#define NID_id_Gost28147_89_MAC         815
-#define OBJ_id_Gost28147_89_MAC         OBJ_cryptopro,22L
-
-#define SN_id_GostR3411_94_prf          "prf-gostr3411-94"
-#define LN_id_GostR3411_94_prf          "GOST R 34.11-94 PRF"
-#define NID_id_GostR3411_94_prf         816
-#define OBJ_id_GostR3411_94_prf         OBJ_cryptopro,23L
-
-#define SN_id_GostR3410_2001DH          "id-GostR3410-2001DH"
-#define LN_id_GostR3410_2001DH          "GOST R 34.10-2001 DH"
-#define NID_id_GostR3410_2001DH         817
-#define OBJ_id_GostR3410_2001DH         OBJ_cryptopro,98L
-
-#define SN_id_GostR3410_94DH            "id-GostR3410-94DH"
-#define LN_id_GostR3410_94DH            "GOST R 34.10-94 DH"
-#define NID_id_GostR3410_94DH           818
-#define OBJ_id_GostR3410_94DH           OBJ_cryptopro,99L
-
-#define SN_id_Gost28147_89_CryptoPro_KeyMeshing         "id-Gost28147-89-CryptoPro-KeyMeshing"
-#define NID_id_Gost28147_89_CryptoPro_KeyMeshing                819
-#define OBJ_id_Gost28147_89_CryptoPro_KeyMeshing                OBJ_cryptopro,14L,1L
-
-#define SN_id_Gost28147_89_None_KeyMeshing              "id-Gost28147-89-None-KeyMeshing"
-#define NID_id_Gost28147_89_None_KeyMeshing             820
-#define OBJ_id_Gost28147_89_None_KeyMeshing             OBJ_cryptopro,14L,0L
-
-#define SN_id_GostR3411_94_TestParamSet         "id-GostR3411-94-TestParamSet"
-#define NID_id_GostR3411_94_TestParamSet                821
-#define OBJ_id_GostR3411_94_TestParamSet                OBJ_cryptopro,30L,0L
-
-#define SN_id_GostR3411_94_CryptoProParamSet            "id-GostR3411-94-CryptoProParamSet"
-#define NID_id_GostR3411_94_CryptoProParamSet           822
-#define OBJ_id_GostR3411_94_CryptoProParamSet           OBJ_cryptopro,30L,1L
-
-#define SN_id_Gost28147_89_TestParamSet         "id-Gost28147-89-TestParamSet"
-#define NID_id_Gost28147_89_TestParamSet                823
-#define OBJ_id_Gost28147_89_TestParamSet                OBJ_cryptopro,31L,0L
-
-#define SN_id_Gost28147_89_CryptoPro_A_ParamSet         "id-Gost28147-89-CryptoPro-A-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_A_ParamSet                824
-#define OBJ_id_Gost28147_89_CryptoPro_A_ParamSet                OBJ_cryptopro,31L,1L
-
-#define SN_id_Gost28147_89_CryptoPro_B_ParamSet         "id-Gost28147-89-CryptoPro-B-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_B_ParamSet                825
-#define OBJ_id_Gost28147_89_CryptoPro_B_ParamSet                OBJ_cryptopro,31L,2L
-
-#define SN_id_Gost28147_89_CryptoPro_C_ParamSet         "id-Gost28147-89-CryptoPro-C-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_C_ParamSet                826
-#define OBJ_id_Gost28147_89_CryptoPro_C_ParamSet                OBJ_cryptopro,31L,3L
-
-#define SN_id_Gost28147_89_CryptoPro_D_ParamSet         "id-Gost28147-89-CryptoPro-D-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_D_ParamSet                827
-#define OBJ_id_Gost28147_89_CryptoPro_D_ParamSet                OBJ_cryptopro,31L,4L
-
-#define SN_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet         "id-Gost28147-89-CryptoPro-Oscar-1-1-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet                828
-#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet                OBJ_cryptopro,31L,5L
-
-#define SN_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet         "id-Gost28147-89-CryptoPro-Oscar-1-0-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet                829
-#define OBJ_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet                OBJ_cryptopro,31L,6L
-
-#define SN_id_Gost28147_89_CryptoPro_RIC_1_ParamSet             "id-Gost28147-89-CryptoPro-RIC-1-ParamSet"
-#define NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet            830
-#define OBJ_id_Gost28147_89_CryptoPro_RIC_1_ParamSet            OBJ_cryptopro,31L,7L
-
-#define SN_id_GostR3410_94_TestParamSet         "id-GostR3410-94-TestParamSet"
-#define NID_id_GostR3410_94_TestParamSet                831
-#define OBJ_id_GostR3410_94_TestParamSet                OBJ_cryptopro,32L,0L
-
-#define SN_id_GostR3410_94_CryptoPro_A_ParamSet         "id-GostR3410-94-CryptoPro-A-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_A_ParamSet                832
-#define OBJ_id_GostR3410_94_CryptoPro_A_ParamSet                OBJ_cryptopro,32L,2L
-
-#define SN_id_GostR3410_94_CryptoPro_B_ParamSet         "id-GostR3410-94-CryptoPro-B-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_B_ParamSet                833
-#define OBJ_id_GostR3410_94_CryptoPro_B_ParamSet                OBJ_cryptopro,32L,3L
-
-#define SN_id_GostR3410_94_CryptoPro_C_ParamSet         "id-GostR3410-94-CryptoPro-C-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_C_ParamSet                834
-#define OBJ_id_GostR3410_94_CryptoPro_C_ParamSet                OBJ_cryptopro,32L,4L
-
-#define SN_id_GostR3410_94_CryptoPro_D_ParamSet         "id-GostR3410-94-CryptoPro-D-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_D_ParamSet                835
-#define OBJ_id_GostR3410_94_CryptoPro_D_ParamSet                OBJ_cryptopro,32L,5L
-
-#define SN_id_GostR3410_94_CryptoPro_XchA_ParamSet              "id-GostR3410-94-CryptoPro-XchA-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchA_ParamSet             836
-#define OBJ_id_GostR3410_94_CryptoPro_XchA_ParamSet             OBJ_cryptopro,33L,1L
-
-#define SN_id_GostR3410_94_CryptoPro_XchB_ParamSet              "id-GostR3410-94-CryptoPro-XchB-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchB_ParamSet             837
-#define OBJ_id_GostR3410_94_CryptoPro_XchB_ParamSet             OBJ_cryptopro,33L,2L
-
-#define SN_id_GostR3410_94_CryptoPro_XchC_ParamSet              "id-GostR3410-94-CryptoPro-XchC-ParamSet"
-#define NID_id_GostR3410_94_CryptoPro_XchC_ParamSet             838
-#define OBJ_id_GostR3410_94_CryptoPro_XchC_ParamSet             OBJ_cryptopro,33L,3L
-
-#define SN_id_GostR3410_2001_TestParamSet               "id-GostR3410-2001-TestParamSet"
-#define NID_id_GostR3410_2001_TestParamSet              839
-#define OBJ_id_GostR3410_2001_TestParamSet              OBJ_cryptopro,35L,0L
-
-#define SN_id_GostR3410_2001_CryptoPro_A_ParamSet               "id-GostR3410-2001-CryptoPro-A-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_A_ParamSet              840
-#define OBJ_id_GostR3410_2001_CryptoPro_A_ParamSet              OBJ_cryptopro,35L,1L
-
-#define SN_id_GostR3410_2001_CryptoPro_B_ParamSet               "id-GostR3410-2001-CryptoPro-B-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_B_ParamSet              841
-#define OBJ_id_GostR3410_2001_CryptoPro_B_ParamSet              OBJ_cryptopro,35L,2L
-
-#define SN_id_GostR3410_2001_CryptoPro_C_ParamSet               "id-GostR3410-2001-CryptoPro-C-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_C_ParamSet              842
-#define OBJ_id_GostR3410_2001_CryptoPro_C_ParamSet              OBJ_cryptopro,35L,3L
-
-#define SN_id_GostR3410_2001_CryptoPro_XchA_ParamSet            "id-GostR3410-2001-CryptoPro-XchA-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet           843
-#define OBJ_id_GostR3410_2001_CryptoPro_XchA_ParamSet           OBJ_cryptopro,36L,0L
-
-#define SN_id_GostR3410_2001_CryptoPro_XchB_ParamSet            "id-GostR3410-2001-CryptoPro-XchB-ParamSet"
-#define NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet           844
-#define OBJ_id_GostR3410_2001_CryptoPro_XchB_ParamSet           OBJ_cryptopro,36L,1L
-
-#define SN_id_GostR3410_94_a            "id-GostR3410-94-a"
-#define NID_id_GostR3410_94_a           845
-#define OBJ_id_GostR3410_94_a           OBJ_id_GostR3410_94,1L
-
-#define SN_id_GostR3410_94_aBis         "id-GostR3410-94-aBis"
-#define NID_id_GostR3410_94_aBis                846
-#define OBJ_id_GostR3410_94_aBis                OBJ_id_GostR3410_94,2L
-
-#define SN_id_GostR3410_94_b            "id-GostR3410-94-b"
-#define NID_id_GostR3410_94_b           847
-#define OBJ_id_GostR3410_94_b           OBJ_id_GostR3410_94,3L
-
-#define SN_id_GostR3410_94_bBis         "id-GostR3410-94-bBis"
-#define NID_id_GostR3410_94_bBis                848
-#define OBJ_id_GostR3410_94_bBis                OBJ_id_GostR3410_94,4L
-
-#define SN_id_Gost28147_89_cc           "id-Gost28147-89-cc"
-#define LN_id_Gost28147_89_cc           "GOST 28147-89 Cryptocom ParamSet"
-#define NID_id_Gost28147_89_cc          849
-#define OBJ_id_Gost28147_89_cc          OBJ_cryptocom,1L,6L,1L
-
-#define SN_id_GostR3410_94_cc           "gost94cc"
-#define LN_id_GostR3410_94_cc           "GOST 34.10-94 Cryptocom"
-#define NID_id_GostR3410_94_cc          850
-#define OBJ_id_GostR3410_94_cc          OBJ_cryptocom,1L,5L,3L
-
-#define SN_id_GostR3410_2001_cc         "gost2001cc"
-#define LN_id_GostR3410_2001_cc         "GOST 34.10-2001 Cryptocom"
-#define NID_id_GostR3410_2001_cc                851
-#define OBJ_id_GostR3410_2001_cc                OBJ_cryptocom,1L,5L,4L
-
-#define SN_id_GostR3411_94_with_GostR3410_94_cc         "id-GostR3411-94-with-GostR3410-94-cc"
-#define LN_id_GostR3411_94_with_GostR3410_94_cc         "GOST R 34.11-94 with GOST R 34.10-94 Cryptocom"
-#define NID_id_GostR3411_94_with_GostR3410_94_cc                852
-#define OBJ_id_GostR3411_94_with_GostR3410_94_cc                OBJ_cryptocom,1L,3L,3L
-
-#define SN_id_GostR3411_94_with_GostR3410_2001_cc               "id-GostR3411-94-with-GostR3410-2001-cc"
-#define LN_id_GostR3411_94_with_GostR3410_2001_cc               "GOST R 34.11-94 with GOST R 34.10-2001 Cryptocom"
-#define NID_id_GostR3411_94_with_GostR3410_2001_cc              853
-#define OBJ_id_GostR3411_94_with_GostR3410_2001_cc              OBJ_cryptocom,1L,3L,4L
-
-#define SN_id_GostR3410_2001_ParamSet_cc                "id-GostR3410-2001-ParamSet-cc"
-#define LN_id_GostR3410_2001_ParamSet_cc                "GOST R 3410-2001 Parameter Set Cryptocom"
-#define NID_id_GostR3410_2001_ParamSet_cc               854
-#define OBJ_id_GostR3410_2001_ParamSet_cc               OBJ_cryptocom,1L,8L,1L
-
-#define SN_camellia_128_cbc             "CAMELLIA-128-CBC"
-#define LN_camellia_128_cbc             "camellia-128-cbc"
-#define NID_camellia_128_cbc            751
-#define OBJ_camellia_128_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,2L
-
-#define SN_camellia_192_cbc             "CAMELLIA-192-CBC"
-#define LN_camellia_192_cbc             "camellia-192-cbc"
-#define NID_camellia_192_cbc            752
-#define OBJ_camellia_192_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,3L
-
-#define SN_camellia_256_cbc             "CAMELLIA-256-CBC"
-#define LN_camellia_256_cbc             "camellia-256-cbc"
-#define NID_camellia_256_cbc            753
-#define OBJ_camellia_256_cbc            1L,2L,392L,200011L,61L,1L,1L,1L,4L
-
-#define SN_id_camellia128_wrap          "id-camellia128-wrap"
-#define NID_id_camellia128_wrap         907
-#define OBJ_id_camellia128_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,2L
-
-#define SN_id_camellia192_wrap          "id-camellia192-wrap"
-#define NID_id_camellia192_wrap         908
-#define OBJ_id_camellia192_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,3L
-
-#define SN_id_camellia256_wrap          "id-camellia256-wrap"
-#define NID_id_camellia256_wrap         909
-#define OBJ_id_camellia256_wrap         1L,2L,392L,200011L,61L,1L,1L,3L,4L
-
-#define OBJ_ntt_ds              0L,3L,4401L,5L
-
-#define OBJ_camellia            OBJ_ntt_ds,3L,1L,9L
-
-#define SN_camellia_128_ecb             "CAMELLIA-128-ECB"
-#define LN_camellia_128_ecb             "camellia-128-ecb"
-#define NID_camellia_128_ecb            754
-#define OBJ_camellia_128_ecb            OBJ_camellia,1L
-
-#define SN_camellia_128_ofb128          "CAMELLIA-128-OFB"
-#define LN_camellia_128_ofb128          "camellia-128-ofb"
-#define NID_camellia_128_ofb128         766
-#define OBJ_camellia_128_ofb128         OBJ_camellia,3L
-
-#define SN_camellia_128_cfb128          "CAMELLIA-128-CFB"
-#define LN_camellia_128_cfb128          "camellia-128-cfb"
-#define NID_camellia_128_cfb128         757
-#define OBJ_camellia_128_cfb128         OBJ_camellia,4L
-
-#define SN_camellia_192_ecb             "CAMELLIA-192-ECB"
-#define LN_camellia_192_ecb             "camellia-192-ecb"
-#define NID_camellia_192_ecb            755
-#define OBJ_camellia_192_ecb            OBJ_camellia,21L
-
-#define SN_camellia_192_ofb128          "CAMELLIA-192-OFB"
-#define LN_camellia_192_ofb128          "camellia-192-ofb"
-#define NID_camellia_192_ofb128         767
-#define OBJ_camellia_192_ofb128         OBJ_camellia,23L
-
-#define SN_camellia_192_cfb128          "CAMELLIA-192-CFB"
-#define LN_camellia_192_cfb128          "camellia-192-cfb"
-#define NID_camellia_192_cfb128         758
-#define OBJ_camellia_192_cfb128         OBJ_camellia,24L
-
-#define SN_camellia_256_ecb             "CAMELLIA-256-ECB"
-#define LN_camellia_256_ecb             "camellia-256-ecb"
-#define NID_camellia_256_ecb            756
-#define OBJ_camellia_256_ecb            OBJ_camellia,41L
-
-#define SN_camellia_256_ofb128          "CAMELLIA-256-OFB"
-#define LN_camellia_256_ofb128          "camellia-256-ofb"
-#define NID_camellia_256_ofb128         768
-#define OBJ_camellia_256_ofb128         OBJ_camellia,43L
-
-#define SN_camellia_256_cfb128          "CAMELLIA-256-CFB"
-#define LN_camellia_256_cfb128          "camellia-256-cfb"
-#define NID_camellia_256_cfb128         759
-#define OBJ_camellia_256_cfb128         OBJ_camellia,44L
-
-#define SN_camellia_128_cfb1            "CAMELLIA-128-CFB1"
-#define LN_camellia_128_cfb1            "camellia-128-cfb1"
-#define NID_camellia_128_cfb1           760
-
-#define SN_camellia_192_cfb1            "CAMELLIA-192-CFB1"
-#define LN_camellia_192_cfb1            "camellia-192-cfb1"
-#define NID_camellia_192_cfb1           761
-
-#define SN_camellia_256_cfb1            "CAMELLIA-256-CFB1"
-#define LN_camellia_256_cfb1            "camellia-256-cfb1"
-#define NID_camellia_256_cfb1           762
-
-#define SN_camellia_128_cfb8            "CAMELLIA-128-CFB8"
-#define LN_camellia_128_cfb8            "camellia-128-cfb8"
-#define NID_camellia_128_cfb8           763
-
-#define SN_camellia_192_cfb8            "CAMELLIA-192-CFB8"
-#define LN_camellia_192_cfb8            "camellia-192-cfb8"
-#define NID_camellia_192_cfb8           764
-
-#define SN_camellia_256_cfb8            "CAMELLIA-256-CFB8"
-#define LN_camellia_256_cfb8            "camellia-256-cfb8"
-#define NID_camellia_256_cfb8           765
-
-#define SN_kisa         "KISA"
-#define LN_kisa         "kisa"
-#define NID_kisa                773
-#define OBJ_kisa                OBJ_member_body,410L,200004L
-
-#define SN_seed_ecb             "SEED-ECB"
-#define LN_seed_ecb             "seed-ecb"
-#define NID_seed_ecb            776
-#define OBJ_seed_ecb            OBJ_kisa,1L,3L
-
-#define SN_seed_cbc             "SEED-CBC"
-#define LN_seed_cbc             "seed-cbc"
-#define NID_seed_cbc            777
-#define OBJ_seed_cbc            OBJ_kisa,1L,4L
-
-#define SN_seed_cfb128          "SEED-CFB"
-#define LN_seed_cfb128          "seed-cfb"
-#define NID_seed_cfb128         779
-#define OBJ_seed_cfb128         OBJ_kisa,1L,5L
-
-#define SN_seed_ofb128          "SEED-OFB"
-#define LN_seed_ofb128          "seed-ofb"
-#define NID_seed_ofb128         778
-#define OBJ_seed_ofb128         OBJ_kisa,1L,6L
-
-#define SN_hmac         "HMAC"
-#define LN_hmac         "hmac"
-#define NID_hmac                855
-
-#define SN_cmac         "CMAC"
-#define LN_cmac         "cmac"
-#define NID_cmac                894
-
-#define SN_rc4_hmac_md5         "RC4-HMAC-MD5"
-#define LN_rc4_hmac_md5         "rc4-hmac-md5"
-#define NID_rc4_hmac_md5                915
-
-#define SN_aes_128_cbc_hmac_sha1                "AES-128-CBC-HMAC-SHA1"
-#define LN_aes_128_cbc_hmac_sha1                "aes-128-cbc-hmac-sha1"
-#define NID_aes_128_cbc_hmac_sha1               916
-
-#define SN_aes_192_cbc_hmac_sha1                "AES-192-CBC-HMAC-SHA1"
-#define LN_aes_192_cbc_hmac_sha1                "aes-192-cbc-hmac-sha1"
-#define NID_aes_192_cbc_hmac_sha1               917
-
-#define SN_aes_256_cbc_hmac_sha1                "AES-256-CBC-HMAC-SHA1"
-#define LN_aes_256_cbc_hmac_sha1                "aes-256-cbc-hmac-sha1"
-#define NID_aes_256_cbc_hmac_sha1               918
diff --git a/include.new/openssl/objects.h b/include.new/openssl/objects.h
deleted file mode 100644
index b8dafa8..0000000
--- a/include.new/openssl/objects.h
+++ /dev/null
@@ -1,1143 +0,0 @@
-/* crypto/objects/objects.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_OBJECTS_H
-# define HEADER_OBJECTS_H
-
-# define USE_OBJ_MAC
-
-# ifdef USE_OBJ_MAC
-#  include <openssl/obj_mac.h>
-# else
-#  define SN_undef                        "UNDEF"
-#  define LN_undef                        "undefined"
-#  define NID_undef                       0
-#  define OBJ_undef                       0L
-
-#  define SN_Algorithm                    "Algorithm"
-#  define LN_algorithm                    "algorithm"
-#  define NID_algorithm                   38
-#  define OBJ_algorithm                   1L,3L,14L,3L,2L
-
-#  define LN_rsadsi                       "rsadsi"
-#  define NID_rsadsi                      1
-#  define OBJ_rsadsi                      1L,2L,840L,113549L
-
-#  define LN_pkcs                         "pkcs"
-#  define NID_pkcs                        2
-#  define OBJ_pkcs                        OBJ_rsadsi,1L
-
-#  define SN_md2                          "MD2"
-#  define LN_md2                          "md2"
-#  define NID_md2                         3
-#  define OBJ_md2                         OBJ_rsadsi,2L,2L
-
-#  define SN_md5                          "MD5"
-#  define LN_md5                          "md5"
-#  define NID_md5                         4
-#  define OBJ_md5                         OBJ_rsadsi,2L,5L
-
-#  define SN_rc4                          "RC4"
-#  define LN_rc4                          "rc4"
-#  define NID_rc4                         5
-#  define OBJ_rc4                         OBJ_rsadsi,3L,4L
-
-#  define LN_rsaEncryption                "rsaEncryption"
-#  define NID_rsaEncryption               6
-#  define OBJ_rsaEncryption               OBJ_pkcs,1L,1L
-
-#  define SN_md2WithRSAEncryption         "RSA-MD2"
-#  define LN_md2WithRSAEncryption         "md2WithRSAEncryption"
-#  define NID_md2WithRSAEncryption        7
-#  define OBJ_md2WithRSAEncryption        OBJ_pkcs,1L,2L
-
-#  define SN_md5WithRSAEncryption         "RSA-MD5"
-#  define LN_md5WithRSAEncryption         "md5WithRSAEncryption"
-#  define NID_md5WithRSAEncryption        8
-#  define OBJ_md5WithRSAEncryption        OBJ_pkcs,1L,4L
-
-#  define SN_pbeWithMD2AndDES_CBC         "PBE-MD2-DES"
-#  define LN_pbeWithMD2AndDES_CBC         "pbeWithMD2AndDES-CBC"
-#  define NID_pbeWithMD2AndDES_CBC        9
-#  define OBJ_pbeWithMD2AndDES_CBC        OBJ_pkcs,5L,1L
-
-#  define SN_pbeWithMD5AndDES_CBC         "PBE-MD5-DES"
-#  define LN_pbeWithMD5AndDES_CBC         "pbeWithMD5AndDES-CBC"
-#  define NID_pbeWithMD5AndDES_CBC        10
-#  define OBJ_pbeWithMD5AndDES_CBC        OBJ_pkcs,5L,3L
-
-#  define LN_X500                         "X500"
-#  define NID_X500                        11
-#  define OBJ_X500                        2L,5L
-
-#  define LN_X509                         "X509"
-#  define NID_X509                        12
-#  define OBJ_X509                        OBJ_X500,4L
-
-#  define SN_commonName                   "CN"
-#  define LN_commonName                   "commonName"
-#  define NID_commonName                  13
-#  define OBJ_commonName                  OBJ_X509,3L
-
-#  define SN_countryName                  "C"
-#  define LN_countryName                  "countryName"
-#  define NID_countryName                 14
-#  define OBJ_countryName                 OBJ_X509,6L
-
-#  define SN_localityName                 "L"
-#  define LN_localityName                 "localityName"
-#  define NID_localityName                15
-#  define OBJ_localityName                OBJ_X509,7L
-
-/* Postal Address? PA */
-
-/* should be "ST" (rfc1327) but MS uses 'S' */
-#  define SN_stateOrProvinceName          "ST"
-#  define LN_stateOrProvinceName          "stateOrProvinceName"
-#  define NID_stateOrProvinceName         16
-#  define OBJ_stateOrProvinceName         OBJ_X509,8L
-
-#  define SN_organizationName             "O"
-#  define LN_organizationName             "organizationName"
-#  define NID_organizationName            17
-#  define OBJ_organizationName            OBJ_X509,10L
-
-#  define SN_organizationalUnitName       "OU"
-#  define LN_organizationalUnitName       "organizationalUnitName"
-#  define NID_organizationalUnitName      18
-#  define OBJ_organizationalUnitName      OBJ_X509,11L
-
-#  define SN_rsa                          "RSA"
-#  define LN_rsa                          "rsa"
-#  define NID_rsa                         19
-#  define OBJ_rsa                         OBJ_X500,8L,1L,1L
-
-#  define LN_pkcs7                        "pkcs7"
-#  define NID_pkcs7                       20
-#  define OBJ_pkcs7                       OBJ_pkcs,7L
-
-#  define LN_pkcs7_data                   "pkcs7-data"
-#  define NID_pkcs7_data                  21
-#  define OBJ_pkcs7_data                  OBJ_pkcs7,1L
-
-#  define LN_pkcs7_signed                 "pkcs7-signedData"
-#  define NID_pkcs7_signed                22
-#  define OBJ_pkcs7_signed                OBJ_pkcs7,2L
-
-#  define LN_pkcs7_enveloped              "pkcs7-envelopedData"
-#  define NID_pkcs7_enveloped             23
-#  define OBJ_pkcs7_enveloped             OBJ_pkcs7,3L
-
-#  define LN_pkcs7_signedAndEnveloped     "pkcs7-signedAndEnvelopedData"
-#  define NID_pkcs7_signedAndEnveloped    24
-#  define OBJ_pkcs7_signedAndEnveloped    OBJ_pkcs7,4L
-
-#  define LN_pkcs7_digest                 "pkcs7-digestData"
-#  define NID_pkcs7_digest                25
-#  define OBJ_pkcs7_digest                OBJ_pkcs7,5L
-
-#  define LN_pkcs7_encrypted              "pkcs7-encryptedData"
-#  define NID_pkcs7_encrypted             26
-#  define OBJ_pkcs7_encrypted             OBJ_pkcs7,6L
-
-#  define LN_pkcs3                        "pkcs3"
-#  define NID_pkcs3                       27
-#  define OBJ_pkcs3                       OBJ_pkcs,3L
-
-#  define LN_dhKeyAgreement               "dhKeyAgreement"
-#  define NID_dhKeyAgreement              28
-#  define OBJ_dhKeyAgreement              OBJ_pkcs3,1L
-
-#  define SN_des_ecb                      "DES-ECB"
-#  define LN_des_ecb                      "des-ecb"
-#  define NID_des_ecb                     29
-#  define OBJ_des_ecb                     OBJ_algorithm,6L
-
-#  define SN_des_cfb64                    "DES-CFB"
-#  define LN_des_cfb64                    "des-cfb"
-#  define NID_des_cfb64                   30
-/* IV + num */
-#  define OBJ_des_cfb64                   OBJ_algorithm,9L
-
-#  define SN_des_cbc                      "DES-CBC"
-#  define LN_des_cbc                      "des-cbc"
-#  define NID_des_cbc                     31
-/* IV */
-#  define OBJ_des_cbc                     OBJ_algorithm,7L
-
-#  define SN_des_ede                      "DES-EDE"
-#  define LN_des_ede                      "des-ede"
-#  define NID_des_ede                     32
-/* ?? */
-#  define OBJ_des_ede                     OBJ_algorithm,17L
-
-#  define SN_des_ede3                     "DES-EDE3"
-#  define LN_des_ede3                     "des-ede3"
-#  define NID_des_ede3                    33
-
-#  define SN_idea_cbc                     "IDEA-CBC"
-#  define LN_idea_cbc                     "idea-cbc"
-#  define NID_idea_cbc                    34
-#  define OBJ_idea_cbc                    1L,3L,6L,1L,4L,1L,188L,7L,1L,1L,2L
-
-#  define SN_idea_cfb64                   "IDEA-CFB"
-#  define LN_idea_cfb64                   "idea-cfb"
-#  define NID_idea_cfb64                  35
-
-#  define SN_idea_ecb                     "IDEA-ECB"
-#  define LN_idea_ecb                     "idea-ecb"
-#  define NID_idea_ecb                    36
-
-#  define SN_rc2_cbc                      "RC2-CBC"
-#  define LN_rc2_cbc                      "rc2-cbc"
-#  define NID_rc2_cbc                     37
-#  define OBJ_rc2_cbc                     OBJ_rsadsi,3L,2L
-
-#  define SN_rc2_ecb                      "RC2-ECB"
-#  define LN_rc2_ecb                      "rc2-ecb"
-#  define NID_rc2_ecb                     38
-
-#  define SN_rc2_cfb64                    "RC2-CFB"
-#  define LN_rc2_cfb64                    "rc2-cfb"
-#  define NID_rc2_cfb64                   39
-
-#  define SN_rc2_ofb64                    "RC2-OFB"
-#  define LN_rc2_ofb64                    "rc2-ofb"
-#  define NID_rc2_ofb64                   40
-
-#  define SN_sha                          "SHA"
-#  define LN_sha                          "sha"
-#  define NID_sha                         41
-#  define OBJ_sha                         OBJ_algorithm,18L
-
-#  define SN_shaWithRSAEncryption         "RSA-SHA"
-#  define LN_shaWithRSAEncryption         "shaWithRSAEncryption"
-#  define NID_shaWithRSAEncryption        42
-#  define OBJ_shaWithRSAEncryption        OBJ_algorithm,15L
-
-#  define SN_des_ede_cbc                  "DES-EDE-CBC"
-#  define LN_des_ede_cbc                  "des-ede-cbc"
-#  define NID_des_ede_cbc                 43
-
-#  define SN_des_ede3_cbc                 "DES-EDE3-CBC"
-#  define LN_des_ede3_cbc                 "des-ede3-cbc"
-#  define NID_des_ede3_cbc                44
-#  define OBJ_des_ede3_cbc                OBJ_rsadsi,3L,7L
-
-#  define SN_des_ofb64                    "DES-OFB"
-#  define LN_des_ofb64                    "des-ofb"
-#  define NID_des_ofb64                   45
-#  define OBJ_des_ofb64                   OBJ_algorithm,8L
-
-#  define SN_idea_ofb64                   "IDEA-OFB"
-#  define LN_idea_ofb64                   "idea-ofb"
-#  define NID_idea_ofb64                  46
-
-#  define LN_pkcs9                        "pkcs9"
-#  define NID_pkcs9                       47
-#  define OBJ_pkcs9                       OBJ_pkcs,9L
-
-#  define SN_pkcs9_emailAddress           "Email"
-#  define LN_pkcs9_emailAddress           "emailAddress"
-#  define NID_pkcs9_emailAddress          48
-#  define OBJ_pkcs9_emailAddress          OBJ_pkcs9,1L
-
-#  define LN_pkcs9_unstructuredName       "unstructuredName"
-#  define NID_pkcs9_unstructuredName      49
-#  define OBJ_pkcs9_unstructuredName      OBJ_pkcs9,2L
-
-#  define LN_pkcs9_contentType            "contentType"
-#  define NID_pkcs9_contentType           50
-#  define OBJ_pkcs9_contentType           OBJ_pkcs9,3L
-
-#  define LN_pkcs9_messageDigest          "messageDigest"
-#  define NID_pkcs9_messageDigest         51
-#  define OBJ_pkcs9_messageDigest         OBJ_pkcs9,4L
-
-#  define LN_pkcs9_signingTime            "signingTime"
-#  define NID_pkcs9_signingTime           52
-#  define OBJ_pkcs9_signingTime           OBJ_pkcs9,5L
-
-#  define LN_pkcs9_countersignature       "countersignature"
-#  define NID_pkcs9_countersignature      53
-#  define OBJ_pkcs9_countersignature      OBJ_pkcs9,6L
-
-#  define LN_pkcs9_challengePassword      "challengePassword"
-#  define NID_pkcs9_challengePassword     54
-#  define OBJ_pkcs9_challengePassword     OBJ_pkcs9,7L
-
-#  define LN_pkcs9_unstructuredAddress    "unstructuredAddress"
-#  define NID_pkcs9_unstructuredAddress   55
-#  define OBJ_pkcs9_unstructuredAddress   OBJ_pkcs9,8L
-
-#  define LN_pkcs9_extCertAttributes      "extendedCertificateAttributes"
-#  define NID_pkcs9_extCertAttributes     56
-#  define OBJ_pkcs9_extCertAttributes     OBJ_pkcs9,9L
-
-#  define SN_netscape                     "Netscape"
-#  define LN_netscape                     "Netscape Communications Corp."
-#  define NID_netscape                    57
-#  define OBJ_netscape                    2L,16L,840L,1L,113730L
-
-#  define SN_netscape_cert_extension      "nsCertExt"
-#  define LN_netscape_cert_extension      "Netscape Certificate Extension"
-#  define NID_netscape_cert_extension     58
-#  define OBJ_netscape_cert_extension     OBJ_netscape,1L
-
-#  define SN_netscape_data_type           "nsDataType"
-#  define LN_netscape_data_type           "Netscape Data Type"
-#  define NID_netscape_data_type          59
-#  define OBJ_netscape_data_type          OBJ_netscape,2L
-
-#  define SN_des_ede_cfb64                "DES-EDE-CFB"
-#  define LN_des_ede_cfb64                "des-ede-cfb"
-#  define NID_des_ede_cfb64               60
-
-#  define SN_des_ede3_cfb64               "DES-EDE3-CFB"
-#  define LN_des_ede3_cfb64               "des-ede3-cfb"
-#  define NID_des_ede3_cfb64              61
-
-#  define SN_des_ede_ofb64                "DES-EDE-OFB"
-#  define LN_des_ede_ofb64                "des-ede-ofb"
-#  define NID_des_ede_ofb64               62
-
-#  define SN_des_ede3_ofb64               "DES-EDE3-OFB"
-#  define LN_des_ede3_ofb64               "des-ede3-ofb"
-#  define NID_des_ede3_ofb64              63
-
-/* I'm not sure about the object ID */
-#  define SN_sha1                         "SHA1"
-#  define LN_sha1                         "sha1"
-#  define NID_sha1                        64
-#  define OBJ_sha1                        OBJ_algorithm,26L
-/* 28 Jun 1996 - eay */
-/* #define OBJ_sha1                     1L,3L,14L,2L,26L,05L <- wrong */
-
-#  define SN_sha1WithRSAEncryption        "RSA-SHA1"
-#  define LN_sha1WithRSAEncryption        "sha1WithRSAEncryption"
-#  define NID_sha1WithRSAEncryption       65
-#  define OBJ_sha1WithRSAEncryption       OBJ_pkcs,1L,5L
-
-#  define SN_dsaWithSHA                   "DSA-SHA"
-#  define LN_dsaWithSHA                   "dsaWithSHA"
-#  define NID_dsaWithSHA                  66
-#  define OBJ_dsaWithSHA                  OBJ_algorithm,13L
-
-#  define SN_dsa_2                        "DSA-old"
-#  define LN_dsa_2                        "dsaEncryption-old"
-#  define NID_dsa_2                       67
-#  define OBJ_dsa_2                       OBJ_algorithm,12L
-
-/* proposed by microsoft to RSA */
-#  define SN_pbeWithSHA1AndRC2_CBC        "PBE-SHA1-RC2-64"
-#  define LN_pbeWithSHA1AndRC2_CBC        "pbeWithSHA1AndRC2-CBC"
-#  define NID_pbeWithSHA1AndRC2_CBC       68
-#  define OBJ_pbeWithSHA1AndRC2_CBC       OBJ_pkcs,5L,11L
-
-/*
- * proposed by microsoft to RSA as pbeWithSHA1AndRC4: it is now defined
- * explicitly in PKCS#5 v2.0 as id-PBKDF2 which is something completely
- * different.
- */
-#  define LN_id_pbkdf2                    "PBKDF2"
-#  define NID_id_pbkdf2                   69
-#  define OBJ_id_pbkdf2                   OBJ_pkcs,5L,12L
-
-#  define SN_dsaWithSHA1_2                "DSA-SHA1-old"
-#  define LN_dsaWithSHA1_2                "dsaWithSHA1-old"
-#  define NID_dsaWithSHA1_2               70
-/* Got this one from 'sdn706r20.pdf' which is actually an NSA document :-) */
-#  define OBJ_dsaWithSHA1_2               OBJ_algorithm,27L
-
-#  define SN_netscape_cert_type           "nsCertType"
-#  define LN_netscape_cert_type           "Netscape Cert Type"
-#  define NID_netscape_cert_type          71
-#  define OBJ_netscape_cert_type          OBJ_netscape_cert_extension,1L
-
-#  define SN_netscape_base_url            "nsBaseUrl"
-#  define LN_netscape_base_url            "Netscape Base Url"
-#  define NID_netscape_base_url           72
-#  define OBJ_netscape_base_url           OBJ_netscape_cert_extension,2L
-
-#  define SN_netscape_revocation_url      "nsRevocationUrl"
-#  define LN_netscape_revocation_url      "Netscape Revocation Url"
-#  define NID_netscape_revocation_url     73
-#  define OBJ_netscape_revocation_url     OBJ_netscape_cert_extension,3L
-
-#  define SN_netscape_ca_revocation_url   "nsCaRevocationUrl"
-#  define LN_netscape_ca_revocation_url   "Netscape CA Revocation Url"
-#  define NID_netscape_ca_revocation_url  74
-#  define OBJ_netscape_ca_revocation_url  OBJ_netscape_cert_extension,4L
-
-#  define SN_netscape_renewal_url         "nsRenewalUrl"
-#  define LN_netscape_renewal_url         "Netscape Renewal Url"
-#  define NID_netscape_renewal_url        75
-#  define OBJ_netscape_renewal_url        OBJ_netscape_cert_extension,7L
-
-#  define SN_netscape_ca_policy_url       "nsCaPolicyUrl"
-#  define LN_netscape_ca_policy_url       "Netscape CA Policy Url"
-#  define NID_netscape_ca_policy_url      76
-#  define OBJ_netscape_ca_policy_url      OBJ_netscape_cert_extension,8L
-
-#  define SN_netscape_ssl_server_name     "nsSslServerName"
-#  define LN_netscape_ssl_server_name     "Netscape SSL Server Name"
-#  define NID_netscape_ssl_server_name    77
-#  define OBJ_netscape_ssl_server_name    OBJ_netscape_cert_extension,12L
-
-#  define SN_netscape_comment             "nsComment"
-#  define LN_netscape_comment             "Netscape Comment"
-#  define NID_netscape_comment            78
-#  define OBJ_netscape_comment            OBJ_netscape_cert_extension,13L
-
-#  define SN_netscape_cert_sequence       "nsCertSequence"
-#  define LN_netscape_cert_sequence       "Netscape Certificate Sequence"
-#  define NID_netscape_cert_sequence      79
-#  define OBJ_netscape_cert_sequence      OBJ_netscape_data_type,5L
-
-#  define SN_desx_cbc                     "DESX-CBC"
-#  define LN_desx_cbc                     "desx-cbc"
-#  define NID_desx_cbc                    80
-
-#  define SN_id_ce                        "id-ce"
-#  define NID_id_ce                       81
-#  define OBJ_id_ce                       2L,5L,29L
-
-#  define SN_subject_key_identifier       "subjectKeyIdentifier"
-#  define LN_subject_key_identifier       "X509v3 Subject Key Identifier"
-#  define NID_subject_key_identifier      82
-#  define OBJ_subject_key_identifier      OBJ_id_ce,14L
-
-#  define SN_key_usage                    "keyUsage"
-#  define LN_key_usage                    "X509v3 Key Usage"
-#  define NID_key_usage                   83
-#  define OBJ_key_usage                   OBJ_id_ce,15L
-
-#  define SN_private_key_usage_period     "privateKeyUsagePeriod"
-#  define LN_private_key_usage_period     "X509v3 Private Key Usage Period"
-#  define NID_private_key_usage_period    84
-#  define OBJ_private_key_usage_period    OBJ_id_ce,16L
-
-#  define SN_subject_alt_name             "subjectAltName"
-#  define LN_subject_alt_name             "X509v3 Subject Alternative Name"
-#  define NID_subject_alt_name            85
-#  define OBJ_subject_alt_name            OBJ_id_ce,17L
-
-#  define SN_issuer_alt_name              "issuerAltName"
-#  define LN_issuer_alt_name              "X509v3 Issuer Alternative Name"
-#  define NID_issuer_alt_name             86
-#  define OBJ_issuer_alt_name             OBJ_id_ce,18L
-
-#  define SN_basic_constraints            "basicConstraints"
-#  define LN_basic_constraints            "X509v3 Basic Constraints"
-#  define NID_basic_constraints           87
-#  define OBJ_basic_constraints           OBJ_id_ce,19L
-
-#  define SN_crl_number                   "crlNumber"
-#  define LN_crl_number                   "X509v3 CRL Number"
-#  define NID_crl_number                  88
-#  define OBJ_crl_number                  OBJ_id_ce,20L
-
-#  define SN_certificate_policies         "certificatePolicies"
-#  define LN_certificate_policies         "X509v3 Certificate Policies"
-#  define NID_certificate_policies        89
-#  define OBJ_certificate_policies        OBJ_id_ce,32L
-
-#  define SN_authority_key_identifier     "authorityKeyIdentifier"
-#  define LN_authority_key_identifier     "X509v3 Authority Key Identifier"
-#  define NID_authority_key_identifier    90
-#  define OBJ_authority_key_identifier    OBJ_id_ce,35L
-
-#  define SN_bf_cbc                       "BF-CBC"
-#  define LN_bf_cbc                       "bf-cbc"
-#  define NID_bf_cbc                      91
-#  define OBJ_bf_cbc                      1L,3L,6L,1L,4L,1L,3029L,1L,2L
-
-#  define SN_bf_ecb                       "BF-ECB"
-#  define LN_bf_ecb                       "bf-ecb"
-#  define NID_bf_ecb                      92
-
-#  define SN_bf_cfb64                     "BF-CFB"
-#  define LN_bf_cfb64                     "bf-cfb"
-#  define NID_bf_cfb64                    93
-
-#  define SN_bf_ofb64                     "BF-OFB"
-#  define LN_bf_ofb64                     "bf-ofb"
-#  define NID_bf_ofb64                    94
-
-#  define SN_mdc2                         "MDC2"
-#  define LN_mdc2                         "mdc2"
-#  define NID_mdc2                        95
-#  define OBJ_mdc2                        2L,5L,8L,3L,101L
-/* An alternative?                      1L,3L,14L,3L,2L,19L */
-
-#  define SN_mdc2WithRSA                  "RSA-MDC2"
-#  define LN_mdc2WithRSA                  "mdc2withRSA"
-#  define NID_mdc2WithRSA                 96
-#  define OBJ_mdc2WithRSA                 2L,5L,8L,3L,100L
-
-#  define SN_rc4_40                       "RC4-40"
-#  define LN_rc4_40                       "rc4-40"
-#  define NID_rc4_40                      97
-
-#  define SN_rc2_40_cbc                   "RC2-40-CBC"
-#  define LN_rc2_40_cbc                   "rc2-40-cbc"
-#  define NID_rc2_40_cbc                  98
-
-#  define SN_givenName                    "G"
-#  define LN_givenName                    "givenName"
-#  define NID_givenName                   99
-#  define OBJ_givenName                   OBJ_X509,42L
-
-#  define SN_surname                      "S"
-#  define LN_surname                      "surname"
-#  define NID_surname                     100
-#  define OBJ_surname                     OBJ_X509,4L
-
-#  define SN_initials                     "I"
-#  define LN_initials                     "initials"
-#  define NID_initials                    101
-#  define OBJ_initials                    OBJ_X509,43L
-
-#  define SN_uniqueIdentifier             "UID"
-#  define LN_uniqueIdentifier             "uniqueIdentifier"
-#  define NID_uniqueIdentifier            102
-#  define OBJ_uniqueIdentifier            OBJ_X509,45L
-
-#  define SN_crl_distribution_points      "crlDistributionPoints"
-#  define LN_crl_distribution_points      "X509v3 CRL Distribution Points"
-#  define NID_crl_distribution_points     103
-#  define OBJ_crl_distribution_points     OBJ_id_ce,31L
-
-#  define SN_md5WithRSA                   "RSA-NP-MD5"
-#  define LN_md5WithRSA                   "md5WithRSA"
-#  define NID_md5WithRSA                  104
-#  define OBJ_md5WithRSA                  OBJ_algorithm,3L
-
-#  define SN_serialNumber                 "SN"
-#  define LN_serialNumber                 "serialNumber"
-#  define NID_serialNumber                105
-#  define OBJ_serialNumber                OBJ_X509,5L
-
-#  define SN_title                        "T"
-#  define LN_title                        "title"
-#  define NID_title                       106
-#  define OBJ_title                       OBJ_X509,12L
-
-#  define SN_description                  "D"
-#  define LN_description                  "description"
-#  define NID_description                 107
-#  define OBJ_description                 OBJ_X509,13L
-
-/* CAST5 is CAST-128, I'm just sticking with the documentation */
-#  define SN_cast5_cbc                    "CAST5-CBC"
-#  define LN_cast5_cbc                    "cast5-cbc"
-#  define NID_cast5_cbc                   108
-#  define OBJ_cast5_cbc                   1L,2L,840L,113533L,7L,66L,10L
-
-#  define SN_cast5_ecb                    "CAST5-ECB"
-#  define LN_cast5_ecb                    "cast5-ecb"
-#  define NID_cast5_ecb                   109
-
-#  define SN_cast5_cfb64                  "CAST5-CFB"
-#  define LN_cast5_cfb64                  "cast5-cfb"
-#  define NID_cast5_cfb64                 110
-
-#  define SN_cast5_ofb64                  "CAST5-OFB"
-#  define LN_cast5_ofb64                  "cast5-ofb"
-#  define NID_cast5_ofb64                 111
-
-#  define LN_pbeWithMD5AndCast5_CBC       "pbeWithMD5AndCast5CBC"
-#  define NID_pbeWithMD5AndCast5_CBC      112
-#  define OBJ_pbeWithMD5AndCast5_CBC      1L,2L,840L,113533L,7L,66L,12L
-
-/*-
- * This is one sun will soon be using :-(
- * id-dsa-with-sha1 ID  ::= {
- *   iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 }
- */
-#  define SN_dsaWithSHA1                  "DSA-SHA1"
-#  define LN_dsaWithSHA1                  "dsaWithSHA1"
-#  define NID_dsaWithSHA1                 113
-#  define OBJ_dsaWithSHA1                 1L,2L,840L,10040L,4L,3L
-
-#  define NID_md5_sha1                    114
-#  define SN_md5_sha1                     "MD5-SHA1"
-#  define LN_md5_sha1                     "md5-sha1"
-
-#  define SN_sha1WithRSA                  "RSA-SHA1-2"
-#  define LN_sha1WithRSA                  "sha1WithRSA"
-#  define NID_sha1WithRSA                 115
-#  define OBJ_sha1WithRSA                 OBJ_algorithm,29L
-
-#  define SN_dsa                          "DSA"
-#  define LN_dsa                          "dsaEncryption"
-#  define NID_dsa                         116
-#  define OBJ_dsa                         1L,2L,840L,10040L,4L,1L
-
-#  define SN_ripemd160                    "RIPEMD160"
-#  define LN_ripemd160                    "ripemd160"
-#  define NID_ripemd160                   117
-#  define OBJ_ripemd160                   1L,3L,36L,3L,2L,1L
-
-/*
- * The name should actually be rsaSignatureWithripemd160, but I'm going to
- * continue using the convention I'm using with the other ciphers
- */
-#  define SN_ripemd160WithRSA             "RSA-RIPEMD160"
-#  define LN_ripemd160WithRSA             "ripemd160WithRSA"
-#  define NID_ripemd160WithRSA            119
-#  define OBJ_ripemd160WithRSA            1L,3L,36L,3L,3L,1L,2L
-
-/*-
- * Taken from rfc2040
- *  RC5_CBC_Parameters ::= SEQUENCE {
- *      version           INTEGER (v1_0(16)),
- *      rounds            INTEGER (8..127),
- *      blockSizeInBits   INTEGER (64, 128),
- *      iv                OCTET STRING OPTIONAL
- *      }
- */
-#  define SN_rc5_cbc                      "RC5-CBC"
-#  define LN_rc5_cbc                      "rc5-cbc"
-#  define NID_rc5_cbc                     120
-#  define OBJ_rc5_cbc                     OBJ_rsadsi,3L,8L
-
-#  define SN_rc5_ecb                      "RC5-ECB"
-#  define LN_rc5_ecb                      "rc5-ecb"
-#  define NID_rc5_ecb                     121
-
-#  define SN_rc5_cfb64                    "RC5-CFB"
-#  define LN_rc5_cfb64                    "rc5-cfb"
-#  define NID_rc5_cfb64                   122
-
-#  define SN_rc5_ofb64                    "RC5-OFB"
-#  define LN_rc5_ofb64                    "rc5-ofb"
-#  define NID_rc5_ofb64                   123
-
-#  define SN_rle_compression              "RLE"
-#  define LN_rle_compression              "run length compression"
-#  define NID_rle_compression             124
-#  define OBJ_rle_compression             1L,1L,1L,1L,666L,1L
-
-#  define SN_zlib_compression             "ZLIB"
-#  define LN_zlib_compression             "zlib compression"
-#  define NID_zlib_compression            125
-#  define OBJ_zlib_compression            1L,1L,1L,1L,666L,2L
-
-#  define SN_ext_key_usage                "extendedKeyUsage"
-#  define LN_ext_key_usage                "X509v3 Extended Key Usage"
-#  define NID_ext_key_usage               126
-#  define OBJ_ext_key_usage               OBJ_id_ce,37
-
-#  define SN_id_pkix                      "PKIX"
-#  define NID_id_pkix                     127
-#  define OBJ_id_pkix                     1L,3L,6L,1L,5L,5L,7L
-
-#  define SN_id_kp                        "id-kp"
-#  define NID_id_kp                       128
-#  define OBJ_id_kp                       OBJ_id_pkix,3L
-
-/* PKIX extended key usage OIDs */
-
-#  define SN_server_auth                  "serverAuth"
-#  define LN_server_auth                  "TLS Web Server Authentication"
-#  define NID_server_auth                 129
-#  define OBJ_server_auth                 OBJ_id_kp,1L
-
-#  define SN_client_auth                  "clientAuth"
-#  define LN_client_auth                  "TLS Web Client Authentication"
-#  define NID_client_auth                 130
-#  define OBJ_client_auth                 OBJ_id_kp,2L
-
-#  define SN_code_sign                    "codeSigning"
-#  define LN_code_sign                    "Code Signing"
-#  define NID_code_sign                   131
-#  define OBJ_code_sign                   OBJ_id_kp,3L
-
-#  define SN_email_protect                "emailProtection"
-#  define LN_email_protect                "E-mail Protection"
-#  define NID_email_protect               132
-#  define OBJ_email_protect               OBJ_id_kp,4L
-
-#  define SN_time_stamp                   "timeStamping"
-#  define LN_time_stamp                   "Time Stamping"
-#  define NID_time_stamp                  133
-#  define OBJ_time_stamp                  OBJ_id_kp,8L
-
-/* Additional extended key usage OIDs: Microsoft */
-
-#  define SN_ms_code_ind                  "msCodeInd"
-#  define LN_ms_code_ind                  "Microsoft Individual Code Signing"
-#  define NID_ms_code_ind                 134
-#  define OBJ_ms_code_ind                 1L,3L,6L,1L,4L,1L,311L,2L,1L,21L
-
-#  define SN_ms_code_com                  "msCodeCom"
-#  define LN_ms_code_com                  "Microsoft Commercial Code Signing"
-#  define NID_ms_code_com                 135
-#  define OBJ_ms_code_com                 1L,3L,6L,1L,4L,1L,311L,2L,1L,22L
-
-#  define SN_ms_ctl_sign                  "msCTLSign"
-#  define LN_ms_ctl_sign                  "Microsoft Trust List Signing"
-#  define NID_ms_ctl_sign                 136
-#  define OBJ_ms_ctl_sign                 1L,3L,6L,1L,4L,1L,311L,10L,3L,1L
-
-#  define SN_ms_sgc                       "msSGC"
-#  define LN_ms_sgc                       "Microsoft Server Gated Crypto"
-#  define NID_ms_sgc                      137
-#  define OBJ_ms_sgc                      1L,3L,6L,1L,4L,1L,311L,10L,3L,3L
-
-#  define SN_ms_efs                       "msEFS"
-#  define LN_ms_efs                       "Microsoft Encrypted File System"
-#  define NID_ms_efs                      138
-#  define OBJ_ms_efs                      1L,3L,6L,1L,4L,1L,311L,10L,3L,4L
-
-/* Additional usage: Netscape */
-
-#  define SN_ns_sgc                       "nsSGC"
-#  define LN_ns_sgc                       "Netscape Server Gated Crypto"
-#  define NID_ns_sgc                      139
-#  define OBJ_ns_sgc                      OBJ_netscape,4L,1L
-
-#  define SN_delta_crl                    "deltaCRL"
-#  define LN_delta_crl                    "X509v3 Delta CRL Indicator"
-#  define NID_delta_crl                   140
-#  define OBJ_delta_crl                   OBJ_id_ce,27L
-
-#  define SN_crl_reason                   "CRLReason"
-#  define LN_crl_reason                   "CRL Reason Code"
-#  define NID_crl_reason                  141
-#  define OBJ_crl_reason                  OBJ_id_ce,21L
-
-#  define SN_invalidity_date              "invalidityDate"
-#  define LN_invalidity_date              "Invalidity Date"
-#  define NID_invalidity_date             142
-#  define OBJ_invalidity_date             OBJ_id_ce,24L
-
-#  define SN_sxnet                        "SXNetID"
-#  define LN_sxnet                        "Strong Extranet ID"
-#  define NID_sxnet                       143
-#  define OBJ_sxnet                       1L,3L,101L,1L,4L,1L
-
-/* PKCS12 and related OBJECT IDENTIFIERS */
-
-#  define OBJ_pkcs12                      OBJ_pkcs,12L
-#  define OBJ_pkcs12_pbeids               OBJ_pkcs12, 1
-
-#  define SN_pbe_WithSHA1And128BitRC4     "PBE-SHA1-RC4-128"
-#  define LN_pbe_WithSHA1And128BitRC4     "pbeWithSHA1And128BitRC4"
-#  define NID_pbe_WithSHA1And128BitRC4    144
-#  define OBJ_pbe_WithSHA1And128BitRC4    OBJ_pkcs12_pbeids, 1L
-
-#  define SN_pbe_WithSHA1And40BitRC4      "PBE-SHA1-RC4-40"
-#  define LN_pbe_WithSHA1And40BitRC4      "pbeWithSHA1And40BitRC4"
-#  define NID_pbe_WithSHA1And40BitRC4     145
-#  define OBJ_pbe_WithSHA1And40BitRC4     OBJ_pkcs12_pbeids, 2L
-
-#  define SN_pbe_WithSHA1And3_Key_TripleDES_CBC   "PBE-SHA1-3DES"
-#  define LN_pbe_WithSHA1And3_Key_TripleDES_CBC   "pbeWithSHA1And3-KeyTripleDES-CBC"
-#  define NID_pbe_WithSHA1And3_Key_TripleDES_CBC  146
-#  define OBJ_pbe_WithSHA1And3_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 3L
-
-#  define SN_pbe_WithSHA1And2_Key_TripleDES_CBC   "PBE-SHA1-2DES"
-#  define LN_pbe_WithSHA1And2_Key_TripleDES_CBC   "pbeWithSHA1And2-KeyTripleDES-CBC"
-#  define NID_pbe_WithSHA1And2_Key_TripleDES_CBC  147
-#  define OBJ_pbe_WithSHA1And2_Key_TripleDES_CBC  OBJ_pkcs12_pbeids, 4L
-
-#  define SN_pbe_WithSHA1And128BitRC2_CBC         "PBE-SHA1-RC2-128"
-#  define LN_pbe_WithSHA1And128BitRC2_CBC         "pbeWithSHA1And128BitRC2-CBC"
-#  define NID_pbe_WithSHA1And128BitRC2_CBC        148
-#  define OBJ_pbe_WithSHA1And128BitRC2_CBC        OBJ_pkcs12_pbeids, 5L
-
-#  define SN_pbe_WithSHA1And40BitRC2_CBC  "PBE-SHA1-RC2-40"
-#  define LN_pbe_WithSHA1And40BitRC2_CBC  "pbeWithSHA1And40BitRC2-CBC"
-#  define NID_pbe_WithSHA1And40BitRC2_CBC 149
-#  define OBJ_pbe_WithSHA1And40BitRC2_CBC OBJ_pkcs12_pbeids, 6L
-
-#  define OBJ_pkcs12_Version1     OBJ_pkcs12, 10L
-
-#  define OBJ_pkcs12_BagIds       OBJ_pkcs12_Version1, 1L
-
-#  define LN_keyBag               "keyBag"
-#  define NID_keyBag              150
-#  define OBJ_keyBag              OBJ_pkcs12_BagIds, 1L
-
-#  define LN_pkcs8ShroudedKeyBag  "pkcs8ShroudedKeyBag"
-#  define NID_pkcs8ShroudedKeyBag 151
-#  define OBJ_pkcs8ShroudedKeyBag OBJ_pkcs12_BagIds, 2L
-
-#  define LN_certBag              "certBag"
-#  define NID_certBag             152
-#  define OBJ_certBag             OBJ_pkcs12_BagIds, 3L
-
-#  define LN_crlBag               "crlBag"
-#  define NID_crlBag              153
-#  define OBJ_crlBag              OBJ_pkcs12_BagIds, 4L
-
-#  define LN_secretBag            "secretBag"
-#  define NID_secretBag           154
-#  define OBJ_secretBag           OBJ_pkcs12_BagIds, 5L
-
-#  define LN_safeContentsBag      "safeContentsBag"
-#  define NID_safeContentsBag     155
-#  define OBJ_safeContentsBag     OBJ_pkcs12_BagIds, 6L
-
-#  define LN_friendlyName         "friendlyName"
-#  define NID_friendlyName        156
-#  define OBJ_friendlyName        OBJ_pkcs9, 20L
-
-#  define LN_localKeyID           "localKeyID"
-#  define NID_localKeyID          157
-#  define OBJ_localKeyID          OBJ_pkcs9, 21L
-
-#  define OBJ_certTypes           OBJ_pkcs9, 22L
-
-#  define LN_x509Certificate      "x509Certificate"
-#  define NID_x509Certificate     158
-#  define OBJ_x509Certificate     OBJ_certTypes, 1L
-
-#  define LN_sdsiCertificate      "sdsiCertificate"
-#  define NID_sdsiCertificate     159
-#  define OBJ_sdsiCertificate     OBJ_certTypes, 2L
-
-#  define OBJ_crlTypes            OBJ_pkcs9, 23L
-
-#  define LN_x509Crl              "x509Crl"
-#  define NID_x509Crl             160
-#  define OBJ_x509Crl             OBJ_crlTypes, 1L
-
-/* PKCS#5 v2 OIDs */
-
-#  define LN_pbes2                "PBES2"
-#  define NID_pbes2               161
-#  define OBJ_pbes2               OBJ_pkcs,5L,13L
-
-#  define LN_pbmac1               "PBMAC1"
-#  define NID_pbmac1              162
-#  define OBJ_pbmac1              OBJ_pkcs,5L,14L
-
-#  define LN_hmacWithSHA1         "hmacWithSHA1"
-#  define NID_hmacWithSHA1        163
-#  define OBJ_hmacWithSHA1        OBJ_rsadsi,2L,7L
-
-/* Policy Qualifier Ids */
-
-#  define LN_id_qt_cps            "Policy Qualifier CPS"
-#  define SN_id_qt_cps            "id-qt-cps"
-#  define NID_id_qt_cps           164
-#  define OBJ_id_qt_cps           OBJ_id_pkix,2L,1L
-
-#  define LN_id_qt_unotice        "Policy Qualifier User Notice"
-#  define SN_id_qt_unotice        "id-qt-unotice"
-#  define NID_id_qt_unotice       165
-#  define OBJ_id_qt_unotice       OBJ_id_pkix,2L,2L
-
-#  define SN_rc2_64_cbc                   "RC2-64-CBC"
-#  define LN_rc2_64_cbc                   "rc2-64-cbc"
-#  define NID_rc2_64_cbc                  166
-
-#  define SN_SMIMECapabilities            "SMIME-CAPS"
-#  define LN_SMIMECapabilities            "S/MIME Capabilities"
-#  define NID_SMIMECapabilities           167
-#  define OBJ_SMIMECapabilities           OBJ_pkcs9,15L
-
-#  define SN_pbeWithMD2AndRC2_CBC         "PBE-MD2-RC2-64"
-#  define LN_pbeWithMD2AndRC2_CBC         "pbeWithMD2AndRC2-CBC"
-#  define NID_pbeWithMD2AndRC2_CBC        168
-#  define OBJ_pbeWithMD2AndRC2_CBC        OBJ_pkcs,5L,4L
-
-#  define SN_pbeWithMD5AndRC2_CBC         "PBE-MD5-RC2-64"
-#  define LN_pbeWithMD5AndRC2_CBC         "pbeWithMD5AndRC2-CBC"
-#  define NID_pbeWithMD5AndRC2_CBC        169
-#  define OBJ_pbeWithMD5AndRC2_CBC        OBJ_pkcs,5L,6L
-
-#  define SN_pbeWithSHA1AndDES_CBC        "PBE-SHA1-DES"
-#  define LN_pbeWithSHA1AndDES_CBC        "pbeWithSHA1AndDES-CBC"
-#  define NID_pbeWithSHA1AndDES_CBC       170
-#  define OBJ_pbeWithSHA1AndDES_CBC       OBJ_pkcs,5L,10L
-
-/* Extension request OIDs */
-
-#  define LN_ms_ext_req                   "Microsoft Extension Request"
-#  define SN_ms_ext_req                   "msExtReq"
-#  define NID_ms_ext_req                  171
-#  define OBJ_ms_ext_req                  1L,3L,6L,1L,4L,1L,311L,2L,1L,14L
-
-#  define LN_ext_req                      "Extension Request"
-#  define SN_ext_req                      "extReq"
-#  define NID_ext_req                     172
-#  define OBJ_ext_req                     OBJ_pkcs9,14L
-
-#  define SN_name                         "name"
-#  define LN_name                         "name"
-#  define NID_name                        173
-#  define OBJ_name                        OBJ_X509,41L
-
-#  define SN_dnQualifier                  "dnQualifier"
-#  define LN_dnQualifier                  "dnQualifier"
-#  define NID_dnQualifier                 174
-#  define OBJ_dnQualifier                 OBJ_X509,46L
-
-#  define SN_id_pe                        "id-pe"
-#  define NID_id_pe                       175
-#  define OBJ_id_pe                       OBJ_id_pkix,1L
-
-#  define SN_id_ad                        "id-ad"
-#  define NID_id_ad                       176
-#  define OBJ_id_ad                       OBJ_id_pkix,48L
-
-#  define SN_info_access                  "authorityInfoAccess"
-#  define LN_info_access                  "Authority Information Access"
-#  define NID_info_access                 177
-#  define OBJ_info_access                 OBJ_id_pe,1L
-
-#  define SN_ad_OCSP                      "OCSP"
-#  define LN_ad_OCSP                      "OCSP"
-#  define NID_ad_OCSP                     178
-#  define OBJ_ad_OCSP                     OBJ_id_ad,1L
-
-#  define SN_ad_ca_issuers                "caIssuers"
-#  define LN_ad_ca_issuers                "CA Issuers"
-#  define NID_ad_ca_issuers               179
-#  define OBJ_ad_ca_issuers               OBJ_id_ad,2L
-
-#  define SN_OCSP_sign                    "OCSPSigning"
-#  define LN_OCSP_sign                    "OCSP Signing"
-#  define NID_OCSP_sign                   180
-#  define OBJ_OCSP_sign                   OBJ_id_kp,9L
-# endif                         /* USE_OBJ_MAC */
-
-# include <openssl/bio.h>
-# include <openssl/asn1.h>
-
-# define OBJ_NAME_TYPE_UNDEF             0x00
-# define OBJ_NAME_TYPE_MD_METH           0x01
-# define OBJ_NAME_TYPE_CIPHER_METH       0x02
-# define OBJ_NAME_TYPE_PKEY_METH         0x03
-# define OBJ_NAME_TYPE_COMP_METH         0x04
-# define OBJ_NAME_TYPE_NUM               0x05
-
-# define OBJ_NAME_ALIAS                  0x8000
-
-# define OBJ_BSEARCH_VALUE_ON_NOMATCH            0x01
-# define OBJ_BSEARCH_FIRST_VALUE_ON_MATCH        0x02
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct obj_name_st {
-    int type;
-    int alias;
-    const char *name;
-    const char *data;
-} OBJ_NAME;
-
-# define         OBJ_create_and_add_object(a,b,c) OBJ_create(a,b,c)
-
-int OBJ_NAME_init(void);
-int OBJ_NAME_new_index(unsigned long (*hash_func) (const char *),
-                       int (*cmp_func) (const char *, const char *),
-                       void (*free_func) (const char *, int, const char *));
-const char *OBJ_NAME_get(const char *name, int type);
-int OBJ_NAME_add(const char *name, int type, const char *data);
-int OBJ_NAME_remove(const char *name, int type);
-void OBJ_NAME_cleanup(int type); /* -1 for everything */
-void OBJ_NAME_do_all(int type, void (*fn) (const OBJ_NAME *, void *arg),
-                     void *arg);
-void OBJ_NAME_do_all_sorted(int type,
-                            void (*fn) (const OBJ_NAME *, void *arg),
-                            void *arg);
-
-ASN1_OBJECT *OBJ_dup(const ASN1_OBJECT *o);
-ASN1_OBJECT *OBJ_nid2obj(int n);
-const char *OBJ_nid2ln(int n);
-const char *OBJ_nid2sn(int n);
-int OBJ_obj2nid(const ASN1_OBJECT *o);
-ASN1_OBJECT *OBJ_txt2obj(const char *s, int no_name);
-int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name);
-int OBJ_txt2nid(const char *s);
-int OBJ_ln2nid(const char *s);
-int OBJ_sn2nid(const char *s);
-int OBJ_cmp(const ASN1_OBJECT *a, const ASN1_OBJECT *b);
-const void *OBJ_bsearch_(const void *key, const void *base, int num, int size,
-                         int (*cmp) (const void *, const void *));
-const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
-                            int size,
-                            int (*cmp) (const void *, const void *),
-                            int flags);
-
-# define _DECLARE_OBJ_BSEARCH_CMP_FN(scope, type1, type2, nm)    \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *, const void *); \
-  static int nm##_cmp(type1 const *, type2 const *); \
-  scope type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
-
-# define DECLARE_OBJ_BSEARCH_CMP_FN(type1, type2, cmp)   \
-  _DECLARE_OBJ_BSEARCH_CMP_FN(static, type1, type2, cmp)
-# define DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)     \
-  type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
-
-/*-
- * Unsolved problem: if a type is actually a pointer type, like
- * nid_triple is, then its impossible to get a const where you need
- * it. Consider:
- *
- * typedef int nid_triple[3];
- * const void *a_;
- * const nid_triple const *a = a_;
- *
- * The assignement discards a const because what you really want is:
- *
- * const int const * const *a = a_;
- *
- * But if you do that, you lose the fact that a is an array of 3 ints,
- * which breaks comparison functions.
- *
- * Thus we end up having to cast, sadly, or unpack the
- * declarations. Or, as I finally did in this case, delcare nid_triple
- * to be a struct, which it should have been in the first place.
- *
- * Ben, August 2008.
- *
- * Also, strictly speaking not all types need be const, but handling
- * the non-constness means a lot of complication, and in practice
- * comparison routines do always not touch their arguments.
- */
-
-# define IMPLEMENT_OBJ_BSEARCH_CMP_FN(type1, type2, nm)  \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)    \
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  static type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-                                        nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
-
-# define IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm)   \
-  static int nm##_cmp_BSEARCH_CMP_FN(const void *a_, const void *b_)    \
-      { \
-      type1 const *a = a_; \
-      type2 const *b = b_; \
-      return nm##_cmp(a,b); \
-      } \
-  type2 *OBJ_bsearch_##nm(type1 *key, type2 const *base, int num) \
-      { \
-      return (type2 *)OBJ_bsearch_(key, base, num, sizeof(type2), \
-                                        nm##_cmp_BSEARCH_CMP_FN); \
-      } \
-      extern void dummy_prototype(void)
-
-# define OBJ_bsearch(type1,key,type2,base,num,cmp)                              \
-  ((type2 *)OBJ_bsearch_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-                         num,sizeof(type2),                             \
-                         ((void)CHECKED_PTR_OF(type1,cmp##_type_1),     \
-                          (void)CHECKED_PTR_OF(type2,cmp##_type_2),     \
-                          cmp##_BSEARCH_CMP_FN)))
-
-# define OBJ_bsearch_ex(type1,key,type2,base,num,cmp,flags)                      \
-  ((type2 *)OBJ_bsearch_ex_(CHECKED_PTR_OF(type1,key),CHECKED_PTR_OF(type2,base), \
-                         num,sizeof(type2),                             \
-                         ((void)CHECKED_PTR_OF(type1,cmp##_type_1),     \
-                          (void)type_2=CHECKED_PTR_OF(type2,cmp##_type_2), \
-                          cmp##_BSEARCH_CMP_FN)),flags)
-
-int OBJ_new_nid(int num);
-int OBJ_add_object(const ASN1_OBJECT *obj);
-int OBJ_create(const char *oid, const char *sn, const char *ln);
-void OBJ_cleanup(void);
-int OBJ_create_objects(BIO *in);
-
-int OBJ_find_sigid_algs(int signid, int *pdig_nid, int *ppkey_nid);
-int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid);
-int OBJ_add_sigid(int signid, int dig_id, int pkey_id);
-void OBJ_sigid_free(void);
-
-extern int obj_cleanup_defer;
-void check_defer(int nid);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_OBJ_strings(void);
-
-/* Error codes for the OBJ functions. */
-
-/* Function codes. */
-# define OBJ_F_OBJ_ADD_OBJECT                             105
-# define OBJ_F_OBJ_CREATE                                 100
-# define OBJ_F_OBJ_DUP                                    101
-# define OBJ_F_OBJ_NAME_NEW_INDEX                         106
-# define OBJ_F_OBJ_NID2LN                                 102
-# define OBJ_F_OBJ_NID2OBJ                                103
-# define OBJ_F_OBJ_NID2SN                                 104
-
-/* Reason codes. */
-# define OBJ_R_MALLOC_FAILURE                             100
-# define OBJ_R_UNKNOWN_NID                                101
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ocsp.h b/include.new/openssl/ocsp.h
deleted file mode 100644
index 25ef019..0000000
--- a/include.new/openssl/ocsp.h
+++ /dev/null
@@ -1,626 +0,0 @@
-/* ocsp.h */
-/*
- * Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
- * project.
- */
-
-/*
- * History: This file was transfered to Richard Levitte from CertCo by Kathy
- * Weinhold in mid-spring 2000 to be included in OpenSSL or released as a
- * patch kit.
- */
-
-/* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_OCSP_H
-# define HEADER_OCSP_H
-
-# include <openssl/ossl_typ.h>
-# include <openssl/x509.h>
-# include <openssl/x509v3.h>
-# include <openssl/safestack.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Various flags and values */
-
-# define OCSP_DEFAULT_NONCE_LENGTH       16
-
-# define OCSP_NOCERTS                    0x1
-# define OCSP_NOINTERN                   0x2
-# define OCSP_NOSIGS                     0x4
-# define OCSP_NOCHAIN                    0x8
-# define OCSP_NOVERIFY                   0x10
-# define OCSP_NOEXPLICIT                 0x20
-# define OCSP_NOCASIGN                   0x40
-# define OCSP_NODELEGATED                0x80
-# define OCSP_NOCHECKS                   0x100
-# define OCSP_TRUSTOTHER                 0x200
-# define OCSP_RESPID_KEY                 0x400
-# define OCSP_NOTIME                     0x800
-
-/*-  CertID ::= SEQUENCE {
- *       hashAlgorithm            AlgorithmIdentifier,
- *       issuerNameHash     OCTET STRING, -- Hash of Issuer's DN
- *       issuerKeyHash      OCTET STRING, -- Hash of Issuers public key (excluding the tag & length fields)
- *       serialNumber       CertificateSerialNumber }
- */
-typedef struct ocsp_cert_id_st {
-    X509_ALGOR *hashAlgorithm;
-    ASN1_OCTET_STRING *issuerNameHash;
-    ASN1_OCTET_STRING *issuerKeyHash;
-    ASN1_INTEGER *serialNumber;
-} OCSP_CERTID;
-
-DECLARE_STACK_OF(OCSP_CERTID)
-
-/*-  Request ::=     SEQUENCE {
- *       reqCert                    CertID,
- *       singleRequestExtensions    [0] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_one_request_st {
-    OCSP_CERTID *reqCert;
-    STACK_OF(X509_EXTENSION) *singleRequestExtensions;
-} OCSP_ONEREQ;
-
-DECLARE_STACK_OF(OCSP_ONEREQ)
-DECLARE_ASN1_SET_OF(OCSP_ONEREQ)
-
-/*-  TBSRequest      ::=     SEQUENCE {
- *       version             [0] EXPLICIT Version DEFAULT v1,
- *       requestorName       [1] EXPLICIT GeneralName OPTIONAL,
- *       requestList             SEQUENCE OF Request,
- *       requestExtensions   [2] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_req_info_st {
-    ASN1_INTEGER *version;
-    GENERAL_NAME *requestorName;
-    STACK_OF(OCSP_ONEREQ) *requestList;
-    STACK_OF(X509_EXTENSION) *requestExtensions;
-} OCSP_REQINFO;
-
-/*-  Signature       ::=     SEQUENCE {
- *       signatureAlgorithm   AlgorithmIdentifier,
- *       signature            BIT STRING,
- *       certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-typedef struct ocsp_signature_st {
-    X509_ALGOR *signatureAlgorithm;
-    ASN1_BIT_STRING *signature;
-    STACK_OF(X509) *certs;
-} OCSP_SIGNATURE;
-
-/*-  OCSPRequest     ::=     SEQUENCE {
- *       tbsRequest                  TBSRequest,
- *       optionalSignature   [0]     EXPLICIT Signature OPTIONAL }
- */
-typedef struct ocsp_request_st {
-    OCSP_REQINFO *tbsRequest;
-    OCSP_SIGNATURE *optionalSignature; /* OPTIONAL */
-} OCSP_REQUEST;
-
-/*-  OCSPResponseStatus ::= ENUMERATED {
- *       successful            (0),      --Response has valid confirmations
- *       malformedRequest      (1),      --Illegal confirmation request
- *       internalError         (2),      --Internal error in issuer
- *       tryLater              (3),      --Try again later
- *                                       --(4) is not used
- *       sigRequired           (5),      --Must sign the request
- *       unauthorized          (6)       --Request unauthorized
- *   }
- */
-# define OCSP_RESPONSE_STATUS_SUCCESSFUL          0
-# define OCSP_RESPONSE_STATUS_MALFORMEDREQUEST     1
-# define OCSP_RESPONSE_STATUS_INTERNALERROR        2
-# define OCSP_RESPONSE_STATUS_TRYLATER             3
-# define OCSP_RESPONSE_STATUS_SIGREQUIRED          5
-# define OCSP_RESPONSE_STATUS_UNAUTHORIZED         6
-
-/*-  ResponseBytes ::=       SEQUENCE {
- *       responseType   OBJECT IDENTIFIER,
- *       response       OCTET STRING }
- */
-typedef struct ocsp_resp_bytes_st {
-    ASN1_OBJECT *responseType;
-    ASN1_OCTET_STRING *response;
-} OCSP_RESPBYTES;
-
-/*-  OCSPResponse ::= SEQUENCE {
- *      responseStatus         OCSPResponseStatus,
- *      responseBytes          [0] EXPLICIT ResponseBytes OPTIONAL }
- */
-struct ocsp_response_st {
-    ASN1_ENUMERATED *responseStatus;
-    OCSP_RESPBYTES *responseBytes;
-};
-
-/*-  ResponderID ::= CHOICE {
- *      byName   [1] Name,
- *      byKey    [2] KeyHash }
- */
-# define V_OCSP_RESPID_NAME 0
-# define V_OCSP_RESPID_KEY  1
-struct ocsp_responder_id_st {
-    int type;
-    union {
-        X509_NAME *byName;
-        ASN1_OCTET_STRING *byKey;
-    } value;
-};
-
-DECLARE_STACK_OF(OCSP_RESPID)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
-
-/*-  KeyHash ::= OCTET STRING --SHA-1 hash of responder's public key
- *                            --(excluding the tag and length fields)
- */
-
-/*-  RevokedInfo ::= SEQUENCE {
- *       revocationTime              GeneralizedTime,
- *       revocationReason    [0]     EXPLICIT CRLReason OPTIONAL }
- */
-typedef struct ocsp_revoked_info_st {
-    ASN1_GENERALIZEDTIME *revocationTime;
-    ASN1_ENUMERATED *revocationReason;
-} OCSP_REVOKEDINFO;
-
-/*-  CertStatus ::= CHOICE {
- *       good                [0]     IMPLICIT NULL,
- *       revoked             [1]     IMPLICIT RevokedInfo,
- *       unknown             [2]     IMPLICIT UnknownInfo }
- */
-# define V_OCSP_CERTSTATUS_GOOD    0
-# define V_OCSP_CERTSTATUS_REVOKED 1
-# define V_OCSP_CERTSTATUS_UNKNOWN 2
-typedef struct ocsp_cert_status_st {
-    int type;
-    union {
-        ASN1_NULL *good;
-        OCSP_REVOKEDINFO *revoked;
-        ASN1_NULL *unknown;
-    } value;
-} OCSP_CERTSTATUS;
-
-/*-  SingleResponse ::= SEQUENCE {
- *      certID                       CertID,
- *      certStatus                   CertStatus,
- *      thisUpdate                   GeneralizedTime,
- *      nextUpdate           [0]     EXPLICIT GeneralizedTime OPTIONAL,
- *      singleExtensions     [1]     EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_single_response_st {
-    OCSP_CERTID *certId;
-    OCSP_CERTSTATUS *certStatus;
-    ASN1_GENERALIZEDTIME *thisUpdate;
-    ASN1_GENERALIZEDTIME *nextUpdate;
-    STACK_OF(X509_EXTENSION) *singleExtensions;
-} OCSP_SINGLERESP;
-
-DECLARE_STACK_OF(OCSP_SINGLERESP)
-DECLARE_ASN1_SET_OF(OCSP_SINGLERESP)
-
-/*-  ResponseData ::= SEQUENCE {
- *      version              [0] EXPLICIT Version DEFAULT v1,
- *      responderID              ResponderID,
- *      producedAt               GeneralizedTime,
- *      responses                SEQUENCE OF SingleResponse,
- *      responseExtensions   [1] EXPLICIT Extensions OPTIONAL }
- */
-typedef struct ocsp_response_data_st {
-    ASN1_INTEGER *version;
-    OCSP_RESPID *responderId;
-    ASN1_GENERALIZEDTIME *producedAt;
-    STACK_OF(OCSP_SINGLERESP) *responses;
-    STACK_OF(X509_EXTENSION) *responseExtensions;
-} OCSP_RESPDATA;
-
-/*-  BasicOCSPResponse       ::= SEQUENCE {
- *      tbsResponseData      ResponseData,
- *      signatureAlgorithm   AlgorithmIdentifier,
- *      signature            BIT STRING,
- *      certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- */
-  /*
-   * Note 1: The value for "signature" is specified in the OCSP rfc2560 as
-   * follows: "The value for the signature SHALL be computed on the hash of
-   * the DER encoding ResponseData." This means that you must hash the
-   * DER-encoded tbsResponseData, and then run it through a crypto-signing
-   * function, which will (at least w/RSA) do a hash-'n'-private-encrypt
-   * operation.  This seems a bit odd, but that's the spec.  Also note that
-   * the data structures do not leave anywhere to independently specify the
-   * algorithm used for the initial hash. So, we look at the
-   * signature-specification algorithm, and try to do something intelligent.
-   * -- Kathy Weinhold, CertCo
-   */
-  /*
-   * Note 2: It seems that the mentioned passage from RFC 2560 (section
-   * 4.2.1) is open for interpretation.  I've done tests against another
-   * responder, and found that it doesn't do the double hashing that the RFC
-   * seems to say one should.  Therefore, all relevant functions take a flag
-   * saying which variant should be used.  -- Richard Levitte, OpenSSL team
-   * and CeloCom
-   */
-typedef struct ocsp_basic_response_st {
-    OCSP_RESPDATA *tbsResponseData;
-    X509_ALGOR *signatureAlgorithm;
-    ASN1_BIT_STRING *signature;
-    STACK_OF(X509) *certs;
-} OCSP_BASICRESP;
-
-/*-
- *   CRLReason ::= ENUMERATED {
- *        unspecified             (0),
- *        keyCompromise           (1),
- *        cACompromise            (2),
- *        affiliationChanged      (3),
- *        superseded              (4),
- *        cessationOfOperation    (5),
- *        certificateHold         (6),
- *        removeFromCRL           (8) }
- */
-# define OCSP_REVOKED_STATUS_NOSTATUS               -1
-# define OCSP_REVOKED_STATUS_UNSPECIFIED             0
-# define OCSP_REVOKED_STATUS_KEYCOMPROMISE           1
-# define OCSP_REVOKED_STATUS_CACOMPROMISE            2
-# define OCSP_REVOKED_STATUS_AFFILIATIONCHANGED      3
-# define OCSP_REVOKED_STATUS_SUPERSEDED              4
-# define OCSP_REVOKED_STATUS_CESSATIONOFOPERATION    5
-# define OCSP_REVOKED_STATUS_CERTIFICATEHOLD         6
-# define OCSP_REVOKED_STATUS_REMOVEFROMCRL           8
-
-/*-
- * CrlID ::= SEQUENCE {
- *     crlUrl               [0]     EXPLICIT IA5String OPTIONAL,
- *     crlNum               [1]     EXPLICIT INTEGER OPTIONAL,
- *     crlTime              [2]     EXPLICIT GeneralizedTime OPTIONAL }
- */
-typedef struct ocsp_crl_id_st {
-    ASN1_IA5STRING *crlUrl;
-    ASN1_INTEGER *crlNum;
-    ASN1_GENERALIZEDTIME *crlTime;
-} OCSP_CRLID;
-
-/*-
- * ServiceLocator ::= SEQUENCE {
- *      issuer    Name,
- *      locator   AuthorityInfoAccessSyntax OPTIONAL }
- */
-typedef struct ocsp_service_locator_st {
-    X509_NAME *issuer;
-    STACK_OF(ACCESS_DESCRIPTION) *locator;
-} OCSP_SERVICELOC;
-
-# define PEM_STRING_OCSP_REQUEST "OCSP REQUEST"
-# define PEM_STRING_OCSP_RESPONSE "OCSP RESPONSE"
-
-# define d2i_OCSP_REQUEST_bio(bp,p) ASN1_d2i_bio_of(OCSP_REQUEST,OCSP_REQUEST_new,d2i_OCSP_REQUEST,bp,p)
-
-# define d2i_OCSP_RESPONSE_bio(bp,p) ASN1_d2i_bio_of(OCSP_RESPONSE,OCSP_RESPONSE_new,d2i_OCSP_RESPONSE,bp,p)
-
-# define PEM_read_bio_OCSP_REQUEST(bp,x,cb) (OCSP_REQUEST *)PEM_ASN1_read_bio( \
-     (char *(*)())d2i_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,bp,(char **)x,cb,NULL)
-
-# define PEM_read_bio_OCSP_RESPONSE(bp,x,cb)(OCSP_RESPONSE *)PEM_ASN1_read_bio(\
-     (char *(*)())d2i_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,bp,(char **)x,cb,NULL)
-
-# define PEM_write_bio_OCSP_REQUEST(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_REQUEST,PEM_STRING_OCSP_REQUEST,\
-                        bp,(char *)o, NULL,NULL,0,NULL,NULL)
-
-# define PEM_write_bio_OCSP_RESPONSE(bp,o) \
-    PEM_ASN1_write_bio((int (*)())i2d_OCSP_RESPONSE,PEM_STRING_OCSP_RESPONSE,\
-                        bp,(char *)o, NULL,NULL,0,NULL,NULL)
-
-# define i2d_OCSP_RESPONSE_bio(bp,o) ASN1_i2d_bio_of(OCSP_RESPONSE,i2d_OCSP_RESPONSE,bp,o)
-
-# define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
-
-# define OCSP_REQUEST_sign(o,pkey,md) \
-        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\
-                o->optionalSignature->signatureAlgorithm,NULL,\
-                o->optionalSignature->signature,o->tbsRequest,pkey,md)
-
-# define OCSP_BASICRESP_sign(o,pkey,md,d) \
-        ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),o->signatureAlgorithm,NULL,\
-                o->signature,o->tbsResponseData,pkey,md)
-
-# define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\
-        a->optionalSignature->signatureAlgorithm,\
-        a->optionalSignature->signature,a->tbsRequest,r)
-
-# define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\
-        a->signatureAlgorithm,a->signature,a->tbsResponseData,r)
-
-# define ASN1_BIT_STRING_digest(data,type,md,len) \
-        ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
-
-# define OCSP_CERTSTATUS_dup(cs)\
-                (OCSP_CERTSTATUS*)ASN1_dup((int(*)())i2d_OCSP_CERTSTATUS,\
-                (char *(*)())d2i_OCSP_CERTSTATUS,(char *)(cs))
-
-OCSP_CERTID *OCSP_CERTID_dup(OCSP_CERTID *id);
-
-OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req);
-OCSP_REQ_CTX *OCSP_sendreq_new(BIO *io, char *path, OCSP_REQUEST *req,
-                               int maxline);
-int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx);
-void OCSP_REQ_CTX_free(OCSP_REQ_CTX *rctx);
-int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req);
-int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx,
-                             const char *name, const char *value);
-
-OCSP_CERTID *OCSP_cert_to_id(const EVP_MD *dgst, X509 *subject, X509 *issuer);
-
-OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst,
-                              X509_NAME *issuerName,
-                              ASN1_BIT_STRING *issuerKey,
-                              ASN1_INTEGER *serialNumber);
-
-OCSP_ONEREQ *OCSP_request_add0_id(OCSP_REQUEST *req, OCSP_CERTID *cid);
-
-int OCSP_request_add1_nonce(OCSP_REQUEST *req, unsigned char *val, int len);
-int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len);
-int OCSP_check_nonce(OCSP_REQUEST *req, OCSP_BASICRESP *bs);
-int OCSP_copy_nonce(OCSP_BASICRESP *resp, OCSP_REQUEST *req);
-
-int OCSP_request_set1_name(OCSP_REQUEST *req, X509_NAME *nm);
-int OCSP_request_add1_cert(OCSP_REQUEST *req, X509 *cert);
-
-int OCSP_request_sign(OCSP_REQUEST *req,
-                      X509 *signer,
-                      EVP_PKEY *key,
-                      const EVP_MD *dgst,
-                      STACK_OF(X509) *certs, unsigned long flags);
-
-int OCSP_response_status(OCSP_RESPONSE *resp);
-OCSP_BASICRESP *OCSP_response_get1_basic(OCSP_RESPONSE *resp);
-
-int OCSP_resp_count(OCSP_BASICRESP *bs);
-OCSP_SINGLERESP *OCSP_resp_get0(OCSP_BASICRESP *bs, int idx);
-int OCSP_resp_find(OCSP_BASICRESP *bs, OCSP_CERTID *id, int last);
-int OCSP_single_get0_status(OCSP_SINGLERESP *single, int *reason,
-                            ASN1_GENERALIZEDTIME **revtime,
-                            ASN1_GENERALIZEDTIME **thisupd,
-                            ASN1_GENERALIZEDTIME **nextupd);
-int OCSP_resp_find_status(OCSP_BASICRESP *bs, OCSP_CERTID *id, int *status,
-                          int *reason,
-                          ASN1_GENERALIZEDTIME **revtime,
-                          ASN1_GENERALIZEDTIME **thisupd,
-                          ASN1_GENERALIZEDTIME **nextupd);
-int OCSP_check_validity(ASN1_GENERALIZEDTIME *thisupd,
-                        ASN1_GENERALIZEDTIME *nextupd, long sec, long maxsec);
-
-int OCSP_request_verify(OCSP_REQUEST *req, STACK_OF(X509) *certs,
-                        X509_STORE *store, unsigned long flags);
-
-int OCSP_parse_url(char *url, char **phost, char **pport, char **ppath,
-                   int *pssl);
-
-int OCSP_id_issuer_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-int OCSP_id_cmp(OCSP_CERTID *a, OCSP_CERTID *b);
-
-int OCSP_request_onereq_count(OCSP_REQUEST *req);
-OCSP_ONEREQ *OCSP_request_onereq_get0(OCSP_REQUEST *req, int i);
-OCSP_CERTID *OCSP_onereq_get0_id(OCSP_ONEREQ *one);
-int OCSP_id_get0_info(ASN1_OCTET_STRING **piNameHash, ASN1_OBJECT **pmd,
-                      ASN1_OCTET_STRING **pikeyHash,
-                      ASN1_INTEGER **pserial, OCSP_CERTID *cid);
-int OCSP_request_is_signed(OCSP_REQUEST *req);
-OCSP_RESPONSE *OCSP_response_create(int status, OCSP_BASICRESP *bs);
-OCSP_SINGLERESP *OCSP_basic_add1_status(OCSP_BASICRESP *rsp,
-                                        OCSP_CERTID *cid,
-                                        int status, int reason,
-                                        ASN1_TIME *revtime,
-                                        ASN1_TIME *thisupd,
-                                        ASN1_TIME *nextupd);
-int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
-int OCSP_basic_sign(OCSP_BASICRESP *brsp,
-                    X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
-                    STACK_OF(X509) *certs, unsigned long flags);
-
-X509_EXTENSION *OCSP_crlID_new(char *url, long *n, char *tim);
-
-X509_EXTENSION *OCSP_accept_responses_new(char **oids);
-
-X509_EXTENSION *OCSP_archive_cutoff_new(char *tim);
-
-X509_EXTENSION *OCSP_url_svcloc_new(X509_NAME *issuer, char **urls);
-
-int OCSP_REQUEST_get_ext_count(OCSP_REQUEST *x);
-int OCSP_REQUEST_get_ext_by_NID(OCSP_REQUEST *x, int nid, int lastpos);
-int OCSP_REQUEST_get_ext_by_OBJ(OCSP_REQUEST *x, ASN1_OBJECT *obj,
-                                int lastpos);
-int OCSP_REQUEST_get_ext_by_critical(OCSP_REQUEST *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_REQUEST_get_ext(OCSP_REQUEST *x, int loc);
-X509_EXTENSION *OCSP_REQUEST_delete_ext(OCSP_REQUEST *x, int loc);
-void *OCSP_REQUEST_get1_ext_d2i(OCSP_REQUEST *x, int nid, int *crit,
-                                int *idx);
-int OCSP_REQUEST_add1_ext_i2d(OCSP_REQUEST *x, int nid, void *value, int crit,
-                              unsigned long flags);
-int OCSP_REQUEST_add_ext(OCSP_REQUEST *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_ONEREQ_get_ext_count(OCSP_ONEREQ *x);
-int OCSP_ONEREQ_get_ext_by_NID(OCSP_ONEREQ *x, int nid, int lastpos);
-int OCSP_ONEREQ_get_ext_by_OBJ(OCSP_ONEREQ *x, ASN1_OBJECT *obj, int lastpos);
-int OCSP_ONEREQ_get_ext_by_critical(OCSP_ONEREQ *x, int crit, int lastpos);
-X509_EXTENSION *OCSP_ONEREQ_get_ext(OCSP_ONEREQ *x, int loc);
-X509_EXTENSION *OCSP_ONEREQ_delete_ext(OCSP_ONEREQ *x, int loc);
-void *OCSP_ONEREQ_get1_ext_d2i(OCSP_ONEREQ *x, int nid, int *crit, int *idx);
-int OCSP_ONEREQ_add1_ext_i2d(OCSP_ONEREQ *x, int nid, void *value, int crit,
-                             unsigned long flags);
-int OCSP_ONEREQ_add_ext(OCSP_ONEREQ *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_BASICRESP_get_ext_count(OCSP_BASICRESP *x);
-int OCSP_BASICRESP_get_ext_by_NID(OCSP_BASICRESP *x, int nid, int lastpos);
-int OCSP_BASICRESP_get_ext_by_OBJ(OCSP_BASICRESP *x, ASN1_OBJECT *obj,
-                                  int lastpos);
-int OCSP_BASICRESP_get_ext_by_critical(OCSP_BASICRESP *x, int crit,
-                                       int lastpos);
-X509_EXTENSION *OCSP_BASICRESP_get_ext(OCSP_BASICRESP *x, int loc);
-X509_EXTENSION *OCSP_BASICRESP_delete_ext(OCSP_BASICRESP *x, int loc);
-void *OCSP_BASICRESP_get1_ext_d2i(OCSP_BASICRESP *x, int nid, int *crit,
-                                  int *idx);
-int OCSP_BASICRESP_add1_ext_i2d(OCSP_BASICRESP *x, int nid, void *value,
-                                int crit, unsigned long flags);
-int OCSP_BASICRESP_add_ext(OCSP_BASICRESP *x, X509_EXTENSION *ex, int loc);
-
-int OCSP_SINGLERESP_get_ext_count(OCSP_SINGLERESP *x);
-int OCSP_SINGLERESP_get_ext_by_NID(OCSP_SINGLERESP *x, int nid, int lastpos);
-int OCSP_SINGLERESP_get_ext_by_OBJ(OCSP_SINGLERESP *x, ASN1_OBJECT *obj,
-                                   int lastpos);
-int OCSP_SINGLERESP_get_ext_by_critical(OCSP_SINGLERESP *x, int crit,
-                                        int lastpos);
-X509_EXTENSION *OCSP_SINGLERESP_get_ext(OCSP_SINGLERESP *x, int loc);
-X509_EXTENSION *OCSP_SINGLERESP_delete_ext(OCSP_SINGLERESP *x, int loc);
-void *OCSP_SINGLERESP_get1_ext_d2i(OCSP_SINGLERESP *x, int nid, int *crit,
-                                   int *idx);
-int OCSP_SINGLERESP_add1_ext_i2d(OCSP_SINGLERESP *x, int nid, void *value,
-                                 int crit, unsigned long flags);
-int OCSP_SINGLERESP_add_ext(OCSP_SINGLERESP *x, X509_EXTENSION *ex, int loc);
-
-DECLARE_ASN1_FUNCTIONS(OCSP_SINGLERESP)
-DECLARE_ASN1_FUNCTIONS(OCSP_CERTSTATUS)
-DECLARE_ASN1_FUNCTIONS(OCSP_REVOKEDINFO)
-DECLARE_ASN1_FUNCTIONS(OCSP_BASICRESP)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPDATA)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPID)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPONSE)
-DECLARE_ASN1_FUNCTIONS(OCSP_RESPBYTES)
-DECLARE_ASN1_FUNCTIONS(OCSP_ONEREQ)
-DECLARE_ASN1_FUNCTIONS(OCSP_CERTID)
-DECLARE_ASN1_FUNCTIONS(OCSP_REQUEST)
-DECLARE_ASN1_FUNCTIONS(OCSP_SIGNATURE)
-DECLARE_ASN1_FUNCTIONS(OCSP_REQINFO)
-DECLARE_ASN1_FUNCTIONS(OCSP_CRLID)
-DECLARE_ASN1_FUNCTIONS(OCSP_SERVICELOC)
-
-const char *OCSP_response_status_str(long s);
-const char *OCSP_cert_status_str(long s);
-const char *OCSP_crl_reason_str(long s);
-
-int OCSP_REQUEST_print(BIO *bp, OCSP_REQUEST *a, unsigned long flags);
-int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE *o, unsigned long flags);
-
-int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
-                      X509_STORE *st, unsigned long flags);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_OCSP_strings(void);
-
-/* Error codes for the OCSP functions. */
-
-/* Function codes. */
-# define OCSP_F_ASN1_STRING_ENCODE                        100
-# define OCSP_F_D2I_OCSP_NONCE                            102
-# define OCSP_F_OCSP_BASIC_ADD1_STATUS                    103
-# define OCSP_F_OCSP_BASIC_SIGN                           104
-# define OCSP_F_OCSP_BASIC_VERIFY                         105
-# define OCSP_F_OCSP_CERT_ID_NEW                          101
-# define OCSP_F_OCSP_CHECK_DELEGATED                      106
-# define OCSP_F_OCSP_CHECK_IDS                            107
-# define OCSP_F_OCSP_CHECK_ISSUER                         108
-# define OCSP_F_OCSP_CHECK_VALIDITY                       115
-# define OCSP_F_OCSP_MATCH_ISSUERID                       109
-# define OCSP_F_OCSP_PARSE_URL                            114
-# define OCSP_F_OCSP_REQUEST_SIGN                         110
-# define OCSP_F_OCSP_REQUEST_VERIFY                       116
-# define OCSP_F_OCSP_RESPONSE_GET1_BASIC                  111
-# define OCSP_F_OCSP_SENDREQ_BIO                          112
-# define OCSP_F_OCSP_SENDREQ_NBIO                         117
-# define OCSP_F_PARSE_HTTP_LINE1                          118
-# define OCSP_F_REQUEST_VERIFY                            113
-
-/* Reason codes. */
-# define OCSP_R_BAD_DATA                                  100
-# define OCSP_R_CERTIFICATE_VERIFY_ERROR                  101
-# define OCSP_R_DIGEST_ERR                                102
-# define OCSP_R_ERROR_IN_NEXTUPDATE_FIELD                 122
-# define OCSP_R_ERROR_IN_THISUPDATE_FIELD                 123
-# define OCSP_R_ERROR_PARSING_URL                         121
-# define OCSP_R_MISSING_OCSPSIGNING_USAGE                 103
-# define OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE              124
-# define OCSP_R_NOT_BASIC_RESPONSE                        104
-# define OCSP_R_NO_CERTIFICATES_IN_CHAIN                  105
-# define OCSP_R_NO_CONTENT                                106
-# define OCSP_R_NO_PUBLIC_KEY                             107
-# define OCSP_R_NO_RESPONSE_DATA                          108
-# define OCSP_R_NO_REVOKED_TIME                           109
-# define OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE    110
-# define OCSP_R_REQUEST_NOT_SIGNED                        128
-# define OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA      111
-# define OCSP_R_ROOT_CA_NOT_TRUSTED                       112
-# define OCSP_R_SERVER_READ_ERROR                         113
-# define OCSP_R_SERVER_RESPONSE_ERROR                     114
-# define OCSP_R_SERVER_RESPONSE_PARSE_ERROR               115
-# define OCSP_R_SERVER_WRITE_ERROR                        116
-# define OCSP_R_SIGNATURE_FAILURE                         117
-# define OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND              118
-# define OCSP_R_STATUS_EXPIRED                            125
-# define OCSP_R_STATUS_NOT_YET_VALID                      126
-# define OCSP_R_STATUS_TOO_OLD                            127
-# define OCSP_R_UNKNOWN_MESSAGE_DIGEST                    119
-# define OCSP_R_UNKNOWN_NID                               120
-# define OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE            129
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/opensslconf.h b/include.new/openssl/opensslconf.h
deleted file mode 100644
index a99c27b..0000000
--- a/include.new/openssl/opensslconf.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/* $FreeBSD: releng/10.2/secure/lib/libcrypto/opensslconf-x86.h 280304 2015-03-20 21:54:45Z jkim $ */
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-/* OpenSSL was configured with the following options: */
-#ifndef OPENSSL_DOING_MAKEDEPEND
-
-
-#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-# define OPENSSL_NO_EC_NISTP_64_GCC_128
-#endif
-#ifndef OPENSSL_NO_GMP
-# define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_JPAKE
-# define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
-# define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_MD2
-# define OPENSSL_NO_MD2
-#endif
-#ifndef OPENSSL_NO_SCTP
-# define OPENSSL_NO_SCTP
-#endif
-#ifndef OPENSSL_NO_STORE
-# define OPENSSL_NO_STORE
-#endif
-#ifndef OPENSSL_NO_UNIT_TEST
-# define OPENSSL_NO_UNIT_TEST
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
-
-#ifndef OPENSSL_THREADS
-# define OPENSSL_THREADS
-#endif
-#ifndef OPENSSL_NO_STATIC_ENGINE
-# define OPENSSL_NO_STATIC_ENGINE
-#endif
-
-/* The OPENSSL_NO_* macros are also defined as NO_* if the application
-   asks for it.  This is a transient feature that is provided for those
-   who haven't had the time to do the appropriate changes in their
-   applications.  */
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
-#  define NO_EC_NISTP_64_GCC_128
-# endif
-# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
-#  define NO_GMP
-# endif
-# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
-#  define NO_JPAKE
-# endif
-# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
-#  define NO_KRB5
-# endif
-# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
-#  define NO_MD2
-# endif
-# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
-#  define NO_SCTP
-# endif
-# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
-#  define NO_STORE
-# endif
-# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
-#  define NO_UNIT_TEST
-# endif
-#endif
-
-#define OPENSSL_CPUID_OBJ
-
-/* crypto/opensslconf.h.in */
-
-/* Generate 80386 code? */
-#undef I386_ONLY
-
-#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/lib/engines"
-#define OPENSSLDIR "/etc/ssl"
-#endif
-#endif
-
-#undef OPENSSL_UNISTD
-#define OPENSSL_UNISTD <unistd.h>
-
-#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
-#endif
-
-#if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC2_H) && !defined(RC2_INT)
-/* I need to put in a mod for the alpha - eay */
-#define RC2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-/*
- * I don't know what does "most" mean, but declaring "int" is a must on:
- * - Intel P6 because partial register stalls are very expensive;
- * - elder Alpha because it lacks byte load/store instructions;
- */
-#define RC4_INT unsigned int
-#endif
-#if !defined(RC4_CHUNK)
-/*
- * This enables code handling data aligned at natural CPU word
- * boundary. See crypto/rc4/rc4_enc.c for further details.
- */
-#ifdef __LP64__
-#define RC4_CHUNK unsigned long
-#else
-#undef RC4_CHUNK
-#endif
-#endif
-#endif
-
-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * %20 speed up (longs are 8 bytes, int's are 4). */
-#ifndef DES_LONG
-#ifdef __LP64__
-#define DES_LONG unsigned int
-#else
-#define DES_LONG unsigned long
-#endif
-#endif
-#endif
-
-#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-#define CONFIG_HEADER_BN_H
-#ifdef __LP64__
-#undef BN_LLONG
-#else
-#define BN_LLONG
-#endif
-
-/* Should we define BN_DIV2W here? */
-
-/* Only one for the following should be defined */
-#ifdef __LP64__
-#define SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#undef THIRTY_TWO_BIT
-#else
-#undef SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#define THIRTY_TWO_BIT
-#endif
-#endif
-
-#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-#ifdef __LP64__
-#undef RC4_INDEX
-#else
-#define RC4_INDEX
-#endif
-#endif
-
-#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
-#undef BF_PTR
-#endif /* HEADER_BF_LOCL_H */
-
-#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
-#ifndef DES_DEFAULT_OPTIONS
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-#ifdef __LP64__
-#undef DES_PTR
-#else
-#define DES_PTR
-#endif
-#endif
-
-/* This helps C compiler generate the correct code for multiple functional
- * units.  It reduces register dependancies at the expense of 2 more
- * registers */
-#ifndef DES_RISC1
-#ifdef __LP64__
-#undef DES_RISC1
-#else
-#define DES_RISC1
-#endif
-#endif
-
-#ifndef DES_RISC2
-#undef DES_RISC2
-#endif
-
-#if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#endif
-
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-#define DES_UNROLL
-#endif
-
-/* These default values were supplied by
- * Peter Gutman <pgut001@cs.auckland.ac.nz>
- * They are only used if nothing else has been defined */
-#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-/* Special defines which change the way the code is built depending on the
-   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
-   even newer MIPS CPU's, but at the moment one size fits all for
-   optimization options.  Older Sparc's work better with only UNROLL, but
-   there's no way to tell at compile time what it is you're running on */
- 
-#if defined( sun )		/* Newer Sparc's */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#elif defined( __ultrix )	/* Older MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined( __osf1__ )	/* Alpha */
-#  define DES_PTR
-#  define DES_RISC2
-#elif defined ( _AIX )		/* RS6000 */
-  /* Unknown */
-#elif defined( __hpux )		/* HP-PA */
-  /* Unknown */
-#elif defined( __aux )		/* 68K */
-  /* Unknown */
-#elif defined( __dgux )		/* 88K (but P6 in latest boxes) */
-#  define DES_UNROLL
-#elif defined( __sgi )		/* Newer MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#endif /* Systems-specific speed defines */
-#endif
-
-#endif /* DES_DEFAULT_OPTIONS */
-#endif /* HEADER_DES_LOCL_H */
-#ifdef  __cplusplus
-}
-#endif
diff --git a/include.new/openssl/opensslv.h b/include.new/openssl/opensslv.h
deleted file mode 100644
index b02adfa..0000000
--- a/include.new/openssl/opensslv.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef HEADER_OPENSSLV_H
-# define HEADER_OPENSSLV_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*-
- * Numeric release version identifier:
- * MNNFFPPS: major minor fix patch status
- * The status nibble has one of the values 0 for development, 1 to e for betas
- * 1 to 14, and f for release.  The patch level is exactly that.
- * For example:
- * 0.9.3-dev      0x00903000
- * 0.9.3-beta1    0x00903001
- * 0.9.3-beta2-dev 0x00903002
- * 0.9.3-beta2    0x00903002 (same as ...beta2-dev)
- * 0.9.3          0x0090300f
- * 0.9.3a         0x0090301f
- * 0.9.4          0x0090400f
- * 1.2.3z         0x102031af
- *
- * For continuity reasons (because 0.9.5 is already out, and is coded
- * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level
- * part is slightly different, by setting the highest bit.  This means
- * that 0.9.5a looks like this: 0x0090581f.  At 0.9.6, we can start
- * with 0x0090600S...
- *
- * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.)
- * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
- *  major minor fix final patch/beta)
- */
-# define OPENSSL_VERSION_NUMBER  0x1000110fL
-# ifdef OPENSSL_FIPS
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1p-fips 9 Jul 2015"
-# else
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.1p-freebsd 9 Jul 2015"
-# endif
-# define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
-
-/*-
- * The macros below are to be used for shared library (.so, .dll, ...)
- * versioning.  That kind of versioning works a bit differently between
- * operating systems.  The most usual scheme is to set a major and a minor
- * number, and have the runtime loader check that the major number is equal
- * to what it was at application link time, while the minor number has to
- * be greater or equal to what it was at application link time.  With this
- * scheme, the version number is usually part of the file name, like this:
- *
- *      libcrypto.so.0.9
- *
- * Some unixen also make a softlink with the major verson number only:
- *
- *      libcrypto.so.0
- *
- * On Tru64 and IRIX 6.x it works a little bit differently.  There, the
- * shared library version is stored in the file, and is actually a series
- * of versions, separated by colons.  The rightmost version present in the
- * library when linking an application is stored in the application to be
- * matched at run time.  When the application is run, a check is done to
- * see if the library version stored in the application matches any of the
- * versions in the version string of the library itself.
- * This version string can be constructed in any way, depending on what
- * kind of matching is desired.  However, to implement the same scheme as
- * the one used in the other unixen, all compatible versions, from lowest
- * to highest, should be part of the string.  Consecutive builds would
- * give the following versions strings:
- *
- *      3.0
- *      3.0:3.1
- *      3.0:3.1:3.2
- *      4.0
- *      4.0:4.1
- *
- * Notice how version 4 is completely incompatible with version, and
- * therefore give the breach you can see.
- *
- * There may be other schemes as well that I haven't yet discovered.
- *
- * So, here's the way it works here: first of all, the library version
- * number doesn't need at all to match the overall OpenSSL version.
- * However, it's nice and more understandable if it actually does.
- * The current library version is stored in the macro SHLIB_VERSION_NUMBER,
- * which is just a piece of text in the format "M.m.e" (Major, minor, edit).
- * For the sake of Tru64, IRIX, and any other OS that behaves in similar ways,
- * we need to keep a history of version numbers, which is done in the
- * macro SHLIB_VERSION_HISTORY.  The numbers are separated by colons and
- * should only keep the versions that are binary compatible with the current.
- */
-# define SHLIB_VERSION_HISTORY ""
-# define SHLIB_VERSION_NUMBER "7"
-
-
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* HEADER_OPENSSLV_H */
diff --git a/include.new/openssl/ossl_typ.h b/include.new/openssl/ossl_typ.h
deleted file mode 100644
index 0fcb0ce..0000000
--- a/include.new/openssl/ossl_typ.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_OPENSSL_TYPES_H
-# define HEADER_OPENSSL_TYPES_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# include <openssl/e_os2.h>
-
-# ifdef NO_ASN1_TYPEDEFS
-#  define ASN1_INTEGER            ASN1_STRING
-#  define ASN1_ENUMERATED         ASN1_STRING
-#  define ASN1_BIT_STRING         ASN1_STRING
-#  define ASN1_OCTET_STRING       ASN1_STRING
-#  define ASN1_PRINTABLESTRING    ASN1_STRING
-#  define ASN1_T61STRING          ASN1_STRING
-#  define ASN1_IA5STRING          ASN1_STRING
-#  define ASN1_UTCTIME            ASN1_STRING
-#  define ASN1_GENERALIZEDTIME    ASN1_STRING
-#  define ASN1_TIME               ASN1_STRING
-#  define ASN1_GENERALSTRING      ASN1_STRING
-#  define ASN1_UNIVERSALSTRING    ASN1_STRING
-#  define ASN1_BMPSTRING          ASN1_STRING
-#  define ASN1_VISIBLESTRING      ASN1_STRING
-#  define ASN1_UTF8STRING         ASN1_STRING
-#  define ASN1_BOOLEAN            int
-#  define ASN1_NULL               int
-# else
-typedef struct asn1_string_st ASN1_INTEGER;
-typedef struct asn1_string_st ASN1_ENUMERATED;
-typedef struct asn1_string_st ASN1_BIT_STRING;
-typedef struct asn1_string_st ASN1_OCTET_STRING;
-typedef struct asn1_string_st ASN1_PRINTABLESTRING;
-typedef struct asn1_string_st ASN1_T61STRING;
-typedef struct asn1_string_st ASN1_IA5STRING;
-typedef struct asn1_string_st ASN1_GENERALSTRING;
-typedef struct asn1_string_st ASN1_UNIVERSALSTRING;
-typedef struct asn1_string_st ASN1_BMPSTRING;
-typedef struct asn1_string_st ASN1_UTCTIME;
-typedef struct asn1_string_st ASN1_TIME;
-typedef struct asn1_string_st ASN1_GENERALIZEDTIME;
-typedef struct asn1_string_st ASN1_VISIBLESTRING;
-typedef struct asn1_string_st ASN1_UTF8STRING;
-typedef struct asn1_string_st ASN1_STRING;
-typedef int ASN1_BOOLEAN;
-typedef int ASN1_NULL;
-# endif
-
-typedef struct ASN1_ITEM_st ASN1_ITEM;
-typedef struct asn1_pctx_st ASN1_PCTX;
-
-# ifdef OPENSSL_SYS_WIN32
-#  undef X509_NAME
-#  undef X509_EXTENSIONS
-#  undef X509_CERT_PAIR
-#  undef PKCS7_ISSUER_AND_SERIAL
-#  undef OCSP_REQUEST
-#  undef OCSP_RESPONSE
-# endif
-
-# ifdef BIGNUM
-#  undef BIGNUM
-# endif
-typedef struct bignum_st BIGNUM;
-typedef struct bignum_ctx BN_CTX;
-typedef struct bn_blinding_st BN_BLINDING;
-typedef struct bn_mont_ctx_st BN_MONT_CTX;
-typedef struct bn_recp_ctx_st BN_RECP_CTX;
-typedef struct bn_gencb_st BN_GENCB;
-
-typedef struct buf_mem_st BUF_MEM;
-
-typedef struct evp_cipher_st EVP_CIPHER;
-typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX;
-typedef struct env_md_st EVP_MD;
-typedef struct env_md_ctx_st EVP_MD_CTX;
-typedef struct evp_pkey_st EVP_PKEY;
-
-typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD;
-
-typedef struct evp_pkey_method_st EVP_PKEY_METHOD;
-typedef struct evp_pkey_ctx_st EVP_PKEY_CTX;
-
-typedef struct dh_st DH;
-typedef struct dh_method DH_METHOD;
-
-typedef struct dsa_st DSA;
-typedef struct dsa_method DSA_METHOD;
-
-typedef struct rsa_st RSA;
-typedef struct rsa_meth_st RSA_METHOD;
-
-typedef struct rand_meth_st RAND_METHOD;
-
-typedef struct ecdh_method ECDH_METHOD;
-typedef struct ecdsa_method ECDSA_METHOD;
-
-typedef struct x509_st X509;
-typedef struct X509_algor_st X509_ALGOR;
-typedef struct X509_crl_st X509_CRL;
-typedef struct x509_crl_method_st X509_CRL_METHOD;
-typedef struct x509_revoked_st X509_REVOKED;
-typedef struct X509_name_st X509_NAME;
-typedef struct X509_pubkey_st X509_PUBKEY;
-typedef struct x509_store_st X509_STORE;
-typedef struct x509_store_ctx_st X509_STORE_CTX;
-
-typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;
-
-typedef struct v3_ext_ctx X509V3_CTX;
-typedef struct conf_st CONF;
-
-typedef struct store_st STORE;
-typedef struct store_method_st STORE_METHOD;
-
-typedef struct ui_st UI;
-typedef struct ui_method_st UI_METHOD;
-
-typedef struct st_ERR_FNS ERR_FNS;
-
-typedef struct engine_st ENGINE;
-typedef struct ssl_st SSL;
-typedef struct ssl_ctx_st SSL_CTX;
-
-typedef struct X509_POLICY_NODE_st X509_POLICY_NODE;
-typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL;
-typedef struct X509_POLICY_TREE_st X509_POLICY_TREE;
-typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE;
-
-typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID;
-typedef struct DIST_POINT_st DIST_POINT;
-typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT;
-typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS;
-
-  /* If placed in pkcs12.h, we end up with a circular depency with pkcs7.h */
-# define DECLARE_PKCS12_STACK_OF(type)/* Nothing */
-# define IMPLEMENT_PKCS12_STACK_OF(type)/* Nothing */
-
-typedef struct crypto_ex_data_st CRYPTO_EX_DATA;
-/* Callback types for crypto.h */
-typedef int CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                           int idx, long argl, void *argp);
-typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
-                             int idx, long argl, void *argp);
-typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,
-                           void *from_d, int idx, long argl, void *argp);
-
-typedef struct ocsp_req_ctx_st OCSP_REQ_CTX;
-typedef struct ocsp_response_st OCSP_RESPONSE;
-typedef struct ocsp_responder_id_st OCSP_RESPID;
-
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* def HEADER_OPENSSL_TYPES_H */
diff --git a/include.new/openssl/pem.h b/include.new/openssl/pem.h
deleted file mode 100644
index 2cdad8a..0000000
--- a/include.new/openssl/pem.h
+++ /dev/null
@@ -1,611 +0,0 @@
-/* crypto/pem/pem.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_PEM_H
-# define HEADER_PEM_H
-
-# include <openssl/e_os2.h>
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# ifndef OPENSSL_NO_STACK
-#  include <openssl/stack.h>
-# endif
-# include <openssl/evp.h>
-# include <openssl/x509.h>
-# include <openssl/pem2.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define PEM_BUFSIZE             1024
-
-# define PEM_OBJ_UNDEF           0
-# define PEM_OBJ_X509            1
-# define PEM_OBJ_X509_REQ        2
-# define PEM_OBJ_CRL             3
-# define PEM_OBJ_SSL_SESSION     4
-# define PEM_OBJ_PRIV_KEY        10
-# define PEM_OBJ_PRIV_RSA        11
-# define PEM_OBJ_PRIV_DSA        12
-# define PEM_OBJ_PRIV_DH         13
-# define PEM_OBJ_PUB_RSA         14
-# define PEM_OBJ_PUB_DSA         15
-# define PEM_OBJ_PUB_DH          16
-# define PEM_OBJ_DHPARAMS        17
-# define PEM_OBJ_DSAPARAMS       18
-# define PEM_OBJ_PRIV_RSA_PUBLIC 19
-# define PEM_OBJ_PRIV_ECDSA      20
-# define PEM_OBJ_PUB_ECDSA       21
-# define PEM_OBJ_ECPARAMETERS    22
-
-# define PEM_ERROR               30
-# define PEM_DEK_DES_CBC         40
-# define PEM_DEK_IDEA_CBC        45
-# define PEM_DEK_DES_EDE         50
-# define PEM_DEK_DES_ECB         60
-# define PEM_DEK_RSA             70
-# define PEM_DEK_RSA_MD2         80
-# define PEM_DEK_RSA_MD5         90
-
-# define PEM_MD_MD2              NID_md2
-# define PEM_MD_MD5              NID_md5
-# define PEM_MD_SHA              NID_sha
-# define PEM_MD_MD2_RSA          NID_md2WithRSAEncryption
-# define PEM_MD_MD5_RSA          NID_md5WithRSAEncryption
-# define PEM_MD_SHA_RSA          NID_sha1WithRSAEncryption
-
-# define PEM_STRING_X509_OLD     "X509 CERTIFICATE"
-# define PEM_STRING_X509         "CERTIFICATE"
-# define PEM_STRING_X509_PAIR    "CERTIFICATE PAIR"
-# define PEM_STRING_X509_TRUSTED "TRUSTED CERTIFICATE"
-# define PEM_STRING_X509_REQ_OLD "NEW CERTIFICATE REQUEST"
-# define PEM_STRING_X509_REQ     "CERTIFICATE REQUEST"
-# define PEM_STRING_X509_CRL     "X509 CRL"
-# define PEM_STRING_EVP_PKEY     "ANY PRIVATE KEY"
-# define PEM_STRING_PUBLIC       "PUBLIC KEY"
-# define PEM_STRING_RSA          "RSA PRIVATE KEY"
-# define PEM_STRING_RSA_PUBLIC   "RSA PUBLIC KEY"
-# define PEM_STRING_DSA          "DSA PRIVATE KEY"
-# define PEM_STRING_DSA_PUBLIC   "DSA PUBLIC KEY"
-# define PEM_STRING_PKCS7        "PKCS7"
-# define PEM_STRING_PKCS7_SIGNED "PKCS #7 SIGNED DATA"
-# define PEM_STRING_PKCS8        "ENCRYPTED PRIVATE KEY"
-# define PEM_STRING_PKCS8INF     "PRIVATE KEY"
-# define PEM_STRING_DHPARAMS     "DH PARAMETERS"
-# define PEM_STRING_SSL_SESSION  "SSL SESSION PARAMETERS"
-# define PEM_STRING_DSAPARAMS    "DSA PARAMETERS"
-# define PEM_STRING_ECDSA_PUBLIC "ECDSA PUBLIC KEY"
-# define PEM_STRING_ECPARAMETERS "EC PARAMETERS"
-# define PEM_STRING_ECPRIVATEKEY "EC PRIVATE KEY"
-# define PEM_STRING_PARAMETERS   "PARAMETERS"
-# define PEM_STRING_CMS          "CMS"
-
-  /*
-   * Note that this structure is initialised by PEM_SealInit and cleaned up
-   * by PEM_SealFinal (at least for now)
-   */
-typedef struct PEM_Encode_Seal_st {
-    EVP_ENCODE_CTX encode;
-    EVP_MD_CTX md;
-    EVP_CIPHER_CTX cipher;
-} PEM_ENCODE_SEAL_CTX;
-
-/* enc_type is one off */
-# define PEM_TYPE_ENCRYPTED      10
-# define PEM_TYPE_MIC_ONLY       20
-# define PEM_TYPE_MIC_CLEAR      30
-# define PEM_TYPE_CLEAR          40
-
-typedef struct pem_recip_st {
-    char *name;
-    X509_NAME *dn;
-    int cipher;
-    int key_enc;
-    /*      char iv[8]; unused and wrong size */
-} PEM_USER;
-
-typedef struct pem_ctx_st {
-    int type;                   /* what type of object */
-    struct {
-        int version;
-        int mode;
-    } proc_type;
-
-    char *domain;
-
-    struct {
-        int cipher;
-        /*-
-        unused, and wrong size
-        unsigned char iv[8]; */
-    } DEK_info;
-
-    PEM_USER *originator;
-
-    int num_recipient;
-    PEM_USER **recipient;
-
-/*-
-    XXX(ben): don#t think this is used!
-        STACK *x509_chain;      / * certificate chain */
-    EVP_MD *md;                 /* signature type */
-
-    int md_enc;                 /* is the md encrypted or not? */
-    int md_len;                 /* length of md_data */
-    char *md_data;              /* message digest, could be pkey encrypted */
-
-    EVP_CIPHER *dec;            /* date encryption cipher */
-    int key_len;                /* key length */
-    unsigned char *key;         /* key */
-  /*-
-    unused, and wrong size
-    unsigned char iv[8]; */
-
-    int data_enc;               /* is the data encrypted */
-    int data_len;
-    unsigned char *data;
-} PEM_CTX;
-
-/*
- * These macros make the PEM_read/PEM_write functions easier to maintain and
- * write. Now they are all implemented with either: IMPLEMENT_PEM_rw(...) or
- * IMPLEMENT_PEM_rw_cb(...)
- */
-
-# ifdef OPENSSL_NO_FP_API
-
-#  define IMPLEMENT_PEM_read_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) /**/
-#  define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) /**/
-# else
-
-#  define IMPLEMENT_PEM_read_fp(name, type, str, asn1) \
-type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return PEM_ASN1_read((d2i_of_void *)d2i_##asn1, str,fp,(void **)x,cb,u); \
-}
-
-#  define IMPLEMENT_PEM_write_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x) \
-{ \
-return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,NULL,NULL,0,NULL,NULL); \
-}
-
-#  define IMPLEMENT_PEM_write_fp_const(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, const type *x) \
-{ \
-return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,(void *)x,NULL,NULL,0,NULL,NULL); \
-}
-
-#  define IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, \
-                  void *u) \
-        { \
-        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
-        }
-
-#  define IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1) \
-int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, \
-                  void *u) \
-        { \
-        return PEM_ASN1_write((i2d_of_void *)i2d_##asn1,str,fp,x,enc,kstr,klen,cb,u); \
-        }
-
-# endif
-
-# define IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u)\
-{ \
-return PEM_ASN1_read_bio((d2i_of_void *)d2i_##asn1, str,bp,(void **)x,cb,u); \
-}
-
-# define IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x) \
-{ \
-return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,NULL,NULL,0,NULL,NULL); \
-}
-
-# define IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, const type *x) \
-{ \
-return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,NULL,NULL,0,NULL,NULL); \
-}
-
-# define IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
-        { \
-        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,x,enc,kstr,klen,cb,u); \
-        }
-
-# define IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
-int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u) \
-        { \
-        return PEM_ASN1_write_bio((i2d_of_void *)i2d_##asn1,str,bp,(void *)x,enc,kstr,klen,cb,u); \
-        }
-
-# define IMPLEMENT_PEM_write(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_fp(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_write_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_bio_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_fp_const(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_write_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_fp(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_write_cb_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_bio_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb_fp_const(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_bio(name, type, str, asn1) \
-        IMPLEMENT_PEM_read_fp(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_rw(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_rw_const(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_const(name, type, str, asn1)
-
-# define IMPLEMENT_PEM_rw_cb(name, type, str, asn1) \
-        IMPLEMENT_PEM_read(name, type, str, asn1) \
-        IMPLEMENT_PEM_write_cb(name, type, str, asn1)
-
-/* These are the same except they are for the declarations */
-
-# if defined(OPENSSL_NO_FP_API)
-
-#  define DECLARE_PEM_read_fp(name, type) /**/
-#  define DECLARE_PEM_write_fp(name, type) /**/
-#  define DECLARE_PEM_write_cb_fp(name, type) /**/
-# else
-
-#  define DECLARE_PEM_read_fp(name, type) \
-        type *PEM_read_##name(FILE *fp, type **x, pem_password_cb *cb, void *u);
-
-#  define DECLARE_PEM_write_fp(name, type) \
-        int PEM_write_##name(FILE *fp, type *x);
-
-#  define DECLARE_PEM_write_fp_const(name, type) \
-        int PEM_write_##name(FILE *fp, const type *x);
-
-#  define DECLARE_PEM_write_cb_fp(name, type) \
-        int PEM_write_##name(FILE *fp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-# endif
-
-# ifndef OPENSSL_NO_BIO
-#  define DECLARE_PEM_read_bio(name, type) \
-        type *PEM_read_bio_##name(BIO *bp, type **x, pem_password_cb *cb, void *u);
-
-#  define DECLARE_PEM_write_bio(name, type) \
-        int PEM_write_bio_##name(BIO *bp, type *x);
-
-#  define DECLARE_PEM_write_bio_const(name, type) \
-        int PEM_write_bio_##name(BIO *bp, const type *x);
-
-#  define DECLARE_PEM_write_cb_bio(name, type) \
-        int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
-             unsigned char *kstr, int klen, pem_password_cb *cb, void *u);
-
-# else
-
-#  define DECLARE_PEM_read_bio(name, type) /**/
-#  define DECLARE_PEM_write_bio(name, type) /**/
-#  define DECLARE_PEM_write_bio_const(name, type) /**/
-#  define DECLARE_PEM_write_cb_bio(name, type) /**/
-# endif
-# define DECLARE_PEM_write(name, type) \
-        DECLARE_PEM_write_bio(name, type) \
-        DECLARE_PEM_write_fp(name, type)
-# define DECLARE_PEM_write_const(name, type) \
-        DECLARE_PEM_write_bio_const(name, type) \
-        DECLARE_PEM_write_fp_const(name, type)
-# define DECLARE_PEM_write_cb(name, type) \
-        DECLARE_PEM_write_cb_bio(name, type) \
-        DECLARE_PEM_write_cb_fp(name, type)
-# define DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_read_bio(name, type) \
-        DECLARE_PEM_read_fp(name, type)
-# define DECLARE_PEM_rw(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write(name, type)
-# define DECLARE_PEM_rw_const(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write_const(name, type)
-# define DECLARE_PEM_rw_cb(name, type) \
-        DECLARE_PEM_read(name, type) \
-        DECLARE_PEM_write_cb(name, type)
-# if 1
-/* "userdata": new with OpenSSL 0.9.4 */
-typedef int pem_password_cb (char *buf, int size, int rwflag, void *userdata);
-# else
-/* OpenSSL 0.9.3, 0.9.3a */
-typedef int pem_password_cb (char *buf, int size, int rwflag);
-# endif
-
-int PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
-int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *len,
-                  pem_password_cb *callback, void *u);
-
-# ifndef OPENSSL_NO_BIO
-int PEM_read_bio(BIO *bp, char **name, char **header,
-                 unsigned char **data, long *len);
-int PEM_write_bio(BIO *bp, const char *name, char *hdr, unsigned char *data,
-                  long len);
-int PEM_bytes_read_bio(unsigned char **pdata, long *plen, char **pnm,
-                       const char *name, BIO *bp, pem_password_cb *cb,
-                       void *u);
-void *PEM_ASN1_read_bio(d2i_of_void *d2i, const char *name, BIO *bp, void **x,
-                        pem_password_cb *cb, void *u);
-int PEM_ASN1_write_bio(i2d_of_void *i2d, const char *name, BIO *bp, void *x,
-                       const EVP_CIPHER *enc, unsigned char *kstr, int klen,
-                       pem_password_cb *cb, void *u);
-
-STACK_OF(X509_INFO) *PEM_X509_INFO_read_bio(BIO *bp, STACK_OF(X509_INFO) *sk,
-                                            pem_password_cb *cb, void *u);
-int PEM_X509_INFO_write_bio(BIO *bp, X509_INFO *xi, EVP_CIPHER *enc,
-                            unsigned char *kstr, int klen,
-                            pem_password_cb *cd, void *u);
-# endif
-
-int PEM_read(FILE *fp, char **name, char **header,
-             unsigned char **data, long *len);
-int PEM_write(FILE *fp, char *name, char *hdr, unsigned char *data, long len);
-void *PEM_ASN1_read(d2i_of_void *d2i, const char *name, FILE *fp, void **x,
-                    pem_password_cb *cb, void *u);
-int PEM_ASN1_write(i2d_of_void *i2d, const char *name, FILE *fp,
-                   void *x, const EVP_CIPHER *enc, unsigned char *kstr,
-                   int klen, pem_password_cb *callback, void *u);
-STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk,
-                                        pem_password_cb *cb, void *u);
-
-int PEM_SealInit(PEM_ENCODE_SEAL_CTX *ctx, EVP_CIPHER *type,
-                 EVP_MD *md_type, unsigned char **ek, int *ekl,
-                 unsigned char *iv, EVP_PKEY **pubk, int npubk);
-void PEM_SealUpdate(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *out, int *outl,
-                    unsigned char *in, int inl);
-int PEM_SealFinal(PEM_ENCODE_SEAL_CTX *ctx, unsigned char *sig, int *sigl,
-                  unsigned char *out, int *outl, EVP_PKEY *priv);
-
-void PEM_SignInit(EVP_MD_CTX *ctx, EVP_MD *type);
-void PEM_SignUpdate(EVP_MD_CTX *ctx, unsigned char *d, unsigned int cnt);
-int PEM_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
-                  unsigned int *siglen, EVP_PKEY *pkey);
-
-int PEM_def_callback(char *buf, int num, int w, void *key);
-void PEM_proc_type(char *buf, int type);
-void PEM_dek_info(char *buf, const char *type, int len, char *str);
-
-# include <openssl/symhacks.h>
-
-DECLARE_PEM_rw(X509, X509)
-DECLARE_PEM_rw(X509_AUX, X509)
-DECLARE_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR)
-DECLARE_PEM_rw(X509_REQ, X509_REQ)
-DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)
-DECLARE_PEM_rw(X509_CRL, X509_CRL)
-DECLARE_PEM_rw(PKCS7, PKCS7)
-DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
-DECLARE_PEM_rw(PKCS8, X509_SIG)
-DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
-# ifndef OPENSSL_NO_RSA
-DECLARE_PEM_rw_cb(RSAPrivateKey, RSA)
-DECLARE_PEM_rw_const(RSAPublicKey, RSA)
-DECLARE_PEM_rw(RSA_PUBKEY, RSA)
-# endif
-# ifndef OPENSSL_NO_DSA
-DECLARE_PEM_rw_cb(DSAPrivateKey, DSA)
-DECLARE_PEM_rw(DSA_PUBKEY, DSA)
-DECLARE_PEM_rw_const(DSAparams, DSA)
-# endif
-# ifndef OPENSSL_NO_EC
-DECLARE_PEM_rw_const(ECPKParameters, EC_GROUP)
-DECLARE_PEM_rw_cb(ECPrivateKey, EC_KEY)
-DECLARE_PEM_rw(EC_PUBKEY, EC_KEY)
-# endif
-# ifndef OPENSSL_NO_DH
-DECLARE_PEM_rw_const(DHparams, DH)
-# endif
-DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
-DECLARE_PEM_rw(PUBKEY, EVP_PKEY)
-
-int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid,
-                                      char *kstr, int klen,
-                                      pem_password_cb *cb, void *u);
-int PEM_write_bio_PKCS8PrivateKey(BIO *, EVP_PKEY *, const EVP_CIPHER *,
-                                  char *, int, pem_password_cb *, void *);
-int i2d_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                            char *kstr, int klen,
-                            pem_password_cb *cb, void *u);
-int i2d_PKCS8PrivateKey_nid_bio(BIO *bp, EVP_PKEY *x, int nid,
-                                char *kstr, int klen,
-                                pem_password_cb *cb, void *u);
-EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb,
-                                  void *u);
-
-int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                           char *kstr, int klen,
-                           pem_password_cb *cb, void *u);
-int i2d_PKCS8PrivateKey_nid_fp(FILE *fp, EVP_PKEY *x, int nid,
-                               char *kstr, int klen,
-                               pem_password_cb *cb, void *u);
-int PEM_write_PKCS8PrivateKey_nid(FILE *fp, EVP_PKEY *x, int nid,
-                                  char *kstr, int klen,
-                                  pem_password_cb *cb, void *u);
-
-EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb,
-                                 void *u);
-
-int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc,
-                              char *kstr, int klen, pem_password_cb *cd,
-                              void *u);
-
-EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x);
-int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x);
-
-EVP_PKEY *b2i_PrivateKey(const unsigned char **in, long length);
-EVP_PKEY *b2i_PublicKey(const unsigned char **in, long length);
-EVP_PKEY *b2i_PrivateKey_bio(BIO *in);
-EVP_PKEY *b2i_PublicKey_bio(BIO *in);
-int i2b_PrivateKey_bio(BIO *out, EVP_PKEY *pk);
-int i2b_PublicKey_bio(BIO *out, EVP_PKEY *pk);
-# ifndef OPENSSL_NO_RC4
-EVP_PKEY *b2i_PVK_bio(BIO *in, pem_password_cb *cb, void *u);
-int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel,
-                pem_password_cb *cb, void *u);
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_PEM_strings(void);
-
-/* Error codes for the PEM functions. */
-
-/* Function codes. */
-# define PEM_F_B2I_DSS                                    127
-# define PEM_F_B2I_PVK_BIO                                128
-# define PEM_F_B2I_RSA                                    129
-# define PEM_F_CHECK_BITLEN_DSA                           130
-# define PEM_F_CHECK_BITLEN_RSA                           131
-# define PEM_F_D2I_PKCS8PRIVATEKEY_BIO                    120
-# define PEM_F_D2I_PKCS8PRIVATEKEY_FP                     121
-# define PEM_F_DO_B2I                                     132
-# define PEM_F_DO_B2I_BIO                                 133
-# define PEM_F_DO_BLOB_HEADER                             134
-# define PEM_F_DO_PK8PKEY                                 126
-# define PEM_F_DO_PK8PKEY_FP                              125
-# define PEM_F_DO_PVK_BODY                                135
-# define PEM_F_DO_PVK_HEADER                              136
-# define PEM_F_I2B_PVK                                    137
-# define PEM_F_I2B_PVK_BIO                                138
-# define PEM_F_LOAD_IV                                    101
-# define PEM_F_PEM_ASN1_READ                              102
-# define PEM_F_PEM_ASN1_READ_BIO                          103
-# define PEM_F_PEM_ASN1_WRITE                             104
-# define PEM_F_PEM_ASN1_WRITE_BIO                         105
-# define PEM_F_PEM_DEF_CALLBACK                           100
-# define PEM_F_PEM_DO_HEADER                              106
-# define PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY            118
-# define PEM_F_PEM_GET_EVP_CIPHER_INFO                    107
-# define PEM_F_PEM_PK8PKEY                                119
-# define PEM_F_PEM_READ                                   108
-# define PEM_F_PEM_READ_BIO                               109
-# define PEM_F_PEM_READ_BIO_PARAMETERS                    140
-# define PEM_F_PEM_READ_BIO_PRIVATEKEY                    123
-# define PEM_F_PEM_READ_PRIVATEKEY                        124
-# define PEM_F_PEM_SEALFINAL                              110
-# define PEM_F_PEM_SEALINIT                               111
-# define PEM_F_PEM_SIGNFINAL                              112
-# define PEM_F_PEM_WRITE                                  113
-# define PEM_F_PEM_WRITE_BIO                              114
-# define PEM_F_PEM_WRITE_PRIVATEKEY                       139
-# define PEM_F_PEM_X509_INFO_READ                         115
-# define PEM_F_PEM_X509_INFO_READ_BIO                     116
-# define PEM_F_PEM_X509_INFO_WRITE_BIO                    117
-
-/* Reason codes. */
-# define PEM_R_BAD_BASE64_DECODE                          100
-# define PEM_R_BAD_DECRYPT                                101
-# define PEM_R_BAD_END_LINE                               102
-# define PEM_R_BAD_IV_CHARS                               103
-# define PEM_R_BAD_MAGIC_NUMBER                           116
-# define PEM_R_BAD_PASSWORD_READ                          104
-# define PEM_R_BAD_VERSION_NUMBER                         117
-# define PEM_R_BIO_WRITE_FAILURE                          118
-# define PEM_R_CIPHER_IS_NULL                             127
-# define PEM_R_ERROR_CONVERTING_PRIVATE_KEY               115
-# define PEM_R_EXPECTING_PRIVATE_KEY_BLOB                 119
-# define PEM_R_EXPECTING_PUBLIC_KEY_BLOB                  120
-# define PEM_R_INCONSISTENT_HEADER                        121
-# define PEM_R_KEYBLOB_HEADER_PARSE_ERROR                 122
-# define PEM_R_KEYBLOB_TOO_SHORT                          123
-# define PEM_R_NOT_DEK_INFO                               105
-# define PEM_R_NOT_ENCRYPTED                              106
-# define PEM_R_NOT_PROC_TYPE                              107
-# define PEM_R_NO_START_LINE                              108
-# define PEM_R_PROBLEMS_GETTING_PASSWORD                  109
-# define PEM_R_PUBLIC_KEY_NO_RSA                          110
-# define PEM_R_PVK_DATA_TOO_SHORT                         124
-# define PEM_R_PVK_TOO_SHORT                              125
-# define PEM_R_READ_KEY                                   111
-# define PEM_R_SHORT_HEADER                               112
-# define PEM_R_UNSUPPORTED_CIPHER                         113
-# define PEM_R_UNSUPPORTED_ENCRYPTION                     114
-# define PEM_R_UNSUPPORTED_KEY_COMPONENTS                 126
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/pem2.h b/include.new/openssl/pem2.h
deleted file mode 100644
index 84897d5..0000000
--- a/include.new/openssl/pem2.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-/*
- * This header only exists to break a circular dependency between pem and err
- * Ben 30 Jan 1999.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef HEADER_PEM_H
-void ERR_load_PEM_strings(void);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/include.new/openssl/pkcs12.h b/include.new/openssl/pkcs12.h
deleted file mode 100644
index a39adf5..0000000
--- a/include.new/openssl/pkcs12.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/* pkcs12.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
- * 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_PKCS12_H
-# define HEADER_PKCS12_H
-
-# include <openssl/bio.h>
-# include <openssl/x509.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# define PKCS12_KEY_ID   1
-# define PKCS12_IV_ID    2
-# define PKCS12_MAC_ID   3
-
-/* Default iteration count */
-# ifndef PKCS12_DEFAULT_ITER
-#  define PKCS12_DEFAULT_ITER     PKCS5_DEFAULT_ITER
-# endif
-
-# define PKCS12_MAC_KEY_LENGTH 20
-
-# define PKCS12_SALT_LEN 8
-
-/* Uncomment out next line for unicode password and names, otherwise ASCII */
-
-/*
- * #define PBE_UNICODE
- */
-
-# ifdef PBE_UNICODE
-#  define PKCS12_key_gen PKCS12_key_gen_uni
-#  define PKCS12_add_friendlyname PKCS12_add_friendlyname_uni
-# else
-#  define PKCS12_key_gen PKCS12_key_gen_asc
-#  define PKCS12_add_friendlyname PKCS12_add_friendlyname_asc
-# endif
-
-/* MS key usage constants */
-
-# define KEY_EX  0x10
-# define KEY_SIG 0x80
-
-typedef struct {
-    X509_SIG *dinfo;
-    ASN1_OCTET_STRING *salt;
-    ASN1_INTEGER *iter;         /* defaults to 1 */
-} PKCS12_MAC_DATA;
-
-typedef struct {
-    ASN1_INTEGER *version;
-    PKCS12_MAC_DATA *mac;
-    PKCS7 *authsafes;
-} PKCS12;
-
-typedef struct {
-    ASN1_OBJECT *type;
-    union {
-        struct pkcs12_bag_st *bag; /* secret, crl and certbag */
-        struct pkcs8_priv_key_info_st *keybag; /* keybag */
-        X509_SIG *shkeybag;     /* shrouded key bag */
-        STACK_OF(PKCS12_SAFEBAG) *safes;
-        ASN1_TYPE *other;
-    } value;
-    STACK_OF(X509_ATTRIBUTE) *attrib;
-} PKCS12_SAFEBAG;
-
-DECLARE_STACK_OF(PKCS12_SAFEBAG)
-DECLARE_ASN1_SET_OF(PKCS12_SAFEBAG)
-DECLARE_PKCS12_STACK_OF(PKCS12_SAFEBAG)
-
-typedef struct pkcs12_bag_st {
-    ASN1_OBJECT *type;
-    union {
-        ASN1_OCTET_STRING *x509cert;
-        ASN1_OCTET_STRING *x509crl;
-        ASN1_OCTET_STRING *octet;
-        ASN1_IA5STRING *sdsicert;
-        ASN1_TYPE *other;       /* Secret or other bag */
-    } value;
-} PKCS12_BAGS;
-
-# define PKCS12_ERROR    0
-# define PKCS12_OK       1
-
-/* Compatibility macros */
-
-# define M_PKCS12_x5092certbag PKCS12_x5092certbag
-# define M_PKCS12_x509crl2certbag PKCS12_x509crl2certbag
-
-# define M_PKCS12_certbag2x509 PKCS12_certbag2x509
-# define M_PKCS12_certbag2x509crl PKCS12_certbag2x509crl
-
-# define M_PKCS12_unpack_p7data PKCS12_unpack_p7data
-# define M_PKCS12_pack_authsafes PKCS12_pack_authsafes
-# define M_PKCS12_unpack_authsafes PKCS12_unpack_authsafes
-# define M_PKCS12_unpack_p7encdata PKCS12_unpack_p7encdata
-
-# define M_PKCS12_decrypt_skey PKCS12_decrypt_skey
-# define M_PKCS8_decrypt PKCS8_decrypt
-
-# define M_PKCS12_bag_type(bg) OBJ_obj2nid((bg)->type)
-# define M_PKCS12_cert_bag_type(bg) OBJ_obj2nid((bg)->value.bag->type)
-# define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type
-
-# define PKCS12_get_attr(bag, attr_nid) \
-                         PKCS12_get_attr_gen(bag->attrib, attr_nid)
-
-# define PKCS8_get_attr(p8, attr_nid) \
-                PKCS12_get_attr_gen(p8->attributes, attr_nid)
-
-# define PKCS12_mac_present(p12) ((p12)->mac ? 1 : 0)
-
-PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509);
-PKCS12_SAFEBAG *PKCS12_x509crl2certbag(X509_CRL *crl);
-X509 *PKCS12_certbag2x509(PKCS12_SAFEBAG *bag);
-X509_CRL *PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag);
-
-PKCS12_SAFEBAG *PKCS12_item_pack_safebag(void *obj, const ASN1_ITEM *it,
-                                         int nid1, int nid2);
-PKCS12_SAFEBAG *PKCS12_MAKE_KEYBAG(PKCS8_PRIV_KEY_INFO *p8);
-PKCS8_PRIV_KEY_INFO *PKCS8_decrypt(X509_SIG *p8, const char *pass,
-                                   int passlen);
-PKCS8_PRIV_KEY_INFO *PKCS12_decrypt_skey(PKCS12_SAFEBAG *bag,
-                                         const char *pass, int passlen);
-X509_SIG *PKCS8_encrypt(int pbe_nid, const EVP_CIPHER *cipher,
-                        const char *pass, int passlen, unsigned char *salt,
-                        int saltlen, int iter, PKCS8_PRIV_KEY_INFO *p8);
-PKCS12_SAFEBAG *PKCS12_MAKE_SHKEYBAG(int pbe_nid, const char *pass,
-                                     int passlen, unsigned char *salt,
-                                     int saltlen, int iter,
-                                     PKCS8_PRIV_KEY_INFO *p8);
-PKCS7 *PKCS12_pack_p7data(STACK_OF(PKCS12_SAFEBAG) *sk);
-STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7data(PKCS7 *p7);
-PKCS7 *PKCS12_pack_p7encdata(int pbe_nid, const char *pass, int passlen,
-                             unsigned char *salt, int saltlen, int iter,
-                             STACK_OF(PKCS12_SAFEBAG) *bags);
-STACK_OF(PKCS12_SAFEBAG) *PKCS12_unpack_p7encdata(PKCS7 *p7, const char *pass,
-                                                  int passlen);
-
-int PKCS12_pack_authsafes(PKCS12 *p12, STACK_OF(PKCS7) *safes);
-STACK_OF(PKCS7) *PKCS12_unpack_authsafes(PKCS12 *p12);
-
-int PKCS12_add_localkeyid(PKCS12_SAFEBAG *bag, unsigned char *name,
-                          int namelen);
-int PKCS12_add_friendlyname_asc(PKCS12_SAFEBAG *bag, const char *name,
-                                int namelen);
-int PKCS12_add_CSPName_asc(PKCS12_SAFEBAG *bag, const char *name,
-                           int namelen);
-int PKCS12_add_friendlyname_uni(PKCS12_SAFEBAG *bag,
-                                const unsigned char *name, int namelen);
-int PKCS8_add_keyusage(PKCS8_PRIV_KEY_INFO *p8, int usage);
-ASN1_TYPE *PKCS12_get_attr_gen(STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid);
-char *PKCS12_get_friendlyname(PKCS12_SAFEBAG *bag);
-unsigned char *PKCS12_pbe_crypt(X509_ALGOR *algor, const char *pass,
-                                int passlen, unsigned char *in, int inlen,
-                                unsigned char **data, int *datalen,
-                                int en_de);
-void *PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it,
-                              const char *pass, int passlen,
-                              ASN1_OCTET_STRING *oct, int zbuf);
-ASN1_OCTET_STRING *PKCS12_item_i2d_encrypt(X509_ALGOR *algor,
-                                           const ASN1_ITEM *it,
-                                           const char *pass, int passlen,
-                                           void *obj, int zbuf);
-PKCS12 *PKCS12_init(int mode);
-int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt,
-                       int saltlen, int id, int iter, int n,
-                       unsigned char *out, const EVP_MD *md_type);
-int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
-                       int saltlen, int id, int iter, int n,
-                       unsigned char *out, const EVP_MD *md_type);
-int PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
-                        ASN1_TYPE *param, const EVP_CIPHER *cipher,
-                        const EVP_MD *md_type, int en_de);
-int PKCS12_gen_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *mac, unsigned int *maclen);
-int PKCS12_verify_mac(PKCS12 *p12, const char *pass, int passlen);
-int PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen,
-                   unsigned char *salt, int saltlen, int iter,
-                   const EVP_MD *md_type);
-int PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt,
-                     int saltlen, const EVP_MD *md_type);
-unsigned char *OPENSSL_asc2uni(const char *asc, int asclen,
-                               unsigned char **uni, int *unilen);
-char *OPENSSL_uni2asc(unsigned char *uni, int unilen);
-
-DECLARE_ASN1_FUNCTIONS(PKCS12)
-DECLARE_ASN1_FUNCTIONS(PKCS12_MAC_DATA)
-DECLARE_ASN1_FUNCTIONS(PKCS12_SAFEBAG)
-DECLARE_ASN1_FUNCTIONS(PKCS12_BAGS)
-
-DECLARE_ASN1_ITEM(PKCS12_SAFEBAGS)
-DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES)
-
-void PKCS12_PBE_add(void);
-int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
-                 STACK_OF(X509) **ca);
-PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert,
-                      STACK_OF(X509) *ca, int nid_key, int nid_cert, int iter,
-                      int mac_iter, int keytype);
-
-PKCS12_SAFEBAG *PKCS12_add_cert(STACK_OF(PKCS12_SAFEBAG) **pbags, X509 *cert);
-PKCS12_SAFEBAG *PKCS12_add_key(STACK_OF(PKCS12_SAFEBAG) **pbags,
-                               EVP_PKEY *key, int key_usage, int iter,
-                               int key_nid, char *pass);
-int PKCS12_add_safe(STACK_OF(PKCS7) **psafes, STACK_OF(PKCS12_SAFEBAG) *bags,
-                    int safe_nid, int iter, char *pass);
-PKCS12 *PKCS12_add_safes(STACK_OF(PKCS7) *safes, int p7_nid);
-
-int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12);
-int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12);
-PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
-PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
-int PKCS12_newpass(PKCS12 *p12, char *oldpass, char *newpass);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_PKCS12_strings(void);
-
-/* Error codes for the PKCS12 functions. */
-
-/* Function codes. */
-# define PKCS12_F_PARSE_BAG                               129
-# define PKCS12_F_PARSE_BAGS                              103
-# define PKCS12_F_PKCS12_ADD_FRIENDLYNAME                 100
-# define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC             127
-# define PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI             102
-# define PKCS12_F_PKCS12_ADD_LOCALKEYID                   104
-# define PKCS12_F_PKCS12_CREATE                           105
-# define PKCS12_F_PKCS12_GEN_MAC                          107
-# define PKCS12_F_PKCS12_INIT                             109
-# define PKCS12_F_PKCS12_ITEM_DECRYPT_D2I                 106
-# define PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT                 108
-# define PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG                117
-# define PKCS12_F_PKCS12_KEY_GEN_ASC                      110
-# define PKCS12_F_PKCS12_KEY_GEN_UNI                      111
-# define PKCS12_F_PKCS12_MAKE_KEYBAG                      112
-# define PKCS12_F_PKCS12_MAKE_SHKEYBAG                    113
-# define PKCS12_F_PKCS12_NEWPASS                          128
-# define PKCS12_F_PKCS12_PACK_P7DATA                      114
-# define PKCS12_F_PKCS12_PACK_P7ENCDATA                   115
-# define PKCS12_F_PKCS12_PARSE                            118
-# define PKCS12_F_PKCS12_PBE_CRYPT                        119
-# define PKCS12_F_PKCS12_PBE_KEYIVGEN                     120
-# define PKCS12_F_PKCS12_SETUP_MAC                        122
-# define PKCS12_F_PKCS12_SET_MAC                          123
-# define PKCS12_F_PKCS12_UNPACK_AUTHSAFES                 130
-# define PKCS12_F_PKCS12_UNPACK_P7DATA                    131
-# define PKCS12_F_PKCS12_VERIFY_MAC                       126
-# define PKCS12_F_PKCS8_ADD_KEYUSAGE                      124
-# define PKCS12_F_PKCS8_ENCRYPT                           125
-
-/* Reason codes. */
-# define PKCS12_R_CANT_PACK_STRUCTURE                     100
-# define PKCS12_R_CONTENT_TYPE_NOT_DATA                   121
-# define PKCS12_R_DECODE_ERROR                            101
-# define PKCS12_R_ENCODE_ERROR                            102
-# define PKCS12_R_ENCRYPT_ERROR                           103
-# define PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE       120
-# define PKCS12_R_INVALID_NULL_ARGUMENT                   104
-# define PKCS12_R_INVALID_NULL_PKCS12_POINTER             105
-# define PKCS12_R_IV_GEN_ERROR                            106
-# define PKCS12_R_KEY_GEN_ERROR                           107
-# define PKCS12_R_MAC_ABSENT                              108
-# define PKCS12_R_MAC_GENERATION_ERROR                    109
-# define PKCS12_R_MAC_SETUP_ERROR                         110
-# define PKCS12_R_MAC_STRING_SET_ERROR                    111
-# define PKCS12_R_MAC_VERIFY_ERROR                        112
-# define PKCS12_R_MAC_VERIFY_FAILURE                      113
-# define PKCS12_R_PARSE_ERROR                             114
-# define PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR           115
-# define PKCS12_R_PKCS12_CIPHERFINAL_ERROR                116
-# define PKCS12_R_PKCS12_PBE_CRYPT_ERROR                  117
-# define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM                118
-# define PKCS12_R_UNSUPPORTED_PKCS12_MODE                 119
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/pkcs7.h b/include.new/openssl/pkcs7.h
deleted file mode 100644
index b51b386..0000000
--- a/include.new/openssl/pkcs7.h
+++ /dev/null
@@ -1,481 +0,0 @@
-/* crypto/pkcs7/pkcs7.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_PKCS7_H
-# define HEADER_PKCS7_H
-
-# include <openssl/asn1.h>
-# include <openssl/bio.h>
-# include <openssl/e_os2.h>
-
-# include <openssl/symhacks.h>
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_SYS_WIN32
-/* Under Win32 thes are defined in wincrypt.h */
-#  undef PKCS7_ISSUER_AND_SERIAL
-#  undef PKCS7_SIGNER_INFO
-# endif
-
-/*-
-Encryption_ID           DES-CBC
-Digest_ID               MD5
-Digest_Encryption_ID    rsaEncryption
-Key_Encryption_ID       rsaEncryption
-*/
-
-typedef struct pkcs7_issuer_and_serial_st {
-    X509_NAME *issuer;
-    ASN1_INTEGER *serial;
-} PKCS7_ISSUER_AND_SERIAL;
-
-typedef struct pkcs7_signer_info_st {
-    ASN1_INTEGER *version;      /* version 1 */
-    PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
-    X509_ALGOR *digest_alg;
-    STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */
-    X509_ALGOR *digest_enc_alg;
-    ASN1_OCTET_STRING *enc_digest;
-    STACK_OF(X509_ATTRIBUTE) *unauth_attr; /* [ 1 ] */
-    /* The private key to sign with */
-    EVP_PKEY *pkey;
-} PKCS7_SIGNER_INFO;
-
-DECLARE_STACK_OF(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO)
-
-typedef struct pkcs7_recip_info_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
-    X509_ALGOR *key_enc_algor;
-    ASN1_OCTET_STRING *enc_key;
-    X509 *cert;                 /* get the pub-key from this */
-} PKCS7_RECIP_INFO;
-
-DECLARE_STACK_OF(PKCS7_RECIP_INFO)
-DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO)
-
-typedef struct pkcs7_signed_st {
-    ASN1_INTEGER *version;      /* version 1 */
-    STACK_OF(X509_ALGOR) *md_algs; /* md used */
-    STACK_OF(X509) *cert;       /* [ 0 ] */
-    STACK_OF(X509_CRL) *crl;    /* [ 1 ] */
-    STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
-    struct pkcs7_st *contents;
-} PKCS7_SIGNED;
-/*
- * The above structure is very very similar to PKCS7_SIGN_ENVELOPE. How about
- * merging the two
- */
-
-typedef struct pkcs7_enc_content_st {
-    ASN1_OBJECT *content_type;
-    X509_ALGOR *algorithm;
-    ASN1_OCTET_STRING *enc_data; /* [ 0 ] */
-    const EVP_CIPHER *cipher;
-} PKCS7_ENC_CONTENT;
-
-typedef struct pkcs7_enveloped_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
-    PKCS7_ENC_CONTENT *enc_data;
-} PKCS7_ENVELOPE;
-
-typedef struct pkcs7_signedandenveloped_st {
-    ASN1_INTEGER *version;      /* version 1 */
-    STACK_OF(X509_ALGOR) *md_algs; /* md used */
-    STACK_OF(X509) *cert;       /* [ 0 ] */
-    STACK_OF(X509_CRL) *crl;    /* [ 1 ] */
-    STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
-    PKCS7_ENC_CONTENT *enc_data;
-    STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
-} PKCS7_SIGN_ENVELOPE;
-
-typedef struct pkcs7_digest_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    X509_ALGOR *md;             /* md used */
-    struct pkcs7_st *contents;
-    ASN1_OCTET_STRING *digest;
-} PKCS7_DIGEST;
-
-typedef struct pkcs7_encrypted_st {
-    ASN1_INTEGER *version;      /* version 0 */
-    PKCS7_ENC_CONTENT *enc_data;
-} PKCS7_ENCRYPT;
-
-typedef struct pkcs7_st {
-    /*
-     * The following is non NULL if it contains ASN1 encoding of this
-     * structure
-     */
-    unsigned char *asn1;
-    long length;
-# define PKCS7_S_HEADER  0
-# define PKCS7_S_BODY    1
-# define PKCS7_S_TAIL    2
-    int state;                  /* used during processing */
-    int detached;
-    ASN1_OBJECT *type;
-    /* content as defined by the type */
-    /*
-     * all encryption/message digests are applied to the 'contents', leaving
-     * out the 'type' field.
-     */
-    union {
-        char *ptr;
-        /* NID_pkcs7_data */
-        ASN1_OCTET_STRING *data;
-        /* NID_pkcs7_signed */
-        PKCS7_SIGNED *sign;
-        /* NID_pkcs7_enveloped */
-        PKCS7_ENVELOPE *enveloped;
-        /* NID_pkcs7_signedAndEnveloped */
-        PKCS7_SIGN_ENVELOPE *signed_and_enveloped;
-        /* NID_pkcs7_digest */
-        PKCS7_DIGEST *digest;
-        /* NID_pkcs7_encrypted */
-        PKCS7_ENCRYPT *encrypted;
-        /* Anything else */
-        ASN1_TYPE *other;
-    } d;
-} PKCS7;
-
-DECLARE_STACK_OF(PKCS7)
-DECLARE_ASN1_SET_OF(PKCS7)
-DECLARE_PKCS12_STACK_OF(PKCS7)
-
-# define PKCS7_OP_SET_DETACHED_SIGNATURE 1
-# define PKCS7_OP_GET_DETACHED_SIGNATURE 2
-
-# define PKCS7_get_signed_attributes(si) ((si)->auth_attr)
-# define PKCS7_get_attributes(si)        ((si)->unauth_attr)
-
-# define PKCS7_type_is_signed(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_signed)
-# define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
-# define PKCS7_type_is_enveloped(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_enveloped)
-# define PKCS7_type_is_signedAndEnveloped(a) \
-                (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped)
-# define PKCS7_type_is_data(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_data)
-# define PKCS7_type_is_digest(a)   (OBJ_obj2nid((a)->type) == NID_pkcs7_digest)
-
-# define PKCS7_set_detached(p,v) \
-                PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL)
-# define PKCS7_get_detached(p) \
-                PKCS7_ctrl(p,PKCS7_OP_GET_DETACHED_SIGNATURE,0,NULL)
-
-# define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
-
-/* S/MIME related flags */
-
-# define PKCS7_TEXT              0x1
-# define PKCS7_NOCERTS           0x2
-# define PKCS7_NOSIGS            0x4
-# define PKCS7_NOCHAIN           0x8
-# define PKCS7_NOINTERN          0x10
-# define PKCS7_NOVERIFY          0x20
-# define PKCS7_DETACHED          0x40
-# define PKCS7_BINARY            0x80
-# define PKCS7_NOATTR            0x100
-# define PKCS7_NOSMIMECAP        0x200
-# define PKCS7_NOOLDMIMETYPE     0x400
-# define PKCS7_CRLFEOL           0x800
-# define PKCS7_STREAM            0x1000
-# define PKCS7_NOCRL             0x2000
-# define PKCS7_PARTIAL           0x4000
-# define PKCS7_REUSE_DIGEST      0x8000
-
-/* Flags: for compatibility with older code */
-
-# define SMIME_TEXT      PKCS7_TEXT
-# define SMIME_NOCERTS   PKCS7_NOCERTS
-# define SMIME_NOSIGS    PKCS7_NOSIGS
-# define SMIME_NOCHAIN   PKCS7_NOCHAIN
-# define SMIME_NOINTERN  PKCS7_NOINTERN
-# define SMIME_NOVERIFY  PKCS7_NOVERIFY
-# define SMIME_DETACHED  PKCS7_DETACHED
-# define SMIME_BINARY    PKCS7_BINARY
-# define SMIME_NOATTR    PKCS7_NOATTR
-
-DECLARE_ASN1_FUNCTIONS(PKCS7_ISSUER_AND_SERIAL)
-
-int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
-                                   const EVP_MD *type, unsigned char *md,
-                                   unsigned int *len);
-# ifndef OPENSSL_NO_FP_API
-PKCS7 *d2i_PKCS7_fp(FILE *fp, PKCS7 **p7);
-int i2d_PKCS7_fp(FILE *fp, PKCS7 *p7);
-# endif
-PKCS7 *PKCS7_dup(PKCS7 *p7);
-PKCS7 *d2i_PKCS7_bio(BIO *bp, PKCS7 **p7);
-int i2d_PKCS7_bio(BIO *bp, PKCS7 *p7);
-int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
-int PEM_write_bio_PKCS7_stream(BIO *out, PKCS7 *p7, BIO *in, int flags);
-
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNER_INFO)
-DECLARE_ASN1_FUNCTIONS(PKCS7_RECIP_INFO)
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGNED)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENC_CONTENT)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENVELOPE)
-DECLARE_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
-DECLARE_ASN1_FUNCTIONS(PKCS7_DIGEST)
-DECLARE_ASN1_FUNCTIONS(PKCS7_ENCRYPT)
-DECLARE_ASN1_FUNCTIONS(PKCS7)
-
-DECLARE_ASN1_ITEM(PKCS7_ATTR_SIGN)
-DECLARE_ASN1_ITEM(PKCS7_ATTR_VERIFY)
-
-DECLARE_ASN1_NDEF_FUNCTION(PKCS7)
-DECLARE_ASN1_PRINT_FUNCTION(PKCS7)
-
-long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
-
-int PKCS7_set_type(PKCS7 *p7, int type);
-int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other);
-int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
-int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
-                          const EVP_MD *dgst);
-int PKCS7_SIGNER_INFO_sign(PKCS7_SIGNER_INFO *si);
-int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *p7i);
-int PKCS7_add_certificate(PKCS7 *p7, X509 *x509);
-int PKCS7_add_crl(PKCS7 *p7, X509_CRL *x509);
-int PKCS7_content_new(PKCS7 *p7, int nid);
-int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx,
-                     BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si);
-int PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si,
-                          X509 *x509);
-
-BIO *PKCS7_dataInit(PKCS7 *p7, BIO *bio);
-int PKCS7_dataFinal(PKCS7 *p7, BIO *bio);
-BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert);
-
-PKCS7_SIGNER_INFO *PKCS7_add_signature(PKCS7 *p7, X509 *x509,
-                                       EVP_PKEY *pkey, const EVP_MD *dgst);
-X509 *PKCS7_cert_from_signer_info(PKCS7 *p7, PKCS7_SIGNER_INFO *si);
-int PKCS7_set_digest(PKCS7 *p7, const EVP_MD *md);
-STACK_OF(PKCS7_SIGNER_INFO) *PKCS7_get_signer_info(PKCS7 *p7);
-
-PKCS7_RECIP_INFO *PKCS7_add_recipient(PKCS7 *p7, X509 *x509);
-void PKCS7_SIGNER_INFO_get0_algs(PKCS7_SIGNER_INFO *si, EVP_PKEY **pk,
-                                 X509_ALGOR **pdig, X509_ALGOR **psig);
-void PKCS7_RECIP_INFO_get0_alg(PKCS7_RECIP_INFO *ri, X509_ALGOR **penc);
-int PKCS7_add_recipient_info(PKCS7 *p7, PKCS7_RECIP_INFO *ri);
-int PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509);
-int PKCS7_set_cipher(PKCS7 *p7, const EVP_CIPHER *cipher);
-int PKCS7_stream(unsigned char ***boundary, PKCS7 *p7);
-
-PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx);
-ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int type,
-                               void *data);
-int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype,
-                        void *value);
-ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid);
-ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid);
-int PKCS7_set_signed_attributes(PKCS7_SIGNER_INFO *p7si,
-                                STACK_OF(X509_ATTRIBUTE) *sk);
-int PKCS7_set_attributes(PKCS7_SIGNER_INFO *p7si,
-                         STACK_OF(X509_ATTRIBUTE) *sk);
-
-PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
-                  BIO *data, int flags);
-
-PKCS7_SIGNER_INFO *PKCS7_sign_add_signer(PKCS7 *p7,
-                                         X509 *signcert, EVP_PKEY *pkey,
-                                         const EVP_MD *md, int flags);
-
-int PKCS7_final(PKCS7 *p7, BIO *data, int flags);
-int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store,
-                 BIO *indata, BIO *out, int flags);
-STACK_OF(X509) *PKCS7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs,
-                                   int flags);
-PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
-                     int flags);
-int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data,
-                  int flags);
-
-int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
-                              STACK_OF(X509_ALGOR) *cap);
-STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si);
-int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg);
-
-int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid);
-int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t);
-int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
-                             const unsigned char *md, int mdlen);
-
-int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);
-PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);
-
-BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_PKCS7_strings(void);
-
-/* Error codes for the PKCS7 functions. */
-
-/* Function codes. */
-# define PKCS7_F_B64_READ_PKCS7                           120
-# define PKCS7_F_B64_WRITE_PKCS7                          121
-# define PKCS7_F_DO_PKCS7_SIGNED_ATTRIB                   136
-# define PKCS7_F_I2D_PKCS7_BIO_STREAM                     140
-# define PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME           135
-# define PKCS7_F_PKCS7_ADD_ATTRIB_SMIMECAP                118
-# define PKCS7_F_PKCS7_ADD_CERTIFICATE                    100
-# define PKCS7_F_PKCS7_ADD_CRL                            101
-# define PKCS7_F_PKCS7_ADD_RECIPIENT_INFO                 102
-# define PKCS7_F_PKCS7_ADD_SIGNATURE                      131
-# define PKCS7_F_PKCS7_ADD_SIGNER                         103
-# define PKCS7_F_PKCS7_BIO_ADD_DIGEST                     125
-# define PKCS7_F_PKCS7_COPY_EXISTING_DIGEST               138
-# define PKCS7_F_PKCS7_CTRL                               104
-# define PKCS7_F_PKCS7_DATADECODE                         112
-# define PKCS7_F_PKCS7_DATAFINAL                          128
-# define PKCS7_F_PKCS7_DATAINIT                           105
-# define PKCS7_F_PKCS7_DATASIGN                           106
-# define PKCS7_F_PKCS7_DATAVERIFY                         107
-# define PKCS7_F_PKCS7_DECRYPT                            114
-# define PKCS7_F_PKCS7_DECRYPT_RINFO                      133
-# define PKCS7_F_PKCS7_ENCODE_RINFO                       132
-# define PKCS7_F_PKCS7_ENCRYPT                            115
-# define PKCS7_F_PKCS7_FINAL                              134
-# define PKCS7_F_PKCS7_FIND_DIGEST                        127
-# define PKCS7_F_PKCS7_GET0_SIGNERS                       124
-# define PKCS7_F_PKCS7_RECIP_INFO_SET                     130
-# define PKCS7_F_PKCS7_SET_CIPHER                         108
-# define PKCS7_F_PKCS7_SET_CONTENT                        109
-# define PKCS7_F_PKCS7_SET_DIGEST                         126
-# define PKCS7_F_PKCS7_SET_TYPE                           110
-# define PKCS7_F_PKCS7_SIGN                               116
-# define PKCS7_F_PKCS7_SIGNATUREVERIFY                    113
-# define PKCS7_F_PKCS7_SIGNER_INFO_SET                    129
-# define PKCS7_F_PKCS7_SIGNER_INFO_SIGN                   139
-# define PKCS7_F_PKCS7_SIGN_ADD_SIGNER                    137
-# define PKCS7_F_PKCS7_SIMPLE_SMIMECAP                    119
-# define PKCS7_F_PKCS7_VERIFY                             117
-# define PKCS7_F_SMIME_READ_PKCS7                         122
-# define PKCS7_F_SMIME_TEXT                               123
-
-/* Reason codes. */
-# define PKCS7_R_CERTIFICATE_VERIFY_ERROR                 117
-# define PKCS7_R_CIPHER_HAS_NO_OBJECT_IDENTIFIER          144
-# define PKCS7_R_CIPHER_NOT_INITIALIZED                   116
-# define PKCS7_R_CONTENT_AND_DATA_PRESENT                 118
-# define PKCS7_R_CTRL_ERROR                               152
-# define PKCS7_R_DECODE_ERROR                             130
-# define PKCS7_R_DECRYPTED_KEY_IS_WRONG_LENGTH            100
-# define PKCS7_R_DECRYPT_ERROR                            119
-# define PKCS7_R_DIGEST_FAILURE                           101
-# define PKCS7_R_ENCRYPTION_CTRL_FAILURE                  149
-# define PKCS7_R_ENCRYPTION_NOT_SUPPORTED_FOR_THIS_KEY_TYPE 150
-# define PKCS7_R_ERROR_ADDING_RECIPIENT                   120
-# define PKCS7_R_ERROR_SETTING_CIPHER                     121
-# define PKCS7_R_INVALID_MIME_TYPE                        131
-# define PKCS7_R_INVALID_NULL_POINTER                     143
-# define PKCS7_R_INVALID_SIGNED_DATA_TYPE                 155
-# define PKCS7_R_MIME_NO_CONTENT_TYPE                     132
-# define PKCS7_R_MIME_PARSE_ERROR                         133
-# define PKCS7_R_MIME_SIG_PARSE_ERROR                     134
-# define PKCS7_R_MISSING_CERIPEND_INFO                    103
-# define PKCS7_R_NO_CONTENT                               122
-# define PKCS7_R_NO_CONTENT_TYPE                          135
-# define PKCS7_R_NO_DEFAULT_DIGEST                        151
-# define PKCS7_R_NO_MATCHING_DIGEST_TYPE_FOUND            154
-# define PKCS7_R_NO_MULTIPART_BODY_FAILURE                136
-# define PKCS7_R_NO_MULTIPART_BOUNDARY                    137
-# define PKCS7_R_NO_RECIPIENT_MATCHES_CERTIFICATE         115
-# define PKCS7_R_NO_RECIPIENT_MATCHES_KEY                 146
-# define PKCS7_R_NO_SIGNATURES_ON_DATA                    123
-# define PKCS7_R_NO_SIGNERS                               142
-# define PKCS7_R_NO_SIG_CONTENT_TYPE                      138
-# define PKCS7_R_OPERATION_NOT_SUPPORTED_ON_THIS_TYPE     104
-# define PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR                124
-# define PKCS7_R_PKCS7_ADD_SIGNER_ERROR                   153
-# define PKCS7_R_PKCS7_DATAFINAL                          126
-# define PKCS7_R_PKCS7_DATAFINAL_ERROR                    125
-# define PKCS7_R_PKCS7_DATASIGN                           145
-# define PKCS7_R_PKCS7_PARSE_ERROR                        139
-# define PKCS7_R_PKCS7_SIG_PARSE_ERROR                    140
-# define PKCS7_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE   127
-# define PKCS7_R_SIGNATURE_FAILURE                        105
-# define PKCS7_R_SIGNER_CERTIFICATE_NOT_FOUND             128
-# define PKCS7_R_SIGNING_CTRL_FAILURE                     147
-# define PKCS7_R_SIGNING_NOT_SUPPORTED_FOR_THIS_KEY_TYPE  148
-# define PKCS7_R_SIG_INVALID_MIME_TYPE                    141
-# define PKCS7_R_SMIME_TEXT_ERROR                         129
-# define PKCS7_R_UNABLE_TO_FIND_CERTIFICATE               106
-# define PKCS7_R_UNABLE_TO_FIND_MEM_BIO                   107
-# define PKCS7_R_UNABLE_TO_FIND_MESSAGE_DIGEST            108
-# define PKCS7_R_UNKNOWN_DIGEST_TYPE                      109
-# define PKCS7_R_UNKNOWN_OPERATION                        110
-# define PKCS7_R_UNSUPPORTED_CIPHER_TYPE                  111
-# define PKCS7_R_UNSUPPORTED_CONTENT_TYPE                 112
-# define PKCS7_R_WRONG_CONTENT_TYPE                       113
-# define PKCS7_R_WRONG_PKCS7_TYPE                         114
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/pqueue.h b/include.new/openssl/pqueue.h
deleted file mode 100644
index d40d9c7..0000000
--- a/include.new/openssl/pqueue.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* crypto/pqueue/pqueue.h */
-/*
- * DTLS implementation written by Nagendra Modadugu
- * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
- */
-/* ====================================================================
- * Copyright (c) 1999-2005 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_PQUEUE_H
-# define HEADER_PQUEUE_H
-
-# include <stdio.h>
-# include <stdlib.h>
-# include <string.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-typedef struct _pqueue *pqueue;
-
-typedef struct _pitem {
-    unsigned char priority[8];  /* 64-bit value in big-endian encoding */
-    void *data;
-    struct _pitem *next;
-} pitem;
-
-typedef struct _pitem *piterator;
-
-pitem *pitem_new(unsigned char *prio64be, void *data);
-void pitem_free(pitem *item);
-
-pqueue pqueue_new(void);
-void pqueue_free(pqueue pq);
-
-pitem *pqueue_insert(pqueue pq, pitem *item);
-pitem *pqueue_peek(pqueue pq);
-pitem *pqueue_pop(pqueue pq);
-pitem *pqueue_find(pqueue pq, unsigned char *prio64be);
-pitem *pqueue_iterator(pqueue pq);
-pitem *pqueue_next(piterator *iter);
-
-void pqueue_print(pqueue pq);
-int pqueue_size(pqueue pq);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* ! HEADER_PQUEUE_H */
diff --git a/include.new/openssl/rand.h b/include.new/openssl/rand.h
deleted file mode 100644
index 2553afd..0000000
--- a/include.new/openssl/rand.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/* crypto/rand/rand.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RAND_H
-# define HEADER_RAND_H
-
-# include <stdlib.h>
-# include <openssl/ossl_typ.h>
-# include <openssl/e_os2.h>
-
-# if defined(OPENSSL_SYS_WINDOWS)
-#  include <windows.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# if defined(OPENSSL_FIPS)
-#  define FIPS_RAND_SIZE_T size_t
-# endif
-
-/* Already defined in ossl_typ.h */
-/* typedef struct rand_meth_st RAND_METHOD; */
-
-struct rand_meth_st {
-    void (*seed) (const void *buf, int num);
-    int (*bytes) (unsigned char *buf, int num);
-    void (*cleanup) (void);
-    void (*add) (const void *buf, int num, double entropy);
-    int (*pseudorand) (unsigned char *buf, int num);
-    int (*status) (void);
-};
-
-# ifdef BN_DEBUG
-extern int rand_predictable;
-# endif
-
-int RAND_set_rand_method(const RAND_METHOD *meth);
-const RAND_METHOD *RAND_get_rand_method(void);
-# ifndef OPENSSL_NO_ENGINE
-int RAND_set_rand_engine(ENGINE *engine);
-# endif
-RAND_METHOD *RAND_SSLeay(void);
-void RAND_cleanup(void);
-int RAND_bytes(unsigned char *buf, int num);
-int RAND_pseudo_bytes(unsigned char *buf, int num);
-void RAND_seed(const void *buf, int num);
-void RAND_add(const void *buf, int num, double entropy);
-int RAND_load_file(const char *file, long max_bytes);
-int RAND_write_file(const char *file);
-const char *RAND_file_name(char *file, size_t num);
-int RAND_status(void);
-int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes);
-int RAND_egd(const char *path);
-int RAND_egd_bytes(const char *path, int bytes);
-int RAND_poll(void);
-
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-
-void RAND_screen(void);
-int RAND_event(UINT, WPARAM, LPARAM);
-
-# endif
-
-# ifdef OPENSSL_FIPS
-void RAND_set_fips_drbg_type(int type, int flags);
-int RAND_init_fips(void);
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_RAND_strings(void);
-
-/* Error codes for the RAND functions. */
-
-/* Function codes. */
-# define RAND_F_RAND_GET_RAND_METHOD                      101
-# define RAND_F_RAND_INIT_FIPS                            102
-# define RAND_F_SSLEAY_RAND_BYTES                         100
-
-/* Reason codes. */
-# define RAND_R_DUAL_EC_DRBG_DISABLED                     104
-# define RAND_R_ERROR_INITIALISING_DRBG                   102
-# define RAND_R_ERROR_INSTANTIATING_DRBG                  103
-# define RAND_R_NO_FIPS_RANDOM_METHOD_SET                 101
-# define RAND_R_PRNG_NOT_SEEDED                           100
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/rc2.h b/include.new/openssl/rc2.h
deleted file mode 100644
index 29d02d7..0000000
--- a/include.new/openssl/rc2.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* crypto/rc2/rc2.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RC2_H
-# define HEADER_RC2_H
-
-# include <openssl/opensslconf.h>/* OPENSSL_NO_RC2, RC2_INT */
-# ifdef OPENSSL_NO_RC2
-#  error RC2 is disabled.
-# endif
-
-# define RC2_ENCRYPT     1
-# define RC2_DECRYPT     0
-
-# define RC2_BLOCK       8
-# define RC2_KEY_LENGTH  16
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct rc2_key_st {
-    RC2_INT data[64];
-} RC2_KEY;
-
-# ifdef OPENSSL_FIPS
-void private_RC2_set_key(RC2_KEY *key, int len, const unsigned char *data,
-                         int bits);
-# endif
-void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits);
-void RC2_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                     RC2_KEY *key, int enc);
-void RC2_encrypt(unsigned long *data, RC2_KEY *key);
-void RC2_decrypt(unsigned long *data, RC2_KEY *key);
-void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
-                     RC2_KEY *ks, unsigned char *iv, int enc);
-void RC2_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, RC2_KEY *schedule, unsigned char *ivec,
-                       int *num, int enc);
-void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                       long length, RC2_KEY *schedule, unsigned char *ivec,
-                       int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/rc4.h b/include.new/openssl/rc4.h
deleted file mode 100644
index 39162b1..0000000
--- a/include.new/openssl/rc4.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/rc4/rc4.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RC4_H
-# define HEADER_RC4_H
-
-# include <openssl/opensslconf.h>/* OPENSSL_NO_RC4, RC4_INT */
-# ifdef OPENSSL_NO_RC4
-#  error RC4 is disabled.
-# endif
-
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct rc4_key_st {
-    RC4_INT x, y;
-    RC4_INT data[256];
-} RC4_KEY;
-
-const char *RC4_options(void);
-void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
-void private_RC4_set_key(RC4_KEY *key, int len, const unsigned char *data);
-void RC4(RC4_KEY *key, size_t len, const unsigned char *indata,
-         unsigned char *outdata);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/rc5.h b/include.new/openssl/rc5.h
deleted file mode 100644
index fba6137..0000000
--- a/include.new/openssl/rc5.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* crypto/rc5/rc5.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RC5_H
-# define HEADER_RC5_H
-
-# include <openssl/opensslconf.h>/* OPENSSL_NO_RC5 */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_RC5
-#  error RC5 is disabled.
-# endif
-
-# define RC5_ENCRYPT     1
-# define RC5_DECRYPT     0
-
-/* 32 bit.  For Alpha, things may get weird */
-# define RC5_32_INT unsigned long
-
-# define RC5_32_BLOCK            8
-# define RC5_32_KEY_LENGTH       16/* This is a default, max is 255 */
-
-/*
- * This are the only values supported.  Tweak the code if you want more The
- * most supported modes will be RC5-32/12/16 RC5-32/16/8
- */
-# define RC5_8_ROUNDS    8
-# define RC5_12_ROUNDS   12
-# define RC5_16_ROUNDS   16
-
-typedef struct rc5_key_st {
-    /* Number of rounds */
-    int rounds;
-    RC5_32_INT data[2 * (RC5_16_ROUNDS + 1)];
-} RC5_32_KEY;
-
-void RC5_32_set_key(RC5_32_KEY *key, int len, const unsigned char *data,
-                    int rounds);
-void RC5_32_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                        RC5_32_KEY *key, int enc);
-void RC5_32_encrypt(unsigned long *data, RC5_32_KEY *key);
-void RC5_32_decrypt(unsigned long *data, RC5_32_KEY *key);
-void RC5_32_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                        long length, RC5_32_KEY *ks, unsigned char *iv,
-                        int enc);
-void RC5_32_cfb64_encrypt(const unsigned char *in, unsigned char *out,
-                          long length, RC5_32_KEY *schedule,
-                          unsigned char *ivec, int *num, int enc);
-void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out,
-                          long length, RC5_32_KEY *schedule,
-                          unsigned char *ivec, int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/ripemd.h b/include.new/openssl/ripemd.h
deleted file mode 100644
index b88ef25..0000000
--- a/include.new/openssl/ripemd.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* crypto/ripemd/ripemd.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RIPEMD_H
-# define HEADER_RIPEMD_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_NO_RIPEMD
-#  error RIPEMD is disabled.
-# endif
-
-# if defined(__LP32__)
-#  define RIPEMD160_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define RIPEMD160_LONG unsigned long
-#  define RIPEMD160_LONG_LOG2 3
-# else
-#  define RIPEMD160_LONG unsigned int
-# endif
-
-# define RIPEMD160_CBLOCK        64
-# define RIPEMD160_LBLOCK        (RIPEMD160_CBLOCK/4)
-# define RIPEMD160_DIGEST_LENGTH 20
-
-typedef struct RIPEMD160state_st {
-    RIPEMD160_LONG A, B, C, D, E;
-    RIPEMD160_LONG Nl, Nh;
-    RIPEMD160_LONG data[RIPEMD160_LBLOCK];
-    unsigned int num;
-} RIPEMD160_CTX;
-
-# ifdef OPENSSL_FIPS
-int private_RIPEMD160_Init(RIPEMD160_CTX *c);
-# endif
-int RIPEMD160_Init(RIPEMD160_CTX *c);
-int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len);
-int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
-unsigned char *RIPEMD160(const unsigned char *d, size_t n, unsigned char *md);
-void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b);
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/rsa.h b/include.new/openssl/rsa.h
deleted file mode 100644
index a8b59a9..0000000
--- a/include.new/openssl/rsa.h
+++ /dev/null
@@ -1,610 +0,0 @@
-/* crypto/rsa/rsa.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_RSA_H
-# define HEADER_RSA_H
-
-# include <openssl/asn1.h>
-
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/crypto.h>
-# include <openssl/ossl_typ.h>
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/bn.h>
-# endif
-
-# ifdef OPENSSL_NO_RSA
-#  error RSA is disabled.
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Declared already in ossl_typ.h */
-/* typedef struct rsa_st RSA; */
-/* typedef struct rsa_meth_st RSA_METHOD; */
-
-struct rsa_meth_st {
-    const char *name;
-    int (*rsa_pub_enc) (int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-    int (*rsa_pub_dec) (int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-    int (*rsa_priv_enc) (int flen, const unsigned char *from,
-                         unsigned char *to, RSA *rsa, int padding);
-    int (*rsa_priv_dec) (int flen, const unsigned char *from,
-                         unsigned char *to, RSA *rsa, int padding);
-    /* Can be null */
-    int (*rsa_mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
-    /* Can be null */
-    int (*bn_mod_exp) (BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
-                       const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
-    /* called at new */
-    int (*init) (RSA *rsa);
-    /* called at free */
-    int (*finish) (RSA *rsa);
-    /* RSA_METHOD_FLAG_* things */
-    int flags;
-    /* may be needed! */
-    char *app_data;
-    /*
-     * New sign and verify functions: some libraries don't allow arbitrary
-     * data to be signed/verified: this allows them to be used. Note: for
-     * this to work the RSA_public_decrypt() and RSA_private_encrypt() should
-     * *NOT* be used RSA_sign(), RSA_verify() should be used instead. Note:
-     * for backwards compatibility this functionality is only enabled if the
-     * RSA_FLAG_SIGN_VER option is set in 'flags'.
-     */
-    int (*rsa_sign) (int type,
-                     const unsigned char *m, unsigned int m_length,
-                     unsigned char *sigret, unsigned int *siglen,
-                     const RSA *rsa);
-    int (*rsa_verify) (int dtype, const unsigned char *m,
-                       unsigned int m_length, const unsigned char *sigbuf,
-                       unsigned int siglen, const RSA *rsa);
-    /*
-     * If this callback is NULL, the builtin software RSA key-gen will be
-     * used. This is for behavioural compatibility whilst the code gets
-     * rewired, but one day it would be nice to assume there are no such
-     * things as "builtin software" implementations.
-     */
-    int (*rsa_keygen) (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-};
-
-struct rsa_st {
-    /*
-     * The first parameter is used to pickup errors where this is passed
-     * instead of aEVP_PKEY, it is set to 0
-     */
-    int pad;
-    long version;
-    const RSA_METHOD *meth;
-    /* functional reference if 'meth' is ENGINE-provided */
-    ENGINE *engine;
-    BIGNUM *n;
-    BIGNUM *e;
-    BIGNUM *d;
-    BIGNUM *p;
-    BIGNUM *q;
-    BIGNUM *dmp1;
-    BIGNUM *dmq1;
-    BIGNUM *iqmp;
-    /* be careful using this if the RSA structure is shared */
-    CRYPTO_EX_DATA ex_data;
-    int references;
-    int flags;
-    /* Used to cache montgomery values */
-    BN_MONT_CTX *_method_mod_n;
-    BN_MONT_CTX *_method_mod_p;
-    BN_MONT_CTX *_method_mod_q;
-    /*
-     * all BIGNUM values are actually in the following data, if it is not
-     * NULL
-     */
-    char *bignum_data;
-    BN_BLINDING *blinding;
-    BN_BLINDING *mt_blinding;
-};
-
-# ifndef OPENSSL_RSA_MAX_MODULUS_BITS
-#  define OPENSSL_RSA_MAX_MODULUS_BITS   16384
-# endif
-
-# ifndef OPENSSL_RSA_SMALL_MODULUS_BITS
-#  define OPENSSL_RSA_SMALL_MODULUS_BITS 3072
-# endif
-# ifndef OPENSSL_RSA_MAX_PUBEXP_BITS
-
-/* exponent limit enforced for "large" modulus only */
-#  define OPENSSL_RSA_MAX_PUBEXP_BITS    64
-# endif
-
-# define RSA_3   0x3L
-# define RSA_F4  0x10001L
-
-# define RSA_METHOD_FLAG_NO_CHECK        0x0001/* don't check pub/private
-                                                * match */
-
-# define RSA_FLAG_CACHE_PUBLIC           0x0002
-# define RSA_FLAG_CACHE_PRIVATE          0x0004
-# define RSA_FLAG_BLINDING               0x0008
-# define RSA_FLAG_THREAD_SAFE            0x0010
-/*
- * This flag means the private key operations will be handled by rsa_mod_exp
- * and that they do not depend on the private key components being present:
- * for example a key stored in external hardware. Without this flag
- * bn_mod_exp gets called when private key components are absent.
- */
-# define RSA_FLAG_EXT_PKEY               0x0020
-
-/*
- * This flag in the RSA_METHOD enables the new rsa_sign, rsa_verify
- * functions.
- */
-# define RSA_FLAG_SIGN_VER               0x0040
-
-/*
- * new with 0.9.6j and 0.9.7b; the built-in
- * RSA implementation now uses blinding by
- * default (ignoring RSA_FLAG_BLINDING),
- * but other engines might not need it
- */
-# define RSA_FLAG_NO_BLINDING            0x0080
-/*
- * new with 0.9.8f; the built-in RSA
- * implementation now uses constant time
- * operations by default in private key operations,
- * e.g., constant time modular exponentiation,
- * modular inverse without leaking branches,
- * division without leaking branches. This
- * flag disables these constant time
- * operations and results in faster RSA
- * private key operations.
- */
-# define RSA_FLAG_NO_CONSTTIME           0x0100
-# ifdef OPENSSL_USE_DEPRECATED
-/* deprecated name for the flag*/
-/*
- * new with 0.9.7h; the built-in RSA
- * implementation now uses constant time
- * modular exponentiation for secret exponents
- * by default. This flag causes the
- * faster variable sliding window method to
- * be used for all exponents.
- */
-#  define RSA_FLAG_NO_EXP_CONSTTIME RSA_FLAG_NO_CONSTTIME
-# endif
-
-# define EVP_PKEY_CTX_set_rsa_padding(ctx, pad) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, EVP_PKEY_CTRL_RSA_PADDING, \
-                                pad, NULL)
-
-# define EVP_PKEY_CTX_get_rsa_padding(ctx, ppad) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, \
-                                EVP_PKEY_CTRL_GET_RSA_PADDING, 0, ppad)
-
-# define EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, len) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                                (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
-                                EVP_PKEY_CTRL_RSA_PSS_SALTLEN, \
-                                len, NULL)
-
-# define EVP_PKEY_CTX_get_rsa_pss_saltlen(ctx, plen) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \
-                                (EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \
-                                EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, \
-                                0, plen)
-
-# define EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_RSA_KEYGEN_BITS, bits, NULL)
-
-# define EVP_PKEY_CTX_set_rsa_keygen_pubexp(ctx, pubexp) \
-        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \
-                                EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp)
-
-# define  EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, md)  \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_SIG,  \
-                                EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)md)
-
-# define  EVP_PKEY_CTX_get_rsa_mgf1_md(ctx, pmd) \
-                EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_SIG,  \
-                                EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)pmd)
-
-# define EVP_PKEY_CTRL_RSA_PADDING       (EVP_PKEY_ALG_CTRL + 1)
-# define EVP_PKEY_CTRL_RSA_PSS_SALTLEN   (EVP_PKEY_ALG_CTRL + 2)
-
-# define EVP_PKEY_CTRL_RSA_KEYGEN_BITS   (EVP_PKEY_ALG_CTRL + 3)
-# define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP (EVP_PKEY_ALG_CTRL + 4)
-# define EVP_PKEY_CTRL_RSA_MGF1_MD       (EVP_PKEY_ALG_CTRL + 5)
-
-# define EVP_PKEY_CTRL_GET_RSA_PADDING           (EVP_PKEY_ALG_CTRL + 6)
-# define EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN       (EVP_PKEY_ALG_CTRL + 7)
-# define EVP_PKEY_CTRL_GET_RSA_MGF1_MD           (EVP_PKEY_ALG_CTRL + 8)
-
-# define RSA_PKCS1_PADDING       1
-# define RSA_SSLV23_PADDING      2
-# define RSA_NO_PADDING          3
-# define RSA_PKCS1_OAEP_PADDING  4
-# define RSA_X931_PADDING        5
-/* EVP_PKEY_ only */
-# define RSA_PKCS1_PSS_PADDING   6
-
-# define RSA_PKCS1_PADDING_SIZE  11
-
-# define RSA_set_app_data(s,arg)         RSA_set_ex_data(s,0,arg)
-# define RSA_get_app_data(s)             RSA_get_ex_data(s,0)
-
-RSA *RSA_new(void);
-RSA *RSA_new_method(ENGINE *engine);
-int RSA_size(const RSA *rsa);
-
-/* Deprecated version */
-# ifndef OPENSSL_NO_DEPRECATED
-RSA *RSA_generate_key(int bits, unsigned long e, void
-                       (*callback) (int, int, void *), void *cb_arg);
-# endif                         /* !defined(OPENSSL_NO_DEPRECATED) */
-
-/* New version */
-int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);
-
-int RSA_check_key(const RSA *);
-        /* next 4 return -1 on error */
-int RSA_public_encrypt(int flen, const unsigned char *from,
-                       unsigned char *to, RSA *rsa, int padding);
-int RSA_private_encrypt(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-int RSA_public_decrypt(int flen, const unsigned char *from,
-                       unsigned char *to, RSA *rsa, int padding);
-int RSA_private_decrypt(int flen, const unsigned char *from,
-                        unsigned char *to, RSA *rsa, int padding);
-void RSA_free(RSA *r);
-/* "up" the RSA object's reference count */
-int RSA_up_ref(RSA *r);
-
-int RSA_flags(const RSA *r);
-
-void RSA_set_default_method(const RSA_METHOD *meth);
-const RSA_METHOD *RSA_get_default_method(void);
-const RSA_METHOD *RSA_get_method(const RSA *rsa);
-int RSA_set_method(RSA *rsa, const RSA_METHOD *meth);
-
-/* This function needs the memory locking malloc callbacks to be installed */
-int RSA_memory_lock(RSA *r);
-
-/* these are the actual SSLeay RSA functions */
-const RSA_METHOD *RSA_PKCS1_SSLeay(void);
-
-const RSA_METHOD *RSA_null_method(void);
-
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPublicKey)
-DECLARE_ASN1_ENCODE_FUNCTIONS_const(RSA, RSAPrivateKey)
-
-typedef struct rsa_pss_params_st {
-    X509_ALGOR *hashAlgorithm;
-    X509_ALGOR *maskGenAlgorithm;
-    ASN1_INTEGER *saltLength;
-    ASN1_INTEGER *trailerField;
-} RSA_PSS_PARAMS;
-
-DECLARE_ASN1_FUNCTIONS(RSA_PSS_PARAMS)
-
-# ifndef OPENSSL_NO_FP_API
-int RSA_print_fp(FILE *fp, const RSA *r, int offset);
-# endif
-
-# ifndef OPENSSL_NO_BIO
-int RSA_print(BIO *bp, const RSA *r, int offset);
-# endif
-
-# ifndef OPENSSL_NO_RC4
-int i2d_RSA_NET(const RSA *a, unsigned char **pp,
-                int (*cb) (char *buf, int len, const char *prompt,
-                           int verify), int sgckey);
-RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
-                 int (*cb) (char *buf, int len, const char *prompt,
-                            int verify), int sgckey);
-
-int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
-                     int (*cb) (char *buf, int len, const char *prompt,
-                                int verify));
-RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
-                      int (*cb) (char *buf, int len, const char *prompt,
-                                 int verify));
-# endif
-
-/*
- * The following 2 functions sign and verify a X509_SIG ASN1 object inside
- * PKCS#1 padded RSA encryption
- */
-int RSA_sign(int type, const unsigned char *m, unsigned int m_length,
-             unsigned char *sigret, unsigned int *siglen, RSA *rsa);
-int RSA_verify(int type, const unsigned char *m, unsigned int m_length,
-               const unsigned char *sigbuf, unsigned int siglen, RSA *rsa);
-
-/*
- * The following 2 function sign and verify a ASN1_OCTET_STRING object inside
- * PKCS#1 padded RSA encryption
- */
-int RSA_sign_ASN1_OCTET_STRING(int type,
-                               const unsigned char *m, unsigned int m_length,
-                               unsigned char *sigret, unsigned int *siglen,
-                               RSA *rsa);
-int RSA_verify_ASN1_OCTET_STRING(int type, const unsigned char *m,
-                                 unsigned int m_length, unsigned char *sigbuf,
-                                 unsigned int siglen, RSA *rsa);
-
-int RSA_blinding_on(RSA *rsa, BN_CTX *ctx);
-void RSA_blinding_off(RSA *rsa);
-BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *ctx);
-
-int RSA_padding_add_PKCS1_type_1(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl);
-int RSA_padding_check_PKCS1_type_1(unsigned char *to, int tlen,
-                                   const unsigned char *f, int fl,
-                                   int rsa_len);
-int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl);
-int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen,
-                                   const unsigned char *f, int fl,
-                                   int rsa_len);
-int PKCS1_MGF1(unsigned char *mask, long len, const unsigned char *seed,
-               long seedlen, const EVP_MD *dgst);
-int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
-                               const unsigned char *f, int fl,
-                               const unsigned char *p, int pl);
-int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
-                                 const unsigned char *f, int fl, int rsa_len,
-                                 const unsigned char *p, int pl);
-int RSA_padding_add_SSLv23(unsigned char *to, int tlen,
-                           const unsigned char *f, int fl);
-int RSA_padding_check_SSLv23(unsigned char *to, int tlen,
-                             const unsigned char *f, int fl, int rsa_len);
-int RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *f,
-                         int fl);
-int RSA_padding_check_none(unsigned char *to, int tlen,
-                           const unsigned char *f, int fl, int rsa_len);
-int RSA_padding_add_X931(unsigned char *to, int tlen, const unsigned char *f,
-                         int fl);
-int RSA_padding_check_X931(unsigned char *to, int tlen,
-                           const unsigned char *f, int fl, int rsa_len);
-int RSA_X931_hash_id(int nid);
-
-int RSA_verify_PKCS1_PSS(RSA *rsa, const unsigned char *mHash,
-                         const EVP_MD *Hash, const unsigned char *EM,
-                         int sLen);
-int RSA_padding_add_PKCS1_PSS(RSA *rsa, unsigned char *EM,
-                              const unsigned char *mHash, const EVP_MD *Hash,
-                              int sLen);
-
-int RSA_verify_PKCS1_PSS_mgf1(RSA *rsa, const unsigned char *mHash,
-                              const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                              const unsigned char *EM, int sLen);
-
-int RSA_padding_add_PKCS1_PSS_mgf1(RSA *rsa, unsigned char *EM,
-                                   const unsigned char *mHash,
-                                   const EVP_MD *Hash, const EVP_MD *mgf1Hash,
-                                   int sLen);
-
-int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                         CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int RSA_set_ex_data(RSA *r, int idx, void *arg);
-void *RSA_get_ex_data(const RSA *r, int idx);
-
-RSA *RSAPublicKey_dup(RSA *rsa);
-RSA *RSAPrivateKey_dup(RSA *rsa);
-
-/*
- * If this flag is set the RSA method is FIPS compliant and can be used in
- * FIPS mode. This is set in the validated module method. If an application
- * sets this flag in its own methods it is its responsibility to ensure the
- * result is compliant.
- */
-
-# define RSA_FLAG_FIPS_METHOD                    0x0400
-
-/*
- * If this flag is set the operations normally disabled in FIPS mode are
- * permitted it is then the applications responsibility to ensure that the
- * usage is compliant.
- */
-
-# define RSA_FLAG_NON_FIPS_ALLOW                 0x0400
-/*
- * Application has decided PRNG is good enough to generate a key: don't
- * check.
- */
-# define RSA_FLAG_CHECKED                        0x0800
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_RSA_strings(void);
-
-/* Error codes for the RSA functions. */
-
-/* Function codes. */
-# define RSA_F_CHECK_PADDING_MD                           140
-# define RSA_F_DO_RSA_PRINT                               146
-# define RSA_F_INT_RSA_VERIFY                             145
-# define RSA_F_MEMORY_LOCK                                100
-# define RSA_F_OLD_RSA_PRIV_DECODE                        147
-# define RSA_F_PKEY_RSA_CTRL                              143
-# define RSA_F_PKEY_RSA_CTRL_STR                          144
-# define RSA_F_PKEY_RSA_SIGN                              142
-# define RSA_F_PKEY_RSA_VERIFY                            154
-# define RSA_F_PKEY_RSA_VERIFYRECOVER                     141
-# define RSA_F_RSA_BUILTIN_KEYGEN                         129
-# define RSA_F_RSA_CHECK_KEY                              123
-# define RSA_F_RSA_EAY_PRIVATE_DECRYPT                    101
-# define RSA_F_RSA_EAY_PRIVATE_ENCRYPT                    102
-# define RSA_F_RSA_EAY_PUBLIC_DECRYPT                     103
-# define RSA_F_RSA_EAY_PUBLIC_ENCRYPT                     104
-# define RSA_F_RSA_GENERATE_KEY                           105
-# define RSA_F_RSA_GENERATE_KEY_EX                        155
-# define RSA_F_RSA_ITEM_VERIFY                            156
-# define RSA_F_RSA_MEMORY_LOCK                            130
-# define RSA_F_RSA_NEW_METHOD                             106
-# define RSA_F_RSA_NULL                                   124
-# define RSA_F_RSA_NULL_MOD_EXP                           131
-# define RSA_F_RSA_NULL_PRIVATE_DECRYPT                   132
-# define RSA_F_RSA_NULL_PRIVATE_ENCRYPT                   133
-# define RSA_F_RSA_NULL_PUBLIC_DECRYPT                    134
-# define RSA_F_RSA_NULL_PUBLIC_ENCRYPT                    135
-# define RSA_F_RSA_PADDING_ADD_NONE                       107
-# define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP                 121
-# define RSA_F_RSA_PADDING_ADD_PKCS1_PSS                  125
-# define RSA_F_RSA_PADDING_ADD_PKCS1_PSS_MGF1             148
-# define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1               108
-# define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2               109
-# define RSA_F_RSA_PADDING_ADD_SSLV23                     110
-# define RSA_F_RSA_PADDING_ADD_X931                       127
-# define RSA_F_RSA_PADDING_CHECK_NONE                     111
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP               122
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1             112
-# define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2             113
-# define RSA_F_RSA_PADDING_CHECK_SSLV23                   114
-# define RSA_F_RSA_PADDING_CHECK_X931                     128
-# define RSA_F_RSA_PRINT                                  115
-# define RSA_F_RSA_PRINT_FP                               116
-# define RSA_F_RSA_PRIVATE_DECRYPT                        150
-# define RSA_F_RSA_PRIVATE_ENCRYPT                        151
-# define RSA_F_RSA_PRIV_DECODE                            137
-# define RSA_F_RSA_PRIV_ENCODE                            138
-# define RSA_F_RSA_PUBLIC_DECRYPT                         152
-# define RSA_F_RSA_PUBLIC_ENCRYPT                         153
-# define RSA_F_RSA_PUB_DECODE                             139
-# define RSA_F_RSA_SETUP_BLINDING                         136
-# define RSA_F_RSA_SIGN                                   117
-# define RSA_F_RSA_SIGN_ASN1_OCTET_STRING                 118
-# define RSA_F_RSA_VERIFY                                 119
-# define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               120
-# define RSA_F_RSA_VERIFY_PKCS1_PSS                       126
-# define RSA_F_RSA_VERIFY_PKCS1_PSS_MGF1                  149
-
-/* Reason codes. */
-# define RSA_R_ALGORITHM_MISMATCH                         100
-# define RSA_R_BAD_E_VALUE                                101
-# define RSA_R_BAD_FIXED_HEADER_DECRYPT                   102
-# define RSA_R_BAD_PAD_BYTE_COUNT                         103
-# define RSA_R_BAD_SIGNATURE                              104
-# define RSA_R_BLOCK_TYPE_IS_NOT_01                       106
-# define RSA_R_BLOCK_TYPE_IS_NOT_02                       107
-# define RSA_R_DATA_GREATER_THAN_MOD_LEN                  108
-# define RSA_R_DATA_TOO_LARGE                             109
-# define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                110
-# define RSA_R_DATA_TOO_LARGE_FOR_MODULUS                 132
-# define RSA_R_DATA_TOO_SMALL                             111
-# define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE                122
-# define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY                 112
-# define RSA_R_DMP1_NOT_CONGRUENT_TO_D                    124
-# define RSA_R_DMQ1_NOT_CONGRUENT_TO_D                    125
-# define RSA_R_D_E_NOT_CONGRUENT_TO_1                     123
-# define RSA_R_FIRST_OCTET_INVALID                        133
-# define RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE        144
-# define RSA_R_INVALID_DIGEST_LENGTH                      143
-# define RSA_R_INVALID_HEADER                             137
-# define RSA_R_INVALID_KEYBITS                            145
-# define RSA_R_INVALID_MESSAGE_LENGTH                     131
-# define RSA_R_INVALID_MGF1_MD                            156
-# define RSA_R_INVALID_PADDING                            138
-# define RSA_R_INVALID_PADDING_MODE                       141
-# define RSA_R_INVALID_PSS_PARAMETERS                     149
-# define RSA_R_INVALID_PSS_SALTLEN                        146
-# define RSA_R_INVALID_SALT_LENGTH                        150
-# define RSA_R_INVALID_TRAILER                            139
-# define RSA_R_INVALID_X931_DIGEST                        142
-# define RSA_R_IQMP_NOT_INVERSE_OF_Q                      126
-# define RSA_R_KEY_SIZE_TOO_SMALL                         120
-# define RSA_R_LAST_OCTET_INVALID                         134
-# define RSA_R_MODULUS_TOO_LARGE                          105
-# define RSA_R_NON_FIPS_RSA_METHOD                        157
-# define RSA_R_NO_PUBLIC_EXPONENT                         140
-# define RSA_R_NULL_BEFORE_BLOCK_MISSING                  113
-# define RSA_R_N_DOES_NOT_EQUAL_P_Q                       127
-# define RSA_R_OAEP_DECODING_ERROR                        121
-# define RSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE         158
-# define RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE   148
-# define RSA_R_PADDING_CHECK_FAILED                       114
-# define RSA_R_PKCS_DECODING_ERROR                        159
-# define RSA_R_P_NOT_PRIME                                128
-# define RSA_R_Q_NOT_PRIME                                129
-# define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED               130
-# define RSA_R_SLEN_CHECK_FAILED                          136
-# define RSA_R_SLEN_RECOVERY_FAILED                       135
-# define RSA_R_SSLV3_ROLLBACK_ATTACK                      115
-# define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
-# define RSA_R_UNKNOWN_ALGORITHM_TYPE                     117
-# define RSA_R_UNKNOWN_MASK_DIGEST                        151
-# define RSA_R_UNKNOWN_PADDING_TYPE                       118
-# define RSA_R_UNKNOWN_PSS_DIGEST                         152
-# define RSA_R_UNSUPPORTED_MASK_ALGORITHM                 153
-# define RSA_R_UNSUPPORTED_MASK_PARAMETER                 154
-# define RSA_R_UNSUPPORTED_SIGNATURE_TYPE                 155
-# define RSA_R_VALUE_MISSING                              147
-# define RSA_R_WRONG_SIGNATURE_LENGTH                     119
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/safestack.h b/include.new/openssl/safestack.h
deleted file mode 100644
index 519649b..0000000
--- a/include.new/openssl/safestack.h
+++ /dev/null
@@ -1,2536 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SAFESTACK_H
-# define HEADER_SAFESTACK_H
-
-# include <openssl/stack.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# ifndef CHECKED_PTR_OF
-#  define CHECKED_PTR_OF(type, p) \
-    ((void*) (1 ? p : (type*)0))
-# endif
-
-/*
- * In C++ we get problems because an explicit cast is needed from (void *) we
- * use CHECKED_STACK_OF to ensure the correct type is passed in the macros
- * below.
- */
-
-# define CHECKED_STACK_OF(type, p) \
-    ((_STACK*) (1 ? p : (STACK_OF(type)*)0))
-
-# define CHECKED_SK_FREE_FUNC(type, p) \
-    ((void (*)(void *)) ((1 ? p : (void (*)(type *))0)))
-
-# define CHECKED_SK_FREE_FUNC2(type, p) \
-    ((void (*)(void *)) ((1 ? p : (void (*)(type))0)))
-
-# define CHECKED_SK_CMP_FUNC(type, p) \
-    ((int (*)(const void *, const void *)) \
-        ((1 ? p : (int (*)(const type * const *, const type * const *))0)))
-
-# define STACK_OF(type) struct stack_st_##type
-# define PREDECLARE_STACK_OF(type) STACK_OF(type);
-
-# define DECLARE_STACK_OF(type) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-# define DECLARE_SPECIAL_STACK_OF(type, type2) \
-STACK_OF(type) \
-    { \
-    _STACK stack; \
-    };
-
-/* nada (obsolete in new safestack approach)*/
-# define IMPLEMENT_STACK_OF(type)
-
-/*-
- * Strings are special: normally an lhash entry will point to a single
- * (somewhat) mutable object. In the case of strings:
- *
- * a) Instead of a single char, there is an array of chars, NUL-terminated.
- * b) The string may have be immutable.
- *
- * So, they need their own declarations. Especially important for
- * type-checking tools, such as Deputy.
- *
- * In practice, however, it appears to be hard to have a const
- * string. For now, I'm settling for dealing with the fact it is a
- * string at all.
- */
-typedef char *OPENSSL_STRING;
-
-typedef const char *OPENSSL_CSTRING;
-
-/*
- * Confusingly, LHASH_OF(STRING) deals with char ** throughout, but
- * STACK_OF(STRING) is really more like STACK_OF(char), only, as mentioned
- * above, instead of a single char each entry is a NUL-terminated array of
- * chars. So, we have to implement STRING specially for STACK_OF. This is
- * dealt with in the autogenerated macros below.
- */
-
-DECLARE_SPECIAL_STACK_OF(OPENSSL_STRING, char)
-
-/*
- * Similarly, we sometimes use a block of characters, NOT nul-terminated.
- * These should also be distinguished from "normal" stacks.
- */
-typedef void *OPENSSL_BLOCK;
-DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void)
-
-/*
- * SKM_sk_... stack macros are internal to safestack.h: never use them
- * directly, use sk_<type>_... instead
- */
-# define SKM_sk_new(type, cmp) \
-        ((STACK_OF(type) *)sk_new(CHECKED_SK_CMP_FUNC(type, cmp)))
-# define SKM_sk_new_null(type) \
-        ((STACK_OF(type) *)sk_new_null())
-# define SKM_sk_free(type, st) \
-        sk_free(CHECKED_STACK_OF(type, st))
-# define SKM_sk_num(type, st) \
-        sk_num(CHECKED_STACK_OF(type, st))
-# define SKM_sk_value(type, st,i) \
-        ((type *)sk_value(CHECKED_STACK_OF(type, st), i))
-# define SKM_sk_set(type, st,i,val) \
-        sk_set(CHECKED_STACK_OF(type, st), i, CHECKED_PTR_OF(type, val))
-# define SKM_sk_zero(type, st) \
-        sk_zero(CHECKED_STACK_OF(type, st))
-# define SKM_sk_push(type, st, val) \
-        sk_push(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-# define SKM_sk_unshift(type, st, val) \
-        sk_unshift(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-# define SKM_sk_find(type, st, val) \
-        sk_find(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val))
-# define SKM_sk_find_ex(type, st, val) \
-        sk_find_ex(CHECKED_STACK_OF(type, st), \
-                   CHECKED_PTR_OF(type, val))
-# define SKM_sk_delete(type, st, i) \
-        (type *)sk_delete(CHECKED_STACK_OF(type, st), i)
-# define SKM_sk_delete_ptr(type, st, ptr) \
-        (type *)sk_delete_ptr(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, ptr))
-# define SKM_sk_insert(type, st,val, i) \
-        sk_insert(CHECKED_STACK_OF(type, st), CHECKED_PTR_OF(type, val), i)
-# define SKM_sk_set_cmp_func(type, st, cmp) \
-        ((int (*)(const type * const *,const type * const *)) \
-        sk_set_cmp_func(CHECKED_STACK_OF(type, st), CHECKED_SK_CMP_FUNC(type, cmp)))
-# define SKM_sk_dup(type, st) \
-        (STACK_OF(type) *)sk_dup(CHECKED_STACK_OF(type, st))
-# define SKM_sk_pop_free(type, st, free_func) \
-        sk_pop_free(CHECKED_STACK_OF(type, st), CHECKED_SK_FREE_FUNC(type, free_func))
-# define SKM_sk_shift(type, st) \
-        (type *)sk_shift(CHECKED_STACK_OF(type, st))
-# define SKM_sk_pop(type, st) \
-        (type *)sk_pop(CHECKED_STACK_OF(type, st))
-# define SKM_sk_sort(type, st) \
-        sk_sort(CHECKED_STACK_OF(type, st))
-# define SKM_sk_is_sorted(type, st) \
-        sk_is_sorted(CHECKED_STACK_OF(type, st))
-# define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-  (STACK_OF(type) *)d2i_ASN1_SET( \
-                                (STACK_OF(OPENSSL_BLOCK) **)CHECKED_PTR_OF(STACK_OF(type)*, st), \
-                                pp, length, \
-                                CHECKED_D2I_OF(type, d2i_func), \
-                                CHECKED_SK_FREE_FUNC(type, free_func), \
-                                ex_tag, ex_class)
-# define SKM_ASN1_SET_OF_i2d(type, st, pp, i2d_func, ex_tag, ex_class, is_set) \
-  i2d_ASN1_SET((STACK_OF(OPENSSL_BLOCK) *)CHECKED_STACK_OF(type, st), pp, \
-                                CHECKED_I2D_OF(type, i2d_func), \
-                                ex_tag, ex_class, is_set)
-# define SKM_ASN1_seq_pack(type, st, i2d_func, buf, len) \
-        ASN1_seq_pack(CHECKED_PTR_OF(STACK_OF(type), st), \
-                        CHECKED_I2D_OF(type, i2d_func), buf, len)
-# define SKM_ASN1_seq_unpack(type, buf, len, d2i_func, free_func) \
-        (STACK_OF(type) *)ASN1_seq_unpack(buf, len, CHECKED_D2I_OF(type, d2i_func), CHECKED_SK_FREE_FUNC(type, free_func))
-# define SKM_PKCS12_decrypt_d2i(type, algor, d2i_func, free_func, pass, passlen, oct, seq) \
-        (STACK_OF(type) *)PKCS12_decrypt_d2i(algor, \
-                                CHECKED_D2I_OF(type, d2i_func), \
-                                CHECKED_SK_FREE_FUNC(type, free_func), \
-                                pass, passlen, oct, seq)
-/*
- * This block of defines is updated by util/mkstack.pl, please do not touch!
- */
-# define sk_ACCESS_DESCRIPTION_new(cmp) SKM_sk_new(ACCESS_DESCRIPTION, (cmp))
-# define sk_ACCESS_DESCRIPTION_new_null() SKM_sk_new_null(ACCESS_DESCRIPTION)
-# define sk_ACCESS_DESCRIPTION_free(st) SKM_sk_free(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_num(st) SKM_sk_num(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_value(st, i) SKM_sk_value(ACCESS_DESCRIPTION, (st), (i))
-# define sk_ACCESS_DESCRIPTION_set(st, i, val) SKM_sk_set(ACCESS_DESCRIPTION, (st), (i), (val))
-# define sk_ACCESS_DESCRIPTION_zero(st) SKM_sk_zero(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_push(st, val) SKM_sk_push(ACCESS_DESCRIPTION, (st), (val))
-# define sk_ACCESS_DESCRIPTION_unshift(st, val) SKM_sk_unshift(ACCESS_DESCRIPTION, (st), (val))
-# define sk_ACCESS_DESCRIPTION_find(st, val) SKM_sk_find(ACCESS_DESCRIPTION, (st), (val))
-# define sk_ACCESS_DESCRIPTION_find_ex(st, val) SKM_sk_find_ex(ACCESS_DESCRIPTION, (st), (val))
-# define sk_ACCESS_DESCRIPTION_delete(st, i) SKM_sk_delete(ACCESS_DESCRIPTION, (st), (i))
-# define sk_ACCESS_DESCRIPTION_delete_ptr(st, ptr) SKM_sk_delete_ptr(ACCESS_DESCRIPTION, (st), (ptr))
-# define sk_ACCESS_DESCRIPTION_insert(st, val, i) SKM_sk_insert(ACCESS_DESCRIPTION, (st), (val), (i))
-# define sk_ACCESS_DESCRIPTION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ACCESS_DESCRIPTION, (st), (cmp))
-# define sk_ACCESS_DESCRIPTION_dup(st) SKM_sk_dup(ACCESS_DESCRIPTION, st)
-# define sk_ACCESS_DESCRIPTION_pop_free(st, free_func) SKM_sk_pop_free(ACCESS_DESCRIPTION, (st), (free_func))
-# define sk_ACCESS_DESCRIPTION_shift(st) SKM_sk_shift(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_pop(st) SKM_sk_pop(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_sort(st) SKM_sk_sort(ACCESS_DESCRIPTION, (st))
-# define sk_ACCESS_DESCRIPTION_is_sorted(st) SKM_sk_is_sorted(ACCESS_DESCRIPTION, (st))
-# define sk_ASIdOrRange_new(cmp) SKM_sk_new(ASIdOrRange, (cmp))
-# define sk_ASIdOrRange_new_null() SKM_sk_new_null(ASIdOrRange)
-# define sk_ASIdOrRange_free(st) SKM_sk_free(ASIdOrRange, (st))
-# define sk_ASIdOrRange_num(st) SKM_sk_num(ASIdOrRange, (st))
-# define sk_ASIdOrRange_value(st, i) SKM_sk_value(ASIdOrRange, (st), (i))
-# define sk_ASIdOrRange_set(st, i, val) SKM_sk_set(ASIdOrRange, (st), (i), (val))
-# define sk_ASIdOrRange_zero(st) SKM_sk_zero(ASIdOrRange, (st))
-# define sk_ASIdOrRange_push(st, val) SKM_sk_push(ASIdOrRange, (st), (val))
-# define sk_ASIdOrRange_unshift(st, val) SKM_sk_unshift(ASIdOrRange, (st), (val))
-# define sk_ASIdOrRange_find(st, val) SKM_sk_find(ASIdOrRange, (st), (val))
-# define sk_ASIdOrRange_find_ex(st, val) SKM_sk_find_ex(ASIdOrRange, (st), (val))
-# define sk_ASIdOrRange_delete(st, i) SKM_sk_delete(ASIdOrRange, (st), (i))
-# define sk_ASIdOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASIdOrRange, (st), (ptr))
-# define sk_ASIdOrRange_insert(st, val, i) SKM_sk_insert(ASIdOrRange, (st), (val), (i))
-# define sk_ASIdOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASIdOrRange, (st), (cmp))
-# define sk_ASIdOrRange_dup(st) SKM_sk_dup(ASIdOrRange, st)
-# define sk_ASIdOrRange_pop_free(st, free_func) SKM_sk_pop_free(ASIdOrRange, (st), (free_func))
-# define sk_ASIdOrRange_shift(st) SKM_sk_shift(ASIdOrRange, (st))
-# define sk_ASIdOrRange_pop(st) SKM_sk_pop(ASIdOrRange, (st))
-# define sk_ASIdOrRange_sort(st) SKM_sk_sort(ASIdOrRange, (st))
-# define sk_ASIdOrRange_is_sorted(st) SKM_sk_is_sorted(ASIdOrRange, (st))
-# define sk_ASN1_GENERALSTRING_new(cmp) SKM_sk_new(ASN1_GENERALSTRING, (cmp))
-# define sk_ASN1_GENERALSTRING_new_null() SKM_sk_new_null(ASN1_GENERALSTRING)
-# define sk_ASN1_GENERALSTRING_free(st) SKM_sk_free(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_num(st) SKM_sk_num(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_value(st, i) SKM_sk_value(ASN1_GENERALSTRING, (st), (i))
-# define sk_ASN1_GENERALSTRING_set(st, i, val) SKM_sk_set(ASN1_GENERALSTRING, (st), (i), (val))
-# define sk_ASN1_GENERALSTRING_zero(st) SKM_sk_zero(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_push(st, val) SKM_sk_push(ASN1_GENERALSTRING, (st), (val))
-# define sk_ASN1_GENERALSTRING_unshift(st, val) SKM_sk_unshift(ASN1_GENERALSTRING, (st), (val))
-# define sk_ASN1_GENERALSTRING_find(st, val) SKM_sk_find(ASN1_GENERALSTRING, (st), (val))
-# define sk_ASN1_GENERALSTRING_find_ex(st, val) SKM_sk_find_ex(ASN1_GENERALSTRING, (st), (val))
-# define sk_ASN1_GENERALSTRING_delete(st, i) SKM_sk_delete(ASN1_GENERALSTRING, (st), (i))
-# define sk_ASN1_GENERALSTRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_GENERALSTRING, (st), (ptr))
-# define sk_ASN1_GENERALSTRING_insert(st, val, i) SKM_sk_insert(ASN1_GENERALSTRING, (st), (val), (i))
-# define sk_ASN1_GENERALSTRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_GENERALSTRING, (st), (cmp))
-# define sk_ASN1_GENERALSTRING_dup(st) SKM_sk_dup(ASN1_GENERALSTRING, st)
-# define sk_ASN1_GENERALSTRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_GENERALSTRING, (st), (free_func))
-# define sk_ASN1_GENERALSTRING_shift(st) SKM_sk_shift(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_pop(st) SKM_sk_pop(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_sort(st) SKM_sk_sort(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_GENERALSTRING_is_sorted(st) SKM_sk_is_sorted(ASN1_GENERALSTRING, (st))
-# define sk_ASN1_INTEGER_new(cmp) SKM_sk_new(ASN1_INTEGER, (cmp))
-# define sk_ASN1_INTEGER_new_null() SKM_sk_new_null(ASN1_INTEGER)
-# define sk_ASN1_INTEGER_free(st) SKM_sk_free(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_num(st) SKM_sk_num(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_value(st, i) SKM_sk_value(ASN1_INTEGER, (st), (i))
-# define sk_ASN1_INTEGER_set(st, i, val) SKM_sk_set(ASN1_INTEGER, (st), (i), (val))
-# define sk_ASN1_INTEGER_zero(st) SKM_sk_zero(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_push(st, val) SKM_sk_push(ASN1_INTEGER, (st), (val))
-# define sk_ASN1_INTEGER_unshift(st, val) SKM_sk_unshift(ASN1_INTEGER, (st), (val))
-# define sk_ASN1_INTEGER_find(st, val) SKM_sk_find(ASN1_INTEGER, (st), (val))
-# define sk_ASN1_INTEGER_find_ex(st, val) SKM_sk_find_ex(ASN1_INTEGER, (st), (val))
-# define sk_ASN1_INTEGER_delete(st, i) SKM_sk_delete(ASN1_INTEGER, (st), (i))
-# define sk_ASN1_INTEGER_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_INTEGER, (st), (ptr))
-# define sk_ASN1_INTEGER_insert(st, val, i) SKM_sk_insert(ASN1_INTEGER, (st), (val), (i))
-# define sk_ASN1_INTEGER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_INTEGER, (st), (cmp))
-# define sk_ASN1_INTEGER_dup(st) SKM_sk_dup(ASN1_INTEGER, st)
-# define sk_ASN1_INTEGER_pop_free(st, free_func) SKM_sk_pop_free(ASN1_INTEGER, (st), (free_func))
-# define sk_ASN1_INTEGER_shift(st) SKM_sk_shift(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_pop(st) SKM_sk_pop(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_sort(st) SKM_sk_sort(ASN1_INTEGER, (st))
-# define sk_ASN1_INTEGER_is_sorted(st) SKM_sk_is_sorted(ASN1_INTEGER, (st))
-# define sk_ASN1_OBJECT_new(cmp) SKM_sk_new(ASN1_OBJECT, (cmp))
-# define sk_ASN1_OBJECT_new_null() SKM_sk_new_null(ASN1_OBJECT)
-# define sk_ASN1_OBJECT_free(st) SKM_sk_free(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_num(st) SKM_sk_num(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_value(st, i) SKM_sk_value(ASN1_OBJECT, (st), (i))
-# define sk_ASN1_OBJECT_set(st, i, val) SKM_sk_set(ASN1_OBJECT, (st), (i), (val))
-# define sk_ASN1_OBJECT_zero(st) SKM_sk_zero(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_push(st, val) SKM_sk_push(ASN1_OBJECT, (st), (val))
-# define sk_ASN1_OBJECT_unshift(st, val) SKM_sk_unshift(ASN1_OBJECT, (st), (val))
-# define sk_ASN1_OBJECT_find(st, val) SKM_sk_find(ASN1_OBJECT, (st), (val))
-# define sk_ASN1_OBJECT_find_ex(st, val) SKM_sk_find_ex(ASN1_OBJECT, (st), (val))
-# define sk_ASN1_OBJECT_delete(st, i) SKM_sk_delete(ASN1_OBJECT, (st), (i))
-# define sk_ASN1_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_OBJECT, (st), (ptr))
-# define sk_ASN1_OBJECT_insert(st, val, i) SKM_sk_insert(ASN1_OBJECT, (st), (val), (i))
-# define sk_ASN1_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_OBJECT, (st), (cmp))
-# define sk_ASN1_OBJECT_dup(st) SKM_sk_dup(ASN1_OBJECT, st)
-# define sk_ASN1_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(ASN1_OBJECT, (st), (free_func))
-# define sk_ASN1_OBJECT_shift(st) SKM_sk_shift(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_pop(st) SKM_sk_pop(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_sort(st) SKM_sk_sort(ASN1_OBJECT, (st))
-# define sk_ASN1_OBJECT_is_sorted(st) SKM_sk_is_sorted(ASN1_OBJECT, (st))
-# define sk_ASN1_STRING_TABLE_new(cmp) SKM_sk_new(ASN1_STRING_TABLE, (cmp))
-# define sk_ASN1_STRING_TABLE_new_null() SKM_sk_new_null(ASN1_STRING_TABLE)
-# define sk_ASN1_STRING_TABLE_free(st) SKM_sk_free(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_num(st) SKM_sk_num(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_value(st, i) SKM_sk_value(ASN1_STRING_TABLE, (st), (i))
-# define sk_ASN1_STRING_TABLE_set(st, i, val) SKM_sk_set(ASN1_STRING_TABLE, (st), (i), (val))
-# define sk_ASN1_STRING_TABLE_zero(st) SKM_sk_zero(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_push(st, val) SKM_sk_push(ASN1_STRING_TABLE, (st), (val))
-# define sk_ASN1_STRING_TABLE_unshift(st, val) SKM_sk_unshift(ASN1_STRING_TABLE, (st), (val))
-# define sk_ASN1_STRING_TABLE_find(st, val) SKM_sk_find(ASN1_STRING_TABLE, (st), (val))
-# define sk_ASN1_STRING_TABLE_find_ex(st, val) SKM_sk_find_ex(ASN1_STRING_TABLE, (st), (val))
-# define sk_ASN1_STRING_TABLE_delete(st, i) SKM_sk_delete(ASN1_STRING_TABLE, (st), (i))
-# define sk_ASN1_STRING_TABLE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_STRING_TABLE, (st), (ptr))
-# define sk_ASN1_STRING_TABLE_insert(st, val, i) SKM_sk_insert(ASN1_STRING_TABLE, (st), (val), (i))
-# define sk_ASN1_STRING_TABLE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_STRING_TABLE, (st), (cmp))
-# define sk_ASN1_STRING_TABLE_dup(st) SKM_sk_dup(ASN1_STRING_TABLE, st)
-# define sk_ASN1_STRING_TABLE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_STRING_TABLE, (st), (free_func))
-# define sk_ASN1_STRING_TABLE_shift(st) SKM_sk_shift(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_pop(st) SKM_sk_pop(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_sort(st) SKM_sk_sort(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_STRING_TABLE_is_sorted(st) SKM_sk_is_sorted(ASN1_STRING_TABLE, (st))
-# define sk_ASN1_TYPE_new(cmp) SKM_sk_new(ASN1_TYPE, (cmp))
-# define sk_ASN1_TYPE_new_null() SKM_sk_new_null(ASN1_TYPE)
-# define sk_ASN1_TYPE_free(st) SKM_sk_free(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_num(st) SKM_sk_num(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_value(st, i) SKM_sk_value(ASN1_TYPE, (st), (i))
-# define sk_ASN1_TYPE_set(st, i, val) SKM_sk_set(ASN1_TYPE, (st), (i), (val))
-# define sk_ASN1_TYPE_zero(st) SKM_sk_zero(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_push(st, val) SKM_sk_push(ASN1_TYPE, (st), (val))
-# define sk_ASN1_TYPE_unshift(st, val) SKM_sk_unshift(ASN1_TYPE, (st), (val))
-# define sk_ASN1_TYPE_find(st, val) SKM_sk_find(ASN1_TYPE, (st), (val))
-# define sk_ASN1_TYPE_find_ex(st, val) SKM_sk_find_ex(ASN1_TYPE, (st), (val))
-# define sk_ASN1_TYPE_delete(st, i) SKM_sk_delete(ASN1_TYPE, (st), (i))
-# define sk_ASN1_TYPE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_TYPE, (st), (ptr))
-# define sk_ASN1_TYPE_insert(st, val, i) SKM_sk_insert(ASN1_TYPE, (st), (val), (i))
-# define sk_ASN1_TYPE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_TYPE, (st), (cmp))
-# define sk_ASN1_TYPE_dup(st) SKM_sk_dup(ASN1_TYPE, st)
-# define sk_ASN1_TYPE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_TYPE, (st), (free_func))
-# define sk_ASN1_TYPE_shift(st) SKM_sk_shift(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_pop(st) SKM_sk_pop(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_sort(st) SKM_sk_sort(ASN1_TYPE, (st))
-# define sk_ASN1_TYPE_is_sorted(st) SKM_sk_is_sorted(ASN1_TYPE, (st))
-# define sk_ASN1_UTF8STRING_new(cmp) SKM_sk_new(ASN1_UTF8STRING, (cmp))
-# define sk_ASN1_UTF8STRING_new_null() SKM_sk_new_null(ASN1_UTF8STRING)
-# define sk_ASN1_UTF8STRING_free(st) SKM_sk_free(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_num(st) SKM_sk_num(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_value(st, i) SKM_sk_value(ASN1_UTF8STRING, (st), (i))
-# define sk_ASN1_UTF8STRING_set(st, i, val) SKM_sk_set(ASN1_UTF8STRING, (st), (i), (val))
-# define sk_ASN1_UTF8STRING_zero(st) SKM_sk_zero(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_push(st, val) SKM_sk_push(ASN1_UTF8STRING, (st), (val))
-# define sk_ASN1_UTF8STRING_unshift(st, val) SKM_sk_unshift(ASN1_UTF8STRING, (st), (val))
-# define sk_ASN1_UTF8STRING_find(st, val) SKM_sk_find(ASN1_UTF8STRING, (st), (val))
-# define sk_ASN1_UTF8STRING_find_ex(st, val) SKM_sk_find_ex(ASN1_UTF8STRING, (st), (val))
-# define sk_ASN1_UTF8STRING_delete(st, i) SKM_sk_delete(ASN1_UTF8STRING, (st), (i))
-# define sk_ASN1_UTF8STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_UTF8STRING, (st), (ptr))
-# define sk_ASN1_UTF8STRING_insert(st, val, i) SKM_sk_insert(ASN1_UTF8STRING, (st), (val), (i))
-# define sk_ASN1_UTF8STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_UTF8STRING, (st), (cmp))
-# define sk_ASN1_UTF8STRING_dup(st) SKM_sk_dup(ASN1_UTF8STRING, st)
-# define sk_ASN1_UTF8STRING_pop_free(st, free_func) SKM_sk_pop_free(ASN1_UTF8STRING, (st), (free_func))
-# define sk_ASN1_UTF8STRING_shift(st) SKM_sk_shift(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_pop(st) SKM_sk_pop(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_sort(st) SKM_sk_sort(ASN1_UTF8STRING, (st))
-# define sk_ASN1_UTF8STRING_is_sorted(st) SKM_sk_is_sorted(ASN1_UTF8STRING, (st))
-# define sk_ASN1_VALUE_new(cmp) SKM_sk_new(ASN1_VALUE, (cmp))
-# define sk_ASN1_VALUE_new_null() SKM_sk_new_null(ASN1_VALUE)
-# define sk_ASN1_VALUE_free(st) SKM_sk_free(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_num(st) SKM_sk_num(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_value(st, i) SKM_sk_value(ASN1_VALUE, (st), (i))
-# define sk_ASN1_VALUE_set(st, i, val) SKM_sk_set(ASN1_VALUE, (st), (i), (val))
-# define sk_ASN1_VALUE_zero(st) SKM_sk_zero(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_push(st, val) SKM_sk_push(ASN1_VALUE, (st), (val))
-# define sk_ASN1_VALUE_unshift(st, val) SKM_sk_unshift(ASN1_VALUE, (st), (val))
-# define sk_ASN1_VALUE_find(st, val) SKM_sk_find(ASN1_VALUE, (st), (val))
-# define sk_ASN1_VALUE_find_ex(st, val) SKM_sk_find_ex(ASN1_VALUE, (st), (val))
-# define sk_ASN1_VALUE_delete(st, i) SKM_sk_delete(ASN1_VALUE, (st), (i))
-# define sk_ASN1_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ASN1_VALUE, (st), (ptr))
-# define sk_ASN1_VALUE_insert(st, val, i) SKM_sk_insert(ASN1_VALUE, (st), (val), (i))
-# define sk_ASN1_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ASN1_VALUE, (st), (cmp))
-# define sk_ASN1_VALUE_dup(st) SKM_sk_dup(ASN1_VALUE, st)
-# define sk_ASN1_VALUE_pop_free(st, free_func) SKM_sk_pop_free(ASN1_VALUE, (st), (free_func))
-# define sk_ASN1_VALUE_shift(st) SKM_sk_shift(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_pop(st) SKM_sk_pop(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_sort(st) SKM_sk_sort(ASN1_VALUE, (st))
-# define sk_ASN1_VALUE_is_sorted(st) SKM_sk_is_sorted(ASN1_VALUE, (st))
-# define sk_BIO_new(cmp) SKM_sk_new(BIO, (cmp))
-# define sk_BIO_new_null() SKM_sk_new_null(BIO)
-# define sk_BIO_free(st) SKM_sk_free(BIO, (st))
-# define sk_BIO_num(st) SKM_sk_num(BIO, (st))
-# define sk_BIO_value(st, i) SKM_sk_value(BIO, (st), (i))
-# define sk_BIO_set(st, i, val) SKM_sk_set(BIO, (st), (i), (val))
-# define sk_BIO_zero(st) SKM_sk_zero(BIO, (st))
-# define sk_BIO_push(st, val) SKM_sk_push(BIO, (st), (val))
-# define sk_BIO_unshift(st, val) SKM_sk_unshift(BIO, (st), (val))
-# define sk_BIO_find(st, val) SKM_sk_find(BIO, (st), (val))
-# define sk_BIO_find_ex(st, val) SKM_sk_find_ex(BIO, (st), (val))
-# define sk_BIO_delete(st, i) SKM_sk_delete(BIO, (st), (i))
-# define sk_BIO_delete_ptr(st, ptr) SKM_sk_delete_ptr(BIO, (st), (ptr))
-# define sk_BIO_insert(st, val, i) SKM_sk_insert(BIO, (st), (val), (i))
-# define sk_BIO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BIO, (st), (cmp))
-# define sk_BIO_dup(st) SKM_sk_dup(BIO, st)
-# define sk_BIO_pop_free(st, free_func) SKM_sk_pop_free(BIO, (st), (free_func))
-# define sk_BIO_shift(st) SKM_sk_shift(BIO, (st))
-# define sk_BIO_pop(st) SKM_sk_pop(BIO, (st))
-# define sk_BIO_sort(st) SKM_sk_sort(BIO, (st))
-# define sk_BIO_is_sorted(st) SKM_sk_is_sorted(BIO, (st))
-# define sk_BY_DIR_ENTRY_new(cmp) SKM_sk_new(BY_DIR_ENTRY, (cmp))
-# define sk_BY_DIR_ENTRY_new_null() SKM_sk_new_null(BY_DIR_ENTRY)
-# define sk_BY_DIR_ENTRY_free(st) SKM_sk_free(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_num(st) SKM_sk_num(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_value(st, i) SKM_sk_value(BY_DIR_ENTRY, (st), (i))
-# define sk_BY_DIR_ENTRY_set(st, i, val) SKM_sk_set(BY_DIR_ENTRY, (st), (i), (val))
-# define sk_BY_DIR_ENTRY_zero(st) SKM_sk_zero(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_push(st, val) SKM_sk_push(BY_DIR_ENTRY, (st), (val))
-# define sk_BY_DIR_ENTRY_unshift(st, val) SKM_sk_unshift(BY_DIR_ENTRY, (st), (val))
-# define sk_BY_DIR_ENTRY_find(st, val) SKM_sk_find(BY_DIR_ENTRY, (st), (val))
-# define sk_BY_DIR_ENTRY_find_ex(st, val) SKM_sk_find_ex(BY_DIR_ENTRY, (st), (val))
-# define sk_BY_DIR_ENTRY_delete(st, i) SKM_sk_delete(BY_DIR_ENTRY, (st), (i))
-# define sk_BY_DIR_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_ENTRY, (st), (ptr))
-# define sk_BY_DIR_ENTRY_insert(st, val, i) SKM_sk_insert(BY_DIR_ENTRY, (st), (val), (i))
-# define sk_BY_DIR_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_ENTRY, (st), (cmp))
-# define sk_BY_DIR_ENTRY_dup(st) SKM_sk_dup(BY_DIR_ENTRY, st)
-# define sk_BY_DIR_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_ENTRY, (st), (free_func))
-# define sk_BY_DIR_ENTRY_shift(st) SKM_sk_shift(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_pop(st) SKM_sk_pop(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_sort(st) SKM_sk_sort(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_ENTRY_is_sorted(st) SKM_sk_is_sorted(BY_DIR_ENTRY, (st))
-# define sk_BY_DIR_HASH_new(cmp) SKM_sk_new(BY_DIR_HASH, (cmp))
-# define sk_BY_DIR_HASH_new_null() SKM_sk_new_null(BY_DIR_HASH)
-# define sk_BY_DIR_HASH_free(st) SKM_sk_free(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_num(st) SKM_sk_num(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_value(st, i) SKM_sk_value(BY_DIR_HASH, (st), (i))
-# define sk_BY_DIR_HASH_set(st, i, val) SKM_sk_set(BY_DIR_HASH, (st), (i), (val))
-# define sk_BY_DIR_HASH_zero(st) SKM_sk_zero(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_push(st, val) SKM_sk_push(BY_DIR_HASH, (st), (val))
-# define sk_BY_DIR_HASH_unshift(st, val) SKM_sk_unshift(BY_DIR_HASH, (st), (val))
-# define sk_BY_DIR_HASH_find(st, val) SKM_sk_find(BY_DIR_HASH, (st), (val))
-# define sk_BY_DIR_HASH_find_ex(st, val) SKM_sk_find_ex(BY_DIR_HASH, (st), (val))
-# define sk_BY_DIR_HASH_delete(st, i) SKM_sk_delete(BY_DIR_HASH, (st), (i))
-# define sk_BY_DIR_HASH_delete_ptr(st, ptr) SKM_sk_delete_ptr(BY_DIR_HASH, (st), (ptr))
-# define sk_BY_DIR_HASH_insert(st, val, i) SKM_sk_insert(BY_DIR_HASH, (st), (val), (i))
-# define sk_BY_DIR_HASH_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(BY_DIR_HASH, (st), (cmp))
-# define sk_BY_DIR_HASH_dup(st) SKM_sk_dup(BY_DIR_HASH, st)
-# define sk_BY_DIR_HASH_pop_free(st, free_func) SKM_sk_pop_free(BY_DIR_HASH, (st), (free_func))
-# define sk_BY_DIR_HASH_shift(st) SKM_sk_shift(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_pop(st) SKM_sk_pop(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_sort(st) SKM_sk_sort(BY_DIR_HASH, (st))
-# define sk_BY_DIR_HASH_is_sorted(st) SKM_sk_is_sorted(BY_DIR_HASH, (st))
-# define sk_CMS_CertificateChoices_new(cmp) SKM_sk_new(CMS_CertificateChoices, (cmp))
-# define sk_CMS_CertificateChoices_new_null() SKM_sk_new_null(CMS_CertificateChoices)
-# define sk_CMS_CertificateChoices_free(st) SKM_sk_free(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_num(st) SKM_sk_num(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_value(st, i) SKM_sk_value(CMS_CertificateChoices, (st), (i))
-# define sk_CMS_CertificateChoices_set(st, i, val) SKM_sk_set(CMS_CertificateChoices, (st), (i), (val))
-# define sk_CMS_CertificateChoices_zero(st) SKM_sk_zero(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_push(st, val) SKM_sk_push(CMS_CertificateChoices, (st), (val))
-# define sk_CMS_CertificateChoices_unshift(st, val) SKM_sk_unshift(CMS_CertificateChoices, (st), (val))
-# define sk_CMS_CertificateChoices_find(st, val) SKM_sk_find(CMS_CertificateChoices, (st), (val))
-# define sk_CMS_CertificateChoices_find_ex(st, val) SKM_sk_find_ex(CMS_CertificateChoices, (st), (val))
-# define sk_CMS_CertificateChoices_delete(st, i) SKM_sk_delete(CMS_CertificateChoices, (st), (i))
-# define sk_CMS_CertificateChoices_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_CertificateChoices, (st), (ptr))
-# define sk_CMS_CertificateChoices_insert(st, val, i) SKM_sk_insert(CMS_CertificateChoices, (st), (val), (i))
-# define sk_CMS_CertificateChoices_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_CertificateChoices, (st), (cmp))
-# define sk_CMS_CertificateChoices_dup(st) SKM_sk_dup(CMS_CertificateChoices, st)
-# define sk_CMS_CertificateChoices_pop_free(st, free_func) SKM_sk_pop_free(CMS_CertificateChoices, (st), (free_func))
-# define sk_CMS_CertificateChoices_shift(st) SKM_sk_shift(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_pop(st) SKM_sk_pop(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_sort(st) SKM_sk_sort(CMS_CertificateChoices, (st))
-# define sk_CMS_CertificateChoices_is_sorted(st) SKM_sk_is_sorted(CMS_CertificateChoices, (st))
-# define sk_CMS_RecipientInfo_new(cmp) SKM_sk_new(CMS_RecipientInfo, (cmp))
-# define sk_CMS_RecipientInfo_new_null() SKM_sk_new_null(CMS_RecipientInfo)
-# define sk_CMS_RecipientInfo_free(st) SKM_sk_free(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_num(st) SKM_sk_num(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_value(st, i) SKM_sk_value(CMS_RecipientInfo, (st), (i))
-# define sk_CMS_RecipientInfo_set(st, i, val) SKM_sk_set(CMS_RecipientInfo, (st), (i), (val))
-# define sk_CMS_RecipientInfo_zero(st) SKM_sk_zero(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_push(st, val) SKM_sk_push(CMS_RecipientInfo, (st), (val))
-# define sk_CMS_RecipientInfo_unshift(st, val) SKM_sk_unshift(CMS_RecipientInfo, (st), (val))
-# define sk_CMS_RecipientInfo_find(st, val) SKM_sk_find(CMS_RecipientInfo, (st), (val))
-# define sk_CMS_RecipientInfo_find_ex(st, val) SKM_sk_find_ex(CMS_RecipientInfo, (st), (val))
-# define sk_CMS_RecipientInfo_delete(st, i) SKM_sk_delete(CMS_RecipientInfo, (st), (i))
-# define sk_CMS_RecipientInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RecipientInfo, (st), (ptr))
-# define sk_CMS_RecipientInfo_insert(st, val, i) SKM_sk_insert(CMS_RecipientInfo, (st), (val), (i))
-# define sk_CMS_RecipientInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RecipientInfo, (st), (cmp))
-# define sk_CMS_RecipientInfo_dup(st) SKM_sk_dup(CMS_RecipientInfo, st)
-# define sk_CMS_RecipientInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_RecipientInfo, (st), (free_func))
-# define sk_CMS_RecipientInfo_shift(st) SKM_sk_shift(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_pop(st) SKM_sk_pop(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_sort(st) SKM_sk_sort(CMS_RecipientInfo, (st))
-# define sk_CMS_RecipientInfo_is_sorted(st) SKM_sk_is_sorted(CMS_RecipientInfo, (st))
-# define sk_CMS_RevocationInfoChoice_new(cmp) SKM_sk_new(CMS_RevocationInfoChoice, (cmp))
-# define sk_CMS_RevocationInfoChoice_new_null() SKM_sk_new_null(CMS_RevocationInfoChoice)
-# define sk_CMS_RevocationInfoChoice_free(st) SKM_sk_free(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_num(st) SKM_sk_num(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_value(st, i) SKM_sk_value(CMS_RevocationInfoChoice, (st), (i))
-# define sk_CMS_RevocationInfoChoice_set(st, i, val) SKM_sk_set(CMS_RevocationInfoChoice, (st), (i), (val))
-# define sk_CMS_RevocationInfoChoice_zero(st) SKM_sk_zero(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_push(st, val) SKM_sk_push(CMS_RevocationInfoChoice, (st), (val))
-# define sk_CMS_RevocationInfoChoice_unshift(st, val) SKM_sk_unshift(CMS_RevocationInfoChoice, (st), (val))
-# define sk_CMS_RevocationInfoChoice_find(st, val) SKM_sk_find(CMS_RevocationInfoChoice, (st), (val))
-# define sk_CMS_RevocationInfoChoice_find_ex(st, val) SKM_sk_find_ex(CMS_RevocationInfoChoice, (st), (val))
-# define sk_CMS_RevocationInfoChoice_delete(st, i) SKM_sk_delete(CMS_RevocationInfoChoice, (st), (i))
-# define sk_CMS_RevocationInfoChoice_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_RevocationInfoChoice, (st), (ptr))
-# define sk_CMS_RevocationInfoChoice_insert(st, val, i) SKM_sk_insert(CMS_RevocationInfoChoice, (st), (val), (i))
-# define sk_CMS_RevocationInfoChoice_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_RevocationInfoChoice, (st), (cmp))
-# define sk_CMS_RevocationInfoChoice_dup(st) SKM_sk_dup(CMS_RevocationInfoChoice, st)
-# define sk_CMS_RevocationInfoChoice_pop_free(st, free_func) SKM_sk_pop_free(CMS_RevocationInfoChoice, (st), (free_func))
-# define sk_CMS_RevocationInfoChoice_shift(st) SKM_sk_shift(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_pop(st) SKM_sk_pop(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_sort(st) SKM_sk_sort(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_RevocationInfoChoice_is_sorted(st) SKM_sk_is_sorted(CMS_RevocationInfoChoice, (st))
-# define sk_CMS_SignerInfo_new(cmp) SKM_sk_new(CMS_SignerInfo, (cmp))
-# define sk_CMS_SignerInfo_new_null() SKM_sk_new_null(CMS_SignerInfo)
-# define sk_CMS_SignerInfo_free(st) SKM_sk_free(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_num(st) SKM_sk_num(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_value(st, i) SKM_sk_value(CMS_SignerInfo, (st), (i))
-# define sk_CMS_SignerInfo_set(st, i, val) SKM_sk_set(CMS_SignerInfo, (st), (i), (val))
-# define sk_CMS_SignerInfo_zero(st) SKM_sk_zero(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_push(st, val) SKM_sk_push(CMS_SignerInfo, (st), (val))
-# define sk_CMS_SignerInfo_unshift(st, val) SKM_sk_unshift(CMS_SignerInfo, (st), (val))
-# define sk_CMS_SignerInfo_find(st, val) SKM_sk_find(CMS_SignerInfo, (st), (val))
-# define sk_CMS_SignerInfo_find_ex(st, val) SKM_sk_find_ex(CMS_SignerInfo, (st), (val))
-# define sk_CMS_SignerInfo_delete(st, i) SKM_sk_delete(CMS_SignerInfo, (st), (i))
-# define sk_CMS_SignerInfo_delete_ptr(st, ptr) SKM_sk_delete_ptr(CMS_SignerInfo, (st), (ptr))
-# define sk_CMS_SignerInfo_insert(st, val, i) SKM_sk_insert(CMS_SignerInfo, (st), (val), (i))
-# define sk_CMS_SignerInfo_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CMS_SignerInfo, (st), (cmp))
-# define sk_CMS_SignerInfo_dup(st) SKM_sk_dup(CMS_SignerInfo, st)
-# define sk_CMS_SignerInfo_pop_free(st, free_func) SKM_sk_pop_free(CMS_SignerInfo, (st), (free_func))
-# define sk_CMS_SignerInfo_shift(st) SKM_sk_shift(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_pop(st) SKM_sk_pop(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_sort(st) SKM_sk_sort(CMS_SignerInfo, (st))
-# define sk_CMS_SignerInfo_is_sorted(st) SKM_sk_is_sorted(CMS_SignerInfo, (st))
-# define sk_CONF_IMODULE_new(cmp) SKM_sk_new(CONF_IMODULE, (cmp))
-# define sk_CONF_IMODULE_new_null() SKM_sk_new_null(CONF_IMODULE)
-# define sk_CONF_IMODULE_free(st) SKM_sk_free(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_num(st) SKM_sk_num(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_value(st, i) SKM_sk_value(CONF_IMODULE, (st), (i))
-# define sk_CONF_IMODULE_set(st, i, val) SKM_sk_set(CONF_IMODULE, (st), (i), (val))
-# define sk_CONF_IMODULE_zero(st) SKM_sk_zero(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_push(st, val) SKM_sk_push(CONF_IMODULE, (st), (val))
-# define sk_CONF_IMODULE_unshift(st, val) SKM_sk_unshift(CONF_IMODULE, (st), (val))
-# define sk_CONF_IMODULE_find(st, val) SKM_sk_find(CONF_IMODULE, (st), (val))
-# define sk_CONF_IMODULE_find_ex(st, val) SKM_sk_find_ex(CONF_IMODULE, (st), (val))
-# define sk_CONF_IMODULE_delete(st, i) SKM_sk_delete(CONF_IMODULE, (st), (i))
-# define sk_CONF_IMODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_IMODULE, (st), (ptr))
-# define sk_CONF_IMODULE_insert(st, val, i) SKM_sk_insert(CONF_IMODULE, (st), (val), (i))
-# define sk_CONF_IMODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_IMODULE, (st), (cmp))
-# define sk_CONF_IMODULE_dup(st) SKM_sk_dup(CONF_IMODULE, st)
-# define sk_CONF_IMODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_IMODULE, (st), (free_func))
-# define sk_CONF_IMODULE_shift(st) SKM_sk_shift(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_pop(st) SKM_sk_pop(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_sort(st) SKM_sk_sort(CONF_IMODULE, (st))
-# define sk_CONF_IMODULE_is_sorted(st) SKM_sk_is_sorted(CONF_IMODULE, (st))
-# define sk_CONF_MODULE_new(cmp) SKM_sk_new(CONF_MODULE, (cmp))
-# define sk_CONF_MODULE_new_null() SKM_sk_new_null(CONF_MODULE)
-# define sk_CONF_MODULE_free(st) SKM_sk_free(CONF_MODULE, (st))
-# define sk_CONF_MODULE_num(st) SKM_sk_num(CONF_MODULE, (st))
-# define sk_CONF_MODULE_value(st, i) SKM_sk_value(CONF_MODULE, (st), (i))
-# define sk_CONF_MODULE_set(st, i, val) SKM_sk_set(CONF_MODULE, (st), (i), (val))
-# define sk_CONF_MODULE_zero(st) SKM_sk_zero(CONF_MODULE, (st))
-# define sk_CONF_MODULE_push(st, val) SKM_sk_push(CONF_MODULE, (st), (val))
-# define sk_CONF_MODULE_unshift(st, val) SKM_sk_unshift(CONF_MODULE, (st), (val))
-# define sk_CONF_MODULE_find(st, val) SKM_sk_find(CONF_MODULE, (st), (val))
-# define sk_CONF_MODULE_find_ex(st, val) SKM_sk_find_ex(CONF_MODULE, (st), (val))
-# define sk_CONF_MODULE_delete(st, i) SKM_sk_delete(CONF_MODULE, (st), (i))
-# define sk_CONF_MODULE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_MODULE, (st), (ptr))
-# define sk_CONF_MODULE_insert(st, val, i) SKM_sk_insert(CONF_MODULE, (st), (val), (i))
-# define sk_CONF_MODULE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_MODULE, (st), (cmp))
-# define sk_CONF_MODULE_dup(st) SKM_sk_dup(CONF_MODULE, st)
-# define sk_CONF_MODULE_pop_free(st, free_func) SKM_sk_pop_free(CONF_MODULE, (st), (free_func))
-# define sk_CONF_MODULE_shift(st) SKM_sk_shift(CONF_MODULE, (st))
-# define sk_CONF_MODULE_pop(st) SKM_sk_pop(CONF_MODULE, (st))
-# define sk_CONF_MODULE_sort(st) SKM_sk_sort(CONF_MODULE, (st))
-# define sk_CONF_MODULE_is_sorted(st) SKM_sk_is_sorted(CONF_MODULE, (st))
-# define sk_CONF_VALUE_new(cmp) SKM_sk_new(CONF_VALUE, (cmp))
-# define sk_CONF_VALUE_new_null() SKM_sk_new_null(CONF_VALUE)
-# define sk_CONF_VALUE_free(st) SKM_sk_free(CONF_VALUE, (st))
-# define sk_CONF_VALUE_num(st) SKM_sk_num(CONF_VALUE, (st))
-# define sk_CONF_VALUE_value(st, i) SKM_sk_value(CONF_VALUE, (st), (i))
-# define sk_CONF_VALUE_set(st, i, val) SKM_sk_set(CONF_VALUE, (st), (i), (val))
-# define sk_CONF_VALUE_zero(st) SKM_sk_zero(CONF_VALUE, (st))
-# define sk_CONF_VALUE_push(st, val) SKM_sk_push(CONF_VALUE, (st), (val))
-# define sk_CONF_VALUE_unshift(st, val) SKM_sk_unshift(CONF_VALUE, (st), (val))
-# define sk_CONF_VALUE_find(st, val) SKM_sk_find(CONF_VALUE, (st), (val))
-# define sk_CONF_VALUE_find_ex(st, val) SKM_sk_find_ex(CONF_VALUE, (st), (val))
-# define sk_CONF_VALUE_delete(st, i) SKM_sk_delete(CONF_VALUE, (st), (i))
-# define sk_CONF_VALUE_delete_ptr(st, ptr) SKM_sk_delete_ptr(CONF_VALUE, (st), (ptr))
-# define sk_CONF_VALUE_insert(st, val, i) SKM_sk_insert(CONF_VALUE, (st), (val), (i))
-# define sk_CONF_VALUE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CONF_VALUE, (st), (cmp))
-# define sk_CONF_VALUE_dup(st) SKM_sk_dup(CONF_VALUE, st)
-# define sk_CONF_VALUE_pop_free(st, free_func) SKM_sk_pop_free(CONF_VALUE, (st), (free_func))
-# define sk_CONF_VALUE_shift(st) SKM_sk_shift(CONF_VALUE, (st))
-# define sk_CONF_VALUE_pop(st) SKM_sk_pop(CONF_VALUE, (st))
-# define sk_CONF_VALUE_sort(st) SKM_sk_sort(CONF_VALUE, (st))
-# define sk_CONF_VALUE_is_sorted(st) SKM_sk_is_sorted(CONF_VALUE, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_new(cmp) SKM_sk_new(CRYPTO_EX_DATA_FUNCS, (cmp))
-# define sk_CRYPTO_EX_DATA_FUNCS_new_null() SKM_sk_new_null(CRYPTO_EX_DATA_FUNCS)
-# define sk_CRYPTO_EX_DATA_FUNCS_free(st) SKM_sk_free(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_num(st) SKM_sk_num(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_value(st, i) SKM_sk_value(CRYPTO_EX_DATA_FUNCS, (st), (i))
-# define sk_CRYPTO_EX_DATA_FUNCS_set(st, i, val) SKM_sk_set(CRYPTO_EX_DATA_FUNCS, (st), (i), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_zero(st) SKM_sk_zero(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_push(st, val) SKM_sk_push(CRYPTO_EX_DATA_FUNCS, (st), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_unshift(st, val) SKM_sk_unshift(CRYPTO_EX_DATA_FUNCS, (st), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_find(st, val) SKM_sk_find(CRYPTO_EX_DATA_FUNCS, (st), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_find_ex(st, val) SKM_sk_find_ex(CRYPTO_EX_DATA_FUNCS, (st), (val))
-# define sk_CRYPTO_EX_DATA_FUNCS_delete(st, i) SKM_sk_delete(CRYPTO_EX_DATA_FUNCS, (st), (i))
-# define sk_CRYPTO_EX_DATA_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_EX_DATA_FUNCS, (st), (ptr))
-# define sk_CRYPTO_EX_DATA_FUNCS_insert(st, val, i) SKM_sk_insert(CRYPTO_EX_DATA_FUNCS, (st), (val), (i))
-# define sk_CRYPTO_EX_DATA_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_EX_DATA_FUNCS, (st), (cmp))
-# define sk_CRYPTO_EX_DATA_FUNCS_dup(st) SKM_sk_dup(CRYPTO_EX_DATA_FUNCS, st)
-# define sk_CRYPTO_EX_DATA_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_EX_DATA_FUNCS, (st), (free_func))
-# define sk_CRYPTO_EX_DATA_FUNCS_shift(st) SKM_sk_shift(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_pop(st) SKM_sk_pop(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_sort(st) SKM_sk_sort(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_EX_DATA_FUNCS_is_sorted(st) SKM_sk_is_sorted(CRYPTO_EX_DATA_FUNCS, (st))
-# define sk_CRYPTO_dynlock_new(cmp) SKM_sk_new(CRYPTO_dynlock, (cmp))
-# define sk_CRYPTO_dynlock_new_null() SKM_sk_new_null(CRYPTO_dynlock)
-# define sk_CRYPTO_dynlock_free(st) SKM_sk_free(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_num(st) SKM_sk_num(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_value(st, i) SKM_sk_value(CRYPTO_dynlock, (st), (i))
-# define sk_CRYPTO_dynlock_set(st, i, val) SKM_sk_set(CRYPTO_dynlock, (st), (i), (val))
-# define sk_CRYPTO_dynlock_zero(st) SKM_sk_zero(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_push(st, val) SKM_sk_push(CRYPTO_dynlock, (st), (val))
-# define sk_CRYPTO_dynlock_unshift(st, val) SKM_sk_unshift(CRYPTO_dynlock, (st), (val))
-# define sk_CRYPTO_dynlock_find(st, val) SKM_sk_find(CRYPTO_dynlock, (st), (val))
-# define sk_CRYPTO_dynlock_find_ex(st, val) SKM_sk_find_ex(CRYPTO_dynlock, (st), (val))
-# define sk_CRYPTO_dynlock_delete(st, i) SKM_sk_delete(CRYPTO_dynlock, (st), (i))
-# define sk_CRYPTO_dynlock_delete_ptr(st, ptr) SKM_sk_delete_ptr(CRYPTO_dynlock, (st), (ptr))
-# define sk_CRYPTO_dynlock_insert(st, val, i) SKM_sk_insert(CRYPTO_dynlock, (st), (val), (i))
-# define sk_CRYPTO_dynlock_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(CRYPTO_dynlock, (st), (cmp))
-# define sk_CRYPTO_dynlock_dup(st) SKM_sk_dup(CRYPTO_dynlock, st)
-# define sk_CRYPTO_dynlock_pop_free(st, free_func) SKM_sk_pop_free(CRYPTO_dynlock, (st), (free_func))
-# define sk_CRYPTO_dynlock_shift(st) SKM_sk_shift(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_pop(st) SKM_sk_pop(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_sort(st) SKM_sk_sort(CRYPTO_dynlock, (st))
-# define sk_CRYPTO_dynlock_is_sorted(st) SKM_sk_is_sorted(CRYPTO_dynlock, (st))
-# define sk_DIST_POINT_new(cmp) SKM_sk_new(DIST_POINT, (cmp))
-# define sk_DIST_POINT_new_null() SKM_sk_new_null(DIST_POINT)
-# define sk_DIST_POINT_free(st) SKM_sk_free(DIST_POINT, (st))
-# define sk_DIST_POINT_num(st) SKM_sk_num(DIST_POINT, (st))
-# define sk_DIST_POINT_value(st, i) SKM_sk_value(DIST_POINT, (st), (i))
-# define sk_DIST_POINT_set(st, i, val) SKM_sk_set(DIST_POINT, (st), (i), (val))
-# define sk_DIST_POINT_zero(st) SKM_sk_zero(DIST_POINT, (st))
-# define sk_DIST_POINT_push(st, val) SKM_sk_push(DIST_POINT, (st), (val))
-# define sk_DIST_POINT_unshift(st, val) SKM_sk_unshift(DIST_POINT, (st), (val))
-# define sk_DIST_POINT_find(st, val) SKM_sk_find(DIST_POINT, (st), (val))
-# define sk_DIST_POINT_find_ex(st, val) SKM_sk_find_ex(DIST_POINT, (st), (val))
-# define sk_DIST_POINT_delete(st, i) SKM_sk_delete(DIST_POINT, (st), (i))
-# define sk_DIST_POINT_delete_ptr(st, ptr) SKM_sk_delete_ptr(DIST_POINT, (st), (ptr))
-# define sk_DIST_POINT_insert(st, val, i) SKM_sk_insert(DIST_POINT, (st), (val), (i))
-# define sk_DIST_POINT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(DIST_POINT, (st), (cmp))
-# define sk_DIST_POINT_dup(st) SKM_sk_dup(DIST_POINT, st)
-# define sk_DIST_POINT_pop_free(st, free_func) SKM_sk_pop_free(DIST_POINT, (st), (free_func))
-# define sk_DIST_POINT_shift(st) SKM_sk_shift(DIST_POINT, (st))
-# define sk_DIST_POINT_pop(st) SKM_sk_pop(DIST_POINT, (st))
-# define sk_DIST_POINT_sort(st) SKM_sk_sort(DIST_POINT, (st))
-# define sk_DIST_POINT_is_sorted(st) SKM_sk_is_sorted(DIST_POINT, (st))
-# define sk_ENGINE_new(cmp) SKM_sk_new(ENGINE, (cmp))
-# define sk_ENGINE_new_null() SKM_sk_new_null(ENGINE)
-# define sk_ENGINE_free(st) SKM_sk_free(ENGINE, (st))
-# define sk_ENGINE_num(st) SKM_sk_num(ENGINE, (st))
-# define sk_ENGINE_value(st, i) SKM_sk_value(ENGINE, (st), (i))
-# define sk_ENGINE_set(st, i, val) SKM_sk_set(ENGINE, (st), (i), (val))
-# define sk_ENGINE_zero(st) SKM_sk_zero(ENGINE, (st))
-# define sk_ENGINE_push(st, val) SKM_sk_push(ENGINE, (st), (val))
-# define sk_ENGINE_unshift(st, val) SKM_sk_unshift(ENGINE, (st), (val))
-# define sk_ENGINE_find(st, val) SKM_sk_find(ENGINE, (st), (val))
-# define sk_ENGINE_find_ex(st, val) SKM_sk_find_ex(ENGINE, (st), (val))
-# define sk_ENGINE_delete(st, i) SKM_sk_delete(ENGINE, (st), (i))
-# define sk_ENGINE_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE, (st), (ptr))
-# define sk_ENGINE_insert(st, val, i) SKM_sk_insert(ENGINE, (st), (val), (i))
-# define sk_ENGINE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE, (st), (cmp))
-# define sk_ENGINE_dup(st) SKM_sk_dup(ENGINE, st)
-# define sk_ENGINE_pop_free(st, free_func) SKM_sk_pop_free(ENGINE, (st), (free_func))
-# define sk_ENGINE_shift(st) SKM_sk_shift(ENGINE, (st))
-# define sk_ENGINE_pop(st) SKM_sk_pop(ENGINE, (st))
-# define sk_ENGINE_sort(st) SKM_sk_sort(ENGINE, (st))
-# define sk_ENGINE_is_sorted(st) SKM_sk_is_sorted(ENGINE, (st))
-# define sk_ENGINE_CLEANUP_ITEM_new(cmp) SKM_sk_new(ENGINE_CLEANUP_ITEM, (cmp))
-# define sk_ENGINE_CLEANUP_ITEM_new_null() SKM_sk_new_null(ENGINE_CLEANUP_ITEM)
-# define sk_ENGINE_CLEANUP_ITEM_free(st) SKM_sk_free(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_num(st) SKM_sk_num(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_value(st, i) SKM_sk_value(ENGINE_CLEANUP_ITEM, (st), (i))
-# define sk_ENGINE_CLEANUP_ITEM_set(st, i, val) SKM_sk_set(ENGINE_CLEANUP_ITEM, (st), (i), (val))
-# define sk_ENGINE_CLEANUP_ITEM_zero(st) SKM_sk_zero(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_push(st, val) SKM_sk_push(ENGINE_CLEANUP_ITEM, (st), (val))
-# define sk_ENGINE_CLEANUP_ITEM_unshift(st, val) SKM_sk_unshift(ENGINE_CLEANUP_ITEM, (st), (val))
-# define sk_ENGINE_CLEANUP_ITEM_find(st, val) SKM_sk_find(ENGINE_CLEANUP_ITEM, (st), (val))
-# define sk_ENGINE_CLEANUP_ITEM_find_ex(st, val) SKM_sk_find_ex(ENGINE_CLEANUP_ITEM, (st), (val))
-# define sk_ENGINE_CLEANUP_ITEM_delete(st, i) SKM_sk_delete(ENGINE_CLEANUP_ITEM, (st), (i))
-# define sk_ENGINE_CLEANUP_ITEM_delete_ptr(st, ptr) SKM_sk_delete_ptr(ENGINE_CLEANUP_ITEM, (st), (ptr))
-# define sk_ENGINE_CLEANUP_ITEM_insert(st, val, i) SKM_sk_insert(ENGINE_CLEANUP_ITEM, (st), (val), (i))
-# define sk_ENGINE_CLEANUP_ITEM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ENGINE_CLEANUP_ITEM, (st), (cmp))
-# define sk_ENGINE_CLEANUP_ITEM_dup(st) SKM_sk_dup(ENGINE_CLEANUP_ITEM, st)
-# define sk_ENGINE_CLEANUP_ITEM_pop_free(st, free_func) SKM_sk_pop_free(ENGINE_CLEANUP_ITEM, (st), (free_func))
-# define sk_ENGINE_CLEANUP_ITEM_shift(st) SKM_sk_shift(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_pop(st) SKM_sk_pop(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_sort(st) SKM_sk_sort(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ENGINE_CLEANUP_ITEM_is_sorted(st) SKM_sk_is_sorted(ENGINE_CLEANUP_ITEM, (st))
-# define sk_ESS_CERT_ID_new(cmp) SKM_sk_new(ESS_CERT_ID, (cmp))
-# define sk_ESS_CERT_ID_new_null() SKM_sk_new_null(ESS_CERT_ID)
-# define sk_ESS_CERT_ID_free(st) SKM_sk_free(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_num(st) SKM_sk_num(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_value(st, i) SKM_sk_value(ESS_CERT_ID, (st), (i))
-# define sk_ESS_CERT_ID_set(st, i, val) SKM_sk_set(ESS_CERT_ID, (st), (i), (val))
-# define sk_ESS_CERT_ID_zero(st) SKM_sk_zero(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_push(st, val) SKM_sk_push(ESS_CERT_ID, (st), (val))
-# define sk_ESS_CERT_ID_unshift(st, val) SKM_sk_unshift(ESS_CERT_ID, (st), (val))
-# define sk_ESS_CERT_ID_find(st, val) SKM_sk_find(ESS_CERT_ID, (st), (val))
-# define sk_ESS_CERT_ID_find_ex(st, val) SKM_sk_find_ex(ESS_CERT_ID, (st), (val))
-# define sk_ESS_CERT_ID_delete(st, i) SKM_sk_delete(ESS_CERT_ID, (st), (i))
-# define sk_ESS_CERT_ID_delete_ptr(st, ptr) SKM_sk_delete_ptr(ESS_CERT_ID, (st), (ptr))
-# define sk_ESS_CERT_ID_insert(st, val, i) SKM_sk_insert(ESS_CERT_ID, (st), (val), (i))
-# define sk_ESS_CERT_ID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(ESS_CERT_ID, (st), (cmp))
-# define sk_ESS_CERT_ID_dup(st) SKM_sk_dup(ESS_CERT_ID, st)
-# define sk_ESS_CERT_ID_pop_free(st, free_func) SKM_sk_pop_free(ESS_CERT_ID, (st), (free_func))
-# define sk_ESS_CERT_ID_shift(st) SKM_sk_shift(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_pop(st) SKM_sk_pop(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_sort(st) SKM_sk_sort(ESS_CERT_ID, (st))
-# define sk_ESS_CERT_ID_is_sorted(st) SKM_sk_is_sorted(ESS_CERT_ID, (st))
-# define sk_EVP_MD_new(cmp) SKM_sk_new(EVP_MD, (cmp))
-# define sk_EVP_MD_new_null() SKM_sk_new_null(EVP_MD)
-# define sk_EVP_MD_free(st) SKM_sk_free(EVP_MD, (st))
-# define sk_EVP_MD_num(st) SKM_sk_num(EVP_MD, (st))
-# define sk_EVP_MD_value(st, i) SKM_sk_value(EVP_MD, (st), (i))
-# define sk_EVP_MD_set(st, i, val) SKM_sk_set(EVP_MD, (st), (i), (val))
-# define sk_EVP_MD_zero(st) SKM_sk_zero(EVP_MD, (st))
-# define sk_EVP_MD_push(st, val) SKM_sk_push(EVP_MD, (st), (val))
-# define sk_EVP_MD_unshift(st, val) SKM_sk_unshift(EVP_MD, (st), (val))
-# define sk_EVP_MD_find(st, val) SKM_sk_find(EVP_MD, (st), (val))
-# define sk_EVP_MD_find_ex(st, val) SKM_sk_find_ex(EVP_MD, (st), (val))
-# define sk_EVP_MD_delete(st, i) SKM_sk_delete(EVP_MD, (st), (i))
-# define sk_EVP_MD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_MD, (st), (ptr))
-# define sk_EVP_MD_insert(st, val, i) SKM_sk_insert(EVP_MD, (st), (val), (i))
-# define sk_EVP_MD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_MD, (st), (cmp))
-# define sk_EVP_MD_dup(st) SKM_sk_dup(EVP_MD, st)
-# define sk_EVP_MD_pop_free(st, free_func) SKM_sk_pop_free(EVP_MD, (st), (free_func))
-# define sk_EVP_MD_shift(st) SKM_sk_shift(EVP_MD, (st))
-# define sk_EVP_MD_pop(st) SKM_sk_pop(EVP_MD, (st))
-# define sk_EVP_MD_sort(st) SKM_sk_sort(EVP_MD, (st))
-# define sk_EVP_MD_is_sorted(st) SKM_sk_is_sorted(EVP_MD, (st))
-# define sk_EVP_PBE_CTL_new(cmp) SKM_sk_new(EVP_PBE_CTL, (cmp))
-# define sk_EVP_PBE_CTL_new_null() SKM_sk_new_null(EVP_PBE_CTL)
-# define sk_EVP_PBE_CTL_free(st) SKM_sk_free(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_num(st) SKM_sk_num(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_value(st, i) SKM_sk_value(EVP_PBE_CTL, (st), (i))
-# define sk_EVP_PBE_CTL_set(st, i, val) SKM_sk_set(EVP_PBE_CTL, (st), (i), (val))
-# define sk_EVP_PBE_CTL_zero(st) SKM_sk_zero(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_push(st, val) SKM_sk_push(EVP_PBE_CTL, (st), (val))
-# define sk_EVP_PBE_CTL_unshift(st, val) SKM_sk_unshift(EVP_PBE_CTL, (st), (val))
-# define sk_EVP_PBE_CTL_find(st, val) SKM_sk_find(EVP_PBE_CTL, (st), (val))
-# define sk_EVP_PBE_CTL_find_ex(st, val) SKM_sk_find_ex(EVP_PBE_CTL, (st), (val))
-# define sk_EVP_PBE_CTL_delete(st, i) SKM_sk_delete(EVP_PBE_CTL, (st), (i))
-# define sk_EVP_PBE_CTL_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PBE_CTL, (st), (ptr))
-# define sk_EVP_PBE_CTL_insert(st, val, i) SKM_sk_insert(EVP_PBE_CTL, (st), (val), (i))
-# define sk_EVP_PBE_CTL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PBE_CTL, (st), (cmp))
-# define sk_EVP_PBE_CTL_dup(st) SKM_sk_dup(EVP_PBE_CTL, st)
-# define sk_EVP_PBE_CTL_pop_free(st, free_func) SKM_sk_pop_free(EVP_PBE_CTL, (st), (free_func))
-# define sk_EVP_PBE_CTL_shift(st) SKM_sk_shift(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_pop(st) SKM_sk_pop(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_sort(st) SKM_sk_sort(EVP_PBE_CTL, (st))
-# define sk_EVP_PBE_CTL_is_sorted(st) SKM_sk_is_sorted(EVP_PBE_CTL, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_ASN1_METHOD, (cmp))
-# define sk_EVP_PKEY_ASN1_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_ASN1_METHOD)
-# define sk_EVP_PKEY_ASN1_METHOD_free(st) SKM_sk_free(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_num(st) SKM_sk_num(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_ASN1_METHOD, (st), (i))
-# define sk_EVP_PKEY_ASN1_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_ASN1_METHOD, (st), (i), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_ASN1_METHOD, (st), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_ASN1_METHOD, (st), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_ASN1_METHOD, (st), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_ASN1_METHOD, (st), (val))
-# define sk_EVP_PKEY_ASN1_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_ASN1_METHOD, (st), (i))
-# define sk_EVP_PKEY_ASN1_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_ASN1_METHOD, (st), (ptr))
-# define sk_EVP_PKEY_ASN1_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_ASN1_METHOD, (st), (val), (i))
-# define sk_EVP_PKEY_ASN1_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_ASN1_METHOD, (st), (cmp))
-# define sk_EVP_PKEY_ASN1_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_ASN1_METHOD, st)
-# define sk_EVP_PKEY_ASN1_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_ASN1_METHOD, (st), (free_func))
-# define sk_EVP_PKEY_ASN1_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_ASN1_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_ASN1_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_new(cmp) SKM_sk_new(EVP_PKEY_METHOD, (cmp))
-# define sk_EVP_PKEY_METHOD_new_null() SKM_sk_new_null(EVP_PKEY_METHOD)
-# define sk_EVP_PKEY_METHOD_free(st) SKM_sk_free(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_num(st) SKM_sk_num(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_value(st, i) SKM_sk_value(EVP_PKEY_METHOD, (st), (i))
-# define sk_EVP_PKEY_METHOD_set(st, i, val) SKM_sk_set(EVP_PKEY_METHOD, (st), (i), (val))
-# define sk_EVP_PKEY_METHOD_zero(st) SKM_sk_zero(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_push(st, val) SKM_sk_push(EVP_PKEY_METHOD, (st), (val))
-# define sk_EVP_PKEY_METHOD_unshift(st, val) SKM_sk_unshift(EVP_PKEY_METHOD, (st), (val))
-# define sk_EVP_PKEY_METHOD_find(st, val) SKM_sk_find(EVP_PKEY_METHOD, (st), (val))
-# define sk_EVP_PKEY_METHOD_find_ex(st, val) SKM_sk_find_ex(EVP_PKEY_METHOD, (st), (val))
-# define sk_EVP_PKEY_METHOD_delete(st, i) SKM_sk_delete(EVP_PKEY_METHOD, (st), (i))
-# define sk_EVP_PKEY_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(EVP_PKEY_METHOD, (st), (ptr))
-# define sk_EVP_PKEY_METHOD_insert(st, val, i) SKM_sk_insert(EVP_PKEY_METHOD, (st), (val), (i))
-# define sk_EVP_PKEY_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(EVP_PKEY_METHOD, (st), (cmp))
-# define sk_EVP_PKEY_METHOD_dup(st) SKM_sk_dup(EVP_PKEY_METHOD, st)
-# define sk_EVP_PKEY_METHOD_pop_free(st, free_func) SKM_sk_pop_free(EVP_PKEY_METHOD, (st), (free_func))
-# define sk_EVP_PKEY_METHOD_shift(st) SKM_sk_shift(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_pop(st) SKM_sk_pop(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_sort(st) SKM_sk_sort(EVP_PKEY_METHOD, (st))
-# define sk_EVP_PKEY_METHOD_is_sorted(st) SKM_sk_is_sorted(EVP_PKEY_METHOD, (st))
-# define sk_GENERAL_NAME_new(cmp) SKM_sk_new(GENERAL_NAME, (cmp))
-# define sk_GENERAL_NAME_new_null() SKM_sk_new_null(GENERAL_NAME)
-# define sk_GENERAL_NAME_free(st) SKM_sk_free(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_num(st) SKM_sk_num(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_value(st, i) SKM_sk_value(GENERAL_NAME, (st), (i))
-# define sk_GENERAL_NAME_set(st, i, val) SKM_sk_set(GENERAL_NAME, (st), (i), (val))
-# define sk_GENERAL_NAME_zero(st) SKM_sk_zero(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_push(st, val) SKM_sk_push(GENERAL_NAME, (st), (val))
-# define sk_GENERAL_NAME_unshift(st, val) SKM_sk_unshift(GENERAL_NAME, (st), (val))
-# define sk_GENERAL_NAME_find(st, val) SKM_sk_find(GENERAL_NAME, (st), (val))
-# define sk_GENERAL_NAME_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAME, (st), (val))
-# define sk_GENERAL_NAME_delete(st, i) SKM_sk_delete(GENERAL_NAME, (st), (i))
-# define sk_GENERAL_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAME, (st), (ptr))
-# define sk_GENERAL_NAME_insert(st, val, i) SKM_sk_insert(GENERAL_NAME, (st), (val), (i))
-# define sk_GENERAL_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAME, (st), (cmp))
-# define sk_GENERAL_NAME_dup(st) SKM_sk_dup(GENERAL_NAME, st)
-# define sk_GENERAL_NAME_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAME, (st), (free_func))
-# define sk_GENERAL_NAME_shift(st) SKM_sk_shift(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_pop(st) SKM_sk_pop(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_sort(st) SKM_sk_sort(GENERAL_NAME, (st))
-# define sk_GENERAL_NAME_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAME, (st))
-# define sk_GENERAL_NAMES_new(cmp) SKM_sk_new(GENERAL_NAMES, (cmp))
-# define sk_GENERAL_NAMES_new_null() SKM_sk_new_null(GENERAL_NAMES)
-# define sk_GENERAL_NAMES_free(st) SKM_sk_free(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_num(st) SKM_sk_num(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_value(st, i) SKM_sk_value(GENERAL_NAMES, (st), (i))
-# define sk_GENERAL_NAMES_set(st, i, val) SKM_sk_set(GENERAL_NAMES, (st), (i), (val))
-# define sk_GENERAL_NAMES_zero(st) SKM_sk_zero(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_push(st, val) SKM_sk_push(GENERAL_NAMES, (st), (val))
-# define sk_GENERAL_NAMES_unshift(st, val) SKM_sk_unshift(GENERAL_NAMES, (st), (val))
-# define sk_GENERAL_NAMES_find(st, val) SKM_sk_find(GENERAL_NAMES, (st), (val))
-# define sk_GENERAL_NAMES_find_ex(st, val) SKM_sk_find_ex(GENERAL_NAMES, (st), (val))
-# define sk_GENERAL_NAMES_delete(st, i) SKM_sk_delete(GENERAL_NAMES, (st), (i))
-# define sk_GENERAL_NAMES_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_NAMES, (st), (ptr))
-# define sk_GENERAL_NAMES_insert(st, val, i) SKM_sk_insert(GENERAL_NAMES, (st), (val), (i))
-# define sk_GENERAL_NAMES_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_NAMES, (st), (cmp))
-# define sk_GENERAL_NAMES_dup(st) SKM_sk_dup(GENERAL_NAMES, st)
-# define sk_GENERAL_NAMES_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_NAMES, (st), (free_func))
-# define sk_GENERAL_NAMES_shift(st) SKM_sk_shift(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_pop(st) SKM_sk_pop(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_sort(st) SKM_sk_sort(GENERAL_NAMES, (st))
-# define sk_GENERAL_NAMES_is_sorted(st) SKM_sk_is_sorted(GENERAL_NAMES, (st))
-# define sk_GENERAL_SUBTREE_new(cmp) SKM_sk_new(GENERAL_SUBTREE, (cmp))
-# define sk_GENERAL_SUBTREE_new_null() SKM_sk_new_null(GENERAL_SUBTREE)
-# define sk_GENERAL_SUBTREE_free(st) SKM_sk_free(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_num(st) SKM_sk_num(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_value(st, i) SKM_sk_value(GENERAL_SUBTREE, (st), (i))
-# define sk_GENERAL_SUBTREE_set(st, i, val) SKM_sk_set(GENERAL_SUBTREE, (st), (i), (val))
-# define sk_GENERAL_SUBTREE_zero(st) SKM_sk_zero(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_push(st, val) SKM_sk_push(GENERAL_SUBTREE, (st), (val))
-# define sk_GENERAL_SUBTREE_unshift(st, val) SKM_sk_unshift(GENERAL_SUBTREE, (st), (val))
-# define sk_GENERAL_SUBTREE_find(st, val) SKM_sk_find(GENERAL_SUBTREE, (st), (val))
-# define sk_GENERAL_SUBTREE_find_ex(st, val) SKM_sk_find_ex(GENERAL_SUBTREE, (st), (val))
-# define sk_GENERAL_SUBTREE_delete(st, i) SKM_sk_delete(GENERAL_SUBTREE, (st), (i))
-# define sk_GENERAL_SUBTREE_delete_ptr(st, ptr) SKM_sk_delete_ptr(GENERAL_SUBTREE, (st), (ptr))
-# define sk_GENERAL_SUBTREE_insert(st, val, i) SKM_sk_insert(GENERAL_SUBTREE, (st), (val), (i))
-# define sk_GENERAL_SUBTREE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(GENERAL_SUBTREE, (st), (cmp))
-# define sk_GENERAL_SUBTREE_dup(st) SKM_sk_dup(GENERAL_SUBTREE, st)
-# define sk_GENERAL_SUBTREE_pop_free(st, free_func) SKM_sk_pop_free(GENERAL_SUBTREE, (st), (free_func))
-# define sk_GENERAL_SUBTREE_shift(st) SKM_sk_shift(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_pop(st) SKM_sk_pop(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_sort(st) SKM_sk_sort(GENERAL_SUBTREE, (st))
-# define sk_GENERAL_SUBTREE_is_sorted(st) SKM_sk_is_sorted(GENERAL_SUBTREE, (st))
-# define sk_IPAddressFamily_new(cmp) SKM_sk_new(IPAddressFamily, (cmp))
-# define sk_IPAddressFamily_new_null() SKM_sk_new_null(IPAddressFamily)
-# define sk_IPAddressFamily_free(st) SKM_sk_free(IPAddressFamily, (st))
-# define sk_IPAddressFamily_num(st) SKM_sk_num(IPAddressFamily, (st))
-# define sk_IPAddressFamily_value(st, i) SKM_sk_value(IPAddressFamily, (st), (i))
-# define sk_IPAddressFamily_set(st, i, val) SKM_sk_set(IPAddressFamily, (st), (i), (val))
-# define sk_IPAddressFamily_zero(st) SKM_sk_zero(IPAddressFamily, (st))
-# define sk_IPAddressFamily_push(st, val) SKM_sk_push(IPAddressFamily, (st), (val))
-# define sk_IPAddressFamily_unshift(st, val) SKM_sk_unshift(IPAddressFamily, (st), (val))
-# define sk_IPAddressFamily_find(st, val) SKM_sk_find(IPAddressFamily, (st), (val))
-# define sk_IPAddressFamily_find_ex(st, val) SKM_sk_find_ex(IPAddressFamily, (st), (val))
-# define sk_IPAddressFamily_delete(st, i) SKM_sk_delete(IPAddressFamily, (st), (i))
-# define sk_IPAddressFamily_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressFamily, (st), (ptr))
-# define sk_IPAddressFamily_insert(st, val, i) SKM_sk_insert(IPAddressFamily, (st), (val), (i))
-# define sk_IPAddressFamily_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressFamily, (st), (cmp))
-# define sk_IPAddressFamily_dup(st) SKM_sk_dup(IPAddressFamily, st)
-# define sk_IPAddressFamily_pop_free(st, free_func) SKM_sk_pop_free(IPAddressFamily, (st), (free_func))
-# define sk_IPAddressFamily_shift(st) SKM_sk_shift(IPAddressFamily, (st))
-# define sk_IPAddressFamily_pop(st) SKM_sk_pop(IPAddressFamily, (st))
-# define sk_IPAddressFamily_sort(st) SKM_sk_sort(IPAddressFamily, (st))
-# define sk_IPAddressFamily_is_sorted(st) SKM_sk_is_sorted(IPAddressFamily, (st))
-# define sk_IPAddressOrRange_new(cmp) SKM_sk_new(IPAddressOrRange, (cmp))
-# define sk_IPAddressOrRange_new_null() SKM_sk_new_null(IPAddressOrRange)
-# define sk_IPAddressOrRange_free(st) SKM_sk_free(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_num(st) SKM_sk_num(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_value(st, i) SKM_sk_value(IPAddressOrRange, (st), (i))
-# define sk_IPAddressOrRange_set(st, i, val) SKM_sk_set(IPAddressOrRange, (st), (i), (val))
-# define sk_IPAddressOrRange_zero(st) SKM_sk_zero(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_push(st, val) SKM_sk_push(IPAddressOrRange, (st), (val))
-# define sk_IPAddressOrRange_unshift(st, val) SKM_sk_unshift(IPAddressOrRange, (st), (val))
-# define sk_IPAddressOrRange_find(st, val) SKM_sk_find(IPAddressOrRange, (st), (val))
-# define sk_IPAddressOrRange_find_ex(st, val) SKM_sk_find_ex(IPAddressOrRange, (st), (val))
-# define sk_IPAddressOrRange_delete(st, i) SKM_sk_delete(IPAddressOrRange, (st), (i))
-# define sk_IPAddressOrRange_delete_ptr(st, ptr) SKM_sk_delete_ptr(IPAddressOrRange, (st), (ptr))
-# define sk_IPAddressOrRange_insert(st, val, i) SKM_sk_insert(IPAddressOrRange, (st), (val), (i))
-# define sk_IPAddressOrRange_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(IPAddressOrRange, (st), (cmp))
-# define sk_IPAddressOrRange_dup(st) SKM_sk_dup(IPAddressOrRange, st)
-# define sk_IPAddressOrRange_pop_free(st, free_func) SKM_sk_pop_free(IPAddressOrRange, (st), (free_func))
-# define sk_IPAddressOrRange_shift(st) SKM_sk_shift(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_pop(st) SKM_sk_pop(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_sort(st) SKM_sk_sort(IPAddressOrRange, (st))
-# define sk_IPAddressOrRange_is_sorted(st) SKM_sk_is_sorted(IPAddressOrRange, (st))
-# define sk_KRB5_APREQBODY_new(cmp) SKM_sk_new(KRB5_APREQBODY, (cmp))
-# define sk_KRB5_APREQBODY_new_null() SKM_sk_new_null(KRB5_APREQBODY)
-# define sk_KRB5_APREQBODY_free(st) SKM_sk_free(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_num(st) SKM_sk_num(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_value(st, i) SKM_sk_value(KRB5_APREQBODY, (st), (i))
-# define sk_KRB5_APREQBODY_set(st, i, val) SKM_sk_set(KRB5_APREQBODY, (st), (i), (val))
-# define sk_KRB5_APREQBODY_zero(st) SKM_sk_zero(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_push(st, val) SKM_sk_push(KRB5_APREQBODY, (st), (val))
-# define sk_KRB5_APREQBODY_unshift(st, val) SKM_sk_unshift(KRB5_APREQBODY, (st), (val))
-# define sk_KRB5_APREQBODY_find(st, val) SKM_sk_find(KRB5_APREQBODY, (st), (val))
-# define sk_KRB5_APREQBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_APREQBODY, (st), (val))
-# define sk_KRB5_APREQBODY_delete(st, i) SKM_sk_delete(KRB5_APREQBODY, (st), (i))
-# define sk_KRB5_APREQBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_APREQBODY, (st), (ptr))
-# define sk_KRB5_APREQBODY_insert(st, val, i) SKM_sk_insert(KRB5_APREQBODY, (st), (val), (i))
-# define sk_KRB5_APREQBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_APREQBODY, (st), (cmp))
-# define sk_KRB5_APREQBODY_dup(st) SKM_sk_dup(KRB5_APREQBODY, st)
-# define sk_KRB5_APREQBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_APREQBODY, (st), (free_func))
-# define sk_KRB5_APREQBODY_shift(st) SKM_sk_shift(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_pop(st) SKM_sk_pop(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_sort(st) SKM_sk_sort(KRB5_APREQBODY, (st))
-# define sk_KRB5_APREQBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_APREQBODY, (st))
-# define sk_KRB5_AUTHDATA_new(cmp) SKM_sk_new(KRB5_AUTHDATA, (cmp))
-# define sk_KRB5_AUTHDATA_new_null() SKM_sk_new_null(KRB5_AUTHDATA)
-# define sk_KRB5_AUTHDATA_free(st) SKM_sk_free(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_num(st) SKM_sk_num(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_value(st, i) SKM_sk_value(KRB5_AUTHDATA, (st), (i))
-# define sk_KRB5_AUTHDATA_set(st, i, val) SKM_sk_set(KRB5_AUTHDATA, (st), (i), (val))
-# define sk_KRB5_AUTHDATA_zero(st) SKM_sk_zero(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_push(st, val) SKM_sk_push(KRB5_AUTHDATA, (st), (val))
-# define sk_KRB5_AUTHDATA_unshift(st, val) SKM_sk_unshift(KRB5_AUTHDATA, (st), (val))
-# define sk_KRB5_AUTHDATA_find(st, val) SKM_sk_find(KRB5_AUTHDATA, (st), (val))
-# define sk_KRB5_AUTHDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHDATA, (st), (val))
-# define sk_KRB5_AUTHDATA_delete(st, i) SKM_sk_delete(KRB5_AUTHDATA, (st), (i))
-# define sk_KRB5_AUTHDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHDATA, (st), (ptr))
-# define sk_KRB5_AUTHDATA_insert(st, val, i) SKM_sk_insert(KRB5_AUTHDATA, (st), (val), (i))
-# define sk_KRB5_AUTHDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHDATA, (st), (cmp))
-# define sk_KRB5_AUTHDATA_dup(st) SKM_sk_dup(KRB5_AUTHDATA, st)
-# define sk_KRB5_AUTHDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHDATA, (st), (free_func))
-# define sk_KRB5_AUTHDATA_shift(st) SKM_sk_shift(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_pop(st) SKM_sk_pop(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_sort(st) SKM_sk_sort(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHDATA, (st))
-# define sk_KRB5_AUTHENTBODY_new(cmp) SKM_sk_new(KRB5_AUTHENTBODY, (cmp))
-# define sk_KRB5_AUTHENTBODY_new_null() SKM_sk_new_null(KRB5_AUTHENTBODY)
-# define sk_KRB5_AUTHENTBODY_free(st) SKM_sk_free(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_num(st) SKM_sk_num(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_value(st, i) SKM_sk_value(KRB5_AUTHENTBODY, (st), (i))
-# define sk_KRB5_AUTHENTBODY_set(st, i, val) SKM_sk_set(KRB5_AUTHENTBODY, (st), (i), (val))
-# define sk_KRB5_AUTHENTBODY_zero(st) SKM_sk_zero(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_push(st, val) SKM_sk_push(KRB5_AUTHENTBODY, (st), (val))
-# define sk_KRB5_AUTHENTBODY_unshift(st, val) SKM_sk_unshift(KRB5_AUTHENTBODY, (st), (val))
-# define sk_KRB5_AUTHENTBODY_find(st, val) SKM_sk_find(KRB5_AUTHENTBODY, (st), (val))
-# define sk_KRB5_AUTHENTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_AUTHENTBODY, (st), (val))
-# define sk_KRB5_AUTHENTBODY_delete(st, i) SKM_sk_delete(KRB5_AUTHENTBODY, (st), (i))
-# define sk_KRB5_AUTHENTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_AUTHENTBODY, (st), (ptr))
-# define sk_KRB5_AUTHENTBODY_insert(st, val, i) SKM_sk_insert(KRB5_AUTHENTBODY, (st), (val), (i))
-# define sk_KRB5_AUTHENTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_AUTHENTBODY, (st), (cmp))
-# define sk_KRB5_AUTHENTBODY_dup(st) SKM_sk_dup(KRB5_AUTHENTBODY, st)
-# define sk_KRB5_AUTHENTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_AUTHENTBODY, (st), (free_func))
-# define sk_KRB5_AUTHENTBODY_shift(st) SKM_sk_shift(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_pop(st) SKM_sk_pop(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_sort(st) SKM_sk_sort(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_AUTHENTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_AUTHENTBODY, (st))
-# define sk_KRB5_CHECKSUM_new(cmp) SKM_sk_new(KRB5_CHECKSUM, (cmp))
-# define sk_KRB5_CHECKSUM_new_null() SKM_sk_new_null(KRB5_CHECKSUM)
-# define sk_KRB5_CHECKSUM_free(st) SKM_sk_free(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_num(st) SKM_sk_num(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_value(st, i) SKM_sk_value(KRB5_CHECKSUM, (st), (i))
-# define sk_KRB5_CHECKSUM_set(st, i, val) SKM_sk_set(KRB5_CHECKSUM, (st), (i), (val))
-# define sk_KRB5_CHECKSUM_zero(st) SKM_sk_zero(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_push(st, val) SKM_sk_push(KRB5_CHECKSUM, (st), (val))
-# define sk_KRB5_CHECKSUM_unshift(st, val) SKM_sk_unshift(KRB5_CHECKSUM, (st), (val))
-# define sk_KRB5_CHECKSUM_find(st, val) SKM_sk_find(KRB5_CHECKSUM, (st), (val))
-# define sk_KRB5_CHECKSUM_find_ex(st, val) SKM_sk_find_ex(KRB5_CHECKSUM, (st), (val))
-# define sk_KRB5_CHECKSUM_delete(st, i) SKM_sk_delete(KRB5_CHECKSUM, (st), (i))
-# define sk_KRB5_CHECKSUM_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_CHECKSUM, (st), (ptr))
-# define sk_KRB5_CHECKSUM_insert(st, val, i) SKM_sk_insert(KRB5_CHECKSUM, (st), (val), (i))
-# define sk_KRB5_CHECKSUM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_CHECKSUM, (st), (cmp))
-# define sk_KRB5_CHECKSUM_dup(st) SKM_sk_dup(KRB5_CHECKSUM, st)
-# define sk_KRB5_CHECKSUM_pop_free(st, free_func) SKM_sk_pop_free(KRB5_CHECKSUM, (st), (free_func))
-# define sk_KRB5_CHECKSUM_shift(st) SKM_sk_shift(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_pop(st) SKM_sk_pop(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_sort(st) SKM_sk_sort(KRB5_CHECKSUM, (st))
-# define sk_KRB5_CHECKSUM_is_sorted(st) SKM_sk_is_sorted(KRB5_CHECKSUM, (st))
-# define sk_KRB5_ENCDATA_new(cmp) SKM_sk_new(KRB5_ENCDATA, (cmp))
-# define sk_KRB5_ENCDATA_new_null() SKM_sk_new_null(KRB5_ENCDATA)
-# define sk_KRB5_ENCDATA_free(st) SKM_sk_free(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_num(st) SKM_sk_num(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_value(st, i) SKM_sk_value(KRB5_ENCDATA, (st), (i))
-# define sk_KRB5_ENCDATA_set(st, i, val) SKM_sk_set(KRB5_ENCDATA, (st), (i), (val))
-# define sk_KRB5_ENCDATA_zero(st) SKM_sk_zero(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_push(st, val) SKM_sk_push(KRB5_ENCDATA, (st), (val))
-# define sk_KRB5_ENCDATA_unshift(st, val) SKM_sk_unshift(KRB5_ENCDATA, (st), (val))
-# define sk_KRB5_ENCDATA_find(st, val) SKM_sk_find(KRB5_ENCDATA, (st), (val))
-# define sk_KRB5_ENCDATA_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCDATA, (st), (val))
-# define sk_KRB5_ENCDATA_delete(st, i) SKM_sk_delete(KRB5_ENCDATA, (st), (i))
-# define sk_KRB5_ENCDATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCDATA, (st), (ptr))
-# define sk_KRB5_ENCDATA_insert(st, val, i) SKM_sk_insert(KRB5_ENCDATA, (st), (val), (i))
-# define sk_KRB5_ENCDATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCDATA, (st), (cmp))
-# define sk_KRB5_ENCDATA_dup(st) SKM_sk_dup(KRB5_ENCDATA, st)
-# define sk_KRB5_ENCDATA_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCDATA, (st), (free_func))
-# define sk_KRB5_ENCDATA_shift(st) SKM_sk_shift(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_pop(st) SKM_sk_pop(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_sort(st) SKM_sk_sort(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCDATA_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCDATA, (st))
-# define sk_KRB5_ENCKEY_new(cmp) SKM_sk_new(KRB5_ENCKEY, (cmp))
-# define sk_KRB5_ENCKEY_new_null() SKM_sk_new_null(KRB5_ENCKEY)
-# define sk_KRB5_ENCKEY_free(st) SKM_sk_free(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_num(st) SKM_sk_num(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_value(st, i) SKM_sk_value(KRB5_ENCKEY, (st), (i))
-# define sk_KRB5_ENCKEY_set(st, i, val) SKM_sk_set(KRB5_ENCKEY, (st), (i), (val))
-# define sk_KRB5_ENCKEY_zero(st) SKM_sk_zero(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_push(st, val) SKM_sk_push(KRB5_ENCKEY, (st), (val))
-# define sk_KRB5_ENCKEY_unshift(st, val) SKM_sk_unshift(KRB5_ENCKEY, (st), (val))
-# define sk_KRB5_ENCKEY_find(st, val) SKM_sk_find(KRB5_ENCKEY, (st), (val))
-# define sk_KRB5_ENCKEY_find_ex(st, val) SKM_sk_find_ex(KRB5_ENCKEY, (st), (val))
-# define sk_KRB5_ENCKEY_delete(st, i) SKM_sk_delete(KRB5_ENCKEY, (st), (i))
-# define sk_KRB5_ENCKEY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_ENCKEY, (st), (ptr))
-# define sk_KRB5_ENCKEY_insert(st, val, i) SKM_sk_insert(KRB5_ENCKEY, (st), (val), (i))
-# define sk_KRB5_ENCKEY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_ENCKEY, (st), (cmp))
-# define sk_KRB5_ENCKEY_dup(st) SKM_sk_dup(KRB5_ENCKEY, st)
-# define sk_KRB5_ENCKEY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_ENCKEY, (st), (free_func))
-# define sk_KRB5_ENCKEY_shift(st) SKM_sk_shift(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_pop(st) SKM_sk_pop(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_sort(st) SKM_sk_sort(KRB5_ENCKEY, (st))
-# define sk_KRB5_ENCKEY_is_sorted(st) SKM_sk_is_sorted(KRB5_ENCKEY, (st))
-# define sk_KRB5_PRINCNAME_new(cmp) SKM_sk_new(KRB5_PRINCNAME, (cmp))
-# define sk_KRB5_PRINCNAME_new_null() SKM_sk_new_null(KRB5_PRINCNAME)
-# define sk_KRB5_PRINCNAME_free(st) SKM_sk_free(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_num(st) SKM_sk_num(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_value(st, i) SKM_sk_value(KRB5_PRINCNAME, (st), (i))
-# define sk_KRB5_PRINCNAME_set(st, i, val) SKM_sk_set(KRB5_PRINCNAME, (st), (i), (val))
-# define sk_KRB5_PRINCNAME_zero(st) SKM_sk_zero(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_push(st, val) SKM_sk_push(KRB5_PRINCNAME, (st), (val))
-# define sk_KRB5_PRINCNAME_unshift(st, val) SKM_sk_unshift(KRB5_PRINCNAME, (st), (val))
-# define sk_KRB5_PRINCNAME_find(st, val) SKM_sk_find(KRB5_PRINCNAME, (st), (val))
-# define sk_KRB5_PRINCNAME_find_ex(st, val) SKM_sk_find_ex(KRB5_PRINCNAME, (st), (val))
-# define sk_KRB5_PRINCNAME_delete(st, i) SKM_sk_delete(KRB5_PRINCNAME, (st), (i))
-# define sk_KRB5_PRINCNAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_PRINCNAME, (st), (ptr))
-# define sk_KRB5_PRINCNAME_insert(st, val, i) SKM_sk_insert(KRB5_PRINCNAME, (st), (val), (i))
-# define sk_KRB5_PRINCNAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_PRINCNAME, (st), (cmp))
-# define sk_KRB5_PRINCNAME_dup(st) SKM_sk_dup(KRB5_PRINCNAME, st)
-# define sk_KRB5_PRINCNAME_pop_free(st, free_func) SKM_sk_pop_free(KRB5_PRINCNAME, (st), (free_func))
-# define sk_KRB5_PRINCNAME_shift(st) SKM_sk_shift(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_pop(st) SKM_sk_pop(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_sort(st) SKM_sk_sort(KRB5_PRINCNAME, (st))
-# define sk_KRB5_PRINCNAME_is_sorted(st) SKM_sk_is_sorted(KRB5_PRINCNAME, (st))
-# define sk_KRB5_TKTBODY_new(cmp) SKM_sk_new(KRB5_TKTBODY, (cmp))
-# define sk_KRB5_TKTBODY_new_null() SKM_sk_new_null(KRB5_TKTBODY)
-# define sk_KRB5_TKTBODY_free(st) SKM_sk_free(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_num(st) SKM_sk_num(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_value(st, i) SKM_sk_value(KRB5_TKTBODY, (st), (i))
-# define sk_KRB5_TKTBODY_set(st, i, val) SKM_sk_set(KRB5_TKTBODY, (st), (i), (val))
-# define sk_KRB5_TKTBODY_zero(st) SKM_sk_zero(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_push(st, val) SKM_sk_push(KRB5_TKTBODY, (st), (val))
-# define sk_KRB5_TKTBODY_unshift(st, val) SKM_sk_unshift(KRB5_TKTBODY, (st), (val))
-# define sk_KRB5_TKTBODY_find(st, val) SKM_sk_find(KRB5_TKTBODY, (st), (val))
-# define sk_KRB5_TKTBODY_find_ex(st, val) SKM_sk_find_ex(KRB5_TKTBODY, (st), (val))
-# define sk_KRB5_TKTBODY_delete(st, i) SKM_sk_delete(KRB5_TKTBODY, (st), (i))
-# define sk_KRB5_TKTBODY_delete_ptr(st, ptr) SKM_sk_delete_ptr(KRB5_TKTBODY, (st), (ptr))
-# define sk_KRB5_TKTBODY_insert(st, val, i) SKM_sk_insert(KRB5_TKTBODY, (st), (val), (i))
-# define sk_KRB5_TKTBODY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(KRB5_TKTBODY, (st), (cmp))
-# define sk_KRB5_TKTBODY_dup(st) SKM_sk_dup(KRB5_TKTBODY, st)
-# define sk_KRB5_TKTBODY_pop_free(st, free_func) SKM_sk_pop_free(KRB5_TKTBODY, (st), (free_func))
-# define sk_KRB5_TKTBODY_shift(st) SKM_sk_shift(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_pop(st) SKM_sk_pop(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_sort(st) SKM_sk_sort(KRB5_TKTBODY, (st))
-# define sk_KRB5_TKTBODY_is_sorted(st) SKM_sk_is_sorted(KRB5_TKTBODY, (st))
-# define sk_MEM_OBJECT_DATA_new(cmp) SKM_sk_new(MEM_OBJECT_DATA, (cmp))
-# define sk_MEM_OBJECT_DATA_new_null() SKM_sk_new_null(MEM_OBJECT_DATA)
-# define sk_MEM_OBJECT_DATA_free(st) SKM_sk_free(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_num(st) SKM_sk_num(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_value(st, i) SKM_sk_value(MEM_OBJECT_DATA, (st), (i))
-# define sk_MEM_OBJECT_DATA_set(st, i, val) SKM_sk_set(MEM_OBJECT_DATA, (st), (i), (val))
-# define sk_MEM_OBJECT_DATA_zero(st) SKM_sk_zero(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_push(st, val) SKM_sk_push(MEM_OBJECT_DATA, (st), (val))
-# define sk_MEM_OBJECT_DATA_unshift(st, val) SKM_sk_unshift(MEM_OBJECT_DATA, (st), (val))
-# define sk_MEM_OBJECT_DATA_find(st, val) SKM_sk_find(MEM_OBJECT_DATA, (st), (val))
-# define sk_MEM_OBJECT_DATA_find_ex(st, val) SKM_sk_find_ex(MEM_OBJECT_DATA, (st), (val))
-# define sk_MEM_OBJECT_DATA_delete(st, i) SKM_sk_delete(MEM_OBJECT_DATA, (st), (i))
-# define sk_MEM_OBJECT_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(MEM_OBJECT_DATA, (st), (ptr))
-# define sk_MEM_OBJECT_DATA_insert(st, val, i) SKM_sk_insert(MEM_OBJECT_DATA, (st), (val), (i))
-# define sk_MEM_OBJECT_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MEM_OBJECT_DATA, (st), (cmp))
-# define sk_MEM_OBJECT_DATA_dup(st) SKM_sk_dup(MEM_OBJECT_DATA, st)
-# define sk_MEM_OBJECT_DATA_pop_free(st, free_func) SKM_sk_pop_free(MEM_OBJECT_DATA, (st), (free_func))
-# define sk_MEM_OBJECT_DATA_shift(st) SKM_sk_shift(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_pop(st) SKM_sk_pop(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_sort(st) SKM_sk_sort(MEM_OBJECT_DATA, (st))
-# define sk_MEM_OBJECT_DATA_is_sorted(st) SKM_sk_is_sorted(MEM_OBJECT_DATA, (st))
-# define sk_MIME_HEADER_new(cmp) SKM_sk_new(MIME_HEADER, (cmp))
-# define sk_MIME_HEADER_new_null() SKM_sk_new_null(MIME_HEADER)
-# define sk_MIME_HEADER_free(st) SKM_sk_free(MIME_HEADER, (st))
-# define sk_MIME_HEADER_num(st) SKM_sk_num(MIME_HEADER, (st))
-# define sk_MIME_HEADER_value(st, i) SKM_sk_value(MIME_HEADER, (st), (i))
-# define sk_MIME_HEADER_set(st, i, val) SKM_sk_set(MIME_HEADER, (st), (i), (val))
-# define sk_MIME_HEADER_zero(st) SKM_sk_zero(MIME_HEADER, (st))
-# define sk_MIME_HEADER_push(st, val) SKM_sk_push(MIME_HEADER, (st), (val))
-# define sk_MIME_HEADER_unshift(st, val) SKM_sk_unshift(MIME_HEADER, (st), (val))
-# define sk_MIME_HEADER_find(st, val) SKM_sk_find(MIME_HEADER, (st), (val))
-# define sk_MIME_HEADER_find_ex(st, val) SKM_sk_find_ex(MIME_HEADER, (st), (val))
-# define sk_MIME_HEADER_delete(st, i) SKM_sk_delete(MIME_HEADER, (st), (i))
-# define sk_MIME_HEADER_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_HEADER, (st), (ptr))
-# define sk_MIME_HEADER_insert(st, val, i) SKM_sk_insert(MIME_HEADER, (st), (val), (i))
-# define sk_MIME_HEADER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_HEADER, (st), (cmp))
-# define sk_MIME_HEADER_dup(st) SKM_sk_dup(MIME_HEADER, st)
-# define sk_MIME_HEADER_pop_free(st, free_func) SKM_sk_pop_free(MIME_HEADER, (st), (free_func))
-# define sk_MIME_HEADER_shift(st) SKM_sk_shift(MIME_HEADER, (st))
-# define sk_MIME_HEADER_pop(st) SKM_sk_pop(MIME_HEADER, (st))
-# define sk_MIME_HEADER_sort(st) SKM_sk_sort(MIME_HEADER, (st))
-# define sk_MIME_HEADER_is_sorted(st) SKM_sk_is_sorted(MIME_HEADER, (st))
-# define sk_MIME_PARAM_new(cmp) SKM_sk_new(MIME_PARAM, (cmp))
-# define sk_MIME_PARAM_new_null() SKM_sk_new_null(MIME_PARAM)
-# define sk_MIME_PARAM_free(st) SKM_sk_free(MIME_PARAM, (st))
-# define sk_MIME_PARAM_num(st) SKM_sk_num(MIME_PARAM, (st))
-# define sk_MIME_PARAM_value(st, i) SKM_sk_value(MIME_PARAM, (st), (i))
-# define sk_MIME_PARAM_set(st, i, val) SKM_sk_set(MIME_PARAM, (st), (i), (val))
-# define sk_MIME_PARAM_zero(st) SKM_sk_zero(MIME_PARAM, (st))
-# define sk_MIME_PARAM_push(st, val) SKM_sk_push(MIME_PARAM, (st), (val))
-# define sk_MIME_PARAM_unshift(st, val) SKM_sk_unshift(MIME_PARAM, (st), (val))
-# define sk_MIME_PARAM_find(st, val) SKM_sk_find(MIME_PARAM, (st), (val))
-# define sk_MIME_PARAM_find_ex(st, val) SKM_sk_find_ex(MIME_PARAM, (st), (val))
-# define sk_MIME_PARAM_delete(st, i) SKM_sk_delete(MIME_PARAM, (st), (i))
-# define sk_MIME_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(MIME_PARAM, (st), (ptr))
-# define sk_MIME_PARAM_insert(st, val, i) SKM_sk_insert(MIME_PARAM, (st), (val), (i))
-# define sk_MIME_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(MIME_PARAM, (st), (cmp))
-# define sk_MIME_PARAM_dup(st) SKM_sk_dup(MIME_PARAM, st)
-# define sk_MIME_PARAM_pop_free(st, free_func) SKM_sk_pop_free(MIME_PARAM, (st), (free_func))
-# define sk_MIME_PARAM_shift(st) SKM_sk_shift(MIME_PARAM, (st))
-# define sk_MIME_PARAM_pop(st) SKM_sk_pop(MIME_PARAM, (st))
-# define sk_MIME_PARAM_sort(st) SKM_sk_sort(MIME_PARAM, (st))
-# define sk_MIME_PARAM_is_sorted(st) SKM_sk_is_sorted(MIME_PARAM, (st))
-# define sk_NAME_FUNCS_new(cmp) SKM_sk_new(NAME_FUNCS, (cmp))
-# define sk_NAME_FUNCS_new_null() SKM_sk_new_null(NAME_FUNCS)
-# define sk_NAME_FUNCS_free(st) SKM_sk_free(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_num(st) SKM_sk_num(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_value(st, i) SKM_sk_value(NAME_FUNCS, (st), (i))
-# define sk_NAME_FUNCS_set(st, i, val) SKM_sk_set(NAME_FUNCS, (st), (i), (val))
-# define sk_NAME_FUNCS_zero(st) SKM_sk_zero(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_push(st, val) SKM_sk_push(NAME_FUNCS, (st), (val))
-# define sk_NAME_FUNCS_unshift(st, val) SKM_sk_unshift(NAME_FUNCS, (st), (val))
-# define sk_NAME_FUNCS_find(st, val) SKM_sk_find(NAME_FUNCS, (st), (val))
-# define sk_NAME_FUNCS_find_ex(st, val) SKM_sk_find_ex(NAME_FUNCS, (st), (val))
-# define sk_NAME_FUNCS_delete(st, i) SKM_sk_delete(NAME_FUNCS, (st), (i))
-# define sk_NAME_FUNCS_delete_ptr(st, ptr) SKM_sk_delete_ptr(NAME_FUNCS, (st), (ptr))
-# define sk_NAME_FUNCS_insert(st, val, i) SKM_sk_insert(NAME_FUNCS, (st), (val), (i))
-# define sk_NAME_FUNCS_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(NAME_FUNCS, (st), (cmp))
-# define sk_NAME_FUNCS_dup(st) SKM_sk_dup(NAME_FUNCS, st)
-# define sk_NAME_FUNCS_pop_free(st, free_func) SKM_sk_pop_free(NAME_FUNCS, (st), (free_func))
-# define sk_NAME_FUNCS_shift(st) SKM_sk_shift(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_pop(st) SKM_sk_pop(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_sort(st) SKM_sk_sort(NAME_FUNCS, (st))
-# define sk_NAME_FUNCS_is_sorted(st) SKM_sk_is_sorted(NAME_FUNCS, (st))
-# define sk_OCSP_CERTID_new(cmp) SKM_sk_new(OCSP_CERTID, (cmp))
-# define sk_OCSP_CERTID_new_null() SKM_sk_new_null(OCSP_CERTID)
-# define sk_OCSP_CERTID_free(st) SKM_sk_free(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_num(st) SKM_sk_num(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_value(st, i) SKM_sk_value(OCSP_CERTID, (st), (i))
-# define sk_OCSP_CERTID_set(st, i, val) SKM_sk_set(OCSP_CERTID, (st), (i), (val))
-# define sk_OCSP_CERTID_zero(st) SKM_sk_zero(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_push(st, val) SKM_sk_push(OCSP_CERTID, (st), (val))
-# define sk_OCSP_CERTID_unshift(st, val) SKM_sk_unshift(OCSP_CERTID, (st), (val))
-# define sk_OCSP_CERTID_find(st, val) SKM_sk_find(OCSP_CERTID, (st), (val))
-# define sk_OCSP_CERTID_find_ex(st, val) SKM_sk_find_ex(OCSP_CERTID, (st), (val))
-# define sk_OCSP_CERTID_delete(st, i) SKM_sk_delete(OCSP_CERTID, (st), (i))
-# define sk_OCSP_CERTID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_CERTID, (st), (ptr))
-# define sk_OCSP_CERTID_insert(st, val, i) SKM_sk_insert(OCSP_CERTID, (st), (val), (i))
-# define sk_OCSP_CERTID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_CERTID, (st), (cmp))
-# define sk_OCSP_CERTID_dup(st) SKM_sk_dup(OCSP_CERTID, st)
-# define sk_OCSP_CERTID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_CERTID, (st), (free_func))
-# define sk_OCSP_CERTID_shift(st) SKM_sk_shift(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_pop(st) SKM_sk_pop(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_sort(st) SKM_sk_sort(OCSP_CERTID, (st))
-# define sk_OCSP_CERTID_is_sorted(st) SKM_sk_is_sorted(OCSP_CERTID, (st))
-# define sk_OCSP_ONEREQ_new(cmp) SKM_sk_new(OCSP_ONEREQ, (cmp))
-# define sk_OCSP_ONEREQ_new_null() SKM_sk_new_null(OCSP_ONEREQ)
-# define sk_OCSP_ONEREQ_free(st) SKM_sk_free(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_num(st) SKM_sk_num(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_value(st, i) SKM_sk_value(OCSP_ONEREQ, (st), (i))
-# define sk_OCSP_ONEREQ_set(st, i, val) SKM_sk_set(OCSP_ONEREQ, (st), (i), (val))
-# define sk_OCSP_ONEREQ_zero(st) SKM_sk_zero(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_push(st, val) SKM_sk_push(OCSP_ONEREQ, (st), (val))
-# define sk_OCSP_ONEREQ_unshift(st, val) SKM_sk_unshift(OCSP_ONEREQ, (st), (val))
-# define sk_OCSP_ONEREQ_find(st, val) SKM_sk_find(OCSP_ONEREQ, (st), (val))
-# define sk_OCSP_ONEREQ_find_ex(st, val) SKM_sk_find_ex(OCSP_ONEREQ, (st), (val))
-# define sk_OCSP_ONEREQ_delete(st, i) SKM_sk_delete(OCSP_ONEREQ, (st), (i))
-# define sk_OCSP_ONEREQ_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_ONEREQ, (st), (ptr))
-# define sk_OCSP_ONEREQ_insert(st, val, i) SKM_sk_insert(OCSP_ONEREQ, (st), (val), (i))
-# define sk_OCSP_ONEREQ_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_ONEREQ, (st), (cmp))
-# define sk_OCSP_ONEREQ_dup(st) SKM_sk_dup(OCSP_ONEREQ, st)
-# define sk_OCSP_ONEREQ_pop_free(st, free_func) SKM_sk_pop_free(OCSP_ONEREQ, (st), (free_func))
-# define sk_OCSP_ONEREQ_shift(st) SKM_sk_shift(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_pop(st) SKM_sk_pop(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_sort(st) SKM_sk_sort(OCSP_ONEREQ, (st))
-# define sk_OCSP_ONEREQ_is_sorted(st) SKM_sk_is_sorted(OCSP_ONEREQ, (st))
-# define sk_OCSP_RESPID_new(cmp) SKM_sk_new(OCSP_RESPID, (cmp))
-# define sk_OCSP_RESPID_new_null() SKM_sk_new_null(OCSP_RESPID)
-# define sk_OCSP_RESPID_free(st) SKM_sk_free(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_num(st) SKM_sk_num(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_value(st, i) SKM_sk_value(OCSP_RESPID, (st), (i))
-# define sk_OCSP_RESPID_set(st, i, val) SKM_sk_set(OCSP_RESPID, (st), (i), (val))
-# define sk_OCSP_RESPID_zero(st) SKM_sk_zero(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_push(st, val) SKM_sk_push(OCSP_RESPID, (st), (val))
-# define sk_OCSP_RESPID_unshift(st, val) SKM_sk_unshift(OCSP_RESPID, (st), (val))
-# define sk_OCSP_RESPID_find(st, val) SKM_sk_find(OCSP_RESPID, (st), (val))
-# define sk_OCSP_RESPID_find_ex(st, val) SKM_sk_find_ex(OCSP_RESPID, (st), (val))
-# define sk_OCSP_RESPID_delete(st, i) SKM_sk_delete(OCSP_RESPID, (st), (i))
-# define sk_OCSP_RESPID_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_RESPID, (st), (ptr))
-# define sk_OCSP_RESPID_insert(st, val, i) SKM_sk_insert(OCSP_RESPID, (st), (val), (i))
-# define sk_OCSP_RESPID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_RESPID, (st), (cmp))
-# define sk_OCSP_RESPID_dup(st) SKM_sk_dup(OCSP_RESPID, st)
-# define sk_OCSP_RESPID_pop_free(st, free_func) SKM_sk_pop_free(OCSP_RESPID, (st), (free_func))
-# define sk_OCSP_RESPID_shift(st) SKM_sk_shift(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_pop(st) SKM_sk_pop(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_sort(st) SKM_sk_sort(OCSP_RESPID, (st))
-# define sk_OCSP_RESPID_is_sorted(st) SKM_sk_is_sorted(OCSP_RESPID, (st))
-# define sk_OCSP_SINGLERESP_new(cmp) SKM_sk_new(OCSP_SINGLERESP, (cmp))
-# define sk_OCSP_SINGLERESP_new_null() SKM_sk_new_null(OCSP_SINGLERESP)
-# define sk_OCSP_SINGLERESP_free(st) SKM_sk_free(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_num(st) SKM_sk_num(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_value(st, i) SKM_sk_value(OCSP_SINGLERESP, (st), (i))
-# define sk_OCSP_SINGLERESP_set(st, i, val) SKM_sk_set(OCSP_SINGLERESP, (st), (i), (val))
-# define sk_OCSP_SINGLERESP_zero(st) SKM_sk_zero(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_push(st, val) SKM_sk_push(OCSP_SINGLERESP, (st), (val))
-# define sk_OCSP_SINGLERESP_unshift(st, val) SKM_sk_unshift(OCSP_SINGLERESP, (st), (val))
-# define sk_OCSP_SINGLERESP_find(st, val) SKM_sk_find(OCSP_SINGLERESP, (st), (val))
-# define sk_OCSP_SINGLERESP_find_ex(st, val) SKM_sk_find_ex(OCSP_SINGLERESP, (st), (val))
-# define sk_OCSP_SINGLERESP_delete(st, i) SKM_sk_delete(OCSP_SINGLERESP, (st), (i))
-# define sk_OCSP_SINGLERESP_delete_ptr(st, ptr) SKM_sk_delete_ptr(OCSP_SINGLERESP, (st), (ptr))
-# define sk_OCSP_SINGLERESP_insert(st, val, i) SKM_sk_insert(OCSP_SINGLERESP, (st), (val), (i))
-# define sk_OCSP_SINGLERESP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(OCSP_SINGLERESP, (st), (cmp))
-# define sk_OCSP_SINGLERESP_dup(st) SKM_sk_dup(OCSP_SINGLERESP, st)
-# define sk_OCSP_SINGLERESP_pop_free(st, free_func) SKM_sk_pop_free(OCSP_SINGLERESP, (st), (free_func))
-# define sk_OCSP_SINGLERESP_shift(st) SKM_sk_shift(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_pop(st) SKM_sk_pop(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_sort(st) SKM_sk_sort(OCSP_SINGLERESP, (st))
-# define sk_OCSP_SINGLERESP_is_sorted(st) SKM_sk_is_sorted(OCSP_SINGLERESP, (st))
-# define sk_PKCS12_SAFEBAG_new(cmp) SKM_sk_new(PKCS12_SAFEBAG, (cmp))
-# define sk_PKCS12_SAFEBAG_new_null() SKM_sk_new_null(PKCS12_SAFEBAG)
-# define sk_PKCS12_SAFEBAG_free(st) SKM_sk_free(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_num(st) SKM_sk_num(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_value(st, i) SKM_sk_value(PKCS12_SAFEBAG, (st), (i))
-# define sk_PKCS12_SAFEBAG_set(st, i, val) SKM_sk_set(PKCS12_SAFEBAG, (st), (i), (val))
-# define sk_PKCS12_SAFEBAG_zero(st) SKM_sk_zero(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_push(st, val) SKM_sk_push(PKCS12_SAFEBAG, (st), (val))
-# define sk_PKCS12_SAFEBAG_unshift(st, val) SKM_sk_unshift(PKCS12_SAFEBAG, (st), (val))
-# define sk_PKCS12_SAFEBAG_find(st, val) SKM_sk_find(PKCS12_SAFEBAG, (st), (val))
-# define sk_PKCS12_SAFEBAG_find_ex(st, val) SKM_sk_find_ex(PKCS12_SAFEBAG, (st), (val))
-# define sk_PKCS12_SAFEBAG_delete(st, i) SKM_sk_delete(PKCS12_SAFEBAG, (st), (i))
-# define sk_PKCS12_SAFEBAG_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS12_SAFEBAG, (st), (ptr))
-# define sk_PKCS12_SAFEBAG_insert(st, val, i) SKM_sk_insert(PKCS12_SAFEBAG, (st), (val), (i))
-# define sk_PKCS12_SAFEBAG_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS12_SAFEBAG, (st), (cmp))
-# define sk_PKCS12_SAFEBAG_dup(st) SKM_sk_dup(PKCS12_SAFEBAG, st)
-# define sk_PKCS12_SAFEBAG_pop_free(st, free_func) SKM_sk_pop_free(PKCS12_SAFEBAG, (st), (free_func))
-# define sk_PKCS12_SAFEBAG_shift(st) SKM_sk_shift(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_pop(st) SKM_sk_pop(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_sort(st) SKM_sk_sort(PKCS12_SAFEBAG, (st))
-# define sk_PKCS12_SAFEBAG_is_sorted(st) SKM_sk_is_sorted(PKCS12_SAFEBAG, (st))
-# define sk_PKCS7_new(cmp) SKM_sk_new(PKCS7, (cmp))
-# define sk_PKCS7_new_null() SKM_sk_new_null(PKCS7)
-# define sk_PKCS7_free(st) SKM_sk_free(PKCS7, (st))
-# define sk_PKCS7_num(st) SKM_sk_num(PKCS7, (st))
-# define sk_PKCS7_value(st, i) SKM_sk_value(PKCS7, (st), (i))
-# define sk_PKCS7_set(st, i, val) SKM_sk_set(PKCS7, (st), (i), (val))
-# define sk_PKCS7_zero(st) SKM_sk_zero(PKCS7, (st))
-# define sk_PKCS7_push(st, val) SKM_sk_push(PKCS7, (st), (val))
-# define sk_PKCS7_unshift(st, val) SKM_sk_unshift(PKCS7, (st), (val))
-# define sk_PKCS7_find(st, val) SKM_sk_find(PKCS7, (st), (val))
-# define sk_PKCS7_find_ex(st, val) SKM_sk_find_ex(PKCS7, (st), (val))
-# define sk_PKCS7_delete(st, i) SKM_sk_delete(PKCS7, (st), (i))
-# define sk_PKCS7_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7, (st), (ptr))
-# define sk_PKCS7_insert(st, val, i) SKM_sk_insert(PKCS7, (st), (val), (i))
-# define sk_PKCS7_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7, (st), (cmp))
-# define sk_PKCS7_dup(st) SKM_sk_dup(PKCS7, st)
-# define sk_PKCS7_pop_free(st, free_func) SKM_sk_pop_free(PKCS7, (st), (free_func))
-# define sk_PKCS7_shift(st) SKM_sk_shift(PKCS7, (st))
-# define sk_PKCS7_pop(st) SKM_sk_pop(PKCS7, (st))
-# define sk_PKCS7_sort(st) SKM_sk_sort(PKCS7, (st))
-# define sk_PKCS7_is_sorted(st) SKM_sk_is_sorted(PKCS7, (st))
-# define sk_PKCS7_RECIP_INFO_new(cmp) SKM_sk_new(PKCS7_RECIP_INFO, (cmp))
-# define sk_PKCS7_RECIP_INFO_new_null() SKM_sk_new_null(PKCS7_RECIP_INFO)
-# define sk_PKCS7_RECIP_INFO_free(st) SKM_sk_free(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_num(st) SKM_sk_num(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_value(st, i) SKM_sk_value(PKCS7_RECIP_INFO, (st), (i))
-# define sk_PKCS7_RECIP_INFO_set(st, i, val) SKM_sk_set(PKCS7_RECIP_INFO, (st), (i), (val))
-# define sk_PKCS7_RECIP_INFO_zero(st) SKM_sk_zero(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_push(st, val) SKM_sk_push(PKCS7_RECIP_INFO, (st), (val))
-# define sk_PKCS7_RECIP_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_RECIP_INFO, (st), (val))
-# define sk_PKCS7_RECIP_INFO_find(st, val) SKM_sk_find(PKCS7_RECIP_INFO, (st), (val))
-# define sk_PKCS7_RECIP_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_RECIP_INFO, (st), (val))
-# define sk_PKCS7_RECIP_INFO_delete(st, i) SKM_sk_delete(PKCS7_RECIP_INFO, (st), (i))
-# define sk_PKCS7_RECIP_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_RECIP_INFO, (st), (ptr))
-# define sk_PKCS7_RECIP_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_RECIP_INFO, (st), (val), (i))
-# define sk_PKCS7_RECIP_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_RECIP_INFO, (st), (cmp))
-# define sk_PKCS7_RECIP_INFO_dup(st) SKM_sk_dup(PKCS7_RECIP_INFO, st)
-# define sk_PKCS7_RECIP_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_RECIP_INFO, (st), (free_func))
-# define sk_PKCS7_RECIP_INFO_shift(st) SKM_sk_shift(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_pop(st) SKM_sk_pop(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_sort(st) SKM_sk_sort(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_RECIP_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_RECIP_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_new(cmp) SKM_sk_new(PKCS7_SIGNER_INFO, (cmp))
-# define sk_PKCS7_SIGNER_INFO_new_null() SKM_sk_new_null(PKCS7_SIGNER_INFO)
-# define sk_PKCS7_SIGNER_INFO_free(st) SKM_sk_free(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_num(st) SKM_sk_num(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_value(st, i) SKM_sk_value(PKCS7_SIGNER_INFO, (st), (i))
-# define sk_PKCS7_SIGNER_INFO_set(st, i, val) SKM_sk_set(PKCS7_SIGNER_INFO, (st), (i), (val))
-# define sk_PKCS7_SIGNER_INFO_zero(st) SKM_sk_zero(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_push(st, val) SKM_sk_push(PKCS7_SIGNER_INFO, (st), (val))
-# define sk_PKCS7_SIGNER_INFO_unshift(st, val) SKM_sk_unshift(PKCS7_SIGNER_INFO, (st), (val))
-# define sk_PKCS7_SIGNER_INFO_find(st, val) SKM_sk_find(PKCS7_SIGNER_INFO, (st), (val))
-# define sk_PKCS7_SIGNER_INFO_find_ex(st, val) SKM_sk_find_ex(PKCS7_SIGNER_INFO, (st), (val))
-# define sk_PKCS7_SIGNER_INFO_delete(st, i) SKM_sk_delete(PKCS7_SIGNER_INFO, (st), (i))
-# define sk_PKCS7_SIGNER_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(PKCS7_SIGNER_INFO, (st), (ptr))
-# define sk_PKCS7_SIGNER_INFO_insert(st, val, i) SKM_sk_insert(PKCS7_SIGNER_INFO, (st), (val), (i))
-# define sk_PKCS7_SIGNER_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(PKCS7_SIGNER_INFO, (st), (cmp))
-# define sk_PKCS7_SIGNER_INFO_dup(st) SKM_sk_dup(PKCS7_SIGNER_INFO, st)
-# define sk_PKCS7_SIGNER_INFO_pop_free(st, free_func) SKM_sk_pop_free(PKCS7_SIGNER_INFO, (st), (free_func))
-# define sk_PKCS7_SIGNER_INFO_shift(st) SKM_sk_shift(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_pop(st) SKM_sk_pop(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_sort(st) SKM_sk_sort(PKCS7_SIGNER_INFO, (st))
-# define sk_PKCS7_SIGNER_INFO_is_sorted(st) SKM_sk_is_sorted(PKCS7_SIGNER_INFO, (st))
-# define sk_POLICYINFO_new(cmp) SKM_sk_new(POLICYINFO, (cmp))
-# define sk_POLICYINFO_new_null() SKM_sk_new_null(POLICYINFO)
-# define sk_POLICYINFO_free(st) SKM_sk_free(POLICYINFO, (st))
-# define sk_POLICYINFO_num(st) SKM_sk_num(POLICYINFO, (st))
-# define sk_POLICYINFO_value(st, i) SKM_sk_value(POLICYINFO, (st), (i))
-# define sk_POLICYINFO_set(st, i, val) SKM_sk_set(POLICYINFO, (st), (i), (val))
-# define sk_POLICYINFO_zero(st) SKM_sk_zero(POLICYINFO, (st))
-# define sk_POLICYINFO_push(st, val) SKM_sk_push(POLICYINFO, (st), (val))
-# define sk_POLICYINFO_unshift(st, val) SKM_sk_unshift(POLICYINFO, (st), (val))
-# define sk_POLICYINFO_find(st, val) SKM_sk_find(POLICYINFO, (st), (val))
-# define sk_POLICYINFO_find_ex(st, val) SKM_sk_find_ex(POLICYINFO, (st), (val))
-# define sk_POLICYINFO_delete(st, i) SKM_sk_delete(POLICYINFO, (st), (i))
-# define sk_POLICYINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYINFO, (st), (ptr))
-# define sk_POLICYINFO_insert(st, val, i) SKM_sk_insert(POLICYINFO, (st), (val), (i))
-# define sk_POLICYINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYINFO, (st), (cmp))
-# define sk_POLICYINFO_dup(st) SKM_sk_dup(POLICYINFO, st)
-# define sk_POLICYINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYINFO, (st), (free_func))
-# define sk_POLICYINFO_shift(st) SKM_sk_shift(POLICYINFO, (st))
-# define sk_POLICYINFO_pop(st) SKM_sk_pop(POLICYINFO, (st))
-# define sk_POLICYINFO_sort(st) SKM_sk_sort(POLICYINFO, (st))
-# define sk_POLICYINFO_is_sorted(st) SKM_sk_is_sorted(POLICYINFO, (st))
-# define sk_POLICYQUALINFO_new(cmp) SKM_sk_new(POLICYQUALINFO, (cmp))
-# define sk_POLICYQUALINFO_new_null() SKM_sk_new_null(POLICYQUALINFO)
-# define sk_POLICYQUALINFO_free(st) SKM_sk_free(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_num(st) SKM_sk_num(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_value(st, i) SKM_sk_value(POLICYQUALINFO, (st), (i))
-# define sk_POLICYQUALINFO_set(st, i, val) SKM_sk_set(POLICYQUALINFO, (st), (i), (val))
-# define sk_POLICYQUALINFO_zero(st) SKM_sk_zero(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_push(st, val) SKM_sk_push(POLICYQUALINFO, (st), (val))
-# define sk_POLICYQUALINFO_unshift(st, val) SKM_sk_unshift(POLICYQUALINFO, (st), (val))
-# define sk_POLICYQUALINFO_find(st, val) SKM_sk_find(POLICYQUALINFO, (st), (val))
-# define sk_POLICYQUALINFO_find_ex(st, val) SKM_sk_find_ex(POLICYQUALINFO, (st), (val))
-# define sk_POLICYQUALINFO_delete(st, i) SKM_sk_delete(POLICYQUALINFO, (st), (i))
-# define sk_POLICYQUALINFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICYQUALINFO, (st), (ptr))
-# define sk_POLICYQUALINFO_insert(st, val, i) SKM_sk_insert(POLICYQUALINFO, (st), (val), (i))
-# define sk_POLICYQUALINFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICYQUALINFO, (st), (cmp))
-# define sk_POLICYQUALINFO_dup(st) SKM_sk_dup(POLICYQUALINFO, st)
-# define sk_POLICYQUALINFO_pop_free(st, free_func) SKM_sk_pop_free(POLICYQUALINFO, (st), (free_func))
-# define sk_POLICYQUALINFO_shift(st) SKM_sk_shift(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_pop(st) SKM_sk_pop(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_sort(st) SKM_sk_sort(POLICYQUALINFO, (st))
-# define sk_POLICYQUALINFO_is_sorted(st) SKM_sk_is_sorted(POLICYQUALINFO, (st))
-# define sk_POLICY_MAPPING_new(cmp) SKM_sk_new(POLICY_MAPPING, (cmp))
-# define sk_POLICY_MAPPING_new_null() SKM_sk_new_null(POLICY_MAPPING)
-# define sk_POLICY_MAPPING_free(st) SKM_sk_free(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_num(st) SKM_sk_num(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_value(st, i) SKM_sk_value(POLICY_MAPPING, (st), (i))
-# define sk_POLICY_MAPPING_set(st, i, val) SKM_sk_set(POLICY_MAPPING, (st), (i), (val))
-# define sk_POLICY_MAPPING_zero(st) SKM_sk_zero(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_push(st, val) SKM_sk_push(POLICY_MAPPING, (st), (val))
-# define sk_POLICY_MAPPING_unshift(st, val) SKM_sk_unshift(POLICY_MAPPING, (st), (val))
-# define sk_POLICY_MAPPING_find(st, val) SKM_sk_find(POLICY_MAPPING, (st), (val))
-# define sk_POLICY_MAPPING_find_ex(st, val) SKM_sk_find_ex(POLICY_MAPPING, (st), (val))
-# define sk_POLICY_MAPPING_delete(st, i) SKM_sk_delete(POLICY_MAPPING, (st), (i))
-# define sk_POLICY_MAPPING_delete_ptr(st, ptr) SKM_sk_delete_ptr(POLICY_MAPPING, (st), (ptr))
-# define sk_POLICY_MAPPING_insert(st, val, i) SKM_sk_insert(POLICY_MAPPING, (st), (val), (i))
-# define sk_POLICY_MAPPING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(POLICY_MAPPING, (st), (cmp))
-# define sk_POLICY_MAPPING_dup(st) SKM_sk_dup(POLICY_MAPPING, st)
-# define sk_POLICY_MAPPING_pop_free(st, free_func) SKM_sk_pop_free(POLICY_MAPPING, (st), (free_func))
-# define sk_POLICY_MAPPING_shift(st) SKM_sk_shift(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_pop(st) SKM_sk_pop(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_sort(st) SKM_sk_sort(POLICY_MAPPING, (st))
-# define sk_POLICY_MAPPING_is_sorted(st) SKM_sk_is_sorted(POLICY_MAPPING, (st))
-# define sk_SRP_gN_new(cmp) SKM_sk_new(SRP_gN, (cmp))
-# define sk_SRP_gN_new_null() SKM_sk_new_null(SRP_gN)
-# define sk_SRP_gN_free(st) SKM_sk_free(SRP_gN, (st))
-# define sk_SRP_gN_num(st) SKM_sk_num(SRP_gN, (st))
-# define sk_SRP_gN_value(st, i) SKM_sk_value(SRP_gN, (st), (i))
-# define sk_SRP_gN_set(st, i, val) SKM_sk_set(SRP_gN, (st), (i), (val))
-# define sk_SRP_gN_zero(st) SKM_sk_zero(SRP_gN, (st))
-# define sk_SRP_gN_push(st, val) SKM_sk_push(SRP_gN, (st), (val))
-# define sk_SRP_gN_unshift(st, val) SKM_sk_unshift(SRP_gN, (st), (val))
-# define sk_SRP_gN_find(st, val) SKM_sk_find(SRP_gN, (st), (val))
-# define sk_SRP_gN_find_ex(st, val) SKM_sk_find_ex(SRP_gN, (st), (val))
-# define sk_SRP_gN_delete(st, i) SKM_sk_delete(SRP_gN, (st), (i))
-# define sk_SRP_gN_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN, (st), (ptr))
-# define sk_SRP_gN_insert(st, val, i) SKM_sk_insert(SRP_gN, (st), (val), (i))
-# define sk_SRP_gN_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRP_gN, (st), (cmp))
-# define sk_SRP_gN_dup(st) SKM_sk_dup(SRP_gN, st)
-# define sk_SRP_gN_pop_free(st, free_func) SKM_sk_pop_free(SRP_gN, (st), (free_func))
-# define sk_SRP_gN_shift(st) SKM_sk_shift(SRP_gN, (st))
-# define sk_SRP_gN_pop(st) SKM_sk_pop(SRP_gN, (st))
-# define sk_SRP_gN_sort(st) SKM_sk_sort(SRP_gN, (st))
-# define sk_SRP_gN_is_sorted(st) SKM_sk_is_sorted(SRP_gN, (st))
-# define sk_SRP_gN_cache_new(cmp) SKM_sk_new(SRP_gN_cache, (cmp))
-# define sk_SRP_gN_cache_new_null() SKM_sk_new_null(SRP_gN_cache)
-# define sk_SRP_gN_cache_free(st) SKM_sk_free(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_num(st) SKM_sk_num(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_value(st, i) SKM_sk_value(SRP_gN_cache, (st), (i))
-# define sk_SRP_gN_cache_set(st, i, val) SKM_sk_set(SRP_gN_cache, (st), (i), (val))
-# define sk_SRP_gN_cache_zero(st) SKM_sk_zero(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_push(st, val) SKM_sk_push(SRP_gN_cache, (st), (val))
-# define sk_SRP_gN_cache_unshift(st, val) SKM_sk_unshift(SRP_gN_cache, (st), (val))
-# define sk_SRP_gN_cache_find(st, val) SKM_sk_find(SRP_gN_cache, (st), (val))
-# define sk_SRP_gN_cache_find_ex(st, val) SKM_sk_find_ex(SRP_gN_cache, (st), (val))
-# define sk_SRP_gN_cache_delete(st, i) SKM_sk_delete(SRP_gN_cache, (st), (i))
-# define sk_SRP_gN_cache_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_gN_cache, (st), (ptr))
-# define sk_SRP_gN_cache_insert(st, val, i) SKM_sk_insert(SRP_gN_cache, (st), (val), (i))
-# define sk_SRP_gN_cache_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRP_gN_cache, (st), (cmp))
-# define sk_SRP_gN_cache_dup(st) SKM_sk_dup(SRP_gN_cache, st)
-# define sk_SRP_gN_cache_pop_free(st, free_func) SKM_sk_pop_free(SRP_gN_cache, (st), (free_func))
-# define sk_SRP_gN_cache_shift(st) SKM_sk_shift(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_pop(st) SKM_sk_pop(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_sort(st) SKM_sk_sort(SRP_gN_cache, (st))
-# define sk_SRP_gN_cache_is_sorted(st) SKM_sk_is_sorted(SRP_gN_cache, (st))
-# define sk_SRP_user_pwd_new(cmp) SKM_sk_new(SRP_user_pwd, (cmp))
-# define sk_SRP_user_pwd_new_null() SKM_sk_new_null(SRP_user_pwd)
-# define sk_SRP_user_pwd_free(st) SKM_sk_free(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_num(st) SKM_sk_num(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_value(st, i) SKM_sk_value(SRP_user_pwd, (st), (i))
-# define sk_SRP_user_pwd_set(st, i, val) SKM_sk_set(SRP_user_pwd, (st), (i), (val))
-# define sk_SRP_user_pwd_zero(st) SKM_sk_zero(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_push(st, val) SKM_sk_push(SRP_user_pwd, (st), (val))
-# define sk_SRP_user_pwd_unshift(st, val) SKM_sk_unshift(SRP_user_pwd, (st), (val))
-# define sk_SRP_user_pwd_find(st, val) SKM_sk_find(SRP_user_pwd, (st), (val))
-# define sk_SRP_user_pwd_find_ex(st, val) SKM_sk_find_ex(SRP_user_pwd, (st), (val))
-# define sk_SRP_user_pwd_delete(st, i) SKM_sk_delete(SRP_user_pwd, (st), (i))
-# define sk_SRP_user_pwd_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRP_user_pwd, (st), (ptr))
-# define sk_SRP_user_pwd_insert(st, val, i) SKM_sk_insert(SRP_user_pwd, (st), (val), (i))
-# define sk_SRP_user_pwd_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRP_user_pwd, (st), (cmp))
-# define sk_SRP_user_pwd_dup(st) SKM_sk_dup(SRP_user_pwd, st)
-# define sk_SRP_user_pwd_pop_free(st, free_func) SKM_sk_pop_free(SRP_user_pwd, (st), (free_func))
-# define sk_SRP_user_pwd_shift(st) SKM_sk_shift(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_pop(st) SKM_sk_pop(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_sort(st) SKM_sk_sort(SRP_user_pwd, (st))
-# define sk_SRP_user_pwd_is_sorted(st) SKM_sk_is_sorted(SRP_user_pwd, (st))
-# define sk_SRTP_PROTECTION_PROFILE_new(cmp) SKM_sk_new(SRTP_PROTECTION_PROFILE, (cmp))
-# define sk_SRTP_PROTECTION_PROFILE_new_null() SKM_sk_new_null(SRTP_PROTECTION_PROFILE)
-# define sk_SRTP_PROTECTION_PROFILE_free(st) SKM_sk_free(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_num(st) SKM_sk_num(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_value(st, i) SKM_sk_value(SRTP_PROTECTION_PROFILE, (st), (i))
-# define sk_SRTP_PROTECTION_PROFILE_set(st, i, val) SKM_sk_set(SRTP_PROTECTION_PROFILE, (st), (i), (val))
-# define sk_SRTP_PROTECTION_PROFILE_zero(st) SKM_sk_zero(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_push(st, val) SKM_sk_push(SRTP_PROTECTION_PROFILE, (st), (val))
-# define sk_SRTP_PROTECTION_PROFILE_unshift(st, val) SKM_sk_unshift(SRTP_PROTECTION_PROFILE, (st), (val))
-# define sk_SRTP_PROTECTION_PROFILE_find(st, val) SKM_sk_find(SRTP_PROTECTION_PROFILE, (st), (val))
-# define sk_SRTP_PROTECTION_PROFILE_find_ex(st, val) SKM_sk_find_ex(SRTP_PROTECTION_PROFILE, (st), (val))
-# define sk_SRTP_PROTECTION_PROFILE_delete(st, i) SKM_sk_delete(SRTP_PROTECTION_PROFILE, (st), (i))
-# define sk_SRTP_PROTECTION_PROFILE_delete_ptr(st, ptr) SKM_sk_delete_ptr(SRTP_PROTECTION_PROFILE, (st), (ptr))
-# define sk_SRTP_PROTECTION_PROFILE_insert(st, val, i) SKM_sk_insert(SRTP_PROTECTION_PROFILE, (st), (val), (i))
-# define sk_SRTP_PROTECTION_PROFILE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SRTP_PROTECTION_PROFILE, (st), (cmp))
-# define sk_SRTP_PROTECTION_PROFILE_dup(st) SKM_sk_dup(SRTP_PROTECTION_PROFILE, st)
-# define sk_SRTP_PROTECTION_PROFILE_pop_free(st, free_func) SKM_sk_pop_free(SRTP_PROTECTION_PROFILE, (st), (free_func))
-# define sk_SRTP_PROTECTION_PROFILE_shift(st) SKM_sk_shift(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_pop(st) SKM_sk_pop(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_sort(st) SKM_sk_sort(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SRTP_PROTECTION_PROFILE_is_sorted(st) SKM_sk_is_sorted(SRTP_PROTECTION_PROFILE, (st))
-# define sk_SSL_CIPHER_new(cmp) SKM_sk_new(SSL_CIPHER, (cmp))
-# define sk_SSL_CIPHER_new_null() SKM_sk_new_null(SSL_CIPHER)
-# define sk_SSL_CIPHER_free(st) SKM_sk_free(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_num(st) SKM_sk_num(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_value(st, i) SKM_sk_value(SSL_CIPHER, (st), (i))
-# define sk_SSL_CIPHER_set(st, i, val) SKM_sk_set(SSL_CIPHER, (st), (i), (val))
-# define sk_SSL_CIPHER_zero(st) SKM_sk_zero(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_push(st, val) SKM_sk_push(SSL_CIPHER, (st), (val))
-# define sk_SSL_CIPHER_unshift(st, val) SKM_sk_unshift(SSL_CIPHER, (st), (val))
-# define sk_SSL_CIPHER_find(st, val) SKM_sk_find(SSL_CIPHER, (st), (val))
-# define sk_SSL_CIPHER_find_ex(st, val) SKM_sk_find_ex(SSL_CIPHER, (st), (val))
-# define sk_SSL_CIPHER_delete(st, i) SKM_sk_delete(SSL_CIPHER, (st), (i))
-# define sk_SSL_CIPHER_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_CIPHER, (st), (ptr))
-# define sk_SSL_CIPHER_insert(st, val, i) SKM_sk_insert(SSL_CIPHER, (st), (val), (i))
-# define sk_SSL_CIPHER_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_CIPHER, (st), (cmp))
-# define sk_SSL_CIPHER_dup(st) SKM_sk_dup(SSL_CIPHER, st)
-# define sk_SSL_CIPHER_pop_free(st, free_func) SKM_sk_pop_free(SSL_CIPHER, (st), (free_func))
-# define sk_SSL_CIPHER_shift(st) SKM_sk_shift(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_pop(st) SKM_sk_pop(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_sort(st) SKM_sk_sort(SSL_CIPHER, (st))
-# define sk_SSL_CIPHER_is_sorted(st) SKM_sk_is_sorted(SSL_CIPHER, (st))
-# define sk_SSL_COMP_new(cmp) SKM_sk_new(SSL_COMP, (cmp))
-# define sk_SSL_COMP_new_null() SKM_sk_new_null(SSL_COMP)
-# define sk_SSL_COMP_free(st) SKM_sk_free(SSL_COMP, (st))
-# define sk_SSL_COMP_num(st) SKM_sk_num(SSL_COMP, (st))
-# define sk_SSL_COMP_value(st, i) SKM_sk_value(SSL_COMP, (st), (i))
-# define sk_SSL_COMP_set(st, i, val) SKM_sk_set(SSL_COMP, (st), (i), (val))
-# define sk_SSL_COMP_zero(st) SKM_sk_zero(SSL_COMP, (st))
-# define sk_SSL_COMP_push(st, val) SKM_sk_push(SSL_COMP, (st), (val))
-# define sk_SSL_COMP_unshift(st, val) SKM_sk_unshift(SSL_COMP, (st), (val))
-# define sk_SSL_COMP_find(st, val) SKM_sk_find(SSL_COMP, (st), (val))
-# define sk_SSL_COMP_find_ex(st, val) SKM_sk_find_ex(SSL_COMP, (st), (val))
-# define sk_SSL_COMP_delete(st, i) SKM_sk_delete(SSL_COMP, (st), (i))
-# define sk_SSL_COMP_delete_ptr(st, ptr) SKM_sk_delete_ptr(SSL_COMP, (st), (ptr))
-# define sk_SSL_COMP_insert(st, val, i) SKM_sk_insert(SSL_COMP, (st), (val), (i))
-# define sk_SSL_COMP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SSL_COMP, (st), (cmp))
-# define sk_SSL_COMP_dup(st) SKM_sk_dup(SSL_COMP, st)
-# define sk_SSL_COMP_pop_free(st, free_func) SKM_sk_pop_free(SSL_COMP, (st), (free_func))
-# define sk_SSL_COMP_shift(st) SKM_sk_shift(SSL_COMP, (st))
-# define sk_SSL_COMP_pop(st) SKM_sk_pop(SSL_COMP, (st))
-# define sk_SSL_COMP_sort(st) SKM_sk_sort(SSL_COMP, (st))
-# define sk_SSL_COMP_is_sorted(st) SKM_sk_is_sorted(SSL_COMP, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_new(cmp) SKM_sk_new(STACK_OF_X509_NAME_ENTRY, (cmp))
-# define sk_STACK_OF_X509_NAME_ENTRY_new_null() SKM_sk_new_null(STACK_OF_X509_NAME_ENTRY)
-# define sk_STACK_OF_X509_NAME_ENTRY_free(st) SKM_sk_free(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_num(st) SKM_sk_num(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_value(st, i) SKM_sk_value(STACK_OF_X509_NAME_ENTRY, (st), (i))
-# define sk_STACK_OF_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(STACK_OF_X509_NAME_ENTRY, (st), (i), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_zero(st) SKM_sk_zero(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_push(st, val) SKM_sk_push(STACK_OF_X509_NAME_ENTRY, (st), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(STACK_OF_X509_NAME_ENTRY, (st), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_find(st, val) SKM_sk_find(STACK_OF_X509_NAME_ENTRY, (st), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(STACK_OF_X509_NAME_ENTRY, (st), (val))
-# define sk_STACK_OF_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(STACK_OF_X509_NAME_ENTRY, (st), (i))
-# define sk_STACK_OF_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(STACK_OF_X509_NAME_ENTRY, (st), (ptr))
-# define sk_STACK_OF_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(STACK_OF_X509_NAME_ENTRY, (st), (val), (i))
-# define sk_STACK_OF_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STACK_OF_X509_NAME_ENTRY, (st), (cmp))
-# define sk_STACK_OF_X509_NAME_ENTRY_dup(st) SKM_sk_dup(STACK_OF_X509_NAME_ENTRY, st)
-# define sk_STACK_OF_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(STACK_OF_X509_NAME_ENTRY, (st), (free_func))
-# define sk_STACK_OF_X509_NAME_ENTRY_shift(st) SKM_sk_shift(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_pop(st) SKM_sk_pop(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_sort(st) SKM_sk_sort(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STACK_OF_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(STACK_OF_X509_NAME_ENTRY, (st))
-# define sk_STORE_ATTR_INFO_new(cmp) SKM_sk_new(STORE_ATTR_INFO, (cmp))
-# define sk_STORE_ATTR_INFO_new_null() SKM_sk_new_null(STORE_ATTR_INFO)
-# define sk_STORE_ATTR_INFO_free(st) SKM_sk_free(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_num(st) SKM_sk_num(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_value(st, i) SKM_sk_value(STORE_ATTR_INFO, (st), (i))
-# define sk_STORE_ATTR_INFO_set(st, i, val) SKM_sk_set(STORE_ATTR_INFO, (st), (i), (val))
-# define sk_STORE_ATTR_INFO_zero(st) SKM_sk_zero(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_push(st, val) SKM_sk_push(STORE_ATTR_INFO, (st), (val))
-# define sk_STORE_ATTR_INFO_unshift(st, val) SKM_sk_unshift(STORE_ATTR_INFO, (st), (val))
-# define sk_STORE_ATTR_INFO_find(st, val) SKM_sk_find(STORE_ATTR_INFO, (st), (val))
-# define sk_STORE_ATTR_INFO_find_ex(st, val) SKM_sk_find_ex(STORE_ATTR_INFO, (st), (val))
-# define sk_STORE_ATTR_INFO_delete(st, i) SKM_sk_delete(STORE_ATTR_INFO, (st), (i))
-# define sk_STORE_ATTR_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_ATTR_INFO, (st), (ptr))
-# define sk_STORE_ATTR_INFO_insert(st, val, i) SKM_sk_insert(STORE_ATTR_INFO, (st), (val), (i))
-# define sk_STORE_ATTR_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_ATTR_INFO, (st), (cmp))
-# define sk_STORE_ATTR_INFO_dup(st) SKM_sk_dup(STORE_ATTR_INFO, st)
-# define sk_STORE_ATTR_INFO_pop_free(st, free_func) SKM_sk_pop_free(STORE_ATTR_INFO, (st), (free_func))
-# define sk_STORE_ATTR_INFO_shift(st) SKM_sk_shift(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_pop(st) SKM_sk_pop(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_sort(st) SKM_sk_sort(STORE_ATTR_INFO, (st))
-# define sk_STORE_ATTR_INFO_is_sorted(st) SKM_sk_is_sorted(STORE_ATTR_INFO, (st))
-# define sk_STORE_OBJECT_new(cmp) SKM_sk_new(STORE_OBJECT, (cmp))
-# define sk_STORE_OBJECT_new_null() SKM_sk_new_null(STORE_OBJECT)
-# define sk_STORE_OBJECT_free(st) SKM_sk_free(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_num(st) SKM_sk_num(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_value(st, i) SKM_sk_value(STORE_OBJECT, (st), (i))
-# define sk_STORE_OBJECT_set(st, i, val) SKM_sk_set(STORE_OBJECT, (st), (i), (val))
-# define sk_STORE_OBJECT_zero(st) SKM_sk_zero(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_push(st, val) SKM_sk_push(STORE_OBJECT, (st), (val))
-# define sk_STORE_OBJECT_unshift(st, val) SKM_sk_unshift(STORE_OBJECT, (st), (val))
-# define sk_STORE_OBJECT_find(st, val) SKM_sk_find(STORE_OBJECT, (st), (val))
-# define sk_STORE_OBJECT_find_ex(st, val) SKM_sk_find_ex(STORE_OBJECT, (st), (val))
-# define sk_STORE_OBJECT_delete(st, i) SKM_sk_delete(STORE_OBJECT, (st), (i))
-# define sk_STORE_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(STORE_OBJECT, (st), (ptr))
-# define sk_STORE_OBJECT_insert(st, val, i) SKM_sk_insert(STORE_OBJECT, (st), (val), (i))
-# define sk_STORE_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(STORE_OBJECT, (st), (cmp))
-# define sk_STORE_OBJECT_dup(st) SKM_sk_dup(STORE_OBJECT, st)
-# define sk_STORE_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(STORE_OBJECT, (st), (free_func))
-# define sk_STORE_OBJECT_shift(st) SKM_sk_shift(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_pop(st) SKM_sk_pop(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_sort(st) SKM_sk_sort(STORE_OBJECT, (st))
-# define sk_STORE_OBJECT_is_sorted(st) SKM_sk_is_sorted(STORE_OBJECT, (st))
-# define sk_SXNETID_new(cmp) SKM_sk_new(SXNETID, (cmp))
-# define sk_SXNETID_new_null() SKM_sk_new_null(SXNETID)
-# define sk_SXNETID_free(st) SKM_sk_free(SXNETID, (st))
-# define sk_SXNETID_num(st) SKM_sk_num(SXNETID, (st))
-# define sk_SXNETID_value(st, i) SKM_sk_value(SXNETID, (st), (i))
-# define sk_SXNETID_set(st, i, val) SKM_sk_set(SXNETID, (st), (i), (val))
-# define sk_SXNETID_zero(st) SKM_sk_zero(SXNETID, (st))
-# define sk_SXNETID_push(st, val) SKM_sk_push(SXNETID, (st), (val))
-# define sk_SXNETID_unshift(st, val) SKM_sk_unshift(SXNETID, (st), (val))
-# define sk_SXNETID_find(st, val) SKM_sk_find(SXNETID, (st), (val))
-# define sk_SXNETID_find_ex(st, val) SKM_sk_find_ex(SXNETID, (st), (val))
-# define sk_SXNETID_delete(st, i) SKM_sk_delete(SXNETID, (st), (i))
-# define sk_SXNETID_delete_ptr(st, ptr) SKM_sk_delete_ptr(SXNETID, (st), (ptr))
-# define sk_SXNETID_insert(st, val, i) SKM_sk_insert(SXNETID, (st), (val), (i))
-# define sk_SXNETID_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(SXNETID, (st), (cmp))
-# define sk_SXNETID_dup(st) SKM_sk_dup(SXNETID, st)
-# define sk_SXNETID_pop_free(st, free_func) SKM_sk_pop_free(SXNETID, (st), (free_func))
-# define sk_SXNETID_shift(st) SKM_sk_shift(SXNETID, (st))
-# define sk_SXNETID_pop(st) SKM_sk_pop(SXNETID, (st))
-# define sk_SXNETID_sort(st) SKM_sk_sort(SXNETID, (st))
-# define sk_SXNETID_is_sorted(st) SKM_sk_is_sorted(SXNETID, (st))
-# define sk_UI_STRING_new(cmp) SKM_sk_new(UI_STRING, (cmp))
-# define sk_UI_STRING_new_null() SKM_sk_new_null(UI_STRING)
-# define sk_UI_STRING_free(st) SKM_sk_free(UI_STRING, (st))
-# define sk_UI_STRING_num(st) SKM_sk_num(UI_STRING, (st))
-# define sk_UI_STRING_value(st, i) SKM_sk_value(UI_STRING, (st), (i))
-# define sk_UI_STRING_set(st, i, val) SKM_sk_set(UI_STRING, (st), (i), (val))
-# define sk_UI_STRING_zero(st) SKM_sk_zero(UI_STRING, (st))
-# define sk_UI_STRING_push(st, val) SKM_sk_push(UI_STRING, (st), (val))
-# define sk_UI_STRING_unshift(st, val) SKM_sk_unshift(UI_STRING, (st), (val))
-# define sk_UI_STRING_find(st, val) SKM_sk_find(UI_STRING, (st), (val))
-# define sk_UI_STRING_find_ex(st, val) SKM_sk_find_ex(UI_STRING, (st), (val))
-# define sk_UI_STRING_delete(st, i) SKM_sk_delete(UI_STRING, (st), (i))
-# define sk_UI_STRING_delete_ptr(st, ptr) SKM_sk_delete_ptr(UI_STRING, (st), (ptr))
-# define sk_UI_STRING_insert(st, val, i) SKM_sk_insert(UI_STRING, (st), (val), (i))
-# define sk_UI_STRING_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(UI_STRING, (st), (cmp))
-# define sk_UI_STRING_dup(st) SKM_sk_dup(UI_STRING, st)
-# define sk_UI_STRING_pop_free(st, free_func) SKM_sk_pop_free(UI_STRING, (st), (free_func))
-# define sk_UI_STRING_shift(st) SKM_sk_shift(UI_STRING, (st))
-# define sk_UI_STRING_pop(st) SKM_sk_pop(UI_STRING, (st))
-# define sk_UI_STRING_sort(st) SKM_sk_sort(UI_STRING, (st))
-# define sk_UI_STRING_is_sorted(st) SKM_sk_is_sorted(UI_STRING, (st))
-# define sk_X509_new(cmp) SKM_sk_new(X509, (cmp))
-# define sk_X509_new_null() SKM_sk_new_null(X509)
-# define sk_X509_free(st) SKM_sk_free(X509, (st))
-# define sk_X509_num(st) SKM_sk_num(X509, (st))
-# define sk_X509_value(st, i) SKM_sk_value(X509, (st), (i))
-# define sk_X509_set(st, i, val) SKM_sk_set(X509, (st), (i), (val))
-# define sk_X509_zero(st) SKM_sk_zero(X509, (st))
-# define sk_X509_push(st, val) SKM_sk_push(X509, (st), (val))
-# define sk_X509_unshift(st, val) SKM_sk_unshift(X509, (st), (val))
-# define sk_X509_find(st, val) SKM_sk_find(X509, (st), (val))
-# define sk_X509_find_ex(st, val) SKM_sk_find_ex(X509, (st), (val))
-# define sk_X509_delete(st, i) SKM_sk_delete(X509, (st), (i))
-# define sk_X509_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509, (st), (ptr))
-# define sk_X509_insert(st, val, i) SKM_sk_insert(X509, (st), (val), (i))
-# define sk_X509_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509, (st), (cmp))
-# define sk_X509_dup(st) SKM_sk_dup(X509, st)
-# define sk_X509_pop_free(st, free_func) SKM_sk_pop_free(X509, (st), (free_func))
-# define sk_X509_shift(st) SKM_sk_shift(X509, (st))
-# define sk_X509_pop(st) SKM_sk_pop(X509, (st))
-# define sk_X509_sort(st) SKM_sk_sort(X509, (st))
-# define sk_X509_is_sorted(st) SKM_sk_is_sorted(X509, (st))
-# define sk_X509V3_EXT_METHOD_new(cmp) SKM_sk_new(X509V3_EXT_METHOD, (cmp))
-# define sk_X509V3_EXT_METHOD_new_null() SKM_sk_new_null(X509V3_EXT_METHOD)
-# define sk_X509V3_EXT_METHOD_free(st) SKM_sk_free(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_num(st) SKM_sk_num(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_value(st, i) SKM_sk_value(X509V3_EXT_METHOD, (st), (i))
-# define sk_X509V3_EXT_METHOD_set(st, i, val) SKM_sk_set(X509V3_EXT_METHOD, (st), (i), (val))
-# define sk_X509V3_EXT_METHOD_zero(st) SKM_sk_zero(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_push(st, val) SKM_sk_push(X509V3_EXT_METHOD, (st), (val))
-# define sk_X509V3_EXT_METHOD_unshift(st, val) SKM_sk_unshift(X509V3_EXT_METHOD, (st), (val))
-# define sk_X509V3_EXT_METHOD_find(st, val) SKM_sk_find(X509V3_EXT_METHOD, (st), (val))
-# define sk_X509V3_EXT_METHOD_find_ex(st, val) SKM_sk_find_ex(X509V3_EXT_METHOD, (st), (val))
-# define sk_X509V3_EXT_METHOD_delete(st, i) SKM_sk_delete(X509V3_EXT_METHOD, (st), (i))
-# define sk_X509V3_EXT_METHOD_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509V3_EXT_METHOD, (st), (ptr))
-# define sk_X509V3_EXT_METHOD_insert(st, val, i) SKM_sk_insert(X509V3_EXT_METHOD, (st), (val), (i))
-# define sk_X509V3_EXT_METHOD_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509V3_EXT_METHOD, (st), (cmp))
-# define sk_X509V3_EXT_METHOD_dup(st) SKM_sk_dup(X509V3_EXT_METHOD, st)
-# define sk_X509V3_EXT_METHOD_pop_free(st, free_func) SKM_sk_pop_free(X509V3_EXT_METHOD, (st), (free_func))
-# define sk_X509V3_EXT_METHOD_shift(st) SKM_sk_shift(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_pop(st) SKM_sk_pop(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_sort(st) SKM_sk_sort(X509V3_EXT_METHOD, (st))
-# define sk_X509V3_EXT_METHOD_is_sorted(st) SKM_sk_is_sorted(X509V3_EXT_METHOD, (st))
-# define sk_X509_ALGOR_new(cmp) SKM_sk_new(X509_ALGOR, (cmp))
-# define sk_X509_ALGOR_new_null() SKM_sk_new_null(X509_ALGOR)
-# define sk_X509_ALGOR_free(st) SKM_sk_free(X509_ALGOR, (st))
-# define sk_X509_ALGOR_num(st) SKM_sk_num(X509_ALGOR, (st))
-# define sk_X509_ALGOR_value(st, i) SKM_sk_value(X509_ALGOR, (st), (i))
-# define sk_X509_ALGOR_set(st, i, val) SKM_sk_set(X509_ALGOR, (st), (i), (val))
-# define sk_X509_ALGOR_zero(st) SKM_sk_zero(X509_ALGOR, (st))
-# define sk_X509_ALGOR_push(st, val) SKM_sk_push(X509_ALGOR, (st), (val))
-# define sk_X509_ALGOR_unshift(st, val) SKM_sk_unshift(X509_ALGOR, (st), (val))
-# define sk_X509_ALGOR_find(st, val) SKM_sk_find(X509_ALGOR, (st), (val))
-# define sk_X509_ALGOR_find_ex(st, val) SKM_sk_find_ex(X509_ALGOR, (st), (val))
-# define sk_X509_ALGOR_delete(st, i) SKM_sk_delete(X509_ALGOR, (st), (i))
-# define sk_X509_ALGOR_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ALGOR, (st), (ptr))
-# define sk_X509_ALGOR_insert(st, val, i) SKM_sk_insert(X509_ALGOR, (st), (val), (i))
-# define sk_X509_ALGOR_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ALGOR, (st), (cmp))
-# define sk_X509_ALGOR_dup(st) SKM_sk_dup(X509_ALGOR, st)
-# define sk_X509_ALGOR_pop_free(st, free_func) SKM_sk_pop_free(X509_ALGOR, (st), (free_func))
-# define sk_X509_ALGOR_shift(st) SKM_sk_shift(X509_ALGOR, (st))
-# define sk_X509_ALGOR_pop(st) SKM_sk_pop(X509_ALGOR, (st))
-# define sk_X509_ALGOR_sort(st) SKM_sk_sort(X509_ALGOR, (st))
-# define sk_X509_ALGOR_is_sorted(st) SKM_sk_is_sorted(X509_ALGOR, (st))
-# define sk_X509_ATTRIBUTE_new(cmp) SKM_sk_new(X509_ATTRIBUTE, (cmp))
-# define sk_X509_ATTRIBUTE_new_null() SKM_sk_new_null(X509_ATTRIBUTE)
-# define sk_X509_ATTRIBUTE_free(st) SKM_sk_free(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_num(st) SKM_sk_num(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_value(st, i) SKM_sk_value(X509_ATTRIBUTE, (st), (i))
-# define sk_X509_ATTRIBUTE_set(st, i, val) SKM_sk_set(X509_ATTRIBUTE, (st), (i), (val))
-# define sk_X509_ATTRIBUTE_zero(st) SKM_sk_zero(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_push(st, val) SKM_sk_push(X509_ATTRIBUTE, (st), (val))
-# define sk_X509_ATTRIBUTE_unshift(st, val) SKM_sk_unshift(X509_ATTRIBUTE, (st), (val))
-# define sk_X509_ATTRIBUTE_find(st, val) SKM_sk_find(X509_ATTRIBUTE, (st), (val))
-# define sk_X509_ATTRIBUTE_find_ex(st, val) SKM_sk_find_ex(X509_ATTRIBUTE, (st), (val))
-# define sk_X509_ATTRIBUTE_delete(st, i) SKM_sk_delete(X509_ATTRIBUTE, (st), (i))
-# define sk_X509_ATTRIBUTE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_ATTRIBUTE, (st), (ptr))
-# define sk_X509_ATTRIBUTE_insert(st, val, i) SKM_sk_insert(X509_ATTRIBUTE, (st), (val), (i))
-# define sk_X509_ATTRIBUTE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_ATTRIBUTE, (st), (cmp))
-# define sk_X509_ATTRIBUTE_dup(st) SKM_sk_dup(X509_ATTRIBUTE, st)
-# define sk_X509_ATTRIBUTE_pop_free(st, free_func) SKM_sk_pop_free(X509_ATTRIBUTE, (st), (free_func))
-# define sk_X509_ATTRIBUTE_shift(st) SKM_sk_shift(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_pop(st) SKM_sk_pop(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_sort(st) SKM_sk_sort(X509_ATTRIBUTE, (st))
-# define sk_X509_ATTRIBUTE_is_sorted(st) SKM_sk_is_sorted(X509_ATTRIBUTE, (st))
-# define sk_X509_CRL_new(cmp) SKM_sk_new(X509_CRL, (cmp))
-# define sk_X509_CRL_new_null() SKM_sk_new_null(X509_CRL)
-# define sk_X509_CRL_free(st) SKM_sk_free(X509_CRL, (st))
-# define sk_X509_CRL_num(st) SKM_sk_num(X509_CRL, (st))
-# define sk_X509_CRL_value(st, i) SKM_sk_value(X509_CRL, (st), (i))
-# define sk_X509_CRL_set(st, i, val) SKM_sk_set(X509_CRL, (st), (i), (val))
-# define sk_X509_CRL_zero(st) SKM_sk_zero(X509_CRL, (st))
-# define sk_X509_CRL_push(st, val) SKM_sk_push(X509_CRL, (st), (val))
-# define sk_X509_CRL_unshift(st, val) SKM_sk_unshift(X509_CRL, (st), (val))
-# define sk_X509_CRL_find(st, val) SKM_sk_find(X509_CRL, (st), (val))
-# define sk_X509_CRL_find_ex(st, val) SKM_sk_find_ex(X509_CRL, (st), (val))
-# define sk_X509_CRL_delete(st, i) SKM_sk_delete(X509_CRL, (st), (i))
-# define sk_X509_CRL_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_CRL, (st), (ptr))
-# define sk_X509_CRL_insert(st, val, i) SKM_sk_insert(X509_CRL, (st), (val), (i))
-# define sk_X509_CRL_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_CRL, (st), (cmp))
-# define sk_X509_CRL_dup(st) SKM_sk_dup(X509_CRL, st)
-# define sk_X509_CRL_pop_free(st, free_func) SKM_sk_pop_free(X509_CRL, (st), (free_func))
-# define sk_X509_CRL_shift(st) SKM_sk_shift(X509_CRL, (st))
-# define sk_X509_CRL_pop(st) SKM_sk_pop(X509_CRL, (st))
-# define sk_X509_CRL_sort(st) SKM_sk_sort(X509_CRL, (st))
-# define sk_X509_CRL_is_sorted(st) SKM_sk_is_sorted(X509_CRL, (st))
-# define sk_X509_EXTENSION_new(cmp) SKM_sk_new(X509_EXTENSION, (cmp))
-# define sk_X509_EXTENSION_new_null() SKM_sk_new_null(X509_EXTENSION)
-# define sk_X509_EXTENSION_free(st) SKM_sk_free(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_num(st) SKM_sk_num(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_value(st, i) SKM_sk_value(X509_EXTENSION, (st), (i))
-# define sk_X509_EXTENSION_set(st, i, val) SKM_sk_set(X509_EXTENSION, (st), (i), (val))
-# define sk_X509_EXTENSION_zero(st) SKM_sk_zero(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_push(st, val) SKM_sk_push(X509_EXTENSION, (st), (val))
-# define sk_X509_EXTENSION_unshift(st, val) SKM_sk_unshift(X509_EXTENSION, (st), (val))
-# define sk_X509_EXTENSION_find(st, val) SKM_sk_find(X509_EXTENSION, (st), (val))
-# define sk_X509_EXTENSION_find_ex(st, val) SKM_sk_find_ex(X509_EXTENSION, (st), (val))
-# define sk_X509_EXTENSION_delete(st, i) SKM_sk_delete(X509_EXTENSION, (st), (i))
-# define sk_X509_EXTENSION_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_EXTENSION, (st), (ptr))
-# define sk_X509_EXTENSION_insert(st, val, i) SKM_sk_insert(X509_EXTENSION, (st), (val), (i))
-# define sk_X509_EXTENSION_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_EXTENSION, (st), (cmp))
-# define sk_X509_EXTENSION_dup(st) SKM_sk_dup(X509_EXTENSION, st)
-# define sk_X509_EXTENSION_pop_free(st, free_func) SKM_sk_pop_free(X509_EXTENSION, (st), (free_func))
-# define sk_X509_EXTENSION_shift(st) SKM_sk_shift(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_pop(st) SKM_sk_pop(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_sort(st) SKM_sk_sort(X509_EXTENSION, (st))
-# define sk_X509_EXTENSION_is_sorted(st) SKM_sk_is_sorted(X509_EXTENSION, (st))
-# define sk_X509_INFO_new(cmp) SKM_sk_new(X509_INFO, (cmp))
-# define sk_X509_INFO_new_null() SKM_sk_new_null(X509_INFO)
-# define sk_X509_INFO_free(st) SKM_sk_free(X509_INFO, (st))
-# define sk_X509_INFO_num(st) SKM_sk_num(X509_INFO, (st))
-# define sk_X509_INFO_value(st, i) SKM_sk_value(X509_INFO, (st), (i))
-# define sk_X509_INFO_set(st, i, val) SKM_sk_set(X509_INFO, (st), (i), (val))
-# define sk_X509_INFO_zero(st) SKM_sk_zero(X509_INFO, (st))
-# define sk_X509_INFO_push(st, val) SKM_sk_push(X509_INFO, (st), (val))
-# define sk_X509_INFO_unshift(st, val) SKM_sk_unshift(X509_INFO, (st), (val))
-# define sk_X509_INFO_find(st, val) SKM_sk_find(X509_INFO, (st), (val))
-# define sk_X509_INFO_find_ex(st, val) SKM_sk_find_ex(X509_INFO, (st), (val))
-# define sk_X509_INFO_delete(st, i) SKM_sk_delete(X509_INFO, (st), (i))
-# define sk_X509_INFO_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_INFO, (st), (ptr))
-# define sk_X509_INFO_insert(st, val, i) SKM_sk_insert(X509_INFO, (st), (val), (i))
-# define sk_X509_INFO_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_INFO, (st), (cmp))
-# define sk_X509_INFO_dup(st) SKM_sk_dup(X509_INFO, st)
-# define sk_X509_INFO_pop_free(st, free_func) SKM_sk_pop_free(X509_INFO, (st), (free_func))
-# define sk_X509_INFO_shift(st) SKM_sk_shift(X509_INFO, (st))
-# define sk_X509_INFO_pop(st) SKM_sk_pop(X509_INFO, (st))
-# define sk_X509_INFO_sort(st) SKM_sk_sort(X509_INFO, (st))
-# define sk_X509_INFO_is_sorted(st) SKM_sk_is_sorted(X509_INFO, (st))
-# define sk_X509_LOOKUP_new(cmp) SKM_sk_new(X509_LOOKUP, (cmp))
-# define sk_X509_LOOKUP_new_null() SKM_sk_new_null(X509_LOOKUP)
-# define sk_X509_LOOKUP_free(st) SKM_sk_free(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_num(st) SKM_sk_num(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_value(st, i) SKM_sk_value(X509_LOOKUP, (st), (i))
-# define sk_X509_LOOKUP_set(st, i, val) SKM_sk_set(X509_LOOKUP, (st), (i), (val))
-# define sk_X509_LOOKUP_zero(st) SKM_sk_zero(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_push(st, val) SKM_sk_push(X509_LOOKUP, (st), (val))
-# define sk_X509_LOOKUP_unshift(st, val) SKM_sk_unshift(X509_LOOKUP, (st), (val))
-# define sk_X509_LOOKUP_find(st, val) SKM_sk_find(X509_LOOKUP, (st), (val))
-# define sk_X509_LOOKUP_find_ex(st, val) SKM_sk_find_ex(X509_LOOKUP, (st), (val))
-# define sk_X509_LOOKUP_delete(st, i) SKM_sk_delete(X509_LOOKUP, (st), (i))
-# define sk_X509_LOOKUP_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_LOOKUP, (st), (ptr))
-# define sk_X509_LOOKUP_insert(st, val, i) SKM_sk_insert(X509_LOOKUP, (st), (val), (i))
-# define sk_X509_LOOKUP_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_LOOKUP, (st), (cmp))
-# define sk_X509_LOOKUP_dup(st) SKM_sk_dup(X509_LOOKUP, st)
-# define sk_X509_LOOKUP_pop_free(st, free_func) SKM_sk_pop_free(X509_LOOKUP, (st), (free_func))
-# define sk_X509_LOOKUP_shift(st) SKM_sk_shift(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_pop(st) SKM_sk_pop(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_sort(st) SKM_sk_sort(X509_LOOKUP, (st))
-# define sk_X509_LOOKUP_is_sorted(st) SKM_sk_is_sorted(X509_LOOKUP, (st))
-# define sk_X509_NAME_new(cmp) SKM_sk_new(X509_NAME, (cmp))
-# define sk_X509_NAME_new_null() SKM_sk_new_null(X509_NAME)
-# define sk_X509_NAME_free(st) SKM_sk_free(X509_NAME, (st))
-# define sk_X509_NAME_num(st) SKM_sk_num(X509_NAME, (st))
-# define sk_X509_NAME_value(st, i) SKM_sk_value(X509_NAME, (st), (i))
-# define sk_X509_NAME_set(st, i, val) SKM_sk_set(X509_NAME, (st), (i), (val))
-# define sk_X509_NAME_zero(st) SKM_sk_zero(X509_NAME, (st))
-# define sk_X509_NAME_push(st, val) SKM_sk_push(X509_NAME, (st), (val))
-# define sk_X509_NAME_unshift(st, val) SKM_sk_unshift(X509_NAME, (st), (val))
-# define sk_X509_NAME_find(st, val) SKM_sk_find(X509_NAME, (st), (val))
-# define sk_X509_NAME_find_ex(st, val) SKM_sk_find_ex(X509_NAME, (st), (val))
-# define sk_X509_NAME_delete(st, i) SKM_sk_delete(X509_NAME, (st), (i))
-# define sk_X509_NAME_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME, (st), (ptr))
-# define sk_X509_NAME_insert(st, val, i) SKM_sk_insert(X509_NAME, (st), (val), (i))
-# define sk_X509_NAME_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME, (st), (cmp))
-# define sk_X509_NAME_dup(st) SKM_sk_dup(X509_NAME, st)
-# define sk_X509_NAME_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME, (st), (free_func))
-# define sk_X509_NAME_shift(st) SKM_sk_shift(X509_NAME, (st))
-# define sk_X509_NAME_pop(st) SKM_sk_pop(X509_NAME, (st))
-# define sk_X509_NAME_sort(st) SKM_sk_sort(X509_NAME, (st))
-# define sk_X509_NAME_is_sorted(st) SKM_sk_is_sorted(X509_NAME, (st))
-# define sk_X509_NAME_ENTRY_new(cmp) SKM_sk_new(X509_NAME_ENTRY, (cmp))
-# define sk_X509_NAME_ENTRY_new_null() SKM_sk_new_null(X509_NAME_ENTRY)
-# define sk_X509_NAME_ENTRY_free(st) SKM_sk_free(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_num(st) SKM_sk_num(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_value(st, i) SKM_sk_value(X509_NAME_ENTRY, (st), (i))
-# define sk_X509_NAME_ENTRY_set(st, i, val) SKM_sk_set(X509_NAME_ENTRY, (st), (i), (val))
-# define sk_X509_NAME_ENTRY_zero(st) SKM_sk_zero(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_push(st, val) SKM_sk_push(X509_NAME_ENTRY, (st), (val))
-# define sk_X509_NAME_ENTRY_unshift(st, val) SKM_sk_unshift(X509_NAME_ENTRY, (st), (val))
-# define sk_X509_NAME_ENTRY_find(st, val) SKM_sk_find(X509_NAME_ENTRY, (st), (val))
-# define sk_X509_NAME_ENTRY_find_ex(st, val) SKM_sk_find_ex(X509_NAME_ENTRY, (st), (val))
-# define sk_X509_NAME_ENTRY_delete(st, i) SKM_sk_delete(X509_NAME_ENTRY, (st), (i))
-# define sk_X509_NAME_ENTRY_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_NAME_ENTRY, (st), (ptr))
-# define sk_X509_NAME_ENTRY_insert(st, val, i) SKM_sk_insert(X509_NAME_ENTRY, (st), (val), (i))
-# define sk_X509_NAME_ENTRY_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_NAME_ENTRY, (st), (cmp))
-# define sk_X509_NAME_ENTRY_dup(st) SKM_sk_dup(X509_NAME_ENTRY, st)
-# define sk_X509_NAME_ENTRY_pop_free(st, free_func) SKM_sk_pop_free(X509_NAME_ENTRY, (st), (free_func))
-# define sk_X509_NAME_ENTRY_shift(st) SKM_sk_shift(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_pop(st) SKM_sk_pop(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_sort(st) SKM_sk_sort(X509_NAME_ENTRY, (st))
-# define sk_X509_NAME_ENTRY_is_sorted(st) SKM_sk_is_sorted(X509_NAME_ENTRY, (st))
-# define sk_X509_OBJECT_new(cmp) SKM_sk_new(X509_OBJECT, (cmp))
-# define sk_X509_OBJECT_new_null() SKM_sk_new_null(X509_OBJECT)
-# define sk_X509_OBJECT_free(st) SKM_sk_free(X509_OBJECT, (st))
-# define sk_X509_OBJECT_num(st) SKM_sk_num(X509_OBJECT, (st))
-# define sk_X509_OBJECT_value(st, i) SKM_sk_value(X509_OBJECT, (st), (i))
-# define sk_X509_OBJECT_set(st, i, val) SKM_sk_set(X509_OBJECT, (st), (i), (val))
-# define sk_X509_OBJECT_zero(st) SKM_sk_zero(X509_OBJECT, (st))
-# define sk_X509_OBJECT_push(st, val) SKM_sk_push(X509_OBJECT, (st), (val))
-# define sk_X509_OBJECT_unshift(st, val) SKM_sk_unshift(X509_OBJECT, (st), (val))
-# define sk_X509_OBJECT_find(st, val) SKM_sk_find(X509_OBJECT, (st), (val))
-# define sk_X509_OBJECT_find_ex(st, val) SKM_sk_find_ex(X509_OBJECT, (st), (val))
-# define sk_X509_OBJECT_delete(st, i) SKM_sk_delete(X509_OBJECT, (st), (i))
-# define sk_X509_OBJECT_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_OBJECT, (st), (ptr))
-# define sk_X509_OBJECT_insert(st, val, i) SKM_sk_insert(X509_OBJECT, (st), (val), (i))
-# define sk_X509_OBJECT_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_OBJECT, (st), (cmp))
-# define sk_X509_OBJECT_dup(st) SKM_sk_dup(X509_OBJECT, st)
-# define sk_X509_OBJECT_pop_free(st, free_func) SKM_sk_pop_free(X509_OBJECT, (st), (free_func))
-# define sk_X509_OBJECT_shift(st) SKM_sk_shift(X509_OBJECT, (st))
-# define sk_X509_OBJECT_pop(st) SKM_sk_pop(X509_OBJECT, (st))
-# define sk_X509_OBJECT_sort(st) SKM_sk_sort(X509_OBJECT, (st))
-# define sk_X509_OBJECT_is_sorted(st) SKM_sk_is_sorted(X509_OBJECT, (st))
-# define sk_X509_POLICY_DATA_new(cmp) SKM_sk_new(X509_POLICY_DATA, (cmp))
-# define sk_X509_POLICY_DATA_new_null() SKM_sk_new_null(X509_POLICY_DATA)
-# define sk_X509_POLICY_DATA_free(st) SKM_sk_free(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_num(st) SKM_sk_num(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_value(st, i) SKM_sk_value(X509_POLICY_DATA, (st), (i))
-# define sk_X509_POLICY_DATA_set(st, i, val) SKM_sk_set(X509_POLICY_DATA, (st), (i), (val))
-# define sk_X509_POLICY_DATA_zero(st) SKM_sk_zero(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_push(st, val) SKM_sk_push(X509_POLICY_DATA, (st), (val))
-# define sk_X509_POLICY_DATA_unshift(st, val) SKM_sk_unshift(X509_POLICY_DATA, (st), (val))
-# define sk_X509_POLICY_DATA_find(st, val) SKM_sk_find(X509_POLICY_DATA, (st), (val))
-# define sk_X509_POLICY_DATA_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_DATA, (st), (val))
-# define sk_X509_POLICY_DATA_delete(st, i) SKM_sk_delete(X509_POLICY_DATA, (st), (i))
-# define sk_X509_POLICY_DATA_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_DATA, (st), (ptr))
-# define sk_X509_POLICY_DATA_insert(st, val, i) SKM_sk_insert(X509_POLICY_DATA, (st), (val), (i))
-# define sk_X509_POLICY_DATA_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_DATA, (st), (cmp))
-# define sk_X509_POLICY_DATA_dup(st) SKM_sk_dup(X509_POLICY_DATA, st)
-# define sk_X509_POLICY_DATA_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_DATA, (st), (free_func))
-# define sk_X509_POLICY_DATA_shift(st) SKM_sk_shift(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_pop(st) SKM_sk_pop(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_sort(st) SKM_sk_sort(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_DATA_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_DATA, (st))
-# define sk_X509_POLICY_NODE_new(cmp) SKM_sk_new(X509_POLICY_NODE, (cmp))
-# define sk_X509_POLICY_NODE_new_null() SKM_sk_new_null(X509_POLICY_NODE)
-# define sk_X509_POLICY_NODE_free(st) SKM_sk_free(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_num(st) SKM_sk_num(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_value(st, i) SKM_sk_value(X509_POLICY_NODE, (st), (i))
-# define sk_X509_POLICY_NODE_set(st, i, val) SKM_sk_set(X509_POLICY_NODE, (st), (i), (val))
-# define sk_X509_POLICY_NODE_zero(st) SKM_sk_zero(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_push(st, val) SKM_sk_push(X509_POLICY_NODE, (st), (val))
-# define sk_X509_POLICY_NODE_unshift(st, val) SKM_sk_unshift(X509_POLICY_NODE, (st), (val))
-# define sk_X509_POLICY_NODE_find(st, val) SKM_sk_find(X509_POLICY_NODE, (st), (val))
-# define sk_X509_POLICY_NODE_find_ex(st, val) SKM_sk_find_ex(X509_POLICY_NODE, (st), (val))
-# define sk_X509_POLICY_NODE_delete(st, i) SKM_sk_delete(X509_POLICY_NODE, (st), (i))
-# define sk_X509_POLICY_NODE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_POLICY_NODE, (st), (ptr))
-# define sk_X509_POLICY_NODE_insert(st, val, i) SKM_sk_insert(X509_POLICY_NODE, (st), (val), (i))
-# define sk_X509_POLICY_NODE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_POLICY_NODE, (st), (cmp))
-# define sk_X509_POLICY_NODE_dup(st) SKM_sk_dup(X509_POLICY_NODE, st)
-# define sk_X509_POLICY_NODE_pop_free(st, free_func) SKM_sk_pop_free(X509_POLICY_NODE, (st), (free_func))
-# define sk_X509_POLICY_NODE_shift(st) SKM_sk_shift(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_pop(st) SKM_sk_pop(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_sort(st) SKM_sk_sort(X509_POLICY_NODE, (st))
-# define sk_X509_POLICY_NODE_is_sorted(st) SKM_sk_is_sorted(X509_POLICY_NODE, (st))
-# define sk_X509_PURPOSE_new(cmp) SKM_sk_new(X509_PURPOSE, (cmp))
-# define sk_X509_PURPOSE_new_null() SKM_sk_new_null(X509_PURPOSE)
-# define sk_X509_PURPOSE_free(st) SKM_sk_free(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_num(st) SKM_sk_num(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_value(st, i) SKM_sk_value(X509_PURPOSE, (st), (i))
-# define sk_X509_PURPOSE_set(st, i, val) SKM_sk_set(X509_PURPOSE, (st), (i), (val))
-# define sk_X509_PURPOSE_zero(st) SKM_sk_zero(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_push(st, val) SKM_sk_push(X509_PURPOSE, (st), (val))
-# define sk_X509_PURPOSE_unshift(st, val) SKM_sk_unshift(X509_PURPOSE, (st), (val))
-# define sk_X509_PURPOSE_find(st, val) SKM_sk_find(X509_PURPOSE, (st), (val))
-# define sk_X509_PURPOSE_find_ex(st, val) SKM_sk_find_ex(X509_PURPOSE, (st), (val))
-# define sk_X509_PURPOSE_delete(st, i) SKM_sk_delete(X509_PURPOSE, (st), (i))
-# define sk_X509_PURPOSE_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_PURPOSE, (st), (ptr))
-# define sk_X509_PURPOSE_insert(st, val, i) SKM_sk_insert(X509_PURPOSE, (st), (val), (i))
-# define sk_X509_PURPOSE_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_PURPOSE, (st), (cmp))
-# define sk_X509_PURPOSE_dup(st) SKM_sk_dup(X509_PURPOSE, st)
-# define sk_X509_PURPOSE_pop_free(st, free_func) SKM_sk_pop_free(X509_PURPOSE, (st), (free_func))
-# define sk_X509_PURPOSE_shift(st) SKM_sk_shift(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_pop(st) SKM_sk_pop(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_sort(st) SKM_sk_sort(X509_PURPOSE, (st))
-# define sk_X509_PURPOSE_is_sorted(st) SKM_sk_is_sorted(X509_PURPOSE, (st))
-# define sk_X509_REVOKED_new(cmp) SKM_sk_new(X509_REVOKED, (cmp))
-# define sk_X509_REVOKED_new_null() SKM_sk_new_null(X509_REVOKED)
-# define sk_X509_REVOKED_free(st) SKM_sk_free(X509_REVOKED, (st))
-# define sk_X509_REVOKED_num(st) SKM_sk_num(X509_REVOKED, (st))
-# define sk_X509_REVOKED_value(st, i) SKM_sk_value(X509_REVOKED, (st), (i))
-# define sk_X509_REVOKED_set(st, i, val) SKM_sk_set(X509_REVOKED, (st), (i), (val))
-# define sk_X509_REVOKED_zero(st) SKM_sk_zero(X509_REVOKED, (st))
-# define sk_X509_REVOKED_push(st, val) SKM_sk_push(X509_REVOKED, (st), (val))
-# define sk_X509_REVOKED_unshift(st, val) SKM_sk_unshift(X509_REVOKED, (st), (val))
-# define sk_X509_REVOKED_find(st, val) SKM_sk_find(X509_REVOKED, (st), (val))
-# define sk_X509_REVOKED_find_ex(st, val) SKM_sk_find_ex(X509_REVOKED, (st), (val))
-# define sk_X509_REVOKED_delete(st, i) SKM_sk_delete(X509_REVOKED, (st), (i))
-# define sk_X509_REVOKED_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_REVOKED, (st), (ptr))
-# define sk_X509_REVOKED_insert(st, val, i) SKM_sk_insert(X509_REVOKED, (st), (val), (i))
-# define sk_X509_REVOKED_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_REVOKED, (st), (cmp))
-# define sk_X509_REVOKED_dup(st) SKM_sk_dup(X509_REVOKED, st)
-# define sk_X509_REVOKED_pop_free(st, free_func) SKM_sk_pop_free(X509_REVOKED, (st), (free_func))
-# define sk_X509_REVOKED_shift(st) SKM_sk_shift(X509_REVOKED, (st))
-# define sk_X509_REVOKED_pop(st) SKM_sk_pop(X509_REVOKED, (st))
-# define sk_X509_REVOKED_sort(st) SKM_sk_sort(X509_REVOKED, (st))
-# define sk_X509_REVOKED_is_sorted(st) SKM_sk_is_sorted(X509_REVOKED, (st))
-# define sk_X509_TRUST_new(cmp) SKM_sk_new(X509_TRUST, (cmp))
-# define sk_X509_TRUST_new_null() SKM_sk_new_null(X509_TRUST)
-# define sk_X509_TRUST_free(st) SKM_sk_free(X509_TRUST, (st))
-# define sk_X509_TRUST_num(st) SKM_sk_num(X509_TRUST, (st))
-# define sk_X509_TRUST_value(st, i) SKM_sk_value(X509_TRUST, (st), (i))
-# define sk_X509_TRUST_set(st, i, val) SKM_sk_set(X509_TRUST, (st), (i), (val))
-# define sk_X509_TRUST_zero(st) SKM_sk_zero(X509_TRUST, (st))
-# define sk_X509_TRUST_push(st, val) SKM_sk_push(X509_TRUST, (st), (val))
-# define sk_X509_TRUST_unshift(st, val) SKM_sk_unshift(X509_TRUST, (st), (val))
-# define sk_X509_TRUST_find(st, val) SKM_sk_find(X509_TRUST, (st), (val))
-# define sk_X509_TRUST_find_ex(st, val) SKM_sk_find_ex(X509_TRUST, (st), (val))
-# define sk_X509_TRUST_delete(st, i) SKM_sk_delete(X509_TRUST, (st), (i))
-# define sk_X509_TRUST_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_TRUST, (st), (ptr))
-# define sk_X509_TRUST_insert(st, val, i) SKM_sk_insert(X509_TRUST, (st), (val), (i))
-# define sk_X509_TRUST_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_TRUST, (st), (cmp))
-# define sk_X509_TRUST_dup(st) SKM_sk_dup(X509_TRUST, st)
-# define sk_X509_TRUST_pop_free(st, free_func) SKM_sk_pop_free(X509_TRUST, (st), (free_func))
-# define sk_X509_TRUST_shift(st) SKM_sk_shift(X509_TRUST, (st))
-# define sk_X509_TRUST_pop(st) SKM_sk_pop(X509_TRUST, (st))
-# define sk_X509_TRUST_sort(st) SKM_sk_sort(X509_TRUST, (st))
-# define sk_X509_TRUST_is_sorted(st) SKM_sk_is_sorted(X509_TRUST, (st))
-# define sk_X509_VERIFY_PARAM_new(cmp) SKM_sk_new(X509_VERIFY_PARAM, (cmp))
-# define sk_X509_VERIFY_PARAM_new_null() SKM_sk_new_null(X509_VERIFY_PARAM)
-# define sk_X509_VERIFY_PARAM_free(st) SKM_sk_free(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_num(st) SKM_sk_num(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_value(st, i) SKM_sk_value(X509_VERIFY_PARAM, (st), (i))
-# define sk_X509_VERIFY_PARAM_set(st, i, val) SKM_sk_set(X509_VERIFY_PARAM, (st), (i), (val))
-# define sk_X509_VERIFY_PARAM_zero(st) SKM_sk_zero(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_push(st, val) SKM_sk_push(X509_VERIFY_PARAM, (st), (val))
-# define sk_X509_VERIFY_PARAM_unshift(st, val) SKM_sk_unshift(X509_VERIFY_PARAM, (st), (val))
-# define sk_X509_VERIFY_PARAM_find(st, val) SKM_sk_find(X509_VERIFY_PARAM, (st), (val))
-# define sk_X509_VERIFY_PARAM_find_ex(st, val) SKM_sk_find_ex(X509_VERIFY_PARAM, (st), (val))
-# define sk_X509_VERIFY_PARAM_delete(st, i) SKM_sk_delete(X509_VERIFY_PARAM, (st), (i))
-# define sk_X509_VERIFY_PARAM_delete_ptr(st, ptr) SKM_sk_delete_ptr(X509_VERIFY_PARAM, (st), (ptr))
-# define sk_X509_VERIFY_PARAM_insert(st, val, i) SKM_sk_insert(X509_VERIFY_PARAM, (st), (val), (i))
-# define sk_X509_VERIFY_PARAM_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(X509_VERIFY_PARAM, (st), (cmp))
-# define sk_X509_VERIFY_PARAM_dup(st) SKM_sk_dup(X509_VERIFY_PARAM, st)
-# define sk_X509_VERIFY_PARAM_pop_free(st, free_func) SKM_sk_pop_free(X509_VERIFY_PARAM, (st), (free_func))
-# define sk_X509_VERIFY_PARAM_shift(st) SKM_sk_shift(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_pop(st) SKM_sk_pop(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_sort(st) SKM_sk_sort(X509_VERIFY_PARAM, (st))
-# define sk_X509_VERIFY_PARAM_is_sorted(st) SKM_sk_is_sorted(X509_VERIFY_PARAM, (st))
-# define sk_nid_triple_new(cmp) SKM_sk_new(nid_triple, (cmp))
-# define sk_nid_triple_new_null() SKM_sk_new_null(nid_triple)
-# define sk_nid_triple_free(st) SKM_sk_free(nid_triple, (st))
-# define sk_nid_triple_num(st) SKM_sk_num(nid_triple, (st))
-# define sk_nid_triple_value(st, i) SKM_sk_value(nid_triple, (st), (i))
-# define sk_nid_triple_set(st, i, val) SKM_sk_set(nid_triple, (st), (i), (val))
-# define sk_nid_triple_zero(st) SKM_sk_zero(nid_triple, (st))
-# define sk_nid_triple_push(st, val) SKM_sk_push(nid_triple, (st), (val))
-# define sk_nid_triple_unshift(st, val) SKM_sk_unshift(nid_triple, (st), (val))
-# define sk_nid_triple_find(st, val) SKM_sk_find(nid_triple, (st), (val))
-# define sk_nid_triple_find_ex(st, val) SKM_sk_find_ex(nid_triple, (st), (val))
-# define sk_nid_triple_delete(st, i) SKM_sk_delete(nid_triple, (st), (i))
-# define sk_nid_triple_delete_ptr(st, ptr) SKM_sk_delete_ptr(nid_triple, (st), (ptr))
-# define sk_nid_triple_insert(st, val, i) SKM_sk_insert(nid_triple, (st), (val), (i))
-# define sk_nid_triple_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(nid_triple, (st), (cmp))
-# define sk_nid_triple_dup(st) SKM_sk_dup(nid_triple, st)
-# define sk_nid_triple_pop_free(st, free_func) SKM_sk_pop_free(nid_triple, (st), (free_func))
-# define sk_nid_triple_shift(st) SKM_sk_shift(nid_triple, (st))
-# define sk_nid_triple_pop(st) SKM_sk_pop(nid_triple, (st))
-# define sk_nid_triple_sort(st) SKM_sk_sort(nid_triple, (st))
-# define sk_nid_triple_is_sorted(st) SKM_sk_is_sorted(nid_triple, (st))
-# define sk_void_new(cmp) SKM_sk_new(void, (cmp))
-# define sk_void_new_null() SKM_sk_new_null(void)
-# define sk_void_free(st) SKM_sk_free(void, (st))
-# define sk_void_num(st) SKM_sk_num(void, (st))
-# define sk_void_value(st, i) SKM_sk_value(void, (st), (i))
-# define sk_void_set(st, i, val) SKM_sk_set(void, (st), (i), (val))
-# define sk_void_zero(st) SKM_sk_zero(void, (st))
-# define sk_void_push(st, val) SKM_sk_push(void, (st), (val))
-# define sk_void_unshift(st, val) SKM_sk_unshift(void, (st), (val))
-# define sk_void_find(st, val) SKM_sk_find(void, (st), (val))
-# define sk_void_find_ex(st, val) SKM_sk_find_ex(void, (st), (val))
-# define sk_void_delete(st, i) SKM_sk_delete(void, (st), (i))
-# define sk_void_delete_ptr(st, ptr) SKM_sk_delete_ptr(void, (st), (ptr))
-# define sk_void_insert(st, val, i) SKM_sk_insert(void, (st), (val), (i))
-# define sk_void_set_cmp_func(st, cmp) SKM_sk_set_cmp_func(void, (st), (cmp))
-# define sk_void_dup(st) SKM_sk_dup(void, st)
-# define sk_void_pop_free(st, free_func) SKM_sk_pop_free(void, (st), (free_func))
-# define sk_void_shift(st) SKM_sk_shift(void, (st))
-# define sk_void_pop(st) SKM_sk_pop(void, (st))
-# define sk_void_sort(st) SKM_sk_sort(void, (st))
-# define sk_void_is_sorted(st) SKM_sk_is_sorted(void, (st))
-# define sk_OPENSSL_STRING_new(cmp) ((STACK_OF(OPENSSL_STRING) *)sk_new(CHECKED_SK_CMP_FUNC(char, cmp)))
-# define sk_OPENSSL_STRING_new_null() ((STACK_OF(OPENSSL_STRING) *)sk_new_null())
-# define sk_OPENSSL_STRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_value(st, i) ((OPENSSL_STRING)sk_value(CHECKED_STACK_OF(OPENSSL_STRING, st), i))
-# define sk_OPENSSL_STRING_num(st) SKM_sk_num(OPENSSL_STRING, st)
-# define sk_OPENSSL_STRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_STRING, free_func))
-# define sk_OPENSSL_STRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val), i)
-# define sk_OPENSSL_STRING_free(st) SKM_sk_free(OPENSSL_STRING, st)
-# define sk_OPENSSL_STRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_STRING, st), i, CHECKED_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_zero(st) SKM_sk_zero(OPENSSL_STRING, (st))
-# define sk_OPENSSL_STRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_STRING), st), CHECKED_CONST_PTR_OF(char, val))
-# define sk_OPENSSL_STRING_delete(st, i) SKM_sk_delete(OPENSSL_STRING, (st), (i))
-# define sk_OPENSSL_STRING_delete_ptr(st, ptr) (OPENSSL_STRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_PTR_OF(char, ptr))
-# define sk_OPENSSL_STRING_set_cmp_func(st, cmp)  \
-        ((int (*)(const char * const *,const char * const *)) \
-        sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_STRING, st), CHECKED_SK_CMP_FUNC(char, cmp)))
-# define sk_OPENSSL_STRING_dup(st) SKM_sk_dup(OPENSSL_STRING, st)
-# define sk_OPENSSL_STRING_shift(st) SKM_sk_shift(OPENSSL_STRING, (st))
-# define sk_OPENSSL_STRING_pop(st) (char *)sk_pop(CHECKED_STACK_OF(OPENSSL_STRING, st))
-# define sk_OPENSSL_STRING_sort(st) SKM_sk_sort(OPENSSL_STRING, (st))
-# define sk_OPENSSL_STRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_STRING, (st))
-# define sk_OPENSSL_BLOCK_new(cmp) ((STACK_OF(OPENSSL_BLOCK) *)sk_new(CHECKED_SK_CMP_FUNC(void, cmp)))
-# define sk_OPENSSL_BLOCK_new_null() ((STACK_OF(OPENSSL_BLOCK) *)sk_new_null())
-# define sk_OPENSSL_BLOCK_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_value(st, i) ((OPENSSL_BLOCK)sk_value(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i))
-# define sk_OPENSSL_BLOCK_num(st) SKM_sk_num(OPENSSL_BLOCK, st)
-# define sk_OPENSSL_BLOCK_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_FREE_FUNC2(OPENSSL_BLOCK, free_func))
-# define sk_OPENSSL_BLOCK_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val), i)
-# define sk_OPENSSL_BLOCK_free(st) SKM_sk_free(OPENSSL_BLOCK, st)
-# define sk_OPENSSL_BLOCK_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_BLOCK, st), i, CHECKED_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_zero(st) SKM_sk_zero(OPENSSL_BLOCK, (st))
-# define sk_OPENSSL_BLOCK_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_BLOCK), st), CHECKED_CONST_PTR_OF(void, val))
-# define sk_OPENSSL_BLOCK_delete(st, i) SKM_sk_delete(OPENSSL_BLOCK, (st), (i))
-# define sk_OPENSSL_BLOCK_delete_ptr(st, ptr) (OPENSSL_BLOCK *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_PTR_OF(void, ptr))
-# define sk_OPENSSL_BLOCK_set_cmp_func(st, cmp)  \
-        ((int (*)(const void * const *,const void * const *)) \
-        sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_BLOCK, st), CHECKED_SK_CMP_FUNC(void, cmp)))
-# define sk_OPENSSL_BLOCK_dup(st) SKM_sk_dup(OPENSSL_BLOCK, st)
-# define sk_OPENSSL_BLOCK_shift(st) SKM_sk_shift(OPENSSL_BLOCK, (st))
-# define sk_OPENSSL_BLOCK_pop(st) (void *)sk_pop(CHECKED_STACK_OF(OPENSSL_BLOCK, st))
-# define sk_OPENSSL_BLOCK_sort(st) SKM_sk_sort(OPENSSL_BLOCK, (st))
-# define sk_OPENSSL_BLOCK_is_sorted(st) SKM_sk_is_sorted(OPENSSL_BLOCK, (st))
-# define sk_OPENSSL_PSTRING_new(cmp) ((STACK_OF(OPENSSL_PSTRING) *)sk_new(CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-# define sk_OPENSSL_PSTRING_new_null() ((STACK_OF(OPENSSL_PSTRING) *)sk_new_null())
-# define sk_OPENSSL_PSTRING_push(st, val) sk_push(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_find(st, val) sk_find(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_value(st, i) ((OPENSSL_PSTRING)sk_value(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i))
-# define sk_OPENSSL_PSTRING_num(st) SKM_sk_num(OPENSSL_PSTRING, st)
-# define sk_OPENSSL_PSTRING_pop_free(st, free_func) sk_pop_free(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_FREE_FUNC2(OPENSSL_PSTRING, free_func))
-# define sk_OPENSSL_PSTRING_insert(st, val, i) sk_insert(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val), i)
-# define sk_OPENSSL_PSTRING_free(st) SKM_sk_free(OPENSSL_PSTRING, st)
-# define sk_OPENSSL_PSTRING_set(st, i, val) sk_set(CHECKED_STACK_OF(OPENSSL_PSTRING, st), i, CHECKED_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_zero(st) SKM_sk_zero(OPENSSL_PSTRING, (st))
-# define sk_OPENSSL_PSTRING_unshift(st, val) sk_unshift(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_find_ex(st, val) sk_find_ex((_STACK *)CHECKED_CONST_PTR_OF(STACK_OF(OPENSSL_PSTRING), st), CHECKED_CONST_PTR_OF(OPENSSL_STRING, val))
-# define sk_OPENSSL_PSTRING_delete(st, i) SKM_sk_delete(OPENSSL_PSTRING, (st), (i))
-# define sk_OPENSSL_PSTRING_delete_ptr(st, ptr) (OPENSSL_PSTRING *)sk_delete_ptr(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_PTR_OF(OPENSSL_STRING, ptr))
-# define sk_OPENSSL_PSTRING_set_cmp_func(st, cmp)  \
-        ((int (*)(const OPENSSL_STRING * const *,const OPENSSL_STRING * const *)) \
-        sk_set_cmp_func(CHECKED_STACK_OF(OPENSSL_PSTRING, st), CHECKED_SK_CMP_FUNC(OPENSSL_STRING, cmp)))
-# define sk_OPENSSL_PSTRING_dup(st) SKM_sk_dup(OPENSSL_PSTRING, st)
-# define sk_OPENSSL_PSTRING_shift(st) SKM_sk_shift(OPENSSL_PSTRING, (st))
-# define sk_OPENSSL_PSTRING_pop(st) (OPENSSL_STRING *)sk_pop(CHECKED_STACK_OF(OPENSSL_PSTRING, st))
-# define sk_OPENSSL_PSTRING_sort(st) SKM_sk_sort(OPENSSL_PSTRING, (st))
-# define sk_OPENSSL_PSTRING_is_sorted(st) SKM_sk_is_sorted(OPENSSL_PSTRING, (st))
-# define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ACCESS_DESCRIPTION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ACCESS_DESCRIPTION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ACCESS_DESCRIPTION(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ACCESS_DESCRIPTION, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ACCESS_DESCRIPTION(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ACCESS_DESCRIPTION, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ASN1_INTEGER(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_INTEGER, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_INTEGER(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_INTEGER, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_INTEGER(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_INTEGER, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_INTEGER(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_INTEGER, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ASN1_OBJECT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_OBJECT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_OBJECT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_OBJECT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_OBJECT(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_OBJECT, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_OBJECT(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_OBJECT, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ASN1_TYPE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_TYPE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_TYPE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_TYPE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_TYPE(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_TYPE, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_TYPE(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_TYPE, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ASN1_UTF8STRING, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ASN1_UTF8STRING(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ASN1_UTF8STRING, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ASN1_UTF8STRING(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ASN1_UTF8STRING, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ASN1_UTF8STRING(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ASN1_UTF8STRING, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_DIST_POINT(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(DIST_POINT, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_DIST_POINT(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(DIST_POINT, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_DIST_POINT(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(DIST_POINT, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_DIST_POINT(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(DIST_POINT, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_ESS_CERT_ID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(ESS_CERT_ID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_ESS_CERT_ID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(ESS_CERT_ID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_ESS_CERT_ID(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(ESS_CERT_ID, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_ESS_CERT_ID(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(ESS_CERT_ID, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_EVP_MD(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(EVP_MD, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_EVP_MD(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(EVP_MD, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_EVP_MD(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(EVP_MD, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_EVP_MD(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(EVP_MD, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_GENERAL_NAME(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(GENERAL_NAME, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_GENERAL_NAME(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(GENERAL_NAME, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_GENERAL_NAME(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(GENERAL_NAME, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_GENERAL_NAME(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(GENERAL_NAME, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_OCSP_ONEREQ(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(OCSP_ONEREQ, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_OCSP_ONEREQ(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(OCSP_ONEREQ, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_OCSP_ONEREQ(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(OCSP_ONEREQ, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_OCSP_ONEREQ(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(OCSP_ONEREQ, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(OCSP_SINGLERESP, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_OCSP_SINGLERESP(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(OCSP_SINGLERESP, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_OCSP_SINGLERESP(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(OCSP_SINGLERESP, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_OCSP_SINGLERESP(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(OCSP_SINGLERESP, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS12_SAFEBAG, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS12_SAFEBAG(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS12_SAFEBAG, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS12_SAFEBAG(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS12_SAFEBAG, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS12_SAFEBAG(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS12_SAFEBAG, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_PKCS7(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS7, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS7(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS7, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS7(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS7, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS7(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS7, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS7_RECIP_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS7_RECIP_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS7_RECIP_INFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS7_RECIP_INFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS7_RECIP_INFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS7_RECIP_INFO, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(PKCS7_SIGNER_INFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(PKCS7_SIGNER_INFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_PKCS7_SIGNER_INFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(PKCS7_SIGNER_INFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_PKCS7_SIGNER_INFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(PKCS7_SIGNER_INFO, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_POLICYINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(POLICYINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_POLICYINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(POLICYINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_POLICYINFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(POLICYINFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_POLICYINFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(POLICYINFO, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_POLICYQUALINFO(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(POLICYQUALINFO, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_POLICYQUALINFO(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(POLICYQUALINFO, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_POLICYQUALINFO(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(POLICYQUALINFO, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_POLICYQUALINFO(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(POLICYQUALINFO, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_SXNETID(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(SXNETID, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_SXNETID(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(SXNETID, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_SXNETID(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(SXNETID, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_SXNETID(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(SXNETID, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_ALGOR(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_ALGOR, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_ALGOR(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_ALGOR, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_ALGOR(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_ALGOR, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_ALGOR(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_ALGOR, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_ATTRIBUTE, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_ATTRIBUTE(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_ATTRIBUTE, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_ATTRIBUTE(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_ATTRIBUTE, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_ATTRIBUTE(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_ATTRIBUTE, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_CRL(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_CRL, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_CRL(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_CRL, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_CRL(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_CRL, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_CRL(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_CRL, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_EXTENSION(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_EXTENSION, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_EXTENSION(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_EXTENSION, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_EXTENSION(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_EXTENSION, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_EXTENSION(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_EXTENSION, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_NAME_ENTRY, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_NAME_ENTRY(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_NAME_ENTRY, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_NAME_ENTRY(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_NAME_ENTRY, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_NAME_ENTRY(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_NAME_ENTRY, (buf), (len), (d2i_func), (free_func))
-# define d2i_ASN1_SET_OF_X509_REVOKED(st, pp, length, d2i_func, free_func, ex_tag, ex_class) \
-        SKM_ASN1_SET_OF_d2i(X509_REVOKED, (st), (pp), (length), (d2i_func), (free_func), (ex_tag), (ex_class))
-# define i2d_ASN1_SET_OF_X509_REVOKED(st, pp, i2d_func, ex_tag, ex_class, is_set) \
-        SKM_ASN1_SET_OF_i2d(X509_REVOKED, (st), (pp), (i2d_func), (ex_tag), (ex_class), (is_set))
-# define ASN1_seq_pack_X509_REVOKED(st, i2d_func, buf, len) \
-        SKM_ASN1_seq_pack(X509_REVOKED, (st), (i2d_func), (buf), (len))
-# define ASN1_seq_unpack_X509_REVOKED(buf, len, d2i_func, free_func) \
-        SKM_ASN1_seq_unpack(X509_REVOKED, (buf), (len), (d2i_func), (free_func))
-# define PKCS12_decrypt_d2i_PKCS12_SAFEBAG(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-        SKM_PKCS12_decrypt_d2i(PKCS12_SAFEBAG, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-# define PKCS12_decrypt_d2i_PKCS7(algor, d2i_func, free_func, pass, passlen, oct, seq) \
-        SKM_PKCS12_decrypt_d2i(PKCS7, (algor), (d2i_func), (free_func), (pass), (passlen), (oct), (seq))
-# define lh_ADDED_OBJ_new() LHM_lh_new(ADDED_OBJ,added_obj)
-# define lh_ADDED_OBJ_insert(lh,inst) LHM_lh_insert(ADDED_OBJ,lh,inst)
-# define lh_ADDED_OBJ_retrieve(lh,inst) LHM_lh_retrieve(ADDED_OBJ,lh,inst)
-# define lh_ADDED_OBJ_delete(lh,inst) LHM_lh_delete(ADDED_OBJ,lh,inst)
-# define lh_ADDED_OBJ_doall(lh,fn) LHM_lh_doall(ADDED_OBJ,lh,fn)
-# define lh_ADDED_OBJ_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ADDED_OBJ,lh,fn,arg_type,arg)
-# define lh_ADDED_OBJ_error(lh) LHM_lh_error(ADDED_OBJ,lh)
-# define lh_ADDED_OBJ_num_items(lh) LHM_lh_num_items(ADDED_OBJ,lh)
-# define lh_ADDED_OBJ_down_load(lh) LHM_lh_down_load(ADDED_OBJ,lh)
-# define lh_ADDED_OBJ_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ADDED_OBJ,lh,out)
-# define lh_ADDED_OBJ_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ADDED_OBJ,lh,out)
-# define lh_ADDED_OBJ_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ADDED_OBJ,lh,out)
-# define lh_ADDED_OBJ_free(lh) LHM_lh_free(ADDED_OBJ,lh)
-# define lh_APP_INFO_new() LHM_lh_new(APP_INFO,app_info)
-# define lh_APP_INFO_insert(lh,inst) LHM_lh_insert(APP_INFO,lh,inst)
-# define lh_APP_INFO_retrieve(lh,inst) LHM_lh_retrieve(APP_INFO,lh,inst)
-# define lh_APP_INFO_delete(lh,inst) LHM_lh_delete(APP_INFO,lh,inst)
-# define lh_APP_INFO_doall(lh,fn) LHM_lh_doall(APP_INFO,lh,fn)
-# define lh_APP_INFO_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(APP_INFO,lh,fn,arg_type,arg)
-# define lh_APP_INFO_error(lh) LHM_lh_error(APP_INFO,lh)
-# define lh_APP_INFO_num_items(lh) LHM_lh_num_items(APP_INFO,lh)
-# define lh_APP_INFO_down_load(lh) LHM_lh_down_load(APP_INFO,lh)
-# define lh_APP_INFO_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(APP_INFO,lh,out)
-# define lh_APP_INFO_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(APP_INFO,lh,out)
-# define lh_APP_INFO_stats_bio(lh,out) \
-  LHM_lh_stats_bio(APP_INFO,lh,out)
-# define lh_APP_INFO_free(lh) LHM_lh_free(APP_INFO,lh)
-# define lh_CONF_VALUE_new() LHM_lh_new(CONF_VALUE,conf_value)
-# define lh_CONF_VALUE_insert(lh,inst) LHM_lh_insert(CONF_VALUE,lh,inst)
-# define lh_CONF_VALUE_retrieve(lh,inst) LHM_lh_retrieve(CONF_VALUE,lh,inst)
-# define lh_CONF_VALUE_delete(lh,inst) LHM_lh_delete(CONF_VALUE,lh,inst)
-# define lh_CONF_VALUE_doall(lh,fn) LHM_lh_doall(CONF_VALUE,lh,fn)
-# define lh_CONF_VALUE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(CONF_VALUE,lh,fn,arg_type,arg)
-# define lh_CONF_VALUE_error(lh) LHM_lh_error(CONF_VALUE,lh)
-# define lh_CONF_VALUE_num_items(lh) LHM_lh_num_items(CONF_VALUE,lh)
-# define lh_CONF_VALUE_down_load(lh) LHM_lh_down_load(CONF_VALUE,lh)
-# define lh_CONF_VALUE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(CONF_VALUE,lh,out)
-# define lh_CONF_VALUE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(CONF_VALUE,lh,out)
-# define lh_CONF_VALUE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(CONF_VALUE,lh,out)
-# define lh_CONF_VALUE_free(lh) LHM_lh_free(CONF_VALUE,lh)
-# define lh_ENGINE_PILE_new() LHM_lh_new(ENGINE_PILE,engine_pile)
-# define lh_ENGINE_PILE_insert(lh,inst) LHM_lh_insert(ENGINE_PILE,lh,inst)
-# define lh_ENGINE_PILE_retrieve(lh,inst) LHM_lh_retrieve(ENGINE_PILE,lh,inst)
-# define lh_ENGINE_PILE_delete(lh,inst) LHM_lh_delete(ENGINE_PILE,lh,inst)
-# define lh_ENGINE_PILE_doall(lh,fn) LHM_lh_doall(ENGINE_PILE,lh,fn)
-# define lh_ENGINE_PILE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ENGINE_PILE,lh,fn,arg_type,arg)
-# define lh_ENGINE_PILE_error(lh) LHM_lh_error(ENGINE_PILE,lh)
-# define lh_ENGINE_PILE_num_items(lh) LHM_lh_num_items(ENGINE_PILE,lh)
-# define lh_ENGINE_PILE_down_load(lh) LHM_lh_down_load(ENGINE_PILE,lh)
-# define lh_ENGINE_PILE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ENGINE_PILE,lh,out)
-# define lh_ENGINE_PILE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ENGINE_PILE,lh,out)
-# define lh_ENGINE_PILE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ENGINE_PILE,lh,out)
-# define lh_ENGINE_PILE_free(lh) LHM_lh_free(ENGINE_PILE,lh)
-# define lh_ERR_STATE_new() LHM_lh_new(ERR_STATE,err_state)
-# define lh_ERR_STATE_insert(lh,inst) LHM_lh_insert(ERR_STATE,lh,inst)
-# define lh_ERR_STATE_retrieve(lh,inst) LHM_lh_retrieve(ERR_STATE,lh,inst)
-# define lh_ERR_STATE_delete(lh,inst) LHM_lh_delete(ERR_STATE,lh,inst)
-# define lh_ERR_STATE_doall(lh,fn) LHM_lh_doall(ERR_STATE,lh,fn)
-# define lh_ERR_STATE_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ERR_STATE,lh,fn,arg_type,arg)
-# define lh_ERR_STATE_error(lh) LHM_lh_error(ERR_STATE,lh)
-# define lh_ERR_STATE_num_items(lh) LHM_lh_num_items(ERR_STATE,lh)
-# define lh_ERR_STATE_down_load(lh) LHM_lh_down_load(ERR_STATE,lh)
-# define lh_ERR_STATE_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ERR_STATE,lh,out)
-# define lh_ERR_STATE_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ERR_STATE,lh,out)
-# define lh_ERR_STATE_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ERR_STATE,lh,out)
-# define lh_ERR_STATE_free(lh) LHM_lh_free(ERR_STATE,lh)
-# define lh_ERR_STRING_DATA_new() LHM_lh_new(ERR_STRING_DATA,err_string_data)
-# define lh_ERR_STRING_DATA_insert(lh,inst) LHM_lh_insert(ERR_STRING_DATA,lh,inst)
-# define lh_ERR_STRING_DATA_retrieve(lh,inst) LHM_lh_retrieve(ERR_STRING_DATA,lh,inst)
-# define lh_ERR_STRING_DATA_delete(lh,inst) LHM_lh_delete(ERR_STRING_DATA,lh,inst)
-# define lh_ERR_STRING_DATA_doall(lh,fn) LHM_lh_doall(ERR_STRING_DATA,lh,fn)
-# define lh_ERR_STRING_DATA_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(ERR_STRING_DATA,lh,fn,arg_type,arg)
-# define lh_ERR_STRING_DATA_error(lh) LHM_lh_error(ERR_STRING_DATA,lh)
-# define lh_ERR_STRING_DATA_num_items(lh) LHM_lh_num_items(ERR_STRING_DATA,lh)
-# define lh_ERR_STRING_DATA_down_load(lh) LHM_lh_down_load(ERR_STRING_DATA,lh)
-# define lh_ERR_STRING_DATA_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(ERR_STRING_DATA,lh,out)
-# define lh_ERR_STRING_DATA_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(ERR_STRING_DATA,lh,out)
-# define lh_ERR_STRING_DATA_stats_bio(lh,out) \
-  LHM_lh_stats_bio(ERR_STRING_DATA,lh,out)
-# define lh_ERR_STRING_DATA_free(lh) LHM_lh_free(ERR_STRING_DATA,lh)
-# define lh_EX_CLASS_ITEM_new() LHM_lh_new(EX_CLASS_ITEM,ex_class_item)
-# define lh_EX_CLASS_ITEM_insert(lh,inst) LHM_lh_insert(EX_CLASS_ITEM,lh,inst)
-# define lh_EX_CLASS_ITEM_retrieve(lh,inst) LHM_lh_retrieve(EX_CLASS_ITEM,lh,inst)
-# define lh_EX_CLASS_ITEM_delete(lh,inst) LHM_lh_delete(EX_CLASS_ITEM,lh,inst)
-# define lh_EX_CLASS_ITEM_doall(lh,fn) LHM_lh_doall(EX_CLASS_ITEM,lh,fn)
-# define lh_EX_CLASS_ITEM_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(EX_CLASS_ITEM,lh,fn,arg_type,arg)
-# define lh_EX_CLASS_ITEM_error(lh) LHM_lh_error(EX_CLASS_ITEM,lh)
-# define lh_EX_CLASS_ITEM_num_items(lh) LHM_lh_num_items(EX_CLASS_ITEM,lh)
-# define lh_EX_CLASS_ITEM_down_load(lh) LHM_lh_down_load(EX_CLASS_ITEM,lh)
-# define lh_EX_CLASS_ITEM_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(EX_CLASS_ITEM,lh,out)
-# define lh_EX_CLASS_ITEM_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(EX_CLASS_ITEM,lh,out)
-# define lh_EX_CLASS_ITEM_stats_bio(lh,out) \
-  LHM_lh_stats_bio(EX_CLASS_ITEM,lh,out)
-# define lh_EX_CLASS_ITEM_free(lh) LHM_lh_free(EX_CLASS_ITEM,lh)
-# define lh_FUNCTION_new() LHM_lh_new(FUNCTION,function)
-# define lh_FUNCTION_insert(lh,inst) LHM_lh_insert(FUNCTION,lh,inst)
-# define lh_FUNCTION_retrieve(lh,inst) LHM_lh_retrieve(FUNCTION,lh,inst)
-# define lh_FUNCTION_delete(lh,inst) LHM_lh_delete(FUNCTION,lh,inst)
-# define lh_FUNCTION_doall(lh,fn) LHM_lh_doall(FUNCTION,lh,fn)
-# define lh_FUNCTION_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(FUNCTION,lh,fn,arg_type,arg)
-# define lh_FUNCTION_error(lh) LHM_lh_error(FUNCTION,lh)
-# define lh_FUNCTION_num_items(lh) LHM_lh_num_items(FUNCTION,lh)
-# define lh_FUNCTION_down_load(lh) LHM_lh_down_load(FUNCTION,lh)
-# define lh_FUNCTION_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(FUNCTION,lh,out)
-# define lh_FUNCTION_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(FUNCTION,lh,out)
-# define lh_FUNCTION_stats_bio(lh,out) \
-  LHM_lh_stats_bio(FUNCTION,lh,out)
-# define lh_FUNCTION_free(lh) LHM_lh_free(FUNCTION,lh)
-# define lh_MEM_new() LHM_lh_new(MEM,mem)
-# define lh_MEM_insert(lh,inst) LHM_lh_insert(MEM,lh,inst)
-# define lh_MEM_retrieve(lh,inst) LHM_lh_retrieve(MEM,lh,inst)
-# define lh_MEM_delete(lh,inst) LHM_lh_delete(MEM,lh,inst)
-# define lh_MEM_doall(lh,fn) LHM_lh_doall(MEM,lh,fn)
-# define lh_MEM_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(MEM,lh,fn,arg_type,arg)
-# define lh_MEM_error(lh) LHM_lh_error(MEM,lh)
-# define lh_MEM_num_items(lh) LHM_lh_num_items(MEM,lh)
-# define lh_MEM_down_load(lh) LHM_lh_down_load(MEM,lh)
-# define lh_MEM_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(MEM,lh,out)
-# define lh_MEM_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(MEM,lh,out)
-# define lh_MEM_stats_bio(lh,out) \
-  LHM_lh_stats_bio(MEM,lh,out)
-# define lh_MEM_free(lh) LHM_lh_free(MEM,lh)
-# define lh_OBJ_NAME_new() LHM_lh_new(OBJ_NAME,obj_name)
-# define lh_OBJ_NAME_insert(lh,inst) LHM_lh_insert(OBJ_NAME,lh,inst)
-# define lh_OBJ_NAME_retrieve(lh,inst) LHM_lh_retrieve(OBJ_NAME,lh,inst)
-# define lh_OBJ_NAME_delete(lh,inst) LHM_lh_delete(OBJ_NAME,lh,inst)
-# define lh_OBJ_NAME_doall(lh,fn) LHM_lh_doall(OBJ_NAME,lh,fn)
-# define lh_OBJ_NAME_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OBJ_NAME,lh,fn,arg_type,arg)
-# define lh_OBJ_NAME_error(lh) LHM_lh_error(OBJ_NAME,lh)
-# define lh_OBJ_NAME_num_items(lh) LHM_lh_num_items(OBJ_NAME,lh)
-# define lh_OBJ_NAME_down_load(lh) LHM_lh_down_load(OBJ_NAME,lh)
-# define lh_OBJ_NAME_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OBJ_NAME,lh,out)
-# define lh_OBJ_NAME_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OBJ_NAME,lh,out)
-# define lh_OBJ_NAME_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OBJ_NAME,lh,out)
-# define lh_OBJ_NAME_free(lh) LHM_lh_free(OBJ_NAME,lh)
-# define lh_OPENSSL_CSTRING_new() LHM_lh_new(OPENSSL_CSTRING,openssl_cstring)
-# define lh_OPENSSL_CSTRING_insert(lh,inst) LHM_lh_insert(OPENSSL_CSTRING,lh,inst)
-# define lh_OPENSSL_CSTRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_CSTRING,lh,inst)
-# define lh_OPENSSL_CSTRING_delete(lh,inst) LHM_lh_delete(OPENSSL_CSTRING,lh,inst)
-# define lh_OPENSSL_CSTRING_doall(lh,fn) LHM_lh_doall(OPENSSL_CSTRING,lh,fn)
-# define lh_OPENSSL_CSTRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OPENSSL_CSTRING,lh,fn,arg_type,arg)
-# define lh_OPENSSL_CSTRING_error(lh) LHM_lh_error(OPENSSL_CSTRING,lh)
-# define lh_OPENSSL_CSTRING_num_items(lh) LHM_lh_num_items(OPENSSL_CSTRING,lh)
-# define lh_OPENSSL_CSTRING_down_load(lh) LHM_lh_down_load(OPENSSL_CSTRING,lh)
-# define lh_OPENSSL_CSTRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OPENSSL_CSTRING,lh,out)
-# define lh_OPENSSL_CSTRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OPENSSL_CSTRING,lh,out)
-# define lh_OPENSSL_CSTRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OPENSSL_CSTRING,lh,out)
-# define lh_OPENSSL_CSTRING_free(lh) LHM_lh_free(OPENSSL_CSTRING,lh)
-# define lh_OPENSSL_STRING_new() LHM_lh_new(OPENSSL_STRING,openssl_string)
-# define lh_OPENSSL_STRING_insert(lh,inst) LHM_lh_insert(OPENSSL_STRING,lh,inst)
-# define lh_OPENSSL_STRING_retrieve(lh,inst) LHM_lh_retrieve(OPENSSL_STRING,lh,inst)
-# define lh_OPENSSL_STRING_delete(lh,inst) LHM_lh_delete(OPENSSL_STRING,lh,inst)
-# define lh_OPENSSL_STRING_doall(lh,fn) LHM_lh_doall(OPENSSL_STRING,lh,fn)
-# define lh_OPENSSL_STRING_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(OPENSSL_STRING,lh,fn,arg_type,arg)
-# define lh_OPENSSL_STRING_error(lh) LHM_lh_error(OPENSSL_STRING,lh)
-# define lh_OPENSSL_STRING_num_items(lh) LHM_lh_num_items(OPENSSL_STRING,lh)
-# define lh_OPENSSL_STRING_down_load(lh) LHM_lh_down_load(OPENSSL_STRING,lh)
-# define lh_OPENSSL_STRING_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(OPENSSL_STRING,lh,out)
-# define lh_OPENSSL_STRING_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(OPENSSL_STRING,lh,out)
-# define lh_OPENSSL_STRING_stats_bio(lh,out) \
-  LHM_lh_stats_bio(OPENSSL_STRING,lh,out)
-# define lh_OPENSSL_STRING_free(lh) LHM_lh_free(OPENSSL_STRING,lh)
-# define lh_SSL_SESSION_new() LHM_lh_new(SSL_SESSION,ssl_session)
-# define lh_SSL_SESSION_insert(lh,inst) LHM_lh_insert(SSL_SESSION,lh,inst)
-# define lh_SSL_SESSION_retrieve(lh,inst) LHM_lh_retrieve(SSL_SESSION,lh,inst)
-# define lh_SSL_SESSION_delete(lh,inst) LHM_lh_delete(SSL_SESSION,lh,inst)
-# define lh_SSL_SESSION_doall(lh,fn) LHM_lh_doall(SSL_SESSION,lh,fn)
-# define lh_SSL_SESSION_doall_arg(lh,fn,arg_type,arg) \
-  LHM_lh_doall_arg(SSL_SESSION,lh,fn,arg_type,arg)
-# define lh_SSL_SESSION_error(lh) LHM_lh_error(SSL_SESSION,lh)
-# define lh_SSL_SESSION_num_items(lh) LHM_lh_num_items(SSL_SESSION,lh)
-# define lh_SSL_SESSION_down_load(lh) LHM_lh_down_load(SSL_SESSION,lh)
-# define lh_SSL_SESSION_node_stats_bio(lh,out) \
-  LHM_lh_node_stats_bio(SSL_SESSION,lh,out)
-# define lh_SSL_SESSION_node_usage_stats_bio(lh,out) \
-  LHM_lh_node_usage_stats_bio(SSL_SESSION,lh,out)
-# define lh_SSL_SESSION_stats_bio(lh,out) \
-  LHM_lh_stats_bio(SSL_SESSION,lh,out)
-# define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh)
-#ifdef  __cplusplus
-}
-#endif
-#endif                          /* !defined HEADER_SAFESTACK_H */
diff --git a/include.new/openssl/seed.h b/include.new/openssl/seed.h
deleted file mode 100644
index 8cbf0d9..0000000
--- a/include.new/openssl/seed.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2007 KISA(Korea Information Security Agency). 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. Neither the name of author 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 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 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.
- *
- */
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SEED_H
-# define HEADER_SEED_H
-
-# include <openssl/opensslconf.h>
-# include <openssl/e_os2.h>
-# include <openssl/crypto.h>
-
-# ifdef OPENSSL_NO_SEED
-#  error SEED is disabled.
-# endif
-
-/* look whether we need 'long' to get 32 bits */
-# ifdef AES_LONG
-#  ifndef SEED_LONG
-#   define SEED_LONG 1
-#  endif
-# endif
-
-# if !defined(NO_SYS_TYPES_H)
-#  include <sys/types.h>
-# endif
-
-# define SEED_BLOCK_SIZE 16
-# define SEED_KEY_LENGTH 16
-
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct seed_key_st {
-# ifdef SEED_LONG
-    unsigned long data[32];
-# else
-    unsigned int data[32];
-# endif
-} SEED_KEY_SCHEDULE;
-
-# ifdef OPENSSL_FIPS
-void private_SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
-                          SEED_KEY_SCHEDULE *ks);
-# endif
-void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],
-                  SEED_KEY_SCHEDULE *ks);
-
-void SEED_encrypt(const unsigned char s[SEED_BLOCK_SIZE],
-                  unsigned char d[SEED_BLOCK_SIZE],
-                  const SEED_KEY_SCHEDULE *ks);
-void SEED_decrypt(const unsigned char s[SEED_BLOCK_SIZE],
-                  unsigned char d[SEED_BLOCK_SIZE],
-                  const SEED_KEY_SCHEDULE *ks);
-
-void SEED_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                      const SEED_KEY_SCHEDULE *ks, int enc);
-void SEED_cbc_encrypt(const unsigned char *in, unsigned char *out, size_t len,
-                      const SEED_KEY_SCHEDULE *ks,
-                      unsigned char ivec[SEED_BLOCK_SIZE], int enc);
-void SEED_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-                         size_t len, const SEED_KEY_SCHEDULE *ks,
-                         unsigned char ivec[SEED_BLOCK_SIZE], int *num,
-                         int enc);
-void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-                         size_t len, const SEED_KEY_SCHEDULE *ks,
-                         unsigned char ivec[SEED_BLOCK_SIZE], int *num);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif                          /* HEADER_SEED_H */
diff --git a/include.new/openssl/sha.h b/include.new/openssl/sha.h
deleted file mode 100644
index e5169e4..0000000
--- a/include.new/openssl/sha.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/* crypto/sha/sha.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SHA_H
-# define HEADER_SHA_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# if defined(OPENSSL_NO_SHA) || (defined(OPENSSL_NO_SHA0) && defined(OPENSSL_NO_SHA1))
-#  error SHA is disabled.
-# endif
-
-# if defined(OPENSSL_FIPS)
-#  define FIPS_SHA_SIZE_T size_t
-# endif
-
-/*-
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * ! SHA_LONG has to be at least 32 bits wide. If it's wider, then !
- * ! SHA_LONG_LOG2 has to be defined along.                        !
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- */
-
-# if defined(__LP32__)
-#  define SHA_LONG unsigned long
-# elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
-#  define SHA_LONG unsigned long
-#  define SHA_LONG_LOG2 3
-# else
-#  define SHA_LONG unsigned int
-# endif
-
-# define SHA_LBLOCK      16
-# define SHA_CBLOCK      (SHA_LBLOCK*4)/* SHA treats input data as a
-                                        * contiguous array of 32 bit wide
-                                        * big-endian values. */
-# define SHA_LAST_BLOCK  (SHA_CBLOCK-8)
-# define SHA_DIGEST_LENGTH 20
-
-typedef struct SHAstate_st {
-    SHA_LONG h0, h1, h2, h3, h4;
-    SHA_LONG Nl, Nh;
-    SHA_LONG data[SHA_LBLOCK];
-    unsigned int num;
-} SHA_CTX;
-
-# ifndef OPENSSL_NO_SHA0
-#  ifdef OPENSSL_FIPS
-int private_SHA_Init(SHA_CTX *c);
-#  endif
-int SHA_Init(SHA_CTX *c);
-int SHA_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA(const unsigned char *d, size_t n, unsigned char *md);
-void SHA_Transform(SHA_CTX *c, const unsigned char *data);
-# endif
-# ifndef OPENSSL_NO_SHA1
-#  ifdef OPENSSL_FIPS
-int private_SHA1_Init(SHA_CTX *c);
-#  endif
-int SHA1_Init(SHA_CTX *c);
-int SHA1_Update(SHA_CTX *c, const void *data, size_t len);
-int SHA1_Final(unsigned char *md, SHA_CTX *c);
-unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md);
-void SHA1_Transform(SHA_CTX *c, const unsigned char *data);
-# endif
-
-# define SHA256_CBLOCK   (SHA_LBLOCK*4)/* SHA-256 treats input data as a
-                                        * contiguous array of 32 bit wide
-                                        * big-endian values. */
-# define SHA224_DIGEST_LENGTH    28
-# define SHA256_DIGEST_LENGTH    32
-
-typedef struct SHA256state_st {
-    SHA_LONG h[8];
-    SHA_LONG Nl, Nh;
-    SHA_LONG data[SHA_LBLOCK];
-    unsigned int num, md_len;
-} SHA256_CTX;
-
-# ifndef OPENSSL_NO_SHA256
-#  ifdef OPENSSL_FIPS
-int private_SHA224_Init(SHA256_CTX *c);
-int private_SHA256_Init(SHA256_CTX *c);
-#  endif
-int SHA224_Init(SHA256_CTX *c);
-int SHA224_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA224_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA224(const unsigned char *d, size_t n, unsigned char *md);
-int SHA256_Init(SHA256_CTX *c);
-int SHA256_Update(SHA256_CTX *c, const void *data, size_t len);
-int SHA256_Final(unsigned char *md, SHA256_CTX *c);
-unsigned char *SHA256(const unsigned char *d, size_t n, unsigned char *md);
-void SHA256_Transform(SHA256_CTX *c, const unsigned char *data);
-# endif
-
-# define SHA384_DIGEST_LENGTH    48
-# define SHA512_DIGEST_LENGTH    64
-
-# ifndef OPENSSL_NO_SHA512
-/*
- * Unlike 32-bit digest algorithms, SHA-512 *relies* on SHA_LONG64
- * being exactly 64-bit wide. See Implementation Notes in sha512.c
- * for further details.
- */
-/*
- * SHA-512 treats input data as a
- * contiguous array of 64 bit
- * wide big-endian values.
- */
-#  define SHA512_CBLOCK   (SHA_LBLOCK*8)
-#  if (defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW32__)
-#   define SHA_LONG64 unsigned __int64
-#   define U64(C)     C##UI64
-#  elif defined(__arch64__)
-#   define SHA_LONG64 unsigned long
-#   define U64(C)     C##UL
-#  else
-#   define SHA_LONG64 unsigned long long
-#   define U64(C)     C##ULL
-#  endif
-
-typedef struct SHA512state_st {
-    SHA_LONG64 h[8];
-    SHA_LONG64 Nl, Nh;
-    union {
-        SHA_LONG64 d[SHA_LBLOCK];
-        unsigned char p[SHA512_CBLOCK];
-    } u;
-    unsigned int num, md_len;
-} SHA512_CTX;
-# endif
-
-# ifndef OPENSSL_NO_SHA512
-#  ifdef OPENSSL_FIPS
-int private_SHA384_Init(SHA512_CTX *c);
-int private_SHA512_Init(SHA512_CTX *c);
-#  endif
-int SHA384_Init(SHA512_CTX *c);
-int SHA384_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA384_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA384(const unsigned char *d, size_t n, unsigned char *md);
-int SHA512_Init(SHA512_CTX *c);
-int SHA512_Update(SHA512_CTX *c, const void *data, size_t len);
-int SHA512_Final(unsigned char *md, SHA512_CTX *c);
-unsigned char *SHA512(const unsigned char *d, size_t n, unsigned char *md);
-void SHA512_Transform(SHA512_CTX *c, const unsigned char *data);
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/srp.h b/include.new/openssl/srp.h
deleted file mode 100644
index d072536..0000000
--- a/include.new/openssl/srp.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* crypto/srp/srp.h */
-/*
- * Written by Christophe Renou (christophe.renou@edelweb.fr) with the
- * precious help of Peter Sylvester (peter.sylvester@edelweb.fr) for the
- * EdelKey project and contributed to the OpenSSL project 2004.
- */
-/* ====================================================================
- * Copyright (c) 2004 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef __SRP_H__
-# define __SRP_H__
-
-# ifndef OPENSSL_NO_SRP
-
-#  include <stdio.h>
-#  include <string.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#  include <openssl/safestack.h>
-#  include <openssl/bn.h>
-#  include <openssl/crypto.h>
-
-typedef struct SRP_gN_cache_st {
-    char *b64_bn;
-    BIGNUM *bn;
-} SRP_gN_cache;
-
-
-DECLARE_STACK_OF(SRP_gN_cache)
-
-typedef struct SRP_user_pwd_st {
-    char *id;
-    BIGNUM *s;
-    BIGNUM *v;
-    const BIGNUM *g;
-    const BIGNUM *N;
-    char *info;
-} SRP_user_pwd;
-
-DECLARE_STACK_OF(SRP_user_pwd)
-
-typedef struct SRP_VBASE_st {
-    STACK_OF(SRP_user_pwd) *users_pwd;
-    STACK_OF(SRP_gN_cache) *gN_cache;
-/* to simulate a user */
-    char *seed_key;
-    BIGNUM *default_g;
-    BIGNUM *default_N;
-} SRP_VBASE;
-
-/*
- * Structure interne pour retenir les couples N et g
- */
-typedef struct SRP_gN_st {
-    char *id;
-    BIGNUM *g;
-    BIGNUM *N;
-} SRP_gN;
-
-DECLARE_STACK_OF(SRP_gN)
-
-SRP_VBASE *SRP_VBASE_new(char *seed_key);
-int SRP_VBASE_free(SRP_VBASE *vb);
-int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file);
-SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username);
-char *SRP_create_verifier(const char *user, const char *pass, char **salt,
-                          char **verifier, const char *N, const char *g);
-int SRP_create_verifier_BN(const char *user, const char *pass, BIGNUM **salt,
-                           BIGNUM **verifier, BIGNUM *N, BIGNUM *g);
-
-#  define SRP_NO_ERROR 0
-#  define SRP_ERR_VBASE_INCOMPLETE_FILE 1
-#  define SRP_ERR_VBASE_BN_LIB 2
-#  define SRP_ERR_OPEN_FILE 3
-#  define SRP_ERR_MEMORY 4
-
-#  define DB_srptype      0
-#  define DB_srpverifier  1
-#  define DB_srpsalt      2
-#  define DB_srpid        3
-#  define DB_srpgN        4
-#  define DB_srpinfo      5
-#  undef  DB_NUMBER
-#  define DB_NUMBER       6
-
-#  define DB_SRP_INDEX    'I'
-#  define DB_SRP_VALID    'V'
-#  define DB_SRP_REVOKED  'R'
-#  define DB_SRP_MODIF    'v'
-
-/* see srp.c */
-char *SRP_check_known_gN_param(BIGNUM *g, BIGNUM *N);
-SRP_gN *SRP_get_default_gN(const char *id);
-
-/* server side .... */
-BIGNUM *SRP_Calc_server_key(BIGNUM *A, BIGNUM *v, BIGNUM *u, BIGNUM *b,
-                            BIGNUM *N);
-BIGNUM *SRP_Calc_B(BIGNUM *b, BIGNUM *N, BIGNUM *g, BIGNUM *v);
-int SRP_Verify_A_mod_N(BIGNUM *A, BIGNUM *N);
-BIGNUM *SRP_Calc_u(BIGNUM *A, BIGNUM *B, BIGNUM *N);
-
-/* client side .... */
-BIGNUM *SRP_Calc_x(BIGNUM *s, const char *user, const char *pass);
-BIGNUM *SRP_Calc_A(BIGNUM *a, BIGNUM *N, BIGNUM *g);
-BIGNUM *SRP_Calc_client_key(BIGNUM *N, BIGNUM *B, BIGNUM *g, BIGNUM *x,
-                            BIGNUM *a, BIGNUM *u);
-int SRP_Verify_B_mod_N(BIGNUM *B, BIGNUM *N);
-
-#  define SRP_MINIMAL_N 1024
-
-#ifdef  __cplusplus
-}
-#endif
-
-# endif
-#endif
diff --git a/include.new/openssl/srtp.h b/include.new/openssl/srtp.h
deleted file mode 100644
index 0c72841..0000000
--- a/include.new/openssl/srtp.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* ssl/srtp.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/*
- * DTLS code by Eric Rescorla <ekr@rtfm.com>
- *
- * Copyright (C) 2006, Network Resonance, Inc. Copyright (C) 2011, RTFM, Inc.
- */
-
-#ifndef HEADER_D1_SRTP_H
-# define HEADER_D1_SRTP_H
-
-# include <openssl/ssl.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define SRTP_AES128_CM_SHA1_80 0x0001
-# define SRTP_AES128_CM_SHA1_32 0x0002
-# define SRTP_AES128_F8_SHA1_80 0x0003
-# define SRTP_AES128_F8_SHA1_32 0x0004
-# define SRTP_NULL_SHA1_80      0x0005
-# define SRTP_NULL_SHA1_32      0x0006
-
-# ifndef OPENSSL_NO_SRTP
-
-int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
-int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles);
-SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
-
-STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
-
-# endif
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/ssl.h b/include.new/openssl/ssl.h
deleted file mode 100644
index d2ab0c0..0000000
--- a/include.new/openssl/ssl.h
+++ /dev/null
@@ -1,2766 +0,0 @@
-/* ssl/ssl.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2007 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
-
-#ifndef HEADER_SSL_H
-# define HEADER_SSL_H
-
-# include <openssl/e_os2.h>
-
-# ifndef OPENSSL_NO_COMP
-#  include <openssl/comp.h>
-# endif
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# ifndef OPENSSL_NO_DEPRECATED
-#  ifndef OPENSSL_NO_X509
-#   include <openssl/x509.h>
-#  endif
-#  include <openssl/crypto.h>
-#  include <openssl/lhash.h>
-#  include <openssl/buffer.h>
-# endif
-# include <openssl/pem.h>
-# include <openssl/hmac.h>
-
-# include <openssl/kssl.h>
-# include <openssl/safestack.h>
-# include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* SSLeay version number for ASN.1 encoding of the session information */
-/*-
- * Version 0 - initial version
- * Version 1 - added the optional peer certificate
- */
-# define SSL_SESSION_ASN1_VERSION 0x0001
-
-/* text strings for the ciphers */
-# define SSL_TXT_NULL_WITH_MD5           SSL2_TXT_NULL_WITH_MD5
-# define SSL_TXT_RC4_128_WITH_MD5        SSL2_TXT_RC4_128_WITH_MD5
-# define SSL_TXT_RC4_128_EXPORT40_WITH_MD5 SSL2_TXT_RC4_128_EXPORT40_WITH_MD5
-# define SSL_TXT_RC2_128_CBC_WITH_MD5    SSL2_TXT_RC2_128_CBC_WITH_MD5
-# define SSL_TXT_RC2_128_CBC_EXPORT40_WITH_MD5 SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5
-# define SSL_TXT_IDEA_128_CBC_WITH_MD5   SSL2_TXT_IDEA_128_CBC_WITH_MD5
-# define SSL_TXT_DES_64_CBC_WITH_MD5     SSL2_TXT_DES_64_CBC_WITH_MD5
-# define SSL_TXT_DES_64_CBC_WITH_SHA     SSL2_TXT_DES_64_CBC_WITH_SHA
-# define SSL_TXT_DES_192_EDE3_CBC_WITH_MD5 SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5
-# define SSL_TXT_DES_192_EDE3_CBC_WITH_SHA SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA
-
-/*
- * VRS Additional Kerberos5 entries
- */
-# define SSL_TXT_KRB5_DES_64_CBC_SHA   SSL3_TXT_KRB5_DES_64_CBC_SHA
-# define SSL_TXT_KRB5_DES_192_CBC3_SHA SSL3_TXT_KRB5_DES_192_CBC3_SHA
-# define SSL_TXT_KRB5_RC4_128_SHA      SSL3_TXT_KRB5_RC4_128_SHA
-# define SSL_TXT_KRB5_IDEA_128_CBC_SHA SSL3_TXT_KRB5_IDEA_128_CBC_SHA
-# define SSL_TXT_KRB5_DES_64_CBC_MD5   SSL3_TXT_KRB5_DES_64_CBC_MD5
-# define SSL_TXT_KRB5_DES_192_CBC3_MD5 SSL3_TXT_KRB5_DES_192_CBC3_MD5
-# define SSL_TXT_KRB5_RC4_128_MD5      SSL3_TXT_KRB5_RC4_128_MD5
-# define SSL_TXT_KRB5_IDEA_128_CBC_MD5 SSL3_TXT_KRB5_IDEA_128_CBC_MD5
-
-# define SSL_TXT_KRB5_DES_40_CBC_SHA   SSL3_TXT_KRB5_DES_40_CBC_SHA
-# define SSL_TXT_KRB5_RC2_40_CBC_SHA   SSL3_TXT_KRB5_RC2_40_CBC_SHA
-# define SSL_TXT_KRB5_RC4_40_SHA       SSL3_TXT_KRB5_RC4_40_SHA
-# define SSL_TXT_KRB5_DES_40_CBC_MD5   SSL3_TXT_KRB5_DES_40_CBC_MD5
-# define SSL_TXT_KRB5_RC2_40_CBC_MD5   SSL3_TXT_KRB5_RC2_40_CBC_MD5
-# define SSL_TXT_KRB5_RC4_40_MD5       SSL3_TXT_KRB5_RC4_40_MD5
-
-# define SSL_TXT_KRB5_DES_40_CBC_SHA   SSL3_TXT_KRB5_DES_40_CBC_SHA
-# define SSL_TXT_KRB5_DES_40_CBC_MD5   SSL3_TXT_KRB5_DES_40_CBC_MD5
-# define SSL_TXT_KRB5_DES_64_CBC_SHA   SSL3_TXT_KRB5_DES_64_CBC_SHA
-# define SSL_TXT_KRB5_DES_64_CBC_MD5   SSL3_TXT_KRB5_DES_64_CBC_MD5
-# define SSL_TXT_KRB5_DES_192_CBC3_SHA SSL3_TXT_KRB5_DES_192_CBC3_SHA
-# define SSL_TXT_KRB5_DES_192_CBC3_MD5 SSL3_TXT_KRB5_DES_192_CBC3_MD5
-# define SSL_MAX_KRB5_PRINCIPAL_LENGTH  256
-
-# define SSL_MAX_SSL_SESSION_ID_LENGTH           32
-# define SSL_MAX_SID_CTX_LENGTH                  32
-
-# define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES     (512/8)
-# define SSL_MAX_KEY_ARG_LENGTH                  8
-# define SSL_MAX_MASTER_KEY_LENGTH               48
-
-/* These are used to specify which ciphers to use and not to use */
-
-# define SSL_TXT_EXP40           "EXPORT40"
-# define SSL_TXT_EXP56           "EXPORT56"
-# define SSL_TXT_LOW             "LOW"
-# define SSL_TXT_MEDIUM          "MEDIUM"
-# define SSL_TXT_HIGH            "HIGH"
-# define SSL_TXT_FIPS            "FIPS"
-
-# define SSL_TXT_kFZA            "kFZA"/* unused! */
-# define SSL_TXT_aFZA            "aFZA"/* unused! */
-# define SSL_TXT_eFZA            "eFZA"/* unused! */
-# define SSL_TXT_FZA             "FZA"/* unused! */
-
-# define SSL_TXT_aNULL           "aNULL"
-# define SSL_TXT_eNULL           "eNULL"
-# define SSL_TXT_NULL            "NULL"
-
-# define SSL_TXT_kRSA            "kRSA"
-# define SSL_TXT_kDHr            "kDHr"/* no such ciphersuites supported! */
-# define SSL_TXT_kDHd            "kDHd"/* no such ciphersuites supported! */
-# define SSL_TXT_kDH             "kDH"/* no such ciphersuites supported! */
-# define SSL_TXT_kEDH            "kEDH"
-# define SSL_TXT_kKRB5           "kKRB5"
-# define SSL_TXT_kECDHr          "kECDHr"
-# define SSL_TXT_kECDHe          "kECDHe"
-# define SSL_TXT_kECDH           "kECDH"
-# define SSL_TXT_kEECDH          "kEECDH"
-# define SSL_TXT_kPSK            "kPSK"
-# define SSL_TXT_kGOST           "kGOST"
-# define SSL_TXT_kSRP            "kSRP"
-
-# define SSL_TXT_aRSA            "aRSA"
-# define SSL_TXT_aDSS            "aDSS"
-# define SSL_TXT_aDH             "aDH"/* no such ciphersuites supported! */
-# define SSL_TXT_aECDH           "aECDH"
-# define SSL_TXT_aKRB5           "aKRB5"
-# define SSL_TXT_aECDSA          "aECDSA"
-# define SSL_TXT_aPSK            "aPSK"
-# define SSL_TXT_aGOST94 "aGOST94"
-# define SSL_TXT_aGOST01 "aGOST01"
-# define SSL_TXT_aGOST  "aGOST"
-# define SSL_TXT_aSRP            "aSRP"
-
-# define SSL_TXT_DSS             "DSS"
-# define SSL_TXT_DH              "DH"
-# define SSL_TXT_EDH             "EDH"/* same as "kEDH:-ADH" */
-# define SSL_TXT_ADH             "ADH"
-# define SSL_TXT_RSA             "RSA"
-# define SSL_TXT_ECDH            "ECDH"
-# define SSL_TXT_EECDH           "EECDH"/* same as "kEECDH:-AECDH" */
-# define SSL_TXT_AECDH           "AECDH"
-# define SSL_TXT_ECDSA           "ECDSA"
-# define SSL_TXT_KRB5            "KRB5"
-# define SSL_TXT_PSK             "PSK"
-# define SSL_TXT_SRP             "SRP"
-
-# define SSL_TXT_DES             "DES"
-# define SSL_TXT_3DES            "3DES"
-# define SSL_TXT_RC4             "RC4"
-# define SSL_TXT_RC2             "RC2"
-# define SSL_TXT_IDEA            "IDEA"
-# define SSL_TXT_SEED            "SEED"
-# define SSL_TXT_AES128          "AES128"
-# define SSL_TXT_AES256          "AES256"
-# define SSL_TXT_AES             "AES"
-# define SSL_TXT_AES_GCM         "AESGCM"
-# define SSL_TXT_CAMELLIA128     "CAMELLIA128"
-# define SSL_TXT_CAMELLIA256     "CAMELLIA256"
-# define SSL_TXT_CAMELLIA        "CAMELLIA"
-
-# define SSL_TXT_MD5             "MD5"
-# define SSL_TXT_SHA1            "SHA1"
-# define SSL_TXT_SHA             "SHA"/* same as "SHA1" */
-# define SSL_TXT_GOST94          "GOST94"
-# define SSL_TXT_GOST89MAC               "GOST89MAC"
-# define SSL_TXT_SHA256          "SHA256"
-# define SSL_TXT_SHA384          "SHA384"
-
-# define SSL_TXT_SSLV2           "SSLv2"
-# define SSL_TXT_SSLV3           "SSLv3"
-# define SSL_TXT_TLSV1           "TLSv1"
-# define SSL_TXT_TLSV1_1         "TLSv1.1"
-# define SSL_TXT_TLSV1_2         "TLSv1.2"
-
-# define SSL_TXT_EXP             "EXP"
-# define SSL_TXT_EXPORT          "EXPORT"
-
-# define SSL_TXT_ALL             "ALL"
-
-/*-
- * COMPLEMENTOF* definitions. These identifiers are used to (de-select)
- * ciphers normally not being used.
- * Example: "RC4" will activate all ciphers using RC4 including ciphers
- * without authentication, which would normally disabled by DEFAULT (due
- * the "!ADH" being part of default). Therefore "RC4:!COMPLEMENTOFDEFAULT"
- * will make sure that it is also disabled in the specific selection.
- * COMPLEMENTOF* identifiers are portable between version, as adjustments
- * to the default cipher setup will also be included here.
- *
- * COMPLEMENTOFDEFAULT does not experience the same special treatment that
- * DEFAULT gets, as only selection is being done and no sorting as needed
- * for DEFAULT.
- */
-# define SSL_TXT_CMPALL          "COMPLEMENTOFALL"
-# define SSL_TXT_CMPDEF          "COMPLEMENTOFDEFAULT"
-
-/*
- * The following cipher list is used by default. It also is substituted when
- * an application-defined cipher list string starts with 'DEFAULT'.
- */
-# define SSL_DEFAULT_CIPHER_LIST "ALL:!EXPORT:!aNULL:!eNULL:!SSLv2"
-/*
- * As of OpenSSL 1.0.0, ssl_create_cipher_list() in ssl/ssl_ciph.c always
- * starts with a reasonable order, and all we have to do for DEFAULT is
- * throwing out anonymous and unencrypted ciphersuites! (The latter are not
- * actually enabled by ALL, but "ALL:RSA" would enable some of them.)
- */
-
-/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
-# define SSL_SENT_SHUTDOWN       1
-# define SSL_RECEIVED_SHUTDOWN   2
-
-#ifdef __cplusplus
-}
-#endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# if (defined(OPENSSL_NO_RSA) || defined(OPENSSL_NO_MD5)) && !defined(OPENSSL_NO_SSL2)
-#  define OPENSSL_NO_SSL2
-# endif
-
-# define SSL_FILETYPE_ASN1       X509_FILETYPE_ASN1
-# define SSL_FILETYPE_PEM        X509_FILETYPE_PEM
-
-/*
- * This is needed to stop compilers complaining about the 'struct ssl_st *'
- * function parameters used to prototype callbacks in SSL_CTX.
- */
-typedef struct ssl_st *ssl_crock_st;
-typedef struct tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;
-typedef struct ssl_method_st SSL_METHOD;
-typedef struct ssl_cipher_st SSL_CIPHER;
-typedef struct ssl_session_st SSL_SESSION;
-
-DECLARE_STACK_OF(SSL_CIPHER)
-
-/* SRTP protection profiles for use with the use_srtp extension (RFC 5764)*/
-typedef struct srtp_protection_profile_st {
-    const char *name;
-    unsigned long id;
-} SRTP_PROTECTION_PROFILE;
-
-DECLARE_STACK_OF(SRTP_PROTECTION_PROFILE)
-
-typedef int (*tls_session_ticket_ext_cb_fn) (SSL *s,
-                                             const unsigned char *data,
-                                             int len, void *arg);
-typedef int (*tls_session_secret_cb_fn) (SSL *s, void *secret,
-                                         int *secret_len,
-                                         STACK_OF(SSL_CIPHER) *peer_ciphers,
-                                         SSL_CIPHER **cipher, void *arg);
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-/* used to hold info on the particular ciphers used */
-struct ssl_cipher_st {
-    int valid;
-    const char *name;           /* text name */
-    unsigned long id;           /* id, 4 bytes, first is version */
-    /*
-     * changed in 0.9.9: these four used to be portions of a single value
-     * 'algorithms'
-     */
-    unsigned long algorithm_mkey; /* key exchange algorithm */
-    unsigned long algorithm_auth; /* server authentication */
-    unsigned long algorithm_enc; /* symmetric encryption */
-    unsigned long algorithm_mac; /* symmetric authentication */
-    unsigned long algorithm_ssl; /* (major) protocol version */
-    unsigned long algo_strength; /* strength and export flags */
-    unsigned long algorithm2;   /* Extra flags */
-    int strength_bits;          /* Number of bits really used */
-    int alg_bits;               /* Number of bits for algorithm */
-};
-
-/* Used to hold functions for SSLv2 or SSLv3/TLSv1 functions */
-struct ssl_method_st {
-    int version;
-    int (*ssl_new) (SSL *s);
-    void (*ssl_clear) (SSL *s);
-    void (*ssl_free) (SSL *s);
-    int (*ssl_accept) (SSL *s);
-    int (*ssl_connect) (SSL *s);
-    int (*ssl_read) (SSL *s, void *buf, int len);
-    int (*ssl_peek) (SSL *s, void *buf, int len);
-    int (*ssl_write) (SSL *s, const void *buf, int len);
-    int (*ssl_shutdown) (SSL *s);
-    int (*ssl_renegotiate) (SSL *s);
-    int (*ssl_renegotiate_check) (SSL *s);
-    long (*ssl_get_message) (SSL *s, int st1, int stn, int mt, long
-                             max, int *ok);
-    int (*ssl_read_bytes) (SSL *s, int type, unsigned char *buf, int len,
-                           int peek);
-    int (*ssl_write_bytes) (SSL *s, int type, const void *buf_, int len);
-    int (*ssl_dispatch_alert) (SSL *s);
-    long (*ssl_ctrl) (SSL *s, int cmd, long larg, void *parg);
-    long (*ssl_ctx_ctrl) (SSL_CTX *ctx, int cmd, long larg, void *parg);
-    const SSL_CIPHER *(*get_cipher_by_char) (const unsigned char *ptr);
-    int (*put_cipher_by_char) (const SSL_CIPHER *cipher, unsigned char *ptr);
-    int (*ssl_pending) (const SSL *s);
-    int (*num_ciphers) (void);
-    const SSL_CIPHER *(*get_cipher) (unsigned ncipher);
-    const struct ssl_method_st *(*get_ssl_method) (int version);
-    long (*get_timeout) (void);
-    struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */
-    int (*ssl_version) (void);
-    long (*ssl_callback_ctrl) (SSL *s, int cb_id, void (*fp) (void));
-    long (*ssl_ctx_callback_ctrl) (SSL_CTX *s, int cb_id, void (*fp) (void));
-};
-
-/*-
- * Lets make this into an ASN.1 type structure as follows
- * SSL_SESSION_ID ::= SEQUENCE {
- *      version                 INTEGER,        -- structure version number
- *      SSLversion              INTEGER,        -- SSL version number
- *      Cipher                  OCTET STRING,   -- the 3 byte cipher ID
- *      Session_ID              OCTET STRING,   -- the Session ID
- *      Master_key              OCTET STRING,   -- the master key
- *      KRB5_principal          OCTET STRING    -- optional Kerberos principal
- *      Key_Arg [ 0 ] IMPLICIT  OCTET STRING,   -- the optional Key argument
- *      Time [ 1 ] EXPLICIT     INTEGER,        -- optional Start Time
- *      Timeout [ 2 ] EXPLICIT  INTEGER,        -- optional Timeout ins seconds
- *      Peer [ 3 ] EXPLICIT     X509,           -- optional Peer Certificate
- *      Session_ID_context [ 4 ] EXPLICIT OCTET STRING,   -- the Session ID context
- *      Verify_result [ 5 ] EXPLICIT INTEGER,   -- X509_V_... code for `Peer'
- *      HostName [ 6 ] EXPLICIT OCTET STRING,   -- optional HostName from servername TLS extension
- *      PSK_identity_hint [ 7 ] EXPLICIT OCTET STRING, -- optional PSK identity hint
- *      PSK_identity [ 8 ] EXPLICIT OCTET STRING,  -- optional PSK identity
- *      Ticket_lifetime_hint [9] EXPLICIT INTEGER, -- server's lifetime hint for session ticket
- *      Ticket [10]             EXPLICIT OCTET STRING, -- session ticket (clients only)
- *      Compression_meth [11]   EXPLICIT OCTET STRING, -- optional compression method
- *      SRP_username [ 12 ] EXPLICIT OCTET STRING -- optional SRP username
- *      }
- * Look in ssl/ssl_asn1.c for more details
- * I'm using EXPLICIT tags so I can read the damn things using asn1parse :-).
- */
-struct ssl_session_st {
-    int ssl_version;            /* what ssl version session info is being
-                                 * kept in here? */
-    /* only really used in SSLv2 */
-    unsigned int key_arg_length;
-    unsigned char key_arg[SSL_MAX_KEY_ARG_LENGTH];
-    int master_key_length;
-    unsigned char master_key[SSL_MAX_MASTER_KEY_LENGTH];
-    /* session_id - valid? */
-    unsigned int session_id_length;
-    unsigned char session_id[SSL_MAX_SSL_SESSION_ID_LENGTH];
-    /*
-     * this is used to determine whether the session is being reused in the
-     * appropriate context. It is up to the application to set this, via
-     * SSL_new
-     */
-    unsigned int sid_ctx_length;
-    unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-#  ifndef OPENSSL_NO_KRB5
-    unsigned int krb5_client_princ_len;
-    unsigned char krb5_client_princ[SSL_MAX_KRB5_PRINCIPAL_LENGTH];
-#  endif                        /* OPENSSL_NO_KRB5 */
-#  ifndef OPENSSL_NO_PSK
-    char *psk_identity_hint;
-    char *psk_identity;
-#  endif
-    /*
-     * Used to indicate that session resumption is not allowed. Applications
-     * can also set this bit for a new session via not_resumable_session_cb
-     * to disable session caching and tickets.
-     */
-    int not_resumable;
-    /* The cert is the certificate used to establish this connection */
-    struct sess_cert_st /* SESS_CERT */ *sess_cert;
-    /*
-     * This is the cert for the other end. On clients, it will be the same as
-     * sess_cert->peer_key->x509 (the latter is not enough as sess_cert is
-     * not retained in the external representation of sessions, see
-     * ssl_asn1.c).
-     */
-    X509 *peer;
-    /*
-     * when app_verify_callback accepts a session where the peer's
-     * certificate is not ok, we must remember the error for session reuse:
-     */
-    long verify_result;         /* only for servers */
-    int references;
-    long timeout;
-    long time;
-    unsigned int compress_meth; /* Need to lookup the method */
-    const SSL_CIPHER *cipher;
-    unsigned long cipher_id;    /* when ASN.1 loaded, this needs to be used
-                                 * to load the 'cipher' structure */
-    STACK_OF(SSL_CIPHER) *ciphers; /* shared ciphers? */
-    CRYPTO_EX_DATA ex_data;     /* application specific data */
-    /*
-     * These are used to make removal of session-ids more efficient and to
-     * implement a maximum cache size.
-     */
-    struct ssl_session_st *prev, *next;
-#  ifndef OPENSSL_NO_TLSEXT
-    char *tlsext_hostname;
-#   ifndef OPENSSL_NO_EC
-    size_t tlsext_ecpointformatlist_length;
-    unsigned char *tlsext_ecpointformatlist; /* peer's list */
-    size_t tlsext_ellipticcurvelist_length;
-    unsigned char *tlsext_ellipticcurvelist; /* peer's list */
-#   endif                       /* OPENSSL_NO_EC */
-    /* RFC4507 info */
-    unsigned char *tlsext_tick; /* Session ticket */
-    size_t tlsext_ticklen;      /* Session ticket length */
-    long tlsext_tick_lifetime_hint; /* Session lifetime hint in seconds */
-#  endif
-#  ifndef OPENSSL_NO_SRP
-    char *srp_username;
-#  endif
-};
-
-# endif
-
-# define SSL_OP_MICROSOFT_SESS_ID_BUG                    0x00000001L
-# define SSL_OP_NETSCAPE_CHALLENGE_BUG                   0x00000002L
-/* Allow initial connection to servers that don't support RI */
-# define SSL_OP_LEGACY_SERVER_CONNECT                    0x00000004L
-# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG         0x00000008L
-# define SSL_OP_TLSEXT_PADDING                           0x00000010L
-# define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER               0x00000020L
-# define SSL_OP_SAFARI_ECDHE_ECDSA_BUG                   0x00000040L
-# define SSL_OP_SSLEAY_080_CLIENT_DH_BUG                 0x00000080L
-# define SSL_OP_TLS_D5_BUG                               0x00000100L
-# define SSL_OP_TLS_BLOCK_PADDING_BUG                    0x00000200L
-
-/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
-# define SSL_OP_MSIE_SSLV2_RSA_PADDING                   0x0
-/* Refers to ancient SSLREF and SSLv2, retained for compatibility */
-# define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG              0x0
-
-/*
- * Disable SSL 3.0/TLS 1.0 CBC vulnerability workaround that was added in
- * OpenSSL 0.9.6d.  Usually (depending on the application protocol) the
- * workaround is not needed.  Unfortunately some broken SSL/TLS
- * implementations cannot handle it at all, which is why we include it in
- * SSL_OP_ALL.
- */
-/* added in 0.9.6e */
-# define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS              0x00000800L
-
-/*
- * SSL_OP_ALL: various bug workarounds that should be rather harmless.  This
- * used to be 0x000FFFFFL before 0.9.7.
- */
-# define SSL_OP_ALL                                      0x80000BFFL
-
-/* DTLS options */
-# define SSL_OP_NO_QUERY_MTU                 0x00001000L
-/* Turn on Cookie Exchange (on relevant for servers) */
-# define SSL_OP_COOKIE_EXCHANGE              0x00002000L
-/* Don't use RFC4507 ticket extension */
-# define SSL_OP_NO_TICKET                    0x00004000L
-/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client)  */
-# define SSL_OP_CISCO_ANYCONNECT             0x00008000L
-
-/* As server, disallow session resumption on renegotiation */
-# define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION   0x00010000L
-/* Don't use compression even if supported */
-# define SSL_OP_NO_COMPRESSION                           0x00020000L
-/* Permit unsafe legacy renegotiation */
-# define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION        0x00040000L
-/* If set, always create a new key when using tmp_ecdh parameters */
-# define SSL_OP_SINGLE_ECDH_USE                          0x00080000L
-/* If set, always create a new key when using tmp_dh parameters */
-# define SSL_OP_SINGLE_DH_USE                            0x00100000L
-/* Does nothing: retained for compatibiity */
-# define SSL_OP_EPHEMERAL_RSA                            0x0
-/*
- * Set on servers to choose the cipher according to the server's preferences
- */
-# define SSL_OP_CIPHER_SERVER_PREFERENCE                 0x00400000L
-/*
- * If set, a server will allow a client to issue a SSLv3.0 version number as
- * latest version supported in the premaster secret, even when TLSv1.0
- * (version 3.1) was announced in the client hello. Normally this is
- * forbidden to prevent version rollback attacks.
- */
-# define SSL_OP_TLS_ROLLBACK_BUG                         0x00800000L
-
-# define SSL_OP_NO_SSLv2                                 0x01000000L
-# define SSL_OP_NO_SSLv3                                 0x02000000L
-# define SSL_OP_NO_TLSv1                                 0x04000000L
-# define SSL_OP_NO_TLSv1_2                               0x08000000L
-# define SSL_OP_NO_TLSv1_1                               0x10000000L
-
-/*
- * These next two were never actually used for anything since SSLeay zap so
- * we have some more flags.
- */
-/*
- * The next flag deliberately changes the ciphertest, this is a check for the
- * PKCS#1 attack
- */
-# define SSL_OP_PKCS1_CHECK_1                            0x0
-# define SSL_OP_PKCS1_CHECK_2                            0x0
-
-# define SSL_OP_NETSCAPE_CA_DN_BUG                       0x20000000L
-# define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG          0x40000000L
-/*
- * Make server add server-hello extension from early version of cryptopro
- * draft, when GOST ciphersuite is negotiated. Required for interoperability
- * with CryptoPro CSP 3.x
- */
-# define SSL_OP_CRYPTOPRO_TLSEXT_BUG                     0x80000000L
-
-/*
- * Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
- * when just a single record has been written):
- */
-# define SSL_MODE_ENABLE_PARTIAL_WRITE       0x00000001L
-/*
- * Make it possible to retry SSL_write() with changed buffer location (buffer
- * contents must stay the same!); this is not the default to avoid the
- * misconception that non-blocking SSL_write() behaves like non-blocking
- * write():
- */
-# define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002L
-/*
- * Never bother the application with retries if the transport is blocking:
- */
-# define SSL_MODE_AUTO_RETRY 0x00000004L
-/* Don't attempt to automatically build certificate chain */
-# define SSL_MODE_NO_AUTO_CHAIN 0x00000008L
-/*
- * Save RAM by releasing read and write buffers when they're empty. (SSL3 and
- * TLS only.) "Released" buffers are put onto a free-list in the context or
- * just freed (depending on the context's setting for freelist_max_len).
- */
-# define SSL_MODE_RELEASE_BUFFERS 0x00000010L
-/*
- * Send the current time in the Random fields of the ClientHello and
- * ServerHello records for compatibility with hypothetical implementations
- * that require it.
- */
-# define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020L
-# define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040L
-/*
- * Send TLS_FALLBACK_SCSV in the ClientHello. To be set only by applications
- * that reconnect with a downgraded protocol version; see
- * draft-ietf-tls-downgrade-scsv-00 for details. DO NOT ENABLE THIS if your
- * application attempts a normal handshake. Only use this in explicit
- * fallback retries, following the guidance in
- * draft-ietf-tls-downgrade-scsv-00.
- */
-# define SSL_MODE_SEND_FALLBACK_SCSV 0x00000080L
-
-/*
- * Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value, they
- * cannot be used to clear bits.
- */
-
-# define SSL_CTX_set_options(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,(op),NULL)
-# define SSL_CTX_clear_options(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
-# define SSL_CTX_get_options(ctx) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_OPTIONS,0,NULL)
-# define SSL_set_options(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_OPTIONS,(op),NULL)
-# define SSL_clear_options(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_OPTIONS,(op),NULL)
-# define SSL_get_options(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_OPTIONS,0,NULL)
-
-# define SSL_CTX_set_mode(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,(op),NULL)
-# define SSL_CTX_clear_mode(ctx,op) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_CLEAR_MODE,(op),NULL)
-# define SSL_CTX_get_mode(ctx) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_MODE,0,NULL)
-# define SSL_clear_mode(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_MODE,(op),NULL)
-# define SSL_set_mode(ssl,op) \
-        SSL_ctrl((ssl),SSL_CTRL_MODE,(op),NULL)
-# define SSL_get_mode(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_MODE,0,NULL)
-# define SSL_set_mtu(ssl, mtu) \
-        SSL_ctrl((ssl),SSL_CTRL_SET_MTU,(mtu),NULL)
-# define DTLS_set_link_mtu(ssl, mtu) \
-        SSL_ctrl((ssl),DTLS_CTRL_SET_LINK_MTU,(mtu),NULL)
-# define DTLS_get_link_min_mtu(ssl) \
-        SSL_ctrl((ssl),DTLS_CTRL_GET_LINK_MIN_MTU,0,NULL)
-
-# define SSL_get_secure_renegotiation_support(ssl) \
-        SSL_ctrl((ssl), SSL_CTRL_GET_RI_SUPPORT, 0, NULL)
-
-# ifndef OPENSSL_NO_HEARTBEATS
-#  define SSL_heartbeat(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_TLS_EXT_SEND_HEARTBEAT,0,NULL)
-# endif
-
-void SSL_CTX_set_msg_callback(SSL_CTX *ctx,
-                              void (*cb) (int write_p, int version,
-                                          int content_type, const void *buf,
-                                          size_t len, SSL *ssl, void *arg));
-void SSL_set_msg_callback(SSL *ssl,
-                          void (*cb) (int write_p, int version,
-                                      int content_type, const void *buf,
-                                      size_t len, SSL *ssl, void *arg));
-# define SSL_CTX_set_msg_callback_arg(ctx, arg) SSL_CTX_ctrl((ctx), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
-# define SSL_set_msg_callback_arg(ssl, arg) SSL_ctrl((ssl), SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, (arg))
-
-# ifndef OPENSSL_NO_SRP
-
-#  ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct srp_ctx_st {
-    /* param for all the callbacks */
-    void *SRP_cb_arg;
-    /* set client Hello login callback */
-    int (*TLS_ext_srp_username_callback) (SSL *, int *, void *);
-    /* set SRP N/g param callback for verification */
-    int (*SRP_verify_param_callback) (SSL *, void *);
-    /* set SRP client passwd callback */
-    char *(*SRP_give_srp_client_pwd_callback) (SSL *, void *);
-    char *login;
-    BIGNUM *N, *g, *s, *B, *A;
-    BIGNUM *a, *b, *v;
-    char *info;
-    int strength;
-    unsigned long srp_Mask;
-} SRP_CTX;
-
-#  endif
-
-/* see tls_srp.c */
-int SSL_SRP_CTX_init(SSL *s);
-int SSL_CTX_SRP_CTX_init(SSL_CTX *ctx);
-int SSL_SRP_CTX_free(SSL *ctx);
-int SSL_CTX_SRP_CTX_free(SSL_CTX *ctx);
-int SSL_srp_server_param_with_username(SSL *s, int *ad);
-int SRP_generate_server_master_secret(SSL *s, unsigned char *master_key);
-int SRP_Calc_A_param(SSL *s);
-int SRP_generate_client_master_secret(SSL *s, unsigned char *master_key);
-
-# endif
-
-# if defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_WIN32)
-#  define SSL_MAX_CERT_LIST_DEFAULT 1024*30
-                                          /* 30k max cert list :-) */
-# else
-#  define SSL_MAX_CERT_LIST_DEFAULT 1024*100
-                                           /* 100k max cert list :-) */
-# endif
-
-# define SSL_SESSION_CACHE_MAX_SIZE_DEFAULT      (1024*20)
-
-/*
- * This callback type is used inside SSL_CTX, SSL, and in the functions that
- * set them. It is used to override the generation of SSL/TLS session IDs in
- * a server. Return value should be zero on an error, non-zero to proceed.
- * Also, callbacks should themselves check if the id they generate is unique
- * otherwise the SSL handshake will fail with an error - callbacks can do
- * this using the 'ssl' value they're passed by;
- * SSL_has_matching_session_id(ssl, id, *id_len) The length value passed in
- * is set at the maximum size the session ID can be. In SSLv2 this is 16
- * bytes, whereas SSLv3/TLSv1 it is 32 bytes. The callback can alter this
- * length to be less if desired, but under SSLv2 session IDs are supposed to
- * be fixed at 16 bytes so the id will be padded after the callback returns
- * in this case. It is also an error for the callback to set the size to
- * zero.
- */
-typedef int (*GEN_SESSION_CB) (const SSL *ssl, unsigned char *id,
-                               unsigned int *id_len);
-
-typedef struct ssl_comp_st SSL_COMP;
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-struct ssl_comp_st {
-    int id;
-    const char *name;
-#  ifndef OPENSSL_NO_COMP
-    COMP_METHOD *method;
-#  else
-    char *method;
-#  endif
-};
-
-DECLARE_STACK_OF(SSL_COMP)
-DECLARE_LHASH_OF(SSL_SESSION);
-
-struct ssl_ctx_st {
-    const SSL_METHOD *method;
-    STACK_OF(SSL_CIPHER) *cipher_list;
-    /* same as above but sorted for lookup */
-    STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-    struct x509_store_st /* X509_STORE */ *cert_store;
-    LHASH_OF(SSL_SESSION) *sessions;
-    /*
-     * Most session-ids that will be cached, default is
-     * SSL_SESSION_CACHE_MAX_SIZE_DEFAULT. 0 is unlimited.
-     */
-    unsigned long session_cache_size;
-    struct ssl_session_st *session_cache_head;
-    struct ssl_session_st *session_cache_tail;
-    /*
-     * This can have one of 2 values, ored together, SSL_SESS_CACHE_CLIENT,
-     * SSL_SESS_CACHE_SERVER, Default is SSL_SESSION_CACHE_SERVER, which
-     * means only SSL_accept which cache SSL_SESSIONS.
-     */
-    int session_cache_mode;
-    /*
-     * If timeout is not 0, it is the default timeout value set when
-     * SSL_new() is called.  This has been put in to make life easier to set
-     * things up
-     */
-    long session_timeout;
-    /*
-     * If this callback is not null, it will be called each time a session id
-     * is added to the cache.  If this function returns 1, it means that the
-     * callback will do a SSL_SESSION_free() when it has finished using it.
-     * Otherwise, on 0, it means the callback has finished with it. If
-     * remove_session_cb is not null, it will be called when a session-id is
-     * removed from the cache.  After the call, OpenSSL will
-     * SSL_SESSION_free() it.
-     */
-    int (*new_session_cb) (struct ssl_st *ssl, SSL_SESSION *sess);
-    void (*remove_session_cb) (struct ssl_ctx_st *ctx, SSL_SESSION *sess);
-    SSL_SESSION *(*get_session_cb) (struct ssl_st *ssl,
-                                    unsigned char *data, int len, int *copy);
-    struct {
-        int sess_connect;       /* SSL new conn - started */
-        int sess_connect_renegotiate; /* SSL reneg - requested */
-        int sess_connect_good;  /* SSL new conne/reneg - finished */
-        int sess_accept;        /* SSL new accept - started */
-        int sess_accept_renegotiate; /* SSL reneg - requested */
-        int sess_accept_good;   /* SSL accept/reneg - finished */
-        int sess_miss;          /* session lookup misses */
-        int sess_timeout;       /* reuse attempt on timeouted session */
-        int sess_cache_full;    /* session removed due to full cache */
-        int sess_hit;           /* session reuse actually done */
-        int sess_cb_hit;        /* session-id that was not in the cache was
-                                 * passed back via the callback.  This
-                                 * indicates that the application is
-                                 * supplying session-id's from other
-                                 * processes - spooky :-) */
-    } stats;
-
-    int references;
-
-    /* if defined, these override the X509_verify_cert() calls */
-    int (*app_verify_callback) (X509_STORE_CTX *, void *);
-    void *app_verify_arg;
-    /*
-     * before OpenSSL 0.9.7, 'app_verify_arg' was ignored
-     * ('app_verify_callback' was called with just one argument)
-     */
-
-    /* Default password callback. */
-    pem_password_cb *default_passwd_callback;
-
-    /* Default password callback user data. */
-    void *default_passwd_callback_userdata;
-
-    /* get client cert callback */
-    int (*client_cert_cb) (SSL *ssl, X509 **x509, EVP_PKEY **pkey);
-
-    /* cookie generate callback */
-    int (*app_gen_cookie_cb) (SSL *ssl, unsigned char *cookie,
-                              unsigned int *cookie_len);
-
-    /* verify cookie callback */
-    int (*app_verify_cookie_cb) (SSL *ssl, unsigned char *cookie,
-                                 unsigned int cookie_len);
-
-    CRYPTO_EX_DATA ex_data;
-
-    const EVP_MD *rsa_md5;      /* For SSLv2 - name is 'ssl2-md5' */
-    const EVP_MD *md5;          /* For SSLv3/TLSv1 'ssl3-md5' */
-    const EVP_MD *sha1;         /* For SSLv3/TLSv1 'ssl3->sha1' */
-
-    STACK_OF(X509) *extra_certs;
-    STACK_OF(SSL_COMP) *comp_methods; /* stack of SSL_COMP, SSLv3/TLSv1 */
-
-    /* Default values used when no per-SSL value is defined follow */
-
-    /* used if SSL's info_callback is NULL */
-    void (*info_callback) (const SSL *ssl, int type, int val);
-
-    /* what we put in client cert requests */
-    STACK_OF(X509_NAME) *client_CA;
-
-    /*
-     * Default values to use in SSL structures follow (these are copied by
-     * SSL_new)
-     */
-
-    unsigned long options;
-    unsigned long mode;
-    long max_cert_list;
-
-    struct cert_st /* CERT */ *cert;
-    int read_ahead;
-
-    /* callback that allows applications to peek at protocol messages */
-    void (*msg_callback) (int write_p, int version, int content_type,
-                          const void *buf, size_t len, SSL *ssl, void *arg);
-    void *msg_callback_arg;
-
-    int verify_mode;
-    unsigned int sid_ctx_length;
-    unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-    /* called 'verify_callback' in the SSL */
-    int (*default_verify_callback) (int ok, X509_STORE_CTX *ctx);
-
-    /* Default generate session ID callback. */
-    GEN_SESSION_CB generate_session_id;
-
-    X509_VERIFY_PARAM *param;
-
-#  if 0
-    int purpose;                /* Purpose setting */
-    int trust;                  /* Trust setting */
-#  endif
-
-    int quiet_shutdown;
-
-    /*
-     * Maximum amount of data to send in one fragment. actual record size can
-     * be more than this due to padding and MAC overheads.
-     */
-    unsigned int max_send_fragment;
-
-#  ifndef OPENSSL_NO_ENGINE
-    /*
-     * Engine to pass requests for client certs to
-     */
-    ENGINE *client_cert_engine;
-#  endif
-
-#  ifndef OPENSSL_NO_TLSEXT
-    /* TLS extensions servername callback */
-    int (*tlsext_servername_callback) (SSL *, int *, void *);
-    void *tlsext_servername_arg;
-    /* RFC 4507 session ticket keys */
-    unsigned char tlsext_tick_key_name[16];
-    unsigned char tlsext_tick_hmac_key[16];
-    unsigned char tlsext_tick_aes_key[16];
-    /* Callback to support customisation of ticket key setting */
-    int (*tlsext_ticket_key_cb) (SSL *ssl,
-                                 unsigned char *name, unsigned char *iv,
-                                 EVP_CIPHER_CTX *ectx,
-                                 HMAC_CTX *hctx, int enc);
-
-    /* certificate status request info */
-    /* Callback for status request */
-    int (*tlsext_status_cb) (SSL *ssl, void *arg);
-    void *tlsext_status_arg;
-
-    /* draft-rescorla-tls-opaque-prf-input-00.txt information */
-    int (*tlsext_opaque_prf_input_callback) (SSL *, void *peerinput,
-                                             size_t len, void *arg);
-    void *tlsext_opaque_prf_input_callback_arg;
-#  endif
-
-#  ifndef OPENSSL_NO_PSK
-    char *psk_identity_hint;
-    unsigned int (*psk_client_callback) (SSL *ssl, const char *hint,
-                                         char *identity,
-                                         unsigned int max_identity_len,
-                                         unsigned char *psk,
-                                         unsigned int max_psk_len);
-    unsigned int (*psk_server_callback) (SSL *ssl, const char *identity,
-                                         unsigned char *psk,
-                                         unsigned int max_psk_len);
-#  endif
-
-#  ifndef OPENSSL_NO_BUF_FREELISTS
-#   define SSL_MAX_BUF_FREELIST_LEN_DEFAULT 32
-    unsigned int freelist_max_len;
-    struct ssl3_buf_freelist_st *wbuf_freelist;
-    struct ssl3_buf_freelist_st *rbuf_freelist;
-#  endif
-#  ifndef OPENSSL_NO_SRP
-    SRP_CTX srp_ctx;            /* ctx for SRP authentication */
-#  endif
-
-#  ifndef OPENSSL_NO_TLSEXT
-
-#   ifndef OPENSSL_NO_NEXTPROTONEG
-    /* Next protocol negotiation information */
-    /* (for experimental NPN extension). */
-
-    /*
-     * For a server, this contains a callback function by which the set of
-     * advertised protocols can be provided.
-     */
-    int (*next_protos_advertised_cb) (SSL *s, const unsigned char **buf,
-                                      unsigned int *len, void *arg);
-    void *next_protos_advertised_cb_arg;
-    /*
-     * For a client, this contains a callback function that selects the next
-     * protocol from the list provided by the server.
-     */
-    int (*next_proto_select_cb) (SSL *s, unsigned char **out,
-                                 unsigned char *outlen,
-                                 const unsigned char *in,
-                                 unsigned int inlen, void *arg);
-    void *next_proto_select_cb_arg;
-#   endif
-    /* SRTP profiles we are willing to do from RFC 5764 */
-    STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles;
-#  endif
-};
-
-# endif
-
-# define SSL_SESS_CACHE_OFF                      0x0000
-# define SSL_SESS_CACHE_CLIENT                   0x0001
-# define SSL_SESS_CACHE_SERVER                   0x0002
-# define SSL_SESS_CACHE_BOTH     (SSL_SESS_CACHE_CLIENT|SSL_SESS_CACHE_SERVER)
-# define SSL_SESS_CACHE_NO_AUTO_CLEAR            0x0080
-/* enough comments already ... see SSL_CTX_set_session_cache_mode(3) */
-# define SSL_SESS_CACHE_NO_INTERNAL_LOOKUP       0x0100
-# define SSL_SESS_CACHE_NO_INTERNAL_STORE        0x0200
-# define SSL_SESS_CACHE_NO_INTERNAL \
-        (SSL_SESS_CACHE_NO_INTERNAL_LOOKUP|SSL_SESS_CACHE_NO_INTERNAL_STORE)
-
-LHASH_OF(SSL_SESSION) *SSL_CTX_sessions(SSL_CTX *ctx);
-# define SSL_CTX_sess_number(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_NUMBER,0,NULL)
-# define SSL_CTX_sess_connect(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT,0,NULL)
-# define SSL_CTX_sess_connect_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_GOOD,0,NULL)
-# define SSL_CTX_sess_connect_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CONNECT_RENEGOTIATE,0,NULL)
-# define SSL_CTX_sess_accept(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT,0,NULL)
-# define SSL_CTX_sess_accept_renegotiate(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_RENEGOTIATE,0,NULL)
-# define SSL_CTX_sess_accept_good(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_ACCEPT_GOOD,0,NULL)
-# define SSL_CTX_sess_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_HIT,0,NULL)
-# define SSL_CTX_sess_cb_hits(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CB_HIT,0,NULL)
-# define SSL_CTX_sess_misses(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_MISSES,0,NULL)
-# define SSL_CTX_sess_timeouts(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_TIMEOUTS,0,NULL)
-# define SSL_CTX_sess_cache_full(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CACHE_FULL,0,NULL)
-
-void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx,
-                             int (*new_session_cb) (struct ssl_st *ssl,
-                                                    SSL_SESSION *sess));
-int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx)) (struct ssl_st *ssl,
-                                              SSL_SESSION *sess);
-void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx,
-                                void (*remove_session_cb) (struct ssl_ctx_st
-                                                           *ctx,
-                                                           SSL_SESSION
-                                                           *sess));
-void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx)) (struct ssl_ctx_st *ctx,
-                                                  SSL_SESSION *sess);
-void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx,
-                             SSL_SESSION *(*get_session_cb) (struct ssl_st
-                                                             *ssl,
-                                                             unsigned char
-                                                             *data, int len,
-                                                             int *copy));
-SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx)) (struct ssl_st *ssl,
-                                                       unsigned char *Data,
-                                                       int len, int *copy);
-void SSL_CTX_set_info_callback(SSL_CTX *ctx,
-                               void (*cb) (const SSL *ssl, int type,
-                                           int val));
-void (*SSL_CTX_get_info_callback(SSL_CTX *ctx)) (const SSL *ssl, int type,
-                                                 int val);
-void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx,
-                                int (*client_cert_cb) (SSL *ssl, X509 **x509,
-                                                       EVP_PKEY **pkey));
-int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx)) (SSL *ssl, X509 **x509,
-                                                 EVP_PKEY **pkey);
-# ifndef OPENSSL_NO_ENGINE
-int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e);
-# endif
-void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx,
-                                    int (*app_gen_cookie_cb) (SSL *ssl,
-                                                              unsigned char
-                                                              *cookie,
-                                                              unsigned int
-                                                              *cookie_len));
-void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx,
-                                  int (*app_verify_cookie_cb) (SSL *ssl,
-                                                               unsigned char
-                                                               *cookie,
-                                                               unsigned int
-                                                               cookie_len));
-# ifndef OPENSSL_NO_NEXTPROTONEG
-void SSL_CTX_set_next_protos_advertised_cb(SSL_CTX *s,
-                                           int (*cb) (SSL *ssl,
-                                                      const unsigned char
-                                                      **out,
-                                                      unsigned int *outlen,
-                                                      void *arg), void *arg);
-void SSL_CTX_set_next_proto_select_cb(SSL_CTX *s,
-                                      int (*cb) (SSL *ssl,
-                                                 unsigned char **out,
-                                                 unsigned char *outlen,
-                                                 const unsigned char *in,
-                                                 unsigned int inlen,
-                                                 void *arg), void *arg);
-
-int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
-                          const unsigned char *in, unsigned int inlen,
-                          const unsigned char *client,
-                          unsigned int client_len);
-void SSL_get0_next_proto_negotiated(const SSL *s, const unsigned char **data,
-                                    unsigned *len);
-
-#  define OPENSSL_NPN_UNSUPPORTED 0
-#  define OPENSSL_NPN_NEGOTIATED  1
-#  define OPENSSL_NPN_NO_OVERLAP  2
-# endif
-
-# ifndef OPENSSL_NO_PSK
-/*
- * the maximum length of the buffer given to callbacks containing the
- * resulting identity/psk
- */
-#  define PSK_MAX_IDENTITY_LEN 128
-#  define PSK_MAX_PSK_LEN 256
-void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx,
-                                     unsigned int (*psk_client_callback) (SSL
-                                                                          *ssl,
-                                                                          const
-                                                                          char
-                                                                          *hint,
-                                                                          char
-                                                                          *identity,
-                                                                          unsigned
-                                                                          int
-                                                                          max_identity_len,
-                                                                          unsigned
-                                                                          char
-                                                                          *psk,
-                                                                          unsigned
-                                                                          int
-                                                                          max_psk_len));
-void SSL_set_psk_client_callback(SSL *ssl,
-                                 unsigned int (*psk_client_callback) (SSL
-                                                                      *ssl,
-                                                                      const
-                                                                      char
-                                                                      *hint,
-                                                                      char
-                                                                      *identity,
-                                                                      unsigned
-                                                                      int
-                                                                      max_identity_len,
-                                                                      unsigned
-                                                                      char
-                                                                      *psk,
-                                                                      unsigned
-                                                                      int
-                                                                      max_psk_len));
-void SSL_CTX_set_psk_server_callback(SSL_CTX *ctx,
-                                     unsigned int (*psk_server_callback) (SSL
-                                                                          *ssl,
-                                                                          const
-                                                                          char
-                                                                          *identity,
-                                                                          unsigned
-                                                                          char
-                                                                          *psk,
-                                                                          unsigned
-                                                                          int
-                                                                          max_psk_len));
-void SSL_set_psk_server_callback(SSL *ssl,
-                                 unsigned int (*psk_server_callback) (SSL
-                                                                      *ssl,
-                                                                      const
-                                                                      char
-                                                                      *identity,
-                                                                      unsigned
-                                                                      char
-                                                                      *psk,
-                                                                      unsigned
-                                                                      int
-                                                                      max_psk_len));
-int SSL_CTX_use_psk_identity_hint(SSL_CTX *ctx, const char *identity_hint);
-int SSL_use_psk_identity_hint(SSL *s, const char *identity_hint);
-const char *SSL_get_psk_identity_hint(const SSL *s);
-const char *SSL_get_psk_identity(const SSL *s);
-# endif
-
-# define SSL_NOTHING     1
-# define SSL_WRITING     2
-# define SSL_READING     3
-# define SSL_X509_LOOKUP 4
-
-/* These will only be used when doing non-blocking IO */
-# define SSL_want_nothing(s)     (SSL_want(s) == SSL_NOTHING)
-# define SSL_want_read(s)        (SSL_want(s) == SSL_READING)
-# define SSL_want_write(s)       (SSL_want(s) == SSL_WRITING)
-# define SSL_want_x509_lookup(s) (SSL_want(s) == SSL_X509_LOOKUP)
-
-# define SSL_MAC_FLAG_READ_MAC_STREAM 1
-# define SSL_MAC_FLAG_WRITE_MAC_STREAM 2
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-struct ssl_st {
-    /*
-     * protocol version (one of SSL2_VERSION, SSL3_VERSION, TLS1_VERSION,
-     * DTLS1_VERSION)
-     */
-    int version;
-    /* SSL_ST_CONNECT or SSL_ST_ACCEPT */
-    int type;
-    /* SSLv3 */
-    const SSL_METHOD *method;
-    /*
-     * There are 2 BIO's even though they are normally both the same.  This
-     * is so data can be read and written to different handlers
-     */
-#  ifndef OPENSSL_NO_BIO
-    /* used by SSL_read */
-    BIO *rbio;
-    /* used by SSL_write */
-    BIO *wbio;
-    /* used during session-id reuse to concatenate messages */
-    BIO *bbio;
-#  else
-    /* used by SSL_read */
-    char *rbio;
-    /* used by SSL_write */
-    char *wbio;
-    char *bbio;
-#  endif
-    /*
-     * This holds a variable that indicates what we were doing when a 0 or -1
-     * is returned.  This is needed for non-blocking IO so we know what
-     * request needs re-doing when in SSL_accept or SSL_connect
-     */
-    int rwstate;
-    /* true when we are actually in SSL_accept() or SSL_connect() */
-    int in_handshake;
-    int (*handshake_func) (SSL *);
-    /*
-     * Imagine that here's a boolean member "init" that is switched as soon
-     * as SSL_set_{accept/connect}_state is called for the first time, so
-     * that "state" and "handshake_func" are properly initialized.  But as
-     * handshake_func is == 0 until then, we use this test instead of an
-     * "init" member.
-     */
-    /* are we the server side? - mostly used by SSL_clear */
-    int server;
-    /*
-     * Generate a new session or reuse an old one.
-     * NB: For servers, the 'new' session may actually be a previously
-     * cached session or even the previous session unless
-     * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set
-     */
-    int new_session;
-    /* don't send shutdown packets */
-    int quiet_shutdown;
-    /* we have shut things down, 0x01 sent, 0x02 for received */
-    int shutdown;
-    /* where we are */
-    int state;
-    /* where we are when reading */
-    int rstate;
-    BUF_MEM *init_buf;          /* buffer used during init */
-    void *init_msg;             /* pointer to handshake message body, set by
-                                 * ssl3_get_message() */
-    int init_num;               /* amount read/written */
-    int init_off;               /* amount read/written */
-    /* used internally to point at a raw packet */
-    unsigned char *packet;
-    unsigned int packet_length;
-    struct ssl2_state_st *s2;   /* SSLv2 variables */
-    struct ssl3_state_st *s3;   /* SSLv3 variables */
-    struct dtls1_state_st *d1;  /* DTLSv1 variables */
-    int read_ahead;             /* Read as many input bytes as possible (for
-                                 * non-blocking reads) */
-    /* callback that allows applications to peek at protocol messages */
-    void (*msg_callback) (int write_p, int version, int content_type,
-                          const void *buf, size_t len, SSL *ssl, void *arg);
-    void *msg_callback_arg;
-    int hit;                    /* reusing a previous session */
-    X509_VERIFY_PARAM *param;
-#  if 0
-    int purpose;                /* Purpose setting */
-    int trust;                  /* Trust setting */
-#  endif
-    /* crypto */
-    STACK_OF(SSL_CIPHER) *cipher_list;
-    STACK_OF(SSL_CIPHER) *cipher_list_by_id;
-    /*
-     * These are the ones being used, the ones in SSL_SESSION are the ones to
-     * be 'copied' into these ones
-     */
-    int mac_flags;
-    EVP_CIPHER_CTX *enc_read_ctx; /* cryptographic state */
-    EVP_MD_CTX *read_hash;      /* used for mac generation */
-#  ifndef OPENSSL_NO_COMP
-    COMP_CTX *expand;           /* uncompress */
-#  else
-    char *expand;
-#  endif
-    EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */
-    EVP_MD_CTX *write_hash;     /* used for mac generation */
-#  ifndef OPENSSL_NO_COMP
-    COMP_CTX *compress;         /* compression */
-#  else
-    char *compress;
-#  endif
-    /* session info */
-    /* client cert? */
-    /* This is used to hold the server certificate used */
-    struct cert_st /* CERT */ *cert;
-    /*
-     * the session_id_context is used to ensure sessions are only reused in
-     * the appropriate context
-     */
-    unsigned int sid_ctx_length;
-    unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH];
-    /* This can also be in the session once a session is established */
-    SSL_SESSION *session;
-    /* Default generate session ID callback. */
-    GEN_SESSION_CB generate_session_id;
-    /* Used in SSL2 and SSL3 */
-    /*
-     * 0 don't care about verify failure.
-     * 1 fail if verify fails
-     */
-    int verify_mode;
-    /* fail if callback returns 0 */
-    int (*verify_callback) (int ok, X509_STORE_CTX *ctx);
-    /* optional informational callback */
-    void (*info_callback) (const SSL *ssl, int type, int val);
-    /* error bytes to be written */
-    int error;
-    /* actual code */
-    int error_code;
-#  ifndef OPENSSL_NO_KRB5
-    /* Kerberos 5 context */
-    KSSL_CTX *kssl_ctx;
-#  endif                        /* OPENSSL_NO_KRB5 */
-#  ifndef OPENSSL_NO_PSK
-    unsigned int (*psk_client_callback) (SSL *ssl, const char *hint,
-                                         char *identity,
-                                         unsigned int max_identity_len,
-                                         unsigned char *psk,
-                                         unsigned int max_psk_len);
-    unsigned int (*psk_server_callback) (SSL *ssl, const char *identity,
-                                         unsigned char *psk,
-                                         unsigned int max_psk_len);
-#  endif
-    SSL_CTX *ctx;
-    /*
-     * set this flag to 1 and a sleep(1) is put into all SSL_read() and
-     * SSL_write() calls, good for nbio debuging :-)
-     */
-    int debug;
-    /* extra application data */
-    long verify_result;
-    CRYPTO_EX_DATA ex_data;
-    /* for server side, keep the list of CA_dn we can use */
-    STACK_OF(X509_NAME) *client_CA;
-    int references;
-    /* protocol behaviour */
-    unsigned long options;
-    /* API behaviour */
-    unsigned long mode;
-    long max_cert_list;
-    int first_packet;
-    /* what was passed, used for SSLv3/TLS rollback check */
-    int client_version;
-    unsigned int max_send_fragment;
-#  ifndef OPENSSL_NO_TLSEXT
-    /* TLS extension debug callback */
-    void (*tlsext_debug_cb) (SSL *s, int client_server, int type,
-                             unsigned char *data, int len, void *arg);
-    void *tlsext_debug_arg;
-    char *tlsext_hostname;
-    /*-
-     * no further mod of servername
-     * 0 : call the servername extension callback.
-     * 1 : prepare 2, allow last ack just after in server callback.
-     * 2 : don't call servername callback, no ack in server hello
-     */
-    int servername_done;
-    /* certificate status request info */
-    /* Status type or -1 if no status type */
-    int tlsext_status_type;
-    /* Expect OCSP CertificateStatus message */
-    int tlsext_status_expected;
-    /* OCSP status request only */
-    STACK_OF(OCSP_RESPID) *tlsext_ocsp_ids;
-    X509_EXTENSIONS *tlsext_ocsp_exts;
-    /* OCSP response received or to be sent */
-    unsigned char *tlsext_ocsp_resp;
-    int tlsext_ocsp_resplen;
-    /* RFC4507 session ticket expected to be received or sent */
-    int tlsext_ticket_expected;
-#   ifndef OPENSSL_NO_EC
-    size_t tlsext_ecpointformatlist_length;
-    /* our list */
-    unsigned char *tlsext_ecpointformatlist;
-    size_t tlsext_ellipticcurvelist_length;
-    /* our list */
-    unsigned char *tlsext_ellipticcurvelist;
-#   endif                       /* OPENSSL_NO_EC */
-    /*
-     * draft-rescorla-tls-opaque-prf-input-00.txt information to be used for
-     * handshakes
-     */
-    void *tlsext_opaque_prf_input;
-    size_t tlsext_opaque_prf_input_len;
-    /* TLS Session Ticket extension override */
-    TLS_SESSION_TICKET_EXT *tlsext_session_ticket;
-    /* TLS Session Ticket extension callback */
-    tls_session_ticket_ext_cb_fn tls_session_ticket_ext_cb;
-    void *tls_session_ticket_ext_cb_arg;
-    /* TLS pre-shared secret session resumption */
-    tls_session_secret_cb_fn tls_session_secret_cb;
-    void *tls_session_secret_cb_arg;
-    SSL_CTX *initial_ctx;       /* initial ctx, used to store sessions */
-#   ifndef OPENSSL_NO_NEXTPROTONEG
-    /*
-     * Next protocol negotiation. For the client, this is the protocol that
-     * we sent in NextProtocol and is set when handling ServerHello
-     * extensions. For a server, this is the client's selected_protocol from
-     * NextProtocol and is set when handling the NextProtocol message, before
-     * the Finished message.
-     */
-    unsigned char *next_proto_negotiated;
-    unsigned char next_proto_negotiated_len;
-#   endif
-#   define session_ctx initial_ctx
-    /* What we'll do */
-    STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles;
-    /* What's been chosen */
-    SRTP_PROTECTION_PROFILE *srtp_profile;
-        /*-
-         * Is use of the Heartbeat extension negotiated?
-         * 0: disabled
-         * 1: enabled
-         * 2: enabled, but not allowed to send Requests
-         */
-    unsigned int tlsext_heartbeat;
-    /* Indicates if a HeartbeatRequest is in flight */
-    unsigned int tlsext_hb_pending;
-    /* HeartbeatRequest sequence number */
-    unsigned int tlsext_hb_seq;
-#  else
-#   define session_ctx ctx
-#  endif                        /* OPENSSL_NO_TLSEXT */
-    /*-
-     * 1 if we are renegotiating.
-     * 2 if we are a server and are inside a handshake
-     * (i.e. not just sending a HelloRequest)
-     */
-    int renegotiate;
-#  ifndef OPENSSL_NO_SRP
-    /* ctx for SRP authentication */
-    SRP_CTX srp_ctx;
-#  endif
-};
-
-# endif
-
-#ifdef __cplusplus
-}
-#endif
-
-# include <openssl/ssl2.h>
-# include <openssl/ssl3.h>
-# include <openssl/tls1.h>      /* This is mostly sslv3 with a few tweaks */
-# include <openssl/dtls1.h>     /* Datagram TLS */
-# include <openssl/ssl23.h>
-# include <openssl/srtp.h>      /* Support for the use_srtp extension */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* compatibility */
-# define SSL_set_app_data(s,arg)         (SSL_set_ex_data(s,0,(char *)arg))
-# define SSL_get_app_data(s)             (SSL_get_ex_data(s,0))
-# define SSL_SESSION_set_app_data(s,a)   (SSL_SESSION_set_ex_data(s,0,(char *)a))
-# define SSL_SESSION_get_app_data(s)     (SSL_SESSION_get_ex_data(s,0))
-# define SSL_CTX_get_app_data(ctx)       (SSL_CTX_get_ex_data(ctx,0))
-# define SSL_CTX_set_app_data(ctx,arg)   (SSL_CTX_set_ex_data(ctx,0,(char *)arg))
-
-/*
- * The following are the possible values for ssl->state are are used to
- * indicate where we are up to in the SSL connection establishment. The
- * macros that follow are about the only things you should need to use and
- * even then, only when using non-blocking IO. It can also be useful to work
- * out where you were when the connection failed
- */
-
-# define SSL_ST_CONNECT                  0x1000
-# define SSL_ST_ACCEPT                   0x2000
-# define SSL_ST_MASK                     0x0FFF
-# define SSL_ST_INIT                     (SSL_ST_CONNECT|SSL_ST_ACCEPT)
-# define SSL_ST_BEFORE                   0x4000
-# define SSL_ST_OK                       0x03
-# define SSL_ST_RENEGOTIATE              (0x04|SSL_ST_INIT)
-# define SSL_ST_ERR                      0x05
-
-# define SSL_CB_LOOP                     0x01
-# define SSL_CB_EXIT                     0x02
-# define SSL_CB_READ                     0x04
-# define SSL_CB_WRITE                    0x08
-# define SSL_CB_ALERT                    0x4000/* used in callback */
-# define SSL_CB_READ_ALERT               (SSL_CB_ALERT|SSL_CB_READ)
-# define SSL_CB_WRITE_ALERT              (SSL_CB_ALERT|SSL_CB_WRITE)
-# define SSL_CB_ACCEPT_LOOP              (SSL_ST_ACCEPT|SSL_CB_LOOP)
-# define SSL_CB_ACCEPT_EXIT              (SSL_ST_ACCEPT|SSL_CB_EXIT)
-# define SSL_CB_CONNECT_LOOP             (SSL_ST_CONNECT|SSL_CB_LOOP)
-# define SSL_CB_CONNECT_EXIT             (SSL_ST_CONNECT|SSL_CB_EXIT)
-# define SSL_CB_HANDSHAKE_START          0x10
-# define SSL_CB_HANDSHAKE_DONE           0x20
-
-/* Is the SSL_connection established? */
-# define SSL_get_state(a)                SSL_state(a)
-# define SSL_is_init_finished(a)         (SSL_state(a) == SSL_ST_OK)
-# define SSL_in_init(a)                  (SSL_state(a)&SSL_ST_INIT)
-# define SSL_in_before(a)                (SSL_state(a)&SSL_ST_BEFORE)
-# define SSL_in_connect_init(a)          (SSL_state(a)&SSL_ST_CONNECT)
-# define SSL_in_accept_init(a)           (SSL_state(a)&SSL_ST_ACCEPT)
-
-/*
- * The following 2 states are kept in ssl->rstate when reads fail, you should
- * not need these
- */
-# define SSL_ST_READ_HEADER                      0xF0
-# define SSL_ST_READ_BODY                        0xF1
-# define SSL_ST_READ_DONE                        0xF2
-
-/*-
- * Obtain latest Finished message
- *   -- that we sent (SSL_get_finished)
- *   -- that we expected from peer (SSL_get_peer_finished).
- * Returns length (0 == no Finished so far), copies up to 'count' bytes.
- */
-size_t SSL_get_finished(const SSL *s, void *buf, size_t count);
-size_t SSL_get_peer_finished(const SSL *s, void *buf, size_t count);
-
-/*
- * use either SSL_VERIFY_NONE or SSL_VERIFY_PEER, the last 2 options are
- * 'ored' with SSL_VERIFY_PEER if they are desired
- */
-# define SSL_VERIFY_NONE                 0x00
-# define SSL_VERIFY_PEER                 0x01
-# define SSL_VERIFY_FAIL_IF_NO_PEER_CERT 0x02
-# define SSL_VERIFY_CLIENT_ONCE          0x04
-
-# define OpenSSL_add_ssl_algorithms()    SSL_library_init()
-# define SSLeay_add_ssl_algorithms()     SSL_library_init()
-
-/* this is for backward compatibility */
-# if 0                          /* NEW_SSLEAY */
-#  define SSL_CTX_set_default_verify(a,b,c) SSL_CTX_set_verify(a,b,c)
-#  define SSL_set_pref_cipher(c,n)        SSL_set_cipher_list(c,n)
-#  define SSL_add_session(a,b)            SSL_CTX_add_session((a),(b))
-#  define SSL_remove_session(a,b)         SSL_CTX_remove_session((a),(b))
-#  define SSL_flush_sessions(a,b)         SSL_CTX_flush_sessions((a),(b))
-# endif
-/* More backward compatibility */
-# define SSL_get_cipher(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-# define SSL_get_cipher_bits(s,np) \
-                SSL_CIPHER_get_bits(SSL_get_current_cipher(s),np)
-# define SSL_get_cipher_version(s) \
-                SSL_CIPHER_get_version(SSL_get_current_cipher(s))
-# define SSL_get_cipher_name(s) \
-                SSL_CIPHER_get_name(SSL_get_current_cipher(s))
-# define SSL_get_time(a)         SSL_SESSION_get_time(a)
-# define SSL_set_time(a,b)       SSL_SESSION_set_time((a),(b))
-# define SSL_get_timeout(a)      SSL_SESSION_get_timeout(a)
-# define SSL_set_timeout(a,b)    SSL_SESSION_set_timeout((a),(b))
-
-# define d2i_SSL_SESSION_bio(bp,s_id) ASN1_d2i_bio_of(SSL_SESSION,SSL_SESSION_new,d2i_SSL_SESSION,bp,s_id)
-# define i2d_SSL_SESSION_bio(bp,s_id) ASN1_i2d_bio_of(SSL_SESSION,i2d_SSL_SESSION,bp,s_id)
-
-DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
-# define SSL_AD_REASON_OFFSET            1000/* offset to get SSL_R_... value
-                                              * from SSL_AD_... */
-/* These alert types are for SSLv3 and TLSv1 */
-# define SSL_AD_CLOSE_NOTIFY             SSL3_AD_CLOSE_NOTIFY
-/* fatal */
-# define SSL_AD_UNEXPECTED_MESSAGE       SSL3_AD_UNEXPECTED_MESSAGE
-/* fatal */
-# define SSL_AD_BAD_RECORD_MAC           SSL3_AD_BAD_RECORD_MAC
-# define SSL_AD_DECRYPTION_FAILED        TLS1_AD_DECRYPTION_FAILED
-# define SSL_AD_RECORD_OVERFLOW          TLS1_AD_RECORD_OVERFLOW
-/* fatal */
-# define SSL_AD_DECOMPRESSION_FAILURE    SSL3_AD_DECOMPRESSION_FAILURE
-/* fatal */
-# define SSL_AD_HANDSHAKE_FAILURE        SSL3_AD_HANDSHAKE_FAILURE
-/* Not for TLS */
-# define SSL_AD_NO_CERTIFICATE           SSL3_AD_NO_CERTIFICATE
-# define SSL_AD_BAD_CERTIFICATE          SSL3_AD_BAD_CERTIFICATE
-# define SSL_AD_UNSUPPORTED_CERTIFICATE  SSL3_AD_UNSUPPORTED_CERTIFICATE
-# define SSL_AD_CERTIFICATE_REVOKED      SSL3_AD_CERTIFICATE_REVOKED
-# define SSL_AD_CERTIFICATE_EXPIRED      SSL3_AD_CERTIFICATE_EXPIRED
-# define SSL_AD_CERTIFICATE_UNKNOWN      SSL3_AD_CERTIFICATE_UNKNOWN
-/* fatal */
-# define SSL_AD_ILLEGAL_PARAMETER        SSL3_AD_ILLEGAL_PARAMETER
-/* fatal */
-# define SSL_AD_UNKNOWN_CA               TLS1_AD_UNKNOWN_CA
-/* fatal */
-# define SSL_AD_ACCESS_DENIED            TLS1_AD_ACCESS_DENIED
-/* fatal */
-# define SSL_AD_DECODE_ERROR             TLS1_AD_DECODE_ERROR
-# define SSL_AD_DECRYPT_ERROR            TLS1_AD_DECRYPT_ERROR
-/* fatal */
-# define SSL_AD_EXPORT_RESTRICTION       TLS1_AD_EXPORT_RESTRICTION
-/* fatal */
-# define SSL_AD_PROTOCOL_VERSION         TLS1_AD_PROTOCOL_VERSION
-/* fatal */
-# define SSL_AD_INSUFFICIENT_SECURITY    TLS1_AD_INSUFFICIENT_SECURITY
-/* fatal */
-# define SSL_AD_INTERNAL_ERROR           TLS1_AD_INTERNAL_ERROR
-# define SSL_AD_USER_CANCELLED           TLS1_AD_USER_CANCELLED
-# define SSL_AD_NO_RENEGOTIATION         TLS1_AD_NO_RENEGOTIATION
-# define SSL_AD_UNSUPPORTED_EXTENSION    TLS1_AD_UNSUPPORTED_EXTENSION
-# define SSL_AD_CERTIFICATE_UNOBTAINABLE TLS1_AD_CERTIFICATE_UNOBTAINABLE
-# define SSL_AD_UNRECOGNIZED_NAME        TLS1_AD_UNRECOGNIZED_NAME
-# define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE
-# define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE
-/* fatal */
-# define SSL_AD_UNKNOWN_PSK_IDENTITY     TLS1_AD_UNKNOWN_PSK_IDENTITY
-/* fatal */
-# define SSL_AD_INAPPROPRIATE_FALLBACK   TLS1_AD_INAPPROPRIATE_FALLBACK
-# define SSL_ERROR_NONE                  0
-# define SSL_ERROR_SSL                   1
-# define SSL_ERROR_WANT_READ             2
-# define SSL_ERROR_WANT_WRITE            3
-# define SSL_ERROR_WANT_X509_LOOKUP      4
-# define SSL_ERROR_SYSCALL               5/* look at error stack/return
-                                           * value/errno */
-# define SSL_ERROR_ZERO_RETURN           6
-# define SSL_ERROR_WANT_CONNECT          7
-# define SSL_ERROR_WANT_ACCEPT           8
-# define SSL_CTRL_NEED_TMP_RSA                   1
-# define SSL_CTRL_SET_TMP_RSA                    2
-# define SSL_CTRL_SET_TMP_DH                     3
-# define SSL_CTRL_SET_TMP_ECDH                   4
-# define SSL_CTRL_SET_TMP_RSA_CB                 5
-# define SSL_CTRL_SET_TMP_DH_CB                  6
-# define SSL_CTRL_SET_TMP_ECDH_CB                7
-# define SSL_CTRL_GET_SESSION_REUSED             8
-# define SSL_CTRL_GET_CLIENT_CERT_REQUEST        9
-# define SSL_CTRL_GET_NUM_RENEGOTIATIONS         10
-# define SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS       11
-# define SSL_CTRL_GET_TOTAL_RENEGOTIATIONS       12
-# define SSL_CTRL_GET_FLAGS                      13
-# define SSL_CTRL_EXTRA_CHAIN_CERT               14
-# define SSL_CTRL_SET_MSG_CALLBACK               15
-# define SSL_CTRL_SET_MSG_CALLBACK_ARG           16
-/* only applies to datagram connections */
-# define SSL_CTRL_SET_MTU                17
-/* Stats */
-# define SSL_CTRL_SESS_NUMBER                    20
-# define SSL_CTRL_SESS_CONNECT                   21
-# define SSL_CTRL_SESS_CONNECT_GOOD              22
-# define SSL_CTRL_SESS_CONNECT_RENEGOTIATE       23
-# define SSL_CTRL_SESS_ACCEPT                    24
-# define SSL_CTRL_SESS_ACCEPT_GOOD               25
-# define SSL_CTRL_SESS_ACCEPT_RENEGOTIATE        26
-# define SSL_CTRL_SESS_HIT                       27
-# define SSL_CTRL_SESS_CB_HIT                    28
-# define SSL_CTRL_SESS_MISSES                    29
-# define SSL_CTRL_SESS_TIMEOUTS                  30
-# define SSL_CTRL_SESS_CACHE_FULL                31
-# define SSL_CTRL_OPTIONS                        32
-# define SSL_CTRL_MODE                           33
-# define SSL_CTRL_GET_READ_AHEAD                 40
-# define SSL_CTRL_SET_READ_AHEAD                 41
-# define SSL_CTRL_SET_SESS_CACHE_SIZE            42
-# define SSL_CTRL_GET_SESS_CACHE_SIZE            43
-# define SSL_CTRL_SET_SESS_CACHE_MODE            44
-# define SSL_CTRL_GET_SESS_CACHE_MODE            45
-# define SSL_CTRL_GET_MAX_CERT_LIST              50
-# define SSL_CTRL_SET_MAX_CERT_LIST              51
-# define SSL_CTRL_SET_MAX_SEND_FRAGMENT          52
-/* see tls1.h for macros based on these */
-# ifndef OPENSSL_NO_TLSEXT
-#  define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB       53
-#  define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG      54
-#  define SSL_CTRL_SET_TLSEXT_HOSTNAME            55
-#  define SSL_CTRL_SET_TLSEXT_DEBUG_CB            56
-#  define SSL_CTRL_SET_TLSEXT_DEBUG_ARG           57
-#  define SSL_CTRL_GET_TLSEXT_TICKET_KEYS         58
-#  define SSL_CTRL_SET_TLSEXT_TICKET_KEYS         59
-#  define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT    60
-#  define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB 61
-#  define SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG 62
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB       63
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG   64
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE     65
-#  define SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS     66
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS     67
-#  define SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS      68
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS      69
-#  define SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP        70
-#  define SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP        71
-#  define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB       72
-#  define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB    75
-#  define SSL_CTRL_SET_SRP_VERIFY_PARAM_CB                76
-#  define SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB             77
-#  define SSL_CTRL_SET_SRP_ARG            78
-#  define SSL_CTRL_SET_TLS_EXT_SRP_USERNAME               79
-#  define SSL_CTRL_SET_TLS_EXT_SRP_STRENGTH               80
-#  define SSL_CTRL_SET_TLS_EXT_SRP_PASSWORD               81
-#  ifndef OPENSSL_NO_HEARTBEATS
-#   define SSL_CTRL_TLS_EXT_SEND_HEARTBEAT                         85
-#   define SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING          86
-#   define SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS      87
-#  endif
-# endif
-# define DTLS_CTRL_GET_TIMEOUT           73
-# define DTLS_CTRL_HANDLE_TIMEOUT        74
-# define DTLS_CTRL_LISTEN                        75
-# define SSL_CTRL_GET_RI_SUPPORT                 76
-# define SSL_CTRL_CLEAR_OPTIONS                  77
-# define SSL_CTRL_CLEAR_MODE                     78
-# define SSL_CTRL_GET_EXTRA_CHAIN_CERTS          82
-# define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS        83
-# define SSL_CTRL_CHECK_PROTO_VERSION            119
-# define DTLS_CTRL_SET_LINK_MTU                  120
-# define DTLS_CTRL_GET_LINK_MIN_MTU              121
-# define DTLSv1_get_timeout(ssl, arg) \
-        SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg)
-# define DTLSv1_handle_timeout(ssl) \
-        SSL_ctrl(ssl,DTLS_CTRL_HANDLE_TIMEOUT,0, NULL)
-# define DTLSv1_listen(ssl, peer) \
-        SSL_ctrl(ssl,DTLS_CTRL_LISTEN,0, (void *)peer)
-# define SSL_session_reused(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_SESSION_REUSED,0,NULL)
-# define SSL_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_NUM_RENEGOTIATIONS,0,NULL)
-# define SSL_clear_num_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_CLEAR_NUM_RENEGOTIATIONS,0,NULL)
-# define SSL_total_renegotiations(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_TOTAL_RENEGOTIATIONS,0,NULL)
-# define SSL_CTX_need_tmp_RSA(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-# define SSL_CTX_set_tmp_rsa(ctx,rsa) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-# define SSL_CTX_set_tmp_dh(ctx,dh) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-# define SSL_CTX_set_tmp_ecdh(ctx,ecdh) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
-# define SSL_need_tmp_RSA(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_NEED_TMP_RSA,0,NULL)
-# define SSL_set_tmp_rsa(ssl,rsa) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_RSA,0,(char *)rsa)
-# define SSL_set_tmp_dh(ssl,dh) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_DH,0,(char *)dh)
-# define SSL_set_tmp_ecdh(ssl,ecdh) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_TMP_ECDH,0,(char *)ecdh)
-# define SSL_CTX_add_extra_chain_cert(ctx,x509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
-# define SSL_CTX_get_extra_chain_certs(ctx,px509) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_EXTRA_CHAIN_CERTS,0,px509)
-# define SSL_CTX_clear_extra_chain_certs(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS,0,NULL)
-# ifndef OPENSSL_NO_BIO
-BIO_METHOD *BIO_f_ssl(void);
-BIO *BIO_new_ssl(SSL_CTX *ctx, int client);
-BIO *BIO_new_ssl_connect(SSL_CTX *ctx);
-BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx);
-int BIO_ssl_copy_session_id(BIO *to, BIO *from);
-void BIO_ssl_shutdown(BIO *ssl_bio);
-
-# endif
-
-int SSL_CTX_set_cipher_list(SSL_CTX *, const char *str);
-SSL_CTX *SSL_CTX_new(const SSL_METHOD *meth);
-void SSL_CTX_free(SSL_CTX *);
-long SSL_CTX_set_timeout(SSL_CTX *ctx, long t);
-long SSL_CTX_get_timeout(const SSL_CTX *ctx);
-X509_STORE *SSL_CTX_get_cert_store(const SSL_CTX *);
-void SSL_CTX_set_cert_store(SSL_CTX *, X509_STORE *);
-int SSL_want(const SSL *s);
-int SSL_clear(SSL *s);
-
-void SSL_CTX_flush_sessions(SSL_CTX *ctx, long tm);
-
-const SSL_CIPHER *SSL_get_current_cipher(const SSL *s);
-int SSL_CIPHER_get_bits(const SSL_CIPHER *c, int *alg_bits);
-char *SSL_CIPHER_get_version(const SSL_CIPHER *c);
-const char *SSL_CIPHER_get_name(const SSL_CIPHER *c);
-unsigned long SSL_CIPHER_get_id(const SSL_CIPHER *c);
-
-int SSL_get_fd(const SSL *s);
-int SSL_get_rfd(const SSL *s);
-int SSL_get_wfd(const SSL *s);
-const char *SSL_get_cipher_list(const SSL *s, int n);
-char *SSL_get_shared_ciphers(const SSL *s, char *buf, int len);
-int SSL_get_read_ahead(const SSL *s);
-int SSL_pending(const SSL *s);
-# ifndef OPENSSL_NO_SOCK
-int SSL_set_fd(SSL *s, int fd);
-int SSL_set_rfd(SSL *s, int fd);
-int SSL_set_wfd(SSL *s, int fd);
-# endif
-# ifndef OPENSSL_NO_BIO
-void SSL_set_bio(SSL *s, BIO *rbio, BIO *wbio);
-BIO *SSL_get_rbio(const SSL *s);
-BIO *SSL_get_wbio(const SSL *s);
-# endif
-int SSL_set_cipher_list(SSL *s, const char *str);
-void SSL_set_read_ahead(SSL *s, int yes);
-int SSL_get_verify_mode(const SSL *s);
-int SSL_get_verify_depth(const SSL *s);
-int (*SSL_get_verify_callback(const SSL *s)) (int, X509_STORE_CTX *);
-void SSL_set_verify(SSL *s, int mode,
-                    int (*callback) (int ok, X509_STORE_CTX *ctx));
-void SSL_set_verify_depth(SSL *s, int depth);
-# ifndef OPENSSL_NO_RSA
-int SSL_use_RSAPrivateKey(SSL *ssl, RSA *rsa);
-# endif
-int SSL_use_RSAPrivateKey_ASN1(SSL *ssl, unsigned char *d, long len);
-int SSL_use_PrivateKey(SSL *ssl, EVP_PKEY *pkey);
-int SSL_use_PrivateKey_ASN1(int pk, SSL *ssl, const unsigned char *d,
-                            long len);
-int SSL_use_certificate(SSL *ssl, X509 *x);
-int SSL_use_certificate_ASN1(SSL *ssl, const unsigned char *d, int len);
-
-# ifndef OPENSSL_NO_STDIO
-int SSL_use_RSAPrivateKey_file(SSL *ssl, const char *file, int type);
-int SSL_use_PrivateKey_file(SSL *ssl, const char *file, int type);
-int SSL_use_certificate_file(SSL *ssl, const char *file, int type);
-int SSL_CTX_use_RSAPrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int SSL_CTX_use_PrivateKey_file(SSL_CTX *ctx, const char *file, int type);
-int SSL_CTX_use_certificate_file(SSL_CTX *ctx, const char *file, int type);
-/* PEM type */
-int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file);
-STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
-int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                        const char *file);
-#  ifndef OPENSSL_SYS_VMS
-/* XXXXX: Better scheme needed! [was: #ifndef MAC_OS_pre_X] */
-#   ifndef OPENSSL_SYS_MACINTOSH_CLASSIC
-int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
-                                       const char *dir);
-#   endif
-#  endif
-
-# endif
-
-void SSL_load_error_strings(void);
-const char *SSL_state_string(const SSL *s);
-const char *SSL_rstate_string(const SSL *s);
-const char *SSL_state_string_long(const SSL *s);
-const char *SSL_rstate_string_long(const SSL *s);
-long SSL_SESSION_get_time(const SSL_SESSION *s);
-long SSL_SESSION_set_time(SSL_SESSION *s, long t);
-long SSL_SESSION_get_timeout(const SSL_SESSION *s);
-long SSL_SESSION_set_timeout(SSL_SESSION *s, long t);
-void SSL_copy_session_id(SSL *to, const SSL *from);
-X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);
-int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
-                                unsigned int sid_ctx_len);
-
-SSL_SESSION *SSL_SESSION_new(void);
-const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,
-                                        unsigned int *len);
-unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);
-# ifndef OPENSSL_NO_FP_API
-int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses);
-# endif
-# ifndef OPENSSL_NO_BIO
-int SSL_SESSION_print(BIO *fp, const SSL_SESSION *ses);
-# endif
-void SSL_SESSION_free(SSL_SESSION *ses);
-int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
-int SSL_set_session(SSL *to, SSL_SESSION *session);
-int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
-int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *c);
-int SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
-int SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);
-int SSL_has_matching_session_id(const SSL *ssl, const unsigned char *id,
-                                unsigned int id_len);
-SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
-                             long length);
-
-# ifdef HEADER_X509_H
-X509 *SSL_get_peer_certificate(const SSL *s);
-# endif
-
-STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s);
-
-int SSL_CTX_get_verify_mode(const SSL_CTX *ctx);
-int SSL_CTX_get_verify_depth(const SSL_CTX *ctx);
-int (*SSL_CTX_get_verify_callback(const SSL_CTX *ctx)) (int,
-                                                        X509_STORE_CTX *);
-void SSL_CTX_set_verify(SSL_CTX *ctx, int mode,
-                        int (*callback) (int, X509_STORE_CTX *));
-void SSL_CTX_set_verify_depth(SSL_CTX *ctx, int depth);
-void SSL_CTX_set_cert_verify_callback(SSL_CTX *ctx,
-                                      int (*cb) (X509_STORE_CTX *, void *),
-                                      void *arg);
-# ifndef OPENSSL_NO_RSA
-int SSL_CTX_use_RSAPrivateKey(SSL_CTX *ctx, RSA *rsa);
-# endif
-int SSL_CTX_use_RSAPrivateKey_ASN1(SSL_CTX *ctx, const unsigned char *d,
-                                   long len);
-int SSL_CTX_use_PrivateKey(SSL_CTX *ctx, EVP_PKEY *pkey);
-int SSL_CTX_use_PrivateKey_ASN1(int pk, SSL_CTX *ctx,
-                                const unsigned char *d, long len);
-int SSL_CTX_use_certificate(SSL_CTX *ctx, X509 *x);
-int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
-                                 const unsigned char *d);
-
-void SSL_CTX_set_default_passwd_cb(SSL_CTX *ctx, pem_password_cb *cb);
-void SSL_CTX_set_default_passwd_cb_userdata(SSL_CTX *ctx, void *u);
-
-int SSL_CTX_check_private_key(const SSL_CTX *ctx);
-int SSL_check_private_key(const SSL *ctx);
-
-int SSL_CTX_set_session_id_context(SSL_CTX *ctx, const unsigned char *sid_ctx,
-                                   unsigned int sid_ctx_len);
-
-SSL *SSL_new(SSL_CTX *ctx);
-int SSL_set_session_id_context(SSL *ssl, const unsigned char *sid_ctx,
-                               unsigned int sid_ctx_len);
-
-int SSL_CTX_set_purpose(SSL_CTX *s, int purpose);
-int SSL_set_purpose(SSL *s, int purpose);
-int SSL_CTX_set_trust(SSL_CTX *s, int trust);
-int SSL_set_trust(SSL *s, int trust);
-
-int SSL_CTX_set1_param(SSL_CTX *ctx, X509_VERIFY_PARAM *vpm);
-int SSL_set1_param(SSL *ssl, X509_VERIFY_PARAM *vpm);
-
-# ifndef OPENSSL_NO_SRP
-int SSL_CTX_set_srp_username(SSL_CTX *ctx, char *name);
-int SSL_CTX_set_srp_password(SSL_CTX *ctx, char *password);
-int SSL_CTX_set_srp_strength(SSL_CTX *ctx, int strength);
-int SSL_CTX_set_srp_client_pwd_callback(SSL_CTX *ctx,
-                                        char *(*cb) (SSL *, void *));
-int SSL_CTX_set_srp_verify_param_callback(SSL_CTX *ctx,
-                                          int (*cb) (SSL *, void *));
-int SSL_CTX_set_srp_username_callback(SSL_CTX *ctx,
-                                      int (*cb) (SSL *, int *, void *));
-int SSL_CTX_set_srp_cb_arg(SSL_CTX *ctx, void *arg);
-
-int SSL_set_srp_server_param(SSL *s, const BIGNUM *N, const BIGNUM *g,
-                             BIGNUM *sa, BIGNUM *v, char *info);
-int SSL_set_srp_server_param_pw(SSL *s, const char *user, const char *pass,
-                                const char *grp);
-
-BIGNUM *SSL_get_srp_g(SSL *s);
-BIGNUM *SSL_get_srp_N(SSL *s);
-
-char *SSL_get_srp_username(SSL *s);
-char *SSL_get_srp_userinfo(SSL *s);
-# endif
-
-void SSL_free(SSL *ssl);
-int SSL_accept(SSL *ssl);
-int SSL_connect(SSL *ssl);
-int SSL_read(SSL *ssl, void *buf, int num);
-int SSL_peek(SSL *ssl, void *buf, int num);
-int SSL_write(SSL *ssl, const void *buf, int num);
-long SSL_ctrl(SSL *ssl, int cmd, long larg, void *parg);
-long SSL_callback_ctrl(SSL *, int, void (*)(void));
-long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg);
-long SSL_CTX_callback_ctrl(SSL_CTX *, int, void (*)(void));
-
-int SSL_get_error(const SSL *s, int ret_code);
-const char *SSL_get_version(const SSL *s);
-
-/* This sets the 'default' SSL version that SSL_new() will create */
-int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth);
-
-# ifndef OPENSSL_NO_SSL2
-const SSL_METHOD *SSLv2_method(void); /* SSLv2 */
-const SSL_METHOD *SSLv2_server_method(void); /* SSLv2 */
-const SSL_METHOD *SSLv2_client_method(void); /* SSLv2 */
-# endif
-
-# ifndef OPENSSL_NO_SSL3_METHOD
-const SSL_METHOD *SSLv3_method(void); /* SSLv3 */
-const SSL_METHOD *SSLv3_server_method(void); /* SSLv3 */
-const SSL_METHOD *SSLv3_client_method(void); /* SSLv3 */
-# endif
-
-const SSL_METHOD *SSLv23_method(void); /* Negotiate highest available SSL/TLS
-                                        * version */
-const SSL_METHOD *SSLv23_server_method(void); /* Negotiate highest available
-                                               * SSL/TLS version */
-const SSL_METHOD *SSLv23_client_method(void); /* Negotiate highest available
-                                               * SSL/TLS version */
-
-const SSL_METHOD *TLSv1_method(void); /* TLSv1.0 */
-const SSL_METHOD *TLSv1_server_method(void); /* TLSv1.0 */
-const SSL_METHOD *TLSv1_client_method(void); /* TLSv1.0 */
-
-const SSL_METHOD *TLSv1_1_method(void); /* TLSv1.1 */
-const SSL_METHOD *TLSv1_1_server_method(void); /* TLSv1.1 */
-const SSL_METHOD *TLSv1_1_client_method(void); /* TLSv1.1 */
-
-const SSL_METHOD *TLSv1_2_method(void); /* TLSv1.2 */
-const SSL_METHOD *TLSv1_2_server_method(void); /* TLSv1.2 */
-const SSL_METHOD *TLSv1_2_client_method(void); /* TLSv1.2 */
-
-const SSL_METHOD *DTLSv1_method(void); /* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_server_method(void); /* DTLSv1.0 */
-const SSL_METHOD *DTLSv1_client_method(void); /* DTLSv1.0 */
-
-STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
-
-int SSL_do_handshake(SSL *s);
-int SSL_renegotiate(SSL *s);
-int SSL_renegotiate_abbreviated(SSL *s);
-int SSL_renegotiate_pending(SSL *s);
-int SSL_shutdown(SSL *s);
-
-const SSL_METHOD *SSL_get_ssl_method(SSL *s);
-int SSL_set_ssl_method(SSL *s, const SSL_METHOD *method);
-const char *SSL_alert_type_string_long(int value);
-const char *SSL_alert_type_string(int value);
-const char *SSL_alert_desc_string_long(int value);
-const char *SSL_alert_desc_string(int value);
-
-void SSL_set_client_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list);
-void SSL_CTX_set_client_CA_list(SSL_CTX *ctx, STACK_OF(X509_NAME) *name_list);
-STACK_OF(X509_NAME) *SSL_get_client_CA_list(const SSL *s);
-STACK_OF(X509_NAME) *SSL_CTX_get_client_CA_list(const SSL_CTX *s);
-int SSL_add_client_CA(SSL *ssl, X509 *x);
-int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x);
-
-void SSL_set_connect_state(SSL *s);
-void SSL_set_accept_state(SSL *s);
-
-long SSL_get_default_timeout(const SSL *s);
-
-int SSL_library_init(void);
-
-char *SSL_CIPHER_description(const SSL_CIPHER *, char *buf, int size);
-STACK_OF(X509_NAME) *SSL_dup_CA_list(STACK_OF(X509_NAME) *sk);
-
-SSL *SSL_dup(SSL *ssl);
-
-X509 *SSL_get_certificate(const SSL *ssl);
-/*
- * EVP_PKEY
- */ struct evp_pkey_st *SSL_get_privatekey(SSL *ssl);
-
-void SSL_CTX_set_quiet_shutdown(SSL_CTX *ctx, int mode);
-int SSL_CTX_get_quiet_shutdown(const SSL_CTX *ctx);
-void SSL_set_quiet_shutdown(SSL *ssl, int mode);
-int SSL_get_quiet_shutdown(const SSL *ssl);
-void SSL_set_shutdown(SSL *ssl, int mode);
-int SSL_get_shutdown(const SSL *ssl);
-int SSL_version(const SSL *ssl);
-int SSL_CTX_set_default_verify_paths(SSL_CTX *ctx);
-int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
-                                  const char *CApath);
-# define SSL_get0_session SSL_get_session/* just peek at pointer */
-SSL_SESSION *SSL_get_session(const SSL *ssl);
-SSL_SESSION *SSL_get1_session(SSL *ssl); /* obtain a reference count */
-SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl);
-SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX *ctx);
-void SSL_set_info_callback(SSL *ssl,
-                           void (*cb) (const SSL *ssl, int type, int val));
-void (*SSL_get_info_callback(const SSL *ssl)) (const SSL *ssl, int type,
-                                               int val);
-int SSL_state(const SSL *ssl);
-void SSL_set_state(SSL *ssl, int state);
-
-void SSL_set_verify_result(SSL *ssl, long v);
-long SSL_get_verify_result(const SSL *ssl);
-
-int SSL_set_ex_data(SSL *ssl, int idx, void *data);
-void *SSL_get_ex_data(const SSL *ssl, int idx);
-int SSL_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                         CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-
-int SSL_SESSION_set_ex_data(SSL_SESSION *ss, int idx, void *data);
-void *SSL_SESSION_get_ex_data(const SSL_SESSION *ss, int idx);
-int SSL_SESSION_get_ex_new_index(long argl, void *argp,
-                                 CRYPTO_EX_new *new_func,
-                                 CRYPTO_EX_dup *dup_func,
-                                 CRYPTO_EX_free *free_func);
-
-int SSL_CTX_set_ex_data(SSL_CTX *ssl, int idx, void *data);
-void *SSL_CTX_get_ex_data(const SSL_CTX *ssl, int idx);
-int SSL_CTX_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                             CRYPTO_EX_dup *dup_func,
-                             CRYPTO_EX_free *free_func);
-
-int SSL_get_ex_data_X509_STORE_CTX_idx(void);
-
-# define SSL_CTX_sess_set_cache_size(ctx,t) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_SIZE,t,NULL)
-# define SSL_CTX_sess_get_cache_size(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_SIZE,0,NULL)
-# define SSL_CTX_set_session_cache_mode(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_SESS_CACHE_MODE,m,NULL)
-# define SSL_CTX_get_session_cache_mode(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_SESS_CACHE_MODE,0,NULL)
-
-# define SSL_CTX_get_default_read_ahead(ctx) SSL_CTX_get_read_ahead(ctx)
-# define SSL_CTX_set_default_read_ahead(ctx,m) SSL_CTX_set_read_ahead(ctx,m)
-# define SSL_CTX_get_read_ahead(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_READ_AHEAD,0,NULL)
-# define SSL_CTX_set_read_ahead(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_READ_AHEAD,m,NULL)
-# define SSL_CTX_get_max_cert_list(ctx) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-# define SSL_CTX_set_max_cert_list(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
-# define SSL_get_max_cert_list(ssl) \
-        SSL_ctrl(ssl,SSL_CTRL_GET_MAX_CERT_LIST,0,NULL)
-# define SSL_set_max_cert_list(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_CERT_LIST,m,NULL)
-
-# define SSL_CTX_set_max_send_fragment(ctx,m) \
-        SSL_CTX_ctrl(ctx,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-# define SSL_set_max_send_fragment(ssl,m) \
-        SSL_ctrl(ssl,SSL_CTRL_SET_MAX_SEND_FRAGMENT,m,NULL)
-
-     /* NB: the keylength is only applicable when is_export is true */
-# ifndef OPENSSL_NO_RSA
-void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,
-                                  RSA *(*cb) (SSL *ssl, int is_export,
-                                              int keylength));
-
-void SSL_set_tmp_rsa_callback(SSL *ssl,
-                              RSA *(*cb) (SSL *ssl, int is_export,
-                                          int keylength));
-# endif
-# ifndef OPENSSL_NO_DH
-void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,
-                                 DH *(*dh) (SSL *ssl, int is_export,
-                                            int keylength));
-void SSL_set_tmp_dh_callback(SSL *ssl,
-                             DH *(*dh) (SSL *ssl, int is_export,
-                                        int keylength));
-# endif
-# ifndef OPENSSL_NO_ECDH
-void SSL_CTX_set_tmp_ecdh_callback(SSL_CTX *ctx,
-                                   EC_KEY *(*ecdh) (SSL *ssl, int is_export,
-                                                    int keylength));
-void SSL_set_tmp_ecdh_callback(SSL *ssl,
-                               EC_KEY *(*ecdh) (SSL *ssl, int is_export,
-                                                int keylength));
-# endif
-
-# ifndef OPENSSL_NO_COMP
-const COMP_METHOD *SSL_get_current_compression(SSL *s);
-const COMP_METHOD *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const COMP_METHOD *comp);
-STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);
-int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm);
-# else
-const void *SSL_get_current_compression(SSL *s);
-const void *SSL_get_current_expansion(SSL *s);
-const char *SSL_COMP_get_name(const void *comp);
-void *SSL_COMP_get_compression_methods(void);
-int SSL_COMP_add_compression_method(int id, void *cm);
-# endif
-
-/* TLS extensions functions */
-int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len);
-
-int SSL_set_session_ticket_ext_cb(SSL *s, tls_session_ticket_ext_cb_fn cb,
-                                  void *arg);
-
-/* Pre-shared secret session resumption functions */
-int SSL_set_session_secret_cb(SSL *s,
-                              tls_session_secret_cb_fn tls_session_secret_cb,
-                              void *arg);
-
-void SSL_set_debug(SSL *s, int debug);
-int SSL_cache_hit(SSL *s);
-
-# ifndef OPENSSL_NO_UNIT_TEST
-const struct openssl_ssl_test_functions *SSL_test_functions(void);
-# endif
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_SSL_strings(void);
-
-/* Error codes for the SSL functions. */
-
-/* Function codes. */
-# define SSL_F_CLIENT_CERTIFICATE                         100
-# define SSL_F_CLIENT_FINISHED                            167
-# define SSL_F_CLIENT_HELLO                               101
-# define SSL_F_CLIENT_MASTER_KEY                          102
-# define SSL_F_D2I_SSL_SESSION                            103
-# define SSL_F_DO_DTLS1_WRITE                             245
-# define SSL_F_DO_SSL3_WRITE                              104
-# define SSL_F_DTLS1_ACCEPT                               246
-# define SSL_F_DTLS1_ADD_CERT_TO_BUF                      295
-# define SSL_F_DTLS1_BUFFER_RECORD                        247
-# define SSL_F_DTLS1_CHECK_TIMEOUT_NUM                    316
-# define SSL_F_DTLS1_CLIENT_HELLO                         248
-# define SSL_F_DTLS1_CONNECT                              249
-# define SSL_F_DTLS1_ENC                                  250
-# define SSL_F_DTLS1_GET_HELLO_VERIFY                     251
-# define SSL_F_DTLS1_GET_MESSAGE                          252
-# define SSL_F_DTLS1_GET_MESSAGE_FRAGMENT                 253
-# define SSL_F_DTLS1_GET_RECORD                           254
-# define SSL_F_DTLS1_HANDLE_TIMEOUT                       297
-# define SSL_F_DTLS1_HEARTBEAT                            305
-# define SSL_F_DTLS1_OUTPUT_CERT_CHAIN                    255
-# define SSL_F_DTLS1_PREPROCESS_FRAGMENT                  288
-# define SSL_F_DTLS1_PROCESS_OUT_OF_SEQ_MESSAGE           256
-# define SSL_F_DTLS1_PROCESS_RECORD                       257
-# define SSL_F_DTLS1_READ_BYTES                           258
-# define SSL_F_DTLS1_READ_FAILED                          259
-# define SSL_F_DTLS1_SEND_CERTIFICATE_REQUEST             260
-# define SSL_F_DTLS1_SEND_CLIENT_CERTIFICATE              261
-# define SSL_F_DTLS1_SEND_CLIENT_KEY_EXCHANGE             262
-# define SSL_F_DTLS1_SEND_CLIENT_VERIFY                   263
-# define SSL_F_DTLS1_SEND_HELLO_VERIFY_REQUEST            264
-# define SSL_F_DTLS1_SEND_SERVER_CERTIFICATE              265
-# define SSL_F_DTLS1_SEND_SERVER_HELLO                    266
-# define SSL_F_DTLS1_SEND_SERVER_KEY_EXCHANGE             267
-# define SSL_F_DTLS1_WRITE_APP_DATA_BYTES                 268
-# define SSL_F_GET_CLIENT_FINISHED                        105
-# define SSL_F_GET_CLIENT_HELLO                           106
-# define SSL_F_GET_CLIENT_MASTER_KEY                      107
-# define SSL_F_GET_SERVER_FINISHED                        108
-# define SSL_F_GET_SERVER_HELLO                           109
-# define SSL_F_GET_SERVER_VERIFY                          110
-# define SSL_F_I2D_SSL_SESSION                            111
-# define SSL_F_READ_N                                     112
-# define SSL_F_REQUEST_CERTIFICATE                        113
-# define SSL_F_SERVER_FINISH                              239
-# define SSL_F_SERVER_HELLO                               114
-# define SSL_F_SERVER_VERIFY                              240
-# define SSL_F_SSL23_ACCEPT                               115
-# define SSL_F_SSL23_CLIENT_HELLO                         116
-# define SSL_F_SSL23_CONNECT                              117
-# define SSL_F_SSL23_GET_CLIENT_HELLO                     118
-# define SSL_F_SSL23_GET_SERVER_HELLO                     119
-# define SSL_F_SSL23_PEEK                                 237
-# define SSL_F_SSL23_READ                                 120
-# define SSL_F_SSL23_WRITE                                121
-# define SSL_F_SSL2_ACCEPT                                122
-# define SSL_F_SSL2_CONNECT                               123
-# define SSL_F_SSL2_ENC_INIT                              124
-# define SSL_F_SSL2_GENERATE_KEY_MATERIAL                 241
-# define SSL_F_SSL2_PEEK                                  234
-# define SSL_F_SSL2_READ                                  125
-# define SSL_F_SSL2_READ_INTERNAL                         236
-# define SSL_F_SSL2_SET_CERTIFICATE                       126
-# define SSL_F_SSL2_WRITE                                 127
-# define SSL_F_SSL3_ACCEPT                                128
-# define SSL_F_SSL3_ADD_CERT_TO_BUF                       296
-# define SSL_F_SSL3_CALLBACK_CTRL                         233
-# define SSL_F_SSL3_CHANGE_CIPHER_STATE                   129
-# define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM              130
-# define SSL_F_SSL3_CHECK_CLIENT_HELLO                    304
-# define SSL_F_SSL3_CHECK_FINISHED                        339
-# define SSL_F_SSL3_CLIENT_HELLO                          131
-# define SSL_F_SSL3_CONNECT                               132
-# define SSL_F_SSL3_CTRL                                  213
-# define SSL_F_SSL3_CTX_CTRL                              133
-# define SSL_F_SSL3_DIGEST_CACHED_RECORDS                 293
-# define SSL_F_SSL3_DO_CHANGE_CIPHER_SPEC                 292
-# define SSL_F_SSL3_ENC                                   134
-# define SSL_F_SSL3_GENERATE_KEY_BLOCK                    238
-# define SSL_F_SSL3_GET_CERTIFICATE_REQUEST               135
-# define SSL_F_SSL3_GET_CERT_STATUS                       289
-# define SSL_F_SSL3_GET_CERT_VERIFY                       136
-# define SSL_F_SSL3_GET_CLIENT_CERTIFICATE                137
-# define SSL_F_SSL3_GET_CLIENT_HELLO                      138
-# define SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE               139
-# define SSL_F_SSL3_GET_FINISHED                          140
-# define SSL_F_SSL3_GET_KEY_EXCHANGE                      141
-# define SSL_F_SSL3_GET_MESSAGE                           142
-# define SSL_F_SSL3_GET_NEW_SESSION_TICKET                283
-# define SSL_F_SSL3_GET_NEXT_PROTO                        306
-# define SSL_F_SSL3_GET_RECORD                            143
-# define SSL_F_SSL3_GET_SERVER_CERTIFICATE                144
-# define SSL_F_SSL3_GET_SERVER_DONE                       145
-# define SSL_F_SSL3_GET_SERVER_HELLO                      146
-# define SSL_F_SSL3_HANDSHAKE_MAC                         285
-# define SSL_F_SSL3_NEW_SESSION_TICKET                    287
-# define SSL_F_SSL3_OUTPUT_CERT_CHAIN                     147
-# define SSL_F_SSL3_PEEK                                  235
-# define SSL_F_SSL3_READ_BYTES                            148
-# define SSL_F_SSL3_READ_N                                149
-# define SSL_F_SSL3_SEND_CERTIFICATE_REQUEST              150
-# define SSL_F_SSL3_SEND_CLIENT_CERTIFICATE               151
-# define SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE              152
-# define SSL_F_SSL3_SEND_CLIENT_VERIFY                    153
-# define SSL_F_SSL3_SEND_SERVER_CERTIFICATE               154
-# define SSL_F_SSL3_SEND_SERVER_HELLO                     242
-# define SSL_F_SSL3_SEND_SERVER_KEY_EXCHANGE              155
-# define SSL_F_SSL3_SETUP_KEY_BLOCK                       157
-# define SSL_F_SSL3_SETUP_READ_BUFFER                     156
-# define SSL_F_SSL3_SETUP_WRITE_BUFFER                    291
-# define SSL_F_SSL3_WRITE_BYTES                           158
-# define SSL_F_SSL3_WRITE_PENDING                         159
-# define SSL_F_SSL_ADD_CLIENTHELLO_RENEGOTIATE_EXT        298
-# define SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT                 277
-# define SSL_F_SSL_ADD_CLIENTHELLO_USE_SRTP_EXT           307
-# define SSL_F_SSL_ADD_DIR_CERT_SUBJECTS_TO_STACK         215
-# define SSL_F_SSL_ADD_FILE_CERT_SUBJECTS_TO_STACK        216
-# define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT        299
-# define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT                 278
-# define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT           308
-# define SSL_F_SSL_BAD_METHOD                             160
-# define SSL_F_SSL_BYTES_TO_CIPHER_LIST                   161
-# define SSL_F_SSL_CERT_DUP                               221
-# define SSL_F_SSL_CERT_INST                              222
-# define SSL_F_SSL_CERT_INSTANTIATE                       214
-# define SSL_F_SSL_CERT_NEW                               162
-# define SSL_F_SSL_CHECK_PRIVATE_KEY                      163
-# define SSL_F_SSL_CHECK_SERVERHELLO_TLSEXT               280
-# define SSL_F_SSL_CHECK_SRVR_ECC_CERT_AND_ALG            279
-# define SSL_F_SSL_CIPHER_PROCESS_RULESTR                 230
-# define SSL_F_SSL_CIPHER_STRENGTH_SORT                   231
-# define SSL_F_SSL_CLEAR                                  164
-# define SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD            165
-# define SSL_F_SSL_CREATE_CIPHER_LIST                     166
-# define SSL_F_SSL_CTRL                                   232
-# define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY                  168
-# define SSL_F_SSL_CTX_MAKE_PROFILES                      309
-# define SSL_F_SSL_CTX_NEW                                169
-# define SSL_F_SSL_CTX_SET_CIPHER_LIST                    269
-# define SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE             290
-# define SSL_F_SSL_CTX_SET_PURPOSE                        226
-# define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT             219
-# define SSL_F_SSL_CTX_SET_SSL_VERSION                    170
-# define SSL_F_SSL_CTX_SET_TRUST                          229
-# define SSL_F_SSL_CTX_USE_CERTIFICATE                    171
-# define SSL_F_SSL_CTX_USE_CERTIFICATE_ASN1               172
-# define SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE         220
-# define SSL_F_SSL_CTX_USE_CERTIFICATE_FILE               173
-# define SSL_F_SSL_CTX_USE_PRIVATEKEY                     174
-# define SSL_F_SSL_CTX_USE_PRIVATEKEY_ASN1                175
-# define SSL_F_SSL_CTX_USE_PRIVATEKEY_FILE                176
-# define SSL_F_SSL_CTX_USE_PSK_IDENTITY_HINT              272
-# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY                  177
-# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_ASN1             178
-# define SSL_F_SSL_CTX_USE_RSAPRIVATEKEY_FILE             179
-# define SSL_F_SSL_DO_HANDSHAKE                           180
-# define SSL_F_SSL_GET_NEW_SESSION                        181
-# define SSL_F_SSL_GET_PREV_SESSION                       217
-# define SSL_F_SSL_GET_SERVER_SEND_CERT                   182
-# define SSL_F_SSL_GET_SERVER_SEND_PKEY                   317
-# define SSL_F_SSL_GET_SIGN_PKEY                          183
-# define SSL_F_SSL_INIT_WBIO_BUFFER                       184
-# define SSL_F_SSL_LOAD_CLIENT_CA_FILE                    185
-# define SSL_F_SSL_NEW                                    186
-# define SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT      300
-# define SSL_F_SSL_PARSE_CLIENTHELLO_TLSEXT               302
-# define SSL_F_SSL_PARSE_CLIENTHELLO_USE_SRTP_EXT         310
-# define SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT      301
-# define SSL_F_SSL_PARSE_SERVERHELLO_TLSEXT               303
-# define SSL_F_SSL_PARSE_SERVERHELLO_USE_SRTP_EXT         311
-# define SSL_F_SSL_PEEK                                   270
-# define SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT             281
-# define SSL_F_SSL_PREPARE_SERVERHELLO_TLSEXT             282
-# define SSL_F_SSL_READ                                   223
-# define SSL_F_SSL_RSA_PRIVATE_DECRYPT                    187
-# define SSL_F_SSL_RSA_PUBLIC_ENCRYPT                     188
-# define SSL_F_SSL_SESSION_DUP                            348
-# define SSL_F_SSL_SESSION_NEW                            189
-# define SSL_F_SSL_SESSION_PRINT_FP                       190
-# define SSL_F_SSL_SESSION_SET1_ID_CONTEXT                312
-# define SSL_F_SSL_SESS_CERT_NEW                          225
-# define SSL_F_SSL_SET_CERT                               191
-# define SSL_F_SSL_SET_CIPHER_LIST                        271
-# define SSL_F_SSL_SET_FD                                 192
-# define SSL_F_SSL_SET_PKEY                               193
-# define SSL_F_SSL_SET_PURPOSE                            227
-# define SSL_F_SSL_SET_RFD                                194
-# define SSL_F_SSL_SET_SESSION                            195
-# define SSL_F_SSL_SET_SESSION_ID_CONTEXT                 218
-# define SSL_F_SSL_SET_SESSION_TICKET_EXT                 294
-# define SSL_F_SSL_SET_TRUST                              228
-# define SSL_F_SSL_SET_WFD                                196
-# define SSL_F_SSL_SHUTDOWN                               224
-# define SSL_F_SSL_SRP_CTX_INIT                           313
-# define SSL_F_SSL_UNDEFINED_CONST_FUNCTION               243
-# define SSL_F_SSL_UNDEFINED_FUNCTION                     197
-# define SSL_F_SSL_UNDEFINED_VOID_FUNCTION                244
-# define SSL_F_SSL_USE_CERTIFICATE                        198
-# define SSL_F_SSL_USE_CERTIFICATE_ASN1                   199
-# define SSL_F_SSL_USE_CERTIFICATE_FILE                   200
-# define SSL_F_SSL_USE_PRIVATEKEY                         201
-# define SSL_F_SSL_USE_PRIVATEKEY_ASN1                    202
-# define SSL_F_SSL_USE_PRIVATEKEY_FILE                    203
-# define SSL_F_SSL_USE_PSK_IDENTITY_HINT                  273
-# define SSL_F_SSL_USE_RSAPRIVATEKEY                      204
-# define SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1                 205
-# define SSL_F_SSL_USE_RSAPRIVATEKEY_FILE                 206
-# define SSL_F_SSL_VERIFY_CERT_CHAIN                      207
-# define SSL_F_SSL_WRITE                                  208
-# define SSL_F_TLS1_CERT_VERIFY_MAC                       286
-# define SSL_F_TLS1_CHANGE_CIPHER_STATE                   209
-# define SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT              274
-# define SSL_F_TLS1_ENC                                   210
-# define SSL_F_TLS1_EXPORT_KEYING_MATERIAL                314
-# define SSL_F_TLS1_HEARTBEAT                             315
-# define SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT            275
-# define SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT            276
-# define SSL_F_TLS1_PRF                                   284
-# define SSL_F_TLS1_SETUP_KEY_BLOCK                       211
-# define SSL_F_WRITE_PENDING                              212
-
-/* Reason codes. */
-# define SSL_R_APP_DATA_IN_HANDSHAKE                      100
-# define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272
-# define SSL_R_BAD_ALERT_RECORD                           101
-# define SSL_R_BAD_AUTHENTICATION_TYPE                    102
-# define SSL_R_BAD_CHANGE_CIPHER_SPEC                     103
-# define SSL_R_BAD_CHECKSUM                               104
-# define SSL_R_BAD_DATA_RETURNED_BY_CALLBACK              106
-# define SSL_R_BAD_DECOMPRESSION                          107
-# define SSL_R_BAD_DH_G_LENGTH                            108
-# define SSL_R_BAD_DH_PUB_KEY_LENGTH                      109
-# define SSL_R_BAD_DH_P_LENGTH                            110
-# define SSL_R_BAD_DIGEST_LENGTH                          111
-# define SSL_R_BAD_DSA_SIGNATURE                          112
-# define SSL_R_BAD_ECC_CERT                               304
-# define SSL_R_BAD_ECDSA_SIGNATURE                        305
-# define SSL_R_BAD_ECPOINT                                306
-# define SSL_R_BAD_HANDSHAKE_LENGTH                       332
-# define SSL_R_BAD_HELLO_REQUEST                          105
-# define SSL_R_BAD_LENGTH                                 271
-# define SSL_R_BAD_MAC_DECODE                             113
-# define SSL_R_BAD_MAC_LENGTH                             333
-# define SSL_R_BAD_MESSAGE_TYPE                           114
-# define SSL_R_BAD_PACKET_LENGTH                          115
-# define SSL_R_BAD_PROTOCOL_VERSION_NUMBER                116
-# define SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH               316
-# define SSL_R_BAD_RESPONSE_ARGUMENT                      117
-# define SSL_R_BAD_RSA_DECRYPT                            118
-# define SSL_R_BAD_RSA_ENCRYPT                            119
-# define SSL_R_BAD_RSA_E_LENGTH                           120
-# define SSL_R_BAD_RSA_MODULUS_LENGTH                     121
-# define SSL_R_BAD_RSA_SIGNATURE                          122
-# define SSL_R_BAD_SIGNATURE                              123
-# define SSL_R_BAD_SRP_A_LENGTH                           347
-# define SSL_R_BAD_SRP_B_LENGTH                           348
-# define SSL_R_BAD_SRP_G_LENGTH                           349
-# define SSL_R_BAD_SRP_N_LENGTH                           350
-# define SSL_R_BAD_SRP_PARAMETERS                         371
-# define SSL_R_BAD_SRP_S_LENGTH                           351
-# define SSL_R_BAD_SRTP_MKI_VALUE                         352
-# define SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST           353
-# define SSL_R_BAD_SSL_FILETYPE                           124
-# define SSL_R_BAD_SSL_SESSION_ID_LENGTH                  125
-# define SSL_R_BAD_STATE                                  126
-# define SSL_R_BAD_WRITE_RETRY                            127
-# define SSL_R_BIO_NOT_SET                                128
-# define SSL_R_BLOCK_CIPHER_PAD_IS_WRONG                  129
-# define SSL_R_BN_LIB                                     130
-# define SSL_R_CA_DN_LENGTH_MISMATCH                      131
-# define SSL_R_CA_DN_TOO_LONG                             132
-# define SSL_R_CCS_RECEIVED_EARLY                         133
-# define SSL_R_CERTIFICATE_VERIFY_FAILED                  134
-# define SSL_R_CERT_LENGTH_MISMATCH                       135
-# define SSL_R_CHALLENGE_IS_DIFFERENT                     136
-# define SSL_R_CIPHER_CODE_WRONG_LENGTH                   137
-# define SSL_R_CIPHER_OR_HASH_UNAVAILABLE                 138
-# define SSL_R_CIPHER_TABLE_SRC_ERROR                     139
-# define SSL_R_CLIENTHELLO_TLSEXT                         226
-# define SSL_R_COMPRESSED_LENGTH_TOO_LONG                 140
-# define SSL_R_COMPRESSION_DISABLED                       343
-# define SSL_R_COMPRESSION_FAILURE                        141
-# define SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE    307
-# define SSL_R_COMPRESSION_LIBRARY_ERROR                  142
-# define SSL_R_CONNECTION_ID_IS_DIFFERENT                 143
-# define SSL_R_CONNECTION_TYPE_NOT_SET                    144
-# define SSL_R_COOKIE_MISMATCH                            308
-# define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED              145
-# define SSL_R_DATA_LENGTH_TOO_LONG                       146
-# define SSL_R_DECRYPTION_FAILED                          147
-# define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC        281
-# define SSL_R_DH_KEY_TOO_SMALL                           372
-# define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG            148
-# define SSL_R_DIGEST_CHECK_FAILED                        149
-# define SSL_R_DTLS_MESSAGE_TOO_BIG                       334
-# define SSL_R_DUPLICATE_COMPRESSION_ID                   309
-# define SSL_R_ECC_CERT_NOT_FOR_KEY_AGREEMENT             317
-# define SSL_R_ECC_CERT_NOT_FOR_SIGNING                   318
-# define SSL_R_ECC_CERT_SHOULD_HAVE_RSA_SIGNATURE         322
-# define SSL_R_ECC_CERT_SHOULD_HAVE_SHA1_SIGNATURE        323
-# define SSL_R_ECGROUP_TOO_LARGE_FOR_CIPHER               310
-# define SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST         354
-# define SSL_R_ENCRYPTED_LENGTH_TOO_LONG                  150
-# define SSL_R_ERROR_GENERATING_TMP_RSA_KEY               282
-# define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              151
-# define SSL_R_EXCESSIVE_MESSAGE_SIZE                     152
-# define SSL_R_EXTRA_DATA_IN_MESSAGE                      153
-# define SSL_R_GOT_A_FIN_BEFORE_A_CCS                     154
-# define SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS                355
-# define SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION           356
-# define SSL_R_HTTPS_PROXY_REQUEST                        155
-# define SSL_R_HTTP_REQUEST                               156
-# define SSL_R_ILLEGAL_PADDING                            283
-# define SSL_R_INAPPROPRIATE_FALLBACK                     373
-# define SSL_R_INCONSISTENT_COMPRESSION                   340
-# define SSL_R_INVALID_CHALLENGE_LENGTH                   158
-# define SSL_R_INVALID_COMMAND                            280
-# define SSL_R_INVALID_COMPRESSION_ALGORITHM              341
-# define SSL_R_INVALID_PURPOSE                            278
-# define SSL_R_INVALID_SRP_USERNAME                       357
-# define SSL_R_INVALID_STATUS_RESPONSE                    328
-# define SSL_R_INVALID_TICKET_KEYS_LENGTH                 325
-# define SSL_R_INVALID_TRUST                              279
-# define SSL_R_KEY_ARG_TOO_LONG                           284
-# define SSL_R_KRB5                                       285
-# define SSL_R_KRB5_C_CC_PRINC                            286
-# define SSL_R_KRB5_C_GET_CRED                            287
-# define SSL_R_KRB5_C_INIT                                288
-# define SSL_R_KRB5_C_MK_REQ                              289
-# define SSL_R_KRB5_S_BAD_TICKET                          290
-# define SSL_R_KRB5_S_INIT                                291
-# define SSL_R_KRB5_S_RD_REQ                              292
-# define SSL_R_KRB5_S_TKT_EXPIRED                         293
-# define SSL_R_KRB5_S_TKT_NYV                             294
-# define SSL_R_KRB5_S_TKT_SKEW                            295
-# define SSL_R_LENGTH_MISMATCH                            159
-# define SSL_R_LENGTH_TOO_SHORT                           160
-# define SSL_R_LIBRARY_BUG                                274
-# define SSL_R_LIBRARY_HAS_NO_CIPHERS                     161
-# define SSL_R_MESSAGE_TOO_LONG                           296
-# define SSL_R_MISSING_DH_DSA_CERT                        162
-# define SSL_R_MISSING_DH_KEY                             163
-# define SSL_R_MISSING_DH_RSA_CERT                        164
-# define SSL_R_MISSING_DSA_SIGNING_CERT                   165
-# define SSL_R_MISSING_EXPORT_TMP_DH_KEY                  166
-# define SSL_R_MISSING_EXPORT_TMP_RSA_KEY                 167
-# define SSL_R_MISSING_RSA_CERTIFICATE                    168
-# define SSL_R_MISSING_RSA_ENCRYPTING_CERT                169
-# define SSL_R_MISSING_RSA_SIGNING_CERT                   170
-# define SSL_R_MISSING_SRP_PARAM                          358
-# define SSL_R_MISSING_TMP_DH_KEY                         171
-# define SSL_R_MISSING_TMP_ECDH_KEY                       311
-# define SSL_R_MISSING_TMP_RSA_KEY                        172
-# define SSL_R_MISSING_TMP_RSA_PKEY                       173
-# define SSL_R_MISSING_VERIFY_MESSAGE                     174
-# define SSL_R_MULTIPLE_SGC_RESTARTS                      346
-# define SSL_R_NON_SSLV2_INITIAL_PACKET                   175
-# define SSL_R_NO_CERTIFICATES_RETURNED                   176
-# define SSL_R_NO_CERTIFICATE_ASSIGNED                    177
-# define SSL_R_NO_CERTIFICATE_RETURNED                    178
-# define SSL_R_NO_CERTIFICATE_SET                         179
-# define SSL_R_NO_CERTIFICATE_SPECIFIED                   180
-# define SSL_R_NO_CIPHERS_AVAILABLE                       181
-# define SSL_R_NO_CIPHERS_PASSED                          182
-# define SSL_R_NO_CIPHERS_SPECIFIED                       183
-# define SSL_R_NO_CIPHER_LIST                             184
-# define SSL_R_NO_CIPHER_MATCH                            185
-# define SSL_R_NO_CLIENT_CERT_METHOD                      331
-# define SSL_R_NO_CLIENT_CERT_RECEIVED                    186
-# define SSL_R_NO_COMPRESSION_SPECIFIED                   187
-# define SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER           330
-# define SSL_R_NO_METHOD_SPECIFIED                        188
-# define SSL_R_NO_PRIVATEKEY                              189
-# define SSL_R_NO_PRIVATE_KEY_ASSIGNED                    190
-# define SSL_R_NO_PROTOCOLS_AVAILABLE                     191
-# define SSL_R_NO_PUBLICKEY                               192
-# define SSL_R_NO_RENEGOTIATION                           339
-# define SSL_R_NO_REQUIRED_DIGEST                         324
-# define SSL_R_NO_SHARED_CIPHER                           193
-# define SSL_R_NO_SRTP_PROFILES                           359
-# define SSL_R_NO_VERIFY_CALLBACK                         194
-# define SSL_R_NULL_SSL_CTX                               195
-# define SSL_R_NULL_SSL_METHOD_PASSED                     196
-# define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED            197
-# define SSL_R_OLD_SESSION_COMPRESSION_ALGORITHM_NOT_RETURNED 344
-# define SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE              297
-# define SSL_R_OPAQUE_PRF_INPUT_TOO_LONG                  327
-# define SSL_R_PACKET_LENGTH_TOO_LONG                     198
-# define SSL_R_PARSE_TLSEXT                               227
-# define SSL_R_PATH_TOO_LONG                              270
-# define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE          199
-# define SSL_R_PEER_ERROR                                 200
-# define SSL_R_PEER_ERROR_CERTIFICATE                     201
-# define SSL_R_PEER_ERROR_NO_CERTIFICATE                  202
-# define SSL_R_PEER_ERROR_NO_CIPHER                       203
-# define SSL_R_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE    204
-# define SSL_R_PRE_MAC_LENGTH_TOO_LONG                    205
-# define SSL_R_PROBLEMS_MAPPING_CIPHER_FUNCTIONS          206
-# define SSL_R_PROTOCOL_IS_SHUTDOWN                       207
-# define SSL_R_PSK_IDENTITY_NOT_FOUND                     223
-# define SSL_R_PSK_NO_CLIENT_CB                           224
-# define SSL_R_PSK_NO_SERVER_CB                           225
-# define SSL_R_PUBLIC_KEY_ENCRYPT_ERROR                   208
-# define SSL_R_PUBLIC_KEY_IS_NOT_RSA                      209
-# define SSL_R_PUBLIC_KEY_NOT_RSA                         210
-# define SSL_R_READ_BIO_NOT_SET                           211
-# define SSL_R_READ_TIMEOUT_EXPIRED                       312
-# define SSL_R_READ_WRONG_PACKET_TYPE                     212
-# define SSL_R_RECORD_LENGTH_MISMATCH                     213
-# define SSL_R_RECORD_TOO_LARGE                           214
-# define SSL_R_RECORD_TOO_SMALL                           298
-# define SSL_R_RENEGOTIATE_EXT_TOO_LONG                   335
-# define SSL_R_RENEGOTIATION_ENCODING_ERR                 336
-# define SSL_R_RENEGOTIATION_MISMATCH                     337
-# define SSL_R_REQUIRED_CIPHER_MISSING                    215
-# define SSL_R_REQUIRED_COMPRESSSION_ALGORITHM_MISSING    342
-# define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO                 216
-# define SSL_R_REUSE_CERT_TYPE_NOT_ZERO                   217
-# define SSL_R_REUSE_CIPHER_LIST_NOT_ZERO                 218
-# define SSL_R_SCSV_RECEIVED_WHEN_RENEGOTIATING           345
-# define SSL_R_SERVERHELLO_TLSEXT                         275
-# define SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED           277
-# define SSL_R_SHORT_READ                                 219
-# define SSL_R_SIGNATURE_ALGORITHMS_ERROR                 360
-# define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE      220
-# define SSL_R_SRP_A_CALC                                 361
-# define SSL_R_SRTP_COULD_NOT_ALLOCATE_PROFILES           362
-# define SSL_R_SRTP_PROTECTION_PROFILE_LIST_TOO_LONG      363
-# define SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE            364
-# define SSL_R_SSL23_DOING_SESSION_ID_REUSE               221
-# define SSL_R_SSL2_CONNECTION_ID_TOO_LONG                299
-# define SSL_R_SSL3_EXT_INVALID_ECPOINTFORMAT             321
-# define SSL_R_SSL3_EXT_INVALID_SERVERNAME                319
-# define SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE           320
-# define SSL_R_SSL3_SESSION_ID_TOO_LONG                   300
-# define SSL_R_SSL3_SESSION_ID_TOO_SHORT                  222
-# define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE                1042
-# define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC                 1020
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED            1045
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED            1044
-# define SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN            1046
-# define SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE          1030
-# define SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE              1040
-# define SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER              1047
-# define SSL_R_SSLV3_ALERT_NO_CERTIFICATE                 1041
-# define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE             1010
-# define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE        1043
-# define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION         228
-# define SSL_R_SSL_HANDSHAKE_FAILURE                      229
-# define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS                 230
-# define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED             301
-# define SSL_R_SSL_SESSION_ID_CONFLICT                    302
-# define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG            273
-# define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH              303
-# define SSL_R_SSL_SESSION_ID_IS_DIFFERENT                231
-# define SSL_R_TLSV1_ALERT_ACCESS_DENIED                  1049
-# define SSL_R_TLSV1_ALERT_DECODE_ERROR                   1050
-# define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED              1021
-# define SSL_R_TLSV1_ALERT_DECRYPT_ERROR                  1051
-# define SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION             1060
-# define SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK         1086
-# define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY          1071
-# define SSL_R_TLSV1_ALERT_INTERNAL_ERROR                 1080
-# define SSL_R_TLSV1_ALERT_NO_RENEGOTIATION               1100
-# define SSL_R_TLSV1_ALERT_PROTOCOL_VERSION               1070
-# define SSL_R_TLSV1_ALERT_RECORD_OVERFLOW                1022
-# define SSL_R_TLSV1_ALERT_UNKNOWN_CA                     1048
-# define SSL_R_TLSV1_ALERT_USER_CANCELLED                 1090
-# define SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE           1114
-# define SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE      1113
-# define SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE             1111
-# define SSL_R_TLSV1_UNRECOGNIZED_NAME                    1112
-# define SSL_R_TLSV1_UNSUPPORTED_EXTENSION                1110
-# define SSL_R_TLS_CLIENT_CERT_REQ_WITH_ANON_CIPHER       232
-# define SSL_R_TLS_HEARTBEAT_PEER_DOESNT_ACCEPT           365
-# define SSL_R_TLS_HEARTBEAT_PENDING                      366
-# define SSL_R_TLS_ILLEGAL_EXPORTER_LABEL                 367
-# define SSL_R_TLS_INVALID_ECPOINTFORMAT_LIST             157
-# define SSL_R_TLS_PEER_DID_NOT_RESPOND_WITH_CERTIFICATE_LIST 233
-# define SSL_R_TLS_RSA_ENCRYPTED_VALUE_LENGTH_IS_WRONG    234
-# define SSL_R_TRIED_TO_USE_UNSUPPORTED_CIPHER            235
-# define SSL_R_UNABLE_TO_DECODE_DH_CERTS                  236
-# define SSL_R_UNABLE_TO_DECODE_ECDH_CERTS                313
-# define SSL_R_UNABLE_TO_EXTRACT_PUBLIC_KEY               237
-# define SSL_R_UNABLE_TO_FIND_DH_PARAMETERS               238
-# define SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS             314
-# define SSL_R_UNABLE_TO_FIND_PUBLIC_KEY_PARAMETERS       239
-# define SSL_R_UNABLE_TO_FIND_SSL_METHOD                  240
-# define SSL_R_UNABLE_TO_LOAD_SSL2_MD5_ROUTINES           241
-# define SSL_R_UNABLE_TO_LOAD_SSL3_MD5_ROUTINES           242
-# define SSL_R_UNABLE_TO_LOAD_SSL3_SHA1_ROUTINES          243
-# define SSL_R_UNEXPECTED_MESSAGE                         244
-# define SSL_R_UNEXPECTED_RECORD                          245
-# define SSL_R_UNINITIALIZED                              276
-# define SSL_R_UNKNOWN_ALERT_TYPE                         246
-# define SSL_R_UNKNOWN_CERTIFICATE_TYPE                   247
-# define SSL_R_UNKNOWN_CIPHER_RETURNED                    248
-# define SSL_R_UNKNOWN_CIPHER_TYPE                        249
-# define SSL_R_UNKNOWN_DIGEST                             368
-# define SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE                  250
-# define SSL_R_UNKNOWN_PKEY_TYPE                          251
-# define SSL_R_UNKNOWN_PROTOCOL                           252
-# define SSL_R_UNKNOWN_REMOTE_ERROR_TYPE                  253
-# define SSL_R_UNKNOWN_SSL_VERSION                        254
-# define SSL_R_UNKNOWN_STATE                              255
-# define SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED       338
-# define SSL_R_UNSUPPORTED_CIPHER                         256
-# define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM          257
-# define SSL_R_UNSUPPORTED_DIGEST_TYPE                    326
-# define SSL_R_UNSUPPORTED_ELLIPTIC_CURVE                 315
-# define SSL_R_UNSUPPORTED_PROTOCOL                       258
-# define SSL_R_UNSUPPORTED_SSL_VERSION                    259
-# define SSL_R_UNSUPPORTED_STATUS_TYPE                    329
-# define SSL_R_USE_SRTP_NOT_NEGOTIATED                    369
-# define SSL_R_WRITE_BIO_NOT_SET                          260
-# define SSL_R_WRONG_CIPHER_RETURNED                      261
-# define SSL_R_WRONG_MESSAGE_TYPE                         262
-# define SSL_R_WRONG_NUMBER_OF_KEY_BITS                   263
-# define SSL_R_WRONG_SIGNATURE_LENGTH                     264
-# define SSL_R_WRONG_SIGNATURE_SIZE                       265
-# define SSL_R_WRONG_SIGNATURE_TYPE                       370
-# define SSL_R_WRONG_SSL_VERSION                          266
-# define SSL_R_WRONG_VERSION_NUMBER                       267
-# define SSL_R_X509_LIB                                   268
-# define SSL_R_X509_VERIFICATION_SETUP_PROBLEMS           269
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ssl2.h b/include.new/openssl/ssl2.h
deleted file mode 100644
index 03c7dd8..0000000
--- a/include.new/openssl/ssl2.h
+++ /dev/null
@@ -1,265 +0,0 @@
-/* ssl/ssl2.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SSL2_H
-# define HEADER_SSL2_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Protocol Version Codes */
-# define SSL2_VERSION            0x0002
-# define SSL2_VERSION_MAJOR      0x00
-# define SSL2_VERSION_MINOR      0x02
-/* #define SSL2_CLIENT_VERSION  0x0002 */
-/* #define SSL2_SERVER_VERSION  0x0002 */
-
-/* Protocol Message Codes */
-# define SSL2_MT_ERROR                   0
-# define SSL2_MT_CLIENT_HELLO            1
-# define SSL2_MT_CLIENT_MASTER_KEY       2
-# define SSL2_MT_CLIENT_FINISHED         3
-# define SSL2_MT_SERVER_HELLO            4
-# define SSL2_MT_SERVER_VERIFY           5
-# define SSL2_MT_SERVER_FINISHED         6
-# define SSL2_MT_REQUEST_CERTIFICATE     7
-# define SSL2_MT_CLIENT_CERTIFICATE      8
-
-/* Error Message Codes */
-# define SSL2_PE_UNDEFINED_ERROR         0x0000
-# define SSL2_PE_NO_CIPHER               0x0001
-# define SSL2_PE_NO_CERTIFICATE          0x0002
-# define SSL2_PE_BAD_CERTIFICATE         0x0004
-# define SSL2_PE_UNSUPPORTED_CERTIFICATE_TYPE 0x0006
-
-/* Cipher Kind Values */
-# define SSL2_CK_NULL_WITH_MD5                   0x02000000/* v3 */
-# define SSL2_CK_RC4_128_WITH_MD5                0x02010080
-# define SSL2_CK_RC4_128_EXPORT40_WITH_MD5       0x02020080
-# define SSL2_CK_RC2_128_CBC_WITH_MD5            0x02030080
-# define SSL2_CK_RC2_128_CBC_EXPORT40_WITH_MD5   0x02040080
-# define SSL2_CK_IDEA_128_CBC_WITH_MD5           0x02050080
-# define SSL2_CK_DES_64_CBC_WITH_MD5             0x02060040
-# define SSL2_CK_DES_64_CBC_WITH_SHA             0x02060140/* v3 */
-# define SSL2_CK_DES_192_EDE3_CBC_WITH_MD5       0x020700c0
-# define SSL2_CK_DES_192_EDE3_CBC_WITH_SHA       0x020701c0/* v3 */
-# define SSL2_CK_RC4_64_WITH_MD5                 0x02080080/* MS hack */
-
-# define SSL2_CK_DES_64_CFB64_WITH_MD5_1         0x02ff0800/* SSLeay */
-# define SSL2_CK_NULL                            0x02ff0810/* SSLeay */
-
-# define SSL2_TXT_DES_64_CFB64_WITH_MD5_1        "DES-CFB-M1"
-# define SSL2_TXT_NULL_WITH_MD5                  "NULL-MD5"
-# define SSL2_TXT_RC4_128_WITH_MD5               "RC4-MD5"
-# define SSL2_TXT_RC4_128_EXPORT40_WITH_MD5      "EXP-RC4-MD5"
-# define SSL2_TXT_RC2_128_CBC_WITH_MD5           "RC2-CBC-MD5"
-# define SSL2_TXT_RC2_128_CBC_EXPORT40_WITH_MD5  "EXP-RC2-CBC-MD5"
-# define SSL2_TXT_IDEA_128_CBC_WITH_MD5          "IDEA-CBC-MD5"
-# define SSL2_TXT_DES_64_CBC_WITH_MD5            "DES-CBC-MD5"
-# define SSL2_TXT_DES_64_CBC_WITH_SHA            "DES-CBC-SHA"
-# define SSL2_TXT_DES_192_EDE3_CBC_WITH_MD5      "DES-CBC3-MD5"
-# define SSL2_TXT_DES_192_EDE3_CBC_WITH_SHA      "DES-CBC3-SHA"
-# define SSL2_TXT_RC4_64_WITH_MD5                "RC4-64-MD5"
-
-# define SSL2_TXT_NULL                           "NULL"
-
-/* Flags for the SSL_CIPHER.algorithm2 field */
-# define SSL2_CF_5_BYTE_ENC                      0x01
-# define SSL2_CF_8_BYTE_ENC                      0x02
-
-/* Certificate Type Codes */
-# define SSL2_CT_X509_CERTIFICATE                0x01
-
-/* Authentication Type Code */
-# define SSL2_AT_MD5_WITH_RSA_ENCRYPTION         0x01
-
-# define SSL2_MAX_SSL_SESSION_ID_LENGTH          32
-
-/* Upper/Lower Bounds */
-# define SSL2_MAX_MASTER_KEY_LENGTH_IN_BITS      256
-# ifdef OPENSSL_SYS_MPE
-#  define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER    29998u
-# else
-#  define SSL2_MAX_RECORD_LENGTH_2_BYTE_HEADER    32767u
-                                                       /* 2^15-1 */
-# endif
-# define SSL2_MAX_RECORD_LENGTH_3_BYTE_HEADER    16383/* 2^14-1 */
-
-# define SSL2_CHALLENGE_LENGTH   16
-/*
- * #define SSL2_CHALLENGE_LENGTH 32
- */
-# define SSL2_MIN_CHALLENGE_LENGTH       16
-# define SSL2_MAX_CHALLENGE_LENGTH       32
-# define SSL2_CONNECTION_ID_LENGTH       16
-# define SSL2_MAX_CONNECTION_ID_LENGTH   16
-# define SSL2_SSL_SESSION_ID_LENGTH      16
-# define SSL2_MAX_CERT_CHALLENGE_LENGTH  32
-# define SSL2_MIN_CERT_CHALLENGE_LENGTH  16
-# define SSL2_MAX_KEY_MATERIAL_LENGTH    24
-
-# ifndef HEADER_SSL_LOCL_H
-#  define  CERT           char
-# endif
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct ssl2_state_st {
-    int three_byte_header;
-    int clear_text;             /* clear text */
-    int escape;                 /* not used in SSLv2 */
-    int ssl2_rollback;          /* used if SSLv23 rolled back to SSLv2 */
-    /*
-     * non-blocking io info, used to make sure the same args were passwd
-     */
-    unsigned int wnum;          /* number of bytes sent so far */
-    int wpend_tot;
-    const unsigned char *wpend_buf;
-    int wpend_off;              /* offset to data to write */
-    int wpend_len;              /* number of bytes passwd to write */
-    int wpend_ret;              /* number of bytes to return to caller */
-    /* buffer raw data */
-    int rbuf_left;
-    int rbuf_offs;
-    unsigned char *rbuf;
-    unsigned char *wbuf;
-    unsigned char *write_ptr;   /* used to point to the start due to 2/3 byte
-                                 * header. */
-    unsigned int padding;
-    unsigned int rlength;       /* passed to ssl2_enc */
-    int ract_data_length;       /* Set when things are encrypted. */
-    unsigned int wlength;       /* passed to ssl2_enc */
-    int wact_data_length;       /* Set when things are decrypted. */
-    unsigned char *ract_data;
-    unsigned char *wact_data;
-    unsigned char *mac_data;
-    unsigned char *read_key;
-    unsigned char *write_key;
-    /* Stuff specifically to do with this SSL session */
-    unsigned int challenge_length;
-    unsigned char challenge[SSL2_MAX_CHALLENGE_LENGTH];
-    unsigned int conn_id_length;
-    unsigned char conn_id[SSL2_MAX_CONNECTION_ID_LENGTH];
-    unsigned int key_material_length;
-    unsigned char key_material[SSL2_MAX_KEY_MATERIAL_LENGTH * 2];
-    unsigned long read_sequence;
-    unsigned long write_sequence;
-    struct {
-        unsigned int conn_id_length;
-        unsigned int cert_type;
-        unsigned int cert_length;
-        unsigned int csl;
-        unsigned int clear;
-        unsigned int enc;
-        unsigned char ccl[SSL2_MAX_CERT_CHALLENGE_LENGTH];
-        unsigned int cipher_spec_length;
-        unsigned int session_id_length;
-        unsigned int clen;
-        unsigned int rlen;
-    } tmp;
-} SSL2_STATE;
-
-# endif
-
-/* SSLv2 */
-/* client */
-# define SSL2_ST_SEND_CLIENT_HELLO_A             (0x10|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_HELLO_B             (0x11|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_HELLO_A              (0x20|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_HELLO_B              (0x21|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_MASTER_KEY_A        (0x30|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_MASTER_KEY_B        (0x31|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_FINISHED_A          (0x40|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_FINISHED_B          (0x41|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_CERTIFICATE_A       (0x50|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_CERTIFICATE_B       (0x51|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_CERTIFICATE_C       (0x52|SSL_ST_CONNECT)
-# define SSL2_ST_SEND_CLIENT_CERTIFICATE_D       (0x53|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_VERIFY_A             (0x60|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_VERIFY_B             (0x61|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_FINISHED_A           (0x70|SSL_ST_CONNECT)
-# define SSL2_ST_GET_SERVER_FINISHED_B           (0x71|SSL_ST_CONNECT)
-# define SSL2_ST_CLIENT_START_ENCRYPTION         (0x80|SSL_ST_CONNECT)
-# define SSL2_ST_X509_GET_CLIENT_CERTIFICATE     (0x90|SSL_ST_CONNECT)
-/* server */
-# define SSL2_ST_GET_CLIENT_HELLO_A              (0x10|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_HELLO_B              (0x11|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_HELLO_C              (0x12|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_HELLO_A             (0x20|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_HELLO_B             (0x21|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_MASTER_KEY_A         (0x30|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_MASTER_KEY_B         (0x31|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_VERIFY_A            (0x40|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_VERIFY_B            (0x41|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_VERIFY_C            (0x42|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_FINISHED_A           (0x50|SSL_ST_ACCEPT)
-# define SSL2_ST_GET_CLIENT_FINISHED_B           (0x51|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_FINISHED_A          (0x60|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_SERVER_FINISHED_B          (0x61|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_REQUEST_CERTIFICATE_A      (0x70|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_REQUEST_CERTIFICATE_B      (0x71|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_REQUEST_CERTIFICATE_C      (0x72|SSL_ST_ACCEPT)
-# define SSL2_ST_SEND_REQUEST_CERTIFICATE_D      (0x73|SSL_ST_ACCEPT)
-# define SSL2_ST_SERVER_START_ENCRYPTION         (0x80|SSL_ST_ACCEPT)
-# define SSL2_ST_X509_GET_SERVER_CERTIFICATE     (0x90|SSL_ST_ACCEPT)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ssl23.h b/include.new/openssl/ssl23.h
deleted file mode 100644
index 9de4685..0000000
--- a/include.new/openssl/ssl23.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ssl/ssl23.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_SSL23_H
-# define HEADER_SSL23_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * client
- */
-/* write to server */
-# define SSL23_ST_CW_CLNT_HELLO_A        (0x210|SSL_ST_CONNECT)
-# define SSL23_ST_CW_CLNT_HELLO_B        (0x211|SSL_ST_CONNECT)
-/* read from server */
-# define SSL23_ST_CR_SRVR_HELLO_A        (0x220|SSL_ST_CONNECT)
-# define SSL23_ST_CR_SRVR_HELLO_B        (0x221|SSL_ST_CONNECT)
-
-/* server */
-/* read from client */
-# define SSL23_ST_SR_CLNT_HELLO_A        (0x210|SSL_ST_ACCEPT)
-# define SSL23_ST_SR_CLNT_HELLO_B        (0x211|SSL_ST_ACCEPT)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ssl3.h b/include.new/openssl/ssl3.h
deleted file mode 100644
index 2dd5462..0000000
--- a/include.new/openssl/ssl3.h
+++ /dev/null
@@ -1,730 +0,0 @@
-/* ssl/ssl3.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECC cipher suite support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_SSL3_H
-# define HEADER_SSL3_H
-
-# ifndef OPENSSL_NO_COMP
-#  include <openssl/comp.h>
-# endif
-# include <openssl/buffer.h>
-# include <openssl/evp.h>
-# include <openssl/ssl.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * Signalling cipher suite value from RFC 5746
- * (TLS_EMPTY_RENEGOTIATION_INFO_SCSV)
- */
-# define SSL3_CK_SCSV                            0x030000FF
-
-/*
- * Signalling cipher suite value from draft-ietf-tls-downgrade-scsv-00
- * (TLS_FALLBACK_SCSV)
- */
-# define SSL3_CK_FALLBACK_SCSV                   0x03005600
-
-# define SSL3_CK_RSA_NULL_MD5                    0x03000001
-# define SSL3_CK_RSA_NULL_SHA                    0x03000002
-# define SSL3_CK_RSA_RC4_40_MD5                  0x03000003
-# define SSL3_CK_RSA_RC4_128_MD5                 0x03000004
-# define SSL3_CK_RSA_RC4_128_SHA                 0x03000005
-# define SSL3_CK_RSA_RC2_40_MD5                  0x03000006
-# define SSL3_CK_RSA_IDEA_128_SHA                0x03000007
-# define SSL3_CK_RSA_DES_40_CBC_SHA              0x03000008
-# define SSL3_CK_RSA_DES_64_CBC_SHA              0x03000009
-# define SSL3_CK_RSA_DES_192_CBC3_SHA            0x0300000A
-
-# define SSL3_CK_DH_DSS_DES_40_CBC_SHA           0x0300000B
-# define SSL3_CK_DH_DSS_DES_64_CBC_SHA           0x0300000C
-# define SSL3_CK_DH_DSS_DES_192_CBC3_SHA         0x0300000D
-# define SSL3_CK_DH_RSA_DES_40_CBC_SHA           0x0300000E
-# define SSL3_CK_DH_RSA_DES_64_CBC_SHA           0x0300000F
-# define SSL3_CK_DH_RSA_DES_192_CBC3_SHA         0x03000010
-
-# define SSL3_CK_EDH_DSS_DES_40_CBC_SHA          0x03000011
-# define SSL3_CK_EDH_DSS_DES_64_CBC_SHA          0x03000012
-# define SSL3_CK_EDH_DSS_DES_192_CBC3_SHA        0x03000013
-# define SSL3_CK_EDH_RSA_DES_40_CBC_SHA          0x03000014
-# define SSL3_CK_EDH_RSA_DES_64_CBC_SHA          0x03000015
-# define SSL3_CK_EDH_RSA_DES_192_CBC3_SHA        0x03000016
-
-# define SSL3_CK_ADH_RC4_40_MD5                  0x03000017
-# define SSL3_CK_ADH_RC4_128_MD5                 0x03000018
-# define SSL3_CK_ADH_DES_40_CBC_SHA              0x03000019
-# define SSL3_CK_ADH_DES_64_CBC_SHA              0x0300001A
-# define SSL3_CK_ADH_DES_192_CBC_SHA             0x0300001B
-
-# if 0
-#  define SSL3_CK_FZA_DMS_NULL_SHA                0x0300001C
-#  define SSL3_CK_FZA_DMS_FZA_SHA                 0x0300001D
-#  if 0                         /* Because it clashes with KRB5, is never
-                                 * used any more, and is safe to remove
-                                 * according to David Hopwood
-                                 * <david.hopwood@zetnet.co.uk> of the
-                                 * ietf-tls list */
-#   define SSL3_CK_FZA_DMS_RC4_SHA                 0x0300001E
-#  endif
-# endif
-
-/*
- * VRS Additional Kerberos5 entries
- */
-# define SSL3_CK_KRB5_DES_64_CBC_SHA             0x0300001E
-# define SSL3_CK_KRB5_DES_192_CBC3_SHA           0x0300001F
-# define SSL3_CK_KRB5_RC4_128_SHA                0x03000020
-# define SSL3_CK_KRB5_IDEA_128_CBC_SHA           0x03000021
-# define SSL3_CK_KRB5_DES_64_CBC_MD5             0x03000022
-# define SSL3_CK_KRB5_DES_192_CBC3_MD5           0x03000023
-# define SSL3_CK_KRB5_RC4_128_MD5                0x03000024
-# define SSL3_CK_KRB5_IDEA_128_CBC_MD5           0x03000025
-
-# define SSL3_CK_KRB5_DES_40_CBC_SHA             0x03000026
-# define SSL3_CK_KRB5_RC2_40_CBC_SHA             0x03000027
-# define SSL3_CK_KRB5_RC4_40_SHA                 0x03000028
-# define SSL3_CK_KRB5_DES_40_CBC_MD5             0x03000029
-# define SSL3_CK_KRB5_RC2_40_CBC_MD5             0x0300002A
-# define SSL3_CK_KRB5_RC4_40_MD5                 0x0300002B
-
-# define SSL3_TXT_RSA_NULL_MD5                   "NULL-MD5"
-# define SSL3_TXT_RSA_NULL_SHA                   "NULL-SHA"
-# define SSL3_TXT_RSA_RC4_40_MD5                 "EXP-RC4-MD5"
-# define SSL3_TXT_RSA_RC4_128_MD5                "RC4-MD5"
-# define SSL3_TXT_RSA_RC4_128_SHA                "RC4-SHA"
-# define SSL3_TXT_RSA_RC2_40_MD5                 "EXP-RC2-CBC-MD5"
-# define SSL3_TXT_RSA_IDEA_128_SHA               "IDEA-CBC-SHA"
-# define SSL3_TXT_RSA_DES_40_CBC_SHA             "EXP-DES-CBC-SHA"
-# define SSL3_TXT_RSA_DES_64_CBC_SHA             "DES-CBC-SHA"
-# define SSL3_TXT_RSA_DES_192_CBC3_SHA           "DES-CBC3-SHA"
-
-# define SSL3_TXT_DH_DSS_DES_40_CBC_SHA          "EXP-DH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DH_DSS_DES_64_CBC_SHA          "DH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_DH_DSS_DES_192_CBC3_SHA        "DH-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_DH_RSA_DES_40_CBC_SHA          "EXP-DH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DH_RSA_DES_64_CBC_SHA          "DH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_DH_RSA_DES_192_CBC3_SHA        "DH-RSA-DES-CBC3-SHA"
-
-# define SSL3_TXT_EDH_DSS_DES_40_CBC_SHA         "EXP-EDH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_EDH_DSS_DES_64_CBC_SHA         "EDH-DSS-DES-CBC-SHA"
-# define SSL3_TXT_EDH_DSS_DES_192_CBC3_SHA       "EDH-DSS-DES-CBC3-SHA"
-# define SSL3_TXT_EDH_RSA_DES_40_CBC_SHA         "EXP-EDH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_EDH_RSA_DES_64_CBC_SHA         "EDH-RSA-DES-CBC-SHA"
-# define SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA       "EDH-RSA-DES-CBC3-SHA"
-
-# define SSL3_TXT_ADH_RC4_40_MD5                 "EXP-ADH-RC4-MD5"
-# define SSL3_TXT_ADH_RC4_128_MD5                "ADH-RC4-MD5"
-# define SSL3_TXT_ADH_DES_40_CBC_SHA             "EXP-ADH-DES-CBC-SHA"
-# define SSL3_TXT_ADH_DES_64_CBC_SHA             "ADH-DES-CBC-SHA"
-# define SSL3_TXT_ADH_DES_192_CBC_SHA            "ADH-DES-CBC3-SHA"
-
-# if 0
-#  define SSL3_TXT_FZA_DMS_NULL_SHA               "FZA-NULL-SHA"
-#  define SSL3_TXT_FZA_DMS_FZA_SHA                "FZA-FZA-CBC-SHA"
-#  define SSL3_TXT_FZA_DMS_RC4_SHA                "FZA-RC4-SHA"
-# endif
-
-# define SSL3_TXT_KRB5_DES_64_CBC_SHA            "KRB5-DES-CBC-SHA"
-# define SSL3_TXT_KRB5_DES_192_CBC3_SHA          "KRB5-DES-CBC3-SHA"
-# define SSL3_TXT_KRB5_RC4_128_SHA               "KRB5-RC4-SHA"
-# define SSL3_TXT_KRB5_IDEA_128_CBC_SHA          "KRB5-IDEA-CBC-SHA"
-# define SSL3_TXT_KRB5_DES_64_CBC_MD5            "KRB5-DES-CBC-MD5"
-# define SSL3_TXT_KRB5_DES_192_CBC3_MD5          "KRB5-DES-CBC3-MD5"
-# define SSL3_TXT_KRB5_RC4_128_MD5               "KRB5-RC4-MD5"
-# define SSL3_TXT_KRB5_IDEA_128_CBC_MD5          "KRB5-IDEA-CBC-MD5"
-
-# define SSL3_TXT_KRB5_DES_40_CBC_SHA            "EXP-KRB5-DES-CBC-SHA"
-# define SSL3_TXT_KRB5_RC2_40_CBC_SHA            "EXP-KRB5-RC2-CBC-SHA"
-# define SSL3_TXT_KRB5_RC4_40_SHA                "EXP-KRB5-RC4-SHA"
-# define SSL3_TXT_KRB5_DES_40_CBC_MD5            "EXP-KRB5-DES-CBC-MD5"
-# define SSL3_TXT_KRB5_RC2_40_CBC_MD5            "EXP-KRB5-RC2-CBC-MD5"
-# define SSL3_TXT_KRB5_RC4_40_MD5                "EXP-KRB5-RC4-MD5"
-
-# define SSL3_SSL_SESSION_ID_LENGTH              32
-# define SSL3_MAX_SSL_SESSION_ID_LENGTH          32
-
-# define SSL3_MASTER_SECRET_SIZE                 48
-# define SSL3_RANDOM_SIZE                        32
-# define SSL3_SESSION_ID_SIZE                    32
-# define SSL3_RT_HEADER_LENGTH                   5
-
-# ifndef SSL3_ALIGN_PAYLOAD
- /*
-  * Some will argue that this increases memory footprint, but it's not
-  * actually true. Point is that malloc has to return at least 64-bit aligned
-  * pointers, meaning that allocating 5 bytes wastes 3 bytes in either case.
-  * Suggested pre-gaping simply moves these wasted bytes from the end of
-  * allocated region to its front, but makes data payload aligned, which
-  * improves performance:-)
-  */
-#  define SSL3_ALIGN_PAYLOAD                     8
-# else
-#  if (SSL3_ALIGN_PAYLOAD&(SSL3_ALIGN_PAYLOAD-1))!=0
-#   error "insane SSL3_ALIGN_PAYLOAD"
-#   undef SSL3_ALIGN_PAYLOAD
-#  endif
-# endif
-
-/*
- * This is the maximum MAC (digest) size used by the SSL library. Currently
- * maximum of 20 is used by SHA1, but we reserve for future extension for
- * 512-bit hashes.
- */
-
-# define SSL3_RT_MAX_MD_SIZE                     64
-
-/*
- * Maximum block size used in all ciphersuites. Currently 16 for AES.
- */
-
-# define SSL_RT_MAX_CIPHER_BLOCK_SIZE            16
-
-# define SSL3_RT_MAX_EXTRA                       (16384)
-
-/* Maximum plaintext length: defined by SSL/TLS standards */
-# define SSL3_RT_MAX_PLAIN_LENGTH                16384
-/* Maximum compression overhead: defined by SSL/TLS standards */
-# define SSL3_RT_MAX_COMPRESSED_OVERHEAD         1024
-
-/*
- * The standards give a maximum encryption overhead of 1024 bytes. In
- * practice the value is lower than this. The overhead is the maximum number
- * of padding bytes (256) plus the mac size.
- */
-# define SSL3_RT_MAX_ENCRYPTED_OVERHEAD  (256 + SSL3_RT_MAX_MD_SIZE)
-
-/*
- * OpenSSL currently only uses a padding length of at most one block so the
- * send overhead is smaller.
- */
-
-# define SSL3_RT_SEND_MAX_ENCRYPTED_OVERHEAD \
-                        (SSL_RT_MAX_CIPHER_BLOCK_SIZE + SSL3_RT_MAX_MD_SIZE)
-
-/* If compression isn't used don't include the compression overhead */
-
-# ifdef OPENSSL_NO_COMP
-#  define SSL3_RT_MAX_COMPRESSED_LENGTH           SSL3_RT_MAX_PLAIN_LENGTH
-# else
-#  define SSL3_RT_MAX_COMPRESSED_LENGTH   \
-                (SSL3_RT_MAX_PLAIN_LENGTH+SSL3_RT_MAX_COMPRESSED_OVERHEAD)
-# endif
-# define SSL3_RT_MAX_ENCRYPTED_LENGTH    \
-                (SSL3_RT_MAX_ENCRYPTED_OVERHEAD+SSL3_RT_MAX_COMPRESSED_LENGTH)
-# define SSL3_RT_MAX_PACKET_SIZE         \
-                (SSL3_RT_MAX_ENCRYPTED_LENGTH+SSL3_RT_HEADER_LENGTH)
-
-# define SSL3_MD_CLIENT_FINISHED_CONST   "\x43\x4C\x4E\x54"
-# define SSL3_MD_SERVER_FINISHED_CONST   "\x53\x52\x56\x52"
-
-# define SSL3_VERSION                    0x0300
-# define SSL3_VERSION_MAJOR              0x03
-# define SSL3_VERSION_MINOR              0x00
-
-# define SSL3_RT_CHANGE_CIPHER_SPEC      20
-# define SSL3_RT_ALERT                   21
-# define SSL3_RT_HANDSHAKE               22
-# define SSL3_RT_APPLICATION_DATA        23
-# define TLS1_RT_HEARTBEAT               24
-
-# define SSL3_AL_WARNING                 1
-# define SSL3_AL_FATAL                   2
-
-# define SSL3_AD_CLOSE_NOTIFY             0
-# define SSL3_AD_UNEXPECTED_MESSAGE      10/* fatal */
-# define SSL3_AD_BAD_RECORD_MAC          20/* fatal */
-# define SSL3_AD_DECOMPRESSION_FAILURE   30/* fatal */
-# define SSL3_AD_HANDSHAKE_FAILURE       40/* fatal */
-# define SSL3_AD_NO_CERTIFICATE          41
-# define SSL3_AD_BAD_CERTIFICATE         42
-# define SSL3_AD_UNSUPPORTED_CERTIFICATE 43
-# define SSL3_AD_CERTIFICATE_REVOKED     44
-# define SSL3_AD_CERTIFICATE_EXPIRED     45
-# define SSL3_AD_CERTIFICATE_UNKNOWN     46
-# define SSL3_AD_ILLEGAL_PARAMETER       47/* fatal */
-
-# define TLS1_HB_REQUEST         1
-# define TLS1_HB_RESPONSE        2
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct ssl3_record_st {
-    /* type of record */
-    /*
-     * r
-     */ int type;
-    /* How many bytes available */
-    /*
-     * rw
-     */ unsigned int length;
-    /* read/write offset into 'buf' */
-    /*
-     * r
-     */ unsigned int off;
-    /* pointer to the record data */
-    /*
-     * rw
-     */ unsigned char *data;
-    /* where the decode bytes are */
-    /*
-     * rw
-     */ unsigned char *input;
-    /* only used with decompression - malloc()ed */
-    /*
-     * r
-     */ unsigned char *comp;
-    /* epoch number, needed by DTLS1 */
-    /*
-     * r
-     */ unsigned long epoch;
-    /* sequence number, needed by DTLS1 */
-    /*
-     * r
-     */ unsigned char seq_num[8];
-} SSL3_RECORD;
-
-typedef struct ssl3_buffer_st {
-    /* at least SSL3_RT_MAX_PACKET_SIZE bytes, see ssl3_setup_buffers() */
-    unsigned char *buf;
-    /* buffer size */
-    size_t len;
-    /* where to 'copy from' */
-    int offset;
-    /* how many bytes left */
-    int left;
-} SSL3_BUFFER;
-
-# endif
-
-# define SSL3_CT_RSA_SIGN                        1
-# define SSL3_CT_DSS_SIGN                        2
-# define SSL3_CT_RSA_FIXED_DH                    3
-# define SSL3_CT_DSS_FIXED_DH                    4
-# define SSL3_CT_RSA_EPHEMERAL_DH                5
-# define SSL3_CT_DSS_EPHEMERAL_DH                6
-# define SSL3_CT_FORTEZZA_DMS                    20
-/*
- * SSL3_CT_NUMBER is used to size arrays and it must be large enough to
- * contain all of the cert types defined either for SSLv3 and TLSv1.
- */
-# define SSL3_CT_NUMBER                  9
-
-# define SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS       0x0001
-# define SSL3_FLAGS_DELAY_CLIENT_FINISHED        0x0002
-# define SSL3_FLAGS_POP_BUFFER                   0x0004
-# define TLS1_FLAGS_TLS_PADDING_BUG              0x0008
-# define TLS1_FLAGS_SKIP_CERT_VERIFY             0x0010
-# define TLS1_FLAGS_KEEP_HANDSHAKE               0x0020
-/*
- * Set when the handshake is ready to process peer's ChangeCipherSpec message.
- * Cleared after the message has been processed.
- */
-# define SSL3_FLAGS_CCS_OK                       0x0080
-
-/*
- * SSL3_FLAGS_SGC_RESTART_DONE is set when we restart a handshake because of
- * MS SGC and so prevents us from restarting the handshake in a loop. It's
- * reset on a renegotiation, so effectively limits the client to one restart
- * per negotiation. This limits the possibility of a DDoS attack where the
- * client handshakes in a loop using SGC to restart. Servers which permit
- * renegotiation can still be effected, but we can't prevent that.
- */
-# define SSL3_FLAGS_SGC_RESTART_DONE             0x0040
-
-# ifndef OPENSSL_NO_SSL_INTERN
-
-typedef struct ssl3_state_st {
-    long flags;
-    int delay_buf_pop_ret;
-    unsigned char read_sequence[8];
-    int read_mac_secret_size;
-    unsigned char read_mac_secret[EVP_MAX_MD_SIZE];
-    unsigned char write_sequence[8];
-    int write_mac_secret_size;
-    unsigned char write_mac_secret[EVP_MAX_MD_SIZE];
-    unsigned char server_random[SSL3_RANDOM_SIZE];
-    unsigned char client_random[SSL3_RANDOM_SIZE];
-    /* flags for countermeasure against known-IV weakness */
-    int need_empty_fragments;
-    int empty_fragment_done;
-    /* The value of 'extra' when the buffers were initialized */
-    int init_extra;
-    SSL3_BUFFER rbuf;           /* read IO goes into here */
-    SSL3_BUFFER wbuf;           /* write IO goes into here */
-    SSL3_RECORD rrec;           /* each decoded record goes in here */
-    SSL3_RECORD wrec;           /* goes out from here */
-    /*
-     * storage for Alert/Handshake protocol data received but not yet
-     * processed by ssl3_read_bytes:
-     */
-    unsigned char alert_fragment[2];
-    unsigned int alert_fragment_len;
-    unsigned char handshake_fragment[4];
-    unsigned int handshake_fragment_len;
-    /* partial write - check the numbers match */
-    unsigned int wnum;          /* number of bytes sent so far */
-    int wpend_tot;              /* number bytes written */
-    int wpend_type;
-    int wpend_ret;              /* number of bytes submitted */
-    const unsigned char *wpend_buf;
-    /* used during startup, digest all incoming/outgoing packets */
-    BIO *handshake_buffer;
-    /*
-     * When set of handshake digests is determined, buffer is hashed and
-     * freed and MD_CTX-es for all required digests are stored in this array
-     */
-    EVP_MD_CTX **handshake_dgst;
-    /*
-     * Set whenever an expected ChangeCipherSpec message is processed.
-     * Unset when the peer's Finished message is received.
-     * Unexpected ChangeCipherSpec messages trigger a fatal alert.
-     */
-    int change_cipher_spec;
-    int warn_alert;
-    int fatal_alert;
-    /*
-     * we allow one fatal and one warning alert to be outstanding, send close
-     * alert via the warning alert
-     */
-    int alert_dispatch;
-    unsigned char send_alert[2];
-    /*
-     * This flag is set when we should renegotiate ASAP, basically when there
-     * is no more data in the read or write buffers
-     */
-    int renegotiate;
-    int total_renegotiations;
-    int num_renegotiations;
-    int in_read_app_data;
-    /*
-     * Opaque PRF input as used for the current handshake. These fields are
-     * used only if TLSEXT_TYPE_opaque_prf_input is defined (otherwise, they
-     * are merely present to improve binary compatibility)
-     */
-    void *client_opaque_prf_input;
-    size_t client_opaque_prf_input_len;
-    void *server_opaque_prf_input;
-    size_t server_opaque_prf_input_len;
-    struct {
-        /* actually only needs to be 16+20 */
-        unsigned char cert_verify_md[EVP_MAX_MD_SIZE * 2];
-        /* actually only need to be 16+20 for SSLv3 and 12 for TLS */
-        unsigned char finish_md[EVP_MAX_MD_SIZE * 2];
-        int finish_md_len;
-        unsigned char peer_finish_md[EVP_MAX_MD_SIZE * 2];
-        int peer_finish_md_len;
-        unsigned long message_size;
-        int message_type;
-        /* used to hold the new cipher we are going to use */
-        const SSL_CIPHER *new_cipher;
-#  ifndef OPENSSL_NO_DH
-        DH *dh;
-#  endif
-#  ifndef OPENSSL_NO_ECDH
-        EC_KEY *ecdh;           /* holds short lived ECDH key */
-#  endif
-        /* used when SSL_ST_FLUSH_DATA is entered */
-        int next_state;
-        int reuse_message;
-        /* used for certificate requests */
-        int cert_req;
-        int ctype_num;
-        char ctype[SSL3_CT_NUMBER];
-        STACK_OF(X509_NAME) *ca_names;
-        int use_rsa_tmp;
-        int key_block_length;
-        unsigned char *key_block;
-        const EVP_CIPHER *new_sym_enc;
-        const EVP_MD *new_hash;
-        int new_mac_pkey_type;
-        int new_mac_secret_size;
-#  ifndef OPENSSL_NO_COMP
-        const SSL_COMP *new_compression;
-#  else
-        char *new_compression;
-#  endif
-        int cert_request;
-    } tmp;
-
-    /* Connection binding to prevent renegotiation attacks */
-    unsigned char previous_client_finished[EVP_MAX_MD_SIZE];
-    unsigned char previous_client_finished_len;
-    unsigned char previous_server_finished[EVP_MAX_MD_SIZE];
-    unsigned char previous_server_finished_len;
-    int send_connection_binding; /* TODOEKR */
-
-#  ifndef OPENSSL_NO_NEXTPROTONEG
-    /*
-     * Set if we saw the Next Protocol Negotiation extension from our peer.
-     */
-    int next_proto_neg_seen;
-#  endif
-
-#  ifndef OPENSSL_NO_TLSEXT
-#   ifndef OPENSSL_NO_EC
-    /*
-     * This is set to true if we believe that this is a version of Safari
-     * running on OS X 10.6 or newer. We wish to know this because Safari on
-     * 10.8 .. 10.8.3 has broken ECDHE-ECDSA support.
-     */
-    char is_probably_safari;
-#   endif                       /* !OPENSSL_NO_EC */
-#  endif                        /* !OPENSSL_NO_TLSEXT */
-} SSL3_STATE;
-
-# endif
-
-/* SSLv3 */
-/*
- * client
- */
-/* extra state */
-# define SSL3_ST_CW_FLUSH                (0x100|SSL_ST_CONNECT)
-# ifndef OPENSSL_NO_SCTP
-#  define DTLS1_SCTP_ST_CW_WRITE_SOCK                     (0x310|SSL_ST_CONNECT)
-#  define DTLS1_SCTP_ST_CR_READ_SOCK                      (0x320|SSL_ST_CONNECT)
-# endif
-/* write to server */
-# define SSL3_ST_CW_CLNT_HELLO_A         (0x110|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CLNT_HELLO_B         (0x111|SSL_ST_CONNECT)
-/* read from server */
-# define SSL3_ST_CR_SRVR_HELLO_A         (0x120|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SRVR_HELLO_B         (0x121|SSL_ST_CONNECT)
-# define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT)
-# define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_A               (0x130|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_B               (0x131|SSL_ST_CONNECT)
-# define SSL3_ST_CR_KEY_EXCH_A           (0x140|SSL_ST_CONNECT)
-# define SSL3_ST_CR_KEY_EXCH_B           (0x141|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_REQ_A           (0x150|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_REQ_B           (0x151|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SRVR_DONE_A          (0x160|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SRVR_DONE_B          (0x161|SSL_ST_CONNECT)
-/* write to server */
-# define SSL3_ST_CW_CERT_A               (0x170|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_B               (0x171|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_C               (0x172|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_D               (0x173|SSL_ST_CONNECT)
-# define SSL3_ST_CW_KEY_EXCH_A           (0x180|SSL_ST_CONNECT)
-# define SSL3_ST_CW_KEY_EXCH_B           (0x181|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_VRFY_A          (0x190|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CERT_VRFY_B          (0x191|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CHANGE_A             (0x1A0|SSL_ST_CONNECT)
-# define SSL3_ST_CW_CHANGE_B             (0x1A1|SSL_ST_CONNECT)
-# ifndef OPENSSL_NO_NEXTPROTONEG
-#  define SSL3_ST_CW_NEXT_PROTO_A         (0x200|SSL_ST_CONNECT)
-#  define SSL3_ST_CW_NEXT_PROTO_B         (0x201|SSL_ST_CONNECT)
-# endif
-# define SSL3_ST_CW_FINISHED_A           (0x1B0|SSL_ST_CONNECT)
-# define SSL3_ST_CW_FINISHED_B           (0x1B1|SSL_ST_CONNECT)
-/* read from server */
-# define SSL3_ST_CR_CHANGE_A             (0x1C0|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CHANGE_B             (0x1C1|SSL_ST_CONNECT)
-# define SSL3_ST_CR_FINISHED_A           (0x1D0|SSL_ST_CONNECT)
-# define SSL3_ST_CR_FINISHED_B           (0x1D1|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SESSION_TICKET_A     (0x1E0|SSL_ST_CONNECT)
-# define SSL3_ST_CR_SESSION_TICKET_B     (0x1E1|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_STATUS_A        (0x1F0|SSL_ST_CONNECT)
-# define SSL3_ST_CR_CERT_STATUS_B        (0x1F1|SSL_ST_CONNECT)
-
-/* server */
-/* extra state */
-# define SSL3_ST_SW_FLUSH                (0x100|SSL_ST_ACCEPT)
-# ifndef OPENSSL_NO_SCTP
-#  define DTLS1_SCTP_ST_SW_WRITE_SOCK                     (0x310|SSL_ST_ACCEPT)
-#  define DTLS1_SCTP_ST_SR_READ_SOCK                      (0x320|SSL_ST_ACCEPT)
-# endif
-/* read from client */
-/* Do not change the number values, they do matter */
-# define SSL3_ST_SR_CLNT_HELLO_A         (0x110|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CLNT_HELLO_B         (0x111|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CLNT_HELLO_C         (0x112|SSL_ST_ACCEPT)
-/* write to client */
-# define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT)
-# define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_HELLO_REQ_A          (0x120|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_HELLO_REQ_B          (0x121|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_HELLO_REQ_C          (0x122|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SRVR_HELLO_A         (0x130|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SRVR_HELLO_B         (0x131|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_A               (0x140|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_B               (0x141|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_KEY_EXCH_A           (0x150|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_KEY_EXCH_B           (0x151|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_REQ_A           (0x160|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_REQ_B           (0x161|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SRVR_DONE_A          (0x170|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SRVR_DONE_B          (0x171|SSL_ST_ACCEPT)
-/* read from client */
-# define SSL3_ST_SR_CERT_A               (0x180|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CERT_B               (0x181|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_KEY_EXCH_A           (0x190|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_KEY_EXCH_B           (0x191|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CERT_VRFY_A          (0x1A0|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CERT_VRFY_B          (0x1A1|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CHANGE_A             (0x1B0|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_CHANGE_B             (0x1B1|SSL_ST_ACCEPT)
-# ifndef OPENSSL_NO_NEXTPROTONEG
-#  define SSL3_ST_SR_NEXT_PROTO_A         (0x210|SSL_ST_ACCEPT)
-#  define SSL3_ST_SR_NEXT_PROTO_B         (0x211|SSL_ST_ACCEPT)
-# endif
-# define SSL3_ST_SR_FINISHED_A           (0x1C0|SSL_ST_ACCEPT)
-# define SSL3_ST_SR_FINISHED_B           (0x1C1|SSL_ST_ACCEPT)
-/* write to client */
-# define SSL3_ST_SW_CHANGE_A             (0x1D0|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CHANGE_B             (0x1D1|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_FINISHED_A           (0x1E0|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_FINISHED_B           (0x1E1|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SESSION_TICKET_A     (0x1F0|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_SESSION_TICKET_B     (0x1F1|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_STATUS_A        (0x200|SSL_ST_ACCEPT)
-# define SSL3_ST_SW_CERT_STATUS_B        (0x201|SSL_ST_ACCEPT)
-
-# define SSL3_MT_HELLO_REQUEST                   0
-# define SSL3_MT_CLIENT_HELLO                    1
-# define SSL3_MT_SERVER_HELLO                    2
-# define SSL3_MT_NEWSESSION_TICKET               4
-# define SSL3_MT_CERTIFICATE                     11
-# define SSL3_MT_SERVER_KEY_EXCHANGE             12
-# define SSL3_MT_CERTIFICATE_REQUEST             13
-# define SSL3_MT_SERVER_DONE                     14
-# define SSL3_MT_CERTIFICATE_VERIFY              15
-# define SSL3_MT_CLIENT_KEY_EXCHANGE             16
-# define SSL3_MT_FINISHED                        20
-# define SSL3_MT_CERTIFICATE_STATUS              22
-# ifndef OPENSSL_NO_NEXTPROTONEG
-#  define SSL3_MT_NEXT_PROTO                      67
-# endif
-# define DTLS1_MT_HELLO_VERIFY_REQUEST    3
-
-# define SSL3_MT_CCS                             1
-
-/* These are used when changing over to a new cipher */
-# define SSL3_CC_READ            0x01
-# define SSL3_CC_WRITE           0x02
-# define SSL3_CC_CLIENT          0x10
-# define SSL3_CC_SERVER          0x20
-# define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE)
-# define SSL3_CHANGE_CIPHER_SERVER_READ  (SSL3_CC_SERVER|SSL3_CC_READ)
-# define SSL3_CHANGE_CIPHER_CLIENT_READ  (SSL3_CC_CLIENT|SSL3_CC_READ)
-# define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE)
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/stack.h b/include.new/openssl/stack.h
deleted file mode 100644
index 8d6e939..0000000
--- a/include.new/openssl/stack.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* crypto/stack/stack.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_STACK_H
-# define HEADER_STACK_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef struct stack_st {
-    int num;
-    char **data;
-    int sorted;
-    int num_alloc;
-    int (*comp) (const void *, const void *);
-} _STACK;                       /* Use STACK_OF(...) instead */
-
-# define M_sk_num(sk)            ((sk) ? (sk)->num:-1)
-# define M_sk_value(sk,n)        ((sk) ? (sk)->data[n] : NULL)
-
-int sk_num(const _STACK *);
-void *sk_value(const _STACK *, int);
-
-void *sk_set(_STACK *, int, void *);
-
-_STACK *sk_new(int (*cmp) (const void *, const void *));
-_STACK *sk_new_null(void);
-void sk_free(_STACK *);
-void sk_pop_free(_STACK *st, void (*func) (void *));
-int sk_insert(_STACK *sk, void *data, int where);
-void *sk_delete(_STACK *st, int loc);
-void *sk_delete_ptr(_STACK *st, void *p);
-int sk_find(_STACK *st, void *data);
-int sk_find_ex(_STACK *st, void *data);
-int sk_push(_STACK *st, void *data);
-int sk_unshift(_STACK *st, void *data);
-void *sk_shift(_STACK *st);
-void *sk_pop(_STACK *st);
-void sk_zero(_STACK *st);
-int (*sk_set_cmp_func(_STACK *sk, int (*c) (const void *, const void *)))
- (const void *, const void *);
-_STACK *sk_dup(_STACK *st);
-void sk_sort(_STACK *st);
-int sk_is_sorted(const _STACK *st);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/symhacks.h b/include.new/openssl/symhacks.h
deleted file mode 100644
index 2eadf7f..0000000
--- a/include.new/openssl/symhacks.h
+++ /dev/null
@@ -1,486 +0,0 @@
-/* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_SYMHACKS_H
-# define HEADER_SYMHACKS_H
-
-# include <openssl/e_os2.h>
-
-/*
- * Hacks to solve the problem with linkers incapable of handling very long
- * symbol names.  In the case of VMS, the limit is 31 characters on VMS for
- * VAX.
- */
-/*
- * Note that this affects util/libeay.num and util/ssleay.num...  you may
- * change those manually, but that's not recommended, as those files are
- * controlled centrally and updated on Unix, and the central definition may
- * disagree with yours, which in turn may come with shareable library
- * incompatibilities.
- */
-# ifdef OPENSSL_SYS_VMS
-
-/* Hack a long name in crypto/ex_data.c */
-#  undef CRYPTO_get_ex_data_implementation
-#  define CRYPTO_get_ex_data_implementation       CRYPTO_get_ex_data_impl
-#  undef CRYPTO_set_ex_data_implementation
-#  define CRYPTO_set_ex_data_implementation       CRYPTO_set_ex_data_impl
-
-/* Hack a long name in crypto/asn1/a_mbstr.c */
-#  undef ASN1_STRING_set_default_mask_asc
-#  define ASN1_STRING_set_default_mask_asc        ASN1_STRING_set_def_mask_asc
-
-#  if 0                         /* No longer needed, since safestack macro
-                                 * magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_SIGNER_INFO) */
-#   undef i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO
-#   define i2d_ASN1_SET_OF_PKCS7_SIGNER_INFO       i2d_ASN1_SET_OF_PKCS7_SIGINF
-#   undef d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO
-#   define d2i_ASN1_SET_OF_PKCS7_SIGNER_INFO       d2i_ASN1_SET_OF_PKCS7_SIGINF
-#  endif
-
-#  if 0                         /* No longer needed, since safestack macro
-                                 * magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(PKCS7_RECIP_INFO) */
-#   undef i2d_ASN1_SET_OF_PKCS7_RECIP_INFO
-#   define i2d_ASN1_SET_OF_PKCS7_RECIP_INFO        i2d_ASN1_SET_OF_PKCS7_RECINF
-#   undef d2i_ASN1_SET_OF_PKCS7_RECIP_INFO
-#   define d2i_ASN1_SET_OF_PKCS7_RECIP_INFO        d2i_ASN1_SET_OF_PKCS7_RECINF
-#  endif
-
-#  if 0                         /* No longer needed, since safestack macro
-                                 * magic does the job */
-/* Hack the names created with DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION) */
-#   undef i2d_ASN1_SET_OF_ACCESS_DESCRIPTION
-#   define i2d_ASN1_SET_OF_ACCESS_DESCRIPTION      i2d_ASN1_SET_OF_ACC_DESC
-#   undef d2i_ASN1_SET_OF_ACCESS_DESCRIPTION
-#   define d2i_ASN1_SET_OF_ACCESS_DESCRIPTION      d2i_ASN1_SET_OF_ACC_DESC
-#  endif
-
-/* Hack the names created with DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE) */
-#  undef PEM_read_NETSCAPE_CERT_SEQUENCE
-#  define PEM_read_NETSCAPE_CERT_SEQUENCE         PEM_read_NS_CERT_SEQ
-#  undef PEM_write_NETSCAPE_CERT_SEQUENCE
-#  define PEM_write_NETSCAPE_CERT_SEQUENCE        PEM_write_NS_CERT_SEQ
-#  undef PEM_read_bio_NETSCAPE_CERT_SEQUENCE
-#  define PEM_read_bio_NETSCAPE_CERT_SEQUENCE     PEM_read_bio_NS_CERT_SEQ
-#  undef PEM_write_bio_NETSCAPE_CERT_SEQUENCE
-#  define PEM_write_bio_NETSCAPE_CERT_SEQUENCE    PEM_write_bio_NS_CERT_SEQ
-#  undef PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE
-#  define PEM_write_cb_bio_NETSCAPE_CERT_SEQUENCE PEM_write_cb_bio_NS_CERT_SEQ
-
-/* Hack the names created with DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO) */
-#  undef PEM_read_PKCS8_PRIV_KEY_INFO
-#  define PEM_read_PKCS8_PRIV_KEY_INFO            PEM_read_P8_PRIV_KEY_INFO
-#  undef PEM_write_PKCS8_PRIV_KEY_INFO
-#  define PEM_write_PKCS8_PRIV_KEY_INFO           PEM_write_P8_PRIV_KEY_INFO
-#  undef PEM_read_bio_PKCS8_PRIV_KEY_INFO
-#  define PEM_read_bio_PKCS8_PRIV_KEY_INFO        PEM_read_bio_P8_PRIV_KEY_INFO
-#  undef PEM_write_bio_PKCS8_PRIV_KEY_INFO
-#  define PEM_write_bio_PKCS8_PRIV_KEY_INFO       PEM_write_bio_P8_PRIV_KEY_INFO
-#  undef PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO
-#  define PEM_write_cb_bio_PKCS8_PRIV_KEY_INFO    PEM_wrt_cb_bio_P8_PRIV_KEY_INFO
-
-/* Hack other PEM names */
-#  undef PEM_write_bio_PKCS8PrivateKey_nid
-#  define PEM_write_bio_PKCS8PrivateKey_nid       PEM_write_bio_PKCS8PrivKey_nid
-
-/* Hack some long X509 names */
-#  undef X509_REVOKED_get_ext_by_critical
-#  define X509_REVOKED_get_ext_by_critical        X509_REVOKED_get_ext_by_critic
-#  undef X509_policy_tree_get0_user_policies
-#  define X509_policy_tree_get0_user_policies     X509_pcy_tree_get0_usr_policies
-#  undef X509_policy_node_get0_qualifiers
-#  define X509_policy_node_get0_qualifiers        X509_pcy_node_get0_qualifiers
-#  undef X509_STORE_CTX_get_explicit_policy
-#  define X509_STORE_CTX_get_explicit_policy      X509_STORE_CTX_get_expl_policy
-#  undef X509_STORE_CTX_get0_current_issuer
-#  define X509_STORE_CTX_get0_current_issuer      X509_STORE_CTX_get0_cur_issuer
-
-/* Hack some long CRYPTO names */
-#  undef CRYPTO_set_dynlock_destroy_callback
-#  define CRYPTO_set_dynlock_destroy_callback     CRYPTO_set_dynlock_destroy_cb
-#  undef CRYPTO_set_dynlock_create_callback
-#  define CRYPTO_set_dynlock_create_callback      CRYPTO_set_dynlock_create_cb
-#  undef CRYPTO_set_dynlock_lock_callback
-#  define CRYPTO_set_dynlock_lock_callback        CRYPTO_set_dynlock_lock_cb
-#  undef CRYPTO_get_dynlock_lock_callback
-#  define CRYPTO_get_dynlock_lock_callback        CRYPTO_get_dynlock_lock_cb
-#  undef CRYPTO_get_dynlock_destroy_callback
-#  define CRYPTO_get_dynlock_destroy_callback     CRYPTO_get_dynlock_destroy_cb
-#  undef CRYPTO_get_dynlock_create_callback
-#  define CRYPTO_get_dynlock_create_callback      CRYPTO_get_dynlock_create_cb
-#  undef CRYPTO_set_locked_mem_ex_functions
-#  define CRYPTO_set_locked_mem_ex_functions      CRYPTO_set_locked_mem_ex_funcs
-#  undef CRYPTO_get_locked_mem_ex_functions
-#  define CRYPTO_get_locked_mem_ex_functions      CRYPTO_get_locked_mem_ex_funcs
-
-/* Hack some long SSL names */
-#  undef SSL_CTX_set_default_verify_paths
-#  define SSL_CTX_set_default_verify_paths        SSL_CTX_set_def_verify_paths
-#  undef SSL_get_ex_data_X509_STORE_CTX_idx
-#  define SSL_get_ex_data_X509_STORE_CTX_idx      SSL_get_ex_d_X509_STORE_CTX_idx
-#  undef SSL_add_file_cert_subjects_to_stack
-#  define SSL_add_file_cert_subjects_to_stack     SSL_add_file_cert_subjs_to_stk
-#  undef SSL_add_dir_cert_subjects_to_stack
-#  define SSL_add_dir_cert_subjects_to_stack      SSL_add_dir_cert_subjs_to_stk
-#  undef SSL_CTX_use_certificate_chain_file
-#  define SSL_CTX_use_certificate_chain_file      SSL_CTX_use_cert_chain_file
-#  undef SSL_CTX_set_cert_verify_callback
-#  define SSL_CTX_set_cert_verify_callback        SSL_CTX_set_cert_verify_cb
-#  undef SSL_CTX_set_default_passwd_cb_userdata
-#  define SSL_CTX_set_default_passwd_cb_userdata  SSL_CTX_set_def_passwd_cb_ud
-#  undef SSL_COMP_get_compression_methods
-#  define SSL_COMP_get_compression_methods        SSL_COMP_get_compress_methods
-#  undef ssl_add_clienthello_renegotiate_ext
-#  define ssl_add_clienthello_renegotiate_ext     ssl_add_clienthello_reneg_ext
-#  undef ssl_add_serverhello_renegotiate_ext
-#  define ssl_add_serverhello_renegotiate_ext     ssl_add_serverhello_reneg_ext
-#  undef ssl_parse_clienthello_renegotiate_ext
-#  define ssl_parse_clienthello_renegotiate_ext   ssl_parse_clienthello_reneg_ext
-#  undef ssl_parse_serverhello_renegotiate_ext
-#  define ssl_parse_serverhello_renegotiate_ext   ssl_parse_serverhello_reneg_ext
-#  undef SSL_srp_server_param_with_username
-#  define SSL_srp_server_param_with_username      SSL_srp_server_param_with_un
-#  undef SSL_CTX_set_srp_client_pwd_callback
-#  define SSL_CTX_set_srp_client_pwd_callback     SSL_CTX_set_srp_client_pwd_cb
-#  undef SSL_CTX_set_srp_verify_param_callback
-#  define SSL_CTX_set_srp_verify_param_callback   SSL_CTX_set_srp_vfy_param_cb
-#  undef SSL_CTX_set_srp_username_callback
-#  define SSL_CTX_set_srp_username_callback       SSL_CTX_set_srp_un_cb
-#  undef ssl_add_clienthello_use_srtp_ext
-#  define ssl_add_clienthello_use_srtp_ext        ssl_add_clihello_use_srtp_ext
-#  undef ssl_add_serverhello_use_srtp_ext
-#  define ssl_add_serverhello_use_srtp_ext        ssl_add_serhello_use_srtp_ext
-#  undef ssl_parse_clienthello_use_srtp_ext
-#  define ssl_parse_clienthello_use_srtp_ext      ssl_parse_clihello_use_srtp_ext
-#  undef ssl_parse_serverhello_use_srtp_ext
-#  define ssl_parse_serverhello_use_srtp_ext      ssl_parse_serhello_use_srtp_ext
-#  undef SSL_CTX_set_next_protos_advertised_cb
-#  define SSL_CTX_set_next_protos_advertised_cb   SSL_CTX_set_next_protos_adv_cb
-#  undef SSL_CTX_set_next_proto_select_cb
-#  define SSL_CTX_set_next_proto_select_cb        SSL_CTX_set_next_proto_sel_cb
-#  undef ssl3_cbc_record_digest_supported
-#  define ssl3_cbc_record_digest_supported        ssl3_cbc_record_digest_support
-#  undef ssl_check_clienthello_tlsext_late
-#  define ssl_check_clienthello_tlsext_late       ssl_check_clihello_tlsext_late
-#  undef ssl_check_clienthello_tlsext_early
-#  define ssl_check_clienthello_tlsext_early      ssl_check_clihello_tlsext_early
-
-/* Hack some long ENGINE names */
-#  undef ENGINE_get_default_BN_mod_exp_crt
-#  define ENGINE_get_default_BN_mod_exp_crt       ENGINE_get_def_BN_mod_exp_crt
-#  undef ENGINE_set_default_BN_mod_exp_crt
-#  define ENGINE_set_default_BN_mod_exp_crt       ENGINE_set_def_BN_mod_exp_crt
-#  undef ENGINE_set_load_privkey_function
-#  define ENGINE_set_load_privkey_function        ENGINE_set_load_privkey_fn
-#  undef ENGINE_get_load_privkey_function
-#  define ENGINE_get_load_privkey_function        ENGINE_get_load_privkey_fn
-#  undef ENGINE_unregister_pkey_asn1_meths
-#  define ENGINE_unregister_pkey_asn1_meths       ENGINE_unreg_pkey_asn1_meths
-#  undef ENGINE_register_all_pkey_asn1_meths
-#  define ENGINE_register_all_pkey_asn1_meths     ENGINE_reg_all_pkey_asn1_meths
-#  undef ENGINE_set_default_pkey_asn1_meths
-#  define ENGINE_set_default_pkey_asn1_meths      ENGINE_set_def_pkey_asn1_meths
-#  undef ENGINE_get_pkey_asn1_meth_engine
-#  define ENGINE_get_pkey_asn1_meth_engine        ENGINE_get_pkey_asn1_meth_eng
-#  undef ENGINE_set_load_ssl_client_cert_function
-#  define ENGINE_set_load_ssl_client_cert_function \
-                                                ENGINE_set_ld_ssl_clnt_cert_fn
-#  undef ENGINE_get_ssl_client_cert_function
-#  define ENGINE_get_ssl_client_cert_function     ENGINE_get_ssl_client_cert_fn
-
-/* Hack some long OCSP names */
-#  undef OCSP_REQUEST_get_ext_by_critical
-#  define OCSP_REQUEST_get_ext_by_critical        OCSP_REQUEST_get_ext_by_crit
-#  undef OCSP_BASICRESP_get_ext_by_critical
-#  define OCSP_BASICRESP_get_ext_by_critical      OCSP_BASICRESP_get_ext_by_crit
-#  undef OCSP_SINGLERESP_get_ext_by_critical
-#  define OCSP_SINGLERESP_get_ext_by_critical     OCSP_SINGLERESP_get_ext_by_crit
-
-/* Hack some long DES names */
-#  undef _ossl_old_des_ede3_cfb64_encrypt
-#  define _ossl_old_des_ede3_cfb64_encrypt        _ossl_odes_ede3_cfb64_encrypt
-#  undef _ossl_old_des_ede3_ofb64_encrypt
-#  define _ossl_old_des_ede3_ofb64_encrypt        _ossl_odes_ede3_ofb64_encrypt
-
-/* Hack some long EVP names */
-#  undef OPENSSL_add_all_algorithms_noconf
-#  define OPENSSL_add_all_algorithms_noconf       OPENSSL_add_all_algo_noconf
-#  undef OPENSSL_add_all_algorithms_conf
-#  define OPENSSL_add_all_algorithms_conf         OPENSSL_add_all_algo_conf
-#  undef EVP_PKEY_meth_set_verify_recover
-#  define EVP_PKEY_meth_set_verify_recover        EVP_PKEY_meth_set_vrfy_recover
-
-/* Hack some long EC names */
-#  undef EC_GROUP_set_point_conversion_form
-#  define EC_GROUP_set_point_conversion_form      EC_GROUP_set_point_conv_form
-#  undef EC_GROUP_get_point_conversion_form
-#  define EC_GROUP_get_point_conversion_form      EC_GROUP_get_point_conv_form
-#  undef EC_GROUP_clear_free_all_extra_data
-#  define EC_GROUP_clear_free_all_extra_data      EC_GROUP_clr_free_all_xtra_data
-#  undef EC_KEY_set_public_key_affine_coordinates
-#  define EC_KEY_set_public_key_affine_coordinates \
-                                                EC_KEY_set_pub_key_aff_coords
-#  undef EC_POINT_set_Jprojective_coordinates_GFp
-#  define EC_POINT_set_Jprojective_coordinates_GFp \
-                                                EC_POINT_set_Jproj_coords_GFp
-#  undef EC_POINT_get_Jprojective_coordinates_GFp
-#  define EC_POINT_get_Jprojective_coordinates_GFp \
-                                                EC_POINT_get_Jproj_coords_GFp
-#  undef EC_POINT_set_affine_coordinates_GFp
-#  define EC_POINT_set_affine_coordinates_GFp     EC_POINT_set_affine_coords_GFp
-#  undef EC_POINT_get_affine_coordinates_GFp
-#  define EC_POINT_get_affine_coordinates_GFp     EC_POINT_get_affine_coords_GFp
-#  undef EC_POINT_set_compressed_coordinates_GFp
-#  define EC_POINT_set_compressed_coordinates_GFp EC_POINT_set_compr_coords_GFp
-#  undef EC_POINT_set_affine_coordinates_GF2m
-#  define EC_POINT_set_affine_coordinates_GF2m    EC_POINT_set_affine_coords_GF2m
-#  undef EC_POINT_get_affine_coordinates_GF2m
-#  define EC_POINT_get_affine_coordinates_GF2m    EC_POINT_get_affine_coords_GF2m
-#  undef EC_POINT_set_compressed_coordinates_GF2m
-#  define EC_POINT_set_compressed_coordinates_GF2m \
-                                                EC_POINT_set_compr_coords_GF2m
-#  undef ec_GF2m_simple_group_clear_finish
-#  define ec_GF2m_simple_group_clear_finish       ec_GF2m_simple_grp_clr_finish
-#  undef ec_GF2m_simple_group_check_discriminant
-#  define ec_GF2m_simple_group_check_discriminant ec_GF2m_simple_grp_chk_discrim
-#  undef ec_GF2m_simple_point_clear_finish
-#  define ec_GF2m_simple_point_clear_finish       ec_GF2m_simple_pt_clr_finish
-#  undef ec_GF2m_simple_point_set_to_infinity
-#  define ec_GF2m_simple_point_set_to_infinity    ec_GF2m_simple_pt_set_to_inf
-#  undef ec_GF2m_simple_points_make_affine
-#  define ec_GF2m_simple_points_make_affine       ec_GF2m_simple_pts_make_affine
-#  undef ec_GF2m_simple_point_set_affine_coordinates
-#  define ec_GF2m_simple_point_set_affine_coordinates \
-                                                ec_GF2m_smp_pt_set_af_coords
-#  undef ec_GF2m_simple_point_get_affine_coordinates
-#  define ec_GF2m_simple_point_get_affine_coordinates \
-                                                ec_GF2m_smp_pt_get_af_coords
-#  undef ec_GF2m_simple_set_compressed_coordinates
-#  define ec_GF2m_simple_set_compressed_coordinates \
-                                                ec_GF2m_smp_set_compr_coords
-#  undef ec_GFp_simple_group_set_curve_GFp
-#  define ec_GFp_simple_group_set_curve_GFp       ec_GFp_simple_grp_set_curve_GFp
-#  undef ec_GFp_simple_group_get_curve_GFp
-#  define ec_GFp_simple_group_get_curve_GFp       ec_GFp_simple_grp_get_curve_GFp
-#  undef ec_GFp_simple_group_clear_finish
-#  define ec_GFp_simple_group_clear_finish        ec_GFp_simple_grp_clear_finish
-#  undef ec_GFp_simple_group_set_generator
-#  define ec_GFp_simple_group_set_generator       ec_GFp_simple_grp_set_generator
-#  undef ec_GFp_simple_group_get0_generator
-#  define ec_GFp_simple_group_get0_generator      ec_GFp_simple_grp_gt0_generator
-#  undef ec_GFp_simple_group_get_cofactor
-#  define ec_GFp_simple_group_get_cofactor        ec_GFp_simple_grp_get_cofactor
-#  undef ec_GFp_simple_point_clear_finish
-#  define ec_GFp_simple_point_clear_finish        ec_GFp_simple_pt_clear_finish
-#  undef ec_GFp_simple_point_set_to_infinity
-#  define ec_GFp_simple_point_set_to_infinity     ec_GFp_simple_pt_set_to_inf
-#  undef ec_GFp_simple_points_make_affine
-#  define ec_GFp_simple_points_make_affine        ec_GFp_simple_pts_make_affine
-#  undef ec_GFp_simple_set_Jprojective_coordinates_GFp
-#  define ec_GFp_simple_set_Jprojective_coordinates_GFp \
-                                                ec_GFp_smp_set_Jproj_coords_GFp
-#  undef ec_GFp_simple_get_Jprojective_coordinates_GFp
-#  define ec_GFp_simple_get_Jprojective_coordinates_GFp \
-                                                ec_GFp_smp_get_Jproj_coords_GFp
-#  undef ec_GFp_simple_point_set_affine_coordinates_GFp
-#  define ec_GFp_simple_point_set_affine_coordinates_GFp \
-                                                ec_GFp_smp_pt_set_af_coords_GFp
-#  undef ec_GFp_simple_point_get_affine_coordinates_GFp
-#  define ec_GFp_simple_point_get_affine_coordinates_GFp \
-                                                ec_GFp_smp_pt_get_af_coords_GFp
-#  undef ec_GFp_simple_set_compressed_coordinates_GFp
-#  define ec_GFp_simple_set_compressed_coordinates_GFp \
-                                                ec_GFp_smp_set_compr_coords_GFp
-#  undef ec_GFp_simple_point_set_affine_coordinates
-#  define ec_GFp_simple_point_set_affine_coordinates \
-                                                ec_GFp_smp_pt_set_af_coords
-#  undef ec_GFp_simple_point_get_affine_coordinates
-#  define ec_GFp_simple_point_get_affine_coordinates \
-                                                ec_GFp_smp_pt_get_af_coords
-#  undef ec_GFp_simple_set_compressed_coordinates
-#  define ec_GFp_simple_set_compressed_coordinates \
-                                                ec_GFp_smp_set_compr_coords
-#  undef ec_GFp_simple_group_check_discriminant
-#  define ec_GFp_simple_group_check_discriminant  ec_GFp_simple_grp_chk_discrim
-
-/* Hack som long STORE names */
-#  undef STORE_method_set_initialise_function
-#  define STORE_method_set_initialise_function    STORE_meth_set_initialise_fn
-#  undef STORE_method_set_cleanup_function
-#  define STORE_method_set_cleanup_function       STORE_meth_set_cleanup_fn
-#  undef STORE_method_set_generate_function
-#  define STORE_method_set_generate_function      STORE_meth_set_generate_fn
-#  undef STORE_method_set_modify_function
-#  define STORE_method_set_modify_function        STORE_meth_set_modify_fn
-#  undef STORE_method_set_revoke_function
-#  define STORE_method_set_revoke_function        STORE_meth_set_revoke_fn
-#  undef STORE_method_set_delete_function
-#  define STORE_method_set_delete_function        STORE_meth_set_delete_fn
-#  undef STORE_method_set_list_start_function
-#  define STORE_method_set_list_start_function    STORE_meth_set_list_start_fn
-#  undef STORE_method_set_list_next_function
-#  define STORE_method_set_list_next_function     STORE_meth_set_list_next_fn
-#  undef STORE_method_set_list_end_function
-#  define STORE_method_set_list_end_function      STORE_meth_set_list_end_fn
-#  undef STORE_method_set_update_store_function
-#  define STORE_method_set_update_store_function  STORE_meth_set_update_store_fn
-#  undef STORE_method_set_lock_store_function
-#  define STORE_method_set_lock_store_function    STORE_meth_set_lock_store_fn
-#  undef STORE_method_set_unlock_store_function
-#  define STORE_method_set_unlock_store_function  STORE_meth_set_unlock_store_fn
-#  undef STORE_method_get_initialise_function
-#  define STORE_method_get_initialise_function    STORE_meth_get_initialise_fn
-#  undef STORE_method_get_cleanup_function
-#  define STORE_method_get_cleanup_function       STORE_meth_get_cleanup_fn
-#  undef STORE_method_get_generate_function
-#  define STORE_method_get_generate_function      STORE_meth_get_generate_fn
-#  undef STORE_method_get_modify_function
-#  define STORE_method_get_modify_function        STORE_meth_get_modify_fn
-#  undef STORE_method_get_revoke_function
-#  define STORE_method_get_revoke_function        STORE_meth_get_revoke_fn
-#  undef STORE_method_get_delete_function
-#  define STORE_method_get_delete_function        STORE_meth_get_delete_fn
-#  undef STORE_method_get_list_start_function
-#  define STORE_method_get_list_start_function    STORE_meth_get_list_start_fn
-#  undef STORE_method_get_list_next_function
-#  define STORE_method_get_list_next_function     STORE_meth_get_list_next_fn
-#  undef STORE_method_get_list_end_function
-#  define STORE_method_get_list_end_function      STORE_meth_get_list_end_fn
-#  undef STORE_method_get_update_store_function
-#  define STORE_method_get_update_store_function  STORE_meth_get_update_store_fn
-#  undef STORE_method_get_lock_store_function
-#  define STORE_method_get_lock_store_function    STORE_meth_get_lock_store_fn
-#  undef STORE_method_get_unlock_store_function
-#  define STORE_method_get_unlock_store_function  STORE_meth_get_unlock_store_fn
-
-/* Hack some long TS names */
-#  undef TS_RESP_CTX_set_status_info_cond
-#  define TS_RESP_CTX_set_status_info_cond        TS_RESP_CTX_set_stat_info_cond
-#  undef TS_RESP_CTX_set_clock_precision_digits
-#  define TS_RESP_CTX_set_clock_precision_digits  TS_RESP_CTX_set_clk_prec_digits
-#  undef TS_CONF_set_clock_precision_digits
-#  define TS_CONF_set_clock_precision_digits      TS_CONF_set_clk_prec_digits
-
-/* Hack some long CMS names */
-#  undef CMS_RecipientInfo_ktri_get0_algs
-#  define CMS_RecipientInfo_ktri_get0_algs        CMS_RecipInfo_ktri_get0_algs
-#  undef CMS_RecipientInfo_ktri_get0_signer_id
-#  define CMS_RecipientInfo_ktri_get0_signer_id   CMS_RecipInfo_ktri_get0_sigr_id
-#  undef CMS_OtherRevocationInfoFormat_it
-#  define CMS_OtherRevocationInfoFormat_it        CMS_OtherRevocInfoFormat_it
-#  undef CMS_KeyAgreeRecipientIdentifier_it
-#  define CMS_KeyAgreeRecipientIdentifier_it      CMS_KeyAgreeRecipIdentifier_it
-#  undef CMS_OriginatorIdentifierOrKey_it
-#  define CMS_OriginatorIdentifierOrKey_it        CMS_OriginatorIdOrKey_it
-#  undef cms_SignerIdentifier_get0_signer_id
-#  define cms_SignerIdentifier_get0_signer_id     cms_SignerId_get0_signer_id
-
-/* Hack some long DTLS1 names */
-#  undef dtls1_retransmit_buffered_messages
-#  define dtls1_retransmit_buffered_messages      dtls1_retransmit_buffered_msgs
-
-/* Hack some long SRP names */
-#  undef SRP_generate_server_master_secret
-#  define SRP_generate_server_master_secret       SRP_gen_server_master_secret
-#  undef SRP_generate_client_master_secret
-#  define SRP_generate_client_master_secret       SRP_gen_client_master_secret
-
-/* Hack some long UI names */
-#  undef UI_method_get_prompt_constructor
-#  define UI_method_get_prompt_constructor        UI_method_get_prompt_constructr
-#  undef UI_method_set_prompt_constructor
-#  define UI_method_set_prompt_constructor        UI_method_set_prompt_constructr
-
-# endif                         /* defined OPENSSL_SYS_VMS */
-
-/* Case insensitive linking causes problems.... */
-# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2)
-#  undef ERR_load_CRYPTO_strings
-#  define ERR_load_CRYPTO_strings                 ERR_load_CRYPTOlib_strings
-#  undef OCSP_crlID_new
-#  define OCSP_crlID_new                          OCSP_crlID2_new
-
-#  undef d2i_ECPARAMETERS
-#  define d2i_ECPARAMETERS                        d2i_UC_ECPARAMETERS
-#  undef i2d_ECPARAMETERS
-#  define i2d_ECPARAMETERS                        i2d_UC_ECPARAMETERS
-#  undef d2i_ECPKPARAMETERS
-#  define d2i_ECPKPARAMETERS                      d2i_UC_ECPKPARAMETERS
-#  undef i2d_ECPKPARAMETERS
-#  define i2d_ECPKPARAMETERS                      i2d_UC_ECPKPARAMETERS
-
-/*
- * These functions do not seem to exist! However, I'm paranoid... Original
- * command in x509v3.h: These functions are being redefined in another
- * directory, and clash when the linker is case-insensitive, so let's hide
- * them a little, by giving them an extra 'o' at the beginning of the name...
- */
-#  undef X509v3_cleanup_extensions
-#  define X509v3_cleanup_extensions               oX509v3_cleanup_extensions
-#  undef X509v3_add_extension
-#  define X509v3_add_extension                    oX509v3_add_extension
-#  undef X509v3_add_netscape_extensions
-#  define X509v3_add_netscape_extensions          oX509v3_add_netscape_extensions
-#  undef X509v3_add_standard_extensions
-#  define X509v3_add_standard_extensions          oX509v3_add_standard_extensions
-
-/* This one clashes with CMS_data_create */
-#  undef cms_Data_create
-#  define cms_Data_create                         priv_cms_Data_create
-
-# endif
-
-#endif                          /* ! defined HEADER_VMS_IDHACKS_H */
diff --git a/include.new/openssl/tls1.h b/include.new/openssl/tls1.h
deleted file mode 100644
index 69d8186..0000000
--- a/include.new/openssl/tls1.h
+++ /dev/null
@@ -1,788 +0,0 @@
-/* ssl/tls1.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright (c) 1998-2006 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- *
- * Portions of the attached software ("Contribution") are developed by
- * SUN MICROSYSTEMS, INC., and are contributed to the OpenSSL project.
- *
- * The Contribution is licensed pursuant to the OpenSSL open source
- * license provided above.
- *
- * ECC cipher suite support in OpenSSL originally written by
- * Vipul Gupta and Sumit Gupta of Sun Microsystems Laboratories.
- *
- */
-/* ====================================================================
- * Copyright 2005 Nokia. All rights reserved.
- *
- * The portions of the attached software ("Contribution") is developed by
- * Nokia Corporation and is licensed pursuant to the OpenSSL open source
- * license.
- *
- * The Contribution, originally written by Mika Kousa and Pasi Eronen of
- * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
- * support (see RFC 4279) to OpenSSL.
- *
- * No patent licenses or other rights except those expressly stated in
- * the OpenSSL open source license shall be deemed granted or received
- * expressly, by implication, estoppel, or otherwise.
- *
- * No assurances are provided by Nokia that the Contribution does not
- * infringe the patent or other intellectual property rights of any third
- * party or that the license provides you with all the necessary rights
- * to make use of the Contribution.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
- * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
- * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
- * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
- * OTHERWISE.
- */
-
-#ifndef HEADER_TLS1_H
-# define HEADER_TLS1_H
-
-# include <openssl/buffer.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES    0
-
-# define TLS1_VERSION                    0x0301
-# define TLS1_1_VERSION                  0x0302
-# define TLS1_2_VERSION                  0x0303
-# define TLS_MAX_VERSION                 TLS1_2_VERSION
-
-# define TLS1_VERSION_MAJOR              0x03
-# define TLS1_VERSION_MINOR              0x01
-
-# define TLS1_1_VERSION_MAJOR            0x03
-# define TLS1_1_VERSION_MINOR            0x02
-
-# define TLS1_2_VERSION_MAJOR            0x03
-# define TLS1_2_VERSION_MINOR            0x03
-
-# define TLS1_get_version(s) \
-                ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0)
-
-# define TLS1_get_client_version(s) \
-                ((s->client_version >> 8) == TLS1_VERSION_MAJOR ? s->client_version : 0)
-
-# define TLS1_AD_DECRYPTION_FAILED       21
-# define TLS1_AD_RECORD_OVERFLOW         22
-# define TLS1_AD_UNKNOWN_CA              48/* fatal */
-# define TLS1_AD_ACCESS_DENIED           49/* fatal */
-# define TLS1_AD_DECODE_ERROR            50/* fatal */
-# define TLS1_AD_DECRYPT_ERROR           51
-# define TLS1_AD_EXPORT_RESTRICTION      60/* fatal */
-# define TLS1_AD_PROTOCOL_VERSION        70/* fatal */
-# define TLS1_AD_INSUFFICIENT_SECURITY   71/* fatal */
-# define TLS1_AD_INTERNAL_ERROR          80/* fatal */
-# define TLS1_AD_INAPPROPRIATE_FALLBACK  86/* fatal */
-# define TLS1_AD_USER_CANCELLED          90
-# define TLS1_AD_NO_RENEGOTIATION        100
-/* codes 110-114 are from RFC3546 */
-# define TLS1_AD_UNSUPPORTED_EXTENSION   110
-# define TLS1_AD_CERTIFICATE_UNOBTAINABLE 111
-# define TLS1_AD_UNRECOGNIZED_NAME       112
-# define TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE 113
-# define TLS1_AD_BAD_CERTIFICATE_HASH_VALUE 114
-# define TLS1_AD_UNKNOWN_PSK_IDENTITY    115/* fatal */
-
-/* ExtensionType values from RFC3546 / RFC4366 / RFC6066 */
-# define TLSEXT_TYPE_server_name                 0
-# define TLSEXT_TYPE_max_fragment_length         1
-# define TLSEXT_TYPE_client_certificate_url      2
-# define TLSEXT_TYPE_trusted_ca_keys             3
-# define TLSEXT_TYPE_truncated_hmac              4
-# define TLSEXT_TYPE_status_request              5
-/* ExtensionType values from RFC4681 */
-# define TLSEXT_TYPE_user_mapping                6
-
-/* ExtensionType values from RFC5878 */
-# define TLSEXT_TYPE_client_authz                7
-# define TLSEXT_TYPE_server_authz                8
-
-/* ExtensionType values from RFC6091 */
-# define TLSEXT_TYPE_cert_type           9
-
-/* ExtensionType values from RFC4492 */
-# define TLSEXT_TYPE_elliptic_curves             10
-# define TLSEXT_TYPE_ec_point_formats            11
-
-/* ExtensionType value from RFC5054 */
-# define TLSEXT_TYPE_srp                         12
-
-/* ExtensionType values from RFC5246 */
-# define TLSEXT_TYPE_signature_algorithms        13
-
-/* ExtensionType value from RFC5764 */
-# define TLSEXT_TYPE_use_srtp    14
-
-/* ExtensionType value from RFC5620 */
-# define TLSEXT_TYPE_heartbeat   15
-
-/*
- * ExtensionType value for TLS padding extension.
- * http://www.iana.org/assignments/tls-extensiontype-values/tls-extensiontype-values.xhtml
- * http://tools.ietf.org/html/draft-agl-tls-padding-03
- */
-# define TLSEXT_TYPE_padding     21
-
-/* ExtensionType value from RFC4507 */
-# define TLSEXT_TYPE_session_ticket              35
-
-/* ExtensionType value from draft-rescorla-tls-opaque-prf-input-00.txt */
-# if 0
-/*
- * will have to be provided externally for now ,
- * i.e. build with -DTLSEXT_TYPE_opaque_prf_input=38183
- * using whatever extension number you'd like to try
- */
-#  define TLSEXT_TYPE_opaque_prf_input           ?? */
-# endif
-
-/* Temporary extension type */
-# define TLSEXT_TYPE_renegotiate                 0xff01
-
-# ifndef OPENSSL_NO_NEXTPROTONEG
-/* This is not an IANA defined extension number */
-#  define TLSEXT_TYPE_next_proto_neg              13172
-# endif
-
-/* NameType value from RFC 3546 */
-# define TLSEXT_NAMETYPE_host_name 0
-/* status request value from RFC 3546 */
-# define TLSEXT_STATUSTYPE_ocsp 1
-
-/* ECPointFormat values from draft-ietf-tls-ecc-12 */
-# define TLSEXT_ECPOINTFORMAT_first                      0
-# define TLSEXT_ECPOINTFORMAT_uncompressed               0
-# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_prime  1
-# define TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2  2
-# define TLSEXT_ECPOINTFORMAT_last                       2
-
-/* Signature and hash algorithms from RFC 5246 */
-
-# define TLSEXT_signature_anonymous                      0
-# define TLSEXT_signature_rsa                            1
-# define TLSEXT_signature_dsa                            2
-# define TLSEXT_signature_ecdsa                          3
-
-# define TLSEXT_hash_none                                0
-# define TLSEXT_hash_md5                                 1
-# define TLSEXT_hash_sha1                                2
-# define TLSEXT_hash_sha224                              3
-# define TLSEXT_hash_sha256                              4
-# define TLSEXT_hash_sha384                              5
-# define TLSEXT_hash_sha512                              6
-
-# ifndef OPENSSL_NO_TLSEXT
-
-#  define TLSEXT_MAXLEN_host_name 255
-
-const char *SSL_get_servername(const SSL *s, const int type);
-int SSL_get_servername_type(const SSL *s);
-/*
- * SSL_export_keying_material exports a value derived from the master secret,
- * as specified in RFC 5705. It writes |olen| bytes to |out| given a label and
- * optional context. (Since a zero length context is allowed, the |use_context|
- * flag controls whether a context is included.) It returns 1 on success and
- * zero otherwise.
- */
-int SSL_export_keying_material(SSL *s, unsigned char *out, size_t olen,
-                               const char *label, size_t llen,
-                               const unsigned char *p, size_t plen,
-                               int use_context);
-
-#  define SSL_set_tlsext_host_name(s,name) \
-SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_HOSTNAME,TLSEXT_NAMETYPE_host_name,(char *)name)
-
-#  define SSL_set_tlsext_debug_callback(ssl, cb) \
-SSL_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_CB,(void (*)(void))cb)
-
-#  define SSL_set_tlsext_debug_arg(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_DEBUG_ARG,0, (void *)arg)
-
-#  define SSL_set_tlsext_status_type(ssl, type) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE,type, NULL)
-
-#  define SSL_get_tlsext_status_exts(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
-
-#  define SSL_set_tlsext_status_exts(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_EXTS,0, (void *)arg)
-
-#  define SSL_get_tlsext_status_ids(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
-
-#  define SSL_set_tlsext_status_ids(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS,0, (void *)arg)
-
-#  define SSL_get_tlsext_status_ocsp_resp(ssl, arg) \
-SSL_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP,0, (void *)arg)
-
-#  define SSL_set_tlsext_status_ocsp_resp(ssl, arg, arglen) \
-SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen, (void *)arg)
-
-#  define SSL_CTX_set_tlsext_servername_callback(ctx, cb) \
-SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,(void (*)(void))cb)
-
-#  define SSL_TLSEXT_ERR_OK 0
-#  define SSL_TLSEXT_ERR_ALERT_WARNING 1
-#  define SSL_TLSEXT_ERR_ALERT_FATAL 2
-#  define SSL_TLSEXT_ERR_NOACK 3
-
-#  define SSL_CTX_set_tlsext_servername_arg(ctx, arg) \
-SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg)
-
-#  define SSL_CTX_get_tlsext_ticket_keys(ctx, keys, keylen) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_GET_TLSEXT_TICKET_KEYS,(keylen),(keys))
-#  define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \
-        SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLSEXT_TICKET_KEYS,(keylen),(keys))
-
-#  define SSL_CTX_set_tlsext_status_cb(ssl, cb) \
-SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)
-
-#  define SSL_CTX_set_tlsext_status_arg(ssl, arg) \
-SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg)
-
-#  define SSL_set_tlsext_opaque_prf_input(s, src, len) \
-SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT, len, src)
-#  define SSL_CTX_set_tlsext_opaque_prf_input_callback(ctx, cb) \
-SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB, (void (*)(void))cb)
-#  define SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(ctx, arg) \
-SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, arg)
-
-#  define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \
-SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
-
-#  ifndef OPENSSL_NO_HEARTBEATS
-#   define SSL_TLSEXT_HB_ENABLED                           0x01
-#   define SSL_TLSEXT_HB_DONT_SEND_REQUESTS        0x02
-#   define SSL_TLSEXT_HB_DONT_RECV_REQUESTS        0x04
-
-#   define SSL_get_tlsext_heartbeat_pending(ssl) \
-        SSL_ctrl((ssl),SSL_CTRL_GET_TLS_EXT_HEARTBEAT_PENDING,0,NULL)
-#   define SSL_set_tlsext_heartbeat_no_requests(ssl, arg) \
-        SSL_ctrl((ssl),SSL_CTRL_SET_TLS_EXT_HEARTBEAT_NO_REQUESTS,arg,NULL)
-#  endif
-# endif
-
-/* PSK ciphersuites from 4279 */
-# define TLS1_CK_PSK_WITH_RC4_128_SHA                    0x0300008A
-# define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA               0x0300008B
-# define TLS1_CK_PSK_WITH_AES_128_CBC_SHA                0x0300008C
-# define TLS1_CK_PSK_WITH_AES_256_CBC_SHA                0x0300008D
-
-/*
- * Additional TLS ciphersuites from expired Internet Draft
- * draft-ietf-tls-56-bit-ciphersuites-01.txt (available if
- * TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES is defined, see s3_lib.c).  We
- * actually treat them like SSL 3.0 ciphers, which we probably shouldn't.
- * Note that the first two are actually not in the IDs.
- */
-# define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_MD5          0x03000060/* not in
-                                                                    * ID */
-# define TLS1_CK_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5      0x03000061/* not in
-                                                                    * ID */
-# define TLS1_CK_RSA_EXPORT1024_WITH_DES_CBC_SHA         0x03000062
-# define TLS1_CK_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA     0x03000063
-# define TLS1_CK_RSA_EXPORT1024_WITH_RC4_56_SHA          0x03000064
-# define TLS1_CK_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA      0x03000065
-# define TLS1_CK_DHE_DSS_WITH_RC4_128_SHA                0x03000066
-
-/* AES ciphersuites from RFC3268 */
-
-# define TLS1_CK_RSA_WITH_AES_128_SHA                    0x0300002F
-# define TLS1_CK_DH_DSS_WITH_AES_128_SHA                 0x03000030
-# define TLS1_CK_DH_RSA_WITH_AES_128_SHA                 0x03000031
-# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA                0x03000032
-# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA                0x03000033
-# define TLS1_CK_ADH_WITH_AES_128_SHA                    0x03000034
-
-# define TLS1_CK_RSA_WITH_AES_256_SHA                    0x03000035
-# define TLS1_CK_DH_DSS_WITH_AES_256_SHA                 0x03000036
-# define TLS1_CK_DH_RSA_WITH_AES_256_SHA                 0x03000037
-# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA                0x03000038
-# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA                0x03000039
-# define TLS1_CK_ADH_WITH_AES_256_SHA                    0x0300003A
-
-/* TLS v1.2 ciphersuites */
-# define TLS1_CK_RSA_WITH_NULL_SHA256                    0x0300003B
-# define TLS1_CK_RSA_WITH_AES_128_SHA256                 0x0300003C
-# define TLS1_CK_RSA_WITH_AES_256_SHA256                 0x0300003D
-# define TLS1_CK_DH_DSS_WITH_AES_128_SHA256              0x0300003E
-# define TLS1_CK_DH_RSA_WITH_AES_128_SHA256              0x0300003F
-# define TLS1_CK_DHE_DSS_WITH_AES_128_SHA256             0x03000040
-
-/* Camellia ciphersuites from RFC4132 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_128_CBC_SHA           0x03000041
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_128_CBC_SHA        0x03000042
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_128_CBC_SHA        0x03000043
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA       0x03000044
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA       0x03000045
-# define TLS1_CK_ADH_WITH_CAMELLIA_128_CBC_SHA           0x03000046
-
-/* TLS v1.2 ciphersuites */
-# define TLS1_CK_DHE_RSA_WITH_AES_128_SHA256             0x03000067
-# define TLS1_CK_DH_DSS_WITH_AES_256_SHA256              0x03000068
-# define TLS1_CK_DH_RSA_WITH_AES_256_SHA256              0x03000069
-# define TLS1_CK_DHE_DSS_WITH_AES_256_SHA256             0x0300006A
-# define TLS1_CK_DHE_RSA_WITH_AES_256_SHA256             0x0300006B
-# define TLS1_CK_ADH_WITH_AES_128_SHA256                 0x0300006C
-# define TLS1_CK_ADH_WITH_AES_256_SHA256                 0x0300006D
-
-/* Camellia ciphersuites from RFC4132 */
-# define TLS1_CK_RSA_WITH_CAMELLIA_256_CBC_SHA           0x03000084
-# define TLS1_CK_DH_DSS_WITH_CAMELLIA_256_CBC_SHA        0x03000085
-# define TLS1_CK_DH_RSA_WITH_CAMELLIA_256_CBC_SHA        0x03000086
-# define TLS1_CK_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA       0x03000087
-# define TLS1_CK_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA       0x03000088
-# define TLS1_CK_ADH_WITH_CAMELLIA_256_CBC_SHA           0x03000089
-
-/* SEED ciphersuites from RFC4162 */
-# define TLS1_CK_RSA_WITH_SEED_SHA                       0x03000096
-# define TLS1_CK_DH_DSS_WITH_SEED_SHA                    0x03000097
-# define TLS1_CK_DH_RSA_WITH_SEED_SHA                    0x03000098
-# define TLS1_CK_DHE_DSS_WITH_SEED_SHA                   0x03000099
-# define TLS1_CK_DHE_RSA_WITH_SEED_SHA                   0x0300009A
-# define TLS1_CK_ADH_WITH_SEED_SHA                       0x0300009B
-
-/* TLS v1.2 GCM ciphersuites from RFC5288 */
-# define TLS1_CK_RSA_WITH_AES_128_GCM_SHA256             0x0300009C
-# define TLS1_CK_RSA_WITH_AES_256_GCM_SHA384             0x0300009D
-# define TLS1_CK_DHE_RSA_WITH_AES_128_GCM_SHA256         0x0300009E
-# define TLS1_CK_DHE_RSA_WITH_AES_256_GCM_SHA384         0x0300009F
-# define TLS1_CK_DH_RSA_WITH_AES_128_GCM_SHA256          0x030000A0
-# define TLS1_CK_DH_RSA_WITH_AES_256_GCM_SHA384          0x030000A1
-# define TLS1_CK_DHE_DSS_WITH_AES_128_GCM_SHA256         0x030000A2
-# define TLS1_CK_DHE_DSS_WITH_AES_256_GCM_SHA384         0x030000A3
-# define TLS1_CK_DH_DSS_WITH_AES_128_GCM_SHA256          0x030000A4
-# define TLS1_CK_DH_DSS_WITH_AES_256_GCM_SHA384          0x030000A5
-# define TLS1_CK_ADH_WITH_AES_128_GCM_SHA256             0x030000A6
-# define TLS1_CK_ADH_WITH_AES_256_GCM_SHA384             0x030000A7
-
-/*
- * ECC ciphersuites from draft-ietf-tls-ecc-12.txt with changes soon to be in
- * draft 13
- */
-# define TLS1_CK_ECDH_ECDSA_WITH_NULL_SHA                0x0300C001
-# define TLS1_CK_ECDH_ECDSA_WITH_RC4_128_SHA             0x0300C002
-# define TLS1_CK_ECDH_ECDSA_WITH_DES_192_CBC3_SHA        0x0300C003
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_CBC_SHA         0x0300C004
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_CBC_SHA         0x0300C005
-
-# define TLS1_CK_ECDHE_ECDSA_WITH_NULL_SHA               0x0300C006
-# define TLS1_CK_ECDHE_ECDSA_WITH_RC4_128_SHA            0x0300C007
-# define TLS1_CK_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA       0x0300C008
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_CBC_SHA        0x0300C009
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_CBC_SHA        0x0300C00A
-
-# define TLS1_CK_ECDH_RSA_WITH_NULL_SHA                  0x0300C00B
-# define TLS1_CK_ECDH_RSA_WITH_RC4_128_SHA               0x0300C00C
-# define TLS1_CK_ECDH_RSA_WITH_DES_192_CBC3_SHA          0x0300C00D
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_CBC_SHA           0x0300C00E
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_CBC_SHA           0x0300C00F
-
-# define TLS1_CK_ECDHE_RSA_WITH_NULL_SHA                 0x0300C010
-# define TLS1_CK_ECDHE_RSA_WITH_RC4_128_SHA              0x0300C011
-# define TLS1_CK_ECDHE_RSA_WITH_DES_192_CBC3_SHA         0x0300C012
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_CBC_SHA          0x0300C013
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_CBC_SHA          0x0300C014
-
-# define TLS1_CK_ECDH_anon_WITH_NULL_SHA                 0x0300C015
-# define TLS1_CK_ECDH_anon_WITH_RC4_128_SHA              0x0300C016
-# define TLS1_CK_ECDH_anon_WITH_DES_192_CBC3_SHA         0x0300C017
-# define TLS1_CK_ECDH_anon_WITH_AES_128_CBC_SHA          0x0300C018
-# define TLS1_CK_ECDH_anon_WITH_AES_256_CBC_SHA          0x0300C019
-
-/* SRP ciphersuites from RFC 5054 */
-# define TLS1_CK_SRP_SHA_WITH_3DES_EDE_CBC_SHA           0x0300C01A
-# define TLS1_CK_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA       0x0300C01B
-# define TLS1_CK_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA       0x0300C01C
-# define TLS1_CK_SRP_SHA_WITH_AES_128_CBC_SHA            0x0300C01D
-# define TLS1_CK_SRP_SHA_RSA_WITH_AES_128_CBC_SHA        0x0300C01E
-# define TLS1_CK_SRP_SHA_DSS_WITH_AES_128_CBC_SHA        0x0300C01F
-# define TLS1_CK_SRP_SHA_WITH_AES_256_CBC_SHA            0x0300C020
-# define TLS1_CK_SRP_SHA_RSA_WITH_AES_256_CBC_SHA        0x0300C021
-# define TLS1_CK_SRP_SHA_DSS_WITH_AES_256_CBC_SHA        0x0300C022
-
-/* ECDH HMAC based ciphersuites from RFC5289 */
-
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_SHA256         0x0300C023
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_SHA384         0x0300C024
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_SHA256          0x0300C025
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_SHA384          0x0300C026
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_SHA256           0x0300C027
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_SHA384           0x0300C028
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_SHA256            0x0300C029
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_SHA384            0x0300C02A
-
-/* ECDH GCM based ciphersuites from RFC5289 */
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256     0x0300C02B
-# define TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384     0x0300C02C
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_128_GCM_SHA256      0x0300C02D
-# define TLS1_CK_ECDH_ECDSA_WITH_AES_256_GCM_SHA384      0x0300C02E
-# define TLS1_CK_ECDHE_RSA_WITH_AES_128_GCM_SHA256       0x0300C02F
-# define TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA384       0x0300C030
-# define TLS1_CK_ECDH_RSA_WITH_AES_128_GCM_SHA256        0x0300C031
-# define TLS1_CK_ECDH_RSA_WITH_AES_256_GCM_SHA384        0x0300C032
-
-/*
- * XXX Inconsistency alert: The OpenSSL names of ciphers with ephemeral DH
- * here include the string "DHE", while elsewhere it has always been "EDH".
- * (The alias for the list of all such ciphers also is "EDH".) The
- * specifications speak of "EDH"; maybe we should allow both forms for
- * everything.
- */
-# define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_MD5         "EXP1024-RC4-MD5"
-# define TLS1_TXT_RSA_EXPORT1024_WITH_RC2_CBC_56_MD5     "EXP1024-RC2-CBC-MD5"
-# define TLS1_TXT_RSA_EXPORT1024_WITH_DES_CBC_SHA        "EXP1024-DES-CBC-SHA"
-# define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA    "EXP1024-DHE-DSS-DES-CBC-SHA"
-# define TLS1_TXT_RSA_EXPORT1024_WITH_RC4_56_SHA         "EXP1024-RC4-SHA"
-# define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA     "EXP1024-DHE-DSS-RC4-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA               "DHE-DSS-RC4-SHA"
-
-/* AES ciphersuites from RFC3268 */
-# define TLS1_TXT_RSA_WITH_AES_128_SHA                   "AES128-SHA"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA                "DH-DSS-AES128-SHA"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA                "DH-RSA-AES128-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA               "DHE-DSS-AES128-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA               "DHE-RSA-AES128-SHA"
-# define TLS1_TXT_ADH_WITH_AES_128_SHA                   "ADH-AES128-SHA"
-
-# define TLS1_TXT_RSA_WITH_AES_256_SHA                   "AES256-SHA"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA                "DH-DSS-AES256-SHA"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA                "DH-RSA-AES256-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA               "DHE-DSS-AES256-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA               "DHE-RSA-AES256-SHA"
-# define TLS1_TXT_ADH_WITH_AES_256_SHA                   "ADH-AES256-SHA"
-
-/* ECC ciphersuites from draft-ietf-tls-ecc-01.txt (Mar 15, 2001) */
-# define TLS1_TXT_ECDH_ECDSA_WITH_NULL_SHA               "ECDH-ECDSA-NULL-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_RC4_128_SHA            "ECDH-ECDSA-RC4-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_DES_192_CBC3_SHA       "ECDH-ECDSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_CBC_SHA        "ECDH-ECDSA-AES128-SHA"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_CBC_SHA        "ECDH-ECDSA-AES256-SHA"
-
-# define TLS1_TXT_ECDHE_ECDSA_WITH_NULL_SHA              "ECDHE-ECDSA-NULL-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_RC4_128_SHA           "ECDHE-ECDSA-RC4-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_DES_192_CBC3_SHA      "ECDHE-ECDSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_CBC_SHA       "ECDHE-ECDSA-AES128-SHA"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA       "ECDHE-ECDSA-AES256-SHA"
-
-# define TLS1_TXT_ECDH_RSA_WITH_NULL_SHA                 "ECDH-RSA-NULL-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_RC4_128_SHA              "ECDH-RSA-RC4-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_DES_192_CBC3_SHA         "ECDH-RSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_CBC_SHA          "ECDH-RSA-AES128-SHA"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_CBC_SHA          "ECDH-RSA-AES256-SHA"
-
-# define TLS1_TXT_ECDHE_RSA_WITH_NULL_SHA                "ECDHE-RSA-NULL-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_RC4_128_SHA             "ECDHE-RSA-RC4-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_DES_192_CBC3_SHA        "ECDHE-RSA-DES-CBC3-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_CBC_SHA         "ECDHE-RSA-AES128-SHA"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA         "ECDHE-RSA-AES256-SHA"
-
-# define TLS1_TXT_ECDH_anon_WITH_NULL_SHA                "AECDH-NULL-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_RC4_128_SHA             "AECDH-RC4-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_DES_192_CBC3_SHA        "AECDH-DES-CBC3-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_AES_128_CBC_SHA         "AECDH-AES128-SHA"
-# define TLS1_TXT_ECDH_anon_WITH_AES_256_CBC_SHA         "AECDH-AES256-SHA"
-
-/* PSK ciphersuites from RFC 4279 */
-# define TLS1_TXT_PSK_WITH_RC4_128_SHA                   "PSK-RC4-SHA"
-# define TLS1_TXT_PSK_WITH_3DES_EDE_CBC_SHA              "PSK-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_PSK_WITH_AES_128_CBC_SHA               "PSK-AES128-CBC-SHA"
-# define TLS1_TXT_PSK_WITH_AES_256_CBC_SHA               "PSK-AES256-CBC-SHA"
-
-/* SRP ciphersuite from RFC 5054 */
-# define TLS1_TXT_SRP_SHA_WITH_3DES_EDE_CBC_SHA          "SRP-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA      "SRP-RSA-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA      "SRP-DSS-3DES-EDE-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_WITH_AES_128_CBC_SHA           "SRP-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_128_CBC_SHA       "SRP-RSA-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_128_CBC_SHA       "SRP-DSS-AES-128-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_WITH_AES_256_CBC_SHA           "SRP-AES-256-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_RSA_WITH_AES_256_CBC_SHA       "SRP-RSA-AES-256-CBC-SHA"
-# define TLS1_TXT_SRP_SHA_DSS_WITH_AES_256_CBC_SHA       "SRP-DSS-AES-256-CBC-SHA"
-
-/* Camellia ciphersuites from RFC4132 */
-# define TLS1_TXT_RSA_WITH_CAMELLIA_128_CBC_SHA          "CAMELLIA128-SHA"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_128_CBC_SHA       "DH-DSS-CAMELLIA128-SHA"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_128_CBC_SHA       "DH-RSA-CAMELLIA128-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA      "DHE-DSS-CAMELLIA128-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA      "DHE-RSA-CAMELLIA128-SHA"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_128_CBC_SHA          "ADH-CAMELLIA128-SHA"
-
-# define TLS1_TXT_RSA_WITH_CAMELLIA_256_CBC_SHA          "CAMELLIA256-SHA"
-# define TLS1_TXT_DH_DSS_WITH_CAMELLIA_256_CBC_SHA       "DH-DSS-CAMELLIA256-SHA"
-# define TLS1_TXT_DH_RSA_WITH_CAMELLIA_256_CBC_SHA       "DH-RSA-CAMELLIA256-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA      "DHE-DSS-CAMELLIA256-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA      "DHE-RSA-CAMELLIA256-SHA"
-# define TLS1_TXT_ADH_WITH_CAMELLIA_256_CBC_SHA          "ADH-CAMELLIA256-SHA"
-
-/* SEED ciphersuites from RFC4162 */
-# define TLS1_TXT_RSA_WITH_SEED_SHA                      "SEED-SHA"
-# define TLS1_TXT_DH_DSS_WITH_SEED_SHA                   "DH-DSS-SEED-SHA"
-# define TLS1_TXT_DH_RSA_WITH_SEED_SHA                   "DH-RSA-SEED-SHA"
-# define TLS1_TXT_DHE_DSS_WITH_SEED_SHA                  "DHE-DSS-SEED-SHA"
-# define TLS1_TXT_DHE_RSA_WITH_SEED_SHA                  "DHE-RSA-SEED-SHA"
-# define TLS1_TXT_ADH_WITH_SEED_SHA                      "ADH-SEED-SHA"
-
-/* TLS v1.2 ciphersuites */
-# define TLS1_TXT_RSA_WITH_NULL_SHA256                   "NULL-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_128_SHA256                "AES128-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_256_SHA256                "AES256-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA256             "DH-DSS-AES128-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_SHA256             "DH-RSA-AES128-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_SHA256            "DHE-DSS-AES128-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_SHA256            "DHE-RSA-AES128-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_SHA256             "DH-DSS-AES256-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_SHA256             "DH-RSA-AES256-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_SHA256            "DHE-DSS-AES256-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_SHA256            "DHE-RSA-AES256-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_128_SHA256                "ADH-AES128-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_256_SHA256                "ADH-AES256-SHA256"
-
-/* TLS v1.2 GCM ciphersuites from RFC5288 */
-# define TLS1_TXT_RSA_WITH_AES_128_GCM_SHA256            "AES128-GCM-SHA256"
-# define TLS1_TXT_RSA_WITH_AES_256_GCM_SHA384            "AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_RSA_WITH_AES_128_GCM_SHA256        "DHE-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_RSA_WITH_AES_256_GCM_SHA384        "DHE-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_DH_RSA_WITH_AES_128_GCM_SHA256         "DH-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_DH_RSA_WITH_AES_256_GCM_SHA384         "DH-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_DHE_DSS_WITH_AES_128_GCM_SHA256        "DHE-DSS-AES128-GCM-SHA256"
-# define TLS1_TXT_DHE_DSS_WITH_AES_256_GCM_SHA384        "DHE-DSS-AES256-GCM-SHA384"
-# define TLS1_TXT_DH_DSS_WITH_AES_128_GCM_SHA256         "DH-DSS-AES128-GCM-SHA256"
-# define TLS1_TXT_DH_DSS_WITH_AES_256_GCM_SHA384         "DH-DSS-AES256-GCM-SHA384"
-# define TLS1_TXT_ADH_WITH_AES_128_GCM_SHA256            "ADH-AES128-GCM-SHA256"
-# define TLS1_TXT_ADH_WITH_AES_256_GCM_SHA384            "ADH-AES256-GCM-SHA384"
-
-/* ECDH HMAC based ciphersuites from RFC5289 */
-
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_SHA256    "ECDHE-ECDSA-AES128-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_SHA384    "ECDHE-ECDSA-AES256-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_SHA256     "ECDH-ECDSA-AES128-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_SHA384     "ECDH-ECDSA-AES256-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_SHA256      "ECDHE-RSA-AES128-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_SHA384      "ECDHE-RSA-AES256-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_SHA256       "ECDH-RSA-AES128-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_SHA384       "ECDH-RSA-AES256-SHA384"
-
-/* ECDH GCM based ciphersuites from RFC5289 */
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256    "ECDHE-ECDSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384    "ECDHE-ECDSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_128_GCM_SHA256     "ECDH-ECDSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDH_ECDSA_WITH_AES_256_GCM_SHA384     "ECDH-ECDSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_128_GCM_SHA256      "ECDHE-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDHE_RSA_WITH_AES_256_GCM_SHA384      "ECDHE-RSA-AES256-GCM-SHA384"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_128_GCM_SHA256       "ECDH-RSA-AES128-GCM-SHA256"
-# define TLS1_TXT_ECDH_RSA_WITH_AES_256_GCM_SHA384       "ECDH-RSA-AES256-GCM-SHA384"
-
-# define TLS_CT_RSA_SIGN                 1
-# define TLS_CT_DSS_SIGN                 2
-# define TLS_CT_RSA_FIXED_DH             3
-# define TLS_CT_DSS_FIXED_DH             4
-# define TLS_CT_ECDSA_SIGN               64
-# define TLS_CT_RSA_FIXED_ECDH           65
-# define TLS_CT_ECDSA_FIXED_ECDH         66
-# define TLS_CT_GOST94_SIGN              21
-# define TLS_CT_GOST01_SIGN              22
-/*
- * when correcting this number, correct also SSL3_CT_NUMBER in ssl3.h (see
- * comment there)
- */
-# define TLS_CT_NUMBER                   9
-
-# define TLS1_FINISH_MAC_LENGTH          12
-
-# define TLS_MD_MAX_CONST_SIZE                   20
-# define TLS_MD_CLIENT_FINISH_CONST              "client finished"
-# define TLS_MD_CLIENT_FINISH_CONST_SIZE         15
-# define TLS_MD_SERVER_FINISH_CONST              "server finished"
-# define TLS_MD_SERVER_FINISH_CONST_SIZE         15
-# define TLS_MD_SERVER_WRITE_KEY_CONST           "server write key"
-# define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE      16
-# define TLS_MD_KEY_EXPANSION_CONST              "key expansion"
-# define TLS_MD_KEY_EXPANSION_CONST_SIZE         13
-# define TLS_MD_CLIENT_WRITE_KEY_CONST           "client write key"
-# define TLS_MD_CLIENT_WRITE_KEY_CONST_SIZE      16
-# define TLS_MD_SERVER_WRITE_KEY_CONST           "server write key"
-# define TLS_MD_SERVER_WRITE_KEY_CONST_SIZE      16
-# define TLS_MD_IV_BLOCK_CONST                   "IV block"
-# define TLS_MD_IV_BLOCK_CONST_SIZE              8
-# define TLS_MD_MASTER_SECRET_CONST              "master secret"
-# define TLS_MD_MASTER_SECRET_CONST_SIZE         13
-
-# ifdef CHARSET_EBCDIC
-#  undef TLS_MD_CLIENT_FINISH_CONST
-/*
- * client finished
- */
-#  define TLS_MD_CLIENT_FINISH_CONST    "\x63\x6c\x69\x65\x6e\x74\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
-
-#  undef TLS_MD_SERVER_FINISH_CONST
-/*
- * server finished
- */
-#  define TLS_MD_SERVER_FINISH_CONST    "\x73\x65\x72\x76\x65\x72\x20\x66\x69\x6e\x69\x73\x68\x65\x64"
-
-#  undef TLS_MD_SERVER_WRITE_KEY_CONST
-/*
- * server write key
- */
-#  define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-
-#  undef TLS_MD_KEY_EXPANSION_CONST
-/*
- * key expansion
- */
-#  define TLS_MD_KEY_EXPANSION_CONST    "\x6b\x65\x79\x20\x65\x78\x70\x61\x6e\x73\x69\x6f\x6e"
-
-#  undef TLS_MD_CLIENT_WRITE_KEY_CONST
-/*
- * client write key
- */
-#  define TLS_MD_CLIENT_WRITE_KEY_CONST "\x63\x6c\x69\x65\x6e\x74\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-
-#  undef TLS_MD_SERVER_WRITE_KEY_CONST
-/*
- * server write key
- */
-#  define TLS_MD_SERVER_WRITE_KEY_CONST "\x73\x65\x72\x76\x65\x72\x20\x77\x72\x69\x74\x65\x20\x6b\x65\x79"
-
-#  undef TLS_MD_IV_BLOCK_CONST
-/*
- * IV block
- */
-#  define TLS_MD_IV_BLOCK_CONST         "\x49\x56\x20\x62\x6c\x6f\x63\x6b"
-
-#  undef TLS_MD_MASTER_SECRET_CONST
-/*
- * master secret
- */
-#  define TLS_MD_MASTER_SECRET_CONST    "\x6d\x61\x73\x74\x65\x72\x20\x73\x65\x63\x72\x65\x74"
-# endif
-
-/* TLS Session Ticket extension struct */
-struct tls_session_ticket_ext_st {
-    unsigned short length;
-    void *data;
-};
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/tmdiff.h b/include.new/openssl/tmdiff.h
deleted file mode 100644
index 41a8a1e..0000000
--- a/include.new/openssl/tmdiff.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* crypto/tmdiff.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/* Header for dynamic hash table routines
- * Author - Eric Young
- */
-
-#ifndef HEADER_TMDIFF_H
-#define HEADER_TMDIFF_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-char *ms_time_new(void );
-void ms_time_free(char *a);
-void ms_time_get(char *a);
-double ms_time_diff(char *start,char *end);
-int ms_time_cmp(char *ap,char *bp);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/include.new/openssl/ts.h b/include.new/openssl/ts.h
deleted file mode 100644
index 16eccbb..0000000
--- a/include.new/openssl/ts.h
+++ /dev/null
@@ -1,862 +0,0 @@
-/* crypto/ts/ts.h */
-/*
- * Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL project
- * 2002, 2003, 2004.
- */
-/* ====================================================================
- * Copyright (c) 2006 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_TS_H
-# define HEADER_TS_H
-
-# include <openssl/opensslconf.h>
-# include <openssl/symhacks.h>
-# ifndef OPENSSL_NO_BUFFER
-#  include <openssl/buffer.h>
-# endif
-# ifndef OPENSSL_NO_EVP
-#  include <openssl/evp.h>
-# endif
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/stack.h>
-# include <openssl/asn1.h>
-# include <openssl/safestack.h>
-
-# ifndef OPENSSL_NO_RSA
-#  include <openssl/rsa.h>
-# endif
-
-# ifndef OPENSSL_NO_DSA
-#  include <openssl/dsa.h>
-# endif
-
-# ifndef OPENSSL_NO_DH
-#  include <openssl/dh.h>
-# endif
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef WIN32
-/* Under Win32 this is defined in wincrypt.h */
-#  undef X509_NAME
-# endif
-
-# include <openssl/x509.h>
-# include <openssl/x509v3.h>
-
-/*-
-MessageImprint ::= SEQUENCE  {
-     hashAlgorithm                AlgorithmIdentifier,
-     hashedMessage                OCTET STRING  }
-*/
-
-typedef struct TS_msg_imprint_st {
-    X509_ALGOR *hash_algo;
-    ASN1_OCTET_STRING *hashed_msg;
-} TS_MSG_IMPRINT;
-
-/*-
-TimeStampReq ::= SEQUENCE  {
-   version                  INTEGER  { v1(1) },
-   messageImprint           MessageImprint,
-     --a hash algorithm OID and the hash value of the data to be
-     --time-stamped
-   reqPolicy                TSAPolicyId                OPTIONAL,
-   nonce                    INTEGER                    OPTIONAL,
-   certReq                  BOOLEAN                    DEFAULT FALSE,
-   extensions               [0] IMPLICIT Extensions    OPTIONAL  }
-*/
-
-typedef struct TS_req_st {
-    ASN1_INTEGER *version;
-    TS_MSG_IMPRINT *msg_imprint;
-    ASN1_OBJECT *policy_id;     /* OPTIONAL */
-    ASN1_INTEGER *nonce;        /* OPTIONAL */
-    ASN1_BOOLEAN cert_req;      /* DEFAULT FALSE */
-    STACK_OF(X509_EXTENSION) *extensions; /* [0] OPTIONAL */
-} TS_REQ;
-
-/*-
-Accuracy ::= SEQUENCE {
-                seconds        INTEGER           OPTIONAL,
-                millis     [0] INTEGER  (1..999) OPTIONAL,
-                micros     [1] INTEGER  (1..999) OPTIONAL  }
-*/
-
-typedef struct TS_accuracy_st {
-    ASN1_INTEGER *seconds;
-    ASN1_INTEGER *millis;
-    ASN1_INTEGER *micros;
-} TS_ACCURACY;
-
-/*-
-TSTInfo ::= SEQUENCE  {
-    version                      INTEGER  { v1(1) },
-    policy                       TSAPolicyId,
-    messageImprint               MessageImprint,
-      -- MUST have the same value as the similar field in
-      -- TimeStampReq
-    serialNumber                 INTEGER,
-     -- Time-Stamping users MUST be ready to accommodate integers
-     -- up to 160 bits.
-    genTime                      GeneralizedTime,
-    accuracy                     Accuracy                 OPTIONAL,
-    ordering                     BOOLEAN             DEFAULT FALSE,
-    nonce                        INTEGER                  OPTIONAL,
-      -- MUST be present if the similar field was present
-      -- in TimeStampReq.  In that case it MUST have the same value.
-    tsa                          [0] GeneralName          OPTIONAL,
-    extensions                   [1] IMPLICIT Extensions  OPTIONAL   }
-*/
-
-typedef struct TS_tst_info_st {
-    ASN1_INTEGER *version;
-    ASN1_OBJECT *policy_id;
-    TS_MSG_IMPRINT *msg_imprint;
-    ASN1_INTEGER *serial;
-    ASN1_GENERALIZEDTIME *time;
-    TS_ACCURACY *accuracy;
-    ASN1_BOOLEAN ordering;
-    ASN1_INTEGER *nonce;
-    GENERAL_NAME *tsa;
-    STACK_OF(X509_EXTENSION) *extensions;
-} TS_TST_INFO;
-
-/*-
-PKIStatusInfo ::= SEQUENCE {
-    status        PKIStatus,
-    statusString  PKIFreeText     OPTIONAL,
-    failInfo      PKIFailureInfo  OPTIONAL  }
-
-From RFC 1510 - section 3.1.1:
-PKIFreeText ::= SEQUENCE SIZE (1..MAX) OF UTF8String
-        -- text encoded as UTF-8 String (note:  each UTF8String SHOULD
-        -- include an RFC 1766 language tag to indicate the language
-        -- of the contained text)
-*/
-
-/* Possible values for status. See ts_resp_print.c && ts_resp_verify.c. */
-
-# define TS_STATUS_GRANTED                       0
-# define TS_STATUS_GRANTED_WITH_MODS             1
-# define TS_STATUS_REJECTION                     2
-# define TS_STATUS_WAITING                       3
-# define TS_STATUS_REVOCATION_WARNING            4
-# define TS_STATUS_REVOCATION_NOTIFICATION       5
-
-/*
- * Possible values for failure_info. See ts_resp_print.c && ts_resp_verify.c
- */
-
-# define TS_INFO_BAD_ALG                 0
-# define TS_INFO_BAD_REQUEST             2
-# define TS_INFO_BAD_DATA_FORMAT         5
-# define TS_INFO_TIME_NOT_AVAILABLE      14
-# define TS_INFO_UNACCEPTED_POLICY       15
-# define TS_INFO_UNACCEPTED_EXTENSION    16
-# define TS_INFO_ADD_INFO_NOT_AVAILABLE  17
-# define TS_INFO_SYSTEM_FAILURE          25
-
-typedef struct TS_status_info_st {
-    ASN1_INTEGER *status;
-    STACK_OF(ASN1_UTF8STRING) *text;
-    ASN1_BIT_STRING *failure_info;
-} TS_STATUS_INFO;
-
-DECLARE_STACK_OF(ASN1_UTF8STRING)
-DECLARE_ASN1_SET_OF(ASN1_UTF8STRING)
-
-/*-
-TimeStampResp ::= SEQUENCE  {
-     status                  PKIStatusInfo,
-     timeStampToken          TimeStampToken     OPTIONAL }
-*/
-
-typedef struct TS_resp_st {
-    TS_STATUS_INFO *status_info;
-    PKCS7 *token;
-    TS_TST_INFO *tst_info;
-} TS_RESP;
-
-/* The structure below would belong to the ESS component. */
-
-/*-
-IssuerSerial ::= SEQUENCE {
-        issuer                   GeneralNames,
-        serialNumber             CertificateSerialNumber
-        }
-*/
-
-typedef struct ESS_issuer_serial {
-    STACK_OF(GENERAL_NAME) *issuer;
-    ASN1_INTEGER *serial;
-} ESS_ISSUER_SERIAL;
-
-/*-
-ESSCertID ::=  SEQUENCE {
-        certHash                 Hash,
-        issuerSerial             IssuerSerial OPTIONAL
-}
-*/
-
-typedef struct ESS_cert_id {
-    ASN1_OCTET_STRING *hash;    /* Always SHA-1 digest. */
-    ESS_ISSUER_SERIAL *issuer_serial;
-} ESS_CERT_ID;
-
-DECLARE_STACK_OF(ESS_CERT_ID)
-DECLARE_ASN1_SET_OF(ESS_CERT_ID)
-
-/*-
-SigningCertificate ::=  SEQUENCE {
-       certs        SEQUENCE OF ESSCertID,
-       policies     SEQUENCE OF PolicyInformation OPTIONAL
-}
-*/
-
-typedef struct ESS_signing_cert {
-    STACK_OF(ESS_CERT_ID) *cert_ids;
-    STACK_OF(POLICYINFO) *policy_info;
-} ESS_SIGNING_CERT;
-
-TS_REQ *TS_REQ_new(void);
-void TS_REQ_free(TS_REQ *a);
-int i2d_TS_REQ(const TS_REQ *a, unsigned char **pp);
-TS_REQ *d2i_TS_REQ(TS_REQ **a, const unsigned char **pp, long length);
-
-TS_REQ *TS_REQ_dup(TS_REQ *a);
-
-TS_REQ *d2i_TS_REQ_fp(FILE *fp, TS_REQ **a);
-int i2d_TS_REQ_fp(FILE *fp, TS_REQ *a);
-TS_REQ *d2i_TS_REQ_bio(BIO *fp, TS_REQ **a);
-int i2d_TS_REQ_bio(BIO *fp, TS_REQ *a);
-
-TS_MSG_IMPRINT *TS_MSG_IMPRINT_new(void);
-void TS_MSG_IMPRINT_free(TS_MSG_IMPRINT *a);
-int i2d_TS_MSG_IMPRINT(const TS_MSG_IMPRINT *a, unsigned char **pp);
-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT(TS_MSG_IMPRINT **a,
-                                   const unsigned char **pp, long length);
-
-TS_MSG_IMPRINT *TS_MSG_IMPRINT_dup(TS_MSG_IMPRINT *a);
-
-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a);
-int i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a);
-TS_MSG_IMPRINT *d2i_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT **a);
-int i2d_TS_MSG_IMPRINT_bio(BIO *fp, TS_MSG_IMPRINT *a);
-
-TS_RESP *TS_RESP_new(void);
-void TS_RESP_free(TS_RESP *a);
-int i2d_TS_RESP(const TS_RESP *a, unsigned char **pp);
-TS_RESP *d2i_TS_RESP(TS_RESP **a, const unsigned char **pp, long length);
-TS_TST_INFO *PKCS7_to_TS_TST_INFO(PKCS7 *token);
-TS_RESP *TS_RESP_dup(TS_RESP *a);
-
-TS_RESP *d2i_TS_RESP_fp(FILE *fp, TS_RESP **a);
-int i2d_TS_RESP_fp(FILE *fp, TS_RESP *a);
-TS_RESP *d2i_TS_RESP_bio(BIO *fp, TS_RESP **a);
-int i2d_TS_RESP_bio(BIO *fp, TS_RESP *a);
-
-TS_STATUS_INFO *TS_STATUS_INFO_new(void);
-void TS_STATUS_INFO_free(TS_STATUS_INFO *a);
-int i2d_TS_STATUS_INFO(const TS_STATUS_INFO *a, unsigned char **pp);
-TS_STATUS_INFO *d2i_TS_STATUS_INFO(TS_STATUS_INFO **a,
-                                   const unsigned char **pp, long length);
-TS_STATUS_INFO *TS_STATUS_INFO_dup(TS_STATUS_INFO *a);
-
-TS_TST_INFO *TS_TST_INFO_new(void);
-void TS_TST_INFO_free(TS_TST_INFO *a);
-int i2d_TS_TST_INFO(const TS_TST_INFO *a, unsigned char **pp);
-TS_TST_INFO *d2i_TS_TST_INFO(TS_TST_INFO **a, const unsigned char **pp,
-                             long length);
-TS_TST_INFO *TS_TST_INFO_dup(TS_TST_INFO *a);
-
-TS_TST_INFO *d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a);
-int i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a);
-TS_TST_INFO *d2i_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO **a);
-int i2d_TS_TST_INFO_bio(BIO *fp, TS_TST_INFO *a);
-
-TS_ACCURACY *TS_ACCURACY_new(void);
-void TS_ACCURACY_free(TS_ACCURACY *a);
-int i2d_TS_ACCURACY(const TS_ACCURACY *a, unsigned char **pp);
-TS_ACCURACY *d2i_TS_ACCURACY(TS_ACCURACY **a, const unsigned char **pp,
-                             long length);
-TS_ACCURACY *TS_ACCURACY_dup(TS_ACCURACY *a);
-
-ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_new(void);
-void ESS_ISSUER_SERIAL_free(ESS_ISSUER_SERIAL *a);
-int i2d_ESS_ISSUER_SERIAL(const ESS_ISSUER_SERIAL *a, unsigned char **pp);
-ESS_ISSUER_SERIAL *d2i_ESS_ISSUER_SERIAL(ESS_ISSUER_SERIAL **a,
-                                         const unsigned char **pp,
-                                         long length);
-ESS_ISSUER_SERIAL *ESS_ISSUER_SERIAL_dup(ESS_ISSUER_SERIAL *a);
-
-ESS_CERT_ID *ESS_CERT_ID_new(void);
-void ESS_CERT_ID_free(ESS_CERT_ID *a);
-int i2d_ESS_CERT_ID(const ESS_CERT_ID *a, unsigned char **pp);
-ESS_CERT_ID *d2i_ESS_CERT_ID(ESS_CERT_ID **a, const unsigned char **pp,
-                             long length);
-ESS_CERT_ID *ESS_CERT_ID_dup(ESS_CERT_ID *a);
-
-ESS_SIGNING_CERT *ESS_SIGNING_CERT_new(void);
-void ESS_SIGNING_CERT_free(ESS_SIGNING_CERT *a);
-int i2d_ESS_SIGNING_CERT(const ESS_SIGNING_CERT *a, unsigned char **pp);
-ESS_SIGNING_CERT *d2i_ESS_SIGNING_CERT(ESS_SIGNING_CERT **a,
-                                       const unsigned char **pp, long length);
-ESS_SIGNING_CERT *ESS_SIGNING_CERT_dup(ESS_SIGNING_CERT *a);
-
-void ERR_load_TS_strings(void);
-
-int TS_REQ_set_version(TS_REQ *a, long version);
-long TS_REQ_get_version(const TS_REQ *a);
-
-int TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint);
-TS_MSG_IMPRINT *TS_REQ_get_msg_imprint(TS_REQ *a);
-
-int TS_MSG_IMPRINT_set_algo(TS_MSG_IMPRINT *a, X509_ALGOR *alg);
-X509_ALGOR *TS_MSG_IMPRINT_get_algo(TS_MSG_IMPRINT *a);
-
-int TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len);
-ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a);
-
-int TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy);
-ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a);
-
-int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce);
-const ASN1_INTEGER *TS_REQ_get_nonce(const TS_REQ *a);
-
-int TS_REQ_set_cert_req(TS_REQ *a, int cert_req);
-int TS_REQ_get_cert_req(const TS_REQ *a);
-
-STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a);
-void TS_REQ_ext_free(TS_REQ *a);
-int TS_REQ_get_ext_count(TS_REQ *a);
-int TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos);
-int TS_REQ_get_ext_by_OBJ(TS_REQ *a, ASN1_OBJECT *obj, int lastpos);
-int TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos);
-X509_EXTENSION *TS_REQ_get_ext(TS_REQ *a, int loc);
-X509_EXTENSION *TS_REQ_delete_ext(TS_REQ *a, int loc);
-int TS_REQ_add_ext(TS_REQ *a, X509_EXTENSION *ex, int loc);
-void *TS_REQ_get_ext_d2i(TS_REQ *a, int nid, int *crit, int *idx);
-
-/* Function declarations for TS_REQ defined in ts/ts_req_print.c */
-
-int TS_REQ_print_bio(BIO *bio, TS_REQ *a);
-
-/* Function declarations for TS_RESP defined in ts/ts_resp_utils.c */
-
-int TS_RESP_set_status_info(TS_RESP *a, TS_STATUS_INFO *info);
-TS_STATUS_INFO *TS_RESP_get_status_info(TS_RESP *a);
-
-/* Caller loses ownership of PKCS7 and TS_TST_INFO objects. */
-void TS_RESP_set_tst_info(TS_RESP *a, PKCS7 *p7, TS_TST_INFO *tst_info);
-PKCS7 *TS_RESP_get_token(TS_RESP *a);
-TS_TST_INFO *TS_RESP_get_tst_info(TS_RESP *a);
-
-int TS_TST_INFO_set_version(TS_TST_INFO *a, long version);
-long TS_TST_INFO_get_version(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_policy_id(TS_TST_INFO *a, ASN1_OBJECT *policy_id);
-ASN1_OBJECT *TS_TST_INFO_get_policy_id(TS_TST_INFO *a);
-
-int TS_TST_INFO_set_msg_imprint(TS_TST_INFO *a, TS_MSG_IMPRINT *msg_imprint);
-TS_MSG_IMPRINT *TS_TST_INFO_get_msg_imprint(TS_TST_INFO *a);
-
-int TS_TST_INFO_set_serial(TS_TST_INFO *a, const ASN1_INTEGER *serial);
-const ASN1_INTEGER *TS_TST_INFO_get_serial(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime);
-const ASN1_GENERALIZEDTIME *TS_TST_INFO_get_time(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_accuracy(TS_TST_INFO *a, TS_ACCURACY *accuracy);
-TS_ACCURACY *TS_TST_INFO_get_accuracy(TS_TST_INFO *a);
-
-int TS_ACCURACY_set_seconds(TS_ACCURACY *a, const ASN1_INTEGER *seconds);
-const ASN1_INTEGER *TS_ACCURACY_get_seconds(const TS_ACCURACY *a);
-
-int TS_ACCURACY_set_millis(TS_ACCURACY *a, const ASN1_INTEGER *millis);
-const ASN1_INTEGER *TS_ACCURACY_get_millis(const TS_ACCURACY *a);
-
-int TS_ACCURACY_set_micros(TS_ACCURACY *a, const ASN1_INTEGER *micros);
-const ASN1_INTEGER *TS_ACCURACY_get_micros(const TS_ACCURACY *a);
-
-int TS_TST_INFO_set_ordering(TS_TST_INFO *a, int ordering);
-int TS_TST_INFO_get_ordering(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_nonce(TS_TST_INFO *a, const ASN1_INTEGER *nonce);
-const ASN1_INTEGER *TS_TST_INFO_get_nonce(const TS_TST_INFO *a);
-
-int TS_TST_INFO_set_tsa(TS_TST_INFO *a, GENERAL_NAME *tsa);
-GENERAL_NAME *TS_TST_INFO_get_tsa(TS_TST_INFO *a);
-
-STACK_OF(X509_EXTENSION) *TS_TST_INFO_get_exts(TS_TST_INFO *a);
-void TS_TST_INFO_ext_free(TS_TST_INFO *a);
-int TS_TST_INFO_get_ext_count(TS_TST_INFO *a);
-int TS_TST_INFO_get_ext_by_NID(TS_TST_INFO *a, int nid, int lastpos);
-int TS_TST_INFO_get_ext_by_OBJ(TS_TST_INFO *a, ASN1_OBJECT *obj, int lastpos);
-int TS_TST_INFO_get_ext_by_critical(TS_TST_INFO *a, int crit, int lastpos);
-X509_EXTENSION *TS_TST_INFO_get_ext(TS_TST_INFO *a, int loc);
-X509_EXTENSION *TS_TST_INFO_delete_ext(TS_TST_INFO *a, int loc);
-int TS_TST_INFO_add_ext(TS_TST_INFO *a, X509_EXTENSION *ex, int loc);
-void *TS_TST_INFO_get_ext_d2i(TS_TST_INFO *a, int nid, int *crit, int *idx);
-
-/*
- * Declarations related to response generation, defined in ts/ts_resp_sign.c.
- */
-
-/* Optional flags for response generation. */
-
-/* Don't include the TSA name in response. */
-# define TS_TSA_NAME             0x01
-
-/* Set ordering to true in response. */
-# define TS_ORDERING             0x02
-
-/*
- * Include the signer certificate and the other specified certificates in
- * the ESS signing certificate attribute beside the PKCS7 signed data.
- * Only the signer certificates is included by default.
- */
-# define TS_ESS_CERT_ID_CHAIN    0x04
-
-/* Forward declaration. */
-struct TS_resp_ctx;
-
-/* This must return a unique number less than 160 bits long. */
-typedef ASN1_INTEGER *(*TS_serial_cb) (struct TS_resp_ctx *, void *);
-
-/*
- * This must return the seconds and microseconds since Jan 1, 1970 in the sec
- * and usec variables allocated by the caller. Return non-zero for success
- * and zero for failure.
- */
-typedef int (*TS_time_cb) (struct TS_resp_ctx *, void *, long *sec,
-                           long *usec);
-
-/*
- * This must process the given extension. It can modify the TS_TST_INFO
- * object of the context. Return values: !0 (processed), 0 (error, it must
- * set the status info/failure info of the response).
- */
-typedef int (*TS_extension_cb) (struct TS_resp_ctx *, X509_EXTENSION *,
-                                void *);
-
-typedef struct TS_resp_ctx {
-    X509 *signer_cert;
-    EVP_PKEY *signer_key;
-    STACK_OF(X509) *certs;      /* Certs to include in signed data. */
-    STACK_OF(ASN1_OBJECT) *policies; /* Acceptable policies. */
-    ASN1_OBJECT *default_policy; /* It may appear in policies, too. */
-    STACK_OF(EVP_MD) *mds;      /* Acceptable message digests. */
-    ASN1_INTEGER *seconds;      /* accuracy, 0 means not specified. */
-    ASN1_INTEGER *millis;       /* accuracy, 0 means not specified. */
-    ASN1_INTEGER *micros;       /* accuracy, 0 means not specified. */
-    unsigned clock_precision_digits; /* fraction of seconds in time stamp
-                                      * token. */
-    unsigned flags;             /* Optional info, see values above. */
-    /* Callback functions. */
-    TS_serial_cb serial_cb;
-    void *serial_cb_data;       /* User data for serial_cb. */
-    TS_time_cb time_cb;
-    void *time_cb_data;         /* User data for time_cb. */
-    TS_extension_cb extension_cb;
-    void *extension_cb_data;    /* User data for extension_cb. */
-    /* These members are used only while creating the response. */
-    TS_REQ *request;
-    TS_RESP *response;
-    TS_TST_INFO *tst_info;
-} TS_RESP_CTX;
-
-DECLARE_STACK_OF(EVP_MD)
-DECLARE_ASN1_SET_OF(EVP_MD)
-
-/* Creates a response context that can be used for generating responses. */
-TS_RESP_CTX *TS_RESP_CTX_new(void);
-void TS_RESP_CTX_free(TS_RESP_CTX *ctx);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_signer_cert(TS_RESP_CTX *ctx, X509 *signer);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_signer_key(TS_RESP_CTX *ctx, EVP_PKEY *key);
-
-/* This parameter must be set. */
-int TS_RESP_CTX_set_def_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *def_policy);
-
-/* No additional certs are included in the response by default. */
-int TS_RESP_CTX_set_certs(TS_RESP_CTX *ctx, STACK_OF(X509) *certs);
-
-/*
- * Adds a new acceptable policy, only the default policy is accepted by
- * default.
- */
-int TS_RESP_CTX_add_policy(TS_RESP_CTX *ctx, ASN1_OBJECT *policy);
-
-/*
- * Adds a new acceptable message digest. Note that no message digests are
- * accepted by default. The md argument is shared with the caller.
- */
-int TS_RESP_CTX_add_md(TS_RESP_CTX *ctx, const EVP_MD *md);
-
-/* Accuracy is not included by default. */
-int TS_RESP_CTX_set_accuracy(TS_RESP_CTX *ctx,
-                             int secs, int millis, int micros);
-
-/*
- * Clock precision digits, i.e. the number of decimal digits: '0' means sec,
- * '3' msec, '6' usec, and so on. Default is 0.
- */
-int TS_RESP_CTX_set_clock_precision_digits(TS_RESP_CTX *ctx,
-                                           unsigned clock_precision_digits);
-/* At most we accept usec precision. */
-# define TS_MAX_CLOCK_PRECISION_DIGITS   6
-
-/* No flags are set by default. */
-void TS_RESP_CTX_add_flags(TS_RESP_CTX *ctx, int flags);
-
-/* Default callback always returns a constant. */
-void TS_RESP_CTX_set_serial_cb(TS_RESP_CTX *ctx, TS_serial_cb cb, void *data);
-
-/* Default callback uses the gettimeofday() and gmtime() system calls. */
-void TS_RESP_CTX_set_time_cb(TS_RESP_CTX *ctx, TS_time_cb cb, void *data);
-
-/*
- * Default callback rejects all extensions. The extension callback is called
- * when the TS_TST_INFO object is already set up and not signed yet.
- */
-/* FIXME: extension handling is not tested yet. */
-void TS_RESP_CTX_set_extension_cb(TS_RESP_CTX *ctx,
-                                  TS_extension_cb cb, void *data);
-
-/* The following methods can be used in the callbacks. */
-int TS_RESP_CTX_set_status_info(TS_RESP_CTX *ctx,
-                                int status, const char *text);
-
-/* Sets the status info only if it is still TS_STATUS_GRANTED. */
-int TS_RESP_CTX_set_status_info_cond(TS_RESP_CTX *ctx,
-                                     int status, const char *text);
-
-int TS_RESP_CTX_add_failure_info(TS_RESP_CTX *ctx, int failure);
-
-/* The get methods below can be used in the extension callback. */
-TS_REQ *TS_RESP_CTX_get_request(TS_RESP_CTX *ctx);
-
-TS_TST_INFO *TS_RESP_CTX_get_tst_info(TS_RESP_CTX *ctx);
-
-/*
- * Creates the signed TS_TST_INFO and puts it in TS_RESP.
- * In case of errors it sets the status info properly.
- * Returns NULL only in case of memory allocation/fatal error.
- */
-TS_RESP *TS_RESP_create_response(TS_RESP_CTX *ctx, BIO *req_bio);
-
-/*
- * Declarations related to response verification,
- * they are defined in ts/ts_resp_verify.c.
- */
-
-int TS_RESP_verify_signature(PKCS7 *token, STACK_OF(X509) *certs,
-                             X509_STORE *store, X509 **signer_out);
-
-/* Context structure for the generic verify method. */
-
-/* Verify the signer's certificate and the signature of the response. */
-# define TS_VFY_SIGNATURE        (1u << 0)
-/* Verify the version number of the response. */
-# define TS_VFY_VERSION          (1u << 1)
-/* Verify if the policy supplied by the user matches the policy of the TSA. */
-# define TS_VFY_POLICY           (1u << 2)
-/*
- * Verify the message imprint provided by the user. This flag should not be
- * specified with TS_VFY_DATA.
- */
-# define TS_VFY_IMPRINT          (1u << 3)
-/*
- * Verify the message imprint computed by the verify method from the user
- * provided data and the MD algorithm of the response. This flag should not
- * be specified with TS_VFY_IMPRINT.
- */
-# define TS_VFY_DATA             (1u << 4)
-/* Verify the nonce value. */
-# define TS_VFY_NONCE            (1u << 5)
-/* Verify if the TSA name field matches the signer certificate. */
-# define TS_VFY_SIGNER           (1u << 6)
-/* Verify if the TSA name field equals to the user provided name. */
-# define TS_VFY_TSA_NAME         (1u << 7)
-
-/* You can use the following convenience constants. */
-# define TS_VFY_ALL_IMPRINT      (TS_VFY_SIGNATURE       \
-                                 | TS_VFY_VERSION       \
-                                 | TS_VFY_POLICY        \
-                                 | TS_VFY_IMPRINT       \
-                                 | TS_VFY_NONCE         \
-                                 | TS_VFY_SIGNER        \
-                                 | TS_VFY_TSA_NAME)
-# define TS_VFY_ALL_DATA         (TS_VFY_SIGNATURE       \
-                                 | TS_VFY_VERSION       \
-                                 | TS_VFY_POLICY        \
-                                 | TS_VFY_DATA          \
-                                 | TS_VFY_NONCE         \
-                                 | TS_VFY_SIGNER        \
-                                 | TS_VFY_TSA_NAME)
-
-typedef struct TS_verify_ctx {
-    /* Set this to the union of TS_VFY_... flags you want to carry out. */
-    unsigned flags;
-    /* Must be set only with TS_VFY_SIGNATURE. certs is optional. */
-    X509_STORE *store;
-    STACK_OF(X509) *certs;
-    /* Must be set only with TS_VFY_POLICY. */
-    ASN1_OBJECT *policy;
-    /*
-     * Must be set only with TS_VFY_IMPRINT. If md_alg is NULL, the
-     * algorithm from the response is used.
-     */
-    X509_ALGOR *md_alg;
-    unsigned char *imprint;
-    unsigned imprint_len;
-    /* Must be set only with TS_VFY_DATA. */
-    BIO *data;
-    /* Must be set only with TS_VFY_TSA_NAME. */
-    ASN1_INTEGER *nonce;
-    /* Must be set only with TS_VFY_TSA_NAME. */
-    GENERAL_NAME *tsa_name;
-} TS_VERIFY_CTX;
-
-int TS_RESP_verify_response(TS_VERIFY_CTX *ctx, TS_RESP *response);
-int TS_RESP_verify_token(TS_VERIFY_CTX *ctx, PKCS7 *token);
-
-/*
- * Declarations related to response verification context,
- * they are defined in ts/ts_verify_ctx.c.
- */
-
-/* Set all fields to zero. */
-TS_VERIFY_CTX *TS_VERIFY_CTX_new(void);
-void TS_VERIFY_CTX_init(TS_VERIFY_CTX *ctx);
-void TS_VERIFY_CTX_free(TS_VERIFY_CTX *ctx);
-void TS_VERIFY_CTX_cleanup(TS_VERIFY_CTX *ctx);
-
-/*-
- * If ctx is NULL, it allocates and returns a new object, otherwise
- * it returns ctx. It initialises all the members as follows:
- * flags = TS_VFY_ALL_IMPRINT & ~(TS_VFY_TSA_NAME | TS_VFY_SIGNATURE)
- * certs = NULL
- * store = NULL
- * policy = policy from the request or NULL if absent (in this case
- *      TS_VFY_POLICY is cleared from flags as well)
- * md_alg = MD algorithm from request
- * imprint, imprint_len = imprint from request
- * data = NULL
- * nonce, nonce_len = nonce from the request or NULL if absent (in this case
- *      TS_VFY_NONCE is cleared from flags as well)
- * tsa_name = NULL
- * Important: after calling this method TS_VFY_SIGNATURE should be added!
- */
-TS_VERIFY_CTX *TS_REQ_to_TS_VERIFY_CTX(TS_REQ *req, TS_VERIFY_CTX *ctx);
-
-/* Function declarations for TS_RESP defined in ts/ts_resp_print.c */
-
-int TS_RESP_print_bio(BIO *bio, TS_RESP *a);
-int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a);
-int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a);
-
-/* Common utility functions defined in ts/ts_lib.c */
-
-int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num);
-int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj);
-int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions);
-int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg);
-int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *msg);
-
-/*
- * Function declarations for handling configuration options, defined in
- * ts/ts_conf.c
- */
-
-X509 *TS_CONF_load_cert(const char *file);
-STACK_OF(X509) *TS_CONF_load_certs(const char *file);
-EVP_PKEY *TS_CONF_load_key(const char *file, const char *pass);
-const char *TS_CONF_get_tsa_section(CONF *conf, const char *section);
-int TS_CONF_set_serial(CONF *conf, const char *section, TS_serial_cb cb,
-                       TS_RESP_CTX *ctx);
-int TS_CONF_set_crypto_device(CONF *conf, const char *section,
-                              const char *device);
-int TS_CONF_set_default_engine(const char *name);
-int TS_CONF_set_signer_cert(CONF *conf, const char *section,
-                            const char *cert, TS_RESP_CTX *ctx);
-int TS_CONF_set_certs(CONF *conf, const char *section, const char *certs,
-                      TS_RESP_CTX *ctx);
-int TS_CONF_set_signer_key(CONF *conf, const char *section,
-                           const char *key, const char *pass,
-                           TS_RESP_CTX *ctx);
-int TS_CONF_set_def_policy(CONF *conf, const char *section,
-                           const char *policy, TS_RESP_CTX *ctx);
-int TS_CONF_set_policies(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_digests(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_accuracy(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_clock_precision_digits(CONF *conf, const char *section,
-                                       TS_RESP_CTX *ctx);
-int TS_CONF_set_ordering(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx);
-int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
-                                  TS_RESP_CTX *ctx);
-
-/* -------------------------------------------------- */
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_TS_strings(void);
-
-/* Error codes for the TS functions. */
-
-/* Function codes. */
-# define TS_F_D2I_TS_RESP                                 147
-# define TS_F_DEF_SERIAL_CB                               110
-# define TS_F_DEF_TIME_CB                                 111
-# define TS_F_ESS_ADD_SIGNING_CERT                        112
-# define TS_F_ESS_CERT_ID_NEW_INIT                        113
-# define TS_F_ESS_SIGNING_CERT_NEW_INIT                   114
-# define TS_F_INT_TS_RESP_VERIFY_TOKEN                    149
-# define TS_F_PKCS7_TO_TS_TST_INFO                        148
-# define TS_F_TS_ACCURACY_SET_MICROS                      115
-# define TS_F_TS_ACCURACY_SET_MILLIS                      116
-# define TS_F_TS_ACCURACY_SET_SECONDS                     117
-# define TS_F_TS_CHECK_IMPRINTS                           100
-# define TS_F_TS_CHECK_NONCES                             101
-# define TS_F_TS_CHECK_POLICY                             102
-# define TS_F_TS_CHECK_SIGNING_CERTS                      103
-# define TS_F_TS_CHECK_STATUS_INFO                        104
-# define TS_F_TS_COMPUTE_IMPRINT                          145
-# define TS_F_TS_CONF_SET_DEFAULT_ENGINE                  146
-# define TS_F_TS_GET_STATUS_TEXT                          105
-# define TS_F_TS_MSG_IMPRINT_SET_ALGO                     118
-# define TS_F_TS_REQ_SET_MSG_IMPRINT                      119
-# define TS_F_TS_REQ_SET_NONCE                            120
-# define TS_F_TS_REQ_SET_POLICY_ID                        121
-# define TS_F_TS_RESP_CREATE_RESPONSE                     122
-# define TS_F_TS_RESP_CREATE_TST_INFO                     123
-# define TS_F_TS_RESP_CTX_ADD_FAILURE_INFO                124
-# define TS_F_TS_RESP_CTX_ADD_MD                          125
-# define TS_F_TS_RESP_CTX_ADD_POLICY                      126
-# define TS_F_TS_RESP_CTX_NEW                             127
-# define TS_F_TS_RESP_CTX_SET_ACCURACY                    128
-# define TS_F_TS_RESP_CTX_SET_CERTS                       129
-# define TS_F_TS_RESP_CTX_SET_DEF_POLICY                  130
-# define TS_F_TS_RESP_CTX_SET_SIGNER_CERT                 131
-# define TS_F_TS_RESP_CTX_SET_STATUS_INFO                 132
-# define TS_F_TS_RESP_GET_POLICY                          133
-# define TS_F_TS_RESP_SET_GENTIME_WITH_PRECISION          134
-# define TS_F_TS_RESP_SET_STATUS_INFO                     135
-# define TS_F_TS_RESP_SET_TST_INFO                        150
-# define TS_F_TS_RESP_SIGN                                136
-# define TS_F_TS_RESP_VERIFY_SIGNATURE                    106
-# define TS_F_TS_RESP_VERIFY_TOKEN                        107
-# define TS_F_TS_TST_INFO_SET_ACCURACY                    137
-# define TS_F_TS_TST_INFO_SET_MSG_IMPRINT                 138
-# define TS_F_TS_TST_INFO_SET_NONCE                       139
-# define TS_F_TS_TST_INFO_SET_POLICY_ID                   140
-# define TS_F_TS_TST_INFO_SET_SERIAL                      141
-# define TS_F_TS_TST_INFO_SET_TIME                        142
-# define TS_F_TS_TST_INFO_SET_TSA                         143
-# define TS_F_TS_VERIFY                                   108
-# define TS_F_TS_VERIFY_CERT                              109
-# define TS_F_TS_VERIFY_CTX_NEW                           144
-
-/* Reason codes. */
-# define TS_R_BAD_PKCS7_TYPE                              132
-# define TS_R_BAD_TYPE                                    133
-# define TS_R_CERTIFICATE_VERIFY_ERROR                    100
-# define TS_R_COULD_NOT_SET_ENGINE                        127
-# define TS_R_COULD_NOT_SET_TIME                          115
-# define TS_R_D2I_TS_RESP_INT_FAILED                      128
-# define TS_R_DETACHED_CONTENT                            134
-# define TS_R_ESS_ADD_SIGNING_CERT_ERROR                  116
-# define TS_R_ESS_SIGNING_CERTIFICATE_ERROR               101
-# define TS_R_INVALID_NULL_POINTER                        102
-# define TS_R_INVALID_SIGNER_CERTIFICATE_PURPOSE          117
-# define TS_R_MESSAGE_IMPRINT_MISMATCH                    103
-# define TS_R_NONCE_MISMATCH                              104
-# define TS_R_NONCE_NOT_RETURNED                          105
-# define TS_R_NO_CONTENT                                  106
-# define TS_R_NO_TIME_STAMP_TOKEN                         107
-# define TS_R_PKCS7_ADD_SIGNATURE_ERROR                   118
-# define TS_R_PKCS7_ADD_SIGNED_ATTR_ERROR                 119
-# define TS_R_PKCS7_TO_TS_TST_INFO_FAILED                 129
-# define TS_R_POLICY_MISMATCH                             108
-# define TS_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE      120
-# define TS_R_RESPONSE_SETUP_ERROR                        121
-# define TS_R_SIGNATURE_FAILURE                           109
-# define TS_R_THERE_MUST_BE_ONE_SIGNER                    110
-# define TS_R_TIME_SYSCALL_ERROR                          122
-# define TS_R_TOKEN_NOT_PRESENT                           130
-# define TS_R_TOKEN_PRESENT                               131
-# define TS_R_TSA_NAME_MISMATCH                           111
-# define TS_R_TSA_UNTRUSTED                               112
-# define TS_R_TST_INFO_SETUP_ERROR                        123
-# define TS_R_TS_DATASIGN                                 124
-# define TS_R_UNACCEPTABLE_POLICY                         125
-# define TS_R_UNSUPPORTED_MD_ALGORITHM                    126
-# define TS_R_UNSUPPORTED_VERSION                         113
-# define TS_R_WRONG_CONTENT_TYPE                          114
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/txt_db.h b/include.new/openssl/txt_db.h
deleted file mode 100644
index 98e23a2..0000000
--- a/include.new/openssl/txt_db.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* crypto/txt_db/txt_db.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_TXT_DB_H
-# define HEADER_TXT_DB_H
-
-# include <openssl/opensslconf.h>
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/stack.h>
-# include <openssl/lhash.h>
-
-# define DB_ERROR_OK                     0
-# define DB_ERROR_MALLOC                 1
-# define DB_ERROR_INDEX_CLASH            2
-# define DB_ERROR_INDEX_OUT_OF_RANGE     3
-# define DB_ERROR_NO_INDEX               4
-# define DB_ERROR_INSERT_INDEX_CLASH     5
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef OPENSSL_STRING *OPENSSL_PSTRING;
-DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
-
-typedef struct txt_db_st {
-    int num_fields;
-    STACK_OF(OPENSSL_PSTRING) *data;
-    LHASH_OF(OPENSSL_STRING) **index;
-    int (**qual) (OPENSSL_STRING *);
-    long error;
-    long arg1;
-    long arg2;
-    OPENSSL_STRING *arg_row;
-} TXT_DB;
-
-# ifndef OPENSSL_NO_BIO
-TXT_DB *TXT_DB_read(BIO *in, int num);
-long TXT_DB_write(BIO *out, TXT_DB *db);
-# else
-TXT_DB *TXT_DB_read(char *in, int num);
-long TXT_DB_write(char *out, TXT_DB *db);
-# endif
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual) (OPENSSL_STRING *),
-                        LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
-void TXT_DB_free(TXT_DB *db);
-OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx,
-                                    OPENSSL_STRING *value);
-int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/ui.h b/include.new/openssl/ui.h
deleted file mode 100644
index b917eda..0000000
--- a/include.new/openssl/ui.h
+++ /dev/null
@@ -1,415 +0,0 @@
-/* crypto/ui/ui.h -*- mode:C; c-file-style: "eay" -*- */
-/*
- * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
- * 2001.
- */
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_UI_H
-# define HEADER_UI_H
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  include <openssl/crypto.h>
-# endif
-# include <openssl/safestack.h>
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/* Declared already in ossl_typ.h */
-/* typedef struct ui_st UI; */
-/* typedef struct ui_method_st UI_METHOD; */
-
-/*
- * All the following functions return -1 or NULL on error and in some cases
- * (UI_process()) -2 if interrupted or in some other way cancelled. When
- * everything is fine, they return 0, a positive value or a non-NULL pointer,
- * all depending on their purpose.
- */
-
-/* Creators and destructor.   */
-UI *UI_new(void);
-UI *UI_new_method(const UI_METHOD *method);
-void UI_free(UI *ui);
-
-/*-
-   The following functions are used to add strings to be printed and prompt
-   strings to prompt for data.  The names are UI_{add,dup}_<function>_string
-   and UI_{add,dup}_input_boolean.
-
-   UI_{add,dup}_<function>_string have the following meanings:
-        add     add a text or prompt string.  The pointers given to these
-                functions are used verbatim, no copying is done.
-        dup     make a copy of the text or prompt string, then add the copy
-                to the collection of strings in the user interface.
-        <function>
-                The function is a name for the functionality that the given
-                string shall be used for.  It can be one of:
-                        input   use the string as data prompt.
-                        verify  use the string as verification prompt.  This
-                                is used to verify a previous input.
-                        info    use the string for informational output.
-                        error   use the string for error output.
-   Honestly, there's currently no difference between info and error for the
-   moment.
-
-   UI_{add,dup}_input_boolean have the same semantics for "add" and "dup",
-   and are typically used when one wants to prompt for a yes/no response.
-
-   All of the functions in this group take a UI and a prompt string.
-   The string input and verify addition functions also take a flag argument,
-   a buffer for the result to end up with, a minimum input size and a maximum
-   input size (the result buffer MUST be large enough to be able to contain
-   the maximum number of characters).  Additionally, the verify addition
-   functions takes another buffer to compare the result against.
-   The boolean input functions take an action description string (which should
-   be safe to ignore if the expected user action is obvious, for example with
-   a dialog box with an OK button and a Cancel button), a string of acceptable
-   characters to mean OK and to mean Cancel.  The two last strings are checked
-   to make sure they don't have common characters.  Additionally, the same
-   flag argument as for the string input is taken, as well as a result buffer.
-   The result buffer is required to be at least one byte long.  Depending on
-   the answer, the first character from the OK or the Cancel character strings
-   will be stored in the first byte of the result buffer.  No NUL will be
-   added, so the result is *not* a string.
-
-   On success, the all return an index of the added information.  That index
-   is usefull when retrieving results with UI_get0_result(). */
-int UI_add_input_string(UI *ui, const char *prompt, int flags,
-                        char *result_buf, int minsize, int maxsize);
-int UI_dup_input_string(UI *ui, const char *prompt, int flags,
-                        char *result_buf, int minsize, int maxsize);
-int UI_add_verify_string(UI *ui, const char *prompt, int flags,
-                         char *result_buf, int minsize, int maxsize,
-                         const char *test_buf);
-int UI_dup_verify_string(UI *ui, const char *prompt, int flags,
-                         char *result_buf, int minsize, int maxsize,
-                         const char *test_buf);
-int UI_add_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-                         const char *ok_chars, const char *cancel_chars,
-                         int flags, char *result_buf);
-int UI_dup_input_boolean(UI *ui, const char *prompt, const char *action_desc,
-                         const char *ok_chars, const char *cancel_chars,
-                         int flags, char *result_buf);
-int UI_add_info_string(UI *ui, const char *text);
-int UI_dup_info_string(UI *ui, const char *text);
-int UI_add_error_string(UI *ui, const char *text);
-int UI_dup_error_string(UI *ui, const char *text);
-
-/* These are the possible flags.  They can be or'ed together. */
-/* Use to have echoing of input */
-# define UI_INPUT_FLAG_ECHO              0x01
-/*
- * Use a default password.  Where that password is found is completely up to
- * the application, it might for example be in the user data set with
- * UI_add_user_data().  It is not recommended to have more than one input in
- * each UI being marked with this flag, or the application might get
- * confused.
- */
-# define UI_INPUT_FLAG_DEFAULT_PWD       0x02
-
-/*-
- * The user of these routines may want to define flags of their own.  The core
- * UI won't look at those, but will pass them on to the method routines.  They
- * must use higher bits so they don't get confused with the UI bits above.
- * UI_INPUT_FLAG_USER_BASE tells which is the lowest bit to use.  A good
- * example of use is this:
- *
- *    #define MY_UI_FLAG1       (0x01 << UI_INPUT_FLAG_USER_BASE)
- *
-*/
-# define UI_INPUT_FLAG_USER_BASE 16
-
-/*-
- * The following function helps construct a prompt.  object_desc is a
- * textual short description of the object, for example "pass phrase",
- * and object_name is the name of the object (might be a card name or
- * a file name.
- * The returned string shall always be allocated on the heap with
- * OPENSSL_malloc(), and need to be free'd with OPENSSL_free().
- *
- * If the ui_method doesn't contain a pointer to a user-defined prompt
- * constructor, a default string is built, looking like this:
- *
- *       "Enter {object_desc} for {object_name}:"
- *
- * So, if object_desc has the value "pass phrase" and object_name has
- * the value "foo.key", the resulting string is:
- *
- *       "Enter pass phrase for foo.key:"
-*/
-char *UI_construct_prompt(UI *ui_method,
-                          const char *object_desc, const char *object_name);
-
-/*
- * The following function is used to store a pointer to user-specific data.
- * Any previous such pointer will be returned and replaced.
- *
- * For callback purposes, this function makes a lot more sense than using
- * ex_data, since the latter requires that different parts of OpenSSL or
- * applications share the same ex_data index.
- *
- * Note that the UI_OpenSSL() method completely ignores the user data. Other
- * methods may not, however.
- */
-void *UI_add_user_data(UI *ui, void *user_data);
-/* We need a user data retrieving function as well.  */
-void *UI_get0_user_data(UI *ui);
-
-/* Return the result associated with a prompt given with the index i. */
-const char *UI_get0_result(UI *ui, int i);
-
-/* When all strings have been added, process the whole thing. */
-int UI_process(UI *ui);
-
-/*
- * Give a user interface parametrised control commands.  This can be used to
- * send down an integer, a data pointer or a function pointer, as well as be
- * used to get information from a UI.
- */
-int UI_ctrl(UI *ui, int cmd, long i, void *p, void (*f) (void));
-
-/* The commands */
-/*
- * Use UI_CONTROL_PRINT_ERRORS with the value 1 to have UI_process print the
- * OpenSSL error stack before printing any info or added error messages and
- * before any prompting.
- */
-# define UI_CTRL_PRINT_ERRORS            1
-/*
- * Check if a UI_process() is possible to do again with the same instance of
- * a user interface.  This makes UI_ctrl() return 1 if it is redoable, and 0
- * if not.
- */
-# define UI_CTRL_IS_REDOABLE             2
-
-/* Some methods may use extra data */
-# define UI_set_app_data(s,arg)         UI_set_ex_data(s,0,arg)
-# define UI_get_app_data(s)             UI_get_ex_data(s,0)
-int UI_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                        CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int UI_set_ex_data(UI *r, int idx, void *arg);
-void *UI_get_ex_data(UI *r, int idx);
-
-/* Use specific methods instead of the built-in one */
-void UI_set_default_method(const UI_METHOD *meth);
-const UI_METHOD *UI_get_default_method(void);
-const UI_METHOD *UI_get_method(UI *ui);
-const UI_METHOD *UI_set_method(UI *ui, const UI_METHOD *meth);
-
-/* The method with all the built-in thingies */
-UI_METHOD *UI_OpenSSL(void);
-
-/* ---------- For method writers ---------- */
-/*-
-   A method contains a number of functions that implement the low level
-   of the User Interface.  The functions are:
-
-        an opener       This function starts a session, maybe by opening
-                        a channel to a tty, or by opening a window.
-        a writer        This function is called to write a given string,
-                        maybe to the tty, maybe as a field label in a
-                        window.
-        a flusher       This function is called to flush everything that
-                        has been output so far.  It can be used to actually
-                        display a dialog box after it has been built.
-        a reader        This function is called to read a given prompt,
-                        maybe from the tty, maybe from a field in a
-                        window.  Note that it's called wth all string
-                        structures, not only the prompt ones, so it must
-                        check such things itself.
-        a closer        This function closes the session, maybe by closing
-                        the channel to the tty, or closing the window.
-
-   All these functions are expected to return:
-
-        0       on error.
-        1       on success.
-        -1      on out-of-band events, for example if some prompting has
-                been canceled (by pressing Ctrl-C, for example).  This is
-                only checked when returned by the flusher or the reader.
-
-   The way this is used, the opener is first called, then the writer for all
-   strings, then the flusher, then the reader for all strings and finally the
-   closer.  Note that if you want to prompt from a terminal or other command
-   line interface, the best is to have the reader also write the prompts
-   instead of having the writer do it.  If you want to prompt from a dialog
-   box, the writer can be used to build up the contents of the box, and the
-   flusher to actually display the box and run the event loop until all data
-   has been given, after which the reader only grabs the given data and puts
-   them back into the UI strings.
-
-   All method functions take a UI as argument.  Additionally, the writer and
-   the reader take a UI_STRING.
-*/
-
-/*
- * The UI_STRING type is the data structure that contains all the needed info
- * about a string or a prompt, including test data for a verification prompt.
- */
-typedef struct ui_string_st UI_STRING;
-DECLARE_STACK_OF(UI_STRING)
-
-/*
- * The different types of strings that are currently supported. This is only
- * needed by method authors.
- */
-enum UI_string_types {
-    UIT_NONE = 0,
-    UIT_PROMPT,                 /* Prompt for a string */
-    UIT_VERIFY,                 /* Prompt for a string and verify */
-    UIT_BOOLEAN,                /* Prompt for a yes/no response */
-    UIT_INFO,                   /* Send info to the user */
-    UIT_ERROR                   /* Send an error message to the user */
-};
-
-/* Create and manipulate methods */
-UI_METHOD *UI_create_method(char *name);
-void UI_destroy_method(UI_METHOD *ui_method);
-int UI_method_set_opener(UI_METHOD *method, int (*opener) (UI *ui));
-int UI_method_set_writer(UI_METHOD *method,
-                         int (*writer) (UI *ui, UI_STRING *uis));
-int UI_method_set_flusher(UI_METHOD *method, int (*flusher) (UI *ui));
-int UI_method_set_reader(UI_METHOD *method,
-                         int (*reader) (UI *ui, UI_STRING *uis));
-int UI_method_set_closer(UI_METHOD *method, int (*closer) (UI *ui));
-int UI_method_set_prompt_constructor(UI_METHOD *method,
-                                     char *(*prompt_constructor) (UI *ui,
-                                                                  const char
-                                                                  *object_desc,
-                                                                  const char
-                                                                  *object_name));
-int (*UI_method_get_opener(UI_METHOD *method)) (UI *);
-int (*UI_method_get_writer(UI_METHOD *method)) (UI *, UI_STRING *);
-int (*UI_method_get_flusher(UI_METHOD *method)) (UI *);
-int (*UI_method_get_reader(UI_METHOD *method)) (UI *, UI_STRING *);
-int (*UI_method_get_closer(UI_METHOD *method)) (UI *);
-char *(*UI_method_get_prompt_constructor(UI_METHOD *method)) (UI *,
-                                                              const char *,
-                                                              const char *);
-
-/*
- * The following functions are helpers for method writers to access relevant
- * data from a UI_STRING.
- */
-
-/* Return type of the UI_STRING */
-enum UI_string_types UI_get_string_type(UI_STRING *uis);
-/* Return input flags of the UI_STRING */
-int UI_get_input_flags(UI_STRING *uis);
-/* Return the actual string to output (the prompt, info or error) */
-const char *UI_get0_output_string(UI_STRING *uis);
-/*
- * Return the optional action string to output (the boolean promtp
- * instruction)
- */
-const char *UI_get0_action_string(UI_STRING *uis);
-/* Return the result of a prompt */
-const char *UI_get0_result_string(UI_STRING *uis);
-/*
- * Return the string to test the result against.  Only useful with verifies.
- */
-const char *UI_get0_test_string(UI_STRING *uis);
-/* Return the required minimum size of the result */
-int UI_get_result_minsize(UI_STRING *uis);
-/* Return the required maximum size of the result */
-int UI_get_result_maxsize(UI_STRING *uis);
-/* Set the result of a UI_STRING. */
-int UI_set_result(UI *ui, UI_STRING *uis, const char *result);
-
-/* A couple of popular utility functions */
-int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt,
-                           int verify);
-int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt,
-                    int verify);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_UI_strings(void);
-
-/* Error codes for the UI functions. */
-
-/* Function codes. */
-# define UI_F_GENERAL_ALLOCATE_BOOLEAN                    108
-# define UI_F_GENERAL_ALLOCATE_PROMPT                     109
-# define UI_F_GENERAL_ALLOCATE_STRING                     100
-# define UI_F_UI_CTRL                                     111
-# define UI_F_UI_DUP_ERROR_STRING                         101
-# define UI_F_UI_DUP_INFO_STRING                          102
-# define UI_F_UI_DUP_INPUT_BOOLEAN                        110
-# define UI_F_UI_DUP_INPUT_STRING                         103
-# define UI_F_UI_DUP_VERIFY_STRING                        106
-# define UI_F_UI_GET0_RESULT                              107
-# define UI_F_UI_NEW_METHOD                               104
-# define UI_F_UI_SET_RESULT                               105
-
-/* Reason codes. */
-# define UI_R_COMMON_OK_AND_CANCEL_CHARACTERS             104
-# define UI_R_INDEX_TOO_LARGE                             102
-# define UI_R_INDEX_TOO_SMALL                             103
-# define UI_R_NO_RESULT_BUFFER                            105
-# define UI_R_RESULT_TOO_LARGE                            100
-# define UI_R_RESULT_TOO_SMALL                            101
-# define UI_R_UNKNOWN_CONTROL_COMMAND                     106
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ui_compat.h b/include.new/openssl/ui_compat.h
deleted file mode 100644
index 42fb9ff..0000000
--- a/include.new/openssl/ui_compat.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/ui/ui.h -*- mode:C; c-file-style: "eay" -*- */
-/*
- * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
- * 2001.
- */
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_UI_COMPAT_H
-# define HEADER_UI_COMPAT_H
-
-# include <openssl/opensslconf.h>
-# include <openssl/ui.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * The following functions were previously part of the DES section, and are
- * provided here for backward compatibility reasons.
- */
-
-# define des_read_pw_string(b,l,p,v) \
-        _ossl_old_des_read_pw_string((b),(l),(p),(v))
-# define des_read_pw(b,bf,s,p,v) \
-        _ossl_old_des_read_pw((b),(bf),(s),(p),(v))
-
-int _ossl_old_des_read_pw_string(char *buf, int length, const char *prompt,
-                                 int verify);
-int _ossl_old_des_read_pw(char *buf, char *buff, int size, const char *prompt,
-                          int verify);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/ui_locl.h b/include.new/openssl/ui_locl.h
deleted file mode 100644
index 7d3a75a..0000000
--- a/include.new/openssl/ui_locl.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/* crypto/ui/ui.h -*- mode:C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
- * project 2001.
- */
-/* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#ifndef HEADER_UI_LOCL_H
-#define HEADER_UI_LOCL_H
-
-#include <openssl/ui.h>
-
-struct ui_method_st
-	{
-	char *name;
-
-	/* All the functions return 1 or non-NULL for success and 0 or NULL
-	   for failure */
-
-	/* Open whatever channel for this, be it the console, an X window
-	   or whatever.
-	   This function should use the ex_data structure to save
-	   intermediate data. */
-	int (*ui_open_session)(UI *ui);
-
-	int (*ui_write_string)(UI *ui, UI_STRING *uis);
-
-	/* Flush the output.  If a GUI dialog box is used, this function can
-	   be used to actually display it. */
-	int (*ui_flush)(UI *ui);
-
-	int (*ui_read_string)(UI *ui, UI_STRING *uis);
-
-	int (*ui_close_session)(UI *ui);
-
-	/* Construct a prompt in a user-defined manner.  object_desc is a
-	   textual short description of the object, for example "pass phrase",
-	   and object_name is the name of the object (might be a card name or
-	   a file name.
-	   The returned string shall always be allocated on the heap with
-	   OPENSSL_malloc(), and need to be free'd with OPENSSL_free(). */
-	char *(*ui_construct_prompt)(UI *ui, const char *object_desc,
-		const char *object_name);
-	};
-
-struct ui_string_st
-	{
-	enum UI_string_types type; /* Input */
-	const char *out_string;	/* Input */
-	int input_flags;	/* Flags from the user */
-
-	/* The following parameters are completely irrelevant for UIT_INFO,
-	   and can therefore be set to 0 or NULL */
-	char *result_buf;	/* Input and Output: If not NULL, user-defined
-				   with size in result_maxsize.  Otherwise, it
-				   may be allocated by the UI routine, meaning
-				   result_minsize is going to be overwritten.*/
-	union
-		{
-		struct
-			{
-			int result_minsize;	/* Input: minimum required
-						   size of the result.
-						*/
-			int result_maxsize;	/* Input: maximum permitted
-						   size of the result */
-
-			const char *test_buf;	/* Input: test string to verify
-						   against */
-			} string_data;
-		struct
-			{
-			const char *action_desc; /* Input */
-			const char *ok_chars; /* Input */
-			const char *cancel_chars; /* Input */
-			} boolean_data;
-		} _;
-
-#define OUT_STRING_FREEABLE 0x01
-	int flags;		/* flags for internal use */
-	};
-
-struct ui_st
-	{
-	const UI_METHOD *meth;
-	STACK_OF(UI_STRING) *strings; /* We might want to prompt for more
-					 than one thing at a time, and
-					 with different echoing status.  */
-	void *user_data;
-	CRYPTO_EX_DATA ex_data;
-
-#define UI_FLAG_REDOABLE	0x0001
-#define UI_FLAG_PRINT_ERRORS	0x0100
-	int flags;
-	};
-
-#endif
diff --git a/include.new/openssl/whrlpool.h b/include.new/openssl/whrlpool.h
deleted file mode 100644
index 73c749d..0000000
--- a/include.new/openssl/whrlpool.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef HEADER_WHRLPOOL_H
-# define HEADER_WHRLPOOL_H
-
-# include <openssl/e_os2.h>
-# include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-# define WHIRLPOOL_DIGEST_LENGTH (512/8)
-# define WHIRLPOOL_BBLOCK        512
-# define WHIRLPOOL_COUNTER       (256/8)
-
-typedef struct {
-    union {
-        unsigned char c[WHIRLPOOL_DIGEST_LENGTH];
-        /* double q is here to ensure 64-bit alignment */
-        double q[WHIRLPOOL_DIGEST_LENGTH / sizeof(double)];
-    } H;
-    unsigned char data[WHIRLPOOL_BBLOCK / 8];
-    unsigned int bitoff;
-    size_t bitlen[WHIRLPOOL_COUNTER / sizeof(size_t)];
-} WHIRLPOOL_CTX;
-
-# ifndef OPENSSL_NO_WHIRLPOOL
-#  ifdef OPENSSL_FIPS
-int private_WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
-#  endif
-int WHIRLPOOL_Init(WHIRLPOOL_CTX *c);
-int WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *inp, size_t bytes);
-void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *inp, size_t bits);
-int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c);
-unsigned char *WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md);
-# endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/openssl/x509.h b/include.new/openssl/x509.h
deleted file mode 100644
index a491174..0000000
--- a/include.new/openssl/x509.h
+++ /dev/null
@@ -1,1301 +0,0 @@
-/* crypto/x509/x509.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-/* ====================================================================
- * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
- * ECDH support in OpenSSL originally developed by
- * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
- */
-
-#ifndef HEADER_X509_H
-# define HEADER_X509_H
-
-# include <openssl/e_os2.h>
-# include <openssl/symhacks.h>
-# ifndef OPENSSL_NO_BUFFER
-#  include <openssl/buffer.h>
-# endif
-# ifndef OPENSSL_NO_EVP
-#  include <openssl/evp.h>
-# endif
-# ifndef OPENSSL_NO_BIO
-#  include <openssl/bio.h>
-# endif
-# include <openssl/stack.h>
-# include <openssl/asn1.h>
-# include <openssl/safestack.h>
-
-# ifndef OPENSSL_NO_EC
-#  include <openssl/ec.h>
-# endif
-
-# ifndef OPENSSL_NO_ECDSA
-#  include <openssl/ecdsa.h>
-# endif
-
-# ifndef OPENSSL_NO_ECDH
-#  include <openssl/ecdh.h>
-# endif
-
-# ifndef OPENSSL_NO_DEPRECATED
-#  ifndef OPENSSL_NO_RSA
-#   include <openssl/rsa.h>
-#  endif
-#  ifndef OPENSSL_NO_DSA
-#   include <openssl/dsa.h>
-#  endif
-#  ifndef OPENSSL_NO_DH
-#   include <openssl/dh.h>
-#  endif
-# endif
-
-# ifndef OPENSSL_NO_SHA
-#  include <openssl/sha.h>
-# endif
-# include <openssl/ossl_typ.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# ifdef OPENSSL_SYS_WIN32
-/* Under Win32 these are defined in wincrypt.h */
-#  undef X509_NAME
-#  undef X509_CERT_PAIR
-#  undef X509_EXTENSIONS
-# endif
-
-# define X509_FILETYPE_PEM       1
-# define X509_FILETYPE_ASN1      2
-# define X509_FILETYPE_DEFAULT   3
-
-# define X509v3_KU_DIGITAL_SIGNATURE     0x0080
-# define X509v3_KU_NON_REPUDIATION       0x0040
-# define X509v3_KU_KEY_ENCIPHERMENT      0x0020
-# define X509v3_KU_DATA_ENCIPHERMENT     0x0010
-# define X509v3_KU_KEY_AGREEMENT         0x0008
-# define X509v3_KU_KEY_CERT_SIGN         0x0004
-# define X509v3_KU_CRL_SIGN              0x0002
-# define X509v3_KU_ENCIPHER_ONLY         0x0001
-# define X509v3_KU_DECIPHER_ONLY         0x8000
-# define X509v3_KU_UNDEF                 0xffff
-
-typedef struct X509_objects_st {
-    int nid;
-    int (*a2i) (void);
-    int (*i2a) (void);
-} X509_OBJECTS;
-
-struct X509_algor_st {
-    ASN1_OBJECT *algorithm;
-    ASN1_TYPE *parameter;
-} /* X509_ALGOR */ ;
-
-DECLARE_ASN1_SET_OF(X509_ALGOR)
-
-typedef STACK_OF(X509_ALGOR) X509_ALGORS;
-
-typedef struct X509_val_st {
-    ASN1_TIME *notBefore;
-    ASN1_TIME *notAfter;
-} X509_VAL;
-
-struct X509_pubkey_st {
-    X509_ALGOR *algor;
-    ASN1_BIT_STRING *public_key;
-    EVP_PKEY *pkey;
-};
-
-typedef struct X509_sig_st {
-    X509_ALGOR *algor;
-    ASN1_OCTET_STRING *digest;
-} X509_SIG;
-
-typedef struct X509_name_entry_st {
-    ASN1_OBJECT *object;
-    ASN1_STRING *value;
-    int set;
-    int size;                   /* temp variable */
-} X509_NAME_ENTRY;
-
-DECLARE_STACK_OF(X509_NAME_ENTRY)
-DECLARE_ASN1_SET_OF(X509_NAME_ENTRY)
-
-/* we always keep X509_NAMEs in 2 forms. */
-struct X509_name_st {
-    STACK_OF(X509_NAME_ENTRY) *entries;
-    int modified;               /* true if 'bytes' needs to be built */
-# ifndef OPENSSL_NO_BUFFER
-    BUF_MEM *bytes;
-# else
-    char *bytes;
-# endif
-/*      unsigned long hash; Keep the hash around for lookups */
-    unsigned char *canon_enc;
-    int canon_enclen;
-} /* X509_NAME */ ;
-
-DECLARE_STACK_OF(X509_NAME)
-
-# define X509_EX_V_NETSCAPE_HACK         0x8000
-# define X509_EX_V_INIT                  0x0001
-typedef struct X509_extension_st {
-    ASN1_OBJECT *object;
-    ASN1_BOOLEAN critical;
-    ASN1_OCTET_STRING *value;
-} X509_EXTENSION;
-
-typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
-
-DECLARE_STACK_OF(X509_EXTENSION)
-DECLARE_ASN1_SET_OF(X509_EXTENSION)
-
-/* a sequence of these are used */
-typedef struct x509_attributes_st {
-    ASN1_OBJECT *object;
-    int single;                 /* 0 for a set, 1 for a single item (which is
-                                 * wrong) */
-    union {
-        char *ptr;
-        /*
-         * 0
-         */ STACK_OF(ASN1_TYPE) *set;
-        /*
-         * 1
-         */ ASN1_TYPE *single;
-    } value;
-} X509_ATTRIBUTE;
-
-DECLARE_STACK_OF(X509_ATTRIBUTE)
-DECLARE_ASN1_SET_OF(X509_ATTRIBUTE)
-
-typedef struct X509_req_info_st {
-    ASN1_ENCODING enc;
-    ASN1_INTEGER *version;
-    X509_NAME *subject;
-    X509_PUBKEY *pubkey;
-    /*  d=2 hl=2 l=  0 cons: cont: 00 */
-    STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-} X509_REQ_INFO;
-
-typedef struct X509_req_st {
-    X509_REQ_INFO *req_info;
-    X509_ALGOR *sig_alg;
-    ASN1_BIT_STRING *signature;
-    int references;
-} X509_REQ;
-
-typedef struct x509_cinf_st {
-    ASN1_INTEGER *version;      /* [ 0 ] default of v1 */
-    ASN1_INTEGER *serialNumber;
-    X509_ALGOR *signature;
-    X509_NAME *issuer;
-    X509_VAL *validity;
-    X509_NAME *subject;
-    X509_PUBKEY *key;
-    ASN1_BIT_STRING *issuerUID; /* [ 1 ] optional in v2 */
-    ASN1_BIT_STRING *subjectUID; /* [ 2 ] optional in v2 */
-    STACK_OF(X509_EXTENSION) *extensions; /* [ 3 ] optional in v3 */
-    ASN1_ENCODING enc;
-} X509_CINF;
-
-/*
- * This stuff is certificate "auxiliary info" it contains details which are
- * useful in certificate stores and databases. When used this is tagged onto
- * the end of the certificate itself
- */
-
-typedef struct x509_cert_aux_st {
-    STACK_OF(ASN1_OBJECT) *trust; /* trusted uses */
-    STACK_OF(ASN1_OBJECT) *reject; /* rejected uses */
-    ASN1_UTF8STRING *alias;     /* "friendly name" */
-    ASN1_OCTET_STRING *keyid;   /* key id of private key */
-    STACK_OF(X509_ALGOR) *other; /* other unspecified info */
-} X509_CERT_AUX;
-
-struct x509_st {
-    X509_CINF *cert_info;
-    X509_ALGOR *sig_alg;
-    ASN1_BIT_STRING *signature;
-    int valid;
-    int references;
-    char *name;
-    CRYPTO_EX_DATA ex_data;
-    /* These contain copies of various extension values */
-    long ex_pathlen;
-    long ex_pcpathlen;
-    unsigned long ex_flags;
-    unsigned long ex_kusage;
-    unsigned long ex_xkusage;
-    unsigned long ex_nscert;
-    ASN1_OCTET_STRING *skid;
-    AUTHORITY_KEYID *akid;
-    X509_POLICY_CACHE *policy_cache;
-    STACK_OF(DIST_POINT) *crldp;
-    STACK_OF(GENERAL_NAME) *altname;
-    NAME_CONSTRAINTS *nc;
-# ifndef OPENSSL_NO_RFC3779
-    STACK_OF(IPAddressFamily) *rfc3779_addr;
-    struct ASIdentifiers_st *rfc3779_asid;
-# endif
-# ifndef OPENSSL_NO_SHA
-    unsigned char sha1_hash[SHA_DIGEST_LENGTH];
-# endif
-    X509_CERT_AUX *aux;
-} /* X509 */ ;
-
-DECLARE_STACK_OF(X509)
-DECLARE_ASN1_SET_OF(X509)
-
-/* This is used for a table of trust checking functions */
-
-typedef struct x509_trust_st {
-    int trust;
-    int flags;
-    int (*check_trust) (struct x509_trust_st *, X509 *, int);
-    char *name;
-    int arg1;
-    void *arg2;
-} X509_TRUST;
-
-DECLARE_STACK_OF(X509_TRUST)
-
-typedef struct x509_cert_pair_st {
-    X509 *forward;
-    X509 *reverse;
-} X509_CERT_PAIR;
-
-/* standard trust ids */
-
-# define X509_TRUST_DEFAULT      -1/* Only valid in purpose settings */
-
-# define X509_TRUST_COMPAT       1
-# define X509_TRUST_SSL_CLIENT   2
-# define X509_TRUST_SSL_SERVER   3
-# define X509_TRUST_EMAIL        4
-# define X509_TRUST_OBJECT_SIGN  5
-# define X509_TRUST_OCSP_SIGN    6
-# define X509_TRUST_OCSP_REQUEST 7
-# define X509_TRUST_TSA          8
-
-/* Keep these up to date! */
-# define X509_TRUST_MIN          1
-# define X509_TRUST_MAX          8
-
-/* trust_flags values */
-# define X509_TRUST_DYNAMIC      1
-# define X509_TRUST_DYNAMIC_NAME 2
-
-/* check_trust return codes */
-
-# define X509_TRUST_TRUSTED      1
-# define X509_TRUST_REJECTED     2
-# define X509_TRUST_UNTRUSTED    3
-
-/* Flags for X509_print_ex() */
-
-# define X509_FLAG_COMPAT                0
-# define X509_FLAG_NO_HEADER             1L
-# define X509_FLAG_NO_VERSION            (1L << 1)
-# define X509_FLAG_NO_SERIAL             (1L << 2)
-# define X509_FLAG_NO_SIGNAME            (1L << 3)
-# define X509_FLAG_NO_ISSUER             (1L << 4)
-# define X509_FLAG_NO_VALIDITY           (1L << 5)
-# define X509_FLAG_NO_SUBJECT            (1L << 6)
-# define X509_FLAG_NO_PUBKEY             (1L << 7)
-# define X509_FLAG_NO_EXTENSIONS         (1L << 8)
-# define X509_FLAG_NO_SIGDUMP            (1L << 9)
-# define X509_FLAG_NO_AUX                (1L << 10)
-# define X509_FLAG_NO_ATTRIBUTES         (1L << 11)
-
-/* Flags specific to X509_NAME_print_ex() */
-
-/* The field separator information */
-
-# define XN_FLAG_SEP_MASK        (0xf << 16)
-
-# define XN_FLAG_COMPAT          0/* Traditional SSLeay: use old
-                                   * X509_NAME_print */
-# define XN_FLAG_SEP_COMMA_PLUS  (1 << 16)/* RFC2253 ,+ */
-# define XN_FLAG_SEP_CPLUS_SPC   (2 << 16)/* ,+ spaced: more readable */
-# define XN_FLAG_SEP_SPLUS_SPC   (3 << 16)/* ;+ spaced */
-# define XN_FLAG_SEP_MULTILINE   (4 << 16)/* One line per field */
-
-# define XN_FLAG_DN_REV          (1 << 20)/* Reverse DN order */
-
-/* How the field name is shown */
-
-# define XN_FLAG_FN_MASK         (0x3 << 21)
-
-# define XN_FLAG_FN_SN           0/* Object short name */
-# define XN_FLAG_FN_LN           (1 << 21)/* Object long name */
-# define XN_FLAG_FN_OID          (2 << 21)/* Always use OIDs */
-# define XN_FLAG_FN_NONE         (3 << 21)/* No field names */
-
-# define XN_FLAG_SPC_EQ          (1 << 23)/* Put spaces round '=' */
-
-/*
- * This determines if we dump fields we don't recognise: RFC2253 requires
- * this.
- */
-
-# define XN_FLAG_DUMP_UNKNOWN_FIELDS (1 << 24)
-
-# define XN_FLAG_FN_ALIGN        (1 << 25)/* Align field names to 20
-                                           * characters */
-
-/* Complete set of RFC2253 flags */
-
-# define XN_FLAG_RFC2253 (ASN1_STRFLGS_RFC2253 | \
-                        XN_FLAG_SEP_COMMA_PLUS | \
-                        XN_FLAG_DN_REV | \
-                        XN_FLAG_FN_SN | \
-                        XN_FLAG_DUMP_UNKNOWN_FIELDS)
-
-/* readable oneline form */
-
-# define XN_FLAG_ONELINE (ASN1_STRFLGS_RFC2253 | \
-                        ASN1_STRFLGS_ESC_QUOTE | \
-                        XN_FLAG_SEP_CPLUS_SPC | \
-                        XN_FLAG_SPC_EQ | \
-                        XN_FLAG_FN_SN)
-
-/* readable multiline form */
-
-# define XN_FLAG_MULTILINE (ASN1_STRFLGS_ESC_CTRL | \
-                        ASN1_STRFLGS_ESC_MSB | \
-                        XN_FLAG_SEP_MULTILINE | \
-                        XN_FLAG_SPC_EQ | \
-                        XN_FLAG_FN_LN | \
-                        XN_FLAG_FN_ALIGN)
-
-struct x509_revoked_st {
-    ASN1_INTEGER *serialNumber;
-    ASN1_TIME *revocationDate;
-    STACK_OF(X509_EXTENSION) /* optional */ *extensions;
-    /* Set up if indirect CRL */
-    STACK_OF(GENERAL_NAME) *issuer;
-    /* Revocation reason */
-    int reason;
-    int sequence;               /* load sequence */
-};
-
-DECLARE_STACK_OF(X509_REVOKED)
-DECLARE_ASN1_SET_OF(X509_REVOKED)
-
-typedef struct X509_crl_info_st {
-    ASN1_INTEGER *version;
-    X509_ALGOR *sig_alg;
-    X509_NAME *issuer;
-    ASN1_TIME *lastUpdate;
-    ASN1_TIME *nextUpdate;
-    STACK_OF(X509_REVOKED) *revoked;
-    STACK_OF(X509_EXTENSION) /* [0] */ *extensions;
-    ASN1_ENCODING enc;
-} X509_CRL_INFO;
-
-struct X509_crl_st {
-    /* actual signature */
-    X509_CRL_INFO *crl;
-    X509_ALGOR *sig_alg;
-    ASN1_BIT_STRING *signature;
-    int references;
-    int flags;
-    /* Copies of various extensions */
-    AUTHORITY_KEYID *akid;
-    ISSUING_DIST_POINT *idp;
-    /* Convenient breakdown of IDP */
-    int idp_flags;
-    int idp_reasons;
-    /* CRL and base CRL numbers for delta processing */
-    ASN1_INTEGER *crl_number;
-    ASN1_INTEGER *base_crl_number;
-# ifndef OPENSSL_NO_SHA
-    unsigned char sha1_hash[SHA_DIGEST_LENGTH];
-# endif
-    STACK_OF(GENERAL_NAMES) *issuers;
-    const X509_CRL_METHOD *meth;
-    void *meth_data;
-} /* X509_CRL */ ;
-
-DECLARE_STACK_OF(X509_CRL)
-DECLARE_ASN1_SET_OF(X509_CRL)
-
-typedef struct private_key_st {
-    int version;
-    /* The PKCS#8 data types */
-    X509_ALGOR *enc_algor;
-    ASN1_OCTET_STRING *enc_pkey; /* encrypted pub key */
-    /* When decrypted, the following will not be NULL */
-    EVP_PKEY *dec_pkey;
-    /* used to encrypt and decrypt */
-    int key_length;
-    char *key_data;
-    int key_free;               /* true if we should auto free key_data */
-    /* expanded version of 'enc_algor' */
-    EVP_CIPHER_INFO cipher;
-    int references;
-} X509_PKEY;
-
-# ifndef OPENSSL_NO_EVP
-typedef struct X509_info_st {
-    X509 *x509;
-    X509_CRL *crl;
-    X509_PKEY *x_pkey;
-    EVP_CIPHER_INFO enc_cipher;
-    int enc_len;
-    char *enc_data;
-    int references;
-} X509_INFO;
-
-DECLARE_STACK_OF(X509_INFO)
-# endif
-
-/*
- * The next 2 structures and their 8 routines were sent to me by Pat Richard
- * <patr@x509.com> and are used to manipulate Netscapes spki structures -
- * useful if you are writing a CA web page
- */
-typedef struct Netscape_spkac_st {
-    X509_PUBKEY *pubkey;
-    ASN1_IA5STRING *challenge;  /* challenge sent in atlas >= PR2 */
-} NETSCAPE_SPKAC;
-
-typedef struct Netscape_spki_st {
-    NETSCAPE_SPKAC *spkac;      /* signed public key and challenge */
-    X509_ALGOR *sig_algor;
-    ASN1_BIT_STRING *signature;
-} NETSCAPE_SPKI;
-
-/* Netscape certificate sequence structure */
-typedef struct Netscape_certificate_sequence {
-    ASN1_OBJECT *type;
-    STACK_OF(X509) *certs;
-} NETSCAPE_CERT_SEQUENCE;
-
-/*- Unused (and iv length is wrong)
-typedef struct CBCParameter_st
-        {
-        unsigned char iv[8];
-        } CBC_PARAM;
-*/
-
-/* Password based encryption structure */
-
-typedef struct PBEPARAM_st {
-    ASN1_OCTET_STRING *salt;
-    ASN1_INTEGER *iter;
-} PBEPARAM;
-
-/* Password based encryption V2 structures */
-
-typedef struct PBE2PARAM_st {
-    X509_ALGOR *keyfunc;
-    X509_ALGOR *encryption;
-} PBE2PARAM;
-
-typedef struct PBKDF2PARAM_st {
-/* Usually OCTET STRING but could be anything */
-    ASN1_TYPE *salt;
-    ASN1_INTEGER *iter;
-    ASN1_INTEGER *keylength;
-    X509_ALGOR *prf;
-} PBKDF2PARAM;
-
-/* PKCS#8 private key info structure */
-
-struct pkcs8_priv_key_info_st {
-    /* Flag for various broken formats */
-    int broken;
-# define PKCS8_OK                0
-# define PKCS8_NO_OCTET          1
-# define PKCS8_EMBEDDED_PARAM    2
-# define PKCS8_NS_DB             3
-# define PKCS8_NEG_PRIVKEY       4
-    ASN1_INTEGER *version;
-    X509_ALGOR *pkeyalg;
-    /* Should be OCTET STRING but some are broken */
-    ASN1_TYPE *pkey;
-    STACK_OF(X509_ATTRIBUTE) *attributes;
-};
-
-#ifdef  __cplusplus
-}
-#endif
-
-# include <openssl/x509_vfy.h>
-# include <openssl/pkcs7.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# define X509_EXT_PACK_UNKNOWN   1
-# define X509_EXT_PACK_STRING    2
-
-# define         X509_get_version(x) ASN1_INTEGER_get((x)->cert_info->version)
-/* #define      X509_get_serialNumber(x) ((x)->cert_info->serialNumber) */
-# define         X509_get_notBefore(x) ((x)->cert_info->validity->notBefore)
-# define         X509_get_notAfter(x) ((x)->cert_info->validity->notAfter)
-# define         X509_extract_key(x)     X509_get_pubkey(x)/*****/
-# define         X509_REQ_get_version(x) ASN1_INTEGER_get((x)->req_info->version)
-# define         X509_REQ_get_subject_name(x) ((x)->req_info->subject)
-# define         X509_REQ_extract_key(a) X509_REQ_get_pubkey(a)
-# define         X509_name_cmp(a,b)      X509_NAME_cmp((a),(b))
-# define         X509_get_signature_type(x) EVP_PKEY_type(OBJ_obj2nid((x)->sig_alg->algorithm))
-
-# define         X509_CRL_get_version(x) ASN1_INTEGER_get((x)->crl->version)
-# define         X509_CRL_get_lastUpdate(x) ((x)->crl->lastUpdate)
-# define         X509_CRL_get_nextUpdate(x) ((x)->crl->nextUpdate)
-# define         X509_CRL_get_issuer(x) ((x)->crl->issuer)
-# define         X509_CRL_get_REVOKED(x) ((x)->crl->revoked)
-
-void X509_CRL_set_default_method(const X509_CRL_METHOD *meth);
-X509_CRL_METHOD *X509_CRL_METHOD_new(int (*crl_init) (X509_CRL *crl),
-                                     int (*crl_free) (X509_CRL *crl),
-                                     int (*crl_lookup) (X509_CRL *crl,
-                                                        X509_REVOKED **ret,
-                                                        ASN1_INTEGER *ser,
-                                                        X509_NAME *issuer),
-                                     int (*crl_verify) (X509_CRL *crl,
-                                                        EVP_PKEY *pk));
-void X509_CRL_METHOD_free(X509_CRL_METHOD *m);
-
-void X509_CRL_set_meth_data(X509_CRL *crl, void *dat);
-void *X509_CRL_get_meth_data(X509_CRL *crl);
-
-/*
- * This one is only used so that a binary form can output, as in
- * i2d_X509_NAME(X509_get_X509_PUBKEY(x),&buf)
- */
-# define         X509_get_X509_PUBKEY(x) ((x)->cert_info->key)
-
-const char *X509_verify_cert_error_string(long n);
-
-# ifndef OPENSSL_NO_EVP
-int X509_verify(X509 *a, EVP_PKEY *r);
-
-int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r);
-int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r);
-int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r);
-
-NETSCAPE_SPKI *NETSCAPE_SPKI_b64_decode(const char *str, int len);
-char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *x);
-EVP_PKEY *NETSCAPE_SPKI_get_pubkey(NETSCAPE_SPKI *x);
-int NETSCAPE_SPKI_set_pubkey(NETSCAPE_SPKI *x, EVP_PKEY *pkey);
-
-int NETSCAPE_SPKI_print(BIO *out, NETSCAPE_SPKI *spki);
-
-int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent);
-int X509_signature_print(BIO *bp, X509_ALGOR *alg, ASN1_STRING *sig);
-
-int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_sign_ctx(X509 *x, EVP_MD_CTX *ctx);
-int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_REQ_sign_ctx(X509_REQ *x, EVP_MD_CTX *ctx);
-int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md);
-int X509_CRL_sign_ctx(X509_CRL *x, EVP_MD_CTX *ctx);
-int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md);
-
-int X509_pubkey_digest(const X509 *data, const EVP_MD *type,
-                       unsigned char *md, unsigned int *len);
-int X509_digest(const X509 *data, const EVP_MD *type,
-                unsigned char *md, unsigned int *len);
-int X509_CRL_digest(const X509_CRL *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len);
-int X509_REQ_digest(const X509_REQ *data, const EVP_MD *type,
-                    unsigned char *md, unsigned int *len);
-int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type,
-                     unsigned char *md, unsigned int *len);
-# endif
-
-# ifndef OPENSSL_NO_FP_API
-X509 *d2i_X509_fp(FILE *fp, X509 **x509);
-int i2d_X509_fp(FILE *fp, X509 *x509);
-X509_CRL *d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl);
-int i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_fp(FILE *fp, X509_REQ **req);
-int i2d_X509_REQ_fp(FILE *fp, X509_REQ *req);
-#  ifndef OPENSSL_NO_RSA
-RSA *d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa);
-int i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa);
-RSA *d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa);
-int i2d_RSAPublicKey_fp(FILE *fp, RSA *rsa);
-RSA *d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa);
-int i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa);
-#  endif
-#  ifndef OPENSSL_NO_DSA
-DSA *d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa);
-int i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa);
-DSA *d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa);
-int i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa);
-#  endif
-#  ifndef OPENSSL_NO_EC
-EC_KEY *d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey);
-int i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *eckey);
-EC_KEY *d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey);
-int i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey);
-#  endif
-X509_SIG *d2i_PKCS8_fp(FILE *fp, X509_SIG **p8);
-int i2d_PKCS8_fp(FILE *fp, X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
-                                                PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO *p8inf);
-int i2d_PKCS8PrivateKeyInfo_fp(FILE *fp, EVP_PKEY *key);
-int i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a);
-int i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a);
-# endif
-
-# ifndef OPENSSL_NO_BIO
-X509 *d2i_X509_bio(BIO *bp, X509 **x509);
-int i2d_X509_bio(BIO *bp, X509 *x509);
-X509_CRL *d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl);
-int i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl);
-X509_REQ *d2i_X509_REQ_bio(BIO *bp, X509_REQ **req);
-int i2d_X509_REQ_bio(BIO *bp, X509_REQ *req);
-#  ifndef OPENSSL_NO_RSA
-RSA *d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa);
-int i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa);
-RSA *d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa);
-int i2d_RSAPublicKey_bio(BIO *bp, RSA *rsa);
-RSA *d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa);
-int i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa);
-#  endif
-#  ifndef OPENSSL_NO_DSA
-DSA *d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa);
-int i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa);
-DSA *d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa);
-int i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa);
-#  endif
-#  ifndef OPENSSL_NO_EC
-EC_KEY *d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey);
-int i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *eckey);
-EC_KEY *d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey);
-int i2d_ECPrivateKey_bio(BIO *bp, EC_KEY *eckey);
-#  endif
-X509_SIG *d2i_PKCS8_bio(BIO *bp, X509_SIG **p8);
-int i2d_PKCS8_bio(BIO *bp, X509_SIG *p8);
-PKCS8_PRIV_KEY_INFO *d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
-                                                 PKCS8_PRIV_KEY_INFO **p8inf);
-int i2d_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO *p8inf);
-int i2d_PKCS8PrivateKeyInfo_bio(BIO *bp, EVP_PKEY *key);
-int i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a);
-int i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey);
-EVP_PKEY *d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a);
-# endif
-
-X509 *X509_dup(X509 *x509);
-X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa);
-X509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *ex);
-X509_CRL *X509_CRL_dup(X509_CRL *crl);
-X509_REQ *X509_REQ_dup(X509_REQ *req);
-X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn);
-int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype,
-                    void *pval);
-void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,
-                     X509_ALGOR *algor);
-void X509_ALGOR_set_md(X509_ALGOR *alg, const EVP_MD *md);
-int X509_ALGOR_cmp(const X509_ALGOR *a, const X509_ALGOR *b);
-
-X509_NAME *X509_NAME_dup(X509_NAME *xn);
-X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
-
-int X509_cmp_time(const ASN1_TIME *s, time_t *t);
-int X509_cmp_current_time(const ASN1_TIME *s);
-ASN1_TIME *X509_time_adj(ASN1_TIME *s, long adj, time_t *t);
-ASN1_TIME *X509_time_adj_ex(ASN1_TIME *s,
-                            int offset_day, long offset_sec, time_t *t);
-ASN1_TIME *X509_gmtime_adj(ASN1_TIME *s, long adj);
-
-const char *X509_get_default_cert_area(void);
-const char *X509_get_default_cert_dir(void);
-const char *X509_get_default_cert_file(void);
-const char *X509_get_default_cert_dir_env(void);
-const char *X509_get_default_cert_file_env(void);
-const char *X509_get_default_private_dir(void);
-
-X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md);
-X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey);
-
-DECLARE_ASN1_FUNCTIONS(X509_ALGOR)
-DECLARE_ASN1_ENCODE_FUNCTIONS(X509_ALGORS, X509_ALGORS, X509_ALGORS)
-DECLARE_ASN1_FUNCTIONS(X509_VAL)
-
-DECLARE_ASN1_FUNCTIONS(X509_PUBKEY)
-
-int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey);
-EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key);
-int X509_get_pubkey_parameters(EVP_PKEY *pkey, STACK_OF(X509) *chain);
-int i2d_PUBKEY(EVP_PKEY *a, unsigned char **pp);
-EVP_PKEY *d2i_PUBKEY(EVP_PKEY **a, const unsigned char **pp, long length);
-# ifndef OPENSSL_NO_RSA
-int i2d_RSA_PUBKEY(RSA *a, unsigned char **pp);
-RSA *d2i_RSA_PUBKEY(RSA **a, const unsigned char **pp, long length);
-# endif
-# ifndef OPENSSL_NO_DSA
-int i2d_DSA_PUBKEY(DSA *a, unsigned char **pp);
-DSA *d2i_DSA_PUBKEY(DSA **a, const unsigned char **pp, long length);
-# endif
-# ifndef OPENSSL_NO_EC
-int i2d_EC_PUBKEY(EC_KEY *a, unsigned char **pp);
-EC_KEY *d2i_EC_PUBKEY(EC_KEY **a, const unsigned char **pp, long length);
-# endif
-
-DECLARE_ASN1_FUNCTIONS(X509_SIG)
-DECLARE_ASN1_FUNCTIONS(X509_REQ_INFO)
-DECLARE_ASN1_FUNCTIONS(X509_REQ)
-
-DECLARE_ASN1_FUNCTIONS(X509_ATTRIBUTE)
-X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value);
-
-DECLARE_ASN1_FUNCTIONS(X509_EXTENSION)
-DECLARE_ASN1_ENCODE_FUNCTIONS(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXTENSIONS)
-
-DECLARE_ASN1_FUNCTIONS(X509_NAME_ENTRY)
-
-DECLARE_ASN1_FUNCTIONS(X509_NAME)
-
-int X509_NAME_set(X509_NAME **xn, X509_NAME *name);
-
-DECLARE_ASN1_FUNCTIONS(X509_CINF)
-
-DECLARE_ASN1_FUNCTIONS(X509)
-DECLARE_ASN1_FUNCTIONS(X509_CERT_AUX)
-
-DECLARE_ASN1_FUNCTIONS(X509_CERT_PAIR)
-
-int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-                          CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
-int X509_set_ex_data(X509 *r, int idx, void *arg);
-void *X509_get_ex_data(X509 *r, int idx);
-int i2d_X509_AUX(X509 *a, unsigned char **pp);
-X509 *d2i_X509_AUX(X509 **a, const unsigned char **pp, long length);
-
-int X509_alias_set1(X509 *x, unsigned char *name, int len);
-int X509_keyid_set1(X509 *x, unsigned char *id, int len);
-unsigned char *X509_alias_get0(X509 *x, int *len);
-unsigned char *X509_keyid_get0(X509 *x, int *len);
-int (*X509_TRUST_set_default(int (*trust) (int, X509 *, int))) (int, X509 *,
-                                                                int);
-int X509_TRUST_set(int *t, int trust);
-int X509_add1_trust_object(X509 *x, ASN1_OBJECT *obj);
-int X509_add1_reject_object(X509 *x, ASN1_OBJECT *obj);
-void X509_trust_clear(X509 *x);
-void X509_reject_clear(X509 *x);
-
-DECLARE_ASN1_FUNCTIONS(X509_REVOKED)
-DECLARE_ASN1_FUNCTIONS(X509_CRL_INFO)
-DECLARE_ASN1_FUNCTIONS(X509_CRL)
-
-int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-int X509_CRL_get0_by_serial(X509_CRL *crl,
-                            X509_REVOKED **ret, ASN1_INTEGER *serial);
-int X509_CRL_get0_by_cert(X509_CRL *crl, X509_REVOKED **ret, X509 *x);
-
-X509_PKEY *X509_PKEY_new(void);
-void X509_PKEY_free(X509_PKEY *a);
-int i2d_X509_PKEY(X509_PKEY *a, unsigned char **pp);
-X509_PKEY *d2i_X509_PKEY(X509_PKEY **a, const unsigned char **pp,
-                         long length);
-
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKI)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_SPKAC)
-DECLARE_ASN1_FUNCTIONS(NETSCAPE_CERT_SEQUENCE)
-
-# ifndef OPENSSL_NO_EVP
-X509_INFO *X509_INFO_new(void);
-void X509_INFO_free(X509_INFO *a);
-char *X509_NAME_oneline(X509_NAME *a, char *buf, int size);
-
-int ASN1_verify(i2d_of_void *i2d, X509_ALGOR *algor1,
-                ASN1_BIT_STRING *signature, char *data, EVP_PKEY *pkey);
-
-int ASN1_digest(i2d_of_void *i2d, const EVP_MD *type, char *data,
-                unsigned char *md, unsigned int *len);
-
-int ASN1_sign(i2d_of_void *i2d, X509_ALGOR *algor1,
-              X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
-              char *data, EVP_PKEY *pkey, const EVP_MD *type);
-
-int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *data,
-                     unsigned char *md, unsigned int *len);
-
-int ASN1_item_verify(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                     ASN1_BIT_STRING *signature, void *data, EVP_PKEY *pkey);
-
-int ASN1_item_sign(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                   X509_ALGOR *algor2, ASN1_BIT_STRING *signature, void *data,
-                   EVP_PKEY *pkey, const EVP_MD *type);
-int ASN1_item_sign_ctx(const ASN1_ITEM *it, X509_ALGOR *algor1,
-                       X509_ALGOR *algor2, ASN1_BIT_STRING *signature,
-                       void *asn, EVP_MD_CTX *ctx);
-# endif
-
-int X509_set_version(X509 *x, long version);
-int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial);
-ASN1_INTEGER *X509_get_serialNumber(X509 *x);
-int X509_set_issuer_name(X509 *x, X509_NAME *name);
-X509_NAME *X509_get_issuer_name(X509 *a);
-int X509_set_subject_name(X509 *x, X509_NAME *name);
-X509_NAME *X509_get_subject_name(X509 *a);
-int X509_set_notBefore(X509 *x, const ASN1_TIME *tm);
-int X509_set_notAfter(X509 *x, const ASN1_TIME *tm);
-int X509_set_pubkey(X509 *x, EVP_PKEY *pkey);
-EVP_PKEY *X509_get_pubkey(X509 *x);
-ASN1_BIT_STRING *X509_get0_pubkey_bitstr(const X509 *x);
-int X509_certificate_type(X509 *x, EVP_PKEY *pubkey /* optional */ );
-
-int X509_REQ_set_version(X509_REQ *x, long version);
-int X509_REQ_set_subject_name(X509_REQ *req, X509_NAME *name);
-int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey);
-EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req);
-int X509_REQ_extension_nid(int nid);
-int *X509_REQ_get_extension_nids(void);
-void X509_REQ_set_extension_nids(int *nids);
-STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req);
-int X509_REQ_add_extensions_nid(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts,
-                                int nid);
-int X509_REQ_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts);
-int X509_REQ_get_attr_count(const X509_REQ *req);
-int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos);
-int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, ASN1_OBJECT *obj,
-                             int lastpos);
-X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc);
-X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc);
-int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr);
-int X509_REQ_add1_attr_by_OBJ(X509_REQ *req,
-                              const ASN1_OBJECT *obj, int type,
-                              const unsigned char *bytes, int len);
-int X509_REQ_add1_attr_by_NID(X509_REQ *req,
-                              int nid, int type,
-                              const unsigned char *bytes, int len);
-int X509_REQ_add1_attr_by_txt(X509_REQ *req,
-                              const char *attrname, int type,
-                              const unsigned char *bytes, int len);
-
-int X509_CRL_set_version(X509_CRL *x, long version);
-int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-int X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm);
-int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm);
-int X509_CRL_sort(X509_CRL *crl);
-
-int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial);
-int X509_REVOKED_set_revocationDate(X509_REVOKED *r, ASN1_TIME *tm);
-
-int X509_REQ_check_private_key(X509_REQ *x509, EVP_PKEY *pkey);
-
-int X509_check_private_key(X509 *x509, EVP_PKEY *pkey);
-
-int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b);
-unsigned long X509_issuer_and_serial_hash(X509 *a);
-
-int X509_issuer_name_cmp(const X509 *a, const X509 *b);
-unsigned long X509_issuer_name_hash(X509 *a);
-
-int X509_subject_name_cmp(const X509 *a, const X509 *b);
-unsigned long X509_subject_name_hash(X509 *x);
-
-# ifndef OPENSSL_NO_MD5
-unsigned long X509_issuer_name_hash_old(X509 *a);
-unsigned long X509_subject_name_hash_old(X509 *x);
-# endif
-
-int X509_cmp(const X509 *a, const X509 *b);
-int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b);
-unsigned long X509_NAME_hash(X509_NAME *x);
-unsigned long X509_NAME_hash_old(X509_NAME *x);
-
-int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b);
-int X509_CRL_match(const X509_CRL *a, const X509_CRL *b);
-# ifndef OPENSSL_NO_FP_API
-int X509_print_ex_fp(FILE *bp, X509 *x, unsigned long nmflag,
-                     unsigned long cflag);
-int X509_print_fp(FILE *bp, X509 *x);
-int X509_CRL_print_fp(FILE *bp, X509_CRL *x);
-int X509_REQ_print_fp(FILE *bp, X509_REQ *req);
-int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent,
-                          unsigned long flags);
-# endif
-
-# ifndef OPENSSL_NO_BIO
-int X509_NAME_print(BIO *bp, X509_NAME *name, int obase);
-int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent,
-                       unsigned long flags);
-int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflag,
-                  unsigned long cflag);
-int X509_print(BIO *bp, X509 *x);
-int X509_ocspid_print(BIO *bp, X509 *x);
-int X509_CERT_AUX_print(BIO *bp, X509_CERT_AUX *x, int indent);
-int X509_CRL_print(BIO *bp, X509_CRL *x);
-int X509_REQ_print_ex(BIO *bp, X509_REQ *x, unsigned long nmflag,
-                      unsigned long cflag);
-int X509_REQ_print(BIO *bp, X509_REQ *req);
-# endif
-
-int X509_NAME_entry_count(X509_NAME *name);
-int X509_NAME_get_text_by_NID(X509_NAME *name, int nid, char *buf, int len);
-int X509_NAME_get_text_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
-                              char *buf, int len);
-
-/*
- * NOTE: you should be passsing -1, not 0 as lastpos.  The functions that use
- * lastpos, search after that position on.
- */
-int X509_NAME_get_index_by_NID(X509_NAME *name, int nid, int lastpos);
-int X509_NAME_get_index_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj,
-                               int lastpos);
-X509_NAME_ENTRY *X509_NAME_get_entry(X509_NAME *name, int loc);
-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc);
-int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne,
-                        int loc, int set);
-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
-                               unsigned char *bytes, int len, int loc,
-                               int set);
-int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
-                               unsigned char *bytes, int len, int loc,
-                               int set);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
-                                               const char *field, int type,
-                                               const unsigned char *bytes,
-                                               int len);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
-                                               int type, unsigned char *bytes,
-                                               int len);
-int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
-                               const unsigned char *bytes, int len, int loc,
-                               int set);
-X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-                                               ASN1_OBJECT *obj, int type,
-                                               const unsigned char *bytes,
-                                               int len);
-int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, ASN1_OBJECT *obj);
-int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
-                             const unsigned char *bytes, int len);
-ASN1_OBJECT *X509_NAME_ENTRY_get_object(X509_NAME_ENTRY *ne);
-ASN1_STRING *X509_NAME_ENTRY_get_data(X509_NAME_ENTRY *ne);
-
-int X509v3_get_ext_count(const STACK_OF(X509_EXTENSION) *x);
-int X509v3_get_ext_by_NID(const STACK_OF(X509_EXTENSION) *x,
-                          int nid, int lastpos);
-int X509v3_get_ext_by_OBJ(const STACK_OF(X509_EXTENSION) *x,
-                          ASN1_OBJECT *obj, int lastpos);
-int X509v3_get_ext_by_critical(const STACK_OF(X509_EXTENSION) *x,
-                               int crit, int lastpos);
-X509_EXTENSION *X509v3_get_ext(const STACK_OF(X509_EXTENSION) *x, int loc);
-X509_EXTENSION *X509v3_delete_ext(STACK_OF(X509_EXTENSION) *x, int loc);
-STACK_OF(X509_EXTENSION) *X509v3_add_ext(STACK_OF(X509_EXTENSION) **x,
-                                         X509_EXTENSION *ex, int loc);
-
-int X509_get_ext_count(X509 *x);
-int X509_get_ext_by_NID(X509 *x, int nid, int lastpos);
-int X509_get_ext_by_OBJ(X509 *x, ASN1_OBJECT *obj, int lastpos);
-int X509_get_ext_by_critical(X509 *x, int crit, int lastpos);
-X509_EXTENSION *X509_get_ext(X509 *x, int loc);
-X509_EXTENSION *X509_delete_ext(X509 *x, int loc);
-int X509_add_ext(X509 *x, X509_EXTENSION *ex, int loc);
-void *X509_get_ext_d2i(X509 *x, int nid, int *crit, int *idx);
-int X509_add1_ext_i2d(X509 *x, int nid, void *value, int crit,
-                      unsigned long flags);
-
-int X509_CRL_get_ext_count(X509_CRL *x);
-int X509_CRL_get_ext_by_NID(X509_CRL *x, int nid, int lastpos);
-int X509_CRL_get_ext_by_OBJ(X509_CRL *x, ASN1_OBJECT *obj, int lastpos);
-int X509_CRL_get_ext_by_critical(X509_CRL *x, int crit, int lastpos);
-X509_EXTENSION *X509_CRL_get_ext(X509_CRL *x, int loc);
-X509_EXTENSION *X509_CRL_delete_ext(X509_CRL *x, int loc);
-int X509_CRL_add_ext(X509_CRL *x, X509_EXTENSION *ex, int loc);
-void *X509_CRL_get_ext_d2i(X509_CRL *x, int nid, int *crit, int *idx);
-int X509_CRL_add1_ext_i2d(X509_CRL *x, int nid, void *value, int crit,
-                          unsigned long flags);
-
-int X509_REVOKED_get_ext_count(X509_REVOKED *x);
-int X509_REVOKED_get_ext_by_NID(X509_REVOKED *x, int nid, int lastpos);
-int X509_REVOKED_get_ext_by_OBJ(X509_REVOKED *x, ASN1_OBJECT *obj,
-                                int lastpos);
-int X509_REVOKED_get_ext_by_critical(X509_REVOKED *x, int crit, int lastpos);
-X509_EXTENSION *X509_REVOKED_get_ext(X509_REVOKED *x, int loc);
-X509_EXTENSION *X509_REVOKED_delete_ext(X509_REVOKED *x, int loc);
-int X509_REVOKED_add_ext(X509_REVOKED *x, X509_EXTENSION *ex, int loc);
-void *X509_REVOKED_get_ext_d2i(X509_REVOKED *x, int nid, int *crit, int *idx);
-int X509_REVOKED_add1_ext_i2d(X509_REVOKED *x, int nid, void *value, int crit,
-                              unsigned long flags);
-
-X509_EXTENSION *X509_EXTENSION_create_by_NID(X509_EXTENSION **ex,
-                                             int nid, int crit,
-                                             ASN1_OCTET_STRING *data);
-X509_EXTENSION *X509_EXTENSION_create_by_OBJ(X509_EXTENSION **ex,
-                                             ASN1_OBJECT *obj, int crit,
-                                             ASN1_OCTET_STRING *data);
-int X509_EXTENSION_set_object(X509_EXTENSION *ex, ASN1_OBJECT *obj);
-int X509_EXTENSION_set_critical(X509_EXTENSION *ex, int crit);
-int X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data);
-ASN1_OBJECT *X509_EXTENSION_get_object(X509_EXTENSION *ex);
-ASN1_OCTET_STRING *X509_EXTENSION_get_data(X509_EXTENSION *ne);
-int X509_EXTENSION_get_critical(X509_EXTENSION *ex);
-
-int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x);
-int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
-                           int lastpos);
-int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
-                           ASN1_OBJECT *obj, int lastpos);
-X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc);
-X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
-                                           X509_ATTRIBUTE *attr);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const ASN1_OBJECT *obj,
-                                                  int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, int nid, int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const char *attrname,
-                                                  int type,
-                                                  const unsigned char *bytes,
-                                                  int len);
-void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, ASN1_OBJECT *obj,
-                              int lastpos, int type);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
-                                             int atrtype, const void *data,
-                                             int len);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
-                                             const ASN1_OBJECT *obj,
-                                             int atrtype, const void *data,
-                                             int len);
-X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr,
-                                             const char *atrname, int type,
-                                             const unsigned char *bytes,
-                                             int len);
-int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj);
-int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
-                             const void *data, int len);
-void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int atrtype,
-                               void *data);
-int X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr);
-ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr);
-ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx);
-
-int EVP_PKEY_get_attr_count(const EVP_PKEY *key);
-int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, int lastpos);
-int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, ASN1_OBJECT *obj,
-                             int lastpos);
-X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc);
-X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc);
-int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr);
-int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key,
-                              const ASN1_OBJECT *obj, int type,
-                              const unsigned char *bytes, int len);
-int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key,
-                              int nid, int type,
-                              const unsigned char *bytes, int len);
-int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key,
-                              const char *attrname, int type,
-                              const unsigned char *bytes, int len);
-
-int X509_verify_cert(X509_STORE_CTX *ctx);
-
-/* lookup a cert from a X509 STACK */
-X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name,
-                                     ASN1_INTEGER *serial);
-X509 *X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name);
-
-DECLARE_ASN1_FUNCTIONS(PBEPARAM)
-DECLARE_ASN1_FUNCTIONS(PBE2PARAM)
-DECLARE_ASN1_FUNCTIONS(PBKDF2PARAM)
-
-int PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter,
-                         const unsigned char *salt, int saltlen);
-
-X509_ALGOR *PKCS5_pbe_set(int alg, int iter,
-                          const unsigned char *salt, int saltlen);
-X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
-                           unsigned char *salt, int saltlen);
-X509_ALGOR *PKCS5_pbe2_set_iv(const EVP_CIPHER *cipher, int iter,
-                              unsigned char *salt, int saltlen,
-                              unsigned char *aiv, int prf_nid);
-
-X509_ALGOR *PKCS5_pbkdf2_set(int iter, unsigned char *salt, int saltlen,
-                             int prf_nid, int keylen);
-
-/* PKCS#8 utilities */
-
-DECLARE_ASN1_FUNCTIONS(PKCS8_PRIV_KEY_INFO)
-
-EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8);
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey);
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken);
-PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken);
-
-int PKCS8_pkey_set0(PKCS8_PRIV_KEY_INFO *priv, ASN1_OBJECT *aobj,
-                    int version, int ptype, void *pval,
-                    unsigned char *penc, int penclen);
-int PKCS8_pkey_get0(ASN1_OBJECT **ppkalg,
-                    const unsigned char **pk, int *ppklen,
-                    X509_ALGOR **pa, PKCS8_PRIV_KEY_INFO *p8);
-
-int X509_PUBKEY_set0_param(X509_PUBKEY *pub, ASN1_OBJECT *aobj,
-                           int ptype, void *pval,
-                           unsigned char *penc, int penclen);
-int X509_PUBKEY_get0_param(ASN1_OBJECT **ppkalg,
-                           const unsigned char **pk, int *ppklen,
-                           X509_ALGOR **pa, X509_PUBKEY *pub);
-
-int X509_check_trust(X509 *x, int id, int flags);
-int X509_TRUST_get_count(void);
-X509_TRUST *X509_TRUST_get0(int idx);
-int X509_TRUST_get_by_id(int id);
-int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
-                   char *name, int arg1, void *arg2);
-void X509_TRUST_cleanup(void);
-int X509_TRUST_get_flags(X509_TRUST *xp);
-char *X509_TRUST_get0_name(X509_TRUST *xp);
-int X509_TRUST_get_trust(X509_TRUST *xp);
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_X509_strings(void);
-
-/* Error codes for the X509 functions. */
-
-/* Function codes. */
-# define X509_F_ADD_CERT_DIR                              100
-# define X509_F_BY_FILE_CTRL                              101
-# define X509_F_CHECK_POLICY                              145
-# define X509_F_DIR_CTRL                                  102
-# define X509_F_GET_CERT_BY_SUBJECT                       103
-# define X509_F_NETSCAPE_SPKI_B64_DECODE                  129
-# define X509_F_NETSCAPE_SPKI_B64_ENCODE                  130
-# define X509_F_X509AT_ADD1_ATTR                          135
-# define X509_F_X509V3_ADD_EXT                            104
-# define X509_F_X509_ATTRIBUTE_CREATE_BY_NID              136
-# define X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ              137
-# define X509_F_X509_ATTRIBUTE_CREATE_BY_TXT              140
-# define X509_F_X509_ATTRIBUTE_GET0_DATA                  139
-# define X509_F_X509_ATTRIBUTE_SET1_DATA                  138
-# define X509_F_X509_CHECK_PRIVATE_KEY                    128
-# define X509_F_X509_CRL_PRINT_FP                         147
-# define X509_F_X509_EXTENSION_CREATE_BY_NID              108
-# define X509_F_X509_EXTENSION_CREATE_BY_OBJ              109
-# define X509_F_X509_GET_PUBKEY_PARAMETERS                110
-# define X509_F_X509_LOAD_CERT_CRL_FILE                   132
-# define X509_F_X509_LOAD_CERT_FILE                       111
-# define X509_F_X509_LOAD_CRL_FILE                        112
-# define X509_F_X509_NAME_ADD_ENTRY                       113
-# define X509_F_X509_NAME_ENTRY_CREATE_BY_NID             114
-# define X509_F_X509_NAME_ENTRY_CREATE_BY_TXT             131
-# define X509_F_X509_NAME_ENTRY_SET_OBJECT                115
-# define X509_F_X509_NAME_ONELINE                         116
-# define X509_F_X509_NAME_PRINT                           117
-# define X509_F_X509_PRINT_EX_FP                          118
-# define X509_F_X509_PUBKEY_GET                           119
-# define X509_F_X509_PUBKEY_SET                           120
-# define X509_F_X509_REQ_CHECK_PRIVATE_KEY                144
-# define X509_F_X509_REQ_PRINT_EX                         121
-# define X509_F_X509_REQ_PRINT_FP                         122
-# define X509_F_X509_REQ_TO_X509                          123
-# define X509_F_X509_STORE_ADD_CERT                       124
-# define X509_F_X509_STORE_ADD_CRL                        125
-# define X509_F_X509_STORE_CTX_GET1_ISSUER                146
-# define X509_F_X509_STORE_CTX_INIT                       143
-# define X509_F_X509_STORE_CTX_NEW                        142
-# define X509_F_X509_STORE_CTX_PURPOSE_INHERIT            134
-# define X509_F_X509_TO_X509_REQ                          126
-# define X509_F_X509_TRUST_ADD                            133
-# define X509_F_X509_TRUST_SET                            141
-# define X509_F_X509_VERIFY_CERT                          127
-
-/* Reason codes. */
-# define X509_R_BAD_X509_FILETYPE                         100
-# define X509_R_BASE64_DECODE_ERROR                       118
-# define X509_R_CANT_CHECK_DH_KEY                         114
-# define X509_R_CERT_ALREADY_IN_HASH_TABLE                101
-# define X509_R_ERR_ASN1_LIB                              102
-# define X509_R_INVALID_DIRECTORY                         113
-# define X509_R_INVALID_FIELD_NAME                        119
-# define X509_R_INVALID_TRUST                             123
-# define X509_R_KEY_TYPE_MISMATCH                         115
-# define X509_R_KEY_VALUES_MISMATCH                       116
-# define X509_R_LOADING_CERT_DIR                          103
-# define X509_R_LOADING_DEFAULTS                          104
-# define X509_R_METHOD_NOT_SUPPORTED                      124
-# define X509_R_NO_CERT_SET_FOR_US_TO_VERIFY              105
-# define X509_R_PUBLIC_KEY_DECODE_ERROR                   125
-# define X509_R_PUBLIC_KEY_ENCODE_ERROR                   126
-# define X509_R_SHOULD_RETRY                              106
-# define X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN        107
-# define X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY            108
-# define X509_R_UNKNOWN_KEY_TYPE                          117
-# define X509_R_UNKNOWN_NID                               109
-# define X509_R_UNKNOWN_PURPOSE_ID                        121
-# define X509_R_UNKNOWN_TRUST_ID                          120
-# define X509_R_UNSUPPORTED_ALGORITHM                     111
-# define X509_R_WRONG_LOOKUP_TYPE                         112
-# define X509_R_WRONG_TYPE                                122
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/x509_vfy.h b/include.new/openssl/x509_vfy.h
deleted file mode 100644
index aacdf55..0000000
--- a/include.new/openssl/x509_vfy.h
+++ /dev/null
@@ -1,595 +0,0 @@
-/* crypto/x509/x509_vfy.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- *
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- *
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- *
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- *
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- *
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-#ifndef HEADER_X509_H
-# include <openssl/x509.h>
-/*
- * openssl/x509.h ends up #include-ing this file at about the only
- * appropriate moment.
- */
-#endif
-
-#ifndef HEADER_X509_VFY_H
-# define HEADER_X509_VFY_H
-
-# include <openssl/opensslconf.h>
-# ifndef OPENSSL_NO_LHASH
-#  include <openssl/lhash.h>
-# endif
-# include <openssl/bio.h>
-# include <openssl/crypto.h>
-# include <openssl/symhacks.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-# if 0
-/* Outer object */
-typedef struct x509_hash_dir_st {
-    int num_dirs;
-    char **dirs;
-    int *dirs_type;
-    int num_dirs_alloced;
-} X509_HASH_DIR_CTX;
-# endif
-
-typedef struct x509_file_st {
-    int num_paths;              /* number of paths to files or directories */
-    int num_alloced;
-    char **paths;               /* the list of paths or directories */
-    int *path_type;
-} X509_CERT_FILE_CTX;
-
-/*******************************/
-/*-
-SSL_CTX -> X509_STORE
-                -> X509_LOOKUP
-                        ->X509_LOOKUP_METHOD
-                -> X509_LOOKUP
-                        ->X509_LOOKUP_METHOD
-
-SSL     -> X509_STORE_CTX
-                ->X509_STORE
-
-The X509_STORE holds the tables etc for verification stuff.
-A X509_STORE_CTX is used while validating a single certificate.
-The X509_STORE has X509_LOOKUPs for looking up certs.
-The X509_STORE then calls a function to actually verify the
-certificate chain.
-*/
-
-# define X509_LU_RETRY           -1
-# define X509_LU_FAIL            0
-# define X509_LU_X509            1
-# define X509_LU_CRL             2
-# define X509_LU_PKEY            3
-
-typedef struct x509_object_st {
-    /* one of the above types */
-    int type;
-    union {
-        char *ptr;
-        X509 *x509;
-        X509_CRL *crl;
-        EVP_PKEY *pkey;
-    } data;
-} X509_OBJECT;
-
-typedef struct x509_lookup_st X509_LOOKUP;
-
-DECLARE_STACK_OF(X509_LOOKUP)
-DECLARE_STACK_OF(X509_OBJECT)
-
-/* This is a static that defines the function interface */
-typedef struct x509_lookup_method_st {
-    const char *name;
-    int (*new_item) (X509_LOOKUP *ctx);
-    void (*free) (X509_LOOKUP *ctx);
-    int (*init) (X509_LOOKUP *ctx);
-    int (*shutdown) (X509_LOOKUP *ctx);
-    int (*ctrl) (X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
-                 char **ret);
-    int (*get_by_subject) (X509_LOOKUP *ctx, int type, X509_NAME *name,
-                           X509_OBJECT *ret);
-    int (*get_by_issuer_serial) (X509_LOOKUP *ctx, int type, X509_NAME *name,
-                                 ASN1_INTEGER *serial, X509_OBJECT *ret);
-    int (*get_by_fingerprint) (X509_LOOKUP *ctx, int type,
-                               unsigned char *bytes, int len,
-                               X509_OBJECT *ret);
-    int (*get_by_alias) (X509_LOOKUP *ctx, int type, char *str, int len,
-                         X509_OBJECT *ret);
-} X509_LOOKUP_METHOD;
-
-/*
- * This structure hold all parameters associated with a verify operation by
- * including an X509_VERIFY_PARAM structure in related structures the
- * parameters used can be customized
- */
-
-typedef struct X509_VERIFY_PARAM_st {
-    char *name;
-    time_t check_time;          /* Time to use */
-    unsigned long inh_flags;    /* Inheritance flags */
-    unsigned long flags;        /* Various verify flags */
-    int purpose;                /* purpose to check untrusted certificates */
-    int trust;                  /* trust setting to check */
-    int depth;                  /* Verify depth */
-    STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */
-} X509_VERIFY_PARAM;
-
-DECLARE_STACK_OF(X509_VERIFY_PARAM)
-
-/*
- * This is used to hold everything.  It is used for all certificate
- * validation.  Once we have a certificate chain, the 'verify' function is
- * then called to actually check the cert chain.
- */
-struct x509_store_st {
-    /* The following is a cache of trusted certs */
-    int cache;                  /* if true, stash any hits */
-    STACK_OF(X509_OBJECT) *objs; /* Cache of all objects */
-    /* These are external lookup methods */
-    STACK_OF(X509_LOOKUP) *get_cert_methods;
-    X509_VERIFY_PARAM *param;
-    /* Callbacks for various operations */
-    /* called to verify a certificate */
-    int (*verify) (X509_STORE_CTX *ctx);
-    /* error callback */
-    int (*verify_cb) (int ok, X509_STORE_CTX *ctx);
-    /* get issuers cert from ctx */
-    int (*get_issuer) (X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
-    /* check issued */
-    int (*check_issued) (X509_STORE_CTX *ctx, X509 *x, X509 *issuer);
-    /* Check revocation status of chain */
-    int (*check_revocation) (X509_STORE_CTX *ctx);
-    /* retrieve CRL */
-    int (*get_crl) (X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);
-    /* Check CRL validity */
-    int (*check_crl) (X509_STORE_CTX *ctx, X509_CRL *crl);
-    /* Check certificate against CRL */
-    int (*cert_crl) (X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);
-    STACK_OF(X509) *(*lookup_certs) (X509_STORE_CTX *ctx, X509_NAME *nm);
-    STACK_OF(X509_CRL) *(*lookup_crls) (X509_STORE_CTX *ctx, X509_NAME *nm);
-    int (*cleanup) (X509_STORE_CTX *ctx);
-    CRYPTO_EX_DATA ex_data;
-    int references;
-} /* X509_STORE */ ;
-
-int X509_STORE_set_depth(X509_STORE *store, int depth);
-
-# define X509_STORE_set_verify_cb_func(ctx,func) ((ctx)->verify_cb=(func))
-# define X509_STORE_set_verify_func(ctx,func)    ((ctx)->verify=(func))
-
-/* This is the functions plus an instance of the local variables. */
-struct x509_lookup_st {
-    int init;                   /* have we been started */
-    int skip;                   /* don't use us. */
-    X509_LOOKUP_METHOD *method; /* the functions */
-    char *method_data;          /* method data */
-    X509_STORE *store_ctx;      /* who owns us */
-} /* X509_LOOKUP */ ;
-
-/*
- * This is a used when verifying cert chains.  Since the gathering of the
- * cert chain can take some time (and have to be 'retried', this needs to be
- * kept and passed around.
- */
-struct x509_store_ctx_st {      /* X509_STORE_CTX */
-    X509_STORE *ctx;
-    /* used when looking up certs */
-    int current_method;
-    /* The following are set by the caller */
-    /* The cert to check */
-    X509 *cert;
-    /* chain of X509s - untrusted - passed in */
-    STACK_OF(X509) *untrusted;
-    /* set of CRLs passed in */
-    STACK_OF(X509_CRL) *crls;
-    X509_VERIFY_PARAM *param;
-    /* Other info for use with get_issuer() */
-    void *other_ctx;
-    /* Callbacks for various operations */
-    /* called to verify a certificate */
-    int (*verify) (X509_STORE_CTX *ctx);
-    /* error callback */
-    int (*verify_cb) (int ok, X509_STORE_CTX *ctx);
-    /* get issuers cert from ctx */
-    int (*get_issuer) (X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
-    /* check issued */
-    int (*check_issued) (X509_STORE_CTX *ctx, X509 *x, X509 *issuer);
-    /* Check revocation status of chain */
-    int (*check_revocation) (X509_STORE_CTX *ctx);
-    /* retrieve CRL */
-    int (*get_crl) (X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x);
-    /* Check CRL validity */
-    int (*check_crl) (X509_STORE_CTX *ctx, X509_CRL *crl);
-    /* Check certificate against CRL */
-    int (*cert_crl) (X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x);
-    int (*check_policy) (X509_STORE_CTX *ctx);
-    STACK_OF(X509) *(*lookup_certs) (X509_STORE_CTX *ctx, X509_NAME *nm);
-    STACK_OF(X509_CRL) *(*lookup_crls) (X509_STORE_CTX *ctx, X509_NAME *nm);
-    int (*cleanup) (X509_STORE_CTX *ctx);
-    /* The following is built up */
-    /* if 0, rebuild chain */
-    int valid;
-    /* index of last untrusted cert */
-    int last_untrusted;
-    /* chain of X509s - built up and trusted */
-    STACK_OF(X509) *chain;
-    /* Valid policy tree */
-    X509_POLICY_TREE *tree;
-    /* Require explicit policy value */
-    int explicit_policy;
-    /* When something goes wrong, this is why */
-    int error_depth;
-    int error;
-    X509 *current_cert;
-    /* cert currently being tested as valid issuer */
-    X509 *current_issuer;
-    /* current CRL */
-    X509_CRL *current_crl;
-    /* score of current CRL */
-    int current_crl_score;
-    /* Reason mask */
-    unsigned int current_reasons;
-    /* For CRL path validation: parent context */
-    X509_STORE_CTX *parent;
-    CRYPTO_EX_DATA ex_data;
-} /* X509_STORE_CTX */ ;
-
-void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth);
-
-# define X509_STORE_CTX_set_app_data(ctx,data) \
-        X509_STORE_CTX_set_ex_data(ctx,0,data)
-# define X509_STORE_CTX_get_app_data(ctx) \
-        X509_STORE_CTX_get_ex_data(ctx,0)
-
-# define X509_L_FILE_LOAD        1
-# define X509_L_ADD_DIR          2
-
-# define X509_LOOKUP_load_file(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)
-
-# define X509_LOOKUP_add_dir(x,name,type) \
-                X509_LOOKUP_ctrl((x),X509_L_ADD_DIR,(name),(long)(type),NULL)
-
-# define         X509_V_OK                                       0
-/* illegal error (for uninitialized values, to avoid X509_V_OK): 1 */
-
-# define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT            2
-# define         X509_V_ERR_UNABLE_TO_GET_CRL                    3
-# define         X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE     4
-# define         X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE      5
-# define         X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY   6
-# define         X509_V_ERR_CERT_SIGNATURE_FAILURE               7
-# define         X509_V_ERR_CRL_SIGNATURE_FAILURE                8
-# define         X509_V_ERR_CERT_NOT_YET_VALID                   9
-# define         X509_V_ERR_CERT_HAS_EXPIRED                     10
-# define         X509_V_ERR_CRL_NOT_YET_VALID                    11
-# define         X509_V_ERR_CRL_HAS_EXPIRED                      12
-# define         X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD       13
-# define         X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD        14
-# define         X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD       15
-# define         X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD       16
-# define         X509_V_ERR_OUT_OF_MEM                           17
-# define         X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT          18
-# define         X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN            19
-# define         X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY    20
-# define         X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE      21
-# define         X509_V_ERR_CERT_CHAIN_TOO_LONG                  22
-# define         X509_V_ERR_CERT_REVOKED                         23
-# define         X509_V_ERR_INVALID_CA                           24
-# define         X509_V_ERR_PATH_LENGTH_EXCEEDED                 25
-# define         X509_V_ERR_INVALID_PURPOSE                      26
-# define         X509_V_ERR_CERT_UNTRUSTED                       27
-# define         X509_V_ERR_CERT_REJECTED                        28
-/* These are 'informational' when looking for issuer cert */
-# define         X509_V_ERR_SUBJECT_ISSUER_MISMATCH              29
-# define         X509_V_ERR_AKID_SKID_MISMATCH                   30
-# define         X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH          31
-# define         X509_V_ERR_KEYUSAGE_NO_CERTSIGN                 32
-
-# define         X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER             33
-# define         X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION         34
-# define         X509_V_ERR_KEYUSAGE_NO_CRL_SIGN                 35
-# define         X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION     36
-# define         X509_V_ERR_INVALID_NON_CA                       37
-# define         X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED           38
-# define         X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE        39
-# define         X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED       40
-
-# define         X509_V_ERR_INVALID_EXTENSION                    41
-# define         X509_V_ERR_INVALID_POLICY_EXTENSION             42
-# define         X509_V_ERR_NO_EXPLICIT_POLICY                   43
-# define         X509_V_ERR_DIFFERENT_CRL_SCOPE                  44
-# define         X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE        45
-
-# define         X509_V_ERR_UNNESTED_RESOURCE                    46
-
-# define         X509_V_ERR_PERMITTED_VIOLATION                  47
-# define         X509_V_ERR_EXCLUDED_VIOLATION                   48
-# define         X509_V_ERR_SUBTREE_MINMAX                       49
-# define         X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE          51
-# define         X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX        52
-# define         X509_V_ERR_UNSUPPORTED_NAME_SYNTAX              53
-# define         X509_V_ERR_CRL_PATH_VALIDATION_ERROR            54
-
-/* The application is not happy */
-# define         X509_V_ERR_APPLICATION_VERIFICATION             50
-
-/* Certificate verify flags */
-
-/* Send issuer+subject checks to verify_cb */
-# define X509_V_FLAG_CB_ISSUER_CHECK             0x1
-/* Use check time instead of current time */
-# define X509_V_FLAG_USE_CHECK_TIME              0x2
-/* Lookup CRLs */
-# define X509_V_FLAG_CRL_CHECK                   0x4
-/* Lookup CRLs for whole chain */
-# define X509_V_FLAG_CRL_CHECK_ALL               0x8
-/* Ignore unhandled critical extensions */
-# define X509_V_FLAG_IGNORE_CRITICAL             0x10
-/* Disable workarounds for broken certificates */
-# define X509_V_FLAG_X509_STRICT                 0x20
-/* Enable proxy certificate validation */
-# define X509_V_FLAG_ALLOW_PROXY_CERTS           0x40
-/* Enable policy checking */
-# define X509_V_FLAG_POLICY_CHECK                0x80
-/* Policy variable require-explicit-policy */
-# define X509_V_FLAG_EXPLICIT_POLICY             0x100
-/* Policy variable inhibit-any-policy */
-# define X509_V_FLAG_INHIBIT_ANY                 0x200
-/* Policy variable inhibit-policy-mapping */
-# define X509_V_FLAG_INHIBIT_MAP                 0x400
-/* Notify callback that policy is OK */
-# define X509_V_FLAG_NOTIFY_POLICY               0x800
-/* Extended CRL features such as indirect CRLs, alternate CRL signing keys */
-# define X509_V_FLAG_EXTENDED_CRL_SUPPORT        0x1000
-/* Delta CRL support */
-# define X509_V_FLAG_USE_DELTAS                  0x2000
-/* Check selfsigned CA signature */
-# define X509_V_FLAG_CHECK_SS_SIGNATURE          0x4000
-/*
- * If the initial chain is not trusted, do not attempt to build an alternative
- * chain. Alternate chain checking was introduced in 1.0.1n/1.0.2b. Setting
- * this flag will force the behaviour to match that of previous versions.
- */
-# define X509_V_FLAG_NO_ALT_CHAINS               0x100000
-
-# define X509_VP_FLAG_DEFAULT                    0x1
-# define X509_VP_FLAG_OVERWRITE                  0x2
-# define X509_VP_FLAG_RESET_FLAGS                0x4
-# define X509_VP_FLAG_LOCKED                     0x8
-# define X509_VP_FLAG_ONCE                       0x10
-
-/* Internal use: mask of policy related options */
-# define X509_V_FLAG_POLICY_MASK (X509_V_FLAG_POLICY_CHECK \
-                                | X509_V_FLAG_EXPLICIT_POLICY \
-                                | X509_V_FLAG_INHIBIT_ANY \
-                                | X509_V_FLAG_INHIBIT_MAP)
-
-int X509_OBJECT_idx_by_subject(STACK_OF(X509_OBJECT) *h, int type,
-                               X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_by_subject(STACK_OF(X509_OBJECT) *h,
-                                             int type, X509_NAME *name);
-X509_OBJECT *X509_OBJECT_retrieve_match(STACK_OF(X509_OBJECT) *h,
-                                        X509_OBJECT *x);
-void X509_OBJECT_up_ref_count(X509_OBJECT *a);
-void X509_OBJECT_free_contents(X509_OBJECT *a);
-X509_STORE *X509_STORE_new(void);
-void X509_STORE_free(X509_STORE *v);
-
-STACK_OF(X509) *X509_STORE_get1_certs(X509_STORE_CTX *st, X509_NAME *nm);
-STACK_OF(X509_CRL) *X509_STORE_get1_crls(X509_STORE_CTX *st, X509_NAME *nm);
-int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags);
-int X509_STORE_set_purpose(X509_STORE *ctx, int purpose);
-int X509_STORE_set_trust(X509_STORE *ctx, int trust);
-int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm);
-
-void X509_STORE_set_verify_cb(X509_STORE *ctx,
-                              int (*verify_cb) (int, X509_STORE_CTX *));
-
-X509_STORE_CTX *X509_STORE_CTX_new(void);
-
-int X509_STORE_CTX_get1_issuer(X509 **issuer, X509_STORE_CTX *ctx, X509 *x);
-
-void X509_STORE_CTX_free(X509_STORE_CTX *ctx);
-int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store,
-                        X509 *x509, STACK_OF(X509) *chain);
-void X509_STORE_CTX_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk);
-void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx);
-
-X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
-
-X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);
-X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
-
-int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);
-int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
-
-int X509_STORE_get_by_subject(X509_STORE_CTX *vs, int type, X509_NAME *name,
-                              X509_OBJECT *ret);
-
-int X509_LOOKUP_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-                     long argl, char **ret);
-
-# ifndef OPENSSL_NO_STDIO
-int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type);
-int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type);
-int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type);
-# endif
-
-X509_LOOKUP *X509_LOOKUP_new(X509_LOOKUP_METHOD *method);
-void X509_LOOKUP_free(X509_LOOKUP *ctx);
-int X509_LOOKUP_init(X509_LOOKUP *ctx);
-int X509_LOOKUP_by_subject(X509_LOOKUP *ctx, int type, X509_NAME *name,
-                           X509_OBJECT *ret);
-int X509_LOOKUP_by_issuer_serial(X509_LOOKUP *ctx, int type, X509_NAME *name,
-                                 ASN1_INTEGER *serial, X509_OBJECT *ret);
-int X509_LOOKUP_by_fingerprint(X509_LOOKUP *ctx, int type,
-                               unsigned char *bytes, int len,
-                               X509_OBJECT *ret);
-int X509_LOOKUP_by_alias(X509_LOOKUP *ctx, int type, char *str, int len,
-                         X509_OBJECT *ret);
-int X509_LOOKUP_shutdown(X509_LOOKUP *ctx);
-
-# ifndef OPENSSL_NO_STDIO
-int X509_STORE_load_locations(X509_STORE *ctx,
-                              const char *file, const char *dir);
-int X509_STORE_set_default_paths(X509_STORE *ctx);
-# endif
-
-int X509_STORE_CTX_get_ex_new_index(long argl, void *argp,
-                                    CRYPTO_EX_new *new_func,
-                                    CRYPTO_EX_dup *dup_func,
-                                    CRYPTO_EX_free *free_func);
-int X509_STORE_CTX_set_ex_data(X509_STORE_CTX *ctx, int idx, void *data);
-void *X509_STORE_CTX_get_ex_data(X509_STORE_CTX *ctx, int idx);
-int X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set_error(X509_STORE_CTX *ctx, int s);
-int X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
-X509 *X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
-X509 *X509_STORE_CTX_get0_current_issuer(X509_STORE_CTX *ctx);
-X509_CRL *X509_STORE_CTX_get0_current_crl(X509_STORE_CTX *ctx);
-X509_STORE_CTX *X509_STORE_CTX_get0_parent_ctx(X509_STORE_CTX *ctx);
-STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
-STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set_cert(X509_STORE_CTX *c, X509 *x);
-void X509_STORE_CTX_set_chain(X509_STORE_CTX *c, STACK_OF(X509) *sk);
-void X509_STORE_CTX_set0_crls(X509_STORE_CTX *c, STACK_OF(X509_CRL) *sk);
-int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose);
-int X509_STORE_CTX_set_trust(X509_STORE_CTX *ctx, int trust);
-int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
-                                   int purpose, int trust);
-void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, unsigned long flags);
-void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, unsigned long flags,
-                             time_t t);
-void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
-                                  int (*verify_cb) (int, X509_STORE_CTX *));
-
-X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(X509_STORE_CTX *ctx);
-int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx);
-
-X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *ctx);
-void X509_STORE_CTX_set0_param(X509_STORE_CTX *ctx, X509_VERIFY_PARAM *param);
-int X509_STORE_CTX_set_default(X509_STORE_CTX *ctx, const char *name);
-
-/* X509_VERIFY_PARAM functions */
-
-X509_VERIFY_PARAM *X509_VERIFY_PARAM_new(void);
-void X509_VERIFY_PARAM_free(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *to,
-                              const X509_VERIFY_PARAM *from);
-int X509_VERIFY_PARAM_set1(X509_VERIFY_PARAM *to,
-                           const X509_VERIFY_PARAM *from);
-int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name);
-int X509_VERIFY_PARAM_set_flags(X509_VERIFY_PARAM *param,
-                                unsigned long flags);
-int X509_VERIFY_PARAM_clear_flags(X509_VERIFY_PARAM *param,
-                                  unsigned long flags);
-unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
-int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
-int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
-void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);
-void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t);
-int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
-                                  ASN1_OBJECT *policy);
-int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param,
-                                    STACK_OF(ASN1_OBJECT) *policies);
-int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param);
-
-int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param);
-const X509_VERIFY_PARAM *X509_VERIFY_PARAM_lookup(const char *name);
-void X509_VERIFY_PARAM_table_cleanup(void);
-
-int X509_policy_check(X509_POLICY_TREE **ptree, int *pexplicit_policy,
-                      STACK_OF(X509) *certs,
-                      STACK_OF(ASN1_OBJECT) *policy_oids, unsigned int flags);
-
-void X509_policy_tree_free(X509_POLICY_TREE *tree);
-
-int X509_policy_tree_level_count(const X509_POLICY_TREE *tree);
-X509_POLICY_LEVEL *X509_policy_tree_get0_level(const X509_POLICY_TREE *tree,
-                                               int i);
-
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_policies(const
-                                                           X509_POLICY_TREE
-                                                           *tree);
-
-STACK_OF(X509_POLICY_NODE) *X509_policy_tree_get0_user_policies(const
-                                                                X509_POLICY_TREE
-                                                                *tree);
-
-int X509_policy_level_node_count(X509_POLICY_LEVEL *level);
-
-X509_POLICY_NODE *X509_policy_level_get0_node(X509_POLICY_LEVEL *level,
-                                              int i);
-
-const ASN1_OBJECT *X509_policy_node_get0_policy(const X509_POLICY_NODE *node);
-
-STACK_OF(POLICYQUALINFO) *X509_policy_node_get0_qualifiers(const
-                                                           X509_POLICY_NODE
-                                                           *node);
-const X509_POLICY_NODE *X509_policy_node_get0_parent(const X509_POLICY_NODE
-                                                     *node);
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/openssl/x509v3.h b/include.new/openssl/x509v3.h
deleted file mode 100644
index db9c3e8..0000000
--- a/include.new/openssl/x509v3.h
+++ /dev/null
@@ -1,1015 +0,0 @@
-/* x509v3.h */
-/*
- * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
- * 1999.
- */
-/* ====================================================================
- * Copyright (c) 1999-2004 The OpenSSL Project.  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 acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED 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 OpenSSL PROJECT OR
- * ITS 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.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-#ifndef HEADER_X509V3_H
-# define HEADER_X509V3_H
-
-# include <openssl/bio.h>
-# include <openssl/x509.h>
-# include <openssl/conf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Forward reference */
-struct v3_ext_method;
-struct v3_ext_ctx;
-
-/* Useful typedefs */
-
-typedef void *(*X509V3_EXT_NEW)(void);
-typedef void (*X509V3_EXT_FREE) (void *);
-typedef void *(*X509V3_EXT_D2I)(void *, const unsigned char **, long);
-typedef int (*X509V3_EXT_I2D) (void *, unsigned char **);
-typedef STACK_OF(CONF_VALUE) *
-    (*X509V3_EXT_I2V) (const struct v3_ext_method *method, void *ext,
-                       STACK_OF(CONF_VALUE) *extlist);
-typedef void *(*X509V3_EXT_V2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx,
-                                STACK_OF(CONF_VALUE) *values);
-typedef char *(*X509V3_EXT_I2S)(const struct v3_ext_method *method,
-                                void *ext);
-typedef void *(*X509V3_EXT_S2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx, const char *str);
-typedef int (*X509V3_EXT_I2R) (const struct v3_ext_method *method, void *ext,
-                               BIO *out, int indent);
-typedef void *(*X509V3_EXT_R2I)(const struct v3_ext_method *method,
-                                struct v3_ext_ctx *ctx, const char *str);
-
-/* V3 extension structure */
-
-struct v3_ext_method {
-    int ext_nid;
-    int ext_flags;
-/* If this is set the following four fields are ignored */
-    ASN1_ITEM_EXP *it;
-/* Old style ASN1 calls */
-    X509V3_EXT_NEW ext_new;
-    X509V3_EXT_FREE ext_free;
-    X509V3_EXT_D2I d2i;
-    X509V3_EXT_I2D i2d;
-/* The following pair is used for string extensions */
-    X509V3_EXT_I2S i2s;
-    X509V3_EXT_S2I s2i;
-/* The following pair is used for multi-valued extensions */
-    X509V3_EXT_I2V i2v;
-    X509V3_EXT_V2I v2i;
-/* The following are used for raw extensions */
-    X509V3_EXT_I2R i2r;
-    X509V3_EXT_R2I r2i;
-    void *usr_data;             /* Any extension specific data */
-};
-
-typedef struct X509V3_CONF_METHOD_st {
-    char *(*get_string) (void *db, char *section, char *value);
-    STACK_OF(CONF_VALUE) *(*get_section) (void *db, char *section);
-    void (*free_string) (void *db, char *string);
-    void (*free_section) (void *db, STACK_OF(CONF_VALUE) *section);
-} X509V3_CONF_METHOD;
-
-/* Context specific info */
-struct v3_ext_ctx {
-# define CTX_TEST 0x1
-    int flags;
-    X509 *issuer_cert;
-    X509 *subject_cert;
-    X509_REQ *subject_req;
-    X509_CRL *crl;
-    X509V3_CONF_METHOD *db_meth;
-    void *db;
-/* Maybe more here */
-};
-
-typedef struct v3_ext_method X509V3_EXT_METHOD;
-
-DECLARE_STACK_OF(X509V3_EXT_METHOD)
-
-/* ext_flags values */
-# define X509V3_EXT_DYNAMIC      0x1
-# define X509V3_EXT_CTX_DEP      0x2
-# define X509V3_EXT_MULTILINE    0x4
-
-typedef BIT_STRING_BITNAME ENUMERATED_NAMES;
-
-typedef struct BASIC_CONSTRAINTS_st {
-    int ca;
-    ASN1_INTEGER *pathlen;
-} BASIC_CONSTRAINTS;
-
-typedef struct PKEY_USAGE_PERIOD_st {
-    ASN1_GENERALIZEDTIME *notBefore;
-    ASN1_GENERALIZEDTIME *notAfter;
-} PKEY_USAGE_PERIOD;
-
-typedef struct otherName_st {
-    ASN1_OBJECT *type_id;
-    ASN1_TYPE *value;
-} OTHERNAME;
-
-typedef struct EDIPartyName_st {
-    ASN1_STRING *nameAssigner;
-    ASN1_STRING *partyName;
-} EDIPARTYNAME;
-
-typedef struct GENERAL_NAME_st {
-# define GEN_OTHERNAME   0
-# define GEN_EMAIL       1
-# define GEN_DNS         2
-# define GEN_X400        3
-# define GEN_DIRNAME     4
-# define GEN_EDIPARTY    5
-# define GEN_URI         6
-# define GEN_IPADD       7
-# define GEN_RID         8
-    int type;
-    union {
-        char *ptr;
-        OTHERNAME *otherName;   /* otherName */
-        ASN1_IA5STRING *rfc822Name;
-        ASN1_IA5STRING *dNSName;
-        ASN1_TYPE *x400Address;
-        X509_NAME *directoryName;
-        EDIPARTYNAME *ediPartyName;
-        ASN1_IA5STRING *uniformResourceIdentifier;
-        ASN1_OCTET_STRING *iPAddress;
-        ASN1_OBJECT *registeredID;
-        /* Old names */
-        ASN1_OCTET_STRING *ip;  /* iPAddress */
-        X509_NAME *dirn;        /* dirn */
-        ASN1_IA5STRING *ia5;    /* rfc822Name, dNSName,
-                                 * uniformResourceIdentifier */
-        ASN1_OBJECT *rid;       /* registeredID */
-        ASN1_TYPE *other;       /* x400Address */
-    } d;
-} GENERAL_NAME;
-
-typedef STACK_OF(GENERAL_NAME) GENERAL_NAMES;
-
-typedef struct ACCESS_DESCRIPTION_st {
-    ASN1_OBJECT *method;
-    GENERAL_NAME *location;
-} ACCESS_DESCRIPTION;
-
-typedef STACK_OF(ACCESS_DESCRIPTION) AUTHORITY_INFO_ACCESS;
-
-typedef STACK_OF(ASN1_OBJECT) EXTENDED_KEY_USAGE;
-
-DECLARE_STACK_OF(GENERAL_NAME)
-DECLARE_ASN1_SET_OF(GENERAL_NAME)
-
-DECLARE_STACK_OF(ACCESS_DESCRIPTION)
-DECLARE_ASN1_SET_OF(ACCESS_DESCRIPTION)
-
-typedef struct DIST_POINT_NAME_st {
-    int type;
-    union {
-        GENERAL_NAMES *fullname;
-        STACK_OF(X509_NAME_ENTRY) *relativename;
-    } name;
-/* If relativename then this contains the full distribution point name */
-    X509_NAME *dpname;
-} DIST_POINT_NAME;
-/* All existing reasons */
-# define CRLDP_ALL_REASONS       0x807f
-
-# define CRL_REASON_NONE                         -1
-# define CRL_REASON_UNSPECIFIED                  0
-# define CRL_REASON_KEY_COMPROMISE               1
-# define CRL_REASON_CA_COMPROMISE                2
-# define CRL_REASON_AFFILIATION_CHANGED          3
-# define CRL_REASON_SUPERSEDED                   4
-# define CRL_REASON_CESSATION_OF_OPERATION       5
-# define CRL_REASON_CERTIFICATE_HOLD             6
-# define CRL_REASON_REMOVE_FROM_CRL              8
-# define CRL_REASON_PRIVILEGE_WITHDRAWN          9
-# define CRL_REASON_AA_COMPROMISE                10
-
-struct DIST_POINT_st {
-    DIST_POINT_NAME *distpoint;
-    ASN1_BIT_STRING *reasons;
-    GENERAL_NAMES *CRLissuer;
-    int dp_reasons;
-};
-
-typedef STACK_OF(DIST_POINT) CRL_DIST_POINTS;
-
-DECLARE_STACK_OF(DIST_POINT)
-DECLARE_ASN1_SET_OF(DIST_POINT)
-
-struct AUTHORITY_KEYID_st {
-    ASN1_OCTET_STRING *keyid;
-    GENERAL_NAMES *issuer;
-    ASN1_INTEGER *serial;
-};
-
-/* Strong extranet structures */
-
-typedef struct SXNET_ID_st {
-    ASN1_INTEGER *zone;
-    ASN1_OCTET_STRING *user;
-} SXNETID;
-
-DECLARE_STACK_OF(SXNETID)
-DECLARE_ASN1_SET_OF(SXNETID)
-
-typedef struct SXNET_st {
-    ASN1_INTEGER *version;
-    STACK_OF(SXNETID) *ids;
-} SXNET;
-
-typedef struct NOTICEREF_st {
-    ASN1_STRING *organization;
-    STACK_OF(ASN1_INTEGER) *noticenos;
-} NOTICEREF;
-
-typedef struct USERNOTICE_st {
-    NOTICEREF *noticeref;
-    ASN1_STRING *exptext;
-} USERNOTICE;
-
-typedef struct POLICYQUALINFO_st {
-    ASN1_OBJECT *pqualid;
-    union {
-        ASN1_IA5STRING *cpsuri;
-        USERNOTICE *usernotice;
-        ASN1_TYPE *other;
-    } d;
-} POLICYQUALINFO;
-
-DECLARE_STACK_OF(POLICYQUALINFO)
-DECLARE_ASN1_SET_OF(POLICYQUALINFO)
-
-typedef struct POLICYINFO_st {
-    ASN1_OBJECT *policyid;
-    STACK_OF(POLICYQUALINFO) *qualifiers;
-} POLICYINFO;
-
-typedef STACK_OF(POLICYINFO) CERTIFICATEPOLICIES;
-
-DECLARE_STACK_OF(POLICYINFO)
-DECLARE_ASN1_SET_OF(POLICYINFO)
-
-typedef struct POLICY_MAPPING_st {
-    ASN1_OBJECT *issuerDomainPolicy;
-    ASN1_OBJECT *subjectDomainPolicy;
-} POLICY_MAPPING;
-
-DECLARE_STACK_OF(POLICY_MAPPING)
-
-typedef STACK_OF(POLICY_MAPPING) POLICY_MAPPINGS;
-
-typedef struct GENERAL_SUBTREE_st {
-    GENERAL_NAME *base;
-    ASN1_INTEGER *minimum;
-    ASN1_INTEGER *maximum;
-} GENERAL_SUBTREE;
-
-DECLARE_STACK_OF(GENERAL_SUBTREE)
-
-struct NAME_CONSTRAINTS_st {
-    STACK_OF(GENERAL_SUBTREE) *permittedSubtrees;
-    STACK_OF(GENERAL_SUBTREE) *excludedSubtrees;
-};
-
-typedef struct POLICY_CONSTRAINTS_st {
-    ASN1_INTEGER *requireExplicitPolicy;
-    ASN1_INTEGER *inhibitPolicyMapping;
-} POLICY_CONSTRAINTS;
-
-/* Proxy certificate structures, see RFC 3820 */
-typedef struct PROXY_POLICY_st {
-    ASN1_OBJECT *policyLanguage;
-    ASN1_OCTET_STRING *policy;
-} PROXY_POLICY;
-
-typedef struct PROXY_CERT_INFO_EXTENSION_st {
-    ASN1_INTEGER *pcPathLengthConstraint;
-    PROXY_POLICY *proxyPolicy;
-} PROXY_CERT_INFO_EXTENSION;
-
-DECLARE_ASN1_FUNCTIONS(PROXY_POLICY)
-DECLARE_ASN1_FUNCTIONS(PROXY_CERT_INFO_EXTENSION)
-
-struct ISSUING_DIST_POINT_st {
-    DIST_POINT_NAME *distpoint;
-    int onlyuser;
-    int onlyCA;
-    ASN1_BIT_STRING *onlysomereasons;
-    int indirectCRL;
-    int onlyattr;
-};
-
-/* Values in idp_flags field */
-/* IDP present */
-# define IDP_PRESENT     0x1
-/* IDP values inconsistent */
-# define IDP_INVALID     0x2
-/* onlyuser true */
-# define IDP_ONLYUSER    0x4
-/* onlyCA true */
-# define IDP_ONLYCA      0x8
-/* onlyattr true */
-# define IDP_ONLYATTR    0x10
-/* indirectCRL true */
-# define IDP_INDIRECT    0x20
-/* onlysomereasons present */
-# define IDP_REASONS     0x40
-
-# define X509V3_conf_err(val) ERR_add_error_data(6, "section:", val->section, \
-",name:", val->name, ",value:", val->value);
-
-# define X509V3_set_ctx_test(ctx) \
-                        X509V3_set_ctx(ctx, NULL, NULL, NULL, NULL, CTX_TEST)
-# define X509V3_set_ctx_nodb(ctx) (ctx)->db = NULL;
-
-# define EXT_BITSTRING(nid, table) { nid, 0, ASN1_ITEM_ref(ASN1_BIT_STRING), \
-                        0,0,0,0, \
-                        0,0, \
-                        (X509V3_EXT_I2V)i2v_ASN1_BIT_STRING, \
-                        (X509V3_EXT_V2I)v2i_ASN1_BIT_STRING, \
-                        NULL, NULL, \
-                        table}
-
-# define EXT_IA5STRING(nid) { nid, 0, ASN1_ITEM_ref(ASN1_IA5STRING), \
-                        0,0,0,0, \
-                        (X509V3_EXT_I2S)i2s_ASN1_IA5STRING, \
-                        (X509V3_EXT_S2I)s2i_ASN1_IA5STRING, \
-                        0,0,0,0, \
-                        NULL}
-
-# define EXT_END { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
-/* X509_PURPOSE stuff */
-
-# define EXFLAG_BCONS            0x1
-# define EXFLAG_KUSAGE           0x2
-# define EXFLAG_XKUSAGE          0x4
-# define EXFLAG_NSCERT           0x8
-
-# define EXFLAG_CA               0x10
-/* Really self issued not necessarily self signed */
-# define EXFLAG_SI               0x20
-# define EXFLAG_SS               0x20
-# define EXFLAG_V1               0x40
-# define EXFLAG_INVALID          0x80
-# define EXFLAG_SET              0x100
-# define EXFLAG_CRITICAL         0x200
-# define EXFLAG_PROXY            0x400
-
-# define EXFLAG_INVALID_POLICY   0x800
-# define EXFLAG_FRESHEST         0x1000
-
-# define KU_DIGITAL_SIGNATURE    0x0080
-# define KU_NON_REPUDIATION      0x0040
-# define KU_KEY_ENCIPHERMENT     0x0020
-# define KU_DATA_ENCIPHERMENT    0x0010
-# define KU_KEY_AGREEMENT        0x0008
-# define KU_KEY_CERT_SIGN        0x0004
-# define KU_CRL_SIGN             0x0002
-# define KU_ENCIPHER_ONLY        0x0001
-# define KU_DECIPHER_ONLY        0x8000
-
-# define NS_SSL_CLIENT           0x80
-# define NS_SSL_SERVER           0x40
-# define NS_SMIME                0x20
-# define NS_OBJSIGN              0x10
-# define NS_SSL_CA               0x04
-# define NS_SMIME_CA             0x02
-# define NS_OBJSIGN_CA           0x01
-# define NS_ANY_CA               (NS_SSL_CA|NS_SMIME_CA|NS_OBJSIGN_CA)
-
-# define XKU_SSL_SERVER          0x1
-# define XKU_SSL_CLIENT          0x2
-# define XKU_SMIME               0x4
-# define XKU_CODE_SIGN           0x8
-# define XKU_SGC                 0x10
-# define XKU_OCSP_SIGN           0x20
-# define XKU_TIMESTAMP           0x40
-# define XKU_DVCS                0x80
-
-# define X509_PURPOSE_DYNAMIC    0x1
-# define X509_PURPOSE_DYNAMIC_NAME       0x2
-
-typedef struct x509_purpose_st {
-    int purpose;
-    int trust;                  /* Default trust ID */
-    int flags;
-    int (*check_purpose) (const struct x509_purpose_st *, const X509 *, int);
-    char *name;
-    char *sname;
-    void *usr_data;
-} X509_PURPOSE;
-
-# define X509_PURPOSE_SSL_CLIENT         1
-# define X509_PURPOSE_SSL_SERVER         2
-# define X509_PURPOSE_NS_SSL_SERVER      3
-# define X509_PURPOSE_SMIME_SIGN         4
-# define X509_PURPOSE_SMIME_ENCRYPT      5
-# define X509_PURPOSE_CRL_SIGN           6
-# define X509_PURPOSE_ANY                7
-# define X509_PURPOSE_OCSP_HELPER        8
-# define X509_PURPOSE_TIMESTAMP_SIGN     9
-
-# define X509_PURPOSE_MIN                1
-# define X509_PURPOSE_MAX                9
-
-/* Flags for X509V3_EXT_print() */
-
-# define X509V3_EXT_UNKNOWN_MASK         (0xfL << 16)
-/* Return error for unknown extensions */
-# define X509V3_EXT_DEFAULT              0
-/* Print error for unknown extensions */
-# define X509V3_EXT_ERROR_UNKNOWN        (1L << 16)
-/* ASN1 parse unknown extensions */
-# define X509V3_EXT_PARSE_UNKNOWN        (2L << 16)
-/* BIO_dump unknown extensions */
-# define X509V3_EXT_DUMP_UNKNOWN         (3L << 16)
-
-/* Flags for X509V3_add1_i2d */
-
-# define X509V3_ADD_OP_MASK              0xfL
-# define X509V3_ADD_DEFAULT              0L
-# define X509V3_ADD_APPEND               1L
-# define X509V3_ADD_REPLACE              2L
-# define X509V3_ADD_REPLACE_EXISTING     3L
-# define X509V3_ADD_KEEP_EXISTING        4L
-# define X509V3_ADD_DELETE               5L
-# define X509V3_ADD_SILENT               0x10
-
-DECLARE_STACK_OF(X509_PURPOSE)
-
-DECLARE_ASN1_FUNCTIONS(BASIC_CONSTRAINTS)
-
-DECLARE_ASN1_FUNCTIONS(SXNET)
-DECLARE_ASN1_FUNCTIONS(SXNETID)
-
-int SXNET_add_id_asc(SXNET **psx, char *zone, char *user, int userlen);
-int SXNET_add_id_ulong(SXNET **psx, unsigned long lzone, char *user,
-                       int userlen);
-int SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *izone, char *user,
-                         int userlen);
-
-ASN1_OCTET_STRING *SXNET_get_id_asc(SXNET *sx, char *zone);
-ASN1_OCTET_STRING *SXNET_get_id_ulong(SXNET *sx, unsigned long lzone);
-ASN1_OCTET_STRING *SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone);
-
-DECLARE_ASN1_FUNCTIONS(AUTHORITY_KEYID)
-
-DECLARE_ASN1_FUNCTIONS(PKEY_USAGE_PERIOD)
-
-DECLARE_ASN1_FUNCTIONS(GENERAL_NAME)
-GENERAL_NAME *GENERAL_NAME_dup(GENERAL_NAME *a);
-int GENERAL_NAME_cmp(GENERAL_NAME *a, GENERAL_NAME *b);
-
-ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                     X509V3_CTX *ctx,
-                                     STACK_OF(CONF_VALUE) *nval);
-STACK_OF(CONF_VALUE) *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method,
-                                          ASN1_BIT_STRING *bits,
-                                          STACK_OF(CONF_VALUE) *extlist);
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
-                                       GENERAL_NAME *gen,
-                                       STACK_OF(CONF_VALUE) *ret);
-int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen);
-
-DECLARE_ASN1_FUNCTIONS(GENERAL_NAMES)
-
-STACK_OF(CONF_VALUE) *i2v_GENERAL_NAMES(X509V3_EXT_METHOD *method,
-                                        GENERAL_NAMES *gen,
-                                        STACK_OF(CONF_VALUE) *extlist);
-GENERAL_NAMES *v2i_GENERAL_NAMES(const X509V3_EXT_METHOD *method,
-                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
-
-DECLARE_ASN1_FUNCTIONS(OTHERNAME)
-DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME)
-int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b);
-void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value);
-void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype);
-int GENERAL_NAME_set0_othername(GENERAL_NAME *gen,
-                                ASN1_OBJECT *oid, ASN1_TYPE *value);
-int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen,
-                                ASN1_OBJECT **poid, ASN1_TYPE **pvalue);
-
-char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                            ASN1_OCTET_STRING *ia5);
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method,
-                                         X509V3_CTX *ctx, char *str);
-
-DECLARE_ASN1_FUNCTIONS(EXTENDED_KEY_USAGE)
-int i2a_ACCESS_DESCRIPTION(BIO *bp, ACCESS_DESCRIPTION *a);
-
-DECLARE_ASN1_FUNCTIONS(CERTIFICATEPOLICIES)
-DECLARE_ASN1_FUNCTIONS(POLICYINFO)
-DECLARE_ASN1_FUNCTIONS(POLICYQUALINFO)
-DECLARE_ASN1_FUNCTIONS(USERNOTICE)
-DECLARE_ASN1_FUNCTIONS(NOTICEREF)
-
-DECLARE_ASN1_FUNCTIONS(CRL_DIST_POINTS)
-DECLARE_ASN1_FUNCTIONS(DIST_POINT)
-DECLARE_ASN1_FUNCTIONS(DIST_POINT_NAME)
-DECLARE_ASN1_FUNCTIONS(ISSUING_DIST_POINT)
-
-int DIST_POINT_set_dpname(DIST_POINT_NAME *dpn, X509_NAME *iname);
-
-int NAME_CONSTRAINTS_check(X509 *x, NAME_CONSTRAINTS *nc);
-
-DECLARE_ASN1_FUNCTIONS(ACCESS_DESCRIPTION)
-DECLARE_ASN1_FUNCTIONS(AUTHORITY_INFO_ACCESS)
-
-DECLARE_ASN1_ITEM(POLICY_MAPPING)
-DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
-DECLARE_ASN1_ITEM(POLICY_MAPPINGS)
-
-DECLARE_ASN1_ITEM(GENERAL_SUBTREE)
-DECLARE_ASN1_ALLOC_FUNCTIONS(GENERAL_SUBTREE)
-
-DECLARE_ASN1_ITEM(NAME_CONSTRAINTS)
-DECLARE_ASN1_ALLOC_FUNCTIONS(NAME_CONSTRAINTS)
-
-DECLARE_ASN1_ALLOC_FUNCTIONS(POLICY_CONSTRAINTS)
-DECLARE_ASN1_ITEM(POLICY_CONSTRAINTS)
-
-GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
-                               const X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, int gen_type, char *value,
-                               int is_nc);
-
-# ifdef HEADER_CONF_H
-GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
-                               X509V3_CTX *ctx, CONF_VALUE *cnf);
-GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,
-                                  const X509V3_EXT_METHOD *method,
-                                  X509V3_CTX *ctx, CONF_VALUE *cnf,
-                                  int is_nc);
-void X509V3_conf_free(CONF_VALUE *val);
-
-X509_EXTENSION *X509V3_EXT_nconf_nid(CONF *conf, X509V3_CTX *ctx, int ext_nid,
-                                     char *value);
-X509_EXTENSION *X509V3_EXT_nconf(CONF *conf, X509V3_CTX *ctx, char *name,
-                                 char *value);
-int X509V3_EXT_add_nconf_sk(CONF *conf, X509V3_CTX *ctx, char *section,
-                            STACK_OF(X509_EXTENSION) **sk);
-int X509V3_EXT_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
-                         X509 *cert);
-int X509V3_EXT_REQ_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
-                             X509_REQ *req);
-int X509V3_EXT_CRL_add_nconf(CONF *conf, X509V3_CTX *ctx, char *section,
-                             X509_CRL *crl);
-
-X509_EXTENSION *X509V3_EXT_conf_nid(LHASH_OF(CONF_VALUE) *conf,
-                                    X509V3_CTX *ctx, int ext_nid,
-                                    char *value);
-X509_EXTENSION *X509V3_EXT_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                                char *name, char *value);
-int X509V3_EXT_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                        char *section, X509 *cert);
-int X509V3_EXT_REQ_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                            char *section, X509_REQ *req);
-int X509V3_EXT_CRL_add_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx,
-                            char *section, X509_CRL *crl);
-
-int X509V3_add_value_bool_nf(char *name, int asn1_bool,
-                             STACK_OF(CONF_VALUE) **extlist);
-int X509V3_get_value_bool(CONF_VALUE *value, int *asn1_bool);
-int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint);
-void X509V3_set_nconf(X509V3_CTX *ctx, CONF *conf);
-void X509V3_set_conf_lhash(X509V3_CTX *ctx, LHASH_OF(CONF_VALUE) *lhash);
-# endif
-
-char *X509V3_get_string(X509V3_CTX *ctx, char *name, char *section);
-STACK_OF(CONF_VALUE) *X509V3_get_section(X509V3_CTX *ctx, char *section);
-void X509V3_string_free(X509V3_CTX *ctx, char *str);
-void X509V3_section_free(X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *section);
-void X509V3_set_ctx(X509V3_CTX *ctx, X509 *issuer, X509 *subject,
-                    X509_REQ *req, X509_CRL *crl, int flags);
-
-int X509V3_add_value(const char *name, const char *value,
-                     STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_uchar(const char *name, const unsigned char *value,
-                           STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_bool(const char *name, int asn1_bool,
-                          STACK_OF(CONF_VALUE) **extlist);
-int X509V3_add_value_int(const char *name, ASN1_INTEGER *aint,
-                         STACK_OF(CONF_VALUE) **extlist);
-char *i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint);
-ASN1_INTEGER *s2i_ASN1_INTEGER(X509V3_EXT_METHOD *meth, char *value);
-char *i2s_ASN1_ENUMERATED(X509V3_EXT_METHOD *meth, ASN1_ENUMERATED *aint);
-char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *meth,
-                                ASN1_ENUMERATED *aint);
-int X509V3_EXT_add(X509V3_EXT_METHOD *ext);
-int X509V3_EXT_add_list(X509V3_EXT_METHOD *extlist);
-int X509V3_EXT_add_alias(int nid_to, int nid_from);
-void X509V3_EXT_cleanup(void);
-
-const X509V3_EXT_METHOD *X509V3_EXT_get(X509_EXTENSION *ext);
-const X509V3_EXT_METHOD *X509V3_EXT_get_nid(int nid);
-int X509V3_add_standard_extensions(void);
-STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line);
-void *X509V3_EXT_d2i(X509_EXTENSION *ext);
-void *X509V3_get_d2i(STACK_OF(X509_EXTENSION) *x, int nid, int *crit,
-                     int *idx);
-
-X509_EXTENSION *X509V3_EXT_i2d(int ext_nid, int crit, void *ext_struc);
-int X509V3_add1_i2d(STACK_OF(X509_EXTENSION) **x, int nid, void *value,
-                    int crit, unsigned long flags);
-
-char *hex_to_string(const unsigned char *buffer, long len);
-unsigned char *string_to_hex(const char *str, long *len);
-int name_cmp(const char *name, const char *cmp);
-
-void X509V3_EXT_val_prn(BIO *out, STACK_OF(CONF_VALUE) *val, int indent,
-                        int ml);
-int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, unsigned long flag,
-                     int indent);
-int X509V3_EXT_print_fp(FILE *out, X509_EXTENSION *ext, int flag, int indent);
-
-int X509V3_extensions_print(BIO *out, char *title,
-                            STACK_OF(X509_EXTENSION) *exts,
-                            unsigned long flag, int indent);
-
-int X509_check_ca(X509 *x);
-int X509_check_purpose(X509 *x, int id, int ca);
-int X509_supported_extension(X509_EXTENSION *ex);
-int X509_PURPOSE_set(int *p, int purpose);
-int X509_check_issued(X509 *issuer, X509 *subject);
-int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid);
-int X509_PURPOSE_get_count(void);
-X509_PURPOSE *X509_PURPOSE_get0(int idx);
-int X509_PURPOSE_get_by_sname(char *sname);
-int X509_PURPOSE_get_by_id(int id);
-int X509_PURPOSE_add(int id, int trust, int flags,
-                     int (*ck) (const X509_PURPOSE *, const X509 *, int),
-                     char *name, char *sname, void *arg);
-char *X509_PURPOSE_get0_name(X509_PURPOSE *xp);
-char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp);
-int X509_PURPOSE_get_trust(X509_PURPOSE *xp);
-void X509_PURPOSE_cleanup(void);
-int X509_PURPOSE_get_id(X509_PURPOSE *);
-
-STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x);
-STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x);
-void X509_email_free(STACK_OF(OPENSSL_STRING) *sk);
-STACK_OF(OPENSSL_STRING) *X509_get1_ocsp(X509 *x);
-
-ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
-ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
-int a2i_ipadd(unsigned char *ipout, const char *ipasc);
-int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
-                             unsigned long chtype);
-
-void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent);
-DECLARE_STACK_OF(X509_POLICY_NODE)
-
-# ifndef OPENSSL_NO_RFC3779
-
-typedef struct ASRange_st {
-    ASN1_INTEGER *min, *max;
-} ASRange;
-
-#  define ASIdOrRange_id          0
-#  define ASIdOrRange_range       1
-
-typedef struct ASIdOrRange_st {
-    int type;
-    union {
-        ASN1_INTEGER *id;
-        ASRange *range;
-    } u;
-} ASIdOrRange;
-
-typedef STACK_OF(ASIdOrRange) ASIdOrRanges;
-DECLARE_STACK_OF(ASIdOrRange)
-
-#  define ASIdentifierChoice_inherit              0
-#  define ASIdentifierChoice_asIdsOrRanges        1
-
-typedef struct ASIdentifierChoice_st {
-    int type;
-    union {
-        ASN1_NULL *inherit;
-        ASIdOrRanges *asIdsOrRanges;
-    } u;
-} ASIdentifierChoice;
-
-typedef struct ASIdentifiers_st {
-    ASIdentifierChoice *asnum, *rdi;
-} ASIdentifiers;
-
-DECLARE_ASN1_FUNCTIONS(ASRange)
-DECLARE_ASN1_FUNCTIONS(ASIdOrRange)
-DECLARE_ASN1_FUNCTIONS(ASIdentifierChoice)
-DECLARE_ASN1_FUNCTIONS(ASIdentifiers)
-
-typedef struct IPAddressRange_st {
-    ASN1_BIT_STRING *min, *max;
-} IPAddressRange;
-
-#  define IPAddressOrRange_addressPrefix  0
-#  define IPAddressOrRange_addressRange   1
-
-typedef struct IPAddressOrRange_st {
-    int type;
-    union {
-        ASN1_BIT_STRING *addressPrefix;
-        IPAddressRange *addressRange;
-    } u;
-} IPAddressOrRange;
-
-typedef STACK_OF(IPAddressOrRange) IPAddressOrRanges;
-DECLARE_STACK_OF(IPAddressOrRange)
-
-#  define IPAddressChoice_inherit                 0
-#  define IPAddressChoice_addressesOrRanges       1
-
-typedef struct IPAddressChoice_st {
-    int type;
-    union {
-        ASN1_NULL *inherit;
-        IPAddressOrRanges *addressesOrRanges;
-    } u;
-} IPAddressChoice;
-
-typedef struct IPAddressFamily_st {
-    ASN1_OCTET_STRING *addressFamily;
-    IPAddressChoice *ipAddressChoice;
-} IPAddressFamily;
-
-typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
-DECLARE_STACK_OF(IPAddressFamily)
-
-DECLARE_ASN1_FUNCTIONS(IPAddressRange)
-DECLARE_ASN1_FUNCTIONS(IPAddressOrRange)
-DECLARE_ASN1_FUNCTIONS(IPAddressChoice)
-DECLARE_ASN1_FUNCTIONS(IPAddressFamily)
-
-/*
- * API tag for elements of the ASIdentifer SEQUENCE.
- */
-#  define V3_ASID_ASNUM   0
-#  define V3_ASID_RDI     1
-
-/*
- * AFI values, assigned by IANA.  It'd be nice to make the AFI
- * handling code totally generic, but there are too many little things
- * that would need to be defined for other address families for it to
- * be worth the trouble.
- */
-#  define IANA_AFI_IPV4   1
-#  define IANA_AFI_IPV6   2
-
-/*
- * Utilities to construct and extract values from RFC3779 extensions,
- * since some of the encodings (particularly for IP address prefixes
- * and ranges) are a bit tedious to work with directly.
- */
-int v3_asid_add_inherit(ASIdentifiers *asid, int which);
-int v3_asid_add_id_or_range(ASIdentifiers *asid, int which,
-                            ASN1_INTEGER *min, ASN1_INTEGER *max);
-int v3_addr_add_inherit(IPAddrBlocks *addr,
-                        const unsigned afi, const unsigned *safi);
-int v3_addr_add_prefix(IPAddrBlocks *addr,
-                       const unsigned afi, const unsigned *safi,
-                       unsigned char *a, const int prefixlen);
-int v3_addr_add_range(IPAddrBlocks *addr,
-                      const unsigned afi, const unsigned *safi,
-                      unsigned char *min, unsigned char *max);
-unsigned v3_addr_get_afi(const IPAddressFamily *f);
-int v3_addr_get_range(IPAddressOrRange *aor, const unsigned afi,
-                      unsigned char *min, unsigned char *max,
-                      const int length);
-
-/*
- * Canonical forms.
- */
-int v3_asid_is_canonical(ASIdentifiers *asid);
-int v3_addr_is_canonical(IPAddrBlocks *addr);
-int v3_asid_canonize(ASIdentifiers *asid);
-int v3_addr_canonize(IPAddrBlocks *addr);
-
-/*
- * Tests for inheritance and containment.
- */
-int v3_asid_inherits(ASIdentifiers *asid);
-int v3_addr_inherits(IPAddrBlocks *addr);
-int v3_asid_subset(ASIdentifiers *a, ASIdentifiers *b);
-int v3_addr_subset(IPAddrBlocks *a, IPAddrBlocks *b);
-
-/*
- * Check whether RFC 3779 extensions nest properly in chains.
- */
-int v3_asid_validate_path(X509_STORE_CTX *);
-int v3_addr_validate_path(X509_STORE_CTX *);
-int v3_asid_validate_resource_set(STACK_OF(X509) *chain,
-                                  ASIdentifiers *ext, int allow_inheritance);
-int v3_addr_validate_resource_set(STACK_OF(X509) *chain,
-                                  IPAddrBlocks *ext, int allow_inheritance);
-
-# endif                         /* OPENSSL_NO_RFC3779 */
-
-/* BEGIN ERROR CODES */
-/*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-void ERR_load_X509V3_strings(void);
-
-/* Error codes for the X509V3 functions. */
-
-/* Function codes. */
-# define X509V3_F_A2I_GENERAL_NAME                        164
-# define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE             161
-# define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL         162
-# define X509V3_F_COPY_EMAIL                              122
-# define X509V3_F_COPY_ISSUER                             123
-# define X509V3_F_DO_DIRNAME                              144
-# define X509V3_F_DO_EXT_CONF                             124
-# define X509V3_F_DO_EXT_I2D                              135
-# define X509V3_F_DO_EXT_NCONF                            151
-# define X509V3_F_DO_I2V_NAME_CONSTRAINTS                 148
-# define X509V3_F_GNAMES_FROM_SECTNAME                    156
-# define X509V3_F_HEX_TO_STRING                           111
-# define X509V3_F_I2S_ASN1_ENUMERATED                     121
-# define X509V3_F_I2S_ASN1_IA5STRING                      149
-# define X509V3_F_I2S_ASN1_INTEGER                        120
-# define X509V3_F_I2V_AUTHORITY_INFO_ACCESS               138
-# define X509V3_F_NOTICE_SECTION                          132
-# define X509V3_F_NREF_NOS                                133
-# define X509V3_F_POLICY_SECTION                          131
-# define X509V3_F_PROCESS_PCI_VALUE                       150
-# define X509V3_F_R2I_CERTPOL                             130
-# define X509V3_F_R2I_PCI                                 155
-# define X509V3_F_S2I_ASN1_IA5STRING                      100
-# define X509V3_F_S2I_ASN1_INTEGER                        108
-# define X509V3_F_S2I_ASN1_OCTET_STRING                   112
-# define X509V3_F_S2I_ASN1_SKEY_ID                        114
-# define X509V3_F_S2I_SKEY_ID                             115
-# define X509V3_F_SET_DIST_POINT_NAME                     158
-# define X509V3_F_STRING_TO_HEX                           113
-# define X509V3_F_SXNET_ADD_ID_ASC                        125
-# define X509V3_F_SXNET_ADD_ID_INTEGER                    126
-# define X509V3_F_SXNET_ADD_ID_ULONG                      127
-# define X509V3_F_SXNET_GET_ID_ASC                        128
-# define X509V3_F_SXNET_GET_ID_ULONG                      129
-# define X509V3_F_V2I_ASIDENTIFIERS                       163
-# define X509V3_F_V2I_ASN1_BIT_STRING                     101
-# define X509V3_F_V2I_AUTHORITY_INFO_ACCESS               139
-# define X509V3_F_V2I_AUTHORITY_KEYID                     119
-# define X509V3_F_V2I_BASIC_CONSTRAINTS                   102
-# define X509V3_F_V2I_CRLD                                134
-# define X509V3_F_V2I_EXTENDED_KEY_USAGE                  103
-# define X509V3_F_V2I_GENERAL_NAMES                       118
-# define X509V3_F_V2I_GENERAL_NAME_EX                     117
-# define X509V3_F_V2I_IDP                                 157
-# define X509V3_F_V2I_IPADDRBLOCKS                        159
-# define X509V3_F_V2I_ISSUER_ALT                          153
-# define X509V3_F_V2I_NAME_CONSTRAINTS                    147
-# define X509V3_F_V2I_POLICY_CONSTRAINTS                  146
-# define X509V3_F_V2I_POLICY_MAPPINGS                     145
-# define X509V3_F_V2I_SUBJECT_ALT                         154
-# define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL          160
-# define X509V3_F_V3_GENERIC_EXTENSION                    116
-# define X509V3_F_X509V3_ADD1_I2D                         140
-# define X509V3_F_X509V3_ADD_VALUE                        105
-# define X509V3_F_X509V3_EXT_ADD                          104
-# define X509V3_F_X509V3_EXT_ADD_ALIAS                    106
-# define X509V3_F_X509V3_EXT_CONF                         107
-# define X509V3_F_X509V3_EXT_I2D                          136
-# define X509V3_F_X509V3_EXT_NCONF                        152
-# define X509V3_F_X509V3_GET_SECTION                      142
-# define X509V3_F_X509V3_GET_STRING                       143
-# define X509V3_F_X509V3_GET_VALUE_BOOL                   110
-# define X509V3_F_X509V3_PARSE_LIST                       109
-# define X509V3_F_X509_PURPOSE_ADD                        137
-# define X509V3_F_X509_PURPOSE_SET                        141
-
-/* Reason codes. */
-# define X509V3_R_BAD_IP_ADDRESS                          118
-# define X509V3_R_BAD_OBJECT                              119
-# define X509V3_R_BN_DEC2BN_ERROR                         100
-# define X509V3_R_BN_TO_ASN1_INTEGER_ERROR                101
-# define X509V3_R_DIRNAME_ERROR                           149
-# define X509V3_R_DISTPOINT_ALREADY_SET                   160
-# define X509V3_R_DUPLICATE_ZONE_ID                       133
-# define X509V3_R_ERROR_CONVERTING_ZONE                   131
-# define X509V3_R_ERROR_CREATING_EXTENSION                144
-# define X509V3_R_ERROR_IN_EXTENSION                      128
-# define X509V3_R_EXPECTED_A_SECTION_NAME                 137
-# define X509V3_R_EXTENSION_EXISTS                        145
-# define X509V3_R_EXTENSION_NAME_ERROR                    115
-# define X509V3_R_EXTENSION_NOT_FOUND                     102
-# define X509V3_R_EXTENSION_SETTING_NOT_SUPPORTED         103
-# define X509V3_R_EXTENSION_VALUE_ERROR                   116
-# define X509V3_R_ILLEGAL_EMPTY_EXTENSION                 151
-# define X509V3_R_ILLEGAL_HEX_DIGIT                       113
-# define X509V3_R_INCORRECT_POLICY_SYNTAX_TAG             152
-# define X509V3_R_INVALID_MULTIPLE_RDNS                   161
-# define X509V3_R_INVALID_ASNUMBER                        162
-# define X509V3_R_INVALID_ASRANGE                         163
-# define X509V3_R_INVALID_BOOLEAN_STRING                  104
-# define X509V3_R_INVALID_EXTENSION_STRING                105
-# define X509V3_R_INVALID_INHERITANCE                     165
-# define X509V3_R_INVALID_IPADDRESS                       166
-# define X509V3_R_INVALID_NAME                            106
-# define X509V3_R_INVALID_NULL_ARGUMENT                   107
-# define X509V3_R_INVALID_NULL_NAME                       108
-# define X509V3_R_INVALID_NULL_VALUE                      109
-# define X509V3_R_INVALID_NUMBER                          140
-# define X509V3_R_INVALID_NUMBERS                         141
-# define X509V3_R_INVALID_OBJECT_IDENTIFIER               110
-# define X509V3_R_INVALID_OPTION                          138
-# define X509V3_R_INVALID_POLICY_IDENTIFIER               134
-# define X509V3_R_INVALID_PROXY_POLICY_SETTING            153
-# define X509V3_R_INVALID_PURPOSE                         146
-# define X509V3_R_INVALID_SAFI                            164
-# define X509V3_R_INVALID_SECTION                         135
-# define X509V3_R_INVALID_SYNTAX                          143
-# define X509V3_R_ISSUER_DECODE_ERROR                     126
-# define X509V3_R_MISSING_VALUE                           124
-# define X509V3_R_NEED_ORGANIZATION_AND_NUMBERS           142
-# define X509V3_R_NO_CONFIG_DATABASE                      136
-# define X509V3_R_NO_ISSUER_CERTIFICATE                   121
-# define X509V3_R_NO_ISSUER_DETAILS                       127
-# define X509V3_R_NO_POLICY_IDENTIFIER                    139
-# define X509V3_R_NO_PROXY_CERT_POLICY_LANGUAGE_DEFINED   154
-# define X509V3_R_NO_PUBLIC_KEY                           114
-# define X509V3_R_NO_SUBJECT_DETAILS                      125
-# define X509V3_R_ODD_NUMBER_OF_DIGITS                    112
-# define X509V3_R_OPERATION_NOT_DEFINED                   148
-# define X509V3_R_OTHERNAME_ERROR                         147
-# define X509V3_R_POLICY_LANGUAGE_ALREADY_DEFINED         155
-# define X509V3_R_POLICY_PATH_LENGTH                      156
-# define X509V3_R_POLICY_PATH_LENGTH_ALREADY_DEFINED      157
-# define X509V3_R_POLICY_SYNTAX_NOT_CURRENTLY_SUPPORTED   158
-# define X509V3_R_POLICY_WHEN_PROXY_LANGUAGE_REQUIRES_NO_POLICY 159
-# define X509V3_R_SECTION_NOT_FOUND                       150
-# define X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS            122
-# define X509V3_R_UNABLE_TO_GET_ISSUER_KEYID              123
-# define X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT             111
-# define X509V3_R_UNKNOWN_EXTENSION                       129
-# define X509V3_R_UNKNOWN_EXTENSION_NAME                  130
-# define X509V3_R_UNKNOWN_OPTION                          120
-# define X509V3_R_UNSUPPORTED_OPTION                      117
-# define X509V3_R_UNSUPPORTED_TYPE                        167
-# define X509V3_R_USER_TOO_LONG                           132
-
-#ifdef  __cplusplus
-}
-#endif
-#endif
diff --git a/include.new/opie.h b/include.new/opie.h
deleted file mode 100644
index 9857d64..0000000
--- a/include.new/opie.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/* opie.h: Data structures and values for the OPIE authentication
-	system that a program might need.
-
-%%% portions-copyright-cmetz-96
-Portions of this software are Copyright 1996-1999 by Craig Metz, All Rights
-Reserved. The Inner Net License Version 2 applies to these portions of
-the software.
-You should have received a copy of the license with this software. If
-you didn't get a copy, you may request one from <license@inner.net>.
-
-Portions of this software are Copyright 1995 by Randall Atkinson and Dan
-McDonald, All Rights Reserved. All Rights under this copyright are assigned
-to the U.S. Naval Research Laboratory (NRL). The NRL Copyright Notice and
-License Agreement applies to this software.
-
-	History:
-
-	Modified by cmetz for OPIE 2.4. Added sequence number limits. Added
-		struct opie_otpkey and made many functions use it. Added
-		opiestrncpy(). Include header with libmissing prototypes.
-	Modified by cmetz for OPIE 2.32. Added symbolic flag names for
-		opiepasswd(). Added __opieparsechallenge() prototype.
-	Modified by cmetz for OPIE 2.31. Removed active attack protection.
-	Modified by cmetz for OPIE 2.3. Renamed PTR to VOIDPTR. Added
-		re-init key and extension file fields to struct opie. Added
-		opie_ prefix on struct opie members. Added opie_flags field
-		and definitions. Added more prototypes. Changed opiehash()
-		prototype.
-	Modified by cmetz for OPIE 2.22. Define __P correctly if this file
-		is included in a third-party program.
-	Modified by cmetz for OPIE 2.2. Re-did prototypes. Added FUNCTION
-                definition et al. Multiple-include protection. Added struct
-		utsname fake. Got rid of gethostname() cruft. Moved UINT4
-                here. Provide for *seek whence values. Move MDx context here
-                and unify. Re-did prototypes.
-	Modified at NRL for OPIE 2.0.
-	Written at Bellcore for the S/Key Version 1 software distribution
-		(skey.h).
-
-$FreeBSD: releng/10.2/contrib/opie/opie.h 273277 2014-10-19 12:11:25Z antoine $
-*/
-#ifndef _OPIE_H
-#define _OPIE_H 1
-
-struct opie {
-  int opie_flags;
-  char opie_buf[256];
-  char *opie_principal;
-  int opie_n;
-  char *opie_seed;
-  char *opie_val;
-  long opie_recstart;
-};
-
-#define __OPIE_FLAGS_RW 1
-#define __OPIE_FLAGS_READ 2
-
-/* Minimum length of a secret password */
-#ifndef OPIE_SECRET_MIN
-#define OPIE_SECRET_MIN 10
-#endif	/* OPIE_SECRET_MIN */
-
-/* Maximum length of a secret password */
-#define OPIE_SECRET_MAX 127
-
-/* Minimum length of a seed */
-#define OPIE_SEED_MIN 5
-
-/* Maximum length of a seed */
-#define OPIE_SEED_MAX 16
-
-/* Max length of hash algorithm name (md4/md5) */
-#define OPIE_HASHNAME_MAX 3
-
-/* Maximum length of a challenge (otp-md? 9999 seed) */
-#define OPIE_CHALLENGE_MAX (4+OPIE_HASHNAME_MAX+1+4+1+OPIE_SEED_MAX)
-
-/* Maximum length of a response that we allow */
-#define OPIE_RESPONSE_MAX (9+1+19+1+9+OPIE_SEED_MAX+1+19+1+19+1+19)
-
-/* Maximum length of a principal (read: user name) */
-#define OPIE_PRINCIPAL_MAX 32
-
-/* Maximum sequence number */
-#ifndef OPIE_SEQUENCE_MAX
-#define OPIE_SEQUENCE_MAX 9999
-#endif /* OPIE_SEQUENCE_MAX */
-
-/* Restricted sequence number */
-#ifndef OPIE_SEQUENCE_RESTRICT
-#define OPIE_SEQUENCE_RESTRICT 9
-#endif /* OPIE_SEQUENCE_RESTRICT */
-
-#define UINT4 uint32_t
-
-struct opie_otpkey {
-	UINT4 words[2];
-};
-
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif /* SEEK_SET */
-
-#ifndef SEEK_END
-#define SEEK_END 2
-#endif /* SEEK_END */
-
-__BEGIN_DECLS
-int  opieaccessfile __P((char *));
-int  rdnets __P((long));
-int  isaddr __P((register char *));
-int  opiealways __P((char *));
-char *opieatob8 __P((struct opie_otpkey *, char *));
-void opiebackspace __P((char *));
-char *opiebtoa8 __P((char *, struct opie_otpkey *));
-char *opiebtoe __P((char *, struct opie_otpkey *));
-char *opiebtoh __P((char *, struct opie_otpkey *));
-int  opieetob __P((struct opie_otpkey *, char *));
-int  opiechallenge __P((struct opie *,char *,char *));
-int  opiegenerator __P((char *,char *,char *));
-int  opiegetsequence __P((struct opie *));
-void opiehash __P((struct opie_otpkey *, unsigned));
-int  opiehtoi __P((register char));
-int  opiekeycrunch __P((int, struct opie_otpkey *, char *, char *));
-int  opielock __P((char *));
-int  opieunlock __P((void));
-void opieunlockaeh __P((void));
-void opiedisableaeh __P((void));
-int  opielookup __P((struct opie *,char *));
-int  opiepasscheck __P((char *));
-void opierandomchallenge __P((char *));
-char * opieskipspace __P((register char *));
-void opiestripcrlf __P((char *));
-int  opieverify __P((struct opie *,char *));
-int opiepasswd __P((struct opie *, int, char *, int, char *, char *));
-char *opiereadpass __P((char *, int, int));
-int opielogin __P((char *line, char *name, char *host));
-const char *opie_get_algorithm __P((void));
-int  opie_haskey __P((char *username));
-char *opie_keyinfo __P((char *));
-int  opie_passverify __P((char *username, char *passwd));
-__END_DECLS
-
-#if _OPIE
-#define VOIDPTR void *
-#define VOIDRET void
-#define NOARGS  void
-#define FUNCTION(arglist, args) (args)
-#define AND ,
-#define FUNCTION_NOARGS ()
-
-__BEGIN_DECLS
-struct utmp;
-int __opiegetutmpentry __P((char *, struct utmp *));
-#ifdef EOF
-FILE *__opieopen __P((char *, int, int));
-#endif /* EOF */
-int __opiereadrec __P((struct opie *));
-int __opiewriterec __P((struct opie *));
-int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts));
-__END_DECLS
-
-#define opiestrncpy(dst, src, n) \
-  do { \
-    strncpy(dst, src, n-1); \
-    dst[n-1] = 0; \
-  } while(0)
-
-/* #include "missing.h" */
-#endif /* _OPIE */
-
-#define OPIEPASSWD_CONSOLE 1
-#define OPIEPASSWD_FORCE   2
-
-#endif /* _OPIE_H */
diff --git a/include.new/osreldate.h b/include.new/osreldate.h
deleted file mode 100644
index 60fb658..0000000
--- a/include.new/osreldate.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 1992-2015 The FreeBSD Project.
- * 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.
- *
- * 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.
- *
- */
-
-#ifdef _KERNEL
-#error "<osreldate.h> cannot be used in the kernel, use <sys/param.h>"
-#else
-#undef __FreeBSD_version
-#define __FreeBSD_version 1002000
-#endif
diff --git a/include.new/panel.h b/include.new/panel.h
deleted file mode 100644
index 0752e24..0000000
--- a/include.new/panel.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1995                    *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- ****************************************************************************/
-
-/* $Id: panel.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-/* panel.h -- interface file for panels library */
-
-#ifndef NCURSES_PANEL_H_incl
-#define NCURSES_PANEL_H_incl 1
-
-#include <curses.h>
-
-typedef struct panel
-{
-  WINDOW *win;
-  struct panel *below;
-  struct panel *above;
-  NCURSES_CONST void *user;
-} PANEL;
-
-#if	defined(__cplusplus)
-extern "C" {
-#endif
-
-extern NCURSES_EXPORT(WINDOW*) panel_window (const PANEL *);
-extern NCURSES_EXPORT(void)    update_panels (void);
-extern NCURSES_EXPORT(int)     hide_panel (PANEL *);
-extern NCURSES_EXPORT(int)     show_panel (PANEL *);
-extern NCURSES_EXPORT(int)     del_panel (PANEL *);
-extern NCURSES_EXPORT(int)     top_panel (PANEL *);
-extern NCURSES_EXPORT(int)     bottom_panel (PANEL *);
-extern NCURSES_EXPORT(PANEL*)  new_panel (WINDOW *);
-extern NCURSES_EXPORT(PANEL*)  panel_above (const PANEL *);
-extern NCURSES_EXPORT(PANEL*)  panel_below (const PANEL *);
-extern NCURSES_EXPORT(int)     set_panel_userptr (PANEL *, NCURSES_CONST void *);
-extern NCURSES_EXPORT(NCURSES_CONST void*) panel_userptr (const PANEL *);
-extern NCURSES_EXPORT(int)     move_panel (PANEL *, int, int);
-extern NCURSES_EXPORT(int)     replace_panel (PANEL *,WINDOW *);
-extern NCURSES_EXPORT(int)     panel_hidden (const PANEL *);
-
-#if	defined(__cplusplus)
-}
-#endif
-
-#endif /* NCURSES_PANEL_H_incl */
-
-/* end of panel.h */
diff --git a/include.new/parse_bytes.h b/include.new/parse_bytes.h
deleted file mode 100644
index 8a88eca..0000000
--- a/include.new/parse_bytes.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1999 - 2001 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef __PARSE_BYTES_H__
-#define __PARSE_BYTES_H__
-
-#ifndef ROKEN_LIB_FUNCTION
-#ifdef _WIN32
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL     __cdecl
-#else
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#endif
-#endif
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-parse_bytes (const char *s, const char *def_unit);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-unparse_bytes (int t, char *s, size_t len);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-unparse_bytes_short (int t, char *s, size_t len);
-
-#endif /* __PARSE_BYTES_H__ */
diff --git a/include.new/parse_time.h b/include.new/parse_time.h
deleted file mode 100644
index dabcefd..0000000
--- a/include.new/parse_time.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1997 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef __PARSE_TIME_H__
-#define __PARSE_TIME_H__
-
-#ifndef ROKEN_LIB_FUNCTION
-#ifdef _WIN32
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL     __cdecl
-#else
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#endif
-#endif
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-parse_time (const char *s, const char *def_unit);
-
-ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL
-unparse_time (int t, char *s, size_t len);
-
-ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL
-unparse_time_approx (int t, char *s, size_t len);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-print_time_table (FILE *f);
-
-#endif /* __PARSE_TIME_H__ */
diff --git a/include.new/parse_units.h b/include.new/parse_units.h
deleted file mode 100644
index 2d1c286..0000000
--- a/include.new/parse_units.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1997 - 2001 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef __PARSE_UNITS_H__
-#define __PARSE_UNITS_H__
-
-#include <stdio.h>
-#include <stddef.h>
-
-#ifndef ROKEN_LIB_FUNCTION
-#ifdef _WIN32
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL     __cdecl
-#else
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#endif
-#endif
-
-struct units {
-    const char *name;
-    unsigned mult;
-};
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-parse_units (const char *s, const struct units *units,
-	     const char *def_unit);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-print_units_table (const struct units *units, FILE *f);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-parse_flags (const char *s, const struct units *units,
-	     int orig);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-unparse_units (int num, const struct units *units, char *s, size_t len);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-unparse_units_approx (int num, const struct units *units, char *s,
-		      size_t len);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-unparse_flags (int num, const struct units *units, char *s, size_t len);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-print_flags_table (const struct units *units, FILE *f);
-
-#endif /* __PARSE_UNITS_H__ */
diff --git a/include.new/paths.h b/include.new/paths.h
deleted file mode 100644
index a57a1e4..0000000
--- a/include.new/paths.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 1989, 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. 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.
- *
- *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/paths.h 255629 2013-09-17 11:48:47Z sbruno $
- */
-
-#ifndef _PATHS_H_
-#define	_PATHS_H_
-
-#include <sys/cdefs.h>
-
-/* Default search path. */
-#define	_PATH_DEFPATH	"/usr/bin:/bin"
-/* All standard utilities path. */
-#define	_PATH_STDPATH	"/usr/bin:/bin:/usr/sbin:/sbin"
-/* Locate system binaries. */
-#define	_PATH_SYSPATH	"/sbin:/usr/sbin"
-
-#define	_PATH_BSHELL	"/bin/sh"
-#define	_PATH_CAPABILITY	"/etc/capability"
-#define	_PATH_CAPABILITY_DB	"/etc/capability.db"
-#define	_PATH_CONSOLE	"/dev/console"
-#define	_PATH_CP	"/bin/cp"
-#define	_PATH_CSHELL	"/bin/csh"
-#define	_PATH_CSMAPPER	"/usr/share/i18n/csmapper"
-#define	_PATH_DEFTAPE	"/dev/sa0"
-#define	_PATH_DEVGPIOC	"/dev/gpioc"
-#define	_PATH_DEVNULL	"/dev/null"
-#define	_PATH_DEVZERO	"/dev/zero"
-#define	_PATH_DRUM	"/dev/drum"
-#define	_PATH_ESDB	"/usr/share/i18n/esdb"
-#define	_PATH_ETC	"/etc"
-#define	_PATH_FTPUSERS	"/etc/ftpusers"
-#define	_PATH_FWMEM	"/dev/fwmem"
-#define	_PATH_GBDE	"/sbin/gbde"
-#define	_PATH_GELI	"/sbin/geli"
-#define	_PATH_HALT	"/sbin/halt"
-#ifdef COMPAT_32BIT
-#define	_PATH_I18NMODULE	"/usr/lib32/i18n"
-#else
-#define	_PATH_I18NMODULE	"/usr/lib/i18n"
-#endif
-#define	_PATH_IFCONFIG	"/sbin/ifconfig"
-#define	_PATH_KMEM	"/dev/kmem"
-#define	_PATH_LIBMAP_CONF	"/etc/libmap.conf"
-#define	_PATH_LOCALE	"/usr/share/locale"
-#define	_PATH_LOGIN	"/usr/bin/login"
-#define	_PATH_MAILDIR	"/var/mail"
-#define	_PATH_MAN	"/usr/share/man"
-#define	_PATH_MDCONFIG	"/sbin/mdconfig"
-#define	_PATH_MEM	"/dev/mem"
-#define	_PATH_MKSNAP_FFS	"/sbin/mksnap_ffs"
-#define	_PATH_MOUNT	"/sbin/mount"
-#define	_PATH_NEWFS	"/sbin/newfs"
-#define	_PATH_NOLOGIN	"/var/run/nologin"
-#define	_PATH_RCP	"/bin/rcp"
-#define	_PATH_REBOOT	"/sbin/reboot"
-#define	_PATH_RLOGIN	"/usr/bin/rlogin"
-#define	_PATH_RM	"/bin/rm"
-#define	_PATH_RSH	"/usr/bin/rsh"
-#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
-#define	_PATH_SHELLS	"/etc/shells"
-#define	_PATH_TTY	"/dev/tty"
-#define	_PATH_UNIX	"don't use _PATH_UNIX"
-#define	_PATH_UFSSUSPEND	"/dev/ufssuspend"
-#define	_PATH_VI	"/usr/bin/vi"
-#define	_PATH_WALL	"/usr/bin/wall"
-
-/* Provide trailing slash, since mostly used for building pathnames. */
-#define	_PATH_DEV	"/dev/"
-#define	_PATH_TMP	"/tmp/"
-#define	_PATH_VARDB	"/var/db/"
-#define	_PATH_VARRUN	"/var/run/"
-#define	_PATH_VARTMP	"/var/tmp/"
-#define	_PATH_YP	"/var/yp/"
-#define	_PATH_UUCPLOCK	"/var/spool/lock/"
-
-/* How to get the correct name of the kernel. */
-__BEGIN_DECLS
-const char *getbootfile(void);
-__END_DECLS
-
-#ifdef RESCUE
-#undef	_PATH_DEFPATH
-#define	_PATH_DEFPATH	"/rescue:/usr/bin:/bin"
-#undef	_PATH_STDPATH
-#define	_PATH_STDPATH	"/rescue:/usr/bin:/bin:/usr/sbin:/sbin"
-#undef	_PATH_SYSPATH
-#define	_PATH_SYSPATH	"/rescue:/sbin:/usr/sbin"
-#undef	_PATH_BSHELL
-#define	_PATH_BSHELL	"/rescue/sh"
-#undef	_PATH_CP
-#define	_PATH_CP	"/rescue/cp"
-#undef	_PATH_CSHELL
-#define	_PATH_CSHELL	"/rescue/csh"
-#undef	_PATH_HALT
-#define	_PATH_HALT	"/rescue/halt"
-#undef	_PATH_IFCONFIG
-#define	_PATH_IFCONFIG	"/rescue/ifconfig"
-#undef	_PATH_MDCONFIG
-#define	_PATH_MDCONFIG	"/rescue/mdconfig"
-#undef	_PATH_MOUNT
-#define	_PATH_MOUNT	"/rescue/mount"
-#undef	_PATH_NEWFS
-#define	_PATH_NEWFS	"/rescue/newfs"
-#undef	_PATH_RCP
-#define	_PATH_RCP	"/rescue/rcp"
-#undef	_PATH_REBOOT
-#define	_PATH_REBOOT	"/rescue/reboot"
-#undef	_PATH_RM
-#define	_PATH_RM	"/rescue/rm"
-#undef	_PATH_VI
-#define	_PATH_VI	"/rescue/vi"
-#undef	_PATH_WALL
-#define	_PATH_WALL	"/rescue/wall"
-#endif /* RESCUE */
-
-#endif /* !_PATHS_H_ */
diff --git a/include.new/pcap-bpf.h b/include.new/pcap-bpf.h
deleted file mode 100644
index 7b7e90a..0000000
--- a/include.new/pcap-bpf.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence 
- * Berkeley Laboratory.
- *
- * 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.
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.50 2007-04-01 21:43:55 guy Exp $ (LBL)
- */
-
-/*
- * For backwards compatibility.
- *
- * Note to OS vendors: do NOT get rid of this file!  Some applications
- * might expect to be able to include <pcap-bpf.h>.
- */
-#include <pcap/bpf.h>
diff --git a/include.new/pcap-int.h b/include.new/pcap-int.h
deleted file mode 100644
index b3ce82d..0000000
--- a/include.new/pcap-int.h
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * Copyright (c) 1994, 1995, 1996
- *	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 Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory 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.
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.94 2008-09-16 00:20:23 guy Exp $ (LBL)
- */
-
-#ifndef pcap_int_h
-#define	pcap_int_h
-
-#include <pcap/pcap.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef HAVE_LIBDLPI
-#include <libdlpi.h>
-#endif
-
-#ifdef WIN32
-#include <Packet32.h>
-extern CRITICAL_SECTION g_PcapCompileCriticalSection;
-#endif /* WIN32 */
-
-#ifdef MSDOS
-#include <fcntl.h>
-#include <io.h>
-#endif
-
-#ifdef HAVE_SNF_API
-#include <snf.h>
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER <= 1200)) /* we are compiling with Visual Studio 6, that doesn't support the LL suffix*/
-
-/*
- * Swap byte ordering of unsigned long long timestamp on a big endian
- * machine.
- */
-#define SWAPLL(ull)  ((ull & 0xff00000000000000) >> 56) | \
-                      ((ull & 0x00ff000000000000) >> 40) | \
-                      ((ull & 0x0000ff0000000000) >> 24) | \
-                      ((ull & 0x000000ff00000000) >> 8)  | \
-                      ((ull & 0x00000000ff000000) << 8)  | \
-                      ((ull & 0x0000000000ff0000) << 24) | \
-                      ((ull & 0x000000000000ff00) << 40) | \
-                      ((ull & 0x00000000000000ff) << 56)
-
-#else /* A recent Visual studio compiler or not VC */
-
-/*
- * Swap byte ordering of unsigned long long timestamp on a big endian
- * machine.
- */
-#define SWAPLL(ull)  ((ull & 0xff00000000000000LL) >> 56) | \
-                      ((ull & 0x00ff000000000000LL) >> 40) | \
-                      ((ull & 0x0000ff0000000000LL) >> 24) | \
-                      ((ull & 0x000000ff00000000LL) >> 8)  | \
-                      ((ull & 0x00000000ff000000LL) << 8)  | \
-                      ((ull & 0x0000000000ff0000LL) << 24) | \
-                      ((ull & 0x000000000000ff00LL) << 40) | \
-                      ((ull & 0x00000000000000ffLL) << 56)
-
-#endif /* _MSC_VER */
-
-/*
- * Savefile
- */
-typedef enum {
-	NOT_SWAPPED,
-	SWAPPED,
-	MAYBE_SWAPPED
-} swapped_type_t;
-
-/*
- * Used when reading a savefile.
- */
-struct pcap_sf {
-	FILE *rfile;
-	int (*next_packet_op)(pcap_t *, struct pcap_pkthdr *, u_char **);
-	int swapped;
-	size_t hdrsize;
-	swapped_type_t lengths_swapped;
-	int version_major;
-	int version_minor;
-	bpf_u_int32 ifcount;	/* number of interfaces seen in this capture */
-	u_int tsresol;		/* time stamp resolution */
-	u_int tsscale;		/* scaling factor for resolution -> microseconds */
-	u_int64_t tsoffset;	/* time stamp offset */
-};
-
-/*
- * Used when doing a live capture.
- */
-struct pcap_md {
-	struct pcap_stat stat;
-	/*XXX*/
-	int use_bpf;		/* using kernel filter */
-	u_long	TotPkts;	/* can't oflow for 79 hrs on ether */
-	u_long	TotAccepted;	/* count accepted by filter */
-	u_long	TotDrops;	/* count of dropped packets */
-	long	TotMissed;	/* missed by i/f during this run */
-	long	OrigMissed;	/* missed by i/f before this run */
-	char	*device;	/* device name */
-	int	timeout;	/* timeout for buffering */
-	int	must_do_on_close; /* stuff we must do when we close */
-	struct pcap *next;	/* list of open pcaps that need stuff cleared on close */
-#ifdef linux
-	int	sock_packet;	/* using Linux 2.0 compatible interface */
-	int	cooked;		/* using SOCK_DGRAM rather than SOCK_RAW */
-	int	ifindex;	/* interface index of device we're bound to */
-	int	lo_ifindex;	/* interface index of the loopback device */
-	u_int	packets_read;	/* count of packets read with recvfrom() */
-	bpf_u_int32 oldmode;	/* mode to restore when turning monitor mode off */
-	char	*mondevice;	/* mac80211 monitor device we created */
-	u_char	*mmapbuf;	/* memory-mapped region pointer */
-	size_t	mmapbuflen;	/* size of region */
-	int	vlan_offset;	/* offset at which to insert vlan tags; if -1, don't insert */
-	u_int	tp_version;	/* version of tpacket_hdr for mmaped ring */
-	u_int	tp_hdrlen;	/* hdrlen of tpacket_hdr for mmaped ring */
-	u_char	*oneshot_buffer; /* buffer for copy of packet */
-	long	proc_dropped; /* packets reported dropped by /proc/net/dev */
-#endif /* linux */
-
-#ifdef HAVE_DAG_API
-#ifdef HAVE_DAG_STREAMS_API
-	u_char	*dag_mem_bottom;	/* DAG card current memory bottom pointer */
-	u_char	*dag_mem_top;	/* DAG card current memory top pointer */
-#else /* HAVE_DAG_STREAMS_API */
-	void	*dag_mem_base;	/* DAG card memory base address */
-	u_int	dag_mem_bottom;	/* DAG card current memory bottom offset */
-	u_int	dag_mem_top;	/* DAG card current memory top offset */
-#endif /* HAVE_DAG_STREAMS_API */
-	int	dag_fcs_bits;	/* Number of checksum bits from link layer */
-	int	dag_offset_flags; /* Flags to pass to dag_offset(). */
-	int	dag_stream;	/* DAG stream number */
-	int	dag_timeout;	/* timeout specified to pcap_open_live.
-				 * Same as in linux above, introduce
-				 * generally? */
-#endif /* HAVE_DAG_API */
-#ifdef HAVE_SNF_API
-	snf_handle_t snf_handle; /* opaque device handle */
-	snf_ring_t   snf_ring;   /* opaque device ring handle */
-        int          snf_timeout;
-        int          snf_boardnum;
-#endif /*HAVE_SNF_API*/
-
-#ifdef HAVE_ZEROCOPY_BPF
-       /*
-        * Zero-copy read buffer -- for zero-copy BPF.  'buffer' above will
-        * alternative between these two actual mmap'd buffers as required.
-        * As there is a header on the front size of the mmap'd buffer, only
-        * some of the buffer is exposed to libpcap as a whole via bufsize;
-        * zbufsize is the true size.  zbuffer tracks the current zbuf
-        * assocated with buffer so that it can be used to decide which the
-        * next buffer to read will be.
-        */
-       u_char *zbuf1, *zbuf2, *zbuffer;
-       u_int zbufsize;
-       u_int zerocopy;
-       u_int interrupted;
-       struct timespec firstsel;
-       /*
-        * If there's currently a buffer being actively processed, then it is
-        * referenced here; 'buffer' is also pointed at it, but offset by the
-        * size of the header.
-        */
-       struct bpf_zbuf_header *bzh;
-#endif /* HAVE_ZEROCOPY_BPF */
-};
-
-/*
- * Stuff to do when we close.
- */
-#define MUST_CLEAR_PROMISC	0x00000001	/* clear promiscuous mode */
-#define MUST_CLEAR_RFMON	0x00000002	/* clear rfmon (monitor) mode */
-#define MUST_DELETE_MONIF	0x00000004	/* delete monitor-mode interface */
-
-struct pcap_opt {
-	int	buffer_size;
-	char	*source;
-	int	promisc;
-	int	rfmon;
-	int	tstamp_type;
-};
-
-/*
- * Ultrix, DEC OSF/1^H^H^H^H^H^H^H^H^HDigital UNIX^H^H^H^H^H^H^H^H^H^H^H^H
- * Tru64 UNIX, and some versions of NetBSD pad FDDI packets to make everything
- * line up on a nice boundary.
- */
-#ifdef __NetBSD__
-#include <sys/param.h>	/* needed to declare __NetBSD_Version__ */
-#endif
-
-#if defined(ultrix) || defined(__osf__) || (defined(__NetBSD__) && __NetBSD_Version__ > 106000000)
-#define       PCAP_FDDIPAD 3
-#endif
-
-typedef int	(*activate_op_t)(pcap_t *);
-typedef int	(*can_set_rfmon_op_t)(pcap_t *);
-typedef int	(*read_op_t)(pcap_t *, int cnt, pcap_handler, u_char *);
-typedef int	(*inject_op_t)(pcap_t *, const void *, size_t);
-typedef int	(*setfilter_op_t)(pcap_t *, struct bpf_program *);
-typedef int	(*setdirection_op_t)(pcap_t *, pcap_direction_t);
-typedef int	(*set_datalink_op_t)(pcap_t *, int);
-typedef int	(*getnonblock_op_t)(pcap_t *, char *);
-typedef int	(*setnonblock_op_t)(pcap_t *, int, char *);
-typedef int	(*stats_op_t)(pcap_t *, struct pcap_stat *);
-#ifdef WIN32
-typedef int	(*setbuff_op_t)(pcap_t *, int);
-typedef int	(*setmode_op_t)(pcap_t *, int);
-typedef int	(*setmintocopy_op_t)(pcap_t *, int);
-#endif
-typedef void	(*cleanup_op_t)(pcap_t *);
-
-struct pcap {
-#ifdef WIN32
-	ADAPTER *adapter;
-	LPPACKET Packet;
-	int nonblock;
-#else
-	int fd;
-	int selectable_fd;
-	int send_fd;
-#endif /* WIN32 */
-
-#ifdef HAVE_LIBDLPI
-	dlpi_handle_t dlpi_hd;
-#endif
-	int snapshot;
-	int linktype;		/* Network linktype */
-	int linktype_ext;       /* Extended information stored in the linktype field of a file */
-	int tzoff;		/* timezone offset */
-	int offset;		/* offset for proper alignment */
-	int activated;		/* true if the capture is really started */
-	int oldstyle;		/* if we're opening with pcap_open_live() */
-
-	int break_loop;		/* flag set to force break from packet-reading loop */
-
-#ifdef PCAP_FDDIPAD
-	int fddipad;
-#endif
-
-#ifdef MSDOS
-        void (*wait_proc)(void); /*          call proc while waiting */
-#endif
-
-	struct pcap_sf sf;
-	struct pcap_md md;
-	struct pcap_opt opt;
-
-	/*
-	 * Read buffer.
-	 */
-	int bufsize;
-	u_char *buffer;
-	u_char *bp;
-	int cc;
-
-	/*
-	 * Place holder for pcap_next().
-	 */
-	u_char *pkt;
-
-	/* We're accepting only packets in this direction/these directions. */
-	pcap_direction_t direction;
-
-	/*
-	 * Methods.
-	 */
-	activate_op_t activate_op;
-	can_set_rfmon_op_t can_set_rfmon_op;
-	read_op_t read_op;
-	inject_op_t inject_op;
-	setfilter_op_t setfilter_op;
-	setdirection_op_t setdirection_op;
-	set_datalink_op_t set_datalink_op;
-	getnonblock_op_t getnonblock_op;
-	setnonblock_op_t setnonblock_op;
-	stats_op_t stats_op;
-
-	/*
-	 * Routine to use as callback for pcap_next()/pcap_next_ex().
-	 */
-	pcap_handler oneshot_callback;
-
-#ifdef WIN32
-	/*
-	 * These are, at least currently, specific to the Win32 NPF
-	 * driver.
-	 */
-	setbuff_op_t setbuff_op;
-	setmode_op_t setmode_op;
-	setmintocopy_op_t setmintocopy_op;
-#endif
-	cleanup_op_t cleanup_op;
-
-	/*
-	 * Placeholder for filter code if bpf not in kernel.
-	 */
-	struct bpf_program fcode;
-
-	char errbuf[PCAP_ERRBUF_SIZE + 1];
-	int dlt_count;
-	u_int *dlt_list;
-	int tstamp_type_count;
-	u_int *tstamp_type_list;
-
-	struct pcap_pkthdr pcap_header;	/* This is needed for the pcap_next_ex() to work */
-};
-
-/*
- * This is a timeval as stored in a savefile.
- * It has to use the same types everywhere, independent of the actual
- * `struct timeval'; `struct timeval' has 32-bit tv_sec values on some
- * platforms and 64-bit tv_sec values on other platforms, and writing
- * out native `struct timeval' values would mean files could only be
- * read on systems with the same tv_sec size as the system on which
- * the file was written.
- */
-
-struct pcap_timeval {
-    bpf_int32 tv_sec;		/* seconds */
-    bpf_int32 tv_usec;		/* microseconds */
-};
-
-/*
- * This is a `pcap_pkthdr' as actually stored in a savefile.
- *
- * Do not change the format of this structure, in any way (this includes
- * changes that only affect the length of fields in this structure),
- * and do not make the time stamp anything other than seconds and
- * microseconds (e.g., seconds and nanoseconds).  Instead:
- *
- *	introduce a new structure for the new format;
- *
- *	send mail to "tcpdump-workers@lists.tcpdump.org", requesting
- *	a new magic number for your new capture file format, and, when
- *	you get the new magic number, put it in "savefile.c";
- *
- *	use that magic number for save files with the changed record
- *	header;
- *
- *	make the code in "savefile.c" capable of reading files with
- *	the old record header as well as files with the new record header
- *	(using the magic number to determine the header format).
- *
- * Then supply the changes by forking the branch at
- *
- *	https://github.com/mcr/libpcap/issues
- *
- * and issuing a pull request, so that future versions of libpcap and
- * programs that use it (such as tcpdump) will be able to read your new
- * capture file format.
- */
-
-struct pcap_sf_pkthdr {
-    struct pcap_timeval ts;	/* time stamp */
-    bpf_u_int32 caplen;		/* length of portion present */
-    bpf_u_int32 len;		/* length this packet (off wire) */
-};
-
-/*
- * How a `pcap_pkthdr' is actually stored in savefiles written
- * by some patched versions of libpcap (e.g. the ones in Red
- * Hat Linux 6.1 and 6.2).
- *
- * Do not change the format of this structure, in any way (this includes
- * changes that only affect the length of fields in this structure).
- * Instead, introduce a new structure, as per the above.
- */
-
-struct pcap_sf_patched_pkthdr {
-    struct pcap_timeval ts;	/* time stamp */
-    bpf_u_int32 caplen;		/* length of portion present */
-    bpf_u_int32 len;		/* length this packet (off wire) */
-    int		index;
-    unsigned short protocol;
-    unsigned char pkt_type;
-};
-
-/*
- * User data structure for the one-shot callback used for pcap_next()
- * and pcap_next_ex().
- */
-struct oneshot_userdata {
-	struct pcap_pkthdr *hdr;
-	const u_char **pkt;
-	pcap_t *pd;
-};
-
-int	yylex(void);
-
-#ifndef min
-#define min(a, b) ((a) > (b) ? (b) : (a))
-#endif
-
-/* XXX should these be in pcap.h? */
-int	pcap_offline_read(pcap_t *, int, pcap_handler, u_char *);
-int	pcap_read(pcap_t *, int cnt, pcap_handler, u_char *);
-
-#ifndef HAVE_STRLCPY
-#define strlcpy(x, y, z) \
-	(strncpy((x), (y), (z)), \
-	 ((z) <= 0 ? 0 : ((x)[(z) - 1] = '\0')), \
-	 strlen((y)))
-#endif
-
-#include <stdarg.h>
-
-#if !defined(HAVE_SNPRINTF)
-#define snprintf pcap_snprintf
-extern int snprintf (char *, size_t, const char *, ...);
-#endif
-
-#if !defined(HAVE_VSNPRINTF)
-#define vsnprintf pcap_vsnprintf
-extern int vsnprintf (char *, size_t, const char *, va_list ap);
-#endif
-
-/*
- * Routines that most pcap implementations can use for non-blocking mode.
- */
-#if !defined(WIN32) && !defined(MSDOS)
-int	pcap_getnonblock_fd(pcap_t *, char *);
-int	pcap_setnonblock_fd(pcap_t *p, int, char *);
-#endif
-
-/*
- * Internal interfaces for "pcap_create()".
- *
- * "pcap_create_interface()" is the routine to do a pcap_create on
- * a regular network interface.  There are multiple implementations
- * of this, one for each platform type (Linux, BPF, DLPI, etc.),
- * with the one used chosen by the configure script.
- *
- * "pcap_create_common()" allocates and fills in a pcap_t, for use
- * by pcap_create routines.
- */
-pcap_t	*pcap_create_interface(const char *, char *);
-pcap_t	*pcap_create_common(const char *, char *);
-int	pcap_do_addexit(pcap_t *);
-void	pcap_add_to_pcaps_to_close(pcap_t *);
-void	pcap_remove_from_pcaps_to_close(pcap_t *);
-void	pcap_cleanup_live_common(pcap_t *);
-int	pcap_not_initialized(pcap_t *);
-int	pcap_check_activated(pcap_t *);
-
-/*
- * Internal interfaces for "pcap_findalldevs()".
- *
- * "pcap_findalldevs_interfaces()" finds interfaces using the
- * "standard" mechanisms (SIOCGIFCONF, "getifaddrs()", etc.).
- *
- * "pcap_platform_finddevs()" is a platform-dependent routine to
- * add devices not found by the "standard" mechanisms.
- *
- * "pcap_add_if()" adds an interface to the list of interfaces, for
- * use by various "find interfaces" routines.
- */
-int	pcap_findalldevs_interfaces(pcap_if_t **, char *);
-int	pcap_platform_finddevs(pcap_if_t **, char *);
-int	add_addr_to_iflist(pcap_if_t **, const char *, u_int, struct sockaddr *,
-	    size_t, struct sockaddr *, size_t, struct sockaddr *, size_t,
-	    struct sockaddr *, size_t, char *);
-int	pcap_add_if(pcap_if_t **, const char *, u_int, const char *, char *);
-struct sockaddr *dup_sockaddr(struct sockaddr *, size_t);
-int	add_or_find_if(pcap_if_t **, pcap_if_t **, const char *, u_int,
-	    const char *, char *);
-
-#ifdef WIN32
-char	*pcap_win32strerror(void);
-#endif
-
-int	install_bpf_program(pcap_t *, struct bpf_program *);
-
-int	pcap_strcasecmp(const char *, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/pcap-namedb.h b/include.new/pcap-namedb.h
deleted file mode 100644
index d0b2231..0000000
--- a/include.new/pcap-namedb.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1994, 1996
- *	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 Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory 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.
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.13 2006-10-04 18:13:32 guy Exp $ (LBL)
- */
-
-/*
- * For backwards compatibility.
- *
- * Note to OS vendors: do NOT get rid of this file!  Some applications
- * might expect to be able to include <pcap-namedb.h>.
- */
-#include <pcap/namedb.h>
diff --git a/include.new/pcap.h b/include.new/pcap.h
deleted file mode 100644
index 490a4bf..0000000
--- a/include.new/pcap.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- *	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 Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory 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.
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.59 2006-10-04 18:09:22 guy Exp $ (LBL)
- */
-
-/*
- * For backwards compatibility.
- *
- * Note to OS vendors: do NOT get rid of this file!  Many applications
- * expect to be able to include <pcap.h>, and at least some of them
- * go through contortions in their configure scripts to try to detect
- * OSes that have "helpfully" moved pcap.h to <pcap/pcap.h> without
- * leaving behind a <pcap.h> file.
- */
-#include <pcap/pcap.h>
diff --git a/include.new/pcap/bpf.h b/include.new/pcap/bpf.h
deleted file mode 100644
index ffe09d1..0000000
--- a/include.new/pcap/bpf.h
+++ /dev/null
@@ -1,1303 +0,0 @@
-/*-
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from the Stanford/CMU enet packet filter,
- * (net/enet.c) distributed as part of 4.3BSD, and code contributed
- * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence 
- * Berkeley Laboratory.
- *
- * 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.
- *
- *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.32 2008-12-23 20:13:29 guy Exp $ (LBL)
- */
-
-/*
- * This is libpcap's cut-down version of bpf.h; it includes only
- * the stuff needed for the code generator and the userland BPF
- * interpreter, and the libpcap APIs for setting filters, etc..
- *
- * "pcap-bpf.c" will include the native OS version, as it deals with
- * the OS's BPF implementation.
- *
- * At least two programs found by Google Code Search explicitly includes
- * <pcap/bpf.h> (even though <pcap.h>/<pcap/pcap.h> includes it for you),
- * so moving that stuff to <pcap/pcap.h> would break the build for some
- * programs.
- */
-
-/*
- * If we've already included <net/bpf.h>, don't re-define this stuff.
- * We assume BSD-style multiple-include protection in <net/bpf.h>,
- * which is true of all but the oldest versions of FreeBSD and NetBSD,
- * or Tru64 UNIX-style multiple-include protection (or, at least,
- * Tru64 UNIX 5.x-style; I don't have earlier versions available to check),
- * or AIX-style multiple-include protection (or, at least, AIX 5.x-style;
- * I don't have earlier versions available to check).
- *
- * We do not check for BPF_MAJOR_VERSION, as that's defined by
- * <linux/filter.h>, which is directly or indirectly included in some
- * programs that also include pcap.h, and <linux/filter.h> doesn't
- * define stuff we need.
- *
- * This also provides our own multiple-include protection.
- */
-#if !defined(_NET_BPF_H_) && !defined(_BPF_H_) && !defined(_H_BPF) && !defined(lib_pcap_bpf_h)
-#define lib_pcap_bpf_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* BSD style release date */
-#define BPF_RELEASE 199606
-
-#ifdef MSDOS /* must be 32-bit */
-typedef long          bpf_int32;
-typedef unsigned long bpf_u_int32;
-#else
-typedef	int bpf_int32;
-typedef	u_int bpf_u_int32;
-#endif
-
-/*
- * Alignment macros.  BPF_WORDALIGN rounds up to the next 
- * even multiple of BPF_ALIGNMENT.
- *
- * Tcpdump's print-pflog.c uses this, so we define it here.
- */
-#ifndef __NetBSD__
-#define BPF_ALIGNMENT sizeof(bpf_int32)
-#else
-#define BPF_ALIGNMENT sizeof(long)
-#endif
-#define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1))
-
-/*
- * Structure for "pcap_compile()", "pcap_setfilter()", etc..
- */
-struct bpf_program {
-	u_int bf_len;
-	struct bpf_insn *bf_insns;
-};
- 
-/*
- * Link-layer header type codes.
- *
- * Do *NOT* add new values to this list without asking
- * "tcpdump-workers@lists.tcpdump.org" for a value.  Otherwise, you run
- * the risk of using a value that's already being used for some other
- * purpose, and of having tools that read libpcap-format captures not
- * being able to handle captures with your new DLT_ value, with no hope
- * that they will ever be changed to do so (as that would destroy their
- * ability to read captures using that value for that other purpose).
- *
- * See
- *
- *	http://www.tcpdump.org/linktypes.html
- *
- * for detailed descriptions of some of these link-layer header types.
- */
-
-/*
- * These are the types that are the same on all platforms, and that
- * have been defined by <net/bpf.h> for ages.
- */
-#define DLT_NULL	0	/* BSD loopback encapsulation */
-#define DLT_EN10MB	1	/* Ethernet (10Mb) */
-#define DLT_EN3MB	2	/* Experimental Ethernet (3Mb) */
-#define DLT_AX25	3	/* Amateur Radio AX.25 */
-#define DLT_PRONET	4	/* Proteon ProNET Token Ring */
-#define DLT_CHAOS	5	/* Chaos */
-#define DLT_IEEE802	6	/* 802.5 Token Ring */
-#define DLT_ARCNET	7	/* ARCNET, with BSD-style header */
-#define DLT_SLIP	8	/* Serial Line IP */
-#define DLT_PPP		9	/* Point-to-point Protocol */
-#define DLT_FDDI	10	/* FDDI */
-
-/*
- * These are types that are different on some platforms, and that
- * have been defined by <net/bpf.h> for ages.  We use #ifdefs to
- * detect the BSDs that define them differently from the traditional
- * libpcap <net/bpf.h>
- *
- * XXX - DLT_ATM_RFC1483 is 13 in BSD/OS, and DLT_RAW is 14 in BSD/OS,
- * but I don't know what the right #define is for BSD/OS.
- */
-#define DLT_ATM_RFC1483	11	/* LLC-encapsulated ATM */
-
-#ifdef __OpenBSD__
-#define DLT_RAW		14	/* raw IP */
-#else
-#define DLT_RAW		12	/* raw IP */
-#endif
-
-/*
- * Given that the only OS that currently generates BSD/OS SLIP or PPP
- * is, well, BSD/OS, arguably everybody should have chosen its values
- * for DLT_SLIP_BSDOS and DLT_PPP_BSDOS, which are 15 and 16, but they
- * didn't.  So it goes.
- */
-#if defined(__NetBSD__) || defined(__FreeBSD__)
-#ifndef DLT_SLIP_BSDOS
-#define DLT_SLIP_BSDOS	13	/* BSD/OS Serial Line IP */
-#define DLT_PPP_BSDOS	14	/* BSD/OS Point-to-point Protocol */
-#endif
-#else
-#define DLT_SLIP_BSDOS	15	/* BSD/OS Serial Line IP */
-#define DLT_PPP_BSDOS	16	/* BSD/OS Point-to-point Protocol */
-#endif
-
-/*
- * 17 was used for DLT_PFLOG in OpenBSD; it no longer is.
- *
- * It was DLT_LANE8023 in SuSE 6.3, so we defined LINKTYPE_PFLOG
- * as 117 so that pflog captures would use a link-layer header type
- * value that didn't collide with any other values.  On all
- * platforms other than OpenBSD, we defined DLT_PFLOG as 117,
- * and we mapped between LINKTYPE_PFLOG and DLT_PFLOG.
- *
- * OpenBSD eventually switched to using 117 for DLT_PFLOG as well.
- *
- * Don't use 17 for anything else.
- */
-
-/*
- * 18 is used for DLT_PFSYNC in OpenBSD, NetBSD, DragonFly BSD and
- * Mac OS X; don't use it for anything else.  (FreeBSD uses 121,
- * which collides with DLT_HHDLC, even though it doesn't use 18
- * for anything and doesn't appear to have ever used it for anything.)
- *
- * We define it as 18 on those platforms; it is, unfortunately, used
- * for DLT_CIP in Suse 6.3, so we don't define it as DLT_PFSYNC
- * in general.  As the packet format for it, like that for
- * DLT_PFLOG, is not only OS-dependent but OS-version-dependent,
- * we don't support printing it in tcpdump except on OSes that
- * have the relevant header files, so it's not that useful on
- * other platforms.
- */
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__)
-#define DLT_PFSYNC	18
-#endif
-
-#define DLT_ATM_CLIP	19	/* Linux Classical-IP over ATM */
-
-/*
- * Apparently Redback uses this for its SmartEdge 400/800.  I hope
- * nobody else decided to use it, too.
- */
-#define DLT_REDBACK_SMARTEDGE	32
-
-/*
- * These values are defined by NetBSD; other platforms should refrain from
- * using them for other purposes, so that NetBSD savefiles with link
- * types of 50 or 51 can be read as this type on all platforms.
- */
-#define DLT_PPP_SERIAL	50	/* PPP over serial with HDLC encapsulation */
-#define DLT_PPP_ETHER	51	/* PPP over Ethernet */
-
-/*
- * The Axent Raptor firewall - now the Symantec Enterprise Firewall - uses
- * a link-layer type of 99 for the tcpdump it supplies.  The link-layer
- * header has 6 bytes of unknown data, something that appears to be an
- * Ethernet type, and 36 bytes that appear to be 0 in at least one capture
- * I've seen.
- */
-#define DLT_SYMANTEC_FIREWALL	99
-
-/*
- * Values between 100 and 103 are used in capture file headers as
- * link-layer header type LINKTYPE_ values corresponding to DLT_ types
- * that differ between platforms; don't use those values for new DLT_
- * new types.
- */
-
-/*
- * Values starting with 104 are used for newly-assigned link-layer
- * header type values; for those link-layer header types, the DLT_
- * value returned by pcap_datalink() and passed to pcap_open_dead(),
- * and the LINKTYPE_ value that appears in capture files, are the
- * same.
- *
- * DLT_MATCHING_MIN is the lowest such value; DLT_MATCHING_MAX is
- * the highest such value.
- */
-#define DLT_MATCHING_MIN	104
-
-/*
- * This value was defined by libpcap 0.5; platforms that have defined
- * it with a different value should define it here with that value -
- * a link type of 104 in a save file will be mapped to DLT_C_HDLC,
- * whatever value that happens to be, so programs will correctly
- * handle files with that link type regardless of the value of
- * DLT_C_HDLC.
- *
- * The name DLT_C_HDLC was used by BSD/OS; we use that name for source
- * compatibility with programs written for BSD/OS.
- *
- * libpcap 0.5 defined it as DLT_CHDLC; we define DLT_CHDLC as well,
- * for source compatibility with programs written for libpcap 0.5.
- */
-#define DLT_C_HDLC	104	/* Cisco HDLC */
-#define DLT_CHDLC	DLT_C_HDLC
-
-#define DLT_IEEE802_11	105	/* IEEE 802.11 wireless */
-
-/*
- * 106 is reserved for Linux Classical IP over ATM; it's like DLT_RAW,
- * except when it isn't.  (I.e., sometimes it's just raw IP, and
- * sometimes it isn't.)  We currently handle it as DLT_LINUX_SLL,
- * so that we don't have to worry about the link-layer header.)
- */
-
-/*
- * Frame Relay; BSD/OS has a DLT_FR with a value of 11, but that collides
- * with other values.
- * DLT_FR and DLT_FRELAY packets start with the Q.922 Frame Relay header
- * (DLCI, etc.).
- */
-#define DLT_FRELAY	107
-
-/*
- * OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except
- * that the AF_ type in the link-layer header is in network byte order.
- *
- * DLT_LOOP is 12 in OpenBSD, but that's DLT_RAW in other OSes, so
- * we don't use 12 for it in OSes other than OpenBSD.
- */
-#ifdef __OpenBSD__
-#define DLT_LOOP	12
-#else
-#define DLT_LOOP	108
-#endif
-
-/*
- * Encapsulated packets for IPsec; DLT_ENC is 13 in OpenBSD, but that's
- * DLT_SLIP_BSDOS in NetBSD, so we don't use 13 for it in OSes other
- * than OpenBSD.
- */
-#ifdef __OpenBSD__
-#define DLT_ENC		13
-#else
-#define DLT_ENC		109
-#endif
-
-/*
- * Values between 110 and 112 are reserved for use in capture file headers
- * as link-layer types corresponding to DLT_ types that might differ
- * between platforms; don't use those values for new DLT_ types
- * other than the corresponding DLT_ types.
- */
-
-/*
- * This is for Linux cooked sockets.
- */
-#define DLT_LINUX_SLL	113
-
-/*
- * Apple LocalTalk hardware.
- */
-#define DLT_LTALK	114
-
-/*
- * Acorn Econet.
- */
-#define DLT_ECONET	115
-
-/*
- * Reserved for use with OpenBSD ipfilter.
- */
-#define DLT_IPFILTER	116
-
-/*
- * OpenBSD DLT_PFLOG.
- */
-#define DLT_PFLOG	117
-
-/*
- * Registered for Cisco-internal use.
- */
-#define DLT_CISCO_IOS	118
-
-/*
- * For 802.11 cards using the Prism II chips, with a link-layer
- * header including Prism monitor mode information plus an 802.11
- * header.
- */
-#define DLT_PRISM_HEADER	119
-
-/*
- * Reserved for Aironet 802.11 cards, with an Aironet link-layer header
- * (see Doug Ambrisko's FreeBSD patches).
- */
-#define DLT_AIRONET_HEADER	120
-
-/*
- * Sigh.
- *
- * This was reserved for Siemens HiPath HDLC on 2002-01-25, as
- * requested by Tomas Kukosa.
- *
- * On 2004-02-25, a FreeBSD checkin to sys/net/bpf.h was made that
- * assigned 121 as DLT_PFSYNC.  Its libpcap does DLT_ <-> LINKTYPE_
- * mapping, so it probably supports capturing on the pfsync device
- * but not saving the captured data to a pcap file.
- *
- * OpenBSD, from which pf came, however, uses 18 for DLT_PFSYNC;
- * their libpcap does no DLT_ <-> LINKTYPE_ mapping, so it would
- * use 18 in pcap files as well.
- *
- * NetBSD and DragonFly BSD also use 18 for DLT_PFSYNC; their
- * libpcaps do DLT_ <-> LINKTYPE_ mapping, and neither has an entry
- * for DLT_PFSYNC, so it might not be able to write out dump files
- * with 18 as the link-layer header type.  (Earlier versions might
- * not have done mapping, in which case they'd work the same way
- * OpenBSD does.)
- *
- * Mac OS X defines it as 18, but doesn't appear to use it as of
- * Mac OS X 10.7.3.  Its libpcap does DLT_ <-> LINKTYPE_ mapping.
- *
- * We'll define DLT_PFSYNC as 121 on FreeBSD and define it as 18 on
- * all other platforms.  We'll define DLT_HHDLC as 121 on everything
- * except for FreeBSD; anybody who wants to compile, on FreeBSD, code
- * that uses DLT_HHDLC is out of luck.
- *
- * We'll define LINKTYPE_PFSYNC as 18, *even on FreeBSD*, and map
- * it, so that savefiles won't use 121 for PFSYNC - they'll all
- * use 18.  Code that uses pcap_datalink() to determine the link-layer
- * header type of a savefile won't, when built and run on FreeBSD,
- * be able to distinguish between LINKTYPE_PFSYNC and LINKTYPE_HHDLC
- * capture files; code that doesn't, such as the code in Wireshark,
- * will be able to distinguish between them.
- */
-#ifdef __FreeBSD__
-#define DLT_PFSYNC		121
-#else
-#define DLT_HHDLC		121
-#endif
-
-/*
- * This is for RFC 2625 IP-over-Fibre Channel.
- *
- * This is not for use with raw Fibre Channel, where the link-layer
- * header starts with a Fibre Channel frame header; it's for IP-over-FC,
- * where the link-layer header starts with an RFC 2625 Network_Header
- * field.
- */
-#define DLT_IP_OVER_FC		122
-
-/*
- * This is for Full Frontal ATM on Solaris with SunATM, with a
- * pseudo-header followed by an AALn PDU.
- *
- * There may be other forms of Full Frontal ATM on other OSes,
- * with different pseudo-headers.
- *
- * If ATM software returns a pseudo-header with VPI/VCI information
- * (and, ideally, packet type information, e.g. signalling, ILMI,
- * LANE, LLC-multiplexed traffic, etc.), it should not use
- * DLT_ATM_RFC1483, but should get a new DLT_ value, so tcpdump
- * and the like don't have to infer the presence or absence of a
- * pseudo-header and the form of the pseudo-header.
- */
-#define DLT_SUNATM		123	/* Solaris+SunATM */
-
-/* 
- * Reserved as per request from Kent Dahlgren <kent@praesum.com>
- * for private use.
- */
-#define DLT_RIO                 124     /* RapidIO */
-#define DLT_PCI_EXP             125     /* PCI Express */
-#define DLT_AURORA              126     /* Xilinx Aurora link layer */
-
-/*
- * Header for 802.11 plus a number of bits of link-layer information
- * including radio information, used by some recent BSD drivers as
- * well as the madwifi Atheros driver for Linux.
- */
-#define DLT_IEEE802_11_RADIO	127	/* 802.11 plus radiotap radio header */
-
-/*
- * Reserved for the TZSP encapsulation, as per request from
- * Chris Waters <chris.waters@networkchemistry.com>
- * TZSP is a generic encapsulation for any other link type,
- * which includes a means to include meta-information
- * with the packet, e.g. signal strength and channel
- * for 802.11 packets.
- */
-#define DLT_TZSP                128     /* Tazmen Sniffer Protocol */
-
-/*
- * BSD's ARCNET headers have the source host, destination host,
- * and type at the beginning of the packet; that's what's handed
- * up to userland via BPF.
- *
- * Linux's ARCNET headers, however, have a 2-byte offset field
- * between the host IDs and the type; that's what's handed up
- * to userland via PF_PACKET sockets.
- *
- * We therefore have to have separate DLT_ values for them.
- */
-#define DLT_ARCNET_LINUX	129	/* ARCNET */
-
-/*
- * Juniper-private data link types, as per request from
- * Hannes Gredler <hannes@juniper.net>.  The DLT_s are used
- * for passing on chassis-internal metainformation such as
- * QOS profiles, etc..
- */
-#define DLT_JUNIPER_MLPPP       130
-#define DLT_JUNIPER_MLFR        131
-#define DLT_JUNIPER_ES          132
-#define DLT_JUNIPER_GGSN        133
-#define DLT_JUNIPER_MFR         134
-#define DLT_JUNIPER_ATM2        135
-#define DLT_JUNIPER_SERVICES    136
-#define DLT_JUNIPER_ATM1        137
-
-/*
- * Apple IP-over-IEEE 1394, as per a request from Dieter Siegmund
- * <dieter@apple.com>.  The header that's presented is an Ethernet-like
- * header:
- *
- *	#define FIREWIRE_EUI64_LEN	8
- *	struct firewire_header {
- *		u_char  firewire_dhost[FIREWIRE_EUI64_LEN];
- *		u_char  firewire_shost[FIREWIRE_EUI64_LEN];
- *		u_short firewire_type;
- *	};
- *
- * with "firewire_type" being an Ethernet type value, rather than,
- * for example, raw GASP frames being handed up.
- */
-#define DLT_APPLE_IP_OVER_IEEE1394	138
-
-/*
- * Various SS7 encapsulations, as per a request from Jeff Morriss
- * <jeff.morriss[AT]ulticom.com> and subsequent discussions.
- */
-#define DLT_MTP2_WITH_PHDR	139	/* pseudo-header with various info, followed by MTP2 */
-#define DLT_MTP2		140	/* MTP2, without pseudo-header */
-#define DLT_MTP3		141	/* MTP3, without pseudo-header or MTP2 */
-#define DLT_SCCP		142	/* SCCP, without pseudo-header or MTP2 or MTP3 */
-
-/*
- * DOCSIS MAC frames.
- */
-#define DLT_DOCSIS		143
-
-/*
- * Linux-IrDA packets. Protocol defined at http://www.irda.org.
- * Those packets include IrLAP headers and above (IrLMP...), but
- * don't include Phy framing (SOF/EOF/CRC & byte stuffing), because Phy
- * framing can be handled by the hardware and depend on the bitrate.
- * This is exactly the format you would get capturing on a Linux-IrDA
- * interface (irdaX), but not on a raw serial port.
- * Note the capture is done in "Linux-cooked" mode, so each packet include
- * a fake packet header (struct sll_header). This is because IrDA packet
- * decoding is dependant on the direction of the packet (incomming or
- * outgoing).
- * When/if other platform implement IrDA capture, we may revisit the
- * issue and define a real DLT_IRDA...
- * Jean II
- */
-#define DLT_LINUX_IRDA		144
-
-/*
- * Reserved for IBM SP switch and IBM Next Federation switch.
- */
-#define DLT_IBM_SP		145
-#define DLT_IBM_SN		146
-
-/*
- * Reserved for private use.  If you have some link-layer header type
- * that you want to use within your organization, with the capture files
- * using that link-layer header type not ever be sent outside your
- * organization, you can use these values.
- *
- * No libpcap release will use these for any purpose, nor will any
- * tcpdump release use them, either.
- *
- * Do *NOT* use these in capture files that you expect anybody not using
- * your private versions of capture-file-reading tools to read; in
- * particular, do *NOT* use them in products, otherwise you may find that
- * people won't be able to use tcpdump, or snort, or Ethereal, or... to
- * read capture files from your firewall/intrusion detection/traffic
- * monitoring/etc. appliance, or whatever product uses that DLT_ value,
- * and you may also find that the developers of those applications will
- * not accept patches to let them read those files.
- *
- * Also, do not use them if somebody might send you a capture using them
- * for *their* private type and tools using them for *your* private type
- * would have to read them.
- *
- * Instead, ask "tcpdump-workers@lists.tcpdump.org" for a new DLT_ value,
- * as per the comment above, and use the type you're given.
- */
-#define DLT_USER0		147
-#define DLT_USER1		148
-#define DLT_USER2		149
-#define DLT_USER3		150
-#define DLT_USER4		151
-#define DLT_USER5		152
-#define DLT_USER6		153
-#define DLT_USER7		154
-#define DLT_USER8		155
-#define DLT_USER9		156
-#define DLT_USER10		157
-#define DLT_USER11		158
-#define DLT_USER12		159
-#define DLT_USER13		160
-#define DLT_USER14		161
-#define DLT_USER15		162
-
-/*
- * For future use with 802.11 captures - defined by AbsoluteValue
- * Systems to store a number of bits of link-layer information
- * including radio information:
- *
- *	http://www.shaftnet.org/~pizza/software/capturefrm.txt
- *
- * but it might be used by some non-AVS drivers now or in the
- * future.
- */
-#define DLT_IEEE802_11_RADIO_AVS 163	/* 802.11 plus AVS radio header */
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.  The DLT_s are used
- * for passing on chassis-internal metainformation such as
- * QOS profiles, etc..
- */
-#define DLT_JUNIPER_MONITOR     164
-
-/*
- * BACnet MS/TP frames.
- */
-#define DLT_BACNET_MS_TP	165
-
-/*
- * Another PPP variant as per request from Karsten Keil <kkeil@suse.de>.
- *
- * This is used in some OSes to allow a kernel socket filter to distinguish
- * between incoming and outgoing packets, on a socket intended to
- * supply pppd with outgoing packets so it can do dial-on-demand and
- * hangup-on-lack-of-demand; incoming packets are filtered out so they
- * don't cause pppd to hold the connection up (you don't want random
- * input packets such as port scans, packets from old lost connections,
- * etc. to force the connection to stay up).
- *
- * The first byte of the PPP header (0xff03) is modified to accomodate
- * the direction - 0x00 = IN, 0x01 = OUT.
- */
-#define DLT_PPP_PPPD		166
-
-/*
- * Names for backwards compatibility with older versions of some PPP
- * software; new software should use DLT_PPP_PPPD.
- */
-#define DLT_PPP_WITH_DIRECTION	DLT_PPP_PPPD
-#define DLT_LINUX_PPP_WITHDIRECTION	DLT_PPP_PPPD
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.  The DLT_s are used
- * for passing on chassis-internal metainformation such as
- * QOS profiles, cookies, etc..
- */
-#define DLT_JUNIPER_PPPOE       167
-#define DLT_JUNIPER_PPPOE_ATM   168
-
-#define DLT_GPRS_LLC		169	/* GPRS LLC */
-#define DLT_GPF_T		170	/* GPF-T (ITU-T G.7041/Y.1303) */
-#define DLT_GPF_F		171	/* GPF-F (ITU-T G.7041/Y.1303) */
-
-/*
- * Requested by Oolan Zimmer <oz@gcom.com> for use in Gcom's T1/E1 line
- * monitoring equipment.
- */
-#define DLT_GCOM_T1E1		172
-#define DLT_GCOM_SERIAL		173
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.  The DLT_ is used
- * for internal communication to Physical Interface Cards (PIC)
- */
-#define DLT_JUNIPER_PIC_PEER    174
-
-/*
- * Link types requested by Gregor Maier <gregor@endace.com> of Endace
- * Measurement Systems.  They add an ERF header (see
- * http://www.endace.com/support/EndaceRecordFormat.pdf) in front of
- * the link-layer header.
- */
-#define DLT_ERF_ETH		175	/* Ethernet */
-#define DLT_ERF_POS		176	/* Packet-over-SONET */
-
-/*
- * Requested by Daniele Orlandi <daniele@orlandi.com> for raw LAPD
- * for vISDN (http://www.orlandi.com/visdn/).  Its link-layer header
- * includes additional information before the LAPD header, so it's
- * not necessarily a generic LAPD header.
- */
-#define DLT_LINUX_LAPD		177
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>. 
- * The DLT_ are used for prepending meta-information
- * like interface index, interface name
- * before standard Ethernet, PPP, Frelay & C-HDLC Frames
- */
-#define DLT_JUNIPER_ETHER       178
-#define DLT_JUNIPER_PPP         179
-#define DLT_JUNIPER_FRELAY      180
-#define DLT_JUNIPER_CHDLC       181
-
-/*
- * Multi Link Frame Relay (FRF.16)
- */
-#define DLT_MFR                 182
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>. 
- * The DLT_ is used for internal communication with a
- * voice Adapter Card (PIC)
- */
-#define DLT_JUNIPER_VP          183
-
-/*
- * Arinc 429 frames.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- * Every frame contains a 32bit A429 label.
- * More documentation on Arinc 429 can be found at
- * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf
- */
-#define DLT_A429                184
-
-/*
- * Arinc 653 Interpartition Communication messages.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- * Please refer to the A653-1 standard for more information.
- */
-#define DLT_A653_ICM            185
-
-/*
- * USB packets, beginning with a USB setup header; requested by
- * Paolo Abeni <paolo.abeni@email.it>.
- */
-#define DLT_USB			186
-
-/*
- * Bluetooth HCI UART transport layer (part H:4); requested by
- * Paolo Abeni.
- */
-#define DLT_BLUETOOTH_HCI_H4	187
-
-/*
- * IEEE 802.16 MAC Common Part Sublayer; requested by Maria Cruz
- * <cruz_petagay@bah.com>.
- */
-#define DLT_IEEE802_16_MAC_CPS	188
-
-/*
- * USB packets, beginning with a Linux USB header; requested by
- * Paolo Abeni <paolo.abeni@email.it>.
- */
-#define DLT_USB_LINUX		189
-
-/*
- * Controller Area Network (CAN) v. 2.0B packets.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- * Used to dump CAN packets coming from a CAN Vector board.
- * More documentation on the CAN v2.0B frames can be found at
- * http://www.can-cia.org/downloads/?269
- */
-#define DLT_CAN20B              190
-
-/*
- * IEEE 802.15.4, with address fields padded, as is done by Linux
- * drivers; requested by Juergen Schimmer.
- */
-#define DLT_IEEE802_15_4_LINUX	191
-
-/*
- * Per Packet Information encapsulated packets.
- * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>.
- */
-#define DLT_PPI			192
-
-/*
- * Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header;
- * requested by Charles Clancy.
- */
-#define DLT_IEEE802_16_MAC_CPS_RADIO	193
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>. 
- * The DLT_ is used for internal communication with a
- * integrated service module (ISM).
- */
-#define DLT_JUNIPER_ISM         194
-
-/*
- * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
- * nothing); requested by Mikko Saarnivala <mikko.saarnivala@sensinode.com>.
- * For this one, we expect the FCS to be present at the end of the frame;
- * if the frame has no FCS, DLT_IEEE802_15_4_NOFCS should be used.
- */
-#define DLT_IEEE802_15_4	195
-
-/*
- * Various link-layer types, with a pseudo-header, for SITA
- * (http://www.sita.aero/); requested by Fulko Hew (fulko.hew@gmail.com).
- */
-#define DLT_SITA		196
-
-/*
- * Various link-layer types, with a pseudo-header, for Endace DAG cards;
- * encapsulates Endace ERF records.  Requested by Stephen Donnelly
- * <stephen@endace.com>.
- */
-#define DLT_ERF			197
-
-/*
- * Special header prepended to Ethernet packets when capturing from a
- * u10 Networks board.  Requested by Phil Mulholland
- * <phil@u10networks.com>.
- */
-#define DLT_RAIF1		198
-
-/*
- * IPMB packet for IPMI, beginning with the I2C slave address, followed
- * by the netFn and LUN, etc..  Requested by Chanthy Toeung
- * <chanthy.toeung@ca.kontron.com>.
- */
-#define DLT_IPMB		199
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>. 
- * The DLT_ is used for capturing data on a secure tunnel interface.
- */
-#define DLT_JUNIPER_ST          200
-
-/*
- * Bluetooth HCI UART transport layer (part H:4), with pseudo-header
- * that includes direction information; requested by Paolo Abeni.
- */
-#define DLT_BLUETOOTH_HCI_H4_WITH_PHDR	201
-
-/*
- * AX.25 packet with a 1-byte KISS header; see
- *
- *	http://www.ax25.net/kiss.htm
- *
- * as per Richard Stearn <richard@rns-stearn.demon.co.uk>.
- */
-#define DLT_AX25_KISS		202
-
-/*
- * LAPD packets from an ISDN channel, starting with the address field,
- * with no pseudo-header.
- * Requested by Varuna De Silva <varunax@gmail.com>.
- */
-#define DLT_LAPD		203
-
-/*
- * Variants of various link-layer headers, with a one-byte direction
- * pseudo-header prepended - zero means "received by this host",
- * non-zero (any non-zero value) means "sent by this host" - as per
- * Will Barker <w.barker@zen.co.uk>.
- */
-#define DLT_PPP_WITH_DIR	204	/* PPP - don't confuse with DLT_PPP_WITH_DIRECTION */
-#define DLT_C_HDLC_WITH_DIR	205	/* Cisco HDLC */
-#define DLT_FRELAY_WITH_DIR	206	/* Frame Relay */
-#define DLT_LAPB_WITH_DIR	207	/* LAPB */
-
-/*
- * 208 is reserved for an as-yet-unspecified proprietary link-layer
- * type, as requested by Will Barker.
- */
-
-/*
- * IPMB with a Linux-specific pseudo-header; as requested by Alexey Neyman
- * <avn@pigeonpoint.com>.
- */
-#define DLT_IPMB_LINUX		209
-
-/*
- * FlexRay automotive bus - http://www.flexray.com/ - as requested
- * by Hannes Kaelber <hannes.kaelber@x2e.de>.
- */
-#define DLT_FLEXRAY		210
-
-/*
- * Media Oriented Systems Transport (MOST) bus for multimedia
- * transport - http://www.mostcooperation.com/ - as requested
- * by Hannes Kaelber <hannes.kaelber@x2e.de>.
- */
-#define DLT_MOST		211
-
-/*
- * Local Interconnect Network (LIN) bus for vehicle networks -
- * http://www.lin-subbus.org/ - as requested by Hannes Kaelber
- * <hannes.kaelber@x2e.de>.
- */
-#define DLT_LIN			212
-
-/*
- * X2E-private data link type used for serial line capture,
- * as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
- */
-#define DLT_X2E_SERIAL		213
-
-/*
- * X2E-private data link type used for the Xoraya data logger
- * family, as requested by Hannes Kaelber <hannes.kaelber@x2e.de>.
- */
-#define DLT_X2E_XORAYA		214
-
-/*
- * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
- * nothing), but with the PHY-level data for non-ASK PHYs (4 octets
- * of 0 as preamble, one octet of SFD, one octet of frame length+
- * reserved bit, and then the MAC-layer data, starting with the
- * frame control field).
- *
- * Requested by Max Filippov <jcmvbkbc@gmail.com>.
- */
-#define DLT_IEEE802_15_4_NONASK_PHY	215
-
-/* 
- * David Gibson <david@gibson.dropbear.id.au> requested this for
- * captures from the Linux kernel /dev/input/eventN devices. This
- * is used to communicate keystrokes and mouse movements from the
- * Linux kernel to display systems, such as Xorg. 
- */
-#define DLT_LINUX_EVDEV		216
-
-/*
- * GSM Um and Abis interfaces, preceded by a "gsmtap" header.
- *
- * Requested by Harald Welte <laforge@gnumonks.org>.
- */
-#define DLT_GSMTAP_UM		217
-#define DLT_GSMTAP_ABIS		218
-
-/*
- * MPLS, with an MPLS label as the link-layer header.
- * Requested by Michele Marchetto <michele@openbsd.org> on behalf
- * of OpenBSD.
- */
-#define DLT_MPLS		219
-
-/*
- * USB packets, beginning with a Linux USB header, with the USB header
- * padded to 64 bytes; required for memory-mapped access.
- */
-#define DLT_USB_LINUX_MMAPPED	220
-
-/*
- * DECT packets, with a pseudo-header; requested by
- * Matthias Wenzel <tcpdump@mazzoo.de>.
- */
-#define DLT_DECT		221
-
-/*
- * From: "Lidwa, Eric (GSFC-582.0)[SGT INC]" <eric.lidwa-1@nasa.gov>
- * Date: Mon, 11 May 2009 11:18:30 -0500
- *
- * DLT_AOS. We need it for AOS Space Data Link Protocol.
- *   I have already written dissectors for but need an OK from
- *   legal before I can submit a patch.
- *
- */
-#define DLT_AOS                 222
-
-/*
- * Wireless HART (Highway Addressable Remote Transducer)
- * From the HART Communication Foundation
- * IES/PAS 62591
- *
- * Requested by Sam Roberts <vieuxtech@gmail.com>.
- */
-#define DLT_WIHART		223
-
-/*
- * Fibre Channel FC-2 frames, beginning with a Frame_Header.
- * Requested by Kahou Lei <kahou82@gmail.com>.
- */
-#define DLT_FC_2		224
-
-/*
- * Fibre Channel FC-2 frames, beginning with an encoding of the
- * SOF, and ending with an encoding of the EOF.
- *
- * The encodings represent the frame delimiters as 4-byte sequences
- * representing the corresponding ordered sets, with K28.5
- * represented as 0xBC, and the D symbols as the corresponding
- * byte values; for example, SOFi2, which is K28.5 - D21.5 - D1.2 - D21.2,
- * is represented as 0xBC 0xB5 0x55 0x55.
- *
- * Requested by Kahou Lei <kahou82@gmail.com>.
- */
-#define DLT_FC_2_WITH_FRAME_DELIMS	225
-
-/*
- * Solaris ipnet pseudo-header; requested by Darren Reed <Darren.Reed@Sun.COM>.
- *
- * The pseudo-header starts with a one-byte version number; for version 2,
- * the pseudo-header is:
- *
- * struct dl_ipnetinfo {
- *     u_int8_t   dli_version;
- *     u_int8_t   dli_family;
- *     u_int16_t  dli_htype;
- *     uint32_t  dli_pktlen;
- *     uint32_t  dli_ifindex;
- *     uint32_t  dli_grifindex;
- *     uint32_t  dli_zsrc;
- *     uint32_t  dli_zdst;
- * };
- *
- * dli_version is 2 for the current version of the pseudo-header.
- *
- * dli_family is a Solaris address family value, so it's 2 for IPv4
- * and 26 for IPv6.
- *
- * dli_htype is a "hook type" - 0 for incoming packets, 1 for outgoing
- * packets, and 2 for packets arriving from another zone on the same
- * machine.
- *
- * dli_pktlen is the length of the packet data following the pseudo-header
- * (so the captured length minus dli_pktlen is the length of the
- * pseudo-header, assuming the entire pseudo-header was captured).
- *
- * dli_ifindex is the interface index of the interface on which the
- * packet arrived.
- *
- * dli_grifindex is the group interface index number (for IPMP interfaces).
- *
- * dli_zsrc is the zone identifier for the source of the packet.
- *
- * dli_zdst is the zone identifier for the destination of the packet.
- *
- * A zone number of 0 is the global zone; a zone number of 0xffffffff
- * means that the packet arrived from another host on the network, not
- * from another zone on the same machine.
- *
- * An IPv4 or IPv6 datagram follows the pseudo-header; dli_family indicates
- * which of those it is.
- */
-#define DLT_IPNET		226
-
-/*
- * CAN (Controller Area Network) frames, with a pseudo-header as supplied
- * by Linux SocketCAN.  See Documentation/networking/can.txt in the Linux
- * source.
- *
- * Requested by Felix Obenhuber <felix@obenhuber.de>.
- */
-#define DLT_CAN_SOCKETCAN	227
-
-/*
- * Raw IPv4/IPv6; different from DLT_RAW in that the DLT_ value specifies
- * whether it's v4 or v6.  Requested by Darren Reed <Darren.Reed@Sun.COM>.
- */
-#define DLT_IPV4		228
-#define DLT_IPV6		229
-
-/*
- * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
- * nothing), and with no FCS at the end of the frame; requested by
- * Jon Smirl <jonsmirl@gmail.com>.
- */
-#define DLT_IEEE802_15_4_NOFCS	230
-
-/*
- * Raw D-Bus:
- *
- *	http://www.freedesktop.org/wiki/Software/dbus
- *
- * messages:
- *
- *	http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-messages
- *
- * starting with the endianness flag, followed by the message type, etc.,
- * but without the authentication handshake before the message sequence:
- *
- *	http://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
- *
- * Requested by Martin Vidner <martin@vidner.net>.
- */
-#define DLT_DBUS		231
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- */
-#define DLT_JUNIPER_VS			232
-#define DLT_JUNIPER_SRX_E2E		233
-#define DLT_JUNIPER_FIBRECHANNEL	234
-
-/*
- * DVB-CI (DVB Common Interface for communication between a PC Card
- * module and a DVB receiver).  See
- *
- *	http://www.kaiser.cx/pcap-dvbci.html
- *
- * for the specification.
- *
- * Requested by Martin Kaiser <martin@kaiser.cx>.
- */
-#define DLT_DVB_CI		235
-
-/*
- * Variant of 3GPP TS 27.010 multiplexing protocol (similar to, but
- * *not* the same as, 27.010).  Requested by Hans-Christoph Schemmel
- * <hans-christoph.schemmel@cinterion.com>.
- */
-#define DLT_MUX27010		236
-
-/*
- * STANAG 5066 D_PDUs.  Requested by M. Baris Demiray
- * <barisdemiray@gmail.com>.
- */
-#define DLT_STANAG_5066_D_PDU	237
-
-/*
- * Juniper-private data link type, as per request from
- * Hannes Gredler <hannes@juniper.net>.
- */
-#define DLT_JUNIPER_ATM_CEMIC	238
-
-/*
- * NetFilter LOG messages 
- * (payload of netlink NFNL_SUBSYS_ULOG/NFULNL_MSG_PACKET packets)
- *
- * Requested by Jakub Zawadzki <darkjames-ws@darkjames.pl>
- */
-#define DLT_NFLOG		239
-
-/*
- * Hilscher Gesellschaft fuer Systemautomation mbH link-layer type
- * for Ethernet packets with a 4-byte pseudo-header and always
- * with the payload including the FCS, as supplied by their
- * netANALYZER hardware and software.
- *
- * Requested by Holger P. Frommer <HPfrommer@hilscher.com>
- */
-#define DLT_NETANALYZER		240
-
-/*
- * Hilscher Gesellschaft fuer Systemautomation mbH link-layer type
- * for Ethernet packets with a 4-byte pseudo-header and FCS and
- * with the Ethernet header preceded by 7 bytes of preamble and
- * 1 byte of SFD, as supplied by their netANALYZER hardware and
- * software.
- *
- * Requested by Holger P. Frommer <HPfrommer@hilscher.com>
- */
-#define DLT_NETANALYZER_TRANSPARENT	241
-
-/*
- * IP-over-InfiniBand, as specified by RFC 4391.
- *
- * Requested by Petr Sumbera <petr.sumbera@oracle.com>.
- */
-#define DLT_IPOIB		242
-
-/*
- * MPEG-2 transport stream (ISO 13818-1/ITU-T H.222.0).
- *
- * Requested by Guy Martin <gmsoft@tuxicoman.be>.
- */
-#define DLT_MPEG_2_TS		243
-
-/*
- * ng4T GmbH's UMTS Iub/Iur-over-ATM and Iub/Iur-over-IP format as
- * used by their ng40 protocol tester.
- *
- * Requested by Jens Grimmer <jens.grimmer@ng4t.com>.
- */
-#define DLT_NG40		244
-
-/*
- * Pseudo-header giving adapter number and flags, followed by an NFC
- * (Near-Field Communications) Logical Link Control Protocol (LLCP) PDU,
- * as specified by NFC Forum Logical Link Control Protocol Technical
- * Specification LLCP 1.1.
- *
- * Requested by Mike Wakerly <mikey@google.com>.
- */
-#define DLT_NFC_LLCP		245
-
-/*
- * 245 is used as LINKTYPE_PFSYNC; do not use it for any other purpose.
- *
- * DLT_PFSYNC has different values on different platforms, and all of
- * them collide with something used elsewhere.  On platforms that
- * don't already define it, define it as 245.
- */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__APPLE__)
-#define DLT_PFSYNC		246
-#endif
-
-/*
- * Raw InfiniBand packets, starting with the Local Routing Header.
- *
- * Requested by Oren Kladnitsky <orenk@mellanox.com>.
- */
-#define DLT_INFINIBAND		247
-
-/*
- * SCTP, with no lower-level protocols (i.e., no IPv4 or IPv6).
- *
- * Requested by Michael Tuexen <Michael.Tuexen@lurchi.franken.de>.
- */
-#define DLT_SCTP		248
-
-#define DLT_MATCHING_MAX	248	/* highest value in the "matching" range */
-
-/*
- * DLT and savefile link type values are split into a class and
- * a member of that class.  A class value of 0 indicates a regular
- * DLT_/LINKTYPE_ value.
- */
-#define DLT_CLASS(x)		((x) & 0x03ff0000)
-
-/*
- * NetBSD-specific generic "raw" link type.  The class value indicates
- * that this is the generic raw type, and the lower 16 bits are the
- * address family we're dealing with.  Those values are NetBSD-specific;
- * do not assume that they correspond to AF_ values for your operating
- * system.
- */
-#define	DLT_CLASS_NETBSD_RAWAF	0x02240000
-#define	DLT_NETBSD_RAWAF(af)	(DLT_CLASS_NETBSD_RAWAF | (af))
-#define	DLT_NETBSD_RAWAF_AF(x)	((x) & 0x0000ffff)
-#define	DLT_IS_NETBSD_RAWAF(x)	(DLT_CLASS(x) == DLT_CLASS_NETBSD_RAWAF)
-
-
-/*
- * The instruction encodings.
- */
-/* instruction classes */
-#define BPF_CLASS(code) ((code) & 0x07)
-#define		BPF_LD		0x00
-#define		BPF_LDX		0x01
-#define		BPF_ST		0x02
-#define		BPF_STX		0x03
-#define		BPF_ALU		0x04
-#define		BPF_JMP		0x05
-#define		BPF_RET		0x06
-#define		BPF_MISC	0x07
-
-/* ld/ldx fields */
-#define BPF_SIZE(code)	((code) & 0x18)
-#define		BPF_W		0x00
-#define		BPF_H		0x08
-#define		BPF_B		0x10
-#define BPF_MODE(code)	((code) & 0xe0)
-#define		BPF_IMM 	0x00
-#define		BPF_ABS		0x20
-#define		BPF_IND		0x40
-#define		BPF_MEM		0x60
-#define		BPF_LEN		0x80
-#define		BPF_MSH		0xa0
-
-/* alu/jmp fields */
-#define BPF_OP(code)	((code) & 0xf0)
-#define		BPF_ADD		0x00
-#define		BPF_SUB		0x10
-#define		BPF_MUL		0x20
-#define		BPF_DIV		0x30
-#define		BPF_OR		0x40
-#define		BPF_AND		0x50
-#define		BPF_LSH		0x60
-#define		BPF_RSH		0x70
-#define		BPF_NEG		0x80
-#define		BPF_JA		0x00
-#define		BPF_JEQ		0x10
-#define		BPF_JGT		0x20
-#define		BPF_JGE		0x30
-#define		BPF_JSET	0x40
-#define BPF_SRC(code)	((code) & 0x08)
-#define		BPF_K		0x00
-#define		BPF_X		0x08
-
-/* ret - BPF_K and BPF_X also apply */
-#define BPF_RVAL(code)	((code) & 0x18)
-#define		BPF_A		0x10
-
-/* misc */
-#define BPF_MISCOP(code) ((code) & 0xf8)
-#define		BPF_TAX		0x00
-#define		BPF_TXA		0x80
-
-/*
- * The instruction data structure.
- */
-struct bpf_insn {
-	u_short	code;
-	u_char 	jt;
-	u_char 	jf;
-	bpf_u_int32 k;
-};
-
-/*
- * Macros for insn array initializers.
- */
-#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
-#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
-
-#if __STDC__ || defined(__cplusplus)
-extern int bpf_validate(const struct bpf_insn *, int);
-extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
-#else
-extern int bpf_validate();
-extern u_int bpf_filter();
-#endif
-
-/*
- * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST).
- */
-#define BPF_MEMWORDS 16
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !defined(_NET_BPF_H_) && !defined(_BPF_H_) && !defined(_H_BPF) && !defined(lib_pcap_bpf_h) */
diff --git a/include.new/pcap/namedb.h b/include.new/pcap/namedb.h
deleted file mode 100644
index e314557..0000000
--- a/include.new/pcap/namedb.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1994, 1996
- *	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 Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory 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.
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap/namedb.h,v 1.1 2006-10-04 18:09:22 guy Exp $ (LBL)
- */
-
-#ifndef lib_pcap_namedb_h
-#define lib_pcap_namedb_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * As returned by the pcap_next_etherent()
- * XXX this stuff doesn't belong in this interface, but this
- * library already must do name to address translation, so
- * on systems that don't have support for /etc/ethers, we
- * export these hooks since they'll
- */
-struct pcap_etherent {
-	u_char addr[6];
-	char name[122];
-};
-#ifndef PCAP_ETHERS_FILE
-#define PCAP_ETHERS_FILE "/etc/ethers"
-#endif
-struct	pcap_etherent *pcap_next_etherent(FILE *);
-u_char *pcap_ether_hostton(const char*);
-u_char *pcap_ether_aton(const char *);
-
-bpf_u_int32 **pcap_nametoaddr(const char *);
-#ifdef INET6
-struct addrinfo *pcap_nametoaddrinfo(const char *);
-#endif
-bpf_u_int32 pcap_nametonetaddr(const char *);
-
-int	pcap_nametoport(const char *, int *, int *);
-int	pcap_nametoportrange(const char *, int *, int *, int *);
-int	pcap_nametoproto(const char *);
-int	pcap_nametoeproto(const char *);
-int	pcap_nametollc(const char *);
-/*
- * If a protocol is unknown, PROTO_UNDEF is returned.
- * Also, pcap_nametoport() returns the protocol along with the port number.
- * If there are ambiguous entried in /etc/services (i.e. domain
- * can be either tcp or udp) PROTO_UNDEF is returned.
- */
-#define PROTO_UNDEF		-1
-
-/* XXX move these to pcap-int.h? */
-int __pcap_atodn(const char *, bpf_u_int32 *);
-int __pcap_atoin(const char *, bpf_u_int32 *);
-u_short	__pcap_nametodnaddr(const char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include.new/pcap/pcap.h b/include.new/pcap/pcap.h
deleted file mode 100644
index 6248e9f..0000000
--- a/include.new/pcap/pcap.h
+++ /dev/null
@@ -1,461 +0,0 @@
-/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */
-/*
- * Copyright (c) 1993, 1994, 1995, 1996, 1997
- *	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 Computer Systems
- *	Engineering Group at Lawrence Berkeley Laboratory.
- * 4. Neither the name of the University nor of the Laboratory 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.
- *
- * @(#) $Header: /tcpdump/master/libpcap/pcap/pcap.h,v 1.15 2008-10-06 15:27:32 gianluca Exp $ (LBL)
- */
-
-#ifndef lib_pcap_pcap_h
-#define lib_pcap_pcap_h
-
-#if defined(WIN32)
-  #include <pcap-stdinc.h>
-#elif defined(MSDOS)
-  #include <sys/types.h>
-  #include <sys/socket.h>  /* u_int, u_char etc. */
-#else /* UN*X */
-  #include <sys/types.h>
-  #include <sys/time.h>
-#endif /* WIN32/MSDOS/UN*X */
-
-#include <net/bpf.h>
-
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Version number of the current version of the pcap file format.
- *
- * NOTE: this is *NOT* the version number of the libpcap library.
- * To fetch the version information for the version of libpcap
- * you're using, use pcap_lib_version().
- */
-#define PCAP_VERSION_MAJOR 2
-#define PCAP_VERSION_MINOR 4
-
-#define PCAP_ERRBUF_SIZE 256
-
-/*
- * Compatibility for systems that have a bpf.h that
- * predates the bpf typedefs for 64-bit support.
- */
-#if BPF_RELEASE - 0 < 199406
-typedef	int bpf_int32;
-typedef	u_int bpf_u_int32;
-#endif
-
-typedef struct pcap pcap_t;
-typedef struct pcap_dumper pcap_dumper_t;
-typedef struct pcap_if pcap_if_t;
-typedef struct pcap_addr pcap_addr_t;
-
-/*
- * The first record in the file contains saved values for some
- * of the flags used in the printout phases of tcpdump.
- * Many fields here are 32 bit ints so compilers won't insert unwanted
- * padding; these files need to be interchangeable across architectures.
- *
- * Do not change the layout of this structure, in any way (this includes
- * changes that only affect the length of fields in this structure).
- *
- * Also, do not change the interpretation of any of the members of this
- * structure, in any way (this includes using values other than
- * LINKTYPE_ values, as defined in "savefile.c", in the "linktype"
- * field).
- *
- * Instead:
- *
- *	introduce a new structure for the new format, if the layout
- *	of the structure changed;
- *
- *	send mail to "tcpdump-workers@lists.tcpdump.org", requesting
- *	a new magic number for your new capture file format, and, when
- *	you get the new magic number, put it in "savefile.c";
- *
- *	use that magic number for save files with the changed file
- *	header;
- *
- *	make the code in "savefile.c" capable of reading files with
- *	the old file header as well as files with the new file header
- *	(using the magic number to determine the header format).
- *
- * Then supply the changes by forking the branch at
- *
- *	https://github.com/mcr/libpcap/issues
- *
- * and issuing a pull request, so that future versions of libpcap and
- * programs that use it (such as tcpdump) will be able to read your new
- * capture file format.
- */
-struct pcap_file_header {
-	bpf_u_int32 magic;
-	u_short version_major;
-	u_short version_minor;
-	bpf_int32 thiszone;	/* gmt to local correction */
-	bpf_u_int32 sigfigs;	/* accuracy of timestamps */
-	bpf_u_int32 snaplen;	/* max length saved portion of each pkt */
-	bpf_u_int32 linktype;	/* data link type (LINKTYPE_*) */
-};
-
-/*
- * Macros for the value returned by pcap_datalink_ext().
- * 
- * If LT_FCS_LENGTH_PRESENT(x) is true, the LT_FCS_LENGTH(x) macro
- * gives the FCS length of packets in the capture.
- */
-#define LT_FCS_LENGTH_PRESENT(x)	((x) & 0x04000000)
-#define LT_FCS_LENGTH(x)		(((x) & 0xF0000000) >> 28)
-#define LT_FCS_DATALINK_EXT(x)		((((x) & 0xF) << 28) | 0x04000000)
-
-typedef enum {
-       PCAP_D_INOUT = 0,
-       PCAP_D_IN,
-       PCAP_D_OUT
-} pcap_direction_t;
-
-/*
- * Generic per-packet information, as supplied by libpcap.
- *
- * The time stamp can and should be a "struct timeval", regardless of
- * whether your system supports 32-bit tv_sec in "struct timeval",
- * 64-bit tv_sec in "struct timeval", or both if it supports both 32-bit
- * and 64-bit applications.  The on-disk format of savefiles uses 32-bit
- * tv_sec (and tv_usec); this structure is irrelevant to that.  32-bit
- * and 64-bit versions of libpcap, even if they're on the same platform,
- * should supply the appropriate version of "struct timeval", even if
- * that's not what the underlying packet capture mechanism supplies.
- */
-struct pcap_pkthdr {
-	struct timeval ts;	/* time stamp */
-	bpf_u_int32 caplen;	/* length of portion present */
-	bpf_u_int32 len;	/* length this packet (off wire) */
-};
-
-/*
- * As returned by the pcap_stats()
- */
-struct pcap_stat {
-	u_int ps_recv;		/* number of packets received */
-	u_int ps_drop;		/* number of packets dropped */
-	u_int ps_ifdrop;	/* drops by interface -- only supported on some platforms */
-#ifdef WIN32
-	u_int bs_capt;		/* number of packets that reach the application */
-#endif /* WIN32 */
-};
-
-#ifdef MSDOS
-/*
- * As returned by the pcap_stats_ex()
- */
-struct pcap_stat_ex {
-       u_long  rx_packets;        /* total packets received       */
-       u_long  tx_packets;        /* total packets transmitted    */
-       u_long  rx_bytes;          /* total bytes received         */
-       u_long  tx_bytes;          /* total bytes transmitted      */
-       u_long  rx_errors;         /* bad packets received         */
-       u_long  tx_errors;         /* packet transmit problems     */
-       u_long  rx_dropped;        /* no space in Rx buffers       */
-       u_long  tx_dropped;        /* no space available for Tx    */
-       u_long  multicast;         /* multicast packets received   */
-       u_long  collisions;
-
-       /* detailed rx_errors: */
-       u_long  rx_length_errors;
-       u_long  rx_over_errors;    /* receiver ring buff overflow  */
-       u_long  rx_crc_errors;     /* recv'd pkt with crc error    */
-       u_long  rx_frame_errors;   /* recv'd frame alignment error */
-       u_long  rx_fifo_errors;    /* recv'r fifo overrun          */
-       u_long  rx_missed_errors;  /* recv'r missed packet         */
-
-       /* detailed tx_errors */
-       u_long  tx_aborted_errors;
-       u_long  tx_carrier_errors;
-       u_long  tx_fifo_errors;
-       u_long  tx_heartbeat_errors;
-       u_long  tx_window_errors;
-     };
-#endif
-
-/*
- * Item in a list of interfaces.
- */
-struct pcap_if {
-	struct pcap_if *next;
-	char *name;		/* name to hand to "pcap_open_live()" */
-	char *description;	/* textual description of interface, or NULL */
-	struct pcap_addr *addresses;
-	bpf_u_int32 flags;	/* PCAP_IF_ interface flags */
-};
-
-#define PCAP_IF_LOOPBACK	0x00000001	/* interface is loopback */
-
-/*
- * Representation of an interface address.
- */
-struct pcap_addr {
-	struct pcap_addr *next;
-	struct sockaddr *addr;		/* address */
-	struct sockaddr *netmask;	/* netmask for that address */
-	struct sockaddr *broadaddr;	/* broadcast address for that address */
-	struct sockaddr *dstaddr;	/* P2P destination address for that address */
-};
-
-typedef void (*pcap_handler)(u_char *, const struct pcap_pkthdr *,
-			     const u_char *);
-
-/*
- * Error codes for the pcap API.
- * These will all be negative, so you can check for the success or
- * failure of a call that returns these codes by checking for a
- * negative value.
- */
-#define PCAP_ERROR			-1	/* generic error code */
-#define PCAP_ERROR_BREAK		-2	/* loop terminated by pcap_breakloop */
-#define PCAP_ERROR_NOT_ACTIVATED	-3	/* the capture needs to be activated */
-#define PCAP_ERROR_ACTIVATED		-4	/* the operation can't be performed on already activated captures */
-#define PCAP_ERROR_NO_SUCH_DEVICE	-5	/* no such device exists */
-#define PCAP_ERROR_RFMON_NOTSUP		-6	/* this device doesn't support rfmon (monitor) mode */
-#define PCAP_ERROR_NOT_RFMON		-7	/* operation supported only in monitor mode */
-#define PCAP_ERROR_PERM_DENIED		-8	/* no permission to open the device */
-#define PCAP_ERROR_IFACE_NOT_UP		-9	/* interface isn't up */
-#define PCAP_ERROR_CANTSET_TSTAMP_TYPE	-10	/* this device doesn't support setting the time stamp type */
-#define PCAP_ERROR_PROMISC_PERM_DENIED	-11	/* you don't have permission to capture in promiscuous mode */
-
-/*
- * Warning codes for the pcap API.
- * These will all be positive and non-zero, so they won't look like
- * errors.
- */
-#define PCAP_WARNING			1	/* generic warning code */
-#define PCAP_WARNING_PROMISC_NOTSUP	2	/* this device doesn't support promiscuous mode */
-#define PCAP_WARNING_TSTAMP_TYPE_NOTSUP	3	/* the requested time stamp type is not supported */
-
-/*
- * Value to pass to pcap_compile() as the netmask if you don't know what
- * the netmask is.
- */
-#define PCAP_NETMASK_UNKNOWN	0xffffffff
-
-char	*pcap_lookupdev(char *);
-int	pcap_lookupnet(const char *, bpf_u_int32 *, bpf_u_int32 *, char *);
-
-pcap_t	*pcap_create(const char *, char *);
-int	pcap_set_snaplen(pcap_t *, int);
-int	pcap_set_promisc(pcap_t *, int);
-int	pcap_can_set_rfmon(pcap_t *);
-int	pcap_set_rfmon(pcap_t *, int);
-int	pcap_set_timeout(pcap_t *, int);
-int	pcap_set_tstamp_type(pcap_t *, int);
-int	pcap_set_buffer_size(pcap_t *, int);
-int	pcap_activate(pcap_t *);
-
-int	pcap_list_tstamp_types(pcap_t *, int **);
-void	pcap_free_tstamp_types(int *);
-int	pcap_tstamp_type_name_to_val(const char *);
-const char *pcap_tstamp_type_val_to_name(int);
-const char *pcap_tstamp_type_val_to_description(int);
-
-/*
- * Time stamp types.
- * Not all systems and interfaces will necessarily support all of these.
- *
- * A system that supports PCAP_TSTAMP_HOST is offering time stamps
- * provided by the host machine, rather than by the capture device,
- * but not committing to any characteristics of the time stamp;
- * it will not offer any of the PCAP_TSTAMP_HOST_ subtypes.
- *
- * PCAP_TSTAMP_HOST_LOWPREC is a time stamp, provided by the host machine,
- * that's low-precision but relatively cheap to fetch; it's normally done
- * using the system clock, so it's normally synchronized with times you'd
- * fetch from system calls.
- *
- * PCAP_TSTAMP_HOST_HIPREC is a time stamp, provided by the host machine,
- * that's high-precision; it might be more expensive to fetch.  It might
- * or might not be synchronized with the system clock, and might have
- * problems with time stamps for packets received on different CPUs,
- * depending on the platform.
- *
- * PCAP_TSTAMP_ADAPTER is a high-precision time stamp supplied by the
- * capture device; it's synchronized with the system clock.
- *
- * PCAP_TSTAMP_ADAPTER_UNSYNCED is a high-precision time stamp supplied by
- * the capture device; it's not synchronized with the system clock.
- *
- * Note that time stamps synchronized with the system clock can go
- * backwards, as the system clock can go backwards.  If a clock is
- * not in sync with the system clock, that could be because the
- * system clock isn't keeping accurate time, because the other
- * clock isn't keeping accurate time, or both.
- *
- * Note that host-provided time stamps generally correspond to the
- * time when the time-stamping code sees the packet; this could
- * be some unknown amount of time after the first or last bit of
- * the packet is received by the network adapter, due to batching
- * of interrupts for packet arrival, queueing delays, etc..
- */
-#define PCAP_TSTAMP_HOST		0	/* host-provided, unknown characteristics */
-#define PCAP_TSTAMP_HOST_LOWPREC	1	/* host-provided, low precision */
-#define PCAP_TSTAMP_HOST_HIPREC		2	/* host-provided, high precision */
-#define PCAP_TSTAMP_ADAPTER		3	/* device-provided, synced with the system clock */
-#define PCAP_TSTAMP_ADAPTER_UNSYNCED	4	/* device-provided, not synced with the system clock */
-
-pcap_t	*pcap_open_live(const char *, int, int, int, char *);
-pcap_t	*pcap_open_dead(int, int);
-pcap_t	*pcap_open_offline(const char *, char *);
-#if defined(WIN32)
-pcap_t  *pcap_hopen_offline(intptr_t, char *);
-#if !defined(LIBPCAP_EXPORTS)
-#define pcap_fopen_offline(f,b) \
-	pcap_hopen_offline(_get_osfhandle(_fileno(f)), b)
-#else /*LIBPCAP_EXPORTS*/
-static pcap_t *pcap_fopen_offline(FILE *, char *);
-#endif
-#else /*WIN32*/
-pcap_t	*pcap_fopen_offline(FILE *, char *);
-#endif /*WIN32*/
-
-void	pcap_close(pcap_t *);
-int	pcap_loop(pcap_t *, int, pcap_handler, u_char *);
-int	pcap_dispatch(pcap_t *, int, pcap_handler, u_char *);
-const u_char*
-	pcap_next(pcap_t *, struct pcap_pkthdr *);
-int 	pcap_next_ex(pcap_t *, struct pcap_pkthdr **, const u_char **);
-void	pcap_breakloop(pcap_t *);
-int	pcap_stats(pcap_t *, struct pcap_stat *);
-int	pcap_setfilter(pcap_t *, struct bpf_program *);
-int 	pcap_setdirection(pcap_t *, pcap_direction_t);
-int	pcap_getnonblock(pcap_t *, char *);
-int	pcap_setnonblock(pcap_t *, int, char *);
-int	pcap_inject(pcap_t *, const void *, size_t);
-int	pcap_sendpacket(pcap_t *, const u_char *, int);
-const char *pcap_statustostr(int);
-const char *pcap_strerror(int);
-char	*pcap_geterr(pcap_t *);
-void	pcap_perror(pcap_t *, char *);
-int	pcap_compile(pcap_t *, struct bpf_program *, const char *, int,
-	    bpf_u_int32);
-int	pcap_compile_nopcap(int, int, struct bpf_program *,
-	    const char *, int, bpf_u_int32);
-void	pcap_freecode(struct bpf_program *);
-int	pcap_offline_filter(const struct bpf_program *,
-	    const struct pcap_pkthdr *, const u_char *);
-int	pcap_datalink(pcap_t *);
-int	pcap_datalink_ext(pcap_t *);
-int	pcap_list_datalinks(pcap_t *, int **);
-int	pcap_set_datalink(pcap_t *, int);
-void	pcap_free_datalinks(int *);
-int	pcap_datalink_name_to_val(const char *);
-const char *pcap_datalink_val_to_name(int);
-const char *pcap_datalink_val_to_description(int);
-int	pcap_snapshot(pcap_t *);
-int	pcap_is_swapped(pcap_t *);
-int	pcap_major_version(pcap_t *);
-int	pcap_minor_version(pcap_t *);
-
-/* XXX */
-FILE	*pcap_file(pcap_t *);
-int	pcap_fileno(pcap_t *);
-
-pcap_dumper_t *pcap_dump_open(pcap_t *, const char *);
-pcap_dumper_t *pcap_dump_fopen(pcap_t *, FILE *fp);
-FILE	*pcap_dump_file(pcap_dumper_t *);
-long	pcap_dump_ftell(pcap_dumper_t *);
-int	pcap_dump_flush(pcap_dumper_t *);
-void	pcap_dump_close(pcap_dumper_t *);
-void	pcap_dump(u_char *, const struct pcap_pkthdr *, const u_char *);
-
-int	pcap_findalldevs(pcap_if_t **, char *);
-void	pcap_freealldevs(pcap_if_t *);
-
-const char *pcap_lib_version(void);
-
-/*
- * On at least some versions of NetBSD, we don't want to declare
- * bpf_filter() here, as it's also be declared in <net/bpf.h>, with a
- * different signature, but, on other BSD-flavored UN*Xes, it's not
- * declared in <net/bpf.h>, so we *do* want to declare it here, so it's
- * declared when we build pcap-bpf.c.
- */
-#ifndef __NetBSD__
-u_int	bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); 
-#endif
-int	bpf_validate(const struct bpf_insn *f, int len);
-char	*bpf_image(struct bpf_insn *, int);
-void	bpf_dump(struct bpf_program *, int);
-
-#if defined(WIN32)
-
-/*
- * Win32 definitions
- */
-
-int pcap_setbuff(pcap_t *p, int dim);
-int pcap_setmode(pcap_t *p, int mode);
-int pcap_setmintocopy(pcap_t *p, int size);
-
-#ifdef WPCAP
-/* Include file with the wpcap-specific extensions */
-#include <Win32-Extensions.h>
-#endif /* WPCAP */
-
-#define MODE_CAPT 0
-#define MODE_STAT 1
-#define MODE_MON 2
-
-#elif defined(MSDOS)
-
-/*
- * MS-DOS definitions
- */
-
-int  pcap_stats_ex (pcap_t *, struct pcap_stat_ex *);
-void pcap_set_wait (pcap_t *p, void (*yield)(void), int wait);
-u_long pcap_mac_packets (void);
-
-#else /* UN*X */
-
-/*
- * UN*X definitions
- */
-
-int	pcap_get_selectable_fd(pcap_t *);
-
-#endif /* WIN32/MSDOS/UN*X */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* lib_pcap_pcap_h */
diff --git a/include.new/pccard/cardinfo.h b/include.new/pccard/cardinfo.h
deleted file mode 100644
index 375b40d..0000000
--- a/include.new/pccard/cardinfo.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *	Include file for PCMCIA user process interface
- *
- *-------------------------------------------------------------------------
- */
-/*-
- * Copyright (c) 1995 Andrew McRae.  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 ``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 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/pccard/cardinfo.h,v 1.30 2005/01/07 02:29:17 imp Exp $ */
-
-#ifndef	_PCCARD_CARDINFO_H_
-#define	_PCCARD_CARDINFO_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-#define	PIOCGSTATE	_IOR('P', 1, struct slotstate)	/* Get slot state */
-#define	PIOCGMEM	_IOWR('P', 2, struct mem_desc)	/* Get memory map */
-#define	PIOCSMEM	_IOW('P', 3, struct mem_desc)	/* Set memory map */
-#define	PIOCGIO		_IOWR('P', 4, struct io_desc)	/* Get I/O map */
-#define	PIOCSIO		_IOW('P', 5, struct io_desc)	/* Set I/O map */
-#define PIOCSDRV	_IOWR('P', 6, struct dev_desc)	/* Set driver */
-#define PIOCRWFLAG	_IOW('P', 7, int)	/* Set flags for drv use */
-#define PIOCRWMEM	_IOWR('P', 8, unsigned long) /* Set mem for drv use */
-#define PIOCSPOW	_IOW('P', 9, struct power) /* Set power structure */
-#define PIOCSVIR	_IOW('P', 10, int)	/* Virtual insert/remove */
-#define PIOCSBEEP	_IOW('P', 11, int)		/* Select Beep */
-#define PIOCSRESOURCE	_IOWR('P', 12, struct pccard_resource)	/* get resource info */
-/*
- *	Debug codes.
- */
-#define PIOCGREG	_IOWR('P',100, struct pcic_reg)	/* get reg */
-#define PIOCSREG	_IOW('P', 101, struct pcic_reg)	/* Set reg */
-
-/*
- *	Slot states for PIOCGSTATE
- *
- *	Here's a state diagram of all the possible states:
- *
- *                             power x 1
- *                       -------------------
- *                      /                   \
- *                     /                     v
- *    resume    +----------+   power x 0   +----------+
- *      ------->| inactive |<--------------| filled   |
- *     /        +----------+               +----------+
- *    /           /     \                   ^   |
- *  nil <---------       \        insert or |   | suspend or
- *        suspend         \       power x 1 |   | eject
- *                         \                |   v
- *                          \            +----------+
- *                           ----------->|  empty   |
- *                             eject     +----------+
- *
- *	Note, the above diagram is for the state.  On suspend, the laststate
- * gets set to suspend to tell pccardd what happened.  Also the nil state
- * means that when the no state change has happened.  Note: if you eject
- * while suspended in the inactive state, you will return to the
- * empty state if you do not insert a new card and to the inactive state
- * if you do insert a new card.
- *
- * Some might argue that inactive should be sticky forever and
- * eject/insert shouldn't take it out of that state.  They might be
- * right.  On the other hand, some would argue that eject resets all
- * state.  They might be right.  They both can't be right.  The above
- * represents a reasonable compromise between the two.
- *
- * Some bridges allow one to query to see if the card was changed while
- * we were suspended.  Others do not.  We make no use of this functionality
- * at this time.
- */
-enum cardstate { noslot, empty, suspend, filled, inactive };
-
-/*
- *	Descriptor structure for memory map.
- */
-struct mem_desc {
-	int	window;		/* Memory map window number (0-4) */
-	int	flags;		/* Flags - see below */
-	caddr_t	start;		/* System memory start */
-	int	size;		/* Size of memory area */
-	unsigned long card;	/* Card memory address */
-};
-
-#define	MDF_16BITS	0x01	/* Memory is 16 bits wide */
-#define	MDF_ZEROWS	0x02	/* Set no wait states for memory */
-#define	MDF_WS0		0x04	/* Wait state flags */
-#define	MDF_WS1		0x08
-#define	MDF_ATTR	0x10	/* Memory is attribute memory */
-#define	MDF_WP		0x20	/* Write protect memory */
-#define	MDF_ACTIVE	0x40	/* Context active (read-only) */
-
-/*
- *	Descriptor structure for I/O map
- */
-struct io_desc {
-	int	window;		/* I/O map number (0-1) */
-	int	flags;		/* Flags - see below */
-	int	start;		/* I/O port start */
-	int	size;		/* Number of port addresses */
-};
-
-#define	IODF_WS		0x01	/* Set wait states for 16 bit I/O access */
-#define	IODF_16BIT	0x02	/* I/O access are 16 bit */
-#define	IODF_CS16	0x04	/* Allow card selection of 16 bit access */
-#define	IODF_ZEROWS	0x08	/* No wait states for 8 bit I/O */
-#define	IODF_ACTIVE	0x10	/* Context active (read-only) */
-
-/*
- *	Device descriptor for allocation of driver.
- */
-#define DEV_MISC_LEN	36
-#define DEV_MAX_CIS_LEN	40
-struct dev_desc {
-	char		name[16];	/* Driver name */
-	int		unit;		/* Driver unit number */
-	unsigned long	mem;		/* Memory address of driver */
-	int		memsize;	/* Memory size (if used) */
-	int		iobase;		/* base of I/O ports */
-	int		iosize;		/* Length of I/O ports */
-	int		irqmask;	/* Interrupt number(s) to allocate */
-	int		flags;		/* Device flags */
-	uint8_t		misc[DEV_MISC_LEN]; /* For any random info */
-	uint8_t		manufstr[DEV_MAX_CIS_LEN];
-	uint8_t		versstr[DEV_MAX_CIS_LEN];
-	uint8_t		cis3str[DEV_MAX_CIS_LEN];
-	uint8_t		cis4str[DEV_MAX_CIS_LEN];
-	uint32_t	manufacturer;	/* Manufacturer ID */
-	uint32_t	product;	/* Product ID */
-	uint32_t	prodext;	/* Product ID (extended) */
-};
-#if __FreeBSD_version < 5000000		/* 4.x compatibility only. */
-#define PIOCSDRVOLD	_IOWR('P', 6, struct dev_desc_old) /* Set driver */
-struct dev_desc_old {
-	char		name[16];	/* Driver name */
-	int		unit;		/* Driver unit number */
-	unsigned long	mem;		/* Memory address of driver */
-	int		memsize;	/* Memory size (if used) */
-	int		iobase;		/* base of I/O ports */
-	int		iosize;		/* Length of I/O ports */
-	int		irqmask;	/* Interrupt number(s) to allocate */
-	int		flags;		/* Device flags */
-	uint8_t		misc[DEV_MISC_LEN]; /* For any random info */
-	uint8_t		manufstr[DEV_MAX_CIS_LEN];
-	uint8_t		versstr[DEV_MAX_CIS_LEN];
-	uint32_t	manufacturer;	/* Manufacturer ID */
-	uint32_t	product;	/* Product ID */
-	uint32_t	prodext;	/* Product ID (extended) */
-};
-#endif
-#define DEV_DESC_HAS_SIZE 1
-
-struct pcic_reg {
-	unsigned char reg;
-	unsigned char value;
-};
-
-/*
- *	Slot information. Used to read current status of slot.
- */
-struct slotstate {
-	enum cardstate	state;		/* Current state of slot */
-	enum cardstate	laststate;	/* Previous state of slot */
-	int		maxmem;		/* Max allowed memory windows */
-	int		maxio;		/* Max allowed I/O windows */
-	int		irqs;		/* Bitmap of IRQs allowed */
-	int		flags;		/* Capability flags */
-};
-
-/*
- *	The power values are in volts * 10, e.g. 5V is 50, 3.3V is 33.
- */
-struct power {
-	int		vcc;
-	int		vpp;
-};
-
-/*
- *	The PC-Card resource IOC_GET_RESOURCE_RANGE
- */
-struct pccard_resource {
-	int		type;
-	u_long		size;
-	u_long		min;
-	u_long		max;
-	u_long		resource_addr;
-};
-
-
-/*
- *	Other system limits
- */
-#define MAXSLOT 16
-#define	NUM_MEM_WINDOWS	10
-#define	NUM_IO_WINDOWS	6
-#define	CARD_DEVICE	"/dev/card%d"		/* String for snprintf */
-#define	PCCARD_MEMSIZE	(4*1024)
-
-#endif /* !_PCCARD_CARDINFO_H_ */
diff --git a/include.new/pccard/cis.h b/include.new/pccard/cis.h
deleted file mode 100644
index adaa57c..0000000
--- a/include.new/pccard/cis.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- *	PCMCIA card structures and defines.
- *	These defines relate to the user level
- *	structures and card information, not
- *	driver/process communication.
- *-------------------------------------------------------------------------
- */
-/*-
- * Copyright (c) 1995 Andrew McRae.  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 ``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 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/pccard/cis.h,v 1.5 2005/01/07 02:29:17 imp Exp $
- *
- */
-
-/*
- *	Card Information Structure tuples definitions
- *	The structure of a tuple is basically:
- *
- *		Tuple_code
- *		Tuple_data_length
- *		Tuple_data ...
- *
- *	Tuples are contiguous in attribute memory, and
- *	are terminated with a 0xFF for the tuple code or
- *	the tuple length.
- */
-#ifndef	_PCCARD_CIS_H
-#define	_PCCARD_CIS_H
-
-#define	CIS_NULL	0	/* Empty tuple */
-#define	CIS_MEM_COMMON	0x01	/* Device descriptor, common memory */
-#define	CIS_LONGLINK_CB	0x02	/* Long link to next chain for CardBus */
-#define	CIS_INDIRECT	0x03	/* Indirect access */
-#define	CIS_CONF_MAP_CB	0x04	/* Card Configuration map for CardBus */
-#define	CIS_CONFIG_CB	0x05	/* Card Configuration entry for CardBus */
-#define	CIS_LONGLINK_MFC	0x06	/* Long link to next chain for Multi function card */
-#define	CIS_BAR		0x07	/* Base address register for CardBus */
-#define	CIS_CHECKSUM	0x10	/* Checksum */
-#define	CIS_LONGLINK_A	0x11	/* Link to Attribute memory */
-#define	CIS_LONGLINK_C	0x12	/* Link to Common memory */
-#define	CIS_LINKTARGET	0x13	/* Linked tuple must start with this. */
-#define	CIS_NOLINK	0x14	/* Assume no common memory link tuple. */
-#define	CIS_INFO_V1	0x15	/* Card info data, version 1 */
-#define	CIS_ALTSTR	0x16	/* Alternate language string tuple. */
-#define	CIS_MEM_ATTR	0x17	/* Device descriptor, Attribute memory */
-#define	CIS_JEDEC_C	0x18	/* JEDEC descr for common memory */
-#define	CIS_JEDEC_A	0x19	/* JEDEC descr for Attribute memory */
-#define	CIS_CONF_MAP	0x1A	/* Card Configuration map */
-#define	CIS_CONFIG	0x1B	/* Card Configuration entry */
-#define	CIS_DEVICE_OC	0x1C	/* Other conditions info - common memory */
-#define	CIS_DEVICE_OA	0x1D	/* Other conditions info - attribute memory */
-#define	CIS_DEVICEGEO	0x1E	/* Geometry info for common memory */
-#define	CIS_DEVICEGEO_A	0x1F	/* Geometry info for attribute memory */
-#define	CIS_MANUF_ID	0x20	/* Card manufacturer's ID */
-#define	CIS_FUNC_ID	0x21	/* Function of card */
-#define	CIS_FUNC_EXT	0x22	/* Functional extension */
-/*
- *	Data recording format tuples.
- */
-#define	CIS_SW_INTERLV	0x23	/* Software interleave */
-#define	CIS_VERS_2	0x40	/* Card info data, version 2 */
-#define	CIS_FORMAT	0x41	/* Memory card format */
-#define	CIS_GEOMETRY	0x42	/* Disk sector layout */
-#define	CIS_BYTEORDER	0x43	/* Byte order of memory data */
-#define	CIS_DATE	0x44	/* Format data/time */
-#define	CIS_BATTERY	0x45	/* Battery replacement date */
-#define	CIS_ORG		0x46	/* Organization of data on card */
-#define	CIS_END		0xFF	/* Termination code */
-
-/*
- *	Internal tuple definitions.
- *
- *	Device descriptor for memory (CIS_MEM_ATTR, CIS_MEM_COMMON)
- *
- *	Byte 1:
- *		0xF0 - Device type
- *		0x08 - Write protect switch
- *		0x07 - Speed index (7 = extended speed)
- *	Byte 2: Extended speed (bit 7 = another follows)
- *	Byte 3: (ignored if 0xFF)
- *		0xF8 - Addressable units (0's numbered)
- *		0x07 - Unit size
- *	The three byte sequence is repeated until byte 1 == 0xFF
- */
-
-/*
- *	CIS_INFO_V1 - Version one card information.
- *
- *	Byte 1:   Major version number (should be 4)
- *	Byte 2:   Minor version number (should be 1)
- *	Byte 3-x: Null terminated Manufacturer name
- *	Byte x-x: Null terminated product name
- *	Byte x-x: Null terminated additional info 1
- *	Byte x-x: Null terminated additional info 2
- *	Byte x:   final byte must be 0xFF
- */
-#define	CIS_MAJOR_VERSION	4
-#define	CIS_MINOR_VERSION	1
-
-/*
- *	CIS_CONF_MAP - Provides an address map for the card
- *			configuration register(s), and a max value
- *			identifying the last configuration tuple.
- *
- *	Byte 1:
- *		0x3C - Register mask size (0's numbered)
- *		0x03 - Register address size (0's numbered)
- *	Byte 2:
- *		0x3F - ID of last configuration.
- *	Byte 3-n: Card register address (size is determined by
- *			the value in byte 1).
- *	Byte x-x: Card register masks (size determined by the
- *			value in byte 1)
- */
-
-/*
- *	CIS_CONFIG - Card configuration entry. Multiple tuples may
- *		exist of this type, each one describing a different
- *		memory/I-O map that can be used to address this card.
- *		The first one usually has extra config data about the
- *		card features. The final configuration tuple number
- *		is stored in the CIS_CONF_MAP tuple so that the complete
- *		list can be scanned.
- *
- *	Byte 1:
- *		0x3F - Configuration ID number.
- *		0x40 - Indicates this is the default configuration
- *		0x80 - Interface byte exists
- *	Byte 2: (exists only if bit 0x80 set in byte 1)
- *		0x0F - Interface type value
- *		0x10 - Battery voltage detect
- *		0x20 - Write protect active
- *		0x40 - RdyBsy active bit
- *		0x80 - Wait signal required
- *	Byte 3: (features byte)
- *		0x03 - Power sub-tuple(s) exists
- *		0x04 - Timing sub-tuple exists
- *		0x08 - I/O space sub-tuple exists
- *		0x10 - IRQ sub-tuple exists
- *		0x60 - Memory space sub-tuple(s) exists
- *		0x80 - Miscellaneous sub-tuple exists
- */
-#define	CIS_FEAT_POWER(x)	((x) & 0x3)
-#define	CIS_FEAT_TIMING		0x4
-#define	CIS_FEAT_I_O		0x8
-#define	CIS_FEAT_IRQ		0x10
-#define	CIS_FEAT_MEMORY(x)	(((x) >> 5) & 0x3)
-#define	CIS_FEAT_MISC		0x80
-/*
- *	Depending on whether the "features" byte has the corresponding
- *	bit set, a number of sub-tuples follow. Some features have
- *	more than one sub-tuple, depending on the count within the
- *	features byte (e.g power feature bits allows up to 3 sub-tuples).
- *
- *	Power structure sub-tuple:
- *	Byte 1: parameter exists - Each bit (starting from 0x01) indicates
- *		that a parameter block exists - up to 8 parameter blocks
- *		are therefore allowed).
- *	Byte 2:
- *		0x7F - Parameter data
- *		0x80 - More bytes follow (0 = last byte)
- *
- *	Timing sub-tuple
- *	Byte 1:
- *		0x03 - Wait scale
- *		0x1C - Ready scale
- *		0xE0 - Reserved scale
- *	Byte 2: extended wait scale if wait scale != 3
- *	Byte 3: extended ready scale if ready scale != 7
- *	Byte 4: extended reserved scale if reserved scale != 7
- */
-#define	CIS_WAIT_SCALE(x)	((x) & 0x3)
-#define	CIS_READY_SCALE(x)	(((x)>>2) & 0x7)
-#define	CIS_RESERVED_SCALE(x)	(((x)>>5) & 0x7)
-/*
- *	I/O mapping sub-tuple:
- *	Byte 1:
- *		0x1F - I/O address lines
- *		0x20 - 8 bit I/O
- *		0x40 - 16 bit I/O
- *		0x80 - I/O range??
- *	Byte 2:
- *		0x0F - 0's numbered count of I/O block subtuples following.
- *		0x30 - Size of I/O address value within subtuple. Values
- *			can be 1 (8 bits), 2 (16 bits) or 3 (32 bits).
- *		0xC0 - Size of I/O port block size value within subtuple.
- *	I/O block sub-tuples, count from previous block:
- *		Byte 1-n: I/O start address
- *		Byte x-x: Size of I/O port block.
- */
-#define	CIS_IO_ADDR(x)	((x) & 0x1F)
-#define	CIS_IO_8BIT	0x20
-#define	CIS_IO_16BIT	0x40
-#define	CIS_IO_RANGE	0x80
-#define	CIS_IO_BLKS(x)	((x) & 0xF)
-#define	CIS_IO_ADSZ(x)	(((x)>>4) & 3)
-#define	CIS_IO_BLKSZ(x)	(((x)>>6) & 3)
-/*
- *	IRQ sub-tuple.
- *	Byte 1:
- *		0x0F - Irq number or mask bits
- *		0x10 - IRQ mask values exist
- *		0x20 - Level triggered interrupts
- *		0x40 - Pulse triggered requests
- *		0x80 - Interrupt sharing.
- *	Byte 2-3: Interrupt req mask (if 0x10 of byte 1 set).
- */
-#define	CIS_IRQ_IRQN(x)		((x) & 0xF)
-#define	CIS_IRQ_MASK		0x10
-#define	CIS_IRQ_LEVEL		0x20
-#define	CIS_IRQ_PULSE		0x40
-#define	CIS_IRQ_SHARING		0x80
-/*
- *	Memory block subtuple. Depending on the features bits, the
- *	following subtuples are used:
- *	mem features == 1
- *		Byte 1-2: upper 16 bits of 24 bit memory length.
- *	mem features == 2
- *		Byte 1-2: upper 16 bits of 24 bit memory length.
- *		Byte 3-4: upper 16 bits of 24 bit memory address.
- *	mem_features == 3
- *		Byte 1:
- *			0x07 - 0's numbered count of memory sub-tuples
- *			0x18 - Memory length size (1's numbered)
- *			0x60 - Memory address size (1's numbered)
- *			0x80 - Host address value exists
- *		Memory sub-tuples follow:
- *			Byte 1-n: Memory length value (<< 8)
- *			Byte n-n: Memory card address value (<< 8)
- *			Byte n-n: Memory host address value (<< 8)
- */
-#define	CIS_FEAT_MEM_NONE	0	/* No memory config */
-#define	CIS_FEAT_MEM_LEN	1	/* Just length */
-#define	CIS_FEAT_MEM_ADDR	2	/* Card address & length */
-#define	CIS_FEAT_MEM_WIN	3	/* Multiple windows */
-
-#define	CIS_MEM_WINS(x)		(((x) & 0x7)+1)
-#define	CIS_MEM_LENSZ(x)	(((x) >> 3) & 0x3)
-#define	CIS_MEM_ADDRSZ(x)	(((x) >> 5) & 0x3)
-#define	CIS_MEM_HOST		0x80
-/*
- *	Misc sub-tuple.
- *	Byte 1:
- *	Byte 2:
- *		0x0c - DMA Request Signal
- *                      00 - not support DMA
- *                      01 - use SPKR# line
- *                      10 - use IOIS16# line
- *                      11 - use INPACK# line
- *		0x10 - DMA Width
- *                      0 - 8 bit DMA
- *                      1 - 16 bit DMA
- */
-#define	CIS_MISC_DMA_WIDTH(x)	(((x) & 0x10) >> 4)
-#define	CIS_MISC_DMA_REQ(x)	(((x) >> 2) & 0x3)
-
-#endif	/* _PCCARD_CIS_H */
diff --git a/include.new/pccard/driver.h b/include.new/pccard/driver.h
deleted file mode 100644
index 2559073..0000000
--- a/include.new/pccard/driver.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*-
- * pccard driver interface.
- * Bruce Evans, November 1995.
- * This file is in the public domain.
- *
- * $FreeBSD: src/sys/pccard/driver.h,v 1.14 2001/03/22 05:49:18 imp Exp $
- */
-
-#ifndef _PCCARD_DRIVER_H_
-#define	_PCCARD_DRIVER_H_
-
-struct pccard_device;
-
-void	pccard_add_driver(struct pccard_device *);
-
-enum beepstate { BEEP_OFF, BEEP_ON };
-
-void	pccard_insert_beep(void);
-void	pccard_remove_beep(void);
-void	pccard_success_beep(void);
-void	pccard_failure_beep(void);
-int	pccard_beep_select(int);
-
-#endif /* !_PCCARD_DRIVER_H_ */
diff --git a/include.new/pccard/i82365.h b/include.new/pccard/i82365.h
deleted file mode 100644
index c0ed0be..0000000
--- a/include.new/pccard/i82365.h
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- *	i82365.h - Definitions for Intel 82365 PCIC
- *	PCMCIA Card Interface Controller
- *
- * originally by Barry Jaspan; hacked over by Keith Moore
- * hacked to unrecognisability by Andrew McRae (andrew@mega.com.au)
- *
- * Updated 3/3/95 to include Cirrus Logic stuff.
- *-------------------------------------------------------------------------
- */
-/*-
- * Copyright (c) 2001 M. Warner Losh.  All rights reserved.
- * Copyright (c) 1995 Andrew McRae.  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 ``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 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/pccard/i82365.h,v 1.29 2005/01/07 02:29:17 imp Exp $
- */
-
-#define	PCIC_I82365	0		/* Intel i82365SL-A/B or clone */
-#define	PCIC_IBM	1		/* IBM clone */
-#define	PCIC_VLSI	2		/* VLSI chip */
-#define	PCIC_PD6722	3		/* Cirrus logic PD6722 */
-#define	PCIC_PD6710	4		/* Cirrus logic PD6710 */
-#define	PCIC_VG365	5		/* Vadem 365 */
-#define	PCIC_VG465      6		/* Vadem 465 */
-#define	PCIC_VG468	7		/* Vadem 468 */
-#define	PCIC_VG469	8		/* Vadem 469 */
-#define	PCIC_RF5C296	9		/* Ricoh RF5C296 */
-#define	PCIC_RF5C396	10		/* Ricoh RF5C396 */
-#define	PCIC_IBM_KING	11		/* IBM KING PCMCIA Controller */
-#define PCIC_I82365SL_DF 12		/* Intel i82365sl-DF step */
-#define PCIC_PD6729	13		/* Cirrus Logic PD6729 */
-#define PCIC_PD673X	14		/* Cirrus Logic PD673x */
-
-/*
- *	Address of the controllers. Each controller can manage
- *	two PCMCIA slots. Up to 8 slots are supported in total.
- *	The PCIC controller is accessed via an index port and a
- *	data port. The index port has the 8 bit address of the
- *	register accessed via the data port. How I long for
- *	real memory mapped I/O!
- *	The top two bits of the index address are used to
- *	identify the port number, and the lower 6 bits
- *	select one of the 64 possible data registers.
- */
-#define PCIC_INDEX	0			/* Index register */
-#define PCIC_DATA	1			/* Data register */
-#define PCIC_NPORT	2			/* Number of ports */
-#define PCIC_PORT_0	0x3e0			/* index reg, chips 0 and 1 */
-
-/*
- *	Register index addresses.
- */
-#define PCIC_ID_REV	0x00	/* Identification and Revision */
-#define PCIC_STATUS	0x01	/* Interface Status */
-#define PCIC_POWER	0x02	/* Power and RESETDRV control */
-#define PCIC_INT_GEN	0x03	/* Interrupt and General Control */
-#define PCIC_STAT_CHG	0x04	/* Card Status Change */
-#define PCIC_STAT_INT	0x05	/* Card Status Change Interrupt Config */
-#define PCIC_ADDRWINE	0x06	/* Address Window Enable */
-#define PCIC_IOCTL	0x07	/* I/O Control */
-#define PCIC_IO0	0x08	/* I/O Address 0 */
-#define PCIC_IO1	0x0c	/* I/O Address 1 */
-#define	PCIC_MEMBASE	0x10	/* Base of memory window registers */
-#define PCIC_CDGC	0x16	/* Card Detect and General Control */
-#define PCIC_MISC1	0x16	/* PD67xx: Misc control register 1 per slot */
-#define PCIC_GLO_CTRL	0x1e	/* Global Control Register */
-#define PCIC_MISC2	0x1e	/* PD67xx: Misc control register 2 per chip */
-#define PCIC_CLCHIP	0x1f	/* PD67xx: Chip I/D */
-#define PCIC_EXT_IND	0x2e	/* PD67xx: Extended Index */
-#define PCIC_EXTENDED	0x2f	/* PD67xx: Extended register */
-#define PCIC_CVSR	0x2f	/* Vadem: Voltage select register */
-#define PCIC_RICOH_MCR2 0x2f	/* Ricoh: Mode Control Register 2 */
-
-#define PCIC_VMISC	0x3a	/* Vadem: Misc control register */
-#define PCIC_RICOH_ID	0x3a	/* Ricoh: ID register */
-
-#define PCIC_TOPIC_FCR	0x3e	/* Toshiba ToPIC: Function Control Register */
-
-#define	PCIC_TIME_SETUP0	0x3a
-#define	PCIC_TIME_CMD0		0x3b
-#define	PCIC_TIME_RECOV0	0x3c
-#define	PCIC_TIME_SETUP1	0x3d
-#define	PCIC_TIME_CMD1		0x3e
-#define	PCIC_TIME_RECOV1	0x3f
-
-/* Yenta only registers */
-#define PCIC_MEMORY_HIGH0	0x40	/* A31..A25 of mapping addres for */
-#define PCIC_MEMORY_HIGH1	0x41	/* the memory windows. */
-#define PCIC_MEMORY_HIGH2	0x42
-#define PCIC_MEMORY_HIGH3	0x43
-
-
-#define	PCIC_SLOT_SIZE	0x40	/* Size of register set for one slot */
-
-/* Now register bits, ordered by reg # */
-
-/* For Identification and Revision (PCIC_ID_REV) */
-#define PCIC_INTEL0	0x82	/* Intel 82365SL Rev. 0; Both Memory and I/O */
-#define PCIC_INTEL1	0x83	/* Intel 82365SL Rev. 1; Both Memory and I/O */
-#define PCIC_INTEL2	0x84	/* Intel 82365SL step D */
-#define PCIC_VLSI82C146	0x84	/* VLSI 82C146 */
-#define PCIC_IBM1	0x88	/* IBM PCIC clone; Both Memory and I/O */
-#define PCIC_IBM2	0x89	/* IBM PCIC clone; Both Memory and I/O */
-#define PCIC_IBM3	0x8a	/* IBM KING PCIC clone; Both Memory and I/O */
-
-/* For Interface Status register (PCIC_STATUS) */
-#define PCIC_VPPV	0x80	/* Vpp_valid or reserved*/
-#define PCIC_RICOH_5VCARD 0x80	/* 5V card detected */
-#define PCIC_POW	0x40	/* PC Card power active */
-#define PCIC_READY	0x20	/* Ready/~Busy */
-#define PCIC_MWP	0x10	/* Memory Write Protect */
-#define PCIC_CD		0x0C	/* Both card detect bits */
-#define PCIC_BVD	0x03	/* Both Battery Voltage Detect bits */
-
-/* For the Power and RESETDRV register (PCIC_POWER) */
-#define PCIC_OUTENA	0x80	/* Output Enable */
-#define PCIC_DISRST	0x40	/* Disable RESETDRV */
-#define PCIC_APSENA	0x20	/* Auto Pwer Switch Enable */
-#define PCIC_PCPWRE	0x10	/* PC Card Power Enable */
-#define	PCIC_VCC	0x18	/* Vcc control bits */
-#define	PCIC_VCC_5V	0x10	/* 5 volts */
-#define	PCIC_VCC_ON	0x10	/* Turn on VCC on some chips. */
-#define	PCIC_VCC_3V	0x18	/* 3 volts */
-#define	PCIC_VCC_5V_KING	0x14	/* 5 volts for KING PCIC */
-#define	PCIC_VPP	0x03	/* Vpp control bits */
-#define	PCIC_VPP_5V	0x01	/* 5 volts */
-#define	PCIC_VPP_12V	0x02	/* 12 volts */
-
-/* For the Interrupt and General Control register (PCIC_INT_GEN) */
-#define PCIC_CARDRESET	0x40	/* Card reset 0 = Reset, 1 = Normal */
-#define PCIC_CARDTYPE	0x20	/* Card Type 0 = memory, 1 = I/O */
-#define		PCIC_IOCARD	0x20
-#define		PCIC_MEMCARD	0x00
-#define	PCIC_INTR_ENA	0x10	/* PCI CSC Interrupt enable */
-
-/* For the Card Status Change register (PCIC_STAT_CHG) */
-#define PCIC_CDTCH	0x08	/* Card Detect Change */
-#define PCIC_RDYCH	0x04	/* Ready Change */
-#define PCIC_BATWRN	0x02	/* Battery Warning */
-#define PCIC_BATDED	0x01	/* Battery Dead */
-
-/* For the Card status change interrupt PCIC_STAT_INT */
-#define PCIC_CSCSELECT		0xf0	/* CSCSELECT */
-#define PCIC_SI_IRQ_SHIFT	4
-#define PCIC_CDEN		0x8
-#define PCIC_READYEN		0x4
-#define PCIC_BATWARNEN		0x2
-#define PCIC_BATDEADEN		0x1
-
-/*
- * For the Address Window Enable Register (PCIC_ADDRWINE)
- * The lower 5 bits contain enable bits for the memory
- * windows (LSB = memory window 0).
- */
-#define PCIC_MEMCS16	0x20	/* ~MEMCS16 Decode A23-A12 */
-#define PCIC_IO0_EN	0x40	/* I/O Window 0 Enable */
-#define PCIC_IO1_EN	0x80	/* I/O Window 1 Enable */
-
-/*
- * For the I/O Control Register (PCIC_IOCTL)
- * The lower nybble is the flags for I/O window 0
- * The upper nybble is the flags for I/O window 1
- */
-#define PCIC_IO_16BIT	0x01	/* I/O to this segment is 16 bit */
-#define PCIC_IO_CS16	0x02	/* I/O cs16 source is the card */
-#define PCIC_IO_0WS	0x04	/* zero wait states added on 8 bit cycles */
-#define PCIC_IO_WS	0x08	/* Wait states added for 16 bit cycles */
-
-/*
- *	The memory window registers contain the start and end
- *	physical host address that the PCIC maps to the card,
- *	and an offset calculated from the card memory address.
- *	All values are shifted down 12 bits, so allocation is
- *	done in 4Kb blocks. Only 12 bits of each value is
- *	stored, limiting the range to the ISA address size of
- *	24 bits. The upper 4 bits of the most significant byte
- *	within the values are used for various flags.
- *
- *	The layout is:
- *
- *	base+0 : lower 8 bits of system memory start address
- *	base+1 : upper 4 bits of system memory start address + flags
- *	base+2 : lower 8 bits of system memory end address
- *	base+3 : upper 4 bits of system memory end address + flags
- *	base+4 : lower 8 bits of offset to card address
- *	base+5 : upper 4 bits of offset to card address + flags
- *
- *	The following two bytes are reserved for other use.
- */
-#define	PCIC_MEMSIZE	8
-/*
- *	Flags for system memory start address upper byte
- */
-#define PCIC_ZEROWS	0x40	/* Zero wait states */
-#define PCIC_DATA16	0x80	/* Data width is 16 bits */
-
-/*
- *	Flags for system memory end address upper byte
- */
-#define PCIC_MW0	0x40	/* Wait state bit 0 */
-#define PCIC_MW1	0x80	/* Wait state bit 1 */
-
-/*
- *	Flags for card offset upper byte
- */
-#define PCIC_REG	0x40	/* Attribute/Common select (why called Reg?) */
-#define PCIC_WP		0x80	/* Write-protect this window */
-
-/* For Card Detect and General Control register (PCIC_CDGC) */
-#define PCIC_16_DL_INH	0x01	/* 16-bit memory delay inhibit */
-#define PCIC_CNFG_RST_EN 0x02	/* configuration reset enable */
-#define PCIC_GPI_EN	0x04	/* GPI Enable */
-#define PCIC_GPI_TRANS	0x08	/* GPI Transition Control */
-#define PCIC_CDRES_EN	0x10	/* card detect resume enable */
-#define PCIC_SW_CD_INT	0x20	/* s/w card detect interrupt */
-#define PCIC_VS1STAT	0x40	/* 0 VS1# low, 1 VS1# high */
-#define PCIC_VS2STAT	0x80	/* 0 VS2# low, 1 VS2# high */
-
-/* CL-PD67[12]x: For 3.3V cards, etc. (PCIC_MISC1) */
-#define PCIC_MISC1_5V_DETECT 0x01	/* PD6710 only */
-#define PCIC_MISC1_VCC_33    0x02	/* Set Vcc is 3.3V, else 5.0V */
-#define PCIC_MISC1_PMINT     0x04	/* Pulse management intr */
-#define PCIC_MISC1_PCINT     0x08	/* Pulse card interrupt */
-#define PCIC_MISC1_SPEAKER   0x10	/* Enable speaker */
-#define PCIC_MISC1_INPACK    0x80	/* INPACK throttles data */
-
-/* i82365B and newer (!PD67xx) Global Control register (PCIC_GLO_CTRL) */
-#define PCIC_PWR_DOWN	0x01	/* power down */
-#define PCIC_LVL_MODE	0x02	/* level mode interrupt enable */
-#define PCIC_WB_CSCINT	0x04	/* explicit write-back csc intr */
-/* Rev B only */
-#define PCIC_IRQ0_LEVEL 0x08	/* irq 14 pulse mode enable */
-#define PCIC_IRQ1_LEVEL 0x10
-
-/* CL-PD67[12]x: For Misc. Control Register 2 (PCIC_MISC2) */
-#define PCIC_LPDM_EN	0x02	/* Cirrus PD672x: low power dynamic mode */
-
-/* CL-PD67[12]x: Chip info (PCIC_CLCHIP) */
-#define PCIC_CLC_TOGGLE 0xc0		/* These bits toggle 1 -> 0 */
-#define PCIC_CLC_DUAL	0x20		/* Single/dual socket version */
-
-/* Cirrus Logic: Extended Registers (PCIC_EXT_IND) */
-#define PCIC_EXT_DATA	0x0a		/* External Data */
-
-/* EXT_DATA */
-#define PCIC_VS1A	0x01
-#define PCIC_VS2A	0x02
-#define PCIC_VS1B	0x04
-#define PCIC_VS2B	0x08
-
-/* Cirrus Logic: Extended register Extension Control 1 */
-#define PCIC_EXTCTRL1	0x03
-#define PCIC_EC1_VCC_LOCK 0x1		/* Vcc Power locked to s/w change */
-#define PCIC_EC1_AUTO_POWER_CLEAR 0x2	/* Vcc power cleared on eject? */
-#define PCIC_EC1_LED_ENABLE 0x4		/* LED activity enable */
-#define PCIC_EC1_CARD_IRQ_INV 0x8	/* Card IRQ level inverted for pci? */
-#define PCIC_EC1_CSC_IRQ_INV 0x10	/* CSC IRQ level inverted for pci? */
-#define PCIC_EC1_PULLUP 0x20		/* Dis pullup when 1. */
-
-/* Vadem: Card Voltage Select register (PCIC_CVSR) */
-#define PCIC_CVSR_VS	0x03		/* Voltage select */
-#define PCIC_CVSR_VS_5	0x00		/* 5.0 V */
-#define PCIC_CVSR_VS_33a 0x01		/* alt 3.3V */
-#define PCIC_CVSR_VS_XX	0x02		/* X.XV when available */
-#define PCIC_CVSR_VS_33 0x03		/* 3.3V */
-
-/* Ricoh: Misc Control Register 2 (PCIC_RICOH_MCR2) */
-#define PCIC_MCR2_VCC_33 0x01		/* 3.3V */
-
-/* Vadem: misc register (PCIC_VMISC) */
-#define PCIC_VADEMREV	0x40
-
-/* Ricoh: ID register values (PCIC_RICOH_ID) */
-#define PCIC_RID_296	0x32
-#define PCIC_RID_396	0xb2
-
-/* Toshiba ToPIC: Function Control Register */
-#define PCIC_FCR_3V_EN		0x01	/* Enable 3V cards */
-#define PCIC_FCR_VS_EN		0x02	/* Voltage Sense enable */
-
-/*
- *	Mask of allowable interrupts.
- *
- *	For IBM-AT machines, irqs 3, 4, 5, 7, 9, 10, 11, 12, 14, 15 are
- *	allowed.  Nearly all IBM-AT machines with pcic cards or bridges
- *	wire these interrupts (or a subset thereof) to the corresponding
- *	pins on the ISA bus.  Some older laptops are reported to not route
- *	all the interrupt pins to the bus because the designers knew that
- *	some would conflict with builtin devices.
- *
- *	For NEC PC98 machines, irq 3, 5, 6, 9, 10, 11, 12, 13 are allowed.
- *	These correspond to the C-BUS signals INT 0, 1, 2, 3, 41, 42, 5, 6
- *	respectively.  This is with the desktop C-BUS addin card.
- *
- *	Hiroshi TSUKADA-san writes in FreeBSD98-testers that cbus IRQ
- *	6 is routed to the IRQ 7 pin of the pcic in pc98 cbus based
- *	cards.  I do not know how pc98 laptop models are wired.
- */
-#ifdef PC98
-#define	PCIC_INT_MASK_ALLOWED	0x3E68		/* PC98 */
-#else
-#define	PCIC_INT_MASK_ALLOWED	0xDEB8		/* AT */
-#endif
-
-#define	PCIC_IO_WIN	2
-#define	PCIC_MEM_WIN	5
-
-#define	PCIC_CARD_SLOTS	4
-#define PCIC_MAX_CARDS	2
-#define PCIC_MAX_SLOTS (PCIC_MAX_CARDS * PCIC_CARD_SLOTS)
-
-/* Plug and play */
-#define PCIC_PNP_ACTIONTEC	0x1802A904	/* AEI0218 */
-#define PCIC_PNP_IBM3765	0x65374d24	/* IBM3765 */
-#define PCIC_PNP_82365		0x000ED041	/* PNP0E00 */
-#define PCIC_PNP_CL_PD6720	0x010ED041	/* PNP0E01 */
-#define PCIC_PNP_VLSI_82C146	0x020ED041	/* PNP0E02 */
-#define PCIC_PNP_82365_CARDBUS	0x030ED041	/* PNP0E03 */
-#define PCIC_PNP_SCM_SWAPBOX	0x69046d4c	/* SMC0469 */
-
-/* C-Bus PnP Definitions */
-#define PCIC_NEC_PC9801_102	0x9180a3b8	/* NEC8091 PC-9801-102 */
-#define	PCIC_NEC_PC9821RA_E01	0x2181a3b8	/* NEC8121 PC-9821RA-E01 */
diff --git a/include.new/pccard/meciareg.h b/include.new/pccard/meciareg.h
deleted file mode 100644
index a528d17..0000000
--- a/include.new/pccard/meciareg.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * meciareg.h
- *
- * PC9801 original PCMCIA controller code for NS/A,Ne,NX/C,NR/L.
- * by Noriyuki Hosobuchi <hoso@ce.mbn.or.jp>
- *
- * $FreeBSD: src/sys/pccard/meciareg.h,v 1.2 2001/05/15 23:53:18 imp Exp $
- */
-
-/*--- I/O port definition */
-#define	MECIA_REG0		0x0a8e	/* byte */
-#define	MECIA_REG1		0x1a8e	/* byte */
-#define	MECIA_REG2		0x2a8e	/* byte */
-#define	MECIA_REG3		0x3a8e	/* byte : Interrupt */
-#define	MECIA_REG4		0x4a8e	/* word : PC98 side I/O base */
-#define	MECIA_REG5		0x5a8e	/* word : Card side I/O base */
-#define	MECIA_REG7		0x7a8e	/* byte */
-
-#define	MECIA_REG_WINSEL	0x1e8e	/* byte : win bank select register */
-#define	MECIA_REG_PAGOFS	0x0e8e	/* word */
-
-/* PC98_REG_WINSEL */
-#define	MECIA_MAPWIN		0x84	/* map Card on 0xda0000 - 0xdbffff */
-#define	MECIA_UNMAPWIN		0x00
-
-/* MECIA_REG1 */
-#define	MECIA_CARDEXIST		0x08	/* 1:exist 0:not exist */
-
-/* MECIA_REG2 */
-#define	MECIA_MAPIO		0x80	/* 1:I/O 0:Memory */
-#define	MECIA_IOTHROUGH		0x40	/* 0:I/O map 1:I/O addr-through */
-#define	MECIA_8BIT		0x20	/* bit width 1:8bit 0:16bit */
-#define	MECIA_MAP128		0x10	/* I/O map size 1:128byte 0:16byte */
-#define	MECIA_VCC3P3V		0x02	/* Vcc 1:3.3V 0:5.0V */
-
-/* MECIA_REG3 */
-#define	MECIA_INT0		(0xf8 + 0x0)	/* INT0(IRQ3) */
-#define	MECIA_INT1		(0xf8 + 0x1)	/* INT1(IRQ5) */
-#define	MECIA_INT2		(0xf8 + 0x2)	/* INT2(IRQ6) */
-#define	MECIA_INT4		(0xf8 + 0x4)	/* INT4(IRQ10) */
-#define	MECIA_INT5		(0xf8 + 0x5)	/* INT5(IRQ12) */
-#define	MECIA_INTDISABLE	(0xf8 + 0x7)	/* disable interrupt */
-
-/* MECIA_REG7 */
-#define	MECIA_ATTRMEM		0x20	/* 1:attr mem 0:common mem */
-#define	MECIA_VPP12V		0x10	/* Vpp 0:5V 1:12V */
-
-
-#ifdef KERNEL
-extern int mecia_mode;		/* in 'pccard/pcic.c' */
-#define mecia_8bit_on()	\
-	if (mecia_mode & MECIA_8BIT)	\
-		outb(MECIA_REG2, inb(MECIA_REG2) | MECIA_8BIT)
-#define mecia_8bit_off()	\
-	if (mecia_mode & MECIA_8BIT)	\
-		outb(MECIA_REG2, inb(MECIA_REG2) & ~MECIA_8BIT)
-#define mecia_map128()		(mecia_mode & MECIA_MAP128)
-#endif
-
-#define	MECIA_INT_MASK_ALLOWED	0x3E68		/* PC98 */
diff --git a/include.new/pccard/pccard_nbk.h b/include.new/pccard/pccard_nbk.h
deleted file mode 100644
index 085d5a7..0000000
--- a/include.new/pccard/pccard_nbk.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 1999, 2001 M. Warner Losh.  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.
- *
- * 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/pccard/pccard_nbk.h,v 1.7 2005/01/07 02:29:17 imp Exp $
- */
-
-#ifndef PCCARD_PCCARD_NBK_H
-#define PCCARD_PCCARD_NBK_H
-
-SYSCTL_DECL(_machdep_pccard);
-
-struct pccard_device;
-extern devclass_t pccard_devclass;
-
-#endif /* ! PCCARD_PCCARD_NBK_H */
diff --git a/include.new/pccard/pcic_pci.h b/include.new/pccard/pcic_pci.h
deleted file mode 100644
index 07bc7d7..0000000
--- a/include.new/pccard/pcic_pci.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*-
- * Copyright (c) 2001 M. Warner Losh. All rights reserved.
- * Copyright (c) 1997 Ted Faber. 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 immediately at the beginning of the file, without modification,
- *    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. Absolutely no warranty of function or purpose is made by the author
- *    Ted Faber.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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/pccard/pcic_pci.h,v 1.37 2005/01/07 02:29:17 imp Exp $
- */
-
-/* Share the devid database with NEWCARD */
-#include <dev/pccbb/pccbbdevid.h>
-
-/* CL-PD683x CardBus defines */
-#define	CLPD6833_CFG_MISC_1		0x98
-
-/* Configuration constants */
-#define	CLPD6832_BCR_MGMT_IRQ_ENA	0x0800
-#define CLPD6833_CM1_MGMT_EXCA_ENA	0x0001	/* Set ExCA, Clr PCI */
-
-/* End of CL-PD6832 defines */
-/* Texas Instruments PCI-1130/1131 CardBus Controller */
-#define TI113X_PCI_SYSTEM_CONTROL	0x80	/* System Control */
-#define TI12XX_PCI_MULTIMEDIA_CONTROL	0x84	/* Zoom Video */
-#define TI12XX_PCI_MFUNC		0x8c	/* multifunction pins */
-#define TI113X_PCI_RETRY_STATUS		0x90	/* Retry Status */
-#define TI113X_PCI_CARD_CONTROL		0x91	/* Card Control */
-#define TI113X_PCI_DEVICE_CONTROL	0x92	/* Device Control */
-#define TI113X_PCI_BUFFER_CONTROL	0x93	/* Buffer Control */
-#define TI12XX_PCI_DIAGNOSTIC		0x93	/* Diagnostic register */
-#define TI113X_PCI_SOCKET_DMA0		0x94	/* Socket DMA Register 0 */
-#define TI113X_PCI_SOCKET_DMA1		0x98	/* Socket DMA Register 1 */
-
-/* Card control register (TI113X_SYSTEM_CONTROL == 0x80) */
-#define TI113X_SYSCNTL_INTRTIE		0x20000000u
-#define TI12XX_SYSCNTL_PCI_CLOCK	0x08000000u
-#define TI113X_SYSCNTL_SMIENB		0x00800000u
-#define TI113X_SYSCNTL_VCC_PROTECT	0x00200000u
-#define TI113X_SYSCNTL_CLKRUN_SEL	0x00000080u
-#define	TI113X_SYSCNTL_PWRSAVINGS	0x00000040u
-#define TI113X_SYSCNTL_KEEP_CLK		0x00000002u
-#define TI113X_SYSCNTL_CLKRUN_ENA	0x00000001u
-
-/* MFUNC register (TI12XX_MFUNC == 0x8c) */
-#define TI12XX_MFUNC_PIN0		0x0000000fu
-#define   TI12XX_MFUNC_PIN0_INTA	0x2
-#define TI12XX_MFUNC_PIN1		0x000000f0u
-#define   TI12XX_MFUNC_PIN1_INTB	0x20
-#define TI12XX_MFUNC_PIN2		0x00000f00u
-#define TI12XX_MFUNC_PIN3		0x0000f000u
-#define TI12XX_MFUNC_PIN4		0x000f0000u
-#define TI12XX_MFUNC_PIN5		0x00f00000u
-#define TI12XX_MFUNC_PIN6		0x0f000000u
-
-/* Card control register (TI113X_CARD_CONTROL == 0x91) */
-#define TI113X_CARDCNTL_RING_ENA	0x80u
-#define TI113X_CARDCNTL_ZOOM_VIDEO	0x40u
-#define TI113X_CARDCNTL_PCI_IRQ_ENA	0x20u
-#define TI113X_CARDCNTL_PCI_IREQ	0x10u
-#define TI113X_CARDCNTL_PCI_CSC		0x08u
-#define	TI113X_CARDCNTL_MASK		(TI113X_CARDCNTL_PCI_IRQ_ENA | TI113X_CARDCNTL_PCI_IREQ | TI113X_CARDCNTL_PCI_CSC)
-#define	TI113X_FUNC0_VALID		TI113X_CARDCNTL_MASK
-#define	TI113X_FUNC1_VALID		(TI113X_CARDCNTL_PCI_IREQ | TI113X_CARDCNTL_PCI_CSC)
-/* Reserved bit				0x04u */
-#define TI113X_CARDCNTL_SPKR_ENA	0x02u
-#define TI113X_CARDCNTL_INT		0x01u
-
-/* Device control register (TI113X_DEVICE_CONTROL == 0x92) */
-#define	TI113X_DEVCNTL_5V_SOCKET	0x40u
-#define	TI113X_DEVCNTL_3V_SOCKET	0x20u
-#define	TI113X_DEVCNTL_INTR_MASK	0x06u
-#define	TI113X_DEVCNTL_INTR_NONE	0x00u
-#define	TI113X_DEVCNTL_INTR_ISA		0x02u
-#define	TI113X_DEVCNTL_INTR_SERIAL	0x04u
-/* TI12XX specific code */
-#define	TI12XX_DEVCNTL_INTR_ALLSERIAL	0x06u
-
-/* Diagnostic register (misnamed) TI12XX_PCI_DIAGNOSTIC == 0x93 */
-#define TI12XX_DIAG_CSC_INTR		0x20	/* see datasheet */
-
-/* Texas Instruments PCI-1130/1131 CardBus Controller */
-#define	TI113X_ExCA_IO_OFFSET0		0x36	/* Offset of I/O window */
-#define	TI113X_ExCA_IO_OFFSET1		0x38	/* Offset of I/O window */
-#define	TI113X_ExCA_MEM_WINDOW_PAGE	0x3C	/* Memory Window Page */
-
-/*
- * Ricoh R5C47[5678] parts have these registers.  Maybe the 46x also use
- * them, but I can't find out for sure without datasheets...
- */
-#define	R5C47X_MISC_CONTROL_REGISTER_2	0xa0
-#define R5C47X_MCR2_CSC_TO_INTX_DISABLE 0x0010	/* Bit 7 */
-
-/*
- * Special resister definition for Toshiba ToPIC95/97
- * These values are borrowed from pcmcia-cs/Linux.
- */
-#define TOPIC_SOCKET_CTRL  0x90
-# define TOPIC_SOCKET_CTRL_SCR_IRQSEL 0x00000001 /* PCI intr */
-
-#define TOPIC_SLOT_CTRL    0xa0
-# define TOPIC_SLOT_CTRL_SLOTON       0x00000080
-# define TOPIC_SLOT_CTRL_SLOTEN       0x00000040
-# define TOPIC_SLOT_CTRL_ID_LOCK      0x00000020
-# define TOPIC_SLOT_CTRL_ID_WP        0x00000010
-# define TOPIC_SLOT_CTRL_PORT_MASK    0x0000000c
-# define TOPIC_SLOT_CTRL_PORT_SHIFT            2
-# define TOPIC_SLOT_CTRL_OSF_MASK     0x00000003
-# define TOPIC_SLOT_CTRL_OSF_SHIFT             0
-
-# define TOPIC_SLOT_CTRL_INTB         0x00002000
-# define TOPIC_SLOT_CTRL_INTA         0x00001000
-# define TOPIC_SLOT_CTRL_INT_MASK     0x00003000
-# define TOPIC_SLOT_CTRL_CLOCK_MASK   0x00000c00
-# define TOPIC_SLOT_CTRL_CLOCK_2      0x00000800 /* PCI Clock/2 */
-# define TOPIC_SLOT_CTRL_CLOCK_1      0x00000400 /* PCI Clock */
-# define TOPIC_SLOT_CTRL_CLOCK_0      0x00000000 /* no clock */
-# define TOPIC97_SLOT_CTRL_STSIRQP    0x00000400 /* status change intr pulse */
-# define TOPIC97_SLOT_CTRL_IRQP       0x00000200 /* function intr pulse */
-# define TOPIC97_SLOT_CTRL_PCIINT     0x00000100 /* intr routing to PCI INT */
-
-# define TOPIC_SLOT_CTRL_CARDBUS      0x80000000
-# define TOPIC_SLOT_CTRL_VS1          0x04000000
-# define TOPIC_SLOT_CTRL_VS2          0x02000000
-# define TOPIC_SLOT_CTRL_SWDETECT     0x01000000
-
-#define TOPIC_REG_CTRL     0x00a4
-# define TOPIC_REG_CTRL_RESUME_RESET  0x80000000
-# define TOPIC_REG_CTRL_REMOVE_RESET  0x40000000
-# define TOPIC97_REG_CTRL_CLKRUN_ENA  0x20000000
-# define TOPIC97_REG_CTRL_TESTMODE    0x10000000
-# define TOPIC97_REG_CTRL_IOPLUP      0x08000000
-# define TOPIC_REG_CTRL_BUFOFF_PWROFF 0x02000000
-# define TOPIC_REG_CTRL_BUFOFF_SIGOFF 0x01000000
-# define TOPIC97_REG_CTRL_CB_DEV_MASK 0x0000f800
-# define TOPIC97_REG_CTRL_CB_DEV_SHIFT 11
-# define TOPIC97_REG_CTRL_RI_DISABLE  0x00000004
-# define TOPIC97_REG_CTRL_CAUDIO_OFF  0x00000002
-# define TOPIC_REG_CTRL_CAUDIO_INVERT 0x00000001
-
-/* For Bridge Control register (CB_PCI_BRIDGE_CTRL) */
-#define CB_BCR_MASTER_ABORT	0x0020
-#define CB_BCR_CB_RESET		0x0040
-#define CB_BCR_INT_EXCA		0x0080
-#define CB_BCR_WRITE_POST_EN	0x0400
-  /* additional bits for Ricoh's cardbus products */
-#define CB_BCR_RL_3E0_EN	0x0800
-#define CB_BCR_RL_3E2_EN	0x1000
-
-/* PCI Configuration Registers (common) */
-#define	CB_PCI_VENDOR_ID	0x00	/* vendor ID */
-#define	CB_PCI_DEVICE_ID	0x02	/* device ID */
-#define	CB_PCI_COMMAND		0x04	/* PCI command */
-#define	CB_PCI_STATUS		0x06	/* PCI status */
-#define	CB_PCI_REVISION_ID	0x08	/* PCI revision ID */
-#define	CB_PCI_CLASS		0x09	/* PCI class code */
-#define	CB_PCI_CACHE_LINE_SIZE	0x0c	/* Cache line size */
-#define	CB_PCI_LATENCY		0x0d	/* PCI latency timer */
-#define	CB_PCI_HEADER_TYPE	0x0e	/* PCI header type */
-#define	CB_PCI_BIST		0x0f	/* Built-in self test */
-#define	CB_PCI_SOCKET_BASE	0x10	/* Socket/ExCA base address reg. */
-#define	CB_PCI_CB_STATUS	0x16	/* CardBus Status */
-#define	CB_PCI_PCI_BUS_NUM	0x18	/* PCI bus number */
-#define	CB_PCI_CB_BUS_NUM	0x19	/* CardBus bus number */
-#define	CB_PCI_CB_SUB_BUS_NUM	0x1A	/* Subordinate CardBus bus number */
-#define	CB_PCI_CB_LATENCY	0x1A	/* CardBus latency timer */
-#define	CB_PCI_MEMBASE0		0x1C	/* Memory base register 0 */
-#define	CB_PCI_MEMLIMIT0	0x20	/* Memory limit register 0 */
-#define	CB_PCI_MEMBASE1		0x24	/* Memory base register 1 */
-#define	CB_PCI_MEMLIMIT1	0x28	/* Memory limit register 1 */
-#define	CB_PCI_IOBASE0		0x2C	/* I/O base register 0 */
-#define	CB_PCI_IOLIMIT0		0x30	/* I/O limit register 0 */
-#define	CB_PCI_IOBASE1		0x34	/* I/O base register 1 */
-#define	CB_PCI_IOLIMIT1		0x38	/* I/O limit register 1 */
-#define	CB_PCI_INT_LINE		0x3C	/* Interrupt Line */
-#define	CB_PCI_INT_PIN		0x3D	/* Interrupt Pin */
-#define	CB_PCI_BRIDGE_CTRL	0x3E	/* Bridge Control */
-#define	CB_PCI_SUBSYS_VENDOR_ID	0x40	/* Subsystem Vendor ID */
-#define	CB_PCI_SUBSYS_ID	0x42	/* Subsystem ID */
-#define	CB_PCI_LEGACY16_IOADDR	0x44	/* Legacy 16bit I/O address */
-#define	CB_PCI_LEGACY16_IOENABLE 0x01	/* Enable Legacy 16bit I/O address */
-
-/* PCI Memory register offsets for YENTA devices */
-#define CB_SOCKET_EVENT		0x00
-#define CB_SOCKET_MASK		0x04
-#define CB_SOCKET_STATE		0x08
-#define CB_SOCKET_FORCE		0x0c
-#define CB_SOCKET_POWER		0x10
-#define CB_EXCA_OFFSET		0x800	/* Offset for ExCA registers */
-
-#define CB_SE_CD		0x6	/* Socket Event Card detect */
-#define CB_SE_POWER		0x8
-
-#define CB_SM_CD		0x6	/* Socket MASK Card detect */
-#define CB_SM_POWER		0x8
-
-/* Socket State Register */
-#define CB_SS_CARDSTS		0x00000001 /* Card Status Change */
-#define CB_SS_CD1		0x00000002 /* Card Detect 1 */
-#define CB_SS_CD2		0x00000004 /* Card Detect 2 */
-#define CB_SS_CD		0x00000006 /* Card Detect all */
-#define CB_SS_PWRCYCLE		0x00000008 /* Power Cycle */
-#define CB_SS_16BIT		0x00000010 /* 16-bit Card */
-#define CB_SS_CB		0x00000020 /* Cardbus Card */
-#define CB_SS_IREQ		0x00000040 /* Ready */
-#define CB_SS_NOTCARD		0x00000080 /* Unrecognized Card */
-#define CB_SS_DATALOST		0x00000100 /* Data Lost */
-#define CB_SS_BADVCC		0x00000200 /* Bad VccRequest */
-#define CB_SS_5VCARD		0x00000400 /* 5 V Card */
-#define CB_SS_3VCARD		0x00000800 /* 3.3 V Card */
-#define CB_SS_XVCARD		0x00001000 /* X.X V Card */
-#define CB_SS_YVCARD		0x00002000 /* Y.Y V Card */
-#define CB_SS_CARD_MASK		0x00003c00 /* *VCARD signal */
-#define CB_SS_5VSOCK		0x10000000 /* 5 V Socket */
-#define CB_SS_3VSOCK		0x20000000 /* 3.3 V Socket */
-#define CB_SS_XVSOCK		0x40000000 /* X.X V Socket */
-#define CB_SS_YVSOCK		0x80000000 /* Y.Y V Socket */
-
-/* Socket power register */
-#define CB_SP_CLKSTOP		0x80	/* Cardbus clock stop protocol */
-#define CB_SP_VCC_MASK		0x70
-#define CB_SP_VCC_0V		0x00
-					/* 0x10 is reserved 12V in VPP */
-#define CB_SP_VCC_5V		0x20
-#define CB_SP_VCC_3V		0x30
-#define CB_SP_VCC_XV		0x40
-#define CB_SP_VCC_YV		0x50
-					/* 0x60 and 0x70 are reserved */
-#define CB_SP_VPP_MASK		0x07
-#define CB_SP_VPP_0V		0x00
-#define CB_SP_VPP_12V		0x01
-#define CB_SP_VPP_5V		0x02
-#define CB_SP_VPP_3V		0x03
-#define CB_SP_VPP_XV		0x04
-#define CB_SP_VPP_YV		0x05
-
-/* Socket force register */
-#define CB_SF_INTCVS		(1 << 14)	/* Interregate CVS/CCD pins */
-#define CB_SF_5VCARD		(1 << 11)
-#define CB_SF_3VCARD		(1 << 10)
-#define CB_SF_BADVCC		(1 << 9)
-#define CB_SF_DATALOST		(1 << 8)
-#define CB_SF_NOTACARD		(1 << 7)
-#define CB_SF_CBCARD		(1 << 5)
-#define CB_SF_16CARD		(1 << 4)
-#define CB_SF_POWERCYCLE	(1 << 3)
-#define CB_SF_CCD2		(1 << 2)
-#define CB_SF_CCD1		(1 << 1)
-#define CB_SF_CSTCHG		(1 << 0)
-					/* 0x6 and 0x7 are reserved */
diff --git a/include.new/pccard/pcicvar.h b/include.new/pccard/pcicvar.h
deleted file mode 100644
index 1b4ea38..0000000
--- a/include.new/pccard/pcicvar.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * Copyright (c) 2001 M. Warner Losh.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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/pccard/pcicvar.h,v 1.30 2005/01/07 02:29:17 imp Exp $
- */
-
-/*
- *	Per-slot data table.
- */
-struct pcic_slot {
-	int offset;			/* Offset value for index */
-	char controller;		/* Device type */
-	char revision;			/* Device Revision */
-	struct slot *slt;		/* Back ptr to slot */
-	struct pcic_softc *sc;		/* Back pointer to softc */
-	u_int8_t (*getb)(struct pcic_slot *, int);
-	void   (*putb)(struct pcic_slot *, int, u_int8_t);
-	bus_space_tag_t bst;
-	bus_space_handle_t bsh;
-};
-
-enum pcic_intr_way { pcic_iw_isa = 1, pcic_iw_pci = 2 };
-
-struct pcic_softc 
-{
-	uint32_t		slotmask;/* Mask of valid slots */
-	uint32_t		flags;	/* Interesting flags */
-#define PCIC_AB_POWER	   0x00000001	/* Use old A/B step power */
-#define PCIC_DF_POWER	   0x00000002	/* Uses DF step regs  */
-#define PCIC_PD_POWER	   0x00000004	/* Uses CL-PD regs  */
-#define	PCIC_VG_POWER	   0x00000008	/* Uses VG power regs */
-#define PCIC_KING_POWER    0x00000010	/* Uses IBM KING regs  */
-#define PCIC_RICOH_POWER   0x00000020	/* Uses the ricoh power regs */
-#define PCIC_CARDBUS_POWER 0x00000040	/* Cardbus power regs */
-#define PCIC_YENTA_HIGH_MEMORY 0x0080	/* Can do high memory mapping */
-
-	enum pcic_intr_way	csc_route; /* How to route csc interrupts */
-	enum pcic_intr_way	func_route; /* How to route function ints */
-	int			iorid;	/* Rid of I/O region */
-	struct resource 	*iores;	/* resource for I/O region */
-	int			memrid;	/* Memory rid */
-	struct resource		*memres;/* Resource for memory mapped regs */
-	int			irqrid;	/* Irq rid */
-	struct resource		*irqres;/* Irq resource */
-	void			*ih;	/* Our interrupt handler. */
-	int			irq;
-	device_t		dev;	/* Our device */
-	void (*slot_poll)(void *);
-	struct callout_handle	timeout_ch;
-	struct pcic_slot	slots[PCIC_MAX_SLOTS];
-	int			cd_pending; /* debounce timeout active */
-	int			cd_present; /* debounced card-present state */
-	struct callout_handle	cd_ch;	/* handle for pcic_cd_insert */
-	struct pcic_chip	*chip;
-	driver_intr_t		*func_intr;
-	void			*func_arg;
-};
-
-typedef int (pcic_intr_way_t)(struct pcic_slot *, enum pcic_intr_way);
-typedef int (pcic_intr_mapirq_t)(struct pcic_slot *, int irq);
-typedef void (pcic_init_t)(device_t);
-
-struct pcic_chip
-{
-	pcic_intr_way_t *func_intr_way;
-	pcic_intr_way_t *csc_intr_way;
-	pcic_intr_mapirq_t *map_irq;
-	pcic_init_t	*init;
-};
-
-extern devclass_t	pcic_devclass;
-extern int		pcic_override_irq;
-
-int pcic_activate_resource(device_t dev, device_t child, int type, int rid,
-    struct resource *r);
-struct resource *pcic_alloc_resource(device_t dev, device_t child, int type,
-    int *rid, u_long start, u_long end, u_long count, u_int flags);
-int pcic_attach(device_t dev);
-void pcic_clrb(struct pcic_slot *sp, int reg, unsigned char mask);
-int pcic_deactivate_resource(device_t dev, device_t child, int type, int rid,
-    struct resource *r);
-void pcic_dealloc(device_t dev);
-void pcic_do_stat_delta(struct pcic_slot *sp);
-int pcic_get_memory_offset(device_t bus, device_t child, int rid,
-    uint32_t *offset);
-int pcic_get_res_flags(device_t bus, device_t child, int restype, int rid,
-    u_long *value);
-unsigned char pcic_getb_io(struct pcic_slot *sp, int reg);
-driver_intr_t	pcic_isa_intr;
-int		pcic_isa_intr1(void *);
-pcic_intr_mapirq_t pcic_isa_mapirq;
-void pcic_putb_io(struct pcic_slot *sp, int reg, unsigned char val);
-int pcic_set_memory_offset(device_t bus, device_t child, int rid,
-    uint32_t offset
-#if __FreeBSD_version >= 500000
-    , uint32_t *deltap
-#endif
-    );
-int pcic_set_res_flags(device_t bus, device_t child, int restype, int rid,
-    u_long value);
-void pcic_setb(struct pcic_slot *sp, int reg, unsigned char mask);
-int pcic_setup_intr(device_t dev, device_t child, struct resource *irq,
-    int flags, driver_intr_t *intr, void *arg, void **cookiep);
-int pcic_teardown_intr(device_t dev, device_t child, struct resource *irq,
-    void *cookie);
-timeout_t 	pcic_timeout;
diff --git a/include.new/pccard/slot.h b/include.new/pccard/slot.h
deleted file mode 100644
index d611def..0000000
--- a/include.new/pccard/slot.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- *	Slot structures for PC-CARD interface.
- *	Each slot has a controller specific structure
- *	attached to it. A slot number allows
- *	mapping from the character device to the
- *	slot structure. This is separate to the
- *	controller slot number to allow multiple controllers
- *	to be accessed.
- *-------------------------------------------------------------------------
- */
-
-/*-
- * Copyright (c) 1995 Andrew McRae.  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 ``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 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/pccard/slot.h,v 1.40 2005/01/07 02:29:17 imp Exp $
- */
-
-#ifndef _PCCARD_SLOT_H
-#define _PCCARD_SLOT_H
-
-/*
- * Normally we shouldn't include stuff here, but we're trying to be
- * compatible with the long, dark hand of the past.
- */
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <sys/rman.h>
-#include <machine/resource.h>
-#if __FreeBSD_version >= 500000
-#include <sys/selinfo.h>
-#else
-#include <sys/select.h>
-#endif
-
-/*
- *	Controller data - Specific to each slot controller.
- */
-struct slot;
-struct slot_ctrl {
-	void	(*mapirq)(struct slot *, int);
-				/* Map irq */
-	int	(*mapmem)(struct slot *, int);
-				/* Map memory */
-	int	(*mapio)(struct slot *, int);
-				/* Map io */
-	void	(*reset)(void *);
-				/* init */
-	void	(*disable)(struct slot *);
-				/* Disable slot */
-	int	(*power)(struct slot *);
-				/* Set power values */
-	int	(*ioctl)(struct slot *, int, caddr_t);
-				/* ioctl to lower level */
-	void	(*resume)(struct slot *);
-				/* suspend/resume support */
-	int	maxmem;		/* Number of allowed memory windows */
-	int	maxio;		/* Number of allowed I/O windows */
-};
-
-/*
- *	Device structure for cards. Each card may have one
- *	or more pccard drivers attached to it; each driver is assumed
- *	to require at most one interrupt handler, one I/O block
- *	and one memory block. This structure is used to link the different
- *	devices together.
- */
-struct pccard_devinfo {
-	uint8_t		name[128];
-	int		running;	/* Current state of driver */
-	uint8_t		misc[DEV_MISC_LEN]; /* For any random info */
-	uint8_t		manufstr[DEV_MAX_CIS_LEN];
-	uint8_t		versstr[DEV_MAX_CIS_LEN];
-	uint8_t		cis3str[DEV_MAX_CIS_LEN];
-	uint8_t		cis4str[DEV_MAX_CIS_LEN];
-	uint32_t	manufacturer;	/* Manufacturer ID */
-	uint32_t	product;	/* Product ID */
-	uint32_t	prodext;	/* Product ID (extended) */
-	struct slot	*slt;		/* Back pointer to slot */
-	struct resource_list resources;
-};
-
-/*
- *	Per-slot structure.
- */
-struct slot {
-	int slotnum;			/* Slot number */
-	int flags;			/* Slot flags (see below) */
-	int rwmem;			/* Read/write flags */
-	int irq;			/* IRQ allocated (0 = none) */
-
-	/*
-	 *	flags.
-	 */
-	unsigned int 	insert_seq;	/* Firing up under the card */
-	struct callout_handle insert_ch;/* Insert event timeout handle */
-	struct callout_handle poff_ch;	/* Power Off timeout handle */
-
-	enum cardstate 	state, laststate; /* Current/last card states */
-	struct selinfo	selp;		/* Info for select */
-	struct mem_desc	mem[NUM_MEM_WINDOWS];	/* Memory windows */
-	struct io_desc	io[NUM_IO_WINDOWS];	/* I/O windows */
-	struct power	pwr;		/* Power values */
-	struct slot_ctrl *ctrl;		/* Per-controller data */
-	void		*cdata;		/* Controller specific data */
-	int		pwr_off_pending;/* Power status of slot */
-	device_t	dev;		/* Config system device. */
-	struct cdev *d;		/* fs device */
-};
-
-#define PCCARD_DEVICE2SOFTC(d)	((struct slot *) device_get_softc(d))
-#define PCCARD_DEV2SOFTC(d)	((struct slot *) (d)->si_drv1)
-
-enum card_event { card_removed, card_inserted, card_deactivated };
-
-struct slot	*pccard_init_slot(device_t, struct slot_ctrl *);
-void		 pccard_event(struct slot *, enum card_event);
-int		 pccard_suspend(device_t);
-int		 pccard_resume(device_t);
-
-#endif /* !_PCCARD_SLOT_H */
diff --git a/include.new/pkcs10_asn1.h b/include.new/pkcs10_asn1.h
deleted file mode 100644
index c21e643..0000000
--- a/include.new/pkcs10_asn1.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libhx509/../../../crypto/heimdal/lib/hx509/pkcs10.asn1 */
-/* Do not edit */
-
-#ifndef __pkcs10_asn1_h__
-#define __pkcs10_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <rfc2459_asn1.h>
-/*
-CertificationRequestInfo ::= SEQUENCE {
-  version         INTEGER {
-    pkcs10_v1(0)
-  },
-  subject         Name,
-  subjectPKInfo   SubjectPublicKeyInfo,
-  attributes      [0] IMPLICIT SET OF Attribute OPTIONAL,
-}
-*/
-
-typedef struct CertificationRequestInfo {
-  heim_octet_string _save;
-  enum  {
-    pkcs10_v1 = 0
-} version;
-  Name subject;
-  SubjectPublicKeyInfo subjectPKInfo;
-  struct CertificationRequestInfo_attributes {
-    unsigned int len;
-    Attribute *val;
-  } *attributes;
-} CertificationRequestInfo;
-
-ASN1EXP int    ASN1CALL decode_CertificationRequestInfo(const unsigned char *, size_t, CertificationRequestInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertificationRequestInfo(unsigned char *, size_t, const CertificationRequestInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertificationRequestInfo(const CertificationRequestInfo *);
-ASN1EXP int    ASN1CALL copy_CertificationRequestInfo  (const CertificationRequestInfo *, CertificationRequestInfo *);
-ASN1EXP void   ASN1CALL free_CertificationRequestInfo  (CertificationRequestInfo *);
-
-
-/*
-CertificationRequest ::= SEQUENCE {
-  certificationRequestInfo   CertificationRequestInfo,
-  signatureAlgorithm         AlgorithmIdentifier,
-  signature                    BIT STRING {
-  },
-}
-*/
-
-typedef struct CertificationRequest {
-  CertificationRequestInfo certificationRequestInfo;
-  AlgorithmIdentifier signatureAlgorithm;
-  heim_bit_string signature;
-} CertificationRequest;
-
-ASN1EXP int    ASN1CALL decode_CertificationRequest(const unsigned char *, size_t, CertificationRequest *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertificationRequest(unsigned char *, size_t, const CertificationRequest *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertificationRequest(const CertificationRequest *);
-ASN1EXP int    ASN1CALL copy_CertificationRequest  (const CertificationRequest *, CertificationRequest *);
-ASN1EXP void   ASN1CALL free_CertificationRequest  (CertificationRequest *);
-
-
-#endif /* __pkcs10_asn1_h__ */
diff --git a/include.new/pkcs12_asn1.h b/include.new/pkcs12_asn1.h
deleted file mode 100644
index 5e8ffbc..0000000
--- a/include.new/pkcs12_asn1.h
+++ /dev/null
@@ -1,332 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/pkcs12.asn1 */
-/* Do not edit */
-
-#ifndef __pkcs12_asn1_h__
-#define __pkcs12_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <cms_asn1.h>
-#include <rfc2459_asn1.h>
-#include <heim_asn1.h>
-/* OBJECT IDENTIFIER id-pkcs-12 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_12;
-#define ASN1_OID_ID_PKCS_12 (&asn1_oid_id_pkcs_12)
-
-/* OBJECT IDENTIFIER id-pkcs-12PbeIds ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_12PbeIds;
-#define ASN1_OID_ID_PKCS_12PBEIDS (&asn1_oid_id_pkcs_12PbeIds)
-
-/* OBJECT IDENTIFIER id-pbeWithSHAAnd128BitRC4 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(1) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pbeWithSHAAnd128BitRC4;
-#define ASN1_OID_ID_PBEWITHSHAAND128BITRC4 (&asn1_oid_id_pbeWithSHAAnd128BitRC4)
-
-/* OBJECT IDENTIFIER id-pbeWithSHAAnd40BitRC4 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(1) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pbeWithSHAAnd40BitRC4;
-#define ASN1_OID_ID_PBEWITHSHAAND40BITRC4 (&asn1_oid_id_pbeWithSHAAnd40BitRC4)
-
-/* OBJECT IDENTIFIER id-pbeWithSHAAnd3-KeyTripleDES-CBC ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(1) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pbeWithSHAAnd3_KeyTripleDES_CBC;
-#define ASN1_OID_ID_PBEWITHSHAAND3_KEYTRIPLEDES_CBC (&asn1_oid_id_pbeWithSHAAnd3_KeyTripleDES_CBC)
-
-/* OBJECT IDENTIFIER id-pbeWithSHAAnd2-KeyTripleDES-CBC ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(1) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pbeWithSHAAnd2_KeyTripleDES_CBC;
-#define ASN1_OID_ID_PBEWITHSHAAND2_KEYTRIPLEDES_CBC (&asn1_oid_id_pbeWithSHAAnd2_KeyTripleDES_CBC)
-
-/* OBJECT IDENTIFIER id-pbeWithSHAAnd128BitRC2-CBC ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(1) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pbeWithSHAAnd128BitRC2_CBC;
-#define ASN1_OID_ID_PBEWITHSHAAND128BITRC2_CBC (&asn1_oid_id_pbeWithSHAAnd128BitRC2_CBC)
-
-/* OBJECT IDENTIFIER id-pbewithSHAAnd40BitRC2-CBC ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(1) label-less(6) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pbewithSHAAnd40BitRC2_CBC;
-#define ASN1_OID_ID_PBEWITHSHAAND40BITRC2_CBC (&asn1_oid_id_pbewithSHAAnd40BitRC2_CBC)
-
-/* OBJECT IDENTIFIER id-pkcs12-bagtypes ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(10) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs12_bagtypes;
-#define ASN1_OID_ID_PKCS12_BAGTYPES (&asn1_oid_id_pkcs12_bagtypes)
-
-/* OBJECT IDENTIFIER id-pkcs12-keyBag ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(10) label-less(1) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs12_keyBag;
-#define ASN1_OID_ID_PKCS12_KEYBAG (&asn1_oid_id_pkcs12_keyBag)
-
-/* OBJECT IDENTIFIER id-pkcs12-pkcs8ShroudedKeyBag ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(10) label-less(1) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs12_pkcs8ShroudedKeyBag;
-#define ASN1_OID_ID_PKCS12_PKCS8SHROUDEDKEYBAG (&asn1_oid_id_pkcs12_pkcs8ShroudedKeyBag)
-
-/* OBJECT IDENTIFIER id-pkcs12-certBag ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(10) label-less(1) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs12_certBag;
-#define ASN1_OID_ID_PKCS12_CERTBAG (&asn1_oid_id_pkcs12_certBag)
-
-/* OBJECT IDENTIFIER id-pkcs12-crlBag ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(10) label-less(1) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs12_crlBag;
-#define ASN1_OID_ID_PKCS12_CRLBAG (&asn1_oid_id_pkcs12_crlBag)
-
-/* OBJECT IDENTIFIER id-pkcs12-secretBag ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(10) label-less(1) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs12_secretBag;
-#define ASN1_OID_ID_PKCS12_SECRETBAG (&asn1_oid_id_pkcs12_secretBag)
-
-/* OBJECT IDENTIFIER id-pkcs12-safeContentsBag ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-12(12) label-less(10) label-less(1) label-less(6) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs12_safeContentsBag;
-#define ASN1_OID_ID_PKCS12_SAFECONTENTSBAG (&asn1_oid_id_pkcs12_safeContentsBag)
-
-/*
-PKCS12-MacData ::= SEQUENCE {
-  mac             DigestInfo,
-  macSalt         OCTET STRING,
-  iterations      INTEGER OPTIONAL,
-}
-*/
-
-typedef struct PKCS12_MacData {
-  DigestInfo mac;
-  heim_octet_string macSalt;
-  heim_integer *iterations;
-} PKCS12_MacData;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_MacData(const unsigned char *, size_t, PKCS12_MacData *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_MacData(unsigned char *, size_t, const PKCS12_MacData *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_MacData(const PKCS12_MacData *);
-ASN1EXP int    ASN1CALL copy_PKCS12_MacData  (const PKCS12_MacData *, PKCS12_MacData *);
-ASN1EXP void   ASN1CALL free_PKCS12_MacData  (PKCS12_MacData *);
-
-
-/*
-PKCS12-PFX ::= SEQUENCE {
-  version         INTEGER,
-  authSafe        ContentInfo,
-  macData         PKCS12-MacData OPTIONAL,
-}
-*/
-
-typedef struct PKCS12_PFX {
-  heim_integer version;
-  ContentInfo authSafe;
-  PKCS12_MacData *macData;
-} PKCS12_PFX;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_PFX(const unsigned char *, size_t, PKCS12_PFX *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_PFX(unsigned char *, size_t, const PKCS12_PFX *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_PFX(const PKCS12_PFX *);
-ASN1EXP int    ASN1CALL copy_PKCS12_PFX  (const PKCS12_PFX *, PKCS12_PFX *);
-ASN1EXP void   ASN1CALL free_PKCS12_PFX  (PKCS12_PFX *);
-
-
-/*
-PKCS12-AuthenticatedSafe ::= SEQUENCE OF ContentInfo
-*/
-
-typedef struct PKCS12_AuthenticatedSafe {
-  unsigned int len;
-  ContentInfo *val;
-} PKCS12_AuthenticatedSafe;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_AuthenticatedSafe(const unsigned char *, size_t, PKCS12_AuthenticatedSafe *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_AuthenticatedSafe(unsigned char *, size_t, const PKCS12_AuthenticatedSafe *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_AuthenticatedSafe(const PKCS12_AuthenticatedSafe *);
-ASN1EXP int    ASN1CALL copy_PKCS12_AuthenticatedSafe  (const PKCS12_AuthenticatedSafe *, PKCS12_AuthenticatedSafe *);
-ASN1EXP void   ASN1CALL free_PKCS12_AuthenticatedSafe  (PKCS12_AuthenticatedSafe *);
-
-
-/*
-PKCS12-Attribute ::= SEQUENCE {
-  attrId            OBJECT IDENTIFIER,
-  attrValues      heim_any_set,
-}
-*/
-
-typedef struct PKCS12_Attribute {
-  heim_oid attrId;
-  heim_any_set attrValues;
-} PKCS12_Attribute;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_Attribute(const unsigned char *, size_t, PKCS12_Attribute *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_Attribute(unsigned char *, size_t, const PKCS12_Attribute *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_Attribute(const PKCS12_Attribute *);
-ASN1EXP int    ASN1CALL copy_PKCS12_Attribute  (const PKCS12_Attribute *, PKCS12_Attribute *);
-ASN1EXP void   ASN1CALL free_PKCS12_Attribute  (PKCS12_Attribute *);
-
-
-/*
-PKCS12-Attributes ::= SET OF PKCS12-Attribute
-*/
-
-typedef struct PKCS12_Attributes {
-  unsigned int len;
-  PKCS12_Attribute *val;
-} PKCS12_Attributes;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_Attributes(const unsigned char *, size_t, PKCS12_Attributes *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_Attributes(unsigned char *, size_t, const PKCS12_Attributes *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_Attributes(const PKCS12_Attributes *);
-ASN1EXP int    ASN1CALL copy_PKCS12_Attributes  (const PKCS12_Attributes *, PKCS12_Attributes *);
-ASN1EXP void   ASN1CALL free_PKCS12_Attributes  (PKCS12_Attributes *);
-
-
-/*
-PKCS12-SafeBag ::= SEQUENCE {
-  bagId             OBJECT IDENTIFIER,
-  bagValue        [0] heim_any,
-  bagAttributes   PKCS12-Attributes OPTIONAL,
-}
-*/
-
-typedef struct PKCS12_SafeBag {
-  heim_oid bagId;
-  heim_any bagValue;
-  PKCS12_Attributes *bagAttributes;
-} PKCS12_SafeBag;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_SafeBag(const unsigned char *, size_t, PKCS12_SafeBag *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_SafeBag(unsigned char *, size_t, const PKCS12_SafeBag *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_SafeBag(const PKCS12_SafeBag *);
-ASN1EXP int    ASN1CALL copy_PKCS12_SafeBag  (const PKCS12_SafeBag *, PKCS12_SafeBag *);
-ASN1EXP void   ASN1CALL free_PKCS12_SafeBag  (PKCS12_SafeBag *);
-
-
-/*
-PKCS12-SafeContents ::= SEQUENCE OF PKCS12-SafeBag
-*/
-
-typedef struct PKCS12_SafeContents {
-  unsigned int len;
-  PKCS12_SafeBag *val;
-} PKCS12_SafeContents;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_SafeContents(const unsigned char *, size_t, PKCS12_SafeContents *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_SafeContents(unsigned char *, size_t, const PKCS12_SafeContents *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_SafeContents(const PKCS12_SafeContents *);
-ASN1EXP int    ASN1CALL copy_PKCS12_SafeContents  (const PKCS12_SafeContents *, PKCS12_SafeContents *);
-ASN1EXP void   ASN1CALL free_PKCS12_SafeContents  (PKCS12_SafeContents *);
-
-
-/*
-PKCS12-CertBag ::= SEQUENCE {
-  certType          OBJECT IDENTIFIER,
-  certValue       [0] heim_any,
-}
-*/
-
-typedef struct PKCS12_CertBag {
-  heim_oid certType;
-  heim_any certValue;
-} PKCS12_CertBag;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_CertBag(const unsigned char *, size_t, PKCS12_CertBag *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_CertBag(unsigned char *, size_t, const PKCS12_CertBag *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_CertBag(const PKCS12_CertBag *);
-ASN1EXP int    ASN1CALL copy_PKCS12_CertBag  (const PKCS12_CertBag *, PKCS12_CertBag *);
-ASN1EXP void   ASN1CALL free_PKCS12_CertBag  (PKCS12_CertBag *);
-
-
-/*
-PKCS12-PBEParams ::= SEQUENCE {
-  salt            OCTET STRING,
-  iterations      INTEGER (0..2147483647) OPTIONAL,
-}
-*/
-
-typedef struct PKCS12_PBEParams {
-  heim_octet_string salt;
-  unsigned int *iterations;
-} PKCS12_PBEParams;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_PBEParams(const unsigned char *, size_t, PKCS12_PBEParams *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_PBEParams(unsigned char *, size_t, const PKCS12_PBEParams *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_PBEParams(const PKCS12_PBEParams *);
-ASN1EXP int    ASN1CALL copy_PKCS12_PBEParams  (const PKCS12_PBEParams *, PKCS12_PBEParams *);
-ASN1EXP void   ASN1CALL free_PKCS12_PBEParams  (PKCS12_PBEParams *);
-
-
-/*
-PKCS12-OctetString ::= OCTET STRING
-*/
-
-typedef heim_octet_string PKCS12_OctetString;
-
-ASN1EXP int    ASN1CALL decode_PKCS12_OctetString(const unsigned char *, size_t, PKCS12_OctetString *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS12_OctetString(unsigned char *, size_t, const PKCS12_OctetString *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS12_OctetString(const PKCS12_OctetString *);
-ASN1EXP int    ASN1CALL copy_PKCS12_OctetString  (const PKCS12_OctetString *, PKCS12_OctetString *);
-ASN1EXP void   ASN1CALL free_PKCS12_OctetString  (PKCS12_OctetString *);
-
-
-#endif /* __pkcs12_asn1_h__ */
diff --git a/include.new/pkcs8_asn1.h b/include.new/pkcs8_asn1.h
deleted file mode 100644
index f1a6cc4..0000000
--- a/include.new/pkcs8_asn1.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/pkcs8.asn1 */
-/* Do not edit */
-
-#ifndef __pkcs8_asn1_h__
-#define __pkcs8_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <rfc2459_asn1.h>
-#include <heim_asn1.h>
-/*
-PKCS8PrivateKeyAlgorithmIdentifier ::= AlgorithmIdentifier
-*/
-
-typedef AlgorithmIdentifier PKCS8PrivateKeyAlgorithmIdentifier;
-
-ASN1EXP int    ASN1CALL decode_PKCS8PrivateKeyAlgorithmIdentifier(const unsigned char *, size_t, PKCS8PrivateKeyAlgorithmIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS8PrivateKeyAlgorithmIdentifier(unsigned char *, size_t, const PKCS8PrivateKeyAlgorithmIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS8PrivateKeyAlgorithmIdentifier(const PKCS8PrivateKeyAlgorithmIdentifier *);
-ASN1EXP int    ASN1CALL copy_PKCS8PrivateKeyAlgorithmIdentifier  (const PKCS8PrivateKeyAlgorithmIdentifier *, PKCS8PrivateKeyAlgorithmIdentifier *);
-ASN1EXP void   ASN1CALL free_PKCS8PrivateKeyAlgorithmIdentifier  (PKCS8PrivateKeyAlgorithmIdentifier *);
-
-
-/*
-PKCS8PrivateKey ::= OCTET STRING
-*/
-
-typedef heim_octet_string PKCS8PrivateKey;
-
-ASN1EXP int    ASN1CALL decode_PKCS8PrivateKey(const unsigned char *, size_t, PKCS8PrivateKey *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS8PrivateKey(unsigned char *, size_t, const PKCS8PrivateKey *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS8PrivateKey(const PKCS8PrivateKey *);
-ASN1EXP int    ASN1CALL copy_PKCS8PrivateKey  (const PKCS8PrivateKey *, PKCS8PrivateKey *);
-ASN1EXP void   ASN1CALL free_PKCS8PrivateKey  (PKCS8PrivateKey *);
-
-
-/*
-PKCS8Attributes ::= SET OF Attribute
-*/
-
-typedef struct PKCS8Attributes {
-  unsigned int len;
-  Attribute *val;
-} PKCS8Attributes;
-
-ASN1EXP int    ASN1CALL decode_PKCS8Attributes(const unsigned char *, size_t, PKCS8Attributes *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS8Attributes(unsigned char *, size_t, const PKCS8Attributes *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS8Attributes(const PKCS8Attributes *);
-ASN1EXP int    ASN1CALL copy_PKCS8Attributes  (const PKCS8Attributes *, PKCS8Attributes *);
-ASN1EXP void   ASN1CALL free_PKCS8Attributes  (PKCS8Attributes *);
-
-
-/*
-PKCS8PrivateKeyInfo ::= SEQUENCE {
-  version               INTEGER,
-  privateKeyAlgorithm   PKCS8PrivateKeyAlgorithmIdentifier,
-  privateKey            PKCS8PrivateKey,
-  attributes            [0] IMPLICIT SET OF Attribute OPTIONAL,
-}
-*/
-
-typedef struct PKCS8PrivateKeyInfo {
-  heim_integer version;
-  PKCS8PrivateKeyAlgorithmIdentifier privateKeyAlgorithm;
-  PKCS8PrivateKey privateKey;
-  struct PKCS8PrivateKeyInfo_attributes {
-    unsigned int len;
-    Attribute *val;
-  } *attributes;
-} PKCS8PrivateKeyInfo;
-
-ASN1EXP int    ASN1CALL decode_PKCS8PrivateKeyInfo(const unsigned char *, size_t, PKCS8PrivateKeyInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS8PrivateKeyInfo(unsigned char *, size_t, const PKCS8PrivateKeyInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS8PrivateKeyInfo(const PKCS8PrivateKeyInfo *);
-ASN1EXP int    ASN1CALL copy_PKCS8PrivateKeyInfo  (const PKCS8PrivateKeyInfo *, PKCS8PrivateKeyInfo *);
-ASN1EXP void   ASN1CALL free_PKCS8PrivateKeyInfo  (PKCS8PrivateKeyInfo *);
-
-
-/*
-PKCS8EncryptedData ::= OCTET STRING
-*/
-
-typedef heim_octet_string PKCS8EncryptedData;
-
-ASN1EXP int    ASN1CALL decode_PKCS8EncryptedData(const unsigned char *, size_t, PKCS8EncryptedData *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS8EncryptedData(unsigned char *, size_t, const PKCS8EncryptedData *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS8EncryptedData(const PKCS8EncryptedData *);
-ASN1EXP int    ASN1CALL copy_PKCS8EncryptedData  (const PKCS8EncryptedData *, PKCS8EncryptedData *);
-ASN1EXP void   ASN1CALL free_PKCS8EncryptedData  (PKCS8EncryptedData *);
-
-
-/*
-PKCS8EncryptedPrivateKeyInfo ::= SEQUENCE {
-  encryptionAlgorithm   AlgorithmIdentifier,
-  encryptedData         PKCS8EncryptedData,
-}
-*/
-
-typedef struct PKCS8EncryptedPrivateKeyInfo {
-  AlgorithmIdentifier encryptionAlgorithm;
-  PKCS8EncryptedData encryptedData;
-} PKCS8EncryptedPrivateKeyInfo;
-
-ASN1EXP int    ASN1CALL decode_PKCS8EncryptedPrivateKeyInfo(const unsigned char *, size_t, PKCS8EncryptedPrivateKeyInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS8EncryptedPrivateKeyInfo(unsigned char *, size_t, const PKCS8EncryptedPrivateKeyInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS8EncryptedPrivateKeyInfo(const PKCS8EncryptedPrivateKeyInfo *);
-ASN1EXP int    ASN1CALL copy_PKCS8EncryptedPrivateKeyInfo  (const PKCS8EncryptedPrivateKeyInfo *, PKCS8EncryptedPrivateKeyInfo *);
-ASN1EXP void   ASN1CALL free_PKCS8EncryptedPrivateKeyInfo  (PKCS8EncryptedPrivateKeyInfo *);
-
-
-#endif /* __pkcs8_asn1_h__ */
diff --git a/include.new/pkcs9_asn1.h b/include.new/pkcs9_asn1.h
deleted file mode 100644
index 04703e6..0000000
--- a/include.new/pkcs9_asn1.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/pkcs9.asn1 */
-/* Do not edit */
-
-#ifndef __pkcs9_asn1_h__
-#define __pkcs9_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-/* OBJECT IDENTIFIER id-pkcs-9 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9;
-#define ASN1_OID_ID_PKCS_9 (&asn1_oid_id_pkcs_9)
-
-/* OBJECT IDENTIFIER id-pkcs9-emailAddress ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_emailAddress;
-#define ASN1_OID_ID_PKCS9_EMAILADDRESS (&asn1_oid_id_pkcs9_emailAddress)
-
-/* OBJECT IDENTIFIER id-pkcs9-contentType ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_contentType;
-#define ASN1_OID_ID_PKCS9_CONTENTTYPE (&asn1_oid_id_pkcs9_contentType)
-
-/* OBJECT IDENTIFIER id-pkcs9-messageDigest ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_messageDigest;
-#define ASN1_OID_ID_PKCS9_MESSAGEDIGEST (&asn1_oid_id_pkcs9_messageDigest)
-
-/* OBJECT IDENTIFIER id-pkcs9-signingTime ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_signingTime;
-#define ASN1_OID_ID_PKCS9_SIGNINGTIME (&asn1_oid_id_pkcs9_signingTime)
-
-/* OBJECT IDENTIFIER id-pkcs9-countersignature ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(6) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs9_countersignature;
-#define ASN1_OID_ID_PKCS9_COUNTERSIGNATURE (&asn1_oid_id_pkcs9_countersignature)
-
-/* OBJECT IDENTIFIER id-pkcs-9-at-friendlyName ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(20) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9_at_friendlyName;
-#define ASN1_OID_ID_PKCS_9_AT_FRIENDLYNAME (&asn1_oid_id_pkcs_9_at_friendlyName)
-
-/* OBJECT IDENTIFIER id-pkcs-9-at-localKeyId ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(21) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9_at_localKeyId;
-#define ASN1_OID_ID_PKCS_9_AT_LOCALKEYID (&asn1_oid_id_pkcs_9_at_localKeyId)
-
-/* OBJECT IDENTIFIER id-pkcs-9-at-certTypes ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(22) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9_at_certTypes;
-#define ASN1_OID_ID_PKCS_9_AT_CERTTYPES (&asn1_oid_id_pkcs_9_at_certTypes)
-
-/* OBJECT IDENTIFIER id-pkcs-9-at-certTypes-x509 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9) label-less(22) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_9_at_certTypes_x509;
-#define ASN1_OID_ID_PKCS_9_AT_CERTTYPES_X509 (&asn1_oid_id_pkcs_9_at_certTypes_x509)
-
-/*
-PKCS9-BMPString ::= BMPString
-*/
-
-typedef heim_bmp_string PKCS9_BMPString;
-
-ASN1EXP int    ASN1CALL decode_PKCS9_BMPString(const unsigned char *, size_t, PKCS9_BMPString *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS9_BMPString(unsigned char *, size_t, const PKCS9_BMPString *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS9_BMPString(const PKCS9_BMPString *);
-ASN1EXP int    ASN1CALL copy_PKCS9_BMPString  (const PKCS9_BMPString *, PKCS9_BMPString *);
-ASN1EXP void   ASN1CALL free_PKCS9_BMPString  (PKCS9_BMPString *);
-
-
-/*
-PKCS9-friendlyName ::= SET OF PKCS9-BMPString
-*/
-
-typedef struct PKCS9_friendlyName {
-  unsigned int len;
-  PKCS9_BMPString *val;
-} PKCS9_friendlyName;
-
-ASN1EXP int    ASN1CALL decode_PKCS9_friendlyName(const unsigned char *, size_t, PKCS9_friendlyName *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKCS9_friendlyName(unsigned char *, size_t, const PKCS9_friendlyName *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKCS9_friendlyName(const PKCS9_friendlyName *);
-ASN1EXP int    ASN1CALL copy_PKCS9_friendlyName  (const PKCS9_friendlyName *, PKCS9_friendlyName *);
-ASN1EXP void   ASN1CALL free_PKCS9_friendlyName  (PKCS9_friendlyName *);
-
-
-#endif /* __pkcs9_asn1_h__ */
diff --git a/include.new/pkinit_asn1.h b/include.new/pkinit_asn1.h
deleted file mode 100644
index 326ab7f..0000000
--- a/include.new/pkinit_asn1.h
+++ /dev/null
@@ -1,737 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/pkinit.asn1 */
-/* Do not edit */
-
-#ifndef __pkinit_asn1_h__
-#define __pkinit_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <krb5_asn1.h>
-#include <cms_asn1.h>
-#include <rfc2459_asn1.h>
-#include <heim_asn1.h>
-/* OBJECT IDENTIFIER id-pkinit ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkinit;
-#define ASN1_OID_ID_PKINIT (&asn1_oid_id_pkinit)
-
-/* OBJECT IDENTIFIER id-pkauthdata ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkauthdata;
-#define ASN1_OID_ID_PKAUTHDATA (&asn1_oid_id_pkauthdata)
-
-/* OBJECT IDENTIFIER id-pkdhkeydata ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkdhkeydata;
-#define ASN1_OID_ID_PKDHKEYDATA (&asn1_oid_id_pkdhkeydata)
-
-/* OBJECT IDENTIFIER id-pkrkeydata ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkrkeydata;
-#define ASN1_OID_ID_PKRKEYDATA (&asn1_oid_id_pkrkeydata)
-
-/* OBJECT IDENTIFIER id-pkekuoid ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkekuoid;
-#define ASN1_OID_ID_PKEKUOID (&asn1_oid_id_pkekuoid)
-
-/* OBJECT IDENTIFIER id-pkkdcekuoid ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkkdcekuoid;
-#define ASN1_OID_ID_PKKDCEKUOID (&asn1_oid_id_pkkdcekuoid)
-
-/* OBJECT IDENTIFIER id-pkinit-kdf ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(6) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkinit_kdf;
-#define ASN1_OID_ID_PKINIT_KDF (&asn1_oid_id_pkinit_kdf)
-
-/* OBJECT IDENTIFIER id-pkinit-kdf-ah-sha1 ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(6) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkinit_kdf_ah_sha1;
-#define ASN1_OID_ID_PKINIT_KDF_AH_SHA1 (&asn1_oid_id_pkinit_kdf_ah_sha1)
-
-/* OBJECT IDENTIFIER id-pkinit-kdf-ah-sha256 ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(6) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkinit_kdf_ah_sha256;
-#define ASN1_OID_ID_PKINIT_KDF_AH_SHA256 (&asn1_oid_id_pkinit_kdf_ah_sha256)
-
-/* OBJECT IDENTIFIER id-pkinit-kdf-ah-sha512 ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) pkinit(3) label-less(6) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkinit_kdf_ah_sha512;
-#define ASN1_OID_ID_PKINIT_KDF_AH_SHA512 (&asn1_oid_id_pkinit_kdf_ah_sha512)
-
-/* OBJECT IDENTIFIER id-pkinit-san ::= { iso(1) org(3) dod(6) internet(1) security(5) kerberosv5(2) x509-sanan(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkinit_san;
-#define ASN1_OID_ID_PKINIT_SAN (&asn1_oid_id_pkinit_san)
-
-/* OBJECT IDENTIFIER id-pkinit-ms-eku ::= { iso(1) org(3) dod(6) internet(1) private(4) enterprise(1) microsoft(311) label-less(20) label-less(2) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkinit_ms_eku;
-#define ASN1_OID_ID_PKINIT_MS_EKU (&asn1_oid_id_pkinit_ms_eku)
-
-/* OBJECT IDENTIFIER id-pkinit-ms-san ::= { iso(1) org(3) dod(6) internet(1) private(4) enterprise(1) microsoft(311) label-less(20) label-less(2) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkinit_ms_san;
-#define ASN1_OID_ID_PKINIT_MS_SAN (&asn1_oid_id_pkinit_ms_san)
-
-/*
-MS-UPN-SAN ::= UTF8String
-*/
-
-typedef heim_utf8_string MS_UPN_SAN;
-
-ASN1EXP int    ASN1CALL decode_MS_UPN_SAN(const unsigned char *, size_t, MS_UPN_SAN *, size_t *);
-ASN1EXP int    ASN1CALL encode_MS_UPN_SAN(unsigned char *, size_t, const MS_UPN_SAN *, size_t *);
-ASN1EXP size_t ASN1CALL length_MS_UPN_SAN(const MS_UPN_SAN *);
-ASN1EXP int    ASN1CALL copy_MS_UPN_SAN  (const MS_UPN_SAN *, MS_UPN_SAN *);
-ASN1EXP void   ASN1CALL free_MS_UPN_SAN  (MS_UPN_SAN *);
-
-
-enum { pa_pk_as_req = 16 };
-
-enum { pa_pk_as_rep = 17 };
-
-enum { td_trusted_certifiers = 104 };
-
-enum { td_invalid_certificates = 105 };
-
-enum { td_dh_parameters = 109 };
-
-/*
-DHNonce ::= OCTET STRING
-*/
-
-typedef heim_octet_string DHNonce;
-
-ASN1EXP int    ASN1CALL decode_DHNonce(const unsigned char *, size_t, DHNonce *, size_t *);
-ASN1EXP int    ASN1CALL encode_DHNonce(unsigned char *, size_t, const DHNonce *, size_t *);
-ASN1EXP size_t ASN1CALL length_DHNonce(const DHNonce *);
-ASN1EXP int    ASN1CALL copy_DHNonce  (const DHNonce *, DHNonce *);
-ASN1EXP void   ASN1CALL free_DHNonce  (DHNonce *);
-
-
-/*
-KDFAlgorithmId ::= SEQUENCE {
-  kdf-id          [0]   OBJECT IDENTIFIER,
-  ...,
-}
-*/
-
-typedef struct KDFAlgorithmId {
-  heim_oid kdf_id;
-} KDFAlgorithmId;
-
-ASN1EXP int    ASN1CALL decode_KDFAlgorithmId(const unsigned char *, size_t, KDFAlgorithmId *, size_t *);
-ASN1EXP int    ASN1CALL encode_KDFAlgorithmId(unsigned char *, size_t, const KDFAlgorithmId *, size_t *);
-ASN1EXP size_t ASN1CALL length_KDFAlgorithmId(const KDFAlgorithmId *);
-ASN1EXP int    ASN1CALL copy_KDFAlgorithmId  (const KDFAlgorithmId *, KDFAlgorithmId *);
-ASN1EXP void   ASN1CALL free_KDFAlgorithmId  (KDFAlgorithmId *);
-
-
-/*
-TrustedCA ::= SEQUENCE {
-  caName                    [0] IMPLICIT OCTET STRING,
-  certificateSerialNumber   [1] INTEGER OPTIONAL,
-  subjectKeyIdentifier      [2] OCTET STRING OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct TrustedCA {
-  heim_octet_string caName;
-  heim_integer *certificateSerialNumber;
-  heim_octet_string *subjectKeyIdentifier;
-} TrustedCA;
-
-ASN1EXP int    ASN1CALL decode_TrustedCA(const unsigned char *, size_t, TrustedCA *, size_t *);
-ASN1EXP int    ASN1CALL encode_TrustedCA(unsigned char *, size_t, const TrustedCA *, size_t *);
-ASN1EXP size_t ASN1CALL length_TrustedCA(const TrustedCA *);
-ASN1EXP int    ASN1CALL copy_TrustedCA  (const TrustedCA *, TrustedCA *);
-ASN1EXP void   ASN1CALL free_TrustedCA  (TrustedCA *);
-
-
-/*
-ExternalPrincipalIdentifier ::= SEQUENCE {
-  subjectName             [0] IMPLICIT OCTET STRING OPTIONAL,
-  issuerAndSerialNumber   [1] IMPLICIT OCTET STRING OPTIONAL,
-  subjectKeyIdentifier    [2] IMPLICIT OCTET STRING OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct ExternalPrincipalIdentifier {
-  heim_octet_string *subjectName;
-  heim_octet_string *issuerAndSerialNumber;
-  heim_octet_string *subjectKeyIdentifier;
-} ExternalPrincipalIdentifier;
-
-ASN1EXP int    ASN1CALL decode_ExternalPrincipalIdentifier(const unsigned char *, size_t, ExternalPrincipalIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_ExternalPrincipalIdentifier(unsigned char *, size_t, const ExternalPrincipalIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_ExternalPrincipalIdentifier(const ExternalPrincipalIdentifier *);
-ASN1EXP int    ASN1CALL copy_ExternalPrincipalIdentifier  (const ExternalPrincipalIdentifier *, ExternalPrincipalIdentifier *);
-ASN1EXP void   ASN1CALL free_ExternalPrincipalIdentifier  (ExternalPrincipalIdentifier *);
-
-
-/*
-ExternalPrincipalIdentifiers ::= SEQUENCE OF ExternalPrincipalIdentifier
-*/
-
-typedef struct ExternalPrincipalIdentifiers {
-  unsigned int len;
-  ExternalPrincipalIdentifier *val;
-} ExternalPrincipalIdentifiers;
-
-ASN1EXP int    ASN1CALL decode_ExternalPrincipalIdentifiers(const unsigned char *, size_t, ExternalPrincipalIdentifiers *, size_t *);
-ASN1EXP int    ASN1CALL encode_ExternalPrincipalIdentifiers(unsigned char *, size_t, const ExternalPrincipalIdentifiers *, size_t *);
-ASN1EXP size_t ASN1CALL length_ExternalPrincipalIdentifiers(const ExternalPrincipalIdentifiers *);
-ASN1EXP int    ASN1CALL copy_ExternalPrincipalIdentifiers  (const ExternalPrincipalIdentifiers *, ExternalPrincipalIdentifiers *);
-ASN1EXP void   ASN1CALL free_ExternalPrincipalIdentifiers  (ExternalPrincipalIdentifiers *);
-
-
-/*
-PA-PK-AS-REQ ::= SEQUENCE {
-  signedAuthPack      [0] IMPLICIT OCTET STRING,
-  trustedCertifiers   [1] ExternalPrincipalIdentifiers OPTIONAL,
-  kdcPkId             [2] IMPLICIT OCTET STRING OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct PA_PK_AS_REQ {
-  heim_octet_string signedAuthPack;
-  ExternalPrincipalIdentifiers *trustedCertifiers;
-  heim_octet_string *kdcPkId;
-} PA_PK_AS_REQ;
-
-ASN1EXP int    ASN1CALL decode_PA_PK_AS_REQ(const unsigned char *, size_t, PA_PK_AS_REQ *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_PK_AS_REQ(unsigned char *, size_t, const PA_PK_AS_REQ *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_PK_AS_REQ(const PA_PK_AS_REQ *);
-ASN1EXP int    ASN1CALL copy_PA_PK_AS_REQ  (const PA_PK_AS_REQ *, PA_PK_AS_REQ *);
-ASN1EXP void   ASN1CALL free_PA_PK_AS_REQ  (PA_PK_AS_REQ *);
-
-
-/*
-PKAuthenticator ::= SEQUENCE {
-  cusec           [0] INTEGER,
-  ctime           [1] KerberosTime,
-  nonce           [2] INTEGER (0..2147483647),
-  paChecksum      [3] OCTET STRING OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct PKAuthenticator {
-  heim_integer cusec;
-  KerberosTime ctime;
-  unsigned int nonce;
-  heim_octet_string *paChecksum;
-} PKAuthenticator;
-
-ASN1EXP int    ASN1CALL decode_PKAuthenticator(const unsigned char *, size_t, PKAuthenticator *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKAuthenticator(unsigned char *, size_t, const PKAuthenticator *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKAuthenticator(const PKAuthenticator *);
-ASN1EXP int    ASN1CALL copy_PKAuthenticator  (const PKAuthenticator *, PKAuthenticator *);
-ASN1EXP void   ASN1CALL free_PKAuthenticator  (PKAuthenticator *);
-
-
-/*
-AuthPack ::= SEQUENCE {
-  pkAuthenticator     [0] PKAuthenticator,
-  clientPublicValue   [1] SubjectPublicKeyInfo OPTIONAL,
-  supportedCMSTypes   [2] SEQUENCE OF AlgorithmIdentifier OPTIONAL,
-  clientDHNonce       [3] DHNonce OPTIONAL,
-  ...,
-  supportedKDFs       [4] SEQUENCE OF KDFAlgorithmId OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct AuthPack {
-  PKAuthenticator pkAuthenticator;
-  SubjectPublicKeyInfo *clientPublicValue;
-  struct AuthPack_supportedCMSTypes {
-    unsigned int len;
-    AlgorithmIdentifier *val;
-  } *supportedCMSTypes;
-  DHNonce *clientDHNonce;
-  struct AuthPack_supportedKDFs {
-    unsigned int len;
-    KDFAlgorithmId *val;
-  } *supportedKDFs;
-} AuthPack;
-
-ASN1EXP int    ASN1CALL decode_AuthPack(const unsigned char *, size_t, AuthPack *, size_t *);
-ASN1EXP int    ASN1CALL encode_AuthPack(unsigned char *, size_t, const AuthPack *, size_t *);
-ASN1EXP size_t ASN1CALL length_AuthPack(const AuthPack *);
-ASN1EXP int    ASN1CALL copy_AuthPack  (const AuthPack *, AuthPack *);
-ASN1EXP void   ASN1CALL free_AuthPack  (AuthPack *);
-
-
-/*
-TD-TRUSTED-CERTIFIERS ::= ExternalPrincipalIdentifiers
-*/
-
-typedef ExternalPrincipalIdentifiers TD_TRUSTED_CERTIFIERS;
-
-ASN1EXP int    ASN1CALL decode_TD_TRUSTED_CERTIFIERS(const unsigned char *, size_t, TD_TRUSTED_CERTIFIERS *, size_t *);
-ASN1EXP int    ASN1CALL encode_TD_TRUSTED_CERTIFIERS(unsigned char *, size_t, const TD_TRUSTED_CERTIFIERS *, size_t *);
-ASN1EXP size_t ASN1CALL length_TD_TRUSTED_CERTIFIERS(const TD_TRUSTED_CERTIFIERS *);
-ASN1EXP int    ASN1CALL copy_TD_TRUSTED_CERTIFIERS  (const TD_TRUSTED_CERTIFIERS *, TD_TRUSTED_CERTIFIERS *);
-ASN1EXP void   ASN1CALL free_TD_TRUSTED_CERTIFIERS  (TD_TRUSTED_CERTIFIERS *);
-
-
-/*
-TD-INVALID-CERTIFICATES ::= ExternalPrincipalIdentifiers
-*/
-
-typedef ExternalPrincipalIdentifiers TD_INVALID_CERTIFICATES;
-
-ASN1EXP int    ASN1CALL decode_TD_INVALID_CERTIFICATES(const unsigned char *, size_t, TD_INVALID_CERTIFICATES *, size_t *);
-ASN1EXP int    ASN1CALL encode_TD_INVALID_CERTIFICATES(unsigned char *, size_t, const TD_INVALID_CERTIFICATES *, size_t *);
-ASN1EXP size_t ASN1CALL length_TD_INVALID_CERTIFICATES(const TD_INVALID_CERTIFICATES *);
-ASN1EXP int    ASN1CALL copy_TD_INVALID_CERTIFICATES  (const TD_INVALID_CERTIFICATES *, TD_INVALID_CERTIFICATES *);
-ASN1EXP void   ASN1CALL free_TD_INVALID_CERTIFICATES  (TD_INVALID_CERTIFICATES *);
-
-
-/*
-KRB5PrincipalName ::= SEQUENCE {
-  realm           [0] Realm,
-  principalName   [1] PrincipalName,
-}
-*/
-
-typedef struct KRB5PrincipalName {
-  Realm realm;
-  PrincipalName principalName;
-} KRB5PrincipalName;
-
-ASN1EXP int    ASN1CALL decode_KRB5PrincipalName(const unsigned char *, size_t, KRB5PrincipalName *, size_t *);
-ASN1EXP int    ASN1CALL encode_KRB5PrincipalName(unsigned char *, size_t, const KRB5PrincipalName *, size_t *);
-ASN1EXP size_t ASN1CALL length_KRB5PrincipalName(const KRB5PrincipalName *);
-ASN1EXP int    ASN1CALL copy_KRB5PrincipalName  (const KRB5PrincipalName *, KRB5PrincipalName *);
-ASN1EXP void   ASN1CALL free_KRB5PrincipalName  (KRB5PrincipalName *);
-
-
-/*
-AD-INITIAL-VERIFIED-CAS ::= SEQUENCE OF ExternalPrincipalIdentifier
-*/
-
-typedef struct AD_INITIAL_VERIFIED_CAS {
-  unsigned int len;
-  ExternalPrincipalIdentifier *val;
-} AD_INITIAL_VERIFIED_CAS;
-
-ASN1EXP int    ASN1CALL decode_AD_INITIAL_VERIFIED_CAS(const unsigned char *, size_t, AD_INITIAL_VERIFIED_CAS *, size_t *);
-ASN1EXP int    ASN1CALL encode_AD_INITIAL_VERIFIED_CAS(unsigned char *, size_t, const AD_INITIAL_VERIFIED_CAS *, size_t *);
-ASN1EXP size_t ASN1CALL length_AD_INITIAL_VERIFIED_CAS(const AD_INITIAL_VERIFIED_CAS *);
-ASN1EXP int    ASN1CALL copy_AD_INITIAL_VERIFIED_CAS  (const AD_INITIAL_VERIFIED_CAS *, AD_INITIAL_VERIFIED_CAS *);
-ASN1EXP void   ASN1CALL free_AD_INITIAL_VERIFIED_CAS  (AD_INITIAL_VERIFIED_CAS *);
-
-
-/*
-DHRepInfo ::= SEQUENCE {
-  dhSignedData    [0] IMPLICIT OCTET STRING,
-  serverDHNonce   [1] DHNonce OPTIONAL,
-  ...,
-  kdf             [2] KDFAlgorithmId OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct DHRepInfo {
-  heim_octet_string dhSignedData;
-  DHNonce *serverDHNonce;
-  KDFAlgorithmId *kdf;
-} DHRepInfo;
-
-ASN1EXP int    ASN1CALL decode_DHRepInfo(const unsigned char *, size_t, DHRepInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_DHRepInfo(unsigned char *, size_t, const DHRepInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_DHRepInfo(const DHRepInfo *);
-ASN1EXP int    ASN1CALL copy_DHRepInfo  (const DHRepInfo *, DHRepInfo *);
-ASN1EXP void   ASN1CALL free_DHRepInfo  (DHRepInfo *);
-
-
-/*
-PA-PK-AS-REP ::= CHOICE {
-  dhInfo          [0] DHRepInfo,
-  encKeyPack      [1] IMPLICIT OCTET STRING,
-  ...,
-}
-*/
-
-typedef struct PA_PK_AS_REP {
-  enum {
-    choice_PA_PK_AS_REP_asn1_ellipsis = 0,
-    choice_PA_PK_AS_REP_dhInfo,
-    choice_PA_PK_AS_REP_encKeyPack
-    /* ... */
-  } element;
-  union {
-    DHRepInfo dhInfo;
-    heim_octet_string encKeyPack;
-    heim_octet_string asn1_ellipsis;
-  } u;
-} PA_PK_AS_REP;
-
-ASN1EXP int    ASN1CALL decode_PA_PK_AS_REP(const unsigned char *, size_t, PA_PK_AS_REP *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_PK_AS_REP(unsigned char *, size_t, const PA_PK_AS_REP *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_PK_AS_REP(const PA_PK_AS_REP *);
-ASN1EXP int    ASN1CALL copy_PA_PK_AS_REP  (const PA_PK_AS_REP *, PA_PK_AS_REP *);
-ASN1EXP void   ASN1CALL free_PA_PK_AS_REP  (PA_PK_AS_REP *);
-
-
-/*
-KDCDHKeyInfo ::= SEQUENCE {
-  subjectPublicKey   [0]   BIT STRING {
-  },
-  nonce              [1] INTEGER (0..2147483647),
-  dhKeyExpiration    [2] KerberosTime OPTIONAL,
-  ...,
-}
-*/
-
-typedef struct KDCDHKeyInfo {
-  heim_bit_string subjectPublicKey;
-  unsigned int nonce;
-  KerberosTime *dhKeyExpiration;
-} KDCDHKeyInfo;
-
-ASN1EXP int    ASN1CALL decode_KDCDHKeyInfo(const unsigned char *, size_t, KDCDHKeyInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_KDCDHKeyInfo(unsigned char *, size_t, const KDCDHKeyInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_KDCDHKeyInfo(const KDCDHKeyInfo *);
-ASN1EXP int    ASN1CALL copy_KDCDHKeyInfo  (const KDCDHKeyInfo *, KDCDHKeyInfo *);
-ASN1EXP void   ASN1CALL free_KDCDHKeyInfo  (KDCDHKeyInfo *);
-
-
-/*
-ReplyKeyPack ::= SEQUENCE {
-  replyKey        [0] EncryptionKey,
-  asChecksum      [1] Checksum,
-  ...,
-}
-*/
-
-typedef struct ReplyKeyPack {
-  EncryptionKey replyKey;
-  Checksum asChecksum;
-} ReplyKeyPack;
-
-ASN1EXP int    ASN1CALL decode_ReplyKeyPack(const unsigned char *, size_t, ReplyKeyPack *, size_t *);
-ASN1EXP int    ASN1CALL encode_ReplyKeyPack(unsigned char *, size_t, const ReplyKeyPack *, size_t *);
-ASN1EXP size_t ASN1CALL length_ReplyKeyPack(const ReplyKeyPack *);
-ASN1EXP int    ASN1CALL copy_ReplyKeyPack  (const ReplyKeyPack *, ReplyKeyPack *);
-ASN1EXP void   ASN1CALL free_ReplyKeyPack  (ReplyKeyPack *);
-
-
-/*
-TD-DH-PARAMETERS ::= SEQUENCE OF AlgorithmIdentifier
-*/
-
-typedef struct TD_DH_PARAMETERS {
-  unsigned int len;
-  AlgorithmIdentifier *val;
-} TD_DH_PARAMETERS;
-
-ASN1EXP int    ASN1CALL decode_TD_DH_PARAMETERS(const unsigned char *, size_t, TD_DH_PARAMETERS *, size_t *);
-ASN1EXP int    ASN1CALL encode_TD_DH_PARAMETERS(unsigned char *, size_t, const TD_DH_PARAMETERS *, size_t *);
-ASN1EXP size_t ASN1CALL length_TD_DH_PARAMETERS(const TD_DH_PARAMETERS *);
-ASN1EXP int    ASN1CALL copy_TD_DH_PARAMETERS  (const TD_DH_PARAMETERS *, TD_DH_PARAMETERS *);
-ASN1EXP void   ASN1CALL free_TD_DH_PARAMETERS  (TD_DH_PARAMETERS *);
-
-
-/*
-PKAuthenticator-Win2k ::= SEQUENCE {
-  kdcName         [0] PrincipalName,
-  kdcRealm        [1] Realm,
-  cusec           [2] INTEGER (0..2147483647),
-  ctime           [3] KerberosTime,
-  nonce           [4] INTEGER (-2147483648..2147483647),
-}
-*/
-
-typedef struct PKAuthenticator_Win2k {
-  PrincipalName kdcName;
-  Realm kdcRealm;
-  unsigned int cusec;
-  KerberosTime ctime;
-  int nonce;
-} PKAuthenticator_Win2k;
-
-ASN1EXP int    ASN1CALL decode_PKAuthenticator_Win2k(const unsigned char *, size_t, PKAuthenticator_Win2k *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKAuthenticator_Win2k(unsigned char *, size_t, const PKAuthenticator_Win2k *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKAuthenticator_Win2k(const PKAuthenticator_Win2k *);
-ASN1EXP int    ASN1CALL copy_PKAuthenticator_Win2k  (const PKAuthenticator_Win2k *, PKAuthenticator_Win2k *);
-ASN1EXP void   ASN1CALL free_PKAuthenticator_Win2k  (PKAuthenticator_Win2k *);
-
-
-/*
-AuthPack-Win2k ::= SEQUENCE {
-  pkAuthenticator     [0] PKAuthenticator-Win2k,
-  clientPublicValue   [1] SubjectPublicKeyInfo OPTIONAL,
-}
-*/
-
-typedef struct AuthPack_Win2k {
-  PKAuthenticator_Win2k pkAuthenticator;
-  SubjectPublicKeyInfo *clientPublicValue;
-} AuthPack_Win2k;
-
-ASN1EXP int    ASN1CALL decode_AuthPack_Win2k(const unsigned char *, size_t, AuthPack_Win2k *, size_t *);
-ASN1EXP int    ASN1CALL encode_AuthPack_Win2k(unsigned char *, size_t, const AuthPack_Win2k *, size_t *);
-ASN1EXP size_t ASN1CALL length_AuthPack_Win2k(const AuthPack_Win2k *);
-ASN1EXP int    ASN1CALL copy_AuthPack_Win2k  (const AuthPack_Win2k *, AuthPack_Win2k *);
-ASN1EXP void   ASN1CALL free_AuthPack_Win2k  (AuthPack_Win2k *);
-
-
-/*
-TrustedCA-Win2k ::= CHOICE {
-  caName            [1] heim_any,
-  issuerAndSerial   [2] IssuerAndSerialNumber,
-}
-*/
-
-typedef struct TrustedCA_Win2k {
-  enum {
-    choice_TrustedCA_Win2k_caName = 1,
-    choice_TrustedCA_Win2k_issuerAndSerial
-  } element;
-  union {
-    heim_any caName;
-    IssuerAndSerialNumber issuerAndSerial;
-  } u;
-} TrustedCA_Win2k;
-
-ASN1EXP int    ASN1CALL decode_TrustedCA_Win2k(const unsigned char *, size_t, TrustedCA_Win2k *, size_t *);
-ASN1EXP int    ASN1CALL encode_TrustedCA_Win2k(unsigned char *, size_t, const TrustedCA_Win2k *, size_t *);
-ASN1EXP size_t ASN1CALL length_TrustedCA_Win2k(const TrustedCA_Win2k *);
-ASN1EXP int    ASN1CALL copy_TrustedCA_Win2k  (const TrustedCA_Win2k *, TrustedCA_Win2k *);
-ASN1EXP void   ASN1CALL free_TrustedCA_Win2k  (TrustedCA_Win2k *);
-
-
-/*
-PA-PK-AS-REQ-Win2k ::= SEQUENCE {
-  signed-auth-pack     [0] IMPLICIT OCTET STRING,
-  trusted-certifiers   [2] SEQUENCE OF TrustedCA-Win2k OPTIONAL,
-  kdc-cert             [3] IMPLICIT OCTET STRING OPTIONAL,
-  encryption-cert      [4] IMPLICIT OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct PA_PK_AS_REQ_Win2k {
-  heim_octet_string signed_auth_pack;
-  struct PA_PK_AS_REQ_Win2k_trusted_certifiers {
-    unsigned int len;
-    TrustedCA_Win2k *val;
-  } *trusted_certifiers;
-  heim_octet_string *kdc_cert;
-  heim_octet_string *encryption_cert;
-} PA_PK_AS_REQ_Win2k;
-
-ASN1EXP int    ASN1CALL decode_PA_PK_AS_REQ_Win2k(const unsigned char *, size_t, PA_PK_AS_REQ_Win2k *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_PK_AS_REQ_Win2k(unsigned char *, size_t, const PA_PK_AS_REQ_Win2k *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_PK_AS_REQ_Win2k(const PA_PK_AS_REQ_Win2k *);
-ASN1EXP int    ASN1CALL copy_PA_PK_AS_REQ_Win2k  (const PA_PK_AS_REQ_Win2k *, PA_PK_AS_REQ_Win2k *);
-ASN1EXP void   ASN1CALL free_PA_PK_AS_REQ_Win2k  (PA_PK_AS_REQ_Win2k *);
-
-
-/*
-PA-PK-AS-REP-Win2k ::= CHOICE {
-  dhSignedData    [0] IMPLICIT OCTET STRING,
-  encKeyPack      [1] IMPLICIT OCTET STRING,
-}
-*/
-
-typedef struct PA_PK_AS_REP_Win2k {
-  enum {
-    choice_PA_PK_AS_REP_Win2k_dhSignedData = 1,
-    choice_PA_PK_AS_REP_Win2k_encKeyPack
-  } element;
-  union {
-    heim_octet_string dhSignedData;
-    heim_octet_string encKeyPack;
-  } u;
-} PA_PK_AS_REP_Win2k;
-
-ASN1EXP int    ASN1CALL decode_PA_PK_AS_REP_Win2k(const unsigned char *, size_t, PA_PK_AS_REP_Win2k *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_PK_AS_REP_Win2k(unsigned char *, size_t, const PA_PK_AS_REP_Win2k *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_PK_AS_REP_Win2k(const PA_PK_AS_REP_Win2k *);
-ASN1EXP int    ASN1CALL copy_PA_PK_AS_REP_Win2k  (const PA_PK_AS_REP_Win2k *, PA_PK_AS_REP_Win2k *);
-ASN1EXP void   ASN1CALL free_PA_PK_AS_REP_Win2k  (PA_PK_AS_REP_Win2k *);
-
-
-/*
-KDCDHKeyInfo-Win2k ::= SEQUENCE {
-  nonce              [0] INTEGER (-2147483648..2147483647),
-  subjectPublicKey   [2]   BIT STRING {
-  },
-}
-*/
-
-typedef struct KDCDHKeyInfo_Win2k {
-  int nonce;
-  heim_bit_string subjectPublicKey;
-} KDCDHKeyInfo_Win2k;
-
-ASN1EXP int    ASN1CALL decode_KDCDHKeyInfo_Win2k(const unsigned char *, size_t, KDCDHKeyInfo_Win2k *, size_t *);
-ASN1EXP int    ASN1CALL encode_KDCDHKeyInfo_Win2k(unsigned char *, size_t, const KDCDHKeyInfo_Win2k *, size_t *);
-ASN1EXP size_t ASN1CALL length_KDCDHKeyInfo_Win2k(const KDCDHKeyInfo_Win2k *);
-ASN1EXP int    ASN1CALL copy_KDCDHKeyInfo_Win2k  (const KDCDHKeyInfo_Win2k *, KDCDHKeyInfo_Win2k *);
-ASN1EXP void   ASN1CALL free_KDCDHKeyInfo_Win2k  (KDCDHKeyInfo_Win2k *);
-
-
-/*
-ReplyKeyPack-Win2k ::= SEQUENCE {
-  replyKey        [0] EncryptionKey,
-  nonce           [1] INTEGER (-2147483648..2147483647),
-  ...,
-}
-*/
-
-typedef struct ReplyKeyPack_Win2k {
-  EncryptionKey replyKey;
-  int nonce;
-} ReplyKeyPack_Win2k;
-
-ASN1EXP int    ASN1CALL decode_ReplyKeyPack_Win2k(const unsigned char *, size_t, ReplyKeyPack_Win2k *, size_t *);
-ASN1EXP int    ASN1CALL encode_ReplyKeyPack_Win2k(unsigned char *, size_t, const ReplyKeyPack_Win2k *, size_t *);
-ASN1EXP size_t ASN1CALL length_ReplyKeyPack_Win2k(const ReplyKeyPack_Win2k *);
-ASN1EXP int    ASN1CALL copy_ReplyKeyPack_Win2k  (const ReplyKeyPack_Win2k *, ReplyKeyPack_Win2k *);
-ASN1EXP void   ASN1CALL free_ReplyKeyPack_Win2k  (ReplyKeyPack_Win2k *);
-
-
-/*
-PA-PK-AS-REP-BTMM ::= SEQUENCE {
-  dhSignedData    [0] heim_any OPTIONAL,
-  encKeyPack      [1] heim_any OPTIONAL,
-}
-*/
-
-typedef struct PA_PK_AS_REP_BTMM {
-  heim_any *dhSignedData;
-  heim_any *encKeyPack;
-} PA_PK_AS_REP_BTMM;
-
-ASN1EXP int    ASN1CALL decode_PA_PK_AS_REP_BTMM(const unsigned char *, size_t, PA_PK_AS_REP_BTMM *, size_t *);
-ASN1EXP int    ASN1CALL encode_PA_PK_AS_REP_BTMM(unsigned char *, size_t, const PA_PK_AS_REP_BTMM *, size_t *);
-ASN1EXP size_t ASN1CALL length_PA_PK_AS_REP_BTMM(const PA_PK_AS_REP_BTMM *);
-ASN1EXP int    ASN1CALL copy_PA_PK_AS_REP_BTMM  (const PA_PK_AS_REP_BTMM *, PA_PK_AS_REP_BTMM *);
-ASN1EXP void   ASN1CALL free_PA_PK_AS_REP_BTMM  (PA_PK_AS_REP_BTMM *);
-
-
-/*
-PkinitSP80056AOtherInfo ::= SEQUENCE {
-  algorithmID     AlgorithmIdentifier,
-  partyUInfo      [0] OCTET STRING,
-  partyVInfo      [1] OCTET STRING,
-  suppPubInfo     [2] OCTET STRING OPTIONAL,
-  suppPrivInfo    [3] OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct PkinitSP80056AOtherInfo {
-  AlgorithmIdentifier algorithmID;
-  heim_octet_string partyUInfo;
-  heim_octet_string partyVInfo;
-  heim_octet_string *suppPubInfo;
-  heim_octet_string *suppPrivInfo;
-} PkinitSP80056AOtherInfo;
-
-ASN1EXP int    ASN1CALL decode_PkinitSP80056AOtherInfo(const unsigned char *, size_t, PkinitSP80056AOtherInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_PkinitSP80056AOtherInfo(unsigned char *, size_t, const PkinitSP80056AOtherInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_PkinitSP80056AOtherInfo(const PkinitSP80056AOtherInfo *);
-ASN1EXP int    ASN1CALL copy_PkinitSP80056AOtherInfo  (const PkinitSP80056AOtherInfo *, PkinitSP80056AOtherInfo *);
-ASN1EXP void   ASN1CALL free_PkinitSP80056AOtherInfo  (PkinitSP80056AOtherInfo *);
-
-
-/*
-PkinitSuppPubInfo ::= SEQUENCE {
-  enctype         [0] INTEGER (-2147483648..2147483647),
-  as-REQ          [1] OCTET STRING,
-  pk-as-rep       [2] OCTET STRING,
-  ticket          [3] Ticket,
-  ...,
-}
-*/
-
-typedef struct PkinitSuppPubInfo {
-  int enctype;
-  heim_octet_string as_REQ;
-  heim_octet_string pk_as_rep;
-  Ticket ticket;
-} PkinitSuppPubInfo;
-
-ASN1EXP int    ASN1CALL decode_PkinitSuppPubInfo(const unsigned char *, size_t, PkinitSuppPubInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_PkinitSuppPubInfo(unsigned char *, size_t, const PkinitSuppPubInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_PkinitSuppPubInfo(const PkinitSuppPubInfo *);
-ASN1EXP int    ASN1CALL copy_PkinitSuppPubInfo  (const PkinitSuppPubInfo *, PkinitSuppPubInfo *);
-ASN1EXP void   ASN1CALL free_PkinitSuppPubInfo  (PkinitSuppPubInfo *);
-
-
-#endif /* __pkinit_asn1_h__ */
diff --git a/include.new/pmc.h b/include.new/pmc.h
deleted file mode 100644
index ae93d8c..0000000
--- a/include.new/pmc.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 2003,2004 Joseph Koshy
- * 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.
- *
- * 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: releng/10.2/lib/libpmc/pmc.h 233321 2012-03-22 19:04:22Z jkoshy $
- */
-
-#ifndef _PMC_H_
-#define _PMC_H_
-
-#include <sys/cdefs.h>
-#include <sys/pmc.h>
-
-/*
- * Driver statistics.
- */
-struct pmc_driverstats {
-	int	pm_intr_ignored;	/* #interrupts ignored */
-	int	pm_intr_processed;	/* #interrupts processed */
-	int	pm_intr_bufferfull;	/* #interrupts with ENOSPC */
-	int	pm_syscalls;		/* #syscalls */
-	int	pm_syscall_errors;	/* #syscalls with errors */
-	int	pm_buffer_requests;	/* #buffer requests */
-	int	pm_buffer_requests_failed; /* #failed buffer requests */
-	int	pm_log_sweeps;		/* #sample buffer processing passes */
-};
-
-/*
- * CPU information.
- */
-struct pmc_cpuinfo {
-	enum pmc_cputype pm_cputype;	/* the kind of CPU */
-	uint32_t	pm_ncpu;	/* number of CPUs */
-	uint32_t	pm_npmc;	/* #PMCs per CPU */
-	uint32_t	pm_nclass;	/* #classes of PMCs */
-	struct pmc_classinfo pm_classes[PMC_CLASS_MAX];
-};
-
-/*
- * Current PMC state.
- */
-struct pmc_pmcinfo {
-	int32_t		pm_cpu;		/* CPU number */
-	struct pmc_info	pm_pmcs[];	/* NPMC structs */
-};
-
-/*
- * Prototypes
- */
-
-__BEGIN_DECLS
-int	pmc_allocate(const char *_ctrspec, enum pmc_mode _mode, uint32_t _flags,
-    int _cpu, pmc_id_t *_pmcid);
-int	pmc_attach(pmc_id_t _pmcid, pid_t _pid);
-int	pmc_capabilities(pmc_id_t _pmc, uint32_t *_caps);
-int	pmc_configure_logfile(int _fd);
-int	pmc_flush_logfile(void);
-int	pmc_close_logfile(void);
-int	pmc_detach(pmc_id_t _pmcid, pid_t _pid);
-int	pmc_disable(int _cpu, int _pmc);
-int	pmc_enable(int _cpu, int _pmc);
-int	pmc_get_driver_stats(struct pmc_driverstats *_gms);
-int	pmc_get_msr(pmc_id_t _pmc, uint32_t *_msr);
-int	pmc_init(void);
-int	pmc_read(pmc_id_t _pmc, pmc_value_t *_value);
-int	pmc_release(pmc_id_t _pmc);
-int	pmc_rw(pmc_id_t _pmc, pmc_value_t _newvalue, pmc_value_t *_oldvalue);
-int	pmc_set(pmc_id_t _pmc, pmc_value_t _value);
-int	pmc_start(pmc_id_t _pmc);
-int	pmc_stop(pmc_id_t _pmc);
-int	pmc_width(pmc_id_t _pmc, uint32_t *_width);
-int	pmc_write(pmc_id_t _pmc, pmc_value_t _value);
-int	pmc_writelog(uint32_t _udata);
-
-int	pmc_ncpu(void);
-int	pmc_npmc(int _cpu);
-int	pmc_cpuinfo(const struct pmc_cpuinfo **_cpu_info);
-int	pmc_pmcinfo(int _cpu, struct pmc_pmcinfo **_pmc_info);
-
-const char	*pmc_name_of_capability(enum pmc_caps _c);
-const char	*pmc_name_of_class(enum pmc_class _pc);
-const char	*pmc_name_of_cputype(enum pmc_cputype _cp);
-const char	*pmc_name_of_disposition(enum pmc_disp _pd);
-const char	*pmc_name_of_event(enum pmc_event _pe);
-const char	*pmc_name_of_mode(enum pmc_mode _pm);
-const char	*pmc_name_of_state(enum pmc_state _ps);
-
-int	pmc_event_names_of_class(enum pmc_class _cl, const char ***_eventnames,
-    int *_nevents);
-__END_DECLS
-
-#endif
diff --git a/include.new/pmclog.h b/include.new/pmclog.h
deleted file mode 100644
index 158392e..0000000
--- a/include.new/pmclog.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * Copyright (c) 2005-2007 Joseph Koshy
- * Copyright (c) 2007 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by A. Joseph Koshy under
- * sponsorship from the FreeBSD Foundation and Google, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libpmc/pmclog.h 233628 2012-03-28 20:58:30Z fabient $
- */
-
-#ifndef	_PMCLOG_H_
-#define	_PMCLOG_H_
-
-#include <sys/cdefs.h>
-#include <sys/pmclog.h>
-
-enum pmclog_state {
-	PMCLOG_OK,
-	PMCLOG_EOF,
-	PMCLOG_REQUIRE_DATA,
-	PMCLOG_ERROR
-};
-
-struct pmclog_ev_callchain {
-	uint32_t	pl_pid;
-	uint32_t	pl_pmcid;
-	uint32_t	pl_cpuflags;
-	uint32_t	pl_npc;
-	uintfptr_t	pl_pc[PMC_CALLCHAIN_DEPTH_MAX];
-};
-
-struct pmclog_ev_dropnotify {
-};
-
-struct pmclog_ev_closelog {
-};
-
-struct pmclog_ev_initialize {
-	uint32_t	pl_version;
-	uint32_t	pl_arch;
-};
-
-struct pmclog_ev_map_in {
-	pid_t		pl_pid;
-	uintfptr_t	pl_start;
-	char		pl_pathname[PATH_MAX];
-};
-
-struct pmclog_ev_map_out {
-	pid_t		pl_pid;
-	uintfptr_t	pl_start;
-	uintfptr_t	pl_end;
-};
-
-struct pmclog_ev_pcsample {
-	uintfptr_t	pl_pc;
-	pid_t		pl_pid;
-	pmc_id_t	pl_pmcid;
-	uint32_t	pl_usermode;
-};
-
-struct pmclog_ev_pmcallocate {
-	uint32_t	pl_event;
-	const char *	pl_evname;
-	uint32_t	pl_flags;
-	pmc_id_t	pl_pmcid;
-};
-
-struct pmclog_ev_pmcallocatedyn {
-	uint32_t	pl_event;
-	char 		pl_evname[PMC_NAME_MAX];
-	uint32_t	pl_flags;
-	pmc_id_t	pl_pmcid;
-};
-
-struct pmclog_ev_pmcattach {
-	pmc_id_t	pl_pmcid;
-	pid_t		pl_pid;
-	char		pl_pathname[PATH_MAX];
-};
-
-struct pmclog_ev_pmcdetach {
-	pmc_id_t	pl_pmcid;
-	pid_t		pl_pid;
-};
-
-struct pmclog_ev_proccsw {
-	pid_t		pl_pid;
-	pmc_id_t	pl_pmcid;
-	pmc_value_t	pl_value;
-};
-
-struct pmclog_ev_procexec {
-	pid_t		pl_pid;
-	pmc_id_t	pl_pmcid;
-	uintfptr_t	pl_entryaddr;
-	char		pl_pathname[PATH_MAX];
-};
-
-struct pmclog_ev_procexit {
-	uint32_t	pl_pid;
-	pmc_id_t	pl_pmcid;
-	pmc_value_t	pl_value;
-};
-
-struct pmclog_ev_procfork {
-	pid_t		pl_oldpid;
-	pid_t		pl_newpid;
-};
-
-struct pmclog_ev_sysexit {
-	pid_t		pl_pid;
-};
-
-struct pmclog_ev_userdata {
-	uint32_t	pl_userdata;
-};
-
-struct pmclog_ev {
-	enum pmclog_state pl_state;	/* state after 'get_event()' */
-	off_t		  pl_offset;	/* byte offset in stream */
-	size_t		  pl_count;	/* count of records so far */
-	struct timespec   pl_ts;	/* log entry timestamp */
-	enum pmclog_type  pl_type;	/* type of log entry */
-	union { 			/* log entry data */
-		struct pmclog_ev_callchain	pl_cc;
-		struct pmclog_ev_closelog	pl_cl;
-		struct pmclog_ev_dropnotify	pl_dn;
-		struct pmclog_ev_initialize	pl_i;
-		struct pmclog_ev_map_in		pl_mi;
-		struct pmclog_ev_map_out	pl_mo;
-		struct pmclog_ev_pcsample	pl_s;
-		struct pmclog_ev_pmcallocate	pl_a;
-		struct pmclog_ev_pmcallocatedyn	pl_ad;
-		struct pmclog_ev_pmcattach	pl_t;
-		struct pmclog_ev_pmcdetach	pl_d;
-		struct pmclog_ev_proccsw	pl_c;
-		struct pmclog_ev_procexec	pl_x;
-		struct pmclog_ev_procexit	pl_e;
-		struct pmclog_ev_procfork	pl_f;
-		struct pmclog_ev_sysexit	pl_se;
-		struct pmclog_ev_userdata	pl_u;
-	} pl_u;
-};
-
-#define	PMCLOG_FD_NONE				(-1)
-
-__BEGIN_DECLS
-void	*pmclog_open(int _fd);
-int	pmclog_feed(void *_cookie, char *_data, int _len);
-int	pmclog_read(void *_cookie, struct pmclog_ev *_ev);
-void	pmclog_close(void *_cookie);
-__END_DECLS
-
-#endif
-
diff --git a/include.new/pmmintrin.h b/include.new/pmmintrin.h
deleted file mode 100644
index 3b18e2a..0000000
--- a/include.new/pmmintrin.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
-
-   This file is part of GCC.
-
-   GCC is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GCC is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you include this header file into source
-   files compiled by GCC, this header file does not by itself cause
-   the resulting executable to be covered by the GNU General Public
-   License.  This exception does not however invalidate any other
-   reasons why the executable file might be covered by the GNU General
-   Public License.  */
-
-/* Implemented from the specification included in the Intel C++ Compiler
-   User Guide and Reference, version 8.0.  */
-
-#ifndef _PMMINTRIN_H_INCLUDED
-#define _PMMINTRIN_H_INCLUDED
-
-#ifdef __SSE3__
-#include <xmmintrin.h>
-#include <emmintrin.h>
-
-/* Additional bits in the MXCSR.  */
-#define _MM_DENORMALS_ZERO_MASK		0x0040
-#define _MM_DENORMALS_ZERO_ON		0x0040
-#define _MM_DENORMALS_ZERO_OFF		0x0000
-
-#define _MM_SET_DENORMALS_ZERO_MODE(mode) \
-  _mm_setcsr ((_mm_getcsr () & ~_MM_DENORMALS_ZERO_MASK) | (mode))
-#define _MM_GET_DENORMALS_ZERO_MODE() \
-  (_mm_getcsr() & _MM_DENORMALS_ZERO_MASK)
-
-static __inline __m128
-_mm_addsub_ps (__m128 __X, __m128 __Y)
-{
-  return (__m128) __builtin_ia32_addsubps ((__v4sf)__X, (__v4sf)__Y);
-}
-
-static __inline __m128
-_mm_hadd_ps (__m128 __X, __m128 __Y)
-{
-  return (__m128) __builtin_ia32_haddps ((__v4sf)__X, (__v4sf)__Y);
-}
-
-static __inline __m128
-_mm_hsub_ps (__m128 __X, __m128 __Y)
-{
-  return (__m128) __builtin_ia32_hsubps ((__v4sf)__X, (__v4sf)__Y);
-}
-
-static __inline __m128
-_mm_movehdup_ps (__m128 __X)
-{
-  return (__m128) __builtin_ia32_movshdup ((__v4sf)__X);
-}
-
-static __inline __m128
-_mm_moveldup_ps (__m128 __X)
-{
-  return (__m128) __builtin_ia32_movsldup ((__v4sf)__X);
-}
-
-static __inline __m128d
-_mm_addsub_pd (__m128d __X, __m128d __Y)
-{
-  return (__m128d) __builtin_ia32_addsubpd ((__v2df)__X, (__v2df)__Y);
-}
-
-static __inline __m128d
-_mm_hadd_pd (__m128d __X, __m128d __Y)
-{
-  return (__m128d) __builtin_ia32_haddpd ((__v2df)__X, (__v2df)__Y);
-}
-
-static __inline __m128d
-_mm_hsub_pd (__m128d __X, __m128d __Y)
-{
-  return (__m128d) __builtin_ia32_hsubpd ((__v2df)__X, (__v2df)__Y);
-}
-
-static __inline __m128d
-_mm_loaddup_pd (double const *__P)
-{
-  return (__m128d) __builtin_ia32_loadddup (__P);
-}
-
-static __inline __m128d
-_mm_movedup_pd (__m128d __X)
-{
-  return (__m128d) __builtin_ia32_movddup ((__v2df)__X);
-}
-
-static __inline __m128i
-_mm_lddqu_si128 (__m128i const *__P)
-{
-  return (__m128i) __builtin_ia32_lddqu ((char const *)__P);
-}
-
-#if 0
-static __inline void
-_mm_monitor (void const * __P, unsigned int __E, unsigned int __H)
-{
-  __builtin_ia32_monitor (__P, __E, __H);
-}
-
-static __inline void
-_mm_mwait (unsigned int __E, unsigned int __H)
-{
-  __builtin_ia32_mwait (__E, __H);
-}
-#else
-#define _mm_monitor(P, E, H)	__builtin_ia32_monitor ((P), (E), (H))
-#define _mm_mwait(E, H)		__builtin_ia32_mwait ((E), (H))
-#endif
-
-#endif /* __SSE3__ */
-
-#endif /* _PMMINTRIN_H_INCLUDED */
diff --git a/include.new/poll.h b/include.new/poll.h
deleted file mode 100644
index e99242e..0000000
--- a/include.new/poll.h
+++ /dev/null
@@ -1,122 +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: releng/10.2/sys/sys/poll.h 275986 2014-12-21 07:58:28Z dchagin $
- */
-
-#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
-
-#if __BSD_VISIBLE
-#include <sys/_types.h>
-
-#include <sys/_sigset.h>
-#include <sys/timespec.h>
-
-#ifndef _SIGSET_T_DECLARED
-#define	_SIGSET_T_DECLARED
-typedef	__sigset_t	sigset_t;
-#endif
-
-#endif
-
-__BEGIN_DECLS
-int	poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout);
-#if __BSD_VISIBLE
-int	ppoll(struct pollfd _pfd[], nfds_t _nfds,
-	    const struct timespec *__restrict _timeout,
-	    const sigset_t *__restrict _newsigmask);
-#endif
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_POLL_H_ */
diff --git a/include.new/posix4/_semaphore.h b/include.new/posix4/_semaphore.h
deleted file mode 100644
index 64ad946..0000000
--- a/include.new/posix4/_semaphore.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 2002 Alfred Perlstein <alfred@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.
- *
- * 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/posix4/_semaphore.h,v 1.4 2005/01/07 02:29:19 imp Exp $
- */
-#ifndef __SEMAPHORE_H_
-#define __SEMAPHORE_H_
-
-typedef intptr_t semid_t;
-struct timespec;
-
-#ifndef _KERNEL
-
-#include <sys/cdefs.h>
-
-/*
- * Semaphore definitions.
- */
-struct sem {
-#define SEM_MAGIC       ((uint32_t) 0x09fa4012)
-        uint32_t       magic;
-        pthread_mutex_t lock;
-        pthread_cond_t  gtzero;
-        uint32_t       count;
-        uint32_t       nwaiters;
-#define SEM_USER        (NULL)
-        semid_t         semid;  /* semaphore id if kernel (shared) semaphore */
-        int             syssem; /* 1 if kernel (shared) semaphore */
-        LIST_ENTRY(sem) entry;
-        struct sem      **backpointer;
-};
-
-__BEGIN_DECLS
-
-int ksem_close(semid_t id);
-int ksem_post(semid_t id);
-int ksem_wait(semid_t id);
-int ksem_trywait(semid_t id);
-int ksem_timedwait(semid_t id, struct timespec *abstime);
-int ksem_init(semid_t *idp, unsigned int value);
-int ksem_open(semid_t *idp, const char *name, int oflag, mode_t mode,
-    unsigned int value);
-int ksem_unlink(const char *name);
-int ksem_getvalue(semid_t id, int *val);
-int ksem_destroy(semid_t id);
-
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* __SEMAPHORE_H_ */
diff --git a/include.new/posix4/ksem.h b/include.new/posix4/ksem.h
deleted file mode 100644
index a110fe3..0000000
--- a/include.new/posix4/ksem.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2002 Alfred Perlstein <alfred@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.
- *
- * 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/posix4/ksem.h,v 1.2 2005/05/04 10:39:14 rwatson Exp $
- */
-
-#ifndef _POSIX4_KSEM_H_
-#define	_POSIX4_KSEM_H_
-
-#ifndef _KERNEL
-#error "no user-servicable parts inside"
-#endif
-
-#include <sys/condvar.h>
-#include <sys/queue.h>
-
-struct kuser {
-	pid_t ku_pid;
-	LIST_ENTRY(kuser) ku_next;
-};
-
-struct ksem {
-	LIST_ENTRY(ksem) ks_entry;	/* global list entry */
-	int ks_onlist;			/* boolean if on a list (ks_entry) */
-	char *ks_name;			/* if named, this is the name */
-	int ks_ref;			/* number of references */
-	mode_t ks_mode;			/* protection bits */
-	uid_t ks_uid;			/* creator uid */
-	gid_t ks_gid;			/* creator gid */
-	unsigned int ks_value;		/* current value */
-	struct cv ks_cv;		/* waiters sleep here */
-	int ks_waiters;			/* number of waiters */
-	LIST_HEAD(, kuser) ks_users;	/* pids using this sem */
-	struct label *ks_label;		/* MAC label */
-};
-
-#endif /* !_POSIX4_KSEM_H_ */
diff --git a/include.new/posix4/mqueue.h b/include.new/posix4/mqueue.h
deleted file mode 100644
index f04c72a..0000000
--- a/include.new/posix4/mqueue.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1996, 1997
- *	HD Associates, Inc.  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 HD Associates, Inc
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES 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 HD ASSOCIATES 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/posix4/mqueue.h,v 1.6 2002/09/20 17:54:34 mike Exp $
- */
-
-/* mqueue.h: POSIX 1003.1b Message Queues */
-
-#ifndef _MQUEUE_H_
-#define	_MQUEUE_H_
-
-#include <sys/_posix.h>
-
-#ifdef _P1003_1B_INCLUDE_MAYBES
-#include <sys/types.h>
-#include <fcntl.h>
-#include <time.h>
-#include <signal.h>
-#else
-struct sigevent;
-#endif
-
-typedef	int		mqd_t;	/* message queue descriptors */
-
-struct mq_attr {
-	long	mq_flags;	/* message queue flags */
-	long	mq_maxmsg;	/* maximum number of messages */
-	long	mq_msgsize;	/* maximum message size */
-	long	mq_curmsgs;	/* number of messages currently queued */
-};
-
-#ifndef _KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	 mq_close(mqd_t);
-int	 mq_getattr(mqd_t, struct mq_attr *);
-int	 mq_notify(mqd_t, const struct sigevent *);
-mqd_t	 mq_open(const char *, int oflag, ...);
-ssize_t	 mq_receive(mqd_t, char *, size_t, unsigned int *);
-int	 mq_send(mqd_t, const char *, size_t, unsigned int);
-int	 mq_setattr(mqd_t, const struct mq_attr *, struct mq_attr *);
-int	 mq_unlink(const char *);
-__END_DECLS
-
-#endif
-
-#endif /* !_MQUEUE_H_ */
diff --git a/include.new/posix4/posix4.h b/include.new/posix4/posix4.h
deleted file mode 100644
index ae5077a..0000000
--- a/include.new/posix4/posix4.h
+++ /dev/null
@@ -1,116 +0,0 @@
-#ifndef _P1003_1B_P1003_1B_H_
-#define _P1003_1B_P1003_1B_H_
-/*-
- * Copyright (c) 1996, 1997, 1998
- *	HD Associates, Inc.  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 HD Associates, Inc
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES 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 HD ASSOCIATES 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/posix4/posix4.h,v 1.13 2003/02/19 05:47:42 imp Exp $
- */
-
-#include <sys/param.h>
-#include <sys/ioccom.h>
-#include <sys/malloc.h>
-#include <posix4/sched.h>
-
-/* Generate syscall stubs for when something is optionally
- * loadable as a module.  References "syscall_not_present". 
- * XXX Good candidate for sys/syscall.h
- */
-struct proc;
-struct nosys_args;
-extern int syscall_not_present(struct thread *, const char *, struct nosys_args *);
-
-#define SYSCALL_NOT_PRESENT_GEN(SC) \
-int SC (struct thread *td, struct SC##_args *uap) \
-{ \
-	return syscall_not_present(td, #SC , (struct nosys_args *)uap); \
-}
-
-
-MALLOC_DECLARE(M_P31B);
-
-#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, M_WAITOK)
-#define p31b_free(P) free((P), M_P31B)
-
-int p31b_proc(struct proc *, pid_t, struct proc **);
-
-void p31b_setcfg(int, int);
-int p31b_getcfg(int);
-int p31b_iscfg(int);
-
-#ifdef _KPOSIX_PRIORITY_SCHEDULING
-
-/* 
- * KSCHED_OP_RW is a vector of read/write flags for each entry indexed
- * by the enum ksched_op.
- *
- * 1 means you need write access, 0 means read is sufficient.
- */
-
-enum ksched_op {
-
-#define KSCHED_OP_RW { 1, 0, 1, 0, 0, 0, 0, 0 }
-
-	SCHED_SETPARAM,
-	SCHED_GETPARAM,
-	SCHED_SETSCHEDULER,
-	SCHED_GETSCHEDULER,
-	SCHED_YIELD,
-	SCHED_GET_PRIORITY_MAX,
-	SCHED_GET_PRIORITY_MIN,
-	SCHED_RR_GET_INTERVAL,
-	SCHED_OP_MAX
-};
-
-struct ksched;
-
-int ksched_attach(struct ksched **);
-int ksched_detach(struct ksched *);
-
-int ksched_setparam(register_t *, struct ksched *,
-	struct thread *, const struct sched_param *);
-int ksched_getparam(register_t *, struct ksched *,
-	struct thread *, struct sched_param *);
-
-int ksched_setscheduler(register_t *, struct ksched *,
-	struct thread *, int, const struct sched_param *);
-int ksched_getscheduler(register_t *, struct ksched *, struct thread *);
-
-int ksched_yield(register_t *, struct ksched *);
-
-int ksched_get_priority_max(register_t *, struct ksched *, int);
-int ksched_get_priority_min(register_t *, struct ksched *, int);
-
-int ksched_rr_get_interval(register_t *, struct ksched *,
-	struct thread *, struct timespec *);
-
-#endif /* _KPOSIX_PRIORITY_SCHEDULING */
-
-#endif /* _P1003_1B_P1003_1B_H_ */
diff --git a/include.new/posix4/sched.h b/include.new/posix4/sched.h
deleted file mode 100644
index 0079d9a..0000000
--- a/include.new/posix4/sched.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1996, 1997
- *	HD Associates, Inc.  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 HD Associates, Inc
- *	and Jukka Antero Ukkonen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES 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 HD ASSOCIATES 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/posix4/sched.h,v 1.7 2002/10/03 06:27:50 mike Exp $
- */
-
-/* sched.h: POSIX 1003.1b Process Scheduling header */
-
-#ifndef _SCHED_H_
-#define _SCHED_H_
-
-#include <sys/_types.h>
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-/*
- * Scheduling policies
- */
-#define	SCHED_FIFO	1
-#define	SCHED_OTHER	2
-#define	SCHED_RR	3
-
-struct sched_param {
-	int	sched_priority;
-};
-
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-
-struct timespec;
-
-__BEGIN_DECLS
-int	sched_get_priority_max(int);
-int	sched_get_priority_min(int);
-int	sched_getparam(pid_t, struct sched_param *);
-int	sched_getscheduler(pid_t);
-int	sched_rr_get_interval(pid_t, struct timespec *);
-int	sched_setparam(pid_t, const struct sched_param *);
-int	sched_setscheduler(pid_t, int, const struct sched_param *);
-int	sched_yield(void);
-__END_DECLS
-
-#endif
-
-#endif /* !_SCHED_H_ */
diff --git a/include.new/posix4/semaphore.h b/include.new/posix4/semaphore.h
deleted file mode 100644
index b2daf34..0000000
--- a/include.new/posix4/semaphore.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1996, 1997
- *	HD Associates, Inc.  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 HD Associates, Inc
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES 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 HD ASSOCIATES 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/posix4/semaphore.h,v 1.11 2004/02/03 22:27:03 deischen Exp $
- */
-
-/* semaphore.h: POSIX 1003.1b semaphores */
-
-#ifndef _SEMAPHORE_H_
-#define _SEMAPHORE_H_
-
-/* Opaque type definition. */
-struct sem;
-typedef	struct sem *	sem_t;
-
-#define	SEM_FAILED	((sem_t *)0)
-#define	SEM_VALUE_MAX	(~0U)		/* Equivalent to UINT_MAX. */
-
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-
-struct timespec;
-
-__BEGIN_DECLS
-int	 sem_close(sem_t *);
-int	 sem_destroy(sem_t *);
-int	 sem_getvalue(sem_t * __restrict, int * __restrict);
-int	 sem_init(sem_t *, int, unsigned int);
-sem_t	*sem_open(const char *, int, ...);
-int	 sem_post(sem_t *);
-int	 sem_timedwait(sem_t * __restrict, const struct timespec * __restrict);
-int	 sem_trywait(sem_t *);
-int	 sem_unlink(const char *);
-int	 sem_wait(sem_t *);
-__END_DECLS
-
-#endif
-
-#endif /* !_SEMAPHORE_H_ */
diff --git a/include.new/printf.h b/include.new/printf.h
deleted file mode 100644
index a255e32..0000000
--- a/include.new/printf.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/include/printf.h 238111 2012-07-04 17:35:07Z pjd $
- */
-
-#ifndef _PRINTF_H_
-#define _PRINTF_H_
-
-#include <stdio.h>
-#include <wchar.h>
-
-/*
- * The API defined by glibc allows a renderer to take multiple arguments
- * This is obviously usable for things like (ptr+len) pairs etc.
- * But the do not actually provide support for it at the end of the day,
- * they offer only one argument to the arginfo function, but do accept
- * >1 returns, although the do not check the types of those arguments
- * argument
- * Be compatible for now.
- */
-#define __PRINTFMAXARG		2
-
-struct printf_info {
-	/* GLIBC compatible */
-	int		prec;
-	int		width;
-	wchar_t		spec;
-	unsigned 	is_long_double;
-	unsigned 	is_char;
-	unsigned	is_short;
-	unsigned	is_long;
-	unsigned	alt;
-	unsigned	space;
-	unsigned	left;
-	unsigned	showsign;
-	unsigned	group;
-	unsigned	extra;
-	unsigned	wide;
-	wchar_t		pad;
-
-	/* FreeBSD extensions */
-
-	unsigned	is_quad;
-	unsigned	is_intmax;
-	unsigned	is_ptrdiff;
-	unsigned	is_size;
-
-	/* private */
-	int		sofar;
-	unsigned	get_width;
-	unsigned	get_prec;
-	const char	*begin;
-	const char	*end;
-	void 		*arg[__PRINTFMAXARG];
-};
-
-enum {
-	PA_INT		= (1 << 0),	/* int */
-	PA_CHAR		= (1 << 1),	/* int, cast to char */
-	PA_WCHAR	= (1 << 2),	/* wide char */
-	PA_STRING	= (1 << 3),	/* const char * (with '\0') */
-	PA_WSTRING	= (1 << 4),	/* const wchar_t * */
-	PA_POINTER	= (1 << 5),	/* void * */
-	PA_FLOAT	= (1 << 6),	/* float */
-	PA_DOUBLE	= (1 << 7) 	/* double */
-};
-
-#define	PA_FLAG_MASK		0xff0000
-#define	PA_FLAG_LONG_LONG	(1 << 16)
-#define	PA_FLAG_LONG		(1 << 17)
-#define	PA_FLAG_SHORT		(1 << 18)
-#define	PA_FLAG_PTR		(1 << 19)
-#define	PA_FLAG_QUAD		(1 << 20)
-#define	PA_FLAG_INTMAX		(1 << 21)
-#define	PA_FLAG_SIZE		(1 << 22)
-#define	PA_FLAG_PTRDIFF		(1 << 23)
-#define	PA_FLAG_LONG_DOUBLE	PA_FLAG_LONG_LONG
-
-typedef int printf_arginfo_function(const struct printf_info *, size_t, int *);
-typedef int printf_function(FILE *, const struct printf_info *, const void *const *);
-
-/* FreeBSD extension */
-struct __printf_io;
-typedef int printf_render(struct __printf_io *, const struct printf_info *, const void *const *);
-
-/* vprintf.c */
-extern const char __lowercase_hex[17];
-extern const char __uppercase_hex[17];
-
-void __printf_flush(struct __printf_io *io);
-int __printf_puts(struct __printf_io *io, const void *ptr, int len);
-int __printf_pad(struct __printf_io *io, int n, int zero);
-int __printf_out(struct __printf_io *io, const struct printf_info *pi, const void *ptr, int len);
-
-int __xvprintf(FILE *fp, const char *fmt0, va_list ap);
-extern int __use_xprintf;
-
-/* GLIBC compat */
-int register_printf_function(int spec, printf_function *render, printf_arginfo_function *arginfo);
-
-/* FreeBSD */
-int register_printf_render(int spec, printf_render *render, printf_arginfo_function *arginfo);
-int register_printf_render_std(const char *specs);
-
-/* vprintf_errno.c */
-printf_arginfo_function		__printf_arginfo_errno;
-printf_render			__printf_render_errno;
-
-/* vprintf_float.c */
-printf_arginfo_function		__printf_arginfo_float;
-printf_render			__printf_render_float;
-
-/* vprintf_hexdump.c */
-printf_arginfo_function		__printf_arginfo_hexdump;
-printf_render 			__printf_render_hexdump;
-
-/* vprintf_int.c */
-printf_arginfo_function		__printf_arginfo_ptr;
-printf_arginfo_function		__printf_arginfo_int;
-printf_render			__printf_render_ptr;
-printf_render			__printf_render_int;
-
-/* vprintf_quoute.c */
-printf_arginfo_function		__printf_arginfo_quote;
-printf_render 			__printf_render_quote;
-
-/* vprintf_str.c */
-printf_arginfo_function		__printf_arginfo_chr;
-printf_render			__printf_render_chr;
-printf_arginfo_function		__printf_arginfo_str;
-printf_render			__printf_render_str;
-
-/* vprintf_time.c */
-printf_arginfo_function		__printf_arginfo_time;
-printf_render			__printf_render_time;
-
-/* vprintf_vis.c */
-printf_arginfo_function		__printf_arginfo_vis;
-printf_render 			__printf_render_vis;
-
-#endif /* !_PRINTF_H */
diff --git a/include.new/proc_service.h b/include.new/proc_service.h
deleted file mode 100644
index 4243dd2..0000000
--- a/include.new/proc_service.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2004 David Xu <davidxu@freebsd.org>
- * Copyright (c) 2004 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/include/proc_service.h 155412 2006-02-07 02:29:55Z davidxu $
- */
-
-#ifndef _PROC_SERVICE_H_
-#define	_PROC_SERVICE_H_
-
-#include <sys/types.h>
-#include <sys/procfs.h>
-
-typedef enum {
-	PS_OK = 0,		/* No errors. */
-	PS_ERR,			/* Generic error. */
-	PS_BADADDR,		/* Bad address. */
-	PS_BADLID,		/* Bad LWP Id. */
-	PS_BADPID,		/* Bad process Id. */
-	PS_NOFREGS,		/* FPU register set not available. */
-	PS_NOSYM		/* Symbol not found. */
-} ps_err_e;
-
-struct ps_prochandle;		/* Opaque type. Defined by the implementor. */
-
-__BEGIN_DECLS
-ps_err_e ps_lcontinue(struct ps_prochandle *, lwpid_t);
-ps_err_e ps_lgetfpregs(struct ps_prochandle *, lwpid_t, prfpregset_t *);
-ps_err_e ps_lgetregs(struct ps_prochandle *, lwpid_t, prgregset_t);
-ps_err_e ps_lsetfpregs(struct ps_prochandle *, lwpid_t, const prfpregset_t *);
-ps_err_e ps_lsetregs(struct ps_prochandle *, lwpid_t, const prgregset_t);
-#ifdef __i386__
-ps_err_e ps_lgetxmmregs (struct ps_prochandle *, lwpid_t, char *);
-ps_err_e ps_lsetxmmregs (struct ps_prochandle *, lwpid_t, const char *);
-#endif
-ps_err_e ps_lstop(struct ps_prochandle *, lwpid_t);
-ps_err_e ps_linfo(struct ps_prochandle *, lwpid_t, void *);
-ps_err_e ps_pcontinue(struct ps_prochandle *);
-ps_err_e ps_pdmodel(struct ps_prochandle *, int *);
-ps_err_e ps_pglobal_lookup(struct ps_prochandle *, const char *, const char *,
-    psaddr_t *);
-void	 ps_plog(const char *, ...);
-ps_err_e ps_pread(struct ps_prochandle *, psaddr_t, void *, size_t);
-ps_err_e ps_pstop(struct ps_prochandle *);
-ps_err_e ps_pwrite(struct ps_prochandle *, psaddr_t, const void *, size_t);
-__END_DECLS
-
-#endif /* _PROC_SERVICE_H_ */
diff --git a/include.new/protocols/dumprestore.h b/include.new/protocols/dumprestore.h
deleted file mode 100644
index 8dbfa7f..0000000
--- a/include.new/protocols/dumprestore.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 1980, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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. 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.
- *
- *	@(#)dumprestore.h	8.2 (Berkeley) 1/21/94
- *
- * $FreeBSD: releng/10.2/include/protocols/dumprestore.h 235601 2012-05-18 10:01:31Z gleb $
- */
-
-#ifndef _PROTOCOLS_DUMPRESTORE_H_
-#define _PROTOCOLS_DUMPRESTORE_H_
-
-/*
- * TP_BSIZE is the size of file blocks on the dump tapes.
- * Note that TP_BSIZE must be a multiple of DEV_BSIZE.
- *
- * NTREC is the number of TP_BSIZE blocks that are written
- * in each tape record. HIGHDENSITYTREC is the number of
- * TP_BSIZE blocks that are written in each tape record on
- * 6250 BPI or higher density tapes.
- *
- * TP_NINDIR is the number of indirect pointers in a TS_INODE
- * or TS_ADDR record. Note that it must be a power of two.
- */
-#define TP_BSIZE	1024
-#define NTREC   	10
-#define HIGHDENSITYTREC	32
-#define TP_NINDIR	(TP_BSIZE/2)
-#define LBLSIZE		16
-#define NAMELEN		64
-
-#define OFS_MAGIC   	(int)60011
-#define NFS_MAGIC   	(int)60012
-#ifndef FS_UFS2_MAGIC
-#define FS_UFS2_MAGIC  	(int)0x19540119
-#endif
-#define CHECKSUM	(int)84446
-
-/*
- * Since ino_t size is changing to 64-bits, yet we desire this structure to
- * remain compatible with exiting dump formats, we do NOT use ino_t here,
- * but rather define a 32-bit type in its place.  At some point, it may be
- * necessary to use some of the c_spare[] in order to fully support 64-bit
- * inode numbers.
- */
-typedef uint32_t dump_ino_t;
-
-union u_spcl {
-	char dummy[TP_BSIZE];
-	struct	s_spcl {
-		int32_t	c_type;		    /* record type (see below) */
-		int32_t	c_old_date;	    /* date of this dump */
-		int32_t	c_old_ddate;	    /* date of previous dump */
-		int32_t	c_volume;	    /* dump volume number */
-		int32_t	c_old_tapea;	    /* logical block of this record */
-		dump_ino_t c_inumber;	    /* number of inode */
-		int32_t	c_magic;	    /* magic number (see above) */
-		int32_t	c_checksum;	    /* record checksum */
-		/*
-		 * Start old dinode structure, expanded for binary
-		 * compatibility with UFS1.
-		 */
-		u_int16_t c_mode;	    /* file mode */
-		int16_t	c_spare1[3];	    /* old nlink, ids */
-		u_int64_t c_size;	    /* file byte count */
-		int32_t	c_old_atime;	    /* old last access time, seconds */
-		int32_t	c_atimensec;	    /* last access time, nanoseconds */
-		int32_t	c_old_mtime;	    /* old last modified time, secs */
-		int32_t	c_mtimensec;	    /* last modified time, nanosecs */
-		int32_t	c_spare2[2];	    /* old ctime */
-		int32_t	c_rdev;		    /* for devices, device number */
-		int32_t	c_birthtimensec;    /* creation time, nanosecs */
-		int64_t	c_birthtime;	    /* creation time, seconds */
-		int64_t	c_atime;	    /* last access time, seconds */
-		int64_t	c_mtime;	    /* last modified time, seconds */
-		int32_t	c_extsize;	    /* external attribute size */
-		int32_t	c_spare4[6];	    /* old block pointers */
-		uint32_t c_file_flags;	    /* status flags (chflags) */
-		int32_t	c_spare5[2];	    /* old blocks, generation number */
-		uint32_t c_uid;	    /* file owner */
-		uint32_t c_gid;	    /* file group */
-		int32_t	c_spare6[2];	    /* previously unused spares */
-		/*
-		 * End old dinode structure.
-		 */
-		int32_t	c_count;	    /* number of valid c_addr entries */
-		char	c_addr[TP_NINDIR];  /* 1 => data; 0 => hole in inode */
-		char	c_label[LBLSIZE];   /* dump label */
-		int32_t	c_level;	    /* level of this dump */
-		char	c_filesys[NAMELEN]; /* name of dumpped file system */
-		char	c_dev[NAMELEN];	    /* name of dumpped device */
-		char	c_host[NAMELEN];    /* name of dumpped host */
-		int32_t	c_flags;	    /* additional information */
-		int32_t	c_old_firstrec;	    /* first record on volume */
-		int64_t	c_date;		    /* date of this dump */
-		int64_t	c_ddate;	    /* date of previous dump */
-		int64_t	c_tapea;	    /* logical block of this record */
-		int64_t	c_firstrec;	    /* first record on volume */
-		int32_t	c_spare[24];	    /* reserved for future uses */
-	} s_spcl;
-} u_spcl;
-#define spcl u_spcl.s_spcl
-/*
- * special record types
- */
-#define TS_TAPE 	1	/* dump tape header */
-#define TS_INODE	2	/* beginning of file record */
-#define TS_ADDR 	4	/* continuation of file record */
-#define TS_BITS 	3	/* map of inodes on tape */
-#define TS_CLRI 	6	/* map of inodes deleted since last dump */
-#define TS_END  	5	/* end of volume marker */
-
-#endif /* !_DUMPRESTORE_H_ */
diff --git a/include.new/protocols/routed.h b/include.new/protocols/routed.h
deleted file mode 100644
index 25c1f7e..0000000
--- a/include.new/protocols/routed.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * Copyright (c) 1983, 1989, 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. 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.
- *
- *	@(#)routed.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/protocols/routed.h 203965 2010-02-16 19:46:46Z imp $
- *	$Revision: 2.26 $
- */
-
-#ifndef _ROUTED_H_
-#define	_ROUTED_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Routing Information Protocol
- *
- * Derived from Xerox NS Routing Information Protocol
- * by changing 32-bit net numbers to sockaddr's and
- * padding stuff to 32-bit boundaries.
- */
-
-#define	RIPv1		1
-#define	RIPv2		2
-#ifndef RIPVERSION
-#define	RIPVERSION	RIPv1
-#endif
-
-#define RIP_PORT	520
-
-#if RIPVERSION == 1
-/* Note that this so called sockaddr has a 2-byte sa_family and no sa_len.
- * It is not a UNIX sockaddr, but the shape of an address as defined
- * in RIPv1.  It is still defined to allow old versions of programs
- * such as `gated` to use this file to define RIPv1.
- */
-struct netinfo {
-	struct	sockaddr rip_dst;	/* destination net/host */
-	uint32_t   rip_metric;		/* cost of route */
-};
-#else
-struct netinfo {
-	u_int16_t   n_family;
-#define	    RIP_AF_INET	    htons(AF_INET)
-#define	    RIP_AF_UNSPEC   0
-#define	    RIP_AF_AUTH	    0xffff
-	u_int16_t   n_tag;		/* optional in RIPv2 */
-	uint32_t   n_dst;		/* destination net or host */
-#define	    RIP_DEFAULT	    0
-	uint32_t   n_mask;		/* netmask in RIPv2 */
-	uint32_t   n_nhop;		/* optional next hop in RIPv2 */
-	uint32_t   n_metric;		/* cost of route */
-};
-#endif
-
-/* RIPv2 authentication */
-struct netauth {
-	u_int16_t   a_family;		/* always RIP_AF_AUTH */
-	u_int16_t   a_type;
-#define	    RIP_AUTH_NONE   0
-#define	    RIP_AUTH_PW	    htons(2)	/* password type */
-#define	    RIP_AUTH_MD5    htons(3)	/* Keyed MD5 */
-	union {
-#define	    RIP_AUTH_PW_LEN 16
-	    u_int8_t    au_pw[RIP_AUTH_PW_LEN];
-	    struct a_md5 {
-		int16_t	md5_pkt_len;	/* RIP-II packet length */
-		int8_t	md5_keyid;	/* key ID and auth data len */
-		int8_t	md5_auth_len;	/* 16 */
-		uint32_t md5_seqno;	/* sequence number */
-		uint32_t rsvd[2];	/* must be 0 */
-#define	    RIP_AUTH_MD5_KEY_LEN   RIP_AUTH_PW_LEN
-#define	    RIP_AUTH_MD5_HASH_XTRA (sizeof(struct netauth)-sizeof(struct a_md5))
-#define	    RIP_AUTH_MD5_HASH_LEN  (RIP_AUTH_MD5_KEY_LEN+RIP_AUTH_MD5_HASH_XTRA)
-	    } a_md5;
-	} au;
-};
-
-struct rip {
-	u_int8_t    rip_cmd;		/* request/response */
-	u_int8_t    rip_vers;		/* protocol version # */
-	u_int16_t   rip_res1;		/* pad to 32-bit boundary */
-	union {				/* variable length... */
-	    struct netinfo ru_nets[1];
-	    int8_t    ru_tracefile[1];
-	    struct netauth ru_auth[1];
-	} ripun;
-#define	rip_nets	ripun.ru_nets
-#define rip_auths	ripun.ru_auth
-#define	rip_tracefile	ripun.ru_tracefile
-};
-
-/* Packet types.
- */
-#define	RIPCMD_REQUEST		1	/* want info */
-#define	RIPCMD_RESPONSE		2	/* responding to request */
-#define	RIPCMD_TRACEON		3	/* turn tracing on */
-#define	RIPCMD_TRACEOFF		4	/* turn it off */
-
-/* Gated extended RIP to include a "poll" command instead of using
- * RIPCMD_REQUEST with (RIP_AF_UNSPEC, RIP_DEFAULT).  RFC 1058 says
- * command 5 is used by Sun Microsystems for its own purposes.
- */
-#define RIPCMD_POLL		5
-
-#define	RIPCMD_MAX		6
-
-#ifdef RIPCMDS
-const char *ripcmds[RIPCMD_MAX] = {
-	"#0", "REQUEST", "RESPONSE", "TRACEON", "TRACEOFF"
-};
-#endif
-
-#define	HOPCNT_INFINITY		16
-#define	MAXPACKETSIZE		512	/* max broadcast size */
-#define NETS_LEN ((MAXPACKETSIZE-sizeof(struct rip))	\
-		      / sizeof(struct netinfo) +1)
-
-#define INADDR_RIP_GROUP (uint32_t)0xe0000009	/* 224.0.0.9 */
-
-
-/* Timer values used in managing the routing table.
- *
- * Complete tables are broadcast every SUPPLY_INTERVAL seconds.
- * If changes occur between updates, dynamic updates containing only changes
- * may be sent.  When these are sent, a timer is set for a random value
- * between MIN_WAITTIME and MAX_WAITTIME, and no additional dynamic updates
- * are sent until the timer expires.
- *
- * Every update of a routing entry forces an entry's timer to be reset.
- * After EXPIRE_TIME without updates, the entry is marked invalid,
- * but held onto until GARBAGE_TIME so that others may see it, to
- * "poison" the bad route.
- */
-#define	SUPPLY_INTERVAL		30	/* time to supply tables */
-#define	MIN_WAITTIME		2	/* min sec until next flash updates */
-#define	MAX_WAITTIME		5	/* max sec until flash update */
-
-#define STALE_TIME		90	/* switch to a new gateway */
-#define	EXPIRE_TIME		180	/* time to mark entry invalid */
-#define	GARBAGE_TIME		240	/* time to garbage collect */
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* !_ROUTED_H_ */
diff --git a/include.new/protocols/rwhod.h b/include.new/protocols/rwhod.h
deleted file mode 100644
index 75526cb..0000000
--- a/include.new/protocols/rwhod.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 1983, 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. 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.
- *
- *	@(#)rwhod.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/protocols/rwhod.h 250889 2013-05-21 21:50:11Z ed $
- */
-
-#ifndef _PROTOCOLS_RWHOD_H_
-#define	_PROTOCOLS_RWHOD_H_
-
-#include <sys/_types.h>
-
-/*
- * rwho protocol packet format.
- */
-struct	outmp {
-	char	out_line[8];		/* tty name */
-	char	out_name[8];		/* user id */
-	__int32_t out_time;		/* time on */
-};
-
-struct	whod {
-	char	wd_vers;		/* protocol version # */
-	char	wd_type;		/* packet type, see below */
-	char	wd_pad[2];
-	int	wd_sendtime;		/* time stamp by sender */
-	int	wd_recvtime;		/* time stamp applied by receiver */
-	char	wd_hostname[32];	/* hosts's name */
-	int	wd_loadav[3];		/* load average as in uptime */
-	int	wd_boottime;		/* time system booted */
-	struct	whoent {
-		struct	outmp we_utmp;	/* active tty info */
-		int	we_idle;	/* tty idle time */
-	} wd_we[1024 / sizeof (struct whoent)];
-};
-
-#define	WHODVERSION	1
-#define	WHODTYPE_STATUS	1		/* host status */
-
-#define	_PATH_RWHODIR	"/var/rwho"
-
-#endif /* !_RWHOD_H_ */
diff --git a/include.new/protocols/talkd.h b/include.new/protocols/talkd.h
deleted file mode 100644
index 3d31b3b..0000000
--- a/include.new/protocols/talkd.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1983, 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. 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.
- *
- *	@(#)talkd.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/protocols/talkd.h 203965 2010-02-16 19:46:46Z imp $
- */
-
-#ifndef _PROTOCOLS_TALKD_H_
-#define	_PROTOCOLS_TALKD_H_
-
-/*
- * This describes the protocol used by the talk server and clients.
- *
- * The talk server acts a repository of invitations, responding to
- * requests by clients wishing to rendezvous for the purpose of
- * holding a conversation.  In normal operation, a client, the caller,
- * initiates a rendezvous by sending a CTL_MSG to the server of
- * type LOOK_UP.  This causes the server to search its invitation
- * tables to check if an invitation currently exists for the caller
- * (to speak to the callee specified in the message).  If the lookup
- * fails, the caller then sends an ANNOUNCE message causing the server
- * to broadcast an announcement on the callee's login ports requesting
- * contact.  When the callee responds, the local server uses the
- * recorded invitation to respond with the appropriate rendezvous
- * address and the caller and callee client programs establish a
- * stream connection through which the conversation takes place.
- */
-
-/*
- * Client->server request message format.
- */
-typedef struct {
-	u_char	vers;		/* protocol version */
-	u_char	type;		/* request type, see below */
-	u_char	answer;		/* not used */
-	u_char	pad;
-	uint32_t	id_num;		/* message id */
-	struct	osockaddr addr;		/* old (4.3) style */
-	struct	osockaddr ctl_addr;	/* old (4.3) style */
-	int32_t	pid;		/* caller's process id */
-#define	NAME_SIZE	12
-	char	l_name[NAME_SIZE];/* caller's name */
-	char	r_name[NAME_SIZE];/* callee's name */
-#define	TTY_SIZE	16
-	char	r_tty[TTY_SIZE];/* callee's tty name */
-} CTL_MSG;
-
-/*
- * Server->client response message format.
- */
-typedef struct {
-	u_char	vers;		/* protocol version */
-	u_char	type;		/* type of request message, see below */
-	u_char	answer;		/* respose to request message, see below */
-	u_char	pad;
-	uint32_t	id_num;		/* message id */
-	struct	osockaddr addr;	/* address for establishing conversation */
-} CTL_RESPONSE;
-
-#define	TALK_VERSION	1		/* protocol version */
-
-/* message type values */
-#define LEAVE_INVITE	0	/* leave invitation with server */
-#define LOOK_UP		1	/* check for invitation by callee */
-#define DELETE		2	/* delete invitation by caller */
-#define ANNOUNCE	3	/* announce invitation by caller */
-
-/* answer values */
-#define SUCCESS		0	/* operation completed properly */
-#define NOT_HERE	1	/* callee not logged in */
-#define FAILED		2	/* operation failed for unexplained reason */
-#define MACHINE_UNKNOWN	3	/* caller's machine name unknown */
-#define PERMISSION_DENIED 4	/* callee's tty doesn't permit announce */
-#define UNKNOWN_REQUEST	5	/* request has invalid type value */
-#define	BADVERSION	6	/* request has invalid protocol version */
-#define	BADADDR		7	/* request has invalid addr value */
-#define	BADCTLADDR	8	/* request has invalid ctl_addr value */
-
-/*
- * Operational parameters.
- */
-#define MAX_LIFE	60	/* max time daemon saves invitations */
-/* RING_WAIT should be 10's of seconds less than MAX_LIFE */
-#define RING_WAIT	30	/* time to wait before resending invitation */
-
-#endif /* !_TALKD_H_ */
diff --git a/include.new/protocols/timed.h b/include.new/protocols/timed.h
deleted file mode 100644
index 7d7740d..0000000
--- a/include.new/protocols/timed.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1983, 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. 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.
- *
- *	@(#)timed.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/protocols/timed.h 249311 2013-04-09 16:16:34Z ed $
- */
-
-#ifndef	_PROTOCOLS_TIMED_H_
-#define	_PROTOCOLS_TIMED_H_
-
-/*
- * Time Synchronization Protocol
- */
-
-#define	TSPVERSION	1
-#define ANYADDR 	NULL
-
-struct tsp {
-	u_int8_t	tsp_type;
-	u_int8_t	tsp_vers;
-	u_int16_t	tsp_seq;
-	union {
-		struct {
-			int32_t	tv_sec;
-			int32_t	tv_usec;
-		} tspu_time;
-		char tspu_hopcnt;
-	} tsp_u;
-	char tsp_name[MAXHOSTNAMELEN];
-};
-
-#define	tsp_time	tsp_u.tspu_time
-#define	tsp_hopcnt	tsp_u.tspu_hopcnt
-
-/*
- * Command types.
- */
-#define	TSP_ANY			0	/* match any types */
-#define	TSP_ADJTIME		1	/* send adjtime */
-#define	TSP_ACK			2	/* generic acknowledgement */
-#define	TSP_MASTERREQ		3	/* ask for master's name */
-#define	TSP_MASTERACK		4	/* acknowledge master request */
-#define	TSP_SETTIME		5	/* send network time */
-#define	TSP_MASTERUP		6	/* inform slaves that master is up */
-#define	TSP_SLAVEUP		7	/* slave is up but not polled */
-#define	TSP_ELECTION		8	/* advance candidature for master */
-#define	TSP_ACCEPT		9	/* support candidature of master */
-#define	TSP_REFUSE		10	/* reject candidature of master */
-#define	TSP_CONFLICT		11	/* two or more masters present */
-#define	TSP_RESOLVE		12	/* masters' conflict resolution */
-#define	TSP_QUIT		13	/* reject candidature if master is up */
-#define	TSP_DATE		14	/* reset the time (date command) */
-#define	TSP_DATEREQ		15	/* remote request to reset the time */
-#define	TSP_DATEACK		16	/* acknowledge time setting  */
-#define	TSP_TRACEON		17	/* turn tracing on */
-#define	TSP_TRACEOFF		18	/* turn tracing off */
-#define	TSP_MSITE		19	/* find out master's site */
-#define	TSP_MSITEREQ		20	/* remote master's site request */
-#define	TSP_TEST		21	/* for testing election algo */
-#define	TSP_SETDATE		22	/* New from date command */
-#define	TSP_SETDATEREQ		23	/* New remote for above */
-#define	TSP_LOOP		24	/* loop detection packet */
-
-#define	TSPTYPENUMBER		25
-
-#ifdef TSPTYPES
-static char const * const tsptype[] =
-  { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
-  "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT",
-  "DATE", "DATEREQ", "DATEACK", "TRACEON", "TRACEOFF", "MSITE", "MSITEREQ",
-  "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
-_Static_assert(sizeof(tsptype) / sizeof(const char *) == TSPTYPENUMBER,
-    "Size of tsptype does not match TSPTYPENUMBER");
-#endif
-
-#endif /* !_TIMED_H_ */
diff --git a/include.new/pthread.h b/include.new/pthread.h
deleted file mode 100644
index 37496d1..0000000
--- a/include.new/pthread.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
- * Copyright (c) 1995-1998 by John Birrell <jb@cimlogic.com.au>
- * 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 Chris Provenzano.
- * 4. The name of Chris Provenzano may not be used to endorse or promote 
- *	  products derived from this software without specific prior written
- *	  permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CHRIS PROVENZANO ``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 CHRIS PROVENZANO 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: releng/10.2/include/pthread.h 257113 2013-10-25 13:27:55Z tijl $
- */
-#ifndef _PTHREAD_H_
-#define _PTHREAD_H_
-
-/*
- * Header files.
- */
-#include <sys/cdefs.h>
-#include <sys/_pthreadtypes.h>
-#include <machine/_limits.h>
-#include <machine/_types.h>
-#include <sys/_sigset.h>
-#include <sched.h>
-#include <time.h>
-
-/*
- * Run-time invariant values:
- */
-#define PTHREAD_DESTRUCTOR_ITERATIONS		4
-#define PTHREAD_KEYS_MAX			256
-#define PTHREAD_STACK_MIN			__MINSIGSTKSZ
-#define PTHREAD_THREADS_MAX			__ULONG_MAX
-#define PTHREAD_BARRIER_SERIAL_THREAD		-1
-
-/*
- * Flags for threads and thread attributes.
- */
-#define PTHREAD_DETACHED            0x1
-#define PTHREAD_SCOPE_SYSTEM        0x2
-#define PTHREAD_INHERIT_SCHED       0x4
-#define PTHREAD_NOFLOAT             0x8
-
-#define PTHREAD_CREATE_DETACHED     PTHREAD_DETACHED
-#define PTHREAD_CREATE_JOINABLE     0
-#define PTHREAD_SCOPE_PROCESS       0
-#define PTHREAD_EXPLICIT_SCHED      0
-
-/*
- * Flags for read/write lock attributes
- */
-#define PTHREAD_PROCESS_PRIVATE     0
-#define PTHREAD_PROCESS_SHARED      1	
-
-/*
- * Flags for cancelling threads
- */
-#define PTHREAD_CANCEL_ENABLE		0
-#define PTHREAD_CANCEL_DISABLE		1
-#define PTHREAD_CANCEL_DEFERRED		0
-#define PTHREAD_CANCEL_ASYNCHRONOUS	2
-#define PTHREAD_CANCELED		((void *) 1)
-
-/*
- * Flags for once initialization.
- */
-#define PTHREAD_NEEDS_INIT  0
-#define PTHREAD_DONE_INIT   1
-
-/*
- * Static once initialization values. 
- */
-#define PTHREAD_ONCE_INIT   { PTHREAD_NEEDS_INIT, NULL }
-
-/*
- * Static initialization values. 
- */
-#define PTHREAD_MUTEX_INITIALIZER	NULL
-#define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP	((pthread_mutex_t)1)
-#define PTHREAD_COND_INITIALIZER	NULL
-#define PTHREAD_RWLOCK_INITIALIZER	NULL
-
-/*
- * Default attribute arguments (draft 4, deprecated).
- */
-#ifndef PTHREAD_KERNEL
-#define pthread_condattr_default    NULL
-#define pthread_mutexattr_default   NULL
-#define pthread_attr_default        NULL
-#endif
-
-#define PTHREAD_PRIO_NONE	0
-#define PTHREAD_PRIO_INHERIT	1
-#define PTHREAD_PRIO_PROTECT	2
-
-/*
- * Mutex types (Single UNIX Specification, Version 2, 1997).
- *
- * Note that a mutex attribute with one of the following types:
- *
- *	PTHREAD_MUTEX_NORMAL
- *	PTHREAD_MUTEX_RECURSIVE
- *
- * will deviate from POSIX specified semantics.
- */
-enum pthread_mutextype {
-	PTHREAD_MUTEX_ERRORCHECK	= 1,	/* Default POSIX mutex */
-	PTHREAD_MUTEX_RECURSIVE		= 2,	/* Recursive mutex */
-	PTHREAD_MUTEX_NORMAL		= 3,	/* No error checking */
-	PTHREAD_MUTEX_ADAPTIVE_NP	= 4,	/* Adaptive mutex, spins briefly before blocking on lock */
-	PTHREAD_MUTEX_TYPE_MAX
-};
-
-#define PTHREAD_MUTEX_DEFAULT		PTHREAD_MUTEX_ERRORCHECK
-
-struct _pthread_cleanup_info {
-	__uintptr_t	pthread_cleanup_pad[8];
-};
-
-/*
- * Thread function prototype definitions:
- */
-__BEGIN_DECLS
-int		pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
-int		pthread_attr_destroy(pthread_attr_t *);
-int		pthread_attr_getstack(const pthread_attr_t * __restrict, 
-			void ** __restrict, size_t * __restrict);
-int		pthread_attr_getstacksize(const pthread_attr_t *, size_t *);
-int		pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
-int		pthread_attr_getstackaddr(const pthread_attr_t *, void **);
-int		pthread_attr_getdetachstate(const pthread_attr_t *, int *);
-int		pthread_attr_init(pthread_attr_t *);
-int		pthread_attr_setstacksize(pthread_attr_t *, size_t);
-int		pthread_attr_setguardsize(pthread_attr_t *, size_t);
-int		pthread_attr_setstack(pthread_attr_t *, void *, size_t);
-int		pthread_attr_setstackaddr(pthread_attr_t *, void *);
-int		pthread_attr_setdetachstate(pthread_attr_t *, int);
-int		pthread_barrier_destroy(pthread_barrier_t *);
-int		pthread_barrier_init(pthread_barrier_t *,
-			const pthread_barrierattr_t *, unsigned);
-int		pthread_barrier_wait(pthread_barrier_t *);
-int		pthread_barrierattr_destroy(pthread_barrierattr_t *);
-int		pthread_barrierattr_getpshared(const pthread_barrierattr_t *,
-			int *);
-int		pthread_barrierattr_init(pthread_barrierattr_t *);
-int		pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
-
-#define		pthread_cleanup_push(cleanup_routine, cleanup_arg)		\
-		{								\
-			struct _pthread_cleanup_info __cleanup_info__;		\
-			__pthread_cleanup_push_imp(cleanup_routine, cleanup_arg,\
-				&__cleanup_info__);				\
-			{
-
-#define		pthread_cleanup_pop(execute)					\
-				(void)0;					\
-			}							\
-			__pthread_cleanup_pop_imp(execute);			\
-		}
-
-int		pthread_condattr_destroy(pthread_condattr_t *);
-int		pthread_condattr_getclock(const pthread_condattr_t *,
-			clockid_t *);
-int		pthread_condattr_getpshared(const pthread_condattr_t *, int *);
-int		pthread_condattr_init(pthread_condattr_t *);
-int		pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
-int		pthread_condattr_setpshared(pthread_condattr_t *, int);
-int		pthread_cond_broadcast(pthread_cond_t *);
-int		pthread_cond_destroy(pthread_cond_t *);
-int		pthread_cond_init(pthread_cond_t *,
-			const pthread_condattr_t *);
-int		pthread_cond_signal(pthread_cond_t *);
-int		pthread_cond_timedwait(pthread_cond_t *,
-			pthread_mutex_t *, const struct timespec *);
-int		pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
-int		pthread_create(pthread_t *, const pthread_attr_t *,
-			void *(*) (void *), void *);
-int		pthread_detach(pthread_t);
-int		pthread_equal(pthread_t, pthread_t);
-void		pthread_exit(void *) __dead2;
-void		*pthread_getspecific(pthread_key_t);
-int		pthread_getcpuclockid(pthread_t, clockid_t *);
-int		pthread_join(pthread_t, void **);
-int		pthread_key_create(pthread_key_t *,
-			void (*) (void *));
-int		pthread_key_delete(pthread_key_t);
-int		pthread_mutexattr_init(pthread_mutexattr_t *);
-int		pthread_mutexattr_destroy(pthread_mutexattr_t *);
-int		pthread_mutexattr_getpshared(const pthread_mutexattr_t *,
-			int *);
-int		pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
-int		pthread_mutexattr_settype(pthread_mutexattr_t *, int);
-int		pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
-int		pthread_mutex_destroy(pthread_mutex_t *);
-int		pthread_mutex_init(pthread_mutex_t *,
-			const pthread_mutexattr_t *);
-int		pthread_mutex_lock(pthread_mutex_t *);
-int		pthread_mutex_trylock(pthread_mutex_t *);
-int		pthread_mutex_timedlock(pthread_mutex_t *,
-			const struct timespec *);
-int		pthread_mutex_unlock(pthread_mutex_t *);
-int		pthread_once(pthread_once_t *, void (*) (void));
-int		pthread_rwlock_destroy(pthread_rwlock_t *);
-int		pthread_rwlock_init(pthread_rwlock_t *,
-			const pthread_rwlockattr_t *);
-int		pthread_rwlock_rdlock(pthread_rwlock_t *);
-int		pthread_rwlock_timedrdlock(pthread_rwlock_t *,
-			const struct timespec *);
-int		pthread_rwlock_timedwrlock(pthread_rwlock_t *,
-			const struct timespec *);
-int		pthread_rwlock_tryrdlock(pthread_rwlock_t *);
-int		pthread_rwlock_trywrlock(pthread_rwlock_t *);
-int		pthread_rwlock_unlock(pthread_rwlock_t *);
-int		pthread_rwlock_wrlock(pthread_rwlock_t *);
-int		pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
-int		pthread_rwlockattr_getkind_np(const pthread_rwlockattr_t *,
-			int *);
-int		pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *,
-			int *);
-int		pthread_rwlockattr_init(pthread_rwlockattr_t *);
-int		pthread_rwlockattr_setkind_np(pthread_rwlockattr_t *, int);
-int		pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
-pthread_t	pthread_self(void);
-int		pthread_setspecific(pthread_key_t, const void *);
-
-int		pthread_spin_init(pthread_spinlock_t *, int);
-int		pthread_spin_destroy(pthread_spinlock_t *);
-int		pthread_spin_lock(pthread_spinlock_t *);
-int		pthread_spin_trylock(pthread_spinlock_t *);
-int		pthread_spin_unlock(pthread_spinlock_t *);
-int		pthread_cancel(pthread_t);
-int		pthread_setcancelstate(int, int *);
-int		pthread_setcanceltype(int, int *);
-void		pthread_testcancel(void);
-
-#if __BSD_VISIBLE
-int		pthread_getprio(pthread_t);
-int		pthread_setprio(pthread_t, int);
-void		pthread_yield(void);
-#endif
-
-int		pthread_mutexattr_getprioceiling(pthread_mutexattr_t *,
-			int *);
-int		pthread_mutexattr_setprioceiling(pthread_mutexattr_t *,
-			int);
-int		pthread_mutex_getprioceiling(pthread_mutex_t *, int *);
-int		pthread_mutex_setprioceiling(pthread_mutex_t *, int, int *);
-
-int		pthread_mutexattr_getprotocol(pthread_mutexattr_t *, int *);
-int		pthread_mutexattr_setprotocol(pthread_mutexattr_t *, int);
-
-int		pthread_attr_getinheritsched(const pthread_attr_t *, int *);
-int		pthread_attr_getschedparam(const pthread_attr_t *,
-			struct sched_param *);
-int		pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
-int		pthread_attr_getscope(const pthread_attr_t *, int *);
-int		pthread_attr_setinheritsched(pthread_attr_t *, int);
-int		pthread_attr_setschedparam(pthread_attr_t *,
-			const struct sched_param *);
-int		pthread_attr_setschedpolicy(pthread_attr_t *, int);
-int		pthread_attr_setscope(pthread_attr_t *, int);
-int		pthread_getschedparam(pthread_t pthread, int *,
-			struct sched_param *);
-int		pthread_setschedparam(pthread_t, int,
-			const struct sched_param *);
-#if __XSI_VISIBLE
-int		pthread_getconcurrency(void);
-int		pthread_setconcurrency(int);
-#endif
-
-void		__pthread_cleanup_push_imp(void (*)(void *), void *,
-			struct _pthread_cleanup_info *);
-void		__pthread_cleanup_pop_imp(int);
-__END_DECLS
-
-#endif
diff --git a/include.new/pthread_np.h b/include.new/pthread_np.h
deleted file mode 100644
index 37391b6..0000000
--- a/include.new/pthread_np.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1996-98 John Birrell <jb@cimlogic.com.au>.
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- *
- * $FreeBSD: releng/10.2/include/pthread_np.h 218414 2011-02-07 21:26:46Z jkim $
- */
-#ifndef _PTHREAD_NP_H_
-#define _PTHREAD_NP_H_
-
-#include <sys/param.h>
-#include <sys/cpuset.h>
-
-/*
- * Non-POSIX type definitions:
- */
-typedef void	(*pthread_switch_routine_t)(pthread_t, pthread_t);
-
-/*
- * Non-POSIX thread function prototype definitions:
- */
-__BEGIN_DECLS
-int pthread_attr_setcreatesuspend_np(pthread_attr_t *);
-int pthread_attr_get_np(pthread_t, pthread_attr_t *);
-int pthread_attr_getaffinity_np(const pthread_attr_t *, size_t, cpuset_t *);
-int pthread_attr_setaffinity_np(pthread_attr_t *, size_t, const cpuset_t *);
-int pthread_getaffinity_np(pthread_t, size_t, cpuset_t *);
-int pthread_getthreadid_np(void);
-int pthread_main_np(void);
-int pthread_multi_np(void);
-int pthread_mutexattr_getkind_np(pthread_mutexattr_t);
-int pthread_mutexattr_setkind_np(pthread_mutexattr_t *, int);
-void pthread_resume_all_np(void);
-int pthread_resume_np(pthread_t);
-void pthread_set_name_np(pthread_t, const char *);
-int pthread_mutex_getspinloops_np(pthread_mutex_t *mutex, int *count);
-int pthread_mutex_setspinloops_np(pthread_mutex_t *mutex, int count);
-int pthread_mutex_getyieldloops_np(pthread_mutex_t *mutex, int *count);
-int pthread_mutex_setyieldloops_np(pthread_mutex_t *mutex, int count);
-int pthread_mutex_isowned_np(pthread_mutex_t *mutex);
-int pthread_setaffinity_np(pthread_t, size_t, const cpuset_t *);
-int pthread_single_np(void);
-void pthread_suspend_all_np(void);
-int pthread_suspend_np(pthread_t);
-int pthread_switch_add_np(pthread_switch_routine_t);
-int pthread_switch_delete_np(pthread_switch_routine_t);
-int pthread_timedjoin_np(pthread_t, void **, const struct timespec *);
-__END_DECLS
-
-#endif
diff --git a/include.new/pwd.h b/include.new/pwd.h
deleted file mode 100644
index b239fb8..0000000
--- a/include.new/pwd.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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. 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.
- *
- *	@(#)pwd.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/include/pwd.h 241731 2012-10-19 12:44:22Z brooks $
- */
-
-#ifndef _PWD_H_
-#define	_PWD_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-#ifndef _UID_T_DECLARED
-typedef	__uid_t		uid_t;
-#define	_UID_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef __size_t	size_t;
-#define _SIZE_T_DECLARED
-#endif
-
-#define _PATH_PWD		"/etc"
-#define	_PATH_PASSWD		"/etc/passwd"
-#define	_PASSWD			"passwd"
-#define	_PATH_MASTERPASSWD	"/etc/master.passwd"
-#define	_MASTERPASSWD		"master.passwd"
-
-#define	_PATH_MP_DB		"/etc/pwd.db"
-#define	_MP_DB			"pwd.db"
-#define	_PATH_SMP_DB		"/etc/spwd.db"
-#define	_SMP_DB			"spwd.db"
-
-#define	_PATH_PWD_MKDB		"/usr/sbin/pwd_mkdb"
-
-/* Historically, the keys in _PATH_MP_DB/_PATH_SMP_DB had the format
- * `1 octet tag | key', where the tag is one of the _PW_KEY* values
- * listed below.  These values happen to be ASCII digits.  Starting
- * with FreeBSD 5.1, the tag is now still a single octet, but the
- * upper 4 bits are interpreted as a version.  Pre-FreeBSD 5.1 format
- * entries are version `3' -- this conveniently results in the same
- * key values as before.  The new, architecture-independent entries
- * are version `4'.
- * As it happens, some applications read the database directly.
- * (Bad app, no cookie!)  Thus, we leave the _PW_KEY* symbols at their
- * old pre-FreeBSD 5.1 values so these apps still work.  Consequently
- * we have to muck around a bit more to get the correct, versioned
- * tag, and that is what the _PW_VERSIONED macro is about.
- */
-
-#define _PW_VERSION_MASK	'\xF0'
-#define _PW_VERSIONED(x, v)	((unsigned char)(((x) & 0xCF) | ((v)<<4)))
-
-#define	_PW_KEYBYNAME		'\x31'	/* stored by name */
-#define	_PW_KEYBYNUM		'\x32'	/* stored by entry in the "file" */
-#define	_PW_KEYBYUID		'\x33'	/* stored by uid */
-#define _PW_KEYYPENABLED	'\x34'	/* YP is enabled */
-#define	_PW_KEYYPBYNUM		'\x35'	/* special +@netgroup entries */
-
-/* The database also contains a key to indicate the format version of
- * the entries therein.  There may be other, older versioned entries
- * as well.
- */
-#define _PWD_VERSION_KEY	"\xFF" "VERSION"
-#define _PWD_CURRENT_VERSION	'\x04'
-
-#define	_PASSWORD_EFMT1		'_'	/* extended encryption format */
-
-#define	_PASSWORD_LEN		128	/* max length, not counting NULL */
-
-struct passwd {
-	char	*pw_name;		/* user name */
-	char	*pw_passwd;		/* encrypted password */
-	uid_t	pw_uid;			/* user uid */
-	gid_t	pw_gid;			/* user gid */
-	time_t	pw_change;		/* password change time */
-	char	*pw_class;		/* user access class */
-	char	*pw_gecos;		/* Honeywell login info */
-	char	*pw_dir;		/* home directory */
-	char	*pw_shell;		/* default shell */
-	time_t	pw_expire;		/* account expiration */
-	int	pw_fields;		/* internal: fields filled in */
-};
-
-/* Mapping from fields to bits for pw_fields. */
-#define _PWF(x)		(1 << x)
-#define _PWF_NAME	_PWF(0)
-#define _PWF_PASSWD	_PWF(1)
-#define _PWF_UID	_PWF(2)
-#define _PWF_GID	_PWF(3)
-#define _PWF_CHANGE	_PWF(4)
-#define _PWF_CLASS	_PWF(5)
-#define _PWF_GECOS	_PWF(6)
-#define _PWF_DIR	_PWF(7)
-#define _PWF_SHELL	_PWF(8)
-#define _PWF_EXPIRE	_PWF(9)
-
-/* XXX These flags are bogus.  With nsswitch, there are many
- * possible sources and they cannot be represented in a small integer.
- */                           
-#define _PWF_SOURCE	0x3000
-#define _PWF_FILES	0x1000
-#define _PWF_NIS	0x2000
-#define _PWF_HESIOD	0x3000
-
-__BEGIN_DECLS
-struct passwd	*getpwnam(const char *);
-struct passwd	*getpwuid(uid_t);
-
-#if __XSI_VISIBLE >= 500
-void		 endpwent(void);
-struct passwd	*getpwent(void);
-void		 setpwent(void);
-#endif
-
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 500
-int		 getpwnam_r(const char *, struct passwd *, char *, size_t,
-		    struct passwd **);
-int		 getpwuid_r(uid_t, struct passwd *, char *, size_t,
-		    struct passwd **);
-#endif
-
-#if __BSD_VISIBLE
-int		 getpwent_r(struct passwd *, char *, size_t, struct passwd **);
-int		 setpassent(int);
-const char	*user_from_uid(uid_t, int);
-int		 uid_from_user(const char *, uid_t *);
-int		 pwcache_userdb(int (*)(int), void (*)(void),
-		    struct passwd * (*)(const char *),
-		    struct passwd * (*)(uid_t));
-#endif
-__END_DECLS
-
-#endif /* !_PWD_H_ */
diff --git a/include.new/radlib.h b/include.new/radlib.h
deleted file mode 100644
index dba0e65..0000000
--- a/include.new/radlib.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/*-
- * Copyright 1998 Juniper Networks, Inc.
- * 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.
- *
- * 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: releng/10.2/lib/libradius/radlib.h 243956 2012-12-06 19:00:37Z sem $
- */
-
-#ifndef _RADLIB_H_
-#define _RADLIB_H_
-
-#include <sys/types.h>
-#include <netinet/in.h>
-
-/* Limits */
-#define RAD_MAX_ATTR_LEN		253
-
-/* Message types */
-#define RAD_ACCESS_REQUEST		1
-#define RAD_ACCESS_ACCEPT		2
-#define RAD_ACCESS_REJECT		3
-#define RAD_ACCOUNTING_REQUEST		4
-#define RAD_ACCOUNTING_RESPONSE		5
-#define RAD_ACCESS_CHALLENGE		11
-#define RAD_DISCONNECT_REQUEST		40
-#define RAD_DISCONNECT_ACK		41
-#define RAD_DISCONNECT_NAK		42
-#define RAD_COA_REQUEST			43
-#define RAD_COA_ACK			44
-#define RAD_COA_NAK			45
-
-/* Attribute types and values */
-#define RAD_USER_NAME			1	/* String */
-#define RAD_USER_PASSWORD		2	/* String */
-#define RAD_CHAP_PASSWORD		3	/* String */
-#define RAD_NAS_IP_ADDRESS		4	/* IP address */
-#define RAD_NAS_PORT			5	/* Integer */
-#define RAD_SERVICE_TYPE		6	/* Integer */
-	#define RAD_LOGIN			1
-	#define RAD_FRAMED			2
-	#define RAD_CALLBACK_LOGIN		3
-	#define RAD_CALLBACK_FRAMED		4
-	#define RAD_OUTBOUND			5
-	#define RAD_ADMINISTRATIVE		6
-	#define RAD_NAS_PROMPT			7
-	#define RAD_AUTHENTICATE_ONLY		8
-	#define RAD_CALLBACK_NAS_PROMPT		9
-#define RAD_FRAMED_PROTOCOL		7	/* Integer */
-	#define RAD_PPP				1
-	#define RAD_SLIP			2
-	#define RAD_ARAP			3	/* Appletalk */
-	#define RAD_GANDALF			4
-	#define RAD_XYLOGICS			5
-#define RAD_FRAMED_IP_ADDRESS		8	/* IP address */
-#define RAD_FRAMED_IP_NETMASK		9	/* IP address */
-#define RAD_FRAMED_ROUTING		10	/* Integer */
-#define RAD_FILTER_ID			11	/* String */
-#define RAD_FRAMED_MTU			12	/* Integer */
-#define RAD_FRAMED_COMPRESSION		13	/* Integer */
-	#define RAD_COMP_NONE			0
-	#define RAD_COMP_VJ			1
-	#define RAD_COMP_IPXHDR			2
-#define RAD_LOGIN_IP_HOST		14	/* IP address */
-#define RAD_LOGIN_SERVICE		15	/* Integer */
-#define RAD_LOGIN_TCP_PORT		16	/* Integer */
-     /* unassiged			17 */
-#define RAD_REPLY_MESSAGE		18	/* String */
-#define RAD_CALLBACK_NUMBER		19	/* String */
-#define RAD_CALLBACK_ID			20	/* String */
-     /* unassiged			21 */
-#define RAD_FRAMED_ROUTE		22	/* String */
-#define RAD_FRAMED_IPX_NETWORK		23	/* IP address */
-#define RAD_STATE			24	/* String */
-#define RAD_CLASS			25	/* Integer */
-#define RAD_VENDOR_SPECIFIC		26	/* Integer */
-#define RAD_SESSION_TIMEOUT		27	/* Integer */
-#define RAD_IDLE_TIMEOUT		28	/* Integer */
-#define RAD_TERMINATION_ACTION		29	/* Integer */
-#define RAD_CALLED_STATION_ID		30	/* String */
-#define RAD_CALLING_STATION_ID		31	/* String */
-#define RAD_NAS_IDENTIFIER		32	/* Integer */
-#define RAD_PROXY_STATE			33	/* Integer */
-#define RAD_LOGIN_LAT_SERVICE		34	/* Integer */
-#define RAD_LOGIN_LAT_NODE		35	/* Integer */
-#define RAD_LOGIN_LAT_GROUP		36	/* Integer */
-#define RAD_FRAMED_APPLETALK_LINK	37	/* Integer */
-#define RAD_FRAMED_APPLETALK_NETWORK	38	/* Integer */
-#define RAD_FRAMED_APPLETALK_ZONE	39	/* Integer */
-     /* reserved for accounting		40-59 */
-#define RAD_ACCT_INPUT_GIGAWORDS	52
-#define RAD_ACCT_OUTPUT_GIGAWORDS	53
-
-#define RAD_CHAP_CHALLENGE		60	/* String */
-#define RAD_NAS_PORT_TYPE		61	/* Integer */
-	#define RAD_ASYNC			0
-	#define RAD_SYNC			1
-	#define RAD_ISDN_SYNC			2
-	#define RAD_ISDN_ASYNC_V120		3
-	#define RAD_ISDN_ASYNC_V110		4
-	#define RAD_VIRTUAL			5
-	#define RAD_PIAFS			6
-	#define RAD_HDLC_CLEAR_CHANNEL		7
-	#define RAD_X_25			8
-	#define RAD_X_75			9
-	#define RAD_G_3_FAX			10
-	#define RAD_SDSL			11
-	#define RAD_ADSL_CAP			12
-	#define RAD_ADSL_DMT			13
-	#define RAD_IDSL			14
-	#define RAD_ETHERNET			15
-	#define RAD_XDSL			16
-	#define RAD_CABLE			17
-	#define RAD_WIRELESS_OTHER		18
-	#define RAD_WIRELESS_IEEE_802_11	19
-#define RAD_PORT_LIMIT			62	/* Integer */
-#define RAD_LOGIN_LAT_PORT		63	/* Integer */
-#define RAD_CONNECT_INFO		77	/* String */
-#define RAD_EAP_MESSAGE			79	/* Octets */
-#define RAD_MESSAGE_AUTHENTIC		80	/* Octets */
-#define RAD_ACCT_INTERIM_INTERVAL	85	/* Integer */
-#define RAD_NAS_IPV6_ADDRESS		95	/* IPv6 address */
-#define RAD_FRAMED_INTERFACE_ID		96	/* 8 octets */
-#define RAD_FRAMED_IPV6_PREFIX		97	/* Octets */
-#define RAD_LOGIN_IPV6_HOST		98	/* IPv6 address */
-#define RAD_FRAMED_IPV6_ROUTE		99	/* String */
-#define RAD_FRAMED_IPV6_POOL		100	/* String */
-
-/* Accounting attribute types and values */
-#define RAD_ACCT_STATUS_TYPE		40	/* Integer */
-	#define RAD_START			1
-	#define RAD_STOP			2
-	#define RAD_UPDATE			3
-	#define RAD_ACCOUNTING_ON		7
-	#define RAD_ACCOUNTING_OFF		8
-#define RAD_ACCT_DELAY_TIME		41	/* Integer */
-#define RAD_ACCT_INPUT_OCTETS		42	/* Integer */
-#define RAD_ACCT_OUTPUT_OCTETS		43	/* Integer */
-#define RAD_ACCT_SESSION_ID		44	/* String */
-#define RAD_ACCT_AUTHENTIC		45	/* Integer */
-	#define RAD_AUTH_RADIUS			1
-	#define RAD_AUTH_LOCAL			2
-	#define RAD_AUTH_REMOTE			3
-#define RAD_ACCT_SESSION_TIME		46	/* Integer */
-#define RAD_ACCT_INPUT_PACKETS		47	/* Integer */
-#define RAD_ACCT_OUTPUT_PACKETS		48	/* Integer */
-#define RAD_ACCT_TERMINATE_CAUSE	49	/* Integer */
-        #define RAD_TERM_USER_REQUEST		1
-        #define RAD_TERM_LOST_CARRIER		2
-        #define RAD_TERM_LOST_SERVICE		3
-        #define RAD_TERM_IDLE_TIMEOUT		4
-        #define RAD_TERM_SESSION_TIMEOUT	5
-        #define RAD_TERM_ADMIN_RESET		6
-        #define RAD_TERM_ADMIN_REBOOT		7
-        #define RAD_TERM_PORT_ERROR		8
-        #define RAD_TERM_NAS_ERROR		9
-        #define RAD_TERM_NAS_REQUEST		10
-        #define RAD_TERM_NAS_REBOOT		11
-        #define RAD_TERM_PORT_UNNEEDED		12
-        #define RAD_TERM_PORT_PREEMPTED		13
-        #define RAD_TERM_PORT_SUSPENDED		14
-        #define RAD_TERM_SERVICE_UNAVAILABLE    15
-        #define RAD_TERM_CALLBACK		16
-        #define RAD_TERM_USER_ERROR		17
-        #define RAD_TERM_HOST_REQUEST		18
-#define	RAD_ACCT_MULTI_SESSION_ID	50	/* String */
-#define	RAD_ACCT_LINK_COUNT		51	/* Integer */
-
-#define	RAD_ERROR_CAUSE			101	/* Integer */
-
-struct rad_handle;
-struct timeval;
-
-__BEGIN_DECLS
-struct rad_handle	*rad_acct_open(void);
-int			 rad_add_server(struct rad_handle *,
-			    const char *, int, const char *, int, int);
-int			 rad_add_server_ex(struct rad_handle *,
-			    const char *, int, const char *, int, int,
-			    int, struct in_addr *);
-struct rad_handle	*rad_auth_open(void);
-void			 rad_bind_to(struct rad_handle *, in_addr_t);
-void			 rad_close(struct rad_handle *);
-int			 rad_config(struct rad_handle *, const char *);
-int			 rad_continue_send_request(struct rad_handle *, int,
-			    int *, struct timeval *);
-int			 rad_create_request(struct rad_handle *, int);
-int			 rad_create_response(struct rad_handle *, int);
-struct in_addr		 rad_cvt_addr(const void *);
-struct in6_addr		 rad_cvt_addr6(const void *);
-uint32_t		 rad_cvt_int(const void *);
-char			*rad_cvt_string(const void *, size_t);
-int			 rad_get_attr(struct rad_handle *, const void **,
-			    size_t *);
-int			 rad_init_send_request(struct rad_handle *, int *,
-			    struct timeval *);
-struct rad_handle	*rad_open(void);  /* Deprecated, == rad_auth_open */
-int			 rad_put_addr(struct rad_handle *, int, struct in_addr);
-int			 rad_put_addr6(struct rad_handle *, int, struct in6_addr);
-int			 rad_put_attr(struct rad_handle *, int,
-			    const void *, size_t);
-int			 rad_put_int(struct rad_handle *, int, uint32_t);
-int			 rad_put_string(struct rad_handle *, int,
-			    const char *);
-int			 rad_put_message_authentic(struct rad_handle *);
-ssize_t			 rad_request_authenticator(struct rad_handle *, char *,
-			    size_t);
-int			 rad_receive_request(struct rad_handle *);
-int			 rad_send_request(struct rad_handle *);
-int			 rad_send_response(struct rad_handle *);
-struct rad_handle	*rad_server_open(int fd);
-const char		*rad_server_secret(struct rad_handle *);
-const char		*rad_strerror(struct rad_handle *);
-u_char			*rad_demangle(struct rad_handle *, const void *,
-			    size_t);
-
-__END_DECLS
-
-#endif /* _RADLIB_H_ */
diff --git a/include.new/radlib_vs.h b/include.new/radlib_vs.h
deleted file mode 100644
index aba46f4..0000000
--- a/include.new/radlib_vs.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 2002 Brian Somers <brian@Awfulhak.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.
- *
- * 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: releng/10.2/lib/libradius/radlib_vs.h 243956 2012-12-06 19:00:37Z sem $
- */
-
-#ifndef _RADLIB_VS_H_
-#define _RADLIB_VS_H_
-
-#include <sys/types.h>
-#include <netinet/in.h>
-
-#define	RAD_VENDOR_MICROSOFT	311		/* rfc2548 */
-	#define	RAD_MICROSOFT_MS_CHAP_RESPONSE			1
-	#define	RAD_MICROSOFT_MS_CHAP_ERROR			2
-	#define	RAD_MICROSOFT_MS_CHAP_PW_1			3
-	#define	RAD_MICROSOFT_MS_CHAP_PW_2			4
-	#define	RAD_MICROSOFT_MS_CHAP_LM_ENC_PW			5
-	#define	RAD_MICROSOFT_MS_CHAP_NT_ENC_PW			6
-	#define	RAD_MICROSOFT_MS_MPPE_ENCRYPTION_POLICY		7
-	#define	RAD_MICROSOFT_MS_MPPE_ENCRYPTION_TYPES		8
-	#define	RAD_MICROSOFT_MS_RAS_VENDOR			9
-	#define	RAD_MICROSOFT_MS_CHAP_DOMAIN			10
-	#define	RAD_MICROSOFT_MS_CHAP_CHALLENGE			11
-	#define	RAD_MICROSOFT_MS_CHAP_MPPE_KEYS			12
-	#define	RAD_MICROSOFT_MS_BAP_USAGE			13
-	#define	RAD_MICROSOFT_MS_LINK_UTILIZATION_THRESHOLD	14
-	#define	RAD_MICROSOFT_MS_LINK_DROP_TIME_LIMIT		15
-	#define	RAD_MICROSOFT_MS_MPPE_SEND_KEY			16
-	#define	RAD_MICROSOFT_MS_MPPE_RECV_KEY			17
-	#define	RAD_MICROSOFT_MS_RAS_VERSION			18
-	#define	RAD_MICROSOFT_MS_OLD_ARAP_PASSWORD		19
-	#define	RAD_MICROSOFT_MS_NEW_ARAP_PASSWORD		20
-	#define	RAD_MICROSOFT_MS_ARAP_PASSWORD_CHANGE_REASON	21
-	#define	RAD_MICROSOFT_MS_FILTER				22
-	#define	RAD_MICROSOFT_MS_ACCT_AUTH_TYPE			23
-	#define	RAD_MICROSOFT_MS_ACCT_EAP_TYPE			24
-	#define	RAD_MICROSOFT_MS_CHAP2_RESPONSE			25
-	#define	RAD_MICROSOFT_MS_CHAP2_SUCCESS			26
-	#define	RAD_MICROSOFT_MS_CHAP2_PW			27
-	#define	RAD_MICROSOFT_MS_PRIMARY_DNS_SERVER		28
-	#define	RAD_MICROSOFT_MS_SECONDARY_DNS_SERVER		29
-	#define	RAD_MICROSOFT_MS_PRIMARY_NBNS_SERVER		30
-	#define	RAD_MICROSOFT_MS_SECONDARY_NBNS_SERVER		31
-	#define	RAD_MICROSOFT_MS_ARAP_CHALLENGE			33
-
-#define SALT_LEN    2
-
-struct rad_handle;
-
-__BEGIN_DECLS
-int	 rad_get_vendor_attr(uint32_t *, const void **, size_t *);
-int	 rad_put_vendor_addr(struct rad_handle *, int, int, struct in_addr);
-int	 rad_put_vendor_addr6(struct rad_handle *, int, int, struct in6_addr);
-int	 rad_put_vendor_attr(struct rad_handle *, int, int, const void *,
-	    size_t);
-int	 rad_put_vendor_int(struct rad_handle *, int, int, uint32_t);
-int	 rad_put_vendor_string(struct rad_handle *, int, int, const char *);
-u_char	*rad_demangle_mppe_key(struct rad_handle *, const void *, size_t,
-	    size_t *);
-__END_DECLS
-
-#endif /* _RADLIB_VS_H_ */
diff --git a/include.new/ranlib.h b/include.new/ranlib.h
deleted file mode 100644
index f59bd10..0000000
--- a/include.new/ranlib.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- *	@(#)ranlib.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/ranlib.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _RANLIB_H_
-#define	_RANLIB_H_
-
-#define	RANLIBMAG	"__.SYMDEF"	/* archive file name */
-#define	RANLIBSKEW	3		/* creation time offset */
-
-struct ranlib {
-	union {
-		long ran_strx;		/* string table index */
-		char *ran_name;		/* in memory symbol name */
-	} ran_un;
-	long ran_off;			/* archive file offset */
-};
-
-#endif /* !_RANLIB_H_ */
diff --git a/include.new/readline/chardefs.h b/include.new/readline/chardefs.h
deleted file mode 100644
index def3a11..0000000
--- a/include.new/readline/chardefs.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* chardefs.h -- Character definitions for readline. */
-
-/* Copyright (C) 1994 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library, a library for
-   reading lines of text with interactive input and history editing.
-
-   The GNU Readline Library is free software; you can redistribute it
-   and/or modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2, or
-   (at your option) any later version.
-
-   The GNU Readline Library is distributed in the hope that it will be
-   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   The GNU General Public License is often shipped with GNU software, and
-   is generally kept in a file called COPYING or LICENSE.  If you do not
-   have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#ifndef _CHARDEFS_H_
-#define _CHARDEFS_H_
-
-#include <ctype.h>
-
-#if defined (HAVE_CONFIG_H)
-#  if defined (HAVE_STRING_H)
-#    if ! defined (STDC_HEADERS) && defined (HAVE_MEMORY_H)
-#      include <memory.h>
-#    endif
-#    include <string.h>
-#  endif /* HAVE_STRING_H */
-#  if defined (HAVE_STRINGS_H)
-#    include <strings.h>
-#  endif /* HAVE_STRINGS_H */
-#else
-#  include <string.h>
-#endif /* !HAVE_CONFIG_H */
-
-#ifndef whitespace
-#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
-#endif
-
-#ifdef CTRL
-#  undef CTRL
-#endif
-#ifdef UNCTRL
-#  undef UNCTRL
-#endif
-
-/* Some character stuff. */
-#define control_character_threshold 0x020   /* Smaller than this is control. */
-#define control_character_mask 0x1f	    /* 0x20 - 1 */
-#define meta_character_threshold 0x07f	    /* Larger than this is Meta. */
-#define control_character_bit 0x40	    /* 0x000000, must be off. */
-#define meta_character_bit 0x080	    /* x0000000, must be on. */
-#define largest_char 255		    /* Largest character value. */
-
-#define CTRL_CHAR(c) ((c) < control_character_threshold && (((c) & 0x80) == 0))
-#define META_CHAR(c) ((c) > meta_character_threshold && (c) <= largest_char)
-
-#define CTRL(c) ((c) & control_character_mask)
-#define META(c) ((c) | meta_character_bit)
-
-#define UNMETA(c) ((c) & (~meta_character_bit))
-#define UNCTRL(c) _rl_to_upper(((c)|control_character_bit))
-
-#if defined STDC_HEADERS || (!defined (isascii) && !defined (HAVE_ISASCII))
-#  define IN_CTYPE_DOMAIN(c) 1
-#else
-#  define IN_CTYPE_DOMAIN(c) isascii(c)
-#endif
-
-#if !defined (isxdigit) && !defined (HAVE_ISXDIGIT)
-#  define isxdigit(c)   (isdigit((c)) || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
-#endif
-
-#if defined (CTYPE_NON_ASCII)
-#  define NON_NEGATIVE(c) 1
-#else
-#  define NON_NEGATIVE(c) ((unsigned char)(c) == (c))
-#endif
-
-/* Some systems define these; we want our definitions. */
-#undef ISPRINT
-
-/* Beware:  these only work with single-byte ASCII characters. */
-
-#define ISALNUM(c)	(IN_CTYPE_DOMAIN (c) && isalnum (c))
-#define ISALPHA(c)	(IN_CTYPE_DOMAIN (c) && isalpha (c))
-#define ISDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isdigit (c))
-#define ISLOWER(c)	(IN_CTYPE_DOMAIN (c) && islower (c))
-#define ISPRINT(c)	(IN_CTYPE_DOMAIN (c) && isprint (c))
-#define ISUPPER(c)	(IN_CTYPE_DOMAIN (c) && isupper (c))
-#define ISXDIGIT(c)	(IN_CTYPE_DOMAIN (c) && isxdigit (c))
-
-#define _rl_lowercase_p(c)	(NON_NEGATIVE(c) && ISLOWER(c))
-#define _rl_uppercase_p(c)	(NON_NEGATIVE(c) && ISUPPER(c))
-#define _rl_digit_p(c)		((c) >= '0' && (c) <= '9')
-
-#define _rl_pure_alphabetic(c)	(NON_NEGATIVE(c) && ISALPHA(c))
-#define ALPHABETIC(c)		(NON_NEGATIVE(c) && ISALNUM(c))
-
-#ifndef _rl_to_upper
-#  define _rl_to_upper(c) (_rl_lowercase_p(c) ? toupper((unsigned char)c) : (c))
-#  define _rl_to_lower(c) (_rl_uppercase_p(c) ? tolower((unsigned char)c) : (c))
-#endif
-
-#ifndef _rl_digit_value
-#  define _rl_digit_value(x) ((x) - '0')
-#endif
-
-#ifndef _rl_isident
-#  define _rl_isident(c) (ISALNUM(c) || (c) == '_')
-#endif
-
-#ifndef ISOCTAL
-#  define ISOCTAL(c)	((c) >= '0' && (c) <= '7')
-#endif
-#define OCTVALUE(c)	((c) - '0')
-
-#define HEXVALUE(c) \
-  (((c) >= 'a' && (c) <= 'f') \
-  	? (c)-'a'+10 \
-  	: (c) >= 'A' && (c) <= 'F' ? (c)-'A'+10 : (c)-'0')
-
-#ifndef NEWLINE
-#define NEWLINE '\n'
-#endif
-
-#ifndef RETURN
-#define RETURN CTRL('M')
-#endif
-
-#ifndef RUBOUT
-#define RUBOUT 0x7f
-#endif
-
-#ifndef TAB
-#define TAB '\t'
-#endif
-
-#ifdef ABORT_CHAR
-#undef ABORT_CHAR
-#endif
-#define ABORT_CHAR CTRL('G')
-
-#ifdef PAGE
-#undef PAGE
-#endif
-#define PAGE CTRL('L')
-
-#ifdef SPACE
-#undef SPACE
-#endif
-#define SPACE ' '	/* XXX - was 0x20 */
-
-#ifdef ESC
-#undef ESC
-#endif
-#define ESC CTRL('[')
-
-#endif  /* _CHARDEFS_H_ */
diff --git a/include.new/readline/history.h b/include.new/readline/history.h
deleted file mode 100644
index 14ca2a9..0000000
--- a/include.new/readline/history.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/* history.h -- the names of functions that you can call in history. */
-/* Copyright (C) 1989-2003 Free Software Foundation, Inc.
-
-   This file contains the GNU History Library (the Library), a set of
-   routines for managing the text of previously typed lines.
-
-   The Library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The Library is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   The GNU General Public License is often shipped with GNU software, and
-   is generally kept in a file called COPYING or LICENSE.  If you do not
-   have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#ifndef _HISTORY_H_
-#define _HISTORY_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <time.h>		/* XXX - for history timestamp code */
-
-#if defined READLINE_LIBRARY
-#  include "rlstdc.h"
-#  include "rltypedefs.h"
-#else
-#  include <readline/rlstdc.h>
-#  include <readline/rltypedefs.h>
-#endif
-
-#ifdef __STDC__
-typedef void *histdata_t;
-#else
-typedef char *histdata_t;
-#endif
-
-/* The structure used to store a history entry. */
-typedef struct _hist_entry {
-  char *line;
-  char *timestamp;		/* char * rather than time_t for read/write */
-  histdata_t data;
-} HIST_ENTRY;
-
-/* Size of the history-library-managed space in history entry HS. */
-#define HISTENT_BYTES(hs)	(strlen ((hs)->line) + strlen ((hs)->timestamp))
-
-/* A structure used to pass the current state of the history stuff around. */
-typedef struct _hist_state {
-  HIST_ENTRY **entries;		/* Pointer to the entries themselves. */
-  int offset;			/* The location pointer within this array. */
-  int length;			/* Number of elements within this array. */
-  int size;			/* Number of slots allocated to this array. */
-  int flags;
-} HISTORY_STATE;
-
-/* Flag values for the `flags' member of HISTORY_STATE. */
-#define HS_STIFLED	0x01
-
-/* Initialization and state management. */
-
-/* Begin a session in which the history functions might be used.  This
-   just initializes the interactive variables. */
-extern void using_history PARAMS((void));
-
-/* Return the current HISTORY_STATE of the history. */
-extern HISTORY_STATE *history_get_history_state PARAMS((void));
-
-/* Set the state of the current history array to STATE. */
-extern void history_set_history_state PARAMS((HISTORY_STATE *));
-
-/* Manage the history list. */
-
-/* Place STRING at the end of the history list.
-   The associated data field (if any) is set to NULL. */
-extern void add_history PARAMS((const char *));
-
-/* Change the timestamp associated with the most recent history entry to
-   STRING. */
-extern void add_history_time PARAMS((const char *));
-
-/* A reasonably useless function, only here for completeness.  WHICH
-   is the magic number that tells us which element to delete.  The
-   elements are numbered from 0. */
-extern HIST_ENTRY *remove_history PARAMS((int));
-
-/* Free the history entry H and return any application-specific data
-   associated with it. */
-extern histdata_t free_history_entry PARAMS((HIST_ENTRY *));
-
-/* Make the history entry at WHICH have LINE and DATA.  This returns
-   the old entry so you can dispose of the data.  In the case of an
-   invalid WHICH, a NULL pointer is returned. */
-extern HIST_ENTRY *replace_history_entry PARAMS((int, const char *, histdata_t));
-
-/* Clear the history list and start over. */
-extern void clear_history PARAMS((void));
-
-/* Stifle the history list, remembering only MAX number of entries. */
-extern void stifle_history PARAMS((int));
-
-/* Stop stifling the history.  This returns the previous amount the
-   history was stifled by.  The value is positive if the history was
-   stifled, negative if it wasn't. */
-extern int unstifle_history PARAMS((void));
-
-/* Return 1 if the history is stifled, 0 if it is not. */
-extern int history_is_stifled PARAMS((void));
-
-/* Information about the history list. */
-
-/* Return a NULL terminated array of HIST_ENTRY which is the current input
-   history.  Element 0 of this list is the beginning of time.  If there
-   is no history, return NULL. */
-extern HIST_ENTRY **history_list PARAMS((void));
-
-/* Returns the number which says what history element we are now
-   looking at.  */
-extern int where_history PARAMS((void));
-  
-/* Return the history entry at the current position, as determined by
-   history_offset.  If there is no entry there, return a NULL pointer. */
-extern HIST_ENTRY *current_history PARAMS((void));
-
-/* Return the history entry which is logically at OFFSET in the history
-   array.  OFFSET is relative to history_base. */
-extern HIST_ENTRY *history_get PARAMS((int));
-
-/* Return the timestamp associated with the HIST_ENTRY * passed as an
-   argument */
-extern time_t history_get_time PARAMS((HIST_ENTRY *));
-
-/* Return the number of bytes that the primary history entries are using.
-   This just adds up the lengths of the_history->lines. */
-extern int history_total_bytes PARAMS((void));
-
-/* Moving around the history list. */
-
-/* Set the position in the history list to POS. */
-extern int history_set_pos PARAMS((int));
-
-/* Back up history_offset to the previous history entry, and return
-   a pointer to that entry.  If there is no previous entry, return
-   a NULL pointer. */
-extern HIST_ENTRY *previous_history PARAMS((void));
-
-/* Move history_offset forward to the next item in the input_history,
-   and return the a pointer to that entry.  If there is no next entry,
-   return a NULL pointer. */
-extern HIST_ENTRY *next_history PARAMS((void));
-
-/* Searching the history list. */
-
-/* Search the history for STRING, starting at history_offset.
-   If DIRECTION < 0, then the search is through previous entries,
-   else through subsequent.  If the string is found, then
-   current_history () is the history entry, and the value of this function
-   is the offset in the line of that history entry that the string was
-   found in.  Otherwise, nothing is changed, and a -1 is returned. */
-extern int history_search PARAMS((const char *, int));
-
-/* Search the history for STRING, starting at history_offset.
-   The search is anchored: matching lines must begin with string.
-   DIRECTION is as in history_search(). */
-extern int history_search_prefix PARAMS((const char *, int));
-
-/* Search for STRING in the history list, starting at POS, an
-   absolute index into the list.  DIR, if negative, says to search
-   backwards from POS, else forwards.
-   Returns the absolute index of the history element where STRING
-   was found, or -1 otherwise. */
-extern int history_search_pos PARAMS((const char *, int, int));
-
-/* Managing the history file. */
-
-/* Add the contents of FILENAME to the history list, a line at a time.
-   If FILENAME is NULL, then read from ~/.history.  Returns 0 if
-   successful, or errno if not. */
-extern int read_history PARAMS((const char *));
-
-/* Read a range of lines from FILENAME, adding them to the history list.
-   Start reading at the FROM'th line and end at the TO'th.  If FROM
-   is zero, start at the beginning.  If TO is less than FROM, read
-   until the end of the file.  If FILENAME is NULL, then read from
-   ~/.history.  Returns 0 if successful, or errno if not. */
-extern int read_history_range PARAMS((const char *, int, int));
-
-/* Write the current history to FILENAME.  If FILENAME is NULL,
-   then write the history list to ~/.history.  Values returned
-   are as in read_history ().  */
-extern int write_history PARAMS((const char *));
-
-/* Append NELEMENT entries to FILENAME.  The entries appended are from
-   the end of the list minus NELEMENTs up to the end of the list. */
-extern int append_history PARAMS((int, const char *));
-
-/* Truncate the history file, leaving only the last NLINES lines. */
-extern int history_truncate_file PARAMS((const char *, int));
-
-/* History expansion. */
-
-/* Expand the string STRING, placing the result into OUTPUT, a pointer
-   to a string.  Returns:
-
-   0) If no expansions took place (or, if the only change in
-      the text was the de-slashifying of the history expansion
-      character)
-   1) If expansions did take place
-  -1) If there was an error in expansion.
-   2) If the returned line should just be printed.
-
-  If an error ocurred in expansion, then OUTPUT contains a descriptive
-  error message. */
-extern int history_expand PARAMS((char *, char **));
-
-/* Extract a string segment consisting of the FIRST through LAST
-   arguments present in STRING.  Arguments are broken up as in
-   the shell. */
-extern char *history_arg_extract PARAMS((int, int, const char *));
-
-/* Return the text of the history event beginning at the current
-   offset into STRING.  Pass STRING with *INDEX equal to the
-   history_expansion_char that begins this specification.
-   DELIMITING_QUOTE is a character that is allowed to end the string
-   specification for what to search for in addition to the normal
-   characters `:', ` ', `\t', `\n', and sometimes `?'. */
-extern char *get_history_event PARAMS((const char *, int *, int));
-
-/* Return an array of tokens, much as the shell might.  The tokens are
-   parsed out of STRING. */
-extern char **history_tokenize PARAMS((const char *));
-
-/* Exported history variables. */
-extern int history_base;
-extern int history_length;
-extern int history_max_entries;
-extern char history_expansion_char;
-extern char history_subst_char;
-extern char *history_word_delimiters;
-extern char history_comment_char;
-extern char *history_no_expand_chars;
-extern char *history_search_delimiter_chars;
-extern int history_quotes_inhibit_expansion;
-
-extern int history_write_timestamps;
-
-/* Backwards compatibility */
-extern int max_input_history;
-
-/* If set, this function is called to decide whether or not a particular
-   history expansion should be treated as a special case for the calling
-   application and not expanded. */
-extern rl_linebuf_func_t *history_inhibit_expansion_function;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_HISTORY_H_ */
diff --git a/include.new/readline/keymaps.h b/include.new/readline/keymaps.h
deleted file mode 100644
index 66fa2a5..0000000
--- a/include.new/readline/keymaps.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* keymaps.h -- Manipulation of readline keymaps. */
-
-/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library, a library for
-   reading lines of text with interactive input and history editing.
-
-   The GNU Readline Library is free software; you can redistribute it
-   and/or modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2, or
-   (at your option) any later version.
-
-   The GNU Readline Library is distributed in the hope that it will be
-   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   The GNU General Public License is often shipped with GNU software, and
-   is generally kept in a file called COPYING or LICENSE.  If you do not
-   have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#ifndef _KEYMAPS_H_
-#define _KEYMAPS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined (READLINE_LIBRARY)
-#  include "rlstdc.h"
-#  include "chardefs.h"
-#  include "rltypedefs.h"
-#else
-#  include <readline/rlstdc.h>
-#  include <readline/chardefs.h>
-#  include <readline/rltypedefs.h>
-#endif
-
-/* A keymap contains one entry for each key in the ASCII set.
-   Each entry consists of a type and a pointer.
-   FUNCTION is the address of a function to run, or the
-   address of a keymap to indirect through.
-   TYPE says which kind of thing FUNCTION is. */
-typedef struct _keymap_entry {
-  char type;
-  rl_command_func_t *function;
-} KEYMAP_ENTRY;
-
-/* This must be large enough to hold bindings for all of the characters
-   in a desired character set (e.g, 128 for ASCII, 256 for ISO Latin-x,
-   and so on) plus one for subsequence matching. */
-#define KEYMAP_SIZE 257
-#define ANYOTHERKEY KEYMAP_SIZE-1
-
-/* I wanted to make the above structure contain a union of:
-   union { rl_command_func_t *function; struct _keymap_entry *keymap; } value;
-   but this made it impossible for me to create a static array.
-   Maybe I need C lessons. */
-
-typedef KEYMAP_ENTRY KEYMAP_ENTRY_ARRAY[KEYMAP_SIZE];
-typedef KEYMAP_ENTRY *Keymap;
-
-/* The values that TYPE can have in a keymap entry. */
-#define ISFUNC 0
-#define ISKMAP 1
-#define ISMACR 2
-
-extern KEYMAP_ENTRY_ARRAY emacs_standard_keymap, emacs_meta_keymap, emacs_ctlx_keymap;
-extern KEYMAP_ENTRY_ARRAY vi_insertion_keymap, vi_movement_keymap;
-
-/* Return a new, empty keymap.
-   Free it with free() when you are done. */
-extern Keymap rl_make_bare_keymap PARAMS((void));
-
-/* Return a new keymap which is a copy of MAP. */
-extern Keymap rl_copy_keymap PARAMS((Keymap));
-
-/* Return a new keymap with the printing characters bound to rl_insert,
-   the lowercase Meta characters bound to run their equivalents, and
-   the Meta digits bound to produce numeric arguments. */
-extern Keymap rl_make_keymap PARAMS((void));
-
-/* Free the storage associated with a keymap. */
-extern void rl_discard_keymap PARAMS((Keymap));
-
-/* These functions actually appear in bind.c */
-
-/* Return the keymap corresponding to a given name.  Names look like
-   `emacs' or `emacs-meta' or `vi-insert'.  */
-extern Keymap rl_get_keymap_by_name PARAMS((const char *));
-
-/* Return the current keymap. */
-extern Keymap rl_get_keymap PARAMS((void));
-
-/* Set the current keymap to MAP. */
-extern void rl_set_keymap PARAMS((Keymap));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _KEYMAPS_H_ */
diff --git a/include.new/readline/readline.h b/include.new/readline/readline.h
deleted file mode 100644
index 612d466..0000000
--- a/include.new/readline/readline.h
+++ /dev/null
@@ -1,861 +0,0 @@
-/* $FreeBSD: releng/10.2/contrib/libreadline/readline.h 165675 2006-12-31 09:22:31Z ache $ */
-/* Readline.h -- the names of functions callable from within readline. */
-
-/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library, a library for
-   reading lines of text with interactive input and history editing.
-
-   The GNU Readline Library is free software; you can redistribute it
-   and/or modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2, or
-   (at your option) any later version.
-
-   The GNU Readline Library is distributed in the hope that it will be
-   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   The GNU General Public License is often shipped with GNU software, and
-   is generally kept in a file called COPYING or LICENSE.  If you do not
-   have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#if !defined (_READLINE_H_)
-#define _READLINE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined (READLINE_LIBRARY)
-#  include "rlstdc.h"
-#  include "rltypedefs.h"
-#  include "keymaps.h"
-#  include "tilde.h"
-#else
-#  include <readline/rlstdc.h>
-#  include <readline/rltypedefs.h>
-#  include <readline/keymaps.h>
-#  include <readline/tilde.h>
-#endif
-
-/* Hex-encoded Readline version number. */
-#define RL_READLINE_VERSION	0x0502		/* Readline 5.2 */
-#define RL_VERSION_MAJOR	5
-#define RL_VERSION_MINOR	2
-
-/* Readline data structures. */
-
-/* Maintaining the state of undo.  We remember individual deletes and inserts
-   on a chain of things to do. */
-
-/* The actions that undo knows how to undo.  Notice that UNDO_DELETE means
-   to insert some text, and UNDO_INSERT means to delete some text.   I.e.,
-   the code tells undo what to undo, not how to undo it. */
-enum undo_code { UNDO_DELETE, UNDO_INSERT, UNDO_BEGIN, UNDO_END };
-
-/* What an element of THE_UNDO_LIST looks like. */
-typedef struct undo_list {
-  struct undo_list *next;
-  int start, end;		/* Where the change took place. */
-  char *text;			/* The text to insert, if undoing a delete. */
-  enum undo_code what;		/* Delete, Insert, Begin, End. */
-} UNDO_LIST;
-
-/* The current undo list for RL_LINE_BUFFER. */
-extern UNDO_LIST *rl_undo_list;
-
-/* The data structure for mapping textual names to code addresses. */
-typedef struct _funmap {
-  const char *name;
-  rl_command_func_t *function;
-} FUNMAP;
-
-extern FUNMAP **funmap;
-
-/* **************************************************************** */
-/*								    */
-/*	     Functions available to bind to key sequences	    */
-/*								    */
-/* **************************************************************** */
-
-/* Bindable commands for numeric arguments. */
-extern int rl_digit_argument PARAMS((int, int));
-extern int rl_universal_argument PARAMS((int, int));
-
-/* Bindable commands for moving the cursor. */
-extern int rl_forward_byte PARAMS((int, int));
-extern int rl_forward_char PARAMS((int, int));
-extern int rl_forward PARAMS((int, int));
-extern int rl_backward_byte PARAMS((int, int));
-extern int rl_backward_char PARAMS((int, int));
-extern int rl_backward PARAMS((int, int));
-extern int rl_beg_of_line PARAMS((int, int));
-extern int rl_end_of_line PARAMS((int, int));
-extern int rl_forward_word PARAMS((int, int));
-extern int rl_backward_word PARAMS((int, int));
-extern int rl_refresh_line PARAMS((int, int));
-extern int rl_clear_screen PARAMS((int, int));
-extern int rl_arrow_keys PARAMS((int, int));
-
-/* Bindable commands for inserting and deleting text. */
-extern int rl_insert PARAMS((int, int));
-extern int rl_quoted_insert PARAMS((int, int));
-extern int rl_tab_insert PARAMS((int, int));
-extern int rl_newline PARAMS((int, int));
-extern int rl_do_lowercase_version PARAMS((int, int));
-extern int rl_rubout PARAMS((int, int));
-extern int rl_delete PARAMS((int, int));
-extern int rl_rubout_or_delete PARAMS((int, int));
-extern int rl_delete_horizontal_space PARAMS((int, int));
-extern int rl_delete_or_show_completions PARAMS((int, int));
-extern int rl_insert_comment PARAMS((int, int));
-
-/* Bindable commands for changing case. */
-extern int rl_upcase_word PARAMS((int, int));
-extern int rl_downcase_word PARAMS((int, int));
-extern int rl_capitalize_word PARAMS((int, int));
-
-/* Bindable commands for transposing characters and words. */
-extern int rl_transpose_words PARAMS((int, int));
-extern int rl_transpose_chars PARAMS((int, int));
-
-/* Bindable commands for searching within a line. */
-extern int rl_char_search PARAMS((int, int));
-extern int rl_backward_char_search PARAMS((int, int));
-
-/* Bindable commands for readline's interface to the command history. */
-extern int rl_beginning_of_history PARAMS((int, int));
-extern int rl_end_of_history PARAMS((int, int));
-extern int rl_get_next_history PARAMS((int, int));
-extern int rl_get_previous_history PARAMS((int, int));
-
-/* Bindable commands for managing the mark and region. */
-extern int rl_set_mark PARAMS((int, int));
-extern int rl_exchange_point_and_mark PARAMS((int, int));
-
-/* Bindable commands to set the editing mode (emacs or vi). */
-extern int rl_vi_editing_mode PARAMS((int, int));
-extern int rl_emacs_editing_mode PARAMS((int, int));
-
-/* Bindable commands to change the insert mode (insert or overwrite) */
-extern int rl_overwrite_mode PARAMS((int, int));
-
-/* Bindable commands for managing key bindings. */
-extern int rl_re_read_init_file PARAMS((int, int));
-extern int rl_dump_functions PARAMS((int, int));
-extern int rl_dump_macros PARAMS((int, int));
-extern int rl_dump_variables PARAMS((int, int));
-
-/* Bindable commands for word completion. */
-extern int rl_complete PARAMS((int, int));
-extern int rl_possible_completions PARAMS((int, int));
-extern int rl_insert_completions PARAMS((int, int));
-extern int rl_menu_complete PARAMS((int, int));
-
-/* Bindable commands for killing and yanking text, and managing the kill ring. */
-extern int rl_kill_word PARAMS((int, int));
-extern int rl_backward_kill_word PARAMS((int, int));
-extern int rl_kill_line PARAMS((int, int));
-extern int rl_backward_kill_line PARAMS((int, int));
-extern int rl_kill_full_line PARAMS((int, int));
-extern int rl_unix_word_rubout PARAMS((int, int));
-extern int rl_unix_filename_rubout PARAMS((int, int));
-extern int rl_unix_line_discard PARAMS((int, int));
-extern int rl_copy_region_to_kill PARAMS((int, int));
-extern int rl_kill_region PARAMS((int, int));
-extern int rl_copy_forward_word PARAMS((int, int));
-extern int rl_copy_backward_word PARAMS((int, int));
-extern int rl_yank PARAMS((int, int));
-extern int rl_yank_pop PARAMS((int, int));
-extern int rl_yank_nth_arg PARAMS((int, int));
-extern int rl_yank_last_arg PARAMS((int, int));
-/* Not available unless __CYGWIN__ is defined. */
-#ifdef __CYGWIN__
-extern int rl_paste_from_clipboard PARAMS((int, int));
-#endif
-
-/* Bindable commands for incremental searching. */
-extern int rl_reverse_search_history PARAMS((int, int));
-extern int rl_forward_search_history PARAMS((int, int));
-
-/* Bindable keyboard macro commands. */
-extern int rl_start_kbd_macro PARAMS((int, int));
-extern int rl_end_kbd_macro PARAMS((int, int));
-extern int rl_call_last_kbd_macro PARAMS((int, int));
-
-/* Bindable undo commands. */
-extern int rl_revert_line PARAMS((int, int));
-extern int rl_undo_command PARAMS((int, int));
-
-/* Bindable tilde expansion commands. */
-extern int rl_tilde_expand PARAMS((int, int));
-
-/* Bindable terminal control commands. */
-extern int rl_restart_output PARAMS((int, int));
-extern int rl_stop_output PARAMS((int, int));
-
-/* Miscellaneous bindable commands. */
-extern int rl_abort PARAMS((int, int));
-extern int rl_tty_status PARAMS((int, int));
-
-/* Bindable commands for incremental and non-incremental history searching. */
-extern int rl_history_search_forward PARAMS((int, int));
-extern int rl_history_search_backward PARAMS((int, int));
-extern int rl_noninc_forward_search PARAMS((int, int));
-extern int rl_noninc_reverse_search PARAMS((int, int));
-extern int rl_noninc_forward_search_again PARAMS((int, int));
-extern int rl_noninc_reverse_search_again PARAMS((int, int));
-
-/* Bindable command used when inserting a matching close character. */
-extern int rl_insert_close PARAMS((int, int));
-
-/* Not available unless READLINE_CALLBACKS is defined. */
-extern void rl_callback_handler_install PARAMS((const char *, rl_vcpfunc_t *));
-extern void rl_callback_read_char PARAMS((void));
-extern void rl_callback_handler_remove PARAMS((void));
-
-/* Things for vi mode. Not available unless readline is compiled -DVI_MODE. */
-/* VI-mode bindable commands. */
-extern int rl_vi_redo PARAMS((int, int));
-extern int rl_vi_undo PARAMS((int, int));
-extern int rl_vi_yank_arg PARAMS((int, int));
-extern int rl_vi_fetch_history PARAMS((int, int));
-extern int rl_vi_search_again PARAMS((int, int));
-extern int rl_vi_search PARAMS((int, int));
-extern int rl_vi_complete PARAMS((int, int));
-extern int rl_vi_tilde_expand PARAMS((int, int));
-extern int rl_vi_prev_word PARAMS((int, int));
-extern int rl_vi_next_word PARAMS((int, int));
-extern int rl_vi_end_word PARAMS((int, int));
-extern int rl_vi_insert_beg PARAMS((int, int));
-extern int rl_vi_append_mode PARAMS((int, int));
-extern int rl_vi_append_eol PARAMS((int, int));
-extern int rl_vi_eof_maybe PARAMS((int, int));
-extern int rl_vi_insertion_mode PARAMS((int, int));
-extern int rl_vi_movement_mode PARAMS((int, int));
-extern int rl_vi_arg_digit PARAMS((int, int));
-extern int rl_vi_change_case PARAMS((int, int));
-extern int rl_vi_put PARAMS((int, int));
-extern int rl_vi_column PARAMS((int, int));
-extern int rl_vi_delete_to PARAMS((int, int));
-extern int rl_vi_change_to PARAMS((int, int));
-extern int rl_vi_yank_to PARAMS((int, int));
-extern int rl_vi_rubout PARAMS((int, int));
-extern int rl_vi_delete PARAMS((int, int));
-extern int rl_vi_back_to_indent PARAMS((int, int));
-extern int rl_vi_first_print PARAMS((int, int));
-extern int rl_vi_char_search PARAMS((int, int));
-extern int rl_vi_match PARAMS((int, int));
-extern int rl_vi_change_char PARAMS((int, int));
-extern int rl_vi_subst PARAMS((int, int));
-extern int rl_vi_overstrike PARAMS((int, int));
-extern int rl_vi_overstrike_delete PARAMS((int, int));
-extern int rl_vi_replace PARAMS((int, int));
-extern int rl_vi_set_mark PARAMS((int, int));
-extern int rl_vi_goto_mark PARAMS((int, int));
-
-/* VI-mode utility functions. */
-extern int rl_vi_check PARAMS((void));
-extern int rl_vi_domove PARAMS((int, int *));
-extern int rl_vi_bracktype PARAMS((int));
-
-extern void rl_vi_start_inserting PARAMS((int, int, int));
-
-/* VI-mode pseudo-bindable commands, used as utility functions. */
-extern int rl_vi_fWord PARAMS((int, int));
-extern int rl_vi_bWord PARAMS((int, int));
-extern int rl_vi_eWord PARAMS((int, int));
-extern int rl_vi_fword PARAMS((int, int));
-extern int rl_vi_bword PARAMS((int, int));
-extern int rl_vi_eword PARAMS((int, int));
-
-/* **************************************************************** */
-/*								    */
-/*			Well Published Functions		    */
-/*								    */
-/* **************************************************************** */
-
-/* Readline functions. */
-/* Read a line of input.  Prompt with PROMPT.  A NULL PROMPT means none. */
-extern char *readline PARAMS((const char *));
-
-extern int rl_set_prompt PARAMS((const char *));
-extern int rl_expand_prompt PARAMS((char *));
-
-extern int rl_initialize PARAMS((void));
-
-/* Undocumented; unused by readline */
-extern int rl_discard_argument PARAMS((void));
-
-/* Utility functions to bind keys to readline commands. */
-extern int rl_add_defun PARAMS((const char *, rl_command_func_t *, int));
-extern int rl_bind_key PARAMS((int, rl_command_func_t *));
-extern int rl_bind_key_in_map PARAMS((int, rl_command_func_t *, Keymap));
-extern int rl_unbind_key PARAMS((int));
-extern int rl_unbind_key_in_map PARAMS((int, Keymap));
-extern int rl_bind_key_if_unbound PARAMS((int, rl_command_func_t *));
-extern int rl_bind_key_if_unbound_in_map PARAMS((int, rl_command_func_t *, Keymap));
-extern int rl_unbind_function_in_map PARAMS((rl_command_func_t *, Keymap));
-extern int rl_unbind_command_in_map PARAMS((const char *, Keymap));
-extern int rl_bind_keyseq PARAMS((const char *, rl_command_func_t *));
-extern int rl_bind_keyseq_in_map PARAMS((const char *, rl_command_func_t *, Keymap));
-extern int rl_bind_keyseq_if_unbound PARAMS((const char *, rl_command_func_t *));
-extern int rl_bind_keyseq_if_unbound_in_map PARAMS((const char *, rl_command_func_t *, Keymap));
-extern int rl_generic_bind PARAMS((int, const char *, char *, Keymap));
-
-extern char *rl_variable_value PARAMS((const char *));
-extern int rl_variable_bind PARAMS((const char *, const char *));
-
-/* Backwards compatibility, use rl_bind_keyseq_in_map instead. */
-extern int rl_set_key PARAMS((const char *, rl_command_func_t *, Keymap));
-
-/* Backwards compatibility, use rl_generic_bind instead. */
-extern int rl_macro_bind PARAMS((const char *, const char *, Keymap));
-
-/* Undocumented in the texinfo manual; not really useful to programs. */
-extern int rl_translate_keyseq PARAMS((const char *, char *, int *));
-extern char *rl_untranslate_keyseq PARAMS((int));
-
-extern rl_command_func_t *rl_named_function PARAMS((const char *));
-extern rl_command_func_t *rl_function_of_keyseq PARAMS((const char *, Keymap, int *));
-
-extern void rl_list_funmap_names PARAMS((void));
-extern char **rl_invoking_keyseqs_in_map PARAMS((rl_command_func_t *, Keymap));
-extern char **rl_invoking_keyseqs PARAMS((rl_command_func_t *));
- 
-extern void rl_function_dumper PARAMS((int));
-extern void rl_macro_dumper PARAMS((int));
-extern void rl_variable_dumper PARAMS((int));
-
-extern int rl_read_init_file PARAMS((const char *));
-extern int rl_parse_and_bind PARAMS((char *));
-
-/* Functions for manipulating keymaps. */
-extern Keymap rl_make_bare_keymap PARAMS((void));
-extern Keymap rl_copy_keymap PARAMS((Keymap));
-extern Keymap rl_make_keymap PARAMS((void));
-extern void rl_discard_keymap PARAMS((Keymap));
-
-extern Keymap rl_get_keymap_by_name PARAMS((const char *));
-extern char *rl_get_keymap_name PARAMS((Keymap));
-extern void rl_set_keymap PARAMS((Keymap));
-extern Keymap rl_get_keymap PARAMS((void));
-/* Undocumented; used internally only. */
-extern void rl_set_keymap_from_edit_mode PARAMS((void));
-extern char *rl_get_keymap_name_from_edit_mode PARAMS((void));
-
-/* Functions for manipulating the funmap, which maps command names to functions. */
-extern int rl_add_funmap_entry PARAMS((const char *, rl_command_func_t *));
-extern const char **rl_funmap_names PARAMS((void));
-/* Undocumented, only used internally -- there is only one funmap, and this
-   function may be called only once. */
-extern void rl_initialize_funmap PARAMS((void));
-
-/* Utility functions for managing keyboard macros. */
-extern void rl_push_macro_input PARAMS((char *));
-
-/* Functions for undoing, from undo.c */
-extern void rl_add_undo PARAMS((enum undo_code, int, int, char *));
-extern void rl_free_undo_list PARAMS((void));
-extern int rl_do_undo PARAMS((void));
-extern int rl_begin_undo_group PARAMS((void));
-extern int rl_end_undo_group PARAMS((void));
-extern int rl_modifying PARAMS((int, int));
-
-/* Functions for redisplay. */
-extern void rl_redisplay PARAMS((void));
-extern int rl_on_new_line PARAMS((void));
-extern int rl_on_new_line_with_prompt PARAMS((void));
-extern int rl_forced_update_display PARAMS((void));
-extern int rl_clear_message PARAMS((void));
-extern int rl_reset_line_state PARAMS((void));
-extern int rl_crlf PARAMS((void));
-
-#if defined (USE_VARARGS) && defined (PREFER_STDARG)
-extern int rl_message (const char *, ...)  __attribute__((__format__ (printf, 1, 2)));
-#else
-extern int rl_message ();
-#endif
-
-extern int rl_show_char PARAMS((int));
-
-/* Undocumented in texinfo manual. */
-extern int rl_character_len PARAMS((int, int));
-
-/* Save and restore internal prompt redisplay information. */
-extern void rl_save_prompt PARAMS((void));
-extern void rl_restore_prompt PARAMS((void));
-
-/* Modifying text. */
-extern void rl_replace_line PARAMS((const char *, int));
-extern int rl_insert_text PARAMS((const char *));
-extern int rl_delete_text PARAMS((int, int));
-extern int rl_kill_text PARAMS((int, int));
-extern char *rl_copy_text PARAMS((int, int));
-
-/* Terminal and tty mode management. */
-extern void rl_prep_terminal PARAMS((int));
-extern void rl_deprep_terminal PARAMS((void));
-extern void rl_tty_set_default_bindings PARAMS((Keymap));
-extern void rl_tty_unset_default_bindings PARAMS((Keymap));
-
-extern int rl_reset_terminal PARAMS((const char *));
-extern void rl_resize_terminal PARAMS((void));
-extern void rl_set_screen_size PARAMS((int, int));
-extern void rl_get_screen_size PARAMS((int *, int *));
-extern void rl_reset_screen_size PARAMS((void));
-
-extern char *rl_get_termcap PARAMS((const char *));
-
-/* Functions for character input. */
-extern int rl_stuff_char PARAMS((int));
-extern int rl_execute_next PARAMS((int));
-extern int rl_clear_pending_input PARAMS((void));
-extern int rl_read_key PARAMS((void));
-extern int rl_getc PARAMS((FILE *));
-extern int rl_set_keyboard_input_timeout PARAMS((int));
-
-/* `Public' utility functions . */
-extern void rl_extend_line_buffer PARAMS((int));
-extern int rl_ding PARAMS((void));
-extern int rl_alphabetic PARAMS((int));
-
-/* Readline signal handling, from signals.c */
-extern int rl_set_signals PARAMS((void));
-extern int rl_clear_signals PARAMS((void));
-extern void rl_cleanup_after_signal PARAMS((void));
-extern void rl_reset_after_signal PARAMS((void));
-extern void rl_free_line_state PARAMS((void));
- 
-extern int rl_set_paren_blink_timeout PARAMS((int));
-
-/* Undocumented. */
-extern int rl_maybe_save_line PARAMS((void));
-extern int rl_maybe_unsave_line PARAMS((void));
-extern int rl_maybe_replace_line PARAMS((void));
-
-/* Completion functions. */
-extern int rl_complete_internal PARAMS((int));
-extern void rl_display_match_list PARAMS((char **, int, int));
-
-extern char **rl_completion_matches PARAMS((const char *, rl_compentry_func_t *));
-extern char *rl_username_completion_function PARAMS((const char *, int));
-extern char *rl_filename_completion_function PARAMS((const char *, int));
-
-extern int rl_completion_mode PARAMS((rl_command_func_t *));
-
-#if !defined(RL_NO_COMPAT)
-/* Backwards compatibility (compat.c).  These will go away sometime. */
-extern void free_undo_list PARAMS((void));
-extern int maybe_save_line PARAMS((void));
-extern int maybe_unsave_line PARAMS((void));
-extern int maybe_replace_line PARAMS((void));
-
-extern int ding PARAMS((void));
-extern int alphabetic PARAMS((int));
-extern int crlf PARAMS((void));
-
-extern char **completion_matches PARAMS((char *, rl_compentry_func_t *));
-extern char *username_completion_function PARAMS((const char *, int));
-extern char *filename_completion_function PARAMS((const char *, int));
-#endif
-
-/* **************************************************************** */
-/*								    */
-/*			Well Published Variables		    */
-/*								    */
-/* **************************************************************** */
-
-/* The version of this incarnation of the readline library. */
-extern const char *rl_library_version;		/* e.g., "4.2" */
-extern int rl_readline_version;			/* e.g., 0x0402 */
-
-/* True if this is real GNU readline. */
-extern int rl_gnu_readline_p;
-
-/* Flags word encapsulating the current readline state. */
-extern int rl_readline_state;
-
-/* Says which editing mode readline is currently using.  1 means emacs mode;
-   0 means vi mode. */
-extern int rl_editing_mode;
-
-/* Insert or overwrite mode for emacs mode.  1 means insert mode; 0 means
-   overwrite mode.  Reset to insert mode on each input line. */
-extern int rl_insert_mode;
-
-/* The name of the calling program.  You should initialize this to
-   whatever was in argv[0].  It is used when parsing conditionals. */
-extern const char *rl_readline_name;
-
-/* The prompt readline uses.  This is set from the argument to
-   readline (), and should not be assigned to directly. */
-extern char *rl_prompt;
-
-/* The line buffer that is in use. */
-extern char *rl_line_buffer;
-
-/* The location of point, and end. */
-extern int rl_point;
-extern int rl_end;
-
-/* The mark, or saved cursor position. */
-extern int rl_mark;
-
-/* Flag to indicate that readline has finished with the current input
-   line and should return it. */
-extern int rl_done;
-
-/* If set to a character value, that will be the next keystroke read. */
-extern int rl_pending_input;
-
-/* Non-zero if we called this function from _rl_dispatch().  It's present
-   so functions can find out whether they were called from a key binding
-   or directly from an application. */
-extern int rl_dispatching;
-
-/* Non-zero if the user typed a numeric argument before executing the
-   current function. */
-extern int rl_explicit_arg;
-
-/* The current value of the numeric argument specified by the user. */
-extern int rl_numeric_arg;
-
-/* The address of the last command function Readline executed. */
-extern rl_command_func_t *rl_last_func;
-
-/* The name of the terminal to use. */
-extern const char *rl_terminal_name;
-
-/* The input and output streams. */
-extern FILE *rl_instream;
-extern FILE *rl_outstream;
-
-/* If non-zero, Readline gives values of LINES and COLUMNS from the environment
-   greater precedence than values fetched from the kernel when computing the
-   screen dimensions. */
-extern int rl_prefer_env_winsize;
-
-/* If non-zero, then this is the address of a function to call just
-   before readline_internal () prints the first prompt. */
-extern rl_hook_func_t *rl_startup_hook;
-
-/* If non-zero, this is the address of a function to call just before
-   readline_internal_setup () returns and readline_internal starts
-   reading input characters. */
-extern rl_hook_func_t *rl_pre_input_hook;
-      
-/* The address of a function to call periodically while Readline is
-   awaiting character input, or NULL, for no event handling. */
-extern rl_hook_func_t *rl_event_hook;
-
-/* The address of the function to call to fetch a character from the current
-   Readline input stream */
-extern rl_getc_func_t *rl_getc_function;
-
-extern rl_voidfunc_t *rl_redisplay_function;
-
-extern rl_vintfunc_t *rl_prep_term_function;
-extern rl_voidfunc_t *rl_deprep_term_function;
-
-/* Dispatch variables. */
-extern Keymap rl_executing_keymap;
-extern Keymap rl_binding_keymap;
-
-/* Display variables. */
-/* If non-zero, readline will erase the entire line, including any prompt,
-   if the only thing typed on an otherwise-blank line is something bound to
-   rl_newline. */
-extern int rl_erase_empty_line;
-
-/* If non-zero, the application has already printed the prompt (rl_prompt)
-   before calling readline, so readline should not output it the first time
-   redisplay is done. */
-extern int rl_already_prompted;
-
-/* A non-zero value means to read only this many characters rather than
-   up to a character bound to accept-line. */
-extern int rl_num_chars_to_read;
-
-/* The text of a currently-executing keyboard macro. */
-extern char *rl_executing_macro;
-
-/* Variables to control readline signal handling. */
-/* If non-zero, readline will install its own signal handlers for
-   SIGINT, SIGTERM, SIGQUIT, SIGALRM, SIGTSTP, SIGTTIN, and SIGTTOU. */
-extern int rl_catch_signals;
-
-/* If non-zero, readline will install a signal handler for SIGWINCH
-   that also attempts to call any calling application's SIGWINCH signal
-   handler.  Note that the terminal is not cleaned up before the
-   application's signal handler is called; use rl_cleanup_after_signal()
-   to do that. */
-extern int rl_catch_sigwinch;
-
-/* Completion variables. */
-/* Pointer to the generator function for completion_matches ().
-   NULL means to use rl_filename_completion_function (), the default
-   filename completer. */
-extern rl_compentry_func_t *rl_completion_entry_function;
-
-/* If rl_ignore_some_completions_function is non-NULL it is the address
-   of a function to call after all of the possible matches have been
-   generated, but before the actual completion is done to the input line.
-   The function is called with one argument; a NULL terminated array
-   of (char *).  If your function removes any of the elements, they
-   must be free()'ed. */
-extern rl_compignore_func_t *rl_ignore_some_completions_function;
-
-/* Pointer to alternative function to create matches.
-   Function is called with TEXT, START, and END.
-   START and END are indices in RL_LINE_BUFFER saying what the boundaries
-   of TEXT are.
-   If this function exists and returns NULL then call the value of
-   rl_completion_entry_function to try to match, otherwise use the
-   array of strings returned. */
-extern rl_completion_func_t *rl_attempted_completion_function;
-
-/* The basic list of characters that signal a break between words for the
-   completer routine.  The initial contents of this variable is what
-   breaks words in the shell, i.e. "n\"\\'`@$>". */
-extern const char *rl_basic_word_break_characters;
-
-/* The list of characters that signal a break between words for
-   rl_complete_internal.  The default list is the contents of
-   rl_basic_word_break_characters.  */
-extern /*const*/ char *rl_completer_word_break_characters;
-
-/* Hook function to allow an application to set the completion word
-   break characters before readline breaks up the line.  Allows
-   position-dependent word break characters. */
-extern rl_cpvfunc_t *rl_completion_word_break_hook;
-
-/* List of characters which can be used to quote a substring of the line.
-   Completion occurs on the entire substring, and within the substring   
-   rl_completer_word_break_characters are treated as any other character,
-   unless they also appear within this list. */
-extern const char *rl_completer_quote_characters;
-
-/* List of quote characters which cause a word break. */
-extern const char *rl_basic_quote_characters;
-
-/* List of characters that need to be quoted in filenames by the completer. */
-extern const char *rl_filename_quote_characters;
-
-/* List of characters that are word break characters, but should be left
-   in TEXT when it is passed to the completion function.  The shell uses
-   this to help determine what kind of completing to do. */
-extern const char *rl_special_prefixes;
-
-/* If non-zero, then this is the address of a function to call when
-   completing on a directory name.  The function is called with
-   the address of a string (the current directory name) as an arg.  It
-   changes what is displayed when the possible completions are printed
-   or inserted. */
-extern rl_icppfunc_t *rl_directory_completion_hook;
-
-/* If non-zero, this is the address of a function to call when completing
-   a directory name.  This function takes the address of the directory name
-   to be modified as an argument.  Unlike rl_directory_completion_hook, it
-   only modifies the directory name used in opendir(2), not what is displayed
-   when the possible completions are printed or inserted.  It is called
-   before rl_directory_completion_hook.  I'm not happy with how this works
-   yet, so it's undocumented. */
-extern rl_icppfunc_t *rl_directory_rewrite_hook;
-
-/* Backwards compatibility with previous versions of readline. */
-#define rl_symbolic_link_hook rl_directory_completion_hook
-
-/* If non-zero, then this is the address of a function to call when
-   completing a word would normally display the list of possible matches.
-   This function is called instead of actually doing the display.
-   It takes three arguments: (char **matches, int num_matches, int max_length)
-   where MATCHES is the array of strings that matched, NUM_MATCHES is the
-   number of strings in that array, and MAX_LENGTH is the length of the
-   longest string in that array. */
-extern rl_compdisp_func_t *rl_completion_display_matches_hook;
-
-/* Non-zero means that the results of the matches are to be treated
-   as filenames.  This is ALWAYS zero on entry, and can only be changed
-   within a completion entry finder function. */
-extern int rl_filename_completion_desired;
-
-/* Non-zero means that the results of the matches are to be quoted using
-   double quotes (or an application-specific quoting mechanism) if the
-   filename contains any characters in rl_word_break_chars.  This is
-   ALWAYS non-zero on entry, and can only be changed within a completion
-   entry finder function. */
-extern int rl_filename_quoting_desired;
-
-/* Set to a function to quote a filename in an application-specific fashion.
-   Called with the text to quote, the type of match found (single or multiple)
-   and a pointer to the quoting character to be used, which the function can
-   reset if desired. */
-extern rl_quote_func_t *rl_filename_quoting_function;
-
-/* Function to call to remove quoting characters from a filename.  Called
-   before completion is attempted, so the embedded quotes do not interfere
-   with matching names in the file system. */
-extern rl_dequote_func_t *rl_filename_dequoting_function;
-
-/* Function to call to decide whether or not a word break character is
-   quoted.  If a character is quoted, it does not break words for the
-   completer. */
-extern rl_linebuf_func_t *rl_char_is_quoted_p;
-
-/* Non-zero means to suppress normal filename completion after the
-   user-specified completion function has been called. */
-extern int rl_attempted_completion_over;
-
-/* Set to a character describing the type of completion being attempted by
-   rl_complete_internal; available for use by application completion
-   functions. */
-extern int rl_completion_type;
-
-/* Up to this many items will be displayed in response to a
-   possible-completions call.  After that, we ask the user if she
-   is sure she wants to see them all.  The default value is 100. */
-extern int rl_completion_query_items;
-
-/* Character appended to completed words when at the end of the line.  The
-   default is a space.  Nothing is added if this is '\0'. */
-extern int rl_completion_append_character;
-
-/* If set to non-zero by an application completion function,
-   rl_completion_append_character will not be appended. */
-extern int rl_completion_suppress_append;
-
-/* Set to any quote character readline thinks it finds before any application
-   completion function is called. */
-extern int rl_completion_quote_character;
-
-/* Set to a non-zero value if readline found quoting anywhere in the word to
-   be completed; set before any application completion function is called. */
-extern int rl_completion_found_quote;
-
-/* If non-zero, the completion functions don't append any closing quote.
-   This is set to 0 by rl_complete_internal and may be changed by an
-   application-specific completion function. */
-extern int rl_completion_suppress_quote;
-
-/* If non-zero, a slash will be appended to completed filenames that are
-   symbolic links to directory names, subject to the value of the
-   mark-directories variable (which is user-settable).  This exists so
-   that application completion functions can override the user's preference
-   (set via the mark-symlinked-directories variable) if appropriate.
-   It's set to the value of _rl_complete_mark_symlink_dirs in
-   rl_complete_internal before any application-specific completion
-   function is called, so without that function doing anything, the user's
-   preferences are honored. */
-extern int rl_completion_mark_symlink_dirs;
-
-/* If non-zero, then disallow duplicates in the matches. */
-extern int rl_ignore_completion_duplicates;
-
-/* If this is non-zero, completion is (temporarily) inhibited, and the
-   completion character will be inserted as any other. */
-extern int rl_inhibit_completion;
-
-/* Input error; can be returned by (*rl_getc_function) if readline is reading
-   a top-level command (RL_ISSTATE (RL_STATE_READCMD)). */
-#define READERR			(-2)
-
-/* Definitions available for use by readline clients. */
-#define RL_PROMPT_START_IGNORE	'\001'
-#define RL_PROMPT_END_IGNORE	'\002'
-
-/* Possible values for do_replace argument to rl_filename_quoting_function,
-   called by rl_complete_internal. */
-#define NO_MATCH        0
-#define SINGLE_MATCH    1
-#define MULT_MATCH      2
-
-/* Possible state values for rl_readline_state */
-#define RL_STATE_NONE		0x000000		/* no state; before first call */
-
-#define RL_STATE_INITIALIZING	0x000001	/* initializing */
-#define RL_STATE_INITIALIZED	0x000002	/* initialization done */
-#define RL_STATE_TERMPREPPED	0x000004	/* terminal is prepped */
-#define RL_STATE_READCMD	0x000008	/* reading a command key */
-#define RL_STATE_METANEXT	0x000010	/* reading input after ESC */
-#define RL_STATE_DISPATCHING	0x000020	/* dispatching to a command */
-#define RL_STATE_MOREINPUT	0x000040	/* reading more input in a command function */
-#define RL_STATE_ISEARCH	0x000080	/* doing incremental search */
-#define RL_STATE_NSEARCH	0x000100	/* doing non-inc search */
-#define RL_STATE_SEARCH		0x000200	/* doing a history search */
-#define RL_STATE_NUMERICARG	0x000400	/* reading numeric argument */
-#define RL_STATE_MACROINPUT	0x000800	/* getting input from a macro */
-#define RL_STATE_MACRODEF	0x001000	/* defining keyboard macro */
-#define RL_STATE_OVERWRITE	0x002000	/* overwrite mode */
-#define RL_STATE_COMPLETING	0x004000	/* doing completion */
-#define RL_STATE_SIGHANDLER	0x008000	/* in readline sighandler */
-#define RL_STATE_UNDOING	0x010000	/* doing an undo */
-#define RL_STATE_INPUTPENDING	0x020000	/* rl_execute_next called */
-#define RL_STATE_TTYCSAVED	0x040000	/* tty special chars saved */
-#define RL_STATE_CALLBACK	0x080000	/* using the callback interface */
-#define RL_STATE_VIMOTION	0x100000	/* reading vi motion arg */
-#define RL_STATE_MULTIKEY	0x200000	/* reading multiple-key command */
-#define RL_STATE_VICMDONCE	0x400000	/* entered vi command mode at least once */
-
-#define RL_STATE_DONE		0x800000	/* done; accepted line */
-
-#define RL_SETSTATE(x)		(rl_readline_state |= (x))
-#define RL_UNSETSTATE(x)	(rl_readline_state &= ~(x))
-#define RL_ISSTATE(x)		(rl_readline_state & (x))
-
-struct readline_state {
-  /* line state */
-  int point;
-  int end;
-  int mark;
-  char *buffer;
-  int buflen;
-  UNDO_LIST *ul;
-  char *prompt;
-
-  /* global state */
-  int rlstate;
-  int done;
-  Keymap kmap;
-
-  /* input state */
-  rl_command_func_t *lastfunc;
-  int insmode;
-  int edmode;
-  int kseqlen;
-  FILE *inf;
-  FILE *outf;
-  int pendingin;
-  char *macro;
-
-  /* signal state */
-  int catchsigs;
-  int catchsigwinch;
-
-  /* search state */
-
-  /* completion state */
-
-  /* options state */
-
-  /* reserved for future expansion, so the struct size doesn't change */
-  char reserved[64];
-};
-
-extern int rl_save_state PARAMS((struct readline_state *));
-extern int rl_restore_state PARAMS((struct readline_state *));
-
-#if !defined(RL_NO_COMPAT)
-#if !defined (savestring)
-#define savestring rl_savestring
-extern char *savestring __P((char *));  /* XXX backwards compatibility */
-#endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _READLINE_H_ */
diff --git a/include.new/readline/rlconf.h b/include.new/readline/rlconf.h
deleted file mode 100644
index a6bd565..0000000
--- a/include.new/readline/rlconf.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $FreeBSD: releng/10.2/contrib/libreadline/rlconf.h 165675 2006-12-31 09:22:31Z ache $ */
-/* rlconf.h -- readline configuration definitions */
-
-/* Copyright (C) 1994 Free Software Foundation, Inc.
-
-   This file contains the Readline Library (the Library), a set of
-   routines for providing Emacs style line input to programs that ask
-   for it.
-
-   The Library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The Library is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   The GNU General Public License is often shipped with GNU software, and
-   is generally kept in a file called COPYING or LICENSE.  If you do not
-   have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#if !defined (_RLCONF_H_)
-#define _RLCONF_H_
-
-/* Define this if you want the vi-mode editing available. */
-#define VI_MODE
-
-/* Define this to get an indication of file type when listing completions. */
-#define VISIBLE_STATS
-
-/* This definition is needed by readline.c, rltty.c, and signals.c. */
-/* If on, then readline handles signals in a way that doesn't screw. */
-#define HANDLE_SIGNALS
-
-/* Ugly but working hack for binding prefix meta. */
-#define PREFIX_META_HACK
-
-/* The next-to-last-ditch effort file name for a user-specific init file. */
-#define DEFAULT_INPUTRC "~/.inputrc"
-
-/* The ultimate last-ditch filenname for an init file -- system-wide. */
-#define SYS_INPUTRC "/etc/inputrc"
-
-/* If defined, expand tabs to spaces. */
-#define DISPLAY_TABS
-
-/* If defined, use the terminal escape sequence to move the cursor forward
-   over a character when updating the line rather than rewriting it. */
-/* #define HACK_TERMCAP_MOTION */
-
-/* The string inserted by the `insert comment' command. */
-#define RL_COMMENT_BEGIN_DEFAULT "#"
-
-/* Define this if you want code that allows readline to be used in an
-   X `callback' style. */
-#define READLINE_CALLBACKS
-
-/* Define this if you want the cursor to indicate insert or overwrite mode. */
-/* #define CURSOR_MODE */
-
-#endif /* _RLCONF_H_ */
diff --git a/include.new/readline/rlstdc.h b/include.new/readline/rlstdc.h
deleted file mode 100644
index 847fa9c..0000000
--- a/include.new/readline/rlstdc.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* stdc.h -- macros to make source compile on both ANSI C and K&R C
-   compilers. */
-
-/* Copyright (C) 1993 Free Software Foundation, Inc.
-
-   This file is part of GNU Bash, the Bourne Again SHell.
-
-   Bash is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   Bash is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-   License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with Bash; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#if !defined (_RL_STDC_H_)
-#define _RL_STDC_H_
-
-/* Adapted from BSD /usr/include/sys/cdefs.h. */
-
-/* A function can be defined using prototypes and compile on both ANSI C
-   and traditional C compilers with something like this:
-	extern char *func PARAMS((char *, char *, int)); */
-
-#if !defined (PARAMS)
-#  if defined (__STDC__) || defined (__GNUC__) || defined (__cplusplus)
-#    define PARAMS(protos) protos
-#  else
-#    define PARAMS(protos) ()
-#  endif
-#endif
-
-#ifndef __attribute__
-#  if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-#    define __attribute__(x)
-#  endif
-#endif
-
-#endif /* !_RL_STDC_H_ */
diff --git a/include.new/readline/rltypedefs.h b/include.new/readline/rltypedefs.h
deleted file mode 100644
index 862bdb8..0000000
--- a/include.new/readline/rltypedefs.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* rltypedefs.h -- Type declarations for readline functions. */
-
-/* Copyright (C) 2000-2004 Free Software Foundation, Inc.
-
-   This file is part of the GNU Readline Library, a library for
-   reading lines of text with interactive input and history editing.
-
-   The GNU Readline Library is free software; you can redistribute it
-   and/or modify it under the terms of the GNU General Public License
-   as published by the Free Software Foundation; either version 2, or
-   (at your option) any later version.
-
-   The GNU Readline Library is distributed in the hope that it will be
-   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   The GNU General Public License is often shipped with GNU software, and
-   is generally kept in a file called COPYING or LICENSE.  If you do not
-   have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#ifndef _RL_TYPEDEFS_H_
-#define _RL_TYPEDEFS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Old-style */
-
-#if !defined (_FUNCTION_DEF)
-#  define _FUNCTION_DEF
-
-typedef int Function ();
-typedef void VFunction ();
-typedef char *CPFunction ();
-typedef char **CPPFunction ();
-
-#endif /* _FUNCTION_DEF */
-
-/* New style. */
-
-#if !defined (_RL_FUNCTION_TYPEDEF)
-#  define _RL_FUNCTION_TYPEDEF
-
-/* Bindable functions */
-typedef int rl_command_func_t PARAMS((int, int));
-
-/* Typedefs for the completion system */
-typedef char *rl_compentry_func_t PARAMS((const char *, int));
-typedef char **rl_completion_func_t PARAMS((const char *, int, int));
-
-typedef char *rl_quote_func_t PARAMS((char *, int, char *));
-typedef char *rl_dequote_func_t PARAMS((char *, int));
-
-typedef int rl_compignore_func_t PARAMS((char **));
-
-typedef void rl_compdisp_func_t PARAMS((char **, int, int));
-
-/* Type for input and pre-read hook functions like rl_event_hook */
-typedef int rl_hook_func_t PARAMS((void));
-
-/* Input function type */
-typedef int rl_getc_func_t PARAMS((FILE *));
-
-/* Generic function that takes a character buffer (which could be the readline
-   line buffer) and an index into it (which could be rl_point) and returns
-   an int. */
-typedef int rl_linebuf_func_t PARAMS((char *, int));
-
-/* `Generic' function pointer typedefs */
-typedef int rl_intfunc_t PARAMS((int));
-#define rl_ivoidfunc_t rl_hook_func_t
-typedef int rl_icpfunc_t PARAMS((char *));
-typedef int rl_icppfunc_t PARAMS((char **));
-
-typedef void rl_voidfunc_t PARAMS((void));
-typedef void rl_vintfunc_t PARAMS((int));
-typedef void rl_vcpfunc_t PARAMS((char *));
-typedef void rl_vcppfunc_t PARAMS((char **));
-
-typedef char *rl_cpvfunc_t PARAMS((void));
-typedef char *rl_cpifunc_t PARAMS((int));
-typedef char *rl_cpcpfunc_t PARAMS((char  *));
-typedef char *rl_cpcppfunc_t PARAMS((char  **));
-
-#endif /* _RL_FUNCTION_TYPEDEF */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _RL_TYPEDEFS_H_ */
diff --git a/include.new/readline/tilde.h b/include.new/readline/tilde.h
deleted file mode 100644
index c58ce20..0000000
--- a/include.new/readline/tilde.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* tilde.h: Externally available variables and function in libtilde.a. */
-
-/* Copyright (C) 1992 Free Software Foundation, Inc.
-
-   This file contains the Readline Library (the Library), a set of
-   routines for providing Emacs style line input to programs that ask
-   for it.
-
-   The Library is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   The Library is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   The GNU General Public License is often shipped with GNU software, and
-   is generally kept in a file called COPYING or LICENSE.  If you do not
-   have a copy of the license, write to the Free Software Foundation,
-   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-
-#if !defined (_TILDE_H_)
-#  define _TILDE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* A function can be defined using prototypes and compile on both ANSI C
-   and traditional C compilers with something like this:
-	extern char *func PARAMS((char *, char *, int)); */
-
-#if !defined (PARAMS)
-#  if defined (__STDC__) || defined (__GNUC__) || defined (__cplusplus)
-#    define PARAMS(protos) protos
-#  else
-#    define PARAMS(protos) ()
-#  endif
-#endif
-
-typedef char *tilde_hook_func_t PARAMS((char *));
-
-/* If non-null, this contains the address of a function that the application
-   wants called before trying the standard tilde expansions.  The function
-   is called with the text sans tilde, and returns a malloc()'ed string
-   which is the expansion, or a NULL pointer if the expansion fails. */
-extern tilde_hook_func_t *tilde_expansion_preexpansion_hook;
-
-/* If non-null, this contains the address of a function to call if the
-   standard meaning for expanding a tilde fails.  The function is called
-   with the text (sans tilde, as in "foo"), and returns a malloc()'ed string
-   which is the expansion, or a NULL pointer if there is no expansion. */
-extern tilde_hook_func_t *tilde_expansion_failure_hook;
-
-/* When non-null, this is a NULL terminated array of strings which
-   are duplicates for a tilde prefix.  Bash uses this to expand
-   `=~' and `:~'. */
-extern char **tilde_additional_prefixes;
-
-/* When non-null, this is a NULL terminated array of strings which match
-   the end of a username, instead of just "/".  Bash sets this to
-   `:' and `=~'. */
-extern char **tilde_additional_suffixes;
-
-/* Return a new string which is the result of tilde expanding STRING. */
-extern char *tilde_expand PARAMS((const char *));
-
-/* Do the work of tilde expansion on FILENAME.  FILENAME starts with a
-   tilde.  If there is no expansion, call tilde_expansion_failure_hook. */
-extern char *tilde_expand_word PARAMS((const char *));
-
-/* Find the portion of the string beginning with ~ that should be expanded. */
-extern char *tilde_find_word PARAMS((const char *, int, int *));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _TILDE_H_ */
diff --git a/include.new/readpassphrase.h b/include.new/readpassphrase.h
deleted file mode 100644
index 56c03cd..0000000
--- a/include.new/readpassphrase.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $	*/
-/*	$FreeBSD: releng/10.2/include/readpassphrase.h 215236 2010-11-13 10:38:06Z delphij $	*/
-
-/*
- * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#ifndef _READPASSPHRASE_H_
-#define _READPASSPHRASE_H_
-
-#define RPP_ECHO_OFF    0x00		/* Turn off echo (default). */
-#define RPP_ECHO_ON     0x01		/* Leave echo on. */
-#define RPP_REQUIRE_TTY 0x02		/* Fail if there is no tty. */
-#define RPP_FORCELOWER  0x04		/* Force input to lower case. */
-#define RPP_FORCEUPPER  0x08		/* Force input to upper case. */
-#define RPP_SEVENBIT    0x10		/* Strip the high bit from input. */
-#define RPP_STDIN       0x20		/* Read from stdin, not /dev/tty */
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-__BEGIN_DECLS
-char * readpassphrase(const char *, char *, size_t, int);
-__END_DECLS
-
-#endif /* !_READPASSPHRASE_H_ */
diff --git a/include.new/regex.h b/include.new/regex.h
deleted file mode 100644
index 4b3c5ff..0000000
--- a/include.new/regex.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * Copyright (c) 1992 Henry Spencer.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer of the University of Toronto.
- *
- * 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. 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.
- *
- *	@(#)regex.h	8.2 (Berkeley) 1/3/94
- * $FreeBSD: releng/10.2/include/regex.h 228468 2011-12-13 13:32:56Z ed $
- */
-
-#ifndef _REGEX_H_
-#define	_REGEX_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/* types */
-typedef	__off_t		regoff_t;
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-typedef struct {
-	int re_magic;
-	size_t re_nsub;		/* number of parenthesized subexpressions */
-	const char *re_endp;	/* end pointer for REG_PEND */
-	struct re_guts *re_g;	/* none of your business :-) */
-} regex_t;
-
-typedef struct {
-	regoff_t rm_so;		/* start of match */
-	regoff_t rm_eo;		/* end of match */
-} regmatch_t;
-
-/* regcomp() flags */
-#define	REG_BASIC	0000
-#define	REG_EXTENDED	0001
-#define	REG_ICASE	0002
-#define	REG_NOSUB	0004
-#define	REG_NEWLINE	0010
-#define	REG_NOSPEC	0020
-#define	REG_PEND	0040
-#define	REG_DUMP	0200
-
-/* regerror() flags */
-#define	REG_ENOSYS	(-1)
-#define	REG_NOMATCH	 1
-#define	REG_BADPAT	 2
-#define	REG_ECOLLATE	 3
-#define	REG_ECTYPE	 4
-#define	REG_EESCAPE	 5
-#define	REG_ESUBREG	 6
-#define	REG_EBRACK	 7
-#define	REG_EPAREN	 8
-#define	REG_EBRACE	 9
-#define	REG_BADBR	10
-#define	REG_ERANGE	11
-#define	REG_ESPACE	12
-#define	REG_BADRPT	13
-#define	REG_EMPTY	14
-#define	REG_ASSERT	15
-#define	REG_INVARG	16
-#define	REG_ILLSEQ	17
-#define	REG_ATOI	255	/* convert name to number (!) */
-#define	REG_ITOA	0400	/* convert number to name (!) */
-
-/* regexec() flags */
-#define	REG_NOTBOL	00001
-#define	REG_NOTEOL	00002
-#define	REG_STARTEND	00004
-#define	REG_TRACE	00400	/* tracing of execution */
-#define	REG_LARGE	01000	/* force large representation */
-#define	REG_BACKR	02000	/* force use of backref code */
-
-__BEGIN_DECLS
-int	regcomp(regex_t * __restrict, const char * __restrict, int);
-size_t	regerror(int, const regex_t * __restrict, char * __restrict, size_t);
-/*
- * XXX forth parameter should be `regmatch_t [__restrict]', but isn't because
- * of a bug in GCC 3.2 (when -std=c99 is specified) which perceives this as a
- * syntax error.
- */
-int	regexec(const regex_t * __restrict, const char * __restrict, size_t,
-	    regmatch_t * __restrict, int);
-void	regfree(regex_t *);
-__END_DECLS
-
-#endif /* !_REGEX_H_ */
diff --git a/include.new/regexp.h b/include.new/regexp.h
deleted file mode 100644
index 5333015..0000000
--- a/include.new/regexp.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1986 by University of Toronto.
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley
- * by Henry Spencer.
- *
- * 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.
- *
- *	@(#)regexp.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/regexp.h,v 1.2 2002/03/23 17:24:53 imp Exp $
- */
-
-#ifndef	_REGEXP_H_
-#define	_REGEXP_H_
-
-/*
- * Definitions etc. for regexp(3) routines.
- *
- * Caveat:  this is V8 regexp(3) [actually, a reimplementation thereof],
- * not the System V one.
- */
-#define NSUBEXP  10
-typedef struct regexp {
-	char *startp[NSUBEXP];
-	char *endp[NSUBEXP];
-	char regstart;		/* Internal use only. */
-	char reganch;		/* Internal use only. */
-	char *regmust;		/* Internal use only. */
-	int regmlen;		/* Internal use only. */
-	char program[1];	/* Unwarranted chumminess with compiler. */
-} regexp;
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-regexp *regcomp(const char *);
-int regexec(const  regexp *, const char *);
-void regsub(const  regexp *, const char *, char *);
-void regerror(const char *);
-__END_DECLS
-
-#endif /* !_REGEXP_H_ */
diff --git a/include.new/res_update.h b/include.new/res_update.h
deleted file mode 100644
index a4499b4..0000000
--- a/include.new/res_update.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1999 by Internet Software Consortium, Inc.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- *	$Id: res_update.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/include/res_update.h 270838 2014-08-30 10:16:25Z ume $
- */
-
-#ifndef __RES_UPDATE_H
-#define __RES_UPDATE_H
-
-/*! \file */
-
-#include <sys/types.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-/*%
- * This RR-like structure is particular to UPDATE.
- */
-struct ns_updrec {
-	struct {
-		struct ns_updrec *prev;
-		struct ns_updrec *next;
-	} r_link, r_glink;
-	ns_sect		r_section;	/*%< ZONE/PREREQUISITE/UPDATE */
-	char *		r_dname;	/*%< owner of the RR */
-	ns_class	r_class;	/*%< class number */
-	ns_type		r_type;		/*%< type number */
-	uint32_t	r_ttl;		/*%< time to live */
-	u_char *	r_data;		/*%< rdata fields as text string */
-	u_int		r_size;		/*%< size of r_data field */
-	int		r_opcode;	/*%< type of operation */
-	/* following fields for private use by the resolver/server routines */
-	struct databuf *r_dp;		/*%< databuf to process */
-	struct databuf *r_deldp;	/*%< databuf's deleted/overwritten */
-	u_int		r_zone;		/*%< zone number on server */
-};
-typedef struct ns_updrec ns_updrec;
-typedef struct {
-	ns_updrec *head;
-	ns_updrec *tail;
-} ns_updque;
-
-#define res_mkupdate		__res_mkupdate
-#define res_update		__res_update
-#define res_mkupdrec		__res_mkupdrec
-#define res_freeupdrec		__res_freeupdrec
-#define res_nmkupdate		__res_nmkupdate
-#define res_nupdate		__res_nupdate
-
-int		res_mkupdate(ns_updrec *, u_char *, int);
-int		res_update(ns_updrec *);
-ns_updrec *	res_mkupdrec(int, const char *, u_int, u_int, u_long);
-void		res_freeupdrec(ns_updrec *);
-int		res_nmkupdate(res_state, ns_updrec *, u_char *, int);
-int		res_nupdate(res_state, ns_updrec *, ns_tsig_key *);
-
-#endif /*__RES_UPDATE_H*/
-
-/*! \file */
diff --git a/include.new/resolv.h b/include.new/resolv.h
deleted file mode 100644
index ce73354..0000000
--- a/include.new/resolv.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/*
- * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1995-2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Copyright (c) 1983, 1987, 1989
- *    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. 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.
- */
-
-/*%
- *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/include/resolv.h 270838 2014-08-30 10:16:25Z ume $
- */
-
-#ifndef _RESOLV_H_
-#define	_RESOLV_H_
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <arpa/nameser.h>
-
-/*%
- * Revision information.  This is the release date in YYYYMMDD format.
- * It can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__RES > 19931104)".  Do not
- * compare for equality; rather, use it to determine whether your resolver
- * is new enough to contain a certain feature.
- */
-
-#define	__RES	20090302
-
-/*%
- * This used to be defined in res_query.c, now it's in herror.c.
- * [XXX no it's not.  It's in irs/irs_data.c]
- * It was
- * never extern'd by any *.h file before it was placed here.  For thread
- * aware programs, the last h_errno value set is stored in res->h_errno.
- *
- * XXX:	There doesn't seem to be a good reason for exposing RES_SET_H_ERRNO
- *	(and __h_errno_set) to the public via <resolv.h>.
- * XXX:	__h_errno_set is really part of IRS, not part of the resolver.
- *	If somebody wants to build and use a resolver that doesn't use IRS,
- *	what do they do?  Perhaps something like
- *		#ifdef WANT_IRS
- *		# define RES_SET_H_ERRNO(r,x) __h_errno_set(r,x)
- *		#else
- *		# define RES_SET_H_ERRNO(r,x) (h_errno = (r)->res_h_errno = (x))
- *		#endif
- */
-
-#define RES_SET_H_ERRNO(r,x) __h_errno_set(r,x)
-struct __res_state; /*%< forward */
-__BEGIN_DECLS
-void __h_errno_set(struct __res_state *, int);
-__END_DECLS
-
-/*%
- * Resolver configuration file.
- * Normally not present, but may contain the address of the
- * initial name server(s) to query and the domain search list.
- */
-
-#ifndef _PATH_RESCONF
-#define	_PATH_RESCONF        "/etc/resolv.conf"
-#endif
-
-typedef enum { res_goahead, res_nextns, res_modified, res_done, res_error }
-	res_sendhookact;
-
-typedef res_sendhookact (*res_send_qhook)(struct sockaddr * const *,
-					  const u_char **, int *,
-					  u_char *, int, int *);
-
-typedef res_sendhookact (*res_send_rhook)(const struct sockaddr *,
-					  const u_char *, int, u_char *,
-					  int, int *);
-
-struct res_sym {
-	int		number;	   /*%< Identifying number, like T_MX */
-	const char *	name;	   /*%< Its symbolic name, like "MX" */
-	const char *	humanname; /*%< Its fun name, like "mail exchanger" */
-};
-
-/*%
- * Global defines and variables for resolver stub.
- */
-#define	MAXNS			3	/*%< max # name servers we'll track */
-#define	MAXDFLSRCH		3	/*%< # default domain levels to try */
-#define	MAXDNSRCH		6	/*%< max # domains in search path */
-#define	LOCALDOMAINPARTS	2	/*%< min levels in name that is "local" */
-#define	RES_TIMEOUT		5	/*%< min. seconds between retries */
-#define	MAXRESOLVSORT		10	/*%< number of net to sort on */
-#define	RES_MAXNDOTS		15	/*%< should reflect bit field size */
-#define	RES_MAXRETRANS		30	/*%< only for resolv.conf/RES_OPTIONS */
-#define	RES_MAXRETRY		5	/*%< only for resolv.conf/RES_OPTIONS */
-#define	RES_DFLRETRY		2	/*%< Default #/tries. */
-#define	RES_MAXTIME		65535	/*%< Infinity, in milliseconds. */
-struct __res_state_ext;
-
-struct __res_state {
-	int	retrans;	 	/*%< retransmission time interval */
-	int	retry;			/*%< number of times to retransmit */
-	/*
-	 * XXX: If `sun' is defined, `options' and `pfcode' are
-	 * defined as u_int in original BIND9 distribution.  However,
-	 * it breaks binary backward compatibility against FreeBSD's
-	 * resolver.  So, we changed not to see `sun'.
-	 */
-#if defined(sun) && 0
-	u_int	options;		/*%< option flags - see below. */
-#else
-	u_long	options;		/*%< option flags - see below. */
-#endif
-	int	nscount;		/*%< number of name servers */
-	struct sockaddr_in
-		nsaddr_list[MAXNS];	/*%< address of name server */
-#define	nsaddr	nsaddr_list[0]		/*%< for backward compatibility */
-	u_short	id;			/*%< current message id */
-	char	*dnsrch[MAXDNSRCH+1];	/*%< components of domain to search */
-	char	defdname[256];		/*%< default domain (deprecated) */
-#if defined(sun) && 0
-	u_int	pfcode;			/*%< RES_PRF_ flags - see below. */
-#else
-	u_long	pfcode;			/*%< RES_PRF_ flags - see below. */
-#endif
-	unsigned ndots:4;		/*%< threshold for initial abs. query */
-	unsigned nsort:4;		/*%< number of elements in sort_list[] */
-	char	unused[3];
-	struct {
-		struct in_addr	addr;
-		uint32_t	mask;
-	} sort_list[MAXRESOLVSORT];
-	res_send_qhook qhook;		/*%< query hook */
-	res_send_rhook rhook;		/*%< response hook */
-	int	res_h_errno;		/*%< last one set for this context */
-	int	_vcsock;		/*%< PRIVATE: for res_send VC i/o */
-	u_int	_flags;			/*%< PRIVATE: see below */
-	u_int	_pad;			/*%< make _u 64 bit aligned */
-	union {
-		/* On an 32-bit arch this means 512b total. */
-		char	pad[72 - 4*sizeof (int) - 3*sizeof (void *)];
-		struct {
-			u_int16_t		nscount;
-			u_int16_t		nstimes[MAXNS];	/*%< ms. */
-			int			nssocks[MAXNS];
-			struct __res_state_ext *ext;	/*%< extension for IPv6 */
-		} _ext;
-	} _u;
-	u_char	*_rnd;			/*%< PRIVATE: random state */
-};
-
-typedef struct __res_state *res_state;
-
-union res_sockaddr_union {
-	struct sockaddr_in	sin;
-#ifdef IN6ADDR_ANY_INIT
-	struct sockaddr_in6	sin6;
-#endif
-#ifdef ISC_ALIGN64
-	int64_t			__align64;	/*%< 64bit alignment */
-#else
-	int32_t			__align32;	/*%< 32bit alignment */
-#endif
-	char			__space[128];   /*%< max size */
-};
-
-/*%
- * Resolver flags (used to be discrete per-module statics ints).
- */
-#define	RES_F_VC	0x00000001	/*%< socket is TCP */
-#define	RES_F_CONN	0x00000002	/*%< socket is connected */
-#define	RES_F_EDNS0ERR	0x00000004	/*%< EDNS0 caused errors */
-#define	RES_F__UNUSED	0x00000008	/*%< (unused) */
-#define	RES_F_LASTMASK	0x000000F0	/*%< ordinal server of last res_nsend */
-#define	RES_F_LASTSHIFT	4		/*%< bit position of LASTMASK "flag" */
-#define	RES_GETLAST(res) (((res)._flags & RES_F_LASTMASK) >> RES_F_LASTSHIFT)
-
-/* res_findzonecut2() options */
-#define	RES_EXHAUSTIVE	0x00000001	/*%< always do all queries */
-#define	RES_IPV4ONLY	0x00000002	/*%< IPv4 only */
-#define	RES_IPV6ONLY	0x00000004	/*%< IPv6 only */
-
-/*%
- * Resolver options (keep these in synch with res_debug.c, please)
- */
-#define RES_INIT	0x00000001	/*%< address initialized */
-#define RES_DEBUG	0x00000002	/*%< print debug messages */
-#define RES_AAONLY	0x00000004	/*%< authoritative answers only (!IMPL)*/
-#define RES_USEVC	0x00000008	/*%< use virtual circuit */
-#define RES_PRIMARY	0x00000010	/*%< query primary server only (!IMPL) */
-#define RES_IGNTC	0x00000020	/*%< ignore truncation errors */
-#define RES_RECURSE	0x00000040	/*%< recursion desired */
-#define RES_DEFNAMES	0x00000080	/*%< use default domain name */
-#define RES_STAYOPEN	0x00000100	/*%< Keep TCP socket open */
-#define RES_DNSRCH	0x00000200	/*%< search up local domain tree */
-#define	RES_INSECURE1	0x00000400	/*%< type 1 security disabled */
-#define	RES_INSECURE2	0x00000800	/*%< type 2 security disabled */
-#define	RES_NOALIASES	0x00001000	/*%< shuts off HOSTALIASES feature */
-#define	RES_USE_INET6	0x00002000	/*%< use/map IPv6 in gethostbyname() */
-#define RES_ROTATE	0x00004000	/*%< rotate ns list after each query */
-#define	RES_NOCHECKNAME	0x00008000	/*%< do not check names for sanity. */
-#define	RES_KEEPTSIG	0x00010000	/*%< do not strip TSIG records */
-#define	RES_BLAST	0x00020000	/*%< blast all recursive servers */
-#define RES_NSID	0x00040000      /*%< request name server ID */
-#define RES_NOTLDQUERY	0x00100000	/*%< don't unqualified name as a tld */
-#define RES_USE_DNSSEC	0x00200000	/*%< use DNSSEC using OK bit in OPT */
-/* #define RES_DEBUG2	0x00400000 */	/* nslookup internal */
-/* KAME extensions: use higher bit to avoid conflict with ISC use */
-#define RES_USE_DNAME	0x10000000	/*%< use DNAME */
-#define RES_USE_EDNS0	0x40000000	/*%< use EDNS0 if configured */
-#define RES_NO_NIBBLE2	0x80000000	/*%< disable alternate nibble lookup */
-
-#define RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | \
-			 RES_DNSRCH | RES_NO_NIBBLE2)
-
-/*%
- * Resolver "pfcode" values.  Used by dig.
- */
-#define	RES_PRF_STATS	0x00000001
-#define	RES_PRF_UPDATE	0x00000002
-#define	RES_PRF_CLASS   0x00000004
-#define	RES_PRF_CMD	0x00000008
-#define	RES_PRF_QUES	0x00000010
-#define	RES_PRF_ANS	0x00000020
-#define	RES_PRF_AUTH	0x00000040
-#define	RES_PRF_ADD	0x00000080
-#define	RES_PRF_HEAD1	0x00000100
-#define	RES_PRF_HEAD2	0x00000200
-#define	RES_PRF_TTLID	0x00000400
-#define	RES_PRF_HEADX	0x00000800
-#define	RES_PRF_QUERY	0x00001000
-#define	RES_PRF_REPLY	0x00002000
-#define	RES_PRF_INIT	0x00004000
-#define	RES_PRF_TRUNC	0x00008000
-/*			0x00010000	*/
-
-/* Things involving an internal (static) resolver context. */
-__BEGIN_DECLS
-extern struct __res_state *__res_state(void);
-__END_DECLS
-#define _res (*__res_state())
-
-#ifndef __BIND_NOSTATIC
-#define fp_nquery		__fp_nquery
-#define fp_query		__fp_query
-#define hostalias		__hostalias
-#define p_query			__p_query
-#define res_close		__res_close
-#define res_init		__res_init
-#define res_isourserver		__res_isourserver
-#define res_mkquery		__res_mkquery
-#define res_opt			__res_opt
-#define res_query		__res_query
-#define res_querydomain		__res_querydomain
-#define res_search		__res_search
-#define res_send		__res_send
-#define res_sendsigned		__res_sendsigned
-
-__BEGIN_DECLS
-void		fp_nquery(const u_char *, int, FILE *);
-void		fp_query(const u_char *, FILE *);
-const char *	hostalias(const char *);
-void		p_query(const u_char *);
-void		res_close(void);
-int		res_init(void);
-int		res_isourserver(const struct sockaddr_in *);
-int		res_mkquery(int, const char *, int, int, const u_char *,
-				 int, const u_char *, u_char *, int);
-int		res_opt(int, u_char *, int, int);
-int		res_query(const char *, int, int, u_char *, int);
-int		res_querydomain(const char *, const char *, int, int,
-				     u_char *, int);
-int		res_search(const char *, int, int, u_char *, int);
-int		res_send(const u_char *, int, u_char *, int);
-int		res_sendsigned(const u_char *, int, ns_tsig_key *,
-				    u_char *, int);
-__END_DECLS
-#endif
-
-#if !defined(SHARED_LIBBIND) || defined(LIB)
-/*
- * If libbind is a shared object (well, DLL anyway)
- * these externs break the linker when resolv.h is
- * included by a lib client (like named)
- * Make them go away if a client is including this
- *
- */
-extern const struct res_sym __p_key_syms[];
-extern const struct res_sym __p_cert_syms[];
-extern const struct res_sym __p_class_syms[];
-extern const struct res_sym __p_type_syms[];
-extern const struct res_sym __p_rcode_syms[];
-#endif /* SHARED_LIBBIND */
-
-#define b64_ntop		__b64_ntop
-#define b64_pton		__b64_pton
-#define dn_comp			__dn_comp
-#define dn_count_labels		__dn_count_labels
-#define dn_expand		__dn_expand
-#define dn_skipname		__dn_skipname
-#define fp_resstat		__fp_resstat
-#define loc_aton		__loc_aton
-#define loc_ntoa		__loc_ntoa
-#define p_cdname		__p_cdname
-#define p_cdnname		__p_cdnname
-#define p_class			__p_class
-#define p_fqname		__p_fqname
-#define p_fqnname		__p_fqnname
-#define p_option		__p_option
-#define p_secstodate		__p_secstodate
-#define p_section		__p_section
-#define p_time			__p_time
-#define p_type			__p_type
-#define p_rcode			__p_rcode
-#define p_sockun		__p_sockun
-#define putlong			__putlong
-#define putshort		__putshort
-#define res_dnok		__res_dnok
-#if 0
-#define res_findzonecut		__res_findzonecut
-#endif
-#define res_findzonecut2	__res_findzonecut2
-#define res_hnok		__res_hnok
-#define res_hostalias		__res_hostalias
-#define res_mailok		__res_mailok
-#define res_nameinquery		__res_nameinquery
-#define res_nclose		__res_nclose
-#define res_ninit		__res_ninit
-#define res_nmkquery		__res_nmkquery
-#define res_pquery		__res_pquery
-#define res_nquery		__res_nquery
-#define res_nquerydomain	__res_nquerydomain
-#define res_nsearch		__res_nsearch
-#define res_nsend		__res_nsend
-#if 0
-#define res_nsendsigned		__res_nsendsigned
-#endif
-#define res_nisourserver	__res_nisourserver
-#define res_ownok		__res_ownok
-#define res_queriesmatch	__res_queriesmatch
-#define res_rndinit		__res_rndinit
-#define res_randomid		__res_randomid
-#define res_nrandomid		__res_nrandomid
-#define sym_ntop		__sym_ntop
-#define sym_ntos		__sym_ntos
-#define sym_ston		__sym_ston
-#define res_nopt		__res_nopt
-#define res_nopt_rdata       	__res_nopt_rdata
-#define res_ndestroy		__res_ndestroy
-#define	res_nametoclass		__res_nametoclass
-#define	res_nametotype		__res_nametotype
-#define	res_setservers		__res_setservers
-#define	res_getservers		__res_getservers
-#if 0
-#define	res_buildprotolist	__res_buildprotolist
-#define	res_destroyprotolist	__res_destroyprotolist
-#define	res_destroyservicelist	__res_destroyservicelist
-#define	res_get_nibblesuffix	__res_get_nibblesuffix
-#define	res_get_nibblesuffix2	__res_get_nibblesuffix2
-#endif
-#define	res_ourserver_p		__res_ourserver_p
-#if 0
-#define	res_protocolname	__res_protocolname
-#define	res_protocolnumber	__res_protocolnumber
-#endif
-#define	res_send_setqhook	__res_send_setqhook
-#define	res_send_setrhook	__res_send_setrhook
-#if 0
-#define	res_servicename		__res_servicename
-#define	res_servicenumber	__res_servicenumber
-#endif
-__BEGIN_DECLS
-int		res_hnok(const char *);
-int		res_ownok(const char *);
-int		res_mailok(const char *);
-int		res_dnok(const char *);
-int		sym_ston(const struct res_sym *, const char *, int *);
-const char *	sym_ntos(const struct res_sym *, int, int *);
-const char *	sym_ntop(const struct res_sym *, int, int *);
-int		b64_ntop(u_char const *, size_t, char *, size_t);
-int		b64_pton(char const *, u_char *, size_t);
-int		loc_aton(const char *, u_char *);
-const char *	loc_ntoa(const u_char *, char *);
-int		dn_skipname(const u_char *, const u_char *);
-void		putlong(uint32_t, u_char *);
-void		putshort(u_int16_t, u_char *);
-#ifndef __ultrix__
-u_int16_t	_getshort(const u_char *);
-uint32_t	_getlong(const u_char *);
-#endif
-const char *	p_class(int);
-const char *	p_time(uint32_t);
-const char *	p_type(int);
-const char *	p_rcode(int);
-const char *	p_sockun(union res_sockaddr_union, char *, size_t);
-const u_char *	p_cdnname(const u_char *, const u_char *, int, FILE *);
-const u_char *	p_cdname(const u_char *, const u_char *, FILE *);
-const u_char *	p_fqnname(const u_char *, const u_char *, int, char *, int);
-const u_char *	p_fqname(const u_char *, const u_char *, FILE *);
-const char *	p_option(u_long);
-char *		p_secstodate(u_long);
-int		dn_count_labels(const char *);
-int		dn_comp(const char *, u_char *, int, u_char **, u_char **);
-int		dn_expand(const u_char *, const u_char *, const u_char *,
-			  char *, int);
-void		res_rndinit(res_state);
-u_int		res_randomid(void);
-u_int		res_nrandomid(res_state);
-int		res_nameinquery(const char *, int, int, const u_char *,
-				const u_char *);
-int		res_queriesmatch(const u_char *, const u_char *,
-				 const u_char *, const u_char *);
-const char *	p_section(int, int);
-/* Things involving a resolver context. */
-int		res_ninit(res_state);
-int		res_nisourserver(const res_state, const struct sockaddr_in *);
-void		fp_resstat(const res_state, FILE *);
-void		res_pquery(const res_state, const u_char *, int, FILE *);
-const char *	res_hostalias(const res_state, const char *, char *, size_t);
-int		res_nquery(res_state, const char *, int, int, u_char *, int);
-int		res_nsearch(res_state, const char *, int, int, u_char *, int);
-int		res_nquerydomain(res_state, const char *, const char *,
-				 int, int, u_char *, int);
-int		res_nmkquery(res_state, int, const char *, int, int,
-			     const u_char *, int, const u_char *,
-			     u_char *, int);
-int		res_nsend(res_state, const u_char *, int, u_char *, int);
-#if 0
-int		res_nsendsigned(res_state, const u_char *, int,
-				ns_tsig_key *, u_char *, int);
-int		res_findzonecut(res_state, const char *, ns_class, int,
-				char *, size_t, struct in_addr *, int);
-#endif
-int		res_findzonecut2(res_state, const char *, ns_class, int,
-				 char *, size_t,
-				 union res_sockaddr_union *, int);
-void		res_nclose(res_state);
-int		res_nopt(res_state, int, u_char *, int, int);
-int		res_nopt_rdata(res_state, int, u_char *, int, u_char *,
-			       u_short, u_short, u_char *);
-void		res_send_setqhook(res_send_qhook);
-void		res_send_setrhook(res_send_rhook);
-int		__res_vinit(res_state, int);
-#if 0
-void		res_destroyservicelist(void);
-const char *	res_servicename(u_int16_t, const char *);
-const char *	res_protocolname(int);
-void		res_destroyprotolist(void);
-void		res_buildprotolist(void);
-const char *	res_get_nibblesuffix(res_state);
-const char *	res_get_nibblesuffix2(res_state);
-#endif
-void		res_ndestroy(res_state);
-u_int16_t	res_nametoclass(const char *, int *);
-u_int16_t	res_nametotype(const char *, int *);
-void		res_setservers(res_state, const union res_sockaddr_union *,
-			       int);
-int		res_getservers(res_state, union res_sockaddr_union *, int);
-__END_DECLS
-
-#endif /* !_RESOLV_H_ */
-/*! \file */
diff --git a/include.new/resolve.h b/include.new/resolve.h
deleted file mode 100644
index fc1e97f..0000000
--- a/include.new/resolve.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef __RESOLVE_H__
-#define __RESOLVE_H__
-
-#ifndef ROKEN_LIB_FUNCTION
-#ifdef _WIN32
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL     __cdecl
-#else
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#endif
-#endif
-
-enum {
-    rk_ns_c_in = 1
-};
-
-enum {
-	rk_ns_t_invalid = 0,	/* Cookie. */
-	rk_ns_t_a = 1,		/* Host address. */
-	rk_ns_t_ns = 2,		/* Authoritative server. */
-	rk_ns_t_md = 3,		/* Mail destination. */
-	rk_ns_t_mf = 4,		/* Mail forwarder. */
-	rk_ns_t_cname = 5,	/* Canonical name. */
-	rk_ns_t_soa = 6,	/* Start of authority zone. */
-	rk_ns_t_mb = 7,		/* Mailbox domain name. */
-	rk_ns_t_mg = 8,		/* Mail group member. */
-	rk_ns_t_mr = 9,		/* Mail rename name. */
-	rk_ns_t_null = 10,	/* Null resource record. */
-	rk_ns_t_wks = 11,	/* Well known service. */
-	rk_ns_t_ptr = 12,	/* Domain name pointer. */
-	rk_ns_t_hinfo = 13,	/* Host information. */
-	rk_ns_t_minfo = 14,	/* Mailbox information. */
-	rk_ns_t_mx = 15,	/* Mail routing information. */
-	rk_ns_t_txt = 16,	/* Text strings. */
-	rk_ns_t_rp = 17,	/* Responsible person. */
-	rk_ns_t_afsdb = 18,	/* AFS cell database. */
-	rk_ns_t_x25 = 19,	/* X_25 calling address. */
-	rk_ns_t_isdn = 20,	/* ISDN calling address. */
-	rk_ns_t_rt = 21,	/* Router. */
-	rk_ns_t_nsap = 22,	/* NSAP address. */
-	rk_ns_t_nsap_ptr = 23,	/* Reverse NSAP lookup (deprecated). */
-	rk_ns_t_sig = 24,	/* Security signature. */
-	rk_ns_t_key = 25,	/* Security key. */
-	rk_ns_t_px = 26,	/* X.400 mail mapping. */
-	rk_ns_t_gpos = 27,	/* Geographical position (withdrawn). */
-	rk_ns_t_aaaa = 28,	/* Ip6 Address. */
-	rk_ns_t_loc = 29,	/* Location Information. */
-	rk_ns_t_nxt = 30,	/* Next domain (security). */
-	rk_ns_t_eid = 31,	/* Endpoint identifier. */
-	rk_ns_t_nimloc = 32,	/* Nimrod Locator. */
-	rk_ns_t_srv = 33,	/* Server Selection. */
-	rk_ns_t_atma = 34,	/* ATM Address */
-	rk_ns_t_naptr = 35,	/* Naming Authority PoinTeR */
-	rk_ns_t_kx = 36,	/* Key Exchange */
-	rk_ns_t_cert = 37,	/* Certification record */
-	rk_ns_t_a6 = 38,	/* IPv6 address (deprecates AAAA) */
-	rk_ns_t_dname = 39,	/* Non-terminal DNAME (for IPv6) */
-	rk_ns_t_sink = 40,	/* Kitchen sink (experimentatl) */
-	rk_ns_t_opt = 41,	/* EDNS0 option (meta-RR) */
-	rk_ns_t_apl = 42,	/* Address prefix list (RFC 3123) */
-	rk_ns_t_ds = 43,	/* Delegation Signer (RFC 3658) */
-	rk_ns_t_sshfp = 44,	/* SSH fingerprint */
-	rk_ns_t_tkey = 249,	/* Transaction key */
-	rk_ns_t_tsig = 250,	/* Transaction signature. */
-	rk_ns_t_ixfr = 251,	/* Incremental zone transfer. */
-	rk_ns_t_axfr = 252,	/* Transfer zone of authority. */
-	rk_ns_t_mailb = 253,	/* Transfer mailbox records. */
-	rk_ns_t_maila = 254,	/* Transfer mail agent records. */
-	rk_ns_t_any = 255,	/* Wildcard match. */
-	rk_ns_t_zxfr = 256,	/* BIND-specific, nonstandard. */
-	rk_ns_t_max = 65536
-};
-
-#ifndef MAXDNAME
-#define MAXDNAME	1025
-#endif
-
-#define mx_record		rk_mx_record
-#define srv_record		rk_srv_record
-#define key_record		rk_key_record
-#define sig_record		rk_sig_record
-#define cert_record		rk_cert_record
-#define sshfp_record		rk_sshfp_record
-
-struct rk_dns_query{
-    char *domain;
-    unsigned type;
-    unsigned class;
-};
-
-struct rk_mx_record{
-    unsigned  preference;
-    char domain[1];
-};
-
-struct rk_srv_record{
-    unsigned priority;
-    unsigned weight;
-    unsigned port;
-    char target[1];
-};
-
-struct rk_key_record {
-    unsigned flags;
-    unsigned protocol;
-    unsigned algorithm;
-    size_t   key_len;
-    u_char   key_data[1];
-};
-
-struct rk_sig_record {
-    unsigned type;
-    unsigned algorithm;
-    unsigned labels;
-    unsigned orig_ttl;
-    unsigned sig_expiration;
-    unsigned sig_inception;
-    unsigned key_tag;
-    char     *signer;
-    size_t   sig_len;
-    char     sig_data[1];	/* also includes signer */
-};
-
-struct rk_cert_record {
-    unsigned type;
-    unsigned tag;
-    unsigned algorithm;
-    size_t   cert_len;
-    u_char   cert_data[1];
-};
-
-struct rk_sshfp_record {
-    unsigned algorithm;
-    unsigned type;
-    size_t   sshfp_len;
-    u_char   sshfp_data[1];
-};
-
-struct rk_ds_record {
-    unsigned key_tag;
-    unsigned algorithm;
-    unsigned digest_type;
-    size_t digest_len;
-    u_char digest_data[1];
-};
-
-struct rk_resource_record{
-    char *domain;
-    unsigned type;
-    unsigned class;
-    unsigned ttl;
-    unsigned size;
-    union {
-	void *data;
-	struct rk_mx_record *mx;
-	struct rk_mx_record *afsdb; /* mx and afsdb are identical */
-	struct rk_srv_record *srv;
-	struct in_addr *a;
-	char *txt;
-	struct rk_key_record *key;
-	struct rk_cert_record *cert;
-	struct rk_sig_record *sig;
-	struct rk_sshfp_record *sshfp;
-	struct rk_ds_record *ds;
-    }u;
-    struct rk_resource_record *next;
-};
-
-#define rk_DNS_MAX_PACKET_SIZE		0xffff
-
-struct rk_dns_header {
-    unsigned id;
-    unsigned flags;
-#define rk_DNS_HEADER_RESPONSE_FLAG		1
-#define rk_DNS_HEADER_AUTHORITIVE_ANSWER	2
-#define rk_DNS_HEADER_TRUNCATED_MESSAGE		4
-#define rk_DNS_HEADER_RECURSION_DESIRED		8
-#define rk_DNS_HEADER_RECURSION_AVAILABLE	16
-#define rk_DNS_HEADER_AUTHENTIC_DATA		32
-#define rk_DNS_HEADER_CHECKING_DISABLED		64
-    unsigned opcode;
-    unsigned response_code;
-    unsigned qdcount;
-    unsigned ancount;
-    unsigned nscount;
-    unsigned arcount;
-};
-
-struct rk_dns_reply{
-    struct rk_dns_header h;
-    struct rk_dns_query q;
-    struct rk_resource_record *head;
-};
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-ROKEN_LIB_FUNCTION struct rk_dns_reply* ROKEN_LIB_CALL
-	rk_dns_lookup(const char *, const char *);
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-	rk_dns_free_data(struct rk_dns_reply *);
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-	rk_dns_string_to_type(const char *name);
-ROKEN_LIB_FUNCTION const char * ROKEN_LIB_CALL
-	rk_dns_type_to_string(int type);
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-	rk_dns_srv_order(struct rk_dns_reply*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __RESOLVE_H__ */
diff --git a/include.new/rfc2459_asn1.h b/include.new/rfc2459_asn1.h
deleted file mode 100644
index 6fed12e..0000000
--- a/include.new/rfc2459_asn1.h
+++ /dev/null
@@ -1,1822 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libasn1/../../../crypto/heimdal/lib/asn1/rfc2459.asn1 */
-/* Do not edit */
-
-#ifndef __rfc2459_asn1_h__
-#define __rfc2459_asn1_h__
-
-#include <stddef.h>
-#include <time.h>
-
-#ifndef __asn1_common_definitions__
-#define __asn1_common_definitions__
-
-typedef struct heim_integer {
-  size_t length;
-  void *data;
-  int negative;
-} heim_integer;
-
-typedef struct heim_octet_string {
-  size_t length;
-  void *data;
-} heim_octet_string;
-
-typedef char *heim_general_string;
-
-typedef char *heim_utf8_string;
-
-typedef struct heim_octet_string heim_printable_string;
-
-typedef struct heim_octet_string heim_ia5_string;
-
-typedef struct heim_bmp_string {
-  size_t length;
-  uint16_t *data;
-} heim_bmp_string;
-
-typedef struct heim_universal_string {
-  size_t length;
-  uint32_t *data;
-} heim_universal_string;
-
-typedef char *heim_visible_string;
-
-typedef struct heim_oid {
-  size_t length;
-  unsigned *components;
-} heim_oid;
-
-typedef struct heim_bit_string {
-  size_t length;
-  void *data;
-} heim_bit_string;
-
-typedef struct heim_octet_string heim_any;
-typedef struct heim_octet_string heim_any_set;
-
-#define ASN1_MALLOC_ENCODE(T, B, BL, S, L, R)                  \
-  do {                                                         \
-    (BL) = length_##T((S));                                    \
-    (B) = malloc((BL));                                        \
-    if((B) == NULL) {                                          \
-      (R) = ENOMEM;                                            \
-    } else {                                                   \
-      (R) = encode_##T(((unsigned char*)(B)) + (BL) - 1, (BL), \
-                       (S), (L));                              \
-      if((R) != 0) {                                           \
-        free((B));                                             \
-        (B) = NULL;                                            \
-      }                                                        \
-    }                                                          \
-  } while (0)
-
-#ifdef _WIN32
-#ifndef ASN1_LIB
-#define ASN1EXP  __declspec(dllimport)
-#else
-#define ASN1EXP
-#endif
-#define ASN1CALL __stdcall
-#else
-#define ASN1EXP
-#define ASN1CALL
-#endif
-struct units;
-
-#endif
-
-#include <heim_asn1.h>
-/*
-Version ::= INTEGER {
-  rfc3280_version_1(0),
-  rfc3280_version_2(1),
-  rfc3280_version_3(2)
-}
-*/
-
-typedef enum Version {
-  rfc3280_version_1 = 0,
-  rfc3280_version_2 = 1,
-  rfc3280_version_3 = 2
-} Version;
-
-ASN1EXP int    ASN1CALL decode_Version(const unsigned char *, size_t, Version *, size_t *);
-ASN1EXP int    ASN1CALL encode_Version(unsigned char *, size_t, const Version *, size_t *);
-ASN1EXP size_t ASN1CALL length_Version(const Version *);
-ASN1EXP int    ASN1CALL copy_Version  (const Version *, Version *);
-ASN1EXP void   ASN1CALL free_Version  (Version *);
-
-
-/* OBJECT IDENTIFIER id-pkcs-1 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_1;
-#define ASN1_OID_ID_PKCS_1 (&asn1_oid_id_pkcs_1)
-
-/* OBJECT IDENTIFIER id-pkcs1-rsaEncryption ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(1) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs1_rsaEncryption;
-#define ASN1_OID_ID_PKCS1_RSAENCRYPTION (&asn1_oid_id_pkcs1_rsaEncryption)
-
-/* OBJECT IDENTIFIER id-pkcs1-md2WithRSAEncryption ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(1) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs1_md2WithRSAEncryption;
-#define ASN1_OID_ID_PKCS1_MD2WITHRSAENCRYPTION (&asn1_oid_id_pkcs1_md2WithRSAEncryption)
-
-/* OBJECT IDENTIFIER id-pkcs1-md5WithRSAEncryption ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(1) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs1_md5WithRSAEncryption;
-#define ASN1_OID_ID_PKCS1_MD5WITHRSAENCRYPTION (&asn1_oid_id_pkcs1_md5WithRSAEncryption)
-
-/* OBJECT IDENTIFIER id-pkcs1-sha1WithRSAEncryption ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(1) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs1_sha1WithRSAEncryption;
-#define ASN1_OID_ID_PKCS1_SHA1WITHRSAENCRYPTION (&asn1_oid_id_pkcs1_sha1WithRSAEncryption)
-
-/* OBJECT IDENTIFIER id-pkcs1-sha256WithRSAEncryption ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(1) label-less(11) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs1_sha256WithRSAEncryption;
-#define ASN1_OID_ID_PKCS1_SHA256WITHRSAENCRYPTION (&asn1_oid_id_pkcs1_sha256WithRSAEncryption)
-
-/* OBJECT IDENTIFIER id-pkcs1-sha384WithRSAEncryption ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(1) label-less(12) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs1_sha384WithRSAEncryption;
-#define ASN1_OID_ID_PKCS1_SHA384WITHRSAENCRYPTION (&asn1_oid_id_pkcs1_sha384WithRSAEncryption)
-
-/* OBJECT IDENTIFIER id-pkcs1-sha512WithRSAEncryption ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(1) label-less(13) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs1_sha512WithRSAEncryption;
-#define ASN1_OID_ID_PKCS1_SHA512WITHRSAENCRYPTION (&asn1_oid_id_pkcs1_sha512WithRSAEncryption)
-
-/* OBJECT IDENTIFIER id-heim-rsa-pkcs1-x509 ::= { label-less(1) label-less(2) label-less(752) label-less(43) label-less(16) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_heim_rsa_pkcs1_x509;
-#define ASN1_OID_ID_HEIM_RSA_PKCS1_X509 (&asn1_oid_id_heim_rsa_pkcs1_x509)
-
-/* OBJECT IDENTIFIER id-pkcs-2 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_2;
-#define ASN1_OID_ID_PKCS_2 (&asn1_oid_id_pkcs_2)
-
-/* OBJECT IDENTIFIER id-pkcs2-md2 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(2) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs2_md2;
-#define ASN1_OID_ID_PKCS2_MD2 (&asn1_oid_id_pkcs2_md2)
-
-/* OBJECT IDENTIFIER id-pkcs2-md4 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(2) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs2_md4;
-#define ASN1_OID_ID_PKCS2_MD4 (&asn1_oid_id_pkcs2_md4)
-
-/* OBJECT IDENTIFIER id-pkcs2-md5 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(2) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs2_md5;
-#define ASN1_OID_ID_PKCS2_MD5 (&asn1_oid_id_pkcs2_md5)
-
-/* OBJECT IDENTIFIER id-rsa-digestAlgorithm ::= { iso(1) member-body(2) us(840) rsadsi(113549) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_rsa_digestAlgorithm;
-#define ASN1_OID_ID_RSA_DIGESTALGORITHM (&asn1_oid_id_rsa_digestAlgorithm)
-
-/* OBJECT IDENTIFIER id-rsa-digest-md2 ::= { iso(1) member-body(2) us(840) rsadsi(113549) label-less(2) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_rsa_digest_md2;
-#define ASN1_OID_ID_RSA_DIGEST_MD2 (&asn1_oid_id_rsa_digest_md2)
-
-/* OBJECT IDENTIFIER id-rsa-digest-md4 ::= { iso(1) member-body(2) us(840) rsadsi(113549) label-less(2) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_rsa_digest_md4;
-#define ASN1_OID_ID_RSA_DIGEST_MD4 (&asn1_oid_id_rsa_digest_md4)
-
-/* OBJECT IDENTIFIER id-rsa-digest-md5 ::= { iso(1) member-body(2) us(840) rsadsi(113549) label-less(2) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_rsa_digest_md5;
-#define ASN1_OID_ID_RSA_DIGEST_MD5 (&asn1_oid_id_rsa_digest_md5)
-
-/* OBJECT IDENTIFIER id-pkcs-3 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs_3;
-#define ASN1_OID_ID_PKCS_3 (&asn1_oid_id_pkcs_3)
-
-/* OBJECT IDENTIFIER id-pkcs3-rc2-cbc ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(3) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs3_rc2_cbc;
-#define ASN1_OID_ID_PKCS3_RC2_CBC (&asn1_oid_id_pkcs3_rc2_cbc)
-
-/* OBJECT IDENTIFIER id-pkcs3-rc4 ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(3) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs3_rc4;
-#define ASN1_OID_ID_PKCS3_RC4 (&asn1_oid_id_pkcs3_rc4)
-
-/* OBJECT IDENTIFIER id-pkcs3-des-ede3-cbc ::= { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) label-less(3) label-less(7) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkcs3_des_ede3_cbc;
-#define ASN1_OID_ID_PKCS3_DES_EDE3_CBC (&asn1_oid_id_pkcs3_des_ede3_cbc)
-
-/* OBJECT IDENTIFIER id-rsadsi-encalg ::= { iso(1) member-body(2) us(840) rsadsi(113549) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_rsadsi_encalg;
-#define ASN1_OID_ID_RSADSI_ENCALG (&asn1_oid_id_rsadsi_encalg)
-
-/* OBJECT IDENTIFIER id-rsadsi-rc2-cbc ::= { iso(1) member-body(2) us(840) rsadsi(113549) label-less(3) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_rsadsi_rc2_cbc;
-#define ASN1_OID_ID_RSADSI_RC2_CBC (&asn1_oid_id_rsadsi_rc2_cbc)
-
-/* OBJECT IDENTIFIER id-rsadsi-des-ede3-cbc ::= { iso(1) member-body(2) us(840) rsadsi(113549) label-less(3) label-less(7) } */
-extern ASN1EXP const heim_oid asn1_oid_id_rsadsi_des_ede3_cbc;
-#define ASN1_OID_ID_RSADSI_DES_EDE3_CBC (&asn1_oid_id_rsadsi_des_ede3_cbc)
-
-/* OBJECT IDENTIFIER id-secsig-sha-1 ::= { iso(1) identified-organization(3) oiw(14) secsig(3) algorithm(2) label-less(26) } */
-extern ASN1EXP const heim_oid asn1_oid_id_secsig_sha_1;
-#define ASN1_OID_ID_SECSIG_SHA_1 (&asn1_oid_id_secsig_sha_1)
-
-/* OBJECT IDENTIFIER id-secsig-sha-1WithRSAEncryption ::= { iso(1) identified-organization(3) oiw(14) secsig(3) algorithm(2) label-less(29) } */
-extern ASN1EXP const heim_oid asn1_oid_id_secsig_sha_1WithRSAEncryption;
-#define ASN1_OID_ID_SECSIG_SHA_1WITHRSAENCRYPTION (&asn1_oid_id_secsig_sha_1WithRSAEncryption)
-
-/* OBJECT IDENTIFIER id-nistAlgorithm ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_nistAlgorithm;
-#define ASN1_OID_ID_NISTALGORITHM (&asn1_oid_id_nistAlgorithm)
-
-/* OBJECT IDENTIFIER id-nist-aes-algs ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_nist_aes_algs;
-#define ASN1_OID_ID_NIST_AES_ALGS (&asn1_oid_id_nist_aes_algs)
-
-/* OBJECT IDENTIFIER id-aes-128-cbc ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) label-less(1) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_aes_128_cbc;
-#define ASN1_OID_ID_AES_128_CBC (&asn1_oid_id_aes_128_cbc)
-
-/* OBJECT IDENTIFIER id-aes-192-cbc ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) label-less(1) label-less(22) } */
-extern ASN1EXP const heim_oid asn1_oid_id_aes_192_cbc;
-#define ASN1_OID_ID_AES_192_CBC (&asn1_oid_id_aes_192_cbc)
-
-/* OBJECT IDENTIFIER id-aes-256-cbc ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) label-less(1) label-less(42) } */
-extern ASN1EXP const heim_oid asn1_oid_id_aes_256_cbc;
-#define ASN1_OID_ID_AES_256_CBC (&asn1_oid_id_aes_256_cbc)
-
-/* OBJECT IDENTIFIER id-nist-sha-algs ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_nist_sha_algs;
-#define ASN1_OID_ID_NIST_SHA_ALGS (&asn1_oid_id_nist_sha_algs)
-
-/* OBJECT IDENTIFIER id-sha256 ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) label-less(2) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_sha256;
-#define ASN1_OID_ID_SHA256 (&asn1_oid_id_sha256)
-
-/* OBJECT IDENTIFIER id-sha224 ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) label-less(2) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_sha224;
-#define ASN1_OID_ID_SHA224 (&asn1_oid_id_sha224)
-
-/* OBJECT IDENTIFIER id-sha384 ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) label-less(2) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_sha384;
-#define ASN1_OID_ID_SHA384 (&asn1_oid_id_sha384)
-
-/* OBJECT IDENTIFIER id-sha512 ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) gov(101) csor(3) label-less(4) label-less(2) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_sha512;
-#define ASN1_OID_ID_SHA512 (&asn1_oid_id_sha512)
-
-/* OBJECT IDENTIFIER id-dhpublicnumber ::= { iso(1) member-body(2) us(840) ansi-x942(10046) number-type(2) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_dhpublicnumber;
-#define ASN1_OID_ID_DHPUBLICNUMBER (&asn1_oid_id_dhpublicnumber)
-
-/* OBJECT IDENTIFIER id-ecPublicKey ::= { iso(1) member-body(2) us(840) ansi-X9-62(10045) keyType(2) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ecPublicKey;
-#define ASN1_OID_ID_ECPUBLICKEY (&asn1_oid_id_ecPublicKey)
-
-/* OBJECT IDENTIFIER id-ecDH ::= { iso(1) identified-organization(3) certicom(132) schemes(1) ecdh(12) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ecDH;
-#define ASN1_OID_ID_ECDH (&asn1_oid_id_ecDH)
-
-/* OBJECT IDENTIFIER id-ecMQV ::= { iso(1) identified-organization(3) certicom(132) schemes(1) ecmqv(13) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ecMQV;
-#define ASN1_OID_ID_ECMQV (&asn1_oid_id_ecMQV)
-
-/* OBJECT IDENTIFIER id-ecdsa-with-SHA256 ::= { iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4) ecdsa-with-SHA2(3) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ecdsa_with_SHA256;
-#define ASN1_OID_ID_ECDSA_WITH_SHA256 (&asn1_oid_id_ecdsa_with_SHA256)
-
-/* OBJECT IDENTIFIER id-ecdsa-with-SHA1 ::= { iso(1) member-body(2) us(840) ansi-X9-62(10045) signatures(4) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ecdsa_with_SHA1;
-#define ASN1_OID_ID_ECDSA_WITH_SHA1 (&asn1_oid_id_ecdsa_with_SHA1)
-
-/* OBJECT IDENTIFIER id-ec-group-secp256r1 ::= { iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3) prime(1) label-less(7) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ec_group_secp256r1;
-#define ASN1_OID_ID_EC_GROUP_SECP256R1 (&asn1_oid_id_ec_group_secp256r1)
-
-/* OBJECT IDENTIFIER id-ec-group-secp160r1 ::= { iso(1) identified-organization(3) certicom(132) label-less(0) label-less(8) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ec_group_secp160r1;
-#define ASN1_OID_ID_EC_GROUP_SECP160R1 (&asn1_oid_id_ec_group_secp160r1)
-
-/* OBJECT IDENTIFIER id-ec-group-secp160r2 ::= { iso(1) identified-organization(3) certicom(132) label-less(0) label-less(30) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ec_group_secp160r2;
-#define ASN1_OID_ID_EC_GROUP_SECP160R2 (&asn1_oid_id_ec_group_secp160r2)
-
-/* OBJECT IDENTIFIER id-x9-57 ::= { iso(1) member-body(2) us(840) ansi-x942(10046) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x9_57;
-#define ASN1_OID_ID_X9_57 (&asn1_oid_id_x9_57)
-
-/* OBJECT IDENTIFIER id-dsa ::= { iso(1) member-body(2) us(840) ansi-x942(10046) label-less(4) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_dsa;
-#define ASN1_OID_ID_DSA (&asn1_oid_id_dsa)
-
-/* OBJECT IDENTIFIER id-dsa-with-sha1 ::= { iso(1) member-body(2) us(840) ansi-x942(10046) label-less(4) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_dsa_with_sha1;
-#define ASN1_OID_ID_DSA_WITH_SHA1 (&asn1_oid_id_dsa_with_sha1)
-
-/* OBJECT IDENTIFIER id-x520-at ::= { joint-iso-ccitt(2) ds(5) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x520_at;
-#define ASN1_OID_ID_X520_AT (&asn1_oid_id_x520_at)
-
-/* OBJECT IDENTIFIER id-at-commonName ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_commonName;
-#define ASN1_OID_ID_AT_COMMONNAME (&asn1_oid_id_at_commonName)
-
-/* OBJECT IDENTIFIER id-at-surname ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_surname;
-#define ASN1_OID_ID_AT_SURNAME (&asn1_oid_id_at_surname)
-
-/* OBJECT IDENTIFIER id-at-serialNumber ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_serialNumber;
-#define ASN1_OID_ID_AT_SERIALNUMBER (&asn1_oid_id_at_serialNumber)
-
-/* OBJECT IDENTIFIER id-at-countryName ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(6) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_countryName;
-#define ASN1_OID_ID_AT_COUNTRYNAME (&asn1_oid_id_at_countryName)
-
-/* OBJECT IDENTIFIER id-at-localityName ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(7) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_localityName;
-#define ASN1_OID_ID_AT_LOCALITYNAME (&asn1_oid_id_at_localityName)
-
-/* OBJECT IDENTIFIER id-at-stateOrProvinceName ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(8) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_stateOrProvinceName;
-#define ASN1_OID_ID_AT_STATEORPROVINCENAME (&asn1_oid_id_at_stateOrProvinceName)
-
-/* OBJECT IDENTIFIER id-at-streetAddress ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(9) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_streetAddress;
-#define ASN1_OID_ID_AT_STREETADDRESS (&asn1_oid_id_at_streetAddress)
-
-/* OBJECT IDENTIFIER id-at-organizationName ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(10) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_organizationName;
-#define ASN1_OID_ID_AT_ORGANIZATIONNAME (&asn1_oid_id_at_organizationName)
-
-/* OBJECT IDENTIFIER id-at-organizationalUnitName ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(11) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_organizationalUnitName;
-#define ASN1_OID_ID_AT_ORGANIZATIONALUNITNAME (&asn1_oid_id_at_organizationalUnitName)
-
-/* OBJECT IDENTIFIER id-at-name ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(41) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_name;
-#define ASN1_OID_ID_AT_NAME (&asn1_oid_id_at_name)
-
-/* OBJECT IDENTIFIER id-at-givenName ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(42) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_givenName;
-#define ASN1_OID_ID_AT_GIVENNAME (&asn1_oid_id_at_givenName)
-
-/* OBJECT IDENTIFIER id-at-initials ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(43) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_initials;
-#define ASN1_OID_ID_AT_INITIALS (&asn1_oid_id_at_initials)
-
-/* OBJECT IDENTIFIER id-at-generationQualifier ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(44) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_generationQualifier;
-#define ASN1_OID_ID_AT_GENERATIONQUALIFIER (&asn1_oid_id_at_generationQualifier)
-
-/* OBJECT IDENTIFIER id-at-pseudonym ::= { joint-iso-ccitt(2) ds(5) label-less(4) label-less(65) } */
-extern ASN1EXP const heim_oid asn1_oid_id_at_pseudonym;
-#define ASN1_OID_ID_AT_PSEUDONYM (&asn1_oid_id_at_pseudonym)
-
-/* OBJECT IDENTIFIER id-Userid ::= { label-less(0) label-less(9) label-less(2342) label-less(19200300) label-less(100) label-less(1) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_Userid;
-#define ASN1_OID_ID_USERID (&asn1_oid_id_Userid)
-
-/* OBJECT IDENTIFIER id-domainComponent ::= { label-less(0) label-less(9) label-less(2342) label-less(19200300) label-less(100) label-less(1) label-less(25) } */
-extern ASN1EXP const heim_oid asn1_oid_id_domainComponent;
-#define ASN1_OID_ID_DOMAINCOMPONENT (&asn1_oid_id_domainComponent)
-
-/* OBJECT IDENTIFIER id-x509-ce ::= { joint-iso-ccitt(2) ds(5) label-less(29) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce;
-#define ASN1_OID_ID_X509_CE (&asn1_oid_id_x509_ce)
-
-/*
-AlgorithmIdentifier ::= SEQUENCE {
-  algorithm         OBJECT IDENTIFIER,
-  parameters      heim_any OPTIONAL,
-}
-*/
-
-typedef struct AlgorithmIdentifier {
-  heim_oid algorithm;
-  heim_any *parameters;
-} AlgorithmIdentifier;
-
-ASN1EXP int    ASN1CALL decode_AlgorithmIdentifier(const unsigned char *, size_t, AlgorithmIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_AlgorithmIdentifier(unsigned char *, size_t, const AlgorithmIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_AlgorithmIdentifier(const AlgorithmIdentifier *);
-ASN1EXP int    ASN1CALL copy_AlgorithmIdentifier  (const AlgorithmIdentifier *, AlgorithmIdentifier *);
-ASN1EXP void   ASN1CALL free_AlgorithmIdentifier  (AlgorithmIdentifier *);
-
-
-/*
-AttributeType ::= OBJECT IDENTIFIER
-*/
-
-typedef heim_oid AttributeType;
-
-ASN1EXP int    ASN1CALL decode_AttributeType(const unsigned char *, size_t, AttributeType *, size_t *);
-ASN1EXP int    ASN1CALL encode_AttributeType(unsigned char *, size_t, const AttributeType *, size_t *);
-ASN1EXP size_t ASN1CALL length_AttributeType(const AttributeType *);
-ASN1EXP int    ASN1CALL copy_AttributeType  (const AttributeType *, AttributeType *);
-ASN1EXP void   ASN1CALL free_AttributeType  (AttributeType *);
-
-
-/*
-AttributeValue ::= heim_any
-*/
-
-typedef heim_any AttributeValue;
-
-ASN1EXP int    ASN1CALL decode_AttributeValue(const unsigned char *, size_t, AttributeValue *, size_t *);
-ASN1EXP int    ASN1CALL encode_AttributeValue(unsigned char *, size_t, const AttributeValue *, size_t *);
-ASN1EXP size_t ASN1CALL length_AttributeValue(const AttributeValue *);
-ASN1EXP int    ASN1CALL copy_AttributeValue  (const AttributeValue *, AttributeValue *);
-ASN1EXP void   ASN1CALL free_AttributeValue  (AttributeValue *);
-
-
-/*
-DirectoryString ::= CHOICE {
-  ia5String           IA5String,
-  teletexString     TeletexString,
-  printableString     PrintableString,
-  universalString     UniversalString,
-  utf8String          UTF8String,
-  bmpString           BMPString,
-}
-*/
-
-typedef struct DirectoryString {
-  enum {
-    choice_DirectoryString_ia5String = 1,
-    choice_DirectoryString_teletexString,
-    choice_DirectoryString_printableString,
-    choice_DirectoryString_universalString,
-    choice_DirectoryString_utf8String,
-    choice_DirectoryString_bmpString
-  } element;
-  union {
-    heim_ia5_string ia5String;
-    heim_general_string teletexString;
-    heim_printable_string printableString;
-    heim_universal_string universalString;
-    heim_utf8_string utf8String;
-    heim_bmp_string bmpString;
-  } u;
-} DirectoryString;
-
-ASN1EXP int    ASN1CALL decode_DirectoryString(const unsigned char *, size_t, DirectoryString *, size_t *);
-ASN1EXP int    ASN1CALL encode_DirectoryString(unsigned char *, size_t, const DirectoryString *, size_t *);
-ASN1EXP size_t ASN1CALL length_DirectoryString(const DirectoryString *);
-ASN1EXP int    ASN1CALL copy_DirectoryString  (const DirectoryString *, DirectoryString *);
-ASN1EXP void   ASN1CALL free_DirectoryString  (DirectoryString *);
-
-
-/*
-Attribute ::= SEQUENCE {
-  type            AttributeType,
-  value           SET OF heim_any,
-}
-*/
-
-typedef struct Attribute {
-  AttributeType type;
-  struct Attribute_value {
-    unsigned int len;
-    heim_any *val;
-  } value;
-} Attribute;
-
-ASN1EXP int    ASN1CALL decode_Attribute(const unsigned char *, size_t, Attribute *, size_t *);
-ASN1EXP int    ASN1CALL encode_Attribute(unsigned char *, size_t, const Attribute *, size_t *);
-ASN1EXP size_t ASN1CALL length_Attribute(const Attribute *);
-ASN1EXP int    ASN1CALL copy_Attribute  (const Attribute *, Attribute *);
-ASN1EXP void   ASN1CALL free_Attribute  (Attribute *);
-
-
-/*
-AttributeTypeAndValue ::= SEQUENCE {
-  type            AttributeType,
-  value           DirectoryString,
-}
-*/
-
-typedef struct AttributeTypeAndValue {
-  AttributeType type;
-  DirectoryString value;
-} AttributeTypeAndValue;
-
-ASN1EXP int    ASN1CALL decode_AttributeTypeAndValue(const unsigned char *, size_t, AttributeTypeAndValue *, size_t *);
-ASN1EXP int    ASN1CALL encode_AttributeTypeAndValue(unsigned char *, size_t, const AttributeTypeAndValue *, size_t *);
-ASN1EXP size_t ASN1CALL length_AttributeTypeAndValue(const AttributeTypeAndValue *);
-ASN1EXP int    ASN1CALL copy_AttributeTypeAndValue  (const AttributeTypeAndValue *, AttributeTypeAndValue *);
-ASN1EXP void   ASN1CALL free_AttributeTypeAndValue  (AttributeTypeAndValue *);
-
-
-/*
-RelativeDistinguishedName ::= SET OF AttributeTypeAndValue
-*/
-
-typedef struct RelativeDistinguishedName {
-  unsigned int len;
-  AttributeTypeAndValue *val;
-} RelativeDistinguishedName;
-
-ASN1EXP int    ASN1CALL decode_RelativeDistinguishedName(const unsigned char *, size_t, RelativeDistinguishedName *, size_t *);
-ASN1EXP int    ASN1CALL encode_RelativeDistinguishedName(unsigned char *, size_t, const RelativeDistinguishedName *, size_t *);
-ASN1EXP size_t ASN1CALL length_RelativeDistinguishedName(const RelativeDistinguishedName *);
-ASN1EXP int    ASN1CALL copy_RelativeDistinguishedName  (const RelativeDistinguishedName *, RelativeDistinguishedName *);
-ASN1EXP void   ASN1CALL free_RelativeDistinguishedName  (RelativeDistinguishedName *);
-
-
-/*
-RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
-*/
-
-typedef struct RDNSequence {
-  unsigned int len;
-  RelativeDistinguishedName *val;
-} RDNSequence;
-
-ASN1EXP int    ASN1CALL decode_RDNSequence(const unsigned char *, size_t, RDNSequence *, size_t *);
-ASN1EXP int    ASN1CALL encode_RDNSequence(unsigned char *, size_t, const RDNSequence *, size_t *);
-ASN1EXP size_t ASN1CALL length_RDNSequence(const RDNSequence *);
-ASN1EXP int    ASN1CALL copy_RDNSequence  (const RDNSequence *, RDNSequence *);
-ASN1EXP void   ASN1CALL free_RDNSequence  (RDNSequence *);
-
-
-/*
-Name ::= CHOICE {
-  rdnSequence     RDNSequence,
-}
-*/
-
-typedef struct Name {
-  heim_octet_string _save;
-  enum {
-    choice_Name_rdnSequence = 1
-  } element;
-  union {
-    RDNSequence rdnSequence;
-  } u;
-} Name;
-
-ASN1EXP int    ASN1CALL decode_Name(const unsigned char *, size_t, Name *, size_t *);
-ASN1EXP int    ASN1CALL encode_Name(unsigned char *, size_t, const Name *, size_t *);
-ASN1EXP size_t ASN1CALL length_Name(const Name *);
-ASN1EXP int    ASN1CALL copy_Name  (const Name *, Name *);
-ASN1EXP void   ASN1CALL free_Name  (Name *);
-
-
-/*
-CertificateSerialNumber ::= INTEGER
-*/
-
-typedef heim_integer CertificateSerialNumber;
-
-ASN1EXP int    ASN1CALL decode_CertificateSerialNumber(const unsigned char *, size_t, CertificateSerialNumber *, size_t *);
-ASN1EXP int    ASN1CALL encode_CertificateSerialNumber(unsigned char *, size_t, const CertificateSerialNumber *, size_t *);
-ASN1EXP size_t ASN1CALL length_CertificateSerialNumber(const CertificateSerialNumber *);
-ASN1EXP int    ASN1CALL copy_CertificateSerialNumber  (const CertificateSerialNumber *, CertificateSerialNumber *);
-ASN1EXP void   ASN1CALL free_CertificateSerialNumber  (CertificateSerialNumber *);
-
-
-/*
-Time ::= CHOICE {
-  utcTime         UTCTime,
-  generalTime     GeneralizedTime,
-}
-*/
-
-typedef struct Time {
-  enum {
-    choice_Time_utcTime = 1,
-    choice_Time_generalTime
-  } element;
-  union {
-    time_t utcTime;
-    time_t generalTime;
-  } u;
-} Time;
-
-ASN1EXP int    ASN1CALL decode_Time(const unsigned char *, size_t, Time *, size_t *);
-ASN1EXP int    ASN1CALL encode_Time(unsigned char *, size_t, const Time *, size_t *);
-ASN1EXP size_t ASN1CALL length_Time(const Time *);
-ASN1EXP int    ASN1CALL copy_Time  (const Time *, Time *);
-ASN1EXP void   ASN1CALL free_Time  (Time *);
-
-
-/*
-Validity ::= SEQUENCE {
-  notBefore       Time,
-  notAfter        Time,
-}
-*/
-
-typedef struct Validity {
-  Time notBefore;
-  Time notAfter;
-} Validity;
-
-ASN1EXP int    ASN1CALL decode_Validity(const unsigned char *, size_t, Validity *, size_t *);
-ASN1EXP int    ASN1CALL encode_Validity(unsigned char *, size_t, const Validity *, size_t *);
-ASN1EXP size_t ASN1CALL length_Validity(const Validity *);
-ASN1EXP int    ASN1CALL copy_Validity  (const Validity *, Validity *);
-ASN1EXP void   ASN1CALL free_Validity  (Validity *);
-
-
-/*
-UniqueIdentifier ::= BIT STRING {
-}
-*/
-
-typedef heim_bit_string UniqueIdentifier;
-
-ASN1EXP int    ASN1CALL decode_UniqueIdentifier(const unsigned char *, size_t, UniqueIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_UniqueIdentifier(unsigned char *, size_t, const UniqueIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_UniqueIdentifier(const UniqueIdentifier *);
-ASN1EXP int    ASN1CALL copy_UniqueIdentifier  (const UniqueIdentifier *, UniqueIdentifier *);
-ASN1EXP void   ASN1CALL free_UniqueIdentifier  (UniqueIdentifier *);
-
-
-/*
-SubjectPublicKeyInfo ::= SEQUENCE {
-  algorithm          AlgorithmIdentifier,
-  subjectPublicKey     BIT STRING {
-  },
-}
-*/
-
-typedef struct SubjectPublicKeyInfo {
-  AlgorithmIdentifier algorithm;
-  heim_bit_string subjectPublicKey;
-} SubjectPublicKeyInfo;
-
-ASN1EXP int    ASN1CALL decode_SubjectPublicKeyInfo(const unsigned char *, size_t, SubjectPublicKeyInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_SubjectPublicKeyInfo(unsigned char *, size_t, const SubjectPublicKeyInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_SubjectPublicKeyInfo(const SubjectPublicKeyInfo *);
-ASN1EXP int    ASN1CALL copy_SubjectPublicKeyInfo  (const SubjectPublicKeyInfo *, SubjectPublicKeyInfo *);
-ASN1EXP void   ASN1CALL free_SubjectPublicKeyInfo  (SubjectPublicKeyInfo *);
-
-
-/*
-Extension ::= SEQUENCE {
-  extnID            OBJECT IDENTIFIER,
-  critical        BOOLEAN OPTIONAL,
-  extnValue       OCTET STRING,
-}
-*/
-
-typedef struct Extension {
-  heim_oid extnID;
-  int *critical;
-  heim_octet_string extnValue;
-} Extension;
-
-ASN1EXP int    ASN1CALL decode_Extension(const unsigned char *, size_t, Extension *, size_t *);
-ASN1EXP int    ASN1CALL encode_Extension(unsigned char *, size_t, const Extension *, size_t *);
-ASN1EXP size_t ASN1CALL length_Extension(const Extension *);
-ASN1EXP int    ASN1CALL copy_Extension  (const Extension *, Extension *);
-ASN1EXP void   ASN1CALL free_Extension  (Extension *);
-
-
-/*
-Extensions ::= SEQUENCE OF Extension
-*/
-
-typedef struct Extensions {
-  unsigned int len;
-  Extension *val;
-} Extensions;
-
-ASN1EXP int   ASN1CALL add_Extensions  (Extensions *, const Extension *);
-ASN1EXP int   ASN1CALL remove_Extensions  (Extensions *, unsigned int);
-ASN1EXP int    ASN1CALL decode_Extensions(const unsigned char *, size_t, Extensions *, size_t *);
-ASN1EXP int    ASN1CALL encode_Extensions(unsigned char *, size_t, const Extensions *, size_t *);
-ASN1EXP size_t ASN1CALL length_Extensions(const Extensions *);
-ASN1EXP int    ASN1CALL copy_Extensions  (const Extensions *, Extensions *);
-ASN1EXP void   ASN1CALL free_Extensions  (Extensions *);
-
-
-/*
-TBSCertificate ::= SEQUENCE {
-  version                [0] Version OPTIONAL,
-  serialNumber           CertificateSerialNumber,
-  signature              AlgorithmIdentifier,
-  issuer                 Name,
-  validity               Validity,
-  subject                Name,
-  subjectPublicKeyInfo   SubjectPublicKeyInfo,
-  issuerUniqueID         [1] IMPLICIT   BIT STRING {
-  } OPTIONAL,
-  subjectUniqueID        [2] IMPLICIT   BIT STRING {
-  } OPTIONAL,
-  extensions             [3] Extensions OPTIONAL,
-}
-*/
-
-typedef struct TBSCertificate {
-  heim_octet_string _save;
-  Version *version;
-  CertificateSerialNumber serialNumber;
-  AlgorithmIdentifier signature;
-  Name issuer;
-  Validity validity;
-  Name subject;
-  SubjectPublicKeyInfo subjectPublicKeyInfo;
-  heim_bit_string *issuerUniqueID;
-  heim_bit_string *subjectUniqueID;
-  Extensions *extensions;
-} TBSCertificate;
-
-ASN1EXP int    ASN1CALL decode_TBSCertificate(const unsigned char *, size_t, TBSCertificate *, size_t *);
-ASN1EXP int    ASN1CALL encode_TBSCertificate(unsigned char *, size_t, const TBSCertificate *, size_t *);
-ASN1EXP size_t ASN1CALL length_TBSCertificate(const TBSCertificate *);
-ASN1EXP int    ASN1CALL copy_TBSCertificate  (const TBSCertificate *, TBSCertificate *);
-ASN1EXP void   ASN1CALL free_TBSCertificate  (TBSCertificate *);
-
-
-/*
-Certificate ::= SEQUENCE {
-  tbsCertificate       TBSCertificate,
-  signatureAlgorithm   AlgorithmIdentifier,
-  signatureValue         BIT STRING {
-  },
-}
-*/
-
-typedef struct Certificate {
-  TBSCertificate tbsCertificate;
-  AlgorithmIdentifier signatureAlgorithm;
-  heim_bit_string signatureValue;
-} Certificate;
-
-ASN1EXP int    ASN1CALL decode_Certificate(const unsigned char *, size_t, Certificate *, size_t *);
-ASN1EXP int    ASN1CALL encode_Certificate(unsigned char *, size_t, const Certificate *, size_t *);
-ASN1EXP size_t ASN1CALL length_Certificate(const Certificate *);
-ASN1EXP int    ASN1CALL copy_Certificate  (const Certificate *, Certificate *);
-ASN1EXP void   ASN1CALL free_Certificate  (Certificate *);
-
-
-/*
-Certificates ::= SEQUENCE OF Certificate
-*/
-
-typedef struct Certificates {
-  unsigned int len;
-  Certificate *val;
-} Certificates;
-
-ASN1EXP int    ASN1CALL decode_Certificates(const unsigned char *, size_t, Certificates *, size_t *);
-ASN1EXP int    ASN1CALL encode_Certificates(unsigned char *, size_t, const Certificates *, size_t *);
-ASN1EXP size_t ASN1CALL length_Certificates(const Certificates *);
-ASN1EXP int    ASN1CALL copy_Certificates  (const Certificates *, Certificates *);
-ASN1EXP void   ASN1CALL free_Certificates  (Certificates *);
-
-
-/*
-ValidationParms ::= SEQUENCE {
-  seed              BIT STRING {
-  },
-  pgenCounter     INTEGER,
-}
-*/
-
-typedef struct ValidationParms {
-  heim_bit_string seed;
-  heim_integer pgenCounter;
-} ValidationParms;
-
-ASN1EXP int    ASN1CALL decode_ValidationParms(const unsigned char *, size_t, ValidationParms *, size_t *);
-ASN1EXP int    ASN1CALL encode_ValidationParms(unsigned char *, size_t, const ValidationParms *, size_t *);
-ASN1EXP size_t ASN1CALL length_ValidationParms(const ValidationParms *);
-ASN1EXP int    ASN1CALL copy_ValidationParms  (const ValidationParms *, ValidationParms *);
-ASN1EXP void   ASN1CALL free_ValidationParms  (ValidationParms *);
-
-
-/*
-DomainParameters ::= SEQUENCE {
-  p                 INTEGER,
-  g                 INTEGER,
-  q                 INTEGER,
-  j                 INTEGER OPTIONAL,
-  validationParms   ValidationParms OPTIONAL,
-}
-*/
-
-typedef struct DomainParameters {
-  heim_integer p;
-  heim_integer g;
-  heim_integer q;
-  heim_integer *j;
-  ValidationParms *validationParms;
-} DomainParameters;
-
-ASN1EXP int    ASN1CALL decode_DomainParameters(const unsigned char *, size_t, DomainParameters *, size_t *);
-ASN1EXP int    ASN1CALL encode_DomainParameters(unsigned char *, size_t, const DomainParameters *, size_t *);
-ASN1EXP size_t ASN1CALL length_DomainParameters(const DomainParameters *);
-ASN1EXP int    ASN1CALL copy_DomainParameters  (const DomainParameters *, DomainParameters *);
-ASN1EXP void   ASN1CALL free_DomainParameters  (DomainParameters *);
-
-
-/*
-DHParameter ::= SEQUENCE {
-  prime                INTEGER,
-  base                 INTEGER,
-  privateValueLength   INTEGER OPTIONAL,
-}
-*/
-
-typedef struct DHParameter {
-  heim_integer prime;
-  heim_integer base;
-  heim_integer *privateValueLength;
-} DHParameter;
-
-ASN1EXP int    ASN1CALL decode_DHParameter(const unsigned char *, size_t, DHParameter *, size_t *);
-ASN1EXP int    ASN1CALL encode_DHParameter(unsigned char *, size_t, const DHParameter *, size_t *);
-ASN1EXP size_t ASN1CALL length_DHParameter(const DHParameter *);
-ASN1EXP int    ASN1CALL copy_DHParameter  (const DHParameter *, DHParameter *);
-ASN1EXP void   ASN1CALL free_DHParameter  (DHParameter *);
-
-
-/*
-DHPublicKey ::= INTEGER
-*/
-
-typedef heim_integer DHPublicKey;
-
-ASN1EXP int    ASN1CALL decode_DHPublicKey(const unsigned char *, size_t, DHPublicKey *, size_t *);
-ASN1EXP int    ASN1CALL encode_DHPublicKey(unsigned char *, size_t, const DHPublicKey *, size_t *);
-ASN1EXP size_t ASN1CALL length_DHPublicKey(const DHPublicKey *);
-ASN1EXP int    ASN1CALL copy_DHPublicKey  (const DHPublicKey *, DHPublicKey *);
-ASN1EXP void   ASN1CALL free_DHPublicKey  (DHPublicKey *);
-
-
-/*
-OtherName ::= SEQUENCE {
-  type-id           OBJECT IDENTIFIER,
-  value           [0] heim_any,
-}
-*/
-
-typedef struct OtherName {
-  heim_oid type_id;
-  heim_any value;
-} OtherName;
-
-ASN1EXP int    ASN1CALL decode_OtherName(const unsigned char *, size_t, OtherName *, size_t *);
-ASN1EXP int    ASN1CALL encode_OtherName(unsigned char *, size_t, const OtherName *, size_t *);
-ASN1EXP size_t ASN1CALL length_OtherName(const OtherName *);
-ASN1EXP int    ASN1CALL copy_OtherName  (const OtherName *, OtherName *);
-ASN1EXP void   ASN1CALL free_OtherName  (OtherName *);
-
-
-/*
-GeneralName ::= CHOICE {
-  otherName                   [0] IMPLICIT SEQUENCE {
-    type-id             OBJECT IDENTIFIER,
-    value           [0] heim_any,
-  },
-  rfc822Name                  [1] IMPLICIT   IA5String,
-  dNSName                     [2] IMPLICIT   IA5String,
-  directoryName               [4] IMPLICIT CHOICE {
-    rdnSequence     RDNSequence,
-  },
-  uniformResourceIdentifier   [6] IMPLICIT   IA5String,
-  iPAddress                   [7] IMPLICIT OCTET STRING,
-  registeredID                [8] IMPLICIT   OBJECT IDENTIFIER,
-}
-*/
-
-typedef struct GeneralName {
-  enum {
-    choice_GeneralName_otherName = 1,
-    choice_GeneralName_rfc822Name,
-    choice_GeneralName_dNSName,
-    choice_GeneralName_directoryName,
-    choice_GeneralName_uniformResourceIdentifier,
-    choice_GeneralName_iPAddress,
-    choice_GeneralName_registeredID
-  } element;
-  union {
-    struct GeneralName_otherName {
-      heim_oid type_id;
-      heim_any value;
-    } otherName;
-    heim_ia5_string rfc822Name;
-    heim_ia5_string dNSName;
-    struct GeneralName_directoryName {
-      enum {
-        choice_GeneralName_directoryName_rdnSequence = 1
-      } element;
-      union {
-        RDNSequence rdnSequence;
-      } u;
-    } directoryName;
-    heim_ia5_string uniformResourceIdentifier;
-    heim_octet_string iPAddress;
-    heim_oid registeredID;
-  } u;
-} GeneralName;
-
-ASN1EXP int    ASN1CALL decode_GeneralName(const unsigned char *, size_t, GeneralName *, size_t *);
-ASN1EXP int    ASN1CALL encode_GeneralName(unsigned char *, size_t, const GeneralName *, size_t *);
-ASN1EXP size_t ASN1CALL length_GeneralName(const GeneralName *);
-ASN1EXP int    ASN1CALL copy_GeneralName  (const GeneralName *, GeneralName *);
-ASN1EXP void   ASN1CALL free_GeneralName  (GeneralName *);
-
-
-/*
-GeneralNames ::= SEQUENCE OF GeneralName
-*/
-
-typedef struct GeneralNames {
-  unsigned int len;
-  GeneralName *val;
-} GeneralNames;
-
-ASN1EXP int   ASN1CALL add_GeneralNames  (GeneralNames *, const GeneralName *);
-ASN1EXP int   ASN1CALL remove_GeneralNames  (GeneralNames *, unsigned int);
-ASN1EXP int    ASN1CALL decode_GeneralNames(const unsigned char *, size_t, GeneralNames *, size_t *);
-ASN1EXP int    ASN1CALL encode_GeneralNames(unsigned char *, size_t, const GeneralNames *, size_t *);
-ASN1EXP size_t ASN1CALL length_GeneralNames(const GeneralNames *);
-ASN1EXP int    ASN1CALL copy_GeneralNames  (const GeneralNames *, GeneralNames *);
-ASN1EXP void   ASN1CALL free_GeneralNames  (GeneralNames *);
-
-
-/* OBJECT IDENTIFIER id-x509-ce-keyUsage ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(15) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_keyUsage;
-#define ASN1_OID_ID_X509_CE_KEYUSAGE (&asn1_oid_id_x509_ce_keyUsage)
-
-/*
-KeyUsage ::= BIT STRING {
-  digitalSignature(0),
-  nonRepudiation(1),
-  keyEncipherment(2),
-  dataEncipherment(3),
-  keyAgreement(4),
-  keyCertSign(5),
-  cRLSign(6),
-  encipherOnly(7),
-  decipherOnly(8)
-}
-*/
-
-typedef struct KeyUsage {
-  unsigned int digitalSignature:1;
-  unsigned int nonRepudiation:1;
-  unsigned int keyEncipherment:1;
-  unsigned int dataEncipherment:1;
-  unsigned int keyAgreement:1;
-  unsigned int keyCertSign:1;
-  unsigned int cRLSign:1;
-  unsigned int encipherOnly:1;
-  unsigned int decipherOnly:1;
-  unsigned int _unused9:1;
-  unsigned int _unused10:1;
-  unsigned int _unused11:1;
-  unsigned int _unused12:1;
-  unsigned int _unused13:1;
-  unsigned int _unused14:1;
-  unsigned int _unused15:1;
-  unsigned int _unused16:1;
-  unsigned int _unused17:1;
-  unsigned int _unused18:1;
-  unsigned int _unused19:1;
-  unsigned int _unused20:1;
-  unsigned int _unused21:1;
-  unsigned int _unused22:1;
-  unsigned int _unused23:1;
-  unsigned int _unused24:1;
-  unsigned int _unused25:1;
-  unsigned int _unused26:1;
-  unsigned int _unused27:1;
-  unsigned int _unused28:1;
-  unsigned int _unused29:1;
-  unsigned int _unused30:1;
-  unsigned int _unused31:1;
-} KeyUsage;
-
-
-unsigned KeyUsage2int(KeyUsage);
-KeyUsage int2KeyUsage(unsigned);
-const struct units * asn1_KeyUsage_units(void);
-ASN1EXP int    ASN1CALL decode_KeyUsage(const unsigned char *, size_t, KeyUsage *, size_t *);
-ASN1EXP int    ASN1CALL encode_KeyUsage(unsigned char *, size_t, const KeyUsage *, size_t *);
-ASN1EXP size_t ASN1CALL length_KeyUsage(const KeyUsage *);
-ASN1EXP int    ASN1CALL copy_KeyUsage  (const KeyUsage *, KeyUsage *);
-ASN1EXP void   ASN1CALL free_KeyUsage  (KeyUsage *);
-
-
-/* OBJECT IDENTIFIER id-x509-ce-authorityKeyIdentifier ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(35) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_authorityKeyIdentifier;
-#define ASN1_OID_ID_X509_CE_AUTHORITYKEYIDENTIFIER (&asn1_oid_id_x509_ce_authorityKeyIdentifier)
-
-/*
-KeyIdentifier ::= OCTET STRING
-*/
-
-typedef heim_octet_string KeyIdentifier;
-
-ASN1EXP int    ASN1CALL decode_KeyIdentifier(const unsigned char *, size_t, KeyIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_KeyIdentifier(unsigned char *, size_t, const KeyIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_KeyIdentifier(const KeyIdentifier *);
-ASN1EXP int    ASN1CALL copy_KeyIdentifier  (const KeyIdentifier *, KeyIdentifier *);
-ASN1EXP void   ASN1CALL free_KeyIdentifier  (KeyIdentifier *);
-
-
-/*
-AuthorityKeyIdentifier ::= SEQUENCE {
-  keyIdentifier               [0] IMPLICIT OCTET STRING OPTIONAL,
-  authorityCertIssuer         [1] IMPLICIT SEQUENCE OF GeneralName OPTIONAL,
-  authorityCertSerialNumber   [2] IMPLICIT INTEGER OPTIONAL,
-}
-*/
-
-typedef struct AuthorityKeyIdentifier {
-  heim_octet_string *keyIdentifier;
-  struct AuthorityKeyIdentifier_authorityCertIssuer {
-    unsigned int len;
-    GeneralName *val;
-  } *authorityCertIssuer;
-  heim_integer *authorityCertSerialNumber;
-} AuthorityKeyIdentifier;
-
-ASN1EXP int    ASN1CALL decode_AuthorityKeyIdentifier(const unsigned char *, size_t, AuthorityKeyIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_AuthorityKeyIdentifier(unsigned char *, size_t, const AuthorityKeyIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_AuthorityKeyIdentifier(const AuthorityKeyIdentifier *);
-ASN1EXP int    ASN1CALL copy_AuthorityKeyIdentifier  (const AuthorityKeyIdentifier *, AuthorityKeyIdentifier *);
-ASN1EXP void   ASN1CALL free_AuthorityKeyIdentifier  (AuthorityKeyIdentifier *);
-
-
-/* OBJECT IDENTIFIER id-x509-ce-subjectKeyIdentifier ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(14) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_subjectKeyIdentifier;
-#define ASN1_OID_ID_X509_CE_SUBJECTKEYIDENTIFIER (&asn1_oid_id_x509_ce_subjectKeyIdentifier)
-
-/*
-SubjectKeyIdentifier ::= KeyIdentifier
-*/
-
-typedef KeyIdentifier SubjectKeyIdentifier;
-
-ASN1EXP int    ASN1CALL decode_SubjectKeyIdentifier(const unsigned char *, size_t, SubjectKeyIdentifier *, size_t *);
-ASN1EXP int    ASN1CALL encode_SubjectKeyIdentifier(unsigned char *, size_t, const SubjectKeyIdentifier *, size_t *);
-ASN1EXP size_t ASN1CALL length_SubjectKeyIdentifier(const SubjectKeyIdentifier *);
-ASN1EXP int    ASN1CALL copy_SubjectKeyIdentifier  (const SubjectKeyIdentifier *, SubjectKeyIdentifier *);
-ASN1EXP void   ASN1CALL free_SubjectKeyIdentifier  (SubjectKeyIdentifier *);
-
-
-/* OBJECT IDENTIFIER id-x509-ce-basicConstraints ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(19) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_basicConstraints;
-#define ASN1_OID_ID_X509_CE_BASICCONSTRAINTS (&asn1_oid_id_x509_ce_basicConstraints)
-
-/*
-BasicConstraints ::= SEQUENCE {
-  cA                  BOOLEAN OPTIONAL,
-  pathLenConstraint   INTEGER (0..2147483647) OPTIONAL,
-}
-*/
-
-typedef struct BasicConstraints {
-  int *cA;
-  unsigned int *pathLenConstraint;
-} BasicConstraints;
-
-ASN1EXP int    ASN1CALL decode_BasicConstraints(const unsigned char *, size_t, BasicConstraints *, size_t *);
-ASN1EXP int    ASN1CALL encode_BasicConstraints(unsigned char *, size_t, const BasicConstraints *, size_t *);
-ASN1EXP size_t ASN1CALL length_BasicConstraints(const BasicConstraints *);
-ASN1EXP int    ASN1CALL copy_BasicConstraints  (const BasicConstraints *, BasicConstraints *);
-ASN1EXP void   ASN1CALL free_BasicConstraints  (BasicConstraints *);
-
-
-/* OBJECT IDENTIFIER id-x509-ce-nameConstraints ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(30) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_nameConstraints;
-#define ASN1_OID_ID_X509_CE_NAMECONSTRAINTS (&asn1_oid_id_x509_ce_nameConstraints)
-
-/*
-BaseDistance ::= INTEGER
-*/
-
-typedef heim_integer BaseDistance;
-
-ASN1EXP int    ASN1CALL decode_BaseDistance(const unsigned char *, size_t, BaseDistance *, size_t *);
-ASN1EXP int    ASN1CALL encode_BaseDistance(unsigned char *, size_t, const BaseDistance *, size_t *);
-ASN1EXP size_t ASN1CALL length_BaseDistance(const BaseDistance *);
-ASN1EXP int    ASN1CALL copy_BaseDistance  (const BaseDistance *, BaseDistance *);
-ASN1EXP void   ASN1CALL free_BaseDistance  (BaseDistance *);
-
-
-/*
-GeneralSubtree ::= SEQUENCE {
-  base            GeneralName,
-  minimum         [0] IMPLICIT INTEGER OPTIONAL,
-  maximum         [1] IMPLICIT INTEGER OPTIONAL,
-}
-*/
-
-typedef struct GeneralSubtree {
-  GeneralName base;
-  heim_integer *minimum;
-  heim_integer *maximum;
-} GeneralSubtree;
-
-ASN1EXP int    ASN1CALL decode_GeneralSubtree(const unsigned char *, size_t, GeneralSubtree *, size_t *);
-ASN1EXP int    ASN1CALL encode_GeneralSubtree(unsigned char *, size_t, const GeneralSubtree *, size_t *);
-ASN1EXP size_t ASN1CALL length_GeneralSubtree(const GeneralSubtree *);
-ASN1EXP int    ASN1CALL copy_GeneralSubtree  (const GeneralSubtree *, GeneralSubtree *);
-ASN1EXP void   ASN1CALL free_GeneralSubtree  (GeneralSubtree *);
-
-
-/*
-GeneralSubtrees ::= SEQUENCE OF GeneralSubtree
-*/
-
-typedef struct GeneralSubtrees {
-  unsigned int len;
-  GeneralSubtree *val;
-} GeneralSubtrees;
-
-ASN1EXP int    ASN1CALL decode_GeneralSubtrees(const unsigned char *, size_t, GeneralSubtrees *, size_t *);
-ASN1EXP int    ASN1CALL encode_GeneralSubtrees(unsigned char *, size_t, const GeneralSubtrees *, size_t *);
-ASN1EXP size_t ASN1CALL length_GeneralSubtrees(const GeneralSubtrees *);
-ASN1EXP int    ASN1CALL copy_GeneralSubtrees  (const GeneralSubtrees *, GeneralSubtrees *);
-ASN1EXP void   ASN1CALL free_GeneralSubtrees  (GeneralSubtrees *);
-
-
-/*
-NameConstraints ::= SEQUENCE {
-  permittedSubtrees   [0] IMPLICIT SEQUENCE OF GeneralSubtree OPTIONAL,
-  excludedSubtrees    [1] IMPLICIT SEQUENCE OF GeneralSubtree OPTIONAL,
-}
-*/
-
-typedef struct NameConstraints {
-  struct NameConstraints_permittedSubtrees {
-    unsigned int len;
-    GeneralSubtree *val;
-  } *permittedSubtrees;
-  struct NameConstraints_excludedSubtrees {
-    unsigned int len;
-    GeneralSubtree *val;
-  } *excludedSubtrees;
-} NameConstraints;
-
-ASN1EXP int    ASN1CALL decode_NameConstraints(const unsigned char *, size_t, NameConstraints *, size_t *);
-ASN1EXP int    ASN1CALL encode_NameConstraints(unsigned char *, size_t, const NameConstraints *, size_t *);
-ASN1EXP size_t ASN1CALL length_NameConstraints(const NameConstraints *);
-ASN1EXP int    ASN1CALL copy_NameConstraints  (const NameConstraints *, NameConstraints *);
-ASN1EXP void   ASN1CALL free_NameConstraints  (NameConstraints *);
-
-
-/* OBJECT IDENTIFIER id-x509-ce-privateKeyUsagePeriod ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(16) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_privateKeyUsagePeriod;
-#define ASN1_OID_ID_X509_CE_PRIVATEKEYUSAGEPERIOD (&asn1_oid_id_x509_ce_privateKeyUsagePeriod)
-
-/* OBJECT IDENTIFIER id-x509-ce-certificatePolicies ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(32) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_certificatePolicies;
-#define ASN1_OID_ID_X509_CE_CERTIFICATEPOLICIES (&asn1_oid_id_x509_ce_certificatePolicies)
-
-/* OBJECT IDENTIFIER id-x509-ce-policyMappings ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(33) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_policyMappings;
-#define ASN1_OID_ID_X509_CE_POLICYMAPPINGS (&asn1_oid_id_x509_ce_policyMappings)
-
-/* OBJECT IDENTIFIER id-x509-ce-subjectAltName ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(17) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_subjectAltName;
-#define ASN1_OID_ID_X509_CE_SUBJECTALTNAME (&asn1_oid_id_x509_ce_subjectAltName)
-
-/* OBJECT IDENTIFIER id-x509-ce-issuerAltName ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(18) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_issuerAltName;
-#define ASN1_OID_ID_X509_CE_ISSUERALTNAME (&asn1_oid_id_x509_ce_issuerAltName)
-
-/* OBJECT IDENTIFIER id-x509-ce-subjectDirectoryAttributes ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(9) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_subjectDirectoryAttributes;
-#define ASN1_OID_ID_X509_CE_SUBJECTDIRECTORYATTRIBUTES (&asn1_oid_id_x509_ce_subjectDirectoryAttributes)
-
-/* OBJECT IDENTIFIER id-x509-ce-policyConstraints ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(36) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_policyConstraints;
-#define ASN1_OID_ID_X509_CE_POLICYCONSTRAINTS (&asn1_oid_id_x509_ce_policyConstraints)
-
-/* OBJECT IDENTIFIER id-x509-ce-extKeyUsage ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(37) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_extKeyUsage;
-#define ASN1_OID_ID_X509_CE_EXTKEYUSAGE (&asn1_oid_id_x509_ce_extKeyUsage)
-
-/*
-ExtKeyUsage ::= SEQUENCE OF OBJECT IDENTIFIER
-*/
-
-typedef struct ExtKeyUsage {
-  unsigned int len;
-  heim_oid *val;
-} ExtKeyUsage;
-
-ASN1EXP int    ASN1CALL decode_ExtKeyUsage(const unsigned char *, size_t, ExtKeyUsage *, size_t *);
-ASN1EXP int    ASN1CALL encode_ExtKeyUsage(unsigned char *, size_t, const ExtKeyUsage *, size_t *);
-ASN1EXP size_t ASN1CALL length_ExtKeyUsage(const ExtKeyUsage *);
-ASN1EXP int    ASN1CALL copy_ExtKeyUsage  (const ExtKeyUsage *, ExtKeyUsage *);
-ASN1EXP void   ASN1CALL free_ExtKeyUsage  (ExtKeyUsage *);
-
-
-/* OBJECT IDENTIFIER id-x509-ce-cRLDistributionPoints ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(31) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_cRLDistributionPoints;
-#define ASN1_OID_ID_X509_CE_CRLDISTRIBUTIONPOINTS (&asn1_oid_id_x509_ce_cRLDistributionPoints)
-
-/* OBJECT IDENTIFIER id-x509-ce-deltaCRLIndicator ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(27) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_deltaCRLIndicator;
-#define ASN1_OID_ID_X509_CE_DELTACRLINDICATOR (&asn1_oid_id_x509_ce_deltaCRLIndicator)
-
-/* OBJECT IDENTIFIER id-x509-ce-issuingDistributionPoint ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(28) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_issuingDistributionPoint;
-#define ASN1_OID_ID_X509_CE_ISSUINGDISTRIBUTIONPOINT (&asn1_oid_id_x509_ce_issuingDistributionPoint)
-
-/* OBJECT IDENTIFIER id-x509-ce-holdInstructionCode ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(23) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_holdInstructionCode;
-#define ASN1_OID_ID_X509_CE_HOLDINSTRUCTIONCODE (&asn1_oid_id_x509_ce_holdInstructionCode)
-
-/* OBJECT IDENTIFIER id-x509-ce-invalidityDate ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(24) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_invalidityDate;
-#define ASN1_OID_ID_X509_CE_INVALIDITYDATE (&asn1_oid_id_x509_ce_invalidityDate)
-
-/* OBJECT IDENTIFIER id-x509-ce-certificateIssuer ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(29) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_certificateIssuer;
-#define ASN1_OID_ID_X509_CE_CERTIFICATEISSUER (&asn1_oid_id_x509_ce_certificateIssuer)
-
-/* OBJECT IDENTIFIER id-x509-ce-inhibitAnyPolicy ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(54) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_inhibitAnyPolicy;
-#define ASN1_OID_ID_X509_CE_INHIBITANYPOLICY (&asn1_oid_id_x509_ce_inhibitAnyPolicy)
-
-/*
-DistributionPointReasonFlags ::= BIT STRING {
-  unused(0),
-  keyCompromise(1),
-  cACompromise(2),
-  affiliationChanged(3),
-  superseded(4),
-  cessationOfOperation(5),
-  certificateHold(6),
-  privilegeWithdrawn(7),
-  aACompromise(8)
-}
-*/
-
-typedef struct DistributionPointReasonFlags {
-  unsigned int unused:1;
-  unsigned int keyCompromise:1;
-  unsigned int cACompromise:1;
-  unsigned int affiliationChanged:1;
-  unsigned int superseded:1;
-  unsigned int cessationOfOperation:1;
-  unsigned int certificateHold:1;
-  unsigned int privilegeWithdrawn:1;
-  unsigned int aACompromise:1;
-  unsigned int _unused9:1;
-  unsigned int _unused10:1;
-  unsigned int _unused11:1;
-  unsigned int _unused12:1;
-  unsigned int _unused13:1;
-  unsigned int _unused14:1;
-  unsigned int _unused15:1;
-  unsigned int _unused16:1;
-  unsigned int _unused17:1;
-  unsigned int _unused18:1;
-  unsigned int _unused19:1;
-  unsigned int _unused20:1;
-  unsigned int _unused21:1;
-  unsigned int _unused22:1;
-  unsigned int _unused23:1;
-  unsigned int _unused24:1;
-  unsigned int _unused25:1;
-  unsigned int _unused26:1;
-  unsigned int _unused27:1;
-  unsigned int _unused28:1;
-  unsigned int _unused29:1;
-  unsigned int _unused30:1;
-  unsigned int _unused31:1;
-} DistributionPointReasonFlags;
-
-
-unsigned DistributionPointReasonFlags2int(DistributionPointReasonFlags);
-DistributionPointReasonFlags int2DistributionPointReasonFlags(unsigned);
-const struct units * asn1_DistributionPointReasonFlags_units(void);
-ASN1EXP int    ASN1CALL decode_DistributionPointReasonFlags(const unsigned char *, size_t, DistributionPointReasonFlags *, size_t *);
-ASN1EXP int    ASN1CALL encode_DistributionPointReasonFlags(unsigned char *, size_t, const DistributionPointReasonFlags *, size_t *);
-ASN1EXP size_t ASN1CALL length_DistributionPointReasonFlags(const DistributionPointReasonFlags *);
-ASN1EXP int    ASN1CALL copy_DistributionPointReasonFlags  (const DistributionPointReasonFlags *, DistributionPointReasonFlags *);
-ASN1EXP void   ASN1CALL free_DistributionPointReasonFlags  (DistributionPointReasonFlags *);
-
-
-/*
-DistributionPointName ::= CHOICE {
-  fullName                  [0] IMPLICIT SEQUENCE OF GeneralName,
-  nameRelativeToCRLIssuer   [1] RelativeDistinguishedName,
-}
-*/
-
-typedef struct DistributionPointName {
-  enum {
-    choice_DistributionPointName_fullName = 1,
-    choice_DistributionPointName_nameRelativeToCRLIssuer
-  } element;
-  union {
-    struct DistributionPointName_fullName {
-      unsigned int len;
-      GeneralName *val;
-    } fullName;
-    RelativeDistinguishedName nameRelativeToCRLIssuer;
-  } u;
-} DistributionPointName;
-
-ASN1EXP int    ASN1CALL decode_DistributionPointName(const unsigned char *, size_t, DistributionPointName *, size_t *);
-ASN1EXP int    ASN1CALL encode_DistributionPointName(unsigned char *, size_t, const DistributionPointName *, size_t *);
-ASN1EXP size_t ASN1CALL length_DistributionPointName(const DistributionPointName *);
-ASN1EXP int    ASN1CALL copy_DistributionPointName  (const DistributionPointName *, DistributionPointName *);
-ASN1EXP void   ASN1CALL free_DistributionPointName  (DistributionPointName *);
-
-
-/*
-DistributionPoint ::= SEQUENCE {
-  distributionPoint   [0] IMPLICIT heim_any OPTIONAL,
-  reasons             [1] IMPLICIT heim_any OPTIONAL,
-  cRLIssuer           [2] IMPLICIT heim_any OPTIONAL,
-}
-*/
-
-typedef struct DistributionPoint {
-  heim_any *distributionPoint;
-  heim_any *reasons;
-  heim_any *cRLIssuer;
-} DistributionPoint;
-
-ASN1EXP int    ASN1CALL decode_DistributionPoint(const unsigned char *, size_t, DistributionPoint *, size_t *);
-ASN1EXP int    ASN1CALL encode_DistributionPoint(unsigned char *, size_t, const DistributionPoint *, size_t *);
-ASN1EXP size_t ASN1CALL length_DistributionPoint(const DistributionPoint *);
-ASN1EXP int    ASN1CALL copy_DistributionPoint  (const DistributionPoint *, DistributionPoint *);
-ASN1EXP void   ASN1CALL free_DistributionPoint  (DistributionPoint *);
-
-
-/*
-CRLDistributionPoints ::= SEQUENCE OF DistributionPoint
-*/
-
-typedef struct CRLDistributionPoints {
-  unsigned int len;
-  DistributionPoint *val;
-} CRLDistributionPoints;
-
-ASN1EXP int   ASN1CALL add_CRLDistributionPoints  (CRLDistributionPoints *, const DistributionPoint *);
-ASN1EXP int   ASN1CALL remove_CRLDistributionPoints  (CRLDistributionPoints *, unsigned int);
-ASN1EXP int    ASN1CALL decode_CRLDistributionPoints(const unsigned char *, size_t, CRLDistributionPoints *, size_t *);
-ASN1EXP int    ASN1CALL encode_CRLDistributionPoints(unsigned char *, size_t, const CRLDistributionPoints *, size_t *);
-ASN1EXP size_t ASN1CALL length_CRLDistributionPoints(const CRLDistributionPoints *);
-ASN1EXP int    ASN1CALL copy_CRLDistributionPoints  (const CRLDistributionPoints *, CRLDistributionPoints *);
-ASN1EXP void   ASN1CALL free_CRLDistributionPoints  (CRLDistributionPoints *);
-
-
-/*
-DSASigValue ::= SEQUENCE {
-  r               INTEGER,
-  s               INTEGER,
-}
-*/
-
-typedef struct DSASigValue {
-  heim_integer r;
-  heim_integer s;
-} DSASigValue;
-
-ASN1EXP int    ASN1CALL decode_DSASigValue(const unsigned char *, size_t, DSASigValue *, size_t *);
-ASN1EXP int    ASN1CALL encode_DSASigValue(unsigned char *, size_t, const DSASigValue *, size_t *);
-ASN1EXP size_t ASN1CALL length_DSASigValue(const DSASigValue *);
-ASN1EXP int    ASN1CALL copy_DSASigValue  (const DSASigValue *, DSASigValue *);
-ASN1EXP void   ASN1CALL free_DSASigValue  (DSASigValue *);
-
-
-/*
-DSAPublicKey ::= INTEGER
-*/
-
-typedef heim_integer DSAPublicKey;
-
-ASN1EXP int    ASN1CALL decode_DSAPublicKey(const unsigned char *, size_t, DSAPublicKey *, size_t *);
-ASN1EXP int    ASN1CALL encode_DSAPublicKey(unsigned char *, size_t, const DSAPublicKey *, size_t *);
-ASN1EXP size_t ASN1CALL length_DSAPublicKey(const DSAPublicKey *);
-ASN1EXP int    ASN1CALL copy_DSAPublicKey  (const DSAPublicKey *, DSAPublicKey *);
-ASN1EXP void   ASN1CALL free_DSAPublicKey  (DSAPublicKey *);
-
-
-/*
-DSAParams ::= SEQUENCE {
-  p               INTEGER,
-  q               INTEGER,
-  g               INTEGER,
-}
-*/
-
-typedef struct DSAParams {
-  heim_integer p;
-  heim_integer q;
-  heim_integer g;
-} DSAParams;
-
-ASN1EXP int    ASN1CALL decode_DSAParams(const unsigned char *, size_t, DSAParams *, size_t *);
-ASN1EXP int    ASN1CALL encode_DSAParams(unsigned char *, size_t, const DSAParams *, size_t *);
-ASN1EXP size_t ASN1CALL length_DSAParams(const DSAParams *);
-ASN1EXP int    ASN1CALL copy_DSAParams  (const DSAParams *, DSAParams *);
-ASN1EXP void   ASN1CALL free_DSAParams  (DSAParams *);
-
-
-/*
-ECPoint ::= OCTET STRING
-*/
-
-typedef heim_octet_string ECPoint;
-
-ASN1EXP int    ASN1CALL decode_ECPoint(const unsigned char *, size_t, ECPoint *, size_t *);
-ASN1EXP int    ASN1CALL encode_ECPoint(unsigned char *, size_t, const ECPoint *, size_t *);
-ASN1EXP size_t ASN1CALL length_ECPoint(const ECPoint *);
-ASN1EXP int    ASN1CALL copy_ECPoint  (const ECPoint *, ECPoint *);
-ASN1EXP void   ASN1CALL free_ECPoint  (ECPoint *);
-
-
-/*
-ECParameters ::= CHOICE {
-  namedCurve        OBJECT IDENTIFIER,
-}
-*/
-
-typedef struct ECParameters {
-  enum {
-    choice_ECParameters_namedCurve = 1
-  } element;
-  union {
-    heim_oid namedCurve;
-  } u;
-} ECParameters;
-
-ASN1EXP int    ASN1CALL decode_ECParameters(const unsigned char *, size_t, ECParameters *, size_t *);
-ASN1EXP int    ASN1CALL encode_ECParameters(unsigned char *, size_t, const ECParameters *, size_t *);
-ASN1EXP size_t ASN1CALL length_ECParameters(const ECParameters *);
-ASN1EXP int    ASN1CALL copy_ECParameters  (const ECParameters *, ECParameters *);
-ASN1EXP void   ASN1CALL free_ECParameters  (ECParameters *);
-
-
-/*
-ECDSA-Sig-Value ::= SEQUENCE {
-  r               INTEGER,
-  s               INTEGER,
-}
-*/
-
-typedef struct ECDSA_Sig_Value {
-  heim_integer r;
-  heim_integer s;
-} ECDSA_Sig_Value;
-
-ASN1EXP int    ASN1CALL decode_ECDSA_Sig_Value(const unsigned char *, size_t, ECDSA_Sig_Value *, size_t *);
-ASN1EXP int    ASN1CALL encode_ECDSA_Sig_Value(unsigned char *, size_t, const ECDSA_Sig_Value *, size_t *);
-ASN1EXP size_t ASN1CALL length_ECDSA_Sig_Value(const ECDSA_Sig_Value *);
-ASN1EXP int    ASN1CALL copy_ECDSA_Sig_Value  (const ECDSA_Sig_Value *, ECDSA_Sig_Value *);
-ASN1EXP void   ASN1CALL free_ECDSA_Sig_Value  (ECDSA_Sig_Value *);
-
-
-/*
-RSAPublicKey ::= SEQUENCE {
-  modulus          INTEGER,
-  publicExponent   INTEGER,
-}
-*/
-
-typedef struct RSAPublicKey {
-  heim_integer modulus;
-  heim_integer publicExponent;
-} RSAPublicKey;
-
-ASN1EXP int    ASN1CALL decode_RSAPublicKey(const unsigned char *, size_t, RSAPublicKey *, size_t *);
-ASN1EXP int    ASN1CALL encode_RSAPublicKey(unsigned char *, size_t, const RSAPublicKey *, size_t *);
-ASN1EXP size_t ASN1CALL length_RSAPublicKey(const RSAPublicKey *);
-ASN1EXP int    ASN1CALL copy_RSAPublicKey  (const RSAPublicKey *, RSAPublicKey *);
-ASN1EXP void   ASN1CALL free_RSAPublicKey  (RSAPublicKey *);
-
-
-/*
-RSAPrivateKey ::= SEQUENCE {
-  version           INTEGER (0..2147483647),
-  modulus           INTEGER,
-  publicExponent    INTEGER,
-  privateExponent   INTEGER,
-  prime1            INTEGER,
-  prime2            INTEGER,
-  exponent1         INTEGER,
-  exponent2         INTEGER,
-  coefficient       INTEGER,
-}
-*/
-
-typedef struct RSAPrivateKey {
-  unsigned int version;
-  heim_integer modulus;
-  heim_integer publicExponent;
-  heim_integer privateExponent;
-  heim_integer prime1;
-  heim_integer prime2;
-  heim_integer exponent1;
-  heim_integer exponent2;
-  heim_integer coefficient;
-} RSAPrivateKey;
-
-ASN1EXP int    ASN1CALL decode_RSAPrivateKey(const unsigned char *, size_t, RSAPrivateKey *, size_t *);
-ASN1EXP int    ASN1CALL encode_RSAPrivateKey(unsigned char *, size_t, const RSAPrivateKey *, size_t *);
-ASN1EXP size_t ASN1CALL length_RSAPrivateKey(const RSAPrivateKey *);
-ASN1EXP int    ASN1CALL copy_RSAPrivateKey  (const RSAPrivateKey *, RSAPrivateKey *);
-ASN1EXP void   ASN1CALL free_RSAPrivateKey  (RSAPrivateKey *);
-
-
-/*
-DigestInfo ::= SEQUENCE {
-  digestAlgorithm   AlgorithmIdentifier,
-  digest            OCTET STRING,
-}
-*/
-
-typedef struct DigestInfo {
-  AlgorithmIdentifier digestAlgorithm;
-  heim_octet_string digest;
-} DigestInfo;
-
-ASN1EXP int    ASN1CALL decode_DigestInfo(const unsigned char *, size_t, DigestInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_DigestInfo(unsigned char *, size_t, const DigestInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_DigestInfo(const DigestInfo *);
-ASN1EXP int    ASN1CALL copy_DigestInfo  (const DigestInfo *, DigestInfo *);
-ASN1EXP void   ASN1CALL free_DigestInfo  (DigestInfo *);
-
-
-/*
-TBSCRLCertList ::= SEQUENCE {
-  version               Version OPTIONAL,
-  signature             AlgorithmIdentifier,
-  issuer                Name,
-  thisUpdate            Time,
-  nextUpdate            Time OPTIONAL,
-  revokedCertificates   SEQUENCE OF SEQUENCE {
-  userCertificate      CertificateSerialNumber,
-  revocationDate       Time,
-  crlEntryExtensions   Extensions OPTIONAL,
-} OPTIONAL,
-  crlExtensions         [0] Extensions OPTIONAL,
-}
-*/
-
-typedef struct TBSCRLCertList {
-  heim_octet_string _save;
-  Version *version;
-  AlgorithmIdentifier signature;
-  Name issuer;
-  Time thisUpdate;
-  Time *nextUpdate;
-  struct TBSCRLCertList_revokedCertificates {
-    unsigned int len;
-    struct TBSCRLCertList_revokedCertificates_val {
-      CertificateSerialNumber userCertificate;
-      Time revocationDate;
-      Extensions *crlEntryExtensions;
-    } *val;
-  } *revokedCertificates;
-  Extensions *crlExtensions;
-} TBSCRLCertList;
-
-ASN1EXP int    ASN1CALL decode_TBSCRLCertList(const unsigned char *, size_t, TBSCRLCertList *, size_t *);
-ASN1EXP int    ASN1CALL encode_TBSCRLCertList(unsigned char *, size_t, const TBSCRLCertList *, size_t *);
-ASN1EXP size_t ASN1CALL length_TBSCRLCertList(const TBSCRLCertList *);
-ASN1EXP int    ASN1CALL copy_TBSCRLCertList  (const TBSCRLCertList *, TBSCRLCertList *);
-ASN1EXP void   ASN1CALL free_TBSCRLCertList  (TBSCRLCertList *);
-
-
-/*
-CRLCertificateList ::= SEQUENCE {
-  tbsCertList          TBSCRLCertList,
-  signatureAlgorithm   AlgorithmIdentifier,
-  signatureValue         BIT STRING {
-  },
-}
-*/
-
-typedef struct CRLCertificateList {
-  TBSCRLCertList tbsCertList;
-  AlgorithmIdentifier signatureAlgorithm;
-  heim_bit_string signatureValue;
-} CRLCertificateList;
-
-ASN1EXP int    ASN1CALL decode_CRLCertificateList(const unsigned char *, size_t, CRLCertificateList *, size_t *);
-ASN1EXP int    ASN1CALL encode_CRLCertificateList(unsigned char *, size_t, const CRLCertificateList *, size_t *);
-ASN1EXP size_t ASN1CALL length_CRLCertificateList(const CRLCertificateList *);
-ASN1EXP int    ASN1CALL copy_CRLCertificateList  (const CRLCertificateList *, CRLCertificateList *);
-ASN1EXP void   ASN1CALL free_CRLCertificateList  (CRLCertificateList *);
-
-
-/* OBJECT IDENTIFIER id-x509-ce-cRLNumber ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(20) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_cRLNumber;
-#define ASN1_OID_ID_X509_CE_CRLNUMBER (&asn1_oid_id_x509_ce_cRLNumber)
-
-/* OBJECT IDENTIFIER id-x509-ce-freshestCRL ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(46) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_freshestCRL;
-#define ASN1_OID_ID_X509_CE_FRESHESTCRL (&asn1_oid_id_x509_ce_freshestCRL)
-
-/* OBJECT IDENTIFIER id-x509-ce-cRLReason ::= { joint-iso-ccitt(2) ds(5) label-less(29) label-less(21) } */
-extern ASN1EXP const heim_oid asn1_oid_id_x509_ce_cRLReason;
-#define ASN1_OID_ID_X509_CE_CRLREASON (&asn1_oid_id_x509_ce_cRLReason)
-
-/*
-CRLReason ::= INTEGER {
-  unspecified(0),
-  keyCompromise(1),
-  cACompromise(2),
-  affiliationChanged(3),
-  superseded(4),
-  cessationOfOperation(5),
-  certificateHold(6),
-  removeFromCRL(8),
-  privilegeWithdrawn(9),
-  aACompromise(10)
-}
-*/
-
-typedef enum CRLReason {
-  unspecified = 0,
-  keyCompromise = 1,
-  cACompromise = 2,
-  affiliationChanged = 3,
-  superseded = 4,
-  cessationOfOperation = 5,
-  certificateHold = 6,
-  removeFromCRL = 8,
-  privilegeWithdrawn = 9,
-  aACompromise = 10
-} CRLReason;
-
-ASN1EXP int    ASN1CALL decode_CRLReason(const unsigned char *, size_t, CRLReason *, size_t *);
-ASN1EXP int    ASN1CALL encode_CRLReason(unsigned char *, size_t, const CRLReason *, size_t *);
-ASN1EXP size_t ASN1CALL length_CRLReason(const CRLReason *);
-ASN1EXP int    ASN1CALL copy_CRLReason  (const CRLReason *, CRLReason *);
-ASN1EXP void   ASN1CALL free_CRLReason  (CRLReason *);
-
-
-/*
-PKIXXmppAddr ::= UTF8String
-*/
-
-typedef heim_utf8_string PKIXXmppAddr;
-
-ASN1EXP int    ASN1CALL decode_PKIXXmppAddr(const unsigned char *, size_t, PKIXXmppAddr *, size_t *);
-ASN1EXP int    ASN1CALL encode_PKIXXmppAddr(unsigned char *, size_t, const PKIXXmppAddr *, size_t *);
-ASN1EXP size_t ASN1CALL length_PKIXXmppAddr(const PKIXXmppAddr *);
-ASN1EXP int    ASN1CALL copy_PKIXXmppAddr  (const PKIXXmppAddr *, PKIXXmppAddr *);
-ASN1EXP void   ASN1CALL free_PKIXXmppAddr  (PKIXXmppAddr *);
-
-
-/* OBJECT IDENTIFIER id-pkix ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix;
-#define ASN1_OID_ID_PKIX (&asn1_oid_id_pkix)
-
-/* OBJECT IDENTIFIER id-pkix-on ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(8) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_on;
-#define ASN1_OID_ID_PKIX_ON (&asn1_oid_id_pkix_on)
-
-/* OBJECT IDENTIFIER id-pkix-on-xmppAddr ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(8) label-less(5) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_on_xmppAddr;
-#define ASN1_OID_ID_PKIX_ON_XMPPADDR (&asn1_oid_id_pkix_on_xmppAddr)
-
-/* OBJECT IDENTIFIER id-pkix-on-dnsSRV ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(8) label-less(7) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_on_dnsSRV;
-#define ASN1_OID_ID_PKIX_ON_DNSSRV (&asn1_oid_id_pkix_on_dnsSRV)
-
-/* OBJECT IDENTIFIER id-pkix-kp ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(3) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_kp;
-#define ASN1_OID_ID_PKIX_KP (&asn1_oid_id_pkix_kp)
-
-/* OBJECT IDENTIFIER id-pkix-kp-serverAuth ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(3) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_kp_serverAuth;
-#define ASN1_OID_ID_PKIX_KP_SERVERAUTH (&asn1_oid_id_pkix_kp_serverAuth)
-
-/* OBJECT IDENTIFIER id-pkix-kp-clientAuth ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(3) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_kp_clientAuth;
-#define ASN1_OID_ID_PKIX_KP_CLIENTAUTH (&asn1_oid_id_pkix_kp_clientAuth)
-
-/* OBJECT IDENTIFIER id-pkix-kp-emailProtection ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(3) label-less(4) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_kp_emailProtection;
-#define ASN1_OID_ID_PKIX_KP_EMAILPROTECTION (&asn1_oid_id_pkix_kp_emailProtection)
-
-/* OBJECT IDENTIFIER id-pkix-kp-timeStamping ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(3) label-less(8) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_kp_timeStamping;
-#define ASN1_OID_ID_PKIX_KP_TIMESTAMPING (&asn1_oid_id_pkix_kp_timeStamping)
-
-/* OBJECT IDENTIFIER id-pkix-kp-OCSPSigning ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(3) label-less(9) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_kp_OCSPSigning;
-#define ASN1_OID_ID_PKIX_KP_OCSPSIGNING (&asn1_oid_id_pkix_kp_OCSPSigning)
-
-/* OBJECT IDENTIFIER id-pkix-pe ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_pe;
-#define ASN1_OID_ID_PKIX_PE (&asn1_oid_id_pkix_pe)
-
-/* OBJECT IDENTIFIER id-pkix-pe-authorityInfoAccess ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(1) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_pe_authorityInfoAccess;
-#define ASN1_OID_ID_PKIX_PE_AUTHORITYINFOACCESS (&asn1_oid_id_pkix_pe_authorityInfoAccess)
-
-/*
-AccessDescription ::= SEQUENCE {
-  accessMethod       OBJECT IDENTIFIER,
-  accessLocation   GeneralName,
-}
-*/
-
-typedef struct AccessDescription {
-  heim_oid accessMethod;
-  GeneralName accessLocation;
-} AccessDescription;
-
-ASN1EXP int    ASN1CALL decode_AccessDescription(const unsigned char *, size_t, AccessDescription *, size_t *);
-ASN1EXP int    ASN1CALL encode_AccessDescription(unsigned char *, size_t, const AccessDescription *, size_t *);
-ASN1EXP size_t ASN1CALL length_AccessDescription(const AccessDescription *);
-ASN1EXP int    ASN1CALL copy_AccessDescription  (const AccessDescription *, AccessDescription *);
-ASN1EXP void   ASN1CALL free_AccessDescription  (AccessDescription *);
-
-
-/*
-AuthorityInfoAccessSyntax ::= SEQUENCE OF AccessDescription
-*/
-
-typedef struct AuthorityInfoAccessSyntax {
-  unsigned int len;
-  AccessDescription *val;
-} AuthorityInfoAccessSyntax;
-
-ASN1EXP int    ASN1CALL decode_AuthorityInfoAccessSyntax(const unsigned char *, size_t, AuthorityInfoAccessSyntax *, size_t *);
-ASN1EXP int    ASN1CALL encode_AuthorityInfoAccessSyntax(unsigned char *, size_t, const AuthorityInfoAccessSyntax *, size_t *);
-ASN1EXP size_t ASN1CALL length_AuthorityInfoAccessSyntax(const AuthorityInfoAccessSyntax *);
-ASN1EXP int    ASN1CALL copy_AuthorityInfoAccessSyntax  (const AuthorityInfoAccessSyntax *, AuthorityInfoAccessSyntax *);
-ASN1EXP void   ASN1CALL free_AuthorityInfoAccessSyntax  (AuthorityInfoAccessSyntax *);
-
-
-/* OBJECT IDENTIFIER id-pkix-pe-proxyCertInfo ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(1) label-less(14) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_pe_proxyCertInfo;
-#define ASN1_OID_ID_PKIX_PE_PROXYCERTINFO (&asn1_oid_id_pkix_pe_proxyCertInfo)
-
-/* OBJECT IDENTIFIER id-pkix-ppl ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(21) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_ppl;
-#define ASN1_OID_ID_PKIX_PPL (&asn1_oid_id_pkix_ppl)
-
-/* OBJECT IDENTIFIER id-pkix-ppl-anyLanguage ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(21) label-less(0) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_ppl_anyLanguage;
-#define ASN1_OID_ID_PKIX_PPL_ANYLANGUAGE (&asn1_oid_id_pkix_ppl_anyLanguage)
-
-/* OBJECT IDENTIFIER id-pkix-ppl-inheritAll ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(21) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_ppl_inheritAll;
-#define ASN1_OID_ID_PKIX_PPL_INHERITALL (&asn1_oid_id_pkix_ppl_inheritAll)
-
-/* OBJECT IDENTIFIER id-pkix-ppl-independent ::= { iso(1) identified-organization(3) dod(6) internet(1) security(5) mechanisms(5) pkix(7) label-less(21) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_pkix_ppl_independent;
-#define ASN1_OID_ID_PKIX_PPL_INDEPENDENT (&asn1_oid_id_pkix_ppl_independent)
-
-/*
-ProxyPolicy ::= SEQUENCE {
-  policyLanguage     OBJECT IDENTIFIER,
-  policy           OCTET STRING OPTIONAL,
-}
-*/
-
-typedef struct ProxyPolicy {
-  heim_oid policyLanguage;
-  heim_octet_string *policy;
-} ProxyPolicy;
-
-ASN1EXP int    ASN1CALL decode_ProxyPolicy(const unsigned char *, size_t, ProxyPolicy *, size_t *);
-ASN1EXP int    ASN1CALL encode_ProxyPolicy(unsigned char *, size_t, const ProxyPolicy *, size_t *);
-ASN1EXP size_t ASN1CALL length_ProxyPolicy(const ProxyPolicy *);
-ASN1EXP int    ASN1CALL copy_ProxyPolicy  (const ProxyPolicy *, ProxyPolicy *);
-ASN1EXP void   ASN1CALL free_ProxyPolicy  (ProxyPolicy *);
-
-
-/*
-ProxyCertInfo ::= SEQUENCE {
-  pCPathLenConstraint   INTEGER (0..2147483647) OPTIONAL,
-  proxyPolicy           ProxyPolicy,
-}
-*/
-
-typedef struct ProxyCertInfo {
-  unsigned int *pCPathLenConstraint;
-  ProxyPolicy proxyPolicy;
-} ProxyCertInfo;
-
-ASN1EXP int    ASN1CALL decode_ProxyCertInfo(const unsigned char *, size_t, ProxyCertInfo *, size_t *);
-ASN1EXP int    ASN1CALL encode_ProxyCertInfo(unsigned char *, size_t, const ProxyCertInfo *, size_t *);
-ASN1EXP size_t ASN1CALL length_ProxyCertInfo(const ProxyCertInfo *);
-ASN1EXP int    ASN1CALL copy_ProxyCertInfo  (const ProxyCertInfo *, ProxyCertInfo *);
-ASN1EXP void   ASN1CALL free_ProxyCertInfo  (ProxyCertInfo *);
-
-
-/* OBJECT IDENTIFIER id-uspkicommon-card-id ::= { label-less(2) label-less(16) label-less(840) label-less(1) label-less(101) label-less(3) label-less(6) label-less(6) } */
-extern ASN1EXP const heim_oid asn1_oid_id_uspkicommon_card_id;
-#define ASN1_OID_ID_USPKICOMMON_CARD_ID (&asn1_oid_id_uspkicommon_card_id)
-
-/* OBJECT IDENTIFIER id-uspkicommon-piv-interim ::= { label-less(2) label-less(16) label-less(840) label-less(1) label-less(101) label-less(3) label-less(6) label-less(9) label-less(1) } */
-extern ASN1EXP const heim_oid asn1_oid_id_uspkicommon_piv_interim;
-#define ASN1_OID_ID_USPKICOMMON_PIV_INTERIM (&asn1_oid_id_uspkicommon_piv_interim)
-
-/* OBJECT IDENTIFIER id-netscape ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) netscape(113730) } */
-extern ASN1EXP const heim_oid asn1_oid_id_netscape;
-#define ASN1_OID_ID_NETSCAPE (&asn1_oid_id_netscape)
-
-/* OBJECT IDENTIFIER id-netscape-cert-comment ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) netscape(113730) label-less(1) label-less(13) } */
-extern ASN1EXP const heim_oid asn1_oid_id_netscape_cert_comment;
-#define ASN1_OID_ID_NETSCAPE_CERT_COMMENT (&asn1_oid_id_netscape_cert_comment)
-
-/* OBJECT IDENTIFIER id-ms-cert-enroll-domaincontroller ::= { label-less(1) label-less(3) label-less(6) label-less(1) label-less(4) label-less(1) label-less(311) label-less(20) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ms_cert_enroll_domaincontroller;
-#define ASN1_OID_ID_MS_CERT_ENROLL_DOMAINCONTROLLER (&asn1_oid_id_ms_cert_enroll_domaincontroller)
-
-/* OBJECT IDENTIFIER id-ms-client-authentication ::= { label-less(1) label-less(3) label-less(6) label-less(1) label-less(5) label-less(5) label-less(7) label-less(3) label-less(2) } */
-extern ASN1EXP const heim_oid asn1_oid_id_ms_client_authentication;
-#define ASN1_OID_ID_MS_CLIENT_AUTHENTICATION (&asn1_oid_id_ms_client_authentication)
-
-#endif /* __rfc2459_asn1_h__ */
diff --git a/include.new/ripemd.h b/include.new/ripemd.h
deleted file mode 100644
index 45265c2..0000000
--- a/include.new/ripemd.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* crypto/ripemd/ripemd.h */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
-
-/*
- * $FreeBSD: releng/10.2/lib/libmd/ripemd.h 154479 2006-01-17 15:35:57Z phk $
- */
-
-#ifndef HEADER_RIPEMD_H
-#define HEADER_RIPEMD_H
-
-#include <sys/cdefs.h>
-#include <sys/types.h>		/* XXX switch to machine/ansi.h and __ types */
-
-#define RIPEMD160_CBLOCK	64
-#define RIPEMD160_LBLOCK	16
-#define RIPEMD160_BLOCK		16
-#define RIPEMD160_LAST_BLOCK	56
-#define RIPEMD160_LENGTH_BLOCK	8
-#define RIPEMD160_DIGEST_LENGTH	20
-
-typedef struct RIPEMD160state_st {
-	uint32_t A,B,C,D,E;
-	uint32_t Nl,Nh;
-	uint32_t data[RIPEMD160_LBLOCK];
-	int num;
-} RIPEMD160_CTX;
-
-__BEGIN_DECLS
-void	RIPEMD160_Init(RIPEMD160_CTX *c);
-void	RIPEMD160_Update(RIPEMD160_CTX *c, const void *data,
-			 size_t len);
-void	RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c);
-char   *RIPEMD160_End(RIPEMD160_CTX *, char *);
-char   *RIPEMD160_File(const char *, char *);
-char   *RIPEMD160_FileChunk(const char *, char *, off_t, off_t);
-char   *RIPEMD160_Data(const void *, unsigned int, char *);
-__END_DECLS
-
-#endif
diff --git a/include.new/roken-common.h b/include.new/roken-common.h
deleted file mode 100644
index 09ca412..0000000
--- a/include.new/roken-common.h
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright (c) 1995 - 2005 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id: roken-common.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef __ROKEN_COMMON_H__
-#define __ROKEN_COMMON_H__
-
-#ifndef ROKEN_LIB_FUNCTION
-#ifdef _WIN32
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL     __cdecl
-#else
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#endif
-#endif
-
-#ifdef __cplusplus
-#define ROKEN_CPP_START	extern "C" {
-#define ROKEN_CPP_END	}
-#else
-#define ROKEN_CPP_START
-#define ROKEN_CPP_END
-#endif
-
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
-
-#ifndef INADDR_LOOPBACK
-#define INADDR_LOOPBACK 0x7f000001
-#endif
-
-#ifndef SOMAXCONN
-#define SOMAXCONN 5
-#endif
-
-#ifndef STDIN_FILENO
-#define STDIN_FILENO 0
-#endif
-
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-
-#ifndef STDERR_FILENO
-#define STDERR_FILENO 2
-#endif
-
-#ifndef max
-#define max(a,b) (((a)>(b))?(a):(b))
-#endif
-
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef LOG_DAEMON
-#define openlog(id,option,facility) openlog((id),(option))
-#define	LOG_DAEMON	0
-#endif
-#ifndef LOG_ODELAY
-#define LOG_ODELAY 0
-#endif
-#ifndef LOG_NDELAY
-#define LOG_NDELAY 0x08
-#endif
-#ifndef LOG_CONS
-#define LOG_CONS 0
-#endif
-#ifndef LOG_AUTH
-#define LOG_AUTH 0
-#endif
-#ifndef LOG_AUTHPRIV
-#define LOG_AUTHPRIV LOG_AUTH
-#endif
-
-#ifndef F_OK
-#define F_OK 0
-#endif
-
-#ifndef O_ACCMODE
-#define O_ACCMODE	003
-#endif
-
-#ifndef _WIN32
-
-#ifndef _PATH_DEV
-#define _PATH_DEV "/dev/"
-#endif
-
-#ifndef _PATH_DEVNULL
-#define _PATH_DEVNULL "/dev/null"
-#endif
-
-#ifndef _PATH_HEQUIV
-#define _PATH_HEQUIV "/etc/hosts.equiv"
-#endif
-
-#ifndef _PATH_VARRUN
-#define _PATH_VARRUN "/var/run/"
-#endif
-
-#ifndef _PATH_BSHELL
-#define _PATH_BSHELL "/bin/sh"
-#endif
-
-#ifndef MAXPATHLEN
-#define MAXPATHLEN (1024+4)
-#endif
-
-#endif	/* !_WIN32 */
-
-#ifndef PATH_MAX
-#define PATH_MAX MAX_PATH
-#endif
-
-#ifndef RETSIGTYPE
-#define RETSIGTYPE void
-#endif
-
-#ifndef SIG_ERR
-#define SIG_ERR ((RETSIGTYPE (*)(int))-1)
-#endif
-
-/*
- * error code for getipnodeby{name,addr}
- */
-
-#ifndef HOST_NOT_FOUND
-#define HOST_NOT_FOUND 1
-#endif
-
-#ifndef TRY_AGAIN
-#define TRY_AGAIN 2
-#endif
-
-#ifndef NO_RECOVERY
-#define NO_RECOVERY 3
-#endif
-
-#ifndef NO_DATA
-#define NO_DATA 4
-#endif
-
-#ifndef NO_ADDRESS
-#define NO_ADDRESS NO_DATA
-#endif
-
-/*
- * error code for getaddrinfo
- */
-
-#ifndef EAI_NOERROR
-#define EAI_NOERROR	0	/* no error */
-#endif
-
-#ifndef EAI_NONAME
-
-#define EAI_ADDRFAMILY	1	/* address family for nodename not supported */
-#define EAI_AGAIN	2	/* temporary failure in name resolution */
-#define EAI_BADFLAGS	3	/* invalid value for ai_flags */
-#define EAI_FAIL	4	/* non-recoverable failure in name resolution */
-#define EAI_FAMILY	5	/* ai_family not supported */
-#define EAI_MEMORY	6	/* memory allocation failure */
-#define EAI_NODATA	7	/* no address associated with nodename */
-#define EAI_NONAME	8	/* nodename nor servname provided, or not known */
-#define EAI_SERVICE	9	/* servname not supported for ai_socktype */
-#define EAI_SOCKTYPE   10	/* ai_socktype not supported */
-#define EAI_SYSTEM     11	/* system error returned in errno */
-
-#endif /* EAI_NONAME */
-
-/* flags for getaddrinfo() */
-
-#ifndef AI_PASSIVE
-#define AI_PASSIVE	0x01
-#define AI_CANONNAME	0x02
-#endif /* AI_PASSIVE */
-
-#ifndef AI_NUMERICHOST
-#define AI_NUMERICHOST	0x04
-#endif
-
-#ifndef AI_NUMERICSERV
-#define AI_NUMERICSERV  0x08
-#endif
-
-/* flags for getnameinfo() */
-
-#ifndef NI_DGRAM
-#define NI_DGRAM	0x01
-#define NI_NAMEREQD	0x02
-#define NI_NOFQDN	0x04
-#define NI_NUMERICHOST	0x08
-#define NI_NUMERICSERV	0x10
-#endif
-
-/*
- * constants for getnameinfo
- */
-
-#ifndef NI_MAXHOST
-#define NI_MAXHOST  1025
-#define NI_MAXSERV    32
-#endif
-
-/*
- * constants for inet_ntop
- */
-
-#ifndef INET_ADDRSTRLEN
-#define INET_ADDRSTRLEN    16
-#endif
-
-#ifndef INET6_ADDRSTRLEN
-#define INET6_ADDRSTRLEN   46
-#endif
-
-/*
- * for shutdown(2)
- */
-
-#ifndef SHUT_RD
-#define SHUT_RD 0
-#endif
-
-#ifndef SHUT_WR
-#define SHUT_WR 1
-#endif
-
-#ifndef SHUT_RDWR
-#define SHUT_RDWR 2
-#endif
-
-#ifndef HAVE___ATTRIBUTE__
-#define __attribute__(x)
-#endif
-
-ROKEN_CPP_START
-
-#ifndef IRIX4 /* fix for compiler bug */
-#ifndef _WIN32
-#ifdef RETSIGTYPE
-typedef RETSIGTYPE (*SigAction)(int);
-SigAction signal(int iSig, SigAction pAction); /* BSD compatible */
-#endif
-#endif
-#endif
-
-#define SE_E_UNSPECIFIED (-1)
-#define SE_E_FORKFAILED  (-2)
-#define SE_E_WAITPIDFAILED (-3)
-#define SE_E_EXECTIMEOUT (-4)
-#define SE_E_NOEXEC   126
-#define SE_E_NOTFOUND 127
-
-#define SE_PROCSTATUS(st) (((st) >= 0 && (st) < 126)? st: -1)
-#define SE_PROCSIGNAL(st) (((st) >= 128)? (st) - 128: -1)
-#define SE_IS_ERROR(st) ((st) < 0 || (st) >= 126)
-
-
-#define simple_execve rk_simple_execve
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-simple_execve(const char*, char*const[], char*const[]);
-
-#define simple_execve_timed rk_simple_execve_timed
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-simple_execve_timed(const char *, char *const[],
-		    char *const [], time_t (*)(void *),
-		    void *, time_t);
-
-#define simple_execvp rk_simple_execvp
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-simple_execvp(const char*, char *const[]);
-
-#define simple_execvp_timed rk_simple_execvp_timed
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-simple_execvp_timed(const char *, char *const[],
-		    time_t (*)(void *), void *, time_t);
-
-#define simple_execlp rk_simple_execlp
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-simple_execlp(const char*, ...);
-
-#define simple_execle rk_simple_execle
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-simple_execle(const char*, ...);
-
-#define wait_for_process rk_wait_for_process
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-wait_for_process(pid_t);
-
-#define wait_for_process_timed rk_wait_for_process_timed
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-wait_for_process_timed(pid_t, time_t (*)(void *),
-		       void *, time_t);
-
-#define pipe_execv rk_pipe_execv
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-pipe_execv(FILE**, FILE**, FILE**, const char*, ...);
-
-#define print_version rk_print_version
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-print_version(const char *);
-
-#define eread rk_eread
-ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL
-eread (int fd, void *buf, size_t nbytes);
-
-#define ewrite rk_ewrite
-ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL
-ewrite (int fd, const void *buf, size_t nbytes);
-
-struct hostent;
-
-#define hostent_find_fqdn rk_hostent_find_fqdn
-ROKEN_LIB_FUNCTION const char * ROKEN_LIB_CALL
-hostent_find_fqdn (const struct hostent *);
-
-#define esetenv rk_esetenv
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-esetenv(const char *, const char *, int);
-
-#define socket_set_address_and_port rk_socket_set_address_and_port
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-socket_set_address_and_port (struct sockaddr *, const void *, int);
-
-#define socket_addr_size rk_socket_addr_size
-ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL
-socket_addr_size (const struct sockaddr *);
-
-#define socket_set_any rk_socket_set_any
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-socket_set_any (struct sockaddr *, int);
-
-#define socket_sockaddr_size rk_socket_sockaddr_size
-ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL
-socket_sockaddr_size (const struct sockaddr *);
-
-#define socket_get_address rk_socket_get_address
-ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
-socket_get_address (const struct sockaddr *);
-
-#define socket_get_port rk_socket_get_port
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-socket_get_port (const struct sockaddr *);
-
-#define socket_set_port rk_socket_set_port
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-socket_set_port (struct sockaddr *, int);
-
-#define socket_set_portrange rk_socket_set_portrange
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-socket_set_portrange (rk_socket_t, int, int);
-
-#define socket_set_debug rk_socket_set_debug
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-socket_set_debug (rk_socket_t);
-
-#define socket_set_tos rk_socket_set_tos
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-socket_set_tos (rk_socket_t, int);
-
-#define socket_set_reuseaddr rk_socket_set_reuseaddr
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-socket_set_reuseaddr (rk_socket_t, int);
-
-#define socket_set_ipv6only rk_socket_set_ipv6only
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-socket_set_ipv6only (rk_socket_t, int);
-
-#define socket_to_fd rk_socket_to_fd
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-socket_to_fd(rk_socket_t, int);
-
-#define vstrcollect rk_vstrcollect
-ROKEN_LIB_FUNCTION char ** ROKEN_LIB_CALL
-vstrcollect(va_list *ap);
-
-#define strcollect rk_strcollect
-ROKEN_LIB_FUNCTION char ** ROKEN_LIB_CALL
-strcollect(char *first, ...);
-
-#define timevalfix rk_timevalfix
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-timevalfix(struct timeval *t1);
-
-#define timevaladd rk_timevaladd
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-timevaladd(struct timeval *t1, const struct timeval *t2);
-
-#define timevalsub rk_timevalsub
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-timevalsub(struct timeval *t1, const struct timeval *t2);
-
-#define pid_file_write rk_pid_file_write
-ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL
-pid_file_write (const char *progname);
-
-#define pid_file_delete rk_pid_file_delete
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-pid_file_delete (char **);
-
-#define read_environment rk_read_environment
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-read_environment(const char *file, char ***env);
-
-#define free_environment rk_free_environment
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-free_environment(char **);
-
-#define warnerr rk_warnerr
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-rk_warnerr(int doerrno, const char *fmt, va_list ap)
-    __attribute__ ((format (printf, 2, 0)));
-
-ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL
-rk_realloc(void *, size_t);
-
-struct rk_strpool;
-
-ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL
-rk_strpoolcollect(struct rk_strpool *);
-
-ROKEN_LIB_FUNCTION struct rk_strpool * ROKEN_LIB_CALL
-rk_strpoolprintf(struct rk_strpool *, const char *, ...)
-    __attribute__ ((format (printf, 2, 3)));
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-rk_strpoolfree(struct rk_strpool *);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-rk_dumpdata (const char *, const void *, size_t);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rk_undumpdata (const char *, void **, size_t *);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-rk_xfree (void *);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-rk_cloexec(int);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-rk_cloexec_file(FILE *);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-rk_cloexec_dir(DIR *);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-ct_memcmp(const void *, const void *, size_t);
-
-void ROKEN_LIB_FUNCTION
-rk_random_init(void);
-
-ROKEN_CPP_END
-
-#endif /* __ROKEN_COMMON_H__ */
diff --git a/include.new/roken.h b/include.new/roken.h
deleted file mode 100644
index e26b587..0000000
--- a/include.new/roken.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/* This is an OS dependent, generated file */
-
-
-#ifndef __ROKEN_H__
-#define __ROKEN_H__
-
-/* -*- C -*- */
-/*
- * Copyright (c) 1995-2005 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdint.h>
-#include <string.h>
-#include <signal.h>
-
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#define ROKEN_LIB_VARIABLE
-
-
-typedef int rk_socket_t;
-
-#define rk_closesocket(x) close(x)
-#define rk_SOCK_IOCTL(s,c,a) ioctl((s),(c),(a))
-#define rk_IS_BAD_SOCKET(s) ((s) < 0)
-#define rk_IS_SOCKET_ERROR(rv) ((rv) < 0)
-#define rk_SOCK_ERRNO errno
-#define rk_INVALID_SOCKET (-1)
-
-#define rk_SOCK_INIT() 0
-#define rk_SOCK_EXIT() do { } while(0)
-
-
-#define IN_LOOPBACKNET 127
-
-
-#define UNREACHABLE(x)
-#define UNUSED_ARGUMENT(x)
-
-
-#include <sys/param.h>
-#include <inttypes.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <grp.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <err.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <time.h>
-
-#include <paths.h>
-
-#include <dirent.h>
-
-
-
-#include <roken-common.h>
-
-ROKEN_CPP_START
-
-#define rk_UNCONST(x) ((void *)(uintptr_t)(const void *)(x))
-
-
-
-
-
-
-
-
-
-
-
-
-#define asnprintf rk_asnprintf
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-    rk_asnprintf (char **, size_t, const char *, ...)
-     __attribute__ ((format (printf, 3, 4)));
-
-#define vasnprintf rk_vasnprintf
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-    vasnprintf (char **, size_t, const char *, va_list)
-     __attribute__((format (printf, 3, 0)));
-
-
-
-#define strlwr rk_strlwr
-ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL strlwr(char *);
-
-
-
-#define strsep_copy rk_strsep_copy
-ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL strsep_copy(const char**, const char*, char*, size_t);
-
-
-
-
-#define strupr rk_strupr
-ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL strupr(char *);
-
-
-
-
-
-#define rk_strerror_r strerror_r
-
-
-
-
-
-
-
-#include <pwd.h>
-ROKEN_LIB_FUNCTION struct passwd * ROKEN_LIB_CALL k_getpwnam (const char *);
-ROKEN_LIB_FUNCTION struct passwd * ROKEN_LIB_CALL k_getpwuid (uid_t);
-
-ROKEN_LIB_FUNCTION const char * ROKEN_LIB_CALL get_default_username (void);
-
-
-
-
-
-
-
-
-#define rk_rename(__rk_rn_from,__rk_rn_to) rename(__rk_rn_from,__rk_rn_to)
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL daemon(int, int);
-
-
-
-
-
-
-
-
-#define pidfile rk_pidfile
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL pidfile (const char*);
-
-#define bswap32 rk_bswap32
-ROKEN_LIB_FUNCTION unsigned int ROKEN_LIB_CALL bswap32(unsigned int);
-
-#define bswap16 rk_bswap16
-ROKEN_LIB_FUNCTION unsigned short ROKEN_LIB_CALL bswap16(unsigned short);
-
-
-
-ROKEN_LIB_FUNCTION time_t ROKEN_LIB_CALL tm2time (struct tm, int);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL unix_verify_user(char *, char *);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL roken_concat (char *, size_t, ...);
-
-ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL roken_mconcat (char **, size_t, ...);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL roken_vconcat (char *, size_t, va_list);
-
-ROKEN_LIB_FUNCTION size_t ROKEN_LIB_CALL
-    roken_vmconcat (char **, size_t, va_list);
-
-ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL
-    net_write (rk_socket_t, const void *, size_t);
-
-ROKEN_LIB_FUNCTION ssize_t ROKEN_LIB_CALL
-    net_read (rk_socket_t, void *, size_t);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-    issuid(void);
-
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL get_window_size(int fd, int *, int *);
-
-
-
-
-
-
-
-#define copyhostent rk_copyhostent
-ROKEN_LIB_FUNCTION struct hostent * ROKEN_LIB_CALL
-copyhostent (const struct hostent *);
-
-
-
-
-
-
-
-
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-getnameinfo_verified(const struct sockaddr *, socklen_t,
-		     char *, size_t,
-		     char *, size_t,
-		     int);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-roken_getaddrinfo_hostspec(const char *, int, struct addrinfo **); 
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-roken_getaddrinfo_hostspec2(const char *, int, int, struct addrinfo **);
-
-
-
-
-#define emalloc rk_emalloc
-ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL emalloc (size_t);
-#define ecalloc rk_ecalloc
-ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL ecalloc(size_t, size_t);
-#define erealloc rk_erealloc
-ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL erealloc (void *, size_t);
-#define estrdup rk_estrdup
-ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL estrdup (const char *);
-
-/*
- * kludges and such
- */
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-roken_gethostby_setup(const char*, const char*);
-ROKEN_LIB_FUNCTION struct hostent* ROKEN_LIB_CALL
-roken_gethostbyname(const char*);
-ROKEN_LIB_FUNCTION struct hostent* ROKEN_LIB_CALL 
-roken_gethostbyaddr(const void*, size_t, int);
-
-#define roken_getservbyname(x,y) getservbyname(x,y)
-
-#define roken_openlog(a,b,c) openlog(a,b,c)
-
-#define roken_getsockname(a,b,c) getsockname(a,b,c)
-
-
-
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-mini_inetd_addrinfo (struct addrinfo*, rk_socket_t *);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-mini_inetd (int, rk_socket_t *);
-
-
-#define strsvis rk_strsvis
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-strsvis(char *, const char *, int, const char *);
-
-#define strsvisx rk_strsvisx
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-strsvisx(char *, const char *, size_t, int, const char *);
-
-
-
-
-#define svis rk_svis
-ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL
-svis(char *, int, int, int, const char *);
-
-
-
-
-
-
-#define rk_random() arc4random()
-
-
-
-
-ROKEN_CPP_END
-
-#endif /* __ROKEN_H__ */
diff --git a/include.new/rpc/auth.h b/include.new/rpc/auth.h
deleted file mode 100644
index b2d9d7f..0000000
--- a/include.new/rpc/auth.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/*	$NetBSD: auth.h,v 1.15 2000/06/02 22:57:55 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)auth.h 1.17 88/02/08 SMI
- *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
- *	from: @(#)auth.h	1.43 	98/02/02 SMI
- * $FreeBSD: releng/10.2/include/rpc/auth.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * auth.h, Authentication interface.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * The data structures are completely opaque to the client.  The client
- * is required to pass an AUTH * to routines that create rpc
- * "sessions".
- */
-
-#ifndef _RPC_AUTH_H
-#define _RPC_AUTH_H
-#include <rpc/xdr.h>
-#include <rpc/clnt_stat.h>
-#include <sys/cdefs.h>
-#include <sys/socket.h>
-
-#define MAX_AUTH_BYTES	400
-#define MAXNETNAMELEN	255	/* maximum length of network user's name */
-
-/*
- *  Client side authentication/security data
- */
-
-typedef struct sec_data {
-	u_int	secmod;		/* security mode number e.g. in nfssec.conf */
-	u_int	rpcflavor;	/* rpc flavors:AUTH_UNIX,AUTH_DES,RPCSEC_GSS */
-	int	flags;		/* AUTH_F_xxx flags */
-	caddr_t data;		/* opaque data per flavor */
-} sec_data_t;
-
-#ifdef _SYSCALL32_IMPL
-struct sec_data32 {
-	uint32_t secmod;	/* security mode number e.g. in nfssec.conf */
-	uint32_t rpcflavor;	/* rpc flavors:AUTH_UNIX,AUTH_DES,RPCSEC_GSS */
-	int32_t flags;		/* AUTH_F_xxx flags */
-	caddr32_t data;		/* opaque data per flavor */
-};
-#endif /* _SYSCALL32_IMPL */
-
-/*
- * AUTH_DES flavor specific data from sec_data opaque data field.
- * AUTH_KERB has the same structure.
- */
-typedef struct des_clnt_data {
-	struct netbuf	syncaddr;	/* time sync addr */
-	struct knetconfig *knconf;	/* knetconfig info that associated */
-					/* with the syncaddr. */
-	char		*netname;	/* server's netname */
-	int		netnamelen;	/* server's netname len */
-} dh_k4_clntdata_t;
-
-#ifdef _SYSCALL32_IMPL
-struct des_clnt_data32 {
-	struct netbuf32 syncaddr;	/* time sync addr */
-	caddr32_t knconf;		/* knetconfig info that associated */
-					/* with the syncaddr. */
-	caddr32_t netname;		/* server's netname */
-	int32_t netnamelen;		/* server's netname len */
-};
-#endif /* _SYSCALL32_IMPL */
-
-#ifdef KERBEROS
-/*
- * flavor specific data to hold the data for AUTH_DES/AUTH_KERB(v4)
- * in sec_data->data opaque field.
- */
-typedef struct krb4_svc_data {
-	int		window;		/* window option value */
-} krb4_svcdata_t;
- 
-typedef struct krb4_svc_data	des_svcdata_t;
-#endif /* KERBEROS */
-
-/*
- * authentication/security specific flags
- */
-#define AUTH_F_RPCTIMESYNC	0x001	/* use RPC to do time sync */
-#define AUTH_F_TRYNONE		0x002	/* allow fall back to AUTH_NONE */
-
-
-/*
- * Status returned from authentication check
- */
-enum auth_stat {
-	AUTH_OK=0,
-	/*
-	 * failed at remote end
-	 */
-	AUTH_BADCRED=1,			/* bogus credentials (seal broken) */
-	AUTH_REJECTEDCRED=2,		/* client should begin new session */
-	AUTH_BADVERF=3,			/* bogus verifier (seal broken) */
-	AUTH_REJECTEDVERF=4,		/* verifier expired or was replayed */
-	AUTH_TOOWEAK=5,			/* rejected due to security reasons */
-	/*
-	 * failed locally
-	*/
-	AUTH_INVALIDRESP=6,		/* bogus response verifier */
-	AUTH_FAILED=7,			/* some unknown reason */
-#ifdef KERBEROS
-	/*
-	 * kerberos errors
-	 */
-	,
-	AUTH_KERB_GENERIC = 8,		/* kerberos generic error */
-	AUTH_TIMEEXPIRE = 9,		/* time of credential expired */
-	AUTH_TKT_FILE = 10,		/* something wrong with ticket file */
-	AUTH_DECODE = 11,			/* can't decode authenticator */
-	AUTH_NET_ADDR = 12,		/* wrong net address in ticket */
-#endif /* KERBEROS */
-	/*
-	 * RPCSEC_GSS errors
-	 */
-	RPCSEC_GSS_CREDPROBLEM = 13,
-	RPCSEC_GSS_CTXPROBLEM = 14,
-	RPCSEC_GSS_NODISPATCH = 0x8000000
-};
-
-union des_block {
-	struct {
-		uint32_t high;
-		uint32_t low;
-	} key;
-	char c[8];
-};
-typedef union des_block des_block;
-__BEGIN_DECLS
-extern bool_t xdr_des_block(XDR *, des_block *);
-__END_DECLS
-
-/*
- * Authentication info.  Opaque to client.
- */
-struct opaque_auth {
-	enum_t	oa_flavor;		/* flavor of auth */
-	caddr_t	oa_base;		/* address of more auth stuff */
-	u_int	oa_length;		/* not to exceed MAX_AUTH_BYTES */
-};
-
-
-/*
- * Auth handle, interface to client side authenticators.
- */
-typedef struct __auth {
-	struct	opaque_auth	ah_cred;
-	struct	opaque_auth	ah_verf;
-	union	des_block	ah_key;
-	struct auth_ops {
-		void	(*ah_nextverf) (struct __auth *);
-		/* nextverf & serialize */
-		int	(*ah_marshal) (struct __auth *, XDR *);
-		/* validate verifier */
-		int	(*ah_validate) (struct __auth *,
-			    struct opaque_auth *);
-		/* refresh credentials */
-		int	(*ah_refresh) (struct __auth *, void *);
-		/* destroy this structure */
-		void	(*ah_destroy) (struct __auth *);
-	} *ah_ops;
-	void *ah_private;
-} AUTH;
-
-
-/*
- * Authentication ops.
- * The ops and the auth handle provide the interface to the authenticators.
- *
- * AUTH	*auth;
- * XDR	*xdrs;
- * struct opaque_auth verf;
- */
-#define AUTH_NEXTVERF(auth)		\
-		((*((auth)->ah_ops->ah_nextverf))(auth))
-#define auth_nextverf(auth)		\
-		((*((auth)->ah_ops->ah_nextverf))(auth))
-
-#define AUTH_MARSHALL(auth, xdrs)	\
-		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
-#define auth_marshall(auth, xdrs)	\
-		((*((auth)->ah_ops->ah_marshal))(auth, xdrs))
-
-#define AUTH_VALIDATE(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
-#define auth_validate(auth, verfp)	\
-		((*((auth)->ah_ops->ah_validate))((auth), verfp))
-
-#define AUTH_REFRESH(auth, msg)		\
-		((*((auth)->ah_ops->ah_refresh))(auth, msg))
-#define auth_refresh(auth, msg)		\
-		((*((auth)->ah_ops->ah_refresh))(auth, msg))
-
-#define AUTH_DESTROY(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-#define auth_destroy(auth)		\
-		((*((auth)->ah_ops->ah_destroy))(auth))
-
-
-__BEGIN_DECLS
-extern struct opaque_auth _null_auth;
-__END_DECLS
-
-/*
- * These are the various implementations of client side authenticators.
- */
-
-/*
- * System style authentication
- * AUTH *authunix_create(machname, uid, gid, len, aup_gids)
- *	char *machname;
- *	u_int uid;
- *	u_int gid;
- *	int len;
- *	u_int *aup_gids;
- */
-__BEGIN_DECLS
-extern AUTH *authunix_create(char *, u_int, u_int, int, u_int *);
-extern AUTH *authunix_create_default(void);	/* takes no parameters */
-extern AUTH *authnone_create(void);		/* takes no parameters */
-__END_DECLS
-/*
- * DES style authentication
- * AUTH *authsecdes_create(servername, window, timehost, ckey)
- * 	char *servername;		- network name of server
- *	u_int window;			- time to live
- * 	const char *timehost;			- optional hostname to sync with
- * 	des_block *ckey;		- optional conversation key to use
- */
-__BEGIN_DECLS
-extern AUTH *authdes_create (char *, u_int, struct sockaddr *, des_block *);
-extern AUTH *authdes_seccreate (const char *, const u_int, const  char *,
-    const  des_block *);
-__END_DECLS
-
-__BEGIN_DECLS
-extern bool_t xdr_opaque_auth		(XDR *, struct opaque_auth *);
-__END_DECLS
-
-#define authsys_create(c,i1,i2,i3,ip) authunix_create((c),(i1),(i2),(i3),(ip))
-#define authsys_create_default() authunix_create_default()
-
-/*
- * Netname manipulation routines.
- */
-__BEGIN_DECLS
-extern int getnetname(char *);
-extern int host2netname(char *, const char *, const char *);
-extern int user2netname(char *, const uid_t, const char *);
-extern int netname2user(char *, uid_t *, gid_t *, int *, gid_t *);
-extern int netname2host(char *, char *, const int);
-extern void passwd2des ( char *, char * );
-__END_DECLS
-
-/*
- *
- * These routines interface to the keyserv daemon
- *
- */
-__BEGIN_DECLS
-extern int key_decryptsession(const char *, des_block *);
-extern int key_encryptsession(const char *, des_block *);
-extern int key_gendes(des_block *);
-extern int key_setsecret(const char *);
-extern int key_secretkey_is_set(void);
-__END_DECLS
-
-/*
- * Publickey routines.
- */
-__BEGIN_DECLS
-extern int getpublickey (const char *, char *);
-extern int getpublicandprivatekey (const char *, char *);
-extern int getsecretkey (char *, char *, char *);
-__END_DECLS
-
-#ifdef KERBEROS
-/*
- * Kerberos style authentication
- * AUTH *authkerb_seccreate(service, srv_inst, realm, window, timehost, status)
- *	const char *service;			- service name
- *	const char *srv_inst;			- server instance
- *	const char *realm;			- server realm
- *	const u_int window;			- time to live
- *	const char *timehost;			- optional hostname to sync with
- *	int *status;				- kerberos status returned
- */
-__BEGIN_DECLS
-extern AUTH	*authkerb_seccreate(const char *, const char *, const  char *,
-		    const u_int, const char *, int *);
-__END_DECLS
-
-/*
- * Map a kerberos credential into a unix cred.
- *
- *	authkerb_getucred(rqst, uid, gid, grouplen, groups)
- *	const struct svc_req *rqst;		- request pointer
- *	uid_t *uid;
- *	gid_t *gid;
- *	short *grouplen;
- *	int *groups;
- *
- */
-__BEGIN_DECLS
-extern int	authkerb_getucred(/* struct svc_req *, uid_t *, gid_t *,
-		    short *, int * */);
-__END_DECLS
-#endif /* KERBEROS */
-
-__BEGIN_DECLS
-struct svc_req;
-struct rpc_msg;
-enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *);
-enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *);
-enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *);
-__END_DECLS
-
-#define AUTH_NONE	0		/* no authentication */
-#define	AUTH_NULL	0		/* backward compatibility */
-#define	AUTH_SYS	1		/* unix style (uid, gids) */
-#define AUTH_UNIX	AUTH_SYS
-#define	AUTH_SHORT	2		/* short hand unix style */
-#define AUTH_DH		3		/* for Diffie-Hellman mechanism */
-#define AUTH_DES	AUTH_DH		/* for backward compatibility */
-#define AUTH_KERB	4		/* kerberos style */
-#define RPCSEC_GSS	6		/* RPCSEC_GSS */
-
-/*
- * Pseudo auth flavors for RPCSEC_GSS.
- */
-#define	RPCSEC_GSS_KRB5		390003
-#define	RPCSEC_GSS_KRB5I	390004
-#define	RPCSEC_GSS_KRB5P	390005
-
-#endif /* !_RPC_AUTH_H */
diff --git a/include.new/rpc/auth_des.h b/include.new/rpc/auth_des.h
deleted file mode 100644
index 544e5dc..0000000
--- a/include.new/rpc/auth_des.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*	@(#)auth_des.h	2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */
-/*	$FreeBSD: releng/10.2/include/rpc/auth_des.h 261046 2014-01-22 23:45:27Z mav $ */
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- * 
- *	from: @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC
- *	from: @(#)auth_des.h 1.14    94/04/25 SMI
- */
-
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * auth_des.h, Protocol for DES style authentication for RPC
- */
-
-#ifndef _AUTH_DES_
-#define _AUTH_DES_
-
-/*
- * There are two kinds of "names": fullnames and nicknames
- */
-enum authdes_namekind {
-	ADN_FULLNAME, 
-	ADN_NICKNAME
-};
-
-/*
- * A fullname contains the network name of the client, 
- * a conversation key and the window
- */
-struct authdes_fullname {
-	char *name;		/* network name of client, up to MAXNETNAMELEN */
-	des_block key;		/* conversation key */
-	u_long window;		/* associated window */
-};
-
-
-/*
- * A credential 
- */
-struct authdes_cred {
-	enum authdes_namekind adc_namekind;
-	struct authdes_fullname adc_fullname;
-	u_long adc_nickname;
-};
-
-
-
-/*
- * A des authentication verifier 
- */
-struct authdes_verf {
-	union {
-		struct timeval adv_ctime;	/* clear time */
-		des_block adv_xtime;		/* crypt time */
-	} adv_time_u;
-	u_long adv_int_u;
-};
-
-/*
- * des authentication verifier: client variety
- *
- * adv_timestamp is the current time.
- * adv_winverf is the credential window + 1.
- * Both are encrypted using the conversation key.
- */
-#define adv_timestamp	adv_time_u.adv_ctime
-#define adv_xtimestamp	adv_time_u.adv_xtime
-#define adv_winverf	adv_int_u
-
-/*
- * des authentication verifier: server variety
- *
- * adv_timeverf is the client's timestamp + client's window
- * adv_nickname is the server's nickname for the client.
- * adv_timeverf is encrypted using the conversation key.
- */
-#define adv_timeverf	adv_time_u.adv_ctime
-#define adv_xtimeverf	adv_time_u.adv_xtime
-#define adv_nickname	adv_int_u
-
-/*
- * Map a des credential into a unix cred.
- *
- */
-__BEGIN_DECLS
-extern int authdes_getucred( struct authdes_cred *, uid_t *, gid_t *, int *, gid_t * );
-__END_DECLS
-
-__BEGIN_DECLS
-extern bool_t	xdr_authdes_cred(XDR *, struct authdes_cred *);
-extern bool_t	xdr_authdes_verf(XDR *, struct authdes_verf *);
-extern int	rtime(dev_t, struct netbuf *, int, struct timeval *,
-		    struct timeval *);
-extern void	kgetnetname(char *);
-extern enum auth_stat _svcauth_des(struct svc_req *, struct rpc_msg *);
-__END_DECLS
-
-#endif /* ndef _AUTH_DES_ */
diff --git a/include.new/rpc/auth_kerb.h b/include.new/rpc/auth_kerb.h
deleted file mode 100644
index 7967c56..0000000
--- a/include.new/rpc/auth_kerb.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*	$FreeBSD: releng/10.2/include/rpc/auth_kerb.h 261046 2014-01-22 23:45:27Z mav $ */
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * auth_kerb.h, Protocol for Kerberos style authentication for RPC
- *
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-
-#ifndef	_RPC_AUTH_KERB_H
-#define	_RPC_AUTH_KERB_H
-
-#ifdef KERBEROS
-
-#include <kerberos/krb.h>
-#include <sys/socket.h>
-#include <sys/t_kuser.h>
-#include <netinet/in.h>
-#include <rpc/svc.h>
-
-/*
- * There are two kinds of "names": fullnames and nicknames
- */
-enum authkerb_namekind {
-	AKN_FULLNAME,
-	AKN_NICKNAME
-};
-/*
- * A fullname contains the ticket and the window
- */
-struct authkerb_fullname {
-	KTEXT_ST ticket;
-	u_long window;		/* associated window */
-};
-
-/*
- *  cooked credential stored in rq_clntcred
- */
-struct authkerb_clnt_cred {
-	/* start of AUTH_DAT */
-	unsigned char k_flags;	/* Flags from ticket */
-	char    pname[ANAME_SZ]; /* Principal's name */
-	char    pinst[INST_SZ];	/* His Instance */
-	char    prealm[REALM_SZ]; /* His Realm */
-	unsigned long checksum;	/* Data checksum (opt) */
-	C_Block session;	/* Session Key */
-	int	life;		/* Life of ticket */
-	unsigned long time_sec;	/* Time ticket issued */
-	unsigned long address;	/* Address in ticket */
-	/* KTEXT_ST reply;	Auth reply (opt) */
-	/* end of AUTH_DAT */
-	unsigned long expiry;	/* time the ticket is expiring */
-	u_long nickname;	/* Nickname into cache */
-	u_long window;		/* associated window */
-};
-
-typedef struct authkerb_clnt_cred authkerb_clnt_cred;
-
-/*
- * A credential
- */
-struct authkerb_cred {
-	enum authkerb_namekind akc_namekind;
-	struct authkerb_fullname akc_fullname;
-	u_long akc_nickname;
-};
-
-/*
- * A kerb authentication verifier
- */
-struct authkerb_verf {
-	union {
-		struct timeval akv_ctime;	/* clear time */
-		des_block akv_xtime;		/* crypt time */
-	} akv_time_u;
-	u_long akv_int_u;
-};
-
-/*
- * des authentication verifier: client variety
- *
- * akv_timestamp is the current time.
- * akv_winverf is the credential window + 1.
- * Both are encrypted using the conversation key.
- */
-#ifndef akv_timestamp
-#define	akv_timestamp	akv_time_u.akv_ctime
-#define	akv_xtimestamp	akv_time_u.akv_xtime
-#define	akv_winverf	akv_int_u
-#endif
-/*
- * des authentication verifier: server variety
- *
- * akv_timeverf is the client's timestamp + client's window
- * akv_nickname is the server's nickname for the client.
- * akv_timeverf is encrypted using the conversation key.
- */
-#ifndef akv_timeverf
-#define	akv_timeverf	akv_time_u.akv_ctime
-#define	akv_xtimeverf	akv_time_u.akv_xtime
-#define	akv_nickname	akv_int_u
-#endif
-
-/*
- * Register the service name, instance and realm.
- */
-extern int	authkerb_create(char *, char *, char *, u_int,
-			struct netbuf *, int *, dev_t, int, AUTH **);
-extern bool_t	xdr_authkerb_cred(XDR *, struct authkerb_cred *);
-extern bool_t	xdr_authkerb_verf(XDR *, struct authkerb_verf *);
-extern int	svc_kerb_reg(SVCXPRT *, char *, char *, char *);
-extern enum auth_stat _svcauth_kerb(struct svc_req *, struct rpc_msg *);
-
-#endif	/* KERBEROS */
-#endif	/* !_RPC_AUTH_KERB_H */
diff --git a/include.new/rpc/auth_unix.h b/include.new/rpc/auth_unix.h
deleted file mode 100644
index aaecca5..0000000
--- a/include.new/rpc/auth_unix.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
- *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD: releng/10.2/include/rpc/auth_unix.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * auth_unix.h, Protocol for UNIX style authentication parameters for RPC
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-/*
- * The system is very weak.  The client uses no encryption for  it
- * credentials and only sends null verifiers.  The server sends backs
- * null verifiers or optionally a verifier that suggests a new short hand
- * for the credentials.
- */
-
-#ifndef _RPC_AUTH_UNIX_H
-#define _RPC_AUTH_UNIX_H
-#include <sys/cdefs.h>
-
-/* The machine name is part of a credential; it may not exceed 255 bytes */
-#define MAX_MACHINE_NAME 255
-
-/* gids compose part of a credential; there may not be more than 16 of them */
-#define NGRPS 16
-
-/*
- * Unix style credentials.
- */
-struct authunix_parms {
-	u_long	 aup_time;
-	char	*aup_machname;
-	u_int	 aup_uid;
-	u_int	 aup_gid;
-	u_int	 aup_len;
-	u_int	*aup_gids;
-};
-
-#define authsys_parms authunix_parms
-
-__BEGIN_DECLS
-extern bool_t xdr_authunix_parms(XDR *, struct authunix_parms *);
-__END_DECLS
-
-/*
- * If a response verifier has flavor AUTH_SHORT,
- * then the body of the response verifier encapsulates the following structure;
- * again it is serialized in the obvious fashion.
- */
-struct short_hand_verf {
-	struct opaque_auth new_cred;
-};
-
-#endif /* !_RPC_AUTH_UNIX_H */
diff --git a/include.new/rpc/clnt.h b/include.new/rpc/clnt.h
deleted file mode 100644
index fb07498..0000000
--- a/include.new/rpc/clnt.h
+++ /dev/null
@@ -1,536 +0,0 @@
-/*	$NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)clnt.h 1.31 94/04/29 SMI
- *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: releng/10.2/include/rpc/clnt.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * clnt.h - Client side remote procedure call interface.
- */
-
-#ifndef _RPC_CLNT_H_
-#define _RPC_CLNT_H_
-#include <rpc/clnt_stat.h>
-#include <sys/cdefs.h>
-#include <netconfig.h>
-#include <sys/un.h>
-
-/*
- * Well-known IPV6 RPC broadcast address.
- */
-#define RPCB_MULTICAST_ADDR "ff02::202"
-
-/*
- * the following errors are in general unrecoverable.  The caller
- * should give up rather than retry.
- */
-#define IS_UNRECOVERABLE_RPC(s) (((s) == RPC_AUTHERROR) || \
-	((s) == RPC_CANTENCODEARGS) || \
-	((s) == RPC_CANTDECODERES) || \
-	((s) == RPC_VERSMISMATCH) || \
-	((s) == RPC_PROCUNAVAIL) || \
-	((s) == RPC_PROGUNAVAIL) || \
-	((s) == RPC_PROGVERSMISMATCH) || \
-	((s) == RPC_CANTDECODEARGS))
-
-/*
- * Error info.
- */
-struct rpc_err {
-	enum clnt_stat re_status;
-	union {
-		int RE_errno;		/* related system error */
-		enum auth_stat RE_why;	/* why the auth error occurred */
-		struct {
-			rpcvers_t low;	/* lowest version supported */
-			rpcvers_t high;	/* highest version supported */
-		} RE_vers;
-		struct {		/* maybe meaningful if RPC_FAILED */
-			int32_t s1;
-			int32_t s2;
-		} RE_lb;		/* life boot & debugging only */
-	} ru;
-#define	re_errno	ru.RE_errno
-#define	re_why		ru.RE_why
-#define	re_vers		ru.RE_vers
-#define	re_lb		ru.RE_lb
-};
-
-
-/*
- * Client rpc handle.
- * Created by individual implementations
- * Client is responsible for initializing auth, see e.g. auth_none.c.
- */
-typedef struct __rpc_client {
-	AUTH	*cl_auth;			/* authenticator */
-	struct clnt_ops {
-		/* call remote procedure */
-		enum clnt_stat	(*cl_call)(struct __rpc_client *,
-				    rpcproc_t, xdrproc_t, void *, xdrproc_t,
-				        void *, struct timeval);
-		/* abort a call */
-		void		(*cl_abort)(struct __rpc_client *);
-		/* get specific error code */
-		void		(*cl_geterr)(struct __rpc_client *,
-					struct rpc_err *);
-		/* frees results */
-		bool_t		(*cl_freeres)(struct __rpc_client *,
-					xdrproc_t, void *);
-		/* destroy this structure */
-		void		(*cl_destroy)(struct __rpc_client *);
-		/* the ioctl() of rpc */
-		bool_t          (*cl_control)(struct __rpc_client *, u_int,
-				    void *);
-	} *cl_ops;
-	void 			*cl_private;	/* private stuff */
-	char			*cl_netid;	/* network token */
-	char			*cl_tp;		/* device name */
-} CLIENT;
-
-
-/*
- * Timers used for the pseudo-transport protocol when using datagrams
- */
-struct rpc_timers {
-	u_short		rt_srtt;	/* smoothed round-trip time */
-	u_short		rt_deviate;	/* estimated deviation */
-	u_long		rt_rtxcur;	/* current (backed-off) rto */
-};
-
-/*      
- * Feedback values used for possible congestion and rate control
- */
-#define FEEDBACK_REXMIT1	1	/* first retransmit */
-#define FEEDBACK_OK		2	/* no retransmits */    
-
-/* Used to set version of portmapper used in broadcast */
-  
-#define CLCR_SET_LOWVERS	3
-#define CLCR_GET_LOWVERS	4
- 
-#define RPCSMALLMSGSIZE 400	/* a more reasonable packet size */
-
-/*
- * client side rpc interface ops
- *
- * Parameter types are:
- *
- */
-
-/*
- * enum clnt_stat
- * CLNT_CALL(rh, proc, xargs, argsp, xres, resp, timeout)
- * 	CLIENT *rh;
- *	rpcproc_t proc;
- *	xdrproc_t xargs;
- *	void *argsp;
- *	xdrproc_t xres;
- *	void *resp;
- *	struct timeval timeout;
- */
-#define	CLNT_CALL(rh, proc, xargs, argsp, xres, resp, secs) \
-	((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \
-		argsp, xres, resp, secs))
-#define	clnt_call(rh, proc, xargs, argsp, xres, resp, secs) \
-	((*(rh)->cl_ops->cl_call)(rh, proc, xargs, \
-		argsp, xres, resp, secs))
-
-/*
- * void
- * CLNT_ABORT(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_ABORT(rh)	((*(rh)->cl_ops->cl_abort)(rh))
-#define	clnt_abort(rh)	((*(rh)->cl_ops->cl_abort)(rh))
-
-/*
- * struct rpc_err
- * CLNT_GETERR(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_GETERR(rh,errp)	((*(rh)->cl_ops->cl_geterr)(rh, errp))
-#define	clnt_geterr(rh,errp)	((*(rh)->cl_ops->cl_geterr)(rh, errp))
-
-
-/*
- * bool_t
- * CLNT_FREERES(rh, xres, resp);
- * 	CLIENT *rh;
- *	xdrproc_t xres;
- *	void *resp;
- */
-#define	CLNT_FREERES(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
-#define	clnt_freeres(rh,xres,resp) ((*(rh)->cl_ops->cl_freeres)(rh,xres,resp))
-
-/*
- * bool_t
- * CLNT_CONTROL(cl, request, info)
- *      CLIENT *cl;
- *      u_int request;
- *      char *info;
- */
-#define	CLNT_CONTROL(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
-#define	clnt_control(cl,rq,in) ((*(cl)->cl_ops->cl_control)(cl,rq,in))
-
-/*
- * control operations that apply to both udp and tcp transports
- */
-#define CLSET_TIMEOUT		1	/* set timeout (timeval) */
-#define CLGET_TIMEOUT		2	/* get timeout (timeval) */
-#define CLGET_SERVER_ADDR	3	/* get server's address (sockaddr) */
-#define CLGET_FD		6	/* get connections file descriptor */
-#define CLGET_SVC_ADDR		7	/* get server's address (netbuf) */
-#define CLSET_FD_CLOSE		8	/* close fd while clnt_destroy */
-#define CLSET_FD_NCLOSE		9	/* Do not close fd while clnt_destroy */
-#define CLGET_XID 		10	/* Get xid */
-#define CLSET_XID		11	/* Set xid */
-#define CLGET_VERS		12	/* Get version number */
-#define CLSET_VERS		13	/* Set version number */
-#define CLGET_PROG		14	/* Get program number */
-#define CLSET_PROG		15	/* Set program number */
-#define CLSET_SVC_ADDR		16	/* get server's address (netbuf) */
-#define CLSET_PUSH_TIMOD	17	/* push timod if not already present */
-#define CLSET_POP_TIMOD		18	/* pop timod */
-/*
- * Connectionless only control operations
- */
-#define CLSET_RETRY_TIMEOUT 4   /* set retry timeout (timeval) */
-#define CLGET_RETRY_TIMEOUT 5   /* get retry timeout (timeval) */
-#define CLSET_ASYNC		19
-#define CLSET_CONNECT		20	/* Use connect() for UDP. (int) */
-
-/*
- * void
- * CLNT_DESTROY(rh);
- * 	CLIENT *rh;
- */
-#define	CLNT_DESTROY(rh)	((*(rh)->cl_ops->cl_destroy)(rh))
-#define	clnt_destroy(rh)	((*(rh)->cl_ops->cl_destroy)(rh))
-
-
-/*
- * RPCTEST is a test program which is accessible on every rpc
- * transport/port.  It is used for testing, performance evaluation,
- * and network administration.
- */
-
-#define RPCTEST_PROGRAM		((rpcprog_t)1)
-#define RPCTEST_VERSION		((rpcvers_t)1)
-#define RPCTEST_NULL_PROC	((rpcproc_t)2)
-#define RPCTEST_NULL_BATCH_PROC	((rpcproc_t)3)
-
-/*
- * By convention, procedure 0 takes null arguments and returns them
- */
-
-#define NULLPROC ((rpcproc_t)0)
-
-/*
- * Below are the client handle creation routines for the various
- * implementations of client side rpc.  They can return NULL if a
- * creation failure occurs.
- */
-
-/*
- * Generic client creation routine. Supported protocols are those that
- * belong to the nettype namespace (/etc/netconfig).
- */
-__BEGIN_DECLS
-extern CLIENT *clnt_create(const char *, const rpcprog_t, const rpcvers_t,
-			   const char *);
-/*
- *
- * 	const char *hostname;			-- hostname
- *	const rpcprog_t prog;			-- program number
- *	const rpcvers_t vers;			-- version number
- *	const char *nettype;			-- network type
- */
-
- /*
- * Generic client creation routine. Just like clnt_create(), except
- * it takes an additional timeout parameter.
- */
-extern CLIENT * clnt_create_timed(const char *, const rpcprog_t,
-	const rpcvers_t, const char *, const struct timeval *);
-/*
- *
- *	const char *hostname;			-- hostname
- *	const rpcprog_t prog;			-- program number
- *	const rpcvers_t vers;			-- version number
- *	const char *nettype;			-- network type
- *	const struct timeval *tp;		-- timeout
- */
-
-/*
- * Generic client creation routine. Supported protocols are which belong
- * to the nettype name space.
- */
-extern CLIENT *clnt_create_vers(const char *, const rpcprog_t, rpcvers_t *,
-				const rpcvers_t, const rpcvers_t,
-				const char *);
-/*
- *	const char *host;		-- hostname
- *	const rpcprog_t prog;		-- program number
- *	rpcvers_t *vers_out;		-- servers highest available version
- *	const rpcvers_t vers_low;	-- low version number
- *	const rpcvers_t vers_high;	-- high version number
- *	const char *nettype;		-- network type
- */
-
-/*
- * Generic client creation routine. Supported protocols are which belong
- * to the nettype name space.
- */
-extern CLIENT * clnt_create_vers_timed(const char *, const rpcprog_t,
-	rpcvers_t *, const rpcvers_t, const rpcvers_t, const char *,
-	const struct timeval *);
-/*
- *	const char *host;		-- hostname
- *	const rpcprog_t prog;		-- program number
- *	rpcvers_t *vers_out;		-- servers highest available version
- *	const rpcvers_t vers_low;	-- low version number
- *	const rpcvers_t vers_high;	-- high version number
- *	const char *nettype;		-- network type
- *	const struct timeval *tp	-- timeout
- */
-
-/*
- * Generic client creation routine. It takes a netconfig structure
- * instead of nettype
- */
-extern CLIENT *clnt_tp_create(const char *, const rpcprog_t,
-			      const rpcvers_t, const struct netconfig *);
-/*
- *	const char *hostname;			-- hostname
- *	const rpcprog_t prog;			-- program number
- *	const rpcvers_t vers;			-- version number
- *	const struct netconfig *netconf; 	-- network config structure
- */
-
-/*
- * Generic client creation routine. Just like clnt_tp_create(), except
- * it takes an additional timeout parameter.
- */
-extern CLIENT * clnt_tp_create_timed(const char *, const rpcprog_t,
-	const rpcvers_t, const struct netconfig *, const struct timeval *);
-/*
- *	const char *hostname;			-- hostname
- *	const rpcprog_t prog;			-- program number
- *	const rpcvers_t vers;			-- version number
- *	const struct netconfig *netconf; 	-- network config structure
- *	const struct timeval *tp		-- timeout
- */
-
-/*
- * Generic TLI create routine. Only provided for compatibility.
- */
-
-extern CLIENT *clnt_tli_create(const int, const struct netconfig *,
-			       struct netbuf *, const rpcprog_t,
-			       const rpcvers_t, const u_int, const u_int);
-/*
- *	const register int fd;		-- fd
- *	const struct netconfig *nconf;	-- netconfig structure
- *	struct netbuf *svcaddr;		-- servers address
- *	const u_long prog;			-- program number
- *	const u_long vers;			-- version number
- *	const u_int sendsz;			-- send size
- *	const u_int recvsz;			-- recv size
- */
-
-/*
- * Low level clnt create routine for connectionful transports, e.g. tcp.
- */
-extern CLIENT *clnt_vc_create(const int, const struct netbuf *,
-			      const rpcprog_t, const rpcvers_t,
-			      u_int, u_int);
-/*
- * Added for compatibility to old rpc 4.0. Obsoleted by clnt_vc_create().
- */
-extern CLIENT *clntunix_create(struct sockaddr_un *,
-			       u_long, u_long, int *, u_int, u_int);
-/*
- *	const int fd;				-- open file descriptor
- *	const struct netbuf *svcaddr;		-- servers address
- *	const rpcprog_t prog;			-- program number
- *	const rpcvers_t vers;			-- version number
- *	const u_int sendsz;			-- buffer recv size
- *	const u_int recvsz;			-- buffer send size
- */
-
-/*
- * Low level clnt create routine for connectionless transports, e.g. udp.
- */
-extern CLIENT *clnt_dg_create(const int, const struct netbuf *,
-			      const rpcprog_t, const rpcvers_t,
-			      const u_int, const u_int);
-/*
- *	const int fd;				-- open file descriptor
- *	const struct netbuf *svcaddr;		-- servers address
- *	const rpcprog_t program;		-- program number
- *	const rpcvers_t version;		-- version number
- *	const u_int sendsz;			-- buffer recv size
- *	const u_int recvsz;			-- buffer send size
- */
-
-/*
- * Memory based rpc (for speed check and testing)
- * CLIENT *
- * clnt_raw_create(prog, vers)
- *	u_long prog;
- *	u_long vers;
- */
-extern CLIENT *clnt_raw_create(rpcprog_t, rpcvers_t);
-
-__END_DECLS
-
-
-/*
- * Print why creation failed
- */
-__BEGIN_DECLS
-extern void clnt_pcreateerror(const char *);			/* stderr */
-extern char *clnt_spcreateerror(const char *);			/* string */
-__END_DECLS
-
-/*
- * Like clnt_perror(), but is more verbose in its output
- */
-__BEGIN_DECLS
-extern void clnt_perrno(enum clnt_stat);		/* stderr */
-extern char *clnt_sperrno(enum clnt_stat);		/* string */
-__END_DECLS
-
-/*
- * Print an English error message, given the client error code
- */
-__BEGIN_DECLS
-extern void clnt_perror(CLIENT *, const char *);	 	/* stderr */
-extern char *clnt_sperror(CLIENT *, const char *);		/* string */
-__END_DECLS
-
-
-/*
- * If a creation fails, the following allows the user to figure out why.
- */
-struct rpc_createerr {
-	enum clnt_stat cf_stat;
-	struct rpc_err cf_error; /* useful when cf_stat == RPC_PMAPFAILURE */
-};
-
-__BEGIN_DECLS
-extern struct rpc_createerr	*__rpc_createerr(void);
-__END_DECLS
-#define rpc_createerr		(*(__rpc_createerr()))
-
-/*
- * The simplified interface:
- * enum clnt_stat
- * rpc_call(host, prognum, versnum, procnum, inproc, in, outproc, out, nettype)
- *	const char *host;
- *	const rpcprog_t prognum;
- *	const rpcvers_t versnum;
- *	const rpcproc_t procnum;
- *	const xdrproc_t inproc, outproc;
- *	const char *in;
- *	char *out;
- *	const char *nettype;
- */
-__BEGIN_DECLS
-extern enum clnt_stat rpc_call(const char *, const rpcprog_t,
-			       const rpcvers_t, const rpcproc_t,
-			       const xdrproc_t, const char *,
-			       const xdrproc_t, char *, const char *);
-__END_DECLS
-
-/*
- * RPC broadcast interface
- * The call is broadcasted to all locally connected nets.
- *
- * extern enum clnt_stat
- * rpc_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp,
- *			eachresult, nettype)
- *	const rpcprog_t		prog;		-- program number
- *	const rpcvers_t		vers;		-- version number
- *	const rpcproc_t		proc;		-- procedure number
- *	const xdrproc_t	xargs;		-- xdr routine for args
- *	caddr_t		argsp;		-- pointer to args
- *	const xdrproc_t	xresults;	-- xdr routine for results
- *	caddr_t		resultsp;	-- pointer to results
- *	const resultproc_t	eachresult;	-- call with each result
- *	const char		*nettype;	-- Transport type
- *
- * For each valid response received, the procedure eachresult is called.
- * Its form is:
- *		done = eachresult(resp, raddr, nconf)
- *			bool_t done;
- *			caddr_t resp;
- *			struct netbuf *raddr;
- *			struct netconfig *nconf;
- * where resp points to the results of the call and raddr is the
- * address if the responder to the broadcast.  nconf is the transport
- * on which the response was received.
- *
- * extern enum clnt_stat
- * rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp,
- *			eachresult, inittime, waittime, nettype)
- *	const rpcprog_t		prog;		-- program number
- *	const rpcvers_t		vers;		-- version number
- *	const rpcproc_t		proc;		-- procedure number
- *	const xdrproc_t	xargs;		-- xdr routine for args
- *	caddr_t		argsp;		-- pointer to args
- *	const xdrproc_t	xresults;	-- xdr routine for results
- *	caddr_t		resultsp;	-- pointer to results
- *	const resultproc_t	eachresult;	-- call with each result
- *	const int 		inittime;	-- how long to wait initially
- *	const int 		waittime;	-- maximum time to wait
- *	const char		*nettype;	-- Transport type
- */
-
-typedef bool_t (*resultproc_t)(caddr_t, ...);
-
-__BEGIN_DECLS
-extern enum clnt_stat rpc_broadcast(const rpcprog_t, const rpcvers_t,
-				    const rpcproc_t, const xdrproc_t,
-				    caddr_t, const xdrproc_t, caddr_t,
-				    const resultproc_t, const char *);
-extern enum clnt_stat rpc_broadcast_exp(const rpcprog_t, const rpcvers_t,
-					const rpcproc_t, const xdrproc_t,
-					caddr_t, const xdrproc_t, caddr_t,
-					const resultproc_t, const int,
-					const int, const char *);
-__END_DECLS
-
-/* For backward compatibility */
-#include <rpc/clnt_soc.h>
-
-#endif /* !_RPC_CLNT_H_ */
diff --git a/include.new/rpc/clnt_soc.h b/include.new/rpc/clnt_soc.h
deleted file mode 100644
index 28d041f..0000000
--- a/include.new/rpc/clnt_soc.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*	$NetBSD: clnt_soc.h,v 1.1 2000/06/02 22:57:55 fvdl Exp $	*/
-/*	$FreeBSD: releng/10.2/include/rpc/clnt_soc.h 261046 2014-01-22 23:45:27Z mav $ */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1984 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * clnt.h - Client side remote procedure call interface.
- */
-
-#ifndef _RPC_CLNT_SOC_H
-#define _RPC_CLNT_SOC_H
-
-/* derived from clnt_soc.h 1.3 88/12/17 SMI     */
-
-/*
- * All the following declarations are only for backward compatibility
- * with TS-RPC.
- */
-
-#include <sys/cdefs.h>
-
-#define UDPMSGSIZE      8800    /* rpc imposed limit on udp msg size */  
-
-/*
- * TCP based rpc
- * CLIENT *
- * clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
- *	struct sockaddr_in *raddr;
- *	u_long prog;
- *	u_long version;
- *	register int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-__BEGIN_DECLS
-extern CLIENT *clnttcp_create(struct sockaddr_in *, u_long, u_long, int *,
-			      u_int, u_int);
-__END_DECLS
-
-/*
- * Raw (memory) rpc.
- */
-__BEGIN_DECLS
-extern CLIENT *clntraw_create(u_long, u_long);
-__END_DECLS
-
-
-/*
- * UDP based rpc.
- * CLIENT *
- * clntudp_create(raddr, program, version, wait, sockp)
- *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait;
- *	int *sockp;
- *
- * Same as above, but you specify max packet sizes.
- * CLIENT *
- * clntudp_bufcreate(raddr, program, version, wait, sockp, sendsz, recvsz)
- *	struct sockaddr_in *raddr;
- *	u_long program;
- *	u_long version;
- *	struct timeval wait;
- *	int *sockp;
- *	u_int sendsz;
- *	u_int recvsz;
- */
-__BEGIN_DECLS
-extern CLIENT *clntudp_create(struct sockaddr_in *, u_long, u_long, 
-			      struct timeval, int *);
-extern CLIENT *clntudp_bufcreate(struct sockaddr_in *, u_long, u_long,
-				 struct timeval, int *, u_int, u_int);
-__END_DECLS
-
-#endif /* _RPC_CLNT_SOC_H */
diff --git a/include.new/rpc/clnt_stat.h b/include.new/rpc/clnt_stat.h
deleted file mode 100644
index 0d3128c..0000000
--- a/include.new/rpc/clnt_stat.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$FreeBSD: releng/10.2/include/rpc/clnt_stat.h 74509 2001-03-20 08:20:50Z alfred $ */
-/*
- * Copyright (c) 1986 - 1991, 1994, 1996, 1997 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-/*
- * clnt_stat.h - Client side remote procedure call enum
- *
- */
-
-#ifndef	_RPC_CLNT_STAT_H
-#define	_RPC_CLNT_STAT_H
-
-/* #pragma ident	"@(#)clnt_stat.h	1.2	97/04/28 SMI" */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum clnt_stat {
-	RPC_SUCCESS = 0,			/* call succeeded */
-	/*
-	 * local errors
-	 */
-	RPC_CANTENCODEARGS = 1,		/* can't encode arguments */
-	RPC_CANTDECODERES = 2,		/* can't decode results */
-	RPC_CANTSEND = 3,			/* failure in sending call */
-	RPC_CANTRECV = 4,
-	/* failure in receiving result */
-	RPC_TIMEDOUT = 5,			/* call timed out */
-	RPC_INTR = 18,			/* call interrupted */
-	RPC_UDERROR = 23,			/* recv got uderr indication */
-	/*
-	 * remote errors
-	 */
-	RPC_VERSMISMATCH = 6,		/* rpc versions not compatible */
-	RPC_AUTHERROR = 7,		/* authentication error */
-	RPC_PROGUNAVAIL = 8,		/* program not available */
-	RPC_PROGVERSMISMATCH = 9,	/* program version mismatched */
-	RPC_PROCUNAVAIL = 10,		/* procedure unavailable */
-	RPC_CANTDECODEARGS = 11,		/* decode arguments error */
-	RPC_SYSTEMERROR = 12,		/* generic "other problem" */
-
-	/*
-	 * rpc_call & clnt_create errors
-	 */
-	RPC_UNKNOWNHOST = 13,		/* unknown host name */
-	RPC_UNKNOWNPROTO = 17,		/* unknown protocol */
-	RPC_UNKNOWNADDR = 19,		/* Remote address unknown */
-	RPC_NOBROADCAST = 21,		/* Broadcasting not supported */
-
-	/*
-	 * rpcbind errors
-	 */
-	RPC_RPCBFAILURE = 14,		/* the pmapper failed in its call */
-#define	RPC_PMAPFAILURE RPC_RPCBFAILURE
-	RPC_PROGNOTREGISTERED = 15,	/* remote program is not registered */
-	RPC_N2AXLATEFAILURE = 22,
-	/* Name to address translation failed */
-	/*
-	 * Misc error in the TLI library
-	 */
-	RPC_TLIERROR = 20,
-	/*
-	 * unspecified error
-	 */
-	RPC_FAILED = 16,
-	/*
-	 * asynchronous errors
-	 */
-	RPC_INPROGRESS = 24,
-	RPC_STALERACHANDLE = 25,
-	RPC_CANTCONNECT = 26,		/* couldn't make connection (cots) */
-	RPC_XPRTFAILED = 27,		/* received discon from remote (cots) */
-	RPC_CANTCREATESTREAM = 28	/* can't push rpc module (cots) */
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* !_RPC_CLNT_STAT_H */
diff --git a/include.new/rpc/des.h b/include.new/rpc/des.h
deleted file mode 100644
index 1e0d84b..0000000
--- a/include.new/rpc/des.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*  @(#)des.h	2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI  */
-/* $FreeBSD: releng/10.2/include/rpc/des.h 261046 2014-01-22 23:45:27Z mav $ */
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Generic DES driver interface
- * Keep this file hardware independent!
- * Copyright (c) 1986 by Sun Microsystems, Inc.
- */
-
-#define DES_MAXLEN 	65536	/* maximum # of bytes to encrypt  */
-#define DES_QUICKLEN	16	/* maximum # of bytes to encrypt quickly */
-
-enum desdir { ENCRYPT, DECRYPT };
-enum desmode { CBC, ECB };
-
-/*
- * parameters to ioctl call
- */
-struct desparams {
-	u_char des_key[8];	/* key (with low bit parity) */
-	enum desdir des_dir;	/* direction */
-	enum desmode des_mode;	/* mode */
-	u_char des_ivec[8];	/* input vector */
-	unsigned des_len;	/* number of bytes to crypt */
-	union {
-		u_char UDES_data[DES_QUICKLEN];
-		u_char *UDES_buf;
-	} UDES;
-#	define des_data UDES.UDES_data	/* direct data here if quick */
-#	define des_buf	UDES.UDES_buf	/* otherwise, pointer to data */
-};
-
-#ifdef notdef
-
-/*
- * These ioctls are only implemented in SunOS. Maybe someday
- * if somebody writes a driver for DES hardware that works
- * with FreeBSD, we can being that back.
- */
-
-/*
- * Encrypt an arbitrary sized buffer
- */
-#define	DESIOCBLOCK	_IOWR('d', 6, struct desparams)
-
-/* 
- * Encrypt of small amount of data, quickly
- */
-#define DESIOCQUICK	_IOWR('d', 7, struct desparams) 
-
-#endif
-
-/*
- * Software DES.
- */
-extern int _des_crypt( char *, int, struct desparams * );
diff --git a/include.new/rpc/des_crypt.h b/include.new/rpc/des_crypt.h
deleted file mode 100644
index cc55a27..0000000
--- a/include.new/rpc/des_crypt.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * @(#)des_crypt.h	2.1 88/08/11 4.0 RPCSRC;	from 1.4 88/02/08 (C) 1986 SMI
- * $FreeBSD: releng/10.2/include/rpc/des_crypt.h 261046 2014-01-22 23:45:27Z mav $
- *
- * des_crypt.h, des library routine interface
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * des_crypt.h, des library routine interface
- */
-
-#ifndef _DES_DES_CRYPT_H
-#define _DES_DES_CRYPT_H
-
-#include <sys/cdefs.h>
-#include <rpc/rpc.h>
-
-#define DES_MAXDATA 8192	/* max bytes encrypted in one call */
-#define DES_DIRMASK (1 << 0)
-#define DES_ENCRYPT (0*DES_DIRMASK)	/* Encrypt */
-#define DES_DECRYPT (1*DES_DIRMASK)	/* Decrypt */
-
-
-#define DES_DEVMASK (1 << 1)
-#define	DES_HW (0*DES_DEVMASK)	/* Use hardware device */ 
-#define DES_SW (1*DES_DEVMASK)	/* Use software device */
-
-
-#define DESERR_NONE 0	/* succeeded */
-#define DESERR_NOHWDEVICE 1	/* succeeded, but hw device not available */
-#define DESERR_HWERROR 2	/* failed, hardware/driver error */
-#define DESERR_BADPARAM 3	/* failed, bad parameter to call */
-
-#define DES_FAILED(err) \
-	((err) > DESERR_NOHWDEVICE)
-
-/*
- * cbc_crypt()
- * ecb_crypt()
- *
- * Encrypt (or decrypt) len bytes of a buffer buf.
- * The length must be a multiple of eight.
- * The key should have odd parity in the low bit of each byte.
- * ivec is the input vector, and is updated to the new one (cbc only).
- * The mode is created by oring together the appropriate parameters.
- * DESERR_NOHWDEVICE is returned if DES_HW was specified but
- * there was no hardware to do it on (the data will still be
- * encrypted though, in software).
- */
-
-
-/*
- * Cipher Block Chaining mode
- */
-__BEGIN_DECLS
-int cbc_crypt( char *, char *, unsigned int, unsigned int, char *);
-__END_DECLS
-
-/*
- * Electronic Code Book mode
- */
-__BEGIN_DECLS
-int ecb_crypt( char *, char *, unsigned int, unsigned int );
-__END_DECLS
-
-/* 
- * Set des parity for a key.
- * DES parity is odd and in the low bit of each byte
- */
-__BEGIN_DECLS
-void des_setparity( char *);
-__END_DECLS
-
-#endif  /* _DES_DES_CRYPT_H */
diff --git a/include.new/rpc/key_prot.h b/include.new/rpc/key_prot.h
deleted file mode 100644
index cdfef87..0000000
--- a/include.new/rpc/key_prot.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _KEY_PROT_H_RPCGEN
-#define	_KEY_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-/* From: #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
-/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/key_prot.x 272850 2014-10-09 23:05:32Z hrs $");
-
-/* 
- * Compiled from key_prot.x using rpcgen.
- * DO NOT EDIT THIS FILE!
- * This is NOT source code!
- */
-#define	PROOT 3
-#define	HEXMODULUS "d4a0ba0250b6fd2ec626e7efd637df76c716e22d0944b88b"
-#define	HEXKEYBYTES 48
-#define	KEYSIZE 192
-#define	KEYBYTES 24
-#define	KEYCHECKSUMSIZE 16
-
-enum keystatus {
-	KEY_SUCCESS = 0,
-	KEY_NOSECRET = 1,
-	KEY_UNKNOWN = 2,
-	KEY_SYSTEMERR = 3
-};
-typedef enum keystatus keystatus;
-
-typedef char keybuf[HEXKEYBYTES];
-
-typedef char *netnamestr;
-
-struct cryptkeyarg {
-	netnamestr remotename;
-	des_block deskey;
-};
-typedef struct cryptkeyarg cryptkeyarg;
-
-struct cryptkeyarg2 {
-	netnamestr remotename;
-	netobj remotekey;
-	des_block deskey;
-};
-typedef struct cryptkeyarg2 cryptkeyarg2;
-
-struct cryptkeyres {
-	keystatus status;
-	union {
-		des_block deskey;
-	} cryptkeyres_u;
-};
-typedef struct cryptkeyres cryptkeyres;
-#define	MAXGIDS 16
-
-struct unixcred {
-	u_int uid;
-	u_int gid;
-	struct {
-		u_int gids_len;
-		u_int *gids_val;
-	} gids;
-};
-typedef struct unixcred unixcred;
-
-struct getcredres {
-	keystatus status;
-	union {
-		unixcred cred;
-	} getcredres_u;
-};
-typedef struct getcredres getcredres;
-
-struct key_netstarg {
-	keybuf st_priv_key;
-	keybuf st_pub_key;
-	netnamestr st_netname;
-};
-typedef struct key_netstarg key_netstarg;
-
-struct key_netstres {
-	keystatus status;
-	union {
-		key_netstarg knet;
-	} key_netstres_u;
-};
-typedef struct key_netstres key_netstres;
-
-#ifndef opaque
-#define opaque char
-#endif
-
-
-#define	KEY_PROG ((unsigned long)(100029))
-#define	KEY_VERS ((unsigned long)(1))
-
-extern  void key_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	KEY_SET ((unsigned long)(1))
-extern  keystatus * key_set_1(char *, CLIENT *);
-extern  keystatus * key_set_1_svc(char *, struct svc_req *);
-#define	KEY_ENCRYPT ((unsigned long)(2))
-extern  cryptkeyres * key_encrypt_1(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_encrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define	KEY_DECRYPT ((unsigned long)(3))
-extern  cryptkeyres * key_decrypt_1(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_decrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define	KEY_GEN ((unsigned long)(4))
-extern  des_block * key_gen_1(void *, CLIENT *);
-extern  des_block * key_gen_1_svc(void *, struct svc_req *);
-#define	KEY_GETCRED ((unsigned long)(5))
-extern  getcredres * key_getcred_1(netnamestr *, CLIENT *);
-extern  getcredres * key_getcred_1_svc(netnamestr *, struct svc_req *);
-extern int key_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	KEY_VERS2 ((unsigned long)(2))
-
-extern  void key_prog_2(struct svc_req *rqstp, SVCXPRT *transp);
-extern  keystatus * key_set_2(char *, CLIENT *);
-extern  keystatus * key_set_2_svc(char *, struct svc_req *);
-extern  cryptkeyres * key_encrypt_2(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_encrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern  cryptkeyres * key_decrypt_2(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_decrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern  des_block * key_gen_2(void *, CLIENT *);
-extern  des_block * key_gen_2_svc(void *, struct svc_req *);
-extern  getcredres * key_getcred_2(netnamestr *, CLIENT *);
-extern  getcredres * key_getcred_2_svc(netnamestr *, struct svc_req *);
-#define	KEY_ENCRYPT_PK ((unsigned long)(6))
-extern  cryptkeyres * key_encrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern  cryptkeyres * key_encrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define	KEY_DECRYPT_PK ((unsigned long)(7))
-extern  cryptkeyres * key_decrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern  cryptkeyres * key_decrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define	KEY_NET_PUT ((unsigned long)(8))
-extern  keystatus * key_net_put_2(key_netstarg *, CLIENT *);
-extern  keystatus * key_net_put_2_svc(key_netstarg *, struct svc_req *);
-#define	KEY_NET_GET ((unsigned long)(9))
-extern  key_netstres * key_net_get_2(void *, CLIENT *);
-extern  key_netstres * key_net_get_2_svc(void *, struct svc_req *);
-#define	KEY_GET_CONV ((unsigned long)(10))
-extern  cryptkeyres * key_get_conv_2(char *, CLIENT *);
-extern  cryptkeyres * key_get_conv_2_svc(char *, struct svc_req *);
-extern int key_prog_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_keystatus(XDR *, keystatus*);
-extern  bool_t xdr_keybuf(XDR *, keybuf);
-extern  bool_t xdr_netnamestr(XDR *, netnamestr*);
-extern  bool_t xdr_cryptkeyarg(XDR *, cryptkeyarg*);
-extern  bool_t xdr_cryptkeyarg2(XDR *, cryptkeyarg2*);
-extern  bool_t xdr_cryptkeyres(XDR *, cryptkeyres*);
-extern  bool_t xdr_unixcred(XDR *, unixcred*);
-extern  bool_t xdr_getcredres(XDR *, getcredres*);
-extern  bool_t xdr_key_netstarg(XDR *, key_netstarg*);
-extern  bool_t xdr_key_netstres(XDR *, key_netstres*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_KEY_PROT_H_RPCGEN */
diff --git a/include.new/rpc/nettype.h b/include.new/rpc/nettype.h
deleted file mode 100644
index 3409f2a..0000000
--- a/include.new/rpc/nettype.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: nettype.h,v 1.2 2000/07/06 03:17:19 christos Exp $	*/
-/*	$FreeBSD: releng/10.2/include/rpc/nettype.h 261046 2014-01-22 23:45:27Z mav $ */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * nettype.h, Nettype definitions.
- * All for the topmost layer of rpc
- *
- */
-
-#ifndef	_RPC_NETTYPE_H
-#define	_RPC_NETTYPE_H
-
-#include <netconfig.h>
-
-#define	_RPC_NONE	0
-#define	_RPC_NETPATH	1
-#define	_RPC_VISIBLE	2
-#define	_RPC_CIRCUIT_V	3
-#define	_RPC_DATAGRAM_V	4
-#define	_RPC_CIRCUIT_N	5
-#define	_RPC_DATAGRAM_N	6
-#define	_RPC_TCP	7
-#define	_RPC_UDP	8
-
-__BEGIN_DECLS
-extern void *__rpc_setconf(const char *);
-extern void __rpc_endconf(void *);
-extern struct netconfig *__rpc_getconf(void *);
-extern struct netconfig *__rpc_getconfip(const char *);
-__END_DECLS
-
-#endif	/* !_RPC_NETTYPE_H */
diff --git a/include.new/rpc/pmap_clnt.h b/include.new/rpc/pmap_clnt.h
deleted file mode 100644
index 05d6e01..0000000
--- a/include.new/rpc/pmap_clnt.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: pmap_clnt.h,v 1.9 2000/06/02 22:57:55 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI 
- *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: releng/10.2/include/rpc/pmap_clnt.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * pmap_clnt.h
- * Supplies C routines to get to portmap services.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-/*
- * Usage:
- *	success = pmap_set(program, version, protocol, port);
- *	success = pmap_unset(program, version);
- *	port = pmap_getport(address, program, version, protocol);
- *	head = pmap_getmaps(address);
- *	clnt_stat = pmap_rmtcall(address, program, version, procedure,
- *		xdrargs, argsp, xdrres, resp, tout, port_ptr)
- *		(works for udp only.)
- * 	clnt_stat = clnt_broadcast(program, version, procedure,
- *		xdrargs, argsp,	xdrres, resp, eachresult)
- *		(like pmap_rmtcall, except the call is broadcasted to all
- *		locally connected nets.  For each valid response received,
- *		the procedure eachresult is called.  Its form is:
- *	done = eachresult(resp, raddr)
- *		bool_t done;
- *		caddr_t resp;
- *		struct sockaddr_in raddr;
- *		where resp points to the results of the call and raddr is the
- *		address if the responder to the broadcast.
- */
-
-#ifndef _RPC_PMAP_CLNT_H_
-#define _RPC_PMAP_CLNT_H_
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern bool_t		pmap_set(u_long, u_long, int, int);
-extern bool_t		pmap_unset(u_long, u_long);
-extern struct pmaplist	*pmap_getmaps(struct sockaddr_in *);
-extern enum clnt_stat	pmap_rmtcall(struct sockaddr_in *,
-				     u_long, u_long, u_long,
-				     xdrproc_t, caddr_t,
-				     xdrproc_t, caddr_t,
-				     struct timeval, u_long *);
-extern enum clnt_stat	clnt_broadcast(u_long, u_long, u_long,
-				       xdrproc_t, void *,
-				       xdrproc_t, void *,
-				       resultproc_t);
-extern u_short		pmap_getport(struct sockaddr_in *,
-				     u_long, u_long, u_int);
-__END_DECLS
-
-#endif /* !_RPC_PMAP_CLNT_H_ */
diff --git a/include.new/rpc/pmap_prot.h b/include.new/rpc/pmap_prot.h
deleted file mode 100644
index 73f9e87..0000000
--- a/include.new/rpc/pmap_prot.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*	$NetBSD: pmap_prot.h,v 1.8 2000/06/02 22:57:55 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI 
- *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: releng/10.2/include/rpc/pmap_prot.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * pmap_prot.h
- * Protocol for the local binder service, or pmap.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * The following procedures are supported by the protocol:
- *
- * PMAPPROC_NULL() returns ()
- * 	takes nothing, returns nothing
- *
- * PMAPPROC_SET(struct pmap) returns (bool_t)
- * 	TRUE is success, FALSE is failure.  Registers the tuple
- *	[prog, vers, prot, port].
- *
- * PMAPPROC_UNSET(struct pmap) returns (bool_t)
- *	TRUE is success, FALSE is failure.  Un-registers pair
- *	[prog, vers].  prot and port are ignored.
- *
- * PMAPPROC_GETPORT(struct pmap) returns (long unsigned).
- *	0 is failure.  Otherwise returns the port number where the pair
- *	[prog, vers] is registered.  It may lie!
- *
- * PMAPPROC_DUMP() RETURNS (struct pmaplist *)
- *
- * PMAPPROC_CALLIT(unsigned, unsigned, unsigned, string<>)
- * 	RETURNS (port, string<>);
- * usage: encapsulatedresults = PMAPPROC_CALLIT(prog, vers, proc, encapsulatedargs);
- * 	Calls the procedure on the local machine.  If it is not registered,
- *	this procedure is quite; ie it does not return error information!!!
- *	This procedure only is supported on rpc/udp and calls via
- *	rpc/udp.  This routine only passes null authentication parameters.
- *	This file has no interface to xdr routines for PMAPPROC_CALLIT.
- *
- * The service supports remote procedure calls on udp/ip or tcp/ip socket 111.
- */
-
-#ifndef _RPC_PMAP_PROT_H
-#define _RPC_PMAP_PROT_H
-#include <sys/cdefs.h>
-
-#define PMAPPORT		((u_short)111)
-#define PMAPPROG		((u_long)100000)
-#define PMAPVERS		((u_long)2)
-#define PMAPVERS_PROTO		((u_long)2)
-#define PMAPVERS_ORIG		((u_long)1)
-#define PMAPPROC_NULL		((u_long)0)
-#define PMAPPROC_SET		((u_long)1)
-#define PMAPPROC_UNSET		((u_long)2)
-#define PMAPPROC_GETPORT	((u_long)3)
-#define PMAPPROC_DUMP		((u_long)4)
-#define PMAPPROC_CALLIT		((u_long)5)
-
-struct pmap {
-	long unsigned pm_prog;
-	long unsigned pm_vers;
-	long unsigned pm_prot;
-	long unsigned pm_port;
-};
-
-struct pmaplist {
-	struct pmap	pml_map;
-	struct pmaplist *pml_next;
-};
-
-__BEGIN_DECLS
-extern bool_t xdr_pmap(XDR *, struct pmap *);
-extern bool_t xdr_pmaplist(XDR *, struct pmaplist **);
-extern bool_t xdr_pmaplist_ptr(XDR *, struct pmaplist *);
-__END_DECLS
-
-#endif /* !_RPC_PMAP_PROT_H */
diff --git a/include.new/rpc/pmap_rmt.h b/include.new/rpc/pmap_rmt.h
deleted file mode 100644
index fd00755..0000000
--- a/include.new/rpc/pmap_rmt.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: pmap_rmt.h,v 1.7 1998/02/11 23:01:23 lukem Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
- *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: releng/10.2/include/rpc/pmap_rmt.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * Structures and XDR routines for parameters to and replies from
- * the portmapper remote-call-service.
- *
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_PMAP_RMT_H
-#define _RPC_PMAP_RMT_H
-#include <sys/cdefs.h>
-
-struct rmtcallargs {
-	u_long prog, vers, proc, arglen;
-	caddr_t args_ptr;
-	xdrproc_t xdr_args;
-};
-
-struct rmtcallres {
-	u_long *port_ptr;
-	u_long resultslen;
-	caddr_t results_ptr;
-	xdrproc_t xdr_results;
-};
-
-__BEGIN_DECLS
-extern bool_t xdr_rmtcall_args(XDR *, struct rmtcallargs *);
-extern bool_t xdr_rmtcallres(XDR *, struct rmtcallres *);
-__END_DECLS
-
-#endif /* !_RPC_PMAP_RMT_H */
diff --git a/include.new/rpc/raw.h b/include.new/rpc/raw.h
deleted file mode 100644
index 584ff63..0000000
--- a/include.new/rpc/raw.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: raw.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD: releng/10.2/include/rpc/raw.h 261046 2014-01-22 23:45:27Z mav $ */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_RAW_H
-#define	_RPC_RAW_H
-
-/* 	from: @(#)raw.h	1.11	94/04/25 SMI */
-/*	from: @(#)raw.h 1.2 88/10/25 SMI	*/
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * raw.h
- *
- * Raw interface
- * The common memory area over which they will communicate
- */
-extern char *__rpc_rawcombuf;
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _RPC_RAW_H */
diff --git a/include.new/rpc/rpc.h b/include.new/rpc/rpc.h
deleted file mode 100644
index 022b1d4..0000000
--- a/include.new/rpc/rpc.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*	$NetBSD: rpc.h,v 1.13 2000/06/02 22:57:56 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)rpc.h 1.9 88/02/08 SMI
- *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
- * $FreeBSD: releng/10.2/include/rpc/rpc.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * rpc.h, Just includes the billions of rpc header files necessary to
- * do remote procedure calling.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-#ifndef _RPC_RPC_H
-#define _RPC_RPC_H
-
-#include <rpc/types.h>		/* some typedefs */
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-/* external data representation interfaces */
-#include <rpc/xdr.h>		/* generic (de)serializer */
-
-/* Client side only authentication */
-#include <rpc/auth.h>		/* generic authenticator (client side) */
-
-/* Client side (mostly) remote procedure call */
-#include <rpc/clnt.h>		/* generic rpc stuff */
-
-/* semi-private protocol headers */
-#include <rpc/rpc_msg.h>	/* protocol for rpc messages */
-#include <rpc/auth_unix.h>	/* protocol for unix style cred */
-/*
- *  Uncomment-out the next line if you are building the rpc library with
- *  DES Authentication (see the README file in the secure_rpc/ directory).
- */
-#include <rpc/auth_des.h>	/* protocol for des style cred */
-
-/* Server side only remote procedure callee */
-#include <rpc/svc.h>		/* service manager and multiplexer */
-#include <rpc/svc_auth.h>	/* service side authenticator */
-
-/* Portmapper client, server, and protocol headers */
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_prot.h>
-
-#ifndef _KERNEL
-#include <rpc/rpcb_clnt.h>	/* rpcbind interface functions */
-#endif
-
-#include <rpc/rpcent.h>
-
-__BEGIN_DECLS
-extern int get_myaddress(struct sockaddr_in *);
-extern int bindresvport(int, struct sockaddr_in *);
-extern int registerrpc(int, int, int, char *(*)(char [UDPMSGSIZE]),
-    xdrproc_t, xdrproc_t);
-extern int callrpc(const char *, int, int, int, xdrproc_t, void *,
-    xdrproc_t , void *);
-extern int getrpcport(char *, int, int, int);
-
-char *taddr2uaddr(const struct netconfig *, const struct netbuf *);
-struct netbuf *uaddr2taddr(const struct netconfig *, const char *);
-
-struct sockaddr;
-extern int bindresvport_sa(int, struct sockaddr *);
-__END_DECLS
-
-/*
- * The following are not exported interfaces, they are for internal library
- * and rpcbind use only. Do not use, they may change without notice.
- */
-__BEGIN_DECLS
-int __rpc_nconf2fd(const struct netconfig *);
-int __rpc_nconf2sockinfo(const struct netconfig *, struct __rpc_sockinfo *);
-int __rpc_fd2sockinfo(int, struct __rpc_sockinfo *);
-u_int __rpc_get_t_size(int, int, int);
-__END_DECLS
-
-#endif /* !_RPC_RPC_H */
diff --git a/include.new/rpc/rpc_com.h b/include.new/rpc/rpc_com.h
deleted file mode 100644
index 3507a46..0000000
--- a/include.new/rpc/rpc_com.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $	*/
-/*	$FreeBSD: releng/10.2/include/rpc/rpc_com.h 261046 2014-01-22 23:45:27Z mav $ */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * rpc_com.h, Common definitions for both the server and client side.
- * All for the topmost layer of rpc
- *
- */
-
-#ifndef _RPC_RPCCOM_H
-#define	_RPC_RPCCOM_H
-
-#include <sys/cdefs.h>
-
-/* #pragma ident	"@(#)rpc_com.h	1.11	93/07/05 SMI" */
-
-/*
- * The max size of the transport, if the size cannot be determined
- * by other means.
- */
-#define	RPC_MAXDATASIZE 9000
-#define	RPC_MAXADDRSIZE 1024
-
-#define __RPC_GETXID(now) ((uint32_t)getpid() ^ (uint32_t)(now)->tv_sec ^ \
-    (uint32_t)(now)->tv_usec)
-
-__BEGIN_DECLS
-extern u_int __rpc_get_a_size(int);
-extern int __rpc_dtbsize(void);
-extern int _rpc_dtablesize(void);
-extern struct netconfig * __rpcgettp(int);
-extern  int  __rpc_get_default_domain(char **);
-
-char *__rpc_taddr2uaddr_af(int, const struct netbuf *);
-struct netbuf *__rpc_uaddr2taddr_af(int, const char *);
-int __rpc_fixup_addr(struct netbuf *, const struct netbuf *);
-int __rpc_sockinfo2netid(struct __rpc_sockinfo *, const char **);
-int __rpc_seman2socktype(int);
-int __rpc_socktype2seman(int);
-void *rpc_nullproc(CLIENT *);
-int __rpc_sockisbound(int);
-
-struct netbuf *__rpcb_findaddr(rpcprog_t, rpcvers_t, const struct netconfig *,
-			       const char *, CLIENT **);
-bool_t rpc_control(int,void *);
-
-char *_get_next_token(char *, int);
-
-__END_DECLS
-
-#endif /* _RPC_RPCCOM_H */
diff --git a/include.new/rpc/rpc_msg.h b/include.new/rpc/rpc_msg.h
deleted file mode 100644
index 10d7ffc..0000000
--- a/include.new/rpc/rpc_msg.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/*	$NetBSD: rpc_msg.h,v 1.11 2000/06/02 22:57:56 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
- *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: releng/10.2/include/rpc/rpc_msg.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * rpc_msg.h
- * rpc message definition
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_RPC_MSG_H
-#define _RPC_RPC_MSG_H
-
-#define RPC_MSG_VERSION		((uint32_t) 2)
-#define RPC_SERVICE_PORT	((u_short) 2048)
-
-/*
- * Bottom up definition of an rpc message.
- * NOTE: call and reply use the same overall stuct but
- * different parts of unions within it.
- */
-
-enum msg_type {
-	CALL=0,
-	REPLY=1
-};
-
-enum reply_stat {
-	MSG_ACCEPTED=0,
-	MSG_DENIED=1
-};
-
-enum accept_stat {
-	SUCCESS=0,
-	PROG_UNAVAIL=1,
-	PROG_MISMATCH=2,
-	PROC_UNAVAIL=3,
-	GARBAGE_ARGS=4,
-	SYSTEM_ERR=5
-};
-
-enum reject_stat {
-	RPC_MISMATCH=0,
-	AUTH_ERROR=1
-};
-
-/*
- * Reply part of an rpc exchange
- */
-
-/*
- * Reply to an rpc request that was accepted by the server.
- * Note: there could be an error even though the request was
- * accepted.
- */
-struct accepted_reply {
-	struct opaque_auth	ar_verf;
-	enum accept_stat	ar_stat;
-	union {
-		struct {
-			rpcvers_t low;
-			rpcvers_t high;
-		} AR_versions;
-		struct {
-			caddr_t	where;
-			xdrproc_t proc;
-		} AR_results;
-		/* and many other null cases */
-	} ru;
-#define	ar_results	ru.AR_results
-#define	ar_vers		ru.AR_versions
-};
-
-/*
- * Reply to an rpc request that was rejected by the server.
- */
-struct rejected_reply {
-	enum reject_stat rj_stat;
-	union {
-		struct {
-			rpcvers_t low;
-			rpcvers_t high;
-		} RJ_versions;
-		enum auth_stat RJ_why;  /* why authentication did not work */
-	} ru;
-#define	rj_vers	ru.RJ_versions
-#define	rj_why	ru.RJ_why
-};
-
-/*
- * Body of a reply to an rpc request.
- */
-struct reply_body {
-	enum reply_stat rp_stat;
-	union {
-		struct accepted_reply RP_ar;
-		struct rejected_reply RP_dr;
-	} ru;
-#define	rp_acpt	ru.RP_ar
-#define	rp_rjct	ru.RP_dr
-};
-
-/*
- * Body of an rpc request call.
- */
-struct call_body {
-	rpcvers_t cb_rpcvers;	/* must be equal to two */
-	rpcprog_t cb_prog;
-	rpcvers_t cb_vers;
-	rpcproc_t cb_proc;
-	struct opaque_auth cb_cred;
-	struct opaque_auth cb_verf; /* protocol specific - provided by client */
-};
-
-/*
- * The rpc message
- */
-struct rpc_msg {
-	uint32_t		rm_xid;
-	enum msg_type		rm_direction;
-	union {
-		struct call_body RM_cmb;
-		struct reply_body RM_rmb;
-	} ru;
-#define	rm_call		ru.RM_cmb
-#define	rm_reply	ru.RM_rmb
-};
-#define	acpted_rply	ru.RM_rmb.ru.RP_ar
-#define	rjcted_rply	ru.RM_rmb.ru.RP_dr
-
-__BEGIN_DECLS
-/*
- * XDR routine to handle a rpc message.
- * xdr_callmsg(xdrs, cmsg)
- * 	XDR *xdrs;
- * 	struct rpc_msg *cmsg;
- */
-extern bool_t	xdr_callmsg(XDR *, struct rpc_msg *);
-
-/*
- * XDR routine to pre-serialize the static part of a rpc message.
- * xdr_callhdr(xdrs, cmsg)
- * 	XDR *xdrs;
- * 	struct rpc_msg *cmsg;
- */
-extern bool_t	xdr_callhdr(XDR *, struct rpc_msg *);
-
-/*
- * XDR routine to handle a rpc reply.
- * xdr_replymsg(xdrs, rmsg)
- * 	XDR *xdrs;
- * 	struct rpc_msg *rmsg;
- */
-extern bool_t	xdr_replymsg(XDR *, struct rpc_msg *);
-
-
-/*
- * XDR routine to handle an accepted rpc reply.
- * xdr_accepted_reply(xdrs, rej)
- * 	XDR *xdrs;
- * 	struct accepted_reply *rej;
- */
-extern bool_t	xdr_accepted_reply(XDR *, struct accepted_reply *);
-
-/*
- * XDR routine to handle a rejected rpc reply.
- * xdr_rejected_reply(xdrs, rej)
- * 	XDR *xdrs;
- * 	struct rejected_reply *rej;
- */
-extern bool_t	xdr_rejected_reply(XDR *, struct rejected_reply *);
-
-/*
- * Fills in the error part of a reply message.
- * _seterr_reply(msg, error)
- * 	struct rpc_msg *msg;
- * 	struct rpc_err *error;
- */
-extern void	_seterr_reply(struct rpc_msg *, struct rpc_err *);
-__END_DECLS
-
-#endif /* !_RPC_RPC_MSG_H */
diff --git a/include.new/rpc/rpcb_clnt.h b/include.new/rpc/rpcb_clnt.h
deleted file mode 100644
index 41de435..0000000
--- a/include.new/rpc/rpcb_clnt.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*	$NetBSD: rpcb_clnt.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD: releng/10.2/include/rpc/rpcb_clnt.h 261046 2014-01-22 23:45:27Z mav $ */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * rpcb_clnt.h
- * Supplies C routines to get to rpcbid services.
- *
- */
-
-/*
- * Usage:
- *	success = rpcb_set(program, version, nconf, address);
- *	success = rpcb_unset(program, version, nconf);
- *	success = rpcb_getaddr(program, version, nconf, host);
- *	head = rpcb_getmaps(nconf, host);
- *	clnt_stat = rpcb_rmtcall(nconf, host, program, version, procedure,
- *		xdrargs, argsp, xdrres, resp, tout, addr_ptr)
- *	success = rpcb_gettime(host, timep)
- *	uaddr = rpcb_taddr2uaddr(nconf, taddr);
- *	taddr = rpcb_uaddr2uaddr(nconf, uaddr);
- */
-
-#ifndef _RPC_RPCB_CLNT_H
-#define	_RPC_RPCB_CLNT_H
-
-/* #pragma ident	"@(#)rpcb_clnt.h	1.13	94/04/25 SMI" */
-/* rpcb_clnt.h 1.3 88/12/05 SMI */
-
-#include <rpc/types.h>
-#include <rpc/rpcb_prot.h>
-
-__BEGIN_DECLS
-extern bool_t rpcb_set(const rpcprog_t, const rpcvers_t,
-		       const struct netconfig  *, const struct netbuf *);
-extern bool_t rpcb_unset(const rpcprog_t, const rpcvers_t,
-			 const struct netconfig *);
-extern rpcblist	*rpcb_getmaps(const struct netconfig *, const char *);
-extern enum clnt_stat rpcb_rmtcall(const struct netconfig *,
-				   const char *, const rpcprog_t,
-				   const rpcvers_t, const rpcproc_t,
-				   const xdrproc_t, const caddr_t,
-				   const xdrproc_t, const caddr_t,
-				   const struct timeval,
-				   const struct netbuf *);
-extern bool_t rpcb_getaddr(const rpcprog_t, const rpcvers_t,
-			   const struct netconfig *, struct netbuf *,
-			   const  char *);
-extern bool_t rpcb_gettime(const char *, time_t *);
-extern char *rpcb_taddr2uaddr(struct netconfig *, struct netbuf *);
-extern struct netbuf *rpcb_uaddr2taddr(struct netconfig *, char *);
-__END_DECLS
-
-#endif	/* !_RPC_RPCB_CLNT_H */
diff --git a/include.new/rpc/rpcb_prot.h b/include.new/rpc/rpcb_prot.h
deleted file mode 100644
index af81756..0000000
--- a/include.new/rpc/rpcb_prot.h
+++ /dev/null
@@ -1,576 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RPCB_PROT_H_RPCGEN
-#define	_RPCB_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*-
- * $FreeBSD: releng/10.2/include/rpc/rpcb_prot.x 261046 2014-01-22 23:45:27Z mav $
- *
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1988 by Sun Microsystems, Inc.
- */
-/* from rpcb_prot.x */
-
-/* #pragma ident	"@(#)rpcb_prot.x	1.5	94/04/29 SMI" */
-
-#ifndef _KERNEL
-
-
-/*
- * The following procedures are supported by the protocol in version 3:
- *
- * RPCBPROC_NULL() returns ()
- * 	takes nothing, returns nothing
- *
- * RPCBPROC_SET(rpcb) returns (bool_t)
- * 	TRUE is success, FALSE is failure.  Registers the tuple
- *	[prog, vers, address, owner, netid].
- *	Finds out owner and netid information on its own.
- *
- * RPCBPROC_UNSET(rpcb) returns (bool_t)
- *	TRUE is success, FALSE is failure.  Un-registers tuple
- *	[prog, vers, netid].  addresses is ignored.
- *	If netid is NULL, unregister all.
- *
- * RPCBPROC_GETADDR(rpcb) returns (string).
- *	0 is failure.  Otherwise returns the universal address where the
- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
- *
- * RPCBPROC_DUMP() RETURNS (rpcblist_ptr)
- *	used to dump the entire rpcbind maps
- *
- * RPCBPROC_CALLIT(rpcb_rmtcallargs)
- * 	RETURNS (rpcb_rmtcallres);
- * 	Calls the procedure on the remote machine.  If it is not registered,
- *	this procedure is quiet; i.e. it does not return error information!!!
- *	This routine only passes null authentication parameters.
- *	It has no interface to xdr routines for RPCBPROC_CALLIT.
- *
- * RPCBPROC_GETTIME() returns (int).
- *	Gets the remote machines time
- *
- * RPCBPROC_UADDR2TADDR(strint) RETURNS (struct netbuf)
- *	Returns the netbuf address from universal address.
- *
- * RPCBPROC_TADDR2UADDR(struct netbuf) RETURNS (string)
- *	Returns the universal address from netbuf address.
- *
- * END OF RPCBIND VERSION 3 PROCEDURES
- */
-/*
- * Except for RPCBPROC_CALLIT, the procedures above are carried over to
- * rpcbind version 4.  Those below are added or modified for version 4.
- * NOTE: RPCBPROC_BCAST HAS THE SAME FUNCTIONALITY AND PROCEDURE NUMBER
- * AS RPCBPROC_CALLIT.
- *
- * RPCBPROC_BCAST(rpcb_rmtcallargs)
- * 	RETURNS (rpcb_rmtcallres);
- * 	Calls the procedure on the remote machine.  If it is not registered,
- *	this procedure IS quiet; i.e. it DOES NOT return error information!!!
- *	This routine should be used for broadcasting and nothing else.
- *
- * RPCBPROC_GETVERSADDR(rpcb) returns (string).
- *	0 is failure.  Otherwise returns the universal address where the
- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
- *	Same as RPCBPROC_GETADDR except that if the given version number
- *	is not available, the address is not returned.
- *
- * RPCBPROC_INDIRECT(rpcb_rmtcallargs)
- * 	RETURNS (rpcb_rmtcallres);
- * 	Calls the procedure on the remote machine.  If it is not registered,
- *	this procedure is NOT quiet; i.e. it DOES return error information!!!
- * 	as any normal application would expect.
- *
- * RPCBPROC_GETADDRLIST(rpcb) returns (rpcb_entry_list_ptr).
- *	Same as RPCBPROC_GETADDR except that it returns a list of all the
- *	addresses registered for the combination (prog, vers) (for all
- *	transports).
- *
- * RPCBPROC_GETSTAT(void) returns (rpcb_stat_byvers)
- *	Returns the statistics about the kind of requests received by rpcbind.
- */
-
-/*
- * A mapping of (program, version, network ID) to address
- */
-
-struct rpcb {
-	rpcprog_t r_prog;
-	rpcvers_t r_vers;
-	char *r_netid;
-	char *r_addr;
-	char *r_owner;
-};
-typedef struct rpcb rpcb;
-
-typedef rpcb RPCB;
-
-
-/*
- * A list of mappings
- *
- * Below are two definitions for the rpcblist structure.  This is done because
- * xdr_rpcblist() is specified to take a struct rpcblist **, rather than a
- * struct rpcblist * that rpcgen would produce.  One version of the rpcblist
- * structure (actually called rp__list) is used with rpcgen, and the other is
- * defined only in the header file for compatibility with the specified
- * interface.
- */
-
-struct rp__list {
-	rpcb rpcb_map;
-	struct rp__list *rpcb_next;
-};
-typedef struct rp__list rp__list;
-
-typedef rp__list *rpcblist_ptr;
-
-typedef struct rp__list rpcblist;
-typedef struct rp__list RPCBLIST;
-
-#ifndef __cplusplus
-struct rpcblist {
- RPCB rpcb_map;
- struct rpcblist *rpcb_next;
-};
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-extern bool_t xdr_rpcblist(XDR *, rpcblist**);
-#ifdef __cplusplus
-}
-#endif
-
-
-/*
- * Arguments of remote calls
- */
-
-struct rpcb_rmtcallargs {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;
-	struct {
-		u_int args_len;
-		char *args_val;
-	} args;
-};
-typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
-
-/*
- * Client-side only representation of rpcb_rmtcallargs structure.
- *
- * The routine that XDRs the rpcb_rmtcallargs structure must deal with the
- * opaque arguments in the "args" structure.  xdr_rpcb_rmtcallargs() needs to
- * be passed the XDR routine that knows the args' structure.  This routine
- * doesn't need to go over-the-wire (and it wouldn't make sense anyway) since
- * the application being called already knows the args structure.  So we use a
- * different "XDR" structure on the client side, r_rpcb_rmtcallargs, which
- * includes the args' XDR routine.
- */
-struct r_rpcb_rmtcallargs {
- rpcprog_t prog;
- rpcvers_t vers;
- rpcproc_t proc;
- struct {
- u_int args_len;
- char *args_val;
- } args;
- xdrproc_t xdr_args; /* encodes args */
-};
-
-
-/*
- * Results of the remote call
- */
-
-struct rpcb_rmtcallres {
-	char *addr;
-	struct {
-		u_int results_len;
-		char *results_val;
-	} results;
-};
-typedef struct rpcb_rmtcallres rpcb_rmtcallres;
-
-/*
- * Client-side only representation of rpcb_rmtcallres structure.
- */
-struct r_rpcb_rmtcallres {
- char *addr;
- struct {
- uint32_t results_len;
- char *results_val;
- } results;
- xdrproc_t xdr_res; /* decodes results */
-};
-
-/*
- * rpcb_entry contains a merged address of a service on a particular
- * transport, plus associated netconfig information.  A list of rpcb_entrys
- * is returned by RPCBPROC_GETADDRLIST.  See netconfig.h for values used
- * in r_nc_* fields.
- */
-
-struct rpcb_entry {
-	char *r_maddr;
-	char *r_nc_netid;
-	u_int r_nc_semantics;
-	char *r_nc_protofmly;
-	char *r_nc_proto;
-};
-typedef struct rpcb_entry rpcb_entry;
-
-/*
- * A list of addresses supported by a service.
- */
-
-struct rpcb_entry_list {
-	rpcb_entry rpcb_entry_map;
-	struct rpcb_entry_list *rpcb_entry_next;
-};
-typedef struct rpcb_entry_list rpcb_entry_list;
-
-typedef rpcb_entry_list *rpcb_entry_list_ptr;
-
-/*
- * rpcbind statistics
- */
-
-#define	rpcb_highproc_2 RPCBPROC_CALLIT
-#define	rpcb_highproc_3 RPCBPROC_TADDR2UADDR
-#define	rpcb_highproc_4 RPCBPROC_GETSTAT
-#define	RPCBSTAT_HIGHPROC 13
-#define	RPCBVERS_STAT 3
-#define	RPCBVERS_4_STAT 2
-#define	RPCBVERS_3_STAT 1
-#define	RPCBVERS_2_STAT 0
-
-/* Link list of all the stats about getport and getaddr */
-
-struct rpcbs_addrlist {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	int success;
-	int failure;
-	char *netid;
-	struct rpcbs_addrlist *next;
-};
-typedef struct rpcbs_addrlist rpcbs_addrlist;
-
-/* Link list of all the stats about rmtcall */
-
-struct rpcbs_rmtcalllist {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;
-	int success;
-	int failure;
-	int indirect;
-	char *netid;
-	struct rpcbs_rmtcalllist *next;
-};
-typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
-
-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
-
-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
-
-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
-
-struct rpcb_stat {
-	rpcbs_proc info;
-	int setinfo;
-	int unsetinfo;
-	rpcbs_addrlist_ptr addrinfo;
-	rpcbs_rmtcalllist_ptr rmtinfo;
-};
-typedef struct rpcb_stat rpcb_stat;
-
-/*
- * One rpcb_stat structure is returned for each version of rpcbind
- * being monitored.
- */
-
-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
-
-/*
- * We don't define netbuf in RPCL, since it would contain structure member
- * names that would conflict with the definition of struct netbuf in
- * <tiuser.h>.  Instead we merely declare the XDR routine xdr_netbuf() here,
- * and implement it ourselves in rpc/rpcb_prot.c.
- */
-#ifdef __cplusplus
-extern "C" bool_t xdr_netbuf(XDR *, struct netbuf *);
-
-#else /* __STDC__ */
-extern bool_t xdr_netbuf(XDR *, struct netbuf *);
-
-#endif
-
-#define RPCBVERS_3 RPCBVERS
-#define RPCBVERS_4 RPCBVERS4
-
-#define _PATH_RPCBINDSOCK "/var/run/rpcbind.sock"
-
-#else /* ndef _KERNEL */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * A mapping of (program, version, network ID) to address
- */
-struct rpcb {
- rpcprog_t r_prog; /* program number */
- rpcvers_t r_vers; /* version number */
- char *r_netid; /* network id */
- char *r_addr; /* universal address */
- char *r_owner; /* owner of the mapping */
-};
-typedef struct rpcb RPCB;
-
-/*
- * A list of mappings
- */
-struct rpcblist {
- RPCB rpcb_map;
- struct rpcblist *rpcb_next;
-};
-typedef struct rpcblist RPCBLIST;
-typedef struct rpcblist *rpcblist_ptr;
-
-/*
- * Remote calls arguments
- */
-struct rpcb_rmtcallargs {
- rpcprog_t prog; /* program number */
- rpcvers_t vers; /* version number */
- rpcproc_t proc; /* procedure number */
- uint32_t arglen; /* arg len */
- caddr_t args_ptr; /* argument */
- xdrproc_t xdr_args; /* XDR routine for argument */
-};
-typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
-
-/*
- * Remote calls results
- */
-struct rpcb_rmtcallres {
- char *addr_ptr; /* remote universal address */
- uint32_t resultslen; /* results length */
- caddr_t results_ptr; /* results */
- xdrproc_t xdr_results; /* XDR routine for result */
-};
-typedef struct rpcb_rmtcallres rpcb_rmtcallres;
-
-struct rpcb_entry {
- char *r_maddr;
- char *r_nc_netid;
- unsigned int r_nc_semantics;
- char *r_nc_protofmly;
- char *r_nc_proto;
-};
-typedef struct rpcb_entry rpcb_entry;
-
-/*
- * A list of addresses supported by a service.
- */
-
-struct rpcb_entry_list {
- rpcb_entry rpcb_entry_map;
- struct rpcb_entry_list *rpcb_entry_next;
-};
-typedef struct rpcb_entry_list rpcb_entry_list;
-
-typedef rpcb_entry_list *rpcb_entry_list_ptr;
-
-/*
- * rpcbind statistics
- */
-
-#define rpcb_highproc_2 RPCBPROC_CALLIT
-#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR
-#define rpcb_highproc_4 RPCBPROC_GETSTAT
-#define RPCBSTAT_HIGHPROC 13
-#define RPCBVERS_STAT 3
-#define RPCBVERS_4_STAT 2
-#define RPCBVERS_3_STAT 1
-#define RPCBVERS_2_STAT 0
-
-/* Link list of all the stats about getport and getaddr */
-
-struct rpcbs_addrlist {
- rpcprog_t prog;
- rpcvers_t vers;
- int success;
- int failure;
- char *netid;
- struct rpcbs_addrlist *next;
-};
-typedef struct rpcbs_addrlist rpcbs_addrlist;
-
-/* Link list of all the stats about rmtcall */
-
-struct rpcbs_rmtcalllist {
- rpcprog_t prog;
- rpcvers_t vers;
- rpcproc_t proc;
- int success;
- int failure;
- int indirect;
- char *netid;
- struct rpcbs_rmtcalllist *next;
-};
-typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
-
-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
-
-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
-
-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
-
-struct rpcb_stat {
- rpcbs_proc info;
- int setinfo;
- int unsetinfo;
- rpcbs_addrlist_ptr addrinfo;
- rpcbs_rmtcalllist_ptr rmtinfo;
-};
-typedef struct rpcb_stat rpcb_stat;
-
-/*
- * One rpcb_stat structure is returned for each version of rpcbind
- * being monitored.
- */
-
-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ndef _KERNEL */
-
-#define	RPCBPROG ((unsigned long)(100000))
-#define	RPCBVERS ((unsigned long)(3))
-
-extern  void rpcbprog_3(struct svc_req *rqstp, SVCXPRT *transp);
-#define	RPCBPROC_SET ((unsigned long)(1))
-extern  bool_t * rpcbproc_set_3(rpcb *, CLIENT *);
-extern  bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *);
-#define	RPCBPROC_UNSET ((unsigned long)(2))
-extern  bool_t * rpcbproc_unset_3(rpcb *, CLIENT *);
-extern  bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *);
-#define	RPCBPROC_GETADDR ((unsigned long)(3))
-extern  char ** rpcbproc_getaddr_3(rpcb *, CLIENT *);
-extern  char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *);
-#define	RPCBPROC_DUMP ((unsigned long)(4))
-extern  rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *);
-extern  rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *);
-#define	RPCBPROC_CALLIT ((unsigned long)(5))
-extern  rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *);
-extern  rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *);
-#define	RPCBPROC_GETTIME ((unsigned long)(6))
-extern  u_int * rpcbproc_gettime_3(void *, CLIENT *);
-extern  u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *);
-#define	RPCBPROC_UADDR2TADDR ((unsigned long)(7))
-extern  struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *);
-extern  struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *);
-#define	RPCBPROC_TADDR2UADDR ((unsigned long)(8))
-extern  char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *);
-extern  char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *);
-extern int rpcbprog_3_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	RPCBVERS4 ((unsigned long)(4))
-
-extern  void rpcbprog_4(struct svc_req *rqstp, SVCXPRT *transp);
-extern  bool_t * rpcbproc_set_4(rpcb *, CLIENT *);
-extern  bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *);
-extern  bool_t * rpcbproc_unset_4(rpcb *, CLIENT *);
-extern  bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *);
-extern  char ** rpcbproc_getaddr_4(rpcb *, CLIENT *);
-extern  char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *);
-extern  rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *);
-extern  rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *);
-#define	RPCBPROC_BCAST ((unsigned long)(RPCBPROC_CALLIT))
-extern  rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *);
-extern  rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *);
-extern  u_int * rpcbproc_gettime_4(void *, CLIENT *);
-extern  u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *);
-extern  struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *);
-extern  struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *);
-extern  char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *);
-extern  char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *);
-#define	RPCBPROC_GETVERSADDR ((unsigned long)(9))
-extern  char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *);
-extern  char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *);
-#define	RPCBPROC_INDIRECT ((unsigned long)(10))
-extern  rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *);
-extern  rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *);
-#define	RPCBPROC_GETADDRLIST ((unsigned long)(11))
-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *);
-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *);
-#define	RPCBPROC_GETSTAT ((unsigned long)(12))
-extern  rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *);
-extern  rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *);
-extern int rpcbprog_4_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_rpcb(XDR *, rpcb*);
-extern  bool_t xdr_rp__list(XDR *, rp__list*);
-extern  bool_t xdr_rpcblist_ptr(XDR *, rpcblist_ptr*);
-extern  bool_t xdr_rpcb_rmtcallargs(XDR *, rpcb_rmtcallargs*);
-extern  bool_t xdr_rpcb_rmtcallres(XDR *, rpcb_rmtcallres*);
-extern  bool_t xdr_rpcb_entry(XDR *, rpcb_entry*);
-extern  bool_t xdr_rpcb_entry_list(XDR *, rpcb_entry_list*);
-extern  bool_t xdr_rpcb_entry_list_ptr(XDR *, rpcb_entry_list_ptr*);
-extern  bool_t xdr_rpcbs_addrlist(XDR *, rpcbs_addrlist*);
-extern  bool_t xdr_rpcbs_rmtcalllist(XDR *, rpcbs_rmtcalllist*);
-extern  bool_t xdr_rpcbs_proc(XDR *, rpcbs_proc);
-extern  bool_t xdr_rpcbs_addrlist_ptr(XDR *, rpcbs_addrlist_ptr*);
-extern  bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *, rpcbs_rmtcalllist_ptr*);
-extern  bool_t xdr_rpcb_stat(XDR *, rpcb_stat*);
-extern  bool_t xdr_rpcb_stat_byvers(XDR *, rpcb_stat_byvers);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RPCB_PROT_H_RPCGEN */
diff --git a/include.new/rpc/rpcb_prot.x b/include.new/rpc/rpcb_prot.x
deleted file mode 100644
index 8669099..0000000
--- a/include.new/rpc/rpcb_prot.x
+++ /dev/null
@@ -1,553 +0,0 @@
-%/*-
-% * $FreeBSD: releng/10.2/include/rpc/rpcb_prot.x 261046 2014-01-22 23:45:27Z mav $
-% *
-% * Copyright (c) 2009, Sun Microsystems, Inc.
-% * All rights reserved.
-% *
-% * Redistribution and use in source and binary forms, with or without
-% * modification, are permitted provided that the following conditions are met:
-% * - Redistributions of source code must retain the above copyright notice,
-% *   this list of conditions and the following disclaimer.
-% * - 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.
-% * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
-% */
-%/*
-% * Copyright (c) 1988 by Sun Microsystems, Inc.
-% */
-
-%/* from rpcb_prot.x */
-
-#ifdef RPC_HDR
-%
-%/* #pragma ident	"@(#)rpcb_prot.x	1.5	94/04/29 SMI" */
-%
-%#ifndef _KERNEL
-%
-#endif
-
-/*
- * rpcb_prot.x
- * rpcbind protocol, versions 3 and 4, in RPC Language
- */
-%
-%/*
-% * The following procedures are supported by the protocol in version 3:
-% *
-% * RPCBPROC_NULL() returns ()
-% * 	takes nothing, returns nothing
-% *
-% * RPCBPROC_SET(rpcb) returns (bool_t)
-% * 	TRUE is success, FALSE is failure.  Registers the tuple
-% *	[prog, vers, address, owner, netid].
-% *	Finds out owner and netid information on its own.
-% *
-% * RPCBPROC_UNSET(rpcb) returns (bool_t)
-% *	TRUE is success, FALSE is failure.  Un-registers tuple
-% *	[prog, vers, netid].  addresses is ignored.
-% *	If netid is NULL, unregister all.
-% *
-% * RPCBPROC_GETADDR(rpcb) returns (string).
-% *	0 is failure.  Otherwise returns the universal address where the
-% *	triple [prog, vers, netid] is registered.  Ignore address and owner.
-% *
-% * RPCBPROC_DUMP() RETURNS (rpcblist_ptr)
-% *	used to dump the entire rpcbind maps
-% *
-% * RPCBPROC_CALLIT(rpcb_rmtcallargs)
-% * 	RETURNS (rpcb_rmtcallres);
-% * 	Calls the procedure on the remote machine.  If it is not registered,
-% *	this procedure is quiet; i.e. it does not return error information!!!
-% *	This routine only passes null authentication parameters.
-% *	It has no interface to xdr routines for RPCBPROC_CALLIT.
-% *
-% * RPCBPROC_GETTIME() returns (int).
-% *	Gets the remote machines time
-% *
-% * RPCBPROC_UADDR2TADDR(strint) RETURNS (struct netbuf)
-% *	Returns the netbuf address from universal address.
-% *
-% * RPCBPROC_TADDR2UADDR(struct netbuf) RETURNS (string)
-% *	Returns the universal address from netbuf address.
-% *
-% * END OF RPCBIND VERSION 3 PROCEDURES
-% */
-%/*
-% * Except for RPCBPROC_CALLIT, the procedures above are carried over to
-% * rpcbind version 4.  Those below are added or modified for version 4.
-% * NOTE: RPCBPROC_BCAST HAS THE SAME FUNCTIONALITY AND PROCEDURE NUMBER
-% * AS RPCBPROC_CALLIT.
-% *
-% * RPCBPROC_BCAST(rpcb_rmtcallargs)
-% * 	RETURNS (rpcb_rmtcallres);
-% * 	Calls the procedure on the remote machine.  If it is not registered,
-% *	this procedure IS quiet; i.e. it DOES NOT return error information!!!
-% *	This routine should be used for broadcasting and nothing else.
-% *
-% * RPCBPROC_GETVERSADDR(rpcb) returns (string).
-% *	0 is failure.  Otherwise returns the universal address where the
-% *	triple [prog, vers, netid] is registered.  Ignore address and owner.
-% *	Same as RPCBPROC_GETADDR except that if the given version number
-% *	is not available, the address is not returned.
-% *
-% * RPCBPROC_INDIRECT(rpcb_rmtcallargs)
-% * 	RETURNS (rpcb_rmtcallres);
-% * 	Calls the procedure on the remote machine.  If it is not registered,
-% *	this procedure is NOT quiet; i.e. it DOES return error information!!!
-% * 	as any normal application would expect.
-% *
-% * RPCBPROC_GETADDRLIST(rpcb) returns (rpcb_entry_list_ptr).
-% *	Same as RPCBPROC_GETADDR except that it returns a list of all the
-% *	addresses registered for the combination (prog, vers) (for all
-% *	transports).
-% *
-% * RPCBPROC_GETSTAT(void) returns (rpcb_stat_byvers)
-% *	Returns the statistics about the kind of requests received by rpcbind.
-% */
-%
-%/*
-% * A mapping of (program, version, network ID) to address
-% */
-struct rpcb {
-	rpcprog_t r_prog;		/* program number */
-	rpcvers_t r_vers;		/* version number */
-	string r_netid<>;		/* network id */
-	string r_addr<>;		/* universal address */
-	string r_owner<>;		/* owner of this service */
-};
-#ifdef RPC_HDR
-%
-%typedef rpcb RPCB;
-%
-#endif
-%
-%/*
-% * A list of mappings
-% *
-% * Below are two definitions for the rpcblist structure.  This is done because
-% * xdr_rpcblist() is specified to take a struct rpcblist **, rather than a
-% * struct rpcblist * that rpcgen would produce.  One version of the rpcblist
-% * structure (actually called rp__list) is used with rpcgen, and the other is
-% * defined only in the header file for compatibility with the specified
-% * interface.
-% */
-
-struct rp__list {
-	rpcb rpcb_map;
-	struct rp__list *rpcb_next;
-};
-
-typedef rp__list *rpcblist_ptr;		/* results of RPCBPROC_DUMP */
-
-#ifdef RPC_HDR
-%
-%typedef struct rp__list rpcblist;
-%typedef struct rp__list RPCBLIST;
-%
-%#ifndef __cplusplus
-%struct rpcblist {
-%	RPCB rpcb_map;
-%	struct rpcblist *rpcb_next;
-%};
-%#endif
-%
-%#ifdef __cplusplus
-%extern "C" {
-%#endif
-%extern  bool_t xdr_rpcblist(XDR *, rpcblist**);
-%#ifdef	__cplusplus
-%}
-%#endif
-%
-#endif
-
-%
-%/*
-% * Arguments of remote calls
-% */
-struct rpcb_rmtcallargs {
-	rpcprog_t prog;			/* program number */
-	rpcvers_t vers;			/* version number */
-	rpcproc_t proc;			/* procedure number */
-	opaque args<>;			/* argument */
-};
-#ifdef RPC_HDR
-%
-%/*
-% * Client-side only representation of rpcb_rmtcallargs structure.
-% *
-% * The routine that XDRs the rpcb_rmtcallargs structure must deal with the
-% * opaque arguments in the "args" structure.  xdr_rpcb_rmtcallargs() needs to
-% * be passed the XDR routine that knows the args' structure.  This routine
-% * doesn't need to go over-the-wire (and it wouldn't make sense anyway) since
-% * the application being called already knows the args structure.  So we use a
-% * different "XDR" structure on the client side, r_rpcb_rmtcallargs, which
-% * includes the args' XDR routine.
-% */
-%struct r_rpcb_rmtcallargs {
-%	rpcprog_t prog;
-%	rpcvers_t vers;
-%	rpcproc_t proc;
-%	struct {
-%		u_int args_len;
-%		char *args_val;
-%	} args;
-%	xdrproc_t	xdr_args;	/* encodes args */
-%};
-%
-#endif	/* def RPC_HDR */
-%
-%/*
-% * Results of the remote call
-% */
-struct rpcb_rmtcallres {
-	string addr<>;			/* remote universal address */
-	opaque results<>;		/* result */
-};
-#ifdef RPC_HDR
-%
-%/*
-% * Client-side only representation of rpcb_rmtcallres structure.
-% */
-%struct r_rpcb_rmtcallres {
-%	char *addr;
-%	struct {
-%		uint32_t results_len;
-%		char *results_val;
-%	} results;
-%	xdrproc_t	xdr_res;	/* decodes results */
-%};
-#endif /* RPC_HDR */
-%
-%/*
-% * rpcb_entry contains a merged address of a service on a particular
-% * transport, plus associated netconfig information.  A list of rpcb_entrys
-% * is returned by RPCBPROC_GETADDRLIST.  See netconfig.h for values used
-% * in r_nc_* fields.
-% */
-struct rpcb_entry {
-	string		r_maddr<>;	/* merged address of service */
-	string		r_nc_netid<>;	/* netid field */
-	unsigned int	r_nc_semantics;	/* semantics of transport */
-	string		r_nc_protofmly<>; /* protocol family */
-	string		r_nc_proto<>;	/* protocol name */
-};
-%
-%/*
-% * A list of addresses supported by a service.
-% */
-struct rpcb_entry_list {
-	rpcb_entry rpcb_entry_map;
-	struct rpcb_entry_list *rpcb_entry_next;
-};
-
-typedef rpcb_entry_list *rpcb_entry_list_ptr;
-
-%
-%/*
-% * rpcbind statistics
-% */
-%
-const rpcb_highproc_2 = RPCBPROC_CALLIT;
-const rpcb_highproc_3 = RPCBPROC_TADDR2UADDR;
-const rpcb_highproc_4 = RPCBPROC_GETSTAT;
-
-const RPCBSTAT_HIGHPROC = 13;	/* # of procs in rpcbind V4 plus one */
-const RPCBVERS_STAT = 3;	/* provide only for rpcbind V2, V3 and V4 */
-const RPCBVERS_4_STAT = 2;
-const RPCBVERS_3_STAT = 1;
-const RPCBVERS_2_STAT = 0;
-%
-%/* Link list of all the stats about getport and getaddr */
-struct rpcbs_addrlist {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	int success;
-	int failure;
-	string netid<>;
-	struct rpcbs_addrlist *next;
-};
-%
-%/* Link list of all the stats about rmtcall */
-struct rpcbs_rmtcalllist {
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;
-	int success;
-	int failure;
-	int indirect;	/* whether callit or indirect */
-	string netid<>;
-	struct rpcbs_rmtcalllist *next;
-};
-
-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
-
-struct rpcb_stat {
-	rpcbs_proc		info;
-	int			setinfo;
-	int			unsetinfo;
-	rpcbs_addrlist_ptr	addrinfo;
-	rpcbs_rmtcalllist_ptr	rmtinfo;
-};
-%
-%/*
-% * One rpcb_stat structure is returned for each version of rpcbind
-% * being monitored.
-% */
-
-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
-
-#ifdef RPC_HDR
-%
-%/*
-% * We don't define netbuf in RPCL, since it would contain structure member
-% * names that would conflict with the definition of struct netbuf in
-% * <tiuser.h>.  Instead we merely declare the XDR routine xdr_netbuf() here,
-% * and implement it ourselves in rpc/rpcb_prot.c.
-% */
-%#ifdef __cplusplus
-%extern "C" bool_t xdr_netbuf(XDR *, struct netbuf *);
-%
-%#else /* __STDC__ */
-%extern  bool_t xdr_netbuf(XDR *, struct netbuf *);
-%
-%#endif
-#endif /* def RPC_HDR */
-
-/*
- * rpcbind procedures
- */
-program RPCBPROG {
-	version RPCBVERS {
-		bool
-		RPCBPROC_SET(rpcb) = 1;
-
-		bool
-		RPCBPROC_UNSET(rpcb) = 2;
-
-		string
-		RPCBPROC_GETADDR(rpcb) = 3;
-
-		rpcblist_ptr
-		RPCBPROC_DUMP(void) = 4;
-
-		rpcb_rmtcallres
-		RPCBPROC_CALLIT(rpcb_rmtcallargs) = 5;
-
-		unsigned int
-		RPCBPROC_GETTIME(void) = 6;
-
-		struct netbuf
-		RPCBPROC_UADDR2TADDR(string) = 7;
-
-		string
-		RPCBPROC_TADDR2UADDR(struct netbuf) = 8;
-	} = 3;
-
-	version RPCBVERS4 {
-		bool
-		RPCBPROC_SET(rpcb) = 1;
-
-		bool
-		RPCBPROC_UNSET(rpcb) = 2;
-
-		string
-		RPCBPROC_GETADDR(rpcb) = 3;
-
-		rpcblist_ptr
-		RPCBPROC_DUMP(void) = 4;
-
-		/*
-		 * NOTE: RPCBPROC_BCAST has the same functionality as CALLIT;
-		 * the new name is intended to indicate that this
-		 * procedure should be used for broadcast RPC, and
-		 * RPCBPROC_INDIRECT should be used for indirect calls.
-		 */
-		rpcb_rmtcallres
-		RPCBPROC_BCAST(rpcb_rmtcallargs) = RPCBPROC_CALLIT;
-
-		unsigned int
-		RPCBPROC_GETTIME(void) = 6;
-
-		struct netbuf
-		RPCBPROC_UADDR2TADDR(string) = 7;
-
-		string
-		RPCBPROC_TADDR2UADDR(struct netbuf) = 8;
-
-		string
-		RPCBPROC_GETVERSADDR(rpcb) = 9;
-
-		rpcb_rmtcallres
-		RPCBPROC_INDIRECT(rpcb_rmtcallargs) = 10;
-
-		rpcb_entry_list_ptr
-		RPCBPROC_GETADDRLIST(rpcb) = 11;
-
-		rpcb_stat_byvers
-		RPCBPROC_GETSTAT(void) = 12;
-	} = 4;
-} = 100000;
-#ifdef RPC_HDR
-%
-%#define	RPCBVERS_3		RPCBVERS
-%#define	RPCBVERS_4		RPCBVERS4
-%
-%#define	_PATH_RPCBINDSOCK	"/var/run/rpcbind.sock"
-%
-%#else		/* ndef _KERNEL */
-%#ifdef __cplusplus
-%extern "C" {
-%#endif
-%
-%/*
-% * A mapping of (program, version, network ID) to address
-% */
-%struct rpcb {
-%	rpcprog_t r_prog;		/* program number */
-%	rpcvers_t r_vers;		/* version number */
-%	char *r_netid;			/* network id */
-%	char *r_addr;			/* universal address */
-%	char *r_owner;			/* owner of the mapping */
-%};
-%typedef struct rpcb RPCB;
-%
-%/*
-% * A list of mappings
-% */
-%struct rpcblist {
-%	RPCB rpcb_map;
-%	struct rpcblist *rpcb_next;
-%};
-%typedef struct rpcblist RPCBLIST;
-%typedef struct rpcblist *rpcblist_ptr;
-%
-%/*
-% * Remote calls arguments
-% */
-%struct rpcb_rmtcallargs {
-%	rpcprog_t prog;			/* program number */
-%	rpcvers_t vers;			/* version number */
-%	rpcproc_t proc;			/* procedure number */
-%	uint32_t arglen;			/* arg len */
-%	caddr_t args_ptr;		/* argument */
-%	xdrproc_t xdr_args;		/* XDR routine for argument */
-%};
-%typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
-%
-%/*
-% * Remote calls results
-% */
-%struct rpcb_rmtcallres {
-%	char *addr_ptr;			/* remote universal address */
-%	uint32_t resultslen;		/* results length */
-%	caddr_t results_ptr;		/* results */
-%	xdrproc_t xdr_results;		/* XDR routine for result */
-%};
-%typedef struct rpcb_rmtcallres rpcb_rmtcallres;
-%
-%struct rpcb_entry {
-%	char *r_maddr;
-%	char *r_nc_netid;
-%	unsigned int r_nc_semantics;
-%	char *r_nc_protofmly;
-%	char *r_nc_proto;
-%};
-%typedef struct rpcb_entry rpcb_entry;
-%
-%/*
-% * A list of addresses supported by a service.
-% */
-%
-%struct rpcb_entry_list {
-%	rpcb_entry rpcb_entry_map;
-%	struct rpcb_entry_list *rpcb_entry_next;
-%};
-%typedef struct rpcb_entry_list rpcb_entry_list;
-%
-%typedef rpcb_entry_list *rpcb_entry_list_ptr;
-%
-%/*
-% * rpcbind statistics
-% */
-%
-%#define	rpcb_highproc_2 RPCBPROC_CALLIT
-%#define	rpcb_highproc_3 RPCBPROC_TADDR2UADDR
-%#define	rpcb_highproc_4 RPCBPROC_GETSTAT
-%#define	RPCBSTAT_HIGHPROC 13
-%#define	RPCBVERS_STAT 3
-%#define	RPCBVERS_4_STAT 2
-%#define	RPCBVERS_3_STAT 1
-%#define	RPCBVERS_2_STAT 0
-%
-%/* Link list of all the stats about getport and getaddr */
-%
-%struct rpcbs_addrlist {
-%	rpcprog_t prog;
-%	rpcvers_t vers;
-%	int success;
-%	int failure;
-%	char *netid;
-%	struct rpcbs_addrlist *next;
-%};
-%typedef struct rpcbs_addrlist rpcbs_addrlist;
-%
-%/* Link list of all the stats about rmtcall */
-%
-%struct rpcbs_rmtcalllist {
-%	rpcprog_t prog;
-%	rpcvers_t vers;
-%	rpcproc_t proc;
-%	int success;
-%	int failure;
-%	int indirect;
-%	char *netid;
-%	struct rpcbs_rmtcalllist *next;
-%};
-%typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
-%
-%typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
-%
-%typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
-%
-%typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
-%
-%struct rpcb_stat {
-%	rpcbs_proc info;
-%	int setinfo;
-%	int unsetinfo;
-%	rpcbs_addrlist_ptr addrinfo;
-%	rpcbs_rmtcalllist_ptr rmtinfo;
-%};
-%typedef struct rpcb_stat rpcb_stat;
-%
-%/*
-% * One rpcb_stat structure is returned for each version of rpcbind
-% * being monitored.
-% */
-%
-%typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
-%
-%#ifdef __cplusplus
-%}
-%#endif
-%
-%#endif		/* ndef _KERNEL */
-#endif		/* RPC_HDR */
diff --git a/include.new/rpc/rpcent.h b/include.new/rpc/rpcent.h
deleted file mode 100644
index ab5e11b..0000000
--- a/include.new/rpc/rpcent.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: rpcent.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
-/*	$FreeBSD: releng/10.2/include/rpc/rpcent.h 261046 2014-01-22 23:45:27Z mav $ */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * rpcent.h,
- * For converting rpc program numbers to names etc.
- *
- */
-
-#ifndef _RPC_RPCENT_H
-#define _RPC_RPCENT_H
-
-/*	#pragma ident "@(#)rpcent.h   1.13    94/04/25 SMI"	*/
-/*      @(#)rpcent.h 1.1 88/12/06 SMI   */
-
-
-struct rpcent {
-      char    *r_name;        /* name of server for this rpc program */
-      char    **r_aliases;    /* alias list */
-      int     r_number;       /* rpc program number */
-};
-
-__BEGIN_DECLS
-/*
- * These interfaces are currently implemented through nsswitch and are
- * MT-safe.
- */
-extern struct rpcent *getrpcbyname(char *);
-extern struct rpcent *getrpcbynumber(int);
-extern struct rpcent *getrpcent(void);
-extern void setrpcent(int);
-extern void endrpcent(void);
-__END_DECLS
-
-#endif /* !_RPC_CENT_H */
diff --git a/include.new/rpc/rpcsec_gss.h b/include.new/rpc/rpcsec_gss.h
deleted file mode 100644
index cd10b70..0000000
--- a/include.new/rpc/rpcsec_gss.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * Copyright (c) 2008 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/include/rpc/rpcsec_gss.h 240062 2012-09-02 22:23:23Z pfg $
- */
-
-#ifndef _RPCSEC_GSS_H
-#define _RPCSEC_GSS_H
-
-#include <gssapi/gssapi.h>
-
-#ifndef MAX_GSS_MECH
-#define MAX_GSS_MECH	64
-#endif
-
-/*
- * Define the types of security service required for rpc_gss_seccreate().
- */
-typedef enum {
-	rpc_gss_svc_default	= 0,
-	rpc_gss_svc_none	= 1,
-	rpc_gss_svc_integrity	= 2,
-	rpc_gss_svc_privacy	= 3
-} rpc_gss_service_t;
-
-/*
- * Structure containing options for rpc_gss_seccreate().
- */
-typedef struct {
-	int		req_flags;	/* GSS request bits */
-	int		time_req;	/* requested credential lifetime */
-	gss_cred_id_t	my_cred;	/* GSS credential */
-	gss_channel_bindings_t input_channel_bindings;
-} rpc_gss_options_req_t;
-
-/*
- * Structure containing options returned by rpc_gss_seccreate().
- */
-typedef struct {
-	int		major_status;
-	int		minor_status;
-	u_int		rpcsec_version;
-	int		ret_flags;
-	int		time_req;
-	gss_ctx_id_t	gss_context;
-	char		actual_mechanism[MAX_GSS_MECH];
-} rpc_gss_options_ret_t;
-
-/*
- * Client principal type. Used as an argument to
- * rpc_gss_get_principal_name(). Also referenced by the
- * rpc_gss_rawcred_t structure.
- */
-typedef struct {
-	int		len;
-	char		name[1];
-} *rpc_gss_principal_t;
-
-/*
- * Structure for raw credentials used by rpc_gss_getcred() and
- * rpc_gss_set_callback().
- */
-typedef struct {
-	u_int		version;	/* RPC version number */
-	const char	*mechanism;	/* security mechanism */
-	const char	*qop;		/* quality of protection */
-	rpc_gss_principal_t client_principal; /* client name */
-	const char	*svc_principal;	/* server name */
-	rpc_gss_service_t service;	/* service type */
-} rpc_gss_rawcred_t;
-
-/*
- * Unix credentials derived from raw credentials. Returned by
- * rpc_gss_getcred().
- */
-typedef struct {
-	uid_t		uid;		/* user ID */
-	gid_t		gid;		/* group ID */
-	short		gidlen;
-	gid_t		*gidlist;	/* list of groups */
-} rpc_gss_ucred_t;
-
-/*
- * Structure used to enforce a particular QOP and service.
- */
-typedef struct {
-	bool_t		locked;
-	rpc_gss_rawcred_t *raw_cred;
-} rpc_gss_lock_t;
-
-/*
- * Callback structure used by rpc_gss_set_callback().
- */
-typedef struct {
-	u_int		program;	/* RPC program number */
-	u_int		version;	/* RPC version number */
-					/* user defined callback */
-	bool_t		(*callback)(struct svc_req *req,
-				    gss_cred_id_t deleg,
-				    gss_ctx_id_t gss_context,
-				    rpc_gss_lock_t *lock,
-				    void **cookie);
-} rpc_gss_callback_t;
-
-/*
- * Structure used to return error information by rpc_gss_get_error()
- */
-typedef struct {
-	int		rpc_gss_error;
-	int		system_error;	/* same as errno */
-} rpc_gss_error_t;
-
-/*
- * Values for rpc_gss_error
- */
-#define RPC_GSS_ER_SUCCESS	0	/* no error */
-#define RPC_GSS_ER_SYSTEMERROR	1	/* system error */
-
-__BEGIN_DECLS
-
-AUTH	*rpc_gss_seccreate(CLIENT *clnt, const char *principal,
-    const char *mechanism, rpc_gss_service_t service, const char *qop,
-    rpc_gss_options_req_t *options_req, rpc_gss_options_ret_t *options_ret);
-bool_t	rpc_gss_set_defaults(AUTH *auth, rpc_gss_service_t service,
-    const char *qop);
-int	rpc_gss_max_data_length(AUTH *handle, int max_tp_unit_len);
-void	rpc_gss_get_error(rpc_gss_error_t *error);
-
-bool_t	rpc_gss_mech_to_oid(const char *mech, gss_OID *oid_ret);
-bool_t	rpc_gss_oid_to_mech(gss_OID oid, const char **mech_ret);
-bool_t	rpc_gss_qop_to_num(const char *qop, const char *mech, u_int *num_ret);
-const char **rpc_gss_get_mechanisms(void);
-const char **rpc_gss_get_mech_info(const char *mech, rpc_gss_service_t *service);
-bool_t	rpc_gss_get_versions(u_int *vers_hi, u_int *vers_lo);
-bool_t	rpc_gss_is_installed(const char *mech);
-
-bool_t	rpc_gss_set_svc_name(const char *principal, const char *mechanism,
-    u_int req_time, u_int program, u_int version);
-bool_t	rpc_gss_getcred(struct svc_req *req, rpc_gss_rawcred_t **rcred,
-    rpc_gss_ucred_t **ucred, void **cookie);
-bool_t	rpc_gss_set_callback(rpc_gss_callback_t *cb);
-bool_t	rpc_gss_get_principal_name(rpc_gss_principal_t *principal,
-    const char *mech, const char *name, const char *node, const char *domain);
-int	rpc_gss_svc_max_data_length(struct svc_req *req, int max_tp_unit_len);
-
-/*
- * Internal interface from the RPC implementation.
- */
-bool_t	__rpc_gss_wrap(AUTH *auth, void *header, size_t headerlen,
-    XDR* xdrs, xdrproc_t xdr_args, void *args_ptr);
-bool_t	__rpc_gss_unwrap(AUTH *auth, XDR* xdrs, xdrproc_t xdr_args,
-    void *args_ptr);
-bool_t __rpc_gss_set_error(int rpc_gss_error, int system_error);
-
-__END_DECLS
-
-#endif /* !_RPCSEC_GSS_H */
diff --git a/include.new/rpc/svc.h b/include.new/rpc/svc.h
deleted file mode 100644
index e9cd49c..0000000
--- a/include.new/rpc/svc.h
+++ /dev/null
@@ -1,473 +0,0 @@
-/*	$NetBSD: svc.h,v 1.17 2000/06/02 22:57:56 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)svc.h 1.35 88/12/17 SMI
- *	from: @(#)svc.h      1.27    94/04/25 SMI
- * $FreeBSD: releng/10.2/include/rpc/svc.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * svc.h, Server-side remote procedure call interface.
- *
- * Copyright (C) 1986-1993 by Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_SVC_H
-#define _RPC_SVC_H
-#include <sys/cdefs.h>
-
-/*
- * This interface must manage two items concerning remote procedure calling:
- *
- * 1) An arbitrary number of transport connections upon which rpc requests
- * are received.  The two most notable transports are TCP and UDP;  they are
- * created and registered by routines in svc_tcp.c and svc_udp.c, respectively;
- * they in turn call xprt_register and xprt_unregister.
- *
- * 2) An arbitrary number of locally registered services.  Services are
- * described by the following four data: program number, version number,
- * "service dispatch" function, a transport handle, and a boolean that
- * indicates whether or not the exported program should be registered with a
- * local binder service;  if true the program's number and version and the
- * port number from the transport handle are registered with the binder.
- * These data are registered with the rpc svc system via svc_register.
- *
- * A service's dispatch function is called whenever an rpc request comes in
- * on a transport.  The request's program and version numbers must match
- * those of the registered service.  The dispatch function is passed two
- * parameters, struct svc_req * and SVCXPRT *, defined below.
- */
-
-/*
- *      Service control requests
- */
-#define SVCGET_VERSQUIET	1
-#define SVCSET_VERSQUIET	2
-#define SVCGET_CONNMAXREC	3
-#define SVCSET_CONNMAXREC	4
-
-/*
- * Operations for rpc_control().
- */
-#define RPC_SVC_CONNMAXREC_SET  0	/* set max rec size, enable nonblock */
-#define RPC_SVC_CONNMAXREC_GET  1
-
-enum xprt_stat {
-	XPRT_DIED,
-	XPRT_MOREREQS,
-	XPRT_IDLE
-};
-
-/*
- * Server side transport handle
- */
-typedef struct __rpc_svcxprt {
-	int		xp_fd;
-	u_short		xp_port;	 /* associated port number */
-	const struct xp_ops {
-	    /* receive incoming requests */
-	    bool_t	(*xp_recv)(struct __rpc_svcxprt *, struct rpc_msg *);
-	    /* get transport status */
-	    enum xprt_stat (*xp_stat)(struct __rpc_svcxprt *);
-	    /* get arguments */
-	    bool_t	(*xp_getargs)(struct __rpc_svcxprt *, xdrproc_t,
-				void *);
-	    /* send reply */
-	    bool_t	(*xp_reply)(struct __rpc_svcxprt *, struct rpc_msg *);
-	    /* free mem allocated for args */
-	    bool_t	(*xp_freeargs)(struct __rpc_svcxprt *, xdrproc_t,
-				void *);
-	    /* destroy this struct */
-	    void	(*xp_destroy)(struct __rpc_svcxprt *);
-	} *xp_ops;
-	int		xp_addrlen;	 /* length of remote address */
-	struct sockaddr_in xp_raddr;	 /* remote addr. (backward ABI compat) */
-	/* XXX - fvdl stick this here for ABI backward compat reasons */
-	const struct xp_ops2 {
-		/* catch-all function */
-		bool_t  (*xp_control)(struct __rpc_svcxprt *, const u_int,
-				void *);
-	} *xp_ops2;
-	char		*xp_tp;		 /* transport provider device name */
-	char		*xp_netid;	 /* network token */
-	struct netbuf	xp_ltaddr;	 /* local transport address */
-	struct netbuf	xp_rtaddr;	 /* remote transport address */
-	struct opaque_auth xp_verf;	 /* raw response verifier */
-	void		*xp_p1;		 /* private: for use by svc ops */
-	void		*xp_p2;		 /* private: for use by svc ops */
-	void		*xp_p3;		 /* private: for use by svc lib */
-	int		xp_type;	 /* transport type */
-} SVCXPRT;
-
-/*
- * Interface to server-side authentication flavors.
- */
-typedef struct __rpc_svcauth {
-	struct svc_auth_ops {
-		int   (*svc_ah_wrap)(struct __rpc_svcauth *, XDR *,
-		    xdrproc_t, caddr_t);
-		int   (*svc_ah_unwrap)(struct __rpc_svcauth *, XDR *,
-		    xdrproc_t, caddr_t);
-	} *svc_ah_ops;
-	void *svc_ah_private;
-} SVCAUTH;
-
-/*
- * Server transport extensions (accessed via xp_p3).
- */
-typedef struct __rpc_svcxprt_ext {
-	int		xp_flags;	/* versquiet */
-	SVCAUTH		xp_auth;	/* interface to auth methods */
-} SVCXPRT_EXT;
-
-/*
- * Service request
- */
-struct svc_req {
-	uint32_t	rq_prog;	/* service program number */
-	uint32_t	rq_vers;	/* service protocol version */
-	uint32_t	rq_proc;	/* the desired procedure */
-	struct opaque_auth rq_cred;	/* raw creds from the wire */
-	void		*rq_clntcred;	/* read only cooked cred */
-	SVCXPRT		*rq_xprt;	/* associated transport */
-};
-
-/*
- *  Approved way of getting address of caller
- */
-#define svc_getrpccaller(x) (&(x)->xp_rtaddr)
-
-/*
- * Operations defined on an SVCXPRT handle
- *
- * SVCXPRT		*xprt;
- * struct rpc_msg	*msg;
- * xdrproc_t		 xargs;
- * void *		 argsp;
- */
-#define SVC_RECV(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_recv)((xprt), (msg))
-#define svc_recv(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_recv)((xprt), (msg))
-
-#define SVC_STAT(xprt)					\
-	(*(xprt)->xp_ops->xp_stat)(xprt)
-#define svc_stat(xprt)					\
-	(*(xprt)->xp_ops->xp_stat)(xprt)
-
-#define SVC_GETARGS(xprt, xargs, argsp)			\
-	(*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
-#define svc_getargs(xprt, xargs, argsp)			\
-	(*(xprt)->xp_ops->xp_getargs)((xprt), (xargs), (argsp))
-
-#define SVC_REPLY(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
-#define svc_reply(xprt, msg)				\
-	(*(xprt)->xp_ops->xp_reply) ((xprt), (msg))
-
-#define SVC_FREEARGS(xprt, xargs, argsp)		\
-	(*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
-#define svc_freeargs(xprt, xargs, argsp)		\
-	(*(xprt)->xp_ops->xp_freeargs)((xprt), (xargs), (argsp))
-
-#define SVC_DESTROY(xprt)				\
-	(*(xprt)->xp_ops->xp_destroy)(xprt)
-#define svc_destroy(xprt)				\
-	(*(xprt)->xp_ops->xp_destroy)(xprt)
-
-#define SVC_CONTROL(xprt, rq, in)			\
-	(*(xprt)->xp_ops2->xp_control)((xprt), (rq), (in))
-
-#define SVC_EXT(xprt)					\
-	((SVCXPRT_EXT *) xprt->xp_p3)
-
-#define SVC_AUTH(xprt)					\
-	(SVC_EXT(xprt)->xp_auth)
-
-/*
- * Operations defined on an SVCAUTH handle
- */
-#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere)		\
-	((auth)->svc_ah_ops->svc_ah_wrap(auth, xdrs, xfunc, xwhere))
-#define SVCAUTH_UNWRAP(auth, xdrs, xfunc, xwhere)	\
-	((auth)->svc_ah_ops->svc_ah_unwrap(auth, xdrs, xfunc, xwhere))
-
-/*
- * Service registration
- *
- * svc_reg(xprt, prog, vers, dispatch, nconf)
- *	const SVCXPRT *xprt;
- *	const rpcprog_t prog;
- *	const rpcvers_t vers;
- *	const void (*dispatch)(struct svc_req *, SVCXPRT *);
- *	const struct netconfig *nconf;
- */
-
-__BEGIN_DECLS
-extern bool_t	svc_reg(SVCXPRT *, const rpcprog_t, const rpcvers_t,
-			void (*)(struct svc_req *, SVCXPRT *),
-			const struct netconfig *);
-__END_DECLS
-
-/*
- * Service un-registration
- *
- * svc_unreg(prog, vers)
- *	const rpcprog_t prog;
- *	const rpcvers_t vers;
- */
-
-__BEGIN_DECLS
-extern void	svc_unreg(const rpcprog_t, const rpcvers_t);
-__END_DECLS
-
-/*
- * Transport registration.
- *
- * xprt_register(xprt)
- *	SVCXPRT *xprt;
- */
-__BEGIN_DECLS
-extern void	xprt_register(SVCXPRT *);
-__END_DECLS
-
-/*
- * Transport un-register
- *
- * xprt_unregister(xprt)
- *	SVCXPRT *xprt;
- */
-__BEGIN_DECLS
-extern void	xprt_unregister(SVCXPRT *);
-__END_DECLS
-
-
-/*
- * When the service routine is called, it must first check to see if it
- * knows about the procedure;  if not, it should call svcerr_noproc
- * and return.  If so, it should deserialize its arguments via
- * SVC_GETARGS (defined above).  If the deserialization does not work,
- * svcerr_decode should be called followed by a return.  Successful
- * decoding of the arguments should be followed the execution of the
- * procedure's code and a call to svc_sendreply.
- *
- * Also, if the service refuses to execute the procedure due to too-
- * weak authentication parameters, svcerr_weakauth should be called.
- * Note: do not confuse access-control failure with weak authentication!
- *
- * NB: In pure implementations of rpc, the caller always waits for a reply
- * msg.  This message is sent when svc_sendreply is called.
- * Therefore pure service implementations should always call
- * svc_sendreply even if the function logically returns void;  use
- * xdr.h - xdr_void for the xdr routine.  HOWEVER, tcp based rpc allows
- * for the abuse of pure rpc via batched calling or pipelining.  In the
- * case of a batched call, svc_sendreply should NOT be called since
- * this would send a return message, which is what batching tries to avoid.
- * It is the service/protocol writer's responsibility to know which calls are
- * batched and which are not.  Warning: responding to batch calls may
- * deadlock the caller and server processes!
- */
-
-__BEGIN_DECLS
-extern bool_t	svc_sendreply(SVCXPRT *, xdrproc_t, void *);
-extern void	svcerr_decode(SVCXPRT *);
-extern void	svcerr_weakauth(SVCXPRT *);
-extern void	svcerr_noproc(SVCXPRT *);
-extern void	svcerr_progvers(SVCXPRT *, rpcvers_t, rpcvers_t);
-extern void	svcerr_auth(SVCXPRT *, enum auth_stat);
-extern void	svcerr_noprog(SVCXPRT *);
-extern void	svcerr_systemerr(SVCXPRT *);
-extern int	rpc_reg(rpcprog_t, rpcvers_t, rpcproc_t,
-			char *(*)(char *), xdrproc_t, xdrproc_t,
-			char *);
-__END_DECLS
-
-/*
- * Lowest level dispatching -OR- who owns this process anyway.
- * Somebody has to wait for incoming requests and then call the correct
- * service routine.  The routine svc_run does infinite waiting; i.e.,
- * svc_run never returns.
- * Since another (co-existent) package may wish to selectively wait for
- * incoming calls or other events outside of the rpc architecture, the
- * routine svc_getreq is provided.  It must be passed readfds, the
- * "in-place" results of a select system call (see select, section 2).
- */
-
-/*
- * Global keeper of rpc service descriptors in use
- * dynamic; must be inspected before each call to select
- */
-extern int svc_maxfd;
-#ifdef FD_SETSIZE
-extern fd_set svc_fdset;
-#define svc_fds svc_fdset.fds_bits[0]	/* compatibility */
-#else
-extern int svc_fds;
-#endif /* def FD_SETSIZE */
-
-/*
- * A set of null auth methods used by any authentication protocols
- * that don't need to inspect or modify the message body.
- */
-extern SVCAUTH _svc_auth_null;
-
-/*
- * a small program implemented by the svc_rpc implementation itself;
- * also see clnt.h for protocol numbers.
- */
-__BEGIN_DECLS
-extern void rpctest_service(void);
-__END_DECLS
-
-__BEGIN_DECLS
-extern SVCXPRT *svc_xprt_alloc(void);
-extern void	svc_xprt_free(SVCXPRT *);
-extern void	svc_getreq(int);
-extern void	svc_getreqset(fd_set *);
-extern void	svc_getreq_common(int);
-struct pollfd;
-extern void	svc_getreq_poll(struct pollfd *, int);
-
-extern void	svc_run(void);
-extern void	svc_exit(void);
-__END_DECLS
-
-/*
- * Socket to use on svcxxx_create call to get default socket
- */
-#define	RPC_ANYSOCK	-1
-#define RPC_ANYFD	RPC_ANYSOCK
-
-/*
- * These are the existing service side transport implementations
- */
-
-__BEGIN_DECLS
-/*
- * Transport independent svc_create routine.
- */
-extern int svc_create(void (*)(struct svc_req *, SVCXPRT *),
-			   const rpcprog_t, const rpcvers_t, const char *);
-/*
- *      void (*dispatch)(struct svc_req *, SVCXPRT *);
- *      const rpcprog_t prognum;        -- program number
- *      const rpcvers_t versnum;        -- version number
- *      const char *nettype;            -- network type
- */
-
-
-/*
- * Generic server creation routine. It takes a netconfig structure
- * instead of a nettype.
- */
-
-extern SVCXPRT *svc_tp_create(void (*)(struct svc_req *, SVCXPRT *),
-				   const rpcprog_t, const rpcvers_t,
-				   const struct netconfig *);
-        /*
-         * void (*dispatch)(struct svc_req *, SVCXPRT *);
-         * const rpcprog_t prognum;       -- program number
-         * const rpcvers_t versnum;       -- version number
-         * const struct netconfig *nconf; -- netconfig structure
-         */
-
-
-/*
- * Generic TLI create routine
- */
-extern SVCXPRT *svc_tli_create(const int, const struct netconfig *,
-			       const struct t_bind *, const u_int,
-			       const u_int);
-/*
- *      const int fd;                   -- connection end point
- *      const struct netconfig *nconf;  -- netconfig structure for network
- *      const struct t_bind *bindaddr;  -- local bind address
- *      const u_int sendsz;             -- max sendsize
- *      const u_int recvsz;             -- max recvsize
- */
-
-/*
- * Connectionless and connectionful create routines
- */
-
-extern SVCXPRT *svc_vc_create(const int, const u_int, const u_int);
-/*
- *      const int fd;                           -- open connection end point
- *      const u_int sendsize;                   -- max send size
- *      const u_int recvsize;                   -- max recv size
- */
-
-/*
- * Added for compatibility to old rpc 4.0. Obsoleted by svc_vc_create().
- */
-extern SVCXPRT *svcunix_create(int, u_int, u_int, char *);
-
-extern SVCXPRT *svc_dg_create(const int, const u_int, const u_int);
-        /*
-         * const int fd;                                -- open connection
-         * const u_int sendsize;                        -- max send size
-         * const u_int recvsize;                        -- max recv size
-         */
-
-
-/*
- * the routine takes any *open* connection
- * descriptor as its first input and is used for open connections.
- */
-extern SVCXPRT *svc_fd_create(const int, const u_int, const u_int);
-/*
- *      const int fd;                           -- open connection end point
- *      const u_int sendsize;                   -- max send size
- *      const u_int recvsize;                   -- max recv size
- */
-
-/*
- * Added for compatibility to old rpc 4.0. Obsoleted by svc_fd_create().
- */
-extern SVCXPRT *svcunixfd_create(int, u_int, u_int);
-
-/*
- * Memory based rpc (for speed check and testing)
- */
-extern SVCXPRT *svc_raw_create(void);
-
-/*
- * svc_dg_enable_cache() enables the cache on dg transports.
- */
-int svc_dg_enablecache(SVCXPRT *, const u_int);
-
-int __rpc_get_local_uid(SVCXPRT *_transp, uid_t *_uid);
-
-__END_DECLS
-
-
-/* for backward compatibility */
-#include <rpc/svc_soc.h>
-
-#endif /* !_RPC_SVC_H */
diff --git a/include.new/rpc/svc_auth.h b/include.new/rpc/svc_auth.h
deleted file mode 100644
index 7080bae..0000000
--- a/include.new/rpc/svc_auth.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: svc_auth.h,v 1.8 2000/06/02 22:57:57 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
- *	@(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- * $FreeBSD: releng/10.2/include/rpc/svc_auth.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * svc_auth.h, Service side of rpc authentication.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_SVC_AUTH_H
-#define _RPC_SVC_AUTH_H
-
-/*
- * Server side authenticator
- */
-__BEGIN_DECLS
-extern struct svc_auth_ops svc_auth_null_ops;
-
-extern enum auth_stat _authenticate(struct svc_req *, struct rpc_msg *);
-extern int svc_auth_reg(int, enum auth_stat (*)(struct svc_req *,
-			  struct rpc_msg *));
-
-__END_DECLS
-
-#endif /* !_RPC_SVC_AUTH_H */
diff --git a/include.new/rpc/svc_dg.h b/include.new/rpc/svc_dg.h
deleted file mode 100644
index 173dac3..0000000
--- a/include.new/rpc/svc_dg.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*	$NetBSD: svc_dg.h,v 1.1 2000/06/02 23:11:16 fvdl Exp $	*/
-/*	$FreeBSD: releng/10.2/include/rpc/svc_dg.h 261046 2014-01-22 23:45:27Z mav $ */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * XXX - this file exists only so that the rpcbind code can pull it in.
- * This should go away. It should only be include by svc_dg.c and
- * rpcb_svc_com.c in the rpcbind code.
- */
-
-/*
- * kept in xprt->xp_p2
- */
-struct svc_dg_data {
-	/* XXX: optbuf should be the first field, used by ti_opts.c code */
-	size_t		su_iosz;		/* size of send.recv buffer */
-	uint32_t	su_xid;			/* transaction id */
-	XDR		su_xdrs;			/* XDR handle */
-	char		su_verfbody[MAX_AUTH_BYTES];	/* verifier body */
-	void		*su_cache;		/* cached data, NULL if none */
-	struct netbuf   su_srcaddr;		/* dst address of last msg */
-};
-
-#define __rpcb_get_dg_xidp(x)	(&((struct svc_dg_data *)(x)->xp_p2)->su_xid)
diff --git a/include.new/rpc/svc_soc.h b/include.new/rpc/svc_soc.h
deleted file mode 100644
index 65d5e6c..0000000
--- a/include.new/rpc/svc_soc.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*	$NetBSD: svc_soc.h,v 1.1 2000/06/02 22:57:57 fvdl Exp $	*/
-/*	$FreeBSD: releng/10.2/include/rpc/svc_soc.h 261046 2014-01-22 23:45:27Z mav $ */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * svc.h, Server-side remote procedure call interface.
- */
-
-#ifndef _RPC_SVC_SOC_H
-#define _RPC_SVC_SOC_H
-#include <sys/cdefs.h>
-
-/* #pragma ident   "@(#)svc_soc.h  1.11    94/04/25 SMI" */
-/*      svc_soc.h 1.8 89/05/01 SMI      */
-
-/*
- * All the following declarations are only for backward compatibility
- * with TS-RPC
- */
-
-/*
- *  Approved way of getting address of caller
- */
-#define svc_getcaller(x) (&(x)->xp_raddr)
-
-/*
- * Service registration
- *
- * svc_register(xprt, prog, vers, dispatch, protocol)
- *	SVCXPRT *xprt;
- *	u_long prog;
- *	u_long vers;
- *	void (*dispatch)();
- *	int protocol;    like TCP or UDP, zero means do not register 
- */
-__BEGIN_DECLS
-extern bool_t	svc_register(SVCXPRT *, u_long, u_long,
-		    void (*)(struct svc_req *, SVCXPRT *), int);
-__END_DECLS
-
-/*
- * Service un-registration
- *
- * svc_unregister(prog, vers)
- *	u_long prog;
- *	u_long vers;
- */
-__BEGIN_DECLS
-extern void	svc_unregister(u_long, u_long);
-__END_DECLS
-
-
-/*
- * Memory based rpc for testing and timing.
- */
-__BEGIN_DECLS
-extern SVCXPRT *svcraw_create(void);
-__END_DECLS
-
-
-/*
- * Udp based rpc.
- */
-__BEGIN_DECLS
-extern SVCXPRT *svcudp_create(int);
-extern SVCXPRT *svcudp_bufcreate(int, u_int, u_int);
-extern int svcudp_enablecache(SVCXPRT *, u_long);
-__END_DECLS
-
-
-/*
- * Tcp based rpc.
- */
-__BEGIN_DECLS
-extern SVCXPRT *svctcp_create(int, u_int, u_int);
-__END_DECLS
-
-/*
- * Fd based rpc.
- */
-__BEGIN_DECLS
-extern SVCXPRT *svcfd_create(int, u_int, u_int);
-__END_DECLS
-
-#endif /* !_RPC_SVC_SOC_H */
diff --git a/include.new/rpc/types.h b/include.new/rpc/types.h
deleted file mode 100644
index 9b5f0b7..0000000
--- a/include.new/rpc/types.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*	$NetBSD: types.h,v 1.13 2000/06/13 01:02:44 thorpej Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)types.h 1.18 87/07/24 SMI
- *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- * $FreeBSD: releng/10.2/sys/rpc/types.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * Rpc additions to <sys/types.h>
- */
-#ifndef _RPC_TYPES_H
-#define _RPC_TYPES_H
-
-#include <sys/types.h>
-#include <sys/_null.h>
-
-typedef int32_t bool_t;
-typedef int32_t enum_t;
-
-typedef uint32_t rpcprog_t;
-typedef uint32_t rpcvers_t;
-typedef uint32_t rpcproc_t;
-typedef uint32_t rpcprot_t;
-typedef uint32_t rpcport_t;
-typedef  int32_t rpc_inline_t;
-
-#define __dontcare__	-1
-
-#ifndef FALSE
-#	define FALSE	(0)
-#endif
-#ifndef TRUE
-#	define TRUE	(1)
-#endif
-
-#ifdef _KERNEL
-#ifdef _SYS_MALLOC_H_
-MALLOC_DECLARE(M_RPC);
-#endif
-#define mem_alloc(bsize)	malloc(bsize, M_RPC,  M_WAITOK|M_ZERO)
-#define mem_free(ptr, bsize)	free(ptr, M_RPC)
-#else
-#define mem_alloc(bsize)	calloc(1, bsize)
-#define mem_free(ptr, bsize)	free(ptr)
-#endif
-
-#include <sys/time.h>
-#ifdef _KERNEL
-#include <rpc/netconfig.h>
-#else
-#include <netconfig.h>
-#endif
-
-/*
- * The netbuf structure is defined here, because FreeBSD / NetBSD only use
- * it inside the RPC code. It's in <xti.h> on SVR4, but it would be confusing
- * to have an xti.h, since FreeBSD / NetBSD does not support XTI/TLI.
- */
-
-/*
- * The netbuf structure is used for transport-independent address storage.
- */
-struct netbuf {
-	unsigned int maxlen;
-	unsigned int len;
-	void *buf;
-};
-
-/*
- * The format of the addres and options arguments of the XTI t_bind call.
- * Only provided for compatibility, it should not be used.
- */
-
-struct t_bind {
-	struct netbuf   addr;
-	unsigned int    qlen;
-};
-
-/*
- * Internal library and rpcbind use. This is not an exported interface, do
- * not use.
- */
-struct __rpc_sockinfo {
-	int si_af; 
-	int si_proto;
-	int si_socktype;
-	int si_alen;
-};
-
-#endif /* !_RPC_TYPES_H */
diff --git a/include.new/rpc/xdr.h b/include.new/rpc/xdr.h
deleted file mode 100644
index 9b6e8e9..0000000
--- a/include.new/rpc/xdr.h
+++ /dev/null
@@ -1,368 +0,0 @@
-/*	$NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- *
- *	from: @(#)xdr.h 1.19 87/04/22 SMI
- *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- * $FreeBSD: releng/10.2/include/rpc/xdr.h 261046 2014-01-22 23:45:27Z mav $
- */
-
-/*
- * xdr.h, External Data Representation Serialization Routines.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#ifndef _RPC_XDR_H
-#define _RPC_XDR_H
-#include <sys/cdefs.h>
-
-/*
- * XDR provides a conventional way for converting between C data
- * types and an external bit-string representation.  Library supplied
- * routines provide for the conversion on built-in C data types.  These
- * routines and utility routines defined here are used to help implement
- * a type encode/decode routine for each user-defined type.
- *
- * Each data type provides a single procedure which takes two arguments:
- *
- *	bool_t
- *	xdrproc(xdrs, argresp)
- *		XDR *xdrs;
- *		<type> *argresp;
- *
- * xdrs is an instance of a XDR handle, to which or from which the data
- * type is to be converted.  argresp is a pointer to the structure to be
- * converted.  The XDR handle contains an operation field which indicates
- * which of the operations (ENCODE, DECODE * or FREE) is to be performed.
- *
- * XDR_DECODE may allocate space if the pointer argresp is null.  This
- * data can be freed with the XDR_FREE operation.
- *
- * We write only one procedure per data type to make it easy
- * to keep the encode and decode procedures for a data type consistent.
- * In many cases the same code performs all operations on a user defined type,
- * because all the hard work is done in the component type routines.
- * decode as a series of calls on the nested data types.
- */
-
-/*
- * Xdr operations.  XDR_ENCODE causes the type to be encoded into the
- * stream.  XDR_DECODE causes the type to be extracted from the stream.
- * XDR_FREE can be used to release the space allocated by an XDR_DECODE
- * request.
- */
-enum xdr_op {
-	XDR_ENCODE=0,
-	XDR_DECODE=1,
-	XDR_FREE=2
-};
-
-/*
- * This is the number of bytes per unit of external data.
- */
-#define BYTES_PER_XDR_UNIT	(4)
-#define RNDUP(x)  ((((x) + BYTES_PER_XDR_UNIT - 1) / BYTES_PER_XDR_UNIT) \
-		    * BYTES_PER_XDR_UNIT)
-
-/*
- * The XDR handle.
- * Contains operation which is being applied to the stream,
- * an operations vector for the particular implementation (e.g. see xdr_mem.c),
- * and two private fields for the use of the particular implementation.
- */
-typedef struct XDR {
-	enum xdr_op	x_op;		/* operation; fast additional param */
-	const struct xdr_ops {
-		/* get a long from underlying stream */
-		bool_t	(*x_getlong)(struct XDR *, long *);
-		/* put a long to " */
-		bool_t	(*x_putlong)(struct XDR *, const long *);
-		/* get some bytes from " */
-		bool_t	(*x_getbytes)(struct XDR *, char *, u_int);
-		/* put some bytes to " */
-		bool_t	(*x_putbytes)(struct XDR *, const char *, u_int);
-		/* returns bytes off from beginning */
-		u_int	(*x_getpostn)(struct XDR *);
-		/* lets you reposition the stream */
-		bool_t  (*x_setpostn)(struct XDR *, u_int);
-		/* buf quick ptr to buffered data */
-		int32_t *(*x_inline)(struct XDR *, u_int);
-		/* free privates of this xdr_stream */
-		void	(*x_destroy)(struct XDR *);
-		bool_t	(*x_control)(struct XDR *, int, void *);
-	} *x_ops;
-	char *	 	x_public;	/* users' data */
-	void *		x_private;	/* pointer to private data */
-	char * 		x_base;		/* private used for position info */
-	u_int		x_handy;	/* extra private word */
-} XDR;
-
-/*
- * A xdrproc_t exists for each data type which is to be encoded or decoded.
- *
- * The second argument to the xdrproc_t is a pointer to an opaque pointer.
- * The opaque pointer generally points to a structure of the data type
- * to be decoded.  If this pointer is 0, then the type routines should
- * allocate dynamic storage of the appropriate size and return it.
- */
-#ifdef _KERNEL
-typedef	bool_t (*xdrproc_t)(XDR *, void *, u_int);
-#else
-/*
- * XXX can't actually prototype it, because some take three args!!!
- */
-typedef	bool_t (*xdrproc_t)(XDR *, ...);
-#endif
-
-/*
- * Operations defined on a XDR handle
- *
- * XDR		*xdrs;
- * long		*longp;
- * char *	 addr;
- * u_int	 len;
- * u_int	 pos;
- */
-#define XDR_GETLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-#define xdr_getlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_getlong)(xdrs, longp)
-
-#define XDR_PUTLONG(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-#define xdr_putlong(xdrs, longp)			\
-	(*(xdrs)->x_ops->x_putlong)(xdrs, longp)
-
-static __inline int
-xdr_getint32(XDR *xdrs, int32_t *ip)
-{
-	long l;
-
-	if (!xdr_getlong(xdrs, &l))
-		return (FALSE);
-	*ip = (int32_t)l;
-	return (TRUE);
-}
-
-static __inline int
-xdr_putint32(XDR *xdrs, int32_t *ip)
-{
-	long l;
-
-	l = (long)*ip;
-	return xdr_putlong(xdrs, &l);
-}
-
-#define XDR_GETINT32(xdrs, int32p)	xdr_getint32(xdrs, int32p)
-#define XDR_PUTINT32(xdrs, int32p)	xdr_putint32(xdrs, int32p)
-
-#define XDR_GETBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-#define xdr_getbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_getbytes)(xdrs, addr, len)
-
-#define XDR_PUTBYTES(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-#define xdr_putbytes(xdrs, addr, len)			\
-	(*(xdrs)->x_ops->x_putbytes)(xdrs, addr, len)
-
-#define XDR_GETPOS(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-#define xdr_getpos(xdrs)				\
-	(*(xdrs)->x_ops->x_getpostn)(xdrs)
-
-#define XDR_SETPOS(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-#define xdr_setpos(xdrs, pos)				\
-	(*(xdrs)->x_ops->x_setpostn)(xdrs, pos)
-
-#define	XDR_INLINE(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-#define	xdr_inline(xdrs, len)				\
-	(*(xdrs)->x_ops->x_inline)(xdrs, len)
-
-#define	XDR_DESTROY(xdrs)				\
-	if ((xdrs)->x_ops->x_destroy) 			\
-		(*(xdrs)->x_ops->x_destroy)(xdrs)
-#define	xdr_destroy(xdrs)				\
-	if ((xdrs)->x_ops->x_destroy) 			\
-		(*(xdrs)->x_ops->x_destroy)(xdrs)
-
-#define XDR_CONTROL(xdrs, req, op)			\
-	if ((xdrs)->x_ops->x_control)			\
-		(*(xdrs)->x_ops->x_control)(xdrs, req, op)
-#define xdr_control(xdrs, req, op) XDR_CONTROL(xdrs, req, op)
-
-/*
- * Solaris strips the '_t' from these types -- not sure why.
- * But, let's be compatible.
- */
-#define xdr_rpcvers(xdrs, versp) xdr_u_int32(xdrs, versp)
-#define xdr_rpcprog(xdrs, progp) xdr_u_int32(xdrs, progp)
-#define xdr_rpcproc(xdrs, procp) xdr_u_int32(xdrs, procp)
-#define xdr_rpcprot(xdrs, protp) xdr_u_int32(xdrs, protp)
-#define xdr_rpcport(xdrs, portp) xdr_u_int32(xdrs, portp)
-
-/*
- * Support struct for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * an entry with a null procedure pointer.  The xdr_union routine gets
- * the discriminant value and then searches the array of structures
- * for a matching value.  If a match is found the associated xdr routine
- * is called to handle that part of the union.  If there is
- * no match, then a default routine may be called.
- * If there is no match and no default routine it is an error.
- */
-#define NULL_xdrproc_t ((xdrproc_t)0)
-struct xdr_discrim {
-	int	value;
-	xdrproc_t proc;
-};
-
-/*
- * In-line routines for fast encode/decode of primitive data types.
- * Caveat emptor: these use single memory cycles to get the
- * data from the underlying buffer, and will fail to operate
- * properly if the data is not aligned.  The standard way to use these
- * is to say:
- *	if ((buf = XDR_INLINE(xdrs, count)) == NULL)
- *		return (FALSE);
- *	<<< macro calls >>>
- * where ``count'' is the number of bytes of data occupied
- * by the primitive data types.
- *
- * N.B. and frozen for all time: each data type here uses 4 bytes
- * of external representation.
- */
-#define IXDR_GET_INT32(buf)		((int32_t)__ntohl((uint32_t)*(buf)++))
-#define IXDR_PUT_INT32(buf, v)		(*(buf)++ =(int32_t)__htonl((uint32_t)v))
-#define IXDR_GET_U_INT32(buf)		((uint32_t)IXDR_GET_INT32(buf))
-#define IXDR_PUT_U_INT32(buf, v)	IXDR_PUT_INT32((buf), ((int32_t)(v)))
-
-#define IXDR_GET_LONG(buf)		((long)__ntohl((uint32_t)*(buf)++))
-#define IXDR_PUT_LONG(buf, v)		(*(buf)++ =(int32_t)__htonl((uint32_t)v))
-
-#define IXDR_GET_BOOL(buf)		((bool_t)IXDR_GET_LONG(buf))
-#define IXDR_GET_ENUM(buf, t)		((t)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_LONG(buf)		((u_long)IXDR_GET_LONG(buf))
-#define IXDR_GET_SHORT(buf)		((short)IXDR_GET_LONG(buf))
-#define IXDR_GET_U_SHORT(buf)		((u_short)IXDR_GET_LONG(buf))
-
-#define IXDR_PUT_BOOL(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_ENUM(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_U_LONG(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_SHORT(buf, v)		IXDR_PUT_LONG((buf), (v))
-#define IXDR_PUT_U_SHORT(buf, v)	IXDR_PUT_LONG((buf), (v))
-
-/*
- * These are the "generic" xdr routines.
- */
-__BEGIN_DECLS
-extern bool_t	xdr_void(void);
-extern bool_t	xdr_int(XDR *, int *);
-extern bool_t	xdr_u_int(XDR *, u_int *);
-extern bool_t	xdr_long(XDR *, long *);
-extern bool_t	xdr_u_long(XDR *, u_long *);
-extern bool_t	xdr_short(XDR *, short *);
-extern bool_t	xdr_u_short(XDR *, u_short *);
-extern bool_t	xdr_int16_t(XDR *, int16_t *);
-extern bool_t	xdr_u_int16_t(XDR *, u_int16_t *);
-extern bool_t	xdr_uint16_t(XDR *, u_int16_t *);
-extern bool_t	xdr_int32_t(XDR *, int32_t *);
-extern bool_t	xdr_uint32_t(XDR *, uint32_t *);
-extern bool_t	xdr_uint32_t(XDR *, uint32_t *);
-extern bool_t	xdr_int64_t(XDR *, int64_t *);
-extern bool_t	xdr_u_int64_t(XDR *, u_int64_t *);
-extern bool_t	xdr_uint64_t(XDR *, u_int64_t *);
-extern bool_t	xdr_bool(XDR *, bool_t *);
-extern bool_t	xdr_enum(XDR *, enum_t *);
-extern bool_t	xdr_array(XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
-extern bool_t	xdr_bytes(XDR *, char **, u_int *, u_int);
-extern bool_t	xdr_opaque(XDR *, char *, u_int);
-extern bool_t	xdr_string(XDR *, char **, u_int);
-extern bool_t	xdr_union(XDR *, enum_t *, char *, const struct xdr_discrim *, xdrproc_t);
-extern bool_t	xdr_char(XDR *, char *);
-extern bool_t	xdr_u_char(XDR *, u_char *);
-extern bool_t	xdr_vector(XDR *, char *, u_int, u_int, xdrproc_t);
-extern bool_t	xdr_float(XDR *, float *);
-extern bool_t	xdr_double(XDR *, double *);
-extern bool_t	xdr_quadruple(XDR *, long double *);
-extern bool_t	xdr_reference(XDR *, char **, u_int, xdrproc_t);
-extern bool_t	xdr_pointer(XDR *, char **, u_int, xdrproc_t);
-extern bool_t	xdr_wrapstring(XDR *, char **);
-extern void	xdr_free(xdrproc_t, void *);
-extern bool_t	xdr_hyper(XDR *, quad_t *);
-extern bool_t	xdr_u_hyper(XDR *, u_quad_t *);
-extern bool_t	xdr_longlong_t(XDR *, quad_t *);
-extern bool_t	xdr_u_longlong_t(XDR *, u_quad_t *);
-extern unsigned long	xdr_sizeof(xdrproc_t, void *);
-__END_DECLS
-
-/*
- * Common opaque bytes objects used by many rpc protocols;
- * declared here due to commonality.
- */
-#define MAX_NETOBJ_SZ 1024
-struct netobj {
-	u_int	n_len;
-	char	*n_bytes;
-};
-typedef struct netobj netobj;
-extern bool_t   xdr_netobj(XDR *, struct netobj *);
-
-/*
- * These are the public routines for the various implementations of
- * xdr streams.
- */
-__BEGIN_DECLS
-/* XDR using memory buffers */
-extern void   xdrmem_create(XDR *, char *, u_int, enum xdr_op);
-
-/* XDR using stdio library */
-#ifdef _STDIO_H_
-extern void   xdrstdio_create(XDR *, FILE *, enum xdr_op);
-#endif
-
-/* XDR pseudo records for tcp */
-extern void   xdrrec_create(XDR *, u_int, u_int, void *,
-			    int (*)(void *, void *, int),
-			    int (*)(void *, void *, int));
-
-/* make end of xdr record */
-extern bool_t xdrrec_endofrecord(XDR *, int);
-
-/* move to beginning of next record */
-extern bool_t xdrrec_skiprecord(XDR *);
-
-/* true if no more input */
-extern bool_t xdrrec_eof(XDR *);
-extern u_int xdrrec_readbytes(XDR *, caddr_t, u_int);
-__END_DECLS
-
-#endif /* !_RPC_XDR_H */
diff --git a/include.new/rpcsvc/bootparam_prot.h b/include.new/rpcsvc/bootparam_prot.h
deleted file mode 100644
index 7ddad2c..0000000
--- a/include.new/rpcsvc/bootparam_prot.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _BOOTPARAM_PROT_H_RPCGEN
-#define	_BOOTPARAM_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <rpc/types.h>
-#include <sys/time.h>
-#include <sys/errno.h>
-#include <sys/param.h>
-#include <sys/syslimits.h>
-#define	MAX_MACHINE_NAME 255
-#define	MAX_PATH_LEN 1024
-#define	MAX_FILEID 32
-#define	IP_ADDR_TYPE 1
-
-typedef char *bp_machine_name_t;
-
-typedef char *bp_path_t;
-
-typedef char *bp_fileid_t;
-
-struct ip_addr_t {
-	char net;
-	char host;
-	char lh;
-	char impno;
-};
-typedef struct ip_addr_t ip_addr_t;
-
-struct bp_address {
-	int address_type;
-	union {
-		ip_addr_t ip_addr;
-	} bp_address_u;
-};
-typedef struct bp_address bp_address;
-
-struct bp_whoami_arg {
-	bp_address client_address;
-};
-typedef struct bp_whoami_arg bp_whoami_arg;
-
-struct bp_whoami_res {
-	bp_machine_name_t client_name;
-	bp_machine_name_t domain_name;
-	bp_address router_address;
-};
-typedef struct bp_whoami_res bp_whoami_res;
-
-struct bp_getfile_arg {
-	bp_machine_name_t client_name;
-	bp_fileid_t file_id;
-};
-typedef struct bp_getfile_arg bp_getfile_arg;
-
-struct bp_getfile_res {
-	bp_machine_name_t server_name;
-	bp_address server_address;
-	bp_path_t server_path;
-};
-typedef struct bp_getfile_res bp_getfile_res;
-
-#define	BOOTPARAMPROG ((unsigned long)(100026))
-#define	BOOTPARAMVERS ((unsigned long)(1))
-
-extern  void bootparamprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	BOOTPARAMPROC_WHOAMI ((unsigned long)(1))
-extern  bp_whoami_res * bootparamproc_whoami_1(bp_whoami_arg *, CLIENT *);
-extern  bp_whoami_res * bootparamproc_whoami_1_svc(bp_whoami_arg *, struct svc_req *);
-#define	BOOTPARAMPROC_GETFILE ((unsigned long)(2))
-extern  bp_getfile_res * bootparamproc_getfile_1(bp_getfile_arg *, CLIENT *);
-extern  bp_getfile_res * bootparamproc_getfile_1_svc(bp_getfile_arg *, struct svc_req *);
-extern int bootparamprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_bp_machine_name_t(XDR *, bp_machine_name_t*);
-extern  bool_t xdr_bp_path_t(XDR *, bp_path_t*);
-extern  bool_t xdr_bp_fileid_t(XDR *, bp_fileid_t*);
-extern  bool_t xdr_ip_addr_t(XDR *, ip_addr_t*);
-extern  bool_t xdr_bp_address(XDR *, bp_address*);
-extern  bool_t xdr_bp_whoami_arg(XDR *, bp_whoami_arg*);
-extern  bool_t xdr_bp_whoami_res(XDR *, bp_whoami_res*);
-extern  bool_t xdr_bp_getfile_arg(XDR *, bp_getfile_arg*);
-extern  bool_t xdr_bp_getfile_res(XDR *, bp_getfile_res*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_BOOTPARAM_PROT_H_RPCGEN */
diff --git a/include.new/rpcsvc/bootparam_prot.x b/include.new/rpcsvc/bootparam_prot.x
deleted file mode 100644
index ef93ee0..0000000
--- a/include.new/rpcsvc/bootparam_prot.x
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * RPC for bootparms service.
- * There are two procedures:
- *   WHOAMI takes a net address and returns a client name and also a
- *	likely net address for routing
- *   GETFILE takes a client name and file identifier and returns the
- *	server name, server net address and pathname for the file.
- *   file identifiers typically include root, swap, pub and dump
- */
-
-#ifdef RPC_HDR
-%#include <rpc/types.h>
-%#include <sys/time.h>
-%#include <sys/errno.h>
-%#include <sys/param.h>
-%#include <sys/syslimits.h>
-#else
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)bootparam_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/bootparam_prot.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-const MAX_MACHINE_NAME  = 255;
-const MAX_PATH_LEN	= 1024;
-const MAX_FILEID	= 32;
-const IP_ADDR_TYPE	= 1;
-
-typedef	string	bp_machine_name_t<MAX_MACHINE_NAME>;
-typedef	string	bp_path_t<MAX_PATH_LEN>;
-typedef	string	bp_fileid_t<MAX_FILEID>;
-
-struct	ip_addr_t {
-	char	net;
-	char	host;
-	char	lh;
-	char	impno;
-};
-
-union bp_address switch (int address_type) {
-	case IP_ADDR_TYPE:
-		ip_addr_t	ip_addr;
-};
-
-struct bp_whoami_arg {
-	bp_address		client_address;
-};
-
-struct bp_whoami_res {
-	bp_machine_name_t	client_name;
-	bp_machine_name_t	domain_name;
-	bp_address		router_address;
-};
-
-struct bp_getfile_arg {
-	bp_machine_name_t	client_name;
-	bp_fileid_t		file_id;
-};
-	
-struct bp_getfile_res {
-	bp_machine_name_t	server_name;
-	bp_address		server_address;
-	bp_path_t		server_path;
-};
-
-program BOOTPARAMPROG {
-	version BOOTPARAMVERS {
-		bp_whoami_res	BOOTPARAMPROC_WHOAMI(bp_whoami_arg) = 1;
-		bp_getfile_res	BOOTPARAMPROC_GETFILE(bp_getfile_arg) = 2;
-	} = 1;
-} = 100026;
diff --git a/include.new/rpcsvc/crypt.h b/include.new/rpcsvc/crypt.h
deleted file mode 100644
index 6ab0078..0000000
--- a/include.new/rpcsvc/crypt.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _CRYPT_H_RPCGEN
-#define	_CRYPT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-enum des_dir {
-	ENCRYPT_DES = 0,
-	DECRYPT_DES = 1
-};
-typedef enum des_dir des_dir;
-
-enum des_mode {
-	CBC_DES = 0,
-	ECB_DES = 1
-};
-typedef enum des_mode des_mode;
-
-struct desargs {
-	u_char des_key[8];
-	des_dir des_dir;
-	des_mode des_mode;
-	u_char des_ivec[8];
-	struct {
-		u_int desbuf_len;
-		char *desbuf_val;
-	} desbuf;
-};
-typedef struct desargs desargs;
-
-struct desresp {
-	struct {
-		u_int desbuf_len;
-		char *desbuf_val;
-	} desbuf;
-	u_char des_ivec[8];
-	int stat;
-};
-typedef struct desresp desresp;
-
-#define	CRYPT_PROG ((unsigned long)(600100029))
-#define	CRYPT_VERS ((unsigned long)(1))
-
-extern  void crypt_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	DES_CRYPT ((unsigned long)(1))
-extern  desresp * des_crypt_1(desargs *, CLIENT *);
-extern  desresp * des_crypt_1_svc(desargs *, struct svc_req *);
-extern int crypt_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_des_dir(XDR *, des_dir*);
-extern  bool_t xdr_des_mode(XDR *, des_mode*);
-extern  bool_t xdr_desargs(XDR *, desargs*);
-extern  bool_t xdr_desresp(XDR *, desresp*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_CRYPT_H_RPCGEN */
diff --git a/include.new/rpcsvc/crypt.x b/include.new/rpcsvc/crypt.x
deleted file mode 100644
index 78710fb..0000000
--- a/include.new/rpcsvc/crypt.x
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1996
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul 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.
- */
-
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/crypt.x 114629 2003-05-04 02:51:42Z obrien $");
-#endif
-
-/*
- * This protocol definition exists because of the U.S. government and
- * its stupid export laws. We can't export DES code from the United
- * States to other countries (even though the code already exists
- * outside the U.S. -- go figure that one out) but we need to make
- * Secure RPC work. The normal way around this is to break the DES
- * code out into a shared library; we can then provide a dummy lib
- * in the base OS and provide the real lib in the secure dist, which
- * the user can install later. But we need Secure RPC for NIS+, and
- * there are several system programs that use NIS+ which are statically
- * linked. We would have to provide replacements for these programs
- * in the secure dist, but there are a lot, and this is a pain. The
- * shared lib trick won't work for these programs, and we can't change
- * them once they're compiled.
- *
- * One solution for this problem is to do the DES encryption as a system
- * call; no programs need to be changed and we can even supply the DES
- * support as an LKM. But this bloats the kernel. Maybe if we have
- * Secure NFS one day this will be worth it, but for now we should keep
- * this mess in user space.
- *
- * So we have this second solution: we provide a server that does the
- * DES encryption for us. In this case, the server is keyserv (we need
- * it to make Secure RPC work anyway) and we use this protocol to ship
- * the data back and forth between keyserv and the application.
- */
-
-enum des_dir { ENCRYPT_DES, DECRYPT_DES };
-enum des_mode { CBC_DES, ECB_DES };
-
-struct desargs {
-	u_char des_key[8];	/* key (with low bit parity) */
-	des_dir des_dir;	/* direction */
-	des_mode des_mode;	/* mode */
-	u_char des_ivec[8];	/* input vector */
-	opaque desbuf<>;
-};
-
-struct desresp {
-	opaque desbuf<>;
-	u_char des_ivec[8];
-	int stat;
-};
-
-program CRYPT_PROG {
-	version CRYPT_VERS {
-		desresp
-		DES_CRYPT(desargs) = 1;
-	} = 1;
-} = 600100029;
diff --git a/include.new/rpcsvc/key_prot.h b/include.new/rpcsvc/key_prot.h
deleted file mode 100644
index cdfef87..0000000
--- a/include.new/rpcsvc/key_prot.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _KEY_PROT_H_RPCGEN
-#define	_KEY_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-/* From: #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
-/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/key_prot.x 272850 2014-10-09 23:05:32Z hrs $");
-
-/* 
- * Compiled from key_prot.x using rpcgen.
- * DO NOT EDIT THIS FILE!
- * This is NOT source code!
- */
-#define	PROOT 3
-#define	HEXMODULUS "d4a0ba0250b6fd2ec626e7efd637df76c716e22d0944b88b"
-#define	HEXKEYBYTES 48
-#define	KEYSIZE 192
-#define	KEYBYTES 24
-#define	KEYCHECKSUMSIZE 16
-
-enum keystatus {
-	KEY_SUCCESS = 0,
-	KEY_NOSECRET = 1,
-	KEY_UNKNOWN = 2,
-	KEY_SYSTEMERR = 3
-};
-typedef enum keystatus keystatus;
-
-typedef char keybuf[HEXKEYBYTES];
-
-typedef char *netnamestr;
-
-struct cryptkeyarg {
-	netnamestr remotename;
-	des_block deskey;
-};
-typedef struct cryptkeyarg cryptkeyarg;
-
-struct cryptkeyarg2 {
-	netnamestr remotename;
-	netobj remotekey;
-	des_block deskey;
-};
-typedef struct cryptkeyarg2 cryptkeyarg2;
-
-struct cryptkeyres {
-	keystatus status;
-	union {
-		des_block deskey;
-	} cryptkeyres_u;
-};
-typedef struct cryptkeyres cryptkeyres;
-#define	MAXGIDS 16
-
-struct unixcred {
-	u_int uid;
-	u_int gid;
-	struct {
-		u_int gids_len;
-		u_int *gids_val;
-	} gids;
-};
-typedef struct unixcred unixcred;
-
-struct getcredres {
-	keystatus status;
-	union {
-		unixcred cred;
-	} getcredres_u;
-};
-typedef struct getcredres getcredres;
-
-struct key_netstarg {
-	keybuf st_priv_key;
-	keybuf st_pub_key;
-	netnamestr st_netname;
-};
-typedef struct key_netstarg key_netstarg;
-
-struct key_netstres {
-	keystatus status;
-	union {
-		key_netstarg knet;
-	} key_netstres_u;
-};
-typedef struct key_netstres key_netstres;
-
-#ifndef opaque
-#define opaque char
-#endif
-
-
-#define	KEY_PROG ((unsigned long)(100029))
-#define	KEY_VERS ((unsigned long)(1))
-
-extern  void key_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	KEY_SET ((unsigned long)(1))
-extern  keystatus * key_set_1(char *, CLIENT *);
-extern  keystatus * key_set_1_svc(char *, struct svc_req *);
-#define	KEY_ENCRYPT ((unsigned long)(2))
-extern  cryptkeyres * key_encrypt_1(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_encrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define	KEY_DECRYPT ((unsigned long)(3))
-extern  cryptkeyres * key_decrypt_1(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_decrypt_1_svc(cryptkeyarg *, struct svc_req *);
-#define	KEY_GEN ((unsigned long)(4))
-extern  des_block * key_gen_1(void *, CLIENT *);
-extern  des_block * key_gen_1_svc(void *, struct svc_req *);
-#define	KEY_GETCRED ((unsigned long)(5))
-extern  getcredres * key_getcred_1(netnamestr *, CLIENT *);
-extern  getcredres * key_getcred_1_svc(netnamestr *, struct svc_req *);
-extern int key_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	KEY_VERS2 ((unsigned long)(2))
-
-extern  void key_prog_2(struct svc_req *rqstp, SVCXPRT *transp);
-extern  keystatus * key_set_2(char *, CLIENT *);
-extern  keystatus * key_set_2_svc(char *, struct svc_req *);
-extern  cryptkeyres * key_encrypt_2(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_encrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern  cryptkeyres * key_decrypt_2(cryptkeyarg *, CLIENT *);
-extern  cryptkeyres * key_decrypt_2_svc(cryptkeyarg *, struct svc_req *);
-extern  des_block * key_gen_2(void *, CLIENT *);
-extern  des_block * key_gen_2_svc(void *, struct svc_req *);
-extern  getcredres * key_getcred_2(netnamestr *, CLIENT *);
-extern  getcredres * key_getcred_2_svc(netnamestr *, struct svc_req *);
-#define	KEY_ENCRYPT_PK ((unsigned long)(6))
-extern  cryptkeyres * key_encrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern  cryptkeyres * key_encrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define	KEY_DECRYPT_PK ((unsigned long)(7))
-extern  cryptkeyres * key_decrypt_pk_2(cryptkeyarg2 *, CLIENT *);
-extern  cryptkeyres * key_decrypt_pk_2_svc(cryptkeyarg2 *, struct svc_req *);
-#define	KEY_NET_PUT ((unsigned long)(8))
-extern  keystatus * key_net_put_2(key_netstarg *, CLIENT *);
-extern  keystatus * key_net_put_2_svc(key_netstarg *, struct svc_req *);
-#define	KEY_NET_GET ((unsigned long)(9))
-extern  key_netstres * key_net_get_2(void *, CLIENT *);
-extern  key_netstres * key_net_get_2_svc(void *, struct svc_req *);
-#define	KEY_GET_CONV ((unsigned long)(10))
-extern  cryptkeyres * key_get_conv_2(char *, CLIENT *);
-extern  cryptkeyres * key_get_conv_2_svc(char *, struct svc_req *);
-extern int key_prog_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_keystatus(XDR *, keystatus*);
-extern  bool_t xdr_keybuf(XDR *, keybuf);
-extern  bool_t xdr_netnamestr(XDR *, netnamestr*);
-extern  bool_t xdr_cryptkeyarg(XDR *, cryptkeyarg*);
-extern  bool_t xdr_cryptkeyarg2(XDR *, cryptkeyarg2*);
-extern  bool_t xdr_cryptkeyres(XDR *, cryptkeyres*);
-extern  bool_t xdr_unixcred(XDR *, unixcred*);
-extern  bool_t xdr_getcredres(XDR *, getcredres*);
-extern  bool_t xdr_key_netstarg(XDR *, key_netstarg*);
-extern  bool_t xdr_key_netstres(XDR *, key_netstres*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_KEY_PROT_H_RPCGEN */
diff --git a/include.new/rpcsvc/key_prot.x b/include.new/rpcsvc/key_prot.x
deleted file mode 100644
index 2cb2df7..0000000
--- a/include.new/rpcsvc/key_prot.x
+++ /dev/null
@@ -1,287 +0,0 @@
-%/*-
-% * Copyright (c) 2010, Oracle America, Inc.
-% *
-% * Redistribution and use in source and binary forms, with or without
-% * modification, are permitted provided that the following conditions are
-% * met:
-% *
-% *     * Redistributions of source code must retain the above copyright
-% *       notice, this list of conditions and the following disclaimer.
-% *     * 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.
-% *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
-% *   COPYRIGHT HOLDER 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.
-% */
-/*
- * Key server protocol definition
- * Copyright (C) 1990, 1991 Sun Microsystems, Inc.
- *
- * The keyserver is a public key storage/encryption/decryption service
- * The encryption method used is based on the Diffie-Hellman exponential
- * key exchange technology.
- *
- * The key server is local to each machine, akin to the portmapper.
- * Under TI-RPC, communication with the keyserver is through the
- * loopback transport.
- *
- * NOTE: This .x file generates the USER level headers for the keyserver.
- * the KERNEL level headers are created by hand as they kernel has special
- * requirements.
- */
-
-%/* From: #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
-%/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/key_prot.x 272850 2014-10-09 23:05:32Z hrs $");
-%
-%/* 
-% * Compiled from key_prot.x using rpcgen.
-% * DO NOT EDIT THIS FILE!
-% * This is NOT source code!
-% */
-
-/*
- * PROOT and MODULUS define the way the Diffie-Hellman key is generated.
- *
- * MODULUS should be chosen as a prime of the form: MODULUS == 2*p + 1,
- * where p is also prime.
- *
- * PROOT satisfies the following two conditions:
- * (1) (PROOT ** 2) % MODULUS != 1
- * (2) (PROOT ** p) % MODULUS != 1
- *
- */
-
-const PROOT = 3;
-const HEXMODULUS = "d4a0ba0250b6fd2ec626e7efd637df76c716e22d0944b88b";
-
-const HEXKEYBYTES = 48;		/* HEXKEYBYTES == strlen(HEXMODULUS) */
-const KEYSIZE = 192;		/* KEYSIZE == bit length of key */
-const KEYBYTES = 24;		/* byte length of key */
-
-/*
- * The first 16 hex digits of the encrypted secret key are used as
- * a checksum in the database.
- */
-const KEYCHECKSUMSIZE = 16;
-
-/*
- * status of operation
- */
-enum keystatus {
-	KEY_SUCCESS,	/* no problems */
-	KEY_NOSECRET,	/* no secret key stored */
-	KEY_UNKNOWN,	/* unknown netname */
-	KEY_SYSTEMERR 	/* system error (out of memory, encryption failure) */
-};
-
-typedef opaque keybuf[HEXKEYBYTES];	/* store key in hex */
-
-typedef string netnamestr<MAXNETNAMELEN>;
-
-/*
- * Argument to ENCRYPT or DECRYPT 
- */
-struct cryptkeyarg {
-	netnamestr remotename;
-	des_block deskey;
-};
-
-/*
- * Argument to ENCRYPT_PK or DECRYPT_PK
- */
-struct cryptkeyarg2 {
-	netnamestr remotename;
-	netobj	remotekey;	/* Contains a length up to 1024 bytes */
-	des_block deskey;
-};
-
-
-/*
- * Result of ENCRYPT, DECRYPT, ENCRYPT_PK, and DECRYPT_PK
- */
-union cryptkeyres switch (keystatus status) {
-case KEY_SUCCESS:
-	des_block deskey;
-default:
-	void;
-};
-
-const MAXGIDS  = 16;	/* max number of gids in gid list */
-
-/*
- * Unix credential 
- */	
-struct unixcred {
-	u_int uid;
-	u_int gid;
-	u_int gids<MAXGIDS>;	
-};
-
-/*
- * Result returned from GETCRED
- */
-union getcredres switch (keystatus status) {
-case KEY_SUCCESS:
-	unixcred cred;
-default:
-	void;
-};
-/*
- * key_netstarg;
- */
-
-struct key_netstarg {
-	keybuf st_priv_key;
-	keybuf st_pub_key;
-	netnamestr st_netname;
-};
-
-union key_netstres switch (keystatus status){
-case KEY_SUCCESS:
-	key_netstarg knet;
-default:
-	void;
-};	
-
-#ifdef RPC_HDR
-%
-%#ifndef opaque
-%#define opaque char
-%#endif
-%
-#endif
-program KEY_PROG {
-	version KEY_VERS {
-
-		/*
-		 * This is my secret key.
-	 	 * Store it for me.
-		 */
-		keystatus 
-		KEY_SET(keybuf) = 1;	
-	
-		/*
-		 * I want to talk to X.
-		 * Encrypt a conversation key for me.
-	 	 */
-		cryptkeyres
-		KEY_ENCRYPT(cryptkeyarg) = 2;	
-
-		/*
-		 * X just sent me a message.
-		 * Decrypt the conversation key for me.
-		 */
-		cryptkeyres
-		KEY_DECRYPT(cryptkeyarg) = 3;
-
-		/*
-		 * Generate a secure conversation key for me
-		 */
-		des_block 
-		KEY_GEN(void) = 4;
-
-		/*
-		 * Get me the uid, gid and group-access-list associated
-		 * with this netname (for kernel which cannot use NIS)
-		 */
-		getcredres
-		KEY_GETCRED(netnamestr) = 5;
-	} = 1;
-	version KEY_VERS2 {
-
-		/*
-		 * #######
-		 * Procedures 1-5 are identical to version 1
-		 * #######
-		 */
-
-		/*
-		 * This is my secret key.
-	 	 * Store it for me.
-		 */
-		keystatus 
-		KEY_SET(keybuf) = 1;	
-	
-		/*
-		 * I want to talk to X.
-		 * Encrypt a conversation key for me.
-	 	 */
-		cryptkeyres
-		KEY_ENCRYPT(cryptkeyarg) = 2;	
-
-		/*
-		 * X just sent me a message.
-		 * Decrypt the conversation key for me.
-		 */
-		cryptkeyres
-		KEY_DECRYPT(cryptkeyarg) = 3;
-
-		/*
-		 * Generate a secure conversation key for me
-		 */
-		des_block 
-		KEY_GEN(void) = 4;
-
-		/*
-		 * Get me the uid, gid and group-access-list associated
-		 * with this netname (for kernel which cannot use NIS)
-		 */
-		getcredres
-		KEY_GETCRED(netnamestr) = 5;
-		
-		/*
-		 * I want to talk to X. and I know X's public key
-		 * Encrypt a conversation key for me.
-	 	 */
-		cryptkeyres
-		KEY_ENCRYPT_PK(cryptkeyarg2) = 6;	
-
-		/*
-		 * X just sent me a message. and I know X's public key
-		 * Decrypt the conversation key for me.
-		 */
-		cryptkeyres
-		KEY_DECRYPT_PK(cryptkeyarg2) = 7;
-		
-		/* 
-		 * Store my public key, netname and private key. 
-		 */
-		keystatus
-		KEY_NET_PUT(key_netstarg) = 8;
-		
-		/*
-		 * Retrieve my public key, netname and private key. 
-		 */
- 		key_netstres
-		KEY_NET_GET(void) = 9;
-		
-		/*
-		 * Return me the conversation key that is constructed 
-		 * from my secret key and this publickey. 
-		 */
-
-		cryptkeyres 
-		KEY_GET_CONV(keybuf) = 10; 
-
-		
-	} = 2;
-} = 100029;
-
-
diff --git a/include.new/rpcsvc/klm_prot.h b/include.new/rpcsvc/klm_prot.h
deleted file mode 100644
index 0d60bb2..0000000
--- a/include.new/rpcsvc/klm_prot.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _KLM_PROT_H_RPCGEN
-#define	_KLM_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	LM_MAXSTRLEN 1024
-
-enum klm_stats {
-	klm_granted = 0,
-	klm_denied = 1,
-	klm_denied_nolocks = 2,
-	klm_working = 3
-};
-typedef enum klm_stats klm_stats;
-
-struct klm_lock {
-	char *server_name;
-	netobj fh;
-	int pid;
-	u_int l_offset;
-	u_int l_len;
-};
-typedef struct klm_lock klm_lock;
-
-struct klm_holder {
-	bool_t exclusive;
-	int svid;
-	u_int l_offset;
-	u_int l_len;
-};
-typedef struct klm_holder klm_holder;
-
-struct klm_stat {
-	klm_stats stat;
-};
-typedef struct klm_stat klm_stat;
-
-struct klm_testrply {
-	klm_stats stat;
-	union {
-		struct klm_holder holder;
-	} klm_testrply_u;
-};
-typedef struct klm_testrply klm_testrply;
-
-struct klm_lockargs {
-	bool_t block;
-	bool_t exclusive;
-	struct klm_lock alock;
-};
-typedef struct klm_lockargs klm_lockargs;
-
-struct klm_testargs {
-	bool_t exclusive;
-	struct klm_lock alock;
-};
-typedef struct klm_testargs klm_testargs;
-
-struct klm_unlockargs {
-	struct klm_lock alock;
-};
-typedef struct klm_unlockargs klm_unlockargs;
-
-#define	KLM_PROG ((unsigned long)(100020))
-#define	KLM_VERS ((unsigned long)(1))
-
-extern  void klm_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	KLM_TEST ((unsigned long)(1))
-extern  klm_testrply * klm_test_1(struct klm_testargs *, CLIENT *);
-extern  klm_testrply * klm_test_1_svc(struct klm_testargs *, struct svc_req *);
-#define	KLM_LOCK ((unsigned long)(2))
-extern  klm_stat * klm_lock_1(struct klm_lockargs *, CLIENT *);
-extern  klm_stat * klm_lock_1_svc(struct klm_lockargs *, struct svc_req *);
-#define	KLM_CANCEL ((unsigned long)(3))
-extern  klm_stat * klm_cancel_1(struct klm_lockargs *, CLIENT *);
-extern  klm_stat * klm_cancel_1_svc(struct klm_lockargs *, struct svc_req *);
-#define	KLM_UNLOCK ((unsigned long)(4))
-extern  klm_stat * klm_unlock_1(struct klm_unlockargs *, CLIENT *);
-extern  klm_stat * klm_unlock_1_svc(struct klm_unlockargs *, struct svc_req *);
-extern int klm_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_klm_stats(XDR *, klm_stats*);
-extern  bool_t xdr_klm_lock(XDR *, klm_lock*);
-extern  bool_t xdr_klm_holder(XDR *, klm_holder*);
-extern  bool_t xdr_klm_stat(XDR *, klm_stat*);
-extern  bool_t xdr_klm_testrply(XDR *, klm_testrply*);
-extern  bool_t xdr_klm_lockargs(XDR *, klm_lockargs*);
-extern  bool_t xdr_klm_testargs(XDR *, klm_testargs*);
-extern  bool_t xdr_klm_unlockargs(XDR *, klm_unlockargs*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_KLM_PROT_H_RPCGEN */
diff --git a/include.new/rpcsvc/klm_prot.x b/include.new/rpcsvc/klm_prot.x
deleted file mode 100644
index 54d673a..0000000
--- a/include.new/rpcsvc/klm_prot.x
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * Kernel/lock manager protocol definition
- * Copyright (C) 1986 Sun Microsystems, Inc.
- *
- * protocol used between the UNIX kernel (the "client") and the
- * local lock manager.  The local lock manager is a deamon running
- * above the kernel.
- */
-
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)klm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/klm_prot.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-const	LM_MAXSTRLEN = 1024;
-
-/*
- * lock manager status returns
- */
-enum klm_stats {
-	klm_granted = 0,	/* lock is granted */
-	klm_denied = 1,		/* lock is denied */
-	klm_denied_nolocks = 2, /* no lock entry available */
-	klm_working = 3 	/* lock is being processed */
-};
-
-/*
- * lock manager lock identifier
- */
-struct klm_lock {
-	string server_name<LM_MAXSTRLEN>;
-	netobj fh;		/* a counted file handle */
-	int pid;		/* holder of the lock */
-	unsigned l_offset;	/* beginning offset of the lock */
-	unsigned l_len;		/* byte length of the lock;
-				 * zero means through end of file */
-};
-
-/*
- * lock holder identifier
- */
-struct klm_holder {
-	bool exclusive;		/* FALSE if shared lock */
-	int svid;		/* holder of the lock (pid) */
-	unsigned l_offset;	/* beginning offset of the lock */
-	unsigned l_len;		/* byte length of the lock;
-				 * zero means through end of file */
-};
-
-/*
- * reply to KLM_LOCK / KLM_UNLOCK / KLM_CANCEL
- */
-struct klm_stat {
-	klm_stats stat;
-};
-
-/*
- * reply to a KLM_TEST call
- */
-union klm_testrply switch (klm_stats stat) {
-	case klm_denied:
-		struct klm_holder holder;
-	default: /* All other cases return no arguments */
-		void;
-};
-
-
-/*
- * arguments to KLM_LOCK
- */
-struct klm_lockargs {
-	bool block;
-	bool exclusive;
-	struct klm_lock alock;
-};
-
-/*
- * arguments to KLM_TEST
- */
-struct klm_testargs {
-	bool exclusive;
-	struct klm_lock alock;
-};
-
-/*
- * arguments to KLM_UNLOCK
- */
-struct klm_unlockargs {
-	struct klm_lock alock;
-};
-
-program KLM_PROG {
-	version KLM_VERS {
-
-		klm_testrply	KLM_TEST (struct klm_testargs) =	1;
-
-		klm_stat	KLM_LOCK (struct klm_lockargs) =	2;
-
-		klm_stat	KLM_CANCEL (struct klm_lockargs) =	3;
-		/* klm_granted=> the cancel request fails due to lock is already granted */
-		/* klm_denied=> the cancel request successfully aborts
-lock request  */
-
-		klm_stat	KLM_UNLOCK (struct klm_unlockargs) =	4;
-	} = 1;
-} = 100020;
diff --git a/include.new/rpcsvc/mount.h b/include.new/rpcsvc/mount.h
deleted file mode 100644
index 153a892..0000000
--- a/include.new/rpcsvc/mount.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _MOUNT_H_RPCGEN
-#define	_MOUNT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	MNTPATHLEN 1024
-#define	MNTNAMLEN 255
-#define	FHSIZE 32
-#define	FHSIZE3 64
-
-typedef char fhandle[FHSIZE];
-
-typedef struct {
-	u_int fhandle3_len;
-	char *fhandle3_val;
-} fhandle3;
-
-struct fhstatus {
-	u_int fhs_status;
-	union {
-		fhandle fhs_fhandle;
-	} fhstatus_u;
-};
-typedef struct fhstatus fhstatus;
-
-enum mountstat3 {
-	MNT3_OK = 0,
-	MNT3ERR_PERM = 1,
-	MNT3ERR_NOENT = 2,
-	MNT3ERR_IO = 5,
-	MNT3ERR_ACCES = 13,
-	MNT3ERR_NOTDIR = 20,
-	MNT3ERR_INVAL = 22,
-	MNT3ERR_NAMETOOLONG = 63,
-	MNT3ERR_NOTSUPP = 10004,
-	MNT3ERR_SERVERFAULT = 10006
-};
-typedef enum mountstat3 mountstat3;
-
-struct mountres3_ok {
-	fhandle3 fhandle;
-	struct {
-		u_int auth_flavors_len;
-		int *auth_flavors_val;
-	} auth_flavors;
-};
-typedef struct mountres3_ok mountres3_ok;
-
-struct mountres3 {
-	mountstat3 fhs_status;
-	union {
-		mountres3_ok mountinfo;
-	} mountres3_u;
-};
-typedef struct mountres3 mountres3;
-
-typedef char *dirpath;
-
-typedef char *name;
-
-typedef struct mountbody *mountlist;
-
-struct mountbody {
-	name ml_hostname;
-	dirpath ml_directory;
-	mountlist ml_next;
-};
-typedef struct mountbody mountbody;
-
-typedef struct groupnode *groups;
-
-struct groupnode {
-	name gr_name;
-	groups gr_next;
-};
-typedef struct groupnode groupnode;
-
-typedef struct exportnode *exports;
-
-struct exportnode {
-	dirpath ex_dir;
-	groups ex_groups;
-	exports ex_next;
-};
-typedef struct exportnode exportnode;
-
-#define	MOUNTPROG ((unsigned long)(100005))
-#define	MOUNTVERS ((unsigned long)(1))
-
-extern  void mountprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	MOUNTPROC_NULL ((unsigned long)(0))
-extern  void * mountproc_null_1(void *, CLIENT *);
-extern  void * mountproc_null_1_svc(void *, struct svc_req *);
-#define	MOUNTPROC_MNT ((unsigned long)(1))
-extern  fhstatus * mountproc_mnt_1(dirpath *, CLIENT *);
-extern  fhstatus * mountproc_mnt_1_svc(dirpath *, struct svc_req *);
-#define	MOUNTPROC_DUMP ((unsigned long)(2))
-extern  mountlist * mountproc_dump_1(void *, CLIENT *);
-extern  mountlist * mountproc_dump_1_svc(void *, struct svc_req *);
-#define	MOUNTPROC_UMNT ((unsigned long)(3))
-extern  void * mountproc_umnt_1(dirpath *, CLIENT *);
-extern  void * mountproc_umnt_1_svc(dirpath *, struct svc_req *);
-#define	MOUNTPROC_UMNTALL ((unsigned long)(4))
-extern  void * mountproc_umntall_1(void *, CLIENT *);
-extern  void * mountproc_umntall_1_svc(void *, struct svc_req *);
-#define	MOUNTPROC_EXPORT ((unsigned long)(5))
-extern  exports * mountproc_export_1(void *, CLIENT *);
-extern  exports * mountproc_export_1_svc(void *, struct svc_req *);
-#define	MOUNTPROC_EXPORTALL ((unsigned long)(6))
-extern  exports * mountproc_exportall_1(void *, CLIENT *);
-extern  exports * mountproc_exportall_1_svc(void *, struct svc_req *);
-extern int mountprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	MOUNTVERS3 ((unsigned long)(3))
-
-extern  void mountprog_3(struct svc_req *rqstp, SVCXPRT *transp);
-extern  void * mountproc_null_3(void *, CLIENT *);
-extern  void * mountproc_null_3_svc(void *, struct svc_req *);
-extern  mountres3 * mountproc_mnt_3(dirpath *, CLIENT *);
-extern  mountres3 * mountproc_mnt_3_svc(dirpath *, struct svc_req *);
-extern  mountlist * mountproc_dump_3(void *, CLIENT *);
-extern  mountlist * mountproc_dump_3_svc(void *, struct svc_req *);
-extern  void * mountproc_umnt_3(dirpath *, CLIENT *);
-extern  void * mountproc_umnt_3_svc(dirpath *, struct svc_req *);
-extern  void * mountproc_umntall_3(void *, CLIENT *);
-extern  void * mountproc_umntall_3_svc(void *, struct svc_req *);
-extern  exports * mountproc_export_3(void *, CLIENT *);
-extern  exports * mountproc_export_3_svc(void *, struct svc_req *);
-extern int mountprog_3_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_fhandle(XDR *, fhandle);
-extern  bool_t xdr_fhandle3(XDR *, fhandle3*);
-extern  bool_t xdr_fhstatus(XDR *, fhstatus*);
-extern  bool_t xdr_mountstat3(XDR *, mountstat3*);
-extern  bool_t xdr_mountres3_ok(XDR *, mountres3_ok*);
-extern  bool_t xdr_mountres3(XDR *, mountres3*);
-extern  bool_t xdr_dirpath(XDR *, dirpath*);
-extern  bool_t xdr_name(XDR *, name*);
-extern  bool_t xdr_mountlist(XDR *, mountlist*);
-extern  bool_t xdr_mountbody(XDR *, mountbody*);
-extern  bool_t xdr_groups(XDR *, groups*);
-extern  bool_t xdr_groupnode(XDR *, groupnode*);
-extern  bool_t xdr_exports(XDR *, exports*);
-extern  bool_t xdr_exportnode(XDR *, exportnode*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_MOUNT_H_RPCGEN */
diff --git a/include.new/rpcsvc/mount.x b/include.new/rpcsvc/mount.x
deleted file mode 100644
index 9089d78..0000000
--- a/include.new/rpcsvc/mount.x
+++ /dev/null
@@ -1,259 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * Protocol description for the mount program
- */
-
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)mount.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/mount.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-const MNTPATHLEN = 1024;	/* maximum bytes in a pathname argument */
-const MNTNAMLEN = 255;		/* maximum bytes in a name argument */
-const FHSIZE = 32;		/* size in bytes of a file handle */
-#ifdef WANT_NFS3
-const FHSIZE3 = 64;		/* size in bytes of a file handle (v3) */
-#endif
-
-/*
- * The fhandle is the file handle that the server passes to the client.
- * All file operations are done using the file handles to refer to a file
- * or a directory. The file handle can contain whatever information the
- * server needs to distinguish an individual file.
- */
-typedef opaque fhandle[FHSIZE];	
-#ifdef WANT_NFS3
-typedef opaque fhandle3<FHSIZE3>;
-#endif
-
-/*
- * If a status of zero is returned, the call completed successfully, and 
- * a file handle for the directory follows. A non-zero status indicates
- * some sort of error. The status corresponds with UNIX error numbers.
- */
-union fhstatus switch (unsigned fhs_status) {
-case 0:
-	fhandle fhs_fhandle;
-default:
-	void;
-};
-
-#ifdef WANT_NFS3
-/*
- * Status codes returned by the version 3 mount call.
- */
-enum mountstat3 {
-	MNT3_OK = 0,                 /* no error */
-	MNT3ERR_PERM = 1,            /* Not owner */
-	MNT3ERR_NOENT = 2,           /* No such file or directory */
-	MNT3ERR_IO = 5,              /* I/O error */
-	MNT3ERR_ACCES = 13,          /* Permission denied */
-	MNT3ERR_NOTDIR = 20,         /* Not a directory */
-	MNT3ERR_INVAL = 22,          /* Invalid argument */
-	MNT3ERR_NAMETOOLONG = 63,    /* Filename too long */
-	MNT3ERR_NOTSUPP = 10004,     /* Operation not supported */
-	MNT3ERR_SERVERFAULT = 10006  /* A failure on the server */
-};
-
-struct mountres3_ok {
-	fhandle3	fhandle;
-	int		auth_flavors<>;
-};
-
-union mountres3 switch (mountstat3 fhs_status) {
-case 0:
-	mountres3_ok	mountinfo;
-default:
-	void;
-};
-#endif
-
-/*
- * The type dirpath is the pathname of a directory
- */
-typedef string dirpath<MNTPATHLEN>;
-
-/*
- * The type name is used for arbitrary names (hostnames, groupnames)
- */
-typedef string name<MNTNAMLEN>;
-
-/*
- * A list of who has what mounted
- */
-typedef struct mountbody *mountlist;
-struct mountbody {
-	name ml_hostname;
-	dirpath ml_directory;
-	mountlist ml_next;
-};
-
-/*
- * A list of netgroups
- */
-typedef struct groupnode *groups;
-struct groupnode {
-	name gr_name;
-	groups gr_next;
-};
-
-/*
- * A list of what is exported and to whom
- */
-typedef struct exportnode *exports;
-struct exportnode {
-	dirpath ex_dir;
-	groups ex_groups;
-	exports ex_next;
-};
-
-program MOUNTPROG {
-	/*
-	 * Version one of the mount protocol communicates with version two
-	 * of the NFS protocol. Version three communicates with
-	 * version three of the NFS protocol. The only connecting
-	 * point is the fhandle structure, which is the same for both
-	 * protocols.
-	 */
-	version MOUNTVERS {
-		/*
-		 * Does no work. It is made available in all RPC services
-		 * to allow server response testing and timing
-		 */
-		void
-		MOUNTPROC_NULL(void) = 0;
-
-		/*	
-		 * If fhs_status is 0, then fhs_fhandle contains the
-	 	 * file handle for the directory. This file handle may
-		 * be used in the NFS protocol. This procedure also adds
-		 * a new entry to the mount list for this client mounting
-		 * the directory.
-		 * Unix authentication required.
-		 */
-		fhstatus 
-		MOUNTPROC_MNT(dirpath) = 1;
-
-		/*
-		 * Returns the list of remotely mounted filesystems. The 
-		 * mountlist contains one entry for each hostname and 
-		 * directory pair.
-		 */
-		mountlist
-		MOUNTPROC_DUMP(void) = 2;
-
-		/*
-		 * Removes the mount list entry for the directory
-		 * Unix authentication required.
-		 */
-		void
-		MOUNTPROC_UMNT(dirpath) = 3;
-
-		/*
-		 * Removes all of the mount list entries for this client
-		 * Unix authentication required.
-		 */
-		void
-		MOUNTPROC_UMNTALL(void) = 4;
-
-		/*
-		 * Returns a list of all the exported filesystems, and which
-		 * machines are allowed to import it.
-		 */
-		exports
-		MOUNTPROC_EXPORT(void)  = 5;
-
-		/*
-		 * Identical to MOUNTPROC_EXPORT above
-		 */
-		exports
-		MOUNTPROC_EXPORTALL(void) = 6;
-	} = 1;
-#ifdef WANT_NFS3
-	version MOUNTVERS3 {
-		/*
-		 * Does no work. It is made available in all RPC services
-		 * to allow server response testing and timing
-		 */
-		void
-		MOUNTPROC_NULL(void) = 0;
-
-		/*
-		 * If mountres3.fhs_status is MNT3_OK, then
-		 * mountres3.mountinfo contains the file handle for
-		 * the directory and a list of acceptable
-		 * authentication flavors.  This file handle may only
-		 * be used in the NFS version 3 protocol.  This
-		 * procedure also results in the server adding a new
-		 * entry to its mount list recording that this client
-		 * has mounted the directory. AUTH_UNIX authentication
-		 * or better is required.
-		 */
-		mountres3
-		MOUNTPROC_MNT(dirpath) = 1;
-
-		/*
-		 * Returns the list of remotely mounted filesystems. The 
-		 * mountlist contains one entry for each hostname and 
-		 * directory pair.
-		 */
-		mountlist
-		MOUNTPROC_DUMP(void) = 2;
-
-		/*
-		 * Removes the mount list entry for the directory
-		 * Unix authentication required.
-		 */
-		void
-		MOUNTPROC_UMNT(dirpath) = 3;
-
-		/*
-		 * Removes all of the mount list entries for this client
-		 * Unix authentication required.
-		 */
-		void
-		MOUNTPROC_UMNTALL(void) = 4;
-
-		/*
-		 * Returns a list of all the exported filesystems, and which
-		 * machines are allowed to import it.
-		 */
-		exports
-		MOUNTPROC_EXPORT(void)  = 5;
-	} = 3;
-#endif
-} = 100005;
diff --git a/include.new/rpcsvc/nfs_prot.h b/include.new/rpcsvc/nfs_prot.h
deleted file mode 100644
index 18da79a..0000000
--- a/include.new/rpcsvc/nfs_prot.h
+++ /dev/null
@@ -1,1456 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NFS_PROT_H_RPCGEN
-#define	_NFS_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	NFS_PORT 2049
-#define	NFS_MAXDATA 8192
-#define	NFS_MAXPATHLEN 1024
-#define	NFS_MAXNAMLEN 255
-#define	NFS_FHSIZE 32
-#define	NFS_COOKIESIZE 4
-#define	NFS_FIFO_DEV -1
-#define	NFSMODE_FMT 0170000
-#define	NFSMODE_DIR 0040000
-#define	NFSMODE_CHR 0020000
-#define	NFSMODE_BLK 0060000
-#define	NFSMODE_REG 0100000
-#define	NFSMODE_LNK 0120000
-#define	NFSMODE_SOCK 0140000
-#define	NFSMODE_FIFO 0010000
-
-enum nfsstat {
-	NFS_OK = 0,
-	NFSERR_PERM = 1,
-	NFSERR_NOENT = 2,
-	NFSERR_IO = 5,
-	NFSERR_NXIO = 6,
-	NFSERR_ACCES = 13,
-	NFSERR_EXIST = 17,
-	NFSERR_NODEV = 19,
-	NFSERR_NOTDIR = 20,
-	NFSERR_ISDIR = 21,
-	NFSERR_FBIG = 27,
-	NFSERR_NOSPC = 28,
-	NFSERR_ROFS = 30,
-	NFSERR_NAMETOOLONG = 63,
-	NFSERR_NOTEMPTY = 66,
-	NFSERR_DQUOT = 69,
-	NFSERR_STALE = 70,
-	NFSERR_WFLUSH = 99
-};
-typedef enum nfsstat nfsstat;
-
-enum ftype {
-	NFNON = 0,
-	NFREG = 1,
-	NFDIR = 2,
-	NFBLK = 3,
-	NFCHR = 4,
-	NFLNK = 5,
-	NFSOCK = 6,
-	NFBAD = 7,
-	NFFIFO = 8
-};
-typedef enum ftype ftype;
-
-struct nfs_fh {
-	char data[NFS_FHSIZE];
-};
-typedef struct nfs_fh nfs_fh;
-
-struct nfstime {
-	u_int seconds;
-	u_int useconds;
-};
-typedef struct nfstime nfstime;
-
-struct fattr {
-	ftype type;
-	u_int mode;
-	u_int nlink;
-	u_int uid;
-	u_int gid;
-	u_int size;
-	u_int blocksize;
-	u_int rdev;
-	u_int blocks;
-	u_int fsid;
-	u_int fileid;
-	nfstime atime;
-	nfstime mtime;
-	nfstime ctime;
-};
-typedef struct fattr fattr;
-
-struct sattr {
-	u_int mode;
-	u_int uid;
-	u_int gid;
-	u_int size;
-	nfstime atime;
-	nfstime mtime;
-};
-typedef struct sattr sattr;
-
-typedef char *filename;
-
-typedef char *nfspath;
-
-struct attrstat {
-	nfsstat status;
-	union {
-		fattr attributes;
-	} attrstat_u;
-};
-typedef struct attrstat attrstat;
-
-struct sattrargs {
-	nfs_fh file;
-	sattr attributes;
-};
-typedef struct sattrargs sattrargs;
-
-struct diropargs {
-	nfs_fh dir;
-	filename name;
-};
-typedef struct diropargs diropargs;
-
-struct diropokres {
-	nfs_fh file;
-	fattr attributes;
-};
-typedef struct diropokres diropokres;
-
-struct diropres {
-	nfsstat status;
-	union {
-		diropokres diropres;
-	} diropres_u;
-};
-typedef struct diropres diropres;
-
-struct readlinkres {
-	nfsstat status;
-	union {
-		nfspath data;
-	} readlinkres_u;
-};
-typedef struct readlinkres readlinkres;
-
-struct readargs {
-	nfs_fh file;
-	u_int offset;
-	u_int count;
-	u_int totalcount;
-};
-typedef struct readargs readargs;
-
-struct readokres {
-	fattr attributes;
-	struct {
-		u_int data_len;
-		char *data_val;
-	} data;
-};
-typedef struct readokres readokres;
-
-struct readres {
-	nfsstat status;
-	union {
-		readokres reply;
-	} readres_u;
-};
-typedef struct readres readres;
-
-struct writeargs {
-	nfs_fh file;
-	u_int beginoffset;
-	u_int offset;
-	u_int totalcount;
-	struct {
-		u_int data_len;
-		char *data_val;
-	} data;
-};
-typedef struct writeargs writeargs;
-
-struct createargs {
-	diropargs where;
-	sattr attributes;
-};
-typedef struct createargs createargs;
-
-struct renameargs {
-	diropargs from;
-	diropargs to;
-};
-typedef struct renameargs renameargs;
-
-struct linkargs {
-	nfs_fh from;
-	diropargs to;
-};
-typedef struct linkargs linkargs;
-
-struct symlinkargs {
-	diropargs from;
-	nfspath to;
-	sattr attributes;
-};
-typedef struct symlinkargs symlinkargs;
-
-typedef char nfscookie[NFS_COOKIESIZE];
-
-struct readdirargs {
-	nfs_fh dir;
-	nfscookie cookie;
-	u_int count;
-};
-typedef struct readdirargs readdirargs;
-
-struct entry {
-	u_int fileid;
-	filename name;
-	nfscookie cookie;
-	struct entry *nextentry;
-};
-typedef struct entry entry;
-
-struct dirlist {
-	entry *entries;
-	bool_t eof;
-};
-typedef struct dirlist dirlist;
-
-struct readdirres {
-	nfsstat status;
-	union {
-		dirlist reply;
-	} readdirres_u;
-};
-typedef struct readdirres readdirres;
-
-struct statfsokres {
-	u_int tsize;
-	u_int bsize;
-	u_int blocks;
-	u_int bfree;
-	u_int bavail;
-};
-typedef struct statfsokres statfsokres;
-
-struct statfsres {
-	nfsstat status;
-	union {
-		statfsokres reply;
-	} statfsres_u;
-};
-typedef struct statfsres statfsres;
-#define	NFS3_FHSIZE 64
-#define	NFS3_COOKIEVERFSIZE 8
-#define	NFS3_CREATEVERFSIZE 8
-#define	NFS3_WRITEVERFSIZE 8
-
-typedef u_int64_t uint64;
-
-typedef int64_t int64;
-
-typedef u_long uint32;
-
-typedef long int32;
-
-typedef char *filename3;
-
-typedef char *nfspath3;
-
-typedef uint64 fileid3;
-
-typedef uint64 cookie3;
-
-typedef char cookieverf3[NFS3_COOKIEVERFSIZE];
-
-typedef char createverf3[NFS3_CREATEVERFSIZE];
-
-typedef char writeverf3[NFS3_WRITEVERFSIZE];
-
-typedef uint32 uid3;
-
-typedef uint32 gid3;
-
-typedef uint64 size3;
-
-typedef uint64 offset3;
-
-typedef uint32 mode3;
-
-typedef uint32 count3;
-
-enum nfsstat3 {
-	NFS3_OK = 0,
-	NFS3ERR_PERM = 1,
-	NFS3ERR_NOENT = 2,
-	NFS3ERR_IO = 5,
-	NFS3ERR_NXIO = 6,
-	NFS3ERR_ACCES = 13,
-	NFS3ERR_EXIST = 17,
-	NFS3ERR_XDEV = 18,
-	NFS3ERR_NODEV = 19,
-	NFS3ERR_NOTDIR = 20,
-	NFS3ERR_ISDIR = 21,
-	NFS3ERR_INVAL = 22,
-	NFS3ERR_FBIG = 27,
-	NFS3ERR_NOSPC = 28,
-	NFS3ERR_ROFS = 30,
-	NFS3ERR_MLINK = 31,
-	NFS3ERR_NAMETOOLONG = 63,
-	NFS3ERR_NOTEMPTY = 66,
-	NFS3ERR_DQUOT = 69,
-	NFS3ERR_STALE = 70,
-	NFS3ERR_REMOTE = 71,
-	NFS3ERR_BADHANDLE = 10001,
-	NFS3ERR_NOT_SYNC = 10002,
-	NFS3ERR_BAD_COOKIE = 10003,
-	NFS3ERR_NOTSUPP = 10004,
-	NFS3ERR_TOOSMALL = 10005,
-	NFS3ERR_SERVERFAULT = 10006,
-	NFS3ERR_BADTYPE = 10007,
-	NFS3ERR_JUKEBOX = 10008
-};
-typedef enum nfsstat3 nfsstat3;
-
-enum ftype3 {
-	NF3REG = 1,
-	NF3DIR = 2,
-	NF3BLK = 3,
-	NF3CHR = 4,
-	NF3LNK = 5,
-	NF3SOCK = 6,
-	NF3FIFO = 7
-};
-typedef enum ftype3 ftype3;
-
-struct specdata3 {
-	uint32 specdata1;
-	uint32 specdata2;
-};
-typedef struct specdata3 specdata3;
-
-struct nfs_fh3 {
-	struct {
-		u_int data_len;
-		char *data_val;
-	} data;
-};
-typedef struct nfs_fh3 nfs_fh3;
-
-struct nfstime3 {
-	uint32 seconds;
-	uint32 nseconds;
-};
-typedef struct nfstime3 nfstime3;
-
-struct fattr3 {
-	ftype3 type;
-	mode3 mode;
-	uint32 nlink;
-	uid3 uid;
-	gid3 gid;
-	size3 size;
-	size3 used;
-	specdata3 rdev;
-	uint64 fsid;
-	fileid3 fileid;
-	nfstime3 atime;
-	nfstime3 mtime;
-	nfstime3 ctime;
-};
-typedef struct fattr3 fattr3;
-
-struct post_op_attr {
-	bool_t attributes_follow;
-	union {
-		fattr3 attributes;
-	} post_op_attr_u;
-};
-typedef struct post_op_attr post_op_attr;
-
-struct wcc_attr {
-	size3 size;
-	nfstime3 mtime;
-	nfstime3 ctime;
-};
-typedef struct wcc_attr wcc_attr;
-
-struct pre_op_attr {
-	bool_t attributes_follow;
-	union {
-		wcc_attr attributes;
-	} pre_op_attr_u;
-};
-typedef struct pre_op_attr pre_op_attr;
-
-struct wcc_data {
-	pre_op_attr before;
-	post_op_attr after;
-};
-typedef struct wcc_data wcc_data;
-
-struct post_op_fh3 {
-	bool_t handle_follows;
-	union {
-		nfs_fh3 handle;
-	} post_op_fh3_u;
-};
-typedef struct post_op_fh3 post_op_fh3;
-
-enum time_how {
-	DONT_CHANGE = 0,
-	SET_TO_SERVER_TIME = 1,
-	SET_TO_CLIENT_TIME = 2
-};
-typedef enum time_how time_how;
-
-struct set_mode3 {
-	bool_t set_it;
-	union {
-		mode3 mode;
-	} set_mode3_u;
-};
-typedef struct set_mode3 set_mode3;
-
-struct set_uid3 {
-	bool_t set_it;
-	union {
-		uid3 uid;
-	} set_uid3_u;
-};
-typedef struct set_uid3 set_uid3;
-
-struct set_gid3 {
-	bool_t set_it;
-	union {
-		gid3 gid;
-	} set_gid3_u;
-};
-typedef struct set_gid3 set_gid3;
-
-struct set_size3 {
-	bool_t set_it;
-	union {
-		size3 size;
-	} set_size3_u;
-};
-typedef struct set_size3 set_size3;
-
-struct set_atime {
-	time_how set_it;
-	union {
-		nfstime3 atime;
-	} set_atime_u;
-};
-typedef struct set_atime set_atime;
-
-struct set_mtime {
-	time_how set_it;
-	union {
-		nfstime3 mtime;
-	} set_mtime_u;
-};
-typedef struct set_mtime set_mtime;
-
-struct sattr3 {
-	set_mode3 mode;
-	set_uid3 uid;
-	set_gid3 gid;
-	set_size3 size;
-	set_atime atime;
-	set_mtime mtime;
-};
-typedef struct sattr3 sattr3;
-
-struct diropargs3 {
-	nfs_fh3 dir;
-	filename3 name;
-};
-typedef struct diropargs3 diropargs3;
-
-struct GETATTR3args {
-	nfs_fh3 object;
-};
-typedef struct GETATTR3args GETATTR3args;
-
-struct GETATTR3resok {
-	fattr3 obj_attributes;
-};
-typedef struct GETATTR3resok GETATTR3resok;
-
-struct GETATTR3res {
-	nfsstat3 status;
-	union {
-		GETATTR3resok resok;
-	} GETATTR3res_u;
-};
-typedef struct GETATTR3res GETATTR3res;
-
-struct sattrguard3 {
-	bool_t check;
-	union {
-		nfstime3 obj_ctime;
-	} sattrguard3_u;
-};
-typedef struct sattrguard3 sattrguard3;
-
-struct SETATTR3args {
-	nfs_fh3 object;
-	sattr3 new_attributes;
-	sattrguard3 guard;
-};
-typedef struct SETATTR3args SETATTR3args;
-
-struct SETATTR3resok {
-	wcc_data obj_wcc;
-};
-typedef struct SETATTR3resok SETATTR3resok;
-
-struct SETATTR3resfail {
-	wcc_data obj_wcc;
-};
-typedef struct SETATTR3resfail SETATTR3resfail;
-
-struct SETATTR3res {
-	nfsstat3 status;
-	union {
-		SETATTR3resok resok;
-		SETATTR3resfail resfail;
-	} SETATTR3res_u;
-};
-typedef struct SETATTR3res SETATTR3res;
-
-struct LOOKUP3args {
-	diropargs3 what;
-};
-typedef struct LOOKUP3args LOOKUP3args;
-
-struct LOOKUP3resok {
-	nfs_fh3 object;
-	post_op_attr obj_attributes;
-	post_op_attr dir_attributes;
-};
-typedef struct LOOKUP3resok LOOKUP3resok;
-
-struct LOOKUP3resfail {
-	post_op_attr dir_attributes;
-};
-typedef struct LOOKUP3resfail LOOKUP3resfail;
-
-struct LOOKUP3res {
-	nfsstat3 status;
-	union {
-		LOOKUP3resok resok;
-		LOOKUP3resfail resfail;
-	} LOOKUP3res_u;
-};
-typedef struct LOOKUP3res LOOKUP3res;
-#define	ACCESS3_READ 0x0001
-#define	ACCESS3_LOOKUP 0x0002
-#define	ACCESS3_MODIFY 0x0004
-#define	ACCESS3_EXTEND 0x0008
-#define	ACCESS3_DELETE 0x0010
-#define	ACCESS3_EXECUTE 0x0020
-
-struct ACCESS3args {
-	nfs_fh3 object;
-	uint32 access;
-};
-typedef struct ACCESS3args ACCESS3args;
-
-struct ACCESS3resok {
-	post_op_attr obj_attributes;
-	uint32 access;
-};
-typedef struct ACCESS3resok ACCESS3resok;
-
-struct ACCESS3resfail {
-	post_op_attr obj_attributes;
-};
-typedef struct ACCESS3resfail ACCESS3resfail;
-
-struct ACCESS3res {
-	nfsstat3 status;
-	union {
-		ACCESS3resok resok;
-		ACCESS3resfail resfail;
-	} ACCESS3res_u;
-};
-typedef struct ACCESS3res ACCESS3res;
-
-struct READLINK3args {
-	nfs_fh3 symlink;
-};
-typedef struct READLINK3args READLINK3args;
-
-struct READLINK3resok {
-	post_op_attr symlink_attributes;
-	nfspath3 data;
-};
-typedef struct READLINK3resok READLINK3resok;
-
-struct READLINK3resfail {
-	post_op_attr symlink_attributes;
-};
-typedef struct READLINK3resfail READLINK3resfail;
-
-struct READLINK3res {
-	nfsstat3 status;
-	union {
-		READLINK3resok resok;
-		READLINK3resfail resfail;
-	} READLINK3res_u;
-};
-typedef struct READLINK3res READLINK3res;
-
-struct READ3args {
-	nfs_fh3 file;
-	offset3 offset;
-	count3 count;
-};
-typedef struct READ3args READ3args;
-
-struct READ3resok {
-	post_op_attr file_attributes;
-	count3 count;
-	bool_t eof;
-	struct {
-		u_int data_len;
-		char *data_val;
-	} data;
-};
-typedef struct READ3resok READ3resok;
-
-struct READ3resfail {
-	post_op_attr file_attributes;
-};
-typedef struct READ3resfail READ3resfail;
-
-struct READ3res {
-	nfsstat3 status;
-	union {
-		READ3resok resok;
-		READ3resfail resfail;
-	} READ3res_u;
-};
-typedef struct READ3res READ3res;
-
-enum stable_how {
-	UNSTABLE = 0,
-	DATA_SYNC = 1,
-	FILE_SYNC = 2
-};
-typedef enum stable_how stable_how;
-
-struct WRITE3args {
-	nfs_fh3 file;
-	offset3 offset;
-	count3 count;
-	stable_how stable;
-	struct {
-		u_int data_len;
-		char *data_val;
-	} data;
-};
-typedef struct WRITE3args WRITE3args;
-
-struct WRITE3resok {
-	wcc_data file_wcc;
-	count3 count;
-	stable_how committed;
-	writeverf3 verf;
-};
-typedef struct WRITE3resok WRITE3resok;
-
-struct WRITE3resfail {
-	wcc_data file_wcc;
-};
-typedef struct WRITE3resfail WRITE3resfail;
-
-struct WRITE3res {
-	nfsstat3 status;
-	union {
-		WRITE3resok resok;
-		WRITE3resfail resfail;
-	} WRITE3res_u;
-};
-typedef struct WRITE3res WRITE3res;
-
-enum createmode3 {
-	UNCHECKED = 0,
-	GUARDED = 1,
-	EXCLUSIVE = 2
-};
-typedef enum createmode3 createmode3;
-
-struct createhow3 {
-	createmode3 mode;
-	union {
-		sattr3 obj_attributes;
-		createverf3 verf;
-	} createhow3_u;
-};
-typedef struct createhow3 createhow3;
-
-struct CREATE3args {
-	diropargs3 where;
-	createhow3 how;
-};
-typedef struct CREATE3args CREATE3args;
-
-struct CREATE3resok {
-	post_op_fh3 obj;
-	post_op_attr obj_attributes;
-	wcc_data dir_wcc;
-};
-typedef struct CREATE3resok CREATE3resok;
-
-struct CREATE3resfail {
-	wcc_data dir_wcc;
-};
-typedef struct CREATE3resfail CREATE3resfail;
-
-struct CREATE3res {
-	nfsstat3 status;
-	union {
-		CREATE3resok resok;
-		CREATE3resfail resfail;
-	} CREATE3res_u;
-};
-typedef struct CREATE3res CREATE3res;
-
-struct MKDIR3args {
-	diropargs3 where;
-	sattr3 attributes;
-};
-typedef struct MKDIR3args MKDIR3args;
-
-struct MKDIR3resok {
-	post_op_fh3 obj;
-	post_op_attr obj_attributes;
-	wcc_data dir_wcc;
-};
-typedef struct MKDIR3resok MKDIR3resok;
-
-struct MKDIR3resfail {
-	wcc_data dir_wcc;
-};
-typedef struct MKDIR3resfail MKDIR3resfail;
-
-struct MKDIR3res {
-	nfsstat3 status;
-	union {
-		MKDIR3resok resok;
-		MKDIR3resfail resfail;
-	} MKDIR3res_u;
-};
-typedef struct MKDIR3res MKDIR3res;
-
-struct symlinkdata3 {
-	sattr3 symlink_attributes;
-	nfspath3 symlink_data;
-};
-typedef struct symlinkdata3 symlinkdata3;
-
-struct SYMLINK3args {
-	diropargs3 where;
-	symlinkdata3 symlink;
-};
-typedef struct SYMLINK3args SYMLINK3args;
-
-struct SYMLINK3resok {
-	post_op_fh3 obj;
-	post_op_attr obj_attributes;
-	wcc_data dir_wcc;
-};
-typedef struct SYMLINK3resok SYMLINK3resok;
-
-struct SYMLINK3resfail {
-	wcc_data dir_wcc;
-};
-typedef struct SYMLINK3resfail SYMLINK3resfail;
-
-struct SYMLINK3res {
-	nfsstat3 status;
-	union {
-		SYMLINK3resok resok;
-		SYMLINK3resfail resfail;
-	} SYMLINK3res_u;
-};
-typedef struct SYMLINK3res SYMLINK3res;
-
-struct devicedata3 {
-	sattr3 dev_attributes;
-	specdata3 spec;
-};
-typedef struct devicedata3 devicedata3;
-
-struct mknoddata3 {
-	ftype3 type;
-	union {
-		devicedata3 device;
-		sattr3 pipe_attributes;
-	} mknoddata3_u;
-};
-typedef struct mknoddata3 mknoddata3;
-
-struct MKNOD3args {
-	diropargs3 where;
-	mknoddata3 what;
-};
-typedef struct MKNOD3args MKNOD3args;
-
-struct MKNOD3resok {
-	post_op_fh3 obj;
-	post_op_attr obj_attributes;
-	wcc_data dir_wcc;
-};
-typedef struct MKNOD3resok MKNOD3resok;
-
-struct MKNOD3resfail {
-	wcc_data dir_wcc;
-};
-typedef struct MKNOD3resfail MKNOD3resfail;
-
-struct MKNOD3res {
-	nfsstat3 status;
-	union {
-		MKNOD3resok resok;
-		MKNOD3resfail resfail;
-	} MKNOD3res_u;
-};
-typedef struct MKNOD3res MKNOD3res;
-
-struct REMOVE3args {
-	diropargs3 object;
-};
-typedef struct REMOVE3args REMOVE3args;
-
-struct REMOVE3resok {
-	wcc_data dir_wcc;
-};
-typedef struct REMOVE3resok REMOVE3resok;
-
-struct REMOVE3resfail {
-	wcc_data dir_wcc;
-};
-typedef struct REMOVE3resfail REMOVE3resfail;
-
-struct REMOVE3res {
-	nfsstat3 status;
-	union {
-		REMOVE3resok resok;
-		REMOVE3resfail resfail;
-	} REMOVE3res_u;
-};
-typedef struct REMOVE3res REMOVE3res;
-
-struct RMDIR3args {
-	diropargs3 object;
-};
-typedef struct RMDIR3args RMDIR3args;
-
-struct RMDIR3resok {
-	wcc_data dir_wcc;
-};
-typedef struct RMDIR3resok RMDIR3resok;
-
-struct RMDIR3resfail {
-	wcc_data dir_wcc;
-};
-typedef struct RMDIR3resfail RMDIR3resfail;
-
-struct RMDIR3res {
-	nfsstat3 status;
-	union {
-		RMDIR3resok resok;
-		RMDIR3resfail resfail;
-	} RMDIR3res_u;
-};
-typedef struct RMDIR3res RMDIR3res;
-
-struct RENAME3args {
-	diropargs3 from;
-	diropargs3 to;
-};
-typedef struct RENAME3args RENAME3args;
-
-struct RENAME3resok {
-	wcc_data fromdir_wcc;
-	wcc_data todir_wcc;
-};
-typedef struct RENAME3resok RENAME3resok;
-
-struct RENAME3resfail {
-	wcc_data fromdir_wcc;
-	wcc_data todir_wcc;
-};
-typedef struct RENAME3resfail RENAME3resfail;
-
-struct RENAME3res {
-	nfsstat3 status;
-	union {
-		RENAME3resok resok;
-		RENAME3resfail resfail;
-	} RENAME3res_u;
-};
-typedef struct RENAME3res RENAME3res;
-
-struct LINK3args {
-	nfs_fh3 file;
-	diropargs3 link;
-};
-typedef struct LINK3args LINK3args;
-
-struct LINK3resok {
-	post_op_attr file_attributes;
-	wcc_data linkdir_wcc;
-};
-typedef struct LINK3resok LINK3resok;
-
-struct LINK3resfail {
-	post_op_attr file_attributes;
-	wcc_data linkdir_wcc;
-};
-typedef struct LINK3resfail LINK3resfail;
-
-struct LINK3res {
-	nfsstat3 status;
-	union {
-		LINK3resok resok;
-		LINK3resfail resfail;
-	} LINK3res_u;
-};
-typedef struct LINK3res LINK3res;
-
-struct READDIR3args {
-	nfs_fh3 dir;
-	cookie3 cookie;
-	cookieverf3 cookieverf;
-	count3 count;
-};
-typedef struct READDIR3args READDIR3args;
-
-struct entry3 {
-	fileid3 fileid;
-	filename3 name;
-	cookie3 cookie;
-	struct entry3 *nextentry;
-};
-typedef struct entry3 entry3;
-
-struct dirlist3 {
-	entry3 *entries;
-	bool_t eof;
-};
-typedef struct dirlist3 dirlist3;
-
-struct READDIR3resok {
-	post_op_attr dir_attributes;
-	cookieverf3 cookieverf;
-	dirlist3 reply;
-};
-typedef struct READDIR3resok READDIR3resok;
-
-struct READDIR3resfail {
-	post_op_attr dir_attributes;
-};
-typedef struct READDIR3resfail READDIR3resfail;
-
-struct READDIR3res {
-	nfsstat3 status;
-	union {
-		READDIR3resok resok;
-		READDIR3resfail resfail;
-	} READDIR3res_u;
-};
-typedef struct READDIR3res READDIR3res;
-
-struct READDIRPLUS3args {
-	nfs_fh3 dir;
-	cookie3 cookie;
-	cookieverf3 cookieverf;
-	count3 dircount;
-	count3 maxcount;
-};
-typedef struct READDIRPLUS3args READDIRPLUS3args;
-
-struct entryplus3 {
-	fileid3 fileid;
-	filename3 name;
-	cookie3 cookie;
-	post_op_attr name_attributes;
-	post_op_fh3 name_handle;
-	struct entryplus3 *nextentry;
-};
-typedef struct entryplus3 entryplus3;
-
-struct dirlistplus3 {
-	entryplus3 *entries;
-	bool_t eof;
-};
-typedef struct dirlistplus3 dirlistplus3;
-
-struct READDIRPLUS3resok {
-	post_op_attr dir_attributes;
-	cookieverf3 cookieverf;
-	dirlistplus3 reply;
-};
-typedef struct READDIRPLUS3resok READDIRPLUS3resok;
-
-struct READDIRPLUS3resfail {
-	post_op_attr dir_attributes;
-};
-typedef struct READDIRPLUS3resfail READDIRPLUS3resfail;
-
-struct READDIRPLUS3res {
-	nfsstat3 status;
-	union {
-		READDIRPLUS3resok resok;
-		READDIRPLUS3resfail resfail;
-	} READDIRPLUS3res_u;
-};
-typedef struct READDIRPLUS3res READDIRPLUS3res;
-
-struct FSSTAT3args {
-	nfs_fh3 fsroot;
-};
-typedef struct FSSTAT3args FSSTAT3args;
-
-struct FSSTAT3resok {
-	post_op_attr obj_attributes;
-	size3 tbytes;
-	size3 fbytes;
-	size3 abytes;
-	size3 tfiles;
-	size3 ffiles;
-	size3 afiles;
-	uint32 invarsec;
-};
-typedef struct FSSTAT3resok FSSTAT3resok;
-
-struct FSSTAT3resfail {
-	post_op_attr obj_attributes;
-};
-typedef struct FSSTAT3resfail FSSTAT3resfail;
-
-struct FSSTAT3res {
-	nfsstat3 status;
-	union {
-		FSSTAT3resok resok;
-		FSSTAT3resfail resfail;
-	} FSSTAT3res_u;
-};
-typedef struct FSSTAT3res FSSTAT3res;
-#define	FSF3_LINK 0x0001
-#define	FSF3_SYMLINK 0x0002
-#define	FSF3_HOMOGENEOUS 0x0008
-#define	FSF3_CANSETTIME 0x0010
-
-struct FSINFO3args {
-	nfs_fh3 fsroot;
-};
-typedef struct FSINFO3args FSINFO3args;
-
-struct FSINFO3resok {
-	post_op_attr obj_attributes;
-	uint32 rtmax;
-	uint32 rtpref;
-	uint32 rtmult;
-	uint32 wtmax;
-	uint32 wtpref;
-	uint32 wtmult;
-	uint32 dtpref;
-	size3 maxfilesize;
-	nfstime3 time_delta;
-	uint32 properties;
-};
-typedef struct FSINFO3resok FSINFO3resok;
-
-struct FSINFO3resfail {
-	post_op_attr obj_attributes;
-};
-typedef struct FSINFO3resfail FSINFO3resfail;
-
-struct FSINFO3res {
-	nfsstat3 status;
-	union {
-		FSINFO3resok resok;
-		FSINFO3resfail resfail;
-	} FSINFO3res_u;
-};
-typedef struct FSINFO3res FSINFO3res;
-
-struct PATHCONF3args {
-	nfs_fh3 object;
-};
-typedef struct PATHCONF3args PATHCONF3args;
-
-struct PATHCONF3resok {
-	post_op_attr obj_attributes;
-	uint32 linkmax;
-	uint32 name_max;
-	bool_t no_trunc;
-	bool_t chown_restricted;
-	bool_t case_insensitive;
-	bool_t case_preserving;
-};
-typedef struct PATHCONF3resok PATHCONF3resok;
-
-struct PATHCONF3resfail {
-	post_op_attr obj_attributes;
-};
-typedef struct PATHCONF3resfail PATHCONF3resfail;
-
-struct PATHCONF3res {
-	nfsstat3 status;
-	union {
-		PATHCONF3resok resok;
-		PATHCONF3resfail resfail;
-	} PATHCONF3res_u;
-};
-typedef struct PATHCONF3res PATHCONF3res;
-
-struct COMMIT3args {
-	nfs_fh3 file;
-	offset3 offset;
-	count3 count;
-};
-typedef struct COMMIT3args COMMIT3args;
-
-struct COMMIT3resok {
-	wcc_data file_wcc;
-	writeverf3 verf;
-};
-typedef struct COMMIT3resok COMMIT3resok;
-
-struct COMMIT3resfail {
-	wcc_data file_wcc;
-};
-typedef struct COMMIT3resfail COMMIT3resfail;
-
-struct COMMIT3res {
-	nfsstat3 status;
-	union {
-		COMMIT3resok resok;
-		COMMIT3resfail resfail;
-	} COMMIT3res_u;
-};
-typedef struct COMMIT3res COMMIT3res;
-
-#define	NFS_PROGRAM ((unsigned long)(100003))
-#define	NFS_VERSION ((unsigned long)(2))
-
-extern  void nfs_program_2(struct svc_req *rqstp, SVCXPRT *transp);
-#define	NFSPROC_NULL ((unsigned long)(0))
-extern  void * nfsproc_null_2(void *, CLIENT *);
-extern  void * nfsproc_null_2_svc(void *, struct svc_req *);
-#define	NFSPROC_GETATTR ((unsigned long)(1))
-extern  attrstat * nfsproc_getattr_2(nfs_fh *, CLIENT *);
-extern  attrstat * nfsproc_getattr_2_svc(nfs_fh *, struct svc_req *);
-#define	NFSPROC_SETATTR ((unsigned long)(2))
-extern  attrstat * nfsproc_setattr_2(sattrargs *, CLIENT *);
-extern  attrstat * nfsproc_setattr_2_svc(sattrargs *, struct svc_req *);
-#define	NFSPROC_ROOT ((unsigned long)(3))
-extern  void * nfsproc_root_2(void *, CLIENT *);
-extern  void * nfsproc_root_2_svc(void *, struct svc_req *);
-#define	NFSPROC_LOOKUP ((unsigned long)(4))
-extern  diropres * nfsproc_lookup_2(diropargs *, CLIENT *);
-extern  diropres * nfsproc_lookup_2_svc(diropargs *, struct svc_req *);
-#define	NFSPROC_READLINK ((unsigned long)(5))
-extern  readlinkres * nfsproc_readlink_2(nfs_fh *, CLIENT *);
-extern  readlinkres * nfsproc_readlink_2_svc(nfs_fh *, struct svc_req *);
-#define	NFSPROC_READ ((unsigned long)(6))
-extern  readres * nfsproc_read_2(readargs *, CLIENT *);
-extern  readres * nfsproc_read_2_svc(readargs *, struct svc_req *);
-#define	NFSPROC_WRITECACHE ((unsigned long)(7))
-extern  void * nfsproc_writecache_2(void *, CLIENT *);
-extern  void * nfsproc_writecache_2_svc(void *, struct svc_req *);
-#define	NFSPROC_WRITE ((unsigned long)(8))
-extern  attrstat * nfsproc_write_2(writeargs *, CLIENT *);
-extern  attrstat * nfsproc_write_2_svc(writeargs *, struct svc_req *);
-#define	NFSPROC_CREATE ((unsigned long)(9))
-extern  diropres * nfsproc_create_2(createargs *, CLIENT *);
-extern  diropres * nfsproc_create_2_svc(createargs *, struct svc_req *);
-#define	NFSPROC_REMOVE ((unsigned long)(10))
-extern  nfsstat * nfsproc_remove_2(diropargs *, CLIENT *);
-extern  nfsstat * nfsproc_remove_2_svc(diropargs *, struct svc_req *);
-#define	NFSPROC_RENAME ((unsigned long)(11))
-extern  nfsstat * nfsproc_rename_2(renameargs *, CLIENT *);
-extern  nfsstat * nfsproc_rename_2_svc(renameargs *, struct svc_req *);
-#define	NFSPROC_LINK ((unsigned long)(12))
-extern  nfsstat * nfsproc_link_2(linkargs *, CLIENT *);
-extern  nfsstat * nfsproc_link_2_svc(linkargs *, struct svc_req *);
-#define	NFSPROC_SYMLINK ((unsigned long)(13))
-extern  nfsstat * nfsproc_symlink_2(symlinkargs *, CLIENT *);
-extern  nfsstat * nfsproc_symlink_2_svc(symlinkargs *, struct svc_req *);
-#define	NFSPROC_MKDIR ((unsigned long)(14))
-extern  diropres * nfsproc_mkdir_2(createargs *, CLIENT *);
-extern  diropres * nfsproc_mkdir_2_svc(createargs *, struct svc_req *);
-#define	NFSPROC_RMDIR ((unsigned long)(15))
-extern  nfsstat * nfsproc_rmdir_2(diropargs *, CLIENT *);
-extern  nfsstat * nfsproc_rmdir_2_svc(diropargs *, struct svc_req *);
-#define	NFSPROC_READDIR ((unsigned long)(16))
-extern  readdirres * nfsproc_readdir_2(readdirargs *, CLIENT *);
-extern  readdirres * nfsproc_readdir_2_svc(readdirargs *, struct svc_req *);
-#define	NFSPROC_STATFS ((unsigned long)(17))
-extern  statfsres * nfsproc_statfs_2(nfs_fh *, CLIENT *);
-extern  statfsres * nfsproc_statfs_2_svc(nfs_fh *, struct svc_req *);
-extern int nfs_program_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#define	NFS3_PROGRAM ((unsigned long)(100003))
-#define	NFS_V3 ((unsigned long)(3))
-
-extern  void nfs3_program_3(struct svc_req *rqstp, SVCXPRT *transp);
-#define	NFSPROC3_NULL ((unsigned long)(0))
-extern  void * nfsproc3_null_3(void *, CLIENT *);
-extern  void * nfsproc3_null_3_svc(void *, struct svc_req *);
-#define	NFSPROC3_GETATTR ((unsigned long)(1))
-extern  GETATTR3res * nfsproc3_getattr_3(GETATTR3args *, CLIENT *);
-extern  GETATTR3res * nfsproc3_getattr_3_svc(GETATTR3args *, struct svc_req *);
-#define	NFSPROC3_SETATTR ((unsigned long)(2))
-extern  SETATTR3res * nfsproc3_setattr_3(SETATTR3args *, CLIENT *);
-extern  SETATTR3res * nfsproc3_setattr_3_svc(SETATTR3args *, struct svc_req *);
-#define	NFSPROC3_LOOKUP ((unsigned long)(3))
-extern  LOOKUP3res * nfsproc3_lookup_3(LOOKUP3args *, CLIENT *);
-extern  LOOKUP3res * nfsproc3_lookup_3_svc(LOOKUP3args *, struct svc_req *);
-#define	NFSPROC3_ACCESS ((unsigned long)(4))
-extern  ACCESS3res * nfsproc3_access_3(ACCESS3args *, CLIENT *);
-extern  ACCESS3res * nfsproc3_access_3_svc(ACCESS3args *, struct svc_req *);
-#define	NFSPROC3_READLINK ((unsigned long)(5))
-extern  READLINK3res * nfsproc3_readlink_3(READLINK3args *, CLIENT *);
-extern  READLINK3res * nfsproc3_readlink_3_svc(READLINK3args *, struct svc_req *);
-#define	NFSPROC3_READ ((unsigned long)(6))
-extern  READ3res * nfsproc3_read_3(READ3args *, CLIENT *);
-extern  READ3res * nfsproc3_read_3_svc(READ3args *, struct svc_req *);
-#define	NFSPROC3_WRITE ((unsigned long)(7))
-extern  WRITE3res * nfsproc3_write_3(WRITE3args *, CLIENT *);
-extern  WRITE3res * nfsproc3_write_3_svc(WRITE3args *, struct svc_req *);
-#define	NFSPROC3_CREATE ((unsigned long)(8))
-extern  CREATE3res * nfsproc3_create_3(CREATE3args *, CLIENT *);
-extern  CREATE3res * nfsproc3_create_3_svc(CREATE3args *, struct svc_req *);
-#define	NFSPROC3_MKDIR ((unsigned long)(9))
-extern  MKDIR3res * nfsproc3_mkdir_3(MKDIR3args *, CLIENT *);
-extern  MKDIR3res * nfsproc3_mkdir_3_svc(MKDIR3args *, struct svc_req *);
-#define	NFSPROC3_SYMLINK ((unsigned long)(10))
-extern  SYMLINK3res * nfsproc3_symlink_3(SYMLINK3args *, CLIENT *);
-extern  SYMLINK3res * nfsproc3_symlink_3_svc(SYMLINK3args *, struct svc_req *);
-#define	NFSPROC3_MKNOD ((unsigned long)(11))
-extern  MKNOD3res * nfsproc3_mknod_3(MKNOD3args *, CLIENT *);
-extern  MKNOD3res * nfsproc3_mknod_3_svc(MKNOD3args *, struct svc_req *);
-#define	NFSPROC3_REMOVE ((unsigned long)(12))
-extern  REMOVE3res * nfsproc3_remove_3(REMOVE3args *, CLIENT *);
-extern  REMOVE3res * nfsproc3_remove_3_svc(REMOVE3args *, struct svc_req *);
-#define	NFSPROC3_RMDIR ((unsigned long)(13))
-extern  RMDIR3res * nfsproc3_rmdir_3(RMDIR3args *, CLIENT *);
-extern  RMDIR3res * nfsproc3_rmdir_3_svc(RMDIR3args *, struct svc_req *);
-#define	NFSPROC3_RENAME ((unsigned long)(14))
-extern  RENAME3res * nfsproc3_rename_3(RENAME3args *, CLIENT *);
-extern  RENAME3res * nfsproc3_rename_3_svc(RENAME3args *, struct svc_req *);
-#define	NFSPROC3_LINK ((unsigned long)(15))
-extern  LINK3res * nfsproc3_link_3(LINK3args *, CLIENT *);
-extern  LINK3res * nfsproc3_link_3_svc(LINK3args *, struct svc_req *);
-#define	NFSPROC3_READDIR ((unsigned long)(16))
-extern  READDIR3res * nfsproc3_readdir_3(READDIR3args *, CLIENT *);
-extern  READDIR3res * nfsproc3_readdir_3_svc(READDIR3args *, struct svc_req *);
-#define	NFSPROC3_READDIRPLUS ((unsigned long)(17))
-extern  READDIRPLUS3res * nfsproc3_readdirplus_3(READDIRPLUS3args *, CLIENT *);
-extern  READDIRPLUS3res * nfsproc3_readdirplus_3_svc(READDIRPLUS3args *, struct svc_req *);
-#define	NFSPROC3_FSSTAT ((unsigned long)(18))
-extern  FSSTAT3res * nfsproc3_fsstat_3(FSSTAT3args *, CLIENT *);
-extern  FSSTAT3res * nfsproc3_fsstat_3_svc(FSSTAT3args *, struct svc_req *);
-#define	NFSPROC3_FSINFO ((unsigned long)(19))
-extern  FSINFO3res * nfsproc3_fsinfo_3(FSINFO3args *, CLIENT *);
-extern  FSINFO3res * nfsproc3_fsinfo_3_svc(FSINFO3args *, struct svc_req *);
-#define	NFSPROC3_PATHCONF ((unsigned long)(20))
-extern  PATHCONF3res * nfsproc3_pathconf_3(PATHCONF3args *, CLIENT *);
-extern  PATHCONF3res * nfsproc3_pathconf_3_svc(PATHCONF3args *, struct svc_req *);
-#define	NFSPROC3_COMMIT ((unsigned long)(21))
-extern  COMMIT3res * nfsproc3_commit_3(COMMIT3args *, CLIENT *);
-extern  COMMIT3res * nfsproc3_commit_3_svc(COMMIT3args *, struct svc_req *);
-extern int nfs3_program_3_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_nfsstat(XDR *, nfsstat*);
-extern  bool_t xdr_ftype(XDR *, ftype*);
-extern  bool_t xdr_nfs_fh(XDR *, nfs_fh*);
-extern  bool_t xdr_nfstime(XDR *, nfstime*);
-extern  bool_t xdr_fattr(XDR *, fattr*);
-extern  bool_t xdr_sattr(XDR *, sattr*);
-extern  bool_t xdr_filename(XDR *, filename*);
-extern  bool_t xdr_nfspath(XDR *, nfspath*);
-extern  bool_t xdr_attrstat(XDR *, attrstat*);
-extern  bool_t xdr_sattrargs(XDR *, sattrargs*);
-extern  bool_t xdr_diropargs(XDR *, diropargs*);
-extern  bool_t xdr_diropokres(XDR *, diropokres*);
-extern  bool_t xdr_diropres(XDR *, diropres*);
-extern  bool_t xdr_readlinkres(XDR *, readlinkres*);
-extern  bool_t xdr_readargs(XDR *, readargs*);
-extern  bool_t xdr_readokres(XDR *, readokres*);
-extern  bool_t xdr_readres(XDR *, readres*);
-extern  bool_t xdr_writeargs(XDR *, writeargs*);
-extern  bool_t xdr_createargs(XDR *, createargs*);
-extern  bool_t xdr_renameargs(XDR *, renameargs*);
-extern  bool_t xdr_linkargs(XDR *, linkargs*);
-extern  bool_t xdr_symlinkargs(XDR *, symlinkargs*);
-extern  bool_t xdr_nfscookie(XDR *, nfscookie);
-extern  bool_t xdr_readdirargs(XDR *, readdirargs*);
-extern  bool_t xdr_entry(XDR *, entry*);
-extern  bool_t xdr_dirlist(XDR *, dirlist*);
-extern  bool_t xdr_readdirres(XDR *, readdirres*);
-extern  bool_t xdr_statfsokres(XDR *, statfsokres*);
-extern  bool_t xdr_statfsres(XDR *, statfsres*);
-extern  bool_t xdr_uint64(XDR *, uint64*);
-extern  bool_t xdr_int64(XDR *, int64*);
-extern  bool_t xdr_uint32(XDR *, uint32*);
-extern  bool_t xdr_int32(XDR *, int32*);
-extern  bool_t xdr_filename3(XDR *, filename3*);
-extern  bool_t xdr_nfspath3(XDR *, nfspath3*);
-extern  bool_t xdr_fileid3(XDR *, fileid3*);
-extern  bool_t xdr_cookie3(XDR *, cookie3*);
-extern  bool_t xdr_cookieverf3(XDR *, cookieverf3);
-extern  bool_t xdr_createverf3(XDR *, createverf3);
-extern  bool_t xdr_writeverf3(XDR *, writeverf3);
-extern  bool_t xdr_uid3(XDR *, uid3*);
-extern  bool_t xdr_gid3(XDR *, gid3*);
-extern  bool_t xdr_size3(XDR *, size3*);
-extern  bool_t xdr_offset3(XDR *, offset3*);
-extern  bool_t xdr_mode3(XDR *, mode3*);
-extern  bool_t xdr_count3(XDR *, count3*);
-extern  bool_t xdr_nfsstat3(XDR *, nfsstat3*);
-extern  bool_t xdr_ftype3(XDR *, ftype3*);
-extern  bool_t xdr_specdata3(XDR *, specdata3*);
-extern  bool_t xdr_nfs_fh3(XDR *, nfs_fh3*);
-extern  bool_t xdr_nfstime3(XDR *, nfstime3*);
-extern  bool_t xdr_fattr3(XDR *, fattr3*);
-extern  bool_t xdr_post_op_attr(XDR *, post_op_attr*);
-extern  bool_t xdr_wcc_attr(XDR *, wcc_attr*);
-extern  bool_t xdr_pre_op_attr(XDR *, pre_op_attr*);
-extern  bool_t xdr_wcc_data(XDR *, wcc_data*);
-extern  bool_t xdr_post_op_fh3(XDR *, post_op_fh3*);
-extern  bool_t xdr_time_how(XDR *, time_how*);
-extern  bool_t xdr_set_mode3(XDR *, set_mode3*);
-extern  bool_t xdr_set_uid3(XDR *, set_uid3*);
-extern  bool_t xdr_set_gid3(XDR *, set_gid3*);
-extern  bool_t xdr_set_size3(XDR *, set_size3*);
-extern  bool_t xdr_set_atime(XDR *, set_atime*);
-extern  bool_t xdr_set_mtime(XDR *, set_mtime*);
-extern  bool_t xdr_sattr3(XDR *, sattr3*);
-extern  bool_t xdr_diropargs3(XDR *, diropargs3*);
-extern  bool_t xdr_GETATTR3args(XDR *, GETATTR3args*);
-extern  bool_t xdr_GETATTR3resok(XDR *, GETATTR3resok*);
-extern  bool_t xdr_GETATTR3res(XDR *, GETATTR3res*);
-extern  bool_t xdr_sattrguard3(XDR *, sattrguard3*);
-extern  bool_t xdr_SETATTR3args(XDR *, SETATTR3args*);
-extern  bool_t xdr_SETATTR3resok(XDR *, SETATTR3resok*);
-extern  bool_t xdr_SETATTR3resfail(XDR *, SETATTR3resfail*);
-extern  bool_t xdr_SETATTR3res(XDR *, SETATTR3res*);
-extern  bool_t xdr_LOOKUP3args(XDR *, LOOKUP3args*);
-extern  bool_t xdr_LOOKUP3resok(XDR *, LOOKUP3resok*);
-extern  bool_t xdr_LOOKUP3resfail(XDR *, LOOKUP3resfail*);
-extern  bool_t xdr_LOOKUP3res(XDR *, LOOKUP3res*);
-extern  bool_t xdr_ACCESS3args(XDR *, ACCESS3args*);
-extern  bool_t xdr_ACCESS3resok(XDR *, ACCESS3resok*);
-extern  bool_t xdr_ACCESS3resfail(XDR *, ACCESS3resfail*);
-extern  bool_t xdr_ACCESS3res(XDR *, ACCESS3res*);
-extern  bool_t xdr_READLINK3args(XDR *, READLINK3args*);
-extern  bool_t xdr_READLINK3resok(XDR *, READLINK3resok*);
-extern  bool_t xdr_READLINK3resfail(XDR *, READLINK3resfail*);
-extern  bool_t xdr_READLINK3res(XDR *, READLINK3res*);
-extern  bool_t xdr_READ3args(XDR *, READ3args*);
-extern  bool_t xdr_READ3resok(XDR *, READ3resok*);
-extern  bool_t xdr_READ3resfail(XDR *, READ3resfail*);
-extern  bool_t xdr_READ3res(XDR *, READ3res*);
-extern  bool_t xdr_stable_how(XDR *, stable_how*);
-extern  bool_t xdr_WRITE3args(XDR *, WRITE3args*);
-extern  bool_t xdr_WRITE3resok(XDR *, WRITE3resok*);
-extern  bool_t xdr_WRITE3resfail(XDR *, WRITE3resfail*);
-extern  bool_t xdr_WRITE3res(XDR *, WRITE3res*);
-extern  bool_t xdr_createmode3(XDR *, createmode3*);
-extern  bool_t xdr_createhow3(XDR *, createhow3*);
-extern  bool_t xdr_CREATE3args(XDR *, CREATE3args*);
-extern  bool_t xdr_CREATE3resok(XDR *, CREATE3resok*);
-extern  bool_t xdr_CREATE3resfail(XDR *, CREATE3resfail*);
-extern  bool_t xdr_CREATE3res(XDR *, CREATE3res*);
-extern  bool_t xdr_MKDIR3args(XDR *, MKDIR3args*);
-extern  bool_t xdr_MKDIR3resok(XDR *, MKDIR3resok*);
-extern  bool_t xdr_MKDIR3resfail(XDR *, MKDIR3resfail*);
-extern  bool_t xdr_MKDIR3res(XDR *, MKDIR3res*);
-extern  bool_t xdr_symlinkdata3(XDR *, symlinkdata3*);
-extern  bool_t xdr_SYMLINK3args(XDR *, SYMLINK3args*);
-extern  bool_t xdr_SYMLINK3resok(XDR *, SYMLINK3resok*);
-extern  bool_t xdr_SYMLINK3resfail(XDR *, SYMLINK3resfail*);
-extern  bool_t xdr_SYMLINK3res(XDR *, SYMLINK3res*);
-extern  bool_t xdr_devicedata3(XDR *, devicedata3*);
-extern  bool_t xdr_mknoddata3(XDR *, mknoddata3*);
-extern  bool_t xdr_MKNOD3args(XDR *, MKNOD3args*);
-extern  bool_t xdr_MKNOD3resok(XDR *, MKNOD3resok*);
-extern  bool_t xdr_MKNOD3resfail(XDR *, MKNOD3resfail*);
-extern  bool_t xdr_MKNOD3res(XDR *, MKNOD3res*);
-extern  bool_t xdr_REMOVE3args(XDR *, REMOVE3args*);
-extern  bool_t xdr_REMOVE3resok(XDR *, REMOVE3resok*);
-extern  bool_t xdr_REMOVE3resfail(XDR *, REMOVE3resfail*);
-extern  bool_t xdr_REMOVE3res(XDR *, REMOVE3res*);
-extern  bool_t xdr_RMDIR3args(XDR *, RMDIR3args*);
-extern  bool_t xdr_RMDIR3resok(XDR *, RMDIR3resok*);
-extern  bool_t xdr_RMDIR3resfail(XDR *, RMDIR3resfail*);
-extern  bool_t xdr_RMDIR3res(XDR *, RMDIR3res*);
-extern  bool_t xdr_RENAME3args(XDR *, RENAME3args*);
-extern  bool_t xdr_RENAME3resok(XDR *, RENAME3resok*);
-extern  bool_t xdr_RENAME3resfail(XDR *, RENAME3resfail*);
-extern  bool_t xdr_RENAME3res(XDR *, RENAME3res*);
-extern  bool_t xdr_LINK3args(XDR *, LINK3args*);
-extern  bool_t xdr_LINK3resok(XDR *, LINK3resok*);
-extern  bool_t xdr_LINK3resfail(XDR *, LINK3resfail*);
-extern  bool_t xdr_LINK3res(XDR *, LINK3res*);
-extern  bool_t xdr_READDIR3args(XDR *, READDIR3args*);
-extern  bool_t xdr_entry3(XDR *, entry3*);
-extern  bool_t xdr_dirlist3(XDR *, dirlist3*);
-extern  bool_t xdr_READDIR3resok(XDR *, READDIR3resok*);
-extern  bool_t xdr_READDIR3resfail(XDR *, READDIR3resfail*);
-extern  bool_t xdr_READDIR3res(XDR *, READDIR3res*);
-extern  bool_t xdr_READDIRPLUS3args(XDR *, READDIRPLUS3args*);
-extern  bool_t xdr_entryplus3(XDR *, entryplus3*);
-extern  bool_t xdr_dirlistplus3(XDR *, dirlistplus3*);
-extern  bool_t xdr_READDIRPLUS3resok(XDR *, READDIRPLUS3resok*);
-extern  bool_t xdr_READDIRPLUS3resfail(XDR *, READDIRPLUS3resfail*);
-extern  bool_t xdr_READDIRPLUS3res(XDR *, READDIRPLUS3res*);
-extern  bool_t xdr_FSSTAT3args(XDR *, FSSTAT3args*);
-extern  bool_t xdr_FSSTAT3resok(XDR *, FSSTAT3resok*);
-extern  bool_t xdr_FSSTAT3resfail(XDR *, FSSTAT3resfail*);
-extern  bool_t xdr_FSSTAT3res(XDR *, FSSTAT3res*);
-extern  bool_t xdr_FSINFO3args(XDR *, FSINFO3args*);
-extern  bool_t xdr_FSINFO3resok(XDR *, FSINFO3resok*);
-extern  bool_t xdr_FSINFO3resfail(XDR *, FSINFO3resfail*);
-extern  bool_t xdr_FSINFO3res(XDR *, FSINFO3res*);
-extern  bool_t xdr_PATHCONF3args(XDR *, PATHCONF3args*);
-extern  bool_t xdr_PATHCONF3resok(XDR *, PATHCONF3resok*);
-extern  bool_t xdr_PATHCONF3resfail(XDR *, PATHCONF3resfail*);
-extern  bool_t xdr_PATHCONF3res(XDR *, PATHCONF3res*);
-extern  bool_t xdr_COMMIT3args(XDR *, COMMIT3args*);
-extern  bool_t xdr_COMMIT3resok(XDR *, COMMIT3resok*);
-extern  bool_t xdr_COMMIT3resfail(XDR *, COMMIT3resfail*);
-extern  bool_t xdr_COMMIT3res(XDR *, COMMIT3res*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NFS_PROT_H_RPCGEN */
diff --git a/include.new/rpcsvc/nfs_prot.x b/include.new/rpcsvc/nfs_prot.x
deleted file mode 100644
index 88d492d..0000000
--- a/include.new/rpcsvc/nfs_prot.x
+++ /dev/null
@@ -1,1268 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)nfs_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/nfs_prot.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-const NFS_PORT          = 2049;
-const NFS_MAXDATA       = 8192;
-const NFS_MAXPATHLEN    = 1024;
-const NFS_MAXNAMLEN	= 255;
-const NFS_FHSIZE	= 32;
-const NFS_COOKIESIZE	= 4;
-const NFS_FIFO_DEV	= -1;	/* size kludge for named pipes */
-
-/*
- * File types
- */
-const NFSMODE_FMT  = 0170000;	/* type of file */
-const NFSMODE_DIR  = 0040000;	/* directory */
-const NFSMODE_CHR  = 0020000;	/* character special */
-const NFSMODE_BLK  = 0060000;	/* block special */
-const NFSMODE_REG  = 0100000;	/* regular */
-const NFSMODE_LNK  = 0120000;	/* symbolic link */
-const NFSMODE_SOCK = 0140000;	/* socket */
-const NFSMODE_FIFO = 0010000;	/* fifo */
-
-/*
- * Error status
- */
-enum nfsstat {
-	NFS_OK= 0,		/* no error */
-	NFSERR_PERM=1,		/* Not owner */
-	NFSERR_NOENT=2,		/* No such file or directory */
-	NFSERR_IO=5,		/* I/O error */
-	NFSERR_NXIO=6,		/* No such device or address */
-	NFSERR_ACCES=13,	/* Permission denied */
-	NFSERR_EXIST=17,	/* File exists */
-	NFSERR_NODEV=19,	/* No such device */
-	NFSERR_NOTDIR=20,	/* Not a directory*/
-	NFSERR_ISDIR=21,	/* Is a directory */
-	NFSERR_FBIG=27,		/* File too large */
-	NFSERR_NOSPC=28,	/* No space left on device */
-	NFSERR_ROFS=30,		/* Read-only file system */
-	NFSERR_NAMETOOLONG=63,	/* File name too long */
-	NFSERR_NOTEMPTY=66,	/* Directory not empty */
-	NFSERR_DQUOT=69,	/* Disc quota exceeded */
-	NFSERR_STALE=70,	/* Stale NFS file handle */
-	NFSERR_WFLUSH=99	/* write cache flushed */
-};
-
-/*
- * File types
- */
-enum ftype {
-	NFNON = 0,	/* non-file */
-	NFREG = 1,	/* regular file */
-	NFDIR = 2,	/* directory */
-	NFBLK = 3,	/* block special */
-	NFCHR = 4,	/* character special */
-	NFLNK = 5,	/* symbolic link */
-	NFSOCK = 6,	/* unix domain sockets */
-	NFBAD = 7,	/* unused */
-	NFFIFO = 8 	/* named pipe */
-};
-
-/*
- * File access handle
- */
-struct nfs_fh {
-	opaque data[NFS_FHSIZE];
-};
-
-/* 
- * Timeval
- */
-struct nfstime {
-	unsigned seconds;
-	unsigned useconds;
-};
-
-
-/*
- * File attributes
- */
-struct fattr {
-	ftype type;		/* file type */
-	unsigned mode;		/* protection mode bits */
-	unsigned nlink;		/* # hard links */
-	unsigned uid;		/* owner user id */
-	unsigned gid;		/* owner group id */
-	unsigned size;		/* file size in bytes */
-	unsigned blocksize;	/* preferred block size */
-	unsigned rdev;		/* special device # */
-	unsigned blocks;	/* Kb of disk used by file */
-	unsigned fsid;		/* device # */
-	unsigned fileid;	/* inode # */
-	nfstime	atime;		/* time of last access */
-	nfstime	mtime;		/* time of last modification */
-	nfstime	ctime;		/* time of last change */
-};
-
-/*
- * File attributes which can be set
- */
-struct sattr {
-	unsigned mode;	/* protection mode bits */
-	unsigned uid;	/* owner user id */
-	unsigned gid;	/* owner group id */
-	unsigned size;	/* file size in bytes */
-	nfstime	atime;	/* time of last access */
-	nfstime	mtime;	/* time of last modification */
-};
-
-
-typedef string filename<NFS_MAXNAMLEN>; 
-typedef string nfspath<NFS_MAXPATHLEN>;
-
-/*
- * Reply status with file attributes
- */
-union attrstat switch (nfsstat status) {
-case NFS_OK:
-	fattr attributes;
-default:
-	void;
-};
-
-struct sattrargs {
-	nfs_fh file;
-	sattr attributes;
-};
-
-/*
- * Arguments for directory operations
- */
-struct diropargs {
-	nfs_fh	dir;	/* directory file handle */
-	filename name;		/* name (up to NFS_MAXNAMLEN bytes) */
-};
-
-struct diropokres {
-	nfs_fh file;
-	fattr attributes;
-};
-
-/*
- * Results from directory operation
- */
-union diropres switch (nfsstat status) {
-case NFS_OK:
-	diropokres diropres;
-default:
-	void;
-};
-
-union readlinkres switch (nfsstat status) {
-case NFS_OK:
-	nfspath data;
-default:
-	void;
-};
-
-/*
- * Arguments to remote read
- */
-struct readargs {
-	nfs_fh file;		/* handle for file */
-	unsigned offset;	/* byte offset in file */
-	unsigned count;		/* immediate read count */
-	unsigned totalcount;	/* total read count (from this offset)*/
-};
-
-/*
- * Status OK portion of remote read reply
- */
-struct readokres {
-	fattr	attributes;	/* attributes, need for pagin*/
-	opaque data<NFS_MAXDATA>;
-};
-
-union readres switch (nfsstat status) {
-case NFS_OK:
-	readokres reply;
-default:
-	void;
-};
-
-/*
- * Arguments to remote write 
- */
-struct writeargs {
-	nfs_fh	file;		/* handle for file */
-	unsigned beginoffset;	/* beginning byte offset in file */
-	unsigned offset;	/* current byte offset in file */
-	unsigned totalcount;	/* total write count (to this offset)*/
-	opaque data<NFS_MAXDATA>;
-};
-
-struct createargs {
-	diropargs where;
-	sattr attributes;
-};
-
-struct renameargs {
-	diropargs from;
-	diropargs to;
-};
-
-struct linkargs {
-	nfs_fh from;
-	diropargs to;
-};
-
-struct symlinkargs {
-	diropargs from;
-	nfspath to;
-	sattr attributes;
-};
-
-
-typedef opaque nfscookie[NFS_COOKIESIZE];
-
-/*
- * Arguments to readdir
- */
-struct readdirargs {
-	nfs_fh dir;		/* directory handle */
-	nfscookie cookie;
-	unsigned count;		/* number of directory bytes to read */
-};
-
-struct entry {
-	unsigned fileid;
-	filename name;
-	nfscookie cookie;
-	entry *nextentry;
-};
-
-struct dirlist {
-	entry *entries;
-	bool eof;
-};
-
-union readdirres switch (nfsstat status) {
-case NFS_OK:
-	dirlist reply;
-default:
-	void;
-};
-
-struct statfsokres {
-	unsigned tsize;	/* preferred transfer size in bytes */
-	unsigned bsize;	/* fundamental file system block size */
-	unsigned blocks;	/* total blocks in file system */
-	unsigned bfree;	/* free blocks in fs */
-	unsigned bavail;	/* free blocks avail to non-superuser */
-};
-
-union statfsres switch (nfsstat status) {
-case NFS_OK:
-	statfsokres reply;
-default:
-	void;
-};
-
-#ifdef WANT_NFS3
-
-/*
- * NFSv3 constants and types
- */
-const NFS3_FHSIZE	= 64;	/* maximum size in bytes of a file handle */
-const NFS3_COOKIEVERFSIZE = 8;	/* size of a cookie verifier for READDIR */
-const NFS3_CREATEVERFSIZE = 8;	/* size of the verifier used for CREATE */
-const NFS3_WRITEVERFSIZE = 8;	/* size of the verifier used for WRITE */
-
-typedef unsigned hyper uint64;
-typedef hyper int64;
-typedef unsigned long uint32;
-typedef long int32;
-typedef string filename3<>;
-typedef string nfspath3<>;
-typedef uint64 fileid3;
-typedef uint64 cookie3;
-typedef opaque cookieverf3[NFS3_COOKIEVERFSIZE];
-typedef opaque createverf3[NFS3_CREATEVERFSIZE];
-typedef opaque writeverf3[NFS3_WRITEVERFSIZE];
-typedef uint32 uid3;
-typedef uint32 gid3;
-typedef uint64 size3;
-typedef uint64 offset3;
-typedef uint32 mode3;
-typedef uint32 count3;
-
-/*
- * Error status (v3)
- */
-enum nfsstat3 {
-	NFS3_OK	= 0,
-	NFS3ERR_PERM		= 1,
-	NFS3ERR_NOENT		= 2,
-	NFS3ERR_IO		= 5,
-	NFS3ERR_NXIO		= 6,
-	NFS3ERR_ACCES		= 13,
-	NFS3ERR_EXIST		= 17,
-	NFS3ERR_XDEV		= 18,
-	NFS3ERR_NODEV		= 19,
-	NFS3ERR_NOTDIR		= 20,
-	NFS3ERR_ISDIR		= 21,
-	NFS3ERR_INVAL		= 22,
-	NFS3ERR_FBIG		= 27,
-	NFS3ERR_NOSPC		= 28,
-	NFS3ERR_ROFS		= 30,
-	NFS3ERR_MLINK		= 31,
-	NFS3ERR_NAMETOOLONG	= 63,
-	NFS3ERR_NOTEMPTY	= 66,
-	NFS3ERR_DQUOT		= 69,
-	NFS3ERR_STALE		= 70,
-	NFS3ERR_REMOTE		= 71,
-	NFS3ERR_BADHANDLE	= 10001,
-	NFS3ERR_NOT_SYNC	= 10002,
-	NFS3ERR_BAD_COOKIE	= 10003,
-	NFS3ERR_NOTSUPP		= 10004,
-	NFS3ERR_TOOSMALL	= 10005,
-	NFS3ERR_SERVERFAULT	= 10006,
-	NFS3ERR_BADTYPE		= 10007,
-	NFS3ERR_JUKEBOX		= 10008
-};
-
-/*
- * File types (v3)
- */
-enum ftype3 {
-	NF3REG	= 1,		/* regular file */
-	NF3DIR	= 2,		/* directory */
-	NF3BLK	= 3,		/* block special */
-	NF3CHR	= 4,		/* character special */
-	NF3LNK	= 5,		/* symbolic link */
-	NF3SOCK	= 6,		/* unix domain sockets */
-	NF3FIFO	= 7		/* named pipe */
-};
-
-struct specdata3 {
-	uint32	specdata1;
-	uint32	specdata2;
-};
-
-/*
- * File access handle (v3)
- */
-struct nfs_fh3 {
-	opaque data<NFS3_FHSIZE>;
-};
-
-/* 
- * Timeval (v3)
- */
-struct nfstime3 {
-	uint32	seconds;
-	uint32	nseconds;
-};
-
-
-/*
- * File attributes (v3)
- */
-struct fattr3 {
-	ftype3	type;		/* file type */
-	mode3	mode;		/* protection mode bits */
-	uint32	nlink;		/* # hard links */
-	uid3	uid;		/* owner user id */
-	gid3	gid;		/* owner group id */
-	size3	size;		/* file size in bytes */
-	size3	used;		/* preferred block size */
-	specdata3 rdev;		/* special device # */
-	uint64 fsid;		/* device # */
-	fileid3	fileid;		/* inode # */
-	nfstime3 atime;		/* time of last access */
-	nfstime3 mtime;		/* time of last modification */
-	nfstime3 ctime;		/* time of last change */
-};
-
-union post_op_attr switch (bool attributes_follow) {
-case TRUE:
-	fattr3	attributes;
-case FALSE:
-	void;
-};
-
-struct wcc_attr {
-	size3	size;
-	nfstime3 mtime;
-	nfstime3 ctime;
-};
-
-union pre_op_attr switch (bool attributes_follow) {
-case TRUE:
-	wcc_attr attributes;
-case FALSE:
-	void;
-};
-
-struct wcc_data {
-	pre_op_attr before;
-	post_op_attr after;
-};
-
-union post_op_fh3 switch (bool handle_follows) {
-case TRUE:
-	nfs_fh3	handle;
-case FALSE:
-	void;
-};
-
-/*
- * File attributes which can be set (v3)
- */
-enum time_how {
-	DONT_CHANGE		= 0,
-	SET_TO_SERVER_TIME	= 1,
-	SET_TO_CLIENT_TIME	= 2
-};
-
-union set_mode3 switch (bool set_it) {
-case TRUE:
-	mode3	mode;
-default:
-	void;
-};
-
-union set_uid3 switch (bool set_it) {
-case TRUE:
-	uid3	uid;
-default:
-	void;
-};
-
-union set_gid3 switch (bool set_it) {
-case TRUE:
-	gid3	gid;
-default:
-	void;
-};
-
-union set_size3 switch (bool set_it) {
-case TRUE:
-	size3	size;
-default:
-	void;
-};
-
-union set_atime switch (time_how set_it) {
-case SET_TO_CLIENT_TIME:
-	nfstime3	atime;
-default:
-	void;
-};
-
-union set_mtime switch (time_how set_it) {
-case SET_TO_CLIENT_TIME:
-	nfstime3	mtime;
-default:
-	void;
-};
-
-struct sattr3 {
-	set_mode3	mode;
-	set_uid3	uid;
-	set_gid3	gid;
-	set_size3	size;
-	set_atime	atime;
-	set_mtime	mtime;
-};
-
-/*
- * Arguments for directory operations (v3)
- */
-struct diropargs3 {
-	nfs_fh3	dir;		/* directory file handle */
-	filename3 name;		/* name (up to NFS_MAXNAMLEN bytes) */
-};
-
-/*
- * Arguments to getattr (v3).
- */
-struct GETATTR3args {
-	nfs_fh3		object;
-};
-
-struct GETATTR3resok {
-	fattr3		obj_attributes;
-};
-
-union GETATTR3res switch (nfsstat3 status) {
-case NFS3_OK:
-	GETATTR3resok	resok;
-default:
-	void;
-};
-
-/*
- * Arguments to setattr (v3).
- */
-union sattrguard3 switch (bool check) {
-case TRUE:
-	nfstime3	obj_ctime;
-case FALSE:
-	void;
-};
-
-struct SETATTR3args {
-	nfs_fh3		object;
-	sattr3		new_attributes;
-	sattrguard3	guard;
-};
-
-struct SETATTR3resok {
-	wcc_data	obj_wcc;
-};
-
-struct SETATTR3resfail {
-	wcc_data	obj_wcc;
-};
-
-union SETATTR3res switch (nfsstat3 status) {
-case NFS3_OK:
-	SETATTR3resok	resok;
-default:
-	SETATTR3resfail	resfail;
-};
-
-/*
- * Arguments to lookup (v3).
- */
-struct LOOKUP3args {
-	diropargs3	what;
-};
-
-struct LOOKUP3resok {
-	nfs_fh3		object;
-	post_op_attr	obj_attributes;
-	post_op_attr	dir_attributes;
-};
-
-struct LOOKUP3resfail {
-	post_op_attr	dir_attributes;
-};
-
-union LOOKUP3res switch (nfsstat3 status) {
-case NFS3_OK:
-	LOOKUP3resok	resok;
-default:
-	LOOKUP3resfail	resfail;
-};
-
-/*
- * Arguments to access (v3).
- */
-const ACCESS3_READ	= 0x0001;
-const ACCESS3_LOOKUP	= 0x0002;
-const ACCESS3_MODIFY	= 0x0004;
-const ACCESS3_EXTEND	= 0x0008;
-const ACCESS3_DELETE	= 0x0010;
-const ACCESS3_EXECUTE	= 0x0020;
-
-struct ACCESS3args {
-	nfs_fh3		object;
-	uint32		access;
-};
-
-struct ACCESS3resok {
-	post_op_attr	obj_attributes;
-	uint32		access;
-};
-
-struct ACCESS3resfail {
-	post_op_attr	obj_attributes;
-};
-
-union ACCESS3res switch (nfsstat3 status) {
-case NFS3_OK:
-	ACCESS3resok	resok;
-default:
-	ACCESS3resfail	resfail;
-};
-
-/*
- * Arguments to readlink (v3).
- */
-struct READLINK3args {
-	nfs_fh3		symlink;
-};
-
-struct READLINK3resok {
-	post_op_attr	symlink_attributes;
-	nfspath3	data;
-};
-
-struct READLINK3resfail {
-	post_op_attr	symlink_attributes;
-};
-
-union READLINK3res switch (nfsstat3 status) {
-case NFS3_OK:
-	READLINK3resok	resok;
-default:
-	READLINK3resfail resfail;
-};
-
-/*
- * Arguments to read (v3).
- */
-struct READ3args {
-	nfs_fh3		file;
-	offset3		offset;
-	count3		count;
-};
-
-struct READ3resok {
-	post_op_attr	file_attributes;
-	count3		count;
-	bool		eof;
-	opaque		data<>;
-};
-
-struct READ3resfail {
-	post_op_attr	file_attributes;
-};
-
-/* XXX: solaris 2.6 uses ``nfsstat'' here */
-union READ3res switch (nfsstat3 status) {
-case NFS3_OK:
-	READ3resok	resok;
-default:
-	READ3resfail	resfail;
-};
-
-/*
- * Arguments to write (v3).
- */
-enum stable_how {
-	UNSTABLE	= 0,
-	DATA_SYNC	= 1,
-	FILE_SYNC	= 2
-};
-
-struct WRITE3args {
-	nfs_fh3		file;
-	offset3		offset;
-	count3		count;
-	stable_how	stable;
-	opaque		data<>;
-};
-
-struct WRITE3resok {
-	wcc_data	file_wcc;
-	count3		count;
-	stable_how	committed;
-	writeverf3	verf;
-};
-
-struct WRITE3resfail {
-	wcc_data	file_wcc;
-};
-
-union WRITE3res switch (nfsstat3 status) {
-case NFS3_OK:
-	WRITE3resok	resok;
-default:
-	WRITE3resfail	resfail;
-};
-
-/*
- * Arguments to create (v3).
- */
-enum createmode3 {
-	UNCHECKED	= 0,
-	GUARDED		= 1,
-	EXCLUSIVE	= 2
-};
-
-union createhow3 switch (createmode3 mode) {
-case UNCHECKED:
-case GUARDED:
-	sattr3		obj_attributes;
-case EXCLUSIVE:
-	createverf3	verf;
-};
-
-struct CREATE3args {
-	diropargs3	where;
-	createhow3	how;
-};
-
-struct CREATE3resok {
-	post_op_fh3	obj;
-	post_op_attr	obj_attributes;
-	wcc_data	dir_wcc;
-};
-
-struct CREATE3resfail {
-	wcc_data	dir_wcc;
-};
-
-union CREATE3res switch (nfsstat3 status) {
-case NFS3_OK:
-	CREATE3resok	resok;
-default:
-	CREATE3resfail	resfail;
-};
-
-/*
- * Arguments to mkdir (v3).
- */
-struct MKDIR3args {
-	diropargs3	where;
-	sattr3		attributes;
-};
-
-struct MKDIR3resok {
-	post_op_fh3	obj;
-	post_op_attr	obj_attributes;
-	wcc_data	dir_wcc;
-};
-
-struct MKDIR3resfail {
-	wcc_data	dir_wcc;
-};
-
-union MKDIR3res switch (nfsstat3 status) {
-case NFS3_OK:
-	MKDIR3resok	resok;
-default:
-	MKDIR3resfail	resfail;
-};
-
-/*
- * Arguments to symlink (v3).
- */
-struct symlinkdata3 {
-	sattr3		symlink_attributes;
-	nfspath3	symlink_data;
-};
-
-struct SYMLINK3args {
-	diropargs3	where;
-	symlinkdata3	symlink;
-};
-
-struct SYMLINK3resok {
-	post_op_fh3	obj;
-	post_op_attr	obj_attributes;
-	wcc_data	dir_wcc;
-};
-
-struct SYMLINK3resfail {
-	wcc_data	dir_wcc;
-};
-
-union SYMLINK3res switch (nfsstat3 status) {
-case NFS3_OK:
-	SYMLINK3resok	resok;
-default:
-	SYMLINK3resfail	resfail;
-};
-
-/*
- * Arguments to mknod (v3).
- */
-struct devicedata3 {
-	sattr3		dev_attributes;
-	specdata3	spec;
-};
-
-union mknoddata3 switch (ftype3 type) {
-case NF3CHR:
-case NF3BLK:
-	devicedata3	device;
-case NF3SOCK:
-case NF3FIFO:
-	sattr3		pipe_attributes;
-default:
-	void;
-};
-
-struct MKNOD3args {
-	diropargs3	where;
-	mknoddata3	what;
-};
-
-struct MKNOD3resok {
-	post_op_fh3	obj;
-	post_op_attr	obj_attributes;
-	wcc_data	dir_wcc;
-};
-
-struct MKNOD3resfail {
-	wcc_data	dir_wcc;
-};
-
-union MKNOD3res switch (nfsstat3 status) {
-case NFS3_OK:
-	MKNOD3resok	resok;
-default:
-	MKNOD3resfail	resfail;
-};
-
-/*
- * Arguments to remove (v3).
- */
-struct REMOVE3args {
-	diropargs3	object;
-};
-
-struct REMOVE3resok {
-	wcc_data	dir_wcc;
-};
-
-struct REMOVE3resfail {
-	wcc_data	dir_wcc;
-};
-
-union REMOVE3res switch (nfsstat3 status) {
-case NFS3_OK:
-	REMOVE3resok	resok;
-default:
-	REMOVE3resfail	resfail;
-};
-
-/*
- * Arguments to rmdir (v3).
- */
-struct RMDIR3args {
-	diropargs3	object;
-};
-
-struct RMDIR3resok {
-	wcc_data	dir_wcc;
-};
-
-struct RMDIR3resfail {
-	wcc_data	dir_wcc;
-};
-
-union RMDIR3res switch (nfsstat3 status) {
-case NFS3_OK:
-	RMDIR3resok	resok;
-default:
-	RMDIR3resfail	resfail;
-};
-
-/*
- * Arguments to rename (v3).
- */
-struct RENAME3args {
-	diropargs3	from;
-	diropargs3	to;
-};
-
-struct RENAME3resok {
-	wcc_data	fromdir_wcc;
-	wcc_data	todir_wcc;
-};
-
-struct RENAME3resfail {
-	wcc_data	fromdir_wcc;
-	wcc_data	todir_wcc;
-};
-
-union RENAME3res switch (nfsstat3 status) {
-case NFS3_OK:
-	RENAME3resok	resok;
-default:
-	RENAME3resfail	resfail;
-};
-
-/*
- * Arguments to link (v3).
- */
-struct LINK3args {
-	nfs_fh3		file;
-	diropargs3	link;
-};
-
-struct LINK3resok {
-	post_op_attr	file_attributes;
-	wcc_data	linkdir_wcc;
-};
-
-struct LINK3resfail {
-	post_op_attr	file_attributes;
-	wcc_data	linkdir_wcc;
-};
-
-union LINK3res switch (nfsstat3 status) {
-case NFS3_OK:
-	LINK3resok	resok;
-default:
-	LINK3resfail	resfail;
-};
-
-/*
- * Arguments to readdir (v3).
- */
-struct READDIR3args {
-	nfs_fh3		dir;
-	cookie3		cookie;
-	cookieverf3	cookieverf;
-	count3		count;
-};
-
-struct entry3 {
-	fileid3		fileid;
-	filename3	name;
-	cookie3		cookie;
-	entry3		*nextentry;
-};
-
-struct dirlist3 {
-	entry3		*entries;
-	bool		eof;
-};
-
-struct READDIR3resok {
-	post_op_attr	dir_attributes;
-	cookieverf3	cookieverf;
-	dirlist3	reply;
-};
-
-struct READDIR3resfail {
-	post_op_attr	dir_attributes;
-};
-
-union READDIR3res switch (nfsstat3 status) {
-case NFS3_OK:
-	READDIR3resok	resok;
-default:
-	READDIR3resfail	resfail;
-};
-
-/*
- * Arguments to readdirplus (v3).
- */
-struct READDIRPLUS3args {
-	nfs_fh3		dir;
-	cookie3		cookie;
-	cookieverf3	cookieverf;
-	count3		dircount;
-	count3		maxcount;
-};
-
-struct entryplus3 {
-	fileid3		fileid;
-	filename3	name;
-	cookie3		cookie;
-	post_op_attr	name_attributes;
-	post_op_fh3	name_handle;
-	entryplus3	*nextentry;
-};
-
-struct dirlistplus3 {
-	entryplus3	*entries;
-	bool		eof;
-};
-
-struct READDIRPLUS3resok {
-	post_op_attr	dir_attributes;
-	cookieverf3	cookieverf;
-	dirlistplus3	reply;
-};
-
-struct READDIRPLUS3resfail {
-	post_op_attr	dir_attributes;
-};
-
-union READDIRPLUS3res switch (nfsstat3 status) {
-case NFS3_OK:
-	READDIRPLUS3resok	resok;
-default:
-	READDIRPLUS3resfail	resfail;
-};
-
-/*
- * Arguments to fsstat (v3).
- */
-struct FSSTAT3args {
-	nfs_fh3		fsroot;
-};
-
-struct FSSTAT3resok {
-	post_op_attr	obj_attributes;
-	size3		tbytes;
-	size3		fbytes;
-	size3		abytes;
-	size3		tfiles;
-	size3		ffiles;
-	size3		afiles;
-	uint32		invarsec;
-};
-
-struct FSSTAT3resfail {
-	post_op_attr	obj_attributes;
-};
-
-union FSSTAT3res switch (nfsstat3 status) {
-case NFS3_OK:
-	FSSTAT3resok	resok;
-default:
-	FSSTAT3resfail	resfail;
-};
-
-/*
- * Arguments to fsinfo (v3).
- */
-const FSF3_LINK		= 0x0001;
-const FSF3_SYMLINK	= 0x0002;
-const FSF3_HOMOGENEOUS	= 0x0008;
-const FSF3_CANSETTIME	= 0x0010;
-
-struct FSINFO3args {
-	nfs_fh3		fsroot;
-};
-
-struct FSINFO3resok {
-	post_op_attr	obj_attributes;
-	uint32		rtmax;
-	uint32		rtpref;
-	uint32		rtmult;
-	uint32		wtmax;
-	uint32		wtpref;
-	uint32		wtmult;
-	uint32		dtpref;
-	size3		maxfilesize;
-	nfstime3	time_delta;
-	uint32		properties;
-};
-
-struct FSINFO3resfail {
-	post_op_attr	obj_attributes;
-};
-
-union FSINFO3res switch (nfsstat3 status) {
-case NFS3_OK:
-	FSINFO3resok	resok;
-default:
-	FSINFO3resfail	resfail;
-};
-
-/*
- * Arguments to pathconf (v3).
- */
-struct PATHCONF3args {
-	nfs_fh3		object;
-};
-
-struct PATHCONF3resok {
-	post_op_attr	obj_attributes;
-	uint32		linkmax;
-	uint32		name_max;
-	bool		no_trunc;
-	bool		chown_restricted;
-	bool		case_insensitive;
-	bool		case_preserving;
-};
-
-struct PATHCONF3resfail {
-	post_op_attr	obj_attributes;
-};
-
-union PATHCONF3res switch (nfsstat3 status) {
-case NFS3_OK:
-	PATHCONF3resok	resok;
-default:
-	PATHCONF3resfail	resfail;
-};
-
-/*
- * Arguments to commit (v3).
- */
-struct COMMIT3args {
-	nfs_fh3		file;
-	offset3		offset;
-	count3		count;
-};
-
-struct COMMIT3resok {
-	wcc_data	file_wcc;
-	writeverf3	verf;
-};
-
-struct COMMIT3resfail {
-	wcc_data	file_wcc;
-};
-
-union COMMIT3res switch (nfsstat3 status) {
-case NFS3_OK:
-	COMMIT3resok	resok;
-default:
-	COMMIT3resfail	resfail;
-};
-
-#endif /* WANT_NFS3 */
-
-/*
- * Remote file service routines
- */
-program NFS_PROGRAM {
-	version NFS_VERSION {
-		void 
-		NFSPROC_NULL(void) = 0;
-
-		attrstat 
-		NFSPROC_GETATTR(nfs_fh) =	1;
-
-		attrstat 
-		NFSPROC_SETATTR(sattrargs) = 2;
-
-		void 
-		NFSPROC_ROOT(void) = 3;
-
-		diropres 
-		NFSPROC_LOOKUP(diropargs) = 4;
-
-		readlinkres 
-		NFSPROC_READLINK(nfs_fh) = 5;
-
-		readres 
-		NFSPROC_READ(readargs) = 6;
-
-		void 
-		NFSPROC_WRITECACHE(void) = 7;
-
-		attrstat
-		NFSPROC_WRITE(writeargs) = 8;
-
-		diropres
-		NFSPROC_CREATE(createargs) = 9;
-
-		nfsstat
-		NFSPROC_REMOVE(diropargs) = 10;
-
-		nfsstat
-		NFSPROC_RENAME(renameargs) = 11;
-
-		nfsstat
-		NFSPROC_LINK(linkargs) = 12;
-
-		nfsstat
-		NFSPROC_SYMLINK(symlinkargs) = 13;
-
-		diropres
-		NFSPROC_MKDIR(createargs) = 14;
-
-		nfsstat
-		NFSPROC_RMDIR(diropargs) = 15;
-
-		readdirres
-		NFSPROC_READDIR(readdirargs) = 16;
-
-		statfsres
-		NFSPROC_STATFS(nfs_fh) = 17;
-	} = 2;
-} = 100003;
-#ifdef WANT_NFS3
-program NFS3_PROGRAM {
-	version NFS_V3 {
-		void
-		NFSPROC3_NULL(void)			= 0;
-
-		GETATTR3res
-		NFSPROC3_GETATTR(GETATTR3args)		= 1;
-
-		SETATTR3res
-		NFSPROC3_SETATTR(SETATTR3args)		= 2;
-
-		LOOKUP3res
-		NFSPROC3_LOOKUP(LOOKUP3args)		= 3;
-
-		ACCESS3res
-		NFSPROC3_ACCESS(ACCESS3args)		= 4;
-
-		READLINK3res
-		NFSPROC3_READLINK(READLINK3args)	= 5;
-
-		READ3res
-		NFSPROC3_READ(READ3args)		= 6;
-
-		WRITE3res
-		NFSPROC3_WRITE(WRITE3args)		= 7;
-
-		CREATE3res
-		NFSPROC3_CREATE(CREATE3args)		= 8;
-
-		MKDIR3res
-		NFSPROC3_MKDIR(MKDIR3args)		= 9;
-
-		SYMLINK3res
-		NFSPROC3_SYMLINK(SYMLINK3args)		= 10;
-
-		MKNOD3res
-		NFSPROC3_MKNOD(MKNOD3args)		= 11;
-
-		REMOVE3res
-		NFSPROC3_REMOVE(REMOVE3args)		= 12;
-
-		RMDIR3res
-		NFSPROC3_RMDIR(RMDIR3args)		= 13;
-
-		RENAME3res
-		NFSPROC3_RENAME(RENAME3args)		= 14;
-
-		LINK3res
-		NFSPROC3_LINK(LINK3args)		= 15;
-
-		READDIR3res
-		NFSPROC3_READDIR(READDIR3args)		= 16;
-
-		READDIRPLUS3res
-		NFSPROC3_READDIRPLUS(READDIRPLUS3args)	= 17;
-
-		FSSTAT3res
-		NFSPROC3_FSSTAT(FSSTAT3args)		= 18;
-
-		FSINFO3res
-		NFSPROC3_FSINFO(FSINFO3args)		= 19;
-
-		PATHCONF3res
-		NFSPROC3_PATHCONF(PATHCONF3args)	= 20;
-
-		COMMIT3res
-		NFSPROC3_COMMIT(COMMIT3args)		= 21;
-	} = 3;
-} = 100003;
-#endif
-
diff --git a/include.new/rpcsvc/nis.h b/include.new/rpcsvc/nis.h
deleted file mode 100644
index 5be14be..0000000
--- a/include.new/rpcsvc/nis.h
+++ /dev/null
@@ -1,689 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NIS_H_RPCGEN
-#define	_NIS_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-/*
- *	nis.h
- *
- *	This file is the main include file for NIS clients. It contains
- *	both the client library function defines and the various data
- * 	structures used by the NIS service. It includes the file nis_tags.h
- *	which defines the tag values. This allows the tags to change without
- *	having to change the nis.x file.
- * 	
- *	NOTE : DO NOT EDIT THIS FILE! It is automatically generated when
- *	       rpcgen is run on the nis.x file. Note that there is a 
- *	       simple sed script to remove some unneeded lines. (See the
- *	       Makefile target nis.h)
- *
- */
-#include <rpcsvc/nis_tags.h>
-#include <rpc/xdr.h>
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-#ifndef __nis_object_h
-#define __nis_object_h
-
-#define	NIS_MAXSTRINGLEN 255
-#define	NIS_MAXNAMELEN 1024
-#define	NIS_MAXATTRNAME 32
-#define	NIS_MAXATTRVAL 2048
-#define	NIS_MAXCOLUMNS 64
-#define	NIS_MAXATTR 16
-#define	NIS_MAXPATH 1024
-#define	NIS_MAXREPLICAS 128
-#define	NIS_MAXLINKS 16
-#define	NIS_PK_NONE 0
-#define	NIS_PK_DH 1
-#define	NIS_PK_RSA 2
-#define	NIS_PK_KERB 3
-
-struct nis_attr {
-	char *zattr_ndx;
-	struct {
-		u_int zattr_val_len;
-		char *zattr_val_val;
-	} zattr_val;
-};
-typedef struct nis_attr nis_attr;
-
-typedef char *nis_name;
-
-enum zotypes {
-	BOGUS_OBJ = 0,
-	NO_OBJ = 1,
-	DIRECTORY_OBJ = 2,
-	GROUP_OBJ = 3,
-	TABLE_OBJ = 4,
-	ENTRY_OBJ = 5,
-	LINK_OBJ = 6,
-	PRIVATE_OBJ = 7
-};
-typedef enum zotypes zotypes;
-
-enum nstype {
-	UNKNOWN = 0,
-	NIS = 1,
-	SUNYP = 2,
-	IVY = 3,
-	DNS = 4,
-	X500 = 5,
-	DNANS = 6,
-	XCHS = 7,
-	CDS = 8
-};
-typedef enum nstype nstype;
-
-struct oar_mask {
-	u_long oa_rights;
-	zotypes oa_otype;
-};
-typedef struct oar_mask oar_mask;
-
-struct endpoint {
-	char *uaddr;
-	char *family;
-	char *proto;
-};
-typedef struct endpoint endpoint;
-
-struct nis_server {
-	nis_name name;
-	struct {
-		u_int ep_len;
-		endpoint *ep_val;
-	} ep;
-	u_long key_type;
-	netobj pkey;
-};
-typedef struct nis_server nis_server;
-
-struct directory_obj {
-	nis_name do_name;
-	nstype do_type;
-	struct {
-		u_int do_servers_len;
-		nis_server *do_servers_val;
-	} do_servers;
-	u_long do_ttl;
-	struct {
-		u_int do_armask_len;
-		oar_mask *do_armask_val;
-	} do_armask;
-};
-typedef struct directory_obj directory_obj;
-#define	EN_BINARY 1
-#define	EN_CRYPT 2
-#define	EN_XDR 4
-#define	EN_MODIFIED 8
-#define	EN_ASN1 64
-
-struct entry_col {
-	u_long ec_flags;
-	struct {
-		u_int ec_value_len;
-		char *ec_value_val;
-	} ec_value;
-};
-typedef struct entry_col entry_col;
-
-struct entry_obj {
-	char *en_type;
-	struct {
-		u_int en_cols_len;
-		entry_col *en_cols_val;
-	} en_cols;
-};
-typedef struct entry_obj entry_obj;
-
-struct group_obj {
-	u_long gr_flags;
-	struct {
-		u_int gr_members_len;
-		nis_name *gr_members_val;
-	} gr_members;
-};
-typedef struct group_obj group_obj;
-
-struct link_obj {
-	zotypes li_rtype;
-	struct {
-		u_int li_attrs_len;
-		nis_attr *li_attrs_val;
-	} li_attrs;
-	nis_name li_name;
-};
-typedef struct link_obj link_obj;
-#define	TA_BINARY 1
-#define	TA_CRYPT 2
-#define	TA_XDR 4
-#define	TA_SEARCHABLE 8
-#define	TA_CASE 16
-#define	TA_MODIFIED 32
-#define	TA_ASN1 64
-
-struct table_col {
-	char *tc_name;
-	u_long tc_flags;
-	u_long tc_rights;
-};
-typedef struct table_col table_col;
-
-struct table_obj {
-	char *ta_type;
-	int ta_maxcol;
-	u_char ta_sep;
-	struct {
-		u_int ta_cols_len;
-		table_col *ta_cols_val;
-	} ta_cols;
-	char *ta_path;
-};
-typedef struct table_obj table_obj;
-
-struct objdata {
-	zotypes zo_type;
-	union {
-		struct directory_obj di_data;
-		struct group_obj gr_data;
-		struct table_obj ta_data;
-		struct entry_obj en_data;
-		struct link_obj li_data;
-		struct {
-			u_int po_data_len;
-			char *po_data_val;
-		} po_data;
-	} objdata_u;
-};
-typedef struct objdata objdata;
-
-struct nis_oid {
-	u_long ctime;
-	u_long mtime;
-};
-typedef struct nis_oid nis_oid;
-
-struct nis_object {
-	nis_oid zo_oid;
-	nis_name zo_name;
-	nis_name zo_owner;
-	nis_name zo_group;
-	nis_name zo_domain;
-	u_long zo_access;
-	u_long zo_ttl;
-	objdata zo_data;
-};
-typedef struct nis_object nis_object;
-
-#endif /* if __nis_object_h */
-
-
-enum nis_error {
-	NIS_SUCCESS = 0,
-	NIS_S_SUCCESS = 1,
-	NIS_NOTFOUND = 2,
-	NIS_S_NOTFOUND = 3,
-	NIS_CACHEEXPIRED = 4,
-	NIS_NAMEUNREACHABLE = 5,
-	NIS_UNKNOWNOBJ = 6,
-	NIS_TRYAGAIN = 7,
-	NIS_SYSTEMERROR = 8,
-	NIS_CHAINBROKEN = 9,
-	NIS_PERMISSION = 10,
-	NIS_NOTOWNER = 11,
-	NIS_NOT_ME = 12,
-	NIS_NOMEMORY = 13,
-	NIS_NAMEEXISTS = 14,
-	NIS_NOTMASTER = 15,
-	NIS_INVALIDOBJ = 16,
-	NIS_BADNAME = 17,
-	NIS_NOCALLBACK = 18,
-	NIS_CBRESULTS = 19,
-	NIS_NOSUCHNAME = 20,
-	NIS_NOTUNIQUE = 21,
-	NIS_IBMODERROR = 22,
-	NIS_NOSUCHTABLE = 23,
-	NIS_TYPEMISMATCH = 24,
-	NIS_LINKNAMEERROR = 25,
-	NIS_PARTIAL = 26,
-	NIS_TOOMANYATTRS = 27,
-	NIS_RPCERROR = 28,
-	NIS_BADATTRIBUTE = 29,
-	NIS_NOTSEARCHABLE = 30,
-	NIS_CBERROR = 31,
-	NIS_FOREIGNNS = 32,
-	NIS_BADOBJECT = 33,
-	NIS_NOTSAMEOBJ = 34,
-	NIS_MODFAIL = 35,
-	NIS_BADREQUEST = 36,
-	NIS_NOTEMPTY = 37,
-	NIS_COLDSTART_ERR = 38,
-	NIS_RESYNC = 39,
-	NIS_FAIL = 40,
-	NIS_UNAVAIL = 41,
-	NIS_RES2BIG = 42,
-	NIS_SRVAUTH = 43,
-	NIS_CLNTAUTH = 44,
-	NIS_NOFILESPACE = 45,
-	NIS_NOPROC = 46,
-	NIS_DUMPLATER = 47
-};
-typedef enum nis_error nis_error;
-
-struct nis_result {
-	nis_error status;
-	struct {
-		u_int objects_len;
-		nis_object *objects_val;
-	} objects;
-	netobj cookie;
-	u_long zticks;
-	u_long dticks;
-	u_long aticks;
-	u_long cticks;
-};
-typedef struct nis_result nis_result;
-
-struct ns_request {
-	nis_name ns_name;
-	struct {
-		u_int ns_object_len;
-		nis_object *ns_object_val;
-	} ns_object;
-};
-typedef struct ns_request ns_request;
-
-struct ib_request {
-	nis_name ibr_name;
-	struct {
-		u_int ibr_srch_len;
-		nis_attr *ibr_srch_val;
-	} ibr_srch;
-	u_long ibr_flags;
-	struct {
-		u_int ibr_obj_len;
-		nis_object *ibr_obj_val;
-	} ibr_obj;
-	struct {
-		u_int ibr_cbhost_len;
-		nis_server *ibr_cbhost_val;
-	} ibr_cbhost;
-	u_long ibr_bufsize;
-	netobj ibr_cookie;
-};
-typedef struct ib_request ib_request;
-
-struct ping_args {
-	nis_name dir;
-	u_long stamp;
-};
-typedef struct ping_args ping_args;
-
-enum log_entry_t {
-	LOG_NOP = 0,
-	ADD_NAME = 1,
-	REM_NAME = 2,
-	MOD_NAME_OLD = 3,
-	MOD_NAME_NEW = 4,
-	ADD_IBASE = 5,
-	REM_IBASE = 6,
-	MOD_IBASE = 7,
-	UPD_STAMP = 8
-};
-typedef enum log_entry_t log_entry_t;
-
-struct log_entry {
-	u_long le_time;
-	log_entry_t le_type;
-	nis_name le_princp;
-	nis_name le_name;
-	struct {
-		u_int le_attrs_len;
-		nis_attr *le_attrs_val;
-	} le_attrs;
-	nis_object le_object;
-};
-typedef struct log_entry log_entry;
-
-struct log_result {
-	nis_error lr_status;
-	netobj lr_cookie;
-	struct {
-		u_int lr_entries_len;
-		log_entry *lr_entries_val;
-	} lr_entries;
-};
-typedef struct log_result log_result;
-
-struct cp_result {
-	nis_error cp_status;
-	u_long cp_zticks;
-	u_long cp_dticks;
-};
-typedef struct cp_result cp_result;
-
-struct nis_tag {
-	u_long tag_type;
-	char *tag_val;
-};
-typedef struct nis_tag nis_tag;
-
-struct nis_taglist {
-	struct {
-		u_int tags_len;
-		nis_tag *tags_val;
-	} tags;
-};
-typedef struct nis_taglist nis_taglist;
-
-struct dump_args {
-	nis_name da_dir;
-	u_long da_time;
-	struct {
-		u_int da_cbhost_len;
-		nis_server *da_cbhost_val;
-	} da_cbhost;
-};
-typedef struct dump_args dump_args;
-
-struct fd_args {
-	nis_name dir_name;
-	nis_name requester;
-};
-typedef struct fd_args fd_args;
-
-struct fd_result {
-	nis_error status;
-	nis_name source;
-	struct {
-		u_int dir_data_len;
-		char *dir_data_val;
-	} dir_data;
-	struct {
-		u_int signature_len;
-		char *signature_val;
-	} signature;
-};
-typedef struct fd_result fd_result;
-/*
- * Generic "hash" datastructures, used by all types of hashed data.
- */
-struct nis_hash_data {
- nis_name name; /* NIS name of hashed item      */
- int keychain; /* It's hash key (for pop)      */
- struct nis_hash_data *next; /* Hash collision pointer       */
- struct nis_hash_data *prv_item; /* A serial, doubly linked list */
- struct nis_hash_data *nxt_item; /* of items in the hash table   */
-};
-typedef struct nis_hash_data NIS_HASH_ITEM;
-
-struct nis_hash_table {
- NIS_HASH_ITEM *keys[64]; /* A hash table of items           */
- NIS_HASH_ITEM *first; /* The first "item" in serial list */
-};
-typedef struct nis_hash_table NIS_HASH_TABLE;
-
-/* Structure for storing dynamically allocated static data */
-struct nis_sdata {
- void *buf; /* Memory allocation pointer 	*/
- u_long size; /* Buffer size			*/
-};
-
-/* Generic client creating flags */
-#define ZMH_VC 1
-#define ZMH_DG 2
-#define ZMH_AUTH 4
-
-/* Testing Access rights for objects */
-
-#define NIS_READ_ACC 1
-#define NIS_MODIFY_ACC 2
-#define NIS_CREATE_ACC 4
-#define NIS_DESTROY_ACC 8
-/* Test macros. a == access rights, m == desired rights. */
-#define WORLD(a, m) (((a) & (m)) != 0)
-#define GROUP(a, m) (((a) & ((m) << 8)) != 0)
-#define OWNER(a, m) (((a) & ((m) << 16)) != 0)
-#define NOBODY(a, m) (((a) & ((m) << 24)) != 0)
-
-#define OATYPE(d, n) (((d)->do_armask.do_armask_val+n)->oa_otype)
-#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
-#define WORLD_DEFAULT (NIS_READ_ACC)
-#define GROUP_DEFAULT (NIS_READ_ACC << 8)
-#define OWNER_DEFAULT ((NIS_READ_ACC + NIS_MODIFY_ACC + NIS_CREATE_ACC + NIS_DESTROY_ACC) << 16)
-#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
-
-/* Result manipulation defines ... */
-#define NIS_RES_NUMOBJ(x) ((x)->objects.objects_len)
-#define NIS_RES_OBJECT(x) ((x)->objects.objects_val)
-#define NIS_RES_COOKIE(x) ((x)->cookie)
-#define NIS_RES_STATUS(x) ((x)->status)
-
-/* These defines make getting at the variant part of the object easier. */
-#define TA_data zo_data.objdata_u.ta_data
-#define EN_data zo_data.objdata_u.en_data
-#define DI_data zo_data.objdata_u.di_data
-#define LI_data zo_data.objdata_u.li_data
-#define GR_data zo_data.objdata_u.gr_data
-
-#define __type_of(o) ((o)->zo_data.zo_type)
-
-/* Declarations for the internal subroutines in nislib.c */
-enum name_pos {SAME_NAME, HIGHER_NAME, LOWER_NAME, NOT_SEQUENTIAL, BAD_NAME};
-typedef enum name_pos name_pos;
-
-/*
- * Defines for getting at column data in entry objects. Because RPCGEN
- * generates some rather wordy structures, we create some defines that
- * collapse the needed keystrokes to access a particular value using
- * these definitions they take an nis_object *, and an int and return
- * a u_char * for Value, and an int for length.
- */
-#define ENTRY_VAL(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
-#define ENTRY_LEN(obj, col) (obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
-
-#ifdef __cplusplus
-}
-#endif
-
-/* Prototypes, and extern declarations for the NIS library functions. */
-#include <rpcsvc/nislib.h>
-#endif /* __NIS_RPCGEN_H */
-/* EDIT_START */
-
-/*
- * nis_3.h
- * 
- * This file contains definitions that are only of interest to the actual
- * service daemon and client stubs. Normal users of NIS will not include
- * this file.
- *
- * NOTE : This include file is automatically created by a combination 
- * of rpcgen and sed. DO NOT EDIT IT, change the nis.x file instead
- * and then remake this file.
- */
-#ifndef __nis_3_h
-#define __nis_3_h
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	NIS_PROG ((unsigned long)(100300))
-#define	NIS_VERSION ((unsigned long)(3))
-
-extern  void nis_prog_3(struct svc_req *rqstp, SVCXPRT *transp);
-#define	NIS_LOOKUP ((unsigned long)(1))
-extern  nis_result * nis_lookup_3(ns_request *, CLIENT *);
-extern  nis_result * nis_lookup_3_svc(ns_request *, struct svc_req *);
-#define	NIS_ADD ((unsigned long)(2))
-extern  nis_result * nis_add_3(ns_request *, CLIENT *);
-extern  nis_result * nis_add_3_svc(ns_request *, struct svc_req *);
-#define	NIS_MODIFY ((unsigned long)(3))
-extern  nis_result * nis_modify_3(ns_request *, CLIENT *);
-extern  nis_result * nis_modify_3_svc(ns_request *, struct svc_req *);
-#define	NIS_REMOVE ((unsigned long)(4))
-extern  nis_result * nis_remove_3(ns_request *, CLIENT *);
-extern  nis_result * nis_remove_3_svc(ns_request *, struct svc_req *);
-#define	NIS_IBLIST ((unsigned long)(5))
-extern  nis_result * nis_iblist_3(ib_request *, CLIENT *);
-extern  nis_result * nis_iblist_3_svc(ib_request *, struct svc_req *);
-#define	NIS_IBADD ((unsigned long)(6))
-extern  nis_result * nis_ibadd_3(ib_request *, CLIENT *);
-extern  nis_result * nis_ibadd_3_svc(ib_request *, struct svc_req *);
-#define	NIS_IBMODIFY ((unsigned long)(7))
-extern  nis_result * nis_ibmodify_3(ib_request *, CLIENT *);
-extern  nis_result * nis_ibmodify_3_svc(ib_request *, struct svc_req *);
-#define	NIS_IBREMOVE ((unsigned long)(8))
-extern  nis_result * nis_ibremove_3(ib_request *, CLIENT *);
-extern  nis_result * nis_ibremove_3_svc(ib_request *, struct svc_req *);
-#define	NIS_IBFIRST ((unsigned long)(9))
-extern  nis_result * nis_ibfirst_3(ib_request *, CLIENT *);
-extern  nis_result * nis_ibfirst_3_svc(ib_request *, struct svc_req *);
-#define	NIS_IBNEXT ((unsigned long)(10))
-extern  nis_result * nis_ibnext_3(ib_request *, CLIENT *);
-extern  nis_result * nis_ibnext_3_svc(ib_request *, struct svc_req *);
-#define	NIS_FINDDIRECTORY ((unsigned long)(12))
-extern  fd_result * nis_finddirectory_3(fd_args *, CLIENT *);
-extern  fd_result * nis_finddirectory_3_svc(fd_args *, struct svc_req *);
-#define	NIS_STATUS ((unsigned long)(14))
-extern  nis_taglist * nis_status_3(nis_taglist *, CLIENT *);
-extern  nis_taglist * nis_status_3_svc(nis_taglist *, struct svc_req *);
-#define	NIS_DUMPLOG ((unsigned long)(15))
-extern  log_result * nis_dumplog_3(dump_args *, CLIENT *);
-extern  log_result * nis_dumplog_3_svc(dump_args *, struct svc_req *);
-#define	NIS_DUMP ((unsigned long)(16))
-extern  log_result * nis_dump_3(dump_args *, CLIENT *);
-extern  log_result * nis_dump_3_svc(dump_args *, struct svc_req *);
-#define	NIS_CALLBACK ((unsigned long)(17))
-extern  bool_t * nis_callback_3(netobj *, CLIENT *);
-extern  bool_t * nis_callback_3_svc(netobj *, struct svc_req *);
-#define	NIS_CPTIME ((unsigned long)(18))
-extern  u_long * nis_cptime_3(nis_name *, CLIENT *);
-extern  u_long * nis_cptime_3_svc(nis_name *, struct svc_req *);
-#define	NIS_CHECKPOINT ((unsigned long)(19))
-extern  cp_result * nis_checkpoint_3(nis_name *, CLIENT *);
-extern  cp_result * nis_checkpoint_3_svc(nis_name *, struct svc_req *);
-#define	NIS_PING ((unsigned long)(20))
-extern  void * nis_ping_3(ping_args *, CLIENT *);
-extern  void * nis_ping_3_svc(ping_args *, struct svc_req *);
-#define	NIS_SERVSTATE ((unsigned long)(21))
-extern  nis_taglist * nis_servstate_3(nis_taglist *, CLIENT *);
-extern  nis_taglist * nis_servstate_3_svc(nis_taglist *, struct svc_req *);
-#define	NIS_MKDIR ((unsigned long)(22))
-extern  nis_error * nis_mkdir_3(nis_name *, CLIENT *);
-extern  nis_error * nis_mkdir_3_svc(nis_name *, struct svc_req *);
-#define	NIS_RMDIR ((unsigned long)(23))
-extern  nis_error * nis_rmdir_3(nis_name *, CLIENT *);
-extern  nis_error * nis_rmdir_3_svc(nis_name *, struct svc_req *);
-#define	NIS_UPDKEYS ((unsigned long)(24))
-extern  nis_error * nis_updkeys_3(nis_name *, CLIENT *);
-extern  nis_error * nis_updkeys_3_svc(nis_name *, struct svc_req *);
-extern int nis_prog_3_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_nis_attr(XDR *, nis_attr*);
-extern  bool_t xdr_nis_name(XDR *, nis_name*);
-extern  bool_t xdr_zotypes(XDR *, zotypes*);
-extern  bool_t xdr_nstype(XDR *, nstype*);
-extern  bool_t xdr_oar_mask(XDR *, oar_mask*);
-extern  bool_t xdr_endpoint(XDR *, endpoint*);
-extern  bool_t xdr_nis_server(XDR *, nis_server*);
-extern  bool_t xdr_directory_obj(XDR *, directory_obj*);
-extern  bool_t xdr_entry_col(XDR *, entry_col*);
-extern  bool_t xdr_entry_obj(XDR *, entry_obj*);
-extern  bool_t xdr_group_obj(XDR *, group_obj*);
-extern  bool_t xdr_link_obj(XDR *, link_obj*);
-extern  bool_t xdr_table_col(XDR *, table_col*);
-extern  bool_t xdr_table_obj(XDR *, table_obj*);
-extern  bool_t xdr_objdata(XDR *, objdata*);
-extern  bool_t xdr_nis_oid(XDR *, nis_oid*);
-extern  bool_t xdr_nis_object(XDR *, nis_object*);
-extern  bool_t xdr_nis_error(XDR *, nis_error*);
-extern  bool_t xdr_nis_result(XDR *, nis_result*);
-extern  bool_t xdr_ns_request(XDR *, ns_request*);
-extern  bool_t xdr_ib_request(XDR *, ib_request*);
-extern  bool_t xdr_ping_args(XDR *, ping_args*);
-extern  bool_t xdr_log_entry_t(XDR *, log_entry_t*);
-extern  bool_t xdr_log_entry(XDR *, log_entry*);
-extern  bool_t xdr_log_result(XDR *, log_result*);
-extern  bool_t xdr_cp_result(XDR *, cp_result*);
-extern  bool_t xdr_nis_tag(XDR *, nis_tag*);
-extern  bool_t xdr_nis_taglist(XDR *, nis_taglist*);
-extern  bool_t xdr_dump_args(XDR *, dump_args*);
-extern  bool_t xdr_fd_args(XDR *, fd_args*);
-extern  bool_t xdr_fd_result(XDR *, fd_result*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NIS_H_RPCGEN */
diff --git a/include.new/rpcsvc/nis.x b/include.new/rpcsvc/nis.x
deleted file mode 100644
index 4182217..0000000
--- a/include.new/rpcsvc/nis.x
+++ /dev/null
@@ -1,465 +0,0 @@
-%/*-
-% * Copyright (c) 2010, Oracle America, Inc.
-% *
-% * Redistribution and use in source and binary forms, with or without
-% * modification, are permitted provided that the following conditions are
-% * met:
-% *
-% *     * Redistributions of source code must retain the above copyright
-% *       notice, this list of conditions and the following disclaimer.
-% *     * 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.
-% *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
-% *   COPYRIGHT HOLDER 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.
-% */
-
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/nis.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-/* 
- * From 4.1 : @(#)nis.x	1.61 Copyright 1989 Sun Microsystems
- *
- * RPC Language Protocol description file for NIS Plus
- * This version : 1.61
- * Last Modified : 3/19/91
- */
-#ifdef RPC_HDR
-%/*
-% *	nis.h
-% *
-% *	This file is the main include file for NIS clients. It contains
-% *	both the client library function defines and the various data
-% * 	structures used by the NIS service. It includes the file nis_tags.h
-% *	which defines the tag values. This allows the tags to change without
-% *	having to change the nis.x file.
-% * 	
-% *	NOTE : DO NOT EDIT THIS FILE! It is automatically generated when
-% *	       rpcgen is run on the nis.x file. Note that there is a 
-% *	       simple sed script to remove some unneeded lines. (See the
-% *	       Makefile target nis.h)
-% *
-% */
-%#include <rpcsvc/nis_tags.h>
-#endif
-
-/* This gets stuffed into the source files. */
-#if RPC_HDR
-%#include <rpc/xdr.h>
-#endif
-/*
- * This is just pointless.
- */
-#ifdef SUN_STUPIDITY
-#if RPC_SVC
-%#include "nis_svc.h"
-#endif
-#endif
-
-/* Include the RPC Language description of NIS objects */
-#include "nis_object.x"
-
-/* Errors  that can be returned by the service */
-enum nis_error {
-	NIS_SUCCESS = 0,	/* A-ok, let's rock n roll 	*/
-	NIS_S_SUCCESS = 1,	/* Name found (maybe)	   	*/
-	NIS_NOTFOUND = 2,	/* Name definitely not found 	*/
-	NIS_S_NOTFOUND = 3,	/* Name maybe not found 	*/
-	NIS_CACHEEXPIRED = 4,	/* Name exists but cache out of date */
-	NIS_NAMEUNREACHABLE = 5, /* Can't get there from here */
-	NIS_UNKNOWNOBJ = 6,	/* Object type is bogus */
-	NIS_TRYAGAIN = 7,	/* I'm busy, call back */
-	NIS_SYSTEMERROR = 8,	/* Out of band failure */
-	NIS_CHAINBROKEN = 9,	/* First/Next warning */
-	NIS_PERMISSION = 10,	/* Not enough permission to access */
-	NIS_NOTOWNER = 11,	/* You don't own it, sorry */
-	NIS_NOT_ME = 12,	/* I don't serve this name */
-	NIS_NOMEMORY = 13,	/* Outta VM! Help! */
-	NIS_NAMEEXISTS = 14,	/* Can't create over another name */
-	NIS_NOTMASTER = 15,	/* I'm justa secondaray, don't ask me */
-	NIS_INVALIDOBJ = 16,	/* Object is broken somehow */
-	NIS_BADNAME = 17,	/* Unparsable name */
-	NIS_NOCALLBACK = 18,	/* Couldn't talk to call back proc */
-	NIS_CBRESULTS = 19,	/* Results being called back to you */
-	NIS_NOSUCHNAME = 20,	/* Name unknown */
-	NIS_NOTUNIQUE = 21,	/* Value is not uniques (entry) */
-	NIS_IBMODERROR = 22,	/* Inf. Base. Modify error. */
-	NIS_NOSUCHTABLE = 23,	/* Name for table was wrong */
-	NIS_TYPEMISMATCH = 24, 	/* Entry and table type mismatch */
-	NIS_LINKNAMEERROR = 25,	/* Link points to bogus name */
-	NIS_PARTIAL = 26,	/* Partial success, found table */
-	NIS_TOOMANYATTRS = 27,	/* Too many attributes */
-	NIS_RPCERROR = 28,	/* RPC error encountered */
-	NIS_BADATTRIBUTE = 29,	/* Bad or invalid attribute */
-	NIS_NOTSEARCHABLE = 30,	/* Non-searchable object searched */
-	NIS_CBERROR = 31,	/* Error during callback (svc crash) */
-	NIS_FOREIGNNS = 32,	/* Foreign Namespace */
-	NIS_BADOBJECT = 33,	/* Malformed object structure */
-	NIS_NOTSAMEOBJ = 34,	/* Object swapped during deletion */
-	NIS_MODFAIL = 35,	/* Failure during a Modify. */
-	NIS_BADREQUEST = 36,	/* Illegal query for table */
-	NIS_NOTEMPTY = 37,	/* Attempt to remove a non-empty tbl */
-	NIS_COLDSTART_ERR = 38, /* Error accesing the cold start file */
-	NIS_RESYNC = 39,	/* Transaction log too far out of date */
-	NIS_FAIL = 40,		/* NIS operation failed. */
-	NIS_UNAVAIL = 41,	/* NIS+ service is unavailable (client) */
-	NIS_RES2BIG = 42,	/* NIS+ result too big for datagram */
-	NIS_SRVAUTH = 43,	/* NIS+ server wasn't authenticated. */
-	NIS_CLNTAUTH = 44,	/* NIS+ Client wasn't authenticated. */
-	NIS_NOFILESPACE = 45,	/* NIS+ server ran out of disk space */
-	NIS_NOPROC = 46,	/* NIS+ server couldn't create new proc */
-	NIS_DUMPLATER = 47	/* NIS+ server already has dump child */
-};
-
-
-/* 
- * Structure definitions for the parameters and results of the actual
- * NIS RPC calls.
- *
- * This is the standard result (in the protocol) of most of the nis 
- * requests.
- */
-
-struct nis_result {
-	nis_error	status;		/* Status of the response */
-	nis_object	objects<>;	/* objects found 	  */
-	netobj		cookie;		/* Cookie Data 		  */
-	u_long		zticks;		/* server ticks	 	  */
-	u_long		dticks;		/* DBM ticks.		  */
-	u_long		aticks;		/* Cache (accel) ticks	  */
-	u_long		cticks;		/* Client ticks		  */
-};
-
-/* 
- * A Name Service request 
- * This request is used to access the name space, ns_name is the name 
- * of the object within the namespace and the object is it's value, for
- * add/modify, a copy of the original for remove. 
- */
-
-struct ns_request {
-	nis_name	ns_name;	/* Name in the NIS name space	*/
-	nis_object	ns_object<1>;	/* Optional Object (add/remove)	*/
-};
-
-/* 
- * An information base request
- * This request includes the NIS name of the table we wish to search, the
- * search criteria in the form of attribute/value pairs and an optional
- * callback program number. If the callback program number is provided
- * the server will send back objects one at a time, otherwise it will
- * return them all in the response.
- */
-
-struct ib_request {
-	nis_name  	ibr_name;	/* The name of the Table 	*/
-	nis_attr  	ibr_srch<>; 	/* The search critereia 	*/
-	u_long		ibr_flags;	/* Optional flags 		*/
-	nis_object	ibr_obj<1>;	/* optional object (add/modify) */
-	nis_server	ibr_cbhost<1>;	/* Optional callback info	*/
-	u_long		ibr_bufsize;	/* Optional first/next bufsize	*/
-	netobj		ibr_cookie;	/* The first/next cookie	*/
-};
-
-/*
- * This argument to the PING call notifies the replicas that something in 
- * a directory has changed and this is it's timestamp. The replica will use
- * the timestamp to determine if its resync operation was successful.
- */
-struct ping_args {
-	nis_name	dir;	/* Directory that had the change */
-	u_long		stamp;	/* timestamp of the transaction  */
-};
-
-/* 
- * These are the type of entries that are stored in the transaction log, 
- * note that modifications will appear as two entries, for names, they have
- * an "OLD" entry followed by a "NEW" entry. For entries in tables, there
- * is a remove followed by an add. It is done this way so that we can read
- * the log backwards to back out transactions and forwards to propagate
- * updates.
- */
-enum log_entry_t {
-	LOG_NOP = 0,
-	ADD_NAME = 1,		/* Name Added to name space 		  */
-	REM_NAME = 2,		/* Name removed from name space 	  */
-	MOD_NAME_OLD = 3,	/* Name was modified in the name space 	  */
-	MOD_NAME_NEW = 4,	/* Name was modified in the name space 	  */
-	ADD_IBASE = 5,		/* Entry added to information base 	  */
-	REM_IBASE = 6,		/* Entry removed from information base    */
-	MOD_IBASE = 7,		/* Entry was modified in information base */
-	UPD_STAMP = 8		/* Update timestamp (used as fenceposts)  */
-};
-	
-/*
- * This result is returned from the name service when it is requested to 
- * dump logged entries from its transaction log. Information base updates
- * will have the name of the information base in the le_name field and
- * a canonical set of attribute/value pairs to fully specify the entry's
- * 'name'. 
- */
-struct log_entry {
-	u_long		le_time;	/* Time in seconds 		*/
-	log_entry_t	le_type;	/* Type of log entry 		*/
-	nis_name	le_princp;	/* Principal making the change	*/
-	nis_name	le_name;	/* Name of table/dir involved 	*/
-	nis_attr	le_attrs<>;	/* List of AV pairs.		*/
-	nis_object	le_object;	/* Actual object value 		*/
-};
-
-struct log_result {
-	nis_error 	lr_status;	/* The status itself 	 	*/
-	netobj		lr_cookie;	/* Used by the dump callback	*/
-	log_entry	lr_entries<>;	/* zero or more entries 	*/
-};
-	
-struct cp_result {
-	nis_error	cp_status;	/* Status of the checkpoint 	*/
-	u_long		cp_zticks;	/* Service 'ticks' 	    	*/
-	u_long		cp_dticks;	/* Database 'ticks'	    	*/
-};
-
-/*
- * This structure defines a generic NIS tag list. The taglist contains
- * zero or tags, each of which is a type and a value. (u_long). 
- * These are used to report statistics (see tag definitions below)
- * and to set or reset state variables.
- */
-struct nis_tag {
-	u_long	tag_type;	/* Statistic tag (may vary) 	 */
-	string	tag_val<1024>;	/* Statistic value may also vary */
-};
-
-struct nis_taglist {
-	nis_tag tags<>;		/* List of tags */
-};
-
-struct dump_args {
-	nis_name	da_dir;		/* Directory to dump 	*/
-	u_long		da_time;	/* From this timestamp	*/
-	nis_server	da_cbhost<1>;	/* Callback to use.	*/
-};
-
-struct fd_args {
-	nis_name	dir_name;  /* The directory we're looking for */
-	nis_name	requester; /* Host principal name for signature */
-};
-
-struct fd_result {
-	nis_error	status;		/* Status returned by function	*/
-	nis_name	source;		/* Source of this answer   	*/
-	opaque		dir_data<>;	/* Directory Data (XDR'ed) 	*/ 
-	opaque		signature<>;	/* Signature of the source 	*/
-};
-
-
-/* 
- * What's going on here? Well, it's like this. When the service
- * is being compiled it wants to have the service definition specific
- * info included, and when the client is being compiled it wants that
- * info. This includes the appropriate file which was generated by
- * make in the protocols directory (probably /usr/include/rpcsvc).
- *
- * Uhm... guys? With RPC, you aren't supposed to have separate
- * server-specific and client-specific header files. You have one header
- * file that's suitable for both. If your code doesn't work using just
- * the one header file, I submit to you that it's broken.
- *							-Bill
- */
-#ifdef SUN_STUPIDITY
-#ifdef RPC_SVC
-%#include "nis_svc.h"
-#endif
-#ifdef RPC_CLNT
-%#include "nis_clnt.h"
-#endif
-#endif
-
-program  NIS_PROG {
-
-	/* RPC Language description of the NIS+ protocol */
-	version NIS_VERSION {
-		/* The name service functions */
-		nis_result  NIS_LOOKUP(ns_request) = 1;
-		nis_result  NIS_ADD(ns_request) = 2;
-		nis_result  NIS_MODIFY(ns_request) = 3;
-		nis_result  NIS_REMOVE(ns_request) = 4;
-
-		/* The information base functions */
-		nis_result  NIS_IBLIST(ib_request) = 5;
-		nis_result  NIS_IBADD(ib_request) = 6;
-		nis_result  NIS_IBMODIFY(ib_request) = 7;
-		nis_result  NIS_IBREMOVE(ib_request) = 8;
-		nis_result  NIS_IBFIRST(ib_request) = 9;
-		nis_result  NIS_IBNEXT(ib_request) = 10;
-
-		/* NIS Administrative functions */
-		fd_result   NIS_FINDDIRECTORY(fd_args) = 12;
-
-		/* If fetch and optionally reset statistics */
-		nis_taglist  NIS_STATUS(nis_taglist) = 14;
-		
-		/* Dump changes to directory since time in da_time */
-		log_result  NIS_DUMPLOG(dump_args) = 15;
-		
-		/* Dump contents of directory named */
-		log_result  NIS_DUMP(dump_args) = 16;
-
-		/* Check status of callback thread */
-		bool	    NIS_CALLBACK(netobj) = 17;
-
-		/* Return last update time for named dir */
-		u_long      NIS_CPTIME(nis_name) = 18;
-
-		/* Checkpoint directory or table named */
-		cp_result   NIS_CHECKPOINT(nis_name) = 19;
-
-		/* Send 'status changed' ping to replicates */
-		void	    NIS_PING(ping_args) = 20;
-	
-		/* Modify server behaviour (such as debugging) */
-		nis_taglist NIS_SERVSTATE(nis_taglist) = 21;
-	
-		/* Create a Directory */
-		nis_error   NIS_MKDIR(nis_name) = 22;
-	
-		/* Remove a Directory */
-		nis_error   NIS_RMDIR(nis_name) = 23;
-		
-		/* Update public keys of a directory object */
-		nis_error   NIS_UPDKEYS(nis_name) = 24;
-	} = 3;
-} = 100300;
-
-/*
- * Included below are the defines that become part of nis.h,
- * they are technically not part of the protocol, but do define
- * key aspects of the implementation and are therefore useful
- * in building a conforming server or client.
- */
-#if RPC_HDR
-%/*
-% * Generic "hash" datastructures, used by all types of hashed data.
-% */
-%struct nis_hash_data {
-%	nis_name		name;	   /* NIS name of hashed item      */
-%	int			keychain;  /* It's hash key (for pop)      */
-%	struct nis_hash_data	*next;	   /* Hash collision pointer       */
-%	struct nis_hash_data	*prv_item; /* A serial, doubly linked list */
-%	struct nis_hash_data	*nxt_item; /* of items in the hash table   */
-%};
-%typedef struct nis_hash_data NIS_HASH_ITEM;
-%
-%struct nis_hash_table {
-%	NIS_HASH_ITEM	*keys[64];	/* A hash table of items           */
-%	NIS_HASH_ITEM	*first;		/* The first "item" in serial list */
-%};
-%typedef struct nis_hash_table NIS_HASH_TABLE;
-%
-%/* Structure for storing dynamically allocated static data */
-%struct nis_sdata {
-%	void	*buf;	/* Memory allocation pointer 	*/
-%	u_long	size;	/* Buffer size			*/
-%};
-%
-%/* Generic client creating flags */
-%#define ZMH_VC		1
-%#define ZMH_DG		2
-%#define ZMH_AUTH	4
-%
-%/* Testing Access rights for objects */
-%
-%#define NIS_READ_ACC		1
-%#define NIS_MODIFY_ACC		2
-%#define NIS_CREATE_ACC		4
-%#define NIS_DESTROY_ACC	8
-%/* Test macros. a == access rights, m == desired rights. */
-%#define WORLD(a, m)	(((a) & (m)) != 0)
-%#define GROUP(a, m)	(((a) & ((m) << 8)) != 0)
-%#define OWNER(a, m)	(((a) & ((m) << 16)) != 0)
-%#define NOBODY(a, m)	(((a) & ((m) << 24)) != 0)
-%
-%#define OATYPE(d, n) (((d)->do_armask.do_armask_val+n)->oa_otype)
-%#define OARIGHTS(d, n) (((d)->do_armask.do_armask_val+n)->oa_rights)
-%#define WORLD_DEFAULT (NIS_READ_ACC)
-%#define GROUP_DEFAULT (NIS_READ_ACC << 8)
-%#define OWNER_DEFAULT ((NIS_READ_ACC +\
-			 NIS_MODIFY_ACC +\
-			 NIS_CREATE_ACC +\
-			 NIS_DESTROY_ACC) << 16)
-%#define DEFAULT_RIGHTS (WORLD_DEFAULT | GROUP_DEFAULT | OWNER_DEFAULT)
-%
-%/* Result manipulation defines ... */
-%#define NIS_RES_NUMOBJ(x)	((x)->objects.objects_len)
-%#define NIS_RES_OBJECT(x)	((x)->objects.objects_val)
-%#define NIS_RES_COOKIE(x)	((x)->cookie)
-%#define NIS_RES_STATUS(x)	((x)->status)
-%
-%/* These defines make getting at the variant part of the object easier. */
-%#define TA_data zo_data.objdata_u.ta_data
-%#define EN_data zo_data.objdata_u.en_data
-%#define DI_data zo_data.objdata_u.di_data
-%#define LI_data zo_data.objdata_u.li_data
-%#define GR_data zo_data.objdata_u.gr_data
-%
-%#define __type_of(o) ((o)->zo_data.zo_type)
-%
-%/* Declarations for the internal subroutines in nislib.c */
-%enum name_pos {SAME_NAME, HIGHER_NAME, LOWER_NAME, NOT_SEQUENTIAL, BAD_NAME};
-%typedef enum name_pos name_pos;
-%
-%/*
-% * Defines for getting at column data in entry objects. Because RPCGEN
-% * generates some rather wordy structures, we create some defines that
-% * collapse the needed keystrokes to access a particular value using
-% * these definitions they take an nis_object *, and an int and return
-% * a u_char * for Value, and an int for length.
-% */
-%#define ENTRY_VAL(obj, col) \
-	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_val
-%#define ENTRY_LEN(obj, col) \
-	(obj)->EN_data.en_cols.en_cols_val[col].ec_value.ec_value_len
-%
-%#ifdef __cplusplus
-%}
-%#endif
-%
-%/* Prototypes, and extern declarations for the NIS library functions. */
-%#include <rpcsvc/nislib.h>
-%#endif /* __NIS_RPCGEN_H */
-%/* EDIT_START */
-%
-%/*
-% * nis_3.h
-% * 
-% * This file contains definitions that are only of interest to the actual
-% * service daemon and client stubs. Normal users of NIS will not include
-% * this file.
-% *
-% * NOTE : This include file is automatically created by a combination 
-% * of rpcgen and sed. DO NOT EDIT IT, change the nis.x file instead
-% * and then remake this file.
-% */
-%#ifndef __nis_3_h
-%#define __nis_3_h
-%#ifdef __cplusplus
-%extern "C" {
-%#endif
-#endif
diff --git a/include.new/rpcsvc/nis_cache.h b/include.new/rpcsvc/nis_cache.h
deleted file mode 100644
index 6462918..0000000
--- a/include.new/rpcsvc/nis_cache.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NIS_CACHE_H_RPCGEN
-#define	_NIS_CACHE_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-#include <rpc/types.h>
-#include <rpcsvc/nis.h>
-
-/* default cache file */
-#define CACHEFILE "/var/nis/NIS_SHARED_DIRCACHE"
-
-/* clients have to read-lock the cache file, and SVR4 locking requires that */
-/*   the file be writable, but we don't want a world-writable cache file.   */
-/*   So... everyone agrees to use a different, world-writable file for the  */
-/*   locking operations, but the data is in CACHEFILE.                      */
-#define CACHELOCK "/usr/tmp/.NIS_DIR_CACHELOCK"
-
-/* the file containing one trusted XDR'ed directory object.
- * This has to be present for the system to work.
- */
-#define COLD_START_FILE "/var/nis/NIS_COLD_START"
-
-enum pc_status {HIT, MISS, NEAR_MISS};
-
-extern int __nis_debuglevel;
-
-
-
-#define	CACHEPROG ((unsigned long)(100301))
-#define	CACHE_VER_1 ((unsigned long)(1))
-
-extern  void cacheprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	NIS_CACHE_ADD_ENTRY ((unsigned long)(1))
-extern  void * nis_cache_add_entry_1(fd_result *, CLIENT *);
-extern  void * nis_cache_add_entry_1_svc(fd_result *, struct svc_req *);
-#define	NIS_CACHE_REMOVE_ENTRY ((unsigned long)(2))
-extern  void * nis_cache_remove_entry_1(directory_obj *, CLIENT *);
-extern  void * nis_cache_remove_entry_1_svc(directory_obj *, struct svc_req *);
-#define	NIS_CACHE_READ_COLDSTART ((unsigned long)(3))
-extern  void * nis_cache_read_coldstart_1(void *, CLIENT *);
-extern  void * nis_cache_read_coldstart_1_svc(void *, struct svc_req *);
-#define	NIS_CACHE_REFRESH_ENTRY ((unsigned long)(4))
-extern  void * nis_cache_refresh_entry_1(char **, CLIENT *);
-extern  void * nis_cache_refresh_entry_1_svc(char **, struct svc_req *);
-extern int cacheprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NIS_CACHE_H_RPCGEN */
diff --git a/include.new/rpcsvc/nis_cache.x b/include.new/rpcsvc/nis_cache.x
deleted file mode 100644
index dee1805..0000000
--- a/include.new/rpcsvc/nis_cache.x
+++ /dev/null
@@ -1,85 +0,0 @@
-%/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part.  Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user or with the express written consent of
-% * Sun Microsystems, Inc.
-% *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-% *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
-% *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
-% *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California  94043
-% */
-
-/*
- *	nis_cache.x
- *
- *	Copyright (c) 1988-1992 Sun Microsystems Inc
- *	All Rights Reserved.
- */
-
-/* From: %#pragma ident	"@(#)nis_cache.x	1.11	94/05/03 SMI" */
-
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/nis_cache.x 114629 2003-05-04 02:51:42Z obrien $");
-#endif
-
-#ifdef RPC_HDR
-%#include <rpc/types.h>
-%#include <rpcsvc/nis.h>
-%
-%/* default cache file */
-%#define CACHEFILE "/var/nis/NIS_SHARED_DIRCACHE" 
-%
-%/* clients have to read-lock the cache file, and SVR4 locking requires that */
-%/*   the file be writable, but we don't want a world-writable cache file.   */
-%/*   So... everyone agrees to use a different, world-writable file for the  */
-%/*   locking operations, but the data is in CACHEFILE.                      */
-%#define CACHELOCK "/usr/tmp/.NIS_DIR_CACHELOCK"
-%
-%/* the file containing one trusted XDR'ed directory object.
-% * This has to be present for the system to work.
-% */
-%#define COLD_START_FILE "/var/nis/NIS_COLD_START"
-%
-%enum pc_status {HIT, MISS, NEAR_MISS};
-%
-%extern int __nis_debuglevel;
-%
-%
-#endif
-
-#ifdef RPC_CLNT
-#ifdef SOLARIS
-%#include "../gen/nis_clnt.h"
-#else
-%#include "nis.h"
-#endif
-#endif
-
-program CACHEPROG {
-	version CACHE_VER_1 {
-		void NIS_CACHE_ADD_ENTRY(fd_result) = 1;
-		void NIS_CACHE_REMOVE_ENTRY(directory_obj) = 2;
-		void NIS_CACHE_READ_COLDSTART(void) = 3;
-		void NIS_CACHE_REFRESH_ENTRY(string<>) = 4;
-	} = 1;
-} = 100301;
diff --git a/include.new/rpcsvc/nis_callback.h b/include.new/rpcsvc/nis_callback.h
deleted file mode 100644
index 4273aa9..0000000
--- a/include.new/rpcsvc/nis_callback.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NIS_CALLBACK_H_RPCGEN
-#define	_NIS_CALLBACK_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-#include <rpcsvc/nis.h>
-
-typedef nis_object *obj_p;
-
-struct cback_data {
-	struct {
-		u_int entries_len;
-		obj_p *entries_val;
-	} entries;
-};
-typedef struct cback_data cback_data;
-
-#define	CB_PROG ((unsigned long)(100302))
-#define	CB_VERS ((unsigned long)(1))
-
-extern  void cb_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	CBPROC_RECEIVE ((unsigned long)(1))
-extern  bool_t * cbproc_receive_1(cback_data *, CLIENT *);
-extern  bool_t * cbproc_receive_1_svc(cback_data *, struct svc_req *);
-#define	CBPROC_FINISH ((unsigned long)(2))
-extern  void * cbproc_finish_1(void *, CLIENT *);
-extern  void * cbproc_finish_1_svc(void *, struct svc_req *);
-#define	CBPROC_ERROR ((unsigned long)(3))
-extern  void * cbproc_error_1(nis_error *, CLIENT *);
-extern  void * cbproc_error_1_svc(nis_error *, struct svc_req *);
-extern int cb_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_obj_p(XDR *, obj_p*);
-extern  bool_t xdr_cback_data(XDR *, cback_data*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NIS_CALLBACK_H_RPCGEN */
diff --git a/include.new/rpcsvc/nis_callback.x b/include.new/rpcsvc/nis_callback.x
deleted file mode 100644
index c26f404..0000000
--- a/include.new/rpcsvc/nis_callback.x
+++ /dev/null
@@ -1,75 +0,0 @@
-%/*-
-% * Copyright (c) 2010, Oracle America, Inc.
-% *
-% * Redistribution and use in source and binary forms, with or without
-% * modification, are permitted provided that the following conditions are
-% * met:
-% *
-% *     * Redistributions of source code must retain the above copyright
-% *       notice, this list of conditions and the following disclaimer.
-% *     * 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.
-% *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
-% *   COPYRIGHT HOLDER 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.
-% */
-
-/*
- *	nis_callback.x
- *
- *	Copyright (c) 1988-1992 Sun Microsystems Inc
- *	All Rights Reserved.
- */
-
-/* From: %#pragma ident	"@(#)nis_callback.x	1.7	94/05/03 SMI" */
-
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/nis_callback.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-/*
- * "@(#)zns_cback.x 1.2 90/09/10 Copyr 1990 Sun Micro" 
- *
- * RPCL description of the Callback Service.
- */
-
-#ifdef RPC_HDR
-%#include <rpcsvc/nis.h>
-#endif
-#ifdef RPC_XDR
-#ifdef SOLARIS
-%#include "nis_clnt.h"
-#else
-%#include "nis.h"
-#endif
-#endif
-
-typedef nis_object	*obj_p;
-
-struct cback_data {
-	obj_p		entries<>;	/* List of objects */
-};
-
-program CB_PROG {
-	version CB_VERS {
-		bool	CBPROC_RECEIVE(cback_data) = 1;
-		void	CBPROC_FINISH(void) = 2;
-		void	CBPROC_ERROR(nis_error) = 3;
-	} = 1;
-} = 100302;
diff --git a/include.new/rpcsvc/nis_db.h b/include.new/rpcsvc/nis_db.h
deleted file mode 100644
index 703de86..0000000
--- a/include.new/rpcsvc/nis_db.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- * $FreeBSD: releng/10.2/include/rpcsvc/nis_db.h 93032 2002-03-23 17:24:55Z imp $
- */
-
-/*
- * Copyright (c) 1991, by Sun Microsystems Inc.
- */
-
-/*
- * This header file defines the interface to the NIS database. All
- * implementations of the database must export at least these routines.
- * They must also follow the conventions set herein. See the implementors
- * guide for specific semantics that are required.
- */
-
-#ifndef	_RPCSVC_NIS_DB_H
-#define	_RPCSVC_NIS_DB_H
-
-
-/* From: #pragma ident	"@(#)nis_db.h	1.8	94/05/03 SMI" */
-
-/*
- * Note: although the version of <rpcsvc/nis_db.h> shipped with Solaris
- * 2.5/2.5.x is actually older than this one (according to the ident
- * string), it contains changes and a few added functions. Those changes
- * have been hand merged into this file to bring it up to date.
- */
-
-#include <rpc/rpc.h>
-#include <rpcsvc/nis.h>
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-enum db_status {
-	DB_SUCCESS = 0,
-	DB_NOTFOUND = 1,
-	DB_NOTUNIQUE = 2,
-	DB_BADTABLE = 3,
-	DB_BADQUERY = 4,
-	DB_BADOBJECT = 5,
-	DB_MEMORY_LIMIT = 6,
-	DB_STORAGE_LIMIT = 7,
-	DB_INTERNAL_ERROR = 8
-};
-typedef enum db_status db_status;
-
-enum db_action {
-	DB_LOOKUP = 0,
-	DB_REMOVE = 1,
-	DB_ADD = 2,
-	DB_FIRST = 3,
-	DB_NEXT = 4,
-	DB_ALL = 5,
-	DB_RESET_NEXT = 6
-};
-typedef enum db_action db_action;
-
-typedef entry_obj *entry_object_p;
-
-typedef struct {
-	u_int db_next_desc_len;
-	char *db_next_desc_val;
-} db_next_desc;
-
-struct db_result {
-	db_status status;
-	db_next_desc nextinfo;
-	struct {
-		u_int objects_len;
-		entry_object_p *objects_val;
-	} objects;
-	long ticks;
-};
-typedef struct db_result db_result;
-
-/*
- * Prototypes for the database functions.
- */
-
-extern bool_t db_initialize(char *);
-#ifdef ORIGINAL_DECLS
-extern bool_t db_create_table(char *, table_obj *);
-extern bool_t db_destroy_table(char *);
-#else
-extern db_status db_create_table(char *, table_obj *);
-extern db_status db_destroy_table(char *);
-#endif
-extern db_result *db_first_entry(char *, int, nis_attr *);
-extern db_result *db_next_entry(char *, db_next_desc *);
-extern db_result *db_reset_next_entry(char *, db_next_desc *);
-extern db_result *db_list_entries(char *, int, nis_attr *);
-extern db_result *db_add_entry(char *, int,  nis_attr *, entry_obj *);
-extern db_result *db_remove_entry(char *, int, nis_attr *);
-extern db_status db_checkpoint(char *);
-extern db_status db_standby(char *);
-#ifndef ORIGINAL_DECLS
-extern db_status db_table_exists(char *);
-extern db_status db_unload_table(char *);
-extern void db_free_result(db_result *);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* _RPCSVC_NIS_DB_H */
diff --git a/include.new/rpcsvc/nis_object.x b/include.new/rpcsvc/nis_object.x
deleted file mode 100644
index 08cdd40..0000000
--- a/include.new/rpcsvc/nis_object.x
+++ /dev/null
@@ -1,319 +0,0 @@
-%/*-
-% * Copyright (c) 2010, Oracle America, Inc.
-% *
-% * Redistribution and use in source and binary forms, with or without
-% * modification, are permitted provided that the following conditions are
-% * met:
-% *
-% *     * Redistributions of source code must retain the above copyright
-% *       notice, this list of conditions and the following disclaimer.
-% *     * 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.
-% *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
-% *   COPYRIGHT HOLDER 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.
-% */
-
-/*
- *	nis_object.x
- *
- *	Copyright (c) 1988-1992 Sun Microsystems Inc
- *	All Rights Reserved.
- */
-
-/* $FreeBSD: releng/10.2/include/rpcsvc/nis_object.x 272850 2014-10-09 23:05:32Z hrs $ */
-/* From: %#pragma ident	"@(#)nis_object.x	1.10	94/05/03 SMI" */
-
-#if RPC_HDR
-%
-%#ifndef __nis_object_h
-%#define __nis_object_h
-%
-#endif
-/* 
- * 	This file defines the format for a NIS object in RPC language.
- * It is included by the main .x file and the database access protocol
- * file. It is common because both of them need to deal with the same
- * type of object. Generating the actual code though is a bit messy because
- * the nis.x file and the nis_dba.x file will generate xdr routines to 
- * encode/decode objects when only one set is needed. Such is life when
- * one is using rpcgen.
- *
- * Note, the protocol doesn't specify any limits on such things as
- * maximum name length, number of attributes, etc. These are enforced
- * by the database backend. When you hit them you will no. Also see
- * the db_getlimits() function for fetching the limit values.
- *
- */
-
-/* Some manifest constants, chosen to maximize flexibility without
- * plugging the wire full of data.
- */
-const NIS_MAXSTRINGLEN = 255;
-const NIS_MAXNAMELEN   = 1024;
-const NIS_MAXATTRNAME  = 32;
-const NIS_MAXATTRVAL   = 2048;
-const NIS_MAXCOLUMNS   = 64;
-const NIS_MAXATTR      = 16;
-const NIS_MAXPATH      = 1024;
-const NIS_MAXREPLICAS  = 128;
-const NIS_MAXLINKS     = 16;
-
-const NIS_PK_NONE      = 0;	/* no public key (unix/sys auth) */
-const NIS_PK_DH	       = 1;	/* Public key is Diffie-Hellman type */
-const NIS_PK_RSA       = 2;	/* Public key if RSA type */
-const NIS_PK_KERB      = 3;	/* Use kerberos style authentication */
-
-/*
- * The fundamental name type of NIS. The name may consist of two parts,
- * the first being the fully qualified name, and the second being an 
- * optional set of attribute/value pairs.
- */
-struct nis_attr {
-	string	zattr_ndx<>;	/* name of the index 		*/
-	opaque	zattr_val<>;	/* Value for the attribute. 	*/
-};
-
-typedef string nis_name<>;	/* The NIS name itself. */
-
-/* NIS object types are defined by the following enumeration. The numbers
- * they use are based on the following scheme :
- *		     0 - 1023 are reserved for Sun,
- * 		1024 - 2047 are defined to be private to a particular tree.
- *		2048 - 4095 are defined to be user defined.
- *		4096 - ...  are reserved for future use.
- */
-
-enum zotypes {
-	BOGUS_OBJ  	= 0,	/* Uninitialized object structure 	*/
-	NO_OBJ   	= 1,	/* NULL object (no data)	 	*/
-	DIRECTORY_OBJ 	= 2,	/* Directory object describing domain 	*/
-	GROUP_OBJ  	= 3,	/* Group object (a list of names) 	*/
-	TABLE_OBJ  	= 4,	/* Table object (a database schema) 	*/
-	ENTRY_OBJ  	= 5,	/* Entry object (a database record) 	*/
-	LINK_OBJ   	= 6, 	/* A name link.				*/
-	PRIVATE_OBJ   	= 7 	/* Private object (all opaque data) 	*/
-};
-
-/*
- * The types of Name services NIS knows about. They are enumerated
- * here. The Binder code will use this type to determine if it has
- * a set of library routines that will access the indicated name service.
- */
-enum nstype {
-	UNKNOWN = 0,
-	NIS = 1,	/* Nis Plus Service		*/
-	SUNYP = 2,	/* Old NIS Service		*/
-	IVY = 3,	/* Nis Plus Plus Service	*/
-	DNS = 4,	/* Domain Name Service		*/
-	X500 = 5,	/* ISO/CCCIT X.500 Service	*/
-	DNANS = 6,	/* Digital DECNet Name Service	*/
-	XCHS = 7,	/* Xerox ClearingHouse Service	*/
-	CDS= 8
-};
-
-/*
- * DIRECTORY - The name service object. These objects identify other name
- * servers that are serving some portion of the name space. Each has a
- * type associated with it. The resolver library will note whether or not
- * is has the needed routines to access that type of service. 
- * The oarmask structure defines an access rights mask on a per object 
- * type basis for the name spaces. The only bits currently used are 
- * create and destroy. By enabling or disabling these access rights for
- * a specific object type for a one of the accessor entities (owner,
- * group, world) the administrator can control what types of objects 
- * may be freely added to the name space and which require the 
- * administrator's approval.
- */
-struct oar_mask {
-	u_long	oa_rights;	/* Access rights mask 	*/
-	zotypes	oa_otype;	/* Object type 		*/
-};
-
-struct endpoint {
-	string		uaddr<>;
-	string		family<>;   /* Transport family (INET, OSI, etc) */
-	string		proto<>;    /* Protocol (TCP, UDP, CLNP,  etc)   */
-};
-
-/*
- * Note: pkey is a netobj which is limited to 1024 bytes which limits the
- * keysize to 8192 bits. This is consider to be a reasonable limit for
- * the expected lifetime of this service.
- */
-struct nis_server {
-	nis_name	name; 	 	/* Principal name of the server  */
-	endpoint	ep<>;  		/* Universal addr(s) for server  */
-	u_long		key_type;	/* Public key type		 */
-	netobj		pkey;		/* server's public key  	 */
-};
-
-struct directory_obj {
-	nis_name   do_name;	 /* Name of the directory being served   */
-	nstype	   do_type;	 /* one of NIS, DNS, IVY, YP, or X.500 	 */
-	nis_server do_servers<>; /* <0> == Primary name server     	 */
-	u_long	   do_ttl;	 /* Time To Live (for caches) 		 */
-	oar_mask   do_armask<>;  /* Create/Destroy rights by object type */
-};
-
-/* 
- * ENTRY - This is one row of data from an information base. 
- * The type value is used by the client library to convert the entry to 
- * it's internal structure representation. The Table name is a back pointer
- * to the table where the entry is stored. This allows the client library 
- * to determine where to send a request if the client wishes to change this
- * entry but got to it through a LINK rather than directly.
- * If the entry is a "standalone" entry then this field is void.
- */
-const EN_BINARY   = 1;	/* Indicates value is binary data 	*/
-const EN_CRYPT    = 2;	/* Indicates the value is encrypted	*/
-const EN_XDR      = 4;	/* Indicates the value is XDR encoded	*/
-const EN_MODIFIED = 8;	/* Indicates entry is modified. 	*/
-const EN_ASN1     = 64;	/* Means contents use ASN.1 encoding    */
-
-struct entry_col {
-	u_long	ec_flags;	/* Flags for this value */
-	opaque	ec_value<>;	/* It's textual value	*/
-};
-
-struct entry_obj {
-	string 	en_type<>;	/* Type of entry such as "passwd" */
-	entry_col en_cols<>;	/* Value for the entry		  */
-};
-
-/*
- * GROUP - The group object contains a list of NIS principal names. Groups
- * are used to authorize principals. Each object has a set of access rights
- * for members of its group. Principal names in groups are in the form 
- * name.directory and recursive groups are expressed as @groupname.directory
- */
-struct group_obj {
-	u_long		gr_flags;	/* Flags controlling group	*/
-	nis_name	gr_members<>;  	/* List of names in group 	*/
-};
-
-/*
- * LINK - This is the LINK object. It is quite similar to a symbolic link
- * in the UNIX filesystem. The attributes in the main object structure are
- * relative to the LINK data and not what it points to (like the file system)
- * "modify" privleges here indicate the right to modify what the link points
- * at and not to modify that actual object pointed to by the link.
- */
-struct link_obj {
-	zotypes	 li_rtype;	/* Real type of the object	*/
-	nis_attr li_attrs<>;	/* Attribute/Values for tables	*/
-	nis_name li_name; 	/* The object's real NIS name	*/
-};
-
-/*
- * TABLE - This is the table object. It implements a simple 
- * data base that applications and use for configuration or 
- * administration purposes. The role of the table is to group together
- * a set of related entries. Tables are the simple database component
- * of NIS. Like many databases, tables are logically divided into columns
- * and rows. The columns are labeled with indexes and each ENTRY makes
- * up a row. Rows may be addressed within the table by selecting one
- * or more indexes, and values for those indexes. Each row which has
- * a value for the given index that matches the desired value is returned.
- * Within the definition of each column there is a flags variable, this
- * variable contains flags which determine whether or not the column is
- * searchable, contains binary data, and access rights for the entry objects
- * column value. 
- */
-
-const TA_BINARY     = 1;	/* Means table data is binary 		*/
-const TA_CRYPT      = 2;	/* Means value should be encrypted 	*/
-const TA_XDR        = 4;	/* Means value is XDR encoded		*/
-const TA_SEARCHABLE = 8;	/* Means this column is searchable	*/
-const TA_CASE       = 16;	/* Means this column is Case Sensitive	*/
-const TA_MODIFIED   = 32;	/* Means this columns attrs are modified*/
-const TA_ASN1       = 64;	/* Means contents use ASN.1 encoding     */
-
-struct table_col {
-	string	tc_name<64>;	/* Column Name 	 	   */
-	u_long	tc_flags;	/* control flags	   */
-	u_long	tc_rights;	/* Access rights mask	   */
-};
-
-struct table_obj {
-	string 	  ta_type<64>;	 /* Table type such as "passwd"	*/
-	int	  ta_maxcol;	 /* Total number of columns	*/
-	u_char	  ta_sep;	 /* Separator character 	*/
-	table_col ta_cols<>; 	 /* The number of table indexes */
-	string	  ta_path<>;	 /* A search path for this table */
-};
-
-/*
- * This union joins together all of the currently known objects. 
- */
-union objdata switch (zotypes zo_type) {
-        case DIRECTORY_OBJ :
-                struct directory_obj di_data;
-        case GROUP_OBJ :
-                struct group_obj gr_data;
-        case TABLE_OBJ :
-                struct table_obj ta_data;
-        case ENTRY_OBJ:
-                struct entry_obj en_data;
-        case LINK_OBJ :
-                struct link_obj li_data;
-        case PRIVATE_OBJ :
-                opaque	po_data<>;
-	case NO_OBJ :
-		void;
-        case BOGUS_OBJ :
-		void;
-        default :
-                void;
-};
-
-/*
- * This is the basic NIS object data type. It consists of a generic part
- * which all objects contain, and a specialized part which varies depending
- * on the type of the object. All of the specialized sections have been
- * described above. You might have wondered why they all start with an 
- * integer size, followed by the useful data. The answer is, when the 
- * server doesn't recognize the type returned it treats it as opaque data. 
- * And the definition for opaque data is {int size; char *data;}. In this
- * way, servers and utility routines that do not understand a given type
- * may still pass it around. One has to be careful in setting
- * this variable accurately, it must take into account such things as
- * XDR padding of structures etc. The best way to set it is to note one's
- * position in the XDR encoding stream, encode the structure, look at the
- * new position and calculate the size. 
- */
-struct nis_oid {
-	u_long	ctime;		/* Time of objects creation 	*/
-	u_long	mtime;		/* Time of objects modification */
-};
-
-struct nis_object {
-	nis_oid	 zo_oid;	/* object identity verifier.		*/ 
-	nis_name zo_name;	/* The NIS name for this object		*/
-	nis_name zo_owner;	/* NIS name of object owner.		*/
-	nis_name zo_group;	/* NIS name of access group.		*/
-	nis_name zo_domain;	/* The administrator for the object	*/
-	u_long	 zo_access;	/* Access rights (owner, group, world)	*/
-	u_long	 zo_ttl;	/* Object's time to live in seconds.	*/
-	objdata	 zo_data;	/* Data structure for this type 	*/
-};
-#if RPC_HDR
-%
-%#endif /* if __nis_object_h */
-%
-#endif
diff --git a/include.new/rpcsvc/nis_tags.h b/include.new/rpcsvc/nis_tags.h
deleted file mode 100644
index e315530..0000000
--- a/include.new/rpcsvc/nis_tags.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * Copyright (c) 1991, Sun Microsystems Inc.
- */
-
-/*
- *	nis_tags.h
- *
- *	This file contains the tags and statistics definitions. It is
- *	automatically included by nis.h
- */
-
-#ifndef	_RPCSVC_NIS_TAGS_H
-#define	_RPCSVC_NIS_TAGS_H
-
-/* $FreeBSD: releng/10.2/include/rpcsvc/nis_tags.h 272850 2014-10-09 23:05:32Z hrs $ */
-/* From: #pragma ident	"@(#)nis_tags.h	1.10	94/05/03 SMI" */
-/* from file: zns_tags.h	1.7 Copyright (c) 1990 Sun Microsystems */
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#ifndef ORIGINAL_DECLS
-#define		NIS_DIR "data"
-#endif
-
-/* Lookup and List function flags */
-#define	FOLLOW_LINKS	(1<<0)	/* Follow link objects 			*/
-#define	FOLLOW_PATH	(1<<1)	/* Follow the path in a table 		*/
-#define	HARD_LOOKUP	(1<<2)	/* Block until successful 		*/
-#define	ALL_RESULTS	(1<<3)	/* Retrieve all results 		*/
-#define	NO_CACHE	(1<<4)	/* Do not return 'cached' results 	*/
-#define	MASTER_ONLY	(1<<5)	/* Get value only from master server	*/
-#define	EXPAND_NAME	(1<<6)	/* Expand partitially qualified names	*/
-
-/* Semantic modification for table operations flags */
-#define	RETURN_RESULT	(1<<7)	/* Return resulting object to client    */
-#define	ADD_OVERWRITE	(1<<8)	/* Allow overwrites on ADD		*/
-#define	REM_MULTIPLE	(1<<9)	/* Allow wildcard deletes		*/
-#define	MOD_SAMEOBJ	(1<<10)	/* Check modified object before write	*/
-#define	ADD_RESERVED	(1<<11)	/* Spare ADD semantic			*/
-#define	REM_RESERVED	(1<<12)	/* Spare REM semantic			*/
-#ifdef ORIGINAL_DECLS
-#define	MOD_RESERVED	(1<<13)	/* Spare MOD semantic			*/
-#else
-#define	MOD_EXCLUSIVE	(1<<13)	/* Modify no overwrite on modified keys	*/
-#endif
-
-/* Transport specific modifications to the operation */
-#define	USE_DGRAM	(1<<16) /* Use a datagram transport 		*/
-#define	NO_AUTHINFO	(1<<17) /* Don't bother attaching auth info	*/
-
-/*
- * Declarations for "standard" NIS+ tags
- * State variable tags have values	0 - 2047
- * Statistic tags have values		2048 - 65535
- * User Tags have values		>2^16
- */
-#define	TAG_DEBUG	1	/* set debug level 		*/
-#define	TAG_STATS	2	/* Enable/disable statistics 	*/
-#define	TAG_GCACHE	3	/* Flush the Group Cache	*/
-#ifndef ORIGINAL_DECLS
-#define	TAG_GCACHE_ALL	TAG_GCACHE
-#endif
-#define	TAG_DCACHE	4	/* Flush the directory cache	*/
-#ifndef ORIGINAL_DECLS
-#define	TAG_DCACHE_ONE	TAG_DCACHE
-#endif
-#define	TAG_OCACHE	5	/* Flush the Object Cache	*/
-#define	TAG_SECURE	6	/* Set the security level 	*/
-#ifndef ORIGINAL_DECLS
-#define	TAG_TCACHE_ONE	7	/* Flush the table cache	*/
-#define	TAG_DCACHE_ALL	8	/* Flush entire directory cache */
-#define TAG_TCACHE_ALL	9	/* Flush entire table cache	*/
-#define	TAG_GCACHE_ONE	10	/* Flush one group object	*/
-#define	TAG_DCACHE_ONE_REFRESH 11 /* Flush and refresh one DO	*/
-#endif
-
-#define	TAG_OPSTATS	2048	/* NIS+ operations statistics   */
-#define	TAG_THREADS	2049	/* Child process/thread status  */
-#define	TAG_HEAP	2050	/* Heap usage statistics	*/
-#define	TAG_UPDATES	2051	/* Updates to this service	*/
-#define	TAG_VISIBLE	2052	/* First update that isn't replicated */
-#define	TAG_S_DCACHE	2053	/* Directory cache statistics	*/
-#define	TAG_S_OCACHE	2054	/* Object cache statistics	*/
-#define	TAG_S_GCACHE	2055	/* Group cache statistics	*/
-#define	TAG_S_STORAGE	2056	/* Group cache statistics	*/
-#define	TAG_UPTIME	2057	/* Time that server has been up */
-#ifndef ORIGINAL_DECLS
-#define	TAG_DIRLIST	2058    /* Dir served by this server	*/
-#define	TAG_NISCOMPAT	2059    /* Whether supports NIS compat mode */
-#define	TAG_DNSFORWARDING 2060	/* Whether DNS forwarding supported*/
-#define	TAG_SECURITY_LEVEL 2061 /* Security level of the server */
-#define	TAG_ROOTSERVER	2062	/* Whether root server		*/
-#endif
-
-/*
- * Declarations for the Group object flags. Currently
- * there are only 3.
- */
-#define	IMPMEM_GROUPS  1	/* Implicit Membership allowed 	*/
-#define	RECURS_GROUPS  2	/* Recursive Groups allowed 	*/
-#define	NEGMEM_GROUPS  4	/* Negative Groups allowed	*/
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _RPCSVC_NIS_TAGS_H */
diff --git a/include.new/rpcsvc/nislib.h b/include.new/rpcsvc/nislib.h
deleted file mode 100644
index c82339b..0000000
--- a/include.new/rpcsvc/nislib.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- * $FreeBSD: releng/10.2/include/rpcsvc/nislib.h 93032 2002-03-23 17:24:55Z imp $
- */
-
-/*
- * Copyright (c) 1991, Sun Microsystems Inc.
- */
-
-/*
- * This file contains the interfaces that are visible in the SunOS 5.x
- * implementation of NIS Plus.
- */
-
-#ifndef	_RPCSVC_NISLIB_H
-#define	_RPCSVC_NISLIB_H
-
-/* From: #pragma ident	"@(#)nislib.h	1.16	94/05/03 SMI" */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct signature {
-	int signature_len;
-	char *signature_val;
-};
-
-extern void nis_freeresult(nis_result *);
-extern nis_result * nis_lookup(nis_name, u_long);
-extern nis_result * nis_list(nis_name, u_long,
-	int (*)(nis_name, nis_object *, void *), void *);
-extern nis_result * nis_add(nis_name, nis_object *);
-extern nis_result * nis_remove(nis_name, nis_object *);
-extern nis_result * nis_modify(nis_name, nis_object *);
-
-extern nis_result * nis_add_entry(nis_name, nis_object *, u_long);
-extern nis_result * nis_remove_entry(nis_name, nis_object *, u_long);
-extern nis_result * nis_modify_entry(nis_name, nis_object *, u_long);
-extern nis_result * nis_first_entry(nis_name);
-extern nis_result * nis_next_entry(nis_name, netobj *);
-
-extern nis_error nis_mkdir(nis_name, nis_server *);
-extern nis_error nis_rmdir(nis_name, nis_server *);
-extern name_pos nis_dir_cmp(nis_name, nis_name);
-
-extern nis_name * nis_getnames(nis_name);
-extern void nis_freenames(nis_name *);
-extern nis_name nis_domain_of(nis_name);
-extern nis_name nis_leaf_of(nis_name);
-extern nis_name nis_leaf_of_r(const nis_name, char *, size_t);
-extern nis_name nis_name_of(nis_name);
-extern nis_name nis_local_group(void);
-extern nis_name nis_local_directory(void);
-extern nis_name nis_local_principal(void);
-extern nis_name nis_local_host(void);
-
-extern void nis_destroy_object(nis_object *);
-extern nis_object * nis_clone_object(nis_object *, nis_object *);
-extern void nis_print_object(nis_object *);
-
-extern char * nis_sperrno(nis_error);
-extern void nis_perror(nis_error, char *);
-extern char * nis_sperror(nis_error, char *);
-extern void nis_lerror(nis_error, char *);
-
-extern void nis_print_group_entry(nis_name);
-extern bool_t nis_ismember(nis_name, nis_name);
-extern nis_error nis_creategroup(nis_name, u_long);
-extern nis_error nis_destroygroup(nis_name);
-extern nis_error nis_addmember(nis_name, nis_name);
-extern nis_error nis_removemember(nis_name, nis_name);
-extern nis_error nis_verifygroup(nis_name);
-
-extern void nis_freeservlist(nis_server **);
-extern nis_server ** nis_getservlist(nis_name);
-extern nis_error nis_stats(nis_server *, nis_tag *, int, nis_tag **);
-extern nis_error nis_servstate(nis_server *, nis_tag *, int, nis_tag **);
-extern void nis_freetags(nis_tag *, int);
-
-extern nis_result * nis_checkpoint(nis_name);
-extern void nis_ping(nis_name, u_long, nis_object *);
-
-/*
- * XXX: PLEASE NOTE THAT THE FOLLOWING FUNCTIONS ARE INTERNAL
- * TO NIS+ AND SHOULD NOT BE USED BY ANY APPLICATION PROGRAM.
- * THEIR SEMANTICS AND/OR SIGNATURE CAN CHANGE WITHOUT NOTICE.
- * SO, PLEASE DO NOT USE THEM.  YOU ARE WARNED!!!!
- */
-
-extern char ** __break_name(nis_name, int *);
-extern int __name_distance(char **, char **);
-extern nis_result * nis_make_error(nis_error, u_long, u_long, u_long, u_long);
-extern nis_attr * __cvt2attr(int *, char **);
-extern void nis_free_request(ib_request *);
-extern nis_error nis_get_request(nis_name, nis_object *, netobj*, ib_request*);
-extern nis_object * nis_read_obj(char *);
-extern int nis_write_obj(char *, nis_object *);
-extern int nis_in_table(nis_name, NIS_HASH_TABLE *, int *);
-extern int nis_insert_item(NIS_HASH_ITEM *, NIS_HASH_TABLE *);
-extern NIS_HASH_ITEM * nis_find_item(nis_name, NIS_HASH_TABLE *);
-extern NIS_HASH_ITEM * nis_remove_item(nis_name, NIS_HASH_TABLE *);
-extern void nis_insert_name(nis_name, NIS_HASH_TABLE *);
-extern void nis_remove_name(nis_name, NIS_HASH_TABLE *);
-extern CLIENT * nis_make_rpchandle(nis_server *, int, u_long, u_long, u_long,
-								int, int);
-extern void * nis_get_static_storage(struct nis_sdata *, u_long, u_long);
-extern char * nis_data(char *);
-extern void nis_print_rights(u_long);
-extern void nis_print_directory(directory_obj *);
-extern void nis_print_group(group_obj *);
-extern void nis_print_table(table_obj *);
-extern void nis_print_link(link_obj *);
-extern void nis_print_entry(entry_obj *);
-extern nis_object * nis_get_object(char *, char *, char *, u_long, u_long,
-								    zotypes);
-extern nis_server * __nis_init_callback(CLIENT *,
-    int (*)(nis_name, nis_object *, void *), void *);
-extern int nis_getdtblsize(void);
-extern int __nis_run_callback(netobj *, u_long, struct timeval *, CLIENT *);
-
-extern log_result *nis_dumplog(nis_server *, nis_name, u_long);
-extern log_result *nis_dump(nis_server *, nis_name,
-    int (*)(nis_name, nis_object *, void *));
-
-extern bool_t __do_ismember(nis_name, nis_name,
-    nis_result *(*)(nis_name, u_long));
-extern nis_name __nis_map_group(nis_name);
-extern nis_name __nis_map_group_r(nis_name, char*, size_t);
-
-extern nis_error __nis_CacheBind(char *, directory_obj *);
-extern nis_error __nis_CacheSearch(char *, directory_obj *);
-extern bool_t __nis_CacheRemoveEntry(directory_obj *);
-extern void __nis_CacheRestart(void);
-extern void __nis_CachePrint(void);
-extern void __nis_CacheDumpStatistics(void);
-extern bool_t writeColdStartFile(directory_obj *);
-
-extern CLIENT * __get_ti_clnt(char *, CLIENT *, char **, pid_t *);
-extern int __strcmp_case_insens(char *, char *);
-extern int __strncmp_case_insens(char *, char *);
-
-extern fd_result * nis_finddirectory(directory_obj *, nis_name);
-extern int __start_clock(int);
-extern u_long __stop_clock(int);
-
-/*
- * This particular function is part of the FreeBSD NIS+ implementation
- * only. Ideally it should be somewhere else, but it is used by both
- * rpc.nisd and nis_cachemgr, and there aren't that many headers common
- * to both programs.
- */
-
-extern struct signature *__nis_calculate_encrypted_cksum(unsigned char *, unsigned int, char *, int);
-
-#define	NUL '\0'
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif	/* _RPCSVC_NISLIB_H */
diff --git a/include.new/rpcsvc/nlm_prot.h b/include.new/rpcsvc/nlm_prot.h
deleted file mode 100644
index 96b3c78..0000000
--- a/include.new/rpcsvc/nlm_prot.h
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _NLM_PROT_H_RPCGEN
-#define	_NLM_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LM_MAXSTRLEN 1024
-#define MAXNAMELEN LM_MAXSTRLEN+1
-
-enum nlm_stats {
-	nlm_granted = 0,
-	nlm_denied = 1,
-	nlm_denied_nolocks = 2,
-	nlm_blocked = 3,
-	nlm_denied_grace_period = 4,
-	nlm_deadlck = 5
-};
-typedef enum nlm_stats nlm_stats;
-
-struct nlm_holder {
-	bool_t exclusive;
-	int svid;
-	netobj oh;
-	u_int l_offset;
-	u_int l_len;
-};
-typedef struct nlm_holder nlm_holder;
-
-struct nlm_testrply {
-	nlm_stats stat;
-	union {
-		struct nlm_holder holder;
-	} nlm_testrply_u;
-};
-typedef struct nlm_testrply nlm_testrply;
-
-struct nlm_stat {
-	nlm_stats stat;
-};
-typedef struct nlm_stat nlm_stat;
-
-struct nlm_res {
-	netobj cookie;
-	nlm_stat stat;
-};
-typedef struct nlm_res nlm_res;
-
-struct nlm_testres {
-	netobj cookie;
-	nlm_testrply stat;
-};
-typedef struct nlm_testres nlm_testres;
-
-struct nlm_lock {
-	char *caller_name;
-	netobj fh;
-	netobj oh;
-	int svid;
-	u_int l_offset;
-	u_int l_len;
-};
-typedef struct nlm_lock nlm_lock;
-
-struct nlm_lockargs {
-	netobj cookie;
-	bool_t block;
-	bool_t exclusive;
-	struct nlm_lock alock;
-	bool_t reclaim;
-	int state;
-};
-typedef struct nlm_lockargs nlm_lockargs;
-
-struct nlm_cancargs {
-	netobj cookie;
-	bool_t block;
-	bool_t exclusive;
-	struct nlm_lock alock;
-};
-typedef struct nlm_cancargs nlm_cancargs;
-
-struct nlm_testargs {
-	netobj cookie;
-	bool_t exclusive;
-	struct nlm_lock alock;
-};
-typedef struct nlm_testargs nlm_testargs;
-
-struct nlm_unlockargs {
-	netobj cookie;
-	struct nlm_lock alock;
-};
-typedef struct nlm_unlockargs nlm_unlockargs;
-/*
- * The following enums are actually bit encoded for efficient
- * boolean algebra.... DON'T change them.....
- */
-
-enum fsh_mode {
-	fsm_DN = 0,
-	fsm_DR = 1,
-	fsm_DW = 2,
-	fsm_DRW = 3
-};
-typedef enum fsh_mode fsh_mode;
-
-enum fsh_access {
-	fsa_NONE = 0,
-	fsa_R = 1,
-	fsa_W = 2,
-	fsa_RW = 3
-};
-typedef enum fsh_access fsh_access;
-
-struct nlm_share {
-	char *caller_name;
-	netobj fh;
-	netobj oh;
-	fsh_mode mode;
-	fsh_access access;
-};
-typedef struct nlm_share nlm_share;
-
-struct nlm_shareargs {
-	netobj cookie;
-	nlm_share share;
-	bool_t reclaim;
-};
-typedef struct nlm_shareargs nlm_shareargs;
-
-struct nlm_shareres {
-	netobj cookie;
-	nlm_stats stat;
-	int sequence;
-};
-typedef struct nlm_shareres nlm_shareres;
-
-struct nlm_notify {
-	char *name;
-	long state;
-};
-typedef struct nlm_notify nlm_notify;
-/* definitions for NLM version 4 */
-
-enum nlm4_stats {
-	nlm4_granted = 0,
-	nlm4_denied = 1,
-	nlm4_denied_nolocks = 2,
-	nlm4_blocked = 3,
-	nlm4_denied_grace_period = 4,
-	nlm4_deadlck = 5,
-	nlm4_rofs = 6,
-	nlm4_stale_fh = 7,
-	nlm4_fbig = 8,
-	nlm4_failed = 9
-};
-typedef enum nlm4_stats nlm4_stats;
-
-struct nlm4_stat {
-	nlm4_stats stat;
-};
-typedef struct nlm4_stat nlm4_stat;
-
-struct nlm4_holder {
-	bool_t exclusive;
-	uint32_t svid;
-	netobj oh;
-	u_int64_t l_offset;
-	u_int64_t l_len;
-};
-typedef struct nlm4_holder nlm4_holder;
-
-struct nlm4_lock {
-	char *caller_name;
-	netobj fh;
-	netobj oh;
-	uint32_t svid;
-	u_int64_t l_offset;
-	u_int64_t l_len;
-};
-typedef struct nlm4_lock nlm4_lock;
-
-struct nlm4_share {
-	char *caller_name;
-	netobj fh;
-	netobj oh;
-	fsh_mode mode;
-	fsh_access access;
-};
-typedef struct nlm4_share nlm4_share;
-
-struct nlm4_testrply {
-	nlm4_stats stat;
-	union {
-		struct nlm4_holder holder;
-	} nlm4_testrply_u;
-};
-typedef struct nlm4_testrply nlm4_testrply;
-
-struct nlm4_testres {
-	netobj cookie;
-	nlm4_testrply stat;
-};
-typedef struct nlm4_testres nlm4_testres;
-
-struct nlm4_testargs {
-	netobj cookie;
-	bool_t exclusive;
-	struct nlm4_lock alock;
-};
-typedef struct nlm4_testargs nlm4_testargs;
-
-struct nlm4_res {
-	netobj cookie;
-	nlm4_stat stat;
-};
-typedef struct nlm4_res nlm4_res;
-
-struct nlm4_lockargs {
-	netobj cookie;
-	bool_t block;
-	bool_t exclusive;
-	struct nlm4_lock alock;
-	bool_t reclaim;
-	int state;
-};
-typedef struct nlm4_lockargs nlm4_lockargs;
-
-struct nlm4_cancargs {
-	netobj cookie;
-	bool_t block;
-	bool_t exclusive;
-	struct nlm4_lock alock;
-};
-typedef struct nlm4_cancargs nlm4_cancargs;
-
-struct nlm4_unlockargs {
-	netobj cookie;
-	struct nlm4_lock alock;
-};
-typedef struct nlm4_unlockargs nlm4_unlockargs;
-
-struct nlm4_shareargs {
-	netobj cookie;
-	nlm4_share share;
-	bool_t reclaim;
-};
-typedef struct nlm4_shareargs nlm4_shareargs;
-
-struct nlm4_shareres {
-	netobj cookie;
-	nlm4_stats stat;
-	int sequence;
-};
-typedef struct nlm4_shareres nlm4_shareres;
-
-struct nlm_sm_status {
-	char *mon_name;
-	int state;
-	char priv[16];
-};
-typedef struct nlm_sm_status nlm_sm_status;
-
-struct nlm4_notify {
-	char *name;
-	int32_t state;
-};
-typedef struct nlm4_notify nlm4_notify;
-
-#define	NLM_PROG ((unsigned long)(100021))
-#define	NLM_SM ((unsigned long)(0))
-
-extern  void nlm_prog_0(struct svc_req *rqstp, SVCXPRT *transp);
-#define	NLM_SM_NOTIFY ((unsigned long)(1))
-extern  void * nlm_sm_notify_0(struct nlm_sm_status *, CLIENT *);
-extern  void * nlm_sm_notify_0_svc(struct nlm_sm_status *, struct svc_req *);
-extern int nlm_prog_0_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	NLM_VERS ((unsigned long)(1))
-
-extern  void nlm_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	NLM_TEST ((unsigned long)(1))
-extern  nlm_testres * nlm_test_1(struct nlm_testargs *, CLIENT *);
-extern  nlm_testres * nlm_test_1_svc(struct nlm_testargs *, struct svc_req *);
-#define	NLM_LOCK ((unsigned long)(2))
-extern  nlm_res * nlm_lock_1(struct nlm_lockargs *, CLIENT *);
-extern  nlm_res * nlm_lock_1_svc(struct nlm_lockargs *, struct svc_req *);
-#define	NLM_CANCEL ((unsigned long)(3))
-extern  nlm_res * nlm_cancel_1(struct nlm_cancargs *, CLIENT *);
-extern  nlm_res * nlm_cancel_1_svc(struct nlm_cancargs *, struct svc_req *);
-#define	NLM_UNLOCK ((unsigned long)(4))
-extern  nlm_res * nlm_unlock_1(struct nlm_unlockargs *, CLIENT *);
-extern  nlm_res * nlm_unlock_1_svc(struct nlm_unlockargs *, struct svc_req *);
-#define	NLM_GRANTED ((unsigned long)(5))
-extern  nlm_res * nlm_granted_1(struct nlm_testargs *, CLIENT *);
-extern  nlm_res * nlm_granted_1_svc(struct nlm_testargs *, struct svc_req *);
-#define	NLM_TEST_MSG ((unsigned long)(6))
-extern  void * nlm_test_msg_1(struct nlm_testargs *, CLIENT *);
-extern  void * nlm_test_msg_1_svc(struct nlm_testargs *, struct svc_req *);
-#define	NLM_LOCK_MSG ((unsigned long)(7))
-extern  void * nlm_lock_msg_1(struct nlm_lockargs *, CLIENT *);
-extern  void * nlm_lock_msg_1_svc(struct nlm_lockargs *, struct svc_req *);
-#define	NLM_CANCEL_MSG ((unsigned long)(8))
-extern  void * nlm_cancel_msg_1(struct nlm_cancargs *, CLIENT *);
-extern  void * nlm_cancel_msg_1_svc(struct nlm_cancargs *, struct svc_req *);
-#define	NLM_UNLOCK_MSG ((unsigned long)(9))
-extern  void * nlm_unlock_msg_1(struct nlm_unlockargs *, CLIENT *);
-extern  void * nlm_unlock_msg_1_svc(struct nlm_unlockargs *, struct svc_req *);
-#define	NLM_GRANTED_MSG ((unsigned long)(10))
-extern  void * nlm_granted_msg_1(struct nlm_testargs *, CLIENT *);
-extern  void * nlm_granted_msg_1_svc(struct nlm_testargs *, struct svc_req *);
-#define	NLM_TEST_RES ((unsigned long)(11))
-extern  void * nlm_test_res_1(nlm_testres *, CLIENT *);
-extern  void * nlm_test_res_1_svc(nlm_testres *, struct svc_req *);
-#define	NLM_LOCK_RES ((unsigned long)(12))
-extern  void * nlm_lock_res_1(nlm_res *, CLIENT *);
-extern  void * nlm_lock_res_1_svc(nlm_res *, struct svc_req *);
-#define	NLM_CANCEL_RES ((unsigned long)(13))
-extern  void * nlm_cancel_res_1(nlm_res *, CLIENT *);
-extern  void * nlm_cancel_res_1_svc(nlm_res *, struct svc_req *);
-#define	NLM_UNLOCK_RES ((unsigned long)(14))
-extern  void * nlm_unlock_res_1(nlm_res *, CLIENT *);
-extern  void * nlm_unlock_res_1_svc(nlm_res *, struct svc_req *);
-#define	NLM_GRANTED_RES ((unsigned long)(15))
-extern  void * nlm_granted_res_1(nlm_res *, CLIENT *);
-extern  void * nlm_granted_res_1_svc(nlm_res *, struct svc_req *);
-extern int nlm_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	NLM_VERSX ((unsigned long)(3))
-
-extern  void nlm_prog_3(struct svc_req *rqstp, SVCXPRT *transp);
-#define	NLM_SHARE ((unsigned long)(20))
-extern  nlm_shareres * nlm_share_3(nlm_shareargs *, CLIENT *);
-extern  nlm_shareres * nlm_share_3_svc(nlm_shareargs *, struct svc_req *);
-#define	NLM_UNSHARE ((unsigned long)(21))
-extern  nlm_shareres * nlm_unshare_3(nlm_shareargs *, CLIENT *);
-extern  nlm_shareres * nlm_unshare_3_svc(nlm_shareargs *, struct svc_req *);
-#define	NLM_NM_LOCK ((unsigned long)(22))
-extern  nlm_res * nlm_nm_lock_3(nlm_lockargs *, CLIENT *);
-extern  nlm_res * nlm_nm_lock_3_svc(nlm_lockargs *, struct svc_req *);
-#define	NLM_FREE_ALL ((unsigned long)(23))
-extern  void * nlm_free_all_3(nlm_notify *, CLIENT *);
-extern  void * nlm_free_all_3_svc(nlm_notify *, struct svc_req *);
-extern int nlm_prog_3_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	NLM_VERS4 ((unsigned long)(4))
-
-extern  void nlm_prog_4(struct svc_req *rqstp, SVCXPRT *transp);
-#define	NLM4_TEST ((unsigned long)(1))
-extern  nlm4_testres * nlm4_test_4(nlm4_testargs *, CLIENT *);
-extern  nlm4_testres * nlm4_test_4_svc(nlm4_testargs *, struct svc_req *);
-#define	NLM4_LOCK ((unsigned long)(2))
-extern  nlm4_res * nlm4_lock_4(nlm4_lockargs *, CLIENT *);
-extern  nlm4_res * nlm4_lock_4_svc(nlm4_lockargs *, struct svc_req *);
-#define	NLM4_CANCEL ((unsigned long)(3))
-extern  nlm4_res * nlm4_cancel_4(nlm4_cancargs *, CLIENT *);
-extern  nlm4_res * nlm4_cancel_4_svc(nlm4_cancargs *, struct svc_req *);
-#define	NLM4_UNLOCK ((unsigned long)(4))
-extern  nlm4_res * nlm4_unlock_4(nlm4_unlockargs *, CLIENT *);
-extern  nlm4_res * nlm4_unlock_4_svc(nlm4_unlockargs *, struct svc_req *);
-#define	NLM4_GRANTED ((unsigned long)(5))
-extern  nlm4_res * nlm4_granted_4(nlm4_testargs *, CLIENT *);
-extern  nlm4_res * nlm4_granted_4_svc(nlm4_testargs *, struct svc_req *);
-#define	NLM4_TEST_MSG ((unsigned long)(6))
-extern  void * nlm4_test_msg_4(nlm4_testargs *, CLIENT *);
-extern  void * nlm4_test_msg_4_svc(nlm4_testargs *, struct svc_req *);
-#define	NLM4_LOCK_MSG ((unsigned long)(7))
-extern  void * nlm4_lock_msg_4(nlm4_lockargs *, CLIENT *);
-extern  void * nlm4_lock_msg_4_svc(nlm4_lockargs *, struct svc_req *);
-#define	NLM4_CANCEL_MSG ((unsigned long)(8))
-extern  void * nlm4_cancel_msg_4(nlm4_cancargs *, CLIENT *);
-extern  void * nlm4_cancel_msg_4_svc(nlm4_cancargs *, struct svc_req *);
-#define	NLM4_UNLOCK_MSG ((unsigned long)(9))
-extern  void * nlm4_unlock_msg_4(nlm4_unlockargs *, CLIENT *);
-extern  void * nlm4_unlock_msg_4_svc(nlm4_unlockargs *, struct svc_req *);
-#define	NLM4_GRANTED_MSG ((unsigned long)(10))
-extern  void * nlm4_granted_msg_4(nlm4_testargs *, CLIENT *);
-extern  void * nlm4_granted_msg_4_svc(nlm4_testargs *, struct svc_req *);
-#define	NLM4_TEST_RES ((unsigned long)(11))
-extern  void * nlm4_test_res_4(nlm4_testres *, CLIENT *);
-extern  void * nlm4_test_res_4_svc(nlm4_testres *, struct svc_req *);
-#define	NLM4_LOCK_RES ((unsigned long)(12))
-extern  void * nlm4_lock_res_4(nlm4_res *, CLIENT *);
-extern  void * nlm4_lock_res_4_svc(nlm4_res *, struct svc_req *);
-#define	NLM4_CANCEL_RES ((unsigned long)(13))
-extern  void * nlm4_cancel_res_4(nlm4_res *, CLIENT *);
-extern  void * nlm4_cancel_res_4_svc(nlm4_res *, struct svc_req *);
-#define	NLM4_UNLOCK_RES ((unsigned long)(14))
-extern  void * nlm4_unlock_res_4(nlm4_res *, CLIENT *);
-extern  void * nlm4_unlock_res_4_svc(nlm4_res *, struct svc_req *);
-#define	NLM4_GRANTED_RES ((unsigned long)(15))
-extern  void * nlm4_granted_res_4(nlm4_res *, CLIENT *);
-extern  void * nlm4_granted_res_4_svc(nlm4_res *, struct svc_req *);
-#define	NLM4_SHARE ((unsigned long)(20))
-extern  nlm4_shareres * nlm4_share_4(nlm4_shareargs *, CLIENT *);
-extern  nlm4_shareres * nlm4_share_4_svc(nlm4_shareargs *, struct svc_req *);
-#define	NLM4_UNSHARE ((unsigned long)(21))
-extern  nlm4_shareres * nlm4_unshare_4(nlm4_shareargs *, CLIENT *);
-extern  nlm4_shareres * nlm4_unshare_4_svc(nlm4_shareargs *, struct svc_req *);
-#define	NLM4_NM_LOCK ((unsigned long)(22))
-extern  nlm4_res * nlm4_nm_lock_4(nlm4_lockargs *, CLIENT *);
-extern  nlm4_res * nlm4_nm_lock_4_svc(nlm4_lockargs *, struct svc_req *);
-#define	NLM4_FREE_ALL ((unsigned long)(23))
-extern  void * nlm4_free_all_4(nlm4_notify *, CLIENT *);
-extern  void * nlm4_free_all_4_svc(nlm4_notify *, struct svc_req *);
-extern int nlm_prog_4_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_nlm_stats(XDR *, nlm_stats*);
-extern  bool_t xdr_nlm_holder(XDR *, nlm_holder*);
-extern  bool_t xdr_nlm_testrply(XDR *, nlm_testrply*);
-extern  bool_t xdr_nlm_stat(XDR *, nlm_stat*);
-extern  bool_t xdr_nlm_res(XDR *, nlm_res*);
-extern  bool_t xdr_nlm_testres(XDR *, nlm_testres*);
-extern  bool_t xdr_nlm_lock(XDR *, nlm_lock*);
-extern  bool_t xdr_nlm_lockargs(XDR *, nlm_lockargs*);
-extern  bool_t xdr_nlm_cancargs(XDR *, nlm_cancargs*);
-extern  bool_t xdr_nlm_testargs(XDR *, nlm_testargs*);
-extern  bool_t xdr_nlm_unlockargs(XDR *, nlm_unlockargs*);
-extern  bool_t xdr_fsh_mode(XDR *, fsh_mode*);
-extern  bool_t xdr_fsh_access(XDR *, fsh_access*);
-extern  bool_t xdr_nlm_share(XDR *, nlm_share*);
-extern  bool_t xdr_nlm_shareargs(XDR *, nlm_shareargs*);
-extern  bool_t xdr_nlm_shareres(XDR *, nlm_shareres*);
-extern  bool_t xdr_nlm_notify(XDR *, nlm_notify*);
-extern  bool_t xdr_nlm4_stats(XDR *, nlm4_stats*);
-extern  bool_t xdr_nlm4_stat(XDR *, nlm4_stat*);
-extern  bool_t xdr_nlm4_holder(XDR *, nlm4_holder*);
-extern  bool_t xdr_nlm4_lock(XDR *, nlm4_lock*);
-extern  bool_t xdr_nlm4_share(XDR *, nlm4_share*);
-extern  bool_t xdr_nlm4_testrply(XDR *, nlm4_testrply*);
-extern  bool_t xdr_nlm4_testres(XDR *, nlm4_testres*);
-extern  bool_t xdr_nlm4_testargs(XDR *, nlm4_testargs*);
-extern  bool_t xdr_nlm4_res(XDR *, nlm4_res*);
-extern  bool_t xdr_nlm4_lockargs(XDR *, nlm4_lockargs*);
-extern  bool_t xdr_nlm4_cancargs(XDR *, nlm4_cancargs*);
-extern  bool_t xdr_nlm4_unlockargs(XDR *, nlm4_unlockargs*);
-extern  bool_t xdr_nlm4_shareargs(XDR *, nlm4_shareargs*);
-extern  bool_t xdr_nlm4_shareres(XDR *, nlm4_shareres*);
-extern  bool_t xdr_nlm_sm_status(XDR *, nlm_sm_status*);
-extern  bool_t xdr_nlm4_notify(XDR *, nlm4_notify*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_NLM_PROT_H_RPCGEN */
diff --git a/include.new/rpcsvc/nlm_prot.x b/include.new/rpcsvc/nlm_prot.x
deleted file mode 100644
index a4a2f22..0000000
--- a/include.new/rpcsvc/nlm_prot.x
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Network lock manager protocol definition
- * Copyright (C) 1986 Sun Microsystems, Inc.
- *
- * protocol used between local lock manager and remote lock manager
- */
-
-#ifdef RPC_HDR
-%#define LM_MAXSTRLEN	1024
-%#define MAXNAMELEN	LM_MAXSTRLEN+1
-#else
-%#include <sys/cdefs.h>
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: * @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%__RCSID("$NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $");
-%#endif /* not lint */
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/nlm_prot.x 114629 2003-05-04 02:51:42Z obrien $");
-#endif
-
-/*
- * status of a call to the lock manager
- */
-enum nlm_stats {
-	nlm_granted = 0,
-	nlm_denied = 1,
-	nlm_denied_nolocks = 2,
-	nlm_blocked = 3,
-	nlm_denied_grace_period = 4,
-	nlm_deadlck = 5
-};
-
-struct nlm_holder {
-	bool exclusive;
-	int svid;
-	netobj oh;
-	unsigned l_offset;
-	unsigned l_len;
-};
-
-union nlm_testrply switch (nlm_stats stat) {
-	case nlm_denied:
-		struct nlm_holder holder;
-	default:
-		void;
-};
-
-struct nlm_stat {
-	nlm_stats stat;
-};
-
-struct nlm_res {
-	netobj cookie;
-	nlm_stat stat;
-};
-
-struct nlm_testres {
-	netobj cookie;
-	nlm_testrply stat;
-};
-
-struct nlm_lock {
-	string caller_name<LM_MAXSTRLEN>;
-	netobj fh;		/* identify a file */
-	netobj oh;		/* identify owner of a lock */
-	int svid;		/* generated from pid for svid */
-	unsigned l_offset;
-	unsigned l_len;
-};
-
-struct nlm_lockargs {
-	netobj cookie;
-	bool block;
-	bool exclusive;
-	struct nlm_lock alock;
-	bool reclaim;		/* used for recovering locks */
-	int state;		/* specify local status monitor state */
-};
-
-struct nlm_cancargs {
-	netobj cookie;
-	bool block;
-	bool exclusive;
-	struct nlm_lock alock;
-};
-
-struct nlm_testargs {
-	netobj cookie;
-	bool exclusive;
-	struct nlm_lock alock;
-};
-
-struct nlm_unlockargs {
-	netobj cookie;
-	struct nlm_lock alock;
-};
-
-
-#ifdef RPC_HDR
-%/*
-% * The following enums are actually bit encoded for efficient
-% * boolean algebra.... DON'T change them.....
-% */
-#endif
-enum	fsh_mode {
-	fsm_DN  = 0,	/* deny none */
-	fsm_DR  = 1,	/* deny read */
-	fsm_DW  = 2,	/* deny write */
-	fsm_DRW = 3	/* deny read/write */
-};
-
-enum	fsh_access {
-	fsa_NONE = 0,	/* for completeness */
-	fsa_R    = 1,	/* read only */
-	fsa_W    = 2,	/* write only */
-	fsa_RW   = 3	/* read/write */
-};
-
-struct	nlm_share {
-	string caller_name<LM_MAXSTRLEN>;
-	netobj	fh;
-	netobj	oh;
-	fsh_mode	mode;
-	fsh_access	access;
-};
-
-struct	nlm_shareargs {
-	netobj	cookie;
-	nlm_share	share;
-	bool	reclaim;
-};
-
-struct	nlm_shareres {
-	netobj	cookie;
-	nlm_stats	stat;
-	int	sequence;
-};
-
-struct	nlm_notify {
-	string name<MAXNAMELEN>;
-	long state;
-};
-
-#ifdef RPC_HDR
-%/* definitions for NLM version 4 */
-#endif
-enum nlm4_stats {
-	nlm4_granted			= 0,
-	nlm4_denied			= 1,
-	nlm4_denied_nolocks		= 2,
-	nlm4_blocked			= 3,
-	nlm4_denied_grace_period	= 4,
-	nlm4_deadlck			= 5,
-	nlm4_rofs			= 6,
-	nlm4_stale_fh			= 7,
-	nlm4_fbig			= 8,
-	nlm4_failed			= 9
-};
-
-struct nlm4_stat {
-	nlm4_stats stat;
-};
-
-struct nlm4_holder {
-	bool exclusive;
-	uint32_t svid;
-	netobj oh;
-	u_int64_t l_offset;
-	u_int64_t l_len;
-};
-
-struct nlm4_lock {
-	string caller_name<MAXNAMELEN>;
-	netobj fh;
-	netobj oh;
-	uint32_t svid;
-	u_int64_t l_offset;
-	u_int64_t l_len;
-};
-
-struct nlm4_share {
-	string caller_name<MAXNAMELEN>;
-	netobj fh;
-	netobj oh;
-	fsh_mode mode;
-	fsh_access access;
-};
-
-union nlm4_testrply switch (nlm4_stats stat) {
-	case nlm_denied:
-		struct nlm4_holder holder;
-	default:
-		void;
-};
-
-struct nlm4_testres {
-	netobj cookie;
-	nlm4_testrply stat;
-};
-
-struct nlm4_testargs {
-	netobj cookie;
-	bool exclusive;
-	struct nlm4_lock alock;
-};
-
-struct nlm4_res {
-	netobj cookie;
-	nlm4_stat stat;
-};
-
-struct nlm4_lockargs {
-	netobj cookie;
-	bool block;
-	bool exclusive;
-	struct nlm4_lock alock;
-	bool reclaim;		/* used for recovering locks */
-	int state;		/* specify local status monitor state */
-};
-
-struct nlm4_cancargs {
-	netobj cookie;
-	bool block;
-	bool exclusive;
-	struct nlm4_lock alock;
-};
-
-struct nlm4_unlockargs {
-	netobj cookie;
-	struct nlm4_lock alock;
-};
-
-struct	nlm4_shareargs {
-	netobj	cookie;
-	nlm4_share	share;
-	bool	reclaim;
-};
-
-struct	nlm4_shareres {
-	netobj	cookie;
-	nlm4_stats	stat;
-	int	sequence;
-};
-
-/*
- * argument for the procedure called by rpc.statd when a monitored host
- * status change.
- * XXX assumes LM_MAXSTRLEN == SM_MAXSTRLEN
- */
-struct nlm_sm_status {
-	string mon_name<LM_MAXSTRLEN>; /* name of host */
-	int state;			/* new state */
-	opaque priv[16];		/* private data */
-};
-
-struct	nlm4_notify {
-	string name<MAXNAMELEN>;
-	int32_t state;
-};
-
-/*
- * Over-the-wire protocol used between the network lock managers
- */
-
-program NLM_PROG {
-
-	version NLM_SM {
-		void NLM_SM_NOTIFY(struct nlm_sm_status) = 1;
-	} = 0;
-
-	version NLM_VERS {
-
-		nlm_testres	NLM_TEST(struct nlm_testargs) =	1;
-
-		nlm_res		NLM_LOCK(struct nlm_lockargs) =	2;
-
-		nlm_res		NLM_CANCEL(struct nlm_cancargs) = 3;
-		nlm_res		NLM_UNLOCK(struct nlm_unlockargs) =	4;
-
-		/*
-		 * remote lock manager call-back to grant lock
-		 */
-		nlm_res		NLM_GRANTED(struct nlm_testargs)= 5;
-		/*
-		 * message passing style of requesting lock
-		 */
-		void		NLM_TEST_MSG(struct nlm_testargs) = 6;
-		void		NLM_LOCK_MSG(struct nlm_lockargs) = 7;
-		void		NLM_CANCEL_MSG(struct nlm_cancargs) =8;
-		void		NLM_UNLOCK_MSG(struct nlm_unlockargs) = 9;
-		void		NLM_GRANTED_MSG(struct nlm_testargs) = 10;
-		void		NLM_TEST_RES(nlm_testres) = 11;
-		void		NLM_LOCK_RES(nlm_res) = 12;
-		void		NLM_CANCEL_RES(nlm_res) = 13;
-		void		NLM_UNLOCK_RES(nlm_res) = 14;
-		void		NLM_GRANTED_RES(nlm_res) = 15;
-	} = 1;
-
-	version NLM_VERSX {
-		nlm_shareres	NLM_SHARE(nlm_shareargs) = 20;
-		nlm_shareres	NLM_UNSHARE(nlm_shareargs) = 21;
-		nlm_res		NLM_NM_LOCK(nlm_lockargs) = 22;
-		void		NLM_FREE_ALL(nlm_notify) = 23;
-	} = 3;
-
-	version NLM_VERS4 {
-		nlm4_testres NLM4_TEST(nlm4_testargs) = 1;
-		nlm4_res NLM4_LOCK(nlm4_lockargs) = 2;
-		nlm4_res NLM4_CANCEL(nlm4_cancargs) = 3;
-		nlm4_res NLM4_UNLOCK(nlm4_unlockargs) = 4;
-		nlm4_res NLM4_GRANTED(nlm4_testargs) = 5;
-		void NLM4_TEST_MSG(nlm4_testargs) = 6;
-		void NLM4_LOCK_MSG(nlm4_lockargs) = 7;
-		void NLM4_CANCEL_MSG(nlm4_cancargs) = 8;
-		void NLM4_UNLOCK_MSG(nlm4_unlockargs) = 9;
-		void NLM4_GRANTED_MSG(nlm4_testargs) = 10;
-		void NLM4_TEST_RES(nlm4_testres) = 11;
-		void NLM4_LOCK_RES(nlm4_res) = 12;
-		void NLM4_CANCEL_RES(nlm4_res) = 13;
-		void NLM4_UNLOCK_RES(nlm4_res) = 14;
-		void NLM4_GRANTED_RES(nlm4_res) = 15;
-		nlm4_shareres NLM4_SHARE(nlm4_shareargs) = 20;
-		nlm4_shareres NLM4_UNSHARE(nlm4_shareargs) = 21;
-		nlm4_res NLM4_NM_LOCK(nlm4_lockargs) = 22;
-		void NLM4_FREE_ALL(nlm4_notify) = 23;
-	} = 4;
-} = 100021;
diff --git a/include.new/rpcsvc/rex.h b/include.new/rpcsvc/rex.h
deleted file mode 100644
index ca8f7c3..0000000
--- a/include.new/rpcsvc/rex.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _REX_H_RPCGEN
-#define	_REX_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	STRINGSIZE 1024
-
-typedef char *rexstring;
-#define	SIGINT 2
-#define	REX_INTERACTIVE 1
-
-struct rex_start {
-	struct {
-		u_int rst_cmd_len;
-		rexstring *rst_cmd_val;
-	} rst_cmd;
-	rexstring rst_host;
-	rexstring rst_fsname;
-	rexstring rst_dirwithin;
-	struct {
-		u_int rst_env_len;
-		rexstring *rst_env_val;
-	} rst_env;
-	u_int rst_port0;
-	u_int rst_port1;
-	u_int rst_port2;
-	u_int rst_flags;
-};
-typedef struct rex_start rex_start;
-
-struct rex_result {
-	int rlt_stat;
-	rexstring rlt_message;
-};
-typedef struct rex_result rex_result;
-
-struct sgttyb {
-	u_int four;
-	char chars[4];
-	u_int flags;
-};
-typedef struct sgttyb sgttyb;
-#define	B0 0
-#define	B50 1
-#define	B75 2
-#define	B110 3
-#define	B134 4
-#define	B150 5
-#define	B200 6
-#define	B300 7
-#define	B600 8
-#define	B1200 9
-#define	B1800 10
-#define	B2400 11
-#define	B4800 12
-#define	B9600 13
-#define	B19200 14
-#define	B38400 15
-#define	TANDEM 0x00000001
-#define	CBREAK 0x00000002
-#define	LCASE 0x00000004
-#define	ECHO 0x00000008
-#define	CRMOD 0x00000010
-#define	RAW 0x00000020
-#define	ODDP 0x00000040
-#define	EVENP 0x00000080
-#define	ANYP 0x000000c0
-#define	NLDELAY 0x00000300
-#define	NL0 0x00000000
-#define	NL1 0x00000100
-#define	NL2 0x00000200
-#define	NL3 0x00000300
-#define	TBDELAY 0x00000c00
-#define	TAB0 0x00000000
-#define	TAB1 0x00000400
-#define	TAB2 0x00000800
-#define	XTABS 0x00000c00
-#define	CRDELAY 0x00003000
-#define	CR0 0x00000000
-#define	CR1 0x00001000
-#define	CR2 0x00002000
-#define	CR3 0x00003000
-#define	VTDELAY 0x00004000
-#define	FF0 0x00000000
-#define	FF1 0x00004000
-#define	BSDELAY 0x00008000
-#define	BS0 0x00000000
-#define	BS1 0x00008000
-#define	CRTBS 0x00010000
-#define	PRTERA 0x00020000
-#define	CRTERA 0x00040000
-#define	TILDE 0x00080000
-#define	MDMBUF 0x00100000
-#define	LITOUT 0x00200000
-#define	TOSTOP 0x00400000
-#define	FLUSHO 0x00800000
-#define	NOHANG 0x01000000
-#define	L001000 0x02000000
-#define	CRTKIL 0x04000000
-#define	PASS8 0x08000000
-#define	CTLECH 0x10000000
-#define	PENDIN 0x20000000
-#define	DECCTQ 0x40000000
-#define	NOFLSH 0x80000000
-
-struct tchars {
-	u_int six;
-	char chars[6];
-};
-typedef struct tchars tchars;
-
-struct ltchars {
-	u_int six;
-	char chars[6];
-	u_int mode;
-};
-typedef struct ltchars ltchars;
-
-struct rex_ttysize {
-	int ts_lines;
-	int ts_cols;
-};
-typedef struct rex_ttysize rex_ttysize;
-
-struct rex_ttymode {
-	sgttyb basic;
-	tchars more;
-	ltchars yetmore;
-	u_int andmore;
-};
-typedef struct rex_ttymode rex_ttymode;
-#define	LCRTBS 0x0001
-#define	LPRTERA 0x0002
-#define	LCRTERA 0x0004
-#define	LTILDE 0x0008
-#define	LMDMBUF 0x0010
-#define	LLITOUT 0x0020
-#define	LTOSTOP 0x0040
-#define	LFLUSHO 0x0080
-#define	LNOHANG 0x0100
-#define	LL001000 0x0200
-#define	LCRTKIL 0x0400
-#define	LPASS8 0x0800
-#define	LCTLECH 0x1000
-#define	LPENDIN 0x2000
-#define	LDECCTQ 0x4000
-#define	LNOFLSH 0x8000
-
-#define	REXPROG ((unsigned long)(100017))
-#define	REXVERS ((unsigned long)(1))
-
-extern  void rexprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	REXPROC_START ((unsigned long)(1))
-extern  rex_result * rexproc_start_1(rex_start *, CLIENT *);
-extern  rex_result * rexproc_start_1_svc(rex_start *, struct svc_req *);
-#define	REXPROC_WAIT ((unsigned long)(2))
-extern  rex_result * rexproc_wait_1(void *, CLIENT *);
-extern  rex_result * rexproc_wait_1_svc(void *, struct svc_req *);
-#define	REXPROC_MODES ((unsigned long)(3))
-extern  void * rexproc_modes_1(rex_ttymode *, CLIENT *);
-extern  void * rexproc_modes_1_svc(rex_ttymode *, struct svc_req *);
-#define	REXPROC_WINCH ((unsigned long)(4))
-extern  void * rexproc_winch_1(rex_ttysize *, CLIENT *);
-extern  void * rexproc_winch_1_svc(rex_ttysize *, struct svc_req *);
-#define	REXPROC_SIGNAL ((unsigned long)(5))
-extern  void * rexproc_signal_1(int *, CLIENT *);
-extern  void * rexproc_signal_1_svc(int *, struct svc_req *);
-extern int rexprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_rexstring(XDR *, rexstring*);
-extern  bool_t xdr_rex_start(XDR *, rex_start*);
-extern  bool_t xdr_rex_result(XDR *, rex_result*);
-extern  bool_t xdr_sgttyb(XDR *, sgttyb*);
-extern  bool_t xdr_tchars(XDR *, tchars*);
-extern  bool_t xdr_ltchars(XDR *, ltchars*);
-extern  bool_t xdr_rex_ttysize(XDR *, rex_ttysize*);
-extern  bool_t xdr_rex_ttymode(XDR *, rex_ttymode*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_REX_H_RPCGEN */
diff --git a/include.new/rpcsvc/rex.x b/include.new/rpcsvc/rex.x
deleted file mode 100644
index 61030f2..0000000
--- a/include.new/rpcsvc/rex.x
+++ /dev/null
@@ -1,237 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * Remote execution (rex) protocol specification
- */
-
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rex.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/rex.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-const STRINGSIZE = 1024;
-typedef string rexstring<1024>;
-
-/*
- * values to pass to REXPROC_SIGNAL
- */
-const SIGINT = 2;	/* interrupt */
-
-/*
- * Values for rst_flags, below 
- */
-const REX_INTERACTIVE = 1;	/* interactive mode */
-
-struct rex_start {
-	rexstring rst_cmd<>;	/* list of command and args */
-	rexstring rst_host;	/* working directory host name */
-	rexstring rst_fsname;	/* working directory file system name */
-	rexstring rst_dirwithin;/* working directory within file system */
-	rexstring rst_env<>;	/* list of environment */
-	unsigned int rst_port0;	/* port for stdin */
-	unsigned int rst_port1;	/* port for stdout */
-	unsigned int rst_port2;	/* port for stderr */
-	unsigned int rst_flags;	/* options - see const above */
-};
-
-struct rex_result {
-   	int rlt_stat;		/* integer status code */
-	rexstring rlt_message;	/* string message for human consumption */
-};
-
-
-struct sgttyb {
-	unsigned four;	/* always equals 4 */
-	opaque chars[4];
-	/* chars[0] == input speed */
-	/* chars[1] == output speed */
-	/* chars[2] == kill character */
-	/* chars[3] == erase character */
-	unsigned flags;
-};
-/* values for speeds above (baud rates)  */
-const B0  = 0;
-const B50 = 1;
-const B75 = 2;
-const B110 = 3;
-const B134 = 4;
-const B150 = 5;
-const B200 = 6;
-const B300 = 7;
-const B600 = 8;
-const B1200 = 9;
-const B1800 = 10;
-const B2400 = 11;
-const B4800 = 12;
-const B9600 = 13;
-const B19200 = 14;
-const B38400 = 15;
-
-/* values for flags above */
-const TANDEM = 0x00000001; /* send stopc on out q full */
-const CBREAK = 0x00000002; /* half-cooked mode */
-const LCASE = 0x00000004; /* simulate lower case */
-const ECHO = 0x00000008; /* echo input */
-const CRMOD = 0x00000010; /* map \r to \r\n on output */
-const RAW = 0x00000020; /* no i/o processing */
-const ODDP = 0x00000040; /* get/send odd parity */
-const EVENP = 0x00000080; /* get/send even parity */
-const ANYP = 0x000000c0; /* get any parity/send none */
-const NLDELAY = 0x00000300; /* \n delay */
-const  NL0 = 0x00000000;
-const  NL1 = 0x00000100; /* tty 37 */
-const  NL2 = 0x00000200; /* vt05 */
-const  NL3 = 0x00000300;
-const TBDELAY = 0x00000c00; /* horizontal tab delay */
-const  TAB0 = 0x00000000;
-const  TAB1 = 0x00000400; /* tty 37 */
-const  TAB2 = 0x00000800;
-const XTABS = 0x00000c00; /* expand tabs on output */
-const CRDELAY = 0x00003000; /* \r delay */
-const  CR0 = 0x00000000;
-const  CR1 = 0x00001000; /* tn 300 */
-const  CR2 = 0x00002000; /* tty 37 */
-const  CR3 = 0x00003000; /* concept 100 */
-const VTDELAY = 0x00004000; /* vertical tab delay */
-const  FF0 = 0x00000000;
-const  FF1 = 0x00004000; /* tty 37 */
-const BSDELAY = 0x00008000; /* \b delay */
-const  BS0 = 0x00000000;
-const  BS1 = 0x00008000;
-const CRTBS = 0x00010000; /* do backspacing for crt */
-const PRTERA = 0x00020000; /* \ ... / erase */
-const CRTERA = 0x00040000; /* " \b " to wipe out char */
-const TILDE = 0x00080000; /* hazeltine tilde kludge */
-const MDMBUF = 0x00100000; /* start/stop output on carrier intr */
-const LITOUT = 0x00200000; /* literal output */
-const TOSTOP = 0x00400000; /* SIGTTOU on background output */
-const FLUSHO = 0x00800000; /* flush output to terminal */
-const NOHANG = 0x01000000; /* no SIGHUP on carrier drop */
-const L001000 = 0x02000000;
-const CRTKIL = 0x04000000; /* kill line with " \b " */
-const PASS8 = 0x08000000;
-const CTLECH = 0x10000000; /* echo control chars as ^X */
-const PENDIN = 0x20000000; /* tp->t_rawq needs reread */
-const DECCTQ = 0x40000000; /* only ^Q starts after ^S */
-const NOFLSH = 0x80000000; /* no output flush on signal */
-
-struct tchars {
-	unsigned six;	/* always equals 6 */
-	opaque chars[6];
-	/* chars[0] == interrupt char */
-	/* chars[1] == quit char */
-	/* chars[2] == start output char */
-	/* chars[3] == stop output char */
-	/* chars[4] == end-of-file char */
-	/* chars[5] == input delimeter (like nl) */
-};
-
-struct ltchars {
-	unsigned six;	/* always equals 6 */
-	opaque chars[6];
-	/* chars[0] == stop process signal */
-	/* chars[1] == delayed stop process signal */
-	/* chars[2] == reprint line */
-	/* chars[3] == flush output */
-	/* chars[4] == word erase */
-	/* chars[5] == literal next character */
-	unsigned mode;
-};
-
-struct rex_ttysize {
-	int ts_lines;
-	int ts_cols;
-};
-
-struct rex_ttymode {
-    sgttyb basic;    /* standard unix tty flags */
-    tchars more; /* interrupt, kill characters, etc. */
-    ltchars yetmore; /* special Berkeley characters */
-    unsigned andmore;     /* and Berkeley modes */
-};
-
-/* values for andmore above */
-const LCRTBS = 0x0001;	/* do backspacing for crt */
-const LPRTERA = 0x0002;	/* \ ... / erase */
-const LCRTERA = 0x0004;	/* " \b " to wipe out char */
-const LTILDE = 0x0008;	/* hazeltine tilde kludge */
-const LMDMBUF = 0x0010;	/* start/stop output on carrier intr */
-const LLITOUT = 0x0020;	/* literal output */
-const LTOSTOP = 0x0040;	/* SIGTTOU on background output */
-const LFLUSHO = 0x0080;	/* flush output to terminal */
-const LNOHANG = 0x0100;	/* no SIGHUP on carrier drop */
-const LL001000 = 0x0200;
-const LCRTKIL = 0x0400;	/* kill line with " \b " */
-const LPASS8 = 0x0800;
-const LCTLECH = 0x1000;	/* echo control chars as ^X */
-const LPENDIN = 0x2000;	/* needs reread */
-const LDECCTQ = 0x4000;	/* only ^Q starts after ^S */
-const LNOFLSH = 0x8000;	/* no output flush on signal */
-
-program REXPROG {
-	version REXVERS {
-
-		/*
-		 * Start remote execution
-		 */
-		rex_result 
-		REXPROC_START(rex_start) = 1;
-
-		/*
-		 * Wait for remote execution to terminate
-		 */
-		rex_result
-		REXPROC_WAIT(void) = 2;
-
-		/*
-		 * Send tty modes
-		 */
-		void
-		REXPROC_MODES(rex_ttymode) = 3;
-
-		/*
-		 * Send window size change
-		 */
-		void
-		REXPROC_WINCH(rex_ttysize) = 4;
-
-		/*
-		 * Send other signal
-		 */
-		void
-		REXPROC_SIGNAL(int) = 5;
-	} = 1;
-} = 100017;
diff --git a/include.new/rpcsvc/rnusers.h b/include.new/rpcsvc/rnusers.h
deleted file mode 100644
index 40b76a3..0000000
--- a/include.new/rpcsvc/rnusers.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RNUSERS_H_RPCGEN
-#define	_RNUSERS_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	MAXUSERS 100
-#define	MAXUTLEN 256
-
-struct utmp {
-	char *ut_line;
-	char *ut_name;
-	char *ut_host;
-	int ut_time;
-};
-typedef struct utmp utmp;
-
-struct utmpidle {
-	utmp ui_utmp;
-	u_int ui_idle;
-};
-typedef struct utmpidle utmpidle;
-
-typedef struct {
-	u_int utmparr_len;
-	utmp *utmparr_val;
-} utmparr;
-
-typedef struct {
-	u_int utmpidlearr_len;
-	utmpidle *utmpidlearr_val;
-} utmpidlearr;
-#define	RUSERS_MAXUSERLEN 32
-#define	RUSERS_MAXLINELEN 32
-#define	RUSERS_MAXHOSTLEN 257
-
-struct rusers_utmp {
-	char *ut_user;
-	char *ut_line;
-	char *ut_host;
-	int ut_type;
-	int ut_time;
-	u_int ut_idle;
-};
-typedef struct rusers_utmp rusers_utmp;
-
-typedef struct {
-	u_int utmp_array_len;
-	rusers_utmp *utmp_array_val;
-} utmp_array;
-
-#define	RUSERSPROG ((unsigned long)(100002))
-#define	RUSERSVERS_ORIG ((unsigned long)(1))
-
-extern  void rusersprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	RUSERSPROC_NUM ((unsigned long)(1))
-extern  int * rusersproc_num_1(void *, CLIENT *);
-extern  int * rusersproc_num_1_svc(void *, struct svc_req *);
-#define	RUSERSPROC_NAMES ((unsigned long)(2))
-extern  utmparr * rusersproc_names_1(void *, CLIENT *);
-extern  utmparr * rusersproc_names_1_svc(void *, struct svc_req *);
-#define	RUSERSPROC_ALLNAMES ((unsigned long)(3))
-extern  utmparr * rusersproc_allnames_1(void *, CLIENT *);
-extern  utmparr * rusersproc_allnames_1_svc(void *, struct svc_req *);
-extern int rusersprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	RUSERSVERS_IDLE ((unsigned long)(2))
-
-extern  void rusersprog_2(struct svc_req *rqstp, SVCXPRT *transp);
-extern  int * rusersproc_num_2(void *, CLIENT *);
-extern  int * rusersproc_num_2_svc(void *, struct svc_req *);
-extern  utmpidlearr * rusersproc_names_2(void *, CLIENT *);
-extern  utmpidlearr * rusersproc_names_2_svc(void *, struct svc_req *);
-extern  utmpidlearr * rusersproc_allnames_2(void *, CLIENT *);
-extern  utmpidlearr * rusersproc_allnames_2_svc(void *, struct svc_req *);
-extern int rusersprog_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	RUSERSVERS_3 ((unsigned long)(3))
-
-extern  void rusersprog_3(struct svc_req *rqstp, SVCXPRT *transp);
-extern  int * rusersproc_num_3(void *, CLIENT *);
-extern  int * rusersproc_num_3_svc(void *, struct svc_req *);
-extern  utmp_array * rusersproc_names_3(void *, CLIENT *);
-extern  utmp_array * rusersproc_names_3_svc(void *, struct svc_req *);
-extern  utmp_array * rusersproc_allnames_3(void *, CLIENT *);
-extern  utmp_array * rusersproc_allnames_3_svc(void *, struct svc_req *);
-extern int rusersprog_3_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_utmp(XDR *, utmp*);
-extern  bool_t xdr_utmpidle(XDR *, utmpidle*);
-extern  bool_t xdr_utmparr(XDR *, utmparr*);
-extern  bool_t xdr_utmpidlearr(XDR *, utmpidlearr*);
-extern  bool_t xdr_rusers_utmp(XDR *, rusers_utmp*);
-extern  bool_t xdr_utmp_array(XDR *, utmp_array*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RNUSERS_H_RPCGEN */
diff --git a/include.new/rpcsvc/rnusers.x b/include.new/rpcsvc/rnusers.x
deleted file mode 100644
index 95a4eb0..0000000
--- a/include.new/rpcsvc/rnusers.x
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * Find out about remote users
- */
-
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rnusers.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/rnusers.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-const MAXUSERS = 100;
-const MAXUTLEN = 256;
-
-struct utmp {
-	string ut_line<MAXUTLEN>;
-	string ut_name<MAXUTLEN>;
-	string ut_host<MAXUTLEN>;
-	int ut_time;
-};
-
-
-struct utmpidle {
-	utmp ui_utmp;
-	unsigned int ui_idle;
-};
-
-typedef utmp utmparr<MAXUSERS>;
-
-typedef utmpidle utmpidlearr<MAXUSERS>;
-
-const RUSERS_MAXUSERLEN = 32;
-const RUSERS_MAXLINELEN = 32;
-const RUSERS_MAXHOSTLEN = 257;
-
-struct rusers_utmp {
-	string ut_user<RUSERS_MAXUSERLEN>;	/* aka ut_name */
-	string ut_line<RUSERS_MAXLINELEN>;	/* device */
-	string ut_host<RUSERS_MAXHOSTLEN>;	/* host user logged on from */
-	int ut_type;				/* type of entry */
-	int ut_time;				/* time entry was made */
-	unsigned int ut_idle;			/* minutes idle */
-};
-
-typedef rusers_utmp utmp_array<>;
-
-program RUSERSPROG {
-	/*
-	 * Old version does not include idle information
-	 */
-	version RUSERSVERS_ORIG {
-		int
-		RUSERSPROC_NUM(void) = 1;
-
-		utmparr
-		RUSERSPROC_NAMES(void) = 2;
-
-		utmparr
-		RUSERSPROC_ALLNAMES(void) = 3;
-	} = 1;
-
-	/*
-	 * Includes idle information
-	 */
-	version RUSERSVERS_IDLE {
-		int
-		RUSERSPROC_NUM(void) = 1;
-
-		utmpidlearr
-		RUSERSPROC_NAMES(void) = 2;
-
-		utmpidlearr
-		RUSERSPROC_ALLNAMES(void) = 3;
-	} = 2;
-
-	/*
-	 * Version 3 rusers procedures (from Solaris).
-	 * (Thanks a lot Sun.)
-	 */
-	version RUSERSVERS_3 {
-		int
-		RUSERSPROC_NUM(void) = 1;
-
-		utmp_array
-		RUSERSPROC_NAMES(void) = 2;
-
-		utmp_array
-		RUSERSPROC_ALLNAMES(void) = 3;
-	} = 3;
-
-} = 100002;
-
diff --git a/include.new/rpcsvc/rquota.h b/include.new/rpcsvc/rquota.h
deleted file mode 100644
index d751f58..0000000
--- a/include.new/rpcsvc/rquota.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RQUOTA_H_RPCGEN
-#define	_RQUOTA_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	RQ_PATHLEN 1024
-
-struct getquota_args {
-	char *gqa_pathp;
-	int gqa_uid;
-};
-typedef struct getquota_args getquota_args;
-
-struct rquota {
-	int rq_bsize;
-	bool_t rq_active;
-	u_int rq_bhardlimit;
-	u_int rq_bsoftlimit;
-	u_int rq_curblocks;
-	u_int rq_fhardlimit;
-	u_int rq_fsoftlimit;
-	u_int rq_curfiles;
-	u_int rq_btimeleft;
-	u_int rq_ftimeleft;
-};
-typedef struct rquota rquota;
-
-enum gqr_status {
-	Q_OK = 1,
-	Q_NOQUOTA = 2,
-	Q_EPERM = 3
-};
-typedef enum gqr_status gqr_status;
-
-struct getquota_rslt {
-	gqr_status status;
-	union {
-		rquota gqr_rquota;
-	} getquota_rslt_u;
-};
-typedef struct getquota_rslt getquota_rslt;
-
-#define	RQUOTAPROG ((unsigned long)(100011))
-#define	RQUOTAVERS ((unsigned long)(1))
-
-extern  void rquotaprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	RQUOTAPROC_GETQUOTA ((unsigned long)(1))
-extern  getquota_rslt * rquotaproc_getquota_1(getquota_args *, CLIENT *);
-extern  getquota_rslt * rquotaproc_getquota_1_svc(getquota_args *, struct svc_req *);
-#define	RQUOTAPROC_GETACTIVEQUOTA ((unsigned long)(2))
-extern  getquota_rslt * rquotaproc_getactivequota_1(getquota_args *, CLIENT *);
-extern  getquota_rslt * rquotaproc_getactivequota_1_svc(getquota_args *, struct svc_req *);
-extern int rquotaprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_getquota_args(XDR *, getquota_args*);
-extern  bool_t xdr_rquota(XDR *, rquota*);
-extern  bool_t xdr_gqr_status(XDR *, gqr_status*);
-extern  bool_t xdr_getquota_rslt(XDR *, getquota_rslt*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RQUOTA_H_RPCGEN */
diff --git a/include.new/rpcsvc/rquota.x b/include.new/rpcsvc/rquota.x
deleted file mode 100644
index fceee6c..0000000
--- a/include.new/rpcsvc/rquota.x
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Remote quota protocol
- * Requires unix authentication
- */
-
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rquota.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/rquota.x 114629 2003-05-04 02:51:42Z obrien $");
-#endif
-
-const RQ_PATHLEN = 1024;
-
-struct getquota_args {
-	string gqa_pathp<RQ_PATHLEN>;  	/* path to filesystem of interest */
-	int gqa_uid;	        	/* inquire about quota for uid */
-};
-
-/*
- * remote quota structure
- */
-struct rquota {
-	int rq_bsize;			/* block size for block counts */
-	bool rq_active;  		/* indicates whether quota is active */
-	unsigned int rq_bhardlimit;	/* absolute limit on disk blks alloc */
-	unsigned int rq_bsoftlimit;	/* preferred limit on disk blks */
-	unsigned int rq_curblocks;	/* current block count */
-	unsigned int rq_fhardlimit;	/* absolute limit on allocated files */
-	unsigned int rq_fsoftlimit;	/* preferred file limit */
-	unsigned int rq_curfiles;	/* current # allocated files */
-	unsigned int rq_btimeleft;	/* time left for excessive disk use */
-	unsigned int rq_ftimeleft;	/* time left for excessive files */
-};	
-
-enum gqr_status {
-	Q_OK = 1,		/* quota returned */
-	Q_NOQUOTA = 2,  	/* noquota for uid */
-	Q_EPERM = 3		/* no permission to access quota */
-};
-
-union getquota_rslt switch (gqr_status status) {
-case Q_OK:
-	rquota gqr_rquota;	/* valid if status == Q_OK */
-case Q_NOQUOTA:
-	void;
-case Q_EPERM:
-	void;
-};
-
-program RQUOTAPROG {
-	version RQUOTAVERS {
-		/*
-		 * Get all quotas
-		 */
-		getquota_rslt
-		RQUOTAPROC_GETQUOTA(getquota_args) = 1;
-
-		/*
-	 	 * Get active quotas only
-		 */
-		getquota_rslt
-		RQUOTAPROC_GETACTIVEQUOTA(getquota_args) = 2;
-	} = 1;
-} = 100011;
diff --git a/include.new/rpcsvc/rstat.h b/include.new/rpcsvc/rstat.h
deleted file mode 100644
index b4cf7b4..0000000
--- a/include.new/rpcsvc/rstat.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RSTAT_H_RPCGEN
-#define	_RSTAT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef FSCALE
-/*
- * Scale factor for scaled integers used to count load averages.
- */
-#define FSHIFT 8 /* bits to right of fixed binary point */
-#define FSCALE (1<<FSHIFT)
-
-#endif /* ndef FSCALE */
-#define	RSTAT_CPUSTATES 4
-#define	RSTAT_DK_NDRIVE 4
-
-struct rstat_timeval {
-	u_int tv_sec;
-	u_int tv_usec;
-};
-typedef struct rstat_timeval rstat_timeval;
-
-struct statstime {
-	int cp_time[RSTAT_CPUSTATES];
-	int dk_xfer[RSTAT_DK_NDRIVE];
-	u_int v_pgpgin;
-	u_int v_pgpgout;
-	u_int v_pswpin;
-	u_int v_pswpout;
-	u_int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	u_int v_swtch;
-	int avenrun[3];
-	rstat_timeval boottime;
-	rstat_timeval curtime;
-	int if_opackets;
-};
-typedef struct statstime statstime;
-
-struct statsswtch {
-	int cp_time[RSTAT_CPUSTATES];
-	int dk_xfer[RSTAT_DK_NDRIVE];
-	u_int v_pgpgin;
-	u_int v_pgpgout;
-	u_int v_pswpin;
-	u_int v_pswpout;
-	u_int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	u_int v_swtch;
-	u_int avenrun[3];
-	rstat_timeval boottime;
-	int if_opackets;
-};
-typedef struct statsswtch statsswtch;
-
-struct stats {
-	int cp_time[RSTAT_CPUSTATES];
-	int dk_xfer[RSTAT_DK_NDRIVE];
-	u_int v_pgpgin;
-	u_int v_pgpgout;
-	u_int v_pswpin;
-	u_int v_pswpout;
-	u_int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	int if_opackets;
-};
-typedef struct stats stats;
-
-enum clnt_stat rstat(char *, struct statstime *);
-int havedisk(char *);
-
-
-#define	RSTATPROG ((unsigned long)(100001))
-#define	RSTATVERS_TIME ((unsigned long)(3))
-
-extern  void rstatprog_3(struct svc_req *rqstp, SVCXPRT *transp);
-#define	RSTATPROC_STATS ((unsigned long)(1))
-extern  statstime * rstatproc_stats_3(void *, CLIENT *);
-extern  statstime * rstatproc_stats_3_svc(void *, struct svc_req *);
-#define	RSTATPROC_HAVEDISK ((unsigned long)(2))
-extern  u_int * rstatproc_havedisk_3(void *, CLIENT *);
-extern  u_int * rstatproc_havedisk_3_svc(void *, struct svc_req *);
-extern int rstatprog_3_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	RSTATVERS_SWTCH ((unsigned long)(2))
-
-extern  void rstatprog_2(struct svc_req *rqstp, SVCXPRT *transp);
-extern  statsswtch * rstatproc_stats_2(void *, CLIENT *);
-extern  statsswtch * rstatproc_stats_2_svc(void *, struct svc_req *);
-extern  u_int * rstatproc_havedisk_2(void *, CLIENT *);
-extern  u_int * rstatproc_havedisk_2_svc(void *, struct svc_req *);
-extern int rstatprog_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	RSTATVERS_ORIG ((unsigned long)(1))
-
-extern  void rstatprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-extern  stats * rstatproc_stats_1(void *, CLIENT *);
-extern  stats * rstatproc_stats_1_svc(void *, struct svc_req *);
-extern  u_int * rstatproc_havedisk_1(void *, CLIENT *);
-extern  u_int * rstatproc_havedisk_1_svc(void *, struct svc_req *);
-extern int rstatprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_rstat_timeval(XDR *, rstat_timeval*);
-extern  bool_t xdr_statstime(XDR *, statstime*);
-extern  bool_t xdr_statsswtch(XDR *, statsswtch*);
-extern  bool_t xdr_stats(XDR *, stats*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RSTAT_H_RPCGEN */
diff --git a/include.new/rpcsvc/rstat.x b/include.new/rpcsvc/rstat.x
deleted file mode 100644
index 68a7f95..0000000
--- a/include.new/rpcsvc/rstat.x
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * Gather statistics on remote machines
- */
-
-#ifdef RPC_HDR
-
-%#ifndef FSCALE
-%/*
-% * Scale factor for scaled integers used to count load averages.
-% */
-%#define FSHIFT  8               /* bits to right of fixed binary point */
-%#define FSCALE  (1<<FSHIFT)
-%
-%#endif /* ndef FSCALE */
-
-#else
-
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rstat.x	2.2 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/rstat.x 272850 2014-10-09 23:05:32Z hrs $");
-
-#endif /* def RPC_HDR */
-
-const RSTAT_CPUSTATES = 4;
-const RSTAT_DK_NDRIVE = 4;
-
-/*
- * GMT since 0:00, January 1, 1970
- */
-struct rstat_timeval {
-	unsigned int tv_sec;	/* seconds */
-	unsigned int tv_usec;	/* and microseconds */
-};
-
-struct statstime {				/* RSTATVERS_TIME */
-	int cp_time[RSTAT_CPUSTATES];
-	int dk_xfer[RSTAT_DK_NDRIVE];
-	unsigned int v_pgpgin;	/* these are cumulative sum */
-	unsigned int v_pgpgout;
-	unsigned int v_pswpin;
-	unsigned int v_pswpout;
-	unsigned int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	unsigned int v_swtch;
-	int avenrun[3];         /* scaled by FSCALE */
-	rstat_timeval boottime;
-	rstat_timeval curtime;
-	int if_opackets;
-};
-
-struct statsswtch {			/* RSTATVERS_SWTCH */
-	int cp_time[RSTAT_CPUSTATES];
-	int dk_xfer[RSTAT_DK_NDRIVE];
-	unsigned int v_pgpgin;	/* these are cumulative sum */
-	unsigned int v_pgpgout;
-	unsigned int v_pswpin;
-	unsigned int v_pswpout;
-	unsigned int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	unsigned int v_swtch;
-	unsigned int avenrun[3];/* scaled by FSCALE */
-	rstat_timeval boottime;
-	int if_opackets;
-};
-
-struct stats {				/* RSTATVERS_ORIG */
-	int cp_time[RSTAT_CPUSTATES];
-	int dk_xfer[RSTAT_DK_NDRIVE];
-	unsigned int v_pgpgin;	/* these are cumulative sum */
-	unsigned int v_pgpgout;
-	unsigned int v_pswpin;
-	unsigned int v_pswpout;
-	unsigned int v_intr;
-	int if_ipackets;
-	int if_ierrors;
-	int if_oerrors;
-	int if_collisions;
-	int if_opackets;
-};
-
-
-program RSTATPROG {
-	/*
-	 * Newest version includes current time and context switching info
-	 */
-	version RSTATVERS_TIME {
-		statstime
-		RSTATPROC_STATS(void) = 1;
-
-		unsigned int
-		RSTATPROC_HAVEDISK(void) = 2;
-	} = 3;
-	/*
-	 * Does not have current time
-	 */
-	version RSTATVERS_SWTCH {
-		statsswtch
-		RSTATPROC_STATS(void) = 1;
-
-		unsigned int
-		RSTATPROC_HAVEDISK(void) = 2;
-	} = 2;
-	/*
-	 * Old version has no info about current time or context switching
-	 */
-	version RSTATVERS_ORIG {
-		stats
-		RSTATPROC_STATS(void) = 1;
-
-		unsigned int
-		RSTATPROC_HAVEDISK(void) = 2;
-	} = 1;
-} = 100001;
-
-#ifdef RPC_HDR
-%
-%enum clnt_stat rstat(char *, struct statstime *);
-%int havedisk(char *);
-%
-#endif
diff --git a/include.new/rpcsvc/rwall.h b/include.new/rpcsvc/rwall.h
deleted file mode 100644
index bf808a3..0000000
--- a/include.new/rpcsvc/rwall.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _RWALL_H_RPCGEN
-#define	_RWALL_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1984, 1990 by Sun Microsystems, Inc.
- */
-
-/* from @(#)rwall.x	1.6 91/03/11 TIRPC 1.0 */
-
-#ifndef _rpcsvc_rwall_h
-#define _rpcsvc_rwall_h
-
-typedef char *wrapstring;
-
-
-#endif /* ! _rpcsvc_rwall_h */
-
-#define	WALLPROG ((unsigned long)(100008))
-#define	WALLVERS ((unsigned long)(1))
-
-extern  void wallprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	WALLPROC_WALL ((unsigned long)(2))
-extern  void * wallproc_wall_1(wrapstring *, CLIENT *);
-extern  void * wallproc_wall_1_svc(wrapstring *, struct svc_req *);
-extern int wallprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_RWALL_H_RPCGEN */
diff --git a/include.new/rpcsvc/rwall.x b/include.new/rpcsvc/rwall.x
deleted file mode 100644
index 6c26c1f..0000000
--- a/include.new/rpcsvc/rwall.x
+++ /dev/null
@@ -1,57 +0,0 @@
-%/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part.  Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user or with the express written consent of
-% * Sun Microsystems, Inc.
-% *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-% *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
-% *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
-% *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California  94043
-% */
-
-%/*
-% * Copyright (c) 1984, 1990 by Sun Microsystems, Inc.
-% */
-%
-%/* from @(#)rwall.x	1.6 91/03/11 TIRPC 1.0 */
-
-#ifdef RPC_HDR
-%
-%#ifndef _rpcsvc_rwall_h
-%#define _rpcsvc_rwall_h
-%
-%typedef char *wrapstring;
-%
-#endif
-
-program WALLPROG {
-	version WALLVERS {
-		void	
-		WALLPROC_WALL(wrapstring) = 2;
-
-	} = 1;
-} = 100008;
-
-#ifdef RPC_HDR
-%
-%#endif /* ! _rpcsvc_rwall_h */
-#endif
diff --git a/include.new/rpcsvc/sm_inter.h b/include.new/rpcsvc/sm_inter.h
deleted file mode 100644
index b7612a0..0000000
--- a/include.new/rpcsvc/sm_inter.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _SM_INTER_H_RPCGEN
-#define	_SM_INTER_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	SM_MAXSTRLEN 1024
-
-struct sm_name {
-	char *mon_name;
-};
-typedef struct sm_name sm_name;
-
-struct my_id {
-	char *my_name;
-	int my_prog;
-	int my_vers;
-	int my_proc;
-};
-typedef struct my_id my_id;
-
-struct mon_id {
-	char *mon_name;
-	struct my_id my_id;
-};
-typedef struct mon_id mon_id;
-
-struct mon {
-	struct mon_id mon_id;
-	char priv[16];
-};
-typedef struct mon mon;
-
-struct stat_chge {
-	char *mon_name;
-	int state;
-};
-typedef struct stat_chge stat_chge;
-
-struct sm_stat {
-	int state;
-};
-typedef struct sm_stat sm_stat;
-
-enum sm_res {
-	stat_succ = 0,
-	stat_fail = 1
-};
-typedef enum sm_res sm_res;
-
-struct sm_stat_res {
-	sm_res res_stat;
-	int state;
-};
-typedef struct sm_stat_res sm_stat_res;
-
-struct sm_status {
-	char *mon_name;
-	int state;
-	char priv[16];
-};
-typedef struct sm_status sm_status;
-
-#define	SM_PROG ((unsigned long)(100024))
-#define	SM_VERS ((unsigned long)(1))
-
-extern  void sm_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	SM_STAT ((unsigned long)(1))
-extern  struct sm_stat_res * sm_stat_1(struct sm_name *, CLIENT *);
-extern  struct sm_stat_res * sm_stat_1_svc(struct sm_name *, struct svc_req *);
-#define	SM_MON ((unsigned long)(2))
-extern  struct sm_stat_res * sm_mon_1(struct mon *, CLIENT *);
-extern  struct sm_stat_res * sm_mon_1_svc(struct mon *, struct svc_req *);
-#define	SM_UNMON ((unsigned long)(3))
-extern  struct sm_stat * sm_unmon_1(struct mon_id *, CLIENT *);
-extern  struct sm_stat * sm_unmon_1_svc(struct mon_id *, struct svc_req *);
-#define	SM_UNMON_ALL ((unsigned long)(4))
-extern  struct sm_stat * sm_unmon_all_1(struct my_id *, CLIENT *);
-extern  struct sm_stat * sm_unmon_all_1_svc(struct my_id *, struct svc_req *);
-#define	SM_SIMU_CRASH ((unsigned long)(5))
-extern  void * sm_simu_crash_1(void *, CLIENT *);
-extern  void * sm_simu_crash_1_svc(void *, struct svc_req *);
-#define	SM_NOTIFY ((unsigned long)(6))
-extern  void * sm_notify_1(struct stat_chge *, CLIENT *);
-extern  void * sm_notify_1_svc(struct stat_chge *, struct svc_req *);
-extern int sm_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_sm_name(XDR *, sm_name*);
-extern  bool_t xdr_my_id(XDR *, my_id*);
-extern  bool_t xdr_mon_id(XDR *, mon_id*);
-extern  bool_t xdr_mon(XDR *, mon*);
-extern  bool_t xdr_stat_chge(XDR *, stat_chge*);
-extern  bool_t xdr_sm_stat(XDR *, sm_stat*);
-extern  bool_t xdr_sm_res(XDR *, sm_res*);
-extern  bool_t xdr_sm_stat_res(XDR *, sm_stat_res*);
-extern  bool_t xdr_sm_status(XDR *, sm_status*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_SM_INTER_H_RPCGEN */
diff --git a/include.new/rpcsvc/sm_inter.x b/include.new/rpcsvc/sm_inter.x
deleted file mode 100644
index ea6e52e..0000000
--- a/include.new/rpcsvc/sm_inter.x
+++ /dev/null
@@ -1,127 +0,0 @@
-/* @(#)sm_inter.x	2.2 88/08/01 4.0 RPCSRC */
-/* @(#)sm_inter.x 1.7 87/06/24 Copyr 1987 Sun Micro */
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * Status monitor protocol specification
- * Copyright (C) 1986 Sun Microsystems, Inc.
- *
- */
-
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/sm_inter.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-program SM_PROG { 
-	version SM_VERS  {
-		/* res_stat = stat_succ if status monitor agrees to monitor */
-		/* res_stat = stat_fail if status monitor cannot monitor */
-		/* if res_stat == stat_succ, state = state number of site sm_name */
-		struct sm_stat_res			 SM_STAT(struct sm_name) = 1;
-
-		/* res_stat = stat_succ if status monitor agrees to monitor */
-		/* res_stat = stat_fail if status monitor cannot monitor */
-		/* stat consists of state number of local site */
-		struct sm_stat_res			 SM_MON(struct mon) = 2;
-
-		/* stat consists of state number of local site */
-		struct sm_stat				 SM_UNMON(struct mon_id) = 3;
-
-		/* stat consists of state number of local site */
-		struct sm_stat				 SM_UNMON_ALL(struct my_id) = 4;
-
-		void					 SM_SIMU_CRASH(void) = 5;
-		void					 SM_NOTIFY(struct stat_chge) = 6;
-
-	} = 1;
-} = 100024;
-
-const	SM_MAXSTRLEN = 1024;
-
-struct sm_name {
-	string mon_name<SM_MAXSTRLEN>;
-};
-
-struct my_id {
-	string	 my_name<SM_MAXSTRLEN>;		/* name of the site iniates the monitoring request*/
-	int	my_prog;			/* rpc program # of the requesting process */
-	int	my_vers;			/* rpc version # of the requesting process */
-	int	my_proc;			/* rpc procedure # of the requesting process */
-};
-
-struct mon_id {
-	string	mon_name<SM_MAXSTRLEN>;		/* name of the site to be monitored */
-	struct my_id my_id;
-};
-
-
-struct mon{
-	struct mon_id mon_id;
-	opaque priv[16]; 		/* private information to store at monitor for requesting process */
-};
-
-struct stat_chge {
-	string  mon_name<SM_MAXSTRLEN>;         /* name of the site that had the state change */
-	int state;
-};
-
-/*
- * state # of status monitor monitonically increases each time
- * status of the site changes:
- * an even number (>= 0) indicates the site is down and
- * an odd number (> 0) indicates the site is up;
- */
-struct sm_stat {
-	int state;		/* state # of status monitor */
-};
-
-enum sm_res {
-	stat_succ = 0,		/* status monitor agrees to monitor */
-	stat_fail = 1		/* status monitor cannot monitor */
-};
-
-struct sm_stat_res {
-	sm_res res_stat;
-	int state;
-};
-
-/* 
- * structure of the status message sent back by the status monitor
- * when monitor site status changes
- */
-struct sm_status {
-	string mon_name<SM_MAXSTRLEN>;
-	int state;
-	opaque priv[16];		/* stored private information */
-};
diff --git a/include.new/rpcsvc/spray.h b/include.new/rpcsvc/spray.h
deleted file mode 100644
index 6bf8d41..0000000
--- a/include.new/rpcsvc/spray.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _SPRAY_H_RPCGEN
-#define	_SPRAY_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	SPRAYMAX 8845
-
-struct spraytimeval {
-	u_int sec;
-	u_int usec;
-};
-typedef struct spraytimeval spraytimeval;
-
-struct spraycumul {
-	u_int counter;
-	spraytimeval clock;
-};
-typedef struct spraycumul spraycumul;
-
-typedef struct {
-	u_int sprayarr_len;
-	char *sprayarr_val;
-} sprayarr;
-
-#define	SPRAYPROG ((unsigned long)(100012))
-#define	SPRAYVERS ((unsigned long)(1))
-
-extern  void sprayprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	SPRAYPROC_SPRAY ((unsigned long)(1))
-extern  void * sprayproc_spray_1(sprayarr *, CLIENT *);
-extern  void * sprayproc_spray_1_svc(sprayarr *, struct svc_req *);
-#define	SPRAYPROC_GET ((unsigned long)(2))
-extern  spraycumul * sprayproc_get_1(void *, CLIENT *);
-extern  spraycumul * sprayproc_get_1_svc(void *, struct svc_req *);
-#define	SPRAYPROC_CLEAR ((unsigned long)(3))
-extern  void * sprayproc_clear_1(void *, CLIENT *);
-extern  void * sprayproc_clear_1_svc(void *, struct svc_req *);
-extern int sprayprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_spraytimeval(XDR *, spraytimeval*);
-extern  bool_t xdr_spraycumul(XDR *, spraycumul*);
-extern  bool_t xdr_sprayarr(XDR *, sprayarr*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_SPRAY_H_RPCGEN */
diff --git a/include.new/rpcsvc/spray.x b/include.new/rpcsvc/spray.x
deleted file mode 100644
index b4c4c22..0000000
--- a/include.new/rpcsvc/spray.x
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * Spray a server with packets
- * Useful for testing flakiness of network interfaces
- */
-
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)spray.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/spray.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-const SPRAYMAX = 8845;	/* max amount can spray */
-
-/*
- * GMT since 0:00, 1 January 1970
- */
-struct spraytimeval {
-	unsigned int sec;
-	unsigned int usec;
-};
-
-/*
- * spray statistics
- */
-struct spraycumul {
-	unsigned int counter;
-	spraytimeval clock;
-};
-
-/*
- * spray data
- */
-typedef opaque sprayarr<SPRAYMAX>;
-
-program SPRAYPROG {
-	version SPRAYVERS {
-		/*
-		 * Just throw away the data and increment the counter
-		 * This call never returns, so the client should always 
-		 * time it out.
-		 */
-		void
-		SPRAYPROC_SPRAY(sprayarr) = 1;
-
-		/*
-		 * Get the value of the counter and elapsed time  since
-		 * last CLEAR.
-		 */
-		spraycumul	
-		SPRAYPROC_GET(void) = 2;
-
-		/*
-		 * Clear the counter and reset the elapsed time
-		 */
-		void
-		SPRAYPROC_CLEAR(void) = 3;
-	} = 1;
-} = 100012;
diff --git a/include.new/rpcsvc/yp.h b/include.new/rpcsvc/yp.h
deleted file mode 100644
index 2ab4f0c..0000000
--- a/include.new/rpcsvc/yp.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _YP_H_RPCGEN
-#define	_YP_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	YPMAXRECORD 1024
-#define	YPMAXDOMAIN 64
-#define	YPMAXMAP 64
-#define	YPMAXPEER 64
-
-enum ypstat {
-	YP_TRUE = 1,
-	YP_NOMORE = 2,
-	YP_FALSE = 0,
-	YP_NOMAP = -1,
-	YP_NODOM = -2,
-	YP_NOKEY = -3,
-	YP_BADOP = -4,
-	YP_BADDB = -5,
-	YP_YPERR = -6,
-	YP_BADARGS = -7,
-	YP_VERS = -8
-};
-typedef enum ypstat ypstat;
-
-enum ypxfrstat {
-	YPXFR_SUCC = 1,
-	YPXFR_AGE = 2,
-	YPXFR_NOMAP = -1,
-	YPXFR_NODOM = -2,
-	YPXFR_RSRC = -3,
-	YPXFR_RPC = -4,
-	YPXFR_MADDR = -5,
-	YPXFR_YPERR = -6,
-	YPXFR_BADARGS = -7,
-	YPXFR_DBM = -8,
-	YPXFR_FILE = -9,
-	YPXFR_SKEW = -10,
-	YPXFR_CLEAR = -11,
-	YPXFR_FORCE = -12,
-	YPXFR_XFRERR = -13,
-	YPXFR_REFUSED = -14
-};
-typedef enum ypxfrstat ypxfrstat;
-
-typedef char *domainname;
-
-typedef char *mapname;
-
-typedef char *peername;
-
-typedef struct {
-	u_int keydat_len;
-	char *keydat_val;
-} keydat;
-
-typedef struct {
-	u_int valdat_len;
-	char *valdat_val;
-} valdat;
-
-struct ypmap_parms {
-	domainname domain;
-	mapname map;
-	u_int ordernum;
-	peername peer;
-};
-typedef struct ypmap_parms ypmap_parms;
-
-struct ypreq_key {
-	domainname domain;
-	mapname map;
-	keydat key;
-};
-typedef struct ypreq_key ypreq_key;
-
-struct ypreq_nokey {
-	domainname domain;
-	mapname map;
-};
-typedef struct ypreq_nokey ypreq_nokey;
-
-struct ypreq_xfr {
-	ypmap_parms map_parms;
-	u_int transid;
-	u_int prog;
-	u_int port;
-};
-typedef struct ypreq_xfr ypreq_xfr;
-
-struct ypresp_val {
-	ypstat stat;
-	valdat val;
-};
-typedef struct ypresp_val ypresp_val;
-
-struct ypresp_key_val {
-	ypstat stat;
-	valdat val;
-	keydat key;
-};
-typedef struct ypresp_key_val ypresp_key_val;
-
-struct ypresp_master {
-	ypstat stat;
-	peername peer;
-};
-typedef struct ypresp_master ypresp_master;
-
-struct ypresp_order {
-	ypstat stat;
-	u_int ordernum;
-};
-typedef struct ypresp_order ypresp_order;
-
-struct ypresp_all {
-	bool_t more;
-	union {
-		ypresp_key_val val;
-	} ypresp_all_u;
-};
-typedef struct ypresp_all ypresp_all;
-
-struct ypresp_xfr {
-	u_int transid;
-	ypxfrstat xfrstat;
-};
-typedef struct ypresp_xfr ypresp_xfr;
-
-struct ypmaplist {
-	mapname map;
-	struct ypmaplist *next;
-};
-typedef struct ypmaplist ypmaplist;
-
-struct ypresp_maplist {
-	ypstat stat;
-	ypmaplist *maps;
-};
-typedef struct ypresp_maplist ypresp_maplist;
-
-enum yppush_status {
-	YPPUSH_SUCC = 1,
-	YPPUSH_AGE = 2,
-	YPPUSH_NOMAP = -1,
-	YPPUSH_NODOM = -2,
-	YPPUSH_RSRC = -3,
-	YPPUSH_RPC = -4,
-	YPPUSH_MADDR = -5,
-	YPPUSH_YPERR = -6,
-	YPPUSH_BADARGS = -7,
-	YPPUSH_DBM = -8,
-	YPPUSH_FILE = -9,
-	YPPUSH_SKEW = -10,
-	YPPUSH_CLEAR = -11,
-	YPPUSH_FORCE = -12,
-	YPPUSH_XFRERR = -13,
-	YPPUSH_REFUSED = -14
-};
-typedef enum yppush_status yppush_status;
-
-struct yppushresp_xfr {
-	u_int transid;
-	yppush_status status;
-};
-typedef struct yppushresp_xfr yppushresp_xfr;
-
-enum ypbind_resptype {
-	YPBIND_SUCC_VAL = 1,
-	YPBIND_FAIL_VAL = 2
-};
-typedef enum ypbind_resptype ypbind_resptype;
-
-struct ypbind_binding {
-	char ypbind_binding_addr[4];
-	char ypbind_binding_port[2];
-};
-typedef struct ypbind_binding ypbind_binding;
-
-struct ypbind_resp {
-	ypbind_resptype ypbind_status;
-	union {
-		u_int ypbind_error;
-		ypbind_binding ypbind_bindinfo;
-	} ypbind_resp_u;
-};
-typedef struct ypbind_resp ypbind_resp;
-#define	YPBIND_ERR_ERR 1
-#define	YPBIND_ERR_NOSERV 2
-#define	YPBIND_ERR_RESC 3
-
-struct ypbind_setdom {
-	domainname ypsetdom_domain;
-	ypbind_binding ypsetdom_binding;
-	u_int ypsetdom_vers;
-};
-typedef struct ypbind_setdom ypbind_setdom;
-
-enum ypreqtype {
-	YPREQ_KEY = 1,
-	YPREQ_NOKEY = 2,
-	YPREQ_MAP_PARMS = 3
-};
-typedef enum ypreqtype ypreqtype;
-
-enum ypresptype {
-	YPRESP_VAL = 1,
-	YPRESP_KEY_VAL = 2,
-	YPRESP_MAP_PARMS = 3
-};
-typedef enum ypresptype ypresptype;
-
-struct yprequest {
-	ypreqtype yp_reqtype;
-	union {
-		ypreq_key yp_req_keytype;
-		ypreq_nokey yp_req_nokeytype;
-		ypmap_parms yp_req_map_parmstype;
-	} yprequest_u;
-};
-typedef struct yprequest yprequest;
-
-struct ypresponse {
-	ypresptype yp_resptype;
-	union {
-		ypresp_val yp_resp_valtype;
-		ypresp_key_val yp_resp_key_valtype;
-		ypmap_parms yp_resp_map_parmstype;
-	} ypresponse_u;
-};
-typedef struct ypresponse ypresponse;
-
-#define	YPPROG ((unsigned long)(100004))
-#define	YPOLDVERS ((unsigned long)(1))
-
-extern  void ypprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	YPOLDPROC_NULL ((unsigned long)(0))
-extern  void * ypoldproc_null_1(void *, CLIENT *);
-extern  void * ypoldproc_null_1_svc(void *, struct svc_req *);
-#define	YPOLDPROC_DOMAIN ((unsigned long)(1))
-extern  bool_t * ypoldproc_domain_1(domainname *, CLIENT *);
-extern  bool_t * ypoldproc_domain_1_svc(domainname *, struct svc_req *);
-#define	YPOLDPROC_DOMAIN_NONACK ((unsigned long)(2))
-extern  bool_t * ypoldproc_domain_nonack_1(domainname *, CLIENT *);
-extern  bool_t * ypoldproc_domain_nonack_1_svc(domainname *, struct svc_req *);
-#define	YPOLDPROC_MATCH ((unsigned long)(3))
-extern  ypresponse * ypoldproc_match_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_match_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_FIRST ((unsigned long)(4))
-extern  ypresponse * ypoldproc_first_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_first_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_NEXT ((unsigned long)(5))
-extern  ypresponse * ypoldproc_next_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_next_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_POLL ((unsigned long)(6))
-extern  ypresponse * ypoldproc_poll_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_poll_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_PUSH ((unsigned long)(7))
-extern  ypresponse * ypoldproc_push_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_push_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_PULL ((unsigned long)(8))
-extern  ypresponse * ypoldproc_pull_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_pull_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_GET ((unsigned long)(9))
-extern  ypresponse * ypoldproc_get_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_get_1_svc(yprequest *, struct svc_req *);
-extern int ypprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-#define	YPVERS ((unsigned long)(2))
-
-extern  void ypprog_2(struct svc_req *rqstp, SVCXPRT *transp);
-#define	YPPROC_NULL ((unsigned long)(0))
-extern  void * ypproc_null_2(void *, CLIENT *);
-extern  void * ypproc_null_2_svc(void *, struct svc_req *);
-#define	YPPROC_DOMAIN ((unsigned long)(1))
-extern  bool_t * ypproc_domain_2(domainname *, CLIENT *);
-extern  bool_t * ypproc_domain_2_svc(domainname *, struct svc_req *);
-#define	YPPROC_DOMAIN_NONACK ((unsigned long)(2))
-extern  bool_t * ypproc_domain_nonack_2(domainname *, CLIENT *);
-extern  bool_t * ypproc_domain_nonack_2_svc(domainname *, struct svc_req *);
-#define	YPPROC_MATCH ((unsigned long)(3))
-extern  ypresp_val * ypproc_match_2(ypreq_key *, CLIENT *);
-extern  ypresp_val * ypproc_match_2_svc(ypreq_key *, struct svc_req *);
-#define	YPPROC_FIRST ((unsigned long)(4))
-extern  ypresp_key_val * ypproc_first_2(ypreq_nokey *, CLIENT *);
-extern  ypresp_key_val * ypproc_first_2_svc(ypreq_nokey *, struct svc_req *);
-#define	YPPROC_NEXT ((unsigned long)(5))
-extern  ypresp_key_val * ypproc_next_2(ypreq_key *, CLIENT *);
-extern  ypresp_key_val * ypproc_next_2_svc(ypreq_key *, struct svc_req *);
-#define	YPPROC_XFR ((unsigned long)(6))
-extern  ypresp_xfr * ypproc_xfr_2(ypreq_xfr *, CLIENT *);
-extern  ypresp_xfr * ypproc_xfr_2_svc(ypreq_xfr *, struct svc_req *);
-#define	YPPROC_CLEAR ((unsigned long)(7))
-extern  void * ypproc_clear_2(void *, CLIENT *);
-extern  void * ypproc_clear_2_svc(void *, struct svc_req *);
-#define	YPPROC_ALL ((unsigned long)(8))
-extern  ypresp_all * ypproc_all_2(ypreq_nokey *, CLIENT *);
-extern  ypresp_all * ypproc_all_2_svc(ypreq_nokey *, struct svc_req *);
-#define	YPPROC_MASTER ((unsigned long)(9))
-extern  ypresp_master * ypproc_master_2(ypreq_nokey *, CLIENT *);
-extern  ypresp_master * ypproc_master_2_svc(ypreq_nokey *, struct svc_req *);
-#define	YPPROC_ORDER ((unsigned long)(10))
-extern  ypresp_order * ypproc_order_2(ypreq_nokey *, CLIENT *);
-extern  ypresp_order * ypproc_order_2_svc(ypreq_nokey *, struct svc_req *);
-#define	YPPROC_MAPLIST ((unsigned long)(11))
-extern  ypresp_maplist * ypproc_maplist_2(domainname *, CLIENT *);
-extern  ypresp_maplist * ypproc_maplist_2_svc(domainname *, struct svc_req *);
-extern int ypprog_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#define	YPPUSH_XFRRESPPROG ((unsigned long)(0x40000000))
-#define	YPPUSH_XFRRESPVERS ((unsigned long)(1))
-
-extern  void yppush_xfrrespprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	YPPUSHPROC_NULL ((unsigned long)(0))
-extern  void * yppushproc_null_1(void *, CLIENT *);
-extern  void * yppushproc_null_1_svc(void *, struct svc_req *);
-#define	YPPUSHPROC_XFRRESP ((unsigned long)(1))
-extern  void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *);
-extern  void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *);
-extern int yppush_xfrrespprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#define	YPBINDPROG ((unsigned long)(100007))
-#define	YPBINDVERS ((unsigned long)(2))
-
-extern  void ypbindprog_2(struct svc_req *rqstp, SVCXPRT *transp);
-#define	YPBINDPROC_NULL ((unsigned long)(0))
-extern  void * ypbindproc_null_2(void *, CLIENT *);
-extern  void * ypbindproc_null_2_svc(void *, struct svc_req *);
-#define	YPBINDPROC_DOMAIN ((unsigned long)(1))
-extern  ypbind_resp * ypbindproc_domain_2(domainname *, CLIENT *);
-extern  ypbind_resp * ypbindproc_domain_2_svc(domainname *, struct svc_req *);
-#define	YPBINDPROC_SETDOM ((unsigned long)(2))
-extern  void * ypbindproc_setdom_2(ypbind_setdom *, CLIENT *);
-extern  void * ypbindproc_setdom_2_svc(ypbind_setdom *, struct svc_req *);
-extern int ypbindprog_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_ypstat(XDR *, ypstat*);
-extern  bool_t xdr_ypxfrstat(XDR *, ypxfrstat*);
-extern  bool_t xdr_domainname(XDR *, domainname*);
-extern  bool_t xdr_mapname(XDR *, mapname*);
-extern  bool_t xdr_peername(XDR *, peername*);
-extern  bool_t xdr_keydat(XDR *, keydat*);
-extern  bool_t xdr_valdat(XDR *, valdat*);
-extern  bool_t xdr_ypmap_parms(XDR *, ypmap_parms*);
-extern  bool_t xdr_ypreq_key(XDR *, ypreq_key*);
-extern  bool_t xdr_ypreq_nokey(XDR *, ypreq_nokey*);
-extern  bool_t xdr_ypreq_xfr(XDR *, ypreq_xfr*);
-extern  bool_t xdr_ypresp_val(XDR *, ypresp_val*);
-extern  bool_t xdr_ypresp_key_val(XDR *, ypresp_key_val*);
-extern  bool_t xdr_ypresp_master(XDR *, ypresp_master*);
-extern  bool_t xdr_ypresp_order(XDR *, ypresp_order*);
-extern  bool_t xdr_ypresp_all(XDR *, ypresp_all*);
-extern  bool_t xdr_ypresp_xfr(XDR *, ypresp_xfr*);
-extern  bool_t xdr_ypmaplist(XDR *, ypmaplist*);
-extern  bool_t xdr_ypresp_maplist(XDR *, ypresp_maplist*);
-extern  bool_t xdr_yppush_status(XDR *, yppush_status*);
-extern  bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-extern  bool_t xdr_ypbind_resptype(XDR *, ypbind_resptype*);
-extern  bool_t xdr_ypbind_binding(XDR *, ypbind_binding*);
-extern  bool_t xdr_ypbind_resp(XDR *, ypbind_resp*);
-extern  bool_t xdr_ypbind_setdom(XDR *, ypbind_setdom*);
-extern  bool_t xdr_ypreqtype(XDR *, ypreqtype*);
-extern  bool_t xdr_ypresptype(XDR *, ypresptype*);
-extern  bool_t xdr_yprequest(XDR *, yprequest*);
-extern  bool_t xdr_ypresponse(XDR *, ypresponse*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_YP_H_RPCGEN */
diff --git a/include.new/rpcsvc/yp.x b/include.new/rpcsvc/yp.x
deleted file mode 100644
index b85998d..0000000
--- a/include.new/rpcsvc/yp.x
+++ /dev/null
@@ -1,379 +0,0 @@
-/* @(#)yp.x	2.1 88/08/01 4.0 RPCSRC */
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * Protocol description file for the Yellow Pages Service
- */
-
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/yp.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-const YPMAXRECORD = 1024;
-const YPMAXDOMAIN = 64;
-const YPMAXMAP = 64;
-const YPMAXPEER = 64;
-
-
-enum ypstat {
-	YP_TRUE		=  1,
-	YP_NOMORE	=  2,
-	YP_FALSE	=  0,
-	YP_NOMAP	= -1,
-	YP_NODOM	= -2,
-	YP_NOKEY	= -3,
-	YP_BADOP	= -4,
-	YP_BADDB	= -5,
-	YP_YPERR	= -6,
-	YP_BADARGS	= -7,
-	YP_VERS		= -8
-};
-
-
-enum ypxfrstat {
-	YPXFR_SUCC	=  1,
-	YPXFR_AGE	=  2,
-	YPXFR_NOMAP	= -1,
-	YPXFR_NODOM	= -2,
-	YPXFR_RSRC	= -3,
-	YPXFR_RPC	= -4,
-	YPXFR_MADDR	= -5,
-	YPXFR_YPERR	= -6,
-	YPXFR_BADARGS	= -7,
-	YPXFR_DBM	= -8,
-	YPXFR_FILE	= -9,
-	YPXFR_SKEW	= -10,
-	YPXFR_CLEAR	= -11,
-	YPXFR_FORCE	= -12,
-	YPXFR_XFRERR	= -13,
-	YPXFR_REFUSED	= -14
-};
-
-
-typedef string domainname<YPMAXDOMAIN>;
-typedef string mapname<YPMAXMAP>;
-typedef string peername<YPMAXPEER>;
-typedef opaque keydat<YPMAXRECORD>;
-typedef opaque valdat<YPMAXRECORD>;
-
-
-struct ypmap_parms {
-	domainname domain;	
-	mapname map;
-	unsigned int ordernum;
-	peername peer;
-};
-
-struct ypreq_key {
-	domainname domain;
-	mapname map;
-	keydat key;
-};
-
-struct ypreq_nokey {
-	domainname domain;	
-	mapname map;
-};
-	
-struct ypreq_xfr {
-	ypmap_parms map_parms;
-	unsigned int transid;
-	unsigned int prog;
-	unsigned int port;
-};
-
-
-struct ypresp_val {
-	ypstat stat;
-	valdat val;
-};
-
-struct ypresp_key_val {
-	ypstat stat;
-#ifdef STUPID_SUN_BUG /* These are backwards */
-	keydat key;
-	valdat val;
-#else
-	valdat val;
-	keydat key;
-#endif
-};
-
-
-struct ypresp_master {
-	ypstat stat;	
-	peername peer;
-};
-
-struct ypresp_order {
-	ypstat stat;
-	unsigned int ordernum;
-};
-
-union ypresp_all switch (bool more) {
-case TRUE:
-	ypresp_key_val val;
-case FALSE:
-	void;
-};
-
-struct ypresp_xfr {
-	unsigned int transid;
-	ypxfrstat xfrstat;
-};
-
-struct ypmaplist {
-	mapname map;
-	ypmaplist *next;
-};
-
-struct ypresp_maplist {
-	ypstat stat;
-	ypmaplist *maps;
-};
-
-enum yppush_status {
-	YPPUSH_SUCC	=  1,	/* Success */
-	YPPUSH_AGE 	=  2,	/* Master's version not newer */
-	YPPUSH_NOMAP	= -1,	/* Can't find server for map */
-	YPPUSH_NODOM	= -2,	/* Domain not supported */
-	YPPUSH_RSRC	= -3,	/* Local resource alloc failure */
-	YPPUSH_RPC	= -4,	/* RPC failure talking to server */
-	YPPUSH_MADDR 	= -5,	/* Can't get master address */
-	YPPUSH_YPERR	= -6,	/* YP server/map db error */
-	YPPUSH_BADARGS	= -7,	/* Request arguments bad */
-	YPPUSH_DBM	= -8,	/* Local dbm operation failed */
-	YPPUSH_FILE	= -9,	/* Local file I/O operation failed */
-	YPPUSH_SKEW	= -10,	/* Map version skew during transfer */
-	YPPUSH_CLEAR	= -11,	/* Can't send "Clear" req to local ypserv */
-	YPPUSH_FORCE	= -12,	/* No local order number in map  use -f flag. */
-	YPPUSH_XFRERR 	= -13,	/* ypxfr error */
-	YPPUSH_REFUSED	= -14 	/* Transfer request refused by ypserv */
-};
-
-struct yppushresp_xfr {
-	unsigned transid;
-	yppush_status status;
-};
-
-/*
- * Response structure and overall result status codes.  Success and failure
- * represent two separate response message types.
- */
- 
-enum ypbind_resptype {
-	YPBIND_SUCC_VAL = 1, 
-	YPBIND_FAIL_VAL = 2
-};
- 
-struct ypbind_binding {
-    opaque ypbind_binding_addr[4]; /* In network order */
-    opaque ypbind_binding_port[2]; /* In network order */
-};   
-
-union ypbind_resp switch (ypbind_resptype ypbind_status) {
-case YPBIND_FAIL_VAL:
-        unsigned ypbind_error;
-case YPBIND_SUCC_VAL:
-        ypbind_binding ypbind_bindinfo;
-};     
-
-/* Detailed failure reason codes for response field ypbind_error*/
- 
-const YPBIND_ERR_ERR    = 1;	/* Internal error */
-const YPBIND_ERR_NOSERV = 2;	/* No bound server for passed domain */
-const YPBIND_ERR_RESC   = 3;	/* System resource allocation failure */
- 
- 
-/*
- * Request data structure for ypbind "Set domain" procedure.
- */
-struct ypbind_setdom {
-	domainname ypsetdom_domain;
-	ypbind_binding ypsetdom_binding;
-	unsigned ypsetdom_vers;
-};
-
-
-/*
- * NIS v1 support for backwards compatibility
- */
-enum ypreqtype {
-	YPREQ_KEY = 1,
-	YPREQ_NOKEY = 2,
-	YPREQ_MAP_PARMS = 3
-};
-
-enum ypresptype {
-	YPRESP_VAL = 1,
-	YPRESP_KEY_VAL = 2,
-	YPRESP_MAP_PARMS = 3
-};
-
-union yprequest switch (ypreqtype yp_reqtype) {
-case YPREQ_KEY:
-	ypreq_key yp_req_keytype;
-case YPREQ_NOKEY:
-	ypreq_nokey yp_req_nokeytype;
-case YPREQ_MAP_PARMS:
-	ypmap_parms yp_req_map_parmstype;
-};
-
-union ypresponse switch (ypresptype yp_resptype) {
-case YPRESP_VAL:
-	ypresp_val yp_resp_valtype;
-case YPRESP_KEY_VAL:
-	ypresp_key_val yp_resp_key_valtype;
-case YPRESP_MAP_PARMS:
-	ypmap_parms yp_resp_map_parmstype;
-};
-
-#if !defined(YPBIND_ONLY) && !defined(YPPUSH_ONLY)
-/*
- * YP access protocol
- */
-program YPPROG {
-/*
- * NIS v1 support for backwards compatibility
- */
-	version YPOLDVERS {
-		void
-		YPOLDPROC_NULL(void) = 0;
-
-		bool
-		YPOLDPROC_DOMAIN(domainname) = 1;
-
-		bool
-		YPOLDPROC_DOMAIN_NONACK(domainname) = 2;
-
-		ypresponse
-		YPOLDPROC_MATCH(yprequest) = 3;
-
-		ypresponse
-		YPOLDPROC_FIRST(yprequest) = 4;
-
-		ypresponse
-		YPOLDPROC_NEXT(yprequest) = 5;
-
-		ypresponse
-		YPOLDPROC_POLL(yprequest) = 6;
-
-		ypresponse
-		YPOLDPROC_PUSH(yprequest) = 7;
-
-		ypresponse
-		YPOLDPROC_PULL(yprequest) = 8;
-
-		ypresponse
-		YPOLDPROC_GET(yprequest) = 9;
-	} = 1;
-
-	version YPVERS {
-		void 
-		YPPROC_NULL(void) = 0;
-
-		bool 
-		YPPROC_DOMAIN(domainname) = 1;	
-
-		bool
-		YPPROC_DOMAIN_NONACK(domainname) = 2;
-
-		ypresp_val
-		YPPROC_MATCH(ypreq_key) = 3;
-
-		ypresp_key_val 
-#ifdef STUPID_SUN_BUG /* should be ypreq_nokey */
-		YPPROC_FIRST(ypreq_key) = 4;
-#else
-		YPPROC_FIRST(ypreq_nokey) = 4;
-#endif
-		ypresp_key_val 
-		YPPROC_NEXT(ypreq_key) = 5;
-
-		ypresp_xfr
-		YPPROC_XFR(ypreq_xfr) = 6;
-
-		void
-		YPPROC_CLEAR(void) = 7;
-
-		ypresp_all
-		YPPROC_ALL(ypreq_nokey) = 8;
-
-		ypresp_master
-		YPPROC_MASTER(ypreq_nokey) = 9;
-
-		ypresp_order
-		YPPROC_ORDER(ypreq_nokey) = 10;
-
-		ypresp_maplist 
-		YPPROC_MAPLIST(domainname) = 11;
-	} = 2;
-} = 100004;
-#endif
-#if !defined(YPSERV_ONLY) && !defined(YPBIND_ONLY)
-/*
- * YPPUSHPROC_XFRRESP is the callback routine for result of YPPROC_XFR
- */
-program YPPUSH_XFRRESPPROG {
-	version YPPUSH_XFRRESPVERS {
-		void
-		YPPUSHPROC_NULL(void) = 0;
-#ifdef STUPID_SUN_BUG /* argument and return value are backwards */
-		yppushresp_xfr	
-		YPPUSHPROC_XFRRESP(void) = 1;
-#else
-		void
-		YPPUSHPROC_XFRRESP(yppushresp_xfr) = 1;
-#endif
-	} = 1;
-} = 0x40000000;	/* transient: could be anything up to 0x5fffffff */
-#endif
-#if !defined(YPSERV_ONLY) && !defined(YPPUSH_ONLY)
-/*
- * YP binding protocol
- */
-program YPBINDPROG {
-	version YPBINDVERS {
-		void
-		YPBINDPROC_NULL(void) = 0;
-	
-		ypbind_resp
-		YPBINDPROC_DOMAIN(domainname) = 1;
-
-		void
-		YPBINDPROC_SETDOM(ypbind_setdom) = 2;
-	} = 2;
-} = 100007;
-
-#endif
diff --git a/include.new/rpcsvc/yp_prot.h b/include.new/rpcsvc/yp_prot.h
deleted file mode 100644
index a2b60e4..0000000
--- a/include.new/rpcsvc/yp_prot.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
- * 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 ``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 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: releng/10.2/include/rpcsvc/yp_prot.h 153149 2005-12-06 02:01:06Z peter $
- */
-
-#ifndef _RPCSVC_YP_PROT_H_
-#define _RPCSVC_YP_PROT_H_
-
-/*
- * YPSERV PROTOCOL:
- *
- * ypserv supports the following procedures:
- *
- * YPPROC_NULL		takes (void), returns (void).
- * 			called to check if server is alive.
- * YPPROC_DOMAIN	takes (char *), returns (bool_t).
- * 			true if ypserv serves the named domain.
- * YPPROC_DOMAIN_NOACK	takes (char *), returns (bool_t).
- * 			true if ypserv serves the named domain.
- *			used for broadcasts, does not ack if ypserv
- *			doesn't handle named domain.
- * YPPROC_MATCH		takes (struct ypreq_key), returns (struct ypresp_val)
- * 			does a lookup.
- * YPPROC_FIRST		takes (struct ypreq_nokey) returns (ypresp_key_val).
- * 			gets the first key/datum from the map.
- * YPPROC_NEXT		takes (struct ypreq_key) returns (ypresp_key_val).
- * 			gets the next key/datum from the map.
- * YPPROC_XFR		takes (struct ypreq_xfr), returns (void).
- * 			tells ypserv to check if there is a new version of
- *			the map.
- * YPPROC_CLEAR		takes (void), returns (void).
- * 			tells ypserv to flush it's file cache, so that
- *			newly transferred files will get read.
- * YPPROC_ALL		takes (struct ypreq_nokey), returns (bool_t and
- *			struct ypresp_key_val).
- * 			returns an array of data, with the bool_t being
- * 			false on the last datum. read the source, it's
- *			convoluted.
- * YPPROC_MASTER	takes (struct ypreq_nokey), returns (ypresp_master).
- * YPPROC_ORDER		takes (struct ypreq_nokey), returns (ypresp_order).
- * YPPROC_MAPLIST	takes (char *), returns (struct ypmaplist *).
- */
-
-#ifndef BOOL_DEFINED
-typedef u_int bool;
-#define BOOL_DEFINED
-#endif
-
-/* Program and version symbols, magic numbers */
-
-#define YPPROG		((u_long)100004)
-#define YPVERS		((u_long)2)
-#define YPVERS_ORIG	((u_long)1)
-#define YPMAXRECORD	((u_long)1024)
-#define YPMAXDOMAIN	((u_long)64)
-#define YPMAXMAP	((u_long)64)
-#define YPMAXPEER	((u_long)256)
-
-/*
- * I don't know if anything of sun's depends on this, or if they
- * simply defined it so that their own code wouldn't try to send
- * packets over the ethernet MTU. This YP code doesn't use it.
- */
-#define YPMSGSZ		1600
-
-#ifndef DATUM
-typedef struct {
-	char	*dptr;
-	int	dsize;
-} datum;
-#define DATUM
-#endif
-
-struct ypmap_parms {
-	char *domain;
-	char *map;
-	u_int ordernum;
-	char *owner;
-};
-
-struct ypreq_key {
-	char *domain;
-	char *map;
-	datum keydat;
-};
-
-struct ypreq_nokey {
-	char *domain;
-	char *map;
-};
-
-struct ypreq_xfr {
-	struct ypmap_parms map_parms;
-	u_int transid;
-	u_int proto;
-	u_int port;
-};
-#define ypxfr_domain	map_parms.domain
-#define ypxfr_map	map_parms.map
-#define ypxfr_ordernum	map_parms.ordernum
-#define ypxfr_owner	map_parms.owner
-
-struct ypresp_val {
-	u_int status;
-	datum valdat;
-};
-
-struct ypresp_key_val {
-	u_int status;
-	datum keydat;
-	datum valdat;
-};
-
-struct ypresp_master {
-	u_int status;
-	char *master;
-};
-
-struct ypresp_order {
-	u_int status;
-	u_int ordernum;
-};
-
-struct ypmaplist {
-	char *ypml_name;
-	struct ypmaplist *ypml_next;
-};
-
-struct ypresp_maplist {
-	u_int status;
-	struct ypmaplist *list;
-};
-
-/* ypserv procedure numbers */
-#define YPPROC_NULL		((u_long)0)
-#define YPPROC_DOMAIN		((u_long)1)
-#define YPPROC_DOMAIN_NONACK	((u_long)2)
-#define YPPROC_MATCH		((u_long)3)
-#define YPPROC_FIRST		((u_long)4)
-#define YPPROC_NEXT		((u_long)5)
-#define YPPROC_XFR		((u_long)6)
-#define YPPROC_CLEAR		((u_long)7)
-#define YPPROC_ALL		((u_long)8)
-#define YPPROC_MASTER		((u_long)9)
-#define YPPROC_ORDER		((u_long)10)
-#define YPPROC_MAPLIST		((u_long)11)
-
-/* ypserv procedure return status values */
-#define YP_TRUE	 	((long)1)	/* general purpose success code */
-#define YP_NOMORE 	((long)2)	/* no more entries in map */
-#define YP_FALSE 	((long)0)	/* general purpose failure code */
-#define YP_NOMAP 	((long)-1)	/* no such map in domain */
-#define YP_NODOM 	((long)-2)	/* domain not supported */
-#define YP_NOKEY 	((long)-3)	/* no such key in map */
-#define YP_BADOP 	((long)-4)	/* invalid operation */
-#define YP_BADDB 	((long)-5)	/* server data base is bad */
-#define YP_YPERR 	((long)-6)	/* YP server error */
-#define YP_BADARGS 	((long)-7)	/* request arguments bad */
-#define YP_VERS		((long)-8)	/* YP server version mismatch */
-
-/*
- * Sun's header file says:
- * "Domain binding data structure, used by ypclnt package and ypserv modules.
- * Users of the ypclnt package (or of this protocol) don't HAVE to know about
- * it, but it must be available to users because _yp_dobind is a public
- * interface."
- *
- * This is totally bogus! Nowhere else does Sun state that _yp_dobind() is
- * a public interface, and I don't know any reason anyone would want to call
- * it. But, just in case anyone does actually expect it to be available..
- * we provide this.. exactly as Sun wants it.
- */
-struct dom_binding {
-	struct dom_binding *dom_pnext;
-	char dom_domain[YPMAXDOMAIN + 1];
-	struct sockaddr_in dom_server_addr;
-	u_short dom_server_port;
-	int dom_socket;
-	CLIENT *dom_client;
-	u_short dom_local_port;
-	long dom_vers;
-};
-
-/*
- * YPBIND PROTOCOL:
- *
- * ypbind supports the following procedures:
- *
- * YPBINDPROC_NULL	takes (void), returns (void).
- *			to check if ypbind is running.
- * YPBINDPROC_DOMAIN	takes (char *), returns (struct ypbind_resp).
- *			requests that ypbind start to serve the
- *			named domain (if it doesn't already)
- * YPBINDPROC_SETDOM	takes (struct ypbind_setdom), returns (void).
- *			used by ypset.
- */
-
-#define YPBINDPROG		((u_long)100007)
-#define YPBINDVERS		((u_long)2)
-#define YPBINDVERS_ORIG		((u_long)1)
-
-/* ypbind procedure numbers */
-#define YPBINDPROC_NULL		((u_long)0)
-#define YPBINDPROC_DOMAIN	((u_long)1)
-#define YPBINDPROC_SETDOM	((u_long)2)
-
-/* error code in ypbind_resp.ypbind_status */
-enum ypbind_resptype {
-	YPBIND_SUCC_VAL = 1,
-	YPBIND_FAIL_VAL = 2
-};
-
-/* network order, of course */
-struct ypbind_binding {
-	struct in_addr	ypbind_binding_addr;
-	u_short		ypbind_binding_port;
-};
-
-struct ypbind_resp {
-	enum ypbind_resptype	ypbind_status;
-	union {
-		u_int			ypbind_error;
-		struct ypbind_binding	ypbind_bindinfo;
-	} ypbind_respbody;
-};
-
-/* error code in ypbind_resp.ypbind_respbody.ypbind_error */
-#define YPBIND_ERR_ERR		1	/* internal error */
-#define YPBIND_ERR_NOSERV	2	/* no bound server for passed domain */
-#define YPBIND_ERR_RESC		3	/* system resource allocation failure */
-
-/*
- * Request data structure for ypbind "Set domain" procedure.
- */
-struct ypbind_setdom {
-	char ypsetdom_domain[YPMAXDOMAIN + 1];
-	struct ypbind_binding ypsetdom_binding;
-	u_int ypsetdom_vers;
-};
-#define ypsetdom_addr ypsetdom_binding.ypbind_binding_addr
-#define ypsetdom_port ypsetdom_binding.ypbind_binding_port
-
-/*
- * YPPUSH PROTOCOL:
- *
- * Sun says:
- * "Protocol between clients (ypxfr, only) and yppush
- *  yppush speaks a protocol in the transient range, which
- *  is supplied to ypxfr as a command-line parameter when it
- *  is activated by ypserv."
- *
- * This protocol is not implemented, naturally, because this YP
- * implementation only does the client side.
- */
-#define YPPUSHVERS		((u_long)1)
-#define YPPUSHVERS_ORIG		((u_long)1)
-
-/* yppush procedure numbers */
-#define YPPUSHPROC_NULL		((u_long)0)
-#define YPPUSHPROC_XFRRESP	((u_long)1)
-
-struct yppushresp_xfr {
-	u_int	transid;
-	u_int	status;
-};
-
-/* yppush status value in yppushresp_xfr.status */
-#define YPPUSH_SUCC	((long)1)	/* Success */
-#define YPPUSH_AGE	((long)2)	/* Master's version not newer */
-#define YPPUSH_NOMAP 	((long)-1)	/* Can't find server for map */
-#define YPPUSH_NODOM 	((long)-2)	/* Domain not supported */
-#define YPPUSH_RSRC 	((long)-3)	/* Local resource alloc failure */
-#define YPPUSH_RPC 	((long)-4)	/* RPC failure talking to server */
-#define YPPUSH_MADDR	((long)-5)	/* Can't get master address */
-#define YPPUSH_YPERR 	((long)-6)	/* YP server/map db error */
-#define YPPUSH_BADARGS 	((long)-7)	/* Request arguments bad */
-#define YPPUSH_DBM	((long)-8)	/* Local dbm operation failed */
-#define YPPUSH_FILE	((long)-9)	/* Local file I/O operation failed */
-#define YPPUSH_SKEW	((long)-10)	/* Map version skew during transfer */
-#define YPPUSH_CLEAR	((long)-11)	/* Can't send "Clear" req to local ypserv */
-#define YPPUSH_FORCE	((long)-12)	/* No local order number in map - use -f */
-#define YPPUSH_XFRERR	((long)-13)	/* ypxfr error */
-#define YPPUSH_REFUSED	((long)-14)	/* Transfer request refused by ypserv */
-
-struct inaddr;
-__BEGIN_DECLS
-bool_t	xdr_datum(XDR *, datum *);
-bool_t	xdr_ypreq_key(XDR *, struct ypreq_key *);
-bool_t	xdr_ypreq_nokey(XDR *, struct ypreq_nokey *);
-bool_t	xdr_ypreq_xfr(XDR *, struct ypreq_xfr *);
-bool_t	xdr_ypresp_val(XDR *, struct ypresp_val *);
-bool_t	xdr_ypresp_key_val(XDR *, struct ypresp_key_val *);
-bool_t	xdr_ypbind_resp(XDR *, struct ypbind_resp *);
-bool_t	xdr_ypbind_setdom(XDR *, struct ypbind_setdom *);
-bool_t	xdr_yp_inaddr(XDR *, struct inaddr *);
-bool_t	xdr_ypmap_parms(XDR *, struct ypmap_parms *);
-bool_t	xdr_yppushresp_xfr(XDR *, struct yppushresp_xfr *);
-bool_t	xdr_ypresp_order(XDR *, struct ypresp_order *);
-bool_t	xdr_ypresp_master(XDR *, struct ypresp_master *);
-bool_t	xdr_ypresp_maplist(XDR *, struct ypresp_maplist *);
-__END_DECLS
-
-#endif /* _RPCSVC_YP_PROT_H_ */
diff --git a/include.new/rpcsvc/ypclnt.h b/include.new/rpcsvc/ypclnt.h
deleted file mode 100644
index 0f6696a..0000000
--- a/include.new/rpcsvc/ypclnt.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
- * 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 ``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 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: releng/10.2/include/rpcsvc/ypclnt.h 121577 2003-10-26 16:35:11Z peter $
- */
-
-#ifndef _RPCSVC_YPCLNT_H_
-#define _RPCSVC_YPCLNT_H_
-
-#include <sys/cdefs.h>
-
-#define YPERR_BADARGS	1		/* args to function are bad */
-#define YPERR_RPC	2		/* RPC failure */
-#define YPERR_DOMAIN	3		/* can't bind to a server for domain */
-#define YPERR_MAP	4		/* no such map in server's domain */
-#define YPERR_KEY	5		/* no such key in map */
-#define YPERR_YPERR	6		/* some internal YP server or client error */
-#define YPERR_RESRC	7		/* local resource allocation failure */
-#define YPERR_NOMORE	8		/* no more records in map database */
-#define YPERR_PMAP	9		/* can't communicate with portmapper */
-#define YPERR_YPBIND	10		/* can't communicate with ypbind */
-#define YPERR_YPSERV	11		/* can't communicate with ypserv */
-#define YPERR_NODOM	12		/* local domain name not set */
-#define YPERR_BADDB	13		/* YP data base is bad */
-#define YPERR_VERS	14		/* YP version mismatch */
-#define YPERR_ACCESS	15		/* access violation */
-#define YPERR_BUSY	16		/* database is busy */
-
-/*
- * Types of update operations
- */
-#define YPOP_CHANGE	1		/* change, do not add */
-#define YPOP_INSERT	2		/* add, do not change */
-#define YPOP_DELETE	3		/* delete this entry */
-#define YPOP_STORE 	4		/* add, or change */
-
-struct ypall_callback {
-	/* return non-0 to stop getting called */
-	int (*foreach)(unsigned long, char *, int, char *, int, void *);
-	char *data;		/* opaque pointer for use of callback fn */
-};
-
-struct dom_binding;
-struct ypmaplist;
-struct ypall_callback;
-
-__BEGIN_DECLS
-int	yp_bind(char *dom);
-int	_yp_dobind(char *dom, struct dom_binding **ypdb);
-void	yp_unbind(char *dom);
-int	yp_get_default_domain(char **domp);
-int	yp_match(char *indomain, char *inmap, const char *inkey, int inkeylen,
-	    char **outval, int *outvallen);
-int	yp_first(char *indomain, char *inmap, char **outkey, int *outkeylen,
-	    char **outval, int *outvallen);
-int	yp_next(char *indomain, char *inmap, char *inkey, int inkeylen,
-	    char **outkey, int *outkeylen, char **outval, int *outvallen);
-int	yp_maplist(char *indomain, struct ypmaplist **outmaplist);
-int	yp_master(char *indomain, char *inmap, char **outname);
-int	yp_order(char *indomain, char *inmap, int *outorder);
-int	yp_all(char *indomain, char *inmap, struct ypall_callback *incallback);
-const char *yperr_string(int incode);
-const char *ypbinderr_string(int incode);
-int	ypprot_err(unsigned int incode);
-__END_DECLS
-
-#endif /* _RPCSVC_YPCLNT_H_ */
-
diff --git a/include.new/rpcsvc/yppasswd.h b/include.new/rpcsvc/yppasswd.h
deleted file mode 100644
index 6146847..0000000
--- a/include.new/rpcsvc/yppasswd.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _YPPASSWD_H_RPCGEN
-#define	_YPPASSWD_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-struct x_passwd {
-	char *pw_name;
-	char *pw_passwd;
-	int pw_uid;
-	int pw_gid;
-	char *pw_gecos;
-	char *pw_dir;
-	char *pw_shell;
-};
-typedef struct x_passwd x_passwd;
-
-struct yppasswd {
-	char *oldpass;
-	x_passwd newpw;
-};
-typedef struct yppasswd yppasswd;
-#include <sys/cdefs.h>
-extern int _yppasswd( char * , struct x_passwd * );
-#define yppasswd(x,y) _yppasswd(x,y)
-
-#define	YPPASSWDPROG ((unsigned long)(100009))
-#define	YPPASSWDVERS ((unsigned long)(1))
-
-extern  void yppasswdprog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	YPPASSWDPROC_UPDATE ((unsigned long)(1))
-extern  int * yppasswdproc_update_1(yppasswd *, CLIENT *);
-extern  int * yppasswdproc_update_1_svc(yppasswd *, struct svc_req *);
-extern int yppasswdprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_x_passwd(XDR *, x_passwd*);
-extern  bool_t xdr_yppasswd(XDR *, yppasswd*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_YPPASSWD_H_RPCGEN */
diff --git a/include.new/rpcsvc/yppasswd.x b/include.new/rpcsvc/yppasswd.x
deleted file mode 100644
index 7bfef64..0000000
--- a/include.new/rpcsvc/yppasswd.x
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-/*
- * YP password update protocol
- * Requires unix authentication
- */
-
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)yppasswd.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/yppasswd.x 272850 2014-10-09 23:05:32Z hrs $");
-#endif
-
-program YPPASSWDPROG {
-	version YPPASSWDVERS {
-		/*
-		 * Update my passwd entry 
-		 */
-		int
-		YPPASSWDPROC_UPDATE(yppasswd) = 1;
-	} = 1;
-} = 100009;
-
-
-struct x_passwd {
-	string pw_name<>;	/* username */
-	string pw_passwd<>;	/* encrypted password */
-	int pw_uid;		/* user id */
-	int pw_gid;		/* group id */
-	string pw_gecos<>;	/* in real life name */
-	string pw_dir<>;	/* home directory */
-	string pw_shell<>;	/* default shell */
-};
-
-struct yppasswd {
-	string oldpass<>;	/* unencrypted old password */
-	x_passwd newpw;		/* new passwd entry */
-};
-
-
-#ifdef RPC_HDR
-%#include <sys/cdefs.h>
-%extern int _yppasswd( char * , struct x_passwd * );
-%#define yppasswd(x,y) _yppasswd(x,y)
-#endif
diff --git a/include.new/rpcsvc/ypupdate_prot.h b/include.new/rpcsvc/ypupdate_prot.h
deleted file mode 100644
index 544d644..0000000
--- a/include.new/rpcsvc/ypupdate_prot.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _YPUPDATE_PROT_H_RPCGEN
-#define	_YPUPDATE_PROT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986, 1990 by Sun Microsystems, Inc.
- */
-
-/* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
-
-/*
- * Compiled from ypupdate_prot.x using rpcgen
- * This is NOT source code!
- * DO NOT EDIT THIS FILE!
- */
-
-#ifndef _rpcsvc_ypupdate_prot_h
-#define _rpcsvc_ypupdate_prot_h
-
-#define	MAXMAPNAMELEN 255
-#define	MAXYPDATALEN 1023
-#define	MAXERRMSGLEN 255
-
-typedef struct {
-	u_int yp_buf_len;
-	char *yp_buf_val;
-} yp_buf;
-
-struct ypupdate_args {
-	char *mapname;
-	yp_buf key;
-	yp_buf datum;
-};
-typedef struct ypupdate_args ypupdate_args;
-
-struct ypdelete_args {
-	char *mapname;
-	yp_buf key;
-};
-typedef struct ypdelete_args ypdelete_args;
-
-#endif /* !_rpcsvc_ypupdate_prot_h */
-
-#define	YPU_PROG ((unsigned long)(100028))
-#define	YPU_VERS ((unsigned long)(1))
-
-extern  void ypu_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	YPU_CHANGE ((unsigned long)(1))
-extern  u_int * ypu_change_1(ypupdate_args *, CLIENT *);
-extern  u_int * ypu_change_1_svc(ypupdate_args *, struct svc_req *);
-#define	YPU_INSERT ((unsigned long)(2))
-extern  u_int * ypu_insert_1(ypupdate_args *, CLIENT *);
-extern  u_int * ypu_insert_1_svc(ypupdate_args *, struct svc_req *);
-#define	YPU_DELETE ((unsigned long)(3))
-extern  u_int * ypu_delete_1(ypdelete_args *, CLIENT *);
-extern  u_int * ypu_delete_1_svc(ypdelete_args *, struct svc_req *);
-#define	YPU_STORE ((unsigned long)(4))
-extern  u_int * ypu_store_1(ypupdate_args *, CLIENT *);
-extern  u_int * ypu_store_1_svc(ypupdate_args *, struct svc_req *);
-extern int ypu_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_yp_buf(XDR *, yp_buf*);
-extern  bool_t xdr_ypupdate_args(XDR *, ypupdate_args*);
-extern  bool_t xdr_ypdelete_args(XDR *, ypdelete_args*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_YPUPDATE_PROT_H_RPCGEN */
diff --git a/include.new/rpcsvc/ypupdate_prot.x b/include.new/rpcsvc/ypupdate_prot.x
deleted file mode 100644
index 4990dd1..0000000
--- a/include.new/rpcsvc/ypupdate_prot.x
+++ /dev/null
@@ -1,86 +0,0 @@
-%/*
-% * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
-% * unrestricted use provided that this legend is included on all tape
-% * media and as a part of the software program in whole or part.  Users
-% * may copy or modify Sun RPC without charge, but are not authorized
-% * to license or distribute it to anyone else except as part of a product or
-% * program developed by the user or with the express written consent of
-% * Sun Microsystems, Inc.
-% *
-% * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
-% * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
-% * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-% *
-% * Sun RPC is provided with no support and without any obligation on the
-% * part of Sun Microsystems, Inc. to assist in its use, correction,
-% * modification or enhancement.
-% *
-% * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-% * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
-% * OR ANY PART THEREOF.
-% *
-% * In no event will Sun Microsystems, Inc. be liable for any lost revenue
-% * or profits or other special, indirect and consequential damages, even if
-% * Sun has been advised of the possibility of such damages.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California  94043
-% */
-
-%/*
-% * Copyright (c) 1986, 1990 by Sun Microsystems, Inc.
-% */
-%
-%/* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/ypupdate_prot.x 114629 2003-05-04 02:51:42Z obrien $");
-#endif
-%
-%/*
-% * Compiled from ypupdate_prot.x using rpcgen
-% * This is NOT source code!
-% * DO NOT EDIT THIS FILE!
-% */
-
-/*
- * YP update service protocol
- */
-#ifdef RPC_HDR
-%
-%#ifndef _rpcsvc_ypupdate_prot_h
-%#define _rpcsvc_ypupdate_prot_h
-%
-#endif
-
-const MAXMAPNAMELEN = 255;
-const MAXYPDATALEN  = 1023;
-const MAXERRMSGLEN  = 255;
-
-program YPU_PROG {
-	version YPU_VERS {
-		u_int YPU_CHANGE(ypupdate_args) = 1;
-		u_int YPU_INSERT(ypupdate_args) = 2;
-		u_int YPU_DELETE(ypdelete_args) = 3;
-		u_int YPU_STORE(ypupdate_args)  = 4;
-	} = 1;
-} = 100028;
-
-typedef opaque yp_buf<MAXYPDATALEN>;
-
-struct ypupdate_args {
-	string mapname<MAXMAPNAMELEN>;
-	yp_buf key;
-	yp_buf datum;
-};
-
-struct ypdelete_args {
-	string mapname<MAXMAPNAMELEN>;
-	yp_buf key;
-};
-
-#ifdef RPC_HDR
-%
-%#endif /* !_rpcsvc_ypupdate_prot_h */
-#endif
diff --git a/include.new/rpcsvc/ypxfrd.h b/include.new/rpcsvc/ypxfrd.h
deleted file mode 100644
index af19794..0000000
--- a/include.new/rpcsvc/ypxfrd.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _YPXFRD_H_RPCGEN
-#define	_YPXFRD_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	_YPMAXRECORD 1024
-#define	_YPMAXDOMAIN 64
-#define	_YPMAXMAP 64
-#define	_YPMAXPEER 64
-#define	YPXFRBLOCK 32767
-
-enum xfrstat {
-	XFR_REQUEST_OK = 1,
-	XFR_DENIED = 2,
-	XFR_NOFILE = 3,
-	XFR_ACCESS = 4,
-	XFR_BADDB = 5,
-	XFR_READ_OK = 6,
-	XFR_READ_ERR = 7,
-	XFR_DONE = 8,
-	XFR_DB_ENDIAN_MISMATCH = 9,
-	XFR_DB_TYPE_MISMATCH = 10
-};
-typedef enum xfrstat xfrstat;
-
-enum xfr_db_type {
-	XFR_DB_ASCII = 1,
-	XFR_DB_BSD_HASH = 2,
-	XFR_DB_BSD_BTREE = 3,
-	XFR_DB_BSD_RECNO = 4,
-	XFR_DB_BSD_MPOOL = 5,
-	XFR_DB_BSD_NDBM = 6,
-	XFR_DB_GNU_GDBM = 7,
-	XFR_DB_DBM = 8,
-	XFR_DB_NDBM = 9,
-	XFR_DB_OPAQUE = 10,
-	XFR_DB_ANY = 11,
-	XFR_DB_UNKNOWN = 12
-};
-typedef enum xfr_db_type xfr_db_type;
-
-enum xfr_byte_order {
-	XFR_ENDIAN_BIG = 1,
-	XFR_ENDIAN_LITTLE = 2,
-	XFR_ENDIAN_ANY = 3
-};
-typedef enum xfr_byte_order xfr_byte_order;
-
-typedef char *xfrdomain;
-
-typedef char *xfrmap;
-
-typedef char *xfrmap_filename;
-
-struct ypxfr_mapname {
-	xfrmap xfrmap;
-	xfrdomain xfrdomain;
-	xfrmap_filename xfrmap_filename;
-	xfr_db_type xfr_db_type;
-	xfr_byte_order xfr_byte_order;
-};
-typedef struct ypxfr_mapname ypxfr_mapname;
-
-struct xfr {
-	bool_t ok;
-	union {
-		struct {
-			u_int xfrblock_buf_len;
-			char *xfrblock_buf_val;
-		} xfrblock_buf;
-		xfrstat xfrstat;
-	} xfr_u;
-};
-typedef struct xfr xfr;
-
-#define	YPXFRD_FREEBSD_PROG ((unsigned long)(600100069))
-#define	YPXFRD_FREEBSD_VERS ((unsigned long)(1))
-
-extern  void ypxfrd_freebsd_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
-#define	YPXFRD_GETMAP ((unsigned long)(1))
-extern  struct xfr * ypxfrd_getmap_1(ypxfr_mapname *, CLIENT *);
-extern  struct xfr * ypxfrd_getmap_1_svc(ypxfr_mapname *, struct svc_req *);
-extern int ypxfrd_freebsd_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-/* the xdr functions */
-extern  bool_t xdr_xfrstat(XDR *, xfrstat*);
-extern  bool_t xdr_xfr_db_type(XDR *, xfr_db_type*);
-extern  bool_t xdr_xfr_byte_order(XDR *, xfr_byte_order*);
-extern  bool_t xdr_xfrdomain(XDR *, xfrdomain*);
-extern  bool_t xdr_xfrmap(XDR *, xfrmap*);
-extern  bool_t xdr_xfrmap_filename(XDR *, xfrmap_filename*);
-extern  bool_t xdr_ypxfr_mapname(XDR *, ypxfr_mapname*);
-extern  bool_t xdr_xfr(XDR *, xfr*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_YPXFRD_H_RPCGEN */
diff --git a/include.new/rpcsvc/ypxfrd.x b/include.new/rpcsvc/ypxfrd.x
deleted file mode 100644
index 7799926..0000000
--- a/include.new/rpcsvc/ypxfrd.x
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 1995, 1996
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul 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.
- */
-
-/*
- * This protocol definition file describes a file transfer
- * system used to very quickly move NIS maps from one host to
- * another. This is similar to what Sun does with their ypxfrd
- * protocol, but it must be stressed that this protocol is _NOT_
- * compatible with Sun's. There are a couple of reasons for this:
- *
- * 1) Sun's protocol is proprietary. The protocol definition is
- *    not freely available in any of the SunRPC source distributions,
- *    even though the NIS v2 protocol is.
- *
- * 2) The idea here is to transfer entire raw files rather than
- *    sending just the records. Sun uses ndbm for its NIS map files,
- *    while FreeBSD uses Berkeley DB. Both are hash databases, but the
- *    formats are incompatible, making it impossible for them to
- *    use each others' files. Even if FreeBSD adopted ndbm for its
- *    database format, FreeBSD/i386 is a little-endian OS and
- *    SunOS/SPARC is big-endian; ndbm is byte-order sensitive and
- *    not very smart about it, which means an attempt to read a
- *    database on a little-endian box that was created on a big-endian
- *    box (or vice-versa) can cause the ndbm code to eat itself.
- *    Luckily, Berkeley DB is able to deal with this situation in
- *    a more graceful manner.
- *
- * While the protocol is incompatible, the idea is the same: we just open
- * up a TCP pipe to the client and transfer the raw map database 
- * from the master server to the slave. This is many times faster than
- * the standard yppush/ypxfr transfer method since it saves us from
- * having to recreate the map databases via the DB library each time.
- * For example: creating a passwd database with 30,000 entries with yp_mkdb
- * can take a couple of minutes, but to just copy the file takes only a few
- * seconds.
- */
-
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: releng/10.2/include/rpcsvc/ypxfrd.x 249583 2013-04-17 11:42:40Z gabor $");
-#endif
-
-/* XXX cribbed from yp.x */
-const _YPMAXRECORD = 1024;
-const _YPMAXDOMAIN = 64;
-const _YPMAXMAP = 64;
-const _YPMAXPEER = 64;
-
-/* Suggested default -- not necessarily the one used. */
-const YPXFRBLOCK = 32767;
-
-/*
- * Possible return codes from the remote server.
- */
-enum xfrstat {
-	XFR_REQUEST_OK	= 1,	/* Transfer request granted */
-	XFR_DENIED	= 2,	/* Transfer request denied */
-	XFR_NOFILE	= 3,	/* Requested map file doesn't exist */
-	XFR_ACCESS	= 4,	/* File exists, but I couldn't access it */
-	XFR_BADDB	= 5,	/* File is not a hash database */
-	XFR_READ_OK	= 6,	/* Block read successfully */
-	XFR_READ_ERR	= 7,	/* Read error during transfer */
-	XFR_DONE	= 8,	/* Transfer completed */
-	XFR_DB_ENDIAN_MISMATCH	= 9,	/* Database byte order mismatch */
-	XFR_DB_TYPE_MISMATCH	= 10	/* Database type mismatch */
-};
-
-/*
- * Database type specifications. The client can use this to ask
- * the server for a particular type of database or just take whatever
- * the server has to offer.
- */
-enum xfr_db_type {
-	XFR_DB_ASCII		= 1,	/* Flat ASCII text */
-	XFR_DB_BSD_HASH		= 2,	/* Berkeley DB, hash method */
-	XFR_DB_BSD_BTREE	= 3,	/* Berkeley DB, btree method */
-	XFR_DB_BSD_RECNO	= 4,	/* Berkeley DB, recno method */
-	XFR_DB_BSD_MPOOL	= 5,	/* Berkeley DB, mpool method */
-	XFR_DB_BSD_NDBM		= 6,	/* Berkeley DB, hash, ndbm compat */
-	XFR_DB_GNU_GDBM		= 7,	/* GNU GDBM */
-	XFR_DB_DBM		= 8,	/* Old, deprecated dbm format */
-	XFR_DB_NDBM		= 9,	/* ndbm format (used by Sun's NISv2) */
-	XFR_DB_OPAQUE		= 10,	/* Mystery format -- just pass along */
-	XFR_DB_ANY		= 11,	/* I'll take any format you've got */
-	XFR_DB_UNKNOWN		= 12	/* Unknown format */
-};
-
-/*
- * Machine byte order specification. This allows the client to check
- * that it's copying a map database from a machine of similar byte sex.
- * This is necessary for handling database libraries that are fatally
- * byte order sensitive.
- *
- * The XFR_ENDIAN_ANY type is for use with the Berkeley DB database
- * formats; Berkeley DB is smart enough to make up for byte order
- * differences, so byte sex isn't important.
- */
-enum xfr_byte_order {
-	XFR_ENDIAN_BIG		= 1,	/* We want big endian */
-	XFR_ENDIAN_LITTLE	= 2,	/* We want little endian */
-	XFR_ENDIAN_ANY		= 3	/* We'll take whatever you got */
-};
-
-typedef string xfrdomain<_YPMAXDOMAIN>;
-typedef string xfrmap<_YPMAXMAP>;
-typedef string xfrmap_filename<_YPMAXMAP>;	/* actual name of map file */
-
-/*
- * Ask the remote ypxfrd for a map using this structure.
- * Note: we supply both a map name and a map file name. These are not
- * the same thing. In the case of ndbm, maps are stored in two files:
- * map.bykey.pag and may.bykey.dir. We may also have to deal with
- * file extensions (on the off chance that the remote server is supporting
- * multiple DB formats). To handle this, we tell the remote server both
- * what map we want and, in the case of ndbm, whether we want the .dir
- * or the .pag part. This name should not be a fully qualified path:
- * it's up to the remote server to decide which directories to look in.
- */
-struct ypxfr_mapname {
-	xfrmap xfrmap;
-	xfrdomain xfrdomain;
-	xfrmap_filename xfrmap_filename;
-	xfr_db_type xfr_db_type;
-	xfr_byte_order xfr_byte_order;
-};
-
-/* Read response using this structure. */
-union xfr switch (bool ok) {
-case TRUE:
-	opaque xfrblock_buf<>;
-case FALSE:
-	xfrstat xfrstat;
-};
-
-program YPXFRD_FREEBSD_PROG {
-	version YPXFRD_FREEBSD_VERS {
-		union xfr
-		YPXFRD_GETMAP(ypxfr_mapname) = 1;
-	} = 1;
-} = 600100069;	/* 100069 + 60000000 -- 100069 is the Sun ypxfrd prog number */
diff --git a/include.new/rpoll.h b/include.new/rpoll.h
deleted file mode 100644
index 497a41e..0000000
--- a/include.new/rpoll.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c)1996-2002 by Hartmut Brandt
- *	All rights reserved.
- *
- * Author: Hartmut Brandt
- *
- * Redistribution of this software and documentation 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 or documentation 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.
- *
- * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED BY THE AUTHOR 
- * AND ITS 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 ITS 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.
- */
-/*
- * $Begemot: libbegemot/rpoll.h,v 1.5 2004/09/21 15:49:26 brandt Exp $
- */
-# ifndef rpoll_h_
-# define rpoll_h_
-
-# ifdef __cplusplus
-extern "C" {
-# endif
-
-typedef void (*poll_f)(int fd, int mask, void *arg);
-typedef void (*timer_f)(int, void *);
-
-int	poll_register(int fd, poll_f func, void *arg, int mask);
-void	poll_unregister(int);
-void	poll_dispatch(int wait);
-int	poll_start_timer(u_int msecs, int repeat, timer_f func, void *arg);
-int	poll_start_utimer(unsigned long long usecs, int repeat, timer_f func,
-    void *arg);
-void	poll_stop_timer(int);
-
-# if defined(POLL_IN)
-#  undef POLL_IN
-# endif
-# if defined(POLL_OUT)
-#  undef POLL_OUT
-# endif
-
-# define POLL_IN	1
-# define POLL_OUT	2
-# define POLL_EXCEPT	4
-
-extern int	rpoll_policy;
-extern int	rpoll_trace;
-
-# ifdef __cplusplus
-}
-# endif
-
-# endif
diff --git a/include.new/rtbl.h b/include.new/rtbl.h
deleted file mode 100644
index 549d3a8..0000000
--- a/include.new/rtbl.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2000,2004 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-/* $Id$ */
-
-#ifndef __rtbl_h__
-#define __rtbl_h__
-
-#ifndef ROKEN_LIB_FUNCTION
-#ifdef _WIN32
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL     __cdecl
-#else
-#define ROKEN_LIB_FUNCTION
-#define ROKEN_LIB_CALL
-#endif
-#endif
-
-#if !defined(__GNUC__) && !defined(__attribute__)
-#define __attribute__(x)
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct rtbl_data;
-typedef struct rtbl_data *rtbl_t;
-
-#define RTBL_ALIGN_LEFT		0
-#define RTBL_ALIGN_RIGHT	1
-
-/* flags */
-#define RTBL_HEADER_STYLE_NONE	1
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_add_column (rtbl_t, const char*, unsigned int);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_add_column_by_id (rtbl_t, unsigned int, const char*, unsigned int);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_add_column_entryv_by_id (rtbl_t table, unsigned int id,
-			      const char *fmt, ...)
-	__attribute__ ((format (printf, 3, 0)));
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_add_column_entry (rtbl_t, const char*, const char*);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_add_column_entryv (rtbl_t, const char*, const char*, ...)
-	__attribute__ ((format (printf, 3, 0)));
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_add_column_entry_by_id (rtbl_t, unsigned int, const char*);
-
-ROKEN_LIB_FUNCTION rtbl_t ROKEN_LIB_CALL
-rtbl_create (void);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-rtbl_destroy (rtbl_t);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_format (rtbl_t, FILE*);
-
-ROKEN_LIB_FUNCTION unsigned int ROKEN_LIB_CALL
-rtbl_get_flags (rtbl_t);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_new_row (rtbl_t);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_set_column_affix_by_id (rtbl_t, unsigned int, const char*, const char*);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_set_column_prefix (rtbl_t, const char*, const char*);
-
-ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
-rtbl_set_flags (rtbl_t, unsigned int);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_set_prefix (rtbl_t, const char*);
-
-ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL
-rtbl_set_separator (rtbl_t, const char*);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __rtbl_h__ */
diff --git a/include.new/rtld_db.h b/include.new/rtld_db.h
deleted file mode 100644
index 7c0936c..0000000
--- a/include.new/rtld_db.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2010 The FreeBSD Foundation 
- * All rights reserved. 
- * 
- * This software was developed by Rui Paulo under sponsorship from the
- * FreeBSD Foundation. 
- *  
- * 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. 
- * 
- * 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: releng/10.2/lib/librtld_db/rtld_db.h 269720 2014-08-08 14:53:01Z markj $
- */ 
-
-#ifndef _RTLD_DB_H_
-#define _RTLD_DB_H_
-
-#include <sys/param.h>
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-
-#define	RD_VERSION	1
-
-typedef enum {
-	RD_OK,
-	RD_ERR,
-	RD_DBERR,
-	RD_NOCAPAB,
-	RD_NODYNAM,
-	RD_NOBASE,
-	RD_NOMAPS
-} rd_err_e;
-
-typedef struct rd_agent {
-	struct proc_handle *rda_php;
-	uintptr_t rda_dlactivity_addr;
-	uintptr_t rda_preinit_addr;
-	uintptr_t rda_postinit_addr;
-} rd_agent_t;
-
-typedef struct rd_loadobj {
-	uintptr_t	rdl_saddr;		/* start address */
-	uintptr_t	rdl_eaddr;		/* end address */
-	uint32_t	rdl_offset;
-	uint8_t		rdl_prot;
-#define RD_RDL_R	0x01
-#define RD_RDL_W	0x02
-#define RD_RDL_X	0x04
-	enum {
-		RDL_TYPE_NONE	= 0,
-		RDL_TYPE_DEF,
-		RDL_TYPE_VNODE,
-		RDL_TYPE_SWAP,
-		RDL_TYPE_DEV,
-		/* XXX some types missing */
-		RDL_TYPE_UNKNOWN = 255
-	} rdl_type;
-	unsigned char	rdl_path[PATH_MAX];
-} rd_loadobj_t;
-
-typedef enum {
-	RD_NONE = 0,
-	RD_PREINIT,
-	RD_POSTINIT,
-	RD_DLACTIVITY
-} rd_event_e;
-
-typedef enum {
-	RD_NOTIFY_BPT,
-	RD_NOTIFY_AUTOBPT,
-	RD_NOTIFY_SYSCALL
-} rd_notify_e;
-
-typedef struct rd_notify {
-	rd_notify_e type;
-	union {
-		uintptr_t bptaddr;
-		long      syscallno;
-	} u;
-} rd_notify_t;
-
-typedef enum {
-	RD_NOSTATE = 0,
-	RD_CONSISTENT,
-	RD_ADD,
-	RD_DELETE
-} rd_state_e;
-
-typedef struct rd_event_msg {
-	rd_event_e type;
-	union {
-		rd_state_e state;
-	} u;
-} rd_event_msg_t;
-
-typedef enum {
-	RD_RESOLVE_NONE,
-	RD_RESOLVE_STEP,
-	RD_RESOLVE_TARGET,
-	RD_RESOLVE_TARGET_STEP
-} rd_skip_e;
-
-typedef struct rd_plt_info {
-	rd_skip_e pi_skip_method;
-	long	  pi_nstep;
-	uintptr_t pi_target;
-	uintptr_t pi_baddr;
-	unsigned int pi_flags;
-} rd_plt_info_t;
-
-#define RD_FLG_PI_PLTBOUND	0x0001
-
-__BEGIN_DECLS
-
-struct proc_handle;
-void		rd_delete(rd_agent_t *);
-const char 	*rd_errstr(rd_err_e);
-rd_err_e	rd_event_addr(rd_agent_t *, rd_event_e, rd_notify_t *);
-rd_err_e	rd_event_enable(rd_agent_t *, int);
-rd_err_e	rd_event_getmsg(rd_agent_t *, rd_event_msg_t *);
-rd_err_e	rd_init(int);
-typedef int rl_iter_f(const rd_loadobj_t *, void *);
-rd_err_e	rd_loadobj_iter(rd_agent_t *, rl_iter_f *, void *);
-void		rd_log(const int);
-rd_agent_t 	*rd_new(struct proc_handle *);
-rd_err_e	rd_objpad_enable(rd_agent_t *, size_t);
-struct proc;
-rd_err_e	rd_plt_resolution(rd_agent_t *, uintptr_t, struct proc *,
-		    uintptr_t, rd_plt_info_t *);
-rd_err_e	rd_reset(rd_agent_t *);
-
-__END_DECLS
-
-#endif /* _RTLD_DB_H_ */
diff --git a/include.new/runetype.h b/include.new/runetype.h
deleted file mode 100644
index 27ad94c..0000000
--- a/include.new/runetype.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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. 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.
- *
- *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/runetype.h 232620 2012-03-06 20:15:23Z dim $
- */
-
-#ifndef	_RUNETYPE_H_
-#define	_RUNETYPE_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#define	_CACHED_RUNES	(1 <<8 )	/* Must be a power of 2 */
-#define	_CRMASK		(~(_CACHED_RUNES - 1))
-
-/*
- * The lower 8 bits of runetype[] contain the digit value of the rune.
- */
-typedef struct {
-	__rune_t	__min;		/* First rune of the range */
-	__rune_t	__max;		/* Last rune (inclusive) of the range */
-	__rune_t	__map;		/* What first maps to in maps */
-	unsigned long	*__types;	/* Array of types in range */
-} _RuneEntry;
-
-typedef struct {
-	int		__nranges;	/* Number of ranges stored */
-	_RuneEntry	*__ranges;	/* Pointer to the ranges */
-} _RuneRange;
-
-typedef struct {
-	char		__magic[8];	/* Magic saying what version we are */
-	char		__encoding[32];	/* ASCII name of this encoding */
-
-	__rune_t	(*__sgetrune)(const char *, __size_t, char const **);
-	int		(*__sputrune)(__rune_t, char *, __size_t, char **);
-	__rune_t	__invalid_rune;
-
-	unsigned long	__runetype[_CACHED_RUNES];
-	__rune_t	__maplower[_CACHED_RUNES];
-	__rune_t	__mapupper[_CACHED_RUNES];
-
-	/*
-	 * The following are to deal with Runes larger than _CACHED_RUNES - 1.
-	 * Their data is actually contiguous with this structure so as to make
-	 * it easier to read/write from/to disk.
-	 */
-	_RuneRange	__runetype_ext;
-	_RuneRange	__maplower_ext;
-	_RuneRange	__mapupper_ext;
-
-	void		*__variable;	/* Data which depends on the encoding */
-	int		__variable_len;	/* how long that data is */
-} _RuneLocale;
-
-#define	_RUNE_MAGIC_1	"RuneMagi"	/* Indicates version 0 of RuneLocale */
-__BEGIN_DECLS
-extern const _RuneLocale _DefaultRuneLocale;
-extern const _RuneLocale *_CurrentRuneLocale;
-#if defined(__NO_TLS) || defined(__RUNETYPE_INTERNAL)
-extern const _RuneLocale *__getCurrentRuneLocale(void);
-#else
-extern _Thread_local const _RuneLocale *_ThreadRuneLocale;
-static __inline const _RuneLocale *__getCurrentRuneLocale(void)
-{
-
-	if (_ThreadRuneLocale) 
-		return _ThreadRuneLocale;
-	if (_CurrentRuneLocale) 
-		return _CurrentRuneLocale;
-	return &_DefaultRuneLocale;
-}
-#endif /* __NO_TLS || __RUNETYPE_INTERNAL */
-#define _CurrentRuneLocale (__getCurrentRuneLocale())
-__END_DECLS
-
-#endif	/* !_RUNETYPE_H_ */
diff --git a/include.new/sched.h b/include.new/sched.h
deleted file mode 100644
index 2b16c63..0000000
--- a/include.new/sched.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/*-
- * Copyright (c) 1996, 1997
- *      HD Associates, Inc.  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 HD Associates, Inc
- *      and Jukka Antero Ukkonen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES 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 HD ASSOCIATES 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.
- */
-
-/*-
- * Copyright (c) 2002-2008, Jeffrey Roberson <jeff@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/sched.h 253604 2013-07-24 09:45:31Z avg $
- */
-
-#ifndef _SCHED_H_
-#define	_SCHED_H_
-
-#ifdef _KERNEL
-/*
- * General scheduling info.
- *
- * sched_load:
- *	Total runnable non-ithread threads in the system.
- *
- * sched_runnable:
- *	Runnable threads for this processor.
- */
-int	sched_load(void);
-int	sched_rr_interval(void);
-int	sched_runnable(void);
-
-/* 
- * Proc related scheduling hooks.
- */
-void	sched_exit(struct proc *p, struct thread *childtd);
-void	sched_fork(struct thread *td, struct thread *childtd);
-void	sched_fork_exit(struct thread *td);
-void	sched_class(struct thread *td, int class);
-void	sched_nice(struct proc *p, int nice);
-
-/*
- * Threads are switched in and out, block on resources, have temporary
- * priorities inherited from their procs, and use up cpu time.
- */
-void	sched_exit_thread(struct thread *td, struct thread *child);
-void	sched_fork_thread(struct thread *td, struct thread *child);
-void	sched_lend_prio(struct thread *td, u_char prio);
-void	sched_lend_user_prio(struct thread *td, u_char pri);
-fixpt_t	sched_pctcpu(struct thread *td);
-void	sched_prio(struct thread *td, u_char prio);
-void	sched_sleep(struct thread *td, int prio);
-void	sched_switch(struct thread *td, struct thread *newtd, int flags);
-void	sched_throw(struct thread *td);
-void	sched_unlend_prio(struct thread *td, u_char prio);
-void	sched_user_prio(struct thread *td, u_char prio);
-void	sched_userret(struct thread *td);
-void	sched_wakeup(struct thread *td);
-void	sched_preempt(struct thread *td);
-#ifdef	RACCT
-#ifdef	SCHED_4BSD
-fixpt_t	sched_pctcpu_delta(struct thread *td);
-#endif
-#endif
-
-/*
- * Threads are moved on and off of run queues
- */
-void	sched_add(struct thread *td, int flags);
-void	sched_clock(struct thread *td);
-void	sched_rem(struct thread *td);
-void	sched_tick(int cnt);
-void	sched_relinquish(struct thread *td);
-struct thread *sched_choose(void);
-void	sched_idletd(void *);
-
-/*
- * Binding makes cpu affinity permanent while pinning is used to temporarily
- * hold a thread on a particular CPU.
- */
-void	sched_bind(struct thread *td, int cpu);
-static __inline void sched_pin(void);
-void	sched_unbind(struct thread *td);
-static __inline void sched_unpin(void);
-int	sched_is_bound(struct thread *td);
-void	sched_affinity(struct thread *td);
-
-/*
- * These procedures tell the process data structure allocation code how
- * many bytes to actually allocate.
- */
-int	sched_sizeof_proc(void);
-int	sched_sizeof_thread(void);
-
-/*
- * This routine provides a consistent thread name for use with KTR graphing
- * functions.
- */
-char	*sched_tdname(struct thread *td);
-#ifdef KTR
-void	sched_clear_tdname(struct thread *td);
-#endif
-
-static __inline void
-sched_pin(void)
-{
-	curthread->td_pinned++;
-	__compiler_membar();
-}
-
-static __inline void
-sched_unpin(void)
-{
-	__compiler_membar();
-	curthread->td_pinned--;
-}
-
-/* sched_add arguments (formerly setrunqueue) */
-#define	SRQ_BORING	0x0000		/* No special circumstances. */
-#define	SRQ_YIELDING	0x0001		/* We are yielding (from mi_switch). */
-#define	SRQ_OURSELF	0x0002		/* It is ourself (from mi_switch). */
-#define	SRQ_INTR	0x0004		/* It is probably urgent. */
-#define	SRQ_PREEMPTED	0x0008		/* has been preempted.. be kind */
-#define	SRQ_BORROWING	0x0010		/* Priority updated due to prio_lend */
-
-/* Scheduler stats. */
-#ifdef SCHED_STATS
-DPCPU_DECLARE(long, sched_switch_stats[SWT_COUNT]);
-
-#define	SCHED_STAT_DEFINE_VAR(name, ptr, descr)				\
-static void name ## _add_proc(void *dummy __unused)			\
-{									\
-									\
-	SYSCTL_ADD_PROC(NULL,						\
-	    SYSCTL_STATIC_CHILDREN(_kern_sched_stats), OID_AUTO,	\
-	    #name, CTLTYPE_LONG|CTLFLAG_RD|CTLFLAG_MPSAFE,		\
-	    ptr, 0, sysctl_dpcpu_long, "LU", descr);			\
-}									\
-SYSINIT(name, SI_SUB_LAST, SI_ORDER_MIDDLE, name ## _add_proc, NULL);
-
-#define	SCHED_STAT_DEFINE(name, descr)					\
-    DPCPU_DEFINE(unsigned long, name);					\
-    SCHED_STAT_DEFINE_VAR(name, &DPCPU_NAME(name), descr)
-/*
- * Sched stats are always incremented in critical sections so no atomic
- * is necesssary to increment them.
- */
-#define SCHED_STAT_INC(var)     DPCPU_GET(var)++;
-#else
-#define	SCHED_STAT_DEFINE_VAR(name, descr, ptr)
-#define	SCHED_STAT_DEFINE(name, descr)
-#define SCHED_STAT_INC(var)			(void)0
-#endif
-
-/*
- * Fixup scheduler state for proc0 and thread0
- */
-void schedinit(void);
-#endif /* _KERNEL */
-
-/* POSIX 1003.1b Process Scheduling */
-
-/*
- * POSIX scheduling policies
- */
-#define SCHED_FIFO      1
-#define SCHED_OTHER     2
-#define SCHED_RR        3
-
-struct sched_param {
-        int     sched_priority;
-};
-
-/*
- * POSIX scheduling declarations for userland.
- */
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _PID_T_DECLARED
-typedef __pid_t         pid_t;
-#define _PID_T_DECLARED
-#endif
-
-struct timespec;
-
-__BEGIN_DECLS
-int     sched_get_priority_max(int);
-int     sched_get_priority_min(int);
-int     sched_getparam(pid_t, struct sched_param *);
-int     sched_getscheduler(pid_t);
-int     sched_rr_get_interval(pid_t, struct timespec *);
-int     sched_setparam(pid_t, const struct sched_param *);
-int     sched_setscheduler(pid_t, int, const struct sched_param *);
-int     sched_yield(void);
-__END_DECLS
-
-#endif
-#endif /* !_SCHED_H_ */
diff --git a/include.new/sdp.h b/include.new/sdp.h
deleted file mode 100644
index 9214ea4..0000000
--- a/include.new/sdp.h
+++ /dev/null
@@ -1,694 +0,0 @@
-/*
- * sdp.h
- *
- * Copyright (c) 2001-2003 Maksim Yevmenkin <m_evmenkin@yahoo.com>
- * 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.
- *
- * 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.
- *
- * $Id: sdp.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/lib/libsdp/sdp.h 226426 2011-10-16 08:45:16Z ed $
- */
-
-#ifndef _SDP_H_
-#define _SDP_H_
-
-__BEGIN_DECLS
-
-/*
- * Data representation (page 349)
- */
-
-/* Nil, the null type */
-#define SDP_DATA_NIL					0x00
-
-/* Unsigned integer */
-#define SDP_DATA_UINT8					0x08
-#define SDP_DATA_UINT16					0x09
-#define SDP_DATA_UINT32					0x0A
-#define SDP_DATA_UINT64					0x0B
-#define SDP_DATA_UINT128				0x0C
-
-/* Signed two's-complement integer */
-#define SDP_DATA_INT8					0x10
-#define SDP_DATA_INT16					0x11
-#define SDP_DATA_INT32					0x12
-#define SDP_DATA_INT64					0x13
-#define SDP_DATA_INT128					0x14
-
-/* UUID, a universally unique identifier */
-#define SDP_DATA_UUID16					0x19
-#define SDP_DATA_UUID32					0x1A
-#define SDP_DATA_UUID128				0x1C
-
-/* Text string */
-#define SDP_DATA_STR8					0x25
-#define SDP_DATA_STR16					0x26
-#define SDP_DATA_STR32					0x27
-
-/* Boolean */
-#define SDP_DATA_BOOL					0x28
-
-/* 
- * Data element sequence.
- * A data element whose data field is a sequence of data elements
- */
-#define SDP_DATA_SEQ8					0x35
-#define SDP_DATA_SEQ16					0x36
-#define SDP_DATA_SEQ32					0x37
-
-/*
- * Data element alternative.
- * A data element whose data field is a sequence of data elements from 
- * which one data element is to be selected.
- */
-#define SDP_DATA_ALT8					0x3D 
-#define SDP_DATA_ALT16					0x3E
-#define SDP_DATA_ALT32					0x3F
-
-/* URL, a uniform resource locator */
-#define SDP_DATA_URL8					0x45
-#define SDP_DATA_URL16					0x46
-#define SDP_DATA_URL32					0x47
-
-/*
- * Protocols UUID (short) https://www.bluetooth.org/assigned-numbers/service_discovery.php
- * BASE UUID 00000000-0000-1000-8000-00805F9B34FB
- */
-
-#define SDP_UUID_PROTOCOL_SDP				0x0001
-#define SDP_UUID_PROTOCOL_UDP				0x0002
-#define SDP_UUID_PROTOCOL_RFCOMM			0x0003
-#define SDP_UUID_PROTOCOL_TCP				0x0004
-#define SDP_UUID_PROTOCOL_TCS_BIN			0x0005
-#define SDP_UUID_PROTOCOL_TCS_AT			0x0006
-#define SDP_UUID_PROTOCOL_OBEX				0x0008
-#define SDP_UUID_PROTOCOL_IP				0x0009
-#define SDP_UUID_PROTOCOL_FTP				0x000A
-#define SDP_UUID_PROTOCOL_HTTP				0x000C
-#define SDP_UUID_PROTOCOL_WSP				0x000E
-#define SDP_UUID_PROTOCOL_BNEP				0x000F
-#define SDP_UUID_PROTOCOL_UPNP				0x0010
-#define SDP_UUID_PROTOCOL_HIDP				0x0011
-#define SDP_UUID_PROTOCOL_HARDCOPY_CONTROL_CHANNEL	0x0012
-#define SDP_UUID_PROTOCOL_HARDCOPY_DATA_CHANNEL		0x0014
-#define SDP_UUID_PROTOCOL_HARDCOPY_NOTIFICATION		0x0016
-#define SDP_UUID_PROTOCOL_AVCTP				0x0017
-#define SDP_UUID_PROTOCOL_AVDTP				0x0019
-#define SDP_UUID_PROTOCOL_CMPT				0x001B
-#define SDP_UUID_PROTOCOL_UDI_C_PLANE			0x001D
-#define SDP_UUID_PROTOCOL_L2CAP				0x0100
-
-/*
- * Service class IDs https://www.bluetooth.org/assigned-numbers/service_discovery.php
- */
-
-#define SDP_SERVICE_CLASS_SERVICE_DISCOVERY_SERVER	0x1000
-#define SDP_SERVICE_CLASS_BROWSE_GROUP_DESCRIPTOR	0x1001
-#define SDP_SERVICE_CLASS_PUBLIC_BROWSE_GROUP		0x1002
-#define SDP_SERVICE_CLASS_SERIAL_PORT			0x1101
-#define SDP_SERVICE_CLASS_LAN_ACCESS_USING_PPP		0x1102
-#define SDP_SERVICE_CLASS_DIALUP_NETWORKING		0x1103
-#define SDP_SERVICE_CLASS_IR_MC_SYNC			0x1104
-#define SDP_SERVICE_CLASS_OBEX_OBJECT_PUSH		0x1105
-#define SDP_SERVICE_CLASS_OBEX_FILE_TRANSFER		0x1106
-#define SDP_SERVICE_CLASS_IR_MC_SYNC_COMMAND		0x1107
-#define SDP_SERVICE_CLASS_HEADSET			0x1108
-#define SDP_SERVICE_CLASS_CORDLESS_TELEPHONY		0x1109
-#define SDP_SERVICE_CLASS_AUDIO_SOURCE			0x110A
-#define SDP_SERVICE_CLASS_AUDIO_SINK			0x110B
-#define SDP_SERVICE_CLASS_AV_REMOTE_CONTROL_TARGET	0x110C
-#define SDP_SERVICE_CLASS_ADVANCED_AUDIO_DISTRIBUTION	0x110D
-#define SDP_SERVICE_CLASS_AV_REMOTE_CONTROL		0x110E
-#define SDP_SERVICE_CLASS_VIDEO_CONFERENCING		0x110F
-#define SDP_SERVICE_CLASS_INTERCOM			0x1110
-#define SDP_SERVICE_CLASS_FAX				0x1111
-#define SDP_SERVICE_CLASS_HEADSET_AUDIO_GATEWAY		0x1112
-#define SDP_SERVICE_CLASS_WAP				0x1113
-#define SDP_SERVICE_CLASS_WAP_CLIENT			0x1114
-#define SDP_SERVICE_CLASS_PANU				0x1115
-#define SDP_SERVICE_CLASS_NAP				0x1116
-#define SDP_SERVICE_CLASS_GN				0x1117
-#define SDP_SERVICE_CLASS_DIRECT_PRINTING		0x1118
-#define SDP_SERVICE_CLASS_REFERENCE_PRINTING		0x1119
-#define SDP_SERVICE_CLASS_IMAGING			0x111A
-#define SDP_SERVICE_CLASS_IMAGING_RESPONDER		0x111B
-#define SDP_SERVICE_CLASS_IMAGING_AUTOMATIC_ARCHIVE	0x111C
-#define SDP_SERVICE_CLASS_IMAGING_REFERENCED_OBJECTS	0x111D
-#define SDP_SERVICE_CLASS_HANDSFREE			0x111E
-#define SDP_SERVICE_CLASS_HANDSFREE_AUDIO_GATEWAY	0x111F
-#define SDP_SERVICE_CLASS_DIRECT_PRINTING_REFERENCE_OBJECTS	0x1120
-#define SDP_SERVICE_CLASS_REFLECTED_UI			0x1121
-#define SDP_SERVICE_CLASS_BASIC_PRINTING		0x1122
-#define SDP_SERVICE_CLASS_PRINTING_STATUS		0x1123
-#define SDP_SERVICE_CLASS_HUMAN_INTERFACE_DEVICE	0x1124
-#define SDP_SERVICE_CLASS_HARDCOPY_CABLE_REPLACEMENT	0x1125
-#define SDP_SERVICE_CLASS_HCR_PRINT			0x1126
-#define SDP_SERVICE_CLASS_HCR_SCAN			0x1127
-#define SDP_SERVICE_CLASS_COMMON_ISDN_ACCESS		0x1128
-#define SDP_SERVICE_CLASS_VIDEO_CONFERENCING_GW		0x1129
-#define SDP_SERVICE_CLASS_UDI_MT			0x112A
-#define SDP_SERVICE_CLASS_UDI_TA			0x112B
-#define SDP_SERVICE_CLASS_AUDIO_VIDEO			0x112C
-#define SDP_SERVICE_CLASS_SIM_ACCESS			0x112D
-#define SDP_SERVICE_CLASS_PHONEBOOK_ACCESS_PCE		0x112E
-#define SDP_SERVICE_CLASS_PHONEBOOK_ACCESS_PSE		0x112F
-#define SDP_SERVICE_CLASS_PHONEBOOK_ACCESS		0x1130
-#define SDP_SERVICE_CLASS_PNP_INFORMATION		0x1200
-#define SDP_SERVICE_CLASS_GENERIC_NETWORKING		0x1201
-#define SDP_SERVICE_CLASS_GENERIC_FILE_TRANSFER		0x1202
-#define SDP_SERVICE_CLASS_GENERIC_AUDIO			0x1203
-#define SDP_SERVICE_CLASS_GENERIC_TELEPHONY		0x1204
-#define SDP_SERVICE_CLASS_UPNP				0x1205
-#define SDP_SERVICE_CLASS_UPNP_IP			0x1206
-#define SDP_SERVICE_CLASS_ESDP_UPNP_IP_PAN		0x1300
-#define SDP_SERVICE_CLASS_ESDP_UPNP_IP_LAP		0x1301
-#define SDP_SERVICE_CLASS_ESDP_UPNP_L2CAP		0x1302
-#define SDP_SERVICE_CLASS_VIDEO_SOURCE			0x1303
-#define SDP_SERVICE_CLASS_VIDEO_SINK			0x1304
-#define SDP_SERVICE_CLASS_VIDEO_DISTRIBUTION		0x1305
-
-/*
- * Universal attribute definitions (page 366) and
- * https://www.bluetooth.org/assigned-numbers/service_discovery.php
- */
-
-#define SDP_ATTR_RANGE(lo, hi) \
-	(uint32_t)(((uint16_t)(lo) << 16) | ((uint16_t)(hi)))
-
-#define SDP_ATTR_SERVICE_RECORD_HANDLE			0x0000
-#define SDP_ATTR_SERVICE_CLASS_ID_LIST			0x0001
-#define SDP_ATTR_SERVICE_RECORD_STATE			0x0002
-#define SDP_ATTR_SERVICE_ID				0x0003
-#define SDP_ATTR_PROTOCOL_DESCRIPTOR_LIST		0x0004
-#define SDP_ATTR_BROWSE_GROUP_LIST			0x0005
-#define SDP_ATTR_LANGUAGE_BASE_ATTRIBUTE_ID_LIST	0x0006
-#define SDP_ATTR_SERVICE_INFO_TIME_TO_LIVE		0x0007
-#define SDP_ATTR_SERVICE_AVAILABILITY			0x0008
-#define SDP_ATTR_BLUETOOTH_PROFILE_DESCRIPTOR_LIST	0x0009
-#define SDP_ATTR_DOCUMENTATION_URL			0x000A
-#define SDP_ATTR_CLIENT_EXECUTABLE_URL			0x000B
-#define SDP_ATTR_ICON_URL				0x000C
-#define SDP_ATTR_ADDITIONAL_PROTOCOL_DESCRIPTOR_LISTS	0x000D
-#define SDP_ATTR_GROUP_ID				0x0200
-#define SDP_ATTR_IP_SUBNET				0x0200
-#define SDP_ATTR_VERSION_NUMBER_LIST			0x0200
-#define SDP_ATTR_SERVICE_DATABASE_STATE			0x0201
-#define SDP_ATTR_SERVICE_VERSION			0x0300
-#define SDP_ATTR_EXTERNAL_NETWORK			0x0301
-#define SDP_ATTR_NETWORK				0x0301
-#define SDP_ATTR_SUPPORTED_DATA_STORES_LIST		0x0301
-#define SDP_ATTR_FAX_CLASS1_SUPPORT			0x0302
-#define SDP_ATTR_REMOTE_AUDIO_VOLUME_CONTROL		0x0302
-#define SDP_ATTR_FAX_CLASS20_SUPPORT			0x0303
-#define SDP_ATTR_SUPPORTED_FORMATS_LIST			0x0303
-#define SDP_ATTR_FAX_CLASS2_SUPPORT			0x0304
-#define SDP_ATTR_AUDIO_FEEDBACK_SUPPORT			0x0305
-#define SDP_ATTR_NETWORK_ADDRESS			0x0306
-#define SDP_ATTR_WAP_GATEWAY				0x0307
-#define SDP_ATTR_HOME_PAGE_URL				0x0308
-#define SDP_ATTR_WAP_STACK_TYPE				0x0309
-#define SDP_ATTR_SECURITY_DESCRIPTION			0x030A
-#define SDP_ATTR_NET_ACCESS_TYPE			0x030B
-#define SDP_ATTR_MAX_NET_ACCESS_RATE			0x030C
-#define SDP_ATTR_IPV4_SUBNET				0x030D
-#define SDP_ATTR_IPV6_SUBNET				0x030E
-#define SDP_ATTR_SUPPORTED_CAPABALITIES			0x0310
-#define SDP_ATTR_SUPPORTED_FEATURES			0x0311
-#define SDP_ATTR_SUPPORTED_FUNCTIONS			0x0312
-#define SDP_ATTR_TOTAL_IMAGING_DATA_CAPACITY		0x0313
-#define SDP_ATTR_SUPPORTED_REPOSITORIES			0x0314
-
-/*
- * The offset must be added to the attribute ID base (contained in the 
- * LANGUAGE_BASE_ATTRIBUTE_ID_LIST attribute) in order to compute the 
- * attribute ID for these attributes.
- */
-
-#define SDP_ATTR_PRIMARY_LANGUAGE_BASE_ID		0x0100
-#define SDP_ATTR_SERVICE_NAME_OFFSET			0x0000
-#define SDP_ATTR_SERVICE_DESCRIPTION_OFFSET		0x0001
-#define SDP_ATTR_PROVIDER_NAME_OFFSET			0x0002
-
-/*
- * Protocol data unit (PDU) format (page 352)
- */
-
-#define SDP_PDU_ERROR_RESPONSE				0x01
-#define SDP_PDU_SERVICE_SEARCH_REQUEST			0x02
-#define SDP_PDU_SERVICE_SEARCH_RESPONSE			0x03
-#define SDP_PDU_SERVICE_ATTRIBUTE_REQUEST		0x04
-#define SDP_PDU_SERVICE_ATTRIBUTE_RESPONSE		0x05
-#define SDP_PDU_SERVICE_SEARCH_ATTRIBUTE_REQUEST	0x06
-#define SDP_PDU_SERVICE_SEARCH_ATTRIBUTE_RESPONSE	0x07
-
-struct sdp_pdu {
-	uint8_t		pid;	/* PDU ID - SDP_PDU_xxx */
-	uint16_t	tid;	/* transaction ID */
-	uint16_t	len;	/* parameters length (in bytes) */
-} __attribute__ ((packed));
-typedef struct sdp_pdu		sdp_pdu_t;
-typedef struct sdp_pdu *	sdp_pdu_p;
-
-/*
- * Error codes for SDP_PDU_ERROR_RESPONSE
- */
-
-#define SDP_ERROR_CODE_INVALID_SDP_VERSION		0x0001
-#define SDP_ERROR_CODE_INVALID_SERVICE_RECORD_HANDLE	0x0002
-#define SDP_ERROR_CODE_INVALID_REQUEST_SYNTAX		0x0003
-#define SDP_ERROR_CODE_INVALID_PDU_SIZE			0x0004
-#define SDP_ERROR_CODE_INVALID_CONTINUATION_STATE	0x0005
-#define SDP_ERROR_CODE_INSUFFICIENT_RESOURCES		0x0006
-
-/*
- * SDP int128/uint128 parameter
- */
-
-struct int128 {
-	int8_t	b[16];
-};
-typedef struct int128	int128_t;
-typedef struct int128	uint128_t;
-
-/*
- * SDP attribute
- */
-
-struct sdp_attr {
-	uint16_t	 flags;
-#define SDP_ATTR_OK		(0 << 0)
-#define SDP_ATTR_INVALID	(1 << 0)
-#define SDP_ATTR_TRUNCATED	(1 << 1)
-	uint16_t	 attr;  /* SDP_ATTR_xxx */
-	uint32_t	 vlen;	/* length of the value[] in bytes */
-	uint8_t		*value;	/* base pointer */
-};
-typedef struct sdp_attr		sdp_attr_t;
-typedef struct sdp_attr *	sdp_attr_p;
-
-/******************************************************************************
- * User interface
- *****************************************************************************/
-
-/* Inline versions of get/put byte/short/long. Pointer is advanced */
-#define SDP_GET8(b, cp) { \
-	const uint8_t *t_cp = (const uint8_t *)(cp); \
-	(b) = *t_cp; \
-	(cp) ++; \
-}
-
-#define SDP_GET16(s, cp) { \
-	const uint8_t *t_cp = (const uint8_t *)(cp); \
-	(s) = ((uint16_t)t_cp[0] << 8) \
-	    | ((uint16_t)t_cp[1]) \
-	    ; \
-	(cp) += 2; \
-}
-
-#define SDP_GET32(l, cp) { \
-	const uint8_t *t_cp = (const uint8_t *)(cp); \
-	(l) = ((uint32_t)t_cp[0] << 24) \
-	    | ((uint32_t)t_cp[1] << 16) \
-	    | ((uint32_t)t_cp[2] << 8) \
-	    | ((uint32_t)t_cp[3]) \
-	    ; \
-	(cp) += 4; \
-}
-
-#define SDP_GET64(l, cp) { \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	(l) = ((uint64_t)t_cp[0] << 56) \
-	    | ((uint64_t)t_cp[1] << 48) \
-	    | ((uint64_t)t_cp[2] << 40) \
-	    | ((uint64_t)t_cp[3] << 32) \
-	    | ((uint64_t)t_cp[4] << 24) \
-	    | ((uint64_t)t_cp[5] << 16) \
-	    | ((uint64_t)t_cp[6] << 8) \
-	    | ((uint64_t)t_cp[7]) \
-	    ; \
-	(cp) += 8; \
-}
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define SDP_GET128(l, cp) { \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	(l)->b[15] = *t_cp++; \
-	(l)->b[14] = *t_cp++; \
-	(l)->b[13] = *t_cp++; \
-	(l)->b[12] = *t_cp++; \
-	(l)->b[11] = *t_cp++; \
-	(l)->b[10] = *t_cp++; \
-	(l)->b[9]  = *t_cp++; \
-	(l)->b[8]  = *t_cp++; \
-	(l)->b[7]  = *t_cp++; \
-	(l)->b[6]  = *t_cp++; \
-	(l)->b[5]  = *t_cp++; \
-	(l)->b[4]  = *t_cp++; \
-	(l)->b[3]  = *t_cp++; \
-	(l)->b[2]  = *t_cp++; \
-	(l)->b[1]  = *t_cp++; \
-	(l)->b[0]  = *t_cp++; \
-	(cp) += 16; \
-}
-
-#define SDP_GET_UUID128(l, cp) { \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	(l)->b[0]  = *t_cp++; \
-	(l)->b[1]  = *t_cp++; \
-	(l)->b[2]  = *t_cp++; \
-	(l)->b[3]  = *t_cp++; \
-	(l)->b[4]  = *t_cp++; \
-	(l)->b[5]  = *t_cp++; \
-	(l)->b[6]  = *t_cp++; \
-	(l)->b[7]  = *t_cp++; \
-	(l)->b[8]  = *t_cp++; \
-	(l)->b[9]  = *t_cp++; \
-	(l)->b[10] = *t_cp++; \
-	(l)->b[11] = *t_cp++; \
-	(l)->b[12] = *t_cp++; \
-	(l)->b[13] = *t_cp++; \
-	(l)->b[14] = *t_cp++; \
-	(l)->b[15] = *t_cp++; \
-	(cp) += 16; \
-}
-#elif BYTE_ORDER == BIG_ENDIAN
-#define SDP_GET128(l, cp) { \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	(l)->b[0]  = *t_cp++; \
-	(l)->b[1]  = *t_cp++; \
-	(l)->b[2]  = *t_cp++; \
-	(l)->b[3]  = *t_cp++; \
-	(l)->b[4]  = *t_cp++; \
-	(l)->b[5]  = *t_cp++; \
-	(l)->b[6]  = *t_cp++; \
-	(l)->b[7]  = *t_cp++; \
-	(l)->b[8]  = *t_cp++; \
-	(l)->b[9]  = *t_cp++; \
-	(l)->b[10] = *t_cp++; \
-	(l)->b[11] = *t_cp++; \
-	(l)->b[12] = *t_cp++; \
-	(l)->b[13] = *t_cp++; \
-	(l)->b[14] = *t_cp++; \
-	(l)->b[15] = *t_cp++; \
-	(cp) += 16; \
-}
-
-#define	SDP_GET_UUID128(l, cp)	SDP_GET128(l, cp)
-#else
-#error	"Unsupported BYTE_ORDER"
-#endif /* BYTE_ORDER */
-
-#define SDP_PUT8(b, cp) { \
-	register uint8_t t_b = (uint8_t)(b); \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	*t_cp = t_b; \
-	(cp) ++; \
-}
-
-#define SDP_PUT16(s, cp) { \
-	register uint16_t t_s = (uint16_t)(s); \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	*t_cp++ = t_s >> 8; \
-	*t_cp   = t_s; \
-	(cp) += 2; \
-}
-
-#define SDP_PUT32(l, cp) { \
-	register uint32_t t_l = (uint32_t)(l); \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += 4; \
-}
-
-#define SDP_PUT64(l, cp) { \
-	register uint64_t t_l = (uint64_t)(l); \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	*t_cp++ = t_l >> 56; \
-	*t_cp++ = t_l >> 48; \
-	*t_cp++ = t_l >> 40; \
-	*t_cp++ = t_l >> 32; \
-	*t_cp++ = t_l >> 24; \
-	*t_cp++ = t_l >> 16; \
-	*t_cp++ = t_l >> 8; \
-	*t_cp   = t_l; \
-	(cp) += 8; \
-}
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define SDP_PUT128(l, cp) { \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	*t_cp++ = (l)->b[15]; \
-	*t_cp++ = (l)->b[14]; \
-	*t_cp++ = (l)->b[13]; \
-	*t_cp++ = (l)->b[12]; \
-	*t_cp++ = (l)->b[11]; \
-	*t_cp++ = (l)->b[10]; \
-	*t_cp++ = (l)->b[9];  \
-	*t_cp++ = (l)->b[8];  \
-	*t_cp++ = (l)->b[7];  \
-	*t_cp++ = (l)->b[6];  \
-	*t_cp++ = (l)->b[5];  \
-	*t_cp++ = (l)->b[4];  \
-	*t_cp++ = (l)->b[3];  \
-	*t_cp++ = (l)->b[2];  \
-	*t_cp++ = (l)->b[1];  \
-	*t_cp   = (l)->b[0];  \
-	(cp) += 16; \
-}
-
-#define SDP_PUT_UUID128(l, cp) { \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	*t_cp++ = (l)->b[0];  \
-	*t_cp++ = (l)->b[1];  \
-	*t_cp++ = (l)->b[2];  \
-	*t_cp++ = (l)->b[3];  \
-	*t_cp++ = (l)->b[4];  \
-	*t_cp++ = (l)->b[5];  \
-	*t_cp++ = (l)->b[6];  \
-	*t_cp++ = (l)->b[7];  \
-	*t_cp++ = (l)->b[8];  \
-	*t_cp++ = (l)->b[9];  \
-	*t_cp++ = (l)->b[10]; \
-	*t_cp++ = (l)->b[11]; \
-	*t_cp++ = (l)->b[12]; \
-	*t_cp++ = (l)->b[13]; \
-	*t_cp++ = (l)->b[14]; \
-	*t_cp   = (l)->b[15]; \
-	(cp) += 16; \
-}
-#elif BYTE_ORDER == BIG_ENDIAN
-#define SDP_PUT128(l, cp) { \
-	register uint8_t *t_cp = (uint8_t *)(cp); \
-	*t_cp++ = (l)->b[0];  \
-	*t_cp++ = (l)->b[1];  \
-	*t_cp++ = (l)->b[2];  \
-	*t_cp++ = (l)->b[3];  \
-	*t_cp++ = (l)->b[4];  \
-	*t_cp++ = (l)->b[5];  \
-	*t_cp++ = (l)->b[6];  \
-	*t_cp++ = (l)->b[7];  \
-	*t_cp++ = (l)->b[8];  \
-	*t_cp++ = (l)->b[9];  \
-	*t_cp++ = (l)->b[10]; \
-	*t_cp++ = (l)->b[11]; \
-	*t_cp++ = (l)->b[12]; \
-	*t_cp++ = (l)->b[13]; \
-	*t_cp++ = (l)->b[14]; \
-	*t_cp   = (l)->b[15]; \
-	(cp) += 16; \
-}
-
-#define SDP_PUT_UUID128(l, cp)	SDP_PUT128(l, cp)
-#else
-#error	"Unsupported BYTE_ORDER"
-#endif /* BYTE_ORDER */
-
-void *             sdp_open       (bdaddr_t const *l, bdaddr_t const *r);
-void *             sdp_open_local (char const *control);
-int32_t            sdp_close      (void *xs);
-int32_t            sdp_error      (void *xs);
-
-int32_t            sdp_search     (void *xs,
-                                   uint32_t plen, uint16_t const *pp,
-                                   uint32_t alen, uint32_t const *ap,
-                                   uint32_t vlen, sdp_attr_t *vp);
-
-char const *	   sdp_attr2desc  (uint16_t attr);
-char const *	   sdp_uuid2desc  (uint16_t uuid);
-void               sdp_print      (uint32_t level, uint8_t const *start,
-                                   uint8_t const *end);
-
-/******************************************************************************
- * sdpd interface and Bluetooth profiles data
- *****************************************************************************/
-
-#define SDP_LOCAL_PATH	"/var/run/sdp"
-#define SDP_LOCAL_MTU	4096
-
-/*
- * These are NOT defined in spec and only accepted on control sockets.
- * The response to these request always will be SDP_PDU_ERROR_RESPONSE.
- * The first 2 bytes (after PDU header) is an error code (in network
- * byte order). The rest of the data (pdu->len - 2) is a response data
- * and depend on the request.
- *
- * SDP_PDU_SERVICE_REGISTER_REQUEST
- * 	pdu_header_t	hdr;
- *	u_int16_t	uuid;	service class UUID (network byte order)
- *	bdaddr_t	bdaddr;	local BD_ADDR (or ANY)
- *	profile data[pdu->len - sizeof(uuid) - sizeof(bdaddr)]
- *
- * in successful reponse additional data will contain 4 bytes record handle
- *
- *
- * SDP_PDU_SERVICE_UNREGISTER_REQUEST
- *	pdu_header_t	hdr;
- *	uint32_t	record_handle;	(network byte order)
- * 
- * no additional data in response.
- *
- *
- * SDP_PDU_SERVICE_CHANGE_REQUEST
- * 	pdu_header_t	hdr;
- *	uint32_t	record_handle;	(network byte order)
- *	profile data[pdu->len - sizeof(record_handle)]
- *
- * no additional data in response.
- */
-
-#define SDP_PDU_SERVICE_REGISTER_REQUEST	0x81
-#define SDP_PDU_SERVICE_UNREGISTER_REQUEST	0x82
-#define SDP_PDU_SERVICE_CHANGE_REQUEST		0x83
-
-struct sdp_dun_profile
-{
-	uint8_t	server_channel;
-	uint8_t	audio_feedback_support;
-	uint8_t	reserved[2];
-};
-typedef struct sdp_dun_profile		sdp_dun_profile_t;
-typedef struct sdp_dun_profile *	sdp_dun_profile_p;
-
-struct sdp_ftrn_profile
-{
-	uint8_t	server_channel;
-	uint8_t	reserved[3];
-};
-typedef struct sdp_ftrn_profile		sdp_ftrn_profile_t;
-typedef struct sdp_ftrn_profile *	sdp_ftrn_profile_p;
-
-/* Keep this in sync with sdp_opush_profile */
-struct sdp_irmc_profile
-{
-	uint8_t	server_channel;
-	uint8_t	supported_formats_size;
-	uint8_t	supported_formats[30];
-};
-typedef struct sdp_irmc_profile		sdp_irmc_profile_t;
-typedef struct sdp_irmc_profile *	sdp_irmc_profile_p;
-
-struct sdp_irmc_command_profile
-{
-	uint8_t	server_channel;
-	uint8_t	reserved[3];
-};
-typedef struct sdp_irmc_command_profile		sdp_irmc_command_profile_t;
-typedef struct sdp_irmc_command_profile *	sdp_irmc_command_profile_p;
-
-struct sdp_lan_profile
-{
-	uint8_t		server_channel;
-	uint8_t		load_factor;
-	uint8_t		reserved;
-	uint8_t		ip_subnet_radius;
-	uint32_t	ip_subnet;
-};
-typedef struct sdp_lan_profile		sdp_lan_profile_t;
-typedef struct sdp_lan_profile *	sdp_lan_profile_p;
-
-/* Keep this in sync with sdp_irmc_profile */
-struct sdp_opush_profile
-{
-	uint8_t	server_channel;
-	uint8_t	supported_formats_size;
-	uint8_t	supported_formats[30];
-};
-typedef struct sdp_opush_profile	sdp_opush_profile_t;
-typedef struct sdp_opush_profile *	sdp_opush_profile_p;
-
-struct sdp_sp_profile
-{
-	uint8_t	server_channel;
-	uint8_t	reserved[3];
-};
-typedef struct sdp_sp_profile	sdp_sp_profile_t;
-typedef struct sdp_sp_profile *	sdp_sp_profile_p;
-
-struct sdp_nap_profile
-{
-	uint8_t		reserved;
-	uint8_t		load_factor;
-	uint16_t	psm;			/* HBO */
-	uint16_t	security_description;	/* HBO */
-	uint16_t	net_access_type;	/* HBO */
-	uint32_t	max_net_access_rate;	/* HBO */
-};
-typedef struct sdp_nap_profile		sdp_nap_profile_t;
-typedef struct sdp_nap_profile *	sdp_nap_profile_p;
-
-struct sdp_gn_profile
-{	
-	uint8_t		reserved;
-	uint8_t		load_factor;
-	uint16_t	psm;			/* HBO */
-	uint16_t	security_description;	/* HBO */
-	uint16_t	reserved2;
-};
-typedef struct sdp_gn_profile		sdp_gn_profile_t;
-typedef struct sdp_gn_profile *		sdp_gn_profile_p;
-
-struct sdp_panu_profile
-{
-	uint8_t		reserved;
-	uint8_t		load_factor;
-	uint16_t	psm;			/* HBO */
-	uint16_t	security_description;	/* HBO */
-	uint16_t	reserved2;
-};
-typedef struct sdp_panu_profile		sdp_panu_profile_t;
-typedef struct sdp_panu_profile *	sdp_panu_profile_p;
-
-int32_t	sdp_register_service	(void *xss, uint16_t uuid,
-				 bdaddr_p const bdaddr, uint8_t const *data,
-				 uint32_t datalen, uint32_t *handle);
-int32_t	sdp_unregister_service	(void *xss, uint32_t handle);
-int32_t	sdp_change_service	(void *xss, uint32_t handle,
-				 uint8_t const *data, uint32_t datalen);
-
-__END_DECLS
-
-#endif /* ndef _SDP_H_ */
-
diff --git a/include.new/search.h b/include.new/search.h
deleted file mode 100644
index 504078d..0000000
--- a/include.new/search.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Written by J.T. Conklin <jtc@netbsd.org>
- * Public domain.
- *
- *	$NetBSD: search.h,v 1.12 1999/02/22 10:34:28 christos Exp $
- * $FreeBSD: releng/10.2/include/search.h 105250 2002-10-16 14:29:23Z robert $
- */
-
-#ifndef _SEARCH_H_
-#define _SEARCH_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-typedef	struct entry {
-	char	*key;
-	void	*data;
-} ENTRY;
-
-typedef	enum {
-	FIND, ENTER
-} ACTION;
-
-typedef	enum {
-	preorder,
-	postorder,
-	endorder,
-	leaf
-} VISIT;
-
-#ifdef _SEARCH_PRIVATE
-typedef	struct node {
-	char         *key;
-	struct node  *llink, *rlink;
-} node_t;
-
-struct que_elem {
-	struct que_elem *next;
-	struct que_elem *prev;
-};
-#endif
-
-__BEGIN_DECLS
-int	 hcreate(size_t);
-void	 hdestroy(void);
-ENTRY	*hsearch(ENTRY, ACTION);
-void	 insque(void *, void *);
-void	*lfind(const void *, const void *, size_t *, size_t,
-	    int (*)(const void *, const void *));
-void	*lsearch(const void *, void *, size_t *, size_t,
-	    int (*)(const void *, const void *));
-void	 remque(void *);
-void	*tdelete(const void * __restrict, void ** __restrict,
-	    int (*)(const void *, const void *));
-void	*tfind(const void *, void * const *,
-	    int (*)(const void *, const void *));
-void	*tsearch(const void *, void **, int (*)(const void *, const void *));
-void	 twalk(const void *, void (*)(const void *, VISIT, int));
-__END_DECLS
-
-#endif /* !_SEARCH_H_ */
diff --git a/include.new/security/audit/audit.h b/include.new/security/audit/audit.h
deleted file mode 100644
index 8d1c74c..0000000
--- a/include.new/security/audit/audit.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/*-
- * Copyright (c) 1999-2005 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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: releng/10.2/sys/security/audit/audit.h 255219 2013-09-05 00:09:56Z pjd $
- */
-
-/*
- * This header includes function prototypes and type definitions that are
- * necessary for the kernel as a whole to interact with the audit subsystem.
- */
-
-#ifndef _SECURITY_AUDIT_KERNEL_H_
-#define	_SECURITY_AUDIT_KERNEL_H_
-
-#ifndef _KERNEL
-#error "no user-serviceable parts inside"
-#endif
-
-#include <bsm/audit.h>
-
-#include <sys/file.h>
-#include <sys/sysctl.h>
-
-/*
- * Audit subsystem condition flags.  The audit_enabled flag is set and
- * removed automatically as a result of configuring log files, and can be
- * observed but should not be directly manipulated.  The audit suspension
- * flag permits audit to be temporarily disabled without reconfiguring the
- * audit target.
- */
-extern int	audit_enabled;
-extern int	audit_suspended;
-
-void	 audit_syscall_enter(unsigned short code, struct thread *td);
-void	 audit_syscall_exit(int error, struct thread *td);
-
-/*
- * The remaining kernel functions are conditionally compiled in as they are
- * wrapped by a macro, and the macro should be the only place in the source
- * tree where these functions are referenced.
- */
-#ifdef AUDIT
-struct ipc_perm;
-struct sockaddr;
-union auditon_udata;
-void	 audit_arg_addr(void * addr);
-void	 audit_arg_exit(int status, int retval);
-void	 audit_arg_len(int len);
-void	 audit_arg_atfd1(int atfd);
-void	 audit_arg_atfd2(int atfd);
-void	 audit_arg_fd(int fd);
-void	 audit_arg_fflags(int fflags);
-void	 audit_arg_gid(gid_t gid);
-void	 audit_arg_uid(uid_t uid);
-void	 audit_arg_egid(gid_t egid);
-void	 audit_arg_euid(uid_t euid);
-void	 audit_arg_rgid(gid_t rgid);
-void	 audit_arg_ruid(uid_t ruid);
-void	 audit_arg_sgid(gid_t sgid);
-void	 audit_arg_suid(uid_t suid);
-void	 audit_arg_groupset(gid_t *gidset, u_int gidset_size);
-void	 audit_arg_login(char *login);
-void	 audit_arg_ctlname(int *name, int namelen);
-void	 audit_arg_mask(int mask);
-void	 audit_arg_mode(mode_t mode);
-void	 audit_arg_dev(int dev);
-void	 audit_arg_value(long value);
-void	 audit_arg_owner(uid_t uid, gid_t gid);
-void	 audit_arg_pid(pid_t pid);
-void	 audit_arg_process(struct proc *p);
-void	 audit_arg_signum(u_int signum);
-void	 audit_arg_socket(int sodomain, int sotype, int soprotocol);
-void	 audit_arg_sockaddr(struct thread *td, int dirfd, struct sockaddr *sa);
-void	 audit_arg_auid(uid_t auid);
-void	 audit_arg_auditinfo(struct auditinfo *au_info);
-void	 audit_arg_auditinfo_addr(struct auditinfo_addr *au_info);
-void	 audit_arg_upath1(struct thread *td, int dirfd, char *upath);
-void	 audit_arg_upath2(struct thread *td, int dirfd, char *upath);
-void	 audit_arg_vnode1(struct vnode *vp);
-void	 audit_arg_vnode2(struct vnode *vp);
-void	 audit_arg_text(char *text);
-void	 audit_arg_cmd(int cmd);
-void	 audit_arg_svipc_cmd(int cmd);
-void	 audit_arg_svipc_perm(struct ipc_perm *perm);
-void	 audit_arg_svipc_id(int id);
-void	 audit_arg_svipc_addr(void *addr);
-void	 audit_arg_posix_ipc_perm(uid_t uid, gid_t gid, mode_t mode);
-void	 audit_arg_auditon(union auditon_udata *udata);
-void	 audit_arg_file(struct proc *p, struct file *fp);
-void	 audit_arg_argv(char *argv, int argc, int length);
-void	 audit_arg_envv(char *envv, int envc, int length);
-void	 audit_arg_rights(cap_rights_t *rightsp);
-void	 audit_arg_fcntl_rights(uint32_t fcntlrights);
-void	 audit_sysclose(struct thread *td, int fd);
-void	 audit_cred_copy(struct ucred *src, struct ucred *dest);
-void	 audit_cred_destroy(struct ucred *cred);
-void	 audit_cred_init(struct ucred *cred);
-void	 audit_cred_kproc0(struct ucred *cred);
-void	 audit_cred_proc1(struct ucred *cred);
-void	 audit_proc_coredump(struct thread *td, char *path, int errcode);
-void	 audit_thread_alloc(struct thread *td);
-void	 audit_thread_free(struct thread *td);
-
-/*
- * Define macros to wrap the audit_arg_* calls by checking the global
- * audit_enabled flag before performing the actual call.
- */
-#define	AUDITING_TD(td)		((td)->td_pflags & TDP_AUDITREC)
-
-#define	AUDIT_ARG_ADDR(addr) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_addr((addr));					\
-} while (0)
-
-#define	AUDIT_ARG_ARGV(argv, argc, length) do {				\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_argv((argv), (argc), (length));		\
-} while (0)
-
-#define	AUDIT_ARG_ATFD1(atfd) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_atfd1((atfd));				\
-} while (0)
-
-#define	AUDIT_ARG_ATFD2(atfd) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_atfd2((atfd));				\
-} while (0)
-
-#define	AUDIT_ARG_AUDITON(udata) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_auditon((udata));				\
-} while (0)
-
-#define	AUDIT_ARG_CMD(cmd) do {						\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_cmd((cmd));					\
-} while (0)
-
-#define	AUDIT_ARG_DEV(dev) do {						\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_dev((dev));					\
-} while (0)
-
-#define	AUDIT_ARG_EGID(egid) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_egid((egid));					\
-} while (0)
-
-#define	AUDIT_ARG_ENVV(envv, envc, length) do {				\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_envv((envv), (envc), (length));		\
-} while (0)
-
-#define	AUDIT_ARG_EXIT(status, retval) do {				\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_exit((status), (retval));			\
-} while (0)
-
-#define	AUDIT_ARG_EUID(euid) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_euid((euid));					\
-} while (0)
-
-#define	AUDIT_ARG_FD(fd) do {						\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_fd((fd));					\
-} while (0)
-
-#define	AUDIT_ARG_FILE(p, fp) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_file((p), (fp));				\
-} while (0)
-
-#define	AUDIT_ARG_FFLAGS(fflags) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_fflags((fflags));				\
-} while (0)
-
-#define	AUDIT_ARG_GID(gid) do {						\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_gid((gid));					\
-} while (0)
-
-#define	AUDIT_ARG_GROUPSET(gidset, gidset_size) do {			\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_groupset((gidset), (gidset_size));		\
-} while (0)
-
-#define	AUDIT_ARG_MODE(mode) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_mode((mode));					\
-} while (0)
-
-#define	AUDIT_ARG_OWNER(uid, gid) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_owner((uid), (gid));				\
-} while (0)
-
-#define	AUDIT_ARG_PID(pid) do {						\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_pid((pid));					\
-} while (0)
-
-#define	AUDIT_ARG_PROCESS(p) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_process((p));					\
-} while (0)
-
-#define	AUDIT_ARG_RGID(rgid) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_rgid((rgid));					\
-} while (0)
-
-#define	AUDIT_ARG_RIGHTS(rights) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_rights((rights));				\
-} while (0)
-
-#define	AUDIT_ARG_FCNTL_RIGHTS(fcntlrights) do {			\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_fcntl_rights((fcntlrights));			\
-} while (0)
-
-#define	AUDIT_ARG_RUID(ruid) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_ruid((ruid));					\
-} while (0)
-
-#define	AUDIT_ARG_SIGNUM(signum) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_signum((signum));				\
-} while (0)
-
-#define	AUDIT_ARG_SGID(sgid) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_sgid((sgid));					\
-} while (0)
-
-#define	AUDIT_ARG_SOCKET(sodomain, sotype, soprotocol) do {		\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_socket((sodomain), (sotype), (soprotocol));	\
-} while (0)
-
-#define	AUDIT_ARG_SOCKADDR(td, dirfd, sa) do {				\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_sockaddr((td), (dirfd), (sa));		\
-} while (0)
-
-#define	AUDIT_ARG_SUID(suid) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_suid((suid));					\
-} while (0)
-
-#define	AUDIT_ARG_TEXT(text) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_text((text));					\
-} while (0)
-
-#define	AUDIT_ARG_UID(uid) do {						\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_uid((uid));					\
-} while (0)
-
-#define	AUDIT_ARG_UPATH1(td, dirfd, upath) do {				\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_upath1((td), (dirfd), (upath));		\
-} while (0)
-
-#define	AUDIT_ARG_UPATH2(td, dirfd, upath) do {				\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_upath2((td), (dirfd), (upath));		\
-} while (0)
-
-#define	AUDIT_ARG_VALUE(value) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_value((value));				\
-} while (0)
-
-#define	AUDIT_ARG_VNODE1(vp) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_vnode1((vp));					\
-} while (0)
-
-#define	AUDIT_ARG_VNODE2(vp) do {					\
-	if (AUDITING_TD(curthread))					\
-		audit_arg_vnode2((vp));					\
-} while (0)
-
-#define	AUDIT_SYSCALL_ENTER(code, td)	do {				\
-	if (audit_enabled) {						\
-		audit_syscall_enter(code, td);				\
-	}								\
-} while (0)
-
-/*
- * Wrap the audit_syscall_exit() function so that it is called only when
- * we have a audit record on the thread.  Audit records can persist after
- * auditing is disabled, so we don't just check audit_enabled here.
- */
-#define	AUDIT_SYSCALL_EXIT(error, td)	do {				\
-	if (td->td_pflags & TDP_AUDITREC)				\
-		audit_syscall_exit(error, td);				\
-} while (0)
-
-/*
- * A Macro to wrap the audit_sysclose() function.
- */
-#define	AUDIT_SYSCLOSE(td, fd)	do {					\
-	if (td->td_pflags & TDP_AUDITREC)				\
-		audit_sysclose(td, fd);					\
-} while (0)
-
-#else /* !AUDIT */
-
-#define	AUDIT_ARG_ADDR(addr)
-#define	AUDIT_ARG_ARGV(argv, argc, length)
-#define	AUDIT_ARG_ATFD1(atfd)
-#define	AUDIT_ARG_ATFD2(atfd)
-#define	AUDIT_ARG_AUDITON(udata)
-#define	AUDIT_ARG_CMD(cmd)
-#define	AUDIT_ARG_DEV(dev)
-#define	AUDIT_ARG_EGID(egid)
-#define	AUDIT_ARG_ENVV(envv, envc, length)
-#define	AUDIT_ARG_EXIT(status, retval)
-#define	AUDIT_ARG_EUID(euid)
-#define	AUDIT_ARG_FD(fd)
-#define	AUDIT_ARG_FILE(p, fp)
-#define	AUDIT_ARG_FFLAGS(fflags)
-#define	AUDIT_ARG_GID(gid)
-#define	AUDIT_ARG_GROUPSET(gidset, gidset_size)
-#define	AUDIT_ARG_MODE(mode)
-#define	AUDIT_ARG_OWNER(uid, gid)
-#define	AUDIT_ARG_PID(pid)
-#define	AUDIT_ARG_PROCESS(p)
-#define	AUDIT_ARG_RGID(rgid)
-#define	AUDIT_ARG_RIGHTS(rights)
-#define	AUDIT_ARG_FCNTL_RIGHTS(fcntlrights)
-#define	AUDIT_ARG_RUID(ruid)
-#define	AUDIT_ARG_SIGNUM(signum)
-#define	AUDIT_ARG_SGID(sgid)
-#define	AUDIT_ARG_SOCKET(sodomain, sotype, soprotocol)
-#define	AUDIT_ARG_SOCKADDR(td, dirfd, sa)
-#define	AUDIT_ARG_SUID(suid)
-#define	AUDIT_ARG_TEXT(text)
-#define	AUDIT_ARG_UID(uid)
-#define	AUDIT_ARG_UPATH1(td, dirfd, upath)
-#define	AUDIT_ARG_UPATH2(td, dirfd, upath)
-#define	AUDIT_ARG_VALUE(value)
-#define	AUDIT_ARG_VNODE1(vp)
-#define	AUDIT_ARG_VNODE2(vp)
-
-#define	AUDIT_SYSCALL_ENTER(code, td)
-#define	AUDIT_SYSCALL_EXIT(error, td)
-
-#define	AUDIT_SYSCLOSE(p, fd)
-
-#endif /* AUDIT */
-
-#endif /* !_SECURITY_AUDIT_KERNEL_H_ */
diff --git a/include.new/security/audit/audit_ioctl.h b/include.new/security/audit/audit_ioctl.h
deleted file mode 100644
index 334e696..0000000
--- a/include.new/security/audit/audit_ioctl.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 2006 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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: releng/10.2/sys/security/audit/audit_ioctl.h 169097 2007-04-29 16:20:32Z rwatson $
- */
-
-#ifndef _SECURITY_AUDIT_AUDIT_IOCTL_H_
-#define	_SECURITY_AUDIT_AUDIT_IOCTL_H_
-
-#define	AUDITPIPE_IOBASE	'A'
-
-/*
- * Data structures used for complex ioctl arguments.  Do not change existing
- * structures, add new revised ones to be used by new ioctls, and keep the
- * old structures and ioctls for backwards compatibility.
- */
-struct auditpipe_ioctl_preselect {
-	au_id_t		aip_auid;
-	au_mask_t	aip_mask;
-};
-
-/*
- * Possible modes of operation for audit pipe preselection.
- */
-#define	AUDITPIPE_PRESELECT_MODE_TRAIL	1	/* Global audit trail. */
-#define	AUDITPIPE_PRESELECT_MODE_LOCAL	2	/* Local audit trail. */
-
-/*
- * Ioctls to read and control the behavior of individual audit pipe devices.
- */
-#define	AUDITPIPE_GET_QLEN		_IOR(AUDITPIPE_IOBASE, 1, u_int)
-#define	AUDITPIPE_GET_QLIMIT		_IOR(AUDITPIPE_IOBASE, 2, u_int)
-#define	AUDITPIPE_SET_QLIMIT		_IOW(AUDITPIPE_IOBASE, 3, u_int)
-#define	AUDITPIPE_GET_QLIMIT_MIN	_IOR(AUDITPIPE_IOBASE, 4, u_int)
-#define	AUDITPIPE_GET_QLIMIT_MAX	_IOR(AUDITPIPE_IOBASE, 5, u_int)
-#define	AUDITPIPE_GET_PRESELECT_FLAGS	_IOR(AUDITPIPE_IOBASE, 6, au_mask_t)
-#define	AUDITPIPE_SET_PRESELECT_FLAGS	_IOW(AUDITPIPE_IOBASE, 7, au_mask_t)
-#define	AUDITPIPE_GET_PRESELECT_NAFLAGS	_IOR(AUDITPIPE_IOBASE, 8, au_mask_t)
-#define	AUDITPIPE_SET_PRESELECT_NAFLAGS	_IOW(AUDITPIPE_IOBASE, 9, au_mask_t)
-#define	AUDITPIPE_GET_PRESELECT_AUID	_IOR(AUDITPIPE_IOBASE, 10,	\
-					    struct auditpipe_ioctl_preselect)
-#define	AUDITPIPE_SET_PRESELECT_AUID	_IOW(AUDITPIPE_IOBASE, 11,	\
-					    struct auditpipe_ioctl_preselect)
-#define	AUDITPIPE_DELETE_PRESELECT_AUID	_IOW(AUDITPIPE_IOBASE, 12, au_id_t)
-#define	AUDITPIPE_FLUSH_PRESELECT_AUID	_IO(AUDITPIPE_IOBASE, 13)
-#define	AUDITPIPE_GET_PRESELECT_MODE	_IOR(AUDITPIPE_IOBASE, 14, int)
-#define	AUDITPIPE_SET_PRESELECT_MODE	_IOW(AUDITPIPE_IOBASE, 15, int)
-#define	AUDITPIPE_FLUSH			_IO(AUDITPIPE_IOBASE, 16)
-#define	AUDITPIPE_GET_MAXAUDITDATA	_IOR(AUDITPIPE_IOBASE, 17, u_int)
-
-/*
- * Ioctls to retrieve audit pipe statistics.
- */
-#define	AUDITPIPE_GET_INSERTS		_IOR(AUDITPIPE_IOBASE, 100, u_int64_t)
-#define	AUDITPIPE_GET_READS		_IOR(AUDITPIPE_IOBASE, 101, u_int64_t)
-#define	AUDITPIPE_GET_DROPS		_IOR(AUDITPIPE_IOBASE, 102, u_int64_t)
-#define	AUDITPIPE_GET_TRUNCATES		_IOR(AUDITPIPE_IOBASE, 103, u_int64_t)
-
-#endif /* _SECURITY_AUDIT_AUDIT_IOCTL_H_ */
diff --git a/include.new/security/audit/audit_private.h b/include.new/security/audit/audit_private.h
deleted file mode 100644
index 5cd26cd..0000000
--- a/include.new/security/audit/audit_private.h
+++ /dev/null
@@ -1,431 +0,0 @@
-/*-
- * Copyright (c) 1999-2009 Apple Inc.
- * 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.  Neither the name of Apple Inc. ("Apple") 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 APPLE AND ITS 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 APPLE OR ITS 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: releng/10.2/sys/security/audit/audit_private.h 255219 2013-09-05 00:09:56Z pjd $
- */
-
-/*
- * This include file contains function prototypes and type definitions used
- * within the audit implementation.
- */
-
-#ifndef _SECURITY_AUDIT_PRIVATE_H_
-#define	_SECURITY_AUDIT_PRIVATE_H_
-
-#ifndef _KERNEL
-#error "no user-serviceable parts inside"
-#endif
-
-#include <sys/caprights.h>
-#include <sys/ipc.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_AUDITBSM);
-MALLOC_DECLARE(M_AUDITDATA);
-MALLOC_DECLARE(M_AUDITPATH);
-MALLOC_DECLARE(M_AUDITTEXT);
-MALLOC_DECLARE(M_AUDITGIDSET);
-#endif
-
-/*
- * Audit control variables that are usually set/read via system calls and
- * used to control various aspects of auditing.
- */
-extern struct au_qctrl		audit_qctrl;
-extern struct audit_fstat	audit_fstat;
-extern struct au_mask		audit_nae_mask;
-extern int			audit_panic_on_write_fail;
-extern int			audit_fail_stop;
-extern int			audit_argv;
-extern int			audit_arge;
-
-/*
- * Success/failure conditions for the conversion of a kernel audit record to
- * BSM format.
- */
-#define	BSM_SUCCESS	0
-#define	BSM_FAILURE	1
-#define	BSM_NOAUDIT	2
-
-/*
- * Defines for the kernel audit record k_ar_commit field.  Flags are set to
- * indicate what sort of record it is, and which preselection mechanism
- * selected it.
- */
-#define	AR_COMMIT_KERNEL	0x00000001U
-#define	AR_COMMIT_USER		0x00000010U
-
-#define	AR_PRESELECT_TRAIL	0x00001000U
-#define	AR_PRESELECT_PIPE	0x00002000U
-
-#define	AR_PRESELECT_USER_TRAIL	0x00004000U
-#define	AR_PRESELECT_USER_PIPE	0x00008000U
-
-/*
- * Audit data is generated as a stream of struct audit_record structures,
- * linked by struct kaudit_record, and contain storage for possible audit so
- * that it will not need to be allocated during the processing of a system
- * call, both improving efficiency and avoiding sleeping at untimely moments.
- * This structure is converted to BSM format before being written to disk.
- */
-struct vnode_au_info {
-	mode_t	vn_mode;
-	uid_t	vn_uid;
-	gid_t	vn_gid;
-	dev_t	vn_dev;
-	long	vn_fsid;
-	long	vn_fileid;
-	long	vn_gen;
-};
-
-struct groupset {
-	gid_t	*gidset;
-	u_int	 gidset_size;
-};
-
-struct socket_au_info {
-	int		so_domain;
-	int		so_type;
-	int		so_protocol;
-	in_addr_t	so_raddr;	/* Remote address if INET socket. */
-	in_addr_t	so_laddr;	/* Local address if INET socket. */
-	u_short		so_rport;	/* Remote port. */
-	u_short		so_lport;	/* Local port. */
-};
-
-/*
- * The following is used for A_OLDSETQCTRL and AU_OLDGETQCTRL and a 64-bit
- * userland.
- */
-struct au_qctrl64 {
-	u_int64_t	aq64_hiwater;
-	u_int64_t	aq64_lowater;
-	u_int64_t	aq64_bufsz;
-	u_int64_t	aq64_delay;
-	u_int64_t	aq64_minfree;
-};
-typedef	struct au_qctrl64	au_qctrl64_t;
-
-union auditon_udata {
-	char			*au_path;
-	int			au_cond;
-	int			au_flags;
-	int			au_policy;
-	int			au_trigger;
-	int64_t			au_cond64;
-	int64_t			au_policy64;
-	au_evclass_map_t	au_evclass;
-	au_mask_t		au_mask;
-	auditinfo_t		au_auinfo;
-	auditpinfo_t		au_aupinfo;
-	auditpinfo_addr_t	au_aupinfo_addr;
-	au_qctrl_t		au_qctrl;
-	au_qctrl64_t		au_qctrl64;
-	au_stat_t		au_stat;
-	au_fstat_t		au_fstat;
-	auditinfo_addr_t	au_kau_info;
-};
-
-struct posix_ipc_perm {
-	uid_t	pipc_uid;
-	gid_t	pipc_gid;
-	mode_t	pipc_mode;
-};
-
-struct audit_record {
-	/* Audit record header. */
-	uint32_t		ar_magic;
-	int			ar_event;
-	int			ar_retval; /* value returned to the process */
-	int			ar_errno;  /* return status of system call */
-	struct timespec		ar_starttime;
-	struct timespec		ar_endtime;
-	u_int64_t		ar_valid_arg;  /* Bitmask of valid arguments */
-
-	/* Audit subject information. */
-	struct xucred		ar_subj_cred;
-	uid_t			ar_subj_ruid;
-	gid_t			ar_subj_rgid;
-	gid_t			ar_subj_egid;
-	uid_t			ar_subj_auid; /* Audit user ID */
-	pid_t			ar_subj_asid; /* Audit session ID */
-	pid_t			ar_subj_pid;
-	struct au_tid		ar_subj_term;
-	struct au_tid_addr	ar_subj_term_addr;
-	struct au_mask		ar_subj_amask;
-
-	/* Operation arguments. */
-	uid_t			ar_arg_euid;
-	uid_t			ar_arg_ruid;
-	uid_t			ar_arg_suid;
-	gid_t			ar_arg_egid;
-	gid_t			ar_arg_rgid;
-	gid_t			ar_arg_sgid;
-	pid_t			ar_arg_pid;
-	pid_t			ar_arg_asid;
-	struct au_tid		ar_arg_termid;
-	struct au_tid_addr	ar_arg_termid_addr;
-	uid_t			ar_arg_uid;
-	uid_t			ar_arg_auid;
-	gid_t			ar_arg_gid;
-	struct groupset		ar_arg_groups;
-	int			ar_arg_fd;
-	int			ar_arg_atfd1;
-	int			ar_arg_atfd2;
-	int			ar_arg_fflags;
-	mode_t			ar_arg_mode;
-	int			ar_arg_dev;
-	long			ar_arg_value;
-	void			*ar_arg_addr;
-	int			ar_arg_len;
-	int			ar_arg_mask;
-	u_int			ar_arg_signum;
-	char			ar_arg_login[MAXLOGNAME];
-	int			ar_arg_ctlname[CTL_MAXNAME];
-	struct socket_au_info	ar_arg_sockinfo;
-	char			*ar_arg_upath1;
-	char			*ar_arg_upath2;
-	char			*ar_arg_text;
-	struct au_mask		ar_arg_amask;
-	struct vnode_au_info	ar_arg_vnode1;
-	struct vnode_au_info	ar_arg_vnode2;
-	int			ar_arg_cmd;
-	int			ar_arg_svipc_cmd;
-	struct ipc_perm		ar_arg_svipc_perm;
-	int			ar_arg_svipc_id;
-	void			*ar_arg_svipc_addr;
-	struct posix_ipc_perm	ar_arg_pipc_perm;
-	union auditon_udata	ar_arg_auditon;
-	char			*ar_arg_argv;
-	int			ar_arg_argc;
-	char			*ar_arg_envv;
-	int			ar_arg_envc;
-	int			ar_arg_exitstatus;
-	int			ar_arg_exitretval;
-	struct sockaddr_storage ar_arg_sockaddr;
-	cap_rights_t		ar_arg_rights;
-	uint32_t		ar_arg_fcntl_rights;
-	char			ar_jailname[MAXHOSTNAMELEN];
-};
-
-/*
- * Arguments in the audit record are initially not defined; flags are set to
- * indicate if they are present so they can be included in the audit log
- * stream only if defined.
- */
-#define	ARG_EUID		0x0000000000000001ULL
-#define	ARG_RUID		0x0000000000000002ULL
-#define	ARG_SUID		0x0000000000000004ULL
-#define	ARG_EGID		0x0000000000000008ULL
-#define	ARG_RGID		0x0000000000000010ULL
-#define	ARG_SGID		0x0000000000000020ULL
-#define	ARG_PID			0x0000000000000040ULL
-#define	ARG_UID			0x0000000000000080ULL
-#define	ARG_AUID		0x0000000000000100ULL
-#define	ARG_GID			0x0000000000000200ULL
-#define	ARG_FD			0x0000000000000400ULL
-#define	ARG_POSIX_IPC_PERM	0x0000000000000800ULL
-#define	ARG_FFLAGS		0x0000000000001000ULL
-#define	ARG_MODE		0x0000000000002000ULL
-#define	ARG_DEV			0x0000000000004000ULL
-#define	ARG_ADDR		0x0000000000008000ULL
-#define	ARG_LEN			0x0000000000010000ULL
-#define	ARG_MASK		0x0000000000020000ULL
-#define	ARG_SIGNUM		0x0000000000040000ULL
-#define	ARG_LOGIN		0x0000000000080000ULL
-#define	ARG_SADDRINET		0x0000000000100000ULL
-#define	ARG_SADDRINET6		0x0000000000200000ULL
-#define	ARG_SADDRUNIX		0x0000000000400000ULL
-#define	ARG_TERMID_ADDR		0x0000000000400000ULL
-#define	ARG_UNUSED2		0x0000000001000000ULL
-#define	ARG_UPATH1		0x0000000002000000ULL
-#define	ARG_UPATH2		0x0000000004000000ULL
-#define	ARG_TEXT		0x0000000008000000ULL
-#define	ARG_VNODE1		0x0000000010000000ULL
-#define	ARG_VNODE2		0x0000000020000000ULL
-#define	ARG_SVIPC_CMD		0x0000000040000000ULL
-#define	ARG_SVIPC_PERM		0x0000000080000000ULL
-#define	ARG_SVIPC_ID		0x0000000100000000ULL
-#define	ARG_SVIPC_ADDR		0x0000000200000000ULL
-#define	ARG_GROUPSET		0x0000000400000000ULL
-#define	ARG_CMD			0x0000000800000000ULL
-#define	ARG_SOCKINFO		0x0000001000000000ULL
-#define	ARG_ASID		0x0000002000000000ULL
-#define	ARG_TERMID		0x0000004000000000ULL
-#define	ARG_AUDITON		0x0000008000000000ULL
-#define	ARG_VALUE		0x0000010000000000ULL
-#define	ARG_AMASK		0x0000020000000000ULL
-#define	ARG_CTLNAME		0x0000040000000000ULL
-#define	ARG_PROCESS		0x0000080000000000ULL
-#define	ARG_MACHPORT1		0x0000100000000000ULL
-#define	ARG_MACHPORT2		0x0000200000000000ULL
-#define	ARG_EXIT		0x0000400000000000ULL
-#define	ARG_IOVECSTR		0x0000800000000000ULL
-#define	ARG_ARGV		0x0001000000000000ULL
-#define	ARG_ENVV		0x0002000000000000ULL
-#define	ARG_ATFD1		0x0004000000000000ULL
-#define	ARG_ATFD2		0x0008000000000000ULL
-#define	ARG_RIGHTS		0x0010000000000000ULL
-#define	ARG_FCNTL_RIGHTS	0x0020000000000000ULL
-#define	ARG_NONE		0x0000000000000000ULL
-#define	ARG_ALL			0xFFFFFFFFFFFFFFFFULL
-
-#define	ARG_IS_VALID(kar, arg)	((kar)->k_ar.ar_valid_arg & (arg))
-#define	ARG_SET_VALID(kar, arg) do {					\
-	(kar)->k_ar.ar_valid_arg |= (arg);				\
-} while (0)
-#define	ARG_CLEAR_VALID(kar, arg) do {					\
-	(kar)->k_ar.ar_valid_arg &= ~(arg);				\
-} while (0)
-
-/*
- * In-kernel version of audit record; the basic record plus queue meta-data.
- * This record can also have a pointer set to some opaque data that will be
- * passed through to the audit writing mechanism.
- */
-struct kaudit_record {
-	struct audit_record		 k_ar;
-	uint32_t			 k_ar_commit;
-	void				*k_udata;	/* User data. */
-	u_int				 k_ulen;	/* User data length. */
-	struct uthread			*k_uthread;	/* Audited thread. */
-	TAILQ_ENTRY(kaudit_record)	 k_q;
-};
-TAILQ_HEAD(kaudit_queue, kaudit_record);
-
-/*
- * Functions to manage the allocation, release, and commit of kernel audit
- * records.
- */
-void			 audit_abort(struct kaudit_record *ar);
-void			 audit_commit(struct kaudit_record *ar, int error,
-			    int retval);
-struct kaudit_record	*audit_new(int event, struct thread *td);
-
-/*
- * Functions relating to the conversion of internal kernel audit records to
- * the BSM file format.
- */
-struct au_record;
-int	 kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau);
-int	 bsm_rec_verify(void *rec);
-
-/*
- * Kernel versions of the libbsm audit record functions.
- */
-void	 kau_free(struct au_record *rec);
-void	 kau_init(void);
-
-/*
- * Return values for pre-selection and post-selection decisions.
- */
-#define	AU_PRS_SUCCESS	1
-#define	AU_PRS_FAILURE	2
-#define	AU_PRS_BOTH	(AU_PRS_SUCCESS|AU_PRS_FAILURE)
-
-/*
- * Data structures relating to the kernel audit queue.  Ideally, these might
- * be abstracted so that only accessor methods are exposed.
- */
-extern struct mtx		audit_mtx;
-extern struct cv		audit_watermark_cv;
-extern struct cv		audit_worker_cv;
-extern struct kaudit_queue	audit_q;
-extern int			audit_q_len;
-extern int			audit_pre_q_len;
-extern int			audit_in_failure;
-
-/*
- * Flags to use on audit files when opening and closing.
- */
-#define	AUDIT_OPEN_FLAGS	(FWRITE | O_APPEND)
-#define	AUDIT_CLOSE_FLAGS	(FWRITE | O_APPEND)
-
-#include <sys/fcntl.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-
-/*
- * Some of the BSM tokenizer functions take different parameters in the
- * kernel implementations in order to save the copying of large kernel data
- * structures.  The prototypes of these functions are declared here.
- */
-token_t		*kau_to_socket(struct socket_au_info *soi);
-
-/*
- * audit_klib prototypes
- */
-int		 au_preselect(au_event_t event, au_class_t class,
-		    au_mask_t *mask_p, int sorf);
-void		 au_evclassmap_init(void);
-void		 au_evclassmap_insert(au_event_t event, au_class_t class);
-au_class_t	 au_event_class(au_event_t event);
-au_event_t	 audit_ctlname_to_sysctlevent(int name[], uint64_t valid_arg);
-au_event_t	 audit_flags_and_error_to_openevent(int oflags, int error);
-au_event_t	 audit_flags_and_error_to_openatevent(int oflags, int error);
-au_event_t	 audit_msgctl_to_event(int cmd);
-au_event_t	 audit_semctl_to_event(int cmr);
-void		 audit_canon_path(struct thread *td, int dirfd, char *path,
-		    char *cpath);
-au_event_t	 auditon_command_event(int cmd);
-
-/*
- * Audit trigger events notify user space of kernel audit conditions
- * asynchronously.
- */
-void		 audit_trigger_init(void);
-int		 audit_send_trigger(unsigned int trigger);
-
-/*
- * Accessor functions to manage global audit state.
- */
-void	 audit_set_kinfo(struct auditinfo_addr *);
-void	 audit_get_kinfo(struct auditinfo_addr *);
-
-/*
- * General audit related functions.
- */
-struct kaudit_record	*currecord(void);
-void			 audit_free(struct kaudit_record *ar);
-void			 audit_shutdown(void *arg, int howto);
-void			 audit_rotate_vnode(struct ucred *cred,
-			    struct vnode *vp);
-void			 audit_worker_init(void);
-
-/*
- * Audit pipe functions.
- */
-int	 audit_pipe_preselect(au_id_t auid, au_event_t event,
-	    au_class_t class, int sorf, int trail_select);
-void	 audit_pipe_submit(au_id_t auid, au_event_t event, au_class_t class,
-	    int sorf, int trail_select, void *record, u_int record_len);
-void	 audit_pipe_submit_user(void *record, u_int record_len);
-
-#endif /* ! _SECURITY_AUDIT_PRIVATE_H_ */
diff --git a/include.new/security/mac_biba/mac_biba.h b/include.new/security/mac_biba/mac_biba.h
deleted file mode 100644
index 357160f..0000000
--- a/include.new/security/mac_biba/mac_biba.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * Copyright (c) 2001-2004 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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: releng/10.2/sys/security/mac_biba/mac_biba.h 132232 2004-07-16 02:03:50Z rwatson $
- */
-/*
- * Definitions for the TrustedBSD Biba integrity policy module.
- */
-#ifndef _SYS_SECURITY_MAC_BIBA_H
-#define	_SYS_SECURITY_MAC_BIBA_H
-
-#define	MAC_BIBA_EXTATTR_NAMESPACE	EXTATTR_NAMESPACE_SYSTEM
-#define	MAC_BIBA_EXTATTR_NAME		"mac_biba"
-
-#define	MAC_BIBA_LABEL_NAME		"biba"
-
-#define	MAC_BIBA_FLAG_EFFECTIVE	0x00000001	/* mb_effective initialized */
-#define	MAC_BIBA_FLAG_RANGE	0x00000002	/* mb_range* initialized */
-#define	MAC_BIBA_FLAGS_BOTH	(MAC_BIBA_FLAG_EFFECTIVE | MAC_BIBA_FLAG_RANGE)
-
-#define	MAC_BIBA_TYPE_UNDEF	0	/* Undefined */
-#define	MAC_BIBA_TYPE_GRADE	1	/* Hierarchal grade with mb_grade. */
-#define	MAC_BIBA_TYPE_LOW	2	/* Dominated by any
-					 * MAC_BIBA_TYPE_LABEL. */
-#define	MAC_BIBA_TYPE_HIGH	3	/* Dominates any
-					 * MAC_BIBA_TYPE_LABEL. */
-#define	MAC_BIBA_TYPE_EQUAL	4	/* Equivilent to any
-					 * MAC_BIBA_TYPE_LABEL. */
-
-/*
- * Structures and constants associated with a Biba Integrity policy.
- * mac_biba represents a Biba label, with mb_type determining its properties,
- * and mb_grade represents the hierarchal grade if valid for the current
- * mb_type.
- */
-
-#define	MAC_BIBA_MAX_COMPARTMENTS	256
-
-struct mac_biba_element {
-	u_short	mbe_type;
-	u_short	mbe_grade;
-	u_char	mbe_compartments[MAC_BIBA_MAX_COMPARTMENTS >> 3];
-};
-
-/*
- * Biba labels consist of two components: an effective label, and a label
- * range.  Depending on the context, one or both may be used; the mb_flags
- * field permits the provider to indicate what fields are intended for
- * use.
- */
-struct mac_biba {
-	int			mb_flags;
-	struct mac_biba_element	mb_effective;
-	struct mac_biba_element	mb_rangelow, mb_rangehigh;
-};
-
-/*
- * Biba compartments bit test/set macros.
- * The range is 1 to MAC_BIBA_MAX_COMPARTMENTS.
- */
-#define	MAC_BIBA_BIT_TEST(b, w) \
-	((w)[(((b) - 1) >> 3)] & (1 << (((b) - 1) & 7)))
-#define	MAC_BIBA_BIT_SET(b, w) \
-	((w)[(((b) - 1) >> 3)] |= (1 << (((b) - 1) & 7)))
-#define	MAC_BIBA_BIT_SET_EMPTY(set)	biba_bit_set_empty(set)
-
-#endif /* !_SYS_SECURITY_MAC_BIBA_H */
diff --git a/include.new/security/mac_bsdextended/mac_bsdextended.h b/include.new/security/mac_bsdextended/mac_bsdextended.h
deleted file mode 100644
index 000a718..0000000
--- a/include.new/security/mac_bsdextended/mac_bsdextended.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * Copyright (c) 2001-2004 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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: releng/10.2/sys/security/mac_bsdextended/mac_bsdextended.h 171253 2007-07-05 13:16:04Z rwatson $
- */
-
-#ifndef _SYS_SECURITY_MAC_BSDEXTENDED_H
-#define	_SYS_SECURITY_MAC_BSDEXTENDED_H
-
-#define MB_VERSION 2 /* Used to check library and kernel are the same. */
-
-/*
- * Rights that can be represented in mbr_mode.  These have the same values as
- * the V* rights in vnode.h, but in order to avoid sharing user and kernel
- * constants, we define them here.  That will also improve ABI stability if
- * the in-kernel values change.
- */
-#define	MBI_EXEC	000100
-#define	MBI_WRITE	000200
-#define	MBI_READ	000400
-#define	MBI_ADMIN	010000
-#define	MBI_STAT	020000
-#define	MBI_APPEND	040000
-#define	MBI_ALLPERM	(MBI_EXEC | MBI_WRITE | MBI_READ | MBI_ADMIN | \
-			    MBI_STAT | MBI_APPEND)
-
-#define	MBS_UID_DEFINED	0x00000001	/* uid field should be matched */
-#define	MBS_GID_DEFINED	0x00000002	/* gid field should be matched */
-#define	MBS_PRISON_DEFINED 0x00000004	/* prison field should be matched */
-
-#define MBS_ALL_FLAGS (MBS_UID_DEFINED | MBS_GID_DEFINED | MBS_PRISON_DEFINED)
-
-struct mac_bsdextended_subject {
-	int	mbs_flags;
-	int	mbs_neg;
-	uid_t	mbs_uid_min;
-	uid_t	mbs_uid_max;
-	gid_t	mbs_gid_min;
-	gid_t	mbs_gid_max;
-	int	mbs_prison;
-};
-
-#define	MBO_UID_DEFINED	0x00000001	/* uid field should be matched */
-#define	MBO_GID_DEFINED	0x00000002	/* gid field should be matched */
-#define	MBO_FSID_DEFINED 0x00000004	/* fsid field should be matched */
-#define	MBO_SUID	0x00000008	/* object must be suid */
-#define	MBO_SGID	0x00000010	/* object must be sgid */
-#define	MBO_UID_SUBJECT	0x00000020	/* uid must match subject */
-#define	MBO_GID_SUBJECT	0x00000040	/* gid must match subject */
-#define	MBO_TYPE_DEFINED 0x00000080	/* object type should be matched */
-
-#define MBO_ALL_FLAGS (MBO_UID_DEFINED | MBO_GID_DEFINED | MBO_FSID_DEFINED | \
-	    MBO_SUID | MBO_SGID | MBO_UID_SUBJECT | MBO_GID_SUBJECT | \
-	    MBO_TYPE_DEFINED)
-
-#define MBO_TYPE_REG	0x00000001
-#define MBO_TYPE_DIR	0x00000002
-#define MBO_TYPE_BLK	0x00000004
-#define MBO_TYPE_CHR	0x00000008
-#define MBO_TYPE_LNK	0x00000010
-#define MBO_TYPE_SOCK	0x00000020
-#define MBO_TYPE_FIFO	0x00000040
-
-#define MBO_ALL_TYPE	(MBO_TYPE_REG | MBO_TYPE_DIR | MBO_TYPE_BLK | \
-	    MBO_TYPE_CHR | MBO_TYPE_LNK | MBO_TYPE_SOCK | MBO_TYPE_FIFO)
-
-struct mac_bsdextended_object {
-	int	mbo_flags;
-	int	mbo_neg;
-	uid_t	mbo_uid_min;
-	uid_t	mbo_uid_max;
-	gid_t	mbo_gid_min;
-	gid_t	mbo_gid_max;
-	struct fsid mbo_fsid;
-	int	mbo_type;
-};
-
-struct mac_bsdextended_rule {
-	struct mac_bsdextended_subject	mbr_subject;
-	struct mac_bsdextended_object	mbr_object;
-	mode_t				mbr_mode;	/* maximum access */
-};
-
-#endif /* _SYS_SECURITY_MAC_BSDEXTENDED_H */
diff --git a/include.new/security/mac_bsdextended/ugidfw_internal.h b/include.new/security/mac_bsdextended/ugidfw_internal.h
deleted file mode 100644
index 516f049..0000000
--- a/include.new/security/mac_bsdextended/ugidfw_internal.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * Copyright (c) 2008 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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: releng/10.2/sys/security/mac_bsdextended/ugidfw_internal.h 189533 2009-03-08 12:32:06Z rwatson $
- */
-
-#ifndef _SYS_SECURITY_MAC_BSDEXTENDED_UGIDFW_INTERNAL_H
-#define	_SYS_SECURITY_MAC_BSDEXTENDED_UGIDFW_INTERNAL_H
-
-/*
- * Central access control routines used by object-specific checks.
- */
-int	ugidfw_accmode2mbi(accmode_t accmode);
-int	ugidfw_check(struct ucred *cred, struct vnode *vp, struct vattr *vap,
-	    int acc_mode);
-int	ugidfw_check_vp(struct ucred *cred, struct vnode *vp, int acc_mode);
-
-/*
- * System access control checks.
- */
-int	ugidfw_system_check_acct(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel);
-int	ugidfw_system_check_auditctl(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel);
-int	ugidfw_system_check_swapon(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel);
-
-/*
- * Vnode access control checks.
- */
-int	ugidfw_vnode_check_access(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, accmode_t accmode);
-int	ugidfw_vnode_check_chdir(struct ucred *cred, struct vnode *dvp,
-	    struct label *dvplabel);
-int	ugidfw_vnode_check_chroot(struct ucred *cred, struct vnode *dvp,
-	    struct label *dvplabel);
-int	ugidfw_check_create_vnode(struct ucred *cred, struct vnode *dvp,
-	    struct label *dvplabel, struct componentname *cnp,
-	    struct vattr *vap);
-int	ugidfw_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, acl_type_t type);
-int	ugidfw_vnode_check_deleteextattr(struct ucred *cred,
-	    struct vnode *vp, struct label *vplabel, int attrnamespace,
-	    const char *name);
-int	ugidfw_vnode_check_exec(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, struct image_params *imgp,
-	    struct label *execlabel);
-int	ugidfw_vnode_check_getacl(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, acl_type_t type);
-int	ugidfw_vnode_check_getextattr(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, int attrnamespace, const char *name);
-int	ugidfw_vnode_check_link(struct ucred *cred, struct vnode *dvp,
-	    struct label *dvplabel, struct vnode *vp, struct label *label,
-	    struct componentname *cnp);
-int	ugidfw_vnode_check_listextattr(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, int attrnamespace);
-int	ugidfw_vnode_check_lookup(struct ucred *cred, struct vnode *dvp,
-	    struct label *dvplabel, struct componentname *cnp);
-int	ugidfw_vnode_check_open(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, accmode_t accmode);
-int	ugidfw_vnode_check_readdir(struct ucred *cred, struct vnode *dvp,
-	    struct label *dvplabel);
-int	ugidfw_vnode_check_readdlink(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel);
-int	ugidfw_vnode_check_rename_from(struct ucred *cred, struct vnode *dvp,
-	    struct label *dvplabel, struct vnode *vp, struct label *vplabel,
-	    struct componentname *cnp);
-int	ugidfw_vnode_check_rename_to(struct ucred *cred, struct vnode *dvp,
-	    struct label *dvplabel, struct vnode *vp, struct label *vplabel,
-	    int samedir, struct componentname *cnp);
-int	ugidfw_vnode_check_revoke(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel);
-int	ugidfw_check_setacl_vnode(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, acl_type_t type, struct acl *acl);
-int	ugidfw_vnode_check_setextattr(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, int attrnamespace, const char *name);
-int	ugidfw_vnode_check_setflags(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, u_long flags);
-int	ugidfw_vnode_check_setmode(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, mode_t mode);
-int	ugidfw_vnode_check_setowner(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, uid_t uid, gid_t gid);
-int	ugidfw_vnode_check_setutimes(struct ucred *cred, struct vnode *vp,
-	    struct label *vplabel, struct timespec atime,
-	    struct timespec utime);
-int	ugidfw_vnode_check_stat(struct ucred *active_cred,
-	    struct ucred *file_cred, struct vnode *vp, struct label *vplabel);
-int	ugidfw_vnode_check_unlink(struct ucred *cred, struct vnode *dvp,
-	    struct label *dvplabel, struct vnode *vp, struct label *vplabel,
-	    struct componentname *cnp);
-
-#endif /* _SYS_SECURITY_MAC_BSDEXTENDED_UGIDFW_INTERNAL_H */
diff --git a/include.new/security/mac_lomac/mac_lomac.h b/include.new/security/mac_lomac/mac_lomac.h
deleted file mode 100644
index 1a7567b..0000000
--- a/include.new/security/mac_lomac/mac_lomac.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * Copyright (c) 2001-2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by NAI Labs,
- * the Security Research Division of Network Associates, Inc. under
- * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA
- * CHATS research program.
- *
- * 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.
- *
- * 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: releng/10.2/sys/security/mac_lomac/mac_lomac.h 140661 2005-01-23 14:26:09Z rwatson $
- */
-/*
- * Definitions for the TrustedBSD LOMAC integrity policy module.
- */
-#ifndef _SYS_SECURITY_MAC_LOMAC_H
-#define	_SYS_SECURITY_MAC_LOMAC_H
-
-#define	MAC_LOMAC_EXTATTR_NAMESPACE	EXTATTR_NAMESPACE_SYSTEM
-#define	MAC_LOMAC_EXTATTR_NAME		"mac_lomac"
-
-#define	MAC_LOMAC_LABEL_NAME		"lomac"
-
-#define	MAC_LOMAC_FLAG_SINGLE	0x00000001	/* ml_single initialized */
-#define	MAC_LOMAC_FLAG_RANGE	0x00000002	/* ml_range* initialized */
-#define	MAC_LOMAC_FLAG_AUX	0x00000004	/* ml_auxsingle initialized */
-#define	MAC_LOMAC_FLAGS_BOTH	(MAC_LOMAC_FLAG_SINGLE | MAC_LOMAC_FLAG_RANGE)
-#define	MAC_LOMAC_FLAG_UPDATE	0x00000008	/* must demote this process */
-
-#define	MAC_LOMAC_TYPE_UNDEF	0	/* Undefined */
-#define	MAC_LOMAC_TYPE_GRADE	1	/* Hierarchal grade with mb_grade. */
-#define	MAC_LOMAC_TYPE_LOW	2	/* Dominated by any
-					 * MAC_LOMAC_TYPE_LABEL. */
-#define	MAC_LOMAC_TYPE_HIGH	3	/* Dominates any
-					 * MAC_LOMAC_TYPE_LABEL. */
-#define	MAC_LOMAC_TYPE_EQUAL	4	/* Equivilent to any
-					 * MAC_LOMAC_TYPE_LABEL. */
-
-/*
- * Structures and constants associated with a LOMAC Integrity policy.
- * mac_lomac represents a LOMAC label, with mb_type determining its properties,
- * and mb_grade represents the hierarchal grade if valid for the current
- * mb_type.
- */
-
-struct mac_lomac_element {
-	u_short	mle_type;
-	u_short	mle_grade;
-};
-
-/*
- * LOMAC labels start with two components: a single label, and a label
- * range.  Depending on the context, one or both may be used; the ml_flags
- * field permits the provider to indicate what fields are intended for
- * use.  The auxiliary label works the same way, but is only valid on
- * filesystem objects to provide inheritance semantics on directories
- * and "non-demoting" execution on executable files.
- */
-struct mac_lomac {
-	int				ml_flags;
-	struct mac_lomac_element	ml_single;
-	struct mac_lomac_element	ml_rangelow, ml_rangehigh;
-	struct mac_lomac_element	ml_auxsingle;
-};
-
-#endif /* !_SYS_SECURITY_MAC_LOMAC_H */
diff --git a/include.new/security/mac_mls/mac_mls.h b/include.new/security/mac_mls/mac_mls.h
deleted file mode 100644
index 9a52e45..0000000
--- a/include.new/security/mac_mls/mac_mls.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * Copyright (c) 2001-2004 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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: releng/10.2/sys/security/mac_mls/mac_mls.h 132232 2004-07-16 02:03:50Z rwatson $
- */
-/*
- * Definitions for the TrustedBSD MLS confidentiality policy module.
- */
-#ifndef _SYS_SECURITY_MAC_MLS_H
-#define	_SYS_SECURITY_MAC_MLS_H
-
-#define	MAC_MLS_EXTATTR_NAMESPACE	EXTATTR_NAMESPACE_SYSTEM
-#define	MAC_MLS_EXTATTR_NAME		"mac_mls"
-
-#define	MAC_MLS_LABEL_NAME		"mls"
-
-#define	MAC_MLS_FLAG_EFFECTIVE	0x00000001	/* mm_effective initialized */
-#define	MAC_MLS_FLAG_RANGE	0x00000002	/* mm_range* initialized */
-#define	MAC_MLS_FLAGS_BOTH	(MAC_MLS_FLAG_EFFECTIVE | MAC_MLS_FLAG_RANGE)
-
-#define	MAC_MLS_TYPE_UNDEF	0	/* Undefined */
-#define	MAC_MLS_TYPE_LEVEL	1	/* Hierarchal level with mm_level. */
-#define	MAC_MLS_TYPE_LOW	2	/* Dominated by any
-					 * MAC_MLS_TYPE_LABEL. */
-#define	MAC_MLS_TYPE_HIGH	3	/* Dominates any
-					 * MAC_MLS_TYPE_LABEL. */
-#define	MAC_MLS_TYPE_EQUAL	4	/* Equivilent to any
-					 * MAC_MLS_TYPE_LABEL. */
-
-/*
- * Structures and constants associated with a Multi-Level Security policy.
- * mac_mls represents an MLS label, with mm_type determining its properties,
- * and mm_level represents the hierarchal sensitivity level if valid for the
- * current mm_type.  If compartments are used, the same semantics apply as
- * long as the suject is in every compartment the object is in.  LOW, EQUAL
- * and HIGH cannot be in compartments.
- */
-
-/*
- * MLS compartments bit set size (in bits).
- */
-#define	MAC_MLS_MAX_COMPARTMENTS	256
-
-struct mac_mls_element {
-	u_short	mme_type;
-	u_short	mme_level;
-	u_char	mme_compartments[MAC_MLS_MAX_COMPARTMENTS >> 3];
-};
-
-/*
- * MLS labels consist of two components: an effective label, and a label
- * range.  Depending on the context, one or both may be used; the mb_flags
- * field permits the provider to indicate what fields are intended for
- * use.
- */
-struct mac_mls {
-	int			mm_flags;
-	struct mac_mls_element	mm_effective;
-	struct mac_mls_element	mm_rangelow, mm_rangehigh;
-};
-
-/*
- * MLS compartments bit test/set macros.
- * The range is 1 to MAC_MLS_MAX_COMPARTMENTS.
- */
-#define	MAC_MLS_BIT_TEST(b, w) \
-	((w)[(((b) - 1) >> 3)] & (1 << (((b) - 1) & 7)))
-#define	MAC_MLS_BIT_SET(b, w) \
-	((w)[(((b) - 1) >> 3)] |= (1 << (((b) - 1) & 7)))
-#define	MAC_MLS_BIT_SET_EMPTY(set)	mls_bit_set_empty(set)
-
-#endif /* !_SYS_SECURITY_MAC_MLS_H */
diff --git a/include.new/security/mac_partition/mac_partition.h b/include.new/security/mac_partition/mac_partition.h
deleted file mode 100644
index 1ddf464..0000000
--- a/include.new/security/mac_partition/mac_partition.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * Copyright (c) 2001-2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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: releng/10.2/sys/security/mac_partition/mac_partition.h 126097 2004-02-22 00:33:12Z rwatson $
- */
-
-/*
- * Definitions for the TrustedBSD partition policy module.
- */
-
-#ifndef _SYS_SECURITY_MAC_PARTITION_H
-#define	_SYS_SECURITY_MAC_PARTITION_H
-
-#define	MAC_PARTITION_LABEL_NAME	"partition"
-
-#endif /* !_SYS_SECURITY_MAC_PARTITION_H */
diff --git a/include.new/security/openpam.h b/include.new/security/openpam.h
deleted file mode 100644
index 5f3477f..0000000
--- a/include.new/security/openpam.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/*-
- * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2011 Dag-Erling Smørgrav
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by ThinkSec AS and
- * Network Associates Laboratories, the Security Research Division of
- * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * $Id: openpam.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef SECURITY_OPENPAM_H_INCLUDED
-#define SECURITY_OPENPAM_H_INCLUDED
-
-/*
- * Annoying but necessary header pollution
- */
-#include <stdarg.h>
-
-#include <security/openpam_attr.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct passwd;
-
-/*
- * API extensions
- */
-int
-openpam_borrow_cred(pam_handle_t *_pamh,
-	const struct passwd *_pwd)
-	OPENPAM_NONNULL((1,2));
-
-int
-openpam_subst(const pam_handle_t *_pamh,
-	char *_buf,
-	size_t *_bufsize,
-	const char *_template);
-
-void
-openpam_free_data(pam_handle_t *_pamh,
-	void *_data,
-	int _status);
-
-void
-openpam_free_envlist(char **_envlist);
-
-const char *
-openpam_get_option(pam_handle_t *_pamh,
-	const char *_option);
-
-int
-openpam_restore_cred(pam_handle_t *_pamh)
-	OPENPAM_NONNULL((1));
-
-int
-openpam_set_option(pam_handle_t *_pamh,
-	const char *_option,
-	const char *_value);
-
-int
-pam_error(const pam_handle_t *_pamh,
-	const char *_fmt,
-	...)
-	OPENPAM_FORMAT ((__printf__, 2, 3))
-	OPENPAM_NONNULL((1,2));
-
-int
-pam_get_authtok(pam_handle_t *_pamh,
-	int _item,
-	const char **_authtok,
-	const char *_prompt)
-	OPENPAM_NONNULL((1,3));
-
-int
-pam_info(const pam_handle_t *_pamh,
-	const char *_fmt,
-	...)
-	OPENPAM_FORMAT ((__printf__, 2, 3))
-	OPENPAM_NONNULL((1,2));
-
-int
-pam_prompt(const pam_handle_t *_pamh,
-	int _style,
-	char **_resp,
-	const char *_fmt,
-	...)
-	OPENPAM_FORMAT ((__printf__, 4, 5))
-	OPENPAM_NONNULL((1,4));
-
-int
-pam_setenv(pam_handle_t *_pamh,
-	const char *_name,
-	const char *_value,
-	int _overwrite)
-	OPENPAM_NONNULL((1,2,3));
-
-int
-pam_vinfo(const pam_handle_t *_pamh,
-	const char *_fmt,
-	va_list _ap)
-	OPENPAM_FORMAT ((__printf__, 2, 0))
-	OPENPAM_NONNULL((1,2));
-
-int
-pam_verror(const pam_handle_t *_pamh,
-	const char *_fmt,
-	va_list _ap)
-	OPENPAM_FORMAT ((__printf__, 2, 0))
-	OPENPAM_NONNULL((1,2));
-
-int
-pam_vprompt(const pam_handle_t *_pamh,
-	int _style,
-	char **_resp,
-	const char *_fmt,
-	va_list _ap)
-	OPENPAM_FORMAT ((__printf__, 4, 0))
-	OPENPAM_NONNULL((1,4));
-
-/*
- * Read cooked lines.
- * Checking for _IOFBF is a fairly reliable way to detect the presence
- * of <stdio.h>, as SUSv3 requires it to be defined there.
- */
-#ifdef _IOFBF
-char *
-openpam_readline(FILE *_f,
-	int *_lineno,
-	size_t *_lenp)
-	OPENPAM_NONNULL((1));
-
-char **
-openpam_readlinev(FILE *_f,
-	int *_lineno,
-	int *_lenp)
-	OPENPAM_NONNULL((1));
-
-char *
-openpam_readword(FILE *_f,
-	int *_lineno,
-	size_t *_lenp)
-	OPENPAM_NONNULL((1));
-#endif
-
-int
-openpam_straddch(char **_str,
-	size_t *_sizep,
-	size_t *_lenp,
-	int ch)
-	OPENPAM_NONNULL((1));
-
-/*
- * Enable / disable optional features
- */
-enum {
-	OPENPAM_RESTRICT_SERVICE_NAME,
-	OPENPAM_VERIFY_POLICY_FILE,
-	OPENPAM_RESTRICT_MODULE_NAME,
-	OPENPAM_VERIFY_MODULE_FILE,
-	OPENPAM_NUM_FEATURES
-};
-
-int
-openpam_set_feature(int _feature, int _onoff);
-
-int
-openpam_get_feature(int _feature, int *_onoff);
-
-/*
- * Log levels
- */
-enum {
-	PAM_LOG_LIBDEBUG = -1,
-	PAM_LOG_DEBUG,
-	PAM_LOG_VERBOSE,
-	PAM_LOG_NOTICE,
-	PAM_LOG_ERROR
-};
-
-/*
- * Log to syslog
- */
-void
-_openpam_log(int _level,
-	const char *_func,
-	const char *_fmt,
-	...)
-	OPENPAM_FORMAT ((__printf__, 3, 4))
-	OPENPAM_NONNULL((3));
-
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-#define openpam_log(lvl, ...) \
-	_openpam_log((lvl), __func__, __VA_ARGS__)
-#elif defined(__GNUC__) && (__GNUC__ >= 3)
-#define openpam_log(lvl, ...) \
-	_openpam_log((lvl), __func__, __VA_ARGS__)
-#elif defined(__GNUC__) && (__GNUC__ >= 2) && (__GNUC_MINOR__ >= 95)
-#define openpam_log(lvl, fmt...) \
-	_openpam_log((lvl), __func__, ##fmt)
-#elif defined(__GNUC__) && defined(__FUNCTION__)
-#define openpam_log(lvl, fmt...) \
-	_openpam_log((lvl), __FUNCTION__, ##fmt)
-#else
-void
-openpam_log(int _level,
-	const char *_format,
-	...)
-	OPENPAM_FORMAT ((__printf__, 2, 3))
-	OPENPAM_NONNULL((2));
-#endif
-
-/*
- * Generic conversation function
- */
-struct pam_message;
-struct pam_response;
-int openpam_ttyconv(int _n,
-	const struct pam_message **_msg,
-	struct pam_response **_resp,
-	void *_data);
-
-extern int openpam_ttyconv_timeout;
-
-/*
- * Null conversation function
- */
-int openpam_nullconv(int _n,
-	const struct pam_message **_msg,
-	struct pam_response **_resp,
-	void *_data);
-
-/*
- * PAM primitives
- */
-enum {
-	PAM_SM_AUTHENTICATE,
-	PAM_SM_SETCRED,
-	PAM_SM_ACCT_MGMT,
-	PAM_SM_OPEN_SESSION,
-	PAM_SM_CLOSE_SESSION,
-	PAM_SM_CHAUTHTOK,
-	/* keep this last */
-	PAM_NUM_PRIMITIVES
-};
-
-/*
- * Dummy service module function
- */
-#define PAM_SM_DUMMY(type)						\
-PAM_EXTERN int								\
-pam_sm_##type(pam_handle_t *pamh, int flags,				\
-    int argc, const char *argv[])					\
-{									\
-									\
-	(void)pamh;							\
-	(void)flags;							\
-	(void)argc;							\
-	(void)argv;							\
-	return (PAM_IGNORE);						\
-}
-
-/*
- * PAM service module functions match this typedef
- */
-struct pam_handle;
-typedef int (*pam_func_t)(struct pam_handle *, int, int, const char **);
-
-/*
- * A struct that describes a module.
- */
-typedef struct pam_module pam_module_t;
-struct pam_module {
-	char		*path;
-	pam_func_t	 func[PAM_NUM_PRIMITIVES];
-	void		*dlh;
-};
-
-/*
- * Source-code compatibility with Linux-PAM modules
- */
-#if defined(PAM_SM_AUTH) || defined(PAM_SM_ACCOUNT) || \
-	defined(PAM_SM_SESSION) || defined(PAM_SM_PASSWORD)
-# define LINUX_PAM_MODULE
-#endif
-
-#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_AUTH)
-# define _PAM_SM_AUTHENTICATE	0
-# define _PAM_SM_SETCRED	0
-#else
-# undef PAM_SM_AUTH
-# define PAM_SM_AUTH
-# define _PAM_SM_AUTHENTICATE	pam_sm_authenticate
-# define _PAM_SM_SETCRED	pam_sm_setcred
-#endif
-
-#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_ACCOUNT)
-# define _PAM_SM_ACCT_MGMT	0
-#else
-# undef PAM_SM_ACCOUNT
-# define PAM_SM_ACCOUNT
-# define _PAM_SM_ACCT_MGMT	pam_sm_acct_mgmt
-#endif
-
-#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_SESSION)
-# define _PAM_SM_OPEN_SESSION	0
-# define _PAM_SM_CLOSE_SESSION	0
-#else
-# undef PAM_SM_SESSION
-# define PAM_SM_SESSION
-# define _PAM_SM_OPEN_SESSION	pam_sm_open_session
-# define _PAM_SM_CLOSE_SESSION	pam_sm_close_session
-#endif
-
-#if defined(LINUX_PAM_MODULE) && !defined(PAM_SM_PASSWORD)
-# define _PAM_SM_CHAUTHTOK	0
-#else
-# undef PAM_SM_PASSWORD
-# define PAM_SM_PASSWORD
-# define _PAM_SM_CHAUTHTOK	pam_sm_chauthtok
-#endif
-
-/*
- * Infrastructure for static modules using GCC linker sets.
- * You are not expected to understand this.
- */
-#if !defined(PAM_SOEXT)
-# define PAM_SOEXT ".so"
-#endif
-
-#if defined(OPENPAM_STATIC_MODULES)
-# if !defined(__GNUC__)
-#  error "Don't know how to build static modules on non-GNU compilers"
-# endif
-/* gcc, static linking */
-# include <sys/cdefs.h>
-# include <linker_set.h>
-# define PAM_EXTERN static
-# define PAM_MODULE_ENTRY(name)						\
-	static char _pam_name[] = name PAM_SOEXT;			\
-	static struct pam_module _pam_module = {			\
-		.path = _pam_name,					\
-		.func = {						\
-			[PAM_SM_AUTHENTICATE] = _PAM_SM_AUTHENTICATE,	\
-			[PAM_SM_SETCRED] = _PAM_SM_SETCRED,		\
-			[PAM_SM_ACCT_MGMT] = _PAM_SM_ACCT_MGMT,		\
-			[PAM_SM_OPEN_SESSION] = _PAM_SM_OPEN_SESSION,	\
-			[PAM_SM_CLOSE_SESSION] = _PAM_SM_CLOSE_SESSION, \
-			[PAM_SM_CHAUTHTOK] = _PAM_SM_CHAUTHTOK		\
-		},							\
-	};								\
-	DATA_SET(_openpam_static_modules, _pam_module)
-#else
-/* normal case */
-# define PAM_EXTERN
-# define PAM_MODULE_ENTRY(name)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !SECURITY_OPENPAM_H_INCLUDED */
diff --git a/include.new/security/openpam_attr.h b/include.new/security/openpam_attr.h
deleted file mode 100644
index 2d88ae5..0000000
--- a/include.new/security/openpam_attr.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * $Id: openpam_attr.h 656 2013-03-06 22:58:45Z des $
- */
-
-#ifndef SECURITY_OPENPAM_ATTR_H_INCLUDED
-#define SECURITY_OPENPAM_ATTR_H_INCLUDED
-
-/* GCC attributes */
-#if defined(__GNUC__) && defined(__GNUC_MINOR__) && !defined(__STRICT_ANSI__)
-# define OPENPAM_GNUC_PREREQ(maj, min) \
-        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-#else
-# define OPENPAM_GNUC_PREREQ(maj, min) 0
-#endif
-
-#if OPENPAM_GNUC_PREREQ(2,5)
-# define OPENPAM_FORMAT(params) __attribute__((__format__ params))
-#else
-# define OPENPAM_FORMAT(params)
-#endif
-
-#if OPENPAM_GNUC_PREREQ(3,3)
-# define OPENPAM_NONNULL(params) __attribute__((__nonnull__ params))
-#else
-# define OPENPAM_NONNULL(params)
-#endif
-
-#if OPENPAM_GNUC_PREREQ(2,7)
-# define OPENPAM_UNUSED(var) var __attribute__((__unused__))
-#else
-# define OPENPAM_UNUSED(var) var
-#endif
-
-#endif /* !SECURITY_OPENPAM_ATTR_H_INCLUDED */
diff --git a/include.new/security/openpam_version.h b/include.new/security/openpam_version.h
deleted file mode 100644
index abd1738..0000000
--- a/include.new/security/openpam_version.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2011 Dag-Erling Smørgrav
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by ThinkSec AS and
- * Network Associates Laboratories, the Security Research Division of
- * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * $Id: openpam_version.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED
-#define SECURITY_OPENPAM_VERSION_H_INCLUDED
-
-#define OPENPAM
-#define OPENPAM_VERSION	20140912
-#define OPENPAM_RELEASE	"Ourouparia"
-
-#endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */
diff --git a/include.new/security/pam_appl.h b/include.new/security/pam_appl.h
deleted file mode 100644
index f2e4b16..0000000
--- a/include.new/security/pam_appl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*-
- * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2011 Dag-Erling Smørgrav
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by ThinkSec AS and
- * Network Associates Laboratories, the Security Research Division of
- * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * $Id: pam_appl.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef SECURITY_PAM_APPL_H_INCLUDED
-#define SECURITY_PAM_APPL_H_INCLUDED
-
-#include <security/pam_types.h>
-#include <security/pam_constants.h>
-#include <security/openpam_attr.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * XSSO 4.2.1, 6
- */
-
-int
-pam_acct_mgmt(pam_handle_t *_pamh,
-	int _flags)
-	OPENPAM_NONNULL((1));
-
-int
-pam_authenticate(pam_handle_t *_pamh,
-	int _flags)
-	OPENPAM_NONNULL((1));
-
-int
-pam_chauthtok(pam_handle_t *_pamh,
-	int _flags)
-	OPENPAM_NONNULL((1));
-
-int
-pam_close_session(pam_handle_t *_pamh,
-	int _flags)
-	OPENPAM_NONNULL((1));
-
-int
-pam_end(pam_handle_t *_pamh,
-	int _status);
-
-int
-pam_get_data(const pam_handle_t *_pamh,
-	const char *_module_data_name,
-	const void **_data)
-	OPENPAM_NONNULL((1,2,3));
-
-int
-pam_get_item(const pam_handle_t *_pamh,
-	int _item_type,
-	const void **_item)
-	OPENPAM_NONNULL((1,3));
-
-int
-pam_get_user(pam_handle_t *_pamh,
-	const char **_user,
-	const char *_prompt)
-	OPENPAM_NONNULL((1,2));
-
-const char *
-pam_getenv(pam_handle_t *_pamh,
-	const char *_name)
-	OPENPAM_NONNULL((1,2));
-
-char **
-pam_getenvlist(pam_handle_t *_pamh)
-	OPENPAM_NONNULL((1));
-
-int
-pam_open_session(pam_handle_t *_pamh,
-	int _flags)
-	OPENPAM_NONNULL((1));
-
-int
-pam_putenv(pam_handle_t *_pamh,
-	const char *_namevalue)
-	OPENPAM_NONNULL((1,2));
-
-int
-pam_set_data(pam_handle_t *_pamh,
-	const char *_module_data_name,
-	void *_data,
-	void (*_cleanup)(pam_handle_t *_pamh,
-		void *_data,
-		int _pam_end_status))
-	OPENPAM_NONNULL((1,2));
-
-int
-pam_set_item(pam_handle_t *_pamh,
-	int _item_type,
-	const void *_item)
-	OPENPAM_NONNULL((1));
-
-int
-pam_setcred(pam_handle_t *_pamh,
-	int _flags)
-	OPENPAM_NONNULL((1));
-
-int
-pam_start(const char *_service,
-	const char *_user,
-	const struct pam_conv *_pam_conv,
-	pam_handle_t **_pamh)
-	OPENPAM_NONNULL((4));
-
-const char *
-pam_strerror(const pam_handle_t *_pamh,
-	int _error_number);
-
-/*
- * Single Sign-On extensions
- */
-#if 0
-int
-pam_authenticate_secondary(pam_handle_t *_pamh,
-	char *_target_username,
-	char *_target_module_type,
-	char *_target_authn_domain,
-	char *_target_supp_data,
-	char *_target_module_authtok,
-	int _flags);
-
-int
-pam_get_mapped_authtok(pam_handle_t *_pamh,
-	const char *_target_module_username,
-	const char *_target_module_type,
-	const char *_target_authn_domain,
-	size_t *_target_authtok_len,
-	unsigned char **_target_module_authtok);
-
-int
-pam_get_mapped_username(pam_handle_t *_pamh,
-	const char *_src_username,
-	const char *_src_module_type,
-	const char *_src_authn_domain,
-	const char *_target_module_type,
-	const char *_target_authn_domain,
-	char **_target_module_username);
-
-int
-pam_set_mapped_authtok(pam_handle_t *_pamh,
-	const char *_target_module_username,
-	size_t _target_authtok_len,
-	unsigned char *_target_module_authtok,
-	const char *_target_module_type,
-	const char *_target_authn_domain);
-
-int
-pam_set_mapped_username(pam_handle_t *_pamh,
-	char *_src_username,
-	char *_src_module_type,
-	char *_src_authn_domain,
-	char *_target_module_username,
-	char *_target_module_type,
-	char *_target_authn_domain);
-#endif /* 0 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !SECURITY_PAM_APPL_H_INCLUDED */
diff --git a/include.new/security/pam_constants.h b/include.new/security/pam_constants.h
deleted file mode 100644
index 65c1466..0000000
--- a/include.new/security/pam_constants.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2011 Dag-Erling Smørgrav
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by ThinkSec AS and
- * Network Associates Laboratories, the Security Research Division of
- * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * $Id: pam_constants.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef SECURITY_PAM_CONSTANTS_H_INCLUDED
-#define SECURITY_PAM_CONSTANTS_H_INCLUDED
-
-#include <security/openpam_version.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * XSSO 5.2
- */
-enum {
-	PAM_SUCCESS			=   0,
-	PAM_OPEN_ERR			=   1,
-	PAM_SYMBOL_ERR			=   2,
-	PAM_SERVICE_ERR			=   3,
-	PAM_SYSTEM_ERR			=   4,
-	PAM_BUF_ERR			=   5,
-	PAM_CONV_ERR			=   6,
-	PAM_PERM_DENIED			=   7,
-	PAM_MAXTRIES			=   8,
-	PAM_AUTH_ERR			=   9,
-	PAM_NEW_AUTHTOK_REQD		=  10,
-	PAM_CRED_INSUFFICIENT		=  11,
-	PAM_AUTHINFO_UNAVAIL		=  12,
-	PAM_USER_UNKNOWN		=  13,
-	PAM_CRED_UNAVAIL		=  14,
-	PAM_CRED_EXPIRED		=  15,
-	PAM_CRED_ERR			=  16,
-	PAM_ACCT_EXPIRED		=  17,
-	PAM_AUTHTOK_EXPIRED		=  18,
-	PAM_SESSION_ERR			=  19,
-	PAM_AUTHTOK_ERR			=  20,
-	PAM_AUTHTOK_RECOVERY_ERR	=  21,
-	PAM_AUTHTOK_LOCK_BUSY		=  22,
-	PAM_AUTHTOK_DISABLE_AGING	=  23,
-	PAM_NO_MODULE_DATA		=  24,
-	PAM_IGNORE			=  25,
-	PAM_ABORT			=  26,
-	PAM_TRY_AGAIN			=  27,
-	PAM_MODULE_UNKNOWN		=  28,
-	PAM_DOMAIN_UNKNOWN		=  29,
-	PAM_NUM_ERRORS					/* OpenPAM extension */
-};
-
-/*
- * XSSO 5.3
- */
-enum {
-	PAM_PROMPT_ECHO_OFF		=   1,
-	PAM_PROMPT_ECHO_ON		=   2,
-	PAM_ERROR_MSG			=   3,
-	PAM_TEXT_INFO			=   4,
-	PAM_MAX_NUM_MSG			=  32,
-	PAM_MAX_MSG_SIZE		= 512,
-	PAM_MAX_RESP_SIZE		= 512
-};
-
-/*
- * XSSO 5.4
- */
-enum {
-	/* some compilers promote 0x8000000 to long */
-	PAM_SILENT			= (-0x7fffffff - 1),
-	PAM_DISALLOW_NULL_AUTHTOK	= 0x1,
-	PAM_ESTABLISH_CRED		= 0x1,
-	PAM_DELETE_CRED			= 0x2,
-	PAM_REINITIALIZE_CRED		= 0x4,
-	PAM_REFRESH_CRED		= 0x8,
-	PAM_PRELIM_CHECK		= 0x1,
-	PAM_UPDATE_AUTHTOK		= 0x2,
-	PAM_CHANGE_EXPIRED_AUTHTOK	= 0x4
-};
-
-/*
- * XSSO 5.5
- */
-enum {
-	PAM_SERVICE			=   1,
-	PAM_USER			=   2,
-	PAM_TTY				=   3,
-	PAM_RHOST			=   4,
-	PAM_CONV			=   5,
-	PAM_AUTHTOK			=   6,
-	PAM_OLDAUTHTOK			=   7,
-	PAM_RUSER			=   8,
-	PAM_USER_PROMPT			=   9,
-	PAM_REPOSITORY			=  10,
-	PAM_AUTHTOK_PROMPT		=  11,		/* OpenPAM extension */
-	PAM_OLDAUTHTOK_PROMPT		=  12,		/* OpenPAM extension */
-	PAM_HOST			=  13,		/* OpenPAM extension */
-	PAM_NUM_ITEMS					/* OpenPAM extension */
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !SECURITY_PAM_CONSTANTS_H_INCLUDED */
diff --git a/include.new/security/pam_mod_misc.h b/include.new/security/pam_mod_misc.h
deleted file mode 100644
index c40455d..0000000
--- a/include.new/security/pam_mod_misc.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright 1998 Juniper Networks, Inc.
- * 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.
- *
- * 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: releng/10.2/lib/libpam/libpam/security/pam_mod_misc.h 160434 2006-07-17 11:48:52Z stefanf $
- */
-
-#ifndef PAM_MOD_MISC_H
-#define PAM_MOD_MISC_H
-
-#include <sys/cdefs.h>
-
-/*
- * Common option names
- */
-#define	PAM_OPT_NULLOK		"nullok"
-#define PAM_OPT_AUTH_AS_SELF	"auth_as_self"
-#define PAM_OPT_ECHO_PASS	"echo_pass"
-#define PAM_OPT_DEBUG		"debug"
-
-__BEGIN_DECLS
-void	_pam_verbose_error(pam_handle_t *, int, const char *,
-		const char *, const char *, ...);
-__END_DECLS
-
-#define	PAM_LOG(...) \
-	openpam_log(PAM_LOG_DEBUG, __VA_ARGS__)
-
-#define PAM_RETURN(arg) \
-	return (arg)
-
-#define PAM_VERBOSE_ERROR(...) \
-	_pam_verbose_error(pamh, flags, __FILE__, __func__, __VA_ARGS__)
-
-#endif
diff --git a/include.new/security/pam_modules.h b/include.new/security/pam_modules.h
deleted file mode 100644
index 96edd71..0000000
--- a/include.new/security/pam_modules.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*-
- * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2011 Dag-Erling Smørgrav
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by ThinkSec AS and
- * Network Associates Laboratories, the Security Research Division of
- * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * $Id: pam_modules.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef SECURITY_PAM_MODULES_H_INCLUDED
-#define SECURITY_PAM_MODULES_H_INCLUDED
-
-#include <security/pam_types.h>
-#include <security/pam_constants.h>
-#include <security/openpam.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * XSSO 4.2.2, 6
- */
-
-#if defined(PAM_SM_ACCOUNT)
-PAM_EXTERN int
-pam_sm_acct_mgmt(pam_handle_t *_pamh,
-	int _flags,
-	int _argc,
-	const char **_argv);
-#endif
-
-#if defined(PAM_SM_AUTH)
-PAM_EXTERN int
-pam_sm_authenticate(pam_handle_t *_pamh,
-	int _flags,
-	int _argc,
-	const char **_argv);
-#endif
-
-#if defined(PAM_SM_PASSWORD)
-PAM_EXTERN int
-pam_sm_chauthtok(pam_handle_t *_pamh,
-	int _flags,
-	int _argc,
-	const char **_argv);
-#endif
-
-#if defined(PAM_SM_SESSION)
-PAM_EXTERN int
-pam_sm_close_session(pam_handle_t *_pamh,
-	int _flags,
-	int _args,
-	const char **_argv);
-#endif
-
-#if defined(PAM_SM_SESSION)
-PAM_EXTERN int
-pam_sm_open_session(pam_handle_t *_pamh,
-	int _flags,
-	int _argc,
-	const char **_argv);
-#endif
-
-#if defined(PAM_SM_AUTH)
-PAM_EXTERN int
-pam_sm_setcred(pam_handle_t *_pamh,
-	int _flags,
-	int _argc,
-	const char **_argv);
-#endif
-
-/*
- * Single Sign-On extensions
- */
-#if 0
-PAM_EXTERN int
-pam_sm_authenticate_secondary(pam_handle_t *_pamh,
-	char *_target_username,
-	char *_target_module_type,
-	char *_target_authn_domain,
-	char *_target_supp_data,
-	unsigned char *_target_module_authtok,
-	int _flags,
-	int _argc,
-	const char **_argv);
-
-PAM_EXTERN int
-pam_sm_get_mapped_authtok(pam_handle_t *_pamh,
-	char *_target_module_username,
-	char *_target_module_type,
-	char *_target_authn_domain,
-	size_t *_target_authtok_len,
-	unsigned char **_target_module_authtok,
-	int _argc,
-	char *_argv);
-
-PAM_EXTERN int
-pam_sm_get_mapped_username(pam_handle_t *_pamh,
-	char *_src_username,
-	char *_src_module_type,
-	char *_src_authn_domain,
-	char *_target_module_type,
-	char *_target_authn_domain,
-	char **_target_module_username,
-	int _argc,
-	const char **_argv);
-
-PAM_EXTERN int
-pam_sm_set_mapped_authtok(pam_handle_t *_pamh,
-	char *_target_module_username,
-	size_t _target_authtok_len,
-	unsigned char *_target_module_authtok,
-	char *_target_module_type,
-	char *_target_authn_domain,
-	int _argc,
-	const char *_argv);
-
-PAM_EXTERN int
-pam_sm_set_mapped_username(pam_handle_t *_pamh,
-	char *_target_module_username,
-	char *_target_module_type,
-	char *_target_authn_domain,
-	int _argc,
-	const char **_argv);
-
-#endif /* 0 */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !SECURITY_PAM_MODULES_H_INCLUDED */
diff --git a/include.new/security/pam_types.h b/include.new/security/pam_types.h
deleted file mode 100644
index 92235bf..0000000
--- a/include.new/security/pam_types.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2011 Dag-Erling Smørgrav
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by ThinkSec AS and
- * Network Associates Laboratories, the Security Research Division of
- * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * $Id: pam_types.h 103 2016-01-12 05:32:24Z reddawg $
- */
-
-#ifndef SECURITY_PAM_TYPES_H_INCLUDED
-#define SECURITY_PAM_TYPES_H_INCLUDED
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * XSSO 5.1.1
- */
-struct pam_message {
-	int	 msg_style;
-	char	*msg;
-};
-
-struct pam_response {
-	char	*resp;
-	int	 resp_retcode;
-};
-
-/*
- * XSSO 5.1.2
- */
-struct pam_conv {
-	int	(*conv)(int, const struct pam_message **,
-	    struct pam_response **, void *);
-	void	*appdata_ptr;
-};
-
-/*
- * XSSO 5.1.3
- */
-struct pam_handle;
-typedef struct pam_handle pam_handle_t;
-
-/*
- * Solaris 9
- */
-typedef struct pam_repository {
-	char	*type;
-	void	*scope;
-	size_t	 scope_len;
-} pam_repository_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !SECURITY_PAM_TYPES_H_INCLUDED */
diff --git a/include.new/semaphore.h b/include.new/semaphore.h
deleted file mode 100644
index 68dedf5..0000000
--- a/include.new/semaphore.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2010 David Xu <davidxu@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/include/semaphore.h 201546 2010-01-05 02:37:59Z davidxu $
- */
-
-/* semaphore.h: POSIX 1003.1b semaphores */
-
-#ifndef _SEMAPHORE_H_
-#define _SEMAPHORE_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/_umtx.h>
-
-struct _sem {
-	__uint32_t	_magic;
-	struct _usem	_kern;
-};
-
-typedef	struct _sem	sem_t;
-
-#define	SEM_FAILED	((sem_t *)0)
-#define	SEM_VALUE_MAX	__INT_MAX
-
-struct timespec;
-
-__BEGIN_DECLS
-int	 sem_close(sem_t *);
-int	 sem_destroy(sem_t *);
-int	 sem_getvalue(sem_t * __restrict, int * __restrict);
-int	 sem_init(sem_t *, int, unsigned int);
-sem_t	*sem_open(const char *, int, ...);
-int	 sem_post(sem_t *);
-int	 sem_timedwait(sem_t * __restrict, const struct timespec * __restrict);
-int	 sem_trywait(sem_t *);
-int	 sem_unlink(const char *);
-int	 sem_wait(sem_t *);
-__END_DECLS
-
-#endif /* !_SEMAPHORE_H_ */
diff --git a/include.new/setjmp.h b/include.new/setjmp.h
deleted file mode 100644
index 6693b24..0000000
--- a/include.new/setjmp.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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. 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.
- *
- *	@(#)setjmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/include/setjmp.h 234785 2012-04-29 11:04:31Z dim $
- */
-
-#ifndef _SETJMP_H_
-#define _SETJMP_H_
-
-#include <sys/cdefs.h>
-
-/* The size of the jmp_buf is machine dependent: */
-#include <machine/setjmp.h>
-
-__BEGIN_DECLS
-#if __BSD_VISIBLE || __XSI_VISIBLE >= 600
-void	_longjmp(jmp_buf, int) __dead2;
-int	_setjmp(jmp_buf) __returns_twice;
-#endif
-void	longjmp(jmp_buf, int) __dead2;
-#if __BSD_VISIBLE
-void	longjmperror(void);
-#endif
-int	setjmp(jmp_buf) __returns_twice;
-#if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE
-void	siglongjmp(sigjmp_buf, int) __dead2;
-int	sigsetjmp(sigjmp_buf, int) __returns_twice;
-#endif
-__END_DECLS
-
-#endif /* !_SETJMP_H_ */
diff --git a/include.new/sgtty.h b/include.new/sgtty.h
deleted file mode 100644
index 723c69d..0000000
--- a/include.new/sgtty.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- *
- *	@(#)sgtty.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef USE_OLD_TTY
-#define	USE_OLD_TTY
-#endif
-#include <sys/ioctl.h>
diff --git a/include.new/sha.h b/include.new/sha.h
deleted file mode 100644
index 17b8d02..0000000
--- a/include.new/sha.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * 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 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 cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``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.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- *
- * $FreeBSD: releng/10.2/lib/libmd/sha.h 154479 2006-01-17 15:35:57Z phk $
- */
-
-#ifndef _SHA_H_
-#define _SHA_H_		1
-
-#include <sys/cdefs.h>
-#include <sys/types.h>		/* XXX switch to machine/ansi.h and __ types */
-
-#define	SHA_CBLOCK	64
-#define	SHA_LBLOCK	16
-#define	SHA_BLOCK	16
-#define	SHA_LAST_BLOCK  56
-#define	SHA_LENGTH_BLOCK 8
-#define	SHA_DIGEST_LENGTH 20
-
-typedef struct SHAstate_st {
-	uint32_t h0, h1, h2, h3, h4;
-	uint32_t Nl, Nh;
-	uint32_t data[SHA_LBLOCK];
-	int num;
-} SHA_CTX;
-#define	SHA1_CTX	SHA_CTX
-
-__BEGIN_DECLS
-void	SHA_Init(SHA_CTX *c);
-void	SHA_Update(SHA_CTX *c, const void *data, size_t len);
-void	SHA_Final(unsigned char *md, SHA_CTX *c);
-char   *SHA_End(SHA_CTX *, char *);
-char   *SHA_File(const char *, char *);
-char   *SHA_FileChunk(const char *, char *, off_t, off_t);
-char   *SHA_Data(const void *, unsigned int, char *);
-void	SHA1_Init(SHA_CTX *c);
-void	SHA1_Update(SHA_CTX *c, const void *data, size_t len);
-void	SHA1_Final(unsigned char *md, SHA_CTX *c);
-char   *SHA1_End(SHA_CTX *, char *);
-char   *SHA1_File(const char *, char *);
-char   *SHA1_FileChunk(const char *, char *, off_t, off_t);
-char   *SHA1_Data(const void *, unsigned int, char *);
-__END_DECLS
-
-#endif /* !_SHA_H_ */
diff --git a/include.new/sha256.h b/include.new/sha256.h
deleted file mode 100644
index dda9841..0000000
--- a/include.new/sha256.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright 2005 Colin Percival
- * 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.
- *
- * 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: releng/10.2/lib/libmd/sha256.h 154479 2006-01-17 15:35:57Z phk $
- */
-
-#ifndef _SHA256_H_
-#define _SHA256_H_
-
-#include <sys/types.h>
-
-typedef struct SHA256Context {
-	uint32_t state[8];
-	uint32_t count[2];
-	unsigned char buf[64];
-} SHA256_CTX;
-
-__BEGIN_DECLS
-void	SHA256_Init(SHA256_CTX *);
-void	SHA256_Update(SHA256_CTX *, const void *, size_t);
-void	SHA256_Final(unsigned char [32], SHA256_CTX *);
-char   *SHA256_End(SHA256_CTX *, char *);
-char   *SHA256_File(const char *, char *);
-char   *SHA256_FileChunk(const char *, char *, off_t, off_t);
-char   *SHA256_Data(const void *, unsigned int, char *);
-__END_DECLS
-
-#endif /* !_SHA256_H_ */
diff --git a/include.new/sha512.h b/include.new/sha512.h
deleted file mode 100644
index 79fb7fc..0000000
--- a/include.new/sha512.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright 2005 Colin Percival
- * 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.
- *
- * 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: releng/10.2/lib/libmd/sha512.h 220496 2011-04-09 13:56:29Z markm $
- */
-
-#ifndef _SHA512_H_
-#define _SHA512_H_
-
-#include <sys/types.h>
-
-typedef struct SHA512Context {
-	uint64_t state[8];
-	uint64_t count[2];
-	unsigned char buf[128];
-} SHA512_CTX;
-
-__BEGIN_DECLS
-void	SHA512_Init(SHA512_CTX *);
-void	SHA512_Update(SHA512_CTX *, const void *, size_t);
-void	SHA512_Final(unsigned char [64], SHA512_CTX *);
-char   *SHA512_End(SHA512_CTX *, char *);
-char   *SHA512_File(const char *, char *);
-char   *SHA512_FileChunk(const char *, char *, off_t, off_t);
-char   *SHA512_Data(const void *, unsigned int, char *);
-__END_DECLS
-
-#endif /* !_SHA512_H_ */
diff --git a/include.new/signal.h b/include.new/signal.h
deleted file mode 100644
index 5b7bac5..0000000
--- a/include.new/signal.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * Copyright (c) 1991, 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. 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.
- *
- *	@(#)signal.h	8.3 (Berkeley) 3/30/94
- * $FreeBSD: releng/10.2/include/signal.h 228468 2011-12-13 13:32:56Z ed $
- */
-
-#ifndef _SIGNAL_H_
-#define	_SIGNAL_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/signal.h>
-
-#if __BSD_VISIBLE
-/*
- * XXX should enlarge these, if only to give empty names instead of bounds
- * errors for large signal numbers.
- */
-extern const char * const sys_signame[NSIG];
-extern const char * const sys_siglist[NSIG];
-extern const int sys_nsig;
-#endif
-
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-struct pthread;		/* XXX */
-typedef struct pthread *__pthread_t;
-#if !defined(_PTHREAD_T_DECLARED) && __POSIX_VISIBLE >= 200809
-typedef __pthread_t pthread_t;
-#define	_PTHREAD_T_DECLARED
-#endif
-#endif /* __POSIX_VISIBLE || __XSI_VISIBLE */
-
-__BEGIN_DECLS
-int	raise(int);
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-int	kill(__pid_t, int);
-int	pthread_kill(__pthread_t, int);
-int	pthread_sigmask(int, const __sigset_t * __restrict,
-	    __sigset_t * __restrict);
-int	sigaction(int, const struct sigaction * __restrict,
-	    struct sigaction * __restrict);
-int	sigaddset(sigset_t *, int);
-int	sigdelset(sigset_t *, int);
-int	sigemptyset(sigset_t *);
-int	sigfillset(sigset_t *);
-int	sigismember(const sigset_t *, int);
-int	sigpending(sigset_t *);
-int	sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict);
-int	sigsuspend(const sigset_t *);
-int	sigwait(const sigset_t * __restrict, int * __restrict);
-#endif
-
-#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 600
-int	sigqueue(__pid_t, int, const union sigval);
-
-struct timespec;
-int	sigtimedwait(const sigset_t * __restrict, siginfo_t * __restrict,
-	    const struct timespec * __restrict);
-int	sigwaitinfo(const sigset_t * __restrict, siginfo_t * __restrict);
-#endif
-
-#if __XSI_VISIBLE
-int	killpg(__pid_t, int);
-int	sigaltstack(const stack_t * __restrict, stack_t * __restrict); 
-int	sighold(int);
-int	sigignore(int);
-int	sigpause(int);
-int	sigrelse(int);
-void	(*sigset(int, void (*)(int)))(int);
-int	xsi_sigpause(int);
-#endif
-
-#if __XSI_VISIBLE >= 600
-int	siginterrupt(int, int);
-#endif
-
-#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
-void	psignal(unsigned int, const char *);
-#endif
-
-#if __BSD_VISIBLE
-int	sigblock(int);
-struct __ucontext;		/* XXX spec requires a complete declaration. */
-int	sigreturn(const struct __ucontext *);
-int	sigsetmask(int);
-int	sigstack(const struct sigstack *, struct sigstack *);
-int	sigvec(int, struct sigvec *, struct sigvec *);
-#endif
-__END_DECLS
-
-#endif /* !_SIGNAL_H_ */
diff --git a/include.new/spawn.h b/include.new/spawn.h
deleted file mode 100644
index 285000f..0000000
--- a/include.new/spawn.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/include/spawn.h 179873 2008-06-19 07:30:32Z ed $
- */
-
-#ifndef _SPAWN_H_
-#define _SPAWN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/_sigset.h>
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-#ifndef _SIGSET_T_DECLARED
-#define	_SIGSET_T_DECLARED
-typedef	__sigset_t	sigset_t;
-#endif
-
-struct sched_param;
-
-typedef struct __posix_spawnattr		*posix_spawnattr_t;
-typedef struct __posix_spawn_file_actions	*posix_spawn_file_actions_t;
-
-#define POSIX_SPAWN_RESETIDS		0x01
-#define POSIX_SPAWN_SETPGROUP		0x02
-#define POSIX_SPAWN_SETSCHEDPARAM	0x04
-#define POSIX_SPAWN_SETSCHEDULER	0x08
-#define POSIX_SPAWN_SETSIGDEF		0x10
-#define POSIX_SPAWN_SETSIGMASK		0x20
-
-__BEGIN_DECLS
-/*
- * Spawn routines
- *
- * XXX both arrays should be __restrict, but this does not work when GCC
- * is invoked with -std=c99.
- */
-int posix_spawn(pid_t * __restrict, const char * __restrict,
-    const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
-    char * const [], char * const []);
-int posix_spawnp(pid_t * __restrict, const char * __restrict,
-    const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
-    char * const [], char * const []);
-
-/*
- * File descriptor actions
- */
-int posix_spawn_file_actions_init(posix_spawn_file_actions_t *);
-int posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *);
-
-int posix_spawn_file_actions_addopen(posix_spawn_file_actions_t * __restrict,
-    int, const char * __restrict, int, mode_t);
-int posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *, int, int);
-int posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *, int);
-
-/*
- * Spawn attributes
- */
-int posix_spawnattr_init(posix_spawnattr_t *);
-int posix_spawnattr_destroy(posix_spawnattr_t *);
-
-int posix_spawnattr_getflags(const posix_spawnattr_t * __restrict,
-    short * __restrict);
-int posix_spawnattr_getpgroup(const posix_spawnattr_t * __restrict,
-    pid_t * __restrict);
-int posix_spawnattr_getschedparam(const posix_spawnattr_t * __restrict,
-    struct sched_param * __restrict);
-int posix_spawnattr_getschedpolicy(const posix_spawnattr_t * __restrict,
-    int * __restrict);
-int posix_spawnattr_getsigdefault(const posix_spawnattr_t * __restrict,
-    sigset_t * __restrict);
-int posix_spawnattr_getsigmask(const posix_spawnattr_t * __restrict,
-    sigset_t * __restrict sigmask);
-
-int posix_spawnattr_setflags(posix_spawnattr_t *, short);
-int posix_spawnattr_setpgroup(posix_spawnattr_t *, pid_t);
-int posix_spawnattr_setschedparam(posix_spawnattr_t * __restrict,
-    const struct sched_param * __restrict);
-int posix_spawnattr_setschedpolicy(posix_spawnattr_t *, int);
-int posix_spawnattr_setsigdefault(posix_spawnattr_t * __restrict,
-    const sigset_t * __restrict);
-int posix_spawnattr_setsigmask(posix_spawnattr_t * __restrict,
-    const sigset_t * __restrict);
-__END_DECLS
-
-#endif /* !_SPAWN_H_ */
diff --git a/include.new/ssp/ssp.h b/include.new/ssp/ssp.h
deleted file mode 100644
index 576bcf3..0000000
--- a/include.new/ssp/ssp.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Object size checking support macros.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
-
-/* As a special exception, if you link this library with files compiled with
-   GCC to produce an executable, this does not cause the resulting executable
-   to be covered by the GNU General Public License. This exception does not
-   however invalidate any other reasons why the executable file might be
-   covered by the GNU General Public License.  */
-
-#ifndef _SSP_H
-#define _SSP_H 1
-
-#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 \
-    && defined __GNUC__ \
-    && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) \
-    && !defined __cplusplus
-# if _FORTIFY_SOURCE == 1
-#  define __SSP_FORTIFY_LEVEL 1
-# elif _FORTIFY_SOURCE > 1
-#  define __SSP_FORTIFY_LEVEL 2
-# endif
-#endif
-
-#if __SSP_FORTIFY_LEVEL > 0
-# include <stddef.h>
-# define __ssp_bos(ptr) __builtin_object_size (ptr, __SSP_FORTIFY_LEVEL > 1)
-# define __ssp_bos0(ptr) __builtin_object_size (ptr, 0)
-
-# define __SSP_REDIRECT(name, proto, alias) \
-  name proto __asm__ (__SSP_ASMNAME (#alias))
-# define __SSP_ASMNAME(cname)  __SSP_ASMNAME2 (__USER_LABEL_PREFIX__, cname)
-# define __SSP_ASMNAME2(prefix, cname) __SSP_ASMNAME3 (prefix) cname
-# define __SSP_ASMNAME3(prefix) #prefix
-
-# define __SSP_HAVE_VSNPRINTF
-
-extern void __chk_fail (void) __attribute__((__noreturn__));
-#endif
-
-#endif /* _SSP_H */
diff --git a/include.new/ssp/stdio.h b/include.new/ssp/stdio.h
deleted file mode 100644
index 00c687f..0000000
--- a/include.new/ssp/stdio.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Checking macros for stdio functions.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
-
-/* As a special exception, if you link this library with files compiled with
-   GCC to produce an executable, this does not cause the resulting executable
-   to be covered by the GNU General Public License. This exception does not
-   however invalidate any other reasons why the executable file might be
-   covered by the GNU General Public License.  */
-
-#ifndef _SSP_STDIO_H
-#define _SSP_STDIO_H 1
-
-#include <ssp.h>
-#include_next <stdio.h>
-
-#if __SSP_FORTIFY_LEVEL > 0
-
-#include <stdarg.h>
-
-#undef sprintf
-#undef vsprintf
-#undef snprintf
-#undef vsnprintf
-#undef gets
-#undef fgets
-
-extern int __sprintf_chk (char *__restrict__ __s, int __flag, size_t __slen,
-			  __const char *__restrict__ __format, ...);
-extern int __vsprintf_chk (char *__restrict__ __s, int __flag, size_t __slen,
-			   __const char *__restrict__ __format,
-			   va_list __ap);
-
-#define sprintf(str, ...) \
-  __builtin___sprintf_chk (str, 0, __ssp_bos (str), \
-			   __VA_ARGS__)
-#define vsprintf(str, fmt, ap) \
-  __builtin___vsprintf_chk (str, 0, __ssp_bos (str), fmt, ap)
-
-extern int __snprintf_chk (char *__restrict__ __s, size_t __n, int __flag,
-			   size_t __slen, __const char *__restrict__ __format,
-			   ...);
-extern int __vsnprintf_chk (char *__restrict__ __s, size_t __n, int __flag,
-			    size_t __slen, __const char *__restrict__ __format,
-			    va_list __ap);
-
-#define snprintf(str, len, ...) \
-  __builtin___snprintf_chk (str, len, 0, __ssp_bos (str), __VA_ARGS__)
-#define vsnprintf(str, len, fmt, ap) \
-  __builtin___vsnprintf_chk (str, len, 0, __ssp_bos (str), fmt, ap)
-
-extern char *__gets_chk (char *__str, size_t);
-extern char *__SSP_REDIRECT (__gets_alias, (char *__str), gets);
-
-extern inline __attribute__((__always_inline__)) char *
-gets (char *__str)
-{
-  if (__ssp_bos (__str) != (size_t) -1)
-    return __gets_chk (__str, __ssp_bos (__str));
-  return __gets_alias (__str);
-}
-
-extern char *__SSP_REDIRECT (__fgets_alias,
-			     (char *__restrict__ __s, int __n,
-			      FILE *__restrict__ __stream), fgets);
-
-extern inline __attribute__((__always_inline__)) char *
-fgets (char *__restrict__ __s, int __n, FILE *__restrict__ __stream)
-{
-  if (__ssp_bos (__s) != (size_t) -1 && (size_t) __n > __ssp_bos (__s))
-    __chk_fail ();
-  return __fgets_alias (__s, __n, __stream);
-}
-
-#endif /* __SSP_FORTIFY_LEVEL > 0 */
-#endif /* _SSP_STDIO_H */
diff --git a/include.new/ssp/string.h b/include.new/ssp/string.h
deleted file mode 100644
index 57a17cf..0000000
--- a/include.new/ssp/string.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* Checking macros for string functions.
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
-
-/* As a special exception, if you link this library with files compiled with
-   GCC to produce an executable, this does not cause the resulting executable
-   to be covered by the GNU General Public License. This exception does not
-   however invalidate any other reasons why the executable file might be
-   covered by the GNU General Public License.  */
-
-#ifndef _SSP_STRING_H
-#define _SSP_STRING_H 1
-
-#include <ssp.h>
-#include_next <string.h>
-
-#if __SSP_FORTIFY_LEVEL > 0
-
-#undef memcpy
-#undef memmove
-#undef memset
-#undef strcat
-#undef strcpy
-#undef strncat
-#undef strncpy
-#undef mempcpy
-#undef stpcpy
-#undef bcopy
-#undef bzero
-
-#define memcpy(dest, src, len) \
-  ((__ssp_bos0 (dest) != (size_t) -1)					\
-   ? __builtin___memcpy_chk (dest, src, len, __ssp_bos0 (dest))		\
-   : __memcpy_ichk (dest, src, len))
-static inline __attribute__((__always_inline__)) void *
-__memcpy_ichk (void *__restrict__ __dest, const void *__restrict__ __src,
-	       size_t __len)
-{
-  return __builtin___memcpy_chk (__dest, __src, __len, __ssp_bos0 (__dest));
-}
-
-
-#define memmove(dest, src, len) \
-  ((__ssp_bos0 (dest) != (size_t) -1)					\
-   ? __builtin___memmove_chk (dest, src, len, __ssp_bos0 (dest))		\
-   : __memmove_ichk (dest, src, len))
-static inline __attribute__((__always_inline__)) void *
-__memmove_ichk (void *__dest, const void *__src, size_t __len)
-{
-  return __builtin___memmove_chk (__dest, __src, __len, __ssp_bos0 (__dest));
-}
-
-
-#define mempcpy(dest, src, len) \
-  ((__ssp_bos0 (dest) != (size_t) -1)					\
-   ? __builtin___mempcpy_chk (dest, src, len, __ssp_bos0 (dest))	\
-   : __mempcpy_ichk (dest, src, len))
-static inline __attribute__((__always_inline__)) void *
-__mempcpy_ichk (void *__restrict__ __dest, const void *__restrict__ __src,
-		size_t __len)
-{
-  return __builtin___mempcpy_chk (__dest, __src, __len, __ssp_bos0 (__dest));
-}
-
-
-#define memset(dest, ch, len) \
-  ((__ssp_bos0 (dest) != (size_t) -1)					\
-   ? __builtin___memset_chk (dest, ch, len, __ssp_bos0 (dest))		\
-   : __memset_ichk (dest, ch, len))
-static inline __attribute__((__always_inline__)) void *
-__memset_ichk (void *__dest, int __ch, size_t __len)
-{
-  return __builtin___memset_chk (__dest, __ch, __len, __ssp_bos0 (__dest));
-}
-
-#define bcopy(src, dest, len) ((void) \
- ((__ssp_bos0 (dest) != (size_t) -1)					\
-   ? __builtin___memmove_chk (dest, src, len, __ssp_bos0 (dest))	\
-   : __memmove_ichk (dest, src, len)))
-#define bzero(dest, len) ((void) \
-  ((__ssp_bos0 (dest) != (size_t) -1)					\
-   ? __builtin___memset_chk (dest, '\0', len, __ssp_bos0 (dest))	\
-   : __memset_ichk (dest, '\0', len)))
-
-
-#define strcpy(dest, src) \
-  ((__ssp_bos (dest) != (size_t) -1)					\
-   ? __builtin___strcpy_chk (dest, src, __ssp_bos (dest))		\
-   : __strcpy_ichk (dest, src))
-static inline __attribute__((__always_inline__)) char *
-__strcpy_ichk (char *__restrict__ __dest, const char *__restrict__ __src)
-{
-  return __builtin___strcpy_chk (__dest, __src, __ssp_bos (__dest));
-}
-
-
-#define stpcpy(dest, src) \
-  ((__ssp_bos (dest) != (size_t) -1)					\
-   ? __builtin___stpcpy_chk (dest, src, __ssp_bos (dest))		\
-   : __stpcpy_ichk (dest, src))
-static inline __attribute__((__always_inline__)) char *
-__stpcpy_ichk (char *__restrict__ __dest, const char *__restrict__ __src)
-{
-  return __builtin___stpcpy_chk (__dest, __src, __ssp_bos (__dest));
-}
-
-
-#define strncpy(dest, src, len) \
-  ((__ssp_bos (dest) != (size_t) -1)					\
-   ? __builtin___strncpy_chk (dest, src, len, __ssp_bos (dest))		\
-   : __strncpy_ichk (dest, src, len))
-static inline __attribute__((__always_inline__)) char *
-__strncpy_ichk (char *__restrict__ __dest, const char *__restrict__ __src,
-		size_t __len)
-{
-  return __builtin___strncpy_chk (__dest, __src, __len, __ssp_bos (__dest));
-}
-
-
-#define strcat(dest, src) \
-  ((__ssp_bos (dest) != (size_t) -1)					\
-   ? __builtin___strcat_chk (dest, src, __ssp_bos (dest))		\
-   : __strcat_ichk (dest, src))
-static inline __attribute__((__always_inline__)) char *
-__strcat_ichk (char *__restrict__ __dest, const char *__restrict__ __src)
-{
-  return __builtin___strcat_chk (__dest, __src, __ssp_bos (__dest));
-}
-
-
-#define strncat(dest, src, len) \
-  ((__ssp_bos (dest) != (size_t) -1)					\
-   ? __builtin___strncat_chk (dest, src, len, __ssp_bos (dest))		\
-   : __strncat_ichk (dest, src, len))
-static inline __attribute__((__always_inline__)) char *
-__strncat_ichk (char *__restrict__ __dest, const char *__restrict__ __src,
-		size_t __len)
-{
-  return __builtin___strncat_chk (__dest, __src, __len, __ssp_bos (__dest));
-}
-
-#endif /* __SSP_FORTIFY_LEVEL > 0 */
-#endif /* _SSP_STRING_H */
diff --git a/include.new/ssp/unistd.h b/include.new/ssp/unistd.h
deleted file mode 100644
index de62166..0000000
--- a/include.new/ssp/unistd.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Checking macros for unistd functions.
-   Copyright (C) 2005 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-GCC is free software; you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free
-Software Foundation; either version 2, or (at your option) any later
-version.
-
-In addition to the permissions in the GNU General Public License, the
-Free Software Foundation gives you unlimited permission to link the
-compiled version of this file into combinations with other programs,
-and to distribute those combinations without any restriction coming
-from the use of this file.  (The General Public License restrictions
-do apply in other respects; for example, they cover modification of
-the file, and distribution when not linked into a combine
-executable.)
-
-GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-for more details.
-
-You should have received a copy of the GNU General Public License
-along with GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
-
-/* As a special exception, if you link this library with files compiled with
-   GCC to produce an executable, this does not cause the resulting executable
-   to be covered by the GNU General Public License. This exception does not
-   however invalidate any other reasons why the executable file might be
-   covered by the GNU General Public License.  */
-
-#ifndef _SSP_UNISTD_H
-#define _SSP_UNISTD_H 1
-
-#include <ssp.h>
-#include_next <unistd.h>
-
-#if __SSP_FORTIFY_LEVEL > 0
-
-#undef read
-#undef readlink
-#undef getcwd
-
-extern ssize_t __SSP_REDIRECT (__read_alias, (int __fd, void *__buf,
-					      size_t __nbytes), read);
-
-extern inline __attribute__((__always_inline__)) ssize_t
-read (int __fd, void *__buf, size_t __nbytes)
-{
-  if (__ssp_bos0 (__buf) != (size_t) -1 && __nbytes > __ssp_bos0 (__buf))
-    __chk_fail ();
-  return __read_alias (__fd, __buf, __nbytes);
-}
-
-extern int __SSP_REDIRECT (__readlink_alias,
-			   (const char *__restrict__ __path,
-			    char *__restrict__ __buf, size_t __len),
-			   readlink);
-
-extern inline __attribute__((__always_inline__)) int
-readlink (const char *__restrict__ __path, char *__restrict__ __buf,
-	  size_t __len)
-{
-  if (__ssp_bos (__buf) != (size_t) -1 && __len > __ssp_bos (__buf))
-    __chk_fail ();
-  return __readlink_alias (__path, __buf, __len);
-}
-
-extern char *__SSP_REDIRECT (__getcwd_alias,
-			     (char *__buf, size_t __size), getcwd);
-
-extern inline __attribute__((__always_inline__)) char *
-getcwd (char *__buf, size_t __size)
-{
-  if (__ssp_bos (__buf) != (size_t) -1 && __size > __ssp_bos (__buf))
-    __chk_fail ();
-  return __getcwd_alias (__buf, __size);
-}
-
-#endif /* __SSP_FORTIFY_LEVEL > 0 */
-#endif /* _SSP_UNISTD_H */
diff --git a/include.new/stab.h b/include.new/stab.h
deleted file mode 100644
index 88434c3..0000000
--- a/include.new/stab.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 1991, 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. 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.
- *
- *	@(#)stab.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/stab.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _STAB_H_
-#define _STAB_H_
-
-/*
- * The following are symbols used by various debuggers and by the Pascal
- * compiler.  Each of them must have one (or more) of the bits defined by
- * the N_STAB mask set.
- */
-
-#define	N_GSYM		0x20	/* global symbol */
-#define	N_FNAME		0x22	/* F77 function name */
-#define	N_FUN		0x24	/* procedure name */
-#define	N_STSYM		0x26	/* data segment variable */
-#define	N_LCSYM		0x28	/* bss segment variable */
-#define	N_MAIN		0x2a	/* main function name */
-#define	N_PC		0x30	/* global Pascal symbol */
-#define	N_RSYM		0x40	/* register variable */
-#define	N_SLINE		0x44	/* text segment line number */
-#define	N_DSLINE	0x46	/* data segment line number */
-#define	N_BSLINE	0x48	/* bss segment line number */
-#define	N_SSYM		0x60	/* structure/union element */
-#define	N_SO		0x64	/* main source file name */
-#define	N_LSYM		0x80	/* stack variable */
-#define	N_BINCL		0x82	/* include file beginning */
-#define	N_SOL		0x84	/* included source file name */
-#define	N_PSYM		0xa0	/* parameter variable */
-#define	N_EINCL		0xa2	/* include file end */
-#define	N_ENTRY		0xa4	/* alternate entry point */
-#define	N_LBRAC		0xc0	/* left bracket */
-#define	N_EXCL		0xc2	/* deleted include file */
-#define	N_RBRAC		0xe0	/* right bracket */
-#define	N_BCOMM		0xe2	/* begin common */
-#define	N_ECOMM		0xe4	/* end common */
-#define	N_ECOML		0xe8	/* end common (local name) */
-#define	N_LENG		0xfe	/* length of preceding entry */
-
-#endif
diff --git a/include.new/stand.h b/include.new/stand.h
deleted file mode 100644
index 2cc6c56..0000000
--- a/include.new/stand.h
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Copyright (c) 1998 Michael Smith.
- * 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.
- *
- * 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: releng/10.2/lib/libstand/stand.h 278602 2015-02-11 22:55:24Z ian $
- * From	$NetBSD: stand.h,v 1.22 1997/06/26 19:17:40 drochner Exp $	
- */
-
-/*-
- * Copyright (c) 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.
- * 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.
- *
- *	@(#)stand.h	8.1 (Berkeley) 6/11/93
- */
-
-#ifndef	STAND_H
-#define	STAND_H
-
-#include <sys/types.h>
-#include <sys/cdefs.h>
-#include <sys/stat.h>
-#include <sys/dirent.h>
-
-/* this header intentionally exports NULL from <string.h> */
-#include <string.h>
-
-#define CHK(fmt, args...)	printf("%s(%d): " fmt "\n", __func__, __LINE__ , ##args)
-#define PCHK(fmt, args...)	{printf("%s(%d): " fmt "\n", __func__, __LINE__ , ##args); getchar();}
-
-/* Avoid unwanted userlandish components */
-#define _KERNEL
-#include <sys/errno.h>
-#undef _KERNEL
-
-/* special stand error codes */
-#define	EADAPT	(ELAST+1)	/* bad adaptor */
-#define	ECTLR	(ELAST+2)	/* bad controller */
-#define	EUNIT	(ELAST+3)	/* bad unit */
-#define ESLICE	(ELAST+4)	/* bad slice */
-#define	EPART	(ELAST+5)	/* bad partition */
-#define	ERDLAB	(ELAST+6)	/* can't read disk label */
-#define	EUNLAB	(ELAST+7)	/* unlabeled disk */
-#define	EOFFSET	(ELAST+8)	/* relative seek not supported */
-#define	ESALAST	(ELAST+8)	/* */
-
-struct open_file;
-
-/*
- * This structure is used to define file system operations in a file system
- * independent way.
- *
- * XXX note that filesystem providers should export a pointer to their fs_ops
- *     struct, so that consumers can reference this and thus include the
- *     filesystems that they require.
- */
-struct fs_ops {
-    const char	*fs_name;
-    int		(*fo_open)(const char *path, struct open_file *f);
-    int		(*fo_close)(struct open_file *f);
-    int		(*fo_read)(struct open_file *f, void *buf,
-			   size_t size, size_t *resid);
-    int		(*fo_write)(struct open_file *f, void *buf,
-			    size_t size, size_t *resid);
-    off_t	(*fo_seek)(struct open_file *f, off_t offset, int where);
-    int		(*fo_stat)(struct open_file *f, struct stat *sb);
-    int		(*fo_readdir)(struct open_file *f, struct dirent *d);
-};
-
-/*
- * libstand-supplied filesystems
- */
-extern struct fs_ops ufs_fsops;
-extern struct fs_ops tftp_fsops;
-extern struct fs_ops nfs_fsops;
-extern struct fs_ops cd9660_fsops;
-extern struct fs_ops nandfs_fsops;
-extern struct fs_ops gzipfs_fsops;
-extern struct fs_ops bzipfs_fsops;
-extern struct fs_ops dosfs_fsops;
-extern struct fs_ops ext2fs_fsops;
-extern struct fs_ops splitfs_fsops;
-
-/* where values for lseek(2) */
-#define	SEEK_SET	0	/* set file offset to offset */
-#define	SEEK_CUR	1	/* set file offset to current plus offset */
-#define	SEEK_END	2	/* set file offset to EOF plus offset */
-
-/* 
- * Device switch
- */
-struct devsw {
-    const char	dv_name[8];
-    int		dv_type;		/* opaque type constant, arch-dependant */
-    int		(*dv_init)(void);	/* early probe call */
-    int		(*dv_strategy)(void *devdata, int rw, daddr_t blk, size_t size,
-			       char *buf, size_t *rsize);
-    int		(*dv_open)(struct open_file *f, ...);
-    int		(*dv_close)(struct open_file *f);
-    int		(*dv_ioctl)(struct open_file *f, u_long cmd, void *data);
-    void	(*dv_print)(int verbose);	/* print device information */
-    void	(*dv_cleanup)(void);
-};
-
-/*
- * libstand-supplied device switch
- */
-extern struct devsw netdev;
-
-extern int errno;
-
-struct open_file {
-    int			f_flags;	/* see F_* below */
-    struct devsw	*f_dev;		/* pointer to device operations */
-    void		*f_devdata;	/* device specific data */
-    struct fs_ops	*f_ops;		/* pointer to file system operations */
-    void		*f_fsdata;	/* file system specific data */
-    off_t		f_offset;	/* current file offset */
-    char		*f_rabuf;	/* readahead buffer pointer */
-    size_t		f_ralen;	/* valid data in readahead buffer */
-    off_t		f_raoffset;	/* consumer offset in readahead buffer */
-#define SOPEN_RASIZE	512
-};
-
-#define	SOPEN_MAX	64
-extern struct open_file files[];
-
-/* f_flags values */
-#define	F_READ		0x0001	/* file opened for reading */
-#define	F_WRITE		0x0002	/* file opened for writing */
-#define	F_RAW		0x0004	/* raw device open - no file system */
-#define F_NODEV		0x0008	/* network open - no device */
-
-#define isascii(c)	(((c) & ~0x7F) == 0)
-
-static __inline int isupper(int c)
-{
-    return c >= 'A' && c <= 'Z';
-}
-
-static __inline int islower(int c)
-{
-    return c >= 'a' && c <= 'z';
-}
-
-static __inline int isspace(int c)
-{
-    return c == ' ' || (c >= 0x9 && c <= 0xd);
-}
-
-static __inline int isdigit(int c)
-{
-    return c >= '0' && c <= '9';
-}
-
-static __inline int isxdigit(int c)
-{
-    return isdigit(c) || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
-}
-
-static __inline int isalpha(int c)
-{
-    return isupper(c) || islower(c);
-}
-
-static __inline int isalnum(int c)
-{
-    return isalpha(c) || isdigit(c);
-}
-
-static __inline int toupper(int c)
-{
-    return islower(c) ? c - 'a' + 'A' : c;
-}
-
-static __inline int tolower(int c)
-{
-    return isupper(c) ? c - 'A' + 'a' : c;
-}
-
-/* sbrk emulation */
-extern void	setheap(void *base, void *top);
-extern char	*sbrk(int incr);
-
-/* Matt Dillon's zalloc/zmalloc */
-extern void	*malloc(size_t bytes);
-extern void	free(void *ptr);
-/*#define free(p)	{CHK("free %p", p); free(p);} */ /* use for catching guard violations */
-extern void	*calloc(size_t n1, size_t n2);
-extern void	*realloc(void *ptr, size_t size);
-extern void	*reallocf(void *ptr, size_t size);
-extern void	mallocstats(void);
-
-extern int	printf(const char *fmt, ...) __printflike(1, 2);
-extern void	vprintf(const char *fmt, __va_list);
-extern int	sprintf(char *buf, const char *cfmt, ...) __printflike(2, 3);
-extern int	snprintf(char *buf, size_t size, const char *cfmt, ...) __printflike(3, 4);
-extern void	vsprintf(char *buf, const char *cfmt, __va_list);
-
-extern void	twiddle(u_int callerdiv);
-extern void	twiddle_divisor(u_int globaldiv);
-
-extern void	ngets(char *, int);
-#define gets(x)	ngets((x), 0)
-extern int	fgetstr(char *buf, int size, int fd);
-
-extern int	open(const char *, int);
-#define	O_RDONLY	0x0
-#define O_WRONLY	0x1
-#define O_RDWR		0x2
-extern int	close(int);
-extern void	closeall(void);
-extern ssize_t	read(int, void *, size_t);
-extern ssize_t	write(int, void *, size_t);
-extern struct	dirent *readdirfd(int);
-
-extern void	srandom(u_long seed);
-extern u_long	random(void);
-    
-/* imports from stdlib, locally modified */
-extern long	strtol(const char *, char **, int);
-extern unsigned long	strtoul(const char *, char **, int);
-extern char	*optarg;			/* getopt(3) external variables */
-extern int	optind, opterr, optopt, optreset;
-extern int	getopt(int, char * const [], const char *);
-
-/* pager.c */
-extern void	pager_open(void);
-extern void	pager_close(void);
-extern int	pager_output(const char *lines);
-extern int	pager_file(const char *fname);
-
-/* No signal state to preserve */
-#define setjmp	_setjmp
-#define longjmp	_longjmp
-
-/* environment.c */
-#define EV_DYNAMIC	(1<<0)		/* value was dynamically allocated, free if changed/unset */
-#define EV_VOLATILE	(1<<1)		/* value is volatile, make a copy of it */
-#define EV_NOHOOK	(1<<2)		/* don't call hook when setting */
-
-struct env_var;
-typedef char	*(ev_format_t)(struct env_var *ev);
-typedef int	(ev_sethook_t)(struct env_var *ev, int flags,
-		    const void *value);
-typedef int	(ev_unsethook_t)(struct env_var *ev);
-
-struct env_var
-{
-    char		*ev_name;
-    int			ev_flags;
-    void		*ev_value;
-    ev_sethook_t	*ev_sethook;
-    ev_unsethook_t	*ev_unsethook;
-    struct env_var	*ev_next, *ev_prev;
-};
-extern struct env_var	*environ;
-
-extern struct env_var	*env_getenv(const char *name);
-extern int		env_setenv(const char *name, int flags,
-				   const void *value, ev_sethook_t sethook,
-				   ev_unsethook_t unsethook);
-extern char		*getenv(const char *name);
-extern int		setenv(const char *name, const char *value,
-			       int overwrite);
-extern int		putenv(const char *string);
-extern int		unsetenv(const char *name);
-
-extern ev_sethook_t	env_noset;		/* refuse set operation */
-extern ev_unsethook_t	env_nounset;		/* refuse unset operation */
-
-/* BCD conversions (undocumented) */
-extern u_char const	bcd2bin_data[];
-extern u_char const	bin2bcd_data[];
-extern char const	hex2ascii_data[];
-
-#define	bcd2bin(bcd)	(bcd2bin_data[bcd])
-#define	bin2bcd(bin)	(bin2bcd_data[bin])
-#define	hex2ascii(hex)	(hex2ascii_data[hex])
-
-/* min/max (undocumented) */
-static __inline int imax(int a, int b) { return (a > b ? a : b); }
-static __inline int imin(int a, int b) { return (a < b ? a : b); }
-static __inline long lmax(long a, long b) { return (a > b ? a : b); }
-static __inline long lmin(long a, long b) { return (a < b ? a : b); }
-static __inline u_int max(u_int a, u_int b) { return (a > b ? a : b); }
-static __inline u_int min(u_int a, u_int b) { return (a < b ? a : b); }
-static __inline quad_t qmax(quad_t a, quad_t b) { return (a > b ? a : b); }
-static __inline quad_t qmin(quad_t a, quad_t b) { return (a < b ? a : b); }
-static __inline u_long ulmax(u_long a, u_long b) { return (a > b ? a : b); }
-static __inline u_long ulmin(u_long a, u_long b) { return (a < b ? a : b); }
-
-/* swaps (undocumented, useful?) */
-#ifdef __i386__
-extern uint32_t	bswap32(uint32_t x);
-extern u_int64_t	bswap64(u_int64_t x);
-#endif
-
-/* null functions for device/filesystem switches (undocumented) */
-extern int	nodev(void);
-extern int	noioctl(struct open_file *, u_long, void *);
-extern void	nullsys(void);
-
-extern int	null_open(const char *path, struct open_file *f);
-extern int	null_close(struct open_file *f);
-extern int	null_read(struct open_file *f, void *buf, size_t size, size_t *resid);
-extern int	null_write(struct open_file *f, void *buf, size_t size, size_t *resid);
-extern off_t	null_seek(struct open_file *f, off_t offset, int where);
-extern int	null_stat(struct open_file *f, struct stat *sb);
-extern int	null_readdir(struct open_file *f, struct dirent *d);
-
-
-/* 
- * Machine dependent functions and data, must be provided or stubbed by 
- * the consumer 
- */
-extern int		getchar(void);
-extern int		ischar(void);
-extern void		putchar(int);
-extern int		devopen(struct open_file *, const char *, const char **);
-extern int		devclose(struct open_file *f);
-extern void		panic(const char *, ...) __dead2 __printflike(1, 2);
-extern struct fs_ops	*file_system[];
-extern struct devsw	*devsw[];
-
-/*
- * Expose byteorder(3) functions.
- */
-#ifndef _BYTEORDER_PROTOTYPED
-#define	_BYTEORDER_PROTOTYPED
-extern uint32_t		htonl(uint32_t);
-extern uint16_t		htons(uint16_t);
-extern uint32_t		ntohl(uint32_t);
-extern uint16_t		ntohs(uint16_t);
-#endif
-
-#ifndef _BYTEORDER_FUNC_DEFINED
-#define	_BYTEORDER_FUNC_DEFINED
-#define	htonl(x)	__htonl(x)
-#define	htons(x)	__htons(x)
-#define	ntohl(x)	__ntohl(x)
-#define	ntohs(x)	__ntohs(x)
-#endif
-
-void *Malloc(size_t, const char *, int);
-void *Calloc(size_t, size_t, const char *, int);
-void *Realloc(void *, size_t, const char *, int);
-void Free(void *, const char *, int);
-
-#if 1
-#define malloc(x)	Malloc(x, __FILE__, __LINE__)
-#define calloc(x, y)	Calloc(x, y, __FILE__, __LINE__)
-#define free(x)		Free(x, __FILE__, __LINE__)
-#define realloc(x, y)	Realloc(x, y, __FILE__, __LINE__)
-#else
-#define malloc(x)	Malloc(x, NULL, 0)
-#define calloc(x, y)	Calloc(x, y, NULL, 0)
-#define free(x)		Free(x, NULL, 0)
-#define realloc(x, y)	Realloc(x, y, NULL, 0)
-#endif
-
-#endif	/* STAND_H */
diff --git a/include.new/stdalign.h b/include.new/stdalign.h
deleted file mode 100644
index 90fd76b..0000000
--- a/include.new/stdalign.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2012 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/include/stdalign.h 228879 2011-12-25 20:51:40Z ed $
- */
-
-#ifndef __alignas_is_defined
-#define	__alignas_is_defined	1
-
-#if !defined(__cplusplus) || __cplusplus < 201103L
-#include <sys/cdefs.h>
-#define	alignas			_Alignas
-#endif
-
-#endif /* !__alignas_is_defined */
-
-#ifndef __alignof_is_defined
-#define	__alignof_is_defined	1
-
-#if !defined(__cplusplus) || __cplusplus < 201103L
-#include <sys/cdefs.h>
-#define	alignof			_Alignof
-#endif
-
-#endif /* !__alignof_is_defined */
diff --git a/include.new/stdarg.h b/include.new/stdarg.h
deleted file mode 100644
index 2cc8e36..0000000
--- a/include.new/stdarg.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*-
- * This file is in the public domain.
- */
-/* $FreeBSD: releng/10.2/sys/i386/include/stdarg.h 232276 2012-02-28 22:30:58Z tijl $ */
-
-#include <x86/stdarg.h>
diff --git a/include.new/stdatomic.h b/include.new/stdatomic.h
deleted file mode 100644
index 846f6d7..0000000
--- a/include.new/stdatomic.h
+++ /dev/null
@@ -1,411 +0,0 @@
-/*-
- * Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
- *                    David Chisnall <theraven@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.
- *
- * 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: releng/10.2/sys/sys/stdatomic.h 264496 2014-04-15 09:41:52Z tijl $
- */
-
-#ifndef _STDATOMIC_H_
-#define	_STDATOMIC_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#if __has_extension(c_atomic) || __has_extension(cxx_atomic)
-#define	__CLANG_ATOMICS
-#elif __GNUC_PREREQ__(4, 7)
-#define	__GNUC_ATOMICS
-#elif defined(__GNUC__)
-#define	__SYNC_ATOMICS
-#else
-#error "stdatomic.h does not support your compiler"
-#endif
-
-/*
- * 7.17.1 Atomic lock-free macros.
- */
-
-#ifdef __GCC_ATOMIC_BOOL_LOCK_FREE
-#define	ATOMIC_BOOL_LOCK_FREE		__GCC_ATOMIC_BOOL_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_CHAR_LOCK_FREE
-#define	ATOMIC_CHAR_LOCK_FREE		__GCC_ATOMIC_CHAR_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#define	ATOMIC_CHAR16_T_LOCK_FREE	__GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#define	ATOMIC_CHAR32_T_LOCK_FREE	__GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#define	ATOMIC_WCHAR_T_LOCK_FREE	__GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_SHORT_LOCK_FREE
-#define	ATOMIC_SHORT_LOCK_FREE		__GCC_ATOMIC_SHORT_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_INT_LOCK_FREE
-#define	ATOMIC_INT_LOCK_FREE		__GCC_ATOMIC_INT_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_LONG_LOCK_FREE
-#define	ATOMIC_LONG_LOCK_FREE		__GCC_ATOMIC_LONG_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_LLONG_LOCK_FREE
-#define	ATOMIC_LLONG_LOCK_FREE		__GCC_ATOMIC_LLONG_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_POINTER_LOCK_FREE
-#define	ATOMIC_POINTER_LOCK_FREE	__GCC_ATOMIC_POINTER_LOCK_FREE
-#endif
-
-/*
- * 7.17.2 Initialization.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	ATOMIC_VAR_INIT(value)		(value)
-#define	atomic_init(obj, value)		__c11_atomic_init(obj, value)
-#else
-#define	ATOMIC_VAR_INIT(value)		{ .__val = (value) }
-#define	atomic_init(obj, value)		((void)((obj)->__val = (value)))
-#endif
-
-/*
- * Clang and recent GCC both provide predefined macros for the memory
- * orderings.  If we are using a compiler that doesn't define them, use the
- * clang values - these will be ignored in the fallback path.
- */
-
-#ifndef __ATOMIC_RELAXED
-#define __ATOMIC_RELAXED		0
-#endif
-#ifndef __ATOMIC_CONSUME
-#define __ATOMIC_CONSUME		1
-#endif
-#ifndef __ATOMIC_ACQUIRE
-#define __ATOMIC_ACQUIRE		2
-#endif
-#ifndef __ATOMIC_RELEASE
-#define __ATOMIC_RELEASE		3
-#endif
-#ifndef __ATOMIC_ACQ_REL
-#define __ATOMIC_ACQ_REL		4
-#endif
-#ifndef __ATOMIC_SEQ_CST
-#define __ATOMIC_SEQ_CST		5
-#endif
-
-/*
- * 7.17.3 Order and consistency.
- *
- * The memory_order_* constants that denote the barrier behaviour of the
- * atomic operations.
- */
-
-typedef enum {
-	memory_order_relaxed = __ATOMIC_RELAXED,
-	memory_order_consume = __ATOMIC_CONSUME,
-	memory_order_acquire = __ATOMIC_ACQUIRE,
-	memory_order_release = __ATOMIC_RELEASE,
-	memory_order_acq_rel = __ATOMIC_ACQ_REL,
-	memory_order_seq_cst = __ATOMIC_SEQ_CST
-} memory_order;
-
-/*
- * 7.17.4 Fences.
- */
-
-static __inline void
-atomic_thread_fence(memory_order __order __unused)
-{
-
-#ifdef __CLANG_ATOMICS
-	__c11_atomic_thread_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-	__atomic_thread_fence(__order);
-#else
-	__sync_synchronize();
-#endif
-}
-
-static __inline void
-atomic_signal_fence(memory_order __order __unused)
-{
-
-#ifdef __CLANG_ATOMICS
-	__c11_atomic_signal_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-	__atomic_signal_fence(__order);
-#else
-	__asm volatile ("" ::: "memory");
-#endif
-}
-
-/*
- * 7.17.5 Lock-free property.
- */
-
-#if defined(_KERNEL)
-/* Atomics in kernelspace are always lock-free. */
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), (_Bool)1)
-#elif defined(__CLANG_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__atomic_is_lock_free(sizeof(*(obj)), obj)
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__atomic_is_lock_free(sizeof((obj)->__val), &(obj)->__val)
-#else
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), sizeof((obj)->__val) <= sizeof(void *))
-#endif
-
-/*
- * 7.17.6 Atomic integer types.
- */
-
-typedef _Atomic(_Bool)			atomic_bool;
-typedef _Atomic(char)			atomic_char;
-typedef _Atomic(signed char)		atomic_schar;
-typedef _Atomic(unsigned char)		atomic_uchar;
-typedef _Atomic(short)			atomic_short;
-typedef _Atomic(unsigned short)		atomic_ushort;
-typedef _Atomic(int)			atomic_int;
-typedef _Atomic(unsigned int)		atomic_uint;
-typedef _Atomic(long)			atomic_long;
-typedef _Atomic(unsigned long)		atomic_ulong;
-typedef _Atomic(long long)		atomic_llong;
-typedef _Atomic(unsigned long long)	atomic_ullong;
-typedef _Atomic(__char16_t)		atomic_char16_t;
-typedef _Atomic(__char32_t)		atomic_char32_t;
-typedef _Atomic(___wchar_t)		atomic_wchar_t;
-typedef _Atomic(__int_least8_t)		atomic_int_least8_t;
-typedef _Atomic(__uint_least8_t)	atomic_uint_least8_t;
-typedef _Atomic(__int_least16_t)	atomic_int_least16_t;
-typedef _Atomic(__uint_least16_t)	atomic_uint_least16_t;
-typedef _Atomic(__int_least32_t)	atomic_int_least32_t;
-typedef _Atomic(__uint_least32_t)	atomic_uint_least32_t;
-typedef _Atomic(__int_least64_t)	atomic_int_least64_t;
-typedef _Atomic(__uint_least64_t)	atomic_uint_least64_t;
-typedef _Atomic(__int_fast8_t)		atomic_int_fast8_t;
-typedef _Atomic(__uint_fast8_t)		atomic_uint_fast8_t;
-typedef _Atomic(__int_fast16_t)		atomic_int_fast16_t;
-typedef _Atomic(__uint_fast16_t)	atomic_uint_fast16_t;
-typedef _Atomic(__int_fast32_t)		atomic_int_fast32_t;
-typedef _Atomic(__uint_fast32_t)	atomic_uint_fast32_t;
-typedef _Atomic(__int_fast64_t)		atomic_int_fast64_t;
-typedef _Atomic(__uint_fast64_t)	atomic_uint_fast64_t;
-typedef _Atomic(__intptr_t)		atomic_intptr_t;
-typedef _Atomic(__uintptr_t)		atomic_uintptr_t;
-typedef _Atomic(__size_t)		atomic_size_t;
-typedef _Atomic(__ptrdiff_t)		atomic_ptrdiff_t;
-typedef _Atomic(__intmax_t)		atomic_intmax_t;
-typedef _Atomic(__uintmax_t)		atomic_uintmax_t;
-
-/*
- * 7.17.7 Operations on atomic types.
- */
-
-/*
- * Compiler-specific operations.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_strong(object, expected, desired,	\
-	    success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_weak(object, expected, desired,	\
-	    success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__c11_atomic_exchange(object, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__c11_atomic_fetch_add(object, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__c11_atomic_fetch_and(object, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__c11_atomic_fetch_or(object, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__c11_atomic_fetch_sub(object, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__c11_atomic_fetch_xor(object, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__c11_atomic_load(object, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__c11_atomic_store(object, desired, order)
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 0, success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 1, success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__atomic_exchange_n(&(object)->__val, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__atomic_fetch_add(&(object)->__val, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__atomic_fetch_and(&(object)->__val, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__atomic_fetch_or(&(object)->__val, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__atomic_fetch_sub(&(object)->__val, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__atomic_fetch_xor(&(object)->__val, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__atomic_load_n(&(object)->__val, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__atomic_store_n(&(object)->__val, desired, order)
-#else
-#define	__atomic_apply_stride(object, operand) \
-	(((__typeof__((object)->__val))0) + (operand))
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)	__extension__ ({			\
-	__typeof__(expected) __ep = (expected);				\
-	__typeof__(*__ep) __e = *__ep;					\
-	(void)(success); (void)(failure);				\
-	(_Bool)((*__ep = __sync_val_compare_and_swap(&(object)->__val,	\
-	    __e, desired)) == __e);					\
-})
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-		desired, success, failure)
-#if __has_builtin(__sync_swap)
-/* Clang provides a full-barrier atomic exchange - use it if available. */
-#define	atomic_exchange_explicit(object, desired, order)		\
-	((void)(order), __sync_swap(&(object)->__val, desired))
-#else
-/*
- * __sync_lock_test_and_set() is only an acquire barrier in theory (although in
- * practice it is usually a full barrier) so we need an explicit barrier before
- * it.
- */
-#define	atomic_exchange_explicit(object, desired, order)		\
-__extension__ ({							\
-	__typeof__(object) __o = (object);				\
-	__typeof__(desired) __d = (desired);				\
-	(void)(order);							\
-	__sync_synchronize();						\
-	__sync_lock_test_and_set(&(__o)->__val, __d);			\
-})
-#endif
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_add(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_and(&(object)->__val, operand))
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_or(&(object)->__val, operand))
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_sub(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_xor(&(object)->__val, operand))
-#define	atomic_load_explicit(object, order)				\
-	((void)(order), __sync_fetch_and_add(&(object)->__val, 0))
-#define	atomic_store_explicit(object, desired, order)			\
-	((void)atomic_exchange_explicit(object, desired, order))
-#endif
-
-/*
- * Convenience functions.
- *
- * Don't provide these in kernel space. In kernel space, we should be
- * disciplined enough to always provide explicit barriers.
- */
-
-#ifndef _KERNEL
-#define	atomic_compare_exchange_strong(object, expected, desired)	\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_compare_exchange_weak(object, expected, desired)		\
-	atomic_compare_exchange_weak_explicit(object, expected,		\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_exchange(object, desired)				\
-	atomic_exchange_explicit(object, desired, memory_order_seq_cst)
-#define	atomic_fetch_add(object, operand)				\
-	atomic_fetch_add_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_and(object, operand)				\
-	atomic_fetch_and_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_or(object, operand)				\
-	atomic_fetch_or_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_sub(object, operand)				\
-	atomic_fetch_sub_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_xor(object, operand)				\
-	atomic_fetch_xor_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_load(object)						\
-	atomic_load_explicit(object, memory_order_seq_cst)
-#define	atomic_store(object, desired)					\
-	atomic_store_explicit(object, desired, memory_order_seq_cst)
-#endif /* !_KERNEL */
-
-/*
- * 7.17.8 Atomic flag type and operations.
- *
- * XXX: Assume atomic_bool can be used as an atomic_flag. Is there some
- * kind of compiler built-in type we could use?
- */
-
-typedef struct {
-	atomic_bool	__flag;
-} atomic_flag;
-
-#define	ATOMIC_FLAG_INIT		{ ATOMIC_VAR_INIT(0) }
-
-static __inline _Bool
-atomic_flag_test_and_set_explicit(volatile atomic_flag *__object,
-    memory_order __order)
-{
-	return (atomic_exchange_explicit(&__object->__flag, 1, __order));
-}
-
-static __inline void
-atomic_flag_clear_explicit(volatile atomic_flag *__object, memory_order __order)
-{
-
-	atomic_store_explicit(&__object->__flag, 0, __order);
-}
-
-#ifndef _KERNEL
-static __inline _Bool
-atomic_flag_test_and_set(volatile atomic_flag *__object)
-{
-
-	return (atomic_flag_test_and_set_explicit(__object,
-	    memory_order_seq_cst));
-}
-
-static __inline void
-atomic_flag_clear(volatile atomic_flag *__object)
-{
-
-	atomic_flag_clear_explicit(__object, memory_order_seq_cst);
-}
-#endif /* !_KERNEL */
-
-#endif /* !_STDATOMIC_H_ */
diff --git a/include.new/stdbool.h b/include.new/stdbool.h
deleted file mode 100644
index dfe0c8a..0000000
--- a/include.new/stdbool.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai@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.
- *
- * 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: releng/10.2/include/stdbool.h 228878 2011-12-25 20:15:41Z ed $
- */
-
-#ifndef __bool_true_false_are_defined
-#define	__bool_true_false_are_defined	1
-
-#ifndef __cplusplus
-
-#define	false	0
-#define	true	1
-
-#define	bool	_Bool
-#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 && !defined(__INTEL_COMPILER)
-typedef	int	_Bool;
-#endif
-
-#endif /* !__cplusplus */
-#endif /* __bool_true_false_are_defined */
diff --git a/include.new/stddef.h b/include.new/stddef.h
deleted file mode 100644
index 1f5fb8c..0000000
--- a/include.new/stddef.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- *	@(#)stddef.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/stddef.h 264496 2014-04-15 09:41:52Z tijl $
- */
-
-#ifndef _STDDEF_H_
-#define _STDDEF_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-
-typedef	__ptrdiff_t	ptrdiff_t;
-
-#if __BSD_VISIBLE
-#ifndef _RUNE_T_DECLARED
-typedef	__rune_t	rune_t;
-#define	_RUNE_T_DECLARED
-#endif
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef	__cplusplus
-#ifndef _WCHAR_T_DECLARED
-typedef	___wchar_t	wchar_t;
-#define	_WCHAR_T_DECLARED
-#endif
-#endif
-
-#define	offsetof(type, member)	__offsetof(type, member)
-
-#endif /* _STDDEF_H_ */
diff --git a/include.new/stdint.h b/include.new/stdint.h
deleted file mode 100644
index 5f02f32..0000000
--- a/include.new/stdint.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/sys/sys/stdint.h 237517 2012-06-24 04:15:58Z andrew $
- */
-
-#ifndef _SYS_STDINT_H_
-#define _SYS_STDINT_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#include <machine/_stdint.h>
-#include <sys/_stdint.h>
-
-typedef	__int_least8_t		int_least8_t;
-typedef	__int_least16_t		int_least16_t;
-typedef	__int_least32_t		int_least32_t;
-typedef	__int_least64_t		int_least64_t;
-
-typedef	__uint_least8_t		uint_least8_t;
-typedef	__uint_least16_t	uint_least16_t;
-typedef	__uint_least32_t	uint_least32_t;
-typedef	__uint_least64_t	uint_least64_t;
-
-typedef	__int_fast8_t		int_fast8_t;
-typedef	__int_fast16_t		int_fast16_t;
-typedef	__int_fast32_t		int_fast32_t;
-typedef	__int_fast64_t		int_fast64_t;
-
-typedef	__uint_fast8_t		uint_fast8_t;
-typedef	__uint_fast16_t		uint_fast16_t;
-typedef	__uint_fast32_t		uint_fast32_t;
-typedef	__uint_fast64_t		uint_fast64_t;
-
-#ifndef _INTMAX_T_DECLARED
-typedef	__intmax_t		intmax_t;
-#define	_INTMAX_T_DECLARED
-#endif
-#ifndef _UINTMAX_T_DECLARED
-typedef	__uintmax_t		uintmax_t;
-#define	_UINTMAX_T_DECLARED
-#endif
-
-/* GNU and Darwin define this and people seem to think it's portable */
-#if defined(UINTPTR_MAX) && defined(UINT64_MAX) && (UINTPTR_MAX == UINT64_MAX)
-#define	__WORDSIZE		64
-#else
-#define	__WORDSIZE		32
-#endif
-
-/* Limits of wchar_t. */
-#define	WCHAR_MIN	__WCHAR_MIN
-#define	WCHAR_MAX	__WCHAR_MAX
-
-#endif /* !_SYS_STDINT_H_ */
diff --git a/include.new/stdio.h b/include.new/stdio.h
deleted file mode 100644
index d8db46e..0000000
--- a/include.new/stdio.h
+++ /dev/null
@@ -1,523 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: releng/10.2/include/stdio.h 281036 2015-04-03 17:19:29Z bdrewery $
- */
-
-#ifndef	_STDIO_H_
-#define	_STDIO_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-
-typedef	__off_t		fpos_t;
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
-#ifndef _OFF_T_DECLARED
-#define	_OFF_T_DECLARED
-typedef	__off_t		off_t;
-#endif
-#ifndef _SSIZE_T_DECLARED
-#define	_SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#endif
-#endif
-
-#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-#ifndef _VA_LIST_DECLARED
-typedef	__va_list	va_list;
-#define	_VA_LIST_DECLARED
-#endif
-#endif
-
-#define	_FSTDIO			/* Define for new stdio with functions. */
-
-/*
- * NB: to fit things in six character monocase externals, the stdio
- * code uses the prefix `__s' for stdio objects, typically followed
- * by a three-character attempt at a mnemonic.
- */
-
-/* stdio buffers */
-struct __sbuf {
-	unsigned char *_base;
-	int	_size;
-};
-
-/*
- * stdio state variables.
- *
- * The following always hold:
- *
- *	if (_flags&(__SLBF|__SWR)) == (__SLBF|__SWR),
- *		_lbfsize is -_bf._size, else _lbfsize is 0
- *	if _flags&__SRD, _w is 0
- *	if _flags&__SWR, _r is 0
- *
- * This ensures that the getc and putc macros (or inline functions) never
- * try to write or read from a file that is in `read' or `write' mode.
- * (Moreover, they can, and do, automatically switch from read mode to
- * write mode, and back, on "r+" and "w+" files.)
- *
- * _lbfsize is used only to make the inline line-buffered output stream
- * code as compact as possible.
- *
- * _ub, _up, and _ur are used when ungetc() pushes back more characters
- * than fit in the current _bf, or when ungetc() pushes back a character
- * that does not match the previous one in _bf.  When this happens,
- * _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
- * _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
- *
- * Certain members of __sFILE are accessed directly via macros or
- * inline functions.  To preserve ABI compat, these members must not
- * be disturbed.  These members are marked below with (*).
- */
-struct __sFILE {
-	unsigned char *_p;	/* (*) current position in (some) buffer */
-	int	_r;		/* (*) read space left for getc() */
-	int	_w;		/* (*) write space left for putc() */
-	short	_flags;		/* (*) flags, below; this FILE is free if 0 */
-	short	_file;		/* (*) fileno, if Unix descriptor, else -1 */
-	struct	__sbuf _bf;	/* (*) the buffer (at least 1 byte, if !NULL) */
-	int	_lbfsize;	/* (*) 0 or -_bf._size, for inline putc */
-
-	/* operations */
-	void	*_cookie;	/* (*) cookie passed to io functions */
-	int	(*_close)(void *);
-	int	(*_read)(void *, char *, int);
-	fpos_t	(*_seek)(void *, fpos_t, int);
-	int	(*_write)(void *, const char *, int);
-
-	/* separate buffer for long sequences of ungetc() */
-	struct	__sbuf _ub;	/* ungetc buffer */
-	unsigned char	*_up;	/* saved _p when _p is doing ungetc data */
-	int	_ur;		/* saved _r when _r is counting ungetc data */
-
-	/* tricks to meet minimum requirements even when malloc() fails */
-	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
-	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
-
-	/* separate buffer for fgetln() when line crosses buffer boundary */
-	struct	__sbuf _lb;	/* buffer for fgetln() */
-
-	/* Unix stdio files get aligned to block boundaries on fseek() */
-	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */
-	fpos_t	_offset;	/* current lseek offset */
-
-	struct pthread_mutex *_fl_mutex;	/* used for MT-safety */
-	struct pthread *_fl_owner;	/* current owner */
-	int	_fl_count;	/* recursive lock count */
-	int	_orientation;	/* orientation for fwide() */
-	__mbstate_t _mbstate;	/* multibyte conversion state */
-};
-#ifndef _STDFILE_DECLARED
-#define _STDFILE_DECLARED
-typedef struct __sFILE FILE;
-#endif
-#ifndef _STDSTREAM_DECLARED
-__BEGIN_DECLS
-extern FILE *__stdinp;
-extern FILE *__stdoutp;
-extern FILE *__stderrp;
-__END_DECLS
-#define	_STDSTREAM_DECLARED
-#endif
-
-#define	__SLBF	0x0001		/* line buffered */
-#define	__SNBF	0x0002		/* unbuffered */
-#define	__SRD	0x0004		/* OK to read */
-#define	__SWR	0x0008		/* OK to write */
-	/* RD and WR are never simultaneously asserted */
-#define	__SRW	0x0010		/* open for reading & writing */
-#define	__SEOF	0x0020		/* found EOF */
-#define	__SERR	0x0040		/* found error */
-#define	__SMBF	0x0080		/* _bf._base is from malloc */
-#define	__SAPP	0x0100		/* fdopen()ed in append mode */
-#define	__SSTR	0x0200		/* this is an sprintf/snprintf string */
-#define	__SOPT	0x0400		/* do fseek() optimization */
-#define	__SNPT	0x0800		/* do not do fseek() optimization */
-#define	__SOFF	0x1000		/* set iff _offset is in fact correct */
-#define	__SMOD	0x2000		/* true => fgetln modified _p text */
-#define	__SALC	0x4000		/* allocate string space dynamically */
-#define	__SIGN	0x8000		/* ignore this file in _fwalk */
-
-/*
- * The following three definitions are for ANSI C, which took them
- * from System V, which brilliantly took internal interface macros and
- * made them official arguments to setvbuf(), without renaming them.
- * Hence, these ugly _IOxxx names are *supposed* to appear in user code.
- *
- * Although numbered as their counterparts above, the implementation
- * does not rely on this.
- */
-#define	_IOFBF	0		/* setvbuf should set fully buffered */
-#define	_IOLBF	1		/* setvbuf should set line buffered */
-#define	_IONBF	2		/* setvbuf should set unbuffered */
-
-#define	BUFSIZ	1024		/* size of buffer used by setbuf */
-#define	EOF	(-1)
-
-/*
- * FOPEN_MAX is a minimum maximum, and is the number of streams that
- * stdio can provide without attempting to allocate further resources
- * (which could fail).  Do not use this for anything.
- */
-				/* must be == _POSIX_STREAM_MAX <limits.h> */
-#ifndef FOPEN_MAX
-#define	FOPEN_MAX	20	/* must be <= OPEN_MAX <sys/syslimits.h> */
-#endif
-#define	FILENAME_MAX	1024	/* must be <= PATH_MAX <sys/syslimits.h> */
-
-/* System V/ANSI C; this is the wrong way to do this, do *not* use these. */
-#if __XSI_VISIBLE
-#define	P_tmpdir	"/tmp/"
-#endif
-#define	L_tmpnam	1024	/* XXX must be == PATH_MAX */
-#define	TMP_MAX		308915776
-
-#ifndef SEEK_SET
-#define	SEEK_SET	0	/* set file offset to offset */
-#endif
-#ifndef SEEK_CUR
-#define	SEEK_CUR	1	/* set file offset to current plus offset */
-#endif
-#ifndef SEEK_END
-#define	SEEK_END	2	/* set file offset to EOF plus offset */
-#endif
-
-#define	stdin	__stdinp
-#define	stdout	__stdoutp
-#define	stderr	__stderrp
-
-__BEGIN_DECLS
-#ifdef _XLOCALE_H_
-#include <xlocale/_stdio.h>
-#endif
-/*
- * Functions defined in ANSI C standard.
- */
-void	 clearerr(FILE *);
-int	 fclose(FILE *);
-int	 feof(FILE *);
-int	 ferror(FILE *);
-int	 fflush(FILE *);
-int	 fgetc(FILE *);
-int	 fgetpos(FILE * __restrict, fpos_t * __restrict);
-char	*fgets(char * __restrict, int, FILE * __restrict);
-FILE	*fopen(const char * __restrict, const char * __restrict);
-int	 fprintf(FILE * __restrict, const char * __restrict, ...);
-int	 fputc(int, FILE *);
-int	 fputs(const char * __restrict, FILE * __restrict);
-size_t	 fread(void * __restrict, size_t, size_t, FILE * __restrict);
-FILE	*freopen(const char * __restrict, const char * __restrict, FILE * __restrict);
-int	 fscanf(FILE * __restrict, const char * __restrict, ...);
-int	 fseek(FILE *, long, int);
-int	 fsetpos(FILE *, const fpos_t *);
-long	 ftell(FILE *);
-size_t	 fwrite(const void * __restrict, size_t, size_t, FILE * __restrict);
-int	 getc(FILE *);
-int	 getchar(void);
-char	*gets(char *);
-void	 perror(const char *);
-int	 printf(const char * __restrict, ...);
-int	 putc(int, FILE *);
-int	 putchar(int);
-int	 puts(const char *);
-int	 remove(const char *);
-int	 rename(const char *, const char *);
-void	 rewind(FILE *);
-int	 scanf(const char * __restrict, ...);
-void	 setbuf(FILE * __restrict, char * __restrict);
-int	 setvbuf(FILE * __restrict, char * __restrict, int, size_t);
-int	 sprintf(char * __restrict, const char * __restrict, ...);
-int	 sscanf(const char * __restrict, const char * __restrict, ...);
-FILE	*tmpfile(void);
-char	*tmpnam(char *);
-int	 ungetc(int, FILE *);
-int	 vfprintf(FILE * __restrict, const char * __restrict,
-	    __va_list);
-int	 vprintf(const char * __restrict, __va_list);
-int	 vsprintf(char * __restrict, const char * __restrict,
-	    __va_list);
-
-#if __ISO_C_VISIBLE >= 1999
-int	 snprintf(char * __restrict, size_t, const char * __restrict,
-	    ...) __printflike(3, 4);
-int	 vfscanf(FILE * __restrict, const char * __restrict, __va_list)
-	    __scanflike(2, 0);
-int	 vscanf(const char * __restrict, __va_list) __scanflike(1, 0);
-int	 vsnprintf(char * __restrict, size_t, const char * __restrict,
-	    __va_list) __printflike(3, 0);
-int	 vsscanf(const char * __restrict, const char * __restrict, __va_list)
-	    __scanflike(2, 0);
-#endif
-
-/*
- * Functions defined in all versions of POSIX 1003.1.
- */
-#if __BSD_VISIBLE || __POSIX_VISIBLE <= 199506
-#define	L_cuserid	17	/* size for cuserid(3); MAXLOGNAME, legacy */
-#endif
-
-#if __POSIX_VISIBLE
-#define	L_ctermid	1024	/* size for ctermid(3); PATH_MAX */
-
-char	*ctermid(char *);
-FILE	*fdopen(int, const char *);
-int	 fileno(FILE *);
-#endif /* __POSIX_VISIBLE */
-
-#if __POSIX_VISIBLE >= 199209
-int	 pclose(FILE *);
-FILE	*popen(const char *, const char *);
-#endif
-
-#if __POSIX_VISIBLE >= 199506
-int	 ftrylockfile(FILE *);
-void	 flockfile(FILE *);
-void	 funlockfile(FILE *);
-
-/*
- * These are normally used through macros as defined below, but POSIX
- * requires functions as well.
- */
-int	 getc_unlocked(FILE *);
-int	 getchar_unlocked(void);
-int	 putc_unlocked(int, FILE *);
-int	 putchar_unlocked(int);
-#endif
-#if __BSD_VISIBLE
-void	 clearerr_unlocked(FILE *);
-int	 feof_unlocked(FILE *);
-int	 ferror_unlocked(FILE *);
-int	 fileno_unlocked(FILE *);
-#endif
-
-#if __POSIX_VISIBLE >= 200112
-int	 fseeko(FILE *, __off_t, int);
-__off_t	 ftello(FILE *);
-#endif
-
-#if __BSD_VISIBLE || __XSI_VISIBLE > 0 && __XSI_VISIBLE < 600
-int	 getw(FILE *);
-int	 putw(int, FILE *);
-#endif /* BSD or X/Open before issue 6 */
-
-#if __XSI_VISIBLE
-char	*tempnam(const char *, const char *);
-#endif
-
-#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
-FILE	*fmemopen(void * __restrict, size_t, const char * __restrict);
-ssize_t	 getdelim(char ** __restrict, size_t * __restrict, int,
-	    FILE * __restrict);
-FILE	*open_memstream(char **, size_t *);
-int	 renameat(int, const char *, int, const char *);
-int	 vdprintf(int, const char * __restrict, __va_list);
-
-/*
- * Every programmer and his dog wrote functions called getline() and dprintf()
- * before POSIX.1-2008 came along and decided to usurp the names, so we
- * don't prototype them by default unless one of the following is true:
- *   a) the app has requested them specifically by defining _WITH_GETLINE or
- *      _WITH_DPRINTF, respectively
- *   b) the app has requested a POSIX.1-2008 environment via _POSIX_C_SOURCE
- *   c) the app defines a GNUism such as _BSD_SOURCE or _GNU_SOURCE
- */
-#ifndef _WITH_GETLINE
-#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
-#define	_WITH_GETLINE
-#elif defined(_POSIX_C_SOURCE)
-#if _POSIX_C_SOURCE >= 200809
-#define	_WITH_GETLINE
-#endif
-#endif
-#endif
-
-#ifdef _WITH_GETLINE
-ssize_t	 getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
-#endif
-
-#ifndef _WITH_DPRINTF
-#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE)
-#define	_WITH_DPRINTF
-#elif defined(_POSIX_C_SOURCE)
-#if _POSIX_C_SOURCE >= 200809
-#define	_WITH_DPRINTF
-#endif
-#endif
-#endif
-
-#ifdef _WITH_DPRINTF
-int	 (dprintf)(int, const char * __restrict, ...);
-#endif
-
-#endif /* __BSD_VISIBLE || __POSIX_VISIBLE >= 200809 */
-
-/*
- * Routines that are purely local.
- */
-#if __BSD_VISIBLE
-int	 asprintf(char **, const char *, ...) __printflike(2, 3);
-char	*ctermid_r(char *);
-void	 fcloseall(void);
-char	*fgetln(FILE *, size_t *);
-const char *fmtcheck(const char *, const char *) __format_arg(2);
-int	 fpurge(FILE *);
-void	 setbuffer(FILE *, char *, int);
-int	 setlinebuf(FILE *);
-int	 vasprintf(char **, const char *, __va_list)
-	    __printflike(2, 0);
-
-/*
- * The system error table contains messages for the first sys_nerr
- * positive errno values.  Use strerror() or strerror_r() from <string.h>
- * instead.
- */
-extern const int sys_nerr;
-extern const char * const sys_errlist[];
-
-/*
- * Stdio function-access interface.
- */
-FILE	*funopen(const void *,
-	    int (*)(void *, char *, int),
-	    int (*)(void *, const char *, int),
-	    fpos_t (*)(void *, fpos_t, int),
-	    int (*)(void *));
-#define	fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
-#define	fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
-
-/*
- * Portability hacks.  See <sys/types.h>.
- */
-#ifndef _FTRUNCATE_DECLARED
-#define	_FTRUNCATE_DECLARED
-int	 ftruncate(int, __off_t);
-#endif
-#ifndef _LSEEK_DECLARED
-#define	_LSEEK_DECLARED
-__off_t	 lseek(int, __off_t, int);
-#endif
-#ifndef _MMAP_DECLARED
-#define	_MMAP_DECLARED
-void	*mmap(void *, size_t, int, int, int, __off_t);
-#endif
-#ifndef _TRUNCATE_DECLARED
-#define	_TRUNCATE_DECLARED
-int	 truncate(const char *, __off_t);
-#endif
-#endif /* __BSD_VISIBLE */
-
-/*
- * Functions internal to the implementation.
- */
-int	__srget(FILE *);
-int	__swbuf(int, FILE *);
-
-/*
- * The __sfoo macros are here so that we can
- * define function versions in the C library.
- */
-#define	__sgetc(p) (--(p)->_r < 0 ? __srget(p) : (int)(*(p)->_p++))
-#if defined(__GNUC__) && defined(__STDC__)
-static __inline int __sputc(int _c, FILE *_p) {
-	if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
-		return (*_p->_p++ = _c);
-	else
-		return (__swbuf(_c, _p));
-}
-#else
-/*
- * This has been tuned to generate reasonable code on the vax using pcc.
- */
-#define	__sputc(c, p) \
-	(--(p)->_w < 0 ? \
-		(p)->_w >= (p)->_lbfsize ? \
-			(*(p)->_p = (c)), *(p)->_p != '\n' ? \
-				(int)*(p)->_p++ : \
-				__swbuf('\n', p) : \
-			__swbuf((int)(c), p) : \
-		(*(p)->_p = (c), (int)*(p)->_p++))
-#endif
-
-extern int __isthreaded;
-
-#ifndef __cplusplus
-
-#define	__sfeof(p)	(((p)->_flags & __SEOF) != 0)
-#define	__sferror(p)	(((p)->_flags & __SERR) != 0)
-#define	__sclearerr(p)	((void)((p)->_flags &= ~(__SERR|__SEOF)))
-#define	__sfileno(p)	((p)->_file)
-
-
-#define	feof(p)		(!__isthreaded ? __sfeof(p) : (feof)(p))
-#define	ferror(p)	(!__isthreaded ? __sferror(p) : (ferror)(p))
-#define	clearerr(p)	(!__isthreaded ? __sclearerr(p) : (clearerr)(p))
-
-#if __POSIX_VISIBLE
-#define	fileno(p)	(!__isthreaded ? __sfileno(p) : (fileno)(p))
-#endif
-
-#define	getc(fp)	(!__isthreaded ? __sgetc(fp) : (getc)(fp))
-#define	putc(x, fp)	(!__isthreaded ? __sputc(x, fp) : (putc)(x, fp))
-
-#define	getchar()	getc(stdin)
-#define	putchar(x)	putc(x, stdout)
-
-#if __BSD_VISIBLE
-/*
- * See ISO/IEC 9945-1 ANSI/IEEE Std 1003.1 Second Edition 1996-07-12
- * B.8.2.7 for the rationale behind the *_unlocked() macros.
- */
-#define	feof_unlocked(p)	__sfeof(p)
-#define	ferror_unlocked(p)	__sferror(p)
-#define	clearerr_unlocked(p)	__sclearerr(p)
-#define	fileno_unlocked(p)	__sfileno(p)
-#endif
-#if __POSIX_VISIBLE >= 199506
-#define	getc_unlocked(fp)	__sgetc(fp)
-#define	putc_unlocked(x, fp)	__sputc(x, fp)
-
-#define	getchar_unlocked()	getc_unlocked(stdin)
-#define	putchar_unlocked(x)	putc_unlocked(x, stdout)
-#endif
-#endif /* __cplusplus */
-
-__END_DECLS
-#endif /* !_STDIO_H_ */
diff --git a/include.new/stdlib.h b/include.new/stdlib.h
deleted file mode 100644
index 2c25c27..0000000
--- a/include.new/stdlib.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- *	@(#)stdlib.h	8.5 (Berkeley) 5/19/95
- * $FreeBSD: releng/10.2/include/stdlib.h 264496 2014-04-15 09:41:52Z tijl $
- */
-
-#ifndef _STDLIB_H_
-#define	_STDLIB_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-
-#if __BSD_VISIBLE
-#ifndef _RUNE_T_DECLARED
-typedef	__rune_t	rune_t;
-#define	_RUNE_T_DECLARED
-#endif
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef	__cplusplus
-#ifndef _WCHAR_T_DECLARED
-typedef	___wchar_t	wchar_t;
-#define	_WCHAR_T_DECLARED
-#endif
-#endif
-
-typedef struct {
-	int	quot;		/* quotient */
-	int	rem;		/* remainder */
-} div_t;
-
-typedef struct {
-	long	quot;
-	long	rem;
-} ldiv_t;
-
-#define	EXIT_FAILURE	1
-#define	EXIT_SUCCESS	0
-
-#define	RAND_MAX	0x7ffffffd
-
-__BEGIN_DECLS
-#ifdef _XLOCALE_H_
-#include <xlocale/_stdlib.h>
-#endif
-extern int __mb_cur_max;
-extern int ___mb_cur_max(void);
-#define	MB_CUR_MAX	(___mb_cur_max())
-
-_Noreturn void	 abort(void);
-int	 abs(int) __pure2;
-int	 atexit(void (*)(void));
-double	 atof(const char *);
-int	 atoi(const char *);
-long	 atol(const char *);
-void	*bsearch(const void *, const void *, size_t,
-	    size_t, int (*)(const void *, const void *));
-void	*calloc(size_t, size_t) __malloc_like;
-div_t	 div(int, int) __pure2;
-_Noreturn void	 exit(int);
-void	 free(void *);
-char	*getenv(const char *);
-long	 labs(long) __pure2;
-ldiv_t	 ldiv(long, long) __pure2;
-void	*malloc(size_t) __malloc_like;
-int	 mblen(const char *, size_t);
-size_t	 mbstowcs(wchar_t * __restrict , const char * __restrict, size_t);
-int	 mbtowc(wchar_t * __restrict, const char * __restrict, size_t);
-void	 qsort(void *, size_t, size_t,
-	    int (*)(const void *, const void *));
-int	 rand(void);
-void	*realloc(void *, size_t);
-void	 srand(unsigned);
-double	 strtod(const char * __restrict, char ** __restrict);
-float	 strtof(const char * __restrict, char ** __restrict);
-long	 strtol(const char * __restrict, char ** __restrict, int);
-long double
-	 strtold(const char * __restrict, char ** __restrict);
-unsigned long
-	 strtoul(const char * __restrict, char ** __restrict, int);
-int	 system(const char *);
-int	 wctomb(char *, wchar_t);
-size_t	 wcstombs(char * __restrict, const wchar_t * __restrict, size_t);
-
-/*
- * Functions added in C99 which we make conditionally available in the
- * BSD^C89 namespace if the compiler supports `long long'.
- * The #if test is more complicated than it ought to be because
- * __BSD_VISIBLE implies __ISO_C_VISIBLE == 1999 *even if* `long long'
- * is not supported in the compilation environment (which therefore means
- * that it can't really be ISO C99).
- *
- * (The only other extension made by C99 in thie header is _Exit().)
- */
-#if __ISO_C_VISIBLE >= 1999
-#ifdef __LONG_LONG_SUPPORTED
-/* LONGLONG */
-typedef struct {
-	long long quot;
-	long long rem;
-} lldiv_t;
-
-/* LONGLONG */
-long long
-	 atoll(const char *);
-/* LONGLONG */
-long long
-	 llabs(long long) __pure2;
-/* LONGLONG */
-lldiv_t	 lldiv(long long, long long) __pure2;
-/* LONGLONG */
-long long
-	 strtoll(const char * __restrict, char ** __restrict, int);
-/* LONGLONG */
-unsigned long long
-	 strtoull(const char * __restrict, char ** __restrict, int);
-#endif /* __LONG_LONG_SUPPORTED */
-
-_Noreturn void	 _Exit(int);
-#endif /* __ISO_C_VISIBLE >= 1999 */
-
-/*
- * If we're in a mode greater than C99, expose C11 functions.
- */
-#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
-void *	aligned_alloc(size_t, size_t) __malloc_like;
-int	at_quick_exit(void (*)(void));
-_Noreturn void
-	quick_exit(int);
-#endif /* __ISO_C_VISIBLE >= 2011 */
-/*
- * Extensions made by POSIX relative to C.
- */
-#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE
-char	*realpath(const char * __restrict, char * __restrict);
-#endif
-#if __POSIX_VISIBLE >= 199506
-int	 rand_r(unsigned *);			/* (TSF) */
-#endif
-#if __POSIX_VISIBLE >= 200112
-int	 posix_memalign(void **, size_t, size_t); /* (ADV) */
-int	 setenv(const char *, const char *, int);
-int	 unsetenv(const char *);
-#endif
-
-#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE
-int	 getsubopt(char **, char *const *, char **);
-#ifndef _MKDTEMP_DECLARED
-char	*mkdtemp(char *);
-#define	_MKDTEMP_DECLARED
-#endif
-#ifndef _MKSTEMP_DECLARED
-int	 mkstemp(char *);
-#define	_MKSTEMP_DECLARED
-#endif
-#endif /* __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE */
-
-/*
- * The only changes to the XSI namespace in revision 6 were the deletion
- * of the ttyslot() and valloc() functions, which FreeBSD never declared
- * in this header.  For revision 7, ecvt(), fcvt(), and gcvt(), which
- * FreeBSD also does not have, and mktemp(), are to be deleted.
- */
-#if __XSI_VISIBLE
-/* XXX XSI requires pollution from <sys/wait.h> here.  We'd rather not. */
-long	 a64l(const char *);
-double	 drand48(void);
-/* char	*ecvt(double, int, int * __restrict, int * __restrict); */
-double	 erand48(unsigned short[3]);
-/* char	*fcvt(double, int, int * __restrict, int * __restrict); */
-/* char	*gcvt(double, int, int * __restrict, int * __restrict); */
-int	 grantpt(int);
-char	*initstate(unsigned long /* XSI requires u_int */, char *, long);
-long	 jrand48(unsigned short[3]);
-char	*l64a(long);
-void	 lcong48(unsigned short[7]);
-long	 lrand48(void);
-#if !defined(_MKTEMP_DECLARED) && (__BSD_VISIBLE || __XSI_VISIBLE <= 600)
-char	*mktemp(char *);
-#define	_MKTEMP_DECLARED
-#endif
-long	 mrand48(void);
-long	 nrand48(unsigned short[3]);
-int	 posix_openpt(int);
-char	*ptsname(int);
-int	 putenv(char *);
-long	 random(void);
-unsigned short
-	*seed48(unsigned short[3]);
-#ifndef _SETKEY_DECLARED
-int	 setkey(const char *);
-#define	_SETKEY_DECLARED
-#endif
-char	*setstate(/* const */ char *);
-void	 srand48(long);
-void	 srandom(unsigned long);
-int	 unlockpt(int);
-#endif /* __XSI_VISIBLE */
-
-#if __BSD_VISIBLE
-extern const char *malloc_conf;
-extern void (*malloc_message)(void *, const char *);
-
-/*
- * The alloca() function can't be implemented in C, and on some
- * platforms it can't be implemented at all as a callable function.
- * The GNU C compiler provides a built-in alloca() which we can use;
- * in all other cases, provide a prototype, mainly to pacify various
- * incarnations of lint.  On platforms where alloca() is not in libc,
- * programs which use it will fail to link when compiled with non-GNU
- * compilers.
- */
-#if __GNUC__ >= 2 || defined(__INTEL_COMPILER)
-#undef  alloca	/* some GNU bits try to get cute and define this on their own */
-#define alloca(sz) __builtin_alloca(sz)
-#elif defined(lint)
-void	*alloca(size_t);
-#endif
-
-void	 abort2(const char *, int, void **) __dead2;
-__uint32_t
-	 arc4random(void);
-void	 arc4random_addrandom(unsigned char *, int);
-void	 arc4random_buf(void *, size_t);
-void	 arc4random_stir(void);
-__uint32_t 
-	 arc4random_uniform(__uint32_t);
-char	*getbsize(int *, long *);
-					/* getcap(3) functions */
-char	*cgetcap(char *, const char *, int);
-int	 cgetclose(void);
-int	 cgetent(char **, char **, const char *);
-int	 cgetfirst(char **, char **);
-int	 cgetmatch(const char *, const char *);
-int	 cgetnext(char **, char **);
-int	 cgetnum(char *, const char *, long *);
-int	 cgetset(const char *);
-int	 cgetstr(char *, const char *, char **);
-int	 cgetustr(char *, const char *, char **);
-
-int	 daemon(int, int);
-char	*devname(__dev_t, __mode_t);
-char 	*devname_r(__dev_t, __mode_t, char *, int);
-char	*fdevname(int);
-char 	*fdevname_r(int, char *, int);
-int	 getloadavg(double [], int);
-const char *
-	 getprogname(void);
-
-int	 heapsort(void *, size_t, size_t, int (*)(const void *, const void *));
-int	 l64a_r(long, char *, int);
-int	 mergesort(void *, size_t, size_t, int (*)(const void *, const void *));
-int	 mkostemp(char *, int);
-int	 mkostemps(char *, int, int);
-void	 qsort_r(void *, size_t, size_t, void *,
-	    int (*)(void *, const void *, const void *));
-int	 radixsort(const unsigned char **, int, const unsigned char *,
-	    unsigned);
-void    *reallocf(void *, size_t);
-int	 rpmatch(const char *);
-void	 setprogname(const char *);
-int	 sradixsort(const unsigned char **, int, const unsigned char *,
-	    unsigned);
-void	 sranddev(void);
-void	 srandomdev(void);
-long long
-	strtonum(const char *, long long, long long, const char **);
-
-/* Deprecated interfaces, to be removed in FreeBSD 6.0. */
-__int64_t
-	 strtoq(const char *, char **, int);
-__uint64_t
-	 strtouq(const char *, char **, int);
-
-extern char *suboptarg;			/* getsubopt(3) external variable */
-#endif /* __BSD_VISIBLE */
-__END_DECLS
-
-#endif /* !_STDLIB_H_ */
diff --git a/include.new/stdnoreturn.h b/include.new/stdnoreturn.h
deleted file mode 100644
index 449f0f3..0000000
--- a/include.new/stdnoreturn.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2012 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/include/stdnoreturn.h 229437 2012-01-03 23:05:23Z ed $
- */
-
-#ifdef __cplusplus
-#error "<stdnoreturn.h> cannot be used in combination with C++11."
-#endif
-
-#ifndef noreturn
-
-#include <sys/cdefs.h>
-#define	noreturn		_Noreturn
-
-#endif /* !noreturn */
diff --git a/include.new/string.h b/include.new/string.h
deleted file mode 100644
index 398d203..0000000
--- a/include.new/string.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- *	@(#)string.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/string.h 246803 2013-02-14 19:26:58Z zeising $
- */
-
-#ifndef _STRING_H_
-#define	_STRING_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-
-/*
- * Prototype functions which were historically defined in <string.h>, but
- * are required by POSIX to be prototyped in <strings.h>.
- */
-#if __BSD_VISIBLE
-#include <strings.h>
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-__BEGIN_DECLS
-#if __XSI_VISIBLE >= 600
-void	*memccpy(void * __restrict, const void * __restrict, int, size_t);
-#endif
-void	*memchr(const void *, int, size_t) __pure;
-#if __BSD_VISIBLE
-void	*memrchr(const void *, int, size_t) __pure;
-#endif
-int	 memcmp(const void *, const void *, size_t) __pure;
-void	*memcpy(void * __restrict, const void * __restrict, size_t);
-#if __BSD_VISIBLE
-void	*memmem(const void *, size_t, const void *, size_t) __pure;
-#endif
-void	*memmove(void *, const void *, size_t);
-void	*memset(void *, int, size_t);
-#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
-char	*stpcpy(char * __restrict, const char * __restrict);
-char	*stpncpy(char * __restrict, const char * __restrict, size_t);
-#endif
-#if __BSD_VISIBLE
-char	*strcasestr(const char *, const char *) __pure;
-#endif
-char	*strcat(char * __restrict, const char * __restrict);
-char	*strchr(const char *, int) __pure;
-#if __BSD_VISIBLE
-char	*strchrnul(const char*, int) __pure;
-#endif
-int	 strcmp(const char *, const char *) __pure;
-int	 strcoll(const char *, const char *);
-char	*strcpy(char * __restrict, const char * __restrict);
-size_t	 strcspn(const char *, const char *) __pure;
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-char	*strdup(const char *) __malloc_like;
-#endif
-char	*strerror(int);
-#if __POSIX_VISIBLE >= 200112
-int	 strerror_r(int, char *, size_t);
-#endif
-#if __BSD_VISIBLE
-size_t	 strlcat(char * __restrict, const char * __restrict, size_t);
-size_t	 strlcpy(char * __restrict, const char * __restrict, size_t);
-#endif
-size_t	 strlen(const char *) __pure;
-#if __BSD_VISIBLE
-void	 strmode(int, char *);
-#endif
-char	*strncat(char * __restrict, const char * __restrict, size_t);
-int	 strncmp(const char *, const char *, size_t) __pure;
-char	*strncpy(char * __restrict, const char * __restrict, size_t);
-#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
-char	*strndup(const char *, size_t) __malloc_like;
-size_t	 strnlen(const char *, size_t) __pure;
-#endif
-#if __BSD_VISIBLE
-char	*strnstr(const char *, const char *, size_t) __pure;
-#endif
-char	*strpbrk(const char *, const char *) __pure;
-char	*strrchr(const char *, int) __pure;
-#if __BSD_VISIBLE
-char	*strsep(char **, const char *);
-#endif
-#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
-char	*strsignal(int);
-#endif
-size_t	 strspn(const char *, const char *) __pure;
-char	*strstr(const char *, const char *) __pure;
-char	*strtok(char * __restrict, const char * __restrict);
-#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500
-char	*strtok_r(char *, const char *, char **);
-#endif
-size_t	 strxfrm(char * __restrict, const char * __restrict, size_t);
-#if __BSD_VISIBLE
-
-#ifndef _SWAB_DECLARED
-#define _SWAB_DECLARED
-
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif /* _SIZE_T_DECLARED */
-
-void	 swab(const void * __restrict, void * __restrict, ssize_t);
-#endif /* _SWAB_DECLARED */
-
-#endif /* __BSD_VISIBLE */
-
-#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
-#include <xlocale/_string.h>
-#endif
-__END_DECLS
-
-#endif /* _STRING_H_ */
diff --git a/include.new/string_m.h b/include.new/string_m.h
deleted file mode 100644
index b33ab91..0000000
--- a/include.new/string_m.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2001-2014 Devin Teske <dteske@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.
- * 
- * 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: releng/10.2/lib/libfigpar/string_m.h 274116 2014-11-04 23:46:01Z dteske $
- */
-
-#ifndef _STRING_M_H_
-#define _STRING_M_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void		strexpand(char *_source);
-void		strexpandnl(char *_source);
-void		strtolower(char *_source);
-int		replaceall(char *_source, const char *_find,
-		    const char *_replace);
-unsigned int	strcount(const char *_source, const char *_find);
-__END_DECLS
-
-#endif /* !_STRING_M_H_ */
diff --git a/include.new/stringlist.h b/include.new/stringlist.h
deleted file mode 100644
index d07900f..0000000
--- a/include.new/stringlist.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $	*/
-
-/*
- * Copyright (c) 1994 Christos Zoulas
- * 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 Christos Zoulas.
- * 4. 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 ``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 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: releng/10.2/include/stringlist.h 249802 2013-04-23 13:03:03Z eadler $
- */
-
-#ifndef _STRINGLIST_H
-#define _STRINGLIST_H 
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/*
- * Simple string list
- */
-typedef struct _stringlist {
-	char	**sl_str;
-	size_t	  sl_max;
-	size_t	  sl_cur;
-} StringList;
-
-__BEGIN_DECLS
-StringList *sl_init(void);
-int	 sl_add(StringList *, char *);
-void	 sl_free(StringList *, int);
-char	*sl_find(StringList *, const char *);
-__END_DECLS
-
-#endif /* _STRINGLIST_H */
diff --git a/include.new/strings.h b/include.new/strings.h
deleted file mode 100644
index 163c361..0000000
--- a/include.new/strings.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/include/strings.h 267465 2014-06-14 02:57:40Z pfg $
- */
-
-#ifndef _STRINGS_H_
-#define	_STRINGS_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-__BEGIN_DECLS
-#if __BSD_VISIBLE || __POSIX_VISIBLE <= 200112
-int	 bcmp(const void *, const void *, size_t) __pure;	/* LEGACY */
-void	 bcopy(const void *, void *, size_t);			/* LEGACY */
-void	 bzero(void *, size_t);					/* LEGACY */
-#endif
-#if __XSI_VISIBLE
-int	 ffs(int) __pure2;
-#endif
-#if __BSD_VISIBLE
-int	 ffsl(long) __pure2;
-int	 ffsll(long long) __pure2;
-int	 fls(int) __pure2;
-int	 flsl(long) __pure2;
-int	 flsll(long long) __pure2;
-#endif
-#if __BSD_VISIBLE || __POSIX_VISIBLE <= 200112
-char	*index(const char *, int) __pure;			/* LEGACY */
-char	*rindex(const char *, int) __pure;			/* LEGACY */
-#endif
-int	 strcasecmp(const char *, const char *) __pure;
-int	 strncasecmp(const char *, const char *, size_t) __pure;
-
-#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
-#include <xlocale/_strings.h>
-#endif
-__END_DECLS
-
-#endif /* _STRINGS_H_ */
diff --git a/include.new/sys/_bitset.h b/include.new/sys/_bitset.h
deleted file mode 100644
index 9b3d75d..0000000
--- a/include.new/sys/_bitset.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
- * All rights reserved.
- *
- * Copyright (c) 2008 Nokia Corporation
- * 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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/_bitset.h 250395 2013-05-09 00:04:59Z attilio $
- */
-
-#ifndef _SYS__BITSET_H_
-#define	_SYS__BITSET_H_
-
-/*
- * Macros addressing word and bit within it, tuned to make compiler
- * optimize cases when SETSIZE fits into single machine word.
- */
-#define	_BITSET_BITS		(sizeof(long) * NBBY)
-
-#define	__bitset_words(_s)	(howmany(_s, _BITSET_BITS))
-
-#define	__bitset_mask(_s, n)						\
-	(1L << ((__bitset_words((_s)) == 1) ?				\
-	    (__size_t)(n) : ((n) % _BITSET_BITS)))
-
-#define	__bitset_word(_s, n)						\
-	((__bitset_words((_s)) == 1) ? 0 : ((n) / _BITSET_BITS))
-
-#define	BITSET_DEFINE(t, _s)						\
-struct t {								\
-        long    __bits[__bitset_words((_s))];				\
-};
-
-#define	BITSET_T_INITIALIZER(x)						\
-	{ .__bits = { x } }
-
-#define	BITSET_FSET(n)							\
-	[ 0 ... ((n) - 1) ] = (-1L)
-
-#endif /* !_SYS__BITSET_H_ */
diff --git a/include.new/sys/_bus_dma.h b/include.new/sys/_bus_dma.h
deleted file mode 100644
index cef8bc7..0000000
--- a/include.new/sys/_bus_dma.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright 2006 John-Mark Gurney.
- * 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.
- *
- * 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: releng/10.2/sys/sys/_bus_dma.h 161927 2006-09-03 00:26:17Z jmg $
- *
- */
-
-#ifndef _SYS__BUS_DMA_H_
-#define _SYS__BUS_DMA_H_
-
-typedef int bus_dmasync_op_t;
-
-/*
- *	bus_dma_tag_t
- *
- *	A machine-dependent opaque type describing the characteristics
- *	of how to perform DMA mappings.  This structure encapsultes
- *	information concerning address and alignment restrictions, number
- *	of S/G segments, amount of data per S/G segment, etc.
- */
-typedef struct bus_dma_tag	*bus_dma_tag_t;
-
-/*
- *	bus_dmamap_t
- *
- *	DMA mapping instance information.
- */
-typedef struct bus_dmamap	*bus_dmamap_t;
-
-/*
- * A function that performs driver-specific synchronization on behalf of
- * busdma.
- */
-typedef enum {
-	BUS_DMA_LOCK	= 0x01,
-	BUS_DMA_UNLOCK	= 0x02,
-} bus_dma_lock_op_t;
-
-typedef void bus_dma_lock_t(void *, bus_dma_lock_op_t);
-
-#endif /* !_SYS__BUS_DMA_H_ */
diff --git a/include.new/sys/_callout.h b/include.new/sys/_callout.h
deleted file mode 100644
index 74fae5b..0000000
--- a/include.new/sys/_callout.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/_callout.h 281657 2015-04-17 15:39:42Z rrs $
- */
-
-#ifndef _SYS__CALLOUT_H
-#define	_SYS__CALLOUT_H
-
-#include <sys/queue.h>
-
-struct lock_object;
-
-LIST_HEAD(callout_list, callout);
-SLIST_HEAD(callout_slist, callout);
-TAILQ_HEAD(callout_tailq, callout);
-
-struct callout {
-	union {
-		LIST_ENTRY(callout) le;
-		SLIST_ENTRY(callout) sle;
-		TAILQ_ENTRY(callout) tqe;
-	} c_links;
-	sbintime_t c_time;			/* ticks to the event */
-	sbintime_t c_precision;			/* delta allowed wrt opt */
-	void	*c_arg;				/* function argument */
-	void	(*c_func)(void *);		/* function to call */
-	struct lock_object *c_lock;		/* lock to handle */
-	short	c_flags;			/* User State */
-	short	c_iflags;			/* Internal State */
-	volatile int c_cpu;			/* CPU we're scheduled on */
-};
-
-#endif
diff --git a/include.new/sys/_cpuset.h b/include.new/sys/_cpuset.h
deleted file mode 100644
index 6658092..0000000
--- a/include.new/sys/_cpuset.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2008,	Jeffrey Roberson <jeff@freebsd.org>
- * All rights reserved.
- *
- * Copyright (c) 2008 Nokia Corporation
- * 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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/_cpuset.h 271172 2014-09-05 15:45:20Z jhb $
- */
-
-#ifndef _SYS__CPUSET_H_
-#define	_SYS__CPUSET_H_
-
-#include <sys/_bitset.h>
-
-#ifdef _KERNEL
-#define	CPU_SETSIZE	MAXCPU
-#endif
-
-#define	CPU_MAXSIZE	256
-
-#ifndef	CPU_SETSIZE
-#define	CPU_SETSIZE	CPU_MAXSIZE
-#endif
-
-#define	_NCPUBITS	_BITSET_BITS
-#define	_NCPUWORDS	__bitset_words(CPU_SETSIZE)
-
-BITSET_DEFINE(_cpuset, CPU_SETSIZE);
-typedef struct _cpuset cpuset_t;
-
-#define	CPUSET_FSET		BITSET_FSET(_NCPUWORDS)
-#define	CPUSET_T_INITIALIZER	BITSET_T_INITIALIZER
-
-#endif /* !_SYS__CPUSET_H_ */
diff --git a/include.new/sys/_ffcounter.h b/include.new/sys/_ffcounter.h
deleted file mode 100644
index cb38853..0000000
--- a/include.new/sys/_ffcounter.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2011 The University of Melbourne
- * All rights reserved.
- *
- * This software was developed by Julien Ridoux at the University of Melbourne
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/_ffcounter.h 227723 2011-11-19 14:10:16Z lstewart $
- */
-
-#ifndef _SYS__FFCOUNTER_H_
-#define _SYS__FFCOUNTER_H_
-
-/*
- * The feed-forward clock counter. The fundamental element of a feed-forward
- * clock is a wide monotonically increasing counter that accumulates at the same
- * rate as the selected timecounter.
- */
-typedef uint64_t ffcounter;
-
-#endif /* _SYS__FFCOUNTER_H_ */
diff --git a/include.new/sys/_iovec.h b/include.new/sys/_iovec.h
deleted file mode 100644
index bc406c2..0000000
--- a/include.new/sys/_iovec.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD: releng/10.2/sys/sys/_iovec.h 139825 2005-01-07 02:29:27Z imp $
- */
-
-#ifndef _SYS__IOVEC_H_
-#define	_SYS__IOVEC_H_
-
-#include <sys/_types.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-struct iovec {
-	void	*iov_base;	/* Base address. */
-	size_t	 iov_len;	/* Length. */
-};
-
-#endif /* !_SYS__IOVEC_H_ */
diff --git a/include.new/sys/_kstack_cache.h b/include.new/sys/_kstack_cache.h
deleted file mode 100644
index da1d396..0000000
--- a/include.new/sys/_kstack_cache.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2009 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- * 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.
- *
- *	$FreeBSD: releng/10.2/sys/sys/_kstack_cache.h 228567 2011-12-16 10:56:16Z kib $
- */
-
-#ifndef _SYS__KSTACK_CACHE_H
-#define	_SYS__KSTACK_CACHE_H
-
-struct kstack_cache_entry {
-	struct vm_object *ksobj;
-	struct kstack_cache_entry *next_ks_entry;
-};
-
-extern struct kstack_cache_entry *kstack_cache;
-
-#endif
-
-
diff --git a/include.new/sys/_label.h b/include.new/sys/_label.h
deleted file mode 100644
index 5dae687..0000000
--- a/include.new/sys/_label.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * Copyright (c) 2001-2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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/_label.h,v 1.6 2004/05/10 18:38:07 rwatson Exp $
- */
-#ifndef _SYS__LABEL_H_
-#define	_SYS__LABEL_H_
-
-/*
- * XXXMAC: This shouldn't be exported to userland, but is because of ucred.h
- * and various other messes.
- */
-
-#define	MAC_MAX_SLOTS	4
-
-#define	MAC_FLAG_INITIALIZED	0x0000001	/* Is initialized for use. */
-
-struct label {
-	int	l_flags;
-	union {
-		void	*l_ptr;
-		long	 l_long;
-	}	l_perpolicy[MAC_MAX_SLOTS];
-};
-
-#endif /* !_SYS__LABEL_H_ */
diff --git a/include.new/sys/_lock.h b/include.new/sys/_lock.h
deleted file mode 100644
index c299e1e..0000000
--- a/include.new/sys/_lock.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 1997 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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: releng/10.2/sys/sys/_lock.h 179025 2008-05-15 20:10:06Z attilio $
- */
-
-#ifndef _SYS__LOCK_H_
-#define	_SYS__LOCK_H_
-
-struct lock_object {
-	const	char *lo_name;		/* Individual lock name. */
-	u_int	lo_flags;
-	u_int	lo_data;		/* General class specific data. */
-	struct	witness *lo_witness;	/* Data for witness. */
-};
-
-#endif /* !_SYS__LOCK_H_ */
diff --git a/include.new/sys/_lockmgr.h b/include.new/sys/_lockmgr.h
deleted file mode 100644
index cab6ad3..0000000
--- a/include.new/sys/_lockmgr.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2008 Attilio Rao <attilio@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible 
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/sys/sys/_lockmgr.h 200447 2009-12-12 21:31:07Z attilio $
- */
-
-#ifndef _SYS__LOCKMGR_H_
-#define	_SYS__LOCKMGR_H_
-
-#ifdef DEBUG_LOCKS
-#include <sys/_stack.h>
-#endif
-
-struct lock {
-	struct lock_object	lock_object;
-	volatile uintptr_t	lk_lock;
-	u_int			lk_exslpfail;
-	int			lk_timo;
-	int			lk_pri;
-#ifdef DEBUG_LOCKS
-	struct stack		lk_stack;
-#endif
-};
-
-#endif
diff --git a/include.new/sys/_mutex.h b/include.new/sys/_mutex.h
deleted file mode 100644
index 080e3ca..0000000
--- a/include.new/sys/_mutex.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1997 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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: releng/10.2/sys/sys/_mutex.h 242901 2012-11-11 23:25:47Z attilio $
- */
-
-#ifndef _SYS__MUTEX_H_
-#define	_SYS__MUTEX_H_
-
-#include <machine/param.h>
-
-/*
- * Sleep/spin mutex.
- *
- * All mutex implementations must always have a member called mtx_lock.
- * Other locking primitive structures are not allowed to use this name
- * for their members.
- * If this rule needs to change, the bits in the mutex implementation must
- * be modified appropriately.
- */
-struct mtx {
-	struct lock_object	lock_object;	/* Common lock properties. */
-	volatile uintptr_t	mtx_lock;	/* Owner and flags. */
-};
-
-/*
- * Members of struct mtx_padalign must mirror members of struct mtx.
- * mtx_padalign mutexes can use the mtx(9) API transparently without
- * modification.
- * Pad-aligned mutexes used within structures should generally be the
- * first member of the struct.  Otherwise, the compiler can generate
- * additional padding for the struct to keep a correct alignment for
- * the mutex.
- */
-struct mtx_padalign {
-	struct lock_object	lock_object;	/* Common lock properties. */
-	volatile uintptr_t	mtx_lock;	/* Owner and flags. */
-} __aligned(CACHE_LINE_SIZE);
-
-#endif /* !_SYS__MUTEX_H_ */
diff --git a/include.new/sys/_null.h b/include.new/sys/_null.h
deleted file mode 100644
index 65c5d0c..0000000
--- a/include.new/sys/_null.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/_null.h 228918 2011-12-27 21:36:31Z theraven $
- */
-
-#ifndef NULL
-
-#if !defined(__cplusplus)
-#define	NULL	((void *)0)
-#else
-#if __cplusplus >= 201103L
-#define	NULL	nullptr
-#elif defined(__GNUG__) && defined(__GNUC__) && __GNUC__ >= 4
-#define	NULL	__null
-#else
-#if defined(__LP64__)
-#define	NULL	(0L)
-#else
-#define	NULL	0
-#endif	/* __LP64__ */
-#endif	/* __GNUG__ */
-#endif	/* !__cplusplus */
-
-#endif
diff --git a/include.new/sys/_pctrie.h b/include.new/sys/_pctrie.h
deleted file mode 100644
index 4847fd8..0000000
--- a/include.new/sys/_pctrie.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2013 EMC Corp.
- * Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
- * Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
- * 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.
- *
- * 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: releng/10.2/sys/sys/_pctrie.h 250551 2013-05-12 04:05:01Z jeff $
- */
-
-#ifndef __SYS_PCTRIE_H_
-#define __SYS_PCTRIE_H_
-
-/*
- * Radix tree root.
- */
-struct pctrie {
-	uintptr_t	pt_root;
-};
-
-#ifdef _KERNEL
-
-static __inline boolean_t
-pctrie_is_empty(struct pctrie *ptree)
-{
-
-	return (ptree->pt_root == 0);
-}
-
-#endif /* _KERNEL */
-#endif /* !__SYS_PCTRIE_H_ */
diff --git a/include.new/sys/_pthreadtypes.h b/include.new/sys/_pthreadtypes.h
deleted file mode 100644
index ec4c985..0000000
--- a/include.new/sys/_pthreadtypes.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 1993, 1994 by Chris Provenzano, proven@mit.edu
- * Copyright (c) 1995-1998 by John Birrell <jb@cimlogic.com.au>
- * 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 Chris Provenzano.
- * 4. The name of Chris Provenzano may not be used to endorse or promote 
- *	  products derived from this software without specific prior written
- *	  permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CHRIS PROVENZANO ``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 CHRIS PROVENZANO 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: releng/10.2/sys/sys/_pthreadtypes.h 189828 2009-03-14 20:10:14Z das $
- */
-
-#ifndef _SYS__PTHREADTYPES_H_
-#define _SYS__PTHREADTYPES_H_
-
-/*
- * Forward structure definitions.
- *
- * These are mostly opaque to the user.
- */
-struct pthread;
-struct pthread_attr;
-struct pthread_cond;
-struct pthread_cond_attr;
-struct pthread_mutex;
-struct pthread_mutex_attr;
-struct pthread_once;
-struct pthread_rwlock;
-struct pthread_rwlockattr;
-struct pthread_barrier;
-struct pthread_barrier_attr;
-struct pthread_spinlock;
-
-/*
- * Primitive system data type definitions required by P1003.1c.
- *
- * Note that P1003.1c specifies that there are no defined comparison
- * or assignment operators for the types pthread_attr_t, pthread_cond_t,
- * pthread_condattr_t, pthread_mutex_t, pthread_mutexattr_t.
- */
-#ifndef _PTHREAD_T_DECLARED
-typedef struct	pthread			*pthread_t;
-#define	_PTHREAD_T_DECLARED
-#endif
-typedef struct	pthread_attr		*pthread_attr_t;
-typedef struct	pthread_mutex		*pthread_mutex_t;
-typedef struct	pthread_mutex_attr	*pthread_mutexattr_t;
-typedef struct	pthread_cond		*pthread_cond_t;
-typedef struct	pthread_cond_attr	*pthread_condattr_t;
-typedef int     			pthread_key_t;
-typedef struct	pthread_once		pthread_once_t;
-typedef struct	pthread_rwlock		*pthread_rwlock_t;
-typedef struct	pthread_rwlockattr	*pthread_rwlockattr_t;
-typedef struct	pthread_barrier		*pthread_barrier_t;
-typedef struct	pthread_barrierattr	*pthread_barrierattr_t;
-typedef struct	pthread_spinlock	*pthread_spinlock_t;
-
-/*
- * Additional type definitions:
- *
- * Note that P1003.1c reserves the prefixes pthread_ and PTHREAD_ for
- * use in header symbols.
- */
-typedef void	*pthread_addr_t;
-typedef void	*(*pthread_startroutine_t)(void *);
-
-/*
- * Once definitions.
- */
-struct pthread_once {
-	int		state;
-	pthread_mutex_t	mutex;
-};
-
-#endif /* ! _SYS__PTHREADTYPES_H_ */
diff --git a/include.new/sys/_rmlock.h b/include.new/sys/_rmlock.h
deleted file mode 100644
index 04297dd..0000000
--- a/include.new/sys/_rmlock.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 2007 Stephan Uphoff <ups@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. Neither the name of the author nor the names of any co-contributors
- *    may 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: releng/10.2/sys/sys/_rmlock.h 252209 2013-06-25 18:44:15Z jhb $
- */
-
-#ifndef _SYS__RMLOCK_H_
-#define	_SYS__RMLOCK_H_
-
-/*
- * Mostly reader/occasional writer lock.
- */
-
-LIST_HEAD(rmpriolist,rm_priotracker);
-
-struct rm_queue {
-	struct rm_queue	*volatile rmq_next;
-	struct rm_queue	*volatile rmq_prev;
-};
-
-struct rmlock {
-	struct lock_object lock_object;
-	volatile cpuset_t rm_writecpus;
-	LIST_HEAD(,rm_priotracker) rm_activeReaders;
-	union {
-		struct lock_object _rm_wlock_object;
-		struct mtx _rm_lock_mtx;
-		struct sx _rm_lock_sx;
-	} _rm_lock;
-};
-
-#define	rm_wlock_object	_rm_lock._rm_wlock_object
-#define	rm_lock_mtx	_rm_lock._rm_lock_mtx
-#define	rm_lock_sx	_rm_lock._rm_lock_sx
-
-struct rm_priotracker {
-	struct rm_queue rmp_cpuQueue; /* Must be first */
-	struct rmlock *rmp_rmlock;
-	struct thread *rmp_thread;
-	int rmp_flags;
-	LIST_ENTRY(rm_priotracker) rmp_qentry;
-};
-
-#endif /* !_SYS__RMLOCK_H_ */
diff --git a/include.new/sys/_rwlock.h b/include.new/sys/_rwlock.h
deleted file mode 100644
index e8a3cd0..0000000
--- a/include.new/sys/_rwlock.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 2006 John Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/sys/_rwlock.h 262192 2014-02-18 20:27:17Z jhb $
- */
-
-#ifndef _SYS__RWLOCK_H_
-#define	_SYS__RWLOCK_H_
-
-#include <machine/param.h>
-
-/*
- * Reader/writer lock.
- *
- * All reader/writer lock implementations must always have a member
- * called rw_lock.  Other locking primitive structures are not allowed to
- * use this name for their members.
- * If this rule needs to change, the bits in the reader/writer lock
- * implementation must be modified appropriately.
- */
-struct rwlock {
-	struct lock_object	lock_object;
-	volatile uintptr_t	rw_lock;
-};
-
-/*
- * Members of struct rwlock_padalign must mirror members of struct rwlock.
- * rwlock_padalign rwlocks can use the rwlock(9) API transparently without
- * modification.
- * Pad-aligned rwlocks used within structures should generally be the
- * first member of the struct.  Otherwise, the compiler can generate
- * additional padding for the struct to keep a correct alignment for
- * the rwlock.
- */
-struct rwlock_padalign {
-	struct lock_object	lock_object;
-	volatile uintptr_t	rw_lock;
-} __aligned(CACHE_LINE_SIZE);
-
-#endif /* !_SYS__RWLOCK_H_ */
diff --git a/include.new/sys/_semaphore.h b/include.new/sys/_semaphore.h
deleted file mode 100644
index b8a83b2..0000000
--- a/include.new/sys/_semaphore.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2002 Alfred Perlstein <alfred@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.
- *
- * 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: releng/10.2/sys/sys/_semaphore.h 201546 2010-01-05 02:37:59Z davidxu $
- */
-#ifndef __SEMAPHORE_H_
-#define __SEMAPHORE_H_
-
-typedef intptr_t semid_t;
-struct timespec;
-
-#define SEM_VALUE_MAX  __INT_MAX
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-
-int ksem_close(semid_t id);
-int ksem_post(semid_t id);
-int ksem_wait(semid_t id);
-int ksem_trywait(semid_t id);
-int ksem_timedwait(semid_t id, const struct timespec *abstime);
-int ksem_init(semid_t *idp, unsigned int value);
-int ksem_open(semid_t *idp, const char *name, int oflag, mode_t mode,
-    unsigned int value);
-int ksem_unlink(const char *name);
-int ksem_getvalue(semid_t id, int *val);
-int ksem_destroy(semid_t id);
-
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* __SEMAPHORE_H_ */
diff --git a/include.new/sys/_sigset.h b/include.new/sys/_sigset.h
deleted file mode 100644
index dd9aea8..0000000
--- a/include.new/sys/_sigset.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD: releng/10.2/sys/sys/_sigset.h 139825 2005-01-07 02:29:27Z imp $
- */
-
-#ifndef _SYS__SIGSET_H_
-#define	_SYS__SIGSET_H_
-
-/*
- * sigset_t macros.
- */
-#define	_SIG_WORDS	4
-#define	_SIG_MAXSIG	128
-#define	_SIG_IDX(sig)	((sig) - 1)
-#define	_SIG_WORD(sig)	(_SIG_IDX(sig) >> 5)
-#define	_SIG_BIT(sig)	(1 << (_SIG_IDX(sig) & 31))
-#define	_SIG_VALID(sig)	((sig) <= _SIG_MAXSIG && (sig) > 0)
-
-typedef struct __sigset {
-	__uint32_t __bits[_SIG_WORDS];
-} __sigset_t;
-
-#if defined(_KERNEL) && defined(COMPAT_43)
-typedef unsigned int osigset_t;
-#endif
-
-#endif /* !_SYS__SIGSET_H_ */
diff --git a/include.new/sys/_sockaddr_storage.h b/include.new/sys/_sockaddr_storage.h
deleted file mode 100644
index b4ee46f..0000000
--- a/include.new/sys/_sockaddr_storage.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD: releng/10.2/sys/sys/_sockaddr_storage.h 196967 2009-09-08 10:39:38Z phk $
- */
-
-#ifndef _SYS__SOCKADDR_STORAGE_H_
-#define	_SYS__SOCKADDR_STORAGE_H_
-
-/*
- * RFC 2553: protocol-independent placeholder for socket addresses
- */
-#define	_SS_MAXSIZE	128U
-#define	_SS_ALIGNSIZE	(sizeof(__int64_t))
-#define	_SS_PAD1SIZE	(_SS_ALIGNSIZE - sizeof(unsigned char) - \
-			    sizeof(sa_family_t))
-#define	_SS_PAD2SIZE	(_SS_MAXSIZE - sizeof(unsigned char) - \
-			    sizeof(sa_family_t) - _SS_PAD1SIZE - _SS_ALIGNSIZE)
-
-struct sockaddr_storage {
-	unsigned char	ss_len;		/* address length */
-	sa_family_t	ss_family;	/* address family */
-	char		__ss_pad1[_SS_PAD1SIZE];
-	__int64_t	__ss_align;	/* force desired struct alignment */
-	char		__ss_pad2[_SS_PAD2SIZE];
-};
-
-#endif /* !_SYS__SOCKADDR_STORAGE_H_ */
diff --git a/include.new/sys/_stack.h b/include.new/sys/_stack.h
deleted file mode 100644
index 7ff6fea..0000000
--- a/include.new/sys/_stack.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2005 Antoine Brodin
- * 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.
- *
- * 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: releng/10.2/sys/sys/_stack.h 177957 2008-04-06 20:08:51Z attilio $
- */
-
-#ifndef _SYS__STACK_H_
-#define	_SYS__STACK_H_
-
-#define	STACK_MAX	18	/* Don't change, stack_ktr relies on this. */
-
-struct stack {
-	int		depth;
-	vm_offset_t	pcs[STACK_MAX];
-};
-
-#endif
diff --git a/include.new/sys/_stdint.h b/include.new/sys/_stdint.h
deleted file mode 100644
index a1c78c3..0000000
--- a/include.new/sys/_stdint.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 2011 David E. O'Brien <obrien@FreeBSD.org>
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/sys/sys/_stdint.h 222813 2011-06-07 08:46:13Z attilio $
- */
-
-#ifndef _SYS__STDINT_H_
-#define _SYS__STDINT_H_
-
-#ifndef _INT8_T_DECLARED
-typedef	__int8_t		int8_t;
-#define	_INT8_T_DECLARED
-#endif
-
-#ifndef _INT16_T_DECLARED
-typedef	__int16_t		int16_t;
-#define	_INT16_T_DECLARED
-#endif
-
-#ifndef _INT32_T_DECLARED
-typedef	__int32_t		int32_t;
-#define	_INT32_T_DECLARED
-#endif
-
-#ifndef _INT64_T_DECLARED
-typedef	__int64_t		int64_t;
-#define	_INT64_T_DECLARED
-#endif
-
-#ifndef _UINT8_T_DECLARED
-typedef	__uint8_t		uint8_t;
-#define	_UINT8_T_DECLARED
-#endif
-
-#ifndef _UINT16_T_DECLARED
-typedef	__uint16_t		uint16_t;
-#define	_UINT16_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t		uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
-
-#ifndef _UINT64_T_DECLARED
-typedef	__uint64_t		uint64_t;
-#define	_UINT64_T_DECLARED
-#endif
-
-#ifndef _INTPTR_T_DECLARED
-typedef	__intptr_t		intptr_t;
-#define	_INTPTR_T_DECLARED
-#endif
-#ifndef _UINTPTR_T_DECLARED
-typedef	__uintptr_t		uintptr_t;
-#define	_UINTPTR_T_DECLARED
-#endif
-
-#endif /* !_SYS__STDINT_H_ */
diff --git a/include.new/sys/_sx.h b/include.new/sys/_sx.h
deleted file mode 100644
index 353b94d..0000000
--- a/include.new/sys/_sx.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2007 Attilio Rao <attilio@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible 
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/sys/sys/_sx.h 179025 2008-05-15 20:10:06Z attilio $
- */
-
-#ifndef	_SYS__SX_H_
-#define	_SYS__SX_H_
-
-/*
- * Shared/exclusive lock main structure definition.
- */
-struct sx {
-	struct lock_object	lock_object;
-	volatile uintptr_t	sx_lock;
-};
-
-#endif	/* !_SYS__SX_H_ */
diff --git a/include.new/sys/_task.h b/include.new/sys/_task.h
deleted file mode 100644
index 7db464d..0000000
--- a/include.new/sys/_task.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/sys/_task.h 213813 2010-10-13 22:59:04Z mdf $
- */
-
-#ifndef _SYS__TASK_H_
-#define _SYS__TASK_H_
-
-#include <sys/queue.h>
-
-/*
- * Each task includes a function which is called from
- * taskqueue_run().  The first argument is taken from the 'ta_context'
- * field of struct task and the second argument is a count of how many
- * times the task was enqueued before the call to taskqueue_run().
- *
- * List of locks	 
- * (c)	const after init	 
- * (q)	taskqueue lock
- */
-typedef void task_fn_t(void *context, int pending);
-
-struct task {
-	STAILQ_ENTRY(task) ta_link;	/* (q) link for queue */
-	u_short	ta_pending;		/* (q) count times queued */
-	u_short	ta_priority;		/* (c) Priority */
-	task_fn_t *ta_func;		/* (c) task handler */
-	void	*ta_context;		/* (c) argument for handler */
-};
-
-#endif /* !_SYS__TASK_H_ */
diff --git a/include.new/sys/_termios.h b/include.new/sys/_termios.h
deleted file mode 100644
index c642a87..0000000
--- a/include.new/sys/_termios.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*-
- * Copyright (c) 1988, 1989, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $FreeBSD: releng/10.2/sys/sys/_termios.h 199898 2009-11-28 23:50:48Z ed $
- */
-
-#ifndef _SYS__TERMIOS_H_
-#define	_SYS__TERMIOS_H_
-
-/*
- * Special Control Characters
- *
- * Index into c_cc[] character array.
- *
- *	Name	     Subscript	Enabled by
- */
-#define	VEOF		0	/* ICANON */
-#define	VEOL		1	/* ICANON */
-#ifndef _POSIX_SOURCE
-#define	VEOL2		2	/* ICANON together with IEXTEN */
-#endif
-#define	VERASE		3	/* ICANON */
-#ifndef _POSIX_SOURCE
-#define	VWERASE 	4	/* ICANON together with IEXTEN */
-#endif
-#define	VKILL		5	/* ICANON */
-#ifndef _POSIX_SOURCE
-#define	VREPRINT 	6	/* ICANON together with IEXTEN */
-#define	VERASE2 	7	/* ICANON */
-#endif
-/*			7	   ex-spare 1 */
-#define	VINTR		8	/* ISIG */
-#define	VQUIT		9	/* ISIG */
-#define	VSUSP		10	/* ISIG */
-#ifndef _POSIX_SOURCE
-#define	VDSUSP		11	/* ISIG together with IEXTEN */
-#endif
-#define	VSTART		12	/* IXON, IXOFF */
-#define	VSTOP		13	/* IXON, IXOFF */
-#ifndef _POSIX_SOURCE
-#define	VLNEXT		14	/* IEXTEN */
-#define	VDISCARD	15	/* IEXTEN */
-#endif
-#define	VMIN		16	/* !ICANON */
-#define	VTIME		17	/* !ICANON */
-#ifndef _POSIX_SOURCE
-#define	VSTATUS		18	/* ICANON together with IEXTEN */
-/*			19	   spare 2 */
-#endif
-#define	NCCS		20
-
-#define	_POSIX_VDISABLE	0xff
-
-/*
- * Input flags - software input processing
- */
-#define	IGNBRK		0x00000001	/* ignore BREAK condition */
-#define	BRKINT		0x00000002	/* map BREAK to SIGINTR */
-#define	IGNPAR		0x00000004	/* ignore (discard) parity errors */
-#define	PARMRK		0x00000008	/* mark parity and framing errors */
-#define	INPCK		0x00000010	/* enable checking of parity errors */
-#define	ISTRIP		0x00000020	/* strip 8th bit off chars */
-#define	INLCR		0x00000040	/* map NL into CR */
-#define	IGNCR		0x00000080	/* ignore CR */
-#define	ICRNL		0x00000100	/* map CR to NL (ala CRMOD) */
-#define	IXON		0x00000200	/* enable output flow control */
-#define	IXOFF		0x00000400	/* enable input flow control */
-#ifndef _POSIX_SOURCE
-#define	IXANY		0x00000800	/* any char will restart after stop */
-#define	IMAXBEL		0x00002000	/* ring bell on input queue full */
-#endif  /*_POSIX_SOURCE */
-
-/*
- * Output flags - software output processing
- */
-#define	OPOST		0x00000001	/* enable following output processing */
-#ifndef _POSIX_SOURCE
-#define	ONLCR		0x00000002	/* map NL to CR-NL (ala CRMOD) */
-#define	TABDLY		0x00000004	/* tab delay mask */
-#define	    TAB0	    0x00000000	    /* no tab delay and expansion */
-#define	    TAB3	    0x00000004	    /* expand tabs to spaces */
-#define	ONOEOT		0x00000008	/* discard EOT's (^D) on output) */
-#define	OCRNL		0x00000010	/* map CR to NL on output */
-#define	ONOCR		0x00000020	/* no CR output at column 0 */
-#define	ONLRET		0x00000040	/* NL performs CR function */
-#endif  /*_POSIX_SOURCE */
-
-/*
- * Control flags - hardware control of terminal
- */
-#ifndef _POSIX_SOURCE
-#define	CIGNORE		0x00000001	/* ignore control flags */
-#endif
-#define	CSIZE		0x00000300	/* character size mask */
-#define	    CS5		    0x00000000	    /* 5 bits (pseudo) */
-#define	    CS6		    0x00000100	    /* 6 bits */
-#define	    CS7		    0x00000200	    /* 7 bits */
-#define	    CS8		    0x00000300	    /* 8 bits */
-#define	CSTOPB		0x00000400	/* send 2 stop bits */
-#define	CREAD		0x00000800	/* enable receiver */
-#define	PARENB		0x00001000	/* parity enable */
-#define	PARODD		0x00002000	/* odd parity, else even */
-#define	HUPCL		0x00004000	/* hang up on last close */
-#define	CLOCAL		0x00008000	/* ignore modem status lines */
-#ifndef _POSIX_SOURCE
-#define	CCTS_OFLOW	0x00010000	/* CTS flow control of output */
-#define	CRTSCTS		(CCTS_OFLOW | CRTS_IFLOW)
-#define	CRTS_IFLOW	0x00020000	/* RTS flow control of input */
-#define	CDTR_IFLOW	0x00040000	/* DTR flow control of input */
-#define	CDSR_OFLOW	0x00080000	/* DSR flow control of output */
-#define	CCAR_OFLOW	0x00100000	/* DCD flow control of output */
-#endif
-
-
-/*
- * "Local" flags - dumping ground for other state
- *
- * Warning: some flags in this structure begin with
- * the letter "I" and look like they belong in the
- * input flag.
- */
-
-#ifndef _POSIX_SOURCE
-#define	ECHOKE		0x00000001	/* visual erase for line kill */
-#endif  /*_POSIX_SOURCE */
-#define	ECHOE		0x00000002	/* visually erase chars */
-#define	ECHOK		0x00000004	/* echo NL after line kill */
-#define	ECHO		0x00000008	/* enable echoing */
-#define	ECHONL		0x00000010	/* echo NL even if ECHO is off */
-#ifndef _POSIX_SOURCE
-#define	ECHOPRT		0x00000020	/* visual erase mode for hardcopy */
-#define	ECHOCTL  	0x00000040	/* echo control chars as ^(Char) */
-#endif  /*_POSIX_SOURCE */
-#define	ISIG		0x00000080	/* enable signals INTR, QUIT, [D]SUSP */
-#define	ICANON		0x00000100	/* canonicalize input lines */
-#ifndef _POSIX_SOURCE
-#define	ALTWERASE	0x00000200	/* use alternate WERASE algorithm */
-#endif  /*_POSIX_SOURCE */
-#define	IEXTEN		0x00000400	/* enable DISCARD and LNEXT */
-#define	EXTPROC         0x00000800      /* external processing */
-#define	TOSTOP		0x00400000	/* stop background jobs from output */
-#ifndef _POSIX_SOURCE
-#define	FLUSHO		0x00800000	/* output being flushed (state) */
-#define	NOKERNINFO	0x02000000	/* no kernel output from VSTATUS */
-#define	PENDIN		0x20000000	/* XXX retype pending input (state) */
-#endif  /*_POSIX_SOURCE */
-#define	NOFLSH		0x80000000	/* don't flush after interrupt */
-
-/*
- * Standard speeds
- */
-#define	B0	0
-#define	B50	50
-#define	B75	75
-#define	B110	110
-#define	B134	134
-#define	B150	150
-#define	B200	200
-#define	B300	300
-#define	B600	600
-#define	B1200	1200
-#define	B1800	1800
-#define	B2400	2400
-#define	B4800	4800
-#define	B9600	9600
-#define	B19200	19200
-#define	B38400	38400
-#ifndef _POSIX_SOURCE
-#define	B7200	7200
-#define	B14400	14400
-#define	B28800	28800
-#define	B57600	57600
-#define	B76800	76800
-#define	B115200	115200
-#define	B230400	230400
-#define	B460800	460800
-#define	B921600	921600
-#define	EXTA	19200
-#define	EXTB	38400
-#endif  /* !_POSIX_SOURCE */
-
-typedef unsigned int	tcflag_t;
-typedef unsigned char	cc_t;
-typedef unsigned int	speed_t;
-
-struct termios {
-	tcflag_t	c_iflag;	/* input flags */
-	tcflag_t	c_oflag;	/* output flags */
-	tcflag_t	c_cflag;	/* control flags */
-	tcflag_t	c_lflag;	/* local flags */
-	cc_t		c_cc[NCCS];	/* control chars */
-	speed_t		c_ispeed;	/* input speed */
-	speed_t		c_ospeed;	/* output speed */
-};
-
-#endif /* !_SYS__TERMIOS_H_ */
diff --git a/include.new/sys/_timespec.h b/include.new/sys/_timespec.h
deleted file mode 100644
index 3d569bd..0000000
--- a/include.new/sys/_timespec.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp
- *	$FreeBSD: releng/10.2/sys/sys/_timespec.h 205792 2010-03-28 13:13:22Z ed $
- */
-
-#ifndef _SYS__TIMESPEC_H_
-#define	_SYS__TIMESPEC_H_
-
-#include <sys/_types.h>
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-struct timespec {
-	time_t	tv_sec;		/* seconds */
-	long	tv_nsec;	/* and nanoseconds */
-};
-
-#endif /* !_SYS__TIMESPEC_H_ */
diff --git a/include.new/sys/_timeval.h b/include.new/sys/_timeval.h
deleted file mode 100644
index feb80bc..0000000
--- a/include.new/sys/_timeval.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/sys/sys/_timeval.h 158471 2006-05-12 05:04:46Z jhb $
- */
-
-#ifndef _SYS__TIMEVAL_H_
-#define _SYS__TIMEVAL_H_
-
-#include <sys/_types.h>
-
-#ifndef _SUSECONDS_T_DECLARED
-typedef	__suseconds_t	suseconds_t;
-#define	_SUSECONDS_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-/*
- * Structure returned by gettimeofday(2) system call, and used in other calls.
- */
-struct timeval {
-	time_t		tv_sec;		/* seconds */
-	suseconds_t	tv_usec;	/* and microseconds */
-};
-
-#endif /* !_SYS__TIMEVAL_H_ */
diff --git a/include.new/sys/_types.h b/include.new/sys/_types.h
deleted file mode 100644
index a2571dd..0000000
--- a/include.new/sys/_types.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/sys/sys/_types.h 255219 2013-09-05 00:09:56Z pjd $
- */
-
-#ifndef _SYS__TYPES_H_
-#define _SYS__TYPES_H_
-
-#include <sys/cdefs.h>
-#include <machine/_types.h>
-
-/*
- * Standard type definitions.
- */
-typedef	__uint32_t	__blksize_t;	/* file block size */
-typedef	__int64_t	__blkcnt_t;	/* file block count */
-typedef	__int32_t	__clockid_t;	/* clock_gettime()... */
-typedef	__uint32_t	__fflags_t;	/* file flags */
-typedef	__uint64_t	__fsblkcnt_t;
-typedef	__uint64_t	__fsfilcnt_t;
-typedef	__uint32_t	__gid_t;
-typedef	__int64_t	__id_t;		/* can hold a gid_t, pid_t, or uid_t */
-typedef	__uint32_t	__ino_t;	/* inode number */
-typedef	long		__key_t;	/* IPC key (for Sys V IPC) */
-typedef	__int32_t	__lwpid_t;	/* Thread ID (a.k.a. LWP) */
-typedef	__uint16_t	__mode_t;	/* permissions */
-typedef	int		__accmode_t;	/* access permissions */
-typedef	int		__nl_item;
-typedef	__uint16_t	__nlink_t;	/* link count */
-typedef	__int64_t	__off_t;	/* file offset */
-typedef	__int32_t	__pid_t;	/* process [group] */
-typedef	__int64_t	__rlim_t;	/* resource limit - intentionally */
-					/* signed, because of legacy code */
-					/* that uses -1 for RLIM_INFINITY */
-typedef	__uint8_t	__sa_family_t;
-typedef	__uint32_t	__socklen_t;
-typedef	long		__suseconds_t;	/* microseconds (signed) */
-typedef	struct __timer	*__timer_t;	/* timer_gettime()... */
-typedef	struct __mq	*__mqd_t;	/* mq_open()... */
-typedef	__uint32_t	__uid_t;
-typedef	unsigned int	__useconds_t;	/* microseconds (unsigned) */
-typedef	int		__cpuwhich_t;	/* which parameter for cpuset. */
-typedef	int		__cpulevel_t;	/* level parameter for cpuset. */
-typedef int		__cpusetid_t;	/* cpuset identifier. */
-
-/*
- * Unusual type definitions.
- */
-/*
- * rune_t is declared to be an ``int'' instead of the more natural
- * ``unsigned long'' or ``long''.  Two things are happening here.  It is not
- * unsigned so that EOF (-1) can be naturally assigned to it and used.  Also,
- * it looks like 10646 will be a 31 bit standard.  This means that if your
- * ints cannot hold 32 bits, you will be in trouble.  The reason an int was
- * chosen over a long is that the is*() and to*() routines take ints (says
- * ANSI C), but they use __ct_rune_t instead of int.
- *
- * NOTE: rune_t is not covered by ANSI nor other standards, and should not
- * be instantiated outside of lib/libc/locale.  Use wchar_t.  wint_t and
- * rune_t must be the same type.  Also, wint_t should be able to hold all
- * members of the largest character set plus one extra value (WEOF), and
- * must be at least 16 bits.
- */
-typedef	int		__ct_rune_t;	/* arg type for ctype funcs */
-typedef	__ct_rune_t	__rune_t;	/* rune_t (see above) */
-typedef	__ct_rune_t	__wint_t;	/* wint_t (see above) */
-
-/* Clang already provides these types as built-ins, but only in C++ mode. */
-#if !defined(__clang__) || !defined(__cplusplus)
-typedef	__uint_least16_t __char16_t;
-typedef	__uint_least32_t __char32_t;
-#endif
-/* In C++11, char16_t and char32_t are built-in types. */
-#if defined(__cplusplus) && __cplusplus >= 201103L
-#define	_CHAR16_T_DECLARED
-#define	_CHAR32_T_DECLARED
-#endif
-
-typedef	__uint32_t	__dev_t;	/* device number */
-
-typedef	__uint32_t	__fixpt_t;	/* fixed point number */
-
-/*
- * mbstate_t is an opaque object to keep conversion state during multibyte
- * stream conversions.
- */
-typedef union {
-	char		__mbstate8[128];
-	__int64_t	_mbstateL;	/* for alignment */
-} __mbstate_t;
-
-#endif /* !_SYS__TYPES_H_ */
diff --git a/include.new/sys/_umtx.h b/include.new/sys/_umtx.h
deleted file mode 100644
index b7ab3d8..0000000
--- a/include.new/sys/_umtx.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * Copyright (c) 2010, David Xu <davidxu@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/_umtx.h 232144 2012-02-25 02:12:17Z davidxu $
- *
- */
-
-#ifndef _SYS__UMTX_H_
-#define	_SYS__UMTX_H_
-
-#include <sys/_types.h>
-#include <sys/_timespec.h>
-
-struct umtx {
-	volatile unsigned long	u_owner;	/* Owner of the mutex. */
-};
-
-struct umutex {
-	volatile __lwpid_t	m_owner;	/* Owner of the mutex */
-	__uint32_t		m_flags;	/* Flags of the mutex */
-	__uint32_t		m_ceilings[2];	/* Priority protect ceiling */
-	__uint32_t		m_spare[4];
-};
-
-struct ucond {
-	volatile __uint32_t	c_has_waiters;	/* Has waiters in kernel */
-	__uint32_t		c_flags;	/* Flags of the condition variable */
-	__uint32_t              c_clockid;	/* Clock id */
-	__uint32_t              c_spare[1];	/* Spare space */
-};
-
-struct urwlock {
-	volatile __int32_t	rw_state;
-	__uint32_t		rw_flags;
-	__uint32_t		rw_blocked_readers;
-	__uint32_t		rw_blocked_writers;
-	__uint32_t		rw_spare[4];
-};
-
-struct _usem {
-	volatile __uint32_t	_has_waiters;
-	volatile __uint32_t	_count;
-	__uint32_t		_flags;
-};
-
-struct _umtx_time {
-	struct timespec		_timeout;
-	__uint32_t		_flags;
-	__uint32_t		_clockid;
-};
-
-#endif /* !_SYS__UMTX_H_ */
diff --git a/include.new/sys/_unrhdr.h b/include.new/sys/_unrhdr.h
deleted file mode 100644
index 1cab56b..0000000
--- a/include.new/sys/_unrhdr.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2004 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/sys/sys/_unrhdr.h 255057 2013-08-30 07:37:45Z kib $
- */
-
-#ifndef _SYS_UNRHDR_H
-#define _SYS_UNRHDR_H
-
-#include <sys/queue.h>
-
-struct mtx;
-
-/* Header element for a unr number space. */
-
-struct unrhdr {
-	TAILQ_HEAD(unrhd,unr)	head;
-	u_int			low;	/* Lowest item */
-	u_int			high;	/* Highest item */
-	u_int			busy;	/* Count of allocated items */
-	u_int			alloc;	/* Count of memory allocations */
-	u_int			first;	/* items in allocated from start */
-	u_int			last;	/* items free at end */
-	struct mtx		*mtx;
-	TAILQ_HEAD(unrfr,unr)	ppfree;	/* Items to be freed after mtx
-					   lock dropped */
-};
-
-#endif
diff --git a/include.new/sys/aac_ioctl.h b/include.new/sys/aac_ioctl.h
deleted file mode 100644
index d01c300..0000000
--- a/include.new/sys/aac_ioctl.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*-
- * Copyright (c) 2000 Michael Smith
- * Copyright (c) 2000 Scott Long
- * Copyright (c) 2000 BSDi
- * 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.
- *
- * 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: releng/10.2/sys/sys/aac_ioctl.h 218909 2011-02-21 09:01:34Z brucec $
- */
-
-/*
- * Command queue statistics
- */
-#define AACQ_FREE	0
-#define AACQ_BIO	1
-#define AACQ_READY	2
-#define AACQ_BUSY	3
-#define AACQ_COUNT	4	/* total number of queues */
-
-struct aac_qstat {
-	uint32_t	q_length;
-	uint32_t	q_max;
-};
-
-/*
- * Statistics request
- */
-union aac_statrequest {
-	uint32_t		as_item;
-	struct aac_qstat	as_qstat;
-};
-
-#define AACIO_STATS		_IOWR('T', 101, union aac_statrequest)
-
-/*
- * Ioctl commands likely to be submitted from a Linux management application.
- * These bit encodings are actually descended from Windows NT.  Ick.
- */
-
-#define CTL_CODE(devType, func, meth, acc) (((devType) << 16) | ((acc) << 14) | ((func) << 2) | (meth))
-#define METHOD_BUFFERED                 0
-#define METHOD_IN_DIRECT                1
-#define METHOD_OUT_DIRECT               2
-#define METHOD_NEITHER                  3
-#define FILE_ANY_ACCESS                 0
-#define FILE_READ_ACCESS          	( 0x0001 )
-#define FILE_WRITE_ACCESS         	( 0x0002 )
-#define FILE_DEVICE_CONTROLLER          0x00000004
-
-#define FSACTL_LNX_SENDFIB		CTL_CODE(FILE_DEVICE_CONTROLLER, 2050, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_SEND_RAW_SRB		CTL_CODE(FILE_DEVICE_CONTROLLER, 2067, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_GET_COMM_PERF_DATA	CTL_CODE(FILE_DEVICE_CONTROLLER, 2084, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_OPENCLS_COMM_PERF_DATA CTL_CODE(FILE_DEVICE_CONTROLLER, \
-					2085, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_OPEN_GET_ADAPTER_FIB	CTL_CODE(FILE_DEVICE_CONTROLLER, 2100, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_GET_NEXT_ADAPTER_FIB	CTL_CODE(FILE_DEVICE_CONTROLLER, 2101, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_CLOSE_GET_ADAPTER_FIB CTL_CODE(FILE_DEVICE_CONTROLLER, \
-					2102, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_CLOSE_ADAPTER_CONFIG	CTL_CODE(FILE_DEVICE_CONTROLLER, 2104, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_OPEN_ADAPTER_CONFIG	CTL_CODE(FILE_DEVICE_CONTROLLER, 2105, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_MINIPORT_REV_CHECK	CTL_CODE(FILE_DEVICE_CONTROLLER, 2107, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_QUERY_ADAPTER_CONFIG	CTL_CODE(FILE_DEVICE_CONTROLLER, 2113, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_GET_PCI_INFO		CTL_CODE(FILE_DEVICE_CONTROLLER, 2119, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define FSACTL_LNX_FORCE_DELETE_DISK	CTL_CODE(FILE_DEVICE_CONTROLLER, 2120, \
-					METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSACTL_LNX_AIF_THREAD		CTL_CODE(FILE_DEVICE_CONTROLLER, 2127, \
-					METHOD_NEITHER, FILE_ANY_ACCESS)
-#define FSACTL_LNX_SEND_LARGE_FIB	CTL_CODE(FILE_DEVICE_CONTROLLER, 2138, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define	FSACTL_LNX_GET_FEATURES		CTL_CODE(FILE_DEVICE_CONTROLLER, 2139, \
-					METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-/* Why these don't follow the previous convention, I don't know */
-#define FSACTL_LNX_NULL_IO_TEST		0x43
-#define FSACTL_LNX_SIM_IO_TEST		0x53
-#define FSACTL_LNX_DOWNLOAD		0x83
-#define FSACTL_LNX_GET_VAR		0x93
-#define FSACTL_LNX_SET_VAR		0xa3
-#define FSACTL_LNX_GET_FIBTIMES		0xb3
-#define FSACTL_LNX_ZERO_FIBTIMES	0xc3
-#define FSACTL_LNX_DELETE_DISK		0x163
-#define FSACTL_LNX_QUERY_DISK		0x173
-
-/* Ok, here it gets really lame */
-#define FSACTL_LNX_PROBE_CONTAINERS	2131	/* Just guessing */
-
-/* Do the native version of the ioctls.  Since the BSD encoding scheme
- * conflicts with the 'standard' AAC encoding scheme, the resulting numbers
- * will be different.  The '8' comes from the fact that the previous scheme
- * used 12 bits for the number, with the 12th bit being the only set
- * bit above bit 8.  Thus the value of 8, with the lower 8 bits holding the
- * command number.  9 is used for the odd overflow case.
- */
-#define FSACTL_SENDFIB			_IO('8', 2)
-#define FSACTL_SEND_RAW_SRB		_IO('8', 19)
-#define FSACTL_GET_COMM_PERF_DATA	_IO('8', 36)
-#define FSACTL_OPENCLS_COMM_PERF_DATA	_IO('8', 37)
-#define FSACTL_OPEN_GET_ADAPTER_FIB	_IO('8', 52)
-#define FSACTL_GET_NEXT_ADAPTER_FIB	_IO('8', 53)
-#define FSACTL_CLOSE_GET_ADAPTER_FIB	_IO('8', 54)
-#define FSACTL_CLOSE_ADAPTER_CONFIG	_IO('8', 56)
-#define FSACTL_OPEN_ADAPTER_CONFIG	_IO('8', 57)
-#define FSACTL_MINIPORT_REV_CHECK	_IO('8', 59)
-#define FSACTL_QUERY_ADAPTER_CONFIG	_IO('8', 65)
-#define FSACTL_GET_PCI_INFO		_IO('8', 71)
-#define FSACTL_FORCE_DELETE_DISK	_IO('8', 72)
-#define FSACTL_AIF_THREAD		_IO('8', 79)
-#define FSACTL_SEND_LARGE_FIB		_IO('8', 90)
-#define	FSACTL_GET_FEATURES		_IO('8', 91)
-
-#define FSACTL_NULL_IO_TEST		_IO('8', 67)
-#define FSACTL_SIM_IO_TEST		_IO('8', 83)
-#define FSACTL_DOWNLOAD			_IO('8', 131)
-#define FSACTL_GET_VAR			_IO('8', 147)
-#define FSACTL_SET_VAR			_IO('8', 163)
-#define FSACTL_GET_FIBTIMES		_IO('8', 179)
-#define FSACTL_ZERO_FIBTIMES		_IO('8', 195)
-#define FSACTL_DELETE_DISK		_IO('8', 99)
-#define FSACTL_QUERY_DISK		_IO('9', 115)
-
-#define FSACTL_PROBE_CONTAINERS		_IO('9', 83)	/* Just guessing */
-
-#ifdef _KERNEL
-/*
- * Support for faking the "miniport" version.
- */
-struct aac_rev_check {
-	RevComponent		callingComponent;
-	struct FsaRevision	callingRevision;
-};
-
-struct aac_rev_check_resp {
-	int			possiblyCompatible;
-	struct FsaRevision	adapterSWRevision;
-};
-
-/*
- * Context passed in by a consumer looking to collect an AIF.
- */
-struct get_adapter_fib_ioctl {
-	uint32_t	AdapterFibContext;
-	int	  	Wait;
-	caddr_t		AifFib;
-};
-
-struct aac_query_disk {
-	int32_t		ContainerNumber;
-	int32_t		Bus;
-	int32_t		Target;
-	int32_t		Lun;
-	uint32_t	Valid;
-	uint32_t	Locked;
-	uint32_t	Deleted;
-	int32_t		Instance;
-	char		diskDeviceName[10];
-	uint32_t	UnMapped;
-};
-
-/* Features, asked from the tools to know if the driver
- * supports drives >2TB
- */
-typedef union {
-	struct {
-		uint32_t largeLBA  : 1;	/* disk support greater 2TB */
-		uint32_t IoctlBuf  : 1;	/* ARCIOCTL call support */
-		uint32_t AIFSupport: 1;	/* AIF support */
-		uint32_t JBODSupport:1;	/* fw + driver support JBOD */
-		uint32_t fReserved : 28;
-	} fBits;
-	uint32_t fValue;
-} featuresState;
-
-struct aac_features {
-	featuresState feat;
-	uint32_t data[31];
-	uint32_t reserved[32];
-} __packed;
-#endif
diff --git a/include.new/sys/acct.h b/include.new/sys/acct.h
deleted file mode 100644
index ddf9669..0000000
--- a/include.new/sys/acct.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)acct.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/sys/acct.h 169857 2007-05-22 06:51:38Z dds $
- */
-
-#ifndef _SYS_ACCT_H_
-#define _SYS_ACCT_H_
-
-#ifdef _KERNEL
-#define float uint32_t
-#endif
-
-#define AC_COMM_LEN 16
-
-/*
- * Accounting structure version 2 (current).
- * The first byte is always zero.
- * Time units are microseconds.
- */
-
-struct acctv2 {
-	uint8_t   ac_zero;		/* zero identifies new version */
-	uint8_t   ac_version;		/* record version number */
-	uint16_t  ac_len;		/* record length */
-
-	char	  ac_comm[AC_COMM_LEN];	/* command name */
-	float	  ac_utime;		/* user time */
-	float	  ac_stime;		/* system time */
-	float	  ac_etime;		/* elapsed time */
-	time_t	  ac_btime;		/* starting time */
-	uid_t	  ac_uid;		/* user id */
-	gid_t	  ac_gid;		/* group id */
-	float	  ac_mem;		/* average memory usage */
-	float	  ac_io;		/* count of IO blocks */
-	__dev_t   ac_tty;		/* controlling tty */
-
-	uint16_t  ac_len2;		/* record length */
-	union {
-		__dev_t	  ac_align;	/* force v1 compatible alignment */
-
-#define	AFORK	0x01			/* forked but not exec'ed */
-/* ASU is no longer supported */
-#define	ASU	0x02			/* used super-user permissions */
-#define	ACOMPAT	0x04			/* used compatibility mode */
-#define	ACORE	0x08			/* dumped core */
-#define	AXSIG	0x10			/* killed by a signal */
-#define ANVER	0x20			/* new record version */
-
-		uint8_t   ac_flag;	/* accounting flags */
-	} ac_trailer;
-
-#define ac_flagx ac_trailer.ac_flag
-};
-
-
-/*
- * Legacy accounting structure (rev. 1.5-1.18).
- * The first byte is always non-zero.
- * Some fields use a comp_t type which is a 3 bits base 8
- * exponent, 13 bit fraction ``floating point'' number.
- * Units are 1/AHZV1 seconds.
- */
-
-typedef uint16_t comp_t;
-
-struct acctv1 {
-	char	  ac_comm[AC_COMM_LEN];	/* command name */
-	comp_t	  ac_utime;		/* user time */
-	comp_t	  ac_stime;		/* system time */
-	comp_t	  ac_etime;		/* elapsed time */
-	time_t	  ac_btime;		/* starting time */
-	uid_t	  ac_uid;		/* user id */
-	gid_t	  ac_gid;		/* group id */
-	uint16_t  ac_mem;		/* average memory usage */
-	comp_t	  ac_io;		/* count of IO blocks */
-	__dev_t   ac_tty;		/* controlling tty */
-	uint8_t   ac_flag;		/* accounting flags */
-};
-
-/*
- * 1/AHZV1 is the granularity of the data encoded in the comp_t fields.
- * This is not necessarily equal to hz.
- */
-#define	AHZV1	64
-
-#ifdef _KERNEL
-struct thread;
-
-int	acct_process(struct thread *td);
-#undef float
-#endif
-
-#endif /* !_SYS_ACCT_H_ */
diff --git a/include.new/sys/acl.h b/include.new/sys/acl.h
deleted file mode 100644
index f69b0de..0000000
--- a/include.new/sys/acl.h
+++ /dev/null
@@ -1,416 +0,0 @@
-/*-
- * Copyright (c) 1999-2001 Robert N. M. Watson
- * Copyright (c) 2008 Edward Tomasz Napierała <trasz@FreeBSD.org>
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/acl.h 220465 2011-04-09 07:42:25Z trasz $
- */
-/* 
- * Developed by the TrustedBSD Project.
- * Support for POSIX.1e and NFSv4 access control lists.
- */
-
-#ifndef _SYS_ACL_H_
-#define	_SYS_ACL_H_
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <vm/uma.h>
-
-/*
- * POSIX.1e and NFSv4 ACL types and related constants.
- */
-
-typedef uint32_t	acl_tag_t;
-typedef uint32_t	acl_perm_t;
-typedef uint16_t	acl_entry_type_t;
-typedef uint16_t	acl_flag_t;
-typedef int		acl_type_t;
-typedef int		*acl_permset_t;
-typedef uint16_t	*acl_flagset_t;
-
-/*
- * With 254 entries, "struct acl_t_struct" is exactly one 4kB page big.
- * Note that with NFSv4 ACLs, the maximum number of ACL entries one
- * may set on file or directory is about half of ACL_MAX_ENTRIES.
- *
- * If you increase this, you might also need to increase
- * _ACL_T_ALIGNMENT_BITS in lib/libc/posix1e/acl_support.h.
- *
- * The maximum number of POSIX.1e ACLs is controlled
- * by OLDACL_MAX_ENTRIES.  Changing that one will break binary
- * compatibility with pre-8.0 userland and change on-disk ACL layout.
- */
-#define	ACL_MAX_ENTRIES				254
-
-#if defined(_KERNEL) || defined(_ACL_PRIVATE)
-
-#define	POSIX1E_ACL_ACCESS_EXTATTR_NAMESPACE	EXTATTR_NAMESPACE_SYSTEM
-#define	POSIX1E_ACL_ACCESS_EXTATTR_NAME		"posix1e.acl_access"
-#define	POSIX1E_ACL_DEFAULT_EXTATTR_NAMESPACE	EXTATTR_NAMESPACE_SYSTEM
-#define	POSIX1E_ACL_DEFAULT_EXTATTR_NAME	"posix1e.acl_default"
-#define	NFS4_ACL_EXTATTR_NAMESPACE		EXTATTR_NAMESPACE_SYSTEM
-#define	NFS4_ACL_EXTATTR_NAME			"nfs4.acl"
-#define	OLDACL_MAX_ENTRIES			32
-
-/*
- * "struct oldacl" is used in compatibility ACL syscalls and for on-disk
- * storage of POSIX.1e ACLs.
- */
-typedef int	oldacl_tag_t;
-typedef mode_t	oldacl_perm_t;
-
-struct oldacl_entry {
-	oldacl_tag_t	ae_tag;
-	uid_t		ae_id;
-	oldacl_perm_t	ae_perm;
-};
-typedef struct oldacl_entry	*oldacl_entry_t;
-
-struct oldacl {
-	int			acl_cnt;
-	struct oldacl_entry	acl_entry[OLDACL_MAX_ENTRIES];
-};
-
-/*
- * Current "struct acl".
- */
-struct acl_entry {
-	acl_tag_t		ae_tag;
-	uid_t			ae_id;
-	acl_perm_t		ae_perm;
-	/* NFSv4 entry type, "allow" or "deny".  Unused in POSIX.1e ACLs. */
-	acl_entry_type_t	ae_entry_type;
-	/* NFSv4 ACL inheritance.  Unused in POSIX.1e ACLs. */
-	acl_flag_t		ae_flags;
-};
-typedef struct acl_entry	*acl_entry_t;
-
-/*
- * Internal ACL structure, used in libc, kernel APIs and for on-disk
- * storage of NFSv4 ACLs.  POSIX.1e ACLs use "struct oldacl" for on-disk
- * storage.
- */
-struct acl {
-	unsigned int		acl_maxcnt;
-	unsigned int		acl_cnt;
-	/* Will be required e.g. to implement NFSv4.1 ACL inheritance. */
-	int			acl_spare[4];
-	struct acl_entry	acl_entry[ACL_MAX_ENTRIES];
-};
-
-/*
- * ACL structure internal to libc.
- */
-struct acl_t_struct {
-	struct acl		ats_acl;
-	int			ats_cur_entry;
-	/*
-	 * ats_brand is for libc internal bookkeeping only.
-	 * Applications should use acl_get_brand_np(3).
-	 * Kernel code should use the "type" argument passed
-	 * to VOP_SETACL, VOP_GETACL or VOP_ACLCHECK calls;
-	 * ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT mean POSIX.1e
-	 * ACL, ACL_TYPE_NFS4 means NFSv4 ACL.
-	 */
-	int			ats_brand;
-};
-typedef struct acl_t_struct *acl_t;
-
-#else /* _KERNEL || _ACL_PRIVATE */
-
-typedef void *acl_entry_t;
-typedef void *acl_t;
-
-#endif /* !_KERNEL && !_ACL_PRIVATE */
-
-/*
- * Possible valid values for ats_brand field.
- */
-#define	ACL_BRAND_UNKNOWN	0
-#define	ACL_BRAND_POSIX		1
-#define	ACL_BRAND_NFS4		2
-
-/*
- * Possible valid values for ae_tag field.  For explanation, see acl(9).
- */
-#define	ACL_UNDEFINED_TAG	0x00000000
-#define	ACL_USER_OBJ		0x00000001
-#define	ACL_USER		0x00000002
-#define	ACL_GROUP_OBJ		0x00000004
-#define	ACL_GROUP		0x00000008
-#define	ACL_MASK		0x00000010
-#define	ACL_OTHER		0x00000020
-#define	ACL_OTHER_OBJ		ACL_OTHER
-#define	ACL_EVERYONE		0x00000040
-
-/*
- * Possible valid values for ae_entry_type field, valid only for NFSv4 ACLs.
- */
-#define	ACL_ENTRY_TYPE_ALLOW	0x0100
-#define	ACL_ENTRY_TYPE_DENY	0x0200
-#define	ACL_ENTRY_TYPE_AUDIT	0x0400
-#define	ACL_ENTRY_TYPE_ALARM	0x0800
-
-/*
- * Possible valid values for acl_type_t arguments.  First two
- * are provided only for backwards binary compatibility.
- */
-#define	ACL_TYPE_ACCESS_OLD	0x00000000
-#define	ACL_TYPE_DEFAULT_OLD	0x00000001
-#define	ACL_TYPE_ACCESS		0x00000002
-#define	ACL_TYPE_DEFAULT	0x00000003
-#define	ACL_TYPE_NFS4		0x00000004
-
-/*
- * Possible bits in ae_perm field for POSIX.1e ACLs.  Note
- * that ACL_EXECUTE may be used in both NFSv4 and POSIX.1e ACLs.
- */
-#define	ACL_EXECUTE		0x0001
-#define	ACL_WRITE		0x0002
-#define	ACL_READ		0x0004
-#define	ACL_PERM_NONE		0x0000
-#define	ACL_PERM_BITS		(ACL_EXECUTE | ACL_WRITE | ACL_READ)
-#define	ACL_POSIX1E_BITS	(ACL_EXECUTE | ACL_WRITE | ACL_READ)
-
-/*
- * Possible bits in ae_perm field for NFSv4 ACLs.
- */
-#define	ACL_READ_DATA		0x00000008
-#define	ACL_LIST_DIRECTORY	0x00000008
-#define	ACL_WRITE_DATA		0x00000010
-#define	ACL_ADD_FILE		0x00000010
-#define	ACL_APPEND_DATA		0x00000020
-#define	ACL_ADD_SUBDIRECTORY	0x00000020
-#define	ACL_READ_NAMED_ATTRS	0x00000040
-#define	ACL_WRITE_NAMED_ATTRS	0x00000080
-/* ACL_EXECUTE is defined above. */
-#define	ACL_DELETE_CHILD	0x00000100
-#define	ACL_READ_ATTRIBUTES	0x00000200
-#define	ACL_WRITE_ATTRIBUTES	0x00000400
-#define	ACL_DELETE		0x00000800
-#define	ACL_READ_ACL		0x00001000
-#define	ACL_WRITE_ACL		0x00002000
-#define	ACL_WRITE_OWNER		0x00004000
-#define	ACL_SYNCHRONIZE		0x00008000
-
-#define	ACL_FULL_SET		(ACL_READ_DATA | ACL_WRITE_DATA | \
-    ACL_APPEND_DATA | ACL_READ_NAMED_ATTRS | ACL_WRITE_NAMED_ATTRS | \
-    ACL_EXECUTE | ACL_DELETE_CHILD | ACL_READ_ATTRIBUTES | \
-    ACL_WRITE_ATTRIBUTES | ACL_DELETE | ACL_READ_ACL | ACL_WRITE_ACL | \
-    ACL_WRITE_OWNER | ACL_SYNCHRONIZE)
-
-#define	ACL_MODIFY_SET		(ACL_FULL_SET & \
-    ~(ACL_WRITE_ACL | ACL_WRITE_OWNER))
-
-#define	ACL_READ_SET		(ACL_READ_DATA | ACL_READ_NAMED_ATTRS | \
-    ACL_READ_ATTRIBUTES | ACL_READ_ACL)
-
-#define	ACL_WRITE_SET		(ACL_WRITE_DATA | ACL_APPEND_DATA | \
-    ACL_WRITE_NAMED_ATTRS | ACL_WRITE_ATTRIBUTES)
-
-#define	ACL_NFS4_PERM_BITS	ACL_FULL_SET
-
-/*
- * Possible entry_id values for acl_get_entry(3).
- */
-#define	ACL_FIRST_ENTRY		0
-#define	ACL_NEXT_ENTRY		1
-
-/*
- * Possible values in ae_flags field; valid only for NFSv4 ACLs.
- */
-#define	ACL_ENTRY_FILE_INHERIT		0x0001
-#define	ACL_ENTRY_DIRECTORY_INHERIT	0x0002
-#define	ACL_ENTRY_NO_PROPAGATE_INHERIT	0x0004
-#define	ACL_ENTRY_INHERIT_ONLY		0x0008
-#define	ACL_ENTRY_SUCCESSFUL_ACCESS	0x0010
-#define	ACL_ENTRY_FAILED_ACCESS		0x0020
-
-#define	ACL_FLAGS_BITS			(ACL_ENTRY_FILE_INHERIT | \
-    ACL_ENTRY_DIRECTORY_INHERIT | ACL_ENTRY_NO_PROPAGATE_INHERIT | \
-    ACL_ENTRY_INHERIT_ONLY | ACL_ENTRY_SUCCESSFUL_ACCESS | \
-    ACL_ENTRY_FAILED_ACCESS)
-
-/*
- * Undefined value in ae_id field.  ae_id should be set to this value
- * iff ae_tag is ACL_USER_OBJ, ACL_GROUP_OBJ, ACL_OTHER or ACL_EVERYONE.
- */
-#define	ACL_UNDEFINED_ID	((uid_t)-1)
-
-/*
- * Possible values for _flags parameter in acl_to_text_np(3).
- */
-#define	ACL_TEXT_VERBOSE	0x01
-#define	ACL_TEXT_NUMERIC_IDS	0x02
-#define	ACL_TEXT_APPEND_ID	0x04
-
-/*
- * POSIX.1e ACLs are capable of expressing the read, write, and execute bits
- * of the POSIX mode field.  We provide two masks: one that defines the bits
- * the ACL will replace in the mode, and the other that defines the bits that
- * must be preseved when an ACL is updating a mode.
- */
-#define	ACL_OVERRIDE_MASK	(S_IRWXU | S_IRWXG | S_IRWXO)
-#define	ACL_PRESERVE_MASK	(~ACL_OVERRIDE_MASK)
-
-#ifdef _KERNEL
-
-/*
- * Filesystem-independent code to move back and forth between POSIX mode and
- * POSIX.1e ACL representations.
- */
-acl_perm_t		acl_posix1e_mode_to_perm(acl_tag_t tag, mode_t mode);
-struct acl_entry	acl_posix1e_mode_to_entry(acl_tag_t tag, uid_t uid,
-			    gid_t gid, mode_t mode);
-mode_t			acl_posix1e_perms_to_mode(
-			    struct acl_entry *acl_user_obj_entry,
-			    struct acl_entry *acl_group_obj_entry,
-			    struct acl_entry *acl_other_entry);
-mode_t			acl_posix1e_acl_to_mode(struct acl *acl);
-mode_t			acl_posix1e_newfilemode(mode_t cmode,
-			    struct acl *dacl);
-struct acl		*acl_alloc(int flags);
-void			acl_free(struct acl *aclp);
-
-void			acl_nfs4_sync_acl_from_mode(struct acl *aclp,
-			    mode_t mode, int file_owner_id);
-void			acl_nfs4_sync_mode_from_acl(mode_t *mode,
-			    const struct acl *aclp);
-int			acl_nfs4_is_trivial(const struct acl *aclp,
-			    int file_owner_id);
-void			acl_nfs4_compute_inherited_acl(
-			    const struct acl *parent_aclp,
-			    struct acl *child_aclp, mode_t mode,
-			    int file_owner_id, int is_directory);
-int			acl_copy_oldacl_into_acl(const struct oldacl *source,
-			    struct acl *dest);
-int			acl_copy_acl_into_oldacl(const struct acl *source,
-			    struct oldacl *dest);
-
-/*
- * To allocate 'struct acl', use acl_alloc()/acl_free() instead of this.
- */
-MALLOC_DECLARE(M_ACL);
-/*
- * Filesystem-independent syntax check for a POSIX.1e ACL.
- */
-int			acl_posix1e_check(struct acl *acl);
-int 			acl_nfs4_check(const struct acl *aclp, int is_directory);
-
-#else /* !_KERNEL */
-
-#if defined(_ACL_PRIVATE)
-
-/*
- * Syscall interface -- use the library calls instead as the syscalls have
- * strict ACL entry ordering requirements.
- */
-__BEGIN_DECLS
-int	__acl_aclcheck_fd(int _filedes, acl_type_t _type, struct acl *_aclp);
-int	__acl_aclcheck_file(const char *_path, acl_type_t _type,
-	    struct acl *_aclp);
-int	__acl_aclcheck_link(const char *_path, acl_type_t _type,
-	    struct acl *_aclp);
-int	__acl_delete_fd(int _filedes, acl_type_t _type);
-int	__acl_delete_file(const char *_path_p, acl_type_t _type);
-int	__acl_delete_link(const char *_path_p, acl_type_t _type);
-int	__acl_get_fd(int _filedes, acl_type_t _type, struct acl *_aclp);
-int	__acl_get_file(const char *_path, acl_type_t _type, struct acl *_aclp);
-int	__acl_get_link(const char *_path, acl_type_t _type, struct acl *_aclp);
-int	__acl_set_fd(int _filedes, acl_type_t _type, struct acl *_aclp);
-int	__acl_set_file(const char *_path, acl_type_t _type, struct acl *_aclp);
-int	__acl_set_link(const char *_path, acl_type_t _type, struct acl *_aclp);
-__END_DECLS
-
-#endif /* _ACL_PRIVATE */
-
-/*
- * Supported POSIX.1e ACL manipulation and assignment/retrieval API _np calls
- * are local extensions that reflect an environment capable of opening file
- * descriptors of directories, and allowing additional ACL type for different
- * filesystems (i.e., AFS).
- */
-__BEGIN_DECLS
-int	acl_add_flag_np(acl_flagset_t _flagset_d, acl_flag_t _flag);
-int	acl_add_perm(acl_permset_t _permset_d, acl_perm_t _perm);
-int	acl_calc_mask(acl_t *_acl_p);
-int	acl_clear_flags_np(acl_flagset_t _flagset_d);
-int	acl_clear_perms(acl_permset_t _permset_d);
-int	acl_copy_entry(acl_entry_t _dest_d, acl_entry_t _src_d);
-ssize_t	acl_copy_ext(void *_buf_p, acl_t _acl, ssize_t _size);
-acl_t	acl_copy_int(const void *_buf_p);
-int	acl_create_entry(acl_t *_acl_p, acl_entry_t *_entry_p);
-int	acl_create_entry_np(acl_t *_acl_p, acl_entry_t *_entry_p, int _index);
-int	acl_delete_entry(acl_t _acl, acl_entry_t _entry_d);
-int	acl_delete_entry_np(acl_t _acl, int _index);
-int	acl_delete_fd_np(int _filedes, acl_type_t _type);
-int	acl_delete_file_np(const char *_path_p, acl_type_t _type);
-int	acl_delete_link_np(const char *_path_p, acl_type_t _type);
-int	acl_delete_def_file(const char *_path_p);
-int	acl_delete_def_link_np(const char *_path_p);
-int	acl_delete_flag_np(acl_flagset_t _flagset_d, acl_flag_t _flag);
-int	acl_delete_perm(acl_permset_t _permset_d, acl_perm_t _perm);
-acl_t	acl_dup(acl_t _acl);
-int	acl_free(void *_obj_p);
-acl_t	acl_from_text(const char *_buf_p);
-int	acl_get_brand_np(acl_t _acl, int *_brand_p);
-int	acl_get_entry(acl_t _acl, int _entry_id, acl_entry_t *_entry_p);
-acl_t	acl_get_fd(int _fd);
-acl_t	acl_get_fd_np(int fd, acl_type_t _type);
-acl_t	acl_get_file(const char *_path_p, acl_type_t _type);
-int	acl_get_entry_type_np(acl_entry_t _entry_d, acl_entry_type_t *_entry_type_p);
-acl_t	acl_get_link_np(const char *_path_p, acl_type_t _type);
-void	*acl_get_qualifier(acl_entry_t _entry_d);
-int	acl_get_flag_np(acl_flagset_t _flagset_d, acl_flag_t _flag);
-int	acl_get_perm_np(acl_permset_t _permset_d, acl_perm_t _perm);
-int	acl_get_flagset_np(acl_entry_t _entry_d, acl_flagset_t *_flagset_p);
-int	acl_get_permset(acl_entry_t _entry_d, acl_permset_t *_permset_p);
-int	acl_get_tag_type(acl_entry_t _entry_d, acl_tag_t *_tag_type_p);
-acl_t	acl_init(int _count);
-int	acl_set_fd(int _fd, acl_t _acl);
-int	acl_set_fd_np(int _fd, acl_t _acl, acl_type_t _type);
-int	acl_set_file(const char *_path_p, acl_type_t _type, acl_t _acl);
-int	acl_set_entry_type_np(acl_entry_t _entry_d, acl_entry_type_t _entry_type);
-int	acl_set_link_np(const char *_path_p, acl_type_t _type, acl_t _acl);
-int	acl_set_flagset_np(acl_entry_t _entry_d, acl_flagset_t _flagset_d);
-int	acl_set_permset(acl_entry_t _entry_d, acl_permset_t _permset_d);
-int	acl_set_qualifier(acl_entry_t _entry_d, const void *_tag_qualifier_p);
-int	acl_set_tag_type(acl_entry_t _entry_d, acl_tag_t _tag_type);
-ssize_t	acl_size(acl_t _acl);
-char	*acl_to_text(acl_t _acl, ssize_t *_len_p);
-char	*acl_to_text_np(acl_t _acl, ssize_t *_len_p, int _flags);
-int	acl_valid(acl_t _acl);
-int	acl_valid_fd_np(int _fd, acl_type_t _type, acl_t _acl);
-int	acl_valid_file_np(const char *_path_p, acl_type_t _type, acl_t _acl);
-int	acl_valid_link_np(const char *_path_p, acl_type_t _type, acl_t _acl);
-int	acl_is_trivial_np(const acl_t _acl, int *_trivialp);
-acl_t	acl_strip_np(const acl_t _acl, int recalculate_mask);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_ACL_H_ */
diff --git a/include.new/sys/agpio.h b/include.new/sys/agpio.h
deleted file mode 100644
index a887020..0000000
--- a/include.new/sys/agpio.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/sys/agpio.h 235782 2012-05-22 10:59:26Z kib $
- */
-
-#ifndef _SYS_AGPIO_H_
-#define _SYS_AGPIO_H_
-
-/*
- * The AGP gatt uses 4k pages irrespective of the host page size.
- */
-#define AGP_PAGE_SIZE		4096
-#define AGP_PAGE_SHIFT		12
-
-/*
- * Macros to manipulate AGP mode words.
- *
- * SBA = Sideband Address Port
- * FW  = Fast Writes
- */
-#define AGP_MODE_GET_RQ(x)		(((x) & 0xff000000U) >> 24)
-#define AGP_MODE_GET_ARQSZ(x)		(((x) & 0x0000e000U) >> 13)
-#define AGP_MODE_GET_CAL(x)		(((x) & 0x00001c00U) >> 10)
-#define AGP_MODE_GET_SBA(x)		(((x) & 0x00000200U) >> 9)
-#define AGP_MODE_GET_AGP(x)		(((x) & 0x00000100U) >> 8)
-#define AGP_MODE_GET_GART_64(x)		(((x) & 0x00000080U) >> 7)
-#define AGP_MODE_GET_OVER_4G(x)		(((x) & 0x00000020U) >> 5)
-#define AGP_MODE_GET_FW(x)		(((x) & 0x00000010U) >> 4)
-#define AGP_MODE_GET_MODE_3(x)		(((x) & 0x00000008U) >> 3)
-#define AGP_MODE_GET_RATE(x)		((x) & 0x00000007U)
-#define AGP_MODE_SET_RQ(x,v)		(((x) & ~0xff000000U) | ((v) << 24))
-#define AGP_MODE_SET_ARQSZ(x,v)		(((x) & ~0x0000e000U) | ((v) << 13))
-#define AGP_MODE_SET_CAL(x,v)		(((x) & ~0x00001c00U) | ((v) << 10))
-#define AGP_MODE_SET_SBA(x,v)		(((x) & ~0x00000200U) | ((v) << 9))
-#define AGP_MODE_SET_AGP(x,v)		(((x) & ~0x00000100U) | ((v) << 8))
-#define AGP_MODE_SET_GART_64(x,v)	(((x) & ~0x00000080U) | ((v) << 7))
-#define AGP_MODE_SET_OVER_4G(x,v)	(((x) & ~0x00000020U) | ((v) << 5))
-#define AGP_MODE_SET_FW(x,v)		(((x) & ~0x00000010U) | ((v) << 4))
-#define AGP_MODE_SET_MODE_3(x,v)	(((x) & ~0x00000008U) | ((v) << 3))
-#define AGP_MODE_SET_RATE(x,v)		(((x) & ~0x00000007U) | (v))
-#define AGP_MODE_V2_RATE_1x		0x00000001
-#define AGP_MODE_V2_RATE_2x		0x00000002
-#define AGP_MODE_V2_RATE_4x		0x00000004
-#define AGP_MODE_V3_RATE_4x		0x00000001
-#define AGP_MODE_V3_RATE_8x		0x00000002
-#define AGP_MODE_V3_RATE_RSVD		0x00000004
-
-/* XXX: Compat */
-#define AGP_MODE_GET_4G(x)		AGP_MODE_GET_OVER_4G(x)
-#define AGP_MODE_SET_4G(x)		AGP_MODE_SET_OVER_4G(x)
-#define AGP_MODE_RATE_1x		AGP_MODE_V2_RATE_1x
-#define AGP_MODE_RATE_2x		AGP_MODE_V2_RATE_2x
-#define AGP_MODE_RATE_4x		AGP_MODE_V2_RATE_4x
-
-#define AGPIOC_BASE       'A'
-#define AGPIOC_INFO       _IOR (AGPIOC_BASE, 0, agp_info)
-#define AGPIOC_ACQUIRE    _IO  (AGPIOC_BASE, 1)
-#define AGPIOC_RELEASE    _IO  (AGPIOC_BASE, 2)
-#define AGPIOC_SETUP      _IOW (AGPIOC_BASE, 3, agp_setup)
-#if 0
-#define AGPIOC_RESERVE    _IOW (AGPIOC_BASE, 4, agp_region)
-#define AGPIOC_PROTECT    _IOW (AGPIOC_BASE, 5, agp_region)
-#endif
-#define AGPIOC_ALLOCATE   _IOWR(AGPIOC_BASE, 6, agp_allocate)
-#define AGPIOC_DEALLOCATE _IOW (AGPIOC_BASE, 7, int)
-#define AGPIOC_BIND       _IOW (AGPIOC_BASE, 8, agp_bind)
-#define AGPIOC_UNBIND     _IOW (AGPIOC_BASE, 9, agp_unbind)
-#define AGPIOC_CHIPSET_FLUSH _IO (AGPIOC_BASE, 10)
-
-typedef struct _agp_version {
-	u_int16_t major;
-	u_int16_t minor;
-} agp_version;
-
-typedef struct _agp_info {
-	agp_version version;	/* version of the driver        */
-	uint32_t bridge_id;	/* bridge vendor/device         */
-	uint32_t agp_mode;	/* mode info of bridge          */
-	off_t aper_base;	/* base of aperture             */
-	size_t aper_size;	/* size of aperture             */
-	size_t pg_total;	/* max pages (swap + system)    */
-	size_t pg_system;	/* max pages (system)           */
-	size_t pg_used;		/* current pages used           */
-} agp_info;
-
-typedef struct _agp_setup {
-	uint32_t agp_mode;		/* mode info of bridge          */
-} agp_setup;
-
-#if 0
-/*
- * The "prot" down below needs still a "sleep" flag somehow ...
- */
-typedef struct _agp_segment {
-	off_t pg_start;		/* starting page to populate    */
-	size_t pg_count;	/* number of pages              */
-	int prot;		/* prot flags for mmap          */
-} agp_segment;
-
-typedef struct _agp_region {
-	pid_t pid;		/* pid of process               */
-	size_t seg_count;	/* number of segments           */
-	struct _agp_segment *seg_list;
-} agp_region;
-#endif
-
-typedef struct _agp_allocate {
-	int key;		/* tag of allocation            */
-	size_t pg_count;	/* number of pages              */
-	uint32_t type;		/* 0 == normal, other devspec   */
-   	uint32_t physical;     /* device specific (some devices  
-				 * need a phys address of the     
-				 * actual page behind the gatt    
-				 * table)                        */
-} agp_allocate;
-
-typedef struct _agp_bind {
-	int key;		/* tag of allocation            */
-	off_t pg_start;		/* starting page to populate    */
-} agp_bind;
-
-typedef struct _agp_unbind {
-	int key;		/* tag of allocation            */
-	uint32_t priority;	/* priority for paging out      */
-} agp_unbind;
-
-#endif /* !_SYS_AGPIO_H_ */
diff --git a/include.new/sys/aio.h b/include.new/sys/aio.h
deleted file mode 100644
index 75353a6..0000000
--- a/include.new/sys/aio.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * Copyright (c) 1997 John S. Dyson.  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. John S. Dyson's name may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * DISCLAIMER:  This code isn't warranted to do anything useful.  Anything
- * bad that happens because of using this software isn't the responsibility
- * of the author.  This software is distributed AS-IS.
- *
- * $FreeBSD: releng/10.2/sys/sys/aio.h 251526 2013-06-08 13:27:57Z glebius $
- */
-
-#ifndef _SYS_AIO_H_
-#define	_SYS_AIO_H_
-
-#include <sys/types.h>
-#include <sys/signal.h>
-
-/*
- * Returned by aio_cancel:
- */
-#define	AIO_CANCELED		0x1
-#define	AIO_NOTCANCELED		0x2
-#define	AIO_ALLDONE		0x3
-
-/*
- * LIO opcodes
- */
-#define	LIO_NOP			0x0
-#define LIO_WRITE		0x1
-#define	LIO_READ		0x2
-#ifdef _KERNEL
-#define	LIO_SYNC		0x3
-#define	LIO_MLOCK		0x4
-#endif
-
-/*
- * LIO modes
- */
-#define	LIO_NOWAIT		0x0
-#define	LIO_WAIT		0x1
-
-/*
- * Maximum number of allowed LIO operations
- */
-#define	AIO_LISTIO_MAX		16
-
-/*
- * Private members for aiocb -- don't access
- * directly.
- */
-struct __aiocb_private {
-	long	status;
-	long	error;
-	void	*kernelinfo;
-};
-
-/*
- * I/O control block
- */
-typedef struct aiocb {
-	int	aio_fildes;		/* File descriptor */
-	off_t	aio_offset;		/* File offset for I/O */
-	volatile void *aio_buf;         /* I/O buffer in process space */
-	size_t	aio_nbytes;		/* Number of bytes for I/O */
-	int	__spare__[2];
-	void	*__spare2__;
-	int	aio_lio_opcode;		/* LIO opcode */
-	int	aio_reqprio;		/* Request priority -- ignored */
-	struct	__aiocb_private	_aiocb_private;
-	struct	sigevent aio_sigevent;	/* Signal to deliver */
-} aiocb_t;
-
-#ifndef _KERNEL
-
-struct timespec;
-
-__BEGIN_DECLS
-/*
- * Asynchronously read from a file
- */
-int	aio_read(struct aiocb *);
-
-/*
- * Asynchronously write to file
- */
-int	aio_write(struct aiocb *);
-
-/*
- * List I/O Asynchronously/synchronously read/write to/from file
- *	"lio_mode" specifies whether or not the I/O is synchronous.
- *	"acb_list" is an array of "nacb_listent" I/O control blocks.
- *	when all I/Os are complete, the optional signal "sig" is sent.
- */
-int	lio_listio(int, struct aiocb * const [], int, struct sigevent *);
-
-/*
- * Get completion status
- *	returns EINPROGRESS until I/O is complete.
- *	this routine does not block.
- */
-int	aio_error(const struct aiocb *);
-
-/*
- * Finish up I/O, releasing I/O resources and returns the value
- *	that would have been associated with a synchronous I/O request.
- *	This routine must be called once and only once for each
- *	I/O control block who has had I/O associated with it.
- */
-ssize_t	aio_return(struct aiocb *);
-
-/*
- * Cancel I/O
- */
-int	aio_cancel(int, struct aiocb *);
-
-/*
- * Suspend until all specified I/O or timeout is complete.
- */
-int	aio_suspend(const struct aiocb * const[], int, const struct timespec *);
-
-/*
- * Asynchronous mlock
- */
-int	aio_mlock(struct aiocb *);
-
-#ifdef __BSD_VISIBLE
-int	aio_waitcomplete(struct aiocb **, struct timespec *);
-#endif
-
-int	aio_fsync(int op, struct aiocb *aiocbp);
-__END_DECLS
-
-#else
-
-/* Forward declarations for prototypes below. */
-struct socket;
-struct sockbuf;
-
-extern void (*aio_swake)(struct socket *, struct sockbuf *);
-
-#endif
-
-#endif
diff --git a/include.new/sys/alq.h b/include.new/sys/alq.h
deleted file mode 100644
index 56b08dd..0000000
--- a/include.new/sys/alq.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * Copyright (c) 2002, Jeffrey Roberson <jeff@freebsd.org>
- * Copyright (c) 2008-2009, Lawrence Stewart <lstewart@freebsd.org>
- * Copyright (c) 2010, The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed at the Centre for Advanced
- * Internet Architectures, Swinburne University of Technology, Melbourne,
- * Australia by Lawrence Stewart under sponsorship from the FreeBSD Foundation.
- *
- * 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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/alq.h 207223 2010-04-26 13:48:22Z lstewart $
- *
- */
-#ifndef _SYS_ALQ_H_
-#define	_SYS_ALQ_H_
-
-/*
- * Opaque type for the Async. Logging Queue
- */
-struct alq;
-
-/* The thread for the logging daemon */
-extern struct thread *ald_thread;
-
-/*
- * Async. Logging Entry
- */
-struct ale {
-	intptr_t	ae_bytesused;	/* # bytes written to ALE. */
-	char		*ae_data;	/* Write ptr. */
-	int		ae_pad;		/* Unused, compat. */
-};
-
-/* Flag options. */
-#define	ALQ_NOWAIT	0x0001	/* ALQ may not sleep. */
-#define	ALQ_WAITOK	0x0002	/* ALQ may sleep. */
-#define	ALQ_NOACTIVATE	0x0004	/* Don't activate ALQ after write. */
-#define	ALQ_ORDERED	0x0010	/* Maintain write ordering between threads. */
-
-/* Suggested mode for file creation. */
-#define	ALQ_DEFAULT_CMODE	0600
-
-/*
- * alq_open_flags:  Creates a new queue
- *
- * Arguments:
- *	alq	Storage for a pointer to the newly created queue.
- *	file	The filename to open for logging.
- *	cred	Credential to authorize open and I/O with.
- *	cmode	Creation mode for file, if new.
- *	size	The size of the queue in bytes.
- *	flags	ALQ_ORDERED
- * Returns:
- *	error from open or 0 on success
- */
-struct ucred;
-int alq_open_flags(struct alq **alqp, const char *file, struct ucred *cred, int cmode,
-	    int size, int flags);
-int alq_open(struct alq **alqp, const char *file, struct ucred *cred, int cmode,
-	    int size, int count);
-
-/*
- * alq_writen:  Write data into the queue
- *
- * Arguments:
- *	alq	The queue we're writing to
- *	data	The entry to be recorded
- *	len	The number of bytes to write from *data
- *	flags	(ALQ_NOWAIT || ALQ_WAITOK), ALQ_NOACTIVATE
- *
- * Returns:
- *	EWOULDBLOCK if:
- *		Waitok is ALQ_NOWAIT and the queue is full.
- *		The system is shutting down.
- *	0 on success.
- */
-int alq_writen(struct alq *alq, void *data, int len, int flags);
-int alq_write(struct alq *alq, void *data, int flags);
-
-/*
- * alq_flush:  Flush the queue out to disk
- */
-void alq_flush(struct alq *alq);
-
-/*
- * alq_close:  Flush the queue and free all resources.
- */
-void alq_close(struct alq *alq);
-
-/*
- * alq_getn:  Return an entry for direct access
- *
- * Arguments:
- *	alq	The queue to retrieve an entry from
- *	len	Max number of bytes required
- *	flags	(ALQ_NOWAIT || ALQ_WAITOK)
- *
- * Returns:
- *	The next available ale on success.
- *	NULL if:
- *		flags is ALQ_NOWAIT and the queue is full.
- *		The system is shutting down.
- *
- * This leaves the queue locked until a subsequent alq_post.
- */
-struct ale *alq_getn(struct alq *alq, int len, int flags);
-struct ale *alq_get(struct alq *alq, int flags);
-
-/*
- * alq_post_flags:  Schedule the ale retrieved by alq_get/alq_getn for writing.
- *	alq	The queue to post the entry to.
- *	ale	An asynch logging entry returned by alq_get.
- *	flags	ALQ_NOACTIVATE
- */
-void alq_post_flags(struct alq *alq, struct ale *ale, int flags);
-
-static __inline void
-alq_post(struct alq *alq, struct ale *ale)
-{
-	alq_post_flags(alq, ale, 0);
-}
-
-#endif	/* _SYS_ALQ_H_ */
diff --git a/include.new/sys/apm.h b/include.new/sys/apm.h
deleted file mode 100644
index db5e35e..0000000
--- a/include.new/sys/apm.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 2007 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/apm.h 236023 2012-05-25 20:33:34Z marcel $
- */
-
-#ifndef _SYS_APM_H_
-#define	_SYS_APM_H_
-
-/* Driver Descriptor Record. */
-struct apm_ddr {
-	uint16_t	ddr_sig;
-#define	APM_DDR_SIG		0x4552
-	uint16_t	ddr_blksize;
-	uint32_t	ddr_blkcount;
-};
-
-#define	APM_ENT_NAMELEN		32
-#define	APM_ENT_TYPELEN		32
-
-/* Partition Map Entry Record. */
-struct apm_ent {
-	uint16_t	ent_sig;
-#define	APM_ENT_SIG		0x504d
-	uint16_t	_pad_;
-	uint32_t	ent_pmblkcnt;
-	uint32_t	ent_start;
-	uint32_t	ent_size;
-	char		ent_name[APM_ENT_NAMELEN];
-	char		ent_type[APM_ENT_TYPELEN];
-};
-
-#define	APM_ENT_TYPE_SELF		"Apple_partition_map"
-#define	APM_ENT_TYPE_UNUSED		"Apple_Free"
-
-#define	APM_ENT_TYPE_FREEBSD		"FreeBSD"
-#define	APM_ENT_TYPE_FREEBSD_NANDFS	"FreeBSD-nandfs"
-#define	APM_ENT_TYPE_FREEBSD_SWAP	"FreeBSD-swap"
-#define	APM_ENT_TYPE_FREEBSD_UFS	"FreeBSD-UFS"
-#define	APM_ENT_TYPE_FREEBSD_VINUM	"FreeBSD-Vinum"
-#define	APM_ENT_TYPE_FREEBSD_ZFS	"FreeBSD-ZFS"
-
-#define	APM_ENT_TYPE_APPLE_BOOT		"Apple_Bootstrap"
-#define	APM_ENT_TYPE_APPLE_HFS		"Apple_HFS"
-#define	APM_ENT_TYPE_APPLE_UFS		"Apple_UNIX_SVR2"
-
-#endif /* _SYS_APM_H_ */
diff --git a/include.new/sys/assym.h b/include.new/sys/assym.h
deleted file mode 100644
index b31546e..0000000
--- a/include.new/sys/assym.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 1999 Marcel Moolenaar
- * 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 
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/sys/assym.h 126891 2004-03-12 21:45:33Z trhodes $
- */
-
-#ifndef _SYS_ASSYM_H_
-#define	_SYS_ASSYM_H_
-
-#define	ASSYM_BIAS		0x10000	/* avoid zero-length arrays */
-#define	ASSYM_ABS(value)	((value) < 0 ? -((value) + 1) + 1ULL : (value))
-
-#define	ASSYM(name, value)						      \
-char name ## sign[((value) < 0 ? 1 : 0) + ASSYM_BIAS];			      \
-char name ## w0[(ASSYM_ABS(value) & 0xFFFFU) + ASSYM_BIAS];		      \
-char name ## w1[((ASSYM_ABS(value) & 0xFFFF0000UL) >> 16) + ASSYM_BIAS];      \
-char name ## w2[((ASSYM_ABS(value) & 0xFFFF00000000ULL) >> 32) + ASSYM_BIAS]; \
-char name ## w3[((ASSYM_ABS(value) & 0xFFFF000000000000ULL) >> 48) + ASSYM_BIAS]
-
-#endif /* !_SYS_ASSYM_H_ */
diff --git a/include.new/sys/ata.h b/include.new/sys/ata.h
deleted file mode 100644
index e8be0dc..0000000
--- a/include.new/sys/ata.h
+++ /dev/null
@@ -1,640 +0,0 @@
-/*-
- * Copyright (c) 2000 - 2008 Søren Schmidt <sos@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,
- *    without modification, immediately at the beginning of the file.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/ata.h 280755 2015-03-27 09:32:34Z mav $
- */
-
-#ifndef _SYS_ATA_H_
-#define _SYS_ATA_H_
-
-#include <sys/ioccom.h>
-
-/* ATA/ATAPI device parameters */
-struct ata_params {
-/*000*/ u_int16_t       config;         /* configuration info */
-#define ATA_PROTO_MASK                  0x8003
-#define ATA_PROTO_ATAPI                 0x8000
-#define ATA_PROTO_ATAPI_12              0x8000
-#define ATA_PROTO_ATAPI_16              0x8001
-#define ATA_PROTO_CFA                   0x848a
-#define ATA_ATAPI_TYPE_MASK             0x1f00
-#define ATA_ATAPI_TYPE_DIRECT           0x0000  /* disk/floppy */
-#define ATA_ATAPI_TYPE_TAPE             0x0100  /* streaming tape */
-#define ATA_ATAPI_TYPE_CDROM            0x0500  /* CD-ROM device */
-#define ATA_ATAPI_TYPE_OPTICAL          0x0700  /* optical disk */
-#define ATA_DRQ_MASK                    0x0060
-#define ATA_DRQ_SLOW                    0x0000  /* cpu 3 ms delay */
-#define ATA_DRQ_INTR                    0x0020  /* interrupt 10 ms delay */
-#define ATA_DRQ_FAST                    0x0040  /* accel 50 us delay */
-#define ATA_RESP_INCOMPLETE             0x0004
-
-/*001*/ u_int16_t       cylinders;              /* # of cylinders */
-/*002*/ u_int16_t       specconf;		/* specific configuration */
-/*003*/ u_int16_t       heads;                  /* # heads */
-	u_int16_t       obsolete4;
-	u_int16_t       obsolete5;
-/*006*/ u_int16_t       sectors;                /* # sectors/track */
-/*007*/ u_int16_t       vendor7[3];
-/*010*/ u_int8_t        serial[20];             /* serial number */
-/*020*/ u_int16_t       retired20;
-	u_int16_t       retired21;
-	u_int16_t       obsolete22;
-/*023*/ u_int8_t        revision[8];            /* firmware revision */
-/*027*/ u_int8_t        model[40];              /* model name */
-/*047*/ u_int16_t       sectors_intr;           /* sectors per interrupt */
-/*048*/ u_int16_t       usedmovsd;              /* double word read/write? */
-/*049*/ u_int16_t       capabilities1;
-#define ATA_SUPPORT_DMA                 0x0100
-#define ATA_SUPPORT_LBA                 0x0200
-#define ATA_SUPPORT_IORDY               0x0400
-#define ATA_SUPPORT_IORDYDIS            0x0800
-#define ATA_SUPPORT_OVERLAP             0x4000
-
-/*050*/ u_int16_t       capabilities2;
-/*051*/ u_int16_t       retired_piomode;        /* PIO modes 0-2 */
-#define ATA_RETIRED_PIO_MASK            0x0300
-
-/*052*/ u_int16_t       retired_dmamode;        /* DMA modes */
-#define ATA_RETIRED_DMA_MASK            0x0003
-
-/*053*/ u_int16_t       atavalid;               /* fields valid */
-#define ATA_FLAG_54_58                  0x0001  /* words 54-58 valid */
-#define ATA_FLAG_64_70                  0x0002  /* words 64-70 valid */
-#define ATA_FLAG_88                     0x0004  /* word 88 valid */
-
-/*054*/ u_int16_t       current_cylinders;
-/*055*/ u_int16_t       current_heads;
-/*056*/ u_int16_t       current_sectors;
-/*057*/ u_int16_t       current_size_1;
-/*058*/ u_int16_t       current_size_2;
-/*059*/ u_int16_t       multi;
-#define ATA_MULTI_VALID                 0x0100
-
-/*060*/ u_int16_t       lba_size_1;
-	u_int16_t       lba_size_2;
-	u_int16_t       obsolete62;
-/*063*/ u_int16_t       mwdmamodes;             /* multiword DMA modes */
-/*064*/ u_int16_t       apiomodes;              /* advanced PIO modes */
-
-/*065*/ u_int16_t       mwdmamin;               /* min. M/W DMA time/word ns */
-/*066*/ u_int16_t       mwdmarec;               /* rec. M/W DMA time ns */
-/*067*/ u_int16_t       pioblind;               /* min. PIO cycle w/o flow */
-/*068*/ u_int16_t       pioiordy;               /* min. PIO cycle IORDY flow */
-/*069*/ u_int16_t       support3;
-#define ATA_SUPPORT_RZAT                0x0020
-#define ATA_SUPPORT_DRAT                0x4000
-	u_int16_t       reserved70;
-/*071*/ u_int16_t       rlsovlap;               /* rel time (us) for overlap */
-/*072*/ u_int16_t       rlsservice;             /* rel time (us) for service */
-	u_int16_t       reserved73;
-	u_int16_t       reserved74;
-/*075*/ u_int16_t       queue;
-#define ATA_QUEUE_LEN(x)                ((x) & 0x001f)
-
-/*76*/  u_int16_t       satacapabilities;
-#define ATA_SATA_GEN1                   0x0002
-#define ATA_SATA_GEN2                   0x0004
-#define ATA_SATA_GEN3                   0x0008
-#define ATA_SUPPORT_NCQ                 0x0100
-#define ATA_SUPPORT_IFPWRMNGTRCV        0x0200
-#define ATA_SUPPORT_PHYEVENTCNT         0x0400
-#define ATA_SUPPORT_NCQ_UNLOAD          0x0800
-#define ATA_SUPPORT_NCQ_PRIO            0x1000
-#define ATA_SUPPORT_HAPST               0x2000
-#define ATA_SUPPORT_DAPST               0x4000
-#define ATA_SUPPORT_READLOGDMAEXT       0x8000
-
-/*77*/  u_int16_t       satacapabilities2;
-#define ATA_SATA_CURR_GEN_MASK          0x0006
-#define ATA_SUPPORT_NCQ_STREAM          0x0010
-#define ATA_SUPPORT_NCQ_QMANAGEMENT     0x0020
-#define ATA_SUPPORT_RCVSND_FPDMA_QUEUED 0x0040
-/*78*/  u_int16_t       satasupport;
-#define ATA_SUPPORT_NONZERO             0x0002
-#define ATA_SUPPORT_AUTOACTIVATE        0x0004
-#define ATA_SUPPORT_IFPWRMNGT           0x0008
-#define ATA_SUPPORT_INORDERDATA         0x0010
-#define ATA_SUPPORT_ASYNCNOTIF          0x0020
-#define ATA_SUPPORT_SOFTSETPRESERVE     0x0040
-/*79*/  u_int16_t       sataenabled;
-#define ATA_ENABLED_DAPST               0x0080
-
-/*080*/ u_int16_t       version_major;
-/*081*/ u_int16_t       version_minor;
-
-	struct {
-/*082/085*/ u_int16_t   command1;
-#define ATA_SUPPORT_SMART               0x0001
-#define ATA_SUPPORT_SECURITY            0x0002
-#define ATA_SUPPORT_REMOVABLE           0x0004
-#define ATA_SUPPORT_POWERMGT            0x0008
-#define ATA_SUPPORT_PACKET              0x0010
-#define ATA_SUPPORT_WRITECACHE          0x0020
-#define ATA_SUPPORT_LOOKAHEAD           0x0040
-#define ATA_SUPPORT_RELEASEIRQ          0x0080
-#define ATA_SUPPORT_SERVICEIRQ          0x0100
-#define ATA_SUPPORT_RESET               0x0200
-#define ATA_SUPPORT_PROTECTED           0x0400
-#define ATA_SUPPORT_WRITEBUFFER         0x1000
-#define ATA_SUPPORT_READBUFFER          0x2000
-#define ATA_SUPPORT_NOP                 0x4000
-
-/*083/086*/ u_int16_t   command2;
-#define ATA_SUPPORT_MICROCODE           0x0001
-#define ATA_SUPPORT_QUEUED              0x0002
-#define ATA_SUPPORT_CFA                 0x0004
-#define ATA_SUPPORT_APM                 0x0008
-#define ATA_SUPPORT_NOTIFY              0x0010
-#define ATA_SUPPORT_STANDBY             0x0020
-#define ATA_SUPPORT_SPINUP              0x0040
-#define ATA_SUPPORT_MAXSECURITY         0x0100
-#define ATA_SUPPORT_AUTOACOUSTIC        0x0200
-#define ATA_SUPPORT_ADDRESS48           0x0400
-#define ATA_SUPPORT_OVERLAY             0x0800
-#define ATA_SUPPORT_FLUSHCACHE          0x1000
-#define ATA_SUPPORT_FLUSHCACHE48        0x2000
-
-/*084/087*/ u_int16_t   extension;
-#define ATA_SUPPORT_SMARTLOG		0x0001
-#define ATA_SUPPORT_SMARTTEST		0x0002
-#define ATA_SUPPORT_MEDIASN		0x0004
-#define ATA_SUPPORT_MEDIAPASS		0x0008
-#define ATA_SUPPORT_STREAMING		0x0010
-#define ATA_SUPPORT_GENLOG		0x0020
-#define ATA_SUPPORT_WRITEDMAFUAEXT	0x0040
-#define ATA_SUPPORT_WRITEDMAQFUAEXT	0x0080
-#define ATA_SUPPORT_64BITWWN		0x0100
-#define ATA_SUPPORT_UNLOAD		0x2000
-	} __packed support, enabled;
-
-/*088*/ u_int16_t       udmamodes;              /* UltraDMA modes */
-/*089*/ u_int16_t       erase_time;             /* time req'd in 2min units */
-/*090*/ u_int16_t       enhanced_erase_time;    /* time req'd in 2min units */
-/*091*/ u_int16_t       apm_value;
-/*092*/ u_int16_t       master_passwd_revision; /* password revision code */
-/*093*/ u_int16_t       hwres;
-#define ATA_CABLE_ID                    0x2000
-
-/*094*/ u_int16_t       acoustic;
-#define ATA_ACOUSTIC_CURRENT(x)         ((x) & 0x00ff)
-#define ATA_ACOUSTIC_VENDOR(x)          (((x) & 0xff00) >> 8)
-
-/*095*/ u_int16_t       stream_min_req_size;
-/*096*/ u_int16_t       stream_transfer_time;
-/*097*/ u_int16_t       stream_access_latency;
-/*098*/ uint32_t       stream_granularity;
-/*100*/ u_int16_t       lba_size48_1;
-	u_int16_t       lba_size48_2;
-	u_int16_t       lba_size48_3;
-	u_int16_t       lba_size48_4;
-	u_int16_t       reserved104;
-/*105*/	u_int16_t       max_dsm_blocks;
-/*106*/	u_int16_t       pss;
-#define ATA_PSS_LSPPS			0x000F
-#define ATA_PSS_LSSABOVE512		0x1000
-#define ATA_PSS_MULTLS			0x2000
-#define ATA_PSS_VALID_MASK		0xC000
-#define ATA_PSS_VALID_VALUE		0x4000
-/*107*/ u_int16_t       isd;
-/*108*/ u_int16_t       wwn[4];
-	u_int16_t       reserved112[5];
-/*117*/ u_int16_t       lss_1;
-/*118*/ u_int16_t       lss_2;
-/*119*/ u_int16_t       support2;
-#define ATA_SUPPORT_WRITEREADVERIFY	0x0002
-#define ATA_SUPPORT_WRITEUNCORREXT	0x0004
-#define ATA_SUPPORT_RWLOGDMAEXT		0x0008
-#define ATA_SUPPORT_MICROCODE3		0x0010
-#define ATA_SUPPORT_FREEFALL		0x0020
-/*120*/ u_int16_t       enabled2;
-	u_int16_t       reserved121[6];
-/*127*/ u_int16_t       removable_status;
-/*128*/ u_int16_t       security_status;
-#define ATA_SECURITY_LEVEL		0x0100	/* 0: high, 1: maximum */
-#define ATA_SECURITY_ENH_SUPP		0x0020	/* enhanced erase supported */
-#define ATA_SECURITY_COUNT_EXP		0x0010	/* count expired */
-#define ATA_SECURITY_FROZEN		0x0008	/* security config is frozen */
-#define ATA_SECURITY_LOCKED		0x0004	/* drive is locked */
-#define ATA_SECURITY_ENABLED		0x0002	/* ATA Security is enabled */
-#define ATA_SECURITY_SUPPORTED		0x0001	/* ATA Security is supported */
-
-	u_int16_t       reserved129[31];
-/*160*/ u_int16_t       cfa_powermode1;
-	u_int16_t       reserved161;
-/*162*/ u_int16_t       cfa_kms_support;
-/*163*/ u_int16_t       cfa_trueide_modes;
-/*164*/ u_int16_t       cfa_memory_modes;
-	u_int16_t       reserved165[4];
-/*169*/	u_int16_t       support_dsm;
-#define ATA_SUPPORT_DSM_TRIM		0x0001
-	u_int16_t       reserved170[6];
-/*176*/ u_int8_t        media_serial[60];
-/*206*/ u_int16_t       sct;
-	u_int16_t       reserved206[2];
-/*209*/ u_int16_t       lsalign;
-/*210*/ u_int16_t       wrv_sectors_m3_1;
-	u_int16_t       wrv_sectors_m3_2;
-/*212*/ u_int16_t       wrv_sectors_m2_1;
-	u_int16_t       wrv_sectors_m2_2;
-/*214*/ u_int16_t       nv_cache_caps;
-/*215*/ u_int16_t       nv_cache_size_1;
-	u_int16_t       nv_cache_size_2;
-/*217*/ u_int16_t       media_rotation_rate;
-#define ATA_RATE_NOT_REPORTED		0x0000
-#define ATA_RATE_NON_ROTATING		0x0001
-	u_int16_t       reserved218;
-/*219*/ u_int16_t       nv_cache_opt;
-/*220*/ u_int16_t       wrv_mode;
-	u_int16_t       reserved221;
-/*222*/ u_int16_t       transport_major;
-/*223*/ u_int16_t       transport_minor;
-	u_int16_t       reserved224[31];
-/*255*/ u_int16_t       integrity;
-} __packed;
-
-/* ATA Dataset Management */
-#define ATA_DSM_BLK_SIZE	512
-#define ATA_DSM_BLK_RANGES	64
-#define ATA_DSM_RANGE_SIZE	8
-#define ATA_DSM_RANGE_MAX	65535
-
-/*
- * ATA Device Register
- *
- * bit 7 Obsolete (was 1 in early ATA specs)
- * bit 6 Sets LBA/CHS mode. 1=LBA, 0=CHS 
- * bit 5 Obsolete (was 1 in early ATA specs)
- * bit 4 1 = Slave Drive, 0 = Master Drive
- * bit 3-0 In LBA mode, 27-24 of address. In CHS mode, head number
-*/
-
-#define ATA_DEV_MASTER		0x00
-#define ATA_DEV_SLAVE		0x10
-#define ATA_DEV_LBA		0x40
-
-/* ATA limits */
-#define ATA_MAX_28BIT_LBA	268435455UL
-
-/* ATA Status Register */
-#define ATA_STATUS_ERROR	0x01
-#define ATA_STATUS_DEVICE_FAULT	0x20
-
-/* ATA Error Register */
-#define ATA_ERROR_ABORT		0x04
-#define ATA_ERROR_ID_NOT_FOUND	0x10
-
-/* ATA HPA Features */
-#define ATA_HPA_FEAT_MAX_ADDR	0x00
-#define ATA_HPA_FEAT_SET_PWD	0x01
-#define ATA_HPA_FEAT_LOCK	0x02
-#define ATA_HPA_FEAT_UNLOCK	0x03
-#define ATA_HPA_FEAT_FREEZE	0x04
-
-/* ATA transfer modes */
-#define ATA_MODE_MASK           0x0f
-#define ATA_DMA_MASK            0xf0
-#define ATA_PIO                 0x00
-#define ATA_PIO0                0x08
-#define ATA_PIO1                0x09
-#define ATA_PIO2                0x0a
-#define ATA_PIO3                0x0b
-#define ATA_PIO4                0x0c
-#define ATA_PIO_MAX             0x0f
-#define ATA_DMA                 0x10
-#define ATA_WDMA0               0x20
-#define ATA_WDMA1               0x21
-#define ATA_WDMA2               0x22
-#define ATA_UDMA0               0x40
-#define ATA_UDMA1               0x41
-#define ATA_UDMA2               0x42
-#define ATA_UDMA3               0x43
-#define ATA_UDMA4               0x44
-#define ATA_UDMA5               0x45
-#define ATA_UDMA6               0x46
-#define ATA_SA150               0x47
-#define ATA_SA300               0x48
-#define ATA_DMA_MAX             0x4f
-
-
-/* ATA commands */
-#define ATA_NOP                         0x00    /* NOP */
-#define         ATA_NF_FLUSHQUEUE       0x00    /* flush queued cmd's */
-#define         ATA_NF_AUTOPOLL         0x01    /* start autopoll function */
-#define ATA_DATA_SET_MANAGEMENT		0x06
-#define 	ATA_DSM_TRIM		0x01
-#define ATA_DEVICE_RESET                0x08    /* reset device */
-#define ATA_READ                        0x20    /* read */
-#define ATA_READ48                      0x24    /* read 48bit LBA */
-#define ATA_READ_DMA48                  0x25    /* read DMA 48bit LBA */
-#define ATA_READ_DMA_QUEUED48           0x26    /* read DMA QUEUED 48bit LBA */
-#define ATA_READ_NATIVE_MAX_ADDRESS48   0x27    /* read native max addr 48bit */
-#define ATA_READ_MUL48                  0x29    /* read multi 48bit LBA */
-#define ATA_READ_STREAM_DMA48           0x2a    /* read DMA stream 48bit LBA */
-#define ATA_READ_LOG_EXT                0x2f    /* read log ext - PIO Data-In */
-#define ATA_READ_STREAM48               0x2b    /* read stream 48bit LBA */
-#define ATA_WRITE                       0x30    /* write */
-#define ATA_WRITE48                     0x34    /* write 48bit LBA */
-#define ATA_WRITE_DMA48                 0x35    /* write DMA 48bit LBA */
-#define ATA_WRITE_DMA_QUEUED48          0x36    /* write DMA QUEUED 48bit LBA*/
-#define ATA_SET_MAX_ADDRESS48           0x37    /* set max address 48bit */
-#define ATA_WRITE_MUL48                 0x39    /* write multi 48bit LBA */
-#define ATA_WRITE_STREAM_DMA48          0x3a
-#define ATA_WRITE_STREAM48              0x3b
-#define ATA_WRITE_DMA_FUA48             0x3d
-#define ATA_WRITE_DMA_QUEUED_FUA48      0x3e
-#define ATA_WRITE_LOG_EXT               0x3f
-#define ATA_READ_VERIFY                 0x40
-#define ATA_READ_VERIFY48               0x42
-#define ATA_READ_LOG_DMA_EXT            0x47    /* read log DMA ext - PIO Data-In */
-#define ATA_READ_FPDMA_QUEUED           0x60    /* read DMA NCQ */
-#define ATA_WRITE_FPDMA_QUEUED          0x61    /* write DMA NCQ */
-#define ATA_NCQ_NON_DATA		0x63	/* NCQ non-data command */
-#define ATA_SEND_FPDMA_QUEUED           0x64    /* send DMA NCQ */
-#define		ATA_SFPDMA_DSM		0x00	/* Data set management */
-#define			ATA_SFPDMA_DSM_TRIM	0x01	/* Set trim bit in auxilary */
-#define		ATA_SFPDMA_HYBRID_EVICT	0x01	/* Hybrid Evict */
-#define		ATA_SFPDMA_WLDMA	0x02	/* Write Log DMA EXT */
-#define ATA_RECV_FPDMA_QUEUED           0x65    /* recieve DMA NCQ */
-#define ATA_SEP_ATTN                    0x67    /* SEP request */
-#define ATA_SEEK                        0x70    /* seek */
-#define ATA_PACKET_CMD                  0xa0    /* packet command */
-#define ATA_ATAPI_IDENTIFY              0xa1    /* get ATAPI params*/
-#define ATA_SERVICE                     0xa2    /* service command */
-#define ATA_SMART_CMD                   0xb0    /* SMART command */
-#define ATA_CFA_ERASE                   0xc0    /* CFA erase */
-#define ATA_READ_MUL                    0xc4    /* read multi */
-#define ATA_WRITE_MUL                   0xc5    /* write multi */
-#define ATA_SET_MULTI                   0xc6    /* set multi size */
-#define ATA_READ_DMA_QUEUED             0xc7    /* read DMA QUEUED */
-#define ATA_READ_DMA                    0xc8    /* read DMA */
-#define ATA_WRITE_DMA                   0xca    /* write DMA */
-#define ATA_WRITE_DMA_QUEUED            0xcc    /* write DMA QUEUED */
-#define ATA_WRITE_MUL_FUA48             0xce
-#define ATA_STANDBY_IMMEDIATE           0xe0    /* standby immediate */
-#define ATA_IDLE_IMMEDIATE              0xe1    /* idle immediate */
-#define ATA_STANDBY_CMD                 0xe2    /* standby */
-#define ATA_IDLE_CMD                    0xe3    /* idle */
-#define ATA_READ_BUFFER                 0xe4    /* read buffer */
-#define ATA_READ_PM                     0xe4    /* read portmultiplier */
-#define ATA_SLEEP                       0xe6    /* sleep */
-#define ATA_FLUSHCACHE                  0xe7    /* flush cache to disk */
-#define ATA_WRITE_PM                    0xe8    /* write portmultiplier */
-#define ATA_FLUSHCACHE48                0xea    /* flush cache to disk */
-#define ATA_ATA_IDENTIFY                0xec    /* get ATA params */
-#define ATA_SETFEATURES                 0xef    /* features command */
-#define         ATA_SF_SETXFER          0x03    /* set transfer mode */
-#define         ATA_SF_ENAB_WCACHE      0x02    /* enable write cache */
-#define         ATA_SF_DIS_WCACHE       0x82    /* disable write cache */
-#define         ATA_SF_ENAB_PUIS        0x06    /* enable PUIS */
-#define         ATA_SF_DIS_PUIS         0x86    /* disable PUIS */
-#define         ATA_SF_PUIS_SPINUP      0x07    /* PUIS spin-up */
-#define         ATA_SF_ENAB_RCACHE      0xaa    /* enable readahead cache */
-#define         ATA_SF_DIS_RCACHE       0x55    /* disable readahead cache */
-#define         ATA_SF_ENAB_RELIRQ      0x5d    /* enable release interrupt */
-#define         ATA_SF_DIS_RELIRQ       0xdd    /* disable release interrupt */
-#define         ATA_SF_ENAB_SRVIRQ      0x5e    /* enable service interrupt */
-#define         ATA_SF_DIS_SRVIRQ       0xde    /* disable service interrupt */
-#define ATA_SECURITY_SET_PASSWORD       0xf1    /* set drive password */
-#define ATA_SECURITY_UNLOCK             0xf2    /* unlock drive using passwd */
-#define ATA_SECURITY_ERASE_PREPARE      0xf3    /* prepare to erase drive */
-#define ATA_SECURITY_ERASE_UNIT         0xf4    /* erase all blocks on drive */
-#define ATA_SECURITY_FREEZE_LOCK        0xf5    /* freeze security config */
-#define ATA_SECURITY_DISABLE_PASSWORD   0xf6    /* disable drive password */
-#define ATA_READ_NATIVE_MAX_ADDRESS     0xf8    /* read native max address */
-#define ATA_SET_MAX_ADDRESS             0xf9    /* set max address */
-
-
-/* ATAPI commands */
-#define ATAPI_TEST_UNIT_READY           0x00    /* check if device is ready */
-#define ATAPI_REZERO                    0x01    /* rewind */
-#define ATAPI_REQUEST_SENSE             0x03    /* get sense data */
-#define ATAPI_FORMAT                    0x04    /* format unit */
-#define ATAPI_READ                      0x08    /* read data */
-#define ATAPI_WRITE                     0x0a    /* write data */
-#define ATAPI_WEOF                      0x10    /* write filemark */
-#define         ATAPI_WF_WRITE          0x01
-#define ATAPI_SPACE                     0x11    /* space command */
-#define         ATAPI_SP_FM             0x01
-#define         ATAPI_SP_EOD            0x03
-#define ATAPI_INQUIRY			0x12	/* get inquiry data */
-#define ATAPI_MODE_SELECT               0x15    /* mode select */
-#define ATAPI_ERASE                     0x19    /* erase */
-#define ATAPI_MODE_SENSE                0x1a    /* mode sense */
-#define ATAPI_START_STOP                0x1b    /* start/stop unit */
-#define         ATAPI_SS_LOAD           0x01
-#define         ATAPI_SS_RETENSION      0x02
-#define         ATAPI_SS_EJECT          0x04
-#define ATAPI_PREVENT_ALLOW             0x1e    /* media removal */
-#define ATAPI_READ_FORMAT_CAPACITIES    0x23    /* get format capacities */
-#define ATAPI_READ_CAPACITY             0x25    /* get volume capacity */
-#define ATAPI_READ_BIG                  0x28    /* read data */
-#define ATAPI_WRITE_BIG                 0x2a    /* write data */
-#define ATAPI_LOCATE                    0x2b    /* locate to position */
-#define ATAPI_READ_POSITION             0x34    /* read position */
-#define ATAPI_SYNCHRONIZE_CACHE         0x35    /* flush buf, close channel */
-#define ATAPI_WRITE_BUFFER              0x3b    /* write device buffer */
-#define ATAPI_READ_BUFFER               0x3c    /* read device buffer */
-#define ATAPI_READ_SUBCHANNEL           0x42    /* get subchannel info */
-#define ATAPI_READ_TOC                  0x43    /* get table of contents */
-#define ATAPI_PLAY_10                   0x45    /* play by lba */
-#define ATAPI_PLAY_MSF                  0x47    /* play by MSF address */
-#define ATAPI_PLAY_TRACK                0x48    /* play by track number */
-#define ATAPI_PAUSE                     0x4b    /* pause audio operation */
-#define ATAPI_READ_DISK_INFO            0x51    /* get disk info structure */
-#define ATAPI_READ_TRACK_INFO           0x52    /* get track info structure */
-#define ATAPI_RESERVE_TRACK             0x53    /* reserve track */
-#define ATAPI_SEND_OPC_INFO             0x54    /* send OPC structurek */
-#define ATAPI_MODE_SELECT_BIG           0x55    /* set device parameters */
-#define ATAPI_REPAIR_TRACK              0x58    /* repair track */
-#define ATAPI_READ_MASTER_CUE           0x59    /* read master CUE info */
-#define ATAPI_MODE_SENSE_BIG            0x5a    /* get device parameters */
-#define ATAPI_CLOSE_TRACK               0x5b    /* close track/session */
-#define ATAPI_READ_BUFFER_CAPACITY      0x5c    /* get buffer capicity */
-#define ATAPI_SEND_CUE_SHEET            0x5d    /* send CUE sheet */
-#define ATAPI_SERVICE_ACTION_IN         0x96	/* get service data */
-#define ATAPI_BLANK                     0xa1    /* blank the media */
-#define ATAPI_SEND_KEY                  0xa3    /* send DVD key structure */
-#define ATAPI_REPORT_KEY                0xa4    /* get DVD key structure */
-#define ATAPI_PLAY_12                   0xa5    /* play by lba */
-#define ATAPI_LOAD_UNLOAD               0xa6    /* changer control command */
-#define ATAPI_READ_STRUCTURE            0xad    /* get DVD structure */
-#define ATAPI_PLAY_CD                   0xb4    /* universal play command */
-#define ATAPI_SET_SPEED                 0xbb    /* set drive speed */
-#define ATAPI_MECH_STATUS               0xbd    /* get changer status */
-#define ATAPI_READ_CD                   0xbe    /* read data */
-#define ATAPI_POLL_DSC                  0xff    /* poll DSC status bit */
-
-
-struct ata_ioc_devices {
-    int                 channel;
-    char                name[2][32];
-    struct ata_params   params[2];
-};
-
-/* pr channel ATA ioctl calls */
-#define IOCATAGMAXCHANNEL       _IOR('a',  1, int)
-#define IOCATAREINIT            _IOW('a',  2, int)
-#define IOCATAATTACH            _IOW('a',  3, int)
-#define IOCATADETACH            _IOW('a',  4, int)
-#define IOCATADEVICES           _IOWR('a',  5, struct ata_ioc_devices)
-
-/* ATAPI request sense structure */
-struct atapi_sense {
-    u_int8_t	error;				/* current or deferred errors */
-#define	ATA_SENSE_VALID			0x80
-
-    u_int8_t	segment;			/* segment number */
-    u_int8_t	key;				/* sense key */
-#define ATA_SENSE_KEY_MASK		0x0f    /* sense key mask */
-#define ATA_SENSE_NO_SENSE		0x00    /* no specific sense key info */
-#define ATA_SENSE_RECOVERED_ERROR 	0x01    /* command OK, data recovered */
-#define ATA_SENSE_NOT_READY		0x02    /* no access to drive */
-#define ATA_SENSE_MEDIUM_ERROR		0x03    /* non-recovered data error */
-#define ATA_SENSE_HARDWARE_ERROR	0x04    /* non-recoverable HW failure */
-#define ATA_SENSE_ILLEGAL_REQUEST	0x05    /* invalid command param(s) */
-#define ATA_SENSE_UNIT_ATTENTION	0x06    /* media changed */
-#define ATA_SENSE_DATA_PROTECT		0x07    /* write protect */
-#define ATA_SENSE_BLANK_CHECK		0x08    /* blank check */
-#define ATA_SENSE_VENDOR_SPECIFIC	0x09    /* vendor specific skey */
-#define ATA_SENSE_COPY_ABORTED		0x0a    /* copy aborted */
-#define ATA_SENSE_ABORTED_COMMAND	0x0b    /* command aborted, try again */
-#define ATA_SENSE_EQUAL			0x0c    /* equal */
-#define ATA_SENSE_VOLUME_OVERFLOW	0x0d    /* volume overflow */
-#define ATA_SENSE_MISCOMPARE		0x0e    /* data dont match the medium */
-#define ATA_SENSE_RESERVED		0x0f
-#define	ATA_SENSE_ILI			0x20;
-#define	ATA_SENSE_EOM			0x40;
-#define	ATA_SENSE_FILEMARK		0x80;
-
-    uint32_t   cmd_info;		/* cmd information */
-    u_int8_t	sense_length;		/* additional sense len (n-7) */
-    uint32_t   cmd_specific_info;	/* additional cmd spec info */
-    u_int8_t    asc;			/* additional sense code */
-    u_int8_t    ascq;			/* additional sense code qual */
-    u_int8_t    replaceable_unit_code;	/* replaceable unit code */
-    u_int8_t	specific;		/* sense key specific */
-#define	ATA_SENSE_SPEC_VALID	0x80
-#define	ATA_SENSE_SPEC_MASK	0x7f
-	
-    u_int8_t	specific1;		/* sense key specific */
-    u_int8_t	specific2;		/* sense key specific */
-} __packed;
-
-struct ata_ioc_request {
-    union {
-	struct {
-	    u_int8_t            command;
-	    u_int8_t            feature;
-	    u_int64_t           lba;
-	    u_int16_t           count;
-	} ata;
-	struct {
-	    char                ccb[16];
-	    struct atapi_sense	sense;
-	} atapi;
-    } u;
-    caddr_t             data;
-    int                 count;
-    int                 flags;
-#define ATA_CMD_CONTROL                 0x01
-#define ATA_CMD_READ                    0x02
-#define ATA_CMD_WRITE                   0x04
-#define ATA_CMD_ATAPI                   0x08
-
-    int                 timeout;
-    int                 error;
-};
-
-struct ata_security_password {
-	u_int16_t		ctrl;
-#define ATA_SECURITY_PASSWORD_USER	0x0000
-#define ATA_SECURITY_PASSWORD_MASTER	0x0001
-#define ATA_SECURITY_ERASE_NORMAL	0x0000
-#define ATA_SECURITY_ERASE_ENHANCED	0x0002
-#define ATA_SECURITY_LEVEL_HIGH		0x0000
-#define ATA_SECURITY_LEVEL_MAXIMUM	0x0100
-
-	u_int8_t		password[32];
-	u_int16_t		revision;
-	u_int16_t		reserved[238];
-};
-
-/* pr device ATA ioctl calls */
-#define IOCATAREQUEST           _IOWR('a', 100, struct ata_ioc_request)
-#define IOCATAGPARM             _IOR('a', 101, struct ata_params)
-#define IOCATAGMODE             _IOR('a', 102, int)
-#define IOCATASMODE             _IOW('a', 103, int)
-
-#define IOCATAGSPINDOWN		_IOR('a', 104, int)
-#define IOCATASSPINDOWN		_IOW('a', 105, int)
-
-
-struct ata_ioc_raid_config {
-	    int                 lun;
-	    int                 type;
-#define AR_JBOD                         0x0001
-#define AR_SPAN                         0x0002
-#define AR_RAID0                        0x0004
-#define AR_RAID1                        0x0008
-#define AR_RAID01                       0x0010
-#define AR_RAID3                        0x0020
-#define AR_RAID4                        0x0040
-#define AR_RAID5                        0x0080
-
-	    int                 interleave;
-	    int                 status;
-#define AR_READY                        1
-#define AR_DEGRADED                     2
-#define AR_REBUILDING                   4
-
-	    int                 progress;
-	    int                 total_disks;
-	    int                 disks[16];
-};
-
-struct ata_ioc_raid_status {
-	    int                 lun;
-	    int                 type;
-	    int                 interleave;
-	    int                 status;
-	    int                 progress;
-	    int                 total_disks;
-	    struct {
-		    int		state;
-#define AR_DISK_ONLINE			0x01
-#define AR_DISK_PRESENT			0x02
-#define AR_DISK_SPARE			0x04
-		    int		lun;
-	    } disks[16];
-};
-
-/* ATA RAID ioctl calls */
-#define IOCATARAIDCREATE        _IOWR('a', 200, struct ata_ioc_raid_config)
-#define IOCATARAIDDELETE        _IOW('a', 201, int)
-#define IOCATARAIDSTATUS        _IOWR('a', 202, struct ata_ioc_raid_status)
-#define IOCATARAIDADDSPARE      _IOW('a', 203, struct ata_ioc_raid_config)
-#define IOCATARAIDREBUILD       _IOW('a', 204, int)
-
-#endif /* _SYS_ATA_H_ */
diff --git a/include.new/sys/bio.h b/include.new/sys/bio.h
deleted file mode 100644
index be2be02..0000000
--- a/include.new/sys/bio.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/sys/bio.h 248654 2013-03-23 16:55:07Z will $
- */
-
-#ifndef _SYS_BIO_H_
-#define	_SYS_BIO_H_
-
-#include <sys/queue.h>
-
-/* bio_cmd */
-#define BIO_READ	0x01	/* Read I/O data */
-#define BIO_WRITE	0x02	/* Write I/O data */
-#define BIO_DELETE	0x04	/* TRIM or free blocks, i.e. mark as unused */
-#define BIO_GETATTR	0x08	/* Get GEOM attributes of object */
-#define BIO_FLUSH	0x10	/* Commit outstanding I/O now */
-#define BIO_CMD0	0x20	/* Available for local hacks */
-#define BIO_CMD1	0x40	/* Available for local hacks */
-#define BIO_CMD2	0x80	/* Available for local hacks */
-
-/* bio_flags */
-#define BIO_ERROR	0x01	/* An error occurred processing this bio. */
-#define BIO_DONE	0x02	/* This bio is finished. */
-#define BIO_ONQUEUE	0x04	/* This bio is in a queue & not yet taken. */
-/*
- * This bio must be executed after all previous bios in the queue have been
- * executed, and before any successive bios can be executed.
- */
-#define BIO_ORDERED	0x08
-#define	BIO_UNMAPPED	0x10
-#define	BIO_TRANSIENT_MAPPING	0x20
-
-#ifdef _KERNEL
-struct disk;
-struct bio;
-struct vm_map;
-
-/* Empty classifier tag, to prevent further classification. */
-#define	BIO_NOTCLASSIFIED		(void *)(~0UL)
-
-typedef void bio_task_t(void *);
-
-/*
- * The bio structure describes an I/O operation in the kernel.
- */
-struct bio {
-	uint8_t	bio_cmd;		/* I/O operation. */
-	uint8_t	bio_flags;		/* General flags. */
-	uint8_t	bio_cflags;		/* Private use by the consumer. */
-	uint8_t	bio_pflags;		/* Private use by the provider. */
-	struct cdev *bio_dev;		/* Device to do I/O on. */
-	struct disk *bio_disk;		/* Valid below geom_disk.c only */
-	off_t	bio_offset;		/* Offset into file. */
-	long	bio_bcount;		/* Valid bytes in buffer. */
-	caddr_t	bio_data;		/* Memory, superblocks, indirect etc. */
-	struct vm_page **bio_ma;	/* Or unmapped. */
-	int	bio_ma_offset;		/* Offset in the first page of bio_ma. */
-	int	bio_ma_n;		/* Number of pages in bio_ma. */
-	int	bio_error;		/* Errno for BIO_ERROR. */
-	long	bio_resid;		/* Remaining I/O in bytes. */
-	void	(*bio_done)(struct bio *);
-	void	*bio_driver1;		/* Private use by the provider. */
-	void	*bio_driver2;		/* Private use by the provider. */
-	void	*bio_caller1;		/* Private use by the consumer. */
-	void	*bio_caller2;		/* Private use by the consumer. */
-	TAILQ_ENTRY(bio) bio_queue;	/* Disksort queue. */
-	const char *bio_attribute;	/* Attribute for BIO_[GS]ETATTR */
-	struct g_consumer *bio_from;	/* GEOM linkage */
-	struct g_provider *bio_to;	/* GEOM linkage */
-	off_t	bio_length;		/* Like bio_bcount */
-	off_t	bio_completed;		/* Inverse of bio_resid */
-	u_int	bio_children;		/* Number of spawned bios */
-	u_int	bio_inbed;		/* Children safely home by now */
-	struct bio *bio_parent;		/* Pointer to parent */
-	struct bintime bio_t0;		/* Time request started */
-
-	bio_task_t *bio_task;		/* Task_queue handler */
-	void	*bio_task_arg;		/* Argument to above */
-
-	void	*bio_classifier1;	/* Classifier tag. */
-	void	*bio_classifier2;	/* Classifier tag. */
-
-#ifdef DIAGNOSTIC
-	void	*_bio_caller1;
-	void	*_bio_caller2;
-	uint8_t	_bio_cflags;
-#endif
-
-	/* XXX: these go away when bio chaining is introduced */
-	daddr_t bio_pblkno;               /* physical block number */
-};
-
-struct uio;
-struct devstat;
-
-struct bio_queue_head {
-	TAILQ_HEAD(bio_queue, bio) queue;
-	off_t last_offset;
-	struct	bio *insert_point;
-};
-
-extern struct vm_map *bio_transient_map;
-extern int bio_transient_maxcnt;
-
-void biodone(struct bio *bp);
-void biofinish(struct bio *bp, struct devstat *stat, int error);
-int biowait(struct bio *bp, const char *wchan);
-
-void bioq_disksort(struct bio_queue_head *ap, struct bio *bp);
-struct bio *bioq_first(struct bio_queue_head *head);
-struct bio *bioq_takefirst(struct bio_queue_head *head);
-void bioq_flush(struct bio_queue_head *head, struct devstat *stp, int error);
-void bioq_init(struct bio_queue_head *head);
-void bioq_insert_head(struct bio_queue_head *head, struct bio *bp);
-void bioq_insert_tail(struct bio_queue_head *head, struct bio *bp);
-void bioq_remove(struct bio_queue_head *head, struct bio *bp);
-
-void bio_taskqueue(struct bio *bp, bio_task_t *fund, void *arg);
-
-int	physio(struct cdev *dev, struct uio *uio, int ioflag);
-#define physread physio
-#define physwrite physio
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_BIO_H_ */
diff --git a/include.new/sys/bitset.h b/include.new/sys/bitset.h
deleted file mode 100644
index a26db6e..0000000
--- a/include.new/sys/bitset.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*-
- * Copyright (c) 2008, Jeffrey Roberson <jeff@freebsd.org>
- * All rights reserved.
- *
- * Copyright (c) 2008 Nokia Corporation
- * 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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/bitset.h 281538 2015-04-14 20:05:26Z jhb $
- */
-
-#ifndef _SYS_BITSET_H_
-#define	_SYS_BITSET_H_
-
-#define	BIT_CLR(_s, n, p)						\
-	((p)->__bits[__bitset_word(_s, n)] &= ~__bitset_mask((_s), (n)))
-
-#define	BIT_COPY(_s, f, t)	(void)(*(t) = *(f))
-
-#define	BIT_ISSET(_s, n, p)						\
-	((((p)->__bits[__bitset_word(_s, n)] & __bitset_mask((_s), (n))) != 0))
-
-#define	BIT_SET(_s, n, p)						\
-	((p)->__bits[__bitset_word(_s, n)] |= __bitset_mask((_s), (n)))
-
-#define	BIT_ZERO(_s, p) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(p)->__bits[__i] = 0L;					\
-} while (0)
-
-#define	BIT_FILL(_s, p) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(p)->__bits[__i] = -1L;					\
-} while (0)
-
-#define	BIT_SETOF(_s, n, p) do {					\
-	BIT_ZERO(_s, p);						\
-	(p)->__bits[__bitset_word(_s, n)] = __bitset_mask((_s), (n));	\
-} while (0)
-
-/* Is p empty. */
-#define	BIT_EMPTY(_s, p) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if ((p)->__bits[__i])					\
-			break;						\
-	__i == __bitset_words((_s));					\
-})
-
-/* Is p full set. */
-#define	BIT_ISFULLSET(_s, p) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if ((p)->__bits[__i] != (long)-1)			\
-			break;						\
-	__i == __bitset_words((_s));					\
-})
-
-/* Is c a subset of p. */
-#define	BIT_SUBSET(_s, p, c) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if (((c)->__bits[__i] &					\
-		    (p)->__bits[__i]) !=				\
-		    (c)->__bits[__i])					\
-			break;						\
-	__i == __bitset_words((_s));					\
-})
-
-/* Are there any common bits between b & c? */
-#define	BIT_OVERLAP(_s, p, c) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if (((c)->__bits[__i] &					\
-		    (p)->__bits[__i]) != 0)				\
-			break;						\
-	__i != __bitset_words((_s));					\
-})
-
-/* Compare two sets, returns 0 if equal 1 otherwise. */
-#define	BIT_CMP(_s, p, c) __extension__ ({				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		if (((c)->__bits[__i] !=				\
-		    (p)->__bits[__i]))					\
-			break;						\
-	__i != __bitset_words((_s));					\
-})
-
-#define	BIT_OR(_s, d, s) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(d)->__bits[__i] |= (s)->__bits[__i];			\
-} while (0)
-
-#define	BIT_AND(_s, d, s) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(d)->__bits[__i] &= (s)->__bits[__i];			\
-} while (0)
-
-#define	BIT_NAND(_s, d, s) do {						\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		(d)->__bits[__i] &= ~(s)->__bits[__i];			\
-} while (0)
-
-#define	BIT_CLR_ATOMIC(_s, n, p)					\
-	atomic_clear_long(&(p)->__bits[__bitset_word(_s, n)],		\
-	    __bitset_mask((_s), n))
-
-#define	BIT_SET_ATOMIC(_s, n, p)					\
-	atomic_set_long(&(p)->__bits[__bitset_word(_s, n)],		\
-	    __bitset_mask((_s), n))
-
-#define	BIT_SET_ATOMIC_ACQ(_s, n, p)					\
-	atomic_set_acq_long(&(p)->__bits[__bitset_word(_s, n)],		\
-	    __bitset_mask((_s), n))
-
-/* Convenience functions catering special cases. */
-#define	BIT_AND_ATOMIC(_s, d, s) do {					\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		atomic_clear_long(&(d)->__bits[__i],			\
-		    ~(s)->__bits[__i]);					\
-} while (0)
-
-#define	BIT_OR_ATOMIC(_s, d, s) do {					\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		atomic_set_long(&(d)->__bits[__i],			\
-		    (s)->__bits[__i]);					\
-} while (0)
-
-#define	BIT_COPY_STORE_REL(_s, f, t) do {				\
-	__size_t __i;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		atomic_store_rel_long(&(t)->__bits[__i],		\
-		    (f)->__bits[__i]);					\
-} while (0)
-
-#define	BIT_FFS(_s, p) __extension__ ({					\
-	__size_t __i;							\
-	int __bit;							\
-									\
-	__bit = 0;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++) {		\
-		if ((p)->__bits[__i] != 0) {				\
-			__bit = ffsl((p)->__bits[__i]);			\
-			__bit += __i * _BITSET_BITS;			\
-			break;						\
-		}							\
-	}								\
-	__bit;								\
-})
-
-#define	BIT_COUNT(_s, p) __extension__ ({				\
-	__size_t __i;							\
-	int __count;							\
-									\
-	__count = 0;							\
-	for (__i = 0; __i < __bitset_words((_s)); __i++)		\
-		__count += __bitcountl((p)->__bits[__i]);		\
-	__count;							\
-})
-	
-#endif /* !_SYS_BITSET_H_ */
diff --git a/include.new/sys/bitstring.h b/include.new/sys/bitstring.h
deleted file mode 100644
index 6966d5b..0000000
--- a/include.new/sys/bitstring.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Vixie.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/sys/bitstring.h 139825 2005-01-07 02:29:27Z imp $
- */
-
-#ifndef _SYS_BITSTRING_H_
-#define	_SYS_BITSTRING_H_
-
-typedef	unsigned char bitstr_t;
-
-/* internal macros */
-				/* byte of the bitstring bit is in */
-#define	_bit_byte(bit) \
-	((bit) >> 3)
-
-				/* mask for the bit within its byte */
-#define	_bit_mask(bit) \
-	(1 << ((bit)&0x7))
-
-/* external macros */
-				/* bytes in a bitstring of nbits bits */
-#define	bitstr_size(nbits) \
-	(((nbits) + 7) >> 3)
-
-				/* allocate a bitstring */
-#define	bit_alloc(nbits) \
-	(bitstr_t *)calloc((size_t)bitstr_size(nbits), sizeof(bitstr_t))
-
-				/* allocate a bitstring on the stack */
-#define	bit_decl(name, nbits) \
-	((name)[bitstr_size(nbits)])
-
-				/* is bit N of bitstring name set? */
-#define	bit_test(name, bit) \
-	((name)[_bit_byte(bit)] & _bit_mask(bit))
-
-				/* set bit N of bitstring name */
-#define	bit_set(name, bit) \
-	((name)[_bit_byte(bit)] |= _bit_mask(bit))
-
-				/* clear bit N of bitstring name */
-#define	bit_clear(name, bit) \
-	((name)[_bit_byte(bit)] &= ~_bit_mask(bit))
-
-				/* clear bits start ... stop in bitstring */
-#define	bit_nclear(name, start, stop) do { \
-	register bitstr_t *_name = (name); \
-	register int _start = (start), _stop = (stop); \
-	register int _startbyte = _bit_byte(_start); \
-	register int _stopbyte = _bit_byte(_stop); \
-	if (_startbyte == _stopbyte) { \
-		_name[_startbyte] &= ((0xff >> (8 - (_start&0x7))) | \
-				      (0xff << ((_stop&0x7) + 1))); \
-	} else { \
-		_name[_startbyte] &= 0xff >> (8 - (_start&0x7)); \
-		while (++_startbyte < _stopbyte) \
-			_name[_startbyte] = 0; \
-		_name[_stopbyte] &= 0xff << ((_stop&0x7) + 1); \
-	} \
-} while (0)
-
-				/* set bits start ... stop in bitstring */
-#define	bit_nset(name, start, stop) do { \
-	register bitstr_t *_name = (name); \
-	register int _start = (start), _stop = (stop); \
-	register int _startbyte = _bit_byte(_start); \
-	register int _stopbyte = _bit_byte(_stop); \
-	if (_startbyte == _stopbyte) { \
-		_name[_startbyte] |= ((0xff << (_start&0x7)) & \
-				    (0xff >> (7 - (_stop&0x7)))); \
-	} else { \
-		_name[_startbyte] |= 0xff << ((_start)&0x7); \
-		while (++_startbyte < _stopbyte) \
-	    		_name[_startbyte] = 0xff; \
-		_name[_stopbyte] |= 0xff >> (7 - (_stop&0x7)); \
-	} \
-} while (0)
-
-				/* find first bit clear in name */
-#define	bit_ffc(name, nbits, value) do { \
-	register bitstr_t *_name = (name); \
-	register int _byte, _nbits = (nbits); \
-	register int _stopbyte = _bit_byte(_nbits - 1), _value = -1; \
-	if (_nbits > 0) \
-		for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-			if (_name[_byte] != 0xff) { \
-				bitstr_t _lb; \
-				_value = _byte << 3; \
-				for (_lb = _name[_byte]; (_lb&0x1); \
-				    ++_value, _lb >>= 1); \
-				break; \
-			} \
-	if (_value >= nbits) \
-		_value = -1; \
-	*(value) = _value; \
-} while (0)
-
-				/* find first bit set in name */
-#define	bit_ffs(name, nbits, value) do { \
-	register bitstr_t *_name = (name); \
-	register int _byte, _nbits = (nbits); \
-	register int _stopbyte = _bit_byte(_nbits - 1), _value = -1; \
-	if (_nbits > 0) \
-		for (_byte = 0; _byte <= _stopbyte; ++_byte) \
-			if (_name[_byte]) { \
-				bitstr_t _lb; \
-				_value = _byte << 3; \
-				for (_lb = _name[_byte]; !(_lb&0x1); \
-				    ++_value, _lb >>= 1); \
-				break; \
-			} \
-	if (_value >= nbits) \
-		_value = -1; \
-	*(value) = _value; \
-} while (0)
-
-#endif /* !_SYS_BITSTRING_H_ */
diff --git a/include.new/sys/blist.h b/include.new/sys/blist.h
deleted file mode 100644
index bd5413b..0000000
--- a/include.new/sys/blist.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 1998 Matthew Dillon.  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.
- * 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 AUTHOR ``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 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.
- */
-
-/*
- * Implements bitmap resource lists.
- *
- *	Usage:
- *		blist = blist_create(blocks, flags)
- *		(void)  blist_destroy(blist)
- *		blkno = blist_alloc(blist, count)
- *		(void)  blist_free(blist, blkno, count)
- *		nblks = blist_fill(blist, blkno, count)
- *		(void)  blist_resize(&blist, count, freeextra, flags)
- *		
- *
- *	Notes:
- *		on creation, the entire list is marked reserved.  You should
- *		first blist_free() the sections you want to make available
- *		for allocation before doing general blist_alloc()/free()
- *		ops.
- *
- *		SWAPBLK_NONE is returned on failure.  This module is typically
- *		capable of managing up to (2^31) blocks per blist, though
- *		the memory utilization would be insane if you actually did
- *		that.  Managing something like 512MB worth of 4K blocks 
- *		eats around 32 KBytes of memory. 
- *
- * $FreeBSD: releng/10.2/sys/sys/blist.h 178792 2008-05-05 19:48:54Z kmacy $
-
- */
-
-#ifndef _SYS_BLIST_H_
-#define _SYS_BLIST_H_
-
-typedef	uint32_t	u_daddr_t;	/* unsigned disk address */
-
-/*
- * note: currently use SWAPBLK_NONE as an absolute value rather then 
- * a flag bit.
- */
-
-#define SWAPBLK_MASK	((daddr_t)((u_daddr_t)-1 >> 1))		/* mask */
-#define SWAPBLK_NONE	((daddr_t)((u_daddr_t)SWAPBLK_MASK + 1))/* flag */
-
-/*
- * blmeta and bl_bitmap_t MUST be a power of 2 in size.
- */
-
-typedef struct blmeta {
-	union {
-	    daddr_t	bmu_avail;	/* space available under us	*/
-	    u_daddr_t	bmu_bitmap;	/* bitmap if we are a leaf	*/
-	} u;
-	daddr_t		bm_bighint;	/* biggest contiguous block hint*/
-} blmeta_t;
-
-typedef struct blist {
-	daddr_t		bl_blocks;	/* area of coverage		*/
-	daddr_t		bl_radix;	/* coverage radix		*/
-	daddr_t		bl_skip;	/* starting skip		*/
-	daddr_t		bl_free;	/* number of free blocks	*/
-	blmeta_t	*bl_root;	/* root of radix tree		*/
-	daddr_t		bl_rootblks;	/* daddr_t blks allocated for tree */
-} *blist_t;
-
-#define BLIST_META_RADIX	16
-#define BLIST_BMAP_RADIX	(sizeof(u_daddr_t)*8)
-
-#define BLIST_MAX_ALLOC		BLIST_BMAP_RADIX
-
-extern blist_t blist_create(daddr_t blocks, int flags);
-extern void blist_destroy(blist_t blist);
-extern daddr_t blist_alloc(blist_t blist, daddr_t count);
-extern void blist_free(blist_t blist, daddr_t blkno, daddr_t count);
-extern int blist_fill(blist_t bl, daddr_t blkno, daddr_t count);
-extern void blist_print(blist_t blist);
-extern void blist_resize(blist_t *pblist, daddr_t count, int freenew, int flags);
-
-#endif	/* _SYS_BLIST_H_ */
-
diff --git a/include.new/sys/boot.h b/include.new/sys/boot.h
deleted file mode 100644
index d8149cb..0000000
--- a/include.new/sys/boot.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2014 Roger Pau Monné <roger.pau@citrix.com>
- * 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.
- *
- * 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: releng/10.2/sys/sys/boot.h 271132 2014-09-04 20:47:14Z emaste $
- */
-
-#ifndef _SYS_BOOT_H_
-#define _SYS_BOOT_H_
-
-/*
- * Return a 'boothowto' value corresponding to the kernel arguments in
- * (kargs) and any relevant environment variables.
- */
-static struct
-{
-	const char	*ev;
-	int		mask;
-} howto_names[] = {
-	{ "boot_askname",	RB_ASKNAME},
-	{ "boot_cdrom",		RB_CDROM},
-	{ "boot_ddb",		RB_KDB},
-	{ "boot_dfltroot",	RB_DFLTROOT},
-	{ "boot_gdb",		RB_GDB},
-	{ "boot_multicons",	RB_MULTIPLE},
-	{ "boot_mute",		RB_MUTE},
-	{ "boot_pause",		RB_PAUSE},
-	{ "boot_serial",	RB_SERIAL},
-	{ "boot_single",	RB_SINGLE},
-	{ "boot_verbose",	RB_VERBOSE},
-	{ NULL,	0}
-};
-
-#endif /* !_SYS_BOOT_H_ */
diff --git a/include.new/sys/buf.h b/include.new/sys/buf.h
deleted file mode 100644
index 0005975..0000000
--- a/include.new/sys/buf.h
+++ /dev/null
@@ -1,546 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)buf.h	8.9 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/sys/buf.h 285402 2015-07-11 19:11:40Z kib $
- */
-
-#ifndef _SYS_BUF_H_
-#define	_SYS_BUF_H_
-
-#include <sys/bufobj.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/lockmgr.h>
-
-struct bio;
-struct buf;
-struct bufobj;
-struct mount;
-struct vnode;
-struct uio;
-
-/*
- * To avoid including <ufs/ffs/softdep.h> 
- */   
-LIST_HEAD(workhead, worklist);
-/*
- * These are currently used only by the soft dependency code, hence
- * are stored once in a global variable. If other subsystems wanted
- * to use these hooks, a pointer to a set of bio_ops could be added
- * to each buffer.
- */
-extern struct bio_ops {
-	void	(*io_start)(struct buf *);
-	void	(*io_complete)(struct buf *);
-	void	(*io_deallocate)(struct buf *);
-	int	(*io_countdeps)(struct buf *, int);
-} bioops;
-
-struct vm_object;
-
-typedef unsigned char b_xflags_t;
-
-/*
- * The buffer header describes an I/O operation in the kernel.
- *
- * NOTES:
- *	b_bufsize, b_bcount.  b_bufsize is the allocation size of the
- *	buffer, either DEV_BSIZE or PAGE_SIZE aligned.  b_bcount is the
- *	originally requested buffer size and can serve as a bounds check
- *	against EOF.  For most, but not all uses, b_bcount == b_bufsize.
- *
- *	b_dirtyoff, b_dirtyend.  Buffers support piecemeal, unaligned
- *	ranges of dirty data that need to be written to backing store.
- *	The range is typically clipped at b_bcount ( not b_bufsize ).
- *
- *	b_resid.  Number of bytes remaining in I/O.  After an I/O operation
- *	completes, b_resid is usually 0 indicating 100% success.
- *
- *	All fields are protected by the buffer lock except those marked:
- *		V - Protected by owning bufobj lock
- *		Q - Protected by the buf queue lock
- *		D - Protected by an dependency implementation specific lock
- */
-struct buf {
-	struct bufobj	*b_bufobj;
-	long		b_bcount;
-	void		*b_caller1;
-	caddr_t		b_data;
-	int		b_error;
-	uint8_t		b_iocmd;
-	uint8_t		b_ioflags;
-	off_t		b_iooffset;
-	long		b_resid;
-	void	(*b_iodone)(struct buf *);
-	daddr_t b_blkno;		/* Underlying physical block number. */
-	off_t	b_offset;		/* Offset into file. */
-	TAILQ_ENTRY(buf) b_bobufs;	/* (V) Buffer's associated vnode. */
-	uint32_t	b_vflags;	/* (V) BV_* flags */
-	TAILQ_ENTRY(buf) b_freelist;	/* (Q) Free list position inactive. */
-	unsigned short b_qindex;	/* (Q) buffer queue index */
-	uint32_t	b_flags;	/* B_* flags. */
-	b_xflags_t b_xflags;		/* extra flags */
-	struct lock b_lock;		/* Buffer lock */
-	long	b_bufsize;		/* Allocated buffer size. */
-	long	b_runningbufspace;	/* when I/O is running, pipelining */
-	caddr_t	b_kvabase;		/* base kva for buffer */
-	caddr_t	b_kvaalloc;		/* allocated kva for B_KVAALLOC */
-	int	b_kvasize;		/* size of kva for buffer */
-	daddr_t b_lblkno;		/* Logical block number. */
-	struct	vnode *b_vp;		/* Device vnode. */
-	int	b_dirtyoff;		/* Offset in buffer of dirty region. */
-	int	b_dirtyend;		/* Offset of end of dirty region. */
-	struct	ucred *b_rcred;		/* Read credentials reference. */
-	struct	ucred *b_wcred;		/* Write credentials reference. */
-	void	*b_saveaddr;		/* Original b_addr for physio. */
-	union	pager_info {
-		int	pg_reqpage;
-	} b_pager;
-	union	cluster_info {
-		TAILQ_HEAD(cluster_list_head, buf) cluster_head;
-		TAILQ_ENTRY(buf) cluster_entry;
-	} b_cluster;
-	struct	vm_page *b_pages[btoc(MAXPHYS)];
-	int		b_npages;
-	struct	workhead b_dep;		/* (D) List of filesystem dependencies. */
-	void	*b_fsprivate1;
-	void	*b_fsprivate2;
-	void	*b_fsprivate3;
-	int	b_pin_count;
-};
-
-#define b_object	b_bufobj->bo_object
-
-/*
- * These flags are kept in b_flags.
- *
- * Notes:
- *
- *	B_ASYNC		VOP calls on bp's are usually async whether or not
- *			B_ASYNC is set, but some subsystems, such as NFS, like 
- *			to know what is best for the caller so they can
- *			optimize the I/O.
- *
- *	B_PAGING	Indicates that bp is being used by the paging system or
- *			some paging system and that the bp is not linked into
- *			the b_vp's clean/dirty linked lists or ref counts.
- *			Buffer vp reassignments are illegal in this case.
- *
- *	B_CACHE		This may only be set if the buffer is entirely valid.
- *			The situation where B_DELWRI is set and B_CACHE is
- *			clear MUST be committed to disk by getblk() so 
- *			B_DELWRI can also be cleared.  See the comments for
- *			getblk() in kern/vfs_bio.c.  If B_CACHE is clear,
- *			the caller is expected to clear BIO_ERROR and B_INVAL,
- *			set BIO_READ, and initiate an I/O.
- *
- *			The 'entire buffer' is defined to be the range from
- *			0 through b_bcount.
- *
- *	B_MALLOC	Request that the buffer be allocated from the malloc
- *			pool, DEV_BSIZE aligned instead of PAGE_SIZE aligned.
- *
- *	B_CLUSTEROK	This flag is typically set for B_DELWRI buffers
- *			by filesystems that allow clustering when the buffer
- *			is fully dirty and indicates that it may be clustered
- *			with other adjacent dirty buffers.  Note the clustering
- *			may not be used with the stage 1 data write under NFS
- *			but may be used for the commit rpc portion.
- *
- *	B_VMIO		Indicates that the buffer is tied into an VM object.
- *			The buffer's data is always PAGE_SIZE aligned even
- *			if b_bufsize and b_bcount are not.  ( b_bufsize is 
- *			always at least DEV_BSIZE aligned, though ).
- *
- *	B_DIRECT	Hint that we should attempt to completely free
- *			the pages underlying the buffer.  B_DIRECT is
- *			sticky until the buffer is released and typically
- *			only has an effect when B_RELBUF is also set.
- *
- */
-
-#define	B_AGE		0x00000001	/* Move to age queue when I/O done. */
-#define	B_NEEDCOMMIT	0x00000002	/* Append-write in progress. */
-#define	B_ASYNC		0x00000004	/* Start I/O, do not wait. */
-#define	B_DIRECT	0x00000008	/* direct I/O flag (pls free vmio) */
-#define	B_DEFERRED	0x00000010	/* Skipped over for cleaning */
-#define	B_CACHE		0x00000020	/* Bread found us in the cache. */
-#define	B_VALIDSUSPWRT	0x00000040	/* Valid write during suspension. */
-#define	B_DELWRI	0x00000080	/* Delay I/O until buffer reused. */
-#define	B_PERSISTENT	0x00000100	/* Perm. ref'ed while EXT2FS mounted. */
-#define	B_DONE		0x00000200	/* I/O completed. */
-#define	B_EINTR		0x00000400	/* I/O was interrupted */
-#define	B_UNMAPPED	0x00000800	/* KVA is not mapped. */
-#define	B_KVAALLOC	0x00001000	/* But allocated. */
-#define	B_INVAL		0x00002000	/* Does not contain valid info. */
-#define	B_BARRIER	0x00004000	/* Write this and all preceeding first. */
-#define	B_NOCACHE	0x00008000	/* Do not cache block after use. */
-#define	B_MALLOC	0x00010000	/* malloced b_data */
-#define	B_CLUSTEROK	0x00020000	/* Pagein op, so swap() can count it. */
-#define	B_000400000	0x00040000	/* Available flag. */
-#define	B_000800000	0x00080000	/* Available flag. */
-#define	B_00100000	0x00100000	/* Available flag. */
-#define	B_DIRTY		0x00200000	/* Needs writing later (in EXT2FS). */
-#define	B_RELBUF	0x00400000	/* Release VMIO buffer. */
-#define	B_00800000	0x00800000	/* Available flag. */
-#define	B_NOCOPY	0x01000000	/* Don't copy-on-write this buf. */
-#define	B_INFREECNT	0x02000000	/* buf is counted in numfreebufs */
-#define	B_PAGING	0x04000000	/* volatile paging I/O -- bypass VMIO */
-#define B_MANAGED	0x08000000	/* Managed by FS. */
-#define B_RAM		0x10000000	/* Read ahead mark (flag) */
-#define B_VMIO		0x20000000	/* VMIO flag */
-#define B_CLUSTER	0x40000000	/* pagein op, so swap() can count it */
-#define B_REMFREE	0x80000000	/* Delayed bremfree */
-
-#define PRINT_BUF_FLAGS "\20\40remfree\37cluster\36vmio\35ram\34managed" \
-	"\33paging\32infreecnt\31nocopy\30b23\27relbuf\26dirty\25b20" \
-	"\24b19\23b18\22clusterok\21malloc\20nocache\17b14\16inval" \
-	"\15kvaalloc\14unmapped\13eintr\12done\11persist\10delwri" \
-	"\7validsuspwrt\6cache\5deferred\4direct\3async\2needcommit\1age"
-
-/*
- * These flags are kept in b_xflags.
- */
-#define	BX_VNDIRTY	0x00000001	/* On vnode dirty list */
-#define	BX_VNCLEAN	0x00000002	/* On vnode clean list */
-#define	BX_BKGRDWRITE	0x00000010	/* Do writes in background */
-#define BX_BKGRDMARKER	0x00000020	/* Mark buffer for splay tree */
-#define	BX_ALTDATA	0x00000040	/* Holds extended data */
-
-#define	PRINT_BUF_XFLAGS "\20\7altdata\6bkgrdmarker\5bkgrdwrite\2clean\1dirty"
-
-#define	NOOFFSET	(-1LL)		/* No buffer offset calculated yet */
-
-/*
- * These flags are kept in b_vflags.
- */
-#define	BV_SCANNED	0x00000001	/* VOP_FSYNC funcs mark written bufs */
-#define	BV_BKGRDINPROG	0x00000002	/* Background write in progress */
-#define	BV_BKGRDWAIT	0x00000004	/* Background write waiting */
-#define	BV_BKGRDERR	0x00000008	/* Error from background write */
-
-#define	PRINT_BUF_VFLAGS "\20\4bkgrderr\3bkgrdwait\2bkgrdinprog\1scanned"
-
-#ifdef _KERNEL
-/*
- * Buffer locking
- */
-extern const char *buf_wmesg;		/* Default buffer lock message */
-#define BUF_WMESG "bufwait"
-#include <sys/proc.h>			/* XXX for curthread */
-#include <sys/mutex.h>
-
-/*
- * Initialize a lock.
- */
-#define BUF_LOCKINIT(bp)						\
-	lockinit(&(bp)->b_lock, PRIBIO + 4, buf_wmesg, 0, 0)
-/*
- *
- * Get a lock sleeping non-interruptably until it becomes available.
- */
-#define	BUF_LOCK(bp, locktype, interlock)				\
-	_lockmgr_args_rw(&(bp)->b_lock, (locktype), (interlock),	\
-	    LK_WMESG_DEFAULT, LK_PRIO_DEFAULT, LK_TIMO_DEFAULT,		\
-	    LOCK_FILE, LOCK_LINE)
-
-/*
- * Get a lock sleeping with specified interruptably and timeout.
- */
-#define	BUF_TIMELOCK(bp, locktype, interlock, wmesg, catch, timo)	\
-	_lockmgr_args_rw(&(bp)->b_lock, (locktype) | LK_TIMELOCK,	\
-	    (interlock), (wmesg), (PRIBIO + 4) | (catch), (timo),	\
-	    LOCK_FILE, LOCK_LINE)
-
-/*
- * Release a lock. Only the acquiring process may free the lock unless
- * it has been handed off to biodone.
- */
-#define	BUF_UNLOCK(bp) do {						\
-	KASSERT(((bp)->b_flags & B_REMFREE) == 0,			\
-	    ("BUF_UNLOCK %p while B_REMFREE is still set.", (bp)));	\
-									\
-	(void)_lockmgr_args(&(bp)->b_lock, LK_RELEASE, NULL,		\
-	    LK_WMESG_DEFAULT, LK_PRIO_DEFAULT, LK_TIMO_DEFAULT,		\
-	    LOCK_FILE, LOCK_LINE);					\
-} while (0)
-
-/*
- * Check if a buffer lock is recursed.
- */
-#define	BUF_LOCKRECURSED(bp)						\
-	lockmgr_recursed(&(bp)->b_lock)
-
-/*
- * Check if a buffer lock is currently held.
- */
-#define	BUF_ISLOCKED(bp)						\
-	lockstatus(&(bp)->b_lock)
-/*
- * Free a buffer lock.
- */
-#define BUF_LOCKFREE(bp) 						\
-	lockdestroy(&(bp)->b_lock)
-
-/*
- * Print informations on a buffer lock.
- */
-#define BUF_LOCKPRINTINFO(bp) 						\
-	lockmgr_printinfo(&(bp)->b_lock)
-
-/*
- * Buffer lock assertions.
- */
-#if defined(INVARIANTS) && defined(INVARIANT_SUPPORT)
-#define	BUF_ASSERT_LOCKED(bp)						\
-	_lockmgr_assert(&(bp)->b_lock, KA_LOCKED, LOCK_FILE, LOCK_LINE)
-#define	BUF_ASSERT_SLOCKED(bp)						\
-	_lockmgr_assert(&(bp)->b_lock, KA_SLOCKED, LOCK_FILE, LOCK_LINE)
-#define	BUF_ASSERT_XLOCKED(bp)						\
-	_lockmgr_assert(&(bp)->b_lock, KA_XLOCKED, LOCK_FILE, LOCK_LINE)
-#define	BUF_ASSERT_UNLOCKED(bp)						\
-	_lockmgr_assert(&(bp)->b_lock, KA_UNLOCKED, LOCK_FILE, LOCK_LINE)
-#define	BUF_ASSERT_HELD(bp)
-#define	BUF_ASSERT_UNHELD(bp)
-#else
-#define	BUF_ASSERT_LOCKED(bp)
-#define	BUF_ASSERT_SLOCKED(bp)
-#define	BUF_ASSERT_XLOCKED(bp)
-#define	BUF_ASSERT_UNLOCKED(bp)
-#define	BUF_ASSERT_HELD(bp)
-#define	BUF_ASSERT_UNHELD(bp)
-#endif
-
-#ifdef _SYS_PROC_H_	/* Avoid #include <sys/proc.h> pollution */
-/*
- * When initiating asynchronous I/O, change ownership of the lock to the
- * kernel. Once done, the lock may legally released by biodone. The
- * original owning process can no longer acquire it recursively, but must
- * wait until the I/O is completed and the lock has been freed by biodone.
- */
-#define	BUF_KERNPROC(bp)						\
-	_lockmgr_disown(&(bp)->b_lock, LOCK_FILE, LOCK_LINE)
-#endif
-
-/*
- * Find out if the lock has waiters or not.
- */
-#define	BUF_LOCKWAITERS(bp)						\
-	lockmgr_waiters(&(bp)->b_lock)
-
-#endif /* _KERNEL */
-
-struct buf_queue_head {
-	TAILQ_HEAD(buf_queue, buf) queue;
-	daddr_t last_pblkno;
-	struct	buf *insert_point;
-	struct	buf *switch_point;
-};
-
-/*
- * This structure describes a clustered I/O.  It is stored in the b_saveaddr
- * field of the buffer on which I/O is done.  At I/O completion, cluster
- * callback uses the structure to parcel I/O's to individual buffers, and
- * then free's this structure.
- */
-struct cluster_save {
-	long	bs_bcount;		/* Saved b_bcount. */
-	long	bs_bufsize;		/* Saved b_bufsize. */
-	void	*bs_saveaddr;		/* Saved b_addr. */
-	int	bs_nchildren;		/* Number of associated buffers. */
-	struct buf **bs_children;	/* List of associated buffers. */
-};
-
-#ifdef _KERNEL
-
-static __inline int
-bwrite(struct buf *bp)
-{
-
-	KASSERT(bp->b_bufobj != NULL, ("bwrite: no bufobj bp=%p", bp));
-	KASSERT(bp->b_bufobj->bo_ops != NULL, ("bwrite: no bo_ops bp=%p", bp));
-	KASSERT(bp->b_bufobj->bo_ops->bop_write != NULL,
-	    ("bwrite: no bop_write bp=%p", bp));
-	return (BO_WRITE(bp->b_bufobj, bp));
-}
-
-static __inline void
-bstrategy(struct buf *bp)
-{
-
-	KASSERT(bp->b_bufobj != NULL, ("bstrategy: no bufobj bp=%p", bp));
-	KASSERT(bp->b_bufobj->bo_ops != NULL,
-	    ("bstrategy: no bo_ops bp=%p", bp));
-	KASSERT(bp->b_bufobj->bo_ops->bop_strategy != NULL,
-	    ("bstrategy: no bop_strategy bp=%p", bp));
-	BO_STRATEGY(bp->b_bufobj, bp);
-}
-
-static __inline void
-buf_start(struct buf *bp)
-{
-	if (bioops.io_start)
-		(*bioops.io_start)(bp);
-}
-
-static __inline void
-buf_complete(struct buf *bp)
-{
-	if (bioops.io_complete)
-		(*bioops.io_complete)(bp);
-}
-
-static __inline void
-buf_deallocate(struct buf *bp)
-{
-	if (bioops.io_deallocate)
-		(*bioops.io_deallocate)(bp);
-}
-
-static __inline int
-buf_countdeps(struct buf *bp, int i)
-{
-	if (bioops.io_countdeps)
-		return ((*bioops.io_countdeps)(bp, i));
-	else
-		return (0);
-}
-
-#endif /* _KERNEL */
-
-/*
- * Zero out the buffer's data area.
- */
-#define	clrbuf(bp) {							\
-	bzero((bp)->b_data, (u_int)(bp)->b_bcount);			\
-	(bp)->b_resid = 0;						\
-}
-
-/*
- * Flags for getblk's last parameter.
- */
-#define	GB_LOCK_NOWAIT	0x0001		/* Fail if we block on a buf lock. */
-#define	GB_NOCREAT	0x0002		/* Don't create a buf if not found. */
-#define	GB_NOWAIT_BD	0x0004		/* Do not wait for bufdaemon. */
-#define	GB_UNMAPPED	0x0008		/* Do not mmap buffer pages. */
-#define	GB_KVAALLOC	0x0010		/* But allocate KVA. */
-
-#ifdef _KERNEL
-extern int	nbuf;			/* The number of buffer headers */
-extern long	maxswzone;		/* Max KVA for swap structures */
-extern long	maxbcache;		/* Max KVA for buffer cache */
-extern long	runningbufspace;
-extern long	hibufspace;
-extern int	dirtybufthresh;
-extern int	bdwriteskip;
-extern int	dirtybufferflushes;
-extern int	altbufferflushes;
-extern struct	buf *buf;		/* The buffer headers. */
-extern struct	buf *swbuf;		/* Swap I/O buffer headers. */
-extern int	nswbuf;			/* Number of swap I/O buffer headers. */
-extern int	cluster_pbuf_freecnt;	/* Number of pbufs for clusters */
-extern int	vnode_pbuf_freecnt;	/* Number of pbufs for vnode pager */
-extern caddr_t	unmapped_buf;
-
-void	runningbufwakeup(struct buf *);
-void	waitrunningbufspace(void);
-caddr_t	kern_vfs_bio_buffer_alloc(caddr_t v, long physmem_est);
-void	bufinit(void);
-void	bdata2bio(struct buf *bp, struct bio *bip);
-void	bwillwrite(void);
-int	buf_dirty_count_severe(void);
-void	bremfree(struct buf *);
-void	bremfreef(struct buf *);	/* XXX Force bremfree, only for nfs. */
-#define bread(vp, blkno, size, cred, bpp) \
-	    breadn_flags(vp, blkno, size, NULL, NULL, 0, cred, 0, bpp)
-#define bread_gb(vp, blkno, size, cred, gbflags, bpp) \
-	    breadn_flags(vp, blkno, size, NULL, NULL, 0, cred, \
-		gbflags, bpp)
-#define breadn(vp, blkno, size, rablkno, rabsize, cnt, cred, bpp) \
-	    breadn_flags(vp, blkno, size, rablkno, rabsize, cnt, cred, 0, bpp)
-int	breadn_flags(struct vnode *, daddr_t, int, daddr_t *, int *, int,
-	    struct ucred *, int, struct buf **);
-void	breada(struct vnode *, daddr_t *, int *, int, struct ucred *);
-void	bdwrite(struct buf *);
-void	bawrite(struct buf *);
-void	babarrierwrite(struct buf *);
-int	bbarrierwrite(struct buf *);
-void	bdirty(struct buf *);
-void	bundirty(struct buf *);
-void	bufstrategy(struct bufobj *, struct buf *);
-void	brelse(struct buf *);
-void	bqrelse(struct buf *);
-int	vfs_bio_awrite(struct buf *);
-void	vfs_drain_busy_pages(struct buf *bp);
-struct buf *     getpbuf(int *);
-struct buf *incore(struct bufobj *, daddr_t);
-struct buf *gbincore(struct bufobj *, daddr_t);
-struct buf *getblk(struct vnode *, daddr_t, int, int, int, int);
-struct buf *geteblk(int, int);
-int	bufwait(struct buf *);
-int	bufwrite(struct buf *);
-void	bufdone(struct buf *);
-void	bufdone_finish(struct buf *);
-void	bd_speedup(void);
-
-int	cluster_read(struct vnode *, u_quad_t, daddr_t, long,
-	    struct ucred *, long, int, int, struct buf **);
-int	cluster_wbuild(struct vnode *, long, daddr_t, int, int);
-void	cluster_write(struct vnode *, struct buf *, u_quad_t, int, int);
-void	vfs_bio_bzero_buf(struct buf *bp, int base, int size);
-void	vfs_bio_set_valid(struct buf *, int base, int size);
-void	vfs_bio_clrbuf(struct buf *);
-void	vfs_busy_pages(struct buf *, int clear_modify);
-void	vfs_unbusy_pages(struct buf *);
-int	vmapbuf(struct buf *, int);
-void	vunmapbuf(struct buf *);
-void	relpbuf(struct buf *, int *);
-void	brelvp(struct buf *);
-void	bgetvp(struct vnode *, struct buf *);
-void	pbgetbo(struct bufobj *bo, struct buf *bp);
-void	pbgetvp(struct vnode *, struct buf *);
-void	pbrelbo(struct buf *);
-void	pbrelvp(struct buf *);
-int	allocbuf(struct buf *bp, int size);
-void	reassignbuf(struct buf *);
-struct	buf *trypbuf(int *);
-void	bwait(struct buf *, u_char, const char *);
-void	bdone(struct buf *);
-void	bpin(struct buf *);
-void	bunpin(struct buf *);
-void 	bunpin_wait(struct buf *);
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_BUF_H_ */
diff --git a/include.new/sys/buf_ring.h b/include.new/sys/buf_ring.h
deleted file mode 100644
index a4625eb..0000000
--- a/include.new/sys/buf_ring.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/*-
- * Copyright (c) 2007-2009 Kip Macy <kmacy@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.
- *
- * 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: releng/10.2/sys/sys/buf_ring.h 274646 2014-11-18 07:16:03Z jpaetzel $
- *
- */
-
-#ifndef	_SYS_BUF_RING_H_
-#define	_SYS_BUF_RING_H_
-
-#include <machine/cpu.h>
-
-#if defined(INVARIANTS) && !defined(DEBUG_BUFRING)
-#define DEBUG_BUFRING 1
-#endif
-
-#ifdef DEBUG_BUFRING
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#endif
-
-struct buf_ring {
-	volatile uint32_t	br_prod_head;
-	volatile uint32_t	br_prod_tail;	
-	int              	br_prod_size;
-	int              	br_prod_mask;
-	uint64_t		br_drops;
-	volatile uint32_t	br_cons_head __aligned(CACHE_LINE_SIZE);
-	volatile uint32_t	br_cons_tail;
-	int		 	br_cons_size;
-	int              	br_cons_mask;
-#ifdef DEBUG_BUFRING
-	struct mtx		*br_lock;
-#endif	
-	void			*br_ring[0] __aligned(CACHE_LINE_SIZE);
-};
-
-/*
- * multi-producer safe lock-free ring buffer enqueue
- *
- */
-static __inline int
-buf_ring_enqueue(struct buf_ring *br, void *buf)
-{
-	uint32_t prod_head, prod_next, cons_tail;
-#ifdef DEBUG_BUFRING
-	int i;
-	for (i = br->br_cons_head; i != br->br_prod_head;
-	     i = ((i + 1) & br->br_cons_mask))
-		if(br->br_ring[i] == buf)
-			panic("buf=%p already enqueue at %d prod=%d cons=%d",
-			    buf, i, br->br_prod_tail, br->br_cons_tail);
-#endif	
-	critical_enter();
-	do {
-		prod_head = br->br_prod_head;
-		prod_next = (prod_head + 1) & br->br_prod_mask;
-		cons_tail = br->br_cons_tail;
-
-		if (prod_next == cons_tail) {
-			rmb();
-			if (prod_head == br->br_prod_head &&
-			    cons_tail == br->br_cons_tail) {
-				br->br_drops++;
-				critical_exit();
-				return (ENOBUFS);
-			}
-			continue;
-		}
-	} while (!atomic_cmpset_acq_int(&br->br_prod_head, prod_head, prod_next));
-#ifdef DEBUG_BUFRING
-	if (br->br_ring[prod_head] != NULL)
-		panic("dangling value in enqueue");
-#endif	
-	br->br_ring[prod_head] = buf;
-
-	/*
-	 * If there are other enqueues in progress
-	 * that preceeded us, we need to wait for them
-	 * to complete 
-	 */   
-	while (br->br_prod_tail != prod_head)
-		cpu_spinwait();
-	atomic_store_rel_int(&br->br_prod_tail, prod_next);
-	critical_exit();
-	return (0);
-}
-
-/*
- * multi-consumer safe dequeue 
- *
- */
-static __inline void *
-buf_ring_dequeue_mc(struct buf_ring *br)
-{
-	uint32_t cons_head, cons_next;
-	void *buf;
-
-	critical_enter();
-	do {
-		cons_head = br->br_cons_head;
-		cons_next = (cons_head + 1) & br->br_cons_mask;
-
-		if (cons_head == br->br_prod_tail) {
-			critical_exit();
-			return (NULL);
-		}
-	} while (!atomic_cmpset_acq_int(&br->br_cons_head, cons_head, cons_next));
-
-	buf = br->br_ring[cons_head];
-#ifdef DEBUG_BUFRING
-	br->br_ring[cons_head] = NULL;
-#endif
-	/*
-	 * If there are other dequeues in progress
-	 * that preceeded us, we need to wait for them
-	 * to complete 
-	 */   
-	while (br->br_cons_tail != cons_head)
-		cpu_spinwait();
-
-	atomic_store_rel_int(&br->br_cons_tail, cons_next);
-	critical_exit();
-
-	return (buf);
-}
-
-/*
- * single-consumer dequeue 
- * use where dequeue is protected by a lock
- * e.g. a network driver's tx queue lock
- */
-static __inline void *
-buf_ring_dequeue_sc(struct buf_ring *br)
-{
-	uint32_t cons_head, cons_next, cons_next_next;
-	uint32_t prod_tail;
-	void *buf;
-	
-	cons_head = br->br_cons_head;
-	prod_tail = br->br_prod_tail;
-	
-	cons_next = (cons_head + 1) & br->br_cons_mask;
-	cons_next_next = (cons_head + 2) & br->br_cons_mask;
-	
-	if (cons_head == prod_tail) 
-		return (NULL);
-
-#ifdef PREFETCH_DEFINED	
-	if (cons_next != prod_tail) {		
-		prefetch(br->br_ring[cons_next]);
-		if (cons_next_next != prod_tail) 
-			prefetch(br->br_ring[cons_next_next]);
-	}
-#endif
-	br->br_cons_head = cons_next;
-	buf = br->br_ring[cons_head];
-
-#ifdef DEBUG_BUFRING
-	br->br_ring[cons_head] = NULL;
-	if (!mtx_owned(br->br_lock))
-		panic("lock not held on single consumer dequeue");
-	if (br->br_cons_tail != cons_head)
-		panic("inconsistent list cons_tail=%d cons_head=%d",
-		    br->br_cons_tail, cons_head);
-#endif
-	br->br_cons_tail = cons_next;
-	return (buf);
-}
-
-/*
- * single-consumer advance after a peek
- * use where it is protected by a lock
- * e.g. a network driver's tx queue lock
- */
-static __inline void
-buf_ring_advance_sc(struct buf_ring *br)
-{
-	uint32_t cons_head, cons_next;
-	uint32_t prod_tail;
-	
-	cons_head = br->br_cons_head;
-	prod_tail = br->br_prod_tail;
-	
-	cons_next = (cons_head + 1) & br->br_cons_mask;
-	if (cons_head == prod_tail) 
-		return;
-	br->br_cons_head = cons_next;
-#ifdef DEBUG_BUFRING
-	br->br_ring[cons_head] = NULL;
-#endif
-	br->br_cons_tail = cons_next;
-}
-
-/*
- * Used to return a buffer (most likely already there)
- * to the top od the ring. The caller should *not*
- * have used any dequeue to pull it out of the ring
- * but instead should have used the peek() function.
- * This is normally used where the transmit queue
- * of a driver is full, and an mubf must be returned.
- * Most likely whats in the ring-buffer is what
- * is being put back (since it was not removed), but
- * sometimes the lower transmit function may have
- * done a pullup or other function that will have
- * changed it. As an optimzation we always put it
- * back (since jhb says the store is probably cheaper),
- * if we have to do a multi-queue version we will need
- * the compare and an atomic.
- */
-static __inline void
-buf_ring_putback_sc(struct buf_ring *br, void *new)
-{
-	KASSERT(br->br_cons_head != br->br_prod_tail, 
-		("Buf-Ring has none in putback")) ;
-	br->br_ring[br->br_cons_head] = new;
-}
-
-/*
- * return a pointer to the first entry in the ring
- * without modifying it, or NULL if the ring is empty
- * race-prone if not protected by a lock
- */
-static __inline void *
-buf_ring_peek(struct buf_ring *br)
-{
-
-#ifdef DEBUG_BUFRING
-	if ((br->br_lock != NULL) && !mtx_owned(br->br_lock))
-		panic("lock not held on single consumer dequeue");
-#endif	
-	/*
-	 * I believe it is safe to not have a memory barrier
-	 * here because we control cons and tail is worst case
-	 * a lagging indicator so we worst case we might
-	 * return NULL immediately after a buffer has been enqueued
-	 */
-	if (br->br_cons_head == br->br_prod_tail)
-		return (NULL);
-	
-	return (br->br_ring[br->br_cons_head]);
-}
-
-static __inline int
-buf_ring_full(struct buf_ring *br)
-{
-
-	return (((br->br_prod_head + 1) & br->br_prod_mask) == br->br_cons_tail);
-}
-
-static __inline int
-buf_ring_empty(struct buf_ring *br)
-{
-
-	return (br->br_cons_head == br->br_prod_tail);
-}
-
-static __inline int
-buf_ring_count(struct buf_ring *br)
-{
-
-	return ((br->br_prod_size + br->br_prod_tail - br->br_cons_tail)
-	    & br->br_prod_mask);
-}
-
-struct buf_ring *buf_ring_alloc(int count, struct malloc_type *type, int flags,
-    struct mtx *);
-void buf_ring_free(struct buf_ring *br, struct malloc_type *type);
-
-
-
-#endif
diff --git a/include.new/sys/bufobj.h b/include.new/sys/bufobj.h
deleted file mode 100644
index e1a52ce..0000000
--- a/include.new/sys/bufobj.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (c) 2004 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/sys/sys/bufobj.h 275956 2014-12-20 15:46:15Z kib $
- */
-
-/*
- * Architectural notes:
- *
- * bufobj is a new object which is what buffers hang from in the buffer
- * cache.
- *
- * This used to be vnodes, but we need non-vnode code to be able
- * to use the buffer cache as well, specifically geom classes like gbde,
- * raid3 and raid5.
- *
- * All vnodes will contain a bufobj initially, but down the road we may
- * want to only allocate bufobjs when they are needed.  There could be a
- * large number of vnodes in the system which wouldn't need a bufobj during
- * their lifetime.
- *
- * The exact relationship to the vmobject is not determined at this point,
- * it may in fact be that we find them to be two sides of the same object 
- * once things starts to crystalize.
- */
-
-#ifndef _SYS_BUFOBJ_H_
-#define _SYS_BUFOBJ_H_
-
-#if defined(_KERNEL) || defined(_KVM_VNODE)
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_rwlock.h>
-#include <sys/_pctrie.h>
-
-struct bufobj;
-struct buf_ops;
-
-extern struct buf_ops buf_ops_bio;
-
-TAILQ_HEAD(buflists, buf);
-
-/* A Buffer splay list */
-struct bufv {
-	struct buflists	bv_hd;		/* Sorted blocklist */
-	struct pctrie	bv_root;	/* Buf trie */
-	int		bv_cnt;		/* Number of buffers */
-};
-
-typedef void b_strategy_t(struct bufobj *, struct buf *);
-typedef int b_write_t(struct buf *);
-typedef int b_sync_t(struct bufobj *, int waitfor);
-typedef void b_bdflush_t(struct bufobj *, struct buf *);
-
-struct buf_ops {
-	char		*bop_name;
-	b_write_t	*bop_write;
-	b_strategy_t	*bop_strategy;
-	b_sync_t	*bop_sync;
-	b_bdflush_t	*bop_bdflush;
-};
-
-#define BO_STRATEGY(bo, bp)	((bo)->bo_ops->bop_strategy((bo), (bp)))
-#define BO_SYNC(bo, w)		((bo)->bo_ops->bop_sync((bo), (w)))
-#define BO_WRITE(bo, bp)	((bo)->bo_ops->bop_write((bp)))
-#define BO_BDFLUSH(bo, bp)	((bo)->bo_ops->bop_bdflush((bo), (bp)))
-
-struct bufobj {
-	struct rwlock	bo_lock;	/* Lock which protects "i" things */
-	struct buf_ops	*bo_ops;	/* - Buffer operations */
-	struct vm_object *bo_object;	/* v Place to store VM object */
-	LIST_ENTRY(bufobj) bo_synclist;	/* S dirty vnode list */
-	void		*bo_private;	/* private pointer */
-	struct vnode	*__bo_vnode;	/*
-					 * XXX: This vnode pointer is here
-					 * XXX: only to keep the syncer working
-					 * XXX: for now.
-					 */
-	struct bufv	bo_clean;	/* i Clean buffers */
-	struct bufv	bo_dirty;	/* i Dirty buffers */
-	long		bo_numoutput;	/* i Writes in progress */
-	u_int		bo_flag;	/* i Flags */
-	int		bo_bsize;	/* - Block size for i/o */
-};
-
-/*
- * XXX BO_ONWORKLST could be replaced with a check for NULL list elements
- * in v_synclist.
- */
-#define	BO_ONWORKLST	(1 << 0)	/* On syncer work-list */
-#define	BO_WWAIT	(1 << 1)	/* Wait for output to complete */
-#define	BO_DEAD		(1 << 2)	/* Dead; only with INVARIANTS */
-
-#define	BO_LOCKPTR(bo)		(&(bo)->bo_lock)
-#define	BO_LOCK(bo)		rw_wlock(BO_LOCKPTR((bo)))
-#define	BO_UNLOCK(bo)		rw_wunlock(BO_LOCKPTR((bo)))
-#define	BO_RLOCK(bo)		rw_rlock(BO_LOCKPTR((bo)))
-#define	BO_RUNLOCK(bo)		rw_runlock(BO_LOCKPTR((bo)))
-#define	ASSERT_BO_WLOCKED(bo)	rw_assert(BO_LOCKPTR((bo)), RA_WLOCKED)
-#define	ASSERT_BO_LOCKED(bo)	rw_assert(BO_LOCKPTR((bo)), RA_LOCKED)
-#define	ASSERT_BO_UNLOCKED(bo)	rw_assert(BO_LOCKPTR((bo)), RA_UNLOCKED)
-
-void bufobj_wdrop(struct bufobj *bo);
-void bufobj_wref(struct bufobj *bo);
-void bufobj_wrefl(struct bufobj *bo);
-int bufobj_invalbuf(struct bufobj *bo, int flags, int slpflag, int slptimeo);
-int bufobj_wwait(struct bufobj *bo, int slpflag, int timeo);
-int bufsync(struct bufobj *bo, int waitfor);
-void bufbdflush(struct bufobj *bo, struct buf *bp);
-
-#endif /* defined(_KERNEL) || defined(_KVM_VNODE) */
-#endif /* _SYS_BUFOBJ_H_ */
diff --git a/include.new/sys/bus.h b/include.new/sys/bus.h
deleted file mode 100644
index 47c357e..0000000
--- a/include.new/sys/bus.h
+++ /dev/null
@@ -1,803 +0,0 @@
-/*-
- * Copyright (c) 1997,1998,2003 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/sys/bus.h 279904 2015-03-12 07:07:41Z scottl $
- */
-
-#ifndef _SYS_BUS_H_
-#define _SYS_BUS_H_
-
-#include <machine/_limits.h>
-#include <sys/_bus_dma.h>
-
-/**
- * @defgroup NEWBUS newbus - a generic framework for managing devices
- * @{
- */
-
-/**
- * @brief Interface information structure.
- */
-struct u_businfo {
-	int	ub_version;		/**< @brief interface version */
-#define BUS_USER_VERSION	1
-	int	ub_generation;		/**< @brief generation count */
-};
-
-/**
- * @brief State of the device.
- */
-typedef enum device_state {
-	DS_NOTPRESENT = 10,		/**< @brief not probed or probe failed */
-	DS_ALIVE = 20,			/**< @brief probe succeeded */
-	DS_ATTACHING = 25,		/**< @brief currently attaching */
-	DS_ATTACHED = 30,		/**< @brief attach method called */
-	DS_BUSY = 40			/**< @brief device is open */
-} device_state_t;
-
-/**
- * @brief Device information exported to userspace.
- */
-struct u_device {
-	uintptr_t	dv_handle;
-	uintptr_t	dv_parent;
-
-	char		dv_name[32];		/**< @brief Name of device in tree. */
-	char		dv_desc[32];		/**< @brief Driver description */
-	char		dv_drivername[32];	/**< @brief Driver name */
-	char		dv_pnpinfo[128];	/**< @brief Plug and play info */
-	char		dv_location[128];	/**< @brief Where is the device? */
-	uint32_t	dv_devflags;		/**< @brief API Flags for device */
-	uint16_t	dv_flags;		/**< @brief flags for dev date */
-	device_state_t	dv_state;		/**< @brief State of attachment */
-	/* XXX more driver info? */
-};
-
-#ifdef _KERNEL
-
-#include <sys/queue.h>
-#include <sys/kobj.h>
-
-/**
- * devctl hooks.  Typically one should use the devctl_notify
- * hook to send the message.  However, devctl_queue_data is also
- * included in case devctl_notify isn't sufficiently general.
- */
-boolean_t devctl_process_running(void);
-void devctl_notify_f(const char *__system, const char *__subsystem,
-    const char *__type, const char *__data, int __flags);
-void devctl_notify(const char *__system, const char *__subsystem,
-    const char *__type, const char *__data);
-void devctl_queue_data_f(char *__data, int __flags);
-void devctl_queue_data(char *__data);
-
-/**
- * @brief A device driver (included mainly for compatibility with
- * FreeBSD 4.x).
- */
-typedef struct kobj_class	driver_t;
-
-/**
- * @brief A device class
- *
- * The devclass object has two main functions in the system. The first
- * is to manage the allocation of unit numbers for device instances
- * and the second is to hold the list of device drivers for a
- * particular bus type. Each devclass has a name and there cannot be
- * two devclasses with the same name. This ensures that unique unit
- * numbers are allocated to device instances.
- *
- * Drivers that support several different bus attachments (e.g. isa,
- * pci, pccard) should all use the same devclass to ensure that unit
- * numbers do not conflict.
- *
- * Each devclass may also have a parent devclass. This is used when
- * searching for device drivers to allow a form of inheritance. When
- * matching drivers with devices, first the driver list of the parent
- * device's devclass is searched. If no driver is found in that list,
- * the search continues in the parent devclass (if any).
- */
-typedef struct devclass		*devclass_t;
-
-/**
- * @brief A device method (included mainly for compatibility with
- * FreeBSD 4.x).
- */
-#define device_method_t		kobj_method_t
-
-/**
- * @brief Driver interrupt filter return values
- *
- * If a driver provides an interrupt filter routine it must return an
- * integer consisting of oring together zero or more of the following
- * flags:
- *
- *	FILTER_STRAY	- this device did not trigger the interrupt
- *	FILTER_HANDLED	- the interrupt has been fully handled and can be EOId
- *	FILTER_SCHEDULE_THREAD - the threaded interrupt handler should be
- *			  scheduled to execute
- *
- * If the driver does not provide a filter, then the interrupt code will
- * act is if the filter had returned FILTER_SCHEDULE_THREAD.  Note that it
- * is illegal to specify any other flag with FILTER_STRAY and that it is
- * illegal to not specify either of FILTER_HANDLED or FILTER_SCHEDULE_THREAD
- * if FILTER_STRAY is not specified.
- */
-#define	FILTER_STRAY		0x01
-#define	FILTER_HANDLED		0x02
-#define	FILTER_SCHEDULE_THREAD	0x04
-
-/**
- * @brief Driver interrupt service routines
- *
- * The filter routine is run in primary interrupt context and may not
- * block or use regular mutexes.  It may only use spin mutexes for
- * synchronization.  The filter may either completely handle the
- * interrupt or it may perform some of the work and defer more
- * expensive work to the regular interrupt handler.  If a filter
- * routine is not registered by the driver, then the regular interrupt
- * handler is always used to handle interrupts from this device.
- *
- * The regular interrupt handler executes in its own thread context
- * and may use regular mutexes.  However, it is prohibited from
- * sleeping on a sleep queue.
- */
-typedef int driver_filter_t(void*);
-typedef void driver_intr_t(void*);
-
-/**
- * @brief Interrupt type bits.
- * 
- * These flags are used both by newbus interrupt
- * registration (nexus.c) and also in struct intrec, which defines
- * interrupt properties.
- *
- * XXX We should probably revisit this and remove the vestiges of the
- * spls implicit in names like INTR_TYPE_TTY. In the meantime, don't
- * confuse things by renaming them (Grog, 18 July 2000).
- *
- * Buses which do interrupt remapping will want to change their type
- * to reflect what sort of devices are underneath.
- */
-enum intr_type {
-	INTR_TYPE_TTY = 1,
-	INTR_TYPE_BIO = 2,
-	INTR_TYPE_NET = 4,
-	INTR_TYPE_CAM = 8,
-	INTR_TYPE_MISC = 16,
-	INTR_TYPE_CLK = 32,
-	INTR_TYPE_AV = 64,
-	INTR_EXCL = 256,		/* exclusive interrupt */
-	INTR_MPSAFE = 512,		/* this interrupt is SMP safe */
-	INTR_ENTROPY = 1024,		/* this interrupt provides entropy */
-	INTR_MD1 = 4096,		/* flag reserved for MD use */
-	INTR_MD2 = 8192,		/* flag reserved for MD use */
-	INTR_MD3 = 16384,		/* flag reserved for MD use */
-	INTR_MD4 = 32768		/* flag reserved for MD use */
-};
-
-enum intr_trigger {
-	INTR_TRIGGER_CONFORM = 0,
-	INTR_TRIGGER_EDGE = 1,
-	INTR_TRIGGER_LEVEL = 2
-};
-
-enum intr_polarity {
-	INTR_POLARITY_CONFORM = 0,
-	INTR_POLARITY_HIGH = 1,
-	INTR_POLARITY_LOW = 2
-};
-
-typedef int (*devop_t)(void);
-
-/**
- * @brief This structure is deprecated.
- *
- * Use the kobj(9) macro DEFINE_CLASS to
- * declare classes which implement device drivers.
- */
-struct driver {
-	KOBJ_CLASS_FIELDS;
-};
-
-/*
- * Definitions for drivers which need to keep simple lists of resources
- * for their child devices.
- */
-struct	resource;
-
-/**
- * @brief An entry for a single resource in a resource list.
- */
-struct resource_list_entry {
-	STAILQ_ENTRY(resource_list_entry) link;
-	int	type;			/**< @brief type argument to alloc_resource */
-	int	rid;			/**< @brief resource identifier */
-	int	flags;			/**< @brief resource flags */
-	struct	resource *res;		/**< @brief the real resource when allocated */
-	u_long	start;			/**< @brief start of resource range */
-	u_long	end;			/**< @brief end of resource range */
-	u_long	count;			/**< @brief count within range */
-};
-STAILQ_HEAD(resource_list, resource_list_entry);
-
-#define	RLE_RESERVED		0x0001	/* Reserved by the parent bus. */
-#define	RLE_ALLOCATED		0x0002	/* Reserved resource is allocated. */
-#define	RLE_PREFETCH		0x0004	/* Resource is a prefetch range. */
-
-void	resource_list_init(struct resource_list *rl);
-void	resource_list_free(struct resource_list *rl);
-struct resource_list_entry *
-	resource_list_add(struct resource_list *rl,
-			  int type, int rid,
-			  u_long start, u_long end, u_long count);
-int	resource_list_add_next(struct resource_list *rl,
-			  int type,
-			  u_long start, u_long end, u_long count);
-int	resource_list_busy(struct resource_list *rl,
-			   int type, int rid);
-int	resource_list_reserved(struct resource_list *rl, int type, int rid);
-struct resource_list_entry*
-	resource_list_find(struct resource_list *rl,
-			   int type, int rid);
-void	resource_list_delete(struct resource_list *rl,
-			     int type, int rid);
-struct resource *
-	resource_list_alloc(struct resource_list *rl,
-			    device_t bus, device_t child,
-			    int type, int *rid,
-			    u_long start, u_long end,
-			    u_long count, u_int flags);
-int	resource_list_release(struct resource_list *rl,
-			      device_t bus, device_t child,
-			      int type, int rid, struct resource *res);
-int	resource_list_release_active(struct resource_list *rl,
-				     device_t bus, device_t child,
-				     int type);
-struct resource *
-	resource_list_reserve(struct resource_list *rl,
-			      device_t bus, device_t child,
-			      int type, int *rid,
-			      u_long start, u_long end,
-			      u_long count, u_int flags);
-int	resource_list_unreserve(struct resource_list *rl,
-				device_t bus, device_t child,
-				int type, int rid);
-void	resource_list_purge(struct resource_list *rl);
-int	resource_list_print_type(struct resource_list *rl,
-				 const char *name, int type,
-				 const char *format);
-
-/*
- * The root bus, to which all top-level busses are attached.
- */
-extern device_t root_bus;
-extern devclass_t root_devclass;
-void	root_bus_configure(void);
-
-/*
- * Useful functions for implementing busses.
- */
-
-int	bus_generic_activate_resource(device_t dev, device_t child, int type,
-				      int rid, struct resource *r);
-device_t
-	bus_generic_add_child(device_t dev, u_int order, const char *name,
-			      int unit);
-int	bus_generic_adjust_resource(device_t bus, device_t child, int type,
-				    struct resource *r, u_long start,
-				    u_long end);
-struct resource *
-	bus_generic_alloc_resource(device_t bus, device_t child, int type,
-				   int *rid, u_long start, u_long end,
-				   u_long count, u_int flags);
-int	bus_generic_attach(device_t dev);
-int	bus_generic_bind_intr(device_t dev, device_t child,
-			      struct resource *irq, int cpu);
-int	bus_generic_child_present(device_t dev, device_t child);
-int	bus_generic_config_intr(device_t, int, enum intr_trigger,
-				enum intr_polarity);
-int	bus_generic_describe_intr(device_t dev, device_t child,
-				  struct resource *irq, void *cookie,
-				  const char *descr);
-int	bus_generic_deactivate_resource(device_t dev, device_t child, int type,
-					int rid, struct resource *r);
-int	bus_generic_detach(device_t dev);
-void	bus_generic_driver_added(device_t dev, driver_t *driver);
-bus_dma_tag_t
-	bus_generic_get_dma_tag(device_t dev, device_t child);
-struct resource_list *
-	bus_generic_get_resource_list (device_t, device_t);
-void	bus_generic_new_pass(device_t dev);
-int	bus_print_child_header(device_t dev, device_t child);
-int	bus_print_child_domain(device_t dev, device_t child);
-int	bus_print_child_footer(device_t dev, device_t child);
-int	bus_generic_print_child(device_t dev, device_t child);
-int	bus_generic_probe(device_t dev);
-int	bus_generic_read_ivar(device_t dev, device_t child, int which,
-			      uintptr_t *result);
-int	bus_generic_release_resource(device_t bus, device_t child,
-				     int type, int rid, struct resource *r);
-int	bus_generic_resume(device_t dev);
-int	bus_generic_setup_intr(device_t dev, device_t child,
-			       struct resource *irq, int flags,
-			       driver_filter_t *filter, driver_intr_t *intr, 
-			       void *arg, void **cookiep);
-
-struct resource *
-	bus_generic_rl_alloc_resource (device_t, device_t, int, int *,
-				       u_long, u_long, u_long, u_int);
-void	bus_generic_rl_delete_resource (device_t, device_t, int, int);
-int	bus_generic_rl_get_resource (device_t, device_t, int, int, u_long *,
-				     u_long *);
-int	bus_generic_rl_set_resource (device_t, device_t, int, int, u_long,
-				     u_long);
-int	bus_generic_rl_release_resource (device_t, device_t, int, int,
-					 struct resource *);
-
-int	bus_generic_shutdown(device_t dev);
-int	bus_generic_suspend(device_t dev);
-int	bus_generic_teardown_intr(device_t dev, device_t child,
-				  struct resource *irq, void *cookie);
-int	bus_generic_write_ivar(device_t dev, device_t child, int which,
-			       uintptr_t value);
-
-int	bus_generic_get_domain(device_t dev, device_t child, int *domain);
-
-/*
- * Wrapper functions for the BUS_*_RESOURCE methods to make client code
- * a little simpler.
- */
-
-struct resource_spec {
-	int	type;
-	int	rid;
-	int	flags;
-};
-
-int	bus_alloc_resources(device_t dev, struct resource_spec *rs,
-			    struct resource **res);
-void	bus_release_resources(device_t dev, const struct resource_spec *rs,
-			      struct resource **res);
-
-int	bus_adjust_resource(device_t child, int type, struct resource *r,
-			    u_long start, u_long end);
-struct	resource *bus_alloc_resource(device_t dev, int type, int *rid,
-				     u_long start, u_long end, u_long count,
-				     u_int flags);
-int	bus_activate_resource(device_t dev, int type, int rid,
-			      struct resource *r);
-int	bus_deactivate_resource(device_t dev, int type, int rid,
-				struct resource *r);
-bus_dma_tag_t bus_get_dma_tag(device_t dev);
-int	bus_get_domain(device_t dev, int *domain);
-int	bus_release_resource(device_t dev, int type, int rid,
-			     struct resource *r);
-int	bus_free_resource(device_t dev, int type, struct resource *r);
-int	bus_setup_intr(device_t dev, struct resource *r, int flags,
-		       driver_filter_t filter, driver_intr_t handler, 
-		       void *arg, void **cookiep);
-int	bus_teardown_intr(device_t dev, struct resource *r, void *cookie);
-int	bus_bind_intr(device_t dev, struct resource *r, int cpu);
-int	bus_describe_intr(device_t dev, struct resource *irq, void *cookie,
-			  const char *fmt, ...);
-int	bus_set_resource(device_t dev, int type, int rid,
-			 u_long start, u_long count);
-int	bus_get_resource(device_t dev, int type, int rid,
-			 u_long *startp, u_long *countp);
-u_long	bus_get_resource_start(device_t dev, int type, int rid);
-u_long	bus_get_resource_count(device_t dev, int type, int rid);
-void	bus_delete_resource(device_t dev, int type, int rid);
-int	bus_child_present(device_t child);
-int	bus_child_pnpinfo_str(device_t child, char *buf, size_t buflen);
-int	bus_child_location_str(device_t child, char *buf, size_t buflen);
-void	bus_enumerate_hinted_children(device_t bus);
-
-static __inline struct resource *
-bus_alloc_resource_any(device_t dev, int type, int *rid, u_int flags)
-{
-	return (bus_alloc_resource(dev, type, rid, 0ul, ~0ul, 1, flags));
-}
-
-/*
- * Access functions for device.
- */
-device_t	device_add_child(device_t dev, const char *name, int unit);
-device_t	device_add_child_ordered(device_t dev, u_int order,
-					 const char *name, int unit);
-void	device_busy(device_t dev);
-int	device_delete_child(device_t dev, device_t child);
-int	device_delete_children(device_t dev);
-int	device_attach(device_t dev);
-int	device_detach(device_t dev);
-void	device_disable(device_t dev);
-void	device_enable(device_t dev);
-device_t	device_find_child(device_t dev, const char *classname,
-				  int unit);
-const char	*device_get_desc(device_t dev);
-devclass_t	device_get_devclass(device_t dev);
-driver_t	*device_get_driver(device_t dev);
-uint32_t	device_get_flags(device_t dev);
-device_t	device_get_parent(device_t dev);
-int	device_get_children(device_t dev, device_t **listp, int *countp);
-void	*device_get_ivars(device_t dev);
-void	device_set_ivars(device_t dev, void *ivars);
-const	char *device_get_name(device_t dev);
-const	char *device_get_nameunit(device_t dev);
-void	*device_get_softc(device_t dev);
-device_state_t	device_get_state(device_t dev);
-int	device_get_unit(device_t dev);
-struct sysctl_ctx_list *device_get_sysctl_ctx(device_t dev);
-struct sysctl_oid *device_get_sysctl_tree(device_t dev);
-int	device_is_alive(device_t dev);	/* did probe succeed? */
-int	device_is_attached(device_t dev);	/* did attach succeed? */
-int	device_is_enabled(device_t dev);
-int	device_is_quiet(device_t dev);
-int	device_print_prettyname(device_t dev);
-int	device_printf(device_t dev, const char *, ...) __printflike(2, 3);
-int	device_probe(device_t dev);
-int	device_probe_and_attach(device_t dev);
-int	device_probe_child(device_t bus, device_t dev);
-int	device_quiesce(device_t dev);
-void	device_quiet(device_t dev);
-void	device_set_desc(device_t dev, const char* desc);
-void	device_set_desc_copy(device_t dev, const char* desc);
-int	device_set_devclass(device_t dev, const char *classname);
-int	device_set_driver(device_t dev, driver_t *driver);
-void	device_set_flags(device_t dev, uint32_t flags);
-void	device_set_softc(device_t dev, void *softc);
-void	device_free_softc(void *softc);
-void	device_claim_softc(device_t dev);
-int	device_set_unit(device_t dev, int unit);	/* XXX DONT USE XXX */
-int	device_shutdown(device_t dev);
-void	device_unbusy(device_t dev);
-void	device_verbose(device_t dev);
-
-/*
- * Access functions for devclass.
- */
-int		devclass_add_driver(devclass_t dc, driver_t *driver,
-				    int pass, devclass_t *dcp);
-devclass_t	devclass_create(const char *classname);
-int		devclass_delete_driver(devclass_t busclass, driver_t *driver);
-devclass_t	devclass_find(const char *classname);
-const char	*devclass_get_name(devclass_t dc);
-device_t	devclass_get_device(devclass_t dc, int unit);
-void	*devclass_get_softc(devclass_t dc, int unit);
-int	devclass_get_devices(devclass_t dc, device_t **listp, int *countp);
-int	devclass_get_drivers(devclass_t dc, driver_t ***listp, int *countp);
-int	devclass_get_count(devclass_t dc);
-int	devclass_get_maxunit(devclass_t dc);
-int	devclass_find_free_unit(devclass_t dc, int unit);
-void	devclass_set_parent(devclass_t dc, devclass_t pdc);
-devclass_t	devclass_get_parent(devclass_t dc);
-struct sysctl_ctx_list *devclass_get_sysctl_ctx(devclass_t dc);
-struct sysctl_oid *devclass_get_sysctl_tree(devclass_t dc);
-
-/*
- * Access functions for device resources.
- */
-
-int	resource_int_value(const char *name, int unit, const char *resname,
-			   int *result);
-int	resource_long_value(const char *name, int unit, const char *resname,
-			    long *result);
-int	resource_string_value(const char *name, int unit, const char *resname,
-			      const char **result);
-int	resource_disabled(const char *name, int unit);
-int	resource_find_match(int *anchor, const char **name, int *unit,
-			    const char *resname, const char *value);
-int	resource_find_dev(int *anchor, const char *name, int *unit,
-			  const char *resname, const char *value);
-int	resource_set_int(const char *name, int unit, const char *resname,
-			 int value);
-int	resource_set_long(const char *name, int unit, const char *resname,
-			  long value);
-int	resource_set_string(const char *name, int unit, const char *resname,
-			    const char *value);
-/*
- * Functions for maintaining and checking consistency of
- * bus information exported to userspace.
- */
-int	bus_data_generation_check(int generation);
-void	bus_data_generation_update(void);
-
-/**
- * Some convenience defines for probe routines to return.  These are just
- * suggested values, and there's nothing magical about them.
- * BUS_PROBE_SPECIFIC is for devices that cannot be reprobed, and that no
- * possible other driver may exist (typically legacy drivers who don't fallow
- * all the rules, or special needs drivers).  BUS_PROBE_VENDOR is the
- * suggested value that vendor supplied drivers use.  This is for source or
- * binary drivers that are not yet integrated into the FreeBSD tree.  Its use
- * in the base OS is prohibited.  BUS_PROBE_DEFAULT is the normal return value
- * for drivers to use.  It is intended that nearly all of the drivers in the
- * tree should return this value.  BUS_PROBE_LOW_PRIORITY are for drivers that
- * have special requirements like when there are two drivers that support
- * overlapping series of hardware devices.  In this case the one that supports
- * the older part of the line would return this value, while the one that
- * supports the newer ones would return BUS_PROBE_DEFAULT.  BUS_PROBE_GENERIC
- * is for drivers that wish to have a generic form and a specialized form,
- * like is done with the pci bus and the acpi pci bus.  BUS_PROBE_HOOVER is
- * for those busses that implement a generic device place-holder for devices on
- * the bus that have no more specific driver for them (aka ugen).
- * BUS_PROBE_NOWILDCARD or lower means that the device isn't really bidding
- * for a device node, but accepts only devices that its parent has told it
- * use this driver.
- */
-#define BUS_PROBE_SPECIFIC	0	/* Only I can use this device */
-#define BUS_PROBE_VENDOR	(-10)	/* Vendor supplied driver */
-#define BUS_PROBE_DEFAULT	(-20)	/* Base OS default driver */
-#define BUS_PROBE_LOW_PRIORITY	(-40)	/* Older, less desirable drivers */
-#define BUS_PROBE_GENERIC	(-100)	/* generic driver for dev */
-#define BUS_PROBE_HOOVER	(-500)	/* Generic dev for all devs on bus */
-#define BUS_PROBE_NOWILDCARD	(-2000000000) /* No wildcard device matches */
-
-/**
- * During boot, the device tree is scanned multiple times.  Each scan,
- * or pass, drivers may be attached to devices.  Each driver
- * attachment is assigned a pass number.  Drivers may only probe and
- * attach to devices if their pass number is less than or equal to the
- * current system-wide pass number.  The default pass is the last pass
- * and is used by most drivers.  Drivers needed by the scheduler are
- * probed in earlier passes.
- */
-#define	BUS_PASS_ROOT		0	/* Used to attach root0. */
-#define	BUS_PASS_BUS		10	/* Busses and bridges. */
-#define	BUS_PASS_CPU		20	/* CPU devices. */
-#define	BUS_PASS_RESOURCE	30	/* Resource discovery. */
-#define	BUS_PASS_INTERRUPT	40	/* Interrupt controllers. */
-#define	BUS_PASS_TIMER		50	/* Timers and clocks. */
-#define	BUS_PASS_SCHEDULER	60	/* Start scheduler. */
-#define	BUS_PASS_DEFAULT	__INT_MAX /* Everything else. */
-
-#define	BUS_PASS_ORDER_FIRST	0
-#define	BUS_PASS_ORDER_EARLY	2
-#define	BUS_PASS_ORDER_MIDDLE	5
-#define	BUS_PASS_ORDER_LATE	7
-#define	BUS_PASS_ORDER_LAST	9
-
-extern int bus_current_pass;
-
-void	bus_set_pass(int pass);
-
-/**
- * Shorthands for constructing method tables.
- */
-#define	DEVMETHOD	KOBJMETHOD
-#define	DEVMETHOD_END	KOBJMETHOD_END
-
-/*
- * Some common device interfaces.
- */
-#include "device_if.h"
-#include "bus_if.h"
-
-struct	module;
-
-int	driver_module_handler(struct module *, int, void *);
-
-/**
- * Module support for automatically adding drivers to busses.
- */
-struct driver_module_data {
-	int		(*dmd_chainevh)(struct module *, int, void *);
-	void		*dmd_chainarg;
-	const char	*dmd_busname;
-	kobj_class_t	dmd_driver;
-	devclass_t	*dmd_devclass;
-	int		dmd_pass;
-};
-
-#define	EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, devclass,	\
-    evh, arg, order, pass)						\
-									\
-static struct driver_module_data name##_##busname##_driver_mod = {	\
-	evh, arg,							\
-	#busname,							\
-	(kobj_class_t) &driver,						\
-	&devclass,							\
-	pass								\
-};									\
-									\
-static moduledata_t name##_##busname##_mod = {				\
-	#busname "/" #name,						\
-	driver_module_handler,						\
-	&name##_##busname##_driver_mod					\
-};									\
-DECLARE_MODULE(name##_##busname, name##_##busname##_mod,		\
-	       SI_SUB_DRIVERS, order)
-
-#define	EARLY_DRIVER_MODULE(name, busname, driver, devclass, evh, arg, pass) \
-	EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, devclass,	\
-	    evh, arg, SI_ORDER_MIDDLE, pass)
-
-#define	DRIVER_MODULE_ORDERED(name, busname, driver, devclass, evh, arg,\
-    order)								\
-	EARLY_DRIVER_MODULE_ORDERED(name, busname, driver, devclass,	\
-	    evh, arg, order, BUS_PASS_DEFAULT)
-
-#define	DRIVER_MODULE(name, busname, driver, devclass, evh, arg)	\
-	EARLY_DRIVER_MODULE(name, busname, driver, devclass, evh, arg,	\
-	    BUS_PASS_DEFAULT)
-
-/**
- * Generic ivar accessor generation macros for bus drivers
- */
-#define __BUS_ACCESSOR(varp, var, ivarp, ivar, type)			\
-									\
-static __inline type varp ## _get_ ## var(device_t dev)			\
-{									\
-	uintptr_t v;							\
-	BUS_READ_IVAR(device_get_parent(dev), dev,			\
-	    ivarp ## _IVAR_ ## ivar, &v);				\
-	return ((type) v);						\
-}									\
-									\
-static __inline void varp ## _set_ ## var(device_t dev, type t)		\
-{									\
-	uintptr_t v = (uintptr_t) t;					\
-	BUS_WRITE_IVAR(device_get_parent(dev), dev,			\
-	    ivarp ## _IVAR_ ## ivar, v);				\
-}
-
-/**
- * Shorthand macros, taking resource argument
- * Generated with sys/tools/bus_macro.sh
- */
-
-#define bus_barrier(r, o, l, f) \
-	bus_space_barrier((r)->r_bustag, (r)->r_bushandle, (o), (l), (f))
-#define bus_read_1(r, o) \
-	bus_space_read_1((r)->r_bustag, (r)->r_bushandle, (o))
-#define bus_read_multi_1(r, o, d, c) \
-	bus_space_read_multi_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_region_1(r, o, d, c) \
-	bus_space_read_region_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_set_multi_1(r, o, v, c) \
-	bus_space_set_multi_1((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_set_region_1(r, o, v, c) \
-	bus_space_set_region_1((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_write_1(r, o, v) \
-	bus_space_write_1((r)->r_bustag, (r)->r_bushandle, (o), (v))
-#define bus_write_multi_1(r, o, d, c) \
-	bus_space_write_multi_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_write_region_1(r, o, d, c) \
-	bus_space_write_region_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_stream_1(r, o) \
-	bus_space_read_stream_1((r)->r_bustag, (r)->r_bushandle, (o))
-#define bus_read_multi_stream_1(r, o, d, c) \
-	bus_space_read_multi_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_region_stream_1(r, o, d, c) \
-	bus_space_read_region_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_set_multi_stream_1(r, o, v, c) \
-	bus_space_set_multi_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_set_region_stream_1(r, o, v, c) \
-	bus_space_set_region_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_write_stream_1(r, o, v) \
-	bus_space_write_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (v))
-#define bus_write_multi_stream_1(r, o, d, c) \
-	bus_space_write_multi_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_write_region_stream_1(r, o, d, c) \
-	bus_space_write_region_stream_1((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_2(r, o) \
-	bus_space_read_2((r)->r_bustag, (r)->r_bushandle, (o))
-#define bus_read_multi_2(r, o, d, c) \
-	bus_space_read_multi_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_region_2(r, o, d, c) \
-	bus_space_read_region_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_set_multi_2(r, o, v, c) \
-	bus_space_set_multi_2((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_set_region_2(r, o, v, c) \
-	bus_space_set_region_2((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_write_2(r, o, v) \
-	bus_space_write_2((r)->r_bustag, (r)->r_bushandle, (o), (v))
-#define bus_write_multi_2(r, o, d, c) \
-	bus_space_write_multi_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_write_region_2(r, o, d, c) \
-	bus_space_write_region_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_stream_2(r, o) \
-	bus_space_read_stream_2((r)->r_bustag, (r)->r_bushandle, (o))
-#define bus_read_multi_stream_2(r, o, d, c) \
-	bus_space_read_multi_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_region_stream_2(r, o, d, c) \
-	bus_space_read_region_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_set_multi_stream_2(r, o, v, c) \
-	bus_space_set_multi_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_set_region_stream_2(r, o, v, c) \
-	bus_space_set_region_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_write_stream_2(r, o, v) \
-	bus_space_write_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (v))
-#define bus_write_multi_stream_2(r, o, d, c) \
-	bus_space_write_multi_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_write_region_stream_2(r, o, d, c) \
-	bus_space_write_region_stream_2((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_4(r, o) \
-	bus_space_read_4((r)->r_bustag, (r)->r_bushandle, (o))
-#define bus_read_multi_4(r, o, d, c) \
-	bus_space_read_multi_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_region_4(r, o, d, c) \
-	bus_space_read_region_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_set_multi_4(r, o, v, c) \
-	bus_space_set_multi_4((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_set_region_4(r, o, v, c) \
-	bus_space_set_region_4((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_write_4(r, o, v) \
-	bus_space_write_4((r)->r_bustag, (r)->r_bushandle, (o), (v))
-#define bus_write_multi_4(r, o, d, c) \
-	bus_space_write_multi_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_write_region_4(r, o, d, c) \
-	bus_space_write_region_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_stream_4(r, o) \
-	bus_space_read_stream_4((r)->r_bustag, (r)->r_bushandle, (o))
-#define bus_read_multi_stream_4(r, o, d, c) \
-	bus_space_read_multi_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_region_stream_4(r, o, d, c) \
-	bus_space_read_region_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_set_multi_stream_4(r, o, v, c) \
-	bus_space_set_multi_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_set_region_stream_4(r, o, v, c) \
-	bus_space_set_region_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_write_stream_4(r, o, v) \
-	bus_space_write_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (v))
-#define bus_write_multi_stream_4(r, o, d, c) \
-	bus_space_write_multi_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_write_region_stream_4(r, o, d, c) \
-	bus_space_write_region_stream_4((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_8(r, o) \
-	bus_space_read_8((r)->r_bustag, (r)->r_bushandle, (o))
-#define bus_read_multi_8(r, o, d, c) \
-	bus_space_read_multi_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_region_8(r, o, d, c) \
-	bus_space_read_region_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_set_multi_8(r, o, v, c) \
-	bus_space_set_multi_8((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_set_region_8(r, o, v, c) \
-	bus_space_set_region_8((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_write_8(r, o, v) \
-	bus_space_write_8((r)->r_bustag, (r)->r_bushandle, (o), (v))
-#define bus_write_multi_8(r, o, d, c) \
-	bus_space_write_multi_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_write_region_8(r, o, d, c) \
-	bus_space_write_region_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_stream_8(r, o) \
-	bus_space_read_stream_8((r)->r_bustag, (r)->r_bushandle, (o))
-#define bus_read_multi_stream_8(r, o, d, c) \
-	bus_space_read_multi_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_read_region_stream_8(r, o, d, c) \
-	bus_space_read_region_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_set_multi_stream_8(r, o, v, c) \
-	bus_space_set_multi_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_set_region_stream_8(r, o, v, c) \
-	bus_space_set_region_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (v), (c))
-#define bus_write_stream_8(r, o, v) \
-	bus_space_write_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (v))
-#define bus_write_multi_stream_8(r, o, d, c) \
-	bus_space_write_multi_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#define bus_write_region_stream_8(r, o, d, c) \
-	bus_space_write_region_stream_8((r)->r_bustag, (r)->r_bushandle, (o), (d), (c))
-#endif /* _KERNEL */
-
-#endif /* !_SYS_BUS_H_ */
diff --git a/include.new/sys/bus_dma.h b/include.new/sys/bus_dma.h
deleted file mode 100644
index 83d2f96..0000000
--- a/include.new/sys/bus_dma.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*-
- * Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
- * Copyright (c) 1996 Christopher G. Demetriou.  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 Christopher G. Demetriou
- *	for the NetBSD Project.
- * 4. 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 ``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 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: releng/10.2/sys/sys/bus_dma.h 263687 2014-03-24 13:48:04Z emaste $ */
-
-#ifndef _BUS_DMA_H_
-#define _BUS_DMA_H_
-
-#include <sys/_bus_dma.h>
-
-/*
- * Machine independent interface for mapping physical addresses to peripheral
- * bus 'physical' addresses, and assisting with DMA operations.
- *
- * XXX This file is always included from <machine/bus_dma.h> and should not
- *     (yet) be included directly.
- */
-
-/*
- * Flags used in various bus DMA methods.
- */
-#define	BUS_DMA_WAITOK		0x00	/* safe to sleep (pseudo-flag) */
-#define	BUS_DMA_NOWAIT		0x01	/* not safe to sleep */
-#define	BUS_DMA_ALLOCNOW	0x02	/* perform resource allocation now */
-#define	BUS_DMA_COHERENT	0x04	/* hint: map memory in a coherent way */
-#define	BUS_DMA_ZERO		0x08	/* allocate zero'ed memory */
-#define	BUS_DMA_BUS1		0x10	/* placeholders for bus functions... */
-#define	BUS_DMA_BUS2		0x20
-#define	BUS_DMA_BUS3		0x40
-#define	BUS_DMA_BUS4		0x80
-
-/*
- * The following two flags are non-standard or specific to only certain
- * architectures
- */
-#define	BUS_DMA_NOWRITE		0x100
-#define	BUS_DMA_NOCACHE		0x200
-
-/*
- * The following flag is a DMA tag hint that the page offset of the
- * loaded kernel virtual address must be preserved in the first
- * physical segment address, when the KVA is loaded into DMA.
- */
-#define	BUS_DMA_KEEP_PG_OFFSET	0x400
-
-#define	BUS_DMA_LOAD_MBUF	0x800
-
-/* Forwards needed by prototypes below. */
-union ccb;
-struct bio;
-struct mbuf;
-struct memdesc;
-struct pmap;
-struct uio;
-
-/*
- * Operations performed by bus_dmamap_sync().
- */
-#define	BUS_DMASYNC_PREREAD	1
-#define	BUS_DMASYNC_POSTREAD	2
-#define	BUS_DMASYNC_PREWRITE	4
-#define	BUS_DMASYNC_POSTWRITE	8
-
-/*
- *	bus_dma_segment_t
- *
- *	Describes a single contiguous DMA transaction.  Values
- *	are suitable for programming into DMA registers.
- */
-typedef struct bus_dma_segment {
-	bus_addr_t	ds_addr;	/* DMA address */
-	bus_size_t	ds_len;		/* length of transfer */
-} bus_dma_segment_t;
-
-/*
- * A function that returns 1 if the address cannot be accessed by
- * a device and 0 if it can be.
- */
-typedef int bus_dma_filter_t(void *, bus_addr_t);
-
-/*
- * Generic helper function for manipulating mutexes.
- */
-void busdma_lock_mutex(void *arg, bus_dma_lock_op_t op);
-
-/*
- * Allocate a device specific dma_tag encapsulating the constraints of
- * the parent tag in addition to other restrictions specified:
- *
- *	alignment:	Alignment for segments.
- *	boundary:	Boundary that segments cannot cross.
- *	lowaddr:	Low restricted address that cannot appear in a mapping.
- *	highaddr:	High restricted address that cannot appear in a mapping.
- *	filtfunc:	An optional function to further test if an address
- *			within the range of lowaddr and highaddr cannot appear
- *			in a mapping.
- *	filtfuncarg:	An argument that will be passed to filtfunc in addition
- *			to the address to test.
- *	maxsize:	Maximum mapping size supported by this tag.
- *	nsegments:	Number of discontinuities allowed in maps.
- *	maxsegsz:	Maximum size of a segment in the map.
- *	flags:		Bus DMA flags.
- *	lockfunc:	An optional function to handle driver-defined lock
- *			operations.
- *	lockfuncarg:	An argument that will be passed to lockfunc in addition
- *			to the lock operation.
- *	dmat:		A pointer to set to a valid dma tag should the return
- *			value of this function indicate success.
- */
-/* XXX Should probably allow specification of alignment */
-int bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
-		       bus_addr_t boundary, bus_addr_t lowaddr,
-		       bus_addr_t highaddr, bus_dma_filter_t *filtfunc,
-		       void *filtfuncarg, bus_size_t maxsize, int nsegments,
-		       bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
-		       void *lockfuncarg, bus_dma_tag_t *dmat);
-
-int bus_dma_tag_destroy(bus_dma_tag_t dmat);
-
-/*
- * A function that processes a successfully loaded dma map or an error
- * from a delayed load map.
- */
-typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int);
-
-/*
- * Like bus_dmamap_callback but includes map size in bytes.  This is
- * defined as a separate interface to maintain compatibility for users
- * of bus_dmamap_callback_t--at some point these interfaces should be merged.
- */
-typedef void bus_dmamap_callback2_t(void *, bus_dma_segment_t *, int, bus_size_t, int);
-
-/*
- * Map the buffer buf into bus space using the dmamap map.
- */
-int bus_dmamap_load(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
-		    bus_size_t buflen, bus_dmamap_callback_t *callback,
-		    void *callback_arg, int flags);
-
-/*
- * Like bus_dmamap_load but for mbufs.  Note the use of the
- * bus_dmamap_callback2_t interface.
- */
-int bus_dmamap_load_mbuf(bus_dma_tag_t dmat, bus_dmamap_t map,
-			 struct mbuf *mbuf,
-			 bus_dmamap_callback2_t *callback, void *callback_arg,
-			 int flags);
-
-int bus_dmamap_load_mbuf_sg(bus_dma_tag_t dmat, bus_dmamap_t map,
-			    struct mbuf *mbuf, bus_dma_segment_t *segs,
-			    int *nsegs, int flags);
-
-/*
- * Like bus_dmamap_load but for uios.  Note the use of the
- * bus_dmamap_callback2_t interface.
- */
-int bus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map,
-			struct uio *ui,
-			bus_dmamap_callback2_t *callback, void *callback_arg,
-			int flags);
-
-/*
- * Like bus_dmamap_load but for cam control blocks.
- */
-int bus_dmamap_load_ccb(bus_dma_tag_t dmat, bus_dmamap_t map, union ccb *ccb,
-			bus_dmamap_callback_t *callback, void *callback_arg,
-			int flags);
-
-/*
- * Like bus_dmamap_load but for bios.
- */
-int bus_dmamap_load_bio(bus_dma_tag_t dmat, bus_dmamap_t map, struct bio *bio,
-			bus_dmamap_callback_t *callback, void *callback_arg,
-			int flags);
-
-/*
- * Loads any memory descriptor.
- */
-int bus_dmamap_load_mem(bus_dma_tag_t dmat, bus_dmamap_t map,
-			struct memdesc *mem, bus_dmamap_callback_t *callback,
-			void *callback_arg, int flags);
-
-/*
- * Placeholder for use by busdma implementations which do not benefit
- * from optimized procedure to load an array of vm_page_t.  Falls back
- * to do _bus_dmamap_load_phys() in loop.
- */
-int bus_dmamap_load_ma_triv(bus_dma_tag_t dmat, bus_dmamap_t map,
-    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
-    bus_dma_segment_t *segs, int *segp);
-
-/*
- * XXX sparc64 uses the same interface, but a much different implementation.
- *     <machine/bus_dma.h> for the sparc64 arch contains the equivalent
- *     declarations.
- */
-#if !defined(__sparc64__)
-
-/*
- * Allocate a handle for mapping from kva/uva/physical
- * address space into bus device space.
- */
-int bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp);
-
-/*
- * Destroy a handle for mapping from kva/uva/physical
- * address space into bus device space.
- */
-int bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map);
-
-/*
- * Allocate a piece of memory that can be efficiently mapped into
- * bus device space based on the constraints listed in the dma tag.
- * A dmamap to for use with dmamap_load is also allocated.
- */
-int bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
-		     bus_dmamap_t *mapp);
-
-/*
- * Free a piece of memory and its allocated dmamap, that was allocated
- * via bus_dmamem_alloc.
- */
-void bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map);
-
-/*
- * Perform a synchronization operation on the given map.
- */
-void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_dmasync_op_t);
-#define bus_dmamap_sync(dmat, dmamap, op) 			\
-	do {							\
-		if ((dmamap) != NULL)				\
-			_bus_dmamap_sync(dmat, dmamap, op);	\
-	} while (0)
-
-/*
- * Release the mapping held by map.
- */
-void _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map);
-#define bus_dmamap_unload(dmat, dmamap) 			\
-	do {							\
-		if ((dmamap) != NULL)				\
-			_bus_dmamap_unload(dmat, dmamap);	\
-	} while (0)
-
-/*
- * The following functions define the interface between the MD and MI
- * busdma layers.  These are not intended for consumption by driver
- * software.
- */
-void __bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
-			 struct memdesc *mem,
-    			 bus_dmamap_callback_t *callback,
-			 void *callback_arg);
-
-#define	_bus_dmamap_waitok(dmat, map, mem, callback, callback_arg)	\
-	do {								\
-		if ((map) != NULL)					\
-			__bus_dmamap_waitok(dmat, map, mem, callback,	\
-			    callback_arg);				\
-	} while (0);
-
-int _bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map,
-			    void *buf, bus_size_t buflen, struct pmap *pmap,
-			    int flags, bus_dma_segment_t *segs, int *segp);
-
-int _bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
-			  vm_paddr_t paddr, bus_size_t buflen,
-			  int flags, bus_dma_segment_t *segs, int *segp);
-
-int _bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
-    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
-    bus_dma_segment_t *segs, int *segp);
-
-bus_dma_segment_t *_bus_dmamap_complete(bus_dma_tag_t dmat,
-			   		bus_dmamap_t map,
-					bus_dma_segment_t *segs,
-					int nsegs, int error);
-
-#endif /* __sparc64__ */
-
-#endif /* _BUS_DMA_H_ */
diff --git a/include.new/sys/busdma_bufalloc.h b/include.new/sys/busdma_bufalloc.h
deleted file mode 100644
index a8e30d7..0000000
--- a/include.new/sys/busdma_bufalloc.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 2012 Ian Lepore
- * 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.
- *
- * 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: releng/10.2/sys/sys/busdma_bufalloc.h 244466 2012-12-20 00:34:54Z cognet $
- */
-
-/*
- * A buffer pool manager, for use by a platform's busdma implementation.
- */
-
-#ifndef _MACHINE_BUSDMA_BUFALLOC_H_
-#define _MACHINE_BUSDMA_BUFALLOC_H_
-
-#include <machine/bus.h>
-#include <vm/uma.h>
-
-/*
- * Information about a buffer zone, returned by busdma_bufalloc_findzone().
- */
-struct busdma_bufzone {
-	bus_size_t	size;
-	uma_zone_t	umazone;
-	char		name[24];
-};
-
-/*
- * Opaque handle type returned by busdma_bufalloc_create().
- */
-struct busdma_bufalloc;
-typedef struct busdma_bufalloc *busdma_bufalloc_t;
-
-/*
- * Create an allocator that manages a pool of DMA buffers.
- *
- * The allocator manages a collection of uma(9) zones of buffers in power-of-two
- * sized increments ranging from minimum_alignment to the platform's PAGE_SIZE.
- * The buffers within each zone are aligned on boundaries corresponding to the
- * buffer size, and thus by implication each buffer is contiguous within a page
- * and does not cross a power of two boundary larger than the buffer size.
- * These rules are intended to make it easy for a busdma implementation to
- * check whether a tag's constraints allow use of a buffer from the allocator.
- *
- * minimum_alignment is also the minimum buffer allocation size.  For platforms
- * with software-assisted cache coherency, this is typically the data cache line
- * size (and MUST not be smaller than the cache line size).
- *
- * name appears in zone stats as 'dma name nnnnn' where 'dma' is fixed and
- * 'nnnnn' is the size of buffers in that zone.
- *
- * If if the alloc/free function pointers are NULL, the regular uma internal
- * allocators are used (I.E., you get "plain old kernel memory").  On a platform
- * with an exclusion zone that applies to all DMA operations, a custom allocator
- * could be used to ensure no buffer memory is ever allocated from that zone,
- * allowing the bus_dmamem_alloc() implementation to make the assumption that
- * buffers provided by the allocation could never lead to the need for a bounce.
- */
-busdma_bufalloc_t busdma_bufalloc_create(const char *name,
-    bus_size_t minimum_alignment,
-    uma_alloc uma_alloc_func, uma_free uma_free_func,
-    uint32_t uma_zcreate_flags);
-
-/*
- * Destroy an allocator created by busdma_bufalloc_create().
- * Safe to call with a NULL pointer.
- */
-void busdma_bufalloc_destroy(busdma_bufalloc_t ba);
-
-/*
- * Return a pointer to the busdma_bufzone that should be used to allocate or
- * free a buffer of the given size.  Returns NULL if the size is larger than the
- * largest zone handled by the allocator.
- */
-struct busdma_bufzone * busdma_bufalloc_findzone(busdma_bufalloc_t ba,
-    bus_size_t size);
-
-/*
- * These built-in allocation routines are available for managing a pools of
- * uncacheable memory on platforms that support VM_MEMATTR_UNCACHEABLE.
- *
- * Allocation is done using kmem_alloc_attr() with these parameters:
- *   lowaddr  = 0
- *   highaddr = BUS_SPACE_MAXADDR
- *   memattr  = VM_MEMATTR_UNCACHEABLE.
- *
- * If your platform has no exclusion region (lowaddr/highaddr), and its pmap
- * routines support pmap_page_set_memattr() and the VM_MEMATTR_UNCACHEABLE flag
- * you can probably use these when you need uncacheable buffers.
- */
-void * busdma_bufalloc_alloc_uncacheable(uma_zone_t zone, int size, 
-    u_int8_t *pflag, int wait);
-void  busdma_bufalloc_free_uncacheable(void *item, int size, u_int8_t pflag);
-
-#endif	/* _MACHINE_BUSDMA_BUFALLOC_H_ */
-
diff --git a/include.new/sys/callout.h b/include.new/sys/callout.h
deleted file mode 100644
index 57ce4eb..0000000
--- a/include.new/sys/callout.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)callout.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/callout.h 281657 2015-04-17 15:39:42Z rrs $
- */
-
-#ifndef _SYS_CALLOUT_H_
-#define _SYS_CALLOUT_H_
-
-#include <sys/_callout.h>
-
-#define	CALLOUT_LOCAL_ALLOC	0x0001 /* was allocated from callfree */
-#define	CALLOUT_ACTIVE		0x0002 /* callout is currently active */
-#define	CALLOUT_PENDING		0x0004 /* callout is waiting for timeout */
-#define	CALLOUT_MPSAFE		0x0008 /* callout handler is mp safe */
-#define	CALLOUT_RETURNUNLOCKED	0x0010 /* handler returns with mtx unlocked */
-#define	CALLOUT_SHAREDLOCK	0x0020 /* callout lock held in shared mode */
-#define	CALLOUT_DFRMIGRATION	0x0040 /* callout in deferred migration mode */
-#define	CALLOUT_PROCESSED	0x0080 /* callout in wheel or processing list? */
-#define	CALLOUT_DIRECT 		0x0100 /* allow exec from hw int context */
-
-#define	C_DIRECT_EXEC		0x0001 /* direct execution of callout */
-#define	C_PRELBITS		7
-#define	C_PRELRANGE		((1 << C_PRELBITS) - 1)
-#define	C_PREL(x)		(((x) + 1) << 1)
-#define	C_PRELGET(x)		(int)((((x) >> 1) & C_PRELRANGE) - 1)
-#define	C_HARDCLOCK		0x0100 /* align to hardclock() calls */
-#define	C_ABSOLUTE		0x0200 /* event time is absolute. */
-
-struct callout_handle {
-	struct callout *callout;
-};
-
-#ifdef _KERNEL
-/* 
- * Note the flags field is actually *two* fields. The c_flags
- * field is the one that caller operations that may, or may not have
- * a lock touches i.e. callout_deactivate(). The other, the c_iflags,
- * is the internal flags that *must* be kept correct on which the
- * callout system depend on e.g. callout_pending().
- * The c_iflag is used internally by the callout system to determine which
- * list the callout is on and track internal state. Callers *should not* 
- * use the c_flags field directly but should use the macros provided.
- *  
- * The c_iflags field holds internal flags that are protected by internal
- * locks of the callout subsystem.  The c_flags field holds external flags.
- * The caller must hold its own lock while manipulating or reading external
- * flags via callout_active(), callout_deactivate(), callout_reset*(), or
- * callout_stop() to avoid races.
- */
-#define	callout_active(c)	((c)->c_flags & CALLOUT_ACTIVE)
-#define	callout_deactivate(c)	((c)->c_flags &= ~CALLOUT_ACTIVE)
-#define	callout_drain(c)	_callout_stop_safe(c, 1)
-void	callout_init(struct callout *, int);
-void	_callout_init_lock(struct callout *, struct lock_object *, int);
-#define	callout_init_mtx(c, mtx, flags)					\
-	_callout_init_lock((c), ((mtx) != NULL) ? &(mtx)->lock_object :	\
-	    NULL, (flags))
-#define	callout_init_rm(c, rm, flags)					\
-	_callout_init_lock((c), ((rm) != NULL) ? &(rm)->lock_object : 	\
-	    NULL, (flags))
-#define	callout_init_rw(c, rw, flags)					\
-	_callout_init_lock((c), ((rw) != NULL) ? &(rw)->lock_object :	\
-	   NULL, (flags))
-#define	callout_pending(c)	((c)->c_iflags & CALLOUT_PENDING)
-int	callout_reset_sbt_on(struct callout *, sbintime_t, sbintime_t,
-	    void (*)(void *), void *, int, int);
-#define	callout_reset_sbt(c, sbt, pr, fn, arg, flags)			\
-    callout_reset_sbt_on((c), (sbt), (pr), (fn), (arg), -1, (flags))
-#define	callout_reset_sbt_curcpu(c, sbt, pr, fn, arg, flags)		\
-    callout_reset_sbt_on((c), (sbt), (pr), (fn), (arg), PCPU_GET(cpuid),\
-        (flags))
-#define	callout_reset_on(c, to_ticks, fn, arg, cpu)			\
-    callout_reset_sbt_on((c), tick_sbt * (to_ticks), 0, (fn), (arg),	\
-        (cpu), C_HARDCLOCK)
-#define	callout_reset(c, on_tick, fn, arg)				\
-    callout_reset_on((c), (on_tick), (fn), (arg), -1)
-#define	callout_reset_curcpu(c, on_tick, fn, arg)			\
-    callout_reset_on((c), (on_tick), (fn), (arg), PCPU_GET(cpuid))
-#define	callout_schedule_sbt_on(c, sbt, pr, cpu, flags)			\
-    callout_reset_sbt_on((c), (sbt), (pr), (c)->c_func, (c)->c_arg,	\
-        (cpu), (flags))
-#define	callout_schedule_sbt(c, sbt, pr, flags)				\
-    callout_schedule_sbt_on((c), (sbt), (pr), -1, (flags))
-#define	callout_schedule_sbt_curcpu(c, sbt, pr, flags)			\
-    callout_schedule_sbt_on((c), (sbt), (pr), PCPU_GET(cpuid), (flags))
-int	callout_schedule(struct callout *, int);
-int	callout_schedule_on(struct callout *, int, int);
-#define	callout_schedule_curcpu(c, on_tick)				\
-    callout_schedule_on((c), (on_tick), PCPU_GET(cpuid))
-#define	callout_stop(c)		_callout_stop_safe(c, 0)
-int	_callout_stop_safe(struct callout *, int);
-void	callout_process(sbintime_t now);
-
-#endif
-
-#endif /* _SYS_CALLOUT_H_ */
diff --git a/include.new/sys/capability.h b/include.new/sys/capability.h
deleted file mode 100644
index 2166a64..0000000
--- a/include.new/sys/capability.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2014 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed at the University of Cambridge Computer
- * Laboratory with support from a grant from Google, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/capability.h 280224 2015-03-18 15:20:08Z rwatson $
- */
-
-/*
- * Historically, the key userspace and kernel Capsicum definitions were found
- * in this file.  However, it conflicted with POSIX.1e's capability.h, so has
- * been renamed capsicum.h.  The file remains for backwards compatibility
- * reasons as a nested include.
- */
-#ifndef _SYS_CAPABILITY_H_
-#define	_SYS_CAPABILITY_H_
-
-#include <sys/capsicum.h>
-
-#endif /* !_SYS_CAPABILITY_H_ */
diff --git a/include.new/sys/caprights.h b/include.new/sys/caprights.h
deleted file mode 100644
index e1873f9..0000000
--- a/include.new/sys/caprights.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2013 FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Pawel Jakub Dawidek under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/caprights.h 255219 2013-09-05 00:09:56Z pjd $
- */
-
-#ifndef _SYS_CAPRIGHTS_H_
-#define	_SYS_CAPRIGHTS_H_
-
-/*
- * The top two bits in the first element of the cr_rights[] array contain
- * total number of elements in the array - 2. This means if those two bits are
- * equal to 0, we have 2 array elements.
- * The top two bits in all remaining array elements should be 0.
- * The next five bits contain array index. Only one bit is used and bit position
- * in this five-bits range defines array index. This means there can be at most
- * five array elements.
- */
-#define	CAP_RIGHTS_VERSION_00	0
-/*
-#define	CAP_RIGHTS_VERSION_01	1
-#define	CAP_RIGHTS_VERSION_02	2
-#define	CAP_RIGHTS_VERSION_03	3
-*/
-#define	CAP_RIGHTS_VERSION	CAP_RIGHTS_VERSION_00
-
-struct cap_rights {
-	uint64_t	cr_rights[CAP_RIGHTS_VERSION + 2];
-};
-
-#ifndef	_CAP_RIGHTS_T_DECLARED
-#define	_CAP_RIGHTS_T_DECLARED
-typedef	struct cap_rights	cap_rights_t;
-#endif
-
-#endif /* !_SYS_CAPRIGHTS_H_ */
diff --git a/include.new/sys/capsicum.h b/include.new/sys/capsicum.h
deleted file mode 100644
index 659c0c9..0000000
--- a/include.new/sys/capsicum.h
+++ /dev/null
@@ -1,422 +0,0 @@
-/*-
- * Copyright (c) 2008-2010 Robert N. M. Watson
- * Copyright (c) 2012 FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed at the University of Cambridge Computer
- * Laboratory with support from a grant from Google, Inc.
- *
- * Portions of this software were developed by Pawel Jakub Dawidek under
- * sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/capsicum.h 280224 2015-03-18 15:20:08Z rwatson $
- */
-
-/*
- * Definitions for FreeBSD capabilities facility.
- */
-#ifndef _SYS_CAPSICUM_H_
-#define	_SYS_CAPSICUM_H_
-
-#include <sys/cdefs.h>
-#include <sys/param.h>
-
-#include <sys/caprights.h>
-#include <sys/file.h>
-#include <sys/fcntl.h>
-
-#ifndef _KERNEL
-#include <stdbool.h>
-#endif
-
-#define	CAPRIGHT(idx, bit)	((1ULL << (57 + (idx))) | (bit))
-
-/*
- * Possible rights on capabilities.
- *
- * Notes:
- * Some system calls don't require a capability in order to perform an
- * operation on an fd.  These include: close, dup, dup2.
- *
- * sendfile is authorized using CAP_READ on the file and CAP_WRITE on the
- * socket.
- *
- * mmap() and aio*() system calls will need special attention as they may
- * involve reads or writes depending a great deal on context.
- */
-
-/* INDEX 0 */
-
-/*
- * General file I/O.
- */
-/* Allows for openat(O_RDONLY), read(2), readv(2). */
-#define	CAP_READ		CAPRIGHT(0, 0x0000000000000001ULL)
-/* Allows for openat(O_WRONLY | O_APPEND), write(2), writev(2). */
-#define	CAP_WRITE		CAPRIGHT(0, 0x0000000000000002ULL)
-/* Allows for lseek(fd, 0, SEEK_CUR). */
-#define	CAP_SEEK_TELL		CAPRIGHT(0, 0x0000000000000004ULL)
-/* Allows for lseek(2). */
-#define	CAP_SEEK		(CAP_SEEK_TELL | 0x0000000000000008ULL)
-/* Allows for aio_read(2), pread(2), preadv(2). */
-#define	CAP_PREAD		(CAP_SEEK | CAP_READ)
-/*
- * Allows for aio_write(2), openat(O_WRONLY) (without O_APPEND), pwrite(2),
- * pwritev(2).
- */
-#define	CAP_PWRITE		(CAP_SEEK | CAP_WRITE)
-/* Allows for mmap(PROT_NONE). */
-#define	CAP_MMAP		CAPRIGHT(0, 0x0000000000000010ULL)
-/* Allows for mmap(PROT_READ). */
-#define	CAP_MMAP_R		(CAP_MMAP | CAP_SEEK | CAP_READ)
-/* Allows for mmap(PROT_WRITE). */
-#define	CAP_MMAP_W		(CAP_MMAP | CAP_SEEK | CAP_WRITE)
-/* Allows for mmap(PROT_EXEC). */
-#define	CAP_MMAP_X		(CAP_MMAP | CAP_SEEK | 0x0000000000000020ULL)
-/* Allows for mmap(PROT_READ | PROT_WRITE). */
-#define	CAP_MMAP_RW		(CAP_MMAP_R | CAP_MMAP_W)
-/* Allows for mmap(PROT_READ | PROT_EXEC). */
-#define	CAP_MMAP_RX		(CAP_MMAP_R | CAP_MMAP_X)
-/* Allows for mmap(PROT_WRITE | PROT_EXEC). */
-#define	CAP_MMAP_WX		(CAP_MMAP_W | CAP_MMAP_X)
-/* Allows for mmap(PROT_READ | PROT_WRITE | PROT_EXEC). */
-#define	CAP_MMAP_RWX		(CAP_MMAP_R | CAP_MMAP_W | CAP_MMAP_X)
-/* Allows for openat(O_CREAT). */
-#define	CAP_CREATE		CAPRIGHT(0, 0x0000000000000040ULL)
-/* Allows for openat(O_EXEC) and fexecve(2) in turn. */
-#define	CAP_FEXECVE		CAPRIGHT(0, 0x0000000000000080ULL)
-/* Allows for openat(O_SYNC), openat(O_FSYNC), fsync(2), aio_fsync(2). */
-#define	CAP_FSYNC		CAPRIGHT(0, 0x0000000000000100ULL)
-/* Allows for openat(O_TRUNC), ftruncate(2). */
-#define	CAP_FTRUNCATE		CAPRIGHT(0, 0x0000000000000200ULL)
-
-/* Lookups - used to constrain *at() calls. */
-#define	CAP_LOOKUP		CAPRIGHT(0, 0x0000000000000400ULL)
-
-/* VFS methods. */
-/* Allows for fchdir(2). */
-#define	CAP_FCHDIR		CAPRIGHT(0, 0x0000000000000800ULL)
-/* Allows for fchflags(2). */
-#define	CAP_FCHFLAGS		CAPRIGHT(0, 0x0000000000001000ULL)
-/* Allows for fchflags(2) and chflagsat(2). */
-#define	CAP_CHFLAGSAT		(CAP_FCHFLAGS | CAP_LOOKUP)
-/* Allows for fchmod(2). */
-#define	CAP_FCHMOD		CAPRIGHT(0, 0x0000000000002000ULL)
-/* Allows for fchmod(2) and fchmodat(2). */
-#define	CAP_FCHMODAT		(CAP_FCHMOD | CAP_LOOKUP)
-/* Allows for fchown(2). */
-#define	CAP_FCHOWN		CAPRIGHT(0, 0x0000000000004000ULL)
-/* Allows for fchown(2) and fchownat(2). */
-#define	CAP_FCHOWNAT		(CAP_FCHOWN | CAP_LOOKUP)
-/* Allows for fcntl(2). */
-#define	CAP_FCNTL		CAPRIGHT(0, 0x0000000000008000ULL)
-/*
- * Allows for flock(2), openat(O_SHLOCK), openat(O_EXLOCK),
- * fcntl(F_SETLK_REMOTE), fcntl(F_SETLKW), fcntl(F_SETLK), fcntl(F_GETLK).
- */
-#define	CAP_FLOCK		CAPRIGHT(0, 0x0000000000010000ULL)
-/* Allows for fpathconf(2). */
-#define	CAP_FPATHCONF		CAPRIGHT(0, 0x0000000000020000ULL)
-/* Allows for UFS background-fsck operations. */
-#define	CAP_FSCK		CAPRIGHT(0, 0x0000000000040000ULL)
-/* Allows for fstat(2). */
-#define	CAP_FSTAT		CAPRIGHT(0, 0x0000000000080000ULL)
-/* Allows for fstat(2), fstatat(2) and faccessat(2). */
-#define	CAP_FSTATAT		(CAP_FSTAT | CAP_LOOKUP)
-/* Allows for fstatfs(2). */
-#define	CAP_FSTATFS		CAPRIGHT(0, 0x0000000000100000ULL)
-/* Allows for futimes(2). */
-#define	CAP_FUTIMES		CAPRIGHT(0, 0x0000000000200000ULL)
-/* Allows for futimes(2) and futimesat(2). */
-#define	CAP_FUTIMESAT		(CAP_FUTIMES | CAP_LOOKUP)
-/* Allows for linkat(2) and renameat(2) (destination directory descriptor). */
-#define	CAP_LINKAT		(CAP_LOOKUP | 0x0000000000400000ULL)
-/* Allows for mkdirat(2). */
-#define	CAP_MKDIRAT		(CAP_LOOKUP | 0x0000000000800000ULL)
-/* Allows for mkfifoat(2). */
-#define	CAP_MKFIFOAT		(CAP_LOOKUP | 0x0000000001000000ULL)
-/* Allows for mknodat(2). */
-#define	CAP_MKNODAT		(CAP_LOOKUP | 0x0000000002000000ULL)
-/* Allows for renameat(2). */
-#define	CAP_RENAMEAT		(CAP_LOOKUP | 0x0000000004000000ULL)
-/* Allows for symlinkat(2). */
-#define	CAP_SYMLINKAT		(CAP_LOOKUP | 0x0000000008000000ULL)
-/*
- * Allows for unlinkat(2) and renameat(2) if destination object exists and
- * will be removed.
- */
-#define	CAP_UNLINKAT		(CAP_LOOKUP | 0x0000000010000000ULL)
-
-/* Socket operations. */
-/* Allows for accept(2) and accept4(2). */
-#define	CAP_ACCEPT		CAPRIGHT(0, 0x0000000020000000ULL)
-/* Allows for bind(2). */
-#define	CAP_BIND		CAPRIGHT(0, 0x0000000040000000ULL)
-/* Allows for connect(2). */
-#define	CAP_CONNECT		CAPRIGHT(0, 0x0000000080000000ULL)
-/* Allows for getpeername(2). */
-#define	CAP_GETPEERNAME		CAPRIGHT(0, 0x0000000100000000ULL)
-/* Allows for getsockname(2). */
-#define	CAP_GETSOCKNAME		CAPRIGHT(0, 0x0000000200000000ULL)
-/* Allows for getsockopt(2). */
-#define	CAP_GETSOCKOPT		CAPRIGHT(0, 0x0000000400000000ULL)
-/* Allows for listen(2). */
-#define	CAP_LISTEN		CAPRIGHT(0, 0x0000000800000000ULL)
-/* Allows for sctp_peeloff(2). */
-#define	CAP_PEELOFF		CAPRIGHT(0, 0x0000001000000000ULL)
-#define	CAP_RECV		CAP_READ
-#define	CAP_SEND		CAP_WRITE
-/* Allows for setsockopt(2). */
-#define	CAP_SETSOCKOPT		CAPRIGHT(0, 0x0000002000000000ULL)
-/* Allows for shutdown(2). */
-#define	CAP_SHUTDOWN		CAPRIGHT(0, 0x0000004000000000ULL)
-
-/* Allows for bindat(2) on a directory descriptor. */
-#define	CAP_BINDAT		(CAP_LOOKUP | 0x0000008000000000ULL)
-/* Allows for connectat(2) on a directory descriptor. */
-#define	CAP_CONNECTAT		(CAP_LOOKUP | 0x0000010000000000ULL)
-
-#define	CAP_SOCK_CLIENT \
-	(CAP_CONNECT | CAP_GETPEERNAME | CAP_GETSOCKNAME | CAP_GETSOCKOPT | \
-	 CAP_PEELOFF | CAP_RECV | CAP_SEND | CAP_SETSOCKOPT | CAP_SHUTDOWN)
-#define	CAP_SOCK_SERVER \
-	(CAP_ACCEPT | CAP_BIND | CAP_GETPEERNAME | CAP_GETSOCKNAME | \
-	 CAP_GETSOCKOPT | CAP_LISTEN | CAP_PEELOFF | CAP_RECV | CAP_SEND | \
-	 CAP_SETSOCKOPT | CAP_SHUTDOWN)
-
-/* All used bits for index 0. */
-#define	CAP_ALL0		CAPRIGHT(0, 0x0000007FFFFFFFFFULL)
-
-/* Available bits for index 0. */
-#define	CAP_UNUSED0_40		CAPRIGHT(0, 0x0000008000000000ULL)
-/* ... */
-#define	CAP_UNUSED0_57		CAPRIGHT(0, 0x0100000000000000ULL)
-
-/* INDEX 1 */
-
-/* Mandatory Access Control. */
-/* Allows for mac_get_fd(3). */
-#define	CAP_MAC_GET		CAPRIGHT(1, 0x0000000000000001ULL)
-/* Allows for mac_set_fd(3). */
-#define	CAP_MAC_SET		CAPRIGHT(1, 0x0000000000000002ULL)
-
-/* Methods on semaphores. */
-#define	CAP_SEM_GETVALUE	CAPRIGHT(1, 0x0000000000000004ULL)
-#define	CAP_SEM_POST		CAPRIGHT(1, 0x0000000000000008ULL)
-#define	CAP_SEM_WAIT		CAPRIGHT(1, 0x0000000000000010ULL)
-
-/* Allows select(2) and poll(2) on descriptor. */
-#define	CAP_EVENT		CAPRIGHT(1, 0x0000000000000020ULL)
-/* Allows for kevent(2) on kqueue descriptor with eventlist != NULL. */
-#define	CAP_KQUEUE_EVENT	CAPRIGHT(1, 0x0000000000000040ULL)
-
-/* Strange and powerful rights that should not be given lightly. */
-/* Allows for ioctl(2). */
-#define	CAP_IOCTL		CAPRIGHT(1, 0x0000000000000080ULL)
-#define	CAP_TTYHOOK		CAPRIGHT(1, 0x0000000000000100ULL)
-
-/* Process management via process descriptors. */
-/* Allows for pdgetpid(2). */
-#define	CAP_PDGETPID		CAPRIGHT(1, 0x0000000000000200ULL)
-/* Allows for pdwait4(2). */
-#define	CAP_PDWAIT		CAPRIGHT(1, 0x0000000000000400ULL)
-/* Allows for pdkill(2). */
-#define	CAP_PDKILL		CAPRIGHT(1, 0x0000000000000800ULL)
-
-/* Extended attributes. */
-/* Allows for extattr_delete_fd(2). */
-#define	CAP_EXTATTR_DELETE	CAPRIGHT(1, 0x0000000000001000ULL)
-/* Allows for extattr_get_fd(2). */
-#define	CAP_EXTATTR_GET		CAPRIGHT(1, 0x0000000000002000ULL)
-/* Allows for extattr_list_fd(2). */
-#define	CAP_EXTATTR_LIST	CAPRIGHT(1, 0x0000000000004000ULL)
-/* Allows for extattr_set_fd(2). */
-#define	CAP_EXTATTR_SET		CAPRIGHT(1, 0x0000000000008000ULL)
-
-/* Access Control Lists. */
-/* Allows for acl_valid_fd_np(3). */
-#define	CAP_ACL_CHECK		CAPRIGHT(1, 0x0000000000010000ULL)
-/* Allows for acl_delete_fd_np(3). */
-#define	CAP_ACL_DELETE		CAPRIGHT(1, 0x0000000000020000ULL)
-/* Allows for acl_get_fd(3) and acl_get_fd_np(3). */
-#define	CAP_ACL_GET		CAPRIGHT(1, 0x0000000000040000ULL)
-/* Allows for acl_set_fd(3) and acl_set_fd_np(3). */
-#define	CAP_ACL_SET		CAPRIGHT(1, 0x0000000000080000ULL)
-
-/* Allows for kevent(2) on kqueue descriptor with changelist != NULL. */
-#define	CAP_KQUEUE_CHANGE	CAPRIGHT(1, 0x0000000000100000ULL)
-
-#define	CAP_KQUEUE		(CAP_KQUEUE_EVENT | CAP_KQUEUE_CHANGE)
-
-/* All used bits for index 1. */
-#define	CAP_ALL1		CAPRIGHT(1, 0x00000000001FFFFFULL)
-
-/* Available bits for index 1. */
-#define	CAP_UNUSED1_22		CAPRIGHT(1, 0x0000000000200000ULL)
-/* ... */
-#define	CAP_UNUSED1_57		CAPRIGHT(1, 0x0100000000000000ULL)
-
-/* Backward compatibility. */
-#define	CAP_POLL_EVENT		CAP_EVENT
-
-#define	CAP_ALL(rights)		do {					\
-	(rights)->cr_rights[0] =					\
-	    ((uint64_t)CAP_RIGHTS_VERSION << 62) | CAP_ALL0;		\
-	(rights)->cr_rights[1] = CAP_ALL1;				\
-} while (0)
-
-#define	CAP_NONE(rights)	do {					\
-	(rights)->cr_rights[0] =					\
-	    ((uint64_t)CAP_RIGHTS_VERSION << 62) | CAPRIGHT(0, 0ULL);	\
-	(rights)->cr_rights[1] = CAPRIGHT(1, 0ULL);			\
-} while (0)
-
-#define	CAPRVER(right)		((int)((right) >> 62))
-#define	CAPVER(rights)		CAPRVER((rights)->cr_rights[0])
-#define	CAPARSIZE(rights)	(CAPVER(rights) + 2)
-#define	CAPIDXBIT(right)	((int)(((right) >> 57) & 0x1F))
-
-/*
- * Allowed fcntl(2) commands.
- */
-#define	CAP_FCNTL_GETFL		(1 << F_GETFL)
-#define	CAP_FCNTL_SETFL		(1 << F_SETFL)
-#if __BSD_VISIBLE || __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-#define	CAP_FCNTL_GETOWN	(1 << F_GETOWN)
-#define	CAP_FCNTL_SETOWN	(1 << F_SETOWN)
-#endif
-#if __BSD_VISIBLE || __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-#define	CAP_FCNTL_ALL		(CAP_FCNTL_GETFL | CAP_FCNTL_SETFL | \
-				 CAP_FCNTL_GETOWN | CAP_FCNTL_SETOWN)
-#else
-#define	CAP_FCNTL_ALL		(CAP_FCNTL_GETFL | CAP_FCNTL_SETFL)
-#endif
-
-#define	CAP_IOCTLS_ALL	SSIZE_MAX
-
-#define	cap_rights_init(...)						\
-	__cap_rights_init(CAP_RIGHTS_VERSION, __VA_ARGS__, 0ULL)
-cap_rights_t *__cap_rights_init(int version, cap_rights_t *rights, ...);
-
-#define	cap_rights_set(rights, ...)					\
-	__cap_rights_set((rights), __VA_ARGS__, 0ULL)
-cap_rights_t *__cap_rights_set(cap_rights_t *rights, ...);
-
-#define	cap_rights_clear(rights, ...)					\
-	__cap_rights_clear((rights), __VA_ARGS__, 0ULL)
-cap_rights_t *__cap_rights_clear(cap_rights_t *rights, ...);
-
-#define	cap_rights_is_set(rights, ...)					\
-	__cap_rights_is_set((rights), __VA_ARGS__, 0ULL)
-bool __cap_rights_is_set(const cap_rights_t *rights, ...);
-
-bool cap_rights_is_valid(const cap_rights_t *rights);
-cap_rights_t *cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src);
-cap_rights_t *cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src);
-bool cap_rights_contains(const cap_rights_t *big, const cap_rights_t *little);
-
-#ifdef _KERNEL
-
-#include <sys/systm.h>
-
-#define IN_CAPABILITY_MODE(td) ((td->td_ucred->cr_flags & CRED_FLAG_CAPMODE) != 0)
-
-struct filedesc;
-struct filedescent;
-
-/*
- * Test whether a capability grants the requested rights.
- */
-int	cap_check(const cap_rights_t *havep, const cap_rights_t *needp);
-/*
- * Convert capability rights into VM access flags.
- */
-u_char	cap_rights_to_vmprot(cap_rights_t *havep);
-
-/*
- * For the purposes of procstat(1) and similar tools, allow kern_descrip.c to
- * extract the rights from a capability.
- */
-cap_rights_t	*cap_rights_fde(struct filedescent *fde);
-cap_rights_t	*cap_rights(struct filedesc *fdp, int fd);
-
-int	cap_ioctl_check(struct filedesc *fdp, int fd, u_long cmd);
-int	cap_fcntl_check_fde(struct filedescent *fde, int cmd);
-int	cap_fcntl_check(struct filedesc *fdp, int fd, int cmd);
-
-#else /* !_KERNEL */
-
-__BEGIN_DECLS
-/*
- * cap_enter(): Cause the process to enter capability mode, which will
- * prevent it from directly accessing global namespaces.  System calls will
- * be limited to process-local, process-inherited, or file descriptor
- * operations.  If already in capability mode, a no-op.
- */
-int	cap_enter(void);
-
-/*
- * Are we sandboxed (in capability mode)?
- * This is a libc wrapper around the cap_getmode(2) system call.
- */
-bool	cap_sandboxed(void);
-
-/*
- * cap_getmode(): Are we in capability mode?
- */
-int	cap_getmode(u_int *modep);
-
-/*
- * Limits capability rights for the given descriptor (CAP_*).
- */
-int cap_rights_limit(int fd, const cap_rights_t *rights);
-/*
- * Returns capability rights for the given descriptor.
- */
-#define	cap_rights_get(fd, rights)	__cap_rights_get(CAP_RIGHTS_VERSION, (fd), (rights))
-int __cap_rights_get(int version, int fd, cap_rights_t *rightsp);
-/*
- * Limits allowed ioctls for the given descriptor.
- */
-int cap_ioctls_limit(int fd, const unsigned long *cmds, size_t ncmds);
-/*
- * Returns array of allowed ioctls for the given descriptor.
- * If all ioctls are allowed, the cmds array is not populated and
- * the function returns CAP_IOCTLS_ALL.
- */
-ssize_t cap_ioctls_get(int fd, unsigned long *cmds, size_t maxcmds);
-/*
- * Limits allowed fcntls for the given descriptor (CAP_FCNTL_*).
- */
-int cap_fcntls_limit(int fd, uint32_t fcntlrights);
-/*
- * Returns bitmask of allowed fcntls for the given descriptor.
- */
-int cap_fcntls_get(int fd, uint32_t *fcntlrightsp);
-
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_CAPSICUM_H_ */
diff --git a/include.new/sys/cdefs.h b/include.new/sys/cdefs.h
deleted file mode 100644
index 4153df2..0000000
--- a/include.new/sys/cdefs.h
+++ /dev/null
@@ -1,748 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Berkeley Software Design, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/sys/cdefs.h 284948 2015-06-30 08:40:15Z tijl $
- */
-
-#ifndef	_SYS_CDEFS_H_
-#define	_SYS_CDEFS_H_
-
-/*
- * Testing against Clang-specific extensions.
- */
-
-#ifndef	__has_attribute
-#define	__has_attribute(x)	0
-#endif
-#ifndef	__has_extension
-#define	__has_extension		__has_feature
-#endif
-#ifndef	__has_feature
-#define	__has_feature(x)	0
-#endif
-#ifndef	__has_include
-#define	__has_include(x)	0
-#endif
-#ifndef	__has_builtin
-#define	__has_builtin(x)	0
-#endif
-
-#if defined(__cplusplus)
-#define	__BEGIN_DECLS	extern "C" {
-#define	__END_DECLS	}
-#else
-#define	__BEGIN_DECLS
-#define	__END_DECLS
-#endif
-
-/*
- * This code has been put in place to help reduce the addition of
- * compiler specific defines in FreeBSD code.  It helps to aid in
- * having a compiler-agnostic source tree.
- */
-
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-
-#if __GNUC__ >= 3 || defined(__INTEL_COMPILER)
-#define __GNUCLIKE_ASM 3
-#define __GNUCLIKE_MATH_BUILTIN_CONSTANTS
-#else
-#define __GNUCLIKE_ASM 2
-#endif
-#define __GNUCLIKE___TYPEOF 1
-#define __GNUCLIKE___OFFSETOF 1
-#define __GNUCLIKE___SECTION 1
-
-#ifndef __INTEL_COMPILER
-# define __GNUCLIKE_CTOR_SECTION_HANDLING 1
-#endif
-
-#define __GNUCLIKE_BUILTIN_CONSTANT_P 1
-# if defined(__INTEL_COMPILER) && defined(__cplusplus) \
-    && __INTEL_COMPILER < 800
-#  undef __GNUCLIKE_BUILTIN_CONSTANT_P
-# endif
-
-#if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3)
-# define __GNUCLIKE_BUILTIN_VARARGS 1
-# define __GNUCLIKE_BUILTIN_STDARG 1
-# define __GNUCLIKE_BUILTIN_VAALIST 1
-#endif
-
-#if defined(__GNUC__)
-# define __GNUC_VA_LIST_COMPATIBILITY 1
-#endif
-
-/*
- * Compiler memory barriers, specific to gcc and clang.
- */
-#if defined(__GNUC__)
-#define	__compiler_membar()	__asm __volatile(" " : : : "memory")
-#endif
-
-#ifndef __INTEL_COMPILER
-# define __GNUCLIKE_BUILTIN_NEXT_ARG 1
-# define __GNUCLIKE_MATH_BUILTIN_RELOPS
-#endif
-
-#define __GNUCLIKE_BUILTIN_MEMCPY 1
-
-/* XXX: if __GNUC__ >= 2: not tested everywhere originally, where replaced */
-#define __CC_SUPPORTS_INLINE 1
-#define __CC_SUPPORTS___INLINE 1
-#define __CC_SUPPORTS___INLINE__ 1
-
-#define __CC_SUPPORTS___FUNC__ 1
-#define __CC_SUPPORTS_WARNING 1
-
-#define __CC_SUPPORTS_VARADIC_XXX 1 /* see varargs.h */
-
-#define __CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1
-
-#endif /* __GNUC__ || __INTEL_COMPILER */
-
-/*
- * Macro to test if we're using a specific version of gcc or later.
- */
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-#define	__GNUC_PREREQ__(ma, mi)	\
-	(__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi))
-#else
-#define	__GNUC_PREREQ__(ma, mi)	0
-#endif
-
-/*
- * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
- * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
- * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI
- * mode -- there must be no spaces between its arguments, and for nested
- * __CONCAT's, all the __CONCAT's must be at the left.  __CONCAT can also
- * concatenate double-quoted strings produced by the __STRING macro, but
- * this only works with ANSI C.
- *
- * __XSTRING is like __STRING, but it expands any macros in its argument
- * first.  It is only available with ANSI C.
- */
-#if defined(__STDC__) || defined(__cplusplus)
-#define	__P(protos)	protos		/* full-blown ANSI C */
-#define	__CONCAT1(x,y)	x ## y
-#define	__CONCAT(x,y)	__CONCAT1(x,y)
-#define	__STRING(x)	#x		/* stringify without expanding x */
-#define	__XSTRING(x)	__STRING(x)	/* expand x, then stringify */
-
-#define	__const		const		/* define reserved names to standard */
-#define	__signed	signed
-#define	__volatile	volatile
-#if defined(__cplusplus)
-#define	__inline	inline		/* convert to C++ keyword */
-#else
-#if !(defined(__CC_SUPPORTS___INLINE))
-#define	__inline			/* delete GCC keyword */
-#endif /* ! __CC_SUPPORTS___INLINE */
-#endif /* !__cplusplus */
-
-#else	/* !(__STDC__ || __cplusplus) */
-#define	__P(protos)	()		/* traditional C preprocessor */
-#define	__CONCAT(x,y)	x/**/y
-#define	__STRING(x)	"x"
-
-#if !defined(__CC_SUPPORTS___INLINE)
-#define	__const				/* delete pseudo-ANSI C keywords */
-#define	__inline
-#define	__signed
-#define	__volatile
-/*
- * In non-ANSI C environments, new programs will want ANSI-only C keywords
- * deleted from the program and old programs will want them left alone.
- * When using a compiler other than gcc, programs using the ANSI C keywords
- * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
- * When using "gcc -traditional", we assume that this is the intent; if
- * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
- */
-#ifndef	NO_ANSI_KEYWORDS
-#define	const				/* delete ANSI C keywords */
-#define	inline
-#define	signed
-#define	volatile
-#endif	/* !NO_ANSI_KEYWORDS */
-#endif	/* !__CC_SUPPORTS___INLINE */
-#endif	/* !(__STDC__ || __cplusplus) */
-
-/*
- * Compiler-dependent macros to help declare dead (non-returning) and
- * pure (no side effects) functions, and unused variables.  They are
- * null except for versions of gcc that are known to support the features
- * properly (old versions of gcc-2 supported the dead and pure features
- * in a different (wrong) way).  If we do not provide an implementation
- * for a given compiler, let the compile fail if it is told to use
- * a feature that we cannot live without.
- */
-#ifdef lint
-#define	__dead2
-#define	__pure2
-#define	__unused
-#define	__packed
-#define	__aligned(x)
-#define	__section(x)
-#define	__weak_symbol
-#else
-#define	__weak_symbol	__attribute__((__weak__))
-#if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
-#define	__dead2
-#define	__pure2
-#define	__unused
-#endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7 && !defined(__INTEL_COMPILER)
-#define	__dead2		__attribute__((__noreturn__))
-#define	__pure2		__attribute__((__const__))
-#define	__unused
-/* XXX Find out what to do for __packed, __aligned and __section */
-#endif
-#if __GNUC_PREREQ__(2, 7)
-#define	__dead2		__attribute__((__noreturn__))
-#define	__pure2		__attribute__((__const__))
-#define	__unused	__attribute__((__unused__))
-#define	__used		__attribute__((__used__))
-#define	__packed	__attribute__((__packed__))
-#define	__aligned(x)	__attribute__((__aligned__(x)))
-#define	__section(x)	__attribute__((__section__(x)))
-#endif
-#if defined(__INTEL_COMPILER)
-#define __dead2		__attribute__((__noreturn__))
-#define __pure2		__attribute__((__const__))
-#define __unused	__attribute__((__unused__))
-#define __used		__attribute__((__used__))
-#define __packed	__attribute__((__packed__))
-#define __aligned(x)	__attribute__((__aligned__(x)))
-#define __section(x)	__attribute__((__section__(x)))
-#endif
-#endif /* lint */
-
-#if !__GNUC_PREREQ__(2, 95)
-#define	__alignof(x)	__offsetof(struct { char __a; x __b; }, __b)
-#endif
-
-/*
- * Keywords added in C11.
- */
-
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L || defined(lint)
-
-#if !__has_extension(c_alignas)
-#if (defined(__cplusplus) && __cplusplus >= 201103L) || \
-    __has_extension(cxx_alignas)
-#define	_Alignas(x)		alignas(x)
-#else
-/* XXX: Only emulates _Alignas(constant-expression); not _Alignas(type-name). */
-#define	_Alignas(x)		__aligned(x)
-#endif
-#endif
-
-#if defined(__cplusplus) && __cplusplus >= 201103L
-#define	_Alignof(x)		alignof(x)
-#else
-#define	_Alignof(x)		__alignof(x)
-#endif
-
-#if !__has_extension(c_atomic) && !__has_extension(cxx_atomic)
-/*
- * No native support for _Atomic(). Place object in structure to prevent
- * most forms of direct non-atomic access.
- */
-#define	_Atomic(T)		struct { T volatile __val; }
-#endif
-
-#if defined(__cplusplus) && __cplusplus >= 201103L
-#define	_Noreturn		[[noreturn]]
-#else
-#define	_Noreturn		__dead2
-#endif
-
-#if !__has_extension(c_static_assert)
-#if (defined(__cplusplus) && __cplusplus >= 201103L) || \
-    __has_extension(cxx_static_assert)
-#define	_Static_assert(x, y)	static_assert(x, y)
-#elif defined(__COUNTER__)
-#define	_Static_assert(x, y)	__Static_assert(x, __COUNTER__)
-#define	__Static_assert(x, y)	___Static_assert(x, y)
-#define	___Static_assert(x, y)	typedef char __assert_ ## y[(x) ? 1 : -1] \
-				__unused
-#else
-#define	_Static_assert(x, y)	struct __hack
-#endif
-#endif
-
-#if !__has_extension(c_thread_local)
-/* XXX: Change this to test against C++11 when clang in base supports it. */
-#if /* (defined(__cplusplus) && __cplusplus >= 201103L) || */ \
-    __has_extension(cxx_thread_local)
-#define	_Thread_local		thread_local
-#else
-#define	_Thread_local		__thread
-#endif
-#endif
-
-#endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */
-
-/*
- * Emulation of C11 _Generic().  Unlike the previously defined C11
- * keywords, it is not possible to implement this using exactly the same
- * syntax.  Therefore implement something similar under the name
- * __generic().  Unlike _Generic(), this macro can only distinguish
- * between a single type, so it requires nested invocations to
- * distinguish multiple cases.
- */
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-#define	__generic(expr, t, yes, no)					\
-	_Generic(expr, t: yes, default: no)
-#elif __GNUC_PREREQ__(3, 1) && !defined(__cplusplus)
-#define	__generic(expr, t, yes, no)					\
-	__builtin_choose_expr(						\
-	    __builtin_types_compatible_p(__typeof(expr), t), yes, no)
-#endif
-
-#if __GNUC_PREREQ__(2, 96)
-#define	__malloc_like	__attribute__((__malloc__))
-#define	__pure		__attribute__((__pure__))
-#else
-#define	__malloc_like
-#define	__pure
-#endif
-
-#if __GNUC_PREREQ__(3, 1) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
-#define	__always_inline	__attribute__((__always_inline__))
-#else
-#define	__always_inline
-#endif
-
-#if __GNUC_PREREQ__(3, 1)
-#define	__noinline	__attribute__ ((__noinline__))
-#else
-#define	__noinline
-#endif
-
-#if __GNUC_PREREQ__(3, 3)
-#define __nonnull(x)	__attribute__((__nonnull__(x)))
-#else
-#define __nonnull(x)
-#endif
-
-#if __GNUC_PREREQ__(3, 4)
-#define	__fastcall	__attribute__((__fastcall__))
-#define	__result_use_check	__attribute__((__warn_unused_result__))
-#else
-#define	__fastcall
-#define	__result_use_check
-#endif
-
-#if __GNUC_PREREQ__(4, 1)
-#define	__returns_twice	__attribute__((__returns_twice__))
-#else
-#define	__returns_twice
-#endif
-
-/* XXX: should use `#if __STDC_VERSION__ < 199901'. */
-#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
-#define	__func__	NULL
-#endif
-
-#if (defined(__INTEL_COMPILER) || (defined(__GNUC__) && __GNUC__ >= 2)) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
-#define	__LONG_LONG_SUPPORTED
-#endif
-
-/* C++11 exposes a load of C99 stuff */
-#if defined(__cplusplus) && __cplusplus >= 201103L
-#define	__LONG_LONG_SUPPORTED
-#ifndef	__STDC_LIMIT_MACROS
-#define	__STDC_LIMIT_MACROS
-#endif
-#ifndef	__STDC_CONSTANT_MACROS
-#define	__STDC_CONSTANT_MACROS
-#endif
-#endif
-
-/*
- * GCC 2.95 provides `__restrict' as an extension to C90 to support the
- * C99-specific `restrict' type qualifier.  We happen to use `__restrict' as
- * a way to define the `restrict' type qualifier without disturbing older
- * software that is unaware of C99 keywords.
- */
-#if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 || defined(lint)
-#define	__restrict
-#else
-#define	__restrict	restrict
-#endif
-#endif
-
-/*
- * GNU C version 2.96 adds explicit branch prediction so that
- * the CPU back-end can hint the processor and also so that
- * code blocks can be reordered such that the predicted path
- * sees a more linear flow, thus improving cache behavior, etc.
- *
- * The following two macros provide us with a way to utilize this
- * compiler feature.  Use __predict_true() if you expect the expression
- * to evaluate to true, and __predict_false() if you expect the
- * expression to evaluate to false.
- *
- * A few notes about usage:
- *
- *	* Generally, __predict_false() error condition checks (unless
- *	  you have some _strong_ reason to do otherwise, in which case
- *	  document it), and/or __predict_true() `no-error' condition
- *	  checks, assuming you want to optimize for the no-error case.
- *
- *	* Other than that, if you don't know the likelihood of a test
- *	  succeeding from empirical or other `hard' evidence, don't
- *	  make predictions.
- *
- *	* These are meant to be used in places that are run `a lot'.
- *	  It is wasteful to make predictions in code that is run
- *	  seldomly (e.g. at subsystem initialization time) as the
- *	  basic block reordering that this affects can often generate
- *	  larger code.
- */
-#if __GNUC_PREREQ__(2, 96)
-#define __predict_true(exp)     __builtin_expect((exp), 1)
-#define __predict_false(exp)    __builtin_expect((exp), 0)
-#else
-#define __predict_true(exp)     (exp)
-#define __predict_false(exp)    (exp)
-#endif
-
-#if __GNUC_PREREQ__(4, 0)
-#define	__hidden	__attribute__((__visibility__("hidden")))
-#define	__exported	__attribute__((__visibility__("default")))
-#else
-#define	__hidden
-#define	__exported
-#endif
-
-/*
- * We define this here since <stddef.h>, <sys/queue.h>, and <sys/types.h>
- * require it.
- */
-#if __GNUC_PREREQ__(4, 1)
-#define __offsetof(type, field)	 __builtin_offsetof(type, field)
-#else
-#ifndef __cplusplus
-#define	__offsetof(type, field) \
-	((__size_t)(__uintptr_t)((const volatile void *)&((type *)0)->field))
-#else
-#define __offsetof(type, field)					\
-  (__offsetof__ (reinterpret_cast <__size_t>			\
-                 (&reinterpret_cast <const volatile char &>	\
-                  (static_cast<type *> (0)->field))))
-#endif
-#endif
-#define	__rangeof(type, start, end) \
-	(__offsetof(type, end) - __offsetof(type, start))
-
-/*
- * Given the pointer x to the member m of the struct s, return
- * a pointer to the containing structure.  When using GCC, we first
- * assign pointer x to a local variable, to check that its type is
- * compatible with member m.
- */
-#if __GNUC_PREREQ__(3, 1)
-#define	__containerof(x, s, m) ({					\
-	const volatile __typeof(((s *)0)->m) *__x = (x);		\
-	__DEQUALIFY(s *, (const volatile char *)__x - __offsetof(s, m));\
-})
-#else
-#define	__containerof(x, s, m)						\
-	__DEQUALIFY(s *, (const volatile char *)(x) - __offsetof(s, m))
-#endif
-
-/*
- * Compiler-dependent macros to declare that functions take printf-like
- * or scanf-like arguments.  They are null except for versions of gcc
- * that are known to support the features properly (old versions of gcc-2
- * didn't permit keeping the keywords out of the application namespace).
- */
-#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
-#define	__printflike(fmtarg, firstvararg)
-#define	__scanflike(fmtarg, firstvararg)
-#define	__format_arg(fmtarg)
-#define	__strfmonlike(fmtarg, firstvararg)
-#define	__strftimelike(fmtarg, firstvararg)
-#else
-#define	__printflike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
-#define	__scanflike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__scanf__, fmtarg, firstvararg)))
-#define	__format_arg(fmtarg)	__attribute__((__format_arg__ (fmtarg)))
-#define	__strfmonlike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__strfmon__, fmtarg, firstvararg)))
-#define	__strftimelike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__strftime__, fmtarg, firstvararg)))
-#endif
-
-/* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
-#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 && \
-    defined(__GNUC__) && !defined(__INTEL_COMPILER)
-#define	__printf0like(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__printf0__, fmtarg, firstvararg)))
-#else
-#define	__printf0like(fmtarg, firstvararg)
-#endif
-
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-#ifndef __INTEL_COMPILER
-#define	__strong_reference(sym,aliassym)	\
-	extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)))
-#endif
-#ifdef __STDC__
-#define	__weak_reference(sym,alias)	\
-	__asm__(".weak " #alias);	\
-	__asm__(".equ "  #alias ", " #sym)
-#define	__warn_references(sym,msg)	\
-	__asm__(".section .gnu.warning." #sym);	\
-	__asm__(".asciz \"" msg "\"");	\
-	__asm__(".previous")
-#define	__sym_compat(sym,impl,verid)	\
-	__asm__(".symver " #impl ", " #sym "@" #verid)
-#define	__sym_default(sym,impl,verid)	\
-	__asm__(".symver " #impl ", " #sym "@@" #verid)
-#else
-#define	__weak_reference(sym,alias)	\
-	__asm__(".weak alias");		\
-	__asm__(".equ alias, sym")
-#define	__warn_references(sym,msg)	\
-	__asm__(".section .gnu.warning.sym"); \
-	__asm__(".asciz \"msg\"");	\
-	__asm__(".previous")
-#define	__sym_compat(sym,impl,verid)	\
-	__asm__(".symver impl, sym@verid")
-#define	__sym_default(impl,sym,verid)	\
-	__asm__(".symver impl, sym@@verid")
-#endif	/* __STDC__ */
-#endif	/* __GNUC__ || __INTEL_COMPILER */
-
-#define	__GLOBL1(sym)	__asm__(".globl " #sym)
-#define	__GLOBL(sym)	__GLOBL1(sym)
-
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-#define	__IDSTRING(name,string)	__asm__(".ident\t\"" string "\"")
-#else
-/*
- * The following definition might not work well if used in header files,
- * but it should be better than nothing.  If you want a "do nothing"
- * version, then it should generate some harmless declaration, such as:
- *    #define __IDSTRING(name,string)	struct __hack
- */
-#define	__IDSTRING(name,string)	static const char name[] __unused = string
-#endif
-
-/*
- * Embed the rcs id of a source file in the resulting library.  Note that in
- * more recent ELF binutils, we use .ident allowing the ID to be stripped.
- * Usage:
- *	__FBSDID("$FreeBSD: releng/10.2/sys/sys/cdefs.h 284948 2015-06-30 08:40:15Z tijl $");
- */
-#ifndef	__FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
-#define	__FBSDID(s)	__IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-#else
-#define	__FBSDID(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__RCSID
-#ifndef	NO__RCSID
-#define	__RCSID(s)	__IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-#else
-#define	__RCSID(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__RCSID_SOURCE
-#ifndef	NO__RCSID_SOURCE
-#define	__RCSID_SOURCE(s)	__IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s)
-#else
-#define	__RCSID_SOURCE(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__SCCSID
-#ifndef	NO__SCCSID
-#define	__SCCSID(s)	__IDSTRING(__CONCAT(__sccsid_,__LINE__),s)
-#else
-#define	__SCCSID(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__COPYRIGHT
-#ifndef	NO__COPYRIGHT
-#define	__COPYRIGHT(s)	__IDSTRING(__CONCAT(__copyright_,__LINE__),s)
-#else
-#define	__COPYRIGHT(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__DECONST
-#define	__DECONST(type, var)	((type)(__uintptr_t)(const void *)(var))
-#endif
-
-#ifndef	__DEVOLATILE
-#define	__DEVOLATILE(type, var)	((type)(__uintptr_t)(volatile void *)(var))
-#endif
-
-#ifndef	__DEQUALIFY
-#define	__DEQUALIFY(type, var)	((type)(__uintptr_t)(const volatile void *)(var))
-#endif
-
-/*-
- * The following definitions are an extension of the behavior originally
- * implemented in <sys/_posix.h>, but with a different level of granularity.
- * POSIX.1 requires that the macros we test be defined before any standard
- * header file is included.
- *
- * Here's a quick run-down of the versions:
- *  defined(_POSIX_SOURCE)		1003.1-1988
- *  _POSIX_C_SOURCE == 1		1003.1-1990
- *  _POSIX_C_SOURCE == 2		1003.2-1992 C Language Binding Option
- *  _POSIX_C_SOURCE == 199309		1003.1b-1993
- *  _POSIX_C_SOURCE == 199506		1003.1c-1995, 1003.1i-1995,
- *					and the omnibus ISO/IEC 9945-1: 1996
- *  _POSIX_C_SOURCE == 200112		1003.1-2001
- *  _POSIX_C_SOURCE == 200809		1003.1-2008
- *
- * In addition, the X/Open Portability Guide, which is now the Single UNIX
- * Specification, defines a feature-test macro which indicates the version of
- * that specification, and which subsumes _POSIX_C_SOURCE.
- *
- * Our macros begin with two underscores to avoid namespace screwage.
- */
-
-/* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1
-#undef _POSIX_C_SOURCE		/* Probably illegal, but beyond caring now. */
-#define	_POSIX_C_SOURCE		199009
-#endif
-
-/* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		199209
-#endif
-
-/* Deal with various X/Open Portability Guides and Single UNIX Spec. */
-#ifdef _XOPEN_SOURCE
-#if _XOPEN_SOURCE - 0 >= 700
-#define	__XSI_VISIBLE		700
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		200809
-#elif _XOPEN_SOURCE - 0 >= 600
-#define	__XSI_VISIBLE		600
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		200112
-#elif _XOPEN_SOURCE - 0 >= 500
-#define	__XSI_VISIBLE		500
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		199506
-#endif
-#endif
-
-/*
- * Deal with all versions of POSIX.  The ordering relative to the tests above is
- * important.
- */
-#if defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE)
-#define	_POSIX_C_SOURCE		198808
-#endif
-#ifdef _POSIX_C_SOURCE
-#if _POSIX_C_SOURCE >= 200809
-#define	__POSIX_VISIBLE		200809
-#define	__ISO_C_VISIBLE		1999
-#elif _POSIX_C_SOURCE >= 200112
-#define	__POSIX_VISIBLE		200112
-#define	__ISO_C_VISIBLE		1999
-#elif _POSIX_C_SOURCE >= 199506
-#define	__POSIX_VISIBLE		199506
-#define	__ISO_C_VISIBLE		1990
-#elif _POSIX_C_SOURCE >= 199309
-#define	__POSIX_VISIBLE		199309
-#define	__ISO_C_VISIBLE		1990
-#elif _POSIX_C_SOURCE >= 199209
-#define	__POSIX_VISIBLE		199209
-#define	__ISO_C_VISIBLE		1990
-#elif _POSIX_C_SOURCE >= 199009
-#define	__POSIX_VISIBLE		199009
-#define	__ISO_C_VISIBLE		1990
-#else
-#define	__POSIX_VISIBLE		198808
-#define	__ISO_C_VISIBLE		0
-#endif /* _POSIX_C_SOURCE */
-#else
-/*-
- * Deal with _ANSI_SOURCE:
- * If it is defined, and no other compilation environment is explicitly
- * requested, then define our internal feature-test macros to zero.  This
- * makes no difference to the preprocessor (undefined symbols in preprocessing
- * expressions are defined to have value zero), but makes it more convenient for
- * a test program to print out the values.
- *
- * If a program mistakenly defines _ANSI_SOURCE and some other macro such as
- * _POSIX_C_SOURCE, we will assume that it wants the broader compilation
- * environment (and in fact we will never get here).
- */
-#if defined(_ANSI_SOURCE)	/* Hide almost everything. */
-#define	__POSIX_VISIBLE		0
-#define	__XSI_VISIBLE		0
-#define	__BSD_VISIBLE		0
-#define	__ISO_C_VISIBLE		1990
-#elif defined(_C99_SOURCE)	/* Localism to specify strict C99 env. */
-#define	__POSIX_VISIBLE		0
-#define	__XSI_VISIBLE		0
-#define	__BSD_VISIBLE		0
-#define	__ISO_C_VISIBLE		1999
-#elif defined(_C11_SOURCE)	/* Localism to specify strict C11 env. */
-#define	__POSIX_VISIBLE		0
-#define	__XSI_VISIBLE		0
-#define	__BSD_VISIBLE		0
-#define	__ISO_C_VISIBLE		2011
-#else				/* Default environment: show everything. */
-#define	__POSIX_VISIBLE		200809
-#define	__XSI_VISIBLE		700
-#define	__BSD_VISIBLE		1
-#define	__ISO_C_VISIBLE		2011
-#endif
-#endif
-
-#if defined(__mips) || defined(__powerpc64__)
-#define __NO_TLS 1
-#endif
-
-#endif /* !_SYS_CDEFS_H_ */
diff --git a/include.new/sys/cdio.h b/include.new/sys/cdio.h
deleted file mode 100644
index 9ed72c4..0000000
--- a/include.new/sys/cdio.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * 16 Feb 93	Julian Elischer	(julian@dialix.oz.au)
- *
- * $FreeBSD: releng/10.2/sys/sys/cdio.h 141031 2005-01-30 08:12:37Z sobomax $
- */
-
-/*
-<1>	Fixed a conflict with ioctl usage.  There were two different
-	functions using code #25.  Made file formatting consistent.
-	Added two new ioctl codes: door closing and audio pitch playback.
-	Added a STEREO union called STEREO.
-	5-Mar-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
-
-<2>	Added a new ioctl that allows you to find out what capabilities
-	a drive has and what commands it will accept.  This allows a
-	user application to only offer controls (buttons, sliders, etc)
-	for functions that drive can actually do.   Things it can't do
-	can disappear or be greyed-out (like some other system).
-	If the driver doesn't respond to this call, well, handle it the
-	way you used to do it.
-	2-Apr-95  Frank Durda IV	bsdmail@nemesis.lonestar.org
-*/
-
-/* Shared between kernel & process */
-
-#ifndef	_SYS_CDIO_H_
-#define	_SYS_CDIO_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-union msf_lba {
-	struct {
-		unsigned char   unused;
-		unsigned char   minute;
-		unsigned char   second;
-		unsigned char   frame;
-	} msf;
-	int     lba;    /* network byte order */
-	u_char	addr[4];
-};
-
-struct cd_toc_entry {
-#if BYTE_ORDER == LITTLE_ENDIAN
-	u_int	:8;
-	u_int	control:4;
-	u_int	addr_type:4;
-#else
-	u_int	:8;
-	u_int	addr_type:4;
-	u_int	control:4;
-#endif
-	u_char  track;
-	u_int	:8;
-	union msf_lba  addr;
-};
-
-struct cd_sub_channel_header {
-	u_int	:8;
-	u_char	audio_status;
-#define CD_AS_AUDIO_INVALID        0x00
-#define CD_AS_PLAY_IN_PROGRESS     0x11
-#define CD_AS_PLAY_PAUSED          0x12
-#define CD_AS_PLAY_COMPLETED       0x13
-#define CD_AS_PLAY_ERROR           0x14
-#define CD_AS_NO_STATUS            0x15
-	u_char	data_len[2];
-};
-
-struct cd_sub_channel_position_data {
-	u_char	data_format;
-	u_int	control:4;
-	u_int	addr_type:4;
-	u_char	track_number;
-	u_char	index_number;
-	union msf_lba  absaddr;
-	union msf_lba  reladdr;
-};
-
-struct cd_sub_channel_media_catalog {
-        u_char  data_format;
-        u_int   :8;
-        u_int   :8;
-        u_int   :8;
-        u_int   :7;
-        u_int   mc_valid:1;
-        u_char  mc_number[15];
-};
-
-struct cd_sub_channel_track_info {
-        u_char  data_format;
-        u_int   :8;
-        u_char  track_number;
-        u_int   :8;
-        u_int   :7;
-        u_int   ti_valid:1;
-        u_char  ti_number[15];
-};
-
-struct cd_sub_channel_info {
-	struct cd_sub_channel_header header;
-	union {
-		struct cd_sub_channel_position_data position;
-		struct cd_sub_channel_media_catalog media_catalog;
-		struct cd_sub_channel_track_info track_info;
-	} what;
-};
-
-
-/***************************************************************\
-* Ioctls for the CD drive					*
-\***************************************************************/
-
-struct ioc_play_track {
-	u_char	start_track;
-	u_char	start_index;
-	u_char	end_track;
-	u_char	end_index;
-};
-#define	CDIOCPLAYTRACKS	_IOW('c',1,struct ioc_play_track)
-
-
-struct ioc_play_blocks {
-	int	blk;
-	int	len;
-};
-#define	CDIOCPLAYBLOCKS	_IOW('c',2,struct ioc_play_blocks)
-
-
-struct ioc_read_subchannel {
-	u_char address_format;
-#define CD_LBA_FORMAT	1
-#define CD_MSF_FORMAT	2
-	u_char data_format;
-#define CD_SUBQ_DATA		0
-#define CD_CURRENT_POSITION	1
-#define CD_MEDIA_CATALOG	2
-#define CD_TRACK_INFO		3
-	u_char track;
-	int	data_len;
-	struct  cd_sub_channel_info *data;
-};
-#define CDIOCREADSUBCHANNEL _IOWR('c', 3 , struct ioc_read_subchannel )
-
-
-struct ioc_toc_header {
-	u_short len;
-	u_char  starting_track;
-	u_char  ending_track;
-};
-#define CDIOREADTOCHEADER _IOR('c',4,struct ioc_toc_header)
-
-
-struct ioc_read_toc_entry {
-	u_char	address_format;
-	u_char	starting_track;
-	u_short	data_len;
-	struct  cd_toc_entry *data;
-};
-#define CDIOREADTOCENTRYS _IOWR('c',5,struct ioc_read_toc_entry)
-
-
-struct ioc_read_toc_single_entry {
-	u_char	address_format;
-	u_char	track;
-	struct  cd_toc_entry entry;
-};
-#define CDIOREADTOCENTRY _IOWR('c',6,struct ioc_read_toc_single_entry)
-
-
-struct ioc_patch {
-	u_char	patch[4];	/* one for each channel */
-};
-#define	CDIOCSETPATCH	_IOW('c',9,struct ioc_patch)
-
-
-struct ioc_vol {
-	u_char	vol[4];	/* one for each channel */
-};
-#define	CDIOCGETVOL	_IOR('c',10,struct ioc_vol)
-
-#define	CDIOCSETVOL	_IOW('c',11,struct ioc_vol)
-
-#define	CDIOCSETMONO	_IO('c',12)
-
-#define	CDIOCSETSTERIO	_IO('c',13)
-#define	CDIOCSETSTEREO	_IO('c',13)
-
-#define	CDIOCSETMUTE	_IO('c',14)
-
-#define	CDIOCSETLEFT	_IO('c',15)
-
-#define	CDIOCSETRIGHT	_IO('c',16)
-
-#define	CDIOCSETDEBUG	_IO('c',17)
-
-#define	CDIOCCLRDEBUG	_IO('c',18)
-
-#define	CDIOCPAUSE	_IO('c',19)
-
-#define	CDIOCRESUME	_IO('c',20)
-
-#define	CDIOCRESET	_IO('c',21)
-
-#define	CDIOCSTART	_IO('c',22)
-
-#define	CDIOCSTOP	_IO('c',23)
-
-#define	CDIOCEJECT	_IO('c',24)
-
-
-struct ioc_play_msf {
-	u_char	start_m;
-	u_char	start_s;
-	u_char	start_f;
-	u_char	end_m;
-	u_char	end_s;
-	u_char	end_f;
-};
-#define	CDIOCPLAYMSF	_IOW('c',25,struct ioc_play_msf)
-
-#define	CDIOCALLOW	_IO('c',26)
-
-#define	CDIOCPREVENT	_IO('c',27)
-
-				/*<1>For drives that support it, this*/
-				/*<1>causes the drive to close its door*/
-				/*<1>and make the media (if any) ready*/
-#define CDIOCCLOSE	_IO('c',28)	/*<1>*/
-
-
-struct ioc_pitch {		/*<1>For drives that support it, this*/
-				/*<1>call instructs the drive to play the*/
-	short	speed;		/*<1>audio at a faster or slower-than-normal*/
-};				/*<1>rate. -32767 to -1 is slower, 0==normal,*/
-				/*<1>and 1 to 32767 is faster.  LSB bits are*/
-				/*<1>discarded first by drives with less res.*/
-#define	CDIOCPITCH	_IOW('c',29,struct ioc_pitch)	/*<1>*/
-
-struct ioc_capability {			/*<2>*/
-	u_long	play_function;		/*<2>*/
-#define CDDOPLAYTRK	0x00000001	/*<2>Can Play tracks/index*/
-#define	CDDOPLAYMSF	0x00000002	/*<2>Can Play msf to msf*/
-#define	CDDOPLAYBLOCKS	0x00000004	/*<2>Can Play range of blocks*/
-#define	CDDOPAUSE	0x00000100	/*<2>Output can be paused*/
-#define	CDDORESUME	0x00000200	/*<2>Output can be resumed*/
-#define	CDDORESET	0x00000400	/*<2>Drive can be completely reset*/
-#define	CDDOSTART	0x00000800	/*<2>Audio can be started*/
-#define CDDOSTOP	0x00001000	/*<2>Audio can be stopped*/
-#define CDDOPITCH	0x00002000	/*<2>Audio pitch */
-
-	u_long	routing_function;	/*<2>*/
-#define CDREADVOLUME	0x00000001	/*<2>Volume settings can be read*/
-#define CDSETVOLUME	0x00000002	/*<2>Volume settings can be set*/
-#define	CDSETMONO	0x00000100	/*<2>Output can be set to mono*/
-#define CDSETSTEREO	0x00000200	/*<2>Output can be set to stereo (def)*/
-#define	CDSETLEFT	0x00000400	/*<2>Output can be set to left only*/
-#define	CDSETRIGHT	0x00000800	/*<2>Output can be set to right only*/
-#define	CDSETMUTE	0x00001000	/*<2>Output can be muted*/
-#define CDSETPATCH	0x00008000	/*<2>Direct routing control allowed*/
-
-	u_long	special_function;	/*<2>*/
-#define	CDDOEJECT	0x00000001	/*<2>The tray can be opened*/
-#define	CDDOCLOSE	0x00000002	/*<2>The tray can be closed*/
-#define	CDDOLOCK	0x00000004	/*<2>The tray can be locked*/
-#define CDREADHEADER	0x00000100	/*<2>Can read Table of Contents*/
-#define	CDREADENTRIES	0x00000200	/*<2>Can read TOC Entries*/
-#define	CDREADSUBQ	0x00000200	/*<2>Can read Subchannel info*/
-#define CDREADRW	0x00000400	/*<2>Can read subcodes R-W*/
-#define	CDHASDEBUG	0x00004000	/*<2>The tray has dynamic debugging*/
-};					/*<2>*/
-
-#define	CDIOCCAPABILITY	_IOR('c',30,struct ioc_capability)	/*<2>*/
-
-/*
- * Special version of CDIOCREADSUBCHANNEL which assumes that
- * ioc_read_subchannel->data points to the kernel memory. For
- * use in compatibility layers.
- */
-#define CDIOCREADSUBCHANNEL_SYSSPACE _IOWR('c', 31, struct ioc_read_subchannel)
-
-#endif /* !_SYS_CDIO_H_ */
diff --git a/include.new/sys/cdrio.h b/include.new/sys/cdrio.h
deleted file mode 100644
index f6664c3..0000000
--- a/include.new/sys/cdrio.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * Copyright (c) 2000,2001,2002 Søren Schmidt <sos@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,
- *    without modification, immediately at the beginning of the file.
- * 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 ``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 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: releng/10.2/sys/sys/cdrio.h 230132 2012-01-15 13:23:18Z uqs $
- */
-
-#ifndef	_SYS_CDRIO_H_
-#define	_SYS_CDRIO_H_
-
-#include <sys/ioccom.h>
-
-struct cdr_track {
-        int datablock_type;         	/* data type code */
-#define CDR_DB_RAW              0x0     /* 2352 bytes of raw data */
-#define CDR_DB_RAW_PQ           0x1     /* 2368 bytes raw data + P/Q subchan */
-#define CDR_DB_RAW_PW           0x2     /* 2448 bytes raw data + P-W subchan */
-#define CDR_DB_RAW_PW_R         0x3     /* 2448 bytes raw data + P-W raw sub */
-#define CDR_DB_RES_4            0x4     /* reserved */
-#define CDR_DB_RES_5            0x5     /* reserved */
-#define CDR_DB_RES_6            0x6     /* reserved */
-#define CDR_DB_VS_7             0x7     /* vendor specific */
-#define CDR_DB_ROM_MODE1        0x8     /* 2048 bytes Mode 1 (ISO/IEC 10149) */
-#define CDR_DB_ROM_MODE2        0x9     /* 2336 bytes Mode 2 (ISO/IEC 10149) */
-#define CDR_DB_XA_MODE1         0xa     /* 2048 bytes Mode 1 (CD-ROM XA 1) */
-#define CDR_DB_XA_MODE2_F1      0xb     /* 2056 bytes Mode 2 (CD-ROM XA 1) */
-#define CDR_DB_XA_MODE2_F2      0xc     /* 2324 bytes Mode 2 (CD-ROM XA 2) */
-#define CDR_DB_XA_MODE2_MIX     0xd     /* 2332 bytes Mode 2 (CD-ROM XA 1/2) */
-#define CDR_DB_RES_14           0xe     /* reserved */
-#define CDR_DB_VS_15            0xf     /* vendor specific */
-
-	int preemp;			/* preemphasis if audio track*/
-	int test_write;			/* use test writes, laser turned off */
-};
-
-struct cdr_cue_entry {
-	u_int8_t adr:4;
-    	u_int8_t ctl:4;
-	u_int8_t track;
-	u_int8_t index;
-	u_int8_t dataform;
-	u_int8_t scms;
-	u_int8_t min;
-	u_int8_t sec;
-	u_int8_t frame;
-};
-
-struct cdr_cuesheet {
-    	int32_t len;
-	struct cdr_cue_entry *entries;
-	int session_format;
-#define CDR_SESS_CDROM          0x00
-#define CDR_SESS_CDI            0x10
-#define CDR_SESS_CDROM_XA       0x20
-
-	int session_type;
-#define CDR_SESS_NONE           0x00
-#define CDR_SESS_FINAL          0x01
-#define CDR_SESS_RESERVED       0x02
-#define CDR_SESS_MULTI          0x03
-
-	int test_write;
-};
-
-struct cdr_format_capacity {
-	uint32_t blocks;
-	uint32_t reserved:2;
-	uint32_t type:6;
-	uint32_t param:24;
-};
-
-struct cdr_format_capacities {
-	u_int8_t reserved1[3];
-	u_int8_t length;
-	uint32_t blocks;
-	uint32_t type:2;
-	uint32_t reserved2:6;
-	uint32_t block_size:24;
-	struct cdr_format_capacity format[32];
-};
-
-struct cdr_format_params {
-	u_int8_t reserved;
-	u_int8_t vs:1;
-	u_int8_t immed:1;
-	u_int8_t try_out:1;
-	u_int8_t ip:1;
-	u_int8_t stpf:1;
-	u_int8_t dcrt:1;
-	u_int8_t dpry:1;
-	u_int8_t fov:1;
-	u_int16_t length;
-	struct cdr_format_capacity format;
-};
-
-#define CDRIOCBLANK		_IOW('c', 100, int)
-#define CDR_B_ALL		0x0
-#define CDR_B_MIN		0x1
-#define CDR_B_SESSION		0x6
-
-#define CDRIOCNEXTWRITEABLEADDR	_IOR('c', 101, int)
-#define CDRIOCINITWRITER	_IOW('c', 102, int)
-#define CDRIOCINITTRACK		_IOW('c', 103, struct cdr_track)
-#define CDRIOCSENDCUE		_IOW('c', 104, struct cdr_cuesheet)
-#define CDRIOCFLUSH		_IO('c', 105)
-#define CDRIOCFIXATE		_IOW('c', 106, int)
-#define CDRIOCREADSPEED		_IOW('c', 107, int)
-#define CDRIOCWRITESPEED	_IOW('c', 108, int)
-#define CDR_MAX_SPEED		0xffff
-#define CDRIOCGETBLOCKSIZE	_IOR('c', 109, int)
-#define CDRIOCSETBLOCKSIZE	_IOW('c', 110, int)
-#define CDRIOCGETPROGRESS	_IOR('c', 111, int)
-#define CDRIOCREADFORMATCAPS	_IOR('c', 112, struct cdr_format_capacities)
-#define CDRIOCFORMAT		_IOW('c', 113, struct cdr_format_params)
-
-#endif /* !_SYS_CDRIO_H_ */
diff --git a/include.new/sys/cfictl.h b/include.new/sys/cfictl.h
deleted file mode 100644
index cece0b3..0000000
--- a/include.new/sys/cfictl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2007, Juniper Networks, Inc.
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/cfictl.h 188156 2009-02-05 18:12:07Z sam $
- */
-
-#ifndef _SYS_CFICTL_H_
-#define _SYS_CFICTL_H_
-
-/*
- * Allow reading of the CFI query structure.
- */
-
-struct cfiocqry {
-	unsigned long	offset;
-	unsigned long	count;
-	u_char		*buffer;
-};
-
-#define	CFIOCQRY	_IOWR('q', 0, struct cfiocqry)
-
-/* Intel StrataFlash Protection Register support */
-#define	CFIOCGFACTORYPR	_IOR('q', 1, uint64_t)	/* get factory protection reg */
-#define	CFIOCGOEMPR	_IOR('q', 2, uint64_t)	/* get oem protection reg */
-#define	CFIOCSOEMPR	_IOW('q', 3, uint64_t)	/* set oem protection reg */
-#define	CFIOCGPLR	_IOR('q', 4, uint32_t)	/* get protection lock reg */
-#define	CFIOCSPLR	_IO('q', 5)		/* set protection log reg */
-#endif	/* _SYS_CFICTL_H_ */
diff --git a/include.new/sys/chio.h b/include.new/sys/chio.h
deleted file mode 100644
index 12d87f6..0000000
--- a/include.new/sys/chio.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
- * 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 acknowledgements:
- *	This product includes software developed by Jason R. Thorpe
- *	for And Communications, http://www.and.com/
- * 4. 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 ``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 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: releng/10.2/sys/sys/chio.h 249658 2013-04-19 20:03:51Z ken $
- */
-
-#ifndef	_SYS_CHIO_H_
-#define	_SYS_CHIO_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/*
- * Element types.  Used as "to" and "from" type indicators in move
- * and exchange operations.
- *
- * Note that code in sys/scsi/ch.c relies on these values (uses them
- * as offsets in an array, and other evil), so don't muck with them
- * unless you know what you're doing.
- */
-#define CHET_MT		0	/* medium transport (picker) */
-#define CHET_ST		1	/* storage transport (slot) */
-#define CHET_IE		2	/* import/export (portal) */
-#define CHET_DT		3	/* data transfer (drive) */
-#define CHET_MAX	CHET_DT
-
-/*
- * Maximum length of a volume identification string
- */
-#define CH_VOLTAG_MAXLEN	32
-
-/*
- * Structure used to execute a MOVE MEDIUM command.
- */
-struct changer_move {
-	u_int16_t	cm_fromtype;	/* element type to move from */
-	u_int16_t	cm_fromunit;	/* logical unit of from element */
-	u_int16_t	cm_totype;	/* element type to move to */
-	u_int16_t	cm_tounit;	/* logical unit of to element */
-	u_int16_t	cm_flags;	/* misc. flags */
-};
-
-/* cm_flags */
-#define CM_INVERT	0x01	/* invert media */
-
-/*
- * Structure used to execute an EXCHANGE MEDIUM command.  In an
- * exchange operation, the following steps occur:
- *
- *	- media from source is moved to first destination.
- *
- *	- media previously occupying first destination is moved
- *	  to the second destination.
- *
- * The second destination may or may not be the same as the source.
- * In the case of a simple exchange, the source and second destination
- * are the same.
- */
-struct changer_exchange {
-	u_int16_t	ce_srctype;	/* element type of source */
-	u_int16_t	ce_srcunit;	/* logical unit of source */
-	u_int16_t	ce_fdsttype;	/* element type of first destination */
-	u_int16_t	ce_fdstunit;	/* logical unit of first destination */
-	u_int16_t	ce_sdsttype;	/* element type of second destination */
-	u_int16_t	ce_sdstunit;	/* logical unit of second destination */
-	u_int16_t	ce_flags;	/* misc. flags */
-};
-
-/* ce_flags */
-#define CE_INVERT1	0x01	/* invert media 1 */
-#define CE_INVERT2	0x02	/* invert media 2 */
-
-/*
- * Structure used to execute a POSITION TO ELEMENT command.  This
- * moves the current picker in front of the specified element.
- */
-struct changer_position {
-	u_int16_t	cp_type;	/* element type */
-	u_int16_t	cp_unit;	/* logical unit of element */
-	u_int16_t	cp_flags;	/* misc. flags */
-};
-
-/* cp_flags */
-#define CP_INVERT	0x01	/* invert picker */
-
-/*
- * Data returned by CHIOGPARAMS.
- */
-struct changer_params {
-	u_int16_t	cp_npickers;	/* number of pickers */
-	u_int16_t	cp_nslots;	/* number of slots */
-	u_int16_t	cp_nportals;	/* number of import/export portals */
-	u_int16_t	cp_ndrives;	/* number of drives */
-};
-
-/*
- * Command used to get element status.
- */
-
-struct changer_voltag {
-	u_char		cv_volid[CH_VOLTAG_MAXLEN+1];
-	u_int16_t	cv_serial;
-};
-
-typedef struct changer_voltag changer_voltag_t;
-
-/*
- * Flags definitions for ces_status
- * Not all flags have meaning for all element types.
- */
-typedef enum {
-	CES_STATUS_FULL	  = 0x001,	/* element is full */
-	CES_STATUS_IMPEXP = 0x002,	/* media deposited by operator */
-	CES_STATUS_EXCEPT = 0x004,	/* element in abnormal state */
-	CES_PICKER_MASK	  = 0x005,	/* flags valid for pickers */
-	CES_STATUS_ACCESS = 0x008,	/* media accessible by picker */
-	CES_SLOT_MASK	  = 0x00c,	/* flags valid for slots */
-	CES_DRIVE_MASK	  = 0x00c,	/* flags valid for drives */
-	CES_STATUS_EXENAB = 0x010,	/* element supports exporting */
-	CES_STATUS_INENAB = 0x020,	/* element supports importing */
-	CES_PORTAL_MASK	  = 0x03f,	/* flags valid for portals */
-	CES_INVERT	  = 0x040,	/* invert bit */
-	CES_SOURCE_VALID  = 0x080,	/* source address (ces_source) valid */
-	CES_SCSIID_VALID  = 0x100,	/* ces_scsi_id is valid */
-	CES_LUN_VALID	  = 0x200,	/* ces_scsi_lun is valid */
-	CES_PIV		  = 0x400	/* ces_protocol_id is valid */
-} ces_status_flags;
-
-struct changer_element_status {
-	u_int8_t		ces_type;	  /* element type */
-	u_int16_t		ces_addr;	  /* logical element address */
-	u_int16_t		ces_int_addr;	  /* changer element address */
-	ces_status_flags	ces_flags;	  /* 
-						   * see CESTATUS definitions
-						   * below 
-						   */ 
-	u_int8_t		ces_sensecode;	  /* 
-						   * additional sense
-						   * code for element */
-	u_int8_t		ces_sensequal;	  /*
-						   * additional sense
-						   * code qualifier 
-						   */
-	u_int8_t		ces_source_type;  /* 
-						   * element type of
-						   * source address 
-						   */
-	u_int16_t		ces_source_addr;  /* 
-						   * source address of medium
-						   */
-	changer_voltag_t     	ces_pvoltag;	  /* primary volume tag */
-	changer_voltag_t	ces_avoltag;	  /* alternate volume tag */
-	u_int8_t		ces_scsi_id;	  /* SCSI id of element */
-	u_int8_t		ces_scsi_lun;	  /* SCSI lun of element */
-
-	/*
-	 * Data members for SMC3 and later versions
-	 */
-	u_int8_t		ces_medium_type;
-#define	CES_MEDIUM_TYPE_UNKNOWN		0	/* Medium type unspecified */
-#define	CES_MEDIUM_TYPE_DATA		1	/* Data medium */
-#define	CES_MEDIUM_TYPE_CLEANING	2	/* Cleaning medium */
-#define	CES_MEDIUM_TYPE_DIAGNOSTIC	3	/* Diagnostic medium */
-#define	CES_MEDIUM_TYPE_WORM		4	/* WORM medium */
-#define	CES_MEDIUM_TYPE_MICROCODE	5	/* Microcode image medium */
-
-	u_int8_t		ces_protocol_id;
-#define	CES_PROTOCOL_ID_FCP_4	0	/* Fiber channel */
-#define	CES_PROTOCOL_ID_SPI_5	1	/* Parallel SCSI */
-#define	CES_PROTOCOL_ID_SSA_S3P	2	/* SSA */
-#define	CES_PROTOCOL_ID_SBP_3	3	/* IEEE 1394 */
-#define	CES_PROTOCOL_ID_SRP	4	/* SCSI Remote DMA */
-#define	CES_PROTOCOL_ID_ISCSI	5	/* iSCSI */
-#define	CES_PROTOCOL_ID_SPL	6	/* SAS */
-#define	CES_PROTOCOL_ID_ADT_2	7	/* Automation/Drive Interface */
-#define	CES_PROTOCOL_ID_ACS_2	8	/* ATA */
-
-	u_int8_t		ces_assoc;
-#define	CES_ASSOC_LOGICAL_UNIT	0
-#define	CES_ASSOC_TARGET_PORT	1
-#define	CES_ASSOC_TARGET_DEVICE	2
-
-	u_int8_t		ces_designator_type;
-#define	CES_DESIGNATOR_TYPE_VENDOR_SPECIFIC	0
-#define	CES_DESIGNATOR_TYPE_T10_VENDOR_ID	1
-#define	CES_DESIGNATOR_TYPE_EUI_64		2
-#define	CES_DESIGNATOR_TYPE_NAA			3
-#define	CES_DESIGNATOR_TYPE_TARGET_PORT_ID	4
-#define	CES_DESIGNATOR_TYPE_TARGET_PORT_GRP	5
-#define	CES_DESIGNATOR_TYPE_LOGICAL_UNIT_GRP	6
-#define	CES_DESIGNATOR_TYPE_MD5_LOGICAL_UNIT_ID	7
-#define	CES_DESIGNATOR_TYPE_SCSI_NAME_STRING	8
-
-	u_int8_t		ces_code_set;
-#define	CES_CODE_SET_RESERVED	0
-#define	CES_CODE_SET_BINARY	1
-#define	CES_CODE_SET_ASCII	2
-#define	CES_CODE_SET_UTF_8	3
-
-	u_int8_t		ces_designator_length;
-
-#define	CES_MAX_DESIGNATOR_LENGTH (1 << 8)
-	u_int8_t		ces_designator[CES_MAX_DESIGNATOR_LENGTH + 1];
-};
-
-struct changer_element_status_request {
-	u_int16_t			cesr_element_type;
-	u_int16_t			cesr_element_base;
-	u_int16_t			cesr_element_count;
-
-	u_int16_t			cesr_flags;
-#define	CESR_VOLTAGS	0x01
-
-	struct changer_element_status	*cesr_element_status;
-};
-
-
-struct changer_set_voltag_request {
-	u_int16_t		csvr_type;
-	u_int16_t		csvr_addr;
-
-	u_int16_t		csvr_flags;
-#define	CSVR_MODE_MASK		0x0f	/* mode mask, acceptable modes below: */
-#define	CSVR_MODE_SET		0x00	/* set volume tag if not set */
-#define	CSVR_MODE_REPLACE	0x01	/* unconditionally replace volume tag */
-#define	CSVR_MODE_CLEAR		0x02	/* clear volume tag */
-
-#define	CSVR_ALTERNATE		0x10	/* set to work with alternate voltag */
-
-	changer_voltag_t     	csvr_voltag;
-};
-
-
-#define	CESTATUS_BITS	\
-	"\20\6INEAB\5EXENAB\4ACCESS\3EXCEPT\2IMPEXP\1FULL"
-
-#define	CHIOMOVE	_IOW('c', 0x01, struct changer_move)
-#define	CHIOEXCHANGE	_IOW('c', 0x02, struct changer_exchange)
-#define	CHIOPOSITION	_IOW('c', 0x03, struct changer_position)
-#define	CHIOGPICKER	_IOR('c', 0x04, int)
-#define	CHIOSPICKER	_IOW('c', 0x05, int)
-#define	CHIOGPARAMS	_IOR('c', 0x06, struct changer_params)
-#define	CHIOIELEM	_IOW('c', 0x07, uint32_t)
-#define	OCHIOGSTATUS	_IOW('c', 0x08, struct changer_element_status_request)
-#define	CHIOSETVOLTAG	_IOW('c', 0x09, struct changer_set_voltag_request)
-#define	CHIOGSTATUS	_IOW('c', 0x0A, struct changer_element_status_request)
-
-#endif /* !_SYS_CHIO_H_ */
diff --git a/include.new/sys/clist.h b/include.new/sys/clist.h
deleted file mode 100644
index cda18a5..0000000
--- a/include.new/sys/clist.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- *
- *	@(#)clist.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/sys/sys/clist.h,v 1.11 2004/04/07 04:19:49 imp Exp $
- */
-
-#ifndef _SYS_CLIST_H_
-#define _SYS_CLIST_H_
-
-struct cblock {
-	struct cblock *c_next;			/* next cblock in queue */
-	unsigned char c_quote[CBQSIZE];		/* quoted characters */
-	unsigned char c_info[CBSIZE];		/* characters */
-};
-
-#ifdef _KERNEL
-extern	struct cblock *cfree;
-extern	int cfreecount;
-#endif
-
-#endif
diff --git a/include.new/sys/clock.h b/include.new/sys/clock.h
deleted file mode 100644
index 8b883e6..0000000
--- a/include.new/sys/clock.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Gordon W. Ross
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- *	$NetBSD: clock_subr.h,v 1.7 2000/10/03 13:41:07 tsutsui Exp $
- *
- *
- * This file is the central clearing-house for calendrical issues.
- *
- * In general the kernel does not know about minutes, hours, days, timezones,
- * daylight savings time, leap-years and such.  All that is theoretically a
- * matter for userland only.
- *
- * Parts of kernel code does however care: badly designed filesystems store
- * timestamps in local time and RTC chips sometimes track time in a local
- * timezone instead of UTC and so on.
- *
- * All that code should go here for service.
- *
- * $FreeBSD: releng/10.2/sys/sys/clock.h 204646 2010-03-03 17:55:51Z joel $
- */
-
-#ifndef _SYS_CLOCK_H_
-#define _SYS_CLOCK_H_
-
-#ifdef _KERNEL		/* No user serviceable parts */
-
-/*
- * Timezone info from settimeofday(2), usually not used
- */
-extern int tz_minuteswest;
-extern int tz_dsttime;
-
-int utc_offset(void);
-
-/*
- * Structure to hold the values typically reported by time-of-day clocks.
- * This can be passed to the generic conversion functions to be converted
- * to a struct timespec.
- */
-struct clocktime {
-	int	year;			/* year (4 digit year) */
-	int	mon;			/* month (1 - 12) */
-	int	day;			/* day (1 - 31) */
-	int	hour;			/* hour (0 - 23) */
-	int	min;			/* minute (0 - 59) */
-	int	sec;			/* second (0 - 59) */
-	int	dow;			/* day of week (0 - 6; 0 = Sunday) */
-	long	nsec;			/* nano seconds */
-};
-
-int clock_ct_to_ts(struct clocktime *, struct timespec *);
-void clock_ts_to_ct(struct timespec *, struct clocktime *);
-void clock_register(device_t, long);
-
-/*
- * BCD to decimal and decimal to BCD.
- */
-#define	FROMBCD(x)	bcd2bin(x)
-#define	TOBCD(x)	bin2bcd(x)
-
-/* Some handy constants. */
-#define SECDAY		(24 * 60 * 60)
-#define SECYR		(SECDAY * 365)
-
-/* Traditional POSIX base year */
-#define	POSIX_BASE_YEAR	1970
-
-void timespec2fattime(struct timespec *tsp, int utc, u_int16_t *ddp, u_int16_t *dtp, u_int8_t *dhp);
-void fattime2timespec(unsigned dd, unsigned dt, unsigned dh, int utc, struct timespec *tsp);
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_CLOCK_H_ */
diff --git a/include.new/sys/condvar.h b/include.new/sys/condvar.h
deleted file mode 100644
index cc09413..0000000
--- a/include.new/sys/condvar.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 2000 Jake Burkholder <jake@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.
- *
- * 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: releng/10.2/sys/sys/condvar.h 247785 2013-03-04 12:20:48Z davide $
- */
-
-#ifndef	_SYS_CONDVAR_H_
-#define	_SYS_CONDVAR_H_
-
-#ifndef	LOCORE
-#include <sys/queue.h>
-
-struct lock_object;
-struct thread;
-
-TAILQ_HEAD(cv_waitq, thread);
-
-/*
- * Condition variable.  The waiters count is protected by the mutex that
- * protects the condition; that is, the mutex that is passed to cv_wait*()
- * and is held across calls to cv_signal() and cv_broadcast().  It is an
- * optimization to avoid looking up the sleep queue if there are no waiters.
- */
-struct cv {
-	const char	*cv_description;
-	int		cv_waiters;
-};
-
-#ifdef _KERNEL
-void	cv_init(struct cv *cvp, const char *desc);
-void	cv_destroy(struct cv *cvp);
-
-void	_cv_wait(struct cv *cvp, struct lock_object *lock);
-void	_cv_wait_unlock(struct cv *cvp, struct lock_object *lock);
-int	_cv_wait_sig(struct cv *cvp, struct lock_object *lock);
-int	_cv_timedwait_sbt(struct cv *cvp, struct lock_object *lock,
-	    sbintime_t sbt, sbintime_t pr, int flags);
-int	_cv_timedwait_sig_sbt(struct cv *cvp, struct lock_object *lock,
-	    sbintime_t sbt, sbintime_t pr, int flags);
-
-void	cv_signal(struct cv *cvp);
-void	cv_broadcastpri(struct cv *cvp, int pri);
-
-#define	cv_wait(cvp, lock)						\
-	_cv_wait((cvp), &(lock)->lock_object)
-#define	cv_wait_unlock(cvp, lock)					\
-	_cv_wait_unlock((cvp), &(lock)->lock_object)
-#define	cv_wait_sig(cvp, lock)						\
-	_cv_wait_sig((cvp), &(lock)->lock_object)
-#define	cv_timedwait(cvp, lock, timo)					\
-	_cv_timedwait_sbt((cvp), &(lock)->lock_object,			\
-	    tick_sbt * (timo), 0, C_HARDCLOCK)
-#define	cv_timedwait_sbt(cvp, lock, sbt, pr, flags)			\
-	_cv_timedwait_sbt((cvp), &(lock)->lock_object, (sbt), (pr), (flags))
-#define	cv_timedwait_sig(cvp, lock, timo)				\
-	_cv_timedwait_sig_sbt((cvp), &(lock)->lock_object,		\
-	    tick_sbt * (timo), 0, C_HARDCLOCK)
-#define	cv_timedwait_sig_sbt(cvp, lock, sbt, pr, flags)			\
-	_cv_timedwait_sig_sbt((cvp), &(lock)->lock_object, (sbt), (pr), (flags))
-
-#define cv_broadcast(cvp)	cv_broadcastpri(cvp, 0)
-
-#define	cv_wmesg(cvp)		((cvp)->cv_description)
-
-#endif	/* _KERNEL */
-#endif	/* !LOCORE */
-#endif	/* _SYS_CONDVAR_H_ */
diff --git a/include.new/sys/conf.h b/include.new/sys/conf.h
deleted file mode 100644
index 3d9ebf7..0000000
--- a/include.new/sys/conf.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 2000
- *	Poul-Henning Kamp.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/sys/conf.h 278283 2015-02-05 20:49:13Z hselasky $
- */
-
-#ifndef _SYS_CONF_H_
-#define	_SYS_CONF_H_
-
-#ifdef _KERNEL
-#include <sys/eventhandler.h>
-#else
-#include <sys/queue.h>
-#endif
-
-struct snapdata;
-struct devfs_dirent;
-struct cdevsw;
-struct file;
-
-struct cdev {
-	void		*si_spare0;
-	u_int		si_flags;
-#define	SI_ETERNAL	0x0001	/* never destroyed */
-#define	SI_ALIAS	0x0002	/* carrier of alias name */
-#define	SI_NAMED	0x0004	/* make_dev{_alias} has been called */
-#define	SI_CHEAPCLONE	0x0008	/* can be removed_dev'ed when vnode reclaims */
-#define	SI_CHILD	0x0010	/* child of another struct cdev **/
-#define	SI_DUMPDEV	0x0080	/* is kernel dumpdev */
-#define	SI_CLONELIST	0x0200	/* on a clone list */
-#define	SI_UNMAPPED	0x0400	/* can handle unmapped I/O */
-#define	SI_NOSPLIT	0x0800	/* I/O should not be split up */
-	struct timespec	si_atime;
-	struct timespec	si_ctime;
-	struct timespec	si_mtime;
-	uid_t		si_uid;
-	gid_t		si_gid;
-	mode_t		si_mode;
-	struct ucred	*si_cred;	/* cached clone-time credential */
-	int		si_drv0;
-	int		si_refcount;
-	LIST_ENTRY(cdev)	si_list;
-	LIST_ENTRY(cdev)	si_clone;
-	LIST_HEAD(, cdev)	si_children;
-	LIST_ENTRY(cdev)	si_siblings;
-	struct cdev *si_parent;
-	struct mount	*si_mountpt;
-	void		*si_drv1, *si_drv2;
-	struct cdevsw	*si_devsw;
-	int		si_iosize_max;	/* maximum I/O size (for physio &al) */
-	u_long		si_usecount;
-	u_long		si_threadcount;
-	union {
-		struct snapdata *__sid_snapdata;
-	} __si_u;
-	char		si_name[SPECNAMELEN + 1];
-};
-
-#define	si_snapdata	__si_u.__sid_snapdata
-
-#ifdef _KERNEL
-
-/*
- * Definitions of device driver entry switches
- */
-
-struct bio;
-struct buf;
-struct thread;
-struct uio;
-struct knote;
-struct clonedevs;
-struct vm_object;
-struct vnode;
-
-/*
- * Note: d_thread_t is provided as a transition aid for those drivers
- * that treat struct proc/struct thread as an opaque data type and
- * exist in substantially the same form in both 4.x and 5.x.  Writers
- * of drivers that dips into the d_thread_t structure should use
- * struct thread or struct proc as appropriate for the version of the
- * OS they are using.  It is provided in lieu of each device driver
- * inventing its own way of doing this.  While it does violate style(9)
- * in a number of ways, this violation is deemed to be less
- * important than the benefits that a uniform API between releases
- * gives.
- *
- * Users of struct thread/struct proc that aren't device drivers should
- * not use d_thread_t.
- */
-
-typedef struct thread d_thread_t;
-
-typedef int d_open_t(struct cdev *dev, int oflags, int devtype, struct thread *td);
-typedef int d_fdopen_t(struct cdev *dev, int oflags, struct thread *td, struct file *fp);
-typedef int d_close_t(struct cdev *dev, int fflag, int devtype, struct thread *td);
-typedef void d_strategy_t(struct bio *bp);
-typedef int d_ioctl_t(struct cdev *dev, u_long cmd, caddr_t data,
-		      int fflag, struct thread *td);
-
-typedef int d_read_t(struct cdev *dev, struct uio *uio, int ioflag);
-typedef int d_write_t(struct cdev *dev, struct uio *uio, int ioflag);
-typedef int d_poll_t(struct cdev *dev, int events, struct thread *td);
-typedef int d_kqfilter_t(struct cdev *dev, struct knote *kn);
-typedef int d_mmap_t(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr,
-		     int nprot, vm_memattr_t *memattr);
-typedef int d_mmap_single_t(struct cdev *cdev, vm_ooffset_t *offset,
-    vm_size_t size, struct vm_object **object, int nprot);
-typedef void d_purge_t(struct cdev *dev);
-
-typedef int dumper_t(
-	void *_priv,		/* Private to the driver. */
-	void *_virtual,		/* Virtual (mapped) address. */
-	vm_offset_t _physical,	/* Physical address of virtual. */
-	off_t _offset,		/* Byte-offset to write at. */
-	size_t _length);	/* Number of bytes to dump. */
-
-#endif /* _KERNEL */
-
-/*
- * Types for d_flags.
- */
-#define	D_TAPE	0x0001
-#define	D_DISK	0x0002
-#define	D_TTY	0x0004
-#define	D_MEM	0x0008
-
-#ifdef _KERNEL
-
-#define	D_TYPEMASK	0xffff
-
-/*
- * Flags for d_flags which the drivers can set.
- */
-#define	D_TRACKCLOSE	0x00080000	/* track all closes */
-#define	D_MMAP_ANON	0x00100000	/* special treatment in vm_mmap.c */
-#define	D_NEEDGIANT	0x00400000	/* driver want Giant */
-#define	D_NEEDMINOR	0x00800000	/* driver uses clone_create() */
-
-/*
- * Version numbers.
- */
-#define	D_VERSION_00	0x20011966
-#define	D_VERSION_01	0x17032005	/* Add d_uid,gid,mode & kind */
-#define	D_VERSION_02	0x28042009	/* Add d_mmap_single */
-#define	D_VERSION_03	0x17122009	/* d_mmap takes memattr,vm_ooffset_t */
-#define	D_VERSION	D_VERSION_03
-
-/*
- * Flags used for internal housekeeping
- */
-#define	D_INIT		0x80000000	/* cdevsw initialized */
-
-/*
- * Character device switch table
- */
-struct cdevsw {
-	int			d_version;
-	u_int			d_flags;
-	const char		*d_name;
-	d_open_t		*d_open;
-	d_fdopen_t		*d_fdopen;
-	d_close_t		*d_close;
-	d_read_t		*d_read;
-	d_write_t		*d_write;
-	d_ioctl_t		*d_ioctl;
-	d_poll_t		*d_poll;
-	d_mmap_t		*d_mmap;
-	d_strategy_t		*d_strategy;
-	dumper_t		*d_dump;
-	d_kqfilter_t		*d_kqfilter;
-	d_purge_t		*d_purge;
-	d_mmap_single_t		*d_mmap_single;
-
-	int32_t			d_spare0[3];
-	void			*d_spare1[3];
-
-	/* These fields should not be messed with by drivers */
-	LIST_HEAD(, cdev)	d_devs;
-	int			d_spare2;
-	union {
-		struct cdevsw		*gianttrick;
-		SLIST_ENTRY(cdevsw)	postfree_list;
-	} __d_giant;
-};
-#define	d_gianttrick		__d_giant.gianttrick
-#define	d_postfree_list		__d_giant.postfree_list
-
-struct module;
-
-struct devsw_module_data {
-	int	(*chainevh)(struct module *, int, void *); /* next handler */
-	void	*chainarg;	/* arg for next event handler */
-	/* Do not initialize fields hereafter */
-};
-
-#define	DEV_MODULE_ORDERED(name, evh, arg, ord)				\
-static moduledata_t name##_mod = {					\
-    #name,								\
-    evh,								\
-    arg									\
-};									\
-DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, ord)
-
-#define	DEV_MODULE(name, evh, arg)					\
-    DEV_MODULE_ORDERED(name, evh, arg, SI_ORDER_MIDDLE)
-
-void clone_setup(struct clonedevs **cdp);
-void clone_cleanup(struct clonedevs **);
-#define	CLONE_UNITMASK	0xfffff
-#define	CLONE_FLAG0	(CLONE_UNITMASK + 1)
-int clone_create(struct clonedevs **, struct cdevsw *, int *unit, struct cdev **dev, int extra);
-
-int	count_dev(struct cdev *_dev);
-void	delist_dev(struct cdev *_dev);
-void	destroy_dev(struct cdev *_dev);
-int	destroy_dev_sched(struct cdev *dev);
-int	destroy_dev_sched_cb(struct cdev *dev, void (*cb)(void *), void *arg);
-void	destroy_dev_drain(struct cdevsw *csw);
-void	drain_dev_clone_events(void);
-struct cdevsw *dev_refthread(struct cdev *_dev, int *_ref);
-struct cdevsw *devvn_refthread(struct vnode *vp, struct cdev **devp, int *_ref);
-void	dev_relthread(struct cdev *_dev, int _ref);
-void	dev_depends(struct cdev *_pdev, struct cdev *_cdev);
-void	dev_ref(struct cdev *dev);
-void	dev_refl(struct cdev *dev);
-void	dev_rel(struct cdev *dev);
-void	dev_strategy(struct cdev *dev, struct buf *bp);
-void	dev_strategy_csw(struct cdev *dev, struct cdevsw *csw, struct buf *bp);
-struct cdev *make_dev(struct cdevsw *_devsw, int _unit, uid_t _uid, gid_t _gid,
-		int _perms, const char *_fmt, ...) __printflike(6, 7);
-struct cdev *make_dev_cred(struct cdevsw *_devsw, int _unit,
-		struct ucred *_cr, uid_t _uid, gid_t _gid, int _perms,
-		const char *_fmt, ...) __printflike(7, 8);
-#define	MAKEDEV_REF		0x01
-#define	MAKEDEV_WHTOUT		0x02
-#define	MAKEDEV_NOWAIT		0x04
-#define	MAKEDEV_WAITOK		0x08
-#define	MAKEDEV_ETERNAL		0x10
-#define	MAKEDEV_CHECKNAME	0x20
-struct cdev *make_dev_credf(int _flags,
-		struct cdevsw *_devsw, int _unit,
-		struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
-		const char *_fmt, ...) __printflike(8, 9);
-int	make_dev_p(int _flags, struct cdev **_cdev, struct cdevsw *_devsw,
-		struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
-		const char *_fmt, ...) __printflike(8, 9);
-struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...)
-		__printflike(2, 3);
-int	make_dev_alias_p(int _flags, struct cdev **_cdev, struct cdev *_pdev,
-		const char *_fmt, ...) __printflike(4, 5);
-int	make_dev_physpath_alias(int _flags, struct cdev **_cdev,
-		struct cdev *_pdev, struct cdev *_old_alias,
-		const char *_physpath);
-void	dev_lock(void);
-void	dev_unlock(void);
-void	setconf(void);
-
-#ifdef KLD_MODULE
-#define	MAKEDEV_ETERNAL_KLD	0
-#else
-#define	MAKEDEV_ETERNAL_KLD	MAKEDEV_ETERNAL
-#endif
-
-#define	dev2unit(d)	((d)->si_drv0)
-
-typedef	void (*cdevpriv_dtr_t)(void *data);
-int	devfs_get_cdevpriv(void **datap);
-int	devfs_set_cdevpriv(void *priv, cdevpriv_dtr_t dtr);
-void	devfs_clear_cdevpriv(void);
-void	devfs_fpdrop(struct file *fp);	/* XXX This is not public KPI */
-
-ino_t	devfs_alloc_cdp_inode(void);
-void	devfs_free_cdp_inode(ino_t ino);
-
-#define		UID_ROOT	0
-#define		UID_BIN		3
-#define		UID_UUCP	66
-#define		UID_NOBODY	65534
-
-#define		GID_WHEEL	0
-#define		GID_KMEM	2
-#define		GID_TTY		4
-#define		GID_OPERATOR	5
-#define		GID_BIN		7
-#define		GID_GAMES	13
-#define		GID_DIALER	68
-#define		GID_NOBODY	65534
-
-typedef void (*dev_clone_fn)(void *arg, struct ucred *cred, char *name,
-	    int namelen, struct cdev **result);
-
-int dev_stdclone(char *_name, char **_namep, const char *_stem, int *_unit);
-EVENTHANDLER_DECLARE(dev_clone, dev_clone_fn);
-
-/* Stuff relating to kernel-dump */
-
-struct dumperinfo {
-	dumper_t *dumper;	/* Dumping function. */
-	void    *priv;		/* Private parts. */
-	u_int   blocksize;	/* Size of block in bytes. */
-	u_int	maxiosize;	/* Max size allowed for an individual I/O */
-	off_t   mediaoffset;	/* Initial offset in bytes. */
-	off_t   mediasize;	/* Space available in bytes. */
-};
-
-int set_dumper(struct dumperinfo *, const char *_devname);
-int dump_write(struct dumperinfo *, void *, vm_offset_t, off_t, size_t);
-void dumpsys(struct dumperinfo *);
-int doadump(boolean_t);
-extern int dumping;		/* system is dumping */
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_CONF_H_ */
diff --git a/include.new/sys/cons.h b/include.new/sys/cons.h
deleted file mode 100644
index 3114d33..0000000
--- a/include.new/sys/cons.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * 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.
- * 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.
- *
- *	from: @(#)cons.h	7.2 (Berkeley) 5/9/91
- * $FreeBSD: releng/10.2/sys/sys/cons.h 270988 2014-09-02 22:01:14Z emaste $
- */
-
-#ifndef _MACHINE_CONS_H_
-#define	_MACHINE_CONS_H_
-
-struct consdev;
-struct tty;
-
-typedef	void	cn_probe_t(struct consdev *);
-typedef	void	cn_init_t(struct consdev *);
-typedef	void	cn_term_t(struct consdev *);
-typedef	void	cn_grab_t(struct consdev *);
-typedef	void	cn_ungrab_t(struct consdev *);
-typedef	int	cn_getc_t(struct consdev *);
-typedef	void	cn_putc_t(struct consdev *, int);
-
-struct consdev_ops {
-	cn_probe_t	*cn_probe;
-				/* probe hardware and fill in consdev info */
-	cn_init_t	*cn_init;
-				/* turn on as console */
-	cn_term_t	*cn_term;
-				/* turn off as console */
-	cn_getc_t	*cn_getc;
-				/* kernel getchar interface */
-	cn_putc_t	*cn_putc;
-				/* kernel putchar interface */
-	cn_grab_t	*cn_grab;
-				/* grab console for exclusive kernel use */
-	cn_ungrab_t	*cn_ungrab;
-				/* ungrab console */
-};
-
-struct consdev {
-	const struct consdev_ops *cn_ops;
-				/* console device operations. */
-	short	cn_pri;		/* pecking order; the higher the better */
-	void	*cn_arg;	/* drivers method argument */
-	int	cn_flags;	/* capabilities of this console */
-	char	cn_name[SPECNAMELEN + 1];	/* console (device) name */
-};
-
-/* values for cn_pri - reflect our policy for console selection */
-#define	CN_DEAD		0	/* device doesn't exist */
-#define CN_LOW		1	/* device is a last restort only */
-#define CN_NORMAL	2	/* device exists but is nothing special */
-#define CN_INTERNAL	3	/* "internal" bit-mapped display */
-#define CN_REMOTE	4	/* serial interface with remote bit set */
-
-/* Values for cn_flags. */
-#define	CN_FLAG_NODEBUG	0x00000001	/* Not supported with debugger. */
-#define	CN_FLAG_NOAVAIL	0x00000002	/* Temporarily not available. */
-
-/* Visibility of characters in cngets() */
-#define	GETS_NOECHO	0	/* Disable echoing of characters. */
-#define	GETS_ECHO	1	/* Enable echoing of characters. */
-#define	GETS_ECHOPASS	2	/* Print a * for every character. */
-
-#ifdef _KERNEL
-
-extern	struct msgbuf consmsgbuf; /* Message buffer for constty. */
-extern	struct tty *constty;	/* Temporary virtual console. */
-
-#define	CONSOLE_DEVICE(name, ops, arg)					\
-	static struct consdev name = {					\
-		.cn_ops = &ops,						\
-		.cn_arg = (arg),					\
-	};								\
-	DATA_SET(cons_set, name)
-
-#define	CONSOLE_DRIVER(name)						\
-	static const struct consdev_ops name##_consdev_ops = {		\
-		.cn_probe = name##_cnprobe,				\
-		.cn_init = name##_cninit,				\
-		.cn_term = name##_cnterm,				\
-		.cn_getc = name##_cngetc,				\
-		.cn_putc = name##_cnputc,				\
-		.cn_grab = name##_cngrab,				\
-		.cn_ungrab = name##_cnungrab,				\
-	};								\
-	CONSOLE_DEVICE(name##_consdev, name##_consdev_ops, NULL)
-
-/* Other kernel entry points. */
-void	cninit(void);
-void	cninit_finish(void);
-int	cnadd(struct consdev *);
-void	cnavailable(struct consdev *, int);
-void	cnremove(struct consdev *);
-void	cnselect(struct consdev *);
-void	cngrab(void);
-void	cnungrab(void);
-int	cncheckc(void);
-int	cngetc(void);
-void	cngets(char *, size_t, int);
-void	cnputc(int);
-void	cnputs(char *);
-int	cnunavailable(void);
-void	constty_set(struct tty *tp);
-void	constty_clear(void);
-
-/* sc(4) / vt(4) coexistence shim */
-#define	VTY_SC 0x01
-#define	VTY_VT 0x02
-int	vty_enabled(unsigned int);
-void	vty_set_preferred(unsigned int);
-
-#endif /* _KERNEL */
-
-#endif /* !_MACHINE_CONS_H_ */
diff --git a/include.new/sys/consio.h b/include.new/sys/consio.h
deleted file mode 100644
index 64a0591..0000000
--- a/include.new/sys/consio.h
+++ /dev/null
@@ -1,465 +0,0 @@
-/*-
- * Copyright (c) 1991-1996 Søren Schmidt
- * 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
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/sys/consio.h 273921 2014-10-31 23:10:58Z dumbbell $
- */
-
-#ifndef	_SYS_CONSIO_H_
-#define	_SYS_CONSIO_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/*
- * Console ioctl commands.  Some commands are named as KDXXXX, GIO_XXX, and
- * PIO_XXX, rather than CONS_XXX, for historical and compatibility reasons.
- * Some other CONS_XXX commands are works as wrapper around frame buffer 
- * ioctl commands FBIO_XXX.  Do not try to change all these commands, 
- * otherwise we shall have compatibility problems.
- */
-
-/* get/set video mode */
-#define KD_TEXT		0		/* set text mode restore fonts  */
-#define KD_TEXT0	0		/* ditto			*/
-#define KD_GRAPHICS	1		/* set graphics mode 		*/
-#define KD_TEXT1	2		/* set text mode !restore fonts */
-#define KD_PIXEL	3		/* set pixel mode		*/
-#define KDGETMODE	_IOR('K', 9, int)
-#define KDSETMODE	_IOWINT('K', 10)
-
-/* set border color */
-#define KDSBORDER	_IOWINT('K', 13)
-
-/* set up raster(pixel) text mode */
-struct _scr_size {
-	int		scr_size[3];
-};
-typedef struct _scr_size	scr_size_t;
-
-#define KDRASTER	_IOW('K', 100, scr_size_t)
-
-/* get/set screen char map */
-struct _scrmap {
-	char		scrmap[256];
-};
-typedef struct _scrmap	scrmap_t;
-
-#define GIO_SCRNMAP	_IOR('k', 2, scrmap_t)
-#define PIO_SCRNMAP	_IOW('k', 3, scrmap_t)
-
-/* get the current text attribute */
-#define GIO_ATTR	_IOR('a', 0, int)
-
-/* get the current text color */
-#define GIO_COLOR	_IOR('c', 0, int)
-
-/* get the adapter type (equivalent to FBIO_ADPTYPE) */
-#define CONS_CURRENT	_IOR('c', 1, int)
-
-/* get the current video mode (equivalent to FBIO_GETMODE) */
-#define CONS_GET	_IOR('c', 2, int)
-
-/* not supported? */
-#define CONS_IO		_IO('c', 3)
-
-/* set blank time interval */
-#define CONS_BLANKTIME	_IOW('c', 4, int)
-
-/* set/get the screen saver (these ioctls are current noop) */
-struct ssaver	{
-#define MAXSSAVER	16
-	char		name[MAXSSAVER];
-	int		num;
-	long		time;
-};
-typedef struct ssaver	ssaver_t;
-
-#define CONS_SSAVER	_IOW('c', 5, ssaver_t)
-#define CONS_GSAVER	_IOWR('c', 6, ssaver_t)
-
-/* set the text cursor type (obsolete, see CONS_CURSORSHAPE below) */
-/*
-#define CONS_BLINK_CURSOR (1 << 0)
-#define CONS_CHAR_CURSOR (1 << 1)
-*/
-#define CONS_CURSORTYPE	_IOW('c', 7, int)
-
-/* set the bell type to audible or visual */
-#define CONS_VISUAL_BELL (1 << 0)
-#define CONS_QUIET_BELL	(1 << 1)
-#define CONS_BELLTYPE	_IOW('c', 8, int)
-
-/* set the history (scroll back) buffer size (in lines) */
-#define CONS_HISTORY	_IOW('c', 9, int)
-
-/* clear the history (scroll back) buffer */
-#define CONS_CLRHIST	_IO('c', 10)
-
-/* mouse cursor ioctl */
-struct mouse_data {
-	int		x;
-	int 		y;
-	int 		z;
-	int 		buttons;
-};
-typedef struct mouse_data mouse_data_t;
-
-struct mouse_mode {
-	int		mode;
-	int		signal;
-};
-typedef struct mouse_mode mouse_mode_t;
-
-struct mouse_event {
-	int		id;			/* one based */
-	int		value;
-};
-typedef struct mouse_event mouse_event_t;
-
-struct mouse_info {
-	int		operation;
-#define MOUSE_SHOW	0x01
-#define MOUSE_HIDE	0x02
-#define MOUSE_MOVEABS	0x03
-#define MOUSE_MOVEREL	0x04
-#define MOUSE_GETINFO	0x05
-#define MOUSE_MODE	0x06
-#define MOUSE_ACTION	0x07
-#define MOUSE_MOTION_EVENT	0x08
-#define MOUSE_BUTTON_EVENT	0x09
-#define MOUSE_MOUSECHAR	0x0a
-	union {
-		mouse_data_t	data;
-		mouse_mode_t	mode;
-		mouse_event_t	event;
-		int		mouse_char;
-	}		u;
-};
-typedef struct mouse_info mouse_info_t;
-
-#define CONS_MOUSECTL	_IOWR('c', 10, mouse_info_t)
-
-/* see if the vty has been idle */
-#define CONS_IDLE	_IOR('c', 11, int)
-
-/* set the screen saver mode */
-#define CONS_NO_SAVER	(-1)
-#define CONS_LKM_SAVER	0
-#define CONS_USR_SAVER	1
-#define CONS_SAVERMODE	_IOW('c', 12, int)
-
-/* start the screen saver */
-#define CONS_SAVERSTART	_IOW('c', 13, int)
-
-/* set the text cursor shape (see also CONS_CURSORTYPE above) */
-#define CONS_BLINK_CURSOR	(1 << 0)
-#define CONS_CHAR_CURSOR	(1 << 1)
-#define CONS_HIDDEN_CURSOR	(1 << 2)
-#define CONS_CURSOR_ATTRS	(CONS_BLINK_CURSOR | CONS_CHAR_CURSOR |	\
-				 CONS_HIDDEN_CURSOR)
-#define CONS_RESET_CURSOR	(1 << 30)
-#define CONS_LOCAL_CURSOR	(1U << 31)
-#define CONS_CURSOR_FLAGS	(CONS_RESET_CURSOR | CONS_LOCAL_CURSOR)
-struct cshape {
-	/* shape[0]: flags, shape[1]: base, shape[2]: height */
-	int		shape[3];
-};
-#define CONS_GETCURSORSHAPE _IOWR('c', 14, struct cshape)
-#define CONS_SETCURSORSHAPE _IOW('c', 15, struct cshape)
-
-/* set/get font data */
-struct fnt8 {
-	char		fnt8x8[8*256];
-};
-typedef struct fnt8	fnt8_t;
-
-struct fnt14 {
-	char		fnt8x14[14*256];
-};
-typedef struct fnt14	fnt14_t;
-
-struct fnt16 {
-	char		fnt8x16[16*256];
-};
-typedef struct fnt16	fnt16_t;
-
-struct vfnt_map {
-	uint32_t	src;
-	uint16_t	dst;
-	uint16_t	len;
-};
-typedef struct vfnt_map	vfnt_map_t;
-
-#define VFNT_MAP_NORMAL		0
-#define VFNT_MAP_NORMAL_RIGHT	1
-#define VFNT_MAP_BOLD		2
-#define VFNT_MAP_BOLD_RIGHT	3
-#define VFNT_MAPS		4
-struct vfnt {
-	vfnt_map_t	*map[VFNT_MAPS];
-	uint8_t		*glyphs;
-	unsigned int	map_count[VFNT_MAPS];
-	unsigned int	glyph_count;
-	unsigned int	width;
-	unsigned int	height;
-};
-typedef struct vfnt	vfnt_t;
-
-#define PIO_FONT8x8	_IOW('c', 64, fnt8_t)
-#define GIO_FONT8x8	_IOR('c', 65, fnt8_t)
-#define PIO_FONT8x14	_IOW('c', 66, fnt14_t)
-#define GIO_FONT8x14	_IOR('c', 67, fnt14_t)
-#define PIO_FONT8x16	_IOW('c', 68, fnt16_t)
-#define GIO_FONT8x16	_IOR('c', 69, fnt16_t)
-#define PIO_VFONT	_IOW('c', 70, vfnt_t)
-#define GIO_VFONT	_IOR('c', 71, vfnt_t)
-#define PIO_VFONT_DEFAULT _IO('c', 72)
-
-/* get video mode information */
-struct colors	{
-	char		fore;
-	char		back;
-};
-
-struct vid_info {
-	short		size;
-	short		m_num;
-	u_short		font_size;
-	u_short		mv_row, mv_col;
-	u_short		mv_rsz, mv_csz;
-	u_short		mv_hsz;
-	struct colors	mv_norm,
-			mv_rev,
-			mv_grfc;
-	u_char		mv_ovscan;
-	u_char		mk_keylock;
-};
-typedef struct vid_info vid_info_t;
-
-#define CONS_GETINFO    _IOWR('c', 73, vid_info_t)
-
-/* get version */
-#define CONS_GETVERS	_IOR('c', 74, int)
-
-/* get the video adapter index (equivalent to FBIO_ADAPTER) */
-#define CONS_CURRENTADP	_IOR('c', 100, int)
-
-/* get the video adapter information (equivalent to FBIO_ADPINFO) */
-#define CONS_ADPINFO	_IOWR('c', 101, video_adapter_info_t)
-
-/* get the video mode information (equivalent to FBIO_MODEINFO) */
-#define CONS_MODEINFO	_IOWR('c', 102, video_info_t)
-
-/* find a video mode (equivalent to FBIO_FINDMODE) */
-#define CONS_FINDMODE	_IOWR('c', 103, video_info_t)
-
-/* set the frame buffer window origin (equivalent to FBIO_SETWINORG) */
-#define CONS_SETWINORG	_IOWINT('c', 104)
-
-/* use the specified keyboard */
-#define CONS_SETKBD	_IOWINT('c', 110)
-
-/* release the current keyboard */
-#define CONS_RELKBD	_IO('c', 111)
-
-struct scrshot {
-	int		x;
-	int		y;
-	int		xsize;
-	int		ysize;
-	u_int16_t*	buf;
-};
-typedef struct scrshot scrshot_t;
-
-/* Snapshot the current video buffer */
-#define CONS_SCRSHOT	_IOWR('c', 105, scrshot_t)
-
-/* get/set the current terminal emulator info. */
-#define TI_NAME_LEN	32
-#define TI_DESC_LEN	64
-
-struct term_info {
-	int		ti_index;
-	int		ti_flags;
-	u_char		ti_name[TI_NAME_LEN];
-	u_char		ti_desc[TI_DESC_LEN];
-};
-typedef struct term_info term_info_t;
-
-#define CONS_GETTERM	_IOWR('c', 112, term_info_t)
-#define CONS_SETTERM	_IOW('c', 113, term_info_t)
-
-/*
- * Vty switching ioctl commands.
- */
-
-/* get the next available vty */
-#define VT_OPENQRY	_IOR('v', 1, int)
-
-/* set/get vty switching mode */
-#ifndef _VT_MODE_DECLARED
-#define	_VT_MODE_DECLARED
-struct vt_mode {
-	char		mode;
-#define VT_AUTO		0		/* switching is automatic 	*/
-#define VT_PROCESS	1		/* switching controlled by prog */
-#define VT_KERNEL	255		/* switching controlled in kernel */
-	char		waitv;		/* not implemented yet 	SOS	*/
-	short		relsig;
-	short		acqsig;
-	short		frsig;		/* not implemented yet	SOS	*/
-};
-typedef struct vt_mode vtmode_t;
-#endif /* !_VT_MODE_DECLARED */
-
-#define VT_SETMODE	_IOW('v', 2, vtmode_t)
-#define VT_GETMODE	_IOR('v', 3, vtmode_t)
-
-/* acknowledge release or acquisition of a vty */
-#define VT_FALSE	0
-#define VT_TRUE		1
-#define VT_ACKACQ	2
-#define VT_RELDISP	_IOWINT('v', 4)
-
-/* activate the specified vty */
-#define VT_ACTIVATE	_IOWINT('v', 5)
-
-/* wait until the specified vty is activate */
-#define VT_WAITACTIVE	_IOWINT('v', 6)
-
-/* get the currently active vty */
-#define VT_GETACTIVE	_IOR('v', 7, int)
-
-/* get the index of the vty */
-#define VT_GETINDEX	_IOR('v', 8, int)
-
-/* prevent switching vtys */
-#define VT_LOCKSWITCH	_IOW('v', 9, int)
-
-/*
- * Video mode switching ioctl.  See sys/fbio.h for mode numbers.
- */
-
-#define SW_B40x25 	_IO('S', M_B40x25)
-#define SW_C40x25  	_IO('S', M_C40x25)
-#define SW_B80x25  	_IO('S', M_B80x25)
-#define SW_C80x25  	_IO('S', M_C80x25)
-#define SW_BG320   	_IO('S', M_BG320)
-#define SW_CG320   	_IO('S', M_CG320)
-#define SW_BG640   	_IO('S', M_BG640)
-#define SW_EGAMONO80x25 _IO('S', M_EGAMONO80x25)
-#define SW_CG320_D    	_IO('S', M_CG320_D)
-#define SW_CG640_E    	_IO('S', M_CG640_E)
-#define SW_EGAMONOAPA 	_IO('S', M_EGAMONOAPA)
-#define SW_CG640x350  	_IO('S', M_CG640x350)
-#define SW_ENH_MONOAPA2 _IO('S', M_ENHMONOAPA2)
-#define SW_ENH_CG640  	_IO('S', M_ENH_CG640)
-#define SW_ENH_B40x25  	_IO('S', M_ENH_B40x25)
-#define SW_ENH_C40x25  	_IO('S', M_ENH_C40x25)
-#define SW_ENH_B80x25  	_IO('S', M_ENH_B80x25)
-#define SW_ENH_C80x25  	_IO('S', M_ENH_C80x25)
-#define SW_ENH_B80x43  	_IO('S', M_ENH_B80x43)
-#define SW_ENH_C80x43  	_IO('S', M_ENH_C80x43)
-#define SW_MCAMODE    	_IO('S', M_MCA_MODE)
-#define SW_VGA_C40x25	_IO('S', M_VGA_C40x25)
-#define SW_VGA_C80x25	_IO('S', M_VGA_C80x25)
-#define SW_VGA_C80x30	_IO('S', M_VGA_C80x30)
-#define SW_VGA_C80x50	_IO('S', M_VGA_C80x50)
-#define SW_VGA_C80x60	_IO('S', M_VGA_C80x60)
-#define SW_VGA_M80x25	_IO('S', M_VGA_M80x25)
-#define SW_VGA_M80x30	_IO('S', M_VGA_M80x30)
-#define SW_VGA_M80x50	_IO('S', M_VGA_M80x50)
-#define SW_VGA_M80x60	_IO('S', M_VGA_M80x60)
-#define SW_VGA11	_IO('S', M_VGA11)
-#define SW_BG640x480	_IO('S', M_VGA11)
-#define SW_VGA12	_IO('S', M_VGA12)
-#define SW_CG640x480	_IO('S', M_VGA12)
-#define SW_VGA13	_IO('S', M_VGA13)
-#define SW_VGA_CG320	_IO('S', M_VGA13)
-#define SW_VGA_CG640	_IO('S', M_VGA_CG640)
-#define SW_VGA_MODEX	_IO('S', M_VGA_MODEX)
-
-#define SW_PC98_80x25		_IO('S', M_PC98_80x25)
-#define SW_PC98_80x30		_IO('S', M_PC98_80x30)
-#define SW_PC98_EGC640x400	_IO('S', M_PC98_EGC640x400)
-#define SW_PC98_PEGC640x400	_IO('S', M_PC98_PEGC640x400)
-#define SW_PC98_PEGC640x480	_IO('S', M_PC98_PEGC640x480)
-
-#define SW_VGA_C90x25	_IO('S', M_VGA_C90x25)
-#define SW_VGA_M90x25	_IO('S', M_VGA_M90x25)
-#define SW_VGA_C90x30	_IO('S', M_VGA_C90x30)
-#define SW_VGA_M90x30	_IO('S', M_VGA_M90x30)
-#define SW_VGA_C90x43	_IO('S', M_VGA_C90x43)
-#define SW_VGA_M90x43	_IO('S', M_VGA_M90x43)
-#define SW_VGA_C90x50	_IO('S', M_VGA_C90x50)
-#define SW_VGA_M90x50	_IO('S', M_VGA_M90x50)
-#define SW_VGA_C90x60	_IO('S', M_VGA_C90x60)
-#define SW_VGA_M90x60	_IO('S', M_VGA_M90x60)
-
-#define SW_TEXT_80x25	_IO('S', M_TEXT_80x25)
-#define SW_TEXT_80x30	_IO('S', M_TEXT_80x30)
-#define SW_TEXT_80x43	_IO('S', M_TEXT_80x43)
-#define SW_TEXT_80x50	_IO('S', M_TEXT_80x50)
-#define SW_TEXT_80x60	_IO('S', M_TEXT_80x60)
-#define SW_TEXT_132x25	_IO('S', M_TEXT_132x25)
-#define SW_TEXT_132x30	_IO('S', M_TEXT_132x30)
-#define SW_TEXT_132x43	_IO('S', M_TEXT_132x43)
-#define SW_TEXT_132x50	_IO('S', M_TEXT_132x50)
-#define SW_TEXT_132x60	_IO('S', M_TEXT_132x60)
-
-#define SW_VESA_CG640x400	_IO('V', M_VESA_CG640x400 - M_VESA_BASE)
-#define SW_VESA_CG640x480	_IO('V', M_VESA_CG640x480 - M_VESA_BASE)
-#define SW_VESA_800x600		_IO('V', M_VESA_800x600 - M_VESA_BASE)
-#define SW_VESA_CG800x600	_IO('V', M_VESA_CG800x600 - M_VESA_BASE)
-#define SW_VESA_1024x768	_IO('V', M_VESA_1024x768 - M_VESA_BASE)
-#define SW_VESA_CG1024x768	_IO('V', M_VESA_CG1024x768 - M_VESA_BASE)
-#define SW_VESA_1280x1024	_IO('V', M_VESA_1280x1024 - M_VESA_BASE)
-#define SW_VESA_CG1280x1024	_IO('V', M_VESA_CG1280x1024 - M_VESA_BASE)
-#define SW_VESA_C80x60		_IO('V', M_VESA_C80x60 - M_VESA_BASE)
-#define SW_VESA_C132x25		_IO('V', M_VESA_C132x25 - M_VESA_BASE)
-#define SW_VESA_C132x43		_IO('V', M_VESA_C132x43 - M_VESA_BASE)
-#define SW_VESA_C132x50		_IO('V', M_VESA_C132x50 - M_VESA_BASE)
-#define SW_VESA_C132x60		_IO('V', M_VESA_C132x60 - M_VESA_BASE)
-#define SW_VESA_32K_320		_IO('V', M_VESA_32K_320 - M_VESA_BASE)
-#define SW_VESA_64K_320		_IO('V', M_VESA_64K_320 - M_VESA_BASE)
-#define SW_VESA_FULL_320	_IO('V', M_VESA_FULL_320 - M_VESA_BASE)
-#define SW_VESA_32K_640		_IO('V', M_VESA_32K_640 - M_VESA_BASE)
-#define SW_VESA_64K_640		_IO('V', M_VESA_64K_640 - M_VESA_BASE)
-#define SW_VESA_FULL_640	_IO('V', M_VESA_FULL_640 - M_VESA_BASE)
-#define SW_VESA_32K_800		_IO('V', M_VESA_32K_800 - M_VESA_BASE)
-#define SW_VESA_64K_800		_IO('V', M_VESA_64K_800 - M_VESA_BASE)
-#define SW_VESA_FULL_800	_IO('V', M_VESA_FULL_800 - M_VESA_BASE)
-#define SW_VESA_32K_1024	_IO('V', M_VESA_32K_1024 - M_VESA_BASE)
-#define SW_VESA_64K_1024	_IO('V', M_VESA_64K_1024 - M_VESA_BASE)
-#define SW_VESA_FULL_1024	_IO('V', M_VESA_FULL_1024 - M_VESA_BASE)
-#define SW_VESA_32K_1280	_IO('V', M_VESA_32K_1280 - M_VESA_BASE)
-#define SW_VESA_64K_1280	_IO('V', M_VESA_64K_1280 - M_VESA_BASE)
-#define SW_VESA_FULL_1280	_IO('V', M_VESA_FULL_1280 - M_VESA_BASE)
-
-#endif /* !_SYS_CONSIO_H_ */
diff --git a/include.new/sys/copyright.h b/include.new/sys/copyright.h
deleted file mode 100644
index 6d0a7e2..0000000
--- a/include.new/sys/copyright.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (C) 1992-2015 The FreeBSD Project. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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: releng/10.2/sys/sys/copyright.h 276465 2014-12-31 10:03:19Z bz $
- */
-
-
-/* Copyrights macros  */
-
-/* FreeBSD */
-#define COPYRIGHT_FreeBSD \
-	"Copyright (c) 1992-2015 The FreeBSD Project.\n"
-
-/* Foundation */
-#define	TRADEMARK_Foundation \
-	"FreeBSD is a registered trademark of The FreeBSD Foundation.\n"
-
-/* Berkeley */
-#define COPYRIGHT_UCB \
-	"Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994\n\tThe Regents of the University of California. All rights reserved.\n"
-
-/* a port of FreeBSD to the NEC PC98, Japan */
-#if defined(PC98)
-#define COPYRIGHT_PC98 \
-	"Copyright (c) 1994-2003 FreeBSD(98) porting team.\nCopyright (c) 1992  A.Kojima F.Ukai M.Ishii (KMC).\n"
-#else
-#define COPYRIGHT_PC98
-#endif
-
-char copyright[] = COPYRIGHT_FreeBSD COPYRIGHT_PC98 COPYRIGHT_UCB;
-char trademark[] = TRADEMARK_Foundation;
diff --git a/include.new/sys/counter.h b/include.new/sys/counter.h
deleted file mode 100644
index 089fbc2..0000000
--- a/include.new/sys/counter.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2012 Gleb Smirnoff <glebius@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.
- *
- * 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: releng/10.2/sys/sys/counter.h 263088 2014-03-12 11:09:17Z glebius $
- */
-
-#ifndef __SYS_COUNTER_H__
-#define __SYS_COUNTER_H__
-
-typedef uint64_t *counter_u64_t;
-
-#ifdef _KERNEL
-#include <machine/counter.h>
-
-counter_u64_t	counter_u64_alloc(int);
-void		counter_u64_free(counter_u64_t);
-
-void		counter_u64_zero(counter_u64_t);
-uint64_t	counter_u64_fetch(counter_u64_t);
-
-#define	COUNTER_ARRAY_ALLOC(a, n, wait)	do {			\
-	for (int i = 0; i < (n); i++)				\
-		(a)[i] = counter_u64_alloc(wait);		\
-} while (0)
-
-#define	COUNTER_ARRAY_FREE(a, n)	do {			\
-	for (int i = 0; i < (n); i++)				\
-		counter_u64_free((a)[i]);			\
-} while (0)
-
-#define	COUNTER_ARRAY_COPY(a, dstp, n)	do {			\
-	for (int i = 0; i < (n); i++)				\
-		((uint64_t *)(dstp))[i] = counter_u64_fetch((a)[i]);\
-} while (0)
-
-#define	COUNTER_ARRAY_ZERO(a, n)	do {			\
-	for (int i = 0; i < (n); i++)				\
-		counter_u64_zero((a)[i]);			\
-} while (0)
-#endif	/* _KERNEL */
-#endif	/* ! __SYS_COUNTER_H__ */
diff --git a/include.new/sys/cpu.h b/include.new/sys/cpu.h
deleted file mode 100644
index 3b368f3..0000000
--- a/include.new/sys/cpu.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*-
- * Copyright (c) 2005-2007 Nate Lawson (SDG)
- * 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.
- *
- * 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: releng/10.2/sys/sys/cpu.h 193155 2009-05-31 08:59:15Z nwhitehorn $
- */
-
-#ifndef _SYS_CPU_H_
-#define _SYS_CPU_H_
-
-#include <sys/eventhandler.h>
-
-/*
- * CPU device support.
- */
-
-#define CPU_IVAR_PCPU		1
-#define CPU_IVAR_NOMINAL_MHZ	2
-
-static __inline struct pcpu *cpu_get_pcpu(device_t dev)
-{
-	uintptr_t v = 0;
-	BUS_READ_IVAR(device_get_parent(dev), dev, CPU_IVAR_PCPU, &v);
-	return ((struct pcpu *)v);
-}
-
-static __inline int32_t cpu_get_nominal_mhz(device_t dev)
-{
-	uintptr_t v = 0;
-	if (BUS_READ_IVAR(device_get_parent(dev), dev,
-	    CPU_IVAR_NOMINAL_MHZ, &v) != 0)
-		return (-1);
-	return ((int32_t)v);
-}
-
-/*
- * CPU frequency control interface.
- */
-
-/* Each driver's CPU frequency setting is exported in this format. */
-struct cf_setting {
-	int	freq;	/* CPU clock in Mhz or 100ths of a percent. */
-	int	volts;	/* Voltage in mV. */
-	int	power;	/* Power consumed in mW. */
-	int	lat;	/* Transition latency in us. */
-	device_t dev;	/* Driver providing this setting. */
-	int	spec[4];/* Driver-specific storage for non-standard info. */
-};
-
-/* Maximum number of settings a given driver can have. */
-#define MAX_SETTINGS		24
-
-/* A combination of settings is a level. */
-struct cf_level {
-	struct cf_setting	total_set;
-	struct cf_setting	abs_set;
-	struct cf_setting	rel_set[MAX_SETTINGS];
-	int			rel_count;
-	TAILQ_ENTRY(cf_level)	link;
-};
-
-TAILQ_HEAD(cf_level_lst, cf_level);
-
-/* Drivers should set all unknown values to this. */
-#define CPUFREQ_VAL_UNKNOWN	(-1)
-
-/*
- * Every driver offers a type of CPU control.  Absolute levels are mutually
- * exclusive while relative levels modify the current absolute level.  There
- * may be multiple absolute and relative drivers available on a given
- * system.
- *
- * For example, consider a system with two absolute drivers that provide
- * frequency settings of 100, 200 and 300, 400 and a relative driver that
- * provides settings of 50%, 100%.  The cpufreq core would export frequency
- * levels of 50, 100, 150, 200, 300, 400.
- *
- * The "info only" flag signifies that settings returned by
- * CPUFREQ_DRV_SETTINGS cannot be passed to the CPUFREQ_DRV_SET method and
- * are only informational.  This is for some drivers that can return
- * information about settings but rely on another machine-dependent driver
- * for actually performing the frequency transition (e.g., ACPI performance
- * states of type "functional fixed hardware.")
- */
-#define CPUFREQ_TYPE_MASK	0xffff
-#define CPUFREQ_TYPE_RELATIVE	(1<<0)
-#define CPUFREQ_TYPE_ABSOLUTE	(1<<1)
-#define CPUFREQ_FLAG_INFO_ONLY	(1<<16)
-
-/*
- * When setting a level, the caller indicates the priority of this request.
- * Priorities determine, among other things, whether a level can be
- * overridden by other callers.  For example, if the user sets a level but
- * the system thermal driver needs to override it for emergency cooling,
- * the driver would use a higher priority.  Once the event has passed, the
- * driver would call cpufreq to resume any previous level.
- */
-#define CPUFREQ_PRIO_HIGHEST	1000000
-#define CPUFREQ_PRIO_KERN	1000
-#define CPUFREQ_PRIO_USER	100
-#define CPUFREQ_PRIO_LOWEST	0
-
-/*
- * Register and unregister a driver with the cpufreq core.  Once a driver
- * is registered, it must support calls to its CPUFREQ_GET, CPUFREQ_GET_LEVEL,
- * and CPUFREQ_SET methods.  It must also unregister before returning from
- * its DEVICE_DETACH method.
- */
-int	cpufreq_register(device_t dev);
-int	cpufreq_unregister(device_t dev);
-
-/*
- * Notify the cpufreq core that the number of or values for settings have
- * changed.
- */
-int	cpufreq_settings_changed(device_t dev);
-
-/*
- * Eventhandlers that are called before and after a change in frequency.
- * The new level and the result of the change (0 is success) is passed in.
- * If the driver wishes to revoke the change from cpufreq_pre_change, it
- * stores a non-zero error code in the result parameter and the change will
- * not be made.  If the post-change eventhandler gets a non-zero result, 
- * no change was made and the previous level remains in effect.  If a change
- * is revoked, the post-change eventhandler is still called with the error
- * value supplied by the revoking driver.  This gives listeners who cached
- * some data in preparation for a level change a chance to clean up.
- */
-typedef void (*cpufreq_pre_notify_fn)(void *, const struct cf_level *, int *);
-typedef void (*cpufreq_post_notify_fn)(void *, const struct cf_level *, int);
-EVENTHANDLER_DECLARE(cpufreq_pre_change, cpufreq_pre_notify_fn);
-EVENTHANDLER_DECLARE(cpufreq_post_change, cpufreq_post_notify_fn);
-
-/*
- * Eventhandler called when the available list of levels changed.
- * The unit number of the device (i.e. "cpufreq0") whose levels changed
- * is provided so the listener can retrieve the new list of levels.
- */
-typedef void (*cpufreq_levels_notify_fn)(void *, int);
-EVENTHANDLER_DECLARE(cpufreq_levels_changed, cpufreq_levels_notify_fn);
-
-/* Allow values to be +/- a bit since sometimes we have to estimate. */
-#define CPUFREQ_CMP(x, y)	(abs((x) - (y)) < 25)
-
-/*
- * Machine-dependent functions.
- */
-
-/* Estimate the current clock rate for the given CPU id. */
-int	cpu_est_clockrate(int cpu_id, uint64_t *rate);
-
-#endif /* !_SYS_CPU_H_ */
diff --git a/include.new/sys/cpuctl.h b/include.new/sys/cpuctl.h
deleted file mode 100644
index 5497d50..0000000
--- a/include.new/sys/cpuctl.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2006-2008 Stanislav Sedov <stas@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.
- *
- * 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: releng/10.2/sys/sys/cpuctl.h 268157 2014-07-02 13:09:26Z kib $
- */
-
-#ifndef _CPUCTL_H_
-#define	_CPUCTL_H_
-
-typedef struct {
-	int		msr;	/* MSR to read */
-	uint64_t	data;
-} cpuctl_msr_args_t;
-
-typedef struct {
-	int		level;		/* CPUID level */
-	uint32_t	data[4];
-} cpuctl_cpuid_args_t;
-
-typedef struct {
-	int		level;		/* CPUID level */
-	int		level_type;	/* CPUID level type */
-	uint32_t	data[4];
-} cpuctl_cpuid_count_args_t;
-
-typedef struct {
-	void	*data;
-	size_t	size;
-} cpuctl_update_args_t;
-
-#define	CPUCTL_RDMSR	_IOWR('c', 1, cpuctl_msr_args_t)
-#define	CPUCTL_WRMSR	_IOWR('c', 2, cpuctl_msr_args_t)
-#define	CPUCTL_CPUID	_IOWR('c', 3, cpuctl_cpuid_args_t)
-#define	CPUCTL_UPDATE	_IOWR('c', 4, cpuctl_update_args_t)
-#define	CPUCTL_MSRSBIT	_IOWR('c', 5, cpuctl_msr_args_t)
-#define	CPUCTL_MSRCBIT	_IOWR('c', 6, cpuctl_msr_args_t)
-#define	CPUCTL_CPUID_COUNT _IOWR('c', 7, cpuctl_cpuid_count_args_t)
-
-#endif /* _CPUCTL_H_ */
diff --git a/include.new/sys/cpuset.h b/include.new/sys/cpuset.h
deleted file mode 100644
index 560be27..0000000
--- a/include.new/sys/cpuset.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 2008,	Jeffrey Roberson <jeff@freebsd.org>
- * All rights reserved.
- *
- * Copyright (c) 2008 Nokia Corporation
- * 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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/cpuset.h 281538 2015-04-14 20:05:26Z jhb $
- */
-
-#ifndef _SYS_CPUSET_H_
-#define	_SYS_CPUSET_H_
-
-#include <sys/_cpuset.h>
-
-#include <sys/bitset.h>
-
-#define	CPUSETBUFSIZ	((2 + sizeof(long) * 2) * _NCPUWORDS)
-
-#define	CPU_CLR(n, p)			BIT_CLR(CPU_SETSIZE, n, p)
-#define	CPU_COPY(f, t)			BIT_COPY(CPU_SETSIZE, f, t)
-#define	CPU_ISSET(n, p)			BIT_ISSET(CPU_SETSIZE, n, p)
-#define	CPU_SET(n, p)			BIT_SET(CPU_SETSIZE, n, p)
-#define	CPU_ZERO(p) 			BIT_ZERO(CPU_SETSIZE, p)
-#define	CPU_FILL(p) 			BIT_FILL(CPU_SETSIZE, p)
-#define	CPU_SETOF(n, p)			BIT_SETOF(CPU_SETSIZE, n, p)
-#define	CPU_EMPTY(p)			BIT_EMPTY(CPU_SETSIZE, p)
-#define	CPU_ISFULLSET(p)		BIT_ISFULLSET(CPU_SETSIZE, p)
-#define	CPU_SUBSET(p, c)		BIT_SUBSET(CPU_SETSIZE, p, c)
-#define	CPU_OVERLAP(p, c)		BIT_OVERLAP(CPU_SETSIZE, p, c)
-#define	CPU_CMP(p, c)			BIT_CMP(CPU_SETSIZE, p, c)
-#define	CPU_OR(d, s)			BIT_OR(CPU_SETSIZE, d, s)
-#define	CPU_AND(d, s)			BIT_AND(CPU_SETSIZE, d, s)
-#define	CPU_NAND(d, s)			BIT_NAND(CPU_SETSIZE, d, s)
-#define	CPU_CLR_ATOMIC(n, p)		BIT_CLR_ATOMIC(CPU_SETSIZE, n, p)
-#define	CPU_SET_ATOMIC(n, p)		BIT_SET_ATOMIC(CPU_SETSIZE, n, p)
-#define	CPU_SET_ATOMIC_ACQ(n, p)	BIT_SET_ATOMIC_ACQ(CPU_SETSIZE, n, p)
-#define	CPU_AND_ATOMIC(n, p)		BIT_AND_ATOMIC(CPU_SETSIZE, n, p)
-#define	CPU_OR_ATOMIC(d, s)		BIT_OR_ATOMIC(CPU_SETSIZE, d, s)
-#define	CPU_COPY_STORE_REL(f, t)	BIT_COPY_STORE_REL(CPU_SETSIZE, f, t)
-#define	CPU_FFS(p)			BIT_FFS(CPU_SETSIZE, p)
-#define	CPU_COUNT(p)			BIT_COUNT(CPU_SETSIZE, p)
-
-/*
- * Valid cpulevel_t values.
- */
-#define	CPU_LEVEL_ROOT		1	/* All system cpus. */
-#define	CPU_LEVEL_CPUSET	2	/* Available cpus for which. */
-#define	CPU_LEVEL_WHICH		3	/* Actual mask/id for which. */
-
-/*
- * Valid cpuwhich_t values.
- */
-#define	CPU_WHICH_TID		1	/* Specifies a thread id. */
-#define	CPU_WHICH_PID		2	/* Specifies a process id. */
-#define	CPU_WHICH_CPUSET	3	/* Specifies a set id. */
-#define	CPU_WHICH_IRQ		4	/* Specifies an irq #. */
-#define	CPU_WHICH_JAIL		5	/* Specifies a jail id. */
-
-/*
- * Reserved cpuset identifiers.
- */
-#define	CPUSET_INVALID	-1
-#define	CPUSET_DEFAULT	0
-
-#ifdef _KERNEL
-LIST_HEAD(setlist, cpuset);
-
-/*
- * cpusets encapsulate cpu binding information for one or more threads.
- *
- * 	a - Accessed with atomics.
- *	s - Set at creation, never modified.  Only a ref required to read.
- *	c - Locked internally by a cpuset lock.
- *
- * The bitmask is only modified while holding the cpuset lock.  It may be
- * read while only a reference is held but the consumer must be prepared
- * to deal with inconsistent results.
- */
-struct cpuset {
-	cpuset_t		cs_mask;	/* bitmask of valid cpus. */
-	volatile u_int		cs_ref;		/* (a) Reference count. */
-	int			cs_flags;	/* (s) Flags from below. */
-	cpusetid_t		cs_id;		/* (s) Id or INVALID. */
-	struct cpuset		*cs_parent;	/* (s) Pointer to our parent. */
-	LIST_ENTRY(cpuset)	cs_link;	/* (c) All identified sets. */
-	LIST_ENTRY(cpuset)	cs_siblings;	/* (c) Sibling set link. */
-	struct setlist		cs_children;	/* (c) List of children. */
-};
-
-#define CPU_SET_ROOT    0x0001  /* Set is a root set. */
-#define CPU_SET_RDONLY  0x0002  /* No modification allowed. */
-
-extern cpuset_t *cpuset_root;
-struct prison;
-struct proc;
-
-struct cpuset *cpuset_thread0(void);
-struct cpuset *cpuset_ref(struct cpuset *);
-void	cpuset_rel(struct cpuset *);
-int	cpuset_setthread(lwpid_t id, cpuset_t *);
-int	cpuset_create_root(struct prison *, struct cpuset **);
-int	cpuset_setproc_update_set(struct proc *, struct cpuset *);
-char	*cpusetobj_strprint(char *, const cpuset_t *);
-int	cpusetobj_strscan(cpuset_t *, const char *);
-#ifdef DDB
-void	ddb_display_cpuset(const cpuset_t *);
-#endif
-
-#else
-__BEGIN_DECLS
-int	cpuset(cpusetid_t *);
-int	cpuset_setid(cpuwhich_t, id_t, cpusetid_t);
-int	cpuset_getid(cpulevel_t, cpuwhich_t, id_t, cpusetid_t *);
-int	cpuset_getaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, cpuset_t *);
-int	cpuset_setaffinity(cpulevel_t, cpuwhich_t, id_t, size_t, const cpuset_t *);
-__END_DECLS
-#endif
-#endif /* !_SYS_CPUSET_H_ */
diff --git a/include.new/sys/ctype.h b/include.new/sys/ctype.h
deleted file mode 100644
index 48abb14..0000000
--- a/include.new/sys/ctype.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1982, 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/sys/ctype.h 127976 2004-04-07 04:19:52Z imp $
- */
-
-#ifndef _SYS_CTYPE_H_
-#define	_SYS_CTYPE_H_
-
-#ifdef _KERNEL
-
-#define isspace(c)	((c) == ' ' || ((c) >= '\t' && (c) <= '\r'))
-#define isascii(c)	(((c) & ~0x7f) == 0)
-#define isupper(c)	((c) >= 'A' && (c) <= 'Z')
-#define islower(c)	((c) >= 'a' && (c) <= 'z')
-#define isalpha(c)	(isupper(c) || islower(c))
-#define isdigit(c)	((c) >= '0' && (c) <= '9')
-#define isxdigit(c)	(isdigit(c) \
-			  || ((c) >= 'A' && (c) <= 'F') \
-			  || ((c) >= 'a' && (c) <= 'f'))
-#define isprint(c)	((c) >= ' ' && (c) <= '~')
-
-#define toupper(c)	((c) - 0x20 * (((c) >= 'a') && ((c) <= 'z')))
-#define tolower(c)	((c) + 0x20 * (((c) >= 'A') && ((c) <= 'Z')))
-
-#endif
-#endif /* !_SYS_CTYPE_H_ */
diff --git a/include.new/sys/dataacq.h b/include.new/sys/dataacq.h
deleted file mode 100644
index 7539bc9..0000000
--- a/include.new/sys/dataacq.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Header for general data acquisition definitions.
- *
- * $FreeBSD: releng/10.2/sys/sys/dataacq.h 59874 2000-05-01 20:32:07Z peter $
- */
-
-#ifndef	_SYS_DATAACQ_H_
-#define	_SYS_DATAACQ_H_
-
-#include <sys/ioccom.h>
-
-/* Period in microseconds between analog I/O samples.
- */
-#define AD_MICRO_PERIOD_SET _IOW('A', 1, long)
-#define AD_MICRO_PERIOD_GET _IOR('A', 2, long)
-
-/* Gain list support.  Initially all gains are 1.  If the board
- * supports no gains at all then AD_NGAINS_GET will return a 0.
- *
- * AD_NGAINS_GET: Return the number of gains the board supports
- *
- * AD_SUPPORTED_GAINS: Get the supported gains.
- * The driver will copy out "ngains" doubles,
- * where "ngains" is obtained with AD_NGAINS_GET.
- *
- * AD_GAINS_SET: Set the gain list.  The driver will copy in "ngains" ints.
- *
- * AD_GAINS_GET: Get the gain list.  The driver will copy out "ngains" ints.
- */
-
-#define AD_NGAINS_GET     _IOR('A', 3, int)
-#define AD_NCHANS_GET     _IOR('A', 4, int)
-#define AD_SUPPORTED_GAINS _IO('A', 5)
-#define AD_GAINS_SET       _IO('A', 6)
-#define AD_GAINS_GET       _IO('A', 7)
-
-#endif /* !_SYS_DATAACQ_H_ */
diff --git a/include.new/sys/device_port.h b/include.new/sys/device_port.h
deleted file mode 100644
index 3abd3b7..0000000
--- a/include.new/sys/device_port.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 1999 Mitsuru IWASAKI <iwasaki@FreeBSD.org>
- * Copyright (c) 1999 Takanori Watanabe <takawata@jp.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.
- *
- * 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/device_port.h,v 1.2 2005/01/19 01:31:33 imp Exp $
- */
-
-#if defined(__NetBSD__)
-# include <sys/device.h>
-#elif defined(__FreeBSD__)
-# include <sys/module.h>
-# include <sys/bus.h>
-#endif
-
-/*
- * Macro's to cope with the differences between operating systems and versions. 
- */
-
-#if defined(__NetBSD__)
-# define DEVPORT_DEVICE			struct device
-# define DEVPORT_DEVNAME(dev)		(dev).dv_xname
-# define DEVPORT_DEVUNIT(dev)		(dev).dv_unit
-
-#elif defined(__FreeBSD__)
-/*
- * FreeBSD (compatibility for struct device)
- */
-#define DEVPORT_DEVICE			device_t
-#define DEVPORT_DEVNAME(dev)		device_get_name(dev)
-#define DEVPORT_DEVUNIT(dev)		device_get_unit(dev)
-#define DEVPORT_ALLOC_SOFTC(dev) 	device_get_softc(dev)
-#define DEVPORT_GET_SOFTC(dev)		device_get_softc(dev)
-
-#define UNCONF	1		/* print " not configured\n" */
-
-/*
- * PC-Card device driver (compatibility for struct pccard_devinfo *)
- */
-#define DEVPORT_PDEVICE			device_t
-#define DEVPORT_PDEVUNIT(pdev)		device_get_unit(pdev)
-#define DEVPORT_PDEVFLAGS(pdev)		device_get_flags(pdev)
-#define DEVPORT_PDEVIOBASE(pdev)	bus_get_resource_start(pdev, SYS_RES_IOPORT, 0)
-#define DEVPORT_PDEVIRQ(pdev)		bus_get_resource_start(pdev, SYS_RES_IRQ, 0)
-#define DEVPORT_PDEVMADDR(pdev)		bus_get_resource_start(pdev, SYS_RES_MEMORY, 0)
-#define DEVPORT_PDEVALLOC_SOFTC(pdev)	device_get_softc(pdev)
-#define DEVPORT_PDEVGET_SOFTC(pdev)	device_get_softc(pdev)
-
-#endif /* __FreeBSD__ */
diff --git a/include.new/sys/devicestat.h b/include.new/sys/devicestat.h
deleted file mode 100644
index 9c91de9..0000000
--- a/include.new/sys/devicestat.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*-
- * Copyright (c) 1997, 1998, 1999 Kenneth D. Merry.
- * 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: releng/10.2/sys/sys/devicestat.h 260385 2014-01-07 01:32:23Z scottl $
- */
-
-#ifndef _DEVICESTAT_H
-#define _DEVICESTAT_H
-
-#include <sys/queue.h>
-#include <sys/time.h>
-
-/*
- * XXX: Should really be SPECNAMELEN
- */
-#define DEVSTAT_NAME_LEN  16
-
-/*
- * device name for the mmap device
- */
-#define DEVSTAT_DEVICE_NAME "devstat"
-
-/*
- * ATTENTION:  The devstat version below should be incremented any time a
- * change is made in struct devstat, or any time a change is made in the
- * enumerated types that struct devstat uses.  (Only if those changes
- * would require a recompile -- i.e. re-arranging the order of an
- * enumerated type or something like that.)  This version number is used by
- * userland utilities to determine whether or not they are in sync with the
- * kernel.
- */
-#define DEVSTAT_VERSION	   6
-
-/*
- * These flags specify which statistics features are supported or not
- * supported by a particular device.  The default is all statistics are
- * supported.
- */
-typedef enum {
-	DEVSTAT_ALL_SUPPORTED	= 0x00,
-	DEVSTAT_NO_BLOCKSIZE	= 0x01,
-	DEVSTAT_NO_ORDERED_TAGS	= 0x02,
-	DEVSTAT_BS_UNAVAILABLE	= 0x04
-} devstat_support_flags;
-
-typedef enum {
-	DEVSTAT_NO_DATA	= 0x00,
-	DEVSTAT_READ	= 0x01,
-	DEVSTAT_WRITE	= 0x02,
-	DEVSTAT_FREE	= 0x03
-} devstat_trans_flags;
-#define DEVSTAT_N_TRANS_FLAGS	4
-
-typedef enum {
-	DEVSTAT_TAG_SIMPLE	= 0x00,
-	DEVSTAT_TAG_HEAD	= 0x01,
-	DEVSTAT_TAG_ORDERED	= 0x02,
-	DEVSTAT_TAG_NONE	= 0x03
-} devstat_tag_type;
-
-typedef enum {
-	DEVSTAT_PRIORITY_MIN	= 0x000,
-	DEVSTAT_PRIORITY_OTHER	= 0x020,
-	DEVSTAT_PRIORITY_PASS	= 0x030,
-	DEVSTAT_PRIORITY_FD	= 0x040,
-	DEVSTAT_PRIORITY_WFD	= 0x050,
-	DEVSTAT_PRIORITY_TAPE	= 0x060,
-	DEVSTAT_PRIORITY_CD	= 0x090,
-	DEVSTAT_PRIORITY_DISK	= 0x110,
-	DEVSTAT_PRIORITY_ARRAY	= 0x120,
-	DEVSTAT_PRIORITY_MAX	= 0xfff
-} devstat_priority;
-
-/*
- * These types are intended to aid statistics gathering/display programs.
- * The first 13 types (up to the 'target' flag) are identical numerically
- * to the SCSI device type numbers.  The next 3 types designate the device
- * interface.  Currently the choices are IDE, SCSI, and 'other'.  The last
- * flag specifies whether or not the given device is a passthrough device
- * or not.  If it is a passthrough device, the lower 4 bits specify which
- * type of physical device lies under the passthrough device, and the next
- * 4 bits specify the interface.
- */
-typedef enum {
-	DEVSTAT_TYPE_DIRECT	= 0x000,
-	DEVSTAT_TYPE_SEQUENTIAL	= 0x001,
-	DEVSTAT_TYPE_PRINTER	= 0x002,
-	DEVSTAT_TYPE_PROCESSOR	= 0x003,
-	DEVSTAT_TYPE_WORM	= 0x004,
-	DEVSTAT_TYPE_CDROM	= 0x005,
-	DEVSTAT_TYPE_SCANNER	= 0x006,
-	DEVSTAT_TYPE_OPTICAL	= 0x007,
-	DEVSTAT_TYPE_CHANGER	= 0x008,
-	DEVSTAT_TYPE_COMM	= 0x009,
-	DEVSTAT_TYPE_ASC0	= 0x00a,
-	DEVSTAT_TYPE_ASC1	= 0x00b,
-	DEVSTAT_TYPE_STORARRAY	= 0x00c,
-	DEVSTAT_TYPE_ENCLOSURE	= 0x00d,
-	DEVSTAT_TYPE_FLOPPY	= 0x00e,
-	DEVSTAT_TYPE_MASK	= 0x00f,
-	DEVSTAT_TYPE_IF_SCSI	= 0x010,
-	DEVSTAT_TYPE_IF_IDE	= 0x020,
-	DEVSTAT_TYPE_IF_OTHER	= 0x030,
-	DEVSTAT_TYPE_IF_MASK	= 0x0f0,
-	DEVSTAT_TYPE_PASS	= 0x100
-} devstat_type_flags;
-
-/*
- * XXX: Next revision should add
- *	off_t		offset[DEVSTAT_N_TRANS_FLAGS];
- * XXX: which should contain the offset of the last completed transfer.
- */
-struct devstat {
-	/* Internal house-keeping fields */
-	u_int			sequence0;	     /* Update sequence# */
-	int			allocated;	     /* Allocated entry */
-	u_int			start_count;	     /* started ops */
-	u_int			end_count;	     /* completed ops */
-	struct bintime		busy_from;	     /*
-						      * busy time unaccounted
-						      * for since this time
-						      */
-	STAILQ_ENTRY(devstat) 	dev_links;
-	uint32_t		device_number;	     /*
-						      * Devstat device
-						      * number.
-						      */
-	char			device_name[DEVSTAT_NAME_LEN];
-	int			unit_number;
-	u_int64_t		bytes[DEVSTAT_N_TRANS_FLAGS];
-	u_int64_t		operations[DEVSTAT_N_TRANS_FLAGS];
-	struct bintime		duration[DEVSTAT_N_TRANS_FLAGS];
-	struct bintime		busy_time;
-	struct bintime          creation_time;       /* 
-						      * Time the device was
-						      * created.
-						      */
-	uint32_t		block_size;	     /* Block size, bytes */
-	u_int64_t		tag_types[3];	     /*
-						      * The number of
-						      * simple, ordered, 
-						      * and head of queue 
-						      * tags sent.
-						      */
-	devstat_support_flags	flags;		     /*
-						      * Which statistics
-						      * are supported by a 
-						      * given device.
-						      */
-	devstat_type_flags	device_type;	     /* Device type */
-	devstat_priority	priority;	     /* Controls list pos. */
-	const void		*id;		     /*
-						      * Identification for
-						      * GEOM nodes
-						      */
-	u_int			sequence1;	     /* Update sequence# */
-};
-
-STAILQ_HEAD(devstatlist, devstat);
-
-#ifdef _KERNEL
-struct bio;
-
-struct devstat *devstat_new_entry(const void *dev_name, int unit_number,
-				  uint32_t block_size,
-				  devstat_support_flags flags,
-				  devstat_type_flags device_type,
-				  devstat_priority priority);
-
-void devstat_remove_entry(struct devstat *ds);
-void devstat_start_transaction(struct devstat *ds, struct bintime *now);
-void devstat_start_transaction_bio(struct devstat *ds, struct bio *bp);
-void devstat_end_transaction(struct devstat *ds, uint32_t bytes, 
-			     devstat_tag_type tag_type,
-			     devstat_trans_flags flags,
-			     struct bintime *now, struct bintime *then);
-void devstat_end_transaction_bio(struct devstat *ds, struct bio *bp);
-void devstat_end_transaction_bio_bt(struct devstat *ds, struct bio *bp,
-			     struct bintime *now);
-#endif
-
-#endif /* _DEVICESTAT_H */
diff --git a/include.new/sys/digiio.h b/include.new/sys/digiio.h
deleted file mode 100644
index 37c9545..0000000
--- a/include.new/sys/digiio.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 2001 Brian Somers <brian@Awfulhak.org>
- *   based on work by Slawa Olhovchenkov
- *                    John Prince <johnp@knight-trosoft.com>
- *                    Eric Hernes
- * 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.
- *
- * 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: releng/10.2/sys/sys/digiio.h 162711 2006-09-27 19:57:02Z ru $
- */
-
-/*
- * A very small subset of cards.
- */
-enum digi_model {
-	PCXE,
-	PCXEVE,
-	PCXI,
-	PCXEM,
-	PCCX,
-	PCIEPCX,
-	PCIXR
-};
-
-enum {
-	DIGIDB_INIT = (1<<0),
-	DIGIDB_OPEN = (1<<1),
-	DIGIDB_CLOSE = (1<<2),
-	DIGIDB_SET = (1<<3),
-	DIGIDB_INT = (1<<4),
-	DIGIDB_READ = (1<<5),
-	DIGIDB_WRITE = (1<<6),
-	DIGIDB_RX = (1<<7),
-	DIGIDB_TX = (1<<8),
-	DIGIDB_IRQ = (1<<9),
-	DIGIDB_MODEM = (1<<10),
-	DIGIDB_RI = (1<<11),
-};
-
-#define	DIGIIO_REINIT		_IO('e', 'A')
-#define	DIGIIO_DEBUG		_IOW('e', 'B', int)
-#define	DIGIIO_RING		_IOWINT('e', 'C')
-#define	DIGIIO_MODEL		_IOR('e', 'D', enum digi_model)
-#define	DIGIIO_IDENT		_IOW('e', 'E', char *)
-#define	DIGIIO_SETALTPIN	_IOW('e', 'F', int)
-#define	DIGIIO_GETALTPIN	_IOR('e', 'G', int)
diff --git a/include.new/sys/dir.h b/include.new/sys/dir.h
deleted file mode 100644
index 2b1b9dd..0000000
--- a/include.new/sys/dir.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 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.
- * 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.
- *
- *	@(#)dir.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: releng/10.2/sys/sys/dir.h 143063 2005-03-02 21:33:29Z joerg $
- */
-
-#ifndef _SYS_DIR_H_
-#define	_SYS_DIR_H_
-
-#include <sys/cdefs.h>
-
-#ifdef __CC_SUPPORTS_WARNING
-#warning "The information in this file should be obtained from <dirent.h>"
-#warning "and is provided solely (and temporarily) for backward compatibility."
-#endif
-
-#include <dirent.h>
-
-/*
- * Backwards compatibility.
- */
-#define	direct		dirent
-#define	DIRSIZ(dp)	_GENERIC_DIRSIZ(dp)
-
-#endif /* !_SYS_DIR_H_ */
diff --git a/include.new/sys/dirent.h b/include.new/sys/dirent.h
deleted file mode 100644
index de343f6..0000000
--- a/include.new/sys/dirent.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- * 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.
- *
- *	@(#)dirent.h	8.3 (Berkeley) 8/10/94
- * $FreeBSD: releng/10.2/sys/sys/dirent.h 161347 2006-08-16 09:34:56Z maxim $
- */
-
-#ifndef	_SYS_DIRENT_H_
-#define	_SYS_DIRENT_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/*
- * The dirent structure defines the format of directory entries returned by
- * the getdirentries(2) system call.
- *
- * A directory entry has a struct dirent at the front of it, containing its
- * inode number, the length of the entry, and the length of the name
- * contained in the entry.  These are followed by the name padded to a 4
- * byte boundary with null bytes.  All names are guaranteed null terminated.
- * The maximum length of a name in a directory is MAXNAMLEN.
- */
-
-struct dirent {
-	__uint32_t d_fileno;		/* file number of entry */
-	__uint16_t d_reclen;		/* length of this record */
-	__uint8_t  d_type; 		/* file type, see below */
-	__uint8_t  d_namlen;		/* length of string in d_name */
-#if __BSD_VISIBLE
-#define	MAXNAMLEN	255
-	char	d_name[MAXNAMLEN + 1];	/* name must be no longer than this */
-#else
-	char	d_name[255 + 1];	/* name must be no longer than this */
-#endif
-};
-
-#if __BSD_VISIBLE
-/*
- * File types
- */
-#define	DT_UNKNOWN	 0
-#define	DT_FIFO		 1
-#define	DT_CHR		 2
-#define	DT_DIR		 4
-#define	DT_BLK		 6
-#define	DT_REG		 8
-#define	DT_LNK		10
-#define	DT_SOCK		12
-#define	DT_WHT		14
-
-/*
- * Convert between stat structure types and directory types.
- */
-#define	IFTODT(mode)	(((mode) & 0170000) >> 12)
-#define	DTTOIF(dirtype)	((dirtype) << 12)
-
-/*
- * The _GENERIC_DIRSIZ macro gives the minimum record length which will hold
- * the directory entry.  This returns the amount of space in struct direct
- * without the d_name field, plus enough space for the name with a terminating
- * null byte (dp->d_namlen+1), rounded up to a 4 byte boundary.
- *
- * XXX although this macro is in the implementation namespace, it requires
- * a manifest constant that is not.
- */
-#define	_GENERIC_DIRSIZ(dp) \
-    ((sizeof (struct dirent) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
-#endif /* __BSD_VISIBLE */
-
-#ifdef _KERNEL
-#define	GENERIC_DIRSIZ(dp)	_GENERIC_DIRSIZ(dp)
-#endif
-
-#endif /* !_SYS_DIRENT_H_ */
diff --git a/include.new/sys/disk.h b/include.new/sys/disk.h
deleted file mode 100644
index edd88fc..0000000
--- a/include.new/sys/disk.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD: releng/10.2/sys/sys/disk.h 279005 2015-02-19 14:40:50Z mav $
- *
- */
-
-#ifndef _SYS_DISK_H_
-#define	_SYS_DISK_H_
-
-#include <sys/ioccom.h>
-#include <sys/types.h>
-
-#ifdef _KERNEL
-
-#ifndef _SYS_CONF_H_
-#include <sys/conf.h>	/* XXX: temporary to avoid breakage */
-#endif
-
-void disk_err(struct bio *bp, const char *what, int blkdone, int nl);
-
-#endif
-
-#define	DIOCGSECTORSIZE	_IOR('d', 128, u_int)
-	/*
-	 * Get the sector size of the device in bytes.  The sector size is the
-	 * smallest unit of data which can be transferred from this device.
-	 * Usually this is a power of 2 but it might not be (i.e. CDROM audio).
-	 */
-
-#define	DIOCGMEDIASIZE	_IOR('d', 129, off_t)	/* Get media size in bytes */
-	/*
-	 * Get the size of the entire device in bytes.  This should be a
-	 * multiple of the sector size.
-	 */
-
-#define	DIOCGFWSECTORS	_IOR('d', 130, u_int)	/* Get firmware's sectorcount */
-	/*
-	 * Get the firmware's notion of number of sectors per track.  This
-	 * value is mostly used for compatibility with various ill designed
-	 * disk label formats.  Don't use it unless you have to.
-	 */
-
-#define	DIOCGFWHEADS	_IOR('d', 131, u_int)	/* Get firmware's headcount */
-	/*
-	 * Get the firmwares notion of number of heads per cylinder.  This
-	 * value is mostly used for compatibility with various ill designed
-	 * disk label formats.  Don't use it unless you have to.
-	 */
-
-#define	DIOCSKERNELDUMP _IOW('d', 133, u_int)	/* Set/Clear kernel dumps */
-	/*
-	 * Enable/Disable (the argument is boolean) the device for kernel
-	 * core dumps.
-	 */
-	
-#define	DIOCGFRONTSTUFF _IOR('d', 134, off_t)
-	/*
-	 * Many disk formats have some amount of space reserved at the
-	 * start of the disk to hold bootblocks, various disklabels and
-	 * similar stuff.  This ioctl returns the number of such bytes
-	 * which may apply to the device.
-	 */
-
-#define	DIOCGFLUSH _IO('d', 135)		/* Flush write cache */
-	/*
-	 * Flush write cache of the device.
-	 */
-
-#define	DIOCGDELETE _IOW('d', 136, off_t[2])	/* Delete data */
-	/*
-	 * Mark data on the device as unused.
-	 */
-
-#define	DISK_IDENT_SIZE	256
-#define	DIOCGIDENT _IOR('d', 137, char[DISK_IDENT_SIZE])
-	/*-
-	 * Get the ident of the given provider. Ident is (most of the time)
-	 * a uniqe and fixed provider's identifier. Ident's properties are as
-	 * follow:
-	 * - ident value is preserved between reboots,
-	 * - provider can be detached/attached and ident is preserved,
-	 * - provider's name can change - ident can't,
-	 * - ident value should not be based on on-disk metadata; in other
-	 *   words copying whole data from one disk to another should not
-	 *   yield the same ident for the other disk,
-	 * - there could be more than one provider with the same ident, but
-	 *   only if they point at exactly the same physical storage, this is
-	 *   the case for multipathing for example,
-	 * - GEOM classes that consumes single providers and provide single
-	 *   providers, like geli, gbde, should just attach class name to the
-	 *   ident of the underlying provider,
-	 * - ident is an ASCII string (is printable),
-	 * - ident is optional and applications can't relay on its presence.
-	 */
-
-#define	DIOCGPROVIDERNAME _IOR('d', 138, char[MAXPATHLEN])
-	/*
-	 * Store the provider name, given a device path, in a buffer. The buffer
-	 * must be at least MAXPATHLEN bytes long.
-	 */
-
-#define	DIOCGSTRIPESIZE	_IOR('d', 139, off_t)	/* Get stripe size in bytes */
-	/*
-	 * Get the size of the device's optimal access block in bytes.
-	 * This should be a multiple of the sector size.
-	 */
-
-#define	DIOCGSTRIPEOFFSET _IOR('d', 140, off_t)	/* Get stripe offset in bytes */
-	/*
-	 * Get the offset of the first device's optimal access block in bytes.
-	 * This should be a multiple of the sector size.
-	 */
-
-#define	DIOCGPHYSPATH _IOR('d', 141, char[MAXPATHLEN])
-	/*
-	 * Get a string defining the physical path for a given provider.
-	 * This has similar rules to ident, but is intended to uniquely
-	 * identify the physical location of the device, not the current
-	 * occupant of that location.
-	 */
-
-struct diocgattr_arg {
-	char name[64];
-	int len;
-	union {
-		char str[DISK_IDENT_SIZE];
-		off_t off;
-		int i;
-	} value;
-};
-#define	DIOCGATTR _IOWR('d', 142, struct diocgattr_arg)
-
-#endif /* _SYS_DISK_H_ */
diff --git a/include.new/sys/disklabel.h b/include.new/sys/disklabel.h
deleted file mode 100644
index b6d937c..0000000
--- a/include.new/sys/disklabel.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/*-
- * Copyright (c) 1987, 1988, 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.
- * 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.
- *
- *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD: releng/10.2/sys/sys/disklabel.h 268091 2014-07-01 13:29:17Z ae $
- */
-
-#ifndef _SYS_DISKLABEL_H_
-#define	_SYS_DISKLABEL_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/*
- * Disk description table, see disktab(5)
- */
-#define	_PATH_DISKTAB	"/etc/disktab"
-
-/*
- * Each disk has a label which includes information about the hardware
- * disk geometry, filesystem partitions, and drive specific information.
- * The label is in block 0 or 1, possibly offset from the beginning
- * to leave room for a bootstrap, etc.
- */
-
-/* XXX these should be defined per controller (or drive) elsewhere, not here! */
-#if defined(__i386__) || defined(__amd64__) || defined(__arm__) || \
-    defined(__ia64__) || defined(__powerpc__) || defined(__mips__)
-#define LABELSECTOR	1			/* sector containing label */
-#define LABELOFFSET	0			/* offset of label in sector */
-#endif
-
-#define DISKMAGIC	((uint32_t)0x82564557)	/* The disk magic number */
-#ifndef MAXPARTITIONS
-#define	MAXPARTITIONS	8
-#endif
-
-/* Size of bootblock area in sector-size neutral bytes */
-#define BBSIZE		8192
-
-#define	LABEL_PART	2		/* partition containing label */
-#define	RAW_PART	2		/* partition containing whole disk */
-#define	SWAP_PART	1		/* partition normally containing swap */
-
-struct disklabel {
-	uint32_t d_magic;		/* the magic number */
-	u_int16_t d_type;		/* drive type */
-	u_int16_t d_subtype;		/* controller/d_type specific */
-	char	  d_typename[16];	/* type name, e.g. "eagle" */
-
-	char      d_packname[16];	/* pack identifier */
-
-			/* disk geometry: */
-	uint32_t d_secsize;		/* # of bytes per sector */
-	uint32_t d_nsectors;		/* # of data sectors per track */
-	uint32_t d_ntracks;		/* # of tracks per cylinder */
-	uint32_t d_ncylinders;		/* # of data cylinders per unit */
-	uint32_t d_secpercyl;		/* # of data sectors per cylinder */
-	uint32_t d_secperunit;		/* # of data sectors per unit */
-
-	/*
-	 * Spares (bad sector replacements) below are not counted in
-	 * d_nsectors or d_secpercyl.  Spare sectors are assumed to
-	 * be physical sectors which occupy space at the end of each
-	 * track and/or cylinder.
-	 */
-	u_int16_t d_sparespertrack;	/* # of spare sectors per track */
-	u_int16_t d_sparespercyl;	/* # of spare sectors per cylinder */
-	/*
-	 * Alternate cylinders include maintenance, replacement, configuration
-	 * description areas, etc.
-	 */
-	uint32_t d_acylinders;		/* # of alt. cylinders per unit */
-
-			/* hardware characteristics: */
-	/*
-	 * d_interleave, d_trackskew and d_cylskew describe perturbations
-	 * in the media format used to compensate for a slow controller.
-	 * Interleave is physical sector interleave, set up by the
-	 * formatter or controller when formatting.  When interleaving is
-	 * in use, logically adjacent sectors are not physically
-	 * contiguous, but instead are separated by some number of
-	 * sectors.  It is specified as the ratio of physical sectors
-	 * traversed per logical sector.  Thus an interleave of 1:1
-	 * implies contiguous layout, while 2:1 implies that logical
-	 * sector 0 is separated by one sector from logical sector 1.
-	 * d_trackskew is the offset of sector 0 on track N relative to
-	 * sector 0 on track N-1 on the same cylinder.  Finally, d_cylskew
-	 * is the offset of sector 0 on cylinder N relative to sector 0
-	 * on cylinder N-1.
-	 */
-	u_int16_t d_rpm;		/* rotational speed */
-	u_int16_t d_interleave;		/* hardware sector interleave */
-	u_int16_t d_trackskew;		/* sector 0 skew, per track */
-	u_int16_t d_cylskew;		/* sector 0 skew, per cylinder */
-	uint32_t d_headswitch;		/* head switch time, usec */
-	uint32_t d_trkseek;		/* track-to-track seek, usec */
-	uint32_t d_flags;		/* generic flags */
-#define NDDATA 5
-	uint32_t d_drivedata[NDDATA];	/* drive-type specific information */
-#define NSPARE 5
-	uint32_t d_spare[NSPARE];	/* reserved for future use */
-	uint32_t d_magic2;		/* the magic number (again) */
-	u_int16_t d_checksum;		/* xor of data incl. partitions */
-
-			/* filesystem and partition information: */
-	u_int16_t d_npartitions;	/* number of partitions in following */
-	uint32_t d_bbsize;		/* size of boot area at sn0, bytes */
-	uint32_t d_sbsize;		/* max size of fs superblock, bytes */
-	struct partition {		/* the partition table */
-		uint32_t p_size;	/* number of sectors in partition */
-		uint32_t p_offset;	/* starting sector */
-		uint32_t p_fsize;	/* filesystem basic fragment size */
-		u_int8_t p_fstype;	/* filesystem type, see below */
-		u_int8_t p_frag;	/* filesystem fragments per block */
-		u_int16_t p_cpg;	/* filesystem cylinders per group */
-	} d_partitions[MAXPARTITIONS];	/* actually may be more */
-};
-
-#ifdef CTASSERT
-CTASSERT(sizeof(struct disklabel) == 148 + MAXPARTITIONS * 16);
-#endif
-
-static __inline u_int16_t dkcksum(struct disklabel *lp);
-static __inline u_int16_t
-dkcksum(struct disklabel *lp)
-{
-	u_int16_t *start, *end;
-	u_int16_t sum = 0;
-
-	start = (u_int16_t *)lp;
-	end = (u_int16_t *)&lp->d_partitions[lp->d_npartitions];
-	while (start < end)
-		sum ^= *start++;
-	return (sum);
-}
-
-
-/* d_type values: */
-#define	DTYPE_SMD		1		/* SMD, XSMD; VAX hp/up */
-#define	DTYPE_MSCP		2		/* MSCP */
-#define	DTYPE_DEC		3		/* other DEC (rk, rl) */
-#define	DTYPE_SCSI		4		/* SCSI */
-#define	DTYPE_ESDI		5		/* ESDI interface */
-#define	DTYPE_ST506		6		/* ST506 etc. */
-#define	DTYPE_HPIB		7		/* CS/80 on HP-IB */
-#define	DTYPE_HPFL		8		/* HP Fiber-link */
-#define	DTYPE_FLOPPY		10		/* floppy */
-#define	DTYPE_CCD		11		/* concatenated disk */
-#define	DTYPE_VINUM		12		/* vinum volume */
-#define	DTYPE_DOC2K		13		/* Msys DiskOnChip */
-#define	DTYPE_RAID		14		/* CMU RAIDFrame */
-#define	DTYPE_JFS2		16		/* IBM JFS 2 */
-
-#ifdef DKTYPENAMES
-static const char *dktypenames[] = {
-	"unknown",
-	"SMD",
-	"MSCP",
-	"old DEC",
-	"SCSI",
-	"ESDI",
-	"ST506",
-	"HP-IB",
-	"HP-FL",
-	"type 9",
-	"floppy",
-	"CCD",
-	"Vinum",
-	"DOC2K",
-	"Raid",
-	"?",
-	"jfs",
-	NULL
-};
-#define DKMAXTYPES	(sizeof(dktypenames) / sizeof(dktypenames[0]) - 1)
-#endif
-
-/*
- * Filesystem type and version.
- * Used to interpret other filesystem-specific
- * per-partition information.
- */
-#define	FS_UNUSED	0		/* unused */
-#define	FS_SWAP		1		/* swap */
-#define	FS_V6		2		/* Sixth Edition */
-#define	FS_V7		3		/* Seventh Edition */
-#define	FS_SYSV		4		/* System V */
-#define	FS_V71K		5		/* V7 with 1K blocks (4.1, 2.9) */
-#define	FS_V8		6		/* Eighth Edition, 4K blocks */
-#define	FS_BSDFFS	7		/* 4.2BSD fast filesystem */
-#define	FS_MSDOS	8		/* MSDOS filesystem */
-#define	FS_BSDLFS	9		/* 4.4BSD log-structured filesystem */
-#define	FS_OTHER	10		/* in use, but unknown/unsupported */
-#define	FS_HPFS		11		/* OS/2 high-performance filesystem */
-#define	FS_ISO9660	12		/* ISO 9660, normally CD-ROM */
-#define	FS_BOOT		13		/* partition contains bootstrap */
-#define	FS_VINUM	14		/* Vinum drive */
-#define	FS_RAID		15		/* RAIDFrame drive */
-#define	FS_FILECORE	16		/* Acorn Filecore Filing System */
-#define	FS_EXT2FS	17		/* ext2fs */
-#define	FS_NTFS		18		/* Windows/NT file system */
-#define	FS_CCD		20		/* concatenated disk component */
-#define	FS_JFS2		21		/* IBM JFS2 */
-#define	FS_HAMMER	22		/* DragonFlyBSD Hammer FS */
-#define	FS_HAMMER2	23		/* DragonFlyBSD Hammer2 FS */
-#define	FS_UDF		24		/* UDF */
-#define	FS_EFS		26		/* SGI's Extent File system */
-#define	FS_ZFS		27		/* Sun's ZFS */
-#define	FS_NANDFS	30		/* FreeBSD nandfs (NiLFS derived) */
-
-#ifdef	FSTYPENAMES
-static const char *fstypenames[] = {
-	"unused",
-	"swap",
-	"Version 6",
-	"Version 7",
-	"System V",
-	"4.1BSD",
-	"Eighth Edition",
-	"4.2BSD",
-	"MSDOS",
-	"4.4LFS",
-	"unknown",
-	"HPFS",
-	"ISO9660",
-	"boot",
-	"vinum",
-	"raid",
-	"Filecore",
-	"EXT2FS",
-	"NTFS",
-	"?",
-	"ccd",
-	"jfs",
-	"HAMMER",
-	"HAMMER2",
-	"UDF",
-	"?",
-	"EFS",
-	"ZFS",
-	"?",
-	"?",
-	"nandfs",
-	NULL
-};
-#define FSMAXTYPES	(sizeof(fstypenames) / sizeof(fstypenames[0]) - 1)
-#endif
-
-/*
- * flags shared by various drives:
- */
-#define	D_REMOVABLE	0x01		/* removable media */
-#define	D_ECC		0x02		/* supports ECC */
-#define	D_BADSECT	0x04		/* supports bad sector forw. */
-#define	D_RAMDISK	0x08		/* disk emulator */
-#define	D_CHAIN		0x10		/* can do back-back transfers */
-
-/*
- * Disklabel-specific ioctls.
- *
- * NB: <sys/disk.h> defines ioctls from 'd'/128 and up.
- */
-		/* get and set disklabel */
-#define DIOCGDINFO	_IOR('d', 101, struct disklabel)/* get */
-#define DIOCSDINFO	_IOW('d', 102, struct disklabel)/* set */
-#define DIOCWDINFO	_IOW('d', 103, struct disklabel)/* set, update disk */
-#define DIOCBSDBB	_IOW('d', 110, void *)	/* write bootblocks */
-
-/*
- * Functions for proper encoding/decoding of struct disklabel into/from
- * bytestring.
- */
-void bsd_partition_le_dec(u_char *ptr, struct partition *d);
-int bsd_disklabel_le_dec(u_char *ptr, struct disklabel *d, int maxpart);
-void bsd_partition_le_enc(u_char *ptr, struct partition *d);
-void bsd_disklabel_le_enc(u_char *ptr, struct disklabel *d);
-
-#ifndef _KERNEL
-__BEGIN_DECLS
-struct disklabel *getdiskbyname(const char *);
-__END_DECLS
-#endif
-
-#endif /* !_SYS_DISKLABEL_H_ */
diff --git a/include.new/sys/diskmbr.h b/include.new/sys/diskmbr.h
deleted file mode 100644
index 00ec577..0000000
--- a/include.new/sys/diskmbr.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 1987, 1988, 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.
- * 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.
- *
- *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD: releng/10.2/sys/sys/diskmbr.h 282861 2015-05-13 14:05:53Z ae $
- */
-
-#ifndef _SYS_DISKMBR_H_
-#define	_SYS_DISKMBR_H_
-
-#include <sys/ioccom.h>
-
-#define	DOSBBSECTOR	0	/* DOS boot block relative sector number */
-#define	DOSDSNOFF	440	/* WinNT/2K/XP Drive Serial Number offset */
-#define	DOSPARTOFF	446
-#define	DOSPARTSIZE	16
-#define	NDOSPART	4
-#define	NEXTDOSPART	32
-#define	DOSMAGICOFFSET	510
-#define	DOSMAGIC	0xAA55
-
-#define	DOSPTYP_EXT	0x05	/* DOS extended partition */
-#define	DOSPTYP_FAT16	0x06	/* FAT16 partition */
-#define	DOSPTYP_NTFS	0x07	/* NTFS partition */
-#define	DOSPTYP_FAT32	0x0b	/* FAT32 partition */
-#define	DOSPTYP_EXTLBA	0x0f	/* DOS extended partition */
-#define	DOSPTYP_PPCBOOT	0x41	/* PReP/CHRP boot partition */
-#define	DOSPTYP_LDM	0x42	/* Win2k dynamic extended partition */
-#define	DOSPTYP_LINSWP	0x82	/* Linux swap partition */
-#define	DOSPTYP_LINUX	0x83	/* Linux partition */
-#define	DOSPTYP_LINLVM	0x8e	/* Linux LVM partition */
-#define	DOSPTYP_386BSD	0xa5	/* 386BSD partition type */
-#define	DOSPTYP_APPLE_UFS	0xa8	/* Apple Mac OS X boot */
-#define	DOSPTYP_APPLE_BOOT	0xab	/* Apple Mac OS X UFS */
-#define	DOSPTYP_HFS	0xaf	/* HFS/HFS+ partition type */
-#define	DOSPTYP_PMBR	0xee	/* GPT Protective MBR */
-#define	DOSPTYP_VMFS	0xfb	/* VMware VMFS partition */
-#define	DOSPTYP_VMKDIAG	0xfc	/* VMware vmkDiagnostic partition */
-#define	DOSPTYP_LINRAID	0xfd	/* Linux raid partition */
-
-struct dos_partition {
-	unsigned char	dp_flag;	/* bootstrap flags */
-	unsigned char	dp_shd;		/* starting head */
-	unsigned char	dp_ssect;	/* starting sector */
-	unsigned char	dp_scyl;	/* starting cylinder */
-	unsigned char	dp_typ;		/* partition type */
-	unsigned char	dp_ehd;		/* end head */
-	unsigned char	dp_esect;	/* end sector */
-	unsigned char	dp_ecyl;	/* end cylinder */
-	uint32_t	dp_start;	/* absolute starting sector number */
-	uint32_t	dp_size;	/* partition size in sectors */
-};
-#ifdef CTASSERT
-CTASSERT(sizeof (struct dos_partition) == DOSPARTSIZE);
-#endif
-
-void dos_partition_dec(void const *pp, struct dos_partition *d);
-void dos_partition_enc(void *pp, struct dos_partition *d);
-
-#define	DPSECT(s) ((s) & 0x3f)		/* isolate relevant bits of sector */
-#define	DPCYL(c, s) ((c) + (((s) & 0xc0)<<2)) /* and those that are cylinder */
-
-#define DIOCSMBR 	_IOW('M', 129, u_char[512])
-
-#endif /* !_SYS_DISKMBR_H_ */
diff --git a/include.new/sys/diskpc98.h b/include.new/sys/diskpc98.h
deleted file mode 100644
index ab31662..0000000
--- a/include.new/sys/diskpc98.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 1987, 1988, 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.
- * 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.
- *
- *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD: releng/10.2/sys/sys/diskpc98.h 254015 2013-08-07 00:00:48Z marcel $
- */
-
-#ifndef _SYS_DISKPC98_H_
-#define	_SYS_DISKPC98_H_
-
-#include <sys/ioccom.h>
-
-#define	PC98_BBSECTOR	1	/* DOS boot block relative sector number */
-#define	PC98_PARTOFF	0
-#define	PC98_PARTSIZE	32
-#define	PC98_NPARTS	16
-#define	PC98_MAGICOFS	510
-#define	PC98_MAGIC	0xAA55
-
-#define	PC98_MID_BOOTABLE	0x80
-#define	PC98_MID_MASK		0x7f
-#define	PC98_MID_386BSD		0x14
-
-#define	PC98_SID_ACTIVE		0x80
-#define	PC98_SID_MASK		0x7f
-#define	PC98_SID_386BSD		0x44
-
-#define	DOSMID_386BSD		(PC98_MID_386BSD | PC98_MID_BOOTABLE)
-#define	DOSSID_386BSD		(PC98_SID_386BSD | PC98_SID_ACTIVE)
-#define	PC98_PTYP_386BSD	(DOSSID_386BSD << 8 | DOSMID_386BSD)
-
-struct pc98_partition {
-    	unsigned char	dp_mid;
-	unsigned char	dp_sid;
-	unsigned char	dp_dum1;
-	unsigned char	dp_dum2;
-	unsigned char	dp_ipl_sct;
-	unsigned char	dp_ipl_head;
-	unsigned short	dp_ipl_cyl;
-	unsigned char	dp_ssect;	/* starting sector */
-	unsigned char	dp_shd;		/* starting head */
-	unsigned short	dp_scyl;	/* starting cylinder */
-	unsigned char	dp_esect;	/* end sector */
-	unsigned char	dp_ehd;		/* end head */
-	unsigned short	dp_ecyl;	/* end cylinder */
-	unsigned char	dp_name[16];
-};
-#ifdef CTASSERT
-CTASSERT(sizeof (struct pc98_partition) == PC98_PARTSIZE);
-#endif
-
-void pc98_partition_dec(void const *pp, struct pc98_partition *d);
-void pc98_partition_enc(void *pp, struct pc98_partition *d);
-
-#define DIOCSPC98	_IOW('M', 129, u_char[8192])
-
-#endif /* !_SYS_DISKPC98_H_ */
diff --git a/include.new/sys/dkstat.h b/include.new/sys/dkstat.h
deleted file mode 100644
index 6074f01..0000000
--- a/include.new/sys/dkstat.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)dkstat.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/dkstat.h 127976 2004-04-07 04:19:52Z imp $
- */
-
-#ifndef _SYS_DKSTAT_H_
-#define _SYS_DKSTAT_H_ 1
-
-#include <sys/resource.h>
-
-#endif /* _SYS_DKSTAT_H_ */
diff --git a/include.new/sys/domain.h b/include.new/sys/domain.h
deleted file mode 100644
index ec65727..0000000
--- a/include.new/sys/domain.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)domain.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/domain.h 248534 2013-03-19 20:58:17Z jilles $
- */
-
-#ifndef _SYS_DOMAIN_H_
-#define _SYS_DOMAIN_H_
-
-/*
- * Structure per communications domain.
- */
-
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-struct	ifnet;
-
-struct domain {
-	int	dom_family;		/* AF_xxx */
-	char	*dom_name;
-	void	(*dom_init)		/* initialize domain data structures */
-		(void);
-	void	(*dom_destroy)		/* cleanup structures / state */
-		(void);
-	int	(*dom_externalize)	/* externalize access rights */
-		(struct mbuf *, struct mbuf **, int);
-	void	(*dom_dispose)		/* dispose of internalized rights */
-		(struct mbuf *);
-	struct	protosw *dom_protosw, *dom_protoswNPROTOSW;
-	struct	domain *dom_next;
-	int	(*dom_rtattach)		/* initialize routing table */
-		(void **, int);
-	int	(*dom_rtdetach)		/* clean up routing table */
-		(void **, int);
-	int	dom_rtoffset;		/* an arg to rtattach, in bits */
-		/* XXX MRT.
-		 * rtoffset May be 0 if the domain supplies its own rtattach(),
-		 * in which case, a 0 indicates it's being called from 
-		 * vfs_export.c (HACK)  Only for AF_INET{,6} at this time.
-		 * Temporary ABI compat hack.. fix post RELENG_7
-		 */
-	int	dom_maxrtkey;		/* for routing layer */
-	void	*(*dom_ifattach)(struct ifnet *);
-	void	(*dom_ifdetach)(struct ifnet *, void *);
-					/* af-dependent data on ifnet */
-};
-
-#ifdef _KERNEL
-extern int	domain_init_status;
-extern struct	domain *domains;
-void		domain_add(void *);
-void		domain_init(void *);
-#ifdef VIMAGE
-void		vnet_domain_init(void *);
-void		vnet_domain_uninit(void *);
-#endif
-
-#define	DOMAIN_SET(name)						\
-	SYSINIT(domain_add_ ## name, SI_SUB_PROTO_DOMAIN,		\
-	    SI_ORDER_FIRST, domain_add, & name ## domain);		\
-	SYSINIT(domain_init_ ## name, SI_SUB_PROTO_DOMAIN,		\
-	    SI_ORDER_SECOND, domain_init, & name ## domain);
-#ifdef VIMAGE
-#define	VNET_DOMAIN_SET(name)						\
-	SYSINIT(domain_add_ ## name, SI_SUB_PROTO_DOMAIN,		\
-	    SI_ORDER_FIRST, domain_add, & name ## domain);		\
-	VNET_SYSINIT(vnet_domain_init_ ## name, SI_SUB_PROTO_DOMAIN,	\
-	    SI_ORDER_SECOND, vnet_domain_init, & name ## domain);	\
-	VNET_SYSUNINIT(vnet_domain_uninit_ ## name,			\
-	    SI_SUB_PROTO_DOMAIN, SI_ORDER_SECOND, vnet_domain_uninit,	\
-	    & name ## domain)
-#else /* !VIMAGE */
-#define	VNET_DOMAIN_SET(name)	DOMAIN_SET(name)
-#endif /* VIMAGE */
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_DOMAIN_H_ */
diff --git a/include.new/sys/dtrace_bsd.h b/include.new/sys/dtrace_bsd.h
deleted file mode 100644
index 4bef181..0000000
--- a/include.new/sys/dtrace_bsd.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*-
- * Copyright (c) 2007-2008 John Birrell (jb@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.
- *
- * 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: releng/10.2/sys/sys/dtrace_bsd.h 282748 2015-05-11 07:54:39Z avg $
- *
- * This file contains BSD shims for Sun's DTrace code.
- */
-
-#ifndef _SYS_DTRACE_BSD_H
-#define	_SYS_DTRACE_BSD_H
-
-/* Forward definitions: */
-struct mbuf;
-struct trapframe;
-struct thread;
-struct vattr;
-struct vnode;
-struct reg;
-struct devstat;
-struct bio;
-
-/*
- * The dtrace module handles traps that occur during a DTrace probe.
- * This type definition is used in the trap handler to provide a
- * hook for the dtrace module to register it's handler with.
- */
-typedef int (*dtrace_trap_func_t)(struct trapframe *, u_int);
-
-int	dtrace_trap(struct trapframe *, u_int);
-
-extern dtrace_trap_func_t	dtrace_trap_func;
-
-/*
- * A hook which removes active FBT probes before executing the double fault
- * handler. We want to ensure that DTrace doesn't trigger another trap, which
- * would result in a reset.
- */
-typedef	int (*dtrace_invop_func_t)(uintptr_t, uintptr_t *, uintptr_t);
-typedef void (*dtrace_doubletrap_func_t)(void);
-extern	dtrace_invop_func_t	dtrace_invop_func;
-extern	dtrace_doubletrap_func_t	dtrace_doubletrap_func;
-
-/* Pid provider hooks */
-typedef int (*dtrace_pid_probe_ptr_t)(struct reg *);
-extern	dtrace_pid_probe_ptr_t	dtrace_pid_probe_ptr;
-typedef int (*dtrace_return_probe_ptr_t)(struct reg *);
-extern	dtrace_return_probe_ptr_t	dtrace_return_probe_ptr;
-
-/* Virtual time hook function type. */
-typedef	void (*dtrace_vtime_switch_func_t)(struct thread *);
-
-extern int			dtrace_vtime_active;
-extern dtrace_vtime_switch_func_t	dtrace_vtime_switch_func;
-
-/* The fasttrap module hooks into the fork, exit and exit. */
-typedef void (*dtrace_fork_func_t)(struct proc *, struct proc *);
-typedef void (*dtrace_execexit_func_t)(struct proc *);
-
-/* Global variable in kern_fork.c */
-extern dtrace_fork_func_t	dtrace_fasttrap_fork;
-
-/* Global variable in kern_exec.c */
-extern dtrace_execexit_func_t	dtrace_fasttrap_exec;
-
-/* Global variable in kern_exit.c */
-extern dtrace_execexit_func_t	dtrace_fasttrap_exit;
-
-/* The dtmalloc provider hooks into malloc. */
-typedef	void (*dtrace_malloc_probe_func_t)(uint32_t, uintptr_t arg0,
-    uintptr_t arg1, uintptr_t arg2, uintptr_t arg3, uintptr_t arg4);
-
-extern dtrace_malloc_probe_func_t   dtrace_malloc_probe;
-
-/* dtnfsclient NFSv[34] access cache provider hooks. */
-typedef void (*dtrace_nfsclient_accesscache_flush_probe_func_t)(uint32_t,
-    struct vnode *);
-extern dtrace_nfsclient_accesscache_flush_probe_func_t
-    dtrace_nfsclient_accesscache_flush_done_probe;
-extern dtrace_nfsclient_accesscache_flush_probe_func_t
-    dtrace_nfscl_accesscache_flush_done_probe;
-
-typedef void (*dtrace_nfsclient_accesscache_get_probe_func_t)(uint32_t,
-    struct vnode *, uid_t, uint32_t);
-extern dtrace_nfsclient_accesscache_get_probe_func_t
-    dtrace_nfsclient_accesscache_get_hit_probe,
-    dtrace_nfsclient_accesscache_get_miss_probe;
-extern dtrace_nfsclient_accesscache_get_probe_func_t
-    dtrace_nfscl_accesscache_get_hit_probe,
-    dtrace_nfscl_accesscache_get_miss_probe;
-
-typedef void (*dtrace_nfsclient_accesscache_load_probe_func_t)(uint32_t,
-    struct vnode *, uid_t, uint32_t, int);
-extern dtrace_nfsclient_accesscache_load_probe_func_t
-    dtrace_nfsclient_accesscache_load_done_probe;
-extern dtrace_nfsclient_accesscache_load_probe_func_t
-    dtrace_nfscl_accesscache_load_done_probe;
-
-/* dtnfsclient NFSv[234] attribute cache provider hooks. */
-typedef void (*dtrace_nfsclient_attrcache_flush_probe_func_t)(uint32_t,
-    struct vnode *);
-extern dtrace_nfsclient_attrcache_flush_probe_func_t
-    dtrace_nfsclient_attrcache_flush_done_probe;
-extern dtrace_nfsclient_attrcache_flush_probe_func_t
-    dtrace_nfscl_attrcache_flush_done_probe;
-
-typedef void (*dtrace_nfsclient_attrcache_get_hit_probe_func_t)(uint32_t,
-    struct vnode *, struct vattr *);
-extern dtrace_nfsclient_attrcache_get_hit_probe_func_t
-    dtrace_nfsclient_attrcache_get_hit_probe;
-extern dtrace_nfsclient_attrcache_get_hit_probe_func_t
-    dtrace_nfscl_attrcache_get_hit_probe;
-
-typedef void (*dtrace_nfsclient_attrcache_get_miss_probe_func_t)(uint32_t,
-    struct vnode *);
-extern dtrace_nfsclient_attrcache_get_miss_probe_func_t
-    dtrace_nfsclient_attrcache_get_miss_probe;
-extern dtrace_nfsclient_attrcache_get_miss_probe_func_t
-    dtrace_nfscl_attrcache_get_miss_probe;
-
-typedef void (*dtrace_nfsclient_attrcache_load_probe_func_t)(uint32_t,
-    struct vnode *, struct vattr *, int);
-extern dtrace_nfsclient_attrcache_load_probe_func_t
-    dtrace_nfsclient_attrcache_load_done_probe;
-extern dtrace_nfsclient_attrcache_load_probe_func_t
-    dtrace_nfscl_attrcache_load_done_probe;
-
-/* dtnfsclient NFSv[234] RPC provider hooks. */
-typedef void (*dtrace_nfsclient_nfs23_start_probe_func_t)(uint32_t,
-    struct vnode *, struct mbuf *, struct ucred *, int);
-extern dtrace_nfsclient_nfs23_start_probe_func_t
-    dtrace_nfsclient_nfs23_start_probe;
-extern dtrace_nfsclient_nfs23_start_probe_func_t
-    dtrace_nfscl_nfs234_start_probe;
-
-typedef void (*dtrace_nfsclient_nfs23_done_probe_func_t)(uint32_t,
-    struct vnode *, struct mbuf *, struct ucred *, int, int);
-extern dtrace_nfsclient_nfs23_done_probe_func_t
-    dtrace_nfsclient_nfs23_done_probe;
-extern dtrace_nfsclient_nfs23_done_probe_func_t
-    dtrace_nfscl_nfs234_done_probe;
-
-/* IO Provider hooks, really hook into devstat */
-typedef void (*dtrace_io_start_probe_func_t)(uint32_t, struct bio *,
-					     struct devstat *);
-extern dtrace_io_start_probe_func_t dtrace_io_start_probe;
-
-typedef void (*dtrace_io_done_probe_func_t)(uint32_t, struct bio *,
-					    struct devstat *);
-extern dtrace_io_done_probe_func_t dtrace_io_done_probe;
-
-typedef void (*dtrace_io_wait_start_probe_func_t)(uint32_t, uintptr_t *, 
-						  struct devstat *);
-extern dtrace_io_wait_start_probe_func_t dtrace_io_wait_start_probe;
-
-typedef void (*dtrace_io_wait_done_probe_func_t)(uint32_t, uintptr_t *, 
-						 struct devstat *);
-extern dtrace_io_wait_done_probe_func_t dtrace_io_wait_done_probe;
-
-/*
- * Functions which allow the dtrace module to check that the kernel 
- * hooks have been compiled with sufficient space for it's private
- * structures.
- */
-size_t	kdtrace_proc_size(void);
-size_t	kdtrace_thread_size(void);
-
-/*
- * OpenSolaris compatible time functions returning nanoseconds.
- * On OpenSolaris these return hrtime_t which we define as uint64_t.
- */
-uint64_t	dtrace_gethrtime(void);
-uint64_t	dtrace_gethrestime(void);
-
-#endif /* _SYS_DTRACE_BSD_H */
diff --git a/include.new/sys/dvdio.h b/include.new/sys/dvdio.h
deleted file mode 100644
index a59b0e1..0000000
--- a/include.new/sys/dvdio.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * Copyright (c) 1999,2000,2001,2002 Søren Schmidt <sos@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,
- *    without modification, immediately at the beginning of the file.
- * 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 ``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 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: releng/10.2/sys/sys/dvdio.h 230132 2012-01-15 13:23:18Z uqs $
- */
-
-#ifndef _SYS_DVDIO_H_
-#define _SYS_DVDIO_H_
-
-struct dvd_layer {
-	u_int8_t book_type	:4;
-	u_int8_t book_version	:4;
-	u_int8_t disc_size	:4;
-	u_int8_t max_rate	:4;
-	u_int8_t nlayers	:2;
-	u_int8_t track_path	:1;
-	u_int8_t layer_type	:4;
-	u_int8_t linear_density	:4;
-	u_int8_t track_density	:4;
-	u_int8_t bca		:1;
-	uint32_t start_sector;
-	uint32_t end_sector;
-	uint32_t end_sector_l0;
-};
-
-struct dvd_struct {
-	u_char format;
-	u_char layer_num;
-	u_char cpst;
-	u_char rmi;
-	u_int8_t agid		:2;
-	uint32_t length;
-	u_char data[2048];
-};
-
-struct dvd_authinfo {
-	unsigned char format;
-	u_int8_t agid		:2;
-	u_int8_t asf		:1;
-	u_int8_t cpm		:1;
-	u_int8_t cp_sec		:1;
-	u_int8_t cgms		:2;
-	u_int8_t reg_type	:2;
-	u_int8_t vend_rsts	:3;
-	u_int8_t user_rsts	:3;
-	u_int8_t region;
-	u_int8_t rpc_scheme;
-	uint32_t lba;
-	u_char keychal[10];
-};
-
-#define DVD_STRUCT_PHYSICAL	0x00
-#define DVD_STRUCT_COPYRIGHT	0x01
-#define DVD_STRUCT_DISCKEY	0x02
-#define DVD_STRUCT_BCA		0x03
-#define DVD_STRUCT_MANUFACT	0x04
-#define DVD_STRUCT_CMI		0x05
-#define DVD_STRUCT_PROTDISCID	0x06
-#define DVD_STRUCT_DISCKEYBLOCK	0x07
-#define DVD_STRUCT_DDS		0x08
-#define DVD_STRUCT_MEDIUM_STAT	0x09
-#define DVD_STRUCT_SPARE_AREA	0x0A
-#define DVD_STRUCT_RMD_LAST	0x0C
-#define DVD_STRUCT_RMD_RMA	0x0D
-#define DVD_STRUCT_PRERECORDED	0x0E
-#define DVD_STRUCT_UNIQUEID	0x0F
-#define DVD_STRUCT_DCB		0x30
-#define DVD_STRUCT_LIST		0xFF
-
-#define DVD_REPORT_AGID		0
-#define DVD_REPORT_CHALLENGE	1
-#define DVD_REPORT_KEY1		2
-#define DVD_REPORT_TITLE_KEY	4
-#define DVD_REPORT_ASF		5
-#define DVD_REPORT_RPC		8
-#define DVD_INVALIDATE_AGID	0x3f
-
-#define DVD_SEND_CHALLENGE	1
-#define DVD_SEND_KEY2		3
-#define DVD_SEND_RPC		6
-
-#define DVDIOCREPORTKEY		_IOWR('c', 200, struct dvd_authinfo)
-#define DVDIOCSENDKEY		_IOWR('c', 201, struct dvd_authinfo)
-#define DVDIOCREADSTRUCTURE	_IOWR('c', 202, struct dvd_struct)
-
-#endif /* _SYS_DVDIO_H_ */
diff --git a/include.new/sys/efi.h b/include.new/sys/efi.h
deleted file mode 100644
index 9ed5f18..0000000
--- a/include.new/sys/efi.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * Copyright (c) 2004 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/efi.h 270296 2014-08-21 19:51:07Z emaste $
- */
-
-#ifndef _SYS_EFI_H_
-#define _SYS_EFI_H_
-
-#include <sys/uuid.h>
-
-#define	EFI_PAGE_SHIFT		12
-#define	EFI_PAGE_SIZE		(1 << EFI_PAGE_SHIFT)
-#define	EFI_PAGE_MASK		(EFI_PAGE_SIZE - 1)
-
-#define	EFI_TABLE_ACPI20			\
-	{0x8868e871,0xe4f1,0x11d3,0xbc,0x22,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define	EFI_TABLE_SAL				\
-	{0xeb9d2d32,0x2d88,0x11d3,0x9a,0x16,{0x00,0x90,0x27,0x3f,0xc1,0x4d}}
-
-enum efi_reset {
-	EFI_RESET_COLD,
-	EFI_RESET_WARM
-};
-
-typedef uint16_t	efi_char;
-typedef unsigned long efi_status;
-
-struct efi_cfgtbl {
-	struct uuid	ct_uuid;
-	uint64_t	ct_data;
-};
-
-struct efi_md {
-	uint32_t	md_type;
-#define	EFI_MD_TYPE_NULL	0
-#define	EFI_MD_TYPE_CODE	1	/* Loader text. */
-#define	EFI_MD_TYPE_DATA	2	/* Loader data. */
-#define	EFI_MD_TYPE_BS_CODE	3	/* Boot services text. */
-#define	EFI_MD_TYPE_BS_DATA	4	/* Boot services data. */
-#define	EFI_MD_TYPE_RT_CODE	5	/* Runtime services text. */
-#define	EFI_MD_TYPE_RT_DATA	6	/* Runtime services data. */
-#define	EFI_MD_TYPE_FREE	7	/* Unused/free memory. */
-#define	EFI_MD_TYPE_BAD		8	/* Bad memory */
-#define	EFI_MD_TYPE_RECLAIM	9	/* ACPI reclaimable memory. */
-#define	EFI_MD_TYPE_FIRMWARE	10	/* ACPI NV memory */
-#define	EFI_MD_TYPE_IOMEM	11	/* Memory-mapped I/O. */
-#define	EFI_MD_TYPE_IOPORT	12	/* I/O port space. */
-#define	EFI_MD_TYPE_PALCODE	13	/* PAL */
-	uint32_t	__pad;
-	uint64_t	md_phys;
-	void		*md_virt;
-	uint64_t	md_pages;
-	uint64_t	md_attr;
-#define	EFI_MD_ATTR_UC		0x0000000000000001UL
-#define	EFI_MD_ATTR_WC		0x0000000000000002UL
-#define	EFI_MD_ATTR_WT		0x0000000000000004UL
-#define	EFI_MD_ATTR_WB		0x0000000000000008UL
-#define	EFI_MD_ATTR_UCE		0x0000000000000010UL
-#define	EFI_MD_ATTR_WP		0x0000000000001000UL
-#define	EFI_MD_ATTR_RP		0x0000000000002000UL
-#define	EFI_MD_ATTR_XP		0x0000000000004000UL
-#define	EFI_MD_ATTR_RT		0x8000000000000000UL
-};
-
-struct efi_tm {
-	uint16_t	tm_year;		/* 1998 - 20XX */
-	uint8_t		tm_mon;			/* 1 - 12 */
-	uint8_t		tm_mday;		/* 1 - 31 */
-	uint8_t		tm_hour;		/* 0 - 23 */
-	uint8_t		tm_min;			/* 0 - 59 */
-	uint8_t		tm_sec;			/* 0 - 59 */
-	uint8_t		__pad1;
-	uint32_t	tm_nsec;		/* 0 - 999,999,999 */
-	int16_t		tm_tz;			/* -1440 to 1440 or 2047 */
-	uint8_t		tm_dst;
-	uint8_t		__pad2;
-};
-
-struct efi_tmcap {
-	uint32_t	tc_res;		/* 1e-6 parts per million */
-	uint32_t	tc_prec;	/* hertz */
-	uint8_t		tc_stz;		/* Set clears sub-second time */
-};
-
-struct efi_tblhdr {
-	uint64_t	th_sig;
-	uint32_t	th_rev;
-	uint32_t	th_hdrsz;
-	uint32_t	th_crc32;
-	uint32_t	__res;
-};
-
-struct efi_rt {
-	struct efi_tblhdr rt_hdr;
-	efi_status	(*rt_gettime)(struct efi_tm *, struct efi_tmcap *);
-	efi_status	(*rt_settime)(struct efi_tm *);
-	efi_status	(*rt_getwaketime)(uint8_t *, uint8_t *,
-	    struct efi_tm *);
-	efi_status	(*rt_setwaketime)(uint8_t, struct efi_tm *);
-	efi_status	(*rt_setvirtual)(u_long, u_long, uint32_t,
-	    struct efi_md *);
-	efi_status	(*rt_cvtptr)(u_long, void **);
-	efi_status	(*rt_getvar)(efi_char *, struct uuid *, uint32_t *,
-	    u_long *, void *);
-	efi_status	(*rt_scanvar)(u_long *, efi_char *, struct uuid *);
-	efi_status	(*rt_setvar)(efi_char *, struct uuid *, uint32_t,
-	    u_long, void *);
-	efi_status	(*rt_gethicnt)(uint32_t *);
-	efi_status	(*rt_reset)(enum efi_reset, efi_status, u_long,
-	    efi_char *);
-};
-
-struct efi_systbl {
-	struct efi_tblhdr st_hdr;
-#define	EFI_SYSTBL_SIG	0x5453595320494249UL
-	efi_char	*st_fwvendor;
-	uint32_t	st_fwrev;
-	uint32_t	__pad;
-	void		*st_cin;
-	void		*st_cinif;
-	void		*st_cout;
-	void		*st_coutif;
-	void		*st_cerr;
-	void		*st_cerrif;
-	uint64_t	st_rt;
-	void		*st_bs;
-	u_long		st_entries;
-	uint64_t	st_cfgtbl;
-};
-
-#if defined(_KERNEL) && defined(__ia64__)
-
-typedef u_long (*ia64_efi_f)(u_long, u_long, u_long, u_long);
-
-u_long ia64_efi_physical(ia64_efi_f, u_long, u_long, u_long, u_long);
-
-void efi_boot_finish(void);
-int efi_boot_minimal(uint64_t);
-void *efi_get_table(struct uuid *);
-void efi_get_time(struct efi_tm *);
-struct efi_md *efi_md_find(vm_paddr_t);
-struct efi_md *efi_md_first(void);
-struct efi_md *efi_md_last(void);
-struct efi_md *efi_md_next(struct efi_md *);
-struct efi_md *efi_md_prev(struct efi_md *);
-void efi_reset_system(void);
-int efi_set_time(struct efi_tm *);
-int efi_var_get(efi_char *, struct uuid *, uint32_t *, size_t *, void *);
-int efi_var_nextname(size_t *, efi_char *, struct uuid *);
-int efi_var_set(efi_char *, struct uuid *, uint32_t, size_t, void *);
-
-#endif /* _KERNEL && __ia64__ */
-
-#endif /* _SYS_EFI_H_ */
diff --git a/include.new/sys/elf.h b/include.new/sys/elf.h
deleted file mode 100644
index 95befc7..0000000
--- a/include.new/sys/elf.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2001 David E. O'Brien.
- * 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.
- *
- * 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: releng/10.2/sys/sys/elf.h 174043 2007-11-28 21:54:46Z jb $
- */
-
-/*
- * This is a Solaris compatibility header
- */
-
-#ifndef	_SYS_ELF_H_
-#define	_SYS_ELF_H_
-
-#include <sys/types.h>
-#include <machine/elf.h>
-#include <sys/elf32.h>
-#include <sys/elf64.h>
-
-#endif /* !_SYS_ELF_H_ */
diff --git a/include.new/sys/elf32.h b/include.new/sys/elf32.h
deleted file mode 100644
index 898401d..0000000
--- a/include.new/sys/elf32.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*-
- * Copyright (c) 1996-1998 John D. Polstra.
- * 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.
- *
- * 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: releng/10.2/sys/sys/elf32.h 163457 2006-10-17 05:43:30Z jkoshy $
- */
-
-#ifndef _SYS_ELF32_H_
-#define _SYS_ELF32_H_ 1
-
-#include <sys/elf_common.h>
-
-/*
- * ELF definitions common to all 32-bit architectures.
- */
-
-typedef uint32_t	Elf32_Addr;
-typedef uint16_t	Elf32_Half;
-typedef uint32_t	Elf32_Off;
-typedef int32_t		Elf32_Sword;
-typedef uint32_t	Elf32_Word;
-typedef uint64_t	Elf32_Lword;
-
-typedef Elf32_Word	Elf32_Hashelt;
-
-/* Non-standard class-dependent datatype used for abstraction. */
-typedef Elf32_Word	Elf32_Size;
-typedef Elf32_Sword	Elf32_Ssize;
-
-/*
- * ELF header.
- */
-
-typedef struct {
-	unsigned char	e_ident[EI_NIDENT];	/* File identification. */
-	Elf32_Half	e_type;		/* File type. */
-	Elf32_Half	e_machine;	/* Machine architecture. */
-	Elf32_Word	e_version;	/* ELF format version. */
-	Elf32_Addr	e_entry;	/* Entry point. */
-	Elf32_Off	e_phoff;	/* Program header file offset. */
-	Elf32_Off	e_shoff;	/* Section header file offset. */
-	Elf32_Word	e_flags;	/* Architecture-specific flags. */
-	Elf32_Half	e_ehsize;	/* Size of ELF header in bytes. */
-	Elf32_Half	e_phentsize;	/* Size of program header entry. */
-	Elf32_Half	e_phnum;	/* Number of program header entries. */
-	Elf32_Half	e_shentsize;	/* Size of section header entry. */
-	Elf32_Half	e_shnum;	/* Number of section header entries. */
-	Elf32_Half	e_shstrndx;	/* Section name strings section. */
-} Elf32_Ehdr;
-
-/*
- * Section header.
- */
-
-typedef struct {
-	Elf32_Word	sh_name;	/* Section name (index into the
-					   section header string table). */
-	Elf32_Word	sh_type;	/* Section type. */
-	Elf32_Word	sh_flags;	/* Section flags. */
-	Elf32_Addr	sh_addr;	/* Address in memory image. */
-	Elf32_Off	sh_offset;	/* Offset in file. */
-	Elf32_Word	sh_size;	/* Size in bytes. */
-	Elf32_Word	sh_link;	/* Index of a related section. */
-	Elf32_Word	sh_info;	/* Depends on section type. */
-	Elf32_Word	sh_addralign;	/* Alignment in bytes. */
-	Elf32_Word	sh_entsize;	/* Size of each entry in section. */
-} Elf32_Shdr;
-
-/*
- * Program header.
- */
-
-typedef struct {
-	Elf32_Word	p_type;		/* Entry type. */
-	Elf32_Off	p_offset;	/* File offset of contents. */
-	Elf32_Addr	p_vaddr;	/* Virtual address in memory image. */
-	Elf32_Addr	p_paddr;	/* Physical address (not used). */
-	Elf32_Word	p_filesz;	/* Size of contents in file. */
-	Elf32_Word	p_memsz;	/* Size of contents in memory. */
-	Elf32_Word	p_flags;	/* Access permission flags. */
-	Elf32_Word	p_align;	/* Alignment in memory and file. */
-} Elf32_Phdr;
-
-/*
- * Dynamic structure.  The ".dynamic" section contains an array of them.
- */
-
-typedef struct {
-	Elf32_Sword	d_tag;		/* Entry type. */
-	union {
-		Elf32_Word	d_val;	/* Integer value. */
-		Elf32_Addr	d_ptr;	/* Address value. */
-	} d_un;
-} Elf32_Dyn;
-
-/*
- * Relocation entries.
- */
-
-/* Relocations that don't need an addend field. */
-typedef struct {
-	Elf32_Addr	r_offset;	/* Location to be relocated. */
-	Elf32_Word	r_info;		/* Relocation type and symbol index. */
-} Elf32_Rel;
-
-/* Relocations that need an addend field. */
-typedef struct {
-	Elf32_Addr	r_offset;	/* Location to be relocated. */
-	Elf32_Word	r_info;		/* Relocation type and symbol index. */
-	Elf32_Sword	r_addend;	/* Addend. */
-} Elf32_Rela;
-
-/* Macros for accessing the fields of r_info. */
-#define ELF32_R_SYM(info)	((info) >> 8)
-#define ELF32_R_TYPE(info)	((unsigned char)(info))
-
-/* Macro for constructing r_info from field values. */
-#define ELF32_R_INFO(sym, type)	(((sym) << 8) + (unsigned char)(type))
-
-/*
- *	Note entry header
- */
-typedef Elf_Note Elf32_Nhdr;
-
-/*
- *	Move entry
- */
-typedef struct {
-	Elf32_Lword	m_value;	/* symbol value */
-	Elf32_Word 	m_info;		/* size + index */
-	Elf32_Word	m_poffset;	/* symbol offset */
-	Elf32_Half	m_repeat;	/* repeat count */
-	Elf32_Half	m_stride;	/* stride info */
-} Elf32_Move;
-
-/*
- *	The macros compose and decompose values for Move.r_info
- *
- *	sym = ELF32_M_SYM(M.m_info)
- *	size = ELF32_M_SIZE(M.m_info)
- *	M.m_info = ELF32_M_INFO(sym, size)
- */
-#define	ELF32_M_SYM(info)	((info)>>8)
-#define	ELF32_M_SIZE(info)	((unsigned char)(info))
-#define	ELF32_M_INFO(sym, size)	(((sym)<<8)+(unsigned char)(size))
-
-/*
- *	Hardware/Software capabilities entry
- */
-typedef struct {
-	Elf32_Word	c_tag;		/* how to interpret value */
-	union {
-		Elf32_Word	c_val;
-		Elf32_Addr	c_ptr;
-	} c_un;
-} Elf32_Cap;
-
-/*
- * Symbol table entries.
- */
-
-typedef struct {
-	Elf32_Word	st_name;	/* String table index of name. */
-	Elf32_Addr	st_value;	/* Symbol value. */
-	Elf32_Word	st_size;	/* Size of associated object. */
-	unsigned char	st_info;	/* Type and binding information. */
-	unsigned char	st_other;	/* Reserved (not used). */
-	Elf32_Half	st_shndx;	/* Section index of symbol. */
-} Elf32_Sym;
-
-/* Macros for accessing the fields of st_info. */
-#define ELF32_ST_BIND(info)		((info) >> 4)
-#define ELF32_ST_TYPE(info)		((info) & 0xf)
-
-/* Macro for constructing st_info from field values. */
-#define ELF32_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
-
-/* Macro for accessing the fields of st_other. */
-#define ELF32_ST_VISIBILITY(oth)	((oth) & 0x3)
-
-/* Structures used by Sun & GNU symbol versioning. */
-typedef struct
-{
-	Elf32_Half	vd_version;
-	Elf32_Half	vd_flags;
-	Elf32_Half	vd_ndx;
-	Elf32_Half	vd_cnt;
-	Elf32_Word	vd_hash;
-	Elf32_Word	vd_aux;
-	Elf32_Word	vd_next;
-} Elf32_Verdef;
-
-typedef struct
-{
-	Elf32_Word	vda_name;
-	Elf32_Word	vda_next;
-} Elf32_Verdaux;
-
-typedef struct
-{
-	Elf32_Half	vn_version;
-	Elf32_Half	vn_cnt;
-	Elf32_Word	vn_file;
-	Elf32_Word	vn_aux;
-	Elf32_Word	vn_next;
-} Elf32_Verneed;
-
-typedef struct
-{
-	Elf32_Word	vna_hash;
-	Elf32_Half	vna_flags;
-	Elf32_Half	vna_other;
-	Elf32_Word	vna_name;
-	Elf32_Word	vna_next;
-} Elf32_Vernaux;
-
-typedef Elf32_Half Elf32_Versym;
-
-typedef struct {
-	Elf32_Half	si_boundto;	/* direct bindings - symbol bound to */
-	Elf32_Half	si_flags;	/* per symbol flags */
-} Elf32_Syminfo;
-
-#endif /* !_SYS_ELF32_H_ */
diff --git a/include.new/sys/elf64.h b/include.new/sys/elf64.h
deleted file mode 100644
index 54efd4b..0000000
--- a/include.new/sys/elf64.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*-
- * Copyright (c) 1996-1998 John D. Polstra.
- * 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.
- *
- * 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: releng/10.2/sys/sys/elf64.h 186667 2009-01-01 02:08:56Z obrien $
- */
-
-#ifndef _SYS_ELF64_H_
-#define _SYS_ELF64_H_ 1
-
-#include <sys/elf_common.h>
-
-/*
- * ELF definitions common to all 64-bit architectures.
- */
-
-typedef uint64_t	Elf64_Addr;
-typedef uint16_t	Elf64_Half;
-typedef uint64_t	Elf64_Off;
-typedef int32_t		Elf64_Sword;
-typedef int64_t		Elf64_Sxword;
-typedef uint32_t	Elf64_Word;
-typedef uint64_t	Elf64_Lword;
-typedef uint64_t	Elf64_Xword;
-
-/*
- * Types of dynamic symbol hash table bucket and chain elements.
- *
- * This is inconsistent among 64 bit architectures, so a machine dependent
- * typedef is required.
- */
-
-typedef Elf64_Word	Elf64_Hashelt;
-
-/* Non-standard class-dependent datatype used for abstraction. */
-typedef Elf64_Xword	Elf64_Size;
-typedef Elf64_Sxword	Elf64_Ssize;
-
-/*
- * ELF header.
- */
-
-typedef struct {
-	unsigned char	e_ident[EI_NIDENT];	/* File identification. */
-	Elf64_Half	e_type;		/* File type. */
-	Elf64_Half	e_machine;	/* Machine architecture. */
-	Elf64_Word	e_version;	/* ELF format version. */
-	Elf64_Addr	e_entry;	/* Entry point. */
-	Elf64_Off	e_phoff;	/* Program header file offset. */
-	Elf64_Off	e_shoff;	/* Section header file offset. */
-	Elf64_Word	e_flags;	/* Architecture-specific flags. */
-	Elf64_Half	e_ehsize;	/* Size of ELF header in bytes. */
-	Elf64_Half	e_phentsize;	/* Size of program header entry. */
-	Elf64_Half	e_phnum;	/* Number of program header entries. */
-	Elf64_Half	e_shentsize;	/* Size of section header entry. */
-	Elf64_Half	e_shnum;	/* Number of section header entries. */
-	Elf64_Half	e_shstrndx;	/* Section name strings section. */
-} Elf64_Ehdr;
-
-/*
- * Section header.
- */
-
-typedef struct {
-	Elf64_Word	sh_name;	/* Section name (index into the
-					   section header string table). */
-	Elf64_Word	sh_type;	/* Section type. */
-	Elf64_Xword	sh_flags;	/* Section flags. */
-	Elf64_Addr	sh_addr;	/* Address in memory image. */
-	Elf64_Off	sh_offset;	/* Offset in file. */
-	Elf64_Xword	sh_size;	/* Size in bytes. */
-	Elf64_Word	sh_link;	/* Index of a related section. */
-	Elf64_Word	sh_info;	/* Depends on section type. */
-	Elf64_Xword	sh_addralign;	/* Alignment in bytes. */
-	Elf64_Xword	sh_entsize;	/* Size of each entry in section. */
-} Elf64_Shdr;
-
-/*
- * Program header.
- */
-
-typedef struct {
-	Elf64_Word	p_type;		/* Entry type. */
-	Elf64_Word	p_flags;	/* Access permission flags. */
-	Elf64_Off	p_offset;	/* File offset of contents. */
-	Elf64_Addr	p_vaddr;	/* Virtual address in memory image. */
-	Elf64_Addr	p_paddr;	/* Physical address (not used). */
-	Elf64_Xword	p_filesz;	/* Size of contents in file. */
-	Elf64_Xword	p_memsz;	/* Size of contents in memory. */
-	Elf64_Xword	p_align;	/* Alignment in memory and file. */
-} Elf64_Phdr;
-
-/*
- * Dynamic structure.  The ".dynamic" section contains an array of them.
- */
-
-typedef struct {
-	Elf64_Sxword	d_tag;		/* Entry type. */
-	union {
-		Elf64_Xword	d_val;	/* Integer value. */
-		Elf64_Addr	d_ptr;	/* Address value. */
-	} d_un;
-} Elf64_Dyn;
-
-/*
- * Relocation entries.
- */
-
-/* Relocations that don't need an addend field. */
-typedef struct {
-	Elf64_Addr	r_offset;	/* Location to be relocated. */
-	Elf64_Xword	r_info;		/* Relocation type and symbol index. */
-} Elf64_Rel;
-
-/* Relocations that need an addend field. */
-typedef struct {
-	Elf64_Addr	r_offset;	/* Location to be relocated. */
-	Elf64_Xword	r_info;		/* Relocation type and symbol index. */
-	Elf64_Sxword	r_addend;	/* Addend. */
-} Elf64_Rela;
-
-/* Macros for accessing the fields of r_info. */
-#define	ELF64_R_SYM(info)	((info) >> 32)
-#define	ELF64_R_TYPE(info)	((info) & 0xffffffffL)
-
-/* Macro for constructing r_info from field values. */
-#define	ELF64_R_INFO(sym, type)	(((sym) << 32) + ((type) & 0xffffffffL))
-
-#define	ELF64_R_TYPE_DATA(info)	(((Elf64_Xword)(info)<<32)>>40)
-#define	ELF64_R_TYPE_ID(info)	(((Elf64_Xword)(info)<<56)>>56)
-#define	ELF64_R_TYPE_INFO(data, type)	\
-				(((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type))
-
-/*
- *	Note entry header
- */
-typedef Elf_Note Elf64_Nhdr;
-
-/*
- *	Move entry
- */
-typedef struct {
-	Elf64_Lword	m_value;	/* symbol value */
-	Elf64_Xword 	m_info;		/* size + index */
-	Elf64_Xword	m_poffset;	/* symbol offset */
-	Elf64_Half	m_repeat;	/* repeat count */
-	Elf64_Half	m_stride;	/* stride info */
-} Elf64_Move;
-
-#define	ELF64_M_SYM(info)	((info)>>8)
-#define	ELF64_M_SIZE(info)	((unsigned char)(info))
-#define	ELF64_M_INFO(sym, size)	(((sym)<<8)+(unsigned char)(size))
-
-/*
- *	Hardware/Software capabilities entry
- */
-typedef struct {
-	Elf64_Xword	c_tag;		/* how to interpret value */
-	union {
-		Elf64_Xword	c_val;
-		Elf64_Addr	c_ptr;
-	} c_un;
-} Elf64_Cap;
-
-/*
- * Symbol table entries.
- */
-
-typedef struct {
-	Elf64_Word	st_name;	/* String table index of name. */
-	unsigned char	st_info;	/* Type and binding information. */
-	unsigned char	st_other;	/* Reserved (not used). */
-	Elf64_Half	st_shndx;	/* Section index of symbol. */
-	Elf64_Addr	st_value;	/* Symbol value. */
-	Elf64_Xword	st_size;	/* Size of associated object. */
-} Elf64_Sym;
-
-/* Macros for accessing the fields of st_info. */
-#define	ELF64_ST_BIND(info)		((info) >> 4)
-#define	ELF64_ST_TYPE(info)		((info) & 0xf)
-
-/* Macro for constructing st_info from field values. */
-#define	ELF64_ST_INFO(bind, type)	(((bind) << 4) + ((type) & 0xf))
-
-/* Macro for accessing the fields of st_other. */
-#define	ELF64_ST_VISIBILITY(oth)	((oth) & 0x3)
-
-/* Structures used by Sun & GNU-style symbol versioning. */
-typedef struct {
-	Elf64_Half	vd_version;
-	Elf64_Half	vd_flags;
-	Elf64_Half	vd_ndx;
-	Elf64_Half	vd_cnt;
-	Elf64_Word	vd_hash;
-	Elf64_Word	vd_aux;
-	Elf64_Word	vd_next;
-} Elf64_Verdef;
-
-typedef struct {
-	Elf64_Word	vda_name;
-	Elf64_Word	vda_next;
-} Elf64_Verdaux;
-
-typedef struct {
-	Elf64_Half	vn_version;
-	Elf64_Half	vn_cnt;
-	Elf64_Word	vn_file;
-	Elf64_Word	vn_aux;
-	Elf64_Word	vn_next;
-} Elf64_Verneed;
-
-typedef struct {
-	Elf64_Word	vna_hash;
-	Elf64_Half	vna_flags;
-	Elf64_Half	vna_other;
-	Elf64_Word	vna_name;
-	Elf64_Word	vna_next;
-} Elf64_Vernaux;
-
-typedef Elf64_Half Elf64_Versym;
-
-typedef struct {
-	Elf64_Half	si_boundto;	/* direct bindings - symbol bound to */
-	Elf64_Half	si_flags;	/* per symbol flags */
-} Elf64_Syminfo;
-
-#endif /* !_SYS_ELF64_H_ */
diff --git a/include.new/sys/elf_common.h b/include.new/sys/elf_common.h
deleted file mode 100644
index 17fcb9a..0000000
--- a/include.new/sys/elf_common.h
+++ /dev/null
@@ -1,1019 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001, 2008, 2011, David E. O'Brien
- * Copyright (c) 1998 John D. Polstra.
- * 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.
- *
- * 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: releng/10.2/sys/sys/elf_common.h 283553 2015-05-26 02:50:30Z emaste $
- */
-
-#ifndef _SYS_ELF_COMMON_H_
-#define	_SYS_ELF_COMMON_H_ 1
-
-/*
- * ELF definitions that are independent of architecture or word size.
- */
-
-/*
- * Note header.  The ".note" section contains an array of notes.  Each
- * begins with this header, aligned to a word boundary.  Immediately
- * following the note header is n_namesz bytes of name, padded to the
- * next word boundary.  Then comes n_descsz bytes of descriptor, again
- * padded to a word boundary.  The values of n_namesz and n_descsz do
- * not include the padding.
- */
-
-typedef struct {
-	uint32_t	n_namesz;	/* Length of name. */
-	uint32_t	n_descsz;	/* Length of descriptor. */
-	uint32_t	n_type;		/* Type of this note. */
-} Elf_Note;
-
-/*
- * The header for GNU-style hash sections.
- */
-
-typedef struct {
-	uint32_t	gh_nbuckets;	/* Number of hash buckets. */
-	uint32_t	gh_symndx;	/* First visible symbol in .dynsym. */
-	uint32_t	gh_maskwords;	/* #maskwords used in bloom filter. */
-	uint32_t	gh_shift2;	/* Bloom filter shift count. */
-} Elf_GNU_Hash_Header;
-
-/* Indexes into the e_ident array.  Keep synced with
-   http://www.sco.com/developers/gabi/latest/ch4.eheader.html */
-#define	EI_MAG0		0	/* Magic number, byte 0. */
-#define	EI_MAG1		1	/* Magic number, byte 1. */
-#define	EI_MAG2		2	/* Magic number, byte 2. */
-#define	EI_MAG3		3	/* Magic number, byte 3. */
-#define	EI_CLASS	4	/* Class of machine. */
-#define	EI_DATA		5	/* Data format. */
-#define	EI_VERSION	6	/* ELF format version. */
-#define	EI_OSABI	7	/* Operating system / ABI identification */
-#define	EI_ABIVERSION	8	/* ABI version */
-#define	OLD_EI_BRAND	8	/* Start of architecture identification. */
-#define	EI_PAD		9	/* Start of padding (per SVR4 ABI). */
-#define	EI_NIDENT	16	/* Size of e_ident array. */
-
-/* Values for the magic number bytes. */
-#define	ELFMAG0		0x7f
-#define	ELFMAG1		'E'
-#define	ELFMAG2		'L'
-#define	ELFMAG3		'F'
-#define	ELFMAG		"\177ELF"	/* magic string */
-#define	SELFMAG		4		/* magic string size */
-
-/* Values for e_ident[EI_VERSION] and e_version. */
-#define	EV_NONE		0
-#define	EV_CURRENT	1
-
-/* Values for e_ident[EI_CLASS]. */
-#define	ELFCLASSNONE	0	/* Unknown class. */
-#define	ELFCLASS32	1	/* 32-bit architecture. */
-#define	ELFCLASS64	2	/* 64-bit architecture. */
-
-/* Values for e_ident[EI_DATA]. */
-#define	ELFDATANONE	0	/* Unknown data format. */
-#define	ELFDATA2LSB	1	/* 2's complement little-endian. */
-#define	ELFDATA2MSB	2	/* 2's complement big-endian. */
-
-/* Values for e_ident[EI_OSABI]. */
-#define	ELFOSABI_NONE		0	/* UNIX System V ABI */
-#define	ELFOSABI_HPUX		1	/* HP-UX operating system */
-#define	ELFOSABI_NETBSD		2	/* NetBSD */
-#define	ELFOSABI_LINUX		3	/* GNU/Linux */
-#define	ELFOSABI_HURD		4	/* GNU/Hurd */
-#define	ELFOSABI_86OPEN		5	/* 86Open common IA32 ABI */
-#define	ELFOSABI_SOLARIS	6	/* Solaris */
-#define	ELFOSABI_AIX		7	/* AIX */
-#define	ELFOSABI_IRIX		8	/* IRIX */
-#define	ELFOSABI_FREEBSD	9	/* FreeBSD */
-#define	ELFOSABI_TRU64		10	/* TRU64 UNIX */
-#define	ELFOSABI_MODESTO	11	/* Novell Modesto */
-#define	ELFOSABI_OPENBSD	12	/* OpenBSD */
-#define	ELFOSABI_OPENVMS	13	/* Open VMS */
-#define	ELFOSABI_NSK		14	/* HP Non-Stop Kernel */
-#define	ELFOSABI_AROS		15	/* Amiga Research OS */
-#define	ELFOSABI_ARM		97	/* ARM */
-#define	ELFOSABI_STANDALONE	255	/* Standalone (embedded) application */
-
-#define	ELFOSABI_SYSV		ELFOSABI_NONE	/* symbol used in old spec */
-#define	ELFOSABI_MONTEREY	ELFOSABI_AIX	/* Monterey */
-
-/* e_ident */
-#define	IS_ELF(ehdr)	((ehdr).e_ident[EI_MAG0] == ELFMAG0 && \
-			 (ehdr).e_ident[EI_MAG1] == ELFMAG1 && \
-			 (ehdr).e_ident[EI_MAG2] == ELFMAG2 && \
-			 (ehdr).e_ident[EI_MAG3] == ELFMAG3)
-
-/* Values for e_type. */
-#define	ET_NONE		0	/* Unknown type. */
-#define	ET_REL		1	/* Relocatable. */
-#define	ET_EXEC		2	/* Executable. */
-#define	ET_DYN		3	/* Shared object. */
-#define	ET_CORE		4	/* Core file. */
-#define	ET_LOOS		0xfe00	/* First operating system specific. */
-#define	ET_HIOS		0xfeff	/* Last operating system-specific. */
-#define	ET_LOPROC	0xff00	/* First processor-specific. */
-#define	ET_HIPROC	0xffff	/* Last processor-specific. */
-
-/* Values for e_machine. */
-#define	EM_NONE		0	/* Unknown machine. */
-#define	EM_M32		1	/* AT&T WE32100. */
-#define	EM_SPARC	2	/* Sun SPARC. */
-#define	EM_386		3	/* Intel i386. */
-#define	EM_68K		4	/* Motorola 68000. */
-#define	EM_88K		5	/* Motorola 88000. */
-#define	EM_860		7	/* Intel i860. */
-#define	EM_MIPS		8	/* MIPS R3000 Big-Endian only. */
-#define	EM_S370		9	/* IBM System/370. */
-#define	EM_MIPS_RS3_LE	10	/* MIPS R3000 Little-Endian. */
-#define	EM_PARISC	15	/* HP PA-RISC. */
-#define	EM_VPP500	17	/* Fujitsu VPP500. */
-#define	EM_SPARC32PLUS	18	/* SPARC v8plus. */
-#define	EM_960		19	/* Intel 80960. */
-#define	EM_PPC		20	/* PowerPC 32-bit. */
-#define	EM_PPC64	21	/* PowerPC 64-bit. */
-#define	EM_S390		22	/* IBM System/390. */
-#define	EM_V800		36	/* NEC V800. */
-#define	EM_FR20		37	/* Fujitsu FR20. */
-#define	EM_RH32		38	/* TRW RH-32. */
-#define	EM_RCE		39	/* Motorola RCE. */
-#define	EM_ARM		40	/* ARM. */
-#define	EM_SH		42	/* Hitachi SH. */
-#define	EM_SPARCV9	43	/* SPARC v9 64-bit. */
-#define	EM_TRICORE	44	/* Siemens TriCore embedded processor. */
-#define	EM_ARC		45	/* Argonaut RISC Core. */
-#define	EM_H8_300	46	/* Hitachi H8/300. */
-#define	EM_H8_300H	47	/* Hitachi H8/300H. */
-#define	EM_H8S		48	/* Hitachi H8S. */
-#define	EM_H8_500	49	/* Hitachi H8/500. */
-#define	EM_IA_64	50	/* Intel IA-64 Processor. */
-#define	EM_MIPS_X	51	/* Stanford MIPS-X. */
-#define	EM_COLDFIRE	52	/* Motorola ColdFire. */
-#define	EM_68HC12	53	/* Motorola M68HC12. */
-#define	EM_MMA		54	/* Fujitsu MMA. */
-#define	EM_PCP		55	/* Siemens PCP. */
-#define	EM_NCPU		56	/* Sony nCPU. */
-#define	EM_NDR1		57	/* Denso NDR1 microprocessor. */
-#define	EM_STARCORE	58	/* Motorola Star*Core processor. */
-#define	EM_ME16		59	/* Toyota ME16 processor. */
-#define	EM_ST100	60	/* STMicroelectronics ST100 processor. */
-#define	EM_TINYJ	61	/* Advanced Logic Corp. TinyJ processor. */
-#define	EM_X86_64	62	/* Advanced Micro Devices x86-64 */
-#define	EM_AMD64	EM_X86_64	/* Advanced Micro Devices x86-64 (compat) */
-#define	EM_PDSP		63	/* Sony DSP Processor. */
-#define	EM_FX66		66	/* Siemens FX66 microcontroller. */
-#define	EM_ST9PLUS	67	/* STMicroelectronics ST9+ 8/16
-				   microcontroller. */
-#define	EM_ST7		68	/* STmicroelectronics ST7 8-bit
-				   microcontroller. */
-#define	EM_68HC16	69	/* Motorola MC68HC16 microcontroller. */
-#define	EM_68HC11	70	/* Motorola MC68HC11 microcontroller. */
-#define	EM_68HC08	71	/* Motorola MC68HC08 microcontroller. */
-#define	EM_68HC05	72	/* Motorola MC68HC05 microcontroller. */
-#define	EM_SVX		73	/* Silicon Graphics SVx. */
-#define	EM_ST19		74	/* STMicroelectronics ST19 8-bit mc. */
-#define	EM_VAX		75	/* Digital VAX. */
-#define	EM_CRIS		76	/* Axis Communications 32-bit embedded
-				   processor. */
-#define	EM_JAVELIN	77	/* Infineon Technologies 32-bit embedded
-				   processor. */
-#define	EM_FIREPATH	78	/* Element 14 64-bit DSP Processor. */
-#define	EM_ZSP		79	/* LSI Logic 16-bit DSP Processor. */
-#define	EM_MMIX		80	/* Donald Knuth's educational 64-bit proc. */
-#define	EM_HUANY	81	/* Harvard University machine-independent
-				   object files. */
-#define	EM_PRISM	82	/* SiTera Prism. */
-#define	EM_AVR		83	/* Atmel AVR 8-bit microcontroller. */
-#define	EM_FR30		84	/* Fujitsu FR30. */
-#define	EM_D10V		85	/* Mitsubishi D10V. */
-#define	EM_D30V		86	/* Mitsubishi D30V. */
-#define	EM_V850		87	/* NEC v850. */
-#define	EM_M32R		88	/* Mitsubishi M32R. */
-#define	EM_MN10300	89	/* Matsushita MN10300. */
-#define	EM_MN10200	90	/* Matsushita MN10200. */
-#define	EM_PJ		91	/* picoJava. */
-#define	EM_OPENRISC	92	/* OpenRISC 32-bit embedded processor. */
-#define	EM_ARC_A5	93	/* ARC Cores Tangent-A5. */
-#define	EM_XTENSA	94	/* Tensilica Xtensa Architecture. */
-#define	EM_VIDEOCORE	95	/* Alphamosaic VideoCore processor. */
-#define	EM_TMM_GPP	96	/* Thompson Multimedia General Purpose
-				   Processor. */
-#define	EM_NS32K	97	/* National Semiconductor 32000 series. */
-#define	EM_TPC		98	/* Tenor Network TPC processor. */
-#define	EM_SNP1K	99	/* Trebia SNP 1000 processor. */
-#define	EM_ST200	100	/* STMicroelectronics ST200 microcontroller. */
-#define	EM_IP2K		101	/* Ubicom IP2xxx microcontroller family. */
-#define	EM_MAX		102	/* MAX Processor. */
-#define	EM_CR		103	/* National Semiconductor CompactRISC
-				   microprocessor. */
-#define	EM_F2MC16	104	/* Fujitsu F2MC16. */
-#define	EM_MSP430	105	/* Texas Instruments embedded microcontroller
-				   msp430. */
-#define	EM_BLACKFIN	106	/* Analog Devices Blackfin (DSP) processor. */
-#define	EM_SE_C33	107	/* S1C33 Family of Seiko Epson processors. */
-#define	EM_SEP		108	/* Sharp embedded microprocessor. */
-#define	EM_ARCA		109	/* Arca RISC Microprocessor. */
-#define	EM_UNICORE	110	/* Microprocessor series from PKU-Unity Ltd.
-				   and MPRC of Peking University */
-#define	EM_AARCH64	183	/* AArch64 (64-bit ARM) */
-
-/* Non-standard or deprecated. */
-#define	EM_486		6	/* Intel i486. */
-#define	EM_MIPS_RS4_BE	10	/* MIPS R4000 Big-Endian */
-#define	EM_ALPHA_STD	41	/* Digital Alpha (standard value). */
-#define	EM_ALPHA	0x9026	/* Alpha (written in the absence of an ABI) */
-
-/* Special section indexes. */
-#define	SHN_UNDEF	     0		/* Undefined, missing, irrelevant. */
-#define	SHN_LORESERVE	0xff00		/* First of reserved range. */
-#define	SHN_LOPROC	0xff00		/* First processor-specific. */
-#define	SHN_HIPROC	0xff1f		/* Last processor-specific. */
-#define	SHN_LOOS	0xff20		/* First operating system-specific. */
-#define	SHN_FBSD_CACHED	SHN_LOOS	/* Transient, for sys/kern/link_elf_obj
-					   linker only: Cached global in local
-					   symtab. */
-#define	SHN_HIOS	0xff3f		/* Last operating system-specific. */
-#define	SHN_ABS		0xfff1		/* Absolute values. */
-#define	SHN_COMMON	0xfff2		/* Common data. */
-#define	SHN_XINDEX	0xffff		/* Escape -- index stored elsewhere. */
-#define	SHN_HIRESERVE	0xffff		/* Last of reserved range. */
-
-/* sh_type */
-#define	SHT_NULL		0	/* inactive */
-#define	SHT_PROGBITS		1	/* program defined information */
-#define	SHT_SYMTAB		2	/* symbol table section */
-#define	SHT_STRTAB		3	/* string table section */
-#define	SHT_RELA		4	/* relocation section with addends */
-#define	SHT_HASH		5	/* symbol hash table section */
-#define	SHT_DYNAMIC		6	/* dynamic section */
-#define	SHT_NOTE		7	/* note section */
-#define	SHT_NOBITS		8	/* no space section */
-#define	SHT_REL			9	/* relocation section - no addends */
-#define	SHT_SHLIB		10	/* reserved - purpose unknown */
-#define	SHT_DYNSYM		11	/* dynamic symbol table section */
-#define	SHT_INIT_ARRAY		14	/* Initialization function pointers. */
-#define	SHT_FINI_ARRAY		15	/* Termination function pointers. */
-#define	SHT_PREINIT_ARRAY	16	/* Pre-initialization function ptrs. */
-#define	SHT_GROUP		17	/* Section group. */
-#define	SHT_SYMTAB_SHNDX	18	/* Section indexes (see SHN_XINDEX). */
-#define	SHT_LOOS		0x60000000	/* First of OS specific semantics */
-#define	SHT_LOSUNW		0x6ffffff4
-#define	SHT_SUNW_dof		0x6ffffff4
-#define	SHT_SUNW_cap		0x6ffffff5
-#define	SHT_SUNW_SIGNATURE	0x6ffffff6
-#define	SHT_GNU_HASH		0x6ffffff6
-#define	SHT_GNU_LIBLIST		0x6ffffff7
-#define	SHT_SUNW_ANNOTATE	0x6ffffff7
-#define	SHT_SUNW_DEBUGSTR	0x6ffffff8
-#define	SHT_SUNW_DEBUG		0x6ffffff9
-#define	SHT_SUNW_move		0x6ffffffa
-#define	SHT_SUNW_COMDAT		0x6ffffffb
-#define	SHT_SUNW_syminfo	0x6ffffffc
-#define	SHT_SUNW_verdef		0x6ffffffd
-#define	SHT_GNU_verdef		0x6ffffffd	/* Symbol versions provided */
-#define	SHT_SUNW_verneed	0x6ffffffe
-#define	SHT_GNU_verneed		0x6ffffffe	/* Symbol versions required */
-#define	SHT_SUNW_versym		0x6fffffff
-#define	SHT_GNU_versym		0x6fffffff	/* Symbol version table */
-#define	SHT_HISUNW		0x6fffffff
-#define	SHT_HIOS		0x6fffffff	/* Last of OS specific semantics */
-#define	SHT_LOPROC		0x70000000	/* reserved range for processor */
-#define	SHT_AMD64_UNWIND	0x70000001	/* unwind information */
-#define	SHT_ARM_EXIDX		0x70000001	/* Exception index table. */
-#define	SHT_ARM_PREEMPTMAP	0x70000002	/* BPABI DLL dynamic linking 
-						   pre-emption map. */
-#define	SHT_ARM_ATTRIBUTES	0x70000003	/* Object file compatibility 
-						   attributes. */
-#define	SHT_ARM_DEBUGOVERLAY	0x70000004	/* See DBGOVL for details. */
-#define	SHT_ARM_OVERLAYSECTION	0x70000005	/* See DBGOVL for details. */
-#define	SHT_MIPS_REGINFO	0x70000006
-#define	SHT_MIPS_OPTIONS	0x7000000d
-#define	SHT_MIPS_DWARF		0x7000001e	/* MIPS gcc uses MIPS_DWARF */
-#define	SHT_HIPROC		0x7fffffff	/* specific section header types */
-#define	SHT_LOUSER		0x80000000	/* reserved range for application */
-#define	SHT_HIUSER		0xffffffff	/* specific indexes */
-
-/* Flags for sh_flags. */
-#define	SHF_WRITE		0x1	/* Section contains writable data. */
-#define	SHF_ALLOC		0x2	/* Section occupies memory. */
-#define	SHF_EXECINSTR		0x4	/* Section contains instructions. */
-#define	SHF_MERGE		0x10	/* Section may be merged. */
-#define	SHF_STRINGS		0x20	/* Section contains strings. */
-#define	SHF_INFO_LINK		0x40	/* sh_info holds section index. */
-#define	SHF_LINK_ORDER		0x80	/* Special ordering requirements. */
-#define	SHF_OS_NONCONFORMING	0x100	/* OS-specific processing required. */
-#define	SHF_GROUP		0x200	/* Member of section group. */
-#define	SHF_TLS			0x400	/* Section contains TLS data. */
-#define	SHF_MASKOS	0x0ff00000	/* OS-specific semantics. */
-#define	SHF_MASKPROC	0xf0000000	/* Processor-specific semantics. */
-
-/* Flags for section groups. */
-#define	GRP_COMDAT	0x1	/* COMDAT semantics. */
-
-/* Values for p_type. */
-#define	PT_NULL		0	/* Unused entry. */
-#define	PT_LOAD		1	/* Loadable segment. */
-#define	PT_DYNAMIC	2	/* Dynamic linking information segment. */
-#define	PT_INTERP	3	/* Pathname of interpreter. */
-#define	PT_NOTE		4	/* Auxiliary information. */
-#define	PT_SHLIB	5	/* Reserved (not used). */
-#define	PT_PHDR		6	/* Location of program header itself. */
-#define	PT_TLS		7	/* Thread local storage segment */
-#define	PT_LOOS		0x60000000	/* First OS-specific. */
-#define	PT_SUNW_UNWIND	0x6464e550	/* amd64 UNWIND program header */
-#define	PT_GNU_EH_FRAME	0x6474e550
-#define	PT_GNU_STACK	0x6474e551
-#define	PT_GNU_RELRO	0x6474e552
-#define	PT_DUMP_DELTA	0x6fb5d000	/* va->pa map for kernel dumps
-					   (currently arm). */
-#define	PT_LOSUNW	0x6ffffffa
-#define	PT_SUNWBSS	0x6ffffffa	/* Sun Specific segment */
-#define	PT_SUNWSTACK	0x6ffffffb	/* describes the stack segment */
-#define	PT_SUNWDTRACE	0x6ffffffc	/* private */
-#define	PT_SUNWCAP	0x6ffffffd	/* hard/soft capabilities segment */
-#define	PT_HISUNW	0x6fffffff
-#define	PT_HIOS		0x6fffffff	/* Last OS-specific. */
-#define	PT_LOPROC	0x70000000	/* First processor-specific type. */
-#define	PT_HIPROC	0x7fffffff	/* Last processor-specific type. */
-
-/* Values for p_flags. */
-#define	PF_X		0x1		/* Executable. */
-#define	PF_W		0x2		/* Writable. */
-#define	PF_R		0x4		/* Readable. */
-#define	PF_MASKOS	0x0ff00000	/* Operating system-specific. */
-#define	PF_MASKPROC	0xf0000000	/* Processor-specific. */
-
-/* Extended program header index. */
-#define	PN_XNUM		0xffff
-
-/* Values for d_tag. */
-#define	DT_NULL		0	/* Terminating entry. */
-#define	DT_NEEDED	1	/* String table offset of a needed shared
-				   library. */
-#define	DT_PLTRELSZ	2	/* Total size in bytes of PLT relocations. */
-#define	DT_PLTGOT	3	/* Processor-dependent address. */
-#define	DT_HASH		4	/* Address of symbol hash table. */
-#define	DT_STRTAB	5	/* Address of string table. */
-#define	DT_SYMTAB	6	/* Address of symbol table. */
-#define	DT_RELA		7	/* Address of ElfNN_Rela relocations. */
-#define	DT_RELASZ	8	/* Total size of ElfNN_Rela relocations. */
-#define	DT_RELAENT	9	/* Size of each ElfNN_Rela relocation entry. */
-#define	DT_STRSZ	10	/* Size of string table. */
-#define	DT_SYMENT	11	/* Size of each symbol table entry. */
-#define	DT_INIT		12	/* Address of initialization function. */
-#define	DT_FINI		13	/* Address of finalization function. */
-#define	DT_SONAME	14	/* String table offset of shared object
-				   name. */
-#define	DT_RPATH	15	/* String table offset of library path. [sup] */
-#define	DT_SYMBOLIC	16	/* Indicates "symbolic" linking. [sup] */
-#define	DT_REL		17	/* Address of ElfNN_Rel relocations. */
-#define	DT_RELSZ	18	/* Total size of ElfNN_Rel relocations. */
-#define	DT_RELENT	19	/* Size of each ElfNN_Rel relocation. */
-#define	DT_PLTREL	20	/* Type of relocation used for PLT. */
-#define	DT_DEBUG	21	/* Reserved (not used). */
-#define	DT_TEXTREL	22	/* Indicates there may be relocations in
-				   non-writable segments. [sup] */
-#define	DT_JMPREL	23	/* Address of PLT relocations. */
-#define	DT_BIND_NOW	24	/* [sup] */
-#define	DT_INIT_ARRAY	25	/* Address of the array of pointers to
-				   initialization functions */
-#define	DT_FINI_ARRAY	26	/* Address of the array of pointers to
-				   termination functions */
-#define	DT_INIT_ARRAYSZ	27	/* Size in bytes of the array of
-				   initialization functions. */
-#define	DT_FINI_ARRAYSZ	28	/* Size in bytes of the array of
-				   termination functions. */
-#define	DT_RUNPATH	29	/* String table offset of a null-terminated
-				   library search path string. */
-#define	DT_FLAGS	30	/* Object specific flag values. */
-#define	DT_ENCODING	32	/* Values greater than or equal to DT_ENCODING
-				   and less than DT_LOOS follow the rules for
-				   the interpretation of the d_un union
-				   as follows: even == 'd_ptr', odd == 'd_val'
-				   or none */
-#define	DT_PREINIT_ARRAY 32	/* Address of the array of pointers to
-				   pre-initialization functions. */
-#define	DT_PREINIT_ARRAYSZ 33	/* Size in bytes of the array of
-				   pre-initialization functions. */
-#define	DT_MAXPOSTAGS	34	/* number of positive tags */
-#define	DT_LOOS		0x6000000d	/* First OS-specific */
-#define	DT_SUNW_AUXILIARY	0x6000000d	/* symbol auxiliary name */
-#define	DT_SUNW_RTLDINF		0x6000000e	/* ld.so.1 info (private) */
-#define	DT_SUNW_FILTER		0x6000000f	/* symbol filter name */
-#define	DT_SUNW_CAP		0x60000010	/* hardware/software */
-#define	DT_HIOS		0x6ffff000	/* Last OS-specific */
-
-/*
- * DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
- * Dyn.d_un.d_val field of the Elf*_Dyn structure.
- */
-#define	DT_VALRNGLO	0x6ffffd00
-#define	DT_CHECKSUM	0x6ffffdf8	/* elf checksum */
-#define	DT_PLTPADSZ	0x6ffffdf9	/* pltpadding size */
-#define	DT_MOVEENT	0x6ffffdfa	/* move table entry size */
-#define	DT_MOVESZ	0x6ffffdfb	/* move table size */
-#define	DT_FEATURE	0x6ffffdfc	/* feature holder */
-#define	DT_POSFLAG_1	0x6ffffdfd	/* flags for DT_* entries, effecting */
-					/*	the following DT_* entry. */
-					/*	See DF_P1_* definitions */
-#define	DT_SYMINSZ	0x6ffffdfe	/* syminfo table size (in bytes) */
-#define	DT_SYMINENT	0x6ffffdff	/* syminfo entry size (in bytes) */
-#define	DT_VALRNGHI	0x6ffffdff
-
-/*
- * DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
- * Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
- *
- * If any adjustment is made to the ELF object after it has been
- * built, these entries will need to be adjusted.
- */
-#define	DT_ADDRRNGLO	0x6ffffe00
-#define	DT_GNU_HASH	0x6ffffef5	/* GNU-style hash table */
-#define	DT_CONFIG	0x6ffffefa	/* configuration information */
-#define	DT_DEPAUDIT	0x6ffffefb	/* dependency auditing */
-#define	DT_AUDIT	0x6ffffefc	/* object auditing */
-#define	DT_PLTPAD	0x6ffffefd	/* pltpadding (sparcv9) */
-#define	DT_MOVETAB	0x6ffffefe	/* move table */
-#define	DT_SYMINFO	0x6ffffeff	/* syminfo table */
-#define	DT_ADDRRNGHI	0x6ffffeff
-
-#define	DT_VERSYM	0x6ffffff0	/* Address of versym section. */
-#define	DT_RELACOUNT	0x6ffffff9	/* number of RELATIVE relocations */
-#define	DT_RELCOUNT	0x6ffffffa	/* number of RELATIVE relocations */
-#define	DT_FLAGS_1	0x6ffffffb	/* state flags - see DF_1_* defs */
-#define	DT_VERDEF	0x6ffffffc	/* Address of verdef section. */
-#define	DT_VERDEFNUM	0x6ffffffd	/* Number of elems in verdef section */
-#define	DT_VERNEED	0x6ffffffe	/* Address of verneed section. */
-#define	DT_VERNEEDNUM	0x6fffffff	/* Number of elems in verneed section */
-
-#define	DT_LOPROC	0x70000000	/* First processor-specific type. */
-#define	DT_DEPRECATED_SPARC_REGISTER	0x7000001
-#define	DT_AUXILIARY	0x7ffffffd	/* shared library auxiliary name */
-#define	DT_USED		0x7ffffffe	/* ignored - same as needed */
-#define	DT_FILTER	0x7fffffff	/* shared library filter name */
-#define	DT_HIPROC	0x7fffffff	/* Last processor-specific type. */
-
-/* Values for DT_FLAGS */
-#define	DF_ORIGIN	0x0001	/* Indicates that the object being loaded may
-				   make reference to the $ORIGIN substitution
-				   string */
-#define	DF_SYMBOLIC	0x0002	/* Indicates "symbolic" linking. */
-#define	DF_TEXTREL	0x0004	/* Indicates there may be relocations in
-				   non-writable segments. */
-#define	DF_BIND_NOW	0x0008	/* Indicates that the dynamic linker should
-				   process all relocations for the object
-				   containing this entry before transferring
-				   control to the program. */
-#define	DF_STATIC_TLS	0x0010	/* Indicates that the shared object or
-				   executable contains code using a static
-				   thread-local storage scheme. */
-
-/* Values for DT_FLAGS_1 */
-#define	DF_1_BIND_NOW	0x00000001	/* Same as DF_BIND_NOW */
-#define	DF_1_GLOBAL	0x00000002	/* Set the RTLD_GLOBAL for object */
-#define	DF_1_NODELETE	0x00000008	/* Set the RTLD_NODELETE for object */
-#define	DF_1_LOADFLTR	0x00000010	/* Immediate loading of filtees */
-#define	DF_1_NOOPEN     0x00000040	/* Do not allow loading on dlopen() */
-#define	DF_1_ORIGIN	0x00000080	/* Process $ORIGIN */
-#define	DF_1_INTERPOSE	0x00000400	/* Interpose all objects but main */
-#define	DF_1_NODEFLIB	0x00000800	/* Do not search default paths */
-
-/* Values for n_type.  Used in core files. */
-#define	NT_PRSTATUS	1	/* Process status. */
-#define	NT_FPREGSET	2	/* Floating point registers. */
-#define	NT_PRPSINFO	3	/* Process state info. */
-#define	NT_THRMISC	7	/* Thread miscellaneous info. */
-#define	NT_PROCSTAT_PROC	8	/* Procstat proc data. */
-#define	NT_PROCSTAT_FILES	9	/* Procstat files data. */
-#define	NT_PROCSTAT_VMMAP	10	/* Procstat vmmap data. */
-#define	NT_PROCSTAT_GROUPS	11	/* Procstat groups data. */
-#define	NT_PROCSTAT_UMASK	12	/* Procstat umask data. */
-#define	NT_PROCSTAT_RLIMIT	13	/* Procstat rlimit data. */
-#define	NT_PROCSTAT_OSREL	14	/* Procstat osreldate data. */
-#define	NT_PROCSTAT_PSSTRINGS	15	/* Procstat ps_strings data. */
-#define	NT_PROCSTAT_AUXV	16	/* Procstat auxv data. */
-#define	NT_X86_XSTATE	0x202	/* x86 XSAVE extended state. */
-
-/* Symbol Binding - ELFNN_ST_BIND - st_info */
-#define	STB_LOCAL	0	/* Local symbol */
-#define	STB_GLOBAL	1	/* Global symbol */
-#define	STB_WEAK	2	/* like global - lower precedence */
-#define	STB_LOOS	10	/* Reserved range for operating system */
-#define	STB_HIOS	12	/*   specific semantics. */
-#define	STB_LOPROC	13	/* reserved range for processor */
-#define	STB_HIPROC	15	/*   specific semantics. */
-
-/* Symbol type - ELFNN_ST_TYPE - st_info */
-#define	STT_NOTYPE	0	/* Unspecified type. */
-#define	STT_OBJECT	1	/* Data object. */
-#define	STT_FUNC	2	/* Function. */
-#define	STT_SECTION	3	/* Section. */
-#define	STT_FILE	4	/* Source file. */
-#define	STT_COMMON	5	/* Uninitialized common block. */
-#define	STT_TLS		6	/* TLS object. */
-#define	STT_NUM		7
-#define	STT_LOOS	10	/* Reserved range for operating system */
-#define	STT_GNU_IFUNC	10
-#define	STT_HIOS	12	/*   specific semantics. */
-#define	STT_LOPROC	13	/* reserved range for processor */
-#define	STT_HIPROC	15	/*   specific semantics. */
-
-/* Symbol visibility - ELFNN_ST_VISIBILITY - st_other */
-#define	STV_DEFAULT	0x0	/* Default visibility (see binding). */
-#define	STV_INTERNAL	0x1	/* Special meaning in relocatable objects. */
-#define	STV_HIDDEN	0x2	/* Not visible. */
-#define	STV_PROTECTED	0x3	/* Visible but not preemptible. */
-#define	STV_EXPORTED	0x4
-#define	STV_SINGLETON	0x5
-#define	STV_ELIMINATE	0x6
-
-/* Special symbol table indexes. */
-#define	STN_UNDEF	0	/* Undefined symbol index. */
-
-/* Symbol versioning flags. */
-#define	VER_DEF_CURRENT	1
-#define	VER_DEF_IDX(x)	VER_NDX(x)
-
-#define	VER_FLG_BASE	0x01
-#define	VER_FLG_WEAK	0x02
-
-#define	VER_NEED_CURRENT	1
-#define	VER_NEED_WEAK	(1u << 15)
-#define	VER_NEED_HIDDEN	VER_NDX_HIDDEN
-#define	VER_NEED_IDX(x)	VER_NDX(x)
-
-#define	VER_NDX_LOCAL	0
-#define	VER_NDX_GLOBAL	1
-#define	VER_NDX_GIVEN	2
-
-#define	VER_NDX_HIDDEN	(1u << 15)
-#define	VER_NDX(x)	((x) & ~(1u << 15))
-
-#define	CA_SUNW_NULL	0
-#define	CA_SUNW_HW_1	1		/* first hardware capabilities entry */
-#define	CA_SUNW_SF_1	2		/* first software capabilities entry */
-
-/*
- * Syminfo flag values
- */
-#define	SYMINFO_FLG_DIRECT	0x0001	/* symbol ref has direct association */
-					/*	to object containing defn. */
-#define	SYMINFO_FLG_PASSTHRU	0x0002	/* ignored - see SYMINFO_FLG_FILTER */
-#define	SYMINFO_FLG_COPY	0x0004	/* symbol is a copy-reloc */
-#define	SYMINFO_FLG_LAZYLOAD	0x0008	/* object containing defn should be */
-					/*	lazily-loaded */
-#define	SYMINFO_FLG_DIRECTBIND	0x0010	/* ref should be bound directly to */
-					/*	object containing defn. */
-#define	SYMINFO_FLG_NOEXTDIRECT	0x0020	/* don't let an external reference */
-					/*	directly bind to this symbol */
-#define	SYMINFO_FLG_FILTER	0x0002	/* symbol ref is associated to a */
-#define	SYMINFO_FLG_AUXILIARY	0x0040	/* 	standard or auxiliary filter */
-
-/*
- * Syminfo.si_boundto values.
- */
-#define	SYMINFO_BT_SELF		0xffff	/* symbol bound to self */
-#define	SYMINFO_BT_PARENT	0xfffe	/* symbol bound to parent */
-#define	SYMINFO_BT_NONE		0xfffd	/* no special symbol binding */
-#define	SYMINFO_BT_EXTERN	0xfffc	/* symbol defined as external */
-#define	SYMINFO_BT_LOWRESERVE	0xff00	/* beginning of reserved entries */
-
-/*
- * Syminfo version values.
- */
-#define	SYMINFO_NONE		0	/* Syminfo version */
-#define	SYMINFO_CURRENT		1
-#define	SYMINFO_NUM		2
-
-/*
- * Relocation types.
- *
- * All machine architectures are defined here to allow tools on one to
- * handle others.
- */
-
-#define	R_386_NONE		0	/* No relocation. */
-#define	R_386_32		1	/* Add symbol value. */
-#define	R_386_PC32		2	/* Add PC-relative symbol value. */
-#define	R_386_GOT32		3	/* Add PC-relative GOT offset. */
-#define	R_386_PLT32		4	/* Add PC-relative PLT offset. */
-#define	R_386_COPY		5	/* Copy data from shared object. */
-#define	R_386_GLOB_DAT		6	/* Set GOT entry to data address. */
-#define	R_386_JMP_SLOT		7	/* Set GOT entry to code address. */
-#define	R_386_RELATIVE		8	/* Add load address of shared object. */
-#define	R_386_GOTOFF		9	/* Add GOT-relative symbol address. */
-#define	R_386_GOTPC		10	/* Add PC-relative GOT table address. */
-#define	R_386_TLS_TPOFF		14	/* Negative offset in static TLS block */
-#define	R_386_TLS_IE		15	/* Absolute address of GOT for -ve static TLS */
-#define	R_386_TLS_GOTIE		16	/* GOT entry for negative static TLS block */
-#define	R_386_TLS_LE		17	/* Negative offset relative to static TLS */
-#define	R_386_TLS_GD		18	/* 32 bit offset to GOT (index,off) pair */
-#define	R_386_TLS_LDM		19	/* 32 bit offset to GOT (index,zero) pair */
-#define	R_386_TLS_GD_32		24	/* 32 bit offset to GOT (index,off) pair */
-#define	R_386_TLS_GD_PUSH	25	/* pushl instruction for Sun ABI GD sequence */
-#define	R_386_TLS_GD_CALL	26	/* call instruction for Sun ABI GD sequence */
-#define	R_386_TLS_GD_POP	27	/* popl instruction for Sun ABI GD sequence */
-#define	R_386_TLS_LDM_32	28	/* 32 bit offset to GOT (index,zero) pair */
-#define	R_386_TLS_LDM_PUSH	29	/* pushl instruction for Sun ABI LD sequence */
-#define	R_386_TLS_LDM_CALL	30	/* call instruction for Sun ABI LD sequence */
-#define	R_386_TLS_LDM_POP	31	/* popl instruction for Sun ABI LD sequence */
-#define	R_386_TLS_LDO_32	32	/* 32 bit offset from start of TLS block */
-#define	R_386_TLS_IE_32		33	/* 32 bit offset to GOT static TLS offset entry */
-#define	R_386_TLS_LE_32		34	/* 32 bit offset within static TLS block */
-#define	R_386_TLS_DTPMOD32	35	/* GOT entry containing TLS index */
-#define	R_386_TLS_DTPOFF32	36	/* GOT entry containing TLS offset */
-#define	R_386_TLS_TPOFF32	37	/* GOT entry of -ve static TLS offset */
-#define	R_386_IRELATIVE		42	/* PLT entry resolved indirectly at runtime */
-
-#define	R_ARM_NONE		0	/* No relocation. */
-#define	R_ARM_PC24		1
-#define	R_ARM_ABS32		2
-#define	R_ARM_REL32		3
-#define	R_ARM_PC13		4
-#define	R_ARM_ABS16		5
-#define	R_ARM_ABS12		6
-#define	R_ARM_THM_ABS5		7
-#define	R_ARM_ABS8		8
-#define	R_ARM_SBREL32		9
-#define	R_ARM_THM_PC22		10
-#define	R_ARM_THM_PC8		11
-#define	R_ARM_AMP_VCALL9	12
-#define	R_ARM_SWI24		13
-#define	R_ARM_THM_SWI8		14
-#define	R_ARM_XPC25		15
-#define	R_ARM_THM_XPC22		16
-/* TLS relocations */
-#define	R_ARM_TLS_DTPMOD32	17	/* ID of module containing symbol */
-#define	R_ARM_TLS_DTPOFF32	18	/* Offset in TLS block */
-#define	R_ARM_TLS_TPOFF32	19	/* Offset in static TLS block */
-#define	R_ARM_COPY		20	/* Copy data from shared object. */
-#define	R_ARM_GLOB_DAT		21	/* Set GOT entry to data address. */
-#define	R_ARM_JUMP_SLOT		22	/* Set GOT entry to code address. */
-#define	R_ARM_RELATIVE		23	/* Add load address of shared object. */
-#define	R_ARM_GOTOFF		24	/* Add GOT-relative symbol address. */
-#define	R_ARM_GOTPC		25	/* Add PC-relative GOT table address. */
-#define	R_ARM_GOT32		26	/* Add PC-relative GOT offset. */
-#define	R_ARM_PLT32		27	/* Add PC-relative PLT offset. */
-#define	R_ARM_GNU_VTENTRY	100
-#define	R_ARM_GNU_VTINHERIT	101
-#define	R_ARM_RSBREL32		250
-#define	R_ARM_THM_RPC22		251
-#define	R_ARM_RREL32		252
-#define	R_ARM_RABS32		253
-#define	R_ARM_RPC24		254
-#define	R_ARM_RBASE		255
-
-/*	Name			Value	   Field	Calculation */
-#define	R_IA_64_NONE		0	/* None */
-#define	R_IA_64_IMM14		0x21	/* immediate14	S + A */
-#define	R_IA_64_IMM22		0x22	/* immediate22	S + A */
-#define	R_IA_64_IMM64		0x23	/* immediate64	S + A */
-#define	R_IA_64_DIR32MSB	0x24	/* word32 MSB	S + A */
-#define	R_IA_64_DIR32LSB	0x25	/* word32 LSB	S + A */
-#define	R_IA_64_DIR64MSB	0x26	/* word64 MSB	S + A */
-#define	R_IA_64_DIR64LSB	0x27	/* word64 LSB	S + A */
-#define	R_IA_64_GPREL22		0x2a	/* immediate22	@gprel(S + A) */
-#define	R_IA_64_GPREL64I	0x2b	/* immediate64	@gprel(S + A) */
-#define	R_IA_64_GPREL32MSB	0x2c	/* word32 MSB	@gprel(S + A) */
-#define	R_IA_64_GPREL32LSB	0x2d	/* word32 LSB	@gprel(S + A) */
-#define	R_IA_64_GPREL64MSB	0x2e	/* word64 MSB	@gprel(S + A) */
-#define	R_IA_64_GPREL64LSB	0x2f	/* word64 LSB	@gprel(S + A) */
-#define	R_IA_64_LTOFF22		0x32	/* immediate22	@ltoff(S + A) */
-#define	R_IA_64_LTOFF64I	0x33	/* immediate64	@ltoff(S + A) */
-#define	R_IA_64_PLTOFF22	0x3a	/* immediate22	@pltoff(S + A) */
-#define	R_IA_64_PLTOFF64I	0x3b	/* immediate64	@pltoff(S + A) */
-#define	R_IA_64_PLTOFF64MSB	0x3e	/* word64 MSB	@pltoff(S + A) */
-#define	R_IA_64_PLTOFF64LSB	0x3f	/* word64 LSB	@pltoff(S + A) */
-#define	R_IA_64_FPTR64I		0x43	/* immediate64	@fptr(S + A) */
-#define	R_IA_64_FPTR32MSB	0x44	/* word32 MSB	@fptr(S + A) */
-#define	R_IA_64_FPTR32LSB	0x45	/* word32 LSB	@fptr(S + A) */
-#define	R_IA_64_FPTR64MSB	0x46	/* word64 MSB	@fptr(S + A) */
-#define	R_IA_64_FPTR64LSB	0x47	/* word64 LSB	@fptr(S + A) */
-#define	R_IA_64_PCREL60B	0x48	/* immediate60 form1 S + A - P */
-#define	R_IA_64_PCREL21B	0x49	/* immediate21 form1 S + A - P */
-#define	R_IA_64_PCREL21M	0x4a	/* immediate21 form2 S + A - P */
-#define	R_IA_64_PCREL21F	0x4b	/* immediate21 form3 S + A - P */
-#define	R_IA_64_PCREL32MSB	0x4c	/* word32 MSB	S + A - P */
-#define	R_IA_64_PCREL32LSB	0x4d	/* word32 LSB	S + A - P */
-#define	R_IA_64_PCREL64MSB	0x4e	/* word64 MSB	S + A - P */
-#define	R_IA_64_PCREL64LSB	0x4f	/* word64 LSB	S + A - P */
-#define	R_IA_64_LTOFF_FPTR22	0x52	/* immediate22	@ltoff(@fptr(S + A)) */
-#define	R_IA_64_LTOFF_FPTR64I	0x53	/* immediate64	@ltoff(@fptr(S + A)) */
-#define	R_IA_64_LTOFF_FPTR32MSB	0x54	/* word32 MSB	@ltoff(@fptr(S + A)) */
-#define	R_IA_64_LTOFF_FPTR32LSB	0x55	/* word32 LSB	@ltoff(@fptr(S + A)) */
-#define	R_IA_64_LTOFF_FPTR64MSB	0x56	/* word64 MSB	@ltoff(@fptr(S + A)) */
-#define	R_IA_64_LTOFF_FPTR64LSB	0x57	/* word64 LSB	@ltoff(@fptr(S + A)) */
-#define	R_IA_64_SEGREL32MSB	0x5c	/* word32 MSB	@segrel(S + A) */
-#define	R_IA_64_SEGREL32LSB	0x5d	/* word32 LSB	@segrel(S + A) */
-#define	R_IA_64_SEGREL64MSB	0x5e	/* word64 MSB	@segrel(S + A) */
-#define	R_IA_64_SEGREL64LSB	0x5f	/* word64 LSB	@segrel(S + A) */
-#define	R_IA_64_SECREL32MSB	0x64	/* word32 MSB	@secrel(S + A) */
-#define	R_IA_64_SECREL32LSB	0x65	/* word32 LSB	@secrel(S + A) */
-#define	R_IA_64_SECREL64MSB	0x66	/* word64 MSB	@secrel(S + A) */
-#define	R_IA_64_SECREL64LSB	0x67	/* word64 LSB	@secrel(S + A) */
-#define	R_IA_64_REL32MSB	0x6c	/* word32 MSB	BD + A */
-#define	R_IA_64_REL32LSB	0x6d	/* word32 LSB	BD + A */
-#define	R_IA_64_REL64MSB	0x6e	/* word64 MSB	BD + A */
-#define	R_IA_64_REL64LSB	0x6f	/* word64 LSB	BD + A */
-#define	R_IA_64_LTV32MSB	0x74	/* word32 MSB	S + A */
-#define	R_IA_64_LTV32LSB	0x75	/* word32 LSB	S + A */
-#define	R_IA_64_LTV64MSB	0x76	/* word64 MSB	S + A */
-#define	R_IA_64_LTV64LSB	0x77	/* word64 LSB	S + A */
-#define	R_IA_64_PCREL21BI	0x79	/* immediate21 form1 S + A - P */
-#define	R_IA_64_PCREL22		0x7a	/* immediate22	S + A - P */
-#define	R_IA_64_PCREL64I	0x7b	/* immediate64	S + A - P */
-#define	R_IA_64_IPLTMSB		0x80	/* function descriptor MSB special */
-#define	R_IA_64_IPLTLSB		0x81	/* function descriptor LSB speciaal */
-#define	R_IA_64_SUB		0x85	/* immediate64	A - S */
-#define	R_IA_64_LTOFF22X	0x86	/* immediate22	special */
-#define	R_IA_64_LDXMOV		0x87	/* immediate22	special */
-#define	R_IA_64_TPREL14		0x91	/* imm14	@tprel(S + A) */
-#define	R_IA_64_TPREL22		0x92	/* imm22	@tprel(S + A) */
-#define	R_IA_64_TPREL64I	0x93	/* imm64	@tprel(S + A) */
-#define	R_IA_64_TPREL64MSB	0x96	/* word64 MSB	@tprel(S + A) */
-#define	R_IA_64_TPREL64LSB	0x97	/* word64 LSB	@tprel(S + A) */
-#define	R_IA_64_LTOFF_TPREL22	0x9a	/* imm22	@ltoff(@tprel(S+A)) */
-#define	R_IA_64_DTPMOD64MSB	0xa6	/* word64 MSB	@dtpmod(S + A) */
-#define	R_IA_64_DTPMOD64LSB	0xa7	/* word64 LSB	@dtpmod(S + A) */
-#define	R_IA_64_LTOFF_DTPMOD22	0xaa	/* imm22	@ltoff(@dtpmod(S+A)) */
-#define	R_IA_64_DTPREL14	0xb1	/* imm14	@dtprel(S + A) */
-#define	R_IA_64_DTPREL22	0xb2	/* imm22	@dtprel(S + A) */
-#define	R_IA_64_DTPREL64I	0xb3	/* imm64	@dtprel(S + A) */
-#define	R_IA_64_DTPREL32MSB	0xb4	/* word32 MSB	@dtprel(S + A) */
-#define	R_IA_64_DTPREL32LSB	0xb5	/* word32 LSB	@dtprel(S + A) */
-#define	R_IA_64_DTPREL64MSB	0xb6	/* word64 MSB	@dtprel(S + A) */
-#define	R_IA_64_DTPREL64LSB	0xb7	/* word64 LSB	@dtprel(S + A) */
-#define	R_IA_64_LTOFF_DTPREL22	0xba	/* imm22	@ltoff(@dtprel(S+A)) */
-
-#define	R_MIPS_NONE	0	/* No reloc */
-#define	R_MIPS_16	1	/* Direct 16 bit */
-#define	R_MIPS_32	2	/* Direct 32 bit */
-#define	R_MIPS_REL32	3	/* PC relative 32 bit */
-#define	R_MIPS_26	4	/* Direct 26 bit shifted */
-#define	R_MIPS_HI16	5	/* High 16 bit */
-#define	R_MIPS_LO16	6	/* Low 16 bit */
-#define	R_MIPS_GPREL16	7	/* GP relative 16 bit */
-#define	R_MIPS_LITERAL	8	/* 16 bit literal entry */
-#define	R_MIPS_GOT16	9	/* 16 bit GOT entry */
-#define	R_MIPS_PC16	10	/* PC relative 16 bit */
-#define	R_MIPS_CALL16	11	/* 16 bit GOT entry for function */
-#define	R_MIPS_GPREL32	12	/* GP relative 32 bit */
-#define	R_MIPS_64	18	/* Direct 64 bit */
-#define	R_MIPS_GOTHI16	21	/* GOT HI 16 bit */
-#define	R_MIPS_GOTLO16	22	/* GOT LO 16 bit */
-#define	R_MIPS_CALLHI16 30	/* upper 16 bit GOT entry for function */
-#define	R_MIPS_CALLLO16 31	/* lower 16 bit GOT entry for function */
-
-#define	R_PPC_NONE		0	/* No relocation. */
-#define	R_PPC_ADDR32		1
-#define	R_PPC_ADDR24		2
-#define	R_PPC_ADDR16		3
-#define	R_PPC_ADDR16_LO		4
-#define	R_PPC_ADDR16_HI		5
-#define	R_PPC_ADDR16_HA		6
-#define	R_PPC_ADDR14		7
-#define	R_PPC_ADDR14_BRTAKEN	8
-#define	R_PPC_ADDR14_BRNTAKEN	9
-#define	R_PPC_REL24		10
-#define	R_PPC_REL14		11
-#define	R_PPC_REL14_BRTAKEN	12
-#define	R_PPC_REL14_BRNTAKEN	13
-#define	R_PPC_GOT16		14
-#define	R_PPC_GOT16_LO		15
-#define	R_PPC_GOT16_HI		16
-#define	R_PPC_GOT16_HA		17
-#define	R_PPC_PLTREL24		18
-#define	R_PPC_COPY		19
-#define	R_PPC_GLOB_DAT		20
-#define	R_PPC_JMP_SLOT		21
-#define	R_PPC_RELATIVE		22
-#define	R_PPC_LOCAL24PC		23
-#define	R_PPC_UADDR32		24
-#define	R_PPC_UADDR16		25
-#define	R_PPC_REL32		26
-#define	R_PPC_PLT32		27
-#define	R_PPC_PLTREL32		28
-#define	R_PPC_PLT16_LO		29
-#define	R_PPC_PLT16_HI		30
-#define	R_PPC_PLT16_HA		31
-#define	R_PPC_SDAREL16		32
-#define	R_PPC_SECTOFF		33
-#define	R_PPC_SECTOFF_LO	34
-#define	R_PPC_SECTOFF_HI	35
-#define	R_PPC_SECTOFF_HA	36
-
-/*
- * 64-bit relocations
- */
-#define	R_PPC64_ADDR64		38
-#define	R_PPC64_ADDR16_HIGHER	39
-#define	R_PPC64_ADDR16_HIGHERA	40
-#define	R_PPC64_ADDR16_HIGHEST	41
-#define	R_PPC64_ADDR16_HIGHESTA	42
-#define	R_PPC64_UADDR64		43
-#define	R_PPC64_REL64		44
-#define	R_PPC64_PLT64		45
-#define	R_PPC64_PLTREL64	46
-#define	R_PPC64_TOC16		47
-#define	R_PPC64_TOC16_LO	48
-#define	R_PPC64_TOC16_HI	49
-#define	R_PPC64_TOC16_HA	50
-#define	R_PPC64_TOC		51
-#define	R_PPC64_DTPMOD64	68
-#define	R_PPC64_TPREL64		73
-#define	R_PPC64_DTPREL64	78
-
-/*
- * TLS relocations
- */
-#define	R_PPC_TLS		67
-#define	R_PPC_DTPMOD32		68
-#define	R_PPC_TPREL16		69
-#define	R_PPC_TPREL16_LO	70
-#define	R_PPC_TPREL16_HI	71
-#define	R_PPC_TPREL16_HA	72
-#define	R_PPC_TPREL32		73
-#define	R_PPC_DTPREL16		74
-#define	R_PPC_DTPREL16_LO	75
-#define	R_PPC_DTPREL16_HI	76
-#define	R_PPC_DTPREL16_HA	77
-#define	R_PPC_DTPREL32		78
-#define	R_PPC_GOT_TLSGD16	79
-#define	R_PPC_GOT_TLSGD16_LO	80
-#define	R_PPC_GOT_TLSGD16_HI	81
-#define	R_PPC_GOT_TLSGD16_HA	82
-#define	R_PPC_GOT_TLSLD16	83
-#define	R_PPC_GOT_TLSLD16_LO	84
-#define	R_PPC_GOT_TLSLD16_HI	85
-#define	R_PPC_GOT_TLSLD16_HA	86
-#define	R_PPC_GOT_TPREL16	87
-#define	R_PPC_GOT_TPREL16_LO	88
-#define	R_PPC_GOT_TPREL16_HI	89
-#define	R_PPC_GOT_TPREL16_HA	90
-
-/*
- * The remaining relocs are from the Embedded ELF ABI, and are not in the
- *  SVR4 ELF ABI.
- */
-
-#define	R_PPC_EMB_NADDR32	101
-#define	R_PPC_EMB_NADDR16	102
-#define	R_PPC_EMB_NADDR16_LO	103
-#define	R_PPC_EMB_NADDR16_HI	104
-#define	R_PPC_EMB_NADDR16_HA	105
-#define	R_PPC_EMB_SDAI16	106
-#define	R_PPC_EMB_SDA2I16	107
-#define	R_PPC_EMB_SDA2REL	108
-#define	R_PPC_EMB_SDA21		109
-#define	R_PPC_EMB_MRKREF	110
-#define	R_PPC_EMB_RELSEC16	111
-#define	R_PPC_EMB_RELST_LO	112
-#define	R_PPC_EMB_RELST_HI	113
-#define	R_PPC_EMB_RELST_HA	114
-#define	R_PPC_EMB_BIT_FLD	115
-#define	R_PPC_EMB_RELSDA	116
-
-#define	R_SPARC_NONE		0
-#define	R_SPARC_8		1
-#define	R_SPARC_16		2
-#define	R_SPARC_32		3
-#define	R_SPARC_DISP8		4
-#define	R_SPARC_DISP16		5
-#define	R_SPARC_DISP32		6
-#define	R_SPARC_WDISP30		7
-#define	R_SPARC_WDISP22		8
-#define	R_SPARC_HI22		9
-#define	R_SPARC_22		10
-#define	R_SPARC_13		11
-#define	R_SPARC_LO10		12
-#define	R_SPARC_GOT10		13
-#define	R_SPARC_GOT13		14
-#define	R_SPARC_GOT22		15
-#define	R_SPARC_PC10		16
-#define	R_SPARC_PC22		17
-#define	R_SPARC_WPLT30		18
-#define	R_SPARC_COPY		19
-#define	R_SPARC_GLOB_DAT	20
-#define	R_SPARC_JMP_SLOT	21
-#define	R_SPARC_RELATIVE	22
-#define	R_SPARC_UA32		23
-#define	R_SPARC_PLT32		24
-#define	R_SPARC_HIPLT22		25
-#define	R_SPARC_LOPLT10		26
-#define	R_SPARC_PCPLT32		27
-#define	R_SPARC_PCPLT22		28
-#define	R_SPARC_PCPLT10		29
-#define	R_SPARC_10		30
-#define	R_SPARC_11		31
-#define	R_SPARC_64		32
-#define	R_SPARC_OLO10		33
-#define	R_SPARC_HH22		34
-#define	R_SPARC_HM10		35
-#define	R_SPARC_LM22		36
-#define	R_SPARC_PC_HH22		37
-#define	R_SPARC_PC_HM10		38
-#define	R_SPARC_PC_LM22		39
-#define	R_SPARC_WDISP16		40
-#define	R_SPARC_WDISP19		41
-#define	R_SPARC_GLOB_JMP	42
-#define	R_SPARC_7		43
-#define	R_SPARC_5		44
-#define	R_SPARC_6		45
-#define	R_SPARC_DISP64		46
-#define	R_SPARC_PLT64		47
-#define	R_SPARC_HIX22		48
-#define	R_SPARC_LOX10		49
-#define	R_SPARC_H44		50
-#define	R_SPARC_M44		51
-#define	R_SPARC_L44		52
-#define	R_SPARC_REGISTER	53
-#define	R_SPARC_UA64		54
-#define	R_SPARC_UA16		55
-#define	R_SPARC_TLS_GD_HI22	56
-#define	R_SPARC_TLS_GD_LO10	57
-#define	R_SPARC_TLS_GD_ADD	58
-#define	R_SPARC_TLS_GD_CALL	59
-#define	R_SPARC_TLS_LDM_HI22	60
-#define	R_SPARC_TLS_LDM_LO10	61
-#define	R_SPARC_TLS_LDM_ADD	62
-#define	R_SPARC_TLS_LDM_CALL	63
-#define	R_SPARC_TLS_LDO_HIX22	64
-#define	R_SPARC_TLS_LDO_LOX10	65
-#define	R_SPARC_TLS_LDO_ADD	66
-#define	R_SPARC_TLS_IE_HI22	67
-#define	R_SPARC_TLS_IE_LO10	68
-#define	R_SPARC_TLS_IE_LD	69
-#define	R_SPARC_TLS_IE_LDX	70
-#define	R_SPARC_TLS_IE_ADD	71
-#define	R_SPARC_TLS_LE_HIX22	72
-#define	R_SPARC_TLS_LE_LOX10	73
-#define	R_SPARC_TLS_DTPMOD32	74
-#define	R_SPARC_TLS_DTPMOD64	75
-#define	R_SPARC_TLS_DTPOFF32	76
-#define	R_SPARC_TLS_DTPOFF64	77
-#define	R_SPARC_TLS_TPOFF32	78
-#define	R_SPARC_TLS_TPOFF64	79
-
-#define	R_X86_64_NONE		0	/* No relocation. */
-#define	R_X86_64_64		1	/* Add 64 bit symbol value. */
-#define	R_X86_64_PC32		2	/* PC-relative 32 bit signed sym value. */
-#define	R_X86_64_GOT32		3	/* PC-relative 32 bit GOT offset. */
-#define	R_X86_64_PLT32		4	/* PC-relative 32 bit PLT offset. */
-#define	R_X86_64_COPY		5	/* Copy data from shared object. */
-#define	R_X86_64_GLOB_DAT	6	/* Set GOT entry to data address. */
-#define	R_X86_64_JMP_SLOT	7	/* Set GOT entry to code address. */
-#define	R_X86_64_RELATIVE	8	/* Add load address of shared object. */
-#define	R_X86_64_GOTPCREL	9	/* Add 32 bit signed pcrel offset to GOT. */
-#define	R_X86_64_32		10	/* Add 32 bit zero extended symbol value */
-#define	R_X86_64_32S		11	/* Add 32 bit sign extended symbol value */
-#define	R_X86_64_16		12	/* Add 16 bit zero extended symbol value */
-#define	R_X86_64_PC16		13	/* Add 16 bit signed extended pc relative symbol value */
-#define	R_X86_64_8		14	/* Add 8 bit zero extended symbol value */
-#define	R_X86_64_PC8		15	/* Add 8 bit signed extended pc relative symbol value */
-#define	R_X86_64_DTPMOD64	16	/* ID of module containing symbol */
-#define	R_X86_64_DTPOFF64	17	/* Offset in TLS block */
-#define	R_X86_64_TPOFF64	18	/* Offset in static TLS block */
-#define	R_X86_64_TLSGD		19	/* PC relative offset to GD GOT entry */
-#define	R_X86_64_TLSLD		20	/* PC relative offset to LD GOT entry */
-#define	R_X86_64_DTPOFF32	21	/* Offset in TLS block */
-#define	R_X86_64_GOTTPOFF	22	/* PC relative offset to IE GOT entry */
-#define	R_X86_64_TPOFF32	23	/* Offset in static TLS block */
-#define	R_X86_64_PC64		24	/* PC-relative 64 bit signed sym value. */
-#define	R_X86_64_GOTOFF64	25
-#define	R_X86_64_GOTPC32	26
-#define	R_X86_64_GOT64		27
-#define	R_X86_64_GOTPCREL64	28
-#define	R_X86_64_GOTPC64	29
-#define	R_X86_64_GOTPLT64	30
-#define	R_X86_64_PLTOFF64	31
-#define	R_X86_64_SIZE32		32
-#define	R_X86_64_SIZE64		33
-#define	R_X86_64_GOTPC32_TLSDESC 34
-#define	R_X86_64_TLSDESC_CALL	35
-#define	R_X86_64_TLSDESC	36
-#define	R_X86_64_IRELATIVE	37
-
-
-#endif /* !_SYS_ELF_COMMON_H_ */
diff --git a/include.new/sys/elf_generic.h b/include.new/sys/elf_generic.h
deleted file mode 100644
index 60df739..0000000
--- a/include.new/sys/elf_generic.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * Copyright (c) 1998 John D. Polstra.
- * 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.
- *
- * 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: releng/10.2/sys/sys/elf_generic.h 186667 2009-01-01 02:08:56Z obrien $
- */
-
-#ifndef _SYS_ELF_GENERIC_H_
-#define	_SYS_ELF_GENERIC_H_ 1
-
-#include <sys/cdefs.h>
-
-/*
- * Definitions of generic ELF names which relieve applications from
- * needing to know the word size.
- */
-
-#if __ELF_WORD_SIZE != 32 && __ELF_WORD_SIZE != 64
-#error "__ELF_WORD_SIZE must be defined as 32 or 64"
-#endif
-
-#define	ELF_CLASS	__CONCAT(ELFCLASS,__ELF_WORD_SIZE)
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define	ELF_DATA	ELFDATA2LSB
-#elif BYTE_ORDER == BIG_ENDIAN
-#define	ELF_DATA	ELFDATA2MSB
-#else
-#error "Unknown byte order"
-#endif
-
-#define	__elfN(x)	__CONCAT(__CONCAT(__CONCAT(elf,__ELF_WORD_SIZE),_),x)
-#define	__ElfN(x)	__CONCAT(__CONCAT(__CONCAT(Elf,__ELF_WORD_SIZE),_),x)
-#define	__ELFN(x)	__CONCAT(__CONCAT(__CONCAT(ELF,__ELF_WORD_SIZE),_),x)
-#define	__ElfType(x)	typedef __ElfN(x) __CONCAT(Elf_,x)
-
-__ElfType(Addr);
-__ElfType(Half);
-__ElfType(Off);
-__ElfType(Sword);
-__ElfType(Word);
-__ElfType(Ehdr);
-__ElfType(Shdr);
-__ElfType(Phdr);
-__ElfType(Dyn);
-__ElfType(Rel);
-__ElfType(Rela);
-__ElfType(Sym);
-__ElfType(Verdef);
-__ElfType(Verdaux);
-__ElfType(Verneed);
-__ElfType(Vernaux);
-__ElfType(Versym);
-
-/* Non-standard ELF types. */
-__ElfType(Hashelt);
-__ElfType(Size);
-__ElfType(Ssize);
-
-#define	ELF_R_SYM	__ELFN(R_SYM)
-#define	ELF_R_TYPE	__ELFN(R_TYPE)
-#define	ELF_R_INFO	__ELFN(R_INFO)
-#define	ELF_ST_BIND	__ELFN(ST_BIND)
-#define	ELF_ST_TYPE	__ELFN(ST_TYPE)
-#define	ELF_ST_INFO	__ELFN(ST_INFO)
-
-#endif /* !_SYS_ELF_GENERIC_H_ */
diff --git a/include.new/sys/endian.h b/include.new/sys/endian.h
deleted file mode 100644
index 45e7952..0000000
--- a/include.new/sys/endian.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * Copyright (c) 2002 Thomas Moestl <tmm@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.
- *
- * 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: releng/10.2/sys/sys/endian.h 208331 2010-05-20 06:16:13Z phk $
- */
-
-#ifndef _SYS_ENDIAN_H_
-#define _SYS_ENDIAN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <machine/endian.h>
-
-#ifndef _UINT8_T_DECLARED
-typedef	__uint8_t	uint8_t;
-#define	_UINT8_T_DECLARED
-#endif
- 
-#ifndef _UINT16_T_DECLARED
-typedef	__uint16_t	uint16_t;
-#define	_UINT16_T_DECLARED
-#endif
- 
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t	uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
- 
-#ifndef _UINT64_T_DECLARED
-typedef	__uint64_t	uint64_t;
-#define	_UINT64_T_DECLARED
-#endif
- 
-/*
- * General byte order swapping functions.
- */
-#define	bswap16(x)	__bswap16(x)
-#define	bswap32(x)	__bswap32(x)
-#define	bswap64(x)	__bswap64(x)
-
-/*
- * Host to big endian, host to little endian, big endian to host, and little
- * endian to host byte order functions as detailed in byteorder(9).
- */
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define	htobe16(x)	bswap16((x))
-#define	htobe32(x)	bswap32((x))
-#define	htobe64(x)	bswap64((x))
-#define	htole16(x)	((uint16_t)(x))
-#define	htole32(x)	((uint32_t)(x))
-#define	htole64(x)	((uint64_t)(x))
-
-#define	be16toh(x)	bswap16((x))
-#define	be32toh(x)	bswap32((x))
-#define	be64toh(x)	bswap64((x))
-#define	le16toh(x)	((uint16_t)(x))
-#define	le32toh(x)	((uint32_t)(x))
-#define	le64toh(x)	((uint64_t)(x))
-#else /* _BYTE_ORDER != _LITTLE_ENDIAN */
-#define	htobe16(x)	((uint16_t)(x))
-#define	htobe32(x)	((uint32_t)(x))
-#define	htobe64(x)	((uint64_t)(x))
-#define	htole16(x)	bswap16((x))
-#define	htole32(x)	bswap32((x))
-#define	htole64(x)	bswap64((x))
-
-#define	be16toh(x)	((uint16_t)(x))
-#define	be32toh(x)	((uint32_t)(x))
-#define	be64toh(x)	((uint64_t)(x))
-#define	le16toh(x)	bswap16((x))
-#define	le32toh(x)	bswap32((x))
-#define	le64toh(x)	bswap64((x))
-#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
-
-/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
-
-static __inline uint16_t
-be16dec(const void *pp)
-{
-	uint8_t const *p = (uint8_t const *)pp;
-
-	return ((p[0] << 8) | p[1]);
-}
-
-static __inline uint32_t
-be32dec(const void *pp)
-{
-	uint8_t const *p = (uint8_t const *)pp;
-
-	return (((unsigned)p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
-}
-
-static __inline uint64_t
-be64dec(const void *pp)
-{
-	uint8_t const *p = (uint8_t const *)pp;
-
-	return (((uint64_t)be32dec(p) << 32) | be32dec(p + 4));
-}
-
-static __inline uint16_t
-le16dec(const void *pp)
-{
-	uint8_t const *p = (uint8_t const *)pp;
-
-	return ((p[1] << 8) | p[0]);
-}
-
-static __inline uint32_t
-le32dec(const void *pp)
-{
-	uint8_t const *p = (uint8_t const *)pp;
-
-	return (((unsigned)p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
-}
-
-static __inline uint64_t
-le64dec(const void *pp)
-{
-	uint8_t const *p = (uint8_t const *)pp;
-
-	return (((uint64_t)le32dec(p + 4) << 32) | le32dec(p));
-}
-
-static __inline void
-be16enc(void *pp, uint16_t u)
-{
-	uint8_t *p = (uint8_t *)pp;
-
-	p[0] = (u >> 8) & 0xff;
-	p[1] = u & 0xff;
-}
-
-static __inline void
-be32enc(void *pp, uint32_t u)
-{
-	uint8_t *p = (uint8_t *)pp;
-
-	p[0] = (u >> 24) & 0xff;
-	p[1] = (u >> 16) & 0xff;
-	p[2] = (u >> 8) & 0xff;
-	p[3] = u & 0xff;
-}
-
-static __inline void
-be64enc(void *pp, uint64_t u)
-{
-	uint8_t *p = (uint8_t *)pp;
-
-	be32enc(p, (uint32_t)(u >> 32));
-	be32enc(p + 4, (uint32_t)(u & 0xffffffffU));
-}
-
-static __inline void
-le16enc(void *pp, uint16_t u)
-{
-	uint8_t *p = (uint8_t *)pp;
-
-	p[0] = u & 0xff;
-	p[1] = (u >> 8) & 0xff;
-}
-
-static __inline void
-le32enc(void *pp, uint32_t u)
-{
-	uint8_t *p = (uint8_t *)pp;
-
-	p[0] = u & 0xff;
-	p[1] = (u >> 8) & 0xff;
-	p[2] = (u >> 16) & 0xff;
-	p[3] = (u >> 24) & 0xff;
-}
-
-static __inline void
-le64enc(void *pp, uint64_t u)
-{
-	uint8_t *p = (uint8_t *)pp;
-
-	le32enc(p, (uint32_t)(u & 0xffffffffU));
-	le32enc(p + 4, (uint32_t)(u >> 32));
-}
-
-#endif	/* _SYS_ENDIAN_H_ */
diff --git a/include.new/sys/errno.h b/include.new/sys/errno.h
deleted file mode 100644
index 690ae14..0000000
--- a/include.new/sys/errno.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/errno.h 250250 2013-05-04 19:07:22Z pluknet $
- */
-
-#ifndef _SYS_ERRNO_H_
-#define _SYS_ERRNO_H_
-
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-int *	__error(void);
-__END_DECLS
-#define	errno		(* __error())
-#endif
-
-#define	EPERM		1		/* Operation not permitted */
-#define	ENOENT		2		/* No such file or directory */
-#define	ESRCH		3		/* No such process */
-#define	EINTR		4		/* Interrupted system call */
-#define	EIO		5		/* Input/output error */
-#define	ENXIO		6		/* Device not configured */
-#define	E2BIG		7		/* Argument list too long */
-#define	ENOEXEC		8		/* Exec format error */
-#define	EBADF		9		/* Bad file descriptor */
-#define	ECHILD		10		/* No child processes */
-#define	EDEADLK		11		/* Resource deadlock avoided */
-					/* 11 was EAGAIN */
-#define	ENOMEM		12		/* Cannot allocate memory */
-#define	EACCES		13		/* Permission denied */
-#define	EFAULT		14		/* Bad address */
-#ifndef _POSIX_SOURCE
-#define	ENOTBLK		15		/* Block device required */
-#endif
-#define	EBUSY		16		/* Device busy */
-#define	EEXIST		17		/* File exists */
-#define	EXDEV		18		/* Cross-device link */
-#define	ENODEV		19		/* Operation not supported by device */
-#define	ENOTDIR		20		/* Not a directory */
-#define	EISDIR		21		/* Is a directory */
-#define	EINVAL		22		/* Invalid argument */
-#define	ENFILE		23		/* Too many open files in system */
-#define	EMFILE		24		/* Too many open files */
-#define	ENOTTY		25		/* Inappropriate ioctl for device */
-#ifndef _POSIX_SOURCE
-#define	ETXTBSY		26		/* Text file busy */
-#endif
-#define	EFBIG		27		/* File too large */
-#define	ENOSPC		28		/* No space left on device */
-#define	ESPIPE		29		/* Illegal seek */
-#define	EROFS		30		/* Read-only filesystem */
-#define	EMLINK		31		/* Too many links */
-#define	EPIPE		32		/* Broken pipe */
-
-/* math software */
-#define	EDOM		33		/* Numerical argument out of domain */
-#define	ERANGE		34		/* Result too large */
-
-/* non-blocking and interrupt i/o */
-#define	EAGAIN		35		/* Resource temporarily unavailable */
-#ifndef _POSIX_SOURCE
-#define	EWOULDBLOCK	EAGAIN		/* Operation would block */
-#define	EINPROGRESS	36		/* Operation now in progress */
-#define	EALREADY	37		/* Operation already in progress */
-
-/* ipc/network software -- argument errors */
-#define	ENOTSOCK	38		/* Socket operation on non-socket */
-#define	EDESTADDRREQ	39		/* Destination address required */
-#define	EMSGSIZE	40		/* Message too long */
-#define	EPROTOTYPE	41		/* Protocol wrong type for socket */
-#define	ENOPROTOOPT	42		/* Protocol not available */
-#define	EPROTONOSUPPORT	43		/* Protocol not supported */
-#define	ESOCKTNOSUPPORT	44		/* Socket type not supported */
-#define	EOPNOTSUPP	45		/* Operation not supported */
-#define	ENOTSUP		EOPNOTSUPP	/* Operation not supported */
-#define	EPFNOSUPPORT	46		/* Protocol family not supported */
-#define	EAFNOSUPPORT	47		/* Address family not supported by protocol family */
-#define	EADDRINUSE	48		/* Address already in use */
-#define	EADDRNOTAVAIL	49		/* Can't assign requested address */
-
-/* ipc/network software -- operational errors */
-#define	ENETDOWN	50		/* Network is down */
-#define	ENETUNREACH	51		/* Network is unreachable */
-#define	ENETRESET	52		/* Network dropped connection on reset */
-#define	ECONNABORTED	53		/* Software caused connection abort */
-#define	ECONNRESET	54		/* Connection reset by peer */
-#define	ENOBUFS		55		/* No buffer space available */
-#define	EISCONN		56		/* Socket is already connected */
-#define	ENOTCONN	57		/* Socket is not connected */
-#define	ESHUTDOWN	58		/* Can't send after socket shutdown */
-#define	ETOOMANYREFS	59		/* Too many references: can't splice */
-#define	ETIMEDOUT	60		/* Operation timed out */
-#define	ECONNREFUSED	61		/* Connection refused */
-
-#define	ELOOP		62		/* Too many levels of symbolic links */
-#endif /* _POSIX_SOURCE */
-#define	ENAMETOOLONG	63		/* File name too long */
-
-/* should be rearranged */
-#ifndef _POSIX_SOURCE
-#define	EHOSTDOWN	64		/* Host is down */
-#define	EHOSTUNREACH	65		/* No route to host */
-#endif /* _POSIX_SOURCE */
-#define	ENOTEMPTY	66		/* Directory not empty */
-
-/* quotas & mush */
-#ifndef _POSIX_SOURCE
-#define	EPROCLIM	67		/* Too many processes */
-#define	EUSERS		68		/* Too many users */
-#define	EDQUOT		69		/* Disc quota exceeded */
-
-/* Network File System */
-#define	ESTALE		70		/* Stale NFS file handle */
-#define	EREMOTE		71		/* Too many levels of remote in path */
-#define	EBADRPC		72		/* RPC struct is bad */
-#define	ERPCMISMATCH	73		/* RPC version wrong */
-#define	EPROGUNAVAIL	74		/* RPC prog. not avail */
-#define	EPROGMISMATCH	75		/* Program version wrong */
-#define	EPROCUNAVAIL	76		/* Bad procedure for program */
-#endif /* _POSIX_SOURCE */
-
-#define	ENOLCK		77		/* No locks available */
-#define	ENOSYS		78		/* Function not implemented */
-
-#ifndef _POSIX_SOURCE
-#define	EFTYPE		79		/* Inappropriate file type or format */
-#define	EAUTH		80		/* Authentication error */
-#define	ENEEDAUTH	81		/* Need authenticator */
-#define	EIDRM		82		/* Identifier removed */
-#define	ENOMSG		83		/* No message of desired type */
-#define	EOVERFLOW	84		/* Value too large to be stored in data type */
-#define	ECANCELED	85		/* Operation canceled */
-#define	EILSEQ		86		/* Illegal byte sequence */
-#define	ENOATTR		87		/* Attribute not found */
-
-#define	EDOOFUS		88		/* Programming error */
-#endif /* _POSIX_SOURCE */
-
-#define	EBADMSG		89		/* Bad message */
-#define	EMULTIHOP	90		/* Multihop attempted */
-#define	ENOLINK		91		/* Link has been severed */
-#define	EPROTO		92		/* Protocol error */
-
-#ifndef _POSIX_SOURCE
-#define	ENOTCAPABLE	93		/* Capabilities insufficient */
-#define	ECAPMODE	94		/* Not permitted in capability mode */
-#define	ENOTRECOVERABLE	95		/* State not recoverable */
-#define	EOWNERDEAD	96		/* Previous owner died */
-#endif /* _POSIX_SOURCE */
-
-#ifndef _POSIX_SOURCE
-#define	ELAST		96		/* Must be equal largest errno */
-#endif /* _POSIX_SOURCE */
-
-#ifdef _KERNEL
-/* pseudo-errors returned inside kernel to modify return to process */
-#define	ERESTART	(-1)		/* restart syscall */
-#define	EJUSTRETURN	(-2)		/* don't modify regs, just return */
-#define	ENOIOCTL	(-3)		/* ioctl not handled by this layer */
-#define	EDIRIOCTL	(-4)		/* do direct ioctl in GEOM */
-#endif
-
-#endif
diff --git a/include.new/sys/eui64.h b/include.new/sys/eui64.h
deleted file mode 100644
index ed64835..0000000
--- a/include.new/sys/eui64.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright 2004 The Aerospace Corporation.  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 Aerospace Corporation may not be used to endorse or
- *     promote products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "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 AEROSPACE CORPORATION 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: releng/10.2/sys/sys/eui64.h 139825 2005-01-07 02:29:27Z imp $
- */
-#ifndef _SYS_EUI64_H
-#define _SYS_EUI64_H
-
-/*
- * Size of the ASCII representation of an EUI-64.
- */
-#define EUI64_SIZ	24
-
-/*
- * The number of bytes in an EUI-64.
- */
-#define EUI64_LEN	8
-
-/*
- * Structure of an IEEE EUI-64.
- */
-struct	eui64 {
-	u_char octet[EUI64_LEN];
-};
-
-#ifndef _KERNEL
-int	eui64_aton(const char *, struct eui64 *);
-int	eui64_ntoa(const struct eui64 *, char *, size_t);
-int	eui64_ntohost(char *, size_t, const struct eui64 *);
-int	eui64_hostton(const char *, struct eui64 *);
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_EUI64_H */
diff --git a/include.new/sys/event.h b/include.new/sys/event.h
deleted file mode 100644
index b8cbf55..0000000
--- a/include.new/sys/event.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*-
- * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@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.
- *
- * 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: releng/10.2/sys/sys/event.h 275899 2014-12-18 11:30:51Z kib $
- */
-
-#ifndef _SYS_EVENT_H_
-#define _SYS_EVENT_H_
-
-#include <sys/queue.h> 
-
-#define EVFILT_READ		(-1)
-#define EVFILT_WRITE		(-2)
-#define EVFILT_AIO		(-3)	/* attached to aio requests */
-#define EVFILT_VNODE		(-4)	/* attached to vnodes */
-#define EVFILT_PROC		(-5)	/* attached to struct proc */
-#define EVFILT_SIGNAL		(-6)	/* attached to struct proc */
-#define EVFILT_TIMER		(-7)	/* timers */
-/*	EVFILT_NETDEV		(-8)	   no longer supported */
-#define EVFILT_FS		(-9)	/* filesystem events */
-#define EVFILT_LIO		(-10)	/* attached to lio requests */
-#define EVFILT_USER		(-11)	/* User events */
-#define EVFILT_SYSCOUNT		11
-
-#define EV_SET(kevp_, a, b, c, d, e, f) do {	\
-	struct kevent *kevp = (kevp_);		\
-	(kevp)->ident = (a);			\
-	(kevp)->filter = (b);			\
-	(kevp)->flags = (c);			\
-	(kevp)->fflags = (d);			\
-	(kevp)->data = (e);			\
-	(kevp)->udata = (f);			\
-} while(0)
-
-struct kevent {
-	uintptr_t	ident;		/* identifier for this event */
-	short		filter;		/* filter for event */
-	u_short		flags;
-	u_int		fflags;
-	intptr_t	data;
-	void		*udata;		/* opaque user data identifier */
-};
-
-/* actions */
-#define EV_ADD		0x0001		/* add event to kq (implies enable) */
-#define EV_DELETE	0x0002		/* delete event from kq */
-#define EV_ENABLE	0x0004		/* enable event */
-#define EV_DISABLE	0x0008		/* disable event (not reported) */
-
-/* flags */
-#define EV_ONESHOT	0x0010		/* only report one occurrence */
-#define EV_CLEAR	0x0020		/* clear event state after reporting */
-#define EV_RECEIPT	0x0040		/* force EV_ERROR on success, data=0 */
-#define EV_DISPATCH	0x0080		/* disable event after reporting */
-
-#define EV_SYSFLAGS	0xF000		/* reserved by system */
-#define	EV_DROP		0x1000		/* note should be dropped */
-#define EV_FLAG1	0x2000		/* filter-specific flag */
-
-/* returned values */
-#define EV_EOF		0x8000		/* EOF detected */
-#define EV_ERROR	0x4000		/* error, data contains errno */
-
- /*
-  * data/hint flags/masks for EVFILT_USER, shared with userspace
-  *
-  * On input, the top two bits of fflags specifies how the lower twenty four
-  * bits should be applied to the stored value of fflags.
-  *
-  * On output, the top two bits will always be set to NOTE_FFNOP and the
-  * remaining twenty four bits will contain the stored fflags value.
-  */
-#define NOTE_FFNOP	0x00000000		/* ignore input fflags */
-#define NOTE_FFAND	0x40000000		/* AND fflags */
-#define NOTE_FFOR	0x80000000		/* OR fflags */
-#define NOTE_FFCOPY	0xc0000000		/* copy fflags */
-#define NOTE_FFCTRLMASK	0xc0000000		/* masks for operations */
-#define NOTE_FFLAGSMASK	0x00ffffff
-
-#define NOTE_TRIGGER	0x01000000		/* Cause the event to be
-						   triggered for output. */
-
-/*
- * data/hint flags for EVFILT_{READ|WRITE}, shared with userspace
- */
-#define NOTE_LOWAT	0x0001			/* low water mark */
-
-/*
- * data/hint flags for EVFILT_VNODE, shared with userspace
- */
-#define	NOTE_DELETE	0x0001			/* vnode was removed */
-#define	NOTE_WRITE	0x0002			/* data contents changed */
-#define	NOTE_EXTEND	0x0004			/* size increased */
-#define	NOTE_ATTRIB	0x0008			/* attributes changed */
-#define	NOTE_LINK	0x0010			/* link count changed */
-#define	NOTE_RENAME	0x0020			/* vnode was renamed */
-#define	NOTE_REVOKE	0x0040			/* vnode access was revoked */
-
-/*
- * data/hint flags for EVFILT_PROC, shared with userspace
- */
-#define	NOTE_EXIT	0x80000000		/* process exited */
-#define	NOTE_FORK	0x40000000		/* process forked */
-#define	NOTE_EXEC	0x20000000		/* process exec'd */
-#define	NOTE_PCTRLMASK	0xf0000000		/* mask for hint bits */
-#define	NOTE_PDATAMASK	0x000fffff		/* mask for pid */
-
-/* additional flags for EVFILT_PROC */
-#define	NOTE_TRACK	0x00000001		/* follow across forks */
-#define	NOTE_TRACKERR	0x00000002		/* could not track child */
-#define	NOTE_CHILD	0x00000004		/* am a child process */
-
-/* additional flags for EVFILE_TIMER */
-#define NOTE_SECONDS		0x00000001	/* data is seconds */
-#define NOTE_MSECONDS		0x00000002	/* data is milliseconds */
-#define NOTE_USECONDS		0x00000004	/* data is microseconds */
-#define NOTE_NSECONDS		0x00000008	/* data is nanoseconds */
-
-struct knote;
-SLIST_HEAD(klist, knote);
-struct kqueue;
-TAILQ_HEAD(kqlist, kqueue);
-struct knlist {
-	struct	klist	kl_list;
-	void    (*kl_lock)(void *);	/* lock function */
-	void    (*kl_unlock)(void *);
-	void	(*kl_assert_locked)(void *);
-	void	(*kl_assert_unlocked)(void *);
-	void *kl_lockarg;		/* argument passed to kl_lockf() */
-};
-
-
-#ifdef _KERNEL
-
-/*
- * Flags for knote call
- */
-#define	KNF_LISTLOCKED	0x0001			/* knlist is locked */
-#define	KNF_NOKQLOCK	0x0002			/* do not keep KQ_LOCK */
-
-#define KNOTE(list, hist, flags)	knote(list, hist, flags)
-#define KNOTE_LOCKED(list, hint)	knote(list, hint, KNF_LISTLOCKED)
-#define KNOTE_UNLOCKED(list, hint)	knote(list, hint, 0)
-
-#define	KNLIST_EMPTY(list)		SLIST_EMPTY(&(list)->kl_list)
-
-/*
- * Flag indicating hint is a signal.  Used by EVFILT_SIGNAL, and also
- * shared by EVFILT_PROC  (all knotes attached to p->p_klist)
- */
-#define NOTE_SIGNAL	0x08000000
-
-/*
- * Hint values for the optional f_touch event filter.  If f_touch is not set 
- * to NULL and f_isfd is zero the f_touch filter will be called with the type
- * argument set to EVENT_REGISTER during a kevent() system call.  It is also
- * called under the same conditions with the type argument set to EVENT_PROCESS
- * when the event has been triggered.
- */
-#define EVENT_REGISTER	1
-#define EVENT_PROCESS	2
-
-struct filterops {
-	int	f_isfd;		/* true if ident == filedescriptor */
-	int	(*f_attach)(struct knote *kn);
-	void	(*f_detach)(struct knote *kn);
-	int	(*f_event)(struct knote *kn, long hint);
-	void	(*f_touch)(struct knote *kn, struct kevent *kev, u_long type);
-};
-
-/*
- * Setting the KN_INFLUX flag enables you to unlock the kq that this knote
- * is on, and modify kn_status as if you had the KQ lock.
- *
- * kn_sfflags, kn_sdata, and kn_kevent are protected by the knlist lock.
- */
-struct knote {
-	SLIST_ENTRY(knote)	kn_link;	/* for kq */
-	SLIST_ENTRY(knote)	kn_selnext;	/* for struct selinfo */
-	struct			knlist *kn_knlist;	/* f_attach populated */
-	TAILQ_ENTRY(knote)	kn_tqe;
-	struct			kqueue *kn_kq;	/* which queue we are on */
-	struct 			kevent kn_kevent;
-	int			kn_status;	/* protected by kq lock */
-#define KN_ACTIVE	0x01			/* event has been triggered */
-#define KN_QUEUED	0x02			/* event is on queue */
-#define KN_DISABLED	0x04			/* event is disabled */
-#define KN_DETACHED	0x08			/* knote is detached */
-#define KN_INFLUX	0x10			/* knote is in flux */
-#define KN_MARKER	0x20			/* ignore this knote */
-#define KN_KQUEUE	0x40			/* this knote belongs to a kq */
-#define KN_HASKQLOCK	0x80			/* for _inevent */
-#define	KN_SCAN		0x100			/* flux set in kqueue_scan() */
-	int			kn_sfflags;	/* saved filter flags */
-	intptr_t		kn_sdata;	/* saved data field */
-	union {
-		struct		file *p_fp;	/* file data pointer */
-		struct		proc *p_proc;	/* proc pointer */
-		struct		aiocblist *p_aio;	/* AIO job pointer */
-		struct		aioliojob *p_lio;	/* LIO job pointer */ 
-		sbintime_t	*p_nexttime;	/* next timer event fires at */
-	} kn_ptr;
-	struct			filterops *kn_fop;
-	void			*kn_hook;
-	int			kn_hookid;
-
-#define kn_id		kn_kevent.ident
-#define kn_filter	kn_kevent.filter
-#define kn_flags	kn_kevent.flags
-#define kn_fflags	kn_kevent.fflags
-#define kn_data		kn_kevent.data
-#define kn_fp		kn_ptr.p_fp
-};
-struct kevent_copyops {
-	void	*arg;
-	int	(*k_copyout)(void *arg, struct kevent *kevp, int count);
-	int	(*k_copyin)(void *arg, struct kevent *kevp, int count);
-};
-
-struct thread;
-struct proc;
-struct knlist;
-struct mtx;
-struct rwlock;
-
-extern void	knote(struct knlist *list, long hint, int lockflags);
-extern void	knote_fork(struct knlist *list, int pid);
-extern void	knlist_add(struct knlist *knl, struct knote *kn, int islocked);
-extern void	knlist_remove(struct knlist *knl, struct knote *kn, int islocked);
-extern void	knlist_remove_inevent(struct knlist *knl, struct knote *kn);
-extern int	knlist_empty(struct knlist *knl);
-extern void	knlist_init(struct knlist *knl, void *lock,
-    void (*kl_lock)(void *), void (*kl_unlock)(void *),
-    void (*kl_assert_locked)(void *), void (*kl_assert_unlocked)(void *));
-extern void	knlist_init_mtx(struct knlist *knl, struct mtx *lock);
-extern void	knlist_init_rw_reader(struct knlist *knl, struct rwlock *lock);
-extern void	knlist_destroy(struct knlist *knl);
-extern void	knlist_cleardel(struct knlist *knl, struct thread *td,
-	int islocked, int killkn);
-#define knlist_clear(knl, islocked)				\
-		knlist_cleardel((knl), NULL, (islocked), 0)
-#define knlist_delete(knl, td, islocked)			\
-		knlist_cleardel((knl), (td), (islocked), 1)
-extern void	knote_fdclose(struct thread *p, int fd);
-extern int 	kqfd_register(int fd, struct kevent *kev, struct thread *p,
-		    int waitok);
-extern int	kqueue_add_filteropts(int filt, struct filterops *filtops);
-extern int	kqueue_del_filteropts(int filt);
-
-#else 	/* !_KERNEL */
-
-#include <sys/cdefs.h>
-struct timespec;
-
-__BEGIN_DECLS
-int     kqueue(void);
-int     kevent(int kq, const struct kevent *changelist, int nchanges,
-	    struct kevent *eventlist, int nevents,
-	    const struct timespec *timeout);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_EVENT_H_ */
diff --git a/include.new/sys/eventhandler.h b/include.new/sys/eventhandler.h
deleted file mode 100644
index 73a3460..0000000
--- a/include.new/sys/eventhandler.h
+++ /dev/null
@@ -1,286 +0,0 @@
-/*-
- * Copyright (c) 1999 Michael Smith <msmith@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.
- *
- * 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: releng/10.2/sys/sys/eventhandler.h 282750 2015-05-11 08:16:33Z avg $
- */
-
-#ifndef SYS_EVENTHANDLER_H
-#define SYS_EVENTHANDLER_H
-
-#include <sys/lock.h>
-#include <sys/ktr.h>
-#include <sys/mutex.h>
-#include <sys/queue.h>
-
-struct eventhandler_entry {
-	TAILQ_ENTRY(eventhandler_entry)	ee_link;
-	int				ee_priority;
-#define	EHE_DEAD_PRIORITY	(-1)
-	void				*ee_arg;
-};
-
-#ifdef VIMAGE
-struct eventhandler_entry_vimage {
-	void	(* func)(void);		/* Original function registered. */
-	void	*ee_arg;		/* Original argument registered. */
-	void	*sparep[2];
-};
-#endif
-
-struct eventhandler_list {
-	char				*el_name;
-	int				el_flags;
-#define EHL_INITTED	(1<<0)
-	u_int				el_runcount;
-	struct mtx			el_lock;
-	TAILQ_ENTRY(eventhandler_list)	el_link;
-	TAILQ_HEAD(,eventhandler_entry)	el_entries;
-};
-
-typedef struct eventhandler_entry	*eventhandler_tag;
-
-#define	EHL_LOCK(p)		mtx_lock(&(p)->el_lock)
-#define	EHL_UNLOCK(p)		mtx_unlock(&(p)->el_lock)
-#define	EHL_LOCK_ASSERT(p, x)	mtx_assert(&(p)->el_lock, x)
-
-/*
- * Macro to invoke the handlers for a given event.
- */
-#define _EVENTHANDLER_INVOKE(name, list, ...) do {			\
-	struct eventhandler_entry *_ep;					\
-	struct eventhandler_entry_ ## name *_t;				\
-									\
-	KASSERT((list)->el_flags & EHL_INITTED,				\
- 	   ("eventhandler_invoke: running non-inited list"));		\
-	EHL_LOCK_ASSERT((list), MA_OWNED);				\
-	(list)->el_runcount++;						\
-	KASSERT((list)->el_runcount > 0,				\
-	    ("eventhandler_invoke: runcount overflow"));		\
-	CTR0(KTR_EVH, "eventhandler_invoke(\"" __STRING(name) "\")");	\
-	TAILQ_FOREACH(_ep, &((list)->el_entries), ee_link) {		\
-		if (_ep->ee_priority != EHE_DEAD_PRIORITY) {		\
-			EHL_UNLOCK((list));				\
-			_t = (struct eventhandler_entry_ ## name *)_ep;	\
-			CTR1(KTR_EVH, "eventhandler_invoke: executing %p", \
- 			    (void *)_t->eh_func);			\
-			_t->eh_func(_ep->ee_arg , ## __VA_ARGS__);	\
-			EHL_LOCK((list));				\
-		}							\
-	}								\
-	KASSERT((list)->el_runcount > 0,				\
-	    ("eventhandler_invoke: runcount underflow"));		\
-	(list)->el_runcount--;						\
-	if ((list)->el_runcount == 0)					\
-		eventhandler_prune_list(list);				\
-	EHL_UNLOCK((list));						\
-} while (0)
-
-/*
- * Slow handlers are entirely dynamic; lists are created
- * when entries are added to them, and thus have no concept of "owner",
- *
- * Slow handlers need to be declared, but do not need to be defined. The
- * declaration must be in scope wherever the handler is to be invoked.
- */
-#define EVENTHANDLER_DECLARE(name, type)				\
-struct eventhandler_entry_ ## name 					\
-{									\
-	struct eventhandler_entry	ee;				\
-	type				eh_func;			\
-};									\
-struct __hack
-
-#define EVENTHANDLER_DEFINE(name, func, arg, priority)			\
-	static eventhandler_tag name ## _tag;				\
-	static void name ## _evh_init(void *ctx)			\
-	{								\
-		name ## _tag = EVENTHANDLER_REGISTER(name, func, ctx,	\
-		    priority);						\
-	}								\
-	SYSINIT(name ## _evh_init, SI_SUB_CONFIGURE, SI_ORDER_ANY,	\
-	    name ## _evh_init, arg);					\
-	struct __hack
-
-#define EVENTHANDLER_INVOKE(name, ...)					\
-do {									\
-	struct eventhandler_list *_el;					\
-									\
-	if ((_el = eventhandler_find_list(#name)) != NULL) 		\
-		_EVENTHANDLER_INVOKE(name, _el , ## __VA_ARGS__);	\
-} while (0)
-
-#define EVENTHANDLER_REGISTER(name, func, arg, priority)		\
-	eventhandler_register(NULL, #name, func, arg, priority)
-
-#define EVENTHANDLER_DEREGISTER(name, tag) 				\
-do {									\
-	struct eventhandler_list *_el;					\
-									\
-	if ((_el = eventhandler_find_list(#name)) != NULL)		\
-		eventhandler_deregister(_el, tag);			\
-} while(0)
-	
-
-eventhandler_tag eventhandler_register(struct eventhandler_list *list, 
-	    const char *name, void *func, void *arg, int priority);
-void	eventhandler_deregister(struct eventhandler_list *list,
-	    eventhandler_tag tag);
-struct eventhandler_list *eventhandler_find_list(const char *name);
-void	eventhandler_prune_list(struct eventhandler_list *list);
-
-#ifdef VIMAGE
-typedef	void (*vimage_iterator_func_t)(void *, ...);
-
-eventhandler_tag vimage_eventhandler_register(struct eventhandler_list *list,
-	    const char *name, void *func, void *arg, int priority,
-	    vimage_iterator_func_t);
-#endif
-
-/*
- * Standard system event queues.
- */
-
-/* Generic priority levels */
-#define	EVENTHANDLER_PRI_FIRST	0
-#define	EVENTHANDLER_PRI_ANY	10000
-#define	EVENTHANDLER_PRI_LAST	20000
-
-/* Shutdown events */
-typedef void (*shutdown_fn)(void *, int);
-
-#define	SHUTDOWN_PRI_FIRST	EVENTHANDLER_PRI_FIRST
-#define	SHUTDOWN_PRI_DEFAULT	EVENTHANDLER_PRI_ANY
-#define	SHUTDOWN_PRI_LAST	EVENTHANDLER_PRI_LAST
-
-EVENTHANDLER_DECLARE(shutdown_pre_sync, shutdown_fn);	/* before fs sync */
-EVENTHANDLER_DECLARE(shutdown_post_sync, shutdown_fn);	/* after fs sync */
-EVENTHANDLER_DECLARE(shutdown_final, shutdown_fn);
-
-/* Power state change events */
-typedef void (*power_change_fn)(void *);
-EVENTHANDLER_DECLARE(power_resume, power_change_fn);
-EVENTHANDLER_DECLARE(power_suspend, power_change_fn);
-EVENTHANDLER_DECLARE(power_suspend_early, power_change_fn);
-
-/* Low memory event */
-typedef void (*vm_lowmem_handler_t)(void *, int);
-#define	LOWMEM_PRI_DEFAULT	EVENTHANDLER_PRI_FIRST
-EVENTHANDLER_DECLARE(vm_lowmem, vm_lowmem_handler_t);
-
-/* Root mounted event */
-typedef void (*mountroot_handler_t)(void *);
-EVENTHANDLER_DECLARE(mountroot, mountroot_handler_t);
-
-/* File system mount events */
-struct mount;
-struct vnode;
-struct thread;
-typedef void (*vfs_mounted_notify_fn)(void *, struct mount *, struct vnode *,
-    struct thread *);
-typedef void (*vfs_unmounted_notify_fn)(void *, struct mount *,
-    struct thread *);
-EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn);
-EVENTHANDLER_DECLARE(vfs_unmounted, vfs_unmounted_notify_fn);
-
-/* VLAN state change events */
-struct ifnet;
-typedef void (*vlan_config_fn)(void *, struct ifnet *, uint16_t);
-typedef void (*vlan_unconfig_fn)(void *, struct ifnet *, uint16_t);
-EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn);
-EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn);
-
-/* BPF attach/detach events */
-struct ifnet;
-typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* dlt */,
-    int /* 1 =>'s attach */);
-EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn);
-
-/*
- * Process events
- * process_fork and exit handlers are called without Giant.
- * exec handlers are called with Giant, but that is by accident.
- */
-struct proc;
-struct image_params;
-
-typedef void (*exitlist_fn)(void *, struct proc *);
-typedef void (*forklist_fn)(void *, struct proc *, struct proc *, int);
-typedef void (*execlist_fn)(void *, struct proc *, struct image_params *);
-typedef void (*proc_ctor_fn)(void *, struct proc *);
-typedef void (*proc_dtor_fn)(void *, struct proc *);
-typedef void (*proc_init_fn)(void *, struct proc *);
-typedef void (*proc_fini_fn)(void *, struct proc *);
-EVENTHANDLER_DECLARE(process_ctor, proc_ctor_fn);
-EVENTHANDLER_DECLARE(process_dtor, proc_dtor_fn);
-EVENTHANDLER_DECLARE(process_init, proc_init_fn);
-EVENTHANDLER_DECLARE(process_fini, proc_fini_fn);
-EVENTHANDLER_DECLARE(process_exit, exitlist_fn);
-EVENTHANDLER_DECLARE(process_fork, forklist_fn);
-EVENTHANDLER_DECLARE(process_exec, execlist_fn);
-
-/*
- * application dump event
- */
-typedef void (*app_coredump_start_fn)(void *, struct thread *, char *name);
-typedef void (*app_coredump_progress_fn)(void *, struct thread *td, int byte_count);
-typedef void (*app_coredump_finish_fn)(void *, struct thread *td);
-typedef void (*app_coredump_error_fn)(void *, struct thread *td, char *msg, ...);
-
-EVENTHANDLER_DECLARE(app_coredump_start, app_coredump_start_fn);
-EVENTHANDLER_DECLARE(app_coredump_progress, app_coredump_progress_fn);
-EVENTHANDLER_DECLARE(app_coredump_finish, app_coredump_finish_fn);
-EVENTHANDLER_DECLARE(app_coredump_error, app_coredump_error_fn);
-
-typedef void (*thread_ctor_fn)(void *, struct thread *);
-typedef void (*thread_dtor_fn)(void *, struct thread *);
-typedef void (*thread_fini_fn)(void *, struct thread *);
-typedef void (*thread_init_fn)(void *, struct thread *);
-EVENTHANDLER_DECLARE(thread_ctor, thread_ctor_fn);
-EVENTHANDLER_DECLARE(thread_dtor, thread_dtor_fn);
-EVENTHANDLER_DECLARE(thread_init, thread_init_fn);
-EVENTHANDLER_DECLARE(thread_fini, thread_fini_fn);
-
-typedef void (*uma_zone_chfn)(void *);
-EVENTHANDLER_DECLARE(nmbclusters_change, uma_zone_chfn);
-EVENTHANDLER_DECLARE(nmbufs_change, uma_zone_chfn);
-EVENTHANDLER_DECLARE(maxsockets_change, uma_zone_chfn);
-
-/* Kernel linker file load and unload events */
-struct linker_file;
-typedef void (*kld_load_fn)(void *, struct linker_file *);
-typedef void (*kld_unload_fn)(void *, const char *, caddr_t, size_t);
-typedef void (*kld_unload_try_fn)(void *, struct linker_file *, int *);
-EVENTHANDLER_DECLARE(kld_load, kld_load_fn);
-EVENTHANDLER_DECLARE(kld_unload, kld_unload_fn);
-EVENTHANDLER_DECLARE(kld_unload_try, kld_unload_try_fn);
-
-/* Generic graphics framebuffer interface */
-struct fb_info;
-typedef void (*register_framebuffer_fn)(void *, struct fb_info *);
-typedef void (*unregister_framebuffer_fn)(void *, struct fb_info *);
-EVENTHANDLER_DECLARE(register_framebuffer, register_framebuffer_fn);
-EVENTHANDLER_DECLARE(unregister_framebuffer, unregister_framebuffer_fn);
-
-#endif /* SYS_EVENTHANDLER_H */
diff --git a/include.new/sys/eventvar.h b/include.new/sys/eventvar.h
deleted file mode 100644
index 8bf616a..0000000
--- a/include.new/sys/eventvar.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1999,2000 Jonathan Lemon <jlemon@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.
- *
- * 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: releng/10.2/sys/sys/eventvar.h 255527 2013-09-13 19:50:50Z kib $
- */
-
-#ifndef _SYS_EVENTVAR_H_
-#define _SYS_EVENTVAR_H_
-
-#ifndef _KERNEL
-#error "no user-servicable parts inside"
-#endif
-
-#include <sys/_task.h>
-
-#define KQ_NEVENTS	8		/* minimize copy{in,out} calls */
-#define KQEXTENT	256		/* linear growth by this amount */
-
-struct kqueue {
-	struct		mtx kq_lock;
-	int		kq_refcnt;
-	TAILQ_ENTRY(kqueue)	kq_list;
-	TAILQ_HEAD(, knote)	kq_head;	/* list of pending event */
-	int		kq_count;		/* number of pending events */
-	struct		selinfo kq_sel;
-	struct		sigio *kq_sigio;
-	struct		filedesc *kq_fdp;
-	int		kq_state;
-#define KQ_SEL		0x01
-#define KQ_SLEEP	0x02
-#define KQ_FLUXWAIT	0x04			/* waiting for a in flux kn */
-#define KQ_ASYNC	0x08
-#define KQ_CLOSING	0x10
-#define	KQ_TASKSCHED	0x20			/* task scheduled */
-#define	KQ_TASKDRAIN	0x40			/* waiting for task to drain */
-	int		kq_knlistsize;		/* size of knlist */
-	struct		klist *kq_knlist;	/* list of knotes */
-	u_long		kq_knhashmask;		/* size of knhash */
-	struct		klist *kq_knhash;	/* hash table for knotes */
-	struct		task kq_task;
-};
-
-#endif /* !_SYS_EVENTVAR_H_ */
diff --git a/include.new/sys/exec.h b/include.new/sys/exec.h
deleted file mode 100644
index e732d84..0000000
--- a/include.new/sys/exec.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)exec.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/exec.h 270670 2014-08-26 19:58:48Z wblock $
- */
-
-#ifndef _SYS_EXEC_H_
-#define _SYS_EXEC_H_
-
-/*
- * Before ps_args existed, the following structure, found at the top of
- * the user stack of each user process, was used by ps(1) to locate
- * environment and argv strings.  Normally ps_argvstr points to the
- * argv vector, and ps_nargvstr is the same as the program's argc. The
- * fields ps_envstr and ps_nenvstr are the equivalent for the environment.
- *
- * Programs should now use setproctitle(3) to change ps output.
- * setproctitle() always informs the kernel with sysctl and sets the
- * pointers in ps_strings.  The kern.proc.args sysctl first tries p_args.
- * If p_args is NULL, it then falls back to reading ps_strings and following
- * the pointers.
- */
-struct ps_strings {
-	char	**ps_argvstr;	/* first of 0 or more argument strings */
-	unsigned int ps_nargvstr; /* the number of argument strings */
-	char	**ps_envstr;	/* first of 0 or more environment strings */
-	unsigned int ps_nenvstr; /* the number of environment strings */
-};
-
-/*
- * Address of ps_strings structure (in user space).
- * Prefer the kern.ps_strings or kern.proc.ps_strings sysctls to this constant.
- */
-#define	PS_STRINGS	(USRSTACK - sizeof(struct ps_strings))
-#define SPARE_USRSPACE	4096
-
-struct image_params;
-
-struct execsw {
-	int (*ex_imgact)(struct image_params *);
-	const char *ex_name;
-};
-
-#include <machine/exec.h>
-
-#ifdef _KERNEL
-#include <sys/cdefs.h>
-
-int exec_map_first_page(struct image_params *);        
-void exec_unmap_first_page(struct image_params *);       
-
-int exec_register(const struct execsw *);
-int exec_unregister(const struct execsw *);
-
-/*
- * note: name##_mod cannot be const storage because the
- * linker_file_sysinit() function modifies _file in the
- * moduledata_t.
- */
-
-#include <sys/module.h>
-
-#define EXEC_SET(name, execsw_arg) \
-	static int __CONCAT(name,_modevent)(module_t mod, int type, \
-	    void *data) \
-	{ \
-		struct execsw *exec = (struct execsw *)data; \
-		int error = 0; \
-		switch (type) { \
-		case MOD_LOAD: \
-			/* printf(#name " module loaded\n"); */ \
-			error = exec_register(exec); \
-			if (error) \
-				printf(__XSTRING(name) "register failed\n"); \
-			break; \
-		case MOD_UNLOAD: \
-			/* printf(#name " module unloaded\n"); */ \
-			error = exec_unregister(exec); \
-			if (error) \
-				printf(__XSTRING(name) " unregister failed\n");\
-			break; \
-		default: \
-			error = EOPNOTSUPP; \
-			break; \
-		} \
-		return error; \
-	} \
-	static moduledata_t __CONCAT(name,_mod) = { \
-		__XSTRING(name), \
-		__CONCAT(name,_modevent), \
-		(void *)& execsw_arg \
-	}; \
-	DECLARE_MODULE_TIED(name, __CONCAT(name,_mod), SI_SUB_EXEC, \
-	    SI_ORDER_ANY)
-#endif
-
-#endif
diff --git a/include.new/sys/extattr.h b/include.new/sys/extattr.h
deleted file mode 100644
index 3e5fd6a..0000000
--- a/include.new/sys/extattr.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 1999-2001 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/extattr.h 248995 2013-04-02 05:30:41Z mdf $
- */
-/*
- * Developed by the TrustedBSD Project.
- * Support for extended filesystem attributes.
- */
-
-#ifndef _SYS_EXTATTR_H_
-#define	_SYS_EXTATTR_H_
-
-/*
- * Defined name spaces for extended attributes.  Numeric constants are passed
- * via system calls, but a user-friendly string is also defined.
- */
-#define	EXTATTR_NAMESPACE_EMPTY		0x00000000
-#define	EXTATTR_NAMESPACE_EMPTY_STRING	"empty"
-#define	EXTATTR_NAMESPACE_USER		0x00000001
-#define	EXTATTR_NAMESPACE_USER_STRING	"user"
-#define	EXTATTR_NAMESPACE_SYSTEM	0x00000002
-#define	EXTATTR_NAMESPACE_SYSTEM_STRING	"system"
-
-/*
- * The following macro is designed to initialize an array that maps
- * extended-attribute namespace values to their names, e.g.:
- *
- * char *extattr_namespace_names[] = EXTATTR_NAMESPACE_NAMES;
- */
-#define EXTATTR_NAMESPACE_NAMES { \
-	EXTATTR_NAMESPACE_EMPTY_STRING, \
-	EXTATTR_NAMESPACE_USER_STRING, \
-	EXTATTR_NAMESPACE_SYSTEM_STRING }
-
-#ifdef _KERNEL
-#include <sys/types.h>
-
-#define	EXTATTR_MAXNAMELEN	NAME_MAX
-struct thread;
-struct ucred;
-struct vnode;
-int	extattr_check_cred(struct vnode *vp, int attrnamespace,
-	    struct ucred *cred, struct thread *td, accmode_t accmode);
-
-#else
-#include <sys/cdefs.h>
-
-struct iovec;
-
-__BEGIN_DECLS
-int	extattrctl(const char *_path, int _cmd, const char *_filename,
-	    int _attrnamespace, const char *_attrname);
-int	extattr_delete_fd(int _fd, int _attrnamespace, const char *_attrname);
-int	extattr_delete_file(const char *_path, int _attrnamespace,
-	    const char *_attrname);
-int	extattr_delete_link(const char *_path, int _attrnamespace,
-	    const char *_attrname);
-ssize_t	extattr_get_fd(int _fd, int _attrnamespace, const char *_attrname,
-	    void *_data, size_t _nbytes);
-ssize_t	extattr_get_file(const char *_path, int _attrnamespace,
-	    const char *_attrname, void *_data, size_t _nbytes);
-ssize_t	extattr_get_link(const char *_path, int _attrnamespace,
-	    const char *_attrname, void *_data, size_t _nbytes);
-ssize_t	extattr_list_fd(int _fd, int _attrnamespace, void *_data,
-	    size_t _nbytes);
-ssize_t	extattr_list_file(const char *_path, int _attrnamespace, void *_data,
-	    size_t _nbytes);
-ssize_t	extattr_list_link(const char *_path, int _attrnamespace, void *_data,
-	    size_t _nbytes);
-ssize_t	extattr_set_fd(int _fd, int _attrnamespace, const char *_attrname,
-	    const void *_data, size_t _nbytes);
-ssize_t	extattr_set_file(const char *_path, int _attrnamespace,
-	    const char *_attrname, const void *_data, size_t _nbytes);
-ssize_t	extattr_set_link(const char *_path, int _attrnamespace,
-	    const char *_attrname, const void *_data, size_t _nbytes);
-__END_DECLS
-
-#endif /* !_KERNEL */
-#endif /* !_SYS_EXTATTR_H_ */
diff --git a/include.new/sys/fail.h b/include.new/sys/fail.h
deleted file mode 100644
index b7b94ab..0000000
--- a/include.new/sys/fail.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*-
- * Copyright (c) 2009 Isilon Inc http://www.isilon.com/
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/fail.h 216620 2010-12-21 18:23:03Z mdf $
- */
-/**
- * @file
- *
- * Main header for failpoint facility.
- */
-#ifndef _SYS_FAIL_H_
-#define _SYS_FAIL_H_
-
-#include <sys/param.h>
-#include <sys/cdefs.h>
-#include <sys/linker_set.h>
-#include <sys/queue.h>
-#include <sys/sysctl.h>
-
-/**
- * Failpoint return codes, used internally.
- * @ingroup failpoint_private
- */
-enum fail_point_return_code {
-	FAIL_POINT_RC_CONTINUE = 0,	/**< Continue with normal execution */
-	FAIL_POINT_RC_RETURN,		/**< FP evaluated to 'return' */
-	FAIL_POINT_RC_QUEUED,		/**< sleep_fn will be called */
-};
-
-struct fail_point_entry;
-TAILQ_HEAD(fail_point_entries, fail_point_entry);
-/**
- * Internal failpoint structure, tracking all the current details of the
- * failpoint.  This structure is the core component shared between the
- * failure-injection code and the user-interface.
- * @ingroup failpoint_private
- */
-struct fail_point {
-	const char *fp_name;		/**< name of fail point */
-	const char *fp_location;	/**< file:line of fail point */
-	struct fail_point_entries fp_entries;	/**< list of entries */
-	int fp_flags;
-	void (*fp_sleep_fn)(void *);	/**< Function to call at end of
-					 * sleep for sleep failpoints */
-	void *fp_sleep_arg;		/**< Arg for sleep_fn */
-};
-
-#define	FAIL_POINT_DYNAMIC_NAME	0x01	/**< Must free name on destroy */
-
-__BEGIN_DECLS
-
-/* Private failpoint eval function -- use fail_point_eval() instead. */
-enum fail_point_return_code fail_point_eval_nontrivial(struct fail_point *,
-	int *ret);
-
-/**
- * @addtogroup failpoint
- * @{
- */
-/*
- * Initialize a fail-point.  The name is formed in printf-like fashion
- * from "fmt" and the subsequent arguments.
- * Pair with fail_point_destroy().
- */
-void fail_point_init(struct fail_point *, const char *fmt, ...)
-    __printflike(2, 3);
-
-/**
- * Set the sleep function for a fail point
- * If sleep_fn is specified, then FAIL_POINT_SLEEP will result in a
- * (*fp->sleep_fn)(fp->sleep_arg) call by the timer thread.  Otherwise,
- * if sleep_fn is NULL (default), then FAIL_POINT_SLEEP will result in the
- * fail_point_eval() call sleeping.
- */
-static __inline void
-fail_point_sleep_set_func(struct fail_point *fp, void (*sleep_fn)(void *))
-{
-	fp->fp_sleep_fn = sleep_fn;
-}
-
-/**
- * Set the argument for the sleep function for a fail point
- */
-static __inline void
-fail_point_sleep_set_arg(struct fail_point *fp, void *sleep_arg)
-{
-	fp->fp_sleep_arg = sleep_arg;
-}
-
-/**
- * Free the resources used by a fail-point.  Pair with fail_point_init().
- */
-void fail_point_destroy(struct fail_point *);
-
-/**
- * Evaluate a failpoint.
- */
-static __inline enum fail_point_return_code
-fail_point_eval(struct fail_point *fp, int *ret)
-{
-	if (TAILQ_EMPTY(&fp->fp_entries)) {
-		return (FAIL_POINT_RC_CONTINUE);
-	}
-	return (fail_point_eval_nontrivial(fp, ret));
-}
-
-__END_DECLS
-
-/* Declare a fail_point and its sysctl in a function. */
-#define	_FAIL_POINT_NAME(name)	_fail_point_##name
-#define	_FAIL_POINT_LOCATION()	"(" __FILE__ ":" __XSTRING(__LINE__) ")"
-
-/**
- * Instantiate a failpoint which returns "value" from the function when triggered.
- * @param parent  The parent sysctl under which to locate the sysctl
- * @param name    The name of the failpoint in the sysctl tree (and printouts)
- * @return        Instantly returns the return("value") specified in the
- *                failpoint, if triggered.
- */
-#define KFAIL_POINT_RETURN(parent, name) \
-	KFAIL_POINT_CODE(parent, name, return RETURN_VALUE)
-
-/**
- * Instantiate a failpoint which returns (void) from the function when triggered.
- * @param parent  The parent sysctl under which to locate the sysctl
- * @param name    The name of the failpoint in the sysctl tree (and printouts)
- * @return        Instantly returns void, if triggered in the failpoint.
- */
-#define KFAIL_POINT_RETURN_VOID(parent, name) \
-	KFAIL_POINT_CODE(parent, name, return)
-
-/**
- * Instantiate a failpoint which sets an error when triggered.
- * @param parent     The parent sysctl under which to locate the sysctl
- * @param name       The name of the failpoint in the sysctl tree (and printouts)
- * @param error_var  A variable to set to the failpoint's specified
- *                   return-value when triggered
- */
-#define KFAIL_POINT_ERROR(parent, name, error_var) \
-	KFAIL_POINT_CODE(parent, name, (error_var) = RETURN_VALUE)
-
-/**
- * Instantiate a failpoint which sets an error and then goes to a
- * specified label in the function when triggered.
- * @param parent     The parent sysctl under which to locate the sysctl
- * @param name       The name of the failpoint in the sysctl tree (and printouts)
- * @param error_var  A variable to set to the failpoint's specified
- *                   return-value when triggered
- * @param label      The location to goto when triggered.
- */
-#define KFAIL_POINT_GOTO(parent, name, error_var, label) \
-	KFAIL_POINT_CODE(parent, name, (error_var) = RETURN_VALUE; goto label)
-
-/**
- * Instantiate a failpoint which runs arbitrary code when triggered.
- * @param parent     The parent sysctl under which to locate the sysctl
- * @param name       The name of the failpoint in the sysctl tree
- *		     (and printouts)
- * @param code       The arbitrary code to run when triggered.  Can reference
- *                   "RETURN_VALUE" if desired to extract the specified
- *                   user return-value when triggered.  Note that this is
- *                   implemented with a do-while loop so be careful of
- *                   break and continue statements.
- */
-#define KFAIL_POINT_CODE(parent, name, code)				\
-do {									\
-	int RETURN_VALUE;						\
-	static struct fail_point _FAIL_POINT_NAME(name) = {		\
-		#name,							\
-		_FAIL_POINT_LOCATION(),					\
-		TAILQ_HEAD_INITIALIZER(_FAIL_POINT_NAME(name).fp_entries), \
-		0,							\
-		NULL, NULL,						\
-	};								\
-	SYSCTL_OID(parent, OID_AUTO, name,				\
-	    CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE,		\
-	    &_FAIL_POINT_NAME(name), 0, fail_point_sysctl,		\
-	    "A", "");							\
-									\
-	if (__predict_false(						\
-	    fail_point_eval(&_FAIL_POINT_NAME(name), &RETURN_VALUE))) {	\
-									\
-		code;							\
-									\
-	}								\
-} while (0)
-
-
-/**
- * @}
- * (end group failpoint)
- */
-
-#ifdef _KERNEL
-int fail_point_sysctl(SYSCTL_HANDLER_ARGS);
-
-/* The fail point sysctl tree. */
-SYSCTL_DECL(_debug_fail_point);
-#define	DEBUG_FP	_debug_fail_point
-#endif
-
-#endif /* _SYS_FAIL_H_ */
diff --git a/include.new/sys/fbio.h b/include.new/sys/fbio.h
deleted file mode 100644
index ac34c3f..0000000
--- a/include.new/sys/fbio.h
+++ /dev/null
@@ -1,618 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software developed by the Computer Systems
- * Engineering group at Lawrence Berkeley Laboratory under DARPA
- * contract BG 91-66 and contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- *	@(#)fbio.h	8.2 (Berkeley) 10/30/93
- *
- * $FreeBSD: releng/10.2/sys/sys/fbio.h 271117 2014-09-04 18:43:40Z emaste $
- */
-
-#ifndef _SYS_FBIO_H_
-#define _SYS_FBIO_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#else
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/eventhandler.h>
-#endif
-#include <sys/ioccom.h>
-
-/*
- * Frame buffer ioctls (from Sprite, trimmed to essentials for X11).
- */
-
-/*
- * Frame buffer type codes.
- */
-#define	FBTYPE_SUN1BW		0	/* multibus mono */
-#define	FBTYPE_SUN1COLOR	1	/* multibus color */
-#define	FBTYPE_SUN2BW		2	/* memory mono */
-#define	FBTYPE_SUN2COLOR	3	/* color w/rasterop chips */
-#define	FBTYPE_SUN2GP		4	/* GP1/GP2 */
-#define	FBTYPE_SUN5COLOR	5	/* RoadRunner accelerator */
-#define	FBTYPE_SUN3COLOR	6	/* memory color */
-#define	FBTYPE_MEMCOLOR		7	/* memory 24-bit */
-#define	FBTYPE_SUN4COLOR	8	/* memory color w/overlay */
-
-#define	FBTYPE_NOTSUN1		9	/* reserved for customer */
-#define	FBTYPE_NOTSUN2		10	/* reserved for customer */
-#define	FBTYPE_PCIMISC		11	/* (generic) PCI misc. disp. */
-
-#define	FBTYPE_SUNFAST_COLOR	12	/* accelerated 8bit */
-#define	FBTYPE_SUNROP_COLOR	13	/* MEMCOLOR with rop h/w */
-#define	FBTYPE_SUNFB_VIDEO	14	/* Simple video mixing */
-#define	FBTYPE_RESERVED5	15	/* reserved, do not use */
-#define	FBTYPE_RESERVED4	16	/* reserved, do not use */
-#define	FBTYPE_SUNGP3		17
-#define	FBTYPE_SUNGT		18
-#define	FBTYPE_SUNLEO		19	/* zx Leo */
-
-#define	FBTYPE_MDA		20
-#define	FBTYPE_HERCULES		21
-#define	FBTYPE_CGA		22
-#define	FBTYPE_EGA		23
-#define	FBTYPE_VGA		24
-#define	FBTYPE_PC98		25
-#define	FBTYPE_TGA		26
-#define	FBTYPE_TGA2		27
-
-#define	FBTYPE_MDICOLOR		28	/* cg14 */
-#define	FBTYPE_TCXCOLOR		29	/* SUNW,tcx */
-#define	FBTYPE_CREATOR		30
-
-#define	FBTYPE_LASTPLUSONE	31	/* max number of fbs (change as add) */
-
-/*
- * Frame buffer descriptor as returned by FBIOGTYPE.
- */
-struct fbtype {
-	int	fb_type;	/* as defined above */
-	int	fb_height;	/* in pixels */
-	int	fb_width;	/* in pixels */
-	int	fb_depth;	/* bits per pixel */
-	int	fb_cmsize;	/* size of color map (entries) */
-	int	fb_size;	/* total size in bytes */
-};
-#define	FBIOGTYPE	_IOR('F', 0, struct fbtype)
-
-#define	FBTYPE_GET_STRIDE(_fb)	((_fb)->fb_size / (_fb)->fb_height)
-#define	FBTYPE_GET_BPP(_fb)	((_fb)->fb_bpp)
-#define	FBTYPE_GET_BYTESPP(_fb)	((_fb)->fb_bpp / 8)
-
-#ifdef	_KERNEL
-
-struct fb_info;
-
-typedef int fb_enter_t(void *priv);
-typedef int fb_leave_t(void *priv);
-
-struct fb_info {
-	/* Raw copy of fbtype. Do not change. */
-	int		fb_type;	/* as defined above */
-	int		fb_height;	/* in pixels */
-	int		fb_width;	/* in pixels */
-	int		fb_depth;	/* bits to define color */
-	int		fb_cmsize;	/* size of color map (entries) */
-	int		fb_size;	/* total size in bytes */
-
-	struct cdev 	*fb_cdev;
-
-	fb_enter_t	*enter;
-	fb_leave_t	*leave;
-
-	intptr_t	fb_pbase;	/* For FB mmap. */
-	intptr_t	fb_vbase;	/* if NULL, use fb_write/fb_read. */
-	void		*fb_priv;	/* First argument for read/write. */
-	const char	*fb_name;
-	uint32_t	fb_flags;
-	int		fb_stride;
-	int		fb_bpp;		/* bits per pixel */
-#define	FB_FLAG_NOMMAP		1	/* mmap unsupported. */
-	uint32_t	fb_cmap[16];
-};
-
-int fbd_list(void);
-int fbd_register(struct fb_info *);
-int fbd_unregister(struct fb_info *);
-
-static inline int
-register_framebuffer(struct fb_info *info)
-{
-
-	EVENTHANDLER_INVOKE(register_framebuffer, info);
-	return (0);
-}
-
-static inline int
-unregister_framebuffer(struct fb_info *info)
-{
-
-	EVENTHANDLER_INVOKE(unregister_framebuffer, info);
-	return (0);
-}
-#endif
-
-#ifdef notdef
-/*
- * General purpose structure for passing info in and out of frame buffers
- * (used for gp1) -- unsupported.
- */
-struct fbinfo {
-	int	fb_physaddr;	/* physical frame buffer address */
-	int	fb_hwwidth;	/* fb board width */
-	int	fb_hwheight;	/* fb board height */
-	int	fb_addrdelta;	/* phys addr diff between boards */
-	u_char	*fb_ropaddr;	/* fb virtual addr */
-	int	fb_unit;	/* minor devnum of fb */
-};
-#define	FBIOGINFO	_IOR('F', 2, struct fbinfo)
-#endif
-
-/*
- * Color map I/O.
- */
-struct fbcmap {
-	int	index;		/* first element (0 origin) */
-	int	count;		/* number of elements */
-	u_char	*red;		/* red color map elements */
-	u_char	*green;		/* green color map elements */
-	u_char	*blue;		/* blue color map elements */
-};
-#define	FBIOPUTCMAP	_IOW('F', 3, struct fbcmap)
-#define	FBIOGETCMAP	_IOW('F', 4, struct fbcmap)
-
-/*
- * Set/get attributes.
- */
-#define	FB_ATTR_NDEVSPECIFIC	8	/* no. of device specific values */
-#define	FB_ATTR_NEMUTYPES	4	/* no. of emulation types */
-
-struct fbsattr {
-	int	flags;			/* flags; see below */
-	int	emu_type;		/* emulation type (-1 if unused) */
-	int	dev_specific[FB_ATTR_NDEVSPECIFIC];	/* catchall */
-};
-#define	FB_ATTR_AUTOINIT	1	/* emulation auto init flag */
-#define	FB_ATTR_DEVSPECIFIC	2	/* dev. specific stuff valid flag */
-
-struct fbgattr {
-	int	real_type;		/* real device type */
-	int	owner;			/* PID of owner, 0 if myself */
-	struct	fbtype fbtype;		/* fbtype info for real device */
-	struct	fbsattr sattr;		/* see above */
-	int	emu_types[FB_ATTR_NEMUTYPES];	/* possible emulations */
-						/* (-1 if unused) */
-};
-#define	FBIOSATTR	_IOW('F', 5, struct fbsattr)
-#define	FBIOGATTR	_IOR('F', 6, struct fbgattr)
-
-/*
- * Video control.
- */
-#define	FBVIDEO_OFF		0
-#define	FBVIDEO_ON		1
-
-#define	FBIOSVIDEO	_IOW('F', 7, int)
-#define	FBIOGVIDEO	_IOR('F', 8, int)
-
-/* vertical retrace */
-#define	FBIOVERTICAL	_IO('F', 9)
-
-/*
- * Hardware cursor control (for, e.g., CG6).  A rather complex and icky
- * interface that smells like VMS, but there it is....
- */
-struct fbcurpos {
-	short	x;
-	short	y;
-};
-
-struct fbcursor {
-	short	set;		/* flags; see below */
-	short	enable;		/* nonzero => cursor on, 0 => cursor off */
-	struct	fbcurpos pos;	/* position on display */
-	struct	fbcurpos hot;	/* hot-spot within cursor */
-	struct	fbcmap cmap;	/* cursor color map */
-	struct	fbcurpos size;	/* number of valid bits in image & mask */
-	caddr_t	image;		/* cursor image bits */
-	caddr_t	mask;		/* cursor mask bits */
-};
-#define	FB_CUR_SETCUR	0x01	/* set on/off (i.e., obey fbcursor.enable) */
-#define	FB_CUR_SETPOS	0x02	/* set position */
-#define	FB_CUR_SETHOT	0x04	/* set hot-spot */
-#define	FB_CUR_SETCMAP	0x08	/* set cursor color map */
-#define	FB_CUR_SETSHAPE	0x10	/* set size & bits */
-#define	FB_CUR_SETALL	(FB_CUR_SETCUR | FB_CUR_SETPOS | FB_CUR_SETHOT | \
-			 FB_CUR_SETCMAP | FB_CUR_SETSHAPE)
-
-/* controls for cursor attributes & shape (including position) */
-#define	FBIOSCURSOR	_IOW('F', 24, struct fbcursor)
-#define	FBIOGCURSOR	_IOWR('F', 25, struct fbcursor)
-
-/* controls for cursor position only */
-#define	FBIOSCURPOS	_IOW('F', 26, struct fbcurpos)
-#define	FBIOGCURPOS	_IOW('F', 27, struct fbcurpos)
-
-/* get maximum cursor size */
-#define	FBIOGCURMAX	_IOR('F', 28, struct fbcurpos)
-
-/*
- * Video board information
- */
-struct brd_info {
-	u_short		accessible_width; /* accessible bytes in scanline */
-	u_short		accessible_height; /* number of accessible scanlines */
-	u_short		line_bytes;	/* number of bytes/scanline */
-	u_short		hdb_capable;	/* can this thing hardware db? */
-	u_short		vmsize;		/* video memory size */
-	u_char		boardrev;	/* board revision # */
-	u_char		pad0;
-	u_long		pad1;
-};
-#define	FBIOGXINFO	_IOR('F', 39, struct brd_info)
-
-/*
- * Monitor information
- */
-struct mon_info {
-	u_long		mon_type;	/* bit array */
-#define MON_TYPE_STEREO		0x8	/* stereo display */
-#define MON_TYPE_0_OFFSET	0x4	/* black level 0 ire instead of 7.5 */
-#define MON_TYPE_OVERSCAN	0x2	/* overscan */
-#define MON_TYPE_GRAY		0x1	/* greyscale monitor */
-	u_long		pixfreq;	/* pixel frequency in Hz */
-	u_long		hfreq;		/* horizontal freq in Hz */
-	u_long		vfreq;		/* vertical freq in Hz */
-	u_long		vsync;		/* vertical sync in scanlines */
-	u_long		hsync;		/* horizontal sync in pixels */
-	/* these are in pixel units */
-	u_short		hfporch;	/* horizontal front porch */
-	u_short		hbporch;	/* horizontal back porch */
-	u_short		vfporch;	/* vertical front porch */
-	u_short		vbporch;	/* vertical back porch */
-};
-#define	FBIOMONINFO	_IOR('F', 40, struct mon_info)
-
-/*
- * Color map I/O.
- */
-struct fbcmap_i {
-	unsigned int	flags;
-#define	FB_CMAP_BLOCK	(1 << 0)	/* wait for vertical refresh */
-#define	FB_CMAP_KERNEL	(1 << 1)	/* called within kernel */
-	int		id;		/* color map id */
-	int		index;		/* first element (0 origin) */
-	int		count;		/* number of elements */
-	u_char		*red;		/* red color map elements */
-	u_char		*green;		/* green color map elements */
-	u_char		*blue;		/* blue color map elements */
-};
-#define	FBIOPUTCMAPI	_IOW('F', 41, struct fbcmap_i)
-#define	FBIOGETCMAPI	_IOW('F', 42, struct fbcmap_i)
-
-/* The new style frame buffer ioctls. */
-
-/* video mode information block */
-struct video_info {
-    int			vi_mode;	/* mode number, see below */
-    int			vi_flags;
-#define V_INFO_COLOR	(1 << 0)
-#define V_INFO_GRAPHICS	(1 << 1)
-#define V_INFO_LINEAR	(1 << 2)
-#define V_INFO_VESA	(1 << 3)
-#define	V_INFO_NONVGA	(1 << 4)
-    int			vi_width;
-    int			vi_height;
-    int			vi_cwidth;
-    int			vi_cheight;
-    int			vi_depth;
-    int			vi_planes;
-    vm_offset_t		vi_window;	/* physical address */
-    size_t		vi_window_size;
-    size_t		vi_window_gran;
-    vm_offset_t		vi_buffer;	/* physical address */
-    size_t		vi_buffer_size;
-    int			vi_mem_model;
-#define V_INFO_MM_OTHER  (-1)
-#define V_INFO_MM_TEXT	 0
-#define V_INFO_MM_PLANAR 1
-#define V_INFO_MM_PACKED 2
-#define V_INFO_MM_DIRECT 3
-#define V_INFO_MM_CGA	 100
-#define V_INFO_MM_HGC	 101
-#define V_INFO_MM_VGAX	 102
-    /* for MM_PACKED and MM_DIRECT only */
-    int			vi_pixel_size;	/* in bytes */
-    /* for MM_DIRECT only */
-    int			vi_pixel_fields[4];	/* RGB and reserved fields */
-    int			vi_pixel_fsizes[4];
-    /* reserved */
-    u_char		vi_reserved[64];
-    vm_offset_t		vi_registers;	/* physical address */
-    vm_offset_t		vi_registers_size;
-};
-typedef struct video_info video_info_t;
-
-/* adapter infromation block */
-struct video_adapter {
-    int			va_index;
-    int			va_type;
-#define KD_OTHER	0		/* unknown */
-#define KD_MONO		1		/* monochrome adapter */
-#define KD_HERCULES	2		/* hercules adapter */
-#define KD_CGA		3		/* color graphics adapter */
-#define KD_EGA		4		/* enhanced graphics adapter */
-#define KD_VGA		5		/* video graphics adapter */
-#define KD_PC98		6		/* PC-98 display */
-#define KD_TGA		7		/* TGA */
-#define KD_TGA2		8		/* TGA2 */
-    char		*va_name;
-    int			va_unit;
-    int			va_minor;
-    int			va_flags;
-#define V_ADP_COLOR	(1 << 0)
-#define V_ADP_MODECHANGE (1 << 1)
-#define V_ADP_STATESAVE	(1 << 2)
-#define V_ADP_STATELOAD	(1 << 3)
-#define V_ADP_FONT	(1 << 4)
-#define V_ADP_PALETTE	(1 << 5)
-#define V_ADP_BORDER	(1 << 6)
-#define V_ADP_VESA	(1 << 7)
-#define V_ADP_BOOTDISPLAY (1 << 8)
-#define V_ADP_PROBED	(1 << 16)
-#define V_ADP_INITIALIZED (1 << 17)
-#define V_ADP_REGISTERED (1 << 18)
-#define V_ADP_ATTACHED	(1 << 19)
-#define	V_ADP_DAC8	(1 << 20)
-    vm_offset_t		va_io_base;
-    int			va_io_size;
-    vm_offset_t		va_crtc_addr;
-    vm_offset_t		va_mem_base;
-    int			va_mem_size;
-    vm_offset_t		va_window;	/* virtual address */
-    size_t		va_window_size;
-    size_t		va_window_gran;
-    u_int		va_window_orig;
-    vm_offset_t		va_buffer;	/* virtual address */
-    size_t		va_buffer_size;
-    int			va_initial_mode;
-    int			va_initial_bios_mode;
-    int			va_mode;
-    struct video_info	va_info;
-    int			va_line_width;
-    struct {
-	int		x;
-	int		y;
-    } 			va_disp_start;
-    void		*va_token;
-    int			va_model;
-    int			va_little_bitian;
-    int			va_little_endian;
-    int			va_buffer_alias;
-    vm_offset_t		va_registers;	/* virtual address */
-    vm_offset_t		va_registers_size;
-};
-typedef struct video_adapter video_adapter_t;
-
-struct video_adapter_info {
-    int			va_index;
-    int			va_type;
-    char		va_name[16];
-    int			va_unit;
-    int			va_flags;
-    vm_offset_t		va_io_base;
-    int			va_io_size;
-    vm_offset_t		va_crtc_addr;
-    vm_offset_t		va_mem_base;
-    int			va_mem_size;
-    vm_offset_t		va_window;	/* virtual address */
-    size_t		va_window_size;
-    size_t		va_window_gran;
-    vm_offset_t		va_unused0;
-    size_t		va_buffer_size;
-    int			va_initial_mode;
-    int			va_initial_bios_mode;
-    int			va_mode;
-    int			va_line_width;
-    struct {
-	int		x;
-	int		y;
-    } 			va_disp_start;
-    u_int		va_window_orig;
-    /* reserved */
-    u_char		va_reserved[64];
-};
-typedef struct video_adapter_info video_adapter_info_t;
-
-/* some useful video adapter index */
-#define V_ADP_PRIMARY	0
-#define V_ADP_SECONDARY	1
-
-/* video mode numbers */
-
-#define M_B40x25	0	/* black & white 40 columns */
-#define M_C40x25	1	/* color 40 columns */
-#define M_B80x25	2	/* black & white 80 columns */
-#define M_C80x25	3	/* color 80 columns */
-#define M_BG320		4	/* black & white graphics 320x200 */
-#define M_CG320		5	/* color graphics 320x200 */
-#define M_BG640		6	/* black & white graphics 640x200 hi-res */
-#define M_EGAMONO80x25  7       /* ega-mono 80x25 */
-#define M_CG320_D	13	/* ega mode D */
-#define M_CG640_E	14	/* ega mode E */
-#define M_EGAMONOAPA	15	/* ega mode F */
-#define M_CG640x350	16	/* ega mode 10 */
-#define M_ENHMONOAPA2	17	/* ega mode F with extended memory */
-#define M_ENH_CG640	18	/* ega mode 10* */
-#define M_ENH_B40x25    19      /* ega enhanced black & white 40 columns */
-#define M_ENH_C40x25    20      /* ega enhanced color 40 columns */
-#define M_ENH_B80x25    21      /* ega enhanced black & white 80 columns */
-#define M_ENH_C80x25    22      /* ega enhanced color 80 columns */
-#define M_VGA_C40x25	23	/* vga 8x16 font on color */
-#define M_VGA_C80x25	24	/* vga 8x16 font on color */
-#define M_VGA_M80x25	25	/* vga 8x16 font on mono */
-
-#define M_VGA11		26	/* vga 640x480 2 colors */
-#define M_BG640x480	26
-#define M_VGA12		27	/* vga 640x480 16 colors */
-#define M_CG640x480	27
-#define M_VGA13		28	/* vga 320x200 256 colors */
-#define M_VGA_CG320	28
-
-#define M_VGA_C80x50	30	/* vga 8x8 font on color */
-#define M_VGA_M80x50	31	/* vga 8x8 font on color */
-#define M_VGA_C80x30	32	/* vga 8x16 font on color */
-#define M_VGA_M80x30	33	/* vga 8x16 font on color */
-#define M_VGA_C80x60	34	/* vga 8x8 font on color */
-#define M_VGA_M80x60	35	/* vga 8x8 font on color */
-#define M_VGA_CG640	36	/* vga 640x400 256 color */
-#define M_VGA_MODEX	37	/* vga 320x240 256 color */
-
-#define M_VGA_C90x25	40	/* vga 8x16 font on color */
-#define M_VGA_M90x25	41	/* vga 8x16 font on mono */
-#define M_VGA_C90x30	42	/* vga 8x16 font on color */
-#define M_VGA_M90x30	43	/* vga 8x16 font on mono */
-#define M_VGA_C90x43	44	/* vga 8x8 font on color */
-#define M_VGA_M90x43	45	/* vga 8x8 font on mono */
-#define M_VGA_C90x50	46	/* vga 8x8 font on color */
-#define M_VGA_M90x50	47	/* vga 8x8 font on mono */
-#define M_VGA_C90x60	48	/* vga 8x8 font on color */
-#define M_VGA_M90x60	49	/* vga 8x8 font on mono */
-
-#define M_ENH_B80x43	0x70	/* ega black & white 80x43 */
-#define M_ENH_C80x43	0x71	/* ega color 80x43 */
-
-#define M_PC98_80x25		98	/* PC98 text 80x25 */
-#define M_PC98_80x30		99	/* PC98 text 80x30 */
-#define M_PC98_EGC640x400	100	/* PC98 graphic 640x400 16 colors */
-#define M_PC98_PEGC640x400	101	/* PC98 graphic 640x400 256 colors */
-#define M_PC98_PEGC640x480	102	/* PC98 graphic 640x480 256 colors */
-
-#define M_HGC_P0	0xe0	/* hercules graphics - page 0 @ B0000 */
-#define M_HGC_P1	0xe1	/* hercules graphics - page 1 @ B8000 */
-#define M_MCA_MODE	0xff	/* monochrome adapter mode */
-
-#define M_TEXT_80x25	200	/* generic text modes */
-#define M_TEXT_80x30	201
-#define M_TEXT_80x43	202
-#define M_TEXT_80x50	203
-#define M_TEXT_80x60	204
-#define M_TEXT_132x25	205
-#define M_TEXT_132x30	206
-#define M_TEXT_132x43	207
-#define M_TEXT_132x50	208
-#define M_TEXT_132x60	209
-
-#define M_VESA_BASE		0x100	/* VESA mode number base */
-#define M_VESA_CG640x400	0x100	/* 640x400, 256 color */
-#define M_VESA_CG640x480	0x101	/* 640x480, 256 color */
-#define M_VESA_800x600		0x102	/* 800x600, 16 color */
-#define M_VESA_CG800x600	0x103	/* 800x600, 256 color */
-#define M_VESA_1024x768		0x104	/* 1024x768, 16 color */
-#define M_VESA_CG1024x768	0x105	/* 1024x768, 256 color */
-#define M_VESA_1280x1024	0x106	/* 1280x1024, 16 color */
-#define M_VESA_CG1280x1024	0x107	/* 1280x1024, 256 color */
-#define M_VESA_C80x60		0x108	/* 8x8 font */
-#define M_VESA_C132x25		0x109	/* 8x16 font */
-#define M_VESA_C132x43		0x10a	/* 8x14 font */
-#define M_VESA_C132x50		0x10b	/* 8x8 font */
-#define M_VESA_C132x60		0x10c	/* 8x8 font */
-#define M_VESA_32K_320		0x10d	/* 320x200, 5:5:5 */
-#define M_VESA_64K_320		0x10e	/* 320x200, 5:6:5 */
-#define M_VESA_FULL_320		0x10f	/* 320x200, 8:8:8 */
-#define M_VESA_32K_640		0x110	/* 640x480, 5:5:5 */
-#define M_VESA_64K_640		0x111	/* 640x480, 5:6:5 */
-#define M_VESA_FULL_640		0x112	/* 640x480, 8:8:8 */
-#define M_VESA_32K_800		0x113	/* 800x600, 5:5:5 */
-#define M_VESA_64K_800		0x114	/* 800x600, 5:6:5 */
-#define M_VESA_FULL_800		0x115	/* 800x600, 8:8:8 */
-#define M_VESA_32K_1024		0x116	/* 1024x768, 5:5:5 */
-#define M_VESA_64K_1024		0x117	/* 1024x768, 5:6:5 */
-#define M_VESA_FULL_1024	0x118	/* 1024x768, 8:8:8 */
-#define M_VESA_32K_1280		0x119	/* 1280x1024, 5:5:5 */
-#define M_VESA_64K_1280		0x11a	/* 1280x1024, 5:6:5 */
-#define M_VESA_FULL_1280	0x11b	/* 1280x1024, 8:8:8 */
-#define M_VESA_MODE_MAX		0x1ff
-
-struct video_display_start {
-	int		x;
-	int		y;
-};
-typedef struct video_display_start video_display_start_t;
-
-struct video_color_palette {
-	int		index;		/* first element (zero-based) */
-	int		count;		/* number of elements */
-	u_char		*red;		/* red */
-	u_char		*green;		/* green */
-	u_char		*blue;		/* blue */
-	u_char		*transparent;	/* may be NULL */
-};
-typedef struct video_color_palette video_color_palette_t;
-
-/* adapter info. */
-#define FBIO_ADAPTER	_IOR('F', 100, int)
-#define FBIO_ADPTYPE	_IOR('F', 101, int)
-#define FBIO_ADPINFO	_IOR('F', 102, struct video_adapter_info)
-
-/* video mode control */
-#define FBIO_MODEINFO	_IOWR('F', 103, struct video_info)
-#define FBIO_FINDMODE	_IOWR('F', 104, struct video_info)
-#define FBIO_GETMODE	_IOR('F', 105, int)
-#define FBIO_SETMODE	_IOW('F', 106, int)
-
-/* get/set frame buffer window origin */
-#define FBIO_GETWINORG	_IOR('F', 107, u_int)
-#define FBIO_SETWINORG	_IOW('F', 108, u_int)
-
-/* get/set display start address */
-#define FBIO_GETDISPSTART	_IOR('F', 109, video_display_start_t) 
-#define FBIO_SETDISPSTART	_IOW('F', 110, video_display_start_t)
-
-/* get/set scan line width */
-#define FBIO_GETLINEWIDTH	_IOR('F', 111, u_int) 
-#define FBIO_SETLINEWIDTH	_IOW('F', 112, u_int)
-
-/* color palette control */
-#define FBIO_GETPALETTE	_IOW('F', 113, video_color_palette_t)
-#define FBIO_SETPALETTE	_IOW('F', 114, video_color_palette_t)
-
-/* blank display */
-#define V_DISPLAY_ON		0
-#define V_DISPLAY_BLANK		1
-#define V_DISPLAY_STAND_BY	2
-#define V_DISPLAY_SUSPEND	3
-
-#define FBIO_BLANK	_IOW('F', 115, int)
-
-#endif /* !_SYS_FBIO_H_ */
diff --git a/include.new/sys/fcntl.h b/include.new/sys/fcntl.h
deleted file mode 100644
index ac800b1..0000000
--- a/include.new/sys/fcntl.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*-
- * Copyright (c) 1983, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/fcntl.h 273840 2014-10-29 22:55:16Z jilles $
- */
-
-#ifndef _SYS_FCNTL_H_
-#define	_SYS_FCNTL_H_
-
-/*
- * This file includes the definitions for open and fcntl
- * described by POSIX for <fcntl.h>; it also includes
- * related kernel definitions.
- */
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-/*
- * File status flags: these are used by open(2), fcntl(2).
- * They are also used (indirectly) in the kernel file structure f_flags,
- * which is a superset of the open/fcntl flags.  Open flags and f_flags
- * are inter-convertible using OFLAGS(fflags) and FFLAGS(oflags).
- * Open/fcntl flags begin with O_; kernel-internal flags begin with F.
- */
-/* open-only flags */
-#define	O_RDONLY	0x0000		/* open for reading only */
-#define	O_WRONLY	0x0001		/* open for writing only */
-#define	O_RDWR		0x0002		/* open for reading and writing */
-#define	O_ACCMODE	0x0003		/* mask for above modes */
-
-/*
- * Kernel encoding of open mode; separate read and write bits that are
- * independently testable: 1 greater than the above.
- *
- * XXX
- * FREAD and FWRITE are excluded from the #ifdef _KERNEL so that TIOCFLUSH,
- * which was documented to use FREAD/FWRITE, continues to work.
- */
-#if __BSD_VISIBLE
-#define	FREAD		0x0001
-#define	FWRITE		0x0002
-#endif
-#define	O_NONBLOCK	0x0004		/* no delay */
-#define	O_APPEND	0x0008		/* set append mode */
-#if __BSD_VISIBLE
-#define	O_SHLOCK	0x0010		/* open with shared file lock */
-#define	O_EXLOCK	0x0020		/* open with exclusive file lock */
-#define	O_ASYNC		0x0040		/* signal pgrp when data ready */
-#define	O_FSYNC		0x0080		/* synchronous writes */
-#endif
-#define	O_SYNC		0x0080		/* POSIX synonym for O_FSYNC */
-#if __POSIX_VISIBLE >= 200809
-#define	O_NOFOLLOW	0x0100		/* don't follow symlinks */
-#endif
-#define	O_CREAT		0x0200		/* create if nonexistent */
-#define	O_TRUNC		0x0400		/* truncate to zero length */
-#define	O_EXCL		0x0800		/* error if already exists */
-#ifdef _KERNEL
-#define	FHASLOCK	0x4000		/* descriptor holds advisory lock */
-#endif
-
-/* Defined by POSIX 1003.1; BSD default, but must be distinct from O_RDONLY. */
-#define	O_NOCTTY	0x8000		/* don't assign controlling terminal */
-
-#if __BSD_VISIBLE
-/* Attempt to bypass buffer cache */
-#define	O_DIRECT	0x00010000
-#endif
-
-#if __POSIX_VISIBLE >= 200809
-#define	O_DIRECTORY	0x00020000	/* Fail if not directory */
-#define	O_EXEC		0x00040000	/* Open for execute only */
-#endif
-#ifdef	_KERNEL
-#define	FEXEC		O_EXEC
-#endif
-
-#if __POSIX_VISIBLE >= 200809
-/* Defined by POSIX 1003.1-2008; BSD default, but reserve for future use. */
-#define	O_TTY_INIT	0x00080000	/* Restore default termios attributes */
-
-#define	O_CLOEXEC	0x00100000
-#endif
-
-/*
- * XXX missing O_DSYNC, O_RSYNC.
- */
-
-#ifdef _KERNEL
-/* convert from open() flags to/from fflags; convert O_RD/WR to FREAD/FWRITE */
-#define	FFLAGS(oflags)	((oflags) & O_EXEC ? (oflags) : (oflags) + 1)
-#define	OFLAGS(fflags)	((fflags) & O_EXEC ? (fflags) : (fflags) - 1)
-
-/* bits to save after open */
-#define	FMASK	(FREAD|FWRITE|FAPPEND|FASYNC|FFSYNC|FNONBLOCK|O_DIRECT|FEXEC)
-/* bits settable by fcntl(F_SETFL, ...) */
-#define	FCNTLFLAGS	(FAPPEND|FASYNC|FFSYNC|FNONBLOCK|FRDAHEAD|O_DIRECT)
-
-#if defined(COMPAT_FREEBSD7) || defined(COMPAT_FREEBSD6) || \
-    defined(COMPAT_FREEBSD5) || defined(COMPAT_FREEBSD4)
-/*
- * Set by shm_open(3) in older libc's to get automatic MAP_ASYNC
- * behavior for POSIX shared memory objects (which are otherwise
- * implemented as plain files).
- */
-#define	FPOSIXSHM	O_NOFOLLOW
-#undef FCNTLFLAGS
-#define	FCNTLFLAGS	(FAPPEND|FASYNC|FFSYNC|FNONBLOCK|FPOSIXSHM|FRDAHEAD| \
-			 O_DIRECT)
-#endif
-#endif
-
-/*
- * The O_* flags used to have only F* names, which were used in the kernel
- * and by fcntl.  We retain the F* names for the kernel f_flag field
- * and for backward compatibility for fcntl.  These flags are deprecated.
- */
-#if __BSD_VISIBLE
-#define	FAPPEND		O_APPEND	/* kernel/compat */
-#define	FASYNC		O_ASYNC		/* kernel/compat */
-#define	FFSYNC		O_FSYNC		/* kernel */
-#define	FNONBLOCK	O_NONBLOCK	/* kernel */
-#define	FNDELAY		O_NONBLOCK	/* compat */
-#define	O_NDELAY	O_NONBLOCK	/* compat */
-#endif
-
-/*
- * We are out of bits in f_flag (which is a short).  However,
- * the flag bits not set in FMASK are only meaningful in the
- * initial open syscall.  Those bits can thus be given a
- * different meaning for fcntl(2).
- */
-#if __BSD_VISIBLE
-/* Read ahead */
-#define	FRDAHEAD	O_CREAT
-#endif
-
-#if __POSIX_VISIBLE >= 200809
-/*
- * Magic value that specify the use of the current working directory
- * to determine the target of relative file paths in the openat() and
- * similar syscalls.
- */
-#define	AT_FDCWD		-100
-
-/*
- * Miscellaneous flags for the *at() syscalls.
- */
-#define	AT_EACCESS		0x100	/* Check access using effective user and group ID */
-#define	AT_SYMLINK_NOFOLLOW	0x200   /* Do not follow symbolic links */
-#define	AT_SYMLINK_FOLLOW	0x400	/* Follow symbolic link */
-#define	AT_REMOVEDIR		0x800	/* Remove directory instead of file */
-#endif
-
-/*
- * Constants used for fcntl(2)
- */
-
-/* command values */
-#define	F_DUPFD		0		/* duplicate file descriptor */
-#define	F_GETFD		1		/* get file descriptor flags */
-#define	F_SETFD		2		/* set file descriptor flags */
-#define	F_GETFL		3		/* get file status flags */
-#define	F_SETFL		4		/* set file status flags */
-#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-#define	F_GETOWN	5		/* get SIGIO/SIGURG proc/pgrp */
-#define	F_SETOWN	6		/* set SIGIO/SIGURG proc/pgrp */
-#endif
-#if __BSD_VISIBLE
-#define	F_OGETLK	7		/* get record locking information */
-#define	F_OSETLK	8		/* set record locking information */
-#define	F_OSETLKW	9		/* F_SETLK; wait if blocked */
-#define	F_DUP2FD	10		/* duplicate file descriptor to arg */
-#endif
-#define	F_GETLK		11		/* get record locking information */
-#define	F_SETLK		12		/* set record locking information */
-#define	F_SETLKW	13		/* F_SETLK; wait if blocked */
-#if __BSD_VISIBLE
-#define	F_SETLK_REMOTE	14		/* debugging support for remote locks */
-#define	F_READAHEAD	15		/* read ahead */
-#define	F_RDAHEAD	16		/* Darwin compatible read ahead */
-#endif
-#if __POSIX_VISIBLE >= 200809
-#define	F_DUPFD_CLOEXEC	17		/* Like F_DUPFD, but FD_CLOEXEC is set */
-#endif
-#if __BSD_VISIBLE
-#define	F_DUP2FD_CLOEXEC 18		/* Like F_DUP2FD, but FD_CLOEXEC is set */
-#endif
-
-/* file descriptor flags (F_GETFD, F_SETFD) */
-#define	FD_CLOEXEC	1		/* close-on-exec flag */
-
-/* record locking flags (F_GETLK, F_SETLK, F_SETLKW) */
-#define	F_RDLCK		1		/* shared or read lock */
-#define	F_UNLCK		2		/* unlock */
-#define	F_WRLCK		3		/* exclusive or write lock */
-#if __BSD_VISIBLE
-#define	F_UNLCKSYS	4		/* purge locks for a given system ID */ 
-#define	F_CANCEL	5		/* cancel an async lock request */
-#endif
-#ifdef _KERNEL
-#define	F_WAIT		0x010		/* Wait until lock is granted */
-#define	F_FLOCK		0x020	 	/* Use flock(2) semantics for lock */
-#define	F_POSIX		0x040	 	/* Use POSIX semantics for lock */
-#define	F_REMOTE	0x080		/* Lock owner is remote NFS client */
-#define	F_NOINTR	0x100		/* Ignore signals when waiting */
-#endif
-
-/*
- * Advisory file segment locking data type -
- * information passed to system by user
- */
-struct flock {
-	off_t	l_start;	/* starting offset */
-	off_t	l_len;		/* len = 0 means until end of file */
-	pid_t	l_pid;		/* lock owner */
-	short	l_type;		/* lock type: read/write, etc. */
-	short	l_whence;	/* type of l_start */
-	int	l_sysid;	/* remote system id or zero for local */
-};
-
-#if __BSD_VISIBLE
-/*
- * Old advisory file segment locking data type,
- * before adding l_sysid.
- */
-struct __oflock {
-	off_t	l_start;	/* starting offset */
-	off_t	l_len;		/* len = 0 means until end of file */
-	pid_t	l_pid;		/* lock owner */
-	short	l_type;		/* lock type: read/write, etc. */
-	short	l_whence;	/* type of l_start */
-};
-#endif
-
-#if __BSD_VISIBLE
-/* lock operations for flock(2) */
-#define	LOCK_SH		0x01		/* shared file lock */
-#define	LOCK_EX		0x02		/* exclusive file lock */
-#define	LOCK_NB		0x04		/* don't block when locking */
-#define	LOCK_UN		0x08		/* unlock file */
-#endif
-
-#if __POSIX_VISIBLE >= 200112
-/*
- * Advice to posix_fadvise
- */
-#define	POSIX_FADV_NORMAL	0	/* no special treatment */
-#define	POSIX_FADV_RANDOM	1	/* expect random page references */
-#define	POSIX_FADV_SEQUENTIAL	2	/* expect sequential page references */
-#define	POSIX_FADV_WILLNEED	3	/* will need these pages */
-#define	POSIX_FADV_DONTNEED	4	/* dont need these pages */
-#define	POSIX_FADV_NOREUSE	5	/* access data only once */
-#endif
-
-#ifndef _KERNEL
-__BEGIN_DECLS
-int	open(const char *, int, ...);
-int	creat(const char *, mode_t);
-int	fcntl(int, int, ...);
-#if __BSD_VISIBLE
-int	flock(int, int);
-#endif
-#if __POSIX_VISIBLE >= 200809
-int	openat(int, const char *, int, ...);
-#endif
-#if __POSIX_VISIBLE >= 200112
-int	posix_fadvise(int, off_t, off_t, int);
-int	posix_fallocate(int, off_t, off_t);
-#endif
-__END_DECLS
-#endif
-
-#endif /* !_SYS_FCNTL_H_ */
diff --git a/include.new/sys/fdcio.h b/include.new/sys/fdcio.h
deleted file mode 100644
index f628551..0000000
--- a/include.new/sys/fdcio.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*-
- * Copyright (C) 1992-1994,2001 by Joerg Wunsch, Dresden
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``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(S) 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: releng/10.2/sys/sys/fdcio.h 274024 2014-11-03 10:26:29Z nyan $
- */
-
-#ifndef	_MACHINE_IOCTL_FD_H_
-#define	_MACHINE_IOCTL_FD_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-#define FD_FORMAT_VERSION 110	/* used to validate before formatting */
-#define FD_MAX_NSEC 36		/* highest known number of spt - allow for */
-				/* 2.88 MB drives */
-
-struct fd_formb {
-	int format_version;	/* == FD_FORMAT_VERSION */
-	int cyl, head;
-	int transfer_rate;	/* FDC_???KBPS */
-
-	struct fd_form_data {
-		/*
-		 * DO NOT CHANGE THE LAYOUT OF THIS STRUCTS
-		 * it is hardware-dependent since it exactly
-		 * matches the byte sequence to write to FDC
-		 * during its `format track' operation
-		 */
-		u_char secshift; /* 0 -> 128, ...; usually 2 -> 512 */
-		u_char nsecs;	/* must be <= FD_MAX_NSEC */
-		u_char gaplen;	/* GAP 3 length; usually 84 */
-		u_char fillbyte; /* usually 0xf6 */
-		struct fd_idfield_data {
-			/*
-			 * data to write into id fields;
-			 * for obscure formats, they mustn't match
-			 * the real values (but mostly do)
-			 */
-			u_char cylno;	/* 0 thru 79 (or 39) */
-			u_char headno;	/* 0, or 1 */
-			u_char secno;	/* starting at 1! */
-			u_char secsize;	/* usually 2 */
-		} idfields[FD_MAX_NSEC]; /* 0 <= idx < nsecs used */
-	} format_info;
-};
-
-/* make life easier */
-# define fd_formb_secshift   format_info.secshift
-# define fd_formb_nsecs      format_info.nsecs
-# define fd_formb_gaplen     format_info.gaplen
-# define fd_formb_fillbyte   format_info.fillbyte
-/* these data must be filled in for(i = 0; i < fd_formb_nsecs; i++) */
-# define fd_formb_cylno(i)   format_info.idfields[i].cylno
-# define fd_formb_headno(i)  format_info.idfields[i].headno
-# define fd_formb_secno(i)   format_info.idfields[i].secno
-# define fd_formb_secsize(i) format_info.idfields[i].secsize
-
-struct fd_type {
-	int	sectrac;		/* sectors per track         */
-	int	secsize;		/* size code for sectors     */
-	int	datalen;		/* data len when secsize = 0 */
-	int	gap;			/* gap len between sectors   */
-	int	tracks;			/* total number of cylinders */
-	int	size;			/* size of disk in sectors   */
-	int	trans;			/* transfer speed code       */
-	int	heads;			/* number of heads	     */
-	int     f_gap;                  /* format gap len            */
-	int     f_inter;                /* format interleave factor  */
-	int	offset_side2;		/* offset of sectors on side2 */
-	int	flags;			/* misc. features */
-#define FL_MFM		0x0001		/* MFM recording */
-#define FL_2STEP	0x0002		/* 2 steps between cylinders */
-#define FL_PERPND	0x0004		/* perpendicular recording */
-#define FL_AUTO		0x0008		/* autodetect format */
-};
-
-struct fdc_status {
-	u_int	status[7];
-};
-
-/*
- * cyl and head are being passed into ioctl(FD_READID)
- * all four fields are being returned
- */
-struct fdc_readid {
-	u_char	cyl;		/* C - 0...79 */
-	u_char	head;		/* H - 0...1 */
-	u_char	sec;		/* R - 1...n */
-	u_char	secshift;	/* N - log2(secsize / 128) */
-};
-
-/*
- * Diskette drive type, basically the same as stored in RTC on ISA
- * machines (see /sys/isa/rtc.h), but right-shifted by four bits.
- */
-enum fd_drivetype {
-	FDT_NONE, FDT_360K, FDT_12M, FDT_720K, FDT_144M, FDT_288M_1,
-	FDT_288M
-};
-
-
-#define FD_FORM   _IOW('F', 61, struct fd_formb) /* format a track */
-#define FD_GTYPE  _IOR('F', 62, struct fd_type)  /* get drive type */
-#define FD_STYPE  _IOW('F', 63, struct fd_type)  /* set drive type */
-
-#define FD_GOPTS  _IOR('F', 64, int) /* drive options, see below */
-#define FD_SOPTS  _IOW('F', 65, int)
- 
-#ifdef PC98
-#define FD_DEBUG  _IOW('F', 66, int)
-#endif
-
-#define FD_CLRERR _IO('F', 67)	/* clear error counter */
-
-#define FD_READID _IOWR('F', 68, struct fdc_readid) /* read ID field */
-
-/*
- * Obtain NE765 status registers.  Only successful if there is
- * a valid status stored in fdc->status[].
- */
-#define FD_GSTAT  _IOR('F', 69, struct fdc_status)
-
-#define FD_GDTYPE _IOR('F', 70, enum fd_drivetype) /* obtain drive type */
-
-/* Options for FD_GOPTS/FD_SOPTS, cleared on device close */
-#define FDOPT_NORETRY 0x0001	/* no retries on failure */
-#define FDOPT_NOERRLOG 0x002	/* no "hard error" kernel log messages */
-#define FDOPT_NOERROR 0x0004	/* do not indicate errors, caller will use
-				   FD_GSTAT in order to obtain status */
-#ifdef PC98
-#define FDOPT_AUTOSEL 0x8000	/* read/only option: device performs media
-				 * autoselection */
-#endif
-
-/*
- * Transfer rate definitions.  Used in the structures above.  They
- * represent the hardware encoding of bits 0 and 1 of the FDC control
- * register when writing to the register.
- * Transfer rates for FM encoding are half the values listed here
- * (but we currently don't support FM encoding).
- */
-#define	FDC_500KBPS	0x00	/* 500KBPS MFM drive transfer rate */
-#define	FDC_300KBPS	0x01	/* 300KBPS MFM drive transfer rate */
-#define	FDC_250KBPS	0x02	/* 250KBPS MFM drive transfer rate */
-#define	FDC_1MBPS	0x03	/* 1MPBS MFM drive transfer rate */
-
-/*
- * Parameters for common formats
- *
- * See struct fd_type for layout.
- * XXX: Field 'size' must be calculated.
- * XXX: Fields 'f_inter' and 'offset_side2' are unused by kernel.
- *
- * XXX: These should really go in a /etc/floppycap colon separated file
- * XXX: but the kernel needs some of them for proper defaults and it would
- * XXX: should have been done 20 years ago to make sense.
- */
-#ifdef PC98
-#define FDF_3_1440 18,2,0xFF,0x1B,80,0,2,2,0x54,1,0,FL_MFM
-#define FDF_3_1200 15,2,0xFF,0x1B,80,0,0,2,0x54,1,0,FL_MFM
-#define FDF_3_720   9,2,0xFF,0x20,80,0,1,2,0x50,1,0,FL_MFM
-#define FDF_3_360   9,2,0xFF,0x20,40,0,1,2,0x50,1,0,FL_MFM|FL_2STEP
-#define FDF_3_640   8,2,0xFF,0x2A,80,0,1,2,0x50,1,0,FL_MFM
-#define FDF_3_1230  8,3,0xFF,0x35,77,0,0,2,0x74,1,0,FL_MFM
-#define FDF_5_1200 15,2,0xFF,0x1B,80,0,0,2,0x54,1,0,FL_MFM
-#define FDF_5_720   9,2,0xFF,0x20,80,0,1,2,0x50,1,0,FL_MFM
-#define FDF_5_360   9,2,0xFF,0x20,40,0,1,2,0x50,1,0,FL_MFM|FL_2STEP
-#define FDF_5_640   8,2,0xFF,0x2A,80,0,1,2,0x50,1,0,FL_MFM
-#define FDF_5_1230  8,3,0xFF,0x35,77,0,0,2,0x74,1,0,FL_MFM
-#else /* PC98 */
-#define FDF_3_2880 36,2,0xFF,0x1B,80,0,FDC_1MBPS,002,0x4C,1,1,FL_MFM|FL_PERPND
-#define FDF_3_1722 21,2,0xFF,0x04,82,0,FDC_500KBPS,2,0x0C,2,0,FL_MFM
-#define FDF_3_1476 18,2,0xFF,0x1B,82,0,FDC_500KBPS,2,0x6C,1,0,FL_MFM
-#define FDF_3_1440 18,2,0xFF,0x1B,80,0,FDC_500KBPS,2,0x6C,1,0,FL_MFM
-#define FDF_3_1200 15,2,0xFF,0x1B,80,0,FDC_500KBPS,2,0x54,1,0,FL_MFM
-#define FDF_3_820  10,2,0xFF,0x10,82,0,FDC_250KBPS,2,0x2e,1,0,FL_MFM
-#define FDF_3_800  10,2,0xFF,0x10,80,0,FDC_250KBPS,2,0x2e,1,0,FL_MFM
-#define FDF_3_720   9,2,0xFF,0x20,80,0,FDC_250KBPS,2,0x50,1,0,FL_MFM
-#define FDF_5_1480 18,2,0xFF,0x02,82,0,FDC_500KBPS,2,0x02,2,0,FL_MFM 
-#define FDF_5_1440 18,2,0xFF,0x02,80,0,FDC_500KBPS,2,0x02,2,0,FL_MFM
-#define FDF_5_1230  8,3,0xFF,0x35,77,0,FDC_500KBPS,2,0x74,1,0,FL_MFM
-#define FDF_5_1200 15,2,0xFF,0x1B,80,0,FDC_500KBPS,2,0x54,1,0,FL_MFM
-#define FDF_5_820  10,2,0xFF,0x10,82,0,FDC_300KBPS,2,0x2e,1,0,FL_MFM
-#define FDF_5_800  10,2,0xFF,0x10,80,0,FDC_300KBPS,2,0x2e,1,0,FL_MFM
-#define FDF_5_720   9,2,0xFF,0x20,80,0,FDC_300KBPS,2,0x50,1,0,FL_MFM
-#define FDF_5_640   8,2,0xFF,0x2A,80,0,FDC_300KBPS,2,0x50,1,0,FL_MFM
-#define FDF_5_360   9,2,0xFF,0x23,40,0,FDC_300KBPS,2,0x50,1,0,FL_MFM
-/* XXX:                      0x2a ? */
-#endif
-
-#endif /* !_MACHINE_IOCTL_FD_H_ */
diff --git a/include.new/sys/file.h b/include.new/sys/file.h
deleted file mode 100644
index dc1d6d6..0000000
--- a/include.new/sys/file.h
+++ /dev/null
@@ -1,388 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 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.
- * 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.
- *
- *	@(#)file.h	8.3 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/sys/file.h 272187 2014-09-26 20:05:28Z mjg $
- */
-
-#ifndef _SYS_FILE_H_
-#define	_SYS_FILE_H_
-
-#ifndef _KERNEL
-#include <sys/types.h> /* XXX */
-#include <sys/fcntl.h>
-#include <sys/unistd.h>
-#else
-#include <sys/queue.h>
-#include <sys/refcount.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-
-struct stat;
-struct thread;
-struct uio;
-struct knote;
-struct vnode;
-struct socket;
-
-
-#endif /* _KERNEL */
-
-#define	DTYPE_VNODE	1	/* file */
-#define	DTYPE_SOCKET	2	/* communications endpoint */
-#define	DTYPE_PIPE	3	/* pipe */
-#define	DTYPE_FIFO	4	/* fifo (named pipe) */
-#define	DTYPE_KQUEUE	5	/* event queue */
-#define	DTYPE_CRYPTO	6	/* crypto */
-#define	DTYPE_MQUEUE	7	/* posix message queue */
-#define	DTYPE_SHM	8	/* swap-backed shared memory */
-#define	DTYPE_SEM	9	/* posix semaphore */
-#define	DTYPE_PTS	10	/* pseudo teletype master device */
-#define	DTYPE_DEV	11	/* Device specific fd type */
-#define	DTYPE_PROCDESC	12	/* process descriptor */
-
-#ifdef _KERNEL
-
-struct file;
-struct filecaps;
-struct ucred;
-
-#define	FOF_OFFSET	0x01	/* Use the offset in uio argument */
-#define	FOF_NOLOCK	0x02	/* Do not take FOFFSET_LOCK */
-#define	FOF_NEXTOFF	0x04	/* Also update f_nextoff */
-#define	FOF_NOUPDATE	0x10	/* Do not update f_offset */
-off_t foffset_lock(struct file *fp, int flags);
-void foffset_lock_uio(struct file *fp, struct uio *uio, int flags);
-void foffset_unlock(struct file *fp, off_t val, int flags);
-void foffset_unlock_uio(struct file *fp, struct uio *uio, int flags);
-
-static inline off_t
-foffset_get(struct file *fp)
-{
-
-	return (foffset_lock(fp, FOF_NOLOCK));
-}
-
-typedef int fo_rdwr_t(struct file *fp, struct uio *uio,
-		    struct ucred *active_cred, int flags,
-		    struct thread *td);
-typedef	int fo_truncate_t(struct file *fp, off_t length,
-		    struct ucred *active_cred, struct thread *td);
-typedef	int fo_ioctl_t(struct file *fp, u_long com, void *data,
-		    struct ucred *active_cred, struct thread *td);
-typedef	int fo_poll_t(struct file *fp, int events,
-		    struct ucred *active_cred, struct thread *td);
-typedef	int fo_kqfilter_t(struct file *fp, struct knote *kn);
-typedef	int fo_stat_t(struct file *fp, struct stat *sb,
-		    struct ucred *active_cred, struct thread *td);
-typedef	int fo_close_t(struct file *fp, struct thread *td);
-typedef	int fo_chmod_t(struct file *fp, mode_t mode,
-		    struct ucred *active_cred, struct thread *td);
-typedef	int fo_chown_t(struct file *fp, uid_t uid, gid_t gid,
-		    struct ucred *active_cred, struct thread *td);
-typedef int fo_sendfile_t(struct file *fp, int sockfd, struct uio *hdr_uio,
-		    struct uio *trl_uio, off_t offset, size_t nbytes,
-		    off_t *sent, int flags, int kflags, struct thread *td);
-typedef int fo_seek_t(struct file *fp, off_t offset, int whence,
-		    struct thread *td);
-typedef	int fo_flags_t;
-
-struct fileops {
-	fo_rdwr_t	*fo_read;
-	fo_rdwr_t	*fo_write;
-	fo_truncate_t	*fo_truncate;
-	fo_ioctl_t	*fo_ioctl;
-	fo_poll_t	*fo_poll;
-	fo_kqfilter_t	*fo_kqfilter;
-	fo_stat_t	*fo_stat;
-	fo_close_t	*fo_close;
-	fo_chmod_t	*fo_chmod;
-	fo_chown_t	*fo_chown;
-	fo_sendfile_t	*fo_sendfile;
-	fo_seek_t	*fo_seek;
-	fo_flags_t	fo_flags;	/* DFLAG_* below */
-};
-
-#define DFLAG_PASSABLE	0x01	/* may be passed via unix sockets. */
-#define DFLAG_SEEKABLE	0x02	/* seekable / nonsequential */
-#endif /* _KERNEL */
-
-#if defined(_KERNEL) || defined(_WANT_FILE)
-/*
- * Kernel descriptor table.
- * One entry for each open kernel vnode and socket.
- *
- * Below is the list of locks that protects members in struct file.
- *
- * (a) f_vnode lock required (shared allows both reads and writes)
- * (f) protected with mtx_lock(mtx_pool_find(fp))
- * (d) cdevpriv_mtx
- * none	not locked
- */
-
-struct fadvise_info {
-	int		fa_advice;	/* (f) FADV_* type. */
-	off_t		fa_start;	/* (f) Region start. */
-	off_t		fa_end;		/* (f) Region end. */
-	off_t		fa_prevstart;	/* (f) Previous NOREUSE start. */
-	off_t		fa_prevend;	/* (f) Previous NOREUSE end. */
-};
-
-struct file {
-	void		*f_data;	/* file descriptor specific data */
-	struct fileops	*f_ops;		/* File operations */
-	struct ucred	*f_cred;	/* associated credentials. */
-	struct vnode 	*f_vnode;	/* NULL or applicable vnode */
-	short		f_type;		/* descriptor type */
-	short		f_vnread_flags; /* (f) Sleep lock for f_offset */
-	volatile u_int	f_flag;		/* see fcntl.h */
-	volatile u_int 	f_count;	/* reference count */
-	/*
-	 *  DTYPE_VNODE specific fields.
-	 */
-	int		f_seqcount;	/* (a) Count of sequential accesses. */
-	off_t		f_nextoff;	/* next expected read/write offset. */
-	union {
-		struct cdev_privdata *fvn_cdevpriv;
-					/* (d) Private data for the cdev. */
-		struct fadvise_info *fvn_advice;
-	} f_vnun;
-	/*
-	 *  DFLAG_SEEKABLE specific fields
-	 */
-	off_t		f_offset;
-	/*
-	 * Mandatory Access control information.
-	 */
-	void		*f_label;	/* Place-holder for MAC label. */
-};
-
-#define	f_cdevpriv	f_vnun.fvn_cdevpriv
-#define	f_advice	f_vnun.fvn_advice
-
-#define	FOFFSET_LOCKED       0x1
-#define	FOFFSET_LOCK_WAITING 0x2
-#define	FDEVFS_VNODE	     0x4
-
-#endif /* _KERNEL || _WANT_FILE */
-
-/*
- * Userland version of struct file, for sysctl
- */
-struct xfile {
-	size_t	xf_size;	/* size of struct xfile */
-	pid_t	xf_pid;		/* owning process */
-	uid_t	xf_uid;		/* effective uid of owning process */
-	int	xf_fd;		/* descriptor number */
-	void	*xf_file;	/* address of struct file */
-	short	xf_type;	/* descriptor type */
-	int	xf_count;	/* reference count */
-	int	xf_msgcount;	/* references from message queue */
-	off_t	xf_offset;	/* file offset */
-	void	*xf_data;	/* file descriptor specific data */
-	void	*xf_vnode;	/* vnode pointer */
-	u_int	xf_flag;	/* flags (see fcntl.h) */
-};
-
-#ifdef _KERNEL
-
-extern struct fileops vnops;
-extern struct fileops badfileops;
-extern struct fileops socketops;
-extern int maxfiles;		/* kernel limit on number of open files */
-extern int maxfilesperproc;	/* per process limit on number of open files */
-extern volatile int openfiles;	/* actual number of open files */
-
-int fget(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp);
-int fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp,
-    u_char *maxprotp, struct file **fpp);
-int fget_read(struct thread *td, int fd, cap_rights_t *rightsp,
-    struct file **fpp);
-int fget_write(struct thread *td, int fd, cap_rights_t *rightsp,
-    struct file **fpp);
-int _fdrop(struct file *fp, struct thread *td);
-
-/*
- * The socket operations are used a couple of places.
- * XXX: This is wrong, they should go through the operations vector for
- * XXX: sockets instead of going directly for the individual functions. /phk
- */
-fo_rdwr_t	soo_read;
-fo_rdwr_t	soo_write;
-fo_truncate_t	soo_truncate;
-fo_ioctl_t	soo_ioctl;
-fo_poll_t	soo_poll;
-fo_kqfilter_t	soo_kqfilter;
-fo_stat_t	soo_stat;
-fo_close_t	soo_close;
-
-fo_chmod_t	invfo_chmod;
-fo_chown_t	invfo_chown;
-fo_sendfile_t	invfo_sendfile;
-
-fo_sendfile_t	vn_sendfile;
-fo_seek_t	vn_seek;
-
-void finit(struct file *, u_int, short, void *, struct fileops *);
-int fgetvp(struct thread *td, int fd, cap_rights_t *rightsp,
-    struct vnode **vpp);
-int fgetvp_exec(struct thread *td, int fd, cap_rights_t *rightsp,
-    struct vnode **vpp);
-int fgetvp_rights(struct thread *td, int fd, cap_rights_t *needrightsp,
-    struct filecaps *havecaps, struct vnode **vpp);
-int fgetvp_read(struct thread *td, int fd, cap_rights_t *rightsp,
-    struct vnode **vpp);
-int fgetvp_write(struct thread *td, int fd, cap_rights_t *rightsp,
-    struct vnode **vpp);
-
-int fgetsock(struct thread *td, int fd, cap_rights_t *rightsp,
-    struct socket **spp, u_int *fflagp);
-void fputsock(struct socket *sp);
-
-static __inline int
-_fnoop(void)
-{
-
-	return (0);
-}
-
-#define	fhold(fp)							\
-	(refcount_acquire(&(fp)->f_count))
-#define	fdrop(fp, td)							\
-	(refcount_release(&(fp)->f_count) ? _fdrop((fp), (td)) : _fnoop())
-
-static __inline fo_rdwr_t	fo_read;
-static __inline fo_rdwr_t	fo_write;
-static __inline fo_truncate_t	fo_truncate;
-static __inline fo_ioctl_t	fo_ioctl;
-static __inline fo_poll_t	fo_poll;
-static __inline fo_kqfilter_t	fo_kqfilter;
-static __inline fo_stat_t	fo_stat;
-static __inline fo_close_t	fo_close;
-static __inline fo_chmod_t	fo_chmod;
-static __inline fo_chown_t	fo_chown;
-static __inline fo_sendfile_t	fo_sendfile;
-
-static __inline int
-fo_read(struct file *fp, struct uio *uio, struct ucred *active_cred,
-    int flags, struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_read)(fp, uio, active_cred, flags, td));
-}
-
-static __inline int
-fo_write(struct file *fp, struct uio *uio, struct ucred *active_cred,
-    int flags, struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_write)(fp, uio, active_cred, flags, td));
-}
-
-static __inline int
-fo_truncate(struct file *fp, off_t length, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_truncate)(fp, length, active_cred, td));
-}
-
-static __inline int
-fo_ioctl(struct file *fp, u_long com, void *data, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_ioctl)(fp, com, data, active_cred, td));
-}
-
-static __inline int
-fo_poll(struct file *fp, int events, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_poll)(fp, events, active_cred, td));
-}
-
-static __inline int
-fo_stat(struct file *fp, struct stat *sb, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_stat)(fp, sb, active_cred, td));
-}
-
-static __inline int
-fo_close(struct file *fp, struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_close)(fp, td));
-}
-
-static __inline int
-fo_kqfilter(struct file *fp, struct knote *kn)
-{
-
-	return ((*fp->f_ops->fo_kqfilter)(fp, kn));
-}
-
-static __inline int
-fo_chmod(struct file *fp, mode_t mode, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_chmod)(fp, mode, active_cred, td));
-}
-
-static __inline int
-fo_chown(struct file *fp, uid_t uid, gid_t gid, struct ucred *active_cred,
-    struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_chown)(fp, uid, gid, active_cred, td));
-}
-
-static __inline int
-fo_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
-    struct uio *trl_uio, off_t offset, size_t nbytes, off_t *sent, int flags,
-    int kflags, struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_sendfile)(fp, sockfd, hdr_uio, trl_uio, offset,
-	    nbytes, sent, flags, kflags, td));
-}
-
-static __inline int
-fo_seek(struct file *fp, off_t offset, int whence, struct thread *td)
-{
-
-	return ((*fp->f_ops->fo_seek)(fp, offset, whence, td));
-}
-
-#endif /* _KERNEL */
-
-#endif /* !SYS_FILE_H */
diff --git a/include.new/sys/filedesc.h b/include.new/sys/filedesc.h
deleted file mode 100644
index 9e99d55..0000000
--- a/include.new/sys/filedesc.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- *
- *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/filedesc.h 273109 2014-10-14 21:19:23Z mjg $
- */
-
-#ifndef _SYS_FILEDESC_H_
-#define	_SYS_FILEDESC_H_
-
-#include <sys/caprights.h>
-#include <sys/queue.h>
-#include <sys/event.h>
-#include <sys/lock.h>
-#include <sys/priority.h>
-#include <sys/seq.h>
-#include <sys/sx.h>
-
-#include <machine/_limits.h>
-
-struct filecaps {
-	cap_rights_t	 fc_rights;	/* per-descriptor capability rights */
-	u_long		*fc_ioctls;	/* per-descriptor allowed ioctls */
-	int16_t		 fc_nioctls;	/* fc_ioctls array size */
-	uint32_t	 fc_fcntls;	/* per-descriptor allowed fcntls */
-};
-
-struct filedescent {
-	struct file	*fde_file;	/* file structure for open file */
-	struct filecaps	 fde_caps;	/* per-descriptor rights */
-	uint8_t		 fde_flags;	/* per-process open file flags */
-	seq_t		 fde_seq;	/* keep file and caps in sync */
-};
-#define	fde_rights	fde_caps.fc_rights
-#define	fde_fcntls	fde_caps.fc_fcntls
-#define	fde_ioctls	fde_caps.fc_ioctls
-#define	fde_nioctls	fde_caps.fc_nioctls
-#define	fde_change_size	(offsetof(struct filedescent, fde_seq))
-
-/*
- * This structure is used for the management of descriptors.  It may be
- * shared by multiple processes.
- */
-#define NDSLOTTYPE	u_long
-
-struct filedesc {
-	struct	filedescent *fd_ofiles;	/* open files */
-	struct	vnode *fd_cdir;		/* current directory */
-	struct	vnode *fd_rdir;		/* root directory */
-	struct	vnode *fd_jdir;		/* jail root directory */
-	int	fd_nfiles;		/* number of open files allocated */
-	NDSLOTTYPE *fd_map;		/* bitmap of free fds */
-	int	fd_lastfile;		/* high-water mark of fd_ofiles */
-	int	fd_freefile;		/* approx. next free file */
-	u_short	fd_cmask;		/* mask for file creation */
-	u_short	fd_refcnt;		/* thread reference count */
-	u_short	fd_holdcnt;		/* hold count on structure + mutex */
-	struct	sx fd_sx;		/* protects members of this struct */
-	struct	kqlist fd_kqlist;	/* list of kqueues on this filedesc */
-	int	fd_holdleaderscount;	/* block fdfree() for shared close() */
-	int	fd_holdleaderswakeup;	/* fdfree() needs wakeup */
-};
-#define	fd_seq(fdp, fd)	(&(fdp)->fd_ofiles[(fd)].fde_seq)
-
-/*
- * Structure to keep track of (process leader, struct fildedesc) tuples.
- * Each process has a pointer to such a structure when detailed tracking
- * is needed, e.g., when rfork(RFPROC | RFMEM) causes a file descriptor
- * table to be shared by processes having different "p_leader" pointers
- * and thus distinct POSIX style locks.
- *
- * fdl_refcount and fdl_holdcount are protected by struct filedesc mtx.
- */
-struct filedesc_to_leader {
-	int		fdl_refcount;	/* references from struct proc */
-	int		fdl_holdcount;	/* temporary hold during closef */
-	int		fdl_wakeup;	/* fdfree() waits on closef() */
-	struct proc	*fdl_leader;	/* owner of POSIX locks */
-	/* Circular list: */
-	struct filedesc_to_leader *fdl_prev;
-	struct filedesc_to_leader *fdl_next;
-};
-
-/*
- * Per-process open flags.
- */
-#define	UF_EXCLOSE	0x01		/* auto-close on exec */
-
-#ifdef _KERNEL
-
-/* Flags for do_dup() */
-#define	DUP_FIXED	0x1	/* Force fixed allocation. */
-#define	DUP_FCNTL	0x2	/* fcntl()-style errors. */
-#define	DUP_CLOEXEC	0x4	/* Atomically set FD_CLOEXEC. */
-
-/* Lock a file descriptor table. */
-#define	FILEDESC_LOCK_INIT(fdp)	sx_init(&(fdp)->fd_sx, "filedesc structure")
-#define	FILEDESC_LOCK_DESTROY(fdp)	sx_destroy(&(fdp)->fd_sx)
-#define	FILEDESC_LOCK(fdp)	(&(fdp)->fd_sx)
-#define	FILEDESC_XLOCK(fdp)	sx_xlock(&(fdp)->fd_sx)
-#define	FILEDESC_XUNLOCK(fdp)	sx_xunlock(&(fdp)->fd_sx)
-#define	FILEDESC_SLOCK(fdp)	sx_slock(&(fdp)->fd_sx)
-#define	FILEDESC_SUNLOCK(fdp)	sx_sunlock(&(fdp)->fd_sx)
-
-#define	FILEDESC_LOCK_ASSERT(fdp)	sx_assert(&(fdp)->fd_sx, SX_LOCKED | \
-					    SX_NOTRECURSED)
-#define	FILEDESC_XLOCK_ASSERT(fdp)	sx_assert(&(fdp)->fd_sx, SX_XLOCKED | \
-					    SX_NOTRECURSED)
-#define	FILEDESC_UNLOCK_ASSERT(fdp)	sx_assert(&(fdp)->fd_sx, SX_UNLOCKED)
-
-struct thread;
-
-void	filecaps_init(struct filecaps *fcaps);
-void	filecaps_copy(const struct filecaps *src, struct filecaps *dst);
-void	filecaps_move(struct filecaps *src, struct filecaps *dst);
-void	filecaps_free(struct filecaps *fcaps);
-
-int	closef(struct file *fp, struct thread *td);
-int	do_dup(struct thread *td, int flags, int old, int new,
-	    register_t *retval);
-int	dupfdopen(struct thread *td, struct filedesc *fdp, int dfd, int mode,
-	    int openerror, int *indxp);
-int	falloc(struct thread *td, struct file **resultfp, int *resultfd,
-	    int flags);
-int	falloc_noinstall(struct thread *td, struct file **resultfp);
-int	finstall(struct thread *td, struct file *fp, int *resultfp, int flags,
-	    struct filecaps *fcaps);
-int	fdalloc(struct thread *td, int minfd, int *result);
-int	fdallocn(struct thread *td, int minfd, int *fds, int n);
-int	fdavail(struct thread *td, int n);
-int	fdcheckstd(struct thread *td);
-void	fdclose(struct filedesc *fdp, struct file *fp, int idx, struct thread *td);
-void	fdcloseexec(struct thread *td);
-struct	filedesc *fdcopy(struct filedesc *fdp);
-void	fdunshare(struct thread *td);
-void	fdescfree(struct thread *td);
-struct	filedesc *fdinit(struct filedesc *fdp);
-struct	filedesc *fdshare(struct filedesc *fdp);
-struct filedesc_to_leader *
-	filedesc_to_leader_alloc(struct filedesc_to_leader *old,
-	    struct filedesc *fdp, struct proc *leader);
-int	getvnode(struct filedesc *fdp, int fd, cap_rights_t *rightsp,
-	    struct file **fpp);
-void	mountcheckdirs(struct vnode *olddp, struct vnode *newdp);
-void	setugidsafety(struct thread *td);
-
-/* Return a referenced file from an unlocked descriptor. */
-int	fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
-	    int needfcntl, struct file **fpp, cap_rights_t *haverightsp);
-
-/* Requires a FILEDESC_{S,X}LOCK held and returns without a ref. */
-static __inline struct file *
-fget_locked(struct filedesc *fdp, int fd)
-{
-
-	FILEDESC_LOCK_ASSERT(fdp);
-
-	if (fd < 0 || fd > fdp->fd_lastfile)
-		return (NULL);
-
-	return (fdp->fd_ofiles[fd].fde_file);
-}
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_FILEDESC_H_ */
diff --git a/include.new/sys/filio.h b/include.new/sys/filio.h
deleted file mode 100644
index eb0bb03..0000000
--- a/include.new/sys/filio.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)filio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD: releng/10.2/sys/sys/filio.h 195191 2009-06-30 13:38:49Z emaste $
- */
-
-#ifndef	_SYS_FILIO_H_
-#define	_SYS_FILIO_H_
-
-#include <sys/ioccom.h>
-
-/* Generic file-descriptor ioctl's. */
-#define	FIOCLEX		 _IO('f', 1)		/* set close on exec on fd */
-#define	FIONCLEX	 _IO('f', 2)		/* remove close on exec */
-#define	FIONREAD	_IOR('f', 127, int)	/* get # bytes to read */
-#define	FIONBIO		_IOW('f', 126, int)	/* set/clear non-blocking i/o */
-#define	FIOASYNC	_IOW('f', 125, int)	/* set/clear async i/o */
-#define	FIOSETOWN	_IOW('f', 124, int)	/* set owner */
-#define	FIOGETOWN	_IOR('f', 123, int)	/* get owner */
-#define	FIODTYPE	_IOR('f', 122, int)	/* get d_flags type part */
-#define	FIOGETLBA	_IOR('f', 121, int)	/* get start blk # */
-struct fiodgname_arg {
-	int	len;
-	void	*buf;
-};
-#define	FIODGNAME	_IOW('f', 120, struct fiodgname_arg) /* get dev. name */
-#define	FIONWRITE	_IOR('f', 119, int)	/* get # bytes (yet) to write */
-#define	FIONSPACE	_IOR('f', 118, int)	/* get space in send queue */
-/* Handle lseek SEEK_DATA and SEEK_HOLE for holey file knowledge. */
-#define	FIOSEEKDATA	_IOWR('f', 97, off_t)	/* SEEK_DATA */
-#define	FIOSEEKHOLE	_IOWR('f', 98, off_t)	/* SEEK_HOLE */
-
-#endif /* !_SYS_FILIO_H_ */
diff --git a/include.new/sys/firmware.h b/include.new/sys/firmware.h
deleted file mode 100644
index 81d0867..0000000
--- a/include.new/sys/firmware.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2005, Sam Leffler <sam@errno.com>
- * 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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/firmware.h 166756 2007-02-15 17:21:31Z luigi $
- */
-#ifndef _SYS_FIRMWARE_H_
-#define _SYS_FIRMWARE_H_
-/*
- * Loadable firmware support.
- *
- * The firmware abstraction provides an interface for loading firmware
- * images into the kernel and making them available to clients.
- *
- * Firmware images are usually embedded in kernel loadable modules that can
- * be loaded on-demand or pre-loaded as desired.  Modules may contain
- * one or more firmware images that are stored as opaque data arrays
- * and registered with a unique string name. Clients request
- * firmware by name, and are returned a struct firmware * below on success.
- * The kernel keeps track of references to firmware images to allow/prevent
- * module/data unload.
- *
- * When multiple images are stored in one module, the first image is
- * treated as the master with the other images holding references
- * to it.  This means that to unload the module each dependent/subimage
- * must first have its references removed.
- * In order for automatic loading to work, the master image must have
- * the same name as the module it is embedded into.
- */
-struct firmware {
-	const char	*name;		/* system-wide name */
-	const void	*data;		/* location of image */
-	size_t		 datasize;	/* size of image in bytes */
-	unsigned int	 version;	/* version of the image */
-};
-
-const struct firmware	*firmware_register(const char *,
-	const void *, size_t, unsigned int, const struct firmware *);
-int	 firmware_unregister(const char *);
-const struct firmware *firmware_get(const char *);
-#define	FIRMWARE_UNLOAD		0x0001	/* unload if unreferenced */
-void		 firmware_put(const struct firmware *, int);
-#endif /* _SYS_FIRMWARE_H_ */
diff --git a/include.new/sys/fnv_hash.h b/include.new/sys/fnv_hash.h
deleted file mode 100644
index 6cb0a70..0000000
--- a/include.new/sys/fnv_hash.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Fowler / Noll / Vo Hash (FNV Hash)
- * http://www.isthe.com/chongo/tech/comp/fnv/
- *
- * This is an implementation of the algorithms posted above.
- * This file is placed in the public domain by Peter Wemm.
- *
- * $FreeBSD: releng/10.2/sys/sys/fnv_hash.h 244209 2012-12-14 12:37:35Z ae $
- */
-#ifndef _SYS_FNV_HASH_H_
-#define	_SYS_FNV_HASH_H_
-
-typedef uint32_t Fnv32_t;
-typedef u_int64_t Fnv64_t;
-
-#define FNV1_32_INIT ((Fnv32_t) 33554467UL)
-#define FNV1_64_INIT ((Fnv64_t) 0xcbf29ce484222325ULL)
-
-#define FNV_32_PRIME ((Fnv32_t) 0x01000193UL)
-#define FNV_64_PRIME ((Fnv64_t) 0x100000001b3ULL)
-
-static __inline Fnv32_t
-fnv_32_buf(const void *buf, size_t len, Fnv32_t hval)
-{
-	const u_int8_t *s = (const u_int8_t *)buf;
-
-	while (len-- != 0) {
-		hval *= FNV_32_PRIME;
-		hval ^= *s++;
-	}
-	return hval;
-}
-
-static __inline Fnv32_t
-fnv_32_str(const char *str, Fnv32_t hval)
-{
-	const u_int8_t *s = (const u_int8_t *)str;
-	Fnv32_t c;
-
-	while ((c = *s++) != 0) {
-		hval *= FNV_32_PRIME;
-		hval ^= c;
-	}
-	return hval;
-}
-
-static __inline Fnv64_t
-fnv_64_buf(const void *buf, size_t len, Fnv64_t hval)
-{
-	const u_int8_t *s = (const u_int8_t *)buf;
-
-	while (len-- != 0) {
-		hval *= FNV_64_PRIME;
-		hval ^= *s++;
-	}
-	return hval;
-}
-
-static __inline Fnv64_t
-fnv_64_str(const char *str, Fnv64_t hval)
-{
-	const u_int8_t *s = (const u_int8_t *)str;
-	u_register_t c;		 /* 32 bit on i386, 64 bit on alpha,ia64 */
-
-	while ((c = *s++) != 0) {
-		hval *= FNV_64_PRIME;
-		hval ^= c;
-	}
-	return hval;
-}
-#endif /* _SYS_FNV_HASH_H_ */
diff --git a/include.new/sys/gmon.h b/include.new/sys/gmon.h
deleted file mode 100644
index f2d7a1b..0000000
--- a/include.new/sys/gmon.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1992, 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.
- * 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.
- *
- *	@(#)gmon.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: releng/10.2/sys/sys/gmon.h 157268 2006-03-29 18:17:03Z jhb $
- */
-
-#ifndef _SYS_GMON_H_
-#define _SYS_GMON_H_
-
-#include <machine/profile.h>
-
-/*
- * Structure prepended to gmon.out profiling data file.
- */
-struct gmonhdr {
-	u_long	lpc;		/* base pc address of sample buffer */
-	u_long	hpc;		/* max pc address of sampled buffer */
-	int	ncnt;		/* size of sample buffer (plus this header) */
-	int	version;	/* version number */
-	int	profrate;	/* profiling clock rate */
-	int	histcounter_type; /* size (in bits) and sign of HISTCOUNTER */
-	int	spare[2];	/* reserved */
-};
-#define GMONVERSION	0x00051879
-
-/*
- * Type of histogram counters used in the kernel.
- */
-#ifdef GPROF4
-#define	HISTCOUNTER	int64_t
-#else
-#define	HISTCOUNTER	unsigned short
-#endif
-
-/*
- * Fraction of text space to allocate for histogram counters.
- * We allocate counters at the same or higher density as function
- * addresses, so that each counter belongs to a unique function.
- * A lower density of counters would give less resolution but a
- * higher density would be wasted.
- */
-#define	HISTFRACTION	(FUNCTION_ALIGNMENT / sizeof(HISTCOUNTER) == 0 \
-			 ? 1 : FUNCTION_ALIGNMENT / sizeof(HISTCOUNTER))
-
-/*
- * Fraction of text space to allocate for from hash buckets.
- * The value of HASHFRACTION is based on the minimum number of bytes
- * of separation between two subroutine call points in the object code.
- * Given MIN_SUBR_SEPARATION bytes of separation the value of
- * HASHFRACTION is calculated as:
- *
- *	HASHFRACTION = MIN_SUBR_SEPARATION / (2 * sizeof(short) - 1);
- *
- * For example, on the VAX, the shortest two call sequence is:
- *
- *	calls	$0,(r0)
- *	calls	$0,(r0)
- *
- * which is separated by only three bytes, thus HASHFRACTION is
- * calculated as:
- *
- *	HASHFRACTION = 3 / (2 * 2 - 1) = 1
- *
- * Note that the division above rounds down, thus if MIN_SUBR_FRACTION
- * is less than three, this algorithm will not work!
- *
- * In practice, however, call instructions are rarely at a minimal
- * distance.  Hence, we will define HASHFRACTION to be 2 across all
- * architectures.  This saves a reasonable amount of space for
- * profiling data structures without (in practice) sacrificing
- * any granularity.
- */
-/*
- * XXX I think the above analysis completely misses the point.  I think
- * the point is that addresses in different functions must hash to
- * different values.  Since the hash is essentially division by
- * sizeof(unsigned short), the correct formula is:
- *
- * 	HASHFRACTION = MIN_FUNCTION_ALIGNMENT / sizeof(unsigned short)
- *
- * Note that he unsigned short here has nothing to do with the one for
- * HISTFRACTION.
- *
- * Hash collisions from a two call sequence don't matter.  They get
- * handled like collisions for calls to different addresses from the
- * same address through a function pointer.
- */
-#define	HASHFRACTION	(FUNCTION_ALIGNMENT / sizeof(unsigned short) == 0 \
-			 ? 1 : FUNCTION_ALIGNMENT / sizeof(unsigned short))
-
-/*
- * percent of text space to allocate for tostructs with a minimum.
- */
-#define ARCDENSITY	2
-#define MINARCS		50
-
-/*
- * Limit on the number of arcs to so that arc numbers can be stored in
- * `*froms' and stored and incremented without overflow in links.
- */
-#define MAXARCS		(((u_long)1 << (8 * sizeof(u_short))) - 2)
-
-struct tostruct {
-	u_long	selfpc;
-	long	count;
-	u_short	link;
-	u_short pad;
-};
-
-/*
- * a raw arc, with pointers to the calling site and
- * the called site and a count.
- */
-struct rawarc {
-	u_long	raw_frompc;
-	u_long	raw_selfpc;
-	long	raw_count;
-};
-
-/*
- * general rounding functions.
- */
-#define ROUNDDOWN(x,y)	rounddown(x,y)
-#define ROUNDUP(x,y)	roundup(x,y)
-
-/*
- * The profiling data structures are housed in this structure.
- */
-struct gmonparam {
-	int		state;
-	HISTCOUNTER	*kcount;
-	u_long		kcountsize;
-	u_short		*froms;
-	u_long		fromssize;
-	struct tostruct	*tos;
-	u_long		tossize;
-	long		tolimit;
-	uintfptr_t	lowpc;
-	uintfptr_t	highpc;
-	u_long		textsize;
-	u_long		hashfraction;
-	int		profrate;	/* XXX wrong type to match gmonhdr */
-	HISTCOUNTER	*cputime_count;
-	int		cputime_overhead;
-	HISTCOUNTER	*mcount_count;
-	int		mcount_overhead;
-	int		mcount_post_overhead;
-	int		mcount_pre_overhead;
-	HISTCOUNTER	*mexitcount_count;
-	int		mexitcount_overhead;
-	int		mexitcount_post_overhead;
-	int		mexitcount_pre_overhead;
-	int		histcounter_type;
-};
-extern struct gmonparam _gmonparam;
-
-/*
- * Possible states of profiling.
- */
-#define	GMON_PROF_ON	0
-#define	GMON_PROF_BUSY	1
-#define	GMON_PROF_ERROR	2
-#define	GMON_PROF_OFF	3
-#define	GMON_PROF_HIRES	4
-
-/*
- * Sysctl definitions for extracting profiling information from the kernel.
- */
-#define	GPROF_STATE	0	/* int: profiling enabling variable */
-#define	GPROF_COUNT	1	/* struct: profile tick count buffer */
-#define	GPROF_FROMS	2	/* struct: from location hash bucket */
-#define	GPROF_TOS	3	/* struct: destination/count structure */
-#define	GPROF_GMONPARAM	4	/* struct: profiling parameters (see above) */
-
-#ifdef _KERNEL
-
-#define	KCOUNT(p,index) \
-	((p)->kcount[(index) / (HISTFRACTION * sizeof(HISTCOUNTER))])
-#define	PC_TO_I(p, pc)	((uintfptr_t)(pc) - (uintfptr_t)(p)->lowpc)
-
-#ifdef GUPROF
-
-#define	CALIB_SCALE	1000
-
-extern int	cputime_bias;
-
-int	cputime(void);
-void	nullfunc_loop_profiled(void);
-void	nullfunc_profiled(void);
-void	startguprof(struct gmonparam *p);
-void	stopguprof(struct gmonparam *p);
-
-#else /* !GUPROF */
-
-#define	startguprof(p)
-#define	stopguprof(p)
-
-#endif /* GUPROF */
-
-void	empty_loop(void);
-void	kmupetext(uintfptr_t nhighpc);
-void	mexitcount(uintfptr_t selfpc);
-void	nullfunc(void);
-void	nullfunc_loop(void);
-
-#else /* !_KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void	moncontrol(int);
-void	monstartup(u_long, u_long);
-__END_DECLS
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_GMON_H_ */
diff --git a/include.new/sys/gpio.h b/include.new/sys/gpio.h
deleted file mode 100644
index ab471a1..0000000
--- a/include.new/sys/gpio.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */
-/*	$OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $	*/
-/*-
- * Copyright (c) 2009, Oleksandr Tymoshenko <gonzo@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 unmodified, 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.
- *
- * 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: releng/10.2/sys/sys/gpio.h 213237 2010-09-28 03:24:53Z gonzo $
- *
- */
-
-/*
- * Copyright (c) 2009 Marc Balmer <marc@msys.ch>
- * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef __GPIO_H__
-#define __GPIO_H__
-
-#include <sys/ioccom.h>
-
-/* GPIO pin states */
-#define GPIO_PIN_LOW		0x00	/* low level (logical 0) */
-#define GPIO_PIN_HIGH		0x01	/* high level (logical 1) */
-
-/* Max name length of a pin */
-#define GPIOMAXNAME		64
-
-/* GPIO pin configuration flags */
-#define GPIO_PIN_INPUT		0x0001	/* input direction */
-#define GPIO_PIN_OUTPUT		0x0002	/* output direction */
-#define GPIO_PIN_OPENDRAIN	0x0004	/* open-drain output */
-#define GPIO_PIN_PUSHPULL	0x0008	/* push-pull output */
-#define GPIO_PIN_TRISTATE	0x0010	/* output disabled */
-#define GPIO_PIN_PULLUP		0x0020	/* internal pull-up enabled */
-#define GPIO_PIN_PULLDOWN	0x0040	/* internal pull-down enabled */
-#define GPIO_PIN_INVIN		0x0080	/* invert input */
-#define GPIO_PIN_INVOUT		0x0100	/* invert output */
-#define GPIO_PIN_PULSATE	0x0200	/* pulsate in hardware */
-
-struct gpio_pin {
-	uint32_t gp_pin;			/* pin number */
-	char gp_name[GPIOMAXNAME];		/* human-readable name */
-	uint32_t gp_caps;			/* capabilities */
-	uint32_t gp_flags;			/* current flags */
-};
-
-/* GPIO pin request (read/write/toggle) */
-struct gpio_req {
-	uint32_t gp_pin;			/* pin number */
-	uint32_t gp_value;			/* value */
-};
-
-/*
- * ioctls
- */
-#define GPIOMAXPIN		_IOR('G', 0, int)
-#define	GPIOGETCONFIG		_IOWR('G', 1, struct gpio_pin)
-#define	GPIOSETCONFIG		_IOW('G', 2, struct gpio_pin)
-#define	GPIOGET			_IOWR('G', 3, struct gpio_req)
-#define	GPIOSET			_IOW('G', 4, struct gpio_req)
-#define	GPIOTOGGLE		_IOWR('G', 5, struct gpio_req)
-
-#endif /* __GPIO_H__ */
diff --git a/include.new/sys/gpt.h b/include.new/sys/gpt.h
deleted file mode 100644
index 4accb7b..0000000
--- a/include.new/sys/gpt.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/gpt.h 280261 2015-03-19 14:09:27Z ae $
- */
-
-#ifndef _SYS_GPT_H_
-#define	_SYS_GPT_H_
-
-#include <sys/uuid.h>
-
-struct gpt_hdr {
-	char		hdr_sig[8];
-#define	GPT_HDR_SIG		"EFI PART"
-	uint32_t	hdr_revision;
-#define	GPT_HDR_REVISION	0x00010000
-	uint32_t	hdr_size;
-	uint32_t	hdr_crc_self;
-	uint32_t	__reserved;
-	uint64_t	hdr_lba_self;
-	uint64_t	hdr_lba_alt;
-	uint64_t	hdr_lba_start;
-	uint64_t	hdr_lba_end;
-	struct uuid	hdr_uuid;
-	uint64_t	hdr_lba_table;
-	uint32_t	hdr_entries;
-	uint32_t	hdr_entsz;
-	uint32_t	hdr_crc_table;
-	/*
-	 * The header as defined in the EFI spec is not a multiple of 8 bytes
-	 * and given that the alignment requirement is on an 8 byte boundary,
-	 * padding will happen. We make the padding explicit so that we can
-	 * correct the value returned by sizeof() when we put the size of the
-	 * header in field hdr_size, or otherwise use offsetof().
-	 */
-	uint32_t	padding;
-};
-
-struct gpt_ent {
-	struct uuid	ent_type;
-	struct uuid	ent_uuid;
-	uint64_t	ent_lba_start;
-	uint64_t	ent_lba_end;
-	uint64_t	ent_attr;
-#define	GPT_ENT_ATTR_PLATFORM		(1ULL << 0)
-#define	GPT_ENT_ATTR_BOOTME		(1ULL << 59)
-#define	GPT_ENT_ATTR_BOOTONCE		(1ULL << 58)
-#define	GPT_ENT_ATTR_BOOTFAILED		(1ULL << 57)
-	uint16_t	ent_name[36];		/* UTF-16. */
-};
-
-#define	GPT_ENT_TYPE_UNUSED		\
-	{0x00000000,0x0000,0x0000,0x00,0x00,{0x00,0x00,0x00,0x00,0x00,0x00}}
-#define	GPT_ENT_TYPE_EFI		\
-	{0xc12a7328,0xf81f,0x11d2,0xba,0x4b,{0x00,0xa0,0xc9,0x3e,0xc9,0x3b}}
-#define	GPT_ENT_TYPE_MBR		\
-	{0x024dee41,0x33e7,0x11d3,0x9d,0x69,{0x00,0x08,0xc7,0x81,0xf3,0x9f}}
-#define	GPT_ENT_TYPE_FREEBSD		\
-	{0x516e7cb4,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define	GPT_ENT_TYPE_FREEBSD_BOOT	\
-	{0x83bd6b9d,0x7f41,0x11dc,0xbe,0x0b,{0x00,0x15,0x60,0xb8,0x4f,0x0f}}
-#define	GPT_ENT_TYPE_FREEBSD_NANDFS	\
-	{0x74ba7dd9,0xa689,0x11e1,0xbd,0x04,{0x00,0xe0,0x81,0x28,0x6a,0xcf}}
-#define	GPT_ENT_TYPE_FREEBSD_SWAP	\
-	{0x516e7cb5,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define	GPT_ENT_TYPE_FREEBSD_UFS	\
-	{0x516e7cb6,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define	GPT_ENT_TYPE_FREEBSD_VINUM	\
-	{0x516e7cb8,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define	GPT_ENT_TYPE_FREEBSD_ZFS	\
-	{0x516e7cba,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define	GPT_ENT_TYPE_PREP_BOOT		\
-	{0x9e1a2d38,0xc612,0x4316,0xaa,0x26,{0x8b,0x49,0x52,0x1e,0x5a,0x8b}}
-
-/*
- * The following are unused but documented here to avoid reuse.
- *
- * GPT_ENT_TYPE_FREEBSD_UFS2	\
- *	{0x516e7cb7,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
- */
-
-/*
- * Foreign partition types that we're likely to encounter. Note that Linux
- * apparently choose to share data partitions with MS. I don't what the
- * advantage might be. I can see how sharing swap partitions is advantageous
- * though.
- */
-#define	GPT_ENT_TYPE_MS_RESERVED	\
-	{0xe3c9e316,0x0b5c,0x4db8,0x81,0x7d,{0xf9,0x2d,0xf0,0x02,0x15,0xae}}
-#define	GPT_ENT_TYPE_MS_BASIC_DATA	\
-	{0xebd0a0a2,0xb9e5,0x4433,0x87,0xc0,{0x68,0xb6,0xb7,0x26,0x99,0xc7}}
-#define	GPT_ENT_TYPE_MS_LDM_METADATA	\
-	{0x5808c8aa,0x7e8f,0x42e0,0x85,0xd2,{0xe1,0xe9,0x04,0x34,0xcf,0xb3}}
-#define	GPT_ENT_TYPE_MS_LDM_DATA	\
-	{0xaf9b60a0,0x1431,0x4f62,0xbc,0x68,{0x33,0x11,0x71,0x4a,0x69,0xad}}
-
-#define	GPT_ENT_TYPE_LINUX_DATA		\
-	{0x0fc63daf,0x8483,0x4772,0x8e,0x79,{0x3d,0x69,0xd8,0x47,0x7d,0xe4}}
-#define	GPT_ENT_TYPE_LINUX_RAID		\
-	{0xa19d880f,0x05fc,0x4d3b,0xa0,0x06,{0x74,0x3f,0x0f,0x84,0x91,0x1e}}
-#define	GPT_ENT_TYPE_LINUX_SWAP		\
-	{0x0657fd6d,0xa4ab,0x43c4,0x84,0xe5,{0x09,0x33,0xc8,0x4b,0x4f,0x4f}}
-#define	GPT_ENT_TYPE_LINUX_LVM		\
-	{0xe6d6d379,0xf507,0x44c2,0xa2,0x3c,{0x23,0x8f,0x2a,0x3d,0xf9,0x28}}
-
-#define	GPT_ENT_TYPE_VMFS		\
-	{0xaa31e02a,0x400f,0x11db,0x95,0x90,{0x00,0x0c,0x29,0x11,0xd1,0xb8}}
-#define	GPT_ENT_TYPE_VMKDIAG		\
-	{0x9d275380,0x40ad,0x11db,0xbf,0x97,{0x00,0x0c,0x29,0x11,0xd1,0xb8}}
-#define	GPT_ENT_TYPE_VMRESERVED		\
-	{0x9198effc,0x31c0,0x11db,0x8f,0x78,{0x00,0x0c,0x29,0x11,0xd1,0xb8}}
-#define	GPT_ENT_TYPE_VMVSANHDR		\
-	{0x381cfccc,0x7288,0x11e0,0x92,0xee,{0x00,0x0c,0x29,0x11,0xd0,0xb2}}
-
-#define	GPT_ENT_TYPE_APPLE_BOOT		\
-	{0x426F6F74,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
-#define	GPT_ENT_TYPE_APPLE_HFS		\
-	{0x48465300,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
-#define	GPT_ENT_TYPE_APPLE_UFS		\
-	{0x55465300,0x0000,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
-#define	GPT_ENT_TYPE_APPLE_ZFS		\
-	{0x6a898cc3,0x1dd2,0x11b2,0x99,0xa6,{0x08,0x00,0x20,0x73,0x66,0x31}}
-#define	GPT_ENT_TYPE_APPLE_RAID		\
-	{0x52414944,0x0000,0x11aa,0xaa,0x22,{0x00,0x30,0x65,0x43,0xec,0xac}}
-#define	GPT_ENT_TYPE_APPLE_RAID_OFFLINE	\
-	{0x52414944,0x5f4f,0x11aa,0xaa,0x22,{0x00,0x30,0x65,0x43,0xec,0xac}}
-#define GPT_ENT_TYPE_APPLE_LABEL	\
-    	{0x4C616265,0x6c00,0x11aa,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
-#define	GPT_ENT_TYPE_APPLE_TV_RECOVERY	\
-    	{0x5265636f,0x7665,0x11AA,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
-#define	GPT_ENT_TYPE_APPLE_CORE_STORAGE	\
-	{0x53746f72,0x6167,0x11AA,0xaa,0x11,{0x00,0x30,0x65,0x43,0xec,0xac}}
-
-#define	GPT_ENT_TYPE_NETBSD_FFS		\
-	{0x49f48d5a,0xb10e,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}}
-#define	GPT_ENT_TYPE_NETBSD_LFS		\
-	{0x49f48d82,0xb10e,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}}
-#define	GPT_ENT_TYPE_NETBSD_SWAP	\
-	{0x49f48d32,0xb10e,0x11dc,0xB9,0x9B,{0x00,0x19,0xd1,0x87,0x96,0x48}}
-#define	GPT_ENT_TYPE_NETBSD_RAID	\
-	{0x49f48daa,0xb10e,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}}
-#define	GPT_ENT_TYPE_NETBSD_CCD		\
-	{0x2db519c4,0xb10f,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}}
-#define	GPT_ENT_TYPE_NETBSD_CGD		\
-	{0x2db519ec,0xb10f,0x11dc,0xb9,0x9b,{0x00,0x19,0xd1,0x87,0x96,0x48}}
-
-#define GPT_ENT_TYPE_DRAGONFLY_LABEL32	\
-	{0x9d087404,0x1ca5,0x11dc,0x88,0x17,{0x01,0x30,0x1b,0xb8,0xa9,0xf5}}
-#define GPT_ENT_TYPE_DRAGONFLY_SWAP	\
-	{0x9d58fdbd,0x1ca5,0x11dc,0x88,0x17,{0x01,0x30,0x1b,0xb8,0xa9,0xf5}}
-#define GPT_ENT_TYPE_DRAGONFLY_UFS1	\
-	{0x9d94ce7c,0x1ca5,0x11dc,0x88,0x17,{0x01,0x30,0x1b,0xb8,0xa9,0xf5}}
-#define GPT_ENT_TYPE_DRAGONFLY_VINUM	\
-	{0x9dd4478f,0x1ca5,0x11dc,0x88,0x17,{0x01,0x30,0x1b,0xb8,0xa9,0xf5}}
-#define GPT_ENT_TYPE_DRAGONFLY_CCD	\
-	{0xdbd5211b,0x1ca5,0x11dc,0x88,0x17,{0x01,0x30,0x1b,0xb8,0xa9,0xf5}}
-#define GPT_ENT_TYPE_DRAGONFLY_LABEL64	\
-	{0x3d48ce54,0x1d16,0x11dc,0x86,0x96,{0x01,0x30,0x1b,0xb8,0xa9,0xf5}}
-#define GPT_ENT_TYPE_DRAGONFLY_LEGACY	\
-	{0xbd215ab2,0x1d16,0x11dc,0x86,0x96,{0x01,0x30,0x1b,0xb8,0xa9,0xf5}}
-#define GPT_ENT_TYPE_DRAGONFLY_HAMMER	\
-	{0x61dc63ac,0x6e38,0x11dc,0x85,0x13,{0x01,0x30,0x1b,0xb8,0xa9,0xf5}}
-#define GPT_ENT_TYPE_DRAGONFLY_HAMMER2	\
-	{0x5cbb9ad1,0x862d,0x11dc,0xa9,0x4d,{0x01,0x30,0x1b,0xb8,0xa9,0xf5}}
-
-/*
- * Boot partition used by GRUB 2.
- */
-#define	GPT_ENT_TYPE_BIOS_BOOT		\
-	{0x21686148,0x6449,0x6e6f,0x74,0x4e,{0x65,0x65,0x64,0x45,0x46,0x49}}
-
-#endif /* _SYS_GPT_H_ */
diff --git a/include.new/sys/hash.h b/include.new/sys/hash.h
deleted file mode 100644
index 93ed0e3..0000000
--- a/include.new/sys/hash.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * Copyright (c) 2001 Tobias Weingartner
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- *
- * $OpenBSD: hash.h,v 1.4 2004/05/25 18:37:23 jmc Exp $
- * $FreeBSD: releng/10.2/sys/sys/hash.h 274486 2014-11-13 21:58:42Z gnn $
- */
-
-#ifndef _SYS_HASH_H_
-#define	_SYS_HASH_H_
-#include <sys/types.h>
-
-/* Convenience */
-#ifndef	HASHINIT
-#define	HASHINIT	5381
-#define	HASHSTEP(x,c)	(((x << 5) + x) + (c))
-#endif
-
-/*
- * Return a 32-bit hash of the given buffer.  The init
- * value should be 0, or the previous hash value to extend
- * the previous hash.
- */
-static __inline uint32_t
-hash32_buf(const void *buf, size_t len, uint32_t hash)
-{
-	const unsigned char *p = buf;
-
-	while (len--)
-		hash = HASHSTEP(hash, *p++);
-
-	return hash;
-}
-
-/*
- * Return a 32-bit hash of the given string.
- */
-static __inline uint32_t
-hash32_str(const void *buf, uint32_t hash)
-{
-	const unsigned char *p = buf;
-
-	while (*p)
-		hash = HASHSTEP(hash, *p++);
-
-	return hash;
-}
-
-/*
- * Return a 32-bit hash of the given string, limited by N.
- */
-static __inline uint32_t
-hash32_strn(const void *buf, size_t len, uint32_t hash)
-{
-	const unsigned char *p = buf;
-
-	while (*p && len--)
-		hash = HASHSTEP(hash, *p++);
-
-	return hash;
-}
-
-/*
- * Return a 32-bit hash of the given string terminated by C,
- * (as well as 0).  This is mainly here as a helper for the
- * namei() hashing of path name parts.
- */
-static __inline uint32_t
-hash32_stre(const void *buf, int end, const char **ep, uint32_t hash)
-{
-	const unsigned char *p = buf;
-
-	while (*p && (*p != end))
-		hash = HASHSTEP(hash, *p++);
-
-	if (ep)
-		*ep = p;
-
-	return hash;
-}
-
-/*
- * Return a 32-bit hash of the given string, limited by N,
- * and terminated by C (as well as 0).  This is mainly here
- * as a helper for the namei() hashing of path name parts.
- */
-static __inline uint32_t
-hash32_strne(const void *buf, size_t len, int end, const char **ep,
-    uint32_t hash)
-{
-	const unsigned char *p = buf;
-
-	while (*p && (*p != end) && len--)
-		hash = HASHSTEP(hash, *p++);
-
-	if (ep)
-		*ep = p;
-
-	return hash;
-}
-
-#ifdef _KERNEL
-/*
- * Hashing function from Bob Jenkins. Implementation in libkern/jenkins_hash.c.
- */
-uint32_t jenkins_hash(const void *, size_t, uint32_t);
-uint32_t jenkins_hash32(const uint32_t *, size_t, uint32_t);
-
-uint32_t murmur3_aligned_32(const void *data, size_t len, uint32_t seed);
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_HASH_H_ */
diff --git a/include.new/sys/hhook.h b/include.new/sys/hhook.h
deleted file mode 100644
index 1fe9a56..0000000
--- a/include.new/sys/hhook.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * Copyright (c) 2010,2013 Lawrence Stewart <lstewart@freebsd.org>
- * Copyright (c) 2010 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University of Technology, made
- * possible in part by grants from the FreeBSD Foundation and Cisco University
- * Research Program Fund at Community Foundation Silicon Valley.
- *
- * Portions of this software were developed at the Centre for Advanced
- * Internet Architectures, Swinburne University of Technology, Melbourne,
- * Australia by Lawrence Stewart under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/hhook.h 251770 2013-06-15 04:03:40Z lstewart $
- */
-
-/*
- * A KPI modelled on the pfil framework for instantiating helper hook points
- * within the kernel for use by Khelp modules. Originally released as part of
- * the NewTCP research project at Swinburne University of Technology's Centre
- * for Advanced Internet Architectures, Melbourne, Australia, which was made
- * possible in part by a grant from the Cisco University Research Program Fund
- * at Community Foundation Silicon Valley. More details are available at:
- *   http://caia.swin.edu.au/urp/newtcp/
- */
-
-#ifndef _SYS_HHOOK_H_
-#define _SYS_HHOOK_H_
-
-/* XXXLAS: Is there a way around this? */
-#include <sys/lock.h>
-#include <sys/rmlock.h>
-
-/* hhook_head flags. */
-#define	HHH_ISINVNET		0x00000001 /* Is the hook point in a vnet? */
-
-/* Flags common to  all register functions. */
-#define	HHOOK_WAITOK		0x00000001 /* Sleeping allowed. */
-#define	HHOOK_NOWAIT		0x00000002 /* Sleeping disallowed. */
-/* Flags only relevant to hhook_head_register() and hhook_head_is_virtual(). */
-#define	HHOOK_HEADISINVNET	0x00000100 /* Public proxy for HHH_ISINVNET. */
-
-/* Helper hook types. */
-#define	HHOOK_TYPE_TCP		1
-
-struct helper;
-struct osd;
-
-/* Signature for helper hook functions. */
-typedef int (*hhook_func_t)(int32_t hhook_type, int32_t hhook_id, void *udata,
-    void *ctx_data, void *hdata, struct osd *hosd);
-
-/*
- * Information required to add/remove a helper hook function to/from a helper
- * hook point.
- */
-struct hookinfo {
-	hhook_func_t	hook_func;
-	struct helper	*hook_helper;
-	void		*hook_udata;
-	int32_t		hook_id;
-	int32_t		hook_type;
-};
-
-/*
- * Ideally this would be private but we need access to the hhh_nhooks member
- * variable in order to make the HHOOKS_RUN_IF() macro low impact.
- */
-struct hhook_head {
-	STAILQ_HEAD(hhook_list, hhook)	hhh_hooks;
-	struct rmlock			hhh_lock;
-	uintptr_t			hhh_vid;
-	int32_t				hhh_id;
-	int32_t				hhh_nhooks;
-	int32_t				hhh_type;
-	uint32_t			hhh_flags;
-	volatile uint32_t		hhh_refcount;
-	LIST_ENTRY(hhook_head)		hhh_next;
-	LIST_ENTRY(hhook_head)		hhh_vnext;
-};
-
-/* Public KPI functions. */
-void	hhook_run_hooks(struct hhook_head *hhh, void *ctx_data, struct osd *hosd);
-
-int	hhook_add_hook(struct hhook_head *hhh, struct hookinfo *hki,
-    uint32_t flags);
-
-int	hhook_add_hook_lookup(struct hookinfo *hki, uint32_t flags);
-
-int	hhook_remove_hook(struct hhook_head *hhh, struct hookinfo *hki);
-
-int	hhook_remove_hook_lookup(struct hookinfo *hki);
-
-int	hhook_head_register(int32_t hhook_type, int32_t hhook_id,
-    struct hhook_head **hhh, uint32_t flags);
-
-int	hhook_head_deregister(struct hhook_head *hhh);
-
-int	hhook_head_deregister_lookup(int32_t hhook_type, int32_t hhook_id);
-
-struct hhook_head * hhook_head_get(int32_t hhook_type, int32_t hhook_id);
-
-void	hhook_head_release(struct hhook_head *hhh);
-
-uint32_t hhook_head_is_virtualised(struct hhook_head *hhh);
-
-uint32_t hhook_head_is_virtualised_lookup(int32_t hook_type, int32_t hook_id);
-
-/*
- * A wrapper around hhook_run_hooks() that only calls the function if at least
- * one helper hook function is registered for the specified helper hook point.
- */
-#define	HHOOKS_RUN_IF(hhh, ctx_data, hosd) do {				\
-	if (hhh != NULL && hhh->hhh_nhooks > 0)				\
-		hhook_run_hooks(hhh, ctx_data, hosd);			\
-} while (0)
-
-/*
- * WARNING: This macro should only be used in code paths that execute
- * infrequently, otherwise the refcounting overhead would be excessive.
- *
- * A similar wrapper to HHOOKS_RUN_IF() for situations where the caller prefers
- * not to lookup and store the appropriate hhook_head pointer themselves.
- */
-#define	HHOOKS_RUN_LOOKUP_IF(hhook_type, hhook_id, ctx_data, hosd) do {	\
-	struct hhook_head *_hhh;					\
-									\
-	_hhh = hhook_head_get(hhook_type, hhook_id);			\
-	if (_hhh != NULL) {						\
-		if (_hhh->hhh_nhooks > 0)				\
-			hhook_run_hooks(_hhh, ctx_data, hosd);		\
-		hhook_head_release(_hhh);				\
-	}								\
-} while (0)
-
-#endif /* _SYS_HHOOK_H_ */
diff --git a/include.new/sys/iconv.h b/include.new/sys/iconv.h
deleted file mode 100644
index aa4ca63..0000000
--- a/include.new/sys/iconv.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*-
- * Copyright (c) 2000-2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/sys/iconv.h 235711 2012-05-21 02:30:22Z kevlo $
- */
-#ifndef _SYS_ICONV_H_
-#define _SYS_ICONV_H_
-
-#define	ICONV_CSNMAXLEN		31	/* maximum length of charset name */
-#define	ICONV_CNVNMAXLEN	31	/* maximum length of converter name */
-/* maximum size of data associated with cs pair */
-#define	ICONV_CSMAXDATALEN	(sizeof(caddr_t) * 0x200 + sizeof(uint32_t) * 0x200 * 0x80)
-
-#define	XLAT16_ACCEPT_NULL_OUT		0x01000000
-#define	XLAT16_ACCEPT_NULL_IN		0x02000000
-#define	XLAT16_HAS_LOWER_CASE		0x04000000
-#define	XLAT16_HAS_UPPER_CASE		0x08000000
-#define	XLAT16_HAS_FROM_LOWER_CASE	0x10000000
-#define	XLAT16_HAS_FROM_UPPER_CASE	0x20000000
-#define	XLAT16_IS_3BYTE_CHR		0x40000000
-
-#define	KICONV_LOWER		1	/* tolower converted character */
-#define	KICONV_UPPER		2	/* toupper converted character */
-#define	KICONV_FROM_LOWER	4	/* tolower source character, then convert */
-#define	KICONV_FROM_UPPER	8	/* toupper source character, then convert */
-#define	KICONV_WCTYPE		16	/* towlower/towupper characters */
-
-#define	ENCODING_UNICODE	"UTF-16BE"
-#define	KICONV_WCTYPE_NAME	"_wctype"
-
-/*
- * Entry for cslist sysctl
- */
-#define	ICONV_CSPAIR_INFO_VER	1
-
-struct iconv_cspair_info {
-	int	cs_version;
-	int	cs_id;
-	int	cs_base;
-	int	cs_refcount;
-	char	cs_to[ICONV_CSNMAXLEN];
-	char	cs_from[ICONV_CSNMAXLEN];
-};
-
-/*
- * Paramters for 'add' sysctl
- */
-#define	ICONV_ADD_VER	1
-
-struct iconv_add_in {
-	int	ia_version;
-	char	ia_converter[ICONV_CNVNMAXLEN];
-	char	ia_to[ICONV_CSNMAXLEN];
-	char	ia_from[ICONV_CSNMAXLEN];
-	int	ia_datalen;
-	const void *ia_data;
-};
-
-struct iconv_add_out {
-	int	ia_csid;
-};
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-
-#define	KICONV_VENDOR_MICSFT	1	/* Microsoft Vendor Code for quirk */
-
-int   kiconv_add_xlat_table(const char *, const char *, const u_char *);
-int   kiconv_add_xlat16_cspair(const char *, const char *, int);
-int   kiconv_add_xlat16_cspairs(const char *, const char *);
-int   kiconv_add_xlat16_table(const char *, const char *, const void *, int);
-int   kiconv_lookupconv(const char *drvname);
-int   kiconv_lookupcs(const char *tocode, const char *fromcode);
-const char *kiconv_quirkcs(const char *, int);
-
-__END_DECLS
-
-#else /* !_KERNEL */
-
-#include <sys/kobj.h>
-#include <sys/module.h>			/* can't avoid that */
-#include <sys/queue.h>			/* can't avoid that */
-#include <sys/sysctl.h>			/* can't avoid that */
-
-struct iconv_cspair;
-struct iconv_cspairdata;
-
-/*
- * iconv converter class definition
- */
-struct iconv_converter_class {
-	KOBJ_CLASS_FIELDS;
-	TAILQ_ENTRY(iconv_converter_class)	cc_link;
-};
-
-struct iconv_cspair {
-	int		cp_id;		/* unique id of charset pair */
-	int		cp_refcount;	/* number of references from other pairs */
-	const char *	cp_from;
-	const char *	cp_to;
-	void *		cp_data;
-	struct iconv_converter_class * cp_dcp;
-	struct iconv_cspair *cp_base;
-	TAILQ_ENTRY(iconv_cspair)	cp_link;
-};
-
-#define	KICONV_CONVERTER(name,size)			\
-    static struct iconv_converter_class iconv_ ## name ## _class = { \
-	"iconv_"#name, iconv_ ## name ## _methods, size, NULL \
-    };							\
-    static moduledata_t iconv_ ## name ## _mod = {	\
-	"iconv_"#name, iconv_converter_handler,		\
-	(void*)&iconv_ ## name ## _class		\
-    };							\
-    DECLARE_MODULE(iconv_ ## name, iconv_ ## name ## _mod, SI_SUB_DRIVERS, SI_ORDER_ANY);
-
-#define	KICONV_CES(name,size)				\
-    static DEFINE_CLASS(iconv_ces_ ## name, iconv_ces_ ## name ## _methods, (size)); \
-    static moduledata_t iconv_ces_ ## name ## _mod = {	\
-	"iconv_ces_"#name, iconv_cesmod_handler,	\
-	(void*)&iconv_ces_ ## name ## _class		\
-    };							\
-    DECLARE_MODULE(iconv_ces_ ## name, iconv_ces_ ## name ## _mod, SI_SUB_DRIVERS, SI_ORDER_ANY);
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_ICONV);
-#endif
-
-/*
- * Basic conversion functions
- */
-int iconv_open(const char *to, const char *from, void **handle);
-int iconv_close(void *handle);
-int iconv_conv(void *handle, const char **inbuf,
-	size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-int iconv_conv_case(void *handle, const char **inbuf,
-	size_t *inbytesleft, char **outbuf, size_t *outbytesleft, int casetype);
-int iconv_convchr(void *handle, const char **inbuf,
-	size_t *inbytesleft, char **outbuf, size_t *outbytesleft);
-int iconv_convchr_case(void *handle, const char **inbuf,
-	size_t *inbytesleft, char **outbuf, size_t *outbytesleft, int casetype);
-int iconv_add(const char *converter, const char *to, const char *from);
-char* iconv_convstr(void *handle, char *dst, const char *src);
-void* iconv_convmem(void *handle, void *dst, const void *src, int size);
-int iconv_vfs_refcount(const char *fsname);
-
-int towlower(int c, void *handle);
-int towupper(int c, void *handle);
-
-/*
- * Bridge struct of iconv functions
- */
-struct iconv_functions {
-	int (*open)(const char *to, const char *from, void **handle);
-	int (*close)(void *handle);
-	int (*conv)(void *handle, const char **inbuf, size_t *inbytesleft,
-		char **outbuf, size_t *outbytesleft);
-	int (*conv_case)(void *handle, const char **inbuf, size_t *inbytesleft,
-		char **outbuf, size_t *outbytesleft, int casetype);
-	int (*convchr)(void *handle, const char **inbuf, size_t *inbytesleft,
-		char **outbuf, size_t *outbytesleft);
-	int (*convchr_case)(void *handle, const char **inbuf, size_t *inbytesleft,
-		char **outbuf, size_t *outbytesleft, int casetype);
-};
-
-#define VFS_DECLARE_ICONV(fsname)					\
-	static struct iconv_functions fsname ## _iconv_core = {		\
-		iconv_open,						\
-		iconv_close,						\
-		iconv_conv,						\
-		iconv_conv_case,					\
-		iconv_convchr,						\
-		iconv_convchr_case					\
-	};								\
-	extern struct iconv_functions *fsname ## _iconv;		\
-	static int fsname ## _iconv_mod_handler(module_t mod,		\
-		int type, void *d);					\
-	static int							\
-	fsname ## _iconv_mod_handler(module_t mod, int type, void *d)	\
-	{								\
-		int error = 0;						\
-		switch(type) {						\
-		case MOD_LOAD:						\
-			fsname ## _iconv = & fsname ## _iconv_core;	\
-			break;						\
-		case MOD_UNLOAD:					\
-			error = iconv_vfs_refcount(#fsname);		\
-			if (error)					\
-				return (EBUSY);				\
-			fsname ## _iconv = NULL;			\
-			break;						\
-		default:						\
-			error = EINVAL;					\
-			break;						\
-		}							\
-		return (error);						\
-	}								\
-	static moduledata_t fsname ## _iconv_mod = {			\
-		#fsname"_iconv",					\
-		fsname ## _iconv_mod_handler,				\
-		NULL							\
-	};								\
-	DECLARE_MODULE(fsname ## _iconv, fsname ## _iconv_mod,		\
-		       SI_SUB_DRIVERS, SI_ORDER_ANY);			\
-	MODULE_DEPEND(fsname ## _iconv, fsname, 1, 1, 1);		\
-	MODULE_DEPEND(fsname ## _iconv, libiconv, 2, 2, 2);		\
-	MODULE_VERSION(fsname ## _iconv, 1)
-
-/*
- * Internal functions
- */
-int iconv_lookupcp(char **cpp, const char *s);
-
-int iconv_converter_initstub(struct iconv_converter_class *dp);
-int iconv_converter_donestub(struct iconv_converter_class *dp);
-int iconv_converter_tolowerstub(int c, void *handle);
-int iconv_converter_handler(module_t mod, int type, void *data);
-
-#ifdef ICONV_DEBUG
-#define ICDEBUG(format, ...) printf("%s: "format, __func__ , ## __VA_ARGS__)
-#else
-#define ICDEBUG(format, ...)
-#endif
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_ICONV_H_ */
diff --git a/include.new/sys/imgact.h b/include.new/sys/imgact.h
deleted file mode 100644
index 8594d78..0000000
--- a/include.new/sys/imgact.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 1993, David Greenman
- * 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.
- * 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 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 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.
- *
- * $FreeBSD: releng/10.2/sys/sys/imgact.h 283359 2015-05-24 07:32:02Z kib $
- */
-
-#ifndef _SYS_IMGACT_H_
-#define	_SYS_IMGACT_H_
-
-#include <sys/uio.h>
-
-#include <vm/vm.h>
-
-#define MAXSHELLCMDLEN	PAGE_SIZE
-
-struct image_args {
-	char *buf;		/* pointer to string buffer */
-	char *begin_argv;	/* beginning of argv in buf */
-	char *begin_envv;	/* beginning of envv in buf */
-	char *endp;		/* current `end' pointer of arg & env strings */
-	char *fname;            /* pointer to filename of executable (system space) */
-	char *fname_buf;	/* pointer to optional malloc(M_TEMP) buffer */
-	int stringspace;	/* space left in arg & env buffer */
-	int argc;		/* count of argument strings */
-	int envc;		/* count of environment strings */
-	int fd;			/* file descriptor of the executable */
-};
-
-struct image_params {
-	struct proc *proc;	/* our process struct */
-	struct label *execlabel;	/* optional exec label */
-	struct vnode *vp;	/* pointer to vnode of file to exec */
-	struct vm_object *object;	/* The vm object for this vp */
-	struct vattr *attr;	/* attributes of file */
-	const char *image_header; /* head of file to exec */
-	unsigned long entry_addr; /* entry address of target executable */
-	unsigned long reloc_base; /* load address of image */
-	char vmspace_destroyed;	/* flag - we've blown away original vm space */
-#define IMGACT_SHELL	0x1
-#define IMGACT_BINMISC	0x2
-	unsigned char interpreted;	/* mask of interpreters that have run */
-	char opened;		/* flag - we have opened executable vnode */
-	char *interpreter_name;	/* name of the interpreter */
-	void *auxargs;		/* ELF Auxinfo structure pointer */
-	struct sf_buf *firstpage;	/* first page that we mapped */
-	unsigned long ps_strings; /* PS_STRINGS for BSD/OS binaries */
-	size_t auxarg_size;
-	struct image_args *args;	/* system call arguments */
-	struct sysentvec *sysent;	/* system entry vector */
-	char *execpath;
-	unsigned long execpathp;
-	char *freepath;
-	unsigned long canary;
-	int canarylen;
-	unsigned long pagesizes;
-	int pagesizeslen;
-	vm_prot_t stack_prot;
-	u_long stack_sz;
-};
-
-#ifdef _KERNEL
-struct sysentvec;
-struct thread;
-struct vmspace;
-
-#define IMGACT_CORE_COMPRESS	0x01
-
-int	exec_alloc_args(struct image_args *);
-int	exec_check_permissions(struct image_params *);
-register_t *exec_copyout_strings(struct image_params *);
-void	exec_free_args(struct image_args *);
-int	exec_new_vmspace(struct image_params *, struct sysentvec *);
-void	exec_setregs(struct thread *, struct image_params *, u_long);
-int	exec_shell_imgact(struct image_params *);
-int	exec_copyin_args(struct image_args *, char *, enum uio_seg,
-	char **, char **);
-int	pre_execve(struct thread *td, struct vmspace **oldvmspace);
-void	post_execve(struct thread *td, int error, struct vmspace *oldvmspace);
-#endif
-
-#endif /* !_SYS_IMGACT_H_ */
diff --git a/include.new/sys/imgact_aout.h b/include.new/sys/imgact_aout.h
deleted file mode 100644
index 9290fa5..0000000
--- a/include.new/sys/imgact_aout.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- *	from: @(#)exec.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: releng/10.2/sys/sys/imgact_aout.h 237695 2012-06-28 07:37:46Z imp $
- */
-
-#ifndef	_IMGACT_AOUT_H_
-#define	_IMGACT_AOUT_H_
-
-#define N_GETMAGIC(ex) \
-	( le32toh((ex).a_midmag) & 0xffff )
-#define N_GETMID(ex) \
-	( (N_GETMAGIC_NET(ex) == ZMAGIC) ? N_GETMID_NET(ex) : \
-	((ex).a_midmag >> 16) & 0x03ff )
-#define N_GETFLAG(ex) \
-	( (N_GETMAGIC_NET(ex) == ZMAGIC) ? N_GETFLAG_NET(ex) : \
-	((ex).a_midmag >> 26) & 0x3f )
-#define N_SETMAGIC(ex,mag,mid,flag) \
-	( (ex).a_midmag = htole32((((flag) & 0x3f) <<26) | \
-	(((mid) & 0x03ff) << 16) | \
-	((mag) & 0xffff)) )
-
-#define N_GETMAGIC_NET(ex) \
-	(ntohl((ex).a_midmag) & 0xffff)
-#define N_GETMID_NET(ex) \
-	((ntohl((ex).a_midmag) >> 16) & 0x03ff)
-#define N_GETFLAG_NET(ex) \
-	((ntohl((ex).a_midmag) >> 26) & 0x3f)
-#define N_SETMAGIC_NET(ex,mag,mid,flag) \
-	( (ex).a_midmag = htonl( (((flag)&0x3f)<<26) | (((mid)&0x03ff)<<16) \
-	| (((mag)&0xffff)) ) )
-
-#define N_ALIGN(ex,x) \
-	(N_GETMAGIC(ex) == ZMAGIC || N_GETMAGIC(ex) == QMAGIC || \
-	 N_GETMAGIC_NET(ex) == ZMAGIC || N_GETMAGIC_NET(ex) == QMAGIC ? \
-	 ((x) + __LDPGSZ - 1) & ~(uint32_t)(__LDPGSZ - 1) : (x))
-
-/* Valid magic number check. */
-#define	N_BADMAG(ex) \
-	(N_GETMAGIC(ex) != OMAGIC && N_GETMAGIC(ex) != NMAGIC && \
-	 N_GETMAGIC(ex) != ZMAGIC && N_GETMAGIC(ex) != QMAGIC && \
-	 N_GETMAGIC_NET(ex) != OMAGIC && N_GETMAGIC_NET(ex) != NMAGIC && \
-	 N_GETMAGIC_NET(ex) != ZMAGIC && N_GETMAGIC_NET(ex) != QMAGIC)
-
-
-/* Address of the bottom of the text segment. */
-/*
- * This can not be done right.  Abuse a_entry in some cases to handle kernels.
- */
-#define N_TXTADDR(ex) \
-	((N_GETMAGIC(ex) == OMAGIC || N_GETMAGIC(ex) == NMAGIC || \
-	N_GETMAGIC(ex) == ZMAGIC) ? \
-	(le32toh((ex).a_entry) < le32toh((ex).a_text) ? 0 : \
-	le32toh((ex).a_entry) & ~__LDPGSZ) : __LDPGSZ)
-
-/* Address of the bottom of the data segment. */
-#define N_DATADDR(ex) \
-	N_ALIGN(ex, N_TXTADDR(ex) + le32toh((ex).a_text))
-
-/* Text segment offset. */
-#define	N_TXTOFF(ex) \
-	(N_GETMAGIC(ex) == ZMAGIC ? __LDPGSZ : (N_GETMAGIC(ex) == QMAGIC || \
-	N_GETMAGIC_NET(ex) == ZMAGIC) ? 0 : sizeof(struct exec))
-
-/* Data segment offset. */
-#define	N_DATOFF(ex) \
-	N_ALIGN(ex, N_TXTOFF(ex) + le32toh((ex).a_text))
-
-/* Relocation table offset. */
-#define N_RELOFF(ex) \
-	N_ALIGN(ex, N_DATOFF(ex) + le32toh((ex).a_data))
-
-/* Symbol table offset. */
-#define N_SYMOFF(ex) \
-	(N_RELOFF(ex) + le32toh((ex).a_trsize) + le32toh((ex).a_drsize))
-
-/* String table offset. */
-#define	N_STROFF(ex) 	(N_SYMOFF(ex) + le32toh((ex).a_syms))
-
-/*
- * Header prepended to each a.out file.
- * Only manipulate the a_midmag field via the
- * N_SETMAGIC/N_GET{MAGIC,MID,FLAG} macros.
- */
-
-struct exec {
-     uint32_t	a_midmag;	/* flags<<26 | mid<<16 | magic */
-     uint32_t	a_text;		/* text segment size */
-     uint32_t	a_data;		/* initialized data size */
-     uint32_t	a_bss;		/* uninitialized data size */
-     uint32_t	a_syms;		/* symbol table size */
-     uint32_t	a_entry;	/* entry point */
-     uint32_t	a_trsize;	/* text relocation size */
-     uint32_t	a_drsize;	/* data relocation size */
-};
-#define a_magic a_midmag	/* Hack for emulators */
-
-/* a_magic */
-#define	OMAGIC		0407	/* old impure format */
-#define	NMAGIC		0410	/* read-only text */
-#define	ZMAGIC		0413	/* demand load format */
-#define QMAGIC          0314    /* "compact" demand load format */
-
-/* a_mid */
-#define	MID_ZERO	0	/* unknown - implementation dependent */
-#define	MID_SUN010	1	/* sun 68010/68020 binary */
-#define	MID_SUN020	2	/* sun 68020-only binary */
-#define MID_I386	134	/* i386 BSD binary */
-#define MID_SPARC	138	/* sparc */
-#define MID_ARM6	143	/* ARM6 */
-#define	MID_HP200	200	/* hp200 (68010) BSD binary */
-#define	MID_HP300	300	/* hp300 (68020+68881) BSD binary */
-#define	MID_HPUX	0x20C	/* hp200/300 HP-UX binary */
-#define	MID_HPUX800     0x20B   /* hp800 HP-UX binary */
-
-/*
- * a_flags
- */
-#define EX_PIC		0x10	/* contains position independent code */
-#define EX_DYNAMIC	0x20	/* contains run-time link-edit info */
-#define EX_DPMASK	0x30	/* mask for the above */
-
-#ifdef _KERNEL
-struct thread;
-struct vnode;
-
-int	aout_coredump(struct thread *td, struct vnode *vp, off_t limit,
-    int flags);
-#endif
-
-#endif /* !_IMGACT_AOUT_H_ */
diff --git a/include.new/sys/imgact_binmisc.h b/include.new/sys/imgact_binmisc.h
deleted file mode 100644
index f7c840e..0000000
--- a/include.new/sys/imgact_binmisc.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * Copyright (c) 2013 Stacey D. Son
- *
- * 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.
- *
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/sys/imgact_binmisc.h 266272 2014-05-16 21:56:33Z sbruno $
- */
-
-#ifndef	_IMGACT_BINMISC_H_
-#define	_IMGACT_BINMISC_H_
-
-/**
- * Miscellaneous binary interpreter image activator.
- */
-
-#include <sys/param.h>	/* for MAXPATHLEN */
-
-/*
- * Imgact bin misc parameters.
- */
-#define	IBE_VERSION	1	/* struct ximgact_binmisc_entry version. */
-#define	IBE_NAME_MAX	32	/* Max size for entry name. */
-#define	IBE_MAGIC_MAX	256	/* Max size for header magic and mask. */
-#define	IBE_ARG_LEN_MAX	256	/* Max space for optional interpreter command-
-				   line argruments seperated by white space */
-#define	IBE_INTERP_LEN_MAX	(MAXPATHLEN + IBE_ARG_LEN_MAX)
-#define	IBE_MAX_ENTRIES	64	/* Max number of interpreter entries. */
-
-/*
- * Imgact bin misc interpreter entry flags.
- */
-#define	IBF_ENABLED	0x0001	/* Entry is active. */
-#define	IBF_USE_MASK	0x0002	/* Use mask on header magic field. */
-
-/*
- * Used with sysctlbyname() to pass imgact bin misc entries in and out of the
- * kernel.
- */
-typedef struct ximgact_binmisc_entry {
-	uint32_t xbe_version;	/* Struct version(IBE_VERSION) */
-	uint32_t xbe_flags;	/* Entry flags (IBF_*) */
-	uint32_t xbe_moffset;	/* Magic offset in header */
-	uint32_t xbe_msize;	/* Magic size */
-	uint32_t spare[3];	/* Spare fields for future use */
-	char xbe_name[IBE_NAME_MAX];	/* Unique interpreter name */
-	char xbe_interpreter[IBE_INTERP_LEN_MAX]; /* Interpreter path + args */
-	uint8_t xbe_magic[IBE_MAGIC_MAX]; /* Header Magic */
-	uint8_t xbe_mask[IBE_MAGIC_MAX]; /* Magic Mask */
-} ximgact_binmisc_entry_t;
-
-/*
- * sysctl() command names.
- */
-#define	IBE_SYSCTL_NAME		"kern.binmisc"
-
-#define	IBE_SYSCTL_NAME_ADD	IBE_SYSCTL_NAME ".add"
-#define	IBE_SYSCTL_NAME_REMOVE	IBE_SYSCTL_NAME ".remove"
-#define	IBE_SYSCTL_NAME_DISABLE	IBE_SYSCTL_NAME ".disable"
-#define	IBE_SYSCTL_NAME_ENABLE	IBE_SYSCTL_NAME ".enable"
-#define	IBE_SYSCTL_NAME_LOOKUP	IBE_SYSCTL_NAME ".lookup"
-#define	IBE_SYSCTL_NAME_LIST	IBE_SYSCTL_NAME ".list"
-
-#define	KMOD_NAME	"imgact_binmisc"
-
-/*
- * Examples of manipulating the interpreter table using sysctlbyname(3):
- *
- * #include <sys/imgact_binmisc.h>
- *
- * #define LLVM_MAGIC  "BC\xc0\xde"
- *
- * #define MIPS64_ELF_MAGIC	"\x7f\x45\x4c\x46\x02\x02\x01\x00\x00\x00" \
- *				"\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08"
- * #define MIPS64_ELF_MASK	"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff" \
- *				"\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"
- *
- * ximgact_binmisc_entry_t xbe, *xbep, out_xbe;
- * size_t size = 0, osize;
- * int error, i;
- *
- * // Add image activator for LLVM byte code
- * bzero(&xbe, sizeof(xbe));
- * xbe.xbe_version = IBE_VERSION;
- * xbe.xbe_flags = IBF_ENABLED;
- * strlcpy(xbe.xbe_name, "llvm_bc", IBE_NAME_MAX);
- * strlcpy(xbe.xbe_interpreter, "/usr/bin/lli --fake-arg0=#a",
- *     IBE_INTERP_LEN_MAX);
- * xbe.xbe_moffset = 0;
- * xbe.xbe_msize = 4;
- * memcpy(xbe.xbe_magic, LLVM_MAGIC, xbe.xbe_msize);
- * error = sysctlbyname(IBE_SYSCTL_NAME_ADD, NULL, NULL, &xbe, sizeof(xbe));
- *
- * // Add image activator for mips64 ELF binaries to use qemu user mode
- * bzero(&xbe, sizeof(xbe));
- * xbe.xbe_version = IBE_VERSION;
- * xbe.xbe_flags = IBF_ENABLED | IBF_USE_MASK;
- * strlcpy(xbe.xbe_name, "mips64elf", IBE_NAME_MAX);
- * strlcpy(xbe.xbe_interpreter, "/usr/local/bin/qemu-mips64",
- *	IBE_INTERP_LEN_MAX);
- * xbe.xbe_moffset = 0;
- * xbe.xbe_msize = 20;
- * memcpy(xbe.xbe_magic, MIPS64_ELF_MAGIC, xbe.xbe_msize);
- * memcpy(xbe.xbe_mask, MIPS64_ELF_MASK, xbe.xbe_msize);
- * sysctlbyname(IBE_SYSCTL_NAME_ADD, NULL, NULL, &xbe, sizeof(xbe));
- *
- * // Disable (OR Enable OR Remove) image activator for LLVM byte code
- * bzero(&xbe, sizeof(xbe));
- * xbe.xbe_version = IBE_VERSION;
- * strlcpy(xbe.xbe_name, "llvm_bc", IBE_NAME_MAX);
- * error = sysctlbyname(IBE_SYSCTL_NAME_DISABLE, NULL, NULL, &xbe, sizeof(xbe));
- * // OR sysctlbyname(IBE_SYSCTL_NAME_ENABLE, NULL, NULL, &xbe, sizeof(xbe));
- * // OR sysctlbyname(IBE_SYSCTL_NAME_REMOVE, NULL, NULL, &xbe, sizeof(xbe));
- *
- * // Lookup image activator  "llvm_bc"
- * bzero(&xbe, sizeof(xbe));
- * xbe.xbe_version = IBE_VERSION;
- * strlcpy(xbe.xbe_name, "llvm_bc", IBE_NAME_MAX);
- * size = sizeof(out_xbe);
- * error = sysctlbyname(IBE_SYSCTL_NAME_LOOKUP, &out_xbe, &size, &xbe,
- *	sizeof(xbe));
- *
- * // Get all the currently configured image activators and report
- * error = sysctlbyname(IBE_SYSCTL_NAME_LIST, NULL, &size, NULL, 0);
- * if (0 == error && size > 0) {
- *	xbep = malloc(size);
- *	while(1) {
- *	    osize = size;
- *	    error = sysctlbyname("kern.binmisc.list", xbep, &size, NULL, 0);
- *	    if (-1 == error && ENOMEM == errno && size == osize) {
- *		// The buffer too small and needs to grow
- *		size += sizeof(xbe);
- *		xbep = realloc(xbep, size);
- *	    } else
- *		break;
- *	}
- * }
- * for(i = 0; i < (size / sizeof(xbe)); i++, xbep++)
- *	printf("name: %s interpreter: %s flags: %s %s\n", xbep->xbe_name,
- *	    xbep->xbe_interpreter, (xbep->xbe_flags & IBF_ENABLED) ?
- *	    "ENABLED" : "", (xbep->xbe_flags & IBF_ENABLED) ? "USE_MASK" : "");
- *
- * The sysctlbyname() calls above may return the following errors in addition
- * to the standard ones:
- *
- * [EINVAL]  Invalid argument in the input ximgact_binmisc_entry_t structure.
- * [EEXIST]  Interpreter entry for given name already exist in kernel list.
- * [ENOMEM]  Allocating memory in the kernel failed or, in the case of
- *           kern.binmisc.list, the user buffer is too small.
- * [ENOENT]  Interpreter entry for given name is not found.
- * [ENOSPC]  Attempted to exceed maximum number of entries (IBE_MAX_ENTRIES).
- */
-
-#endif /* !_IMGACT_BINMISC_H_ */
diff --git a/include.new/sys/imgact_elf.h b/include.new/sys/imgact_elf.h
deleted file mode 100644
index 5150b61..0000000
--- a/include.new/sys/imgact_elf.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 1995-1996 Søren Schmidt
- * 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
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/sys/imgact_elf.h 279211 2015-02-23 18:38:41Z jhb $
- */
-
-#ifndef _SYS_IMGACT_ELF_H_
-#define	_SYS_IMGACT_ELF_H_
-
-#include <machine/elf.h>
-
-#ifdef _KERNEL
-
-#define	AUXARGS_ENTRY(pos, id, val) {suword(pos++, id); suword(pos++, val);}
-
-struct thread;
-
-/*
- * Structure used to pass infomation from the loader to the
- * stack fixup routine.
- */
-typedef struct {
-	Elf_Ssize	execfd;
-	Elf_Size	phdr;
-	Elf_Size	phent;
-	Elf_Size	phnum;
-	Elf_Size	pagesz;
-	Elf_Size	base;
-	Elf_Size	flags;
-	Elf_Size	entry;
-} __ElfN(Auxargs);
-
-typedef struct {
-	Elf_Note	hdr;
-	const char *	vendor;
-	int		flags;
-	boolean_t	(*trans_osrel)(const Elf_Note *, int32_t *);
-#define	BN_CAN_FETCH_OSREL	0x0001	/* Deprecated. */
-#define	BN_TRANSLATE_OSREL	0x0002	/* Use trans_osrel to fetch osrel */
-		/* after checking the image ABI specification, if needed. */
-} Elf_Brandnote;
-
-typedef struct {
-	int brand;
-	int machine;
-	const char *compat_3_brand;	/* pre Binutils 2.10 method (FBSD 3) */
-	const char *emul_path;
-	const char *interp_path;
-	struct sysentvec *sysvec;
-	const char *interp_newpath;
-	int flags;
-	Elf_Brandnote *brand_note;
-#define	BI_CAN_EXEC_DYN		0x0001
-#define	BI_BRAND_NOTE		0x0002	/* May have note.ABI-tag section. */
-#define	BI_BRAND_NOTE_MANDATORY	0x0004	/* Must have note.ABI-tag section. */
-} __ElfN(Brandinfo);
-
-__ElfType(Auxargs);
-__ElfType(Brandinfo);
-
-#define	MAX_BRANDS	8
-
-int	__elfN(brand_inuse)(Elf_Brandinfo *entry);
-int	__elfN(insert_brand_entry)(Elf_Brandinfo *entry);
-int	__elfN(remove_brand_entry)(Elf_Brandinfo *entry);
-int	__elfN(freebsd_fixup)(register_t **, struct image_params *);
-int	__elfN(coredump)(struct thread *, struct vnode *, off_t, int);
-size_t	__elfN(populate_note)(int, void *, void *, size_t, void **);
-
-/* Machine specific function to dump per-thread information. */
-void	__elfN(dump_thread)(struct thread *, void *, size_t *);
-
-extern int __elfN(fallback_brand);
-extern Elf_Brandnote __elfN(freebsd_brandnote);
-extern Elf_Brandnote __elfN(kfreebsd_brandnote);
-#endif /* _KERNEL */
-
-#endif /* !_SYS_IMGACT_ELF_H_ */
diff --git a/include.new/sys/inflate.h b/include.new/sys/inflate.h
deleted file mode 100644
index 361356c..0000000
--- a/include.new/sys/inflate.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD: releng/10.2/sys/sys/inflate.h 139825 2005-01-07 02:29:27Z imp $
- *
- */
-#ifndef	_SYS_INFLATE_H_
-#define	_SYS_INFLATE_H_
-
-#if defined(_KERNEL) || defined(KZIP)
-
-#define GZ_EOF -1
-
-#define GZ_WSIZE 0x8000
-
-/*
- * Global variables used by inflate and friends.
- * This structure is used in order to make inflate() reentrant.
- */
-struct inflate {
-	/* Public part */
-
-	/* This pointer is passed along to the two functions below */
-	void           *gz_private;
-
-	/* Fetch next character to be uncompressed */
-	int             (*gz_input)(void *);
-
-	/* Dispose of uncompressed characters */
-	int             (*gz_output)(void *, u_char *, u_long);
-
-	/* Private part */
-	u_long          gz_bb;	/* bit buffer */
-	unsigned        gz_bk;	/* bits in bit buffer */
-	unsigned        gz_hufts;	/* track memory usage */
-	struct huft    *gz_fixed_tl;	/* must init to NULL !! */
-	struct huft    *gz_fixed_td;
-	int             gz_fixed_bl;
-	int             gz_fixed_bd;
-	u_char         *gz_slide;
-	unsigned        gz_wp;
-};
-
-int inflate(struct inflate *);
-
-#endif	/* _KERNEL || KZIP */
-
-#endif	/* ! _SYS_INFLATE_H_ */
diff --git a/include.new/sys/interrupt.h b/include.new/sys/interrupt.h
deleted file mode 100644
index 6f44fd2..0000000
--- a/include.new/sys/interrupt.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * Copyright (c) 1997, Stefan Esser <se@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/interrupt.h 224187 2011-07-18 15:19:40Z attilio $
- */
-
-#ifndef _SYS_INTERRUPT_H_
-#define _SYS_INTERRUPT_H_
-
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-
-struct intr_event;
-struct intr_thread;
-struct trapframe;
-
-/*
- * Describe a hardware interrupt handler.
- *
- * Multiple interrupt handlers for a specific event can be chained
- * together.
- */
-struct intr_handler {
-	driver_filter_t	*ih_filter;	/* Filter handler function. */
-	driver_intr_t	*ih_handler;	/* Threaded handler function. */
-	void		*ih_argument;	/* Argument to pass to handlers. */
-	int		 ih_flags;
-	char		 ih_name[MAXCOMLEN + 1]; /* Name of handler. */
-	struct intr_event *ih_event;	/* Event we are connected to. */
-	int		 ih_need;	/* Needs service. */
-	TAILQ_ENTRY(intr_handler) ih_next; /* Next handler for this event. */
-	u_char		 ih_pri;	/* Priority of this handler. */
-	struct intr_thread *ih_thread;	/* Ithread for filtered handler. */
-};
-
-/* Interrupt handle flags kept in ih_flags */
-#define	IH_EXCLUSIVE	0x00000002	/* Exclusive interrupt. */
-#define	IH_ENTROPY	0x00000004	/* Device is a good entropy source. */
-#define	IH_DEAD		0x00000008	/* Handler should be removed. */
-#define	IH_MPSAFE	0x80000000	/* Handler does not need Giant. */
-
-/*
- * Describe an interrupt event.  An event holds a list of handlers.
- * The 'pre_ithread', 'post_ithread', 'post_filter', and 'assign_cpu'
- * hooks are used to invoke MD code for certain operations.
- *
- * The 'pre_ithread' hook is called when an interrupt thread for
- * handlers without filters is scheduled.  It is responsible for
- * ensuring that 1) the system won't be swamped with an interrupt
- * storm from the associated source while the ithread runs and 2) the
- * current CPU is able to receive interrupts from other interrupt
- * sources.  The first is usually accomplished by disabling
- * level-triggered interrupts until the ithread completes.  The second
- * is accomplished on some platforms by acknowledging the interrupt
- * via an EOI.
- *
- * The 'post_ithread' hook is invoked when an ithread finishes.  It is
- * responsible for ensuring that the associated interrupt source will
- * trigger an interrupt when it is asserted in the future.  Usually
- * this is implemented by enabling a level-triggered interrupt that
- * was previously disabled via the 'pre_ithread' hook.
- *
- * The 'post_filter' hook is invoked when a filter handles an
- * interrupt.  It is responsible for ensuring that the current CPU is
- * able to receive interrupts again.  On some platforms this is done
- * by acknowledging the interrupts via an EOI.
- *
- * The 'assign_cpu' hook is used to bind an interrupt source to a
- * specific CPU.  If the interrupt cannot be bound, this function may
- * return an error.
- *
- * Note that device drivers may also use interrupt events to manage
- * multiplexing interrupt interrupt handler into handlers for child
- * devices.  In that case, the above hooks are not used.  The device
- * can create an event for its interrupt resource and register child
- * event handlers with that event.  It can then use
- * intr_event_execute_handlers() to execute non-filter handlers.
- * Currently filter handlers are not supported by this, but that can
- * be added by splitting out the filter loop from intr_event_handle()
- * if desired.
- */
-struct intr_event {
-	TAILQ_ENTRY(intr_event) ie_list;
-	TAILQ_HEAD(, intr_handler) ie_handlers; /* Interrupt handlers. */
-	char		ie_name[MAXCOMLEN + 1]; /* Individual event name. */
-	char		ie_fullname[MAXCOMLEN + 1];
-	struct mtx	ie_lock;
-	void		*ie_source;	/* Cookie used by MD code. */
-	struct intr_thread *ie_thread;	/* Thread we are connected to. */
-	void		(*ie_pre_ithread)(void *);
-	void		(*ie_post_ithread)(void *);
-	void		(*ie_post_filter)(void *);
-	int		(*ie_assign_cpu)(void *, u_char);
-	int		ie_flags;
-	int		ie_count;	/* Loop counter. */
-	int		ie_warncnt;	/* Rate-check interrupt storm warns. */
-	struct timeval	ie_warntm;
-	int		ie_irq;		/* Physical irq number if !SOFT. */
-	u_char		ie_cpu;		/* CPU this event is bound to. */
-};
-
-/* Interrupt event flags kept in ie_flags. */
-#define	IE_SOFT		0x000001	/* Software interrupt. */
-#define	IE_ENTROPY	0x000002	/* Interrupt is an entropy source. */
-#define	IE_ADDING_THREAD 0x000004	/* Currently building an ithread. */
-
-/* Flags to pass to sched_swi. */
-#define	SWI_DELAY	0x2
-
-/*
- * Software interrupt numbers in priority order.  The priority determines
- * the priority of the corresponding interrupt thread.
- */
-#define	SWI_TTY		0
-#define	SWI_NET		1
-#define	SWI_CAMBIO	2
-#define	SWI_VM		3
-#define	SWI_CLOCK	4
-#define	SWI_TQ_FAST	5
-#define	SWI_TQ		6
-#define	SWI_TQ_GIANT	6
-
-struct proc;
-
-extern struct	intr_event *tty_intr_event;
-extern struct	intr_event *clk_intr_event;
-extern void	*vm_ih;
-
-/* Counts and names for statistics (defined in MD code). */
-extern u_long 	intrcnt[];	/* counts for for each device and stray */
-extern char 	intrnames[];	/* string table containing device names */
-extern size_t	sintrcnt;	/* size of intrcnt table */
-extern size_t	sintrnames;	/* size of intrnames table */
-
-#ifdef DDB
-void	db_dump_intr_event(struct intr_event *ie, int handlers);
-#endif
-u_char	intr_priority(enum intr_type flags);
-int	intr_event_add_handler(struct intr_event *ie, const char *name,
-	    driver_filter_t filter, driver_intr_t handler, void *arg, 
-	    u_char pri, enum intr_type flags, void **cookiep);	    
-int	intr_event_bind(struct intr_event *ie, u_char cpu);
-int	intr_event_create(struct intr_event **event, void *source,
-	    int flags, int irq, void (*pre_ithread)(void *),
-	    void (*post_ithread)(void *), void (*post_filter)(void *),
-	    int (*assign_cpu)(void *, u_char), const char *fmt, ...)
-	    __printflike(9, 10);
-int	intr_event_describe_handler(struct intr_event *ie, void *cookie,
-	    const char *descr);
-int	intr_event_destroy(struct intr_event *ie);
-void	intr_event_execute_handlers(struct proc *p, struct intr_event *ie);
-int	intr_event_handle(struct intr_event *ie, struct trapframe *frame);
-int	intr_event_remove_handler(void *cookie);
-int	intr_getaffinity(int irq, void *mask);
-void	*intr_handler_source(void *cookie);
-int	intr_setaffinity(int irq, void *mask);
-void	_intr_drain(int irq);  /* Linux compat only. */
-int	swi_add(struct intr_event **eventp, const char *name,
-	    driver_intr_t handler, void *arg, int pri, enum intr_type flags,
-	    void **cookiep);
-void	swi_sched(void *cookie, int flags);
-int	swi_remove(void *cookie);
-
-#endif
diff --git a/include.new/sys/ioccom.h b/include.new/sys/ioccom.h
deleted file mode 100644
index 88bf7b5..0000000
--- a/include.new/sys/ioccom.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $FreeBSD: releng/10.2/sys/sys/ioccom.h 206051 2010-04-01 16:21:35Z pjd $
- */
-
-#ifndef	_SYS_IOCCOM_H_
-#define	_SYS_IOCCOM_H_
-
-/*
- * Ioctl's have the command encoded in the lower word, and the size of
- * any in or out parameters in the upper word.  The high 3 bits of the
- * upper word are used to encode the in/out status of the parameter.
- */
-#define	IOCPARM_SHIFT	13		/* number of bits for ioctl size */
-#define	IOCPARM_MASK	((1 << IOCPARM_SHIFT) - 1) /* parameter length mask */
-#define	IOCPARM_LEN(x)	(((x) >> 16) & IOCPARM_MASK)
-#define	IOCBASECMD(x)	((x) & ~(IOCPARM_MASK << 16))
-#define	IOCGROUP(x)	(((x) >> 8) & 0xff)
-
-#define	IOCPARM_MAX	(1 << IOCPARM_SHIFT) /* max size of ioctl */
-#define	IOC_VOID	0x20000000	/* no parameters */
-#define	IOC_OUT		0x40000000	/* copy out parameters */
-#define	IOC_IN		0x80000000	/* copy in parameters */
-#define	IOC_INOUT	(IOC_IN|IOC_OUT)
-#define	IOC_DIRMASK	(IOC_VOID|IOC_OUT|IOC_IN)
-
-#define	_IOC(inout,group,num,len)	((unsigned long) \
-	((inout) | (((len) & IOCPARM_MASK) << 16) | ((group) << 8) | (num)))
-#define	_IO(g,n)	_IOC(IOC_VOID,	(g), (n), 0)
-#define	_IOWINT(g,n)	_IOC(IOC_VOID,	(g), (n), sizeof(int))
-#define	_IOR(g,n,t)	_IOC(IOC_OUT,	(g), (n), sizeof(t))
-#define	_IOW(g,n,t)	_IOC(IOC_IN,	(g), (n), sizeof(t))
-/* this should be _IORW, but stdio got there first */
-#define	_IOWR(g,n,t)	_IOC(IOC_INOUT,	(g), (n), sizeof(t))
-
-#ifdef _KERNEL
-
-#if defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD5) || \
-    defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
-#define	IOCPARM_IVAL(x)	((int)(intptr_t)(void *)*(caddr_t *)(void *)(x))
-#endif
-
-#else
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	ioctl(int, unsigned long, ...);
-__END_DECLS
-
-#endif
-
-#endif /* !_SYS_IOCCOM_H_ */
diff --git a/include.new/sys/ioctl.h b/include.new/sys/ioctl.h
deleted file mode 100644
index a8a2f63..0000000
--- a/include.new/sys/ioctl.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)ioctl.h	8.6 (Berkeley) 3/28/94
- * $FreeBSD: releng/10.2/sys/sys/ioctl.h 191947 2009-05-09 19:01:24Z ed $
- */
-
-#ifndef	_SYS_IOCTL_H_
-#define	_SYS_IOCTL_H_
-
-#ifdef _KERNEL
-#error "Don't #include ioctl.h in the kernel.  Include xxxio.h instead."
-#endif /* _KERNEL */
-
-#include <sys/ioccom.h>
-
-#include <sys/filio.h>
-#include <sys/sockio.h>
-#include <sys/ttycom.h>
-
-#endif /* !_SYS_IOCTL_H_ */
diff --git a/include.new/sys/ioctl_compat.h b/include.new/sys/ioctl_compat.h
deleted file mode 100644
index f5d7654..0000000
--- a/include.new/sys/ioctl_compat.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)ioctl_compat.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/ioctl_compat.h 196884 2009-09-06 09:39:40Z ed $
- */
-
-#ifndef _SYS_IOCTL_COMPAT_H_
-#define	_SYS_IOCTL_COMPAT_H_
-
-#ifndef COMPAT_43TTY
-#error "Definitions not available without TTY ioctl compat."
-#endif
-
-struct tchars {
-	char	t_intrc;	/* interrupt */
-	char	t_quitc;	/* quit */
-	char	t_startc;	/* start output */
-	char	t_stopc;	/* stop output */
-	char	t_eofc;		/* end-of-file */
-	char	t_brkc;		/* input delimiter (like nl) */
-};
-
-struct ltchars {
-	char	t_suspc;	/* stop process signal */
-	char	t_dsuspc;	/* delayed stop process signal */
-	char	t_rprntc;	/* reprint line */
-	char	t_flushc;	/* flush output (toggles) */
-	char	t_werasc;	/* word erase */
-	char	t_lnextc;	/* literal next character */
-};
-
-/*
- * Structure for TIOCGETP and TIOCSETP ioctls.
- */
-struct sgttyb {
-	char	sg_ispeed;		/* input speed */
-	char	sg_ospeed;		/* output speed */
-	char	sg_erase;		/* erase character */
-	char	sg_kill;		/* kill character */
-	short	sg_flags;		/* mode flags */
-};
-
-#define	OTIOCGETD	_IOR('t', 0, int)	/* get line discipline */
-#define	OTIOCSETD	_IOW('t', 1, int)	/* set line discipline */
-#define	TIOCHPCL	 _IO('t', 2)		/* hang up on last close */
-#define	TIOCGETP	_IOR('t', 8, struct sgttyb) /* get parameters */
-#define	TIOCSETP	_IOW('t', 9, struct sgttyb) /* set parameters */
-#define	TIOCSETN	_IOW('t',10, struct sgttyb) /* as above, but no flush */
-#define	TIOCSETC	_IOW('t',17, struct tchars) /* set special characters */
-#define	TIOCGETC	_IOR('t',18, struct tchars) /* get special characters */
-#define		TANDEM		0x00000001	/* send stopc on out q full */
-#define		CBREAK		0x00000002	/* half-cooked mode */
-#define		LCASE		0x00000004	/* simulate lower case */
-#define		ECHO		0x00000008	/* echo input */
-#define		CRMOD		0x00000010	/* map \r to \r\n on output */
-#define		RAW		0x00000020	/* no i/o processing */
-#define		ODDP		0x00000040	/* get/send odd parity */
-#define		EVENP		0x00000080	/* get/send even parity */
-#define		ANYP		0x000000c0	/* get any parity/send none */
-#define		NLDELAY		0x00000300	/* \n delay */
-#define			NL0	0x00000000
-#define			NL1	0x00000100	/* tty 37 */
-#define			NL2	0x00000200	/* vt05 */
-#define			NL3	0x00000300
-#define		TBDELAY		0x00000c00	/* horizontal tab delay */
-#define			TAB0	0x00000000
-#define			TAB1	0x00000400	/* tty 37 */
-#define			TAB2	0x00000800
-#define		XTABS		0x00000c00	/* expand tabs on output */
-#define		CRDELAY		0x00003000	/* \r delay */
-#define			CR0	0x00000000
-#define			CR1	0x00001000	/* tn 300 */
-#define			CR2	0x00002000	/* tty 37 */
-#define			CR3	0x00003000	/* concept 100 */
-#define		VTDELAY		0x00004000	/* vertical tab delay */
-#define			FF0	0x00000000
-#define			FF1	0x00004000	/* tty 37 */
-#define		BSDELAY		0x00008000	/* \b delay */
-#define			BS0	0x00000000
-#define			BS1	0x00008000
-#define		ALLDELAY	(NLDELAY|TBDELAY|CRDELAY|VTDELAY|BSDELAY)
-#define		CRTBS		0x00010000	/* do backspacing for crt */
-#define		PRTERA		0x00020000	/* \ ... / erase */
-#define		CRTERA		0x00040000	/* " \b " to wipe out char */
-#define		TILDE		0x00080000	/* hazeltine tilde kludge */
-#define		MDMBUF		0x00100000	/*start/stop output on carrier*/
-#define		LITOUT		0x00200000	/* literal output */
-#define		TOSTOP		0x00400000	/*SIGSTOP on background output*/
-#define		FLUSHO		0x00800000	/* flush output to terminal */
-#define		NOHANG		0x01000000	/* (no-op) was no SIGHUP on carrier drop */
-#define		L001000		0x02000000
-#define		CRTKIL		0x04000000	/* kill line with " \b " */
-#define		PASS8		0x08000000
-#define		CTLECH		0x10000000	/* echo control chars as ^X */
-#define		PENDIN		0x20000000	/* tp->t_rawq needs reread */
-#define		DECCTQ		0x40000000	/* only ^Q starts after ^S */
-#define		NOFLSH		0x80000000	/* no output flush on signal */
-#define	OTIOCCONS	 _IO('t', 98)	/* for hp300 -- sans int arg */
-#define	TIOCGLTC	_IOR('t', 116,struct ltchars) /* get special chars */
-#define	TIOCSLTC	_IOW('t', 117,struct ltchars) /* set special chars */
-#define	TIOCLGET	_IOR('t', 124, int)	/* get local modes */
-#define		LCRTBS		(CRTBS>>16)
-#define		LPRTERA		(PRTERA>>16)
-#define		LCRTERA		(CRTERA>>16)
-#define		LTILDE		(TILDE>>16)
-#define		LMDMBUF		(MDMBUF>>16)
-#define		LLITOUT		(LITOUT>>16)
-#define		LTOSTOP		(TOSTOP>>16)
-#define		LFLUSHO		(FLUSHO>>16)
-#define		LNOHANG		(NOHANG>>16)
-#define		LCRTKIL		(CRTKIL>>16)
-#define		LPASS8		(PASS8>>16)
-#define		LCTLECH		(CTLECH>>16)
-#define		LPENDIN		(PENDIN>>16)
-#define		LDECCTQ		(DECCTQ>>16)
-#define		LNOFLSH		(NOFLSH>>16)
-#define	TIOCLSET	_IOW('t', 125, int)	/* set entire local mode word */
-#define	TIOCLBIC	_IOW('t', 126, int)	/* bic local mode bits */
-#define	TIOCLBIS	_IOW('t', 127, int)	/* bis local mode bits */
-
-#endif /* !_SYS_IOCTL_COMPAT_H_ */
diff --git a/include.new/sys/ipc.h b/include.new/sys/ipc.h
deleted file mode 100644
index 44692a8..0000000
--- a/include.new/sys/ipc.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * 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.
- * 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.
- *
- *	@(#)ipc.h	8.4 (Berkeley) 2/19/95
- * $FreeBSD: releng/10.2/sys/sys/ipc.h 241837 2012-10-22 02:59:55Z eadler $
- */
-
-/*
- * SVID compatible ipc.h file
- */
-#ifndef _SYS_IPC_H_
-#define _SYS_IPC_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _KEY_T_DECLARED
-typedef	__key_t		key_t;
-#define	_KEY_T_DECLARED
-#endif
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _UID_T_DECLARED
-typedef	__uid_t		uid_t;
-#define	_UID_T_DECLARED
-#endif
-
-#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
-    defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) || \
-    defined(COMPAT_43)
-struct ipc_perm_old {
-	unsigned short	cuid;	/* creator user id */
-	unsigned short	cgid;	/* creator group id */
-	unsigned short	uid;	/* user id */
-	unsigned short	gid;	/* group id */
-	unsigned short	mode;	/* r/w permission */
-	unsigned short	seq;	/* sequence # (to generate unique ipcid) */
-	key_t		key;	/* user specified msg/sem/shm key */
-};
-#endif
-
-struct ipc_perm {
-	uid_t		cuid;	/* creator user id */
-	gid_t		cgid;	/* creator group id */
-	uid_t		uid;	/* user id */
-	gid_t		gid;	/* group id */
-	mode_t		mode;	/* r/w permission */
-	unsigned short	seq;	/* sequence # (to generate unique ipcid) */
-	key_t		key;	/* user specified msg/sem/shm key */
-};
-
-#if __BSD_VISIBLE
-/* common mode bits */
-#define	IPC_R		000400	/* read permission */
-#define	IPC_W		000200	/* write/alter permission */
-#define	IPC_M		010000	/* permission to change control info */
-#endif
-
-/* SVID required constants (same values as system 5) */
-#define	IPC_CREAT	001000	/* create entry if key does not exist */
-#define	IPC_EXCL	002000	/* fail if key exists */
-#define	IPC_NOWAIT	004000	/* error if request must wait */
-
-#define	IPC_PRIVATE	(key_t)0 /* private key */
-
-#define	IPC_RMID	0	/* remove identifier */
-#define	IPC_SET		1	/* set options */
-#define	IPC_STAT	2	/* get options */
-#if __BSD_VISIBLE
-/*
- * For Linux compatability.
- */
-#define	IPC_INFO	3	/* get info */
-#endif
-
-#ifdef _KERNEL
-/* Macros to convert between ipc ids and array indices or sequence ids */
-#define	IPCID_TO_IX(id)		((id) & 0xffff)
-#define	IPCID_TO_SEQ(id)	(((id) >> 16) & 0xffff)
-#define	IXSEQ_TO_IPCID(ix,perm)	(((perm.seq) << 16) | (ix & 0xffff))
-
-struct thread;
-struct proc;
-struct vmspace;
-
-#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
-    defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
-void	ipcperm_old2new(struct ipc_perm_old *, struct ipc_perm *);
-void	ipcperm_new2old(struct ipc_perm *, struct ipc_perm_old *);
-#endif
-
-int	ipcperm(struct thread *, struct ipc_perm *, int);
-extern void (*shmfork_hook)(struct proc *, struct proc *);
-extern void (*shmexit_hook)(struct vmspace *);
-
-#else /* ! _KERNEL */
-
-__BEGIN_DECLS
-key_t	ftok(const char *, int);
-__END_DECLS
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_IPC_H_ */
diff --git a/include.new/sys/ipmi.h b/include.new/sys/ipmi.h
deleted file mode 100644
index a28c990..0000000
--- a/include.new/sys/ipmi.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright (c) 2006 IronPort Systems Inc. <ambrisko@ironport.com>
- * 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.
- *
- * 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: releng/10.2/sys/sys/ipmi.h 162562 2006-09-22 22:11:29Z jhb $
- */
-
-#ifndef __SYS_IPMI_H__
-#define	__SYS_IPMI_H__
-
-#define IPMI_MAX_ADDR_SIZE		0x20
-#define IPMI_MAX_RX			1024
-#define IPMI_BMC_SLAVE_ADDR		0x20 /* Linux Default slave address */
-#define IPMI_BMC_CHANNEL		0x0f /* Linux BMC channel */
-
-#define IPMI_BMC_SMS_LUN		0x02
-
-#define IPMI_SYSTEM_INTERFACE_ADDR_TYPE	0x0c
-#define IPMI_IPMB_ADDR_TYPE		0x01
-#define IPMI_IPMB_BROADCAST_ADDR_TYPE	0x41
-
-#define IPMI_IOC_MAGIC			'i'
-#define IPMICTL_RECEIVE_MSG_TRUNC	_IOWR(IPMI_IOC_MAGIC, 11, struct ipmi_recv)
-#define IPMICTL_RECEIVE_MSG		_IOWR(IPMI_IOC_MAGIC, 12, struct ipmi_recv)
-#define IPMICTL_SEND_COMMAND		_IOW(IPMI_IOC_MAGIC, 13, struct ipmi_req)
-#define IPMICTL_REGISTER_FOR_CMD	_IOW(IPMI_IOC_MAGIC, 14, struct ipmi_cmdspec)
-#define IPMICTL_UNREGISTER_FOR_CMD	_IOW(IPMI_IOC_MAGIC, 15, struct ipmi_cmdspec)
-#define IPMICTL_SET_GETS_EVENTS_CMD	_IOW(IPMI_IOC_MAGIC, 16, int)
-#define IPMICTL_SET_MY_ADDRESS_CMD	_IOW(IPMI_IOC_MAGIC, 17, unsigned int)
-#define IPMICTL_GET_MY_ADDRESS_CMD	_IOR(IPMI_IOC_MAGIC, 18, unsigned int)
-#define IPMICTL_SET_MY_LUN_CMD		_IOW(IPMI_IOC_MAGIC, 19, unsigned int)
-#define IPMICTL_GET_MY_LUN_CMD		_IOR(IPMI_IOC_MAGIC, 20, unsigned int)
-
-#define IPMI_RESPONSE_RECV_TYPE         1
-#define IPMI_ASYNC_EVENT_RECV_TYPE      2
-#define IPMI_CMD_RECV_TYPE              3
-
-#define IPMI_APP_REQUEST		0x06
-#define IPMI_GET_DEVICE_ID		0x01
-#define IPMI_CLEAR_FLAGS		0x30
-#define IPMI_GET_MSG_FLAGS		0x31
-# define IPMI_MSG_AVAILABLE		0x01
-# define IPMI_MSG_BUFFER_FULL		0x02
-# define IPMI_WDT_PRE_TIMEOUT		0x08
-#define IPMI_GET_MSG			0x33
-#define IPMI_SEND_MSG			0x34
-#define IPMI_GET_CHANNEL_INFO		0x42
-#define IPMI_RESET_WDOG			0x22
-#define IPMI_SET_WDOG			0x24
-#define IPMI_GET_WDOG			0x25
-
-#define IPMI_SET_WD_TIMER_SMS_OS	0x04
-#define IPMI_SET_WD_TIMER_DONT_STOP	0x40
-#define IPMI_SET_WD_ACTION_RESET	0x01
-
-struct ipmi_msg {
-	unsigned char	netfn;
-        unsigned char	cmd;
-        unsigned short	data_len;
-        unsigned char	*data;
-};
-
-struct ipmi_req {
-	unsigned char	*addr;
-	unsigned int	addr_len;
-	long		msgid;
-	struct ipmi_msg	msg;
-};
-
-struct ipmi_recv {
-	int		recv_type;
-	unsigned char	*addr;
-	unsigned int	addr_len;
-	long		msgid;
-	struct ipmi_msg	msg;
-};
-
-struct ipmi_cmdspec {
-	unsigned char	netfn;
-	unsigned char	cmd;
-};
-
-
-struct ipmi_addr {
-	int		addr_type;
-	short		channel;
-	unsigned char	data[IPMI_MAX_ADDR_SIZE];
-};
-
-struct ipmi_system_interface_addr {
-	int		addr_type;
-	short		channel;
-	unsigned char	lun;
-};
-
-struct ipmi_ipmb_addr {
-	int		addr_type;
-	short		channel;
-	unsigned char	slave_addr;
-	unsigned char	lun;
-};
-
-#if defined(__amd64__)
-/* Compatiblity with 32-bit binaries. */
-
-#define IPMICTL_RECEIVE_MSG_TRUNC_32	_IOWR(IPMI_IOC_MAGIC, 11, struct ipmi_recv32)
-#define IPMICTL_RECEIVE_MSG_32		_IOWR(IPMI_IOC_MAGIC, 12, struct ipmi_recv32)
-#define IPMICTL_SEND_COMMAND_32		_IOW(IPMI_IOC_MAGIC, 13, struct ipmi_req32)
-
-struct ipmi_msg32 {
-	unsigned char	netfn;
-        unsigned char	cmd;
-        unsigned short	data_len;
-	uint32_t	data;
-};
-
-struct ipmi_req32 {
-	uint32_t	addr;
-	unsigned int	addr_len;
-	int32_t		msgid;
-	struct ipmi_msg32 msg;
-};
-
-struct ipmi_recv32 {
-	int		recv_type;
-	uint32_t	addr;
-	unsigned int	addr_len;
-	int32_t		msgid;
-	struct ipmi_msg32 msg;
-};
-
-#endif
-
-#endif	/* !__SYS_IPMI_H__ */
diff --git a/include.new/sys/jail.h b/include.new/sys/jail.h
deleted file mode 100644
index f4f1e9f..0000000
--- a/include.new/sys/jail.h
+++ /dev/null
@@ -1,414 +0,0 @@
-/*-
- * Copyright (c) 1999 Poul-Henning Kamp.
- * Copyright (c) 2009 James Gritton.
- * 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.
- *
- * 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: releng/10.2/sys/sys/jail.h 280632 2015-03-25 20:57:54Z ian $
- */
-
-#ifndef _SYS_JAIL_H_
-#define _SYS_JAIL_H_
-
-#ifdef _KERNEL
-struct jail_v0 {
-	uint32_t	version;
-	char		*path;
-	char		*hostname;
-	uint32_t	ip_number;
-};
-#endif
-
-struct jail {
-	uint32_t	version;
-	char		*path;
-	char		*hostname;
-	char		*jailname;
-	uint32_t	ip4s;
-	uint32_t	ip6s;
-	struct in_addr	*ip4;
-	struct in6_addr	*ip6;
-};
-#define	JAIL_API_VERSION	2
-
-/*
- * For all xprison structs, always keep the pr_version an int and
- * the first variable so userspace can easily distinguish them.
- */
-#ifndef _KERNEL
-struct xprison_v1 {
-	int		 pr_version;
-	int		 pr_id;
-	char		 pr_path[MAXPATHLEN];
-	char		 pr_host[MAXHOSTNAMELEN];
-	uint32_t	 pr_ip;
-};
-#endif
-
-struct xprison {
-	int		 pr_version;
-	int		 pr_id;
-	int		 pr_state;
-	cpusetid_t	 pr_cpusetid;
-	char		 pr_path[MAXPATHLEN];
-	char		 pr_host[MAXHOSTNAMELEN];
-	char		 pr_name[MAXHOSTNAMELEN];
-	uint32_t	 pr_ip4s;
-	uint32_t	 pr_ip6s;
-#if 0
-	/*
-	 * sizeof(xprison) will be malloced + size needed for all
-	 * IPv4 and IPv6 addesses. Offsets are based numbers of addresses.
-	 */
-	struct in_addr	 pr_ip4[];
-	struct in6_addr	 pr_ip6[];
-#endif
-};
-#define	XPRISON_VERSION		3
-
-#define	PRISON_STATE_INVALID	0
-#define	PRISON_STATE_ALIVE	1
-#define	PRISON_STATE_DYING	2
-
-/*
- * Flags for jail_set and jail_get.
- */
-#define	JAIL_CREATE	0x01	/* Create jail if it doesn't exist */
-#define	JAIL_UPDATE	0x02	/* Update parameters of existing jail */
-#define	JAIL_ATTACH	0x04	/* Attach to jail upon creation */
-#define	JAIL_DYING	0x08	/* Allow getting a dying jail */
-#define	JAIL_SET_MASK	0x0f
-#define	JAIL_GET_MASK	0x08
-
-#define	JAIL_SYS_DISABLE	0
-#define	JAIL_SYS_NEW		1
-#define	JAIL_SYS_INHERIT	2
-
-#ifndef _KERNEL
-
-struct iovec;
-
-int jail(struct jail *);
-int jail_set(struct iovec *, unsigned int, int);
-int jail_get(struct iovec *, unsigned int, int);
-int jail_attach(int);
-int jail_remove(int);
-
-#else /* _KERNEL */
-
-#include <sys/queue.h>
-#include <sys/sysctl.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/_task.h>
-
-#define JAIL_MAX	999999
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_PRISON);
-#endif
-#endif /* _KERNEL */
-
-#if defined(_KERNEL) || defined(_WANT_PRISON)
-
-#include <sys/osd.h>
-
-#define	HOSTUUIDLEN	64
-#define	OSRELEASELEN	32
-
-struct racct;
-struct prison_racct;
-
-/*
- * This structure describes a prison.  It is pointed to by all struct
- * ucreds's of the inmates.  pr_ref keeps track of them and is used to
- * delete the struture when the last inmate is dead.
- *
- * Lock key:
- *   (a) allprison_lock
- *   (p) locked by pr_mtx
- *   (c) set only during creation before the structure is shared, no mutex
- *       required to read
- *   (d) set only during destruction of jail, no mutex needed
- */
-struct prison {
-	TAILQ_ENTRY(prison) pr_list;			/* (a) all prisons */
-	int		 pr_id;				/* (c) prison id */
-	int		 pr_ref;			/* (p) refcount */
-	int		 pr_uref;			/* (p) user (alive) refcount */
-	unsigned	 pr_flags;			/* (p) PR_* flags */
-	LIST_HEAD(, prison) pr_children;		/* (a) list of child jails */
-	LIST_ENTRY(prison) pr_sibling;			/* (a) next in parent's list */
-	struct prison	*pr_parent;			/* (c) containing jail */
-	struct mtx	 pr_mtx;
-	struct task	 pr_task;			/* (d) destroy task */
-	struct osd	 pr_osd;			/* (p) additional data */
-	struct cpuset	*pr_cpuset;			/* (p) cpuset */
-	struct vnet	*pr_vnet;			/* (c) network stack */
-	struct vnode	*pr_root;			/* (c) vnode to rdir */
-	int		 pr_ip4s;			/* (p) number of v4 IPs */
-	int		 pr_ip6s;			/* (p) number of v6 IPs */
-	struct in_addr	*pr_ip4;			/* (p) v4 IPs of jail */
-	struct in6_addr	*pr_ip6;			/* (p) v6 IPs of jail */
-	struct prison_racct *pr_prison_racct;		/* (c) racct jail proxy */
-	void		*pr_sparep[3];
-	int		 pr_childcount;			/* (a) number of child jails */
-	int		 pr_childmax;			/* (p) maximum child jails */
-	unsigned	 pr_allow;			/* (p) PR_ALLOW_* flags */
-	int		 pr_securelevel;		/* (p) securelevel */
-	int		 pr_enforce_statfs;		/* (p) statfs permission */
-	int		 pr_devfs_rsnum;		/* (p) devfs ruleset */
-	int		 pr_spare[3];
-	int		 pr_osreldate;			/* (c) kern.osreldate value */
-	unsigned long	 pr_hostid;			/* (p) jail hostid */
-	char		 pr_name[MAXHOSTNAMELEN];	/* (p) admin jail name */
-	char		 pr_path[MAXPATHLEN];		/* (c) chroot path */
-	char		 pr_hostname[MAXHOSTNAMELEN];	/* (p) jail hostname */
-	char		 pr_domainname[MAXHOSTNAMELEN];	/* (p) jail domainname */
-	char		 pr_hostuuid[HOSTUUIDLEN];	/* (p) jail hostuuid */
-	char		 pr_osrelease[OSRELEASELEN];	/* (c) kern.osrelease value */
-};
-
-struct prison_racct {
-	LIST_ENTRY(prison_racct) prr_next;
-	char		prr_name[MAXHOSTNAMELEN];
-	u_int		prr_refcount;
-	struct racct	*prr_racct;
-};
-#endif /* _KERNEL || _WANT_PRISON */
-
-#ifdef _KERNEL
-/* Flag bits set via options */
-#define	PR_PERSIST	0x00000001	/* Can exist without processes */
-#define	PR_HOST		0x00000002	/* Virtualize hostname et al */
-#define	PR_IP4_USER	0x00000004	/* Restrict IPv4 addresses */
-#define	PR_IP6_USER	0x00000008	/* Restrict IPv6 addresses */
-#define	PR_VNET		0x00000010	/* Virtual network stack */
-#define	PR_IP4_DISABLE	0x00000020	/* Disable IPv4 */
-#define	PR_IP6_DISABLE	0x00000040	/* Disable IPv6 */
-#define	PR_IP4_SADDRSEL	0x00000080	/* Do IPv4 src addr sel. or use the */
-					/* primary jail address. */
-#define	PR_IP6_SADDRSEL	0x00000100	/* Do IPv6 src addr sel. or use the */
-					/* primary jail address. */
-
-/* Internal flag bits */
-#define	PR_REMOVE	0x01000000	/* In process of being removed */
-#define	PR_IP4		0x02000000	/* IPv4 restricted or disabled */
-					/* by this jail or an ancestor */
-#define	PR_IP6		0x04000000	/* IPv6 restricted or disabled */
-					/* by this jail or an ancestor */
-
-/* Flags for pr_allow */
-#define	PR_ALLOW_SET_HOSTNAME		0x0001
-#define	PR_ALLOW_SYSVIPC		0x0002
-#define	PR_ALLOW_RAW_SOCKETS		0x0004
-#define	PR_ALLOW_CHFLAGS		0x0008
-#define	PR_ALLOW_MOUNT			0x0010
-#define	PR_ALLOW_QUOTAS			0x0020
-#define	PR_ALLOW_SOCKET_AF		0x0040
-#define	PR_ALLOW_MOUNT_DEVFS		0x0080
-#define	PR_ALLOW_MOUNT_NULLFS		0x0100
-#define	PR_ALLOW_MOUNT_ZFS		0x0200
-#define	PR_ALLOW_MOUNT_PROCFS		0x0400
-#define	PR_ALLOW_MOUNT_TMPFS		0x0800
-#define	PR_ALLOW_MOUNT_FDESCFS		0x1000
-#define	PR_ALLOW_ALL			0x1fff
-
-/*
- * OSD methods
- */
-#define	PR_METHOD_CREATE	0
-#define	PR_METHOD_GET		1
-#define	PR_METHOD_SET		2
-#define	PR_METHOD_CHECK		3
-#define	PR_METHOD_ATTACH	4
-#define	PR_MAXMETHOD		5
-
-/*
- * Lock/unlock a prison.
- * XXX These exist not so much for general convenience, but to be useable in
- *     the FOREACH_PRISON_DESCENDANT_LOCKED macro which can't handle them in
- *     non-function form as currently defined.
- */
-static __inline void
-prison_lock(struct prison *pr)
-{
-
-	mtx_lock(&pr->pr_mtx);
-}
-
-static __inline void
-prison_unlock(struct prison *pr)
-{
-
-	mtx_unlock(&pr->pr_mtx);
-}
-
-/* Traverse a prison's immediate children. */
-#define	FOREACH_PRISON_CHILD(ppr, cpr)					\
-	LIST_FOREACH(cpr, &(ppr)->pr_children, pr_sibling)
-
-/*
- * Preorder traversal of all of a prison's descendants.
- * This ugly loop allows the macro to be followed by a single block
- * as expected in a looping primitive.
- */
-#define	FOREACH_PRISON_DESCENDANT(ppr, cpr, descend)			\
-	for ((cpr) = (ppr), (descend) = 1;				\
-	    ((cpr) = (((descend) && !LIST_EMPTY(&(cpr)->pr_children))	\
-	      ? LIST_FIRST(&(cpr)->pr_children)				\
-	      : ((cpr) == (ppr)						\
-		 ? NULL							\
-		 : (((descend) = LIST_NEXT(cpr, pr_sibling) != NULL)	\
-		    ? LIST_NEXT(cpr, pr_sibling)			\
-		    : (cpr)->pr_parent))));)				\
-		if (!(descend))						\
-			;						\
-		else
-
-/*
- * As above, but lock descendants on the way down and unlock on the way up.
- */
-#define	FOREACH_PRISON_DESCENDANT_LOCKED(ppr, cpr, descend)		\
-	for ((cpr) = (ppr), (descend) = 1;				\
-	    ((cpr) = (((descend) && !LIST_EMPTY(&(cpr)->pr_children))	\
-	      ? LIST_FIRST(&(cpr)->pr_children)				\
-	      : ((cpr) == (ppr)						\
-		 ? NULL							\
-		 : ((prison_unlock(cpr),				\
-		    (descend) = LIST_NEXT(cpr, pr_sibling) != NULL)	\
-		    ? LIST_NEXT(cpr, pr_sibling)			\
-		    : (cpr)->pr_parent))));)				\
-		if ((descend) ? (prison_lock(cpr), 0) : 1)		\
-			;						\
-		else
-
-/*
- * As above, but also keep track of the level descended to.
- */
-#define	FOREACH_PRISON_DESCENDANT_LOCKED_LEVEL(ppr, cpr, descend, level)\
-	for ((cpr) = (ppr), (descend) = 1, (level) = 0;			\
-	    ((cpr) = (((descend) && !LIST_EMPTY(&(cpr)->pr_children))	\
-	      ? (level++, LIST_FIRST(&(cpr)->pr_children))		\
-	      : ((cpr) == (ppr)						\
-		 ? NULL							\
-		 : ((prison_unlock(cpr),				\
-		    (descend) = LIST_NEXT(cpr, pr_sibling) != NULL)	\
-		    ? LIST_NEXT(cpr, pr_sibling)			\
-		    : (level--, (cpr)->pr_parent)))));)			\
-		if ((descend) ? (prison_lock(cpr), 0) : 1)		\
-			;						\
-		else
-
-/*
- * Attributes of the physical system, and the root of the jail tree.
- */
-extern struct	prison prison0;
-
-TAILQ_HEAD(prisonlist, prison);
-extern struct	prisonlist allprison;
-extern struct	sx allprison_lock;
-
-/*
- * Sysctls to describe jail parameters.
- */
-SYSCTL_DECL(_security_jail_param);
-
-#define	SYSCTL_JAIL_PARAM(module, param, type, fmt, descr)		\
-    SYSCTL_PROC(_security_jail_param ## module, OID_AUTO, param,	\
-	(type) | CTLFLAG_MPSAFE, NULL, 0, sysctl_jail_param, fmt, descr)
-#define	SYSCTL_JAIL_PARAM_STRING(module, param, access, len, descr)	\
-    SYSCTL_PROC(_security_jail_param ## module, OID_AUTO, param,	\
-	CTLTYPE_STRING | CTLFLAG_MPSAFE | (access), NULL, len,		\
-	sysctl_jail_param, "A", descr)
-#define	SYSCTL_JAIL_PARAM_STRUCT(module, param, access, len, fmt, descr)\
-    SYSCTL_PROC(_security_jail_param ## module, OID_AUTO, param,	\
-	CTLTYPE_STRUCT | CTLFLAG_MPSAFE | (access), NULL, len,		\
-	sysctl_jail_param, fmt, descr)
-#define	SYSCTL_JAIL_PARAM_NODE(module, descr)				\
-    SYSCTL_NODE(_security_jail_param, OID_AUTO, module, 0, 0, descr)
-#define	SYSCTL_JAIL_PARAM_SUBNODE(parent, module, descr)		\
-    SYSCTL_NODE(_security_jail_param_##parent, OID_AUTO, module, 0, 0, descr)
-#define	SYSCTL_JAIL_PARAM_SYS_NODE(module, access, descr)		\
-    SYSCTL_JAIL_PARAM_NODE(module, descr);				\
-    SYSCTL_JAIL_PARAM(_##module, , CTLTYPE_INT | (access), "E,jailsys",	\
-	descr)
-
-/*
- * Kernel support functions for jail().
- */
-struct ucred;
-struct mount;
-struct sockaddr;
-struct statfs;
-int jailed(struct ucred *cred);
-int jailed_without_vnet(struct ucred *);
-void getcredhostname(struct ucred *, char *, size_t);
-void getcreddomainname(struct ucred *, char *, size_t);
-void getcredhostuuid(struct ucred *, char *, size_t);
-void getcredhostid(struct ucred *, unsigned long *);
-void prison0_init(void);
-int prison_allow(struct ucred *, unsigned);
-int prison_check(struct ucred *cred1, struct ucred *cred2);
-int prison_owns_vnet(struct ucred *);
-int prison_canseemount(struct ucred *cred, struct mount *mp);
-void prison_enforce_statfs(struct ucred *cred, struct mount *mp,
-    struct statfs *sp);
-struct prison *prison_find(int prid);
-struct prison *prison_find_child(struct prison *, int);
-struct prison *prison_find_name(struct prison *, const char *);
-int prison_flag(struct ucred *, unsigned);
-void prison_free(struct prison *pr);
-void prison_free_locked(struct prison *pr);
-void prison_hold(struct prison *pr);
-void prison_hold_locked(struct prison *pr);
-void prison_proc_hold(struct prison *);
-void prison_proc_free(struct prison *);
-int prison_ischild(struct prison *, struct prison *);
-int prison_equal_ip4(struct prison *, struct prison *);
-int prison_get_ip4(struct ucred *cred, struct in_addr *ia);
-int prison_local_ip4(struct ucred *cred, struct in_addr *ia);
-int prison_remote_ip4(struct ucred *cred, struct in_addr *ia);
-int prison_check_ip4(struct ucred *cred, struct in_addr *ia);
-int prison_saddrsel_ip4(struct ucred *, struct in_addr *);
-#ifdef INET6
-int prison_equal_ip6(struct prison *, struct prison *);
-int prison_get_ip6(struct ucred *, struct in6_addr *);
-int prison_local_ip6(struct ucred *, struct in6_addr *, int);
-int prison_remote_ip6(struct ucred *, struct in6_addr *);
-int prison_check_ip6(struct ucred *, struct in6_addr *);
-int prison_saddrsel_ip6(struct ucred *, struct in6_addr *);
-#endif
-int prison_check_af(struct ucred *cred, int af);
-int prison_if(struct ucred *cred, struct sockaddr *sa);
-char *prison_name(struct prison *, struct prison *);
-int prison_priv_check(struct ucred *cred, int priv);
-int sysctl_jail_param(SYSCTL_HANDLER_ARGS);
-void prison_racct_foreach(void (*callback)(struct racct *racct,
-    void *arg2, void *arg3), void *arg2, void *arg3);
-struct prison_racct *prison_racct_find(const char *name);
-void prison_racct_hold(struct prison_racct *prr);
-void prison_racct_free(struct prison_racct *prr);
-
-#endif /* _KERNEL */
-#endif /* !_SYS_JAIL_H_ */
diff --git a/include.new/sys/joystick.h b/include.new/sys/joystick.h
deleted file mode 100644
index 63a8e7e..0000000
--- a/include.new/sys/joystick.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1995 Jean-Marc Zucconi
- * 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
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/sys/joystick.h 139866 2005-01-07 19:31:43Z keramida $
- */
-
-#ifndef	_SYS_JOYSTICK_H_
-#define	_SYS_JOYSTICK_H_
-
-#include <sys/ioccom.h>
-
-struct joystick {
-    int x;
-    int y;
-    int b1;
-    int b2;
-};
-
-#define JOY_SETTIMEOUT    _IOW('J', 1, int)    /* set timeout */
-#define JOY_GETTIMEOUT    _IOR('J', 2, int)    /* get timeout */
-#define JOY_SET_X_OFFSET  _IOW('J', 3, int)    /* set offset on X-axis */
-#define JOY_SET_Y_OFFSET  _IOW('J', 4, int)    /* set offset on Y-axis */
-#define JOY_GET_X_OFFSET  _IOR('J', 5, int)    /* get offset on X-axis */
-#define JOY_GET_Y_OFFSET  _IOR('J', 6, int)    /* get offset on Y-axis */
-
-#endif /* !_SYS_JOYSTICK_H_ */
diff --git a/include.new/sys/kbio.h b/include.new/sys/kbio.h
deleted file mode 100644
index f70dedf..0000000
--- a/include.new/sys/kbio.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*-
- * $FreeBSD: releng/10.2/sys/sys/kbio.h 224126 2011-07-17 08:19:19Z ed $
- */
-
-#ifndef	_SYS_KBIO_H_
-#define	_SYS_KBIO_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/* get/set keyboard I/O mode */
-#define K_RAW		0		/* keyboard returns scancodes	*/
-#define K_XLATE		1		/* keyboard returns ascii 	*/
-#define K_CODE		2		/* keyboard returns keycodes 	*/
-#define KDGKBMODE 	_IOR('K', 6, int)
-#define KDSKBMODE 	_IOWINT('K', 7)
-
-/* make tone */
-#define KDMKTONE	_IOWINT('K', 8)
-
-/* see console.h for the definitions of the following ioctls */
-#ifdef notdef
-#define KDGETMODE	_IOR('K', 9, int)
-#define KDSETMODE	_IOWINT('K', 10)
-#define KDSBORDER	_IOWINT('K', 13)
-#endif
-
-/* get/set keyboard lock state */
-#define CLKED		1		/* Caps locked			*/
-#define NLKED		2		/* Num locked			*/
-#define SLKED		4		/* Scroll locked		*/
-#define ALKED		8		/* AltGr locked			*/
-#define LOCK_MASK	(CLKED | NLKED | SLKED | ALKED)
-#define KDGKBSTATE	_IOR('K', 19, int)
-#define KDSKBSTATE	_IOWINT('K', 20)
-
-/* enable/disable I/O access */
-#define KDENABIO	_IO('K', 60)
-#define KDDISABIO	_IO('K', 61)
-
-/* make sound */
-#define KIOCSOUND	_IOWINT('K', 63)
-
-/* get keyboard model */
-#define KB_OTHER	0		/* keyboard not known 		*/
-#define KB_84		1		/* 'old' 84 key AT-keyboard	*/
-#define KB_101		2		/* MF-101 or MF-102 keyboard	*/
-#define KDGKBTYPE	_IOR('K', 64, int)
-
-/* get/set keyboard LED state */
-#define LED_CAP		1		/* Caps lock LED 		*/
-#define LED_NUM		2		/* Num lock LED 		*/
-#define LED_SCR		4		/* Scroll lock LED 		*/
-#define LED_MASK	(LED_CAP | LED_NUM | LED_SCR)
-#define KDGETLED	_IOR('K', 65, int)
-#define KDSETLED	_IOWINT('K', 66)
-
-/* set keyboard repeat rate (obsolete, use KDSETREPEAT below) */
-#define KDSETRAD	_IOWINT('K', 67)
-
-struct keyboard_info {
-	int		kb_index;	/* kbdio index#			*/
-	char		kb_name[16];	/* driver name			*/
-	int		kb_unit;	/* unit#			*/
-	int		kb_type;	/* KB_84, KB_101, KB_OTHER,...	*/
-	int		kb_config;	/* device configuration flags	*/
-	int		kb_flags;	/* internal flags		*/
-};
-typedef struct keyboard_info keyboard_info_t;
-
-/* add/remove keyboard to/from mux */
-#define KBADDKBD	_IOW('K', 68, keyboard_info_t)	/* add keyboard */
-#define KBRELKBD	_IOW('K', 69, keyboard_info_t)	/* release keyboard */
-
-/* see console.h for the definition of the following ioctl */
-#ifdef notdef
-#define KDRASTER	_IOW('K', 100, scr_size_t)
-#endif
-
-/* get keyboard information */
-#define KDGKBINFO	_IOR('K', 101, keyboard_info_t)
-
-/* set/get keyboard repeat rate (new interface) */
-struct keyboard_repeat {
-	int		kb_repeat[2];
-};
-typedef struct keyboard_repeat keyboard_repeat_t;
-#define KDSETREPEAT	_IOW('K', 102, keyboard_repeat_t)
-#define KDGETREPEAT	_IOR('K', 103, keyboard_repeat_t)
-
-/* get/set key map/accent map/function key strings */
-
-#define NUM_KEYS	256		/* number of keys in table	*/
-#define NUM_STATES	8		/* states per key		*/
-#define ALTGR_OFFSET	128		/* offset for altlock keys	*/
-
-#define NUM_DEADKEYS	15		/* number of accent keys	*/
-#define NUM_ACCENTCHARS	52		/* max number of accent chars	*/
-
-#define NUM_FKEYS	96		/* max number of function keys	*/
-#define MAXFK		16		/* max length of a function key str */
-
-#ifndef _KEYMAP_DECLARED
-#define	_KEYMAP_DECLARED
-
-struct keyent_t {
-	u_int		map[NUM_STATES];
-	u_char		spcl;
-	u_char		flgs;
-#define	FLAG_LOCK_O	0
-#define	FLAG_LOCK_C	1
-#define FLAG_LOCK_N	2
-};
-
-struct keymap {
-	u_short		n_keys;
-	struct keyent_t	key[NUM_KEYS];
-};
-typedef struct keymap keymap_t;
-
-#ifdef _KERNEL
-struct okeyent_t {
-	u_char		map[NUM_STATES];
-	u_char		spcl;
-	u_char		flgs;
-};
-
-struct okeymap {
-	u_short		n_keys;
-	struct okeyent_t key[NUM_KEYS];
-};
-typedef struct okeymap okeymap_t;
-#endif /* _KERNEL */
-
-#endif /* !_KEYMAP_DECLARED */
-
-/* defines for "special" keys (spcl bit set in keymap) */
-#define NOP		0x00		/* nothing (dead key)		*/
-#define LSH		0x02		/* left shift key		*/
-#define RSH		0x03		/* right shift key		*/
-#define CLK		0x04		/* caps lock key		*/
-#define NLK		0x05		/* num lock key			*/
-#define SLK		0x06		/* scroll lock key		*/
-#define LALT		0x07		/* left alt key			*/
-#define BTAB		0x08		/* backwards tab		*/
-#define LCTR		0x09		/* left control key		*/
-#define NEXT		0x0a		/* switch to next screen 	*/
-#define F_SCR		0x0b		/* switch to first screen 	*/
-#define L_SCR		0x1a		/* switch to last screen 	*/
-#define F_FN		0x1b		/* first function key 		*/
-#define L_FN		0x7a		/* last function key 		*/
-/*			0x7b-0x7f	   reserved do not use !	*/
-#define RCTR		0x80		/* right control key		*/
-#define RALT		0x81		/* right alt (altgr) key	*/
-#define ALK		0x82		/* alt lock key			*/
-#define ASH		0x83		/* alt shift key		*/
-#define META		0x84		/* meta key			*/
-#define RBT		0x85		/* boot machine			*/
-#define DBG		0x86		/* call debugger		*/
-#define SUSP		0x87		/* suspend power (APM)		*/
-#define SPSC		0x88		/* toggle splash/text screen	*/
-
-#define F_ACC		DGRA		/* first accent key		*/
-#define DGRA		0x89		/* grave			*/
-#define DACU		0x8a		/* acute			*/
-#define DCIR		0x8b		/* circumflex			*/
-#define DTIL		0x8c		/* tilde			*/
-#define DMAC		0x8d		/* macron			*/
-#define DBRE		0x8e		/* breve			*/
-#define DDOT		0x8f		/* dot				*/
-#define DUML		0x90		/* umlaut/diaresis		*/
-#define DDIA		0x90		/* diaresis			*/
-#define DSLA		0x91		/* slash			*/
-#define DRIN		0x92		/* ring				*/
-#define DCED		0x93		/* cedilla			*/
-#define DAPO		0x94		/* apostrophe			*/
-#define DDAC		0x95		/* double acute			*/
-#define DOGO		0x96		/* ogonek			*/
-#define DCAR		0x97		/* caron			*/
-#define L_ACC		DCAR		/* last accent key		*/
-
-#define STBY		0x98		/* Go into standby mode (apm)   */
-#define PREV		0x99		/* switch to previous screen 	*/
-#define PNC		0x9a		/* force system panic */
-#define LSHA		0x9b		/* left shift key / alt lock	*/
-#define RSHA		0x9c		/* right shift key / alt lock	*/
-#define LCTRA		0x9d		/* left ctrl key / alt lock	*/
-#define RCTRA		0x9e		/* right ctrl key / alt lock	*/
-#define LALTA		0x9f		/* left alt key / alt lock	*/
-#define RALTA		0xa0		/* right alt key / alt lock	*/
-#define HALT		0xa1		/* halt machine */
-#define PDWN		0xa2		/* halt machine and power down */
-#define PASTE		0xa3		/* paste from cut-paste buffer */
-
-#define F(x)		((x)+F_FN-1)
-#define	S(x)		((x)+F_SCR-1)
-#define ACC(x)		((x)+F_ACC)
-
-struct acc_t {
-	u_char		accchar;
-	u_char		map[NUM_ACCENTCHARS][2];
-};
-
-struct accentmap {
-	u_short		n_accs;
-	struct acc_t	acc[NUM_DEADKEYS];
-};
-typedef struct accentmap accentmap_t;
-
-struct keyarg {
-	u_short		keynum;
-	struct keyent_t	key;
-};
-typedef struct keyarg keyarg_t;
-
-struct fkeytab {
-	u_char		str[MAXFK];
-	u_char		len;
-};
-typedef struct fkeytab fkeytab_t;
-
-struct fkeyarg {
-	u_short		keynum;
-	char		keydef[MAXFK];
-	char		flen;
-};
-typedef struct fkeyarg	fkeyarg_t;
-
-#define GETFKEY		_IOWR('k', 0, fkeyarg_t)
-#define SETFKEY		_IOWR('k', 1, fkeyarg_t)
-#ifdef notdef		/* see console.h */
-#define GIO_SCRNMAP	_IOR('k', 2, scrmap_t)
-#define PIO_SCRNMAP	_IOW('k', 3, scrmap_t)
-#endif
-/* XXX: Should have keymap_t as an argument, but that's too big for ioctl()! */
-#define GIO_KEYMAP 	 _IO('k', 6)
-#define PIO_KEYMAP 	 _IO('k', 7)
-#ifdef _KERNEL
-#define OGIO_KEYMAP 	_IOR('k', 6, okeymap_t)
-#define OPIO_KEYMAP 	_IOW('k', 7, okeymap_t)
-#endif /* _KERNEL */
-#define GIO_DEADKEYMAP 	_IOR('k', 8, accentmap_t)
-#define PIO_DEADKEYMAP 	_IOW('k', 9, accentmap_t)
-#define GIO_KEYMAPENT 	_IOWR('k', 10, keyarg_t)
-#define PIO_KEYMAPENT 	_IOW('k', 11, keyarg_t)
-
-/* flags set to the return value in the KD_XLATE mode */
-
-#define	NOKEY		0x01000000	/* no key pressed marker 	*/
-#define	FKEY		0x02000000	/* function key marker 		*/
-#define	MKEY		0x04000000	/* meta key marker (prepend ESC)*/
-#define	BKEY		0x08000000	/* backtab (ESC [ Z)		*/
-
-#define	SPCLKEY		0x80000000	/* special key			*/
-#define	RELKEY		0x40000000	/* key released			*/
-#define	ERRKEY		0x20000000	/* error			*/
-
-/*
- * The top byte is used to store the flags.  This means there are 24
- * bits left to store the actual character.  Because UTF-8 can encode
- * 2^21 different characters, this is good enough to get Unicode
- * working.
- */
-#define KEYCHAR(c)	((c) & 0x00ffffff)
-#define KEYFLAGS(c)	((c) & ~0x00ffffff)
-
-#endif /* !_SYS_KBIO_H_ */
diff --git a/include.new/sys/kdb.h b/include.new/sys/kdb.h
deleted file mode 100644
index aaaf58a..0000000
--- a/include.new/sys/kdb.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * Copyright (c) 2004 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/kdb.h 244100 2012-12-10 23:12:51Z alfred $
- */
-
-#ifndef _SYS_KDB_H_
-#define	_SYS_KDB_H_
-
-#include <machine/setjmp.h>
-
-struct pcb;
-struct thread;
-struct trapframe;
-
-typedef int dbbe_init_f(void);
-typedef void dbbe_trace_f(void);
-typedef void dbbe_trace_thread_f(struct thread *);
-typedef int dbbe_trap_f(int, int);
-
-struct kdb_dbbe {
-	const char	*dbbe_name;
-	dbbe_init_f	*dbbe_init;
-	dbbe_trace_f	*dbbe_trace;
-	dbbe_trace_thread_f *dbbe_trace_thread;
-	dbbe_trap_f	*dbbe_trap;
-	int		dbbe_active;
-};
-
-#define	KDB_BACKEND(name, init, trace, trace_thread, trap) \
-	static struct kdb_dbbe name##_dbbe = {		\
-		.dbbe_name = #name,			\
-		.dbbe_init = init,			\
-		.dbbe_trace = trace,			\
-		.dbbe_trace_thread = trace_thread,	\
-		.dbbe_trap = trap			\
-	};						\
-	DATA_SET(kdb_dbbe_set, name##_dbbe)
-
-extern int kdb_active;			/* Non-zero while in debugger. */
-extern int debugger_on_panic;		/* enter the debugger on panic. */
-extern struct kdb_dbbe *kdb_dbbe;	/* Default debugger backend or NULL. */
-extern struct trapframe *kdb_frame;	/* Frame to kdb_trap(). */
-extern struct pcb *kdb_thrctx;		/* Current context. */
-extern struct thread *kdb_thread;	/* Current thread. */
-
-int	kdb_alt_break(int, int *);
-int	kdb_alt_break_gdb(int, int *);
-int	kdb_break(void);
-void	kdb_backtrace(void);
-void	kdb_backtrace_thread(struct thread *);
-int	kdb_dbbe_select(const char *);
-void	kdb_enter(const char *, const char *);
-void	kdb_init(void);
-void *	kdb_jmpbuf(jmp_buf);
-void	kdb_panic(const char *);
-void	kdb_reboot(void);
-void	kdb_reenter(void);
-struct pcb *kdb_thr_ctx(struct thread *);
-struct thread *kdb_thr_first(void);
-struct thread *kdb_thr_from_pid(pid_t);
-struct thread *kdb_thr_lookup(lwpid_t);
-struct thread *kdb_thr_next(struct thread *);
-int	kdb_thr_select(struct thread *);
-int	kdb_trap(int, int, struct trapframe *);
-
-/*
- * KDB enters the debugger via breakpoint(), which leaves the debugger without
- * a lot of information about why it was entered.  This simple enumerated set
- * captures some basic information.
- *
- * It is recommended that values here be short (<16 character) alpha-numeric
- * strings, as they will be used to construct DDB(4) script names.
- */
-extern const char * volatile kdb_why;
-#define	KDB_WHY_UNSET		NULL		/* No reason set. */
-#define	KDB_WHY_PANIC		"panic"		/* panic() was called. */
-#define	KDB_WHY_KASSERT		"kassert"	/* kassert failed. */
-#define	KDB_WHY_SYSCTL		"sysctl"	/* Sysctl entered debugger. */
-#define	KDB_WHY_BOOTFLAGS	"bootflags"	/* Boot flags were set. */
-#define	KDB_WHY_WITNESS		"witness"	/* Witness entered debugger. */
-#define	KDB_WHY_VFSLOCK		"vfslock"	/* VFS detected lock problem. */
-#define	KDB_WHY_NETGRAPH	"netgraph"	/* Netgraph entered debugger. */
-#define	KDB_WHY_BREAK		"break"		/* Console or serial break. */
-#define	KDB_WHY_WATCHDOG	"watchdog"	/* Watchdog entered debugger. */
-#define	KDB_WHY_CAM		"cam"		/* CAM has entered debugger. */
-#define	KDB_WHY_NDIS		"ndis"		/* NDIS entered debugger. */
-#define	KDB_WHY_ACPI		"acpi"		/* ACPI entered debugger. */
-#define	KDB_WHY_TRAPSIG		"trapsig"	/* Sparc fault. */
-#define	KDB_WHY_POWERFAIL	"powerfail"	/* Powerfail NMI. */
-#define	KDB_WHY_MAC		"mac"		/* MAC Framework. */
-#define	KDB_WHY_POWERPC		"powerpc"	/* Unhandled powerpc intr. */
-#define	KDB_WHY_UNIONFS		"unionfs"	/* Unionfs bug. */
-#define	KDB_WHY_DTRACE		"dtrace"	/* DTrace action entered debugger. */
-
-/* Return values for kdb_alt_break */
-#define	KDB_REQ_DEBUGGER	1	/* User requested Debugger */
-#define	KDB_REQ_PANIC		2	/* User requested a panic */
-#define	KDB_REQ_REBOOT		3	/* User requested a clean reboot */
-
-#endif /* !_SYS_KDB_H_ */
diff --git a/include.new/sys/kenv.h b/include.new/sys/kenv.h
deleted file mode 100644
index 913391d..0000000
--- a/include.new/sys/kenv.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2002 Maxime Henrion <mux@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.
- *
- * 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: releng/10.2/sys/sys/kenv.h 94936 2002-04-17 13:06:36Z mux $
- */
-
-#ifndef _SYS_KENV_H_
-#define _SYS_KENV_H_
-
-/*
- * Constants for the kenv(2) syscall
- */
-#define KENV_GET	0
-#define KENV_SET	1
-#define KENV_UNSET	2
-#define KENV_DUMP	3
-
-#define KENV_MNAMELEN	128	/* Maximum name length (for the syscall) */
-#define KENV_MVALLEN	128	/* Maximum value length (for the syscall) */
-
-#endif /* !_SYS_KENV_H_ */
diff --git a/include.new/sys/kernel.h b/include.new/sys/kernel.h
deleted file mode 100644
index 59958d1..0000000
--- a/include.new/sys/kernel.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * Copyright (c) 1995 Terrence R. Lambert
- * All rights reserved.
- *
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)kernel.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/kernel.h 255040 2013-08-29 19:52:18Z gibbs $
- */
-
-#ifndef _SYS_KERNEL_H_
-#define	_SYS_KERNEL_H_
-
-#include <sys/linker_set.h>
-
-#ifdef _KERNEL
-
-/* for intrhook below */
-#include <sys/queue.h>
-
-/* Global variables for the kernel. */
-
-/* 1.1 */
-extern char kernelname[MAXPATHLEN];
-
-extern int tick;			/* usec per tick (1000000 / hz) */
-extern int hz;				/* system clock's frequency */
-extern int psratio;			/* ratio: prof / stat */
-extern int stathz;			/* statistics clock's frequency */
-extern int profhz;			/* profiling clock's frequency */
-extern int profprocs;			/* number of process's profiling */
-extern volatile int ticks;
-
-#endif /* _KERNEL */
-
-/*
- * Enumerated types for known system startup interfaces.
- *
- * Startup occurs in ascending numeric order; the list entries are
- * sorted prior to attempting startup to guarantee order.  Items
- * of the same level are arbitrated for order based on the 'order'
- * element.
- *
- * These numbers are arbitrary and are chosen ONLY for ordering; the
- * enumeration values are explicit rather than implicit to provide
- * for binary compatibility with inserted elements.
- *
- * The SI_SUB_LAST value must have the highest lexical value.
- *
- * The SI_SUB_SWAP values represent a value used by
- * the BSD 4.4Lite but not by FreeBSD; it is maintained in dependent
- * order to support porting.
- */
-enum sysinit_sub_id {
-	SI_SUB_DUMMY		= 0x0000000,	/* not executed; for linker*/
-	SI_SUB_DONE		= 0x0000001,	/* processed*/
-	SI_SUB_TUNABLES		= 0x0700000,	/* establish tunable values */
-	SI_SUB_COPYRIGHT	= 0x0800001,	/* first use of console*/
-	SI_SUB_SETTINGS		= 0x0880000,	/* check and recheck settings */
-	SI_SUB_MTX_POOL_STATIC	= 0x0900000,	/* static mutex pool */
-	SI_SUB_LOCKMGR		= 0x0980000,	/* lockmgr locks */
-	SI_SUB_VM		= 0x1000000,	/* virtual memory system init*/
-	SI_SUB_KMEM		= 0x1800000,	/* kernel memory*/
-	SI_SUB_KVM_RSRC		= 0x1A00000,	/* kvm operational limits*/
-	SI_SUB_HYPERVISOR	= 0x1A40000,	/*
-						 * Hypervisor detection and
-						 * virtualization support 
-						 * setup.
-						 */
-	SI_SUB_WITNESS		= 0x1A80000,	/* witness initialization */
-	SI_SUB_MTX_POOL_DYNAMIC	= 0x1AC0000,	/* dynamic mutex pool */
-	SI_SUB_LOCK		= 0x1B00000,	/* various locks */
-	SI_SUB_EVENTHANDLER	= 0x1C00000,	/* eventhandler init */
-	SI_SUB_VNET_PRELINK	= 0x1E00000,	/* vnet init before modules */
-	SI_SUB_KLD		= 0x2000000,	/* KLD and module setup */
-	SI_SUB_CPU		= 0x2100000,	/* CPU resource(s)*/
-	SI_SUB_RACCT		= 0x2110000,	/* resource accounting */
-	SI_SUB_RANDOM		= 0x2120000,	/* random number generator */
-	SI_SUB_KDTRACE		= 0x2140000,	/* Kernel dtrace hooks */
-	SI_SUB_MAC		= 0x2180000,	/* TrustedBSD MAC subsystem */
-	SI_SUB_MAC_POLICY	= 0x21C0000,	/* TrustedBSD MAC policies */
-	SI_SUB_MAC_LATE		= 0x21D0000,	/* TrustedBSD MAC subsystem */
-	SI_SUB_VNET		= 0x21E0000,	/* vnet 0 */
-	SI_SUB_INTRINSIC	= 0x2200000,	/* proc 0*/
-	SI_SUB_VM_CONF		= 0x2300000,	/* config VM, set limits*/
-	SI_SUB_DDB_SERVICES	= 0x2380000,	/* capture, scripting, etc. */
-	SI_SUB_RUN_QUEUE	= 0x2400000,	/* set up run queue*/
-	SI_SUB_KTRACE		= 0x2480000,	/* ktrace */
-	SI_SUB_OPENSOLARIS	= 0x2490000,	/* OpenSolaris compatibility */
-	SI_SUB_CYCLIC		= 0x24A0000,	/* Cyclic timers */
-	SI_SUB_AUDIT		= 0x24C0000,	/* audit */
-	SI_SUB_CREATE_INIT	= 0x2500000,	/* create init process*/
-	SI_SUB_SCHED_IDLE	= 0x2600000,	/* required idle procs */
-	SI_SUB_MBUF		= 0x2700000,	/* mbuf subsystem */
-	SI_SUB_INTR		= 0x2800000,	/* interrupt threads */
-	SI_SUB_SOFTINTR		= 0x2800001,	/* start soft interrupt thread */
-	SI_SUB_ACL		= 0x2900000,	/* start for filesystem ACLs */
-	SI_SUB_DEVFS		= 0x2F00000,	/* devfs ready for devices */
-	SI_SUB_INIT_IF		= 0x3000000,	/* prep for net interfaces */
-	SI_SUB_NETGRAPH		= 0x3010000,	/* Let Netgraph initialize */
-	SI_SUB_DTRACE		= 0x3020000,	/* DTrace subsystem */
-	SI_SUB_DTRACE_PROVIDER	= 0x3048000,	/* DTrace providers */
-	SI_SUB_DTRACE_ANON	= 0x308C000,	/* DTrace anon enabling */
-	SI_SUB_DRIVERS		= 0x3100000,	/* Let Drivers initialize */
-	SI_SUB_CONFIGURE	= 0x3800000,	/* Configure devices */
-	SI_SUB_VFS		= 0x4000000,	/* virtual filesystem*/
-	SI_SUB_CLOCKS		= 0x4800000,	/* real time and stat clocks*/
-	SI_SUB_CLIST		= 0x5800000,	/* clists*/
-	SI_SUB_SYSV_SHM		= 0x6400000,	/* System V shared memory*/
-	SI_SUB_SYSV_SEM		= 0x6800000,	/* System V semaphores*/
-	SI_SUB_SYSV_MSG		= 0x6C00000,	/* System V message queues*/
-	SI_SUB_P1003_1B		= 0x6E00000,	/* P1003.1B realtime */
-	SI_SUB_PSEUDO		= 0x7000000,	/* pseudo devices*/
-	SI_SUB_EXEC		= 0x7400000,	/* execve() handlers */
-	SI_SUB_PROTO_BEGIN	= 0x8000000,	/* VNET initialization */
-	SI_SUB_PROTO_IF		= 0x8400000,	/* interfaces*/
-	SI_SUB_PROTO_DOMAININIT	= 0x8600000,	/* domain registration system */
-	SI_SUB_PROTO_DOMAIN	= 0x8800000,	/* domains (address families?)*/
-	SI_SUB_PROTO_IFATTACHDOMAIN	= 0x8800001,	/* domain dependent data init*/
-	SI_SUB_PROTO_END	= 0x8ffffff,	/* VNET helper functions */
-	SI_SUB_KPROF		= 0x9000000,	/* kernel profiling*/
-	SI_SUB_KICK_SCHEDULER	= 0xa000000,	/* start the timeout events*/
-	SI_SUB_INT_CONFIG_HOOKS	= 0xa800000,	/* Interrupts enabled config */
-	SI_SUB_ROOT_CONF	= 0xb000000,	/* Find root devices */
-	SI_SUB_DUMP_CONF	= 0xb200000,	/* Find dump devices */
-	SI_SUB_RAID		= 0xb380000,	/* Configure GEOM classes */
-	SI_SUB_SWAP		= 0xc000000,	/* swap */
-	SI_SUB_INTRINSIC_POST	= 0xd000000,	/* proc 0 cleanup*/
-	SI_SUB_SYSCALLS		= 0xd800000,	/* register system calls */
-	SI_SUB_VNET_DONE	= 0xdc00000,	/* vnet registration complete */
-	SI_SUB_KTHREAD_INIT	= 0xe000000,	/* init process*/
-	SI_SUB_KTHREAD_PAGE	= 0xe400000,	/* pageout daemon*/
-	SI_SUB_KTHREAD_VM	= 0xe800000,	/* vm daemon*/
-	SI_SUB_KTHREAD_BUF	= 0xea00000,	/* buffer daemon*/
-	SI_SUB_KTHREAD_UPDATE	= 0xec00000,	/* update daemon*/
-	SI_SUB_KTHREAD_IDLE	= 0xee00000,	/* idle procs*/
-	SI_SUB_SMP		= 0xf000000,	/* start the APs*/
-	SI_SUB_RACCTD		= 0xf100000,	/* start raccd*/
-	SI_SUB_LAST		= 0xfffffff	/* final initialization */
-};
-
-
-/*
- * Some enumerated orders; "ANY" sorts last.
- */
-enum sysinit_elem_order {
-	SI_ORDER_FIRST		= 0x0000000,	/* first*/
-	SI_ORDER_SECOND		= 0x0000001,	/* second*/
-	SI_ORDER_THIRD		= 0x0000002,	/* third*/
-	SI_ORDER_FOURTH		= 0x0000003,	/* fourth*/
-	SI_ORDER_MIDDLE		= 0x1000000,	/* somewhere in the middle */
-	SI_ORDER_ANY		= 0xfffffff	/* last*/
-};
-
-
-/*
- * A system initialization call instance
- *
- * At the moment there is one instance of sysinit.  We probably do not
- * want two which is why this code is if'd out, but we definitely want
- * to discern SYSINIT's which take non-constant data pointers and
- * SYSINIT's which take constant data pointers,
- *
- * The C_* macros take functions expecting const void * arguments
- * while the non-C_* macros take functions expecting just void * arguments.
- *
- * With -Wcast-qual on, the compiler issues warnings:
- *	- if we pass non-const data or functions taking non-const data
- *	  to a C_* macro.
- *
- *	- if we pass const data to the normal macros
- *
- * However, no warning is issued if we pass a function taking const data
- * through a normal non-const macro.  This is ok because the function is
- * saying it won't modify the data so we don't care whether the data is
- * modifiable or not.
- */
-
-typedef void (*sysinit_nfunc_t)(void *);
-typedef void (*sysinit_cfunc_t)(const void *);
-
-struct sysinit {
-	enum sysinit_sub_id	subsystem;	/* subsystem identifier*/
-	enum sysinit_elem_order	order;		/* init order within subsystem*/
-	sysinit_cfunc_t func;			/* function		*/
-	const void	*udata;			/* multiplexer/argument */
-};
-
-/*
- * Default: no special processing
- *
- * The C_ version of SYSINIT is for data pointers to const
- * data ( and functions taking data pointers to const data ).
- * At the moment it is no different from SYSINIT and thus
- * still results in warnings.
- *
- * The casts are necessary to have the compiler produce the
- * correct warnings when -Wcast-qual is used.
- *
- */
-#define	C_SYSINIT(uniquifier, subsystem, order, func, ident)	\
-	static struct sysinit uniquifier ## _sys_init = {	\
-		subsystem,					\
-		order,						\
-		func,						\
-		(ident)						\
-	};							\
-	DATA_SET(sysinit_set,uniquifier ## _sys_init)
-
-#define	SYSINIT(uniquifier, subsystem, order, func, ident)	\
-	C_SYSINIT(uniquifier, subsystem, order,			\
-	(sysinit_cfunc_t)(sysinit_nfunc_t)func, (void *)(ident))
-
-/*
- * Called on module unload: no special processing
- */
-#define	C_SYSUNINIT(uniquifier, subsystem, order, func, ident)	\
-	static struct sysinit uniquifier ## _sys_uninit = {	\
-		subsystem,					\
-		order,						\
-		func,						\
-		(ident)						\
-	};							\
-	DATA_SET(sysuninit_set,uniquifier ## _sys_uninit)
-
-#define	SYSUNINIT(uniquifier, subsystem, order, func, ident)	\
-	C_SYSUNINIT(uniquifier, subsystem, order,		\
-	(sysinit_cfunc_t)(sysinit_nfunc_t)func, (void *)(ident))
-
-void	sysinit_add(struct sysinit **set, struct sysinit **set_end);
-
-/*
- * Infrastructure for tunable 'constants'.  Value may be specified at compile
- * time or kernel load time.  Rules relating tunables together can be placed
- * in a SYSINIT function at SI_SUB_TUNABLES with SI_ORDER_ANY.
- *
- * WARNING: developers should never use the reserved suffixes specified in
- * loader.conf(5) for any tunables or conflicts will result.
- */
-
-/*
- * int
- * please avoid using for new tunables!
- */
-extern void tunable_int_init(void *);
-struct tunable_int {
-	const char *path;
-	int *var;
-};
-#define	TUNABLE_INT(path, var)					\
-	static struct tunable_int __CONCAT(__tunable_int_, __LINE__) = { \
-		(path),						\
-		(var),						\
-	};							\
-	SYSINIT(__CONCAT(__Tunable_init_, __LINE__),		\
-	    SI_SUB_TUNABLES, SI_ORDER_MIDDLE, tunable_int_init,	\
-	    &__CONCAT(__tunable_int_, __LINE__))
-
-#define	TUNABLE_INT_FETCH(path, var)	getenv_int((path), (var))
-
-/*
- * long
- */
-extern void tunable_long_init(void *);
-struct tunable_long {
-	const char *path;
-	long *var;
-};
-#define	TUNABLE_LONG(path, var)					\
-	static struct tunable_long __CONCAT(__tunable_long_, __LINE__) = { \
-		(path),						\
-		(var),						\
-	};							\
-	SYSINIT(__CONCAT(__Tunable_init_, __LINE__),		\
-	    SI_SUB_TUNABLES, SI_ORDER_MIDDLE, tunable_long_init,\
-	    &__CONCAT(__tunable_long_, __LINE__))
-
-#define	TUNABLE_LONG_FETCH(path, var)	getenv_long((path), (var))
-
-/*
- * unsigned long
- */
-extern void tunable_ulong_init(void *);
-struct tunable_ulong {
-	const char *path;
-	unsigned long *var;
-};
-#define	TUNABLE_ULONG(path, var)				\
-	static struct tunable_ulong __CONCAT(__tunable_ulong_, __LINE__) = { \
-		(path),						\
-		(var),						\
-	};							\
-	SYSINIT(__CONCAT(__Tunable_init_, __LINE__),		\
-	    SI_SUB_TUNABLES, SI_ORDER_MIDDLE, tunable_ulong_init, \
-	    &__CONCAT(__tunable_ulong_, __LINE__))
-
-#define	TUNABLE_ULONG_FETCH(path, var)	getenv_ulong((path), (var))
-
-/*
- * quad
- */
-extern void tunable_quad_init(void *);
-struct tunable_quad {
-	const char *path;
-	quad_t *var;
-};
-#define	TUNABLE_QUAD(path, var)					\
-	static struct tunable_quad __CONCAT(__tunable_quad_, __LINE__) = { \
-		(path),						\
-		(var),						\
-	};							\
-	SYSINIT(__CONCAT(__Tunable_init_, __LINE__),		\
-	    SI_SUB_TUNABLES, SI_ORDER_MIDDLE, tunable_quad_init, \
-	    &__CONCAT(__tunable_quad_, __LINE__))
-
-#define	TUNABLE_QUAD_FETCH(path, var)	getenv_quad((path), (var))
-
-extern void tunable_str_init(void *);
-struct tunable_str {
-	const char *path;
-	char *var;
-	int size;
-};
-#define	TUNABLE_STR(path, var, size)				\
-	static struct tunable_str __CONCAT(__tunable_str_, __LINE__) = { \
-		(path),						\
-		(var),						\
-		(size),						\
-	};							\
-	SYSINIT(__CONCAT(__Tunable_init_, __LINE__),		\
-	    SI_SUB_TUNABLES, SI_ORDER_MIDDLE, tunable_str_init,	\
-	    &__CONCAT(__tunable_str_, __LINE__))
-
-#define	TUNABLE_STR_FETCH(path, var, size)			\
-	getenv_string((path), (var), (size))
-
-struct intr_config_hook {
-	TAILQ_ENTRY(intr_config_hook) ich_links;
-	void	(*ich_func)(void *arg);
-	void	*ich_arg;
-};
-
-int	config_intrhook_establish(struct intr_config_hook *hook);
-void	config_intrhook_disestablish(struct intr_config_hook *hook);
-
-#endif /* !_SYS_KERNEL_H_*/
diff --git a/include.new/sys/kerneldump.h b/include.new/sys/kerneldump.h
deleted file mode 100644
index 1fd030e..0000000
--- a/include.new/sys/kerneldump.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 2002 Poul-Henning Kamp
- * Copyright (c) 2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by Poul-Henning Kamp
- * and NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
- *
- * 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 names of the authors 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: releng/10.2/sys/sys/kerneldump.h 214903 2010-11-07 03:09:02Z gonzo $
- */
-
-#ifndef _SYS_KERNELDUMP_H
-#define _SYS_KERNELDUMP_H
-
-#include <machine/endian.h>
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define	dtoh32(x)	__bswap32(x)
-#define	dtoh64(x)	__bswap64(x)
-#define	htod32(x)	__bswap32(x)
-#define	htod64(x)	__bswap64(x)
-#elif BYTE_ORDER == BIG_ENDIAN
-#define	dtoh32(x)	(x)
-#define	dtoh64(x)	(x)
-#define	htod32(x)	(x)
-#define	htod64(x)	(x)
-#endif
-
-/*
- * All uintX_t fields are in dump byte order, which is the same as
- * network byte order. Use the macros defined above to read or
- * write the fields.
- */
-struct kerneldumpheader {
-	char		magic[20];
-#define	KERNELDUMPMAGIC		"FreeBSD Kernel Dump"
-#define	TEXTDUMPMAGIC		"FreeBSD Text Dump"
-#define	KERNELDUMPMAGIC_CLEARED	"Cleared Kernel Dump"
-	char		architecture[12];
-	uint32_t	version;
-#define	KERNELDUMPVERSION	1
-	uint32_t	architectureversion;
-#define	KERNELDUMP_ALPHA_VERSION	1
-#define	KERNELDUMP_AMD64_VERSION	2
-#define	KERNELDUMP_ARM_VERSION		1
-#define	KERNELDUMP_I386_VERSION		2
-#define	KERNELDUMP_IA64_VERSION		1
-#define	KERNELDUMP_MIPS_VERSION		1
-#define	KERNELDUMP_POWERPC_VERSION	1
-#define	KERNELDUMP_SPARC64_VERSION	1
-#define	KERNELDUMP_TEXT_VERSION		1
-	uint64_t	dumplength;		/* excl headers */
-	uint64_t	dumptime;
-	uint32_t	blocksize;
-	char		hostname[64];
-	char		versionstring[192];
-	char		panicstring[192];
-	uint32_t	parity;
-};
-
-/*
- * Parity calculation is endian insensitive.
- */
-static __inline uint32_t
-kerneldump_parity(struct kerneldumpheader *kdhp)
-{
-	uint32_t *up, parity;
-	u_int i;
-
-	up = (uint32_t *)kdhp;
-	parity = 0;
-	for (i = 0; i < sizeof *kdhp; i += sizeof *up)
-		parity ^= *up++;
-	return (parity);
-}
-
-#ifdef _KERNEL
-void mkdumpheader(struct kerneldumpheader *kdh, char *magic, uint32_t archver,
-    uint64_t dumplen, uint32_t blksz);
-#endif
-
-#endif /* _SYS_KERNELDUMP_H */
diff --git a/include.new/sys/khelp.h b/include.new/sys/khelp.h
deleted file mode 100644
index 97b02f7..0000000
--- a/include.new/sys/khelp.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
- * Copyright (c) 2010 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University of Technology, made
- * possible in part by grants from the FreeBSD Foundation and Cisco University
- * Research Program Fund at Community Foundation Silicon Valley.
- *
- * Portions of this software were developed at the Centre for Advanced
- * Internet Architectures, Swinburne University of Technology, Melbourne,
- * Australia by Lawrence Stewart under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/khelp.h 220560 2011-04-12 08:13:18Z lstewart $
- */
-
-/*
- * A KPI for managing kernel helper modules which perform useful functionality
- * within the kernel. Originally released as part of the NewTCP research project
- * at Swinburne University of Technology's Centre for Advanced Internet
- * Architectures, Melbourne, Australia, which was made possible in part by a
- * grant from the Cisco University Research Program Fund at Community Foundation
- * Silicon Valley. More details are available at:
- *   http://caia.swin.edu.au/urp/newtcp/
- */
-
-#ifndef	_SYS_KHELP_H_
-#define	_SYS_KHELP_H_
-
-struct helper;
-struct hookinfo;
-struct osd;
-
-/* Helper classes. */
-#define	HELPER_CLASS_TCP	0x00000001
-
-/* Public KPI functions. */
-int	khelp_register_helper(struct helper *h);
-
-int	khelp_deregister_helper(struct helper *h);
-
-int	khelp_init_osd(uint32_t classes, struct osd *hosd);
-
-int	khelp_destroy_osd(struct osd *hosd);
-
-void *	khelp_get_osd(struct osd *hosd, int32_t id);
-
-int32_t	khelp_get_id(char *hname);
-
-int	khelp_add_hhook(struct hookinfo *hki, uint32_t flags);
-
-int	khelp_remove_hhook(struct hookinfo *hki);
-
-#endif /* _SYS_KHELP_H_ */
diff --git a/include.new/sys/kobj.h b/include.new/sys/kobj.h
deleted file mode 100644
index c3a1407..0000000
--- a/include.new/sys/kobj.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*-
- * Copyright (c) 2000,2003 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/sys/kobj.h 227537 2011-11-15 20:11:03Z marius $
- */
-
-#ifndef _SYS_KOBJ_H_
-#define _SYS_KOBJ_H_
-
-/*
- * Forward declarations
- */
-typedef struct kobj		*kobj_t;
-typedef struct kobj_class	*kobj_class_t;
-typedef const struct kobj_method kobj_method_t;
-typedef int			(*kobjop_t)(void);
-typedef struct kobj_ops		*kobj_ops_t;
-typedef struct kobjop_desc	*kobjop_desc_t;
-struct malloc_type;
-
-struct kobj_method {
-	kobjop_desc_t	desc;
-	kobjop_t	func;
-};
-
-/*
- * A class is simply a method table and a sizeof value. When the first
- * instance of the class is created, the method table will be compiled 
- * into a form more suited to efficient method dispatch. This compiled 
- * method table is always the first field of the object.
- */
-#define KOBJ_CLASS_FIELDS						\
-	const char	*name;		/* class name */		\
-	kobj_method_t	*methods;	/* method table */		\
-	size_t		size;		/* object size */		\
-	kobj_class_t	*baseclasses;	/* base classes */		\
-	u_int		refs;		/* reference count */		\
-	kobj_ops_t	ops		/* compiled method table */
-
-struct kobj_class {
-	KOBJ_CLASS_FIELDS;
-};
-
-/*
- * Implementation of kobj.
- */
-#define KOBJ_FIELDS				\
-	kobj_ops_t	ops
-
-struct kobj {
-	KOBJ_FIELDS;
-};
-
-/*
- * The ops table is used as a cache of results from kobj_lookup_method().
- */
-
-#define KOBJ_CACHE_SIZE	256
-
-struct kobj_ops {
-	kobj_method_t	*cache[KOBJ_CACHE_SIZE];
-	kobj_class_t	cls;
-};
-
-struct kobjop_desc {
-	unsigned int	id;		/* unique ID */
-	kobj_method_t	deflt;		/* default implementation */
-};
-
-/*
- * Shorthand for constructing method tables.
- * The ternary operator is (ab)used to provoke a warning when FUNC
- * has a signature that is not compatible with kobj method signature.
- */
-#define KOBJMETHOD(NAME, FUNC) \
-	{ &NAME##_desc, (kobjop_t) (1 ? FUNC : (NAME##_t *)NULL) }
-
-/*
- *
- */
-#define KOBJMETHOD_END	{ NULL, NULL }
-
-/*
- * Declare a class (which should be defined in another file.
- */
-#define DECLARE_CLASS(name) extern struct kobj_class name
-
-/*
- * Define a class with no base classes (api backward-compatible. with
- * FreeBSD-5.1 and earlier).
- */
-#define DEFINE_CLASS(name, methods, size)     		\
-DEFINE_CLASS_0(name, name ## _class, methods, size)
-
-/*
- * Define a class with no base classes. Use like this:
- *
- * DEFINE_CLASS_0(foo, foo_class, foo_methods, sizeof(foo_softc));
- */
-#define DEFINE_CLASS_0(name, classvar, methods, size)	\
-							\
-struct kobj_class classvar = {				\
-	#name, methods, size, NULL			\
-}
-
-/*
- * Define a class inheriting a single base class. Use like this:
- *
- * DEFINE_CLASS_1(foo, foo_class, foo_methods, sizeof(foo_softc),
- *			  bar);
- */
-#define DEFINE_CLASS_1(name, classvar, methods, size,	\
-		       base1)				\
-							\
-static kobj_class_t name ## _baseclasses[] =		\
-	{ &base1, NULL };				\
-struct kobj_class classvar = {				\
-	#name, methods, size, name ## _baseclasses	\
-}
-
-/*
- * Define a class inheriting two base classes. Use like this:
- *
- * DEFINE_CLASS_2(foo, foo_class, foo_methods, sizeof(foo_softc),
- *			  bar, baz);
- */
-#define DEFINE_CLASS_2(name, methods, size,		\
-	               base1, base2)			\
-							\
-static kobj_class_t name ## _baseclasses[] =		\
-	{ &base1,					\
-	  &base2, NULL };				\
-struct kobj_class name ## _class = {			\
-	#name, methods, size, name ## _baseclasses	\
-}
-
-/*
- * Define a class inheriting three base classes. Use like this:
- *
- * DEFINE_CLASS_3(foo, foo_class, foo_methods, sizeof(foo_softc),
- *			  bar, baz, foobar);
- */
-#define DEFINE_CLASS_3(name, methods, size,		\
-		       base1, base2, base3)		\
-							\
-static kobj_class_t name ## _baseclasses[] =		\
-	{ &base1,					\
-	  &base2,					\
-	  &base3, NULL };				\
-struct kobj_class name ## _class = {			\
-	#name, methods, size, name ## _baseclasses	\
-}
-
-
-/*
- * Compile the method table in a class.
- */
-void		kobj_class_compile(kobj_class_t cls);
-
-/*
- * Compile the method table, with the caller providing the space for
- * the ops table.(for use before malloc is initialised).
- */
-void		kobj_class_compile_static(kobj_class_t cls, kobj_ops_t ops);
-
-/*
- * Free the compiled method table in a class.
- */
-void		kobj_class_free(kobj_class_t cls);
-
-/*
- * Allocate memory for and initialise a new object.
- */
-kobj_t		kobj_create(kobj_class_t cls,
-			    struct malloc_type *mtype,
-			    int mflags);
-
-/*
- * Initialise a pre-allocated object.
- */
-void		kobj_init(kobj_t obj, kobj_class_t cls);
-void		kobj_init_static(kobj_t obj, kobj_class_t cls);
-
-/*
- * Delete an object. If mtype is non-zero, free the memory.
- */
-void		kobj_delete(kobj_t obj, struct malloc_type *mtype);
-
-/*
- * Maintain stats on hits/misses in lookup caches.
- */
-#ifdef KOBJ_STATS
-extern u_int kobj_lookup_hits;
-extern u_int kobj_lookup_misses;
-#endif
-
-/*
- * Lookup the method in the cache and if it isn't there look it up the
- * slow way.
- */
-#ifdef KOBJ_STATS
-#define KOBJOPLOOKUP(OPS,OP) do {				\
-	kobjop_desc_t _desc = &OP##_##desc;			\
-	kobj_method_t **_cep =					\
-	    &OPS->cache[_desc->id & (KOBJ_CACHE_SIZE-1)];	\
-	kobj_method_t *_ce = *_cep;				\
-	kobj_lookup_hits++; /* assume hit */			\
-	if (_ce->desc != _desc)					\
-		_ce = kobj_lookup_method(OPS->cls,		\
-					 _cep, _desc);		\
-	_m = _ce->func;						\
-} while(0)
-#else
-#define KOBJOPLOOKUP(OPS,OP) do {				\
-	kobjop_desc_t _desc = &OP##_##desc;			\
-	kobj_method_t **_cep =					\
-	    &OPS->cache[_desc->id & (KOBJ_CACHE_SIZE-1)];	\
-	kobj_method_t *_ce = *_cep;				\
-	if (_ce->desc != _desc)					\
-		_ce = kobj_lookup_method(OPS->cls,		\
-					 _cep, _desc);		\
-	_m = _ce->func;						\
-} while(0)
-#endif
-
-kobj_method_t* kobj_lookup_method(kobj_class_t cls,
-				  kobj_method_t **cep,
-				  kobjop_desc_t desc);
-
-
-/*
- * Default method implementation. Returns ENXIO.
- */
-int kobj_error_method(void);
-
-#endif /* !_SYS_KOBJ_H_ */
diff --git a/include.new/sys/kse.h b/include.new/sys/kse.h
deleted file mode 100644
index 07f3d7f..0000000
--- a/include.new/sys/kse.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (C) 2001 Julian Elischer <julian@freebsd.org>
- * for the FreeBSD Foundation.
- *
- *  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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible 
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/kse.h,v 1.28 2005/01/07 02:29:23 imp Exp $
- */
-
-#ifndef _SYS_KSE_H_
-#define _SYS_KSE_H_
-
-#include <sys/ucontext.h>
-#include <sys/time.h>
-#include <sys/signal.h>
-
-/*
- * This file defines the structures needed for communication between
- * the userland and the kernel when running a KSE-based threading system.
- * The only programs that should see this file are the user thread
- * scheduler (UTS) and the kernel.
- */
-struct kse_mailbox;
-
-typedef void	kse_func_t(struct kse_mailbox *);
-
-/*
- * Thread mailbox.
- *
- * This describes a user thread to the kernel scheduler.
- */
-struct kse_thr_mailbox {
-	ucontext_t		tm_context;	/* User and machine context */
-	uint32_t		tm_flags;	/* Thread flags */
-	struct kse_thr_mailbox	*tm_next;	/* Next thread in list */
-	void			*tm_udata;	/* For use by the UTS */
-	uint32_t		tm_uticks;	/* Time in userland */
-	uint32_t		tm_sticks;	/* Time in kernel */
-	siginfo_t		tm_syncsig;
-	uint32_t		tm_dflags;	/* Debug flags */
-	lwpid_t			tm_lwp;		/* kernel thread UTS runs on */
-	uint32_t		__spare__[6];
-};
-
-/*
- * KSE mailbox.
- *
- * Communication path between the UTS and the kernel scheduler specific to
- * a single KSE.
- */
-struct kse_mailbox {
-	uint32_t		km_version;	/* Mailbox version */
-	struct kse_thr_mailbox	*km_curthread;	/* Currently running thread */
-	struct kse_thr_mailbox	*km_completed;	/* Threads back from kernel */
-	sigset_t		km_sigscaught;	/* Caught signals */
-	uint32_t		km_flags;	/* Mailbox flags */
-	kse_func_t		*km_func;	/* UTS function */
-	stack_t			km_stack;	/* UTS stack */
-	void			*km_udata;	/* For use by the UTS */
-	struct timespec		km_timeofday;	/* Time of day */
-	uint32_t		km_quantum;	/* Upcall quantum in msecs */
-	lwpid_t			km_lwp;		/* kernel thread UTS runs on */
-	uint32_t		__spare2__[7];
-};
-
-#define KSE_VER_0		0
-#define KSE_VERSION		KSE_VER_0
-
-/* These flags are kept in km_flags */
-#define KMF_NOUPCALL		0x01
-#define KMF_NOCOMPLETED		0x02
-#define KMF_DONE		0x04
-#define KMF_BOUND		0x08
-#define KMF_WAITSIGEVENT	0x10
-
-/* These flags are kept in tm_flags */
-#define TMF_NOUPCALL		0x01
-
-/* These flags are kept in tm_dlfags */
-#define TMDF_SSTEP		0x01
-#define TMDF_SUSPEND		0x02
-
-/* Flags for kse_switchin */
-#define KSE_SWITCHIN_SETTMBX	0x01
-
-/* Commands for kse_thr_interrupt */
-#define KSE_INTR_INTERRUPT	1
-#define KSE_INTR_RESTART	2
-#define KSE_INTR_SENDSIG	3
-#define KSE_INTR_SIGEXIT	4
-#define KSE_INTR_DBSUSPEND	5
-#define KSE_INTR_EXECVE		6
-
-struct kse_execve_args {
-	sigset_t	sigmask;
-	sigset_t	sigpend;
-	char		*path;
-	char		**argv;
-	char		**envp;
-	void		*reserved;
-};
-
-#ifndef _KERNEL
-int	kse_create(struct kse_mailbox *, int);
-int	kse_exit(void);
-int	kse_release(struct timespec *);
-int	kse_thr_interrupt(struct kse_thr_mailbox *, int, long);
-int	kse_wakeup(struct kse_mailbox *);
-int	kse_switchin(struct kse_thr_mailbox *, int flags);
-#endif	/* !_KERNEL */
-
-#endif	/* !_SYS_KSE_H_ */
diff --git a/include.new/sys/ksem.h b/include.new/sys/ksem.h
deleted file mode 100644
index 8366f0c..0000000
--- a/include.new/sys/ksem.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 2002 Alfred Perlstein <alfred@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.
- *
- * 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: releng/10.2/sys/sys/ksem.h 250223 2013-05-03 21:11:57Z jhb $
- */
-
-#ifndef _POSIX4_KSEM_H_
-#define	_POSIX4_KSEM_H_
-
-#if !defined(_KERNEL) && !defined(_WANT_FILE)
-#error "no user-servicable parts inside"
-#endif
-
-#include <sys/condvar.h>
-
-struct ksem {
-	int		ks_ref;		/* number of references */
-	mode_t		ks_mode;	/* protection bits */
-	uid_t		ks_uid;		/* creator uid */
-	gid_t		ks_gid;		/* creator gid */
-	unsigned int	ks_value;	/* current value */
-	struct cv	ks_cv;		/* waiters sleep here */
-	int		ks_waiters;	/* number of waiters */
-	int		ks_flags;
-
-	/*
-	 * Values maintained solely to make this a better-behaved file
-	 * descriptor for fstat() to run on.
-	 *
-	 * XXX: dubious
-	 */
-	struct timespec	ks_atime;
-	struct timespec	ks_mtime;
-	struct timespec	ks_ctime;
-	struct timespec	ks_birthtime;
-
-	struct label	*ks_label;	/* MAC label */
-	const char	*ks_path;
-};
-
-#define	KS_ANONYMOUS	0x0001		/* Anonymous (unnamed) semaphore. */
-#define	KS_DEAD		0x0002		/* No new waiters allowed. */
-
-#ifdef _KERNEL
-extern void	(*ksem_info)(struct ksem *ks, char *path, size_t size,
-		    uint32_t *value);
-#endif
-
-#endif /* !_POSIX4_KSEM_H_ */
diff --git a/include.new/sys/ksyms.h b/include.new/sys/ksyms.h
deleted file mode 100644
index c95bf4b..0000000
--- a/include.new/sys/ksyms.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2008-2009, Stacey Son <sson@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.
- *
- * 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: releng/10.2/sys/sys/ksyms.h 192859 2009-05-26 21:39:09Z sson $
- */
-
-#ifndef _SYS_KSYMS_H_
-#define _SYS_KSYMS_H_
-
-#include <sys/ioccom.h>
-
-#define KIOCGSIZE	_IOR('l', 1, size_t)	
-#define KIOCGADDR	_IOR('l', 2, void *)	
-
-#endif /* _SYS_KSYMS_H_ */
diff --git a/include.new/sys/kthread.h b/include.new/sys/kthread.h
deleted file mode 100644
index 59f155d..0000000
--- a/include.new/sys/kthread.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 1999 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.
- *
- * 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: releng/10.2/sys/sys/kthread.h 210365 2010-07-22 05:42:29Z trasz $
- */
-
-#ifndef _SYS_KTHREAD_H_
-#define	_SYS_KTHREAD_H_
-
-#include <sys/cdefs.h>
-
-/*
- * A kernel process descriptor; used to start "internal" daemons.
- *
- * Note: global_procpp may be NULL for no global save area.
- */
-struct kproc_desc {
-	char		*arg0;			/* arg 0 (for 'ps' listing) */
-	void		(*func)(void);	/* "main" for kernel process */
-	struct proc	**global_procpp;	/* ptr to proc ptr save area */
-};
-
- /* A kernel thread descriptor; used to start "internal" daemons. */
-struct kthread_desc {
-	char		*arg0;			/* arg 0 (for 'ps' listing) */
-	void		(*func)(void);		/* "main" for kernel thread */
-	struct thread	**global_threadpp;	/* ptr to thread ptr save area */
-};
-
-int     kproc_create(void (*)(void *), void *, struct proc **,
-	    int flags, int pages, const char *, ...) __printflike(6, 7);
-void    kproc_exit(int) __dead2;
-int	kproc_resume(struct proc *);
-void	kproc_shutdown(void *, int);
-void	kproc_start(const void *);
-int	kproc_suspend(struct proc *, int);
-void	kproc_suspend_check(struct proc *);
-
-/* create a thread inthe given process. create the process if needed */
-int     kproc_kthread_add(void (*)(void *), void *,
-	    struct proc **,
-	    struct thread **,
-	    int flags, int pages,
-	    const char *procname, const char *, ...) __printflike(8, 9);
-
-int     kthread_add(void (*)(void *), void *,
-	    struct proc *, struct thread **,
-	    int flags, int pages, const char *, ...) __printflike(7, 8);
-void    kthread_exit(void) __dead2;
-int	kthread_resume(struct thread *);
-void	kthread_shutdown(void *, int);
-void	kthread_start(const void *);
-int	kthread_suspend(struct thread *, int);
-void	kthread_suspend_check(void);
-
-
-#endif /* !_SYS_KTHREAD_H_ */
diff --git a/include.new/sys/ktr.h b/include.new/sys/ktr.h
deleted file mode 100644
index 5bc14aa..0000000
--- a/include.new/sys/ktr.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*-
- * Copyright (c) 1996 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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.
- *
- *	from BSDI $Id: ktr.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/sys/ktr.h 284343 2015-06-13 16:15:43Z jhb $
- */
-
-/*
- *	Wraparound kernel trace buffer support.
- */
-
-#ifndef _SYS_KTR_H_
-#define _SYS_KTR_H_
-
-/*
- * Trace classes
- *
- * Two of the trace classes (KTR_DEV and KTR_SUBSYS) are special in that
- * they are really placeholders so that indvidual drivers and subsystems
- * can map their internal tracing to the general class when they wish to
- * have tracing enabled and map it to 0 when they don't.
- */
-#define	KTR_GEN		0x00000001		/* General (TR) */
-#define	KTR_NET		0x00000002		/* Network */
-#define	KTR_DEV		0x00000004		/* Device driver */
-#define	KTR_LOCK	0x00000008		/* MP locking */
-#define	KTR_SMP		0x00000010		/* MP general */
-#define	KTR_SUBSYS	0x00000020		/* Subsystem. */
-#define	KTR_PMAP	0x00000040		/* Pmap tracing */
-#define	KTR_MALLOC	0x00000080		/* Malloc tracing */
-#define	KTR_TRAP	0x00000100		/* Trap processing */
-#define	KTR_INTR	0x00000200		/* Interrupt tracing */
-#define	KTR_SIG		0x00000400		/* Signal processing */
-#define	KTR_SPARE2	0x00000800		/* XXX Used by cxgb */
-#define	KTR_PROC	0x00001000		/* Process scheduling */
-#define	KTR_SYSC	0x00002000		/* System call */
-#define	KTR_INIT	0x00004000		/* System initialization */
-#define	KTR_SPARE3	0x00008000		/* XXX Used by cxgb */
-#define	KTR_SPARE4	0x00010000		/* XXX Used by cxgb */
-#define	KTR_EVH		0x00020000		/* Eventhandler */
-#define	KTR_VFS		0x00040000		/* VFS events */
-#define	KTR_VOP		0x00080000		/* Auto-generated vop events */
-#define	KTR_VM		0x00100000		/* The virtual memory system */
-#define	KTR_INET	0x00200000		/* IPv4 stack */
-#define	KTR_RUNQ	0x00400000		/* Run queue */
-#define	KTR_CONTENTION	0x00800000		/* Lock contention */
-#define	KTR_UMA		0x01000000		/* UMA slab allocator */
-#define	KTR_CALLOUT	0x02000000		/* Callouts and timeouts */
-#define	KTR_GEOM	0x04000000		/* GEOM I/O events */
-#define	KTR_BUSDMA	0x08000000		/* busdma(9) events */
-#define	KTR_INET6	0x10000000		/* IPv6 stack */
-#define	KTR_SCHED	0x20000000		/* Machine parsed sched info. */
-#define	KTR_BUF		0x40000000		/* Buffer cache */
-#define	KTR_PTRACE	0x80000000		/* Process debugging. */
-#define	KTR_ALL		0xffffffff
-
-/* Trace classes to compile in */
-#ifdef KTR
-#ifndef KTR_COMPILE
-#define	KTR_COMPILE	(KTR_ALL)
-#endif
-#else	/* !KTR */
-#undef KTR_COMPILE
-#define KTR_COMPILE 0
-#endif	/* KTR */
-
-/*
- * Version number for ktr_entry struct.  Increment this when you break binary
- * compatibility.
- */
-#define	KTR_VERSION	2
-
-#define	KTR_PARMS	6
-
-#ifndef LOCORE
-
-#include <sys/param.h>
-#include <sys/_cpuset.h>
-
-struct ktr_entry {
-	u_int64_t ktr_timestamp;
-	int	ktr_cpu;
-	int	ktr_line;
-	const	char *ktr_file;
-	const	char *ktr_desc;
-	struct	thread *ktr_thread;
-	u_long	ktr_parms[KTR_PARMS];
-};
-
-extern cpuset_t ktr_cpumask;
-extern int ktr_mask;
-extern int ktr_entries;
-extern int ktr_verbose;
-
-extern volatile int ktr_idx;
-extern struct ktr_entry *ktr_buf;
-
-#ifdef KTR
-
-void	ktr_tracepoint(u_int mask, const char *file, int line,
-	    const char *format, u_long arg1, u_long arg2, u_long arg3,
-	    u_long arg4, u_long arg5, u_long arg6);
-
-#define CTR6(m, format, p1, p2, p3, p4, p5, p6) do {			\
-	if (KTR_COMPILE & (m))						\
-		ktr_tracepoint((m), __FILE__, __LINE__, format,		\
-		    (u_long)(p1), (u_long)(p2), (u_long)(p3),		\
-		    (u_long)(p4), (u_long)(p5), (u_long)(p6));		\
-	} while(0)
-#define CTR0(m, format)			CTR6(m, format, 0, 0, 0, 0, 0, 0)
-#define CTR1(m, format, p1)		CTR6(m, format, p1, 0, 0, 0, 0, 0)
-#define	CTR2(m, format, p1, p2)		CTR6(m, format, p1, p2, 0, 0, 0, 0)
-#define	CTR3(m, format, p1, p2, p3)	CTR6(m, format, p1, p2, p3, 0, 0, 0)
-#define	CTR4(m, format, p1, p2, p3, p4)	CTR6(m, format, p1, p2, p3, p4, 0, 0)
-#define	CTR5(m, format, p1, p2, p3, p4, p5)	CTR6(m, format, p1, p2, p3, p4, p5, 0)
-#else	/* KTR */
-#define	CTR0(m, d)			(void)0
-#define	CTR1(m, d, p1)			(void)0
-#define	CTR2(m, d, p1, p2)		(void)0
-#define	CTR3(m, d, p1, p2, p3)		(void)0
-#define	CTR4(m, d, p1, p2, p3, p4)	(void)0
-#define	CTR5(m, d, p1, p2, p3, p4, p5)	(void)0
-#define	CTR6(m, d, p1, p2, p3, p4, p5, p6)	(void)0
-#endif	/* KTR */
-
-#define	TR0(d)				CTR0(KTR_GEN, d)
-#define	TR1(d, p1)			CTR1(KTR_GEN, d, p1)
-#define	TR2(d, p1, p2)			CTR2(KTR_GEN, d, p1, p2)
-#define	TR3(d, p1, p2, p3)		CTR3(KTR_GEN, d, p1, p2, p3)
-#define	TR4(d, p1, p2, p3, p4)		CTR4(KTR_GEN, d, p1, p2, p3, p4)
-#define	TR5(d, p1, p2, p3, p4, p5)	CTR5(KTR_GEN, d, p1, p2, p3, p4, p5)
-#define	TR6(d, p1, p2, p3, p4, p5, p6)	CTR6(KTR_GEN, d, p1, p2, p3, p4, p5, p6)
-
-/*
- * The event macros implement KTR graphic plotting facilities provided
- * by src/tools/sched/schedgraph.py.  Three generic types of events are
- * supported: states, counters, and points.
- *
- * m is the ktr class for ktr_mask.
- * ident is the string identifier that owns the event (ie: "thread 10001")
- * etype is the type of event to plot (state, counter, point)
- * edat is the event specific data (state name, counter value, point name)
- * up to four attributes may be supplied as a name, value pair of arguments.
- *
- * etype and attribute names must be string constants.  This minimizes the
- * number of ktr slots required by construction the final format strings
- * at compile time.  Both must also include a colon and format specifier
- * (ie. "prio:%d", prio).  It is recommended that string arguments be
- * contained within escaped quotes if they may contain ',' or ':' characters.
- *
- * The special attribute (KTR_ATTR_LINKED, ident) creates a reference to another
- * id on the graph for easy traversal of related graph elements.
- */
-
-#define	KTR_ATTR_LINKED	"linkedto:\"%s\""
-#define	KTR_EFMT(egroup, ident, etype)					\
-	    "KTRGRAPH group:\"" egroup "\", id:\"%s\", " etype ", attributes: "
-
-#define	KTR_EVENT0(m, egroup, ident, etype, edat)			\
-	CTR2(m,	KTR_EFMT(egroup, ident, etype) "none", ident, edat)
-#define	KTR_EVENT1(m, egroup, ident, etype, edat, a0, v0)		\
-	CTR3(m, KTR_EFMT(egroup, ident, etype) a0, ident, edat, (v0))
-#define	KTR_EVENT2(m, egroup, ident, etype, edat, a0, v0, a1, v1)	\
-	CTR4(m, KTR_EFMT(egroup, ident, etype) a0 ", " a1,		\
-	    ident, edat, (v0), (v1))
-#define	KTR_EVENT3(m, egroup, ident, etype, edat, a0, v0, a1, v1, a2, v2)\
-	CTR5(m,KTR_EFMT(egroup, ident, etype) a0 ", " a1 ", " a2,	\
-	    ident, edat, (v0), (v1), (v2))
-#define	KTR_EVENT4(m, egroup, ident, etype, edat,			\
-	    a0, v0, a1, v1, a2, v2, a3, v3)				\
-	CTR6(m,KTR_EFMT(egroup, ident, etype) a0 ", " a1 ", " a2 ", " a3,\
-	     ident, edat, (v0), (v1), (v2), (v3))
-
-/*
- * State functions graph state changes on an ident.
- */
-#define KTR_STATE0(m, egroup, ident, state)				\
-	KTR_EVENT0(m, egroup, ident, "state:\"%s\"", state)
-#define KTR_STATE1(m, egroup, ident, state, a0, v0)			\
-	KTR_EVENT1(m, egroup, ident, "state:\"%s\"", state, a0, (v0))
-#define KTR_STATE2(m, egroup, ident, state, a0, v0, a1, v1)		\
-	KTR_EVENT2(m, egroup, ident, "state:\"%s\"", state, a0, (v0), a1, (v1))
-#define KTR_STATE3(m, egroup, ident, state, a0, v0, a1, v1, a2, v2)	\
-	KTR_EVENT3(m, egroup, ident, "state:\"%s\"",			\
-	    state, a0, (v0), a1, (v1), a2, (v2))
-#define KTR_STATE4(m, egroup, ident, state, a0, v0, a1, v1, a2, v2, a3, v3)\
-	KTR_EVENT4(m, egroup, ident, "state:\"%s\"",			\
-	    state, a0, (v0), a1, (v1), a2, (v2), a3, (v3))
-
-/*
- * Counter functions graph counter values.  The counter id
- * must not be intermixed with a state id. 
- */
-#define	KTR_COUNTER0(m, egroup, ident, counter)				\
-	KTR_EVENT0(m, egroup, ident, "counter:%d", counter)
-#define	KTR_COUNTER1(m, egroup, ident, edat, a0, v0)			\
-	KTR_EVENT1(m, egroup, ident, "counter:%d", counter, a0, (v0))
-#define	KTR_COUNTER2(m, egroup, ident, counter, a0, v0, a1, v1)		\
-	KTR_EVENT2(m, egroup, ident, "counter:%d", counter, a0, (v0), a1, (v1))
-#define	KTR_COUNTER3(m, egroup, ident, counter, a0, v0, a1, v1, a2, v2)	\
-	KTR_EVENT3(m, egroup, ident, "counter:%d",			\
-	    counter, a0, (v0), a1, (v1), a2, (v2))
-#define	KTR_COUNTER4(m, egroup, ident, counter, a0, v0, a1, v1, a2, v2, a3, v3)\
-	KTR_EVENT4(m, egroup, ident, "counter:%d",			\
-	    counter, a0, (v0), a1, (v1), a2, (v2), a3, (v3))
-
-/*
- * Point functions plot points of interest on counter or state graphs.
- */
-#define	KTR_POINT0(m, egroup, ident, point)				\
-	KTR_EVENT0(m, egroup, ident, "point:\"%s\"", point)
-#define	KTR_POINT1(m, egroup, ident, point, a0, v0)			\
-	KTR_EVENT1(m, egroup, ident, "point:\"%s\"", point, a0, (v0))
-#define	KTR_POINT2(m, egroup, ident, point, a0, v0, a1, v1)		\
-	KTR_EVENT2(m, egroup, ident, "point:\"%s\"", point, a0, (v0), a1, (v1))
-#define	KTR_POINT3(m, egroup, ident, point, a0, v0, a1, v1, a2, v2)	\
-	KTR_EVENT3(m, egroup, ident, "point:\"%s\"", point,		\
-	    a0, (v0), a1, (v1), a2, (v2))
-#define	KTR_POINT4(m, egroup, ident, point, a0, v0, a1, v1, a2, v2, a3, v3)\
-	KTR_EVENT4(m, egroup, ident, "point:\"%s\"",			\
-	    point, a0, (v0), a1, (v1), a2, (v2), a3, (v3))
-
-/*
- * Start functions denote the start of a region of code or operation
- * and should be paired with stop functions for timing of nested
- * sequences.
- *
- * Specifying extra attributes with the name "key" will result in
- * multi-part keys.  For example a block device and offset pair
- * might be used to describe a buf undergoing I/O.
- */
-#define	KTR_START0(m, egroup, ident, key)				\
-	KTR_EVENT0(m, egroup, ident, "start:0x%jX", (uintmax_t)key)
-#define	KTR_START1(m, egroup, ident, key, a0, v0)			\
-	KTR_EVENT1(m, egroup, ident, "start:0x%jX", (uintmax_t)key, a0, (v0))
-#define	KTR_START2(m, egroup, ident, key, a0, v0, a1, v1)		\
-	KTR_EVENT2(m, egroup, ident, "start:0x%jX", (uintmax_t)key,	\
-	    a0, (v0), a1, (v1))
-#define	KTR_START3(m, egroup, ident, key, a0, v0, a1, v1, a2, v2)\
-	KTR_EVENT3(m, egroup, ident, "start:0x%jX", (uintmax_t)key,	\
-	    a0, (v0), a1, (v1), a2, (v2))
-#define	KTR_START4(m, egroup, ident, key,				\
-	    a0, v0, a1, v1, a2, v2, a3, v3)				\
-	KTR_EVENT4(m, egroup, ident, "start:0x%jX", (uintmax_t)key,	\
-	    a0, (v0), a1, (v1), a2, (v2), a3, (v3))
-
-/*
- * Stop functions denote the end of a region of code or operation
- * and should be paired with start functions for timing of nested
- * sequences.
- */
-#define	KTR_STOP0(m, egroup, ident, key)				\
-	KTR_EVENT0(m, egroup, ident, "stop:0x%jX", (uintmax_t)key)
-#define	KTR_STOP1(m, egroup, ident, key, a0, v0)			\
-	KTR_EVENT1(m, egroup, ident, "stop:0x%jX", (uintmax_t)key, a0, (v0))
-#define	KTR_STOP2(m, egroup, ident, key, a0, v0, a1, v1)		\
-	KTR_EVENT2(m, egroup, ident, "stop:0x%jX", (uintmax_t)key,	\
-	    a0, (v0), a1, (v1))
-#define	KTR_STOP3(m, egroup, ident, key, a0, v0, a1, v1, a2, v2)\
-	KTR_EVENT3(m, egroup, ident, "stop:0x%jX", (uintmax_t)key,	\
-	    a0, (v0), a1, (v1), a2, (v2))
-#define	KTR_STOP4(m, egroup, ident, 					\
-	    key, a0, v0, a1, v1, a2, v2, a3, v3)			\
-	KTR_EVENT4(m, egroup, ident, "stop:0x%jX", (uintmax_t)key,	\
-	    a0, (v0), a1, (v1), a2, (v2), a3, (v3))
-
-/*
- * Trace initialization events, similar to CTR with KTR_INIT, but
- * completely ifdef'ed out if KTR_INIT isn't in KTR_COMPILE (to
- * save string space, the compiler doesn't optimize out strings
- * for the conditional ones above).
- */
-#if (KTR_COMPILE & KTR_INIT) != 0
-#define	ITR0(d)				CTR0(KTR_INIT, d)
-#define	ITR1(d, p1)			CTR1(KTR_INIT, d, p1)
-#define	ITR2(d, p1, p2)			CTR2(KTR_INIT, d, p1, p2)
-#define	ITR3(d, p1, p2, p3)		CTR3(KTR_INIT, d, p1, p2, p3)
-#define	ITR4(d, p1, p2, p3, p4)		CTR4(KTR_INIT, d, p1, p2, p3, p4)
-#define	ITR5(d, p1, p2, p3, p4, p5)	CTR5(KTR_INIT, d, p1, p2, p3, p4, p5)
-#define	ITR6(d, p1, p2, p3, p4, p5, p6)	CTR6(KTR_INIT, d, p1, p2, p3, p4, p5, p6)
-#else
-#define	ITR0(d)
-#define	ITR1(d, p1)
-#define	ITR2(d, p1, p2)
-#define	ITR3(d, p1, p2, p3)
-#define	ITR4(d, p1, p2, p3, p4)
-#define	ITR5(d, p1, p2, p3, p4, p5)
-#define	ITR6(d, p1, p2, p3, p4, p5, p6)
-#endif
-
-#endif /* !LOCORE */
-
-#endif /* !_SYS_KTR_H_ */
diff --git a/include.new/sys/ktrace.h b/include.new/sys/ktrace.h
deleted file mode 100644
index 3442984..0000000
--- a/include.new/sys/ktrace.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*-
- * Copyright (c) 1988, 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.
- * 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.
- *
- *	@(#)ktrace.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/ktrace.h 255219 2013-09-05 00:09:56Z pjd $
- */
-
-#ifndef _SYS_KTRACE_H_
-#define _SYS_KTRACE_H_
-
-#include <sys/caprights.h>
-
-/*
- * operations to ktrace system call  (KTROP(op))
- */
-#define KTROP_SET		0	/* set trace points */
-#define KTROP_CLEAR		1	/* clear trace points */
-#define KTROP_CLEARFILE		2	/* stop all tracing to file */
-#define	KTROP(o)		((o)&3)	/* macro to extract operation */
-/*
- * flags (ORed in with operation)
- */
-#define KTRFLAG_DESCEND		4	/* perform op on all children too */
-
-/*
- * ktrace record header
- */
-struct ktr_header {
-	int	ktr_len;		/* length of buf */
-	short	ktr_type;		/* trace record type */
-	pid_t	ktr_pid;		/* process id */
-	char	ktr_comm[MAXCOMLEN + 1];/* command name */
-	struct	timeval ktr_time;	/* timestamp */
-	intptr_t	ktr_tid;	/* was ktr_buffer */
-};
-
-/*
- * Test for kernel trace point (MP SAFE).
- *
- * KTRCHECK() just checks that the type is enabled and is only for
- * internal use in the ktrace subsystem.  KTRPOINT() checks against
- * ktrace recursion as well as checking that the type is enabled and
- * is the public interface.
- */
-#define	KTRCHECK(td, type)	((td)->td_proc->p_traceflag & (1 << type))
-#define KTRPOINT(td, type)						\
-	(KTRCHECK((td), (type)) && !((td)->td_pflags & TDP_INKTRACE))
-#define	KTRCHECKDRAIN(td)	(!(STAILQ_EMPTY(&(td)->td_proc->p_ktr)))
-#define	KTRUSERRET(td) do {						\
-	if (KTRCHECKDRAIN(td))						\
-		ktruserret(td);						\
-} while (0)
-
-/*
- * ktrace record types
- */
-
-/*
- * KTR_SYSCALL - system call record
- */
-#define KTR_SYSCALL	1
-struct ktr_syscall {
-	short	ktr_code;		/* syscall number */
-	short	ktr_narg;		/* number of arguments */
-	/*
-	 * followed by ktr_narg register_t
-	 */
-	register_t	ktr_args[1];
-};
-
-/*
- * KTR_SYSRET - return from system call record
- */
-#define KTR_SYSRET	2
-struct ktr_sysret {
-	short	ktr_code;
-	short	ktr_eosys;
-	int	ktr_error;
-	register_t	ktr_retval;
-};
-
-/*
- * KTR_NAMEI - namei record
- */
-#define KTR_NAMEI	3
-	/* record contains pathname */
-
-/*
- * KTR_GENIO - trace generic process i/o
- */
-#define KTR_GENIO	4
-struct ktr_genio {
-	int	ktr_fd;
-	enum	uio_rw ktr_rw;
-	/*
-	 * followed by data successfully read/written
-	 */
-};
-
-/*
- * KTR_PSIG - trace processed signal
- */
-#define	KTR_PSIG	5
-struct ktr_psig {
-	int	signo;
-	sig_t	action;
-	int	code;
-	sigset_t mask;
-};
-
-/*
- * KTR_CSW - trace context switches
- */
-#define KTR_CSW		6
-struct ktr_csw_old {
-	int	out;	/* 1 if switch out, 0 if switch in */
-	int	user;	/* 1 if usermode (ivcsw), 0 if kernel (vcsw) */
-};
-
-struct ktr_csw {
-	int	out;	/* 1 if switch out, 0 if switch in */
-	int	user;	/* 1 if usermode (ivcsw), 0 if kernel (vcsw) */
-	char	wmesg[8];
-};
-
-/*
- * KTR_USER - data coming from userland
- */
-#define KTR_USER_MAXLEN	2048	/* maximum length of passed data */
-#define KTR_USER	7
-
-/*
- * KTR_STRUCT - misc. structs
- */
-#define KTR_STRUCT	8
-	/*
-	 * record contains null-terminated struct name followed by
-	 * struct contents
-	 */
-struct sockaddr;
-struct stat;
-struct sysentvec;
-
-/*
- * KTR_SYSCTL - name of a sysctl MIB
- */
-#define	KTR_SYSCTL	9
-	/* record contains null-terminated MIB name */
-
-/*
- * KTR_PROCCTOR - trace process creation (multiple ABI support)
- */
-#define KTR_PROCCTOR	10
-struct ktr_proc_ctor {
-	u_int	sv_flags;	/* struct sysentvec sv_flags copy */
-};
-
-/*
- * KTR_PROCDTOR - trace process destruction (multiple ABI support)
- */
-#define KTR_PROCDTOR	11
-
-/*
- * KTR_CAPFAIL - trace capability check failures
- */
-#define KTR_CAPFAIL	12
-enum ktr_cap_fail_type {
-	CAPFAIL_NOTCAPABLE,	/* insufficient capabilities in cap_check() */
-	CAPFAIL_INCREASE,	/* attempt to increase capabilities */
-	CAPFAIL_SYSCALL,	/* disallowed system call */
-	CAPFAIL_LOOKUP,		/* disallowed VFS lookup */
-};
-struct ktr_cap_fail {
-	enum ktr_cap_fail_type cap_type;
-	cap_rights_t	cap_needed;
-	cap_rights_t	cap_held;
-};
-
-/*
- * KTR_FAULT - page fault record
- */
-#define KTR_FAULT	13
-struct ktr_fault {
-	vm_offset_t vaddr;
-	int type;
-};
-
-/*
- * KTR_FAULTEND - end of page fault record
- */
-#define KTR_FAULTEND	14
-struct ktr_faultend {
-	int result;
-};
-
-/*
- * KTR_DROP - If this bit is set in ktr_type, then at least one event
- * between the previous record and this record was dropped.
- */
-#define	KTR_DROP	0x8000
-
-/*
- * kernel trace points (in p_traceflag)
- */
-#define KTRFAC_MASK	0x00ffffff
-#define KTRFAC_SYSCALL	(1<<KTR_SYSCALL)
-#define KTRFAC_SYSRET	(1<<KTR_SYSRET)
-#define KTRFAC_NAMEI	(1<<KTR_NAMEI)
-#define KTRFAC_GENIO	(1<<KTR_GENIO)
-#define	KTRFAC_PSIG	(1<<KTR_PSIG)
-#define KTRFAC_CSW	(1<<KTR_CSW)
-#define KTRFAC_USER	(1<<KTR_USER)
-#define KTRFAC_STRUCT	(1<<KTR_STRUCT)
-#define KTRFAC_SYSCTL	(1<<KTR_SYSCTL)
-#define KTRFAC_PROCCTOR	(1<<KTR_PROCCTOR)
-#define KTRFAC_PROCDTOR	(1<<KTR_PROCDTOR)
-#define KTRFAC_CAPFAIL	(1<<KTR_CAPFAIL)
-#define KTRFAC_FAULT	(1<<KTR_FAULT)
-#define KTRFAC_FAULTEND	(1<<KTR_FAULTEND)
-
-/*
- * trace flags (also in p_traceflags)
- */
-#define KTRFAC_ROOT	0x80000000	/* root set this trace */
-#define KTRFAC_INHERIT	0x40000000	/* pass trace flags to children */
-#define	KTRFAC_DROP	0x20000000	/* last event was dropped */
-
-#ifdef	_KERNEL
-void	ktrnamei(char *);
-void	ktrcsw(int, int, const char *);
-void	ktrpsig(int, sig_t, sigset_t *, int);
-void	ktrfault(vm_offset_t, int);
-void	ktrfaultend(int);
-void	ktrgenio(int, enum uio_rw, struct uio *, int);
-void	ktrsyscall(int, int narg, register_t args[]);
-void	ktrsysctl(int *name, u_int namelen);
-void	ktrsysret(int, int, register_t);
-void	ktrprocctor(struct proc *);
-void	ktrprocexec(struct proc *, struct ucred **, struct vnode **);
-void	ktrprocexit(struct thread *);
-void	ktrprocfork(struct proc *, struct proc *);
-void	ktruserret(struct thread *);
-void	ktrstruct(const char *, void *, size_t);
-void	ktrcapfail(enum ktr_cap_fail_type, const cap_rights_t *,
-	    const cap_rights_t *);
-#define ktrcaprights(s) \
-	ktrstruct("caprights", (s), sizeof(cap_rights_t))
-#define ktrsockaddr(s) \
-	ktrstruct("sockaddr", (s), ((struct sockaddr *)(s))->sa_len)
-#define ktrstat(s) \
-	ktrstruct("stat", (s), sizeof(struct stat))
-
-#else
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	ktrace(const char *, int, int, pid_t);
-int	utrace(const void *, size_t);
-__END_DECLS
-
-#endif
-
-#endif
diff --git a/include.new/sys/libkern.h b/include.new/sys/libkern.h
deleted file mode 100644
index 45f5683..0000000
--- a/include.new/sys/libkern.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- *	@(#)libkern.h	8.1 (Berkeley) 6/10/93
- * $FreeBSD: releng/10.2/sys/sys/libkern.h 281538 2015-04-14 20:05:26Z jhb $
- */
-
-#ifndef _SYS_LIBKERN_H_
-#define	_SYS_LIBKERN_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#ifdef _KERNEL
-#include <sys/systm.h>
-#endif
-
-#ifndef	LIBKERN_INLINE
-#define	LIBKERN_INLINE  static __inline
-#define	LIBKERN_BODY
-#endif
-
-/* BCD conversions. */
-extern u_char const	bcd2bin_data[];
-extern u_char const	bin2bcd_data[];
-extern char const	hex2ascii_data[];
-
-#define	bcd2bin(bcd)	(bcd2bin_data[bcd])
-#define	bin2bcd(bin)	(bin2bcd_data[bin])
-#define	hex2ascii(hex)	(hex2ascii_data[hex])
-
-static __inline int imax(int a, int b) { return (a > b ? a : b); }
-static __inline int imin(int a, int b) { return (a < b ? a : b); }
-static __inline long lmax(long a, long b) { return (a > b ? a : b); }
-static __inline long lmin(long a, long b) { return (a < b ? a : b); }
-static __inline u_int max(u_int a, u_int b) { return (a > b ? a : b); }
-static __inline u_int min(u_int a, u_int b) { return (a < b ? a : b); }
-static __inline quad_t qmax(quad_t a, quad_t b) { return (a > b ? a : b); }
-static __inline quad_t qmin(quad_t a, quad_t b) { return (a < b ? a : b); }
-static __inline u_long ulmax(u_long a, u_long b) { return (a > b ? a : b); }
-static __inline u_long ulmin(u_long a, u_long b) { return (a < b ? a : b); }
-static __inline off_t omax(off_t a, off_t b) { return (a > b ? a : b); }
-static __inline off_t omin(off_t a, off_t b) { return (a < b ? a : b); }
-
-static __inline int abs(int a) { return (a < 0 ? -a : a); }
-static __inline long labs(long a) { return (a < 0 ? -a : a); }
-static __inline quad_t qabs(quad_t a) { return (a < 0 ? -a : a); }
-
-#define	ARC4_ENTR_NONE	0	/* Don't have entropy yet. */
-#define	ARC4_ENTR_HAVE	1	/* Have entropy. */
-#define	ARC4_ENTR_SEED	2	/* Reseeding. */
-extern int arc4rand_iniseed_state;
-
-/* Prototypes for non-quad routines. */
-struct malloc_type;
-uint32_t arc4random(void);
-void	 arc4rand(void *ptr, u_int len, int reseed);
-int	 bcmp(const void *, const void *, size_t);
-void	*bsearch(const void *, const void *, size_t,
-	    size_t, int (*)(const void *, const void *));
-#ifndef	HAVE_INLINE_FFS
-int	 ffs(int);
-#endif
-#ifndef	HAVE_INLINE_FFSL
-int	 ffsl(long);
-#endif
-#ifndef	HAVE_INLINE_FLS
-int	 fls(int);
-#endif
-#ifndef	HAVE_INLINE_FLSL
-int	 flsl(long);
-#endif
-#ifndef	HAVE_INLINE_FLSLL
-int	 flsll(long long);
-#endif
-#define	bitcount64(x)	__bitcount64((uint64_t)(x))
-#define	bitcount32(x)	__bitcount32((uint32_t)(x))
-#define	bitcount16(x)	__bitcount16((uint16_t)(x))
-#define	bitcountl(x)	__bitcountl((u_long)(x))
-#define	bitcount(x)	__bitcount((u_int)(x))
-
-int	 fnmatch(const char *, const char *, int);
-int	 locc(int, char *, u_int);
-void	*memchr(const void *s, int c, size_t n);
-void	*memcchr(const void *s, int c, size_t n);
-int	 memcmp(const void *b1, const void *b2, size_t len);
-void	 qsort(void *base, size_t nmemb, size_t size,
-	    int (*compar)(const void *, const void *));
-void	 qsort_r(void *base, size_t nmemb, size_t size, void *thunk,
-	    int (*compar)(void *, const void *, const void *));
-u_long	 random(void);
-int	 scanc(u_int, const u_char *, const u_char *, int);
-void	 srandom(u_long);
-int	 strcasecmp(const char *, const char *);
-char	*strcat(char * __restrict, const char * __restrict);
-char	*strchr(const char *, int);
-int	 strcmp(const char *, const char *);
-char	*strcpy(char * __restrict, const char * __restrict);
-size_t	 strcspn(const char * __restrict, const char * __restrict) __pure;
-char	*strdup(const char *__restrict, struct malloc_type *);
-char	*strndup(const char *__restrict, size_t, struct malloc_type *);
-size_t	 strlcat(char *, const char *, size_t);
-size_t	 strlcpy(char *, const char *, size_t);
-size_t	 strlen(const char *);
-int	 strncasecmp(const char *, const char *, size_t);
-int	 strncmp(const char *, const char *, size_t);
-char	*strncpy(char * __restrict, const char * __restrict, size_t);
-size_t	 strnlen(const char *, size_t);
-char	*strrchr(const char *, int);
-char	*strsep(char **, const char *delim);
-size_t	 strspn(const char *, const char *);
-char	*strstr(const char *, const char *);
-int	 strvalid(const char *, size_t);
-
-extern const uint32_t crc32_tab[];
-
-static __inline uint32_t
-crc32_raw(const void *buf, size_t size, uint32_t crc)
-{
-	const uint8_t *p = (const uint8_t *)buf;
-
-	while (size--)
-		crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
-	return (crc);
-}
-
-static __inline uint32_t
-crc32(const void *buf, size_t size)
-{
-	uint32_t crc;
-
-	crc = crc32_raw(buf, size, ~0U);
-	return (crc ^ ~0U);
-}
-
-uint32_t
-calculate_crc32c(uint32_t crc32c, const unsigned char *buffer,
-    unsigned int length);
-
-
-LIBKERN_INLINE void *memset(void *, int, size_t);
-#ifdef LIBKERN_BODY
-LIBKERN_INLINE void *
-memset(void *b, int c, size_t len)
-{
-	char *bb;
-
-	if (c == 0)
-		bzero(b, len);
-	else
-		for (bb = (char *)b; len--; )
-			*bb++ = c;
-	return (b);
-}
-#endif
-
-static __inline char *
-index(const char *p, int ch)
-{
-
-	return (strchr(p, ch));
-}
-
-static __inline char *
-rindex(const char *p, int ch)
-{
-
-	return (strrchr(p, ch));
-}
-
-/* fnmatch() return values. */
-#define	FNM_NOMATCH	1	/* Match failed. */
-
-/* fnmatch() flags. */
-#define	FNM_NOESCAPE	0x01	/* Disable backslash escaping. */
-#define	FNM_PATHNAME	0x02	/* Slash must be matched by slash. */
-#define	FNM_PERIOD	0x04	/* Period must be matched by period. */
-#define	FNM_LEADING_DIR	0x08	/* Ignore /<tail> after Imatch. */
-#define	FNM_CASEFOLD	0x10	/* Case insensitive search. */
-#define	FNM_IGNORECASE	FNM_CASEFOLD
-#define	FNM_FILE_NAME	FNM_PATHNAME
-
-#endif /* !_SYS_LIBKERN_H_ */
diff --git a/include.new/sys/limits.h b/include.new/sys/limits.h
deleted file mode 100644
index 77ce703..0000000
--- a/include.new/sys/limits.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 1988, 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/sys/limits.h 219271 2011-03-04 19:28:27Z jilles $
- */
-
-#ifndef _SYS_LIMITS_H_
-#define	_SYS_LIMITS_H_
-
-#include <sys/cdefs.h>
-#include <machine/_limits.h>
-
-#define	CHAR_BIT	__CHAR_BIT	/* number of bits in a char */
-
-#define	SCHAR_MAX	__SCHAR_MAX	/* max value for a signed char */
-#define	SCHAR_MIN	__SCHAR_MIN	/* min value for a signed char */
-
-#define	UCHAR_MAX	__UCHAR_MAX	/* max value for an unsigned char */
-
-#ifdef __CHAR_UNSIGNED__
-#define	CHAR_MAX	UCHAR_MAX	/* max value for a char */
-#define	CHAR_MIN	0		/* min value for a char */
-#else
-#define	CHAR_MAX	SCHAR_MAX
-#define	CHAR_MIN	SCHAR_MIN
-#endif
-
-#define	USHRT_MAX	__USHRT_MAX	/* max value for an unsigned short */
-#define	SHRT_MAX	__SHRT_MAX	/* max value for a short */
-#define	SHRT_MIN	__SHRT_MIN	/* min value for a short */
-
-#define	UINT_MAX	__UINT_MAX	/* max value for an unsigned int */
-#define	INT_MAX		__INT_MAX	/* max value for an int */
-#define	INT_MIN		__INT_MIN	/* min value for an int */
-
-#define	ULONG_MAX	__ULONG_MAX	/* max for an unsigned long */
-#define	LONG_MAX	__LONG_MAX	/* max for a long */
-#define	LONG_MIN	__LONG_MIN	/* min for a long */
-
-#ifdef __LONG_LONG_SUPPORTED
-#define	ULLONG_MAX	__ULLONG_MAX	/* max for an unsigned long long */
-#define	LLONG_MAX	__LLONG_MAX	/* max for a long long */
-#define	LLONG_MIN	__LLONG_MIN	/* min for a long long */
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SSIZE_MAX	__SSIZE_MAX	/* max value for an ssize_t */
-#endif
-
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-#define	SIZE_T_MAX	__SIZE_T_MAX	/* max value for a size_t */
-
-#define	OFF_MAX		__OFF_MAX	/* max value for an off_t */
-#define	OFF_MIN		__OFF_MIN	/* min value for an off_t */
-#endif
-
-#if __BSD_VISIBLE
-#define	GID_MAX		UINT_MAX	/* max value for a gid_t */
-#define	UID_MAX		UINT_MAX	/* max value for a uid_t */
-
-#define	UQUAD_MAX	(__UQUAD_MAX)	/* max value for a uquad_t */
-#define	QUAD_MAX	(__QUAD_MAX)	/* max value for a quad_t */
-#define	QUAD_MIN	(__QUAD_MIN)	/* min value for a quad_t */
-#endif
-
-#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200809
-#define	LONG_BIT	__LONG_BIT
-#define	WORD_BIT	__WORD_BIT
-#endif
-
-#if __POSIX_VISIBLE
-#define	MQ_PRIO_MAX	64
-#endif
-
-#endif /* !_SYS_LIMITS_H_ */
diff --git a/include.new/sys/linedisc.h b/include.new/sys/linedisc.h
deleted file mode 100644
index 25fb238..0000000
--- a/include.new/sys/linedisc.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 2004
- *	Poul-Henning Kamp.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)conf.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/linedisc.h,v 1.192 2004/06/26 08:44:04 phk Exp $
- */
-
-#ifndef _SYS_LINEDISC_H_
-#define	_SYS_LINEDISC_H_
-
-#ifdef _KERNEL
-
-struct tty;
-
-typedef int l_open_t(struct cdev *dev, struct tty *tp);
-typedef int l_close_t(struct tty *tp, int flag);
-typedef int l_read_t(struct tty *tp, struct uio *uio, int flag);
-typedef int l_write_t(struct tty *tp, struct uio *uio, int flag);
-typedef int l_ioctl_t(struct tty *tp, u_long cmd, caddr_t data,
-		      int flag, struct thread *td);
-typedef int l_rint_t(int c, struct tty *tp);
-typedef int l_start_t(struct tty *tp);
-typedef int l_modem_t(struct tty *tp, int flag);
-
-/*
- * Line discipline switch table
- */
-struct linesw {
-	l_open_t	*l_open;
-	l_close_t	*l_close;
-	l_read_t	*l_read;
-	l_write_t	*l_write;
-	l_ioctl_t	*l_ioctl;
-	l_rint_t	*l_rint;
-	l_start_t	*l_start;
-	l_modem_t	*l_modem;
-};
-
-extern struct linesw *linesw[];
-extern int nlinesw;
-
-int ldisc_register(int , struct linesw *);
-void ldisc_deregister(int);
-#define LDISC_LOAD 	-1		/* Loadable line discipline */
-
-l_read_t	l_noread;
-l_write_t	l_nowrite;
-l_ioctl_t	l_nullioctl;
-
-static __inline int
-ttyld_open(struct tty *tp, struct cdev *dev)
-{
-
-	return ((*linesw[tp->t_line]->l_open)(dev, tp));
-}
-
-static __inline int
-ttyld_close(struct tty *tp, int flag)
-{
-
-	return ((*linesw[tp->t_line]->l_close)(tp, flag));
-}
-
-static __inline int
-ttyld_read(struct tty *tp, struct uio *uio, int flag)
-{
-
-	return ((*linesw[tp->t_line]->l_read)(tp, uio, flag));
-}
-
-static __inline int
-ttyld_write(struct tty *tp, struct uio *uio, int flag)
-{
-
-	return ((*linesw[tp->t_line]->l_write)(tp, uio, flag));
-}
-
-static __inline int
-ttyld_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
-    struct thread *td)
-{
-
-	return ((*linesw[tp->t_line]->l_ioctl)(tp, cmd, data, flag, td));
-}
-
-static __inline int
-ttyld_rint(struct tty *tp, int c)
-{
-
-	return ((*linesw[tp->t_line]->l_rint)(c, tp));
-}
-
-static __inline int
-ttyld_start(struct tty *tp)
-{
-
-	return ((*linesw[tp->t_line]->l_start)(tp));
-}
-
-static __inline int
-ttyld_modem(struct tty *tp, int flag)
-{
-
-	return ((*linesw[tp->t_line]->l_modem)(tp, flag));
-}
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_LINEDISC_H_ */
diff --git a/include.new/sys/link_aout.h b/include.new/sys/link_aout.h
deleted file mode 100644
index 37d7041..0000000
--- a/include.new/sys/link_aout.h
+++ /dev/null
@@ -1,288 +0,0 @@
-/*-
- * Copyright (c) 1993 Paul Kranenburg
- * 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 Paul Kranenburg.
- * 4. 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 ``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 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: releng/10.2/sys/sys/link_aout.h 139825 2005-01-07 02:29:27Z imp $
- */
-
-/*
- * RRS section definitions.
- *
- * The layout of some data structures defined in this header file is
- * such that we can provide compatibility with the SunOS 4.x shared
- * library scheme.
- */
-
-#ifndef _SYS_LINK_AOUT_H_
-#define _SYS_LINK_AOUT_H_
-
-struct dl_info;
-
-/*
- * A `Shared Object Descriptor' describes a shared object that is needed
- * to complete the link edit process of the object containing it.
- * A list of such objects (chained through `sod_next') is pointed at
- * by `sdt_sods' in the section_dispatch_table structure.
- */
-
-struct sod {	/* Shared Object Descriptor */
-	long	sod_name;		/* name (relative to load address) */
-	u_int	sod_library  : 1,	/* Searched for by library rules */
-		sod_reserved : 31;
-	short	sod_major;		/* major version number */
-	short	sod_minor;		/* minor version number */
-	long	sod_next;		/* next sod */
-};
-
-/*
- * `Shared Object Map's are used by the run-time link editor (ld.so) to
- * keep track of all shared objects loaded into a process' address space.
- * These structures are only used at run-time and do not occur within
- * the text or data segment of an executable or shared library.
- */
-struct so_map {		/* Shared Object Map */
-	caddr_t		som_addr;	/* Address at which object mapped */
-	char 		*som_path;	/* Path to mmap'ed file */
-	struct so_map	*som_next;	/* Next map in chain */
-	struct sod	*som_sod;	/* Sod responsible for this map */
-	caddr_t		som_sodbase;	/* Base address of this sod */
-	u_int		som_write : 1;	/* Text is currently writable */
-	struct _dynamic	*som_dynamic;	/* _dynamic structure */
-	caddr_t		som_spd;	/* Private data */
-};
-
-/*
- * Symbol description with size. This is simply an `nlist' with
- * one field (nz_size) added.
- * Used to convey size information on items in the data segment
- * of shared objects. An array of these live in the shared object's
- * text segment and is addressed by the `sdt_nzlist' field.
- */
-struct nzlist {
-	struct nlist	nlist;
-	u_long		nz_size;
-};
-
-#define nz_un		nlist.n_un
-#define nz_strx		nlist.n_un.n_strx
-#define nz_name		nlist.n_un.n_name
-#define nz_type		nlist.n_type
-#define nz_value	nlist.n_value
-#define nz_desc		nlist.n_desc
-#define nz_other	nlist.n_other
-
-/*
- * The `section_dispatch_table' structure contains offsets to various data
- * structures needed to do run-time relocation.
- */
-struct section_dispatch_table {
-	struct so_map *sdt_loaded;	/* List of loaded objects */
-	long	sdt_sods;		/* List of shared objects descriptors */
-	long	sdt_paths;		/* Library search paths */
-	long	sdt_got;		/* Global offset table */
-	long	sdt_plt;		/* Procedure linkage table */
-	long	sdt_rel;		/* Relocation table */
-	long	sdt_hash;		/* Symbol hash table */
-	long	sdt_nzlist;		/* Symbol table itself */
-	long	sdt_filler2;		/* Unused (was: stab_hash) */
-	long	sdt_buckets;		/* Number of hash buckets */
-	long	sdt_strings;		/* Symbol strings */
-	long	sdt_str_sz;		/* Size of symbol strings */
-	long	sdt_text_sz;		/* Size of text area */
-	long	sdt_plt_sz;		/* Size of procedure linkage table */
-};
-
-/*
- * RRS symbol hash table, addressed by `sdt_hash' in section_dispatch_table.
- * Used to quickly lookup symbols of the shared object by hashing
- * on the symbol's name. `rh_symbolnum' is the index of the symbol
- * in the shared object's symbol list (`sdt_nzlist'), `rh_next' is
- * the next symbol in the hash bucket (in case of collisions).
- */
-struct rrs_hash {
-	int	rh_symbolnum;		/* Symbol number */
-	int	rh_next;		/* Next hash entry */
-};
-
-/*
- * `rt_symbols' is used to keep track of run-time allocated commons
- * and data items copied from shared objects.
- */
-struct rt_symbol {
-	struct nzlist		*rt_sp;		/* The symbol */
-	struct rt_symbol	*rt_next;	/* Next in linear list */
-	struct rt_symbol	*rt_link;	/* Next in bucket */
-	caddr_t			rt_srcaddr;	/* Address of "master" copy */
-	struct so_map		*rt_smp;	/* Originating map */
-};
-
-/*
- * Debugger interface structure.
- */
-struct so_debug {
-	int	dd_version;		/* Version # of interface */
-	int	dd_in_debugger;		/* Set when run by debugger */
-	int	dd_sym_loaded;		/* Run-time linking brought more
-					   symbols into scope */
-	char   	 *dd_bpt_addr;		/* Address of rtld-generated bpt */
-	int	dd_bpt_shadow;		/* Original contents of bpt */
-	struct rt_symbol *dd_cc;	/* Allocated commons/copied data */
-};
-
-/*
- * Version returned to crt0 from ld.so
- */
-#define LDSO_VERSION_NONE	0	/* FreeBSD2.0, 2.0.5 */
-#define LDSO_VERSION_HAS_DLEXIT	1	/* includes dlexit in ld_entry */
-#define LDSO_VERSION_HAS_DLSYM3	2	/* includes 3-argument dlsym */
-#define LDSO_VERSION_HAS_DLADDR	3	/* includes dladdr in ld_entry */
-
-/*
- * Entry points into ld.so - user interface to the run-time linker.
- * Entries are valid for the given version numbers returned by ld.so
- * to crt0.
- */
-struct ld_entry {
-	void	*(*dlopen)(const char *, int);	/* NONE */
-	int	(*dlclose)(void *);		/* NONE */
-	void	*(*dlsym)(void *, const char *);	/* NONE */
-	const char *(*dlerror)(void);		/* NONE */
-	void	(*dlexit)(void);			/* HAS_DLEXIT */
-	void	*(*dlsym3)(void *, const char *, void *); /* HAS_DLSYM3 */
-	int	 (*dladdr)(const void *, struct dl_info *); /* HAS_DLADDR */
-};
-
-/*
- * This is the structure pointed at by the __DYNAMIC symbol if an
- * executable requires the attention of the run-time link editor.
- * __DYNAMIC is given the value zero if no run-time linking needs to
- * be done (it is always present in shared objects).
- * The union `d_un' provides for different versions of the dynamic
- * linking mechanism (switched on by `d_version'). The last version
- * used by Sun is 3. We leave some room here and go to version number
- * 8 for NetBSD, the main difference lying in the support for the
- * `nz_list' type of symbols.
- */
-
-struct _dynamic {
-	int		d_version;	/* version # of this interface */
-	struct so_debug	*d_debug;
-	union {
-		struct section_dispatch_table *d_sdt;
-	} d_un;
-	struct ld_entry *d_entry;	/* XXX */
-};
-
-#define LD_VERSION_SUN		(3)
-#define LD_VERSION_BSD		(8)
-#define LD_VERSION_NZLIST_P(v)	((v) >= 8)
-
-#define LD_GOT(x)	((x)->d_un.d_sdt->sdt_got)
-#define LD_PLT(x)	((x)->d_un.d_sdt->sdt_plt)
-#define LD_REL(x)	((x)->d_un.d_sdt->sdt_rel)
-#define LD_SYMBOL(x)	((x)->d_un.d_sdt->sdt_nzlist)
-#define LD_HASH(x)	((x)->d_un.d_sdt->sdt_hash)
-#define LD_STRINGS(x)	((x)->d_un.d_sdt->sdt_strings)
-#define LD_NEED(x)	((x)->d_un.d_sdt->sdt_sods)
-#define LD_BUCKETS(x)	((x)->d_un.d_sdt->sdt_buckets)
-#define LD_PATHS(x)	((x)->d_un.d_sdt->sdt_paths)
-
-#define LD_GOTSZ(x)	((x)->d_un.d_sdt->sdt_plt - (x)->d_un.d_sdt->sdt_got)
-#define LD_RELSZ(x)	((x)->d_un.d_sdt->sdt_hash - (x)->d_un.d_sdt->sdt_rel)
-#define LD_HASHSZ(x)	((x)->d_un.d_sdt->sdt_nzlist - (x)->d_un.d_sdt->sdt_hash)
-#define LD_STABSZ(x)	((x)->d_un.d_sdt->sdt_strings - (x)->d_un.d_sdt->sdt_nzlist)
-#define LD_PLTSZ(x)	((x)->d_un.d_sdt->sdt_plt_sz)
-#define LD_STRSZ(x)	((x)->d_un.d_sdt->sdt_str_sz)
-#define LD_TEXTSZ(x)	((x)->d_un.d_sdt->sdt_text_sz)
-
-/*
- * Interface to ld.so
- */
-struct crt_ldso {
-	int		crt_ba;		/* Base address of ld.so */
-	int		crt_dzfd;	/* "/dev/zero" file descriptor (SunOS) */
-	int		crt_ldfd;	/* ld.so file descriptor */
-	struct _dynamic	*crt_dp;	/* Main's __DYNAMIC */
-	char		**crt_ep;	/* environment strings */
-	caddr_t		crt_bp;		/* Breakpoint if run from debugger */
-	char		*crt_prog;	/* Program name (v3) */
-	char		*crt_ldso;	/* Link editor name (v4) */
-	struct ld_entry	*crt_ldentry;	/* dl*() access (v4) */
-	char		**crt_argv;	/* argument strings (v5) */
-};
-
-/*
- * Version passed from crt0 to ld.so (1st argument to _rtld()).
- */
-#define CRT_VERSION_SUN		1
-#define CRT_VERSION_BSD_2	2
-#define CRT_VERSION_BSD_3	3
-#define CRT_VERSION_BSD_4	4
-#define CRT_VERSION_BSD_5	5
-
-/*
- * Maximum number of recognized shared object version numbers.
- */
-#define MAXDEWEY	8
-
-/*
- * Header of the hints file.
- */
-struct hints_header {
-	long		hh_magic;
-#define HH_MAGIC	011421044151
-	long		hh_version;	/* Interface version number */
-#define LD_HINTS_VERSION_1	1
-#define LD_HINTS_VERSION_2	2
-	long		hh_hashtab;	/* Location of hash table */
-	long		hh_nbucket;	/* Number of buckets in hashtab */
-	long		hh_strtab;	/* Location of strings */
-	long		hh_strtab_sz;	/* Size of strings */
-	long		hh_ehints;	/* End of hints (max offset in file) */
-	long		hh_dirlist;	/* Colon-separated list of srch dirs */
-};
-
-#define HH_BADMAG(hdr)	((hdr).hh_magic != HH_MAGIC)
-
-/*
- * Hash table element in hints file.
- */
-struct hints_bucket {
-	/* namex and pathx are indices into the string table */
-	int		hi_namex;		/* Library name */
-	int		hi_pathx;		/* Full path */
-	int		hi_dewey[MAXDEWEY];	/* The versions */
-	int		hi_ndewey;		/* Number of version numbers */
-#define hi_major hi_dewey[0]
-#define hi_minor hi_dewey[1]
-	int		hi_next;		/* Next in this bucket */
-};
-
-#define _PATH_LD_HINTS		"/var/run/ld.so.hints"
-
-#endif /* _SYS_LINK_AOUT_H_ */
diff --git a/include.new/sys/link_elf.h b/include.new/sys/link_elf.h
deleted file mode 100644
index b4e7ceb..0000000
--- a/include.new/sys/link_elf.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * Copyright (c) 1993 Paul Kranenburg
- * 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 Paul Kranenburg.
- * 4. 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 ``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 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: releng/10.2/sys/sys/link_elf.h 276908 2015-01-10 09:22:17Z kib $
- */
-
-/*
- * RRS section definitions.
- *
- * The layout of some data structures defined in this header file is
- * such that we can provide compatibility with the SunOS 4.x shared
- * library scheme.
- */
-
-#ifndef _SYS_LINK_ELF_H_
-#define	_SYS_LINK_ELF_H_
-
-#include <sys/elf.h>
-
-/*
- * Flags that describe the origin of the entries in Dl_serinfo.
- * SunOS has these in <sys/link.h>, we follow the suit.
- */
-#define	LA_SER_ORIG	0x01	/* original (needed) name */
-#define	LA_SER_LIBPATH	0x02	/* LD_LIBRARY_PATH entry prepended */
-#define	LA_SER_RUNPATH	0x04	/* runpath entry prepended */
-#define	LA_SER_CONFIG	0x08	/* configuration entry prepended */
-#define	LA_SER_DEFAULT	0x40	/* default path prepended */
-#define	LA_SER_SECURE	0x80	/* default (secure) path prepended */
-
-typedef struct link_map {
-	caddr_t		l_addr;			/* Base Address of library */
-#ifdef __mips__
-	caddr_t		l_offs;			/* Load Offset of library */
-#endif
-	const char	*l_name;		/* Absolute Path to Library */
-	const void	*l_ld;			/* Pointer to .dynamic in memory */
-	struct link_map	*l_next, *l_prev;	/* linked list of of mapped libs */
-} Link_map;
-
-struct r_debug {
-	int		r_version;		/* not used */
-	struct link_map *r_map;			/* list of loaded images */
-	void		(*r_brk)(struct r_debug *, struct link_map *);
-						/* pointer to break point */
-	enum {
-		RT_CONSISTENT,			/* things are stable */
-		RT_ADD,				/* adding a shared library */
-		RT_DELETE			/* removing a shared library */
-	}		r_state;
-};
-
-struct dl_phdr_info
-{
-	Elf_Addr dlpi_addr;			/* module relocation base */
-	const char *dlpi_name;			/* module name */
-	const Elf_Phdr *dlpi_phdr;		/* pointer to module's phdr */
-	Elf_Half dlpi_phnum;			/* number of entries in phdr */
-	unsigned long long int dlpi_adds;	/* total # of loads */
-	unsigned long long int dlpi_subs;	/* total # of unloads */
-	size_t dlpi_tls_modid;
-	void *dlpi_tls_data;
-};
-
-__BEGIN_DECLS
-
-typedef int (*__dl_iterate_hdr_callback)(struct dl_phdr_info *, size_t, void *);
-extern int dl_iterate_phdr(__dl_iterate_hdr_callback, void *);
-int _rtld_addr_phdr(const void *, struct dl_phdr_info *);
-int _rtld_get_stack_prot(void);
-int _rtld_is_dlopened(void *);
-
-#ifdef __ARM_EABI__
-void * dl_unwind_find_exidx(const void *, int *);
-#endif
-
-__END_DECLS
-
-#endif /* _SYS_LINK_ELF_H_ */
diff --git a/include.new/sys/linker.h b/include.new/sys/linker.h
deleted file mode 100644
index 191e915..0000000
--- a/include.new/sys/linker.h
+++ /dev/null
@@ -1,347 +0,0 @@
-/*-
- * Copyright (c) 1997-2000 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/sys/linker.h 254267 2013-08-13 03:09:00Z markj $
- */
-
-#ifndef _SYS_LINKER_H_
-#define _SYS_LINKER_H_
-
-#ifdef _KERNEL
-
-#include <machine/elf.h>
-#include <sys/kobj.h>
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_LINKER);
-#endif
-
-struct mod_depend;
-
-/*
- * Object representing a file which has been loaded by the linker.
- */
-typedef struct linker_file* linker_file_t;
-typedef TAILQ_HEAD(, linker_file) linker_file_list_t;
-
-typedef caddr_t linker_sym_t;		/* opaque symbol */
-typedef c_caddr_t c_linker_sym_t;	/* const opaque symbol */
-typedef int (*linker_function_name_callback_t)(const char *, void *);
-
-/*
- * expanded out linker_sym_t
- */
-typedef struct linker_symval {
-    const char*		name;
-    caddr_t		value;
-    size_t		size;
-} linker_symval_t;
-
-typedef int (*linker_function_nameval_callback_t)(linker_file_t, int, linker_symval_t *, void *);
-
-struct common_symbol {
-    STAILQ_ENTRY(common_symbol) link;
-    char*		name;
-    caddr_t		address;
-};
-
-struct linker_file {
-    KOBJ_FIELDS;
-    int			refs;		/* reference count */
-    int			userrefs;	/* kldload(2) count */
-    int			flags;
-#define LINKER_FILE_LINKED	0x1	/* file has been fully linked */
-    TAILQ_ENTRY(linker_file) link;	/* list of all loaded files */
-    char*		filename;	/* file which was loaded */
-    char*		pathname;	/* file name with full path */
-    int			id;		/* unique id */
-    caddr_t		address;	/* load address */
-    size_t		size;		/* size of file */
-    int			ndeps;		/* number of dependencies */
-    linker_file_t*	deps;		/* list of dependencies */
-    STAILQ_HEAD(, common_symbol) common; /* list of common symbols */
-    TAILQ_HEAD(, module) modules;	/* modules in this file */
-    TAILQ_ENTRY(linker_file) loaded;	/* preload dependency support */
-    int			loadcnt;	/* load counter value */
-
-    /*
-     * Function Boundary Tracing (FBT) or Statically Defined Tracing (SDT)
-     * fields.
-     */
-    int			nenabled;	/* number of enabled probes. */
-    int			fbt_nentries;	/* number of fbt entries created. */
-};
-
-/*
- * Object implementing a class of file (a.out, elf, etc.)
- */
-typedef struct linker_class *linker_class_t;
-typedef TAILQ_HEAD(, linker_class) linker_class_list_t;
-
-struct linker_class {
-    KOBJ_CLASS_FIELDS;
-    TAILQ_ENTRY(linker_class) link;	/* list of all file classes */
-};
-
-/*
- * Function type used when iterating over the list of linker files.
- */
-typedef int linker_predicate_t(linker_file_t, void *);
-
-/*
- * The "file" for the kernel.
- */
-extern linker_file_t	linker_kernel_file;
-
-/*
- * Obtain a reference to a module, loading it if required.
- */
-int linker_reference_module(const char* _modname, struct mod_depend *_verinfo,
-			    linker_file_t* _result);
-
-/*
- * Release a reference to a module, unloading it if there are no more
- * references.  Note that one should either provide a module name and
- * optional version info or a linker file, but not both.
- */
-int linker_release_module(const char *_modname, struct mod_depend *_verinfo,
-			  linker_file_t _file);
-
-/*
- * Iterate over all of the currently loaded linker files calling the
- * predicate function while the function returns 0.  Returns the value
- * returned by the last predicate function.
- */
-int linker_file_foreach(linker_predicate_t *_predicate, void *_context);
-
-/*
- * Lookup a symbol in a file.  If deps is TRUE, look in dependencies
- * if not found in file.
- */
-caddr_t linker_file_lookup_symbol(linker_file_t _file, const char* _name, 
-				  int _deps);
-
-/*
- * Lookup a linker set in a file.  Return pointers to the first entry,
- * last + 1, and count of entries.  Use: for (p = start; p < stop; p++) {}
- * void *start is really: "struct yoursetmember ***start;"
- */
-int linker_file_lookup_set(linker_file_t _file, const char *_name,
-			   void *_start, void *_stop, int *_count);
-
-/*
- * List all functions in a file.
- */
-int linker_file_function_listall(linker_file_t, 
-				 linker_function_nameval_callback_t, void *);
-
-/*
- * Functions soley for use by the linker class handlers.
- */
-int linker_add_class(linker_class_t _cls);
-int linker_file_unload(linker_file_t _file, int flags);
-int linker_load_dependencies(linker_file_t _lf);
-linker_file_t linker_make_file(const char* _filename, linker_class_t _cls);
-
-/*
- * DDB Helpers, tuned specifically for ddb/db_kld.c
- */
-int linker_ddb_lookup(const char *_symstr, c_linker_sym_t *_sym);
-int linker_ddb_search_symbol(caddr_t _value, c_linker_sym_t *_sym,
-			     long *_diffp);
-int linker_ddb_symbol_values(c_linker_sym_t _sym, linker_symval_t *_symval);
-int linker_ddb_search_symbol_name(caddr_t value, char *buf, u_int buflen,
-				  long *offset);
-
-/*
- * stack(9) helper for situations where kernel locking is required.
- */
-int linker_search_symbol_name(caddr_t value, char *buf, u_int buflen,
-    long *offset);
-
-
-/* HWPMC helper */
-void *linker_hwpmc_list_objects(void);
-
-#endif	/* _KERNEL */
-
-/*
- * Module information subtypes
- */
-#define MODINFO_END		0x0000		/* End of list */
-#define MODINFO_NAME		0x0001		/* Name of module (string) */
-#define MODINFO_TYPE		0x0002		/* Type of module (string) */
-#define MODINFO_ADDR		0x0003		/* Loaded address */
-#define MODINFO_SIZE		0x0004		/* Size of module */
-#define MODINFO_EMPTY		0x0005		/* Has been deleted */
-#define MODINFO_ARGS		0x0006		/* Parameters string */
-#define MODINFO_METADATA	0x8000		/* Module-specfic */
-
-#define MODINFOMD_AOUTEXEC	0x0001		/* a.out exec header */
-#define MODINFOMD_ELFHDR	0x0002		/* ELF header */
-#define MODINFOMD_SSYM		0x0003		/* start of symbols */
-#define MODINFOMD_ESYM		0x0004		/* end of symbols */
-#define MODINFOMD_DYNAMIC	0x0005		/* _DYNAMIC pointer */
-/* These values are MD on these two platforms */
-#if !defined(__sparc64__) && !defined(__powerpc__)
-#define MODINFOMD_ENVP		0x0006		/* envp[] */
-#define MODINFOMD_HOWTO		0x0007		/* boothowto */
-#define MODINFOMD_KERNEND	0x0008		/* kernend */
-#endif
-#define MODINFOMD_SHDR		0x0009		/* section header table */
-#define MODINFOMD_NOCOPY	0x8000		/* don't copy this metadata to the kernel */
-
-#define MODINFOMD_DEPLIST	(0x4001 | MODINFOMD_NOCOPY)	/* depends on */
-
-#ifdef _KERNEL
-#define MD_FETCH(mdp, info, type) ({ \
-	type *__p; \
-	__p = (type *)preload_search_info((mdp), MODINFO_METADATA | (info)); \
-	__p ? *__p : 0; \
-})
-#endif
-
-#define	LINKER_HINTS_VERSION	1		/* linker.hints file version */
-
-#ifdef _KERNEL
-
-/*
- * Module lookup
- */
-extern vm_offset_t	preload_addr_relocate;
-extern caddr_t		preload_metadata;
-
-extern void *		preload_fetch_addr(caddr_t _mod);
-extern size_t		preload_fetch_size(caddr_t _mod);
-extern caddr_t		preload_search_by_name(const char *_name);
-extern caddr_t		preload_search_by_type(const char *_type);
-extern caddr_t		preload_search_next_name(caddr_t _base);
-extern caddr_t		preload_search_info(caddr_t _mod, int _inf);
-extern void		preload_delete_name(const char *_name);
-extern void		preload_bootstrap_relocate(vm_offset_t _offset);
-
-#ifdef KLD_DEBUG
-
-extern int kld_debug;
-#define KLD_DEBUG_FILE	1	/* file load/unload */
-#define KLD_DEBUG_SYM	2	/* symbol lookup */
-
-#define KLD_DPF(cat, args)					\
-	do {							\
-		if (kld_debug & KLD_DEBUG_##cat) printf args;	\
-	} while (0)
-
-#else
-
-#define KLD_DPF(cat, args)
-
-#endif
-
-typedef Elf_Addr elf_lookup_fn(linker_file_t, Elf_Size, int);
-
-/* Support functions */
-int	elf_reloc(linker_file_t _lf, Elf_Addr base, const void *_rel, int _type, elf_lookup_fn _lu);
-int	elf_reloc_local(linker_file_t _lf, Elf_Addr base, const void *_rel, int _type, elf_lookup_fn _lu);
-Elf_Addr elf_relocaddr(linker_file_t _lf, Elf_Addr addr);
-const Elf_Sym *elf_get_sym(linker_file_t _lf, Elf_Size _symidx);
-const char *elf_get_symname(linker_file_t _lf, Elf_Size _symidx);
-
-typedef struct linker_ctf {
-	const uint8_t 	*ctftab;	/* Decompressed CTF data. */
-	int 		ctfcnt;		/* Number of CTF data bytes. */
-	const Elf_Sym	*symtab;	/* Ptr to the symbol table. */
-	int		nsym;		/* Number of symbols. */
-	const char	*strtab;	/* Ptr to the string table. */
-	int 		strcnt;		/* Number of string bytes. */
-	uint32_t	**ctfoffp;	/* Ptr to array of obj/fnc offsets. */
-	uint32_t	**typoffp;	/* Ptr to array of type offsets. */
-	long		*typlenp;	/* Ptr to number of type data entries. */
-} linker_ctf_t;
-
-int	linker_ctf_get(linker_file_t, linker_ctf_t *);
-
-int elf_cpu_load_file(linker_file_t);
-int elf_cpu_unload_file(linker_file_t);
-
-/* values for type */
-#define ELF_RELOC_REL	1
-#define ELF_RELOC_RELA	2
-
-/*
- * This is version 1 of the KLD file status structure. It is identified
- * by its _size_ in the version field.
- */
-struct kld_file_stat_1 {
-    int		version;	/* set to sizeof(struct kld_file_stat_1) */
-    char        name[MAXPATHLEN];
-    int		refs;
-    int		id;
-    caddr_t	address;	/* load address */
-    size_t	size;		/* size in bytes */
-};
-#endif /* _KERNEL */
-
-struct kld_file_stat {
-    int		version;	/* set to sizeof(struct kld_file_stat) */
-    char        name[MAXPATHLEN];
-    int		refs;
-    int		id;
-    caddr_t	address;	/* load address */
-    size_t	size;		/* size in bytes */
-    char        pathname[MAXPATHLEN];
-};
-
-struct kld_sym_lookup {
-    int		version;	/* set to sizeof(struct kld_sym_lookup) */
-    char	*symname;	/* Symbol name we are looking up */
-    u_long	symvalue;
-    size_t	symsize;
-};
-#define KLDSYM_LOOKUP	1
-
-/*
- * Flags for kldunloadf() and linker_file_unload()
- */
-#define LINKER_UNLOAD_NORMAL	0
-#define LINKER_UNLOAD_FORCE	1
-
-#ifndef _KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	kldload(const char* _file);
-int	kldunload(int _fileid);
-int	kldunloadf(int _fileid, int flags);
-int	kldfind(const char* _file);
-int	kldnext(int _fileid);
-int	kldstat(int _fileid, struct kld_file_stat* _stat);
-int	kldfirstmod(int _fileid);
-int	kldsym(int _fileid, int _cmd, void *_data);
-__END_DECLS
-
-#endif
-
-#endif /* !_SYS_LINKER_H_ */
diff --git a/include.new/sys/linker_set.h b/include.new/sys/linker_set.h
deleted file mode 100644
index 84c9e40..0000000
--- a/include.new/sys/linker_set.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 1999 John D. Polstra
- * Copyright (c) 1999,2001 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.
- *
- * 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: releng/10.2/sys/sys/linker_set.h 284880 2015-06-26 21:35:36Z hselasky $
- */
-
-#ifndef _SYS_LINKER_SET_H_
-#define _SYS_LINKER_SET_H_
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-/*
- * The following macros are used to declare global sets of objects, which
- * are collected by the linker into a `linker_set' as defined below.
- * For ELF, this is done by constructing a separate segment for each set.
- */
-
-/*
- * Private macros, not to be used outside this header file.
- */
-#ifdef __GNUCLIKE___SECTION
-#define __MAKE_SET(set, sym)						\
-	__GLOBL(__CONCAT(__start_set_,set));				\
-	__GLOBL(__CONCAT(__stop_set_,set));				\
-	static void const * const __set_##set##_sym_##sym 		\
-	__section("set_" #set) __used = &sym
-#else /* !__GNUCLIKE___SECTION */
-#ifndef lint
-#error this file needs to be ported to your compiler
-#endif /* lint */
-#define __MAKE_SET(set, sym)	extern void const * const (__set_##set##_sym_##sym)
-#endif /* __GNUCLIKE___SECTION */
-
-/*
- * Public macros.
- */
-#define TEXT_SET(set, sym)	__MAKE_SET(set, sym)
-#define DATA_SET(set, sym)	__MAKE_SET(set, sym)
-#define BSS_SET(set, sym)	__MAKE_SET(set, sym)
-#define ABS_SET(set, sym)	__MAKE_SET(set, sym)
-#define SET_ENTRY(set, sym)	__MAKE_SET(set, sym)
-
-/*
- * Initialize before referring to a given linker set.
- */
-#define SET_DECLARE(set, ptype)					\
-	extern ptype __weak_symbol *__CONCAT(__start_set_,set);	\
-	extern ptype __weak_symbol *__CONCAT(__stop_set_,set)
-
-#define SET_BEGIN(set)							\
-	(&__CONCAT(__start_set_,set))
-#define SET_LIMIT(set)							\
-	(&__CONCAT(__stop_set_,set))
-
-/*
- * Iterate over all the elements of a set.
- *
- * Sets always contain addresses of things, and "pvar" points to words
- * containing those addresses.  Thus is must be declared as "type **pvar",
- * and the address of each set item is obtained inside the loop by "*pvar".
- */
-#define SET_FOREACH(pvar, set)						\
-	for (pvar = SET_BEGIN(set); pvar < SET_LIMIT(set); pvar++)
-
-#define SET_ITEM(set, i)						\
-	((SET_BEGIN(set))[i])
-
-/*
- * Provide a count of the items in a set.
- */
-#define SET_COUNT(set)							\
-	(SET_LIMIT(set) - SET_BEGIN(set))
-
-#endif	/* _SYS_LINKER_SET_H_ */
diff --git a/include.new/sys/lock.h b/include.new/sys/lock.h
deleted file mode 100644
index 2f5bdac..0000000
--- a/include.new/sys/lock.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/*-
- * Copyright (c) 1997 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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.
- *
- *	from BSDI Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp
- * $FreeBSD: releng/10.2/sys/sys/lock.h 255745 2013-09-20 23:06:21Z davide $
- */
-
-#ifndef _SYS_LOCK_H_
-#define _SYS_LOCK_H_
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-
-struct lock_list_entry;
-struct thread;
-
-/*
- * Lock classes.  Each lock has a class which describes characteristics
- * common to all types of locks of a given class.
- *
- * Spin locks in general must always protect against preemption, as it is
- * an error to perform any type of context switch while holding a spin lock.
- * Also, for an individual lock to be recursable, its class must allow
- * recursion and the lock itself must explicitly allow recursion.
- *
- * The 'lc_ddb_show' function pointer is used to dump class-specific
- * data for the 'show lock' DDB command.  The 'lc_lock' and
- * 'lc_unlock' function pointers are used in sleep(9) and cv_wait(9)
- * to lock and unlock locks while blocking on a sleep queue.  The
- * return value of 'lc_unlock' will be passed to 'lc_lock' on resume
- * to allow communication of state between the two routines.
- */
-
-struct lock_class {
-	const		char *lc_name;
-	u_int		lc_flags;
-	void		(*lc_assert)(const struct lock_object *lock, int what);
-	void		(*lc_ddb_show)(const struct lock_object *lock);
-	void		(*lc_lock)(struct lock_object *lock, uintptr_t how);
-	int		(*lc_owner)(const struct lock_object *lock,
-			    struct thread **owner);
-	uintptr_t	(*lc_unlock)(struct lock_object *lock);
-};
-
-#define	LC_SLEEPLOCK	0x00000001	/* Sleep lock. */
-#define	LC_SPINLOCK	0x00000002	/* Spin lock. */
-#define	LC_SLEEPABLE	0x00000004	/* Sleeping allowed with this lock. */
-#define	LC_RECURSABLE	0x00000008	/* Locks of this type may recurse. */
-#define	LC_UPGRADABLE	0x00000010	/* Upgrades and downgrades permitted. */
-
-#define	LO_CLASSFLAGS	0x0000ffff	/* Class specific flags. */
-#define	LO_INITIALIZED	0x00010000	/* Lock has been initialized. */
-#define	LO_WITNESS	0x00020000	/* Should witness monitor this lock. */
-#define	LO_QUIET	0x00040000	/* Don't log locking operations. */
-#define	LO_RECURSABLE	0x00080000	/* Lock may recurse. */
-#define	LO_SLEEPABLE	0x00100000	/* Lock may be held while sleeping. */
-#define	LO_UPGRADABLE	0x00200000	/* Lock may be upgraded/downgraded. */
-#define	LO_DUPOK	0x00400000	/* Don't check for duplicate acquires */
-#define	LO_IS_VNODE	0x00800000	/* Tell WITNESS about a VNODE lock */
-#define	LO_CLASSMASK	0x0f000000	/* Class index bitmask. */
-#define LO_NOPROFILE    0x10000000      /* Don't profile this lock */
-
-/*
- * Lock classes are statically assigned an index into the gobal lock_classes
- * array.  Debugging code looks up the lock class for a given lock object
- * by indexing the array.
- */
-#define	LO_CLASSSHIFT		24
-#define	LO_CLASSINDEX(lock)	((((lock)->lo_flags) & LO_CLASSMASK) >> LO_CLASSSHIFT)
-#define	LOCK_CLASS(lock)	(lock_classes[LO_CLASSINDEX((lock))])
-#define	LOCK_CLASS_MAX		(LO_CLASSMASK >> LO_CLASSSHIFT)
-
-/*
- * Option flags passed to lock operations that witness also needs to know
- * about or that are generic across all locks.
- */
-#define	LOP_NEWORDER	0x00000001	/* Define a new lock order. */
-#define	LOP_QUIET	0x00000002	/* Don't log locking operations. */
-#define	LOP_TRYLOCK	0x00000004	/* Don't check lock order. */
-#define	LOP_EXCLUSIVE	0x00000008	/* Exclusive lock. */
-#define	LOP_DUPOK	0x00000010	/* Don't check for duplicate acquires */
-
-/* Flags passed to witness_assert. */
-#define	LA_MASKASSERT	0x000000ff	/* Mask for witness defined asserts. */
-#define	LA_UNLOCKED	0x00000000	/* Lock is unlocked. */
-#define	LA_LOCKED	0x00000001	/* Lock is at least share locked. */
-#define	LA_SLOCKED	0x00000002	/* Lock is exactly share locked. */
-#define	LA_XLOCKED	0x00000004	/* Lock is exclusively locked. */
-#define	LA_RECURSED	0x00000008	/* Lock is recursed. */
-#define	LA_NOTRECURSED	0x00000010	/* Lock is not recursed. */
-
-#ifdef _KERNEL
-/*
- * If any of WITNESS, INVARIANTS, or KTR_LOCK KTR tracing has been enabled,
- * then turn on LOCK_DEBUG.  When this option is on, extra debugging
- * facilities such as tracking the file and line number of lock operations
- * are enabled.  Also, mutex locking operations are not inlined to avoid
- * bloat from all the extra debugging code.  We also have to turn on all the
- * calling conventions for this debugging code in modules so that modules can
- * work with both debug and non-debug kernels.
- */
-#if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || defined(INVARIANT_SUPPORT) || defined(KTR) || defined(LOCK_PROFILING)
-#define	LOCK_DEBUG	1
-#else
-#define	LOCK_DEBUG	0
-#endif
-
-/*
- * In the LOCK_DEBUG case, use the filename and line numbers for debugging
- * operations.  Otherwise, use default values to avoid the unneeded bloat.
- */
-#if LOCK_DEBUG > 0
-#define	LOCK_FILE	__FILE__
-#define	LOCK_LINE	__LINE__
-#else
-#define	LOCK_FILE	NULL
-#define	LOCK_LINE	0
-#endif
-
-/*
- * Macros for KTR_LOCK tracing.
- *
- * opname  - name of this operation (LOCK/UNLOCK/SLOCK, etc.)
- * lo      - struct lock_object * for this lock
- * flags   - flags passed to the lock operation
- * recurse - this locks recursion level (or 0 if class is not recursable)
- * result  - result of a try lock operation
- * file    - file name
- * line    - line number
- */
-#define	LOCK_LOG_TEST(lo, flags)					\
-	(((flags) & LOP_QUIET) == 0 && ((lo)->lo_flags & LO_QUIET) == 0)
-
-#define	LOCK_LOG_LOCK(opname, lo, flags, recurse, file, line) do {	\
-	if (LOCK_LOG_TEST((lo), (flags)))				\
-		CTR6(KTR_LOCK, opname " (%s) %s %p r = %d at %s:%d",	\
-		    LOCK_CLASS(lo)->lc_name, (lo)->lo_name,		\
-		    (lo), (u_int)(recurse), (file), (line));		\
-} while (0)
-
-#define	LOCK_LOG_TRY(opname, lo, flags, result, file, line) do {	\
-	if (LOCK_LOG_TEST((lo), (flags)))				\
-		CTR6(KTR_LOCK, "TRY_" opname " (%s) %s %p result=%d at %s:%d",\
-		    LOCK_CLASS(lo)->lc_name, (lo)->lo_name,		\
-		    (lo), (u_int)(result), (file), (line));		\
-} while (0)
-
-#define	LOCK_LOG_INIT(lo, flags) do {					\
-	if (LOCK_LOG_TEST((lo), (flags)))				\
-		CTR4(KTR_LOCK, "%s: %p (%s) %s", __func__, (lo),	\
- 		    LOCK_CLASS(lo)->lc_name, (lo)->lo_name);		\
-} while (0)
-
-#define	LOCK_LOG_DESTROY(lo, flags)	LOCK_LOG_INIT(lo, flags)
-
-#define	lock_initalized(lo)	((lo)->lo_flags & LO_INITIALIZED)
-
-/*
- * Helpful macros for quickly coming up with assertions with informative
- * panic messages.
- */
-#define MPASS(ex)		MPASS4(ex, #ex, __FILE__, __LINE__)
-#define MPASS2(ex, what)	MPASS4(ex, what, __FILE__, __LINE__)
-#define MPASS3(ex, file, line)	MPASS4(ex, #ex, file, line)
-#define MPASS4(ex, what, file, line)					\
-	KASSERT((ex), ("Assertion %s failed at %s:%d", what, file, line))
-
-extern struct lock_class lock_class_mtx_sleep;
-extern struct lock_class lock_class_mtx_spin;
-extern struct lock_class lock_class_sx;
-extern struct lock_class lock_class_rw;
-extern struct lock_class lock_class_rm;
-extern struct lock_class lock_class_rm_sleepable;
-extern struct lock_class lock_class_lockmgr;
-
-extern struct lock_class *lock_classes[];
-
-void	lock_init(struct lock_object *, struct lock_class *,
-	    const char *, const char *, int);
-void	lock_destroy(struct lock_object *);
-void	spinlock_enter(void);
-void	spinlock_exit(void);
-void	witness_init(struct lock_object *, const char *);
-void	witness_destroy(struct lock_object *);
-int	witness_defineorder(struct lock_object *, struct lock_object *);
-void	witness_checkorder(struct lock_object *, int, const char *, int,
-	    struct lock_object *);
-void	witness_lock(struct lock_object *, int, const char *, int);
-void	witness_upgrade(struct lock_object *, int, const char *, int);
-void	witness_downgrade(struct lock_object *, int, const char *, int);
-void	witness_unlock(struct lock_object *, int, const char *, int);
-void	witness_save(struct lock_object *, const char **, int *);
-void	witness_restore(struct lock_object *, const char *, int);
-int	witness_list_locks(struct lock_list_entry **,
-	    int (*)(const char *, ...));
-int	witness_warn(int, struct lock_object *, const char *, ...);
-void	witness_assert(const struct lock_object *, int, const char *, int);
-void	witness_display_spinlock(struct lock_object *, struct thread *,
-	    int (*)(const char *, ...));
-int	witness_line(struct lock_object *);
-void	witness_norelease(struct lock_object *);
-void	witness_releaseok(struct lock_object *);
-const char *witness_file(struct lock_object *);
-void	witness_thread_exit(struct thread *);
-
-#ifdef	WITNESS
-
-/* Flags for witness_warn(). */
-#define	WARN_GIANTOK	0x01	/* Giant is exempt from this check. */
-#define	WARN_PANIC	0x02	/* Panic if check fails. */
-#define	WARN_SLEEPOK	0x04	/* Sleepable locks are exempt from check. */
-
-#define	WITNESS_INIT(lock, type)					\
-	witness_init((lock), (type))
-
-#define WITNESS_DESTROY(lock)						\
-	witness_destroy(lock)
-
-#define	WITNESS_CHECKORDER(lock, flags, file, line, interlock)		\
-	witness_checkorder((lock), (flags), (file), (line), (interlock))
-
-#define	WITNESS_DEFINEORDER(lock1, lock2)				\
-	witness_defineorder((struct lock_object *)(lock1),		\
-	    (struct lock_object *)(lock2))
-
-#define	WITNESS_LOCK(lock, flags, file, line)				\
-	witness_lock((lock), (flags), (file), (line))
-
-#define	WITNESS_UPGRADE(lock, flags, file, line)			\
-	witness_upgrade((lock), (flags), (file), (line))
-
-#define	WITNESS_DOWNGRADE(lock, flags, file, line)			\
-	witness_downgrade((lock), (flags), (file), (line))
-
-#define	WITNESS_UNLOCK(lock, flags, file, line)				\
-	witness_unlock((lock), (flags), (file), (line))
-
-#define	WITNESS_CHECK(flags, lock, fmt, ...)				\
-	witness_warn((flags), (lock), (fmt), ## __VA_ARGS__)
-
-#define	WITNESS_WARN(flags, lock, fmt, ...)				\
-	witness_warn((flags), (lock), (fmt), ## __VA_ARGS__)
-
-#define	WITNESS_SAVE_DECL(n)						\
-	const char * __CONCAT(n, __wf);					\
-	int __CONCAT(n, __wl)
-
-#define	WITNESS_SAVE(lock, n) 						\
-	witness_save((lock), &__CONCAT(n, __wf), &__CONCAT(n, __wl))
-
-#define	WITNESS_RESTORE(lock, n) 					\
-	witness_restore((lock), __CONCAT(n, __wf), __CONCAT(n, __wl))
-
-#define	WITNESS_NORELEASE(lock)						\
-	witness_norelease(&(lock)->lock_object)
-
-#define	WITNESS_RELEASEOK(lock)						\
-	witness_releaseok(&(lock)->lock_object)
-
-#define	WITNESS_FILE(lock) 						\
-	witness_file(lock)
-
-#define	WITNESS_LINE(lock) 						\
-	witness_line(lock)
-
-#else	/* WITNESS */
-#define	WITNESS_INIT(lock, type)				(void)0
-#define	WITNESS_DESTROY(lock)					(void)0
-#define	WITNESS_DEFINEORDER(lock1, lock2)	0
-#define	WITNESS_CHECKORDER(lock, flags, file, line, interlock)	(void)0
-#define	WITNESS_LOCK(lock, flags, file, line)			(void)0
-#define	WITNESS_UPGRADE(lock, flags, file, line)		(void)0
-#define	WITNESS_DOWNGRADE(lock, flags, file, line)		(void)0
-#define	WITNESS_UNLOCK(lock, flags, file, line)			(void)0
-#define	WITNESS_CHECK(flags, lock, fmt, ...)	0
-#define	WITNESS_WARN(flags, lock, fmt, ...)			(void)0
-#define	WITNESS_SAVE_DECL(n)					(void)0
-#define	WITNESS_SAVE(lock, n)					(void)0
-#define	WITNESS_RESTORE(lock, n)				(void)0
-#define	WITNESS_NORELEASE(lock)					(void)0
-#define	WITNESS_RELEASEOK(lock)					(void)0
-#define	WITNESS_FILE(lock) ("?")
-#define	WITNESS_LINE(lock) (0)
-#endif	/* WITNESS */
-
-#endif	/* _KERNEL */
-#endif	/* _SYS_LOCK_H_ */
diff --git a/include.new/sys/lock_profile.h b/include.new/sys/lock_profile.h
deleted file mode 100644
index 62a7d21..0000000
--- a/include.new/sys/lock_profile.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 2006 Kip Macy kmacy@FreeBSD.org
- * Copyright (c) 2006 Kris Kennaway kris@FreeBSD.org
- * Copyright (c) 2006 Dag-Erling Smorgrav des@des.no
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 SHAL THE AUTHORS 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: releng/10.2/sys/sys/lock_profile.h 194578 2009-06-21 09:01:12Z rdivacky $
- */
-
-
-#ifndef _SYS_LOCK_PROFILE_H_
-#define _SYS_LOCK_PROFILE_H_
-
-struct lock_profile_object;
-LIST_HEAD(lpohead, lock_profile_object);
-
-#ifdef _KERNEL
-#ifdef LOCK_PROFILING
-#include <machine/cpufunc.h>
-#include <sys/lock.h>
-
-#ifndef USE_CPU_NANOSECONDS
-u_int64_t nanoseconds(void);
-#endif
-
-extern volatile int lock_prof_enable;
-
-void lock_profile_obtain_lock_success(struct lock_object *lo, int contested,
-    uint64_t waittime, const char *file, int line);
-void lock_profile_release_lock(struct lock_object *lo);
-void lock_profile_thread_exit(struct thread *td);
-
-
-static inline void
-lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested,
-    uint64_t *waittime)
-{
-	if (!lock_prof_enable || (lo->lo_flags & LO_NOPROFILE) || *contested)
-		return;
-	*waittime = nanoseconds();
-	*contested = 1;
-}
-
-#else /* !LOCK_PROFILING */
-
-#define	lock_profile_release_lock(lo)					(void)0
-#define lock_profile_obtain_lock_failed(lo, contested, waittime)	(void)0
-#define lock_profile_obtain_lock_success(lo, contested, waittime, file, line)	(void)0
-#define	lock_profile_thread_exit(td)					(void)0
-
-#endif  /* !LOCK_PROFILING */
-
-#endif /* _KERNEL */
-
-#endif /* _SYS_LOCK_PROFILE_H_ */
diff --git a/include.new/sys/lockf.h b/include.new/sys/lockf.h
deleted file mode 100644
index 26116db..0000000
--- a/include.new/sys/lockf.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Scooter Morris at Genentech Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)lockf.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: releng/10.2/sys/sys/lockf.h 192685 2009-05-24 12:39:38Z kib $
- */
-
-#ifndef _SYS_LOCKF_H_
-#define	_SYS_LOCKF_H_
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_sx.h>
-
-struct flock;
-struct vop_advlock_args;
-struct vop_advlockasync_args;
-
-/*
- * The lockf_entry structure is a kernel structure which contains the
- * information associated with a byte range lock.  The lockf_entry
- * structures are linked into the inode structure. Locks are sorted by
- * the starting byte of the lock for efficiency.
- *
- * Active and pending locks on a vnode are organised into a
- * graph. Each pending lock has an out-going edge to each active lock
- * that blocks it.
- *
- * Locks:
- * (i)		locked by the vnode interlock
- * (s)		locked by state->ls_lock
- * (S)		locked by lf_lock_states_lock
- * (c)		const until freeing
- */
-struct lockf_edge {
-	LIST_ENTRY(lockf_edge) le_outlink; /* (s) link from's out-edge list */
-	LIST_ENTRY(lockf_edge) le_inlink; /* (s) link to's in-edge list */
-	struct lockf_entry *le_from;	/* (c) out-going from here */
-	struct lockf_entry *le_to;	/* (s) in-coming to here */
-};
-LIST_HEAD(lockf_edge_list, lockf_edge);
-
-struct lockf_entry {
-	short	lf_flags;	    /* (c) Semantics: F_POSIX, F_FLOCK, F_WAIT */
-	short	lf_type;	    /* (s) Lock type: F_RDLCK, F_WRLCK */
-	off_t	lf_start;	    /* (s) Byte # of the start of the lock */
-	off_t	lf_end;		    /* (s) Byte # of the end of the lock (OFF_MAX=EOF) */
-	struct	lock_owner *lf_owner; /* (c) Owner of the lock */
-	struct	vnode *lf_vnode;    /* (c) File being locked (only valid for active lock) */
-	struct	inode *lf_inode;    /* (c) Back pointer to the inode */
-	struct	task *lf_async_task;/* (c) Async lock callback */
-	LIST_ENTRY(lockf_entry) lf_link;  /* (s) Linkage for lock lists */
-	struct lockf_edge_list lf_outedges; /* (s) list of out-edges */
-	struct lockf_edge_list lf_inedges; /* (s) list of out-edges */
-	int	lf_refs;	    /* (s) ref count */
-};
-LIST_HEAD(lockf_entry_list, lockf_entry);
-
-/*
- * Extra lf_flags bits used by the implementation
- */
-#define	F_INTR		0x8000	/* lock was interrupted by lf_purgelocks */
-
-/*
- * Filesystem private node structures should include space for a
- * pointer to a struct lockf_state. This pointer is used by the lock
- * manager to track the locking state for a file.
- *
- * The ls_active list contains the set of active locks on the file. It
- * is strictly ordered by the lock's lf_start value. Each active lock
- * will have in-coming edges to any pending lock which it blocks.
- *
- * Lock requests which are blocked by some other active lock are
- * listed in ls_pending with newer requests first in the list. Lock
- * requests in this list will have out-going edges to each active lock
- * that blocks then. They will also have out-going edges to each
- * pending lock that is older in the queue - this helps to ensure
- * fairness when several processes are contenting to lock the same
- * record.
-
- * The value of ls_threads is the number of threads currently using
- * the state structure (typically either setting/clearing locks or
- * sleeping waiting to do so). This is used to defer freeing the
- * structure while some thread is still using it.
- */
-struct lockf {
-	LIST_ENTRY(lockf) ls_link;	/* (S) all active lockf states */
-	struct	sx	ls_lock;
-	struct	lockf_entry_list ls_active; /* (s) Active locks */
-	struct	lockf_entry_list ls_pending; /* (s) Pending locks */
-	int		ls_threads;	/* (i) Thread count */
-};
-LIST_HEAD(lockf_list, lockf);
-
-typedef int lf_iterator(struct vnode *, struct flock *, void *);
-
-int	 lf_advlock(struct vop_advlock_args *, struct lockf **, u_quad_t);
-int	 lf_advlockasync(struct vop_advlockasync_args *, struct lockf **, u_quad_t);
-void	 lf_purgelocks(struct vnode *vp, struct lockf **statep);
-int	 lf_iteratelocks_sysid(int sysid, lf_iterator *, void *);
-int	 lf_iteratelocks_vnode(struct vnode *vp, lf_iterator *, void *);
-int	 lf_countlocks(int sysid);
-void	 lf_clearremotesys(int sysid);
-
-#endif /* !_SYS_LOCKF_H_ */
diff --git a/include.new/sys/lockmgr.h b/include.new/sys/lockmgr.h
deleted file mode 100644
index cd05d03..0000000
--- a/include.new/sys/lockmgr.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*-
- * Copyright (c) 2008 Attilio Rao <attilio@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible 
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/sys/sys/lockmgr.h 274606 2014-11-16 23:02:32Z kib $
- */
-
-#ifndef	_SYS_LOCKMGR_H_
-#define	_SYS_LOCKMGR_H_
-
-#include <sys/_lock.h>
-#include <sys/_lockmgr.h>
-#include <sys/_mutex.h>
-#include <sys/_rwlock.h>
-
-#define	LK_SHARE			0x01
-#define	LK_SHARED_WAITERS		0x02
-#define	LK_EXCLUSIVE_WAITERS		0x04
-#define	LK_EXCLUSIVE_SPINNERS		0x08
-#define	LK_ALL_WAITERS							\
-	(LK_SHARED_WAITERS | LK_EXCLUSIVE_WAITERS)
-#define	LK_FLAGMASK							\
-	(LK_SHARE | LK_ALL_WAITERS | LK_EXCLUSIVE_SPINNERS)
-
-#define	LK_HOLDER(x)			((x) & ~LK_FLAGMASK)
-#define	LK_SHARERS_SHIFT		4
-#define	LK_SHARERS(x)			(LK_HOLDER(x) >> LK_SHARERS_SHIFT)
-#define	LK_SHARERS_LOCK(x)		((x) << LK_SHARERS_SHIFT | LK_SHARE)
-#define	LK_ONE_SHARER			(1 << LK_SHARERS_SHIFT)
-#define	LK_UNLOCKED			LK_SHARERS_LOCK(0)
-#define	LK_KERNPROC			((uintptr_t)(-1) & ~LK_FLAGMASK)
-
-#ifdef _KERNEL
-
-#if !defined(LOCK_FILE) || !defined(LOCK_LINE)
-#error	"LOCK_FILE and LOCK_LINE not defined, include <sys/lock.h> before"
-#endif
-
-struct thread;
-#define	lk_recurse	lock_object.lo_data
-
-/*
- * Function prototipes.  Routines that start with an underscore are not part
- * of the public interface and might be wrappered with a macro.
- */
-int	 __lockmgr_args(struct lock *lk, u_int flags, struct lock_object *ilk,
-	    const char *wmesg, int prio, int timo, const char *file, int line);
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-void	 _lockmgr_assert(const struct lock *lk, int what, const char *file, int line);
-#endif
-void	 _lockmgr_disown(struct lock *lk, const char *file, int line);
-
-void	 lockallowrecurse(struct lock *lk);
-void	 lockallowshare(struct lock *lk);
-void	 lockdestroy(struct lock *lk);
-void	 lockdisablerecurse(struct lock *lk);
-void	 lockdisableshare(struct lock *lk);
-void	 lockinit(struct lock *lk, int prio, const char *wmesg, int timo,
-	    int flags);
-#ifdef DDB
-int	 lockmgr_chain(struct thread *td, struct thread **ownerp);
-#endif
-void	 lockmgr_printinfo(const struct lock *lk);
-int	 lockstatus(const struct lock *lk);
-
-/*
- * As far as the ilk can be a static NULL pointer these functions need a
- * strict prototype in order to safely use the lock_object member.
- */
-static __inline int
-_lockmgr_args(struct lock *lk, u_int flags, struct mtx *ilk, const char *wmesg,
-    int prio, int timo, const char *file, int line)
-{
-
-	return (__lockmgr_args(lk, flags, (ilk != NULL) ? &ilk->lock_object :
-	    NULL, wmesg, prio, timo, file, line));
-}
-
-static __inline int
-_lockmgr_args_rw(struct lock *lk, u_int flags, struct rwlock *ilk,
-    const char *wmesg, int prio, int timo, const char *file, int line)
-{
-
-	return (__lockmgr_args(lk, flags, (ilk != NULL) ? &ilk->lock_object :
-	    NULL, wmesg, prio, timo, file, line));
-}
-
-/*
- * Define aliases in order to complete lockmgr KPI.
- */
-#define	lockmgr(lk, flags, ilk)						\
-	_lockmgr_args((lk), (flags), (ilk), LK_WMESG_DEFAULT,		\
-	    LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, LOCK_FILE, LOCK_LINE)
-#define	lockmgr_args(lk, flags, ilk, wmesg, prio, timo)			\
-	_lockmgr_args((lk), (flags), (ilk), (wmesg), (prio), (timo),	\
-	    LOCK_FILE, LOCK_LINE)
-#define	lockmgr_args_rw(lk, flags, ilk, wmesg, prio, timo)		\
-	_lockmgr_args_rw((lk), (flags), (ilk), (wmesg), (prio), (timo),	\
-	    LOCK_FILE, LOCK_LINE)
-#define	lockmgr_disown(lk)						\
-	_lockmgr_disown((lk), LOCK_FILE, LOCK_LINE)
-#define	lockmgr_recursed(lk)						\
-	((lk)->lk_recurse != 0)
-#define	lockmgr_rw(lk, flags, ilk)					\
-	_lockmgr_args_rw((lk), (flags), (ilk), LK_WMESG_DEFAULT,	\
-	    LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, LOCK_FILE, LOCK_LINE)
-#define	lockmgr_waiters(lk)						\
-	((lk)->lk_lock & LK_ALL_WAITERS)
-#ifdef INVARIANTS
-#define	lockmgr_assert(lk, what)					\
-	_lockmgr_assert((lk), (what), LOCK_FILE, LOCK_LINE)
-#else
-#define	lockmgr_assert(lk, what)
-#endif
-
-/*
- * Flags for lockinit().
- */
-#define	LK_INIT_MASK	0x0000FF
-#define	LK_CANRECURSE	0x000001
-#define	LK_NODUP	0x000002
-#define	LK_NOPROFILE	0x000004
-#define	LK_NOSHARE	0x000008
-#define	LK_NOWITNESS	0x000010
-#define	LK_QUIET	0x000020
-#define	LK_ADAPTIVE	0x000040
-#define	LK_IS_VNODE	0x000080	/* Tell WITNESS about a VNODE lock */
-
-/*
- * Additional attributes to be used in lockmgr().
- */
-#define	LK_EATTR_MASK	0x00FF00
-#define	LK_INTERLOCK	0x000100
-#define	LK_NOWAIT	0x000200
-#define	LK_RETRY	0x000400
-#define	LK_SLEEPFAIL	0x000800
-#define	LK_TIMELOCK	0x001000
-#define	LK_NODDLKTREAT	0x002000
-
-/*
- * Operations for lockmgr().
- */
-#define	LK_TYPE_MASK	0xFF0000
-#define	LK_DOWNGRADE	0x010000
-#define	LK_DRAIN	0x020000
-#define	LK_EXCLOTHER	0x040000
-#define	LK_EXCLUSIVE	0x080000
-#define	LK_RELEASE	0x100000
-#define	LK_SHARED	0x200000
-#define	LK_UPGRADE	0x400000
-#define	LK_TRYUPGRADE	0x800000
-
-#define	LK_TOTAL_MASK	(LK_INIT_MASK | LK_EATTR_MASK | LK_TYPE_MASK)
-
-/*
- * Default values for lockmgr_args().
- */
-#define	LK_WMESG_DEFAULT	(NULL)
-#define	LK_PRIO_DEFAULT		(0)
-#define	LK_TIMO_DEFAULT		(0)
-
-/*
- * Assertion flags.
- */
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-#define	KA_LOCKED	LA_LOCKED
-#define	KA_SLOCKED	LA_SLOCKED
-#define	KA_XLOCKED	LA_XLOCKED
-#define	KA_UNLOCKED	LA_UNLOCKED
-#define	KA_RECURSED	LA_RECURSED
-#define	KA_NOTRECURSED	LA_NOTRECURSED
-#endif
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_LOCKMGR_H_ */
diff --git a/include.new/sys/lockstat.h b/include.new/sys/lockstat.h
deleted file mode 100644
index cc5682b..0000000
--- a/include.new/sys/lockstat.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*-
- * Copyright (c) 2008-2009 Stacey Son <sson@FreeBSD.org> 
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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: releng/10.2/sys/sys/lockstat.h 285759 2015-07-21 17:16:37Z markj $
- */
- 
-/*
- * DTrace lockstat provider definitions
- *
- */
-
-#ifndef	_SYS_LOCKSTAT_H
-#define	_SYS_LOCKSTAT_H
-
-#ifdef	_KERNEL
-
-/*
- * Spin Locks
- */
-#define	LS_MTX_SPIN_LOCK_ACQUIRE	0
-#define	LS_MTX_SPIN_UNLOCK_RELEASE	1
-#define	LS_MTX_SPIN_LOCK_SPIN		2
-
-/*
- * Adaptive Locks
- */
-#define	LS_MTX_LOCK_ACQUIRE		3
-#define	LS_MTX_UNLOCK_RELEASE		4
-#define	LS_MTX_LOCK_SPIN		5
-#define	LS_MTX_LOCK_BLOCK		6
-#define	LS_MTX_TRYLOCK_ACQUIRE		7
-
-/*
- * Reader/Writer Locks
- */
-#define	LS_RW_RLOCK_ACQUIRE		8
-#define	LS_RW_RUNLOCK_RELEASE		9	
-#define	LS_RW_WLOCK_ACQUIRE		10
-#define	LS_RW_WUNLOCK_RELEASE		11
-#define	LS_RW_RLOCK_SPIN		12
-#define	LS_RW_RLOCK_BLOCK		13
-#define	LS_RW_WLOCK_SPIN		14
-#define	LS_RW_WLOCK_BLOCK		15
-#define	LS_RW_TRYUPGRADE_UPGRADE	16
-#define	LS_RW_DOWNGRADE_DOWNGRADE	17
-
-/*
- * Shared/Exclusive Locks
- */
-#define	LS_SX_SLOCK_ACQUIRE		18
-#define	LS_SX_SUNLOCK_RELEASE		19
-#define	LS_SX_XLOCK_ACQUIRE		20
-#define	LS_SX_XUNLOCK_RELEASE		21
-#define	LS_SX_SLOCK_SPIN		22
-#define	LS_SX_SLOCK_BLOCK		23
-#define	LS_SX_XLOCK_SPIN		24
-#define	LS_SX_XLOCK_BLOCK		25
-#define	LS_SX_TRYUPGRADE_UPGRADE	26
-#define	LS_SX_DOWNGRADE_DOWNGRADE	27
-
-/* 
- * Thread Locks
- */
-#define	LS_THREAD_LOCK_SPIN		28
-
-/*
- * Lockmanager Locks 
- *  According to locking(9) Lockmgr locks are "Largely deprecated"
- *  so no support for these have been added in the lockstat provider.
- */
-
-#define	LS_NPROBES			29
-
-#define	LS_MTX_LOCK			"mtx_lock"
-#define	LS_MTX_UNLOCK			"mtx_unlock"
-#define	LS_MTX_SPIN_LOCK		"mtx_lock_spin"
-#define	LS_MTX_SPIN_UNLOCK		"mtx_unlock_spin"
-#define	LS_MTX_TRYLOCK			"mtx_trylock"
-#define	LS_RW_RLOCK			"rw_rlock"
-#define	LS_RW_WLOCK			"rw_wlock"
-#define	LS_RW_RUNLOCK			"rw_runlock"
-#define	LS_RW_WUNLOCK			"rw_wunlock"
-#define	LS_RW_TRYUPGRADE		"rw_try_upgrade"
-#define	LS_RW_DOWNGRADE			"rw_downgrade"
-#define	LS_SX_SLOCK			"sx_slock"
-#define	LS_SX_XLOCK			"sx_xlock"
-#define	LS_SX_SUNLOCK			"sx_sunlock"
-#define	LS_SX_XUNLOCK			"sx_xunlock"
-#define	LS_SX_TRYUPGRADE		"sx_try_upgrade"
-#define	LS_SX_DOWNGRADE			"sx_downgrade"
-#define	LS_THREAD_LOCK			"thread_lock"
-
-#define	LS_ACQUIRE			"acquire"
-#define	LS_RELEASE			"release"
-#define	LS_SPIN				"spin"
-#define	LS_BLOCK			"block"
-#define	LS_UPGRADE			"upgrade"
-#define	LS_DOWNGRADE			"downgrade"
-
-#define	LS_TYPE_ADAPTIVE		"adaptive"
-#define	LS_TYPE_SPIN			"spin"
-#define	LS_TYPE_THREAD			"thread"
-#define	LS_TYPE_RW			"rw"
-#define	LS_TYPE_SX			"sx"
-
-#define	LSA_ACQUIRE			(LS_TYPE_ADAPTIVE "-" LS_ACQUIRE)
-#define	LSA_RELEASE			(LS_TYPE_ADAPTIVE "-" LS_RELEASE)
-#define	LSA_SPIN			(LS_TYPE_ADAPTIVE "-" LS_SPIN)
-#define	LSA_BLOCK			(LS_TYPE_ADAPTIVE "-" LS_BLOCK)
-#define	LSS_ACQUIRE			(LS_TYPE_SPIN "-" LS_ACQUIRE)
-#define	LSS_RELEASE			(LS_TYPE_SPIN "-" LS_RELEASE)
-#define	LSS_SPIN			(LS_TYPE_SPIN "-" LS_SPIN)
-#define	LSR_ACQUIRE			(LS_TYPE_RW "-" LS_ACQUIRE)
-#define	LSR_RELEASE			(LS_TYPE_RW "-" LS_RELEASE)
-#define	LSR_BLOCK			(LS_TYPE_RW "-" LS_BLOCK)
-#define	LSR_SPIN			(LS_TYPE_RW "-" LS_SPIN)
-#define	LSR_UPGRADE			(LS_TYPE_RW "-" LS_UPGRADE)
-#define	LSR_DOWNGRADE			(LS_TYPE_RW "-" LS_DOWNGRADE)
-#define	LSX_ACQUIRE			(LS_TYPE_SX "-" LS_ACQUIRE)
-#define	LSX_RELEASE			(LS_TYPE_SX "-" LS_RELEASE)
-#define	LSX_BLOCK			(LS_TYPE_SX "-" LS_BLOCK)
-#define	LSX_SPIN			(LS_TYPE_SX "-" LS_SPIN)
-#define	LSX_UPGRADE			(LS_TYPE_SX "-" LS_UPGRADE)
-#define	LSX_DOWNGRADE			(LS_TYPE_SX "-" LS_DOWNGRADE)
-#define	LST_SPIN			(LS_TYPE_THREAD "-" LS_SPIN)
-
-/*
- * The following must match the type definition of dtrace_probe.  It is
- * defined this way to avoid having to rely on CDDL code.
- */
-struct lock_object;
-extern uint32_t lockstat_probemap[LS_NPROBES];
-typedef void (*lockstat_probe_func_t)(uint32_t, uintptr_t arg0, uintptr_t arg1,
-    uintptr_t arg2, uintptr_t arg3, uintptr_t arg4);
-extern lockstat_probe_func_t lockstat_probe_func;
-extern uint64_t lockstat_nsecs(struct lock_object *);
-extern int lockstat_enabled;
-
-#ifdef	KDTRACE_HOOKS
-/*
- * Macros to record lockstat probes.
- */
-#define	LOCKSTAT_RECORD4(probe, lp, arg1, arg2, arg3, arg4)  do {	\
-	uint32_t id;							\
-									\
-	if ((id = lockstat_probemap[(probe)])) 				\
-	    (*lockstat_probe_func)(id, (uintptr_t)(lp), (arg1),	(arg2),	\
-		(arg3), (arg4));					\
-} while (0)
-
-#define	LOCKSTAT_RECORD(probe, lp, arg1) \
-	LOCKSTAT_RECORD4(probe, lp, arg1, 0, 0, 0)
-
-#define	LOCKSTAT_RECORD0(probe, lp)     \
-	LOCKSTAT_RECORD4(probe, lp, 0, 0, 0, 0)
-
-#define	LOCKSTAT_RECORD1(probe, lp, arg1) \
-	LOCKSTAT_RECORD4(probe, lp, arg1, 0, 0, 0)
-
-#define	LOCKSTAT_RECORD2(probe, lp, arg1, arg2) \
-	LOCKSTAT_RECORD4(probe, lp, arg1, arg2, 0, 0)
-
-#define	LOCKSTAT_RECORD3(probe, lp, arg1, arg2, arg3) \
-	LOCKSTAT_RECORD4(probe, lp, arg1, arg2, arg3, 0)
-
-#define	LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(probe, lp, c, wt, f, l)  do {   \
-	uint32_t id;							     \
-									     \
-    	lock_profile_obtain_lock_success(&(lp)->lock_object, c, wt, f, l);   \
-	if ((id = lockstat_probemap[(probe)])) 			     	     \
-		(*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, 0, 0);     \
-} while (0)
-
-#define	LOCKSTAT_PROFILE_RELEASE_LOCK(probe, lp)  do {			     \
-	uint32_t id;							     \
-									     \
-	lock_profile_release_lock(&(lp)->lock_object);			     \
-	if ((id = lockstat_probemap[(probe)])) 			     	     \
-		(*lockstat_probe_func)(id, (uintptr_t)(lp), 0, 0, 0, 0);     \
-} while (0)
-
-#define	LOCKSTAT_WRITER		0
-#define	LOCKSTAT_READER		1
-
-#else	/* !KDTRACE_HOOKS */
-
-#define	LOCKSTAT_RECORD(probe, lp, arg1)
-#define	LOCKSTAT_RECORD0(probe, lp)
-#define	LOCKSTAT_RECORD1(probe, lp, arg1)
-#define	LOCKSTAT_RECORD2(probe, lp, arg1, arg2)
-#define	LOCKSTAT_RECORD3(probe, lp, arg1, arg2, arg3)
-#define	LOCKSTAT_RECORD4(probe, lp, arg1, arg2, arg3, arg4)
-
-#define	LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(probe, lp, c, wt, f, l)	\
-	lock_profile_obtain_lock_success(&(lp)->lock_object, c, wt, f, l)
-
-#define	LOCKSTAT_PROFILE_RELEASE_LOCK(probe, lp)  			\
-	lock_profile_release_lock(&(lp)->lock_object)
-
-#endif	/* !KDTRACE_HOOKS */
-
-#endif	/* _KERNEL */
-
-#endif	/* _SYS_LOCKSTAT_H */
diff --git a/include.new/sys/loginclass.h b/include.new/sys/loginclass.h
deleted file mode 100644
index d0748e3..0000000
--- a/include.new/sys/loginclass.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Edward Tomasz Napierala under sponsorship
- * from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/loginclass.h 220137 2011-03-29 17:47:25Z trasz $
- */
-
-#ifndef _SYS_LOGINCLASS_H_
-#define	_SYS_LOGINCLASS_H_
-
-struct racct;
-
-/*
- * Exactly one of these structures exists per login class.
- */
-struct loginclass {
-	LIST_ENTRY(loginclass)	lc_next;
-	char			lc_name[MAXLOGNAME];
-	u_int			lc_refcount;
-	struct racct		*lc_racct;
-};
-
-void	loginclass_hold(struct loginclass *lc);
-void	loginclass_free(struct loginclass *lc);
-struct loginclass	*loginclass_find(const char *name);
-void	loginclass_racct_foreach(void (*callback)(struct racct *racct,
-	    void *arg2, void *arg3), void *arg2, void *arg3);
-
-#endif /* !_SYS_LOGINCLASS_H_ */
diff --git a/include.new/sys/mac.h b/include.new/sys/mac.h
deleted file mode 100644
index 99dc6b1..0000000
--- a/include.new/sys/mac.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * Copyright (c) 2001-2005 Networks Associates Technology, Inc.
- * Copyright (c) 2005-2006 SPARTA, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * This software was enhanced by SPARTA ISSO under SPAWAR contract
- * N66001-04-C-6019 ("SEFOS").
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/mac.h 166537 2007-02-06 16:24:57Z rwatson $
- */
-/*
- * Userland interface for Mandatory Access Control.  Loosely based on the
- * POSIX.1e API.  More information may be found at:
- *
- * http://www.TrustedBSD.org/
- */
-
-#ifndef _SYS_MAC_H_
-#define	_SYS_MAC_H_
-
-#ifndef _POSIX_MAC
-#define	_POSIX_MAC
-#endif
-
-/*
- * MAC framework-related constants and limits.
- */
-#define	MAC_MAX_POLICY_NAME		32
-#define	MAC_MAX_LABEL_ELEMENT_NAME	32
-#define	MAC_MAX_LABEL_ELEMENT_DATA	4096
-#define	MAC_MAX_LABEL_BUF_LEN		8192
-
-/*
- * struct mac is the data structure used to carry MAC labels in system calls
- * and ioctls between userspace and the kernel.
- */
-struct mac {
-	size_t		 m_buflen;
-	char		*m_string;
-};
-
-typedef struct mac	*mac_t;
-
-#ifndef _KERNEL
-
-/*
- * Location of the userland MAC framework configuration file.  mac.conf
- * set defaults for MAC-aware applications.
- */
-#define	MAC_CONFFILE	"/etc/mac.conf"
-
-/*
- * Extended non-POSIX.1e interfaces that offer additional services available
- * from the userland and kernel MAC frameworks.
- */
-__BEGIN_DECLS
-int	 mac_execve(char *fname, char **argv, char **envv, mac_t _label);
-int	 mac_free(mac_t _label);
-int	 mac_from_text(mac_t *_label, const char *_text);
-int	 mac_get_fd(int _fd, mac_t _label);
-int	 mac_get_file(const char *_path, mac_t _label);
-int	 mac_get_link(const char *_path, mac_t _label);
-int	 mac_get_peer(int _fd, mac_t _label);
-int	 mac_get_pid(pid_t _pid, mac_t _label);
-int	 mac_get_proc(mac_t _label);
-int	 mac_is_present(const char *_policyname);
-int	 mac_prepare(mac_t *_label, const char *_elements);
-int	 mac_prepare_file_label(mac_t *_label);
-int	 mac_prepare_ifnet_label(mac_t *_label);
-int	 mac_prepare_process_label(mac_t *_label);
-int	 mac_prepare_type(mac_t *_label, const char *_type);
-int	 mac_set_fd(int _fildes, const mac_t _label);
-int	 mac_set_file(const char *_path, mac_t _label);
-int	 mac_set_link(const char *_path, mac_t _label);
-int	 mac_set_proc(const mac_t _label);
-int	 mac_syscall(const char *_policyname, int _call, void *_arg);
-int	 mac_to_text(mac_t mac, char **_text);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_MAC_H_ */
diff --git a/include.new/sys/mac_policy.h b/include.new/sys/mac_policy.h
deleted file mode 100644
index d5f7378..0000000
--- a/include.new/sys/mac_policy.h
+++ /dev/null
@@ -1,653 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * Copyright (c) 2001-2005 Networks Associates Technology, Inc.
- * Copyright (c) 2005 SPARTA, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * This software was enhanced by SPARTA ISSO under SPAWAR contract 
- * N66001-04-C-6019 ("SEFOS").
- *
- * 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.
- *
- * 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/mac_policy.h,v 1.66.2.5 2006/09/19 15:45:22 csjp Exp $
- */
-/*
- * Kernel interface for MAC policy modules.
- */
-#ifndef _SYS_MAC_POLICY_H_
-#define _SYS_MAC_POLICY_H_
-
-/*-
- * Pluggable access control policy definition structure.
- *
- * List of operations that are performed as part of the implementation
- * of a MAC policy.  Policy implementors declare operations with a
- * mac_policy_ops structure, and using the MAC_POLICY_SET() macro.
- * If an entry point is not declared, then then the policy will be ignored
- * during evaluation of that event or check.
- *
- * Operations are sorted first by general class of operation, then
- * alphabetically.
- */
-struct acl;
-struct bpf_d;
-struct componentname;
-struct devfs_dirent;
-struct ifnet;
-struct image_params;
-struct inpcb;
-struct ipq;
-struct ksem;
-struct label;
-struct mac_policy_conf;
-struct mbuf;
-struct mount;
-struct msqid_kernel;
-struct pipepair;
-struct proc;
-struct sbuf;
-struct semid_kernel;
-struct shmid_kernel;
-struct sockaddr;
-struct socket;
-struct sysctl_oid;
-struct sysctl_req;
-struct thread;
-struct ucred;
-struct uio;
-struct vattr;
-struct vnode;
-struct mac_policy_ops {
-	/*
-	 * Policy module operations.
-	 */
-	void	(*mpo_destroy)(struct mac_policy_conf *mpc);
-	void	(*mpo_init)(struct mac_policy_conf *mpc);
-
-	/*
-	 * General policy-directed security system call so that policies may
-	 * implement new services without reserving explicit system call
-	 * numbers.
-	 */
-	int	(*mpo_syscall)(struct thread *td, int call, void *arg);
-
-	/*
-	 * Label operations.  Initialize label storage, destroy label
-	 * storage, recycle for re-use without init/destroy, copy a label to
-	 * initialized storage, and externalize/internalize from/to
-	 * initialized storage.
-	 */
-	void	(*mpo_init_bpfdesc_label)(struct label *label);
-	void	(*mpo_init_cred_label)(struct label *label);
-	void	(*mpo_init_devfsdirent_label)(struct label *label);
-	void	(*_mpo_placeholder0)(void);
-	void	(*mpo_init_ifnet_label)(struct label *label);
-	int	(*mpo_init_inpcb_label)(struct label *label, int flag);
-	void	(*mpo_init_sysv_msgmsg_label)(struct label *label);
-	void	(*mpo_init_sysv_msgqueue_label)(struct label *label);
-	void	(*mpo_init_sysv_sem_label)(struct label *label);
-	void	(*mpo_init_sysv_shm_label)(struct label *label);
-	int	(*mpo_init_ipq_label)(struct label *label, int flag);
-	int	(*mpo_init_mbuf_label)(struct label *label, int flag);
-	void	(*mpo_init_mount_label)(struct label *label);
-	void	(*mpo_init_mount_fs_label)(struct label *label);
-	int	(*mpo_init_socket_label)(struct label *label, int flag);
-	int	(*mpo_init_socket_peer_label)(struct label *label, int flag);
-	void	(*mpo_init_pipe_label)(struct label *label);
-	void    (*mpo_init_posix_sem_label)(struct label *label);
-	void	(*mpo_init_proc_label)(struct label *label);
-	void	(*mpo_init_vnode_label)(struct label *label);
-	void	(*mpo_destroy_bpfdesc_label)(struct label *label);
-	void	(*mpo_destroy_cred_label)(struct label *label);
-	void	(*mpo_destroy_devfsdirent_label)(struct label *label);
-	void	(*_mpo_placeholder1)(void);
-	void	(*mpo_destroy_ifnet_label)(struct label *label);
-	void	(*mpo_destroy_inpcb_label)(struct label *label);
-	void	(*mpo_destroy_sysv_msgmsg_label)(struct label *label);
-	void	(*mpo_destroy_sysv_msgqueue_label)(struct label *label);
-	void	(*mpo_destroy_sysv_sem_label)(struct label *label);
-	void	(*mpo_destroy_sysv_shm_label)(struct label *label);
-	void	(*mpo_destroy_ipq_label)(struct label *label);
-	void	(*mpo_destroy_mbuf_label)(struct label *label);
-	void	(*mpo_destroy_mount_label)(struct label *label);
-	void	(*mpo_destroy_mount_fs_label)(struct label *label);
-	void	(*mpo_destroy_socket_label)(struct label *label);
-	void	(*mpo_destroy_socket_peer_label)(struct label *label);
-	void	(*mpo_destroy_pipe_label)(struct label *label);
-	void    (*mpo_destroy_posix_sem_label)(struct label *label);
-	void	(*mpo_destroy_proc_label)(struct label *label);
-	void	(*mpo_destroy_vnode_label)(struct label *label);
-	void	(*mpo_cleanup_sysv_msgmsg)(struct label *msglabel);
-	void	(*mpo_cleanup_sysv_msgqueue)(struct label *msqlabel);
-	void	(*mpo_cleanup_sysv_sem)(struct label *semalabel);
-	void	(*mpo_cleanup_sysv_shm)(struct label *shmlabel);
-	void	(*mpo_copy_cred_label)(struct label *src,
-		    struct label *dest);
-	void	(*mpo_copy_ifnet_label)(struct label *src,
-		    struct label *dest);
-	void	(*mpo_copy_mbuf_label)(struct label *src,
-		    struct label *dest);
-	void	(*_mpo_placeholder2)(void);
-	void	(*mpo_copy_pipe_label)(struct label *src,
-		    struct label *dest);
-	void	(*mpo_copy_socket_label)(struct label *src,
-		    struct label *dest);
-	void	(*mpo_copy_vnode_label)(struct label *src,
-		    struct label *dest);
-	int	(*mpo_externalize_cred_label)(struct label *label,
-		    char *element_name, struct sbuf *sb, int *claimed);
-	int	(*mpo_externalize_ifnet_label)(struct label *label,
-		    char *element_name, struct sbuf *sb, int *claimed);
-	void	(*_mpo_placeholder3)(void);
-	int	(*mpo_externalize_pipe_label)(struct label *label,
-		    char *element_name, struct sbuf *sb, int *claimed);
-	int	(*mpo_externalize_socket_label)(struct label *label,
-		    char *element_name, struct sbuf *sb, int *claimed);
-	int	(*mpo_externalize_socket_peer_label)(struct label *label,
-		    char *element_name, struct sbuf *sb, int *claimed);
-	int	(*mpo_externalize_vnode_label)(struct label *label,
-		    char *element_name, struct sbuf *sb, int *claimed);
-	int	(*mpo_internalize_cred_label)(struct label *label,
-		    char *element_name, char *element_data, int *claimed);
-	int	(*mpo_internalize_ifnet_label)(struct label *label,
-		    char *element_name, char *element_data, int *claimed);
-	void	(*_mpo_placeholder4)(void);
-	int	(*mpo_internalize_pipe_label)(struct label *label,
-		    char *element_name, char *element_data, int *claimed);
-	int	(*mpo_internalize_socket_label)(struct label *label,
-		    char *element_name, char *element_data, int *claimed);
-	int	(*mpo_internalize_vnode_label)(struct label *label,
-		    char *element_name, char *element_data, int *claimed);
-
-	/*
-	 * Labeling event operations: file system objects, and things that
-	 * look a lot like file system objects.
-	 */
-	void	(*mpo_associate_vnode_devfs)(struct mount *mp,
-		    struct label *fslabel, struct devfs_dirent *de,
-		    struct label *delabel, struct vnode *vp,
-		    struct label *vlabel);
-	int	(*mpo_associate_vnode_extattr)(struct mount *mp,
-		    struct label *fslabel, struct vnode *vp,
-		    struct label *vlabel);
-	void	(*mpo_associate_vnode_singlelabel)(struct mount *mp,
-		    struct label *fslabel, struct vnode *vp,
-		    struct label *vlabel);
-	void	(*mpo_create_devfs_device)(struct ucred *cred,
-		    struct mount *mp, struct cdev *dev,
-		    struct devfs_dirent *de, struct label *label);
-	void	(*mpo_create_devfs_directory)(struct mount *mp, char *dirname,
-		    int dirnamelen, struct devfs_dirent *de,
-		    struct label *label);
-	void	(*mpo_create_devfs_symlink)(struct ucred *cred,
-		    struct mount *mp, struct devfs_dirent *dd,
-		    struct label *ddlabel, struct devfs_dirent *de,
-		    struct label *delabel);
-	void	(*_mpo_placeholder5)(void);
-	int	(*mpo_create_vnode_extattr)(struct ucred *cred,
-		    struct mount *mp, struct label *fslabel,
-		    struct vnode *dvp, struct label *dlabel,
-		    struct vnode *vp, struct label *vlabel,
-		    struct componentname *cnp);
-	void	(*mpo_create_mount)(struct ucred *cred, struct mount *mp,
-		    struct label *mntlabel, struct label *fslabel);
-	void	(*mpo_relabel_vnode)(struct ucred *cred, struct vnode *vp,
-		    struct label *vnodelabel, struct label *label);
-	int	(*mpo_setlabel_vnode_extattr)(struct ucred *cred,
-		    struct vnode *vp, struct label *vlabel,
-		    struct label *intlabel);
-	void	(*mpo_update_devfsdirent)(struct mount *mp,
-		    struct devfs_dirent *devfs_dirent,
-		    struct label *direntlabel, struct vnode *vp,
-		    struct label *vnodelabel);
-
-	/*
-	 * Labeling event operations: IPC objects.
-	 */
-	void	(*mpo_create_mbuf_from_socket)(struct socket *so,
-		    struct label *socketlabel, struct mbuf *m,
-		    struct label *mbuflabel);
-	void	(*mpo_create_socket)(struct ucred *cred, struct socket *so,
-		    struct label *socketlabel);
-	void	(*mpo_create_socket_from_socket)(struct socket *oldsocket,
-		    struct label *oldsocketlabel, struct socket *newsocket,
-		    struct label *newsocketlabel);
-	void	(*mpo_relabel_socket)(struct ucred *cred, struct socket *so,
-		    struct label *oldlabel, struct label *newlabel);
-	void	(*mpo_relabel_pipe)(struct ucred *cred, struct pipepair *pp,
-		    struct label *oldlabel, struct label *newlabel);
-	void	(*mpo_set_socket_peer_from_mbuf)(struct mbuf *mbuf,
-		    struct label *mbuflabel, struct socket *so,
-		    struct label *socketpeerlabel);
-	void	(*mpo_set_socket_peer_from_socket)(struct socket *oldsocket,
-		    struct label *oldsocketlabel, struct socket *newsocket,
-		    struct label *newsocketpeerlabel);
-	void	(*mpo_create_pipe)(struct ucred *cred, struct pipepair *pp,
-		    struct label *pipelabel);
-
-	/*
-	 * Labeling event operations: System V IPC primitives.
-	 */
-	void	(*mpo_create_sysv_msgmsg)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqlabel,
-		    struct msg *msgptr, struct label *msglabel);
-	void	(*mpo_create_sysv_msgqueue)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqlabel);
-	void	(*mpo_create_sysv_sem)(struct ucred *cred,
-		    struct semid_kernel *semakptr, struct label *semalabel);
-	void	(*mpo_create_sysv_shm)(struct ucred *cred,
-		    struct shmid_kernel *shmsegptr, struct label *shmlabel);
-
-	/*
-	 * Labeling event operations: POSIX (global/inter-process) semaphores.
-	 */
-	void	(*mpo_create_posix_sem)(struct ucred *cred,
-		    struct ksem *ksemptr, struct label *ks_label);
-
-	/*
-	 * Labeling event operations: network objects.
-	 */
-	void	(*mpo_create_bpfdesc)(struct ucred *cred, struct bpf_d *bpf_d,
-		    struct label *bpflabel);
-	void	(*mpo_create_ifnet)(struct ifnet *ifnet,
-		    struct label *ifnetlabel);
-	void	(*mpo_create_inpcb_from_socket)(struct socket *so,
-		    struct label *solabel, struct inpcb *inp,
-		    struct label *inplabel);
-	void	(*mpo_create_ipq)(struct mbuf *fragment,
-		    struct label *fragmentlabel, struct ipq *ipq,
-		    struct label *ipqlabel);
-	void	(*mpo_create_datagram_from_ipq)
-		    (struct ipq *ipq, struct label *ipqlabel,
-		    struct mbuf *datagram, struct label *datagramlabel);
-	void	(*mpo_create_fragment)(struct mbuf *datagram,
-		    struct label *datagramlabel, struct mbuf *fragment,
-		    struct label *fragmentlabel);
-	void	(*mpo_create_mbuf_from_inpcb)(struct inpcb *inp,
-		    struct label *inplabel, struct mbuf *m,
-		    struct label *mlabel);
-	void	(*mpo_create_mbuf_linklayer)(struct ifnet *ifnet,
-		    struct label *ifnetlabel, struct mbuf *mbuf,
-		    struct label *mbuflabel);
-	void	(*mpo_create_mbuf_from_bpfdesc)(struct bpf_d *bpf_d,
-		    struct label *bpflabel, struct mbuf *mbuf,
-		    struct label *mbuflabel);
-	void	(*mpo_create_mbuf_from_ifnet)(struct ifnet *ifnet,
-		    struct label *ifnetlabel, struct mbuf *mbuf,
-		    struct label *mbuflabel);
-	void	(*mpo_create_mbuf_multicast_encap)(struct mbuf *oldmbuf,
-		    struct label *oldmbuflabel, struct ifnet *ifnet,
-		    struct label *ifnetlabel, struct mbuf *newmbuf,
-		    struct label *newmbuflabel);
-	void	(*mpo_create_mbuf_netlayer)(struct mbuf *oldmbuf,
-		    struct label *oldmbuflabel, struct mbuf *newmbuf,
-		    struct label *newmbuflabel);
-	int	(*mpo_fragment_match)(struct mbuf *fragment,
-		    struct label *fragmentlabel, struct ipq *ipq,
-		    struct label *ipqlabel);
-	void	(*mpo_reflect_mbuf_icmp)(struct mbuf *m,
-		    struct label *mlabel);
-	void	(*mpo_reflect_mbuf_tcp)(struct mbuf *m, struct label *mlabel);
-	void	(*mpo_relabel_ifnet)(struct ucred *cred, struct ifnet *ifnet,
-		    struct label *ifnetlabel, struct label *newlabel);
-	void	(*mpo_update_ipq)(struct mbuf *fragment,
-		    struct label *fragmentlabel, struct ipq *ipq,
-		    struct label *ipqlabel);
-	void	(*mpo_inpcb_sosetlabel)(struct socket *so,
-		    struct label *label, struct inpcb *inp,
-		    struct label *inplabel);
-
-	/*
-	 * Labeling event operations: processes.
-	 */
-	void	(*mpo_execve_transition)(struct ucred *old, struct ucred *new,
-		    struct vnode *vp, struct label *vnodelabel,
-		    struct label *interpvnodelabel,
-		    struct image_params *imgp, struct label *execlabel);
-	int	(*mpo_execve_will_transition)(struct ucred *old,
-		    struct vnode *vp, struct label *vnodelabel,
-		    struct label *interpvnodelabel,
-		    struct image_params *imgp, struct label *execlabel);
-	void	(*mpo_create_proc0)(struct ucred *cred);
-	void	(*mpo_create_proc1)(struct ucred *cred);
-	void	(*mpo_relabel_cred)(struct ucred *cred,
-		    struct label *newlabel);
-	void	(*_mpo_placeholder6)(void);
-	void	(*mpo_thread_userret)(struct thread *thread);
-
-	/*
-	 * Access control checks.
-	 */
-	int	(*mpo_check_bpfdesc_receive)(struct bpf_d *bpf_d,
-		    struct label *bpflabel, struct ifnet *ifnet,
-		    struct label *ifnetlabel);
-	void	(*_mpo_placeholder7)(void);
-	int	(*mpo_check_cred_relabel)(struct ucred *cred,
-		    struct label *newlabel);
-	int	(*mpo_check_cred_visible)(struct ucred *u1, struct ucred *u2);
-	void	(*mpo_associate_nfsd_label)(struct ucred *cred);
-	void	(*mpo_create_mbuf_from_firewall)(struct mbuf *m,
-		    struct label *label);
-	void	(*_mpo_placeholder10)(void);
-	void	(*_mpo_placeholder11)(void);
-	void	(*_mpo_placeholder12)(void);
-	void	(*_mpo_placeholder13)(void);
-	void	(*_mpo_placeholder14)(void);
-	void	(*_mpo_placeholder15)(void);
-	void	(*_mpo_placeholder16)(void);
-	void	(*_mpo_placeholder17)(void);
-	void	(*_mpo_placeholder18)(void);
-	int	(*mpo_check_ifnet_relabel)(struct ucred *cred,
-		    struct ifnet *ifnet, struct label *ifnetlabel,
-		    struct label *newlabel);
-	int	(*mpo_check_ifnet_transmit)(struct ifnet *ifnet,
-		    struct label *ifnetlabel, struct mbuf *m,
-		    struct label *mbuflabel);
-	int	(*mpo_check_inpcb_deliver)(struct inpcb *inp,
-		    struct label *inplabel, struct mbuf *m,
-		    struct label *mlabel);
-	int	(*mpo_check_sysv_msgmsq)(struct ucred *cred,
-		    struct msg *msgptr, struct label *msglabel,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-	int	(*mpo_check_sysv_msgrcv)(struct ucred *cred,
-		    struct msg *msgptr, struct label *msglabel);
-	int	(*mpo_check_sysv_msgrmid)(struct ucred *cred,
-		    struct msg *msgptr, struct label *msglabel);
-	int	(*mpo_check_sysv_msqget)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-	int	(*mpo_check_sysv_msqsnd)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-	int	(*mpo_check_sysv_msqrcv)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel);
-	int	(*mpo_check_sysv_msqctl)(struct ucred *cred,
-		    struct msqid_kernel *msqkptr, struct label *msqklabel,
-		    int cmd);
-	int	(*mpo_check_sysv_semctl)(struct ucred *cred,
-		    struct semid_kernel *semakptr, struct label *semaklabel,
-		    int cmd);
-	int	(*mpo_check_sysv_semget)(struct ucred *cred,
-		    struct semid_kernel *semakptr, struct label *semaklabel);
-	int	(*mpo_check_sysv_semop)(struct ucred *cred,
-		    struct semid_kernel *semakptr, struct label *semaklabel,
-		    size_t accesstype);
-	int	(*mpo_check_sysv_shmat)(struct ucred *cred,
-		    struct shmid_kernel *shmsegptr,
-		    struct label *shmseglabel, int shmflg);
-	int	(*mpo_check_sysv_shmctl)(struct ucred *cred,
-		    struct shmid_kernel *shmsegptr,
-		    struct label *shmseglabel, int cmd);
-	int	(*mpo_check_sysv_shmdt)(struct ucred *cred,
-		    struct shmid_kernel *shmsegptr,
-		    struct label *shmseglabel);
-	int	(*mpo_check_sysv_shmget)(struct ucred *cred,
-		    struct shmid_kernel *shmsegptr,
-		    struct label *shmseglabel, int shmflg);
-	int	(*mpo_check_kenv_dump)(struct ucred *cred);
-	int	(*mpo_check_kenv_get)(struct ucred *cred, char *name);
-	int	(*mpo_check_kenv_set)(struct ucred *cred, char *name,
-		    char *value);
-	int	(*mpo_check_kenv_unset)(struct ucred *cred, char *name);
-	int	(*mpo_check_kld_load)(struct ucred *cred, struct vnode *vp,
-		    struct label *vlabel);
-	int	(*mpo_check_kld_stat)(struct ucred *cred);
-	int	(*mpo_check_kld_unload)(struct ucred *cred);
-	void	(*_mpo_placeholder19)(void);
-	void	(*_mpo_placeholder20)(void);
-	int	(*mpo_check_mount_stat)(struct ucred *cred, struct mount *mp,
-		    struct label *mntlabel);
-	void	(*_mpo_placeholder21)(void);
-	int	(*mpo_check_pipe_ioctl)(struct ucred *cred,
-		    struct pipepair *pp, struct label *pipelabel,
-		    unsigned long cmd, void *data);
-	int	(*mpo_check_pipe_poll)(struct ucred *cred,
-		    struct pipepair *pp, struct label *pipelabel);
-	int	(*mpo_check_pipe_read)(struct ucred *cred,
-		    struct pipepair *pp, struct label *pipelabel);
-	int	(*mpo_check_pipe_relabel)(struct ucred *cred,
-		    struct pipepair *pp, struct label *pipelabel,
-		    struct label *newlabel);
-	int	(*mpo_check_pipe_stat)(struct ucred *cred,
-		    struct pipepair *pp, struct label *pipelabel);
-	int	(*mpo_check_pipe_write)(struct ucred *cred,
-		    struct pipepair *pp, struct label *pipelabel);
-	int	(*mpo_check_posix_sem_destroy)(struct ucred *cred,
-		    struct ksem *ksemptr, struct label *ks_label);
-	int	(*mpo_check_posix_sem_getvalue)(struct ucred *cred,
-		    struct ksem *ksemptr, struct label *ks_label);
-	int	(*mpo_check_posix_sem_open)(struct ucred *cred,
-		    struct ksem *ksemptr, struct label *ks_label);
-	int	(*mpo_check_posix_sem_post)(struct ucred *cred,
-		    struct ksem *ksemptr, struct label *ks_label);
-	int	(*mpo_check_posix_sem_unlink)(struct ucred *cred,
-		    struct ksem *ksemptr, struct label *ks_label);
-	int	(*mpo_check_posix_sem_wait)(struct ucred *cred,
-		    struct ksem *ksemptr, struct label *ks_label);
-	int	(*mpo_check_proc_debug)(struct ucred *cred,
-		    struct proc *proc);
-	int	(*mpo_check_proc_sched)(struct ucred *cred,
-		    struct proc *proc);
-	int	(*mpo_check_proc_setuid)(struct ucred *cred, uid_t uid);
-	int	(*mpo_check_proc_seteuid)(struct ucred *cred, uid_t euid);
-	int	(*mpo_check_proc_setgid)(struct ucred *cred, gid_t gid);
-	int	(*mpo_check_proc_setegid)(struct ucred *cred, gid_t egid);
-	int	(*mpo_check_proc_setgroups)(struct ucred *cred, int ngroups,
-		    gid_t *gidset);
-	int	(*mpo_check_proc_setreuid)(struct ucred *cred, uid_t ruid,
-		    uid_t euid);
-	int	(*mpo_check_proc_setregid)(struct ucred *cred, gid_t rgid,
-		    gid_t egid);
-	int	(*mpo_check_proc_setresuid)(struct ucred *cred, uid_t ruid,
-		    uid_t euid, uid_t suid);
-	int	(*mpo_check_proc_setresgid)(struct ucred *cred, gid_t rgid,
-		    gid_t egid, gid_t sgid);
-	int	(*mpo_check_proc_signal)(struct ucred *cred,
-		    struct proc *proc, int signum);
-	int	(*mpo_check_proc_wait)(struct ucred *cred,
-		    struct proc *proc);
-	int	(*mpo_check_socket_accept)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel);
-	int	(*mpo_check_socket_bind)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel,
-		    struct sockaddr *sockaddr);
-	int	(*mpo_check_socket_connect)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel,
-		    struct sockaddr *sockaddr);
-	int	(*mpo_check_socket_create)(struct ucred *cred, int domain,
-		    int type, int protocol);
-	int	(*mpo_check_socket_deliver)(struct socket *so,
-		    struct label *socketlabel, struct mbuf *m,
-		    struct label *mbuflabel);
-	void	(*_mpo_placeholder22)(void);
-	int	(*mpo_check_socket_listen)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel);
-	int	(*mpo_check_socket_poll)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel);
-	int	(*mpo_check_socket_receive)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel);
-	int	(*mpo_check_socket_relabel)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel,
-		    struct label *newlabel);
-	int	(*mpo_check_socket_send)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel);
-	int	(*mpo_check_socket_stat)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel);
-	int	(*mpo_check_socket_visible)(struct ucred *cred,
-		    struct socket *so, struct label *socketlabel);
-	int	(*mpo_check_sysarch_ioperm)(struct ucred *cred);
-	int	(*mpo_check_system_acct)(struct ucred *cred,
-		    struct vnode *vp, struct label *vlabel);
-	int	(*mpo_check_system_nfsd)(struct ucred *cred);
-	int	(*mpo_check_system_reboot)(struct ucred *cred, int howto);
-	int	(*mpo_check_system_settime)(struct ucred *cred);
-	int	(*mpo_check_system_swapon)(struct ucred *cred,
-		    struct vnode *vp, struct label *label);
-	int	(*mpo_check_system_swapoff)(struct ucred *cred,
-		    struct vnode *vp, struct label *label);
-	int	(*mpo_check_system_sysctl)(struct ucred *cred,
-		    struct sysctl_oid *oidp, void *arg1, int arg2,
-		    struct sysctl_req *req);
-	void	(*_mpo_placeholder23)(void);
-	int	(*mpo_check_vnode_access)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, int acc_mode);
-	int	(*mpo_check_vnode_chdir)(struct ucred *cred,
-		    struct vnode *dvp, struct label *dlabel);
-	int	(*mpo_check_vnode_chroot)(struct ucred *cred,
-		    struct vnode *dvp, struct label *dlabel);
-	int	(*mpo_check_vnode_create)(struct ucred *cred,
-		    struct vnode *dvp, struct label *dlabel,
-		    struct componentname *cnp, struct vattr *vap);
-	int	(*mpo_check_vnode_delete)(struct ucred *cred,
-		    struct vnode *dvp, struct label *dlabel,
-		    struct vnode *vp, struct label *label,
-		    struct componentname *cnp);
-	int	(*mpo_check_vnode_deleteacl)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, acl_type_t type);
-	int	(*mpo_check_vnode_deleteextattr)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, int attrnamespace,
-		    const char *name);
-	int	(*mpo_check_vnode_exec)(struct ucred *cred, struct vnode *vp,
-		    struct label *label, struct image_params *imgp,
-		    struct label *execlabel);
-	int	(*mpo_check_vnode_getacl)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, acl_type_t type);
-	int	(*mpo_check_vnode_getextattr)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, int attrnamespace,
-		    const char *name, struct uio *uio);
-	void	(*_mpo_placeholder24)(void);
-	int	(*mpo_check_vnode_link)(struct ucred *cred, struct vnode *dvp,
-		    struct label *dlabel, struct vnode *vp,
-		    struct label *label, struct componentname *cnp);
-	int	(*mpo_check_vnode_listextattr)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, int attrnamespace);
-	int	(*mpo_check_vnode_lookup)(struct ucred *cred,
-		    struct vnode *dvp, struct label *dlabel,
-		    struct componentname *cnp);
-	int	(*mpo_check_vnode_mmap)(struct ucred *cred, struct vnode *vp,
-		    struct label *label, int prot, int flags);
-	void	(*mpo_check_vnode_mmap_downgrade)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, int *prot);
-	int	(*mpo_check_vnode_mprotect)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, int prot);
-	int	(*mpo_check_vnode_open)(struct ucred *cred, struct vnode *vp,
-		    struct label *label, int acc_mode);
-	int	(*mpo_check_vnode_poll)(struct ucred *active_cred,
-		    struct ucred *file_cred, struct vnode *vp,
-		    struct label *label);
-	int	(*mpo_check_vnode_read)(struct ucred *active_cred,
-		    struct ucred *file_cred, struct vnode *vp,
-		    struct label *label);
-	int	(*mpo_check_vnode_readdir)(struct ucred *cred,
-		    struct vnode *dvp, struct label *dlabel);
-	int	(*mpo_check_vnode_readlink)(struct ucred *cred,
-		    struct vnode *vp, struct label *label);
-	int	(*mpo_check_vnode_relabel)(struct ucred *cred,
-		    struct vnode *vp, struct label *vnodelabel,
-		    struct label *newlabel);
-	int	(*mpo_check_vnode_rename_from)(struct ucred *cred,
-		    struct vnode *dvp, struct label *dlabel, struct vnode *vp,
-		    struct label *label, struct componentname *cnp);
-	int	(*mpo_check_vnode_rename_to)(struct ucred *cred,
-		    struct vnode *dvp, struct label *dlabel, struct vnode *vp,
-		    struct label *label, int samedir,
-		    struct componentname *cnp);
-	int	(*mpo_check_vnode_revoke)(struct ucred *cred,
-		    struct vnode *vp, struct label *label);
-	int	(*mpo_check_vnode_setacl)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, acl_type_t type,
-		    struct acl *acl);
-	int	(*mpo_check_vnode_setextattr)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, int attrnamespace,
-		    const char *name, struct uio *uio);
-	int	(*mpo_check_vnode_setflags)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, u_long flags);
-	int	(*mpo_check_vnode_setmode)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, mode_t mode);
-	int	(*mpo_check_vnode_setowner)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, uid_t uid,
-		    gid_t gid);
-	int	(*mpo_check_vnode_setutimes)(struct ucred *cred,
-		    struct vnode *vp, struct label *label,
-		    struct timespec atime, struct timespec mtime);
-	int	(*mpo_check_vnode_stat)(struct ucred *active_cred,
-		    struct ucred *file_cred, struct vnode *vp,
-		    struct label *label);
-	int	(*mpo_check_vnode_write)(struct ucred *active_cred,
-		    struct ucred *file_cred, struct vnode *vp,
-		    struct label *label);
-};
-
-/*
- * struct mac_policy_conf is the registration structure for policies, and is
- * provided to the MAC Framework using MAC_POLICY_SET() to invoke a SYSINIT
- * to register the policy.  In general, the fields are immutable, with the
- * exception of the "security field", run-time flags, and policy list entry,
- * which are managed by the MAC Framework.  Be careful when modifying this
- * structure, as its layout is statically compiled into all policies.
- */
-struct mac_policy_conf {
-	char				*mpc_name;	/* policy name */
-	char				*mpc_fullname;	/* policy full name */
-	struct mac_policy_ops		*mpc_ops;	/* policy operations */
-	int				 mpc_loadtime_flags;	/* flags */
-	int				*mpc_field_off; /* security field */
-	int				 mpc_runtime_flags; /* flags */
-	LIST_ENTRY(mac_policy_conf)	 mpc_list;	/* global list */
-};
-
-/* Flags for the mpc_loadtime_flags field. */
-#define	MPC_LOADTIME_FLAG_NOTLATE	0x00000001
-#define	MPC_LOADTIME_FLAG_UNLOADOK	0x00000002
-#define	MPC_LOADTIME_FLAG_LABELMBUFS	0x00000004
-
-/* Flags for the mpc_runtime_flags field. */
-#define	MPC_RUNTIME_FLAG_REGISTERED	0x00000001
-
-#define	MAC_POLICY_SET(mpops, mpname, mpfullname, mpflags, privdata_wanted) \
-	static struct mac_policy_conf mpname##_mac_policy_conf = {	\
-		#mpname,						\
-		mpfullname,						\
-		mpops,							\
-		mpflags,						\
-		privdata_wanted,					\
-		0,							\
-	};								\
-	static moduledata_t mpname##_mod = {				\
-		#mpname,						\
-		mac_policy_modevent,					\
-		&mpname##_mac_policy_conf				\
-	};								\
-	MODULE_DEPEND(mpname, kernel_mac_support, 2, 2, 2);		\
-	DECLARE_MODULE(mpname, mpname##_mod, SI_SUB_MAC_POLICY,		\
-	    SI_ORDER_MIDDLE)
-
-int	mac_policy_modevent(module_t mod, int type, void *data);
-
-#define	LABEL_TO_SLOT(l, s)	(l)->l_perpolicy[s]
-
-#endif /* !_SYS_MAC_POLICY_H_ */
diff --git a/include.new/sys/malloc.h b/include.new/sys/malloc.h
deleted file mode 100644
index 07fcc43..0000000
--- a/include.new/sys/malloc.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*-
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.
- * Copyright (c) 2005, 2009 Robert N. M. Watson
- * 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.
- * 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.
- *
- *	@(#)malloc.h	8.5 (Berkeley) 5/3/95
- * $FreeBSD: releng/10.2/sys/sys/malloc.h 252330 2013-06-28 03:51:20Z jeff $
- */
-
-#ifndef _SYS_MALLOC_H_
-#define	_SYS_MALLOC_H_
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-
-#define	MINALLOCSIZE	UMA_SMALLEST_UNIT
-
-/*
- * flags to malloc.
- */
-#define	M_NOWAIT	0x0001		/* do not block */
-#define	M_WAITOK	0x0002		/* ok to block */
-#define	M_ZERO		0x0100		/* bzero the allocation */
-#define	M_NOVM		0x0200		/* don't ask VM for pages */
-#define	M_USE_RESERVE	0x0400		/* can alloc out of reserve memory */
-#define	M_NODUMP	0x0800		/* don't dump pages in this allocation */
-#define	M_FIRSTFIT	0x1000		/* Only for vmem, fast fit. */
-#define	M_BESTFIT	0x2000		/* Only for vmem, low fragmentation. */
-
-#define	M_MAGIC		877983977	/* time when first defined :-) */
-
-/*
- * Two malloc type structures are present: malloc_type, which is used by a
- * type owner to declare the type, and malloc_type_internal, which holds
- * malloc-owned statistics and other ABI-sensitive fields, such as the set of
- * malloc statistics indexed by the compile-time MAXCPU constant.
- * Applications should avoid introducing dependence on the allocator private
- * data layout and size.
- *
- * The malloc_type ks_next field is protected by malloc_mtx.  Other fields in
- * malloc_type are static after initialization so unsynchronized.
- *
- * Statistics in malloc_type_stats are written only when holding a critical
- * section and running on the CPU associated with the index into the stat
- * array, but read lock-free resulting in possible (minor) races, which the
- * monitoring app should take into account.
- */
-struct malloc_type_stats {
-	uint64_t	mts_memalloced;	/* Bytes allocated on CPU. */
-	uint64_t	mts_memfreed;	/* Bytes freed on CPU. */
-	uint64_t	mts_numallocs;	/* Number of allocates on CPU. */
-	uint64_t	mts_numfrees;	/* number of frees on CPU. */
-	uint64_t	mts_size;	/* Bitmask of sizes allocated on CPU. */
-	uint64_t	_mts_reserved1;	/* Reserved field. */
-	uint64_t	_mts_reserved2;	/* Reserved field. */
-	uint64_t	_mts_reserved3;	/* Reserved field. */
-};
-
-/*
- * Index definitions for the mti_probes[] array.
- */
-#define DTMALLOC_PROBE_MALLOC		0
-#define DTMALLOC_PROBE_FREE		1
-#define DTMALLOC_PROBE_MAX		2
-
-struct malloc_type_internal {
-	uint32_t	mti_probes[DTMALLOC_PROBE_MAX];
-					/* DTrace probe ID array. */
-	u_char		mti_zone;
-	struct malloc_type_stats	mti_stats[MAXCPU];
-};
-
-/*
- * Public data structure describing a malloc type.  Private data is hung off
- * of ks_handle to avoid encoding internal malloc(9) data structures in
- * modules, which will statically allocate struct malloc_type.
- */
-struct malloc_type {
-	struct malloc_type *ks_next;	/* Next in global chain. */
-	u_long		 ks_magic;	/* Detect programmer error. */
-	const char	*ks_shortdesc;	/* Printable type name. */
-	void		*ks_handle;	/* Priv. data, was lo_class. */
-};
-
-/*
- * Statistics structure headers for user space.  The kern.malloc sysctl
- * exposes a structure stream consisting of a stream header, then a series of
- * malloc type headers and statistics structures (quantity maxcpus).  For
- * convenience, the kernel will provide the current value of maxcpus at the
- * head of the stream.
- */
-#define	MALLOC_TYPE_STREAM_VERSION	0x00000001
-struct malloc_type_stream_header {
-	uint32_t	mtsh_version;	/* Stream format version. */
-	uint32_t	mtsh_maxcpus;	/* Value of MAXCPU for stream. */
-	uint32_t	mtsh_count;	/* Number of records. */
-	uint32_t	_mtsh_pad;	/* Pad/reserved field. */
-};
-
-#define	MALLOC_MAX_NAME	32
-struct malloc_type_header {
-	char				mth_name[MALLOC_MAX_NAME];
-};
-
-#ifdef _KERNEL
-#define	MALLOC_DEFINE(type, shortdesc, longdesc)			\
-	struct malloc_type type[1] = {					\
-		{ NULL, M_MAGIC, shortdesc, NULL }			\
-	};								\
-	SYSINIT(type##_init, SI_SUB_KMEM, SI_ORDER_SECOND, malloc_init,	\
-	    type);							\
-	SYSUNINIT(type##_uninit, SI_SUB_KMEM, SI_ORDER_ANY,		\
-	    malloc_uninit, type)
-
-#define	MALLOC_DECLARE(type) \
-	extern struct malloc_type type[1]
-
-MALLOC_DECLARE(M_CACHE);
-MALLOC_DECLARE(M_DEVBUF);
-MALLOC_DECLARE(M_TEMP);
-
-MALLOC_DECLARE(M_IP6OPT); /* for INET6 */
-MALLOC_DECLARE(M_IP6NDP); /* for INET6 */
-
-/*
- * Deprecated macro versions of not-quite-malloc() and free().
- */
-#define	MALLOC(space, cast, size, type, flags) \
-	((space) = (cast)malloc((u_long)(size), (type), (flags)))
-#define	FREE(addr, type) free((addr), (type))
-
-/*
- * XXX this should be declared in <sys/uio.h>, but that tends to fail
- * because <sys/uio.h> is included in a header before the source file
- * has a chance to include <sys/malloc.h> to get MALLOC_DECLARE() defined.
- */
-MALLOC_DECLARE(M_IOV);
-
-extern struct mtx malloc_mtx;
-
-/*
- * Function type used when iterating over the list of malloc types.
- */
-typedef void malloc_type_list_func_t(struct malloc_type *, void *);
-
-void	contigfree(void *addr, unsigned long size, struct malloc_type *type);
-void	*contigmalloc(unsigned long size, struct malloc_type *type, int flags,
-	    vm_paddr_t low, vm_paddr_t high, unsigned long alignment,
-	    vm_paddr_t boundary) __malloc_like;
-void	free(void *addr, struct malloc_type *type);
-void	*malloc(unsigned long size, struct malloc_type *type, int flags) __malloc_like;
-void	malloc_init(void *);
-int	malloc_last_fail(void);
-void	malloc_type_allocated(struct malloc_type *type, unsigned long size);
-void	malloc_type_freed(struct malloc_type *type, unsigned long size);
-void	malloc_type_list(malloc_type_list_func_t *, void *);
-void	malloc_uninit(void *);
-void	*realloc(void *addr, unsigned long size, struct malloc_type *type,
-	    int flags);
-void	*reallocf(void *addr, unsigned long size, struct malloc_type *type,
-	    int flags);
-
-struct malloc_type *malloc_desc2type(const char *desc);
-#endif /* _KERNEL */
-
-#endif /* !_SYS_MALLOC_H_ */
diff --git a/include.new/sys/mbpool.h b/include.new/sys/mbpool.h
deleted file mode 100644
index ba2b1c1..0000000
--- a/include.new/sys/mbpool.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2003
- *	Fraunhofer Institute for Open Communication Systems (FhG Fokus).
- * 	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.
- *
- * 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.
- *
- * Author: Hartmut Brandt <harti@freebsd.org>
- */
-
-/*
- * This implements pools of DMA-able buffers that conserve DMA address space
- * by putting several buffers into one page and that allow to map between
- * 32-bit handles for the buffer and buffer addresses (to use 32-bit network
- * interfaces on 64bit machines). This assists network interfaces that may need
- * huge numbers of mbufs.
- *
- * $FreeBSD: releng/10.2/sys/sys/mbpool.h 254842 2013-08-25 10:57:09Z andre $
- */
-#ifndef _SYS_MBPOOL_H_
-#define	_SYS_MBPOOL_H_
-
-#ifdef _KERNEL
-
-#include <sys/queue.h>
-
-/* opaque */
-struct mbpool;
-
-/* size of reserved area at end of each chunk */
-#define	MBPOOL_TRAILER_SIZE	4
-
-/* maximum value of max_pages */
-#define	MBPOOL_MAX_MAXPAGES	((1 << 14) - 1)
-
-/* maximum number of chunks per page */
-#define	MBPOOL_MAX_CHUNKS	(1 << 9)
-
-/* initialize a pool */
-int mbp_create(struct mbpool **, const char *, bus_dma_tag_t, u_int,
-	size_t, size_t);
-
-/* destroy a pool */
-void mbp_destroy(struct mbpool *);
-
-/* allocate a chunk and set used and on card */
-void *mbp_alloc(struct mbpool *, bus_addr_t *, uint32_t *);
-
-/* free a chunk */
-void mbp_free(struct mbpool *, void *);
-
-/* free a chunk that is an external mbuf */
-int mbp_ext_free(struct mbuf *, void *, void *);
-
-/* free all buffers that are marked to be on the card */
-void mbp_card_free(struct mbpool *);
-
-/* count used buffers and buffers on card */
-void mbp_count(struct mbpool *, u_int *, u_int *, u_int *);
-
-/* get the buffer from a handle and clear card bit */
-void *mbp_get(struct mbpool *, uint32_t);
-
-/* get the buffer from a handle and don't clear card bit */
-void *mbp_get_keep(struct mbpool *, uint32_t);
-
-/* sync the chunk */
-void mbp_sync(struct mbpool *, uint32_t, bus_addr_t, bus_size_t, u_int);
-
-#endif	/* _KERNEL */
-#endif	/* _SYS_MBPOOL_H_ */
diff --git a/include.new/sys/mbuf.h b/include.new/sys/mbuf.h
deleted file mode 100644
index bef4b9e..0000000
--- a/include.new/sys/mbuf.h
+++ /dev/null
@@ -1,1194 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 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. 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.
- *
- *	@(#)mbuf.h	8.5 (Berkeley) 2/19/95
- * $FreeBSD: releng/10.2/sys/sys/mbuf.h 282786 2015-05-12 00:27:20Z hiren $
- */
-
-#ifndef _SYS_MBUF_H_
-#define	_SYS_MBUF_H_
-
-/* XXX: These includes suck. Sorry! */
-#include <sys/queue.h>
-#ifdef _KERNEL
-#include <sys/systm.h>
-#include <vm/uma.h>
-#ifdef WITNESS
-#include <sys/lock.h>
-#endif
-#endif
-
-/*
- * Mbufs are of a single size, MSIZE (sys/param.h), which includes overhead.
- * An mbuf may add a single "mbuf cluster" of size MCLBYTES (also in
- * sys/param.h), which has no additional overhead and is used instead of the
- * internal data area; this is done when at least MINCLSIZE of data must be
- * stored.  Additionally, it is possible to allocate a separate buffer
- * externally and attach it to the mbuf in a way similar to that of mbuf
- * clusters.
- *
- * NB: These calculation do not take actual compiler-induced alignment and
- * padding inside the complete struct mbuf into account.  Appropriate
- * attention is required when changing members of struct mbuf.
- *
- * MLEN is data length in a normal mbuf.
- * MHLEN is data length in an mbuf with pktheader.
- * MINCLSIZE is a smallest amount of data that should be put into cluster.
- */
-#define	MLEN		((int)(MSIZE - sizeof(struct m_hdr)))
-#define	MHLEN		((int)(MLEN - sizeof(struct pkthdr)))
-#define	MINCLSIZE	(MHLEN + 1)
-
-#ifdef _KERNEL
-/*-
- * Macro for type conversion: convert mbuf pointer to data pointer of correct
- * type:
- *
- * mtod(m, t)	-- Convert mbuf pointer to data pointer of correct type.
- * mtodo(m, o) -- Same as above but with offset 'o' into data.
- */
-#define	mtod(m, t)	((t)((m)->m_data))
-#define	mtodo(m, o)	((void *)(((m)->m_data) + (o)))
-
-/*
- * Argument structure passed to UMA routines during mbuf and packet
- * allocations.
- */
-struct mb_args {
-	int	flags;	/* Flags for mbuf being allocated */
-	short	type;	/* Type of mbuf being allocated */
-};
-#endif /* _KERNEL */
-
-/*
- * Header present at the beginning of every mbuf.
- * Size ILP32: 24
- *	 LP64: 32
- */
-struct m_hdr {
-	struct mbuf	*mh_next;	/* next buffer in chain */
-	struct mbuf	*mh_nextpkt;	/* next chain in queue/record */
-	caddr_t		 mh_data;	/* location of data */
-	int32_t		 mh_len;	/* amount of data in this mbuf */
-	uint32_t	 mh_type:8,	/* type of data in this mbuf */
-			 mh_flags:24;	/* flags; see below */
-#if !defined(__LP64__)
-	uint32_t	 mh_pad;	/* pad for 64bit alignment */
-#endif
-};
-
-/*
- * Packet tag structure (see below for details).
- */
-struct m_tag {
-	SLIST_ENTRY(m_tag)	m_tag_link;	/* List of packet tags */
-	u_int16_t		m_tag_id;	/* Tag ID */
-	u_int16_t		m_tag_len;	/* Length of data */
-	uint32_t		m_tag_cookie;	/* ABI/Module ID */
-	void			(*m_tag_free)(struct m_tag *);
-};
-
-/*
- * Record/packet header in first mbuf of chain; valid only if M_PKTHDR is set.
- * Size ILP32: 48
- *	 LP64: 56
- */
-struct pkthdr {
-	struct ifnet	*rcvif;		/* rcv interface */
-	SLIST_HEAD(packet_tags, m_tag) tags; /* list of packet tags */
-	int32_t		 len;		/* total packet length */
-
-	/* Layer crossing persistent information. */
-	uint32_t	 flowid;	/* packet's 4-tuple system */
-	uint64_t	 csum_flags;	/* checksum and offload features */
-	uint16_t	 fibnum;	/* this packet should use this fib */
-	uint8_t		 cosqos;	/* class/quality of service */
-	uint8_t		 rsstype;	/* hash type */
-	uint8_t		 l2hlen;	/* layer 2 header length */
-	uint8_t		 l3hlen;	/* layer 3 header length */
-	uint8_t		 l4hlen;	/* layer 4 header length */
-	uint8_t		 l5hlen;	/* layer 5 header length */
-	union {
-		uint8_t  eigth[8];
-		uint16_t sixteen[4];
-		uint32_t thirtytwo[2];
-		uint64_t sixtyfour[1];
-		uintptr_t unintptr[1];
-		void	*ptr;
-	} PH_per;
-
-	/* Layer specific non-persistent local storage for reassembly, etc. */
-	union {
-		uint8_t  eigth[8];
-		uint16_t sixteen[4];
-		uint32_t thirtytwo[2];
-		uint64_t sixtyfour[1];
-		uintptr_t unintptr[1];
-		void 	*ptr;
-	} PH_loc;
-};
-#define	ether_vtag	PH_per.sixteen[0]
-#define	PH_vt		PH_per
-#define	vt_nrecs	sixteen[0]
-#define	tso_segsz	PH_per.sixteen[1]
-#define	csum_phsum	PH_per.sixteen[2]
-#define	csum_data	PH_per.thirtytwo[1]
-
-/*
- * Description of external storage mapped into mbuf; valid only if M_EXT is
- * set.
- * Size ILP32: 28
- *	 LP64: 48
- */
-struct m_ext {
-	volatile u_int	*ref_cnt;	/* pointer to ref count info */
-	caddr_t		 ext_buf;	/* start of buffer */
-	uint32_t	 ext_size;	/* size of buffer, for ext_free */
-	uint32_t	 ext_type:8,	/* type of external storage */
-			 ext_flags:24;	/* external storage mbuf flags */
-	int		(*ext_free)	/* free routine if not the usual */
-			    (struct mbuf *, void *, void *);
-	void		*ext_arg1;	/* optional argument pointer */
-	void		*ext_arg2;	/* optional argument pointer */
-};
-
-/*
- * The core of the mbuf object along with some shortcut defines for practical
- * purposes.
- */
-struct mbuf {
-	struct m_hdr	m_hdr;
-	union {
-		struct {
-			struct pkthdr	MH_pkthdr;	/* M_PKTHDR set */
-			union {
-				struct m_ext	MH_ext;	/* M_EXT set */
-				char		MH_databuf[MHLEN];
-			} MH_dat;
-		} MH;
-		char	M_databuf[MLEN];		/* !M_PKTHDR, !M_EXT */
-	} M_dat;
-};
-#define	m_next		m_hdr.mh_next
-#define	m_len		m_hdr.mh_len
-#define	m_data		m_hdr.mh_data
-#define	m_type		m_hdr.mh_type
-#define	m_flags		m_hdr.mh_flags
-#define	m_nextpkt	m_hdr.mh_nextpkt
-#define	m_pkthdr	M_dat.MH.MH_pkthdr
-#define	m_ext		M_dat.MH.MH_dat.MH_ext
-#define	m_pktdat	M_dat.MH.MH_dat.MH_databuf
-#define	m_dat		M_dat.M_databuf
-
-/* 
- * NOTE: forwards compatibility definitions for mbuf(9)
- *
- * These aren't 1:1 with the macros in r277203; in particular they're exposed
- * to both userland and kernel, whereas this is exposed to just _KERNEL -- to
- * avoid disruption with existing KBI/KPIs
- */
-#define	MHSIZE		offsetof(struct mbuf, m_dat)
-#define	MPKTHSIZE	offsetof(struct mbuf, m_pktdat)
-
-/*
- * mbuf flags of global significance and layer crossing.
- * Those of only protocol/layer specific significance are to be mapped
- * to M_PROTO[1-12] and cleared at layer handoff boundaries.
- * NB: Limited to the lower 24 bits.
- */
-#define	M_EXT		0x00000001 /* has associated external storage */
-#define	M_PKTHDR	0x00000002 /* start of record */
-#define	M_EOR		0x00000004 /* end of record */
-#define	M_RDONLY	0x00000008 /* associated data is marked read-only */
-#define	M_BCAST		0x00000010 /* send/received as link-level broadcast */
-#define	M_MCAST		0x00000020 /* send/received as link-level multicast */
-#define	M_PROMISC	0x00000040 /* packet was not for us */
-#define	M_VLANTAG	0x00000080 /* ether_vtag is valid */
-#define	M_FLOWID	0x00000100 /* deprecated: flowid is valid */
-#define	M_NOFREE	0x00000200 /* do not free mbuf, embedded in cluster */
-
-#define	M_PROTO1	0x00001000 /* protocol-specific */
-#define	M_PROTO2	0x00002000 /* protocol-specific */
-#define	M_PROTO3	0x00004000 /* protocol-specific */
-#define	M_PROTO4	0x00008000 /* protocol-specific */
-#define	M_PROTO5	0x00010000 /* protocol-specific */
-#define	M_PROTO6	0x00020000 /* protocol-specific */
-#define	M_PROTO7	0x00040000 /* protocol-specific */
-#define	M_PROTO8	0x00080000 /* protocol-specific */
-#define	M_PROTO9	0x00100000 /* protocol-specific */
-#define	M_PROTO10	0x00200000 /* protocol-specific */
-#define	M_PROTO11	0x00400000 /* protocol-specific */
-#define	M_PROTO12	0x00800000 /* protocol-specific */
-
-/*
- * Flags to purge when crossing layers.
- */
-#define	M_PROTOFLAGS \
-    (M_PROTO1|M_PROTO2|M_PROTO3|M_PROTO4|M_PROTO5|M_PROTO6|M_PROTO7|M_PROTO8|\
-     M_PROTO9|M_PROTO10|M_PROTO11|M_PROTO12)
-
-/*
- * Flags preserved when copying m_pkthdr.
- */
-#define M_COPYFLAGS \
-    (M_PKTHDR|M_EOR|M_RDONLY|M_BCAST|M_MCAST|M_PROMISC|M_VLANTAG|M_FLOWID| \
-     M_PROTOFLAGS)
-
-/*
- * Mbuf flag description for use with printf(9) %b identifier.
- */
-#define	M_FLAG_BITS \
-    "\20\1M_EXT\2M_PKTHDR\3M_EOR\4M_RDONLY\5M_BCAST\6M_MCAST" \
-    "\7M_PROMISC\10M_VLANTAG\11M_FLOWID"
-#define	M_FLAG_PROTOBITS \
-    "\15M_PROTO1\16M_PROTO2\17M_PROTO3\20M_PROTO4\21M_PROTO5" \
-    "\22M_PROTO6\23M_PROTO7\24M_PROTO8\25M_PROTO9\26M_PROTO10" \
-    "\27M_PROTO11\30M_PROTO12"
-#define	M_FLAG_PRINTF (M_FLAG_BITS M_FLAG_PROTOBITS)
-
-/*
- * Network interface cards are able to hash protocol fields (such as IPv4
- * addresses and TCP port numbers) classify packets into flows.  These flows
- * can then be used to maintain ordering while delivering packets to the OS
- * via parallel input queues, as well as to provide a stateless affinity
- * model.  NIC drivers can pass up the hash via m->m_pkthdr.flowid, and set
- * m_flag fields to indicate how the hash should be interpreted by the
- * network stack.
- *
- * Most NICs support RSS, which provides ordering and explicit affinity, and
- * use the hash m_flag bits to indicate what header fields were covered by
- * the hash.  M_HASHTYPE_OPAQUE can be set by non-RSS cards or configurations
- * that provide an opaque flow identifier, allowing for ordering and
- * distribution without explicit affinity.
- */
-#define	M_HASHTYPE_NONE			0
-#define	M_HASHTYPE_RSS_IPV4		1	/* IPv4 2-tuple */
-#define	M_HASHTYPE_RSS_TCP_IPV4		2	/* TCPv4 4-tuple */
-#define	M_HASHTYPE_RSS_IPV6		3	/* IPv6 2-tuple */
-#define	M_HASHTYPE_RSS_TCP_IPV6		4	/* TCPv6 4-tuple */
-#define	M_HASHTYPE_RSS_IPV6_EX		5	/* IPv6 2-tuple + ext hdrs */
-#define	M_HASHTYPE_RSS_TCP_IPV6_EX	6	/* TCPv6 4-tiple + ext hdrs */
-#define	M_HASHTYPE_OPAQUE		255	/* ordering, not affinity */
-
-#define	M_HASHTYPE_CLEAR(m)	((m)->m_pkthdr.rsstype = 0)
-/*
- * Handle M_FLOWID for legacy drivers still using them.
- */
-#define	M_HASHTYPE_GET(m)	(((m->m_flags & M_FLOWID) &&	    \
-    (m)->m_pkthdr.rsstype == M_HASHTYPE_NONE) ? M_HASHTYPE_OPAQUE : \
-    (m)->m_pkthdr.rsstype)
-#define	M_HASHTYPE_SET(m, v)	do {	    \
-	    if ((v) != M_HASHTYPE_NONE)	    \
-		m->m_flags |= M_FLOWID;	    \
-	    (m)->m_pkthdr.rsstype = (v);    \
-} while (0)
-#define	M_HASHTYPE_TEST(m, v)	(M_HASHTYPE_GET(m) == (v))
-
-/*
- * COS/QOS class and quality of service tags.
- * It uses DSCP code points as base.
- */
-#define	QOS_DSCP_CS0		0x00
-#define	QOS_DSCP_DEF		QOS_DSCP_CS0
-#define	QOS_DSCP_CS1		0x20
-#define	QOS_DSCP_AF11		0x28
-#define	QOS_DSCP_AF12		0x30
-#define	QOS_DSCP_AF13		0x38
-#define	QOS_DSCP_CS2		0x40
-#define	QOS_DSCP_AF21		0x48
-#define	QOS_DSCP_AF22		0x50
-#define	QOS_DSCP_AF23		0x58
-#define	QOS_DSCP_CS3		0x60
-#define	QOS_DSCP_AF31		0x68
-#define	QOS_DSCP_AF32		0x70
-#define	QOS_DSCP_AF33		0x78
-#define	QOS_DSCP_CS4		0x80
-#define	QOS_DSCP_AF41		0x88
-#define	QOS_DSCP_AF42		0x90
-#define	QOS_DSCP_AF43		0x98
-#define	QOS_DSCP_CS5		0xa0
-#define	QOS_DSCP_EF		0xb8
-#define	QOS_DSCP_CS6		0xc0
-#define	QOS_DSCP_CS7		0xe0
-
-/*
- * External mbuf storage buffer types.
- */
-#define	EXT_CLUSTER	1	/* mbuf cluster */
-#define	EXT_SFBUF	2	/* sendfile(2)'s sf_bufs */
-#define	EXT_JUMBOP	3	/* jumbo cluster 4096 bytes */
-#define	EXT_JUMBO9	4	/* jumbo cluster 9216 bytes */
-#define	EXT_JUMBO16	5	/* jumbo cluster 16184 bytes */
-#define	EXT_PACKET	6	/* mbuf+cluster from packet zone */
-#define	EXT_MBUF	7	/* external mbuf reference (M_IOVEC) */
-
-#define	EXT_VENDOR1	224	/* for vendor-internal use */
-#define	EXT_VENDOR2	225	/* for vendor-internal use */
-#define	EXT_VENDOR3	226	/* for vendor-internal use */
-#define	EXT_VENDOR4	227	/* for vendor-internal use */
-
-#define	EXT_EXP1	244	/* for experimental use */
-#define	EXT_EXP2	245	/* for experimental use */
-#define	EXT_EXP3	246	/* for experimental use */
-#define	EXT_EXP4	247	/* for experimental use */
-
-#define	EXT_NET_DRV	252	/* custom ext_buf provided by net driver(s) */
-#define	EXT_MOD_TYPE	253	/* custom module's ext_buf type */
-#define	EXT_DISPOSABLE	254	/* can throw this buffer away w/page flipping */
-#define	EXT_EXTREF	255	/* has externally maintained ref_cnt ptr */
-
-/*
- * Flags for external mbuf buffer types.
- * NB: limited to the lower 24 bits.
- */
-#define	EXT_FLAG_EMBREF		0x000001	/* embedded ref_cnt, notyet */
-#define	EXT_FLAG_EXTREF		0x000002	/* external ref_cnt, notyet */
-#define	EXT_FLAG_NOFREE		0x000010	/* don't free mbuf to pool, notyet */
-
-#define	EXT_FLAG_VENDOR1	0x010000	/* for vendor-internal use */
-#define	EXT_FLAG_VENDOR2	0x020000	/* for vendor-internal use */
-#define	EXT_FLAG_VENDOR3	0x040000	/* for vendor-internal use */
-#define	EXT_FLAG_VENDOR4	0x080000	/* for vendor-internal use */
-
-#define	EXT_FLAG_EXP1		0x100000	/* for experimental use */
-#define	EXT_FLAG_EXP2		0x200000	/* for experimental use */
-#define	EXT_FLAG_EXP3		0x400000	/* for experimental use */
-#define	EXT_FLAG_EXP4		0x800000	/* for experimental use */
-
-/*
- * EXT flag description for use with printf(9) %b identifier.
- */
-#define	EXT_FLAG_BITS \
-    "\20\1EXT_FLAG_EMBREF\2EXT_FLAG_EXTREF\5EXT_FLAG_NOFREE" \
-    "\21EXT_FLAG_VENDOR1\22EXT_FLAG_VENDOR2\23EXT_FLAG_VENDOR3" \
-    "\24EXT_FLAG_VENDOR4\25EXT_FLAG_EXP1\26EXT_FLAG_EXP2\27EXT_FLAG_EXP3" \
-    "\30EXT_FLAG_EXP4"
-
-/*
- * Return values for (*ext_free).
- */
-#define	EXT_FREE_OK	0	/* Normal return */
-
-/*
- * Flags indicating checksum, segmentation and other offload work to be
- * done, or already done, by hardware or lower layers.  It is split into
- * separate inbound and outbound flags.
- *
- * Outbound flags that are set by upper protocol layers requesting lower
- * layers, or ideally the hardware, to perform these offloading tasks.
- * For outbound packets this field and its flags can be directly tested
- * against if_data.ifi_hwassist.
- */
-#define	CSUM_IP			0x00000001	/* IP header checksum offload */
-#define	CSUM_IP_UDP		0x00000002	/* UDP checksum offload */
-#define	CSUM_IP_TCP		0x00000004	/* TCP checksum offload */
-#define	CSUM_IP_SCTP		0x00000008	/* SCTP checksum offload */
-#define	CSUM_IP_TSO		0x00000010	/* TCP segmentation offload */
-#define	CSUM_IP_ISCSI		0x00000020	/* iSCSI checksum offload */
-
-#define	CSUM_IP6_UDP		0x00000200	/* UDP checksum offload */
-#define	CSUM_IP6_TCP		0x00000400	/* TCP checksum offload */
-#define	CSUM_IP6_SCTP		0x00000800	/* SCTP checksum offload */
-#define	CSUM_IP6_TSO		0x00001000	/* TCP segmentation offload */
-#define	CSUM_IP6_ISCSI		0x00002000	/* iSCSI checksum offload */
-
-/* Inbound checksum support where the checksum was verified by hardware. */
-#define	CSUM_L3_CALC		0x01000000	/* calculated layer 3 csum */
-#define	CSUM_L3_VALID		0x02000000	/* checksum is correct */
-#define	CSUM_L4_CALC		0x04000000	/* calculated layer 4 csum */
-#define	CSUM_L4_VALID		0x08000000	/* checksum is correct */
-#define	CSUM_L5_CALC		0x10000000	/* calculated layer 5 csum */
-#define	CSUM_L5_VALID		0x20000000	/* checksum is correct */
-#define	CSUM_COALESED		0x40000000	/* contains merged segments */
-
-/*
- * CSUM flag description for use with printf(9) %b identifier.
- */
-#define	CSUM_BITS \
-    "\20\1CSUM_IP\2CSUM_IP_UDP\3CSUM_IP_TCP\4CSUM_IP_SCTP\5CSUM_IP_TSO" \
-    "\6CSUM_IP_ISCSI" \
-    "\12CSUM_IP6_UDP\13CSUM_IP6_TCP\14CSUM_IP6_SCTP\15CSUM_IP6_TSO" \
-    "\16CSUM_IP6_ISCSI" \
-    "\31CSUM_L3_CALC\32CSUM_L3_VALID\33CSUM_L4_CALC\34CSUM_L4_VALID" \
-    "\35CSUM_L5_CALC\36CSUM_L5_VALID\37CSUM_COALESED"
-
-/* CSUM flags compatibility mappings. */
-#define	CSUM_IP_CHECKED		CSUM_L3_CALC
-#define	CSUM_IP_VALID		CSUM_L3_VALID
-#define	CSUM_DATA_VALID		CSUM_L4_VALID
-#define	CSUM_PSEUDO_HDR		CSUM_L4_CALC
-#define	CSUM_SCTP_VALID		CSUM_L4_VALID
-#define	CSUM_DELAY_DATA		(CSUM_TCP|CSUM_UDP)
-#define	CSUM_DELAY_IP		CSUM_IP		/* Only v4, no v6 IP hdr csum */
-#define	CSUM_DELAY_DATA_IPV6	(CSUM_TCP_IPV6|CSUM_UDP_IPV6)
-#define	CSUM_DATA_VALID_IPV6	CSUM_DATA_VALID
-#define	CSUM_TCP		CSUM_IP_TCP
-#define	CSUM_UDP		CSUM_IP_UDP
-#define	CSUM_SCTP		CSUM_IP_SCTP
-#define	CSUM_TSO		(CSUM_IP_TSO|CSUM_IP6_TSO)
-#define	CSUM_UDP_IPV6		CSUM_IP6_UDP
-#define	CSUM_TCP_IPV6		CSUM_IP6_TCP
-#define	CSUM_SCTP_IPV6		CSUM_IP6_SCTP
-#define	CSUM_FRAGMENT		0x0		/* Unused */
-
-/*
- * mbuf types describing the content of the mbuf (including external storage).
- */
-#define	MT_NOTMBUF	0	/* USED INTERNALLY ONLY! Object is not mbuf */
-#define	MT_DATA		1	/* dynamic (data) allocation */
-#define	MT_HEADER	MT_DATA	/* packet header, use M_PKTHDR instead */
-
-#define	MT_VENDOR1	4	/* for vendor-internal use */
-#define	MT_VENDOR2	5	/* for vendor-internal use */
-#define	MT_VENDOR3	6	/* for vendor-internal use */
-#define	MT_VENDOR4	7	/* for vendor-internal use */
-
-#define	MT_SONAME	8	/* socket name */
-
-#define	MT_EXP1		9	/* for experimental use */
-#define	MT_EXP2		10	/* for experimental use */
-#define	MT_EXP3		11	/* for experimental use */
-#define	MT_EXP4		12	/* for experimental use */
-
-#define	MT_CONTROL	14	/* extra-data protocol message */
-#define	MT_OOBDATA	15	/* expedited data  */
-#define	MT_NTYPES	16	/* number of mbuf types for mbtypes[] */
-
-#define	MT_NOINIT	255	/* Not a type but a flag to allocate
-				   a non-initialized mbuf */
-
-/*
- * Compatibility with historic mbuf allocator.
- */
-#define	MBTOM(how)	(how)
-#define	M_DONTWAIT	M_NOWAIT
-#define	M_TRYWAIT	M_WAITOK
-#define	M_WAIT		M_WAITOK
-
-/*
- * String names of mbuf-related UMA(9) and malloc(9) types.  Exposed to
- * !_KERNEL so that monitoring tools can look up the zones with
- * libmemstat(3).
- */
-#define	MBUF_MEM_NAME		"mbuf"
-#define	MBUF_CLUSTER_MEM_NAME	"mbuf_cluster"
-#define	MBUF_PACKET_MEM_NAME	"mbuf_packet"
-#define	MBUF_JUMBOP_MEM_NAME	"mbuf_jumbo_page"
-#define	MBUF_JUMBO9_MEM_NAME	"mbuf_jumbo_9k"
-#define	MBUF_JUMBO16_MEM_NAME	"mbuf_jumbo_16k"
-#define	MBUF_TAG_MEM_NAME	"mbuf_tag"
-#define	MBUF_EXTREFCNT_MEM_NAME	"mbuf_ext_refcnt"
-
-#ifdef _KERNEL
-
-#ifdef WITNESS
-#define	MBUF_CHECKSLEEP(how) do {					\
-	if (how == M_WAITOK)						\
-		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,		\
-		    "Sleeping in \"%s\"", __func__);			\
-} while (0)
-#else
-#define	MBUF_CHECKSLEEP(how)
-#endif
-
-/*
- * Network buffer allocation API
- *
- * The rest of it is defined in kern/kern_mbuf.c
- */
-extern uma_zone_t	zone_mbuf;
-extern uma_zone_t	zone_clust;
-extern uma_zone_t	zone_pack;
-extern uma_zone_t	zone_jumbop;
-extern uma_zone_t	zone_jumbo9;
-extern uma_zone_t	zone_jumbo16;
-extern uma_zone_t	zone_ext_refcnt;
-
-void		 mb_free_ext(struct mbuf *);
-int		 m_pkthdr_init(struct mbuf *, int);
-
-static __inline int
-m_gettype(int size)
-{
-	int type;
-
-	switch (size) {
-	case MSIZE:
-		type = EXT_MBUF;
-		break;
-	case MCLBYTES:
-		type = EXT_CLUSTER;
-		break;
-#if MJUMPAGESIZE != MCLBYTES
-	case MJUMPAGESIZE:
-		type = EXT_JUMBOP;
-		break;
-#endif
-	case MJUM9BYTES:
-		type = EXT_JUMBO9;
-		break;
-	case MJUM16BYTES:
-		type = EXT_JUMBO16;
-		break;
-	default:
-		panic("%s: invalid cluster size %d", __func__, size);
-	}
-
-	return (type);
-}
-
-/*
- * Associated an external reference counted buffer with an mbuf.
- */
-static __inline void
-m_extaddref(struct mbuf *m, caddr_t buf, u_int size, u_int *ref_cnt,
-    int (*freef)(struct mbuf *, void *, void *), void *arg1, void *arg2)
-{
-
-	KASSERT(ref_cnt != NULL, ("%s: ref_cnt not provided", __func__));
-
-	atomic_add_int(ref_cnt, 1);
-	m->m_flags |= M_EXT;
-	m->m_ext.ext_buf = buf;
-	m->m_ext.ref_cnt = ref_cnt;
-	m->m_data = m->m_ext.ext_buf;
-	m->m_ext.ext_size = size;
-	m->m_ext.ext_free = freef;
-	m->m_ext.ext_arg1 = arg1;
-	m->m_ext.ext_arg2 = arg2;
-	m->m_ext.ext_type = EXT_EXTREF;
-	m->m_ext.ext_flags = 0;
-}
-
-static __inline uma_zone_t
-m_getzone(int size)
-{
-	uma_zone_t zone;
-
-	switch (size) {
-	case MCLBYTES:
-		zone = zone_clust;
-		break;
-#if MJUMPAGESIZE != MCLBYTES
-	case MJUMPAGESIZE:
-		zone = zone_jumbop;
-		break;
-#endif
-	case MJUM9BYTES:
-		zone = zone_jumbo9;
-		break;
-	case MJUM16BYTES:
-		zone = zone_jumbo16;
-		break;
-	default:
-		panic("%s: invalid cluster size %d", __func__, size);
-	}
-
-	return (zone);
-}
-
-/*
- * Initialize an mbuf with linear storage.
- *
- * Inline because the consumer text overhead will be roughly the same to
- * initialize or call a function with this many parameters and M_PKTHDR
- * should go away with constant propagation for !MGETHDR.
- */
-static __inline int
-m_init(struct mbuf *m, uma_zone_t zone, int size, int how, short type,
-    int flags)
-{
-	int error;
-
-	m->m_next = NULL;
-	m->m_nextpkt = NULL;
-	m->m_data = m->m_dat;
-	m->m_len = 0;
-	m->m_flags = flags;
-	m->m_type = type;
-	if (flags & M_PKTHDR) {
-		if ((error = m_pkthdr_init(m, how)) != 0)
-			return (error);
-	}
-
-	return (0);
-}
-
-static __inline struct mbuf *
-m_get(int how, short type)
-{
-	struct mb_args args;
-
-	args.flags = 0;
-	args.type = type;
-	return (uma_zalloc_arg(zone_mbuf, &args, how));
-}
-
-/*
- * XXX This should be deprecated, very little use.
- */
-static __inline struct mbuf *
-m_getclr(int how, short type)
-{
-	struct mbuf *m;
-	struct mb_args args;
-
-	args.flags = 0;
-	args.type = type;
-	m = uma_zalloc_arg(zone_mbuf, &args, how);
-	if (m != NULL)
-		bzero(m->m_data, MLEN);
-	return (m);
-}
-
-static __inline struct mbuf *
-m_gethdr(int how, short type)
-{
-	struct mb_args args;
-
-	args.flags = M_PKTHDR;
-	args.type = type;
-	return (uma_zalloc_arg(zone_mbuf, &args, how));
-}
-
-static __inline struct mbuf *
-m_getcl(int how, short type, int flags)
-{
-	struct mb_args args;
-
-	args.flags = flags;
-	args.type = type;
-	return (uma_zalloc_arg(zone_pack, &args, how));
-}
-
-static __inline void
-m_clget(struct mbuf *m, int how)
-{
-
-	if (m->m_flags & M_EXT)
-		printf("%s: %p mbuf already has cluster\n", __func__, m);
-	m->m_ext.ext_buf = (char *)NULL;
-	uma_zalloc_arg(zone_clust, m, how);
-	/*
-	 * On a cluster allocation failure, drain the packet zone and retry,
-	 * we might be able to loosen a few clusters up on the drain.
-	 */
-	if ((how & M_NOWAIT) && (m->m_ext.ext_buf == NULL)) {
-		zone_drain(zone_pack);
-		uma_zalloc_arg(zone_clust, m, how);
-	}
-}
-
-/*
- * m_cljget() is different from m_clget() as it can allocate clusters without
- * attaching them to an mbuf.  In that case the return value is the pointer
- * to the cluster of the requested size.  If an mbuf was specified, it gets
- * the cluster attached to it and the return value can be safely ignored.
- * For size it takes MCLBYTES, MJUMPAGESIZE, MJUM9BYTES, MJUM16BYTES.
- */
-static __inline void *
-m_cljget(struct mbuf *m, int how, int size)
-{
-	uma_zone_t zone;
-
-	if (m && m->m_flags & M_EXT)
-		printf("%s: %p mbuf already has cluster\n", __func__, m);
-	if (m != NULL)
-		m->m_ext.ext_buf = NULL;
-
-	zone = m_getzone(size);
-	return (uma_zalloc_arg(zone, m, how));
-}
-
-static __inline void
-m_cljset(struct mbuf *m, void *cl, int type)
-{
-	uma_zone_t zone;
-	int size;
-
-	switch (type) {
-	case EXT_CLUSTER:
-		size = MCLBYTES;
-		zone = zone_clust;
-		break;
-#if MJUMPAGESIZE != MCLBYTES
-	case EXT_JUMBOP:
-		size = MJUMPAGESIZE;
-		zone = zone_jumbop;
-		break;
-#endif
-	case EXT_JUMBO9:
-		size = MJUM9BYTES;
-		zone = zone_jumbo9;
-		break;
-	case EXT_JUMBO16:
-		size = MJUM16BYTES;
-		zone = zone_jumbo16;
-		break;
-	default:
-		panic("%s: unknown cluster type %d", __func__, type);
-		break;
-	}
-
-	m->m_data = m->m_ext.ext_buf = cl;
-	m->m_ext.ext_free = m->m_ext.ext_arg1 = m->m_ext.ext_arg2 = NULL;
-	m->m_ext.ext_size = size;
-	m->m_ext.ext_type = type;
-	m->m_ext.ext_flags = 0;
-	m->m_ext.ref_cnt = uma_find_refcnt(zone, cl);
-	m->m_flags |= M_EXT;
-
-}
-
-static __inline void
-m_chtype(struct mbuf *m, short new_type)
-{
-
-	m->m_type = new_type;
-}
-
-static __inline void
-m_clrprotoflags(struct mbuf *m)
-{
-
-	m->m_flags &= ~M_PROTOFLAGS;
-}
-
-static __inline struct mbuf *
-m_last(struct mbuf *m)
-{
-
-	while (m->m_next)
-		m = m->m_next;
-	return (m);
-}
-
-/*
- * mbuf, cluster, and external object allocation macros (for compatibility
- * purposes).
- */
-#define	M_MOVE_PKTHDR(to, from)	m_move_pkthdr((to), (from))
-#define	MGET(m, how, type)	((m) = m_get((how), (type)))
-#define	MGETHDR(m, how, type)	((m) = m_gethdr((how), (type)))
-#define	MCLGET(m, how)		m_clget((m), (how))
-#define	MEXTADD(m, buf, size, free, arg1, arg2, flags, type)		\
-    (void )m_extadd((m), (caddr_t)(buf), (size), (free), (arg1), (arg2),\
-    (flags), (type), M_NOWAIT)
-#define	m_getm(m, len, how, type)					\
-    m_getm2((m), (len), (how), (type), M_PKTHDR)
-
-/*
- * Evaluate TRUE if it's safe to write to the mbuf m's data region (this can
- * be both the local data payload, or an external buffer area, depending on
- * whether M_EXT is set).
- */
-#define	M_WRITABLE(m)	(!((m)->m_flags & M_RDONLY) &&			\
-			 (!(((m)->m_flags & M_EXT)) ||			\
-			 (*((m)->m_ext.ref_cnt) == 1)) )		\
-
-/* Check if the supplied mbuf has a packet header, or else panic. */
-#define	M_ASSERTPKTHDR(m)						\
-	KASSERT((m) != NULL && (m)->m_flags & M_PKTHDR,			\
-	    ("%s: no mbuf packet header!", __func__))
-
-/*
- * Ensure that the supplied mbuf is a valid, non-free mbuf.
- *
- * XXX: Broken at the moment.  Need some UMA magic to make it work again.
- */
-#define	M_ASSERTVALID(m)						\
-	KASSERT((((struct mbuf *)m)->m_flags & 0) == 0,			\
-	    ("%s: attempted use of a free mbuf!", __func__))
-
-/*
- * Set the m_data pointer of a newly-allocated mbuf (m_get/MGET) to place an
- * object of the specified size at the end of the mbuf, longword aligned.
- */
-#define	M_ALIGN(m, len) do {						\
-	KASSERT(!((m)->m_flags & (M_PKTHDR|M_EXT)),			\
-		("%s: M_ALIGN not normal mbuf", __func__));		\
-	KASSERT((m)->m_data == (m)->m_dat,				\
-		("%s: M_ALIGN not a virgin mbuf", __func__));		\
-	(m)->m_data += (MLEN - (len)) & ~(sizeof(long) - 1);		\
-} while (0)
-
-/*
- * As above, for mbufs allocated with m_gethdr/MGETHDR or initialized by
- * M_DUP/MOVE_PKTHDR.
- */
-#define	MH_ALIGN(m, len) do {						\
-	KASSERT((m)->m_flags & M_PKTHDR && !((m)->m_flags & M_EXT),	\
-		("%s: MH_ALIGN not PKTHDR mbuf", __func__));		\
-	KASSERT((m)->m_data == (m)->m_pktdat,				\
-		("%s: MH_ALIGN not a virgin mbuf", __func__));		\
-	(m)->m_data += (MHLEN - (len)) & ~(sizeof(long) - 1);		\
-} while (0)
-
-/*
- * As above, for mbuf with external storage.
- */
-#define	MEXT_ALIGN(m, len) do {						\
-	KASSERT((m)->m_flags & M_EXT,					\
-		("%s: MEXT_ALIGN not an M_EXT mbuf", __func__));	\
-	KASSERT((m)->m_data == (m)->m_ext.ext_buf,			\
-		("%s: MEXT_ALIGN not a virgin mbuf", __func__));	\
-	(m)->m_data += ((m)->m_ext.ext_size - (len)) &			\
-	    ~(sizeof(long) - 1); 					\
-} while (0)
-
-/*
- * Compute the amount of space available before the current start of data in
- * an mbuf.
- *
- * The M_WRITABLE() is a temporary, conservative safety measure: the burden
- * of checking writability of the mbuf data area rests solely with the caller.
- */
-#define	M_LEADINGSPACE(m)						\
-	((m)->m_flags & M_EXT ?						\
-	    (M_WRITABLE(m) ? (m)->m_data - (m)->m_ext.ext_buf : 0):	\
-	    (m)->m_flags & M_PKTHDR ? (m)->m_data - (m)->m_pktdat :	\
-	    (m)->m_data - (m)->m_dat)
-
-/*
- * Compute the amount of space available after the end of data in an mbuf.
- *
- * The M_WRITABLE() is a temporary, conservative safety measure: the burden
- * of checking writability of the mbuf data area rests solely with the caller.
- */
-#define	M_TRAILINGSPACE(m)						\
-	((m)->m_flags & M_EXT ?						\
-	    (M_WRITABLE(m) ? (m)->m_ext.ext_buf + (m)->m_ext.ext_size	\
-		- ((m)->m_data + (m)->m_len) : 0) :			\
-	    &(m)->m_dat[MLEN] - ((m)->m_data + (m)->m_len))
-
-/*
- * Arrange to prepend space of size plen to mbuf m.  If a new mbuf must be
- * allocated, how specifies whether to wait.  If the allocation fails, the
- * original mbuf chain is freed and m is set to NULL.
- */
-#define	M_PREPEND(m, plen, how) do {					\
-	struct mbuf **_mmp = &(m);					\
-	struct mbuf *_mm = *_mmp;					\
-	int _mplen = (plen);						\
-	int __mhow = (how);						\
-									\
-	MBUF_CHECKSLEEP(how);						\
-	if (M_LEADINGSPACE(_mm) >= _mplen) {				\
-		_mm->m_data -= _mplen;					\
-		_mm->m_len += _mplen;					\
-	} else								\
-		_mm = m_prepend(_mm, _mplen, __mhow);			\
-	if (_mm != NULL && _mm->m_flags & M_PKTHDR)			\
-		_mm->m_pkthdr.len += _mplen;				\
-	*_mmp = _mm;							\
-} while (0)
-
-/*
- * Change mbuf to new type.  This is a relatively expensive operation and
- * should be avoided.
- */
-#define	MCHTYPE(m, t)	m_chtype((m), (t))
-
-/* Length to m_copy to copy all. */
-#define	M_COPYALL	1000000000
-
-/* Compatibility with 4.3. */
-#define	m_copy(m, o, l)	m_copym((m), (o), (l), M_NOWAIT)
-
-extern int		max_datalen;	/* MHLEN - max_hdr */
-extern int		max_hdr;	/* Largest link + protocol header */
-extern int		max_linkhdr;	/* Largest link-level header */
-extern int		max_protohdr;	/* Largest protocol header */
-extern int		nmbclusters;	/* Maximum number of clusters */
-
-struct uio;
-
-void		 m_adj(struct mbuf *, int);
-void		 m_align(struct mbuf *, int);
-int		 m_apply(struct mbuf *, int, int,
-		    int (*)(void *, void *, u_int), void *);
-int		 m_append(struct mbuf *, int, c_caddr_t);
-void		 m_cat(struct mbuf *, struct mbuf *);
-int		 m_extadd(struct mbuf *, caddr_t, u_int,
-		    int (*)(struct mbuf *, void *, void *), void *, void *,
-		    int, int, int);
-struct mbuf	*m_collapse(struct mbuf *, int, int);
-void		 m_copyback(struct mbuf *, int, int, c_caddr_t);
-void		 m_copydata(const struct mbuf *, int, int, caddr_t);
-struct mbuf	*m_copym(struct mbuf *, int, int, int);
-struct mbuf	*m_copymdata(struct mbuf *, struct mbuf *,
-		    int, int, int, int);
-struct mbuf	*m_copypacket(struct mbuf *, int);
-void		 m_copy_pkthdr(struct mbuf *, struct mbuf *);
-struct mbuf	*m_copyup(struct mbuf *, int, int);
-struct mbuf	*m_defrag(struct mbuf *, int);
-void		 m_demote(struct mbuf *, int);
-struct mbuf	*m_devget(char *, int, int, struct ifnet *,
-		    void (*)(char *, caddr_t, u_int));
-struct mbuf	*m_dup(struct mbuf *, int);
-int		 m_dup_pkthdr(struct mbuf *, struct mbuf *, int);
-u_int		 m_fixhdr(struct mbuf *);
-struct mbuf	*m_fragment(struct mbuf *, int, int);
-void		 m_freem(struct mbuf *);
-struct mbuf	*m_get2(int, int, short, int);
-struct mbuf	*m_getjcl(int, short, int, int);
-struct mbuf	*m_getm2(struct mbuf *, int, int, short, int);
-struct mbuf	*m_getptr(struct mbuf *, int, int *);
-u_int		 m_length(struct mbuf *, struct mbuf **);
-int		 m_mbuftouio(struct uio *, struct mbuf *, int);
-void		 m_move_pkthdr(struct mbuf *, struct mbuf *);
-struct mbuf	*m_prepend(struct mbuf *, int, int);
-void		 m_print(const struct mbuf *, int);
-struct mbuf	*m_pulldown(struct mbuf *, int, int, int *);
-struct mbuf	*m_pullup(struct mbuf *, int);
-int		 m_sanity(struct mbuf *, int);
-struct mbuf	*m_split(struct mbuf *, int, int);
-struct mbuf	*m_uiotombuf(struct uio *, int, int, int, int);
-struct mbuf	*m_unshare(struct mbuf *, int);
-
-/*-
- * Network packets may have annotations attached by affixing a list of
- * "packet tags" to the pkthdr structure.  Packet tags are dynamically
- * allocated semi-opaque data structures that have a fixed header
- * (struct m_tag) that specifies the size of the memory block and a
- * <cookie,type> pair that identifies it.  The cookie is a 32-bit unique
- * unsigned value used to identify a module or ABI.  By convention this value
- * is chosen as the date+time that the module is created, expressed as the
- * number of seconds since the epoch (e.g., using date -u +'%s').  The type
- * value is an ABI/module-specific value that identifies a particular
- * annotation and is private to the module.  For compatibility with systems
- * like OpenBSD that define packet tags w/o an ABI/module cookie, the value
- * PACKET_ABI_COMPAT is used to implement m_tag_get and m_tag_find
- * compatibility shim functions and several tag types are defined below.
- * Users that do not require compatibility should use a private cookie value
- * so that packet tag-related definitions can be maintained privately.
- *
- * Note that the packet tag returned by m_tag_alloc has the default memory
- * alignment implemented by malloc.  To reference private data one can use a
- * construct like:
- *
- *	struct m_tag *mtag = m_tag_alloc(...);
- *	struct foo *p = (struct foo *)(mtag+1);
- *
- * if the alignment of struct m_tag is sufficient for referencing members of
- * struct foo.  Otherwise it is necessary to embed struct m_tag within the
- * private data structure to insure proper alignment; e.g.,
- *
- *	struct foo {
- *		struct m_tag	tag;
- *		...
- *	};
- *	struct foo *p = (struct foo *) m_tag_alloc(...);
- *	struct m_tag *mtag = &p->tag;
- */
-
-/*
- * Persistent tags stay with an mbuf until the mbuf is reclaimed.  Otherwise
- * tags are expected to ``vanish'' when they pass through a network
- * interface.  For most interfaces this happens normally as the tags are
- * reclaimed when the mbuf is free'd.  However in some special cases
- * reclaiming must be done manually.  An example is packets that pass through
- * the loopback interface.  Also, one must be careful to do this when
- * ``turning around'' packets (e.g., icmp_reflect).
- *
- * To mark a tag persistent bit-or this flag in when defining the tag id.
- * The tag will then be treated as described above.
- */
-#define	MTAG_PERSISTENT				0x800
-
-#define	PACKET_TAG_NONE				0  /* Nadda */
-
-/* Packet tags for use with PACKET_ABI_COMPAT. */
-#define	PACKET_TAG_IPSEC_IN_DONE		1  /* IPsec applied, in */
-#define	PACKET_TAG_IPSEC_OUT_DONE		2  /* IPsec applied, out */
-#define	PACKET_TAG_IPSEC_IN_CRYPTO_DONE		3  /* NIC IPsec crypto done */
-#define	PACKET_TAG_IPSEC_OUT_CRYPTO_NEEDED	4  /* NIC IPsec crypto req'ed */
-#define	PACKET_TAG_IPSEC_IN_COULD_DO_CRYPTO	5  /* NIC notifies IPsec */
-#define	PACKET_TAG_IPSEC_PENDING_TDB		6  /* Reminder to do IPsec */
-#define	PACKET_TAG_BRIDGE			7  /* Bridge processing done */
-#define	PACKET_TAG_GIF				8  /* GIF processing done */
-#define	PACKET_TAG_GRE				9  /* GRE processing done */
-#define	PACKET_TAG_IN_PACKET_CHECKSUM		10 /* NIC checksumming done */
-#define	PACKET_TAG_ENCAP			11 /* Encap.  processing */
-#define	PACKET_TAG_IPSEC_SOCKET			12 /* IPSEC socket ref */
-#define	PACKET_TAG_IPSEC_HISTORY		13 /* IPSEC history */
-#define	PACKET_TAG_IPV6_INPUT			14 /* IPV6 input processing */
-#define	PACKET_TAG_DUMMYNET			15 /* dummynet info */
-#define	PACKET_TAG_DIVERT			17 /* divert info */
-#define	PACKET_TAG_IPFORWARD			18 /* ipforward info */
-#define	PACKET_TAG_MACLABEL	(19 | MTAG_PERSISTENT) /* MAC label */
-#define	PACKET_TAG_PF		(21 | MTAG_PERSISTENT) /* PF/ALTQ information */
-#define	PACKET_TAG_RTSOCKFAM			25 /* rtsock sa family */
-#define	PACKET_TAG_IPOPTIONS			27 /* Saved IP options */
-#define	PACKET_TAG_CARP				28 /* CARP info */
-#define	PACKET_TAG_IPSEC_NAT_T_PORTS		29 /* two uint16_t */
-#define	PACKET_TAG_ND_OUTGOING			30 /* ND outgoing */
-
-/* Specific cookies and tags. */
-
-/* Packet tag routines. */
-struct m_tag	*m_tag_alloc(uint32_t, int, int, int);
-void		 m_tag_delete(struct mbuf *, struct m_tag *);
-void		 m_tag_delete_chain(struct mbuf *, struct m_tag *);
-void		 m_tag_free_default(struct m_tag *);
-struct m_tag	*m_tag_locate(struct mbuf *, uint32_t, int, struct m_tag *);
-struct m_tag	*m_tag_copy(struct m_tag *, int);
-int		 m_tag_copy_chain(struct mbuf *, struct mbuf *, int);
-void		 m_tag_delete_nonpersistent(struct mbuf *);
-
-/*
- * Initialize the list of tags associated with an mbuf.
- */
-static __inline void
-m_tag_init(struct mbuf *m)
-{
-
-	SLIST_INIT(&m->m_pkthdr.tags);
-}
-
-/*
- * Set up the contents of a tag.  Note that this does not fill in the free
- * method; the caller is expected to do that.
- *
- * XXX probably should be called m_tag_init, but that was already taken.
- */
-static __inline void
-m_tag_setup(struct m_tag *t, uint32_t cookie, int type, int len)
-{
-
-	t->m_tag_id = type;
-	t->m_tag_len = len;
-	t->m_tag_cookie = cookie;
-}
-
-/*
- * Reclaim resources associated with a tag.
- */
-static __inline void
-m_tag_free(struct m_tag *t)
-{
-
-	(*t->m_tag_free)(t);
-}
-
-/*
- * Return the first tag associated with an mbuf.
- */
-static __inline struct m_tag *
-m_tag_first(struct mbuf *m)
-{
-
-	return (SLIST_FIRST(&m->m_pkthdr.tags));
-}
-
-/*
- * Return the next tag in the list of tags associated with an mbuf.
- */
-static __inline struct m_tag *
-m_tag_next(struct mbuf *m, struct m_tag *t)
-{
-
-	return (SLIST_NEXT(t, m_tag_link));
-}
-
-/*
- * Prepend a tag to the list of tags associated with an mbuf.
- */
-static __inline void
-m_tag_prepend(struct mbuf *m, struct m_tag *t)
-{
-
-	SLIST_INSERT_HEAD(&m->m_pkthdr.tags, t, m_tag_link);
-}
-
-/*
- * Unlink a tag from the list of tags associated with an mbuf.
- */
-static __inline void
-m_tag_unlink(struct mbuf *m, struct m_tag *t)
-{
-
-	SLIST_REMOVE(&m->m_pkthdr.tags, t, m_tag, m_tag_link);
-}
-
-/* These are for OpenBSD compatibility. */
-#define	MTAG_ABI_COMPAT		0		/* compatibility ABI */
-
-static __inline struct m_tag *
-m_tag_get(int type, int length, int wait)
-{
-	return (m_tag_alloc(MTAG_ABI_COMPAT, type, length, wait));
-}
-
-static __inline struct m_tag *
-m_tag_find(struct mbuf *m, int type, struct m_tag *start)
-{
-	return (SLIST_EMPTY(&m->m_pkthdr.tags) ? (struct m_tag *)NULL :
-	    m_tag_locate(m, MTAG_ABI_COMPAT, type, start));
-}
-
-static __inline struct mbuf *
-m_free(struct mbuf *m)
-{
-	struct mbuf *n = m->m_next;
-
-	if ((m->m_flags & (M_PKTHDR|M_NOFREE)) == (M_PKTHDR|M_NOFREE))
-		m_tag_delete_chain(m, NULL);
-	if (m->m_flags & M_EXT)
-		mb_free_ext(m);
-	else if ((m->m_flags & M_NOFREE) == 0)
-		uma_zfree(zone_mbuf, m);
-	return (n);
-}
-
-static int inline
-rt_m_getfib(struct mbuf *m)
-{
-	KASSERT(m->m_flags & M_PKTHDR , ("Attempt to get FIB from non header mbuf."));
-	return (m->m_pkthdr.fibnum);
-}
-
-#define M_GETFIB(_m)   rt_m_getfib(_m)
-
-#define M_SETFIB(_m, _fib) do {						\
-        KASSERT((_m)->m_flags & M_PKTHDR, ("Attempt to set FIB on non header mbuf."));	\
-	((_m)->m_pkthdr.fibnum) = (_fib);				\
-} while (0)
-
-#endif /* _KERNEL */
-
-#ifdef MBUF_PROFILING
- void m_profile(struct mbuf *m);
- #define M_PROFILE(m) m_profile(m)
-#else
- #define M_PROFILE(m)
-#endif
-
-
-#endif /* !_SYS_MBUF_H_ */
diff --git a/include.new/sys/mchain.h b/include.new/sys/mchain.h
deleted file mode 100644
index 4ed19fa..0000000
--- a/include.new/sys/mchain.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Boris Popov
- * 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.
- *
- * 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: releng/10.2/sys/sys/mchain.h 227650 2011-11-18 03:05:20Z kevlo $
- */
-#ifndef _SYS_MCHAIN_H_
-#define _SYS_MCHAIN_H_
-
-#ifdef _KERNEL
-
-/*
- * Type of copy for mb_{put|get}_mem()
- */
-#define	MB_MSYSTEM	0		/* use bcopy() */
-#define	MB_MUSER	1		/* use copyin()/copyout() */
-#define	MB_MINLINE	2		/* use an inline copy loop */
-#define	MB_MZERO	3		/* bzero(), mb_put_mem only */
-#define	MB_MCUSTOM	4		/* use an user defined function */
-
-struct mbuf;
-struct mbchain;
-
-typedef int mb_copy_t(struct mbchain *mbp, c_caddr_t src, caddr_t dst,
-    size_t *srclen, size_t *dstlen);
-
-struct mbchain {
-	struct mbuf *	mb_top;		/* head of mbufs chain */
-	struct mbuf * 	mb_cur;		/* current mbuf */
-	int		mb_mleft;	/* free space in the current mbuf */
-	int		mb_count;	/* total number of bytes */
-	mb_copy_t *	mb_copy;	/* user defined copy function */
-	void *		mb_udata;	/* user data */
-};
-
-struct mdchain {
-	struct mbuf *	md_top;		/* head of mbufs chain */
-	struct mbuf * 	md_cur;		/* current mbuf */
-	u_char *	md_pos;		/* offset in the current mbuf */
-};
-
-int  mb_init(struct mbchain *mbp);
-void mb_initm(struct mbchain *mbp, struct mbuf *m);
-void mb_done(struct mbchain *mbp);
-struct mbuf *mb_detach(struct mbchain *mbp);
-int  mb_fixhdr(struct mbchain *mbp);
-caddr_t mb_reserve(struct mbchain *mbp, int size);
-
-int  mb_put_padbyte(struct mbchain *mbp);
-int  mb_put_uint8(struct mbchain *mbp, u_int8_t x);
-int  mb_put_uint16be(struct mbchain *mbp, u_int16_t x);
-int  mb_put_uint16le(struct mbchain *mbp, u_int16_t x);
-int  mb_put_uint32be(struct mbchain *mbp, uint32_t x);
-int  mb_put_uint32le(struct mbchain *mbp, uint32_t x);
-int  mb_put_int64be(struct mbchain *mbp, int64_t x);
-int  mb_put_int64le(struct mbchain *mbp, int64_t x);
-int  mb_put_mem(struct mbchain *mbp, c_caddr_t source, int size, int type);
-int  mb_put_mbuf(struct mbchain *mbp, struct mbuf *m);
-int  mb_put_uio(struct mbchain *mbp, struct uio *uiop, int size);
-
-int  md_init(struct mdchain *mdp);
-void md_initm(struct mdchain *mbp, struct mbuf *m);
-void md_done(struct mdchain *mdp);
-void md_append_record(struct mdchain *mdp, struct mbuf *top);
-int  md_next_record(struct mdchain *mdp);
-int  md_get_uint8(struct mdchain *mdp, u_int8_t *x);
-int  md_get_uint16(struct mdchain *mdp, u_int16_t *x);
-int  md_get_uint16le(struct mdchain *mdp, u_int16_t *x);
-int  md_get_uint16be(struct mdchain *mdp, u_int16_t *x);
-int  md_get_uint32(struct mdchain *mdp, uint32_t *x);
-int  md_get_uint32be(struct mdchain *mdp, uint32_t *x);
-int  md_get_uint32le(struct mdchain *mdp, uint32_t *x);
-int  md_get_int64(struct mdchain *mdp, int64_t *x);
-int  md_get_int64be(struct mdchain *mdp, int64_t *x);
-int  md_get_int64le(struct mdchain *mdp, int64_t *x);
-int  md_get_mem(struct mdchain *mdp, caddr_t target, int size, int type);
-int  md_get_mbuf(struct mdchain *mdp, int size, struct mbuf **m);
-int  md_get_uio(struct mdchain *mdp, struct uio *uiop, int size);
-
-#endif	/* ifdef _KERNEL */
-
-#endif	/* !_SYS_MCHAIN_H_ */
diff --git a/include.new/sys/md4.h b/include.new/sys/md4.h
deleted file mode 100644
index 3dcb78c..0000000
--- a/include.new/sys/md4.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* MD4.H - header file for MD4C.C
- * $FreeBSD: releng/10.2/sys/sys/md4.h 139825 2005-01-07 02:29:27Z imp $
- */
-
-/*-
-   Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-   rights reserved.
-
-   License to copy and use this software is granted provided that it
-   is identified as the "RSA Data Security, Inc. MD4 Message-Digest
-   Algorithm" in all material mentioning or referencing this software
-   or this function.
-   License is also granted to make and use derivative works provided
-   that such works are identified as "derived from the RSA Data
-   Security, Inc. MD4 Message-Digest Algorithm" in all material
-   mentioning or referencing the derived work.
-
-   RSA Data Security, Inc. makes no representations concerning either
-   the merchantability of this software or the suitability of this
-   software for any particular purpose. It is provided "as is"
-   without express or implied warranty of any kind.
-
-   These notices must be retained in any copies of any part of this
-   documentation and/or software.
- */
-
-#ifndef _MD4_H_
-#define _MD4_H_
-/* MD4 context. */
-typedef struct MD4Context {
-  uint32_t state[4];	/* state (ABCD) */
-  uint32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
-  unsigned char buffer[64];	/* input buffer */
-} MD4_CTX;
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void   MD4Init(MD4_CTX *);
-void   MD4Update(MD4_CTX *, const unsigned char *, unsigned int);
-void   MD4Pad(MD4_CTX *);
-void   MD4Final(unsigned char [16], MD4_CTX *);
-char * MD4End(MD4_CTX *, char *);
-char * MD4File(const char *, char *);
-char * MD4Data(const unsigned char *, unsigned int, char *);
-__END_DECLS
-
-#endif /* _MD4_H_ */
diff --git a/include.new/sys/md5.h b/include.new/sys/md5.h
deleted file mode 100644
index ef3f2f5..0000000
--- a/include.new/sys/md5.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* MD5.H - header file for MD5C.C
- * $FreeBSD: releng/10.2/sys/sys/md5.h 156752 2006-03-15 19:47:12Z andre $
- */
-
-/*-
- Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-rights reserved.
-
-License to copy and use this software is granted provided that it
-is identified as the "RSA Data Security, Inc. MD5 Message-Digest
-Algorithm" in all material mentioning or referencing this software
-or this function.
-
-License is also granted to make and use derivative works provided
-that such works are identified as "derived from the RSA Data
-Security, Inc. MD5 Message-Digest Algorithm" in all material
-mentioning or referencing the derived work.
-
-RSA Data Security, Inc. makes no representations concerning either
-the merchantability of this software or the suitability of this
-software for any particular purpose. It is provided "as is"
-without express or implied warranty of any kind.
-
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-#ifndef _SYS_MD5_H_
-#define _SYS_MD5_H_
-
-#define MD5_BLOCK_LENGTH		64
-#define MD5_DIGEST_LENGTH		16
-#define MD5_DIGEST_STRING_LENGTH	(MD5_DIGEST_LENGTH * 2 + 1)
-
-/* MD5 context. */
-typedef struct MD5Context {
-  uint32_t state[4];	/* state (ABCD) */
-  uint32_t count[2];	/* number of bits, modulo 2^64 (lsb first) */
-  unsigned char buffer[64];	/* input buffer */
-} MD5_CTX;
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void   MD5Init (MD5_CTX *);
-void   MD5Update (MD5_CTX *, const void *, unsigned int);
-void   MD5Final (unsigned char [16], MD5_CTX *);
-char * MD5End(MD5_CTX *, char *);
-char * MD5File(const char *, char *);
-char * MD5FileChunk(const char *, char *, off_t, off_t);
-char * MD5Data(const void *, unsigned int, char *);
-__END_DECLS
-#endif /* _SYS_MD5_H_ */
diff --git a/include.new/sys/mdioctl.h b/include.new/sys/mdioctl.h
deleted file mode 100644
index ac28d00..0000000
--- a/include.new/sys/mdioctl.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * 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.
- * 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.
- *
- * from: Utah $Hdr: fdioctl.h 1.1 90/07/09$
- *
- *	@(#)vnioctl.h	8.1 (Berkeley) 6/10/93
- *
- * From: src/sys/sys/vnioctl.h,v 1.4
- *
- * $FreeBSD: releng/10.2/sys/sys/mdioctl.h 238215 2012-07-07 20:32:21Z trasz $
- */
-
-#ifndef _SYS_MDIOCTL_H_
-#define _SYS_MDIOCTL_H_
-
-enum md_types {MD_MALLOC, MD_PRELOAD, MD_VNODE, MD_SWAP};
-
-/*
- * Ioctl definitions for memory disk pseudo-device.
- */
-
-#define MDNPAD		97
-struct md_ioctl {
-	unsigned	md_version;	/* Structure layout version */
-	unsigned	md_unit;	/* unit number */
-	enum md_types	md_type ;	/* type of disk */
-	char		*md_file;	/* pathname of file to mount */
-	off_t		md_mediasize;	/* size of disk in bytes */
-	unsigned	md_sectorsize;	/* sectorsize */
-	unsigned	md_options;	/* options */
-	u_int64_t	md_base;	/* base address */
-	int		md_fwheads;	/* firmware heads */
-	int		md_fwsectors;	/* firmware sectors */
-	int		md_pad[MDNPAD];	/* padding for future ideas */
-};
-
-#define MD_NAME		"md"
-#define MDCTL_NAME	"mdctl"
-#define MDIOVERSION	0
-
-/*
- * Before you can use a unit, it must be configured with MDIOCSET.
- * The configuration persists across opens and closes of the device;
- * an MDIOCCLR must be used to reset a configuration.  An attempt to
- * MDIOCSET an already active unit will return EBUSY.
- */
-
-#define MDIOCATTACH	_IOWR('m', 0, struct md_ioctl)	/* attach disk */
-#define MDIOCDETACH	_IOWR('m', 1, struct md_ioctl)	/* detach disk */
-#define MDIOCQUERY	_IOWR('m', 2, struct md_ioctl)	/* query status */
-#define MDIOCLIST	_IOWR('m', 3, struct md_ioctl)	/* query status */
-#define MDIOCRESIZE	_IOWR('m', 4, struct md_ioctl)	/* resize disk */
-
-#define MD_CLUSTER	0x01	/* Don't cluster */
-#define MD_RESERVE	0x02	/* Pre-reserve swap */
-#define MD_AUTOUNIT	0x04	/* Assign next free unit */
-#define MD_READONLY	0x08	/* Readonly mode */
-#define MD_COMPRESS	0x10	/* Compression mode */
-#define MD_FORCE	0x20	/* Don't try to prevent foot-shooting */
-#define MD_ASYNC	0x40	/* Asynchronous mode */
-
-#endif	/* _SYS_MDIOCTL_H_*/
diff --git a/include.new/sys/memdesc.h b/include.new/sys/memdesc.h
deleted file mode 100644
index f3080e4..0000000
--- a/include.new/sys/memdesc.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * Copyright (c) 2012 EMC Corp.
- * 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.
- *
- * 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: releng/10.2/sys/sys/memdesc.h 246713 2013-02-12 16:57:20Z kib $
- */
-
-#ifndef _SYS_MEMDESC_H_
-#define	_SYS_MEMDESC_H_
-
-struct bio;
-struct bus_dma_segment;
-struct uio;
-struct mbuf;
-union ccb;
-
-/*
- * struct memdesc encapsulates various memory descriptors and provides
- * abstract access to them.
- */
-struct memdesc {
-	union {
-		void			*md_vaddr;
-		vm_paddr_t		md_paddr;
-		struct bus_dma_segment	*md_list;
-		struct bio		*md_bio;
-		struct uio		*md_uio;
-		struct mbuf		*md_mbuf;
-		union ccb		*md_ccb;
-	} u;
-	size_t		md_opaque;	/* type specific data. */
-	uint32_t	md_type;	/* Type of memory. */
-};
-
-#define	MEMDESC_VADDR	1	/* Contiguous virtual address. */
-#define	MEMDESC_PADDR	2	/* Contiguous physical address. */
-#define	MEMDESC_VLIST	3	/* scatter/gather list of kva addresses. */
-#define	MEMDESC_PLIST	4	/* scatter/gather list of physical addresses. */
-#define	MEMDESC_BIO	5	/* Pointer to a bio (block io). */
-#define	MEMDESC_UIO	6	/* Pointer to a uio (any io). */
-#define	MEMDESC_MBUF	7	/* Pointer to a mbuf (network io). */
-#define	MEMDESC_CCB	8	/* Cam control block. (scsi/ata io). */
-
-static inline struct memdesc
-memdesc_vaddr(void *vaddr, size_t len)
-{
-	struct memdesc mem;
-
-	mem.u.md_vaddr = vaddr;
-	mem.md_opaque = len;
-	mem.md_type = MEMDESC_VADDR;
-
-	return (mem);
-}
-
-static inline struct memdesc
-memdesc_paddr(vm_paddr_t paddr, size_t len)
-{
-	struct memdesc mem;
-
-	mem.u.md_paddr = paddr;
-	mem.md_opaque = len;
-	mem.md_type = MEMDESC_PADDR;
-
-	return (mem);
-}
-
-static inline struct memdesc
-memdesc_vlist(struct bus_dma_segment *vlist, int sglist_cnt)
-{
-	struct memdesc mem;
-
-	mem.u.md_list = vlist;
-	mem.md_opaque = sglist_cnt;
-	mem.md_type = MEMDESC_VLIST;
-
-	return (mem);
-}
-
-static inline struct memdesc
-memdesc_plist(struct bus_dma_segment *plist, int sglist_cnt)
-{
-	struct memdesc mem;
-
-	mem.u.md_list = plist;
-	mem.md_opaque = sglist_cnt;
-	mem.md_type = MEMDESC_PLIST;
-
-	return (mem);
-}
-
-static inline struct memdesc
-memdesc_bio(struct bio *bio)
-{
-	struct memdesc mem;
-
-	mem.u.md_bio = bio;
-	mem.md_type = MEMDESC_BIO;
-
-	return (mem);
-}
-
-static inline struct memdesc
-memdesc_uio(struct uio *uio)
-{
-	struct memdesc mem;
-
-	mem.u.md_uio = uio;
-	mem.md_type = MEMDESC_UIO;
-
-	return (mem);
-}
-
-static inline struct memdesc
-memdesc_mbuf(struct mbuf *mbuf)
-{
-	struct memdesc mem;
-
-	mem.u.md_mbuf = mbuf;
-	mem.md_type = MEMDESC_MBUF;
-
-	return (mem);
-}
-
-static inline struct memdesc
-memdesc_ccb(union ccb *ccb)
-{
-	struct memdesc mem;
-
-	mem.u.md_ccb = ccb;
-	mem.md_type = MEMDESC_CCB;
-
-	return (mem);
-}
-#endif /* _SYS_MEMDESC_H_ */
diff --git a/include.new/sys/memrange.h b/include.new/sys/memrange.h
deleted file mode 100644
index 3788d90..0000000
--- a/include.new/sys/memrange.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Memory range attribute operations, peformed on /dev/mem
- *
- * $FreeBSD: releng/10.2/sys/sys/memrange.h 217515 2011-01-17 22:58:28Z jkim $
- */
-
-#ifndef _SYS_MEMRANGE_H_
-#define	_SYS_MEMRANGE_H_
-
-/* Memory range attributes */
-#define MDF_UNCACHEABLE		(1<<0)	/* region not cached */
-#define MDF_WRITECOMBINE	(1<<1)	/* region supports "write combine" action */
-#define MDF_WRITETHROUGH	(1<<2)	/* write-through cached */
-#define MDF_WRITEBACK		(1<<3)	/* write-back cached */
-#define MDF_WRITEPROTECT	(1<<4)	/* read-only region */
-#define MDF_UNKNOWN		(1<<5)	/* any state we don't understand */
-#define MDF_ATTRMASK		(0x00ffffff)
-
-#define MDF_FIXBASE		(1<<24)	/* fixed base */
-#define MDF_FIXLEN		(1<<25)	/* fixed length */
-#define MDF_FIRMWARE		(1<<26)	/* set by firmware (XXX not useful?) */
-#define MDF_ACTIVE		(1<<27)	/* currently active */
-#define MDF_BOGUS		(1<<28)	/* we don't like it */
-#define MDF_FIXACTIVE		(1<<29)	/* can't be turned off */
-#define MDF_BUSY		(1<<30)	/* range is in use */
-#define MDF_FORCE		(1<<31)	/* force risky changes */
-
-struct mem_range_desc
-{
-	u_int64_t	mr_base;
-	u_int64_t	mr_len;
-	int		mr_flags;
-	char		mr_owner[8];
-};
-
-struct mem_range_op
-{
-	struct mem_range_desc	*mo_desc;
-	int			mo_arg[2];
-#define MEMRANGE_SET_UPDATE	0
-#define MEMRANGE_SET_REMOVE	1
-	/* XXX want a flag that says "set and undo when I exit" */
-};
-
-#define MEMRANGE_GET	_IOWR('m', 50, struct mem_range_op)
-#define MEMRANGE_SET	_IOW('m', 51, struct mem_range_op)
-
-#ifdef _KERNEL
-
-MALLOC_DECLARE(M_MEMDESC);
-
-struct mem_range_softc;
-struct mem_range_ops
-{
-	void	(*init)(struct mem_range_softc *sc);
-	int	(*set)(struct mem_range_softc *sc, struct mem_range_desc *mrd, int *arg);
-    	void	(*initAP)(struct mem_range_softc *sc);
-    	void	(*reinit)(struct mem_range_softc *sc);
-};
-
-struct mem_range_softc 
-{
-	struct mem_range_ops	*mr_op;
-	int			mr_cap;
-	int			mr_ndesc;
-	struct mem_range_desc 	*mr_desc;
-};
-
-extern struct mem_range_softc mem_range_softc;
-
-extern void	mem_range_init(void);
-extern void	mem_range_destroy(void);
-
-extern int	mem_range_attr_get(struct mem_range_desc *mrd, int *arg);
-extern int	mem_range_attr_set(struct mem_range_desc *mrd, int *arg);
-
-#endif /* _KERNEL */
-
-#endif /* _SYS_MEMRANGE_H_ */
diff --git a/include.new/sys/mman.h b/include.new/sys/mman.h
deleted file mode 100644
index 9009927..0000000
--- a/include.new/sys/mman.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)mman.h	8.2 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/sys/mman.h 271399 2014-09-10 15:45:18Z jhb $
- */
-
-#ifndef _SYS_MMAN_H_
-#define _SYS_MMAN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#if __BSD_VISIBLE
-/*
- * Inheritance for minherit()
- */
-#define INHERIT_SHARE	0
-#define INHERIT_COPY	1
-#define INHERIT_NONE	2
-#endif
-
-/*
- * Protections are chosen from these bits, or-ed together
- */
-#define	PROT_NONE	0x00	/* no permissions */
-#define	PROT_READ	0x01	/* pages can be read */
-#define	PROT_WRITE	0x02	/* pages can be written */
-#define	PROT_EXEC	0x04	/* pages can be executed */
-
-/*
- * Flags contain sharing type and options.
- * Sharing types; choose one.
- */
-#define	MAP_SHARED	0x0001		/* share changes */
-#define	MAP_PRIVATE	0x0002		/* changes are private */
-#if __BSD_VISIBLE
-#define	MAP_COPY	MAP_PRIVATE	/* Obsolete */
-#endif
-
-/*
- * Other flags
- */
-#define	MAP_FIXED	 0x0010	/* map addr must be exactly as requested */
-
-#if __BSD_VISIBLE
-#define	MAP_RENAME	 0x0020	/* Sun: rename private pages to file */
-#define	MAP_NORESERVE	 0x0040	/* Sun: don't reserve needed swap area */
-#define	MAP_RESERVED0080 0x0080	/* previously misimplemented MAP_INHERIT */
-#define	MAP_RESERVED0100 0x0100	/* previously unimplemented MAP_NOEXTEND */
-#define	MAP_HASSEMAPHORE 0x0200	/* region may contain semaphores */
-#define	MAP_STACK	 0x0400	/* region grows down, like a stack */
-#define	MAP_NOSYNC	 0x0800 /* page to but do not sync underlying file */
-
-/*
- * Mapping type
- */
-#define	MAP_FILE	 0x0000	/* map from file (default) */
-#define	MAP_ANON	 0x1000	/* allocated from memory, swap space */
-#ifndef _KERNEL
-#define	MAP_ANONYMOUS	 MAP_ANON /* For compatibility. */
-#endif /* !_KERNEL */
-
-/*
- * Extended flags
- */
-#define	MAP_EXCL	 0x00004000 /* for MAP_FIXED, fail if address is used */
-#define	MAP_NOCORE	 0x00020000 /* dont include these pages in a coredump */
-#define	MAP_PREFAULT_READ 0x00040000 /* prefault mapping for reading */
-#ifdef __LP64__
-#define	MAP_32BIT	 0x00080000 /* map in the low 2GB of address space */
-#endif
-
-/*
- * Request specific alignment (n == log2 of the desired alignment).
- *
- * MAP_ALIGNED_SUPER requests optimal superpage alignment, but does
- * not enforce a specific alignment.
- */
-#define	MAP_ALIGNED(n)	 ((n) << MAP_ALIGNMENT_SHIFT)
-#define	MAP_ALIGNMENT_SHIFT	24
-#define	MAP_ALIGNMENT_MASK	MAP_ALIGNED(0xff)
-#define	MAP_ALIGNED_SUPER	MAP_ALIGNED(1) /* align on a superpage */
-#endif /* __BSD_VISIBLE */
-
-#if __POSIX_VISIBLE >= 199309
-/*
- * Process memory locking
- */
-#define MCL_CURRENT	0x0001	/* Lock only current memory */
-#define MCL_FUTURE	0x0002	/* Lock all future memory as well */
-#endif
-
-/*
- * Error return from mmap()
- */
-#define MAP_FAILED	((void *)-1)
-
-/*
- * msync() flags
- */
-#define	MS_SYNC		0x0000	/* msync synchronously */
-#define MS_ASYNC	0x0001	/* return immediately */
-#define MS_INVALIDATE	0x0002	/* invalidate all cached data */
-
-/*
- * Advice to madvise
- */
-#define	_MADV_NORMAL	0	/* no further special treatment */
-#define	_MADV_RANDOM	1	/* expect random page references */
-#define	_MADV_SEQUENTIAL 2	/* expect sequential page references */
-#define	_MADV_WILLNEED	3	/* will need these pages */
-#define	_MADV_DONTNEED	4	/* dont need these pages */
-
-#if __BSD_VISIBLE
-#define	MADV_NORMAL	_MADV_NORMAL
-#define	MADV_RANDOM	_MADV_RANDOM
-#define	MADV_SEQUENTIAL _MADV_SEQUENTIAL
-#define	MADV_WILLNEED	_MADV_WILLNEED
-#define	MADV_DONTNEED	_MADV_DONTNEED
-#define	MADV_FREE	5	/* dont need these pages, and junk contents */
-#define	MADV_NOSYNC	6	/* try to avoid flushes to physical media */
-#define	MADV_AUTOSYNC	7	/* revert to default flushing strategy */
-#define	MADV_NOCORE	8	/* do not include these pages in a core file */
-#define	MADV_CORE	9	/* revert to including pages in a core file */
-#define	MADV_PROTECT	10	/* protect process from pageout kill */
-
-/*
- * Return bits from mincore
- */
-#define	MINCORE_INCORE	 	 0x1 /* Page is incore */
-#define	MINCORE_REFERENCED	 0x2 /* Page has been referenced by us */
-#define	MINCORE_MODIFIED	 0x4 /* Page has been modified by us */
-#define	MINCORE_REFERENCED_OTHER 0x8 /* Page has been referenced */
-#define	MINCORE_MODIFIED_OTHER	0x10 /* Page has been modified */
-#define	MINCORE_SUPER		0x20 /* Page is a "super" page */
-
-/*
- * Anonymous object constant for shm_open().
- */
-#define	SHM_ANON		((char *)1)
-#endif /* __BSD_VISIBLE */
-
-/*
- * XXX missing POSIX_TYPED_MEM_* macros and
- * posix_typed_mem_info structure.
- */
-#if __POSIX_VISIBLE >= 200112
-#define	POSIX_MADV_NORMAL	_MADV_NORMAL
-#define	POSIX_MADV_RANDOM	_MADV_RANDOM
-#define	POSIX_MADV_SEQUENTIAL	_MADV_SEQUENTIAL
-#define	POSIX_MADV_WILLNEED	_MADV_WILLNEED
-#define	POSIX_MADV_DONTNEED	_MADV_DONTNEED
-#endif
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#if defined(_KERNEL) || defined(_WANT_FILE)
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/queue.h>
-#include <sys/rangelock.h>
-#include <vm/vm.h>
-
-struct file;
-
-struct shmfd {
-	size_t		shm_size;
-	vm_object_t	shm_object;
-	int		shm_refs;
-	uid_t		shm_uid;
-	gid_t		shm_gid;
-	mode_t		shm_mode;
-	int		shm_kmappings;
-
-	/*
-	 * Values maintained solely to make this a better-behaved file
-	 * descriptor for fstat() to run on.
-	 */
-	struct timespec	shm_atime;
-	struct timespec	shm_mtime;
-	struct timespec	shm_ctime;
-	struct timespec	shm_birthtime;
-	ino_t		shm_ino;
-
-	struct label	*shm_label;		/* MAC label */
-	const char	*shm_path;
-
-	struct rangelock shm_rl;
-	struct mtx	shm_mtx;
-};
-#endif
-
-#ifdef _KERNEL
-int	shm_mmap(struct shmfd *shmfd, vm_size_t objsize, vm_ooffset_t foff,
-	    vm_object_t *obj);
-int	shm_map(struct file *fp, size_t size, off_t offset, void **memp);
-int	shm_unmap(struct file *fp, void *mem, size_t size);
-void	shm_path(struct shmfd *shmfd, char *path, size_t size);
-
-#else /* !_KERNEL */
-
-__BEGIN_DECLS
-/*
- * XXX not yet implemented: posix_mem_offset(), posix_typed_mem_get_info(),
- * posix_typed_mem_open().
- */
-#if __BSD_VISIBLE
-int	getpagesizes(size_t *, int);
-int	madvise(void *, size_t, int);
-int	mincore(const void *, size_t, char *);
-int	minherit(void *, size_t, int);
-#endif
-int	mlock(const void *, size_t);
-#ifndef _MMAP_DECLARED
-#define	_MMAP_DECLARED
-void *	mmap(void *, size_t, int, int, int, off_t);
-#endif
-int	mprotect(const void *, size_t, int);
-int	msync(void *, size_t, int);
-int	munlock(const void *, size_t);
-int	munmap(void *, size_t);
-#if __POSIX_VISIBLE >= 200112
-int	posix_madvise(void *, size_t, int);
-#endif
-#if __POSIX_VISIBLE >= 199309
-int	mlockall(int);
-int	munlockall(void);
-int	shm_open(const char *, int, mode_t);
-int	shm_unlink(const char *);
-#endif
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_MMAN_H_ */
diff --git a/include.new/sys/module.h b/include.new/sys/module.h
deleted file mode 100644
index 96d107c..0000000
--- a/include.new/sys/module.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/*-
- * Copyright (c) 1997 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/sys/module.h 283642 2015-05-28 06:45:13Z dim $
- */
-
-#ifndef _SYS_MODULE_H_
-#define _SYS_MODULE_H_
-
-/*
- * Module metadata types
- */
-#define	MDT_DEPEND	1		/* argument is a module name */
-#define	MDT_MODULE	2		/* module declaration */
-#define	MDT_VERSION	3		/* module version(s) */
-
-#define	MDT_STRUCT_VERSION	1	/* version of metadata structure */
-#define	MDT_SETNAME	"modmetadata_set"
-
-typedef enum modeventtype {
-	MOD_LOAD,
-	MOD_UNLOAD,
-	MOD_SHUTDOWN,
-	MOD_QUIESCE
-} modeventtype_t;
-
-typedef struct module *module_t;
-typedef int (*modeventhand_t)(module_t, int /* modeventtype_t */, void *);
-
-/*
- * Struct for registering modules statically via SYSINIT.
- */
-typedef struct moduledata {
-	const char	*name;		/* module name */
-	modeventhand_t  evhand;		/* event handler */
-	void		*priv;		/* extra data */
-} moduledata_t;
-
-/*
- * A module can use this to report module specific data to the user via
- * kldstat(2).
- */
-typedef union modspecific {
-	int	intval;
-	u_int	uintval;
-	long	longval;
-	u_long	ulongval;
-} modspecific_t;
-
-/*
- * Module dependency declarartion
- */
-struct mod_depend {
-	int	md_ver_minimum;
-	int	md_ver_preferred;
-	int	md_ver_maximum;
-};
-
-/*
- * Module version declaration
- */
-struct mod_version {
-	int	mv_version;
-};
-
-struct mod_metadata {
-	int		md_version;	/* structure version MDTV_* */
-	int		md_type;	/* type of entry MDT_* */
-	void		*md_data;	/* specific data */
-	const char	*md_cval;	/* common string label */
-};
-
-#ifdef	_KERNEL
-
-#include <sys/linker_set.h>
-
-#define	MODULE_METADATA(uniquifier, type, data, cval)			\
-	static struct mod_metadata _mod_metadata##uniquifier = {	\
-		MDT_STRUCT_VERSION,					\
-		type,							\
-		data,							\
-		cval							\
-	};								\
-	DATA_SET(modmetadata_set, _mod_metadata##uniquifier)
-
-#define	MODULE_DEPEND(module, mdepend, vmin, vpref, vmax)		\
-	static struct mod_depend _##module##_depend_on_##mdepend	\
-	    __section(".data") = {					\
-		vmin,							\
-		vpref,							\
-		vmax							\
-	};								\
-	MODULE_METADATA(_md_##module##_on_##mdepend, MDT_DEPEND,	\
-	    &_##module##_depend_on_##mdepend, #mdepend)
-
-/*
- * Every kernel has a 'kernel' module with the version set to
- * __FreeBSD_version.  We embed a MODULE_DEPEND() inside every module
- * that depends on the 'kernel' module.  It uses the current value of
- * __FreeBSD_version as the minimum and preferred versions.  For the
- * maximum version it rounds the version up to the end of its branch
- * (i.e. M99999 for M.x).  This allows a module built on M.x to work
- * on M.y systems where y >= x, but fail on M.z systems where z < x.
- */
-#define	MODULE_KERNEL_MAXVER	(roundup(__FreeBSD_version, 100000) - 1)
-
-#define	DECLARE_MODULE_WITH_MAXVER(name, data, sub, order, maxver)	\
-	MODULE_DEPEND(name, kernel, __FreeBSD_version,			\
-	    __FreeBSD_version, maxver);			\
-	MODULE_METADATA(_md_##name, MDT_MODULE, &data, #name);		\
-	SYSINIT(name##module, sub, order, module_register_init, &data);	\
-	struct __hack
-
-#define	DECLARE_MODULE(name, data, sub, order)				\
-	DECLARE_MODULE_WITH_MAXVER(name, data, sub, order, MODULE_KERNEL_MAXVER)
-
-/*
- * The module declared with DECLARE_MODULE_TIED can only be loaded
- * into the kernel with exactly the same __FreeBSD_version.
- *
- * Use it for modules that use kernel interfaces that are not stable
- * even on STABLE/X branches.
- */
-#define	DECLARE_MODULE_TIED(name, data, sub, order)				\
-	DECLARE_MODULE_WITH_MAXVER(name, data, sub, order, __FreeBSD_version)
-
-#define	MODULE_VERSION(module, version)					\
-	static struct mod_version _##module##_version			\
-	    __section(".data") = {					\
-		version							\
-	};								\
-	MODULE_METADATA(_##module##_version, MDT_VERSION,		\
-	    &_##module##_version, #module)
-
-extern struct sx modules_sx;
-
-#define	MOD_XLOCK	sx_xlock(&modules_sx)
-#define	MOD_SLOCK	sx_slock(&modules_sx)
-#define	MOD_XUNLOCK	sx_xunlock(&modules_sx)
-#define	MOD_SUNLOCK	sx_sunlock(&modules_sx)
-#define	MOD_LOCK_ASSERT	sx_assert(&modules_sx, SX_LOCKED)
-#define	MOD_XLOCK_ASSERT	sx_assert(&modules_sx, SX_XLOCKED)
-
-struct linker_file;
-
-void	module_register_init(const void *);
-int	module_register(const struct moduledata *, struct linker_file *);
-module_t	module_lookupbyname(const char *);
-module_t	module_lookupbyid(int);
-int	module_quiesce(module_t);
-void	module_reference(module_t);
-void	module_release(module_t);
-int	module_unload(module_t);
-int	module_getid(module_t);
-module_t	module_getfnext(module_t);
-const char *	module_getname(module_t);
-void	module_setspecific(module_t, modspecific_t *);
-struct linker_file *module_file(module_t);
-
-#ifdef	MOD_DEBUG
-extern int mod_debug;
-#define	MOD_DEBUG_REFS	1
-
-#define	MOD_DPF(cat, args) do {						\
-	if (mod_debug & MOD_DEBUG_##cat)				\
-		printf(args);						\
-} while (0)
-
-#else	/* !MOD_DEBUG */
-
-#define	MOD_DPF(cat, args)
-#endif
-#endif	/* _KERNEL */
-
-#define	MAXMODNAME	32
-
-struct module_stat {
-	int		version;	/* set to sizeof(struct module_stat) */
-	char		name[MAXMODNAME];
-	int		refs;
-	int		id;
-	modspecific_t	data;
-};
-
-#ifndef _KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	modnext(int _modid);
-int	modfnext(int _modid);
-int	modstat(int _modid, struct module_stat *_stat);
-int	modfind(const char *_name);
-__END_DECLS
-
-#endif
-
-#endif	/* !_SYS_MODULE_H_ */
diff --git a/include.new/sys/module_khelp.h b/include.new/sys/module_khelp.h
deleted file mode 100644
index 48f2b11..0000000
--- a/include.new/sys/module_khelp.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 2010 Lawrence Stewart <lstewart@freebsd.org>
- * Copyright (c) 2010 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University of Technology, made
- * possible in part by grants from the FreeBSD Foundation and Cisco University
- * Research Program Fund at Community Foundation Silicon Valley.
- *
- * Portions of this software were developed at the Centre for Advanced
- * Internet Architectures, Swinburne University of Technology, Melbourne,
- * Australia by Lawrence Stewart under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/module_khelp.h 251789 2013-06-15 10:38:31Z lstewart $
- */
-
-#ifndef _SYS_MODULE_KHELP_H_
-#define _SYS_MODULE_KHELP_H_
-
-/* XXXLAS: Needed for uma related typedefs. */
-#include <vm/uma.h>
-
-/* Helper flags. */
-#define	HELPER_NEEDS_OSD	0x0001
-
-struct helper {
-	int (*mod_init) (void);
-	int (*mod_destroy) (void);
-#define	HELPER_NAME_MAXLEN 16
-	char			h_name[HELPER_NAME_MAXLEN];
-	uma_zone_t		h_zone;
-	struct hookinfo		*h_hooks;
-	uint32_t		h_nhooks;
-	uint32_t		h_classes;
-	int32_t			h_id;
-	volatile uint32_t	h_refcount;
-	uint16_t		h_flags;
-	TAILQ_ENTRY(helper)	h_next;
-};
-
-struct khelp_modevent_data {
-	char			name[HELPER_NAME_MAXLEN];
-	struct helper		*helper;
-	struct hookinfo		*hooks;
-	int			nhooks;
-	int			uma_zsize;
-	uma_ctor		umactor;
-	uma_dtor		umadtor;
-};
-
-#define	KHELP_DECLARE_MOD_UMA(hname, hdata, hhooks, version, size, ctor, dtor) \
-	static struct khelp_modevent_data kmd_##hname = {		\
-		.name = #hname,						\
-		.helper = hdata,					\
-		.hooks = hhooks,					\
-		.nhooks = sizeof(hhooks) / sizeof(hhooks[0]),		\
-		.uma_zsize = size,					\
-		.umactor = ctor,					\
-		.umadtor = dtor						\
-	};								\
-	static moduledata_t h_##hname = {				\
-		.name = #hname,						\
-		.evhand = khelp_modevent,				\
-		.priv = &kmd_##hname					\
-	};								\
-	DECLARE_MODULE(hname, h_##hname, SI_SUB_KLD, SI_ORDER_ANY);	\
-	MODULE_VERSION(hname, version)
-
-#define	KHELP_DECLARE_MOD(hname, hdata, hhooks, version)		\
-	KHELP_DECLARE_MOD_UMA(hname, hdata, hhooks, version, 0, NULL, NULL)
-
-int	khelp_modevent(module_t mod, int type, void *data);
-
-#endif /* _SYS_MODULE_KHELP_H_ */
diff --git a/include.new/sys/mount.h b/include.new/sys/mount.h
deleted file mode 100644
index 1c4d47f..0000000
--- a/include.new/sys/mount.h
+++ /dev/null
@@ -1,952 +0,0 @@
-/*-
- * Copyright (c) 1989, 1991, 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.
- * 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.
- *
- *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- * $FreeBSD: releng/10.2/sys/sys/mount.h 282270 2015-04-30 12:39:24Z rmacklem $
- */
-
-#ifndef _SYS_MOUNT_H_
-#define _SYS_MOUNT_H_
-
-#include <sys/ucred.h>
-#include <sys/queue.h>
-#ifdef _KERNEL
-#include <sys/lock.h>
-#include <sys/lockmgr.h>
-#include <sys/_mutex.h>
-#include <sys/_sx.h>
-#endif
-
-/*
- * NOTE: When changing statfs structure, mount structure, MNT_* flags or
- * MNTK_* flags also update DDB show mount command in vfs_subr.c.
- */
-
-typedef struct fsid { int32_t val[2]; } fsid_t;	/* filesystem id type */
-
-/*
- * File identifier.
- * These are unique per filesystem on a single machine.
- */
-#define	MAXFIDSZ	16
-
-struct fid {
-	u_short		fid_len;		/* length of data in bytes */
-	u_short		fid_data0;		/* force longword alignment */
-	char		fid_data[MAXFIDSZ];	/* data (variable length) */
-};
-
-/*
- * filesystem statistics
- */
-#define	MFSNAMELEN	16		/* length of type name including null */
-#define	MNAMELEN	88		/* size of on/from name bufs */
-#define	STATFS_VERSION	0x20030518	/* current version number */
-struct statfs {
-	uint32_t f_version;		/* structure version number */
-	uint32_t f_type;		/* type of filesystem */
-	uint64_t f_flags;		/* copy of mount exported flags */
-	uint64_t f_bsize;		/* filesystem fragment size */
-	uint64_t f_iosize;		/* optimal transfer block size */
-	uint64_t f_blocks;		/* total data blocks in filesystem */
-	uint64_t f_bfree;		/* free blocks in filesystem */
-	int64_t	 f_bavail;		/* free blocks avail to non-superuser */
-	uint64_t f_files;		/* total file nodes in filesystem */
-	int64_t	 f_ffree;		/* free nodes avail to non-superuser */
-	uint64_t f_syncwrites;		/* count of sync writes since mount */
-	uint64_t f_asyncwrites;		/* count of async writes since mount */
-	uint64_t f_syncreads;		/* count of sync reads since mount */
-	uint64_t f_asyncreads;		/* count of async reads since mount */
-	uint64_t f_spare[10];		/* unused spare */
-	uint32_t f_namemax;		/* maximum filename length */
-	uid_t	  f_owner;		/* user that mounted the filesystem */
-	fsid_t	  f_fsid;		/* filesystem id */
-	char	  f_charspare[80];	    /* spare string space */
-	char	  f_fstypename[MFSNAMELEN]; /* filesystem type name */
-	char	  f_mntfromname[MNAMELEN];  /* mounted filesystem */
-	char	  f_mntonname[MNAMELEN];    /* directory on which mounted */
-};
-
-#ifdef _KERNEL
-#define	OMFSNAMELEN	16	/* length of fs type name, including null */
-#define	OMNAMELEN	(88 - 2 * sizeof(long))	/* size of on/from name bufs */
-
-/* XXX getfsstat.2 is out of date with write and read counter changes here. */
-/* XXX statfs.2 is out of date with read counter changes here. */
-struct ostatfs {
-	long	f_spare2;		/* placeholder */
-	long	f_bsize;		/* fundamental filesystem block size */
-	long	f_iosize;		/* optimal transfer block size */
-	long	f_blocks;		/* total data blocks in filesystem */
-	long	f_bfree;		/* free blocks in fs */
-	long	f_bavail;		/* free blocks avail to non-superuser */
-	long	f_files;		/* total file nodes in filesystem */
-	long	f_ffree;		/* free file nodes in fs */
-	fsid_t	f_fsid;			/* filesystem id */
-	uid_t	f_owner;		/* user that mounted the filesystem */
-	int	f_type;			/* type of filesystem */
-	int	f_flags;		/* copy of mount exported flags */
-	long	f_syncwrites;		/* count of sync writes since mount */
-	long	f_asyncwrites;		/* count of async writes since mount */
-	char	f_fstypename[OMFSNAMELEN]; /* fs type name */
-	char	f_mntonname[OMNAMELEN];	/* directory on which mounted */
-	long	f_syncreads;		/* count of sync reads since mount */
-	long	f_asyncreads;		/* count of async reads since mount */
-	short	f_spares1;		/* unused spare */
-	char	f_mntfromname[OMNAMELEN];/* mounted filesystem */
-	short	f_spares2;		/* unused spare */
-	/*
-	 * XXX on machines where longs are aligned to 8-byte boundaries, there
-	 * is an unnamed int32_t here.  This spare was after the apparent end
-	 * of the struct until we bit off the read counters from f_mntonname.
-	 */
-	long	f_spare[2];		/* unused spare */
-};
-
-TAILQ_HEAD(vnodelst, vnode);
-
-/* Mount options list */
-TAILQ_HEAD(vfsoptlist, vfsopt);
-struct vfsopt {
-	TAILQ_ENTRY(vfsopt) link;
-	char	*name;
-	void	*value;
-	int	len;
-	int	pos;
-	int	seen;
-};
-
-/*
- * Structure per mounted filesystem.  Each mounted filesystem has an
- * array of operations and an instance record.  The filesystems are
- * put on a doubly linked list.
- *
- * Lock reference:
- *	m - mountlist_mtx
- *	i - interlock
- *	v - vnode freelist mutex
- *
- * Unmarked fields are considered stable as long as a ref is held.
- *
- */
-struct mount {
-	struct mtx	mnt_mtx;		/* mount structure interlock */
-	int		mnt_gen;		/* struct mount generation */
-#define	mnt_startzero	mnt_list
-	TAILQ_ENTRY(mount) mnt_list;		/* (m) mount list */
-	struct vfsops	*mnt_op;		/* operations on fs */
-	struct vfsconf	*mnt_vfc;		/* configuration info */
-	struct vnode	*mnt_vnodecovered;	/* vnode we mounted on */
-	struct vnode	*mnt_syncer;		/* syncer vnode */
-	int		mnt_ref;		/* (i) Reference count */
-	struct vnodelst	mnt_nvnodelist;		/* (i) list of vnodes */
-	int		mnt_nvnodelistsize;	/* (i) # of vnodes */
-	struct vnodelst	mnt_activevnodelist;	/* (v) list of active vnodes */
-	int		mnt_activevnodelistsize;/* (v) # of active vnodes */
-	int		mnt_writeopcount;	/* (i) write syscalls pending */
-	int		mnt_kern_flag;		/* (i) kernel only flags */
-	uint64_t	mnt_flag;		/* (i) flags shared with user */
-	struct vfsoptlist *mnt_opt;		/* current mount options */
-	struct vfsoptlist *mnt_optnew;		/* new options passed to fs */
-	int		mnt_maxsymlinklen;	/* max size of short symlink */
-	struct statfs	mnt_stat;		/* cache of filesystem stats */
-	struct ucred	*mnt_cred;		/* credentials of mounter */
-	void *		mnt_data;		/* private data */
-	time_t		mnt_time;		/* last time written*/
-	int		mnt_iosize_max;		/* max size for clusters, etc */
-	struct netexport *mnt_export;		/* export list */
-	struct label	*mnt_label;		/* MAC label for the fs */
-	u_int		mnt_hashseed;		/* Random seed for vfs_hash */
-	int		mnt_lockref;		/* (i) Lock reference count */
-	int		mnt_secondary_writes;   /* (i) # of secondary writes */
-	int		mnt_secondary_accwrites;/* (i) secondary wr. starts */
-	struct thread	*mnt_susp_owner;	/* (i) thread owning suspension */
-#define	mnt_endzero	mnt_gjprovider
-	char		*mnt_gjprovider;	/* gjournal provider name */
-	struct lock	mnt_explock;		/* vfs_export walkers lock */
-	TAILQ_ENTRY(mount) mnt_upper_link;	/* (m) we in the all uppers */
-	TAILQ_HEAD(, mount) mnt_uppers;		/* (m) upper mounts over us*/
-};
-
-/*
- * Definitions for MNT_VNODE_FOREACH_ALL.
- */
-struct vnode *__mnt_vnode_next_all(struct vnode **mvp, struct mount *mp);
-struct vnode *__mnt_vnode_first_all(struct vnode **mvp, struct mount *mp);
-void          __mnt_vnode_markerfree_all(struct vnode **mvp, struct mount *mp);
-
-#define MNT_VNODE_FOREACH_ALL(vp, mp, mvp)				\
-	for (vp = __mnt_vnode_first_all(&(mvp), (mp));			\
-		(vp) != NULL; vp = __mnt_vnode_next_all(&(mvp), (mp)))
-
-#define MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp)				\
-	do {								\
-		MNT_ILOCK(mp);						\
-		__mnt_vnode_markerfree_all(&(mvp), (mp));		\
-		/* MNT_IUNLOCK(mp); -- done in above function */	\
-		mtx_assert(MNT_MTX(mp), MA_NOTOWNED);			\
-	} while (0)
-
-/*
- * Definitions for MNT_VNODE_FOREACH_ACTIVE.
- */
-struct vnode *__mnt_vnode_next_active(struct vnode **mvp, struct mount *mp);
-struct vnode *__mnt_vnode_first_active(struct vnode **mvp, struct mount *mp);
-void          __mnt_vnode_markerfree_active(struct vnode **mvp, struct mount *);
-
-#define MNT_VNODE_FOREACH_ACTIVE(vp, mp, mvp) 				\
-	for (vp = __mnt_vnode_first_active(&(mvp), (mp)); 		\
-		(vp) != NULL; vp = __mnt_vnode_next_active(&(mvp), (mp)))
-
-#define MNT_VNODE_FOREACH_ACTIVE_ABORT(mp, mvp)				\
-	__mnt_vnode_markerfree_active(&(mvp), (mp))
-
-#define	MNT_ILOCK(mp)	mtx_lock(&(mp)->mnt_mtx)
-#define	MNT_ITRYLOCK(mp) mtx_trylock(&(mp)->mnt_mtx)
-#define	MNT_IUNLOCK(mp)	mtx_unlock(&(mp)->mnt_mtx)
-#define	MNT_MTX(mp)	(&(mp)->mnt_mtx)
-#define	MNT_REF(mp)	(mp)->mnt_ref++
-#define	MNT_REL(mp)	do {						\
-	KASSERT((mp)->mnt_ref > 0, ("negative mnt_ref"));		\
-	(mp)->mnt_ref--;						\
-	if ((mp)->mnt_ref == 0)						\
-		wakeup((mp));						\
-} while (0)
-
-#endif /* _KERNEL */
-
-/*
- * User specifiable flags, stored in mnt_flag.
- */
-#define	MNT_RDONLY	0x0000000000000001ULL /* read only filesystem */
-#define	MNT_SYNCHRONOUS	0x0000000000000002ULL /* fs written synchronously */
-#define	MNT_NOEXEC	0x0000000000000004ULL /* can't exec from filesystem */
-#define	MNT_NOSUID	0x0000000000000008ULL /* don't honor setuid fs bits */
-#define	MNT_NFS4ACLS	0x0000000000000010ULL /* enable NFS version 4 ACLs */
-#define	MNT_UNION	0x0000000000000020ULL /* union with underlying fs */
-#define	MNT_ASYNC	0x0000000000000040ULL /* fs written asynchronously */
-#define	MNT_SUIDDIR	0x0000000000100000ULL /* special SUID dir handling */
-#define	MNT_SOFTDEP	0x0000000000200000ULL /* using soft updates */
-#define	MNT_NOSYMFOLLOW	0x0000000000400000ULL /* do not follow symlinks */
-#define	MNT_GJOURNAL	0x0000000002000000ULL /* GEOM journal support enabled */
-#define	MNT_MULTILABEL	0x0000000004000000ULL /* MAC support for objects */
-#define	MNT_ACLS	0x0000000008000000ULL /* ACL support enabled */
-#define	MNT_NOATIME	0x0000000010000000ULL /* dont update file access time */
-#define	MNT_NOCLUSTERR	0x0000000040000000ULL /* disable cluster read */
-#define	MNT_NOCLUSTERW	0x0000000080000000ULL /* disable cluster write */
-#define	MNT_SUJ		0x0000000100000000ULL /* using journaled soft updates */
-#define	MNT_AUTOMOUNTED	0x0000000200000000ULL /* mounted by automountd(8) */
-
-/*
- * NFS export related mount flags.
- */
-#define	MNT_EXRDONLY	0x0000000000000080ULL	/* exported read only */
-#define	MNT_EXPORTED	0x0000000000000100ULL	/* filesystem is exported */
-#define	MNT_DEFEXPORTED	0x0000000000000200ULL	/* exported to the world */
-#define	MNT_EXPORTANON	0x0000000000000400ULL	/* anon uid mapping for all */
-#define	MNT_EXKERB	0x0000000000000800ULL	/* exported with Kerberos */
-#define	MNT_EXPUBLIC	0x0000000020000000ULL	/* public export (WebNFS) */
-
-/*
- * Flags set by internal operations,
- * but visible to the user.
- * XXX some of these are not quite right.. (I've never seen the root flag set)
- */
-#define	MNT_LOCAL	0x0000000000001000ULL /* filesystem is stored locally */
-#define	MNT_QUOTA	0x0000000000002000ULL /* quotas are enabled on fs */
-#define	MNT_ROOTFS	0x0000000000004000ULL /* identifies the root fs */
-#define	MNT_USER	0x0000000000008000ULL /* mounted by a user */
-#define	MNT_IGNORE	0x0000000000800000ULL /* do not show entry in df */
-
-/*
- * Mask of flags that are visible to statfs().
- * XXX I think that this could now become (~(MNT_CMDFLAGS))
- * but the 'mount' program may need changing to handle this.
- */
-#define	MNT_VISFLAGMASK	(MNT_RDONLY	| MNT_SYNCHRONOUS | MNT_NOEXEC	| \
-			MNT_NOSUID	| MNT_UNION	| MNT_SUJ	| \
-			MNT_ASYNC	| MNT_EXRDONLY	| MNT_EXPORTED	| \
-			MNT_DEFEXPORTED	| MNT_EXPORTANON| MNT_EXKERB	| \
-			MNT_LOCAL	| MNT_USER	| MNT_QUOTA	| \
-			MNT_ROOTFS	| MNT_NOATIME	| MNT_NOCLUSTERR| \
-			MNT_NOCLUSTERW	| MNT_SUIDDIR	| MNT_SOFTDEP	| \
-			MNT_IGNORE	| MNT_EXPUBLIC	| MNT_NOSYMFOLLOW | \
-			MNT_GJOURNAL	| MNT_MULTILABEL | MNT_ACLS	| \
-			MNT_NFS4ACLS	| MNT_AUTOMOUNTED)
-
-/* Mask of flags that can be updated. */
-#define	MNT_UPDATEMASK (MNT_NOSUID	| MNT_NOEXEC	| \
-			MNT_SYNCHRONOUS	| MNT_UNION	| MNT_ASYNC	| \
-			MNT_NOATIME | \
-			MNT_NOSYMFOLLOW	| MNT_IGNORE	| \
-			MNT_NOCLUSTERR	| MNT_NOCLUSTERW | MNT_SUIDDIR	| \
-			MNT_ACLS	| MNT_USER	| MNT_NFS4ACLS	| \
-			MNT_AUTOMOUNTED)
-
-/*
- * External filesystem command modifier flags.
- * Unmount can use the MNT_FORCE flag.
- * XXX: These are not STATES and really should be somewhere else.
- * XXX: MNT_BYFSID collides with MNT_ACLS, but because MNT_ACLS is only used for
- *      mount(2) and MNT_BYFSID is only used for unmount(2) it's harmless.
- */
-#define	MNT_UPDATE	0x0000000000010000ULL /* not real mount, just update */
-#define	MNT_DELEXPORT	0x0000000000020000ULL /* delete export host lists */
-#define	MNT_RELOAD	0x0000000000040000ULL /* reload filesystem data */
-#define	MNT_FORCE	0x0000000000080000ULL /* force unmount or readonly */
-#define	MNT_SNAPSHOT	0x0000000001000000ULL /* snapshot the filesystem */
-#define	MNT_BYFSID	0x0000000008000000ULL /* specify filesystem by ID. */
-#define MNT_CMDFLAGS   (MNT_UPDATE	| MNT_DELEXPORT	| MNT_RELOAD	| \
-			MNT_FORCE	| MNT_SNAPSHOT	| MNT_BYFSID)
-/*
- * Internal filesystem control flags stored in mnt_kern_flag.
- *
- * MNTK_UNMOUNT locks the mount entry so that name lookup cannot proceed
- * past the mount point.  This keeps the subtree stable during mounts
- * and unmounts.
- *
- * MNTK_UNMOUNTF permits filesystems to detect a forced unmount while
- * dounmount() is still waiting to lock the mountpoint. This allows
- * the filesystem to cancel operations that might otherwise deadlock
- * with the unmount attempt (used by NFS).
- *
- * MNTK_NOINSMNTQ is strict subset of MNTK_UNMOUNT. They are separated
- * to allow for failed unmount attempt to restore the syncer vnode for
- * the mount.
- */
-#define MNTK_UNMOUNTF	0x00000001	/* forced unmount in progress */
-#define MNTK_ASYNC	0x00000002	/* filtered async flag */
-#define MNTK_SOFTDEP	0x00000004	/* async disabled by softdep */
-#define MNTK_NOINSMNTQ	0x00000008	/* insmntque is not allowed */
-#define	MNTK_DRAINING	0x00000010	/* lock draining is happening */
-#define	MNTK_REFEXPIRE	0x00000020	/* refcount expiring is happening */
-#define MNTK_EXTENDED_SHARED	0x00000040 /* Allow shared locking for more ops */
-#define	MNTK_SHARED_WRITES	0x00000080 /* Allow shared locking for writes */
-#define	MNTK_NO_IOPF	0x00000100	/* Disallow page faults during reads
-					   and writes. Filesystem shall properly
-					   handle i/o state on EFAULT. */
-#define	MNTK_VGONE_UPPER	0x00000200
-#define	MNTK_VGONE_WAITER	0x00000400
-#define	MNTK_LOOKUP_EXCL_DOTDOT	0x00000800
-#define	MNTK_MARKER		0x00001000
-#define	MNTK_UNMAPPED_BUFS	0x00002000
-#define	MNTK_USES_BCACHE	0x00004000 /* FS uses the buffer cache. */
-#define MNTK_NOASYNC	0x00800000	/* disable async */
-#define MNTK_UNMOUNT	0x01000000	/* unmount in progress */
-#define	MNTK_MWAIT	0x02000000	/* waiting for unmount to finish */
-#define	MNTK_SUSPEND	0x08000000	/* request write suspension */
-#define	MNTK_SUSPEND2	0x04000000	/* block secondary writes */
-#define	MNTK_SUSPENDED	0x10000000	/* write operations are suspended */
-#define	MNTK_UNUSED25	0x20000000	/*  --available-- */
-#define MNTK_LOOKUP_SHARED	0x40000000 /* FS supports shared lock lookups */
-#define	MNTK_NOKNOTE	0x80000000	/* Don't send KNOTEs from VOP hooks */
-
-#ifdef _KERNEL
-static inline int
-MNT_SHARED_WRITES(struct mount *mp)
-{
-
-	return (mp != NULL && (mp->mnt_kern_flag & MNTK_SHARED_WRITES) != 0);
-}
-
-static inline int
-MNT_EXTENDED_SHARED(struct mount *mp)
-{
-
-	return (mp != NULL && (mp->mnt_kern_flag & MNTK_EXTENDED_SHARED) != 0);
-}
-#endif
-
-/*
- * Sysctl CTL_VFS definitions.
- *
- * Second level identifier specifies which filesystem. Second level
- * identifier VFS_VFSCONF returns information about all filesystems.
- * Second level identifier VFS_GENERIC is non-terminal.
- */
-#define	VFS_VFSCONF		0	/* get configured filesystems */
-#define	VFS_GENERIC		0	/* generic filesystem information */
-/*
- * Third level identifiers for VFS_GENERIC are given below; third
- * level identifiers for specific filesystems are given in their
- * mount specific header files.
- */
-#define VFS_MAXTYPENUM	1	/* int: highest defined filesystem type */
-#define VFS_CONF	2	/* struct: vfsconf for filesystem given
-				   as next argument */
-
-/*
- * Flags for various system call interfaces.
- *
- * waitfor flags to vfs_sync() and getfsstat()
- */
-#define MNT_WAIT	1	/* synchronously wait for I/O to complete */
-#define MNT_NOWAIT	2	/* start all I/O, but do not wait for it */
-#define MNT_LAZY	3	/* push data not written by filesystem syncer */
-#define MNT_SUSPEND	4	/* Suspend file system after sync */
-
-/*
- * Generic file handle
- */
-struct fhandle {
-	fsid_t	fh_fsid;	/* Filesystem id of mount point */
-	struct	fid fh_fid;	/* Filesys specific id */
-};
-typedef struct fhandle	fhandle_t;
-
-/*
- * Old export arguments without security flavor list
- */
-struct oexport_args {
-	int	ex_flags;		/* export related flags */
-	uid_t	ex_root;		/* mapping for root uid */
-	struct	xucred ex_anon;		/* mapping for anonymous user */
-	struct	sockaddr *ex_addr;	/* net address to which exported */
-	u_char	ex_addrlen;		/* and the net address length */
-	struct	sockaddr *ex_mask;	/* mask of valid bits in saddr */
-	u_char	ex_masklen;		/* and the smask length */
-	char	*ex_indexfile;		/* index file for WebNFS URLs */
-};
-
-/*
- * Export arguments for local filesystem mount calls.
- */
-#define	MAXSECFLAVORS	5
-struct export_args {
-	int	ex_flags;		/* export related flags */
-	uid_t	ex_root;		/* mapping for root uid */
-	struct	xucred ex_anon;		/* mapping for anonymous user */
-	struct	sockaddr *ex_addr;	/* net address to which exported */
-	u_char	ex_addrlen;		/* and the net address length */
-	struct	sockaddr *ex_mask;	/* mask of valid bits in saddr */
-	u_char	ex_masklen;		/* and the smask length */
-	char	*ex_indexfile;		/* index file for WebNFS URLs */
-	int	ex_numsecflavors;	/* security flavor count */
-	int	ex_secflavors[MAXSECFLAVORS]; /* list of security flavors */
-};
-
-/*
- * Structure holding information for a publicly exported filesystem
- * (WebNFS). Currently the specs allow just for one such filesystem.
- */
-struct nfs_public {
-	int		np_valid;	/* Do we hold valid information */
-	fhandle_t	np_handle;	/* Filehandle for pub fs (internal) */
-	struct mount	*np_mount;	/* Mountpoint of exported fs */
-	char		*np_index;	/* Index file */
-};
-
-/*
- * Filesystem configuration information. One of these exists for each
- * type of filesystem supported by the kernel. These are searched at
- * mount time to identify the requested filesystem.
- *
- * XXX: Never change the first two arguments!
- */
-struct vfsconf {
-	u_int	vfc_version;		/* ABI version number */
-	char	vfc_name[MFSNAMELEN];	/* filesystem type name */
-	struct	vfsops *vfc_vfsops;	/* filesystem operations vector */
-	int	vfc_typenum;		/* historic filesystem type number */
-	int	vfc_refcount;		/* number mounted of this type */
-	int	vfc_flags;		/* permanent flags */
-	struct	vfsoptdecl *vfc_opts;	/* mount options */
-	TAILQ_ENTRY(vfsconf) vfc_list;	/* list of vfscons */
-};
-
-/* Userland version of the struct vfsconf. */
-struct xvfsconf {
-	struct	vfsops *vfc_vfsops;	/* filesystem operations vector */
-	char	vfc_name[MFSNAMELEN];	/* filesystem type name */
-	int	vfc_typenum;		/* historic filesystem type number */
-	int	vfc_refcount;		/* number mounted of this type */
-	int	vfc_flags;		/* permanent flags */
-	struct	vfsconf *vfc_next;	/* next in list */
-};
-
-#ifndef BURN_BRIDGES
-struct ovfsconf {
-	void	*vfc_vfsops;
-	char	vfc_name[32];
-	int	vfc_index;
-	int	vfc_refcount;
-	int	vfc_flags;
-};
-#endif
-
-/*
- * NB: these flags refer to IMPLEMENTATION properties, not properties of
- * any actual mounts; i.e., it does not make sense to change the flags.
- */
-#define	VFCF_STATIC	0x00010000	/* statically compiled into kernel */
-#define	VFCF_NETWORK	0x00020000	/* may get data over the network */
-#define	VFCF_READONLY	0x00040000	/* writes are not implemented */
-#define	VFCF_SYNTHETIC	0x00080000	/* data does not represent real files */
-#define	VFCF_LOOPBACK	0x00100000	/* aliases some other mounted FS */
-#define	VFCF_UNICODE	0x00200000	/* stores file names as Unicode */
-#define	VFCF_JAIL	0x00400000	/* can be mounted from within a jail */
-#define	VFCF_DELEGADMIN	0x00800000	/* supports delegated administration */
-#define	VFCF_SBDRY	0x01000000	/* defer stop requests */
-
-typedef uint32_t fsctlop_t;
-
-struct vfsidctl {
-	int		vc_vers;	/* should be VFSIDCTL_VERS1 (below) */
-	fsid_t		vc_fsid;	/* fsid to operate on */
-	char		vc_fstypename[MFSNAMELEN];
-					/* type of fs 'nfs' or '*' */
-	fsctlop_t	vc_op;		/* operation VFS_CTL_* (below) */
-	void		*vc_ptr;	/* pointer to data structure */
-	size_t		vc_len;		/* sizeof said structure */
-	uint32_t	vc_spare[12];	/* spare (must be zero) */
-};
-
-/* vfsidctl API version. */
-#define VFS_CTL_VERS1	0x01
-
-/*
- * New style VFS sysctls, do not reuse/conflict with the namespace for
- * private sysctls.
- * All "global" sysctl ops have the 33rd bit set:
- * 0x...1....
- * Private sysctl ops should have the 33rd bit unset.
- */
-#define VFS_CTL_QUERY	0x00010001	/* anything wrong? (vfsquery) */
-#define VFS_CTL_TIMEO	0x00010002	/* set timeout for vfs notification */
-#define VFS_CTL_NOLOCKS	0x00010003	/* disable file locking */
-
-struct vfsquery {
-	uint32_t	vq_flags;
-	uint32_t	vq_spare[31];
-};
-
-/* vfsquery flags */
-#define VQ_NOTRESP	0x0001	/* server down */
-#define VQ_NEEDAUTH	0x0002	/* server bad auth */
-#define VQ_LOWDISK	0x0004	/* we're low on space */
-#define VQ_MOUNT	0x0008	/* new filesystem arrived */
-#define VQ_UNMOUNT	0x0010	/* filesystem has left */
-#define VQ_DEAD		0x0020	/* filesystem is dead, needs force unmount */
-#define VQ_ASSIST	0x0040	/* filesystem needs assistance from external
-				   program */
-#define VQ_NOTRESPLOCK	0x0080	/* server lockd down */
-#define VQ_FLAG0100	0x0100	/* placeholder */
-#define VQ_FLAG0200	0x0200	/* placeholder */
-#define VQ_FLAG0400	0x0400	/* placeholder */
-#define VQ_FLAG0800	0x0800	/* placeholder */
-#define VQ_FLAG1000	0x1000	/* placeholder */
-#define VQ_FLAG2000	0x2000	/* placeholder */
-#define VQ_FLAG4000	0x4000	/* placeholder */
-#define VQ_FLAG8000	0x8000	/* placeholder */
-
-#ifdef _KERNEL
-/* Point a sysctl request at a vfsidctl's data. */
-#define VCTLTOREQ(vc, req)						\
-	do {								\
-		(req)->newptr = (vc)->vc_ptr;				\
-		(req)->newlen = (vc)->vc_len;				\
-		(req)->newidx = 0;					\
-	} while (0)
-#endif
-
-struct iovec;
-struct uio;
-
-#ifdef _KERNEL
-
-/*
- * vfs_busy specific flags and mask.
- */
-#define	MBF_NOWAIT	0x01
-#define	MBF_MNTLSTLOCK	0x02
-#define	MBF_MASK	(MBF_NOWAIT | MBF_MNTLSTLOCK)
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_MOUNT);
-#endif
-extern int maxvfsconf;		/* highest defined filesystem type */
-extern int nfs_mount_type;	/* vfc_typenum for nfs, or -1 */
-
-TAILQ_HEAD(vfsconfhead, vfsconf);
-extern struct vfsconfhead vfsconf;
-
-/*
- * Operations supported on mounted filesystem.
- */
-struct mount_args;
-struct nameidata;
-struct sysctl_req;
-struct mntarg;
-
-typedef int vfs_cmount_t(struct mntarg *ma, void *data, uint64_t flags);
-typedef int vfs_unmount_t(struct mount *mp, int mntflags);
-typedef int vfs_root_t(struct mount *mp, int flags, struct vnode **vpp);
-typedef	int vfs_quotactl_t(struct mount *mp, int cmds, uid_t uid, void *arg);
-typedef	int vfs_statfs_t(struct mount *mp, struct statfs *sbp);
-typedef	int vfs_sync_t(struct mount *mp, int waitfor);
-typedef	int vfs_vget_t(struct mount *mp, ino_t ino, int flags,
-		    struct vnode **vpp);
-typedef	int vfs_fhtovp_t(struct mount *mp, struct fid *fhp,
-		    int flags, struct vnode **vpp);
-typedef	int vfs_checkexp_t(struct mount *mp, struct sockaddr *nam,
-		    int *extflagsp, struct ucred **credanonp,
-		    int *numsecflavors, int **secflavors);
-typedef	int vfs_init_t(struct vfsconf *);
-typedef	int vfs_uninit_t(struct vfsconf *);
-typedef	int vfs_extattrctl_t(struct mount *mp, int cmd,
-		    struct vnode *filename_vp, int attrnamespace,
-		    const char *attrname);
-typedef	int vfs_mount_t(struct mount *mp);
-typedef int vfs_sysctl_t(struct mount *mp, fsctlop_t op,
-		    struct sysctl_req *req);
-typedef void vfs_susp_clean_t(struct mount *mp);
-typedef void vfs_notify_lowervp_t(struct mount *mp, struct vnode *lowervp);
-typedef void vfs_purge_t(struct mount *mp);
-
-struct vfsops {
-	vfs_mount_t		*vfs_mount;
-	vfs_cmount_t		*vfs_cmount;
-	vfs_unmount_t		*vfs_unmount;
-	vfs_root_t		*vfs_root;
-	vfs_quotactl_t		*vfs_quotactl;
-	vfs_statfs_t		*vfs_statfs;
-	vfs_sync_t		*vfs_sync;
-	vfs_vget_t		*vfs_vget;
-	vfs_fhtovp_t		*vfs_fhtovp;
-	vfs_checkexp_t		*vfs_checkexp;
-	vfs_init_t		*vfs_init;
-	vfs_uninit_t		*vfs_uninit;
-	vfs_extattrctl_t	*vfs_extattrctl;
-	vfs_sysctl_t		*vfs_sysctl;
-	vfs_susp_clean_t	*vfs_susp_clean;
-	vfs_notify_lowervp_t	*vfs_reclaim_lowervp;
-	vfs_notify_lowervp_t	*vfs_unlink_lowervp;
-	vfs_purge_t		*vfs_purge;
-	vfs_mount_t		*vfs_spare[6];	/* spares for ABI compat */
-};
-
-vfs_statfs_t	__vfs_statfs;
-
-#define	VFS_PROLOGUE(MP)	do {					\
-	struct mount *mp__;						\
-	int _enable_stops;						\
-									\
-	mp__ = (MP);							\
-	_enable_stops = (mp__ != NULL &&				\
-	    (mp__->mnt_vfc->vfc_flags & VFCF_SBDRY) && sigdeferstop())
-
-#define	VFS_EPILOGUE(MP)						\
-	if (_enable_stops)						\
-		sigallowstop();						\
-} while (0)
-
-#define	VFS_MOUNT(MP) ({						\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_mount)(MP);				\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_UNMOUNT(MP, FORCE) ({					\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_unmount)(MP, FORCE);			\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_ROOT(MP, FLAGS, VPP) ({					\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_root)(MP, FLAGS, VPP);		\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_QUOTACTL(MP, C, U, A) ({					\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A);		\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_STATFS(MP, SBP) ({						\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = __vfs_statfs((MP), (SBP));				\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_SYNC(MP, WAIT) ({						\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_sync)(MP, WAIT);			\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_VGET(MP, INO, FLAGS, VPP) ({				\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_vget)(MP, INO, FLAGS, VPP);		\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_FHTOVP(MP, FIDP, FLAGS, VPP) ({				\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_fhtovp)(MP, FIDP, FLAGS, VPP);	\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_CHECKEXP(MP, NAM, EXFLG, CRED, NUMSEC, SEC) ({		\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_checkexp)(MP, NAM, EXFLG, CRED, NUMSEC,\
-	    SEC);							\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_EXTATTRCTL(MP, C, FN, NS, N) ({				\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_extattrctl)(MP, C, FN, NS, N);	\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_SYSCTL(MP, OP, REQ) ({					\
-	int _rc;							\
-									\
-	VFS_PROLOGUE(MP);						\
-	_rc = (*(MP)->mnt_op->vfs_sysctl)(MP, OP, REQ);			\
-	VFS_EPILOGUE(MP);						\
-	_rc; })
-
-#define	VFS_SUSP_CLEAN(MP) do {						\
-	if (*(MP)->mnt_op->vfs_susp_clean != NULL) {			\
-		VFS_PROLOGUE(MP);					\
-		(*(MP)->mnt_op->vfs_susp_clean)(MP);			\
-		VFS_EPILOGUE(MP);					\
-	}								\
-} while (0)
-
-#define	VFS_RECLAIM_LOWERVP(MP, VP) do {				\
-	if (*(MP)->mnt_op->vfs_reclaim_lowervp != NULL) {		\
-		VFS_PROLOGUE(MP);					\
-		(*(MP)->mnt_op->vfs_reclaim_lowervp)((MP), (VP));	\
-		VFS_EPILOGUE(MP);					\
-	}								\
-} while (0)
-
-#define	VFS_UNLINK_LOWERVP(MP, VP) do {					\
-	if (*(MP)->mnt_op->vfs_unlink_lowervp != NULL) {		\
-		VFS_PROLOGUE(MP);					\
-		(*(MP)->mnt_op->vfs_unlink_lowervp)((MP), (VP));	\
-		VFS_EPILOGUE(MP);					\
-	}								\
-} while (0)
-
-#define	VFS_PURGE(MP) do {						\
-	if (*(MP)->mnt_op->vfs_purge != NULL) {				\
-		VFS_PROLOGUE(MP);					\
-		(*(MP)->mnt_op->vfs_purge)(MP);				\
-		VFS_EPILOGUE(MP);					\
-	}								\
-} while (0)
-
-#define VFS_KNOTE_LOCKED(vp, hint) do					\
-{									\
-	if (((vp)->v_vflag & VV_NOKNOTE) == 0)				\
-		VN_KNOTE((vp), (hint), KNF_LISTLOCKED);			\
-} while (0)
-
-#define VFS_KNOTE_UNLOCKED(vp, hint) do					\
-{									\
-	if (((vp)->v_vflag & VV_NOKNOTE) == 0)				\
-		VN_KNOTE((vp), (hint), 0);				\
-} while (0)
-
-#define	VFS_NOTIFY_UPPER_RECLAIM	1
-#define	VFS_NOTIFY_UPPER_UNLINK		2
-
-#include <sys/module.h>
-
-/*
- * Version numbers.
- */
-#define VFS_VERSION_00	0x19660120
-#define VFS_VERSION_01	0x20121030
-#define VFS_VERSION	VFS_VERSION_01
-
-#define VFS_SET(vfsops, fsname, flags) \
-	static struct vfsconf fsname ## _vfsconf = {		\
-		.vfc_version = VFS_VERSION,			\
-		.vfc_name = #fsname,				\
-		.vfc_vfsops = &vfsops,				\
-		.vfc_typenum = -1,				\
-		.vfc_flags = flags,				\
-	};							\
-	static moduledata_t fsname ## _mod = {			\
-		#fsname,					\
-		vfs_modevent,					\
-		& fsname ## _vfsconf				\
-	};							\
-	DECLARE_MODULE(fsname, fsname ## _mod, SI_SUB_VFS, SI_ORDER_MIDDLE)
-
-extern	char *mountrootfsname;
-
-/*
- * exported vnode operations
- */
-
-int	dounmount(struct mount *, int, struct thread *);
-
-int	kernel_mount(struct mntarg *ma, uint64_t flags);
-int	kernel_vmount(int flags, ...);
-struct mntarg *mount_arg(struct mntarg *ma, const char *name, const void *val, int len);
-struct mntarg *mount_argb(struct mntarg *ma, int flag, const char *name);
-struct mntarg *mount_argf(struct mntarg *ma, const char *name, const char *fmt, ...);
-struct mntarg *mount_argsu(struct mntarg *ma, const char *name, const void *val, int len);
-void	statfs_scale_blocks(struct statfs *sf, long max_size);
-struct vfsconf *vfs_byname(const char *);
-struct vfsconf *vfs_byname_kld(const char *, struct thread *td, int *);
-void	vfs_mount_destroy(struct mount *);
-void	vfs_event_signal(fsid_t *, uint32_t, intptr_t);
-void	vfs_freeopts(struct vfsoptlist *opts);
-void	vfs_deleteopt(struct vfsoptlist *opts, const char *name);
-int	vfs_buildopts(struct uio *auio, struct vfsoptlist **options);
-int	vfs_flagopt(struct vfsoptlist *opts, const char *name, uint64_t *w,
-	    uint64_t val);
-int	vfs_getopt(struct vfsoptlist *, const char *, void **, int *);
-int	vfs_getopt_pos(struct vfsoptlist *opts, const char *name);
-int	vfs_getopt_size(struct vfsoptlist *opts, const char *name,
-	    off_t *value);
-char	*vfs_getopts(struct vfsoptlist *, const char *, int *error);
-int	vfs_copyopt(struct vfsoptlist *, const char *, void *, int);
-int	vfs_filteropt(struct vfsoptlist *, const char **legal);
-void	vfs_opterror(struct vfsoptlist *opts, const char *fmt, ...);
-int	vfs_scanopt(struct vfsoptlist *opts, const char *name, const char *fmt, ...);
-int	vfs_setopt(struct vfsoptlist *opts, const char *name, void *value,
-	    int len);
-int	vfs_setopt_part(struct vfsoptlist *opts, const char *name, void *value,
-	    int len);
-int	vfs_setopts(struct vfsoptlist *opts, const char *name,
-	    const char *value);
-int	vfs_setpublicfs			    /* set publicly exported fs */
-	    (struct mount *, struct netexport *, struct export_args *);
-void	vfs_msync(struct mount *, int);
-int	vfs_busy(struct mount *, int);
-int	vfs_export			 /* process mount export info */
-	    (struct mount *, struct export_args *);
-void	vfs_allocate_syncvnode(struct mount *);
-void	vfs_deallocate_syncvnode(struct mount *);
-int	vfs_donmount(struct thread *td, uint64_t fsflags,
-	    struct uio *fsoptions);
-void	vfs_getnewfsid(struct mount *);
-struct cdev *vfs_getrootfsid(struct mount *);
-struct	mount *vfs_getvfs(fsid_t *);      /* return vfs given fsid */
-struct	mount *vfs_busyfs(fsid_t *);
-int	vfs_modevent(module_t, int, void *);
-void	vfs_mount_error(struct mount *, const char *, ...);
-void	vfs_mountroot(void);			/* mount our root filesystem */
-void	vfs_mountedfrom(struct mount *, const char *from);
-void	vfs_notify_upper(struct vnode *, int);
-void	vfs_oexport_conv(const struct oexport_args *oexp,
-	    struct export_args *exp);
-void	vfs_ref(struct mount *);
-void	vfs_rel(struct mount *);
-struct mount *vfs_mount_alloc(struct vnode *, struct vfsconf *, const char *,
-	    struct ucred *);
-int	vfs_suser(struct mount *, struct thread *);
-void	vfs_unbusy(struct mount *);
-void	vfs_unmountall(void);
-extern	TAILQ_HEAD(mntlist, mount) mountlist;	/* mounted filesystem list */
-extern	struct mtx mountlist_mtx;
-extern	struct nfs_public nfs_pub;
-extern	struct sx vfsconf_sx;
-#define	vfsconf_lock()		sx_xlock(&vfsconf_sx)
-#define	vfsconf_unlock()	sx_xunlock(&vfsconf_sx)
-#define	vfsconf_slock()		sx_slock(&vfsconf_sx)
-#define	vfsconf_sunlock()	sx_sunlock(&vfsconf_sx)
-
-/*
- * Declarations for these vfs default operations are located in
- * kern/vfs_default.c.  They will be automatically used to replace
- * null entries in VFS ops tables when registering a new filesystem
- * type in the global table.
- */
-vfs_root_t		vfs_stdroot;
-vfs_quotactl_t		vfs_stdquotactl;
-vfs_statfs_t		vfs_stdstatfs;
-vfs_sync_t		vfs_stdsync;
-vfs_sync_t		vfs_stdnosync;
-vfs_vget_t		vfs_stdvget;
-vfs_fhtovp_t		vfs_stdfhtovp;
-vfs_checkexp_t		vfs_stdcheckexp;
-vfs_init_t		vfs_stdinit;
-vfs_uninit_t		vfs_stduninit;
-vfs_extattrctl_t	vfs_stdextattrctl;
-vfs_sysctl_t		vfs_stdsysctl;
-
-void	syncer_suspend(void);
-void	syncer_resume(void);
-
-#else /* !_KERNEL */
-
-#include <sys/cdefs.h>
-
-struct stat;
-
-__BEGIN_DECLS
-int	fhopen(const struct fhandle *, int);
-int	fhstat(const struct fhandle *, struct stat *);
-int	fhstatfs(const struct fhandle *, struct statfs *);
-int	fstatfs(int, struct statfs *);
-int	getfh(const char *, fhandle_t *);
-int	getfsstat(struct statfs *, long, int);
-int	getmntinfo(struct statfs **, int);
-int	lgetfh(const char *, fhandle_t *);
-int	mount(const char *, const char *, int, void *);
-int	nmount(struct iovec *, unsigned int, int);
-int	statfs(const char *, struct statfs *);
-int	unmount(const char *, int);
-
-/* C library stuff */
-int	getvfsbyname(const char *, struct xvfsconf *);
-__END_DECLS
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_MOUNT_H_ */
diff --git a/include.new/sys/mouse.h b/include.new/sys/mouse.h
deleted file mode 100644
index 368591b..0000000
--- a/include.new/sys/mouse.h
+++ /dev/null
@@ -1,381 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993 Erik Forsberg.
- * Copyright (c) 1996, 1997 Kazutaka YOKOTA
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY ``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 I 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: releng/10.2/sys/sys/mouse.h 281708 2015-04-18 21:24:46Z rpaulo $
- */
-
-#ifndef _SYS_MOUSE_H_
-#define _SYS_MOUSE_H_
-
-#include <sys/types.h>
-#include <sys/ioccom.h>
-
-/* ioctls */
-#define MOUSE_GETSTATUS		_IOR('M', 0, mousestatus_t)
-#define MOUSE_GETHWINFO		_IOR('M', 1, mousehw_t)
-#define MOUSE_GETMODE		_IOR('M', 2, mousemode_t)
-#define MOUSE_SETMODE		_IOW('M', 3, mousemode_t)
-#define MOUSE_GETLEVEL		_IOR('M', 4, int)
-#define MOUSE_SETLEVEL		_IOW('M', 5, int)
-#define MOUSE_GETVARS		_IOR('M', 6, mousevar_t)
-#define MOUSE_SETVARS		_IOW('M', 7, mousevar_t)
-#define MOUSE_READSTATE		_IOWR('M', 8, mousedata_t)
-#define MOUSE_READDATA		_IOWR('M', 9, mousedata_t)
-
-#ifdef notyet
-#define MOUSE_SETRESOLUTION	_IOW('M', 10, int)
-#define MOUSE_SETSCALING	_IOW('M', 11, int)
-#define MOUSE_SETRATE		_IOW('M', 12, int)
-#define MOUSE_GETHWID		_IOR('M', 13, int)
-#endif
-
-#define MOUSE_SYN_GETHWINFO	_IOR('M', 100, synapticshw_t)
-
-/* mouse status block */
-typedef struct mousestatus {
-    int     flags;		/* state change flags */
-    int     button;		/* button status */
-    int     obutton;		/* previous button status */
-    int     dx;			/* x movement */
-    int     dy;			/* y movement */
-    int     dz;			/* z movement */
-} mousestatus_t;
-
-/* button */
-#define MOUSE_BUTTON1DOWN	0x0001	/* left */
-#define MOUSE_BUTTON2DOWN	0x0002	/* middle */
-#define MOUSE_BUTTON3DOWN	0x0004	/* right */
-#define MOUSE_BUTTON4DOWN	0x0008
-#define MOUSE_BUTTON5DOWN	0x0010
-#define MOUSE_BUTTON6DOWN	0x0020
-#define MOUSE_BUTTON7DOWN	0x0040
-#define MOUSE_BUTTON8DOWN	0x0080
-#define MOUSE_MAXBUTTON		31
-#define MOUSE_STDBUTTONS	0x0007		/* buttons 1-3 */
-#define MOUSE_EXTBUTTONS	0x7ffffff8	/* the others (28 of them!) */
-#define MOUSE_BUTTONS		(MOUSE_STDBUTTONS | MOUSE_EXTBUTTONS)
-
-/* flags */
-#define MOUSE_STDBUTTONSCHANGED	MOUSE_STDBUTTONS
-#define MOUSE_EXTBUTTONSCHANGED	MOUSE_EXTBUTTONS
-#define MOUSE_BUTTONSCHANGED	MOUSE_BUTTONS
-#define MOUSE_POSCHANGED	0x80000000
-
-typedef struct mousehw {
-	int buttons;		/* -1 if unknown */
-	int iftype;		/* MOUSE_IF_XXX */
-	int type;		/* mouse/track ball/pad... */
-	int model;		/* I/F dependent model ID: MOUSE_MODEL_XXX */
-	int hwid;		/* I/F dependent hardware ID
-				 * for the PS/2 mouse, it will be PSM_XXX_ID
-				 */
-} mousehw_t;
-
-typedef struct synapticshw {
-	int infoMajor;
-	int infoMinor;
-	int infoRot180;
-	int infoPortrait;
-	int infoSensor;
-	int infoHardware;
-	int infoNewAbs;
-	int capPen;
-	int infoSimplC;
-	int infoGeometry;
-	int capExtended;
-	int capSleep;
-	int capFourButtons;
-	int capMultiFinger;
-	int capPalmDetect;
-	int capPassthrough;
-	int capMiddle;
-	int nExtendedButtons;
-	int nExtendedQueries;
-	int capClickPad;
-	int capDeluxeLEDs;
-	int noAbsoluteFilter;
-	int capReportsV;
-	int capUniformClickPad;
-	int capReportsMin;
-	int capInterTouch;
-	int capReportsMax;
-	int capClearPad;
-	int capAdvancedGestures;
-	int multiFingerMode;
-	int capCoveredPad;
-	int verticalScroll;
-	int horizontalScroll;
-	int verticalWheel;
-} synapticshw_t;
-
-/* iftype */
-#define MOUSE_IF_UNKNOWN	(-1)
-#define MOUSE_IF_SERIAL		0
-#define MOUSE_IF_BUS		1
-#define MOUSE_IF_INPORT		2
-#define MOUSE_IF_PS2		3
-#define MOUSE_IF_SYSMOUSE	4
-#define MOUSE_IF_USB		5
-
-/* type */
-#define MOUSE_UNKNOWN		(-1)	/* should be treated as a mouse */
-#define MOUSE_MOUSE		0
-#define MOUSE_TRACKBALL		1
-#define MOUSE_STICK		2
-#define MOUSE_PAD		3
-
-/* model */
-#define MOUSE_MODEL_UNKNOWN		(-1)
-#define MOUSE_MODEL_GENERIC		0
-#define MOUSE_MODEL_GLIDEPOINT		1
-#define MOUSE_MODEL_NETSCROLL		2
-#define MOUSE_MODEL_NET			3
-#define MOUSE_MODEL_INTELLI		4
-#define MOUSE_MODEL_THINK		5
-#define MOUSE_MODEL_EASYSCROLL		6
-#define MOUSE_MODEL_MOUSEMANPLUS	7
-#define MOUSE_MODEL_KIDSPAD		8
-#define MOUSE_MODEL_VERSAPAD		9
-#define MOUSE_MODEL_EXPLORER		10
-#define MOUSE_MODEL_4D			11
-#define MOUSE_MODEL_4DPLUS		12
-#define MOUSE_MODEL_SYNAPTICS		13
-#define	MOUSE_MODEL_TRACKPOINT		14
-
-typedef struct mousemode {
-	int protocol;		/* MOUSE_PROTO_XXX */
-	int rate;		/* report rate (per sec), -1 if unknown */
-	int resolution;		/* MOUSE_RES_XXX, -1 if unknown */
-	int accelfactor;	/* accelation factor (must be 1 or greater) */
-	int level;		/* driver operation level */
-	int packetsize;		/* the length of the data packet */
-	unsigned char syncmask[2]; /* sync. data bits in the header byte */
-} mousemode_t;
-
-/* protocol */
-/*
- * Serial protocols:
- *   Microsoft, MouseSystems, Logitech, MM series, MouseMan, Hitachi Tablet,
- *   GlidePoint, IntelliMouse, Thinking Mouse, MouseRemote, Kidspad,
- *   VersaPad
- * Bus mouse protocols:
- *   bus, InPort
- * PS/2 mouse protocol:
- *   PS/2
- */
-#define MOUSE_PROTO_UNKNOWN	(-1)
-#define MOUSE_PROTO_MS		0	/* Microsoft Serial, 3 bytes */
-#define MOUSE_PROTO_MSC		1	/* Mouse Systems, 5 bytes */
-#define MOUSE_PROTO_LOGI	2	/* Logitech, 3 bytes */
-#define MOUSE_PROTO_MM		3	/* MM series, 3 bytes */
-#define MOUSE_PROTO_LOGIMOUSEMAN 4	/* Logitech MouseMan 3/4 bytes */
-#define MOUSE_PROTO_BUS		5	/* MS/Logitech bus mouse */
-#define MOUSE_PROTO_INPORT	6	/* MS/ATI InPort mouse */
-#define MOUSE_PROTO_PS2		7	/* PS/2 mouse, 3 bytes */
-#define MOUSE_PROTO_HITTAB	8	/* Hitachi Tablet 3 bytes */
-#define MOUSE_PROTO_GLIDEPOINT	9	/* ALPS GlidePoint, 3/4 bytes */
-#define MOUSE_PROTO_INTELLI	10	/* MS IntelliMouse, 4 bytes */
-#define MOUSE_PROTO_THINK	11	/* Kensington Thinking Mouse, 3/4 bytes */
-#define MOUSE_PROTO_SYSMOUSE	12	/* /dev/sysmouse */
-#define MOUSE_PROTO_X10MOUSEREM	13	/* X10 MouseRemote, 3 bytes */
-#define MOUSE_PROTO_KIDSPAD	14	/* Genius Kidspad */
-#define MOUSE_PROTO_VERSAPAD	15	/* Interlink VersaPad, 6 bytes */
-#define MOUSE_PROTO_JOGDIAL	16	/* Vaio's JogDial */
-#define MOUSE_PROTO_GTCO_DIGIPAD	17
-
-#define MOUSE_RES_UNKNOWN	(-1)
-#define MOUSE_RES_DEFAULT	0
-#define MOUSE_RES_LOW		(-2)
-#define MOUSE_RES_MEDIUMLOW	(-3)
-#define MOUSE_RES_MEDIUMHIGH	(-4)
-#define MOUSE_RES_HIGH		(-5)
-
-typedef struct mousedata {
-	int len;		/* # of data in the buffer */
-	int buf[16];		/* data buffer */
-} mousedata_t;
-
-#if (defined(MOUSE_GETVARS))
-
-typedef struct mousevar {
-	int var[16];
-} mousevar_t;
-
-/* magic numbers in var[0] */
-#define MOUSE_VARS_PS2_SIG	0x00325350	/* 'PS2' */
-#define MOUSE_VARS_BUS_SIG	0x00535542	/* 'BUS' */
-#define MOUSE_VARS_INPORT_SIG	0x00504e49	/* 'INP' */
-
-#endif /* MOUSE_GETVARS */
-
-/* Synaptics Touchpad */
-#define MOUSE_SYNAPTICS_PACKETSIZE	6	/* '3' works better */
-
-/* Microsoft Serial mouse data packet */
-#define MOUSE_MSS_PACKETSIZE	3
-#define MOUSE_MSS_SYNCMASK	0x40
-#define MOUSE_MSS_SYNC		0x40
-#define MOUSE_MSS_BUTTONS	0x30
-#define MOUSE_MSS_BUTTON1DOWN	0x20	/* left */
-#define MOUSE_MSS_BUTTON2DOWN	0x00	/* no middle button */
-#define MOUSE_MSS_BUTTON3DOWN	0x10	/* right */
-
-/* Logitech MouseMan data packet (M+ protocol) */
-#define MOUSE_LMAN_BUTTON2DOWN	0x20	/* middle button, the 4th byte */
-
-/* ALPS GlidePoint extension (variant of M+ protocol) */
-#define MOUSE_ALPS_BUTTON2DOWN	0x20	/* middle button, the 4th byte */
-#define MOUSE_ALPS_TAP		0x10	/* `tapping' action, the 4th byte */
-
-/* Kinsington Thinking Mouse extension (variant of M+ protocol) */
-#define MOUSE_THINK_BUTTON2DOWN 0x20	/* lower-left button, the 4th byte */
-#define MOUSE_THINK_BUTTON4DOWN 0x10	/* lower-right button, the 4th byte */
-
-/* MS IntelliMouse (variant of MS Serial) */
-#define MOUSE_INTELLI_PACKETSIZE 4
-#define MOUSE_INTELLI_BUTTON2DOWN 0x10	/* middle button in the 4th byte */
-
-/* Mouse Systems Corp. mouse data packet */
-#define MOUSE_MSC_PACKETSIZE	5
-#define MOUSE_MSC_SYNCMASK	0xf8
-#define MOUSE_MSC_SYNC		0x80
-#define MOUSE_MSC_BUTTONS	0x07
-#define MOUSE_MSC_BUTTON1UP	0x04	/* left */
-#define MOUSE_MSC_BUTTON2UP	0x02	/* middle */
-#define MOUSE_MSC_BUTTON3UP	0x01	/* right */
-#define MOUSE_MSC_MAXBUTTON	3
-
-/* MM series mouse data packet */
-#define MOUSE_MM_PACKETSIZE	3
-#define MOUSE_MM_SYNCMASK	0xe0
-#define MOUSE_MM_SYNC		0x80
-#define MOUSE_MM_BUTTONS	0x07
-#define MOUSE_MM_BUTTON1DOWN	0x04	/* left */
-#define MOUSE_MM_BUTTON2DOWN	0x02	/* middle */
-#define MOUSE_MM_BUTTON3DOWN	0x01	/* right */
-#define MOUSE_MM_XPOSITIVE	0x10
-#define MOUSE_MM_YPOSITIVE	0x08
-
-/* PS/2 mouse data packet */
-#define MOUSE_PS2_PACKETSIZE	3
-#define MOUSE_PS2_SYNCMASK	0xc8
-#define MOUSE_PS2_SYNC		0x08
-#define MOUSE_PS2_BUTTONS	0x07	/* 0x03 for 2 button mouse */
-#define MOUSE_PS2_BUTTON1DOWN	0x01	/* left */
-#define MOUSE_PS2_BUTTON2DOWN	0x04	/* middle */
-#define MOUSE_PS2_BUTTON3DOWN	0x02	/* right */
-#define MOUSE_PS2_TAP		MOUSE_PS2_SYNC /* GlidePoint (PS/2) `tapping'
-					        * Yes! this is the same bit
-						* as SYNC!
-					 	*/
-
-#define MOUSE_PS2_XNEG		0x10
-#define MOUSE_PS2_YNEG		0x20
-#define MOUSE_PS2_XOVERFLOW	0x40
-#define MOUSE_PS2_YOVERFLOW	0x80
-
-/* Logitech MouseMan+ (PS/2) data packet (PS/2++ protocol) */
-#define MOUSE_PS2PLUS_SYNCMASK	0x48
-#define MOUSE_PS2PLUS_SYNC	0x48
-#define MOUSE_PS2PLUS_ZNEG	0x08	/* sign bit */
-#define MOUSE_PS2PLUS_BUTTON4DOWN 0x10	/* 4th button on MouseMan+ */
-#define MOUSE_PS2PLUS_BUTTON5DOWN 0x20
-
-/* IBM ScrollPoint (PS/2) also uses PS/2++ protocol */
-#define MOUSE_SPOINT_ZNEG	0x80	/* sign bits */
-#define MOUSE_SPOINT_WNEG	0x08
-
-/* MS IntelliMouse (PS/2) data packet */
-#define MOUSE_PS2INTELLI_PACKETSIZE 4
-/* some compatible mice have additional buttons */
-#define MOUSE_PS2INTELLI_BUTTON4DOWN 0x40
-#define MOUSE_PS2INTELLI_BUTTON5DOWN 0x80
-
-/* MS IntelliMouse Explorer (PS/2) data packet (variation of IntelliMouse) */
-#define MOUSE_EXPLORER_ZNEG	0x08	/* sign bit */
-/* IntelliMouse Explorer has additional button data in the fourth byte */
-#define MOUSE_EXPLORER_BUTTON4DOWN 0x10
-#define MOUSE_EXPLORER_BUTTON5DOWN 0x20
-
-/* Interlink VersaPad (serial I/F) data packet */
-#define MOUSE_VERSA_PACKETSIZE	6
-#define MOUSE_VERSA_IN_USE	0x04
-#define MOUSE_VERSA_SYNCMASK	0xc3
-#define MOUSE_VERSA_SYNC	0xc0
-#define MOUSE_VERSA_BUTTONS	0x30
-#define MOUSE_VERSA_BUTTON1DOWN	0x20	/* left */
-#define MOUSE_VERSA_BUTTON2DOWN	0x00	/* middle */
-#define MOUSE_VERSA_BUTTON3DOWN	0x10	/* right */
-#define MOUSE_VERSA_TAP		0x08
-
-/* Interlink VersaPad (PS/2 I/F) data packet */
-#define MOUSE_PS2VERSA_PACKETSIZE	6
-#define MOUSE_PS2VERSA_IN_USE		0x10
-#define MOUSE_PS2VERSA_SYNCMASK		0xe8
-#define MOUSE_PS2VERSA_SYNC		0xc8
-#define MOUSE_PS2VERSA_BUTTONS		0x05
-#define MOUSE_PS2VERSA_BUTTON1DOWN	0x04	/* left */
-#define MOUSE_PS2VERSA_BUTTON2DOWN	0x00	/* middle */
-#define MOUSE_PS2VERSA_BUTTON3DOWN	0x01	/* right */
-#define MOUSE_PS2VERSA_TAP		0x02
-
-/* A4 Tech 4D Mouse (PS/2) data packet */
-#define MOUSE_4D_PACKETSIZE		3
-#define MOUSE_4D_WHEELBITS		0xf0
-
-/* A4 Tech 4D+ Mouse (PS/2) data packet */
-#define MOUSE_4DPLUS_PACKETSIZE		3
-#define MOUSE_4DPLUS_ZNEG		0x04	/* sign bit */
-#define MOUSE_4DPLUS_BUTTON4DOWN	0x08
-
-/* sysmouse extended data packet */
-/*
- * /dev/sysmouse sends data in two formats, depending on the protocol
- * level.  At the level 0, format is exactly the same as MousSystems'
- * five byte packet.  At the level 1, the first five bytes are the same
- * as at the level 0.  There are additional three bytes which shows
- * `dz' and the states of additional buttons.  `dz' is expressed as the
- * sum of the byte 5 and 6 which contain signed seven bit values.
- * The states of the button 4 though 10 are in the bit 0 though 6 in
- * the byte 7 respectively: 1 indicates the button is up.
- */
-#define MOUSE_SYS_PACKETSIZE	8
-#define MOUSE_SYS_SYNCMASK	0xf8
-#define MOUSE_SYS_SYNC		0x80
-#define MOUSE_SYS_BUTTON1UP	0x04	/* left, 1st byte */
-#define MOUSE_SYS_BUTTON2UP	0x02	/* middle, 1st byte */
-#define MOUSE_SYS_BUTTON3UP	0x01	/* right, 1st byte */
-#define MOUSE_SYS_BUTTON4UP	0x0001	/* 7th byte */
-#define MOUSE_SYS_BUTTON5UP	0x0002
-#define MOUSE_SYS_BUTTON6UP	0x0004
-#define MOUSE_SYS_BUTTON7UP	0x0008
-#define MOUSE_SYS_BUTTON8UP	0x0010
-#define MOUSE_SYS_BUTTON9UP	0x0020
-#define MOUSE_SYS_BUTTON10UP	0x0040
-#define MOUSE_SYS_MAXBUTTON	10
-#define MOUSE_SYS_STDBUTTONS	0x07
-#define MOUSE_SYS_EXTBUTTONS	0x7f	/* the others */
-
-/* Mouse remote socket */
-#define _PATH_MOUSEREMOTE	"/var/run/MouseRemote"
-
-#endif /* _SYS_MOUSE_H_ */
diff --git a/include.new/sys/mpt_ioctl.h b/include.new/sys/mpt_ioctl.h
deleted file mode 100644
index 152f7a4..0000000
--- a/include.new/sys/mpt_ioctl.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * Copyright (c) 2008 Yahoo!, Inc.
- * All rights reserved.
- * Written by: John Baldwin <jhb@FreeBSD.org>
- *
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may 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.
- *
- * LSI MPT-Fusion Host Adapter FreeBSD userland interface
- *
- * $FreeBSD: releng/10.2/sys/sys/mpt_ioctl.h 178814 2008-05-06 20:49:53Z jhb $
- */
-
-#ifndef _MPT_IOCTL_H_
-#define	_MPT_IOCTL_H_
-
-#include <dev/mpt/mpilib/mpi_type.h>
-#include <dev/mpt/mpilib/mpi.h>
-#include <dev/mpt/mpilib/mpi_cnfg.h>
-
-/*
- * For the read header requests, the header should include the page
- * type or extended page type, page number, and page version.  The
- * buffer and length are unused.  The completed header is returned in
- * the 'header' member.
- *
- * For the read page and write page requests, 'buf' should point to a
- * buffer of 'len' bytes which holds the entire page (including the
- * header).
- *
- * All requests specify the page address in 'page_address'.
- */
-struct mpt_cfg_page_req {	
-	CONFIG_PAGE_HEADER header;
-	uint32_t page_address;
-	void	*buf;
-	int	len;
-	uint16_t ioc_status;
-};
-
-struct mpt_ext_cfg_page_req {
-	CONFIG_EXTENDED_PAGE_HEADER header;
-	uint32_t page_address;
-	void	*buf;
-	int	len;
-	uint16_t ioc_status;
-};
-
-struct mpt_raid_action {
-	uint8_t action;
-	uint8_t volume_bus;
-	uint8_t volume_id;
-	uint8_t phys_disk_num;
-	uint32_t action_data_word;
-	void *buf;
-	int len;
-	uint32_t volume_status;
-	uint32_t action_data[4];
-	uint16_t action_status;
-	uint16_t ioc_status;
-	uint8_t write;
-};
-
-#define	MPTIO_READ_CFG_HEADER	_IOWR('M', 100, struct mpt_cfg_page_req)
-#define	MPTIO_READ_CFG_PAGE	_IOWR('M', 101, struct mpt_cfg_page_req)
-#define	MPTIO_READ_EXT_CFG_HEADER _IOWR('M', 102, struct mpt_ext_cfg_page_req)
-#define	MPTIO_READ_EXT_CFG_PAGE	_IOWR('M', 103, struct mpt_ext_cfg_page_req)
-#define	MPTIO_WRITE_CFG_PAGE	_IOWR('M', 104, struct mpt_cfg_page_req)
-#define	MPTIO_RAID_ACTION	_IOWR('M', 105, struct mpt_raid_action)
-
-#if defined(__amd64__)
-struct mpt_cfg_page_req32 {
-	CONFIG_PAGE_HEADER header;
-	uint32_t page_address;
-	uint32_t buf;
-	int	len;	
-	uint16_t ioc_status;
-};
-
-struct mpt_ext_cfg_page_req32 {
-	CONFIG_EXTENDED_PAGE_HEADER header;
-	uint32_t page_address;
-	uint32_t buf;
-	int	len;
-	uint16_t ioc_status;
-};
-
-struct mpt_raid_action32 {
-	uint8_t action;
-	uint8_t volume_bus;
-	uint8_t volume_id;
-	uint8_t phys_disk_num;
-	uint32_t action_data_word;
-	uint32_t buf;
-	int len;
-	uint32_t volume_status;
-	uint32_t action_data[4];
-	uint16_t action_status;
-	uint16_t ioc_status;
-	uint8_t write;
-};
-
-#define	MPTIO_READ_CFG_HEADER32	_IOWR('M', 100, struct mpt_cfg_page_req32)
-#define	MPTIO_READ_CFG_PAGE32	_IOWR('M', 101, struct mpt_cfg_page_req32)
-#define	MPTIO_READ_EXT_CFG_HEADER32 _IOWR('M', 102, struct mpt_ext_cfg_page_req32)
-#define	MPTIO_READ_EXT_CFG_PAGE32 _IOWR('M', 103, struct mpt_ext_cfg_page_req32)
-#define	MPTIO_WRITE_CFG_PAGE32	_IOWR('M', 104, struct mpt_cfg_page_req32)
-#define	MPTIO_RAID_ACTION32	_IOWR('M', 105, struct mpt_raid_action32)
-#endif
-
-#endif /* !_MPT_IOCTL_H_ */
diff --git a/include.new/sys/mqueue.h b/include.new/sys/mqueue.h
deleted file mode 100644
index e772355..0000000
--- a/include.new/sys/mqueue.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2005 David Xu <davidxu@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.
- *
- * 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: releng/10.2/sys/sys/mqueue.h 152948 2005-11-30 05:12:03Z davidxu $
- */
-
-#ifndef _SYS_MQUEUE_H_
-#define _SYS_MQUEUE_H_
-
-struct mq_attr {
-	long	mq_flags;	/* Message queue flags. */
-	long	mq_maxmsg;	/* Maximum number of messages. */
-	long	mq_msgsize;	/* Maximum message size. */
-	long	mq_curmsgs;	/* Number of messages currently queued. */
-	long    __reserved[4];  /* Ignored for input, zeroed for output */
-};
-
-#ifdef _KERNEL
-struct thread;
-struct file;
-extern void	(*mq_fdclose)(struct thread *td, int fd, struct file *fp);
-#endif
-#endif
diff --git a/include.new/sys/msg.h b/include.new/sys/msg.h
deleted file mode 100644
index adcfb8d..0000000
--- a/include.new/sys/msg.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/sys/msg.h 220388 2011-04-06 16:59:54Z trasz $ */
-/*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
-
-/*-
- * SVID compatible msg.h file
- *
- * Author:  Daniel Boulet
- *
- * Copyright 1993 Daniel Boulet and RTMX Inc.
- *
- * This system call was implemented by Daniel Boulet under contract from RTMX.
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- */
-
-#ifndef _SYS_MSG_H_
-#define _SYS_MSG_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/ipc.h>
-
-/*
- * The MSG_NOERROR identifier value, the msqid_ds struct and the msg struct
- * are as defined by the SV API Intel 386 Processor Supplement.
- */
-
-#define MSG_NOERROR	010000		/* don't complain about too long msgs */
-
-typedef	unsigned long	msglen_t;
-typedef	unsigned long	msgqnum_t;
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
-    defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
-struct msqid_ds_old {
-	struct	ipc_perm_old msg_perm;	/* msg queue permission bits */
-	struct	msg *msg_first;	/* first message in the queue */
-	struct	msg *msg_last;	/* last message in the queue */
-	msglen_t msg_cbytes;	/* number of bytes in use on the queue */
-	msgqnum_t msg_qnum;	/* number of msgs in the queue */
-	msglen_t msg_qbytes;	/* max # of bytes on the queue */
-	pid_t	msg_lspid;	/* pid of last msgsnd() */
-	pid_t	msg_lrpid;	/* pid of last msgrcv() */
-	time_t	msg_stime;	/* time of last msgsnd() */
-	long	msg_pad1;
-	time_t	msg_rtime;	/* time of last msgrcv() */
-	long	msg_pad2;
-	time_t	msg_ctime;	/* time of last msgctl() */
-	long	msg_pad3;
-	long	msg_pad4[4];
-};
-#endif
-
-/*
- * XXX there seems to be no prefix reserved for this header, so the name
- * "msg" in "struct msg" and the names of all of the nonstandard members
- * (mainly "msg_pad*) are namespace pollution.
- */
-
-struct msqid_ds {
-	struct	ipc_perm msg_perm;	/* msg queue permission bits */
-	struct	msg *msg_first;	/* first message in the queue */
-	struct	msg *msg_last;	/* last message in the queue */
-	msglen_t msg_cbytes;	/* number of bytes in use on the queue */
-	msgqnum_t msg_qnum;	/* number of msgs in the queue */
-	msglen_t msg_qbytes;	/* max # of bytes on the queue */
-	pid_t	msg_lspid;	/* pid of last msgsnd() */
-	pid_t	msg_lrpid;	/* pid of last msgrcv() */
-	time_t	msg_stime;	/* time of last msgsnd() */
-	time_t	msg_rtime;	/* time of last msgrcv() */
-	time_t	msg_ctime;	/* time of last msgctl() */
-};
-
-#if __BSD_VISIBLE
-/*
- * Structure describing a message.  The SVID doesn't suggest any
- * particular name for this structure.  There is a reference in the
- * msgop man page that reads "The structure mymsg is an example of what
- * this user defined buffer might look like, and includes the following
- * members:".  This sentence is followed by two lines equivalent
- * to the mtype and mtext field declarations below.  It isn't clear
- * if "mymsg" refers to the name of the structure type or the name of an
- * instance of the structure...
- */
-struct mymsg {
-	long	mtype;		/* message type (+ve integer) */
-	char	mtext[1];	/* message body */
-};
-#endif
-
-#ifdef _KERNEL
-
-struct msg {
-	struct	msg *msg_next;  /* next msg in the chain */
-	long	msg_type; 	/* type of this message */
-				/* >0 -> type of this message */
-				/* 0 -> free header */
-	u_short	msg_ts;		/* size of this message */
-	short	msg_spot;	/* location of start of msg in buffer */
-	struct	label *label;	/* MAC Framework label */
-};
-
-/*
- * Based on the configuration parameters described in an SVR2 (yes, two)
- * config(1m) man page.
- *
- * Each message is broken up and stored in segments that are msgssz bytes
- * long.  For efficiency reasons, this should be a power of two.  Also,
- * it doesn't make sense if it is less than 8 or greater than about 256.
- * Consequently, msginit in kern/sysv_msg.c checks that msgssz is a power of
- * two between 8 and 1024 inclusive (and panic's if it isn't).
- */
-struct msginfo {
-	int	msgmax,		/* max chars in a message */
-		msgmni,		/* max message queue identifiers */
-		msgmnb,		/* max chars in a queue */
-		msgtql,		/* max messages in system */
-		msgssz,		/* size of a message segment (see notes above) */
-		msgseg;		/* number of message segments */
-};
-extern struct msginfo	msginfo;
-
-/*
- * Kernel wrapper for the user-level structure.
- */
-struct msqid_kernel {
-	/*
-	 * Data structure exposed to user space.
-	 */
-	struct	msqid_ds u;
-
-	/*
-	 * Kernel-private components of the message queue.
-	 */
-	struct	label *label;	/* MAC label */
-	struct	ucred *cred;	/* creator's credentials */
-};
-
-#else /* !_KERNEL */
-
-__BEGIN_DECLS
-int msgctl(int, int, struct msqid_ds *);
-int msgget(key_t, int);
-/* XXX return value should be ssize_t. */
-int msgrcv(int, void *, size_t, long, int);
-int msgsnd(int, const void *, size_t, int);
-#if __BSD_VISIBLE
-int msgsys(int, ...);
-#endif
-__END_DECLS
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_MSG_H_ */
diff --git a/include.new/sys/msgbuf.h b/include.new/sys/msgbuf.h
deleted file mode 100644
index 2b7be73..0000000
--- a/include.new/sys/msgbuf.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1981, 1984, 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.
- * 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.
- *
- *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/msgbuf.h 233135 2012-03-19 00:36:32Z eadler $
- */
-
-#ifndef _SYS_MSGBUF_H_
-#define	_SYS_MSGBUF_H_
-
-#include <sys/lock.h>
-#include <sys/mutex.h>
-
-struct msgbuf {
-	char	   *msg_ptr;		/* pointer to buffer */
-#define	MSG_MAGIC	0x063062
-	u_int	   msg_magic;
-	u_int	   msg_size;		/* size of buffer area */
-	u_int	   msg_wseq;		/* write sequence number */
-	u_int	   msg_rseq;		/* read sequence number */
-	u_int	   msg_cksum;		/* checksum of contents */
-	u_int	   msg_seqmod;		/* range for sequence numbers */
-	int	   msg_lastpri;		/* saved priority value */
-	u_int      msg_flags;
-#define MSGBUF_NEEDNL	0x01	/* set when newline needed */
-	struct mtx msg_lock;		/* mutex to protect the buffer */
-};
-
-/* Normalise a sequence number or a difference between sequence numbers. */
-#define	MSGBUF_SEQNORM(mbp, seq)	(((seq) + (mbp)->msg_seqmod) % \
-    (mbp)->msg_seqmod)
-#define	MSGBUF_SEQ_TO_POS(mbp, seq)	((seq) % (mbp)->msg_size)
-/* Subtract sequence numbers.  Note that only positive values result. */
-#define	MSGBUF_SEQSUB(mbp, seq1, seq2)	(MSGBUF_SEQNORM((mbp), (seq1) - (seq2)))
-
-#ifdef _KERNEL
-extern int	msgbufsize;
-extern int	msgbuftrigger;
-extern struct	msgbuf *msgbufp;
-extern struct	mtx msgbuf_lock;
-
-void	msgbufinit(void *ptr, int size);
-void	msgbuf_addchar(struct msgbuf *mbp, int c);
-void	msgbuf_addstr(struct msgbuf *mbp, int pri, char *str, int filter_cr);
-void	msgbuf_clear(struct msgbuf *mbp);
-void	msgbuf_copy(struct msgbuf *src, struct msgbuf *dst);
-int	msgbuf_getbytes(struct msgbuf *mbp, char *buf, int buflen);
-int	msgbuf_getchar(struct msgbuf *mbp);
-int	msgbuf_getcount(struct msgbuf *mbp);
-void	msgbuf_init(struct msgbuf *mbp, void *ptr, int size);
-int	msgbuf_peekbytes(struct msgbuf *mbp, char *buf, int buflen,
-	    u_int *seqp);
-void	msgbuf_reinit(struct msgbuf *mbp, void *ptr, int size);
-
-#ifndef MSGBUF_SIZE
-#define	MSGBUF_SIZE	(32768 * 3)
-#endif
-#endif /* KERNEL */
-
-#endif /* !_SYS_MSGBUF_H_ */
diff --git a/include.new/sys/mtio.h b/include.new/sys/mtio.h
deleted file mode 100644
index 919c59c..0000000
--- a/include.new/sys/mtio.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)mtio.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/mtio.h 280438 2015-03-24 14:36:10Z ken $
- */
-
-#ifndef	_SYS_MTIO_H_
-#define	_SYS_MTIO_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/*
- * Structures and definitions for mag tape io control commands
- */
-
-/* structure for MTIOCTOP - mag tape op command */
-struct mtop {
-	short	mt_op;		/* operations defined below */
-	int32_t	mt_count;	/* how many of them */
-};
-
-/* operations */
-#define MTWEOF		0	/* write an end-of-file record */
-#define MTFSF		1	/* forward space file */
-#define MTBSF		2	/* backward space file */
-#define MTFSR		3	/* forward space record */
-#define MTBSR		4	/* backward space record */
-#define MTREW		5	/* rewind */
-#define MTOFFL		6	/* rewind and put the drive offline */
-#define MTNOP		7	/* no operation, sets status only */
-#define MTCACHE		8	/* enable controller cache */
-#define MTNOCACHE	9	/* disable controller cache */
-
-#if defined(__FreeBSD__)
-/* Set block size for device. If device is a variable size dev		*/
-/* a non zero parameter will change the device to a fixed block size	*/
-/* device with block size set to that of the parameter passed in.	*/
-/* Resetting the block size to 0 will restore the device to a variable	*/
-/* block size device. */
-
-#define MTSETBSIZ	10
-
-/* Set density values for device. Sets the value for the opened mode only. */
-
-#define MTSETDNSTY	11
-
-#define MTERASE		12	/* erase to EOM */
-#define MTEOD		13	/* Space to EOM */
-#define MTCOMP		14	/* select compression mode 0=off, 1=def */
-#define MTRETENS	15	/* re-tension tape */
-#define MTWSS		16	/* write setmark(s) */
-#define MTFSS		17	/* forward space setmark */
-#define MTBSS		18	/* backward space setmark */
-#define MTLOAD		19	/* load tape in drive */
-#define MTWEOFI		20	/* write an end-of-file record without waiting*/
-
-#define MT_COMP_ENABLE		0xffffffff
-#define MT_COMP_DISABLED	0xfffffffe
-#define MT_COMP_UNSUPP		0xfffffffd
-
-/*
- * Values in mt_dsreg that say what the device is doing
- */
-#define	MTIO_DSREG_NIL	0	/* Unknown */
-#define	MTIO_DSREG_REST	1	/* Doing Nothing */
-#define	MTIO_DSREG_RBSY	2	/* Communicating with tape (but no motion) */
-#define	MTIO_DSREG_WR	20	/* Writing */
-#define	MTIO_DSREG_FMK	21	/* Writing Filemarks */
-#define	MTIO_DSREG_ZER	22	/* Erasing */
-#define	MTIO_DSREG_RD	30	/* Reading */
-#define	MTIO_DSREG_FWD	40	/* Spacing Forward */
-#define	MTIO_DSREG_REV	41	/* Spacing Reverse */
-#define	MTIO_DSREG_POS	42	/* Hardware Positioning (direction unknown) */
-#define	MTIO_DSREG_REW	43	/* Rewinding */
-#define	MTIO_DSREG_TEN	44	/* Retensioning */
-#define	MTIO_DSREG_UNL	45	/* Unloading */
-#define	MTIO_DSREG_LD	46	/* Loading */
-
-#endif	/* __FreeBSD__ */
-
-/* structure for MTIOCGET - mag tape get status command */
-
-struct mtget {
-	short	mt_type;	/* type of magtape device */
-/* the following two registers are grossly device dependent */
-	short	mt_dsreg;	/* ``drive status'' register */
-	short	mt_erreg;	/* ``error'' register */
-/* end device-dependent registers */
-	/*
-	 * Note that the residual count, while maintained, may be
-	 * be nonsense because the size of the residual may (greatly)
-	 * exceed 32 K-bytes. Use the MTIOCERRSTAT ioctl to get a
-	 * more accurate count.
-	 */
-	short	mt_resid;	/* residual count */
-#if defined (__FreeBSD__)
-	int32_t mt_blksiz;	/* presently operating blocksize */
-	int32_t mt_density;	/* presently operating density */
-	uint32_t mt_comp;	/* presently operating compression */
-	int32_t mt_blksiz0;	/* blocksize for mode 0 */
-	int32_t mt_blksiz1;	/* blocksize for mode 1 */
-	int32_t mt_blksiz2;	/* blocksize for mode 2 */
-	int32_t mt_blksiz3;	/* blocksize for mode 3 */
-	int32_t mt_density0;	/* density for mode 0 */
-	int32_t mt_density1;	/* density for mode 1 */
-	int32_t mt_density2;	/* density for mode 2 */
-	int32_t mt_density3;	/* density for mode 3 */
-/* the following are not yet implemented */
-	uint32_t mt_comp0;	/* compression type for mode 0 */
-	uint32_t mt_comp1;	/* compression type for mode 1 */
-	uint32_t mt_comp2;	/* compression type for mode 2 */
-	uint32_t mt_comp3;	/* compression type for mode 3 */
-/* end not yet implemented */
-#endif
-	int32_t	mt_fileno;	/* relative file number of current position */
-	int32_t	mt_blkno;	/* relative block number of current position */
-};
-
-/* structure for MTIOCERRSTAT - tape get error status command */
-/* really only supported for SCSI tapes right now */
-struct scsi_tape_errors {
-	/*
-	 * These are latched from the last command that had a SCSI
-	 * Check Condition noted for these operations. The act
-	 * of issuing an MTIOCERRSTAT unlatches and clears them.
-	 */
-	u_int8_t io_sense[32];	/* Last Sense Data For Data I/O */
-	int32_t io_resid;	/* residual count from last Data I/O */
-	u_int8_t io_cdb[16];	/* Command that Caused the Last Data Sense */
-	u_int8_t ctl_sense[32];	/* Last Sense Data For Control I/O */
-	int32_t ctl_resid;	/* residual count from last Control I/O */
-	u_int8_t ctl_cdb[16];	/* Command that Caused the Last Control Sense */
-	/*
-	 * These are the read and write cumulative error counters.
-	 * (how to reset cumulative error counters is not yet defined).
-	 * (not implemented as yet but space is being reserved for them)
-	 */
-	struct {
-		uint32_t retries;	/* total # retries performed */
-		uint32_t corrected;	/* total # corrections performed */
-		uint32_t processed;	/* total # corrections successful */
-		uint32_t failures;	/* total # corrections/retries failed */
-		u_int64_t nbytes;	/* total # bytes processed */
-	} wterr, rderr;
-};
-	
-union mterrstat {
-	struct scsi_tape_errors scsi_errstat;
-	char _reserved_padding[256];
-};
-
-struct mtrblim {
-	uint32_t granularity;
-	uint32_t min_block_length;
-	uint32_t max_block_length;
-};
-
-typedef enum {
-	MT_LOCATE_DEST_OBJECT	= 0x00,
-	MT_LOCATE_DEST_FILE	= 0x01,
-	MT_LOCATE_DEST_SET	= 0x02,
-	MT_LOCATE_DEST_EOD	= 0x03
-} mt_locate_dest_type;
-
-typedef enum {
-	MT_LOCATE_BAM_IMPLICIT	= 0x00,
-	MT_LOCATE_BAM_EXPLICIT	= 0x01
-} mt_locate_bam;
-
-typedef enum {
-	MT_LOCATE_FLAG_IMMED		= 0x01,
-	MT_LOCATE_FLAG_CHANGE_PART	= 0x02
-} mt_locate_flags;
-
-struct mtlocate {
-	mt_locate_flags		flags;
-	mt_locate_dest_type 	dest_type;
-	mt_locate_bam		block_address_mode;
-	int64_t			partition;
-	uint64_t		logical_id;
-	uint8_t			reserved[64];
-};
-
-typedef enum {
-	MT_EXT_GET_NONE,
-	MT_EXT_GET_OK,
-	MT_EXT_GET_NEED_MORE_SPACE,
-	MT_EXT_GET_ERROR
-} mt_ext_get_status;
-
-struct mtextget {
-	uint32_t		alloc_len;
-	char			*status_xml;
-	uint32_t		fill_len;
-	mt_ext_get_status	status;
-	char			error_str[128];
-	uint8_t			reserved[64];
-};
-
-#define	MT_EXT_GET_ROOT_NAME		"mtextget"
-#define	MT_DENSITY_ROOT_NAME		"mtdensity"
-#define	MT_MEDIA_DENSITY_NAME		"media_density"
-#define	MT_DENSITY_REPORT_NAME		"density_report"
-#define	MT_MEDIUM_TYPE_REPORT_NAME	"medium_type_report"
-#define	MT_MEDIA_REPORT_NAME		"media_report"
-#define	MT_DENSITY_ENTRY_NAME		"density_entry"
-
-#define	MT_DENS_WRITE_OK		0x80
-#define	MT_DENS_DUP			0x40
-#define	MT_DENS_DEFLT			0x20
-
-
-#define	MT_PARAM_FIXED_STR_LEN	32
-union mt_param_value {
-	int64_t		value_signed;
-	uint64_t	value_unsigned;
-	char		*value_var_str;
-	char		value_fixed_str[MT_PARAM_FIXED_STR_LEN];
-	uint8_t		reserved[64];
-};
-
-typedef enum {
-	MT_PARAM_SET_NONE,
-	MT_PARAM_SET_SIGNED,
-	MT_PARAM_SET_UNSIGNED,
-	MT_PARAM_SET_VAR_STR,
-	MT_PARAM_SET_FIXED_STR
-} mt_param_set_type;
-
-typedef enum {
-	MT_PARAM_STATUS_NONE,
-	MT_PARAM_STATUS_OK,
-	MT_PARAM_STATUS_ERROR
-} mt_param_set_status;
-
-#define	MT_PARAM_VALUE_NAME_LEN	64
-struct mtparamset {
-	char			value_name[MT_PARAM_VALUE_NAME_LEN];
-	mt_param_set_type	value_type;
-	int			value_len;
-	union mt_param_value	value;
-	mt_param_set_status	status;
-	char			error_str[128];
-};
-
-#define	MT_PARAM_ROOT_NAME	"mtparamget"
-#define	MT_PROTECTION_NAME	"protection"
-
-/*
- * Set a list of parameters.
- */
-struct mtsetlist {
-	int num_params;
-	int param_len;
-	struct mtparamset *params;
-};
-
-/*
- * Constants for mt_type byte.  These are the same
- * for controllers compatible with the types listed.
- */
-#define	MT_ISTS		0x01		/* TS-11 */
-#define	MT_ISHT		0x02		/* TM03 Massbus: TE16, TU45, TU77 */
-#define	MT_ISTM		0x03		/* TM11/TE10 Unibus */
-#define	MT_ISMT		0x04		/* TM78/TU78 Massbus */
-#define	MT_ISUT		0x05		/* SI TU-45 emulation on Unibus */
-#define	MT_ISCPC	0x06		/* SUN */
-#define	MT_ISAR		0x07		/* SUN */
-#define	MT_ISTMSCP	0x08		/* DEC TMSCP protocol (TU81, TK50) */
-#define MT_ISCY		0x09		/* CCI Cipher */
-#define MT_ISCT		0x0a		/* HP 1/4 tape */
-#define MT_ISFHP	0x0b		/* HP 7980 1/2 tape */
-#define MT_ISEXABYTE	0x0c		/* Exabyte */
-#define MT_ISEXA8200	0x0c		/* Exabyte EXB-8200 */
-#define MT_ISEXA8500	0x0d		/* Exabyte EXB-8500 */
-#define MT_ISVIPER1	0x0e		/* Archive Viper-150 */
-#define MT_ISPYTHON	0x0f		/* Archive Python (DAT) */
-#define MT_ISHPDAT	0x10		/* HP 35450A DAT drive */
-#define MT_ISMFOUR	0x11		/* M4 Data 1/2 9track drive */
-#define MT_ISTK50	0x12		/* DEC SCSI TK50 */
-#define MT_ISMT02	0x13		/* Emulex MT02 SCSI tape controller */
-
-/* mag tape io control commands */
-#define	MTIOCTOP	_IOW('m', 1, struct mtop)	/* do a mag tape op */
-#define	MTIOCGET	_IOR('m', 2, struct mtget)	/* get tape status */
-/* these two do not appear to be used anywhere */
-#define MTIOCIEOT	_IO('m', 3)			/* ignore EOT error */
-#define MTIOCEEOT	_IO('m', 4)			/* enable EOT error */
-/*
- * When more SCSI-3 SSC (streaming device) devices are out there
- * that support the full 32 byte type 2 structure, we'll have to
- * rethink these ioctls to support all the entities they haul into
- * the picture (64 bit blocks, logical file record numbers, etc..).
- */
-#define	MTIOCRDSPOS	_IOR('m', 5, uint32_t)	/* get logical blk addr */
-#define	MTIOCRDHPOS	_IOR('m', 6, uint32_t)	/* get hardware blk addr */
-#define	MTIOCSLOCATE	_IOW('m', 5, uint32_t)	/* seek to logical blk addr */
-#define	MTIOCHLOCATE	_IOW('m', 6, uint32_t)	/* seek to hardware blk addr */
-#define	MTIOCERRSTAT	_IOR('m', 7, union mterrstat)	/* get tape errors */
-
-/*
- * Set EOT model- argument is number of filemarks to end a tape with.
- * Note that not all possible values will be accepted.
- */
-#define	MTIOCSETEOTMODEL	_IOW('m', 8, uint32_t)
-/* Get current EOT model */
-#define	MTIOCGETEOTMODEL	_IOR('m', 8, uint32_t)
-
-#define	MTIOCRBLIM	_IOR('m', 9, struct mtrblim)    /* get block limits */
-#define	MTIOCEXTLOCATE	_IOW('m', 10, struct mtlocate)  /* seek to position */
-#define	MTIOCEXTGET	_IOWR('m', 11, struct mtextget) /* get tape status */
-#define	MTIOCPARAMGET	_IOWR('m', 12, struct mtextget) /* get tape params */
-#define	MTIOCPARAMSET	_IOWR('m', 13, struct mtparamset) /* set tape params */
-#define	MTIOCSETLIST	_IOWR('m', 14, struct mtsetlist) /* set N params */
-
-#ifndef _KERNEL
-#define	DEFTAPE	"/dev/nsa0"
-#endif
-
-#endif /* !_SYS_MTIO_H_ */
diff --git a/include.new/sys/mutex.h b/include.new/sys/mutex.h
deleted file mode 100644
index 65dc4ed..0000000
--- a/include.new/sys/mutex.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/*-
- * Copyright (c) 1997 Berkeley Software Design, Inc. 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. Berkeley Software Design Inc's name may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``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 BERKELEY SOFTWARE DESIGN INC 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.
- *
- *	from BSDI $Id: mutex.h 103 2016-01-12 05:32:24Z reddawg $
- * $FreeBSD: releng/10.2/sys/sys/mutex.h 251220 2013-06-01 11:31:09Z jhb $
- */
-
-#ifndef _SYS_MUTEX_H_
-#define _SYS_MUTEX_H_
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-
-#ifdef _KERNEL
-#include <sys/pcpu.h>
-#include <sys/lock_profile.h>
-#include <sys/lockstat.h>
-#include <machine/atomic.h>
-#include <machine/cpufunc.h>
-
-/*
- * Mutex types and options passed to mtx_init().  MTX_QUIET and MTX_DUPOK
- * can also be passed in.
- */
-#define	MTX_DEF		0x00000000	/* DEFAULT (sleep) lock */ 
-#define MTX_SPIN	0x00000001	/* Spin lock (disables interrupts) */
-#define MTX_RECURSE	0x00000004	/* Option: lock allowed to recurse */
-#define	MTX_NOWITNESS	0x00000008	/* Don't do any witness checking. */
-#define MTX_NOPROFILE   0x00000020	/* Don't profile this lock */
-
-/*
- * Option flags passed to certain lock/unlock routines, through the use
- * of corresponding mtx_{lock,unlock}_flags() interface macros.
- */
-#define	MTX_QUIET	LOP_QUIET	/* Don't log a mutex event */
-#define	MTX_DUPOK	LOP_DUPOK	/* Don't log a duplicate acquire */
-
-/*
- * State bits kept in mutex->mtx_lock, for the DEFAULT lock type. None of this,
- * with the exception of MTX_UNOWNED, applies to spin locks.
- */
-#define	MTX_RECURSED	0x00000001	/* lock recursed (for MTX_DEF only) */
-#define	MTX_CONTESTED	0x00000002	/* lock contested (for MTX_DEF only) */
-#define MTX_UNOWNED	0x00000004	/* Cookie for free mutex */
-#define	MTX_FLAGMASK	(MTX_RECURSED | MTX_CONTESTED | MTX_UNOWNED)
-
-/*
- * Value stored in mutex->mtx_lock to denote a destroyed mutex.
- */
-#define	MTX_DESTROYED	(MTX_CONTESTED | MTX_UNOWNED)
-
-/*
- * Prototypes
- *
- * NOTE: Functions prepended with `_' (underscore) are exported to other parts
- *	 of the kernel via macros, thus allowing us to use the cpp LOCK_FILE
- *	 and LOCK_LINE or for hiding the lock cookie crunching to the
- *	 consumers. These functions should not be called directly by any
- *	 code using the API. Their macros cover their functionality.
- *	 Functions with a `_' suffix are the entrypoint for the common
- *	 KPI covering both compat shims and fast path case.  These can be
- *	 used by consumers willing to pass options, file and line
- *	 informations, in an option-independent way.
- *
- * [See below for descriptions]
- *
- */
-void	_mtx_init(volatile uintptr_t *c, const char *name, const char *type,
-	    int opts);
-void	_mtx_destroy(volatile uintptr_t *c);
-void	mtx_sysinit(void *arg);
-int	_mtx_trylock_flags_(volatile uintptr_t *c, int opts, const char *file,
-	    int line);
-void	mutex_init(void);
-void	__mtx_lock_sleep(volatile uintptr_t *c, uintptr_t tid, int opts,
-	    const char *file, int line);
-void	__mtx_unlock_sleep(volatile uintptr_t *c, int opts, const char *file,
-	    int line);
-#ifdef SMP
-void	_mtx_lock_spin_cookie(volatile uintptr_t *c, uintptr_t tid, int opts,
-	    const char *file, int line);
-#endif
-void	__mtx_lock_flags(volatile uintptr_t *c, int opts, const char *file,
-	    int line);
-void	__mtx_unlock_flags(volatile uintptr_t *c, int opts, const char *file,
-	    int line);
-void	__mtx_lock_spin_flags(volatile uintptr_t *c, int opts, const char *file,
-	     int line);
-void	__mtx_unlock_spin_flags(volatile uintptr_t *c, int opts,
-	    const char *file, int line);
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-void	__mtx_assert(const volatile uintptr_t *c, int what, const char *file,
-	    int line);
-#endif
-void	thread_lock_flags_(struct thread *, int, const char *, int);
-
-#define	thread_lock(tdp)						\
-	thread_lock_flags_((tdp), 0, __FILE__, __LINE__)
-#define	thread_lock_flags(tdp, opt)					\
-	thread_lock_flags_((tdp), (opt), __FILE__, __LINE__)
-#define	thread_unlock(tdp)						\
-       mtx_unlock_spin((tdp)->td_lock)
-
-/*
- * Top-level macros to provide lock cookie once the actual mtx is passed.
- * They will also prevent passing a malformed object to the mtx KPI by
- * failing compilation as the mtx_lock reserved member will not be found.
- */
-#define	mtx_init(m, n, t, o)						\
-	_mtx_init(&(m)->mtx_lock, n, t, o)
-#define	mtx_destroy(m)							\
-	_mtx_destroy(&(m)->mtx_lock)
-#define	mtx_trylock_flags_(m, o, f, l)					\
-	_mtx_trylock_flags_(&(m)->mtx_lock, o, f, l)
-#define	_mtx_lock_sleep(m, t, o, f, l)					\
-	__mtx_lock_sleep(&(m)->mtx_lock, t, o, f, l)
-#define	_mtx_unlock_sleep(m, o, f, l)					\
-	__mtx_unlock_sleep(&(m)->mtx_lock, o, f, l)
-#ifdef SMP
-#define	_mtx_lock_spin(m, t, o, f, l)					\
-	_mtx_lock_spin_cookie(&(m)->mtx_lock, t, o, f, l)
-#endif
-#define	_mtx_lock_flags(m, o, f, l)					\
-	__mtx_lock_flags(&(m)->mtx_lock, o, f, l)
-#define	_mtx_unlock_flags(m, o, f, l)					\
-	__mtx_unlock_flags(&(m)->mtx_lock, o, f, l)
-#define	_mtx_lock_spin_flags(m, o, f, l)				\
-	__mtx_lock_spin_flags(&(m)->mtx_lock, o, f, l)
-#define	_mtx_unlock_spin_flags(m, o, f, l)				\
-	__mtx_unlock_spin_flags(&(m)->mtx_lock, o, f, l)
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-#define	_mtx_assert(m, w, f, l)						\
-	__mtx_assert(&(m)->mtx_lock, w, f, l)
-#endif
-
-#define	mtx_recurse	lock_object.lo_data
-
-/* Very simple operations on mtx_lock. */
-
-/* Try to obtain mtx_lock once. */
-#define _mtx_obtain_lock(mp, tid)					\
-	atomic_cmpset_acq_ptr(&(mp)->mtx_lock, MTX_UNOWNED, (tid))
-
-/* Try to release mtx_lock if it is unrecursed and uncontested. */
-#define _mtx_release_lock(mp, tid)					\
-	atomic_cmpset_rel_ptr(&(mp)->mtx_lock, (tid), MTX_UNOWNED)
-
-/* Release mtx_lock quickly, assuming we own it. */
-#define _mtx_release_lock_quick(mp)					\
-	atomic_store_rel_ptr(&(mp)->mtx_lock, MTX_UNOWNED)
-
-/*
- * Full lock operations that are suitable to be inlined in non-debug
- * kernels.  If the lock cannot be acquired or released trivially then
- * the work is deferred to another function.
- */
-
-/* Lock a normal mutex. */
-#define __mtx_lock(mp, tid, opts, file, line) do {			\
-	uintptr_t _tid = (uintptr_t)(tid);				\
-									\
-	if (!_mtx_obtain_lock((mp), _tid))				\
-		_mtx_lock_sleep((mp), _tid, (opts), (file), (line));	\
-	else								\
-              	LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(LS_MTX_LOCK_ACQUIRE, \
-		    mp, 0, 0, (file), (line));				\
-} while (0)
-
-/*
- * Lock a spin mutex.  For spinlocks, we handle recursion inline (it
- * turns out that function calls can be significantly expensive on
- * some architectures).  Since spin locks are not _too_ common,
- * inlining this code is not too big a deal.
- */
-#ifdef SMP
-#define __mtx_lock_spin(mp, tid, opts, file, line) do {			\
-	uintptr_t _tid = (uintptr_t)(tid);				\
-									\
-	spinlock_enter();						\
-	if (!_mtx_obtain_lock((mp), _tid)) {				\
-		if ((mp)->mtx_lock == _tid)				\
-			(mp)->mtx_recurse++;				\
-		else							\
-			_mtx_lock_spin((mp), _tid, (opts), (file), (line)); \
-	} else 								\
-              	LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(LS_MTX_SPIN_LOCK_ACQUIRE, \
-		    mp, 0, 0, (file), (line));				\
-} while (0)
-#else /* SMP */
-#define __mtx_lock_spin(mp, tid, opts, file, line) do {			\
-	uintptr_t _tid = (uintptr_t)(tid);				\
-									\
-	spinlock_enter();						\
-	if ((mp)->mtx_lock == _tid)					\
-		(mp)->mtx_recurse++;					\
-	else {								\
-		KASSERT((mp)->mtx_lock == MTX_UNOWNED, ("corrupt spinlock")); \
-		(mp)->mtx_lock = _tid;					\
-	}								\
-} while (0)
-#endif /* SMP */
-
-/* Unlock a normal mutex. */
-#define __mtx_unlock(mp, tid, opts, file, line) do {			\
-	uintptr_t _tid = (uintptr_t)(tid);				\
-									\
-	if (!_mtx_release_lock((mp), _tid))				\
-		_mtx_unlock_sleep((mp), (opts), (file), (line));	\
-} while (0)
-
-/*
- * Unlock a spin mutex.  For spinlocks, we can handle everything
- * inline, as it's pretty simple and a function call would be too
- * expensive (at least on some architectures).  Since spin locks are
- * not _too_ common, inlining this code is not too big a deal.
- *
- * Since we always perform a spinlock_enter() when attempting to acquire a
- * spin lock, we need to always perform a matching spinlock_exit() when
- * releasing a spin lock.  This includes the recursion cases.
- */
-#ifdef SMP
-#define __mtx_unlock_spin(mp) do {					\
-	if (mtx_recursed((mp)))						\
-		(mp)->mtx_recurse--;					\
-	else {								\
-		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_SPIN_UNLOCK_RELEASE, \
-			mp);						\
-		_mtx_release_lock_quick((mp));				\
-	}                                                               \
-	spinlock_exit();				                \
-} while (0)
-#else /* SMP */
-#define __mtx_unlock_spin(mp) do {					\
-	if (mtx_recursed((mp)))						\
-		(mp)->mtx_recurse--;					\
-	else {								\
-		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_SPIN_UNLOCK_RELEASE, \
-			mp);						\
-		(mp)->mtx_lock = MTX_UNOWNED;				\
-	}                                                               \
-	spinlock_exit();						\
-} while (0)
-#endif /* SMP */
-
-/*
- * Exported lock manipulation interface.
- *
- * mtx_lock(m) locks MTX_DEF mutex `m'
- *
- * mtx_lock_spin(m) locks MTX_SPIN mutex `m'
- *
- * mtx_unlock(m) unlocks MTX_DEF mutex `m'
- *
- * mtx_unlock_spin(m) unlocks MTX_SPIN mutex `m'
- *
- * mtx_lock_spin_flags(m, opts) and mtx_lock_flags(m, opts) locks mutex `m'
- *     and passes option flags `opts' to the "hard" function, if required.
- *     With these routines, it is possible to pass flags such as MTX_QUIET
- *     to the appropriate lock manipulation routines.
- *
- * mtx_trylock(m) attempts to acquire MTX_DEF mutex `m' but doesn't sleep if
- *     it cannot. Rather, it returns 0 on failure and non-zero on success.
- *     It does NOT handle recursion as we assume that if a caller is properly
- *     using this part of the interface, he will know that the lock in question
- *     is _not_ recursed.
- *
- * mtx_trylock_flags(m, opts) is used the same way as mtx_trylock() but accepts
- *     relevant option flags `opts.'
- *
- * mtx_initialized(m) returns non-zero if the lock `m' has been initialized.
- *
- * mtx_owned(m) returns non-zero if the current thread owns the lock `m'
- *
- * mtx_recursed(m) returns non-zero if the lock `m' is presently recursed.
- */ 
-#define mtx_lock(m)		mtx_lock_flags((m), 0)
-#define mtx_lock_spin(m)	mtx_lock_spin_flags((m), 0)
-#define mtx_trylock(m)		mtx_trylock_flags((m), 0)
-#define mtx_unlock(m)		mtx_unlock_flags((m), 0)
-#define mtx_unlock_spin(m)	mtx_unlock_spin_flags((m), 0)
-
-struct mtx_pool;
-
-struct mtx_pool *mtx_pool_create(const char *mtx_name, int pool_size, int opts);
-void mtx_pool_destroy(struct mtx_pool **poolp);
-struct mtx *mtx_pool_find(struct mtx_pool *pool, void *ptr);
-struct mtx *mtx_pool_alloc(struct mtx_pool *pool);
-#define mtx_pool_lock(pool, ptr)					\
-	mtx_lock(mtx_pool_find((pool), (ptr)))
-#define mtx_pool_lock_spin(pool, ptr)					\
-	mtx_lock_spin(mtx_pool_find((pool), (ptr)))
-#define mtx_pool_unlock(pool, ptr)					\
-	mtx_unlock(mtx_pool_find((pool), (ptr)))
-#define mtx_pool_unlock_spin(pool, ptr)					\
-	mtx_unlock_spin(mtx_pool_find((pool), (ptr)))
-
-/*
- * mtxpool_lockbuilder is a pool of sleep locks that is not witness
- * checked and should only be used for building higher level locks.
- *
- * mtxpool_sleep is a general purpose pool of sleep mutexes.
- */
-extern struct mtx_pool *mtxpool_lockbuilder;
-extern struct mtx_pool *mtxpool_sleep;
-
-#ifndef LOCK_DEBUG
-#error LOCK_DEBUG not defined, include <sys/lock.h> before <sys/mutex.h>
-#endif
-#if LOCK_DEBUG > 0 || defined(MUTEX_NOINLINE)
-#define	mtx_lock_flags_(m, opts, file, line)				\
-	_mtx_lock_flags((m), (opts), (file), (line))
-#define	mtx_unlock_flags_(m, opts, file, line)				\
-	_mtx_unlock_flags((m), (opts), (file), (line))
-#define	mtx_lock_spin_flags_(m, opts, file, line)			\
-	_mtx_lock_spin_flags((m), (opts), (file), (line))
-#define	mtx_unlock_spin_flags_(m, opts, file, line)			\
-	_mtx_unlock_spin_flags((m), (opts), (file), (line))
-#else	/* LOCK_DEBUG == 0 && !MUTEX_NOINLINE */
-#define	mtx_lock_flags_(m, opts, file, line)				\
-	__mtx_lock((m), curthread, (opts), (file), (line))
-#define	mtx_unlock_flags_(m, opts, file, line)				\
-	__mtx_unlock((m), curthread, (opts), (file), (line))
-#define	mtx_lock_spin_flags_(m, opts, file, line)			\
-	__mtx_lock_spin((m), curthread, (opts), (file), (line))
-#define	mtx_unlock_spin_flags_(m, opts, file, line)			\
-	__mtx_unlock_spin((m))
-#endif	/* LOCK_DEBUG > 0 || MUTEX_NOINLINE */
-
-#ifdef INVARIANTS
-#define	mtx_assert_(m, what, file, line)				\
-	_mtx_assert((m), (what), (file), (line))
-
-#define GIANT_REQUIRED	mtx_assert_(&Giant, MA_OWNED, __FILE__, __LINE__)
-
-#else	/* INVARIANTS */
-#define mtx_assert_(m, what, file, line)	(void)0
-#define GIANT_REQUIRED
-#endif	/* INVARIANTS */
-
-#define	mtx_lock_flags(m, opts)						\
-	mtx_lock_flags_((m), (opts), LOCK_FILE, LOCK_LINE)
-#define	mtx_unlock_flags(m, opts)					\
-	mtx_unlock_flags_((m), (opts), LOCK_FILE, LOCK_LINE)
-#define	mtx_lock_spin_flags(m, opts)					\
-	mtx_lock_spin_flags_((m), (opts), LOCK_FILE, LOCK_LINE)
-#define	mtx_unlock_spin_flags(m, opts)					\
-	mtx_unlock_spin_flags_((m), (opts), LOCK_FILE, LOCK_LINE)
-#define mtx_trylock_flags(m, opts)					\
-	mtx_trylock_flags_((m), (opts), LOCK_FILE, LOCK_LINE)
-#define	mtx_assert(m, what)						\
-	mtx_assert_((m), (what), __FILE__, __LINE__)
-
-#define	mtx_sleep(chan, mtx, pri, wmesg, timo)				\
-	_sleep((chan), &(mtx)->lock_object, (pri), (wmesg),		\
-	    tick_sbt * (timo), 0, C_HARDCLOCK)
-
-#define	mtx_initialized(m)	lock_initalized(&(m)->lock_object)
-
-#define mtx_owned(m)	(((m)->mtx_lock & ~MTX_FLAGMASK) == (uintptr_t)curthread)
-
-#define mtx_recursed(m)	((m)->mtx_recurse != 0)
-
-#define mtx_name(m)	((m)->lock_object.lo_name)
-
-/*
- * Global locks.
- */
-extern struct mtx Giant;
-extern struct mtx blocked_lock;
-
-/*
- * Giant lock manipulation and clean exit macros.
- * Used to replace return with an exit Giant and return.
- *
- * Note that DROP_GIANT*() needs to be paired with PICKUP_GIANT() 
- * The #ifndef is to allow lint-like tools to redefine DROP_GIANT.
- */
-#ifndef DROP_GIANT
-#define DROP_GIANT()							\
-do {									\
-	int _giantcnt = 0;						\
-	WITNESS_SAVE_DECL(Giant);					\
-									\
-	if (mtx_owned(&Giant)) {					\
-		WITNESS_SAVE(&Giant.lock_object, Giant);		\
-		for (_giantcnt = 0; mtx_owned(&Giant) &&		\
-		    !SCHEDULER_STOPPED(); _giantcnt++)			\
-			mtx_unlock(&Giant);				\
-	}
-
-#define PICKUP_GIANT()							\
-	PARTIAL_PICKUP_GIANT();						\
-} while (0)
-
-#define PARTIAL_PICKUP_GIANT()						\
-	mtx_assert(&Giant, MA_NOTOWNED);				\
-	if (_giantcnt > 0) {						\
-		while (_giantcnt--)					\
-			mtx_lock(&Giant);				\
-		WITNESS_RESTORE(&Giant.lock_object, Giant);		\
-	}
-#endif
-
-struct mtx_args {
-	void		*ma_mtx;
-	const char 	*ma_desc;
-	int		 ma_opts;
-};
-
-#define	MTX_SYSINIT(name, mtx, desc, opts)				\
-	static struct mtx_args name##_args = {				\
-		(mtx),							\
-		(desc),							\
-		(opts)							\
-	};								\
-	SYSINIT(name##_mtx_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    mtx_sysinit, &name##_args);					\
-	SYSUNINIT(name##_mtx_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    _mtx_destroy, __DEVOLATILE(void *, &(mtx)->mtx_lock))
-
-/*
- * The INVARIANTS-enabled mtx_assert() functionality.
- *
- * The constants need to be defined for INVARIANT_SUPPORT infrastructure
- * support as _mtx_assert() itself uses them and the latter implies that
- * _mtx_assert() must build.
- */
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-#define MA_OWNED	LA_XLOCKED
-#define MA_NOTOWNED	LA_UNLOCKED
-#define MA_RECURSED	LA_RECURSED
-#define MA_NOTRECURSED	LA_NOTRECURSED
-#endif
-
-/*
- * Common lock type names.
- */
-#define	MTX_NETWORK_LOCK	"network driver"
-
-#endif	/* _KERNEL */
-#endif	/* _SYS_MUTEX_H_ */
diff --git a/include.new/sys/namei.h b/include.new/sys/namei.h
deleted file mode 100644
index 1a34003..0000000
--- a/include.new/sys/namei.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * Copyright (c) 1985, 1989, 1991, 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.
- * 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.
- *
- *	@(#)namei.h	8.5 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/sys/namei.h 255219 2013-09-05 00:09:56Z pjd $
- */
-
-#ifndef _SYS_NAMEI_H_
-#define	_SYS_NAMEI_H_
-
-#include <sys/caprights.h>
-#include <sys/filedesc.h>
-#include <sys/queue.h>
-#include <sys/uio.h>
-
-struct componentname {
-	/*
-	 * Arguments to lookup.
-	 */
-	u_long	cn_nameiop;	/* namei operation */
-	u_int64_t cn_flags;	/* flags to namei */
-	struct	thread *cn_thread;/* thread requesting lookup */
-	struct	ucred *cn_cred;	/* credentials */
-	int	cn_lkflags;	/* Lock flags LK_EXCLUSIVE or LK_SHARED */
-	/*
-	 * Shared between lookup and commit routines.
-	 */
-	char	*cn_pnbuf;	/* pathname buffer */
-	char	*cn_nameptr;	/* pointer to looked up name */
-	long	cn_namelen;	/* length of looked up component */
-	long	cn_consume;	/* chars to consume in lookup() */
-};
-
-/*
- * Encapsulation of namei parameters.
- */
-struct nameidata {
-	/*
-	 * Arguments to namei/lookup.
-	 */
-	const	char *ni_dirp;		/* pathname pointer */
-	enum	uio_seg ni_segflg;	/* location of pathname */
-	cap_rights_t ni_rightsneeded;	/* rights required to look up vnode */
-	/*
-	 * Arguments to lookup.
-	 */
-	struct  vnode *ni_startdir;	/* starting directory */
-	struct	vnode *ni_rootdir;	/* logical root directory */
-	struct	vnode *ni_topdir;	/* logical top directory */
-	int	ni_dirfd;		/* starting directory for *at functions */
-	int	ni_strictrelative;	/* relative lookup only; no '..' */
-	/*
-	 * Results: returned from namei
-	 */
-	struct filecaps ni_filecaps;	/* rights the *at base has */
-	/*
-	 * Results: returned from/manipulated by lookup
-	 */
-	struct	vnode *ni_vp;		/* vnode of result */
-	struct	vnode *ni_dvp;		/* vnode of intermediate directory */
-	/*
-	 * Shared between namei and lookup/commit routines.
-	 */
-	size_t	ni_pathlen;		/* remaining chars in path */
-	char	*ni_next;		/* next location in pathname */
-	u_int	ni_loopcnt;		/* count of symlinks encountered */
-	/*
-	 * Lookup parameters: this structure describes the subset of
-	 * information from the nameidata structure that is passed
-	 * through the VOP interface.
-	 */
-	struct componentname ni_cnd;
-};
-
-#ifdef _KERNEL
-/*
- * namei operations
- */
-#define	LOOKUP		0	/* perform name lookup only */
-#define	CREATE		1	/* setup for file creation */
-#define	DELETE		2	/* setup for file deletion */
-#define	RENAME		3	/* setup for file renaming */
-#define	OPMASK		3	/* mask for operation */
-/*
- * namei operational modifier flags, stored in ni_cnd.flags
- */
-#define	LOCKLEAF	0x0004	/* lock vnode on return */
-#define	LOCKPARENT	0x0008	/* want parent vnode returned locked */
-#define	WANTPARENT	0x0010	/* want parent vnode returned unlocked */
-#define	NOCACHE		0x0020	/* name must not be left in cache */
-#define	FOLLOW		0x0040	/* follow symbolic links */
-#define	LOCKSHARED	0x0100	/* Shared lock leaf */
-#define	NOFOLLOW	0x0000	/* do not follow symbolic links (pseudo) */
-#define	MODMASK		0x01fc	/* mask of operational modifiers */
-/*
- * Namei parameter descriptors.
- *
- * SAVENAME may be set by either the callers of namei or by VOP_LOOKUP.
- * If the caller of namei sets the flag (for example execve wants to
- * know the name of the program that is being executed), then it must
- * free the buffer. If VOP_LOOKUP sets the flag, then the buffer must
- * be freed by either the commit routine or the VOP_ABORT routine.
- * SAVESTART is set only by the callers of namei. It implies SAVENAME
- * plus the addition of saving the parent directory that contains the
- * name in ni_startdir. It allows repeated calls to lookup for the
- * name being sought. The caller is responsible for releasing the
- * buffer and for vrele'ing ni_startdir.
- */
-#define	RDONLY		0x00000200 /* lookup with read-only semantics */
-#define	HASBUF		0x00000400 /* has allocated pathname buffer */
-#define	SAVENAME	0x00000800 /* save pathname buffer */
-#define	SAVESTART	0x00001000 /* save starting directory */
-#define	ISDOTDOT	0x00002000 /* current component name is .. */
-#define	MAKEENTRY	0x00004000 /* entry is to be added to name cache */
-#define	ISLASTCN	0x00008000 /* this is last component of pathname */
-#define	ISSYMLINK	0x00010000 /* symlink needs interpretation */
-#define	ISWHITEOUT	0x00020000 /* found whiteout */
-#define	DOWHITEOUT	0x00040000 /* do whiteouts */
-#define	WILLBEDIR	0x00080000 /* new files will be dirs; allow trailing / */
-#define	ISUNICODE	0x00100000 /* current component name is unicode*/
-#define	ISOPEN		0x00200000 /* caller is opening; return a real vnode. */
-#define	NOCROSSMOUNT	0x00400000 /* do not cross mount points */
-#define	NOMACCHECK	0x00800000 /* do not perform MAC checks */
-#define	AUDITVNODE1	0x04000000 /* audit the looked up vnode information */
-#define	AUDITVNODE2	0x08000000 /* audit the looked up vnode information */
-#define	TRAILINGSLASH	0x10000000 /* path ended in a slash */
-#define	NOCAPCHECK	0x20000000 /* do not perform capability checks */
-#define	PARAMASK	0x3ffffe00 /* mask of parameter descriptors */
-
-/*
- * Initialization of a nameidata structure.
- */
-#define	NDINIT(ndp, op, flags, segflg, namep, td)			\
-	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD, NULL, 0, td)
-#define	NDINIT_AT(ndp, op, flags, segflg, namep, dirfd, td)		\
-	NDINIT_ALL(ndp, op, flags, segflg, namep, dirfd, NULL, 0, td)
-#define	NDINIT_ATRIGHTS(ndp, op, flags, segflg, namep, dirfd, rightsp, td) \
-	NDINIT_ALL(ndp, op, flags, segflg, namep, dirfd, NULL, rightsp, td)
-#define	NDINIT_ATVP(ndp, op, flags, segflg, namep, vp, td)		\
-	NDINIT_ALL(ndp, op, flags, segflg, namep, AT_FDCWD, vp, 0, td)
-
-void NDINIT_ALL(struct nameidata *ndp, u_long op, u_long flags,
-    enum uio_seg segflg, const char *namep, int dirfd, struct vnode *startdir,
-    cap_rights_t *rightsp, struct thread *td);
-
-#define NDF_NO_DVP_RELE		0x00000001
-#define NDF_NO_DVP_UNLOCK	0x00000002
-#define NDF_NO_DVP_PUT		0x00000003
-#define NDF_NO_VP_RELE		0x00000004
-#define NDF_NO_VP_UNLOCK	0x00000008
-#define NDF_NO_VP_PUT		0x0000000c
-#define NDF_NO_STARTDIR_RELE	0x00000010
-#define NDF_NO_FREE_PNBUF	0x00000020
-#define NDF_ONLY_PNBUF		(~NDF_NO_FREE_PNBUF)
-
-void NDFREE(struct nameidata *, const u_int);
-
-int	namei(struct nameidata *ndp);
-int	lookup(struct nameidata *ndp);
-int	relookup(struct vnode *dvp, struct vnode **vpp,
-	    struct componentname *cnp);
-#endif
-
-/*
- * Stats on usefulness of namei caches.
- */
-struct nchstats {
-	long	ncs_goodhits;		/* hits that we can really use */
-	long	ncs_neghits;		/* negative hits that we can use */
-	long	ncs_badhits;		/* hits we must drop */
-	long	ncs_falsehits;		/* hits with id mismatch */
-	long	ncs_miss;		/* misses */
-	long	ncs_long;		/* long names that ignore cache */
-	long	ncs_pass2;		/* names found with passes == 2 */
-	long	ncs_2passes;		/* number of times we attempt it */
-};
-
-extern struct nchstats nchstats;
-
-#endif /* !_SYS_NAMEI_H_ */
diff --git a/include.new/sys/nlist_aout.h b/include.new/sys/nlist_aout.h
deleted file mode 100644
index 4903808..0000000
--- a/include.new/sys/nlist_aout.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
- *
- * $FreeBSD: releng/10.2/sys/sys/nlist_aout.h 208986 2010-06-10 14:19:51Z bz $
- */
-
-#ifndef _SYS_NLIST_AOUT_H_
-#define	_SYS_NLIST_AOUT_H_
-
-/*
- * Symbol table entries in a.out files.
- */
-
-/*
- * Layout of each symbol.  The "#ifdef _AOUT_INCLUDE_" is so that
- * programs including nlist.h can initialize nlist structures
- * statically.
- */
-struct nlist {
-#ifdef _AOUT_INCLUDE_
-	union {
-		const char *n_name; /* symbol name (in memory) */
-		long n_strx;	/* file string table offset (on disk) */
-	} n_un;
-#else
-	const char *n_name;	/* symbol name (in memory) */
-	int : 8 * (sizeof(long) > sizeof(char *) ?
-	    sizeof(long) - sizeof(char *) : sizeof(char *) - sizeof(long));
-#endif
-	unsigned char n_type;	/* type defines */
-	char n_other;		/* ".type" and binding information */
-	short n_desc;		/* used by stab entries */
-	unsigned long n_value;	/* address/value of the symbol */
-};
-
-#define	n_hash	n_desc		/* used internally by ld(1); XXX */
-
-/*
- * Defines for n_type.
- */
-#define	N_UNDF	0x00		/* undefined */
-#define	N_ABS	0x02		/* absolute address */
-#define	N_TEXT	0x04		/* text segment */
-#define	N_DATA	0x06		/* data segment */
-#define	N_BSS	0x08		/* bss segment */
-#define	N_INDR	0x0a		/* alias definition */
-#define	N_SIZE	0x0c		/* pseudo type, defines a symbol's size */
-#define	N_COMM	0x12		/* common reference */
-/* GNU extensions */
-#define N_SETA	0x14		/* Absolute set element symbol */
-#define N_SETT  0x16		/* Text set element symbol */
-#define N_SETD  0x18		/* Data set element symbol */
-#define N_SETB  0x1a		/* Bss set element symbol */
-#define N_SETV  0x1c		/* Pointer to set vector in data area. */
-/* end GNU extensions */
-#define	N_FN	0x1e		/* file name (N_EXT on) */
-#define	N_WARN	0x1e		/* warning message (N_EXT off) */
-
-#define	N_EXT	0x01		/* external (global) bit, OR'ed in */
-#define	N_TYPE	0x1e		/* mask for all the type bits */
-#define	N_STAB	0xe0		/* mask for debugger symbols -- stab(5) */
-
-/*
- * Defines for n_other.  It contains the ".type" (AUX) field in the least
- * significant 4 bits, and the binding (for weak symbols) in the most
- * significant 4 bits.
- */
-#define N_AUX(p)	((p)->n_other & 0xf)
-#define N_BIND(p)	(((unsigned int)(p)->n_other >> 4) & 0xf)
-#define N_OTHER(r, v)	(((unsigned int)(r) << 4) | ((v) & 0xf))
-
-#define AUX_OBJECT	1	/* data object */
-#define AUX_FUNC	2	/* function */
-
-/*#define BIND_LOCAL	0	not used */
-/*#define BIND_GLOBAL	1	not used */
-#define BIND_WEAK	2	/* weak binding */
-
-#define	N_FORMAT	"%08x"	/* namelist value format; XXX */
-
-#endif /* !_SYS_NLIST_AOUT_H_ */
diff --git a/include.new/sys/osd.h b/include.new/sys/osd.h
deleted file mode 100644
index 351d28d..0000000
--- a/include.new/sys/osd.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 2007 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/sys/osd.h 216615 2010-12-21 13:45:29Z lstewart $
- */
-
-#ifndef _SYS_OSD_H_
-#define _SYS_OSD_H_
-
-#include <sys/queue.h>
-
-/*
- * Lock key:
- *   (c) container lock (e.g. jail's pr_mtx) and/or osd_object_lock
- *   (l) osd_list_lock
- */
-struct osd {
-	u_int		  osd_nslots;	/* (c) */
-	void		**osd_slots;	/* (c) */
-	LIST_ENTRY(osd)	  osd_next;	/* (l) */
-};
-
-#ifdef _KERNEL
-
-#define	OSD_THREAD	0
-#define	OSD_JAIL	1
-#define	OSD_KHELP	2
-
-#define	OSD_FIRST	OSD_THREAD
-#define	OSD_LAST	OSD_KHELP
-
-typedef void (*osd_destructor_t)(void *value);
-typedef int (*osd_method_t)(void *obj, void *data);
-
-int osd_register(u_int type, osd_destructor_t destructor,
-    osd_method_t *methods);
-void osd_deregister(u_int type, u_int slot);
-
-int osd_set(u_int type, struct osd *osd, u_int slot, void *value);
-void *osd_get(u_int type, struct osd *osd, u_int slot);
-void osd_del(u_int type, struct osd *osd, u_int slot);
-int osd_call(u_int type, u_int method, void *obj, void *data);
-
-void osd_exit(u_int type, struct osd *osd);
-
-#define	osd_thread_register(destructor)					\
-	osd_register(OSD_THREAD, (destructor), NULL)
-#define	osd_thread_deregister(slot)					\
-	osd_deregister(OSD_THREAD, (slot))
-#define	osd_thread_set(td, slot, value)					\
-	osd_set(OSD_THREAD, &(td)->td_osd, (slot), (value))
-#define	osd_thread_get(td, slot)					\
-	osd_get(OSD_THREAD, &(td)->td_osd, (slot))
-#define	osd_thread_del(td, slot)	do {				\
-	KASSERT((td) == curthread, ("Not curthread."));			\
-	osd_del(OSD_THREAD, &(td)->td_osd, (slot));			\
-} while (0)
-#define	osd_thread_call(td, method, data)				\
-	osd_call(OSD_THREAD, (method), (td), (data))
-#define	osd_thread_exit(td)						\
-	osd_exit(OSD_THREAD, &(td)->td_osd)
-
-#define	osd_jail_register(destructor, methods)				\
-	osd_register(OSD_JAIL, (destructor), (methods))
-#define	osd_jail_deregister(slot)					\
-	osd_deregister(OSD_JAIL, (slot))
-#define	osd_jail_set(pr, slot, value)					\
-	osd_set(OSD_JAIL, &(pr)->pr_osd, (slot), (value))
-#define	osd_jail_get(pr, slot)						\
-	osd_get(OSD_JAIL, &(pr)->pr_osd, (slot))
-#define	osd_jail_del(pr, slot)						\
-	osd_del(OSD_JAIL, &(pr)->pr_osd, (slot))
-#define	osd_jail_call(pr, method, data)					\
-	osd_call(OSD_JAIL, (method), (pr), (data))
-#define	osd_jail_exit(pr)						\
-	osd_exit(OSD_JAIL, &(pr)->pr_osd)
-
-#endif	/* _KERNEL */
-
-#endif	/* !_SYS_OSD_H_ */
diff --git a/include.new/sys/param.h b/include.new/sys/param.h
deleted file mode 100644
index 2566e8a..0000000
--- a/include.new/sys/param.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD: releng/10.2/sys/sys/param.h 285830 2015-07-23 23:31:40Z gjb $
- */
-
-#ifndef _SYS_PARAM_H_
-#define _SYS_PARAM_H_
-
-#include <sys/_null.h>
-
-#define	BSD	199506		/* System version (year & month). */
-#define BSD4_3	1
-#define BSD4_4	1
-
-/* 
- * __FreeBSD_version numbers are documented in the Porter's Handbook.
- * If you bump the version for any reason, you should update the documentation
- * there.
- * Currently this lives here in the doc/ repository:
- *
- *	head/en_US.ISO8859-1/books/porters-handbook/book.xml
- *
- * scheme is:  <major><two digit minor>Rxx
- *		'R' is in the range 0 to 4 if this is a release branch or
- *		x.0-CURRENT before RELENG_*_0 is created, otherwise 'R' is
- *		in the range 5 to 9.
- */
-#undef __UbixOS_version
-#define __UbixOS_version 1002000	/* Master, propagated to newvers */
-
-/*
- * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
- * which by definition is always true on FreeBSD. This macro is also defined
- * on other systems that use the kernel of FreeBSD, such as GNU/kFreeBSD.
- *
- * It is tempting to use this macro in userland code when we want to enable
- * kernel-specific routines, and in fact it's fine to do this in code that
- * is part of FreeBSD itself.  However, be aware that as presence of this
- * macro is still not widespread (e.g. older FreeBSD versions, 3rd party
- * compilers, etc), it is STRONGLY DISCOURAGED to check for this macro in
- * external applications without also checking for __FreeBSD__ as an
- * alternative.
- */
-#undef __FreeBSD_kernel__
-#define __FreeBSD_kernel__
-
-#ifdef _KERNEL
-#define	P_OSREL_SIGWAIT		700000
-#define	P_OSREL_SIGSEGV		700004
-#define	P_OSREL_MAP_ANON	800104
-
-#define	P_OSREL_MAJOR(x)	((x) / 100000)
-#endif
-
-#ifndef LOCORE
-#include <sys/types.h>
-#endif
-
-/*
- * Machine-independent constants (some used in following include files).
- * Redefined constants are from POSIX 1003.1 limits file.
- *
- * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
- */
-#include <sys/syslimits.h>
-
-#define	MAXCOMLEN	19		/* max command name remembered */
-#define	MAXINTERP	PATH_MAX	/* max interpreter file name length */
-#define	MAXLOGNAME	33		/* max login name length (incl. NUL) */
-#define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
-#define	NCARGS		ARG_MAX		/* max bytes for an exec function */
-#define	NGROUPS		(NGROUPS_MAX+1)	/* max number groups */
-#define	NOFILE		OPEN_MAX	/* max open files per process */
-#define	NOGROUP		65535		/* marker for empty group set member */
-#define MAXHOSTNAMELEN	256		/* max hostname size */
-#define SPECNAMELEN	63		/* max length of devicename */
-
-/* More types and definitions used throughout the kernel. */
-#ifdef _KERNEL
-#include <sys/cdefs.h>
-#include <sys/errno.h>
-#ifndef LOCORE
-#include <sys/time.h>
-#include <sys/priority.h>
-#endif
-
-#ifndef FALSE
-#define	FALSE	0
-#endif
-#ifndef TRUE
-#define	TRUE	1
-#endif
-#endif
-
-#ifndef _KERNEL
-/* Signals. */
-#include <sys/signal.h>
-#endif
-
-/* Machine type dependent parameters. */
-#include <machine/param.h>
-#ifndef _KERNEL
-#include <sys/limits.h>
-#endif
-
-#ifndef DEV_BSHIFT
-#define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#endif
-#define	DEV_BSIZE	(1<<DEV_BSHIFT)
-
-#ifndef BLKDEV_IOSIZE
-#define BLKDEV_IOSIZE  PAGE_SIZE	/* default block device I/O size */
-#endif
-#ifndef DFLTPHYS
-#define DFLTPHYS	(64 * 1024)	/* default max raw I/O transfer size */
-#endif
-#ifndef MAXPHYS
-#define MAXPHYS		(128 * 1024)	/* max raw I/O transfer size */
-#endif
-#ifndef MAXDUMPPGS
-#define MAXDUMPPGS	(DFLTPHYS/PAGE_SIZE)
-#endif
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than PAGE_SIZE.
- */
-#ifndef	MSIZE
-#define	MSIZE		256		/* size of an mbuf */
-#endif
-
-#ifndef	MCLSHIFT
-#define MCLSHIFT	11		/* convert bytes to mbuf clusters */
-#endif	/* MCLSHIFT */
-
-#define MCLBYTES	(1 << MCLSHIFT)	/* size of an mbuf cluster */
-
-#if PAGE_SIZE < 2048
-#define	MJUMPAGESIZE	MCLBYTES
-#elif PAGE_SIZE <= 8192
-#define	MJUMPAGESIZE	PAGE_SIZE
-#else
-#define	MJUMPAGESIZE	(8 * 1024)
-#endif
-
-#define	MJUM9BYTES	(9 * 1024)	/* jumbo cluster 9k */
-#define	MJUM16BYTES	(16 * 1024)	/* jumbo cluster 16k */
-
-/*
- * Some macros for units conversion
- */
-
-/* clicks to bytes */
-#ifndef ctob
-#define ctob(x)	((x)<<PAGE_SHIFT)
-#endif
-
-/* bytes to clicks */
-#ifndef btoc
-#define btoc(x)	(((vm_offset_t)(x)+PAGE_MASK)>>PAGE_SHIFT)
-#endif
-
-/*
- * btodb() is messy and perhaps slow because `bytes' may be an off_t.  We
- * want to shift an unsigned type to avoid sign extension and we don't
- * want to widen `bytes' unnecessarily.  Assume that the result fits in
- * a daddr_t.
- */
-#ifndef btodb
-#define btodb(bytes)	 		/* calculates (bytes / DEV_BSIZE) */ \
-	(sizeof (bytes) > sizeof(long) \
-	 ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \
-	 : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT))
-#endif
-
-#ifndef dbtob
-#define dbtob(db)			/* calculates (db * DEV_BSIZE) */ \
-	((off_t)(db) << DEV_BSHIFT)
-#endif
-
-#define	PRIMASK	0x0ff
-#define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
-#define	PDROP	0x200	/* OR'd with pri to stop re-entry of interlock mutex */
-
-#define	NZERO	0		/* default "nice" */
-
-#define	NBBY	8		/* number of bits in a byte */
-#define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
-
-#define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-
-#define	NODEV	(dev_t)(-1)	/* non-existent device */
-
-/*
- * File system parameters and macros.
- *
- * MAXBSIZE -	Filesystems are made out of blocks of at most MAXBSIZE bytes
- *		per block.  MAXBSIZE may be made larger without effecting
- *		any existing filesystems as long as it does not exceed MAXPHYS,
- *		and may be made smaller at the risk of not being able to use
- *		filesystems which require a block size exceeding MAXBSIZE.
- *
- * MAXBCACHEBUF - Maximum size of a buffer in the buffer cache.  This must
- *		be >= MAXBSIZE and can be set differently for different
- *		architectures by defining it in <machine/param.h>.
- *		Making this larger allows NFS to do larger reads/writes.
- *
- * BKVASIZE -	Nominal buffer space per buffer, in bytes.  BKVASIZE is the
- *		minimum KVM memory reservation the kernel is willing to make.
- *		Filesystems can of course request smaller chunks.  Actual 
- *		backing memory uses a chunk size of a page (PAGE_SIZE).
- *		The default value here can be overridden on a per-architecture
- *		basis by defining it in <machine/param.h>.  This should
- *		probably be done to increase its value, when MAXBCACHEBUF is
- *		defined as a larger value in <machine/param.h>.
- *
- *		If you make BKVASIZE too small you risk seriously fragmenting
- *		the buffer KVM map which may slow things down a bit.  If you
- *		make it too big the kernel will not be able to optimally use 
- *		the KVM memory reserved for the buffer cache and will wind 
- *		up with too-few buffers.
- *
- *		The default is 16384, roughly 2x the block size used by a
- *		normal UFS filesystem.
- */
-#define MAXBSIZE	65536	/* must be power of 2 */
-#ifndef	MAXBCACHEBUF
-#define	MAXBCACHEBUF	MAXBSIZE /* must be a power of 2 >= MAXBSIZE */
-#endif
-#ifndef	BKVASIZE
-#define BKVASIZE	16384	/* must be power of 2 */
-#endif
-#define BKVAMASK	(BKVASIZE-1)
-
-/*
- * MAXPATHLEN defines the longest permissible path length after expanding
- * symbolic links. It is used to allocate a temporary buffer from the buffer
- * pool in which to do the name expansion, hence should be a power of two,
- * and must be less than or equal to MAXBSIZE.  MAXSYMLINKS defines the
- * maximum number of symbolic links that may be expanded in a path name.
- * It should be set high enough to allow all legitimate uses, but halt
- * infinite loops reasonably quickly.
- */
-#define	MAXPATHLEN	PATH_MAX
-#define MAXSYMLINKS	32
-
-/* Bit map related macros. */
-#define	setbit(a,i)	(((unsigned char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
-#define	clrbit(a,i)	(((unsigned char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define	isset(a,i)							\
-	(((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
-#define	isclr(a,i)							\
-	((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
-/* Macros for counting and rounding. */
-#ifndef howmany
-#define	howmany(x, y)	(((x)+((y)-1))/(y))
-#endif
-#define	nitems(x)	(sizeof((x)) / sizeof((x)[0]))
-#define	rounddown(x, y)	(((x)/(y))*(y))
-#define	rounddown2(x, y) ((x)&(~((y)-1)))          /* if y is power of two */
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
-#define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
-#define powerof2(x)	((((x)-1)&(x))==0)
-
-/* Macros for min/max. */
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-
-#ifdef _KERNEL
-/*
- * Basic byte order function prototypes for non-inline functions.
- */
-#ifndef LOCORE
-#ifndef _BYTEORDER_PROTOTYPED
-#define	_BYTEORDER_PROTOTYPED
-__BEGIN_DECLS
-__uint32_t	 htonl(__uint32_t);
-__uint16_t	 htons(__uint16_t);
-__uint32_t	 ntohl(__uint32_t);
-__uint16_t	 ntohs(__uint16_t);
-__END_DECLS
-#endif
-#endif
-
-#ifndef lint
-#ifndef _BYTEORDER_FUNC_DEFINED
-#define	_BYTEORDER_FUNC_DEFINED
-#define	htonl(x)	__htonl(x)
-#define	htons(x)	__htons(x)
-#define	ntohl(x)	__ntohl(x)
-#define	ntohs(x)	__ntohs(x)
-#endif /* !_BYTEORDER_FUNC_DEFINED */
-#endif /* lint */
-#endif /* _KERNEL */
-
-/*
- * Scale factor for scaled integers used to count %cpu time and load avgs.
- *
- * The number of CPU `tick's that map to a unique `%age' can be expressed
- * by the formula (1 / (2 ^ (FSHIFT - 11))).  The maximum load average that
- * can be calculated (assuming 32 bits) can be closely approximated using
- * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
- *
- * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
- * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
- */
-#define	FSHIFT	11		/* bits to right of fixed binary point */
-#define FSCALE	(1<<FSHIFT)
-
-#define dbtoc(db)			/* calculates devblks to pages */ \
-	((db + (ctodb(1) - 1)) >> (PAGE_SHIFT - DEV_BSHIFT))
- 
-#define ctodb(db)			/* calculates pages to devblks */ \
-	((db) << (PAGE_SHIFT - DEV_BSHIFT))
-
-/*
- * Old spelling of __containerof().
- */
-#define	member2struct(s, m, x)						\
-	((struct s *)(void *)((char *)(x) - offsetof(struct s, m)))
-
-/*
- * Access a variable length array that has been declared as a fixed
- * length array.
- */
-#define __PAST_END(array, offset) (((__typeof__(*(array)) *)(array))[offset])
-
-#endif	/* _SYS_PARAM_H_ */
diff --git a/include.new/sys/pciio.h b/include.new/sys/pciio.h
deleted file mode 100644
index 9a495da..0000000
--- a/include.new/sys/pciio.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 1997, Stefan Esser <se@FreeBSD.ORG>
- * Copyright (c) 1997, 1998, 1999, Kenneth D. Merry <ken@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/pciio.h 262134 2014-02-17 22:19:49Z jhb $
- *
- */
-
-#ifndef _SYS_PCIIO_H_
-#define	_SYS_PCIIO_H_
-
-#include <sys/ioccom.h>
-
-#define PCI_MAXNAMELEN	16
-
-typedef enum {
-	PCI_GETCONF_LAST_DEVICE,
-	PCI_GETCONF_LIST_CHANGED,
-	PCI_GETCONF_MORE_DEVS,
-	PCI_GETCONF_ERROR
-} pci_getconf_status;
-
-typedef enum {
-	PCI_GETCONF_NO_MATCH		= 0x0000,
-	PCI_GETCONF_MATCH_DOMAIN	= 0x0001,
-	PCI_GETCONF_MATCH_BUS		= 0x0002,
-	PCI_GETCONF_MATCH_DEV		= 0x0004,
-	PCI_GETCONF_MATCH_FUNC		= 0x0008,
-	PCI_GETCONF_MATCH_NAME		= 0x0010,
-	PCI_GETCONF_MATCH_UNIT		= 0x0020,
-	PCI_GETCONF_MATCH_VENDOR	= 0x0040,
-	PCI_GETCONF_MATCH_DEVICE	= 0x0080,
-	PCI_GETCONF_MATCH_CLASS		= 0x0100
-} pci_getconf_flags;
-
-struct pcisel {
-	uint32_t	pc_domain;	/* domain number */
-	u_int8_t	pc_bus;		/* bus number */
-	u_int8_t	pc_dev;		/* device on this bus */
-	u_int8_t	pc_func;	/* function on this device */
-};
-
-struct pci_conf {
-	struct pcisel	pc_sel;		/* domain+bus+slot+function */
-	u_int8_t	pc_hdr;		/* PCI header type */
-	u_int16_t	pc_subvendor;	/* card vendor ID */
-	u_int16_t	pc_subdevice;	/* card device ID, assigned by 
-					   card vendor */
-	u_int16_t	pc_vendor;	/* chip vendor ID */
-	u_int16_t	pc_device;	/* chip device ID, assigned by 
-					   chip vendor */
-	u_int8_t	pc_class;	/* chip PCI class */
-	u_int8_t	pc_subclass;	/* chip PCI subclass */
-	u_int8_t	pc_progif;	/* chip PCI programming interface */
-	u_int8_t	pc_revid;	/* chip revision ID */
-	char		pd_name[PCI_MAXNAMELEN + 1];  /* device name */
-	u_long		pd_unit;	/* device unit number */
-};
-
-struct pci_match_conf {
-	struct pcisel		pc_sel;		/* domain+bus+slot+function */
-	char			pd_name[PCI_MAXNAMELEN + 1];  /* device name */
-	u_long			pd_unit;	/* Unit number */
-	u_int16_t		pc_vendor;	/* PCI Vendor ID */
-	u_int16_t		pc_device;	/* PCI Device ID */
-	u_int8_t		pc_class;	/* PCI class */
-	pci_getconf_flags	flags;		/* Matching expression */
-};
-
-struct pci_conf_io {
-	uint32_t		pat_buf_len;	/* pattern buffer length */
-	uint32_t		num_patterns;	/* number of patterns */
-	struct pci_match_conf	*patterns;	/* pattern buffer */
-	uint32_t		match_buf_len;	/* match buffer length */
-	uint32_t		num_matches;	/* number of matches returned */
-	struct pci_conf		*matches;	/* match buffer */
-	uint32_t		offset;		/* offset into device list */
-	uint32_t		generation;	/* device list generation */
-	pci_getconf_status	status;		/* request status */
-};
-
-struct pci_io {
-	struct pcisel	pi_sel;		/* device to operate on */
-	int		pi_reg;		/* configuration register to examine */
-	int		pi_width;	/* width (in bytes) of read or write */
-	uint32_t	pi_data;	/* data to write or result of read */
-};
-
-struct pci_bar_io {
-	struct pcisel	pbi_sel;	/* device to operate on */
-	int		pbi_reg;	/* starting address of BAR */
-	int		pbi_enabled;	/* decoding enabled */
-	uint64_t	pbi_base;	/* current value of BAR */
-	uint64_t	pbi_length;	/* length of BAR */
-};
-
-struct pci_vpd_element {
-	char		pve_keyword[2];
-	uint8_t		pve_flags;
-	uint8_t		pve_datalen;
-	uint8_t		pve_data[0];
-};
-
-#define	PVE_FLAG_IDENT		0x01	/* Element is the string identifier */
-#define	PVE_FLAG_RW		0x02	/* Element is read/write */
-
-#define	PVE_NEXT(pve)							\
-	((struct pci_vpd_element *)((char *)(pve) +			\
-	    sizeof(struct pci_vpd_element) + (pve)->pve_datalen))
-
-struct pci_list_vpd_io {
-	struct pcisel	plvi_sel;	/* device to operate on */
-	size_t		plvi_len;	/* size of the data area */
-	struct pci_vpd_element *plvi_data;
-};
-
-#define	PCIOCGETCONF	_IOWR('p', 5, struct pci_conf_io)
-#define	PCIOCREAD	_IOWR('p', 2, struct pci_io)
-#define	PCIOCWRITE	_IOWR('p', 3, struct pci_io)
-#define	PCIOCATTACHED	_IOWR('p', 4, struct pci_io)
-#define	PCIOCGETBAR	_IOWR('p', 6, struct pci_bar_io)
-#define	PCIOCLISTVPD	_IOWR('p', 7, struct pci_list_vpd_io)
-
-#endif /* !_SYS_PCIIO_H_ */
diff --git a/include.new/sys/pcpu.h b/include.new/sys/pcpu.h
deleted file mode 100644
index cc7ddc1..0000000
--- a/include.new/sys/pcpu.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*-
- * Copyright (c) 2001 Wind River Systems, Inc.
- * All rights reserved.
- * Written by: John Baldwin <jhb@FreeBSD.org>
- *
- * 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.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may 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: releng/10.2/sys/sys/pcpu.h 262739 2014-03-04 14:46:30Z glebius $
- */
-
-#ifndef _SYS_PCPU_H_
-#define	_SYS_PCPU_H_
-
-#ifdef LOCORE
-#error "no assembler-serviceable parts inside"
-#endif
-
-#include <sys/_cpuset.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/_sx.h>
-#include <sys/queue.h>
-#include <sys/_rmlock.h>
-#include <sys/vmmeter.h>
-#include <sys/resource.h>
-#include <machine/pcpu.h>
-
-#define	DPCPU_SETNAME		"set_pcpu"
-#define	DPCPU_SYMPREFIX		"pcpu_entry_"
-
-#ifdef _KERNEL
-
-/*
- * Define a set for pcpu data.
- */
-extern uintptr_t *__start_set_pcpu;
-__GLOBL(__start_set_pcpu);
-extern uintptr_t *__stop_set_pcpu;
-__GLOBL(__stop_set_pcpu);
-
-/*
- * Array of dynamic pcpu base offsets.  Indexed by id.
- */
-extern uintptr_t dpcpu_off[];
-
-/*
- * Convenience defines.
- */
-#define	DPCPU_START		((uintptr_t)&__start_set_pcpu)
-#define	DPCPU_STOP		((uintptr_t)&__stop_set_pcpu)
-#define	DPCPU_BYTES		(DPCPU_STOP - DPCPU_START)
-#define	DPCPU_MODMIN		2048
-#define	DPCPU_SIZE		roundup2(DPCPU_BYTES, PAGE_SIZE)
-#define	DPCPU_MODSIZE		(DPCPU_SIZE - (DPCPU_BYTES - DPCPU_MODMIN))
-
-/*
- * Declaration and definition.
- */
-#define	DPCPU_NAME(n)		pcpu_entry_##n
-#define	DPCPU_DECLARE(t, n)	extern t DPCPU_NAME(n)
-#define	DPCPU_DEFINE(t, n)	t DPCPU_NAME(n) __section(DPCPU_SETNAME) __used
-
-/*
- * Accessors with a given base.
- */
-#define	_DPCPU_PTR(b, n)						\
-    (__typeof(DPCPU_NAME(n))*)((b) + (uintptr_t)&DPCPU_NAME(n))
-#define	_DPCPU_GET(b, n)	(*_DPCPU_PTR(b, n))
-#define	_DPCPU_SET(b, n, v)	(*_DPCPU_PTR(b, n) = v)
-
-/*
- * Accessors for the current cpu.
- */
-#define	DPCPU_PTR(n)		_DPCPU_PTR(PCPU_GET(dynamic), n)
-#define	DPCPU_GET(n)		(*DPCPU_PTR(n))
-#define	DPCPU_SET(n, v)		(*DPCPU_PTR(n) = v)
-
-/*
- * Accessors for remote cpus.
- */
-#define	DPCPU_ID_PTR(i, n)	_DPCPU_PTR(dpcpu_off[(i)], n)
-#define	DPCPU_ID_GET(i, n)	(*DPCPU_ID_PTR(i, n))
-#define	DPCPU_ID_SET(i, n, v)	(*DPCPU_ID_PTR(i, n) = v)
-
-/*
- * Utility macros.
- */
-#define	DPCPU_SUM(n) __extension__					\
-({									\
-	u_int _i;							\
-	__typeof(*DPCPU_PTR(n)) sum;					\
-									\
-	sum = 0;							\
-	CPU_FOREACH(_i) {						\
-		sum += *DPCPU_ID_PTR(_i, n);				\
-	}								\
-	sum;								\
-})
-
-#define	DPCPU_VARSUM(n, var) __extension__				\
-({									\
-	u_int _i;							\
-	__typeof((DPCPU_PTR(n))->var) sum;				\
-									\
-	sum = 0;							\
-	CPU_FOREACH(_i) {						\
-		sum += (DPCPU_ID_PTR(_i, n))->var;			\
-	}								\
-	sum;								\
-})
-
-#define	DPCPU_ZERO(n) do {						\
-	u_int _i;							\
-									\
-	CPU_FOREACH(_i) {						\
-		bzero(DPCPU_ID_PTR(_i, n), sizeof(*DPCPU_PTR(n)));	\
-	}								\
-} while(0)
-
-#endif /* _KERNEL */
-
-/*
- * This structure maps out the global data that needs to be kept on a
- * per-cpu basis.  The members are accessed via the PCPU_GET/SET/PTR
- * macros defined in <machine/pcpu.h>.  Machine dependent fields are
- * defined in the PCPU_MD_FIELDS macro defined in <machine/pcpu.h>.
- */
-struct pcpu {
-	struct thread	*pc_curthread;		/* Current thread */
-	struct thread	*pc_idlethread;		/* Idle thread */
-	struct thread	*pc_fpcurthread;	/* Fp state owner */
-	struct thread	*pc_deadthread;		/* Zombie thread or NULL */
-	struct pcb	*pc_curpcb;		/* Current pcb */
-	uint64_t	pc_switchtime;		/* cpu_ticks() at last csw */
-	int		pc_switchticks;		/* `ticks' at last csw */
-	u_int		pc_cpuid;		/* This cpu number */
-	STAILQ_ENTRY(pcpu) pc_allcpu;
-	struct lock_list_entry *pc_spinlocks;
-	struct vmmeter	pc_cnt;			/* VM stats counters */
-	long		pc_cp_time[CPUSTATES];	/* statclock ticks */
-	struct device	*pc_device;
-	void		*pc_netisr;		/* netisr SWI cookie */
-	int		pc_dnweight;		/* vm_page_dontneed() */
-	int		pc_domain;		/* Memory domain. */
-	struct rm_queue	pc_rm_queue;		/* rmlock list of trackers */
-	uintptr_t	pc_dynamic;		/* Dynamic per-cpu data area */
-
-	/*
-	 * Keep MD fields last, so that CPU-specific variations on a
-	 * single architecture don't result in offset variations of
-	 * the machine-independent fields of the pcpu.  Even though
-	 * the pcpu structure is private to the kernel, some ports
-	 * (e.g., lsof, part of gtop) define _KERNEL and include this
-	 * header.  While strictly speaking this is wrong, there's no
-	 * reason not to keep the offsets of the MI fields constant
-	 * if only to make kernel debugging easier.
-	 */
-	PCPU_MD_FIELDS;
-} __aligned(CACHE_LINE_SIZE);
-
-#ifdef CTASSERT
-/*
- * To minimize memory waste in per-cpu UMA zones, size of struct pcpu
- * should be denominator of PAGE_SIZE.
- */
-CTASSERT((PAGE_SIZE / sizeof(struct pcpu)) * sizeof(struct pcpu) == PAGE_SIZE);
-#endif
-
-#ifdef _KERNEL
-
-STAILQ_HEAD(cpuhead, pcpu);
-
-extern struct cpuhead cpuhead;
-extern struct pcpu *cpuid_to_pcpu[];
-
-#define	curcpu		PCPU_GET(cpuid)
-#define	curproc		(curthread->td_proc)
-#ifndef curthread
-#define	curthread	PCPU_GET(curthread)
-#endif
-#define	curvidata	PCPU_GET(vidata)
-
-/* Accessor to elements allocated via UMA_ZONE_PCPU zone. */
-static inline void *
-zpcpu_get(void *base)
-{
-
-	return ((char *)(base) + sizeof(struct pcpu) * curcpu);
-}
-
-static inline void *
-zpcpu_get_cpu(void *base, int cpu)
-{
-
-	return ((char *)(base) + sizeof(struct pcpu) * cpu);
-}
-
-/*
- * Machine dependent callouts.  cpu_pcpu_init() is responsible for
- * initializing machine dependent fields of struct pcpu, and
- * db_show_mdpcpu() is responsible for handling machine dependent
- * fields for the DDB 'show pcpu' command.
- */
-void	cpu_pcpu_init(struct pcpu *pcpu, int cpuid, size_t size);
-void	db_show_mdpcpu(struct pcpu *pcpu);
-
-void	*dpcpu_alloc(int size);
-void	dpcpu_copy(void *s, int size);
-void	dpcpu_free(void *s, int size);
-void	dpcpu_init(void *dpcpu, int cpuid);
-void	pcpu_destroy(struct pcpu *pcpu);
-struct	pcpu *pcpu_find(u_int cpuid);
-void	pcpu_init(struct pcpu *pcpu, int cpuid, size_t size);
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_PCPU_H_ */
diff --git a/include.new/sys/pctrie.h b/include.new/sys/pctrie.h
deleted file mode 100644
index 6920f2c..0000000
--- a/include.new/sys/pctrie.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2013 EMC Corp.
- * Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
- * Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
- * 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.
- *
- * 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: releng/10.2/sys/sys/pctrie.h 260266 2014-01-04 17:36:13Z dim $
- */
-
-#ifndef _SYS_PCTRIE_H_
-#define _SYS_PCTRIE_H_
-
-#include <sys/_pctrie.h>
-
-#ifdef _KERNEL
-
-#define	PCTRIE_DEFINE(name, type, field, allocfn, freefn)		\
-									\
-CTASSERT(sizeof(((struct type *)0)->field) == sizeof(uint64_t));	\
-/*									\
- * XXX This assert protects flag bits, it does not enforce natural	\
- * alignment.  32bit architectures do not naturally align 64bit fields.	\
- */									\
-CTASSERT((__offsetof(struct type, field) & (sizeof(uint32_t) - 1)) == 0); \
-									\
-static __inline struct type *						\
-name##_PCTRIE_VAL2PTR(uint64_t *val)					\
-{									\
-									\
-	if (val == NULL)						\
-		return (NULL);						\
-	return (struct type *)						\
-	    ((uintptr_t)val - __offsetof(struct type, field));		\
-}									\
-									\
-static __inline uint64_t *						\
-name##_PCTRIE_PTR2VAL(struct type *ptr)					\
-{									\
-									\
-	return &ptr->field;						\
-}									\
-									\
-static __inline int							\
-name##_PCTRIE_INSERT(struct pctrie *ptree, struct type *ptr)		\
-{									\
-									\
-	return pctrie_insert(ptree, name##_PCTRIE_PTR2VAL(ptr),		\
-	    allocfn);							\
-}									\
-									\
-static __inline struct type *						\
-name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key)		\
-{									\
-									\
-	return name##_PCTRIE_VAL2PTR(pctrie_lookup(ptree, key));	\
-}									\
-									\
-static __inline struct type *						\
-name##_PCTRIE_LOOKUP_LE(struct pctrie *ptree, uint64_t key)		\
-{									\
-									\
-	return name##_PCTRIE_VAL2PTR(pctrie_lookup_le(ptree, key));	\
-}									\
-									\
-static __inline __unused struct type *					\
-name##_PCTRIE_LOOKUP_GE(struct pctrie *ptree, uint64_t key)		\
-{									\
-									\
-	return name##_PCTRIE_VAL2PTR(pctrie_lookup_ge(ptree, key));	\
-}									\
-									\
-static __inline __unused void						\
-name##_PCTRIE_RECLAIM(struct pctrie *ptree)				\
-{									\
-									\
-	pctrie_reclaim_allnodes(ptree, freefn);				\
-}									\
-									\
-static __inline void							\
-name##_PCTRIE_REMOVE(struct pctrie *ptree, uint64_t key)		\
-{									\
-									\
-	pctrie_remove(ptree, key, freefn);				\
-}
-
-typedef	void	*(*pctrie_alloc_t)(struct pctrie *ptree);
-typedef	void 	(*pctrie_free_t)(struct pctrie *ptree, void *node);
-
-int		pctrie_insert(struct pctrie *ptree, uint64_t *val, 
-		    pctrie_alloc_t allocfn);
-uint64_t	*pctrie_lookup(struct pctrie *ptree, uint64_t key);
-uint64_t	*pctrie_lookup_ge(struct pctrie *ptree, uint64_t key);
-uint64_t	*pctrie_lookup_le(struct pctrie *ptree, uint64_t key);
-void		pctrie_reclaim_allnodes(struct pctrie *ptree,
-		    pctrie_free_t freefn);
-void		pctrie_remove(struct pctrie *ptree, uint64_t key,
-		    pctrie_free_t freefn);
-size_t		pctrie_node_size(void);
-int		pctrie_zone_init(void *mem, int size, int flags);
-
-#endif /* _KERNEL */
-#endif /* !_SYS_PCTRIE_H_ */
diff --git a/include.new/sys/pioctl.h b/include.new/sys/pioctl.h
deleted file mode 100644
index 6081b15..0000000
--- a/include.new/sys/pioctl.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright 1997 Sean Eric Fagan
- *
- * 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 Sean Eric Fagan
- * 4. Neither the name of the author may 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.
- *
- */
-
-/*
- * procfs ioctl definitions.
- *
- * $FreeBSD: releng/10.2/sys/sys/pioctl.h 217747 2011-01-23 12:44:17Z kib $
- */
-
-#ifndef _SYS_PIOCTL_H
-# define _SYS_PIOCTL_H
-
-# include <sys/ioccom.h>
-
-struct procfs_status {
-	int	state;	/* Running, stopped, something else? */
-	int	flags;	/* Any flags */
-	unsigned long	events;	/* Events to stop on */
-	int	why;	/* What event, if any, proc stopped on */
-	unsigned long	val;	/* Any extra data */
-};
-
-# define	PIOCBIS	_IOWINT('p', 1)	/* Set event flag */
-# define	PIOCBIC	_IOWINT('p', 2)	/* Clear event flag */
-# define	PIOCSFL	_IOWINT('p', 3)	/* Set flags */
-			/* wait for proc to stop */
-# define	PIOCWAIT	_IOR('p', 4, struct procfs_status)
-# define	PIOCCONT	_IOWINT('p', 5)	/* Continue a process */
-			/* Get proc status */
-# define	PIOCSTATUS	_IOR('p', 6, struct procfs_status)
-# define	PIOCGFL	_IOR('p', 7, unsigned int)	/* Get flags */
-
-# define	S_EXEC	0x00000001	/* stop-on-exec */
-# define	S_SIG	0x00000002	/* stop-on-signal */
-# define	S_SCE	0x00000004	/* stop on syscall entry */
-# define	S_SCX	0x00000008	/* stop on syscall exit */
-# define	S_CORE	0x00000010	/* stop on coredump */
-# define	S_EXIT	0x00000020	/* stop on exit */
-# define	S_ALLSTOPS  0x003f	/* stop on all events */
-
-/*
- * If PF_LINGER is set in procp->p_pfsflags, then the last close
- * of a /proc/<pid>/mem file will not clear out the stops and continue
- * the process.
- */
-
-# define PF_LINGER	0x01	/* Keep stops around after last close */
-# define PF_ISUGID	0x02	/* Ignore UID/GID changes */
-# define PF_FORK	0x04	/* Retain settings on fork() */
-#endif 
diff --git a/include.new/sys/pipe.h b/include.new/sys/pipe.h
deleted file mode 100644
index c72fe88..0000000
--- a/include.new/sys/pipe.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * Copyright (c) 1996 John S. Dyson
- * 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 immediately at the beginning of the file, without modification,
- *    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. Absolutely no warranty of function or purpose is made by the author
- *    John S. Dyson.
- * 4. This work was done expressly for inclusion into FreeBSD.  Other use
- *    is allowed if this notation is included.
- * 5. Modifications may be freely made to this file if the above conditions
- *    are met.
- *
- * $FreeBSD: releng/10.2/sys/sys/pipe.h 268335 2014-07-06 22:47:18Z mjg $
- */
-
-#ifndef _SYS_PIPE_H_
-#define _SYS_PIPE_H_
-
-#ifndef _KERNEL
-#error "no user-servicable parts inside"
-#endif
-
-/*
- * Pipe buffer size, keep moderate in value, pipes take kva space.
- */
-#ifndef PIPE_SIZE
-#define PIPE_SIZE	16384
-#endif
-
-#ifndef BIG_PIPE_SIZE
-#define BIG_PIPE_SIZE	(64*1024)
-#endif
-
-#ifndef SMALL_PIPE_SIZE
-#define SMALL_PIPE_SIZE	PAGE_SIZE
-#endif
-
-/*
- * PIPE_MINDIRECT MUST be smaller than PIPE_SIZE and MUST be bigger
- * than PIPE_BUF.
- */
-#ifndef PIPE_MINDIRECT
-#define PIPE_MINDIRECT	8192
-#endif
-
-#define PIPENPAGES	(BIG_PIPE_SIZE / PAGE_SIZE + 1)
-
-/*
- * See sys_pipe.c for info on what these limits mean. 
- */
-extern long	maxpipekva;
-extern struct	fileops pipeops;
-
-/*
- * Pipe buffer information.
- * Separate in, out, cnt are used to simplify calculations.
- * Buffered write is active when the buffer.cnt field is set.
- */
-struct pipebuf {
-	u_int	cnt;		/* number of chars currently in buffer */
-	u_int	in;		/* in pointer */
-	u_int	out;		/* out pointer */
-	u_int	size;		/* size of buffer */
-	caddr_t	buffer;		/* kva of buffer */
-};
-
-/*
- * Information to support direct transfers between processes for pipes.
- */
-struct pipemapping {
-	vm_size_t	cnt;		/* number of chars in buffer */
-	vm_size_t	pos;		/* current position of transfer */
-	int		npages;		/* number of pages */
-	vm_page_t	ms[PIPENPAGES];	/* pages in source process */
-};
-
-/*
- * Bits in pipe_state.
- */
-#define PIPE_ASYNC	0x004	/* Async? I/O. */
-#define PIPE_WANTR	0x008	/* Reader wants some characters. */
-#define PIPE_WANTW	0x010	/* Writer wants space to put characters. */
-#define PIPE_WANT	0x020	/* Pipe is wanted to be run-down. */
-#define PIPE_SEL	0x040	/* Pipe has a select active. */
-#define PIPE_EOF	0x080	/* Pipe is in EOF condition. */
-#define PIPE_LOCKFL	0x100	/* Process has exclusive access to pointers/data. */
-#define PIPE_LWANT	0x200	/* Process wants exclusive access to pointers/data. */
-#define PIPE_DIRECTW	0x400	/* Pipe direct write active. */
-#define PIPE_DIRECTOK	0x800	/* Direct mode ok. */
-#define PIPE_NAMED	0x1000	/* Is a named pipe. */
-
-/*
- * Per-pipe data structure.
- * Two of these are linked together to produce bi-directional pipes.
- */
-struct pipe {
-	struct	pipebuf pipe_buffer;	/* data storage */
-	struct	pipemapping pipe_map;	/* pipe mapping for direct I/O */
-	struct	selinfo pipe_sel;	/* for compat with select */
-	struct	timespec pipe_atime;	/* time of last access */
-	struct	timespec pipe_mtime;	/* time of last modify */
-	struct	timespec pipe_ctime;	/* time of status change */
-	struct	sigio *pipe_sigio;	/* information for async I/O */
-	struct	pipe *pipe_peer;	/* link with other direction */
-	struct	pipepair *pipe_pair;	/* container structure pointer */
-	u_int	pipe_state;		/* pipe status info */
-	int	pipe_busy;		/* busy flag, mostly to handle rundown sanely */
-	int	pipe_present;		/* still present? */
-	int	pipe_wgen;		/* writer generation for named pipe */
-	ino_t	pipe_ino;		/* fake inode for stat(2) */
-};
-
-/*
- * Values for the pipe_present.
- */
-#define PIPE_ACTIVE		1
-#define	PIPE_CLOSING		2
-#define	PIPE_FINALIZED		3
-
-/*
- * Container structure to hold the two pipe endpoints, mutex, and label
- * pointer.
- */
-struct pipepair {
-	struct pipe	pp_rpipe;
-	struct pipe	pp_wpipe;
-	struct mtx	pp_mtx;
-	struct label	*pp_label;
-};
-
-#define PIPE_MTX(pipe)		(&(pipe)->pipe_pair->pp_mtx)
-#define PIPE_LOCK(pipe)		mtx_lock(PIPE_MTX(pipe))
-#define PIPE_UNLOCK(pipe)	mtx_unlock(PIPE_MTX(pipe))
-#define PIPE_LOCK_ASSERT(pipe, type)  mtx_assert(PIPE_MTX(pipe), (type))
-
-void	pipe_dtor(struct pipe *dpipe);
-void	pipe_named_ctor(struct pipe **ppipe, struct thread *td);
-void	pipeselwakeup(struct pipe *cpipe);
-#endif /* !_SYS_PIPE_H_ */
diff --git a/include.new/sys/pmc.h b/include.new/sys/pmc.h
deleted file mode 100644
index 2c6517a..0000000
--- a/include.new/sys/pmc.h
+++ /dev/null
@@ -1,1140 +0,0 @@
-/*-
- * Copyright (c) 2003-2008, Joseph Koshy
- * Copyright (c) 2007 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by A. Joseph Koshy under
- * sponsorship from the FreeBSD Foundation and Google, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/pmc.h 283884 2015-06-01 17:57:05Z jhb $
- */
-
-#ifndef _SYS_PMC_H_
-#define	_SYS_PMC_H_
-
-#include <dev/hwpmc/pmc_events.h>
-
-#include <machine/pmc_mdep.h>
-#include <machine/profile.h>
-
-#define	PMC_MODULE_NAME		"hwpmc"
-#define	PMC_NAME_MAX		64 /* HW counter name size */
-#define	PMC_CLASS_MAX		8  /* max #classes of PMCs per-system */
-
-/*
- * Kernel<->userland API version number [MMmmpppp]
- *
- * Major numbers are to be incremented when an incompatible change to
- * the ABI occurs that older clients will not be able to handle.
- *
- * Minor numbers are incremented when a backwards compatible change
- * occurs that allows older correct programs to run unchanged.  For
- * example, when support for a new PMC type is added.
- *
- * The patch version is incremented for every bug fix.
- */
-#define	PMC_VERSION_MAJOR	0x03
-#define	PMC_VERSION_MINOR	0x01
-#define	PMC_VERSION_PATCH	0x0000
-
-#define	PMC_VERSION		(PMC_VERSION_MAJOR << 24 |		\
-	PMC_VERSION_MINOR << 16 | PMC_VERSION_PATCH)
-
-/*
- * Kinds of CPUs known.
- *
- * We keep track of CPU variants that need to be distinguished in
- * some way for PMC operations.  CPU names are grouped by manufacturer
- * and numbered sparsely in order to minimize changes to the ABI involved
- * when new CPUs are added.
- */
-
-#define	__PMC_CPUS()						\
-	__PMC_CPU(AMD_K7,	0x00,	"AMD K7")		\
-	__PMC_CPU(AMD_K8,	0x01,	"AMD K8")		\
-	__PMC_CPU(INTEL_P5,	0x80,	"Intel Pentium")	\
-	__PMC_CPU(INTEL_P6,	0x81,	"Intel Pentium Pro")	\
-	__PMC_CPU(INTEL_CL,	0x82,	"Intel Celeron")	\
-	__PMC_CPU(INTEL_PII,	0x83,	"Intel Pentium II")	\
-	__PMC_CPU(INTEL_PIII,	0x84,	"Intel Pentium III")	\
-	__PMC_CPU(INTEL_PM,	0x85,	"Intel Pentium M")	\
-	__PMC_CPU(INTEL_PIV,	0x86,	"Intel Pentium IV")	\
-	__PMC_CPU(INTEL_CORE,	0x87,	"Intel Core Solo/Duo")	\
-	__PMC_CPU(INTEL_CORE2,	0x88,	"Intel Core2")		\
-	__PMC_CPU(INTEL_CORE2EXTREME,	0x89,	"Intel Core2 Extreme")	\
-	__PMC_CPU(INTEL_ATOM,	0x8A,	"Intel Atom")		\
-	__PMC_CPU(INTEL_COREI7, 0x8B,   "Intel Core i7")	\
-	__PMC_CPU(INTEL_WESTMERE, 0x8C,   "Intel Westmere")	\
-	__PMC_CPU(INTEL_SANDYBRIDGE, 0x8D,   "Intel Sandy Bridge")	\
-	__PMC_CPU(INTEL_IVYBRIDGE, 0x8E,   "Intel Ivy Bridge")	\
-	__PMC_CPU(INTEL_SANDYBRIDGE_XEON, 0x8F,   "Intel Sandy Bridge Xeon")	\
-	__PMC_CPU(INTEL_IVYBRIDGE_XEON, 0x90,   "Intel Ivy Bridge Xeon")	\
-	__PMC_CPU(INTEL_HASWELL, 0x91,   "Intel Haswell")	\
-	__PMC_CPU(INTEL_ATOM_SILVERMONT, 0x92,	"Intel Atom Silvermont")    \
-	__PMC_CPU(INTEL_NEHALEM_EX, 0x93,   "Intel Nehalem Xeon 7500")	\
-	__PMC_CPU(INTEL_WESTMERE_EX, 0x94,   "Intel Westmere Xeon E7")	\
-        __PMC_CPU(INTEL_HASWELL_XEON, 0x95,   "Intel Haswell Xeon E5 v3") \
-	__PMC_CPU(INTEL_XSCALE,	0x100,	"Intel XScale")		\
-	__PMC_CPU(MIPS_24K,     0x200,  "MIPS 24K")		\
-	__PMC_CPU(MIPS_OCTEON,  0x201,  "Cavium Octeon")	\
-	__PMC_CPU(PPC_7450,     0x300,  "PowerPC MPC7450")	\
-	__PMC_CPU(PPC_970,      0x380,  "IBM PowerPC 970")	\
-	__PMC_CPU(GENERIC, 	0x400,  "Generic")
-
-enum pmc_cputype {
-#undef	__PMC_CPU
-#define	__PMC_CPU(S,V,D)	PMC_CPU_##S = V,
-	__PMC_CPUS()
-};
-
-#define	PMC_CPU_FIRST	PMC_CPU_AMD_K7
-#define	PMC_CPU_LAST	PMC_CPU_GENERIC
-
-/*
- * Classes of PMCs
- */
-
-#define	__PMC_CLASSES()							\
-	__PMC_CLASS(TSC)	/* CPU Timestamp counter */		\
-	__PMC_CLASS(K7)		/* AMD K7 performance counters */	\
-	__PMC_CLASS(K8)		/* AMD K8 performance counters */	\
-	__PMC_CLASS(P5)		/* Intel Pentium counters */		\
-	__PMC_CLASS(P6)		/* Intel Pentium Pro counters */	\
-	__PMC_CLASS(P4)		/* Intel Pentium-IV counters */		\
-	__PMC_CLASS(IAF)	/* Intel Core2/Atom, fixed function */	\
-	__PMC_CLASS(IAP)	/* Intel Core...Atom, programmable */	\
-	__PMC_CLASS(UCF)	/* Intel Uncore fixed function */	\
-	__PMC_CLASS(UCP)	/* Intel Uncore programmable */		\
-	__PMC_CLASS(XSCALE)	/* Intel XScale counters */		\
-	__PMC_CLASS(MIPS24K)	/* MIPS 24K */				\
-	__PMC_CLASS(OCTEON)	/* Cavium Octeon */			\
-	__PMC_CLASS(PPC7450)	/* Motorola MPC7450 class */		\
-	__PMC_CLASS(PPC970)	/* IBM PowerPC 970 class */		\
-	__PMC_CLASS(SOFT)	/* Software events */
-
-enum pmc_class {
-#undef  __PMC_CLASS
-#define	__PMC_CLASS(N)	PMC_CLASS_##N ,
-	__PMC_CLASSES()
-};
-
-#define	PMC_CLASS_FIRST	PMC_CLASS_TSC
-#define	PMC_CLASS_LAST	PMC_CLASS_SOFT
-
-/*
- * A PMC can be in the following states:
- *
- * Hardware states:
- *   DISABLED   -- administratively prohibited from being used.
- *   FREE       -- HW available for use
- * Software states:
- *   ALLOCATED  -- allocated
- *   STOPPED    -- allocated, but not counting events
- *   RUNNING    -- allocated, and in operation; 'pm_runcount'
- *                 holds the number of CPUs using this PMC at
- *                 a given instant
- *   DELETED    -- being destroyed
- */
-
-#define	__PMC_HWSTATES()			\
-	__PMC_STATE(DISABLED)			\
-	__PMC_STATE(FREE)
-
-#define	__PMC_SWSTATES()			\
-	__PMC_STATE(ALLOCATED)			\
-	__PMC_STATE(STOPPED)			\
-	__PMC_STATE(RUNNING)			\
-	__PMC_STATE(DELETED)
-
-#define	__PMC_STATES()				\
-	__PMC_HWSTATES()			\
-	__PMC_SWSTATES()
-
-enum pmc_state {
-#undef	__PMC_STATE
-#define	__PMC_STATE(S)	PMC_STATE_##S,
-	__PMC_STATES()
-	__PMC_STATE(MAX)
-};
-
-#define	PMC_STATE_FIRST	PMC_STATE_DISABLED
-#define	PMC_STATE_LAST	PMC_STATE_DELETED
-
-/*
- * An allocated PMC may used as a 'global' counter or as a
- * 'thread-private' one.  Each such mode of use can be in either
- * statistical sampling mode or in counting mode.  Thus a PMC in use
- *
- * SS i.e., SYSTEM STATISTICAL  -- system-wide statistical profiling
- * SC i.e., SYSTEM COUNTER      -- system-wide counting mode
- * TS i.e., THREAD STATISTICAL  -- thread virtual, statistical profiling
- * TC i.e., THREAD COUNTER      -- thread virtual, counting mode
- *
- * Statistical profiling modes rely on the PMC periodically delivering
- * a interrupt to the CPU (when the configured number of events have
- * been measured), so the PMC must have the ability to generate
- * interrupts.
- *
- * In counting modes, the PMC counts its configured events, with the
- * value of the PMC being read whenever needed by its owner process.
- *
- * The thread specific modes "virtualize" the PMCs -- the PMCs appear
- * to be thread private and count events only when the profiled thread
- * actually executes on the CPU.
- *
- * The system-wide "global" modes keep the PMCs running all the time
- * and are used to measure the behaviour of the whole system.
- */
-
-#define	__PMC_MODES()				\
-	__PMC_MODE(SS,	0)			\
-	__PMC_MODE(SC,	1)			\
-	__PMC_MODE(TS,	2)			\
-	__PMC_MODE(TC,	3)
-
-enum pmc_mode {
-#undef	__PMC_MODE
-#define	__PMC_MODE(M,N)	PMC_MODE_##M = N,
-	__PMC_MODES()
-};
-
-#define	PMC_MODE_FIRST	PMC_MODE_SS
-#define	PMC_MODE_LAST	PMC_MODE_TC
-
-#define	PMC_IS_COUNTING_MODE(mode)				\
-	((mode) == PMC_MODE_SC || (mode) == PMC_MODE_TC)
-#define	PMC_IS_SYSTEM_MODE(mode)				\
-	((mode) == PMC_MODE_SS || (mode) == PMC_MODE_SC)
-#define	PMC_IS_SAMPLING_MODE(mode)				\
-	((mode) == PMC_MODE_SS || (mode) == PMC_MODE_TS)
-#define	PMC_IS_VIRTUAL_MODE(mode)				\
-	((mode) == PMC_MODE_TS || (mode) == PMC_MODE_TC)
-
-/*
- * PMC row disposition
- */
-
-#define	__PMC_DISPOSITIONS(N)					\
-	__PMC_DISP(STANDALONE)	/* global/disabled counters */	\
-	__PMC_DISP(FREE)	/* free/available */		\
-	__PMC_DISP(THREAD)	/* thread-virtual PMCs */	\
-	__PMC_DISP(UNKNOWN)	/* sentinel */
-
-enum pmc_disp {
-#undef	__PMC_DISP
-#define	__PMC_DISP(D)	PMC_DISP_##D ,
-	__PMC_DISPOSITIONS()
-};
-
-#define	PMC_DISP_FIRST	PMC_DISP_STANDALONE
-#define	PMC_DISP_LAST	PMC_DISP_THREAD
-
-/*
- * Counter capabilities
- *
- * __PMC_CAPS(NAME, VALUE, DESCRIPTION)
- */
-
-#define	__PMC_CAPS()							\
-	__PMC_CAP(INTERRUPT,	0, "generate interrupts")		\
-	__PMC_CAP(USER,		1, "count user-mode events")		\
-	__PMC_CAP(SYSTEM,	2, "count system-mode events")		\
-	__PMC_CAP(EDGE,		3, "do edge detection of events")	\
-	__PMC_CAP(THRESHOLD,	4, "ignore events below a threshold")	\
-	__PMC_CAP(READ,		5, "read PMC counter")			\
-	__PMC_CAP(WRITE,	6, "reprogram PMC counter")		\
-	__PMC_CAP(INVERT,	7, "invert comparision sense")		\
-	__PMC_CAP(QUALIFIER,	8, "further qualify monitored events")	\
-	__PMC_CAP(PRECISE,	9, "perform precise sampling")		\
-	__PMC_CAP(TAGGING,	10, "tag upstream events")		\
-	__PMC_CAP(CASCADE,	11, "cascade counters")
-
-enum pmc_caps
-{
-#undef	__PMC_CAP
-#define	__PMC_CAP(NAME, VALUE, DESCR)	PMC_CAP_##NAME = (1 << VALUE) ,
-	__PMC_CAPS()
-};
-
-#define	PMC_CAP_FIRST		PMC_CAP_INTERRUPT
-#define	PMC_CAP_LAST		PMC_CAP_CASCADE
-
-/*
- * PMC Event Numbers
- *
- * These are generated from the definitions in "dev/hwpmc/pmc_events.h".
- */
-
-enum pmc_event {
-#undef	__PMC_EV
-#undef	__PMC_EV_BLOCK
-#define	__PMC_EV_BLOCK(C,V)	PMC_EV_ ## C ## __BLOCK_START = (V) - 1 ,
-#define	__PMC_EV(C,N)		PMC_EV_ ## C ## _ ## N ,
-	__PMC_EVENTS()
-};
-
-/*
- * PMC SYSCALL INTERFACE
- */
-
-/*
- * "PMC_OPS" -- these are the commands recognized by the kernel
- * module, and are used when performing a system call from userland.
- */
-#define	__PMC_OPS()							\
-	__PMC_OP(CONFIGURELOG, "Set log file")				\
-	__PMC_OP(FLUSHLOG, "Flush log file")				\
-	__PMC_OP(GETCPUINFO, "Get system CPU information")		\
-	__PMC_OP(GETDRIVERSTATS, "Get driver statistics")		\
-	__PMC_OP(GETMODULEVERSION, "Get module version")		\
-	__PMC_OP(GETPMCINFO, "Get per-cpu PMC information")		\
-	__PMC_OP(PMCADMIN, "Set PMC state")				\
-	__PMC_OP(PMCALLOCATE, "Allocate and configure a PMC")		\
-	__PMC_OP(PMCATTACH, "Attach a PMC to a process")		\
-	__PMC_OP(PMCDETACH, "Detach a PMC from a process")		\
-	__PMC_OP(PMCGETMSR, "Get a PMC's hardware address")		\
-	__PMC_OP(PMCRELEASE, "Release a PMC")				\
-	__PMC_OP(PMCRW, "Read/Set a PMC")				\
-	__PMC_OP(PMCSETCOUNT, "Set initial count/sampling rate")	\
-	__PMC_OP(PMCSTART, "Start a PMC")				\
-	__PMC_OP(PMCSTOP, "Stop a PMC")					\
-	__PMC_OP(WRITELOG, "Write a cookie to the log file")		\
-	__PMC_OP(CLOSELOG, "Close log file")				\
-	__PMC_OP(GETDYNEVENTINFO, "Get dynamic events list")
-
-
-enum pmc_ops {
-#undef	__PMC_OP
-#define	__PMC_OP(N, D)	PMC_OP_##N,
-	__PMC_OPS()
-};
-
-
-/*
- * Flags used in operations on PMCs.
- */
-
-#define	PMC_F_FORCE		0x00000001 /*OP ADMIN force operation */
-#define	PMC_F_DESCENDANTS	0x00000002 /*OP ALLOCATE track descendants */
-#define	PMC_F_LOG_PROCCSW	0x00000004 /*OP ALLOCATE track ctx switches */
-#define	PMC_F_LOG_PROCEXIT	0x00000008 /*OP ALLOCATE log proc exits */
-#define	PMC_F_NEWVALUE		0x00000010 /*OP RW write new value */
-#define	PMC_F_OLDVALUE		0x00000020 /*OP RW get old value */
-#define	PMC_F_KGMON		0x00000040 /*OP ALLOCATE kgmon(8) profiling */
-/* V2 API */
-#define	PMC_F_CALLCHAIN		0x00000080 /*OP ALLOCATE capture callchains */
-
-/* internal flags */
-#define	PMC_F_ATTACHED_TO_OWNER	0x00010000 /*attached to owner*/
-#define	PMC_F_NEEDS_LOGFILE	0x00020000 /*needs log file */
-#define	PMC_F_ATTACH_DONE	0x00040000 /*attached at least once */
-
-#define	PMC_CALLCHAIN_DEPTH_MAX	128
-
-#define	PMC_CC_F_USERSPACE	0x01	   /*userspace callchain*/
-
-/*
- * Cookies used to denote allocated PMCs, and the values of PMCs.
- */
-
-typedef uint32_t	pmc_id_t;
-typedef uint64_t	pmc_value_t;
-
-#define	PMC_ID_INVALID		(~ (pmc_id_t) 0)
-
-/*
- * PMC IDs have the following format:
- *
- * +--------+----------+-----------+-----------+
- * |   CPU  | PMC MODE | PMC CLASS | ROW INDEX |
- * +--------+----------+-----------+-----------+
- *
- * where each field is 8 bits wide.  Field 'CPU' is set to the
- * requested CPU for system-wide PMCs or PMC_CPU_ANY for process-mode
- * PMCs.  Field 'PMC MODE' is the allocated PMC mode.  Field 'PMC
- * CLASS' is the class of the PMC.  Field 'ROW INDEX' is the row index
- * for the PMC.
- *
- * The 'ROW INDEX' ranges over 0..NWPMCS where NHWPMCS is the total
- * number of hardware PMCs on this cpu.
- */
-
-
-#define	PMC_ID_TO_ROWINDEX(ID)	((ID) & 0xFF)
-#define	PMC_ID_TO_CLASS(ID)	(((ID) & 0xFF00) >> 8)
-#define	PMC_ID_TO_MODE(ID)	(((ID) & 0xFF0000) >> 16)
-#define	PMC_ID_TO_CPU(ID)	(((ID) & 0xFF000000) >> 24)
-#define	PMC_ID_MAKE_ID(CPU,MODE,CLASS,ROWINDEX)			\
-	((((CPU) & 0xFF) << 24) | (((MODE) & 0xFF) << 16) |	\
-	(((CLASS) & 0xFF) << 8) | ((ROWINDEX) & 0xFF))
-
-/*
- * Data structures for system calls supported by the pmc driver.
- */
-
-/*
- * OP PMCALLOCATE
- *
- * Allocate a PMC on the named CPU.
- */
-
-#define	PMC_CPU_ANY	~0
-
-struct pmc_op_pmcallocate {
-	uint32_t	pm_caps;	/* PMC_CAP_* */
-	uint32_t	pm_cpu;		/* CPU number or PMC_CPU_ANY */
-	enum pmc_class	pm_class;	/* class of PMC desired */
-	enum pmc_event	pm_ev;		/* [enum pmc_event] desired */
-	uint32_t	pm_flags;	/* additional modifiers PMC_F_* */
-	enum pmc_mode	pm_mode;	/* desired mode */
-	pmc_id_t	pm_pmcid;	/* [return] process pmc id */
-
-	union pmc_md_op_pmcallocate pm_md; /* MD layer extensions */
-};
-
-/*
- * OP PMCADMIN
- *
- * Set the administrative state (i.e., whether enabled or disabled) of
- * a PMC 'pm_pmc' on CPU 'pm_cpu'.  Note that 'pm_pmc' specifies an
- * absolute PMC number and need not have been first allocated by the
- * calling process.
- */
-
-struct pmc_op_pmcadmin {
-	int		pm_cpu;		/* CPU# */
-	uint32_t	pm_flags;	/* flags */
-	int		pm_pmc;         /* PMC# */
-	enum pmc_state  pm_state;	/* desired state */
-};
-
-/*
- * OP PMCATTACH / OP PMCDETACH
- *
- * Attach/detach a PMC and a process.
- */
-
-struct pmc_op_pmcattach {
-	pmc_id_t	pm_pmc;		/* PMC to attach to */
-	pid_t		pm_pid;		/* target process */
-};
-
-/*
- * OP PMCSETCOUNT
- *
- * Set the sampling rate (i.e., the reload count) for statistical counters.
- * 'pm_pmcid' need to have been previously allocated using PMCALLOCATE.
- */
-
-struct pmc_op_pmcsetcount {
-	pmc_value_t	pm_count;	/* initial/sample count */
-	pmc_id_t	pm_pmcid;	/* PMC id to set */
-};
-
-
-/*
- * OP PMCRW
- *
- * Read the value of a PMC named by 'pm_pmcid'.  'pm_pmcid' needs
- * to have been previously allocated using PMCALLOCATE.
- */
-
-
-struct pmc_op_pmcrw {
-	uint32_t	pm_flags;	/* PMC_F_{OLD,NEW}VALUE*/
-	pmc_id_t	pm_pmcid;	/* pmc id */
-	pmc_value_t	pm_value;	/* new&returned value */
-};
-
-
-/*
- * OP GETPMCINFO
- *
- * retrieve PMC state for a named CPU.  The caller is expected to
- * allocate 'npmc' * 'struct pmc_info' bytes of space for the return
- * values.
- */
-
-struct pmc_info {
-	char		pm_name[PMC_NAME_MAX]; /* pmc name */
-	enum pmc_class	pm_class;	/* enum pmc_class */
-	int		pm_enabled;	/* whether enabled */
-	enum pmc_disp	pm_rowdisp;	/* FREE, THREAD or STANDLONE */
-	pid_t		pm_ownerpid;	/* owner, or -1 */
-	enum pmc_mode	pm_mode;	/* current mode [enum pmc_mode] */
-	enum pmc_event	pm_event;	/* current event */
-	uint32_t	pm_flags;	/* current flags */
-	pmc_value_t	pm_reloadcount;	/* sampling counters only */
-};
-
-struct pmc_op_getpmcinfo {
-	int32_t		pm_cpu;		/* 0 <= cpu < mp_maxid */
-	struct pmc_info	pm_pmcs[];	/* space for 'npmc' structures */
-};
-
-
-/*
- * OP GETCPUINFO
- *
- * Retrieve system CPU information.
- */
-
-
-struct pmc_classinfo {
-	enum pmc_class	pm_class;	/* class id */
-	uint32_t	pm_caps;	/* counter capabilities */
-	uint32_t	pm_width;	/* width of the PMC */
-	uint32_t	pm_num;		/* number of PMCs in class */
-};
-
-struct pmc_op_getcpuinfo {
-	enum pmc_cputype pm_cputype; /* what kind of CPU */
-	uint32_t	pm_ncpu;    /* max CPU number */
-	uint32_t	pm_npmc;    /* #PMCs per CPU */
-	uint32_t	pm_nclass;  /* #classes of PMCs */
-	struct pmc_classinfo  pm_classes[PMC_CLASS_MAX];
-};
-
-/*
- * OP CONFIGURELOG
- *
- * Configure a log file for writing system-wide statistics to.
- */
-
-struct pmc_op_configurelog {
-	int		pm_flags;
-	int		pm_logfd;   /* logfile fd (or -1) */
-};
-
-/*
- * OP GETDRIVERSTATS
- *
- * Retrieve pmc(4) driver-wide statistics.
- */
-
-struct pmc_op_getdriverstats {
-	int	pm_intr_ignored;	/* #interrupts ignored */
-	int	pm_intr_processed;	/* #interrupts processed */
-	int	pm_intr_bufferfull;	/* #interrupts with ENOSPC */
-	int	pm_syscalls;		/* #syscalls */
-	int	pm_syscall_errors;	/* #syscalls with errors */
-	int	pm_buffer_requests;	/* #buffer requests */
-	int	pm_buffer_requests_failed; /* #failed buffer requests */
-	int	pm_log_sweeps;		/* #sample buffer processing passes */
-};
-
-/*
- * OP RELEASE / OP START / OP STOP
- *
- * Simple operations on a PMC id.
- */
-
-struct pmc_op_simple {
-	pmc_id_t	pm_pmcid;
-};
-
-/*
- * OP WRITELOG
- *
- * Flush the current log buffer and write 4 bytes of user data to it.
- */
-
-struct pmc_op_writelog {
-	uint32_t	pm_userdata;
-};
-
-/*
- * OP GETMSR
- *
- * Retrieve the machine specific address assoicated with the allocated
- * PMC.  This number can be used subsequently with a read-performance-counter
- * instruction.
- */
-
-struct pmc_op_getmsr {
-	uint32_t	pm_msr;		/* machine specific address */
-	pmc_id_t	pm_pmcid;	/* allocated pmc id */
-};
-
-/*
- * OP GETDYNEVENTINFO
- *
- * Retrieve a PMC dynamic class events list.
- */
-
-struct pmc_dyn_event_descr {
-	char		pm_ev_name[PMC_NAME_MAX];
-	enum pmc_event	pm_ev_code;
-};
-
-struct pmc_op_getdyneventinfo {
-	enum pmc_class			pm_class;
-	unsigned int			pm_nevent;
-	struct pmc_dyn_event_descr	pm_events[PMC_EV_DYN_COUNT];
-};
-
-#ifdef _KERNEL
-
-#include <sys/malloc.h>
-#include <sys/sysctl.h>
-
-#include <machine/frame.h>
-
-#define	PMC_HASH_SIZE				1024
-#define	PMC_MTXPOOL_SIZE			2048
-#define	PMC_LOG_BUFFER_SIZE			4
-#define	PMC_NLOGBUFFERS				1024
-#define	PMC_NSAMPLES				1024
-#define	PMC_CALLCHAIN_DEPTH			32
-
-#define PMC_SYSCTL_NAME_PREFIX "kern." PMC_MODULE_NAME "."
-
-/*
- * Locking keys
- *
- * (b) - pmc_bufferlist_mtx (spin lock)
- * (k) - pmc_kthread_mtx (sleep lock)
- * (o) - po->po_mtx (spin lock)
- */
-
-/*
- * PMC commands
- */
-
-struct pmc_syscall_args {
-	register_t	pmop_code;	/* one of PMC_OP_* */
-	void		*pmop_data;	/* syscall parameter */
-};
-
-/*
- * Interface to processor specific s1tuff
- */
-
-/*
- * struct pmc_descr
- *
- * Machine independent (i.e., the common parts) of a human readable
- * PMC description.
- */
-
-struct pmc_descr {
-	char		pd_name[PMC_NAME_MAX]; /* name */
-	uint32_t	pd_caps;	/* capabilities */
-	enum pmc_class	pd_class;	/* class of the PMC */
-	uint32_t	pd_width;	/* width in bits */
-};
-
-/*
- * struct pmc_target
- *
- * This structure records all the target processes associated with a
- * PMC.
- */
-
-struct pmc_target {
-	LIST_ENTRY(pmc_target)	pt_next;
-	struct pmc_process	*pt_process; /* target descriptor */
-};
-
-/*
- * struct pmc
- *
- * Describes each allocated PMC.
- *
- * Each PMC has precisely one owner, namely the process that allocated
- * the PMC.
- *
- * A PMC may be attached to multiple target processes.  The
- * 'pm_targets' field links all the target processes being monitored
- * by this PMC.
- *
- * The 'pm_savedvalue' field is protected by a mutex.
- *
- * On a multi-cpu machine, multiple target threads associated with a
- * process-virtual PMC could be concurrently executing on different
- * CPUs.  The 'pm_runcount' field is atomically incremented every time
- * the PMC gets scheduled on a CPU and atomically decremented when it
- * get descheduled.  Deletion of a PMC is only permitted when this
- * field is '0'.
- *
- */
-
-struct pmc {
-	LIST_HEAD(,pmc_target)	pm_targets;	/* list of target processes */
-	LIST_ENTRY(pmc)		pm_next;	/* owner's list */
-
-	/*
-	 * System-wide PMCs are allocated on a CPU and are not moved
-	 * around.  For system-wide PMCs we record the CPU the PMC was
-	 * allocated on in the 'CPU' field of the pmc ID.
-	 *
-	 * Virtual PMCs run on whichever CPU is currently executing
-	 * their targets' threads.  For these PMCs we need to save
-	 * their current PMC counter values when they are taken off
-	 * CPU.
-	 */
-
-	union {
-		pmc_value_t	pm_savedvalue;	/* Virtual PMCS */
-	} pm_gv;
-
-	/*
-	 * For sampling mode PMCs, we keep track of the PMC's "reload
-	 * count", which is the counter value to be loaded in when
-	 * arming the PMC for the next counting session.  For counting
-	 * modes on PMCs that are read-only (e.g., the x86 TSC), we
-	 * keep track of the initial value at the start of
-	 * counting-mode operation.
-	 */
-
-	union {
-		pmc_value_t	pm_reloadcount;	/* sampling PMC modes */
-		pmc_value_t	pm_initial;	/* counting PMC modes */
-	} pm_sc;
-
-	uint32_t	pm_stalled;	/* marks stalled sampling PMCs */
-	uint32_t	pm_caps;	/* PMC capabilities */
-	enum pmc_event	pm_event;	/* event being measured */
-	uint32_t	pm_flags;	/* additional flags PMC_F_... */
-	struct pmc_owner *pm_owner;	/* owner thread state */
-	int		pm_runcount;	/* #cpus currently on */
-	enum pmc_state	pm_state;	/* current PMC state */
-
-	/*
-	 * The PMC ID field encodes the row-index for the PMC, its
-	 * mode, class and the CPU# associated with the PMC.
-	 */
-
-	pmc_id_t	pm_id;		/* allocated PMC id */
-
-	/* md extensions */
-	union pmc_md_pmc	pm_md;
-};
-
-/*
- * Accessor macros for 'struct pmc'
- */
-
-#define	PMC_TO_MODE(P)		PMC_ID_TO_MODE((P)->pm_id)
-#define	PMC_TO_CLASS(P)		PMC_ID_TO_CLASS((P)->pm_id)
-#define	PMC_TO_ROWINDEX(P)	PMC_ID_TO_ROWINDEX((P)->pm_id)
-#define	PMC_TO_CPU(P)		PMC_ID_TO_CPU((P)->pm_id)
-
-
-/*
- * struct pmc_process
- *
- * Record a 'target' process being profiled.
- *
- * The target process being profiled could be different from the owner
- * process which allocated the PMCs.  Each target process descriptor
- * is associated with NHWPMC 'struct pmc *' pointers.  Each PMC at a
- * given hardware row-index 'n' will use slot 'n' of the 'pp_pmcs[]'
- * array.  The size of this structure is thus PMC architecture
- * dependent.
- *
- */
-
-struct pmc_targetstate {
-	struct pmc	*pp_pmc;   /* target PMC */
-	pmc_value_t	pp_pmcval; /* per-process value */
-};
-
-struct pmc_process {
-	LIST_ENTRY(pmc_process) pp_next;	/* hash chain */
-	int		pp_refcnt;		/* reference count */
-	uint32_t	pp_flags;		/* flags PMC_PP_* */
-	struct proc	*pp_proc;		/* target thread */
-	struct pmc_targetstate pp_pmcs[];       /* NHWPMCs */
-};
-
-#define	PMC_PP_ENABLE_MSR_ACCESS	0x00000001
-
-/*
- * struct pmc_owner
- *
- * We associate a PMC with an 'owner' process.
- *
- * A process can be associated with 0..NCPUS*NHWPMC PMCs during its
- * lifetime, where NCPUS is the numbers of CPUS in the system and
- * NHWPMC is the number of hardware PMCs per CPU.  These are
- * maintained in the list headed by the 'po_pmcs' to save on space.
- *
- */
-
-struct pmc_owner  {
-	LIST_ENTRY(pmc_owner)	po_next;	/* hash chain */
-	LIST_ENTRY(pmc_owner)	po_ssnext;	/* list of SS PMC owners */
-	LIST_HEAD(, pmc)	po_pmcs;	/* owned PMC list */
-	TAILQ_HEAD(, pmclog_buffer) po_logbuffers; /* (o) logbuffer list */
-	struct mtx		po_mtx;		/* spin lock for (o) */
-	struct proc		*po_owner;	/* owner proc */
-	uint32_t		po_flags;	/* (k) flags PMC_PO_* */
-	struct proc		*po_kthread;	/* (k) helper kthread */
-	struct pmclog_buffer	*po_curbuf;	/* current log buffer */
-	struct file		*po_file;	/* file reference */
-	int			po_error;	/* recorded error */
-	short			po_sscount;	/* # SS PMCs owned */
-	short			po_logprocmaps;	/* global mappings done */
-};
-
-#define	PMC_PO_OWNS_LOGFILE		0x00000001 /* has a log file */
-#define	PMC_PO_SHUTDOWN			0x00000010 /* in the process of shutdown */
-#define	PMC_PO_INITIAL_MAPPINGS_DONE	0x00000020
-
-/*
- * struct pmc_hw -- describe the state of the PMC hardware
- *
- * When in use, a HW PMC is associated with one allocated 'struct pmc'
- * pointed to by field 'phw_pmc'.  When inactive, this field is NULL.
- *
- * On an SMP box, one or more HW PMC's in process virtual mode with
- * the same 'phw_pmc' could be executing on different CPUs.  In order
- * to handle this case correctly, we need to ensure that only
- * incremental counts get added to the saved value in the associated
- * 'struct pmc'.  The 'phw_save' field is used to keep the saved PMC
- * value at the time the hardware is started during this context
- * switch (i.e., the difference between the new (hardware) count and
- * the saved count is atomically added to the count field in 'struct
- * pmc' at context switch time).
- *
- */
-
-struct pmc_hw {
-	uint32_t	phw_state;	/* see PHW_* macros below */
-	struct pmc	*phw_pmc;	/* current thread PMC */
-};
-
-#define	PMC_PHW_RI_MASK		0x000000FF
-#define	PMC_PHW_CPU_SHIFT	8
-#define	PMC_PHW_CPU_MASK	0x0000FF00
-#define	PMC_PHW_FLAGS_SHIFT	16
-#define	PMC_PHW_FLAGS_MASK	0xFFFF0000
-
-#define	PMC_PHW_INDEX_TO_STATE(ri)	((ri) & PMC_PHW_RI_MASK)
-#define	PMC_PHW_STATE_TO_INDEX(state)	((state) & PMC_PHW_RI_MASK)
-#define	PMC_PHW_CPU_TO_STATE(cpu)	(((cpu) << PMC_PHW_CPU_SHIFT) & \
-	PMC_PHW_CPU_MASK)
-#define	PMC_PHW_STATE_TO_CPU(state)	(((state) & PMC_PHW_CPU_MASK) >> \
-	PMC_PHW_CPU_SHIFT)
-#define	PMC_PHW_FLAGS_TO_STATE(flags)	(((flags) << PMC_PHW_FLAGS_SHIFT) & \
-	PMC_PHW_FLAGS_MASK)
-#define	PMC_PHW_STATE_TO_FLAGS(state)	(((state) & PMC_PHW_FLAGS_MASK) >> \
-	PMC_PHW_FLAGS_SHIFT)
-#define	PMC_PHW_FLAG_IS_ENABLED		(PMC_PHW_FLAGS_TO_STATE(0x01))
-#define	PMC_PHW_FLAG_IS_SHAREABLE	(PMC_PHW_FLAGS_TO_STATE(0x02))
-
-/*
- * struct pmc_sample
- *
- * Space for N (tunable) PC samples and associated control data.
- */
-
-struct pmc_sample {
-	uint16_t		ps_nsamples;	/* callchain depth */
-	uint8_t			ps_cpu;		/* cpu number */
-	uint8_t			ps_flags;	/* other flags */
-	pid_t			ps_pid;		/* process PID or -1 */
-	struct thread		*ps_td;		/* which thread */
-	struct pmc		*ps_pmc;	/* interrupting PMC */
-	uintptr_t		*ps_pc;		/* (const) callchain start */
-};
-
-#define 	PMC_SAMPLE_FREE		((uint16_t) 0)
-#define 	PMC_SAMPLE_INUSE	((uint16_t) 0xFFFF)
-
-struct pmc_samplebuffer {
-	struct pmc_sample * volatile ps_read;	/* read pointer */
-	struct pmc_sample * volatile ps_write;	/* write pointer */
-	uintptr_t		*ps_callchains;	/* all saved call chains */
-	struct pmc_sample	*ps_fence;	/* one beyond ps_samples[] */
-	struct pmc_sample	ps_samples[];	/* array of sample entries */
-};
-
-
-/*
- * struct pmc_cpustate
- *
- * A CPU is modelled as a collection of HW PMCs with space for additional
- * flags.
- */
-
-struct pmc_cpu {
-	uint32_t	pc_state;	/* physical cpu number + flags */
-	struct pmc_samplebuffer *pc_sb[2]; /* space for samples */
-	struct pmc_hw	*pc_hwpmcs[];	/* 'npmc' pointers */
-};
-
-#define	PMC_PCPU_CPU_MASK		0x000000FF
-#define	PMC_PCPU_FLAGS_MASK		0xFFFFFF00
-#define	PMC_PCPU_FLAGS_SHIFT		8
-#define	PMC_PCPU_STATE_TO_CPU(S)	((S) & PMC_PCPU_CPU_MASK)
-#define	PMC_PCPU_STATE_TO_FLAGS(S)	(((S) & PMC_PCPU_FLAGS_MASK) >> PMC_PCPU_FLAGS_SHIFT)
-#define	PMC_PCPU_FLAGS_TO_STATE(F)	(((F) << PMC_PCPU_FLAGS_SHIFT) & PMC_PCPU_FLAGS_MASK)
-#define	PMC_PCPU_CPU_TO_STATE(C)	((C) & PMC_PCPU_CPU_MASK)
-#define	PMC_PCPU_FLAG_HTT		(PMC_PCPU_FLAGS_TO_STATE(0x1))
-
-/*
- * struct pmc_binding
- *
- * CPU binding information.
- */
-
-struct pmc_binding {
-	int	pb_bound;	/* is bound? */
-	int	pb_cpu;		/* if so, to which CPU */
-};
-
-
-struct pmc_mdep;
-
-/*
- * struct pmc_classdep
- *
- * PMC class-dependent operations.
- */
-struct pmc_classdep {
-	uint32_t	pcd_caps;	/* class capabilities */
-	enum pmc_class	pcd_class;	/* class id */
-	int		pcd_num;	/* number of PMCs */
-	int		pcd_ri;		/* row index of the first PMC in class */
-	int		pcd_width;	/* width of the PMC */
-
-	/* configuring/reading/writing the hardware PMCs */
-	int (*pcd_config_pmc)(int _cpu, int _ri, struct pmc *_pm);
-	int (*pcd_get_config)(int _cpu, int _ri, struct pmc **_ppm);
-	int (*pcd_read_pmc)(int _cpu, int _ri, pmc_value_t *_value);
-	int (*pcd_write_pmc)(int _cpu, int _ri, pmc_value_t _value);
-
-	/* pmc allocation/release */
-	int (*pcd_allocate_pmc)(int _cpu, int _ri, struct pmc *_t,
-		const struct pmc_op_pmcallocate *_a);
-	int (*pcd_release_pmc)(int _cpu, int _ri, struct pmc *_pm);
-
-	/* starting and stopping PMCs */
-	int (*pcd_start_pmc)(int _cpu, int _ri);
-	int (*pcd_stop_pmc)(int _cpu, int _ri);
-
-	/* description */
-	int (*pcd_describe)(int _cpu, int _ri, struct pmc_info *_pi,
-		struct pmc **_ppmc);
-
-	/* class-dependent initialization & finalization */
-	int (*pcd_pcpu_init)(struct pmc_mdep *_md, int _cpu);
-	int (*pcd_pcpu_fini)(struct pmc_mdep *_md, int _cpu);
-
-	/* machine-specific interface */
-	int (*pcd_get_msr)(int _ri, uint32_t *_msr);
-};
-
-/*
- * struct pmc_mdep
- *
- * Machine dependent bits needed per CPU type.
- */
-
-struct pmc_mdep  {
-	uint32_t	pmd_cputype;    /* from enum pmc_cputype */
-	uint32_t	pmd_npmc;	/* number of PMCs per CPU */
-	uint32_t	pmd_nclass;	/* number of PMC classes present */
-
-	/*
-	 * Machine dependent methods.
-	 */
-
-	/* per-cpu initialization and finalization */
-	int (*pmd_pcpu_init)(struct pmc_mdep *_md, int _cpu);
-	int (*pmd_pcpu_fini)(struct pmc_mdep *_md, int _cpu);
-
-	/* thread context switch in/out */
-	int (*pmd_switch_in)(struct pmc_cpu *_p, struct pmc_process *_pp);
-	int (*pmd_switch_out)(struct pmc_cpu *_p, struct pmc_process *_pp);
-
-	/* handle a PMC interrupt */
-	int (*pmd_intr)(int _cpu, struct trapframe *_tf);
-
-	/*
-	 * PMC class dependent information.
-	 */
-	struct pmc_classdep pmd_classdep[];
-};
-
-/*
- * Per-CPU state.  This is an array of 'mp_ncpu' pointers
- * to struct pmc_cpu descriptors.
- */
-
-extern struct pmc_cpu **pmc_pcpu;
-
-/* driver statistics */
-extern struct pmc_op_getdriverstats pmc_stats;
-
-#if	defined(HWPMC_DEBUG)
-#include <sys/ktr.h>
-
-/* debug flags, major flag groups */
-struct pmc_debugflags {
-	int	pdb_CPU;
-	int	pdb_CSW;
-	int	pdb_LOG;
-	int	pdb_MDP;
-	int	pdb_MOD;
-	int	pdb_OWN;
-	int	pdb_PMC;
-	int	pdb_PRC;
-	int	pdb_SAM;
-};
-
-extern struct pmc_debugflags pmc_debugflags;
-
-#define	KTR_PMC			KTR_SUBSYS
-
-#define	PMC_DEBUG_STRSIZE		128
-#define	PMC_DEBUG_DEFAULT_FLAGS		{ 0, 0, 0, 0, 0, 0, 0, 0 }
-
-#define	PMCDBG0(M, N, L, F) do {					\
-	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
-		CTR0(KTR_PMC, #M ":" #N ":" #L  ": " F);		\
-} while (0)
-#define	PMCDBG1(M, N, L, F, p1) do {					\
-	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
-		CTR1(KTR_PMC, #M ":" #N ":" #L  ": " F, p1);		\
-} while (0)
-#define	PMCDBG2(M, N, L, F, p1, p2) do {				\
-	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
-		CTR2(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2);	\
-} while (0)
-#define	PMCDBG3(M, N, L, F, p1, p2, p3) do {				\
-	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
-		CTR3(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2, p3);	\
-} while (0)
-#define	PMCDBG4(M, N, L, F, p1, p2, p3, p4) do {			\
-	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
-		CTR4(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2, p3, p4);\
-} while (0)
-#define	PMCDBG5(M, N, L, F, p1, p2, p3, p4, p5) do {			\
-	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
-		CTR5(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2, p3, p4,	\
-		    p5);						\
-} while (0)
-#define	PMCDBG6(M, N, L, F, p1, p2, p3, p4, p5, p6) do {		\
-	if (pmc_debugflags.pdb_ ## M & (1 << PMC_DEBUG_MIN_ ## N))	\
-		CTR6(KTR_PMC, #M ":" #N ":" #L  ": " F, p1, p2, p3, p4,	\
-		    p5, p6);						\
-} while (0)
-	
-/* Major numbers */
-#define	PMC_DEBUG_MAJ_CPU		0 /* cpu switches */
-#define	PMC_DEBUG_MAJ_CSW		1 /* context switches */
-#define	PMC_DEBUG_MAJ_LOG		2 /* logging */
-#define	PMC_DEBUG_MAJ_MDP		3 /* machine dependent */
-#define	PMC_DEBUG_MAJ_MOD		4 /* misc module infrastructure */
-#define	PMC_DEBUG_MAJ_OWN		5 /* owner */
-#define	PMC_DEBUG_MAJ_PMC		6 /* pmc management */
-#define	PMC_DEBUG_MAJ_PRC		7 /* processes */
-#define	PMC_DEBUG_MAJ_SAM		8 /* sampling */
-
-/* Minor numbers */
-
-/* Common (8 bits) */
-#define	PMC_DEBUG_MIN_ALL		0 /* allocation */
-#define	PMC_DEBUG_MIN_REL		1 /* release */
-#define	PMC_DEBUG_MIN_OPS		2 /* ops: start, stop, ... */
-#define	PMC_DEBUG_MIN_INI		3 /* init */
-#define	PMC_DEBUG_MIN_FND		4 /* find */
-
-/* MODULE */
-#define	PMC_DEBUG_MIN_PMH	       14 /* pmc_hook */
-#define	PMC_DEBUG_MIN_PMS	       15 /* pmc_syscall */
-
-/* OWN */
-#define	PMC_DEBUG_MIN_ORM		8 /* owner remove */
-#define	PMC_DEBUG_MIN_OMR		9 /* owner maybe remove */
-
-/* PROCESSES */
-#define	PMC_DEBUG_MIN_TLK		8 /* link target */
-#define	PMC_DEBUG_MIN_TUL		9 /* unlink target */
-#define	PMC_DEBUG_MIN_EXT	       10 /* process exit */
-#define	PMC_DEBUG_MIN_EXC	       11 /* process exec */
-#define	PMC_DEBUG_MIN_FRK	       12 /* process fork */
-#define	PMC_DEBUG_MIN_ATT	       13 /* attach/detach */
-#define	PMC_DEBUG_MIN_SIG	       14 /* signalling */
-
-/* CONTEXT SWITCHES */
-#define	PMC_DEBUG_MIN_SWI		8 /* switch in */
-#define	PMC_DEBUG_MIN_SWO		9 /* switch out */
-
-/* PMC */
-#define	PMC_DEBUG_MIN_REG		8 /* pmc register */
-#define	PMC_DEBUG_MIN_ALR		9 /* allocate row */
-
-/* MACHINE DEPENDENT LAYER */
-#define	PMC_DEBUG_MIN_REA		8 /* read */
-#define	PMC_DEBUG_MIN_WRI		9 /* write */
-#define	PMC_DEBUG_MIN_CFG	       10 /* config */
-#define	PMC_DEBUG_MIN_STA	       11 /* start */
-#define	PMC_DEBUG_MIN_STO	       12 /* stop */
-#define	PMC_DEBUG_MIN_INT	       13 /* interrupts */
-
-/* CPU */
-#define	PMC_DEBUG_MIN_BND		8 /* bind */
-#define	PMC_DEBUG_MIN_SEL		9 /* select */
-
-/* LOG */
-#define	PMC_DEBUG_MIN_GTB		8 /* get buf */
-#define	PMC_DEBUG_MIN_SIO		9 /* schedule i/o */
-#define	PMC_DEBUG_MIN_FLS	       10 /* flush */
-#define	PMC_DEBUG_MIN_SAM	       11 /* sample */
-#define	PMC_DEBUG_MIN_CLO	       12 /* close */
-
-#else
-#define	PMCDBG0(M, N, L, F)		/* nothing */
-#define	PMCDBG1(M, N, L, F, p1)
-#define	PMCDBG2(M, N, L, F, p1, p2)
-#define	PMCDBG3(M, N, L, F, p1, p2, p3)
-#define	PMCDBG4(M, N, L, F, p1, p2, p3, p4)
-#define	PMCDBG5(M, N, L, F, p1, p2, p3, p4, p5)
-#define	PMCDBG6(M, N, L, F, p1, p2, p3, p4, p5, p6)
-#endif
-
-/* declare a dedicated memory pool */
-MALLOC_DECLARE(M_PMC);
-
-/*
- * Functions
- */
-
-struct pmc_mdep *pmc_md_initialize(void);	/* MD init function */
-void	pmc_md_finalize(struct pmc_mdep *_md);	/* MD fini function */
-int	pmc_getrowdisp(int _ri);
-int	pmc_process_interrupt(int _cpu, int _soft, struct pmc *_pm,
-    struct trapframe *_tf, int _inuserspace);
-int	pmc_save_kernel_callchain(uintptr_t *_cc, int _maxsamples,
-    struct trapframe *_tf);
-int	pmc_save_user_callchain(uintptr_t *_cc, int _maxsamples,
-    struct trapframe *_tf);
-struct pmc_mdep *pmc_mdep_alloc(int nclasses);
-void pmc_mdep_free(struct pmc_mdep *md);
-#endif /* _KERNEL */
-#endif /* _SYS_PMC_H_ */
diff --git a/include.new/sys/pmckern.h b/include.new/sys/pmckern.h
deleted file mode 100644
index 424d1a6..0000000
--- a/include.new/sys/pmckern.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*-
- * Copyright (c) 2003-2007, Joseph Koshy
- * Copyright (c) 2007 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by A. Joseph Koshy under
- * sponsorship from the FreeBSD Foundation and Google, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/pmckern.h 254813 2013-08-24 21:13:38Z markj $
- */
-
-/*
- * PMC interface used by the base kernel.
- */
-
-#ifndef _SYS_PMCKERN_H_
-#define _SYS_PMCKERN_H_
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/proc.h>
-#include <sys/sx.h>
-#include <sys/pmc.h>
-
-#include <machine/cpufunc.h>
-
-#define	PMC_FN_PROCESS_EXEC		1
-#define	PMC_FN_CSW_IN			2
-#define	PMC_FN_CSW_OUT			3
-#define	PMC_FN_DO_SAMPLES		4
-#define	PMC_FN_UNUSED1			5
-#define	PMC_FN_UNUSED2			6
-#define	PMC_FN_MMAP			7
-#define	PMC_FN_MUNMAP			8
-#define	PMC_FN_USER_CALLCHAIN		9
-#define	PMC_FN_USER_CALLCHAIN_SOFT	10
-#define	PMC_FN_SOFT_SAMPLING		11
-
-#define	PMC_HR	0	/* Hardware ring buffer */
-#define	PMC_SR	1	/* Software ring buffer */
-
-struct pmckern_procexec {
-	int		pm_credentialschanged;
-	uintfptr_t	pm_entryaddr;
-};
-
-struct pmckern_map_in {
-	void		*pm_file;	/* filename or vnode pointer */
-	uintfptr_t	pm_address;	/* address object is loaded at */
-};
-
-struct pmckern_map_out {
-	uintfptr_t	pm_address;	/* start address of region */
-	size_t		pm_size;	/* size of unmapped region */
-};
-
-struct pmckern_soft {
-	enum pmc_event		pm_ev;
-	int			pm_cpu;
-	struct trapframe 	*pm_tf;
-};
-
-/*
- * Soft PMC.
- */
-
-#define PMC_SOFT_DEFINE_EX(prov, mod, func, name, alloc, release)		\
-	struct pmc_soft pmc_##prov##_##mod##_##func##_##name =			\
-	    { 0, alloc, release, { #prov "_" #mod "_" #func "." #name, 0 } };	\
-	SYSINIT(pmc_##prov##_##mod##_##func##_##name##_init, SI_SUB_KDTRACE, 	\
-	    SI_ORDER_SECOND + 1, pmc_soft_ev_register, 				\
-	    &pmc_##prov##_##mod##_##func##_##name );				\
-	SYSUNINIT(pmc_##prov##_##mod##_##func##_##name##_uninit, 		\
-	    SI_SUB_KDTRACE, SI_ORDER_SECOND + 1, pmc_soft_ev_deregister,	\
-	    &pmc_##prov##_##mod##_##func##_##name )
-
-#define PMC_SOFT_DEFINE(prov, mod, func, name)					\
-	PMC_SOFT_DEFINE_EX(prov, mod, func, name, NULL, NULL)
-
-#define PMC_SOFT_DECLARE(prov, mod, func, name)					\
-	extern struct pmc_soft pmc_##prov##_##mod##_##func##_##name
-
-/*
- * PMC_SOFT_CALL can be used anywhere in the kernel.
- * Require md defined PMC_FAKE_TRAPFRAME.
- */
-#ifdef PMC_FAKE_TRAPFRAME
-#define PMC_SOFT_CALL(pr, mo, fu, na)						\
-do {										\
-	if (pmc_##pr##_##mo##_##fu##_##na.ps_running) {				\
-		struct pmckern_soft ks;						\
-		register_t intr;						\
-		intr = intr_disable();						\
-		PMC_FAKE_TRAPFRAME(&pmc_tf[curcpu]);				\
-		ks.pm_ev = pmc_##pr##_##mo##_##fu##_##na.ps_ev.pm_ev_code;	\
-		ks.pm_cpu = PCPU_GET(cpuid);					\
-		ks.pm_tf = &pmc_tf[curcpu];					\
-		PMC_CALL_HOOK_UNLOCKED(curthread,				\
-		    PMC_FN_SOFT_SAMPLING, (void *) &ks);			\
-		intr_restore(intr);						\
-	}									\
-} while (0)
-#else
-#define PMC_SOFT_CALL(pr, mo, fu, na)						\
-do {										\
-} while (0)
-#endif
-
-/*
- * PMC_SOFT_CALL_TF need to be used carefully.
- * Userland capture will be done during AST processing.
- */
-#define PMC_SOFT_CALL_TF(pr, mo, fu, na, tf)					\
-do {										\
-	if (pmc_##pr##_##mo##_##fu##_##na.ps_running) {				\
-		struct pmckern_soft ks;						\
-		register_t intr;						\
-		intr = intr_disable();						\
-		ks.pm_ev = pmc_##pr##_##mo##_##fu##_##na.ps_ev.pm_ev_code;	\
-		ks.pm_cpu = PCPU_GET(cpuid);					\
-		ks.pm_tf = tf;							\
-		PMC_CALL_HOOK_UNLOCKED(curthread,				\
-		    PMC_FN_SOFT_SAMPLING, (void *) &ks);			\
-		intr_restore(intr);						\
-	}									\
-} while (0)
-
-struct pmc_soft {
-	int				ps_running;
-	void				(*ps_alloc)(void);
-	void				(*ps_release)(void);
-	struct pmc_dyn_event_descr	ps_ev;
-};
-
-/* hook */
-extern int (*pmc_hook)(struct thread *_td, int _function, void *_arg);
-extern int (*pmc_intr)(int _cpu, struct trapframe *_frame);
-
-/* SX lock protecting the hook */
-extern struct sx pmc_sx;
-
-/* Per-cpu flags indicating availability of sampling data */
-extern volatile cpuset_t pmc_cpumask;
-
-/* Count of system-wide sampling PMCs in existence */
-extern volatile int pmc_ss_count;
-
-/* kernel version number */
-extern const int pmc_kernel_version;
-
-/* PMC soft per cpu trapframe */
-extern struct trapframe pmc_tf[MAXCPU];
-
-/* Hook invocation; for use within the kernel */
-#define	PMC_CALL_HOOK(t, cmd, arg)		\
-do {						\
-	sx_slock(&pmc_sx);			\
-	if (pmc_hook != NULL)			\
-		(pmc_hook)((t), (cmd), (arg));	\
-	sx_sunlock(&pmc_sx);			\
-} while (0)
-
-/* Hook invocation that needs an exclusive lock */
-#define	PMC_CALL_HOOK_X(t, cmd, arg)		\
-do {						\
-	sx_xlock(&pmc_sx);			\
-	if (pmc_hook != NULL)			\
-		(pmc_hook)((t), (cmd), (arg));	\
-	sx_xunlock(&pmc_sx);			\
-} while (0)
-
-/*
- * Some hook invocations (e.g., from context switch and clock handling
- * code) need to be lock-free.
- */
-#define	PMC_CALL_HOOK_UNLOCKED(t, cmd, arg)	\
-do {						\
-	if (pmc_hook != NULL)			\
-		(pmc_hook)((t), (cmd), (arg));	\
-} while (0)
-
-#define	PMC_SWITCH_CONTEXT(t,cmd)	PMC_CALL_HOOK_UNLOCKED(t,cmd,NULL)
-
-/* Check if a process is using HWPMCs.*/
-#define PMC_PROC_IS_USING_PMCS(p)				\
-	(__predict_false(p->p_flag & P_HWPMC))
-
-/* Check if a thread have pending user capture. */
-#define PMC_IS_PENDING_CALLCHAIN(p)				\
-	(__predict_false((p)->td_pflags & TDP_CALLCHAIN))
-
-#define	PMC_SYSTEM_SAMPLING_ACTIVE()		(pmc_ss_count > 0)
-
-/* Check if a CPU has recorded samples. */
-#define	PMC_CPU_HAS_SAMPLES(C)	(__predict_false(CPU_ISSET(C, &pmc_cpumask)))
-
-/*
- * Helper functions.
- */
-int		pmc_cpu_is_disabled(int _cpu);  /* deprecated */
-int		pmc_cpu_is_active(int _cpu);
-int		pmc_cpu_is_present(int _cpu);
-int		pmc_cpu_is_primary(int _cpu);
-unsigned int	pmc_cpu_max(void);
-
-#ifdef	INVARIANTS
-int		pmc_cpu_max_active(void);
-#endif
-
-/*
- * Soft events functions.
- */
-void pmc_soft_ev_register(struct pmc_soft *ps);
-void pmc_soft_ev_deregister(struct pmc_soft *ps);
-struct pmc_soft *pmc_soft_ev_acquire(enum pmc_event ev);
-void pmc_soft_ev_release(struct pmc_soft *ps);
-
-#endif /* _SYS_PMCKERN_H_ */
diff --git a/include.new/sys/pmclog.h b/include.new/sys/pmclog.h
deleted file mode 100644
index f91e4a0..0000000
--- a/include.new/sys/pmclog.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*-
- * Copyright (c) 2005-2007, Joseph Koshy
- * Copyright (c) 2007 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by A. Joseph Koshy under
- * sponsorship from the FreeBSD Foundation and Google, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/pmclog.h 233628 2012-03-28 20:58:30Z fabient $
- */
-
-#ifndef	_SYS_PMCLOG_H_
-#define	_SYS_PMCLOG_H_
-
-#include <sys/pmc.h>
-
-enum pmclog_type {
-	/* V1 ABI */
-	PMCLOG_TYPE_CLOSELOG,
-	PMCLOG_TYPE_DROPNOTIFY,
-	PMCLOG_TYPE_INITIALIZE,
-	PMCLOG_TYPE_MAPPINGCHANGE, /* unused in v1 */
-	PMCLOG_TYPE_PCSAMPLE,
-	PMCLOG_TYPE_PMCALLOCATE,
-	PMCLOG_TYPE_PMCATTACH,
-	PMCLOG_TYPE_PMCDETACH,
-	PMCLOG_TYPE_PROCCSW,
-	PMCLOG_TYPE_PROCEXEC,
-	PMCLOG_TYPE_PROCEXIT,
-	PMCLOG_TYPE_PROCFORK,
-	PMCLOG_TYPE_SYSEXIT,
-	PMCLOG_TYPE_USERDATA,
-	/*
-	 * V2 ABI
-	 *
-	 * The MAP_{IN,OUT} event types obsolete the MAPPING_CHANGE
-	 * event type.  The CALLCHAIN event type obsoletes the
-	 * PCSAMPLE event type.
-	 */
-	PMCLOG_TYPE_MAP_IN,
-	PMCLOG_TYPE_MAP_OUT,
-	PMCLOG_TYPE_CALLCHAIN,
-	/*
-	 * V3 ABI
-	 *
-	 * New variant of PMCLOG_TYPE_PMCALLOCATE for dynamic event.
-	 */
-	PMCLOG_TYPE_PMCALLOCATEDYN
-};
-
-/*
- * A log entry descriptor comprises of a 32 bit header and a 64 bit
- * time stamp followed by as many 32 bit words are required to record
- * the event.
- *
- * Header field format:
- *
- *  31           24           16                                   0
- *   +------------+------------+-----------------------------------+
- *   |    MAGIC   |    TYPE    |               LENGTH              |
- *   +------------+------------+-----------------------------------+
- *
- * MAGIC 	is the constant PMCLOG_HEADER_MAGIC.
- * TYPE  	contains a value of type enum pmclog_type.
- * LENGTH	contains the length of the event record, in bytes.
- */
-
-#define	PMCLOG_ENTRY_HEADER				\
-	uint32_t		pl_header;		\
-	uint32_t		pl_ts_sec;		\
-	uint32_t		pl_ts_nsec;
-
-
-/*
- * The following structures are used to describe the size of each kind
- * of log entry to sizeof().  To keep the compiler from adding
- * padding, the fields of each structure are aligned to their natural
- * boundaries, and the structures are marked as 'packed'.
- *
- * The actual reading and writing of the log file is always in terms
- * of 4 byte quantities.
- */
-
-struct pmclog_callchain {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pid;
-	uint32_t		pl_pmcid;
-	uint32_t		pl_cpuflags;
-	/* 8 byte aligned */
-	uintptr_t		pl_pc[PMC_CALLCHAIN_DEPTH_MAX];
-} __packed;
-
-#define	PMC_CALLCHAIN_CPUFLAGS_TO_CPU(CF)	(((CF) >> 16) & 0xFFFF)
-#define	PMC_CALLCHAIN_CPUFLAGS_TO_USERMODE(CF)	((CF) & PMC_CC_F_USERSPACE)
-#define	PMC_CALLCHAIN_TO_CPUFLAGS(CPU,FLAGS)	\
-	(((CPU) << 16) | ((FLAGS) & 0xFFFF))
-
-struct pmclog_closelog {
-	PMCLOG_ENTRY_HEADER
-};
-
-struct pmclog_dropnotify {
-	PMCLOG_ENTRY_HEADER
-};
-
-struct pmclog_initialize {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_version;	/* driver version */
-	uint32_t		pl_cpu;		/* enum pmc_cputype */
-} __packed;
-
-struct pmclog_map_in {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pid;
-	uintfptr_t		pl_start;	/* 8 byte aligned */
-	char			pl_pathname[PATH_MAX];
-} __packed;
-
-struct pmclog_map_out {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pid;
-	uintfptr_t		pl_start;	/* 8 byte aligned */
-	uintfptr_t		pl_end;
-} __packed;
-
-struct pmclog_pcsample {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pid;
-	uintfptr_t		pl_pc;		/* 8 byte aligned */
-	uint32_t		pl_pmcid;
-	uint32_t		pl_usermode;
-} __packed;
-
-struct pmclog_pmcallocate {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pmcid;
-	uint32_t		pl_event;
-	uint32_t		pl_flags;
-} __packed;
-
-struct pmclog_pmcattach {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pmcid;
-	uint32_t		pl_pid;
-	char			pl_pathname[PATH_MAX];
-} __packed;
-
-struct pmclog_pmcdetach {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pmcid;
-	uint32_t		pl_pid;
-} __packed;
-
-struct pmclog_proccsw {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pmcid;
-	uint64_t		pl_value;	/* keep 8 byte aligned */
-	uint32_t		pl_pid;
-} __packed;
-
-struct pmclog_procexec {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pid;
-	uintfptr_t		pl_start;	/* keep 8 byte aligned */
-	uint32_t		pl_pmcid;
-	char			pl_pathname[PATH_MAX];
-} __packed;
-
-struct pmclog_procexit {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pmcid;
-	uint64_t		pl_value;	/* keep 8 byte aligned */
-	uint32_t		pl_pid;
-} __packed;
-
-struct pmclog_procfork {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_oldpid;
-	uint32_t		pl_newpid;
-} __packed;
-
-struct pmclog_sysexit {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pid;
-} __packed;
-
-struct pmclog_userdata {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_userdata;
-} __packed;
-
-struct pmclog_pmcallocatedyn {
-	PMCLOG_ENTRY_HEADER
-	uint32_t		pl_pmcid;
-	uint32_t		pl_event;
-	uint32_t		pl_flags;
-	char			pl_evname[PMC_NAME_MAX];
-} __packed;
-
-union pmclog_entry {		/* only used to size scratch areas */
-	struct pmclog_callchain		pl_cc;
-	struct pmclog_closelog		pl_cl;
-	struct pmclog_dropnotify	pl_dn;
-	struct pmclog_initialize	pl_i;
-	struct pmclog_map_in		pl_mi;
-	struct pmclog_map_out		pl_mo;
-	struct pmclog_pcsample		pl_s;
-	struct pmclog_pmcallocate	pl_a;
-	struct pmclog_pmcallocatedyn	pl_ad;
-	struct pmclog_pmcattach		pl_t;
-	struct pmclog_pmcdetach		pl_d;
-	struct pmclog_proccsw		pl_c;
-	struct pmclog_procexec		pl_x;
-	struct pmclog_procexit		pl_e;
-	struct pmclog_procfork		pl_f;
-	struct pmclog_sysexit		pl_se;
-	struct pmclog_userdata		pl_u;
-};
-
-#define	PMCLOG_HEADER_MAGIC					0xEEU
-
-#define	PMCLOG_HEADER_TO_LENGTH(H)				\
-	((H) & 0x0000FFFF)
-#define	PMCLOG_HEADER_TO_TYPE(H)				\
-	(((H) & 0x00FF0000) >> 16)
-#define	PMCLOG_HEADER_TO_MAGIC(H)				\
-	(((H) & 0xFF000000) >> 24)
-#define	PMCLOG_HEADER_CHECK_MAGIC(H)				\
-	(PMCLOG_HEADER_TO_MAGIC(H) == PMCLOG_HEADER_MAGIC)
-
-#ifdef	_KERNEL
-
-/*
- * Prototypes
- */
-int	pmclog_configure_log(struct pmc_mdep *_md, struct pmc_owner *_po,
-    int _logfd);
-int	pmclog_deconfigure_log(struct pmc_owner *_po);
-int	pmclog_flush(struct pmc_owner *_po);
-int	pmclog_close(struct pmc_owner *_po);
-void	pmclog_initialize(void);
-void	pmclog_process_callchain(struct pmc *_pm, struct pmc_sample *_ps);
-void	pmclog_process_closelog(struct pmc_owner *po);
-void	pmclog_process_dropnotify(struct pmc_owner *po);
-void	pmclog_process_map_in(struct pmc_owner *po, pid_t pid,
-    uintfptr_t start, const char *path);
-void	pmclog_process_map_out(struct pmc_owner *po, pid_t pid,
-    uintfptr_t start, uintfptr_t end);
-void	pmclog_process_pmcallocate(struct pmc *_pm);
-void	pmclog_process_pmcattach(struct pmc *_pm, pid_t _pid, char *_path);
-void	pmclog_process_pmcdetach(struct pmc *_pm, pid_t _pid);
-void	pmclog_process_proccsw(struct pmc *_pm, struct pmc_process *_pp,
-    pmc_value_t _v);
-void	pmclog_process_procexec(struct pmc_owner *_po, pmc_id_t _pmid, pid_t _pid,
-    uintfptr_t _startaddr, char *_path);
-void	pmclog_process_procexit(struct pmc *_pm, struct pmc_process *_pp);
-void	pmclog_process_procfork(struct pmc_owner *_po, pid_t _oldpid, pid_t _newpid);
-void	pmclog_process_sysexit(struct pmc_owner *_po, pid_t _pid);
-int	pmclog_process_userlog(struct pmc_owner *_po,
-    struct pmc_op_writelog *_wl);
-void	pmclog_shutdown(void);
-#endif	/* _KERNEL */
-
-#endif	/* _SYS_PMCLOG_H_ */
diff --git a/include.new/sys/poll.h b/include.new/sys/poll.h
deleted file mode 100644
index e99242e..0000000
--- a/include.new/sys/poll.h
+++ /dev/null
@@ -1,122 +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: releng/10.2/sys/sys/poll.h 275986 2014-12-21 07:58:28Z dchagin $
- */
-
-#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
-
-#if __BSD_VISIBLE
-#include <sys/_types.h>
-
-#include <sys/_sigset.h>
-#include <sys/timespec.h>
-
-#ifndef _SIGSET_T_DECLARED
-#define	_SIGSET_T_DECLARED
-typedef	__sigset_t	sigset_t;
-#endif
-
-#endif
-
-__BEGIN_DECLS
-int	poll(struct pollfd _pfd[], nfds_t _nfds, int _timeout);
-#if __BSD_VISIBLE
-int	ppoll(struct pollfd _pfd[], nfds_t _nfds,
-	    const struct timespec *__restrict _timeout,
-	    const sigset_t *__restrict _newsigmask);
-#endif
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_POLL_H_ */
diff --git a/include.new/sys/posix4.h b/include.new/sys/posix4.h
deleted file mode 100644
index 36147d3..0000000
--- a/include.new/sys/posix4.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef _P1003_1B_P1003_1B_H_
-#define _P1003_1B_P1003_1B_H_
-/*-
- * Copyright (c) 1996, 1997, 1998
- *	HD Associates, Inc.  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 HD Associates, Inc
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES 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 HD ASSOCIATES 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: releng/10.2/sys/sys/posix4.h 225617 2011-09-16 13:58:51Z kmacy $
- */
-
-#include <sys/param.h>
-#include <sys/ioccom.h>
-#include <sys/malloc.h>
-#include <sys/sched.h>
-
-/* Generate syscall stubs for when something is optionally
- * loadable as a module.  References "syscall_not_present". 
- * XXX Good candidate for sys/syscall.h
- */
-struct proc;
-struct nosys_args;
-extern int syscall_not_present(struct thread *, const char *, struct nosys_args *);
-
-#define SYSCALL_NOT_PRESENT_GEN(SC) \
-int sys_ ## SC (struct thread *td, struct SC##_args *uap) \
-{ \
-	return syscall_not_present(td, #SC , (struct nosys_args *)uap); \
-}
-
-
-MALLOC_DECLARE(M_P31B);
-
-#define p31b_malloc(SIZE) malloc((SIZE), M_P31B, M_WAITOK)
-#define p31b_free(P) free((P), M_P31B)
-
-int p31b_proc(struct proc *, pid_t, struct proc **);
-
-void p31b_setcfg(int, int);
-int p31b_getcfg(int);
-int p31b_iscfg(int);
-void p31b_unsetcfg(int);
-
-#ifdef _KPOSIX_PRIORITY_SCHEDULING
-
-/* 
- * KSCHED_OP_RW is a vector of read/write flags for each entry indexed
- * by the enum ksched_op.
- *
- * 1 means you need write access, 0 means read is sufficient.
- */
-
-enum ksched_op {
-
-#define KSCHED_OP_RW { 1, 0, 1, 0, 0, 0, 0, 0 }
-
-	SCHED_SETPARAM,
-	SCHED_GETPARAM,
-	SCHED_SETSCHEDULER,
-	SCHED_GETSCHEDULER,
-	SCHED_YIELD,
-	SCHED_GET_PRIORITY_MAX,
-	SCHED_GET_PRIORITY_MIN,
-	SCHED_RR_GET_INTERVAL,
-	SCHED_OP_MAX
-};
-
-struct ksched;
-
-int ksched_attach(struct ksched **);
-int ksched_detach(struct ksched *);
-
-int ksched_setparam(struct ksched *,
-	struct thread *, const struct sched_param *);
-int ksched_getparam(struct ksched *,
-	struct thread *, struct sched_param *);
-
-int ksched_setscheduler(struct ksched *,
-	struct thread *, int, const struct sched_param *);
-int ksched_getscheduler(struct ksched *, struct thread *, int *);
-
-int ksched_yield(struct ksched *);
-
-int ksched_get_priority_max(struct ksched *, int, int *);
-int ksched_get_priority_min(struct ksched *, int, int *);
-
-int ksched_rr_get_interval(struct ksched *,
-	struct thread *, struct timespec *);
-
-#endif /* _KPOSIX_PRIORITY_SCHEDULING */
-
-#endif /* _P1003_1B_P1003_1B_H_ */
diff --git a/include.new/sys/power.h b/include.new/sys/power.h
deleted file mode 100644
index 6cc5021..0000000
--- a/include.new/sys/power.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2001 Mitsuru IWASAKI
- * 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.
- *
- * 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: releng/10.2/sys/sys/power.h 100084 2002-07-15 14:06:03Z markm $
- */
-
-#ifndef _SYS_POWER_H_
-#define _SYS_POWER_H_
-
-#include <sys/eventhandler.h>
-
-/* Power management system type */
-#define POWER_PM_TYPE_APM		0x00
-#define POWER_PM_TYPE_ACPI		0x01
-#define POWER_PM_TYPE_NONE		0xff
-
-/* Commands for Power management function */
-#define POWER_CMD_SUSPEND		0x00
-
-/* Sleep state */
-#define POWER_SLEEP_STATE_STANDBY	0x00
-#define POWER_SLEEP_STATE_SUSPEND	0x01
-#define POWER_SLEEP_STATE_HIBERNATE	0x02
-
-typedef int (*power_pm_fn_t)(u_long, void*, ...);
-extern int	 power_pm_register(u_int, power_pm_fn_t, void *);
-extern u_int	 power_pm_get_type(void);
-extern void	 power_pm_suspend(int);
-
-/*
- * System power API.
- */
-#define POWER_PROFILE_PERFORMANCE        0
-#define POWER_PROFILE_ECONOMY            1
-
-extern int	power_profile_get_state(void);
-extern void	power_profile_set_state(int);
-
-typedef void (*power_profile_change_hook)(void *, int);
-EVENTHANDLER_DECLARE(power_profile_change, power_profile_change_hook);
-
-#endif	/* !_SYS_POWER_H_ */
-
diff --git a/include.new/sys/priority.h b/include.new/sys/priority.h
deleted file mode 100644
index 3bbdac1..0000000
--- a/include.new/sys/priority.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * Copyright (c) 1994, Henrik Vestergaard Draboel
- * 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 Henrik Vestergaard Draboel.
- * 4. 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: releng/10.2/sys/sys/priority.h 221829 2011-05-13 05:27:58Z mdf $
- */
-
-#ifndef _SYS_PRIORITY_H_
-#define _SYS_PRIORITY_H_
-
-/*
- * Process priority specifications.
- */
-
-/*
- * Priority classes.
- */
-
-#define	PRI_ITHD		1	/* Interrupt thread. */
-#define	PRI_REALTIME		2	/* Real time process. */
-#define	PRI_TIMESHARE		3	/* Time sharing process. */
-#define	PRI_IDLE		4	/* Idle process. */
-
-/*
- * PRI_FIFO is POSIX.1B SCHED_FIFO.
- */
-
-#define	PRI_FIFO_BIT		8
-#define	PRI_FIFO		(PRI_FIFO_BIT | PRI_REALTIME)
-
-#define	PRI_BASE(P)		((P) & ~PRI_FIFO_BIT)
-#define	PRI_IS_REALTIME(P)	(PRI_BASE(P) == PRI_REALTIME)
-#define	PRI_NEED_RR(P)		((P) != PRI_FIFO)
-
-/*
- * Priorities.  Note that with 64 run queues, differences less than 4 are
- * insignificant.
- */
-
-/*
- * Priorities range from 0 to 255, but differences of less then 4 (RQ_PPQ)
- * are insignificant.  Ranges are as follows:
- *
- * Interrupt threads:		0 - 47
- * Realtime user threads:	48 - 79
- * Top half kernel threads:	80 - 119
- * Time sharing user threads:	120 - 223
- * Idle user threads:		224 - 255
- *
- * XXX If/When the specific interrupt thread and top half thread ranges
- * disappear, a larger range can be used for user processes.
- */
-
-#define	PRI_MIN			(0)		/* Highest priority. */
-#define	PRI_MAX			(255)		/* Lowest priority. */
-
-#define	PRI_MIN_ITHD		(PRI_MIN)
-#define	PRI_MAX_ITHD		(PRI_MIN_REALTIME - 1)
-
-#define	PI_REALTIME		(PRI_MIN_ITHD + 0)
-#define	PI_AV			(PRI_MIN_ITHD + 4)
-#define	PI_NET			(PRI_MIN_ITHD + 8)
-#define	PI_DISK			(PRI_MIN_ITHD + 12)
-#define	PI_TTY			(PRI_MIN_ITHD + 16)
-#define	PI_DULL			(PRI_MIN_ITHD + 20)
-#define	PI_SOFT			(PRI_MIN_ITHD + 24)
-#define	PI_SWI(x)		(PI_SOFT + (x) * RQ_PPQ)
-
-#define	PRI_MIN_REALTIME	(48)
-#define	PRI_MAX_REALTIME	(PRI_MIN_KERN - 1)
-
-#define	PRI_MIN_KERN		(80)
-#define	PRI_MAX_KERN		(PRI_MIN_TIMESHARE - 1)
-
-#define	PSWP			(PRI_MIN_KERN + 0)
-#define	PVM			(PRI_MIN_KERN + 4)
-#define	PINOD			(PRI_MIN_KERN + 8)
-#define	PRIBIO			(PRI_MIN_KERN + 12)
-#define	PVFS			(PRI_MIN_KERN + 16)
-#define	PZERO			(PRI_MIN_KERN + 20)
-#define	PSOCK			(PRI_MIN_KERN + 24)
-#define	PWAIT			(PRI_MIN_KERN + 28)
-#define	PLOCK			(PRI_MIN_KERN + 32)
-#define	PPAUSE			(PRI_MIN_KERN + 36)
-
-#define	PRI_MIN_TIMESHARE	(120)
-#define	PRI_MAX_TIMESHARE	(PRI_MIN_IDLE - 1)
-
-#define	PUSER			(PRI_MIN_TIMESHARE)
-
-#define	PRI_MIN_IDLE		(224)
-#define	PRI_MAX_IDLE		(PRI_MAX)
-
-#ifdef _KERNEL
-/* Other arguments for kern_yield(9). */
-#define	PRI_USER	-2	/* Change to current user priority. */
-#define	PRI_UNCHANGED	-1	/* Do not change priority. */
-#endif
-
-struct priority {
-	u_char	pri_class;	/* Scheduling class. */
-	u_char	pri_level;	/* Normal priority level. */
-	u_char	pri_native;	/* Priority before propogation. */
-	u_char	pri_user;	/* User priority based on p_cpu and p_nice. */
-};
-
-#endif	/* !_SYS_PRIORITY_H_ */
diff --git a/include.new/sys/priv.h b/include.new/sys/priv.h
deleted file mode 100644
index 22abea5..0000000
--- a/include.new/sys/priv.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/*-
- * Copyright (c) 2006 nCircle Network Security, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert N. M. Watson for the TrustedBSD
- * Project under contract to nCircle Network Security, Inc.
- *
- * 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.
- *
- * 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, NCIRCLE NETWORK SECURITY,
- * INC., 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: releng/10.2/sys/sys/priv.h 284365 2015-06-14 03:14:45Z bryanv $
- */
-
-/*
- * Privilege checking interface for BSD kernel.
- */
-#ifndef _SYS_PRIV_H_
-#define	_SYS_PRIV_H_
-
-/*
- * Privilege list, sorted loosely by kernel subsystem.
- *
- * Think carefully before adding or reusing one of these privileges -- are
- * there existing instances referring to the same privilege?  Third party
- * vendors may request the assignment of privileges to be used in loadable
- * modules.  Particular numeric privilege assignments are part of the
- * loadable kernel module ABI, and should not be changed across minor
- * releases.
- *
- * When adding a new privilege, remember to determine if it's appropriate for
- * use in jail, and update the privilege switch in kern_jail.c as necessary.
- */
-
-/*
- * Track beginning of privilege list.
- */
-#define	_PRIV_LOWEST	1
-
-/*
- * The remaining privileges typically correspond to one or a small
- * number of specific privilege checks, and have (relatively) precise
- * meanings.  They are loosely sorted into a set of base system
- * privileges, such as the ability to reboot, and then loosely by
- * subsystem, indicated by a subsystem name.
- */
-#define	_PRIV_ROOT		1	/* Removed. */
-#define	PRIV_ACCT		2	/* Manage process accounting. */
-#define	PRIV_MAXFILES		3	/* Exceed system open files limit. */
-#define	PRIV_MAXPROC		4	/* Exceed system processes limit. */
-#define	PRIV_KTRACE		5	/* Set/clear KTRFAC_ROOT on ktrace. */
-#define	PRIV_SETDUMPER		6	/* Configure dump device. */
-#define	PRIV_REBOOT		8	/* Can reboot system. */
-#define	PRIV_SWAPON		9	/* Can swapon(). */
-#define	PRIV_SWAPOFF		10	/* Can swapoff(). */
-#define	PRIV_MSGBUF		11	/* Can read kernel message buffer. */
-#define	PRIV_IO			12	/* Can perform low-level I/O. */
-#define	PRIV_KEYBOARD		13	/* Reprogram keyboard. */
-#define	PRIV_DRIVER		14	/* Low-level driver privilege. */
-#define	PRIV_ADJTIME		15	/* Set time adjustment. */
-#define	PRIV_NTP_ADJTIME	16	/* Set NTP time adjustment. */
-#define	PRIV_CLOCK_SETTIME	17	/* Can call clock_settime. */
-#define	PRIV_SETTIMEOFDAY	18	/* Can call settimeofday. */
-#define	_PRIV_SETHOSTID		19	/* Removed. */
-#define	_PRIV_SETDOMAINNAME	20	/* Removed. */
-
-/*
- * Audit subsystem privileges.
- */
-#define	PRIV_AUDIT_CONTROL	40	/* Can configure audit. */
-#define	PRIV_AUDIT_FAILSTOP	41	/* Can run during audit fail stop. */
-#define	PRIV_AUDIT_GETAUDIT	42	/* Can get proc audit properties. */
-#define	PRIV_AUDIT_SETAUDIT	43	/* Can set proc audit properties. */
-#define	PRIV_AUDIT_SUBMIT	44	/* Can submit an audit record. */
-
-/*
- * Credential management privileges.
- */
-#define	PRIV_CRED_SETUID	50	/* setuid. */
-#define	PRIV_CRED_SETEUID	51	/* seteuid to !ruid and !svuid. */
-#define	PRIV_CRED_SETGID	52	/* setgid. */
-#define	PRIV_CRED_SETEGID	53	/* setgid to !rgid and !svgid. */
-#define	PRIV_CRED_SETGROUPS	54	/* Set process additional groups. */
-#define	PRIV_CRED_SETREUID	55	/* setreuid. */
-#define	PRIV_CRED_SETREGID	56	/* setregid. */
-#define	PRIV_CRED_SETRESUID	57	/* setresuid. */
-#define	PRIV_CRED_SETRESGID	58	/* setresgid. */
-#define	PRIV_SEEOTHERGIDS	59	/* Exempt bsd.seeothergids. */
-#define	PRIV_SEEOTHERUIDS	60	/* Exempt bsd.seeotheruids. */
-
-/*
- * Debugging privileges.
- */
-#define	PRIV_DEBUG_DIFFCRED	80	/* Exempt debugging other users. */
-#define	PRIV_DEBUG_SUGID	81	/* Exempt debugging setuid proc. */
-#define	PRIV_DEBUG_UNPRIV	82	/* Exempt unprivileged debug limit. */
-#define	PRIV_DEBUG_DENIED	83	/* Exempt P2_NOTRACE. */
-
-/*
- * Dtrace privileges.
- */
-#define	PRIV_DTRACE_KERNEL	90	/* Allow use of DTrace on the kernel. */
-#define	PRIV_DTRACE_PROC	91	/* Allow attaching DTrace to process. */
-#define	PRIV_DTRACE_USER	92	/* Process may submit DTrace events. */
-
-/*
- * Firmware privilegs.
- */
-#define	PRIV_FIRMWARE_LOAD	100	/* Can load firmware. */
-
-/*
- * Jail privileges.
- */
-#define	PRIV_JAIL_ATTACH	110	/* Attach to a jail. */
-#define	PRIV_JAIL_SET		111	/* Set jail parameters. */
-#define	PRIV_JAIL_REMOVE	112	/* Remove a jail. */
-
-/*
- * Kernel environment priveleges.
- */
-#define	PRIV_KENV_SET		120	/* Set kernel env. variables. */
-#define	PRIV_KENV_UNSET		121	/* Unset kernel env. variables. */
-
-/*
- * Loadable kernel module privileges.
- */
-#define	PRIV_KLD_LOAD		130	/* Load a kernel module. */
-#define	PRIV_KLD_UNLOAD		131	/* Unload a kernel module. */
-
-/*
- * Privileges associated with the MAC Framework and specific MAC policy
- * modules.
- */
-#define	PRIV_MAC_PARTITION	140	/* Privilege in mac_partition policy. */
-#define	PRIV_MAC_PRIVS		141	/* Privilege in the mac_privs policy. */
-
-/*
- * Process-related privileges.
- */
-#define	PRIV_PROC_LIMIT		160	/* Exceed user process limit. */
-#define	PRIV_PROC_SETLOGIN	161	/* Can call setlogin. */
-#define	PRIV_PROC_SETRLIMIT	162	/* Can raise resources limits. */
-#define	PRIV_PROC_SETLOGINCLASS	163	/* Can call setloginclass(2). */
-
-/*
- * System V IPC privileges.
- */
-#define	PRIV_IPC_READ		170	/* Can override IPC read perm. */
-#define	PRIV_IPC_WRITE		171	/* Can override IPC write perm. */
-#define	PRIV_IPC_ADMIN		172	/* Can override IPC owner-only perm. */
-#define	PRIV_IPC_MSGSIZE	173	/* Exempt IPC message queue limit. */
-
-/*
- * POSIX message queue privileges.
- */
-#define	PRIV_MQ_ADMIN		180	/* Can override msgq owner-only perm. */
-
-/*
- * Performance monitoring counter privileges.
- */
-#define	PRIV_PMC_MANAGE		190	/* Can administer PMC. */
-#define	PRIV_PMC_SYSTEM		191	/* Can allocate a system-wide PMC. */
-
-/*
- * Scheduling privileges.
- */
-#define	PRIV_SCHED_DIFFCRED	200	/* Exempt scheduling other users. */
-#define	PRIV_SCHED_SETPRIORITY	201	/* Can set lower nice value for proc. */
-#define	PRIV_SCHED_RTPRIO	202	/* Can set real time scheduling. */
-#define	PRIV_SCHED_SETPOLICY	203	/* Can set scheduler policy. */
-#define	PRIV_SCHED_SET		204	/* Can set thread scheduler. */
-#define	PRIV_SCHED_SETPARAM	205	/* Can set thread scheduler params. */
-#define	PRIV_SCHED_CPUSET	206	/* Can manipulate cpusets. */
-#define	PRIV_SCHED_CPUSET_INTR	207	/* Can adjust IRQ to CPU binding. */
-
-/*
- * POSIX semaphore privileges.
- */
-#define	PRIV_SEM_WRITE		220	/* Can override sem write perm. */
-
-/*
- * Signal privileges.
- */
-#define	PRIV_SIGNAL_DIFFCRED	230	/* Exempt signalling other users. */
-#define	PRIV_SIGNAL_SUGID	231	/* Non-conserv signal setuid proc. */
-
-/*
- * Sysctl privileges.
- */
-#define	PRIV_SYSCTL_DEBUG	240	/* Can invoke sysctl.debug. */
-#define	PRIV_SYSCTL_WRITE	241	/* Can write sysctls. */
-#define	PRIV_SYSCTL_WRITEJAIL	242	/* Can write sysctls, jail permitted. */
-
-/*
- * TTY privileges.
- */
-#define	PRIV_TTY_CONSOLE	250	/* Set console to tty. */
-#define	PRIV_TTY_DRAINWAIT	251	/* Set tty drain wait time. */
-#define	PRIV_TTY_DTRWAIT	252	/* Set DTR wait on tty. */
-#define	PRIV_TTY_EXCLUSIVE	253	/* Override tty exclusive flag. */
-#define	_PRIV_TTY_PRISON	254	/* Removed. */
-#define	PRIV_TTY_STI		255	/* Simulate input on another tty. */
-#define	PRIV_TTY_SETA		256	/* Set tty termios structure. */
-
-/*
- * UFS-specific privileges.
- */
-#define	PRIV_UFS_EXTATTRCTL	270	/* Can configure EAs on UFS1. */
-#define	PRIV_UFS_QUOTAOFF	271	/* quotaoff(). */
-#define	PRIV_UFS_QUOTAON	272	/* quotaon(). */
-#define	PRIV_UFS_SETUSE		273	/* setuse(). */
-
-/*
- * ZFS-specific privileges.
- */
-#define	PRIV_ZFS_POOL_CONFIG	280	/* Can configure ZFS pools. */
-#define	PRIV_ZFS_INJECT		281	/* Can inject faults in the ZFS fault
-					   injection framework. */
-#define	PRIV_ZFS_JAIL		282	/* Can attach/detach ZFS file systems
-					   to/from jails. */
-
-/*
- * NFS-specific privileges.
- */
-#define	PRIV_NFS_DAEMON		290	/* Can become the NFS daemon. */
-#define	PRIV_NFS_LOCKD		291	/* Can become NFS lock daemon. */
-
-/*
- * VFS privileges.
- */
-#define	PRIV_VFS_READ		310	/* Override vnode DAC read perm. */
-#define	PRIV_VFS_WRITE		311	/* Override vnode DAC write perm. */
-#define	PRIV_VFS_ADMIN		312	/* Override vnode DAC admin perm. */
-#define	PRIV_VFS_EXEC		313	/* Override vnode DAC exec perm. */
-#define	PRIV_VFS_LOOKUP		314	/* Override vnode DAC lookup perm. */
-#define	PRIV_VFS_BLOCKRESERVE	315	/* Can use free block reserve. */
-#define	PRIV_VFS_CHFLAGS_DEV	316	/* Can chflags() a device node. */
-#define	PRIV_VFS_CHOWN		317	/* Can set user; group to non-member. */
-#define	PRIV_VFS_CHROOT		318	/* chroot(). */
-#define	PRIV_VFS_RETAINSUGID	319	/* Can retain sugid bits on change. */
-#define	PRIV_VFS_EXCEEDQUOTA	320	/* Exempt from quota restrictions. */
-#define	PRIV_VFS_EXTATTR_SYSTEM	321	/* Operate on system EA namespace. */
-#define	PRIV_VFS_FCHROOT	322	/* fchroot(). */
-#define	PRIV_VFS_FHOPEN		323	/* Can fhopen(). */
-#define	PRIV_VFS_FHSTAT		324	/* Can fhstat(). */
-#define	PRIV_VFS_FHSTATFS	325	/* Can fhstatfs(). */
-#define	PRIV_VFS_GENERATION	326	/* stat() returns generation number. */
-#define	PRIV_VFS_GETFH		327	/* Can retrieve file handles. */
-#define	PRIV_VFS_GETQUOTA	328	/* getquota(). */
-#define	PRIV_VFS_LINK		329	/* bsd.hardlink_check_uid */
-#define	PRIV_VFS_MKNOD_BAD	330	/* Can mknod() to mark bad inodes. */
-#define	PRIV_VFS_MKNOD_DEV	331	/* Can mknod() to create dev nodes. */
-#define	PRIV_VFS_MKNOD_WHT	332	/* Can mknod() to create whiteout. */
-#define	PRIV_VFS_MOUNT		333	/* Can mount(). */
-#define	PRIV_VFS_MOUNT_OWNER	334	/* Can manage other users' file systems. */
-#define	PRIV_VFS_MOUNT_EXPORTED	335	/* Can set MNT_EXPORTED on mount. */
-#define	PRIV_VFS_MOUNT_PERM	336	/* Override dev node perms at mount. */
-#define	PRIV_VFS_MOUNT_SUIDDIR	337	/* Can set MNT_SUIDDIR on mount. */
-#define	PRIV_VFS_MOUNT_NONUSER	338	/* Can perform a non-user mount. */
-#define	PRIV_VFS_SETGID		339	/* Can setgid if not in group. */
-#define	PRIV_VFS_SETQUOTA	340	/* setquota(). */
-#define	PRIV_VFS_STICKYFILE	341	/* Can set sticky bit on file. */
-#define	PRIV_VFS_SYSFLAGS	342	/* Can modify system flags. */
-#define	PRIV_VFS_UNMOUNT	343	/* Can unmount(). */
-#define	PRIV_VFS_STAT		344	/* Override vnode MAC stat perm. */
-
-/*
- * Virtual memory privileges.
- */
-#define	PRIV_VM_MADV_PROTECT	360	/* Can set MADV_PROTECT. */
-#define	PRIV_VM_MLOCK		361	/* Can mlock(), mlockall(). */
-#define	PRIV_VM_MUNLOCK		362	/* Can munlock(), munlockall(). */
-#define	PRIV_VM_SWAP_NOQUOTA	363	/*
-					 * Can override the global
-					 * swap reservation limits.
-					 */
-#define	PRIV_VM_SWAP_NORLIMIT	364	/*
-					 * Can override the per-uid
-					 * swap reservation limits.
-					 */
-
-/*
- * Device file system privileges.
- */
-#define	PRIV_DEVFS_RULE		370	/* Can manage devfs rules. */
-#define	PRIV_DEVFS_SYMLINK	371	/* Can create symlinks in devfs. */
-
-/*
- * Random number generator privileges.
- */
-#define	PRIV_RANDOM_RESEED	380	/* Closing /dev/random reseeds. */
-
-/*
- * Network stack privileges.
- */
-#define	PRIV_NET_BRIDGE		390	/* Administer bridge. */
-#define	PRIV_NET_GRE		391	/* Administer GRE. */
-#define	_PRIV_NET_PPP		392	/* Removed. */
-#define	_PRIV_NET_SLIP		393	/* Removed. */
-#define	PRIV_NET_BPF		394	/* Monitor BPF. */
-#define	PRIV_NET_RAW		395	/* Open raw socket. */
-#define	PRIV_NET_ROUTE		396	/* Administer routing. */
-#define	PRIV_NET_TAP		397	/* Can open tap device. */
-#define	PRIV_NET_SETIFMTU	398	/* Set interface MTU. */
-#define	PRIV_NET_SETIFFLAGS	399	/* Set interface flags. */
-#define	PRIV_NET_SETIFCAP	400	/* Set interface capabilities. */
-#define	PRIV_NET_SETIFNAME	401	/* Set interface name. */
-#define	PRIV_NET_SETIFMETRIC	402	/* Set interface metrics. */
-#define	PRIV_NET_SETIFPHYS	403	/* Set interface physical layer prop. */
-#define	PRIV_NET_SETIFMAC	404	/* Set interface MAC label. */
-#define	PRIV_NET_ADDMULTI	405	/* Add multicast addr. to ifnet. */
-#define	PRIV_NET_DELMULTI	406	/* Delete multicast addr. from ifnet. */
-#define	PRIV_NET_HWIOCTL	407	/* Issue hardware ioctl on ifnet. */
-#define	PRIV_NET_SETLLADDR	408	/* Set interface link-level address. */
-#define	PRIV_NET_ADDIFGROUP	409	/* Add new interface group. */
-#define	PRIV_NET_DELIFGROUP	410	/* Delete interface group. */
-#define	PRIV_NET_IFCREATE	411	/* Create cloned interface. */
-#define	PRIV_NET_IFDESTROY	412	/* Destroy cloned interface. */
-#define	PRIV_NET_ADDIFADDR	413	/* Add protocol addr to interface. */
-#define	PRIV_NET_DELIFADDR	414	/* Delete protocol addr on interface. */
-#define	PRIV_NET_LAGG		415	/* Administer lagg interface. */
-#define	PRIV_NET_GIF		416	/* Administer gif interface. */
-#define	PRIV_NET_SETIFVNET	417	/* Move interface to vnet. */
-#define	PRIV_NET_SETIFDESCR	418	/* Set interface description. */
-#define	PRIV_NET_SETIFFIB	419	/* Set interface fib. */
-#define	PRIV_NET_VXLAN		420	/* Administer vxlan. */
-
-/*
- * 802.11-related privileges.
- */
-#define	PRIV_NET80211_GETKEY	440	/* Query 802.11 keys. */
-#define	PRIV_NET80211_MANAGE	441	/* Administer 802.11. */
-
-/*
- * AppleTalk privileges.
- */
-#define	PRIV_NETATALK_RESERVEDPORT	450	/* Bind low port number. */
-
-/*
- * ATM privileges.
- */
-#define	PRIV_NETATM_CFG		460
-#define	PRIV_NETATM_ADD		461
-#define	PRIV_NETATM_DEL		462
-#define	PRIV_NETATM_SET		463
-
-/*
- * Bluetooth privileges.
- */
-#define	PRIV_NETBLUETOOTH_RAW	470	/* Open raw bluetooth socket. */
-
-/*
- * Netgraph and netgraph module privileges.
- */
-#define	PRIV_NETGRAPH_CONTROL	480	/* Open netgraph control socket. */
-#define	PRIV_NETGRAPH_TTY	481	/* Configure tty for netgraph. */
-
-/*
- * IPv4 and IPv6 privileges.
- */
-#define	PRIV_NETINET_RESERVEDPORT	490	/* Bind low port number. */
-#define	PRIV_NETINET_IPFW	491	/* Administer IPFW firewall. */
-#define	PRIV_NETINET_DIVERT	492	/* Open IP divert socket. */
-#define	PRIV_NETINET_PF		493	/* Administer pf firewall. */
-#define	PRIV_NETINET_DUMMYNET	494	/* Administer DUMMYNET. */
-#define	PRIV_NETINET_CARP	495	/* Administer CARP. */
-#define	PRIV_NETINET_MROUTE	496	/* Administer multicast routing. */
-#define	PRIV_NETINET_RAW	497	/* Open netinet raw socket. */
-#define	PRIV_NETINET_GETCRED	498	/* Query netinet pcb credentials. */
-#define	PRIV_NETINET_ADDRCTRL6	499	/* Administer IPv6 address scopes. */
-#define	PRIV_NETINET_ND6	500	/* Administer IPv6 neighbor disc. */
-#define	PRIV_NETINET_SCOPE6	501	/* Administer IPv6 address scopes. */
-#define	PRIV_NETINET_ALIFETIME6	502	/* Administer IPv6 address lifetimes. */
-#define	PRIV_NETINET_IPSEC	503	/* Administer IPSEC. */
-#define	PRIV_NETINET_REUSEPORT	504	/* Allow [rapid] port/address reuse. */
-#define	PRIV_NETINET_SETHDROPTS	505	/* Set certain IPv4/6 header options. */
-#define	PRIV_NETINET_BINDANY	506	/* Allow bind to any address. */
-
-/*
- * IPX/SPX privileges.
- */
-#define	PRIV_NETIPX_RESERVEDPORT	520	/* Bind low port number. */
-#define	PRIV_NETIPX_RAW		521	/* Open netipx raw socket. */
-
-/*
- * NCP privileges.
- */
-#define	PRIV_NETNCP		530	/* Use another user's connection. */
-
-/*
- * SMB privileges.
- */
-#define	PRIV_NETSMB		540	/* Use another user's connection. */
-
-/*
- * VM86 privileges.
- */
-#define	PRIV_VM86_INTCALL	550	/* Allow invoking vm86 int handlers. */
-
-/*
- * Set of reserved privilege values, which will be allocated to code as
- * needed, in order to avoid renumbering later privileges due to insertion.
- */
-#define	_PRIV_RESERVED0		560
-#define	_PRIV_RESERVED1		561
-#define	_PRIV_RESERVED2		562
-#define	_PRIV_RESERVED3		563
-#define	_PRIV_RESERVED4		564
-#define	_PRIV_RESERVED5		565
-#define	_PRIV_RESERVED6		566
-#define	_PRIV_RESERVED7		567
-#define	_PRIV_RESERVED8		568
-#define	_PRIV_RESERVED9		569
-#define	_PRIV_RESERVED10	570
-#define	_PRIV_RESERVED11	571
-#define	_PRIV_RESERVED12	572
-#define	_PRIV_RESERVED13	573
-#define	_PRIV_RESERVED14	574
-#define	_PRIV_RESERVED15	575
-
-/*
- * Define a set of valid privilege numbers that can be used by loadable
- * modules that don't yet have privilege reservations.  Ideally, these should
- * not be used, since their meaning is opaque to any policies that are aware
- * of specific privileges, such as jail, and as such may be arbitrarily
- * denied.
- */
-#define	PRIV_MODULE0		600
-#define	PRIV_MODULE1		601
-#define	PRIV_MODULE2		602
-#define	PRIV_MODULE3		603
-#define	PRIV_MODULE4		604
-#define	PRIV_MODULE5		605
-#define	PRIV_MODULE6		606
-#define	PRIV_MODULE7		607
-#define	PRIV_MODULE8		608
-#define	PRIV_MODULE9		609
-#define	PRIV_MODULE10		610
-#define	PRIV_MODULE11		611
-#define	PRIV_MODULE12		612
-#define	PRIV_MODULE13		613
-#define	PRIV_MODULE14		614
-#define	PRIV_MODULE15		615
-
-/*
- * DDB(4) privileges.
- */
-#define	PRIV_DDB_CAPTURE	620	/* Allow reading of DDB capture log. */
-
-/*
- * Arla/nnpfs privileges.
- */
-#define	PRIV_NNPFS_DEBUG	630	/* Perforn ARLA_VIOC_NNPFSDEBUG. */
-
-/*
- * cpuctl(4) privileges.
- */
-#define PRIV_CPUCTL_WRMSR	640	/* Write model-specific register. */
-#define PRIV_CPUCTL_UPDATE	641	/* Update cpu microcode. */
-
-/*
- * Capi4BSD privileges.
- */
-#define	PRIV_C4B_RESET_CTLR	650	/* Load firmware, reset controller. */
-#define	PRIV_C4B_TRACE		651	/* Unrestricted CAPI message tracing. */
-
-/*
- * OpenAFS privileges.
- */
-#define	PRIV_AFS_ADMIN		660	/* Can change AFS client settings. */
-#define	PRIV_AFS_DAEMON		661	/* Can become the AFS daemon. */
-
-/*
- * Resource Limits privileges.
- */
-#define	PRIV_RCTL_GET_RACCT	670
-#define	PRIV_RCTL_GET_RULES	671
-#define	PRIV_RCTL_GET_LIMITS	672
-#define	PRIV_RCTL_ADD_RULE	673
-#define	PRIV_RCTL_REMOVE_RULE	674
-
-/*
- * mem(4) privileges.
- */
-#define	PRIV_KMEM_READ		680	/* Open mem/kmem for reading. */
-#define	PRIV_KMEM_WRITE		681	/* Open mem/kmem for writing. */
-
-/*
- * Track end of privilege list.
- */
-#define	_PRIV_HIGHEST		682
-
-/*
- * Validate that a named privilege is known by the privilege system.  Invalid
- * privileges presented to the privilege system by a priv_check interface
- * will result in a panic.  This is only approximate due to sparse allocation
- * of the privilege space.
- */
-#define	PRIV_VALID(x)	((x) > _PRIV_LOWEST && (x) < _PRIV_HIGHEST)
-
-#ifdef _KERNEL
-/*
- * Privilege check interfaces, modeled after historic suser() interfaces, but
- * with the addition of a specific privilege name.  No flags are currently
- * defined for the API.  Historically, flags specified using the real uid
- * instead of the effective uid, and whether or not the check should be
- * allowed in jail.
- */
-struct thread;
-struct ucred;
-int	priv_check(struct thread *td, int priv);
-int	priv_check_cred(struct ucred *cred, int priv, int flags);
-#endif
-
-#endif /* !_SYS_PRIV_H_ */
diff --git a/include.new/sys/proc.h b/include.new/sys/proc.h
deleted file mode 100644
index d26ab8d..0000000
--- a/include.new/sys/proc.h
+++ /dev/null
@@ -1,998 +0,0 @@
-/*-
- * Copyright (c) 1986, 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)proc.h	8.15 (Berkeley) 5/19/95
- * $FreeBSD: releng/10.2/sys/sys/proc.h 284199 2015-06-10 02:04:02Z kib $
- */
-
-#ifndef _SYS_PROC_H_
-#define	_SYS_PROC_H_
-
-#include <sys/callout.h>		/* For struct callout. */
-#include <sys/event.h>			/* For struct klist. */
-#include <sys/condvar.h>
-#ifndef _KERNEL
-#include <sys/filedesc.h>
-#endif
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/lock_profile.h>
-#include <sys/_mutex.h>
-#include <sys/osd.h>
-#include <sys/priority.h>
-#include <sys/rtprio.h>			/* XXX. */
-#include <sys/runq.h>
-#include <sys/resource.h>
-#include <sys/sigio.h>
-#include <sys/signal.h>
-#include <sys/signalvar.h>
-#ifndef _KERNEL
-#include <sys/time.h>			/* For structs itimerval, timeval. */
-#else
-#include <sys/pcpu.h>
-#endif
-#include <sys/ucontext.h>
-#include <sys/ucred.h>
-#include <machine/proc.h>		/* Machine-dependent proc substruct. */
-
-/*
- * One structure allocated per session.
- *
- * List of locks
- * (m)		locked by s_mtx mtx
- * (e)		locked by proctree_lock sx
- * (c)		const until freeing
- */
-struct session {
-	u_int		s_count;	/* Ref cnt; pgrps in session - atomic. */
-	struct proc	*s_leader;	/* (m + e) Session leader. */
-	struct vnode	*s_ttyvp;	/* (m) Vnode of controlling tty. */
-	struct cdev_priv *s_ttydp;	/* (m) Device of controlling tty.  */
-	struct tty	*s_ttyp;	/* (e) Controlling tty. */
-	pid_t		s_sid;		/* (c) Session ID. */
-					/* (m) Setlogin() name: */
-	char		s_login[roundup(MAXLOGNAME, sizeof(long))];
-	struct mtx	s_mtx;		/* Mutex to protect members. */
-};
-
-/*
- * One structure allocated per process group.
- *
- * List of locks
- * (m)		locked by pg_mtx mtx
- * (e)		locked by proctree_lock sx
- * (c)		const until freeing
- */
-struct pgrp {
-	LIST_ENTRY(pgrp) pg_hash;	/* (e) Hash chain. */
-	LIST_HEAD(, proc) pg_members;	/* (m + e) Pointer to pgrp members. */
-	struct session	*pg_session;	/* (c) Pointer to session. */
-	struct sigiolst	pg_sigiolst;	/* (m) List of sigio sources. */
-	pid_t		pg_id;		/* (c) Process group id. */
-	int		pg_jobc;	/* (m) Job control process count. */
-	struct mtx	pg_mtx;		/* Mutex to protect members */
-};
-
-/*
- * pargs, used to hold a copy of the command line, if it had a sane length.
- */
-struct pargs {
-	u_int	ar_ref;		/* Reference count. */
-	u_int	ar_length;	/* Length. */
-	u_char	ar_args[1];	/* Arguments. */
-};
-
-/*-
- * Description of a process.
- *
- * This structure contains the information needed to manage a thread of
- * control, known in UN*X as a process; it has references to substructures
- * containing descriptions of things that the process uses, but may share
- * with related processes.  The process structure and the substructures
- * are always addressable except for those marked "(CPU)" below,
- * which might be addressable only on a processor on which the process
- * is running.
- *
- * Below is a key of locks used to protect each member of struct proc.  The
- * lock is indicated by a reference to a specific character in parens in the
- * associated comment.
- *      * - not yet protected
- *      a - only touched by curproc or parent during fork/wait
- *      b - created at fork, never changes
- *		(exception aiods switch vmspaces, but they are also
- *		marked 'P_SYSTEM' so hopefully it will be left alone)
- *      c - locked by proc mtx
- *      d - locked by allproc_lock lock
- *      e - locked by proctree_lock lock
- *      f - session mtx
- *      g - process group mtx
- *      h - callout_lock mtx
- *      i - by curproc or the master session mtx
- *      j - locked by proc slock
- *      k - only accessed by curthread
- *	k*- only accessed by curthread and from an interrupt
- *      l - the attaching proc or attaching proc parent
- *      m - Giant
- *      n - not locked, lazy
- *      o - ktrace lock
- *      q - td_contested lock
- *      r - p_peers lock
- *      t - thread lock
- *      x - created at fork, only changes during single threading in exec
- *      y - created at first aio, doesn't change until exit or exec at which
- *          point we are single-threaded and only curthread changes it
- *      z - zombie threads lock
- *
- * If the locking key specifies two identifiers (for example, p_pptr) then
- * either lock is sufficient for read access, but both locks must be held
- * for write access.
- */
-struct cpuset;
-struct kaioinfo;
-struct kaudit_record;
-struct kdtrace_proc;
-struct kdtrace_thread;
-struct mqueue_notifier;
-struct nlminfo;
-struct p_sched;
-struct proc;
-struct procdesc;
-struct racct;
-struct sbuf;
-struct sleepqueue;
-struct td_sched;
-struct thread;
-struct trapframe;
-struct turnstile;
-
-/*
- * XXX: Does this belong in resource.h or resourcevar.h instead?
- * Resource usage extension.  The times in rusage structs in the kernel are
- * never up to date.  The actual times are kept as runtimes and tick counts
- * (with control info in the "previous" times), and are converted when
- * userland asks for rusage info.  Backwards compatibility prevents putting
- * this directly in the user-visible rusage struct.
- *
- * Locking for p_rux: (cj) means (j) for p_rux and (c) for p_crux.
- * Locking for td_rux: (t) for all fields.
- */
-struct rusage_ext {
-	uint64_t	rux_runtime;    /* (cj) Real time. */
-	uint64_t	rux_uticks;     /* (cj) Statclock hits in user mode. */
-	uint64_t	rux_sticks;     /* (cj) Statclock hits in sys mode. */
-	uint64_t	rux_iticks;     /* (cj) Statclock hits in intr mode. */
-	uint64_t	rux_uu;         /* (c) Previous user time in usec. */
-	uint64_t	rux_su;         /* (c) Previous sys time in usec. */
-	uint64_t	rux_tu;         /* (c) Previous total time in usec. */
-};
-
-/*
- * Kernel runnable context (thread).
- * This is what is put to sleep and reactivated.
- * Thread context.  Processes may have multiple threads.
- */
-struct thread {
-	struct mtx	*volatile td_lock; /* replaces sched lock */
-	struct proc	*td_proc;	/* (*) Associated process. */
-	TAILQ_ENTRY(thread) td_plist;	/* (*) All threads in this proc. */
-	TAILQ_ENTRY(thread) td_runq;	/* (t) Run queue. */
-	TAILQ_ENTRY(thread) td_slpq;	/* (t) Sleep queue. */
-	TAILQ_ENTRY(thread) td_lockq;	/* (t) Lock queue. */
-	LIST_ENTRY(thread) td_hash;	/* (d) Hash chain. */
-	struct cpuset	*td_cpuset;	/* (t) CPU affinity mask. */
-	struct seltd	*td_sel;	/* Select queue/channel. */
-	struct sleepqueue *td_sleepqueue; /* (k) Associated sleep queue. */
-	struct turnstile *td_turnstile;	/* (k) Associated turnstile. */
-	struct rl_q_entry *td_rlqe;	/* (k) Associated range lock entry. */
-	struct umtx_q   *td_umtxq;	/* (c?) Link for when we're blocked. */
-	lwpid_t		td_tid;		/* (b) Thread ID. */
-	sigqueue_t	td_sigqueue;	/* (c) Sigs arrived, not delivered. */
-#define	td_siglist	td_sigqueue.sq_signals
-	u_char		td_lend_user_pri; /* (t) Lend user pri. */
-
-/* Cleared during fork1() */
-#define	td_startzero td_flags
-	int		td_flags;	/* (t) TDF_* flags. */
-	int		td_inhibitors;	/* (t) Why can not run. */
-	int		td_pflags;	/* (k) Private thread (TDP_*) flags. */
-	int		td_dupfd;	/* (k) Ret value from fdopen. XXX */
-	int		td_sqqueue;	/* (t) Sleepqueue queue blocked on. */
-	void		*td_wchan;	/* (t) Sleep address. */
-	const char	*td_wmesg;	/* (t) Reason for sleep. */
-	u_char		td_lastcpu;	/* (t) Last cpu we were on. */
-	u_char		td_oncpu;	/* (t) Which cpu we are on. */
-	volatile u_char td_owepreempt;  /* (k*) Preempt on last critical_exit */
-	u_char		td_tsqueue;	/* (t) Turnstile queue blocked on. */
-	short		td_locks;	/* (k) Count of non-spin locks. */
-	short		td_rw_rlocks;	/* (k) Count of rwlock read locks. */
-	short		td_lk_slocks;	/* (k) Count of lockmgr shared locks. */
-	short		td_stopsched;	/* (k) Scheduler stopped. */
-	struct turnstile *td_blocked;	/* (t) Lock thread is blocked on. */
-	const char	*td_lockname;	/* (t) Name of lock blocked on. */
-	LIST_HEAD(, turnstile) td_contested;	/* (q) Contested locks. */
-	struct lock_list_entry *td_sleeplocks; /* (k) Held sleep locks. */
-	int		td_intr_nesting_level; /* (k) Interrupt recursion. */
-	int		td_pinned;	/* (k) Temporary cpu pin count. */
-	struct ucred	*td_ucred;	/* (k) Reference to credentials. */
-	u_int		td_estcpu;	/* (t) estimated cpu utilization */
-	int		td_slptick;	/* (t) Time at sleep. */
-	int		td_blktick;	/* (t) Time spent blocked. */
-	int		td_swvoltick;	/* (t) Time at last SW_VOL switch. */
-	u_int		td_cow;		/* (*) Number of copy-on-write faults */
-	struct rusage	td_ru;		/* (t) rusage information. */
-	struct rusage_ext td_rux;	/* (t) Internal rusage information. */
-	uint64_t	td_incruntime;	/* (t) Cpu ticks to transfer to proc. */
-	uint64_t	td_runtime;	/* (t) How many cpu ticks we've run. */
-	u_int 		td_pticks;	/* (t) Statclock hits for profiling */
-	u_int		td_sticks;	/* (t) Statclock hits in system mode. */
-	u_int		td_iticks;	/* (t) Statclock hits in intr mode. */
-	u_int		td_uticks;	/* (t) Statclock hits in user mode. */
-	int		td_intrval;	/* (t) Return value for sleepq. */
-	sigset_t	td_oldsigmask;	/* (k) Saved mask from pre sigpause. */
-	volatile u_int	td_generation;	/* (k) For detection of preemption */
-	stack_t		td_sigstk;	/* (k) Stack ptr and on-stack flag. */
-	int		td_xsig;	/* (c) Signal for ptrace */
-	u_long		td_profil_addr;	/* (k) Temporary addr until AST. */
-	u_int		td_profil_ticks; /* (k) Temporary ticks until AST. */
-	char		td_name[MAXCOMLEN + 1];	/* (*) Thread name. */
-	struct file	*td_fpop;	/* (k) file referencing cdev under op */
-	int		td_dbgflags;	/* (c) Userland debugger flags */
-	struct ksiginfo td_dbgksi;	/* (c) ksi reflected to debugger. */
-	int		td_ng_outbound;	/* (k) Thread entered ng from above. */
-	struct osd	td_osd;		/* (k) Object specific data. */
-	struct vm_map_entry *td_map_def_user; /* (k) Deferred entries. */
-	pid_t		td_dbg_forked;	/* (c) Child pid for debugger. */
-	u_int		td_vp_reserv;	/* (k) Count of reserved vnodes. */
-	int		td_no_sleeping;	/* (k) Sleeping disabled count. */
-	int		td_dom_rr_idx;	/* (k) RR Numa domain selection. */
-#define	td_endzero td_sigmask
-
-/* Copied during fork1() or create_thread(). */
-#define	td_startcopy td_endzero
-	sigset_t	td_sigmask;	/* (c) Current signal mask. */
-	u_char		td_rqindex;	/* (t) Run queue index. */
-	u_char		td_base_pri;	/* (t) Thread base kernel priority. */
-	u_char		td_priority;	/* (t) Thread active priority. */
-	u_char		td_pri_class;	/* (t) Scheduling class. */
-	u_char		td_user_pri;	/* (t) User pri from estcpu and nice. */
-	u_char		td_base_user_pri; /* (t) Base user pri */
-#define	td_endcopy td_pcb
-
-/*
- * Fields that must be manually set in fork1() or create_thread()
- * or already have been set in the allocator, constructor, etc.
- */
-	struct pcb	*td_pcb;	/* (k) Kernel VA of pcb and kstack. */
-	enum {
-		TDS_INACTIVE = 0x0,
-		TDS_INHIBITED,
-		TDS_CAN_RUN,
-		TDS_RUNQ,
-		TDS_RUNNING
-	} td_state;			/* (t) thread state */
-	register_t	td_retval[2];	/* (k) Syscall aux returns. */
-	struct callout	td_slpcallout;	/* (h) Callout for sleep. */
-	struct trapframe *td_frame;	/* (k) */
-	struct vm_object *td_kstack_obj;/* (a) Kstack object. */
-	vm_offset_t	td_kstack;	/* (a) Kernel VA of kstack. */
-	int		td_kstack_pages; /* (a) Size of the kstack. */
-	volatile u_int	td_critnest;	/* (k*) Critical section nest level. */
-	struct mdthread td_md;		/* (k) Any machine-dependent fields. */
-	struct td_sched	*td_sched;	/* (*) Scheduler-specific data. */
-	struct kaudit_record	*td_ar;	/* (k) Active audit record, if any. */
-	struct lpohead	td_lprof[2];	/* (a) lock profiling objects. */
-	struct kdtrace_thread	*td_dtrace; /* (*) DTrace-specific data. */
-	int		td_errno;	/* Error returned by last syscall. */
-	struct vnet	*td_vnet;	/* (k) Effective vnet. */
-	const char	*td_vnet_lpush;	/* (k) Debugging vnet push / pop. */
-	struct trapframe *td_intr_frame;/* (k) Frame of the current irq */
-	struct proc	*td_rfppwait_p;	/* (k) The vforked child */
-	struct vm_page	**td_ma;	/* (k) uio pages held */
-	int		td_ma_cnt;	/* (k) size of *td_ma */
-	void		*td_su;		/* (k) FFS SU private */
-};
-
-struct mtx *thread_lock_block(struct thread *);
-void thread_lock_unblock(struct thread *, struct mtx *);
-void thread_lock_set(struct thread *, struct mtx *);
-#define	THREAD_LOCK_ASSERT(td, type)					\
-do {									\
-	struct mtx *__m = (td)->td_lock;				\
-	if (__m != &blocked_lock)					\
-		mtx_assert(__m, (type));				\
-} while (0)
-
-#ifdef INVARIANTS
-#define	THREAD_LOCKPTR_ASSERT(td, lock)					\
-do {									\
-	struct mtx *__m = (td)->td_lock;				\
-	KASSERT((__m == &blocked_lock || __m == (lock)),		\
-	    ("Thread %p lock %p does not match %p", td, __m, (lock)));	\
-} while (0)
-#else
-#define	THREAD_LOCKPTR_ASSERT(td, lock)
-#endif
-
-/*
- * Flags kept in td_flags:
- * To change these you MUST have the scheduler lock.
- */
-#define	TDF_BORROWING	0x00000001 /* Thread is borrowing pri from another. */
-#define	TDF_INPANIC	0x00000002 /* Caused a panic, let it drive crashdump. */
-#define	TDF_INMEM	0x00000004 /* Thread's stack is in memory. */
-#define	TDF_SINTR	0x00000008 /* Sleep is interruptible. */
-#define	TDF_TIMEOUT	0x00000010 /* Timing out during sleep. */
-#define	TDF_IDLETD	0x00000020 /* This is a per-CPU idle thread. */
-#define	TDF_CANSWAP	0x00000040 /* Thread can be swapped. */
-#define	TDF_SLEEPABORT	0x00000080 /* sleepq_abort was called. */
-#define	TDF_KTH_SUSP	0x00000100 /* kthread is suspended */
-#define	TDF_ALLPROCSUSP	0x00000200 /* suspended by SINGLE_ALLPROC */
-#define	TDF_BOUNDARY	0x00000400 /* Thread suspended at user boundary */
-#define	TDF_ASTPENDING	0x00000800 /* Thread has some asynchronous events. */
-#define	TDF_TIMOFAIL	0x00001000 /* Timeout from sleep after we were awake. */
-#define	TDF_SBDRY	0x00002000 /* Stop only on usermode boundary. */
-#define	TDF_UPIBLOCKED	0x00004000 /* Thread blocked on user PI mutex. */
-#define	TDF_NEEDSUSPCHK	0x00008000 /* Thread may need to suspend. */
-#define	TDF_NEEDRESCHED	0x00010000 /* Thread needs to yield. */
-#define	TDF_NEEDSIGCHK	0x00020000 /* Thread may need signal delivery. */
-#define	TDF_NOLOAD	0x00040000 /* Ignore during load avg calculations. */
-#define	TDF_UNUSED19	0x00080000 /* --available-- */
-#define	TDF_THRWAKEUP	0x00100000 /* Libthr thread must not suspend itself. */
-#define	TDF_UNUSED21	0x00200000 /* --available-- */
-#define	TDF_SWAPINREQ	0x00400000 /* Swapin request due to wakeup. */
-#define	TDF_UNUSED23	0x00800000 /* --available-- */
-#define	TDF_SCHED0	0x01000000 /* Reserved for scheduler private use */
-#define	TDF_SCHED1	0x02000000 /* Reserved for scheduler private use */
-#define	TDF_SCHED2	0x04000000 /* Reserved for scheduler private use */
-#define	TDF_SCHED3	0x08000000 /* Reserved for scheduler private use */
-#define	TDF_ALRMPEND	0x10000000 /* Pending SIGVTALRM needs to be posted. */
-#define	TDF_PROFPEND	0x20000000 /* Pending SIGPROF needs to be posted. */
-#define	TDF_MACPEND	0x40000000 /* AST-based MAC event pending. */
-
-/* Userland debug flags */
-#define	TDB_SUSPEND	0x00000001 /* Thread is suspended by debugger */
-#define	TDB_XSIG	0x00000002 /* Thread is exchanging signal under trace */
-#define	TDB_USERWR	0x00000004 /* Debugger modified memory or registers */
-#define	TDB_SCE		0x00000008 /* Thread performs syscall enter */
-#define	TDB_SCX		0x00000010 /* Thread performs syscall exit */
-#define	TDB_EXEC	0x00000020 /* TDB_SCX from exec(2) family */
-#define	TDB_FORK	0x00000040 /* TDB_SCX from fork(2) that created new
-				      process */
-#define	TDB_STOPATFORK	0x00000080 /* Stop at the return from fork (child
-				      only) */
-#define	TDB_CHILD	0x00000100 /* New child indicator for ptrace() */
-
-/*
- * "Private" flags kept in td_pflags:
- * These are only written by curthread and thus need no locking.
- */
-#define	TDP_OLDMASK	0x00000001 /* Need to restore mask after suspend. */
-#define	TDP_INKTR	0x00000002 /* Thread is currently in KTR code. */
-#define	TDP_INKTRACE	0x00000004 /* Thread is currently in KTRACE code. */
-#define	TDP_BUFNEED	0x00000008 /* Do not recurse into the buf flush */
-#define	TDP_COWINPROGRESS 0x00000010 /* Snapshot copy-on-write in progress. */
-#define	TDP_ALTSTACK	0x00000020 /* Have alternate signal stack. */
-#define	TDP_DEADLKTREAT	0x00000040 /* Lock aquisition - deadlock treatment. */
-#define	TDP_NOFAULTING	0x00000080 /* Do not handle page faults. */
-#define	TDP_UNUSED9	0x00000100 /* --available-- */
-#define	TDP_OWEUPC	0x00000200 /* Call addupc() at next AST. */
-#define	TDP_ITHREAD	0x00000400 /* Thread is an interrupt thread. */
-#define	TDP_SYNCIO	0x00000800 /* Local override, disable async i/o. */
-#define	TDP_SCHED1	0x00001000 /* Reserved for scheduler private use */
-#define	TDP_SCHED2	0x00002000 /* Reserved for scheduler private use */
-#define	TDP_SCHED3	0x00004000 /* Reserved for scheduler private use */
-#define	TDP_SCHED4	0x00008000 /* Reserved for scheduler private use */
-#define	TDP_GEOM	0x00010000 /* Settle GEOM before finishing syscall */
-#define	TDP_SOFTDEP	0x00020000 /* Stuck processing softdep worklist */
-#define	TDP_NORUNNINGBUF 0x00040000 /* Ignore runningbufspace check */
-#define	TDP_WAKEUP	0x00080000 /* Don't sleep in umtx cond_wait */
-#define	TDP_INBDFLUSH	0x00100000 /* Already in BO_BDFLUSH, do not recurse */
-#define	TDP_KTHREAD	0x00200000 /* This is an official kernel thread */
-#define	TDP_CALLCHAIN	0x00400000 /* Capture thread's callchain */
-#define	TDP_IGNSUSP	0x00800000 /* Permission to ignore the MNTK_SUSPEND* */
-#define	TDP_AUDITREC	0x01000000 /* Audit record pending on thread */
-#define	TDP_RFPPWAIT	0x02000000 /* Handle RFPPWAIT on syscall exit */
-#define	TDP_RESETSPUR	0x04000000 /* Reset spurious page fault history. */
-#define	TDP_NERRNO	0x08000000 /* Last errno is already in td_errno */
-#define	TDP_UIOHELD	0x10000000 /* Current uio has pages held in td_ma */
-#define	TDP_UNUSED29	0x20000000 /* --available-- */
-#define	TDP_EXECVMSPC	0x40000000 /* Execve destroyed old vmspace */
-
-/*
- * Reasons that the current thread can not be run yet.
- * More than one may apply.
- */
-#define	TDI_SUSPENDED	0x0001	/* On suspension queue. */
-#define	TDI_SLEEPING	0x0002	/* Actually asleep! (tricky). */
-#define	TDI_SWAPPED	0x0004	/* Stack not in mem.  Bad juju if run. */
-#define	TDI_LOCK	0x0008	/* Stopped on a lock. */
-#define	TDI_IWAIT	0x0010	/* Awaiting interrupt. */
-
-#define	TD_IS_SLEEPING(td)	((td)->td_inhibitors & TDI_SLEEPING)
-#define	TD_ON_SLEEPQ(td)	((td)->td_wchan != NULL)
-#define	TD_IS_SUSPENDED(td)	((td)->td_inhibitors & TDI_SUSPENDED)
-#define	TD_IS_SWAPPED(td)	((td)->td_inhibitors & TDI_SWAPPED)
-#define	TD_ON_LOCK(td)		((td)->td_inhibitors & TDI_LOCK)
-#define	TD_AWAITING_INTR(td)	((td)->td_inhibitors & TDI_IWAIT)
-#define	TD_IS_RUNNING(td)	((td)->td_state == TDS_RUNNING)
-#define	TD_ON_RUNQ(td)		((td)->td_state == TDS_RUNQ)
-#define	TD_CAN_RUN(td)		((td)->td_state == TDS_CAN_RUN)
-#define	TD_IS_INHIBITED(td)	((td)->td_state == TDS_INHIBITED)
-#define	TD_ON_UPILOCK(td)	((td)->td_flags & TDF_UPIBLOCKED)
-#define TD_IS_IDLETHREAD(td)	((td)->td_flags & TDF_IDLETD)
-
-
-#define	TD_SET_INHIB(td, inhib) do {			\
-	(td)->td_state = TDS_INHIBITED;			\
-	(td)->td_inhibitors |= (inhib);			\
-} while (0)
-
-#define	TD_CLR_INHIB(td, inhib) do {			\
-	if (((td)->td_inhibitors & (inhib)) &&		\
-	    (((td)->td_inhibitors &= ~(inhib)) == 0))	\
-		(td)->td_state = TDS_CAN_RUN;		\
-} while (0)
-
-#define	TD_SET_SLEEPING(td)	TD_SET_INHIB((td), TDI_SLEEPING)
-#define	TD_SET_SWAPPED(td)	TD_SET_INHIB((td), TDI_SWAPPED)
-#define	TD_SET_LOCK(td)		TD_SET_INHIB((td), TDI_LOCK)
-#define	TD_SET_SUSPENDED(td)	TD_SET_INHIB((td), TDI_SUSPENDED)
-#define	TD_SET_IWAIT(td)	TD_SET_INHIB((td), TDI_IWAIT)
-#define	TD_SET_EXITING(td)	TD_SET_INHIB((td), TDI_EXITING)
-
-#define	TD_CLR_SLEEPING(td)	TD_CLR_INHIB((td), TDI_SLEEPING)
-#define	TD_CLR_SWAPPED(td)	TD_CLR_INHIB((td), TDI_SWAPPED)
-#define	TD_CLR_LOCK(td)		TD_CLR_INHIB((td), TDI_LOCK)
-#define	TD_CLR_SUSPENDED(td)	TD_CLR_INHIB((td), TDI_SUSPENDED)
-#define	TD_CLR_IWAIT(td)	TD_CLR_INHIB((td), TDI_IWAIT)
-
-#define	TD_SET_RUNNING(td)	(td)->td_state = TDS_RUNNING
-#define	TD_SET_RUNQ(td)		(td)->td_state = TDS_RUNQ
-#define	TD_SET_CAN_RUN(td)	(td)->td_state = TDS_CAN_RUN
-
-/*
- * Process structure.
- */
-struct proc {
-	LIST_ENTRY(proc) p_list;	/* (d) List of all processes. */
-	TAILQ_HEAD(, thread) p_threads;	/* (c) all threads. */
-	struct mtx	p_slock;	/* process spin lock */
-	struct ucred	*p_ucred;	/* (c) Process owner's identity. */
-	struct filedesc	*p_fd;		/* (b) Open files. */
-	struct filedesc_to_leader *p_fdtol; /* (b) Tracking node */
-	struct pstats	*p_stats;	/* (b) Accounting/statistics (CPU). */
-	struct plimit	*p_limit;	/* (c) Process limits. */
-	struct callout	p_limco;	/* (c) Limit callout handle */
-	struct sigacts	*p_sigacts;	/* (x) Signal actions, state (CPU). */
-
-	int		p_flag;		/* (c) P_* flags. */
-	int		p_flag2;	/* (c) P2_* flags. */
-	enum {
-		PRS_NEW = 0,		/* In creation */
-		PRS_NORMAL,		/* threads can be run. */
-		PRS_ZOMBIE
-	} p_state;			/* (j/c) Process status. */
-	pid_t		p_pid;		/* (b) Process identifier. */
-	LIST_ENTRY(proc) p_hash;	/* (d) Hash chain. */
-	LIST_ENTRY(proc) p_pglist;	/* (g + e) List of processes in pgrp. */
-	struct proc	*p_pptr;	/* (c + e) Pointer to parent process. */
-	LIST_ENTRY(proc) p_sibling;	/* (e) List of sibling processes. */
-	LIST_HEAD(, proc) p_children;	/* (e) Pointer to list of children. */
-	struct mtx	p_mtx;		/* (n) Lock for this struct. */
-	struct ksiginfo *p_ksi;	/* Locked by parent proc lock */
-	sigqueue_t	p_sigqueue;	/* (c) Sigs not delivered to a td. */
-#define p_siglist	p_sigqueue.sq_signals
-
-/* The following fields are all zeroed upon creation in fork. */
-#define	p_startzero	p_oppid
-	pid_t		p_oppid;	/* (c + e) Save ppid in ptrace. XXX */
-	struct vmspace	*p_vmspace;	/* (b) Address space. */
-	u_int		p_swtick;	/* (c) Tick when swapped in or out. */
-	struct itimerval p_realtimer;	/* (c) Alarm timer. */
-	struct rusage	p_ru;		/* (a) Exit information. */
-	struct rusage_ext p_rux;	/* (cj) Internal resource usage. */
-	struct rusage_ext p_crux;	/* (c) Internal child resource usage. */
-	int		p_profthreads;	/* (c) Num threads in addupc_task. */
-	volatile int	p_exitthreads;	/* (j) Number of threads exiting */
-	int		p_traceflag;	/* (o) Kernel trace points. */
-	struct vnode	*p_tracevp;	/* (c + o) Trace to vnode. */
-	struct ucred	*p_tracecred;	/* (o) Credentials to trace with. */
-	struct vnode	*p_textvp;	/* (b) Vnode of executable. */
-	u_int		p_lock;		/* (c) Proclock (prevent swap) count. */
-	struct sigiolst	p_sigiolst;	/* (c) List of sigio sources. */
-	int		p_sigparent;	/* (c) Signal to parent on exit. */
-	int		p_sig;		/* (n) For core dump/debugger XXX. */
-	u_long		p_code;		/* (n) For core dump/debugger XXX. */
-	u_int		p_stops;	/* (c) Stop event bitmask. */
-	u_int		p_stype;	/* (c) Stop event type. */
-	char		p_step;		/* (c) Process is stopped. */
-	u_char		p_pfsflags;	/* (c) Procfs flags. */
-	struct nlminfo	*p_nlminfo;	/* (?) Only used by/for lockd. */
-	struct kaioinfo	*p_aioinfo;	/* (y) ASYNC I/O info. */
-	struct thread	*p_singlethread;/* (c + j) If single threading this is it */
-	int		p_suspcount;	/* (j) Num threads in suspended mode. */
-	struct thread	*p_xthread;	/* (c) Trap thread */
-	int		p_boundary_count;/* (j) Num threads at user boundary */
-	int		p_pendingcnt;	/* how many signals are pending */
-	struct itimers	*p_itimers;	/* (c) POSIX interval timers. */
-	struct procdesc	*p_procdesc;	/* (e) Process descriptor, if any. */
-/* End area that is zeroed on creation. */
-#define	p_endzero	p_magic
-
-/* The following fields are all copied upon creation in fork. */
-#define	p_startcopy	p_endzero
-	u_int		p_magic;	/* (b) Magic number. */
-	int		p_osrel;	/* (x) osreldate for the
-					       binary (from ELF note, if any) */
-	char		p_comm[MAXCOMLEN + 1];	/* (b) Process name. */
-	struct pgrp	*p_pgrp;	/* (c + e) Pointer to process group. */
-	struct sysentvec *p_sysent;	/* (b) Syscall dispatch info. */
-	struct pargs	*p_args;	/* (c) Process arguments. */
-	rlim_t		p_cpulimit;	/* (c) Current CPU limit in seconds. */
-	signed char	p_nice;		/* (c) Process "nice" value. */
-	int		p_fibnum;	/* in this routing domain XXX MRT */
-/* End area that is copied on creation. */
-#define	p_endcopy	p_xstat
-
-	u_short		p_xstat;	/* (c) Exit status; also stop sig. */
-	struct knlist	p_klist;	/* (c) Knotes attached to this proc. */
-	int		p_numthreads;	/* (c) Number of threads. */
-	struct mdproc	p_md;		/* Any machine-dependent fields. */
-	struct callout	p_itcallout;	/* (h + c) Interval timer callout. */
-	u_short		p_acflag;	/* (c) Accounting flags. */
-	struct proc	*p_peers;	/* (r) */
-	struct proc	*p_leader;	/* (b) */
-	void		*p_emuldata;	/* (c) Emulator state data. */
-	struct label	*p_label;	/* (*) Proc (not subject) MAC label. */
-	struct p_sched	*p_sched;	/* (*) Scheduler-specific data. */
-	STAILQ_HEAD(, ktr_request)	p_ktr;	/* (o) KTR event queue. */
-	LIST_HEAD(, mqueue_notifier)	p_mqnotifier; /* (c) mqueue notifiers.*/
-	struct kdtrace_proc	*p_dtrace; /* (*) DTrace-specific data. */
-	struct cv	p_pwait;	/* (*) wait cv for exit/exec. */
-	struct cv	p_dbgwait;	/* (*) wait cv for debugger attach
-					   after fork. */
-	uint64_t	p_prev_runtime;	/* (c) Resource usage accounting. */
-	struct racct	*p_racct;	/* (b) Resource accounting. */
-	u_char		p_throttled;	/* (c) Flag for racct pcpu throttling */
-	/*
-	 * An orphan is the child that has beed re-parented to the
-	 * debugger as a result of attaching to it.  Need to keep
-	 * track of them for parent to be able to collect the exit
-	 * status of what used to be children.
-	 */
-	LIST_ENTRY(proc) p_orphan;	/* (e) List of orphan processes. */
-	LIST_HEAD(, proc) p_orphans;	/* (e) Pointer to list of orphans. */
-	u_int		p_treeflag;	/* (e) P_TREE flags */
-	struct proc	*p_reaper;	/* (e) My reaper. */
-	LIST_HEAD(, proc) p_reaplist;	/* (e) List of my descendants
-					       (if I am reaper). */
-	LIST_ENTRY(proc) p_reapsibling;	/* (e) List of siblings - descendants of
-					       the same reaper. */
-	pid_t		p_reapsubtree;	/* (e) Pid of the direct child of the
-					       reaper which spawned
-					       our subtree. */
-};
-
-#define	p_session	p_pgrp->pg_session
-#define	p_pgid		p_pgrp->pg_id
-
-#define	NOCPU	0xff		/* For when we aren't on a CPU. */
-
-#define	PROC_SLOCK(p)	mtx_lock_spin(&(p)->p_slock)
-#define	PROC_SUNLOCK(p)	mtx_unlock_spin(&(p)->p_slock)
-#define	PROC_SLOCK_ASSERT(p, type)	mtx_assert(&(p)->p_slock, (type))
-
-/* These flags are kept in p_flag. */
-#define	P_ADVLOCK	0x00001	/* Process may hold a POSIX advisory lock. */
-#define	P_CONTROLT	0x00002	/* Has a controlling terminal. */
-#define	P_KTHREAD	0x00004	/* Kernel thread (*). */
-#define	P_FOLLOWFORK	0x00008	/* Attach parent debugger to children. */
-#define	P_PPWAIT	0x00010	/* Parent is waiting for child to exec/exit. */
-#define	P_PROFIL	0x00020	/* Has started profiling. */
-#define	P_STOPPROF	0x00040	/* Has thread requesting to stop profiling. */
-#define	P_HADTHREADS	0x00080	/* Has had threads (no cleanup shortcuts) */
-#define	P_SUGID		0x00100	/* Had set id privileges since last exec. */
-#define	P_SYSTEM	0x00200	/* System proc: no sigs, stats or swapping. */
-#define	P_SINGLE_EXIT	0x00400	/* Threads suspending should exit, not wait. */
-#define	P_TRACED	0x00800	/* Debugged process being traced. */
-#define	P_WAITED	0x01000	/* Someone is waiting for us. */
-#define	P_WEXIT		0x02000	/* Working on exiting. */
-#define	P_EXEC		0x04000	/* Process called exec. */
-#define	P_WKILLED	0x08000	/* Killed, go to kernel/user boundary ASAP. */
-#define	P_CONTINUED	0x10000	/* Proc has continued from a stopped state. */
-#define	P_STOPPED_SIG	0x20000	/* Stopped due to SIGSTOP/SIGTSTP. */
-#define	P_STOPPED_TRACE	0x40000	/* Stopped because of tracing. */
-#define	P_STOPPED_SINGLE 0x80000 /* Only 1 thread can continue (not to user). */
-#define	P_PROTECTED	0x100000 /* Do not kill on memory overcommit. */
-#define	P_SIGEVENT	0x200000 /* Process pending signals changed. */
-#define	P_SINGLE_BOUNDARY 0x400000 /* Threads should suspend at user boundary. */
-#define	P_HWPMC		0x800000 /* Process is using HWPMCs */
-#define	P_JAILED	0x1000000 /* Process is in jail. */
-#define	P_TOTAL_STOP	0x2000000 /* Stopped in proc_stop_total. */
-#define	P_INEXEC	0x4000000 /* Process is in execve(). */
-#define	P_STATCHILD	0x8000000 /* Child process stopped or exited. */
-#define	P_INMEM		0x10000000 /* Loaded into memory. */
-#define	P_SWAPPINGOUT	0x20000000 /* Process is being swapped out. */
-#define	P_SWAPPINGIN	0x40000000 /* Process is being swapped in. */
-#define	P_PPTRACE	0x80000000 /* PT_TRACEME by vforked child. */
-
-#define	P_STOPPED	(P_STOPPED_SIG|P_STOPPED_SINGLE|P_STOPPED_TRACE)
-#define	P_SHOULDSTOP(p)	((p)->p_flag & P_STOPPED)
-#define	P_KILLED(p)	((p)->p_flag & P_WKILLED)
-
-/* These flags are kept in p_flag2. */
-#define	P2_INHERIT_PROTECTED 0x00000001 /* New children get P_PROTECTED. */
-#define	P2_NOTRACE	0x00000002	/* No ptrace(2) attach or coredumps. */
-#define	P2_NOTRACE_EXEC 0x00000004	/* Keep P2_NOPTRACE on exec(2). */
-#define	P2_AST_SU	0x00000008	/* Handles SU ast for kthreads. */
-
-/* Flags protected by proctree_lock, kept in p_treeflags. */
-#define	P_TREE_ORPHANED		0x00000001	/* Reparented, on orphan list */
-#define	P_TREE_FIRST_ORPHAN	0x00000002	/* First element of orphan
-						   list */
-#define	P_TREE_REAPER		0x00000004	/* Reaper of subtree */
-
-/*
- * These were process status values (p_stat), now they are only used in
- * legacy conversion code.
- */
-#define	SIDL	1		/* Process being created by fork. */
-#define	SRUN	2		/* Currently runnable. */
-#define	SSLEEP	3		/* Sleeping on an address. */
-#define	SSTOP	4		/* Process debugging or suspension. */
-#define	SZOMB	5		/* Awaiting collection by parent. */
-#define	SWAIT	6		/* Waiting for interrupt. */
-#define	SLOCK	7		/* Blocked on a lock. */
-
-#define	P_MAGIC		0xbeefface
-
-#ifdef _KERNEL
-
-/* Types and flags for mi_switch(). */
-#define	SW_TYPE_MASK		0xff	/* First 8 bits are switch type */
-#define	SWT_NONE		0	/* Unspecified switch. */
-#define	SWT_PREEMPT		1	/* Switching due to preemption. */
-#define	SWT_OWEPREEMPT		2	/* Switching due to opepreempt. */
-#define	SWT_TURNSTILE		3	/* Turnstile contention. */
-#define	SWT_SLEEPQ		4	/* Sleepq wait. */
-#define	SWT_SLEEPQTIMO		5	/* Sleepq timeout wait. */
-#define	SWT_RELINQUISH		6	/* yield call. */
-#define	SWT_NEEDRESCHED		7	/* NEEDRESCHED was set. */
-#define	SWT_IDLE		8	/* Switching from the idle thread. */
-#define	SWT_IWAIT		9	/* Waiting for interrupts. */
-#define	SWT_SUSPEND		10	/* Thread suspended. */
-#define	SWT_REMOTEPREEMPT	11	/* Remote processor preempted. */
-#define	SWT_REMOTEWAKEIDLE	12	/* Remote processor preempted idle. */
-#define	SWT_COUNT		13	/* Number of switch types. */
-/* Flags */
-#define	SW_VOL		0x0100		/* Voluntary switch. */
-#define	SW_INVOL	0x0200		/* Involuntary switch. */
-#define SW_PREEMPT	0x0400		/* The invol switch is a preemption */
-
-/* How values for thread_single(). */
-#define	SINGLE_NO_EXIT	0
-#define	SINGLE_EXIT	1
-#define	SINGLE_BOUNDARY	2
-#define	SINGLE_ALLPROC	3
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_PARGS);
-MALLOC_DECLARE(M_PGRP);
-MALLOC_DECLARE(M_SESSION);
-MALLOC_DECLARE(M_SUBPROC);
-#endif
-
-#define	FOREACH_PROC_IN_SYSTEM(p)					\
-	LIST_FOREACH((p), &allproc, p_list)
-#define	FOREACH_THREAD_IN_PROC(p, td)					\
-	TAILQ_FOREACH((td), &(p)->p_threads, td_plist)
-
-#define	FIRST_THREAD_IN_PROC(p)	TAILQ_FIRST(&(p)->p_threads)
-
-/*
- * We use process IDs <= pid_max <= PID_MAX; PID_MAX + 1 must also fit
- * in a pid_t, as it is used to represent "no process group".
- */
-#define	PID_MAX		99999
-#define	NO_PID		100000
-extern pid_t pid_max;
-
-#define	SESS_LEADER(p)	((p)->p_session->s_leader == (p))
-
-
-#define	STOPEVENT(p, e, v) do {						\
-	if ((p)->p_stops & (e))	{					\
-		PROC_LOCK(p);						\
-		stopevent((p), (e), (v));				\
-		PROC_UNLOCK(p);						\
-	}								\
-} while (0)
-#define	_STOPEVENT(p, e, v) do {					\
-	PROC_LOCK_ASSERT(p, MA_OWNED);					\
-	WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, &p->p_mtx.lock_object, \
- 	    "checking stopevent %d", (e));				\
-	if ((p)->p_stops & (e))						\
-		stopevent((p), (e), (v));				\
-} while (0)
-
-/* Lock and unlock a process. */
-#define	PROC_LOCK(p)	mtx_lock(&(p)->p_mtx)
-#define	PROC_TRYLOCK(p)	mtx_trylock(&(p)->p_mtx)
-#define	PROC_UNLOCK(p)	mtx_unlock(&(p)->p_mtx)
-#define	PROC_LOCKED(p)	mtx_owned(&(p)->p_mtx)
-#define	PROC_LOCK_ASSERT(p, type)	mtx_assert(&(p)->p_mtx, (type))
-
-/* Lock and unlock a process group. */
-#define	PGRP_LOCK(pg)	mtx_lock(&(pg)->pg_mtx)
-#define	PGRP_UNLOCK(pg)	mtx_unlock(&(pg)->pg_mtx)
-#define	PGRP_LOCKED(pg)	mtx_owned(&(pg)->pg_mtx)
-#define	PGRP_LOCK_ASSERT(pg, type)	mtx_assert(&(pg)->pg_mtx, (type))
-
-#define	PGRP_LOCK_PGSIGNAL(pg) do {					\
-	if ((pg) != NULL)						\
-		PGRP_LOCK(pg);						\
-} while (0)
-#define	PGRP_UNLOCK_PGSIGNAL(pg) do {					\
-	if ((pg) != NULL)						\
-		PGRP_UNLOCK(pg);					\
-} while (0)
-
-/* Lock and unlock a session. */
-#define	SESS_LOCK(s)	mtx_lock(&(s)->s_mtx)
-#define	SESS_UNLOCK(s)	mtx_unlock(&(s)->s_mtx)
-#define	SESS_LOCKED(s)	mtx_owned(&(s)->s_mtx)
-#define	SESS_LOCK_ASSERT(s, type)	mtx_assert(&(s)->s_mtx, (type))
-
-/* Hold process U-area in memory, normally for ptrace/procfs work. */
-#define	PHOLD(p) do {							\
-	PROC_LOCK(p);							\
-	_PHOLD(p);							\
-	PROC_UNLOCK(p);							\
-} while (0)
-#define	_PHOLD(p) do {							\
-	PROC_LOCK_ASSERT((p), MA_OWNED);				\
-	KASSERT(!((p)->p_flag & P_WEXIT) || (p) == curproc,		\
-	    ("PHOLD of exiting process"));				\
-	(p)->p_lock++;							\
-	if (((p)->p_flag & P_INMEM) == 0)				\
-		faultin((p));						\
-} while (0)
-#define PROC_ASSERT_HELD(p) do {					\
-	KASSERT((p)->p_lock > 0, ("process not held"));			\
-} while (0)
-
-#define	PRELE(p) do {							\
-	PROC_LOCK((p));							\
-	_PRELE((p));							\
-	PROC_UNLOCK((p));						\
-} while (0)
-#define	_PRELE(p) do {							\
-	PROC_LOCK_ASSERT((p), MA_OWNED);				\
-	PROC_ASSERT_HELD(p);						\
-	(--(p)->p_lock);						\
-	if (((p)->p_flag & P_WEXIT) && (p)->p_lock == 0)		\
-		wakeup(&(p)->p_lock);					\
-} while (0)
-#define PROC_ASSERT_NOT_HELD(p) do {					\
-	KASSERT((p)->p_lock == 0, ("process held"));			\
-} while (0)
-
-/* Check whether a thread is safe to be swapped out. */
-#define	thread_safetoswapout(td)	((td)->td_flags & TDF_CANSWAP)
-
-/* Control whether or not it is safe for curthread to sleep. */
-#define	THREAD_NO_SLEEPING()		((curthread)->td_no_sleeping++)
-
-#define	THREAD_SLEEPING_OK()		((curthread)->td_no_sleeping--)
-
-#define	THREAD_CAN_SLEEP()		((curthread)->td_no_sleeping == 0)
-
-#define	PIDHASH(pid)	(&pidhashtbl[(pid) & pidhash])
-extern LIST_HEAD(pidhashhead, proc) *pidhashtbl;
-extern u_long pidhash;
-#define	TIDHASH(tid)	(&tidhashtbl[(tid) & tidhash])
-extern LIST_HEAD(tidhashhead, thread) *tidhashtbl;
-extern u_long tidhash;
-extern struct rwlock tidhash_lock;
-
-#define	PGRPHASH(pgid)	(&pgrphashtbl[(pgid) & pgrphash])
-extern LIST_HEAD(pgrphashhead, pgrp) *pgrphashtbl;
-extern u_long pgrphash;
-
-extern struct sx allproc_lock;
-extern int allproc_gen;
-extern struct sx proctree_lock;
-extern struct mtx ppeers_lock;
-extern struct proc proc0;		/* Process slot for swapper. */
-extern struct thread thread0;		/* Primary thread in proc0. */
-extern struct vmspace vmspace0;		/* VM space for proc0. */
-extern int hogticks;			/* Limit on kernel cpu hogs. */
-extern int lastpid;
-extern int nprocs, maxproc;		/* Current and max number of procs. */
-extern int maxprocperuid;		/* Max procs per uid. */
-extern u_long ps_arg_cache_limit;
-
-LIST_HEAD(proclist, proc);
-TAILQ_HEAD(procqueue, proc);
-TAILQ_HEAD(threadqueue, thread);
-extern struct proclist allproc;		/* List of all processes. */
-extern struct proclist zombproc;	/* List of zombie processes. */
-extern struct proc *initproc, *pageproc; /* Process slots for init, pager. */
-
-extern struct uma_zone *proc_zone;
-
-struct	proc *pfind(pid_t);		/* Find process by id. */
-struct	proc *pfind_locked(pid_t pid);
-struct	pgrp *pgfind(pid_t);		/* Find process group by id. */
-struct	proc *zpfind(pid_t);		/* Find zombie process by id. */
-
-/*
- * pget() flags.
- */
-#define	PGET_HOLD	0x00001	/* Hold the process. */
-#define	PGET_CANSEE	0x00002	/* Check against p_cansee(). */
-#define	PGET_CANDEBUG	0x00004	/* Check against p_candebug(). */
-#define	PGET_ISCURRENT	0x00008	/* Check that the found process is current. */
-#define	PGET_NOTWEXIT	0x00010	/* Check that the process is not in P_WEXIT. */
-#define	PGET_NOTINEXEC	0x00020	/* Check that the process is not in P_INEXEC. */
-#define	PGET_NOTID	0x00040	/* Do not assume tid if pid > PID_MAX. */
-
-#define	PGET_WANTREAD	(PGET_HOLD | PGET_CANDEBUG | PGET_NOTWEXIT)
-
-int	pget(pid_t pid, int flags, struct proc **pp);
-
-void	ast(struct trapframe *framep);
-struct	thread *choosethread(void);
-int	cr_cansignal(struct ucred *cred, struct proc *proc, int signum);
-int	enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp,
-	    struct session *sess);
-int	enterthispgrp(struct proc *p, struct pgrp *pgrp);
-void	faultin(struct proc *p);
-void	fixjobc(struct proc *p, struct pgrp *pgrp, int entering);
-int	fork1(struct thread *, int, int, struct proc **, int *, int);
-void	fork_exit(void (*)(void *, struct trapframe *), void *,
-	    struct trapframe *);
-void	fork_return(struct thread *, struct trapframe *);
-int	inferior(struct proc *p);
-void	kern_yield(int);
-void 	kick_proc0(void);
-int	leavepgrp(struct proc *p);
-int	maybe_preempt(struct thread *td);
-void	maybe_yield(void);
-void	mi_switch(int flags, struct thread *newtd);
-int	p_candebug(struct thread *td, struct proc *p);
-int	p_cansee(struct thread *td, struct proc *p);
-int	p_cansched(struct thread *td, struct proc *p);
-int	p_cansignal(struct thread *td, struct proc *p, int signum);
-int	p_canwait(struct thread *td, struct proc *p);
-struct	pargs *pargs_alloc(int len);
-void	pargs_drop(struct pargs *pa);
-void	pargs_hold(struct pargs *pa);
-int	proc_getargv(struct thread *td, struct proc *p, struct sbuf *sb);
-int	proc_getauxv(struct thread *td, struct proc *p, struct sbuf *sb);
-int	proc_getenvv(struct thread *td, struct proc *p, struct sbuf *sb);
-void	procinit(void);
-void	proc_linkup0(struct proc *p, struct thread *td);
-void	proc_linkup(struct proc *p, struct thread *td);
-struct proc *proc_realparent(struct proc *child);
-void	proc_reap(struct thread *td, struct proc *p, int *status, int options);
-void	proc_reparent(struct proc *child, struct proc *newparent);
-struct	pstats *pstats_alloc(void);
-void	pstats_fork(struct pstats *src, struct pstats *dst);
-void	pstats_free(struct pstats *ps);
-void	reaper_abandon_children(struct proc *p, bool exiting);
-int	securelevel_ge(struct ucred *cr, int level);
-int	securelevel_gt(struct ucred *cr, int level);
-void	sess_hold(struct session *);
-void	sess_release(struct session *);
-int	setrunnable(struct thread *);
-void	setsugid(struct proc *p);
-int	should_yield(void);
-int	sigonstack(size_t sp);
-void	stopevent(struct proc *, u_int, u_int);
-struct	thread *tdfind(lwpid_t, pid_t);
-void	threadinit(void);
-void	tidhash_add(struct thread *);
-void	tidhash_remove(struct thread *);
-void	cpu_idle(int);
-int	cpu_idle_wakeup(int);
-extern	void (*cpu_idle_hook)(sbintime_t);	/* Hook to machdep CPU idler. */
-void	cpu_switch(struct thread *, struct thread *, struct mtx *);
-void	cpu_throw(struct thread *, struct thread *) __dead2;
-void	unsleep(struct thread *);
-void	userret(struct thread *, struct trapframe *);
-
-void	cpu_exit(struct thread *);
-void	exit1(struct thread *, int) __dead2;
-struct syscall_args;
-int	cpu_fetch_syscall_args(struct thread *td, struct syscall_args *sa);
-void	cpu_fork(struct thread *, struct proc *, struct thread *, int);
-void	cpu_set_fork_handler(struct thread *, void (*)(void *), void *);
-void	cpu_set_syscall_retval(struct thread *, int);
-void	cpu_set_upcall(struct thread *td, struct thread *td0);
-void	cpu_set_upcall_kse(struct thread *, void (*)(void *), void *,
-	    stack_t *);
-int	cpu_set_user_tls(struct thread *, void *tls_base);
-void	cpu_thread_alloc(struct thread *);
-void	cpu_thread_clean(struct thread *);
-void	cpu_thread_exit(struct thread *);
-void	cpu_thread_free(struct thread *);
-void	cpu_thread_swapin(struct thread *);
-void	cpu_thread_swapout(struct thread *);
-struct	thread *thread_alloc(int pages);
-int	thread_alloc_stack(struct thread *, int pages);
-void	thread_exit(void) __dead2;
-void	thread_free(struct thread *td);
-void	thread_link(struct thread *td, struct proc *p);
-void	thread_reap(void);
-int	thread_single(struct proc *p, int how);
-void	thread_single_end(struct proc *p, int how);
-void	thread_stash(struct thread *td);
-void	thread_stopped(struct proc *p);
-void	childproc_stopped(struct proc *child, int reason);
-void	childproc_continued(struct proc *child);
-void	childproc_exited(struct proc *child);
-int	thread_suspend_check(int how);
-bool	thread_suspend_check_needed(void);
-void	thread_suspend_switch(struct thread *, struct proc *p);
-void	thread_suspend_one(struct thread *td);
-void	thread_unlink(struct thread *td);
-void	thread_unsuspend(struct proc *p);
-void	thread_wait(struct proc *p);
-struct thread	*thread_find(struct proc *p, lwpid_t tid);
-
-void	stop_all_proc(void);
-void	resume_all_proc(void);
-
-static __inline int
-curthread_pflags_set(int flags)
-{
-	struct thread *td;
-	int save;
-
-	td = curthread;
-	save = ~flags | (td->td_pflags & flags);
-	td->td_pflags |= flags;
-	return (save);
-}
-
-static __inline void
-curthread_pflags_restore(int save)
-{
-
-	curthread->td_pflags &= save;
-}
-
-#endif	/* _KERNEL */
-
-#endif	/* !_SYS_PROC_H_ */
diff --git a/include.new/sys/procctl.h b/include.new/sys/procctl.h
deleted file mode 100644
index 851f983..0000000
--- a/include.new/sys/procctl.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * Copyright (c) 2013 Hudson River Trading LLC
- * Written by: John H. Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/sys/procctl.h 283927 2015-06-02 19:20:39Z jhb $
- */
-
-#ifndef	_SYS_PROCCTL_H_
-#define	_SYS_PROCCTL_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#include <sys/wait.h>
-#endif
-
-#define	PROC_SPROTECT		1	/* set protected state */
-#define	PROC_REAP_ACQUIRE	2	/* reaping enable */
-#define	PROC_REAP_RELEASE	3	/* reaping disable */
-#define	PROC_REAP_STATUS	4	/* reaping status */
-#define	PROC_REAP_GETPIDS	5	/* get descendants */
-#define	PROC_REAP_KILL		6	/* kill descendants */
-#define	PROC_TRACE_CTL		7	/* en/dis ptrace and coredumps */
-#define	PROC_TRACE_STATUS	8	/* query tracing status */
-
-/* Operations for PROC_SPROTECT (passed in integer arg). */
-#define	PPROT_OP(x)	((x) & 0xf)
-#define	PPROT_SET	1
-#define	PPROT_CLEAR	2
-
-/* Flags for PROC_SPROTECT (ORed in with operation). */
-#define	PPROT_FLAGS(x)	((x) & ~0xf)
-#define	PPROT_DESCEND	0x10
-#define	PPROT_INHERIT	0x20
-
-/* Result of PREAP_STATUS (returned by value). */
-struct procctl_reaper_status {
-	u_int	rs_flags;
-	u_int	rs_children;
-	u_int	rs_descendants;
-	pid_t	rs_reaper;
-	pid_t	rs_pid;
-	u_int	rs_pad0[15];
-};
-
-/* struct procctl_reaper_status rs_flags */
-#define	REAPER_STATUS_OWNED	0x00000001
-#define	REAPER_STATUS_REALINIT	0x00000002
-
-struct procctl_reaper_pidinfo {
-	pid_t	pi_pid;
-	pid_t	pi_subtree;
-	u_int	pi_flags;
-	u_int	pi_pad0[15];
-};
-
-#define	REAPER_PIDINFO_VALID	0x00000001
-#define	REAPER_PIDINFO_CHILD	0x00000002
-
-struct procctl_reaper_pids {
-	u_int	rp_count;
-	u_int	rp_pad0[15];
-	struct procctl_reaper_pidinfo *rp_pids;
-};
-
-struct procctl_reaper_kill {
-	int	rk_sig;		/* in  - signal to send */
-	u_int	rk_flags;	/* in  - REAPER_KILL flags */
-	pid_t	rk_subtree;	/* in  - subtree, if REAPER_KILL_SUBTREE */
-	u_int	rk_killed;	/* out - count of processes sucessfully
-				   killed */
-	pid_t	rk_fpid;	/* out - first failed pid for which error
-				   is returned */
-	u_int	rk_pad0[15];
-};
-
-#define	REAPER_KILL_CHILDREN	0x00000001
-#define	REAPER_KILL_SUBTREE	0x00000002
-
-#define	PROC_TRACE_CTL_ENABLE		1
-#define	PROC_TRACE_CTL_DISABLE		2
-#define	PROC_TRACE_CTL_DISABLE_EXEC	3
-
-#ifndef _KERNEL
-__BEGIN_DECLS
-int	procctl(idtype_t, id_t, int, void *);
-__END_DECLS
-
-#endif
-
-#endif /* !_SYS_PROCCTL_H_ */
diff --git a/include.new/sys/procdesc.h b/include.new/sys/procdesc.h
deleted file mode 100644
index 56517e6..0000000
--- a/include.new/sys/procdesc.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * Copyright (c) 2009 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed at the University of Cambridge Computer
- * Laboratory with support from a grant from Google, Inc.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/procdesc.h 269619 2014-08-06 00:35:32Z emaste $
- */
-
-#ifndef _SYS_PROCDESC_H_
-#define	_SYS_PROCDESC_H_
-
-#ifdef _KERNEL
-#include <sys/selinfo.h>	/* struct selinfo */
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-
-/*-
- * struct procdesc describes a process descriptor, and essentially consists
- * of two pointers -- one to the file descriptor, and one to the process.
- * When both become NULL, the process descriptor will be freed.  An important
- * invariant is that there is only ever one process descriptor for a process,
- * so a single file pointer will suffice.
- *
- * Locking key:
- * (c) - Constant after initial setup.
- * (p) - Protected by the process descriptor mutex.
- * (r) - Atomic reference count.
- * (s) - Protected by selinfo.
- * (t) - Protected by the proctree_lock
- */
-struct proc;
-struct sigio;
-struct procdesc {
-	/*
-	 * Basic process descriptor state: the process, a cache of its pid to
-	 * satisfy queries after the process exits, and process descriptor
-	 * refcount.
-	 */
-	struct proc	*pd_proc;		/* (t) Process. */
-	pid_t		 pd_pid;		/* (c) Cached pid. */
-	u_int		 pd_refcount;		/* (r) Reference count. */
-
-	/*
-	 * In-flight data and notification of events.
-	 */
-	int		 pd_flags;		/* (p) PD_ flags. */
-	struct selinfo	 pd_selinfo;		/* (p) Event notification. */
-	struct mtx	 pd_lock;		/* Protect data + events. */
-};
-
-/*
- * Locking macros for the procdesc itself.
- */
-#define	PROCDESC_LOCK_DESTROY(pd)	mtx_destroy(&(pd)->pd_lock)
-#define	PROCDESC_LOCK_INIT(pd)	mtx_init(&(pd)->pd_lock, "procdesc", NULL, \
-				    MTX_DEF)
-#define	PROCDESC_LOCK(pd)	mtx_lock(&(pd)->pd_lock)
-#define	PROCDESC_UNLOCK(pd)	mtx_unlock(&(pd)->pd_lock)
-
-/*
- * Flags for the pd_flags field.
- */
-#define	PDF_CLOSED	0x00000001	/* Descriptor has closed. */
-#define	PDF_SELECTED	0x00000002	/* Issue selwakeup(). */
-#define	PDF_EXITED	0x00000004	/* Process exited. */
-#define	PDF_DAEMON	0x00000008	/* Don't exit when procdesc closes. */
-
-/*
- * In-kernel interfaces to process descriptors.
- */
-int	 procdesc_exit(struct proc *);
-int	 procdesc_find(struct thread *, int fd, cap_rights_t *, struct proc **);
-int	 kern_pdgetpid(struct thread *, int fd, cap_rights_t *, pid_t *pidp);
-void	 procdesc_new(struct proc *, int);
-void	 procdesc_finit(struct procdesc *, struct file *);
-pid_t	 procdesc_pid(struct file *);
-void	 procdesc_reap(struct proc *);
-
-#else /* !_KERNEL */
-
-/*
- * Process descriptor system calls.
- */
-struct rusage;
-int	 pdfork(int *, int);
-int	 pdkill(int, int);
-int	 pdgetpid(int, pid_t *);
-
-#endif /* _KERNEL */
-
-/*
- * Flags which can be passed to pdfork(2).
- */
-#define	PD_DAEMON	0x00000001	/* Don't exit when procdesc closes. */
-
-#endif /* !_SYS_PROCDESC_H_ */
diff --git a/include.new/sys/procfs.h b/include.new/sys/procfs.h
deleted file mode 100644
index 44909fc..0000000
--- a/include.new/sys/procfs.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 1998 John D. Polstra.
- * 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.
- *
- * 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: releng/10.2/sys/sys/procfs.h 283911 2015-06-02 14:55:55Z jhb $
- */
-
-#ifndef _SYS_PROCFS_H_
-#define _SYS_PROCFS_H_
-
-#include <sys/param.h>
-#include <machine/reg.h>
-
-typedef struct reg gregset_t;
-typedef struct fpreg fpregset_t;
-
-/*
- * These structures define an interface between core files and the debugger.
- * Never change or delete any elements.  If you add elements, add them to
- * the end of the structure, and increment the value of its version field.
- * This will help to ensure that today's core dump will still be usable
- * with next year's debugger.
- *
- * A lot more things should be added to these structures.  At present,
- * they contain the absolute bare minimum required to allow GDB to work
- * with ELF core dumps.
- */
-
-/*
- * The parenthsized numbers like (1) indicate the minimum version number
- * for which each element exists in the structure.
- */
-
-#define PRSTATUS_VERSION	1	/* Current version of prstatus_t */
-
-typedef struct prstatus {
-    int		pr_version;	/* Version number of struct (1) */
-    size_t	pr_statussz;	/* sizeof(prstatus_t) (1) */
-    size_t	pr_gregsetsz;	/* sizeof(gregset_t) (1) */
-    size_t	pr_fpregsetsz;	/* sizeof(fpregset_t) (1) */
-    int		pr_osreldate;	/* Kernel version (1) */
-    int		pr_cursig;	/* Current signal (1) */
-    pid_t	pr_pid;		/* Process ID (1) */
-    gregset_t	pr_reg;		/* General purpose registers (1) */
-} prstatus_t;
-
-typedef gregset_t prgregset_t[1];
-typedef fpregset_t prfpregset_t;
-
-#define PRFNAMESZ	16	/* Maximum command length saved */
-#define PRARGSZ		80	/* Maximum argument bytes saved */
-
-#define PRPSINFO_VERSION	1	/* Current version of prpsinfo_t */
-
-typedef struct prpsinfo {
-    int		pr_version;	/* Version number of struct (1) */
-    size_t	pr_psinfosz;	/* sizeof(prpsinfo_t) (1) */
-    char	pr_fname[PRFNAMESZ+1];	/* Command name, null terminated (1) */
-    char	pr_psargs[PRARGSZ+1];	/* Arguments, null terminated (1) */
-} prpsinfo_t;
-
-typedef struct thrmisc {
-    char	pr_tname[MAXCOMLEN+1];	/* Thread name, null terminated (1) */
-    u_int	_pad;			/* Convenience pad, 0-filled (1) */
-} thrmisc_t;
-
-typedef uint64_t psaddr_t;	/* An address in the target process. */
-
-#ifdef __HAVE_REG32
-typedef struct prstatus32 {
-	int32_t	pr_version;
-	uint32_t pr_statussz;
-	uint32_t pr_gregsetsz;
-	uint32_t pr_fpregsetsz;
-	int32_t	pr_osreldate;
-	int32_t	pr_cursig;
-	int32_t	pr_pid;
-	struct reg32 pr_reg;
-} prstatus32_t;
-
-typedef struct prpsinfo32 {
-	int32_t	pr_version;
-	uint32_t pr_psinfosz;
-	char	pr_fname[PRFNAMESZ+1];
-	char	pr_psargs[PRARGSZ+1];
-} prpsinfo32_t;
-
-struct thrmisc32 {
-	char	pr_tname[MAXCOMLEN+1];
-	uint32_t _pad;
-};
-#endif /* __HAVE_REG32 */
-
-#endif /* _SYS_PROCFS_H_ */
diff --git a/include.new/sys/protosw.h b/include.new/sys/protosw.h
deleted file mode 100644
index 44c4369..0000000
--- a/include.new/sys/protosw.h
+++ /dev/null
@@ -1,348 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)protosw.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/protosw.h 247667 2013-03-02 21:11:30Z pjd $
- */
-
-#ifndef _SYS_PROTOSW_H_
-#define _SYS_PROTOSW_H_
-
-/* Forward declare these structures referenced from prototypes below. */
-struct mbuf;
-struct thread;
-struct sockaddr;
-struct socket;
-struct sockopt;
-
-/*#ifdef _KERNEL*/
-/*
- * Protocol switch table.
- *
- * Each protocol has a handle initializing one of these structures,
- * which is used for protocol-protocol and system-protocol communication.
- *
- * A protocol is called through the pr_init entry before any other.
- * Thereafter it is called every 200ms through the pr_fasttimo entry and
- * every 500ms through the pr_slowtimo for timer based actions.
- * The system will call the pr_drain entry if it is low on space and
- * this should throw away any non-critical data.
- *
- * Protocols pass data between themselves as chains of mbufs using
- * the pr_input and pr_output hooks.  Pr_input passes data up (towards
- * the users) and pr_output passes it down (towards the interfaces); control
- * information passes up and down on pr_ctlinput and pr_ctloutput.
- * The protocol is responsible for the space occupied by any the
- * arguments to these entries and must dispose it.
- *
- * In retrospect, it would be a lot nicer to use an interface
- * similar to the vnode VOP interface.
- */
-/* USE THESE FOR YOUR PROTOTYPES ! */
-typedef void	pr_input_t (struct mbuf *, int);
-typedef int	pr_input6_t (struct mbuf **, int*, int);  /* XXX FIX THIS */
-typedef int	pr_output_t (struct mbuf *, struct socket *);
-typedef void	pr_ctlinput_t (int, struct sockaddr *, void *);
-typedef int	pr_ctloutput_t (struct socket *, struct sockopt *);
-typedef	void	pr_init_t (void);
-typedef	void	pr_destroy_t (void);
-typedef	void	pr_fasttimo_t (void);
-typedef	void	pr_slowtimo_t (void);
-typedef	void	pr_drain_t (void);
-
-struct protosw {
-	short	pr_type;		/* socket type used for */
-	struct	domain *pr_domain;	/* domain protocol a member of */
-	short	pr_protocol;		/* protocol number */
-	short	pr_flags;		/* see below */
-/* protocol-protocol hooks */
-	pr_input_t *pr_input;		/* input to protocol (from below) */
-	pr_output_t *pr_output;		/* output to protocol (from above) */
-	pr_ctlinput_t *pr_ctlinput;	/* control input (from below) */
-	pr_ctloutput_t *pr_ctloutput;	/* control output (from above) */
-/* utility hooks */
-	pr_init_t *pr_init;
-	pr_destroy_t *pr_destroy;
-	pr_fasttimo_t *pr_fasttimo;	/* fast timeout (200ms) */
-	pr_slowtimo_t *pr_slowtimo;	/* slow timeout (500ms) */
-	pr_drain_t *pr_drain;		/* flush any excess space possible */
-
-	struct	pr_usrreqs *pr_usrreqs;	/* user-protocol hook */
-};
-/*#endif*/
-
-#define	PR_SLOWHZ	2		/* 2 slow timeouts per second */
-#define	PR_FASTHZ	5		/* 5 fast timeouts per second */
-
-/*
- * This number should be defined again within each protocol family to avoid
- * confusion.
- */
-#define	PROTO_SPACER	32767		/* spacer for loadable protocols */
-
-/*
- * Values for pr_flags.
- * PR_ADDR requires PR_ATOMIC;
- * PR_ADDR and PR_CONNREQUIRED are mutually exclusive.
- * PR_IMPLOPCL means that the protocol allows sendto without prior connect,
- *	and the protocol understands the MSG_EOF flag.  The first property is
- *	is only relevant if PR_CONNREQUIRED is set (otherwise sendto is allowed
- *	anyhow).
- */
-#define	PR_ATOMIC	0x01		/* exchange atomic messages only */
-#define	PR_ADDR		0x02		/* addresses given with messages */
-#define	PR_CONNREQUIRED	0x04		/* connection required by protocol */
-#define	PR_WANTRCVD	0x08		/* want PRU_RCVD calls */
-#define	PR_RIGHTS	0x10		/* passes capabilities */
-#define PR_IMPLOPCL	0x20		/* implied open/close */
-#define	PR_LASTHDR	0x40		/* enforce ipsec policy; last header */
-
-/*
- * In earlier BSD network stacks, a single pr_usrreq() function pointer was
- * invoked with an operation number indicating what operation was desired.
- * We now provide individual function pointers which protocols can implement,
- * which offers a number of benefits (such as type checking for arguments).
- * These older constants are still present in order to support TCP debugging.
- */
-#define	PRU_ATTACH		0	/* attach protocol to up */
-#define	PRU_DETACH		1	/* detach protocol from up */
-#define	PRU_BIND		2	/* bind socket to address */
-#define	PRU_LISTEN		3	/* listen for connection */
-#define	PRU_CONNECT		4	/* establish connection to peer */
-#define	PRU_ACCEPT		5	/* accept connection from peer */
-#define	PRU_DISCONNECT		6	/* disconnect from peer */
-#define	PRU_SHUTDOWN		7	/* won't send any more data */
-#define	PRU_RCVD		8	/* have taken data; more room now */
-#define	PRU_SEND		9	/* send this data */
-#define	PRU_ABORT		10	/* abort (fast DISCONNECT, DETATCH) */
-#define	PRU_CONTROL		11	/* control operations on protocol */
-#define	PRU_SENSE		12	/* return status into m */
-#define	PRU_RCVOOB		13	/* retrieve out of band data */
-#define	PRU_SENDOOB		14	/* send out of band data */
-#define	PRU_SOCKADDR		15	/* fetch socket's address */
-#define	PRU_PEERADDR		16	/* fetch peer's address */
-#define	PRU_CONNECT2		17	/* connect two sockets */
-/* begin for protocols internal use */
-#define	PRU_FASTTIMO		18	/* 200ms timeout */
-#define	PRU_SLOWTIMO		19	/* 500ms timeout */
-#define	PRU_PROTORCV		20	/* receive from below */
-#define	PRU_PROTOSEND		21	/* send to below */
-/* end for protocol's internal use */
-#define PRU_SEND_EOF		22	/* send and close */
-#define	PRU_SOSETLABEL		23	/* MAC label change */
-#define	PRU_CLOSE		24	/* socket close */
-#define	PRU_FLUSH		25	/* flush the socket */
-#define	PRU_NREQ		25
-
-#ifdef PRUREQUESTS
-const char *prurequests[] = {
-	"ATTACH",	"DETACH",	"BIND",		"LISTEN",
-	"CONNECT",	"ACCEPT",	"DISCONNECT",	"SHUTDOWN",
-	"RCVD",		"SEND",		"ABORT",	"CONTROL",
-	"SENSE",	"RCVOOB",	"SENDOOB",	"SOCKADDR",
-	"PEERADDR",	"CONNECT2",	"FASTTIMO",	"SLOWTIMO",
-	"PROTORCV",	"PROTOSEND",	"SEND_EOF",	"SOSETLABEL",
-	"CLOSE",	"FLUSH",
-};
-#endif
-
-#ifdef	_KERNEL			/* users shouldn't see this decl */
-
-struct ifnet;
-struct stat;
-struct ucred;
-struct uio;
-
-/*
- * If the ordering here looks odd, that's because it's alphabetical.  These
- * should eventually be merged back into struct protosw.
- *
- * Some fields initialized to defaults if they are NULL.
- * See uipc_domain.c:net_init_domain()
- */
-struct pr_usrreqs {
-	void	(*pru_abort)(struct socket *so);
-	int	(*pru_accept)(struct socket *so, struct sockaddr **nam);
-	int	(*pru_attach)(struct socket *so, int proto, struct thread *td);
-	int	(*pru_bind)(struct socket *so, struct sockaddr *nam,
-		    struct thread *td);
-	int	(*pru_connect)(struct socket *so, struct sockaddr *nam,
-		    struct thread *td);
-	int	(*pru_connect2)(struct socket *so1, struct socket *so2);
-	int	(*pru_control)(struct socket *so, u_long cmd, caddr_t data,
-		    struct ifnet *ifp, struct thread *td);
-	void	(*pru_detach)(struct socket *so);
-	int	(*pru_disconnect)(struct socket *so);
-	int	(*pru_listen)(struct socket *so, int backlog,
-		    struct thread *td);
-	int	(*pru_peeraddr)(struct socket *so, struct sockaddr **nam);
-	int	(*pru_rcvd)(struct socket *so, int flags);
-	int	(*pru_rcvoob)(struct socket *so, struct mbuf *m, int flags);
-	int	(*pru_send)(struct socket *so, int flags, struct mbuf *m,
-		    struct sockaddr *addr, struct mbuf *control,
-		    struct thread *td);
-#define	PRUS_OOB	0x1
-#define	PRUS_EOF	0x2
-#define	PRUS_MORETOCOME	0x4
-	int	(*pru_sense)(struct socket *so, struct stat *sb);
-	int	(*pru_shutdown)(struct socket *so);
-	int	(*pru_flush)(struct socket *so, int direction);
-	int	(*pru_sockaddr)(struct socket *so, struct sockaddr **nam);
-	int	(*pru_sosend)(struct socket *so, struct sockaddr *addr,
-		    struct uio *uio, struct mbuf *top, struct mbuf *control,
-		    int flags, struct thread *td);
-	int	(*pru_soreceive)(struct socket *so, struct sockaddr **paddr,
-		    struct uio *uio, struct mbuf **mp0, struct mbuf **controlp,
-		    int *flagsp);
-	int	(*pru_sopoll)(struct socket *so, int events,
-		    struct ucred *cred, struct thread *td);
-	void	(*pru_sosetlabel)(struct socket *so);
-	void	(*pru_close)(struct socket *so);
-	int	(*pru_bindat)(int fd, struct socket *so, struct sockaddr *nam,
-		    struct thread *td);
-	int	(*pru_connectat)(int fd, struct socket *so,
-		    struct sockaddr *nam, struct thread *td);
-};
-
-/*
- * All nonvoid pru_*() functions below return EOPNOTSUPP.
- */
-int	pru_accept_notsupp(struct socket *so, struct sockaddr **nam);
-int	pru_attach_notsupp(struct socket *so, int proto, struct thread *td);
-int	pru_bind_notsupp(struct socket *so, struct sockaddr *nam,
-	    struct thread *td);
-int	pru_bindat_notsupp(int fd, struct socket *so, struct sockaddr *nam,
-	    struct thread *td);
-int	pru_connect_notsupp(struct socket *so, struct sockaddr *nam,
-	    struct thread *td);
-int	pru_connectat_notsupp(int fd, struct socket *so, struct sockaddr *nam,
-	    struct thread *td);
-int	pru_connect2_notsupp(struct socket *so1, struct socket *so2);
-int	pru_control_notsupp(struct socket *so, u_long cmd, caddr_t data,
-	    struct ifnet *ifp, struct thread *td);
-int	pru_disconnect_notsupp(struct socket *so);
-int	pru_listen_notsupp(struct socket *so, int backlog, struct thread *td);
-int	pru_peeraddr_notsupp(struct socket *so, struct sockaddr **nam);
-int	pru_rcvd_notsupp(struct socket *so, int flags);
-int	pru_rcvoob_notsupp(struct socket *so, struct mbuf *m, int flags);
-int	pru_send_notsupp(struct socket *so, int flags, struct mbuf *m,
-	    struct sockaddr *addr, struct mbuf *control, struct thread *td);
-int	pru_sense_null(struct socket *so, struct stat *sb);
-int	pru_shutdown_notsupp(struct socket *so);
-int	pru_sockaddr_notsupp(struct socket *so, struct sockaddr **nam);
-int	pru_sosend_notsupp(struct socket *so, struct sockaddr *addr,
-	    struct uio *uio, struct mbuf *top, struct mbuf *control, int flags,
-	    struct thread *td);
-int	pru_soreceive_notsupp(struct socket *so, struct sockaddr **paddr,
-	    struct uio *uio, struct mbuf **mp0, struct mbuf **controlp,
-	    int *flagsp);
-int	pru_sopoll_notsupp(struct socket *so, int events, struct ucred *cred,
-	    struct thread *td);
-
-#endif /* _KERNEL */
-
-/*
- * The arguments to the ctlinput routine are
- *	(*protosw[].pr_ctlinput)(cmd, sa, arg);
- * where cmd is one of the commands below, sa is a pointer to a sockaddr,
- * and arg is a `void *' argument used within a protocol family.
- */
-#define	PRC_IFDOWN		0	/* interface transition */
-#define	PRC_ROUTEDEAD		1	/* select new route if possible ??? */
-#define	PRC_IFUP		2	/* interface has come back up */
-#define	PRC_QUENCH2		3	/* DEC congestion bit says slow down */
-#define	PRC_QUENCH		4	/* some one said to slow down */
-#define	PRC_MSGSIZE		5	/* message size forced drop */
-#define	PRC_HOSTDEAD		6	/* host appears to be down */
-#define	PRC_HOSTUNREACH		7	/* deprecated (use PRC_UNREACH_HOST) */
-#define	PRC_UNREACH_NET		8	/* no route to network */
-#define	PRC_UNREACH_HOST	9	/* no route to host */
-#define	PRC_UNREACH_PROTOCOL	10	/* dst says bad protocol */
-#define	PRC_UNREACH_PORT	11	/* bad port # */
-/* was	PRC_UNREACH_NEEDFRAG	12	   (use PRC_MSGSIZE) */
-#define	PRC_UNREACH_SRCFAIL	13	/* source route failed */
-#define	PRC_REDIRECT_NET	14	/* net routing redirect */
-#define	PRC_REDIRECT_HOST	15	/* host routing redirect */
-#define	PRC_REDIRECT_TOSNET	16	/* redirect for type of service & net */
-#define	PRC_REDIRECT_TOSHOST	17	/* redirect for tos & host */
-#define	PRC_TIMXCEED_INTRANS	18	/* packet lifetime expired in transit */
-#define	PRC_TIMXCEED_REASS	19	/* lifetime expired on reass q */
-#define	PRC_PARAMPROB		20	/* header incorrect */
-#define	PRC_UNREACH_ADMIN_PROHIB	21	/* packet administrativly prohibited */
-
-#define	PRC_NCMDS		22
-
-#define	PRC_IS_REDIRECT(cmd)	\
-	((cmd) >= PRC_REDIRECT_NET && (cmd) <= PRC_REDIRECT_TOSHOST)
-
-#ifdef PRCREQUESTS
-char	*prcrequests[] = {
-	"IFDOWN", "ROUTEDEAD", "IFUP", "DEC-BIT-QUENCH2",
-	"QUENCH", "MSGSIZE", "HOSTDEAD", "#7",
-	"NET-UNREACH", "HOST-UNREACH", "PROTO-UNREACH", "PORT-UNREACH",
-	"#12", "SRCFAIL-UNREACH", "NET-REDIRECT", "HOST-REDIRECT",
-	"TOSNET-REDIRECT", "TOSHOST-REDIRECT", "TX-INTRANS", "TX-REASS",
-	"PARAMPROB", "ADMIN-UNREACH"
-};
-#endif
-
-/*
- * The arguments to ctloutput are:
- *	(*protosw[].pr_ctloutput)(req, so, level, optname, optval, p);
- * req is one of the actions listed below, so is a (struct socket *),
- * level is an indication of which protocol layer the option is intended.
- * optname is a protocol dependent socket option request,
- * optval is a pointer to a mbuf-chain pointer, for value-return results.
- * The protocol is responsible for disposal of the mbuf chain *optval
- * if supplied,
- * the caller is responsible for any space held by *optval, when returned.
- * A non-zero return from ctloutput gives an
- * UNIX error number which should be passed to higher level software.
- */
-#define	PRCO_GETOPT	0
-#define	PRCO_SETOPT	1
-
-#define	PRCO_NCMDS	2
-
-#ifdef PRCOREQUESTS
-char	*prcorequests[] = {
-	"GETOPT", "SETOPT",
-};
-#endif
-
-#ifdef _KERNEL
-void	pfctlinput(int, struct sockaddr *);
-void	pfctlinput2(int, struct sockaddr *, void *);
-struct domain *pffinddomain(int family);
-struct protosw *pffindproto(int family, int protocol, int type);
-struct protosw *pffindtype(int family, int type);
-int	pf_proto_register(int family, struct protosw *npr);
-int	pf_proto_unregister(int family, int protocol, int type);
-#endif
-
-#endif
diff --git a/include.new/sys/ptio.h b/include.new/sys/ptio.h
deleted file mode 100644
index ad6e04f..0000000
--- a/include.new/sys/ptio.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 1999 Kenneth D. Merry.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/sys/ptio.h 50477 1999-08-28 01:08:13Z peter $
- */
-
-#ifndef _SYS_PTIO_H_
-#define	_SYS_PTIO_H_
-
-#include <sys/ioccom.h>
-
-#define	PTIOCGETTIMEOUT	_IOR('T', 1, int)
-#define	PTIOCSETTIMEOUT	_IOW('T', 2, int)
-
-#endif /* !_SYS_PTIO_H_ */
diff --git a/include.new/sys/ptrace.h b/include.new/sys/ptrace.h
deleted file mode 100644
index 921f48a..0000000
--- a/include.new/sys/ptrace.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*-
- * Copyright (c) 1984, 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.
- * 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.
- *
- *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: releng/10.2/sys/sys/ptrace.h 231521 2012-02-11 14:49:25Z kib $
- */
-
-#ifndef	_SYS_PTRACE_H_
-#define	_SYS_PTRACE_H_
-
-#include <sys/signal.h>
-#include <sys/param.h>
-#include <machine/reg.h>
-
-#define	PT_TRACE_ME	0	/* child declares it's being traced */
-#define	PT_READ_I	1	/* read word in child's I space */
-#define	PT_READ_D	2	/* read word in child's D space */
-/* was	PT_READ_U	3	 * read word in child's user structure */
-#define	PT_WRITE_I	4	/* write word in child's I space */
-#define	PT_WRITE_D	5	/* write word in child's D space */
-/* was	PT_WRITE_U	6	 * write word in child's user structure */
-#define	PT_CONTINUE	7	/* continue the child */
-#define	PT_KILL		8	/* kill the child process */
-#define	PT_STEP		9	/* single step the child */
-
-#define	PT_ATTACH	10	/* trace some running process */
-#define	PT_DETACH	11	/* stop tracing a process */
-#define PT_IO		12	/* do I/O to/from stopped process. */
-#define	PT_LWPINFO	13	/* Info about the LWP that stopped. */
-#define PT_GETNUMLWPS	14	/* get total number of threads */
-#define PT_GETLWPLIST	15	/* get thread list */
-#define PT_CLEARSTEP	16	/* turn off single step */
-#define PT_SETSTEP	17	/* turn on single step */
-#define PT_SUSPEND	18	/* suspend a thread */
-#define PT_RESUME	19	/* resume a thread */
-
-#define	PT_TO_SCE	20
-#define	PT_TO_SCX	21
-#define	PT_SYSCALL	22
-
-#define	PT_FOLLOW_FORK	23
-
-#define PT_GETREGS      33	/* get general-purpose registers */
-#define PT_SETREGS      34	/* set general-purpose registers */
-#define PT_GETFPREGS    35	/* get floating-point registers */
-#define PT_SETFPREGS    36	/* set floating-point registers */
-#define PT_GETDBREGS    37	/* get debugging registers */
-#define PT_SETDBREGS    38	/* set debugging registers */
-
-#define	PT_VM_TIMESTAMP	40	/* Get VM version (timestamp) */
-#define	PT_VM_ENTRY	41	/* Get VM map (entry) */
-
-#define PT_FIRSTMACH    64	/* for machine-specific requests */
-#include <machine/ptrace.h>	/* machine-specific requests, if any */
-
-struct ptrace_io_desc {
-	int	piod_op;	/* I/O operation */
-	void	*piod_offs;	/* child offset */
-	void	*piod_addr;	/* parent offset */
-	size_t	piod_len;	/* request length */
-};
-
-/*
- * Operations in piod_op.
- */
-#define PIOD_READ_D	1	/* Read from D space */
-#define PIOD_WRITE_D	2	/* Write to D space */
-#define PIOD_READ_I	3	/* Read from I space */
-#define PIOD_WRITE_I	4	/* Write to I space */
-
-/* Argument structure for PT_LWPINFO. */
-struct ptrace_lwpinfo {
-	lwpid_t	pl_lwpid;	/* LWP described. */
-	int	pl_event;	/* Event that stopped the LWP. */
-#define	PL_EVENT_NONE	0
-#define	PL_EVENT_SIGNAL	1
-	int	pl_flags;	/* LWP flags. */
-#define	PL_FLAG_SA	0x01	/* M:N thread */
-#define	PL_FLAG_BOUND	0x02	/* M:N bound thread */
-#define	PL_FLAG_SCE	0x04	/* syscall enter point */
-#define	PL_FLAG_SCX	0x08	/* syscall leave point */
-#define	PL_FLAG_EXEC	0x10	/* exec(2) succeeded */
-#define	PL_FLAG_SI	0x20	/* siginfo is valid */
-#define	PL_FLAG_FORKED	0x40	/* new child */
-#define	PL_FLAG_CHILD	0x80	/* I am from child */
-	sigset_t	pl_sigmask;	/* LWP signal mask */
-	sigset_t	pl_siglist;	/* LWP pending signal */
-	struct __siginfo pl_siginfo;	/* siginfo for signal */
-	char		pl_tdname[MAXCOMLEN + 1]; /* LWP name */
-	int		pl_child_pid;	/* New child pid */
-};
-
-/* Argument structure for PT_VM_ENTRY. */
-struct ptrace_vm_entry {
-	int		pve_entry;	/* Entry number used for iteration. */
-	int		pve_timestamp;	/* Generation number of VM map. */
-	u_long		pve_start;	/* Start VA of range. */
-	u_long		pve_end;	/* End VA of range (incl). */
-	u_long		pve_offset;	/* Offset in backing object. */
-	u_int		pve_prot;	/* Protection of memory range. */
-	u_int		pve_pathlen;	/* Size of path. */
-	long		pve_fileid;	/* File ID. */
-	uint32_t	pve_fsid;	/* File system ID. */
-	char		*pve_path;	/* Path name of object. */
-};
-
-#ifdef _KERNEL
-
-/*
- * The flags below are used for ptrace(2) tracing and have no relation
- * to procfs.  They are stored in struct proc's p_stops member.
- */
-#define	S_PT_SCE	0x000010000
-#define	S_PT_SCX	0x000020000
-
-int	ptrace_set_pc(struct thread *_td, unsigned long _addr);
-int	ptrace_single_step(struct thread *_td);
-int	ptrace_clear_single_step(struct thread *_td);
-
-#ifdef __HAVE_PTRACE_MACHDEP
-int	cpu_ptrace(struct thread *_td, int _req, void *_addr, int _data);
-#endif
-
-/*
- * These are prototypes for functions that implement some of the
- * debugging functionality exported by procfs / linprocfs and by the
- * ptrace(2) syscall.  They used to be part of procfs, but they don't
- * really belong there.
- */
-struct reg;
-struct fpreg;
-struct dbreg;
-struct uio;
-int	proc_read_regs(struct thread *_td, struct reg *_reg);
-int	proc_write_regs(struct thread *_td, struct reg *_reg);
-int	proc_read_fpregs(struct thread *_td, struct fpreg *_fpreg);
-int	proc_write_fpregs(struct thread *_td, struct fpreg *_fpreg);
-int	proc_read_dbregs(struct thread *_td, struct dbreg *_dbreg);
-int	proc_write_dbregs(struct thread *_td, struct dbreg *_dbreg);
-int	proc_sstep(struct thread *_td);
-int	proc_rwmem(struct proc *_p, struct uio *_uio);
-#ifdef COMPAT_FREEBSD32
-struct reg32;
-struct fpreg32;
-struct dbreg32;
-int	proc_read_regs32(struct thread *_td, struct reg32 *_reg32);
-int	proc_write_regs32(struct thread *_td, struct reg32 *_reg32);
-int	proc_read_fpregs32(struct thread *_td, struct fpreg32 *_fpreg32);
-int	proc_write_fpregs32(struct thread *_td, struct fpreg32 *_fpreg32);
-int	proc_read_dbregs32(struct thread *_td, struct dbreg32 *_dbreg32);
-int	proc_write_dbregs32(struct thread *_td, struct dbreg32 *_dbreg32);
-#endif
-#else /* !_KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	ptrace(int _request, pid_t _pid, caddr_t _addr, int _data);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif	/* !_SYS_PTRACE_H_ */
diff --git a/include.new/sys/queue.h b/include.new/sys/queue.h
deleted file mode 100644
index a08a637..0000000
--- a/include.new/sys/queue.h
+++ /dev/null
@@ -1,694 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD: releng/10.2/sys/sys/queue.h 279633 2015-03-05 09:23:43Z hselasky $
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file defines four types of data structures: singly-linked lists,
- * singly-linked tail queues, lists and tail queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may be traversed in either direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- *
- *
- *				SLIST	LIST	STAILQ	TAILQ
- * _HEAD			+	+	+	+
- * _HEAD_INITIALIZER		+	+	+	+
- * _ENTRY			+	+	+	+
- * _INIT			+	+	+	+
- * _EMPTY			+	+	+	+
- * _FIRST			+	+	+	+
- * _NEXT			+	+	+	+
- * _PREV			-	+	-	+
- * _LAST			-	-	+	+
- * _FOREACH			+	+	+	+
- * _FOREACH_FROM		+	+	+	+
- * _FOREACH_SAFE		+	+	+	+
- * _FOREACH_FROM_SAFE		+	+	+	+
- * _FOREACH_REVERSE		-	-	-	+
- * _FOREACH_REVERSE_FROM	-	-	-	+
- * _FOREACH_REVERSE_SAFE	-	-	-	+
- * _FOREACH_REVERSE_FROM_SAFE	-	-	-	+
- * _INSERT_HEAD			+	+	+	+
- * _INSERT_BEFORE		-	+	-	+
- * _INSERT_AFTER		+	+	+	+
- * _INSERT_TAIL			-	-	+	+
- * _CONCAT			-	-	+	+
- * _REMOVE_AFTER		+	-	+	-
- * _REMOVE_HEAD			+	-	+	-
- * _REMOVE			+	+	+	+
- * _SWAP			+	+	+	+
- *
- */
-#ifdef QUEUE_MACRO_DEBUG
-/* Store the last 2 places the queue element or head was altered */
-struct qm_trace {
-	unsigned long	 lastline;
-	unsigned long	 prevline;
-	const char	*lastfile;
-	const char	*prevfile;
-};
-
-#define	TRACEBUF	struct qm_trace trace;
-#define	TRACEBUF_INITIALIZER	{ __LINE__, 0, __FILE__, NULL } ,
-#define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
-#define	QMD_SAVELINK(name, link)	void **name = (void *)&(link)
-
-#define	QMD_TRACE_HEAD(head) do {					\
-	(head)->trace.prevline = (head)->trace.lastline;		\
-	(head)->trace.prevfile = (head)->trace.lastfile;		\
-	(head)->trace.lastline = __LINE__;				\
-	(head)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#define	QMD_TRACE_ELEM(elem) do {					\
-	(elem)->trace.prevline = (elem)->trace.lastline;		\
-	(elem)->trace.prevfile = (elem)->trace.lastfile;		\
-	(elem)->trace.lastline = __LINE__;				\
-	(elem)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#else
-#define	QMD_TRACE_ELEM(elem)
-#define	QMD_TRACE_HEAD(head)
-#define	QMD_SAVELINK(name, link)
-#define	TRACEBUF
-#define	TRACEBUF_INITIALIZER
-#define	TRASHIT(x)
-#endif	/* QUEUE_MACRO_DEBUG */
-
-/*
- * Singly-linked List declarations.
- */
-#define	SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
-
-#define	SLIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
-
-/*
- * Singly-linked List functions.
- */
-#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
-
-#define	SLIST_FIRST(head)	((head)->slh_first)
-
-#define	SLIST_FOREACH(var, head, field)					\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var);							\
-	    (var) = SLIST_NEXT((var), field))
-
-#define	SLIST_FOREACH_FROM(var, head, field)				\
-	for ((var) = ((var) ? (var) : SLIST_FIRST((head)));		\
-	    (var);							\
-	    (var) = SLIST_NEXT((var), field))
-
-#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	SLIST_FOREACH_FROM_SAFE(var, head, field, tvar)			\
-	for ((var) = ((var) ? (var) : SLIST_FIRST((head)));		\
-	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-	for ((varp) = &SLIST_FIRST((head));				\
-	    ((var) = *(varp)) != NULL;					\
-	    (varp) = &SLIST_NEXT((var), field))
-
-#define	SLIST_INIT(head) do {						\
-	SLIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field);	\
-	SLIST_NEXT((slistelm), field) = (elm);				\
-} while (0)
-
-#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_FIRST((head));			\
-	SLIST_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-
-#define	SLIST_REMOVE(head, elm, type, field) do {			\
-	QMD_SAVELINK(oldnext, (elm)->field.sle_next);			\
-	if (SLIST_FIRST((head)) == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = SLIST_FIRST((head));		\
-		while (SLIST_NEXT(curelm, field) != (elm))		\
-			curelm = SLIST_NEXT(curelm, field);		\
-		SLIST_REMOVE_AFTER(curelm, field);			\
-	}								\
-	TRASHIT(*oldnext);						\
-} while (0)
-
-#define SLIST_REMOVE_AFTER(elm, field) do {				\
-	SLIST_NEXT(elm, field) =					\
-	    SLIST_NEXT(SLIST_NEXT(elm, field), field);			\
-} while (0)
-
-#define	SLIST_REMOVE_HEAD(head, field) do {				\
-	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
-} while (0)
-
-#define SLIST_SWAP(head1, head2, type) do {				\
-	struct type *swap_first = SLIST_FIRST(head1);			\
-	SLIST_FIRST(head1) = SLIST_FIRST(head2);			\
-	SLIST_FIRST(head2) = swap_first;				\
-} while (0)
-
-/*
- * Singly-linked Tail queue declarations.
- */
-#define	STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define	STAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).stqh_first }
-
-#define	STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_CONCAT(head1, head2) do {				\
-	if (!STAILQ_EMPTY((head2))) {					\
-		*(head1)->stqh_last = (head2)->stqh_first;		\
-		(head1)->stqh_last = (head2)->stqh_last;		\
-		STAILQ_INIT((head2));					\
-	}								\
-} while (0)
-
-#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
-
-#define	STAILQ_FIRST(head)	((head)->stqh_first)
-
-#define	STAILQ_FOREACH(var, head, field)				\
-	for((var) = STAILQ_FIRST((head));				\
-	   (var);							\
-	   (var) = STAILQ_NEXT((var), field))
-
-#define	STAILQ_FOREACH_FROM(var, head, field)				\
-	for ((var) = ((var) ? (var) : STAILQ_FIRST((head)));		\
-	   (var);							\
-	   (var) = STAILQ_NEXT((var), field))
-
-#define	STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = STAILQ_FIRST((head));				\
-	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	STAILQ_FOREACH_FROM_SAFE(var, head, field, tvar)		\
-	for ((var) = ((var) ? (var) : STAILQ_FIRST((head)));		\
-	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	STAILQ_INIT(head) do {						\
-	STAILQ_FIRST((head)) = NULL;					\
-	(head)->stqh_last = &STAILQ_FIRST((head));			\
-} while (0)
-
-#define	STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_NEXT((tqelm), field) = (elm);				\
-} while (0)
-
-#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL)	\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
-	STAILQ_NEXT((elm), field) = NULL;				\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &STAILQ_NEXT((elm), field);			\
-} while (0)
-
-#define	STAILQ_LAST(head, type, field)					\
-	(STAILQ_EMPTY((head)) ? NULL :					\
-	    __containerof((head)->stqh_last, struct type, field.stqe_next))
-
-#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
-
-#define	STAILQ_REMOVE(head, elm, type, field) do {			\
-	QMD_SAVELINK(oldnext, (elm)->field.stqe_next);			\
-	if (STAILQ_FIRST((head)) == (elm)) {				\
-		STAILQ_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = STAILQ_FIRST((head));		\
-		while (STAILQ_NEXT(curelm, field) != (elm))		\
-			curelm = STAILQ_NEXT(curelm, field);		\
-		STAILQ_REMOVE_AFTER(head, curelm, field);		\
-	}								\
-	TRASHIT(*oldnext);						\
-} while (0)
-
-#define STAILQ_REMOVE_AFTER(head, elm, field) do {			\
-	if ((STAILQ_NEXT(elm, field) =					\
-	     STAILQ_NEXT(STAILQ_NEXT(elm, field), field)) == NULL)	\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD(head, field) do {				\
-	if ((STAILQ_FIRST((head)) =					\
-	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-#define STAILQ_SWAP(head1, head2, type) do {				\
-	struct type *swap_first = STAILQ_FIRST(head1);			\
-	struct type **swap_last = (head1)->stqh_last;			\
-	STAILQ_FIRST(head1) = STAILQ_FIRST(head2);			\
-	(head1)->stqh_last = (head2)->stqh_last;			\
-	STAILQ_FIRST(head2) = swap_first;				\
-	(head2)->stqh_last = swap_last;					\
-	if (STAILQ_EMPTY(head1))					\
-		(head1)->stqh_last = &STAILQ_FIRST(head1);		\
-	if (STAILQ_EMPTY(head2))					\
-		(head2)->stqh_last = &STAILQ_FIRST(head2);		\
-} while (0)
-
-
-/*
- * List declarations.
- */
-#define	LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define	LIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-
-#if (defined(_KERNEL) && defined(INVARIANTS))
-#define	QMD_LIST_CHECK_HEAD(head, field) do {				\
-	if (LIST_FIRST((head)) != NULL &&				\
-	    LIST_FIRST((head))->field.le_prev !=			\
-	     &LIST_FIRST((head)))					\
-		panic("Bad list head %p first->prev != head", (head));	\
-} while (0)
-
-#define	QMD_LIST_CHECK_NEXT(elm, field) do {				\
-	if (LIST_NEXT((elm), field) != NULL &&				\
-	    LIST_NEXT((elm), field)->field.le_prev !=			\
-	     &((elm)->field.le_next))					\
-	     	panic("Bad link elm %p next->prev != elm", (elm));	\
-} while (0)
-
-#define	QMD_LIST_CHECK_PREV(elm, field) do {				\
-	if (*(elm)->field.le_prev != (elm))				\
-		panic("Bad link elm %p prev->next != elm", (elm));	\
-} while (0)
-#else
-#define	QMD_LIST_CHECK_HEAD(head, field)
-#define	QMD_LIST_CHECK_NEXT(elm, field)
-#define	QMD_LIST_CHECK_PREV(elm, field)
-#endif /* (_KERNEL && INVARIANTS) */
-
-#define	LIST_EMPTY(head)	((head)->lh_first == NULL)
-
-#define	LIST_FIRST(head)	((head)->lh_first)
-
-#define	LIST_FOREACH(var, head, field)					\
-	for ((var) = LIST_FIRST((head));				\
-	    (var);							\
-	    (var) = LIST_NEXT((var), field))
-
-#define	LIST_FOREACH_FROM(var, head, field)				\
-	for ((var) = ((var) ? (var) : LIST_FIRST((head)));		\
-	    (var);							\
-	    (var) = LIST_NEXT((var), field))
-
-#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = LIST_FIRST((head));				\
-	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	LIST_FOREACH_FROM_SAFE(var, head, field, tvar)			\
-	for ((var) = ((var) ? (var) : LIST_FIRST((head)));		\
-	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	LIST_INIT(head) do {						\
-	LIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
-	QMD_LIST_CHECK_NEXT(listelm, field);				\
-	if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
-		LIST_NEXT((listelm), field)->field.le_prev =		\
-		    &LIST_NEXT((elm), field);				\
-	LIST_NEXT((listelm), field) = (elm);				\
-	(elm)->field.le_prev = &LIST_NEXT((listelm), field);		\
-} while (0)
-
-#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-	QMD_LIST_CHECK_PREV(listelm, field);				\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	LIST_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &LIST_NEXT((elm), field);		\
-} while (0)
-
-#define	LIST_INSERT_HEAD(head, elm, field) do {				\
-	QMD_LIST_CHECK_HEAD((head), field);				\
-	if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL)	\
-		LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\
-	LIST_FIRST((head)) = (elm);					\
-	(elm)->field.le_prev = &LIST_FIRST((head));			\
-} while (0)
-
-#define	LIST_NEXT(elm, field)	((elm)->field.le_next)
-
-#define	LIST_PREV(elm, head, type, field)				\
-	((elm)->field.le_prev == &LIST_FIRST((head)) ? NULL :		\
-	    __containerof((elm)->field.le_prev, struct type, field.le_next))
-
-#define	LIST_REMOVE(elm, field) do {					\
-	QMD_SAVELINK(oldnext, (elm)->field.le_next);			\
-	QMD_SAVELINK(oldprev, (elm)->field.le_prev);			\
-	QMD_LIST_CHECK_NEXT(elm, field);				\
-	QMD_LIST_CHECK_PREV(elm, field);				\
-	if (LIST_NEXT((elm), field) != NULL)				\
-		LIST_NEXT((elm), field)->field.le_prev = 		\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
-	TRASHIT(*oldnext);						\
-	TRASHIT(*oldprev);						\
-} while (0)
-
-#define LIST_SWAP(head1, head2, type, field) do {			\
-	struct type *swap_tmp = LIST_FIRST((head1));			\
-	LIST_FIRST((head1)) = LIST_FIRST((head2));			\
-	LIST_FIRST((head2)) = swap_tmp;					\
-	if ((swap_tmp = LIST_FIRST((head1))) != NULL)			\
-		swap_tmp->field.le_prev = &LIST_FIRST((head1));		\
-	if ((swap_tmp = LIST_FIRST((head2))) != NULL)			\
-		swap_tmp->field.le_prev = &LIST_FIRST((head2));		\
-} while (0)
-
-/*
- * Tail queue declarations.
- */
-#define	TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-	TRACEBUF							\
-}
-
-#define	TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first, TRACEBUF_INITIALIZER }
-
-#define	TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-	TRACEBUF							\
-}
-
-/*
- * Tail queue functions.
- */
-#if (defined(_KERNEL) && defined(INVARIANTS))
-#define	QMD_TAILQ_CHECK_HEAD(head, field) do {				\
-	if (!TAILQ_EMPTY(head) &&					\
-	    TAILQ_FIRST((head))->field.tqe_prev !=			\
-	     &TAILQ_FIRST((head)))					\
-		panic("Bad tailq head %p first->prev != head", (head));	\
-} while (0)
-
-#define	QMD_TAILQ_CHECK_TAIL(head, field) do {				\
-	if (*(head)->tqh_last != NULL)					\
-	    	panic("Bad tailq NEXT(%p->tqh_last) != NULL", (head)); 	\
-} while (0)
-
-#define	QMD_TAILQ_CHECK_NEXT(elm, field) do {				\
-	if (TAILQ_NEXT((elm), field) != NULL &&				\
-	    TAILQ_NEXT((elm), field)->field.tqe_prev !=			\
-	     &((elm)->field.tqe_next))					\
-		panic("Bad link elm %p next->prev != elm", (elm));	\
-} while (0)
-
-#define	QMD_TAILQ_CHECK_PREV(elm, field) do {				\
-	if (*(elm)->field.tqe_prev != (elm))				\
-		panic("Bad link elm %p prev->next != elm", (elm));	\
-} while (0)
-#else
-#define	QMD_TAILQ_CHECK_HEAD(head, field)
-#define	QMD_TAILQ_CHECK_TAIL(head, headname)
-#define	QMD_TAILQ_CHECK_NEXT(elm, field)
-#define	QMD_TAILQ_CHECK_PREV(elm, field)
-#endif /* (_KERNEL && INVARIANTS) */
-
-#define	TAILQ_CONCAT(head1, head2, field) do {				\
-	if (!TAILQ_EMPTY(head2)) {					\
-		*(head1)->tqh_last = (head2)->tqh_first;		\
-		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
-		(head1)->tqh_last = (head2)->tqh_last;			\
-		TAILQ_INIT((head2));					\
-		QMD_TRACE_HEAD(head1);					\
-		QMD_TRACE_HEAD(head2);					\
-	}								\
-} while (0)
-
-#define	TAILQ_EMPTY(head)	((head)->tqh_first == NULL)
-
-#define	TAILQ_FIRST(head)	((head)->tqh_first)
-
-#define	TAILQ_FOREACH(var, head, field)					\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var);							\
-	    (var) = TAILQ_NEXT((var), field))
-
-#define	TAILQ_FOREACH_FROM(var, head, field)				\
-	for ((var) = ((var) ? (var) : TAILQ_FIRST((head)));		\
-	    (var);							\
-	    (var) = TAILQ_NEXT((var), field))
-
-#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	TAILQ_FOREACH_FROM_SAFE(var, head, field, tvar)			\
-	for ((var) = ((var) ? (var) : TAILQ_FIRST((head)));		\
-	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var);							\
-	    (var) = TAILQ_PREV((var), headname, field))
-
-#define	TAILQ_FOREACH_REVERSE_FROM(var, head, headname, field)		\
-	for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname));	\
-	    (var);							\
-	    (var) = TAILQ_PREV((var), headname, field))
-
-#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-	    (var) = (tvar))
-
-#define	TAILQ_FOREACH_REVERSE_FROM_SAFE(var, head, headname, field, tvar) \
-	for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname));	\
-	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-	    (var) = (tvar))
-
-#define	TAILQ_INIT(head) do {						\
-	TAILQ_FIRST((head)) = NULL;					\
-	(head)->tqh_last = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-} while (0)
-
-#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	QMD_TAILQ_CHECK_NEXT(listelm, field);				\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    &TAILQ_NEXT((elm), field);				\
-	else {								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	TAILQ_NEXT((listelm), field) = (elm);				\
-	(elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&(listelm)->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	QMD_TAILQ_CHECK_PREV(listelm, field);				\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	TAILQ_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&(listelm)->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-	QMD_TAILQ_CHECK_HEAD(head, field);				\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)	\
-		TAILQ_FIRST((head))->field.tqe_prev =			\
-		    &TAILQ_NEXT((elm), field);				\
-	else								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-	TAILQ_FIRST((head)) = (elm);					\
-	(elm)->field.tqe_prev = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	QMD_TAILQ_CHECK_TAIL(head, field);				\
-	TAILQ_NEXT((elm), field) = NULL;				\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &TAILQ_NEXT((elm), field);			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_LAST(head, headname)					\
-	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define	TAILQ_PREV(elm, headname, field)				\
-	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-#define	TAILQ_REMOVE(head, elm, field) do {				\
-	QMD_SAVELINK(oldnext, (elm)->field.tqe_next);			\
-	QMD_SAVELINK(oldprev, (elm)->field.tqe_prev);			\
-	QMD_TAILQ_CHECK_NEXT(elm, field);				\
-	QMD_TAILQ_CHECK_PREV(elm, field);				\
-	if ((TAILQ_NEXT((elm), field)) != NULL)				\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else {								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
-	TRASHIT(*oldnext);						\
-	TRASHIT(*oldprev);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define TAILQ_SWAP(head1, head2, type, field) do {			\
-	struct type *swap_first = (head1)->tqh_first;			\
-	struct type **swap_last = (head1)->tqh_last;			\
-	(head1)->tqh_first = (head2)->tqh_first;			\
-	(head1)->tqh_last = (head2)->tqh_last;				\
-	(head2)->tqh_first = swap_first;				\
-	(head2)->tqh_last = swap_last;					\
-	if ((swap_first = (head1)->tqh_first) != NULL)			\
-		swap_first->field.tqe_prev = &(head1)->tqh_first;	\
-	else								\
-		(head1)->tqh_last = &(head1)->tqh_first;		\
-	if ((swap_first = (head2)->tqh_first) != NULL)			\
-		swap_first->field.tqe_prev = &(head2)->tqh_first;	\
-	else								\
-		(head2)->tqh_last = &(head2)->tqh_first;		\
-} while (0)
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/include.new/sys/racct.h b/include.new/sys/racct.h
deleted file mode 100644
index 7855b0b..0000000
--- a/include.new/sys/racct.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*-
- * Copyright (c) 2010 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Edward Tomasz Napierala under sponsorship
- * from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/racct.h 284665 2015-06-21 06:28:26Z trasz $
- */
-
-/*
- * Resource accounting.
- */
-
-#ifndef _RACCT_H_
-#define	_RACCT_H_
-
-#include <sys/cdefs.h>
-#include <sys/queue.h>
-#include <sys/types.h>
-
-struct proc;
-struct rctl_rule_link;
-struct ucred;
-
-/*
- * Resources.
- */
-#define	RACCT_UNDEFINED		-1
-#define	RACCT_CPU		0
-#define	RACCT_DATA		1
-#define	RACCT_STACK		2
-#define	RACCT_CORE		3
-#define	RACCT_RSS		4
-#define	RACCT_MEMLOCK		5
-#define	RACCT_NPROC		6
-#define	RACCT_NOFILE		7
-#define	RACCT_VMEM		8
-#define	RACCT_NPTS		9
-#define	RACCT_SWAP		10
-#define	RACCT_NTHR		11
-#define	RACCT_MSGQQUEUED	12
-#define	RACCT_MSGQSIZE		13
-#define	RACCT_NMSGQ		14
-#define	RACCT_NSEM		15
-#define	RACCT_NSEMOP		16
-#define	RACCT_NSHM		17
-#define	RACCT_SHMSIZE		18
-#define	RACCT_WALLCLOCK		19
-#define	RACCT_PCTCPU		20
-#define	RACCT_MAX		RACCT_PCTCPU
-
-/*
- * Resource properties.
- */
-#define	RACCT_IN_MILLIONS	0x01
-#define	RACCT_RECLAIMABLE	0x02
-#define	RACCT_INHERITABLE	0x04
-#define	RACCT_DENIABLE		0x08
-#define	RACCT_SLOPPY		0x10
-#define	RACCT_DECAYING		0x20
-
-extern int racct_types[];
-extern int racct_enable;
-
-#define ASSERT_RACCT_ENABLED()	KASSERT(racct_enable, \
-				    ("%s called with !racct_enable", __func__))
-
-/*
- * Amount stored in c_resources[] is 10**6 times bigger than what's
- * visible to the userland.  It gets fixed up when retrieving resource
- * usage or adding rules.
- */
-#define	RACCT_IS_IN_MILLIONS(X)	(racct_types[X] & RACCT_IN_MILLIONS)
-
-/*
- * Resource usage can drop, as opposed to only grow.  When the process
- * terminates, its resource usage is freed from the respective
- * per-credential racct containers.
- */
-#define	RACCT_IS_RECLAIMABLE(X)	(racct_types[X] & RACCT_RECLAIMABLE)
-
-/*
- * Children inherit resource usage.
- */
-#define	RACCT_IS_INHERITABLE(X)	(racct_types[X] & RACCT_INHERITABLE)
-
-/*
- * racct_{add,set}(9) can actually return an error and not update resource
- * usage counters.  Note that even when resource is not deniable, allocating
- * resource might cause signals to be sent by RCTL code.
- */
-#define	RACCT_IS_DENIABLE(X)		(racct_types[X] & RACCT_DENIABLE)
-
-/*
- * Per-process resource usage information makes no sense, but per-credential
- * one does.  This kind of resources are usually allocated for process, but
- * freed using credentials.
- */
-#define	RACCT_IS_SLOPPY(X)		(racct_types[X] & RACCT_SLOPPY)
-
-/*
- * When a process terminates, its resource usage is not automatically
- * subtracted from per-credential racct containers.  Instead, the resource
- * usage of per-credential racct containers decays in time.
- * Resource usage can olso drop for such resource.
- * So far, the only such resource is RACCT_PCTCPU.
- */
-#define RACCT_IS_DECAYING(X)		(racct_types[X] & RACCT_DECAYING)
-
-/*
- * Resource usage can drop, as opposed to only grow.
- */
-#define RACCT_CAN_DROP(X)		(RACCT_IS_RECLAIMABLE(X) | RACCT_IS_DECAYING(X))
-
-/*
- * The 'racct' structure defines resource consumption for a particular
- * subject, such as process or jail.
- *
- * This structure must be filled with zeroes initially.
- */
-struct racct {
-	int64_t				r_resources[RACCT_MAX + 1];
-	LIST_HEAD(, rctl_rule_link)	r_rule_links;
-};
-
-int	racct_add(struct proc *p, int resource, uint64_t amount);
-void	racct_add_cred(struct ucred *cred, int resource, uint64_t amount);
-void	racct_add_force(struct proc *p, int resource, uint64_t amount);
-int	racct_set(struct proc *p, int resource, uint64_t amount);
-void	racct_set_force(struct proc *p, int resource, uint64_t amount);
-void	racct_sub(struct proc *p, int resource, uint64_t amount);
-void	racct_sub_cred(struct ucred *cred, int resource, uint64_t amount);
-uint64_t	racct_get_limit(struct proc *p, int resource);
-uint64_t	racct_get_available(struct proc *p, int resource);
-
-void	racct_create(struct racct **racctp);
-void	racct_destroy(struct racct **racctp);
-
-int	racct_proc_fork(struct proc *parent, struct proc *child);
-void	racct_proc_fork_done(struct proc *child);
-void	racct_proc_exit(struct proc *p);
-
-void	racct_proc_ucred_changed(struct proc *p, struct ucred *oldcred,
-	    struct ucred *newcred);
-void	racct_move(struct racct *dest, struct racct *src);
-
-#endif /* !_RACCT_H_ */
diff --git a/include.new/sys/random.h b/include.new/sys/random.h
deleted file mode 100644
index a43ce3d..0000000
--- a/include.new/sys/random.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2000-2013 Mark R. V. Murray
- * 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
- *    in this position and unchanged.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/random.h 268933 2014-07-21 00:21:56Z jhb $
- */
-
-#ifndef	_SYS_RANDOM_H_
-#define	_SYS_RANDOM_H_
-
-#ifdef _KERNEL
-
-int read_random(void *, int);
-
-/*
- * Note: if you add or remove members of esource, remember to also update the
- * KASSERT regarding what valid members are in random_harvest_internal().
- */
-enum esource {
-	RANDOM_START = 0,
-	RANDOM_CACHED = 0,
-	RANDOM_ATTACH,
-	RANDOM_KEYBOARD,
-	RANDOM_MOUSE,
-	RANDOM_NET_TUN,
-	RANDOM_NET_ETHER,
-	RANDOM_NET_NG,
-	RANDOM_INTERRUPT,
-	RANDOM_SWI,
-	RANDOM_PURE_OCTEON,
-	RANDOM_PURE_SAFE,
-	RANDOM_PURE_GLXSB,
-	RANDOM_PURE_UBSEC,
-	RANDOM_PURE_HIFN,
-	RANDOM_PURE_RDRAND,
-	RANDOM_PURE_NEHEMIAH,
-	RANDOM_PURE_RNDTEST,
-	RANDOM_PURE_VIRTIO,
-	ENTROPYSOURCE
-};
-void random_harvest(void *, u_int, u_int, enum esource);
-
-/* Allow the sysadmin to select the broad category of
- * entropy types to harvest
- */
-struct harvest_select {
-	int ethernet;
-	int point_to_point;
-	int interrupt;
-	int swi;
-	int namei;
-};
-
-extern struct harvest_select harvest;
-
-#endif /* _KERNEL */
-
-#endif /* _SYS_RANDOM_H_ */
diff --git a/include.new/sys/rangelock.h b/include.new/sys/rangelock.h
deleted file mode 100644
index 17ef3f1..0000000
--- a/include.new/sys/rangelock.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 2009 Konstantin Belousov <kib@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/rangelock.h 254380 2013-08-15 20:19:17Z cperciva $
- */
-
-#ifndef	_SYS_RANGELOCK_H
-#define	_SYS_RANGELOCK_H
-
-#include <sys/queue.h>
-
-#define	RL_LOCK_READ		0x0001
-#define	RL_LOCK_WRITE		0x0002
-#define	RL_LOCK_TYPE_MASK	0x0003
-#define	RL_LOCK_GRANTED		0x0004
-
-struct rl_q_entry;
-
-/*
- * The structure representing the range lock.  Caller may request
- * read or write access to the range of bytes. Access is granted if
- * all existing lock owners are compatible with the request. Two lock
- * owners are compatible if their ranges do not overlap, or both
- * owners are for read.
- *
- * Access to the structure itself is synchronized with the externally
- * supplied mutex.
- *
- * rl_waiters is the queue containing in order (a) granted write lock
- * requests, (b) granted read lock requests, and (c) in order of arrival,
- * lock requests which cannot be granted yet.
- *
- * rl_currdep is the first lock request that cannot be granted now due
- * to the preceding requests conflicting with it (i.e., it points to
- * position (c) in the list above).
- */
-struct rangelock {
-	TAILQ_HEAD(, rl_q_entry) rl_waiters;
-	struct rl_q_entry	*rl_currdep;
-};
-
-#ifdef _KERNEL
-
-struct mtx;
-
-void	 rangelock_init(struct rangelock *lock);
-void	 rangelock_destroy(struct rangelock *lock);
-void	 rangelock_unlock(struct rangelock *lock, void *cookie,
-	    struct mtx *ilk);
-void	*rangelock_unlock_range(struct rangelock *lock, void *cookie,
-	    off_t start, off_t end, struct mtx *ilk);
-void	*rangelock_rlock(struct rangelock *lock, off_t start, off_t end,
-	    struct mtx *ilk);
-void	*rangelock_wlock(struct rangelock *lock, off_t start, off_t end,
-	    struct mtx *ilk);
-void	 rlqentry_free(struct rl_q_entry *rlqe);
-
-#endif	/* _KERNEL */
-
-#endif	/* _SYS_RANGELOCK_H */
diff --git a/include.new/sys/rctl.h b/include.new/sys/rctl.h
deleted file mode 100644
index a3e2149..0000000
--- a/include.new/sys/rctl.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*-
- * Copyright (c) 2010 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Edward Tomasz Napierala under sponsorship
- * from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/rctl.h 242139 2012-10-26 16:01:08Z trasz $
- */
-
-/*
- * Resource Limits.
- */
-
-#ifndef _RCTL_H_
-#define	_RCTL_H_
-
-#include <sys/cdefs.h>
-#include <sys/queue.h>
-#include <sys/types.h>
-#include <sys/_task.h>
-
-struct proc;
-struct uidinfo;
-struct loginclass;
-struct prison_racct;
-struct ucred;
-struct rctl_rule_link;
-
-#ifdef _KERNEL
-
-/*
- * Rules describe an action to be taken when conditions defined
- * in the rule are met.  There is no global list of rules; instead,
- * rules are linked to by the racct structures for all the subjects
- * they apply to - for example, a rule of type "user" is linked to the
- * appropriate struct uidinfo, and to all the processes of that user.
- *
- * 'rr_refcount' is equal to the number of rctl_rule_link structures
- * pointing to the rule.
- *
- * This structure must never change after being added, via rctl_rule_link
- * structures, to subjects.  In order to change a rule, add a new rule
- * and remove the previous one.
- */
-struct rctl_rule {
-	int		rr_subject_type;
-	union {
-		struct proc		*rs_proc;
-		struct uidinfo		*rs_uip;
-		struct loginclass	*rs_loginclass;
-		struct prison_racct	*rs_prison_racct;
-	} rr_subject;
-	int		rr_per;
-	int		rr_resource;
-	int		rr_action;
-	int64_t		rr_amount;
-	u_int		rr_refcount;
-	struct task	rr_task;
-};
-
-/*
- * Allowed values for rr_subject_type and rr_per fields.
- */
-#define	RCTL_SUBJECT_TYPE_UNDEFINED	-1
-#define	RCTL_SUBJECT_TYPE_PROCESS	0x0000
-#define	RCTL_SUBJECT_TYPE_USER		0x0001
-#define	RCTL_SUBJECT_TYPE_LOGINCLASS	0x0003
-#define	RCTL_SUBJECT_TYPE_JAIL		0x0004
-#define	RCTL_SUBJECT_TYPE_MAX		RCTL_SUBJECT_TYPE_JAIL
-
-/*
- * Allowed values for rr_action field.
- */
-#define	RCTL_ACTION_UNDEFINED		-1
-#define	RCTL_ACTION_SIGHUP		SIGHUP
-#define	RCTL_ACTION_SIGINT		SIGINT
-#define	RCTL_ACTION_SIGQUIT		SIGQUIT
-#define	RCTL_ACTION_SIGILL		SIGILL
-#define	RCTL_ACTION_SIGTRAP		SIGTRAP
-#define	RCTL_ACTION_SIGABRT		SIGABRT
-#define	RCTL_ACTION_SIGEMT		SIGEMT
-#define	RCTL_ACTION_SIGFPE		SIGFPE
-#define	RCTL_ACTION_SIGKILL		SIGKILL
-#define	RCTL_ACTION_SIGBUS		SIGBUS
-#define	RCTL_ACTION_SIGSEGV		SIGSEGV
-#define	RCTL_ACTION_SIGSYS		SIGSYS
-#define	RCTL_ACTION_SIGPIPE		SIGPIPE
-#define	RCTL_ACTION_SIGALRM		SIGALRM
-#define	RCTL_ACTION_SIGTERM		SIGTERM
-#define	RCTL_ACTION_SIGURG		SIGURG
-#define	RCTL_ACTION_SIGSTOP		SIGSTOP
-#define	RCTL_ACTION_SIGTSTP		SIGTSTP
-#define	RCTL_ACTION_SIGCHLD		SIGCHLD
-#define	RCTL_ACTION_SIGTTIN		SIGTTIN
-#define	RCTL_ACTION_SIGTTOU		SIGTTOU
-#define	RCTL_ACTION_SIGIO		SIGIO
-#define	RCTL_ACTION_SIGXCPU		SIGXCPU
-#define	RCTL_ACTION_SIGXFSZ		SIGXFSZ
-#define	RCTL_ACTION_SIGVTALRM		SIGVTALRM
-#define	RCTL_ACTION_SIGPROF		SIGPROF
-#define	RCTL_ACTION_SIGWINCH		SIGWINCH
-#define	RCTL_ACTION_SIGINFO		SIGINFO
-#define	RCTL_ACTION_SIGUSR1		SIGUSR1
-#define	RCTL_ACTION_SIGUSR2		SIGUSR2
-#define	RCTL_ACTION_SIGTHR		SIGTHR
-#define	RCTL_ACTION_SIGNAL_MAX		RCTL_ACTION_SIGTHR
-#define	RCTL_ACTION_DENY		(RCTL_ACTION_SIGNAL_MAX + 1)
-#define	RCTL_ACTION_LOG			(RCTL_ACTION_SIGNAL_MAX + 2)
-#define	RCTL_ACTION_DEVCTL		(RCTL_ACTION_SIGNAL_MAX + 3)
-#define	RCTL_ACTION_MAX			RCTL_ACTION_DEVCTL
-
-#define	RCTL_AMOUNT_UNDEFINED		-1
-
-struct rctl_rule *rctl_rule_alloc(int flags);
-struct rctl_rule *rctl_rule_duplicate(const struct rctl_rule *rule, int flags);
-void	rctl_rule_acquire(struct rctl_rule *rule);
-void	rctl_rule_release(struct rctl_rule *rule);
-int	rctl_rule_add(struct rctl_rule *rule);
-int	rctl_rule_remove(struct rctl_rule *filter);
-int	rctl_enforce(struct proc *p, int resource, uint64_t amount);
-int64_t	rctl_pcpu_available(const struct proc *p);
-uint64_t rctl_get_limit(struct proc *p, int resource);
-uint64_t rctl_get_available(struct proc *p, int resource);
-const char *rctl_resource_name(int resource);
-void	rctl_proc_ucred_changed(struct proc *p, struct ucred *newcred);
-int	rctl_proc_fork(struct proc *parent, struct proc *child);
-void	rctl_racct_release(struct racct *racct);
-#else /* !_KERNEL */
-
-/*
- * Syscall interface.
- */
-__BEGIN_DECLS
-int	rctl_get_racct(const char *inbufp, size_t inbuflen, char *outbufp,
-	    size_t outbuflen);
-int	rctl_get_rules(const char *inbufp, size_t inbuflen, char *outbufp,
-	    size_t outbuflen);
-int	rctl_get_limits(const char *inbufp, size_t inbuflen, char *outbufp,
-	    size_t outbuflen);
-int	rctl_add_rule(const char *inbufp, size_t inbuflen, char *outbufp,
-	    size_t outbuflen);
-int	rctl_remove_rule(const char *inbufp, size_t inbuflen, char *outbufp,
-	    size_t outbuflen);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_RCTL_H_ */
diff --git a/include.new/sys/reboot.h b/include.new/sys/reboot.h
deleted file mode 100644
index b37ea61..0000000
--- a/include.new/sys/reboot.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)reboot.h	8.3 (Berkeley) 12/13/94
- * $FreeBSD: releng/10.2/sys/sys/reboot.h 139825 2005-01-07 02:29:27Z imp $
- */
-
-#ifndef _SYS_REBOOT_H_
-#define	_SYS_REBOOT_H_
-
-/*
- * Arguments to reboot system call.  These are passed to
- * the boot program and on to init.
- */
-#define	RB_AUTOBOOT	0	/* flags for system auto-booting itself */
-
-#define	RB_ASKNAME	0x001	/* ask for file name to reboot from */
-#define	RB_SINGLE	0x002	/* reboot to single user only */
-#define	RB_NOSYNC	0x004	/* dont sync before reboot */
-#define	RB_HALT		0x008	/* don't reboot, just halt */
-#define	RB_INITNAME	0x010	/* name given for /etc/init (unused) */
-#define	RB_DFLTROOT	0x020	/* use compiled-in rootdev */
-#define	RB_KDB		0x040	/* give control to kernel debugger */
-#define	RB_RDONLY	0x080	/* mount root fs read-only */
-#define	RB_DUMP		0x100	/* dump kernel memory before reboot */
-#define	RB_MINIROOT	0x200	/* mini-root present in memory at boot time */
-#define	RB_VERBOSE	0x800	/* print all potentially useful info */
-#define	RB_SERIAL	0x1000	/* use serial port as console */
-#define	RB_CDROM	0x2000	/* use cdrom as root */
-#define	RB_POWEROFF	0x4000	/* turn the power off if possible */
-#define	RB_GDB		0x8000	/* use GDB remote debugger instead of DDB */
-#define	RB_MUTE		0x10000	/* start up with the console muted */
-#define	RB_SELFTEST	0x20000	/* don't complete the boot; do selftest */
-#define	RB_RESERVED1	0x40000	/* reserved for internal use of boot blocks */
-#define	RB_RESERVED2	0x80000	/* reserved for internal use of boot blocks */
-#define	RB_PAUSE	0x100000 /* pause after each output line during probe */
-#define	RB_MULTIPLE	0x20000000	/* use multiple consoles */
-
-#define	RB_BOOTINFO	0x80000000	/* have `struct bootinfo *' arg */
-
-#endif
diff --git a/include.new/sys/refcount.h b/include.new/sys/refcount.h
deleted file mode 100644
index 2ad747a..0000000
--- a/include.new/sys/refcount.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2005 John Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/sys/refcount.h 262192 2014-02-18 20:27:17Z jhb $
- */
-
-#ifndef __SYS_REFCOUNT_H__
-#define __SYS_REFCOUNT_H__
-
-#include <sys/limits.h>
-#include <machine/atomic.h>
-
-#ifdef _KERNEL
-#include <sys/systm.h>
-#else
-#define	KASSERT(exp, msg)	/* */
-#endif
-
-static __inline void
-refcount_init(volatile u_int *count, u_int value)
-{
-
-	*count = value;
-}
-
-static __inline void
-refcount_acquire(volatile u_int *count)
-{
-
-	KASSERT(*count < UINT_MAX, ("refcount %p overflowed", count));
-	atomic_add_acq_int(count, 1);	
-}
-
-static __inline int
-refcount_release(volatile u_int *count)
-{
-	u_int old;
-
-	/* XXX: Should this have a rel membar? */
-	old = atomic_fetchadd_int(count, -1);
-	KASSERT(old > 0, ("negative refcount %p", count));
-	return (old == 1);
-}
-
-#endif	/* ! __SYS_REFCOUNT_H__ */
diff --git a/include.new/sys/regression.h b/include.new/sys/regression.h
deleted file mode 100644
index caef5f0..0000000
--- a/include.new/sys/regression.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2001 Robert N. M. Watson
- * 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.
- *
- * 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: releng/10.2/sys/sys/regression.h 129096 2004-05-10 18:38:07Z rwatson $
- */
-#ifndef _SYS_REGRESSION_H_
-#define	_SYS_REGRESSION_H_
-
-#ifndef _KERNEL
-/*
- * System calls associated with regression testing functions in kernel.
- */
-int	__setugid(int _flag);
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_REGRESSION_H_ */
diff --git a/include.new/sys/resource.h b/include.new/sys/resource.h
deleted file mode 100644
index 206425a..0000000
--- a/include.new/sys/resource.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)resource.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/sys/resource.h 242958 2012-11-13 12:52:31Z kib $
- */
-
-#ifndef _SYS_RESOURCE_H_
-#define	_SYS_RESOURCE_H_
-
-#include <sys/cdefs.h>
-#include <sys/_timeval.h>
-#include <sys/_types.h>
-
-/*
- * Process priority specifications to get/setpriority.
- */
-#define	PRIO_MIN	-20
-#define	PRIO_MAX	20
-
-#define	PRIO_PROCESS	0
-#define	PRIO_PGRP	1
-#define	PRIO_USER	2
-
-/*
- * Resource utilization information.
- *
- * All fields are only modified by curthread and
- * no locks are required to read.
- */
-
-#define	RUSAGE_SELF	0
-#define	RUSAGE_CHILDREN	-1
-#define	RUSAGE_THREAD	1
-
-struct rusage {
-	struct timeval ru_utime;	/* user time used */
-	struct timeval ru_stime;	/* system time used */
-	long	ru_maxrss;		/* max resident set size */
-#define	ru_first	ru_ixrss
-	long	ru_ixrss;		/* integral shared memory size */
-	long	ru_idrss;		/* integral unshared data " */
-	long	ru_isrss;		/* integral unshared stack " */
-	long	ru_minflt;		/* page reclaims */
-	long	ru_majflt;		/* page faults */
-	long	ru_nswap;		/* swaps */
-	long	ru_inblock;		/* block input operations */
-	long	ru_oublock;		/* block output operations */
-	long	ru_msgsnd;		/* messages sent */
-	long	ru_msgrcv;		/* messages received */
-	long	ru_nsignals;		/* signals received */
-	long	ru_nvcsw;		/* voluntary context switches */
-	long	ru_nivcsw;		/* involuntary " */
-#define	ru_last		ru_nivcsw
-};
-
-#if __BSD_VISIBLE
-struct __wrusage {
-	struct rusage	wru_self;
-	struct rusage	wru_children;
-};
-#endif
-
-/*
- * Resource limits
- */
-#define	RLIMIT_CPU	0		/* maximum cpu time in seconds */
-#define	RLIMIT_FSIZE	1		/* maximum file size */
-#define	RLIMIT_DATA	2		/* data size */
-#define	RLIMIT_STACK	3		/* stack size */
-#define	RLIMIT_CORE	4		/* core file size */
-#define	RLIMIT_RSS	5		/* resident set size */
-#define	RLIMIT_MEMLOCK	6		/* locked-in-memory address space */
-#define	RLIMIT_NPROC	7		/* number of processes */
-#define	RLIMIT_NOFILE	8		/* number of open files */
-#define	RLIMIT_SBSIZE	9		/* maximum size of all socket buffers */
-#define	RLIMIT_VMEM	10		/* virtual process size (incl. mmap) */
-#define	RLIMIT_AS	RLIMIT_VMEM	/* standard name for RLIMIT_VMEM */
-#define	RLIMIT_NPTS	11		/* pseudo-terminals */
-#define	RLIMIT_SWAP	12		/* swap used */
-
-#define	RLIM_NLIMITS	13		/* number of resource limits */
-
-#define	RLIM_INFINITY	((rlim_t)(((uint64_t)1 << 63) - 1))
-/* XXX Missing: RLIM_SAVED_MAX, RLIM_SAVED_CUR */
-
-
-/*
- * Resource limit string identifiers
- */
-
-#ifdef _RLIMIT_IDENT
-static const char *rlimit_ident[RLIM_NLIMITS] = {
-	"cpu",
-	"fsize",
-	"data",
-	"stack",
-	"core",
-	"rss",
-	"memlock",
-	"nproc",
-	"nofile",
-	"sbsize",
-	"vmem",
-	"npts",
-	"swap",
-};
-#endif
-
-#ifndef _RLIM_T_DECLARED
-typedef	__rlim_t	rlim_t;
-#define	_RLIM_T_DECLARED
-#endif
-
-struct rlimit {
-	rlim_t	rlim_cur;		/* current (soft) limit */
-	rlim_t	rlim_max;		/* maximum value for rlim_cur */
-};
-
-#if __BSD_VISIBLE
-
-struct orlimit {
-	__int32_t	rlim_cur;	/* current (soft) limit */
-	__int32_t	rlim_max;	/* maximum value for rlim_cur */
-};
-
-struct loadavg {
-	__fixpt_t	ldavg[3];
-	long		fscale;
-};
-
-#define	CP_USER		0
-#define	CP_NICE		1
-#define	CP_SYS		2
-#define	CP_INTR		3
-#define	CP_IDLE		4
-#define	CPUSTATES	5
-
-#endif	/* __BSD_VISIBLE */
-
-#ifdef _KERNEL
-
-extern struct loadavg averunnable;
-void	read_cpu_time(long *cp_time);	/* Writes array of CPUSTATES */
-
-#else
-
-__BEGIN_DECLS
-/* XXX 2nd arg to [gs]etpriority() should be an id_t */
-int	getpriority(int, int);
-int	getrlimit(int, struct rlimit *);
-int	getrusage(int, struct rusage *);
-int	setpriority(int, int, int);
-int	setrlimit(int, const struct rlimit *);
-__END_DECLS
-
-#endif	/* _KERNEL */
-#endif	/* !_SYS_RESOURCE_H_ */
diff --git a/include.new/sys/resourcevar.h b/include.new/sys/resourcevar.h
deleted file mode 100644
index 0d37286..0000000
--- a/include.new/sys/resourcevar.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- *
- *	@(#)resourcevar.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/sys/resourcevar.h 230470 2012-01-22 20:25:00Z trociny $
- */
-
-#ifndef	_SYS_RESOURCEVAR_H_
-#define	_SYS_RESOURCEVAR_H_
-
-#include <sys/resource.h>
-#include <sys/queue.h>
-#ifdef _KERNEL
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#endif
-
-/*
- * Kernel per-process accounting / statistics
- * (not necessarily resident except when running).
- *
- * Locking key:
- *      b - created at fork, never changes
- *      c - locked by proc mtx
- *      j - locked by proc slock
- *      k - only accessed by curthread
- */
-struct pstats {
-#define	pstat_startzero	p_cru
-	struct	rusage p_cru;		/* Stats for reaped children. */
-	struct	itimerval p_timer[3];	/* (j) Virtual-time timers. */
-#define	pstat_endzero	pstat_startcopy
-
-#define	pstat_startcopy	p_prof
-	struct uprof {			/* Profile arguments. */
-		caddr_t	pr_base;	/* (c + j) Buffer base. */
-		u_long	pr_size;	/* (c + j) Buffer size. */
-		u_long	pr_off;		/* (c + j) PC offset. */
-		u_long	pr_scale;	/* (c + j) PC scaling. */
-	} p_prof;
-#define	pstat_endcopy	p_start
-	struct	timeval p_start;	/* (b) Starting time. */
-};
-
-#ifdef _KERNEL
-
-/*
- * Kernel shareable process resource limits.  Because this structure
- * is moderately large but changes infrequently, it is normally
- * shared copy-on-write after forks.
- */
-struct plimit {
-	struct	rlimit pl_rlimit[RLIM_NLIMITS];
-	int	pl_refcnt;		/* number of references */
-};
-
-struct racct;
-
-/*-
- * Per uid resource consumption.  This structure is used to track
- * the total resource consumption (process count, socket buffer size,
- * etc) for the uid and impose limits.
- *
- * Locking guide:
- * (a) Constant from inception
- * (b) Lockless, updated using atomics
- * (c) Locked by global uihashtbl_mtx
- * (d) Locked by the ui_vmsize_mtx
- */
-struct uidinfo {
-	LIST_ENTRY(uidinfo) ui_hash;	/* (c) hash chain of uidinfos */
-	struct mtx ui_vmsize_mtx;
-	vm_ooffset_t ui_vmsize;		/* (d) swap reservation by uid */
-	long	ui_sbsize;		/* (b) socket buffer space consumed */
-	long	ui_proccnt;		/* (b) number of processes */
-	long	ui_ptscnt;		/* (b) number of pseudo-terminals */
-	uid_t	ui_uid;			/* (a) uid */
-	u_int	ui_ref;			/* (b) reference count */
-	struct racct *ui_racct;		/* (a) resource accounting */
-};
-
-#define	UIDINFO_VMSIZE_LOCK(ui)		mtx_lock(&((ui)->ui_vmsize_mtx))
-#define	UIDINFO_VMSIZE_UNLOCK(ui)	mtx_unlock(&((ui)->ui_vmsize_mtx))
-
-struct proc;
-struct rusage_ext;
-struct thread;
-
-void	 addupc_intr(struct thread *td, uintfptr_t pc, u_int ticks);
-void	 addupc_task(struct thread *td, uintfptr_t pc, u_int ticks);
-void	 calccru(struct proc *p, struct timeval *up, struct timeval *sp);
-void	 calcru(struct proc *p, struct timeval *up, struct timeval *sp);
-int	 chgproccnt(struct uidinfo *uip, int diff, rlim_t maxval);
-int	 chgsbsize(struct uidinfo *uip, u_int *hiwat, u_int to,
-	    rlim_t maxval);
-int	 chgptscnt(struct uidinfo *uip, int diff, rlim_t maxval);
-int	 fuswintr(void *base);
-int	 kern_proc_setrlimit(struct thread *td, struct proc *p, u_int which,
-	    struct rlimit *limp);
-struct plimit
-	*lim_alloc(void);
-void	 lim_copy(struct plimit *dst, struct plimit *src);
-rlim_t	 lim_cur(struct proc *p, int which);
-void	 lim_fork(struct proc *p1, struct proc *p2);
-void	 lim_free(struct plimit *limp);
-struct plimit
-	*lim_hold(struct plimit *limp);
-rlim_t	 lim_max(struct proc *p, int which);
-void	 lim_rlimit(struct proc *p, int which, struct rlimit *rlp);
-void	 ruadd(struct rusage *ru, struct rusage_ext *rux, struct rusage *ru2,
-	    struct rusage_ext *rux2);
-void	 rucollect(struct rusage *ru, struct rusage *ru2);
-void	 rufetch(struct proc *p, struct rusage *ru);
-void	 rufetchcalc(struct proc *p, struct rusage *ru, struct timeval *up,
-	    struct timeval *sp);
-void	 rufetchtd(struct thread *td, struct rusage *ru);
-void	 ruxagg(struct proc *p, struct thread *td);
-int	 suswintr(void *base, int word);
-struct uidinfo
-	*uifind(uid_t uid);
-void	 uifree(struct uidinfo *uip);
-void	 uihashinit(void);
-void	 uihold(struct uidinfo *uip);
-void	 ui_racct_foreach(void (*callback)(struct racct *racct,
-	    void *arg2, void *arg3), void *arg2, void *arg3);
-
-#endif /* _KERNEL */
-#endif /* !_SYS_RESOURCEVAR_H_ */
diff --git a/include.new/sys/rman.h b/include.new/sys/rman.h
deleted file mode 100644
index c598a9f..0000000
--- a/include.new/sys/rman.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * Copyright 1998 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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: releng/10.2/sys/sys/rman.h 269383 2014-08-01 15:04:46Z truckman $
- */
-
-#ifndef _SYS_RMAN_H_
-#define	_SYS_RMAN_H_	1
-
-#ifndef	_KERNEL
-#include <sys/queue.h>
-#else
-#include <machine/_bus.h>
-#include <machine/resource.h>
-#endif
-
-#define	RF_ALLOCATED	0x0001	/* resource has been reserved */
-#define	RF_ACTIVE	0x0002	/* resource allocation has been activated */
-#define	RF_SHAREABLE	0x0004	/* resource permits contemporaneous sharing */
-#define	RF_SPARE1	0x0008
-#define	RF_SPARE2	0x0010
-#define	RF_FIRSTSHARE	0x0020	/* first in sharing list */
-#define	RF_PREFETCHABLE	0x0040	/* resource is prefetchable */
-#define	RF_OPTIONAL	0x0080	/* for bus_alloc_resources() */
-
-#define	RF_ALIGNMENT_SHIFT	10 /* alignment size bit starts bit 10 */
-#define	RF_ALIGNMENT_MASK	(0x003F << RF_ALIGNMENT_SHIFT)
-				/* resource address alignment size bit mask */
-#define	RF_ALIGNMENT_LOG2(x)	((x) << RF_ALIGNMENT_SHIFT)
-#define	RF_ALIGNMENT(x)		(((x) & RF_ALIGNMENT_MASK) >> RF_ALIGNMENT_SHIFT)
-
-enum	rman_type { RMAN_UNINIT = 0, RMAN_GAUGE, RMAN_ARRAY };
-
-/*
- * String length exported to userspace for resource names, etc.
- */
-#define RM_TEXTLEN	32
-
-/*
- * Userspace-exported structures.
- */
-struct u_resource {
-	uintptr_t	r_handle;		/* resource uniquifier */
-	uintptr_t	r_parent;		/* parent rman */
-	uintptr_t	r_device;		/* device owning this resource */
-	char		r_devname[RM_TEXTLEN];	/* device name XXX obsolete */
-
-	u_long		r_start;		/* offset in resource space */
-	u_long		r_size;			/* size in resource space */
-	u_int		r_flags;		/* RF_* flags */
-};
-
-struct u_rman {
-	uintptr_t	rm_handle;		/* rman uniquifier */
-	char		rm_descr[RM_TEXTLEN];	/* rman description */
-
-	u_long		rm_start;		/* base of managed region */
-	u_long		rm_size;		/* size of managed region */
-	enum rman_type	rm_type;		/* region type */
-};
-
-#ifdef _KERNEL
-
-/*
- * The public (kernel) view of struct resource
- *
- * NB: Changing the offset/size/type of existing fields in struct resource
- * NB: breaks the device driver ABI and is strongly FORBIDDEN.
- * NB: Appending new fields is probably just misguided.
- */
-
-struct resource {
-	struct resource_i	*__r_i;
-	bus_space_tag_t		r_bustag; /* bus_space tag */
-	bus_space_handle_t	r_bushandle;	/* bus_space handle */
-};
-
-struct resource_i;
-
-TAILQ_HEAD(resource_head, resource_i);
-
-struct rman {
-	struct	resource_head 	rm_list;
-	struct	mtx *rm_mtx;	/* mutex used to protect rm_list */
-	TAILQ_ENTRY(rman)	rm_link; /* link in list of all rmans */
-	u_long	rm_start;	/* index of globally first entry */
-	u_long	rm_end;		/* index of globally last entry */
-	enum	rman_type rm_type; /* what type of resource this is */
-	const	char *rm_descr;	/* text descripion of this resource */
-};
-TAILQ_HEAD(rman_head, rman);
-
-int	rman_activate_resource(struct resource *r);
-int	rman_adjust_resource(struct resource *r, u_long start, u_long end);
-int	rman_await_resource(struct resource *r, int pri, int timo);
-int	rman_first_free_region(struct rman *rm, u_long *start, u_long *end);
-bus_space_handle_t rman_get_bushandle(struct resource *);
-bus_space_tag_t rman_get_bustag(struct resource *);
-u_long	rman_get_end(struct resource *);
-struct device *rman_get_device(struct resource *);
-u_int	rman_get_flags(struct resource *);
-int	rman_get_rid(struct resource *);
-u_long	rman_get_size(struct resource *);
-u_long	rman_get_start(struct resource *);
-void   *rman_get_virtual(struct resource *);
-int	rman_deactivate_resource(struct resource *r);
-int	rman_fini(struct rman *rm);
-int	rman_init(struct rman *rm);
-int	rman_init_from_resource(struct rman *rm, struct resource *r);
-int	rman_last_free_region(struct rman *rm, u_long *start, u_long *end);
-uint32_t rman_make_alignment_flags(uint32_t size);
-int	rman_manage_region(struct rman *rm, u_long start, u_long end);
-int	rman_is_region_manager(struct resource *r, struct rman *rm);
-int	rman_release_resource(struct resource *r);
-struct resource *rman_reserve_resource(struct rman *rm, u_long start,
-					u_long end, u_long count,
-					u_int flags, struct device *dev);
-struct resource *rman_reserve_resource_bound(struct rman *rm, u_long start,
-					u_long end, u_long count, u_long bound,
-					u_int flags, struct device *dev);
-void	rman_set_bushandle(struct resource *_r, bus_space_handle_t _h);
-void	rman_set_bustag(struct resource *_r, bus_space_tag_t _t);
-void	rman_set_device(struct resource *_r, struct device *_dev);
-void	rman_set_end(struct resource *_r, u_long _end);
-void	rman_set_rid(struct resource *_r, int _rid);
-void	rman_set_start(struct resource *_r, u_long _start);
-void	rman_set_virtual(struct resource *_r, void *_v);
-
-extern	struct rman_head rman_head;
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_RMAN_H_ */
diff --git a/include.new/sys/rmlock.h b/include.new/sys/rmlock.h
deleted file mode 100644
index 650016f..0000000
--- a/include.new/sys/rmlock.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-
- * Copyright (c) 2007 Stephan Uphoff <ups@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. Neither the name of the author nor the names of any co-contributors
- *    may 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: releng/10.2/sys/sys/rmlock.h 252209 2013-06-25 18:44:15Z jhb $
- */
-
-#ifndef _SYS_RMLOCK_H_
-#define _SYS_RMLOCK_H_
-
-#include <sys/mutex.h>
-#include <sys/sx.h>
-#include <sys/_lock.h>
-#include <sys/_rmlock.h>
-
-#ifdef _KERNEL
-
-/*
- * Flags passed to rm_init_flags(9).
- */
-#define	RM_NOWITNESS	0x00000001
-#define	RM_RECURSE	0x00000002
-#define	RM_SLEEPABLE	0x00000004
-
-void	rm_init(struct rmlock *rm, const char *name);
-void	rm_init_flags(struct rmlock *rm, const char *name, int opts);
-void	rm_destroy(struct rmlock *rm);
-int	rm_wowned(const struct rmlock *rm);
-void	rm_sysinit(void *arg);
-void	rm_sysinit_flags(void *arg);
-
-void	_rm_wlock_debug(struct rmlock *rm, const char *file, int line);
-void	_rm_wunlock_debug(struct rmlock *rm, const char *file, int line);
-int	_rm_rlock_debug(struct rmlock *rm, struct rm_priotracker *tracker,
-	    int trylock, const char *file, int line);
-void	_rm_runlock_debug(struct rmlock *rm,  struct rm_priotracker *tracker,
-	    const char *file, int line);
-
-void	_rm_wlock(struct rmlock *rm);
-void	_rm_wunlock(struct rmlock *rm);
-int	_rm_rlock(struct rmlock *rm, struct rm_priotracker *tracker,
-	    int trylock);
-void	_rm_runlock(struct rmlock *rm,  struct rm_priotracker *tracker);
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-void	_rm_assert(const struct rmlock *rm, int what, const char *file,
-	    int line);
-#endif
-
-/*
- * Public interface for lock operations.
- */
-#ifndef LOCK_DEBUG
-#error LOCK_DEBUG not defined, include <sys/lock.h> before <sys/rmlock.h>
-#endif
-
-#if LOCK_DEBUG > 0
-#define	rm_wlock(rm)	_rm_wlock_debug((rm), LOCK_FILE, LOCK_LINE)
-#define	rm_wunlock(rm)	_rm_wunlock_debug((rm), LOCK_FILE, LOCK_LINE)
-#define	rm_rlock(rm,tracker)  \
-    ((void)_rm_rlock_debug((rm),(tracker), 0, LOCK_FILE, LOCK_LINE ))
-#define	rm_try_rlock(rm,tracker)  \
-    _rm_rlock_debug((rm),(tracker), 1, LOCK_FILE, LOCK_LINE )
-#define	rm_runlock(rm,tracker)	\
-    _rm_runlock_debug((rm), (tracker), LOCK_FILE, LOCK_LINE )
-#else
-#define	rm_wlock(rm)			_rm_wlock((rm))
-#define	rm_wunlock(rm)			_rm_wunlock((rm))
-#define	rm_rlock(rm,tracker)		((void)_rm_rlock((rm),(tracker), 0))
-#define	rm_try_rlock(rm,tracker)	_rm_rlock((rm),(tracker), 1)
-#define	rm_runlock(rm,tracker)		_rm_runlock((rm), (tracker))
-#endif
-#define	rm_sleep(chan, rm, pri, wmesg, timo)				\
-	_sleep((chan), &(rm)->lock_object, (pri), (wmesg),		\
-	    tick_sbt * (timo), 0, C_HARDCLOCK)
-
-struct rm_args {
-	struct rmlock	*ra_rm;
-	const char 	*ra_desc;
-};
-
-struct rm_args_flags {
-	struct rmlock	*ra_rm;
-	const char 	*ra_desc;
-	int		ra_opts;
-};
-
-#define	RM_SYSINIT(name, rm, desc)       				\
-	static struct rm_args name##_args = {				\
-		(rm),							\
-		(desc),							\
-	};								\
-	SYSINIT(name##_rm_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    rm_sysinit, &name##_args);					\
-	SYSUNINIT(name##_rm_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    rm_destroy, (rm))
-
-
-#define	RM_SYSINIT_FLAGS(name, rm, desc, opts)       			\
-	static struct rm_args name##_args = {				\
-		(rm),							\
-		(desc),							\
-                (opts),							\
-	};								\
-	SYSINIT(name##_rm_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    rm_sysinit_flags, &name##_args);				\
-	SYSUNINIT(name##_rm_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    rm_destroy, (rm))
-
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-#define	RA_LOCKED		LA_LOCKED
-#define	RA_RLOCKED		LA_SLOCKED
-#define	RA_WLOCKED		LA_XLOCKED
-#define	RA_UNLOCKED		LA_UNLOCKED
-#define	RA_RECURSED		LA_RECURSED
-#define	RA_NOTRECURSED		LA_NOTRECURSED
-#endif
-
-#ifdef INVARIANTS
-#define	rm_assert(rm, what)	_rm_assert((rm), (what), LOCK_FILE, LOCK_LINE)
-#else
-#define	rm_assert(rm, what)
-#endif
-
-#endif /* _KERNEL */
-#endif /* !_SYS_RMLOCK_H_ */
diff --git a/include.new/sys/rtprio.h b/include.new/sys/rtprio.h
deleted file mode 100644
index 7a761b9..0000000
--- a/include.new/sys/rtprio.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1994, Henrik Vestergaard Draboel
- * 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 Henrik Vestergaard Draboel.
- * 4. 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: releng/10.2/sys/sys/rtprio.h 165898 2007-01-08 21:21:45Z imp $
- */
-
-#ifndef _SYS_RTPRIO_H_
-#define _SYS_RTPRIO_H_
-
-#include <sys/priority.h>
-
-/*
- * Process realtime-priority specifications to rtprio.
- */
-
-/* priority types.  Start at 1 to catch uninitialized fields. */
-
-#define RTP_PRIO_REALTIME	PRI_REALTIME	/* real time process */
-#define RTP_PRIO_NORMAL		PRI_TIMESHARE	/* time sharing process */
-#define RTP_PRIO_IDLE		PRI_IDLE	/* idle process */
-
-/* RTP_PRIO_FIFO is POSIX.1B SCHED_FIFO.
- */
-
-#define RTP_PRIO_FIFO_BIT	PRI_FIFO_BIT
-#define RTP_PRIO_FIFO		PRI_FIFO
-#define RTP_PRIO_BASE(P)	PRI_BASE(P)
-#define RTP_PRIO_IS_REALTIME(P) PRI_IS_REALTIME(P)
-#define RTP_PRIO_NEED_RR(P)	PRI_NEED_RR(P)
-
-/* priority range */
-#define RTP_PRIO_MIN		0	/* Highest priority */
-#define RTP_PRIO_MAX		31	/* Lowest priority */
-
-/*
- * rtprio() syscall functions
- */
-#define RTP_LOOKUP		0
-#define RTP_SET			1
-
-#ifndef LOCORE
-/*
- * Scheduling class information.
- */
-struct rtprio {
-	u_short type;			/* scheduling class */
-	u_short prio;
-};
-
-#ifdef _KERNEL
-struct thread;
-int	rtp_to_pri(struct rtprio *, struct thread *);
-void	pri_to_rtp(struct thread *, struct rtprio *);
-#endif
-#endif
-
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	rtprio(int, pid_t, struct rtprio *);
-int	rtprio_thread(int, lwpid_t, struct rtprio *);
-__END_DECLS
-#endif	/* !_KERNEL */
-#endif	/* !_SYS_RTPRIO_H_ */
diff --git a/include.new/sys/runq.h b/include.new/sys/runq.h
deleted file mode 100644
index 0a3ff04..0000000
--- a/include.new/sys/runq.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 2001 Jake Burkholder <jake@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.
- *
- * 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: releng/10.2/sys/sys/runq.h 177435 2008-03-20 05:51:16Z jeff $
- */
-
-#ifndef	_RUNQ_H_
-#define	_RUNQ_H_
-
-#include <machine/runq.h>
-
-struct thread;
-
-/*
- * Run queue parameters.
- */
-
-#define	RQ_NQS		(64)		/* Number of run queues. */
-#define	RQ_PPQ		(4)		/* Priorities per queue. */
-
-/*
- * Head of run queues.
- */
-TAILQ_HEAD(rqhead, thread);
-
-/*
- * Bit array which maintains the status of a run queue.  When a queue is
- * non-empty the bit corresponding to the queue number will be set.
- */
-struct rqbits {
-	rqb_word_t rqb_bits[RQB_LEN];
-};
-
-/*
- * Run queue structure.  Contains an array of run queues on which processes
- * are placed, and a structure to maintain the status of each queue.
- */
-struct runq {
-	struct	rqbits rq_status;
-	struct	rqhead rq_queues[RQ_NQS];
-};
-
-void	runq_add(struct runq *, struct thread *, int);
-void	runq_add_pri(struct runq *, struct thread *, u_char, int);
-int	runq_check(struct runq *);
-struct	thread *runq_choose(struct runq *);
-struct	thread *runq_choose_from(struct runq *, u_char);
-struct	thread *runq_choose_fuzz(struct runq *, int);
-void	runq_init(struct runq *);
-void	runq_remove(struct runq *, struct thread *);
-void	runq_remove_idx(struct runq *, struct thread *, u_char *);
-
-#endif
diff --git a/include.new/sys/rwlock.h b/include.new/sys/rwlock.h
deleted file mode 100644
index ad5c91d..0000000
--- a/include.new/sys/rwlock.h
+++ /dev/null
@@ -1,281 +0,0 @@
-/*-
- * Copyright (c) 2006 John Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/sys/rwlock.h 262192 2014-02-18 20:27:17Z jhb $
- */
-
-#ifndef _SYS_RWLOCK_H_
-#define _SYS_RWLOCK_H_
-
-#include <sys/_lock.h>
-#include <sys/_rwlock.h>
-#include <sys/lock_profile.h>
-#include <sys/lockstat.h>
-
-#ifdef _KERNEL
-#include <sys/pcpu.h>
-#include <machine/atomic.h>
-#endif
-
-/*
- * The rw_lock field consists of several fields.  The low bit indicates
- * if the lock is locked with a read (shared) or write (exclusive) lock.
- * A value of 0 indicates a write lock, and a value of 1 indicates a read
- * lock.  Bit 1 is a boolean indicating if there are any threads waiting
- * for a read lock.  Bit 2 is a boolean indicating if there are any threads
- * waiting for a write lock.  The rest of the variable's definition is
- * dependent on the value of the first bit.  For a write lock, it is a
- * pointer to the thread holding the lock, similar to the mtx_lock field of
- * mutexes.  For read locks, it is a count of read locks that are held.
- *
- * When the lock is not locked by any thread, it is encoded as a read lock
- * with zero waiters.
- */
-
-#define	RW_LOCK_READ		0x01
-#define	RW_LOCK_READ_WAITERS	0x02
-#define	RW_LOCK_WRITE_WAITERS	0x04
-#define	RW_LOCK_WRITE_SPINNER	0x08
-#define	RW_LOCK_FLAGMASK						\
-	(RW_LOCK_READ | RW_LOCK_READ_WAITERS | RW_LOCK_WRITE_WAITERS |	\
-	RW_LOCK_WRITE_SPINNER)
-#define	RW_LOCK_WAITERS		(RW_LOCK_READ_WAITERS | RW_LOCK_WRITE_WAITERS)
-
-#define	RW_OWNER(x)		((x) & ~RW_LOCK_FLAGMASK)
-#define	RW_READERS_SHIFT	4
-#define	RW_READERS(x)		(RW_OWNER((x)) >> RW_READERS_SHIFT)
-#define	RW_READERS_LOCK(x)	((x) << RW_READERS_SHIFT | RW_LOCK_READ)
-#define	RW_ONE_READER		(1 << RW_READERS_SHIFT)
-
-#define	RW_UNLOCKED		RW_READERS_LOCK(0)
-#define	RW_DESTROYED		(RW_LOCK_READ_WAITERS | RW_LOCK_WRITE_WAITERS)
-
-#ifdef _KERNEL
-
-#define	rw_recurse	lock_object.lo_data
-
-/* Very simple operations on rw_lock. */
-
-/* Try to obtain a write lock once. */
-#define	_rw_write_lock(rw, tid)						\
-	atomic_cmpset_acq_ptr(&(rw)->rw_lock, RW_UNLOCKED, (tid))
-
-/* Release a write lock quickly if there are no waiters. */
-#define	_rw_write_unlock(rw, tid)					\
-	atomic_cmpset_rel_ptr(&(rw)->rw_lock, (tid), RW_UNLOCKED)
-
-/*
- * Full lock operations that are suitable to be inlined in non-debug
- * kernels.  If the lock cannot be acquired or released trivially then
- * the work is deferred to another function.
- */
-
-/* Acquire a write lock. */
-#define	__rw_wlock(rw, tid, file, line) do {				\
-	uintptr_t _tid = (uintptr_t)(tid);				\
-						                        \
-	if (!_rw_write_lock((rw), _tid))				\
-		_rw_wlock_hard((rw), _tid, (file), (line));		\
-	else 								\
-		LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(LS_RW_WLOCK_ACQUIRE, \
-		    rw, 0, 0, (file), (line));				\
-} while (0)
-
-/* Release a write lock. */
-#define	__rw_wunlock(rw, tid, file, line) do {				\
-	uintptr_t _tid = (uintptr_t)(tid);				\
-									\
-	if ((rw)->rw_recurse)						\
-		(rw)->rw_recurse--;					\
-	else if (!_rw_write_unlock((rw), _tid))				\
-		_rw_wunlock_hard((rw), _tid, (file), (line));		\
-} while (0)
-
-/*
- * Function prototypes.  Routines that start with _ are not part of the
- * external API and should not be called directly.  Wrapper macros should
- * be used instead.
- */
-void	_rw_init_flags(volatile uintptr_t *c, const char *name, int opts);
-void	_rw_destroy(volatile uintptr_t *c);
-void	rw_sysinit(void *arg);
-void	rw_sysinit_flags(void *arg);
-int	_rw_wowned(const volatile uintptr_t *c);
-void	_rw_wlock_cookie(volatile uintptr_t *c, const char *file, int line);
-int	__rw_try_wlock(volatile uintptr_t *c, const char *file, int line);
-void	_rw_wunlock_cookie(volatile uintptr_t *c, const char *file, int line);
-void	__rw_rlock(volatile uintptr_t *c, const char *file, int line);
-int	__rw_try_rlock(volatile uintptr_t *c, const char *file, int line);
-void	_rw_runlock_cookie(volatile uintptr_t *c, const char *file, int line);
-void	__rw_wlock_hard(volatile uintptr_t *c, uintptr_t tid, const char *file,
-	    int line);
-void	__rw_wunlock_hard(volatile uintptr_t *c, uintptr_t tid,
-	    const char *file, int line);
-int	__rw_try_upgrade(volatile uintptr_t *c, const char *file, int line);
-void	__rw_downgrade(volatile uintptr_t *c, const char *file, int line);
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-void	__rw_assert(const volatile uintptr_t *c, int what, const char *file,
-	    int line);
-#endif
-
-/*
- * Top-level macros to provide lock cookie once the actual rwlock is passed.
- * They will also prevent passing a malformed object to the rwlock KPI by
- * failing compilation as the rw_lock reserved member will not be found.
- */
-#define	rw_init(rw, n)							\
-	_rw_init_flags(&(rw)->rw_lock, n, 0)
-#define	rw_init_flags(rw, n, o)						\
-	_rw_init_flags(&(rw)->rw_lock, n, o)
-#define	rw_destroy(rw)							\
-	_rw_destroy(&(rw)->rw_lock)
-#define	rw_wowned(rw)							\
-	_rw_wowned(&(rw)->rw_lock)
-#define	_rw_wlock(rw, f, l)						\
-	_rw_wlock_cookie(&(rw)->rw_lock, f, l)
-#define	_rw_try_wlock(rw, f, l)						\
-	__rw_try_wlock(&(rw)->rw_lock, f, l)
-#define	_rw_wunlock(rw, f, l)						\
-	_rw_wunlock_cookie(&(rw)->rw_lock, f, l)
-#define	_rw_rlock(rw, f, l)						\
-	__rw_rlock(&(rw)->rw_lock, f, l)
-#define	_rw_try_rlock(rw, f, l)						\
-	__rw_try_rlock(&(rw)->rw_lock, f, l)
-#define	_rw_runlock(rw, f, l)						\
-	_rw_runlock_cookie(&(rw)->rw_lock, f, l)
-#define	_rw_wlock_hard(rw, t, f, l)					\
-	__rw_wlock_hard(&(rw)->rw_lock, t, f, l)
-#define	_rw_wunlock_hard(rw, t, f, l)					\
-	__rw_wunlock_hard(&(rw)->rw_lock, t, f, l)
-#define	_rw_try_upgrade(rw, f, l)					\
-	__rw_try_upgrade(&(rw)->rw_lock, f, l)
-#define	_rw_downgrade(rw, f, l)						\
-	__rw_downgrade(&(rw)->rw_lock, f, l)
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-#define	_rw_assert(rw, w, f, l)						\
-	__rw_assert(&(rw)->rw_lock, w, f, l)
-#endif
-
-
-/*
- * Public interface for lock operations.
- */
-
-#ifndef LOCK_DEBUG
-#error LOCK_DEBUG not defined, include <sys/lock.h> before <sys/rwlock.h>
-#endif
-#if LOCK_DEBUG > 0 || defined(RWLOCK_NOINLINE)
-#define	rw_wlock(rw)		_rw_wlock((rw), LOCK_FILE, LOCK_LINE)
-#define	rw_wunlock(rw)		_rw_wunlock((rw), LOCK_FILE, LOCK_LINE)
-#else
-#define	rw_wlock(rw)							\
-	__rw_wlock((rw), curthread, LOCK_FILE, LOCK_LINE)
-#define	rw_wunlock(rw)							\
-	__rw_wunlock((rw), curthread, LOCK_FILE, LOCK_LINE)
-#endif
-#define	rw_rlock(rw)		_rw_rlock((rw), LOCK_FILE, LOCK_LINE)
-#define	rw_runlock(rw)		_rw_runlock((rw), LOCK_FILE, LOCK_LINE)
-#define	rw_try_rlock(rw)	_rw_try_rlock((rw), LOCK_FILE, LOCK_LINE)
-#define	rw_try_upgrade(rw)	_rw_try_upgrade((rw), LOCK_FILE, LOCK_LINE)
-#define	rw_try_wlock(rw)	_rw_try_wlock((rw), LOCK_FILE, LOCK_LINE)
-#define	rw_downgrade(rw)	_rw_downgrade((rw), LOCK_FILE, LOCK_LINE)
-#define	rw_unlock(rw)	do {						\
-	if (rw_wowned(rw))						\
-		rw_wunlock(rw);						\
-	else								\
-		rw_runlock(rw);						\
-} while (0)
-#define	rw_sleep(chan, rw, pri, wmesg, timo)				\
-	_sleep((chan), &(rw)->lock_object, (pri), (wmesg),		\
-	    tick_sbt * (timo), 0, C_HARDCLOCK)
-
-#define	rw_initialized(rw)	lock_initalized(&(rw)->lock_object)
-
-struct rw_args {
-	void		*ra_rw;
-	const char 	*ra_desc;
-};
-
-struct rw_args_flags {
-	void		*ra_rw;
-	const char 	*ra_desc;
-	int		ra_flags;
-};
-
-#define	RW_SYSINIT(name, rw, desc)					\
-	static struct rw_args name##_args = {				\
-		(rw),							\
-		(desc),							\
-	};								\
-	SYSINIT(name##_rw_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    rw_sysinit, &name##_args);					\
-	SYSUNINIT(name##_rw_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    _rw_destroy, __DEVOLATILE(void *, &(rw)->rw_lock))
-
-
-#define	RW_SYSINIT_FLAGS(name, rw, desc, flags)				\
-	static struct rw_args_flags name##_args = {			\
-		(rw),							\
-		(desc),							\
-		(flags),						\
-	};								\
-	SYSINIT(name##_rw_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    rw_sysinit_flags, &name##_args);				\
-	SYSUNINIT(name##_rw_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    _rw_destroy, __DEVOLATILE(void *, &(rw)->rw_lock))
-
-/*
- * Options passed to rw_init_flags().
- */
-#define	RW_DUPOK	0x01
-#define	RW_NOPROFILE	0x02
-#define	RW_NOWITNESS	0x04
-#define	RW_QUIET	0x08
-#define	RW_RECURSE	0x10
-
-/*
- * The INVARIANTS-enabled rw_assert() functionality.
- *
- * The constants need to be defined for INVARIANT_SUPPORT infrastructure
- * support as _rw_assert() itself uses them and the latter implies that
- * _rw_assert() must build.
- */
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-#define	RA_LOCKED		LA_LOCKED
-#define	RA_RLOCKED		LA_SLOCKED
-#define	RA_WLOCKED		LA_XLOCKED
-#define	RA_UNLOCKED		LA_UNLOCKED
-#define	RA_RECURSED		LA_RECURSED
-#define	RA_NOTRECURSED		LA_NOTRECURSED
-#endif
-
-#ifdef INVARIANTS
-#define	rw_assert(rw, what)	_rw_assert((rw), (what), LOCK_FILE, LOCK_LINE)
-#else
-#define	rw_assert(rw, what)
-#endif
-
-#endif /* _KERNEL */
-#endif /* !_SYS_RWLOCK_H_ */
diff --git a/include.new/sys/sbuf.h b/include.new/sys/sbuf.h
deleted file mode 100644
index dc990a4..0000000
--- a/include.new/sys/sbuf.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * Copyright (c) 2000-2008 Poul-Henning Kamp
- * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
- * 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
- *    in this position and unchanged.
- * 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.
- *
- * 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: releng/10.2/sys/sys/sbuf.h 284435 2015-06-16 02:31:11Z ken $
- */
-
-#ifndef _SYS_SBUF_H_
-#define	_SYS_SBUF_H_
-
-#include <sys/_types.h>
-
-struct sbuf;
-typedef int (sbuf_drain_func)(void *, const char *, int);
-
-/*
- * Structure definition
- */
-struct sbuf {
-	char		*s_buf;		/* storage buffer */
-	sbuf_drain_func	*s_drain_func;	/* drain function */
-	void		*s_drain_arg;	/* user-supplied drain argument */
-	int		 s_error;	/* current error code */
-	ssize_t		 s_size;	/* size of storage buffer */
-	ssize_t		 s_len;		/* current length of string */
-#define	SBUF_FIXEDLEN	0x00000000	/* fixed length buffer (default) */
-#define	SBUF_AUTOEXTEND	0x00000001	/* automatically extend buffer */
-#define	SBUF_USRFLAGMSK	0x0000ffff	/* mask of flags the user may specify */
-#define	SBUF_DYNAMIC	0x00010000	/* s_buf must be freed */
-#define	SBUF_FINISHED	0x00020000	/* set by sbuf_finish() */
-#define	SBUF_DYNSTRUCT	0x00080000	/* sbuf must be freed */
-#define	SBUF_INSECTION	0x00100000	/* set by sbuf_start_section() */
-	int		 s_flags;	/* flags */
-	ssize_t		 s_sect_len;	/* current length of section */
-};
-
-#ifndef HD_COLUMN_MASK
-#define	HD_COLUMN_MASK	0xff
-#define	HD_DELIM_MASK	0xff00
-#define	HD_OMIT_COUNT	(1 << 16)
-#define	HD_OMIT_HEX	(1 << 17)
-#define	HD_OMIT_CHARS	(1 << 18)
-#endif /* HD_COLUMN_MASK */
-
-__BEGIN_DECLS
-/*
- * API functions
- */
-struct sbuf	*sbuf_new(struct sbuf *, char *, int, int);
-#define		 sbuf_new_auto()				\
-	sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND)
-void		 sbuf_clear(struct sbuf *);
-int		 sbuf_setpos(struct sbuf *, ssize_t);
-int		 sbuf_bcat(struct sbuf *, const void *, size_t);
-int		 sbuf_bcpy(struct sbuf *, const void *, size_t);
-int		 sbuf_cat(struct sbuf *, const char *);
-int		 sbuf_cpy(struct sbuf *, const char *);
-int		 sbuf_printf(struct sbuf *, const char *, ...)
-	__printflike(2, 3);
-int		 sbuf_vprintf(struct sbuf *, const char *, __va_list)
-	__printflike(2, 0);
-int		 sbuf_putc(struct sbuf *, int);
-void		 sbuf_set_drain(struct sbuf *, sbuf_drain_func *, void *);
-int		 sbuf_trim(struct sbuf *);
-int		 sbuf_error(const struct sbuf *);
-int		 sbuf_finish(struct sbuf *);
-char		*sbuf_data(struct sbuf *);
-ssize_t		 sbuf_len(struct sbuf *);
-int		 sbuf_done(const struct sbuf *);
-void		 sbuf_delete(struct sbuf *);
-void		 sbuf_start_section(struct sbuf *, ssize_t *);
-ssize_t		 sbuf_end_section(struct sbuf *, ssize_t, size_t, int);
-void		 sbuf_hexdump(struct sbuf *, const void *, int, const char *,
-		     int);
-
-#ifdef _KERNEL
-struct uio;
-struct sbuf	*sbuf_uionew(struct sbuf *, struct uio *, int *);
-int		 sbuf_bcopyin(struct sbuf *, const void *, size_t);
-int		 sbuf_copyin(struct sbuf *, const void *, size_t);
-#endif
-__END_DECLS
-
-#endif
diff --git a/include.new/sys/sched.h b/include.new/sys/sched.h
deleted file mode 100644
index 2b16c63..0000000
--- a/include.new/sys/sched.h
+++ /dev/null
@@ -1,246 +0,0 @@
-/*-
- * Copyright (c) 1996, 1997
- *      HD Associates, Inc.  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 HD Associates, Inc
- *      and Jukka Antero Ukkonen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES 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 HD ASSOCIATES 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.
- */
-
-/*-
- * Copyright (c) 2002-2008, Jeffrey Roberson <jeff@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/sched.h 253604 2013-07-24 09:45:31Z avg $
- */
-
-#ifndef _SCHED_H_
-#define	_SCHED_H_
-
-#ifdef _KERNEL
-/*
- * General scheduling info.
- *
- * sched_load:
- *	Total runnable non-ithread threads in the system.
- *
- * sched_runnable:
- *	Runnable threads for this processor.
- */
-int	sched_load(void);
-int	sched_rr_interval(void);
-int	sched_runnable(void);
-
-/* 
- * Proc related scheduling hooks.
- */
-void	sched_exit(struct proc *p, struct thread *childtd);
-void	sched_fork(struct thread *td, struct thread *childtd);
-void	sched_fork_exit(struct thread *td);
-void	sched_class(struct thread *td, int class);
-void	sched_nice(struct proc *p, int nice);
-
-/*
- * Threads are switched in and out, block on resources, have temporary
- * priorities inherited from their procs, and use up cpu time.
- */
-void	sched_exit_thread(struct thread *td, struct thread *child);
-void	sched_fork_thread(struct thread *td, struct thread *child);
-void	sched_lend_prio(struct thread *td, u_char prio);
-void	sched_lend_user_prio(struct thread *td, u_char pri);
-fixpt_t	sched_pctcpu(struct thread *td);
-void	sched_prio(struct thread *td, u_char prio);
-void	sched_sleep(struct thread *td, int prio);
-void	sched_switch(struct thread *td, struct thread *newtd, int flags);
-void	sched_throw(struct thread *td);
-void	sched_unlend_prio(struct thread *td, u_char prio);
-void	sched_user_prio(struct thread *td, u_char prio);
-void	sched_userret(struct thread *td);
-void	sched_wakeup(struct thread *td);
-void	sched_preempt(struct thread *td);
-#ifdef	RACCT
-#ifdef	SCHED_4BSD
-fixpt_t	sched_pctcpu_delta(struct thread *td);
-#endif
-#endif
-
-/*
- * Threads are moved on and off of run queues
- */
-void	sched_add(struct thread *td, int flags);
-void	sched_clock(struct thread *td);
-void	sched_rem(struct thread *td);
-void	sched_tick(int cnt);
-void	sched_relinquish(struct thread *td);
-struct thread *sched_choose(void);
-void	sched_idletd(void *);
-
-/*
- * Binding makes cpu affinity permanent while pinning is used to temporarily
- * hold a thread on a particular CPU.
- */
-void	sched_bind(struct thread *td, int cpu);
-static __inline void sched_pin(void);
-void	sched_unbind(struct thread *td);
-static __inline void sched_unpin(void);
-int	sched_is_bound(struct thread *td);
-void	sched_affinity(struct thread *td);
-
-/*
- * These procedures tell the process data structure allocation code how
- * many bytes to actually allocate.
- */
-int	sched_sizeof_proc(void);
-int	sched_sizeof_thread(void);
-
-/*
- * This routine provides a consistent thread name for use with KTR graphing
- * functions.
- */
-char	*sched_tdname(struct thread *td);
-#ifdef KTR
-void	sched_clear_tdname(struct thread *td);
-#endif
-
-static __inline void
-sched_pin(void)
-{
-	curthread->td_pinned++;
-	__compiler_membar();
-}
-
-static __inline void
-sched_unpin(void)
-{
-	__compiler_membar();
-	curthread->td_pinned--;
-}
-
-/* sched_add arguments (formerly setrunqueue) */
-#define	SRQ_BORING	0x0000		/* No special circumstances. */
-#define	SRQ_YIELDING	0x0001		/* We are yielding (from mi_switch). */
-#define	SRQ_OURSELF	0x0002		/* It is ourself (from mi_switch). */
-#define	SRQ_INTR	0x0004		/* It is probably urgent. */
-#define	SRQ_PREEMPTED	0x0008		/* has been preempted.. be kind */
-#define	SRQ_BORROWING	0x0010		/* Priority updated due to prio_lend */
-
-/* Scheduler stats. */
-#ifdef SCHED_STATS
-DPCPU_DECLARE(long, sched_switch_stats[SWT_COUNT]);
-
-#define	SCHED_STAT_DEFINE_VAR(name, ptr, descr)				\
-static void name ## _add_proc(void *dummy __unused)			\
-{									\
-									\
-	SYSCTL_ADD_PROC(NULL,						\
-	    SYSCTL_STATIC_CHILDREN(_kern_sched_stats), OID_AUTO,	\
-	    #name, CTLTYPE_LONG|CTLFLAG_RD|CTLFLAG_MPSAFE,		\
-	    ptr, 0, sysctl_dpcpu_long, "LU", descr);			\
-}									\
-SYSINIT(name, SI_SUB_LAST, SI_ORDER_MIDDLE, name ## _add_proc, NULL);
-
-#define	SCHED_STAT_DEFINE(name, descr)					\
-    DPCPU_DEFINE(unsigned long, name);					\
-    SCHED_STAT_DEFINE_VAR(name, &DPCPU_NAME(name), descr)
-/*
- * Sched stats are always incremented in critical sections so no atomic
- * is necesssary to increment them.
- */
-#define SCHED_STAT_INC(var)     DPCPU_GET(var)++;
-#else
-#define	SCHED_STAT_DEFINE_VAR(name, descr, ptr)
-#define	SCHED_STAT_DEFINE(name, descr)
-#define SCHED_STAT_INC(var)			(void)0
-#endif
-
-/*
- * Fixup scheduler state for proc0 and thread0
- */
-void schedinit(void);
-#endif /* _KERNEL */
-
-/* POSIX 1003.1b Process Scheduling */
-
-/*
- * POSIX scheduling policies
- */
-#define SCHED_FIFO      1
-#define SCHED_OTHER     2
-#define SCHED_RR        3
-
-struct sched_param {
-        int     sched_priority;
-};
-
-/*
- * POSIX scheduling declarations for userland.
- */
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _PID_T_DECLARED
-typedef __pid_t         pid_t;
-#define _PID_T_DECLARED
-#endif
-
-struct timespec;
-
-__BEGIN_DECLS
-int     sched_get_priority_max(int);
-int     sched_get_priority_min(int);
-int     sched_getparam(pid_t, struct sched_param *);
-int     sched_getscheduler(pid_t);
-int     sched_rr_get_interval(pid_t, struct timespec *);
-int     sched_setparam(pid_t, const struct sched_param *);
-int     sched_setscheduler(pid_t, int, const struct sched_param *);
-int     sched_yield(void);
-__END_DECLS
-
-#endif
-#endif /* !_SCHED_H_ */
diff --git a/include.new/sys/sdt.h b/include.new/sys/sdt.h
deleted file mode 100644
index 391a867..0000000
--- a/include.new/sys/sdt.h
+++ /dev/null
@@ -1,425 +0,0 @@
-/*-
- * Copyright 2006-2008 John Birrell <jb@FreeBSD.org>
- *
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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: releng/10.2/sys/sys/sdt.h 262058 2014-02-17 14:47:52Z avg $
- *
- * Statically Defined Tracing (SDT) definitions.
- *
- */
-
-#ifndef _SYS_SDT_H
-#define	_SYS_SDT_H
-
-#ifndef _KERNEL
-
-#define	_DTRACE_VERSION	1
-
-#define	DTRACE_PROBE(prov, name) {				\
-	extern void __dtrace_##prov##___##name(void);		\
-	__dtrace_##prov##___##name();				\
-}
-
-#define	DTRACE_PROBE1(prov, name, arg1) {			\
-	extern void __dtrace_##prov##___##name(unsigned long);	\
-	__dtrace_##prov##___##name((unsigned long)arg1);	\
-}
-
-#define	DTRACE_PROBE2(prov, name, arg1, arg2) {			\
-	extern void __dtrace_##prov##___##name(unsigned long,	\
-	    unsigned long);					\
-	__dtrace_##prov##___##name((unsigned long)arg1,		\
-	    (unsigned long)arg2);				\
-}
-
-#define	DTRACE_PROBE3(prov, name, arg1, arg2, arg3) {		\
-	extern void __dtrace_##prov##___##name(unsigned long,	\
-	    unsigned long, unsigned long);			\
-	__dtrace_##prov##___##name((unsigned long)arg1,		\
-	    (unsigned long)arg2, (unsigned long)arg3);		\
-}
-
-#define	DTRACE_PROBE4(prov, name, arg1, arg2, arg3, arg4) {	\
-	extern void __dtrace_##prov##___##name(unsigned long,	\
-	    unsigned long, unsigned long, unsigned long);	\
-	__dtrace_##prov##___##name((unsigned long)arg1,		\
-	    (unsigned long)arg2, (unsigned long)arg3,		\
-	    (unsigned long)arg4);				\
-}
-
-#define	DTRACE_PROBE5(prov, name, arg1, arg2, arg3, arg4, arg5) {	\
-	extern void __dtrace_##prov##___##name(unsigned long,		\
-	    unsigned long, unsigned long, unsigned long, unsigned long);\
-	__dtrace_##prov##___##name((unsigned long)arg1,			\
-	    (unsigned long)arg2, (unsigned long)arg3,			\
-	    (unsigned long)arg4, (unsigned long)arg5);			\
-}
-
-#else /* _KERNEL */
-
-#include <sys/cdefs.h>
-#include <sys/linker_set.h>
-
-#ifndef KDTRACE_HOOKS
-
-#define SDT_PROVIDER_DEFINE(prov)
-#define SDT_PROVIDER_DECLARE(prov)
-#define SDT_PROBE_DEFINE(prov, mod, func, name)
-#define SDT_PROBE_DECLARE(prov, mod, func, name)
-#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
-#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype)
-
-#define	SDT_PROBE_DEFINE0(prov, mod, func, name)
-#define	SDT_PROBE_DEFINE1(prov, mod, func, name, arg0)
-#define	SDT_PROBE_DEFINE2(prov, mod, func, name, arg0, arg1)
-#define	SDT_PROBE_DEFINE3(prov, mod, func, name, arg0, arg1, arg2)
-#define	SDT_PROBE_DEFINE4(prov, mod, func, name, arg0, arg1, arg2, arg3)
-#define	SDT_PROBE_DEFINE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
-#define	SDT_PROBE_DEFINE6(prov, mod, func, name, arg0, arg1, arg2,      \
-    arg3, arg4, arg5)
-#define	SDT_PROBE_DEFINE7(prov, mod, func, name, arg0, arg1, arg2,      \
-    arg3, arg4, arg5, arg6)
-
-#define	SDT_PROBE0(prov, mod, func, name)
-#define	SDT_PROBE1(prov, mod, func, name, arg0)
-#define	SDT_PROBE2(prov, mod, func, name, arg0, arg1)
-#define	SDT_PROBE3(prov, mod, func, name, arg0, arg1, arg2)
-#define	SDT_PROBE4(prov, mod, func, name, arg0, arg1, arg2, arg3)
-#define	SDT_PROBE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
-#define	SDT_PROBE6(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5)
-#define	SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5,  \
-    arg6)
-
-#define	SDT_PROBE_DEFINE0_XLATE(prov, mod, func, name)
-#define	SDT_PROBE_DEFINE1_XLATE(prov, mod, func, name, arg0, xarg0)
-#define	SDT_PROBE_DEFINE2_XLATE(prov, mod, func, name, arg0, xarg0,     \
-    arg1, xarg1)
-#define	SDT_PROBE_DEFINE3_XLATE(prov, mod, func, name, arg0, xarg0,     \
-    arg1, xarg1, arg2, xarg2)
-#define SDT_PROBE_DEFINE4_XLATE(prov, mod, func, name, arg0, xarg0,     \
-    arg1, xarg1, arg2, xarg2, arg3, xarg3)
-#define	SDT_PROBE_DEFINE5_XLATE(prov, mod, func, name, arg0, xarg0,     \
-    arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4)
-#define	SDT_PROBE_DEFINE6_XLATE(prov, mod, func, name, arg0, xarg0,     \
-    arg1,  xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5)
-#define	SDT_PROBE_DEFINE7_XLATE(prov, mod, func, name, arg0, xarg0,     \
-    arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5, arg6,     \
-    xarg6)
-
-#define	DTRACE_PROBE(name)
-#define	DTRACE_PROBE1(name, type0, arg0)
-#define	DTRACE_PROBE2(name, type0, arg0, type1, arg1)
-#define	DTRACE_PROBE3(name, type0, arg0, type1, arg1, type2, arg2)
-#define	DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3)
-#define	DTRACE_PROBE5(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3,\
-    type4, arg4)
-
-#else
-
-SET_DECLARE(sdt_providers_set, struct sdt_provider);
-SET_DECLARE(sdt_probes_set, struct sdt_probe);
-SET_DECLARE(sdt_argtypes_set, struct sdt_argtype);
-
-#define SDT_PROVIDER_DEFINE(prov)						\
-	struct sdt_provider sdt_provider_##prov[1] = {				\
-		{ #prov, { NULL, NULL }, 0, 0 }					\
-	};									\
-	DATA_SET(sdt_providers_set, sdt_provider_##prov);
-
-#define SDT_PROVIDER_DECLARE(prov)						\
-	extern struct sdt_provider sdt_provider_##prov[1]
-
-#define SDT_PROBE_DEFINE(prov, mod, func, name)					\
-	struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] = {		\
-		{ sizeof(struct sdt_probe), sdt_provider_##prov,		\
-		    { NULL, NULL }, { NULL, NULL }, #mod, #func, #name, 0, 0,	\
-		    NULL }							\
-	};									\
-	DATA_SET(sdt_probes_set, sdt_##prov##_##mod##_##func##_##name);
-
-#define SDT_PROBE_DECLARE(prov, mod, func, name)				\
-	extern struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1]
-
-#define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)	do {	\
-	if (sdt_##prov##_##mod##_##func##_##name->id)				\
-		(*sdt_probe_func)(sdt_##prov##_##mod##_##func##_##name->id,	\
-		    (uintptr_t) arg0, (uintptr_t) arg1, (uintptr_t) arg2,	\
-		    (uintptr_t) arg3, (uintptr_t) arg4);			\
-} while (0)
-
-#define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype)		\
-	static struct sdt_argtype sdta_##prov##_##mod##_##func##_##name##num[1]	\
-	    = { { num, type, xtype, { NULL, NULL },				\
-	    sdt_##prov##_##mod##_##func##_##name }				\
-	};									\
-	DATA_SET(sdt_argtypes_set, sdta_##prov##_##mod##_##func##_##name##num);
-
-#define	SDT_PROBE_DEFINE0(prov, mod, func, name)			\
-	SDT_PROBE_DEFINE(prov, mod, func, name)
-
-#define	SDT_PROBE_DEFINE1(prov, mod, func, name, arg0)			\
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL)
-
-#define	SDT_PROBE_DEFINE2(prov, mod, func, name, arg0, arg1)		\
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL)
-
-#define	SDT_PROBE_DEFINE3(prov, mod, func, name, arg0, arg1, arg2)\
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL)
-
-#define	SDT_PROBE_DEFINE4(prov, mod, func, name, arg0, arg1, arg2, arg3) \
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, NULL)
-
-#define	SDT_PROBE_DEFINE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, NULL)
-
-#define	SDT_PROBE_DEFINE6(prov, mod, func, name, arg0, arg1, arg2, arg3,\
-    arg4, arg5) \
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 5, arg5, NULL)
-
-#define	SDT_PROBE_DEFINE7(prov, mod, func, name, arg0, arg1, arg2, arg3,\
-    arg4, arg5, arg6) \
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 5, arg5, NULL);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 6, arg6, NULL)
-
-#define	SDT_PROBE_DEFINE0_XLATE(prov, mod, func, name)		\
-	SDT_PROBE_DEFINE(prov, mod, func, name)
-
-#define	SDT_PROBE_DEFINE1_XLATE(prov, mod, func, name, arg0, xarg0) \
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0)
-
-#define	SDT_PROBE_DEFINE2_XLATE(prov, mod, func, name, arg0, xarg0, \
-    arg1,  xarg1)							\
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1)
-
-#define	SDT_PROBE_DEFINE3_XLATE(prov, mod, func, name, arg0, xarg0, \
-    arg1, xarg1, arg2, xarg2)						\
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2)
-
-#define	SDT_PROBE_DEFINE4_XLATE(prov, mod, func, name, arg0, xarg0, \
-    arg1, xarg1, arg2, xarg2, arg3, xarg3)				\
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, xarg3)
-
-#define	SDT_PROBE_DEFINE5_XLATE(prov, mod, func, name, arg0, xarg0, \
-    arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4)			\
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, xarg3);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, xarg4)
-
-#define	SDT_PROBE_DEFINE6_XLATE(prov, mod, func, name, arg0, xarg0, \
-    arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5)	\
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, xarg3);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, xarg4);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 5, arg5, xarg5)
-
-#define	SDT_PROBE_DEFINE7_XLATE(prov, mod, func, name, arg0, xarg0, \
-    arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5, arg6, \
-    xarg6)								\
-	SDT_PROBE_DEFINE(prov, mod, func, name);			\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, xarg3);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, xarg4);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 5, arg5, xarg5);	\
-	SDT_PROBE_ARGTYPE(prov, mod, func, name, 6, arg6, xarg6)
-
-#define	SDT_PROBE0(prov, mod, func, name)				\
-	SDT_PROBE(prov, mod, func, name, 0, 0, 0, 0, 0)
-#define	SDT_PROBE1(prov, mod, func, name, arg0)				\
-	SDT_PROBE(prov, mod, func, name, arg0, 0, 0, 0, 0)
-#define	SDT_PROBE2(prov, mod, func, name, arg0, arg1)			\
-	SDT_PROBE(prov, mod, func, name, arg0, arg1, 0, 0, 0)
-#define	SDT_PROBE3(prov, mod, func, name, arg0, arg1, arg2)		\
-	SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2,  0, 0)
-#define	SDT_PROBE4(prov, mod, func, name, arg0, arg1, arg2, arg3)	\
-	SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, 0)
-#define	SDT_PROBE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \
-	SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
-#define	SDT_PROBE6(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5)  \
-	do {								       \
-		if (sdt_##prov##_##mod##_##func##_##name->id)		       \
-			(*(void (*)(uint32_t, uintptr_t, uintptr_t, uintptr_t, \
-			    uintptr_t, uintptr_t, uintptr_t))sdt_probe_func)(  \
-			    sdt_##prov##_##mod##_##func##_##name->id,	       \
-			    (uintptr_t)arg0, (uintptr_t)arg1, (uintptr_t)arg2, \
-			    (uintptr_t)arg3, (uintptr_t)arg4, (uintptr_t)arg5);\
-	} while (0)
-#define	SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5,  \
-    arg6)								       \
-	do {								       \
-		if (sdt_##prov##_##mod##_##func##_##name->id)		       \
-			(*(void (*)(uint32_t, uintptr_t, uintptr_t, uintptr_t, \
-			    uintptr_t, uintptr_t, uintptr_t, uintptr_t))       \
-			    sdt_probe_func)(				       \
-			    sdt_##prov##_##mod##_##func##_##name->id,	       \
-			    (uintptr_t)arg0, (uintptr_t)arg1, (uintptr_t)arg2, \
-			    (uintptr_t)arg3, (uintptr_t)arg4, (uintptr_t)arg5, \
-			    (uintptr_t)arg6);				       \
-	} while (0)
-
-#define	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, arg4)	do { \
-	static SDT_PROBE_DEFINE(sdt, , , name);				     \
-	SDT_PROBE(sdt, , , name, arg0, arg1, arg2, arg3, arg4);
-#define DTRACE_PROBE_IMPL_END	} while (0)
-
-#define DTRACE_PROBE(name)						\
-	DTRACE_PROBE_IMPL_START(name, 0, 0, 0, 0, 0)			\
-	DTRACE_PROBE_IMPL_END
-
-#define DTRACE_PROBE1(name, type0, arg0)				\
-	DTRACE_PROBE_IMPL_START(name, arg0, 0, 0, 0, 0) 		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
-	DTRACE_PROBE_IMPL_END
-
-#define DTRACE_PROBE2(name, type0, arg0, type1, arg1)			\
-	DTRACE_PROBE_IMPL_START(name, arg0, arg1, 0, 0, 0) 		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
-	DTRACE_PROBE_IMPL_END
-
-#define DTRACE_PROBE3(name, type0, arg0, type1, arg1, type2, arg2)	\
-	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, 0, 0)	 	\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		\
-	DTRACE_PROBE_IMPL_END
-
-#define DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3)	\
-	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, 0) 	\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 3, #type3, NULL);		\
-	DTRACE_PROBE_IMPL_END
-
-#define DTRACE_PROBE5(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3,	\
-    type4, arg4)								\
-	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, arg4) 	\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 3, #type3, NULL);		\
-	SDT_PROBE_ARGTYPE(sdt, , , name, 4, #type4, NULL);		\
-	DTRACE_PROBE_IMPL_END
-
-#endif /* KDTRACE_HOOKS */
-
-/*
- * This type definition must match that of dtrace_probe. It is defined this
- * way to avoid having to rely on CDDL code.
- */
-typedef	void (*sdt_probe_func_t)(uint32_t, uintptr_t arg0, uintptr_t arg1,
-    uintptr_t arg2, uintptr_t arg3, uintptr_t arg4);
-
-/*
- * The 'sdt' provider will set it to dtrace_probe when it loads.
- */
-extern sdt_probe_func_t	sdt_probe_func;
-
-struct sdt_probe;
-struct sdt_provider;
-struct linker_file;
-
-struct sdt_argtype {
-	int		ndx;		/* Argument index. */
-	const char	*type;		/* Argument type string. */
-	const char	*xtype;		/* Translated argument type. */
-	TAILQ_ENTRY(sdt_argtype)
-			argtype_entry;	/* Argument type list entry. */
-	struct sdt_probe *probe;	/* Ptr to the probe structure. */
-};
-
-struct sdt_probe {
-	int		version;	/* Set to sizeof(struct sdt_probe). */
-	struct sdt_provider *prov;	/* Ptr to the provider structure. */
-	TAILQ_ENTRY(sdt_probe)
-			probe_entry;	/* SDT probe list entry. */
-	TAILQ_HEAD(argtype_list_head, sdt_argtype) argtype_list;
-	const char	*mod;
-	const char	*func;
-	const char	*name;
-	id_t		id;		/* DTrace probe ID. */
-	int		n_args;		/* Number of arguments. */
-	struct linker_file *sdtp_lf;	/* Module in which we're defined. */
-};
-
-struct sdt_provider {
-	char *name;			/* Provider name. */
-	TAILQ_ENTRY(sdt_provider)
-			prov_entry;	/* SDT provider list entry. */
-	uintptr_t	id;		/* DTrace provider ID. */
-	int		sdt_refs;	/* Number of module references. */
-};
-
-void sdt_probe_stub(uint32_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t,
-    uintptr_t);
-
-SDT_PROVIDER_DECLARE(sdt);
-
-#endif /* _KERNEL */
-
-#endif /* _SYS_SDT_H */
diff --git a/include.new/sys/select.h b/include.new/sys/select.h
deleted file mode 100644
index e3c11b7..0000000
--- a/include.new/sys/select.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/sys/select.h 154090 2006-01-06 22:12:46Z marcel $
- */
-
-#ifndef _SYS_SELECT_H_
-#define	_SYS_SELECT_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#include <sys/_sigset.h>
-#include <sys/_timeval.h>
-#include <sys/timespec.h>
-
-typedef	unsigned long	__fd_mask;
-#if __BSD_VISIBLE
-typedef	__fd_mask	fd_mask;
-#endif
-
-#ifndef _SIGSET_T_DECLARED
-#define	_SIGSET_T_DECLARED
-typedef	__sigset_t	sigset_t;
-#endif
-
-/*
- * Select uses bit masks of file descriptors in longs.  These macros
- * manipulate such bit fields (the filesystem macros use chars).
- * FD_SETSIZE may be defined by the user, but the default here should
- * be enough for most uses.
- */
-#ifndef	FD_SETSIZE
-#define	FD_SETSIZE	1024U
-#endif
-
-#define	_NFDBITS	(sizeof(__fd_mask) * 8)	/* bits per mask */
-#if __BSD_VISIBLE
-#define	NFDBITS		_NFDBITS
-#endif
-
-#ifndef _howmany
-#define	_howmany(x, y)	(((x) + ((y) - 1)) / (y))
-#endif
-
-typedef	struct fd_set {
-	__fd_mask	__fds_bits[_howmany(FD_SETSIZE, _NFDBITS)];
-} fd_set;
-#if __BSD_VISIBLE
-#define	fds_bits	__fds_bits
-#endif
-
-#define	__fdset_mask(n)	((__fd_mask)1 << ((n) % _NFDBITS))
-#define	FD_CLR(n, p)	((p)->__fds_bits[(n)/_NFDBITS] &= ~__fdset_mask(n))
-#if __BSD_VISIBLE
-#define	FD_COPY(f, t)	(void)(*(t) = *(f))
-#endif
-#define	FD_ISSET(n, p)	(((p)->__fds_bits[(n)/_NFDBITS] & __fdset_mask(n)) != 0)
-#define	FD_SET(n, p)	((p)->__fds_bits[(n)/_NFDBITS] |= __fdset_mask(n))
-#define	FD_ZERO(p) do {					\
-	fd_set *_p;					\
-	__size_t _n;					\
-							\
-	_p = (p);					\
-	_n = _howmany(FD_SETSIZE, _NFDBITS);		\
-	while (_n > 0)					\
-		_p->__fds_bits[--_n] = 0;		\
-} while (0)
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-int pselect(int, fd_set *__restrict, fd_set *__restrict, fd_set *__restrict,
-	const struct timespec *__restrict, const sigset_t *__restrict);
-#ifndef _SELECT_DECLARED
-#define	_SELECT_DECLARED
-/* XXX missing restrict type-qualifier */
-int	select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-#endif
-__END_DECLS
-#endif /* !_KERNEL */
-
-#endif /* _SYS_SELECT_H_ */
diff --git a/include.new/sys/selinfo.h b/include.new/sys/selinfo.h
deleted file mode 100644
index 31a5f79..0000000
--- a/include.new/sys/selinfo.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- *	@(#)select.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: releng/10.2/sys/sys/selinfo.h 225177 2011-08-25 15:51:54Z attilio $
- */
-
-#ifndef _SYS_SELINFO_H_
-#define	_SYS_SELINFO_H_
-
-#include <sys/event.h>		/* for struct klist */
-
-struct selfd;
-TAILQ_HEAD(selfdlist, selfd);
-
-/*
- * Used to maintain information about processes that wish to be
- * notified when I/O becomes possible.
- */
-struct selinfo {
-	struct selfdlist	si_tdlist;	/* List of sleeping threads. */
-	struct knlist		si_note;	/* kernel note list */
-	struct mtx		*si_mtx;	/* Lock for tdlist. */
-};
-
-#define	SEL_WAITING(si)		(!TAILQ_EMPTY(&(si)->si_tdlist))
-
-#ifdef _KERNEL
-void	seldrain(struct selinfo *sip);
-void	selrecord(struct thread *selector, struct selinfo *sip);
-void	selwakeup(struct selinfo *sip);
-void	selwakeuppri(struct selinfo *sip, int pri);
-void	seltdfini(struct thread *td);
-#endif
-
-#endif /* !_SYS_SELINFO_H_ */
diff --git a/include.new/sys/sem.h b/include.new/sys/sem.h
deleted file mode 100644
index f46f444..0000000
--- a/include.new/sys/sem.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/sys/sem.h 224016 2011-07-14 14:18:14Z bz $ */
-/*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
-
-/*
- * SVID compatible sem.h file
- *
- * Author:  Daniel Boulet
- */
-
-#ifndef _SYS_SEM_H_
-#define _SYS_SEM_H_
-
-#include <sys/ipc.h>
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
-    defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
-struct semid_ds_old {
-	struct ipc_perm_old sem_perm;	/* operation permission struct */
-	struct sem	*sem_base;	/* pointer to first semaphore in set */
-	unsigned short	sem_nsems;	/* number of sems in set */
-	time_t		sem_otime;	/* last operation time */
-	long		sem_pad1;	/* SVABI/386 says I need this here */
-	time_t		sem_ctime;	/* last change time */
-    					/* Times measured in secs since */
-    					/* 00:00:00 GMT, Jan. 1, 1970 */
-	long		sem_pad2;	/* SVABI/386 says I need this here */
-	long		sem_pad3[4];	/* SVABI/386 says I need this here */
-};
-#endif
-
-struct semid_ds {
-	struct ipc_perm	sem_perm;	/* operation permission struct */
-	struct sem	*sem_base;	/* pointer to first semaphore in set */
-	unsigned short	sem_nsems;	/* number of sems in set */
-	time_t		sem_otime;	/* last operation time */
-	time_t		sem_ctime;	/* last change time */
-    					/* Times measured in secs since */
-    					/* 00:00:00 GMT, Jan. 1, 1970 */
-};
-
-/*
- * semop's sops parameter structure
- */
-struct sembuf {
-	unsigned short	sem_num;	/* semaphore # */
-	short		sem_op;		/* semaphore operation */
-	short		sem_flg;	/* operation flags */
-};
-#define SEM_UNDO	010000
-
-#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
-    defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) || \
-    defined(_WANT_SEMUN_OLD)
-union semun_old {
-	int		val;		/* value for SETVAL */
-	struct		semid_ds_old *buf; /* buffer for IPC_STAT & IPC_SET */
-	unsigned short	*array;		/* array for GETALL & SETALL */
-};
-#endif
-
-/*
- * semctl's arg parameter structure
- */
-union semun {
-	int		val;		/* value for SETVAL */
-	struct		semid_ds *buf;	/* buffer for IPC_STAT & IPC_SET */
-	unsigned short	*array;		/* array for GETALL & SETALL */
-};
-
-/*
- * commands for semctl
- */
-#define GETNCNT	3	/* Return the value of semncnt {READ} */
-#define GETPID	4	/* Return the value of sempid {READ} */
-#define GETVAL	5	/* Return the value of semval {READ} */
-#define GETALL	6	/* Return semvals into arg.array {READ} */
-#define GETZCNT	7	/* Return the value of semzcnt {READ} */
-#define SETVAL	8	/* Set the value of semval to arg.val {ALTER} */
-#define SETALL	9	/* Set semvals from arg.array {ALTER} */
-#define SEM_STAT 10	/* Like IPC_STAT but treats semid as sema-index */
-#define SEM_INFO 11	/* Like IPC_INFO but treats semid as sema-index */
-
-/*
- * Permissions
- */
-#define SEM_A		IPC_W	/* alter permission */
-#define SEM_R		IPC_R	/* read permission */
-
-#ifdef _KERNEL
-
-/*
- * semaphore info struct
- */
-struct seminfo {
-	int	semmni,		/* # of semaphore identifiers */
-		semmns,		/* # of semaphores in system */
-		semmnu,		/* # of undo structures in system */
-		semmsl,		/* max # of semaphores per id */
-		semopm,		/* max # of operations per semop call */
-		semume,		/* max # of undo entries per process */
-		semusz,		/* size in bytes of undo structure */
-		semvmx,		/* semaphore maximum value */
-		semaem;		/* adjust on exit max value */
-};
-extern struct seminfo	seminfo;
-
-/*
- * Kernel wrapper for the user-level structure
- */
-struct semid_kernel {
-	struct	semid_ds u;
-	struct	label *label;	/* MAC framework label */
-	struct	ucred *cred;	/* creator's credentials */
-};
-
-/* internal "mode" bits */
-#define	SEM_ALLOC	01000	/* semaphore is allocated */
-#define	SEM_DEST	02000	/* semaphore will be destroyed on last detach */
-
-/*
- * Process sem_undo vectors at proc exit.
- */
-void	semexit(struct proc *p);
-
-#else /* ! _KERNEL */
-
-__BEGIN_DECLS
-#if __BSD_VISIBLE
-int semsys(int, ...);
-#endif
-int semctl(int, int, int, ...);
-int semget(key_t, int, int);
-int semop(int, struct sembuf *, size_t);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_SEM_H_ */
diff --git a/include.new/sys/sema.h b/include.new/sys/sema.h
deleted file mode 100644
index d700bae..0000000
--- a/include.new/sys/sema.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (C) 2001 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/sys/sys/sema.h 139825 2005-01-07 02:29:27Z imp $
- */
-
-#ifndef	_SYS_SEMA_H_
-#define	_SYS_SEMA_H_
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/condvar.h>
-
-struct sema {
-	struct mtx	sema_mtx;	/* General protection lock. */
-	struct cv	sema_cv;	/* Waiters. */
-	int		sema_waiters;	/* Number of waiters. */
-	int		sema_value;	/* Semaphore value. */
-};
-
-#ifdef _KERNEL
-void	sema_init(struct sema *sema, int value, const char *description);
-void	sema_destroy(struct sema *sema);
-void	_sema_post(struct sema *sema, const char *file, int line);
-void	_sema_wait(struct sema *sema, const char *file, int line);
-int	_sema_timedwait(struct sema *sema, int timo, const char *file, int
-    line);
-int	_sema_trywait(struct sema *sema, const char *file, int line);
-int	sema_value(struct sema *sema);
-
-#define	sema_post(sema)		_sema_post((sema), LOCK_FILE, LOCK_LINE)
-#define	sema_wait(sema)		_sema_wait((sema), LOCK_FILE, LOCK_LINE)
-#define	sema_timedwait(sema, timo)					\
-	_sema_timedwait((sema), (timo), LOCK_FILE, LOCK_LINE)
-#define	sema_trywait(sema)	_sema_trywait((sema), LOCK_FILE, LOCK_LINE)
-
-#endif	/* _KERNEL */
-#endif	/* _SYS_SEMA_H_ */
diff --git a/include.new/sys/seq.h b/include.new/sys/seq.h
deleted file mode 100644
index 5043dfd..0000000
--- a/include.new/sys/seq.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 2014 Mateusz Guzik <mjg@FreeBSD.org>
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/seq.h 273109 2014-10-14 21:19:23Z mjg $
- */
-
-#ifndef _SYS_SEQ_H_
-#define _SYS_SEQ_H_
-
-#ifdef _KERNEL
-#include <sys/systm.h>
-#endif
-#include <sys/types.h>
-
-/*
- * seq_t may be included in structs visible to userspace
- */
-typedef uint32_t seq_t;
-
-#ifdef _KERNEL
-
-/*
- * Typical usage:
- *
- * writers:
- * 	lock_exclusive(&obj->lock);
- * 	seq_write_begin(&obj->seq);
- * 	.....
- * 	seq_write_end(&obj->seq);
- * 	unlock_exclusive(&obj->unlock);
- *
- * readers:
- * 	obj_t lobj;
- * 	seq_t seq;
- *
- * 	for (;;) {
- * 		seq = seq_read(&gobj->seq);
- * 		lobj = gobj;
- * 		if (seq_consistent(&gobj->seq, seq))
- * 			break;
- * 		cpu_spinwait();
- * 	}
- * 	foo(lobj);
- */		
-
-/* A hack to get MPASS macro */
-#include <sys/lock.h>
-
-#include <machine/cpu.h>
-
-/*
- * This is a temporary hack until memory barriers are cleaned up.
- *
- * atomic_load_acq_int at least on amd64 provides a full memory barrier,
- * in a way which affects perforance.
- *
- * Hack below covers all architectures and avoids most of the penalty at least
- * on amd64.
- */
-static __inline int
-atomic_load_acq_rmb_int(volatile u_int *p)
-{
-	volatile u_int v;
-
-	v = *p;
-	atomic_load_acq_int(&v);
-	return (v);
-}
-
-static __inline bool
-seq_in_modify(seq_t seqp)
-{
-
-	return (seqp & 1);
-}
-
-static __inline void
-seq_write_begin(seq_t *seqp)
-{
-
-	MPASS(!seq_in_modify(*seqp));
-	atomic_add_acq_int(seqp, 1);
-}
-
-static __inline void
-seq_write_end(seq_t *seqp)
-{
-
-	atomic_add_rel_int(seqp, 1);
-	MPASS(!seq_in_modify(*seqp));
-}
-
-static __inline seq_t
-seq_read(seq_t *seqp)
-{
-	seq_t ret;
-
-	for (;;) {
-		ret = atomic_load_acq_rmb_int(seqp);
-		if (seq_in_modify(ret)) {
-			cpu_spinwait();
-			continue;
-		}
-		break;
-	}
-
-	return (ret);
-}
-
-static __inline seq_t
-seq_consistent(seq_t *seqp, seq_t oldseq)
-{
-
-	return (atomic_load_acq_rmb_int(seqp) == oldseq);
-}
-
-static __inline seq_t
-seq_consistent_nomb(seq_t *seqp, seq_t oldseq)
-{
-
-	return (*seqp == oldseq);
-}
-
-#endif	/* _KERNEL */
-#endif	/* _SYS_SEQ_H_ */
diff --git a/include.new/sys/serial.h b/include.new/sys/serial.h
deleted file mode 100644
index b01dda9..0000000
--- a/include.new/sys/serial.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 2004 Poul-Henning Kamp
- * 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.
- *
- * 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.
- *
- * This file contains definitions which pertain to serial ports as such,
- * (both async and sync), but which do not necessarily have anything to
- * do with tty processing.
- *
- * $FreeBSD: releng/10.2/sys/sys/serial.h 157298 2006-03-30 17:24:42Z marcel $
- */
-
-#ifndef _SYS_SERIAL_H_
-#define	_SYS_SERIAL_H_
-
-
-/*
- * Indentification of modem control signals.  These definitions match
- * the TIOCMGET definitions in <sys/ttycom.h> shifted a bit down, and
- * that identity is enforced with CTASSERT at the bottom of kern/tty.c
- * Both the modem bits and delta bits must fit in 16 bit.
- */
-#define	SER_DTR		0x0001		/* data terminal ready */
-#define	SER_RTS		0x0002		/* request to send */
-#define	SER_STX		0x0004		/* secondary transmit */
-#define	SER_SRX		0x0008		/* secondary receive */
-#define	SER_CTS		0x0010		/* clear to send */
-#define	SER_DCD		0x0020		/* data carrier detect */
-#define	SER_RI	 	0x0040		/* ring indicate */
-#define	SER_DSR		0x0080		/* data set ready */
-
-#define	SER_MASK_STATE	0x00ff
-
-/* Delta bits, used to indicate which signals should/was affected */
-#define	SER_DELTA(x)	((x) << 8)
-
-#define	SER_DDTR	SER_DELTA(SER_DTR)
-#define	SER_DRTS	SER_DELTA(SER_RTS)
-#define	SER_DSTX	SER_DELTA(SER_STX)
-#define	SER_DSRX	SER_DELTA(SER_SRX)
-#define	SER_DCTS	SER_DELTA(SER_CTS)
-#define	SER_DDCD	SER_DELTA(SER_DCD)
-#define	SER_DRI		SER_DELTA(SER_RI)
-#define	SER_DDSR	SER_DELTA(SER_DSR)
-
-#define	SER_MASK_DELTA	SER_DELTA(SER_MASK_STATE)
-
-#ifdef _KERNEL
-/*
- * Specification of interrupt sources typical for serial ports. These are
- * useful when some umbrella driver like scc(4) has enough knowledge of
- * the hardware to obtain the set of pending interrupts but does not itself
- * handle the interrupt. Each interrupt source can be given an interrupt
- * resource for which inferior drivers can install handlers. The lower 16
- * bits are kept free for the signals above.
- */
-#define	SER_INT_OVERRUN	0x010000
-#define	SER_INT_BREAK	0x020000
-#define	SER_INT_RXREADY	0x040000
-#define	SER_INT_SIGCHG	0x080000
-#define	SER_INT_TXIDLE	0x100000
-
-#define	SER_INT_MASK	0xff0000
-#define	SER_INT_SIGMASK	(SER_MASK_DELTA | SER_MASK_STATE)
-
-#ifndef LOCORE
-typedef int serdev_intr_t(void*);
-#endif
-
-#endif	/* _KERNEL */
-
-#endif /* !_SYS_SERIAL_H_ */
diff --git a/include.new/sys/sf_buf.h b/include.new/sys/sf_buf.h
deleted file mode 100644
index ed2e981..0000000
--- a/include.new/sys/sf_buf.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 2003-2004 Alan L. Cox <alc@cs.rice.edu>
- * 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.
- *
- * 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: releng/10.2/sys/sys/sf_buf.h 255786 2013-09-22 13:36:52Z glebius $
- */
-
-#ifndef _SYS_SF_BUF_H_
-#define _SYS_SF_BUF_H_
-
-/*
- * Options to sf_buf_alloc() are specified through its flags argument.  This
- * argument's value should be the result of a bitwise or'ing of one or more
- * of the following values.
- */
-#define	SFB_CATCH	1		/* Check signals if the allocation
-					   sleeps. */
-#define	SFB_CPUPRIVATE	2		/* Create a CPU private mapping. */
-#define	SFB_DEFAULT	0
-#define	SFB_NOWAIT	4		/* Return NULL if all bufs are used. */
-
-struct vm_page;
-
-struct sfstat {				/* sendfile statistics */
-	uint64_t	sf_iocnt;	/* times sendfile had to do disk I/O */
-	uint64_t	sf_allocfail;	/* times sfbuf allocation failed */
-	uint64_t	sf_allocwait;	/* times sfbuf allocation had to wait */
-};
-
-#ifdef _KERNEL
-#include <machine/sf_buf.h>
-#include <sys/systm.h>
-#include <sys/counter.h>
-struct mbuf;	/* for sf_buf_mext() */
-
-extern counter_u64_t sfstat[sizeof(struct sfstat) / sizeof(uint64_t)];
-#define	SFSTAT_ADD(name, val)	\
-    counter_u64_add(sfstat[offsetof(struct sfstat, name) / sizeof(uint64_t)],\
-	(val))
-#define	SFSTAT_INC(name)	SFSTAT_ADD(name, 1)
-#endif /* _KERNEL */
-
-int	sf_buf_mext(struct mbuf *mb, void *addr, void *args);
-
-#endif /* !_SYS_SF_BUF_H_ */
diff --git a/include.new/sys/sglist.h b/include.new/sys/sglist.h
deleted file mode 100644
index 8bf27d8..0000000
--- a/include.new/sys/sglist.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 2008 Yahoo!, Inc.
- * All rights reserved.
- * Written by: John Baldwin <jhb@FreeBSD.org>
- *
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may 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: releng/10.2/sys/sys/sglist.h 260856 2014-01-18 18:36:41Z bryanv $
- */
-
-/*
- * A scatter/gather list describes a group of physical address ranges.
- * Each physical address range consists of a starting address and a
- * length.
- */
-
-#ifndef __SGLIST_H__
-#define	__SGLIST_H__
-
-#include <sys/refcount.h>
-
-struct sglist_seg {
-	vm_paddr_t	ss_paddr;
-	size_t		ss_len;
-};
-
-struct sglist {
-	struct sglist_seg *sg_segs;
-	int		sg_refs;
-	u_short		sg_nseg;
-	u_short		sg_maxseg;
-};
-
-struct bio;
-struct mbuf;
-struct uio;
-
-static __inline void
-sglist_init(struct sglist *sg, u_short maxsegs, struct sglist_seg *segs)
-{
-
-	sg->sg_segs = segs;
-	sg->sg_nseg = 0;
-	sg->sg_maxseg = maxsegs;
-	refcount_init(&sg->sg_refs, 1);
-}
-
-static __inline void
-sglist_reset(struct sglist *sg)
-{
-
-	sg->sg_nseg = 0;
-}
-
-static __inline struct sglist *
-sglist_hold(struct sglist *sg)
-{
-
-	refcount_acquire(&sg->sg_refs);
-	return (sg);
-}
-
-struct sglist *sglist_alloc(int nsegs, int mflags);
-int	sglist_append(struct sglist *sg, void *buf, size_t len);
-int	sglist_append_bio(struct sglist *sg, struct bio *bp);
-int	sglist_append_mbuf(struct sglist *sg, struct mbuf *m0);
-int	sglist_append_phys(struct sglist *sg, vm_paddr_t paddr,
-	    size_t len);
-int	sglist_append_uio(struct sglist *sg, struct uio *uio);
-int	sglist_append_user(struct sglist *sg, void *buf, size_t len,
-	    struct thread *td);
-struct sglist *sglist_build(void *buf, size_t len, int mflags);
-struct sglist *sglist_clone(struct sglist *sg, int mflags);
-int	sglist_consume_uio(struct sglist *sg, struct uio *uio, size_t resid);
-int	sglist_count(void *buf, size_t len);
-void	sglist_free(struct sglist *sg);
-int	sglist_join(struct sglist *first, struct sglist *second);
-size_t	sglist_length(struct sglist *sg);
-int	sglist_slice(struct sglist *original, struct sglist **slice,
-	    size_t offset, size_t length, int mflags);
-int	sglist_split(struct sglist *original, struct sglist **head,
-	    size_t length, int mflags);
-
-#endif	/* !__SGLIST_H__ */
diff --git a/include.new/sys/shm.h b/include.new/sys/shm.h
deleted file mode 100644
index 46a7cd0..0000000
--- a/include.new/sys/shm.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/sys/shm.h 220388 2011-04-06 16:59:54Z trasz $ */
-/*	$NetBSD: shm.h,v 1.15 1994/06/29 06:45:17 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1994 Adam Glass
- * 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 Adam Glass.
- * 4. 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 ``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 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.
- */
-
-/*
- * As defined+described in "X/Open System Interfaces and Headers"
- *                         Issue 4, p. XXX
- */
-
-#ifndef _SYS_SHM_H_
-#define _SYS_SHM_H_
-
-#include <sys/cdefs.h>
-#include <sys/ipc.h>
-#include <sys/_types.h>
-
-#define SHM_RDONLY  010000  /* Attach read-only (else read-write) */
-#define SHM_RND     020000  /* Round attach address to SHMLBA */
-#define SHMLBA      PAGE_SIZE /* Segment low boundary address multiple */
-
-/* "official" access mode definitions; somewhat braindead since you have
-   to specify (SHM_* >> 3) for group and (SHM_* >> 6) for world permissions */
-#define SHM_R       (IPC_R)
-#define SHM_W       (IPC_W)
-
-/* predefine tbd *LOCK shmctl commands */
-#define	SHM_LOCK	11
-#define	SHM_UNLOCK	12
-
-/* ipcs shmctl commands for Linux compatability */
-#define	SHM_STAT	13
-#define	SHM_INFO	14
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
-    defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
-struct shmid_ds_old {
-	struct ipc_perm_old shm_perm;	/* operation permission structure */
-	int             shm_segsz;	/* size of segment in bytes */
-	pid_t           shm_lpid;   /* process ID of last shared memory op */
-	pid_t           shm_cpid;	/* process ID of creator */
-	short		shm_nattch;	/* number of current attaches */
-	time_t          shm_atime;	/* time of last shmat() */
-	time_t          shm_dtime;	/* time of last shmdt() */
-	time_t          shm_ctime;	/* time of last change by shmctl() */
-	void           *shm_internal;   /* sysv stupidity */
-};
-#endif
-
-struct shmid_ds {
-	struct ipc_perm shm_perm;	/* operation permission structure */
-	size_t          shm_segsz;	/* size of segment in bytes */
-	pid_t           shm_lpid;   /* process ID of last shared memory op */
-	pid_t           shm_cpid;	/* process ID of creator */
-	int		shm_nattch;	/* number of current attaches */
-	time_t          shm_atime;	/* time of last shmat() */
-	time_t          shm_dtime;	/* time of last shmdt() */
-	time_t          shm_ctime;	/* time of last change by shmctl() */
-};
-
-#ifdef _KERNEL
-#include <vm/vm.h>
-
-/*
- * System 5 style catch-all structure for shared memory constants that
- * might be of interest to user programs.  Do we really want/need this?
- */
-struct shminfo {
-	u_long	shmmax;		/* max shared memory segment size (bytes) */
-	u_long	shmmin;		/* max shared memory segment size (bytes) */
-	u_long	shmmni;		/* max number of shared memory identifiers */
-	u_long	shmseg;		/* max shared memory segments per process */
-	u_long	shmall;		/* max amount of shared memory (pages) */
-};
-
-/* 
- * Add a kernel wrapper to the shmid_ds struct so that private info (like the
- * MAC label) can be added to it, without changing the user interface.
- */
-struct shmid_kernel {
-	struct shmid_ds u;
-	vm_object_t object;
-	struct label *label;	/* MAC label */
-	struct ucred *cred;	/* creator's credendials */
-};
-
-extern struct shminfo	shminfo;
-
-struct shm_info {
-	int used_ids;
-	unsigned long shm_tot;
-	unsigned long shm_rss;
-	unsigned long shm_swp;
-	unsigned long swap_attempts;
-	unsigned long swap_successes;
-};
-
-struct thread;
-struct proc;
-struct vmspace;
-
-void	shmexit(struct vmspace *);
-void	shmfork(struct proc *, struct proc *);
-#else /* !_KERNEL */
-
-#include <sys/cdefs.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef __size_t        size_t;
-#define _SIZE_T_DECLARED
-#endif
-
-__BEGIN_DECLS
-#ifdef __BSD_VISIBLE
-int shmsys(int, ...);
-#endif
-void *shmat(int, const void *, int);
-int shmget(key_t, size_t, int);
-int shmctl(int, int, struct shmid_ds *);
-int shmdt(const void *);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_SHM_H_ */
diff --git a/include.new/sys/sigio.h b/include.new/sys/sigio.h
deleted file mode 100644
index a51f157..0000000
--- a/include.new/sys/sigio.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- *
- *	@(#)filedesc.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/sigio.h 139825 2005-01-07 02:29:27Z imp $
- */
-
-#ifndef _SYS_SIGIO_H_
-#define _SYS_SIGIO_H_
-
-/*
- * This structure holds the information needed to send a SIGIO or
- * a SIGURG signal to a process or process group when new data arrives
- * on a device or socket.  The structure is placed on an SLIST belonging
- * to the proc or pgrp so that the entire list may be revoked when the
- * process exits or the process group disappears.
- *
- * (c)	const
- * (pg)	locked by either the process or process group lock
- */
-struct sigio {
-	union {
-		struct	proc *siu_proc; /* (c)	process to receive SIGIO/SIGURG */
-		struct	pgrp *siu_pgrp; /* (c)	process group to receive ... */
-	} sio_u;
-	SLIST_ENTRY(sigio) sio_pgsigio;	/* (pg)	sigio's for process or group */
-	struct	sigio **sio_myref;	/* (c)	location of the pointer that holds
-					 * 	the reference to this structure */
-	struct	ucred *sio_ucred;	/* (c)	current credentials */
-	pid_t	sio_pgid;		/* (c)	pgid for signals */
-};
-#define	sio_proc	sio_u.siu_proc
-#define	sio_pgrp	sio_u.siu_pgrp
-
-SLIST_HEAD(sigiolst, sigio);
-
-pid_t	fgetown(struct sigio **sigiop);
-int	fsetown(pid_t pgid, struct sigio **sigiop);
-void	funsetown(struct sigio **sigiop);
-void	funsetownlst(struct sigiolst *sigiolst);
-
-#endif /* _SYS_SIGIO_H_ */
diff --git a/include.new/sys/signal.h b/include.new/sys/signal.h
deleted file mode 100644
index d121930..0000000
--- a/include.new/sys/signal.h
+++ /dev/null
@@ -1,444 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD: releng/10.2/sys/sys/signal.h 233519 2012-03-26 19:12:09Z rmh $
- */
-
-#ifndef _SYS_SIGNAL_H_
-#define	_SYS_SIGNAL_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/_sigset.h>
-
-#include <machine/_limits.h>	/* __MINSIGSTKSZ */
-#include <machine/signal.h>	/* sig_atomic_t; trap codes; sigcontext */
-
-/*
- * System defined signals.
- */
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGHUP		1	/* hangup */
-#endif
-#define	SIGINT		2	/* interrupt */
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGQUIT		3	/* quit */
-#endif
-#define	SIGILL		4	/* illegal instr. (not reset when caught) */
-#if __XSI_VISIBLE
-#define	SIGTRAP		5	/* trace trap (not reset when caught) */
-#endif
-#define	SIGABRT		6	/* abort() */
-#if __BSD_VISIBLE
-#define	SIGIOT		SIGABRT	/* compatibility */
-#define	SIGEMT		7	/* EMT instruction */
-#endif
-#define	SIGFPE		8	/* floating point exception */
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGKILL		9	/* kill (cannot be caught or ignored) */
-#endif
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-#define	SIGBUS		10	/* bus error */
-#endif
-#define	SIGSEGV		11	/* segmentation violation */
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-#define	SIGSYS		12	/* non-existent system call invoked */
-#endif
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGPIPE		13	/* write on a pipe with no one to read it */
-#define	SIGALRM		14	/* alarm clock */
-#endif
-#define	SIGTERM		15	/* software termination signal from kill */
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-#define	SIGURG		16	/* urgent condition on IO channel */
-#endif
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGSTOP		17	/* sendable stop signal not from tty */
-#define	SIGTSTP		18	/* stop signal from tty */
-#define	SIGCONT		19	/* continue a stopped process */
-#define	SIGCHLD		20	/* to parent on child stop or exit */
-#define	SIGTTIN		21	/* to readers pgrp upon background tty read */
-#define	SIGTTOU		22	/* like TTIN if (tp->t_local&LTOSTOP) */
-#endif
-#if __BSD_VISIBLE
-#define	SIGIO		23	/* input/output possible signal */
-#endif
-#if __XSI_VISIBLE
-#define	SIGXCPU		24	/* exceeded CPU time limit */
-#define	SIGXFSZ		25	/* exceeded file size limit */
-#define	SIGVTALRM	26	/* virtual time alarm */
-#define	SIGPROF		27	/* profiling time alarm */
-#endif
-#if __BSD_VISIBLE
-#define	SIGWINCH	28	/* window size changes */
-#define	SIGINFO		29	/* information request */
-#endif
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGUSR1		30	/* user defined signal 1 */
-#define	SIGUSR2		31	/* user defined signal 2 */
-#endif
-#if __BSD_VISIBLE
-#define	SIGTHR		32	/* reserved by thread library. */
-#define	SIGLWP		SIGTHR
-#define	SIGLIBRT	33	/* reserved by real-time library. */
-#endif
-
-#define	SIGRTMIN	65
-#define	SIGRTMAX	126
-
-#define	SIG_DFL		((__sighandler_t *)0)
-#define	SIG_IGN		((__sighandler_t *)1)
-#define	SIG_ERR		((__sighandler_t *)-1)
-/* #define	SIG_CATCH	((__sighandler_t *)2) See signalvar.h */
-#define SIG_HOLD        ((__sighandler_t *)3)
-
-/*
- * Type of a signal handling function.
- *
- * Language spec sez signal handlers take exactly one arg, even though we
- * actually supply three.  Ugh!
- *
- * We don't try to hide the difference by leaving out the args because
- * that would cause warnings about conformant programs.  Nonconformant
- * programs can avoid the warnings by casting to (__sighandler_t *) or
- * sig_t before calling signal() or assigning to sa_handler or sv_handler.
- *
- * The kernel should reverse the cast before calling the function.  It
- * has no way to do this, but on most machines 1-arg and 3-arg functions
- * have the same calling protocol so there is no problem in practice.
- * A bit in sa_flags could be used to specify the number of args.
- */
-typedef	void __sighandler_t(int);
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#ifndef _SIGSET_T_DECLARED
-#define	_SIGSET_T_DECLARED
-typedef	__sigset_t	sigset_t;
-#endif
-#endif
-
-#if __POSIX_VISIBLE >= 199309 || __XSI_VISIBLE >= 500
-union sigval {
-	/* Members as suggested by Annex C of POSIX 1003.1b. */
-	int	sival_int;
-	void	*sival_ptr;
-	/* 6.0 compatibility */
-	int     sigval_int;
-	void    *sigval_ptr;
-};
-#endif
-
-#if __POSIX_VISIBLE >= 199309
-struct sigevent {
-	int	sigev_notify;		/* Notification type */
-	int	sigev_signo;		/* Signal number */
-	union sigval sigev_value;	/* Signal value */
-	union {
-		__lwpid_t	_threadid;
-		struct {
-			void (*_function)(union sigval);
-			void *_attribute; /* pthread_attr_t * */
-		} _sigev_thread;
-		unsigned short _kevent_flags;
-		long __spare__[8];
-	} _sigev_un;
-};
-
-#if __BSD_VISIBLE
-#define	sigev_notify_kqueue		sigev_signo
-#define	sigev_notify_kevent_flags	_sigev_un._kevent_flags
-#define	sigev_notify_thread_id		_sigev_un._threadid
-#endif
-#define	sigev_notify_function		_sigev_un._sigev_thread._function
-#define	sigev_notify_attributes		_sigev_un._sigev_thread._attribute
-
-#define	SIGEV_NONE	0		/* No async notification. */
-#define	SIGEV_SIGNAL	1		/* Generate a queued signal. */
-#define	SIGEV_THREAD	2		/* Call back from another pthread. */
-#if __BSD_VISIBLE
-#define	SIGEV_KEVENT	3		/* Generate a kevent. */
-#define	SIGEV_THREAD_ID	4		/* Send signal to a kernel thread. */
-#endif
-#endif /* __POSIX_VISIBLE >= 199309 */
-
-#if __POSIX_VISIBLE >= 199309 || __XSI_VISIBLE
-typedef	struct __siginfo {
-	int	si_signo;		/* signal number */
-	int	si_errno;		/* errno association */
-	/*
-	 * Cause of signal, one of the SI_ macros or signal-specific
-	 * values, i.e. one of the FPE_... values for SIGFPE.  This
-	 * value is equivalent to the second argument to an old-style
-	 * FreeBSD signal handler.
-	 */
-	int	si_code;		/* signal code */
-	__pid_t	si_pid;			/* sending process */
-	__uid_t	si_uid;			/* sender's ruid */
-	int	si_status;		/* exit value */
-	void	*si_addr;		/* faulting instruction */
-	union sigval si_value;		/* signal value */
-	union	{
-		struct {
-			int	_trapno;/* machine specific trap code */
-		} _fault;
-		struct {
-			int	_timerid;
-			int	_overrun;
-		} _timer;
-		struct {
-			int	_mqd;
-		} _mesgq;
-		struct {
-			long	_band;		/* band event for SIGPOLL */
-		} _poll;			/* was this ever used ? */
-		struct {
-			long	__spare1__;
-			int	__spare2__[7];
-		} __spare__;
-	} _reason;
-} siginfo_t;
-
-#define si_trapno	_reason._fault._trapno
-#define si_timerid	_reason._timer._timerid
-#define si_overrun	_reason._timer._overrun
-#define si_mqd		_reason._mesgq._mqd
-#define si_band		_reason._poll._band
-
-/** si_code **/
-/* codes for SIGILL */
-#define ILL_ILLOPC 	1	/* Illegal opcode.			*/
-#define ILL_ILLOPN 	2	/* Illegal operand.			*/
-#define ILL_ILLADR 	3	/* Illegal addressing mode.		*/
-#define ILL_ILLTRP 	4	/* Illegal trap.			*/
-#define ILL_PRVOPC 	5	/* Privileged opcode.			*/
-#define ILL_PRVREG 	6	/* Privileged register.			*/
-#define ILL_COPROC 	7	/* Coprocessor error.			*/
-#define ILL_BADSTK 	8	/* Internal stack error.		*/
-
-/* codes for SIGBUS */
-#define BUS_ADRALN	1	/* Invalid address alignment.		*/
-#define BUS_ADRERR	2	/* Nonexistent physical address.	*/
-#define BUS_OBJERR	3	/* Object-specific hardware error.	*/
-
-/* codes for SIGSEGV */
-#define SEGV_MAPERR	1	/* Address not mapped to object.	*/
-#define SEGV_ACCERR	2	/* Invalid permissions for mapped	*/
-				/* object.				*/
-
-/* codes for SIGFPE */
-#define FPE_INTOVF	1	/* Integer overflow.			*/
-#define FPE_INTDIV	2	/* Integer divide by zero.		*/
-#define FPE_FLTDIV	3	/* Floating point divide by zero.	*/
-#define FPE_FLTOVF	4	/* Floating point overflow.		*/
-#define FPE_FLTUND	5	/* Floating point underflow.		*/
-#define FPE_FLTRES	6	/* Floating point inexact result.	*/
-#define FPE_FLTINV	7	/* Invalid floating point operation.	*/
-#define FPE_FLTSUB	8	/* Subscript out of range.		*/
-
-/* codes for SIGTRAP */
-#define TRAP_BRKPT	1	/* Process breakpoint.			*/
-#define TRAP_TRACE	2	/* Process trace trap.			*/
-#define	TRAP_DTRACE	3	/* DTrace induced trap.			*/
-
-/* codes for SIGCHLD */
-#define CLD_EXITED	1	/* Child has exited			*/
-#define CLD_KILLED	2	/* Child has terminated abnormally but	*/
-				/* did not create a core file		*/
-#define CLD_DUMPED	3	/* Child has terminated abnormally and	*/
-				/* created a core file			*/
-#define CLD_TRAPPED	4	/* Traced child has trapped		*/
-#define CLD_STOPPED	5	/* Child has stopped			*/
-#define CLD_CONTINUED	6	/* Stopped child has continued		*/
-
-/* codes for SIGPOLL */
-#define POLL_IN		1	/* Data input available			*/
-#define POLL_OUT	2	/* Output buffers available		*/
-#define POLL_MSG	3	/* Input message available		*/
-#define POLL_ERR	4	/* I/O Error				*/
-#define POLL_PRI	5	/* High priority input available	*/
-#define POLL_HUP	6	/* Device disconnected			*/
-
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-struct __siginfo;
-
-/*
- * Signal vector "template" used in sigaction call.
- */
-struct sigaction {
-	union {
-		void    (*__sa_handler)(int);
-		void    (*__sa_sigaction)(int, struct __siginfo *, void *);
-	} __sigaction_u;		/* signal handler */
-	int	sa_flags;		/* see signal options below */
-	sigset_t sa_mask;		/* signal mask to apply */
-};
-
-#define	sa_handler	__sigaction_u.__sa_handler
-#endif
-
-#if __XSI_VISIBLE
-/* If SA_SIGINFO is set, sa_sigaction must be used instead of sa_handler. */
-#define	sa_sigaction	__sigaction_u.__sa_sigaction
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SA_NOCLDSTOP	0x0008	/* do not generate SIGCHLD on child stop */
-#endif /* __POSIX_VISIBLE || __XSI_VISIBLE */
-
-#if __XSI_VISIBLE
-#define	SA_ONSTACK	0x0001	/* take signal on signal stack */
-#define	SA_RESTART	0x0002	/* restart system call on signal return */
-#define	SA_RESETHAND	0x0004	/* reset to SIG_DFL when taking signal */
-#define	SA_NODEFER	0x0010	/* don't mask the signal we're delivering */
-#define	SA_NOCLDWAIT	0x0020	/* don't keep zombies around */
-#define	SA_SIGINFO	0x0040	/* signal handler with SA_SIGINFO args */
-#endif
-
-#if __BSD_VISIBLE
-#define	NSIG		32	/* number of old signals (counting 0) */
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SI_NOINFO	0		/* No signal info besides si_signo. */
-#define	SI_USER		0x10001		/* Signal sent by kill(). */
-#define	SI_QUEUE	0x10002		/* Signal sent by the sigqueue(). */
-#define	SI_TIMER	0x10003		/* Signal generated by expiration of */
-					/* a timer set by timer_settime(). */
-#define	SI_ASYNCIO	0x10004		/* Signal generated by completion of */
-					/* an asynchronous I/O request.*/
-#define	SI_MESGQ	0x10005		/* Signal generated by arrival of a */
-					/* message on an empty message queue. */
-#define	SI_KERNEL	0x10006
-#define	SI_LWP		0x10007		/* Signal sent by thr_kill */
-#endif
-#if __BSD_VISIBLE
-#define	SI_UNDEFINED	0
-#endif
-
-#if __BSD_VISIBLE
-typedef	__sighandler_t	*sig_t;	/* type of pointer to a signal function */
-typedef	void __siginfohandler_t(int, struct __siginfo *, void *);
-#endif
-
-#if __XSI_VISIBLE
-/*
- * Structure used in sigaltstack call.
- */
-#if __BSD_VISIBLE
-typedef	struct sigaltstack {
-#else
-typedef	struct {
-#endif
-	char	*ss_sp;			/* signal stack base */
-	__size_t ss_size;		/* signal stack length */
-	int	ss_flags;		/* SS_DISABLE and/or SS_ONSTACK */
-} stack_t;
-
-#define	SS_ONSTACK	0x0001	/* take signal on alternate stack */
-#define	SS_DISABLE	0x0004	/* disable taking signals on alternate stack */
-#define	MINSIGSTKSZ	__MINSIGSTKSZ		/* minimum stack size */
-#define	SIGSTKSZ	(MINSIGSTKSZ + 32768)	/* recommended stack size */
-#endif
-
-#if __BSD_VISIBLE
-/*
- * 4.3 compatibility:
- * Signal vector "template" used in sigvec call.
- */
-struct sigvec {
-	__sighandler_t *sv_handler;	/* signal handler */
-	int	sv_mask;		/* signal mask to apply */
-	int	sv_flags;		/* see signal options below */
-};
-
-#define	SV_ONSTACK	SA_ONSTACK
-#define	SV_INTERRUPT	SA_RESTART	/* same bit, opposite sense */
-#define	SV_RESETHAND	SA_RESETHAND
-#define	SV_NODEFER	SA_NODEFER
-#define	SV_NOCLDSTOP	SA_NOCLDSTOP
-#define	SV_SIGINFO	SA_SIGINFO
-#define	sv_onstack	sv_flags	/* isn't compatibility wonderful! */
-#endif
-
-/* Keep this in one place only */
-#if defined(_KERNEL) && defined(COMPAT_43) && \
-    !defined(__i386__)
-struct osigcontext {
-	int _not_used;
-};
-#endif
-
-#if __XSI_VISIBLE
-/*
- * Structure used in sigstack call.
- */
-struct sigstack {
-	/* XXX ss_sp's type should be `void *'. */
-	char	*ss_sp;			/* signal stack pointer */
-	int	ss_onstack;		/* current status */
-};
-#endif
-
-#if __BSD_VISIBLE || __POSIX_VISIBLE > 0 && __POSIX_VISIBLE <= 200112
-/*
- * Macro for converting signal number to a mask suitable for
- * sigblock().
- */
-#define	sigmask(m)	(1 << ((m)-1))
-#endif
-
-#if __BSD_VISIBLE
-#define	BADSIG		SIG_ERR
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-/*
- * Flags for sigprocmask:
- */
-#define	SIG_BLOCK	1	/* block specified signal set */
-#define	SIG_UNBLOCK	2	/* unblock specified signal set */
-#define	SIG_SETMASK	3	/* set specified signal set */
-#endif
-
-/*
- * For historical reasons; programs expect signal's return value to be
- * defined by <sys/signal.h>.
- */
-__BEGIN_DECLS
-__sighandler_t *signal(int, __sighandler_t *);
-__END_DECLS
-
-#endif /* !_SYS_SIGNAL_H_ */
diff --git a/include.new/sys/signalvar.h b/include.new/sys/signalvar.h
deleted file mode 100644
index 547fa10..0000000
--- a/include.new/sys/signalvar.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- *
- *	@(#)signalvar.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD: releng/10.2/sys/sys/signalvar.h 277697 2015-01-25 13:09:53Z kib $
- */
-
-#ifndef _SYS_SIGNALVAR_H_
-#define	_SYS_SIGNALVAR_H_
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/signal.h>
-
-/*
- * Kernel signal definitions and data structures.
- */
-
-/*
- * Logical process signal actions and state, needed only within the process
- * The mapping between sigacts and proc structures is 1:1 except for rfork()
- * processes masquerading as threads which use one structure for the whole
- * group.  All members are locked by the included mutex.  The reference count
- * and mutex must be last for the bcopy in sigacts_copy() to work.
- */
-struct sigacts {
-	sig_t	ps_sigact[_SIG_MAXSIG];	/* Disposition of signals. */
-	sigset_t ps_catchmask[_SIG_MAXSIG];	/* Signals to be blocked. */
-	sigset_t ps_sigonstack;		/* Signals to take on sigstack. */
-	sigset_t ps_sigintr;		/* Signals that interrupt syscalls. */
-	sigset_t ps_sigreset;		/* Signals that reset when caught. */
-	sigset_t ps_signodefer;		/* Signals not masked while handled. */
-	sigset_t ps_siginfo;		/* Signals that want SA_SIGINFO args. */
-	sigset_t ps_sigignore;		/* Signals being ignored. */
-	sigset_t ps_sigcatch;		/* Signals being caught by user. */
-	sigset_t ps_freebsd4;		/* Signals using freebsd4 ucontext. */
-	sigset_t ps_osigset;		/* Signals using <= 3.x osigset_t. */
-	sigset_t ps_usertramp;		/* SunOS compat; libc sigtramp. XXX */
-	int	ps_flag;
-	u_int	ps_refcnt;
-	struct mtx ps_mtx;
-};
-
-#define	PS_NOCLDWAIT	0x0001	/* No zombies if child dies */
-#define	PS_NOCLDSTOP	0x0002	/* No SIGCHLD when children stop. */
-#define	PS_CLDSIGIGN	0x0004	/* The SIGCHLD handler is SIG_IGN. */
-
-#ifdef _KERNEL
-
-#ifdef COMPAT_43
-typedef struct {
-	struct osigcontext si_sc;
-	int		si_signo;
-	int		si_code;
-	union sigval	si_value;
-} osiginfo_t;
-
-struct osigaction {
-	union {
-		void    (*__sa_handler)(int);
-		void    (*__sa_sigaction)(int, osiginfo_t *, void *);
-	} __sigaction_u;		/* signal handler */
-	osigset_t	sa_mask;	/* signal mask to apply */
-	int		sa_flags;	/* see signal options below */
-};
-
-typedef void __osiginfohandler_t(int, osiginfo_t *, void *);
-#endif /* COMPAT_43 */
-
-/* additional signal action values, used only temporarily/internally */
-#define	SIG_CATCH	((__sighandler_t *)2)
-/* #define SIG_HOLD        ((__sighandler_t *)3) See signal.h */
-
-/*
- * get signal action for process and signal; currently only for current process
- */
-#define	SIGACTION(p, sig)	(p->p_sigacts->ps_sigact[_SIG_IDX(sig)])
-
-#endif /* _KERNEL */
-
-/*
- * sigset_t manipulation macros.
- */
-#define	SIGADDSET(set, signo)						\
-	((set).__bits[_SIG_WORD(signo)] |= _SIG_BIT(signo))
-
-#define	SIGDELSET(set, signo)						\
-	((set).__bits[_SIG_WORD(signo)] &= ~_SIG_BIT(signo))
-
-#define	SIGEMPTYSET(set)						\
-	do {								\
-		int __i;						\
-		for (__i = 0; __i < _SIG_WORDS; __i++)			\
-			(set).__bits[__i] = 0;				\
-	} while (0)
-
-#define	SIGFILLSET(set)							\
-	do {								\
-		int __i;						\
-		for (__i = 0; __i < _SIG_WORDS; __i++)			\
-			(set).__bits[__i] = ~0U;			\
-	} while (0)
-
-#define	SIGISMEMBER(set, signo)						\
-	((set).__bits[_SIG_WORD(signo)] & _SIG_BIT(signo))
-
-#define	SIGISEMPTY(set)		(__sigisempty(&(set)))
-#define	SIGNOTEMPTY(set)	(!__sigisempty(&(set)))
-
-#define	SIGSETEQ(set1, set2)	(__sigseteq(&(set1), &(set2)))
-#define	SIGSETNEQ(set1, set2)	(!__sigseteq(&(set1), &(set2)))
-
-#define	SIGSETOR(set1, set2)						\
-	do {								\
-		int __i;						\
-		for (__i = 0; __i < _SIG_WORDS; __i++)			\
-			(set1).__bits[__i] |= (set2).__bits[__i];	\
-	} while (0)
-
-#define	SIGSETAND(set1, set2)						\
-	do {								\
-		int __i;						\
-		for (__i = 0; __i < _SIG_WORDS; __i++)			\
-			(set1).__bits[__i] &= (set2).__bits[__i];	\
-	} while (0)
-
-#define	SIGSETNAND(set1, set2)						\
-	do {								\
-		int __i;						\
-		for (__i = 0; __i < _SIG_WORDS; __i++)			\
-			(set1).__bits[__i] &= ~(set2).__bits[__i];	\
-	} while (0)
-
-#define	SIGSETLO(set1, set2)	((set1).__bits[0] = (set2).__bits[0])
-#define	SIGSETOLD(set, oset)	((set).__bits[0] = (oset))
-
-#define	SIG_CANTMASK(set)						\
-	SIGDELSET(set, SIGKILL), SIGDELSET(set, SIGSTOP)
-
-#define	SIG_STOPSIGMASK(set)						\
-	SIGDELSET(set, SIGSTOP), SIGDELSET(set, SIGTSTP),		\
-	SIGDELSET(set, SIGTTIN), SIGDELSET(set, SIGTTOU)
-
-#define	SIG_CONTSIGMASK(set)						\
-	SIGDELSET(set, SIGCONT)
-
-#define	sigcantmask	(sigmask(SIGKILL) | sigmask(SIGSTOP))
-
-#define	SIG2OSIG(sig, osig)	(osig = (sig).__bits[0])
-#define	OSIG2SIG(osig, sig)	SIGEMPTYSET(sig); (sig).__bits[0] = osig
-
-static __inline int
-__sigisempty(sigset_t *set)
-{
-	int i;
-
-	for (i = 0; i < _SIG_WORDS; i++) {
-		if (set->__bits[i])
-			return (0);
-	}
-	return (1);
-}
-
-static __inline int
-__sigseteq(sigset_t *set1, sigset_t *set2)
-{
-	int i;
-
-	for (i = 0; i < _SIG_WORDS; i++) {
-		if (set1->__bits[i] != set2->__bits[i])
-			return (0);
-	}
-	return (1);
-}
-
-struct osigevent {
-	int	sigev_notify;		/* Notification type */
-	union {
-		int	__sigev_signo;	/* Signal number */
-		int	__sigev_notify_kqueue;
-	} __sigev_u;
-	union sigval sigev_value;	/* Signal value */
-};
-
-typedef struct ksiginfo {
-	TAILQ_ENTRY(ksiginfo)	ksi_link;
-	siginfo_t		ksi_info;
-	int			ksi_flags;
-	struct sigqueue		*ksi_sigq;
-} ksiginfo_t;
-
-#define	ksi_signo	ksi_info.si_signo
-#define	ksi_errno	ksi_info.si_errno
-#define	ksi_code	ksi_info.si_code
-#define	ksi_pid		ksi_info.si_pid
-#define	ksi_uid		ksi_info.si_uid
-#define	ksi_status      ksi_info.si_status
-#define	ksi_addr        ksi_info.si_addr
-#define	ksi_value	ksi_info.si_value
-#define	ksi_band	ksi_info.si_band
-#define	ksi_trapno	ksi_info.si_trapno
-#define	ksi_overrun	ksi_info.si_overrun
-#define	ksi_timerid	ksi_info.si_timerid
-#define	ksi_mqd		ksi_info.si_mqd
-
-/* bits for ksi_flags */
-#define	KSI_TRAP	0x01	/* Generated by trap. */
-#define	KSI_EXT		0x02	/* Externally managed ksi. */
-#define	KSI_INS		0x04	/* Directly insert ksi, not the copy */
-#define	KSI_SIGQ	0x08	/* Generated by sigqueue, might ret EGAIN. */
-#define	KSI_HEAD	0x10	/* Insert into head, not tail. */
-#define	KSI_COPYMASK	(KSI_TRAP|KSI_SIGQ)
-
-#define	KSI_ONQ(ksi)	((ksi)->ksi_sigq != NULL)
-
-typedef struct sigqueue {
-	sigset_t	sq_signals;	/* All pending signals. */
-	sigset_t	sq_kill;	/* Legacy depth 1 queue. */
-	TAILQ_HEAD(, ksiginfo)	sq_list;/* Queued signal info. */
-	struct proc	*sq_proc;
-	int		sq_flags;
-} sigqueue_t;
-
-/* Flags for ksi_flags */
-#define	SQ_INIT	0x01
-
-#ifdef _KERNEL
-
-/* Return nonzero if process p has an unmasked pending signal. */
-#define	SIGPENDING(td)							\
-	((!SIGISEMPTY((td)->td_siglist) &&				\
-	    !sigsetmasked(&(td)->td_siglist, &(td)->td_sigmask)) ||	\
-	 (!SIGISEMPTY((td)->td_proc->p_siglist) &&			\
-	    !sigsetmasked(&(td)->td_proc->p_siglist, &(td)->td_sigmask)))
-/*
- * Return the value of the pseudo-expression ((*set & ~*mask) != 0).  This
- * is an optimized version of SIGISEMPTY() on a temporary variable
- * containing SIGSETNAND(*set, *mask).
- */
-static __inline int
-sigsetmasked(sigset_t *set, sigset_t *mask)
-{
-	int i;
-
-	for (i = 0; i < _SIG_WORDS; i++) {
-		if (set->__bits[i] & ~mask->__bits[i])
-			return (0);
-	}
-	return (1);
-}
-
-#define	ksiginfo_init(ksi)			\
-do {						\
-	bzero(ksi, sizeof(ksiginfo_t));		\
-} while(0)
-
-#define	ksiginfo_init_trap(ksi)			\
-do {						\
-	ksiginfo_t *kp = ksi;			\
-	bzero(kp, sizeof(ksiginfo_t));		\
-	kp->ksi_flags |= KSI_TRAP;		\
-} while(0)
-
-static __inline void
-ksiginfo_copy(ksiginfo_t *src, ksiginfo_t *dst)
-{
-	(dst)->ksi_info = src->ksi_info;
-	(dst)->ksi_flags = (src->ksi_flags & KSI_COPYMASK);
-}
-
-static __inline void
-ksiginfo_set_sigev(ksiginfo_t *dst, struct sigevent *sigev)
-{
-	dst->ksi_signo = sigev->sigev_signo;
-	dst->ksi_value = sigev->sigev_value;
-}
-
-struct pgrp;
-struct proc;
-struct sigio;
-struct thread;
-
-/*
- * Lock the pointers for a sigio object in the underlying objects of
- * a file descriptor.
- */
-#define	SIGIO_LOCK()	mtx_lock(&sigio_lock)
-#define	SIGIO_TRYLOCK()	mtx_trylock(&sigio_lock)
-#define	SIGIO_UNLOCK()	mtx_unlock(&sigio_lock)
-#define	SIGIO_LOCKED()	mtx_owned(&sigio_lock)
-#define	SIGIO_ASSERT(type)	mtx_assert(&sigio_lock, type)
-
-extern struct mtx	sigio_lock;
-
-/* Flags for kern_sigprocmask(). */
-#define	SIGPROCMASK_OLD		0x0001
-#define	SIGPROCMASK_PROC_LOCKED	0x0002
-#define	SIGPROCMASK_PS_LOCKED	0x0004
-
-int	cursig(struct thread *td);
-int	sigdeferstop(void);
-int	sigallowstop(void);
-void	execsigs(struct proc *p);
-void	gsignal(int pgid, int sig, ksiginfo_t *ksi);
-void	killproc(struct proc *p, char *why);
-ksiginfo_t * ksiginfo_alloc(int wait);
-void	ksiginfo_free(ksiginfo_t *ksi);
-int	pksignal(struct proc *p, int sig, ksiginfo_t *ksi);
-void	pgsigio(struct sigio **sigiop, int sig, int checkctty);
-void	pgsignal(struct pgrp *pgrp, int sig, int checkctty, ksiginfo_t *ksi);
-int	postsig(int sig);
-void	kern_psignal(struct proc *p, int sig);
-int	ptracestop(struct thread *td, int sig);
-void	sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *retmask);
-struct sigacts *sigacts_alloc(void);
-void	sigacts_copy(struct sigacts *dest, struct sigacts *src);
-void	sigacts_free(struct sigacts *ps);
-struct sigacts *sigacts_hold(struct sigacts *ps);
-int	sigacts_shared(struct sigacts *ps);
-void	sigexit(struct thread *td, int sig) __dead2;
-int	sigev_findtd(struct proc *p, struct sigevent *sigev, struct thread **);
-int	sig_ffs(sigset_t *set);
-void	siginit(struct proc *p);
-void	signotify(struct thread *td);
-void	sigqueue_delete(struct sigqueue *queue, int sig);
-void	sigqueue_delete_proc(struct proc *p, int sig);
-void	sigqueue_flush(struct sigqueue *queue);
-void	sigqueue_init(struct sigqueue *queue, struct proc *p);
-void	sigqueue_take(ksiginfo_t *ksi);
-void	tdksignal(struct thread *td, int sig, ksiginfo_t *ksi);
-int	tdsendsignal(struct proc *p, struct thread *td, int sig,
-	   ksiginfo_t *ksi);
-void	tdsigcleanup(struct thread *td);
-void	tdsignal(struct thread *td, int sig);
-void	trapsignal(struct thread *td, ksiginfo_t *ksi);
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_SIGNALVAR_H_ */
diff --git a/include.new/sys/sleepqueue.h b/include.new/sys/sleepqueue.h
deleted file mode 100644
index fd3cfc0..0000000
--- a/include.new/sys/sleepqueue.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * Copyright (c) 2004 John Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/sys/sleepqueue.h 274139 2014-11-05 16:24:57Z lwhsu $
- */
-
-#ifndef _SYS_SLEEPQUEUE_H_
-#define _SYS_SLEEPQUEUE_H_
-
-/*
- * Sleep queue interface.  Sleep/wakeup, condition variables, and sx
- * locks use a sleep queue for the queue of threads blocked on a sleep
- * channel.
- *
- * A thread calls sleepq_lock() to lock the sleep queue chain associated
- * with a given wait channel.  A thread can then call call sleepq_add() to
- * add themself onto a sleep queue and call one of the sleepq_wait()
- * functions to actually go to sleep.  If a thread needs to abort a sleep
- * operation it should call sleepq_release() to unlock the associated sleep
- * queue chain lock.  If the thread also needs to remove itself from a queue
- * it just enqueued itself on, it can use sleepq_remove() instead.
- *
- * If the thread only wishes to sleep for a limited amount of time, it can
- * call sleepq_set_timeout() after sleepq_add() to setup a timeout.  It
- * should then use one of the sleepq_timedwait() functions to block.
- *
- * A thread is normally resumed from a sleep queue by either the
- * sleepq_signal() or sleepq_broadcast() functions.  Sleepq_signal() wakes
- * the thread with the highest priority that is sleeping on the specified
- * wait channel.  Sleepq_broadcast() wakes all threads that are sleeping
- * on the specified wait channel.  A thread sleeping in an interruptible
- * sleep can be interrupted by calling sleepq_abort().  A thread can also
- * be removed from a specified sleep queue using the sleepq_remove()
- * function.  Note that the sleep queue chain must first be locked via
- * sleepq_lock() before calling sleepq_abort(), sleepq_broadcast(), or
- * sleepq_signal().  These routines each return a boolean that will be true
- * if at least one swapped-out thread was resumed.  In that case, the caller
- * is responsible for waking up the swapper by calling kick_proc0() after
- * releasing the sleep queue chain lock.
- *
- * Each thread allocates a sleep queue at thread creation via sleepq_alloc()
- * and releases it at thread destruction via sleepq_free().  Note that
- * a sleep queue is not tied to a specific thread and that the sleep queue
- * released at thread destruction may not be the same sleep queue that the
- * thread allocated when it was created.
- *
- * XXX: Some other parts of the kernel such as ithread sleeping may end up
- * using this interface as well (death to TDI_IWAIT!)
- */
-
-struct lock_object;
-struct sleepqueue;
-struct thread;
-
-#ifdef _KERNEL
-
-#define	SLEEPQ_TYPE		0x0ff		/* Mask of sleep queue types. */
-#define	SLEEPQ_SLEEP		0x00		/* Used by sleep/wakeup. */
-#define	SLEEPQ_CONDVAR		0x01		/* Used for a cv. */
-#define	SLEEPQ_PAUSE		0x02		/* Used by pause. */
-#define	SLEEPQ_SX		0x03		/* Used by an sx lock. */
-#define	SLEEPQ_LK		0x04		/* Used by a lockmgr. */
-#define	SLEEPQ_INTERRUPTIBLE	0x100		/* Sleep is interruptible. */
-
-void	init_sleepqueues(void);
-int	sleepq_abort(struct thread *td, int intrval);
-void	sleepq_add(void *wchan, struct lock_object *lock, const char *wmesg,
-	    int flags, int queue);
-struct sleepqueue *sleepq_alloc(void);
-int	sleepq_broadcast(void *wchan, int flags, int pri, int queue);
-void	sleepq_free(struct sleepqueue *sq);
-void	sleepq_lock(void *wchan);
-struct sleepqueue *sleepq_lookup(void *wchan);
-void	sleepq_release(void *wchan);
-void	sleepq_remove(struct thread *td, void *wchan);
-int	sleepq_signal(void *wchan, int flags, int pri, int queue);
-void	sleepq_set_timeout_sbt(void *wchan, sbintime_t sbt,
-	    sbintime_t pr, int flags);
-#define	sleepq_set_timeout(wchan, timo)					\
-    sleepq_set_timeout_sbt((wchan), tick_sbt * (timo), 0, C_HARDCLOCK)
-u_int	sleepq_sleepcnt(void *wchan, int queue);
-int	sleepq_timedwait(void *wchan, int pri);
-int	sleepq_timedwait_sig(void *wchan, int pri);
-int	sleepq_type(void *wchan);
-void	sleepq_wait(void *wchan, int pri);
-int	sleepq_wait_sig(void *wchan, int pri);
-
-#endif	/* _KERNEL */
-#endif	/* !_SYS_SLEEPQUEUE_H_ */
diff --git a/include.new/sys/slicer.h b/include.new/sys/slicer.h
deleted file mode 100644
index 4922e56..0000000
--- a/include.new/sys/slicer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2012 Semihalf.
- * 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.
- *
- * 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: releng/10.2/sys/sys/slicer.h 235778 2012-05-22 08:33:14Z gber $
- */
-
-#ifndef _FLASH_SLICER_H_
-#define _FLASH_SLICER_H_
-
-#include <sys/types.h>
-
-#define FLASH_SLICES_MAX_NUM		8
-#define FLASH_SLICES_MAX_NAME_LEN	(32 + 1)
-
-#define	FLASH_SLICES_FLAG_NONE		0
-#define	FLASH_SLICES_FLAG_RO		1	/* Read only */
-
-struct flash_slice {
-	off_t		base;
-	off_t		size;
-	char		*label;
-	unsigned int	flags;
-};
-
-#ifdef _KERNEL
-int flash_fill_slices(device_t, struct flash_slice *, int *);
-#endif /* _KERNEL */
-
-#endif /* _FLASH_SLICER_H_ */
diff --git a/include.new/sys/smp.h b/include.new/sys/smp.h
deleted file mode 100644
index 181c95b..0000000
--- a/include.new/sys/smp.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD: releng/10.2/sys/sys/smp.h 265606 2014-05-07 20:28:27Z scottl $
- */
-
-#ifndef _SYS_SMP_H_
-#define _SYS_SMP_H_
-
-#ifdef _KERNEL
-
-#ifndef LOCORE
-
-#include <sys/cpuset.h>
-
-/*
- * Topology of a NUMA or HTT system.
- *
- * The top level topology is an array of pointers to groups.  Each group
- * contains a bitmask of cpus in its group or subgroups.  It may also
- * contain a pointer to an array of child groups.
- *
- * The bitmasks at non leaf groups may be used by consumers who support
- * a smaller depth than the hardware provides.
- *
- * The topology may be omitted by systems where all CPUs are equal.
- */
-
-struct cpu_group {
-	struct cpu_group *cg_parent;	/* Our parent group. */
-	struct cpu_group *cg_child;	/* Optional children groups. */
-	cpuset_t	cg_mask;	/* Mask of cpus in this group. */
-	int32_t		cg_count;	/* Count of cpus in this group. */
-	int16_t		cg_children;	/* Number of children groups. */
-	int8_t		cg_level;	/* Shared cache level. */
-	int8_t		cg_flags;	/* Traversal modifiers. */
-};
-
-typedef struct cpu_group *cpu_group_t;
-
-/*
- * Defines common resources for CPUs in the group.  The highest level
- * resource should be used when multiple are shared.
- */
-#define	CG_SHARE_NONE	0
-#define	CG_SHARE_L1	1
-#define	CG_SHARE_L2	2
-#define	CG_SHARE_L3	3
-
-/*
- * Behavior modifiers for load balancing and affinity.
- */
-#define	CG_FLAG_HTT	0x01		/* Schedule the alternate core last. */
-#define	CG_FLAG_SMT	0x02		/* New age htt, less crippled. */
-#define	CG_FLAG_THREAD	(CG_FLAG_HTT | CG_FLAG_SMT)	/* Any threading. */
-
-/*
- * Convenience routines for building topologies.
- */
-#ifdef SMP
-struct cpu_group *smp_topo(void);
-struct cpu_group *smp_topo_none(void);
-struct cpu_group *smp_topo_1level(int l1share, int l1count, int l1flags);
-struct cpu_group *smp_topo_2level(int l2share, int l2count, int l1share,
-    int l1count, int l1flags);
-struct cpu_group *smp_topo_find(struct cpu_group *top, int cpu);
-
-extern void (*cpustop_restartfunc)(void);
-extern int smp_cpus;
-extern volatile cpuset_t started_cpus;
-extern volatile cpuset_t stopped_cpus;
-extern volatile cpuset_t suspended_cpus;
-extern cpuset_t hlt_cpus_mask;
-extern cpuset_t logical_cpus_mask;
-#endif /* SMP */
-
-extern u_int mp_maxid;
-extern int mp_maxcpus;
-extern int mp_ncpus;
-extern volatile int smp_started;
-
-extern cpuset_t all_cpus;
-
-/*
- * Macro allowing us to determine whether a CPU is absent at any given
- * time, thus permitting us to configure sparse maps of cpuid-dependent
- * (per-CPU) structures.
- */
-#define	CPU_ABSENT(x_cpu)	(!CPU_ISSET(x_cpu, &all_cpus))
-
-/*
- * Macros to iterate over non-absent CPUs.  CPU_FOREACH() takes an
- * integer iterator and iterates over the available set of CPUs.
- * CPU_FIRST() returns the id of the first non-absent CPU.  CPU_NEXT()
- * returns the id of the next non-absent CPU.  It will wrap back to
- * CPU_FIRST() once the end of the list is reached.  The iterators are
- * currently implemented via inline functions.
- */
-#define	CPU_FOREACH(i)							\
-	for ((i) = 0; (i) <= mp_maxid; (i)++)				\
-		if (!CPU_ABSENT((i)))
-
-static __inline int
-cpu_first(void)
-{
-	int i;
-
-	for (i = 0;; i++)
-		if (!CPU_ABSENT(i))
-			return (i);
-}
-
-static __inline int
-cpu_next(int i)
-{
-
-	for (;;) {
-		i++;
-		if (i > mp_maxid)
-			i = 0;
-		if (!CPU_ABSENT(i))
-			return (i);
-	}
-}
-
-#define	CPU_FIRST()	cpu_first()
-#define	CPU_NEXT(i)	cpu_next((i))
-
-#ifdef SMP
-/*
- * Machine dependent functions used to initialize MP support.
- *
- * The cpu_mp_probe() should check to see if MP support is present and return
- * zero if it is not or non-zero if it is.  If MP support is present, then
- * cpu_mp_start() will be called so that MP can be enabled.  This function
- * should do things such as startup secondary processors.  It should also
- * setup mp_ncpus, all_cpus, and smp_cpus.  It should also ensure that
- * smp_started is initialized at the appropriate time.
- * Once cpu_mp_start() returns, machine independent MP startup code will be
- * executed and a simple message will be output to the console.  Finally,
- * cpu_mp_announce() will be called so that machine dependent messages about
- * the MP support may be output to the console if desired.
- *
- * The cpu_setmaxid() function is called very early during the boot process
- * so that the MD code may set mp_maxid to provide an upper bound on CPU IDs
- * that other subsystems may use.  If a platform is not able to determine
- * the exact maximum ID that early, then it may set mp_maxid to MAXCPU - 1.
- */
-struct thread;
-
-struct cpu_group *cpu_topo(void);
-void	cpu_mp_announce(void);
-int	cpu_mp_probe(void);
-void	cpu_mp_setmaxid(void);
-void	cpu_mp_start(void);
-
-void	forward_signal(struct thread *);
-int	restart_cpus(cpuset_t);
-int	stop_cpus(cpuset_t);
-int	stop_cpus_hard(cpuset_t);
-#if defined(__amd64__) || defined(__i386__)
-int	suspend_cpus(cpuset_t);
-int	resume_cpus(cpuset_t);
-#endif
-
-void	smp_rendezvous_action(void);
-extern	struct mtx smp_ipi_mtx;
-
-#endif /* SMP */
-
-int	quiesce_all_cpus(const char *, int);
-int	quiesce_cpus(cpuset_t, const char *, int);
-void	smp_no_rendevous_barrier(void *);
-void	smp_rendezvous(void (*)(void *), 
-		       void (*)(void *),
-		       void (*)(void *),
-		       void *arg);
-void	smp_rendezvous_cpus(cpuset_t,
-		       void (*)(void *), 
-		       void (*)(void *),
-		       void (*)(void *),
-		       void *arg);
-#endif /* !LOCORE */
-#endif /* _KERNEL */
-#endif /* _SYS_SMP_H_ */
diff --git a/include.new/sys/snoop.h b/include.new/sys/snoop.h
deleted file mode 100644
index 4ee89b2..0000000
--- a/include.new/sys/snoop.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 1995 Ugen J.S.Antsilevich
- *
- * Redistribution and use in source forms, with and without modification,
- * are permitted provided that this entire comment appears intact.
- *
- * Redistribution in binary form may occur without any restrictions.
- * Obviously, it would be nice if you gave credit where credit is due
- * but requiring it would be too onerous.
- *
- * This software is provided ``AS IS'' without any warranties of any kind.
- *
- * Snoop stuff.
- *
- * $FreeBSD: releng/10.2/sys/sys/snoop.h 150298 2005-09-18 19:23:35Z cognet $
- */
-
-#ifndef _SYS_SNOOP_H_
-#define	_SYS_SNOOP_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/*
- * These are snoop io controls
- * SNPSTTY accepts a file descriptor as input.
- */
-
-#define SNPSTTY       _IOW('T', 90, int)
-#define SNPGTTY       _IOR('T', 89, dev_t)
-
-/*
- * These values would be returned by FIONREAD ioctl
- * instead of number of characters in buffer in case
- * of specific errors.
- */
-#define SNP_OFLOW		-1
-#define SNP_TTYCLOSE		-2
-#define SNP_DETACH		-3
-
-#endif /* !_SYS_SNOOP_H_ */
diff --git a/include.new/sys/sockbuf.h b/include.new/sys/sockbuf.h
deleted file mode 100644
index a144f5b..0000000
--- a/include.new/sys/sockbuf.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 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.
- * 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.
- *
- *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- *
- * $FreeBSD: releng/10.2/sys/sys/sockbuf.h 279930 2015-03-12 17:07:45Z sjg $
- */
-#ifndef _SYS_SOCKBUF_H_
-#define _SYS_SOCKBUF_H_
-#include <sys/selinfo.h>		/* for struct selinfo */
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/_sx.h>
-
-#define	SB_MAX		(2*1024*1024)	/* default for max chars in sockbuf */
-
-/*
- * Constants for sb_flags field of struct sockbuf.
- */
-#define	SB_WAIT		0x04		/* someone is waiting for data/space */
-#define	SB_SEL		0x08		/* someone is selecting */
-#define	SB_ASYNC	0x10		/* ASYNC I/O, need signals */
-#define	SB_UPCALL	0x20		/* someone wants an upcall */
-#define	SB_NOINTR	0x40		/* operations not interruptible */
-#define	SB_AIO		0x80		/* AIO operations queued */
-#define	SB_KNOTE	0x100		/* kernel note attached */
-#define	SB_NOCOALESCE	0x200		/* don't coalesce new data into existing mbufs */
-#define	SB_IN_TOE	0x400		/* socket buffer is in the middle of an operation */
-#define	SB_AUTOSIZE	0x800		/* automatically size socket buffer */
-#define	SB_STOP		0x1000		/* backpressure indicator */
-
-#define	SBS_CANTSENDMORE	0x0010	/* can't send more data to peer */
-#define	SBS_CANTRCVMORE		0x0020	/* can't receive more data from peer */
-#define	SBS_RCVATMARK		0x0040	/* at mark on input */
-
-struct mbuf;
-struct sockaddr;
-struct socket;
-struct thread;
-
-struct	xsockbuf {
-	u_int	sb_cc;
-	u_int	sb_hiwat;
-	u_int	sb_mbcnt;
-	u_int   sb_mcnt;
-	u_int   sb_ccnt;
-	u_int	sb_mbmax;
-	int	sb_lowat;
-	int	sb_timeo;
-	short	sb_flags;
-};
-
-/*
- * Variables for socket buffering.
- */
-struct	sockbuf {
-	struct	selinfo sb_sel;	/* process selecting read/write */
-	struct	mtx sb_mtx;	/* sockbuf lock */
-	struct	sx sb_sx;	/* prevent I/O interlacing */
-	short	sb_state;	/* (c/d) socket state on sockbuf */
-#define	sb_startzero	sb_mb
-	struct	mbuf *sb_mb;	/* (c/d) the mbuf chain */
-	struct	mbuf *sb_mbtail; /* (c/d) the last mbuf in the chain */
-	struct	mbuf *sb_lastrecord;	/* (c/d) first mbuf of last
-					 * record in socket buffer */
-	struct	mbuf *sb_sndptr; /* (c/d) pointer into mbuf chain */
-	u_int	sb_sndptroff;	/* (c/d) byte offset of ptr into chain */
-	u_int	sb_cc;		/* (c/d) actual chars in buffer */
-	u_int	sb_hiwat;	/* (c/d) max actual char count */
-	u_int	sb_mbcnt;	/* (c/d) chars of mbufs used */
-	u_int   sb_mcnt;        /* (c/d) number of mbufs in buffer */
-	u_int   sb_ccnt;        /* (c/d) number of clusters in buffer */
-	u_int	sb_mbmax;	/* (c/d) max chars of mbufs to use */
-	u_int	sb_ctl;		/* (c/d) non-data chars in buffer */
-	int	sb_lowat;	/* (c/d) low water mark */
-	sbintime_t	sb_timeo;	/* (c/d) timeout for read/write */
-	short	sb_flags;	/* (c/d) flags, see below */
-	int	(*sb_upcall)(struct socket *, void *, int); /* (c/d) */
-	void	*sb_upcallarg;	/* (c/d) */
-};
-
-#ifdef _KERNEL
-
-/*
- * Per-socket buffer mutex used to protect most fields in the socket
- * buffer.
- */
-#define	SOCKBUF_MTX(_sb)		(&(_sb)->sb_mtx)
-#define	SOCKBUF_LOCK_INIT(_sb, _name) \
-	mtx_init(SOCKBUF_MTX(_sb), _name, NULL, MTX_DEF)
-#define	SOCKBUF_LOCK_DESTROY(_sb)	mtx_destroy(SOCKBUF_MTX(_sb))
-#define	SOCKBUF_LOCK(_sb)		mtx_lock(SOCKBUF_MTX(_sb))
-#define	SOCKBUF_OWNED(_sb)		mtx_owned(SOCKBUF_MTX(_sb))
-#define	SOCKBUF_UNLOCK(_sb)		mtx_unlock(SOCKBUF_MTX(_sb))
-#define	SOCKBUF_LOCK_ASSERT(_sb)	mtx_assert(SOCKBUF_MTX(_sb), MA_OWNED)
-#define	SOCKBUF_UNLOCK_ASSERT(_sb)	mtx_assert(SOCKBUF_MTX(_sb), MA_NOTOWNED)
-
-void	sbappend(struct sockbuf *sb, struct mbuf *m);
-void	sbappend_locked(struct sockbuf *sb, struct mbuf *m);
-void	sbappendstream(struct sockbuf *sb, struct mbuf *m);
-void	sbappendstream_locked(struct sockbuf *sb, struct mbuf *m);
-int	sbappendaddr(struct sockbuf *sb, const struct sockaddr *asa,
-	    struct mbuf *m0, struct mbuf *control);
-int	sbappendaddr_locked(struct sockbuf *sb, const struct sockaddr *asa,
-	    struct mbuf *m0, struct mbuf *control);
-int	sbappendaddr_nospacecheck_locked(struct sockbuf *sb,
-	    const struct sockaddr *asa, struct mbuf *m0, struct mbuf *control);
-int	sbappendcontrol(struct sockbuf *sb, struct mbuf *m0,
-	    struct mbuf *control);
-int	sbappendcontrol_locked(struct sockbuf *sb, struct mbuf *m0,
-	    struct mbuf *control);
-void	sbappendrecord(struct sockbuf *sb, struct mbuf *m0);
-void	sbappendrecord_locked(struct sockbuf *sb, struct mbuf *m0);
-void	sbcheck(struct sockbuf *sb);
-void	sbcompress(struct sockbuf *sb, struct mbuf *m, struct mbuf *n);
-struct mbuf *
-	sbcreatecontrol(caddr_t p, int size, int type, int level);
-void	sbdestroy(struct sockbuf *sb, struct socket *so);
-void	sbdrop(struct sockbuf *sb, int len);
-void	sbdrop_locked(struct sockbuf *sb, int len);
-struct mbuf *
-	sbcut_locked(struct sockbuf *sb, int len);
-void	sbdroprecord(struct sockbuf *sb);
-void	sbdroprecord_locked(struct sockbuf *sb);
-void	sbflush(struct sockbuf *sb);
-void	sbflush_locked(struct sockbuf *sb);
-void	sbrelease(struct sockbuf *sb, struct socket *so);
-void	sbrelease_internal(struct sockbuf *sb, struct socket *so);
-void	sbrelease_locked(struct sockbuf *sb, struct socket *so);
-int	sbreserve(struct sockbuf *sb, u_long cc, struct socket *so,
-	    struct thread *td);
-int	sbreserve_locked(struct sockbuf *sb, u_long cc, struct socket *so,
-	    struct thread *td);
-struct mbuf *
-	sbsndptr(struct sockbuf *sb, u_int off, u_int len, u_int *moff);
-struct mbuf *
-	sbsndmbuf(struct sockbuf *sb, u_int off, u_int *moff);
-void	sbtoxsockbuf(struct sockbuf *sb, struct xsockbuf *xsb);
-int	sbwait(struct sockbuf *sb);
-int	sblock(struct sockbuf *sb, int flags);
-void	sbunlock(struct sockbuf *sb);
-
-/*
- * How much space is there in a socket buffer (so->so_snd or so->so_rcv)?
- * This is problematical if the fields are unsigned, as the space might
- * still be negative (cc > hiwat or mbcnt > mbmax).  Should detect
- * overflow and return 0.  Should use "lmin" but it doesn't exist now.
- */
-static __inline
-long
-sbspace(struct sockbuf *sb)
-{
-	int bleft, mleft;		/* size should match sockbuf fields */
-
-	if (sb->sb_flags & SB_STOP)
-		return(0);
-	bleft = sb->sb_hiwat - sb->sb_cc;
-	mleft = sb->sb_mbmax - sb->sb_mbcnt;
-	return((bleft < mleft) ? bleft : mleft);
-}
-
-/* adjust counters in sb reflecting allocation of m */
-#define	sballoc(sb, m) { \
-	(sb)->sb_cc += (m)->m_len; \
-	if ((m)->m_type != MT_DATA && (m)->m_type != MT_OOBDATA) \
-		(sb)->sb_ctl += (m)->m_len; \
-	(sb)->sb_mbcnt += MSIZE; \
-	(sb)->sb_mcnt += 1; \
-	if ((m)->m_flags & M_EXT) { \
-		(sb)->sb_mbcnt += (m)->m_ext.ext_size; \
-		(sb)->sb_ccnt += 1; \
-	} \
-}
-
-/* adjust counters in sb reflecting freeing of m */
-#define	sbfree(sb, m) { \
-	(sb)->sb_cc -= (m)->m_len; \
-	if ((m)->m_type != MT_DATA && (m)->m_type != MT_OOBDATA) \
-		(sb)->sb_ctl -= (m)->m_len; \
-	(sb)->sb_mbcnt -= MSIZE; \
-	(sb)->sb_mcnt -= 1; \
-	if ((m)->m_flags & M_EXT) { \
-		(sb)->sb_mbcnt -= (m)->m_ext.ext_size; \
-		(sb)->sb_ccnt -= 1; \
-	} \
-	if ((sb)->sb_sndptr == (m)) { \
-		(sb)->sb_sndptr = NULL; \
-		(sb)->sb_sndptroff = 0; \
-	} \
-	if ((sb)->sb_sndptroff != 0) \
-		(sb)->sb_sndptroff -= (m)->m_len; \
-}
-
-#define SB_EMPTY_FIXUP(sb) do {						\
-	if ((sb)->sb_mb == NULL) {					\
-		(sb)->sb_mbtail = NULL;					\
-		(sb)->sb_lastrecord = NULL;				\
-	}								\
-} while (/*CONSTCOND*/0)
-
-#ifdef SOCKBUF_DEBUG
-void	sblastrecordchk(struct sockbuf *, const char *, int);
-#define	SBLASTRECORDCHK(sb)	sblastrecordchk((sb), __FILE__, __LINE__)
-
-void	sblastmbufchk(struct sockbuf *, const char *, int);
-#define	SBLASTMBUFCHK(sb)	sblastmbufchk((sb), __FILE__, __LINE__)
-#else
-#define	SBLASTRECORDCHK(sb)      /* nothing */
-#define	SBLASTMBUFCHK(sb)        /* nothing */
-#endif /* SOCKBUF_DEBUG */
-
-#endif /* _KERNEL */
-
-#endif /* _SYS_SOCKBUF_H_ */
diff --git a/include.new/sys/socket.h b/include.new/sys/socket.h
deleted file mode 100644
index 296790e..0000000
--- a/include.new/sys/socket.h
+++ /dev/null
@@ -1,665 +0,0 @@
-/*-
- * Copyright (c) 1982, 1985, 1986, 1988, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)socket.h	8.4 (Berkeley) 2/21/94
- * $FreeBSD: releng/10.2/sys/sys/socket.h 254925 2013-08-26 18:16:05Z jhb $
- */
-
-#ifndef _SYS_SOCKET_H_
-#define	_SYS_SOCKET_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/_iovec.h>
-#include <machine/_align.h>
-
-/*
- * Definitions related to sockets: types, address families, options.
- */
-
-/*
- * Data types.
- */
-#if __BSD_VISIBLE
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-#endif
-
-#ifndef _SA_FAMILY_T_DECLARED
-typedef	__sa_family_t	sa_family_t;
-#define	_SA_FAMILY_T_DECLARED
-#endif
-
-#ifndef _SOCKLEN_T_DECLARED
-typedef	__socklen_t	socklen_t;
-#define	_SOCKLEN_T_DECLARED
-#endif
- 
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif
-
-#if __BSD_VISIBLE 
-#ifndef _UID_T_DECLARED
-typedef	__uid_t		uid_t;
-#define	_UID_T_DECLARED
-#endif
-#endif
-
-/*
- * Types
- */
-#define	SOCK_STREAM	1		/* stream socket */
-#define	SOCK_DGRAM	2		/* datagram socket */
-#define	SOCK_RAW	3		/* raw-protocol interface */
-#if __BSD_VISIBLE
-#define	SOCK_RDM	4		/* reliably-delivered message */
-#endif
-#define	SOCK_SEQPACKET	5		/* sequenced packet stream */
-
-#if __BSD_VISIBLE
-/*
- * Creation flags, OR'ed into socket() and socketpair() type argument.
- */
-#define	SOCK_CLOEXEC	0x10000000
-#define	SOCK_NONBLOCK	0x20000000
-#endif
-
-/*
- * Option flags per-socket.
- */
-#define	SO_DEBUG	0x0001		/* turn on debugging info recording */
-#define	SO_ACCEPTCONN	0x0002		/* socket has had listen() */
-#define	SO_REUSEADDR	0x0004		/* allow local address reuse */
-#define	SO_KEEPALIVE	0x0008		/* keep connections alive */
-#define	SO_DONTROUTE	0x0010		/* just use interface addresses */
-#define	SO_BROADCAST	0x0020		/* permit sending of broadcast msgs */
-#if __BSD_VISIBLE
-#define	SO_USELOOPBACK	0x0040		/* bypass hardware when possible */
-#endif
-#define	SO_LINGER	0x0080		/* linger on close if data present */
-#define	SO_OOBINLINE	0x0100		/* leave received OOB data in line */
-#if __BSD_VISIBLE
-#define	SO_REUSEPORT	0x0200		/* allow local address & port reuse */
-#define	SO_TIMESTAMP	0x0400		/* timestamp received dgram traffic */
-#define	SO_NOSIGPIPE	0x0800		/* no SIGPIPE from EPIPE */
-#define	SO_ACCEPTFILTER	0x1000		/* there is an accept filter */
-#define	SO_BINTIME	0x2000		/* timestamp received dgram traffic */
-#endif
-#define	SO_NO_OFFLOAD	0x4000		/* socket cannot be offloaded */
-#define	SO_NO_DDP	0x8000		/* disable direct data placement */
-
-/*
- * Additional options, not kept in so_options.
- */
-#define	SO_SNDBUF	0x1001		/* send buffer size */
-#define	SO_RCVBUF	0x1002		/* receive buffer size */
-#define	SO_SNDLOWAT	0x1003		/* send low-water mark */
-#define	SO_RCVLOWAT	0x1004		/* receive low-water mark */
-#define	SO_SNDTIMEO	0x1005		/* send timeout */
-#define	SO_RCVTIMEO	0x1006		/* receive timeout */
-#define	SO_ERROR	0x1007		/* get error status and clear */
-#define	SO_TYPE		0x1008		/* get socket type */
-#if __BSD_VISIBLE
-#define	SO_LABEL	0x1009		/* socket's MAC label */
-#define	SO_PEERLABEL	0x1010		/* socket's peer's MAC label */
-#define	SO_LISTENQLIMIT	0x1011		/* socket's backlog limit */
-#define	SO_LISTENQLEN	0x1012		/* socket's complete queue length */
-#define	SO_LISTENINCQLEN	0x1013	/* socket's incomplete queue length */
-#define	SO_SETFIB	0x1014		/* use this FIB to route */
-#define	SO_USER_COOKIE	0x1015		/* user cookie (dummynet etc.) */
-#define	SO_PROTOCOL	0x1016		/* get socket protocol (Linux name) */
-#define	SO_PROTOTYPE	SO_PROTOCOL	/* alias for SO_PROTOCOL (SunOS name) */
-#endif
-
-/*
- * Space reserved for new socket options added by third-party vendors.
- * This range applies to all socket option levels.  New socket options
- * in FreeBSD should always use an option value less than SO_VENDOR.
- */
-#if __BSD_VISIBLE
-#define	SO_VENDOR	0x80000000
-#endif
-
-/*
- * Structure used for manipulating linger option.
- */
-struct linger {
-	int	l_onoff;		/* option on/off */
-	int	l_linger;		/* linger time */
-};
-
-#if __BSD_VISIBLE
-struct accept_filter_arg {
-	char	af_name[16];
-	char	af_arg[256-16];
-};
-#endif
-
-/*
- * Level number for (get/set)sockopt() to apply to socket itself.
- */
-#define	SOL_SOCKET	0xffff		/* options for socket level */
-
-/*
- * Address families.
- */
-#define	AF_UNSPEC	0		/* unspecified */
-#if __BSD_VISIBLE
-#define	AF_LOCAL	AF_UNIX		/* local to host (pipes, portals) */
-#endif
-#define	AF_UNIX		1		/* standardized name for AF_LOCAL */
-#define	AF_INET		2		/* internetwork: UDP, TCP, etc. */
-#if __BSD_VISIBLE
-#define	AF_IMPLINK	3		/* arpanet imp addresses */
-#define	AF_PUP		4		/* pup protocols: e.g. BSP */
-#define	AF_CHAOS	5		/* mit CHAOS protocols */
-#define	AF_NETBIOS	6		/* SMB protocols */
-#define	AF_ISO		7		/* ISO protocols */
-#define	AF_OSI		AF_ISO
-#define	AF_ECMA		8		/* European computer manufacturers */
-#define	AF_DATAKIT	9		/* datakit protocols */
-#define	AF_CCITT	10		/* CCITT protocols, X.25 etc */
-#define	AF_SNA		11		/* IBM SNA */
-#define AF_DECnet	12		/* DECnet */
-#define AF_DLI		13		/* DEC Direct data link interface */
-#define AF_LAT		14		/* LAT */
-#define	AF_HYLINK	15		/* NSC Hyperchannel */
-#define	AF_APPLETALK	16		/* Apple Talk */
-#define	AF_ROUTE	17		/* Internal Routing Protocol */
-#define	AF_LINK		18		/* Link layer interface */
-#define	pseudo_AF_XTP	19		/* eXpress Transfer Protocol (no AF) */
-#define	AF_COIP		20		/* connection-oriented IP, aka ST II */
-#define	AF_CNT		21		/* Computer Network Technology */
-#define pseudo_AF_RTIP	22		/* Help Identify RTIP packets */
-#define	AF_IPX		23		/* Novell Internet Protocol */
-#define	AF_SIP		24		/* Simple Internet Protocol */
-#define	pseudo_AF_PIP	25		/* Help Identify PIP packets */
-#define	AF_ISDN		26		/* Integrated Services Digital Network*/
-#define	AF_E164		AF_ISDN		/* CCITT E.164 recommendation */
-#define	pseudo_AF_KEY	27		/* Internal key-management function */
-#endif
-#define	AF_INET6	28		/* IPv6 */
-#if __BSD_VISIBLE
-#define	AF_NATM		29		/* native ATM access */
-#define	AF_ATM		30		/* ATM */
-#define pseudo_AF_HDRCMPLT 31		/* Used by BPF to not rewrite headers
-					 * in interface output routine
-					 */
-#define	AF_NETGRAPH	32		/* Netgraph sockets */
-#define	AF_SLOW		33		/* 802.3ad slow protocol */
-#define	AF_SCLUSTER	34		/* Sitara cluster protocol */
-#define	AF_ARP		35
-#define	AF_BLUETOOTH	36		/* Bluetooth sockets */
-#define	AF_IEEE80211	37		/* IEEE 802.11 protocol */
-#define	AF_INET_SDP	40		/* OFED Socket Direct Protocol ipv4 */
-#define	AF_INET6_SDP	42		/* OFED Socket Direct Protocol ipv6 */
-#define	AF_MAX		42
-/*
- * When allocating a new AF_ constant, please only allocate
- * even numbered constants for FreeBSD until 134 as odd numbered AF_
- * constants 39-133 are now reserved for vendors.
- */
-#define AF_VENDOR00 39
-#define AF_VENDOR01 41
-#define AF_VENDOR02 43
-#define AF_VENDOR03 45
-#define AF_VENDOR04 47
-#define AF_VENDOR05 49
-#define AF_VENDOR06 51
-#define AF_VENDOR07 53
-#define AF_VENDOR08 55
-#define AF_VENDOR09 57
-#define AF_VENDOR10 59
-#define AF_VENDOR11 61
-#define AF_VENDOR12 63
-#define AF_VENDOR13 65
-#define AF_VENDOR14 67
-#define AF_VENDOR15 69
-#define AF_VENDOR16 71
-#define AF_VENDOR17 73
-#define AF_VENDOR18 75
-#define AF_VENDOR19 77
-#define AF_VENDOR20 79
-#define AF_VENDOR21 81
-#define AF_VENDOR22 83
-#define AF_VENDOR23 85
-#define AF_VENDOR24 87
-#define AF_VENDOR25 89
-#define AF_VENDOR26 91
-#define AF_VENDOR27 93
-#define AF_VENDOR28 95
-#define AF_VENDOR29 97
-#define AF_VENDOR30 99
-#define AF_VENDOR31 101
-#define AF_VENDOR32 103
-#define AF_VENDOR33 105
-#define AF_VENDOR34 107
-#define AF_VENDOR35 109
-#define AF_VENDOR36 111
-#define AF_VENDOR37 113
-#define AF_VENDOR38 115
-#define AF_VENDOR39 117
-#define AF_VENDOR40 119
-#define AF_VENDOR41 121
-#define AF_VENDOR42 123
-#define AF_VENDOR43 125
-#define AF_VENDOR44 127
-#define AF_VENDOR45 129
-#define AF_VENDOR46 131
-#define AF_VENDOR47 133
-#endif
-
-/*
- * Structure used by kernel to store most
- * addresses.
- */
-struct sockaddr {
-	unsigned char	sa_len;		/* total length */
-	sa_family_t	sa_family;	/* address family */
-	char		sa_data[14];	/* actually longer; address value */
-};
-#if __BSD_VISIBLE
-#define	SOCK_MAXADDRLEN	255		/* longest possible addresses */
-
-/*
- * Structure used by kernel to pass protocol
- * information in raw sockets.
- */
-struct sockproto {
-	unsigned short	sp_family;		/* address family */
-	unsigned short	sp_protocol;		/* protocol */
-};
-#endif
-
-#include <sys/_sockaddr_storage.h>
-
-#if __BSD_VISIBLE
-/*
- * Protocol families, same as address families for now.
- */
-#define	PF_UNSPEC	AF_UNSPEC
-#define	PF_LOCAL	AF_LOCAL
-#define	PF_UNIX		PF_LOCAL	/* backward compatibility */
-#define	PF_INET		AF_INET
-#define	PF_IMPLINK	AF_IMPLINK
-#define	PF_PUP		AF_PUP
-#define	PF_CHAOS	AF_CHAOS
-#define	PF_NETBIOS	AF_NETBIOS
-#define	PF_ISO		AF_ISO
-#define	PF_OSI		AF_ISO
-#define	PF_ECMA		AF_ECMA
-#define	PF_DATAKIT	AF_DATAKIT
-#define	PF_CCITT	AF_CCITT
-#define	PF_SNA		AF_SNA
-#define PF_DECnet	AF_DECnet
-#define PF_DLI		AF_DLI
-#define PF_LAT		AF_LAT
-#define	PF_HYLINK	AF_HYLINK
-#define	PF_APPLETALK	AF_APPLETALK
-#define	PF_ROUTE	AF_ROUTE
-#define	PF_LINK		AF_LINK
-#define	PF_XTP		pseudo_AF_XTP	/* really just proto family, no AF */
-#define	PF_COIP		AF_COIP
-#define	PF_CNT		AF_CNT
-#define	PF_SIP		AF_SIP
-#define	PF_IPX		AF_IPX
-#define PF_RTIP		pseudo_AF_RTIP	/* same format as AF_INET */
-#define PF_PIP		pseudo_AF_PIP
-#define	PF_ISDN		AF_ISDN
-#define	PF_KEY		pseudo_AF_KEY
-#define	PF_INET6	AF_INET6
-#define	PF_NATM		AF_NATM
-#define	PF_ATM		AF_ATM
-#define	PF_NETGRAPH	AF_NETGRAPH
-#define	PF_SLOW		AF_SLOW
-#define PF_SCLUSTER	AF_SCLUSTER
-#define	PF_ARP		AF_ARP
-#define	PF_BLUETOOTH	AF_BLUETOOTH
-#define	PF_IEEE80211	AF_IEEE80211
-#define	PF_INET_SDP	AF_INET_SDP
-#define	PF_INET6_SDP	AF_INET6_SDP
-
-#define	PF_MAX		AF_MAX
-
-/*
- * Definitions for network related sysctl, CTL_NET.
- *
- * Second level is protocol family.
- * Third level is protocol number.
- *
- * Further levels are defined by the individual families below.
- */
-#define NET_MAXID	AF_MAX
-
-/*
- * PF_ROUTE - Routing table
- *
- * Three additional levels are defined:
- *	Fourth: address family, 0 is wildcard
- *	Fifth: type of info, defined below
- *	Sixth: flag(s) to mask with for NET_RT_FLAGS
- */
-#define NET_RT_DUMP	1		/* dump; may limit to a.f. */
-#define NET_RT_FLAGS	2		/* by flags, e.g. RESOLVING */
-#define NET_RT_IFLIST	3		/* survey interface list */
-#define	NET_RT_IFMALIST	4		/* return multicast address list */
-#define	NET_RT_IFLISTL	5		/* Survey interface list, using 'l'en
-					 * versions of msghdr structs. */
-#define	NET_RT_MAXID	6
-
-#endif /* __BSD_VISIBLE */
-
-/*
- * Maximum queue length specifiable by listen.
- */
-#define	SOMAXCONN	128
-
-/*
- * Message header for recvmsg and sendmsg calls.
- * Used value-result for recvmsg, value only for sendmsg.
- */
-struct msghdr {
-	void		*msg_name;		/* optional address */
-	socklen_t	 msg_namelen;		/* size of address */
-	struct iovec	*msg_iov;		/* scatter/gather array */
-	int		 msg_iovlen;		/* # elements in msg_iov */
-	void		*msg_control;		/* ancillary data, see below */
-	socklen_t	 msg_controllen;	/* ancillary data buffer len */
-	int		 msg_flags;		/* flags on received message */
-};
-
-#define	MSG_OOB		0x1		/* process out-of-band data */
-#define	MSG_PEEK	0x2		/* peek at incoming message */
-#define	MSG_DONTROUTE	0x4		/* send without using routing tables */
-#define	MSG_EOR		0x8		/* data completes record */
-#define	MSG_TRUNC	0x10		/* data discarded before delivery */
-#define	MSG_CTRUNC	0x20		/* control data lost before delivery */
-#define	MSG_WAITALL	0x40		/* wait for full request or error */
-#if __POSIX_VISIBLE >= 200809
-#define	MSG_NOSIGNAL	0x20000		/* do not generate SIGPIPE on EOF */
-#endif
-#if __BSD_VISIBLE
-#define	MSG_DONTWAIT	0x80		/* this message should be nonblocking */
-#define	MSG_EOF		0x100		/* data completes connection */
-#define	MSG_NOTIFICATION 0x2000         /* SCTP notification */
-#define	MSG_NBIO	0x4000		/* FIONBIO mode, used by fifofs */
-#define	MSG_COMPAT      0x8000		/* used in sendit() */
-#define	MSG_CMSG_CLOEXEC 0x40000	/* make received fds close-on-exec */
-#endif
-#ifdef _KERNEL
-#define	MSG_SOCALLBCK   0x10000		/* for use by socket callbacks - soreceive (TCP) */
-#endif
-
-/*
- * Header for ancillary data objects in msg_control buffer.
- * Used for additional information with/about a datagram
- * not expressible by flags.  The format is a sequence
- * of message elements headed by cmsghdr structures.
- */
-struct cmsghdr {
-	socklen_t	cmsg_len;		/* data byte count, including hdr */
-	int		cmsg_level;		/* originating protocol */
-	int		cmsg_type;		/* protocol-specific type */
-/* followed by	u_char  cmsg_data[]; */
-};
-
-#if __BSD_VISIBLE
-/*
- * While we may have more groups than this, the cmsgcred struct must
- * be able to fit in an mbuf and we have historically supported a
- * maximum of 16 groups.
-*/
-#define CMGROUP_MAX 16
-
-/*
- * Credentials structure, used to verify the identity of a peer
- * process that has sent us a message. This is allocated by the
- * peer process but filled in by the kernel. This prevents the
- * peer from lying about its identity. (Note that cmcred_groups[0]
- * is the effective GID.)
- */
-struct cmsgcred {
-	pid_t	cmcred_pid;		/* PID of sending process */
-	uid_t	cmcred_uid;		/* real UID of sending process */
-	uid_t	cmcred_euid;		/* effective UID of sending process */
-	gid_t	cmcred_gid;		/* real GID of sending process */
-	short	cmcred_ngroups;		/* number or groups */
-	gid_t	cmcred_groups[CMGROUP_MAX];	/* groups */
-};
-
-/*
- * Socket credentials.
- */
-struct sockcred {
-	uid_t	sc_uid;			/* real user id */
-	uid_t	sc_euid;		/* effective user id */
-	gid_t	sc_gid;			/* real group id */
-	gid_t	sc_egid;		/* effective group id */
-	int	sc_ngroups;		/* number of supplemental groups */
-	gid_t	sc_groups[1];		/* variable length */
-};
-
-/*
- * Compute size of a sockcred structure with groups.
- */
-#define	SOCKCREDSIZE(ngrps) \
-	(sizeof(struct sockcred) + (sizeof(gid_t) * ((ngrps) - 1)))
-
-#endif /* __BSD_VISIBLE */
-
-/* given pointer to struct cmsghdr, return pointer to data */
-#define	CMSG_DATA(cmsg)		((unsigned char *)(cmsg) + \
-				 _ALIGN(sizeof(struct cmsghdr)))
-
-/* given pointer to struct cmsghdr, return pointer to next cmsghdr */
-#define	CMSG_NXTHDR(mhdr, cmsg)	\
-	((char *)(cmsg) == NULL ? CMSG_FIRSTHDR(mhdr) : \
-	    ((char *)(cmsg) + _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len) + \
-	  _ALIGN(sizeof(struct cmsghdr)) > \
-	    (char *)(mhdr)->msg_control + (mhdr)->msg_controllen) ? \
-	    (struct cmsghdr *)0 : \
-	    (struct cmsghdr *)(void *)((char *)(cmsg) + \
-	    _ALIGN(((struct cmsghdr *)(cmsg))->cmsg_len)))
-
-/*
- * RFC 2292 requires to check msg_controllen, in case that the kernel returns
- * an empty list for some reasons.
- */
-#define	CMSG_FIRSTHDR(mhdr) \
-	((mhdr)->msg_controllen >= sizeof(struct cmsghdr) ? \
-	 (struct cmsghdr *)(mhdr)->msg_control : \
-	 (struct cmsghdr *)NULL)
-
-#if __BSD_VISIBLE
-/* RFC 2292 additions */
-#define	CMSG_SPACE(l)		(_ALIGN(sizeof(struct cmsghdr)) + _ALIGN(l))
-#define	CMSG_LEN(l)		(_ALIGN(sizeof(struct cmsghdr)) + (l))
-#endif
-
-#ifdef _KERNEL
-#define	CMSG_ALIGN(n)	_ALIGN(n)
-#endif
-
-/* "Socket"-level control message types: */
-#define	SCM_RIGHTS	0x01		/* access rights (array of int) */
-#if __BSD_VISIBLE
-#define	SCM_TIMESTAMP	0x02		/* timestamp (struct timeval) */
-#define	SCM_CREDS	0x03		/* process creds (struct cmsgcred) */
-#define	SCM_BINTIME	0x04		/* timestamp (struct bintime) */
-#endif
-
-#if __BSD_VISIBLE
-/*
- * 4.3 compat sockaddr, move to compat file later
- */
-struct osockaddr {
-	unsigned short sa_family;	/* address family */
-	char	sa_data[14];		/* up to 14 bytes of direct address */
-};
-
-/*
- * 4.3-compat message header (move to compat file later).
- */
-struct omsghdr {
-	char	*msg_name;		/* optional address */
-	int	msg_namelen;		/* size of address */
-	struct	iovec *msg_iov;		/* scatter/gather array */
-	int	msg_iovlen;		/* # elements in msg_iov */
-	char	*msg_accrights;		/* access rights sent/received */
-	int	msg_accrightslen;
-};
-#endif
-
-/*
- * howto arguments for shutdown(2), specified by Posix.1g.
- */
-#define	SHUT_RD		0		/* shut down the reading side */
-#define	SHUT_WR		1		/* shut down the writing side */
-#define	SHUT_RDWR	2		/* shut down both sides */
-
-#if __BSD_VISIBLE
-/* for SCTP */
-/* we cheat and use the SHUT_XX defines for these */
-#define PRU_FLUSH_RD     SHUT_RD
-#define PRU_FLUSH_WR     SHUT_WR
-#define PRU_FLUSH_RDWR   SHUT_RDWR
-#endif
-
-
-#if __BSD_VISIBLE
-/*
- * sendfile(2) header/trailer struct
- */
-struct sf_hdtr {
-	struct iovec *headers;	/* pointer to an array of header struct iovec's */
-	int hdr_cnt;		/* number of header iovec's */
-	struct iovec *trailers;	/* pointer to an array of trailer struct iovec's */
-	int trl_cnt;		/* number of trailer iovec's */
-};
-
-/*
- * Sendfile-specific flag(s)
- */
-#define	SF_NODISKIO     0x00000001
-#define	SF_MNOWAIT	0x00000002
-#define	SF_SYNC		0x00000004
-
-#ifdef _KERNEL
-#define	SFK_COMPAT	0x00000001
-#endif /* _KERNEL */
-#endif /* __BSD_VISIBLE */
-
-#ifndef	_KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	accept(int, struct sockaddr * __restrict, socklen_t * __restrict);
-int	bind(int, const struct sockaddr *, socklen_t);
-int	connect(int, const struct sockaddr *, socklen_t);
-#if __BSD_VISIBLE
-int	accept4(int, struct sockaddr * __restrict, socklen_t * __restrict, int);
-int	bindat(int, int, const struct sockaddr *, socklen_t);
-int	connectat(int, int, const struct sockaddr *, socklen_t);
-#endif
-int	getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict);
-int	getsockname(int, struct sockaddr * __restrict, socklen_t * __restrict);
-int	getsockopt(int, int, int, void * __restrict, socklen_t * __restrict);
-int	listen(int, int);
-ssize_t	recv(int, void *, size_t, int);
-ssize_t	recvfrom(int, void *, size_t, int, struct sockaddr * __restrict, socklen_t * __restrict);
-ssize_t	recvmsg(int, struct msghdr *, int);
-ssize_t	send(int, const void *, size_t, int);
-ssize_t	sendto(int, const void *,
-	    size_t, int, const struct sockaddr *, socklen_t);
-ssize_t	sendmsg(int, const struct msghdr *, int);
-#if __BSD_VISIBLE
-int	sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int);
-int	setfib(int);
-#endif
-int	setsockopt(int, int, int, const void *, socklen_t);
-int	shutdown(int, int);
-int	sockatmark(int);
-int	socket(int, int, int);
-int	socketpair(int, int, int, int *);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#ifdef _KERNEL
-struct socket;
-
-struct tcpcb *so_sototcpcb(struct socket *so);
-struct inpcb *so_sotoinpcb(struct socket *so);
-struct sockbuf *so_sockbuf_snd(struct socket *);
-struct sockbuf *so_sockbuf_rcv(struct socket *);
-
-int so_state_get(const struct socket *);
-void so_state_set(struct socket *, int);
-
-int so_options_get(const struct socket *);
-void so_options_set(struct socket *, int);
-
-int so_error_get(const struct socket *);
-void so_error_set(struct socket *, int);
-
-int so_linger_get(const struct socket *);
-void so_linger_set(struct socket *, int);
-
-struct protosw *so_protosw_get(const struct socket *);
-void so_protosw_set(struct socket *, struct protosw *);
-
-void so_sorwakeup_locked(struct socket *so);
-void so_sowwakeup_locked(struct socket *so);
-
-void so_sorwakeup(struct socket *so);
-void so_sowwakeup(struct socket *so);
-
-void so_lock(struct socket *so);
-void so_unlock(struct socket *so);
-
-void so_listeners_apply_all(struct socket *so, void (*func)(struct socket *, void *), void *arg);
-
-#endif
-
-
-#endif /* !_SYS_SOCKET_H_ */
diff --git a/include.new/sys/socketvar.h b/include.new/sys/socketvar.h
deleted file mode 100644
index c15c2f2..0000000
--- a/include.new/sys/socketvar.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 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.
- * 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.
- *
- *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- *
- * $FreeBSD: releng/10.2/sys/sys/socketvar.h 255608 2013-09-16 06:25:54Z kib $
- */
-
-#ifndef _SYS_SOCKETVAR_H_
-#define _SYS_SOCKETVAR_H_
-
-#include <sys/queue.h>			/* for TAILQ macros */
-#include <sys/selinfo.h>		/* for struct selinfo */
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/_sx.h>
-#include <sys/sockbuf.h>
-#include <sys/sockstate.h>
-#ifdef _KERNEL
-#include <sys/sockopt.h>
-#endif
-
-struct vnet;
-
-/*
- * Kernel structure per socket.
- * Contains send and receive buffer queues,
- * handle on protocol and pointer to protocol
- * private data and error information.
- */
-typedef	u_quad_t so_gen_t;
-
-struct socket;
-
-/*-
- * Locking key to struct socket:
- * (a) constant after allocation, no locking required.
- * (b) locked by SOCK_LOCK(so).
- * (c) locked by SOCKBUF_LOCK(&so->so_rcv).
- * (d) locked by SOCKBUF_LOCK(&so->so_snd).
- * (e) locked by ACCEPT_LOCK().
- * (f) not locked since integer reads/writes are atomic.
- * (g) used only as a sleep/wakeup address, no value.
- * (h) locked by global mutex so_global_mtx.
- */
-struct socket {
-	int	so_count;		/* (b) reference count */
-	short	so_type;		/* (a) generic type, see socket.h */
-	short	so_options;		/* from socket call, see socket.h */
-	short	so_linger;		/* time to linger while closing */
-	short	so_state;		/* (b) internal state flags SS_* */
-	int	so_qstate;		/* (e) internal state flags SQ_* */
-	void	*so_pcb;		/* protocol control block */
-	struct	vnet *so_vnet;		/* network stack instance */
-	struct	protosw *so_proto;	/* (a) protocol handle */
-/*
- * Variables for connection queuing.
- * Socket where accepts occur is so_head in all subsidiary sockets.
- * If so_head is 0, socket is not related to an accept.
- * For head socket so_incomp queues partially completed connections,
- * while so_comp is a queue of connections ready to be accepted.
- * If a connection is aborted and it has so_head set, then
- * it has to be pulled out of either so_incomp or so_comp.
- * We allow connections to queue up based on current queue lengths
- * and limit on number of queued connections for this socket.
- */
-	struct	socket *so_head;	/* (e) back pointer to listen socket */
-	TAILQ_HEAD(, socket) so_incomp;	/* (e) queue of partial unaccepted connections */
-	TAILQ_HEAD(, socket) so_comp;	/* (e) queue of complete unaccepted connections */
-	TAILQ_ENTRY(socket) so_list;	/* (e) list of unaccepted connections */
-	u_short	so_qlen;		/* (e) number of unaccepted connections */
-	u_short	so_incqlen;		/* (e) number of unaccepted incomplete
-					   connections */
-	u_short	so_qlimit;		/* (e) max number queued connections */
-	short	so_timeo;		/* (g) connection timeout */
-	u_short	so_error;		/* (f) error affecting connection */
-	struct	sigio *so_sigio;	/* [sg] information for async I/O or
-					   out of band data (SIGURG) */
-	u_long	so_oobmark;		/* (c) chars to oob mark */
-	TAILQ_HEAD(, aiocblist) so_aiojobq; /* AIO ops waiting on socket */
-
-	struct sockbuf so_rcv, so_snd;
-
-	struct	ucred *so_cred;		/* (a) user credentials */
-	struct	label *so_label;	/* (b) MAC label for socket */
-	struct	label *so_peerlabel;	/* (b) cached MAC label for peer */
-	/* NB: generation count must not be first. */
-	so_gen_t so_gencnt;		/* (h) generation count */
-	void	*so_emuldata;		/* (b) private data for emulators */
- 	struct so_accf {
-		struct	accept_filter *so_accept_filter;
-		void	*so_accept_filter_arg;	/* saved filter args */
-		char	*so_accept_filter_str;	/* saved user args */
-	} *so_accf;
-	/*
-	 * so_fibnum, so_user_cookie and friends can be used to attach
-	 * some user-specified metadata to a socket, which then can be
-	 * used by the kernel for various actions.
-	 * so_user_cookie is used by ipfw/dummynet.
-	 */
-	int so_fibnum;		/* routing domain for this socket */
-	uint32_t so_user_cookie;
-};
-
-/*
- * Global accept mutex to serialize access to accept queues and
- * fields associated with multiple sockets.  This allows us to
- * avoid defining a lock order between listen and accept sockets
- * until such time as it proves to be a good idea.
- */
-extern struct mtx accept_mtx;
-#define	ACCEPT_LOCK_ASSERT()		mtx_assert(&accept_mtx, MA_OWNED)
-#define	ACCEPT_UNLOCK_ASSERT()		mtx_assert(&accept_mtx, MA_NOTOWNED)
-#define	ACCEPT_LOCK()			mtx_lock(&accept_mtx)
-#define	ACCEPT_UNLOCK()			mtx_unlock(&accept_mtx)
-
-/*
- * Per-socket mutex: we reuse the receive socket buffer mutex for space
- * efficiency.  This decision should probably be revisited as we optimize
- * locking for the socket code.
- */
-#define	SOCK_MTX(_so)			SOCKBUF_MTX(&(_so)->so_rcv)
-#define	SOCK_LOCK(_so)			SOCKBUF_LOCK(&(_so)->so_rcv)
-#define	SOCK_OWNED(_so)			SOCKBUF_OWNED(&(_so)->so_rcv)
-#define	SOCK_UNLOCK(_so)		SOCKBUF_UNLOCK(&(_so)->so_rcv)
-#define	SOCK_LOCK_ASSERT(_so)		SOCKBUF_LOCK_ASSERT(&(_so)->so_rcv)
-
-/*
- * Socket state bits stored in so_qstate.
- */
-#define	SQ_INCOMP		0x0800	/* unaccepted, incomplete connection */
-#define	SQ_COMP			0x1000	/* unaccepted, complete connection */
-
-/*
- * Externalized form of struct socket used by the sysctl(3) interface.
- */
-struct xsocket {
-	size_t	xso_len;	/* length of this structure */
-	struct	socket *xso_so;	/* makes a convenient handle sometimes */
-	short	so_type;
-	short	so_options;
-	short	so_linger;
-	short	so_state;
-	caddr_t	so_pcb;		/* another convenient handle */
-	int	xso_protocol;
-	int	xso_family;
-	u_short	so_qlen;
-	u_short	so_incqlen;
-	u_short	so_qlimit;
-	short	so_timeo;
-	u_short	so_error;
-	pid_t	so_pgid;
-	u_long	so_oobmark;
-	struct xsockbuf so_rcv, so_snd;
-	uid_t	so_uid;		/* XXX */
-};
-
-#ifdef _KERNEL
-
-/*
- * Macros for sockets and socket buffering.
- */
-
-/*
- * Flags to sblock().
- */
-#define	SBL_WAIT	0x00000001	/* Wait if not immediately available. */
-#define	SBL_NOINTR	0x00000002	/* Force non-interruptible sleep. */
-#define	SBL_VALID	(SBL_WAIT | SBL_NOINTR)
-
-/*
- * Do we need to notify the other side when I/O is possible?
- */
-#define	sb_notify(sb)	(((sb)->sb_flags & (SB_WAIT | SB_SEL | SB_ASYNC | \
-    SB_UPCALL | SB_AIO | SB_KNOTE)) != 0)
-
-/* do we have to send all at once on a socket? */
-#define	sosendallatonce(so) \
-    ((so)->so_proto->pr_flags & PR_ATOMIC)
-
-/* can we read something from so? */
-#define	soreadabledata(so) \
-    ((so)->so_rcv.sb_cc >= (so)->so_rcv.sb_lowat || \
-	!TAILQ_EMPTY(&(so)->so_comp) || (so)->so_error)
-#define	soreadable(so) \
-	(soreadabledata(so) || ((so)->so_rcv.sb_state & SBS_CANTRCVMORE))
-
-/* can we write something to so? */
-#define	sowriteable(so) \
-    ((sbspace(&(so)->so_snd) >= (so)->so_snd.sb_lowat && \
-	(((so)->so_state&SS_ISCONNECTED) || \
-	  ((so)->so_proto->pr_flags&PR_CONNREQUIRED)==0)) || \
-     ((so)->so_snd.sb_state & SBS_CANTSENDMORE) || \
-     (so)->so_error)
-
-/*
- * soref()/sorele() ref-count the socket structure.  Note that you must
- * still explicitly close the socket, but the last ref count will free
- * the structure.
- */
-#define	soref(so) do {							\
-	SOCK_LOCK_ASSERT(so);						\
-	++(so)->so_count;						\
-} while (0)
-
-#define	sorele(so) do {							\
-	ACCEPT_LOCK_ASSERT();						\
-	SOCK_LOCK_ASSERT(so);						\
-	if ((so)->so_count <= 0)					\
-		panic("sorele");					\
-	if (--(so)->so_count == 0)					\
-		sofree(so);						\
-	else {								\
-		SOCK_UNLOCK(so);					\
-		ACCEPT_UNLOCK();					\
-	}								\
-} while (0)
-
-/*
- * In sorwakeup() and sowwakeup(), acquire the socket buffer lock to
- * avoid a non-atomic test-and-wakeup.  However, sowakeup is
- * responsible for releasing the lock if it is called.  We unlock only
- * if we don't call into sowakeup.  If any code is introduced that
- * directly invokes the underlying sowakeup() primitives, it must
- * maintain the same semantics.
- */
-#define	sorwakeup_locked(so) do {					\
-	SOCKBUF_LOCK_ASSERT(&(so)->so_rcv);				\
-	if (sb_notify(&(so)->so_rcv))					\
-		sowakeup((so), &(so)->so_rcv);	 			\
-	else								\
-		SOCKBUF_UNLOCK(&(so)->so_rcv);				\
-} while (0)
-
-#define	sorwakeup(so) do {						\
-	SOCKBUF_LOCK(&(so)->so_rcv);					\
-	sorwakeup_locked(so);						\
-} while (0)
-
-#define	sowwakeup_locked(so) do {					\
-	SOCKBUF_LOCK_ASSERT(&(so)->so_snd);				\
-	if (sb_notify(&(so)->so_snd))					\
-		sowakeup((so), &(so)->so_snd); 				\
-	else								\
-		SOCKBUF_UNLOCK(&(so)->so_snd);				\
-} while (0)
-
-#define	sowwakeup(so) do {						\
-	SOCKBUF_LOCK(&(so)->so_snd);					\
-	sowwakeup_locked(so);						\
-} while (0)
-
-struct accept_filter {
-	char	accf_name[16];
-	int	(*accf_callback)
-		(struct socket *so, void *arg, int waitflag);
-	void *	(*accf_create)
-		(struct socket *so, char *arg);
-	void	(*accf_destroy)
-		(struct socket *so);
-	SLIST_ENTRY(accept_filter) accf_next;
-};
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_ACCF);
-MALLOC_DECLARE(M_PCB);
-MALLOC_DECLARE(M_SONAME);
-#endif
-
-extern int	maxsockets;
-extern u_long	sb_max;
-extern so_gen_t so_gencnt;
-
-struct mbuf;
-struct sockaddr;
-struct ucred;
-struct uio;
-
-/* 'which' values for socket upcalls. */
-#define	SO_RCV		1
-#define	SO_SND		2
-
-/* Return values for socket upcalls. */
-#define	SU_OK		0
-#define	SU_ISCONNECTED	1
-
-/*
- * From uipc_socket and friends
- */
-int	sockargs(struct mbuf **mp, caddr_t buf, int buflen, int type);
-int	getsockaddr(struct sockaddr **namp, caddr_t uaddr, size_t len);
-void	soabort(struct socket *so);
-int	soaccept(struct socket *so, struct sockaddr **nam);
-int	socheckuid(struct socket *so, uid_t uid);
-int	sobind(struct socket *so, struct sockaddr *nam, struct thread *td);
-int	sobindat(int fd, struct socket *so, struct sockaddr *nam,
-	    struct thread *td);
-int	soclose(struct socket *so);
-int	soconnect(struct socket *so, struct sockaddr *nam, struct thread *td);
-int	soconnectat(int fd, struct socket *so, struct sockaddr *nam,
-	    struct thread *td);
-int	soconnect2(struct socket *so1, struct socket *so2);
-int	socreate(int dom, struct socket **aso, int type, int proto,
-	    struct ucred *cred, struct thread *td);
-int	sodisconnect(struct socket *so);
-struct	sockaddr *sodupsockaddr(const struct sockaddr *sa, int mflags);
-void	sofree(struct socket *so);
-void	sohasoutofband(struct socket *so);
-int	solisten(struct socket *so, int backlog, struct thread *td);
-void	solisten_proto(struct socket *so, int backlog);
-int	solisten_proto_check(struct socket *so);
-struct socket *
-	sonewconn(struct socket *head, int connstatus);
-
-
-int	sopoll(struct socket *so, int events, struct ucred *active_cred,
-	    struct thread *td);
-int	sopoll_generic(struct socket *so, int events,
-	    struct ucred *active_cred, struct thread *td);
-int	soreceive(struct socket *so, struct sockaddr **paddr, struct uio *uio,
-	    struct mbuf **mp0, struct mbuf **controlp, int *flagsp);
-int	soreceive_stream(struct socket *so, struct sockaddr **paddr,
-	    struct uio *uio, struct mbuf **mp0, struct mbuf **controlp,
-	    int *flagsp);
-int	soreceive_dgram(struct socket *so, struct sockaddr **paddr,
-	    struct uio *uio, struct mbuf **mp0, struct mbuf **controlp,
-	    int *flagsp);
-int	soreceive_generic(struct socket *so, struct sockaddr **paddr,
-	    struct uio *uio, struct mbuf **mp0, struct mbuf **controlp,
-	    int *flagsp);
-int	soreserve(struct socket *so, u_long sndcc, u_long rcvcc);
-void	sorflush(struct socket *so);
-int	sosend(struct socket *so, struct sockaddr *addr, struct uio *uio,
-	    struct mbuf *top, struct mbuf *control, int flags,
-	    struct thread *td);
-int	sosend_dgram(struct socket *so, struct sockaddr *addr,
-	    struct uio *uio, struct mbuf *top, struct mbuf *control,
-	    int flags, struct thread *td);
-int	sosend_generic(struct socket *so, struct sockaddr *addr,
-	    struct uio *uio, struct mbuf *top, struct mbuf *control,
-	    int flags, struct thread *td);
-int	soshutdown(struct socket *so, int how);
-void	sotoxsocket(struct socket *so, struct xsocket *xso);
-void	soupcall_clear(struct socket *so, int which);
-void	soupcall_set(struct socket *so, int which,
-	    int (*func)(struct socket *, void *, int), void *arg);
-void	sowakeup(struct socket *so, struct sockbuf *sb);
-int	selsocket(struct socket *so, int events, struct timeval *tv,
-	    struct thread *td);
-
-/*
- * Accept filter functions (duh).
- */
-int	accept_filt_add(struct accept_filter *filt);
-int	accept_filt_del(char *name);
-struct	accept_filter *accept_filt_get(char *name);
-#ifdef ACCEPT_FILTER_MOD
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_net_inet_accf);
-#endif
-int	accept_filt_generic_mod_event(module_t mod, int event, void *data);
-#endif
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_SOCKETVAR_H_ */
diff --git a/include.new/sys/sockio.h b/include.new/sys/sockio.h
deleted file mode 100644
index 7a8f84c..0000000
--- a/include.new/sys/sockio.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)sockio.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD: releng/10.2/sys/sys/sockio.h 284074 2015-06-06 13:37:11Z ae $
- */
-
-#ifndef _SYS_SOCKIO_H_
-#define	_SYS_SOCKIO_H_
-
-#include <sys/ioccom.h>
-
-/* Socket ioctl's. */
-#define	SIOCSHIWAT	 _IOW('s',  0, int)		/* set high watermark */
-#define	SIOCGHIWAT	 _IOR('s',  1, int)		/* get high watermark */
-#define	SIOCSLOWAT	 _IOW('s',  2, int)		/* set low watermark */
-#define	SIOCGLOWAT	 _IOR('s',  3, int)		/* get low watermark */
-#define	SIOCATMARK	 _IOR('s',  7, int)		/* at oob mark? */
-#define	SIOCSPGRP	 _IOW('s',  8, int)		/* set process group */
-#define	SIOCGPGRP	 _IOR('s',  9, int)		/* get process group */
-
-/*	SIOCADDRT	 _IOW('r', 10, struct ortentry)	4.3BSD */
-/*	SIOCDELRT	 _IOW('r', 11, struct ortentry)	4.3BSD */
-#define	SIOCGETVIFCNT	_IOWR('r', 15, struct sioc_vif_req)/* get vif pkt cnt */
-#define	SIOCGETSGCNT	_IOWR('r', 16, struct sioc_sg_req) /* get s,g pkt cnt */
-
-#define	SIOCSIFADDR	 _IOW('i', 12, struct ifreq)	/* set ifnet address */
-#define	OSIOCGIFADDR	_IOWR('i', 13, struct ifreq)	/* get ifnet address */
-#define	SIOCGIFADDR	_IOWR('i', 33, struct ifreq)	/* get ifnet address */
-#define	SIOCSIFDSTADDR	 _IOW('i', 14, struct ifreq)	/* set p-p address */
-#define	OSIOCGIFDSTADDR	_IOWR('i', 15, struct ifreq)	/* get p-p address */
-#define	SIOCGIFDSTADDR	_IOWR('i', 34, struct ifreq)	/* get p-p address */
-#define	SIOCSIFFLAGS	 _IOW('i', 16, struct ifreq)	/* set ifnet flags */
-#define	SIOCGIFFLAGS	_IOWR('i', 17, struct ifreq)	/* get ifnet flags */
-#define	OSIOCGIFBRDADDR	_IOWR('i', 18, struct ifreq)	/* get broadcast addr */
-#define	SIOCGIFBRDADDR	_IOWR('i', 35, struct ifreq)	/* get broadcast addr */
-#define	SIOCSIFBRDADDR	 _IOW('i', 19, struct ifreq)	/* set broadcast addr */
-#define	OSIOCGIFCONF	_IOWR('i', 20, struct ifconf)	/* get ifnet list */
-#define	SIOCGIFCONF	_IOWR('i', 36, struct ifconf)	/* get ifnet list */
-#define	OSIOCGIFNETMASK	_IOWR('i', 21, struct ifreq)	/* get net addr mask */
-#define	SIOCGIFNETMASK	_IOWR('i', 37, struct ifreq)	/* get net addr mask */
-#define	SIOCSIFNETMASK	 _IOW('i', 22, struct ifreq)	/* set net addr mask */
-#define	SIOCGIFMETRIC	_IOWR('i', 23, struct ifreq)	/* get IF metric */
-#define	SIOCSIFMETRIC	 _IOW('i', 24, struct ifreq)	/* set IF metric */
-#define	SIOCDIFADDR	 _IOW('i', 25, struct ifreq)	/* delete IF addr */
-#define	OSIOCAIFADDR	 _IOW('i', 26, struct oifaliasreq)/* add/chg IF alias */
-#define	SIOCALIFADDR	 _IOW('i', 27, struct if_laddrreq) /* add IF addr */
-#define	SIOCGLIFADDR	_IOWR('i', 28, struct if_laddrreq) /* get IF addr */
-#define	SIOCDLIFADDR	 _IOW('i', 29, struct if_laddrreq) /* delete IF addr */
-#define	SIOCSIFCAP	 _IOW('i', 30, struct ifreq)	/* set IF features */
-#define	SIOCGIFCAP	_IOWR('i', 31, struct ifreq)	/* get IF features */
-#define	SIOCGIFINDEX	_IOWR('i', 32, struct ifreq)	/* get IF index */
-#define	SIOCGIFMAC	_IOWR('i', 38, struct ifreq)	/* get IF MAC label */
-#define	SIOCSIFMAC	 _IOW('i', 39, struct ifreq)	/* set IF MAC label */
-#define	SIOCSIFNAME	 _IOW('i', 40, struct ifreq)	/* set IF name */
-#define	SIOCSIFDESCR	 _IOW('i', 41, struct ifreq)	/* set ifnet descr */ 
-#define	SIOCGIFDESCR	_IOWR('i', 42, struct ifreq)	/* get ifnet descr */ 
-#define	SIOCAIFADDR	 _IOW('i', 43, struct ifaliasreq)/* add/chg IF alias */
-
-#define	SIOCADDMULTI	 _IOW('i', 49, struct ifreq)	/* add m'cast addr */
-#define	SIOCDELMULTI	 _IOW('i', 50, struct ifreq)	/* del m'cast addr */
-#define	SIOCGIFMTU	_IOWR('i', 51, struct ifreq)	/* get IF mtu */
-#define	SIOCSIFMTU	 _IOW('i', 52, struct ifreq)	/* set IF mtu */
-#define	SIOCGIFPHYS	_IOWR('i', 53, struct ifreq)	/* get IF wire */
-#define	SIOCSIFPHYS	 _IOW('i', 54, struct ifreq)	/* set IF wire */
-#define	SIOCSIFMEDIA	_IOWR('i', 55, struct ifreq)	/* set net media */
-#define	SIOCGIFMEDIA	_IOWR('i', 56, struct ifmediareq) /* get net media */
-
-#define	SIOCSIFGENERIC	 _IOW('i', 57, struct ifreq)	/* generic IF set op */
-#define	SIOCGIFGENERIC	_IOWR('i', 58, struct ifreq)	/* generic IF get op */
-
-#define	SIOCGIFSTATUS	_IOWR('i', 59, struct ifstat)	/* get IF status */
-#define	SIOCSIFLLADDR	 _IOW('i', 60, struct ifreq)	/* set linklevel addr */
-
-#define	SIOCSIFPHYADDR	 _IOW('i', 70, struct ifaliasreq) /* set gif addres */
-#define	SIOCGIFPSRCADDR	_IOWR('i', 71, struct ifreq)	/* get gif psrc addr */
-#define	SIOCGIFPDSTADDR	_IOWR('i', 72, struct ifreq)	/* get gif pdst addr */
-#define	SIOCDIFPHYADDR	 _IOW('i', 73, struct ifreq)	/* delete gif addrs */
-#define	SIOCSLIFPHYADDR	 _IOW('i', 74, struct if_laddrreq) /* set gif addrs */
-#define	SIOCGLIFPHYADDR	_IOWR('i', 75, struct if_laddrreq) /* get gif addrs */
-
-#define	SIOCGPRIVATE_0	_IOWR('i', 80, struct ifreq)	/* device private 0 */
-#define	SIOCGPRIVATE_1	_IOWR('i', 81, struct ifreq)	/* device private 1 */
-
-#define	SIOCSIFVNET	_IOWR('i', 90, struct ifreq)	/* move IF jail/vnet */
-#define	SIOCSIFRVNET	_IOWR('i', 91, struct ifreq)	/* reclaim vnet IF */
-
-#define	SIOCGIFFIB	_IOWR('i', 92, struct ifreq)	/* get IF fib */
-#define	SIOCSIFFIB	 _IOW('i', 93, struct ifreq)	/* set IF fib */
-
-#define	SIOCGTUNFIB	_IOWR('i', 94, struct ifreq)	/* get tunnel fib */
-#define	SIOCSTUNFIB	 _IOW('i', 95, struct ifreq)	/* set tunnel fib */
-
-#define	SIOCSDRVSPEC	_IOW('i', 123, struct ifdrv)	/* set driver-specific
-								  parameters */
-#define	SIOCGDRVSPEC	_IOWR('i', 123, struct ifdrv)	/* get driver-specific
-								  parameters */
-
-#define	SIOCIFCREATE	_IOWR('i', 122, struct ifreq)	/* create clone if */
-#define	SIOCIFCREATE2	_IOWR('i', 124, struct ifreq)	/* create clone if */
-#define	SIOCIFDESTROY	 _IOW('i', 121, struct ifreq)	/* destroy clone if */
-#define	SIOCIFGCLONERS	_IOWR('i', 120, struct if_clonereq) /* get cloners */
-
-#define	SIOCAIFGROUP	 _IOW('i', 135, struct ifgroupreq) /* add an ifgroup */
-#define	SIOCGIFGROUP	_IOWR('i', 136, struct ifgroupreq) /* get ifgroups */
-#define	SIOCDIFGROUP	 _IOW('i', 137, struct ifgroupreq) /* delete ifgroup */
-#define	SIOCGIFGMEMB	_IOWR('i', 138, struct ifgroupreq) /* get members */
-#define	SIOCGIFXMEDIA	_IOWR('i', 139, struct ifmediareq) /* get net xmedia */
-
-#endif /* !_SYS_SOCKIO_H_ */
diff --git a/include.new/sys/sockopt.h b/include.new/sys/sockopt.h
deleted file mode 100644
index 81932a4..0000000
--- a/include.new/sys/sockopt.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 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.
- * 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.
- *
- *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- *
- * $FreeBSD: releng/10.2/sys/sys/sockopt.h 180948 2008-07-29 07:45:05Z kmacy $
- */
-#ifndef _SYS_SOCKOPT_H_
-#define _SYS_SOCKOPT_H_
-
-#ifndef _KERNEL
-#error "no user-servicable parts inside"
-#endif
-
-
-struct thread;
-struct socket;
-
-/*
- * Argument structure for sosetopt et seq.  This is in the KERNEL
- * section because it will never be visible to user code.
- */
-enum sopt_dir { SOPT_GET, SOPT_SET };
-
-struct	sockopt {
-	enum	sopt_dir sopt_dir; /* is this a get or a set? */
-	int	sopt_level;	/* second arg of [gs]etsockopt */
-	int	sopt_name;	/* third arg of [gs]etsockopt */
-	void   *sopt_val;	/* fourth arg of [gs]etsockopt */
-	size_t	sopt_valsize;	/* (almost) fifth arg of [gs]etsockopt */
-	struct	thread *sopt_td; /* calling thread or null if kernel */
-};
-
-int	sosetopt(struct socket *so, struct sockopt *sopt);
-int	sogetopt(struct socket *so, struct sockopt *sopt);
-int	sooptcopyin(struct sockopt *sopt, void *buf, size_t len, size_t minlen);
-int	sooptcopyout(struct sockopt *sopt, const void *buf, size_t len);
-/* XXX; prepare mbuf for (__FreeBSD__ < 3) routines. */
-int	soopt_getm(struct sockopt *sopt, struct mbuf **mp);
-int	soopt_mcopyin(struct sockopt *sopt, struct mbuf *m);
-int	soopt_mcopyout(struct sockopt *sopt, struct mbuf *m);
-int	do_getopt_accept_filter(struct socket *so, struct sockopt *sopt);
-int	do_setopt_accept_filter(struct socket *so, struct sockopt *sopt);
-int	so_setsockopt(struct socket *so, int level, int optname,
-	    void *optval, size_t optlen);
-
-#endif /* _SYS_SOCKOPT_H_ */
diff --git a/include.new/sys/sockstate.h b/include.new/sys/sockstate.h
deleted file mode 100644
index 7729a2c..0000000
--- a/include.new/sys/sockstate.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 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.
- * 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.
- *
- *	@(#)socketvar.h	8.3 (Berkeley) 2/19/95
- *
- * $FreeBSD: releng/10.2/sys/sys/sockstate.h 180948 2008-07-29 07:45:05Z kmacy $
- */
-#ifndef _SYS_SOCKTATE_H_
-#define _SYS_SOCKTATE_H_
-
-/*
- * Socket state bits.
- *
- * Historically, this bits were all kept in the so_state field.  For
- * locking reasons, they are now in multiple fields, as they are
- * locked differently.  so_state maintains basic socket state protected
- * by the socket lock.  so_qstate holds information about the socket
- * accept queues.  Each socket buffer also has a state field holding
- * information relevant to that socket buffer (can't send, rcv).  Many
- * fields will be read without locks to improve performance and avoid
- * lock order issues.  However, this approach must be used with caution.
- */
-#define	SS_NOFDREF		0x0001	/* no file table ref any more */
-#define	SS_ISCONNECTED		0x0002	/* socket connected to a peer */
-#define	SS_ISCONNECTING		0x0004	/* in process of connecting to peer */
-#define	SS_ISDISCONNECTING	0x0008	/* in process of disconnecting */
-#define	SS_NBIO			0x0100	/* non-blocking ops */
-#define	SS_ASYNC		0x0200	/* async i/o notify */
-#define	SS_ISCONFIRMING		0x0400	/* deciding to accept connection req */
-#define	SS_ISDISCONNECTED	0x2000	/* socket disconnected from peer */
-
-/*
- * Protocols can mark a socket as SS_PROTOREF to indicate that, following
- * pru_detach, they still want the socket to persist, and will free it
- * themselves when they are done.  Protocols should only ever call sofree()
- * following setting this flag in pru_detach(), and never otherwise, as
- * sofree() bypasses socket reference counting.
- */
-#define	SS_PROTOREF		0x4000	/* strong protocol reference */
-
-/*
- * Socket state bits now stored in the socket buffer state field.
- */
-#define	SBS_CANTSENDMORE	0x0010	/* can't send more data to peer */
-#define	SBS_CANTRCVMORE		0x0020	/* can't receive more data from peer */
-#define	SBS_RCVATMARK		0x0040	/* at mark on input */
-
-struct socket;
-
-void	soisconnected(struct socket *so);
-void	soisconnecting(struct socket *so);
-void	soisdisconnected(struct socket *so);
-void	soisdisconnecting(struct socket *so);
-void	socantrcvmore(struct socket *so);
-void	socantrcvmore_locked(struct socket *so);
-void	socantsendmore(struct socket *so);
-void	socantsendmore_locked(struct socket *so);
-#endif /* _SYS_SOCKTATE_H_ */
diff --git a/include.new/sys/soundcard.h b/include.new/sys/soundcard.h
deleted file mode 100644
index 749642d..0000000
--- a/include.new/sys/soundcard.h
+++ /dev/null
@@ -1,2004 +0,0 @@
-/*
- * soundcard.h
- */
-
-/*-
- * Copyright by Hannu Savolainen 1993 / 4Front Technologies 1993-2006
- * Modified for the new FreeBSD sound driver by Luigi Rizzo, 1997
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/soundcard.h 223663 2011-06-29 08:32:37Z avg $
- */
-
-/*
- * Unless coordinating changes with 4Front Technologies, do NOT make any
- * modifications to ioctl commands, types, etc. that would break
- * compatibility with the OSS API.
- */
-
-#ifndef _SYS_SOUNDCARD_H_
-#define _SYS_SOUNDCARD_H_
- /*
-  * If you make modifications to this file, please contact me before
-  * distributing the modified version. There is already enough
-  * diversity in the world.
-  *
-  * Regards,
-  * Hannu Savolainen
-  * hannu@voxware.pp.fi
-  *
-  **********************************************************************
-  * PS.	The Hacker's Guide to VoxWare available from
-  *     nic.funet.fi:pub/Linux/ALPHA/sound. The file is
-  *	snd-sdk-doc-0.1.ps.gz (gzipped postscript). It contains
-  *	some useful information about programming with VoxWare.
-  *	(NOTE! The pub/Linux/ALPHA/ directories are hidden. You have
-  *	to cd inside them before the files are accessible.)
-  **********************************************************************
-  */
-
-/*
- * SOUND_VERSION is only used by the voxware driver. Hopefully apps
- * should not depend on it, but rather look at the capabilities
- * of the driver in the kernel!
- */
-#define SOUND_VERSION  301
-#define VOXWARE		/* does this have any use ? */
-
-/*
- * Supported card ID numbers (Should be somewhere else? We keep
- * them here just for compativility with the old driver, but these
- * constants are of little or no use).
- */
-
-#define SNDCARD_ADLIB          1
-#define SNDCARD_SB             2
-#define SNDCARD_PAS            3
-#define SNDCARD_GUS            4
-#define SNDCARD_MPU401         5
-#define SNDCARD_SB16           6
-#define SNDCARD_SB16MIDI       7
-#define SNDCARD_UART6850       8
-#define SNDCARD_GUS16          9
-#define SNDCARD_MSS            10
-#define SNDCARD_PSS            11
-#define SNDCARD_SSCAPE         12
-#define SNDCARD_PSS_MPU        13
-#define SNDCARD_PSS_MSS        14
-#define SNDCARD_SSCAPE_MSS     15
-#define SNDCARD_TRXPRO         16
-#define SNDCARD_TRXPRO_SB      17
-#define SNDCARD_TRXPRO_MPU     18
-#define SNDCARD_MAD16          19
-#define SNDCARD_MAD16_MPU      20
-#define SNDCARD_CS4232         21
-#define SNDCARD_CS4232_MPU     22
-#define SNDCARD_MAUI           23
-#define SNDCARD_PSEUDO_MSS     24
-#define SNDCARD_AWE32          25
-#define SNDCARD_NSS            26
-#define SNDCARD_UART16550      27
-#define SNDCARD_OPL            28
-
-#include <sys/types.h>
-#include <machine/endian.h>
-#ifndef _IOWR
-#include <sys/ioccom.h>
-#endif  /* !_IOWR */
-
-/*
- * The first part of this file contains the new FreeBSD sound ioctl
- * interface. Tries to minimize the number of different ioctls, and
- * to be reasonably general.
- *
- * 970821: some of the new calls have not been implemented yet.
- */
-
-/*
- * the following three calls extend the generic file descriptor
- * interface. AIONWRITE is the dual of FIONREAD, i.e. returns the max
- * number of bytes for a write operation to be non-blocking.
- *
- * AIOGSIZE/AIOSSIZE are used to change the behaviour of the device,
- * from a character device (default) to a block device. In block mode,
- * (not to be confused with blocking mode) the main difference for the
- * application is that select() will return only when a complete
- * block can be read/written to the device, whereas in character mode
- * select will return true when one byte can be exchanged. For audio
- * devices, character mode makes select almost useless since one byte
- * will always be ready by the next sample time (which is often only a
- * handful of microseconds away).
- * Use a size of 0 or 1 to return to character mode.
- */
-#define	AIONWRITE   _IOR('A', 10, int)   /* get # bytes to write */
-struct snd_size {
-    int play_size;
-    int rec_size;
-};
-#define	AIOGSIZE    _IOR('A', 11, struct snd_size)/* read current blocksize */
-#define	AIOSSIZE    _IOWR('A', 11, struct snd_size)  /* sets blocksize */
-
-/*
- * The following constants define supported audio formats. The
- * encoding follows voxware conventions, i.e. 1 bit for each supported
- * format. We extend it by using bit 31 (RO) to indicate full-duplex
- * capability, and bit 29 (RO) to indicate that the card supports/
- * needs different formats on capture & playback channels.
- * Bit 29 (RW) is used to indicate/ask stereo.
- *
- * The number of bits required to store the sample is:
- *  o  4 bits for the IDA ADPCM format,
- *  o  8 bits for 8-bit formats, mu-law and A-law,
- *  o  16 bits for the 16-bit formats, and
- *  o  32 bits for the 24/32-bit formats.
- *  o  undefined for the MPEG audio format.
- */
-
-#define AFMT_QUERY	0x00000000	/* Return current format */
-#define AFMT_MU_LAW	0x00000001	/* Logarithmic mu-law */
-#define AFMT_A_LAW	0x00000002	/* Logarithmic A-law */
-#define AFMT_IMA_ADPCM	0x00000004	/* A 4:1 compressed format where 16-bit
-					 * squence represented using the
-					 * the average 4 bits per sample */
-#define AFMT_U8		0x00000008	/* Unsigned 8-bit */
-#define AFMT_S16_LE	0x00000010	/* Little endian signed 16-bit */
-#define AFMT_S16_BE	0x00000020	/* Big endian signed 16-bit */
-#define AFMT_S8		0x00000040	/* Signed 8-bit */
-#define AFMT_U16_LE	0x00000080	/* Little endian unsigned 16-bit */
-#define AFMT_U16_BE	0x00000100	/* Big endian unsigned 16-bit */
-#define AFMT_MPEG	0x00000200	/* MPEG MP2/MP3 audio */
-#define AFMT_AC3	0x00000400	/* Dolby Digital AC3 */
-
-/*
- * 32-bit formats below used for 24-bit audio data where the data is stored
- * in the 24 most significant bits and the least significant bits are not used
- * (should be set to 0).
- */
-#define AFMT_S32_LE	0x00001000	/* Little endian signed 32-bit */
-#define AFMT_S32_BE	0x00002000	/* Big endian signed 32-bit */
-#define AFMT_U32_LE	0x00004000	/* Little endian unsigned 32-bit */
-#define AFMT_U32_BE	0x00008000	/* Big endian unsigned 32-bit */
-#define AFMT_S24_LE	0x00010000	/* Little endian signed 24-bit */
-#define AFMT_S24_BE	0x00020000	/* Big endian signed 24-bit */
-#define AFMT_U24_LE	0x00040000	/* Little endian unsigned 24-bit */
-#define AFMT_U24_BE	0x00080000	/* Big endian unsigned 24-bit */
-
-/* Machine dependant AFMT_* definitions. */
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define AFMT_S16_NE	AFMT_S16_LE
-#define AFMT_S24_NE	AFMT_S24_LE
-#define AFMT_S32_NE	AFMT_S32_LE
-#define AFMT_U16_NE	AFMT_U16_LE
-#define AFMT_U24_NE	AFMT_U24_LE
-#define AFMT_U32_NE	AFMT_U32_LE
-#define AFMT_S16_OE	AFMT_S16_BE
-#define AFMT_S24_OE	AFMT_S24_BE
-#define AFMT_S32_OE	AFMT_S32_BE
-#define AFMT_U16_OE	AFMT_U16_BE
-#define AFMT_U24_OE	AFMT_U24_BE
-#define AFMT_U32_OE	AFMT_U32_BE
-#else
-#define AFMT_S16_OE	AFMT_S16_LE
-#define AFMT_S24_OE	AFMT_S24_LE
-#define AFMT_S32_OE	AFMT_S32_LE
-#define AFMT_U16_OE	AFMT_U16_LE
-#define AFMT_U24_OE	AFMT_U24_LE
-#define AFMT_U32_OE	AFMT_U32_LE
-#define AFMT_S16_NE	AFMT_S16_BE
-#define AFMT_S24_NE	AFMT_S24_BE
-#define AFMT_S32_NE	AFMT_S32_BE
-#define AFMT_U16_NE	AFMT_U16_BE
-#define AFMT_U24_NE	AFMT_U24_BE
-#define AFMT_U32_NE	AFMT_U32_BE
-#endif
-
-#define AFMT_STEREO	0x10000000	/* can do/want stereo	*/
-
-/*
- * the following are really capabilities
- */
-#define AFMT_WEIRD	0x20000000	/* weird hardware...	*/
-    /*
-     * AFMT_WEIRD reports that the hardware might need to operate
-     * with different formats in the playback and capture
-     * channels when operating in full duplex.
-     * As an example, SoundBlaster16 cards only support U8 in one
-     * direction and S16 in the other one, and applications should
-     * be aware of this limitation.
-     */
-#define AFMT_FULLDUPLEX	0x80000000	/* can do full duplex	*/
-
-/*
- * The following structure is used to get/set format and sampling rate.
- * While it would be better to have things such as stereo, bits per
- * sample, endiannes, etc split in different variables, it turns out
- * that formats are not that many, and not all combinations are possible.
- * So we followed the Voxware approach of associating one bit to each
- * format.
- */
-
-typedef struct _snd_chan_param {
-    u_long	play_rate;	/* sampling rate			*/
-    u_long	rec_rate;	/* sampling rate			*/
-    u_long	play_format;	/* everything describing the format	*/
-    u_long	rec_format;	/* everything describing the format	*/
-} snd_chan_param;
-#define	AIOGFMT    _IOR('f', 12, snd_chan_param)   /* get format */
-#define	AIOSFMT    _IOWR('f', 12, snd_chan_param)  /* sets format */
-
-/*
- * The following structure is used to get/set the mixer setting.
- * Up to 32 mixers are supported, each one with up to 32 channels.
- */
-typedef struct _snd_mix_param {
-    u_char	subdev;	/* which output				*/
-    u_char	line;	/* which input				*/
-    u_char	left,right; /* volumes, 0..255, 0 = mute	*/
-} snd_mix_param ;
-
-/* XXX AIOGMIX, AIOSMIX not implemented yet */
-#define AIOGMIX	_IOWR('A', 13, snd_mix_param)	/* return mixer status */
-#define AIOSMIX	_IOWR('A', 14, snd_mix_param)	/* sets mixer status   */
-
-/*
- * channel specifiers used in AIOSTOP and AIOSYNC
- */
-#define	AIOSYNC_PLAY	0x1	/* play chan */
-#define	AIOSYNC_CAPTURE	0x2	/* capture chan */
-/* AIOSTOP stop & flush a channel, returns the residual count */
-#define	AIOSTOP	_IOWR ('A', 15, int)
-
-/* alternate method used to notify the sync condition */
-#define	AIOSYNC_SIGNAL	0x100
-#define	AIOSYNC_SELECT	0x200
-
-/* what the 'pos' field refers to */
-#define AIOSYNC_READY	0x400
-#define AIOSYNC_FREE	0x800
-
-typedef struct _snd_sync_parm {
-    long chan ; /* play or capture channel, plus modifier */
-    long pos;
-} snd_sync_parm;
-#define	AIOSYNC	_IOWR ('A', 15, snd_sync_parm)	/* misc. synchronization */
-
-/*
- * The following is used to return device capabilities. If the structure
- * passed to the ioctl is zeroed, default values are returned for rate
- * and formats, a bitmap of available mixers is returned, and values
- * (inputs, different levels) for the first one are returned.
- *
- * If  formats, mixers, inputs are instantiated, then detailed info
- * are returned depending on the call.
- */
-typedef struct _snd_capabilities {
-    u_long	rate_min, rate_max;	/* min-max sampling rate */
-    u_long	formats;
-    u_long	bufsize; /* DMA buffer size */
-    u_long	mixers; /* bitmap of available mixers */
-    u_long	inputs; /* bitmap of available inputs (per mixer) */
-    u_short	left, right;	/* how many levels are supported */
-} snd_capabilities;
-#define AIOGCAP	_IOWR('A', 15, snd_capabilities)	/* get capabilities */
-
-/*
- * here is the old (Voxware) ioctl interface
- */
-
-/*
- * IOCTL Commands for /dev/sequencer
- */
-
-#define SNDCTL_SEQ_RESET	_IO  ('Q', 0)
-#define SNDCTL_SEQ_SYNC		_IO  ('Q', 1)
-#define SNDCTL_SYNTH_INFO	_IOWR('Q', 2, struct synth_info)
-#define SNDCTL_SEQ_CTRLRATE	_IOWR('Q', 3, int) /* Set/get timer res.(hz) */
-#define SNDCTL_SEQ_GETOUTCOUNT	_IOR ('Q', 4, int)
-#define SNDCTL_SEQ_GETINCOUNT	_IOR ('Q', 5, int)
-#define SNDCTL_SEQ_PERCMODE	_IOW ('Q', 6, int)
-#define SNDCTL_FM_LOAD_INSTR	_IOW ('Q', 7, struct sbi_instrument)	/* Valid for FM only */
-#define SNDCTL_SEQ_TESTMIDI	_IOW ('Q', 8, int)
-#define SNDCTL_SEQ_RESETSAMPLES	_IOW ('Q', 9, int)
-#define SNDCTL_SEQ_NRSYNTHS	_IOR ('Q',10, int)
-#define SNDCTL_SEQ_NRMIDIS	_IOR ('Q',11, int)
-#define SNDCTL_MIDI_INFO	_IOWR('Q',12, struct midi_info)
-#define SNDCTL_SEQ_THRESHOLD	_IOW ('Q',13, int)
-#define SNDCTL_SEQ_TRESHOLD	SNDCTL_SEQ_THRESHOLD	/* there was once a typo */
-#define SNDCTL_SYNTH_MEMAVL	_IOWR('Q',14, int) /* in=dev#, out=memsize */
-#define SNDCTL_FM_4OP_ENABLE	_IOW ('Q',15, int) /* in=dev# */
-#define SNDCTL_PMGR_ACCESS	_IOWR('Q',16, struct patmgr_info)
-#define SNDCTL_SEQ_PANIC	_IO  ('Q',17)
-#define SNDCTL_SEQ_OUTOFBAND	_IOW ('Q',18, struct seq_event_rec)
-#define SNDCTL_SEQ_GETTIME	_IOR ('Q',19, int)
-
-struct seq_event_rec {
-	u_char arr[8];
-};
-
-#define SNDCTL_TMR_TIMEBASE	_IOWR('T', 1, int)
-#define SNDCTL_TMR_START	_IO  ('T', 2)
-#define SNDCTL_TMR_STOP		_IO  ('T', 3)
-#define SNDCTL_TMR_CONTINUE	_IO  ('T', 4)
-#define SNDCTL_TMR_TEMPO	_IOWR('T', 5, int)
-#define SNDCTL_TMR_SOURCE	_IOWR('T', 6, int)
-#   define TMR_INTERNAL		0x00000001
-#   define TMR_EXTERNAL		0x00000002
-#	define TMR_MODE_MIDI	0x00000010
-#	define TMR_MODE_FSK	0x00000020
-#	define TMR_MODE_CLS	0x00000040
-#	define TMR_MODE_SMPTE	0x00000080
-#define SNDCTL_TMR_METRONOME	_IOW ('T', 7, int)
-#define SNDCTL_TMR_SELECT	_IOW ('T', 8, int)
-
-/*
- *	Endian aware patch key generation algorithm.
- */
-
-#if defined(_AIX) || defined(AIX)
-#  define _PATCHKEY(id) (0xfd00|id)
-#else
-#  define _PATCHKEY(id) ((id<<8)|0xfd)
-#endif
-
-/*
- *	Sample loading mechanism for internal synthesizers (/dev/sequencer)
- *	The following patch_info structure has been designed to support
- *	Gravis UltraSound. It tries to be universal format for uploading
- *	sample based patches but is probably too limited.
- */
-
-struct patch_info {
-/*		u_short key;		 Use GUS_PATCH here */
-	short key;		 /* Use GUS_PATCH here */
-#define GUS_PATCH	_PATCHKEY(0x04)
-#define OBSOLETE_GUS_PATCH	_PATCHKEY(0x02)
-
-	short device_no;	/* Synthesizer number */
-	short instr_no;		/* Midi pgm# */
-
-	u_long mode;
-/*
- * The least significant byte has the same format than the GUS .PAT
- * files
- */
-#define WAVE_16_BITS	0x01	/* bit 0 = 8 or 16 bit wave data. */
-#define WAVE_UNSIGNED	0x02	/* bit 1 = Signed - Unsigned data. */
-#define WAVE_LOOPING	0x04	/* bit 2 = looping enabled-1. */
-#define WAVE_BIDIR_LOOP	0x08	/* bit 3 = Set is bidirectional looping. */
-#define WAVE_LOOP_BACK	0x10	/* bit 4 = Set is looping backward. */
-#define WAVE_SUSTAIN_ON	0x20	/* bit 5 = Turn sustaining on. (Env. pts. 3)*/
-#define WAVE_ENVELOPES	0x40	/* bit 6 = Enable envelopes - 1 */
-				/* 	(use the env_rate/env_offs fields). */
-/* Linux specific bits */
-#define WAVE_VIBRATO	0x00010000	/* The vibrato info is valid */
-#define WAVE_TREMOLO	0x00020000	/* The tremolo info is valid */
-#define WAVE_SCALE	0x00040000	/* The scaling info is valid */
-/* Other bits must be zeroed */
-
-	long len;	/* Size of the wave data in bytes */
-	long loop_start, loop_end; /* Byte offsets from the beginning */
-
-/*
- * The base_freq and base_note fields are used when computing the
- * playback speed for a note. The base_note defines the tone frequency
- * which is heard if the sample is played using the base_freq as the
- * playback speed.
- *
- * The low_note and high_note fields define the minimum and maximum note
- * frequencies for which this sample is valid. It is possible to define
- * more than one samples for an instrument number at the same time. The
- * low_note and high_note fields are used to select the most suitable one.
- *
- * The fields base_note, high_note and low_note should contain
- * the note frequency multiplied by 1000. For example value for the
- * middle A is 440*1000.
- */
-
-	u_int base_freq;
-	u_long base_note;
-	u_long high_note;
-	u_long low_note;
-	int panning;	/* -128=left, 127=right */
-	int detuning;
-
-/*	New fields introduced in version 1.99.5	*/
-
-       /* Envelope. Enabled by mode bit WAVE_ENVELOPES	*/
-	u_char	env_rate[ 6 ];	 /* GUS HW ramping rate */
-	u_char	env_offset[ 6 ]; /* 255 == 100% */
-
-	/*
-	 * The tremolo, vibrato and scale info are not supported yet.
-	 * Enable by setting the mode bits WAVE_TREMOLO, WAVE_VIBRATO or
-	 * WAVE_SCALE
-	 */
-
-	u_char	tremolo_sweep;
-	u_char	tremolo_rate;
-	u_char	tremolo_depth;
-
-	u_char	vibrato_sweep;
-	u_char	vibrato_rate;
-	u_char	vibrato_depth;
-
-	int		scale_frequency;
-	u_int	scale_factor;		/* from 0 to 2048 or 0 to 2 */
-
-	int		volume;
-	int		spare[4];
-	char data[1];	/* The waveform data starts here */
-};
-
-struct sysex_info {
-	short key;		/* Use GUS_PATCH here */
-#define SYSEX_PATCH	_PATCHKEY(0x05)
-#define MAUI_PATCH	_PATCHKEY(0x06)
-	short device_no;	/* Synthesizer number */
-	long len;	/* Size of the sysex data in bytes */
-	u_char data[1];	/* Sysex data starts here */
-};
-
-/*
- * Patch management interface (/dev/sequencer, /dev/patmgr#)
- * Don't use these calls if you want to maintain compatibility with
- * the future versions of the driver.
- */
-
-#define PS_NO_PATCHES		0	/* No patch support on device */
-#define	PS_MGR_NOT_OK		1	/* Plain patch support (no mgr) */
-#define	PS_MGR_OK		2	/* Patch manager supported */
-#define	PS_MANAGED		3	/* Patch manager running */
-
-#define SNDCTL_PMGR_IFACE		_IOWR('P', 1, struct patmgr_info)
-
-/*
- * The patmgr_info is a fixed size structure which is used for two
- * different purposes. The intended use is for communication between
- * the application using /dev/sequencer and the patch manager daemon
- * associated with a synthesizer device (ioctl(SNDCTL_PMGR_ACCESS)).
- *
- * This structure is also used with ioctl(SNDCTL_PGMR_IFACE) which allows
- * a patch manager daemon to read and write device parameters. This
- * ioctl available through /dev/sequencer also. Avoid using it since it's
- * extremely hardware dependent. In addition access trough /dev/sequencer
- * may confuse the patch manager daemon.
- */
-
-struct patmgr_info {	/* Note! size must be < 4k since kmalloc() is used */
-	  u_long key;	/* Don't worry. Reserved for communication
-	  			   between the patch manager and the driver. */
-#define PM_K_EVENT		1 /* Event from the /dev/sequencer driver */
-#define PM_K_COMMAND		2 /* Request from an application */
-#define PM_K_RESPONSE		3 /* From patmgr to application */
-#define PM_ERROR		4 /* Error returned by the patmgr */
-	  int device;
-	  int command;
-
-/*
- * Commands 0x000 to 0xfff reserved for patch manager programs
- */
-#define PM_GET_DEVTYPE	1	/* Returns type of the patch mgr interface of dev */
-#define		PMTYPE_FM2	1	/* 2 OP fm */
-#define		PMTYPE_FM4	2	/* Mixed 4 or 2 op FM (OPL-3) */
-#define		PMTYPE_WAVE	3	/* Wave table synthesizer (GUS) */
-#define PM_GET_NRPGM	2	/* Returns max # of midi programs in parm1 */
-#define PM_GET_PGMMAP	3	/* Returns map of loaded midi programs in data8 */
-#define PM_GET_PGM_PATCHES 4	/* Return list of patches of a program (parm1) */
-#define PM_GET_PATCH	5	/* Return patch header of patch parm1 */
-#define PM_SET_PATCH	6	/* Set patch header of patch parm1 */
-#define PM_READ_PATCH	7	/* Read patch (wave) data */
-#define PM_WRITE_PATCH	8	/* Write patch (wave) data */
-
-/*
- * Commands 0x1000 to 0xffff are for communication between the patch manager
- * and the client
- */
-#define _PM_LOAD_PATCH	0x100
-
-/*
- * Commands above 0xffff reserved for device specific use
- */
-
-	long parm1;
-	long parm2;
-	long parm3;
-
-	union {
-		u_char data8[4000];
-		u_short data16[2000];
-		u_long data32[1000];
-		struct patch_info patch;
-	} data;
-};
-
-/*
- * When a patch manager daemon is present, it will be informed by the
- * driver when something important happens. For example when the
- * /dev/sequencer is opened or closed. A record with key == PM_K_EVENT is
- * returned. The command field contains the event type:
- */
-#define PM_E_OPENED		1	/* /dev/sequencer opened */
-#define PM_E_CLOSED		2	/* /dev/sequencer closed */
-#define PM_E_PATCH_RESET	3	/* SNDCTL_RESETSAMPLES called */
-#define PM_E_PATCH_LOADED	4	/* A patch has been loaded by appl */
-
-/*
- * /dev/sequencer input events.
- *
- * The data written to the /dev/sequencer is a stream of events. Events
- * are records of 4 or 8 bytes. The first byte defines the size.
- * Any number of events can be written with a write call. There
- * is a set of macros for sending these events. Use these macros if you
- * want to maximize portability of your program.
- *
- * Events SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO. Are also input events.
- * (All input events are currently 4 bytes long. Be prepared to support
- * 8 byte events also. If you receive any event having first byte >= 128,
- * it's a 8 byte event.
- *
- * The events are documented at the end of this file.
- *
- * Normal events (4 bytes)
- * There is also a 8 byte version of most of the 4 byte events. The
- * 8 byte one is recommended.
- */
-#define SEQ_NOTEOFF		0
-#define SEQ_FMNOTEOFF		SEQ_NOTEOFF	/* Just old name */
-#define SEQ_NOTEON		1
-#define	SEQ_FMNOTEON		SEQ_NOTEON
-#define SEQ_WAIT		TMR_WAIT_ABS
-#define SEQ_PGMCHANGE		3
-#define SEQ_FMPGMCHANGE		SEQ_PGMCHANGE
-#define SEQ_SYNCTIMER		TMR_START
-#define SEQ_MIDIPUTC		5
-#define SEQ_DRUMON		6	/*** OBSOLETE ***/
-#define SEQ_DRUMOFF		7	/*** OBSOLETE ***/
-#define SEQ_ECHO		TMR_ECHO	/* For synching programs with output */
-#define SEQ_AFTERTOUCH		9
-#define SEQ_CONTROLLER		10
-
-/*
- *	Midi controller numbers
- *
- * Controllers 0 to 31 (0x00 to 0x1f) and 32 to 63 (0x20 to 0x3f)
- * are continuous controllers.
- * In the MIDI 1.0 these controllers are sent using two messages.
- * Controller numbers 0 to 31 are used to send the MSB and the
- * controller numbers 32 to 63 are for the LSB. Note that just 7 bits
- * are used in MIDI bytes.
- */
-
-#define	CTL_BANK_SELECT		0x00
-#define	CTL_MODWHEEL		0x01
-#define CTL_BREATH		0x02
-/*	undefined		0x03 */
-#define CTL_FOOT		0x04
-#define CTL_PORTAMENTO_TIME	0x05
-#define CTL_DATA_ENTRY		0x06
-#define CTL_MAIN_VOLUME		0x07
-#define CTL_BALANCE		0x08
-/*	undefined		0x09 */
-#define CTL_PAN			0x0a
-#define CTL_EXPRESSION		0x0b
-/*	undefined		0x0c - 0x0f */
-#define CTL_GENERAL_PURPOSE1	0x10
-#define CTL_GENERAL_PURPOSE2	0x11
-#define CTL_GENERAL_PURPOSE3	0x12
-#define CTL_GENERAL_PURPOSE4	0x13
-/*	undefined		0x14 - 0x1f */
-
-/*	undefined		0x20 */
-
-/*
- * The controller numbers 0x21 to 0x3f are reserved for the
- * least significant bytes of the controllers 0x00 to 0x1f.
- * These controllers are not recognised by the driver.
- *
- * Controllers 64 to 69 (0x40 to 0x45) are on/off switches.
- * 0=OFF and 127=ON (intermediate values are possible)
- */
-#define CTL_DAMPER_PEDAL	0x40
-#define CTL_SUSTAIN		CTL_DAMPER_PEDAL	/* Alias */
-#define CTL_HOLD		CTL_DAMPER_PEDAL	/* Alias */
-#define CTL_PORTAMENTO		0x41
-#define CTL_SOSTENUTO		0x42
-#define CTL_SOFT_PEDAL		0x43
-/*	undefined		0x44 */
-#define CTL_HOLD2		0x45
-/*	undefined		0x46 - 0x4f */
-
-#define CTL_GENERAL_PURPOSE5	0x50
-#define CTL_GENERAL_PURPOSE6	0x51
-#define CTL_GENERAL_PURPOSE7	0x52
-#define CTL_GENERAL_PURPOSE8	0x53
-/*	undefined		0x54 - 0x5a */
-#define CTL_EXT_EFF_DEPTH	0x5b
-#define CTL_TREMOLO_DEPTH	0x5c
-#define CTL_CHORUS_DEPTH	0x5d
-#define CTL_DETUNE_DEPTH	0x5e
-#define CTL_CELESTE_DEPTH	CTL_DETUNE_DEPTH /* Alias for the above one */
-#define CTL_PHASER_DEPTH	0x5f
-#define CTL_DATA_INCREMENT	0x60
-#define CTL_DATA_DECREMENT	0x61
-#define CTL_NONREG_PARM_NUM_LSB	0x62
-#define CTL_NONREG_PARM_NUM_MSB	0x63
-#define CTL_REGIST_PARM_NUM_LSB	0x64
-#define CTL_REGIST_PARM_NUM_MSB	0x65
-/*	undefined		0x66 - 0x78 */
-/*	reserved		0x79 - 0x7f */
-
-/* Pseudo controllers (not midi compatible) */
-#define CTRL_PITCH_BENDER	255
-#define CTRL_PITCH_BENDER_RANGE	254
-#define CTRL_EXPRESSION		253	/* Obsolete */
-#define CTRL_MAIN_VOLUME	252	/* Obsolete */
-
-#define SEQ_BALANCE		11
-#define SEQ_VOLMODE             12
-
-/*
- * Volume mode decides how volumes are used
- */
-
-#define VOL_METHOD_ADAGIO	1
-#define VOL_METHOD_LINEAR	2
-
-/*
- * Note! SEQ_WAIT, SEQ_MIDIPUTC and SEQ_ECHO are used also as
- *	 input events.
- */
-
-/*
- * Event codes 0xf0 to 0xfc are reserved for future extensions.
- */
-
-#define SEQ_FULLSIZE		0xfd	/* Long events */
-/*
- * SEQ_FULLSIZE events are used for loading patches/samples to the
- * synthesizer devices. These events are passed directly to the driver
- * of the associated synthesizer device. There is no limit to the size
- * of the extended events. These events are not queued but executed
- * immediately when the write() is called (execution can take several
- * seconds of time).
- *
- * When a SEQ_FULLSIZE message is written to the device, it must
- * be written using exactly one write() call. Other events cannot
- * be mixed to the same write.
- *
- * For FM synths (YM3812/OPL3) use struct sbi_instrument and write
- * it to the /dev/sequencer. Don't write other data together with
- * the instrument structure Set the key field of the structure to
- * FM_PATCH. The device field is used to route the patch to the
- * corresponding device.
- *
- * For Gravis UltraSound use struct patch_info. Initialize the key field
- * to GUS_PATCH.
- */
-#define SEQ_PRIVATE	0xfe	/* Low level HW dependent events (8 bytes) */
-#define SEQ_EXTENDED	0xff	/* Extended events (8 bytes) OBSOLETE */
-
-/*
- * Record for FM patches
- */
-
-typedef u_char sbi_instr_data[32];
-
-struct sbi_instrument {
-	u_short	key;	/* FM_PATCH or OPL3_PATCH */
-#define FM_PATCH	_PATCHKEY(0x01)
-#define OPL3_PATCH	_PATCHKEY(0x03)
-	short		device;		/* Synth# (0-4)	*/
-	int 		channel;	/* Program# to be initialized  */
-	sbi_instr_data	operators;	/* Reg. settings for operator cells
-					 * (.SBI format)	*/
-};
-
-struct synth_info {	/* Read only */
-	char	name[30];
-	int	device;		/* 0-N. INITIALIZE BEFORE CALLING */
-	int	synth_type;
-#define SYNTH_TYPE_FM			0
-#define SYNTH_TYPE_SAMPLE		1
-#define SYNTH_TYPE_MIDI			2	/* Midi interface */
-
-	int	synth_subtype;
-#define FM_TYPE_ADLIB			0x00
-#define FM_TYPE_OPL3			0x01
-#define MIDI_TYPE_MPU401		0x401
-
-#define SAMPLE_TYPE_BASIC		0x10
-#define SAMPLE_TYPE_GUS			SAMPLE_TYPE_BASIC
-#define SAMPLE_TYPE_AWE32		0x20
-
-	int	perc_mode;	/* No longer supported */
-	int	nr_voices;
-	int	nr_drums;	/* Obsolete field */
-	int	instr_bank_size;
-	u_long	capabilities;
-#define SYNTH_CAP_PERCMODE	0x00000001 /* No longer used */
-#define SYNTH_CAP_OPL3		0x00000002 /* Set if OPL3 supported */
-#define SYNTH_CAP_INPUT		0x00000004 /* Input (MIDI) device */
-	int	dummies[19];	/* Reserve space */
-};
-
-struct sound_timer_info {
-	char name[32];
-	int caps;
-};
-
-struct midi_info {
-	char		name[30];
-	int		device;		/* 0-N. INITIALIZE BEFORE CALLING */
-	u_long	capabilities;	/* To be defined later */
-	int		dev_type;
-	int		dummies[18];	/* Reserve space */
-};
-
-/*
- * ioctl commands for the /dev/midi##
- */
-typedef struct {
-	u_char cmd;
-	char nr_args, nr_returns;
-	u_char data[30];
-} mpu_command_rec;
-
-#define SNDCTL_MIDI_PRETIME	_IOWR('m', 0, int)
-#define SNDCTL_MIDI_MPUMODE	_IOWR('m', 1, int)
-#define SNDCTL_MIDI_MPUCMD	_IOWR('m', 2, mpu_command_rec)
-#define MIOSPASSTHRU		_IOWR('m', 3, int)
-#define MIOGPASSTHRU		_IOWR('m', 4, int)
-
-/*
- * IOCTL commands for /dev/dsp and /dev/audio
- */
-
-#define SNDCTL_DSP_HALT		_IO  ('P', 0)
-#define SNDCTL_DSP_RESET	SNDCTL_DSP_HALT
-#define SNDCTL_DSP_SYNC		_IO  ('P', 1)
-#define SNDCTL_DSP_SPEED	_IOWR('P', 2, int)
-#define SNDCTL_DSP_STEREO	_IOWR('P', 3, int)
-#define SNDCTL_DSP_GETBLKSIZE	_IOR('P', 4, int)
-#define SNDCTL_DSP_SETBLKSIZE   _IOW('P', 4, int)
-#define SNDCTL_DSP_SETFMT	_IOWR('P',5, int) /* Selects ONE fmt*/
-
-/*
- * SOUND_PCM_WRITE_CHANNELS is not that different
- * from SNDCTL_DSP_STEREO
- */
-#define SOUND_PCM_WRITE_CHANNELS	_IOWR('P', 6, int)
-#define SNDCTL_DSP_CHANNELS	SOUND_PCM_WRITE_CHANNELS
-#define SOUND_PCM_WRITE_FILTER	_IOWR('P', 7, int)
-#define SNDCTL_DSP_POST		_IO  ('P', 8)
-
-/*
- * SNDCTL_DSP_SETBLKSIZE and the following two calls mostly do
- * the same thing, i.e. set the block size used in DMA transfers.
- */
-#define SNDCTL_DSP_SUBDIVIDE	_IOWR('P', 9, int)
-#define SNDCTL_DSP_SETFRAGMENT	_IOWR('P',10, int)
-
-
-#define SNDCTL_DSP_GETFMTS	_IOR ('P',11, int) /* Returns a mask */
-/*
- * Buffer status queries.
- */
-typedef struct audio_buf_info {
-    int fragments;	/* # of avail. frags (partly used ones not counted) */
-    int fragstotal;	/* Total # of fragments allocated */
-    int fragsize;	/* Size of a fragment in bytes */
-
-    int bytes;	/* Avail. space in bytes (includes partly used fragments) */
-		/* Note! 'bytes' could be more than fragments*fragsize */
-} audio_buf_info;
-
-#define SNDCTL_DSP_GETOSPACE	_IOR ('P',12, audio_buf_info)
-#define SNDCTL_DSP_GETISPACE	_IOR ('P',13, audio_buf_info)
-
-/*
- * SNDCTL_DSP_NONBLOCK is the same (but less powerful, since the
- * action cannot be undone) of FIONBIO. The same can be achieved
- * by opening the device with O_NDELAY
- */
-#define SNDCTL_DSP_NONBLOCK	_IO  ('P',14)
-
-#define SNDCTL_DSP_GETCAPS	_IOR ('P',15, int)
-#	define PCM_CAP_REVISION		0x000000ff	/* Bits for revision level (0 to 255) */
-#	define PCM_CAP_DUPLEX		0x00000100	/* Full duplex record/playback */
-#	define PCM_CAP_REALTIME		0x00000200	/* Not in use */
-#	define PCM_CAP_BATCH		0x00000400	/* Device has some kind of */
-							/* internal buffers which may */
-							/* cause some delays and */
-							/* decrease precision of timing */
-#	define PCM_CAP_COPROC		0x00000800	/* Has a coprocessor */
-							/* Sometimes it's a DSP */
-							/* but usually not */
-#	define PCM_CAP_TRIGGER		0x00001000	/* Supports SETTRIGGER */
-#	define PCM_CAP_MMAP		0x00002000	/* Supports mmap() */
-#	define PCM_CAP_MULTI		0x00004000	/* Supports multiple open */
-#	define PCM_CAP_BIND		0x00008000	/* Supports binding to front/rear/center/lfe */
-#   	define PCM_CAP_INPUT		0x00010000	/* Supports recording */
-#   	define PCM_CAP_OUTPUT		0x00020000	/* Supports playback */
-#	define PCM_CAP_VIRTUAL		0x00040000	/* Virtual device */
-/* 0x00040000 and 0x00080000 reserved for future use */
-
-/* Analog/digital control capabilities */
-#	define PCM_CAP_ANALOGOUT	0x00100000
-#	define PCM_CAP_ANALOGIN		0x00200000
-#	define PCM_CAP_DIGITALOUT	0x00400000
-#	define PCM_CAP_DIGITALIN	0x00800000
-#	define PCM_CAP_ADMASK		0x00f00000
-/*
- * NOTE! (capabilities & PCM_CAP_ADMASK)==0 means just that the
- * digital/analog interface control features are not supported by the 
- * device/driver. However the device still supports analog, digital or
- * both inputs/outputs (depending on the device). See the OSS Programmer's
- * Guide for full details.
- */
-#	define PCM_CAP_SPECIAL		0x01000000	/* Not for ordinary "multimedia" use */
-#	define PCM_CAP_SHADOW		0x00000000	/* OBSOLETE */
-
-/*
- * Preferred channel usage. These bits can be used to
- * give recommendations to the application. Used by few drivers.
- * For example if ((caps & DSP_CH_MASK) == DSP_CH_MONO) means that
- * the device works best in mono mode. However it doesn't necessarily mean
- * that the device cannot be used in stereo. These bits should only be used
- * by special applications such as multi track hard disk recorders to find
- * out the initial setup. However the user should be able to override this
- * selection.
- *
- * To find out which modes are actually supported the application should 
- * try to select them using SNDCTL_DSP_CHANNELS.
- */
-#	define DSP_CH_MASK		0x06000000	/* Mask */
-#	define DSP_CH_ANY		0x00000000	/* No preferred mode */
-#	define DSP_CH_MONO		0x02000000
-#	define DSP_CH_STEREO		0x04000000
-#	define DSP_CH_MULTI		0x06000000	/* More than two channels */
-
-#	define PCM_CAP_HIDDEN		0x08000000	/* Hidden device */
-#	define PCM_CAP_FREERATE		0x10000000
-#	define PCM_CAP_MODEM		0x20000000	/* Modem device */
-#	define PCM_CAP_DEFAULT		0x40000000	/* "Default" device */
-
-/*
- * The PCM_CAP_* capability names were known as DSP_CAP_* prior OSS 4.0
- * so it's necessary to define the older names too.
- */
-#define DSP_CAP_ADMASK		PCM_CAP_ADMASK
-#define DSP_CAP_ANALOGIN	PCM_CAP_ANALOGIN
-#define DSP_CAP_ANALOGOUT	PCM_CAP_ANALOGOUT
-#define DSP_CAP_BATCH		PCM_CAP_BATCH
-#define DSP_CAP_BIND		PCM_CAP_BIND
-#define DSP_CAP_COPROC		PCM_CAP_COPROC
-#define DSP_CAP_DEFAULT		PCM_CAP_DEFAULT
-#define DSP_CAP_DIGITALIN	PCM_CAP_DIGITALIN
-#define DSP_CAP_DIGITALOUT	PCM_CAP_DIGITALOUT
-#define DSP_CAP_DUPLEX		PCM_CAP_DUPLEX
-#define DSP_CAP_FREERATE	PCM_CAP_FREERATE
-#define DSP_CAP_HIDDEN		PCM_CAP_HIDDEN
-#define DSP_CAP_INPUT		PCM_CAP_INPUT
-#define DSP_CAP_MMAP		PCM_CAP_MMAP
-#define DSP_CAP_MODEM		PCM_CAP_MODEM
-#define DSP_CAP_MULTI		PCM_CAP_MULTI
-#define DSP_CAP_OUTPUT		PCM_CAP_OUTPUT
-#define DSP_CAP_REALTIME	PCM_CAP_REALTIME
-#define DSP_CAP_REVISION	PCM_CAP_REVISION
-#define DSP_CAP_SHADOW		PCM_CAP_SHADOW
-#define DSP_CAP_TRIGGER		PCM_CAP_TRIGGER
-#define DSP_CAP_VIRTUAL		PCM_CAP_VIRTUAL
-
-/*
- * What do these function do ?
- */
-#define SNDCTL_DSP_GETTRIGGER	_IOR ('P',16, int)
-#define SNDCTL_DSP_SETTRIGGER	_IOW ('P',16, int)
-#define PCM_ENABLE_INPUT	0x00000001
-#define PCM_ENABLE_OUTPUT	0x00000002
-
-typedef struct count_info {
-	int bytes;	/* Total # of bytes processed */
-	int blocks;	/* # of fragment transitions since last time */
-	int ptr;	/* Current DMA pointer value */
-} count_info;
-
-/*
- * GETIPTR and GETISPACE are not that different... same for out.
- */
-#define SNDCTL_DSP_GETIPTR	_IOR ('P',17, count_info)
-#define SNDCTL_DSP_GETOPTR	_IOR ('P',18, count_info)
-
-typedef struct buffmem_desc {
-	caddr_t buffer;
-	int size;
-} buffmem_desc;
-
-#define SNDCTL_DSP_MAPINBUF	_IOR ('P', 19, buffmem_desc)
-#define SNDCTL_DSP_MAPOUTBUF	_IOR ('P', 20, buffmem_desc)
-#define SNDCTL_DSP_SETSYNCRO	_IO  ('P', 21)
-#define SNDCTL_DSP_SETDUPLEX	_IO  ('P', 22)
-#define SNDCTL_DSP_GETODELAY	_IOR ('P', 23, int)
-
-/*
- * I guess these are the readonly version of the same
- * functions that exist above as SNDCTL_DSP_...
- */
-#define SOUND_PCM_READ_RATE	_IOR ('P', 2, int)
-#define SOUND_PCM_READ_CHANNELS	_IOR ('P', 6, int)
-#define SOUND_PCM_READ_BITS	_IOR ('P', 5, int)
-#define SOUND_PCM_READ_FILTER	_IOR ('P', 7, int)
-
-/*
- * ioctl calls to be used in communication with coprocessors and
- * DSP chips.
- */
-
-typedef struct copr_buffer {
-	int command;	/* Set to 0 if not used */
-	int flags;
-#define CPF_NONE		0x0000
-#define CPF_FIRST		0x0001	/* First block */
-#define CPF_LAST		0x0002	/* Last block */
-	int len;
-	int offs;	/* If required by the device (0 if not used) */
-
-	u_char data[4000]; /* NOTE! 4000 is not 4k */
-} copr_buffer;
-
-typedef struct copr_debug_buf {
-	int command;	/* Used internally. Set to 0 */
-	int parm1;
-	int parm2;
-	int flags;
-	int len;	/* Length of data in bytes */
-} copr_debug_buf;
-
-typedef struct copr_msg {
-	int len;
-	u_char data[4000];
-} copr_msg;
-
-#define SNDCTL_COPR_RESET       _IO  ('C',  0)
-#define SNDCTL_COPR_LOAD	_IOWR('C',  1, copr_buffer)
-#define SNDCTL_COPR_RDATA	_IOWR('C',  2, copr_debug_buf)
-#define SNDCTL_COPR_RCODE	_IOWR('C',  3, copr_debug_buf)
-#define SNDCTL_COPR_WDATA	_IOW ('C',  4, copr_debug_buf)
-#define SNDCTL_COPR_WCODE	_IOW ('C',  5, copr_debug_buf)
-#define SNDCTL_COPR_RUN		_IOWR('C',  6, copr_debug_buf)
-#define SNDCTL_COPR_HALT	_IOWR('C',  7, copr_debug_buf)
-#define SNDCTL_COPR_SENDMSG	_IOW ('C',  8, copr_msg)
-#define SNDCTL_COPR_RCVMSG	_IOR ('C',  9, copr_msg)
-
-/*
- * IOCTL commands for /dev/mixer
- */
-
-/*
- * Mixer devices
- *
- * There can be up to 20 different analog mixer channels. The
- * SOUND_MIXER_NRDEVICES gives the currently supported maximum.
- * The SOUND_MIXER_READ_DEVMASK returns a bitmask which tells
- * the devices supported by the particular mixer.
- */
-
-#define SOUND_MIXER_NRDEVICES	25
-#define SOUND_MIXER_VOLUME	0	/* Master output level */
-#define SOUND_MIXER_BASS	1	/* Treble level of all output channels */
-#define SOUND_MIXER_TREBLE	2	/* Bass level of all output channels */
-#define SOUND_MIXER_SYNTH	3	/* Volume of synthesier input */
-#define SOUND_MIXER_PCM		4	/* Output level for the audio device */
-#define SOUND_MIXER_SPEAKER	5	/* Output level for the PC speaker
-					 * signals */
-#define SOUND_MIXER_LINE	6	/* Volume level for the line in jack */
-#define SOUND_MIXER_MIC		7	/* Volume for the signal coming from
-					 * the microphone jack */
-#define SOUND_MIXER_CD		8	/* Volume level for the input signal
-					 * connected to the CD audio input */
-#define SOUND_MIXER_IMIX	9	/* Recording monitor. It controls the
-					 * output volume of the selected
-					 * recording sources while recording */
-#define SOUND_MIXER_ALTPCM	10	/* Volume of the alternative codec
-					 * device */
-#define SOUND_MIXER_RECLEV	11	/* Global recording level */
-#define SOUND_MIXER_IGAIN	12	/* Input gain */
-#define SOUND_MIXER_OGAIN	13	/* Output gain */
-/*
- * The AD1848 codec and compatibles have three line level inputs
- * (line, aux1 and aux2). Since each card manufacturer have assigned
- * different meanings to these inputs, it's inpractical to assign
- * specific meanings (line, cd, synth etc.) to them.
- */
-#define SOUND_MIXER_LINE1	14	/* Input source 1  (aux1) */
-#define SOUND_MIXER_LINE2	15	/* Input source 2  (aux2) */
-#define SOUND_MIXER_LINE3	16	/* Input source 3  (line) */
-#define SOUND_MIXER_DIGITAL1    17      /* Digital (input) 1 */
-#define SOUND_MIXER_DIGITAL2    18      /* Digital (input) 2 */
-#define SOUND_MIXER_DIGITAL3    19      /* Digital (input) 3 */
-#define SOUND_MIXER_PHONEIN     20      /* Phone input */
-#define SOUND_MIXER_PHONEOUT    21      /* Phone output */
-#define SOUND_MIXER_VIDEO       22      /* Video/TV (audio) in */
-#define SOUND_MIXER_RADIO       23      /* Radio in */
-#define SOUND_MIXER_MONITOR     24      /* Monitor (usually mic) volume */
-
-
-/*
- * Some on/off settings (SOUND_SPECIAL_MIN - SOUND_SPECIAL_MAX)
- * Not counted to SOUND_MIXER_NRDEVICES, but use the same number space
- */
-#define SOUND_ONOFF_MIN		28
-#define SOUND_ONOFF_MAX		30
-#define SOUND_MIXER_MUTE	28	/* 0 or 1 */
-#define SOUND_MIXER_ENHANCE	29	/* Enhanced stereo (0, 40, 60 or 80) */
-#define SOUND_MIXER_LOUD	30	/* 0 or 1 */
-
-/* Note!	Number 31 cannot be used since the sign bit is reserved */
-#define SOUND_MIXER_NONE        31
-
-#define SOUND_DEVICE_LABELS	{ \
-	"Vol  ", "Bass ", "Trebl", "Synth", "Pcm  ", "Spkr ", "Line ", \
-	"Mic  ", "CD   ", "Mix  ", "Pcm2 ", "Rec  ", "IGain", "OGain", \
-	"Line1", "Line2", "Line3", "Digital1", "Digital2", "Digital3", \
-	"PhoneIn", "PhoneOut", "Video", "Radio", "Monitor"}
-
-#define SOUND_DEVICE_NAMES	{ \
-	"vol", "bass", "treble", "synth", "pcm", "speaker", "line", \
-	"mic", "cd", "mix", "pcm2", "rec", "igain", "ogain", \
-	"line1", "line2", "line3", "dig1", "dig2", "dig3", \
-	"phin", "phout", "video", "radio", "monitor"}
-
-/*	Device bitmask identifiers	*/
-
-#define SOUND_MIXER_RECSRC	0xff	/* 1 bit per recording source */
-#define SOUND_MIXER_DEVMASK	0xfe	/* 1 bit per supported device */
-#define SOUND_MIXER_RECMASK	0xfd	/* 1 bit per supp. recording source */
-#define SOUND_MIXER_CAPS	0xfc
-#define SOUND_CAP_EXCL_INPUT	0x00000001	/* Only 1 rec. src at a time */
-#define SOUND_MIXER_STEREODEVS	0xfb	/* Mixer channels supporting stereo */
-
-/*	Device mask bits	*/
-
-#define SOUND_MASK_VOLUME	(1 << SOUND_MIXER_VOLUME)
-#define SOUND_MASK_BASS		(1 << SOUND_MIXER_BASS)
-#define SOUND_MASK_TREBLE	(1 << SOUND_MIXER_TREBLE)
-#define SOUND_MASK_SYNTH	(1 << SOUND_MIXER_SYNTH)
-#define SOUND_MASK_PCM		(1 << SOUND_MIXER_PCM)
-#define SOUND_MASK_SPEAKER	(1 << SOUND_MIXER_SPEAKER)
-#define SOUND_MASK_LINE		(1 << SOUND_MIXER_LINE)
-#define SOUND_MASK_MIC		(1 << SOUND_MIXER_MIC)
-#define SOUND_MASK_CD		(1 << SOUND_MIXER_CD)
-#define SOUND_MASK_IMIX		(1 << SOUND_MIXER_IMIX)
-#define SOUND_MASK_ALTPCM	(1 << SOUND_MIXER_ALTPCM)
-#define SOUND_MASK_RECLEV	(1 << SOUND_MIXER_RECLEV)
-#define SOUND_MASK_IGAIN	(1 << SOUND_MIXER_IGAIN)
-#define SOUND_MASK_OGAIN	(1 << SOUND_MIXER_OGAIN)
-#define SOUND_MASK_LINE1	(1 << SOUND_MIXER_LINE1)
-#define SOUND_MASK_LINE2	(1 << SOUND_MIXER_LINE2)
-#define SOUND_MASK_LINE3	(1 << SOUND_MIXER_LINE3)
-#define SOUND_MASK_DIGITAL1     (1 << SOUND_MIXER_DIGITAL1)
-#define SOUND_MASK_DIGITAL2     (1 << SOUND_MIXER_DIGITAL2)
-#define SOUND_MASK_DIGITAL3     (1 << SOUND_MIXER_DIGITAL3)
-#define SOUND_MASK_PHONEIN      (1 << SOUND_MIXER_PHONEIN)
-#define SOUND_MASK_PHONEOUT     (1 << SOUND_MIXER_PHONEOUT)
-#define SOUND_MASK_RADIO        (1 << SOUND_MIXER_RADIO)
-#define SOUND_MASK_VIDEO        (1 << SOUND_MIXER_VIDEO)
-#define SOUND_MASK_MONITOR      (1 << SOUND_MIXER_MONITOR)
-
-/* Obsolete macros */
-#define SOUND_MASK_MUTE		(1 << SOUND_MIXER_MUTE)
-#define SOUND_MASK_ENHANCE	(1 << SOUND_MIXER_ENHANCE)
-#define SOUND_MASK_LOUD		(1 << SOUND_MIXER_LOUD)
-
-#define MIXER_READ(dev)		_IOR('M', dev, int)
-#define SOUND_MIXER_READ_VOLUME		MIXER_READ(SOUND_MIXER_VOLUME)
-#define SOUND_MIXER_READ_BASS		MIXER_READ(SOUND_MIXER_BASS)
-#define SOUND_MIXER_READ_TREBLE		MIXER_READ(SOUND_MIXER_TREBLE)
-#define SOUND_MIXER_READ_SYNTH		MIXER_READ(SOUND_MIXER_SYNTH)
-#define SOUND_MIXER_READ_PCM		MIXER_READ(SOUND_MIXER_PCM)
-#define SOUND_MIXER_READ_SPEAKER	MIXER_READ(SOUND_MIXER_SPEAKER)
-#define SOUND_MIXER_READ_LINE		MIXER_READ(SOUND_MIXER_LINE)
-#define SOUND_MIXER_READ_MIC		MIXER_READ(SOUND_MIXER_MIC)
-#define SOUND_MIXER_READ_CD		MIXER_READ(SOUND_MIXER_CD)
-#define SOUND_MIXER_READ_IMIX		MIXER_READ(SOUND_MIXER_IMIX)
-#define SOUND_MIXER_READ_ALTPCM		MIXER_READ(SOUND_MIXER_ALTPCM)
-#define SOUND_MIXER_READ_RECLEV		MIXER_READ(SOUND_MIXER_RECLEV)
-#define SOUND_MIXER_READ_IGAIN		MIXER_READ(SOUND_MIXER_IGAIN)
-#define SOUND_MIXER_READ_OGAIN		MIXER_READ(SOUND_MIXER_OGAIN)
-#define SOUND_MIXER_READ_LINE1		MIXER_READ(SOUND_MIXER_LINE1)
-#define SOUND_MIXER_READ_LINE2		MIXER_READ(SOUND_MIXER_LINE2)
-#define SOUND_MIXER_READ_LINE3		MIXER_READ(SOUND_MIXER_LINE3)
-#define SOUND_MIXER_READ_DIGITAL1	MIXER_READ(SOUND_MIXER_DIGITAL1)
-#define SOUND_MIXER_READ_DIGITAL2	MIXER_READ(SOUND_MIXER_DIGITAL2)
-#define SOUND_MIXER_READ_DIGITAL3	MIXER_READ(SOUND_MIXER_DIGITAL3)
-#define SOUND_MIXER_READ_PHONEIN      	MIXER_READ(SOUND_MIXER_PHONEIN)
-#define SOUND_MIXER_READ_PHONEOUT	MIXER_READ(SOUND_MIXER_PHONEOUT)
-#define SOUND_MIXER_READ_RADIO		MIXER_READ(SOUND_MIXER_RADIO)
-#define SOUND_MIXER_READ_VIDEO		MIXER_READ(SOUND_MIXER_VIDEO)
-#define SOUND_MIXER_READ_MONITOR	MIXER_READ(SOUND_MIXER_MONITOR)
-
-/* Obsolete macros */
-#define SOUND_MIXER_READ_MUTE		MIXER_READ(SOUND_MIXER_MUTE)
-#define SOUND_MIXER_READ_ENHANCE	MIXER_READ(SOUND_MIXER_ENHANCE)
-#define SOUND_MIXER_READ_LOUD		MIXER_READ(SOUND_MIXER_LOUD)
-
-#define SOUND_MIXER_READ_RECSRC		MIXER_READ(SOUND_MIXER_RECSRC)
-#define SOUND_MIXER_READ_DEVMASK	MIXER_READ(SOUND_MIXER_DEVMASK)
-#define SOUND_MIXER_READ_RECMASK	MIXER_READ(SOUND_MIXER_RECMASK)
-#define SOUND_MIXER_READ_STEREODEVS	MIXER_READ(SOUND_MIXER_STEREODEVS)
-#define SOUND_MIXER_READ_CAPS		MIXER_READ(SOUND_MIXER_CAPS)
-
-#define MIXER_WRITE(dev)		_IOWR('M', dev, int)
-#define SOUND_MIXER_WRITE_VOLUME	MIXER_WRITE(SOUND_MIXER_VOLUME)
-#define SOUND_MIXER_WRITE_BASS		MIXER_WRITE(SOUND_MIXER_BASS)
-#define SOUND_MIXER_WRITE_TREBLE	MIXER_WRITE(SOUND_MIXER_TREBLE)
-#define SOUND_MIXER_WRITE_SYNTH		MIXER_WRITE(SOUND_MIXER_SYNTH)
-#define SOUND_MIXER_WRITE_PCM		MIXER_WRITE(SOUND_MIXER_PCM)
-#define SOUND_MIXER_WRITE_SPEAKER	MIXER_WRITE(SOUND_MIXER_SPEAKER)
-#define SOUND_MIXER_WRITE_LINE		MIXER_WRITE(SOUND_MIXER_LINE)
-#define SOUND_MIXER_WRITE_MIC		MIXER_WRITE(SOUND_MIXER_MIC)
-#define SOUND_MIXER_WRITE_CD		MIXER_WRITE(SOUND_MIXER_CD)
-#define SOUND_MIXER_WRITE_IMIX		MIXER_WRITE(SOUND_MIXER_IMIX)
-#define SOUND_MIXER_WRITE_ALTPCM	MIXER_WRITE(SOUND_MIXER_ALTPCM)
-#define SOUND_MIXER_WRITE_RECLEV	MIXER_WRITE(SOUND_MIXER_RECLEV)
-#define SOUND_MIXER_WRITE_IGAIN		MIXER_WRITE(SOUND_MIXER_IGAIN)
-#define SOUND_MIXER_WRITE_OGAIN		MIXER_WRITE(SOUND_MIXER_OGAIN)
-#define SOUND_MIXER_WRITE_LINE1		MIXER_WRITE(SOUND_MIXER_LINE1)
-#define SOUND_MIXER_WRITE_LINE2		MIXER_WRITE(SOUND_MIXER_LINE2)
-#define SOUND_MIXER_WRITE_LINE3		MIXER_WRITE(SOUND_MIXER_LINE3)
-#define SOUND_MIXER_WRITE_DIGITAL1	MIXER_WRITE(SOUND_MIXER_DIGITAL1)
-#define SOUND_MIXER_WRITE_DIGITAL2	MIXER_WRITE(SOUND_MIXER_DIGITAL2)
-#define SOUND_MIXER_WRITE_DIGITAL3	MIXER_WRITE(SOUND_MIXER_DIGITAL3)
-#define SOUND_MIXER_WRITE_PHONEIN      	MIXER_WRITE(SOUND_MIXER_PHONEIN)
-#define SOUND_MIXER_WRITE_PHONEOUT	MIXER_WRITE(SOUND_MIXER_PHONEOUT)
-#define SOUND_MIXER_WRITE_RADIO		MIXER_WRITE(SOUND_MIXER_RADIO)
-#define SOUND_MIXER_WRITE_VIDEO		MIXER_WRITE(SOUND_MIXER_VIDEO)
-#define SOUND_MIXER_WRITE_MONITOR	MIXER_WRITE(SOUND_MIXER_MONITOR)
-
-#define SOUND_MIXER_WRITE_MUTE		MIXER_WRITE(SOUND_MIXER_MUTE)
-#define SOUND_MIXER_WRITE_ENHANCE	MIXER_WRITE(SOUND_MIXER_ENHANCE)
-#define SOUND_MIXER_WRITE_LOUD		MIXER_WRITE(SOUND_MIXER_LOUD)
-
-#define SOUND_MIXER_WRITE_RECSRC	MIXER_WRITE(SOUND_MIXER_RECSRC)
-
-typedef struct mixer_info {
-  char id[16];
-  char name[32];
-  int  modify_counter;
-  int fillers[10];
-} mixer_info;
-
-#define SOUND_MIXER_INFO		_IOR('M', 101, mixer_info)
-
-#define LEFT_CHN	0
-#define RIGHT_CHN	1
-
-/*
- * Level 2 event types for /dev/sequencer
- */
-
-/*
- * The 4 most significant bits of byte 0 specify the class of
- * the event:
- *
- *	0x8X = system level events,
- *	0x9X = device/port specific events, event[1] = device/port,
- *		The last 4 bits give the subtype:
- *			0x02	= Channel event (event[3] = chn).
- *			0x01	= note event (event[4] = note).
- *			(0x01 is not used alone but always with bit 0x02).
- *	       event[2] = MIDI message code (0x80=note off etc.)
- *
- */
-
-#define EV_SEQ_LOCAL		0x80
-#define EV_TIMING		0x81
-#define EV_CHN_COMMON		0x92
-#define EV_CHN_VOICE		0x93
-#define EV_SYSEX		0x94
-/*
- * Event types 200 to 220 are reserved for application use.
- * These numbers will not be used by the driver.
- */
-
-/*
- * Events for event type EV_CHN_VOICE
- */
-
-#define MIDI_NOTEOFF		0x80
-#define MIDI_NOTEON		0x90
-#define MIDI_KEY_PRESSURE	0xA0
-
-/*
- * Events for event type EV_CHN_COMMON
- */
-
-#define MIDI_CTL_CHANGE		0xB0
-#define MIDI_PGM_CHANGE		0xC0
-#define MIDI_CHN_PRESSURE	0xD0
-#define MIDI_PITCH_BEND		0xE0
-
-#define MIDI_SYSTEM_PREFIX	0xF0
-
-/*
- * Timer event types
- */
-#define TMR_WAIT_REL		1	/* Time relative to the prev time */
-#define TMR_WAIT_ABS		2	/* Absolute time since TMR_START */
-#define TMR_STOP		3
-#define TMR_START		4
-#define TMR_CONTINUE		5
-#define TMR_TEMPO		6
-#define TMR_ECHO		8
-#define TMR_CLOCK		9	/* MIDI clock */
-#define TMR_SPP			10	/* Song position pointer */
-#define TMR_TIMESIG		11	/* Time signature */
-
-/*
- *	Local event types
- */
-#define LOCL_STARTAUDIO		1
-
-#if (!defined(_KERNEL) && !defined(INKERNEL)) || defined(USE_SEQ_MACROS)
-/*
- *	Some convenience macros to simplify programming of the
- *	/dev/sequencer interface
- *
- *	These macros define the API which should be used when possible.
- */
-
-#ifndef USE_SIMPLE_MACROS
-void seqbuf_dump(void);	/* This function must be provided by programs */
-
-/* Sample seqbuf_dump() implementation:
- *
- *	SEQ_DEFINEBUF (2048);	-- Defines a buffer for 2048 bytes
- *
- *	int seqfd;		-- The file descriptor for /dev/sequencer.
- *
- *	void
- *	seqbuf_dump ()
- *	{
- *	  if (_seqbufptr)
- *	    if (write (seqfd, _seqbuf, _seqbufptr) == -1)
- *	      {
- *		perror ("write /dev/sequencer");
- *		exit (-1);
- *	      }
- *	  _seqbufptr = 0;
- *	}
- */
-
-#define SEQ_DEFINEBUF(len)		\
-	u_char _seqbuf[len]; int _seqbuflen = len;int _seqbufptr = 0
-#define SEQ_USE_EXTBUF()		\
-	extern u_char _seqbuf[]; \
-	extern int _seqbuflen;extern int _seqbufptr
-#define SEQ_DECLAREBUF()		SEQ_USE_EXTBUF()
-#define SEQ_PM_DEFINES			struct patmgr_info _pm_info
-#define _SEQ_NEEDBUF(len)		\
-	if ((_seqbufptr+(len)) > _seqbuflen) \
-		seqbuf_dump()
-#define _SEQ_ADVBUF(len)		_seqbufptr += len
-#define SEQ_DUMPBUF			seqbuf_dump
-#else
-/*
- * This variation of the sequencer macros is used just to format one event
- * using fixed buffer.
- *
- * The program using the macro library must define the following macros before
- * using this library.
- *
- * #define _seqbuf 		 name of the buffer (u_char[])
- * #define _SEQ_ADVBUF(len)	 If the applic needs to know the exact
- *				 size of the event, this macro can be used.
- *				 Otherwise this must be defined as empty.
- * #define _seqbufptr		 Define the name of index variable or 0 if
- *				 not required.
- */
-#define _SEQ_NEEDBUF(len)	/* empty */
-#endif
-
-#define PM_LOAD_PATCH(dev, bank, pgm)	\
-	(SEQ_DUMPBUF(), _pm_info.command = _PM_LOAD_PATCH, \
-	_pm_info.device=dev, _pm_info.data.data8[0]=pgm, \
-	_pm_info.parm1 = bank, _pm_info.parm2 = 1, \
-	ioctl(seqfd, SNDCTL_PMGR_ACCESS, &_pm_info))
-#define PM_LOAD_PATCHES(dev, bank, pgm) \
-	(SEQ_DUMPBUF(), _pm_info.command = _PM_LOAD_PATCH, \
-	_pm_info.device=dev, bcopy( pgm, _pm_info.data.data8,  128), \
-	_pm_info.parm1 = bank, _pm_info.parm2 = 128, \
-	ioctl(seqfd, SNDCTL_PMGR_ACCESS, &_pm_info))
-
-#define SEQ_VOLUME_MODE(dev, mode)	{ \
-	_SEQ_NEEDBUF(8);\
-	_seqbuf[_seqbufptr] = SEQ_EXTENDED;\
-	_seqbuf[_seqbufptr+1] = SEQ_VOLMODE;\
-	_seqbuf[_seqbufptr+2] = (dev);\
-	_seqbuf[_seqbufptr+3] = (mode);\
-	_seqbuf[_seqbufptr+4] = 0;\
-	_seqbuf[_seqbufptr+5] = 0;\
-	_seqbuf[_seqbufptr+6] = 0;\
-	_seqbuf[_seqbufptr+7] = 0;\
-	_SEQ_ADVBUF(8);}
-
-/*
- * Midi voice messages
- */
-
-#define _CHN_VOICE(dev, event, chn, note, parm)  { \
-	_SEQ_NEEDBUF(8);\
-	_seqbuf[_seqbufptr] = EV_CHN_VOICE;\
-	_seqbuf[_seqbufptr+1] = (dev);\
-	_seqbuf[_seqbufptr+2] = (event);\
-	_seqbuf[_seqbufptr+3] = (chn);\
-	_seqbuf[_seqbufptr+4] = (note);\
-	_seqbuf[_seqbufptr+5] = (parm);\
-	_seqbuf[_seqbufptr+6] = (0);\
-	_seqbuf[_seqbufptr+7] = 0;\
-	_SEQ_ADVBUF(8);}
-
-#define SEQ_START_NOTE(dev, chn, note, vol) \
-		_CHN_VOICE(dev, MIDI_NOTEON, chn, note, vol)
-
-#define SEQ_STOP_NOTE(dev, chn, note, vol) \
-		_CHN_VOICE(dev, MIDI_NOTEOFF, chn, note, vol)
-
-#define SEQ_KEY_PRESSURE(dev, chn, note, pressure) \
-		_CHN_VOICE(dev, MIDI_KEY_PRESSURE, chn, note, pressure)
-
-/*
- * Midi channel messages
- */
-
-#define _CHN_COMMON(dev, event, chn, p1, p2, w14) { \
-	_SEQ_NEEDBUF(8);\
-	_seqbuf[_seqbufptr] = EV_CHN_COMMON;\
-	_seqbuf[_seqbufptr+1] = (dev);\
-	_seqbuf[_seqbufptr+2] = (event);\
-	_seqbuf[_seqbufptr+3] = (chn);\
-	_seqbuf[_seqbufptr+4] = (p1);\
-	_seqbuf[_seqbufptr+5] = (p2);\
-	*(short *)&_seqbuf[_seqbufptr+6] = (w14);\
-	_SEQ_ADVBUF(8);}
-/*
- * SEQ_SYSEX permits sending of sysex messages. (It may look that it permits
- * sending any MIDI bytes but it's absolutely not possible. Trying to do
- * so _will_ cause problems with MPU401 intelligent mode).
- *
- * Sysex messages are sent in blocks of 1 to 6 bytes. Longer messages must be
- * sent by calling SEQ_SYSEX() several times (there must be no other events
- * between them). First sysex fragment must have 0xf0 in the first byte
- * and the last byte (buf[len-1] of the last fragment must be 0xf7. No byte
- * between these sysex start and end markers cannot be larger than 0x7f. Also
- * lengths of each fragments (except the last one) must be 6.
- *
- * Breaking the above rules may work with some MIDI ports but is likely to
- * cause fatal problems with some other devices (such as MPU401).
- */
-#define SEQ_SYSEX(dev, buf, len) { \
-	int i, l=(len); if (l>6)l=6;\
-	_SEQ_NEEDBUF(8);\
-	_seqbuf[_seqbufptr] = EV_SYSEX;\
-	for(i=0;i<l;i++)_seqbuf[_seqbufptr+i+1] = (buf)[i];\
-	for(i=l;i<6;i++)_seqbuf[_seqbufptr+i+1] = 0xff;\
-	_SEQ_ADVBUF(8);}
-
-#define SEQ_CHN_PRESSURE(dev, chn, pressure) \
-	_CHN_COMMON(dev, MIDI_CHN_PRESSURE, chn, pressure, 0, 0)
-
-#define SEQ_SET_PATCH(dev, chn, patch) \
-	_CHN_COMMON(dev, MIDI_PGM_CHANGE, chn, patch, 0, 0)
-
-#define SEQ_CONTROL(dev, chn, controller, value) \
-	_CHN_COMMON(dev, MIDI_CTL_CHANGE, chn, controller, 0, value)
-
-#define SEQ_BENDER(dev, chn, value) \
-	_CHN_COMMON(dev, MIDI_PITCH_BEND, chn, 0, 0, value)
-
-
-#define SEQ_V2_X_CONTROL(dev, voice, controller, value)	{ \
-	_SEQ_NEEDBUF(8);\
-	_seqbuf[_seqbufptr] = SEQ_EXTENDED;\
-	_seqbuf[_seqbufptr+1] = SEQ_CONTROLLER;\
-	_seqbuf[_seqbufptr+2] = (dev);\
-	_seqbuf[_seqbufptr+3] = (voice);\
-	_seqbuf[_seqbufptr+4] = (controller);\
-	*(short *)&_seqbuf[_seqbufptr+5] = (value);\
-	_seqbuf[_seqbufptr+7] = 0;\
-	_SEQ_ADVBUF(8);}
-
-/*
- * The following 5 macros are incorrectly implemented and obsolete.
- * Use SEQ_BENDER and SEQ_CONTROL (with proper controller) instead.
- */
-
-#define SEQ_PITCHBEND(dev, voice, value) \
-	SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER, value)
-#define SEQ_BENDER_RANGE(dev, voice, value) \
-	SEQ_V2_X_CONTROL(dev, voice, CTRL_PITCH_BENDER_RANGE, value)
-#define SEQ_EXPRESSION(dev, voice, value) \
-	SEQ_CONTROL(dev, voice, CTL_EXPRESSION, value*128)
-#define SEQ_MAIN_VOLUME(dev, voice, value) \
-	SEQ_CONTROL(dev, voice, CTL_MAIN_VOLUME, (value*16383)/100)
-#define SEQ_PANNING(dev, voice, pos) \
-	SEQ_CONTROL(dev, voice, CTL_PAN, (pos+128) / 2)
-
-/*
- * Timing and syncronization macros
- */
-
-#define _TIMER_EVENT(ev, parm)		{ \
-	_SEQ_NEEDBUF(8);\
-	_seqbuf[_seqbufptr+0] = EV_TIMING; \
-	_seqbuf[_seqbufptr+1] = (ev); \
-	_seqbuf[_seqbufptr+2] = 0;\
-	_seqbuf[_seqbufptr+3] = 0;\
-	*(u_int *)&_seqbuf[_seqbufptr+4] = (parm); \
-	_SEQ_ADVBUF(8); \
-	}
-
-#define SEQ_START_TIMER()		_TIMER_EVENT(TMR_START, 0)
-#define SEQ_STOP_TIMER()		_TIMER_EVENT(TMR_STOP, 0)
-#define SEQ_CONTINUE_TIMER()		_TIMER_EVENT(TMR_CONTINUE, 0)
-#define SEQ_WAIT_TIME(ticks)		_TIMER_EVENT(TMR_WAIT_ABS, ticks)
-#define SEQ_DELTA_TIME(ticks)		_TIMER_EVENT(TMR_WAIT_REL, ticks)
-#define SEQ_ECHO_BACK(key)		_TIMER_EVENT(TMR_ECHO, key)
-#define SEQ_SET_TEMPO(value)		_TIMER_EVENT(TMR_TEMPO, value)
-#define SEQ_SONGPOS(pos)		_TIMER_EVENT(TMR_SPP, pos)
-#define SEQ_TIME_SIGNATURE(sig)		_TIMER_EVENT(TMR_TIMESIG, sig)
-
-/*
- * Local control events
- */
-
-#define _LOCAL_EVENT(ev, parm)		{ \
-	_SEQ_NEEDBUF(8);\
-	_seqbuf[_seqbufptr+0] = EV_SEQ_LOCAL; \
-	_seqbuf[_seqbufptr+1] = (ev); \
-	_seqbuf[_seqbufptr+2] = 0;\
-	_seqbuf[_seqbufptr+3] = 0;\
-	*(u_int *)&_seqbuf[_seqbufptr+4] = (parm); \
-	_SEQ_ADVBUF(8); \
-	}
-
-#define SEQ_PLAYAUDIO(devmask)		_LOCAL_EVENT(LOCL_STARTAUDIO, devmask)
-/*
- * Events for the level 1 interface only
- */
-
-#define SEQ_MIDIOUT(device, byte)	{ \
-	_SEQ_NEEDBUF(4);\
-	_seqbuf[_seqbufptr] = SEQ_MIDIPUTC;\
-	_seqbuf[_seqbufptr+1] = (byte);\
-	_seqbuf[_seqbufptr+2] = (device);\
-	_seqbuf[_seqbufptr+3] = 0;\
-	_SEQ_ADVBUF(4);}
-
-/*
- * Patch loading.
- */
-#define SEQ_WRPATCH(patchx, len)	{ \
-	if (_seqbufptr) seqbuf_dump(); \
-	if (write(seqfd, (char*)(patchx), len)==-1) \
-	   perror("Write patch: /dev/sequencer"); \
-	}
-
-#define SEQ_WRPATCH2(patchx, len)	\
-	( seqbuf_dump(), write(seqfd, (char*)(patchx), len) )
-
-#endif
-
-/*
- * Here I have moved all the aliases for ioctl names.
- */
-
-#define SNDCTL_DSP_SAMPLESIZE	SNDCTL_DSP_SETFMT
-#define SOUND_PCM_WRITE_BITS	SNDCTL_DSP_SETFMT
-#define SOUND_PCM_SETFMT	SNDCTL_DSP_SETFMT
-
-#define SOUND_PCM_WRITE_RATE	SNDCTL_DSP_SPEED
-#define SOUND_PCM_POST		SNDCTL_DSP_POST
-#define SOUND_PCM_RESET		SNDCTL_DSP_RESET
-#define SOUND_PCM_SYNC		SNDCTL_DSP_SYNC
-#define SOUND_PCM_SUBDIVIDE	SNDCTL_DSP_SUBDIVIDE
-#define SOUND_PCM_SETFRAGMENT	SNDCTL_DSP_SETFRAGMENT
-#define SOUND_PCM_GETFMTS	SNDCTL_DSP_GETFMTS
-#define SOUND_PCM_GETOSPACE	SNDCTL_DSP_GETOSPACE
-#define SOUND_PCM_GETISPACE	SNDCTL_DSP_GETISPACE
-#define SOUND_PCM_NONBLOCK	SNDCTL_DSP_NONBLOCK
-#define SOUND_PCM_GETCAPS	SNDCTL_DSP_GETCAPS
-#define SOUND_PCM_GETTRIGGER	SNDCTL_DSP_GETTRIGGER
-#define SOUND_PCM_SETTRIGGER	SNDCTL_DSP_SETTRIGGER
-#define SOUND_PCM_SETSYNCRO	SNDCTL_DSP_SETSYNCRO
-#define SOUND_PCM_GETIPTR	SNDCTL_DSP_GETIPTR
-#define SOUND_PCM_GETOPTR	SNDCTL_DSP_GETOPTR
-#define SOUND_PCM_MAPINBUF	SNDCTL_DSP_MAPINBUF
-#define SOUND_PCM_MAPOUTBUF	SNDCTL_DSP_MAPOUTBUF
-
-/***********************************************************************/
-
-/**
- * XXX OSSv4 defines -- some bits taken straight out of the new
- * sys/soundcard.h bundled with recent OSS releases.
- *
- * NB:  These macros and structures will be reorganized and inserted
- * 	in appropriate places throughout this file once the code begins
- * 	to take shape.
- *
- * @todo reorganize layout more like the 4Front version
- * @todo ask about maintaining __SIOWR vs. _IOWR ioctl cmd defines
- */
-
-/**
- * @note The @c OSSV4_EXPERIMENT macro is meant to wrap new development code
- * in the sound system relevant to adopting 4Front's OSSv4 specification.
- * Users should not enable this!  Really!
- */
-#if 0
-# define OSSV4_EXPERIMENT 1
-#else
-# undef OSSV4_EXPERIMENT
-#endif
-
-#ifdef SOUND_VERSION
-# undef SOUND_VERSION
-# define SOUND_VERSION	0x040000
-#endif	/* !SOUND_VERSION */
-
-#define OSS_LONGNAME_SIZE	64
-#define OSS_LABEL_SIZE		16
-#define OSS_DEVNODE_SIZE        32
-typedef char oss_longname_t[OSS_LONGNAME_SIZE];
-typedef char oss_label_t[OSS_LABEL_SIZE];
-typedef char oss_devnode_t[OSS_DEVNODE_SIZE];
-
-typedef struct audio_errinfo
-{
-	int		play_underruns;
-	int		rec_overruns;
-	unsigned int	play_ptradjust;
-	unsigned int	rec_ptradjust;
-	int		play_errorcount;
-	int		rec_errorcount;
-	int		play_lasterror;
-	int		rec_lasterror;
-	long		play_errorparm;
-	long		rec_errorparm;
-	int		filler[16];
-} audio_errinfo;
-
-#define SNDCTL_DSP_GETPLAYVOL           _IOR ('P', 24, int)
-#define SNDCTL_DSP_SETPLAYVOL           _IOWR('P', 24, int)
-#define SNDCTL_DSP_GETERROR             _IOR ('P', 25, audio_errinfo)
-
-
-/*
- ****************************************************************************
- * Sync groups for audio devices
- */
-typedef struct oss_syncgroup
-{
-  int id;
-  int mode;
-  int filler[16];
-} oss_syncgroup;
-
-#define SNDCTL_DSP_SYNCGROUP            _IOWR('P', 28, oss_syncgroup)
-#define SNDCTL_DSP_SYNCSTART            _IOW ('P', 29, int)
-
-/*
- **************************************************************************
- * "cooked" mode enables software based conversions for sample rate, sample
- * format (bits) and number of channels (mono/stereo). These conversions are
- * required with some devices that support only one sample rate or just stereo
- * to let the applications to use other formats. The cooked mode is enabled by
- * default. However it's necessary to disable this mode when mmap() is used or
- * when very deterministic timing is required. SNDCTL_DSP_COOKEDMODE is an
- * optional call introduced in OSS 3.9.6f. It's _error return must be ignored_
- * since normally this call will return erno=EINVAL.
- *
- * SNDCTL_DSP_COOKEDMODE must be called immediately after open before doing
- * anything else. Otherwise the call will not have any effect.
- */
-#define SNDCTL_DSP_COOKEDMODE           _IOW ('P', 30, int)
-
-/*
- **************************************************************************
- * SNDCTL_DSP_SILENCE and SNDCTL_DSP_SKIP are new calls in OSS 3.99.0
- * that can be used to implement pause/continue during playback (no effect
- * on recording).
- */
-#define SNDCTL_DSP_SILENCE              _IO  ('P', 31)
-#define SNDCTL_DSP_SKIP                 _IO  ('P', 32)
-
-/*
- ****************************************************************************
- * Abort transfer (reset) functions for input and output
- */
-#define SNDCTL_DSP_HALT_INPUT		_IO  ('P', 33)
-#define SNDCTL_DSP_RESET_INPUT	SNDCTL_DSP_HALT_INPUT	/* Old name */
-#define SNDCTL_DSP_HALT_OUTPUT		_IO  ('P', 34)
-#define SNDCTL_DSP_RESET_OUTPUT	SNDCTL_DSP_HALT_OUTPUT	/* Old name */
-
-/*
- ****************************************************************************
- * Low water level control
- */
-#define SNDCTL_DSP_LOW_WATER		_IOW ('P', 34, int)
-
-/** @todo Get rid of OSS_NO_LONG_LONG references? */
-
-/*
- ****************************************************************************
- * 64 bit pointer support. Only available in environments that support
- * the 64 bit (long long) integer type.
- */
-#ifndef OSS_NO_LONG_LONG
-typedef struct
-{
-  long long samples;
-  int fifo_samples;
-  int filler[32];		/* For future use */
-} oss_count_t;
-
-#define SNDCTL_DSP_CURRENT_IPTR		_IOR ('P', 35, oss_count_t)
-#define SNDCTL_DSP_CURRENT_OPTR		_IOR ('P', 36, oss_count_t)
-#endif
-
-/*
- ****************************************************************************
- * Interface for selecting recording sources and playback output routings.
- */
-#define SNDCTL_DSP_GET_RECSRC_NAMES     _IOR ('P', 37, oss_mixer_enuminfo)
-#define SNDCTL_DSP_GET_RECSRC           _IOR ('P', 38, int)
-#define SNDCTL_DSP_SET_RECSRC           _IOWR('P', 38, int)
-
-#define SNDCTL_DSP_GET_PLAYTGT_NAMES    _IOR ('P', 39, oss_mixer_enuminfo)
-#define SNDCTL_DSP_GET_PLAYTGT          _IOR ('P', 40, int)
-#define SNDCTL_DSP_SET_PLAYTGT          _IOWR('P', 40, int)
-#define SNDCTL_DSP_GETRECVOL            _IOR ('P', 41, int)
-#define SNDCTL_DSP_SETRECVOL            _IOWR('P', 41, int)
-
-/*
- ***************************************************************************
- * Some calls for setting the channel assignment with multi channel devices
- * (see the manual for details).                                                 */
-#define SNDCTL_DSP_GET_CHNORDER         _IOR ('P', 42, unsigned long long)
-#define SNDCTL_DSP_SET_CHNORDER         _IOWR('P', 42, unsigned long long)
-#       define CHID_UNDEF       0
-#       define CHID_L           1
-#       define CHID_R           2
-#       define CHID_C           3
-#       define CHID_LFE         4
-#       define CHID_LS          5
-#       define CHID_RS          6
-#       define CHID_LR          7
-#       define CHID_RR          8
-#define CHNORDER_UNDEF          0x0000000000000000ULL
-#define CHNORDER_NORMAL         0x0000000087654321ULL
-
-#define MAX_PEAK_CHANNELS	128
-typedef unsigned short oss_peaks_t[MAX_PEAK_CHANNELS];
-#define SNDCTL_DSP_GETIPEAKS		_IOR('P', 43, oss_peaks_t)
-#define SNDCTL_DSP_GETOPEAKS		_IOR('P', 44, oss_peaks_t)
-#define SNDCTL_DSP_POLICY               _IOW('P', 45, int)    /* See the manual */
-
-/*
- ****************************************************************************
- * Few ioctl calls that are not official parts of OSS. They have been used
- * by few freeware implementations of OSS.
- */
-#define SNDCTL_DSP_GETCHANNELMASK	_IOWR('P', 64, int)
-#define SNDCTL_DSP_BIND_CHANNEL		_IOWR('P', 65, int)
-#define DSP_BIND_QUERY			0x00000000
-#define DSP_BIND_FRONT			0x00000001
-#define DSP_BIND_SURR			0x00000002
-#define DSP_BIND_CENTER_LFE		0x00000004
-#define DSP_BIND_HANDSET		0x00000008
-#define DSP_BIND_MIC			0x00000010
-#define DSP_BIND_MODEM1			0x00000020
-#define DSP_BIND_MODEM2			0x00000040
-#define DSP_BIND_I2S			0x00000080
-#define DSP_BIND_SPDIF			0x00000100
-#define DSP_BIND_REAR			0x00000200
-
-/*
- * OSS_SYSIFO is obsolete. Use SNDCTL_SYSINFO insteads.
- */
-#define OSS_GETVERSION                  _IOR ('M', 118, int)
-
-/**
- * @brief	Argument for SNDCTL_SYSINFO ioctl.
- *
- * For use w/ the SNDCTL_SYSINFO ioctl available on audio (/dev/dsp*),
- * mixer, and MIDI devices.
- */
-typedef struct oss_sysinfo
-{
-	char	product[32];	/* For example OSS/Free, OSS/Linux or
-				   OSS/Solaris */
-	char	version[32];	/* For example 4.0a */
-	int	versionnum;	/* See OSS_GETVERSION */
-	char	options[128];	/* Reserved */
-
-	int	numaudios;	/* # of audio/dsp devices */
-	int	openedaudio[8];	/* Bit mask telling which audio devices
-				   are busy */
-
-	int	numsynths;	/* # of availavle synth devices */
-	int	nummidis;	/* # of available MIDI ports */
-	int	numtimers;	/* # of available timer devices */
-	int	nummixers;	/* # of mixer devices */
-
-	int	openedmidi[8];	/* Bit mask telling which midi devices
-				   are busy */
-	int	numcards;	/* Number of sound cards in the system */
-	int	numaudioengines;	/* Number of audio engines in the system */
-	char	license[16];	/* For example "GPL" or "CDDL" */
-	char	revision_info[256];	/* For internal use */
-	int	filler[172];	/* For future expansion (set to -1) */
-} oss_sysinfo;
-
-typedef struct oss_mixext
-{
-  int dev;			/* Mixer device number */
-  int ctrl;			/* Controller number */
-  int type;			/* Entry type */
-#	define MIXT_DEVROOT	 0	/* Device root entry */
-#	define MIXT_GROUP	 1	/* Controller group */
-#	define MIXT_ONOFF	 2	/* OFF (0) or ON (1) */
-#	define MIXT_ENUM	 3	/* Enumerated (0 to maxvalue) */
-#	define MIXT_MONOSLIDER	 4	/* Mono slider (0 to 100) */
-#	define MIXT_STEREOSLIDER 5	/* Stereo slider (dual 0 to 100) */
-#	define MIXT_MESSAGE	 6	/* (Readable) textual message */
-#	define MIXT_MONOVU	 7	/* VU meter value (mono) */
-#	define MIXT_STEREOVU	 8	/* VU meter value (stereo) */
-#	define MIXT_MONOPEAK	 9	/* VU meter peak value (mono) */
-#	define MIXT_STEREOPEAK	10	/* VU meter peak value (stereo) */
-#	define MIXT_RADIOGROUP	11	/* Radio button group */
-#	define MIXT_MARKER	12	/* Separator between normal and extension entries */
-#	define MIXT_VALUE	13	/* Decimal value entry */
-#	define MIXT_HEXVALUE	14	/* Hexadecimal value entry */
-#	define MIXT_MONODB	15	/* Mono atten. slider (0 to -144) */
-#	define MIXT_STEREODB	16	/* Stereo atten. slider (dual 0 to -144) */
-#	define MIXT_SLIDER	17	/* Slider (mono) with full integer range */
-#	define MIXT_3D		18
-
-  /* Possible value range (minvalue to maxvalue) */
-  /* Note that maxvalue may also be smaller than minvalue */
-  int maxvalue;
-  int minvalue;
-
-  int flags;
-#	define MIXF_READABLE	0x00000001	/* Has readable value */
-#	define MIXF_WRITEABLE	0x00000002	/* Has writeable value */
-#	define MIXF_POLL	0x00000004	/* May change itself */
-#	define MIXF_HZ		0x00000008	/* Herz scale */
-#	define MIXF_STRING	0x00000010	/* Use dynamic extensions for value */
-#	define MIXF_DYNAMIC	0x00000010	/* Supports dynamic extensions */
-#	define MIXF_OKFAIL	0x00000020	/* Interpret value as 1=OK, 0=FAIL */
-#	define MIXF_FLAT	0x00000040	/* Flat vertical space requirements */
-#	define MIXF_LEGACY	0x00000080	/* Legacy mixer control group */
-  char id[16];			/* Mnemonic ID (mainly for internal use) */
-  int parent;			/* Entry# of parent (group) node (-1 if root) */
-
-  int dummy;			/* Internal use */
-
-  int timestamp;
-
-  char data[64];		/* Misc data (entry type dependent) */
-  unsigned char enum_present[32];	/* Mask of allowed enum values */
-  int control_no;		/* SOUND_MIXER_VOLUME..SOUND_MIXER_MIDI */
-  /* (-1 means not indicated) */
-
-/*
- * The desc field is reserved for internal purposes of OSS. It should not be 
- * used by applications.
- */
-  unsigned int desc;
-#define MIXEXT_SCOPE_MASK			0x0000003f
-#define MIXEXT_SCOPE_OTHER			0x00000000
-#define MIXEXT_SCOPE_INPUT			0x00000001
-#define MIXEXT_SCOPE_OUTPUT			0x00000002
-#define MIXEXT_SCOPE_MONITOR			0x00000003
-#define MIXEXT_SCOPE_RECSWITCH			0x00000004
-
-  char extname[32];
-  int update_counter;
-  int filler[7];
-} oss_mixext;
-
-typedef struct oss_mixext_root
-{
-  char id[16];
-  char name[48];
-} oss_mixext_root;
-
-typedef struct oss_mixer_value
-{
-  int dev;
-  int ctrl;
-  int value;
-  int flags;			/* Reserved for future use. Initialize to 0 */
-  int timestamp;		/* Must be set to oss_mixext.timestamp */
-  int filler[8];		/* Reserved for future use. Initialize to 0 */
-} oss_mixer_value;
-
-#define OSS_ENUM_MAXVALUE       255
-typedef struct oss_mixer_enuminfo
-{
-	int	dev;
-	int	ctrl;
-	int	nvalues;
-	int	version;                  /* Read the manual */
-	short	strindex[OSS_ENUM_MAXVALUE];
-	char	strings[3000];
-} oss_mixer_enuminfo;
-
-#define OPEN_READ       PCM_ENABLE_INPUT
-#define OPEN_WRITE      PCM_ENABLE_OUTPUT
-#define OPEN_READWRITE  (OPEN_READ|OPEN_WRITE)
-
-/**
- * @brief	Argument for SNDCTL_AUDIOINFO ioctl.
- *
- * For use w/ the SNDCTL_AUDIOINFO ioctl available on audio (/dev/dsp*)
- * devices.
- */
-typedef struct oss_audioinfo
-{
-	int	dev;		/* Audio device number */
-	char	name[64];
-	int	busy;		/* 0, OPEN_READ, OPEN_WRITE or OPEN_READWRITE */
-	int	pid;
-	int	caps;		/* DSP_CAP_INPUT, DSP_CAP_OUTPUT */
-	int	iformats;
-	int	oformats;
-	int	magic;		/* Reserved for internal use */
-	char 	cmd[64];	/* Command using the device (if known) */
-	int	card_number;
-	int	port_number;
-	int	mixer_dev;
-	int	real_device;	/* Obsolete field. Replaced by devnode */
-	int	enabled;	/* 1=enabled, 0=device not ready at this
-				   moment */
-	int	flags;		/* For internal use only - no practical
-				   meaning */
-	int	min_rate;	/* Sample rate limits */
-	int	max_rate;
-	int	min_channels;	/* Number of channels supported */
-	int	max_channels;
-	int	binding;	/* DSP_BIND_FRONT, etc. 0 means undefined */
-	int	rate_source;
-	char	handle[32];
-	#define OSS_MAX_SAMPLE_RATES	20	/* Cannot be changed  */
-	unsigned int nrates;
-	unsigned int rates[OSS_MAX_SAMPLE_RATES]; /* Please read the manual before using these */
-	oss_longname_t	song_name;	/* Song name (if given) */
-	oss_label_t	label;		/* Device label (if given) */
-	int		latency;	/* In usecs, -1=unknown */
-	oss_devnode_t	devnode;	/* Device special file name (inside
-					   /dev) */
-	int next_play_engine;
-	int next_rec_engine;
-	int filler[184];
-} oss_audioinfo;
-
-typedef struct oss_mixerinfo
-{
-  int dev;
-  char id[16];
-  char name[32];
-  int modify_counter;
-  int card_number;
-  int port_number;
-  char handle[32];
-  int magic;			/* Reserved */
-  int enabled;			/* Reserved */
-  int caps;
-#define MIXER_CAP_VIRTUAL				0x00000001
-  int flags;			/* Reserved */
-  int nrext;
-  /*
-   * The priority field can be used to select the default (motherboard)
-   * mixer device. The mixer with the highest priority is the
-   * most preferred one. -2 or less means that this device cannot be used
-   * as the default mixer.
-   */
-  int priority;
-  int filler[254];		/* Reserved */
-} oss_mixerinfo;
-
-typedef struct oss_midi_info
-{
-  int dev;			/* Midi device number */
-  char name[64];
-  int busy;			/* 0, OPEN_READ, OPEN_WRITE or OPEN_READWRITE */
-  int pid;
-  char cmd[64];			/* Command using the device (if known) */
-  int caps;
-#define MIDI_CAP_MPU401		0x00000001	/**** OBSOLETE ****/
-#define MIDI_CAP_INPUT		0x00000002
-#define MIDI_CAP_OUTPUT		0x00000004
-#define MIDI_CAP_INOUT		(MIDI_CAP_INPUT|MIDI_CAP_OUTPUT)
-#define MIDI_CAP_VIRTUAL	0x00000008	/* Pseudo device */
-#define MIDI_CAP_MTCINPUT	0x00000010	/* Supports SNDCTL_MIDI_MTCINPUT */
-#define MIDI_CAP_CLIENT		0x00000020	/* Virtual client side device */
-#define MIDI_CAP_SERVER		0x00000040	/* Virtual server side device */
-#define MIDI_CAP_INTERNAL	0x00000080	/* Internal (synth) device */
-#define MIDI_CAP_EXTERNAL	0x00000100	/* external (MIDI port) device */
-#define MIDI_CAP_PTOP		0x00000200	/* Point to point link to one device */
-#define MIDI_CAP_MTC		0x00000400	/* MTC/SMPTE (control) device */
-  int magic;			/* Reserved for internal use */
-  int card_number;
-  int port_number;
-  int enabled;			/* 1=enabled, 0=device not ready at this moment */
-  int flags;			/* For internal use only - no practical meaning */
-  char handle[32];
-  oss_longname_t song_name;	/* Song name (if known) */
-  oss_label_t label;		/* Device label (if given) */
-  int latency;			/* In usecs, -1=unknown */
-  int filler[244];
-} oss_midi_info;
-
-typedef struct oss_card_info
-{
-  int card;
-  char shortname[16];
-  char longname[128];
-  int flags;
-  char hw_info[400];
-  int intr_count, ack_count;
-  int filler[154];
-} oss_card_info;
-
-#define SNDCTL_SYSINFO          _IOR ('X', 1, oss_sysinfo)
-#define OSS_SYSINFO             SNDCTL_SYSINFO /* Old name */
-
-#define SNDCTL_MIX_NRMIX	_IOR ('X', 2, int)
-#define SNDCTL_MIX_NREXT	_IOWR('X', 3, int)
-#define SNDCTL_MIX_EXTINFO	_IOWR('X', 4, oss_mixext)
-#define SNDCTL_MIX_READ		_IOWR('X', 5, oss_mixer_value)
-#define SNDCTL_MIX_WRITE	_IOWR('X', 6, oss_mixer_value)
-
-#define SNDCTL_AUDIOINFO	_IOWR('X', 7, oss_audioinfo)
-#define SNDCTL_MIX_ENUMINFO	_IOWR('X', 8, oss_mixer_enuminfo)
-#define SNDCTL_MIDIINFO		_IOWR('X', 9, oss_midi_info)
-#define SNDCTL_MIXERINFO	_IOWR('X',10, oss_mixerinfo)
-#define SNDCTL_CARDINFO		_IOWR('X',11, oss_card_info)
-#define SNDCTL_ENGINEINFO	_IOWR('X',12, oss_audioinfo)
-#define SNDCTL_AUDIOINFO_EX	_IOWR('X',13, oss_audioinfo)
-
-/*
- * Few more "globally" available ioctl calls.
- */
-#define SNDCTL_SETSONG          _IOW ('Y', 2, oss_longname_t)
-#define SNDCTL_GETSONG          _IOR ('Y', 2, oss_longname_t)
-#define SNDCTL_SETNAME          _IOW ('Y', 3, oss_longname_t)
-#define SNDCTL_SETLABEL         _IOW ('Y', 4, oss_label_t)
-#define SNDCTL_GETLABEL         _IOR ('Y', 4, oss_label_t)
-
-#endif	/* !_SYS_SOUNDCARD_H_ */
diff --git a/include.new/sys/stack.h b/include.new/sys/stack.h
deleted file mode 100644
index 9f55f76..0000000
--- a/include.new/sys/stack.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2005 Antoine Brodin
- * 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.
- *
- * 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: releng/10.2/sys/sys/stack.h 227581 2011-11-16 19:06:55Z pjd $
- */
-
-#ifndef _SYS_STACK_H_
-#define	_SYS_STACK_H_
-
-#include <sys/_stack.h>
-
-struct sbuf;
-
-/* MI Routines. */
-struct stack	*stack_create(void);
-void		 stack_destroy(struct stack *);
-int		 stack_put(struct stack *, vm_offset_t);
-void		 stack_copy(const struct stack *, struct stack *);
-void		 stack_zero(struct stack *);
-void		 stack_print(const struct stack *);
-void		 stack_print_ddb(const struct stack *);
-void		 stack_print_short(const struct stack *);
-void		 stack_print_short_ddb(const struct stack *);
-void		 stack_sbuf_print(struct sbuf *, const struct stack *);
-void		 stack_sbuf_print_ddb(struct sbuf *, const struct stack *);
-#ifdef KTR
-void		 stack_ktr(u_int, const char *, int, const struct stack *,
-		    u_int, int);
-#define	CTRSTACK(m, st, depth, cheap) do {				\
-	if (KTR_COMPILE & (m))						\
-		stack_ktr((m), __FILE__, __LINE__, st, depth, cheap);	\
-	} while(0)
-#else
-#define	CTRSTACK(m, st, depth, cheap)
-#endif
-
-/* MD Routine. */
-struct thread;
-void		 stack_save(struct stack *);
-void		 stack_save_td(struct stack *, struct thread *);
-
-#endif
diff --git a/include.new/sys/stat.h b/include.new/sys/stat.h
deleted file mode 100644
index 892126f..0000000
--- a/include.new/sys/stat.h
+++ /dev/null
@@ -1,353 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)stat.h	8.12 (Berkeley) 6/16/95
- * $FreeBSD: releng/10.2/sys/sys/stat.h 254627 2013-08-21 23:04:48Z ken $
- */
-
-#ifndef _SYS_STAT_H_
-#define	_SYS_STAT_H_
-
-#include <sys/cdefs.h>
-#include <sys/_timespec.h>
-#include <sys/_types.h>
-
-#ifndef _BLKSIZE_T_DECLARED
-typedef	__blksize_t	blksize_t;
-#define	_BLKSIZE_T_DECLARED
-#endif
-
-#ifndef _BLKCNT_T_DECLARED
-typedef	__blkcnt_t	blkcnt_t;
-#define	_BLKCNT_T_DECLARED
-#endif
-
-#ifndef _DEV_T_DECLARED
-typedef	__dev_t		dev_t;
-#define	_DEV_T_DECLARED
-#endif
-
-#ifndef _FFLAGS_T_DECLARED
-typedef	__fflags_t	fflags_t;
-#define	_FFLAGS_T_DECLARED
-#endif
-
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _INO_T_DECLARED
-typedef	__ino_t		ino_t;
-#define	_INO_T_DECLARED
-#endif
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _NLINK_T_DECLARED
-typedef	__nlink_t	nlink_t;
-#define	_NLINK_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _UID_T_DECLARED
-typedef	__uid_t		uid_t;
-#define	_UID_T_DECLARED
-#endif
-
-#if !defined(_KERNEL) && __BSD_VISIBLE
-/*
- * XXX We get miscellaneous namespace pollution with this.
- */
-#include <sys/time.h>
-#endif
-
-#ifdef _KERNEL
-struct ostat {
-	__uint16_t st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
-	mode_t	  st_mode;		/* inode protection mode */
-	nlink_t	  st_nlink;		/* number of hard links */
-	__uint16_t st_uid;		/* user ID of the file's owner */
-	__uint16_t st_gid;		/* group ID of the file's group */
-	__uint16_t st_rdev;		/* device type */
-	__int32_t st_size;		/* file size, in bytes */
-	struct	timespec st_atim;	/* time of last access */
-	struct	timespec st_mtim;	/* time of last data modification */
-	struct	timespec st_ctim;	/* time of last file status change */
-	__int32_t st_blksize;		/* optimal blocksize for I/O */
-	__int32_t st_blocks;		/* blocks allocated for file */
-	fflags_t  st_flags;		/* user defined flags for file */
-	__uint32_t st_gen;		/* file generation number */
-};
-#endif
-
-struct stat {
-	__dev_t   st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
-	mode_t	  st_mode;		/* inode protection mode */
-	nlink_t	  st_nlink;		/* number of hard links */
-	uid_t	  st_uid;		/* user ID of the file's owner */
-	gid_t	  st_gid;		/* group ID of the file's group */
-	__dev_t   st_rdev;		/* device type */
-	struct	timespec st_atim;	/* time of last access */
-	struct	timespec st_mtim;	/* time of last data modification */
-	struct	timespec st_ctim;	/* time of last file status change */
-	off_t	  st_size;		/* file size, in bytes */
-	blkcnt_t st_blocks;		/* blocks allocated for file */
-	blksize_t st_blksize;		/* optimal blocksize for I/O */
-	fflags_t  st_flags;		/* user defined flags for file */
-	__uint32_t st_gen;		/* file generation number */
-	__int32_t st_lspare;
-	struct timespec st_birthtim;	/* time of file creation */
-	/*
-	 * Explicitly pad st_birthtim to 16 bytes so that the size of
-	 * struct stat is backwards compatible.  We use bitfields instead
-	 * of an array of chars so that this doesn't require a C99 compiler
-	 * to compile if the size of the padding is 0.  We use 2 bitfields
-	 * to cover up to 64 bits on 32-bit machines.  We assume that
-	 * CHAR_BIT is 8...
-	 */
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-};
-
-#ifdef _KERNEL
-struct nstat {
-	__dev_t   st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
-	__uint32_t st_mode;		/* inode protection mode */
-	__uint32_t st_nlink;		/* number of hard links */
-	uid_t	  st_uid;		/* user ID of the file's owner */
-	gid_t	  st_gid;		/* group ID of the file's group */
-	__dev_t   st_rdev;		/* device type */
-	struct	timespec st_atim;	/* time of last access */
-	struct	timespec st_mtim;	/* time of last data modification */
-	struct	timespec st_ctim;	/* time of last file status change */
-	off_t	  st_size;		/* file size, in bytes */
-	blkcnt_t st_blocks;		/* blocks allocated for file */
-	blksize_t st_blksize;		/* optimal blocksize for I/O */
-	fflags_t  st_flags;		/* user defined flags for file */
-	__uint32_t st_gen;		/* file generation number */
-	struct timespec st_birthtim;	/* time of file creation */
-	/*
-	 * See above about the following padding.
-	 */
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-};
-#endif
-
-#ifndef _KERNEL
-#define	st_atime		st_atim.tv_sec
-#define	st_mtime		st_mtim.tv_sec
-#define	st_ctime		st_ctim.tv_sec
-#if __BSD_VISIBLE
-#define	st_birthtime		st_birthtim.tv_sec
-#endif
-
-/* For compatibility. */
-#if __BSD_VISIBLE
-#define	st_atimespec		st_atim
-#define	st_mtimespec		st_mtim
-#define	st_ctimespec		st_ctim
-#define	st_birthtimespec	st_birthtim
-#endif
-#endif /* !_KERNEL */
-
-#define	S_ISUID	0004000			/* set user id on execution */
-#define	S_ISGID	0002000			/* set group id on execution */
-#if __BSD_VISIBLE
-#define	S_ISTXT	0001000			/* sticky bit */
-#endif
-
-#define	S_IRWXU	0000700			/* RWX mask for owner */
-#define	S_IRUSR	0000400			/* R for owner */
-#define	S_IWUSR	0000200			/* W for owner */
-#define	S_IXUSR	0000100			/* X for owner */
-
-#if __BSD_VISIBLE
-#define	S_IREAD		S_IRUSR
-#define	S_IWRITE	S_IWUSR
-#define	S_IEXEC		S_IXUSR
-#endif
-
-#define	S_IRWXG	0000070			/* RWX mask for group */
-#define	S_IRGRP	0000040			/* R for group */
-#define	S_IWGRP	0000020			/* W for group */
-#define	S_IXGRP	0000010			/* X for group */
-
-#define	S_IRWXO	0000007			/* RWX mask for other */
-#define	S_IROTH	0000004			/* R for other */
-#define	S_IWOTH	0000002			/* W for other */
-#define	S_IXOTH	0000001			/* X for other */
-
-#if __XSI_VISIBLE
-#define	S_IFMT	 0170000		/* type of file mask */
-#define	S_IFIFO	 0010000		/* named pipe (fifo) */
-#define	S_IFCHR	 0020000		/* character special */
-#define	S_IFDIR	 0040000		/* directory */
-#define	S_IFBLK	 0060000		/* block special */
-#define	S_IFREG	 0100000		/* regular */
-#define	S_IFLNK	 0120000		/* symbolic link */
-#define	S_IFSOCK 0140000		/* socket */
-#define	S_ISVTX	 0001000		/* save swapped text even after use */
-#endif
-#if __BSD_VISIBLE
-#define	S_IFWHT  0160000		/* whiteout */
-#endif
-
-#define	S_ISDIR(m)	(((m) & 0170000) == 0040000)	/* directory */
-#define	S_ISCHR(m)	(((m) & 0170000) == 0020000)	/* char special */
-#define	S_ISBLK(m)	(((m) & 0170000) == 0060000)	/* block special */
-#define	S_ISREG(m)	(((m) & 0170000) == 0100000)	/* regular file */
-#define	S_ISFIFO(m)	(((m) & 0170000) == 0010000)	/* fifo or socket */
-#if __POSIX_VISIBLE >= 200112
-#define	S_ISLNK(m)	(((m) & 0170000) == 0120000)	/* symbolic link */
-#define	S_ISSOCK(m)	(((m) & 0170000) == 0140000)	/* socket */
-#endif
-#if __BSD_VISIBLE
-#define	S_ISWHT(m)	(((m) & 0170000) == 0160000)	/* whiteout */
-#endif
-
-#if __BSD_VISIBLE
-#define	ACCESSPERMS	(S_IRWXU|S_IRWXG|S_IRWXO)	/* 0777 */
-							/* 7777 */
-#define	ALLPERMS	(S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
-							/* 0666 */
-#define	DEFFILEMODE	(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
-
-#define S_BLKSIZE	512		/* block size used in the stat struct */
-
-/*
- * Definitions of flags stored in file flags word.
- *
- * Super-user and owner changeable flags.
- */
-#define	UF_SETTABLE	0x0000ffff	/* mask of owner changeable flags */
-#define	UF_NODUMP	0x00000001	/* do not dump file */
-#define	UF_IMMUTABLE	0x00000002	/* file may not be changed */
-#define	UF_APPEND	0x00000004	/* writes to file may only append */
-#define	UF_OPAQUE	0x00000008	/* directory is opaque wrt. union */
-#define	UF_NOUNLINK	0x00000010	/* file may not be removed or renamed */
-/*
- * These two bits are defined in MacOS X.  They are not currently used in
- * FreeBSD.
- */
-#if 0
-#define	UF_COMPRESSED	0x00000020	/* file is compressed */
-#define	UF_TRACKED	0x00000040	/* renames and deletes are tracked */
-#endif
-
-#define	UF_SYSTEM	0x00000080	/* Windows system file bit */
-#define	UF_SPARSE	0x00000100	/* sparse file */
-#define	UF_OFFLINE	0x00000200	/* file is offline */
-#define	UF_REPARSE	0x00000400	/* Windows reparse point file bit */
-#define	UF_ARCHIVE	0x00000800	/* file needs to be archived */
-#define	UF_READONLY	0x00001000	/* Windows readonly file bit */
-/* This is the same as the MacOS X definition of UF_HIDDEN. */
-#define	UF_HIDDEN	0x00008000	/* file is hidden */
-
-/*
- * Super-user changeable flags.
- */
-#define	SF_SETTABLE	0xffff0000	/* mask of superuser changeable flags */
-#define	SF_ARCHIVED	0x00010000	/* file is archived */
-#define	SF_IMMUTABLE	0x00020000	/* file may not be changed */
-#define	SF_APPEND	0x00040000	/* writes to file may only append */
-#define	SF_NOUNLINK	0x00100000	/* file may not be removed or renamed */
-#define	SF_SNAPSHOT	0x00200000	/* snapshot inode */
-
-#ifdef _KERNEL
-/*
- * Shorthand abbreviations of above.
- */
-#define	OPAQUE		(UF_OPAQUE)
-#define	APPEND		(UF_APPEND | SF_APPEND)
-#define	IMMUTABLE	(UF_IMMUTABLE | SF_IMMUTABLE)
-#define	NOUNLINK	(UF_NOUNLINK | SF_NOUNLINK)
-#endif
-
-#endif /* __BSD_VISIBLE */
-
-#ifndef _KERNEL
-__BEGIN_DECLS
-#if __BSD_VISIBLE
-int	chflags(const char *, unsigned long);
-int	chflagsat(int, const char *, unsigned long, int);
-#endif
-int	chmod(const char *, mode_t);
-#if __BSD_VISIBLE
-int	fchflags(int, unsigned long);
-#endif
-#if __POSIX_VISIBLE >= 200112
-int	fchmod(int, mode_t);
-#endif
-#if __POSIX_VISIBLE >= 200809
-int	fchmodat(int, const char *, mode_t, int);
-#endif
-int	fstat(int, struct stat *);
-#if __BSD_VISIBLE
-int	lchflags(const char *, unsigned long);
-int	lchmod(const char *, mode_t);
-#endif
-#if __POSIX_VISIBLE >= 200112
-int	lstat(const char * __restrict, struct stat * __restrict);
-#endif
-int	mkdir(const char *, mode_t);
-int	mkfifo(const char *, mode_t);
-#if !defined(_MKNOD_DECLARED) && __XSI_VISIBLE
-int	mknod(const char *, mode_t, dev_t);
-#define	_MKNOD_DECLARED
-#endif
-int	stat(const char * __restrict, struct stat * __restrict);
-mode_t	umask(mode_t);
-#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
-int	fstatat(int, const char *, struct stat *, int);
-int	mkdirat(int, const char *, mode_t);
-int	mkfifoat(int, const char *, mode_t);
-#endif
-#if __BSD_VISIBLE || __XSI_VISIBLE >= 700
-int	mknodat(int, const char *, mode_t, dev_t);
-#endif
-__END_DECLS
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_STAT_H_ */
diff --git a/include.new/sys/statvfs.h b/include.new/sys/statvfs.h
deleted file mode 100644
index f627f5f..0000000
--- a/include.new/sys/statvfs.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright 2002 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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: releng/10.2/sys/sys/statvfs.h 139825 2005-01-07 02:29:27Z imp $
- */
-
-#ifndef _SYS_STATVFS_H_
-#define	_SYS_STATVFS_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/*
- * POSIX says we must define the fsblkcnt_t and fsfilcnt_t types here.
- * Note that these must be unsigned integer types, so we have to be
- * careful in converting the signed statfs members to the unsigned
- * statvfs members.  (Well, actually, we don't -- see below -- but
- * a quality implementation should.)
- */
-#ifndef _FSBLKCNT_T_DECLARED		/* always declared together */
-typedef	__fsblkcnt_t	fsblkcnt_t;
-typedef	__fsfilcnt_t	fsfilcnt_t;
-#define _FSBLKCNT_T_DECLARED
-#endif
-
-/*
- * The difference between `avail' and `free' is that `avail' represents
- * space available to unprivileged processes, whereas `free' includes all
- * unallocated space, including that reserved for privileged processes.
- * Or at least, that's the most useful interpretation.  (According to
- * the letter of the standard, this entire interface is completely
- * unspecified!)
- */
-struct statvfs {
-	fsblkcnt_t	f_bavail;	/* Number of blocks */
-	fsblkcnt_t	f_bfree;
-	fsblkcnt_t	f_blocks;
-	fsfilcnt_t	f_favail;	/* Number of files (e.g., inodes) */
-	fsfilcnt_t	f_ffree;
-	fsfilcnt_t	f_files;
-	unsigned long	f_bsize;	/* Size of blocks counted above */
-	unsigned long	f_flag;
-	unsigned long	f_frsize;	/* Size of fragments */
-	unsigned long	f_fsid;		/* Not meaningful */
-	unsigned long	f_namemax;	/* Same as pathconf(_PC_NAME_MAX) */
-};
-
-/* flag bits for f_flag: */
-#define	ST_RDONLY	0x1
-#define	ST_NOSUID	0x2
-
-__BEGIN_DECLS
-int	fstatvfs(int, struct statvfs *);
-int	statvfs(const char *__restrict, struct statvfs *__restrict);
-__END_DECLS
-#endif /* _SYS_STATVFS_H_ */
diff --git a/include.new/sys/stdatomic.h b/include.new/sys/stdatomic.h
deleted file mode 100644
index 846f6d7..0000000
--- a/include.new/sys/stdatomic.h
+++ /dev/null
@@ -1,411 +0,0 @@
-/*-
- * Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
- *                    David Chisnall <theraven@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.
- *
- * 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: releng/10.2/sys/sys/stdatomic.h 264496 2014-04-15 09:41:52Z tijl $
- */
-
-#ifndef _STDATOMIC_H_
-#define	_STDATOMIC_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#if __has_extension(c_atomic) || __has_extension(cxx_atomic)
-#define	__CLANG_ATOMICS
-#elif __GNUC_PREREQ__(4, 7)
-#define	__GNUC_ATOMICS
-#elif defined(__GNUC__)
-#define	__SYNC_ATOMICS
-#else
-#error "stdatomic.h does not support your compiler"
-#endif
-
-/*
- * 7.17.1 Atomic lock-free macros.
- */
-
-#ifdef __GCC_ATOMIC_BOOL_LOCK_FREE
-#define	ATOMIC_BOOL_LOCK_FREE		__GCC_ATOMIC_BOOL_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_CHAR_LOCK_FREE
-#define	ATOMIC_CHAR_LOCK_FREE		__GCC_ATOMIC_CHAR_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#define	ATOMIC_CHAR16_T_LOCK_FREE	__GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#define	ATOMIC_CHAR32_T_LOCK_FREE	__GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#define	ATOMIC_WCHAR_T_LOCK_FREE	__GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_SHORT_LOCK_FREE
-#define	ATOMIC_SHORT_LOCK_FREE		__GCC_ATOMIC_SHORT_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_INT_LOCK_FREE
-#define	ATOMIC_INT_LOCK_FREE		__GCC_ATOMIC_INT_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_LONG_LOCK_FREE
-#define	ATOMIC_LONG_LOCK_FREE		__GCC_ATOMIC_LONG_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_LLONG_LOCK_FREE
-#define	ATOMIC_LLONG_LOCK_FREE		__GCC_ATOMIC_LLONG_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_POINTER_LOCK_FREE
-#define	ATOMIC_POINTER_LOCK_FREE	__GCC_ATOMIC_POINTER_LOCK_FREE
-#endif
-
-/*
- * 7.17.2 Initialization.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	ATOMIC_VAR_INIT(value)		(value)
-#define	atomic_init(obj, value)		__c11_atomic_init(obj, value)
-#else
-#define	ATOMIC_VAR_INIT(value)		{ .__val = (value) }
-#define	atomic_init(obj, value)		((void)((obj)->__val = (value)))
-#endif
-
-/*
- * Clang and recent GCC both provide predefined macros for the memory
- * orderings.  If we are using a compiler that doesn't define them, use the
- * clang values - these will be ignored in the fallback path.
- */
-
-#ifndef __ATOMIC_RELAXED
-#define __ATOMIC_RELAXED		0
-#endif
-#ifndef __ATOMIC_CONSUME
-#define __ATOMIC_CONSUME		1
-#endif
-#ifndef __ATOMIC_ACQUIRE
-#define __ATOMIC_ACQUIRE		2
-#endif
-#ifndef __ATOMIC_RELEASE
-#define __ATOMIC_RELEASE		3
-#endif
-#ifndef __ATOMIC_ACQ_REL
-#define __ATOMIC_ACQ_REL		4
-#endif
-#ifndef __ATOMIC_SEQ_CST
-#define __ATOMIC_SEQ_CST		5
-#endif
-
-/*
- * 7.17.3 Order and consistency.
- *
- * The memory_order_* constants that denote the barrier behaviour of the
- * atomic operations.
- */
-
-typedef enum {
-	memory_order_relaxed = __ATOMIC_RELAXED,
-	memory_order_consume = __ATOMIC_CONSUME,
-	memory_order_acquire = __ATOMIC_ACQUIRE,
-	memory_order_release = __ATOMIC_RELEASE,
-	memory_order_acq_rel = __ATOMIC_ACQ_REL,
-	memory_order_seq_cst = __ATOMIC_SEQ_CST
-} memory_order;
-
-/*
- * 7.17.4 Fences.
- */
-
-static __inline void
-atomic_thread_fence(memory_order __order __unused)
-{
-
-#ifdef __CLANG_ATOMICS
-	__c11_atomic_thread_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-	__atomic_thread_fence(__order);
-#else
-	__sync_synchronize();
-#endif
-}
-
-static __inline void
-atomic_signal_fence(memory_order __order __unused)
-{
-
-#ifdef __CLANG_ATOMICS
-	__c11_atomic_signal_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-	__atomic_signal_fence(__order);
-#else
-	__asm volatile ("" ::: "memory");
-#endif
-}
-
-/*
- * 7.17.5 Lock-free property.
- */
-
-#if defined(_KERNEL)
-/* Atomics in kernelspace are always lock-free. */
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), (_Bool)1)
-#elif defined(__CLANG_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__atomic_is_lock_free(sizeof(*(obj)), obj)
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__atomic_is_lock_free(sizeof((obj)->__val), &(obj)->__val)
-#else
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), sizeof((obj)->__val) <= sizeof(void *))
-#endif
-
-/*
- * 7.17.6 Atomic integer types.
- */
-
-typedef _Atomic(_Bool)			atomic_bool;
-typedef _Atomic(char)			atomic_char;
-typedef _Atomic(signed char)		atomic_schar;
-typedef _Atomic(unsigned char)		atomic_uchar;
-typedef _Atomic(short)			atomic_short;
-typedef _Atomic(unsigned short)		atomic_ushort;
-typedef _Atomic(int)			atomic_int;
-typedef _Atomic(unsigned int)		atomic_uint;
-typedef _Atomic(long)			atomic_long;
-typedef _Atomic(unsigned long)		atomic_ulong;
-typedef _Atomic(long long)		atomic_llong;
-typedef _Atomic(unsigned long long)	atomic_ullong;
-typedef _Atomic(__char16_t)		atomic_char16_t;
-typedef _Atomic(__char32_t)		atomic_char32_t;
-typedef _Atomic(___wchar_t)		atomic_wchar_t;
-typedef _Atomic(__int_least8_t)		atomic_int_least8_t;
-typedef _Atomic(__uint_least8_t)	atomic_uint_least8_t;
-typedef _Atomic(__int_least16_t)	atomic_int_least16_t;
-typedef _Atomic(__uint_least16_t)	atomic_uint_least16_t;
-typedef _Atomic(__int_least32_t)	atomic_int_least32_t;
-typedef _Atomic(__uint_least32_t)	atomic_uint_least32_t;
-typedef _Atomic(__int_least64_t)	atomic_int_least64_t;
-typedef _Atomic(__uint_least64_t)	atomic_uint_least64_t;
-typedef _Atomic(__int_fast8_t)		atomic_int_fast8_t;
-typedef _Atomic(__uint_fast8_t)		atomic_uint_fast8_t;
-typedef _Atomic(__int_fast16_t)		atomic_int_fast16_t;
-typedef _Atomic(__uint_fast16_t)	atomic_uint_fast16_t;
-typedef _Atomic(__int_fast32_t)		atomic_int_fast32_t;
-typedef _Atomic(__uint_fast32_t)	atomic_uint_fast32_t;
-typedef _Atomic(__int_fast64_t)		atomic_int_fast64_t;
-typedef _Atomic(__uint_fast64_t)	atomic_uint_fast64_t;
-typedef _Atomic(__intptr_t)		atomic_intptr_t;
-typedef _Atomic(__uintptr_t)		atomic_uintptr_t;
-typedef _Atomic(__size_t)		atomic_size_t;
-typedef _Atomic(__ptrdiff_t)		atomic_ptrdiff_t;
-typedef _Atomic(__intmax_t)		atomic_intmax_t;
-typedef _Atomic(__uintmax_t)		atomic_uintmax_t;
-
-/*
- * 7.17.7 Operations on atomic types.
- */
-
-/*
- * Compiler-specific operations.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_strong(object, expected, desired,	\
-	    success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_weak(object, expected, desired,	\
-	    success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__c11_atomic_exchange(object, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__c11_atomic_fetch_add(object, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__c11_atomic_fetch_and(object, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__c11_atomic_fetch_or(object, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__c11_atomic_fetch_sub(object, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__c11_atomic_fetch_xor(object, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__c11_atomic_load(object, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__c11_atomic_store(object, desired, order)
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 0, success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 1, success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__atomic_exchange_n(&(object)->__val, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__atomic_fetch_add(&(object)->__val, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__atomic_fetch_and(&(object)->__val, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__atomic_fetch_or(&(object)->__val, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__atomic_fetch_sub(&(object)->__val, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__atomic_fetch_xor(&(object)->__val, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__atomic_load_n(&(object)->__val, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__atomic_store_n(&(object)->__val, desired, order)
-#else
-#define	__atomic_apply_stride(object, operand) \
-	(((__typeof__((object)->__val))0) + (operand))
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)	__extension__ ({			\
-	__typeof__(expected) __ep = (expected);				\
-	__typeof__(*__ep) __e = *__ep;					\
-	(void)(success); (void)(failure);				\
-	(_Bool)((*__ep = __sync_val_compare_and_swap(&(object)->__val,	\
-	    __e, desired)) == __e);					\
-})
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-		desired, success, failure)
-#if __has_builtin(__sync_swap)
-/* Clang provides a full-barrier atomic exchange - use it if available. */
-#define	atomic_exchange_explicit(object, desired, order)		\
-	((void)(order), __sync_swap(&(object)->__val, desired))
-#else
-/*
- * __sync_lock_test_and_set() is only an acquire barrier in theory (although in
- * practice it is usually a full barrier) so we need an explicit barrier before
- * it.
- */
-#define	atomic_exchange_explicit(object, desired, order)		\
-__extension__ ({							\
-	__typeof__(object) __o = (object);				\
-	__typeof__(desired) __d = (desired);				\
-	(void)(order);							\
-	__sync_synchronize();						\
-	__sync_lock_test_and_set(&(__o)->__val, __d);			\
-})
-#endif
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_add(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_and(&(object)->__val, operand))
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_or(&(object)->__val, operand))
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_sub(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_xor(&(object)->__val, operand))
-#define	atomic_load_explicit(object, order)				\
-	((void)(order), __sync_fetch_and_add(&(object)->__val, 0))
-#define	atomic_store_explicit(object, desired, order)			\
-	((void)atomic_exchange_explicit(object, desired, order))
-#endif
-
-/*
- * Convenience functions.
- *
- * Don't provide these in kernel space. In kernel space, we should be
- * disciplined enough to always provide explicit barriers.
- */
-
-#ifndef _KERNEL
-#define	atomic_compare_exchange_strong(object, expected, desired)	\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_compare_exchange_weak(object, expected, desired)		\
-	atomic_compare_exchange_weak_explicit(object, expected,		\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_exchange(object, desired)				\
-	atomic_exchange_explicit(object, desired, memory_order_seq_cst)
-#define	atomic_fetch_add(object, operand)				\
-	atomic_fetch_add_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_and(object, operand)				\
-	atomic_fetch_and_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_or(object, operand)				\
-	atomic_fetch_or_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_sub(object, operand)				\
-	atomic_fetch_sub_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_xor(object, operand)				\
-	atomic_fetch_xor_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_load(object)						\
-	atomic_load_explicit(object, memory_order_seq_cst)
-#define	atomic_store(object, desired)					\
-	atomic_store_explicit(object, desired, memory_order_seq_cst)
-#endif /* !_KERNEL */
-
-/*
- * 7.17.8 Atomic flag type and operations.
- *
- * XXX: Assume atomic_bool can be used as an atomic_flag. Is there some
- * kind of compiler built-in type we could use?
- */
-
-typedef struct {
-	atomic_bool	__flag;
-} atomic_flag;
-
-#define	ATOMIC_FLAG_INIT		{ ATOMIC_VAR_INIT(0) }
-
-static __inline _Bool
-atomic_flag_test_and_set_explicit(volatile atomic_flag *__object,
-    memory_order __order)
-{
-	return (atomic_exchange_explicit(&__object->__flag, 1, __order));
-}
-
-static __inline void
-atomic_flag_clear_explicit(volatile atomic_flag *__object, memory_order __order)
-{
-
-	atomic_store_explicit(&__object->__flag, 0, __order);
-}
-
-#ifndef _KERNEL
-static __inline _Bool
-atomic_flag_test_and_set(volatile atomic_flag *__object)
-{
-
-	return (atomic_flag_test_and_set_explicit(__object,
-	    memory_order_seq_cst));
-}
-
-static __inline void
-atomic_flag_clear(volatile atomic_flag *__object)
-{
-
-	atomic_flag_clear_explicit(__object, memory_order_seq_cst);
-}
-#endif /* !_KERNEL */
-
-#endif /* !_STDATOMIC_H_ */
diff --git a/include.new/sys/stddef.h b/include.new/sys/stddef.h
deleted file mode 100644
index 33420b3..0000000
--- a/include.new/sys/stddef.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2002 Maxime Henrion <mux@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.
- *
- * 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: releng/10.2/sys/sys/stddef.h 221476 2011-05-05 02:35:25Z obrien $
- */
-
-#ifndef _SYS_STDDEF_H_
-#define _SYS_STDDEF_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <machine/_types.h>
-
-#ifndef _PTRDIFF_T_DECLARED
-typedef	__ptrdiff_t	ptrdiff_t;
-#define	_PTRDIFF_T_DECLARED
-#endif
-
-#define	offsetof(type, field)	__offsetof(type, field)
-
-#endif /* !_SYS_STDDEF_H_ */
diff --git a/include.new/sys/stdint.h b/include.new/sys/stdint.h
deleted file mode 100644
index 5f02f32..0000000
--- a/include.new/sys/stdint.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/sys/sys/stdint.h 237517 2012-06-24 04:15:58Z andrew $
- */
-
-#ifndef _SYS_STDINT_H_
-#define _SYS_STDINT_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#include <machine/_stdint.h>
-#include <sys/_stdint.h>
-
-typedef	__int_least8_t		int_least8_t;
-typedef	__int_least16_t		int_least16_t;
-typedef	__int_least32_t		int_least32_t;
-typedef	__int_least64_t		int_least64_t;
-
-typedef	__uint_least8_t		uint_least8_t;
-typedef	__uint_least16_t	uint_least16_t;
-typedef	__uint_least32_t	uint_least32_t;
-typedef	__uint_least64_t	uint_least64_t;
-
-typedef	__int_fast8_t		int_fast8_t;
-typedef	__int_fast16_t		int_fast16_t;
-typedef	__int_fast32_t		int_fast32_t;
-typedef	__int_fast64_t		int_fast64_t;
-
-typedef	__uint_fast8_t		uint_fast8_t;
-typedef	__uint_fast16_t		uint_fast16_t;
-typedef	__uint_fast32_t		uint_fast32_t;
-typedef	__uint_fast64_t		uint_fast64_t;
-
-#ifndef _INTMAX_T_DECLARED
-typedef	__intmax_t		intmax_t;
-#define	_INTMAX_T_DECLARED
-#endif
-#ifndef _UINTMAX_T_DECLARED
-typedef	__uintmax_t		uintmax_t;
-#define	_UINTMAX_T_DECLARED
-#endif
-
-/* GNU and Darwin define this and people seem to think it's portable */
-#if defined(UINTPTR_MAX) && defined(UINT64_MAX) && (UINTPTR_MAX == UINT64_MAX)
-#define	__WORDSIZE		64
-#else
-#define	__WORDSIZE		32
-#endif
-
-/* Limits of wchar_t. */
-#define	WCHAR_MIN	__WCHAR_MIN
-#define	WCHAR_MAX	__WCHAR_MAX
-
-#endif /* !_SYS_STDINT_H_ */
diff --git a/include.new/sys/sun_disklabel.h b/include.new/sys/sun_disklabel.h
deleted file mode 100644
index 0ef066b..0000000
--- a/include.new/sys/sun_disklabel.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 2004,2005 Joerg Wunsch
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- *	@(#)sun_disklabel.h	8.1 (Berkeley) 6/11/93
- *	$NetBSD: disklabel.h,v 1.2 1998/08/22 14:55:28 mrg Exp $
- *
- * $FreeBSD: releng/10.2/sys/sys/sun_disklabel.h 144328 2005-03-30 09:33:10Z joerg $ 
- */
-
-#ifndef _SYS_SUN_DISKLABEL_H_
-#define	_SYS_SUN_DISKLABEL_H_
-
-/*
- * SunOS/Solaris disk label layout (partial).
- * 
- * Suns disk label format contains a lot of historical baggage which we 
- * ignore entirely.  The structure below contains the relevant bits and the
- * _enc/_dec functions encode/decode only these fields.
- */
-
-#define	SUN_DKMAGIC	55998
-#define	SUN_NPART	8
-#define	SUN_RAWPART	2
-#define	SUN_SIZE	512
-#define	SUN_VTOC_VERSION 1
-#define	SUN_VTOC_SANE	0x600DDEEE /* SVR4-compatible VTOC is "sane". */
-#define	SUN_VOLNAME_LEN	8
-/*
- * XXX: I am actually not sure if this should be "16 sectors" or "8192 bytes".
- * XXX: Considering that Sun went to the effort of getting 512 byte compatible
- * XXX: CDROM drives produced my guess is that Sun computers stand little or
- * XXX: even no chance of running, much less booting on !=512 byte media.
- * XXX: Define this is in terms of bytes since that is easier for us.
- */
-#define	SUN_BOOTSIZE	8192
-
-/* partition info */
-struct sun_dkpart {
-	uint32_t	sdkp_cyloffset;		/* starting cylinder */
-	uint32_t	sdkp_nsectors;		/* number of sectors */
-};
-
-struct sun_vtoc_info {
-	u_int16_t	svtoc_tag;		/* partition tag */
-	u_int16_t	svtoc_flag;		/* partition flags */
-};
-
-/* known partition tag values */
-#define	VTOC_UNASSIGNED	0x00
-#define	VTOC_BOOT	0x01
-#define	VTOC_ROOT	0x02
-#define	VTOC_SWAP	0x03
-#define	VTOC_USR	0x04
-#define	VTOC_BACKUP	0x05	/* "c" partition, covers entire disk */
-#define	VTOC_STAND	0x06
-#define	VTOC_VAR	0x07
-#define	VTOC_HOME	0x08
-#define	VTOC_ALTSCTR	0x09	/* alternate sector partition */
-#define	VTOC_CACHE	0x0a	/* Solaris cachefs partition */
-#define	VTOC_VXVM_PUB	0x0e	/* VxVM public region */
-#define	VTOC_VXVM_PRIV	0x0f	/* VxVM private region */
-
-/* VTOC partition flags */
-#define	VTOC_UNMNT	0x01	/* unmountable partition */
-#define	VTOC_RONLY	0x10	/* partition is read/only */
-
-struct sun_disklabel {
-	char		sl_text[128];
-
-	/* SVR4 VTOC information */
-	uint32_t	sl_vtoc_vers;		/* == SUN_VTOC_VERSION */
-	char		sl_vtoc_volname[SUN_VOLNAME_LEN];
-	u_int16_t	sl_vtoc_nparts;		/* == SUN_NPART */
-	struct sun_vtoc_info sl_vtoc_map[SUN_NPART]; /* partition tag/flag */
-	uint32_t	sl_vtoc_sane;		/* == SUN_VTOC_SANE */
-
-	/* Sun label information */
-	u_int16_t	sl_rpm;			/* rotational speed */
-	u_int16_t	sl_pcylinders;		/* number of physical cyls */
-	u_int16_t	sl_sparespercyl;	/* spare sectors per cylinder */
-	u_int16_t	sl_interleave;		/* interleave factor */
-	u_int16_t	sl_ncylinders;		/* data cylinders */
-	u_int16_t	sl_acylinders;		/* alternate cylinders */
-	u_int16_t	sl_ntracks;		/* tracks per cylinder */
-	u_int16_t	sl_nsectors;		/* sectors per track */
-	struct sun_dkpart sl_part[SUN_NPART];	/* partition layout */
-	u_int16_t	sl_magic;		/* == SUN_DKMAGIC */
-};
-
-int sunlabel_dec(void const *pp, struct sun_disklabel *sl);
-void sunlabel_enc(void *pp, struct sun_disklabel *sl);
-
-#endif /* _SYS_SUN_DISKLABEL_H_ */
diff --git a/include.new/sys/sx.h b/include.new/sys/sx.h
deleted file mode 100644
index e492f01..0000000
--- a/include.new/sys/sx.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/*-
- * Copyright (c) 2007 Attilio Rao <attilio@freebsd.org>
- * Copyright (c) 2001 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible 
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/sys/sys/sx.h 247787 2013-03-04 12:48:41Z davide $
- */
-
-#ifndef	_SYS_SX_H_
-#define	_SYS_SX_H_
-
-#include <sys/_lock.h>
-#include <sys/_sx.h>
-
-#ifdef	_KERNEL
-#include <sys/pcpu.h>
-#include <sys/lock_profile.h>
-#include <sys/lockstat.h>
-#include <machine/atomic.h>
-#endif
-
-/*
- * In general, the sx locks and rwlocks use very similar algorithms.
- * The main difference in the implementations is how threads are
- * blocked when a lock is unavailable.  For this, sx locks use sleep
- * queues which do not support priority propagation, and rwlocks use
- * turnstiles which do.
- *
- * The sx_lock field consists of several fields.  The low bit
- * indicates if the lock is locked with a shared or exclusive lock.  A
- * value of 0 indicates an exclusive lock, and a value of 1 indicates
- * a shared lock.  Bit 1 is a boolean indicating if there are any
- * threads waiting for a shared lock.  Bit 2 is a boolean indicating
- * if there are any threads waiting for an exclusive lock.  Bit 3 is a
- * boolean indicating if an exclusive lock is recursively held.  The
- * rest of the variable's definition is dependent on the value of the
- * first bit.  For an exclusive lock, it is a pointer to the thread
- * holding the lock, similar to the mtx_lock field of mutexes.  For
- * shared locks, it is a count of read locks that are held.
- *
- * When the lock is not locked by any thread, it is encoded as a
- * shared lock with zero waiters.
- */
-
-#define	SX_LOCK_SHARED			0x01
-#define	SX_LOCK_SHARED_WAITERS		0x02
-#define	SX_LOCK_EXCLUSIVE_WAITERS	0x04
-#define	SX_LOCK_RECURSED		0x08
-#define	SX_LOCK_FLAGMASK						\
-	(SX_LOCK_SHARED | SX_LOCK_SHARED_WAITERS |			\
-	SX_LOCK_EXCLUSIVE_WAITERS | SX_LOCK_RECURSED)
-
-#define	SX_OWNER(x)			((x) & ~SX_LOCK_FLAGMASK)
-#define	SX_SHARERS_SHIFT		4
-#define	SX_SHARERS(x)			(SX_OWNER(x) >> SX_SHARERS_SHIFT)
-#define	SX_SHARERS_LOCK(x)						\
-	((x) << SX_SHARERS_SHIFT | SX_LOCK_SHARED)
-#define	SX_ONE_SHARER			(1 << SX_SHARERS_SHIFT)
-
-#define	SX_LOCK_UNLOCKED		SX_SHARERS_LOCK(0)
-#define	SX_LOCK_DESTROYED						\
-	(SX_LOCK_SHARED_WAITERS | SX_LOCK_EXCLUSIVE_WAITERS)
-
-#ifdef _KERNEL
-
-/*
- * Function prototipes.  Routines that start with an underscore are not part
- * of the public interface and are wrappered with a macro.
- */
-void	sx_sysinit(void *arg);
-#define	sx_init(sx, desc)	sx_init_flags((sx), (desc), 0)
-void	sx_init_flags(struct sx *sx, const char *description, int opts);
-void	sx_destroy(struct sx *sx);
-int	sx_try_slock_(struct sx *sx, const char *file, int line);
-int	sx_try_xlock_(struct sx *sx, const char *file, int line);
-int	sx_try_upgrade_(struct sx *sx, const char *file, int line);
-void	sx_downgrade_(struct sx *sx, const char *file, int line);
-int	_sx_slock(struct sx *sx, int opts, const char *file, int line);
-int	_sx_xlock(struct sx *sx, int opts, const char *file, int line);
-void	_sx_sunlock(struct sx *sx, const char *file, int line);
-void	_sx_xunlock(struct sx *sx, const char *file, int line);
-int	_sx_xlock_hard(struct sx *sx, uintptr_t tid, int opts,
-	    const char *file, int line);
-int	_sx_slock_hard(struct sx *sx, int opts, const char *file, int line);
-void	_sx_xunlock_hard(struct sx *sx, uintptr_t tid, const char *file, int
-	    line);
-void	_sx_sunlock_hard(struct sx *sx, const char *file, int line);
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-void	_sx_assert(const struct sx *sx, int what, const char *file, int line);
-#endif
-#ifdef DDB
-int	sx_chain(struct thread *td, struct thread **ownerp);
-#endif
-
-struct sx_args {
-	struct sx 	*sa_sx;
-	const char	*sa_desc;
-	int		sa_flags;
-};
-
-#define	SX_SYSINIT_FLAGS(name, sxa, desc, flags)			\
-	static struct sx_args name##_args = {				\
-		(sxa),							\
-		(desc),							\
-		(flags)							\
-	};								\
-	SYSINIT(name##_sx_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    sx_sysinit, &name##_args);					\
-	SYSUNINIT(name##_sx_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE,	\
-	    sx_destroy, (sxa))
-
-#define	SX_SYSINIT(name, sxa, desc)	SX_SYSINIT_FLAGS(name, sxa, desc, 0)
-
-/*
- * Full lock operations that are suitable to be inlined in non-debug kernels.
- * If the lock can't be acquired or released trivially then the work is
- * deferred to 'tougher' functions.
- */
-
-/* Acquire an exclusive lock. */
-static __inline int
-__sx_xlock(struct sx *sx, struct thread *td, int opts, const char *file,
-    int line)
-{
-	uintptr_t tid = (uintptr_t)td;
-	int error = 0;
-
-	if (!atomic_cmpset_acq_ptr(&sx->sx_lock, SX_LOCK_UNLOCKED, tid))
-		error = _sx_xlock_hard(sx, tid, opts, file, line);
-	else 
-		LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(LS_SX_XLOCK_ACQUIRE,
-		    sx, 0, 0, file, line);
-
-	return (error);
-}
-
-/* Release an exclusive lock. */
-static __inline void
-__sx_xunlock(struct sx *sx, struct thread *td, const char *file, int line)
-{
-	uintptr_t tid = (uintptr_t)td;
-
-	if (!atomic_cmpset_rel_ptr(&sx->sx_lock, tid, SX_LOCK_UNLOCKED))
-		_sx_xunlock_hard(sx, tid, file, line);
-}
-
-/* Acquire a shared lock. */
-static __inline int
-__sx_slock(struct sx *sx, int opts, const char *file, int line)
-{
-	uintptr_t x = sx->sx_lock;
-	int error = 0;
-
-	if (!(x & SX_LOCK_SHARED) ||
-	    !atomic_cmpset_acq_ptr(&sx->sx_lock, x, x + SX_ONE_SHARER))
-		error = _sx_slock_hard(sx, opts, file, line);
-	else
-		LOCKSTAT_PROFILE_OBTAIN_LOCK_SUCCESS(LS_SX_SLOCK_ACQUIRE, sx, 0,
-		    0, file, line);
-
-	return (error);
-}
-
-/*
- * Release a shared lock.  We can just drop a single shared lock so
- * long as we aren't trying to drop the last shared lock when other
- * threads are waiting for an exclusive lock.  This takes advantage of
- * the fact that an unlocked lock is encoded as a shared lock with a
- * count of 0.
- */
-static __inline void
-__sx_sunlock(struct sx *sx, const char *file, int line)
-{
-	uintptr_t x = sx->sx_lock;
-
-	if (x == (SX_SHARERS_LOCK(1) | SX_LOCK_EXCLUSIVE_WAITERS) ||
-	    !atomic_cmpset_rel_ptr(&sx->sx_lock, x, x - SX_ONE_SHARER))
-		_sx_sunlock_hard(sx, file, line);
-}
-
-/*
- * Public interface for lock operations.
- */
-#ifndef LOCK_DEBUG
-#error	"LOCK_DEBUG not defined, include <sys/lock.h> before <sys/sx.h>"
-#endif
-#if	(LOCK_DEBUG > 0) || defined(SX_NOINLINE)
-#define	sx_xlock_(sx, file, line)					\
-	(void)_sx_xlock((sx), 0, (file), (line))
-#define	sx_xlock_sig_(sx, file, line)					\
-	_sx_xlock((sx), SX_INTERRUPTIBLE, (file), (line))
-#define	sx_xunlock_(sx, file, line)					\
-	_sx_xunlock((sx), (file), (line))
-#define	sx_slock_(sx, file, line)					\
-	(void)_sx_slock((sx), 0, (file), (line))
-#define	sx_slock_sig_(sx, file, line)					\
-	_sx_slock((sx), SX_INTERRUPTIBLE, (file) , (line))
-#define	sx_sunlock_(sx, file, line)					\
-	_sx_sunlock((sx), (file), (line))
-#else
-#define	sx_xlock_(sx, file, line)					\
-	(void)__sx_xlock((sx), curthread, 0, (file), (line))
-#define	sx_xlock_sig_(sx, file, line)					\
-	__sx_xlock((sx), curthread, SX_INTERRUPTIBLE, (file), (line))
-#define	sx_xunlock_(sx, file, line)					\
-	__sx_xunlock((sx), curthread, (file), (line))
-#define	sx_slock_(sx, file, line)					\
-	(void)__sx_slock((sx), 0, (file), (line))
-#define	sx_slock_sig_(sx, file, line)					\
-	__sx_slock((sx), SX_INTERRUPTIBLE, (file), (line))
-#define	sx_sunlock_(sx, file, line)					\
-	__sx_sunlock((sx), (file), (line))
-#endif	/* LOCK_DEBUG > 0 || SX_NOINLINE */
-#define	sx_try_slock(sx)	sx_try_slock_((sx), LOCK_FILE, LOCK_LINE)
-#define	sx_try_xlock(sx)	sx_try_xlock_((sx), LOCK_FILE, LOCK_LINE)
-#define	sx_try_upgrade(sx)	sx_try_upgrade_((sx), LOCK_FILE, LOCK_LINE)
-#define	sx_downgrade(sx)	sx_downgrade_((sx), LOCK_FILE, LOCK_LINE)
-#ifdef INVARIANTS
-#define	sx_assert_(sx, what, file, line)				\
-	_sx_assert((sx), (what), (file), (line))
-#else
-#define	sx_assert_(sx, what, file, line)	(void)0
-#endif
-
-#define	sx_xlock(sx)		sx_xlock_((sx), LOCK_FILE, LOCK_LINE)
-#define	sx_xlock_sig(sx)	sx_xlock_sig_((sx), LOCK_FILE, LOCK_LINE)
-#define	sx_xunlock(sx)		sx_xunlock_((sx), LOCK_FILE, LOCK_LINE)
-#define	sx_slock(sx)		sx_slock_((sx), LOCK_FILE, LOCK_LINE)
-#define	sx_slock_sig(sx)	sx_slock_sig_((sx), LOCK_FILE, LOCK_LINE)
-#define	sx_sunlock(sx)		sx_sunlock_((sx), LOCK_FILE, LOCK_LINE)
-#define	sx_assert(sx, what)	sx_assert_((sx), (what), __FILE__, __LINE__)
-
-/*
- * Return a pointer to the owning thread if the lock is exclusively
- * locked.
- */
-#define	sx_xholder(sx)							\
-	((sx)->sx_lock & SX_LOCK_SHARED ? NULL :			\
-	(struct thread *)SX_OWNER((sx)->sx_lock))
-
-#define	sx_xlocked(sx)							\
-	(((sx)->sx_lock & ~(SX_LOCK_FLAGMASK & ~SX_LOCK_SHARED)) ==	\
-	    (uintptr_t)curthread)
-
-#define	sx_unlock_(sx, file, line) do {					\
-	if (sx_xlocked(sx))						\
-		sx_xunlock_(sx, file, line);				\
-	else								\
-		sx_sunlock_(sx, file, line);				\
-} while (0)
-
-#define	sx_unlock(sx)	sx_unlock_((sx), LOCK_FILE, LOCK_LINE)
-
-#define	sx_sleep(chan, sx, pri, wmesg, timo)				\
-	_sleep((chan), &(sx)->lock_object, (pri), (wmesg),		\
-	    tick_sbt * (timo), 0,  C_HARDCLOCK)
-
-/*
- * Options passed to sx_init_flags().
- */
-#define	SX_DUPOK		0x01
-#define	SX_NOPROFILE		0x02
-#define	SX_NOWITNESS		0x04
-#define	SX_QUIET		0x08
-#define	SX_NOADAPTIVE		0x10
-#define	SX_RECURSE		0x20
-
-/*
- * Options passed to sx_*lock_hard().
- */
-#define	SX_INTERRUPTIBLE	0x40
-
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-#define	SA_LOCKED		LA_LOCKED
-#define	SA_SLOCKED		LA_SLOCKED
-#define	SA_XLOCKED		LA_XLOCKED
-#define	SA_UNLOCKED		LA_UNLOCKED
-#define	SA_RECURSED		LA_RECURSED
-#define	SA_NOTRECURSED		LA_NOTRECURSED
-
-/* Backwards compatability. */
-#define	SX_LOCKED		LA_LOCKED
-#define	SX_SLOCKED		LA_SLOCKED
-#define	SX_XLOCKED		LA_XLOCKED
-#define	SX_UNLOCKED		LA_UNLOCKED
-#define	SX_RECURSED		LA_RECURSED
-#define	SX_NOTRECURSED		LA_NOTRECURSED
-#endif
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_SX_H_ */
diff --git a/include.new/sys/syscall.h b/include.new/sys/syscall.h
deleted file mode 100644
index 75ddd93..0000000
--- a/include.new/sys/syscall.h
+++ /dev/null
@@ -1,468 +0,0 @@
-/*
- * System call numbers.
- *
- * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: releng/10.2/sys/sys/syscall.h 276956 2015-01-11 07:04:18Z dchagin $
- * created from FreeBSD: stable/10/sys/kern/syscalls.master 276955 2015-01-11 07:02:03Z dchagin 
- */
-
-#define	SYS_syscall	0
-#define	SYS_exit	1
-#define	SYS_fork	2
-#define	SYS_read	3
-#define	SYS_write	4
-#define	SYS_open	5
-#define	SYS_close	6
-#define	SYS_wait4	7
-				/* 8 is old creat */
-#define	SYS_link	9
-#define	SYS_unlink	10
-				/* 11 is obsolete execv */
-#define	SYS_chdir	12
-#define	SYS_fchdir	13
-#define	SYS_mknod	14
-#define	SYS_chmod	15
-#define	SYS_chown	16
-#define	SYS_break	17
-#define	SYS_freebsd4_getfsstat	18
-				/* 19 is old lseek */
-#define	SYS_getpid	20
-#define	SYS_mount	21
-#define	SYS_unmount	22
-#define	SYS_setuid	23
-#define	SYS_getuid	24
-#define	SYS_geteuid	25
-#define	SYS_ptrace	26
-#define	SYS_recvmsg	27
-#define	SYS_sendmsg	28
-#define	SYS_recvfrom	29
-#define	SYS_accept	30
-#define	SYS_getpeername	31
-#define	SYS_getsockname	32
-#define	SYS_access	33
-#define	SYS_chflags	34
-#define	SYS_fchflags	35
-#define	SYS_sync	36
-#define	SYS_kill	37
-				/* 38 is old stat */
-#define	SYS_getppid	39
-				/* 40 is old lstat */
-#define	SYS_dup	41
-#define	SYS_pipe	42
-#define	SYS_getegid	43
-#define	SYS_profil	44
-#define	SYS_ktrace	45
-				/* 46 is old sigaction */
-#define	SYS_getgid	47
-				/* 48 is old sigprocmask */
-#define	SYS_getlogin	49
-#define	SYS_setlogin	50
-#define	SYS_acct	51
-				/* 52 is old sigpending */
-#define	SYS_sigaltstack	53
-#define	SYS_ioctl	54
-#define	SYS_reboot	55
-#define	SYS_revoke	56
-#define	SYS_symlink	57
-#define	SYS_readlink	58
-#define	SYS_execve	59
-#define	SYS_umask	60
-#define	SYS_chroot	61
-				/* 62 is old fstat */
-				/* 63 is old getkerninfo */
-				/* 64 is old getpagesize */
-#define	SYS_msync	65
-#define	SYS_vfork	66
-				/* 67 is obsolete vread */
-				/* 68 is obsolete vwrite */
-#define	SYS_sbrk	69
-#define	SYS_sstk	70
-				/* 71 is old mmap */
-#define	SYS_vadvise	72
-#define	SYS_munmap	73
-#define	SYS_mprotect	74
-#define	SYS_madvise	75
-				/* 76 is obsolete vhangup */
-				/* 77 is obsolete vlimit */
-#define	SYS_mincore	78
-#define	SYS_getgroups	79
-#define	SYS_setgroups	80
-#define	SYS_getpgrp	81
-#define	SYS_setpgid	82
-#define	SYS_setitimer	83
-				/* 84 is old wait */
-#define	SYS_swapon	85
-#define	SYS_getitimer	86
-				/* 87 is old gethostname */
-				/* 88 is old sethostname */
-#define	SYS_getdtablesize	89
-#define	SYS_dup2	90
-#define	SYS_fcntl	92
-#define	SYS_select	93
-#define	SYS_fsync	95
-#define	SYS_setpriority	96
-#define	SYS_socket	97
-#define	SYS_connect	98
-				/* 99 is old accept */
-#define	SYS_getpriority	100
-				/* 101 is old send */
-				/* 102 is old recv */
-				/* 103 is old sigreturn */
-#define	SYS_bind	104
-#define	SYS_setsockopt	105
-#define	SYS_listen	106
-				/* 107 is obsolete vtimes */
-				/* 108 is old sigvec */
-				/* 109 is old sigblock */
-				/* 110 is old sigsetmask */
-				/* 111 is old sigsuspend */
-				/* 112 is old sigstack */
-				/* 113 is old recvmsg */
-				/* 114 is old sendmsg */
-				/* 115 is obsolete vtrace */
-#define	SYS_gettimeofday	116
-#define	SYS_getrusage	117
-#define	SYS_getsockopt	118
-#define	SYS_readv	120
-#define	SYS_writev	121
-#define	SYS_settimeofday	122
-#define	SYS_fchown	123
-#define	SYS_fchmod	124
-				/* 125 is old recvfrom */
-#define	SYS_setreuid	126
-#define	SYS_setregid	127
-#define	SYS_rename	128
-				/* 129 is old truncate */
-				/* 130 is old ftruncate */
-#define	SYS_flock	131
-#define	SYS_mkfifo	132
-#define	SYS_sendto	133
-#define	SYS_shutdown	134
-#define	SYS_socketpair	135
-#define	SYS_mkdir	136
-#define	SYS_rmdir	137
-#define	SYS_utimes	138
-				/* 139 is obsolete 4.2 sigreturn */
-#define	SYS_adjtime	140
-				/* 141 is old getpeername */
-				/* 142 is old gethostid */
-				/* 143 is old sethostid */
-				/* 144 is old getrlimit */
-				/* 145 is old setrlimit */
-				/* 146 is old killpg */
-#define	SYS_setsid	147
-#define	SYS_quotactl	148
-				/* 149 is old quota */
-				/* 150 is old getsockname */
-#define	SYS_nlm_syscall	154
-#define	SYS_nfssvc	155
-				/* 156 is old getdirentries */
-#define	SYS_freebsd4_statfs	157
-#define	SYS_freebsd4_fstatfs	158
-#define	SYS_lgetfh	160
-#define	SYS_getfh	161
-#define	SYS_freebsd4_getdomainname	162
-#define	SYS_freebsd4_setdomainname	163
-#define	SYS_freebsd4_uname	164
-#define	SYS_sysarch	165
-#define	SYS_rtprio	166
-#define	SYS_semsys	169
-#define	SYS_msgsys	170
-#define	SYS_shmsys	171
-#define	SYS_freebsd6_pread	173
-#define	SYS_freebsd6_pwrite	174
-#define	SYS_setfib	175
-#define	SYS_ntp_adjtime	176
-#define	SYS_setgid	181
-#define	SYS_setegid	182
-#define	SYS_seteuid	183
-#define	SYS_stat	188
-#define	SYS_fstat	189
-#define	SYS_lstat	190
-#define	SYS_pathconf	191
-#define	SYS_fpathconf	192
-#define	SYS_getrlimit	194
-#define	SYS_setrlimit	195
-#define	SYS_getdirentries	196
-#define	SYS_freebsd6_mmap	197
-#define	SYS___syscall	198
-#define	SYS_freebsd6_lseek	199
-#define	SYS_freebsd6_truncate	200
-#define	SYS_freebsd6_ftruncate	201
-#define	SYS___sysctl	202
-#define	SYS_mlock	203
-#define	SYS_munlock	204
-#define	SYS_undelete	205
-#define	SYS_futimes	206
-#define	SYS_getpgid	207
-#define	SYS_poll	209
-#define	SYS_freebsd7___semctl	220
-#define	SYS_semget	221
-#define	SYS_semop	222
-#define	SYS_freebsd7_msgctl	224
-#define	SYS_msgget	225
-#define	SYS_msgsnd	226
-#define	SYS_msgrcv	227
-#define	SYS_shmat	228
-#define	SYS_freebsd7_shmctl	229
-#define	SYS_shmdt	230
-#define	SYS_shmget	231
-#define	SYS_clock_gettime	232
-#define	SYS_clock_settime	233
-#define	SYS_clock_getres	234
-#define	SYS_ktimer_create	235
-#define	SYS_ktimer_delete	236
-#define	SYS_ktimer_settime	237
-#define	SYS_ktimer_gettime	238
-#define	SYS_ktimer_getoverrun	239
-#define	SYS_nanosleep	240
-#define	SYS_ffclock_getcounter	241
-#define	SYS_ffclock_setestimate	242
-#define	SYS_ffclock_getestimate	243
-#define	SYS_clock_getcpuclockid2	247
-#define	SYS_ntp_gettime	248
-#define	SYS_minherit	250
-#define	SYS_rfork	251
-#define	SYS_openbsd_poll	252
-#define	SYS_issetugid	253
-#define	SYS_lchown	254
-#define	SYS_aio_read	255
-#define	SYS_aio_write	256
-#define	SYS_lio_listio	257
-#define	SYS_getdents	272
-#define	SYS_lchmod	274
-#define	SYS_netbsd_lchown	275
-#define	SYS_lutimes	276
-#define	SYS_netbsd_msync	277
-#define	SYS_nstat	278
-#define	SYS_nfstat	279
-#define	SYS_nlstat	280
-#define	SYS_preadv	289
-#define	SYS_pwritev	290
-#define	SYS_freebsd4_fhstatfs	297
-#define	SYS_fhopen	298
-#define	SYS_fhstat	299
-#define	SYS_modnext	300
-#define	SYS_modstat	301
-#define	SYS_modfnext	302
-#define	SYS_modfind	303
-#define	SYS_kldload	304
-#define	SYS_kldunload	305
-#define	SYS_kldfind	306
-#define	SYS_kldnext	307
-#define	SYS_kldstat	308
-#define	SYS_kldfirstmod	309
-#define	SYS_getsid	310
-#define	SYS_setresuid	311
-#define	SYS_setresgid	312
-				/* 313 is obsolete signanosleep */
-#define	SYS_aio_return	314
-#define	SYS_aio_suspend	315
-#define	SYS_aio_cancel	316
-#define	SYS_aio_error	317
-#define	SYS_oaio_read	318
-#define	SYS_oaio_write	319
-#define	SYS_olio_listio	320
-#define	SYS_yield	321
-				/* 322 is obsolete thr_sleep */
-				/* 323 is obsolete thr_wakeup */
-#define	SYS_mlockall	324
-#define	SYS_munlockall	325
-#define	SYS___getcwd	326
-#define	SYS_sched_setparam	327
-#define	SYS_sched_getparam	328
-#define	SYS_sched_setscheduler	329
-#define	SYS_sched_getscheduler	330
-#define	SYS_sched_yield	331
-#define	SYS_sched_get_priority_max	332
-#define	SYS_sched_get_priority_min	333
-#define	SYS_sched_rr_get_interval	334
-#define	SYS_utrace	335
-#define	SYS_freebsd4_sendfile	336
-#define	SYS_kldsym	337
-#define	SYS_jail	338
-#define	SYS_nnpfs_syscall	339
-#define	SYS_sigprocmask	340
-#define	SYS_sigsuspend	341
-#define	SYS_freebsd4_sigaction	342
-#define	SYS_sigpending	343
-#define	SYS_freebsd4_sigreturn	344
-#define	SYS_sigtimedwait	345
-#define	SYS_sigwaitinfo	346
-#define	SYS___acl_get_file	347
-#define	SYS___acl_set_file	348
-#define	SYS___acl_get_fd	349
-#define	SYS___acl_set_fd	350
-#define	SYS___acl_delete_file	351
-#define	SYS___acl_delete_fd	352
-#define	SYS___acl_aclcheck_file	353
-#define	SYS___acl_aclcheck_fd	354
-#define	SYS_extattrctl	355
-#define	SYS_extattr_set_file	356
-#define	SYS_extattr_get_file	357
-#define	SYS_extattr_delete_file	358
-#define	SYS_aio_waitcomplete	359
-#define	SYS_getresuid	360
-#define	SYS_getresgid	361
-#define	SYS_kqueue	362
-#define	SYS_kevent	363
-#define	SYS_extattr_set_fd	371
-#define	SYS_extattr_get_fd	372
-#define	SYS_extattr_delete_fd	373
-#define	SYS___setugid	374
-#define	SYS_eaccess	376
-#define	SYS_afs3_syscall	377
-#define	SYS_nmount	378
-#define	SYS___mac_get_proc	384
-#define	SYS___mac_set_proc	385
-#define	SYS___mac_get_fd	386
-#define	SYS___mac_get_file	387
-#define	SYS___mac_set_fd	388
-#define	SYS___mac_set_file	389
-#define	SYS_kenv	390
-#define	SYS_lchflags	391
-#define	SYS_uuidgen	392
-#define	SYS_sendfile	393
-#define	SYS_mac_syscall	394
-#define	SYS_getfsstat	395
-#define	SYS_statfs	396
-#define	SYS_fstatfs	397
-#define	SYS_fhstatfs	398
-#define	SYS_ksem_close	400
-#define	SYS_ksem_post	401
-#define	SYS_ksem_wait	402
-#define	SYS_ksem_trywait	403
-#define	SYS_ksem_init	404
-#define	SYS_ksem_open	405
-#define	SYS_ksem_unlink	406
-#define	SYS_ksem_getvalue	407
-#define	SYS_ksem_destroy	408
-#define	SYS___mac_get_pid	409
-#define	SYS___mac_get_link	410
-#define	SYS___mac_set_link	411
-#define	SYS_extattr_set_link	412
-#define	SYS_extattr_get_link	413
-#define	SYS_extattr_delete_link	414
-#define	SYS___mac_execve	415
-#define	SYS_sigaction	416
-#define	SYS_sigreturn	417
-#define	SYS_getcontext	421
-#define	SYS_setcontext	422
-#define	SYS_swapcontext	423
-#define	SYS_swapoff	424
-#define	SYS___acl_get_link	425
-#define	SYS___acl_set_link	426
-#define	SYS___acl_delete_link	427
-#define	SYS___acl_aclcheck_link	428
-#define	SYS_sigwait	429
-#define	SYS_thr_create	430
-#define	SYS_thr_exit	431
-#define	SYS_thr_self	432
-#define	SYS_thr_kill	433
-#define	SYS__umtx_lock	434
-#define	SYS__umtx_unlock	435
-#define	SYS_jail_attach	436
-#define	SYS_extattr_list_fd	437
-#define	SYS_extattr_list_file	438
-#define	SYS_extattr_list_link	439
-#define	SYS_ksem_timedwait	441
-#define	SYS_thr_suspend	442
-#define	SYS_thr_wake	443
-#define	SYS_kldunloadf	444
-#define	SYS_audit	445
-#define	SYS_auditon	446
-#define	SYS_getauid	447
-#define	SYS_setauid	448
-#define	SYS_getaudit	449
-#define	SYS_setaudit	450
-#define	SYS_getaudit_addr	451
-#define	SYS_setaudit_addr	452
-#define	SYS_auditctl	453
-#define	SYS__umtx_op	454
-#define	SYS_thr_new	455
-#define	SYS_sigqueue	456
-#define	SYS_kmq_open	457
-#define	SYS_kmq_setattr	458
-#define	SYS_kmq_timedreceive	459
-#define	SYS_kmq_timedsend	460
-#define	SYS_kmq_notify	461
-#define	SYS_kmq_unlink	462
-#define	SYS_abort2	463
-#define	SYS_thr_set_name	464
-#define	SYS_aio_fsync	465
-#define	SYS_rtprio_thread	466
-#define	SYS_sctp_peeloff	471
-#define	SYS_sctp_generic_sendmsg	472
-#define	SYS_sctp_generic_sendmsg_iov	473
-#define	SYS_sctp_generic_recvmsg	474
-#define	SYS_pread	475
-#define	SYS_pwrite	476
-#define	SYS_mmap	477
-#define	SYS_lseek	478
-#define	SYS_truncate	479
-#define	SYS_ftruncate	480
-#define	SYS_thr_kill2	481
-#define	SYS_shm_open	482
-#define	SYS_shm_unlink	483
-#define	SYS_cpuset	484
-#define	SYS_cpuset_setid	485
-#define	SYS_cpuset_getid	486
-#define	SYS_cpuset_getaffinity	487
-#define	SYS_cpuset_setaffinity	488
-#define	SYS_faccessat	489
-#define	SYS_fchmodat	490
-#define	SYS_fchownat	491
-#define	SYS_fexecve	492
-#define	SYS_fstatat	493
-#define	SYS_futimesat	494
-#define	SYS_linkat	495
-#define	SYS_mkdirat	496
-#define	SYS_mkfifoat	497
-#define	SYS_mknodat	498
-#define	SYS_openat	499
-#define	SYS_readlinkat	500
-#define	SYS_renameat	501
-#define	SYS_symlinkat	502
-#define	SYS_unlinkat	503
-#define	SYS_posix_openpt	504
-#define	SYS_gssd_syscall	505
-#define	SYS_jail_get	506
-#define	SYS_jail_set	507
-#define	SYS_jail_remove	508
-#define	SYS_closefrom	509
-#define	SYS___semctl	510
-#define	SYS_msgctl	511
-#define	SYS_shmctl	512
-#define	SYS_lpathconf	513
-				/* 514 is obsolete cap_new */
-#define	SYS___cap_rights_get	515
-#define	SYS_cap_enter	516
-#define	SYS_cap_getmode	517
-#define	SYS_pdfork	518
-#define	SYS_pdkill	519
-#define	SYS_pdgetpid	520
-#define	SYS_pselect	522
-#define	SYS_getloginclass	523
-#define	SYS_setloginclass	524
-#define	SYS_rctl_get_racct	525
-#define	SYS_rctl_get_rules	526
-#define	SYS_rctl_get_limits	527
-#define	SYS_rctl_add_rule	528
-#define	SYS_rctl_remove_rule	529
-#define	SYS_posix_fallocate	530
-#define	SYS_posix_fadvise	531
-#define	SYS_wait6	532
-#define	SYS_cap_rights_limit	533
-#define	SYS_cap_ioctls_limit	534
-#define	SYS_cap_ioctls_get	535
-#define	SYS_cap_fcntls_limit	536
-#define	SYS_cap_fcntls_get	537
-#define	SYS_bindat	538
-#define	SYS_connectat	539
-#define	SYS_chflagsat	540
-#define	SYS_accept4	541
-#define	SYS_pipe2	542
-#define	SYS_aio_mlock	543
-#define	SYS_procctl	544
-#define	SYS_ppoll	545
-#define	SYS_MAXSYSCALL	546
diff --git a/include.new/sys/syscallsubr.h b/include.new/sys/syscallsubr.h
deleted file mode 100644
index 666873c..0000000
--- a/include.new/sys/syscallsubr.h
+++ /dev/null
@@ -1,270 +0,0 @@
-/*-
- * Copyright (c) 2002 Ian Dowse.  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.
- *
- * 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: releng/10.2/sys/sys/syscallsubr.h 276955 2015-01-11 07:02:03Z dchagin $
- */
-
-#ifndef _SYS_SYSCALLSUBR_H_
-#define _SYS_SYSCALLSUBR_H_
-
-#include <sys/signal.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-#include <sys/mac.h>
-#include <sys/mount.h>
-
-struct file;
-enum idtype;
-struct itimerval;
-struct image_args;
-struct jail;
-struct kevent;
-struct kevent_copyops;
-struct kld_file_stat;
-struct ksiginfo;
-struct mbuf;
-struct msghdr;
-struct msqid_ds;
-struct pollfd;
-struct ogetdirentries_args;
-struct rlimit;
-struct rusage;
-union semun;
-struct sendfile_args;
-struct sockaddr;
-struct stat;
-struct thr_param;
-struct __wrusage;
-
-int	kern___getcwd(struct thread *td, char *buf, enum uio_seg bufseg,
-	    u_int buflen);
-int	kern_accept(struct thread *td, int s, struct sockaddr **name,
-	    socklen_t *namelen, struct file **fp);
-int	kern_accept4(struct thread *td, int s, struct sockaddr **name,
-	    socklen_t *namelen, int flags, struct file **fp);
-int	kern_access(struct thread *td, char *path, enum uio_seg pathseg,
-	    int flags);
-int	kern_accessat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg, int flags, int mode);
-int	kern_adjtime(struct thread *td, struct timeval *delta,
-	    struct timeval *olddelta);
-int	kern_alternate_path(struct thread *td, const char *prefix, const char *path,
-	    enum uio_seg pathseg, char **pathbuf, int create, int dirfd);
-int	kern_bind(struct thread *td, int fd, struct sockaddr *sa);
-int	kern_cap_ioctls_limit(struct thread *td, int fd, u_long *cmds,
-	    size_t ncmds);
-int	kern_chdir(struct thread *td, char *path, enum uio_seg pathseg);
-int	kern_chmod(struct thread *td, char *path, enum uio_seg pathseg,
-	    int mode);
-int	kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid,
-	    int gid);
-int	kern_clock_getcpuclockid2(struct thread *td, id_t id, int which,
-	    clockid_t *clk_id);
-int	kern_clock_getres(struct thread *td, clockid_t clock_id,
-	    struct timespec *ts);
-int	kern_clock_gettime(struct thread *td, clockid_t clock_id,
-	    struct timespec *ats);
-int	kern_clock_settime(struct thread *td, clockid_t clock_id,
-	    struct timespec *ats);
-int	kern_close(struct thread *td, int fd);
-int	kern_connect(struct thread *td, int fd, struct sockaddr *sa);
-int	kern_eaccess(struct thread *td, char *path, enum uio_seg pathseg,
-	    int flags);
-int	kern_execve(struct thread *td, struct image_args *args,
-	    struct mac *mac_p);
-int	kern_fchmodat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg, mode_t mode, int flag);
-int	kern_fchownat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg, int uid, int gid, int flag);
-int	kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg);
-int	kern_fcntl_freebsd(struct thread *td, int fd, int cmd, long arg);
-int	kern_fhstat(struct thread *td, fhandle_t fh, struct stat *buf);
-int	kern_fhstatfs(struct thread *td, fhandle_t fh, struct statfs *buf);
-int	kern_fstat(struct thread *td, int fd, struct stat *sbp);
-int	kern_fstatfs(struct thread *td, int fd, struct statfs *buf);
-int	kern_ftruncate(struct thread *td, int fd, off_t length);
-int	kern_futimes(struct thread *td, int fd, struct timeval *tptr,
-	    enum uio_seg tptrseg);
-int	kern_getdirentries(struct thread *td, int fd, char *buf, u_int count,
-	    long *basep, ssize_t *residp, enum uio_seg bufseg);
-int	kern_getfsstat(struct thread *td, struct statfs **buf, size_t bufsize,
-	    enum uio_seg bufseg, int flags);
-int	kern_getgroups(struct thread *td, u_int *ngrp, gid_t *groups);
-int	kern_getitimer(struct thread *, u_int, struct itimerval *);
-int	kern_getpeername(struct thread *td, int fd, struct sockaddr **sa,
-	    socklen_t *alen);
-int	kern_getrusage(struct thread *td, int who, struct rusage *rup);
-int	kern_getsockname(struct thread *td, int fd, struct sockaddr **sa,
-	    socklen_t *alen);
-int	kern_getsockopt(struct thread *td, int s, int level, int name,
-	    void *optval, enum uio_seg valseg, socklen_t *valsize);
-int	kern_ioctl(struct thread *td, int fd, u_long com, caddr_t data);
-int	kern_jail(struct thread *td, struct jail *j);
-int	kern_jail_get(struct thread *td, struct uio *options, int flags);
-int	kern_jail_set(struct thread *td, struct uio *options, int flags);
-int	kern_kevent(struct thread *td, int fd, int nchanges, int nevents,
-	    struct kevent_copyops *k_ops, const struct timespec *timeout);
-int	kern_kldload(struct thread *td, const char *file, int *fileid);
-int	kern_kldstat(struct thread *td, int fileid, struct kld_file_stat *stat);
-int	kern_kldunload(struct thread *td, int fileid, int flags);
-int	kern_lchown(struct thread *td, char *path, enum uio_seg pathseg,
-	    int uid, int gid);
-int	kern_link(struct thread *td, char *path, char *link,
-	    enum uio_seg segflg);
-int	kern_linkat(struct thread *td, int fd1, int fd2, char *path1,
-	    char *path2, enum uio_seg segflg, int follow);
-int	kern_lstat(struct thread *td, char *path, enum uio_seg pathseg,
-	    struct stat *sbp);
-int	kern_lutimes(struct thread *td, char *path, enum uio_seg pathseg,
-	    struct timeval *tptr, enum uio_seg tptrseg);
-int	kern_mkdir(struct thread *td, char *path, enum uio_seg segflg,
-	    int mode);
-int	kern_mkdirat(struct thread *td, int fd, char *path,
-	    enum uio_seg segflg, int mode);
-int	kern_mkfifo(struct thread *td, char *path, enum uio_seg pathseg,
-	    int mode);
-int	kern_mkfifoat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg, int mode);
-int	kern_mknod(struct thread *td, char *path, enum uio_seg pathseg,
-	    int mode, int dev);
-int	kern_mknodat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg, int mode, int dev);
-int	kern_msgctl(struct thread *, int, int, struct msqid_ds *);
-int	kern_msgsnd(struct thread *, int, const void *, size_t, int, long);
-int	kern_msgrcv(struct thread *, int, void *, size_t, long, int, long *);
-int     kern_nanosleep(struct thread *td, struct timespec *rqt,
-	    struct timespec *rmt);
-int	kern_ogetdirentries(struct thread *td, struct ogetdirentries_args *uap,
-	    long *ploff);
-int	kern_open(struct thread *td, char *path, enum uio_seg pathseg,
-	    int flags, int mode);
-int	kern_openat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg, int flags, int mode);
-int	kern_pathconf(struct thread *td, char *path, enum uio_seg pathseg,
-	    int name, u_long flags);
-int	kern_pipe(struct thread *td, int fildes[2]);
-int	kern_pipe2(struct thread *td, int fildes[2], int flags);
-int	kern_poll(struct thread *td, struct pollfd *fds, u_int nfds,
-	    struct timespec *tsp, sigset_t *uset);
-int	kern_posix_fadvise(struct thread *td, int fd, off_t offset, off_t len,
-	    int advice);
-int	kern_posix_fallocate(struct thread *td, int fd, off_t offset,
-	    off_t len);
-int	kern_procctl(struct thread *td, enum idtype idtype, id_t id, int com,
-	    void *data);
-int	kern_preadv(struct thread *td, int fd, struct uio *auio, off_t offset);
-int	kern_pselect(struct thread *td, int nd, fd_set *in, fd_set *ou,
-	    fd_set *ex, struct timeval *tvp, sigset_t *uset, int abi_nfdbits);
-int	kern_ptrace(struct thread *td, int req, pid_t pid, void *addr,
-	    int data);
-int	kern_pwritev(struct thread *td, int fd, struct uio *auio, off_t offset);
-int	kern_readlink(struct thread *td, char *path, enum uio_seg pathseg,
-	    char *buf, enum uio_seg bufseg, size_t count);
-int	kern_readlinkat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg, char *buf, enum uio_seg bufseg, size_t count);
-int	kern_readv(struct thread *td, int fd, struct uio *auio);
-int	kern_recvit(struct thread *td, int s, struct msghdr *mp,
-	    enum uio_seg fromseg, struct mbuf **controlp);
-int	kern_rename(struct thread *td, char *from, char *to,
-	    enum uio_seg pathseg);
-int	kern_renameat(struct thread *td, int oldfd, char *old, int newfd,
-	    char *new, enum uio_seg pathseg);
-int	kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg);
-int	kern_rmdirat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg);
-int	kern_sched_rr_get_interval(struct thread *td, pid_t pid,
-	    struct timespec *ts);
-int	kern_semctl(struct thread *td, int semid, int semnum, int cmd,
-	    union semun *arg, register_t *rval);
-int	kern_select(struct thread *td, int nd, fd_set *fd_in, fd_set *fd_ou,
-	    fd_set *fd_ex, struct timeval *tvp, int abi_nfdbits);
-int	kern_sendfile(struct thread *td, struct sendfile_args *uap,
-	    struct uio *hdr_uio, struct uio *trl_uio, int compat);
-int	kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags,
-	    struct mbuf *control, enum uio_seg segflg);
-int	kern_setgroups(struct thread *td, u_int ngrp, gid_t *groups);
-int	kern_setitimer(struct thread *, u_int, struct itimerval *,
-	    struct itimerval *);
-int	kern_setrlimit(struct thread *, u_int, struct rlimit *);
-int	kern_setsockopt(struct thread *td, int s, int level, int name,
-	    void *optval, enum uio_seg valseg, socklen_t valsize);
-int	kern_settimeofday(struct thread *td, struct timeval *tv,
-	    struct timezone *tzp);
-int	kern_shmat(struct thread *td, int shmid, const void *shmaddr,
-	    int shmflg);
-int	kern_shmctl(struct thread *td, int shmid, int cmd, void *buf,
-	    size_t *bufsz);
-int	kern_sigaction(struct thread *td, int sig, struct sigaction *act,
-	    struct sigaction *oact, int flags);
-int	kern_sigaltstack(struct thread *td, stack_t *ss, stack_t *oss);
-int	kern_sigprocmask(struct thread *td, int how,
-	    sigset_t *set, sigset_t *oset, int flags);
-int	kern_sigsuspend(struct thread *td, sigset_t mask);
-int	kern_sigtimedwait(struct thread *td, sigset_t waitset,
-	    struct ksiginfo *ksi, struct timespec *timeout);
-int	kern_stat(struct thread *td, char *path, enum uio_seg pathseg,
-	    struct stat *sbp);
-int	kern_statat(struct thread *td, int flag, int fd, char *path,
-	    enum uio_seg pathseg, struct stat *sbp);
-int	kern_statat_vnhook(struct thread *td, int flag, int fd, char *path,
-	    enum uio_seg pathseg, struct stat *sbp,
-	    void (*hook)(struct vnode *vp, struct stat *sbp));
-int	kern_statfs(struct thread *td, char *path, enum uio_seg pathseg,
-	    struct statfs *buf);
-int	kern_symlink(struct thread *td, char *path, char *link,
-	    enum uio_seg segflg);
-int	kern_symlinkat(struct thread *td, char *path1, int fd, char *path2,
-	    enum uio_seg segflg);
-int	kern_ktimer_create(struct thread *td, clockid_t clock_id,
-	    struct sigevent *evp, int *timerid, int preset_id);
-int	kern_ktimer_delete(struct thread *, int);
-int	kern_ktimer_settime(struct thread *td, int timer_id, int flags,
-	    struct itimerspec *val, struct itimerspec *oval);
-int	kern_ktimer_gettime(struct thread *td, int timer_id,
-	    struct itimerspec *val);
-int	kern_ktimer_getoverrun(struct thread *td, int timer_id);
-int	kern_thr_new(struct thread *td, struct thr_param *param);
-int	kern_thr_suspend(struct thread *td, struct timespec *tsp);
-int	kern_truncate(struct thread *td, char *path, enum uio_seg pathseg,
-	    off_t length);
-int	kern_unlink(struct thread *td, char *path, enum uio_seg pathseg);
-int	kern_unlinkat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg, ino_t oldinum);
-int	kern_utimes(struct thread *td, char *path, enum uio_seg pathseg,
-	    struct timeval *tptr, enum uio_seg tptrseg);
-int	kern_utimesat(struct thread *td, int fd, char *path,
-	    enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg);
-int	kern_wait(struct thread *td, pid_t pid, int *status, int options,
-	    struct rusage *rup);
-int	kern_wait6(struct thread *td, enum idtype idtype, id_t id, int *status,
-	    int options, struct __wrusage *wrup, siginfo_t *sip);
-int	kern_writev(struct thread *td, int fd, struct uio *auio);
-int	kern_socketpair(struct thread *td, int domain, int type, int protocol,
-	    int *rsv);
-
-/* flags for kern_sigaction */
-#define	KSA_OSIGSET	0x0001	/* uses osigact_t */
-#define	KSA_FREEBSD4	0x0002	/* uses ucontext4 */
-
-#endif /* !_SYS_SYSCALLSUBR_H_ */
diff --git a/include.new/sys/sysctl.h b/include.new/sys/sysctl.h
deleted file mode 100644
index f34a667..0000000
--- a/include.new/sys/sysctl.h
+++ /dev/null
@@ -1,810 +0,0 @@
-/*-
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Karels at Berkeley Software Design, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)sysctl.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/sysctl.h 273736 2014-10-27 14:38:00Z hselasky $
- */
-
-#ifndef _SYS_SYSCTL_H_
-#define	_SYS_SYSCTL_H_
-
-#include <sys/queue.h>
-
-struct thread;
-/*
- * Definitions for sysctl call.  The sysctl call uses a hierarchical name
- * for objects that can be examined or modified.  The name is expressed as
- * a sequence of integers.  Like a file path name, the meaning of each
- * component depends on its place in the hierarchy.  The top-level and kern
- * identifiers are defined here, and other identifiers are defined in the
- * respective subsystem header files.
- */
-
-#define	CTL_MAXNAME	24	/* largest number of components supported */
-
-/*
- * Each subsystem defined by sysctl defines a list of variables
- * for that subsystem. Each name is either a node with further
- * levels defined below it, or it is a leaf of some particular
- * type given below. Each sysctl level defines a set of name/type
- * pairs to be used by sysctl(8) in manipulating the subsystem.
- */
-struct ctlname {
-	char	*ctl_name;	/* subsystem name */
-	int	 ctl_type;	/* type of name */
-};
-
-#define	CTLTYPE		0xf	/* mask for the type */
-#define	CTLTYPE_NODE	1	/* name is a node */
-#define	CTLTYPE_INT	2	/* name describes an integer */
-#define	CTLTYPE_STRING	3	/* name describes a string */
-#define	CTLTYPE_S64	4	/* name describes a signed 64-bit number */
-#define	CTLTYPE_OPAQUE	5	/* name describes a structure */
-#define	CTLTYPE_STRUCT	CTLTYPE_OPAQUE	/* name describes a structure */
-#define	CTLTYPE_UINT	6	/* name describes an unsigned integer */
-#define	CTLTYPE_LONG	7	/* name describes a long */
-#define	CTLTYPE_ULONG	8	/* name describes an unsigned long */
-#define	CTLTYPE_U64	9	/* name describes an unsigned 64-bit number */
-
-#define	CTLFLAG_RD	0x80000000	/* Allow reads of variable */
-#define	CTLFLAG_WR	0x40000000	/* Allow writes to the variable */
-#define	CTLFLAG_RW	(CTLFLAG_RD|CTLFLAG_WR)
-#define	CTLFLAG_ANYBODY	0x10000000	/* All users can set this var */
-#define	CTLFLAG_SECURE	0x08000000	/* Permit set only if securelevel<=0 */
-#define	CTLFLAG_PRISON	0x04000000	/* Prisoned roots can fiddle */
-#define	CTLFLAG_DYN	0x02000000	/* Dynamic oid - can be freed */
-#define	CTLFLAG_SKIP	0x01000000	/* Skip this sysctl when listing */
-#define	CTLMASK_SECURE	0x00F00000	/* Secure level */
-#define	CTLFLAG_TUN	0x00080000	/* Tunable variable */
-#define	CTLFLAG_RDTUN	(CTLFLAG_RD|CTLFLAG_TUN)
-#define	CTLFLAG_RWTUN	(CTLFLAG_RW|CTLFLAG_TUN)
-#define	CTLFLAG_MPSAFE	0x00040000	/* Handler is MP safe */
-#define	CTLFLAG_VNET	0x00020000	/* Prisons with vnet can fiddle */
-#define	CTLFLAG_DYING	0x00010000	/* Oid is being removed */
-#define	CTLFLAG_CAPRD	0x00008000	/* Can be read in capability mode */
-#define	CTLFLAG_CAPWR	0x00004000	/* Can be written in capability mode */
-#define	CTLFLAG_STATS	0x00002000	/* Statistics, not a tuneable */
-#define	CTLFLAG_NOFETCH	0x00001000	/* Don't fetch tunable from getenv() */
-#define	CTLFLAG_CAPRW	(CTLFLAG_CAPRD|CTLFLAG_CAPWR)
-
-/*
- * Secure level.   Note that CTLFLAG_SECURE == CTLFLAG_SECURE1.
- *
- * Secure when the securelevel is raised to at least N.
- */
-#define	CTLSHIFT_SECURE	20
-#define	CTLFLAG_SECURE1	(CTLFLAG_SECURE | (0 << CTLSHIFT_SECURE))
-#define	CTLFLAG_SECURE2	(CTLFLAG_SECURE | (1 << CTLSHIFT_SECURE))
-#define	CTLFLAG_SECURE3	(CTLFLAG_SECURE | (2 << CTLSHIFT_SECURE))
-
-/*
- * USE THIS instead of a hardwired number from the categories below
- * to get dynamically assigned sysctl entries using the linker-set
- * technology. This is the way nearly all new sysctl variables should
- * be implemented.
- * e.g. SYSCTL_INT(_parent, OID_AUTO, name, CTLFLAG_RW, &variable, 0, "");
- */
-#define	OID_AUTO	(-1)
-
-/*
- * The starting number for dynamically-assigned entries.  WARNING!
- * ALL static sysctl entries should have numbers LESS than this!
- */
-#define	CTL_AUTO_START	0x100
-
-#ifdef _KERNEL
-#include <sys/linker_set.h>
-
-#ifdef KLD_MODULE
-/* XXX allow overspecification of type in external kernel modules */
-#define	SYSCTL_CT_ASSERT_MASK CTLTYPE
-#else
-#define	SYSCTL_CT_ASSERT_MASK 0
-#endif
-
-#define	SYSCTL_HANDLER_ARGS struct sysctl_oid *oidp, void *arg1,	\
-	intptr_t arg2, struct sysctl_req *req
-
-/* definitions for sysctl_req 'lock' member */
-#define	REQ_UNWIRED	1
-#define	REQ_WIRED	2
-
-/* definitions for sysctl_req 'flags' member */
-#if defined(__amd64__) || defined(__ia64__) || defined(__powerpc64__) ||\
-    (defined(__mips__) && defined(__mips_n64))
-#define	SCTL_MASK32	1	/* 32 bit emulation */
-#endif
-
-/*
- * This describes the access space for a sysctl request.  This is needed
- * so that we can use the interface from the kernel or from user-space.
- */
-struct sysctl_req {
-	struct thread	*td;		/* used for access checking */
-	int		 lock;		/* wiring state */
-	void		*oldptr;
-	size_t		 oldlen;
-	size_t		 oldidx;
-	int		(*oldfunc)(struct sysctl_req *, const void *, size_t);
-	void		*newptr;
-	size_t		 newlen;
-	size_t		 newidx;
-	int		(*newfunc)(struct sysctl_req *, void *, size_t);
-	size_t		 validlen;
-	int		 flags;
-};
-
-SLIST_HEAD(sysctl_oid_list, sysctl_oid);
-
-/*
- * This describes one "oid" in the MIB tree.  Potentially more nodes can
- * be hidden behind it, expanded by the handler.
- */
-struct sysctl_oid {
-	struct sysctl_oid_list *oid_parent;
-	SLIST_ENTRY(sysctl_oid) oid_link;
-	int		 oid_number;
-	u_int		 oid_kind;
-	void		*oid_arg1;
-	intptr_t	 oid_arg2;
-	const char	*oid_name;
-	int		(*oid_handler)(SYSCTL_HANDLER_ARGS);
-	const char	*oid_fmt;
-	int		 oid_refcnt;
-	u_int		 oid_running;
-	const char	*oid_descr;
-};
-
-#define	SYSCTL_IN(r, p, l)	(r->newfunc)(r, p, l)
-#define	SYSCTL_OUT(r, p, l)	(r->oldfunc)(r, p, l)
-
-int sysctl_handle_int(SYSCTL_HANDLER_ARGS);
-int sysctl_msec_to_ticks(SYSCTL_HANDLER_ARGS);
-int sysctl_handle_long(SYSCTL_HANDLER_ARGS);
-int sysctl_handle_64(SYSCTL_HANDLER_ARGS);
-int sysctl_handle_string(SYSCTL_HANDLER_ARGS);
-int sysctl_handle_opaque(SYSCTL_HANDLER_ARGS);
-int sysctl_handle_counter_u64(SYSCTL_HANDLER_ARGS);
-
-int sysctl_handle_uma_zone_max(SYSCTL_HANDLER_ARGS);
-int sysctl_handle_uma_zone_cur(SYSCTL_HANDLER_ARGS);
-
-int sysctl_dpcpu_int(SYSCTL_HANDLER_ARGS);
-int sysctl_dpcpu_long(SYSCTL_HANDLER_ARGS);
-int sysctl_dpcpu_quad(SYSCTL_HANDLER_ARGS);
-
-/*
- * These functions are used to add/remove an oid from the mib.
- */
-void sysctl_register_oid(struct sysctl_oid *oidp);
-void sysctl_unregister_oid(struct sysctl_oid *oidp);
-
-/* Declare a static oid to allow child oids to be added to it. */
-#define	SYSCTL_DECL(name)						\
-	extern struct sysctl_oid_list sysctl_##name##_children
-
-/* Hide these in macros. */
-#define	SYSCTL_CHILDREN(oid_ptr)					\
-	(struct sysctl_oid_list *)(oid_ptr)->oid_arg1
-#define	SYSCTL_PARENT(oid_ptr)			NULL	/* not supported */
-#define	SYSCTL_CHILDREN_SET(oid_ptr, val)	(oid_ptr)->oid_arg1 = (val)
-#define	SYSCTL_STATIC_CHILDREN(oid_name)	(&sysctl_##oid_name##_children)
-
-/* === Structs and macros related to context handling. === */
-
-/* All dynamically created sysctls can be tracked in a context list. */
-struct sysctl_ctx_entry {
-	struct sysctl_oid *entry;
-	TAILQ_ENTRY(sysctl_ctx_entry) link;
-};
-
-TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry);
-
-#define	SYSCTL_NODE_CHILDREN(parent, name) \
-	sysctl_##parent##_##name##_children
-
-#ifndef NO_SYSCTL_DESCR
-#define	__DESCR(d) d
-#else
-#define	__DESCR(d) ""
-#endif
-
-/* This constructs a "raw" MIB oid. */
-#define	SYSCTL_OID(parent, nbr, name, kind, a1, a2, handler, fmt, descr)\
-	static struct sysctl_oid sysctl__##parent##_##name = {		\
-		&sysctl_##parent##_children,				\
-		{ NULL },						\
-		nbr,							\
-		kind,							\
-		a1,							\
-		a2,							\
-		#name,							\
-		handler,						\
-		fmt,							\
-		0,							\
-		0,							\
-		__DESCR(descr)						\
-		};							\
-	DATA_SET(sysctl_set, sysctl__##parent##_##name)
-
-#define	SYSCTL_ADD_OID(ctx, parent, nbr, name, kind, a1, a2, handler, fmt, descr) \
-	sysctl_add_oid(ctx, parent, nbr, name, kind, a1, a2, handler, fmt, __DESCR(descr))
-
-/* This constructs a root node from which other nodes can hang. */
-#define	SYSCTL_ROOT_NODE(nbr, name, access, handler, descr)		\
-	SYSCTL_NODE(, nbr, name, access, handler, descr);		\
-	CTASSERT(((access) & CTLTYPE) == 0 ||			\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_NODE)
-
-/* This constructs a node from which other oids can hang. */
-#define	SYSCTL_NODE(parent, nbr, name, access, handler, descr)		    \
-	struct sysctl_oid_list SYSCTL_NODE_CHILDREN(parent, name);	    \
-	SYSCTL_OID(parent, nbr, name, CTLTYPE_NODE|(access),		    \
-	    (void*)&SYSCTL_NODE_CHILDREN(parent, name), 0, handler, "N", descr); \
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_NODE)
-
-#define	SYSCTL_ADD_ROOT_NODE(ctx, nbr, name, access, handler, descr) \
-	SYSCTL_ADD_NODE(ctx, SYSCTL_STATIC_CHILDREN(), nbr, name, access, handler, descr)
-
-#define	SYSCTL_ADD_NODE(ctx, parent, nbr, name, access, handler, descr)	\
-({									\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_NODE);	\
-	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_NODE|(access),	\
-	    NULL, 0, handler, "N", __DESCR(descr));			\
-})
-
-/* Oid for a string.  len can be 0 to indicate '\0' termination. */
-#define	SYSCTL_STRING(parent, nbr, name, access, arg, len, descr)	\
-	SYSCTL_OID(parent, nbr, name, CTLTYPE_STRING|(access),		\
-	    arg, len, sysctl_handle_string, "A", descr);		\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_STRING)
-
-#define	SYSCTL_ADD_STRING(ctx, parent, nbr, name, access, arg, len, descr) \
-({									\
-	char *__arg = (arg);						\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_STRING);	\
-	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_STRING|(access),	\
-	    __arg, len, sysctl_handle_string, "A", __DESCR(descr));	\
-})
-
-/* Oid for an int.  If ptr is SYSCTL_NULL_INT_PTR, val is returned. */
-#define	SYSCTL_NULL_INT_PTR ((int *)NULL)
-#define	SYSCTL_INT(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_OID(parent, nbr, name,				\
-	    CTLTYPE_INT | CTLFLAG_MPSAFE | (access),		\
-	    ptr, val, sysctl_handle_int, "I", descr);		\
-	CTASSERT(((access) & CTLTYPE) == 0 ||			\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_INT);	\
-	CTASSERT(sizeof(int) == sizeof(*(ptr)))
-
-#define	SYSCTL_ADD_INT(ctx, parent, nbr, name, access, ptr, val, descr)	\
-({									\
-	int *__ptr = (ptr);						\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_INT);		\
-	sysctl_add_oid(ctx, parent, nbr, name,				\
-	    CTLTYPE_INT | CTLFLAG_MPSAFE | (access),			\
-	    __ptr, val, sysctl_handle_int, "I", __DESCR(descr));	\
-})
-
-/* Oid for an unsigned int.  If ptr is NULL, val is returned. */
-#define	SYSCTL_NULL_UINT_PTR ((unsigned *)NULL)
-#define	SYSCTL_UINT(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_OID(parent, nbr, name,				\
-	    CTLTYPE_UINT | CTLFLAG_MPSAFE | (access),		\
-	    ptr, val, sysctl_handle_int, "IU", descr);		\
-	CTASSERT(((access) & CTLTYPE) == 0 ||			\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_UINT);\
-	CTASSERT(sizeof(unsigned) == sizeof(*(ptr)))
-
-#define	SYSCTL_ADD_UINT(ctx, parent, nbr, name, access, ptr, val, descr) \
-({									\
-	unsigned *__ptr = (ptr);					\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_UINT);	\
-	sysctl_add_oid(ctx, parent, nbr, name,				\
-	    CTLTYPE_UINT | CTLFLAG_MPSAFE | (access),			\
-	    __ptr, val, sysctl_handle_int, "IU", __DESCR(descr));	\
-})
-
-/* Oid for a long.  The pointer must be non NULL. */
-#define	SYSCTL_NULL_LONG_PTR ((long *)NULL)
-#define	SYSCTL_LONG(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_OID(parent, nbr, name,				\
-	    CTLTYPE_LONG | CTLFLAG_MPSAFE | (access),		\
-	    ptr, val, sysctl_handle_long, "L", descr);		\
-	CTASSERT(((access) & CTLTYPE) == 0 ||			\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_LONG);\
-	CTASSERT(sizeof(long) == sizeof(*(ptr)))
-
-#define	SYSCTL_ADD_LONG(ctx, parent, nbr, name, access, ptr, descr)	\
-({									\
-	long *__ptr = (ptr);						\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_LONG);	\
-	sysctl_add_oid(ctx, parent, nbr, name,				\
-	    CTLTYPE_LONG | CTLFLAG_MPSAFE | (access),			\
-	    __ptr, 0, sysctl_handle_long, "L", __DESCR(descr));		\
-})
-
-/* Oid for an unsigned long.  The pointer must be non NULL. */
-#define	SYSCTL_NULL_ULONG_PTR ((unsigned long *)NULL)
-#define	SYSCTL_ULONG(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_OID(parent, nbr, name,					\
-	    CTLTYPE_ULONG | CTLFLAG_MPSAFE | (access),			\
-	    ptr, val, sysctl_handle_long, "LU", descr);			\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_ULONG);	\
-	CTASSERT(sizeof(unsigned long) == sizeof(*(ptr)))
-
-#define	SYSCTL_ADD_ULONG(ctx, parent, nbr, name, access, ptr, descr)	\
-({									\
-	unsigned long *__ptr = (ptr);					\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_ULONG);	\
-	sysctl_add_oid(ctx, parent, nbr, name,				\
-	    CTLTYPE_ULONG | CTLFLAG_MPSAFE | (access),			\
-	    __ptr, 0, sysctl_handle_long, "LU", __DESCR(descr));	\
-})
-
-/* Oid for a quad.  The pointer must be non NULL. */
-#define	SYSCTL_NULL_QUAD_PTR ((int64_t *)NULL)
-#define	SYSCTL_QUAD(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_OID(parent, nbr, name,				\
-	    CTLTYPE_S64 | CTLFLAG_MPSAFE | (access),		\
-	    ptr, val, sysctl_handle_64, "Q", descr);		\
-	CTASSERT(((access) & CTLTYPE) == 0 ||			\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64);	\
-	CTASSERT(sizeof(int64_t) == sizeof(*(ptr)))
-
-#define	SYSCTL_ADD_QUAD(ctx, parent, nbr, name, access, ptr, descr)	\
-({									\
-	int64_t *__ptr = (ptr);						\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_S64);		\
-	sysctl_add_oid(ctx, parent, nbr, name,				\
-	    CTLTYPE_S64 | CTLFLAG_MPSAFE | (access),			\
-	    __ptr, 0, sysctl_handle_64, "Q", __DESCR(descr));		\
-})
-
-#define	SYSCTL_NULL_UQUAD_PTR ((uint64_t *)NULL)
-#define	SYSCTL_UQUAD(parent, nbr, name, access, ptr, val, descr)	\
-	SYSCTL_OID(parent, nbr, name,					\
-	    CTLTYPE_U64 | CTLFLAG_MPSAFE | (access),			\
-	     ptr, val, sysctl_handle_64, "QU", descr);			\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_U64);		\
-	CTASSERT(sizeof(uint64_t) == sizeof(*(ptr)))
-
-#define	SYSCTL_ADD_UQUAD(ctx, parent, nbr, name, access, ptr, descr)	\
-({									\
-	uint64_t *__ptr = (ptr);					\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_U64);		\
-	sysctl_add_oid(ctx, parent, nbr, name,				\
-	    CTLTYPE_U64 | CTLFLAG_MPSAFE | (access),			\
-	    __ptr, 0, sysctl_handle_64, "QU", __DESCR(descr));		\
-})
-
-/* Oid for a CPU dependant variable */
-#define	SYSCTL_ADD_UAUTO(ctx, parent, nbr, name, access, ptr, descr)	\
-({									\
-	struct sysctl_oid *__ret;					\
-	CTASSERT(sizeof(uint64_t) == sizeof(*(ptr)) ||			\
-	    sizeof(unsigned) == sizeof(*(ptr)));			\
-	CTASSERT(((access) & CTLTYPE) == 0);				\
-	if (sizeof(uint64_t) == sizeof(*(ptr))) {			\
-		__ret = sysctl_add_oid(ctx, parent, nbr, name,		\
-		    CTLTYPE_U64 | CTLFLAG_MPSAFE | (access),		\
-		    (ptr), 0, sysctl_handle_64, "QU",			\
-		    __DESCR(descr));					\
-	} else {							\
-		__ret = sysctl_add_oid(ctx, parent, nbr, name,		\
-		    CTLTYPE_UINT | CTLFLAG_MPSAFE | (access),		\
-		    (ptr), 0, sysctl_handle_int, "IU",			\
-		    __DESCR(descr));					\
-	}								\
-	__ret;								\
-})
-
-/* Oid for a 64-bit unsigned counter(9).  The pointer must be non NULL. */
-#define	SYSCTL_COUNTER_U64(parent, nbr, name, access, ptr, descr)	\
-	SYSCTL_OID(parent, nbr, name,					\
-	    CTLTYPE_U64 | CTLFLAG_MPSAFE | (access),			\
-	    (ptr), 0, sysctl_handle_counter_u64, "QU", descr);		\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_U64);		\
-	CTASSERT(sizeof(counter_u64_t) == sizeof(*(ptr)));		\
-	CTASSERT(sizeof(uint64_t) == sizeof(**(ptr)))
-
-#define	SYSCTL_ADD_COUNTER_U64(ctx, parent, nbr, name, access, ptr, descr) \
-({									\
-	counter_u64_t *__ptr = (ptr);					\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_U64);		\
-	sysctl_add_oid(ctx, parent, nbr, name,				\
-	    CTLTYPE_U64 | CTLFLAG_MPSAFE | (access),			\
-	    __ptr, 0, sysctl_handle_counter_u64, "QU", __DESCR(descr));	\
-})
-
-/* Oid for an opaque object.  Specified by a pointer and a length. */
-#define	SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr)	\
-	SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|(access),		\
-	    ptr, len, sysctl_handle_opaque, fmt, descr);		\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_OPAQUE)
-
-#define	SYSCTL_ADD_OPAQUE(ctx, parent, nbr, name, access, ptr, len, fmt, descr)	\
-({									\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_OPAQUE);	\
-	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_OPAQUE|(access),	\
-	    ptr, len, sysctl_handle_opaque, fmt, __DESCR(descr));	\
-})
-
-/* Oid for a struct.  Specified by a pointer and a type. */
-#define	SYSCTL_STRUCT(parent, nbr, name, access, ptr, type, descr)	\
-	SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|(access),		\
-	    ptr, sizeof(struct type), sysctl_handle_opaque,		\
-	    "S," #type, descr);						\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_OPAQUE)
-
-#define	SYSCTL_ADD_STRUCT(ctx, parent, nbr, name, access, ptr, type, descr) \
-({									\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_OPAQUE);	\
-	sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_OPAQUE|(access),	\
-	    (ptr), sizeof(struct type),					\
-	    sysctl_handle_opaque, "S," #type, __DESCR(descr));		\
-})
-
-/* Oid for a procedure.  Specified by a pointer and an arg. */
-#define	SYSCTL_PROC(parent, nbr, name, access, ptr, arg, handler, fmt, descr) \
-	SYSCTL_OID(parent, nbr, name, (access),				\
-	    ptr, arg, handler, fmt, descr);				\
-	CTASSERT(((access) & CTLTYPE) != 0)
-
-#define	SYSCTL_ADD_PROC(ctx, parent, nbr, name, access, ptr, arg, handler, fmt, descr) \
-({									\
-	CTASSERT(((access) & CTLTYPE) != 0);				\
-	sysctl_add_oid(ctx, parent, nbr, name, (access),		\
-	    (ptr), (arg), (handler), (fmt), __DESCR(descr));		\
-})
-
-/* Oid to handle limits on uma(9) zone specified by pointer. */
-#define	SYSCTL_UMA_MAX(parent, nbr, name, access, ptr, descr)	\
-	SYSCTL_OID(parent, nbr, name,				\
-	    CTLTYPE_INT | CTLFLAG_MPSAFE | (access),		\
-	    (ptr), 0, sysctl_handle_uma_zone_max, "I", descr);	\
-	CTASSERT(((access) & CTLTYPE) == 0 ||			\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_INT)
-
-#define	SYSCTL_ADD_UMA_MAX(ctx, parent, nbr, name, access, ptr, descr)	\
-({									\
-	uma_zone_t __ptr = (ptr);					\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_INT);		\
-	sysctl_add_oid(ctx, parent, nbr, name,				\
-	    CTLTYPE_INT | CTLFLAG_MPSAFE | (access),			\
-	    __ptr, 0, sysctl_handle_uma_zone_max, "I", __DESCR(descr));	\
-})
-
-/* Oid to obtain current use of uma(9) zone specified by pointer. */
-#define	SYSCTL_UMA_CUR(parent, nbr, name, access, ptr, descr)		\
-	SYSCTL_OID(parent, nbr, name,					\
-	    CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access),	\
-	    (ptr), 0, sysctl_handle_uma_zone_cur, "I", descr);		\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_INT)
-
-#define	SYSCTL_ADD_UMA_CUR(ctx, parent, nbr, name, access, ptr, descr)	\
-({									\
-	uma_zone_t __ptr = (ptr);					\
-	CTASSERT(((access) & CTLTYPE) == 0 ||				\
-	    ((access) & SYSCTL_CT_ASSERT_MASK) == CTLTYPE_INT);		\
-	sysctl_add_oid(ctx, parent, nbr, name,				\
-	    CTLTYPE_INT | CTLFLAG_MPSAFE | CTLFLAG_RD | (access),	\
-	    __ptr, 0, sysctl_handle_uma_zone_cur, "I", __DESCR(descr));	\
-})
-
-/*
- * A macro to generate a read-only sysctl to indicate the presense of optional
- * kernel features.
- */
-#define	FEATURE(name, desc)						\
-	SYSCTL_INT(_kern_features, OID_AUTO, name, CTLFLAG_RD | CTLFLAG_CAPRD, \
-	    SYSCTL_NULL_INT_PTR, 1, desc)
-
-#endif /* _KERNEL */
-
-/*
- * Top-level identifiers
- */
-#define	CTL_UNSPEC	0		/* unused */
-#define	CTL_KERN	1		/* "high kernel": proc, limits */
-#define	CTL_VM		2		/* virtual memory */
-#define	CTL_VFS		3		/* filesystem, mount type is next */
-#define	CTL_NET		4		/* network, see socket.h */
-#define	CTL_DEBUG	5		/* debugging parameters */
-#define	CTL_HW		6		/* generic cpu/io */
-#define	CTL_MACHDEP	7		/* machine dependent */
-#define	CTL_USER	8		/* user-level */
-#define	CTL_P1003_1B	9		/* POSIX 1003.1B */
-#define	CTL_MAXID	10		/* number of valid top-level ids */
-
-/*
- * CTL_KERN identifiers
- */
-#define	KERN_OSTYPE		 1	/* string: system version */
-#define	KERN_OSRELEASE		 2	/* string: system release */
-#define	KERN_OSREV		 3	/* int: system revision */
-#define	KERN_VERSION		 4	/* string: compile time info */
-#define	KERN_MAXVNODES		 5	/* int: max vnodes */
-#define	KERN_MAXPROC		 6	/* int: max processes */
-#define	KERN_MAXFILES		 7	/* int: max open files */
-#define	KERN_ARGMAX		 8	/* int: max arguments to exec */
-#define	KERN_SECURELVL		 9	/* int: system security level */
-#define	KERN_HOSTNAME		10	/* string: hostname */
-#define	KERN_HOSTID		11	/* int: host identifier */
-#define	KERN_CLOCKRATE		12	/* struct: struct clockrate */
-#define	KERN_VNODE		13	/* struct: vnode structures */
-#define	KERN_PROC		14	/* struct: process entries */
-#define	KERN_FILE		15	/* struct: file entries */
-#define	KERN_PROF		16	/* node: kernel profiling info */
-#define	KERN_POSIX1		17	/* int: POSIX.1 version */
-#define	KERN_NGROUPS		18	/* int: # of supplemental group ids */
-#define	KERN_JOB_CONTROL	19	/* int: is job control available */
-#define	KERN_SAVED_IDS		20	/* int: saved set-user/group-ID */
-#define	KERN_BOOTTIME		21	/* struct: time kernel was booted */
-#define	KERN_NISDOMAINNAME	22	/* string: YP domain name */
-#define	KERN_UPDATEINTERVAL	23	/* int: update process sleep time */
-#define	KERN_OSRELDATE		24	/* int: kernel release date */
-#define	KERN_NTP_PLL		25	/* node: NTP PLL control */
-#define	KERN_BOOTFILE		26	/* string: name of booted kernel */
-#define	KERN_MAXFILESPERPROC	27	/* int: max open files per proc */
-#define	KERN_MAXPROCPERUID	28	/* int: max processes per uid */
-#define	KERN_DUMPDEV		29	/* struct cdev *: device to dump on */
-#define	KERN_IPC		30	/* node: anything related to IPC */
-#define	KERN_DUMMY		31	/* unused */
-#define	KERN_PS_STRINGS		32	/* int: address of PS_STRINGS */
-#define	KERN_USRSTACK		33	/* int: address of USRSTACK */
-#define	KERN_LOGSIGEXIT		34	/* int: do we log sigexit procs? */
-#define	KERN_IOV_MAX		35	/* int: value of UIO_MAXIOV */
-#define	KERN_HOSTUUID		36	/* string: host UUID identifier */
-#define	KERN_ARND		37	/* int: from arc4rand() */
-#define	KERN_MAXID		38	/* number of valid kern ids */
-/*
- * KERN_PROC subtypes
- */
-#define	KERN_PROC_ALL		0	/* everything */
-#define	KERN_PROC_PID		1	/* by process id */
-#define	KERN_PROC_PGRP		2	/* by process group id */
-#define	KERN_PROC_SESSION	3	/* by session of pid */
-#define	KERN_PROC_TTY		4	/* by controlling tty */
-#define	KERN_PROC_UID		5	/* by effective uid */
-#define	KERN_PROC_RUID		6	/* by real uid */
-#define	KERN_PROC_ARGS		7	/* get/set arguments/proctitle */
-#define	KERN_PROC_PROC		8	/* only return procs */
-#define	KERN_PROC_SV_NAME	9	/* get syscall vector name */
-#define	KERN_PROC_RGID		10	/* by real group id */
-#define	KERN_PROC_GID		11	/* by effective group id */
-#define	KERN_PROC_PATHNAME	12	/* path to executable */
-#define	KERN_PROC_OVMMAP	13	/* Old VM map entries for process */
-#define	KERN_PROC_OFILEDESC	14	/* Old file descriptors for process */
-#define	KERN_PROC_KSTACK	15	/* Kernel stacks for process */
-#define	KERN_PROC_INC_THREAD	0x10	/*
-					 * modifier for pid, pgrp, tty,
-					 * uid, ruid, gid, rgid and proc
-					 * This effectively uses 16-31
-					 */
-#define	KERN_PROC_VMMAP		32	/* VM map entries for process */
-#define	KERN_PROC_FILEDESC	33	/* File descriptors for process */
-#define	KERN_PROC_GROUPS	34	/* process groups */
-#define	KERN_PROC_ENV		35	/* get environment */
-#define	KERN_PROC_AUXV		36	/* get ELF auxiliary vector */
-#define	KERN_PROC_RLIMIT	37	/* process resource limits */
-#define	KERN_PROC_PS_STRINGS	38	/* get ps_strings location */
-#define	KERN_PROC_UMASK		39	/* process umask */
-#define	KERN_PROC_OSREL		40	/* osreldate for process binary */
-#define	KERN_PROC_SIGTRAMP	41	/* signal trampoline location */
-
-/*
- * KERN_IPC identifiers
- */
-#define	KIPC_MAXSOCKBUF		1	/* int: max size of a socket buffer */
-#define	KIPC_SOCKBUF_WASTE	2	/* int: wastage factor in sockbuf */
-#define	KIPC_SOMAXCONN		3	/* int: max length of connection q */
-#define	KIPC_MAX_LINKHDR	4	/* int: max length of link header */
-#define	KIPC_MAX_PROTOHDR	5	/* int: max length of network header */
-#define	KIPC_MAX_HDR		6	/* int: max total length of headers */
-#define	KIPC_MAX_DATALEN	7	/* int: max length of data? */
-
-/*
- * CTL_HW identifiers
- */
-#define	HW_MACHINE	 1		/* string: machine class */
-#define	HW_MODEL	 2		/* string: specific machine model */
-#define	HW_NCPU		 3		/* int: number of cpus */
-#define	HW_BYTEORDER	 4		/* int: machine byte order */
-#define	HW_PHYSMEM	 5		/* int: total memory */
-#define	HW_USERMEM	 6		/* int: non-kernel memory */
-#define	HW_PAGESIZE	 7		/* int: software page size */
-#define	HW_DISKNAMES	 8		/* strings: disk drive names */
-#define	HW_DISKSTATS	 9		/* struct: diskstats[] */
-#define	HW_FLOATINGPT	10		/* int: has HW floating point? */
-#define	HW_MACHINE_ARCH	11		/* string: machine architecture */
-#define	HW_REALMEM	12		/* int: 'real' memory */
-#define	HW_MAXID	13		/* number of valid hw ids */
-
-/*
- * CTL_USER definitions
- */
-#define	USER_CS_PATH		 1	/* string: _CS_PATH */
-#define	USER_BC_BASE_MAX	 2	/* int: BC_BASE_MAX */
-#define	USER_BC_DIM_MAX		 3	/* int: BC_DIM_MAX */
-#define	USER_BC_SCALE_MAX	 4	/* int: BC_SCALE_MAX */
-#define	USER_BC_STRING_MAX	 5	/* int: BC_STRING_MAX */
-#define	USER_COLL_WEIGHTS_MAX	 6	/* int: COLL_WEIGHTS_MAX */
-#define	USER_EXPR_NEST_MAX	 7	/* int: EXPR_NEST_MAX */
-#define	USER_LINE_MAX		 8	/* int: LINE_MAX */
-#define	USER_RE_DUP_MAX		 9	/* int: RE_DUP_MAX */
-#define	USER_POSIX2_VERSION	10	/* int: POSIX2_VERSION */
-#define	USER_POSIX2_C_BIND	11	/* int: POSIX2_C_BIND */
-#define	USER_POSIX2_C_DEV	12	/* int: POSIX2_C_DEV */
-#define	USER_POSIX2_CHAR_TERM	13	/* int: POSIX2_CHAR_TERM */
-#define	USER_POSIX2_FORT_DEV	14	/* int: POSIX2_FORT_DEV */
-#define	USER_POSIX2_FORT_RUN	15	/* int: POSIX2_FORT_RUN */
-#define	USER_POSIX2_LOCALEDEF	16	/* int: POSIX2_LOCALEDEF */
-#define	USER_POSIX2_SW_DEV	17	/* int: POSIX2_SW_DEV */
-#define	USER_POSIX2_UPE		18	/* int: POSIX2_UPE */
-#define	USER_STREAM_MAX		19	/* int: POSIX2_STREAM_MAX */
-#define	USER_TZNAME_MAX		20	/* int: POSIX2_TZNAME_MAX */
-#define	USER_MAXID		21	/* number of valid user ids */
-
-#define	CTL_P1003_1B_ASYNCHRONOUS_IO		1	/* boolean */
-#define	CTL_P1003_1B_MAPPED_FILES		2	/* boolean */
-#define	CTL_P1003_1B_MEMLOCK			3	/* boolean */
-#define	CTL_P1003_1B_MEMLOCK_RANGE		4	/* boolean */
-#define	CTL_P1003_1B_MEMORY_PROTECTION		5	/* boolean */
-#define	CTL_P1003_1B_MESSAGE_PASSING		6	/* boolean */
-#define	CTL_P1003_1B_PRIORITIZED_IO		7	/* boolean */
-#define	CTL_P1003_1B_PRIORITY_SCHEDULING	8	/* boolean */
-#define	CTL_P1003_1B_REALTIME_SIGNALS		9	/* boolean */
-#define	CTL_P1003_1B_SEMAPHORES			10	/* boolean */
-#define	CTL_P1003_1B_FSYNC			11	/* boolean */
-#define	CTL_P1003_1B_SHARED_MEMORY_OBJECTS	12	/* boolean */
-#define	CTL_P1003_1B_SYNCHRONIZED_IO		13	/* boolean */
-#define	CTL_P1003_1B_TIMERS			14	/* boolean */
-#define	CTL_P1003_1B_AIO_LISTIO_MAX		15	/* int */
-#define	CTL_P1003_1B_AIO_MAX			16	/* int */
-#define	CTL_P1003_1B_AIO_PRIO_DELTA_MAX		17	/* int */
-#define	CTL_P1003_1B_DELAYTIMER_MAX		18	/* int */
-#define	CTL_P1003_1B_MQ_OPEN_MAX		19	/* int */
-#define	CTL_P1003_1B_PAGESIZE			20	/* int */
-#define	CTL_P1003_1B_RTSIG_MAX			21	/* int */
-#define	CTL_P1003_1B_SEM_NSEMS_MAX		22	/* int */
-#define	CTL_P1003_1B_SEM_VALUE_MAX		23	/* int */
-#define	CTL_P1003_1B_SIGQUEUE_MAX		24	/* int */
-#define	CTL_P1003_1B_TIMER_MAX			25	/* int */
-
-#define	CTL_P1003_1B_MAXID		26
-
-#ifdef _KERNEL
-
-/*
- * Declare some common oids.
- */
-extern struct sysctl_oid_list sysctl__children;
-SYSCTL_DECL(_kern);
-SYSCTL_DECL(_kern_features);
-SYSCTL_DECL(_kern_ipc);
-SYSCTL_DECL(_kern_proc);
-SYSCTL_DECL(_kern_sched);
-SYSCTL_DECL(_kern_sched_stats);
-SYSCTL_DECL(_sysctl);
-SYSCTL_DECL(_vm);
-SYSCTL_DECL(_vm_stats);
-SYSCTL_DECL(_vm_stats_misc);
-SYSCTL_DECL(_vfs);
-SYSCTL_DECL(_net);
-SYSCTL_DECL(_debug);
-SYSCTL_DECL(_debug_sizeof);
-SYSCTL_DECL(_dev);
-SYSCTL_DECL(_hw);
-SYSCTL_DECL(_hw_bus);
-SYSCTL_DECL(_hw_bus_devices);
-SYSCTL_DECL(_hw_bus_info);
-SYSCTL_DECL(_machdep);
-SYSCTL_DECL(_user);
-SYSCTL_DECL(_compat);
-SYSCTL_DECL(_regression);
-SYSCTL_DECL(_security);
-SYSCTL_DECL(_security_bsd);
-
-extern char	machine[];
-extern char	osrelease[];
-extern char	ostype[];
-extern char	kern_ident[];
-
-/* Dynamic oid handling */
-struct sysctl_oid *sysctl_add_oid(struct sysctl_ctx_list *clist,
-	    struct sysctl_oid_list *parent, int nbr, const char *name, int kind,
-	    void *arg1, intptr_t arg2, int (*handler)(SYSCTL_HANDLER_ARGS),
-	    const char *fmt, const char *descr);
-int	sysctl_remove_name(struct sysctl_oid *parent, const char *name, int del,
-	    int recurse);
-void	sysctl_rename_oid(struct sysctl_oid *oidp, const char *name);
-int	sysctl_move_oid(struct sysctl_oid *oidp,
-	    struct sysctl_oid_list *parent);
-int	sysctl_remove_oid(struct sysctl_oid *oidp, int del, int recurse);
-int	sysctl_ctx_init(struct sysctl_ctx_list *clist);
-int	sysctl_ctx_free(struct sysctl_ctx_list *clist);
-struct	sysctl_ctx_entry *sysctl_ctx_entry_add(struct sysctl_ctx_list *clist,
-	    struct sysctl_oid *oidp);
-struct	sysctl_ctx_entry *sysctl_ctx_entry_find(struct sysctl_ctx_list *clist,
-	    struct sysctl_oid *oidp);
-int	sysctl_ctx_entry_del(struct sysctl_ctx_list *clist,
-	    struct sysctl_oid *oidp);
-
-int	kernel_sysctl(struct thread *td, int *name, u_int namelen, void *old,
-	    size_t *oldlenp, void *new, size_t newlen, size_t *retval,
-	    int flags);
-int	kernel_sysctlbyname(struct thread *td, char *name, void *old,
-	    size_t *oldlenp, void *new, size_t newlen, size_t *retval,
-	    int flags);
-int	userland_sysctl(struct thread *td, int *name, u_int namelen, void *old,
-	    size_t *oldlenp, int inkernel, void *new, size_t newlen,
-	    size_t *retval, int flags);
-int	sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
-	    int *nindx, struct sysctl_req *req);
-void	sysctl_lock(void);
-void	sysctl_unlock(void);
-int	sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
-
-struct sbuf;
-struct sbuf *sbuf_new_for_sysctl(struct sbuf *, char *, int,
-	    struct sysctl_req *);
-#else	/* !_KERNEL */
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	sysctl(const int *, u_int, void *, size_t *, const void *, size_t);
-int	sysctlbyname(const char *, void *, size_t *, const void *, size_t);
-int	sysctlnametomib(const char *, int *, size_t *);
-__END_DECLS
-#endif	/* _KERNEL */
-
-#endif	/* !_SYS_SYSCTL_H_ */
diff --git a/include.new/sys/sysent.h b/include.new/sys/sysent.h
deleted file mode 100644
index 149d7bb..0000000
--- a/include.new/sys/sysent.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/*-
- * Copyright (c) 1982, 1988, 1991 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/sys/sysent.h 237476 2012-06-23 10:14:51Z kib $
- */
-
-#ifndef _SYS_SYSENT_H_
-#define	_SYS_SYSENT_H_
-
-#include <bsm/audit.h>
-
-struct rlimit;
-struct sysent;
-struct thread;
-struct ksiginfo;
-
-typedef	int	sy_call_t(struct thread *, void *);
-
-/* Used by the machine dependent syscall() code. */
-typedef	void (*systrace_probe_func_t)(uint32_t, int, struct sysent *, void *,
-    int);
-
-/*
- * Used by loaded syscalls to convert arguments to a DTrace array
- * of 64-bit arguments.
- */
-typedef	void (*systrace_args_func_t)(int, void *, u_int64_t *, int *);
-
-extern systrace_probe_func_t	systrace_probe_func;
-
-struct sysent {			/* system call table */
-	int	sy_narg;	/* number of arguments */
-	sy_call_t *sy_call;	/* implementing function */
-	au_event_t sy_auevent;	/* audit event associated with syscall */
-	systrace_args_func_t sy_systrace_args_func;
-				/* optional argument conversion function. */
-	uint32_t sy_entry;	/* DTrace entry ID for systrace. */
-	uint32_t sy_return;	/* DTrace return ID for systrace. */
-	uint32_t sy_flags;	/* General flags for system calls. */
-	uint32_t sy_thrcnt;
-};
-
-/*
- * A system call is permitted in capability mode.
- */
-#define	SYF_CAPENABLED	0x00000001
-
-#define	SY_THR_FLAGMASK	0x7
-#define	SY_THR_STATIC	0x1
-#define	SY_THR_DRAINING	0x2
-#define	SY_THR_ABSENT	0x4
-#define	SY_THR_INCR	0x8
-
-struct image_params;
-struct __sigset;
-struct syscall_args;
-struct trapframe;
-struct vnode;
-
-struct sysentvec {
-	int		sv_size;	/* number of entries */
-	struct sysent	*sv_table;	/* pointer to sysent */
-	u_int		sv_mask;	/* optional mask to index */
-	int		sv_sigsize;	/* size of signal translation table */
-	int		*sv_sigtbl;	/* signal translation table */
-	int		sv_errsize;	/* size of errno translation table */
-	int 		*sv_errtbl;	/* errno translation table */
-	int		(*sv_transtrap)(int, int);
-					/* translate trap-to-signal mapping */
-	int		(*sv_fixup)(register_t **, struct image_params *);
-					/* stack fixup function */
-	void		(*sv_sendsig)(void (*)(int), struct ksiginfo *, struct __sigset *);
-			    		/* send signal */
-	char 		*sv_sigcode;	/* start of sigtramp code */
-	int 		*sv_szsigcode;	/* size of sigtramp code */
-	void		(*sv_prepsyscall)(struct trapframe *, int *, u_int *,
-			    caddr_t *);
-	char		*sv_name;	/* name of binary type */
-	int		(*sv_coredump)(struct thread *, struct vnode *, off_t, int);
-					/* function to dump core, or NULL */
-	int		(*sv_imgact_try)(struct image_params *);
-	int		sv_minsigstksz;	/* minimum signal stack size */
-	int		sv_pagesize;	/* pagesize */
-	vm_offset_t	sv_minuser;	/* VM_MIN_ADDRESS */
-	vm_offset_t	sv_maxuser;	/* VM_MAXUSER_ADDRESS */
-	vm_offset_t	sv_usrstack;	/* USRSTACK */
-	vm_offset_t	sv_psstrings;	/* PS_STRINGS */
-	int		sv_stackprot;	/* vm protection for stack */
-	register_t	*(*sv_copyout_strings)(struct image_params *);
-	void		(*sv_setregs)(struct thread *, struct image_params *,
-			    u_long);
-	void		(*sv_fixlimit)(struct rlimit *, int);
-	u_long		*sv_maxssiz;
-	u_int		sv_flags;
-	void		(*sv_set_syscall_retval)(struct thread *, int);
-	int		(*sv_fetch_syscall_args)(struct thread *, struct
-			    syscall_args *);
-	const char	**sv_syscallnames;
-	vm_offset_t	sv_shared_page_base;
-	vm_offset_t	sv_shared_page_len;
-	vm_offset_t	sv_sigcode_base;
-	vm_offset_t	sv_timekeep_base;
-	int		sv_timekeep_off;
-	int		sv_timekeep_curr;
-	uint32_t	sv_timekeep_gen;
-	void		*sv_shared_page_obj;
-	void		(*sv_schedtail)(struct thread *);
-};
-
-#define	SV_ILP32	0x000100
-#define	SV_LP64		0x000200
-#define	SV_IA32		0x004000
-#define	SV_AOUT		0x008000
-#define	SV_SHP		0x010000
-
-#define	SV_ABI_MASK	0xff
-#define	SV_PROC_FLAG(p, x)	((p)->p_sysent->sv_flags & (x))
-#define	SV_PROC_ABI(p)		((p)->p_sysent->sv_flags & SV_ABI_MASK)
-#define	SV_CURPROC_FLAG(x)	SV_PROC_FLAG(curproc, x)
-#define	SV_CURPROC_ABI()	SV_PROC_ABI(curproc)
-/* same as ELFOSABI_XXX, to prevent header pollution */
-#define	SV_ABI_LINUX	3
-#define	SV_ABI_FREEBSD 	9
-#define	SV_ABI_UNDEF	255
-
-#ifdef _KERNEL
-extern struct sysentvec aout_sysvec;
-extern struct sysentvec elf_freebsd_sysvec;
-extern struct sysentvec null_sysvec;
-extern struct sysent sysent[];
-extern const char *syscallnames[];
-
-#if defined(__amd64__) || defined(__ia64__)
-extern int i386_read_exec;
-#endif
-
-#define	NO_SYSCALL (-1)
-
-struct module;
-
-struct syscall_module_data {
-	int	(*chainevh)(struct module *, int, void *); /* next handler */
-	void	*chainarg;		/* arg for next event handler */
-	int	*offset;		/* offset into sysent */
-	struct sysent *new_sysent;	/* new sysent */
-	struct sysent old_sysent;	/* old sysent */
-};
-
-#define	MAKE_SYSENT(syscallname)				\
-static struct sysent syscallname##_sysent = {			\
-	(sizeof(struct syscallname ## _args )			\
-	    / sizeof(register_t)),				\
-	(sy_call_t *)& sys_##syscallname,	       		\
-	SYS_AUE_##syscallname					\
-}
-
-#define	MAKE_SYSENT_COMPAT(syscallname)				\
-static struct sysent syscallname##_sysent = {			\
-	(sizeof(struct syscallname ## _args )			\
-	    / sizeof(register_t)),				\
-	(sy_call_t *)& syscallname,				\
-	SYS_AUE_##syscallname					\
-}
-
-#define SYSCALL_MODULE(name, offset, new_sysent, evh, arg)	\
-static struct syscall_module_data name##_syscall_mod = {	\
-	evh, arg, offset, new_sysent, { 0, NULL, AUE_NULL }	\
-};								\
-								\
-static moduledata_t name##_mod = {				\
-	"sys/" #name,						\
-	syscall_module_handler,					\
-	&name##_syscall_mod					\
-};								\
-DECLARE_MODULE(name, name##_mod, SI_SUB_SYSCALLS, SI_ORDER_MIDDLE)
-
-#define	SYSCALL_MODULE_HELPER(syscallname)			\
-static int syscallname##_syscall = SYS_##syscallname;		\
-MAKE_SYSENT(syscallname);					\
-SYSCALL_MODULE(syscallname,					\
-    & syscallname##_syscall, & syscallname##_sysent,		\
-    NULL, NULL)
-
-#define	SYSCALL_MODULE_PRESENT(syscallname)				\
-	(sysent[SYS_##syscallname].sy_call != (sy_call_t *)lkmnosys &&	\
-	sysent[SYS_##syscallname].sy_call != (sy_call_t *)lkmressys)
-
-/*
- * Syscall registration helpers with resource allocation handling.
- */
-struct syscall_helper_data {
-	struct sysent new_sysent;
-	struct sysent old_sysent;
-	int syscall_no;
-	int registered;
-};
-#define SYSCALL_INIT_HELPER(syscallname) {			\
-    .new_sysent = {						\
-	.sy_narg = (sizeof(struct syscallname ## _args )	\
-	    / sizeof(register_t)),				\
-	.sy_call = (sy_call_t *)& sys_ ## syscallname,		\
-	.sy_auevent = SYS_AUE_##syscallname			\
-    },								\
-    .syscall_no = SYS_##syscallname				\
-}
-#define SYSCALL_INIT_HELPER_COMPAT(syscallname) {		\
-    .new_sysent = {						\
-	.sy_narg = (sizeof(struct syscallname ## _args )	\
-	    / sizeof(register_t)),				\
-	.sy_call = (sy_call_t *)& syscallname,			\
-	.sy_auevent = SYS_AUE_##syscallname			\
-    },								\
-    .syscall_no = SYS_##syscallname				\
-}
-#define SYSCALL_INIT_LAST {					\
-    .syscall_no = NO_SYSCALL					\
-}
-
-int	syscall_register(int *offset, struct sysent *new_sysent,
-	    struct sysent *old_sysent);
-int	syscall_deregister(int *offset, struct sysent *old_sysent);
-int	syscall_module_handler(struct module *mod, int what, void *arg);
-int	syscall_helper_register(struct syscall_helper_data *sd);
-int	syscall_helper_unregister(struct syscall_helper_data *sd);
-
-struct proc;
-const char *syscallname(struct proc *p, u_int code);
-
-/* Special purpose system call functions. */
-struct nosys_args;
-
-int	lkmnosys(struct thread *, struct nosys_args *);
-int	lkmressys(struct thread *, struct nosys_args *);
-
-int	syscall_thread_enter(struct thread *td, struct sysent *se);
-void	syscall_thread_exit(struct thread *td, struct sysent *se);
-
-int shared_page_alloc(int size, int align);
-int shared_page_fill(int size, int align, const void *data);
-void shared_page_write(int base, int size, const void *data);
-void exec_sysvec_init(void *param);
-
-#define INIT_SYSENTVEC(name, sv)					\
-    SYSINIT(name, SI_SUB_EXEC, SI_ORDER_ANY,				\
-	(sysinit_cfunc_t)exec_sysvec_init, sv);
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_SYSENT_H_ */
diff --git a/include.new/sys/syslimits.h b/include.new/sys/syslimits.h
deleted file mode 100644
index 76c96d2..0000000
--- a/include.new/sys/syslimits.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 1988, 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.
- * 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.
- *
- *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/syslimits.h 194498 2009-06-19 17:10:35Z brooks $
- */
-
-#ifndef _SYS_SYSLIMITS_H_
-#define _SYS_SYSLIMITS_H_
-
-#if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_)
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-#ifdef __CC_SUPPORTS_WARNING
-#warning "No user-serviceable parts inside."
-#endif
-#endif
-
-/*
- * Do not add any new variables here.  (See the comment at the end of
- * the file for why.)
- */
-#define	ARG_MAX			262144	/* max bytes for an exec function */
-#ifndef CHILD_MAX
-#define	CHILD_MAX		   40	/* max simultaneous processes */
-#endif
-#define	LINK_MAX		32767	/* max file link count */
-#define	MAX_CANON		  255	/* max bytes in term canon input line */
-#define	MAX_INPUT		  255	/* max bytes in terminal input */
-#define	NAME_MAX		  255	/* max bytes in a file name */
-#ifndef NGROUPS_MAX
-#define	NGROUPS_MAX	 	 1023	/* max supplemental group id's */
-#endif
-#ifndef OPEN_MAX
-#define	OPEN_MAX		   64	/* max open files per process */
-#endif
-#define	PATH_MAX		 1024	/* max bytes in pathname */
-#define	PIPE_BUF		  512	/* max bytes for atomic pipe writes */
-#define	IOV_MAX			 1024	/* max elements in i/o vector */
-
-/*
- * We leave the following values undefined to force applications to either
- * assume conservative values or call sysconf() to get the current value.
- *
- * HOST_NAME_MAX
- *
- * (We should do this for most of the values currently defined here,
- * but many programs are not prepared to deal with this yet.)
- */
-#endif
diff --git a/include.new/sys/syslog.h b/include.new/sys/syslog.h
deleted file mode 100644
index 5b97fad..0000000
--- a/include.new/sys/syslog.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 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.
- * 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.
- *
- *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/syslog.h 249311 2013-04-09 16:16:34Z ed $
- */
-
-#ifndef _SYS_SYSLOG_H_
-#define _SYS_SYSLOG_H_
-
-#define	_PATH_LOG	"/var/run/log"
-#define	_PATH_LOG_PRIV	"/var/run/logpriv"
-#define	_PATH_OLDLOG	"/dev/log"	/* backward compatibility */
-
-/*
- * priorities/facilities are encoded into a single 32-bit quantity, where the
- * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
- * (0-big number).  Both the priorities and the facilities map roughly
- * one-to-one to strings in the syslogd(8) source code.  This mapping is
- * included in this file.
- *
- * priorities (these are ordered)
- */
-#define	LOG_EMERG	0	/* system is unusable */
-#define	LOG_ALERT	1	/* action must be taken immediately */
-#define	LOG_CRIT	2	/* critical conditions */
-#define	LOG_ERR		3	/* error conditions */
-#define	LOG_WARNING	4	/* warning conditions */
-#define	LOG_NOTICE	5	/* normal but significant condition */
-#define	LOG_INFO	6	/* informational */
-#define	LOG_DEBUG	7	/* debug-level messages */
-
-#define	LOG_PRIMASK	0x07	/* mask to extract priority part (internal) */
-				/* extract priority */
-#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-#define	LOG_MAKEPRI(fac, pri)	((fac) | (pri))
-
-#ifdef SYSLOG_NAMES
-#define	INTERNAL_NOPRI	0x10	/* the "no priority" priority */
-				/* mark "facility" */
-#define	INTERNAL_MARK	LOG_MAKEPRI((LOG_NFACILITIES<<3), 0)
-typedef struct _code {
-	const char	*c_name;
-	int		c_val;
-} CODE;
-
-static const CODE prioritynames[] = {
-	{ "alert",	LOG_ALERT,	},
-	{ "crit",	LOG_CRIT,	},
-	{ "debug",	LOG_DEBUG,	},
-	{ "emerg",	LOG_EMERG,	},
-	{ "err",	LOG_ERR,	},
-	{ "error",	LOG_ERR,	},	/* DEPRECATED */
-	{ "info",	LOG_INFO,	},
-	{ "none",	INTERNAL_NOPRI,	},	/* INTERNAL */
-	{ "notice",	LOG_NOTICE,	},
-	{ "panic", 	LOG_EMERG,	},	/* DEPRECATED */
-	{ "warn",	LOG_WARNING,	},	/* DEPRECATED */
-	{ "warning",	LOG_WARNING,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-/* facility codes */
-#define	LOG_KERN	(0<<3)	/* kernel messages */
-#define	LOG_USER	(1<<3)	/* random user-level messages */
-#define	LOG_MAIL	(2<<3)	/* mail system */
-#define	LOG_DAEMON	(3<<3)	/* system daemons */
-#define	LOG_AUTH	(4<<3)	/* authorization messages */
-#define	LOG_SYSLOG	(5<<3)	/* messages generated internally by syslogd */
-#define	LOG_LPR		(6<<3)	/* line printer subsystem */
-#define	LOG_NEWS	(7<<3)	/* network news subsystem */
-#define	LOG_UUCP	(8<<3)	/* UUCP subsystem */
-#define	LOG_CRON	(9<<3)	/* clock daemon */
-#define	LOG_AUTHPRIV	(10<<3)	/* authorization messages (private) */
-				/* Facility #10 clashes in DEC UNIX, where */
-				/* it's defined as LOG_MEGASAFE for AdvFS  */
-				/* event logging.                          */
-#define	LOG_FTP		(11<<3)	/* ftp daemon */
-#define	LOG_NTP		(12<<3)	/* NTP subsystem */
-#define	LOG_SECURITY	(13<<3) /* security subsystems (firewalling, etc.) */
-#define	LOG_CONSOLE	(14<<3) /* /dev/console output */
-
-	/* other codes through 15 reserved for system use */
-#define	LOG_LOCAL0	(16<<3)	/* reserved for local use */
-#define	LOG_LOCAL1	(17<<3)	/* reserved for local use */
-#define	LOG_LOCAL2	(18<<3)	/* reserved for local use */
-#define	LOG_LOCAL3	(19<<3)	/* reserved for local use */
-#define	LOG_LOCAL4	(20<<3)	/* reserved for local use */
-#define	LOG_LOCAL5	(21<<3)	/* reserved for local use */
-#define	LOG_LOCAL6	(22<<3)	/* reserved for local use */
-#define	LOG_LOCAL7	(23<<3)	/* reserved for local use */
-
-#define	LOG_NFACILITIES	24	/* current number of facilities */
-#define	LOG_FACMASK	0x03f8	/* mask to extract facility part */
-				/* facility of pri */
-#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
-
-#ifdef SYSLOG_NAMES
-static const CODE facilitynames[] = {
-	{ "auth",	LOG_AUTH,	},
-	{ "authpriv",	LOG_AUTHPRIV,	},
-	{ "console", 	LOG_CONSOLE,	},
-	{ "cron", 	LOG_CRON,	},
-	{ "daemon",	LOG_DAEMON,	},
-	{ "ftp",	LOG_FTP,	},
-	{ "kern",	LOG_KERN,	},
-	{ "lpr",	LOG_LPR,	},
-	{ "mail",	LOG_MAIL,	},
-	{ "mark", 	INTERNAL_MARK,	},	/* INTERNAL */
-	{ "news",	LOG_NEWS,	},
-	{ "ntp",	LOG_NTP,	},
-	{ "security",	LOG_SECURITY,	},
-	{ "syslog",	LOG_SYSLOG,	},
-	{ "user",	LOG_USER,	},
-	{ "uucp",	LOG_UUCP,	},
-	{ "local0",	LOG_LOCAL0,	},
-	{ "local1",	LOG_LOCAL1,	},
-	{ "local2",	LOG_LOCAL2,	},
-	{ "local3",	LOG_LOCAL3,	},
-	{ "local4",	LOG_LOCAL4,	},
-	{ "local5",	LOG_LOCAL5,	},
-	{ "local6",	LOG_LOCAL6,	},
-	{ "local7",	LOG_LOCAL7,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-#ifdef _KERNEL
-#define	LOG_PRINTF	-1	/* pseudo-priority to indicate use of printf */
-#endif
-
-/*
- * arguments to setlogmask.
- */
-#define	LOG_MASK(pri)	(1 << (pri))		/* mask for one priority */
-#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	/* all priorities through pri */
-
-/*
- * Option flags for openlog.
- *
- * LOG_ODELAY no longer does anything.
- * LOG_NDELAY is the inverse of what it used to be.
- */
-#define	LOG_PID		0x01	/* log the pid with each message */
-#define	LOG_CONS	0x02	/* log on the console if errors in sending */
-#define	LOG_ODELAY	0x04	/* delay open until first syslog() (default) */
-#define	LOG_NDELAY	0x08	/* don't delay open */
-#define	LOG_NOWAIT	0x10	/* don't wait for console forks: DEPRECATED */
-#define	LOG_PERROR	0x20	/* log to stderr as well */
-
-#ifdef _KERNEL
-
-#else /* not _KERNEL */
-
-/*
- * Don't use va_list in the vsyslog() prototype.   Va_list is typedef'd in two
- * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
- * of them here we may collide with the utility's includes.  It's unreasonable
- * for utilities to have to include one of them to include syslog.h, so we get
- * __va_list from <sys/_types.h> and use it.
- */
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-__BEGIN_DECLS
-void	closelog(void);
-void	openlog(const char *, int, int);
-int	setlogmask(int);
-void	syslog(int, const char *, ...) __printflike(2, 3);
-#if __BSD_VISIBLE
-void	vsyslog(int, const char *, __va_list) __printflike(2, 0);
-#endif
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif
diff --git a/include.new/sys/sysproto.h b/include.new/sys/sysproto.h
deleted file mode 100644
index 747d37c..0000000
--- a/include.new/sys/sysproto.h
+++ /dev/null
@@ -1,2935 +0,0 @@
-/*
- * System call prototypes.
- *
- * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: releng/10.2/sys/sys/sysproto.h 276956 2015-01-11 07:04:18Z dchagin $
- * created from FreeBSD: stable/10/sys/kern/syscalls.master 276955 2015-01-11 07:02:03Z dchagin 
- */
-
-#ifndef _SYS_SYSPROTO_H_
-#define	_SYS_SYSPROTO_H_
-
-#include <sys/signal.h>
-#include <sys/acl.h>
-#include <sys/cpuset.h>
-#include <sys/_ffcounter.h>
-#include <sys/_semaphore.h>
-#include <sys/ucontext.h>
-#include <sys/wait.h>
-
-#include <bsm/audit_kevents.h>
-
-struct proc;
-
-struct thread;
-
-#define	PAD_(t)	(sizeof(register_t) <= sizeof(t) ? \
-		0 : sizeof(register_t) - sizeof(t))
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define	PADL_(t)	0
-#define	PADR_(t)	PAD_(t)
-#else
-#define	PADL_(t)	PAD_(t)
-#define	PADR_(t)	0
-#endif
-
-struct nosys_args {
-	register_t dummy;
-};
-struct sys_exit_args {
-	char rval_l_[PADL_(int)]; int rval; char rval_r_[PADR_(int)];
-};
-struct fork_args {
-	register_t dummy;
-};
-struct read_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
-	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
-};
-struct write_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
-	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
-};
-struct open_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
-};
-struct close_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-};
-struct wait4_args {
-	char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
-	char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
-	char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
-	char rusage_l_[PADL_(struct rusage *)]; struct rusage * rusage; char rusage_r_[PADR_(struct rusage *)];
-};
-struct link_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char link_l_[PADL_(char *)]; char * link; char link_r_[PADR_(char *)];
-};
-struct unlink_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-};
-struct chdir_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-};
-struct fchdir_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-};
-struct mknod_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
-	char dev_l_[PADL_(int)]; int dev; char dev_r_[PADR_(int)];
-};
-struct chmod_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
-};
-struct chown_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)];
-	char gid_l_[PADL_(int)]; int gid; char gid_r_[PADR_(int)];
-};
-struct obreak_args {
-	char nsize_l_[PADL_(char *)]; char * nsize; char nsize_r_[PADR_(char *)];
-};
-struct getpid_args {
-	register_t dummy;
-};
-struct mount_args {
-	char type_l_[PADL_(char *)]; char * type; char type_r_[PADR_(char *)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)];
-};
-struct unmount_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct setuid_args {
-	char uid_l_[PADL_(uid_t)]; uid_t uid; char uid_r_[PADR_(uid_t)];
-};
-struct getuid_args {
-	register_t dummy;
-};
-struct geteuid_args {
-	register_t dummy;
-};
-struct ptrace_args {
-	char req_l_[PADL_(int)]; int req; char req_r_[PADR_(int)];
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-	char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
-	char data_l_[PADL_(int)]; int data; char data_r_[PADR_(int)];
-};
-struct recvmsg_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char msg_l_[PADL_(struct msghdr *)]; struct msghdr * msg; char msg_r_[PADR_(struct msghdr *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct sendmsg_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char msg_l_[PADL_(struct msghdr *)]; struct msghdr * msg; char msg_r_[PADR_(struct msghdr *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct recvfrom_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char from_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict from; char from_r_[PADR_(struct sockaddr *__restrict)];
-	char fromlenaddr_l_[PADL_(__socklen_t *__restrict)]; __socklen_t *__restrict fromlenaddr; char fromlenaddr_r_[PADR_(__socklen_t *__restrict)];
-};
-struct accept_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char name_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict name; char name_r_[PADR_(struct sockaddr *__restrict)];
-	char anamelen_l_[PADL_(__socklen_t *__restrict)]; __socklen_t *__restrict anamelen; char anamelen_r_[PADR_(__socklen_t *__restrict)];
-};
-struct getpeername_args {
-	char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)];
-	char asa_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict asa; char asa_r_[PADR_(struct sockaddr *__restrict)];
-	char alen_l_[PADL_(__socklen_t *__restrict)]; __socklen_t *__restrict alen; char alen_r_[PADR_(__socklen_t *__restrict)];
-};
-struct getsockname_args {
-	char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)];
-	char asa_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict asa; char asa_r_[PADR_(struct sockaddr *__restrict)];
-	char alen_l_[PADL_(__socklen_t *__restrict)]; __socklen_t *__restrict alen; char alen_r_[PADR_(__socklen_t *__restrict)];
-};
-struct access_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char amode_l_[PADL_(int)]; int amode; char amode_r_[PADR_(int)];
-};
-struct chflags_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char flags_l_[PADL_(u_long)]; u_long flags; char flags_r_[PADR_(u_long)];
-};
-struct fchflags_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char flags_l_[PADL_(u_long)]; u_long flags; char flags_r_[PADR_(u_long)];
-};
-struct sync_args {
-	register_t dummy;
-};
-struct kill_args {
-	char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
-	char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
-};
-struct getppid_args {
-	register_t dummy;
-};
-struct dup_args {
-	char fd_l_[PADL_(u_int)]; u_int fd; char fd_r_[PADR_(u_int)];
-};
-struct pipe_args {
-	register_t dummy;
-};
-struct getegid_args {
-	register_t dummy;
-};
-struct profil_args {
-	char samples_l_[PADL_(caddr_t)]; caddr_t samples; char samples_r_[PADR_(caddr_t)];
-	char size_l_[PADL_(size_t)]; size_t size; char size_r_[PADR_(size_t)];
-	char offset_l_[PADL_(size_t)]; size_t offset; char offset_r_[PADR_(size_t)];
-	char scale_l_[PADL_(u_int)]; u_int scale; char scale_r_[PADR_(u_int)];
-};
-struct ktrace_args {
-	char fname_l_[PADL_(const char *)]; const char * fname; char fname_r_[PADR_(const char *)];
-	char ops_l_[PADL_(int)]; int ops; char ops_r_[PADR_(int)];
-	char facs_l_[PADL_(int)]; int facs; char facs_r_[PADR_(int)];
-	char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
-};
-struct getgid_args {
-	register_t dummy;
-};
-struct getlogin_args {
-	char namebuf_l_[PADL_(char *)]; char * namebuf; char namebuf_r_[PADR_(char *)];
-	char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)];
-};
-struct setlogin_args {
-	char namebuf_l_[PADL_(char *)]; char * namebuf; char namebuf_r_[PADR_(char *)];
-};
-struct acct_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-};
-struct osigpending_args {
-	register_t dummy;
-};
-struct sigaltstack_args {
-	char ss_l_[PADL_(stack_t *)]; stack_t * ss; char ss_r_[PADR_(stack_t *)];
-	char oss_l_[PADL_(stack_t *)]; stack_t * oss; char oss_r_[PADR_(stack_t *)];
-};
-struct ioctl_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char com_l_[PADL_(u_long)]; u_long com; char com_r_[PADR_(u_long)];
-	char data_l_[PADL_(caddr_t)]; caddr_t data; char data_r_[PADR_(caddr_t)];
-};
-struct reboot_args {
-	char opt_l_[PADL_(int)]; int opt; char opt_r_[PADR_(int)];
-};
-struct revoke_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-};
-struct symlink_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char link_l_[PADL_(char *)]; char * link; char link_r_[PADR_(char *)];
-};
-struct readlink_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
-	char count_l_[PADL_(size_t)]; size_t count; char count_r_[PADR_(size_t)];
-};
-struct execve_args {
-	char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)];
-	char argv_l_[PADL_(char **)]; char ** argv; char argv_r_[PADR_(char **)];
-	char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char **)];
-};
-struct umask_args {
-	char newmask_l_[PADL_(int)]; int newmask; char newmask_r_[PADR_(int)];
-};
-struct chroot_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-};
-struct getpagesize_args {
-	register_t dummy;
-};
-struct msync_args {
-	char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct vfork_args {
-	register_t dummy;
-};
-struct sbrk_args {
-	char incr_l_[PADL_(int)]; int incr; char incr_r_[PADR_(int)];
-};
-struct sstk_args {
-	char incr_l_[PADL_(int)]; int incr; char incr_r_[PADR_(int)];
-};
-struct ovadvise_args {
-	char anom_l_[PADL_(int)]; int anom; char anom_r_[PADR_(int)];
-};
-struct munmap_args {
-	char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-};
-struct mprotect_args {
-	char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
-};
-struct madvise_args {
-	char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char behav_l_[PADL_(int)]; int behav; char behav_r_[PADR_(int)];
-};
-struct mincore_args {
-	char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char vec_l_[PADL_(char *)]; char * vec; char vec_r_[PADR_(char *)];
-};
-struct getgroups_args {
-	char gidsetsize_l_[PADL_(u_int)]; u_int gidsetsize; char gidsetsize_r_[PADR_(u_int)];
-	char gidset_l_[PADL_(gid_t *)]; gid_t * gidset; char gidset_r_[PADR_(gid_t *)];
-};
-struct setgroups_args {
-	char gidsetsize_l_[PADL_(u_int)]; u_int gidsetsize; char gidsetsize_r_[PADR_(u_int)];
-	char gidset_l_[PADL_(gid_t *)]; gid_t * gidset; char gidset_r_[PADR_(gid_t *)];
-};
-struct getpgrp_args {
-	register_t dummy;
-};
-struct setpgid_args {
-	char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)];
-	char pgid_l_[PADL_(int)]; int pgid; char pgid_r_[PADR_(int)];
-};
-struct setitimer_args {
-	char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
-	char itv_l_[PADL_(struct itimerval *)]; struct itimerval * itv; char itv_r_[PADR_(struct itimerval *)];
-	char oitv_l_[PADL_(struct itimerval *)]; struct itimerval * oitv; char oitv_r_[PADR_(struct itimerval *)];
-};
-struct owait_args {
-	register_t dummy;
-};
-struct swapon_args {
-	char name_l_[PADL_(char *)]; char * name; char name_r_[PADR_(char *)];
-};
-struct getitimer_args {
-	char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
-	char itv_l_[PADL_(struct itimerval *)]; struct itimerval * itv; char itv_r_[PADR_(struct itimerval *)];
-};
-struct getdtablesize_args {
-	register_t dummy;
-};
-struct dup2_args {
-	char from_l_[PADL_(u_int)]; u_int from; char from_r_[PADR_(u_int)];
-	char to_l_[PADL_(u_int)]; u_int to; char to_r_[PADR_(u_int)];
-};
-struct fcntl_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char arg_l_[PADL_(long)]; long arg; char arg_r_[PADR_(long)];
-};
-struct select_args {
-	char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)];
-	char in_l_[PADL_(fd_set *)]; fd_set * in; char in_r_[PADR_(fd_set *)];
-	char ou_l_[PADL_(fd_set *)]; fd_set * ou; char ou_r_[PADR_(fd_set *)];
-	char ex_l_[PADL_(fd_set *)]; fd_set * ex; char ex_r_[PADR_(fd_set *)];
-	char tv_l_[PADL_(struct timeval *)]; struct timeval * tv; char tv_r_[PADR_(struct timeval *)];
-};
-struct fsync_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-};
-struct setpriority_args {
-	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
-	char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)];
-	char prio_l_[PADL_(int)]; int prio; char prio_r_[PADR_(int)];
-};
-struct socket_args {
-	char domain_l_[PADL_(int)]; int domain; char domain_r_[PADR_(int)];
-	char type_l_[PADL_(int)]; int type; char type_r_[PADR_(int)];
-	char protocol_l_[PADL_(int)]; int protocol; char protocol_r_[PADR_(int)];
-};
-struct connect_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)];
-	char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)];
-};
-struct getpriority_args {
-	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
-	char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)];
-};
-struct bind_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)];
-	char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)];
-};
-struct setsockopt_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char level_l_[PADL_(int)]; int level; char level_r_[PADR_(int)];
-	char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)];
-	char val_l_[PADL_(caddr_t)]; caddr_t val; char val_r_[PADR_(caddr_t)];
-	char valsize_l_[PADL_(int)]; int valsize; char valsize_r_[PADR_(int)];
-};
-struct listen_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char backlog_l_[PADL_(int)]; int backlog; char backlog_r_[PADR_(int)];
-};
-struct gettimeofday_args {
-	char tp_l_[PADL_(struct timeval *)]; struct timeval * tp; char tp_r_[PADR_(struct timeval *)];
-	char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)];
-};
-struct getrusage_args {
-	char who_l_[PADL_(int)]; int who; char who_r_[PADR_(int)];
-	char rusage_l_[PADL_(struct rusage *)]; struct rusage * rusage; char rusage_r_[PADR_(struct rusage *)];
-};
-struct getsockopt_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char level_l_[PADL_(int)]; int level; char level_r_[PADR_(int)];
-	char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)];
-	char val_l_[PADL_(caddr_t)]; caddr_t val; char val_r_[PADR_(caddr_t)];
-	char avalsize_l_[PADL_(int *)]; int * avalsize; char avalsize_r_[PADR_(int *)];
-};
-struct readv_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
-	char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
-};
-struct writev_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
-	char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
-};
-struct settimeofday_args {
-	char tv_l_[PADL_(struct timeval *)]; struct timeval * tv; char tv_r_[PADR_(struct timeval *)];
-	char tzp_l_[PADL_(struct timezone *)]; struct timezone * tzp; char tzp_r_[PADR_(struct timezone *)];
-};
-struct fchown_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)];
-	char gid_l_[PADL_(int)]; int gid; char gid_r_[PADR_(int)];
-};
-struct fchmod_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
-};
-struct setreuid_args {
-	char ruid_l_[PADL_(int)]; int ruid; char ruid_r_[PADR_(int)];
-	char euid_l_[PADL_(int)]; int euid; char euid_r_[PADR_(int)];
-};
-struct setregid_args {
-	char rgid_l_[PADL_(int)]; int rgid; char rgid_r_[PADR_(int)];
-	char egid_l_[PADL_(int)]; int egid; char egid_r_[PADR_(int)];
-};
-struct rename_args {
-	char from_l_[PADL_(char *)]; char * from; char from_r_[PADR_(char *)];
-	char to_l_[PADL_(char *)]; char * to; char to_r_[PADR_(char *)];
-};
-struct flock_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
-};
-struct mkfifo_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
-};
-struct sendto_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)];
-	char tolen_l_[PADL_(int)]; int tolen; char tolen_r_[PADR_(int)];
-};
-struct shutdown_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
-};
-struct socketpair_args {
-	char domain_l_[PADL_(int)]; int domain; char domain_r_[PADR_(int)];
-	char type_l_[PADL_(int)]; int type; char type_r_[PADR_(int)];
-	char protocol_l_[PADL_(int)]; int protocol; char protocol_r_[PADR_(int)];
-	char rsv_l_[PADL_(int *)]; int * rsv; char rsv_r_[PADR_(int *)];
-};
-struct mkdir_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
-};
-struct rmdir_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-};
-struct utimes_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char tptr_l_[PADL_(struct timeval *)]; struct timeval * tptr; char tptr_r_[PADR_(struct timeval *)];
-};
-struct adjtime_args {
-	char delta_l_[PADL_(struct timeval *)]; struct timeval * delta; char delta_r_[PADR_(struct timeval *)];
-	char olddelta_l_[PADL_(struct timeval *)]; struct timeval * olddelta; char olddelta_r_[PADR_(struct timeval *)];
-};
-struct ogethostid_args {
-	register_t dummy;
-};
-struct setsid_args {
-	register_t dummy;
-};
-struct quotactl_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)];
-	char arg_l_[PADL_(caddr_t)]; caddr_t arg; char arg_r_[PADR_(caddr_t)];
-};
-struct oquota_args {
-	register_t dummy;
-};
-struct nlm_syscall_args {
-	char debug_level_l_[PADL_(int)]; int debug_level; char debug_level_r_[PADR_(int)];
-	char grace_period_l_[PADL_(int)]; int grace_period; char grace_period_r_[PADR_(int)];
-	char addr_count_l_[PADL_(int)]; int addr_count; char addr_count_r_[PADR_(int)];
-	char addrs_l_[PADL_(char **)]; char ** addrs; char addrs_r_[PADR_(char **)];
-};
-struct nfssvc_args {
-	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-	char argp_l_[PADL_(caddr_t)]; caddr_t argp; char argp_r_[PADR_(caddr_t)];
-};
-struct lgetfh_args {
-	char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)];
-	char fhp_l_[PADL_(struct fhandle *)]; struct fhandle * fhp; char fhp_r_[PADR_(struct fhandle *)];
-};
-struct getfh_args {
-	char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)];
-	char fhp_l_[PADL_(struct fhandle *)]; struct fhandle * fhp; char fhp_r_[PADR_(struct fhandle *)];
-};
-struct sysarch_args {
-	char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
-	char parms_l_[PADL_(char *)]; char * parms; char parms_r_[PADR_(char *)];
-};
-struct rtprio_args {
-	char function_l_[PADL_(int)]; int function; char function_r_[PADR_(int)];
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-	char rtp_l_[PADL_(struct rtprio *)]; struct rtprio * rtp; char rtp_r_[PADR_(struct rtprio *)];
-};
-struct semsys_args {
-	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
-	char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)];
-	char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)];
-	char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)];
-	char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)];
-};
-struct msgsys_args {
-	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
-	char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)];
-	char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)];
-	char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)];
-	char a5_l_[PADL_(int)]; int a5; char a5_r_[PADR_(int)];
-	char a6_l_[PADL_(int)]; int a6; char a6_r_[PADR_(int)];
-};
-struct shmsys_args {
-	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
-	char a2_l_[PADL_(int)]; int a2; char a2_r_[PADR_(int)];
-	char a3_l_[PADL_(int)]; int a3; char a3_r_[PADR_(int)];
-	char a4_l_[PADL_(int)]; int a4; char a4_r_[PADR_(int)];
-};
-struct freebsd6_pread_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
-	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-};
-struct freebsd6_pwrite_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
-	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-};
-struct setfib_args {
-	char fibnum_l_[PADL_(int)]; int fibnum; char fibnum_r_[PADR_(int)];
-};
-struct ntp_adjtime_args {
-	char tp_l_[PADL_(struct timex *)]; struct timex * tp; char tp_r_[PADR_(struct timex *)];
-};
-struct setgid_args {
-	char gid_l_[PADL_(gid_t)]; gid_t gid; char gid_r_[PADR_(gid_t)];
-};
-struct setegid_args {
-	char egid_l_[PADL_(gid_t)]; gid_t egid; char egid_r_[PADR_(gid_t)];
-};
-struct seteuid_args {
-	char euid_l_[PADL_(uid_t)]; uid_t euid; char euid_r_[PADR_(uid_t)];
-};
-struct stat_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char ub_l_[PADL_(struct stat *)]; struct stat * ub; char ub_r_[PADR_(struct stat *)];
-};
-struct fstat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char sb_l_[PADL_(struct stat *)]; struct stat * sb; char sb_r_[PADR_(struct stat *)];
-};
-struct lstat_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char ub_l_[PADL_(struct stat *)]; struct stat * ub; char ub_r_[PADR_(struct stat *)];
-};
-struct pathconf_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)];
-};
-struct fpathconf_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)];
-};
-struct __getrlimit_args {
-	char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
-	char rlp_l_[PADL_(struct rlimit *)]; struct rlimit * rlp; char rlp_r_[PADR_(struct rlimit *)];
-};
-struct __setrlimit_args {
-	char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
-	char rlp_l_[PADL_(struct rlimit *)]; struct rlimit * rlp; char rlp_r_[PADR_(struct rlimit *)];
-};
-struct getdirentries_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
-	char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)];
-	char basep_l_[PADL_(long *)]; long * basep; char basep_r_[PADR_(long *)];
-};
-struct freebsd6_mmap_args {
-	char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char pos_l_[PADL_(off_t)]; off_t pos; char pos_r_[PADR_(off_t)];
-};
-struct freebsd6_lseek_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-	char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
-};
-struct freebsd6_truncate_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)];
-};
-struct freebsd6_ftruncate_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
-	char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)];
-};
-struct sysctl_args {
-	char name_l_[PADL_(int *)]; int * name; char name_r_[PADR_(int *)];
-	char namelen_l_[PADL_(u_int)]; u_int namelen; char namelen_r_[PADR_(u_int)];
-	char old_l_[PADL_(void *)]; void * old; char old_r_[PADR_(void *)];
-	char oldlenp_l_[PADL_(size_t *)]; size_t * oldlenp; char oldlenp_r_[PADR_(size_t *)];
-	char new_l_[PADL_(void *)]; void * new; char new_r_[PADR_(void *)];
-	char newlen_l_[PADL_(size_t)]; size_t newlen; char newlen_r_[PADR_(size_t)];
-};
-struct mlock_args {
-	char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-};
-struct munlock_args {
-	char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-};
-struct undelete_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-};
-struct futimes_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char tptr_l_[PADL_(struct timeval *)]; struct timeval * tptr; char tptr_r_[PADR_(struct timeval *)];
-};
-struct getpgid_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-};
-struct poll_args {
-	char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)];
-	char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)];
-	char timeout_l_[PADL_(int)]; int timeout; char timeout_r_[PADR_(int)];
-};
-struct semget_args {
-	char key_l_[PADL_(key_t)]; key_t key; char key_r_[PADR_(key_t)];
-	char nsems_l_[PADL_(int)]; int nsems; char nsems_r_[PADR_(int)];
-	char semflg_l_[PADL_(int)]; int semflg; char semflg_r_[PADR_(int)];
-};
-struct semop_args {
-	char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)];
-	char sops_l_[PADL_(struct sembuf *)]; struct sembuf * sops; char sops_r_[PADR_(struct sembuf *)];
-	char nsops_l_[PADL_(size_t)]; size_t nsops; char nsops_r_[PADR_(size_t)];
-};
-struct msgget_args {
-	char key_l_[PADL_(key_t)]; key_t key; char key_r_[PADR_(key_t)];
-	char msgflg_l_[PADL_(int)]; int msgflg; char msgflg_r_[PADR_(int)];
-};
-struct msgsnd_args {
-	char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
-	char msgp_l_[PADL_(const void *)]; const void * msgp; char msgp_r_[PADR_(const void *)];
-	char msgsz_l_[PADL_(size_t)]; size_t msgsz; char msgsz_r_[PADR_(size_t)];
-	char msgflg_l_[PADL_(int)]; int msgflg; char msgflg_r_[PADR_(int)];
-};
-struct msgrcv_args {
-	char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
-	char msgp_l_[PADL_(void *)]; void * msgp; char msgp_r_[PADR_(void *)];
-	char msgsz_l_[PADL_(size_t)]; size_t msgsz; char msgsz_r_[PADR_(size_t)];
-	char msgtyp_l_[PADL_(long)]; long msgtyp; char msgtyp_r_[PADR_(long)];
-	char msgflg_l_[PADL_(int)]; int msgflg; char msgflg_r_[PADR_(int)];
-};
-struct shmat_args {
-	char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)];
-	char shmaddr_l_[PADL_(const void *)]; const void * shmaddr; char shmaddr_r_[PADR_(const void *)];
-	char shmflg_l_[PADL_(int)]; int shmflg; char shmflg_r_[PADR_(int)];
-};
-struct shmdt_args {
-	char shmaddr_l_[PADL_(const void *)]; const void * shmaddr; char shmaddr_r_[PADR_(const void *)];
-};
-struct shmget_args {
-	char key_l_[PADL_(key_t)]; key_t key; char key_r_[PADR_(key_t)];
-	char size_l_[PADL_(size_t)]; size_t size; char size_r_[PADR_(size_t)];
-	char shmflg_l_[PADL_(int)]; int shmflg; char shmflg_r_[PADR_(int)];
-};
-struct clock_gettime_args {
-	char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
-	char tp_l_[PADL_(struct timespec *)]; struct timespec * tp; char tp_r_[PADR_(struct timespec *)];
-};
-struct clock_settime_args {
-	char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
-	char tp_l_[PADL_(const struct timespec *)]; const struct timespec * tp; char tp_r_[PADR_(const struct timespec *)];
-};
-struct clock_getres_args {
-	char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
-	char tp_l_[PADL_(struct timespec *)]; struct timespec * tp; char tp_r_[PADR_(struct timespec *)];
-};
-struct ktimer_create_args {
-	char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)];
-	char evp_l_[PADL_(struct sigevent *)]; struct sigevent * evp; char evp_r_[PADR_(struct sigevent *)];
-	char timerid_l_[PADL_(int *)]; int * timerid; char timerid_r_[PADR_(int *)];
-};
-struct ktimer_delete_args {
-	char timerid_l_[PADL_(int)]; int timerid; char timerid_r_[PADR_(int)];
-};
-struct ktimer_settime_args {
-	char timerid_l_[PADL_(int)]; int timerid; char timerid_r_[PADR_(int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char value_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * value; char value_r_[PADR_(const struct itimerspec *)];
-	char ovalue_l_[PADL_(struct itimerspec *)]; struct itimerspec * ovalue; char ovalue_r_[PADR_(struct itimerspec *)];
-};
-struct ktimer_gettime_args {
-	char timerid_l_[PADL_(int)]; int timerid; char timerid_r_[PADR_(int)];
-	char value_l_[PADL_(struct itimerspec *)]; struct itimerspec * value; char value_r_[PADR_(struct itimerspec *)];
-};
-struct ktimer_getoverrun_args {
-	char timerid_l_[PADL_(int)]; int timerid; char timerid_r_[PADR_(int)];
-};
-struct nanosleep_args {
-	char rqtp_l_[PADL_(const struct timespec *)]; const struct timespec * rqtp; char rqtp_r_[PADR_(const struct timespec *)];
-	char rmtp_l_[PADL_(struct timespec *)]; struct timespec * rmtp; char rmtp_r_[PADR_(struct timespec *)];
-};
-struct ffclock_getcounter_args {
-	char ffcount_l_[PADL_(ffcounter *)]; ffcounter * ffcount; char ffcount_r_[PADR_(ffcounter *)];
-};
-struct ffclock_setestimate_args {
-	char cest_l_[PADL_(struct ffclock_estimate *)]; struct ffclock_estimate * cest; char cest_r_[PADR_(struct ffclock_estimate *)];
-};
-struct ffclock_getestimate_args {
-	char cest_l_[PADL_(struct ffclock_estimate *)]; struct ffclock_estimate * cest; char cest_r_[PADR_(struct ffclock_estimate *)];
-};
-struct clock_getcpuclockid2_args {
-	char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
-	char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
-	char clock_id_l_[PADL_(clockid_t *)]; clockid_t * clock_id; char clock_id_r_[PADR_(clockid_t *)];
-};
-struct ntp_gettime_args {
-	char ntvp_l_[PADL_(struct ntptimeval *)]; struct ntptimeval * ntvp; char ntvp_r_[PADR_(struct ntptimeval *)];
-};
-struct minherit_args {
-	char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char inherit_l_[PADL_(int)]; int inherit; char inherit_r_[PADR_(int)];
-};
-struct rfork_args {
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct openbsd_poll_args {
-	char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)];
-	char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)];
-	char timeout_l_[PADL_(int)]; int timeout; char timeout_r_[PADR_(int)];
-};
-struct issetugid_args {
-	register_t dummy;
-};
-struct lchown_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char uid_l_[PADL_(int)]; int uid; char uid_r_[PADR_(int)];
-	char gid_l_[PADL_(int)]; int gid; char gid_r_[PADR_(int)];
-};
-struct aio_read_args {
-	char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
-};
-struct aio_write_args {
-	char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
-};
-struct lio_listio_args {
-	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
-	char acb_list_l_[PADL_(struct aiocb *const *)]; struct aiocb *const * acb_list; char acb_list_r_[PADR_(struct aiocb *const *)];
-	char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)];
-	char sig_l_[PADL_(struct sigevent *)]; struct sigevent * sig; char sig_r_[PADR_(struct sigevent *)];
-};
-struct getdents_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
-	char count_l_[PADL_(size_t)]; size_t count; char count_r_[PADR_(size_t)];
-};
-struct lchmod_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
-};
-struct lutimes_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char tptr_l_[PADL_(struct timeval *)]; struct timeval * tptr; char tptr_r_[PADR_(struct timeval *)];
-};
-struct nstat_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)];
-};
-struct nfstat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char sb_l_[PADL_(struct nstat *)]; struct nstat * sb; char sb_r_[PADR_(struct nstat *)];
-};
-struct nlstat_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char ub_l_[PADL_(struct nstat *)]; struct nstat * ub; char ub_r_[PADR_(struct nstat *)];
-};
-struct preadv_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
-	char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-};
-struct pwritev_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
-	char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-};
-struct fhopen_args {
-	char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct fhstat_args {
-	char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
-	char sb_l_[PADL_(struct stat *)]; struct stat * sb; char sb_r_[PADR_(struct stat *)];
-};
-struct modnext_args {
-	char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)];
-};
-struct modstat_args {
-	char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)];
-	char stat_l_[PADL_(struct module_stat *)]; struct module_stat * stat; char stat_r_[PADR_(struct module_stat *)];
-};
-struct modfnext_args {
-	char modid_l_[PADL_(int)]; int modid; char modid_r_[PADR_(int)];
-};
-struct modfind_args {
-	char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
-};
-struct kldload_args {
-	char file_l_[PADL_(const char *)]; const char * file; char file_r_[PADR_(const char *)];
-};
-struct kldunload_args {
-	char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)];
-};
-struct kldfind_args {
-	char file_l_[PADL_(const char *)]; const char * file; char file_r_[PADR_(const char *)];
-};
-struct kldnext_args {
-	char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)];
-};
-struct kldstat_args {
-	char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)];
-	char stat_l_[PADL_(struct kld_file_stat *)]; struct kld_file_stat * stat; char stat_r_[PADR_(struct kld_file_stat *)];
-};
-struct kldfirstmod_args {
-	char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)];
-};
-struct getsid_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-};
-struct setresuid_args {
-	char ruid_l_[PADL_(uid_t)]; uid_t ruid; char ruid_r_[PADR_(uid_t)];
-	char euid_l_[PADL_(uid_t)]; uid_t euid; char euid_r_[PADR_(uid_t)];
-	char suid_l_[PADL_(uid_t)]; uid_t suid; char suid_r_[PADR_(uid_t)];
-};
-struct setresgid_args {
-	char rgid_l_[PADL_(gid_t)]; gid_t rgid; char rgid_r_[PADR_(gid_t)];
-	char egid_l_[PADL_(gid_t)]; gid_t egid; char egid_r_[PADR_(gid_t)];
-	char sgid_l_[PADL_(gid_t)]; gid_t sgid; char sgid_r_[PADR_(gid_t)];
-};
-struct aio_return_args {
-	char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
-};
-struct aio_suspend_args {
-	char aiocbp_l_[PADL_(struct aiocb *const *)]; struct aiocb *const * aiocbp; char aiocbp_r_[PADR_(struct aiocb *const *)];
-	char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)];
-	char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)];
-};
-struct aio_cancel_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
-};
-struct aio_error_args {
-	char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
-};
-struct oaio_read_args {
-	char aiocbp_l_[PADL_(struct oaiocb *)]; struct oaiocb * aiocbp; char aiocbp_r_[PADR_(struct oaiocb *)];
-};
-struct oaio_write_args {
-	char aiocbp_l_[PADL_(struct oaiocb *)]; struct oaiocb * aiocbp; char aiocbp_r_[PADR_(struct oaiocb *)];
-};
-struct olio_listio_args {
-	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
-	char acb_list_l_[PADL_(struct oaiocb *const *)]; struct oaiocb *const * acb_list; char acb_list_r_[PADR_(struct oaiocb *const *)];
-	char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)];
-	char sig_l_[PADL_(struct osigevent *)]; struct osigevent * sig; char sig_r_[PADR_(struct osigevent *)];
-};
-struct yield_args {
-	register_t dummy;
-};
-struct mlockall_args {
-	char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
-};
-struct munlockall_args {
-	register_t dummy;
-};
-struct __getcwd_args {
-	char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
-	char buflen_l_[PADL_(u_int)]; u_int buflen; char buflen_r_[PADR_(u_int)];
-};
-struct sched_setparam_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-	char param_l_[PADL_(const struct sched_param *)]; const struct sched_param * param; char param_r_[PADR_(const struct sched_param *)];
-};
-struct sched_getparam_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-	char param_l_[PADL_(struct sched_param *)]; struct sched_param * param; char param_r_[PADR_(struct sched_param *)];
-};
-struct sched_setscheduler_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-	char policy_l_[PADL_(int)]; int policy; char policy_r_[PADR_(int)];
-	char param_l_[PADL_(const struct sched_param *)]; const struct sched_param * param; char param_r_[PADR_(const struct sched_param *)];
-};
-struct sched_getscheduler_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-};
-struct sched_yield_args {
-	register_t dummy;
-};
-struct sched_get_priority_max_args {
-	char policy_l_[PADL_(int)]; int policy; char policy_r_[PADR_(int)];
-};
-struct sched_get_priority_min_args {
-	char policy_l_[PADL_(int)]; int policy; char policy_r_[PADR_(int)];
-};
-struct sched_rr_get_interval_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-	char interval_l_[PADL_(struct timespec *)]; struct timespec * interval; char interval_r_[PADR_(struct timespec *)];
-};
-struct utrace_args {
-	char addr_l_[PADL_(const void *)]; const void * addr; char addr_r_[PADR_(const void *)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-};
-struct kldsym_args {
-	char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-};
-struct jail_args {
-	char jail_l_[PADL_(struct jail *)]; struct jail * jail; char jail_r_[PADR_(struct jail *)];
-};
-struct nnpfs_syscall_args {
-	char operation_l_[PADL_(int)]; int operation; char operation_r_[PADR_(int)];
-	char a_pathP_l_[PADL_(char *)]; char * a_pathP; char a_pathP_r_[PADR_(char *)];
-	char a_opcode_l_[PADL_(int)]; int a_opcode; char a_opcode_r_[PADR_(int)];
-	char a_paramsP_l_[PADL_(void *)]; void * a_paramsP; char a_paramsP_r_[PADR_(void *)];
-	char a_followSymlinks_l_[PADL_(int)]; int a_followSymlinks; char a_followSymlinks_r_[PADR_(int)];
-};
-struct sigprocmask_args {
-	char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
-	char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
-	char oset_l_[PADL_(sigset_t *)]; sigset_t * oset; char oset_r_[PADR_(sigset_t *)];
-};
-struct sigsuspend_args {
-	char sigmask_l_[PADL_(const sigset_t *)]; const sigset_t * sigmask; char sigmask_r_[PADR_(const sigset_t *)];
-};
-struct sigpending_args {
-	char set_l_[PADL_(sigset_t *)]; sigset_t * set; char set_r_[PADR_(sigset_t *)];
-};
-struct sigtimedwait_args {
-	char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
-	char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
-	char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)];
-};
-struct sigwaitinfo_args {
-	char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
-	char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
-};
-struct __acl_get_file_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-	char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
-};
-struct __acl_set_file_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-	char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
-};
-struct __acl_get_fd_args {
-	char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-	char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
-};
-struct __acl_set_fd_args {
-	char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-	char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
-};
-struct __acl_delete_file_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-};
-struct __acl_delete_fd_args {
-	char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-};
-struct __acl_aclcheck_file_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-	char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
-};
-struct __acl_aclcheck_fd_args {
-	char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-	char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
-};
-struct extattrctl_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-};
-struct extattr_set_file_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-};
-struct extattr_get_file_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-};
-struct extattr_delete_file_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-};
-struct aio_waitcomplete_args {
-	char aiocbp_l_[PADL_(struct aiocb **)]; struct aiocb ** aiocbp; char aiocbp_r_[PADR_(struct aiocb **)];
-	char timeout_l_[PADL_(struct timespec *)]; struct timespec * timeout; char timeout_r_[PADR_(struct timespec *)];
-};
-struct getresuid_args {
-	char ruid_l_[PADL_(uid_t *)]; uid_t * ruid; char ruid_r_[PADR_(uid_t *)];
-	char euid_l_[PADL_(uid_t *)]; uid_t * euid; char euid_r_[PADR_(uid_t *)];
-	char suid_l_[PADL_(uid_t *)]; uid_t * suid; char suid_r_[PADR_(uid_t *)];
-};
-struct getresgid_args {
-	char rgid_l_[PADL_(gid_t *)]; gid_t * rgid; char rgid_r_[PADR_(gid_t *)];
-	char egid_l_[PADL_(gid_t *)]; gid_t * egid; char egid_r_[PADR_(gid_t *)];
-	char sgid_l_[PADL_(gid_t *)]; gid_t * sgid; char sgid_r_[PADR_(gid_t *)];
-};
-struct kqueue_args {
-	register_t dummy;
-};
-struct kevent_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char changelist_l_[PADL_(struct kevent *)]; struct kevent * changelist; char changelist_r_[PADR_(struct kevent *)];
-	char nchanges_l_[PADL_(int)]; int nchanges; char nchanges_r_[PADR_(int)];
-	char eventlist_l_[PADL_(struct kevent *)]; struct kevent * eventlist; char eventlist_r_[PADR_(struct kevent *)];
-	char nevents_l_[PADL_(int)]; int nevents; char nevents_r_[PADR_(int)];
-	char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)];
-};
-struct extattr_set_fd_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-};
-struct extattr_get_fd_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-};
-struct extattr_delete_fd_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-};
-struct __setugid_args {
-	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-};
-struct eaccess_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char amode_l_[PADL_(int)]; int amode; char amode_r_[PADR_(int)];
-};
-struct afs3_syscall_args {
-	char syscall_l_[PADL_(long)]; long syscall; char syscall_r_[PADR_(long)];
-	char parm1_l_[PADL_(long)]; long parm1; char parm1_r_[PADR_(long)];
-	char parm2_l_[PADL_(long)]; long parm2; char parm2_r_[PADR_(long)];
-	char parm3_l_[PADL_(long)]; long parm3; char parm3_r_[PADR_(long)];
-	char parm4_l_[PADL_(long)]; long parm4; char parm4_r_[PADR_(long)];
-	char parm5_l_[PADL_(long)]; long parm5; char parm5_r_[PADR_(long)];
-	char parm6_l_[PADL_(long)]; long parm6; char parm6_r_[PADR_(long)];
-};
-struct nmount_args {
-	char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
-	char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct __mac_get_proc_args {
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct __mac_set_proc_args {
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct __mac_get_fd_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct __mac_get_file_args {
-	char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)];
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct __mac_set_fd_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct __mac_set_file_args {
-	char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)];
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct kenv_args {
-	char what_l_[PADL_(int)]; int what; char what_r_[PADR_(int)];
-	char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
-	char value_l_[PADL_(char *)]; char * value; char value_r_[PADR_(char *)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
-};
-struct lchflags_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char flags_l_[PADL_(u_long)]; u_long flags; char flags_r_[PADR_(u_long)];
-};
-struct uuidgen_args {
-	char store_l_[PADL_(struct uuid *)]; struct uuid * store; char store_r_[PADR_(struct uuid *)];
-	char count_l_[PADL_(int)]; int count; char count_r_[PADR_(int)];
-};
-struct sendfile_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-	char hdtr_l_[PADL_(struct sf_hdtr *)]; struct sf_hdtr * hdtr; char hdtr_r_[PADR_(struct sf_hdtr *)];
-	char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct mac_syscall_args {
-	char policy_l_[PADL_(const char *)]; const char * policy; char policy_r_[PADR_(const char *)];
-	char call_l_[PADL_(int)]; int call; char call_r_[PADR_(int)];
-	char arg_l_[PADL_(void *)]; void * arg; char arg_r_[PADR_(void *)];
-};
-struct getfsstat_args {
-	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
-	char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct statfs_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
-};
-struct fstatfs_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
-};
-struct fhstatfs_args {
-	char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
-	char buf_l_[PADL_(struct statfs *)]; struct statfs * buf; char buf_r_[PADR_(struct statfs *)];
-};
-struct ksem_close_args {
-	char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)];
-};
-struct ksem_post_args {
-	char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)];
-};
-struct ksem_wait_args {
-	char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)];
-};
-struct ksem_trywait_args {
-	char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)];
-};
-struct ksem_init_args {
-	char idp_l_[PADL_(semid_t *)]; semid_t * idp; char idp_r_[PADR_(semid_t *)];
-	char value_l_[PADL_(unsigned int)]; unsigned int value; char value_r_[PADR_(unsigned int)];
-};
-struct ksem_open_args {
-	char idp_l_[PADL_(semid_t *)]; semid_t * idp; char idp_r_[PADR_(semid_t *)];
-	char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
-	char oflag_l_[PADL_(int)]; int oflag; char oflag_r_[PADR_(int)];
-	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
-	char value_l_[PADL_(unsigned int)]; unsigned int value; char value_r_[PADR_(unsigned int)];
-};
-struct ksem_unlink_args {
-	char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
-};
-struct ksem_getvalue_args {
-	char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)];
-	char val_l_[PADL_(int *)]; int * val; char val_r_[PADR_(int *)];
-};
-struct ksem_destroy_args {
-	char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)];
-};
-struct __mac_get_pid_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct __mac_get_link_args {
-	char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)];
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct __mac_set_link_args {
-	char path_p_l_[PADL_(const char *)]; const char * path_p; char path_p_r_[PADR_(const char *)];
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct extattr_set_link_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-};
-struct extattr_get_link_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-};
-struct extattr_delete_link_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char attrname_l_[PADL_(const char *)]; const char * attrname; char attrname_r_[PADR_(const char *)];
-};
-struct __mac_execve_args {
-	char fname_l_[PADL_(char *)]; char * fname; char fname_r_[PADR_(char *)];
-	char argv_l_[PADL_(char **)]; char ** argv; char argv_r_[PADR_(char **)];
-	char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char **)];
-	char mac_p_l_[PADL_(struct mac *)]; struct mac * mac_p; char mac_p_r_[PADR_(struct mac *)];
-};
-struct sigaction_args {
-	char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)];
-	char act_l_[PADL_(const struct sigaction *)]; const struct sigaction * act; char act_r_[PADR_(const struct sigaction *)];
-	char oact_l_[PADL_(struct sigaction *)]; struct sigaction * oact; char oact_r_[PADR_(struct sigaction *)];
-};
-struct sigreturn_args {
-	char sigcntxp_l_[PADL_(const struct __ucontext *)]; const struct __ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct __ucontext *)];
-};
-struct getcontext_args {
-	char ucp_l_[PADL_(struct __ucontext *)]; struct __ucontext * ucp; char ucp_r_[PADR_(struct __ucontext *)];
-};
-struct setcontext_args {
-	char ucp_l_[PADL_(const struct __ucontext *)]; const struct __ucontext * ucp; char ucp_r_[PADR_(const struct __ucontext *)];
-};
-struct swapcontext_args {
-	char oucp_l_[PADL_(struct __ucontext *)]; struct __ucontext * oucp; char oucp_r_[PADR_(struct __ucontext *)];
-	char ucp_l_[PADL_(const struct __ucontext *)]; const struct __ucontext * ucp; char ucp_r_[PADR_(const struct __ucontext *)];
-};
-struct swapoff_args {
-	char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
-};
-struct __acl_get_link_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-	char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
-};
-struct __acl_set_link_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-	char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
-};
-struct __acl_delete_link_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-};
-struct __acl_aclcheck_link_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
-	char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
-};
-struct sigwait_args {
-	char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
-	char sig_l_[PADL_(int *)]; int * sig; char sig_r_[PADR_(int *)];
-};
-struct thr_create_args {
-	char ctx_l_[PADL_(ucontext_t *)]; ucontext_t * ctx; char ctx_r_[PADR_(ucontext_t *)];
-	char id_l_[PADL_(long *)]; long * id; char id_r_[PADR_(long *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct thr_exit_args {
-	char state_l_[PADL_(long *)]; long * state; char state_r_[PADR_(long *)];
-};
-struct thr_self_args {
-	char id_l_[PADL_(long *)]; long * id; char id_r_[PADR_(long *)];
-};
-struct thr_kill_args {
-	char id_l_[PADL_(long)]; long id; char id_r_[PADR_(long)];
-	char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)];
-};
-struct _umtx_lock_args {
-	char umtx_l_[PADL_(struct umtx *)]; struct umtx * umtx; char umtx_r_[PADR_(struct umtx *)];
-};
-struct _umtx_unlock_args {
-	char umtx_l_[PADL_(struct umtx *)]; struct umtx * umtx; char umtx_r_[PADR_(struct umtx *)];
-};
-struct jail_attach_args {
-	char jid_l_[PADL_(int)]; int jid; char jid_r_[PADR_(int)];
-};
-struct extattr_list_fd_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-};
-struct extattr_list_file_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-};
-struct extattr_list_link_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char attrnamespace_l_[PADL_(int)]; int attrnamespace; char attrnamespace_r_[PADR_(int)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-};
-struct ksem_timedwait_args {
-	char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)];
-	char abstime_l_[PADL_(const struct timespec *)]; const struct timespec * abstime; char abstime_r_[PADR_(const struct timespec *)];
-};
-struct thr_suspend_args {
-	char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)];
-};
-struct thr_wake_args {
-	char id_l_[PADL_(long)]; long id; char id_r_[PADR_(long)];
-};
-struct kldunloadf_args {
-	char fileid_l_[PADL_(int)]; int fileid; char fileid_r_[PADR_(int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct audit_args {
-	char record_l_[PADL_(const void *)]; const void * record; char record_r_[PADR_(const void *)];
-	char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)];
-};
-struct auditon_args {
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-	char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)];
-};
-struct getauid_args {
-	char auid_l_[PADL_(uid_t *)]; uid_t * auid; char auid_r_[PADR_(uid_t *)];
-};
-struct setauid_args {
-	char auid_l_[PADL_(uid_t *)]; uid_t * auid; char auid_r_[PADR_(uid_t *)];
-};
-struct getaudit_args {
-	char auditinfo_l_[PADL_(struct auditinfo *)]; struct auditinfo * auditinfo; char auditinfo_r_[PADR_(struct auditinfo *)];
-};
-struct setaudit_args {
-	char auditinfo_l_[PADL_(struct auditinfo *)]; struct auditinfo * auditinfo; char auditinfo_r_[PADR_(struct auditinfo *)];
-};
-struct getaudit_addr_args {
-	char auditinfo_addr_l_[PADL_(struct auditinfo_addr *)]; struct auditinfo_addr * auditinfo_addr; char auditinfo_addr_r_[PADR_(struct auditinfo_addr *)];
-	char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)];
-};
-struct setaudit_addr_args {
-	char auditinfo_addr_l_[PADL_(struct auditinfo_addr *)]; struct auditinfo_addr * auditinfo_addr; char auditinfo_addr_r_[PADR_(struct auditinfo_addr *)];
-	char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)];
-};
-struct auditctl_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-};
-struct _umtx_op_args {
-	char obj_l_[PADL_(void *)]; void * obj; char obj_r_[PADR_(void *)];
-	char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
-	char val_l_[PADL_(u_long)]; u_long val; char val_r_[PADR_(u_long)];
-	char uaddr1_l_[PADL_(void *)]; void * uaddr1; char uaddr1_r_[PADR_(void *)];
-	char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)];
-};
-struct thr_new_args {
-	char param_l_[PADL_(struct thr_param *)]; struct thr_param * param; char param_r_[PADR_(struct thr_param *)];
-	char param_size_l_[PADL_(int)]; int param_size; char param_size_r_[PADR_(int)];
-};
-struct sigqueue_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-	char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
-	char value_l_[PADL_(void *)]; void * value; char value_r_[PADR_(void *)];
-};
-struct kmq_open_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
-	char attr_l_[PADL_(const struct mq_attr *)]; const struct mq_attr * attr; char attr_r_[PADR_(const struct mq_attr *)];
-};
-struct kmq_setattr_args {
-	char mqd_l_[PADL_(int)]; int mqd; char mqd_r_[PADR_(int)];
-	char attr_l_[PADL_(const struct mq_attr *)]; const struct mq_attr * attr; char attr_r_[PADR_(const struct mq_attr *)];
-	char oattr_l_[PADL_(struct mq_attr *)]; struct mq_attr * oattr; char oattr_r_[PADR_(struct mq_attr *)];
-};
-struct kmq_timedreceive_args {
-	char mqd_l_[PADL_(int)]; int mqd; char mqd_r_[PADR_(int)];
-	char msg_ptr_l_[PADL_(char *)]; char * msg_ptr; char msg_ptr_r_[PADR_(char *)];
-	char msg_len_l_[PADL_(size_t)]; size_t msg_len; char msg_len_r_[PADR_(size_t)];
-	char msg_prio_l_[PADL_(unsigned *)]; unsigned * msg_prio; char msg_prio_r_[PADR_(unsigned *)];
-	char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)];
-};
-struct kmq_timedsend_args {
-	char mqd_l_[PADL_(int)]; int mqd; char mqd_r_[PADR_(int)];
-	char msg_ptr_l_[PADL_(const char *)]; const char * msg_ptr; char msg_ptr_r_[PADR_(const char *)];
-	char msg_len_l_[PADL_(size_t)]; size_t msg_len; char msg_len_r_[PADR_(size_t)];
-	char msg_prio_l_[PADL_(unsigned)]; unsigned msg_prio; char msg_prio_r_[PADR_(unsigned)];
-	char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)];
-};
-struct kmq_notify_args {
-	char mqd_l_[PADL_(int)]; int mqd; char mqd_r_[PADR_(int)];
-	char sigev_l_[PADL_(const struct sigevent *)]; const struct sigevent * sigev; char sigev_r_[PADR_(const struct sigevent *)];
-};
-struct kmq_unlink_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-};
-struct abort2_args {
-	char why_l_[PADL_(const char *)]; const char * why; char why_r_[PADR_(const char *)];
-	char nargs_l_[PADL_(int)]; int nargs; char nargs_r_[PADR_(int)];
-	char args_l_[PADL_(void **)]; void ** args; char args_r_[PADR_(void **)];
-};
-struct thr_set_name_args {
-	char id_l_[PADL_(long)]; long id; char id_r_[PADR_(long)];
-	char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)];
-};
-struct aio_fsync_args {
-	char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
-	char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
-};
-struct rtprio_thread_args {
-	char function_l_[PADL_(int)]; int function; char function_r_[PADR_(int)];
-	char lwpid_l_[PADL_(lwpid_t)]; lwpid_t lwpid; char lwpid_r_[PADR_(lwpid_t)];
-	char rtp_l_[PADL_(struct rtprio *)]; struct rtprio * rtp; char rtp_r_[PADR_(struct rtprio *)];
-};
-struct sctp_peeloff_args {
-	char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)];
-	char name_l_[PADL_(uint32_t)]; uint32_t name; char name_r_[PADR_(uint32_t)];
-};
-struct sctp_generic_sendmsg_args {
-	char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)];
-	char msg_l_[PADL_(caddr_t)]; caddr_t msg; char msg_r_[PADR_(caddr_t)];
-	char mlen_l_[PADL_(int)]; int mlen; char mlen_r_[PADR_(int)];
-	char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)];
-	char tolen_l_[PADL_(__socklen_t)]; __socklen_t tolen; char tolen_r_[PADR_(__socklen_t)];
-	char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct sctp_generic_sendmsg_iov_args {
-	char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)];
-	char iov_l_[PADL_(struct iovec *)]; struct iovec * iov; char iov_r_[PADR_(struct iovec *)];
-	char iovlen_l_[PADL_(int)]; int iovlen; char iovlen_r_[PADR_(int)];
-	char to_l_[PADL_(caddr_t)]; caddr_t to; char to_r_[PADR_(caddr_t)];
-	char tolen_l_[PADL_(__socklen_t)]; __socklen_t tolen; char tolen_r_[PADR_(__socklen_t)];
-	char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct sctp_generic_recvmsg_args {
-	char sd_l_[PADL_(int)]; int sd; char sd_r_[PADR_(int)];
-	char iov_l_[PADL_(struct iovec *)]; struct iovec * iov; char iov_r_[PADR_(struct iovec *)];
-	char iovlen_l_[PADL_(int)]; int iovlen; char iovlen_r_[PADR_(int)];
-	char from_l_[PADL_(struct sockaddr *)]; struct sockaddr * from; char from_r_[PADR_(struct sockaddr *)];
-	char fromlenaddr_l_[PADL_(__socklen_t *)]; __socklen_t * fromlenaddr; char fromlenaddr_r_[PADR_(__socklen_t *)];
-	char sinfo_l_[PADL_(struct sctp_sndrcvinfo *)]; struct sctp_sndrcvinfo * sinfo; char sinfo_r_[PADR_(struct sctp_sndrcvinfo *)];
-	char msg_flags_l_[PADL_(int *)]; int * msg_flags; char msg_flags_r_[PADR_(int *)];
-};
-struct pread_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(void *)]; void * buf; char buf_r_[PADR_(void *)];
-	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-};
-struct pwrite_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(const void *)]; const void * buf; char buf_r_[PADR_(const void *)];
-	char nbyte_l_[PADL_(size_t)]; size_t nbyte; char nbyte_r_[PADR_(size_t)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-};
-struct mmap_args {
-	char addr_l_[PADL_(caddr_t)]; caddr_t addr; char addr_r_[PADR_(caddr_t)];
-	char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
-	char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pos_l_[PADL_(off_t)]; off_t pos; char pos_r_[PADR_(off_t)];
-};
-struct lseek_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-	char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
-};
-struct truncate_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)];
-};
-struct ftruncate_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char length_l_[PADL_(off_t)]; off_t length; char length_r_[PADR_(off_t)];
-};
-struct thr_kill2_args {
-	char pid_l_[PADL_(pid_t)]; pid_t pid; char pid_r_[PADR_(pid_t)];
-	char id_l_[PADL_(long)]; long id; char id_r_[PADR_(long)];
-	char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)];
-};
-struct shm_open_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
-};
-struct shm_unlink_args {
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-};
-struct cpuset_args {
-	char setid_l_[PADL_(cpusetid_t *)]; cpusetid_t * setid; char setid_r_[PADR_(cpusetid_t *)];
-};
-struct cpuset_setid_args {
-	char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
-	char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
-	char setid_l_[PADL_(cpusetid_t)]; cpusetid_t setid; char setid_r_[PADR_(cpusetid_t)];
-};
-struct cpuset_getid_args {
-	char level_l_[PADL_(cpulevel_t)]; cpulevel_t level; char level_r_[PADR_(cpulevel_t)];
-	char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
-	char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
-	char setid_l_[PADL_(cpusetid_t *)]; cpusetid_t * setid; char setid_r_[PADR_(cpusetid_t *)];
-};
-struct cpuset_getaffinity_args {
-	char level_l_[PADL_(cpulevel_t)]; cpulevel_t level; char level_r_[PADR_(cpulevel_t)];
-	char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
-	char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
-	char cpusetsize_l_[PADL_(size_t)]; size_t cpusetsize; char cpusetsize_r_[PADR_(size_t)];
-	char mask_l_[PADL_(cpuset_t *)]; cpuset_t * mask; char mask_r_[PADR_(cpuset_t *)];
-};
-struct cpuset_setaffinity_args {
-	char level_l_[PADL_(cpulevel_t)]; cpulevel_t level; char level_r_[PADR_(cpulevel_t)];
-	char which_l_[PADL_(cpuwhich_t)]; cpuwhich_t which; char which_r_[PADR_(cpuwhich_t)];
-	char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
-	char cpusetsize_l_[PADL_(size_t)]; size_t cpusetsize; char cpusetsize_r_[PADR_(size_t)];
-	char mask_l_[PADL_(const cpuset_t *)]; const cpuset_t * mask; char mask_r_[PADR_(const cpuset_t *)];
-};
-struct faccessat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char amode_l_[PADL_(int)]; int amode; char amode_r_[PADR_(int)];
-	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-};
-struct fchmodat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
-	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-};
-struct fchownat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char uid_l_[PADL_(uid_t)]; uid_t uid; char uid_r_[PADR_(uid_t)];
-	char gid_l_[PADL_(gid_t)]; gid_t gid; char gid_r_[PADR_(gid_t)];
-	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-};
-struct fexecve_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char argv_l_[PADL_(char **)]; char ** argv; char argv_r_[PADR_(char **)];
-	char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char **)];
-};
-struct fstatat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char buf_l_[PADL_(struct stat *)]; struct stat * buf; char buf_r_[PADR_(struct stat *)];
-	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-};
-struct futimesat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char times_l_[PADL_(struct timeval *)]; struct timeval * times; char times_r_[PADR_(struct timeval *)];
-};
-struct linkat_args {
-	char fd1_l_[PADL_(int)]; int fd1; char fd1_r_[PADR_(int)];
-	char path1_l_[PADL_(char *)]; char * path1; char path1_r_[PADR_(char *)];
-	char fd2_l_[PADL_(int)]; int fd2; char fd2_r_[PADR_(int)];
-	char path2_l_[PADL_(char *)]; char * path2; char path2_r_[PADR_(char *)];
-	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-};
-struct mkdirat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
-};
-struct mkfifoat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
-};
-struct mknodat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
-	char dev_l_[PADL_(dev_t)]; dev_t dev; char dev_r_[PADR_(dev_t)];
-};
-struct openat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-	char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
-};
-struct readlinkat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
-	char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)];
-};
-struct renameat_args {
-	char oldfd_l_[PADL_(int)]; int oldfd; char oldfd_r_[PADR_(int)];
-	char old_l_[PADL_(char *)]; char * old; char old_r_[PADR_(char *)];
-	char newfd_l_[PADL_(int)]; int newfd; char newfd_r_[PADR_(int)];
-	char new_l_[PADL_(char *)]; char * new; char new_r_[PADR_(char *)];
-};
-struct symlinkat_args {
-	char path1_l_[PADL_(char *)]; char * path1; char path1_r_[PADR_(char *)];
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path2_l_[PADL_(char *)]; char * path2; char path2_r_[PADR_(char *)];
-};
-struct unlinkat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)];
-};
-struct posix_openpt_args {
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct gssd_syscall_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-};
-struct jail_get_args {
-	char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
-	char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct jail_set_args {
-	char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
-	char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct jail_remove_args {
-	char jid_l_[PADL_(int)]; int jid; char jid_r_[PADR_(int)];
-};
-struct closefrom_args {
-	char lowfd_l_[PADL_(int)]; int lowfd; char lowfd_r_[PADR_(int)];
-};
-struct __semctl_args {
-	char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)];
-	char semnum_l_[PADL_(int)]; int semnum; char semnum_r_[PADR_(int)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char arg_l_[PADL_(union semun *)]; union semun * arg; char arg_r_[PADR_(union semun *)];
-};
-struct msgctl_args {
-	char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char buf_l_[PADL_(struct msqid_ds *)]; struct msqid_ds * buf; char buf_r_[PADR_(struct msqid_ds *)];
-};
-struct shmctl_args {
-	char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char buf_l_[PADL_(struct shmid_ds *)]; struct shmid_ds * buf; char buf_r_[PADR_(struct shmid_ds *)];
-};
-struct lpathconf_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char name_l_[PADL_(int)]; int name; char name_r_[PADR_(int)];
-};
-struct __cap_rights_get_args {
-	char version_l_[PADL_(int)]; int version; char version_r_[PADR_(int)];
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char rightsp_l_[PADL_(cap_rights_t *)]; cap_rights_t * rightsp; char rightsp_r_[PADR_(cap_rights_t *)];
-};
-struct cap_enter_args {
-	register_t dummy;
-};
-struct cap_getmode_args {
-	char modep_l_[PADL_(u_int *)]; u_int * modep; char modep_r_[PADR_(u_int *)];
-};
-struct pdfork_args {
-	char fdp_l_[PADL_(int *)]; int * fdp; char fdp_r_[PADR_(int *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct pdkill_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
-};
-struct pdgetpid_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pidp_l_[PADL_(pid_t *)]; pid_t * pidp; char pidp_r_[PADR_(pid_t *)];
-};
-struct pselect_args {
-	char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)];
-	char in_l_[PADL_(fd_set *)]; fd_set * in; char in_r_[PADR_(fd_set *)];
-	char ou_l_[PADL_(fd_set *)]; fd_set * ou; char ou_r_[PADR_(fd_set *)];
-	char ex_l_[PADL_(fd_set *)]; fd_set * ex; char ex_r_[PADR_(fd_set *)];
-	char ts_l_[PADL_(const struct timespec *)]; const struct timespec * ts; char ts_r_[PADR_(const struct timespec *)];
-	char sm_l_[PADL_(const sigset_t *)]; const sigset_t * sm; char sm_r_[PADR_(const sigset_t *)];
-};
-struct getloginclass_args {
-	char namebuf_l_[PADL_(char *)]; char * namebuf; char namebuf_r_[PADR_(char *)];
-	char namelen_l_[PADL_(size_t)]; size_t namelen; char namelen_r_[PADR_(size_t)];
-};
-struct setloginclass_args {
-	char namebuf_l_[PADL_(const char *)]; const char * namebuf; char namebuf_r_[PADR_(const char *)];
-};
-struct rctl_get_racct_args {
-	char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)];
-	char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)];
-	char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)];
-	char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)];
-};
-struct rctl_get_rules_args {
-	char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)];
-	char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)];
-	char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)];
-	char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)];
-};
-struct rctl_get_limits_args {
-	char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)];
-	char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)];
-	char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)];
-	char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)];
-};
-struct rctl_add_rule_args {
-	char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)];
-	char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)];
-	char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)];
-	char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)];
-};
-struct rctl_remove_rule_args {
-	char inbufp_l_[PADL_(const void *)]; const void * inbufp; char inbufp_r_[PADR_(const void *)];
-	char inbuflen_l_[PADL_(size_t)]; size_t inbuflen; char inbuflen_r_[PADR_(size_t)];
-	char outbufp_l_[PADL_(void *)]; void * outbufp; char outbufp_r_[PADR_(void *)];
-	char outbuflen_l_[PADL_(size_t)]; size_t outbuflen; char outbuflen_r_[PADR_(size_t)];
-};
-struct posix_fallocate_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-	char len_l_[PADL_(off_t)]; off_t len; char len_r_[PADR_(off_t)];
-};
-struct posix_fadvise_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-	char len_l_[PADL_(off_t)]; off_t len; char len_r_[PADR_(off_t)];
-	char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
-};
-struct wait6_args {
-	char idtype_l_[PADL_(idtype_t)]; idtype_t idtype; char idtype_r_[PADR_(idtype_t)];
-	char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
-	char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
-	char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
-	char wrusage_l_[PADL_(struct __wrusage *)]; struct __wrusage * wrusage; char wrusage_r_[PADR_(struct __wrusage *)];
-	char info_l_[PADL_(siginfo_t *)]; siginfo_t * info; char info_r_[PADR_(siginfo_t *)];
-};
-struct cap_rights_limit_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char rightsp_l_[PADL_(cap_rights_t *)]; cap_rights_t * rightsp; char rightsp_r_[PADR_(cap_rights_t *)];
-};
-struct cap_ioctls_limit_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char cmds_l_[PADL_(const u_long *)]; const u_long * cmds; char cmds_r_[PADR_(const u_long *)];
-	char ncmds_l_[PADL_(size_t)]; size_t ncmds; char ncmds_r_[PADR_(size_t)];
-};
-struct cap_ioctls_get_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char cmds_l_[PADL_(u_long *)]; u_long * cmds; char cmds_r_[PADR_(u_long *)];
-	char maxcmds_l_[PADL_(size_t)]; size_t maxcmds; char maxcmds_r_[PADR_(size_t)];
-};
-struct cap_fcntls_limit_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char fcntlrights_l_[PADL_(uint32_t)]; uint32_t fcntlrights; char fcntlrights_r_[PADR_(uint32_t)];
-};
-struct cap_fcntls_get_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char fcntlrightsp_l_[PADL_(uint32_t *)]; uint32_t * fcntlrightsp; char fcntlrightsp_r_[PADR_(uint32_t *)];
-};
-struct bindat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)];
-	char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)];
-};
-struct connectat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)];
-	char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)];
-};
-struct chflagsat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
-	char flags_l_[PADL_(u_long)]; u_long flags; char flags_r_[PADR_(u_long)];
-	char atflag_l_[PADL_(int)]; int atflag; char atflag_r_[PADR_(int)];
-};
-struct accept4_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char name_l_[PADL_(struct sockaddr *__restrict)]; struct sockaddr *__restrict name; char name_r_[PADR_(struct sockaddr *__restrict)];
-	char anamelen_l_[PADL_(__socklen_t *__restrict)]; __socklen_t *__restrict anamelen; char anamelen_r_[PADR_(__socklen_t *__restrict)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct pipe2_args {
-	char fildes_l_[PADL_(int *)]; int * fildes; char fildes_r_[PADR_(int *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct aio_mlock_args {
-	char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
-};
-struct procctl_args {
-	char idtype_l_[PADL_(idtype_t)]; idtype_t idtype; char idtype_r_[PADR_(idtype_t)];
-	char id_l_[PADL_(id_t)]; id_t id; char id_r_[PADR_(id_t)];
-	char com_l_[PADL_(int)]; int com; char com_r_[PADR_(int)];
-	char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)];
-};
-struct ppoll_args {
-	char fds_l_[PADL_(struct pollfd *)]; struct pollfd * fds; char fds_r_[PADR_(struct pollfd *)];
-	char nfds_l_[PADL_(u_int)]; u_int nfds; char nfds_r_[PADR_(u_int)];
-	char ts_l_[PADL_(const struct timespec *)]; const struct timespec * ts; char ts_r_[PADR_(const struct timespec *)];
-	char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
-};
-int	nosys(struct thread *, struct nosys_args *);
-void	sys_sys_exit(struct thread *, struct sys_exit_args *);
-int	sys_fork(struct thread *, struct fork_args *);
-int	sys_read(struct thread *, struct read_args *);
-int	sys_write(struct thread *, struct write_args *);
-int	sys_open(struct thread *, struct open_args *);
-int	sys_close(struct thread *, struct close_args *);
-int	sys_wait4(struct thread *, struct wait4_args *);
-int	sys_link(struct thread *, struct link_args *);
-int	sys_unlink(struct thread *, struct unlink_args *);
-int	sys_chdir(struct thread *, struct chdir_args *);
-int	sys_fchdir(struct thread *, struct fchdir_args *);
-int	sys_mknod(struct thread *, struct mknod_args *);
-int	sys_chmod(struct thread *, struct chmod_args *);
-int	sys_chown(struct thread *, struct chown_args *);
-int	sys_obreak(struct thread *, struct obreak_args *);
-int	sys_getpid(struct thread *, struct getpid_args *);
-int	sys_mount(struct thread *, struct mount_args *);
-int	sys_unmount(struct thread *, struct unmount_args *);
-int	sys_setuid(struct thread *, struct setuid_args *);
-int	sys_getuid(struct thread *, struct getuid_args *);
-int	sys_geteuid(struct thread *, struct geteuid_args *);
-int	sys_ptrace(struct thread *, struct ptrace_args *);
-int	sys_recvmsg(struct thread *, struct recvmsg_args *);
-int	sys_sendmsg(struct thread *, struct sendmsg_args *);
-int	sys_recvfrom(struct thread *, struct recvfrom_args *);
-int	sys_accept(struct thread *, struct accept_args *);
-int	sys_getpeername(struct thread *, struct getpeername_args *);
-int	sys_getsockname(struct thread *, struct getsockname_args *);
-int	sys_access(struct thread *, struct access_args *);
-int	sys_chflags(struct thread *, struct chflags_args *);
-int	sys_fchflags(struct thread *, struct fchflags_args *);
-int	sys_sync(struct thread *, struct sync_args *);
-int	sys_kill(struct thread *, struct kill_args *);
-int	sys_getppid(struct thread *, struct getppid_args *);
-int	sys_dup(struct thread *, struct dup_args *);
-int	sys_pipe(struct thread *, struct pipe_args *);
-int	sys_getegid(struct thread *, struct getegid_args *);
-int	sys_profil(struct thread *, struct profil_args *);
-int	sys_ktrace(struct thread *, struct ktrace_args *);
-int	sys_getgid(struct thread *, struct getgid_args *);
-int	sys_getlogin(struct thread *, struct getlogin_args *);
-int	sys_setlogin(struct thread *, struct setlogin_args *);
-int	sys_acct(struct thread *, struct acct_args *);
-int	sys_sigaltstack(struct thread *, struct sigaltstack_args *);
-int	sys_ioctl(struct thread *, struct ioctl_args *);
-int	sys_reboot(struct thread *, struct reboot_args *);
-int	sys_revoke(struct thread *, struct revoke_args *);
-int	sys_symlink(struct thread *, struct symlink_args *);
-int	sys_readlink(struct thread *, struct readlink_args *);
-int	sys_execve(struct thread *, struct execve_args *);
-int	sys_umask(struct thread *, struct umask_args *);
-int	sys_chroot(struct thread *, struct chroot_args *);
-int	sys_msync(struct thread *, struct msync_args *);
-int	sys_vfork(struct thread *, struct vfork_args *);
-int	sys_sbrk(struct thread *, struct sbrk_args *);
-int	sys_sstk(struct thread *, struct sstk_args *);
-int	sys_ovadvise(struct thread *, struct ovadvise_args *);
-int	sys_munmap(struct thread *, struct munmap_args *);
-int	sys_mprotect(struct thread *, struct mprotect_args *);
-int	sys_madvise(struct thread *, struct madvise_args *);
-int	sys_mincore(struct thread *, struct mincore_args *);
-int	sys_getgroups(struct thread *, struct getgroups_args *);
-int	sys_setgroups(struct thread *, struct setgroups_args *);
-int	sys_getpgrp(struct thread *, struct getpgrp_args *);
-int	sys_setpgid(struct thread *, struct setpgid_args *);
-int	sys_setitimer(struct thread *, struct setitimer_args *);
-int	sys_swapon(struct thread *, struct swapon_args *);
-int	sys_getitimer(struct thread *, struct getitimer_args *);
-int	sys_getdtablesize(struct thread *, struct getdtablesize_args *);
-int	sys_dup2(struct thread *, struct dup2_args *);
-int	sys_fcntl(struct thread *, struct fcntl_args *);
-int	sys_select(struct thread *, struct select_args *);
-int	sys_fsync(struct thread *, struct fsync_args *);
-int	sys_setpriority(struct thread *, struct setpriority_args *);
-int	sys_socket(struct thread *, struct socket_args *);
-int	sys_connect(struct thread *, struct connect_args *);
-int	sys_getpriority(struct thread *, struct getpriority_args *);
-int	sys_bind(struct thread *, struct bind_args *);
-int	sys_setsockopt(struct thread *, struct setsockopt_args *);
-int	sys_listen(struct thread *, struct listen_args *);
-int	sys_gettimeofday(struct thread *, struct gettimeofday_args *);
-int	sys_getrusage(struct thread *, struct getrusage_args *);
-int	sys_getsockopt(struct thread *, struct getsockopt_args *);
-int	sys_readv(struct thread *, struct readv_args *);
-int	sys_writev(struct thread *, struct writev_args *);
-int	sys_settimeofday(struct thread *, struct settimeofday_args *);
-int	sys_fchown(struct thread *, struct fchown_args *);
-int	sys_fchmod(struct thread *, struct fchmod_args *);
-int	sys_setreuid(struct thread *, struct setreuid_args *);
-int	sys_setregid(struct thread *, struct setregid_args *);
-int	sys_rename(struct thread *, struct rename_args *);
-int	sys_flock(struct thread *, struct flock_args *);
-int	sys_mkfifo(struct thread *, struct mkfifo_args *);
-int	sys_sendto(struct thread *, struct sendto_args *);
-int	sys_shutdown(struct thread *, struct shutdown_args *);
-int	sys_socketpair(struct thread *, struct socketpair_args *);
-int	sys_mkdir(struct thread *, struct mkdir_args *);
-int	sys_rmdir(struct thread *, struct rmdir_args *);
-int	sys_utimes(struct thread *, struct utimes_args *);
-int	sys_adjtime(struct thread *, struct adjtime_args *);
-int	sys_setsid(struct thread *, struct setsid_args *);
-int	sys_quotactl(struct thread *, struct quotactl_args *);
-int	sys_nlm_syscall(struct thread *, struct nlm_syscall_args *);
-int	sys_nfssvc(struct thread *, struct nfssvc_args *);
-int	sys_lgetfh(struct thread *, struct lgetfh_args *);
-int	sys_getfh(struct thread *, struct getfh_args *);
-int	sysarch(struct thread *, struct sysarch_args *);
-int	sys_rtprio(struct thread *, struct rtprio_args *);
-int	sys_semsys(struct thread *, struct semsys_args *);
-int	sys_msgsys(struct thread *, struct msgsys_args *);
-int	sys_shmsys(struct thread *, struct shmsys_args *);
-int	freebsd6_pread(struct thread *, struct freebsd6_pread_args *);
-int	freebsd6_pwrite(struct thread *, struct freebsd6_pwrite_args *);
-int	sys_setfib(struct thread *, struct setfib_args *);
-int	sys_ntp_adjtime(struct thread *, struct ntp_adjtime_args *);
-int	sys_setgid(struct thread *, struct setgid_args *);
-int	sys_setegid(struct thread *, struct setegid_args *);
-int	sys_seteuid(struct thread *, struct seteuid_args *);
-int	sys_stat(struct thread *, struct stat_args *);
-int	sys_fstat(struct thread *, struct fstat_args *);
-int	sys_lstat(struct thread *, struct lstat_args *);
-int	sys_pathconf(struct thread *, struct pathconf_args *);
-int	sys_fpathconf(struct thread *, struct fpathconf_args *);
-int	sys_getrlimit(struct thread *, struct __getrlimit_args *);
-int	sys_setrlimit(struct thread *, struct __setrlimit_args *);
-int	sys_getdirentries(struct thread *, struct getdirentries_args *);
-int	freebsd6_mmap(struct thread *, struct freebsd6_mmap_args *);
-int	freebsd6_lseek(struct thread *, struct freebsd6_lseek_args *);
-int	freebsd6_truncate(struct thread *, struct freebsd6_truncate_args *);
-int	freebsd6_ftruncate(struct thread *, struct freebsd6_ftruncate_args *);
-int	sys___sysctl(struct thread *, struct sysctl_args *);
-int	sys_mlock(struct thread *, struct mlock_args *);
-int	sys_munlock(struct thread *, struct munlock_args *);
-int	sys_undelete(struct thread *, struct undelete_args *);
-int	sys_futimes(struct thread *, struct futimes_args *);
-int	sys_getpgid(struct thread *, struct getpgid_args *);
-int	sys_poll(struct thread *, struct poll_args *);
-int	sys_semget(struct thread *, struct semget_args *);
-int	sys_semop(struct thread *, struct semop_args *);
-int	sys_msgget(struct thread *, struct msgget_args *);
-int	sys_msgsnd(struct thread *, struct msgsnd_args *);
-int	sys_msgrcv(struct thread *, struct msgrcv_args *);
-int	sys_shmat(struct thread *, struct shmat_args *);
-int	sys_shmdt(struct thread *, struct shmdt_args *);
-int	sys_shmget(struct thread *, struct shmget_args *);
-int	sys_clock_gettime(struct thread *, struct clock_gettime_args *);
-int	sys_clock_settime(struct thread *, struct clock_settime_args *);
-int	sys_clock_getres(struct thread *, struct clock_getres_args *);
-int	sys_ktimer_create(struct thread *, struct ktimer_create_args *);
-int	sys_ktimer_delete(struct thread *, struct ktimer_delete_args *);
-int	sys_ktimer_settime(struct thread *, struct ktimer_settime_args *);
-int	sys_ktimer_gettime(struct thread *, struct ktimer_gettime_args *);
-int	sys_ktimer_getoverrun(struct thread *, struct ktimer_getoverrun_args *);
-int	sys_nanosleep(struct thread *, struct nanosleep_args *);
-int	sys_ffclock_getcounter(struct thread *, struct ffclock_getcounter_args *);
-int	sys_ffclock_setestimate(struct thread *, struct ffclock_setestimate_args *);
-int	sys_ffclock_getestimate(struct thread *, struct ffclock_getestimate_args *);
-int	sys_clock_getcpuclockid2(struct thread *, struct clock_getcpuclockid2_args *);
-int	sys_ntp_gettime(struct thread *, struct ntp_gettime_args *);
-int	sys_minherit(struct thread *, struct minherit_args *);
-int	sys_rfork(struct thread *, struct rfork_args *);
-int	sys_openbsd_poll(struct thread *, struct openbsd_poll_args *);
-int	sys_issetugid(struct thread *, struct issetugid_args *);
-int	sys_lchown(struct thread *, struct lchown_args *);
-int	sys_aio_read(struct thread *, struct aio_read_args *);
-int	sys_aio_write(struct thread *, struct aio_write_args *);
-int	sys_lio_listio(struct thread *, struct lio_listio_args *);
-int	sys_getdents(struct thread *, struct getdents_args *);
-int	sys_lchmod(struct thread *, struct lchmod_args *);
-int	sys_lutimes(struct thread *, struct lutimes_args *);
-int	sys_nstat(struct thread *, struct nstat_args *);
-int	sys_nfstat(struct thread *, struct nfstat_args *);
-int	sys_nlstat(struct thread *, struct nlstat_args *);
-int	sys_preadv(struct thread *, struct preadv_args *);
-int	sys_pwritev(struct thread *, struct pwritev_args *);
-int	sys_fhopen(struct thread *, struct fhopen_args *);
-int	sys_fhstat(struct thread *, struct fhstat_args *);
-int	sys_modnext(struct thread *, struct modnext_args *);
-int	sys_modstat(struct thread *, struct modstat_args *);
-int	sys_modfnext(struct thread *, struct modfnext_args *);
-int	sys_modfind(struct thread *, struct modfind_args *);
-int	sys_kldload(struct thread *, struct kldload_args *);
-int	sys_kldunload(struct thread *, struct kldunload_args *);
-int	sys_kldfind(struct thread *, struct kldfind_args *);
-int	sys_kldnext(struct thread *, struct kldnext_args *);
-int	sys_kldstat(struct thread *, struct kldstat_args *);
-int	sys_kldfirstmod(struct thread *, struct kldfirstmod_args *);
-int	sys_getsid(struct thread *, struct getsid_args *);
-int	sys_setresuid(struct thread *, struct setresuid_args *);
-int	sys_setresgid(struct thread *, struct setresgid_args *);
-int	sys_aio_return(struct thread *, struct aio_return_args *);
-int	sys_aio_suspend(struct thread *, struct aio_suspend_args *);
-int	sys_aio_cancel(struct thread *, struct aio_cancel_args *);
-int	sys_aio_error(struct thread *, struct aio_error_args *);
-int	sys_oaio_read(struct thread *, struct oaio_read_args *);
-int	sys_oaio_write(struct thread *, struct oaio_write_args *);
-int	sys_olio_listio(struct thread *, struct olio_listio_args *);
-int	sys_yield(struct thread *, struct yield_args *);
-int	sys_mlockall(struct thread *, struct mlockall_args *);
-int	sys_munlockall(struct thread *, struct munlockall_args *);
-int	sys___getcwd(struct thread *, struct __getcwd_args *);
-int	sys_sched_setparam(struct thread *, struct sched_setparam_args *);
-int	sys_sched_getparam(struct thread *, struct sched_getparam_args *);
-int	sys_sched_setscheduler(struct thread *, struct sched_setscheduler_args *);
-int	sys_sched_getscheduler(struct thread *, struct sched_getscheduler_args *);
-int	sys_sched_yield(struct thread *, struct sched_yield_args *);
-int	sys_sched_get_priority_max(struct thread *, struct sched_get_priority_max_args *);
-int	sys_sched_get_priority_min(struct thread *, struct sched_get_priority_min_args *);
-int	sys_sched_rr_get_interval(struct thread *, struct sched_rr_get_interval_args *);
-int	sys_utrace(struct thread *, struct utrace_args *);
-int	sys_kldsym(struct thread *, struct kldsym_args *);
-int	sys_jail(struct thread *, struct jail_args *);
-int	sys_nnpfs_syscall(struct thread *, struct nnpfs_syscall_args *);
-int	sys_sigprocmask(struct thread *, struct sigprocmask_args *);
-int	sys_sigsuspend(struct thread *, struct sigsuspend_args *);
-int	sys_sigpending(struct thread *, struct sigpending_args *);
-int	sys_sigtimedwait(struct thread *, struct sigtimedwait_args *);
-int	sys_sigwaitinfo(struct thread *, struct sigwaitinfo_args *);
-int	sys___acl_get_file(struct thread *, struct __acl_get_file_args *);
-int	sys___acl_set_file(struct thread *, struct __acl_set_file_args *);
-int	sys___acl_get_fd(struct thread *, struct __acl_get_fd_args *);
-int	sys___acl_set_fd(struct thread *, struct __acl_set_fd_args *);
-int	sys___acl_delete_file(struct thread *, struct __acl_delete_file_args *);
-int	sys___acl_delete_fd(struct thread *, struct __acl_delete_fd_args *);
-int	sys___acl_aclcheck_file(struct thread *, struct __acl_aclcheck_file_args *);
-int	sys___acl_aclcheck_fd(struct thread *, struct __acl_aclcheck_fd_args *);
-int	sys_extattrctl(struct thread *, struct extattrctl_args *);
-int	sys_extattr_set_file(struct thread *, struct extattr_set_file_args *);
-int	sys_extattr_get_file(struct thread *, struct extattr_get_file_args *);
-int	sys_extattr_delete_file(struct thread *, struct extattr_delete_file_args *);
-int	sys_aio_waitcomplete(struct thread *, struct aio_waitcomplete_args *);
-int	sys_getresuid(struct thread *, struct getresuid_args *);
-int	sys_getresgid(struct thread *, struct getresgid_args *);
-int	sys_kqueue(struct thread *, struct kqueue_args *);
-int	sys_kevent(struct thread *, struct kevent_args *);
-int	sys_extattr_set_fd(struct thread *, struct extattr_set_fd_args *);
-int	sys_extattr_get_fd(struct thread *, struct extattr_get_fd_args *);
-int	sys_extattr_delete_fd(struct thread *, struct extattr_delete_fd_args *);
-int	sys___setugid(struct thread *, struct __setugid_args *);
-int	sys_eaccess(struct thread *, struct eaccess_args *);
-int	sys_afs3_syscall(struct thread *, struct afs3_syscall_args *);
-int	sys_nmount(struct thread *, struct nmount_args *);
-int	sys___mac_get_proc(struct thread *, struct __mac_get_proc_args *);
-int	sys___mac_set_proc(struct thread *, struct __mac_set_proc_args *);
-int	sys___mac_get_fd(struct thread *, struct __mac_get_fd_args *);
-int	sys___mac_get_file(struct thread *, struct __mac_get_file_args *);
-int	sys___mac_set_fd(struct thread *, struct __mac_set_fd_args *);
-int	sys___mac_set_file(struct thread *, struct __mac_set_file_args *);
-int	sys_kenv(struct thread *, struct kenv_args *);
-int	sys_lchflags(struct thread *, struct lchflags_args *);
-int	sys_uuidgen(struct thread *, struct uuidgen_args *);
-int	sys_sendfile(struct thread *, struct sendfile_args *);
-int	sys_mac_syscall(struct thread *, struct mac_syscall_args *);
-int	sys_getfsstat(struct thread *, struct getfsstat_args *);
-int	sys_statfs(struct thread *, struct statfs_args *);
-int	sys_fstatfs(struct thread *, struct fstatfs_args *);
-int	sys_fhstatfs(struct thread *, struct fhstatfs_args *);
-int	sys_ksem_close(struct thread *, struct ksem_close_args *);
-int	sys_ksem_post(struct thread *, struct ksem_post_args *);
-int	sys_ksem_wait(struct thread *, struct ksem_wait_args *);
-int	sys_ksem_trywait(struct thread *, struct ksem_trywait_args *);
-int	sys_ksem_init(struct thread *, struct ksem_init_args *);
-int	sys_ksem_open(struct thread *, struct ksem_open_args *);
-int	sys_ksem_unlink(struct thread *, struct ksem_unlink_args *);
-int	sys_ksem_getvalue(struct thread *, struct ksem_getvalue_args *);
-int	sys_ksem_destroy(struct thread *, struct ksem_destroy_args *);
-int	sys___mac_get_pid(struct thread *, struct __mac_get_pid_args *);
-int	sys___mac_get_link(struct thread *, struct __mac_get_link_args *);
-int	sys___mac_set_link(struct thread *, struct __mac_set_link_args *);
-int	sys_extattr_set_link(struct thread *, struct extattr_set_link_args *);
-int	sys_extattr_get_link(struct thread *, struct extattr_get_link_args *);
-int	sys_extattr_delete_link(struct thread *, struct extattr_delete_link_args *);
-int	sys___mac_execve(struct thread *, struct __mac_execve_args *);
-int	sys_sigaction(struct thread *, struct sigaction_args *);
-int	sys_sigreturn(struct thread *, struct sigreturn_args *);
-int	sys_getcontext(struct thread *, struct getcontext_args *);
-int	sys_setcontext(struct thread *, struct setcontext_args *);
-int	sys_swapcontext(struct thread *, struct swapcontext_args *);
-int	sys_swapoff(struct thread *, struct swapoff_args *);
-int	sys___acl_get_link(struct thread *, struct __acl_get_link_args *);
-int	sys___acl_set_link(struct thread *, struct __acl_set_link_args *);
-int	sys___acl_delete_link(struct thread *, struct __acl_delete_link_args *);
-int	sys___acl_aclcheck_link(struct thread *, struct __acl_aclcheck_link_args *);
-int	sys_sigwait(struct thread *, struct sigwait_args *);
-int	sys_thr_create(struct thread *, struct thr_create_args *);
-int	sys_thr_exit(struct thread *, struct thr_exit_args *);
-int	sys_thr_self(struct thread *, struct thr_self_args *);
-int	sys_thr_kill(struct thread *, struct thr_kill_args *);
-int	sys__umtx_lock(struct thread *, struct _umtx_lock_args *);
-int	sys__umtx_unlock(struct thread *, struct _umtx_unlock_args *);
-int	sys_jail_attach(struct thread *, struct jail_attach_args *);
-int	sys_extattr_list_fd(struct thread *, struct extattr_list_fd_args *);
-int	sys_extattr_list_file(struct thread *, struct extattr_list_file_args *);
-int	sys_extattr_list_link(struct thread *, struct extattr_list_link_args *);
-int	sys_ksem_timedwait(struct thread *, struct ksem_timedwait_args *);
-int	sys_thr_suspend(struct thread *, struct thr_suspend_args *);
-int	sys_thr_wake(struct thread *, struct thr_wake_args *);
-int	sys_kldunloadf(struct thread *, struct kldunloadf_args *);
-int	sys_audit(struct thread *, struct audit_args *);
-int	sys_auditon(struct thread *, struct auditon_args *);
-int	sys_getauid(struct thread *, struct getauid_args *);
-int	sys_setauid(struct thread *, struct setauid_args *);
-int	sys_getaudit(struct thread *, struct getaudit_args *);
-int	sys_setaudit(struct thread *, struct setaudit_args *);
-int	sys_getaudit_addr(struct thread *, struct getaudit_addr_args *);
-int	sys_setaudit_addr(struct thread *, struct setaudit_addr_args *);
-int	sys_auditctl(struct thread *, struct auditctl_args *);
-int	sys__umtx_op(struct thread *, struct _umtx_op_args *);
-int	sys_thr_new(struct thread *, struct thr_new_args *);
-int	sys_sigqueue(struct thread *, struct sigqueue_args *);
-int	sys_kmq_open(struct thread *, struct kmq_open_args *);
-int	sys_kmq_setattr(struct thread *, struct kmq_setattr_args *);
-int	sys_kmq_timedreceive(struct thread *, struct kmq_timedreceive_args *);
-int	sys_kmq_timedsend(struct thread *, struct kmq_timedsend_args *);
-int	sys_kmq_notify(struct thread *, struct kmq_notify_args *);
-int	sys_kmq_unlink(struct thread *, struct kmq_unlink_args *);
-int	sys_abort2(struct thread *, struct abort2_args *);
-int	sys_thr_set_name(struct thread *, struct thr_set_name_args *);
-int	sys_aio_fsync(struct thread *, struct aio_fsync_args *);
-int	sys_rtprio_thread(struct thread *, struct rtprio_thread_args *);
-int	sys_sctp_peeloff(struct thread *, struct sctp_peeloff_args *);
-int	sys_sctp_generic_sendmsg(struct thread *, struct sctp_generic_sendmsg_args *);
-int	sys_sctp_generic_sendmsg_iov(struct thread *, struct sctp_generic_sendmsg_iov_args *);
-int	sys_sctp_generic_recvmsg(struct thread *, struct sctp_generic_recvmsg_args *);
-int	sys_pread(struct thread *, struct pread_args *);
-int	sys_pwrite(struct thread *, struct pwrite_args *);
-int	sys_mmap(struct thread *, struct mmap_args *);
-int	sys_lseek(struct thread *, struct lseek_args *);
-int	sys_truncate(struct thread *, struct truncate_args *);
-int	sys_ftruncate(struct thread *, struct ftruncate_args *);
-int	sys_thr_kill2(struct thread *, struct thr_kill2_args *);
-int	sys_shm_open(struct thread *, struct shm_open_args *);
-int	sys_shm_unlink(struct thread *, struct shm_unlink_args *);
-int	sys_cpuset(struct thread *, struct cpuset_args *);
-int	sys_cpuset_setid(struct thread *, struct cpuset_setid_args *);
-int	sys_cpuset_getid(struct thread *, struct cpuset_getid_args *);
-int	sys_cpuset_getaffinity(struct thread *, struct cpuset_getaffinity_args *);
-int	sys_cpuset_setaffinity(struct thread *, struct cpuset_setaffinity_args *);
-int	sys_faccessat(struct thread *, struct faccessat_args *);
-int	sys_fchmodat(struct thread *, struct fchmodat_args *);
-int	sys_fchownat(struct thread *, struct fchownat_args *);
-int	sys_fexecve(struct thread *, struct fexecve_args *);
-int	sys_fstatat(struct thread *, struct fstatat_args *);
-int	sys_futimesat(struct thread *, struct futimesat_args *);
-int	sys_linkat(struct thread *, struct linkat_args *);
-int	sys_mkdirat(struct thread *, struct mkdirat_args *);
-int	sys_mkfifoat(struct thread *, struct mkfifoat_args *);
-int	sys_mknodat(struct thread *, struct mknodat_args *);
-int	sys_openat(struct thread *, struct openat_args *);
-int	sys_readlinkat(struct thread *, struct readlinkat_args *);
-int	sys_renameat(struct thread *, struct renameat_args *);
-int	sys_symlinkat(struct thread *, struct symlinkat_args *);
-int	sys_unlinkat(struct thread *, struct unlinkat_args *);
-int	sys_posix_openpt(struct thread *, struct posix_openpt_args *);
-int	sys_gssd_syscall(struct thread *, struct gssd_syscall_args *);
-int	sys_jail_get(struct thread *, struct jail_get_args *);
-int	sys_jail_set(struct thread *, struct jail_set_args *);
-int	sys_jail_remove(struct thread *, struct jail_remove_args *);
-int	sys_closefrom(struct thread *, struct closefrom_args *);
-int	sys___semctl(struct thread *, struct __semctl_args *);
-int	sys_msgctl(struct thread *, struct msgctl_args *);
-int	sys_shmctl(struct thread *, struct shmctl_args *);
-int	sys_lpathconf(struct thread *, struct lpathconf_args *);
-int	sys___cap_rights_get(struct thread *, struct __cap_rights_get_args *);
-int	sys_cap_enter(struct thread *, struct cap_enter_args *);
-int	sys_cap_getmode(struct thread *, struct cap_getmode_args *);
-int	sys_pdfork(struct thread *, struct pdfork_args *);
-int	sys_pdkill(struct thread *, struct pdkill_args *);
-int	sys_pdgetpid(struct thread *, struct pdgetpid_args *);
-int	sys_pselect(struct thread *, struct pselect_args *);
-int	sys_getloginclass(struct thread *, struct getloginclass_args *);
-int	sys_setloginclass(struct thread *, struct setloginclass_args *);
-int	sys_rctl_get_racct(struct thread *, struct rctl_get_racct_args *);
-int	sys_rctl_get_rules(struct thread *, struct rctl_get_rules_args *);
-int	sys_rctl_get_limits(struct thread *, struct rctl_get_limits_args *);
-int	sys_rctl_add_rule(struct thread *, struct rctl_add_rule_args *);
-int	sys_rctl_remove_rule(struct thread *, struct rctl_remove_rule_args *);
-int	sys_posix_fallocate(struct thread *, struct posix_fallocate_args *);
-int	sys_posix_fadvise(struct thread *, struct posix_fadvise_args *);
-int	sys_wait6(struct thread *, struct wait6_args *);
-int	sys_cap_rights_limit(struct thread *, struct cap_rights_limit_args *);
-int	sys_cap_ioctls_limit(struct thread *, struct cap_ioctls_limit_args *);
-int	sys_cap_ioctls_get(struct thread *, struct cap_ioctls_get_args *);
-int	sys_cap_fcntls_limit(struct thread *, struct cap_fcntls_limit_args *);
-int	sys_cap_fcntls_get(struct thread *, struct cap_fcntls_get_args *);
-int	sys_bindat(struct thread *, struct bindat_args *);
-int	sys_connectat(struct thread *, struct connectat_args *);
-int	sys_chflagsat(struct thread *, struct chflagsat_args *);
-int	sys_accept4(struct thread *, struct accept4_args *);
-int	sys_pipe2(struct thread *, struct pipe2_args *);
-int	sys_aio_mlock(struct thread *, struct aio_mlock_args *);
-int	sys_procctl(struct thread *, struct procctl_args *);
-int	sys_ppoll(struct thread *, struct ppoll_args *);
-
-#ifdef COMPAT_43
-
-struct ocreat_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)];
-};
-struct olseek_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char offset_l_[PADL_(long)]; long offset; char offset_r_[PADR_(long)];
-	char whence_l_[PADL_(int)]; int whence; char whence_r_[PADR_(int)];
-};
-struct ostat_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char ub_l_[PADL_(struct ostat *)]; struct ostat * ub; char ub_r_[PADR_(struct ostat *)];
-};
-struct olstat_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char ub_l_[PADL_(struct ostat *)]; struct ostat * ub; char ub_r_[PADR_(struct ostat *)];
-};
-struct osigaction_args {
-	char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
-	char nsa_l_[PADL_(struct osigaction *)]; struct osigaction * nsa; char nsa_r_[PADR_(struct osigaction *)];
-	char osa_l_[PADL_(struct osigaction *)]; struct osigaction * osa; char osa_r_[PADR_(struct osigaction *)];
-};
-struct osigprocmask_args {
-	char how_l_[PADL_(int)]; int how; char how_r_[PADR_(int)];
-	char mask_l_[PADL_(osigset_t)]; osigset_t mask; char mask_r_[PADR_(osigset_t)];
-};
-struct ofstat_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char sb_l_[PADL_(struct ostat *)]; struct ostat * sb; char sb_r_[PADR_(struct ostat *)];
-};
-struct getkerninfo_args {
-	char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
-	char where_l_[PADL_(char *)]; char * where; char where_r_[PADR_(char *)];
-	char size_l_[PADL_(size_t *)]; size_t * size; char size_r_[PADR_(size_t *)];
-	char arg_l_[PADL_(int)]; int arg; char arg_r_[PADR_(int)];
-};
-struct ommap_args {
-	char addr_l_[PADL_(void *)]; void * addr; char addr_r_[PADR_(void *)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
-	char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char pos_l_[PADL_(long)]; long pos; char pos_r_[PADR_(long)];
-};
-struct gethostname_args {
-	char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)];
-	char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)];
-};
-struct sethostname_args {
-	char hostname_l_[PADL_(char *)]; char * hostname; char hostname_r_[PADR_(char *)];
-	char len_l_[PADL_(u_int)]; u_int len; char len_r_[PADR_(u_int)];
-};
-struct osend_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct orecv_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char buf_l_[PADL_(caddr_t)]; caddr_t buf; char buf_r_[PADR_(caddr_t)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct osigreturn_args {
-	char sigcntxp_l_[PADL_(struct osigcontext *)]; struct osigcontext * sigcntxp; char sigcntxp_r_[PADR_(struct osigcontext *)];
-};
-struct osigvec_args {
-	char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
-	char nsv_l_[PADL_(struct sigvec *)]; struct sigvec * nsv; char nsv_r_[PADR_(struct sigvec *)];
-	char osv_l_[PADL_(struct sigvec *)]; struct sigvec * osv; char osv_r_[PADR_(struct sigvec *)];
-};
-struct osigblock_args {
-	char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)];
-};
-struct osigsetmask_args {
-	char mask_l_[PADL_(int)]; int mask; char mask_r_[PADR_(int)];
-};
-struct osigsuspend_args {
-	char mask_l_[PADL_(osigset_t)]; osigset_t mask; char mask_r_[PADR_(osigset_t)];
-};
-struct osigstack_args {
-	char nss_l_[PADL_(struct sigstack *)]; struct sigstack * nss; char nss_r_[PADR_(struct sigstack *)];
-	char oss_l_[PADL_(struct sigstack *)]; struct sigstack * oss; char oss_r_[PADR_(struct sigstack *)];
-};
-struct orecvmsg_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char msg_l_[PADL_(struct omsghdr *)]; struct omsghdr * msg; char msg_r_[PADR_(struct omsghdr *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct osendmsg_args {
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char msg_l_[PADL_(caddr_t)]; caddr_t msg; char msg_r_[PADR_(caddr_t)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct otruncate_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)];
-};
-struct oftruncate_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char length_l_[PADL_(long)]; long length; char length_r_[PADR_(long)];
-};
-struct ogetpeername_args {
-	char fdes_l_[PADL_(int)]; int fdes; char fdes_r_[PADR_(int)];
-	char asa_l_[PADL_(caddr_t)]; caddr_t asa; char asa_r_[PADR_(caddr_t)];
-	char alen_l_[PADL_(int *)]; int * alen; char alen_r_[PADR_(int *)];
-};
-struct osethostid_args {
-	char hostid_l_[PADL_(long)]; long hostid; char hostid_r_[PADR_(long)];
-};
-struct ogetrlimit_args {
-	char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
-	char rlp_l_[PADL_(struct orlimit *)]; struct orlimit * rlp; char rlp_r_[PADR_(struct orlimit *)];
-};
-struct osetrlimit_args {
-	char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
-	char rlp_l_[PADL_(struct orlimit *)]; struct orlimit * rlp; char rlp_r_[PADR_(struct orlimit *)];
-};
-struct okillpg_args {
-	char pgid_l_[PADL_(int)]; int pgid; char pgid_r_[PADR_(int)];
-	char signum_l_[PADL_(int)]; int signum; char signum_r_[PADR_(int)];
-};
-struct ogetdirentries_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)];
-	char count_l_[PADL_(u_int)]; u_int count; char count_r_[PADR_(u_int)];
-	char basep_l_[PADL_(long *)]; long * basep; char basep_r_[PADR_(long *)];
-};
-int	ocreat(struct thread *, struct ocreat_args *);
-int	olseek(struct thread *, struct olseek_args *);
-int	ostat(struct thread *, struct ostat_args *);
-int	olstat(struct thread *, struct olstat_args *);
-int	osigaction(struct thread *, struct osigaction_args *);
-int	osigprocmask(struct thread *, struct osigprocmask_args *);
-int	osigpending(struct thread *, struct osigpending_args *);
-int	ofstat(struct thread *, struct ofstat_args *);
-int	ogetkerninfo(struct thread *, struct getkerninfo_args *);
-int	ogetpagesize(struct thread *, struct getpagesize_args *);
-int	ommap(struct thread *, struct ommap_args *);
-int	owait(struct thread *, struct owait_args *);
-int	ogethostname(struct thread *, struct gethostname_args *);
-int	osethostname(struct thread *, struct sethostname_args *);
-int	oaccept(struct thread *, struct accept_args *);
-int	osend(struct thread *, struct osend_args *);
-int	orecv(struct thread *, struct orecv_args *);
-int	osigreturn(struct thread *, struct osigreturn_args *);
-int	osigvec(struct thread *, struct osigvec_args *);
-int	osigblock(struct thread *, struct osigblock_args *);
-int	osigsetmask(struct thread *, struct osigsetmask_args *);
-int	osigsuspend(struct thread *, struct osigsuspend_args *);
-int	osigstack(struct thread *, struct osigstack_args *);
-int	orecvmsg(struct thread *, struct orecvmsg_args *);
-int	osendmsg(struct thread *, struct osendmsg_args *);
-int	orecvfrom(struct thread *, struct recvfrom_args *);
-int	otruncate(struct thread *, struct otruncate_args *);
-int	oftruncate(struct thread *, struct oftruncate_args *);
-int	ogetpeername(struct thread *, struct ogetpeername_args *);
-int	ogethostid(struct thread *, struct ogethostid_args *);
-int	osethostid(struct thread *, struct osethostid_args *);
-int	ogetrlimit(struct thread *, struct ogetrlimit_args *);
-int	osetrlimit(struct thread *, struct osetrlimit_args *);
-int	okillpg(struct thread *, struct okillpg_args *);
-int	oquota(struct thread *, struct oquota_args *);
-int	ogetsockname(struct thread *, struct getsockname_args *);
-int	ogetdirentries(struct thread *, struct ogetdirentries_args *);
-
-#endif /* COMPAT_43 */
-
-
-#ifdef COMPAT_FREEBSD4
-
-struct freebsd4_getfsstat_args {
-	char buf_l_[PADL_(struct ostatfs *)]; struct ostatfs * buf; char buf_r_[PADR_(struct ostatfs *)];
-	char bufsize_l_[PADL_(long)]; long bufsize; char bufsize_r_[PADR_(long)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct freebsd4_statfs_args {
-	char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)];
-	char buf_l_[PADL_(struct ostatfs *)]; struct ostatfs * buf; char buf_r_[PADR_(struct ostatfs *)];
-};
-struct freebsd4_fstatfs_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char buf_l_[PADL_(struct ostatfs *)]; struct ostatfs * buf; char buf_r_[PADR_(struct ostatfs *)];
-};
-struct freebsd4_getdomainname_args {
-	char domainname_l_[PADL_(char *)]; char * domainname; char domainname_r_[PADR_(char *)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
-};
-struct freebsd4_setdomainname_args {
-	char domainname_l_[PADL_(char *)]; char * domainname; char domainname_r_[PADR_(char *)];
-	char len_l_[PADL_(int)]; int len; char len_r_[PADR_(int)];
-};
-struct freebsd4_uname_args {
-	char name_l_[PADL_(struct utsname *)]; struct utsname * name; char name_r_[PADR_(struct utsname *)];
-};
-struct freebsd4_fhstatfs_args {
-	char u_fhp_l_[PADL_(const struct fhandle *)]; const struct fhandle * u_fhp; char u_fhp_r_[PADR_(const struct fhandle *)];
-	char buf_l_[PADL_(struct ostatfs *)]; struct ostatfs * buf; char buf_r_[PADR_(struct ostatfs *)];
-};
-struct freebsd4_sendfile_args {
-	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
-	char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
-	char offset_l_[PADL_(off_t)]; off_t offset; char offset_r_[PADR_(off_t)];
-	char nbytes_l_[PADL_(size_t)]; size_t nbytes; char nbytes_r_[PADR_(size_t)];
-	char hdtr_l_[PADL_(struct sf_hdtr *)]; struct sf_hdtr * hdtr; char hdtr_r_[PADR_(struct sf_hdtr *)];
-	char sbytes_l_[PADL_(off_t *)]; off_t * sbytes; char sbytes_r_[PADR_(off_t *)];
-	char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)];
-};
-struct freebsd4_sigaction_args {
-	char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)];
-	char act_l_[PADL_(const struct sigaction *)]; const struct sigaction * act; char act_r_[PADR_(const struct sigaction *)];
-	char oact_l_[PADL_(struct sigaction *)]; struct sigaction * oact; char oact_r_[PADR_(struct sigaction *)];
-};
-struct freebsd4_sigreturn_args {
-	char sigcntxp_l_[PADL_(const struct ucontext4 *)]; const struct ucontext4 * sigcntxp; char sigcntxp_r_[PADR_(const struct ucontext4 *)];
-};
-int	freebsd4_getfsstat(struct thread *, struct freebsd4_getfsstat_args *);
-int	freebsd4_statfs(struct thread *, struct freebsd4_statfs_args *);
-int	freebsd4_fstatfs(struct thread *, struct freebsd4_fstatfs_args *);
-int	freebsd4_getdomainname(struct thread *, struct freebsd4_getdomainname_args *);
-int	freebsd4_setdomainname(struct thread *, struct freebsd4_setdomainname_args *);
-int	freebsd4_uname(struct thread *, struct freebsd4_uname_args *);
-int	freebsd4_fhstatfs(struct thread *, struct freebsd4_fhstatfs_args *);
-int	freebsd4_sendfile(struct thread *, struct freebsd4_sendfile_args *);
-int	freebsd4_sigaction(struct thread *, struct freebsd4_sigaction_args *);
-int	freebsd4_sigreturn(struct thread *, struct freebsd4_sigreturn_args *);
-
-#endif /* COMPAT_FREEBSD4 */
-
-
-#ifdef COMPAT_FREEBSD6
-
-
-#endif /* COMPAT_FREEBSD6 */
-
-
-#ifdef COMPAT_FREEBSD7
-
-struct freebsd7___semctl_args {
-	char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)];
-	char semnum_l_[PADL_(int)]; int semnum; char semnum_r_[PADR_(int)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char arg_l_[PADL_(union semun_old *)]; union semun_old * arg; char arg_r_[PADR_(union semun_old *)];
-};
-struct freebsd7_msgctl_args {
-	char msqid_l_[PADL_(int)]; int msqid; char msqid_r_[PADR_(int)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char buf_l_[PADL_(struct msqid_ds_old *)]; struct msqid_ds_old * buf; char buf_r_[PADR_(struct msqid_ds_old *)];
-};
-struct freebsd7_shmctl_args {
-	char shmid_l_[PADL_(int)]; int shmid; char shmid_r_[PADR_(int)];
-	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char buf_l_[PADL_(struct shmid_ds_old *)]; struct shmid_ds_old * buf; char buf_r_[PADR_(struct shmid_ds_old *)];
-};
-int	freebsd7___semctl(struct thread *, struct freebsd7___semctl_args *);
-int	freebsd7_msgctl(struct thread *, struct freebsd7_msgctl_args *);
-int	freebsd7_shmctl(struct thread *, struct freebsd7_shmctl_args *);
-
-#endif /* COMPAT_FREEBSD7 */
-
-#define	SYS_AUE_syscall	AUE_NULL
-#define	SYS_AUE_exit	AUE_EXIT
-#define	SYS_AUE_fork	AUE_FORK
-#define	SYS_AUE_read	AUE_NULL
-#define	SYS_AUE_write	AUE_NULL
-#define	SYS_AUE_open	AUE_OPEN_RWTC
-#define	SYS_AUE_close	AUE_CLOSE
-#define	SYS_AUE_wait4	AUE_WAIT4
-#define	SYS_AUE_ocreat	AUE_CREAT
-#define	SYS_AUE_link	AUE_LINK
-#define	SYS_AUE_unlink	AUE_UNLINK
-#define	SYS_AUE_chdir	AUE_CHDIR
-#define	SYS_AUE_fchdir	AUE_FCHDIR
-#define	SYS_AUE_mknod	AUE_MKNOD
-#define	SYS_AUE_chmod	AUE_CHMOD
-#define	SYS_AUE_chown	AUE_CHOWN
-#define	SYS_AUE_break	AUE_NULL
-#define	SYS_AUE_freebsd4_getfsstat	AUE_GETFSSTAT
-#define	SYS_AUE_olseek	AUE_LSEEK
-#define	SYS_AUE_getpid	AUE_GETPID
-#define	SYS_AUE_mount	AUE_MOUNT
-#define	SYS_AUE_unmount	AUE_UMOUNT
-#define	SYS_AUE_setuid	AUE_SETUID
-#define	SYS_AUE_getuid	AUE_GETUID
-#define	SYS_AUE_geteuid	AUE_GETEUID
-#define	SYS_AUE_ptrace	AUE_PTRACE
-#define	SYS_AUE_recvmsg	AUE_RECVMSG
-#define	SYS_AUE_sendmsg	AUE_SENDMSG
-#define	SYS_AUE_recvfrom	AUE_RECVFROM
-#define	SYS_AUE_accept	AUE_ACCEPT
-#define	SYS_AUE_getpeername	AUE_GETPEERNAME
-#define	SYS_AUE_getsockname	AUE_GETSOCKNAME
-#define	SYS_AUE_access	AUE_ACCESS
-#define	SYS_AUE_chflags	AUE_CHFLAGS
-#define	SYS_AUE_fchflags	AUE_FCHFLAGS
-#define	SYS_AUE_sync	AUE_SYNC
-#define	SYS_AUE_kill	AUE_KILL
-#define	SYS_AUE_ostat	AUE_STAT
-#define	SYS_AUE_getppid	AUE_GETPPID
-#define	SYS_AUE_olstat	AUE_LSTAT
-#define	SYS_AUE_dup	AUE_DUP
-#define	SYS_AUE_pipe	AUE_PIPE
-#define	SYS_AUE_getegid	AUE_GETEGID
-#define	SYS_AUE_profil	AUE_PROFILE
-#define	SYS_AUE_ktrace	AUE_KTRACE
-#define	SYS_AUE_osigaction	AUE_SIGACTION
-#define	SYS_AUE_getgid	AUE_GETGID
-#define	SYS_AUE_osigprocmask	AUE_SIGPROCMASK
-#define	SYS_AUE_getlogin	AUE_GETLOGIN
-#define	SYS_AUE_setlogin	AUE_SETLOGIN
-#define	SYS_AUE_acct	AUE_ACCT
-#define	SYS_AUE_osigpending	AUE_SIGPENDING
-#define	SYS_AUE_sigaltstack	AUE_SIGALTSTACK
-#define	SYS_AUE_ioctl	AUE_IOCTL
-#define	SYS_AUE_reboot	AUE_REBOOT
-#define	SYS_AUE_revoke	AUE_REVOKE
-#define	SYS_AUE_symlink	AUE_SYMLINK
-#define	SYS_AUE_readlink	AUE_READLINK
-#define	SYS_AUE_execve	AUE_EXECVE
-#define	SYS_AUE_umask	AUE_UMASK
-#define	SYS_AUE_chroot	AUE_CHROOT
-#define	SYS_AUE_ofstat	AUE_FSTAT
-#define	SYS_AUE_ogetkerninfo	AUE_NULL
-#define	SYS_AUE_ogetpagesize	AUE_NULL
-#define	SYS_AUE_msync	AUE_MSYNC
-#define	SYS_AUE_vfork	AUE_VFORK
-#define	SYS_AUE_sbrk	AUE_SBRK
-#define	SYS_AUE_sstk	AUE_SSTK
-#define	SYS_AUE_ommap	AUE_MMAP
-#define	SYS_AUE_vadvise	AUE_O_VADVISE
-#define	SYS_AUE_munmap	AUE_MUNMAP
-#define	SYS_AUE_mprotect	AUE_MPROTECT
-#define	SYS_AUE_madvise	AUE_MADVISE
-#define	SYS_AUE_mincore	AUE_MINCORE
-#define	SYS_AUE_getgroups	AUE_GETGROUPS
-#define	SYS_AUE_setgroups	AUE_SETGROUPS
-#define	SYS_AUE_getpgrp	AUE_GETPGRP
-#define	SYS_AUE_setpgid	AUE_SETPGRP
-#define	SYS_AUE_setitimer	AUE_SETITIMER
-#define	SYS_AUE_owait	AUE_WAIT4
-#define	SYS_AUE_swapon	AUE_SWAPON
-#define	SYS_AUE_getitimer	AUE_GETITIMER
-#define	SYS_AUE_ogethostname	AUE_SYSCTL
-#define	SYS_AUE_osethostname	AUE_SYSCTL
-#define	SYS_AUE_getdtablesize	AUE_GETDTABLESIZE
-#define	SYS_AUE_dup2	AUE_DUP2
-#define	SYS_AUE_fcntl	AUE_FCNTL
-#define	SYS_AUE_select	AUE_SELECT
-#define	SYS_AUE_fsync	AUE_FSYNC
-#define	SYS_AUE_setpriority	AUE_SETPRIORITY
-#define	SYS_AUE_socket	AUE_SOCKET
-#define	SYS_AUE_connect	AUE_CONNECT
-#define	SYS_AUE_oaccept	AUE_ACCEPT
-#define	SYS_AUE_getpriority	AUE_GETPRIORITY
-#define	SYS_AUE_osend	AUE_SEND
-#define	SYS_AUE_orecv	AUE_RECV
-#define	SYS_AUE_osigreturn	AUE_SIGRETURN
-#define	SYS_AUE_bind	AUE_BIND
-#define	SYS_AUE_setsockopt	AUE_SETSOCKOPT
-#define	SYS_AUE_listen	AUE_LISTEN
-#define	SYS_AUE_osigvec	AUE_NULL
-#define	SYS_AUE_osigblock	AUE_NULL
-#define	SYS_AUE_osigsetmask	AUE_NULL
-#define	SYS_AUE_osigsuspend	AUE_NULL
-#define	SYS_AUE_osigstack	AUE_NULL
-#define	SYS_AUE_orecvmsg	AUE_RECVMSG
-#define	SYS_AUE_osendmsg	AUE_SENDMSG
-#define	SYS_AUE_gettimeofday	AUE_GETTIMEOFDAY
-#define	SYS_AUE_getrusage	AUE_GETRUSAGE
-#define	SYS_AUE_getsockopt	AUE_GETSOCKOPT
-#define	SYS_AUE_readv	AUE_READV
-#define	SYS_AUE_writev	AUE_WRITEV
-#define	SYS_AUE_settimeofday	AUE_SETTIMEOFDAY
-#define	SYS_AUE_fchown	AUE_FCHOWN
-#define	SYS_AUE_fchmod	AUE_FCHMOD
-#define	SYS_AUE_orecvfrom	AUE_RECVFROM
-#define	SYS_AUE_setreuid	AUE_SETREUID
-#define	SYS_AUE_setregid	AUE_SETREGID
-#define	SYS_AUE_rename	AUE_RENAME
-#define	SYS_AUE_otruncate	AUE_TRUNCATE
-#define	SYS_AUE_oftruncate	AUE_FTRUNCATE
-#define	SYS_AUE_flock	AUE_FLOCK
-#define	SYS_AUE_mkfifo	AUE_MKFIFO
-#define	SYS_AUE_sendto	AUE_SENDTO
-#define	SYS_AUE_shutdown	AUE_SHUTDOWN
-#define	SYS_AUE_socketpair	AUE_SOCKETPAIR
-#define	SYS_AUE_mkdir	AUE_MKDIR
-#define	SYS_AUE_rmdir	AUE_RMDIR
-#define	SYS_AUE_utimes	AUE_UTIMES
-#define	SYS_AUE_adjtime	AUE_ADJTIME
-#define	SYS_AUE_ogetpeername	AUE_GETPEERNAME
-#define	SYS_AUE_ogethostid	AUE_SYSCTL
-#define	SYS_AUE_osethostid	AUE_SYSCTL
-#define	SYS_AUE_ogetrlimit	AUE_GETRLIMIT
-#define	SYS_AUE_osetrlimit	AUE_SETRLIMIT
-#define	SYS_AUE_okillpg	AUE_KILLPG
-#define	SYS_AUE_setsid	AUE_SETSID
-#define	SYS_AUE_quotactl	AUE_QUOTACTL
-#define	SYS_AUE_oquota	AUE_O_QUOTA
-#define	SYS_AUE_ogetsockname	AUE_GETSOCKNAME
-#define	SYS_AUE_nlm_syscall	AUE_NULL
-#define	SYS_AUE_nfssvc	AUE_NFS_SVC
-#define	SYS_AUE_ogetdirentries	AUE_GETDIRENTRIES
-#define	SYS_AUE_freebsd4_statfs	AUE_STATFS
-#define	SYS_AUE_freebsd4_fstatfs	AUE_FSTATFS
-#define	SYS_AUE_lgetfh	AUE_LGETFH
-#define	SYS_AUE_getfh	AUE_NFS_GETFH
-#define	SYS_AUE_freebsd4_getdomainname	AUE_SYSCTL
-#define	SYS_AUE_freebsd4_setdomainname	AUE_SYSCTL
-#define	SYS_AUE_freebsd4_uname	AUE_NULL
-#define	SYS_AUE_sysarch	AUE_SYSARCH
-#define	SYS_AUE_rtprio	AUE_RTPRIO
-#define	SYS_AUE_semsys	AUE_SEMSYS
-#define	SYS_AUE_msgsys	AUE_MSGSYS
-#define	SYS_AUE_shmsys	AUE_SHMSYS
-#define	SYS_AUE_freebsd6_pread	AUE_PREAD
-#define	SYS_AUE_freebsd6_pwrite	AUE_PWRITE
-#define	SYS_AUE_setfib	AUE_NULL
-#define	SYS_AUE_ntp_adjtime	AUE_NTP_ADJTIME
-#define	SYS_AUE_setgid	AUE_SETGID
-#define	SYS_AUE_setegid	AUE_SETEGID
-#define	SYS_AUE_seteuid	AUE_SETEUID
-#define	SYS_AUE_stat	AUE_STAT
-#define	SYS_AUE_fstat	AUE_FSTAT
-#define	SYS_AUE_lstat	AUE_LSTAT
-#define	SYS_AUE_pathconf	AUE_PATHCONF
-#define	SYS_AUE_fpathconf	AUE_FPATHCONF
-#define	SYS_AUE_getrlimit	AUE_GETRLIMIT
-#define	SYS_AUE_setrlimit	AUE_SETRLIMIT
-#define	SYS_AUE_getdirentries	AUE_GETDIRENTRIES
-#define	SYS_AUE_freebsd6_mmap	AUE_MMAP
-#define	SYS_AUE_freebsd6_lseek	AUE_LSEEK
-#define	SYS_AUE_freebsd6_truncate	AUE_TRUNCATE
-#define	SYS_AUE_freebsd6_ftruncate	AUE_FTRUNCATE
-#define	SYS_AUE___sysctl	AUE_SYSCTL
-#define	SYS_AUE_mlock	AUE_MLOCK
-#define	SYS_AUE_munlock	AUE_MUNLOCK
-#define	SYS_AUE_undelete	AUE_UNDELETE
-#define	SYS_AUE_futimes	AUE_FUTIMES
-#define	SYS_AUE_getpgid	AUE_GETPGID
-#define	SYS_AUE_poll	AUE_POLL
-#define	SYS_AUE_freebsd7___semctl	AUE_SEMCTL
-#define	SYS_AUE_semget	AUE_SEMGET
-#define	SYS_AUE_semop	AUE_SEMOP
-#define	SYS_AUE_freebsd7_msgctl	AUE_MSGCTL
-#define	SYS_AUE_msgget	AUE_MSGGET
-#define	SYS_AUE_msgsnd	AUE_MSGSND
-#define	SYS_AUE_msgrcv	AUE_MSGRCV
-#define	SYS_AUE_shmat	AUE_SHMAT
-#define	SYS_AUE_freebsd7_shmctl	AUE_SHMCTL
-#define	SYS_AUE_shmdt	AUE_SHMDT
-#define	SYS_AUE_shmget	AUE_SHMGET
-#define	SYS_AUE_clock_gettime	AUE_NULL
-#define	SYS_AUE_clock_settime	AUE_CLOCK_SETTIME
-#define	SYS_AUE_clock_getres	AUE_NULL
-#define	SYS_AUE_ktimer_create	AUE_NULL
-#define	SYS_AUE_ktimer_delete	AUE_NULL
-#define	SYS_AUE_ktimer_settime	AUE_NULL
-#define	SYS_AUE_ktimer_gettime	AUE_NULL
-#define	SYS_AUE_ktimer_getoverrun	AUE_NULL
-#define	SYS_AUE_nanosleep	AUE_NULL
-#define	SYS_AUE_ffclock_getcounter	AUE_NULL
-#define	SYS_AUE_ffclock_setestimate	AUE_NULL
-#define	SYS_AUE_ffclock_getestimate	AUE_NULL
-#define	SYS_AUE_clock_getcpuclockid2	AUE_NULL
-#define	SYS_AUE_ntp_gettime	AUE_NULL
-#define	SYS_AUE_minherit	AUE_MINHERIT
-#define	SYS_AUE_rfork	AUE_RFORK
-#define	SYS_AUE_openbsd_poll	AUE_POLL
-#define	SYS_AUE_issetugid	AUE_ISSETUGID
-#define	SYS_AUE_lchown	AUE_LCHOWN
-#define	SYS_AUE_aio_read	AUE_NULL
-#define	SYS_AUE_aio_write	AUE_NULL
-#define	SYS_AUE_lio_listio	AUE_NULL
-#define	SYS_AUE_getdents	AUE_O_GETDENTS
-#define	SYS_AUE_lchmod	AUE_LCHMOD
-#define	SYS_AUE_lutimes	AUE_LUTIMES
-#define	SYS_AUE_nstat	AUE_STAT
-#define	SYS_AUE_nfstat	AUE_FSTAT
-#define	SYS_AUE_nlstat	AUE_LSTAT
-#define	SYS_AUE_preadv	AUE_PREADV
-#define	SYS_AUE_pwritev	AUE_PWRITEV
-#define	SYS_AUE_freebsd4_fhstatfs	AUE_FHSTATFS
-#define	SYS_AUE_fhopen	AUE_FHOPEN
-#define	SYS_AUE_fhstat	AUE_FHSTAT
-#define	SYS_AUE_modnext	AUE_NULL
-#define	SYS_AUE_modstat	AUE_NULL
-#define	SYS_AUE_modfnext	AUE_NULL
-#define	SYS_AUE_modfind	AUE_NULL
-#define	SYS_AUE_kldload	AUE_MODLOAD
-#define	SYS_AUE_kldunload	AUE_MODUNLOAD
-#define	SYS_AUE_kldfind	AUE_NULL
-#define	SYS_AUE_kldnext	AUE_NULL
-#define	SYS_AUE_kldstat	AUE_NULL
-#define	SYS_AUE_kldfirstmod	AUE_NULL
-#define	SYS_AUE_getsid	AUE_GETSID
-#define	SYS_AUE_setresuid	AUE_SETRESUID
-#define	SYS_AUE_setresgid	AUE_SETRESGID
-#define	SYS_AUE_aio_return	AUE_NULL
-#define	SYS_AUE_aio_suspend	AUE_NULL
-#define	SYS_AUE_aio_cancel	AUE_NULL
-#define	SYS_AUE_aio_error	AUE_NULL
-#define	SYS_AUE_oaio_read	AUE_NULL
-#define	SYS_AUE_oaio_write	AUE_NULL
-#define	SYS_AUE_olio_listio	AUE_NULL
-#define	SYS_AUE_yield	AUE_NULL
-#define	SYS_AUE_mlockall	AUE_MLOCKALL
-#define	SYS_AUE_munlockall	AUE_MUNLOCKALL
-#define	SYS_AUE___getcwd	AUE_GETCWD
-#define	SYS_AUE_sched_setparam	AUE_NULL
-#define	SYS_AUE_sched_getparam	AUE_NULL
-#define	SYS_AUE_sched_setscheduler	AUE_NULL
-#define	SYS_AUE_sched_getscheduler	AUE_NULL
-#define	SYS_AUE_sched_yield	AUE_NULL
-#define	SYS_AUE_sched_get_priority_max	AUE_NULL
-#define	SYS_AUE_sched_get_priority_min	AUE_NULL
-#define	SYS_AUE_sched_rr_get_interval	AUE_NULL
-#define	SYS_AUE_utrace	AUE_NULL
-#define	SYS_AUE_freebsd4_sendfile	AUE_SENDFILE
-#define	SYS_AUE_kldsym	AUE_NULL
-#define	SYS_AUE_jail	AUE_JAIL
-#define	SYS_AUE_nnpfs_syscall	AUE_NULL
-#define	SYS_AUE_sigprocmask	AUE_SIGPROCMASK
-#define	SYS_AUE_sigsuspend	AUE_SIGSUSPEND
-#define	SYS_AUE_freebsd4_sigaction	AUE_SIGACTION
-#define	SYS_AUE_sigpending	AUE_SIGPENDING
-#define	SYS_AUE_freebsd4_sigreturn	AUE_SIGRETURN
-#define	SYS_AUE_sigtimedwait	AUE_SIGWAIT
-#define	SYS_AUE_sigwaitinfo	AUE_NULL
-#define	SYS_AUE___acl_get_file	AUE_NULL
-#define	SYS_AUE___acl_set_file	AUE_NULL
-#define	SYS_AUE___acl_get_fd	AUE_NULL
-#define	SYS_AUE___acl_set_fd	AUE_NULL
-#define	SYS_AUE___acl_delete_file	AUE_NULL
-#define	SYS_AUE___acl_delete_fd	AUE_NULL
-#define	SYS_AUE___acl_aclcheck_file	AUE_NULL
-#define	SYS_AUE___acl_aclcheck_fd	AUE_NULL
-#define	SYS_AUE_extattrctl	AUE_EXTATTRCTL
-#define	SYS_AUE_extattr_set_file	AUE_EXTATTR_SET_FILE
-#define	SYS_AUE_extattr_get_file	AUE_EXTATTR_GET_FILE
-#define	SYS_AUE_extattr_delete_file	AUE_EXTATTR_DELETE_FILE
-#define	SYS_AUE_aio_waitcomplete	AUE_NULL
-#define	SYS_AUE_getresuid	AUE_GETRESUID
-#define	SYS_AUE_getresgid	AUE_GETRESGID
-#define	SYS_AUE_kqueue	AUE_KQUEUE
-#define	SYS_AUE_kevent	AUE_NULL
-#define	SYS_AUE_extattr_set_fd	AUE_EXTATTR_SET_FD
-#define	SYS_AUE_extattr_get_fd	AUE_EXTATTR_GET_FD
-#define	SYS_AUE_extattr_delete_fd	AUE_EXTATTR_DELETE_FD
-#define	SYS_AUE___setugid	AUE_NULL
-#define	SYS_AUE_eaccess	AUE_EACCESS
-#define	SYS_AUE_afs3_syscall	AUE_NULL
-#define	SYS_AUE_nmount	AUE_NMOUNT
-#define	SYS_AUE___mac_get_proc	AUE_NULL
-#define	SYS_AUE___mac_set_proc	AUE_NULL
-#define	SYS_AUE___mac_get_fd	AUE_NULL
-#define	SYS_AUE___mac_get_file	AUE_NULL
-#define	SYS_AUE___mac_set_fd	AUE_NULL
-#define	SYS_AUE___mac_set_file	AUE_NULL
-#define	SYS_AUE_kenv	AUE_NULL
-#define	SYS_AUE_lchflags	AUE_LCHFLAGS
-#define	SYS_AUE_uuidgen	AUE_NULL
-#define	SYS_AUE_sendfile	AUE_SENDFILE
-#define	SYS_AUE_mac_syscall	AUE_NULL
-#define	SYS_AUE_getfsstat	AUE_GETFSSTAT
-#define	SYS_AUE_statfs	AUE_STATFS
-#define	SYS_AUE_fstatfs	AUE_FSTATFS
-#define	SYS_AUE_fhstatfs	AUE_FHSTATFS
-#define	SYS_AUE_ksem_close	AUE_NULL
-#define	SYS_AUE_ksem_post	AUE_NULL
-#define	SYS_AUE_ksem_wait	AUE_NULL
-#define	SYS_AUE_ksem_trywait	AUE_NULL
-#define	SYS_AUE_ksem_init	AUE_NULL
-#define	SYS_AUE_ksem_open	AUE_NULL
-#define	SYS_AUE_ksem_unlink	AUE_NULL
-#define	SYS_AUE_ksem_getvalue	AUE_NULL
-#define	SYS_AUE_ksem_destroy	AUE_NULL
-#define	SYS_AUE___mac_get_pid	AUE_NULL
-#define	SYS_AUE___mac_get_link	AUE_NULL
-#define	SYS_AUE___mac_set_link	AUE_NULL
-#define	SYS_AUE_extattr_set_link	AUE_EXTATTR_SET_LINK
-#define	SYS_AUE_extattr_get_link	AUE_EXTATTR_GET_LINK
-#define	SYS_AUE_extattr_delete_link	AUE_EXTATTR_DELETE_LINK
-#define	SYS_AUE___mac_execve	AUE_NULL
-#define	SYS_AUE_sigaction	AUE_SIGACTION
-#define	SYS_AUE_sigreturn	AUE_SIGRETURN
-#define	SYS_AUE_getcontext	AUE_NULL
-#define	SYS_AUE_setcontext	AUE_NULL
-#define	SYS_AUE_swapcontext	AUE_NULL
-#define	SYS_AUE_swapoff	AUE_SWAPOFF
-#define	SYS_AUE___acl_get_link	AUE_NULL
-#define	SYS_AUE___acl_set_link	AUE_NULL
-#define	SYS_AUE___acl_delete_link	AUE_NULL
-#define	SYS_AUE___acl_aclcheck_link	AUE_NULL
-#define	SYS_AUE_sigwait	AUE_SIGWAIT
-#define	SYS_AUE_thr_create	AUE_NULL
-#define	SYS_AUE_thr_exit	AUE_NULL
-#define	SYS_AUE_thr_self	AUE_NULL
-#define	SYS_AUE_thr_kill	AUE_NULL
-#define	SYS_AUE__umtx_lock	AUE_NULL
-#define	SYS_AUE__umtx_unlock	AUE_NULL
-#define	SYS_AUE_jail_attach	AUE_NULL
-#define	SYS_AUE_extattr_list_fd	AUE_EXTATTR_LIST_FD
-#define	SYS_AUE_extattr_list_file	AUE_EXTATTR_LIST_FILE
-#define	SYS_AUE_extattr_list_link	AUE_EXTATTR_LIST_LINK
-#define	SYS_AUE_ksem_timedwait	AUE_NULL
-#define	SYS_AUE_thr_suspend	AUE_NULL
-#define	SYS_AUE_thr_wake	AUE_NULL
-#define	SYS_AUE_kldunloadf	AUE_MODUNLOAD
-#define	SYS_AUE_audit	AUE_AUDIT
-#define	SYS_AUE_auditon	AUE_AUDITON
-#define	SYS_AUE_getauid	AUE_GETAUID
-#define	SYS_AUE_setauid	AUE_SETAUID
-#define	SYS_AUE_getaudit	AUE_GETAUDIT
-#define	SYS_AUE_setaudit	AUE_SETAUDIT
-#define	SYS_AUE_getaudit_addr	AUE_GETAUDIT_ADDR
-#define	SYS_AUE_setaudit_addr	AUE_SETAUDIT_ADDR
-#define	SYS_AUE_auditctl	AUE_AUDITCTL
-#define	SYS_AUE__umtx_op	AUE_NULL
-#define	SYS_AUE_thr_new	AUE_NULL
-#define	SYS_AUE_sigqueue	AUE_NULL
-#define	SYS_AUE_kmq_open	AUE_NULL
-#define	SYS_AUE_kmq_setattr	AUE_NULL
-#define	SYS_AUE_kmq_timedreceive	AUE_NULL
-#define	SYS_AUE_kmq_timedsend	AUE_NULL
-#define	SYS_AUE_kmq_notify	AUE_NULL
-#define	SYS_AUE_kmq_unlink	AUE_NULL
-#define	SYS_AUE_abort2	AUE_NULL
-#define	SYS_AUE_thr_set_name	AUE_NULL
-#define	SYS_AUE_aio_fsync	AUE_NULL
-#define	SYS_AUE_rtprio_thread	AUE_RTPRIO
-#define	SYS_AUE_sctp_peeloff	AUE_NULL
-#define	SYS_AUE_sctp_generic_sendmsg	AUE_NULL
-#define	SYS_AUE_sctp_generic_sendmsg_iov	AUE_NULL
-#define	SYS_AUE_sctp_generic_recvmsg	AUE_NULL
-#define	SYS_AUE_pread	AUE_PREAD
-#define	SYS_AUE_pwrite	AUE_PWRITE
-#define	SYS_AUE_mmap	AUE_MMAP
-#define	SYS_AUE_lseek	AUE_LSEEK
-#define	SYS_AUE_truncate	AUE_TRUNCATE
-#define	SYS_AUE_ftruncate	AUE_FTRUNCATE
-#define	SYS_AUE_thr_kill2	AUE_KILL
-#define	SYS_AUE_shm_open	AUE_SHMOPEN
-#define	SYS_AUE_shm_unlink	AUE_SHMUNLINK
-#define	SYS_AUE_cpuset	AUE_NULL
-#define	SYS_AUE_cpuset_setid	AUE_NULL
-#define	SYS_AUE_cpuset_getid	AUE_NULL
-#define	SYS_AUE_cpuset_getaffinity	AUE_NULL
-#define	SYS_AUE_cpuset_setaffinity	AUE_NULL
-#define	SYS_AUE_faccessat	AUE_FACCESSAT
-#define	SYS_AUE_fchmodat	AUE_FCHMODAT
-#define	SYS_AUE_fchownat	AUE_FCHOWNAT
-#define	SYS_AUE_fexecve	AUE_FEXECVE
-#define	SYS_AUE_fstatat	AUE_FSTATAT
-#define	SYS_AUE_futimesat	AUE_FUTIMESAT
-#define	SYS_AUE_linkat	AUE_LINKAT
-#define	SYS_AUE_mkdirat	AUE_MKDIRAT
-#define	SYS_AUE_mkfifoat	AUE_MKFIFOAT
-#define	SYS_AUE_mknodat	AUE_MKNODAT
-#define	SYS_AUE_openat	AUE_OPENAT_RWTC
-#define	SYS_AUE_readlinkat	AUE_READLINKAT
-#define	SYS_AUE_renameat	AUE_RENAMEAT
-#define	SYS_AUE_symlinkat	AUE_SYMLINKAT
-#define	SYS_AUE_unlinkat	AUE_UNLINKAT
-#define	SYS_AUE_posix_openpt	AUE_POSIX_OPENPT
-#define	SYS_AUE_gssd_syscall	AUE_NULL
-#define	SYS_AUE_jail_get	AUE_NULL
-#define	SYS_AUE_jail_set	AUE_NULL
-#define	SYS_AUE_jail_remove	AUE_NULL
-#define	SYS_AUE_closefrom	AUE_CLOSEFROM
-#define	SYS_AUE___semctl	AUE_SEMCTL
-#define	SYS_AUE_msgctl	AUE_MSGCTL
-#define	SYS_AUE_shmctl	AUE_SHMCTL
-#define	SYS_AUE_lpathconf	AUE_LPATHCONF
-#define	SYS_AUE___cap_rights_get	AUE_CAP_RIGHTS_GET
-#define	SYS_AUE_cap_enter	AUE_CAP_ENTER
-#define	SYS_AUE_cap_getmode	AUE_CAP_GETMODE
-#define	SYS_AUE_pdfork	AUE_PDFORK
-#define	SYS_AUE_pdkill	AUE_PDKILL
-#define	SYS_AUE_pdgetpid	AUE_PDGETPID
-#define	SYS_AUE_pselect	AUE_SELECT
-#define	SYS_AUE_getloginclass	AUE_NULL
-#define	SYS_AUE_setloginclass	AUE_NULL
-#define	SYS_AUE_rctl_get_racct	AUE_NULL
-#define	SYS_AUE_rctl_get_rules	AUE_NULL
-#define	SYS_AUE_rctl_get_limits	AUE_NULL
-#define	SYS_AUE_rctl_add_rule	AUE_NULL
-#define	SYS_AUE_rctl_remove_rule	AUE_NULL
-#define	SYS_AUE_posix_fallocate	AUE_NULL
-#define	SYS_AUE_posix_fadvise	AUE_NULL
-#define	SYS_AUE_wait6	AUE_WAIT6
-#define	SYS_AUE_cap_rights_limit	AUE_CAP_RIGHTS_LIMIT
-#define	SYS_AUE_cap_ioctls_limit	AUE_CAP_IOCTLS_LIMIT
-#define	SYS_AUE_cap_ioctls_get	AUE_CAP_IOCTLS_GET
-#define	SYS_AUE_cap_fcntls_limit	AUE_CAP_FCNTLS_LIMIT
-#define	SYS_AUE_cap_fcntls_get	AUE_CAP_FCNTLS_GET
-#define	SYS_AUE_bindat	AUE_BINDAT
-#define	SYS_AUE_connectat	AUE_CONNECTAT
-#define	SYS_AUE_chflagsat	AUE_CHFLAGSAT
-#define	SYS_AUE_accept4	AUE_ACCEPT
-#define	SYS_AUE_pipe2	AUE_PIPE
-#define	SYS_AUE_aio_mlock	AUE_NULL
-#define	SYS_AUE_procctl	AUE_NULL
-#define	SYS_AUE_ppoll	AUE_POLL
-
-#undef PAD_
-#undef PADL_
-#undef PADR_
-
-#endif /* !_SYS_SYSPROTO_H_ */
diff --git a/include.new/sys/systm.h b/include.new/sys/systm.h
deleted file mode 100644
index 8e4c630..0000000
--- a/include.new/sys/systm.h
+++ /dev/null
@@ -1,432 +0,0 @@
-/*-
- * Copyright (c) 1982, 1988, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)systm.h	8.7 (Berkeley) 3/29/95
- * $FreeBSD: releng/10.2/sys/sys/systm.h 284199 2015-06-10 02:04:02Z kib $
- */
-
-#ifndef _SYS_SYSTM_H_
-#define	_SYS_SYSTM_H_
-
-#include <machine/atomic.h>
-#include <machine/cpufunc.h>
-#include <sys/callout.h>
-#include <sys/cdefs.h>
-#include <sys/queue.h>
-#include <sys/stdint.h>		/* for people using printf mainly */
-
-extern int cold;		/* nonzero if we are doing a cold boot */
-extern int rebooting;		/* kern_reboot() has been called. */
-extern const char *panicstr;	/* panic message */
-extern char version[];		/* system version */
-extern char compiler_version[];	/* compiler version */
-extern char copyright[];	/* system copyright */
-extern int kstack_pages;	/* number of kernel stack pages */
-
-extern u_long pagesizes[];	/* supported page sizes */
-extern long physmem;		/* physical memory */
-extern long realmem;		/* 'real' memory */
-
-extern char *rootdevnames[2];	/* names of possible root devices */
-
-extern int boothowto;		/* reboot flags, from console subsystem */
-extern int bootverbose;		/* nonzero to print verbose messages */
-
-extern int maxusers;		/* system tune hint */
-extern int ngroups_max;		/* max # of supplemental groups */
-extern int vm_guest;		/* Running as virtual machine guest? */
-
-/*
- * Detected virtual machine guest types. The intention is to expand
- * and/or add to the VM_GUEST_VM type if specific VM functionality is
- * ever implemented (e.g. vendor-specific paravirtualization features).
- * Keep in sync with vm_guest_sysctl_names[].
- */
-enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV,
-		VM_GUEST_VMWARE, VM_LAST };
-
-#if defined(WITNESS) || defined(INVARIANTS)
-void	kassert_panic(const char *fmt, ...)  __printflike(1, 2);
-#endif
-
-#ifdef	INVARIANTS		/* The option is always available */
-#define	KASSERT(exp,msg) do {						\
-	if (__predict_false(!(exp)))					\
-		kassert_panic msg;						\
-} while (0)
-#define	VNASSERT(exp, vp, msg) do {					\
-	if (__predict_false(!(exp))) {					\
-		vn_printf(vp, "VNASSERT failed\n");			\
-		kassert_panic msg;						\
-	}								\
-} while (0)
-#else
-#define	KASSERT(exp,msg) do { \
-} while (0)
-
-#define	VNASSERT(exp, vp, msg) do { \
-} while (0)
-#endif
-
-#ifndef CTASSERT	/* Allow lint to override */
-#define	CTASSERT(x)	_Static_assert(x, "compile-time assertion failed")
-#endif
-
-/*
- * Assert that a pointer can be loaded from memory atomically.
- *
- * This assertion enforces stronger alignment than necessary.  For example,
- * on some architectures, atomicity for unaligned loads will depend on
- * whether or not the load spans multiple cache lines.
- */
-#define	ASSERT_ATOMIC_LOAD_PTR(var, msg)				\
-	KASSERT(sizeof(var) == sizeof(void *) &&			\
-	    ((uintptr_t)&(var) & (sizeof(void *) - 1)) == 0, msg)
-
-/*
- * Assert that a thread is in critical(9) section.
- */
-#define	CRITICAL_ASSERT(td)						\
-	KASSERT((td)->td_critnest >= 1, ("Not in critical section"));
- 
-/*
- * If we have already panic'd and this is the thread that called
- * panic(), then don't block on any mutexes but silently succeed.
- * Otherwise, the kernel will deadlock since the scheduler isn't
- * going to run the thread that holds any lock we need.
- */
-#define	SCHEDULER_STOPPED() __predict_false(curthread->td_stopsched)
-
-/*
- * XXX the hints declarations are even more misplaced than most declarations
- * in this file, since they are needed in one file (per arch) and only used
- * in two files.
- * XXX most of these variables should be const.
- */
-extern int osreldate;
-extern int envmode;
-extern int hintmode;		/* 0 = off. 1 = config, 2 = fallback */
-extern int dynamic_kenv;
-extern struct mtx kenv_lock;
-extern char *kern_envp;
-extern char static_env[];
-extern char static_hints[];	/* by config for now */
-
-extern char **kenvp;
-
-extern const void *zero_region;	/* address space maps to a zeroed page	*/
-
-extern int unmapped_buf_allowed;
-extern int iosize_max_clamp;
-extern int devfs_iosize_max_clamp;
-#define	IOSIZE_MAX	(iosize_max_clamp ? INT_MAX : SSIZE_MAX)
-#define	DEVFS_IOSIZE_MAX	(devfs_iosize_max_clamp ? INT_MAX : SSIZE_MAX)
-
-/*
- * General function declarations.
- */
-
-struct inpcb;
-struct lock_object;
-struct malloc_type;
-struct mtx;
-struct proc;
-struct socket;
-struct thread;
-struct tty;
-struct ucred;
-struct uio;
-struct _jmp_buf;
-struct trapframe;
-struct eventtimer;
-
-int	setjmp(struct _jmp_buf *) __returns_twice;
-void	longjmp(struct _jmp_buf *, int) __dead2;
-int	dumpstatus(vm_offset_t addr, off_t count);
-int	nullop(void);
-int	eopnotsupp(void);
-int	ureadc(int, struct uio *);
-void	hashdestroy(void *, struct malloc_type *, u_long);
-void	*hashinit(int count, struct malloc_type *type, u_long *hashmask);
-void	*hashinit_flags(int count, struct malloc_type *type,
-    u_long *hashmask, int flags);
-#define	HASH_NOWAIT	0x00000001
-#define	HASH_WAITOK	0x00000002
-
-void	*phashinit(int count, struct malloc_type *type, u_long *nentries);
-void	g_waitidle(void);
-
-void	panic(const char *, ...) __dead2 __printflike(1, 2);
-void	vpanic(const char *, __va_list) __dead2 __printflike(1, 0);
-
-void	cpu_boot(int);
-void	cpu_flush_dcache(void *, size_t);
-void	cpu_rootconf(void);
-void	critical_enter(void);
-void	critical_exit(void);
-void	init_param1(void);
-void	init_param2(long physpages);
-void	init_static_kenv(char *, size_t);
-void	tablefull(const char *);
-#ifdef  EARLY_PRINTF
-typedef void early_putc_t(int ch);
-extern early_putc_t *early_putc;
-#endif
-int	kvprintf(char const *, void (*)(int, void*), void *, int,
-	    __va_list) __printflike(1, 0);
-void	log(int, const char *, ...) __printflike(2, 3);
-void	log_console(struct uio *);
-int	printf(const char *, ...) __printflike(1, 2);
-int	snprintf(char *, size_t, const char *, ...) __printflike(3, 4);
-int	sprintf(char *buf, const char *, ...) __printflike(2, 3);
-int	uprintf(const char *, ...) __printflike(1, 2);
-int	vprintf(const char *, __va_list) __printflike(1, 0);
-int	vsnprintf(char *, size_t, const char *, __va_list) __printflike(3, 0);
-int	vsnrprintf(char *, size_t, int, const char *, __va_list) __printflike(4, 0);
-int	vsprintf(char *buf, const char *, __va_list) __printflike(2, 0);
-int	ttyprintf(struct tty *, const char *, ...) __printflike(2, 3);
-int	sscanf(const char *, char const *, ...) __nonnull(1) __nonnull(2);
-int	vsscanf(const char *, char const *, __va_list) __nonnull(1) __nonnull(2);
-long	strtol(const char *, char **, int) __nonnull(1);
-u_long	strtoul(const char *, char **, int) __nonnull(1);
-quad_t	strtoq(const char *, char **, int) __nonnull(1);
-u_quad_t strtouq(const char *, char **, int) __nonnull(1);
-void	tprintf(struct proc *p, int pri, const char *, ...) __printflike(3, 4);
-void	vtprintf(struct proc *, int, const char *, __va_list) __printflike(3, 0);
-void	hexdump(const void *ptr, int length, const char *hdr, int flags);
-#define	HD_COLUMN_MASK	0xff
-#define	HD_DELIM_MASK	0xff00
-#define	HD_OMIT_COUNT	(1 << 16)
-#define	HD_OMIT_HEX	(1 << 17)
-#define	HD_OMIT_CHARS	(1 << 18)
-
-#define ovbcopy(f, t, l) bcopy((f), (t), (l))
-void	bcopy(const void *from, void *to, size_t len) __nonnull(1) __nonnull(2);
-void	bzero(void *buf, size_t len) __nonnull(1);
-
-void	*memcpy(void *to, const void *from, size_t len) __nonnull(1) __nonnull(2);
-void	*memmove(void *dest, const void *src, size_t n) __nonnull(1) __nonnull(2);
-
-int	copystr(const void * __restrict kfaddr, void * __restrict kdaddr,
-	    size_t len, size_t * __restrict lencopied)
-	    __nonnull(1) __nonnull(2);
-int	copyinstr(const void * __restrict udaddr, void * __restrict kaddr,
-	    size_t len, size_t * __restrict lencopied)
-	    __nonnull(1) __nonnull(2);
-int	copyin(const void * __restrict udaddr, void * __restrict kaddr,
-	    size_t len) __nonnull(1) __nonnull(2);
-int	copyin_nofault(const void * __restrict udaddr, void * __restrict kaddr,
-	    size_t len) __nonnull(1) __nonnull(2);
-int	copyout(const void * __restrict kaddr, void * __restrict udaddr,
-	    size_t len) __nonnull(1) __nonnull(2);
-int	copyout_nofault(const void * __restrict kaddr, void * __restrict udaddr,
-	    size_t len) __nonnull(1) __nonnull(2);
-
-int	fubyte(volatile const void *base);
-long	fuword(volatile const void *base);
-int	fuword16(volatile const void *base);
-int32_t	fuword32(volatile const void *base);
-int64_t	fuword64(volatile const void *base);
-int	fueword(volatile const void *base, long *val);
-int	fueword32(volatile const void *base, int32_t *val);
-int	fueword64(volatile const void *base, int64_t *val);
-int	subyte(volatile void *base, int byte);
-int	suword(volatile void *base, long word);
-int	suword16(volatile void *base, int word);
-int	suword32(volatile void *base, int32_t word);
-int	suword64(volatile void *base, int64_t word);
-uint32_t casuword32(volatile uint32_t *base, uint32_t oldval, uint32_t newval);
-u_long	casuword(volatile u_long *p, u_long oldval, u_long newval);
-int	casueword32(volatile uint32_t *base, uint32_t oldval, uint32_t *oldvalp,
-	    uint32_t newval);
-int	casueword(volatile u_long *p, u_long oldval, u_long *oldvalp,
-	    u_long newval);
-
-void	realitexpire(void *);
-
-int	sysbeep(int hertz, int period);
-
-void	hardclock(int usermode, uintfptr_t pc);
-void	hardclock_cnt(int cnt, int usermode);
-void	hardclock_cpu(int usermode);
-void	hardclock_sync(int cpu);
-void	softclock(void *);
-void	statclock(int usermode);
-void	statclock_cnt(int cnt, int usermode);
-void	profclock(int usermode, uintfptr_t pc);
-void	profclock_cnt(int cnt, int usermode, uintfptr_t pc);
-
-int	hardclockintr(void);
-
-void	startprofclock(struct proc *);
-void	stopprofclock(struct proc *);
-void	cpu_startprofclock(void);
-void	cpu_stopprofclock(void);
-sbintime_t 	cpu_idleclock(void);
-void	cpu_activeclock(void);
-void	cpu_new_callout(int cpu, sbintime_t bt, sbintime_t bt_opt);
-void	cpu_et_frequency(struct eventtimer *et, uint64_t newfreq);
-extern int	cpu_deepest_sleep;
-extern int	cpu_disable_c2_sleep;
-extern int	cpu_disable_c3_sleep;
-
-int	cr_cansee(struct ucred *u1, struct ucred *u2);
-int	cr_canseesocket(struct ucred *cred, struct socket *so);
-int	cr_canseeinpcb(struct ucred *cred, struct inpcb *inp);
-
-char	*getenv(const char *name);
-void	freeenv(char *env);
-int	getenv_int(const char *name, int *data);
-int	getenv_uint(const char *name, unsigned int *data);
-int	getenv_long(const char *name, long *data);
-int	getenv_ulong(const char *name, unsigned long *data);
-int	getenv_string(const char *name, char *data, int size);
-int	getenv_quad(const char *name, quad_t *data);
-int	setenv(const char *name, const char *value);
-int	unsetenv(const char *name);
-int	testenv(const char *name);
-
-typedef uint64_t (cpu_tick_f)(void);
-void set_cputicker(cpu_tick_f *func, uint64_t freq, unsigned var);
-extern cpu_tick_f *cpu_ticks;
-uint64_t cpu_tickrate(void);
-uint64_t cputick2usec(uint64_t tick);
-
-#ifdef APM_FIXUP_CALLTODO
-struct timeval;
-void	adjust_timeout_calltodo(struct timeval *time_change);
-#endif /* APM_FIXUP_CALLTODO */
-
-#include <sys/libkern.h>
-
-/* Initialize the world */
-void	consinit(void);
-void	cpu_initclocks(void);
-void	cpu_initclocks_bsp(void);
-void	cpu_initclocks_ap(void);
-void	usrinfoinit(void);
-
-/* Finalize the world */
-void	kern_reboot(int) __dead2;
-void	shutdown_nice(int);
-
-/* Timeouts */
-typedef void timeout_t(void *);	/* timeout function type */
-#define CALLOUT_HANDLE_INITIALIZER(handle)	\
-	{ NULL }
-
-void	callout_handle_init(struct callout_handle *);
-struct	callout_handle timeout(timeout_t *, void *, int);
-void	untimeout(timeout_t *, void *, struct callout_handle);
-
-/* Stubs for obsolete functions that used to be for interrupt management */
-static __inline intrmask_t	splbio(void)		{ return 0; }
-static __inline intrmask_t	splcam(void)		{ return 0; }
-static __inline intrmask_t	splclock(void)		{ return 0; }
-static __inline intrmask_t	splhigh(void)		{ return 0; }
-static __inline intrmask_t	splimp(void)		{ return 0; }
-static __inline intrmask_t	splnet(void)		{ return 0; }
-static __inline intrmask_t	spltty(void)		{ return 0; }
-static __inline intrmask_t	splvm(void)		{ return 0; }
-static __inline void		splx(intrmask_t ipl __unused)	{ return; }
-
-/*
- * Common `proc' functions are declared here so that proc.h can be included
- * less often.
- */
-int	_sleep(void *chan, struct lock_object *lock, int pri, const char *wmesg,
-	   sbintime_t sbt, sbintime_t pr, int flags) __nonnull(1);
-#define	msleep(chan, mtx, pri, wmesg, timo)				\
-	_sleep((chan), &(mtx)->lock_object, (pri), (wmesg),		\
-	    tick_sbt * (timo), 0, C_HARDCLOCK)
-#define	msleep_sbt(chan, mtx, pri, wmesg, bt, pr, flags)		\
-	_sleep((chan), &(mtx)->lock_object, (pri), (wmesg), (bt), (pr),	\
-	    (flags))
-int	msleep_spin_sbt(void *chan, struct mtx *mtx, const char *wmesg,
-	    sbintime_t sbt, sbintime_t pr, int flags) __nonnull(1);
-#define	msleep_spin(chan, mtx, wmesg, timo)				\
-	msleep_spin_sbt((chan), (mtx), (wmesg), tick_sbt * (timo),	\
-	    0, C_HARDCLOCK)
-int	pause_sbt(const char *wmesg, sbintime_t sbt, sbintime_t pr,
-	    int flags);
-#define	pause(wmesg, timo)						\
-	pause_sbt((wmesg), tick_sbt * (timo), 0, C_HARDCLOCK)
-#define	tsleep(chan, pri, wmesg, timo)					\
-	_sleep((chan), NULL, (pri), (wmesg), tick_sbt * (timo),		\
-	    0, C_HARDCLOCK)
-#define	tsleep_sbt(chan, pri, wmesg, bt, pr, flags)			\
-	_sleep((chan), NULL, (pri), (wmesg), (bt), (pr), (flags))
-void	wakeup(void *chan) __nonnull(1);
-void	wakeup_one(void *chan) __nonnull(1);
-
-/*
- * Common `struct cdev *' stuff are declared here to avoid #include poisoning
- */
-
-struct cdev;
-dev_t dev2udev(struct cdev *x);
-const char *devtoname(struct cdev *cdev);
-
-int poll_no_poll(int events);
-
-/* XXX: Should be void nanodelay(u_int nsec); */
-void	DELAY(int usec);
-
-/* Root mount holdback API */
-struct root_hold_token;
-
-struct root_hold_token *root_mount_hold(const char *identifier);
-void root_mount_rel(struct root_hold_token *h);
-void root_mount_wait(void);
-int root_mounted(void);
-
-
-/*
- * Unit number allocation API. (kern/subr_unit.c)
- */
-struct unrhdr;
-struct unrhdr *new_unrhdr(int low, int high, struct mtx *mutex);
-void init_unrhdr(struct unrhdr *uh, int low, int high, struct mtx *mutex);
-void delete_unrhdr(struct unrhdr *uh);
-void clean_unrhdr(struct unrhdr *uh);
-void clean_unrhdrl(struct unrhdr *uh);
-int alloc_unr(struct unrhdr *uh);
-int alloc_unr_specific(struct unrhdr *uh, u_int item);
-int alloc_unrl(struct unrhdr *uh);
-void free_unr(struct unrhdr *uh, u_int item);
-
-void	intr_prof_stack_use(struct thread *td, struct trapframe *frame);
-
-extern void (*softdep_ast_cleanup)(void);
-
-#endif /* !_SYS_SYSTM_H_ */
diff --git a/include.new/sys/taskqueue.h b/include.new/sys/taskqueue.h
deleted file mode 100644
index c09ac01..0000000
--- a/include.new/sys/taskqueue.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/sys/sys/taskqueue.h 262065 2014-02-17 15:32:08Z avg $
- */
-
-#ifndef _SYS_TASKQUEUE_H_
-#define _SYS_TASKQUEUE_H_
-
-#ifndef _KERNEL
-#error "no user-servicable parts inside"
-#endif
-
-#include <sys/queue.h>
-#include <sys/_task.h>
-#include <sys/_callout.h>
-
-struct taskqueue;
-struct thread;
-
-struct timeout_task {
-	struct taskqueue *q;
-	struct task t;
-	struct callout c;
-	int    f;
-};
-
-enum taskqueue_callback_type {
-	TASKQUEUE_CALLBACK_TYPE_INIT,
-	TASKQUEUE_CALLBACK_TYPE_SHUTDOWN,
-};
-#define	TASKQUEUE_CALLBACK_TYPE_MIN	TASKQUEUE_CALLBACK_TYPE_INIT
-#define	TASKQUEUE_CALLBACK_TYPE_MAX	TASKQUEUE_CALLBACK_TYPE_SHUTDOWN
-#define	TASKQUEUE_NUM_CALLBACKS		TASKQUEUE_CALLBACK_TYPE_MAX + 1
-
-typedef void (*taskqueue_callback_fn)(void *context);
-
-/*
- * A notification callback function which is called from
- * taskqueue_enqueue().  The context argument is given in the call to
- * taskqueue_create().  This function would normally be used to allow the
- * queue to arrange to run itself later (e.g., by scheduling a software
- * interrupt or waking a kernel thread).
- */
-typedef void (*taskqueue_enqueue_fn)(void *context);
-
-struct taskqueue *taskqueue_create(const char *name, int mflags,
-				    taskqueue_enqueue_fn enqueue,
-				    void *context);
-int	taskqueue_start_threads(struct taskqueue **tqp, int count, int pri,
-				const char *name, ...) __printflike(4, 5);
-int	taskqueue_enqueue(struct taskqueue *queue, struct task *task);
-int	taskqueue_enqueue_timeout(struct taskqueue *queue,
-	    struct timeout_task *timeout_task, int ticks);
-int	taskqueue_cancel(struct taskqueue *queue, struct task *task,
-	    u_int *pendp);
-int	taskqueue_cancel_timeout(struct taskqueue *queue,
-	    struct timeout_task *timeout_task, u_int *pendp);
-void	taskqueue_drain(struct taskqueue *queue, struct task *task);
-void	taskqueue_drain_timeout(struct taskqueue *queue,
-	    struct timeout_task *timeout_task);
-void	taskqueue_drain_all(struct taskqueue *queue);
-void	taskqueue_free(struct taskqueue *queue);
-void	taskqueue_run(struct taskqueue *queue);
-void	taskqueue_block(struct taskqueue *queue);
-void	taskqueue_unblock(struct taskqueue *queue);
-int	taskqueue_member(struct taskqueue *queue, struct thread *td);
-void	taskqueue_set_callback(struct taskqueue *queue,
-	    enum taskqueue_callback_type cb_type,
-	    taskqueue_callback_fn callback, void *context);
-
-#define TASK_INITIALIZER(priority, func, context)	\
-	{ .ta_pending = 0,				\
-	  .ta_priority = (priority),			\
-	  .ta_func = (func),				\
-	  .ta_context = (context) }
-
-/*
- * Functions for dedicated thread taskqueues
- */
-void	taskqueue_thread_loop(void *arg);
-void	taskqueue_thread_enqueue(void *context);
-
-/*
- * Initialise a task structure.
- */
-#define TASK_INIT(task, priority, func, context) do {	\
-	(task)->ta_pending = 0;				\
-	(task)->ta_priority = (priority);		\
-	(task)->ta_func = (func);			\
-	(task)->ta_context = (context);			\
-} while (0)
-
-void _timeout_task_init(struct taskqueue *queue,
-	    struct timeout_task *timeout_task, int priority, task_fn_t func,
-	    void *context);
-#define	TIMEOUT_TASK_INIT(queue, timeout_task, priority, func, context) \
-	_timeout_task_init(queue, timeout_task, priority, func, context);
-
-/*
- * Declare a reference to a taskqueue.
- */
-#define TASKQUEUE_DECLARE(name)			\
-extern struct taskqueue *taskqueue_##name
-
-/*
- * Define and initialise a global taskqueue that uses sleep mutexes.
- */
-#define TASKQUEUE_DEFINE(name, enqueue, context, init)			\
-									\
-struct taskqueue *taskqueue_##name;					\
-									\
-static void								\
-taskqueue_define_##name(void *arg)					\
-{									\
-	taskqueue_##name =						\
-	    taskqueue_create(#name, M_WAITOK, (enqueue), (context));	\
-	init;								\
-}									\
-									\
-SYSINIT(taskqueue_##name, SI_SUB_CONFIGURE, SI_ORDER_SECOND,		\
-	taskqueue_define_##name, NULL);					\
-									\
-struct __hack
-#define TASKQUEUE_DEFINE_THREAD(name)					\
-TASKQUEUE_DEFINE(name, taskqueue_thread_enqueue, &taskqueue_##name,	\
-	taskqueue_start_threads(&taskqueue_##name, 1, PWAIT,		\
-	"%s taskq", #name))
-
-/*
- * Define and initialise a global taskqueue that uses spin mutexes.
- */
-#define TASKQUEUE_FAST_DEFINE(name, enqueue, context, init)		\
-									\
-struct taskqueue *taskqueue_##name;					\
-									\
-static void								\
-taskqueue_define_##name(void *arg)					\
-{									\
-	taskqueue_##name =						\
-	    taskqueue_create_fast(#name, M_WAITOK, (enqueue),		\
-	    (context));							\
-	init;								\
-}									\
-									\
-SYSINIT(taskqueue_##name, SI_SUB_CONFIGURE, SI_ORDER_SECOND,		\
-	taskqueue_define_##name, NULL);					\
-									\
-struct __hack
-#define TASKQUEUE_FAST_DEFINE_THREAD(name)				\
-TASKQUEUE_FAST_DEFINE(name, taskqueue_thread_enqueue,			\
-	&taskqueue_##name, taskqueue_start_threads(&taskqueue_##name	\
-	1, PWAIT, "%s taskq", #name))
-
-/*
- * These queues are serviced by software interrupt handlers.  To enqueue
- * a task, call taskqueue_enqueue(taskqueue_swi, &task) or
- * taskqueue_enqueue(taskqueue_swi_giant, &task).
- */
-TASKQUEUE_DECLARE(swi_giant);
-TASKQUEUE_DECLARE(swi);
-
-/*
- * This queue is serviced by a kernel thread.  To enqueue a task, call
- * taskqueue_enqueue(taskqueue_thread, &task).
- */
-TASKQUEUE_DECLARE(thread);
-
-/*
- * Queue for swi handlers dispatched from fast interrupt handlers.
- * These are necessarily different from the above because the queue
- * must be locked with spinlocks since sleep mutex's cannot be used
- * from a fast interrupt handler context.
- */
-TASKQUEUE_DECLARE(fast);
-int	taskqueue_enqueue_fast(struct taskqueue *queue, struct task *task);
-struct taskqueue *taskqueue_create_fast(const char *name, int mflags,
-				    taskqueue_enqueue_fn enqueue,
-				    void *context);
-
-#endif /* !_SYS_TASKQUEUE_H_ */
diff --git a/include.new/sys/terminal.h b/include.new/sys/terminal.h
deleted file mode 100644
index f68abf6..0000000
--- a/include.new/sys/terminal.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*-
- * Copyright (c) 2009 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Ed Schouten under sponsorship from the
- * FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/terminal.h 274860 2014-11-22 16:55:55Z dumbbell $
- */
-
-#ifndef _SYS_TERMINAL_H_
-#define	_SYS_TERMINAL_H_
-
-#include <sys/param.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/cons.h>
-#include <sys/linker_set.h>
-#include <sys/ttycom.h>
-
-#include <teken/teken.h>
-
-#include "opt_syscons.h"
-#include "opt_teken.h"
-
-struct terminal;
-struct thread;
-struct tty;
-
-/*
- * The terminal layer is an abstraction on top of the TTY layer and the
- * console interface.  It can be used by system console drivers to
- * easily interact with the kernel console and TTYs.
- *
- * Terminals contain terminal emulators, which means console drivers
- * don't need to implement their own terminal emulator. The terminal
- * emulator deals with UTF-8 exclusively. This means that term_char_t,
- * the data type used to store input/output characters will always
- * contain Unicode codepoints.
- *
- * To save memory usage, the top bits of term_char_t will contain other
- * attributes, like colors. Right now term_char_t is composed as
- * follows:
- *
- *  Bits  Meaning
- *  0-20: Character value
- * 21-25: Bold, underline, blink, reverse, right part of CJK fullwidth character
- * 26-28: Foreground color
- * 29-31: Background color
- */
-
-typedef uint32_t term_char_t;
-#define	TCHAR_CHARACTER(c)	((c) & 0x1fffff)
-#define	TCHAR_FORMAT(c)		(((c) >> 21) & 0x1f)
-#define	TCHAR_FGCOLOR(c)	(((c) >> 26) & 0x7)
-#define	TCHAR_BGCOLOR(c)	(((c) >> 29) & 0x7)
-
-typedef teken_attr_t term_attr_t;
-
-typedef teken_color_t term_color_t;
-#define	TCOLOR_FG(c)	(((c) & 0x7) << 26)
-#define	TCOLOR_BG(c)	(((c) & 0x7) << 29)
-#define	TCOLOR_LIGHT(c)	((c) | 0x8)
-#define	TCOLOR_DARK(c)	((c) & ~0x8)
-
-#define	TFORMAT(c)	(((c) & 0x1f) << 21)
-
-/* syscons(4) compatible color attributes for foreground text */
-#define	FG_BLACK		TCOLOR_FG(TC_BLACK)
-#define	FG_BLUE			TCOLOR_FG(TC_BLUE)
-#define	FG_GREEN		TCOLOR_FG(TC_GREEN)
-#define	FG_CYAN			TCOLOR_FG(TC_CYAN)
-#define	FG_RED			TCOLOR_FG(TC_RED)
-#define	FG_MAGENTA		TCOLOR_FG(TC_MAGENTA)
-#define	FG_BROWN		TCOLOR_FG(TC_BROWN)
-#define	FG_LIGHTGREY		TCOLOR_FG(TC_WHITE)
-#define	FG_DARKGREY		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BLACK))
-#define	FG_LIGHTBLUE		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BLUE))
-#define	FG_LIGHTGREEN		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_GREEN))
-#define	FG_LIGHTCYAN		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_CYAN))
-#define	FG_LIGHTRED		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_RED))
-#define	FG_LIGHTMAGENTA		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_MAGENTA))
-#define	FG_YELLOW		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_BROWN))
-#define	FG_WHITE		(TFORMAT(TF_BOLD) | TCOLOR_FG(TC_WHITE))
-#define	FG_BLINK		TFORMAT(TF_BLINK)
-
-/* syscons(4) compatible color attributes for text background */
-#define	BG_BLACK		TCOLOR_BG(TC_BLACK)
-#define	BG_BLUE			TCOLOR_BG(TC_BLUE)
-#define	BG_GREEN		TCOLOR_BG(TC_GREEN)
-#define	BG_CYAN			TCOLOR_BG(TC_CYAN)
-#define	BG_RED			TCOLOR_BG(TC_RED)
-#define	BG_MAGENTA		TCOLOR_BG(TC_MAGENTA)
-#define	BG_BROWN		TCOLOR_BG(TC_BROWN)
-#define	BG_LIGHTGREY		TCOLOR_BG(TC_WHITE)
-#define	BG_DARKGREY		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BLACK))
-#define	BG_LIGHTBLUE		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BLUE))
-#define	BG_LIGHTGREEN		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_GREEN))
-#define	BG_LIGHTCYAN		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_CYAN))
-#define	BG_LIGHTRED		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_RED))
-#define	BG_LIGHTMAGENTA		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_MAGENTA))
-#define	BG_YELLOW		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_BROWN))
-#define	BG_WHITE		(TFORMAT(TF_BOLD) | TCOLOR_BG(TC_WHITE))
-
-#ifndef TERMINAL_NORM_ATTR
-#ifdef SC_NORM_ATTR
-#define	TERMINAL_NORM_ATTR	SC_NORM_ATTR
-#else
-#define	TERMINAL_NORM_ATTR	(FG_LIGHTGREY | BG_BLACK)
-#endif
-#endif
-
-#ifndef TERMINAL_KERN_ATTR
-#ifdef SC_KERNEL_CONS_ATTR
-#define	TERMINAL_KERN_ATTR	SC_KERNEL_CONS_ATTR
-#else
-#define	TERMINAL_KERN_ATTR	(FG_WHITE | BG_BLACK)
-#endif
-#endif
-
-typedef teken_pos_t term_pos_t;
-typedef teken_rect_t term_rect_t;
-
-typedef void tc_cursor_t(struct terminal *tm, const term_pos_t *p);
-typedef void tc_putchar_t(struct terminal *tm, const term_pos_t *p,
-    term_char_t c);
-typedef void tc_fill_t(struct terminal *tm, const term_rect_t *r,
-    term_char_t c);
-typedef void tc_copy_t(struct terminal *tm, const term_rect_t *r,
-    const term_pos_t *p);
-typedef void tc_param_t(struct terminal *tm, int cmd, unsigned int arg);
-typedef void tc_done_t(struct terminal *tm);
-
-typedef void tc_cnprobe_t(struct terminal *tm, struct consdev *cd);
-typedef int tc_cngetc_t(struct terminal *tm);
-
-typedef void tc_cngrab_t(struct terminal *tm);
-typedef void tc_cnungrab_t(struct terminal *tm);
-
-typedef void tc_opened_t(struct terminal *tm, int opened);
-typedef int tc_ioctl_t(struct terminal *tm, u_long cmd, caddr_t data,
-    struct thread *td);
-typedef int tc_mmap_t(struct terminal *tm, vm_ooffset_t offset,
-    vm_paddr_t * paddr, int nprot, vm_memattr_t *memattr);
-typedef void tc_bell_t(struct terminal *tm);
-
-struct terminal_class {
-	/* Terminal emulator. */
-	tc_cursor_t	*tc_cursor;
-	tc_putchar_t	*tc_putchar;
-	tc_fill_t	*tc_fill;
-	tc_copy_t	*tc_copy;
-	tc_param_t	*tc_param;
-	tc_done_t	*tc_done;
-
-	/* Low-level console interface. */
-	tc_cnprobe_t	*tc_cnprobe;
-	tc_cngetc_t	*tc_cngetc;
-
-	/* DDB & panic handling. */
-	tc_cngrab_t	*tc_cngrab;
-	tc_cnungrab_t	*tc_cnungrab;
-
-	/* Misc. */
-	tc_opened_t	*tc_opened;
-	tc_ioctl_t	*tc_ioctl;
-	tc_mmap_t	*tc_mmap;
-	tc_bell_t	*tc_bell;
-};
-
-struct terminal {
-	const struct terminal_class *tm_class;
-	void		*tm_softc;
-	struct mtx	 tm_mtx;
-	struct tty	*tm_tty;
-	teken_t		 tm_emulator;
-	struct winsize	 tm_winsize;
-	unsigned int	 tm_flags;
-#define	TF_MUTE		0x1	/* Drop incoming data. */
-#define	TF_BELL		0x2	/* Bell needs to be sent. */
-#define	TF_CONS		0x4	/* Console device (needs spinlock). */
-	struct consdev	*consdev;
-};
-
-#ifdef _KERNEL
-
-struct terminal *terminal_alloc(const struct terminal_class *tc, void *softc);
-void	terminal_maketty(struct terminal *tm, const char *fmt, ...);
-void	terminal_set_cursor(struct terminal *tm, const term_pos_t *pos);
-void	terminal_set_winsize_blank(struct terminal *tm,
-    const struct winsize *size, int blank, const term_attr_t *attr);
-void	terminal_set_winsize(struct terminal *tm, const struct winsize *size);
-void	terminal_mute(struct terminal *tm, int yes);
-void	terminal_input_char(struct terminal *tm, term_char_t c);
-void	terminal_input_raw(struct terminal *tm, char c);
-void	terminal_input_special(struct terminal *tm, unsigned int k);
-
-void	termcn_cnregister(struct terminal *tm);
-
-/* Kernel console helper interface. */
-extern const struct consdev_ops termcn_cnops;
-
-#define	TERMINAL_DECLARE_EARLY(name, class, softc)			\
-	static struct terminal name = {					\
-		.tm_class = &class,					\
-		.tm_softc = softc,					\
-		.tm_flags = TF_CONS,					\
-	};								\
-	CONSOLE_DEVICE(name ## _consdev, termcn_cnops, &name)
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_TERMINAL_H_ */
diff --git a/include.new/sys/termios.h b/include.new/sys/termios.h
deleted file mode 100644
index 0e57749..0000000
--- a/include.new/sys/termios.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/sys/termios.h 199898 2009-11-28 23:50:48Z ed $ */
-#ifdef __GNUC__
-#warning "this file includes <sys/termios.h> which is deprecated, use <termios.h> instead"
-#endif
-#include <termios.h>
diff --git a/include.new/sys/thr.h b/include.new/sys/thr.h
deleted file mode 100644
index 57f7174..0000000
--- a/include.new/sys/thr.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 2003, Jeffrey Roberson <jeff@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/thr.h 206903 2010-04-20 17:57:43Z imp $
- *
- */
-
-#ifndef _SYS_THR_H_
-#define	_SYS_THR_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/sched.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef __size_t	size_t;
-#define _SIZE_T_DECLARED
-#endif
-
-/* Create the thread in the suspended state. */
-#define	THR_SUSPENDED		0x0001
-/* Create the system scope thread. */
-#define	THR_SYSTEM_SCOPE	0x0002
-
-struct thr_param {
-    void	(*start_func)(void *);	/* thread entry function. */
-    void	*arg;			/* argument for entry function. */
-    char	*stack_base;		/* stack base address. */
-    size_t	stack_size;		/* stack size. */
-    char	*tls_base;		/* tls base address. */
-    size_t	tls_size;		/* tls size. */
-    long	*child_tid;		/* address to store new TID. */
-    long	*parent_tid;		/* parent accesses the new TID here. */
-    int		flags;			/* thread flags. */
-    struct rtprio	*rtp;		/* Real-time scheduling priority */
-    void	*spare[3];		/* TODO: cpu affinity mask etc. */
-};
-
-/* 
- * See pthread_*
- */
-#ifndef _KERNEL
-#include <sys/ucontext.h>
-
-#ifndef _PID_T_DECLARED
-typedef __pid_t		pid_t;
-#define _PID_T_DECLARED
-#endif
-
-__BEGIN_DECLS
-int thr_create(ucontext_t *ctx, long *id, int flags);
-int thr_new(struct thr_param *param, int param_size);
-int thr_self(long *id);
-void thr_exit(long *state);
-int thr_kill(long id, int sig);
-int thr_kill2(pid_t pid, long id, int sig);
-int thr_suspend(const struct timespec *timeout);
-int thr_wake(long id);
-int thr_set_name(long id, const char *name);
-__END_DECLS
-#endif /* !_KERNEL */
-
-#endif /* ! _SYS_THR_H_ */
diff --git a/include.new/sys/tiio.h b/include.new/sys/tiio.h
deleted file mode 100644
index 5a7e530..0000000
--- a/include.new/sys/tiio.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000 Kenneth D. Merry.
- * 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,
- *    without modification, immediately at the beginning of the file.
- * 2. 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: releng/10.2/sys/sys/tiio.h 98849 2002-06-26 03:37:47Z ken $
- */
-/*
- * The ti_stats structure below is from code with the following copyright, 
- * and originally comes from the Alteon firmware documentation.
- */
-/*
- * Copyright (c) 1997, 1998, 1999
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
- * 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.
- *
- *	from: if_tireg.h,v 1.8 1999/07/23 18:46:24 wpaul Exp $
- */
-
-#ifndef _SYS_TIIO_H_
-#define _SYS_TIIO_H_
-
-#include <sys/ioccom.h>
-
-/*
- * Tigon statistics counters.
- */
-struct ti_stats {
-	/*
-	 * MAC stats, taken from RFC 1643, ethernet-like MIB
-	 */
-	volatile uint32_t dot3StatsAlignmentErrors;		/* 0 */
-	volatile uint32_t dot3StatsFCSErrors;			/* 1 */
-	volatile uint32_t dot3StatsSingleCollisionFrames;	/* 2 */
-	volatile uint32_t dot3StatsMultipleCollisionFrames;	/* 3 */
-	volatile uint32_t dot3StatsSQETestErrors;		/* 4 */
-	volatile uint32_t dot3StatsDeferredTransmissions;	/* 5 */
-	volatile uint32_t dot3StatsLateCollisions;		/* 6 */
-	volatile uint32_t dot3StatsExcessiveCollisions;	/* 7 */
-	volatile uint32_t dot3StatsInternalMacTransmitErrors;	/* 8 */
-	volatile uint32_t dot3StatsCarrierSenseErrors;		/* 9 */
-	volatile uint32_t dot3StatsFrameTooLongs;		/* 10 */
-	volatile uint32_t dot3StatsInternalMacReceiveErrors;	/* 11 */
-	/*
-	 * interface stats, taken from RFC 1213, MIB-II, interfaces group
-	 */
-	volatile uint32_t ifIndex;				/* 12 */
-	volatile uint32_t ifType;				/* 13 */
-	volatile uint32_t ifMtu;				/* 14 */
-	volatile uint32_t ifSpeed;				/* 15 */
-	volatile uint32_t ifAdminStatus;			/* 16 */
-#define IF_ADMIN_STATUS_UP      1
-#define IF_ADMIN_STATUS_DOWN    2
-#define IF_ADMIN_STATUS_TESTING 3
-	volatile uint32_t ifOperStatus;			/* 17 */
-#define IF_OPER_STATUS_UP       1
-#define IF_OPER_STATUS_DOWN     2
-#define IF_OPER_STATUS_TESTING  3
-#define IF_OPER_STATUS_UNKNOWN  4
-#define IF_OPER_STATUS_DORMANT  5
-	volatile uint32_t ifLastChange;			/* 18 */
-	volatile uint32_t ifInDiscards;			/* 19 */
-	volatile uint32_t ifInErrors;				/* 20 */
-	volatile uint32_t ifInUnknownProtos;			/* 21 */
-	volatile uint32_t ifOutDiscards;			/* 22 */
-	volatile uint32_t ifOutErrors;				/* 23 */
-	volatile uint32_t ifOutQLen;     /* deprecated */	/* 24 */
-	volatile u_int8_t  ifPhysAddress[8]; /* 8 bytes */	/* 25 - 26 */
-	volatile u_int8_t  ifDescr[32];				/* 27 - 34 */
-	uint32_t alignIt;      /* align to 64 bit for u_int64_ts following */
-	/*
-	 * more interface stats, taken from RFC 1573, MIB-IIupdate,
-	 * interfaces group
-	 */
-	volatile u_int64_t ifHCInOctets;			/* 36 - 37 */
-	volatile u_int64_t ifHCInUcastPkts;			/* 38 - 39 */
-	volatile u_int64_t ifHCInMulticastPkts;			/* 40 - 41 */
-	volatile u_int64_t ifHCInBroadcastPkts;			/* 42 - 43 */
-	volatile u_int64_t ifHCOutOctets;			/* 44 - 45 */
-	volatile u_int64_t ifHCOutUcastPkts;			/* 46 - 47 */
-	volatile u_int64_t ifHCOutMulticastPkts;		/* 48 - 49 */
-	volatile u_int64_t ifHCOutBroadcastPkts;		/* 50 - 51 */
-	volatile uint32_t ifLinkUpDownTrapEnable;		/* 52 */
-	volatile uint32_t ifHighSpeed;				/* 53 */
-	volatile uint32_t ifPromiscuousMode; 			/* 54 */
-	volatile uint32_t ifConnectorPresent; /* follow link state 55 */
-	/*
-	 * Host Commands
-	 */
-	volatile uint32_t nicCmdsHostState;			/* 56 */
-	volatile uint32_t nicCmdsFDRFiltering;			/* 57 */
-	volatile uint32_t nicCmdsSetRecvProdIndex;		/* 58 */
-	volatile uint32_t nicCmdsUpdateGencommStats;		/* 59 */
-	volatile uint32_t nicCmdsResetJumboRing;		/* 60 */
-	volatile uint32_t nicCmdsAddMCastAddr;			/* 61 */
-	volatile uint32_t nicCmdsDelMCastAddr;			/* 62 */
-	volatile uint32_t nicCmdsSetPromiscMode;		/* 63 */
-	volatile uint32_t nicCmdsLinkNegotiate;		/* 64 */
-	volatile uint32_t nicCmdsSetMACAddr;			/* 65 */
-	volatile uint32_t nicCmdsClearProfile;			/* 66 */
-	volatile uint32_t nicCmdsSetMulticastMode;		/* 67 */
-	volatile uint32_t nicCmdsClearStats;			/* 68 */
-	volatile uint32_t nicCmdsSetRecvJumboProdIndex;	/* 69 */
-	volatile uint32_t nicCmdsSetRecvMiniProdIndex;		/* 70 */
-	volatile uint32_t nicCmdsRefreshStats;			/* 71 */
-	volatile uint32_t nicCmdsUnknown;			/* 72 */
-	/*
-	 * NIC Events
-	 */
-	volatile uint32_t nicEventsNICFirmwareOperational;	/* 73 */
-	volatile uint32_t nicEventsStatsUpdated;		/* 74 */
-	volatile uint32_t nicEventsLinkStateChanged;		/* 75 */
-	volatile uint32_t nicEventsError;			/* 76 */
-	volatile uint32_t nicEventsMCastListUpdated;		/* 77 */
-	volatile uint32_t nicEventsResetJumboRing;		/* 78 */
-	/*
-	 * Ring manipulation
-	 */
-	volatile uint32_t nicRingSetSendProdIndex;		/* 79 */
-	volatile uint32_t nicRingSetSendConsIndex;		/* 80 */
-	volatile uint32_t nicRingSetRecvReturnProdIndex;	/* 81 */
-	/*
-	 * Interrupts
-	 */
-	volatile uint32_t nicInterrupts;			/* 82 */
-	volatile uint32_t nicAvoidedInterrupts;		/* 83 */
-	/*
-	 * BD Coalessing Thresholds
-	 */
-	volatile uint32_t nicEventThresholdHit;		/* 84 */
-	volatile uint32_t nicSendThresholdHit;			/* 85 */
-	volatile uint32_t nicRecvThresholdHit;			/* 86 */
-	/*
-	 * DMA Attentions
-	 */
-	volatile uint32_t nicDmaRdOverrun;			/* 87 */
-	volatile uint32_t nicDmaRdUnderrun;			/* 88 */
-	volatile uint32_t nicDmaWrOverrun;			/* 89 */
-	volatile uint32_t nicDmaWrUnderrun;			/* 90 */
-	volatile uint32_t nicDmaWrMasterAborts;		/* 91 */
-	volatile uint32_t nicDmaRdMasterAborts;		/* 92 */
-	/*
-	 * NIC Resources
-	 */
-	volatile uint32_t nicDmaWriteRingFull;			/* 93 */
-	volatile uint32_t nicDmaReadRingFull;			/* 94 */
-	volatile uint32_t nicEventRingFull;			/* 95 */
-	volatile uint32_t nicEventProducerRingFull;		/* 96 */
-	volatile uint32_t nicTxMacDescrRingFull;		/* 97 */
-	volatile uint32_t nicOutOfTxBufSpaceFrameRetry;	/* 98 */
-	volatile uint32_t nicNoMoreWrDMADescriptors;		/* 99 */
-	volatile uint32_t nicNoMoreRxBDs;			/* 100 */
-	volatile uint32_t nicNoSpaceInReturnRing;		/* 101 */
-	volatile uint32_t nicSendBDs;            /* current count 102 */
-	volatile uint32_t nicRecvBDs;            /* current count 103 */
-	volatile uint32_t nicJumboRecvBDs;       /* current count 104 */
-	volatile uint32_t nicMiniRecvBDs;        /* current count 105 */
-	volatile uint32_t nicTotalRecvBDs;       /* current count 106 */
-	volatile uint32_t nicTotalSendBDs;       /* current count 107 */
-	volatile uint32_t nicJumboSpillOver;			/* 108 */
-	volatile uint32_t nicSbusHangCleared;			/* 109 */
-	volatile uint32_t nicEnqEventDelayed;			/* 110 */
-	/*
-	 * Stats from MAC rx completion
-	 */
-	volatile uint32_t nicMacRxLateColls;			/* 111 */
-	volatile uint32_t nicMacRxLinkLostDuringPkt;		/* 112 */
-	volatile uint32_t nicMacRxPhyDecodeErr;		/* 113 */
-	volatile uint32_t nicMacRxMacAbort;			/* 114 */
-	volatile uint32_t nicMacRxTruncNoResources;		/* 115 */
-	/*
-	 * Stats from the mac_stats area
-	 */
-	volatile uint32_t nicMacRxDropUla;			/* 116 */
-	volatile uint32_t nicMacRxDropMcast;			/* 117 */
-	volatile uint32_t nicMacRxFlowControl;			/* 118 */
-	volatile uint32_t nicMacRxDropSpace;			/* 119 */
-	volatile uint32_t nicMacRxColls;			/* 120 */
-	/*
- 	 * MAC RX Attentions
-	 */
-	volatile uint32_t nicMacRxTotalAttns;			/* 121 */
-	volatile uint32_t nicMacRxLinkAttns;			/* 122 */
-	volatile uint32_t nicMacRxSyncAttns;			/* 123 */
-	volatile uint32_t nicMacRxConfigAttns;			/* 124 */
-	volatile uint32_t nicMacReset;				/* 125 */
-	volatile uint32_t nicMacRxBufDescrAttns;		/* 126 */
-	volatile uint32_t nicMacRxBufAttns;			/* 127 */
-	volatile uint32_t nicMacRxZeroFrameCleanup;		/* 128 */
-	volatile uint32_t nicMacRxOneFrameCleanup;		/* 129 */
-	volatile uint32_t nicMacRxMultipleFrameCleanup;	/* 130 */
-	volatile uint32_t nicMacRxTimerCleanup;		/* 131 */
-	volatile uint32_t nicMacRxDmaCleanup;			/* 132 */
-	/*
-	 * Stats from the mac_stats area
-	 */
-	volatile uint32_t nicMacTxCollisionHistogram[15];	/* 133 */
-	/*
-	 * MAC TX Attentions
-	 */
-	volatile uint32_t nicMacTxTotalAttns;			/* 134 */
-	/*
-	 * NIC Profile
-	 */
-	volatile uint32_t nicProfile[32];			/* 135 */
-	/*
-	 * Pat to 1024 bytes.
-	 */
-	uint32_t		pad[75];
-};
-
-struct tg_reg {
-	uint32_t	data;
-	uint32_t	addr;
-};      
-
-struct tg_mem {
-	uint32_t	tgAddr;
-	caddr_t		userAddr;
-	int		len;
-}; 
-
-
-typedef enum {
-	TI_PARAM_NONE		= 0x00,
-	TI_PARAM_STAT_TICKS	= 0x01,
-	TI_PARAM_RX_COAL_TICKS	= 0x02,
-	TI_PARAM_TX_COAL_TICKS	= 0x04,
-	TI_PARAM_RX_COAL_BDS	= 0x08,
-	TI_PARAM_TX_COAL_BDS	= 0x10,
-	TI_PARAM_TX_BUF_RATIO	= 0x20,
-	TI_PARAM_ALL		= 0x2f
-} ti_param_mask;
-
-struct ti_params {
-	uint32_t	ti_stat_ticks;
-	uint32_t	ti_rx_coal_ticks;
-	uint32_t	ti_tx_coal_ticks;
-	uint32_t	ti_rx_max_coal_bds;
-	uint32_t	ti_tx_max_coal_bds;
-	uint32_t	ti_tx_buf_ratio;
-	ti_param_mask	param_mask;
-};
-
-typedef enum {
-	TI_TRACE_TYPE_NONE	= 0x00000000,
-	TI_TRACE_TYPE_SEND	= 0x00000001,
-	TI_TRACE_TYPE_RECV	= 0x00000002,
-	TI_TRACE_TYPE_DMA	= 0x00000004,
-	TI_TRACE_TYPE_EVENT	= 0x00000008,
-	TI_TRACE_TYPE_COMMAND	= 0x00000010,
-	TI_TRACE_TYPE_MAC	= 0x00000020,
-	TI_TRACE_TYPE_STATS	= 0x00000040,
-	TI_TRACE_TYPE_TIMER	= 0x00000080,
-	TI_TRACE_TYPE_DISP	= 0x00000100,
-	TI_TRACE_TYPE_MAILBOX	= 0x00000200,
-	TI_TRACE_TYPE_RECV_BD	= 0x00000400,
-	TI_TRACE_TYPE_LNK_PHY	= 0x00000800,
-	TI_TRACE_TYPE_LNK_NEG	= 0x00001000,
-	TI_TRACE_LEVEL_1	= 0x10000000,
-	TI_TRACE_LEVEL_2	= 0x20000000
-} ti_trace_type;
-
-struct ti_trace_buf {
-	u_long	*buf;
-	int	buf_len;
-	int	fill_len;
-	u_long	cur_trace_ptr;
-};
-
-#define	TIIOCGETSTATS	_IOR('T', 1, struct ti_stats)
-#define	TIIOCGETPARAMS	_IOR('T', 2, struct ti_params)
-#define	TIIOCSETPARAMS	_IOW('T', 3, struct ti_params)
-#define TIIOCSETTRACE	_IOW('T', 11, ti_trace_type)
-#define TIIOCGETTRACE	_IOWR('T', 12, struct ti_trace_buf)
-
-/*
- * Taken from Alteon's altioctl.h.  Alteon's ioctl numbers 1-6 aren't
- * used by the FreeBSD driver.
- */
-#define ALT_ATTACH		_IO('a', 7)
-#define ALT_READ_TG_MEM		_IOWR('a', 10, struct tg_mem)
-#define ALT_WRITE_TG_MEM	_IOWR('a', 11, struct tg_mem)
-#define ALT_READ_TG_REG		_IOWR('a', 12, struct tg_reg)
-#define ALT_WRITE_TG_REG	_IOWR('a', 13, struct tg_reg)
-
-#endif /* _SYS_TIIO_H_  */
diff --git a/include.new/sys/time.h b/include.new/sys/time.h
deleted file mode 100644
index cf78024..0000000
--- a/include.new/sys/time.h
+++ /dev/null
@@ -1,498 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $FreeBSD: releng/10.2/sys/sys/time.h 270240 2014-08-20 18:40:29Z davide $
- */
-
-#ifndef _SYS_TIME_H_
-#define	_SYS_TIME_H_
-
-#include <sys/_timeval.h>
-#include <sys/types.h>
-#include <sys/timespec.h>
-
-struct timezone {
-	int	tz_minuteswest;	/* minutes west of Greenwich */
-	int	tz_dsttime;	/* type of dst correction */
-};
-#define	DST_NONE	0	/* not on dst */
-#define	DST_USA		1	/* USA style dst */
-#define	DST_AUST	2	/* Australian style dst */
-#define	DST_WET		3	/* Western European dst */
-#define	DST_MET		4	/* Middle European dst */
-#define	DST_EET		5	/* Eastern European dst */
-#define	DST_CAN		6	/* Canada */
-
-#if __BSD_VISIBLE
-struct bintime {
-	time_t	sec;
-	uint64_t frac;
-};
-
-static __inline void
-bintime_addx(struct bintime *_bt, uint64_t _x)
-{
-	uint64_t _u;
-
-	_u = _bt->frac;
-	_bt->frac += _x;
-	if (_u > _bt->frac)
-		_bt->sec++;
-}
-
-static __inline void
-bintime_add(struct bintime *_bt, const struct bintime *_bt2)
-{
-	uint64_t _u;
-
-	_u = _bt->frac;
-	_bt->frac += _bt2->frac;
-	if (_u > _bt->frac)
-		_bt->sec++;
-	_bt->sec += _bt2->sec;
-}
-
-static __inline void
-bintime_sub(struct bintime *_bt, const struct bintime *_bt2)
-{
-	uint64_t _u;
-
-	_u = _bt->frac;
-	_bt->frac -= _bt2->frac;
-	if (_u < _bt->frac)
-		_bt->sec--;
-	_bt->sec -= _bt2->sec;
-}
-
-static __inline void
-bintime_mul(struct bintime *_bt, u_int _x)
-{
-	uint64_t _p1, _p2;
-
-	_p1 = (_bt->frac & 0xffffffffull) * _x;
-	_p2 = (_bt->frac >> 32) * _x + (_p1 >> 32);
-	_bt->sec *= _x;
-	_bt->sec += (_p2 >> 32);
-	_bt->frac = (_p2 << 32) | (_p1 & 0xffffffffull);
-}
-
-static __inline void
-bintime_shift(struct bintime *_bt, int _exp)
-{
-
-	if (_exp > 0) {
-		_bt->sec <<= _exp;
-		_bt->sec |= _bt->frac >> (64 - _exp);
-		_bt->frac <<= _exp;
-	} else if (_exp < 0) {
-		_bt->frac >>= -_exp;
-		_bt->frac |= (uint64_t)_bt->sec << (64 + _exp);
-		_bt->sec >>= -_exp;
-	}
-}
-
-#define	bintime_clear(a)	((a)->sec = (a)->frac = 0)
-#define	bintime_isset(a)	((a)->sec || (a)->frac)
-#define	bintime_cmp(a, b, cmp)						\
-	(((a)->sec == (b)->sec) ?					\
-	    ((a)->frac cmp (b)->frac) :					\
-	    ((a)->sec cmp (b)->sec))
-
-#define	SBT_1S	((sbintime_t)1 << 32)
-#define	SBT_1M	(SBT_1S * 60)
-#define	SBT_1MS	(SBT_1S / 1000)
-#define	SBT_1US	(SBT_1S / 1000000)
-#define	SBT_1NS	(SBT_1S / 1000000000)
-#define	SBT_MAX 0x7fffffffffffffff
-
-static __inline int
-sbintime_getsec(sbintime_t _sbt)
-{
-
-	return (_sbt >> 32);
-}
-
-static __inline sbintime_t
-bttosbt(const struct bintime _bt)
-{
-
-	return (((sbintime_t)_bt.sec << 32) + (_bt.frac >> 32));
-}
-
-static __inline struct bintime
-sbttobt(sbintime_t _sbt)
-{
-	struct bintime _bt;
-
-	_bt.sec = _sbt >> 32;
-	_bt.frac = _sbt << 32;
-	return (_bt);
-}
-
-/*-
- * Background information:
- *
- * When converting between timestamps on parallel timescales of differing
- * resolutions it is historical and scientific practice to round down rather
- * than doing 4/5 rounding.
- *
- *   The date changes at midnight, not at noon.
- *
- *   Even at 15:59:59.999999999 it's not four'o'clock.
- *
- *   time_second ticks after N.999999999 not after N.4999999999
- */
-
-static __inline void
-bintime2timespec(const struct bintime *_bt, struct timespec *_ts)
-{
-
-	_ts->tv_sec = _bt->sec;
-	_ts->tv_nsec = ((uint64_t)1000000000 *
-	    (uint32_t)(_bt->frac >> 32)) >> 32;
-}
-
-static __inline void
-timespec2bintime(const struct timespec *_ts, struct bintime *_bt)
-{
-
-	_bt->sec = _ts->tv_sec;
-	/* 18446744073 = int(2^64 / 1000000000) */
-	_bt->frac = _ts->tv_nsec * (uint64_t)18446744073LL;
-}
-
-static __inline void
-bintime2timeval(const struct bintime *_bt, struct timeval *_tv)
-{
-
-	_tv->tv_sec = _bt->sec;
-	_tv->tv_usec = ((uint64_t)1000000 * (uint32_t)(_bt->frac >> 32)) >> 32;
-}
-
-static __inline void
-timeval2bintime(const struct timeval *_tv, struct bintime *_bt)
-{
-
-	_bt->sec = _tv->tv_sec;
-	/* 18446744073709 = int(2^64 / 1000000) */
-	_bt->frac = _tv->tv_usec * (uint64_t)18446744073709LL;
-}
-
-static __inline struct timespec
-sbttots(sbintime_t _sbt)
-{
-	struct timespec _ts;
-
-	_ts.tv_sec = _sbt >> 32;
-	_ts.tv_nsec = ((uint64_t)1000000000 * (uint32_t)_sbt) >> 32;
-	return (_ts);
-}
-
-static __inline sbintime_t
-tstosbt(struct timespec _ts)
-{
-
-	return (((sbintime_t)_ts.tv_sec << 32) +
-	    (_ts.tv_nsec * (((uint64_t)1 << 63) / 500000000) >> 32));
-}
-
-static __inline struct timeval
-sbttotv(sbintime_t _sbt)
-{
-	struct timeval _tv;
-
-	_tv.tv_sec = _sbt >> 32;
-	_tv.tv_usec = ((uint64_t)1000000 * (uint32_t)_sbt) >> 32;
-	return (_tv);
-}
-
-static __inline sbintime_t
-tvtosbt(struct timeval _tv)
-{
-
-	return (((sbintime_t)_tv.tv_sec << 32) +
-	    (_tv.tv_usec * (((uint64_t)1 << 63) / 500000) >> 32));
-}
-#endif /* __BSD_VISIBLE */
-
-#ifdef _KERNEL
-
-/* Operations on timespecs */
-#define	timespecclear(tvp)	((tvp)->tv_sec = (tvp)->tv_nsec = 0)
-#define	timespecisset(tvp)	((tvp)->tv_sec || (tvp)->tv_nsec)
-#define	timespeccmp(tvp, uvp, cmp)					\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
-	    ((tvp)->tv_nsec cmp (uvp)->tv_nsec) :			\
-	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#define	timespecadd(vvp, uvp)						\
-	do {								\
-		(vvp)->tv_sec += (uvp)->tv_sec;				\
-		(vvp)->tv_nsec += (uvp)->tv_nsec;			\
-		if ((vvp)->tv_nsec >= 1000000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_nsec -= 1000000000;			\
-		}							\
-	} while (0)
-#define	timespecsub(vvp, uvp)						\
-	do {								\
-		(vvp)->tv_sec -= (uvp)->tv_sec;				\
-		(vvp)->tv_nsec -= (uvp)->tv_nsec;			\
-		if ((vvp)->tv_nsec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_nsec += 1000000000;			\
-		}							\
-	} while (0)
-
-/* Operations on timevals. */
-
-#define	timevalclear(tvp)		((tvp)->tv_sec = (tvp)->tv_usec = 0)
-#define	timevalisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timevalcmp(tvp, uvp, cmp)					\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
-	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
-	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-
-/* timevaladd and timevalsub are not inlined */
-
-#endif /* _KERNEL */
-
-#ifndef _KERNEL			/* NetBSD/OpenBSD compatible interfaces */
-
-#define	timerclear(tvp)		((tvp)->tv_sec = (tvp)->tv_usec = 0)
-#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timercmp(tvp, uvp, cmp)					\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
-	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
-	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#define	timeradd(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec >= 1000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_usec -= 1000000;			\
-		}							\
-	} while (0)
-#define	timersub(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_usec += 1000000;			\
-		}							\
-	} while (0)
-#endif
-
-/*
- * Names of the interval timers, and structure
- * defining a timer setting.
- */
-#define	ITIMER_REAL	0
-#define	ITIMER_VIRTUAL	1
-#define	ITIMER_PROF	2
-
-struct itimerval {
-	struct	timeval it_interval;	/* timer interval */
-	struct	timeval it_value;	/* current value */
-};
-
-/*
- * Getkerninfo clock information structure
- */
-struct clockinfo {
-	int	hz;		/* clock frequency */
-	int	tick;		/* micro-seconds per hz tick */
-	int	spare;
-	int	stathz;		/* statistics clock frequency */
-	int	profhz;		/* profiling clock frequency */
-};
-
-/* These macros are also in time.h. */
-#ifndef CLOCK_REALTIME
-#define	CLOCK_REALTIME	0
-#define	CLOCK_VIRTUAL	1
-#define	CLOCK_PROF	2
-#define	CLOCK_MONOTONIC	4
-#define	CLOCK_UPTIME	5		/* FreeBSD-specific. */
-#define	CLOCK_UPTIME_PRECISE	7	/* FreeBSD-specific. */
-#define	CLOCK_UPTIME_FAST	8	/* FreeBSD-specific. */
-#define	CLOCK_REALTIME_PRECISE	9	/* FreeBSD-specific. */
-#define	CLOCK_REALTIME_FAST	10	/* FreeBSD-specific. */
-#define	CLOCK_MONOTONIC_PRECISE	11	/* FreeBSD-specific. */
-#define	CLOCK_MONOTONIC_FAST	12	/* FreeBSD-specific. */
-#define	CLOCK_SECOND	13		/* FreeBSD-specific. */
-#define	CLOCK_THREAD_CPUTIME_ID	14
-#define	CLOCK_PROCESS_CPUTIME_ID	15
-#endif
-
-#ifndef TIMER_ABSTIME
-#define	TIMER_RELTIME	0x0	/* relative timer */
-#define	TIMER_ABSTIME	0x1	/* absolute timer */
-#endif
-
-#if __BSD_VISIBLE
-#define	CPUCLOCK_WHICH_PID	0
-#define	CPUCLOCK_WHICH_TID	1
-#endif
-
-#ifdef _KERNEL
-
-/*
- * Kernel to clock driver interface.
- */
-void	inittodr(time_t base);
-void	resettodr(void);
-
-extern volatile time_t	time_second;
-extern volatile time_t	time_uptime;
-extern struct bintime boottimebin;
-extern struct timeval boottime;
-extern struct bintime tc_tick_bt;
-extern sbintime_t tc_tick_sbt;
-extern struct bintime tick_bt;
-extern sbintime_t tick_sbt;
-extern int tc_precexp;
-extern int tc_timepercentage;
-extern struct bintime bt_timethreshold;
-extern struct bintime bt_tickthreshold;
-extern sbintime_t sbt_timethreshold;
-extern sbintime_t sbt_tickthreshold;
-
-/*
- * Functions for looking at our clock: [get]{bin,nano,micro}[up]time()
- *
- * Functions without the "get" prefix returns the best timestamp
- * we can produce in the given format.
- *
- * "bin"   == struct bintime  == seconds + 64 bit fraction of seconds.
- * "nano"  == struct timespec == seconds + nanoseconds.
- * "micro" == struct timeval  == seconds + microseconds.
- *
- * Functions containing "up" returns time relative to boot and
- * should be used for calculating time intervals.
- *
- * Functions without "up" returns GMT time.
- *
- * Functions with the "get" prefix returns a less precise result
- * much faster than the functions without "get" prefix and should
- * be used where a precision of 1/hz seconds is acceptable or where
- * performance is priority. (NB: "precision", _not_ "resolution" !)
- */
-
-void	binuptime(struct bintime *bt);
-void	nanouptime(struct timespec *tsp);
-void	microuptime(struct timeval *tvp);
-
-static __inline sbintime_t
-sbinuptime(void)
-{
-	struct bintime _bt;
-
-	binuptime(&_bt);
-	return (bttosbt(_bt));
-}
-
-void	bintime(struct bintime *bt);
-void	nanotime(struct timespec *tsp);
-void	microtime(struct timeval *tvp);
-
-void	getbinuptime(struct bintime *bt);
-void	getnanouptime(struct timespec *tsp);
-void	getmicrouptime(struct timeval *tvp);
-
-static __inline sbintime_t
-getsbinuptime(void)
-{
-	struct bintime _bt;
-
-	getbinuptime(&_bt);
-	return (bttosbt(_bt));
-}
-
-void	getbintime(struct bintime *bt);
-void	getnanotime(struct timespec *tsp);
-void	getmicrotime(struct timeval *tvp);
-
-/* Other functions */
-int	itimerdecr(struct itimerval *itp, int usec);
-int	itimerfix(struct timeval *tv);
-int	ppsratecheck(struct timeval *, int *, int);
-int	ratecheck(struct timeval *, const struct timeval *);
-void	timevaladd(struct timeval *t1, const struct timeval *t2);
-void	timevalsub(struct timeval *t1, const struct timeval *t2);
-int	tvtohz(struct timeval *tv);
-
-#define	TC_DEFAULTPERC		5
-
-#define	BT2FREQ(bt)                                                     \
-	(((uint64_t)0x8000000000000000 + ((bt)->frac >> 2)) /           \
-	    ((bt)->frac >> 1))
-
-#define	SBT2FREQ(sbt)	((SBT_1S + ((sbt) >> 1)) / (sbt))
-
-#define	FREQ2BT(freq, bt)                                               \
-{									\
-	(bt)->sec = 0;                                                  \
-	(bt)->frac = ((uint64_t)0x8000000000000000  / (freq)) << 1;     \
-}
-
-#define	TIMESEL(sbt, sbt2)						\
-	(((sbt2) >= sbt_timethreshold) ?				\
-	    ((*(sbt) = getsbinuptime()), 1) : ((*(sbt) = sbinuptime()), 0))
-
-#else /* !_KERNEL */
-#include <time.h>
-
-#include <sys/cdefs.h>
-#include <sys/select.h>
-
-__BEGIN_DECLS
-int	setitimer(int, const struct itimerval *, struct itimerval *);
-int	utimes(const char *, const struct timeval *);
-
-#if __BSD_VISIBLE
-int	adjtime(const struct timeval *, struct timeval *);
-int	clock_getcpuclockid2(id_t, int, clockid_t *);
-int	futimes(int, const struct timeval *);
-int	futimesat(int, const char *, const struct timeval [2]);
-int	lutimes(const char *, const struct timeval *);
-int	settimeofday(const struct timeval *, const struct timezone *);
-#endif
-
-#if __XSI_VISIBLE
-int	getitimer(int, struct itimerval *);
-int	gettimeofday(struct timeval *, struct timezone *);
-#endif
-
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_TIME_H_ */
diff --git a/include.new/sys/timeb.h b/include.new/sys/timeb.h
deleted file mode 100644
index b8f9107..0000000
--- a/include.new/sys/timeb.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)timeb.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/timeb.h 204926 2010-03-09 21:01:12Z ed $
- */
-
-#ifndef _SYS_TIMEB_H_
-#define _SYS_TIMEB_H_
-
-#ifdef __GNUC__
-#warning "this file includes <sys/timeb.h> which is deprecated"
-#endif
-
-#include <sys/_types.h>
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-/* The ftime(2) system call structure -- deprecated. */
-struct timeb {
-	time_t	time;			/* seconds since the Epoch */
-	unsigned short millitm;		/* + milliseconds since the Epoch */
-	short	timezone;		/* minutes west of CUT */
-	short	dstflag;		/* DST == non-zero */
-};
-
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int ftime(struct timeb *);
-__END_DECLS
-#endif /* _KERNEL */
-
-#endif /* !_SYS_TIMEB_H_ */
diff --git a/include.new/sys/timeet.h b/include.new/sys/timeet.h
deleted file mode 100644
index 7e4a077..0000000
--- a/include.new/sys/timeet.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 2010-2013 Alexander Motin <mav@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,
- *    without modification, immediately at the beginning of the file.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/timeet.h 266347 2014-05-17 20:10:12Z ian $
- */
-
-#ifndef _SYS_TIMEEC_H_
-#define	_SYS_TIMEEC_H_
-
-#ifndef _KERNEL
-#error "no user-serviceable parts inside"
-#endif
-
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/queue.h>
-#include <sys/time.h>
-
-/*
- * `struct eventtimer' is the interface between the hardware which implements
- * a event timer and the MI code which uses this to receive time events.
- */
-
-struct eventtimer;
-typedef int et_start_t(struct eventtimer *et,
-    sbintime_t first, sbintime_t period);
-typedef int et_stop_t(struct eventtimer *et);
-typedef void et_event_cb_t(struct eventtimer *et, void *arg);
-typedef int et_deregister_cb_t(struct eventtimer *et, void *arg);
-
-struct eventtimer {
-	SLIST_ENTRY(eventtimer)	et_all;
-		/* Pointer to the next event timer. */
-	char			*et_name;
-		/* Name of the event timer. */
-	int			et_flags;
-		/* Set of capabilities flags: */
-#define ET_FLAGS_PERIODIC	1
-#define ET_FLAGS_ONESHOT	2
-#define ET_FLAGS_PERCPU		4
-#define ET_FLAGS_C3STOP		8
-#define ET_FLAGS_POW2DIV	16
-	int			et_quality;
-		/*
-		 * Used to determine if this timecounter is better than
-		 * another timecounter. Higher means better.
-		 */
-	int			et_active;
-	u_int64_t		et_frequency;
-		/* Base frequency in Hz. */
-	sbintime_t		et_min_period;
-	sbintime_t		et_max_period;
-	et_start_t		*et_start;
-	et_stop_t		*et_stop;
-	et_event_cb_t		*et_event_cb;
-	et_deregister_cb_t	*et_deregister_cb;
-	void 			*et_arg;
-	void			*et_priv;
-	struct sysctl_oid	*et_sysctl;
-		/* Pointer to the event timer's private parts. */
-};
-
-extern struct mtx	et_eventtimers_mtx;
-#define	ET_LOCK()	mtx_lock(&et_eventtimers_mtx)
-#define	ET_UNLOCK()	mtx_unlock(&et_eventtimers_mtx)
-
-/* Driver API */
-int	et_register(struct eventtimer *et);
-int	et_deregister(struct eventtimer *et);
-void	et_change_frequency(struct eventtimer *et, uint64_t newfreq);
-/* Consumer API  */
-struct eventtimer *et_find(const char *name, int check, int want);
-int	et_init(struct eventtimer *et, et_event_cb_t *event,
-    et_deregister_cb_t *deregister, void *arg);
-int	et_start(struct eventtimer *et, sbintime_t first, sbintime_t period);
-int	et_stop(struct eventtimer *et);
-int	et_ban(struct eventtimer *et);
-int	et_free(struct eventtimer *et);
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_kern_eventtimer);
-#endif
-#endif /* !_SYS_TIMETC_H_ */
-
diff --git a/include.new/sys/timeffc.h b/include.new/sys/timeffc.h
deleted file mode 100644
index 5cb4e66..0000000
--- a/include.new/sys/timeffc.h
+++ /dev/null
@@ -1,389 +0,0 @@
-/*-
- * Copyright (c) 2011 The University of Melbourne
- * All rights reserved.
- *
- * This software was developed by Julien Ridoux at the University of Melbourne
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/timeffc.h 228856 2011-12-24 01:32:01Z lstewart $
- */
-
-#ifndef _SYS_TIMEFF_H_
-#define _SYS_TIMEFF_H_
-
-#include <sys/_ffcounter.h>
-
-/*
- * Feed-forward clock estimate
- * Holds time mark as a ffcounter and conversion to bintime based on current
- * timecounter period and offset estimate passed by the synchronization daemon.
- * Provides time of last daemon update, clock status and bound on error.
- */
-struct ffclock_estimate {
-	struct bintime	update_time;	/* Time of last estimates update. */
-	ffcounter	update_ffcount;	/* Counter value at last update. */
-	ffcounter	leapsec_next;	/* Counter value of next leap second. */
-	uint64_t	period;		/* Estimate of counter period. */
-	uint32_t	errb_abs;	/* Bound on absolute clock error [ns]. */
-	uint32_t	errb_rate;	/* Bound on counter rate error [ps/s]. */
-	uint32_t	status;		/* Clock status. */
-	int16_t		leapsec_total;	/* All leap seconds seen so far. */
-	int8_t		leapsec;	/* Next leap second (in {-1,0,1}). */
-};
-
-#if __BSD_VISIBLE
-#ifdef _KERNEL
-
-/* Define the kern.sysclock sysctl tree. */
-SYSCTL_DECL(_kern_sysclock);
-
-/* Define the kern.sysclock.ffclock sysctl tree. */
-SYSCTL_DECL(_kern_sysclock_ffclock);
-
-/*
- * Index into the sysclocks array for obtaining the ASCII name of a particular
- * sysclock.
- */
-#define	SYSCLOCK_FBCK	0
-#define	SYSCLOCK_FFWD	1
-extern int sysclock_active;
-
-/*
- * Parameters of counter characterisation required by feed-forward algorithms.
- */
-#define	FFCLOCK_SKM_SCALE	1024
-
-/*
- * Feed-forward clock status
- */
-#define	FFCLOCK_STA_UNSYNC	1
-#define	FFCLOCK_STA_WARMUP	2
-
-/*
- * Flags for use by sysclock_snap2bintime() and various ffclock_ functions to
- * control how the timecounter hardware is read and how the hardware snapshot is
- * converted into absolute time.
- * {FB|FF}CLOCK_FAST:	Do not read the hardware counter, instead using the
- *			value at last tick. The time returned has a resolution
- *			of the kernel tick timer (1/hz [s]).
- * FFCLOCK_LERP:	Linear interpolation of ffclock time to guarantee
- *			monotonic time.
- * FFCLOCK_LEAPSEC:	Include leap seconds.
- * {FB|FF}CLOCK_UPTIME:	Time stamp should be relative to system boot, not epoch.
- */
-#define	FFCLOCK_FAST		0x00000001
-#define	FFCLOCK_LERP		0x00000002
-#define	FFCLOCK_LEAPSEC		0x00000004
-#define	FFCLOCK_UPTIME		0x00000008
-#define	FFCLOCK_MASK		0x0000ffff
-
-#define	FBCLOCK_FAST		0x00010000 /* Currently unused. */
-#define	FBCLOCK_UPTIME		0x00020000
-#define	FBCLOCK_MASK		0xffff0000
-
-/*
- * Feedback clock specific info structure. The feedback clock's estimation of
- * clock error is an absolute figure determined by the NTP algorithm. The status
- * is determined by the userland daemon.
- */
-struct fbclock_info {
-	struct bintime		error;
-	struct bintime		tick_time;
-	uint64_t		th_scale;
-	int			status;
-};
-
-/*
- * Feed-forward clock specific info structure. The feed-forward clock's
- * estimation of clock error is an upper bound, which although potentially
- * looser than the feedback clock equivalent, is much more reliable. The status
- * is determined by the userland daemon.
- */
-struct ffclock_info {
-	struct bintime		error;
-	struct bintime		tick_time;
-	struct bintime		tick_time_lerp;
-	uint64_t		period;
-	uint64_t		period_lerp;
-	int			leapsec_adjustment;
-	int			status;
-};
-
-/*
- * Snapshot of system clocks and related information. Holds time read from each
- * clock based on a single read of the active hardware timecounter, as well as
- * respective clock information such as error estimates and the ffcounter value
- * at the time of the read.
- */
-struct sysclock_snap {
-	struct fbclock_info	fb_info;
-	struct ffclock_info	ff_info;
-	ffcounter		ffcount;
-	unsigned int		delta;
-	int			sysclock_active;
-};
-
-/* Take a snapshot of the system clocks and related information. */
-void sysclock_getsnapshot(struct sysclock_snap *clock_snap, int fast);
-
-/* Convert a timestamp from the selected system clock into bintime. */
-int sysclock_snap2bintime(struct sysclock_snap *cs, struct bintime *bt,
-    int whichclock, uint32_t flags);
-
-/* Resets feed-forward clock from RTC */
-void ffclock_reset_clock(struct timespec *ts);
-
-/*
- * Return the current value of the feed-forward clock counter. Essential to
- * measure time interval in counter units. If a fast timecounter is used by the
- * system, may also allow fast but accurate timestamping.
- */
-void ffclock_read_counter(ffcounter *ffcount);
-
-/*
- * Retrieve feed-forward counter value and time of last kernel tick. This
- * accepts the FFCLOCK_LERP flag.
- */
-void ffclock_last_tick(ffcounter *ffcount, struct bintime *bt, uint32_t flags);
-
-/*
- * Low level routines to convert a counter timestamp into absolute time and a
- * counter timestamp interval into an interval in seconds. The absolute time
- * conversion accepts the FFCLOCK_LERP flag.
- */
-void ffclock_convert_abs(ffcounter ffcount, struct bintime *bt, uint32_t flags);
-void ffclock_convert_diff(ffcounter ffdelta, struct bintime *bt);
-
-/*
- * Feed-forward clock routines.
- *
- * These functions rely on the timecounters and ffclock_estimates stored in
- * fftimehands. Note that the error_bound parameter is not the error of the
- * clock but an upper bound on the error of the absolute time or time interval
- * returned.
- *
- * ffclock_abstime(): retrieves current time as counter value and convert this
- *     timestamp in seconds. The value (in seconds) of the converted timestamp
- *     depends on the flags passed: for a given counter value, different
- *     conversions are possible. Different clock models can be selected by
- *     combining flags (for example (FFCLOCK_LERP|FFCLOCK_UPTIME) produces
- *     linearly interpolated uptime).
- * ffclock_difftime(): computes a time interval in seconds based on an interval
- *     measured in ffcounter units. This should be the preferred way to measure
- *     small time intervals very accurately.
- */
-void ffclock_abstime(ffcounter *ffcount, struct bintime *bt,
-    struct bintime *error_bound, uint32_t flags);
-void ffclock_difftime(ffcounter ffdelta, struct bintime *bt,
-    struct bintime *error_bound);
-
-/*
- * Wrapper routines to return current absolute time using the feed-forward
- * clock. These functions are named after those defined in <sys/time.h>, which
- * contains a description of the original ones.
- */
-void ffclock_bintime(struct bintime *bt);
-void ffclock_nanotime(struct timespec *tsp);
-void ffclock_microtime(struct timeval *tvp);
-
-void ffclock_getbintime(struct bintime *bt);
-void ffclock_getnanotime(struct timespec *tsp);
-void ffclock_getmicrotime(struct timeval *tvp);
-
-void ffclock_binuptime(struct bintime *bt);
-void ffclock_nanouptime(struct timespec *tsp);
-void ffclock_microuptime(struct timeval *tvp);
-
-void ffclock_getbinuptime(struct bintime *bt);
-void ffclock_getnanouptime(struct timespec *tsp);
-void ffclock_getmicrouptime(struct timeval *tvp);
-
-/*
- * Wrapper routines to convert a time interval specified in ffcounter units into
- * seconds using the current feed-forward clock estimates.
- */
-void ffclock_bindifftime(ffcounter ffdelta, struct bintime *bt);
-void ffclock_nanodifftime(ffcounter ffdelta, struct timespec *tsp);
-void ffclock_microdifftime(ffcounter ffdelta, struct timeval *tvp);
-
-/*
- * When FFCLOCK is enabled in the kernel, [get]{bin,nano,micro}[up]time() become
- * wrappers around equivalent feedback or feed-forward functions. Provide access
- * outside of kern_tc.c to the feedback clock equivalent functions for
- * specialised use i.e. these are not for general consumption.
- */
-void fbclock_bintime(struct bintime *bt);
-void fbclock_nanotime(struct timespec *tsp);
-void fbclock_microtime(struct timeval *tvp);
-
-void fbclock_getbintime(struct bintime *bt);
-void fbclock_getnanotime(struct timespec *tsp);
-void fbclock_getmicrotime(struct timeval *tvp);
-
-void fbclock_binuptime(struct bintime *bt);
-void fbclock_nanouptime(struct timespec *tsp);
-void fbclock_microuptime(struct timeval *tvp);
-
-void fbclock_getbinuptime(struct bintime *bt);
-void fbclock_getnanouptime(struct timespec *tsp);
-void fbclock_getmicrouptime(struct timeval *tvp);
-
-/*
- * Public system clock wrapper API which allows consumers to select which clock
- * to obtain time from, independent of the current default system clock. These
- * wrappers should be used instead of directly calling the underlying fbclock_
- * or ffclock_ functions.
- */
-static inline void
-bintime_fromclock(struct bintime *bt, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_bintime(bt);
-	else
-		fbclock_bintime(bt);
-}
-
-static inline void
-nanotime_fromclock(struct timespec *tsp, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_nanotime(tsp);
-	else
-		fbclock_nanotime(tsp);
-}
-
-static inline void
-microtime_fromclock(struct timeval *tvp, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_microtime(tvp);
-	else
-		fbclock_microtime(tvp);
-}
-
-static inline void
-getbintime_fromclock(struct bintime *bt, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_getbintime(bt);
-	else
-		fbclock_getbintime(bt);
-}
-
-static inline void
-getnanotime_fromclock(struct timespec *tsp, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_getnanotime(tsp);
-	else
-		fbclock_getnanotime(tsp);
-}
-
-static inline void
-getmicrotime_fromclock(struct timeval *tvp, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_getmicrotime(tvp);
-	else
-		fbclock_getmicrotime(tvp);
-}
-
-static inline void
-binuptime_fromclock(struct bintime *bt, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_binuptime(bt);
-	else
-		fbclock_binuptime(bt);
-}
-
-static inline void
-nanouptime_fromclock(struct timespec *tsp, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_nanouptime(tsp);
-	else
-		fbclock_nanouptime(tsp);
-}
-
-static inline void
-microuptime_fromclock(struct timeval *tvp, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_microuptime(tvp);
-	else
-		fbclock_microuptime(tvp);
-}
-
-static inline void
-getbinuptime_fromclock(struct bintime *bt, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_getbinuptime(bt);
-	else
-		fbclock_getbinuptime(bt);
-}
-
-static inline void
-getnanouptime_fromclock(struct timespec *tsp, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_getnanouptime(tsp);
-	else
-		fbclock_getnanouptime(tsp);
-}
-
-static inline void
-getmicrouptime_fromclock(struct timeval *tvp, int whichclock)
-{
-
-	if (whichclock == SYSCLOCK_FFWD)
-		ffclock_getmicrouptime(tvp);
-	else
-		fbclock_getmicrouptime(tvp);
-}
-
-#else /* !_KERNEL */
-
-/* Feed-Forward Clock system calls. */
-__BEGIN_DECLS
-int ffclock_getcounter(ffcounter *ffcount);
-int ffclock_getestimate(struct ffclock_estimate *cest);
-int ffclock_setestimate(struct ffclock_estimate *cest);
-__END_DECLS
-
-#endif /* _KERNEL */
-#endif /* __BSD_VISIBLE */
-#endif /* _SYS_TIMEFF_H_ */
diff --git a/include.new/sys/timepps.h b/include.new/sys/timepps.h
deleted file mode 100644
index b8dea19..0000000
--- a/include.new/sys/timepps.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- *
- * Portions of this software were developed by Julien Ridoux at the University
- * of Melbourne under sponsorship from the FreeBSD Foundation.
- *
- * $FreeBSD: releng/10.2/sys/sys/timepps.h 283341 2015-05-24 00:53:43Z ian $
- *
- * The is a FreeBSD version of the RFC 2783 API for Pulse Per Second 
- * timing interfaces.  
- */
-
-#ifndef _SYS_TIMEPPS_H_
-#define _SYS_TIMEPPS_H_
-
-#include <sys/_ffcounter.h>
-#include <sys/ioccom.h>
-#include <sys/time.h>
-
-#define PPS_API_VERS_1	1
-
-typedef int pps_handle_t;	
-
-typedef unsigned pps_seq_t;
-
-typedef struct ntp_fp {
-	unsigned int	integral;
-	unsigned int	fractional;
-} ntp_fp_t;
-
-typedef union pps_timeu {
-	struct timespec	tspec;
-	ntp_fp_t	ntpfp;
-	unsigned long	longpad[3];
-} pps_timeu_t;
-
-typedef struct {
-	pps_seq_t	assert_sequence;	/* assert event seq # */
-	pps_seq_t	clear_sequence;		/* clear event seq # */
-	pps_timeu_t	assert_tu;
-	pps_timeu_t	clear_tu;
-	int		current_mode;		/* current mode bits */
-} pps_info_t;
-
-typedef struct {
-	pps_seq_t	assert_sequence;	/* assert event seq # */
-	pps_seq_t	clear_sequence;		/* clear event seq # */
-	pps_timeu_t	assert_tu;
-	pps_timeu_t	clear_tu;
-	ffcounter	assert_ffcount;		/* ffcounter on assert event */
-	ffcounter	clear_ffcount;		/* ffcounter on clear event */
-	int		current_mode;		/* current mode bits */
-} pps_info_ffc_t;
-
-#define assert_timestamp        assert_tu.tspec
-#define clear_timestamp         clear_tu.tspec
-
-#define assert_timestamp_ntpfp  assert_tu.ntpfp
-#define clear_timestamp_ntpfp   clear_tu.ntpfp
-
-typedef struct {
-	int api_version;			/* API version # */
-	int mode;				/* mode bits */
-	pps_timeu_t assert_off_tu;
-	pps_timeu_t clear_off_tu;
-} pps_params_t;
-
-#define assert_offset   assert_off_tu.tspec
-#define clear_offset    clear_off_tu.tspec
-
-#define assert_offset_ntpfp     assert_off_tu.ntpfp
-#define clear_offset_ntpfp      clear_off_tu.ntpfp
-
-
-#define PPS_CAPTUREASSERT	0x01
-#define PPS_CAPTURECLEAR	0x02
-#define PPS_CAPTUREBOTH		0x03
-
-#define PPS_OFFSETASSERT	0x10
-#define PPS_OFFSETCLEAR		0x20
-
-#define PPS_ECHOASSERT		0x40
-#define PPS_ECHOCLEAR		0x80
-
-#define PPS_CANWAIT		0x100
-#define PPS_CANPOLL		0x200
-
-#define PPS_TSFMT_TSPEC		0x1000
-#define PPS_TSFMT_NTPFP		0x2000
-
-#define	PPS_TSCLK_FBCK		0x10000
-#define	PPS_TSCLK_FFWD		0x20000
-#define	PPS_TSCLK_MASK		0x30000
-
-#define PPS_KC_HARDPPS		0
-#define PPS_KC_HARDPPS_PLL	1
-#define PPS_KC_HARDPPS_FLL	2
-
-struct pps_fetch_args {
-	int tsformat;
-	pps_info_t	pps_info_buf;
-	struct timespec	timeout;
-};
-
-struct pps_fetch_ffc_args {
-	int		tsformat;
-	pps_info_ffc_t	pps_info_buf_ffc;
-	struct timespec	timeout;
-};
-
-struct pps_kcbind_args {
-	int kernel_consumer;
-	int edge;
-	int tsformat;
-};
-
-#define PPS_IOC_CREATE		_IO('1', 1)
-#define PPS_IOC_DESTROY		_IO('1', 2)
-#define PPS_IOC_SETPARAMS	_IOW('1', 3, pps_params_t)
-#define PPS_IOC_GETPARAMS	_IOR('1', 4, pps_params_t)
-#define PPS_IOC_GETCAP		_IOR('1', 5, int)
-#define PPS_IOC_FETCH		_IOWR('1', 6, struct pps_fetch_args)
-#define PPS_IOC_KCBIND		_IOW('1', 7, struct pps_kcbind_args)
-#define	PPS_IOC_FETCH_FFCOUNTER	_IOWR('1', 8, struct pps_fetch_ffc_args)
-
-#ifdef _KERNEL
-
-struct mtx;
-
-#define	KCMODE_EDGEMASK		0x03
-#define	KCMODE_ABIFLAG		0x80000000 /* Internal use: abi-aware driver. */
-
-#define	PPS_ABI_VERSION		1
-
-#define	PPSFLAG_MTX_SPIN	0x01	/* Driver mtx is MTX_SPIN type. */
-
-struct pps_state {
-	/* Capture information. */
-	struct timehands *capth;
-	struct fftimehands *capffth;
-	unsigned	capgen;
-	unsigned	capcount;
-
-	/* State information. */
-	pps_params_t	ppsparam;
-	pps_info_t	ppsinfo;
-	pps_info_ffc_t	ppsinfo_ffc;
-	int		kcmode;
-	int		ppscap;
-	struct timecounter *ppstc;
-	unsigned	ppscount[3];
-	/*
-	 * The following fields are valid if the driver calls pps_init_abi().
-	 */
-	uint16_t	driver_abi;	/* Driver sets before pps_init_abi(). */
-	uint16_t	kernel_abi;	/* Kernel sets during pps_init_abi(). */
-	struct mtx	*driver_mtx;	/* Optional, valid if non-NULL. */
-	uint32_t	flags;
-};
-
-void pps_capture(struct pps_state *pps);
-void pps_event(struct pps_state *pps, int event);
-void pps_init(struct pps_state *pps);
-void pps_init_abi(struct pps_state *pps);
-int pps_ioctl(unsigned long cmd, caddr_t data, struct pps_state *pps);
-void hardpps(struct timespec *tsp, long nsec);
-
-#else /* !_KERNEL */
-
-static __inline int
-time_pps_create(int filedes, pps_handle_t *handle)
-{
-	int error;
-
-	*handle = -1;
-	error = ioctl(filedes, PPS_IOC_CREATE, 0);
-	if (error < 0) 
-		return (-1);
-	*handle = filedes;
-	return (0);
-}
-
-static __inline int
-time_pps_destroy(pps_handle_t handle)
-{
-	return (ioctl(handle, PPS_IOC_DESTROY, 0));
-}
-
-static __inline int
-time_pps_setparams(pps_handle_t handle, const pps_params_t *ppsparams)
-{
-	return (ioctl(handle, PPS_IOC_SETPARAMS, ppsparams));
-}
-
-static __inline int
-time_pps_getparams(pps_handle_t handle, pps_params_t *ppsparams)
-{
-	return (ioctl(handle, PPS_IOC_GETPARAMS, ppsparams));
-}
-
-static __inline int 
-time_pps_getcap(pps_handle_t handle, int *mode)
-{
-	return (ioctl(handle, PPS_IOC_GETCAP, mode));
-}
-
-static __inline int
-time_pps_fetch(pps_handle_t handle, const int tsformat,
-	pps_info_t *ppsinfobuf, const struct timespec *timeout)
-{
-	int error;
-	struct pps_fetch_args arg;
-
-	arg.tsformat = tsformat;
-	if (timeout == NULL) {
-		arg.timeout.tv_sec = -1;
-		arg.timeout.tv_nsec = -1;
-	} else
-		arg.timeout = *timeout;
-	error = ioctl(handle, PPS_IOC_FETCH, &arg);
-	*ppsinfobuf = arg.pps_info_buf;
-	return (error);
-}
-
-static __inline int
-time_pps_fetch_ffc(pps_handle_t handle, const int tsformat,
-	pps_info_ffc_t *ppsinfobuf, const struct timespec *timeout)
-{
-	struct pps_fetch_ffc_args arg;
-	int error;
-
-	arg.tsformat = tsformat;
-	if (timeout == NULL) {
-		arg.timeout.tv_sec = -1;
-		arg.timeout.tv_nsec = -1;
-	} else {
-		arg.timeout = *timeout;
-	}
-	error = ioctl(handle, PPS_IOC_FETCH_FFCOUNTER, &arg);
-	*ppsinfobuf = arg.pps_info_buf_ffc;
-	return (error);
-}
-
-static __inline int
-time_pps_kcbind(pps_handle_t handle, const int kernel_consumer,
-	const int edge, const int tsformat)
-{
-	struct pps_kcbind_args arg;
-
-	arg.kernel_consumer = kernel_consumer;
-	arg.edge = edge;
-	arg.tsformat = tsformat;
-	return (ioctl(handle, PPS_IOC_KCBIND, &arg));
-}
-
-#endif /* KERNEL */
-
-#endif /* !_SYS_TIMEPPS_H_ */
diff --git a/include.new/sys/timers.h b/include.new/sys/timers.h
deleted file mode 100644
index f0e2e61..0000000
--- a/include.new/sys/timers.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 2005 David Xu <davidxu@freebsd.org>
- * Copyright (c) 1994 by Chris Provenzano, proven@mit.edu
- * 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 Chris Provenzano.
- * 4. The name of Chris Provenzano may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CHRIS PROVENZANO ``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 CHRIS PROVENZANO 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: releng/10.2/sys/sys/timers.h 156137 2006-03-01 06:48:31Z davidxu $
- *
- * Description : Basic timers header.
- */
-
-#ifndef _SYS_TIMERS_H_
-#define _SYS_TIMERS_H_
-
-#include <sys/time.h>
-
-#ifdef _KERNEL
-/*
- * Structures used to manage POSIX timers in a process.
- */
-struct itimer {
-	struct mtx  		it_mtx;
-	struct sigevent		it_sigev;
-	struct itimerspec	it_time;
-	struct proc 		*it_proc;
-	int	it_flags;
-	int	it_usecount;
-	int	it_overrun;		/* Overruns currently accumulating */
-	int	it_overrun_last;	/* Overruns associated w/ a delivery */
-	int	it_clockid;
-	int	it_timerid;
-	ksiginfo_t	it_ksi;
-	union {
-		/* realtime */
-		struct {
-			struct callout it_callout;
-		} _rt;
-
-		/* cpu timer */
-		struct {
-			LIST_ENTRY(itimer)	it_link;
-			TAILQ_ENTRY(itimer)	it_worklink;
-			int			it_active;
-			int			it_cflags;
-		} _cpu;
-	} _data;
-};
-
-#define it_callout	_data._rt.it_callout
-#define it_link		_data._cpu.it_link
-#define it_active	_data._cpu.it_active
-#define	it_worklink	_data._cpu.it_worklink
-#define	it_cflags	_data._cpu.it_cflags
-
-#define	ITF_DELETING	0x01
-#define	ITF_WANTED	0x02
-
-#define	ITCF_ONWORKLIST	0x01
-
-#define	TIMER_MAX	32
-
-#define	ITIMER_LOCK(it)		mtx_lock(&(it)->it_mtx)
-#define	ITIMER_UNLOCK(it)	mtx_unlock(&(it)->it_mtx)
-
-LIST_HEAD(itimerlist, itimer);
-
-struct	itimers {
-	struct itimerlist	its_virtual;
-	struct itimerlist	its_prof;
-	TAILQ_HEAD(, itimer)	its_worklist;
-	struct itimer		*its_timers[TIMER_MAX];
-};
-
-struct	kclock {
-	int (*timer_create)(struct itimer *timer);
-	int (*timer_settime)(struct itimer * timer, int flags,
-		struct itimerspec * new_value,
-		struct itimerspec * old_value);
-	int (*timer_delete)(struct itimer * timer);
-	int (*timer_gettime)(struct itimer * timer,
-		struct itimerspec * cur_value);
-	void (*event_hook)(struct proc *p, clockid_t clock_id, int event);
-};
-
-/* Event values for event_hook() */
-#define	ITIMER_EV_EXEC	0
-#define	ITIMER_EV_EXIT	1
-
-int	itimer_accept(struct proc *p, int tid, ksiginfo_t *ksi);
-#endif
-#endif /* !_SYS_TIMERS_H_ */
diff --git a/include.new/sys/times.h b/include.new/sys/times.h
deleted file mode 100644
index 365bf09..0000000
--- a/include.new/sys/times.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)times.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/times.h 127976 2004-04-07 04:19:52Z imp $
- */
-
-#ifndef	_SYS_TIMES_H_
-#define	_SYS_TIMES_H_
-
-#include <sys/_types.h>
-
-#ifndef _CLOCK_T_DECLARED
-typedef	__clock_t	clock_t;
-#define	_CLOCK_T_DECLARED
-#endif
-
-struct tms {
-	clock_t tms_utime;	/* User CPU time */
-	clock_t tms_stime;	/* System CPU time */
-	clock_t tms_cutime;	/* User CPU time of terminated child procs */
-	clock_t tms_cstime;	/* System CPU time of terminated child procs */
-};
-
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-clock_t	times(struct tms *);
-__END_DECLS
-#endif
-#endif /* !_SYS_TIMES_H_ */
diff --git a/include.new/sys/timespec.h b/include.new/sys/timespec.h
deleted file mode 100644
index 3b111d4..0000000
--- a/include.new/sys/timespec.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp
- *	$FreeBSD: releng/10.2/sys/sys/timespec.h 205792 2010-03-28 13:13:22Z ed $
- */
-
-#ifndef _SYS_TIMESPEC_H_
-#define _SYS_TIMESPEC_H_
-
-#include <sys/cdefs.h>
-#include <sys/_timespec.h>
-
-#if __BSD_VISIBLE
-#define	TIMEVAL_TO_TIMESPEC(tv, ts)					\
-	do {								\
-		(ts)->tv_sec = (tv)->tv_sec;				\
-		(ts)->tv_nsec = (tv)->tv_usec * 1000;			\
-	} while (0)
-#define	TIMESPEC_TO_TIMEVAL(tv, ts)					\
-	do {								\
-		(tv)->tv_sec = (ts)->tv_sec;				\
-		(tv)->tv_usec = (ts)->tv_nsec / 1000;			\
-	} while (0)
-
-#endif /* __BSD_VISIBLE */
-
-/*
- * Structure defined by POSIX.1b to be like a itimerval, but with
- * timespecs. Used in the timer_*() system calls.
- */
-struct itimerspec {
-	struct timespec  it_interval;
-	struct timespec  it_value;
-};
-
-#endif /* _SYS_TIMESPEC_H_ */
diff --git a/include.new/sys/timetc.h b/include.new/sys/timetc.h
deleted file mode 100644
index 68b468d..0000000
--- a/include.new/sys/timetc.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD: releng/10.2/sys/sys/timetc.h 280973 2015-04-02 01:02:42Z jhb $
- */
-
-#ifndef _SYS_TIMETC_H_
-#define	_SYS_TIMETC_H_
-
-#ifndef _KERNEL
-#error "no user-serviceable parts inside"
-#endif
-
-/*-
- * `struct timecounter' is the interface between the hardware which implements
- * a timecounter and the MI code which uses this to keep track of time.
- *
- * A timecounter is a binary counter which has two properties:
- *    * it runs at a fixed, known frequency.
- *    * it has sufficient bits to not roll over in less than approximately
- *      max(2 msec, 2/HZ seconds).  (The value 2 here is really 1 + delta,
- *      for some indeterminate value of delta.)
- */
-
-struct timecounter;
-typedef u_int timecounter_get_t(struct timecounter *);
-typedef void timecounter_pps_t(struct timecounter *);
-
-struct timecounter {
-	timecounter_get_t	*tc_get_timecount;
-		/*
-		 * This function reads the counter.  It is not required to
-		 * mask any unimplemented bits out, as long as they are
-		 * constant.
-		 */
-	timecounter_pps_t	*tc_poll_pps;
-		/*
-		 * This function is optional.  It will be called whenever the
-		 * timecounter is rewound, and is intended to check for PPS
-		 * events.  Normal hardware does not need it but timecounters
-		 * which latch PPS in hardware (like sys/pci/xrpu.c) do.
-		 */
-	u_int 			tc_counter_mask;
-		/* This mask should mask off any unimplemented bits. */
-	uint64_t		tc_frequency;
-		/* Frequency of the counter in Hz. */
-	char			*tc_name;
-		/* Name of the timecounter. */
-	int			tc_quality;
-		/*
-		 * Used to determine if this timecounter is better than
-		 * another timecounter higher means better.  Negative
-		 * means "only use at explicit request".
-		 */
-	u_int			tc_flags;
-#define	TC_FLAGS_C2STOP		1	/* Timer dies in C2+. */
-#define	TC_FLAGS_SUSPEND_SAFE	2	/*
-					 * Timer functional across
-					 * suspend/resume.
-					 */
-
-	void			*tc_priv;
-		/* Pointer to the timecounter's private parts. */
-	struct timecounter	*tc_next;
-		/* Pointer to the next timecounter. */
-};
-
-extern struct timecounter *timecounter;
-extern int tc_min_ticktock_freq; /*
-				  * Minimal tc_ticktock() call frequency,
-				  * required to handle counter wraps.
-				  */
-
-u_int64_t tc_getfrequency(void);
-void	tc_init(struct timecounter *tc);
-void	tc_setclock(struct timespec *ts);
-void	tc_ticktock(int cnt);
-void	cpu_tick_calibration(void);
-
-#ifdef SYSCTL_DECL
-SYSCTL_DECL(_kern_timecounter);
-#endif
-
-#endif /* !_SYS_TIMETC_H_ */
diff --git a/include.new/sys/timex.h b/include.new/sys/timex.h
deleted file mode 100644
index 225d698..0000000
--- a/include.new/sys/timex.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/*-
- ***********************************************************************
- *								       *
- * Copyright (c) David L. Mills 1993-2001			       *
- *								       *
- * Permission to use, copy, modify, and distribute this software and   *
- * its documentation for any purpose and without fee is hereby	       *
- * granted, provided that the above copyright notice appears in all    *
- * copies and that both the copyright notice and this permission       *
- * notice appear in supporting documentation, and that the name        *
- * University of Delaware not be used in advertising or publicity      *
- * pertaining to distribution of the software without specific,	       *
- * written prior permission. The University of Delaware makes no       *
- * representations about the suitability this software for any	       *
- * purpose. It is provided "as is" without express or implied	       *
- * warranty.							       *
- *								       *
- **********************************************************************/
-
-/*
- * Modification history timex.h
- *
- * 16 Aug 00	David L. Mills
- *	API Version 4. Added MOD_TAI and tai member of ntptimeval
- *	structure.
- *
- * 17 Nov 98	David L. Mills
- *	Revised for nanosecond kernel and user interface.
- *
- * 26 Sep 94	David L. Mills
- *	Added defines for hybrid phase/frequency-lock loop.
- *
- * 19 Mar 94	David L. Mills
- *	Moved defines from kernel routines to header file and added new
- *	defines for PPS phase-lock loop.
- *
- * 20 Feb 94	David L. Mills
- *	Revised status codes and structures for external clock and PPS
- *	signal discipline.
- *
- * 28 Nov 93	David L. Mills
- *	Adjusted parameters to improve stability and increase poll
- *	interval.
- *
- * 17 Sep 93    David L. Mills
- *      Created file
- *
- * $FreeBSD: releng/10.2/sys/sys/timex.h 250889 2013-05-21 21:50:11Z ed $
- */
-/*
- * This header file defines the Network Time Protocol (NTP) interfaces
- * for user and daemon application programs. These are implemented using
- * defined syscalls and data structures and require specific kernel
- * support.
- *
- * The original precision time kernels developed from 1993 have an
- * ultimate resolution of one microsecond; however, the most recent
- * kernels have an ultimate resolution of one nanosecond. In these
- * kernels, a ntp_adjtime() syscalls can be used to determine which
- * resolution is in use and to select either one at any time. The
- * resolution selected affects the scaling of certain fields in the
- * ntp_gettime() and ntp_adjtime() syscalls, as described below.
- *
- * NAME
- *	ntp_gettime - NTP user application interface
- *
- * SYNOPSIS
- *	#include <sys/timex.h>
- *
- *	int ntp_gettime(struct ntptimeval *ntv);
- *
- * DESCRIPTION
- *	The time returned by ntp_gettime() is in a timespec structure,
- *	but may be in either microsecond (seconds and microseconds) or
- *	nanosecond (seconds and nanoseconds) format. The particular
- *	format in use is determined by the STA_NANO bit of the status
- *	word returned by the ntp_adjtime() syscall.
- *
- * NAME
- *	ntp_adjtime - NTP daemon application interface
- *
- * SYNOPSIS
- *	#include <sys/timex.h>
- *	#include <sys/syscall.h>
- *
- *	int syscall(SYS_ntp_adjtime, tptr);
- *	int SYS_ntp_adjtime;
- *	struct timex *tptr;
- *
- * DESCRIPTION
- *	Certain fields of the timex structure are interpreted in either
- *	microseconds or nanoseconds according to the state of the
- *	STA_NANO bit in the status word. See the description below for
- *	further information.
- */
-#ifndef _SYS_TIMEX_H_
-#define _SYS_TIMEX_H_ 1
-#define NTP_API		4	/* NTP API version */
-
-#ifdef __FreeBSD__
-#include <sys/_timespec.h>
-#endif /* __FreeBSD__ */
-#ifndef MSDOS			/* Microsoft specific */
-#include <sys/syscall.h>
-#endif /* MSDOS */
-
-/*
- * The following defines establish the performance envelope of the
- * kernel discipline loop. Phase or frequency errors greater than
- * NAXPHASE or MAXFREQ are clamped to these maxima. For update intervals
- * less than MINSEC, the loop always operates in PLL mode; while, for
- * update intervals greater than MAXSEC, the loop always operates in FLL
- * mode. Between these two limits the operating mode is selected by the
- * STA_FLL bit in the status word.
- */
-#define MAXPHASE	500000000L /* max phase error (ns) */
-#define MAXFREQ		500000L	/* max freq error (ns/s) */
-#define MINSEC		256	/* min FLL update interval (s) */
-#define MAXSEC		2048	/* max PLL update interval (s) */
-#define NANOSECOND	1000000000L /* nanoseconds in one second */
-#define SCALE_PPM	(65536 / 1000) /* crude ns/s to scaled PPM */
-#define MAXTC		10	/* max time constant */
-
-/*
- * The following defines and structures define the user interface for
- * the ntp_gettime() and ntp_adjtime() syscalls.
- *
- * Control mode codes (timex.modes)
- */
-#define MOD_OFFSET	0x0001	/* set time offset */
-#define MOD_FREQUENCY	0x0002	/* set frequency offset */
-#define MOD_MAXERROR	0x0004	/* set maximum time error */
-#define MOD_ESTERROR	0x0008	/* set estimated time error */
-#define MOD_STATUS	0x0010	/* set clock status bits */
-#define MOD_TIMECONST	0x0020	/* set PLL time constant */
-#define MOD_PPSMAX	0x0040	/* set PPS maximum averaging time */
-#define MOD_TAI		0x0080	/* set TAI offset */
-#define	MOD_MICRO	0x1000	/* select microsecond resolution */
-#define	MOD_NANO	0x2000	/* select nanosecond resolution */
-#define MOD_CLKB	0x4000	/* select clock B */
-#define MOD_CLKA	0x8000	/* select clock A */
-
-/*
- * Status codes (timex.status)
- */
-#define STA_PLL		0x0001	/* enable PLL updates (rw) */
-#define STA_PPSFREQ	0x0002	/* enable PPS freq discipline (rw) */
-#define STA_PPSTIME	0x0004	/* enable PPS time discipline (rw) */
-#define STA_FLL		0x0008	/* enable FLL mode (rw) */
-#define STA_INS		0x0010	/* insert leap (rw) */
-#define STA_DEL		0x0020	/* delete leap (rw) */
-#define STA_UNSYNC	0x0040	/* clock unsynchronized (rw) */
-#define STA_FREQHOLD	0x0080	/* hold frequency (rw) */
-#define STA_PPSSIGNAL	0x0100	/* PPS signal present (ro) */
-#define STA_PPSJITTER	0x0200	/* PPS signal jitter exceeded (ro) */
-#define STA_PPSWANDER	0x0400	/* PPS signal wander exceeded (ro) */
-#define STA_PPSERROR	0x0800	/* PPS signal calibration error (ro) */
-#define STA_CLOCKERR	0x1000	/* clock hardware fault (ro) */
-#define STA_NANO	0x2000	/* resolution (0 = us, 1 = ns) (ro) */
-#define STA_MODE	0x4000	/* mode (0 = PLL, 1 = FLL) (ro) */
-#define STA_CLK		0x8000	/* clock source (0 = A, 1 = B) (ro) */
-
-#define STA_RONLY (STA_PPSSIGNAL | STA_PPSJITTER | STA_PPSWANDER | \
-    STA_PPSERROR | STA_CLOCKERR | STA_NANO | STA_MODE | STA_CLK)
-
-/*
- * Clock states (time_state)
- */
-#define TIME_OK		0	/* no leap second warning */
-#define TIME_INS	1	/* insert leap second warning */
-#define TIME_DEL	2	/* delete leap second warning */
-#define TIME_OOP	3	/* leap second in progress */
-#define TIME_WAIT	4	/* leap second has occured */
-#define TIME_ERROR	5	/* error (see status word) */
-
-/*
- * NTP user interface (ntp_gettime()) - used to read kernel clock values
- *
- * Note: The time member is in microseconds if STA_NANO is zero and
- * nanoseconds if not.
- */
-struct ntptimeval {
-	struct timespec time;	/* current time (ns) (ro) */
-	long maxerror;		/* maximum error (us) (ro) */
-	long esterror;		/* estimated error (us) (ro) */
-	long tai;		/* TAI offset */
-	int time_state;		/* time status */
-};
-
-/*
- * NTP daemon interface (ntp_adjtime()) - used to discipline CPU clock
- * oscillator and determine status.
- *
- * Note: The offset, precision and jitter members are in microseconds if
- * STA_NANO is zero and nanoseconds if not.
- */
-struct timex {
-	unsigned int modes;	/* clock mode bits (wo) */
-	long	offset;		/* time offset (ns/us) (rw) */
-	long	freq;		/* frequency offset (scaled PPM) (rw) */
-	long	maxerror;	/* maximum error (us) (rw) */
-	long	esterror;	/* estimated error (us) (rw) */
-	int	status;		/* clock status bits (rw) */
-	long	constant;	/* poll interval (log2 s) (rw) */
-	long	precision;	/* clock precision (ns/us) (ro) */
-	long	tolerance;	/* clock frequency tolerance (scaled
-				 * PPM) (ro) */
-	/*
-	 * The following read-only structure members are implemented
-	 * only if the PPS signal discipline is configured in the
-	 * kernel. They are included in all configurations to insure
-	 * portability.
-	 */
-	long	ppsfreq;	/* PPS frequency (scaled PPM) (ro) */
-	long	jitter;		/* PPS jitter (ns/us) (ro) */
-	int	shift;		/* interval duration (s) (shift) (ro) */
-	long	stabil;		/* PPS stability (scaled PPM) (ro) */
-	long	jitcnt;		/* jitter limit exceeded (ro) */
-	long	calcnt;		/* calibration intervals (ro) */
-	long	errcnt;		/* calibration errors (ro) */
-	long	stbcnt;		/* stability limit exceeded (ro) */
-};
-
-#ifdef __FreeBSD__
-
-#ifdef _KERNEL
-void	ntp_update_second(int64_t *adjustment, time_t *newsec);
-#else /* !_KERNEL */
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	ntp_adjtime(struct timex *);
-int	ntp_gettime(struct ntptimeval *);
-__END_DECLS
-#endif /* _KERNEL */
-
-#endif /* __FreeBSD__ */
-
-#endif /* !_SYS_TIMEX_H_ */
diff --git a/include.new/sys/tree.h b/include.new/sys/tree.h
deleted file mode 100644
index 2235418..0000000
--- a/include.new/sys/tree.h
+++ /dev/null
@@ -1,801 +0,0 @@
-/*	$NetBSD: tree.h,v 1.8 2004/03/28 19:38:30 provos Exp $	*/
-/*	$OpenBSD: tree.h,v 1.7 2002/10/17 21:51:54 art Exp $	*/
-/* $FreeBSD: releng/10.2/sys/sys/tree.h 278344 2015-02-07 08:14:20Z kib $ */
-
-/*-
- * Copyright 2002 Niels Provos <provos@citi.umich.edu>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#ifndef	_SYS_TREE_H_
-#define	_SYS_TREE_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file defines data structures for different types of trees:
- * splay trees and red-black trees.
- *
- * A splay tree is a self-organizing data structure.  Every operation
- * on the tree causes a splay to happen.  The splay moves the requested
- * node to the root of the tree and partly rebalances it.
- *
- * This has the benefit that request locality causes faster lookups as
- * the requested nodes move to the top of the tree.  On the other hand,
- * every lookup causes memory writes.
- *
- * The Balance Theorem bounds the total access time for m operations
- * and n inserts on an initially empty tree as O((m + n)lg n).  The
- * amortized cost for a sequence of m accesses to a splay tree is O(lg n);
- *
- * A red-black tree is a binary search tree with the node color as an
- * extra attribute.  It fulfills a set of conditions:
- *	- every search path from the root to a leaf consists of the
- *	  same number of black nodes,
- *	- each red node (except for the root) has a black parent,
- *	- each leaf node is black.
- *
- * Every operation on a red-black tree is bounded as O(lg n).
- * The maximum height of a red-black tree is 2lg (n+1).
- */
-
-#define SPLAY_HEAD(name, type)						\
-struct name {								\
-	struct type *sph_root; /* root of the tree */			\
-}
-
-#define SPLAY_INITIALIZER(root)						\
-	{ NULL }
-
-#define SPLAY_INIT(root) do {						\
-	(root)->sph_root = NULL;					\
-} while (/*CONSTCOND*/ 0)
-
-#define SPLAY_ENTRY(type)						\
-struct {								\
-	struct type *spe_left; /* left element */			\
-	struct type *spe_right; /* right element */			\
-}
-
-#define SPLAY_LEFT(elm, field)		(elm)->field.spe_left
-#define SPLAY_RIGHT(elm, field)		(elm)->field.spe_right
-#define SPLAY_ROOT(head)		(head)->sph_root
-#define SPLAY_EMPTY(head)		(SPLAY_ROOT(head) == NULL)
-
-/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */
-#define SPLAY_ROTATE_RIGHT(head, tmp, field) do {			\
-	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field);	\
-	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
-	(head)->sph_root = tmp;						\
-} while (/*CONSTCOND*/ 0)
-	
-#define SPLAY_ROTATE_LEFT(head, tmp, field) do {			\
-	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field);	\
-	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
-	(head)->sph_root = tmp;						\
-} while (/*CONSTCOND*/ 0)
-
-#define SPLAY_LINKLEFT(head, tmp, field) do {				\
-	SPLAY_LEFT(tmp, field) = (head)->sph_root;			\
-	tmp = (head)->sph_root;						\
-	(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);		\
-} while (/*CONSTCOND*/ 0)
-
-#define SPLAY_LINKRIGHT(head, tmp, field) do {				\
-	SPLAY_RIGHT(tmp, field) = (head)->sph_root;			\
-	tmp = (head)->sph_root;						\
-	(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);	\
-} while (/*CONSTCOND*/ 0)
-
-#define SPLAY_ASSEMBLE(head, node, left, right, field) do {		\
-	SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field);	\
-	SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\
-	SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field);	\
-	SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field);	\
-} while (/*CONSTCOND*/ 0)
-
-/* Generates prototypes and inline functions */
-
-#define SPLAY_PROTOTYPE(name, type, field, cmp)				\
-void name##_SPLAY(struct name *, struct type *);			\
-void name##_SPLAY_MINMAX(struct name *, int);				\
-struct type *name##_SPLAY_INSERT(struct name *, struct type *);		\
-struct type *name##_SPLAY_REMOVE(struct name *, struct type *);		\
-									\
-/* Finds the node with the same key as elm */				\
-static __inline struct type *						\
-name##_SPLAY_FIND(struct name *head, struct type *elm)			\
-{									\
-	if (SPLAY_EMPTY(head))						\
-		return(NULL);						\
-	name##_SPLAY(head, elm);					\
-	if ((cmp)(elm, (head)->sph_root) == 0)				\
-		return (head->sph_root);				\
-	return (NULL);							\
-}									\
-									\
-static __inline struct type *						\
-name##_SPLAY_NEXT(struct name *head, struct type *elm)			\
-{									\
-	name##_SPLAY(head, elm);					\
-	if (SPLAY_RIGHT(elm, field) != NULL) {				\
-		elm = SPLAY_RIGHT(elm, field);				\
-		while (SPLAY_LEFT(elm, field) != NULL) {		\
-			elm = SPLAY_LEFT(elm, field);			\
-		}							\
-	} else								\
-		elm = NULL;						\
-	return (elm);							\
-}									\
-									\
-static __inline struct type *						\
-name##_SPLAY_MIN_MAX(struct name *head, int val)			\
-{									\
-	name##_SPLAY_MINMAX(head, val);					\
-        return (SPLAY_ROOT(head));					\
-}
-
-/* Main splay operation.
- * Moves node close to the key of elm to top
- */
-#define SPLAY_GENERATE(name, type, field, cmp)				\
-struct type *								\
-name##_SPLAY_INSERT(struct name *head, struct type *elm)		\
-{									\
-    if (SPLAY_EMPTY(head)) {						\
-	    SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL;	\
-    } else {								\
-	    int __comp;							\
-	    name##_SPLAY(head, elm);					\
-	    __comp = (cmp)(elm, (head)->sph_root);			\
-	    if(__comp < 0) {						\
-		    SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\
-		    SPLAY_RIGHT(elm, field) = (head)->sph_root;		\
-		    SPLAY_LEFT((head)->sph_root, field) = NULL;		\
-	    } else if (__comp > 0) {					\
-		    SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\
-		    SPLAY_LEFT(elm, field) = (head)->sph_root;		\
-		    SPLAY_RIGHT((head)->sph_root, field) = NULL;	\
-	    } else							\
-		    return ((head)->sph_root);				\
-    }									\
-    (head)->sph_root = (elm);						\
-    return (NULL);							\
-}									\
-									\
-struct type *								\
-name##_SPLAY_REMOVE(struct name *head, struct type *elm)		\
-{									\
-	struct type *__tmp;						\
-	if (SPLAY_EMPTY(head))						\
-		return (NULL);						\
-	name##_SPLAY(head, elm);					\
-	if ((cmp)(elm, (head)->sph_root) == 0) {			\
-		if (SPLAY_LEFT((head)->sph_root, field) == NULL) {	\
-			(head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\
-		} else {						\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			(head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\
-			name##_SPLAY(head, elm);			\
-			SPLAY_RIGHT((head)->sph_root, field) = __tmp;	\
-		}							\
-		return (elm);						\
-	}								\
-	return (NULL);							\
-}									\
-									\
-void									\
-name##_SPLAY(struct name *head, struct type *elm)			\
-{									\
-	struct type __node, *__left, *__right, *__tmp;			\
-	int __comp;							\
-\
-	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-	__left = __right = &__node;					\
-\
-	while ((__comp = (cmp)(elm, (head)->sph_root)) != 0) {		\
-		if (__comp < 0) {					\
-			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if ((cmp)(elm, __tmp) < 0){			\
-				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
-				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKLEFT(head, __right, field);		\
-		} else if (__comp > 0) {				\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if ((cmp)(elm, __tmp) > 0){			\
-				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
-				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKRIGHT(head, __left, field);		\
-		}							\
-	}								\
-	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
-}									\
-									\
-/* Splay with either the minimum or the maximum element			\
- * Used to find minimum or maximum element in tree.			\
- */									\
-void name##_SPLAY_MINMAX(struct name *head, int __comp) \
-{									\
-	struct type __node, *__left, *__right, *__tmp;			\
-\
-	SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\
-	__left = __right = &__node;					\
-\
-	while (1) {							\
-		if (__comp < 0) {					\
-			__tmp = SPLAY_LEFT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if (__comp < 0){				\
-				SPLAY_ROTATE_RIGHT(head, __tmp, field);	\
-				if (SPLAY_LEFT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKLEFT(head, __right, field);		\
-		} else if (__comp > 0) {				\
-			__tmp = SPLAY_RIGHT((head)->sph_root, field);	\
-			if (__tmp == NULL)				\
-				break;					\
-			if (__comp > 0) {				\
-				SPLAY_ROTATE_LEFT(head, __tmp, field);	\
-				if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\
-					break;				\
-			}						\
-			SPLAY_LINKRIGHT(head, __left, field);		\
-		}							\
-	}								\
-	SPLAY_ASSEMBLE(head, &__node, __left, __right, field);		\
-}
-
-#define SPLAY_NEGINF	-1
-#define SPLAY_INF	1
-
-#define SPLAY_INSERT(name, x, y)	name##_SPLAY_INSERT(x, y)
-#define SPLAY_REMOVE(name, x, y)	name##_SPLAY_REMOVE(x, y)
-#define SPLAY_FIND(name, x, y)		name##_SPLAY_FIND(x, y)
-#define SPLAY_NEXT(name, x, y)		name##_SPLAY_NEXT(x, y)
-#define SPLAY_MIN(name, x)		(SPLAY_EMPTY(x) ? NULL	\
-					: name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF))
-#define SPLAY_MAX(name, x)		(SPLAY_EMPTY(x) ? NULL	\
-					: name##_SPLAY_MIN_MAX(x, SPLAY_INF))
-
-#define SPLAY_FOREACH(x, name, head)					\
-	for ((x) = SPLAY_MIN(name, head);				\
-	     (x) != NULL;						\
-	     (x) = SPLAY_NEXT(name, head, x))
-
-/* Macros that define a red-black tree */
-#define RB_HEAD(name, type)						\
-struct name {								\
-	struct type *rbh_root; /* root of the tree */			\
-}
-
-#define RB_INITIALIZER(root)						\
-	{ NULL }
-
-#define RB_INIT(root) do {						\
-	(root)->rbh_root = NULL;					\
-} while (/*CONSTCOND*/ 0)
-
-#define RB_BLACK	0
-#define RB_RED		1
-#define RB_ENTRY(type)							\
-struct {								\
-	struct type *rbe_left;		/* left element */		\
-	struct type *rbe_right;		/* right element */		\
-	struct type *rbe_parent;	/* parent element */		\
-	int rbe_color;			/* node color */		\
-}
-
-#define RB_LEFT(elm, field)		(elm)->field.rbe_left
-#define RB_RIGHT(elm, field)		(elm)->field.rbe_right
-#define RB_PARENT(elm, field)		(elm)->field.rbe_parent
-#define RB_COLOR(elm, field)		(elm)->field.rbe_color
-#define RB_ROOT(head)			(head)->rbh_root
-#define RB_EMPTY(head)			(RB_ROOT(head) == NULL)
-
-#define RB_SET(elm, parent, field) do {					\
-	RB_PARENT(elm, field) = parent;					\
-	RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL;		\
-	RB_COLOR(elm, field) = RB_RED;					\
-} while (/*CONSTCOND*/ 0)
-
-#define RB_SET_BLACKRED(black, red, field) do {				\
-	RB_COLOR(black, field) = RB_BLACK;				\
-	RB_COLOR(red, field) = RB_RED;					\
-} while (/*CONSTCOND*/ 0)
-
-#ifndef RB_AUGMENT
-#define RB_AUGMENT(x)	do {} while (0)
-#endif
-
-#define RB_ROTATE_LEFT(head, elm, tmp, field) do {			\
-	(tmp) = RB_RIGHT(elm, field);					\
-	if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field)) != NULL) {	\
-		RB_PARENT(RB_LEFT(tmp, field), field) = (elm);		\
-	}								\
-	RB_AUGMENT(elm);						\
-	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field)) != NULL) {	\
-		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
-			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
-		else							\
-			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
-	} else								\
-		(head)->rbh_root = (tmp);				\
-	RB_LEFT(tmp, field) = (elm);					\
-	RB_PARENT(elm, field) = (tmp);					\
-	RB_AUGMENT(tmp);						\
-	if ((RB_PARENT(tmp, field)))					\
-		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (/*CONSTCOND*/ 0)
-
-#define RB_ROTATE_RIGHT(head, elm, tmp, field) do {			\
-	(tmp) = RB_LEFT(elm, field);					\
-	if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field)) != NULL) {	\
-		RB_PARENT(RB_RIGHT(tmp, field), field) = (elm);		\
-	}								\
-	RB_AUGMENT(elm);						\
-	if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field)) != NULL) {	\
-		if ((elm) == RB_LEFT(RB_PARENT(elm, field), field))	\
-			RB_LEFT(RB_PARENT(elm, field), field) = (tmp);	\
-		else							\
-			RB_RIGHT(RB_PARENT(elm, field), field) = (tmp);	\
-	} else								\
-		(head)->rbh_root = (tmp);				\
-	RB_RIGHT(tmp, field) = (elm);					\
-	RB_PARENT(elm, field) = (tmp);					\
-	RB_AUGMENT(tmp);						\
-	if ((RB_PARENT(tmp, field)))					\
-		RB_AUGMENT(RB_PARENT(tmp, field));			\
-} while (/*CONSTCOND*/ 0)
-
-/* Generates prototypes and inline functions */
-#define	RB_PROTOTYPE(name, type, field, cmp)				\
-	RB_PROTOTYPE_INTERNAL(name, type, field, cmp,)
-#define	RB_PROTOTYPE_STATIC(name, type, field, cmp)			\
-	RB_PROTOTYPE_INTERNAL(name, type, field, cmp, __unused static)
-#define RB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr)		\
-	RB_PROTOTYPE_INSERT_COLOR(name, type, attr);			\
-	RB_PROTOTYPE_REMOVE_COLOR(name, type, attr);			\
-	RB_PROTOTYPE_INSERT(name, type, attr);				\
-	RB_PROTOTYPE_REMOVE(name, type, attr);				\
-	RB_PROTOTYPE_FIND(name, type, attr);				\
-	RB_PROTOTYPE_NFIND(name, type, attr);				\
-	RB_PROTOTYPE_NEXT(name, type, attr);				\
-	RB_PROTOTYPE_PREV(name, type, attr);				\
-	RB_PROTOTYPE_MINMAX(name, type, attr);
-#define RB_PROTOTYPE_INSERT_COLOR(name, type, attr)			\
-	attr void name##_RB_INSERT_COLOR(struct name *, struct type *)
-#define RB_PROTOTYPE_REMOVE_COLOR(name, type, attr)			\
-	attr void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *)
-#define RB_PROTOTYPE_REMOVE(name, type, attr)				\
-	attr struct type *name##_RB_REMOVE(struct name *, struct type *)
-#define RB_PROTOTYPE_INSERT(name, type, attr)				\
-	attr struct type *name##_RB_INSERT(struct name *, struct type *)
-#define RB_PROTOTYPE_FIND(name, type, attr)				\
-	attr struct type *name##_RB_FIND(struct name *, struct type *)
-#define RB_PROTOTYPE_NFIND(name, type, attr)				\
-	attr struct type *name##_RB_NFIND(struct name *, struct type *)
-#define RB_PROTOTYPE_NEXT(name, type, attr)				\
-	attr struct type *name##_RB_NEXT(struct type *)
-#define RB_PROTOTYPE_PREV(name, type, attr)				\
-	attr struct type *name##_RB_PREV(struct type *)
-#define RB_PROTOTYPE_MINMAX(name, type, attr)				\
-	attr struct type *name##_RB_MINMAX(struct name *, int)
-
-/* Main rb operation.
- * Moves node close to the key of elm to top
- */
-#define	RB_GENERATE(name, type, field, cmp)				\
-	RB_GENERATE_INTERNAL(name, type, field, cmp,)
-#define	RB_GENERATE_STATIC(name, type, field, cmp)			\
-	RB_GENERATE_INTERNAL(name, type, field, cmp, __unused static)
-#define RB_GENERATE_INTERNAL(name, type, field, cmp, attr)		\
-	RB_GENERATE_INSERT_COLOR(name, type, field, attr)		\
-	RB_GENERATE_REMOVE_COLOR(name, type, field, attr)		\
-	RB_GENERATE_INSERT(name, type, field, cmp, attr)		\
-	RB_GENERATE_REMOVE(name, type, field, attr)			\
-	RB_GENERATE_FIND(name, type, field, cmp, attr)			\
-	RB_GENERATE_NFIND(name, type, field, cmp, attr)			\
-	RB_GENERATE_NEXT(name, type, field, attr)			\
-	RB_GENERATE_PREV(name, type, field, attr)			\
-	RB_GENERATE_MINMAX(name, type, field, attr)
-
-#define RB_GENERATE_INSERT_COLOR(name, type, field, attr)		\
-attr void								\
-name##_RB_INSERT_COLOR(struct name *head, struct type *elm)		\
-{									\
-	struct type *parent, *gparent, *tmp;				\
-	while ((parent = RB_PARENT(elm, field)) != NULL &&		\
-	    RB_COLOR(parent, field) == RB_RED) {			\
-		gparent = RB_PARENT(parent, field);			\
-		if (parent == RB_LEFT(gparent, field)) {		\
-			tmp = RB_RIGHT(gparent, field);			\
-			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
-				RB_COLOR(tmp, field) = RB_BLACK;	\
-				RB_SET_BLACKRED(parent, gparent, field);\
-				elm = gparent;				\
-				continue;				\
-			}						\
-			if (RB_RIGHT(parent, field) == elm) {		\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				tmp = parent;				\
-				parent = elm;				\
-				elm = tmp;				\
-			}						\
-			RB_SET_BLACKRED(parent, gparent, field);	\
-			RB_ROTATE_RIGHT(head, gparent, tmp, field);	\
-		} else {						\
-			tmp = RB_LEFT(gparent, field);			\
-			if (tmp && RB_COLOR(tmp, field) == RB_RED) {	\
-				RB_COLOR(tmp, field) = RB_BLACK;	\
-				RB_SET_BLACKRED(parent, gparent, field);\
-				elm = gparent;				\
-				continue;				\
-			}						\
-			if (RB_LEFT(parent, field) == elm) {		\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				tmp = parent;				\
-				parent = elm;				\
-				elm = tmp;				\
-			}						\
-			RB_SET_BLACKRED(parent, gparent, field);	\
-			RB_ROTATE_LEFT(head, gparent, tmp, field);	\
-		}							\
-	}								\
-	RB_COLOR(head->rbh_root, field) = RB_BLACK;			\
-}
-
-#define RB_GENERATE_REMOVE_COLOR(name, type, field, attr)		\
-attr void								\
-name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \
-{									\
-	struct type *tmp;						\
-	while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) &&	\
-	    elm != RB_ROOT(head)) {					\
-		if (RB_LEFT(parent, field) == elm) {			\
-			tmp = RB_RIGHT(parent, field);			\
-			if (RB_COLOR(tmp, field) == RB_RED) {		\
-				RB_SET_BLACKRED(tmp, parent, field);	\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				tmp = RB_RIGHT(parent, field);		\
-			}						\
-			if ((RB_LEFT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-			    (RB_RIGHT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-				RB_COLOR(tmp, field) = RB_RED;		\
-				elm = parent;				\
-				parent = RB_PARENT(elm, field);		\
-			} else {					\
-				if (RB_RIGHT(tmp, field) == NULL ||	\
-				    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\
-					struct type *oleft;		\
-					if ((oleft = RB_LEFT(tmp, field)) \
-					    != NULL)			\
-						RB_COLOR(oleft, field) = RB_BLACK;\
-					RB_COLOR(tmp, field) = RB_RED;	\
-					RB_ROTATE_RIGHT(head, tmp, oleft, field);\
-					tmp = RB_RIGHT(parent, field);	\
-				}					\
-				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-				RB_COLOR(parent, field) = RB_BLACK;	\
-				if (RB_RIGHT(tmp, field))		\
-					RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\
-				RB_ROTATE_LEFT(head, parent, tmp, field);\
-				elm = RB_ROOT(head);			\
-				break;					\
-			}						\
-		} else {						\
-			tmp = RB_LEFT(parent, field);			\
-			if (RB_COLOR(tmp, field) == RB_RED) {		\
-				RB_SET_BLACKRED(tmp, parent, field);	\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				tmp = RB_LEFT(parent, field);		\
-			}						\
-			if ((RB_LEFT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\
-			    (RB_RIGHT(tmp, field) == NULL ||		\
-			    RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\
-				RB_COLOR(tmp, field) = RB_RED;		\
-				elm = parent;				\
-				parent = RB_PARENT(elm, field);		\
-			} else {					\
-				if (RB_LEFT(tmp, field) == NULL ||	\
-				    RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\
-					struct type *oright;		\
-					if ((oright = RB_RIGHT(tmp, field)) \
-					    != NULL)			\
-						RB_COLOR(oright, field) = RB_BLACK;\
-					RB_COLOR(tmp, field) = RB_RED;	\
-					RB_ROTATE_LEFT(head, tmp, oright, field);\
-					tmp = RB_LEFT(parent, field);	\
-				}					\
-				RB_COLOR(tmp, field) = RB_COLOR(parent, field);\
-				RB_COLOR(parent, field) = RB_BLACK;	\
-				if (RB_LEFT(tmp, field))		\
-					RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\
-				RB_ROTATE_RIGHT(head, parent, tmp, field);\
-				elm = RB_ROOT(head);			\
-				break;					\
-			}						\
-		}							\
-	}								\
-	if (elm)							\
-		RB_COLOR(elm, field) = RB_BLACK;			\
-}
-
-#define RB_GENERATE_REMOVE(name, type, field, attr)			\
-attr struct type *							\
-name##_RB_REMOVE(struct name *head, struct type *elm)			\
-{									\
-	struct type *child, *parent, *old = elm;			\
-	int color;							\
-	if (RB_LEFT(elm, field) == NULL)				\
-		child = RB_RIGHT(elm, field);				\
-	else if (RB_RIGHT(elm, field) == NULL)				\
-		child = RB_LEFT(elm, field);				\
-	else {								\
-		struct type *left;					\
-		elm = RB_RIGHT(elm, field);				\
-		while ((left = RB_LEFT(elm, field)) != NULL)		\
-			elm = left;					\
-		child = RB_RIGHT(elm, field);				\
-		parent = RB_PARENT(elm, field);				\
-		color = RB_COLOR(elm, field);				\
-		if (child)						\
-			RB_PARENT(child, field) = parent;		\
-		if (parent) {						\
-			if (RB_LEFT(parent, field) == elm)		\
-				RB_LEFT(parent, field) = child;		\
-			else						\
-				RB_RIGHT(parent, field) = child;	\
-			RB_AUGMENT(parent);				\
-		} else							\
-			RB_ROOT(head) = child;				\
-		if (RB_PARENT(elm, field) == old)			\
-			parent = elm;					\
-		(elm)->field = (old)->field;				\
-		if (RB_PARENT(old, field)) {				\
-			if (RB_LEFT(RB_PARENT(old, field), field) == old)\
-				RB_LEFT(RB_PARENT(old, field), field) = elm;\
-			else						\
-				RB_RIGHT(RB_PARENT(old, field), field) = elm;\
-			RB_AUGMENT(RB_PARENT(old, field));		\
-		} else							\
-			RB_ROOT(head) = elm;				\
-		RB_PARENT(RB_LEFT(old, field), field) = elm;		\
-		if (RB_RIGHT(old, field))				\
-			RB_PARENT(RB_RIGHT(old, field), field) = elm;	\
-		if (parent) {						\
-			left = parent;					\
-			do {						\
-				RB_AUGMENT(left);			\
-			} while ((left = RB_PARENT(left, field)) != NULL); \
-		}							\
-		goto color;						\
-	}								\
-	parent = RB_PARENT(elm, field);					\
-	color = RB_COLOR(elm, field);					\
-	if (child)							\
-		RB_PARENT(child, field) = parent;			\
-	if (parent) {							\
-		if (RB_LEFT(parent, field) == elm)			\
-			RB_LEFT(parent, field) = child;			\
-		else							\
-			RB_RIGHT(parent, field) = child;		\
-		RB_AUGMENT(parent);					\
-	} else								\
-		RB_ROOT(head) = child;					\
-color:									\
-	if (color == RB_BLACK)						\
-		name##_RB_REMOVE_COLOR(head, parent, child);		\
-	return (old);							\
-}									\
-
-#define RB_GENERATE_INSERT(name, type, field, cmp, attr)		\
-/* Inserts a node into the RB tree */					\
-attr struct type *							\
-name##_RB_INSERT(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp;						\
-	struct type *parent = NULL;					\
-	int comp = 0;							\
-	tmp = RB_ROOT(head);						\
-	while (tmp) {							\
-		parent = tmp;						\
-		comp = (cmp)(elm, parent);				\
-		if (comp < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	RB_SET(elm, parent, field);					\
-	if (parent != NULL) {						\
-		if (comp < 0)						\
-			RB_LEFT(parent, field) = elm;			\
-		else							\
-			RB_RIGHT(parent, field) = elm;			\
-		RB_AUGMENT(parent);					\
-	} else								\
-		RB_ROOT(head) = elm;					\
-	name##_RB_INSERT_COLOR(head, elm);				\
-	return (NULL);							\
-}
-
-#define RB_GENERATE_FIND(name, type, field, cmp, attr)			\
-/* Finds the node with the same key as elm */				\
-attr struct type *							\
-name##_RB_FIND(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	int comp;							\
-	while (tmp) {							\
-		comp = cmp(elm, tmp);					\
-		if (comp < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	return (NULL);							\
-}
-
-#define RB_GENERATE_NFIND(name, type, field, cmp, attr)			\
-/* Finds the first node greater than or equal to the search key */	\
-attr struct type *							\
-name##_RB_NFIND(struct name *head, struct type *elm)			\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	struct type *res = NULL;					\
-	int comp;							\
-	while (tmp) {							\
-		comp = cmp(elm, tmp);					\
-		if (comp < 0) {						\
-			res = tmp;					\
-			tmp = RB_LEFT(tmp, field);			\
-		}							\
-		else if (comp > 0)					\
-			tmp = RB_RIGHT(tmp, field);			\
-		else							\
-			return (tmp);					\
-	}								\
-	return (res);							\
-}
-
-#define RB_GENERATE_NEXT(name, type, field, attr)			\
-/* ARGSUSED */								\
-attr struct type *							\
-name##_RB_NEXT(struct type *elm)					\
-{									\
-	if (RB_RIGHT(elm, field)) {					\
-		elm = RB_RIGHT(elm, field);				\
-		while (RB_LEFT(elm, field))				\
-			elm = RB_LEFT(elm, field);			\
-	} else {							\
-		if (RB_PARENT(elm, field) &&				\
-		    (elm == RB_LEFT(RB_PARENT(elm, field), field)))	\
-			elm = RB_PARENT(elm, field);			\
-		else {							\
-			while (RB_PARENT(elm, field) &&			\
-			    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\
-				elm = RB_PARENT(elm, field);		\
-			elm = RB_PARENT(elm, field);			\
-		}							\
-	}								\
-	return (elm);							\
-}
-
-#define RB_GENERATE_PREV(name, type, field, attr)			\
-/* ARGSUSED */								\
-attr struct type *							\
-name##_RB_PREV(struct type *elm)					\
-{									\
-	if (RB_LEFT(elm, field)) {					\
-		elm = RB_LEFT(elm, field);				\
-		while (RB_RIGHT(elm, field))				\
-			elm = RB_RIGHT(elm, field);			\
-	} else {							\
-		if (RB_PARENT(elm, field) &&				\
-		    (elm == RB_RIGHT(RB_PARENT(elm, field), field)))	\
-			elm = RB_PARENT(elm, field);			\
-		else {							\
-			while (RB_PARENT(elm, field) &&			\
-			    (elm == RB_LEFT(RB_PARENT(elm, field), field)))\
-				elm = RB_PARENT(elm, field);		\
-			elm = RB_PARENT(elm, field);			\
-		}							\
-	}								\
-	return (elm);							\
-}
-
-#define RB_GENERATE_MINMAX(name, type, field, attr)			\
-attr struct type *							\
-name##_RB_MINMAX(struct name *head, int val)				\
-{									\
-	struct type *tmp = RB_ROOT(head);				\
-	struct type *parent = NULL;					\
-	while (tmp) {							\
-		parent = tmp;						\
-		if (val < 0)						\
-			tmp = RB_LEFT(tmp, field);			\
-		else							\
-			tmp = RB_RIGHT(tmp, field);			\
-	}								\
-	return (parent);						\
-}
-
-#define RB_NEGINF	-1
-#define RB_INF	1
-
-#define RB_INSERT(name, x, y)	name##_RB_INSERT(x, y)
-#define RB_REMOVE(name, x, y)	name##_RB_REMOVE(x, y)
-#define RB_FIND(name, x, y)	name##_RB_FIND(x, y)
-#define RB_NFIND(name, x, y)	name##_RB_NFIND(x, y)
-#define RB_NEXT(name, x, y)	name##_RB_NEXT(y)
-#define RB_PREV(name, x, y)	name##_RB_PREV(y)
-#define RB_MIN(name, x)		name##_RB_MINMAX(x, RB_NEGINF)
-#define RB_MAX(name, x)		name##_RB_MINMAX(x, RB_INF)
-
-#define RB_FOREACH(x, name, head)					\
-	for ((x) = RB_MIN(name, head);					\
-	     (x) != NULL;						\
-	     (x) = name##_RB_NEXT(x))
-
-#define RB_FOREACH_FROM(x, name, y)					\
-	for ((x) = (y);							\
-	    ((x) != NULL) && ((y) = name##_RB_NEXT(x), (x) != NULL);	\
-	     (x) = (y))
-
-#define RB_FOREACH_SAFE(x, name, head, y)				\
-	for ((x) = RB_MIN(name, head);					\
-	    ((x) != NULL) && ((y) = name##_RB_NEXT(x), (x) != NULL);	\
-	     (x) = (y))
-
-#define RB_FOREACH_REVERSE(x, name, head)				\
-	for ((x) = RB_MAX(name, head);					\
-	     (x) != NULL;						\
-	     (x) = name##_RB_PREV(x))
-
-#define RB_FOREACH_REVERSE_FROM(x, name, y)				\
-	for ((x) = (y);							\
-	    ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL);	\
-	     (x) = (y))
-
-#define RB_FOREACH_REVERSE_SAFE(x, name, head, y)			\
-	for ((x) = RB_MAX(name, head);					\
-	    ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL);	\
-	     (x) = (y))
-
-#endif	/* _SYS_TREE_H_ */
diff --git a/include.new/sys/tty.h b/include.new/sys/tty.h
deleted file mode 100644
index 0e9aae1..0000000
--- a/include.new/sys/tty.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
- * All rights reserved.
- *
- * Portions of this software were developed under sponsorship from Snow
- * B.V., the Netherlands.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/tty.h 271773 2014-09-18 14:44:47Z grehan $
- */
-
-#ifndef _SYS_TTY_H_
-#define	_SYS_TTY_H_
-
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/condvar.h>
-#include <sys/selinfo.h>
-#include <sys/_termios.h>
-#include <sys/ttycom.h>
-#include <sys/ttyqueue.h>
-
-struct cdev;
-struct file;
-struct pgrp;
-struct session;
-struct ucred;
-
-struct ttydevsw;
-
-/*
- * Per-TTY structure, containing buffers, etc.
- *
- * List of locks
- * (t)	locked by t_mtx
- * (l)	locked by tty_list_sx
- * (c)	const until freeing
- */
-struct tty {
-	struct mtx	*t_mtx;		/* TTY lock. */
-	struct mtx	t_mtxobj;	/* Per-TTY lock (when not borrowing). */
-	TAILQ_ENTRY(tty) t_list;	/* (l) TTY list entry. */
-	unsigned int	t_flags;	/* (t) Terminal option flags. */
-/* Keep flags in sync with db_show_tty and pstat(8). */
-#define	TF_NOPREFIX	0x00001	/* Don't prepend "tty" to device name. */
-#define	TF_INITLOCK	0x00002	/* Create init/lock state devices. */
-#define	TF_CALLOUT	0x00004	/* Create "cua" devices. */
-#define	TF_OPENED_IN	0x00008	/* "tty" node is in use. */
-#define	TF_OPENED_OUT	0x00010	/* "cua" node is in use. */
-#define	TF_OPENED_CONS	0x00020 /* Device in use as console. */
-#define	TF_OPENED	(TF_OPENED_IN|TF_OPENED_OUT|TF_OPENED_CONS)
-#define	TF_GONE		0x00040	/* Device node is gone. */
-#define	TF_OPENCLOSE	0x00080	/* Device is in open()/close(). */
-#define	TF_ASYNC	0x00100	/* Asynchronous I/O enabled. */
-#define	TF_LITERAL	0x00200	/* Accept the next character literally. */
-#define	TF_HIWAT_IN	0x00400	/* We've reached the input watermark. */
-#define	TF_HIWAT_OUT	0x00800	/* We've reached the output watermark. */
-#define	TF_HIWAT	(TF_HIWAT_IN|TF_HIWAT_OUT)
-#define	TF_STOPPED	0x01000	/* Output flow control - stopped. */
-#define	TF_EXCLUDE	0x02000	/* Exclusive access. */
-#define	TF_BYPASS	0x04000	/* Optimized input path. */
-#define	TF_ZOMBIE	0x08000	/* Modem disconnect received. */
-#define	TF_HOOK		0x10000	/* TTY has hook attached. */
-#define	TF_BUSY_IN	0x20000	/* Process busy in read() -- not supported. */
-#define	TF_BUSY_OUT	0x40000	/* Process busy in write(). */
-#define	TF_BUSY		(TF_BUSY_IN|TF_BUSY_OUT)
-	unsigned int	t_revokecnt;	/* (t) revoke() count. */
-
-	/* Buffering mechanisms. */
-	struct ttyinq	t_inq;		/* (t) Input queue. */
-	size_t		t_inlow;	/* (t) Input low watermark. */
-	struct ttyoutq	t_outq;		/* (t) Output queue. */
-	size_t		t_outlow;	/* (t) Output low watermark. */
-
-	/* Sleeping mechanisms. */
-	struct cv	t_inwait;	/* (t) Input wait queue. */
-	struct cv	t_outwait;	/* (t) Output wait queue. */
-	struct cv	t_outserwait;	/* (t) Serial output wait queue. */
-	struct cv	t_bgwait;	/* (t) Background wait queue. */
-	struct cv	t_dcdwait;	/* (t) Carrier Detect wait queue. */
-
-	/* Polling mechanisms. */
-	struct selinfo	t_inpoll;	/* (t) Input poll queue. */
-	struct selinfo	t_outpoll;	/* (t) Output poll queue. */
-	struct sigio	*t_sigio;	/* (t) Asynchronous I/O. */
-
-	struct termios	t_termios;	/* (t) I/O processing flags. */
-	struct winsize	t_winsize;	/* (t) Window size. */
-	unsigned int	t_column;	/* (t) Current cursor position. */
-	unsigned int	t_writepos;	/* (t) Where input was interrupted. */
-	int		t_compatflags;	/* (t) COMPAT_43TTY flags. */
-
-	/* Init/lock-state devices. */
-	struct termios	t_termios_init_in;	/* tty%s.init. */
-	struct termios	t_termios_lock_in;	/* tty%s.lock. */
-	struct termios	t_termios_init_out;	/* cua%s.init. */
-	struct termios	t_termios_lock_out;	/* cua%s.lock. */
-
-	struct ttydevsw	*t_devsw;	/* (c) Driver hooks. */
-	struct ttyhook	*t_hook;	/* (t) Capture/inject hook. */
-
-	/* Process signal delivery. */
-	struct pgrp	*t_pgrp;	/* (t) Foreground process group. */
-	struct session	*t_session;	/* (t) Associated session. */
-	unsigned int	t_sessioncnt;	/* (t) Backpointing sessions. */
-
-	void		*t_devswsoftc;	/* (c) Soft config, for drivers. */
-	void		*t_hooksoftc;	/* (t) Soft config, for hooks. */
-	struct cdev	*t_dev;		/* (c) Primary character device. */
-};
-
-/*
- * Userland version of struct tty, for sysctl kern.ttys
- */
-struct xtty {
-	size_t	xt_size;	/* Structure size. */
-	size_t	xt_insize;	/* Input queue size. */
-	size_t	xt_incc;	/* Canonicalized characters. */
-	size_t	xt_inlc;	/* Input line charaters. */
-	size_t	xt_inlow;	/* Input low watermark. */
-	size_t	xt_outsize;	/* Output queue size. */
-	size_t	xt_outcc;	/* Output queue usage. */
-	size_t	xt_outlow;	/* Output low watermark. */
-	unsigned int xt_column;	/* Current column position. */
-	pid_t	xt_pgid;	/* Foreground process group. */
-	pid_t	xt_sid;		/* Session. */
-	unsigned int xt_flags;	/* Terminal option flags. */
-	dev_t	xt_dev;		/* Userland device. */
-};
-
-#ifdef _KERNEL
-
-/* Used to distinguish between normal, callout, lock and init devices. */
-#define	TTYUNIT_INIT		0x1
-#define	TTYUNIT_LOCK		0x2
-#define	TTYUNIT_CALLOUT		0x4
-
-/* Allocation and deallocation. */
-struct tty *tty_alloc(struct ttydevsw *tsw, void *softc);
-struct tty *tty_alloc_mutex(struct ttydevsw *tsw, void *softc, struct mtx *mtx);
-void	tty_rel_pgrp(struct tty *tp, struct pgrp *pgrp);
-void	tty_rel_sess(struct tty *tp, struct session *sess);
-void	tty_rel_gone(struct tty *tp);
-
-#define	tty_lock(tp)		mtx_lock((tp)->t_mtx)
-#define	tty_unlock(tp)		mtx_unlock((tp)->t_mtx)
-#define	tty_lock_owned(tp)	mtx_owned((tp)->t_mtx)
-#define	tty_lock_assert(tp,ma)	mtx_assert((tp)->t_mtx, (ma))
-#define	tty_getlock(tp)		((tp)->t_mtx)
-
-/* Device node creation. */
-void	tty_makedev(struct tty *tp, struct ucred *cred, const char *fmt, ...)
-    __printflike(3, 4);
-int	tty_makedevf(struct tty *tp, struct ucred *cred, int flags,
-    const char *fmt, ...) __printflike(4, 5);
-#define	TTYMK_CLONING		0x1
-#define	tty_makealias(tp,fmt,...) \
-	make_dev_alias((tp)->t_dev, fmt, ## __VA_ARGS__)
-
-/* Signalling processes. */
-void	tty_signal_sessleader(struct tty *tp, int signal);
-void	tty_signal_pgrp(struct tty *tp, int signal);
-/* Waking up readers/writers. */
-int	tty_wait(struct tty *tp, struct cv *cv);
-int	tty_wait_background(struct tty *tp, struct thread *td, int sig);
-int	tty_timedwait(struct tty *tp, struct cv *cv, int timo);
-void	tty_wakeup(struct tty *tp, int flags);
-
-/* System messages. */
-int	tty_checkoutq(struct tty *tp);
-int	tty_putchar(struct tty *tp, char c);
-
-int	tty_ioctl(struct tty *tp, u_long cmd, void *data, int fflag,
-    struct thread *td);
-int	tty_ioctl_compat(struct tty *tp, u_long cmd, caddr_t data,
-    int fflag, struct thread *td);
-void	tty_set_winsize(struct tty *tp, const struct winsize *wsz);
-void	tty_init_console(struct tty *tp, speed_t speed);
-void	tty_flush(struct tty *tp, int flags);
-void	tty_hiwat_in_block(struct tty *tp);
-void	tty_hiwat_in_unblock(struct tty *tp);
-dev_t	tty_udev(struct tty *tp);
-#define	tty_opened(tp)		((tp)->t_flags & TF_OPENED)
-#define	tty_gone(tp)		((tp)->t_flags & TF_GONE)
-#define	tty_softc(tp)		((tp)->t_devswsoftc)
-#define	tty_devname(tp)		devtoname((tp)->t_dev)
-
-/* Status line printing. */
-void	tty_info(struct tty *tp);
-
-/* /dev/console selection. */
-void	ttyconsdev_select(const char *name);
-
-/* Pseudo-terminal hooks. */
-int	pts_alloc(int fflags, struct thread *td, struct file *fp);
-int	pts_alloc_external(int fd, struct thread *td, struct file *fp,
-    struct cdev *dev, const char *name);
-
-/* Drivers and line disciplines also need to call these. */
-#include <sys/ttydisc.h>
-#include <sys/ttydevsw.h>
-#include <sys/ttyhook.h>
-#endif /* _KERNEL */
-
-#endif /* !_SYS_TTY_H_ */
diff --git a/include.new/sys/ttychars.h b/include.new/sys/ttychars.h
deleted file mode 100644
index 6cd4529..0000000
--- a/include.new/sys/ttychars.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 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.
- * 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.
- *
- *	@(#)ttychars.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/sys/ttychars.h,v 1.9 2004/06/21 22:57:16 phk Exp $
- */
-
-#ifndef _SYS_TTYCHARS_H_
-#define _SYS_TTYCHARS_H_
-
-#ifndef BURN_BRIDGES
-
-/*
- * 4.3 COMPATIBILITY FILE
- *
- * User visible structures and constants related to terminal handling.
- */
-
-struct ttychars {
-	char	tc_erase;	/* erase last character */
-	char	tc_kill;	/* erase entire line */
-	char	tc_intrc;	/* interrupt */
-	char	tc_quitc;	/* quit */
-	char	tc_startc;	/* start output */
-	char	tc_stopc;	/* stop output */
-	char	tc_eofc;	/* end-of-file */
-	char	tc_brkc;	/* input delimiter (like nl) */
-	char	tc_suspc;	/* stop process signal */
-	char	tc_dsuspc;	/* delayed stop process signal */
-	char	tc_rprntc;	/* reprint line */
-	char	tc_flushc;	/* flush output (toggles) */
-	char	tc_werasc;	/* word erase */
-	char	tc_lnextc;	/* literal next character */
-};
-#ifdef USE_OLD_TTY
-#include <sys/ttydefaults.h>	/* to pick up character defaults */
-#endif
-
-#endif /* BURN_BRIDGES */
-
-#endif /* !_SYS_TTYCHARS_H_ */
diff --git a/include.new/sys/ttycom.h b/include.new/sys/ttycom.h
deleted file mode 100644
index 47d2cd4..0000000
--- a/include.new/sys/ttycom.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)ttycom.h	8.1 (Berkeley) 3/28/94
- * $FreeBSD: releng/10.2/sys/sys/ttycom.h 231095 2012-02-06 18:15:46Z ed $
- */
-
-#ifndef	_SYS_TTYCOM_H_
-#define	_SYS_TTYCOM_H_
-
-#include <sys/ioccom.h>
-
-/*
- * Tty ioctl's except for those supported only for backwards compatibility
- * with the old tty driver.
- */
-
-/*
- * Window/terminal size structure.  This information is stored by the kernel
- * in order to provide a consistent interface, but is not used by the kernel.
- */
-struct winsize {
-	unsigned short	ws_row;		/* rows, in characters */
-	unsigned short	ws_col;		/* columns, in characters */
-	unsigned short	ws_xpixel;	/* horizontal size, pixels */
-	unsigned short	ws_ypixel;	/* vertical size, pixels */
-};
-
-						/* 0-2 compat */
-						/* 3-7 unused */
-						/* 8-10 compat */
-						/* 11-12 unused */
-#define	TIOCEXCL	 _IO('t', 13)		/* set exclusive use of tty */
-#define	TIOCNXCL	 _IO('t', 14)		/* reset exclusive use of tty */
-#define	TIOCGPTN	_IOR('t', 15, int)	/* Get pts number. */
-#define	TIOCFLUSH	_IOW('t', 16, int)	/* flush buffers */
-						/* 17-18 compat */
-#define	TIOCGETA	_IOR('t', 19, struct termios) /* get termios struct */
-#define	TIOCSETA	_IOW('t', 20, struct termios) /* set termios struct */
-#define	TIOCSETAW	_IOW('t', 21, struct termios) /* drain output, set */
-#define	TIOCSETAF	_IOW('t', 22, struct termios) /* drn out, fls in, set */
-						/* 23-25 unused */
-#define	TIOCGETD	_IOR('t', 26, int)	/* get line discipline */
-#define	TIOCSETD	_IOW('t', 27, int)	/* set line discipline */
-#define	TIOCPTMASTER	 _IO('t', 28)		/* pts master validation */
-						/* 29-85 unused */
-#define	TIOCGDRAINWAIT	_IOR('t', 86, int)	/* get ttywait timeout */
-#define	TIOCSDRAINWAIT	_IOW('t', 87, int)	/* set ttywait timeout */
-						/* 88 unused */
-						/* 89-91 conflicts: tun and tap */
-#define	TIOCTIMESTAMP	_IOR('t', 89, struct timeval)	/* enable/get timestamp
-						 * of last input event */
-#define	TIOCMGDTRWAIT	_IOR('t', 90, int)	/* modem: get wait on close */
-#define	TIOCMSDTRWAIT	_IOW('t', 91, int)	/* modem: set wait on close */
-						/* 92-93 tun and tap */
-						/* 94-97 conflicts: tun and tap */
-#define	TIOCDRAIN	 _IO('t', 94)		/* wait till output drained */
-#define	TIOCSIG		_IOWINT('t', 95)	/* pty: generate signal */
-#define	TIOCEXT		_IOW('t', 96, int)	/* pty: external processing */
-#define	TIOCSCTTY	 _IO('t', 97)		/* become controlling tty */
-#define	TIOCCONS	_IOW('t', 98, int)	/* become virtual console */
-#define	TIOCGSID	_IOR('t', 99, int)	/* get session id */
-						/* 100 unused */
-#define	TIOCSTAT	 _IO('t', 101)		/* simulate ^T status message */
-#define	TIOCUCNTL	_IOW('t', 102, int)	/* pty: set/clr usr cntl mode */
-#define		UIOCCMD(n)	_IO('u', n)	/* usr cntl op "n" */
-#define	TIOCSWINSZ	_IOW('t', 103, struct winsize)	/* set window size */
-#define	TIOCGWINSZ	_IOR('t', 104, struct winsize)	/* get window size */
-						/* 105 unused */
-#define	TIOCMGET	_IOR('t', 106, int)	/* get all modem bits */
-#define		TIOCM_LE	0001		/* line enable */
-#define		TIOCM_DTR	0002		/* data terminal ready */
-#define		TIOCM_RTS	0004		/* request to send */
-#define		TIOCM_ST	0010		/* secondary transmit */
-#define		TIOCM_SR	0020		/* secondary receive */
-#define		TIOCM_CTS	0040		/* clear to send */
-#define		TIOCM_DCD	0100		/* data carrier detect */
-#define		TIOCM_RI	0200		/* ring indicate */
-#define		TIOCM_DSR	0400		/* data set ready */
-#define		TIOCM_CD	TIOCM_DCD
-#define		TIOCM_CAR	TIOCM_DCD
-#define		TIOCM_RNG	TIOCM_RI
-#define	TIOCMBIC	_IOW('t', 107, int)	/* bic modem bits */
-#define	TIOCMBIS	_IOW('t', 108, int)	/* bis modem bits */
-#define	TIOCMSET	_IOW('t', 109, int)	/* set all modem bits */
-#define	TIOCSTART	 _IO('t', 110)		/* start output, like ^Q */
-#define	TIOCSTOP	 _IO('t', 111)		/* stop output, like ^S */
-#define	TIOCPKT		_IOW('t', 112, int)	/* pty: set/clear packet mode */
-#define		TIOCPKT_DATA		0x00	/* data packet */
-#define		TIOCPKT_FLUSHREAD	0x01	/* flush packet */
-#define		TIOCPKT_FLUSHWRITE	0x02	/* flush packet */
-#define		TIOCPKT_STOP		0x04	/* stop output */
-#define		TIOCPKT_START		0x08	/* start output */
-#define		TIOCPKT_NOSTOP		0x10	/* no more ^S, ^Q */
-#define		TIOCPKT_DOSTOP		0x20	/* now do ^S ^Q */
-#define		TIOCPKT_IOCTL		0x40	/* state change of pty driver */
-#define	TIOCNOTTY	 _IO('t', 113)		/* void tty association */
-#define	TIOCSTI		_IOW('t', 114, char)	/* simulate terminal input */
-#define	TIOCOUTQ	_IOR('t', 115, int)	/* output queue size */
-						/* 116-117 compat */
-#define	TIOCSPGRP	_IOW('t', 118, int)	/* set pgrp of tty */
-#define	TIOCGPGRP	_IOR('t', 119, int)	/* get pgrp of tty */
-#define	TIOCCDTR	 _IO('t', 120)		/* clear data terminal ready */
-#define	TIOCSDTR	 _IO('t', 121)		/* set data terminal ready */
-#define	TIOCCBRK	 _IO('t', 122)		/* clear break bit */
-#define	TIOCSBRK	 _IO('t', 123)		/* set break bit */
-						/* 124-127 compat */
-
-#define	TTYDISC		0		/* termios tty line discipline */
-#define	SLIPDISC	4		/* serial IP discipline */
-#define	PPPDISC		5		/* PPP discipline */
-#define	NETGRAPHDISC	6		/* Netgraph tty node discipline */
-#define	H4DISC		7		/* Netgraph Bluetooth H4 discipline */
-
-#endif /* !_SYS_TTYCOM_H_ */
diff --git a/include.new/sys/ttydefaults.h b/include.new/sys/ttydefaults.h
deleted file mode 100644
index 000a4e3..0000000
--- a/include.new/sys/ttydefaults.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/sys/ttydefaults.h 249311 2013-04-09 16:16:34Z ed $
- */
-
-/*
- * System wide defaults for terminal state.
- */
-#ifndef _SYS_TTYDEFAULTS_H_
-#define	_SYS_TTYDEFAULTS_H_
-
-/*
- * Defaults on "first" open.
- */
-#define	TTYDEF_IFLAG	(BRKINT	| ICRNL	| IMAXBEL | IXON | IXANY)
-#define	TTYDEF_OFLAG	(OPOST | ONLCR)
-#define	TTYDEF_LFLAG_NOECHO (ICANON | ISIG | IEXTEN)
-#define	TTYDEF_LFLAG_ECHO (TTYDEF_LFLAG_NOECHO \
-	| ECHO | ECHOE | ECHOKE | ECHOCTL)
-#define	TTYDEF_LFLAG TTYDEF_LFLAG_ECHO
-#define	TTYDEF_CFLAG	(CREAD | CS8 | HUPCL)
-#define	TTYDEF_SPEED	(B9600)
-
-/*
- * Control Character Defaults
- */
-/*
- * XXX: A lot of code uses lowercase characters, but control-character
- * conversion is actually only valid when applied to uppercase
- * characters. We just treat lowercase characters as if they were
- * inserted as uppercase.
- */
-#define	CTRL(x) ((x) >= 'a' && (x) <= 'z' ? \
-	((x) - 'a' + 1) : (((x) - 'A' + 1) & 0x7f))
-#define	CEOF		CTRL('D')
-#define	CEOL		0xff		/* XXX avoid _POSIX_VDISABLE */
-#define	CERASE		CTRL('?')
-#define	CERASE2		CTRL('H')
-#define	CINTR		CTRL('C')
-#define	CSTATUS		CTRL('T')
-#define	CKILL		CTRL('U')
-#define	CMIN		1
-#define	CQUIT		CTRL('\\')
-#define	CSUSP		CTRL('Z')
-#define	CTIME		0
-#define	CDSUSP		CTRL('Y')
-#define	CSTART		CTRL('Q')
-#define	CSTOP		CTRL('S')
-#define	CLNEXT		CTRL('V')
-#define	CDISCARD	CTRL('O')
-#define	CWERASE		CTRL('W')
-#define	CREPRINT	CTRL('R')
-#define	CEOT		CEOF
-/* compat */
-#define	CBRK		CEOL
-#define	CRPRNT		CREPRINT
-#define	CFLUSH		CDISCARD
-
-/* PROTECTED INCLUSION ENDS HERE */
-#endif /* !_SYS_TTYDEFAULTS_H_ */
-
-/*
- * #define TTYDEFCHARS to include an array of default control characters.
- */
-#ifdef TTYDEFCHARS
-
-#include <sys/cdefs.h>
-#include <sys/_termios.h>
-
-static const cc_t ttydefchars[] = {
-	CEOF, CEOL, CEOL, CERASE, CWERASE, CKILL, CREPRINT, CERASE2, CINTR,
-	CQUIT, CSUSP, CDSUSP, CSTART, CSTOP, CLNEXT, CDISCARD, CMIN, CTIME,
-	CSTATUS, _POSIX_VDISABLE
-};
-_Static_assert(sizeof(ttydefchars) / sizeof(cc_t) == NCCS,
-    "Size of ttydefchars does not match NCCS");
-
-#undef TTYDEFCHARS
-#endif /* TTYDEFCHARS */
diff --git a/include.new/sys/ttydev.h b/include.new/sys/ttydev.h
deleted file mode 100644
index 9f9bde1..0000000
--- a/include.new/sys/ttydev.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 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.
- * 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.
- *
- *	@(#)ttydev.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/sys/ttydev.h,v 1.11 2004/06/21 22:57:16 phk Exp $
- */
-
-/* COMPATIBILITY HEADER FILE */
-
-#ifndef _SYS_TTYDEV_H_
-#define	_SYS_TTYDEV_H_
-
-#ifndef BURN_BRIDGES
-
-#ifdef USE_OLD_TTY
-#define B0	0
-#define B50	1
-#define B75	2
-#define B110	3
-#define B134	4
-#define B150	5
-#define B200	6
-#define B300	7
-#define B600	8
-#define B1200	9
-#define B1800	10
-#define B2400	11
-#define B4800	12
-#define B9600	13
-#define EXTA	14
-#define EXTB	15
-#define B57600	16
-#define B115200	17
-#define B230400	18
-#define B460800	19
-#define B921600	20
-#endif /* USE_OLD_TTY */
-
-#endif /* BURN_BRIDGES */
-
-#endif /* !_SYS_TTYDEV_H_ */
diff --git a/include.new/sys/ttydevsw.h b/include.new/sys/ttydevsw.h
deleted file mode 100644
index c0b88d6..0000000
--- a/include.new/sys/ttydevsw.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
- * All rights reserved.
- *
- * Portions of this software were developed under sponsorship from Snow
- * B.V., the Netherlands.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/ttydevsw.h 223722 2011-07-02 13:54:20Z ed $
- */
-
-#ifndef _SYS_TTYDEVSW_H_
-#define	_SYS_TTYDEVSW_H_
-
-#ifndef _SYS_TTY_H_
-#error "can only be included through <sys/tty.h>"
-#endif /* !_SYS_TTY_H_ */
-
-/*
- * Driver routines that are called from the line discipline to adjust
- * hardware parameters and such.
- */
-typedef int tsw_open_t(struct tty *tp);
-typedef void tsw_close_t(struct tty *tp);
-typedef void tsw_outwakeup_t(struct tty *tp);
-typedef void tsw_inwakeup_t(struct tty *tp);
-typedef int tsw_ioctl_t(struct tty *tp, u_long cmd, caddr_t data,
-    struct thread *td);
-typedef int tsw_cioctl_t(struct tty *tp, int unit, u_long cmd, caddr_t data,
-    struct thread *td);
-typedef int tsw_param_t(struct tty *tp, struct termios *t);
-typedef int tsw_modem_t(struct tty *tp, int sigon, int sigoff);
-typedef int tsw_mmap_t(struct tty *tp, vm_ooffset_t offset,
-    vm_paddr_t * paddr, int nprot, vm_memattr_t *memattr);
-typedef void tsw_pktnotify_t(struct tty *tp, char event);
-typedef void tsw_free_t(void *softc);
-
-struct ttydevsw {
-	unsigned int	tsw_flags;	/* Default TTY flags. */
-
-	tsw_open_t	*tsw_open;	/* Device opening. */
-	tsw_close_t	*tsw_close;	/* Device closure. */
-
-	tsw_outwakeup_t	*tsw_outwakeup;	/* Output available. */
-	tsw_inwakeup_t	*tsw_inwakeup;	/* Input can be stored again. */
-
-	tsw_ioctl_t	*tsw_ioctl;	/* ioctl() hooks. */
-	tsw_cioctl_t	*tsw_cioctl;	/* ioctl() on control devices. */
-	tsw_param_t	*tsw_param;	/* TIOCSETA device parameter setting. */
-	tsw_modem_t	*tsw_modem;	/* Modem sigon/sigoff. */
-
-	tsw_mmap_t	*tsw_mmap;	/* mmap() hooks. */
-	tsw_pktnotify_t	*tsw_pktnotify;	/* TIOCPKT events. */
-
-	tsw_free_t	*tsw_free;	/* Destructor. */
-
-	void		*tsw_spare[4];	/* For future use. */
-};
-
-static __inline int
-ttydevsw_open(struct tty *tp)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	return tp->t_devsw->tsw_open(tp);
-}
-
-static __inline void
-ttydevsw_close(struct tty *tp)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	tp->t_devsw->tsw_close(tp);
-}
-
-static __inline void
-ttydevsw_outwakeup(struct tty *tp)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	/* Prevent spurious wakeups. */
-	if (ttydisc_getc_poll(tp) == 0)
-		return;
-
-	tp->t_devsw->tsw_outwakeup(tp);
-}
-
-static __inline void
-ttydevsw_inwakeup(struct tty *tp)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	/* Prevent spurious wakeups. */
-	if (tp->t_flags & TF_HIWAT_IN)
-		return;
-
-	tp->t_devsw->tsw_inwakeup(tp);
-}
-
-static __inline int
-ttydevsw_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	return tp->t_devsw->tsw_ioctl(tp, cmd, data, td);
-}
-
-static __inline int
-ttydevsw_cioctl(struct tty *tp, int unit, u_long cmd, caddr_t data, struct thread *td)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	return tp->t_devsw->tsw_cioctl(tp, unit, cmd, data, td);
-}
-
-static __inline int
-ttydevsw_param(struct tty *tp, struct termios *t)
-{
-	MPASS(!tty_gone(tp));
-
-	return tp->t_devsw->tsw_param(tp, t);
-}
-
-static __inline int
-ttydevsw_modem(struct tty *tp, int sigon, int sigoff)
-{
-	MPASS(!tty_gone(tp));
-
-	return tp->t_devsw->tsw_modem(tp, sigon, sigoff);
-}
-
-static __inline int
-ttydevsw_mmap(struct tty *tp, vm_ooffset_t offset, vm_paddr_t *paddr,
-    int nprot, vm_memattr_t *memattr)
-{
-	MPASS(!tty_gone(tp));
-
-	return tp->t_devsw->tsw_mmap(tp, offset, paddr, nprot, memattr);
-}
-
-static __inline void
-ttydevsw_pktnotify(struct tty *tp, char event)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	tp->t_devsw->tsw_pktnotify(tp, event);
-}
-
-static __inline void
-ttydevsw_free(struct tty *tp)
-{
-	MPASS(tty_gone(tp));
-
-	tp->t_devsw->tsw_free(tty_softc(tp));
-}
-
-#endif /* !_SYS_TTYDEVSW_H_ */
diff --git a/include.new/sys/ttydisc.h b/include.new/sys/ttydisc.h
deleted file mode 100644
index 0536a1c..0000000
--- a/include.new/sys/ttydisc.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
- * All rights reserved.
- *
- * Portions of this software were developed under sponsorship from Snow
- * B.V., the Netherlands.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/ttydisc.h 196452 2009-08-23 08:04:40Z ed $
- */
-
-#ifndef _SYS_TTYDISC_H_
-#define	_SYS_TTYDISC_H_
-
-#ifndef _SYS_TTY_H_
-#error "can only be included through <sys/tty.h>"
-#endif /* !_SYS_TTY_H_ */
-
-struct cv;
-struct thread;
-struct tty;
-struct uio;
-
-/* Top half routines. */
-void	ttydisc_open(struct tty *tp);
-void	ttydisc_close(struct tty *tp);
-int	ttydisc_read(struct tty *tp, struct uio *uio, int ioflag);
-int	ttydisc_write(struct tty *tp, struct uio *uio, int ioflag);
-void	ttydisc_optimize(struct tty *tp);
-
-/* Bottom half routines. */
-void	ttydisc_modem(struct tty *tp, int open);
-#define ttydisc_can_bypass(tp) ((tp)->t_flags & TF_BYPASS)
-int	ttydisc_rint(struct tty *tp, char c, int flags);
-size_t	ttydisc_rint_simple(struct tty *tp, const void *buf, size_t len);
-size_t	ttydisc_rint_bypass(struct tty *tp, const void *buf, size_t len);
-void	ttydisc_rint_done(struct tty *tp);
-size_t	ttydisc_rint_poll(struct tty *tp);
-size_t	ttydisc_getc(struct tty *tp, void *buf, size_t len);
-int	ttydisc_getc_uio(struct tty *tp, struct uio *uio);
-size_t	ttydisc_getc_poll(struct tty *tp);
-
-/* Error codes for ttydisc_rint(). */
-#define	TRE_FRAMING	0x01
-#define	TRE_PARITY	0x02
-#define	TRE_OVERRUN	0x04
-#define	TRE_BREAK	0x08
-
-static __inline size_t
-ttydisc_read_poll(struct tty *tp)
-{
-
-	tty_lock_assert(tp, MA_OWNED);
-
-	return ttyinq_bytescanonicalized(&tp->t_inq);
-}
-
-static __inline size_t
-ttydisc_write_poll(struct tty *tp)
-{
-
-	tty_lock_assert(tp, MA_OWNED);
-
-	return ttyoutq_bytesleft(&tp->t_outq);
-}
-
-#endif /* !_SYS_TTYDISC_H_ */
diff --git a/include.new/sys/ttyhook.h b/include.new/sys/ttyhook.h
deleted file mode 100644
index 170e522..0000000
--- a/include.new/sys/ttyhook.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/sys/sys/ttyhook.h 186056 2008-12-13 21:17:46Z mav $
- */
-
-#ifndef _SYS_TTYHOOK_H_
-#define	_SYS_TTYHOOK_H_
-
-#ifndef _SYS_TTY_H_
-#error "can only be included through <sys/tty.h>"
-#endif /* !_SYS_TTY_H_ */
-
-struct tty;
-
-/*
- * Hooks interface, which allows to capture and inject traffic into the
- * input and output paths of a TTY.
- */
-
-typedef int th_rint_t(struct tty *tp, char c, int flags);
-typedef size_t th_rint_bypass_t(struct tty *tp, const void *buf, size_t len);
-typedef void th_rint_done_t(struct tty *tp);
-typedef size_t th_rint_poll_t(struct tty *tp);
-
-typedef size_t th_getc_inject_t(struct tty *tp, void *buf, size_t len);
-typedef void th_getc_capture_t(struct tty *tp, const void *buf, size_t len);
-typedef size_t th_getc_poll_t(struct tty *tp);
-
-typedef void th_close_t(struct tty *tp);
-
-struct ttyhook {
-	/* Character input. */
-	th_rint_t		*th_rint;
-	th_rint_bypass_t	*th_rint_bypass;
-	th_rint_done_t		*th_rint_done;
-	th_rint_poll_t		*th_rint_poll;
-
-	/* Character output. */
-	th_getc_inject_t	*th_getc_inject;
-	th_getc_capture_t	*th_getc_capture;
-	th_getc_poll_t		*th_getc_poll;
-
-	th_close_t		*th_close;
-};
-
-int	ttyhook_register(struct tty **, struct proc *, int,
-    struct ttyhook *, void *);
-void	ttyhook_unregister(struct tty *);
-#define	ttyhook_softc(tp)		((tp)->t_hooksoftc)
-#define	ttyhook_hashook(tp,hook)	((tp)->t_hook != NULL && \
-					(tp)->t_hook->th_ ## hook != NULL)
-
-static __inline int
-ttyhook_rint(struct tty *tp, char c, int flags)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	return tp->t_hook->th_rint(tp, c, flags);
-}
-
-static __inline size_t
-ttyhook_rint_bypass(struct tty *tp, const void *buf, size_t len)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	return tp->t_hook->th_rint_bypass(tp, buf, len);
-}
-
-static __inline void
-ttyhook_rint_done(struct tty *tp)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	tp->t_hook->th_rint_done(tp);
-}
-
-static __inline size_t
-ttyhook_rint_poll(struct tty *tp)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	return tp->t_hook->th_rint_poll(tp);
-}
-
-static __inline size_t
-ttyhook_getc_inject(struct tty *tp, void *buf, size_t len)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	return tp->t_hook->th_getc_inject(tp, buf, len);
-}
-
-static __inline void
-ttyhook_getc_capture(struct tty *tp, const void *buf, size_t len)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	tp->t_hook->th_getc_capture(tp, buf, len);
-}
-
-static __inline size_t
-ttyhook_getc_poll(struct tty *tp)
-{
-	tty_lock_assert(tp, MA_OWNED);
-	MPASS(!tty_gone(tp));
-
-	return tp->t_hook->th_getc_poll(tp);
-}
-
-static __inline void
-ttyhook_close(struct tty *tp)
-{
-	tty_lock_assert(tp, MA_OWNED);
-
-	tp->t_hook->th_close(tp);
-}
-
-#endif /* !_SYS_TTYHOOK_H_ */
diff --git a/include.new/sys/ttyqueue.h b/include.new/sys/ttyqueue.h
deleted file mode 100644
index 2ac623d..0000000
--- a/include.new/sys/ttyqueue.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
- * All rights reserved.
- *
- * Portions of this software were developed under sponsorship from Snow
- * B.V., the Netherlands.
- *
- * 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.
- *
- * 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: releng/10.2/sys/sys/ttyqueue.h 198223 2009-10-19 07:17:37Z ed $
- */
-
-#ifndef _SYS_TTYQUEUE_H_
-#define	_SYS_TTYQUEUE_H_
-
-#ifndef _SYS_TTY_H_
-#error "can only be included through <sys/tty.h>"
-#endif /* !_SYS_TTY_H_ */
-
-struct tty;
-struct ttyinq_block;
-struct ttyoutq_block;
-struct uio;
-
-/* Data input queue. */
-struct ttyinq {
-	struct ttyinq_block	*ti_firstblock;
-	struct ttyinq_block	*ti_startblock;
-	struct ttyinq_block	*ti_reprintblock;
-	struct ttyinq_block	*ti_lastblock;
-	unsigned int		ti_begin;
-	unsigned int		ti_linestart;
-	unsigned int		ti_reprint;
-	unsigned int		ti_end;
-	unsigned int		ti_nblocks;
-	unsigned int		ti_quota;
-};
-#define TTYINQ_DATASIZE 128
-
-/* Data output queue. */
-struct ttyoutq {
-	struct ttyoutq_block	*to_firstblock;
-	struct ttyoutq_block	*to_lastblock;
-	unsigned int		to_begin;
-	unsigned int		to_end;
-	unsigned int		to_nblocks;
-	unsigned int		to_quota;
-};
-#define TTYOUTQ_DATASIZE (256 - sizeof(struct ttyoutq_block *))
-
-#ifdef _KERNEL
-/* Input queue handling routines. */
-void	ttyinq_setsize(struct ttyinq *ti, struct tty *tp, size_t len);
-void	ttyinq_free(struct ttyinq *ti);
-int	ttyinq_read_uio(struct ttyinq *ti, struct tty *tp, struct uio *uio,
-    size_t readlen, size_t flushlen);
-size_t	ttyinq_write(struct ttyinq *ti, const void *buf, size_t len,
-    int quote);
-int	ttyinq_write_nofrag(struct ttyinq *ti, const void *buf, size_t len,
-    int quote);
-void	ttyinq_canonicalize(struct ttyinq *ti);
-size_t	ttyinq_findchar(struct ttyinq *ti, const char *breakc, size_t maxlen,
-    char *lastc);
-void	ttyinq_flush(struct ttyinq *ti);
-int	ttyinq_peekchar(struct ttyinq *ti, char *c, int *quote);
-void	ttyinq_unputchar(struct ttyinq *ti);
-void	ttyinq_reprintpos_set(struct ttyinq *ti);
-void	ttyinq_reprintpos_reset(struct ttyinq *ti);
-
-static __inline size_t
-ttyinq_getsize(struct ttyinq *ti)
-{
-	return (ti->ti_nblocks * TTYINQ_DATASIZE);
-}
-
-static __inline size_t
-ttyinq_getallocatedsize(struct ttyinq *ti)
-{
-
-	return (ti->ti_quota * TTYINQ_DATASIZE);
-}
-
-static __inline size_t
-ttyinq_bytesleft(struct ttyinq *ti)
-{
-	size_t len;
-
-	/* Make sure the usage never exceeds the length. */
-	len = ti->ti_nblocks * TTYINQ_DATASIZE;
-	MPASS(len >= ti->ti_end);
-
-	return (len - ti->ti_end);
-}
-
-static __inline size_t
-ttyinq_bytescanonicalized(struct ttyinq *ti)
-{
-	MPASS(ti->ti_begin <= ti->ti_linestart);
-
-	return (ti->ti_linestart - ti->ti_begin);
-}
-
-static __inline size_t
-ttyinq_bytesline(struct ttyinq *ti)
-{
-	MPASS(ti->ti_linestart <= ti->ti_end);
-
-	return (ti->ti_end - ti->ti_linestart);
-}
-
-/* Input buffer iteration. */
-typedef void ttyinq_line_iterator_t(void *data, char c, int flags);
-void	ttyinq_line_iterate_from_linestart(struct ttyinq *ti,
-    ttyinq_line_iterator_t *iterator, void *data);
-void	ttyinq_line_iterate_from_reprintpos(struct ttyinq *ti,
-    ttyinq_line_iterator_t *iterator, void *data);
-
-/* Output queue handling routines. */
-void	ttyoutq_flush(struct ttyoutq *to);
-void	ttyoutq_setsize(struct ttyoutq *to, struct tty *tp, size_t len);
-void	ttyoutq_free(struct ttyoutq *to);
-size_t	ttyoutq_read(struct ttyoutq *to, void *buf, size_t len);
-int	ttyoutq_read_uio(struct ttyoutq *to, struct tty *tp, struct uio *uio);
-size_t	ttyoutq_write(struct ttyoutq *to, const void *buf, size_t len);
-int	ttyoutq_write_nofrag(struct ttyoutq *to, const void *buf, size_t len);
-
-static __inline size_t
-ttyoutq_getsize(struct ttyoutq *to)
-{
-	return (to->to_nblocks * TTYOUTQ_DATASIZE);
-}
-
-static __inline size_t
-ttyoutq_getallocatedsize(struct ttyoutq *to)
-{
-
-	return (to->to_quota * TTYOUTQ_DATASIZE);
-}
-
-static __inline size_t
-ttyoutq_bytesleft(struct ttyoutq *to)
-{
-	size_t len;
-
-	/* Make sure the usage never exceeds the length. */
-	len = to->to_nblocks * TTYOUTQ_DATASIZE;
-	MPASS(len >= to->to_end);
-
-	return (len - to->to_end);
-}
-
-static __inline size_t
-ttyoutq_bytesused(struct ttyoutq *to)
-{
-	return (to->to_end - to->to_begin);
-}
-#endif /* _KERNEL */
-
-#endif /* !_SYS_TTYQUEUE_H_ */
diff --git a/include.new/sys/turnstile.h b/include.new/sys/turnstile.h
deleted file mode 100644
index 42e0668..0000000
--- a/include.new/sys/turnstile.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * Copyright (c) 2002 John Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/sys/turnstile.h 262192 2014-02-18 20:27:17Z jhb $
- */
-
-#ifndef _SYS_TURNSTILE_H_
-#define _SYS_TURNSTILE_H_
-
-/*
- * Turnstile interface.  Non-sleepable locks use a turnstile for the
- * queue of threads blocked on them when they are contested.  Each
- * turnstile contains two sub-queues: one for threads waiting for a
- * shared, or eread, lock, and one for threads waiting for an
- * exclusive, or write, lock.
- *
- * A thread calls turnstile_chain_lock() to lock the turnstile chain
- * associated with a given lock.  A thread calls turnstile_wait() when
- * the lock is contested to be put on the queue and block.  If a thread
- * calls turnstile_trywait() and decides to retry a lock operation instead
- * of blocking, it should call turnstile_cancel() to unlock the associated
- * turnstile chain lock.
- *
- * When a lock is released, the thread calls turnstile_lookup() to look
- * up the turnstile associated with the given lock in the hash table.  Then
- * it calls either turnstile_signal() or turnstile_broadcast() to mark
- * blocked threads for a pending wakeup.  turnstile_signal() marks the
- * highest priority blocked thread while turnstile_broadcast() marks all
- * blocked threads.  The turnstile_signal() function returns true if the
- * turnstile became empty as a result.  After the higher level code finishes
- * releasing the lock, turnstile_unpend() must be called to wake up the
- * pending thread(s) and give up ownership of the turnstile.
- *
- * Alternatively, if a thread wishes to relinquish ownership of a lock
- * without waking up any waiters, it may call turnstile_disown().
- *
- * When a lock is acquired that already has at least one thread contested
- * on it, the new owner of the lock must claim ownership of the turnstile
- * via turnstile_claim().
- *
- * Each thread allocates a turnstile at thread creation via turnstile_alloc()
- * and releases it at thread destruction via turnstile_free().  Note that
- * a turnstile is not tied to a specific thread and that the turnstile
- * released at thread destruction may not be the same turnstile that the
- * thread allocated when it was created.
- *
- * The highest priority thread blocked on a specified queue of a
- * turnstile can be obtained via turnstile_head().  A given queue can
- * also be queried to see if it is empty via turnstile_empty().
- */
-
-struct lock_object;
-struct thread;
-struct turnstile;
-
-#ifdef _KERNEL
-
-/* Which queue to block on or which queue to wakeup one or more threads from. */
-#define	TS_EXCLUSIVE_QUEUE	0
-#define	TS_SHARED_QUEUE		1
-
-/* The type of lock currently held. */
-#define	TS_EXCLUSIVE_LOCK	TS_EXCLUSIVE_QUEUE
-#define	TS_SHARED_LOCK		TS_SHARED_QUEUE
-
-void	init_turnstiles(void);
-void	turnstile_adjust(struct thread *, u_char);
-struct turnstile *turnstile_alloc(void);
-void	turnstile_broadcast(struct turnstile *, int);
-void	turnstile_cancel(struct turnstile *);
-void	turnstile_chain_lock(struct lock_object *);
-void	turnstile_chain_unlock(struct lock_object *);
-void	turnstile_claim(struct turnstile *);
-void	turnstile_disown(struct turnstile *);
-int	turnstile_empty(struct turnstile *ts, int queue);
-void	turnstile_free(struct turnstile *);
-struct thread *turnstile_head(struct turnstile *, int);
-struct turnstile *turnstile_lookup(struct lock_object *);
-int	turnstile_signal(struct turnstile *, int);
-struct turnstile *turnstile_trywait(struct lock_object *);
-void	turnstile_unpend(struct turnstile *, int);
-void	turnstile_wait(struct turnstile *, struct thread *, int);
-
-#endif	/* _KERNEL */
-#endif	/* _SYS_TURNSTILE_H_ */
diff --git a/include.new/sys/types.h b/include.new/sys/types.h
deleted file mode 100644
index 2d996b7..0000000
--- a/include.new/sys/types.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)types.h	8.6 (Berkeley) 2/19/95
- * $FreeBSD: releng/10.2/sys/sys/types.h 281538 2015-04-14 20:05:26Z jhb $
- */
-
-#ifndef _SYS_TYPES_H_
-#define	_SYS_TYPES_H_
-
-#include <sys/cdefs.h>
-
-/* Machine type dependent parameters. */
-#include <machine/endian.h>
-#include <sys/_types.h>
-
-#include <sys/_pthreadtypes.h>
-
-#if __BSD_VISIBLE
-typedef	unsigned char	u_char;
-typedef	unsigned short	u_short;
-typedef	unsigned int	u_int;
-typedef	unsigned long	u_long;
-#ifndef _KERNEL
-typedef	unsigned short	ushort;		/* Sys V compatibility */
-typedef	unsigned int	uint;		/* Sys V compatibility */
-#endif
-#endif
-
-/*
- * XXX POSIX sized integrals that should appear only in <sys/stdint.h>.
- */
-#include <sys/_stdint.h>
-
-typedef __uint8_t	u_int8_t;	/* unsigned integrals (deprecated) */
-typedef __uint16_t	u_int16_t;
-typedef __uint32_t	uint32_t;
-typedef __uint64_t	u_int64_t;
-
-typedef	__uint64_t	u_quad_t;	/* quads (deprecated) */
-typedef	__int64_t	quad_t;
-typedef	quad_t *	qaddr_t;
-
-typedef	char *		caddr_t;	/* core address */
-typedef	const char *	c_caddr_t;	/* core address, pointer to const */
-
-#ifndef _BLKSIZE_T_DECLARED
-typedef	__blksize_t	blksize_t;
-#define	_BLKSIZE_T_DECLARED
-#endif
-
-typedef	__cpuwhich_t	cpuwhich_t;
-typedef	__cpulevel_t	cpulevel_t;
-typedef	__cpusetid_t	cpusetid_t;
-
-#ifndef _BLKCNT_T_DECLARED
-typedef	__blkcnt_t	blkcnt_t;
-#define	_BLKCNT_T_DECLARED
-#endif
-
-#ifndef _CLOCK_T_DECLARED
-typedef	__clock_t	clock_t;
-#define	_CLOCK_T_DECLARED
-#endif
-
-#ifndef _CLOCKID_T_DECLARED
-typedef	__clockid_t	clockid_t;
-#define	_CLOCKID_T_DECLARED
-#endif
-
-typedef	__critical_t	critical_t;	/* Critical section value */
-typedef	__int64_t	daddr_t;	/* disk address */
-
-#ifndef _DEV_T_DECLARED
-typedef	__dev_t		dev_t;		/* device number or struct cdev */
-#define	_DEV_T_DECLARED
-#endif
-
-#ifndef _FFLAGS_T_DECLARED
-typedef	__fflags_t	fflags_t;	/* file flags */
-#define	_FFLAGS_T_DECLARED
-#endif
-
-typedef	__fixpt_t	fixpt_t;	/* fixed point number */
-
-#ifndef _FSBLKCNT_T_DECLARED		/* for statvfs() */
-typedef	__fsblkcnt_t	fsblkcnt_t;
-typedef	__fsfilcnt_t	fsfilcnt_t;
-#define	_FSBLKCNT_T_DECLARED
-#endif
-
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;		/* group id */
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _IN_ADDR_T_DECLARED
-typedef	__uint32_t	in_addr_t;	/* base type for internet address */
-#define	_IN_ADDR_T_DECLARED
-#endif
-
-#ifndef _IN_PORT_T_DECLARED
-typedef	__uint16_t	in_port_t;
-#define	_IN_PORT_T_DECLARED
-#endif
-
-#ifndef _ID_T_DECLARED
-typedef	__id_t		id_t;		/* can hold a uid_t or pid_t */
-#define	_ID_T_DECLARED
-#endif
-
-#ifndef _INO_T_DECLARED
-typedef	__ino_t		ino_t;		/* inode number */
-#define	_INO_T_DECLARED
-#endif
-
-#ifndef _KEY_T_DECLARED
-typedef	__key_t		key_t;		/* IPC key (for Sys V IPC) */
-#define	_KEY_T_DECLARED
-#endif
-
-#ifndef _LWPID_T_DECLARED
-typedef	__lwpid_t	lwpid_t;	/* Thread ID (a.k.a. LWP) */
-#define	_LWPID_T_DECLARED
-#endif
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;		/* permissions */
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _ACCMODE_T_DECLARED
-typedef	__accmode_t	accmode_t;	/* access permissions */
-#define	_ACCMODE_T_DECLARED
-#endif
-
-#ifndef _NLINK_T_DECLARED
-typedef	__nlink_t	nlink_t;	/* link count */
-#define	_NLINK_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;		/* file offset */
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;		/* process id */
-#define	_PID_T_DECLARED
-#endif
-
-typedef	__register_t	register_t;
-
-#ifndef _RLIM_T_DECLARED
-typedef	__rlim_t	rlim_t;		/* resource limit */
-#define	_RLIM_T_DECLARED
-#endif
-
-typedef	__int64_t	sbintime_t;
-
-typedef	__segsz_t	segsz_t;	/* segment size (in pages) */
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif
-
-#ifndef _SUSECONDS_T_DECLARED
-typedef	__suseconds_t	suseconds_t;	/* microseconds (signed) */
-#define	_SUSECONDS_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-#ifndef _TIMER_T_DECLARED
-typedef	__timer_t	timer_t;
-#define	_TIMER_T_DECLARED
-#endif
-
-#ifndef _MQD_T_DECLARED
-typedef	__mqd_t	mqd_t;
-#define	_MQD_T_DECLARED
-#endif
-
-typedef	__u_register_t	u_register_t;
-
-#ifndef _UID_T_DECLARED
-typedef	__uid_t		uid_t;		/* user id */
-#define	_UID_T_DECLARED
-#endif
-
-#ifndef _USECONDS_T_DECLARED
-typedef	__useconds_t	useconds_t;	/* microseconds (unsigned) */
-#define	_USECONDS_T_DECLARED
-#endif
-
-#ifndef _CAP_RIGHTS_T_DECLARED
-#define	_CAP_RIGHTS_T_DECLARED
-struct cap_rights;
-
-typedef	struct cap_rights	cap_rights_t;
-#endif
-
-typedef	__vm_offset_t	vm_offset_t;
-typedef	__vm_ooffset_t	vm_ooffset_t;
-typedef	__vm_paddr_t	vm_paddr_t;
-typedef	__vm_pindex_t	vm_pindex_t;
-typedef	__vm_size_t	vm_size_t;
-
-#ifdef _KERNEL
-typedef	int		boolean_t;
-typedef	struct device	*device_t;
-typedef	__intfptr_t	intfptr_t;
-
-/*
- * XXX this is fixed width for historical reasons.  It should have had type
- * __int_fast32_t.  Fixed-width types should not be used unless binary
- * compatibility is essential.  Least-width types should be used even less
- * since they provide smaller benefits.
- *
- * XXX should be MD.
- *
- * XXX this is bogus in -current, but still used for spl*().
- */
-typedef	__uint32_t	intrmask_t;	/* Interrupt mask (spl, xxx_imask...) */
-
-typedef	__uintfptr_t	uintfptr_t;
-typedef	__uint64_t	uoff_t;
-typedef	char		vm_memattr_t;	/* memory attribute codes */
-typedef	struct vm_page	*vm_page_t;
-
-#if !defined(__bool_true_false_are_defined) && !defined(__cplusplus)
-#define	__bool_true_false_are_defined	1
-#define	false	0
-#define	true	1
-#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 && !defined(__INTEL_COMPILER)
-typedef	int	_Bool;
-#endif
-typedef	_Bool	bool;
-#endif /* !__bool_true_false_are_defined && !__cplusplus */
-
-#define offsetof(type, field) __offsetof(type, field)
-
-#endif /* !_KERNEL */
-
-/*
- * The following are all things that really shouldn't exist in this header,
- * since its purpose is to provide typedefs, not miscellaneous doodads.
- */
-#if __BSD_VISIBLE
-
-#include <sys/select.h>
-
-#ifdef __POPCNT__
-#define	__bitcount64(x)	__builtin_popcountll((__uint64_t)(x))
-#define	__bitcount32(x)	__builtin_popcount((__uint32_t)(x))
-#define	__bitcount16(x)	__builtin_popcount((__uint16_t)(x))
-#define	__bitcountl(x)	__builtin_popcountl((unsigned long)(x))
-#define	__bitcount(x)	__builtin_popcount((unsigned int)(x))
-#else
-/*
- * Population count algorithm using SWAR approach
- * - "SIMD Within A Register".
- */
-static __inline __uint16_t
-__bitcount16(__uint16_t _x)
-{
-
-	_x = (_x & 0x5555) + ((_x & 0xaaaa) >> 1);
-	_x = (_x & 0x3333) + ((_x & 0xcccc) >> 2);
-	_x = (_x + (_x >> 4)) & 0x0f0f;
-	_x = (_x + (_x >> 8)) & 0x00ff;
-	return (_x);
-}
-
-static __inline __uint32_t
-__bitcount32(__uint32_t _x)
-{
-
-	_x = (_x & 0x55555555) + ((_x & 0xaaaaaaaa) >> 1);
-	_x = (_x & 0x33333333) + ((_x & 0xcccccccc) >> 2);
-	_x = (_x + (_x >> 4)) & 0x0f0f0f0f;
-	_x = (_x + (_x >> 8));
-	_x = (_x + (_x >> 16)) & 0x000000ff;
-	return (_x);
-}
-
-#ifdef __LP64__
-static __inline __uint64_t
-__bitcount64(__uint64_t _x)
-{
-
-	_x = (_x & 0x5555555555555555) + ((_x & 0xaaaaaaaaaaaaaaaa) >> 1);
-	_x = (_x & 0x3333333333333333) + ((_x & 0xcccccccccccccccc) >> 2);
-	_x = (_x + (_x >> 4)) & 0x0f0f0f0f0f0f0f0f;
-	_x = (_x + (_x >> 8));
-	_x = (_x + (_x >> 16));
-	_x = (_x + (_x >> 32)) & 0x000000ff;
-	return (_x);
-}
-
-#define	__bitcountl(x)	__bitcount64((unsigned long)(x))
-#else
-static __inline __uint64_t
-__bitcount64(__uint64_t _x)
-{
-
-	return (__bitcount32(_x >> 32) + __bitcount32(_x));
-}
-
-#define	__bitcountl(x)	__bitcount32((unsigned long)(x))
-#endif
-#define	__bitcount(x)	__bitcount32((unsigned int)(x))
-#endif
-
-/*
- * minor() gives a cookie instead of an index since we don't want to
- * change the meanings of bits 0-15 or waste time and space shifting
- * bits 16-31 for devices that don't use them.
- */
-#define	major(x)	((int)(((u_int)(x) >> 8)&0xff))	/* major number */
-#define	minor(x)	((int)((x)&0xffff00ff))		/* minor number */
-#define	makedev(x,y)	((dev_t)(((x) << 8) | (y)))	/* create dev_t */
-
-/*
- * These declarations belong elsewhere, but are repeated here and in
- * <stdio.h> to give broken programs a better chance of working with
- * 64-bit off_t's.
- */
-#ifndef _KERNEL
-__BEGIN_DECLS
-#ifndef _FTRUNCATE_DECLARED
-#define	_FTRUNCATE_DECLARED
-int	 ftruncate(int, off_t);
-#endif
-#ifndef _LSEEK_DECLARED
-#define	_LSEEK_DECLARED
-off_t	 lseek(int, off_t, int);
-#endif
-#ifndef _MMAP_DECLARED
-#define	_MMAP_DECLARED
-void *	 mmap(void *, size_t, int, int, int, off_t);
-#endif
-#ifndef _TRUNCATE_DECLARED
-#define	_TRUNCATE_DECLARED
-int	 truncate(const char *, off_t);
-#endif
-__END_DECLS
-#endif /* !_KERNEL */
-
-#endif /* __BSD_VISIBLE */
-
-#endif /* !_SYS_TYPES_H_ */
diff --git a/include.new/sys/ucontext.h b/include.new/sys/ucontext.h
deleted file mode 100644
index 4ca3aa5..0000000
--- a/include.new/sys/ucontext.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 1999 Marcel Moolenaar
- * 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 
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/sys/ucontext.h 278347 2015-02-07 08:47:15Z kib $
- */
-
-#ifndef _SYS_UCONTEXT_H_
-#define	_SYS_UCONTEXT_H_
-
-#include <sys/signal.h>
-#include <machine/ucontext.h>
-
-typedef struct __ucontext {
-	/*
-	 * Keep the order of the first two fields. Also,
-	 * keep them the first two fields in the structure.
-	 * This way we can have a union with struct
-	 * sigcontext and ucontext_t. This allows us to
-	 * support them both at the same time.
-	 * note: the union is not defined, though.
-	 */
-	sigset_t	uc_sigmask;
-	mcontext_t	uc_mcontext;
-
-	struct __ucontext *uc_link;
-	stack_t		uc_stack;
-	int		uc_flags;
-#define	UCF_SWAPPED	0x00000001	/* Used by swapcontext(3). */
-	int		__spare__[4];
-} ucontext_t;
-
-#if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
-#if defined(__i386__)
-struct ucontext4 {
-	sigset_t	uc_sigmask;
-	struct mcontext4 uc_mcontext;
-	struct ucontext4 *uc_link;
-	stack_t		uc_stack;
-	int		__spare__[8];
-};
-#else	/* __i386__ */
-#define ucontext4 ucontext
-#endif	/* __i386__ */
-#endif	/* _KERNEL */
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-
-int	getcontext(ucontext_t *) __returns_twice;
-ucontext_t *getcontextx(void);
-int	setcontext(const ucontext_t *);
-void	makecontext(ucontext_t *, void (*)(void), int, ...);
-int	signalcontext(ucontext_t *, int, __sighandler_t *);
-int	swapcontext(ucontext_t *, const ucontext_t *);
-
-#if __BSD_VISIBLE
-int __getcontextx_size(void);
-int __fillcontextx(char *ctx) __returns_twice;
-int __fillcontextx2(char *ctx);
-#endif
-
-__END_DECLS
-
-#else /* _KERNEL */
-
-struct thread;
-
-/*
- * Flags for get_mcontext().  The low order 4 bits (i.e a mask of 0x0f) are
- * reserved for use by machine independent code.  All other bits are for use
- * by machine dependent code.
- */
-#define	GET_MC_CLEAR_RET	1
-
-/* Machine-dependent functions: */
-int	get_mcontext(struct thread *, mcontext_t *, int);
-int	set_mcontext(struct thread *, mcontext_t *);
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_UCONTEXT_H_ */
diff --git a/include.new/sys/ucred.h b/include.new/sys/ucred.h
deleted file mode 100644
index ffd0671..0000000
--- a/include.new/sys/ucred.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- * 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.
- *
- *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD: releng/10.2/sys/sys/ucred.h 219304 2011-03-05 12:40:35Z trasz $
- */
-
-#ifndef _SYS_UCRED_H_
-#define	_SYS_UCRED_H_
-
-#include <bsm/audit.h>
-
-struct loginclass;
-
-/*
- * Credentials.
- *
- * Please do not inspect cr_uid directly to determine superuserness.  The
- * priv(9) interface should be used to check for privilege.
- */
-#if defined(_KERNEL) || defined(_WANT_UCRED)
-struct ucred {
-	u_int	cr_ref;			/* reference count */
-#define	cr_startcopy cr_uid
-	uid_t	cr_uid;			/* effective user id */
-	uid_t	cr_ruid;		/* real user id */
-	uid_t	cr_svuid;		/* saved user id */
-	int	cr_ngroups;		/* number of groups */
-	gid_t	cr_rgid;		/* real group id */
-	gid_t	cr_svgid;		/* saved group id */
-	struct uidinfo	*cr_uidinfo;	/* per euid resource consumption */
-	struct uidinfo	*cr_ruidinfo;	/* per ruid resource consumption */
-	struct prison	*cr_prison;	/* jail(2) */
-	struct loginclass	*cr_loginclass; /* login class */
-	u_int		cr_flags;	/* credential flags */
-	void 		*cr_pspare2[2];	/* general use 2 */
-#define	cr_endcopy	cr_label
-	struct label	*cr_label;	/* MAC label */
-	struct auditinfo_addr	cr_audit;	/* Audit properties. */
-	gid_t	*cr_groups;		/* groups */
-	int	cr_agroups;		/* Available groups */
-};
-#define	NOCRED	((struct ucred *)0)	/* no credential available */
-#define	FSCRED	((struct ucred *)-1)	/* filesystem credential */
-#endif /* _KERNEL || _WANT_UCRED */
-
-#define	XU_NGROUPS	16
-
-/*
- * Flags for cr_flags.
- */
-#define	CRED_FLAG_CAPMODE	0x00000001	/* In capability mode. */
-
-/*
- * This is the external representation of struct ucred.
- */
-struct xucred {
-	u_int	cr_version;		/* structure layout version */
-	uid_t	cr_uid;			/* effective user id */
-	short	cr_ngroups;		/* number of groups */
-	gid_t	cr_groups[XU_NGROUPS];	/* groups */
-	void	*_cr_unused1;		/* compatibility with old ucred */
-};
-#define	XUCRED_VERSION	0
-
-/* This can be used for both ucred and xucred structures. */
-#define	cr_gid cr_groups[0]
-
-#ifdef _KERNEL
-struct proc;
-struct thread;
-
-void	change_egid(struct ucred *newcred, gid_t egid);
-void	change_euid(struct ucred *newcred, struct uidinfo *euip);
-void	change_rgid(struct ucred *newcred, gid_t rgid);
-void	change_ruid(struct ucred *newcred, struct uidinfo *ruip);
-void	change_svgid(struct ucred *newcred, gid_t svgid);
-void	change_svuid(struct ucred *newcred, uid_t svuid);
-void	crcopy(struct ucred *dest, struct ucred *src);
-struct ucred	*crcopysafe(struct proc *p, struct ucred *cr);
-struct ucred	*crdup(struct ucred *cr);
-void	cred_update_thread(struct thread *td);
-void	crfree(struct ucred *cr);
-struct ucred	*crget(void);
-struct ucred	*crhold(struct ucred *cr);
-int	crshared(struct ucred *cr);
-void	cru2x(struct ucred *cr, struct xucred *xcr);
-void	crsetgroups(struct ucred *cr, int n, gid_t *groups);
-int	groupmember(gid_t gid, struct ucred *cred);
-#endif /* _KERNEL */
-
-#endif /* !_SYS_UCRED_H_ */
diff --git a/include.new/sys/uio.h b/include.new/sys/uio.h
deleted file mode 100644
index 80dcdb9..0000000
--- a/include.new/sys/uio.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD: releng/10.2/sys/sys/uio.h 255608 2013-09-16 06:25:54Z kib $
- */
-
-#ifndef _SYS_UIO_H_
-#define	_SYS_UIO_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/_iovec.h>
-
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t	off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#if __BSD_VISIBLE
-enum	uio_rw { UIO_READ, UIO_WRITE };
-
-/* Segment flag values. */
-enum uio_seg {
-	UIO_USERSPACE,		/* from user data space */
-	UIO_SYSSPACE,		/* from system space */
-	UIO_NOCOPY		/* don't copy, already in object */
-};
-#endif
-
-#ifdef _KERNEL
-
-struct uio {
-	struct	iovec *uio_iov;		/* scatter/gather list */
-	int	uio_iovcnt;		/* length of scatter/gather list */
-	off_t	uio_offset;		/* offset in target object */
-	ssize_t	uio_resid;		/* remaining bytes to process */
-	enum	uio_seg uio_segflg;	/* address space */
-	enum	uio_rw uio_rw;		/* operation */
-	struct	thread *uio_td;		/* owner */
-};
-
-/*
- * Limits
- *
- * N.B.: UIO_MAXIOV must be no less than IOV_MAX from <sys/syslimits.h>
- * which in turn must be no less than _XOPEN_IOV_MAX from <limits.h>.  If
- * we ever make this tunable (probably pointless), then IOV_MAX should be
- * removed from <sys/syslimits.h> and applications would be expected to use
- * sysconf(3) to find out the correct value, or else assume the worst
- * (_XOPEN_IOV_MAX).  Perhaps UIO_MAXIOV should be simply defined as
- * IOV_MAX.
- */
-#define UIO_MAXIOV	1024		/* max 1K of iov's */
-
-struct vm_object;
-struct vm_page;
-
-struct uio *cloneuio(struct uio *uiop);
-int	copyinfrom(const void * __restrict src, void * __restrict dst,
-	    size_t len, int seg);
-int	copyiniov(const struct iovec *iovp, u_int iovcnt, struct iovec **iov,
-	    int error);
-int	copyinstrfrom(const void * __restrict src, void * __restrict dst,
-	    size_t len, size_t * __restrict copied, int seg);
-int	copyinuio(const struct iovec *iovp, u_int iovcnt, struct uio **uiop);
-int	copyout_map(struct thread *td, vm_offset_t *addr, size_t sz);
-int	copyout_unmap(struct thread *td, vm_offset_t addr, size_t sz);
-int	physcopyin(void *src, vm_paddr_t dst, size_t len);
-int	physcopyout(vm_paddr_t src, void *dst, size_t len);
-int	uiomove(void *cp, int n, struct uio *uio);
-int	uiomove_frombuf(void *buf, int buflen, struct uio *uio);
-int	uiomove_fromphys(struct vm_page *ma[], vm_offset_t offset, int n,
-	    struct uio *uio);
-int	uiomove_nofault(void *cp, int n, struct uio *uio);
-int	uiomove_object(struct vm_object *obj, off_t obj_size, struct uio *uio);
-
-#else /* !_KERNEL */
-
-__BEGIN_DECLS
-ssize_t	readv(int, const struct iovec *, int);
-ssize_t	writev(int, const struct iovec *, int);
-#if __BSD_VISIBLE
-ssize_t	preadv(int, const struct iovec *, int, off_t);
-ssize_t	pwritev(int, const struct iovec *, int, off_t);
-#endif
-__END_DECLS
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_UIO_H_ */
diff --git a/include.new/sys/umtx.h b/include.new/sys/umtx.h
deleted file mode 100644
index d57cfbe..0000000
--- a/include.new/sys/umtx.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/*-
- * Copyright (c) 2002, Jeffrey Roberson <jeff@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/umtx.h 233912 2012-04-05 02:24:08Z davidxu $
- *
- */
-
-#ifndef _SYS_UMTX_H_
-#define	_SYS_UMTX_H_
-
-#include <sys/_umtx.h>
-#include <sys/limits.h>
-
-#define	UMTX_UNOWNED		0x0
-#define	UMTX_CONTESTED		LONG_MIN
-
-#define USYNC_PROCESS_SHARED	0x0001	/* Process shared sync objs */
-
-#define	UMUTEX_UNOWNED		0x0
-#define	UMUTEX_CONTESTED	0x80000000U
-
-#define	UMUTEX_ERROR_CHECK	0x0002	/* Error-checking mutex */
-#define	UMUTEX_PRIO_INHERIT	0x0004	/* Priority inherited mutex */
-#define	UMUTEX_PRIO_PROTECT	0x0008	/* Priority protect mutex */
-
-/* urwlock flags */
-#define URWLOCK_PREFER_READER	0x0002
-
-#define URWLOCK_WRITE_OWNER	0x80000000U
-#define URWLOCK_WRITE_WAITERS	0x40000000U
-#define URWLOCK_READ_WAITERS	0x20000000U
-#define URWLOCK_MAX_READERS	0x1fffffffU
-#define URWLOCK_READER_COUNT(c)	((c) & URWLOCK_MAX_READERS)
-
-/* _usem flags */
-#define SEM_NAMED	0x0002
-
-/* op code for _umtx_op */
-#define	UMTX_OP_LOCK		0
-#define	UMTX_OP_UNLOCK		1
-#define	UMTX_OP_WAIT		2
-#define	UMTX_OP_WAKE		3
-#define	UMTX_OP_MUTEX_TRYLOCK	4
-#define	UMTX_OP_MUTEX_LOCK	5
-#define	UMTX_OP_MUTEX_UNLOCK	6
-#define	UMTX_OP_SET_CEILING	7
-#define	UMTX_OP_CV_WAIT		8
-#define	UMTX_OP_CV_SIGNAL	9
-#define	UMTX_OP_CV_BROADCAST	10
-#define	UMTX_OP_WAIT_UINT	11
-#define	UMTX_OP_RW_RDLOCK	12
-#define	UMTX_OP_RW_WRLOCK	13
-#define	UMTX_OP_RW_UNLOCK	14
-#define	UMTX_OP_WAIT_UINT_PRIVATE	15
-#define	UMTX_OP_WAKE_PRIVATE	16
-#define	UMTX_OP_MUTEX_WAIT	17
-#define	UMTX_OP_MUTEX_WAKE	18	/* deprecated */
-#define	UMTX_OP_SEM_WAIT	19
-#define	UMTX_OP_SEM_WAKE	20
-#define	UMTX_OP_NWAKE_PRIVATE   21
-#define	UMTX_OP_MUTEX_WAKE2	22
-#define	UMTX_OP_MAX		23
-
-/* Flags for UMTX_OP_CV_WAIT */
-#define	CVWAIT_CHECK_UNPARKING	0x01
-#define	CVWAIT_ABSTIME		0x02
-#define	CVWAIT_CLOCKID		0x04
-
-#define	UMTX_ABSTIME		0x01
-
-#define	UMTX_CHECK_UNPARKING	CVWAIT_CHECK_UNPARKING
-
-#ifndef _KERNEL
-
-int _umtx_op(void *obj, int op, u_long val, void *uaddr, void *uaddr2);
-
-/*
- * Old (deprecated) userland mutex system calls.
- */
-int _umtx_lock(struct umtx *mtx);
-int _umtx_unlock(struct umtx *mtx);
-
-/*
- * Standard api.  Try uncontested acquire/release and asks the
- * kernel to resolve failures.
- */
-static __inline void
-umtx_init(struct umtx *umtx)
-{
-	umtx->u_owner = UMTX_UNOWNED;
-}
-
-static __inline u_long
-umtx_owner(struct umtx *umtx)
-{
-	return (umtx->u_owner & ~LONG_MIN);
-}
-
-static __inline int
-umtx_lock(struct umtx *umtx, u_long id)
-{
-	if (atomic_cmpset_acq_long(&umtx->u_owner, UMTX_UNOWNED, id) == 0)
-		if (_umtx_lock(umtx) == -1)
-			return (errno);
-	return (0);
-}
-
-static __inline int
-umtx_trylock(struct umtx *umtx, u_long id)
-{
-	if (atomic_cmpset_acq_long(&umtx->u_owner, UMTX_UNOWNED, id) == 0)
-		return (EBUSY);
-	return (0);
-}
-
-static __inline int
-umtx_timedlock(struct umtx *umtx, u_long id, const struct timespec *timeout)
-{
-	if (atomic_cmpset_acq_long(&umtx->u_owner, UMTX_UNOWNED, id) == 0)
-		if (_umtx_op(umtx, UMTX_OP_LOCK, id, 0,
-		    __DECONST(void *, timeout)) == -1)
-			return (errno);
-	return (0);
-}
-
-static __inline int
-umtx_unlock(struct umtx *umtx, u_long id)
-{
-	if (atomic_cmpset_rel_long(&umtx->u_owner, id, UMTX_UNOWNED) == 0)
-		if (_umtx_unlock(umtx) == -1)
-			return (errno);
-	return (0);
-}
-
-static __inline int
-umtx_wait(u_long *p, long val, const struct timespec *timeout)
-{
-	if (_umtx_op(p, UMTX_OP_WAIT, val, 0,
-	    __DECONST(void *, timeout)) == -1)
-		return (errno);
-	return (0);
-}
-
-/* Wake threads waiting on a user address. */
-static __inline int
-umtx_wake(u_long *p, int nr_wakeup)
-{
-	if (_umtx_op(p, UMTX_OP_WAKE, nr_wakeup, 0, 0) == -1)
-		return (errno);
-	return (0);
-}
-
-#else
-
-/*
- * The umtx_key structure is used by both the Linux futex code and the
- * umtx implementation to map userland addresses to unique keys.
- */
-
-enum {
-	TYPE_SIMPLE_WAIT,
-	TYPE_CV,
-	TYPE_SEM,
-	TYPE_SIMPLE_LOCK,
-	TYPE_NORMAL_UMUTEX,
-	TYPE_PI_UMUTEX,
-	TYPE_PP_UMUTEX,
-	TYPE_RWLOCK,
-	TYPE_FUTEX
-};
-
-/* Key to represent a unique userland synchronous object */
-struct umtx_key {
-	int	hash;
-	int	type;
-	int	shared;
-	union {
-		struct {
-			struct vm_object *object;
-			uintptr_t	offset;
-		} shared;
-		struct {
-			struct vmspace	*vs;
-			uintptr_t	addr;
-		} private;
-		struct {
-			void		*a;
-			uintptr_t	b;
-		} both;
-	} info;
-};
-
-#define THREAD_SHARE		0
-#define PROCESS_SHARE		1
-#define AUTO_SHARE		2
-
-struct thread;
-
-static inline int
-umtx_key_match(const struct umtx_key *k1, const struct umtx_key *k2)
-{
-	return (k1->type == k2->type &&
-		k1->info.both.a == k2->info.both.a &&
-	        k1->info.both.b == k2->info.both.b);
-}
-
-int umtx_copyin_timeout(const void *, struct timespec *);
-int umtx_key_get(void *, int, int, struct umtx_key *);
-void umtx_key_release(struct umtx_key *);
-struct umtx_q *umtxq_alloc(void);
-void umtxq_free(struct umtx_q *);
-int kern_umtx_wake(struct thread *, void *, int, int);
-void umtx_pi_adjust(struct thread *, u_char);
-void umtx_thread_init(struct thread *);
-void umtx_thread_fini(struct thread *);
-void umtx_thread_alloc(struct thread *);
-void umtx_thread_exit(struct thread *);
-#endif /* !_KERNEL */
-#endif /* !_SYS_UMTX_H_ */
diff --git a/include.new/sys/un.h b/include.new/sys/un.h
deleted file mode 100644
index 58379ed..0000000
--- a/include.new/sys/un.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * 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.
- * 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: releng/10.2/sys/sys/un.h 246210 2013-02-01 15:32:20Z jhb $
- */
-
-#ifndef _SYS_UN_H_
-#define _SYS_UN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _SA_FAMILY_T_DECLARED
-typedef	__sa_family_t	sa_family_t;
-#define	_SA_FAMILY_T_DECLARED
-#endif
-
-/*
- * Definitions for UNIX IPC domain.
- */
-struct sockaddr_un {
-	unsigned char	sun_len;	/* sockaddr len including null */
-	sa_family_t	sun_family;	/* AF_UNIX */
-	char	sun_path[104];		/* path name (gag) */
-};
-
-#if __BSD_VISIBLE
-
-/* Socket options. */
-#define	LOCAL_PEERCRED		1	/* retrieve peer credentials */
-#define	LOCAL_CREDS		2	/* pass credentials to receiver */
-#define	LOCAL_CONNWAIT		4	/* connects block until accepted */
-
-/* Start of reserved space for third-party socket options. */
-#define	LOCAL_VENDOR		SO_VENDOR
-
-#ifndef _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 /* __BSD_VISIBLE */
-
-#endif /* !_SYS_UN_H_ */
diff --git a/include.new/sys/unistd.h b/include.new/sys/unistd.h
deleted file mode 100644
index 14bd887..0000000
--- a/include.new/sys/unistd.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- * 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.
- *
- *	@(#)unistd.h	8.2 (Berkeley) 1/7/94
- * $FreeBSD: releng/10.2/sys/sys/unistd.h 239347 2012-08-17 02:26:31Z davidxu $
- */
-
-#ifndef _SYS_UNISTD_H_
-#define	_SYS_UNISTD_H_
-
-#include <sys/cdefs.h>
-
-/*
- * POSIX options and option groups we unconditionally do or don't
- * implement.  Those options which are implemented (or not) entirely
- * in user mode are defined in <unistd.h>.  Please keep this list in
- * alphabetical order.
- *
- * Anything which is defined as zero below **must** have an
- * implementation for the corresponding sysconf() which is able to
- * determine conclusively whether or not the feature is supported.
- * Anything which is defined as other than -1 below **must** have
- * complete headers, types, and function declarations as specified by
- * the POSIX standard; however, if the relevant sysconf() function
- * returns -1, the functions may be stubbed out.
- */
-#define	_POSIX_ADVISORY_INFO		200112L
-#define	_POSIX_ASYNCHRONOUS_IO		0
-#define	_POSIX_CHOWN_RESTRICTED		1
-#define	_POSIX_CLOCK_SELECTION		(-1)
-#define	_POSIX_CPUTIME			200112L
-#define	_POSIX_FSYNC			200112L
-#define	_POSIX_IPV6			0
-#define	_POSIX_JOB_CONTROL		1
-#define	_POSIX_MAPPED_FILES		200112L
-#define	_POSIX_MEMLOCK			(-1)
-#define	_POSIX_MEMLOCK_RANGE		200112L
-#define	_POSIX_MEMORY_PROTECTION	200112L
-#define	_POSIX_MESSAGE_PASSING		200112L
-#define	_POSIX_MONOTONIC_CLOCK		200112L
-#define	_POSIX_NO_TRUNC			1
-#define	_POSIX_PRIORITIZED_IO		(-1)
-#define	_POSIX_PRIORITY_SCHEDULING	200112L
-#define	_POSIX_RAW_SOCKETS		200112L
-#define	_POSIX_REALTIME_SIGNALS		200112L
-#define	_POSIX_SEMAPHORES		200112L
-#define	_POSIX_SHARED_MEMORY_OBJECTS	200112L
-#define	_POSIX_SPORADIC_SERVER		(-1)
-#define	_POSIX_SYNCHRONIZED_IO		(-1)
-#define	_POSIX_TIMEOUTS			200112L
-#define	_POSIX_TIMERS			200112L
-#define	_POSIX_TYPED_MEMORY_OBJECTS	(-1)
-#define	_POSIX_VDISABLE			0xff
-
-#if __XSI_VISIBLE
-#define	_XOPEN_SHM			1
-#define	_XOPEN_STREAMS			(-1)
-#endif
-
-/*
- * Although we have saved user/group IDs, we do not use them in setuid
- * as described in POSIX 1003.1, because the feature does not work for
- * root.  We use the saved IDs in seteuid/setegid, which are not currently
- * part of the POSIX 1003.1 specification.  XXX revisit for 1003.1-2001
- * as this is now mandatory.
- */
-#ifdef	_NOT_AVAILABLE
-#define	_POSIX_SAVED_IDS	1 /* saved set-user-ID and set-group-ID */
-#endif
-
-/* Define the POSIX.1 version we target for compliance. */
-#define	_POSIX_VERSION		200112L
-
-/* access function */
-#define	F_OK		0	/* test for existence of file */
-#define	X_OK		0x01	/* test for execute or search permission */
-#define	W_OK		0x02	/* test for write permission */
-#define	R_OK		0x04	/* test for read permission */
-
-/* whence values for lseek(2) */
-#ifndef SEEK_SET
-#define	SEEK_SET	0	/* set file offset to offset */
-#define	SEEK_CUR	1	/* set file offset to current plus offset */
-#define	SEEK_END	2	/* set file offset to EOF plus offset */
-#endif
-#if __BSD_VISIBLE
-#define	SEEK_DATA	3	/* set file offset to next data past offset */
-#define	SEEK_HOLE	4	/* set file offset to next hole past offset */
-#endif
-
-#ifndef _POSIX_SOURCE
-/* whence values for lseek(2); renamed by POSIX 1003.1 */
-#define	L_SET		SEEK_SET
-#define	L_INCR		SEEK_CUR
-#define	L_XTND		SEEK_END
-#endif
-
-/* configurable pathname variables */
-#define	_PC_LINK_MAX		 1
-#define	_PC_MAX_CANON		 2
-#define	_PC_MAX_INPUT		 3
-#define	_PC_NAME_MAX		 4
-#define	_PC_PATH_MAX		 5
-#define	_PC_PIPE_BUF		 6
-#define	_PC_CHOWN_RESTRICTED	 7
-#define	_PC_NO_TRUNC		 8
-#define	_PC_VDISABLE		 9
-
-#if __POSIX_VISIBLE >= 199309
-#define	_PC_ASYNC_IO		53
-#define	_PC_PRIO_IO		54
-#define	_PC_SYNC_IO		55
-#endif
-
-#if __POSIX_VISIBLE >= 200112
-#define	_PC_ALLOC_SIZE_MIN	10
-#define	_PC_FILESIZEBITS	12
-#define	_PC_REC_INCR_XFER_SIZE	14
-#define	_PC_REC_MAX_XFER_SIZE	15
-#define	_PC_REC_MIN_XFER_SIZE	16
-#define	_PC_REC_XFER_ALIGN	17
-#define	_PC_SYMLINK_MAX		18
-#endif
-
-#if __BSD_VISIBLE
-#define	_PC_ACL_EXTENDED	59
-#define	_PC_ACL_PATH_MAX	60
-#define	_PC_CAP_PRESENT		61
-#define	_PC_INF_PRESENT		62
-#define	_PC_MAC_PRESENT		63
-#define	_PC_ACL_NFS4		64
-#endif
-
-/* From OpenSolaris, used by SEEK_DATA/SEEK_HOLE. */
-#define	_PC_MIN_HOLE_SIZE	21
-
-#if __BSD_VISIBLE
-/*
- * rfork() options.
- *
- * XXX currently, some operations without RFPROC set are not supported.
- */
-#define	RFNAMEG		(1<<0)	/* UNIMPL new plan9 `name space' */
-#define	RFENVG		(1<<1)	/* UNIMPL copy plan9 `env space' */
-#define	RFFDG		(1<<2)	/* copy fd table */
-#define	RFNOTEG		(1<<3)	/* UNIMPL create new plan9 `note group' */
-#define	RFPROC		(1<<4)	/* change child (else changes curproc) */
-#define	RFMEM		(1<<5)	/* share `address space' */
-#define	RFNOWAIT	(1<<6)	/* give child to init */
-#define	RFCNAMEG	(1<<10)	/* UNIMPL zero plan9 `name space' */
-#define	RFCENVG		(1<<11)	/* UNIMPL zero plan9 `env space' */
-#define	RFCFDG		(1<<12)	/* close all fds, zero fd table */
-#define	RFTHREAD	(1<<13)	/* enable kernel thread support */
-#define	RFSIGSHARE	(1<<14)	/* share signal handlers */
-#define	RFLINUXTHPN	(1<<16)	/* do linux clone exit parent notification */
-#define	RFSTOPPED	(1<<17)	/* leave child in a stopped state */
-#define	RFHIGHPID	(1<<18)	/* use a pid higher than 10 (idleproc) */
-#define	RFTSIGZMB	(1<<19)	/* select signal for exit parent notification */
-#define	RFTSIGSHIFT	20	/* selected signal number is in bits 20-27  */
-#define	RFTSIGMASK	0xFF
-#define	RFTSIGNUM(flags)	(((flags) >> RFTSIGSHIFT) & RFTSIGMASK)
-#define	RFTSIGFLAGS(signum)	((signum) << RFTSIGSHIFT)
-#define	RFPROCDESC	(1<<28)	/* return a process descriptor */
-#define	RFPPWAIT	(1<<31)	/* parent sleeps until child exits (vfork) */
-#define	RFFLAGS		(RFFDG | RFPROC | RFMEM | RFNOWAIT | RFCFDG | \
-    RFTHREAD | RFSIGSHARE | RFLINUXTHPN | RFSTOPPED | RFHIGHPID | RFTSIGZMB | \
-    RFPROCDESC | RFPPWAIT)
-#define	RFKERNELONLY	(RFSTOPPED | RFHIGHPID | RFPPWAIT | RFPROCDESC)
-
-#endif /* __BSD_VISIBLE */
-
-#endif /* !_SYS_UNISTD_H_ */
diff --git a/include.new/sys/unpcb.h b/include.new/sys/unpcb.h
deleted file mode 100644
index d97f180..0000000
--- a/include.new/sys/unpcb.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 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.
- * 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.
- *
- *	@(#)unpcb.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/unpcb.h 264080 2014-04-03 16:57:16Z asomers $
- */
-
-#ifndef _SYS_UNPCB_H_
-#define _SYS_UNPCB_H_
-
-#include <sys/queue.h>
-#include <sys/ucred.h>
-
-/*
- * Protocol control block for an active
- * instance of a UNIX internal protocol.
- *
- * A socket may be associated with a vnode in the
- * filesystem.  If so, the unp_vnode pointer holds
- * a reference count to this vnode, which should be irele'd
- * when the socket goes away.
- *
- * A socket may be connected to another socket, in which
- * case the control block of the socket to which it is connected
- * is given by unp_conn.
- *
- * A socket may be referenced by a number of sockets (e.g. several
- * sockets may be connected to a datagram socket.)  These sockets
- * are in a linked list starting with unp_refs, linked through
- * unp_nextref and null-terminated.  Note that a socket may be referenced
- * by a number of other sockets and may also reference a socket (not
- * necessarily one which is referencing it).  This generates
- * the need for unp_refs and unp_nextref to be separate fields.
- *
- * Stream sockets keep copies of receive sockbuf sb_cc and sb_mbcnt
- * so that changes in the sockbuf may be computed to modify
- * back pressure on the sender accordingly.
- */
-typedef	u_quad_t	unp_gen_t;
-LIST_HEAD(unp_head, unpcb);
-
-struct unpcb {
-	LIST_ENTRY(unpcb) unp_link; 	/* glue on list of all PCBs */
-	struct	socket *unp_socket;	/* pointer back to socket */
-	struct	file *unp_file;		/* back-pointer to file for gc. */
-	struct	vnode *unp_vnode;	/* if associated with file */
-	ino_t	unp_ino;		/* fake inode number */
-	struct	unpcb *unp_conn;	/* control block of connected socket */
-	struct	unp_head unp_refs;	/* referencing socket linked list */
-	LIST_ENTRY(unpcb) unp_reflink;	/* link in unp_refs list */
-	struct	sockaddr_un *unp_addr;	/* bound address of socket */
-	int	reserved1;
-	int	reserved2;
-	unp_gen_t unp_gencnt;		/* generation count of this instance */
-	short	unp_flags;		/* flags */
-	short	unp_gcflag;		/* Garbage collector flags. */
-	struct	xucred unp_peercred;	/* peer credentials, if applicable */
-	u_int	unp_refcount;
-	u_int	unp_msgcount;		/* references from message queue */
-	struct	mtx unp_mtx;		/* mutex */
-};
-
-/*
- * Flags in unp_flags.
- *
- * UNP_HAVEPC - indicates that the unp_peercred member is filled in
- * and is really the credentials of the connected peer.  This is used
- * to determine whether the contents should be sent to the user or
- * not.
- *
- * UNP_HAVEPCCACHED - indicates that the unp_peercred member is filled
- * in, but does *not* contain the credentials of the connected peer
- * (there may not even be a peer).  This is set in unp_listen() when
- * it fills in unp_peercred for later consumption by unp_connect().
- */
-#define UNP_HAVEPC			0x001
-#define UNP_HAVEPCCACHED		0x002
-#define	UNP_WANTCRED			0x004	/* credentials wanted */
-#define	UNP_CONNWAIT			0x008	/* connect blocks until accepted */
-
-#define	UNPGC_REF			0x1	/* unpcb has external ref. */
-#define	UNPGC_DEAD			0x2	/* unpcb might be dead. */
-#define	UNPGC_SCANNED			0x4	/* Has been scanned. */
-
-/*
- * These flags are used to handle non-atomicity in connect() and bind()
- * operations on a socket: in particular, to avoid races between multiple
- * threads or processes operating simultaneously on the same socket.
- */
-#define	UNP_CONNECTING			0x010	/* Currently connecting. */
-#define	UNP_BINDING			0x020	/* Currently binding. */
-
-#define	sotounpcb(so)	((struct unpcb *)((so)->so_pcb))
-
-/* Hack alert -- this structure depends on <sys/socketvar.h>. */
-#ifdef	_SYS_SOCKETVAR_H_
-struct xunpcb {
-	size_t	xu_len;			/* length of this structure */
-	struct	unpcb *xu_unpp;		/* to help netstat, fstat */
-	struct	unpcb xu_unp;		/* our information */
-	union {
-		struct	sockaddr_un xuu_addr;	/* our bound address */
-		char	xu_dummy1[256];
-	} xu_au;
-#define	xu_addr	xu_au.xuu_addr
-	union {
-		struct	sockaddr_un xuu_caddr; /* their bound address */
-		char	xu_dummy2[256];
-	} xu_cau;
-#define	xu_caddr xu_cau.xuu_caddr
-	struct	xsocket	xu_socket;
-	u_quad_t	xu_alignment_hack;
-};
-
-struct xunpgen {
-	size_t	xug_len;
-	u_int	xug_count;
-	unp_gen_t xug_gen;
-	so_gen_t xug_sogen;
-};
-#endif /* _SYS_SOCKETVAR_H_ */
-
-#endif /* _SYS_UNPCB_H_ */
diff --git a/include.new/sys/user.h b/include.new/sys/user.h
deleted file mode 100644
index bad16a7..0000000
--- a/include.new/sys/user.h
+++ /dev/null
@@ -1,536 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1991, 1993
- *	The Regents of the University of California.
- * Copyright (c) 2007 Robert N. M. Watson
- * 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.
- * 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.
- *
- *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $FreeBSD: releng/10.2/sys/sys/user.h 262228 2014-02-19 19:11:14Z jhb $
- */
-
-#ifndef _SYS_USER_H_
-#define _SYS_USER_H_
-
-#include <machine/pcb.h>
-#ifndef _KERNEL
-/* stuff that *used* to be included by user.h, or is now needed */
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/ucred.h>
-#include <sys/uio.h>
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/proc.h>
-#include <vm/vm.h>		/* XXX */
-#include <vm/vm_param.h>	/* XXX */
-#include <vm/pmap.h>		/* XXX */
-#include <vm/vm_map.h>		/* XXX */
-#endif /* !_KERNEL */
-#ifndef _SYS_RESOURCEVAR_H_
-#include <sys/resourcevar.h>
-#endif
-#ifndef _SYS_SIGNALVAR_H_
-#include <sys/signalvar.h>
-#endif
-#ifndef _SYS_SOCKET_VAR_H_
-#include <sys/socket.h>
-#endif
-#include <sys/caprights.h>
-
-/*
- * KERN_PROC subtype ops return arrays of selected proc structure entries:
- *
- * This struct includes several arrays of spare space, with different arrays
- * for different standard C-types.  When adding new variables to this struct,
- * the space for byte-aligned data should be taken from the ki_sparestring,
- * pointers from ki_spareptrs, word-aligned data from ki_spareints, and
- * doubleword-aligned data from ki_sparelongs.  Make sure the space for new
- * variables come from the array which matches the size and alignment of
- * those variables on ALL hardware platforms, and then adjust the appropriate
- * KI_NSPARE_* value(s) to match.
- *
- * Always verify that sizeof(struct kinfo_proc) == KINFO_PROC_SIZE on all
- * platforms after you have added new variables.  Note that if you change
- * the value of KINFO_PROC_SIZE, then many userland programs will stop
- * working until they are recompiled!
- *
- * Once you have added the new field, you will need to add code to initialize
- * it in two places: function fill_kinfo_proc in sys/kern/kern_proc.c and
- * function kvm_proclist in lib/libkvm/kvm_proc.c .
- */
-#define	KI_NSPARE_INT	7
-#define	KI_NSPARE_LONG	12
-#define	KI_NSPARE_PTR	6
-
-#ifndef _KERNEL
-#ifndef KINFO_PROC_SIZE
-#error "Unknown architecture"
-#endif
-#endif /* !_KERNEL */
-
-#define	WMESGLEN	8		/* size of returned wchan message */
-#define	LOCKNAMELEN	8		/* size of returned lock name */
-#define	TDNAMLEN	16		/* size of returned thread name */
-#define	COMMLEN		19		/* size of returned ki_comm name */
-#define	KI_EMULNAMELEN	16		/* size of returned ki_emul */
-#define	KI_NGROUPS	16		/* number of groups in ki_groups */
-#define	LOGNAMELEN	17		/* size of returned ki_login */
-#define	LOGINCLASSLEN	17		/* size of returned ki_loginclass */
-
-#ifndef BURN_BRIDGES
-#define	OCOMMLEN	TDNAMLEN	
-#define	ki_ocomm	ki_tdname
-#endif
-
-/* Flags for the process credential. */
-#define	KI_CRF_CAPABILITY_MODE	0x00000001
-/*
- * Steal a bit from ki_cr_flags to indicate that the cred had more than
- * KI_NGROUPS groups.
- */
-#define KI_CRF_GRP_OVERFLOW	0x80000000
-
-struct kinfo_proc {
-	int	ki_structsize;		/* size of this structure */
-	int	ki_layout;		/* reserved: layout identifier */
-	struct	pargs *ki_args;		/* address of command arguments */
-	struct	proc *ki_paddr;		/* address of proc */
-	struct	user *ki_addr;		/* kernel virtual addr of u-area */
-	struct	vnode *ki_tracep;	/* pointer to trace file */
-	struct	vnode *ki_textvp;	/* pointer to executable file */
-	struct	filedesc *ki_fd;	/* pointer to open file info */
-	struct	vmspace *ki_vmspace;	/* pointer to kernel vmspace struct */
-	void	*ki_wchan;		/* sleep address */
-	pid_t	ki_pid;			/* Process identifier */
-	pid_t	ki_ppid;		/* parent process id */
-	pid_t	ki_pgid;		/* process group id */
-	pid_t	ki_tpgid;		/* tty process group id */
-	pid_t	ki_sid;			/* Process session ID */
-	pid_t	ki_tsid;		/* Terminal session ID */
-	short	ki_jobc;		/* job control counter */
-	short	ki_spare_short1;	/* unused (just here for alignment) */
-	dev_t	ki_tdev;		/* controlling tty dev */
-	sigset_t ki_siglist;		/* Signals arrived but not delivered */
-	sigset_t ki_sigmask;		/* Current signal mask */
-	sigset_t ki_sigignore;		/* Signals being ignored */
-	sigset_t ki_sigcatch;		/* Signals being caught by user */
-	uid_t	ki_uid;			/* effective user id */
-	uid_t	ki_ruid;		/* Real user id */
-	uid_t	ki_svuid;		/* Saved effective user id */
-	gid_t	ki_rgid;		/* Real group id */
-	gid_t	ki_svgid;		/* Saved effective group id */
-	short	ki_ngroups;		/* number of groups */
-	short	ki_spare_short2;	/* unused (just here for alignment) */
-	gid_t	ki_groups[KI_NGROUPS];	/* groups */
-	vm_size_t ki_size;		/* virtual size */
-	segsz_t ki_rssize;		/* current resident set size in pages */
-	segsz_t ki_swrss;		/* resident set size before last swap */
-	segsz_t ki_tsize;		/* text size (pages) XXX */
-	segsz_t ki_dsize;		/* data size (pages) XXX */
-	segsz_t ki_ssize;		/* stack size (pages) */
-	u_short	ki_xstat;		/* Exit status for wait & stop signal */
-	u_short	ki_acflag;		/* Accounting flags */
-	fixpt_t	ki_pctcpu;	 	/* %cpu for process during ki_swtime */
-	u_int	ki_estcpu;	 	/* Time averaged value of ki_cpticks */
-	u_int	ki_slptime;	 	/* Time since last blocked */
-	u_int	ki_swtime;	 	/* Time swapped in or out */
-	u_int	ki_cow;			/* number of copy-on-write faults */
-	u_int64_t ki_runtime;		/* Real time in microsec */
-	struct	timeval ki_start;	/* starting time */
-	struct	timeval ki_childtime;	/* time used by process children */
-	long	ki_flag;		/* P_* flags */
-	long	ki_kiflag;		/* KI_* flags (below) */
-	int	ki_traceflag;		/* Kernel trace points */
-	char	ki_stat;		/* S* process status */
-	signed char ki_nice;		/* Process "nice" value */
-	char	ki_lock;		/* Process lock (prevent swap) count */
-	char	ki_rqindex;		/* Run queue index */
-	u_char	ki_oncpu;		/* Which cpu we are on */
-	u_char	ki_lastcpu;		/* Last cpu we were on */
-	char	ki_tdname[TDNAMLEN+1];	/* thread name */
-	char	ki_wmesg[WMESGLEN+1];	/* wchan message */
-	char	ki_login[LOGNAMELEN+1];	/* setlogin name */
-	char	ki_lockname[LOCKNAMELEN+1]; /* lock name */
-	char	ki_comm[COMMLEN+1];	/* command name */
-	char	ki_emul[KI_EMULNAMELEN+1];  /* emulation name */
-	char	ki_loginclass[LOGINCLASSLEN+1]; /* login class */
-	/*
-	 * When adding new variables, take space for char-strings from the
-	 * front of ki_sparestrings, and ints from the end of ki_spareints.
-	 * That way the spare room from both arrays will remain contiguous.
-	 */
-	char	ki_sparestrings[50];	/* spare string space */
-	int	ki_spareints[KI_NSPARE_INT];	/* spare room for growth */
-	int	ki_flag2;		/* P2_* flags */
-	int	ki_fibnum;		/* Default FIB number */
-	u_int	ki_cr_flags;		/* Credential flags */
-	int	ki_jid;			/* Process jail ID */
-	int	ki_numthreads;		/* XXXKSE number of threads in total */
-	lwpid_t	ki_tid;			/* XXXKSE thread id */
-	struct	priority ki_pri;	/* process priority */
-	struct	rusage ki_rusage;	/* process rusage statistics */
-	/* XXX - most fields in ki_rusage_ch are not (yet) filled in */
-	struct	rusage ki_rusage_ch;	/* rusage of children processes */
-	struct	pcb *ki_pcb;		/* kernel virtual addr of pcb */
-	void	*ki_kstack;		/* kernel virtual addr of stack */
-	void	*ki_udata;		/* User convenience pointer */
-	struct	thread *ki_tdaddr;	/* address of thread */
-	/*
-	 * When adding new variables, take space for pointers from the
-	 * front of ki_spareptrs, and longs from the end of ki_sparelongs.
-	 * That way the spare room from both arrays will remain contiguous.
-	 */
-	void	*ki_spareptrs[KI_NSPARE_PTR];	/* spare room for growth */
-	long	ki_sparelongs[KI_NSPARE_LONG];	/* spare room for growth */
-	long	ki_sflag;		/* PS_* flags */
-	long	ki_tdflags;		/* XXXKSE kthread flag */
-};
-void fill_kinfo_proc(struct proc *, struct kinfo_proc *);
-/* XXX - the following two defines are temporary */
-#define	ki_childstime	ki_rusage_ch.ru_stime
-#define	ki_childutime	ki_rusage_ch.ru_utime
-
-/*
- *  Legacy PS_ flag.  This moved to p_flag but is maintained for
- *  compatibility.
- */
-#define	PS_INMEM	0x00001		/* Loaded into memory. */
-
-/* ki_sessflag values */
-#define	KI_CTTY		0x00000001	/* controlling tty vnode active */
-#define	KI_SLEADER	0x00000002	/* session leader */
-#define	KI_LOCKBLOCK	0x00000004	/* proc blocked on lock ki_lockname */
-
-/*
- * This used to be the per-process structure containing data that
- * isn't needed in core when the process is swapped out, but now it
- * remains only for the benefit of a.out core dumps.
- */
-struct user {
-	struct	pstats u_stats;		/* *p_stats */
-	struct	kinfo_proc u_kproc;	/* eproc */
-};
-
-/*
- * The KERN_PROC_FILE sysctl allows a process to dump the file descriptor
- * array of another process.
- */
-#define	KF_ATTR_VALID	0x0001
-
-#define	KF_TYPE_NONE	0
-#define	KF_TYPE_VNODE	1
-#define	KF_TYPE_SOCKET	2
-#define	KF_TYPE_PIPE	3
-#define	KF_TYPE_FIFO	4
-#define	KF_TYPE_KQUEUE	5
-#define	KF_TYPE_CRYPTO	6
-#define	KF_TYPE_MQUEUE	7
-#define	KF_TYPE_SHM	8
-#define	KF_TYPE_SEM	9
-#define	KF_TYPE_PTS	10
-#define	KF_TYPE_PROCDESC	11
-#define	KF_TYPE_UNKNOWN	255
-
-#define	KF_VTYPE_VNON	0
-#define	KF_VTYPE_VREG	1
-#define	KF_VTYPE_VDIR	2
-#define	KF_VTYPE_VBLK	3
-#define	KF_VTYPE_VCHR	4
-#define	KF_VTYPE_VLNK	5
-#define	KF_VTYPE_VSOCK	6
-#define	KF_VTYPE_VFIFO	7
-#define	KF_VTYPE_VBAD	8
-#define	KF_VTYPE_UNKNOWN	255
-
-#define	KF_FD_TYPE_CWD	-1	/* Current working directory */
-#define	KF_FD_TYPE_ROOT	-2	/* Root directory */
-#define	KF_FD_TYPE_JAIL	-3	/* Jail directory */
-#define	KF_FD_TYPE_TRACE	-4	/* ptrace vnode */
-#define	KF_FD_TYPE_TEXT	-5	/* Text vnode */
-#define	KF_FD_TYPE_CTTY	-6	/* Controlling terminal */
-
-#define	KF_FLAG_READ		0x00000001
-#define	KF_FLAG_WRITE		0x00000002
-#define	KF_FLAG_APPEND		0x00000004
-#define	KF_FLAG_ASYNC		0x00000008
-#define	KF_FLAG_FSYNC		0x00000010
-#define	KF_FLAG_NONBLOCK	0x00000020
-#define	KF_FLAG_DIRECT		0x00000040
-#define	KF_FLAG_HASLOCK		0x00000080
-#define	KF_FLAG_SHLOCK		0x00000100
-#define	KF_FLAG_EXLOCK		0x00000200
-#define	KF_FLAG_NOFOLLOW	0x00000400
-#define	KF_FLAG_CREAT		0x00000800
-#define	KF_FLAG_TRUNC		0x00001000
-#define	KF_FLAG_EXCL		0x00002000
-#define	KF_FLAG_EXEC		0x00004000
-
-/*
- * Old format.  Has variable hidden padding due to alignment.
- * This is a compatability hack for pre-build 7.1 packages.
- */
-#if defined(__amd64__)
-#define	KINFO_OFILE_SIZE	1328
-#endif
-#if defined(__i386__)
-#define	KINFO_OFILE_SIZE	1324
-#endif
-
-struct kinfo_ofile {
-	int	kf_structsize;			/* Size of kinfo_file. */
-	int	kf_type;			/* Descriptor type. */
-	int	kf_fd;				/* Array index. */
-	int	kf_ref_count;			/* Reference count. */
-	int	kf_flags;			/* Flags. */
-	/* XXX Hidden alignment padding here on amd64 */
-	off_t	kf_offset;			/* Seek location. */
-	int	kf_vnode_type;			/* Vnode type. */
-	int	kf_sock_domain;			/* Socket domain. */
-	int	kf_sock_type;			/* Socket type. */
-	int	kf_sock_protocol;		/* Socket protocol. */
-	char	kf_path[PATH_MAX];	/* Path to file, if any. */
-	struct sockaddr_storage kf_sa_local;	/* Socket address. */
-	struct sockaddr_storage	kf_sa_peer;	/* Peer address. */
-};
-
-#if defined(__amd64__) || defined(__i386__)
-/*
- * This size should never be changed. If you really need to, you must provide
- * backward ABI compatibility by allocating a new sysctl MIB that will return
- * the new structure. The current structure has to be returned by the current
- * sysctl MIB. See how it is done for the kinfo_ofile structure.
- */
-#define	KINFO_FILE_SIZE	1392
-#endif
-
-struct kinfo_file {
-	int		kf_structsize;		/* Variable size of record. */
-	int		kf_type;		/* Descriptor type. */
-	int		kf_fd;			/* Array index. */
-	int		kf_ref_count;		/* Reference count. */
-	int		kf_flags;		/* Flags. */
-	int		kf_pad0;		/* Round to 64 bit alignment. */
-	int64_t		kf_offset;		/* Seek location. */
-	int		kf_vnode_type;		/* Vnode type. */
-	int		kf_sock_domain;		/* Socket domain. */
-	int		kf_sock_type;		/* Socket type. */
-	int		kf_sock_protocol;	/* Socket protocol. */
-	struct sockaddr_storage kf_sa_local;	/* Socket address. */
-	struct sockaddr_storage	kf_sa_peer;	/* Peer address. */
-	union {
-		struct {
-			/* Address of so_pcb. */
-			uint64_t	kf_sock_pcb;
-			/* Address of inp_ppcb. */
-			uint64_t	kf_sock_inpcb;
-			/* Address of unp_conn. */
-			uint64_t	kf_sock_unpconn;
-			/* Send buffer state. */
-			uint16_t	kf_sock_snd_sb_state;
-			/* Receive buffer state. */
-			uint16_t	kf_sock_rcv_sb_state;
-			/* Round to 64 bit alignment. */
-			uint32_t	kf_sock_pad0;
-		} kf_sock;
-		struct {
-			/* Global file id. */
-			uint64_t	kf_file_fileid;
-			/* File size. */
-			uint64_t	kf_file_size;
-			/* Vnode filesystem id. */
-			uint32_t	kf_file_fsid;
-			/* File device. */
-			uint32_t	kf_file_rdev;
-			/* File mode. */
-			uint16_t	kf_file_mode;
-			/* Round to 64 bit alignment. */
-			uint16_t	kf_file_pad0;
-			uint32_t	kf_file_pad1;
-		} kf_file;
-		struct {
-			uint32_t	kf_sem_value;
-			uint16_t	kf_sem_mode;
-		} kf_sem;
-		struct {
-			uint64_t	kf_pipe_addr;
-			uint64_t	kf_pipe_peer;
-			uint32_t	kf_pipe_buffer_cnt;
-			/* Round to 64 bit alignment. */
-			uint32_t	kf_pipe_pad0[3];
-		} kf_pipe;
-		struct {
-			uint32_t	kf_pts_dev;
-			/* Round to 64 bit alignment. */
-			uint32_t	kf_pts_pad0[7];
-		} kf_pts;
-		struct {
-			pid_t		kf_pid;
-		} kf_proc;
-	} kf_un;
-	uint16_t	kf_status;		/* Status flags. */
-	uint16_t	kf_pad1;		/* Round to 32 bit alignment. */
-	int		_kf_ispare0;		/* Space for more stuff. */
-	cap_rights_t	kf_cap_rights;		/* Capability rights. */
-	uint64_t	_kf_cap_spare;		/* Space for future cap_rights_t. */
-	/* Truncated before copyout in sysctl */
-	char		kf_path[PATH_MAX];	/* Path to file, if any. */
-};
-
-/*
- * The KERN_PROC_VMMAP sysctl allows a process to dump the VM layout of
- * another process as a series of entries.
- */
-#define	KVME_TYPE_NONE		0
-#define	KVME_TYPE_DEFAULT	1
-#define	KVME_TYPE_VNODE		2
-#define	KVME_TYPE_SWAP		3
-#define	KVME_TYPE_DEVICE	4
-#define	KVME_TYPE_PHYS		5
-#define	KVME_TYPE_DEAD		6
-#define	KVME_TYPE_SG		7
-#define	KVME_TYPE_MGTDEVICE	8
-#define	KVME_TYPE_UNKNOWN	255
-
-#define	KVME_PROT_READ		0x00000001
-#define	KVME_PROT_WRITE		0x00000002
-#define	KVME_PROT_EXEC		0x00000004
-
-#define	KVME_FLAG_COW		0x00000001
-#define	KVME_FLAG_NEEDS_COPY	0x00000002
-#define	KVME_FLAG_NOCOREDUMP	0x00000004
-#define	KVME_FLAG_SUPER		0x00000008
-#define	KVME_FLAG_GROWS_UP	0x00000010
-#define	KVME_FLAG_GROWS_DOWN	0x00000020
-
-#if defined(__amd64__)
-#define	KINFO_OVMENTRY_SIZE	1168
-#endif
-#if defined(__i386__)
-#define	KINFO_OVMENTRY_SIZE	1128
-#endif
-
-struct kinfo_ovmentry {
-	int	 kve_structsize;		/* Size of kinfo_vmmapentry. */
-	int	 kve_type;			/* Type of map entry. */
-	void	*kve_start;			/* Starting address. */
-	void	*kve_end;			/* Finishing address. */
-	int	 kve_flags;			/* Flags on map entry. */
-	int	 kve_resident;			/* Number of resident pages. */
-	int	 kve_private_resident;		/* Number of private pages. */
-	int	 kve_protection;		/* Protection bitmask. */
-	int	 kve_ref_count;			/* VM obj ref count. */
-	int	 kve_shadow_count;		/* VM obj shadow count. */
-	char	 kve_path[PATH_MAX];		/* Path to VM obj, if any. */
-	void	*_kve_pspare[8];		/* Space for more stuff. */
-	off_t	 kve_offset;			/* Mapping offset in object */
-	uint64_t kve_fileid;			/* inode number if vnode */
-	dev_t	 kve_fsid;			/* dev_t of vnode location */
-	int	 _kve_ispare[3];		/* Space for more stuff. */
-};
-
-#if defined(__amd64__) || defined(__i386__)
-#define	KINFO_VMENTRY_SIZE	1160
-#endif
-
-struct kinfo_vmentry {
-	int	 kve_structsize;		/* Variable size of record. */
-	int	 kve_type;			/* Type of map entry. */
-	uint64_t kve_start;			/* Starting address. */
-	uint64_t kve_end;			/* Finishing address. */
-	uint64_t kve_offset;			/* Mapping offset in object */
-	uint64_t kve_vn_fileid;			/* inode number if vnode */
-	uint32_t kve_vn_fsid;			/* dev_t of vnode location */
-	int	 kve_flags;			/* Flags on map entry. */
-	int	 kve_resident;			/* Number of resident pages. */
-	int	 kve_private_resident;		/* Number of private pages. */
-	int	 kve_protection;		/* Protection bitmask. */
-	int	 kve_ref_count;			/* VM obj ref count. */
-	int	 kve_shadow_count;		/* VM obj shadow count. */
-	int	 kve_vn_type;			/* Vnode type. */
-	uint64_t kve_vn_size;			/* File size. */
-	uint32_t kve_vn_rdev;			/* Device id if device. */
-	uint16_t kve_vn_mode;			/* File mode. */
-	uint16_t kve_status;			/* Status flags. */
-	int	 _kve_ispare[12];		/* Space for more stuff. */
-	/* Truncated before copyout in sysctl */
-	char	 kve_path[PATH_MAX];		/* Path to VM obj, if any. */
-};
-
-/*
- * The KERN_PROC_KSTACK sysctl allows a process to dump the kernel stacks of
- * another process as a series of entries.  Each stack is represented by a
- * series of symbol names and offsets as generated by stack_sbuf_print(9).
- */
-#define	KKST_MAXLEN	1024
-
-#define	KKST_STATE_STACKOK	0		/* Stack is valid. */
-#define	KKST_STATE_SWAPPED	1		/* Stack swapped out. */
-#define	KKST_STATE_RUNNING	2		/* Stack ephemeral. */
-
-#if defined(__amd64__) || defined(__i386__)
-#define	KINFO_KSTACK_SIZE	1096
-#endif
-
-struct kinfo_kstack {
-	lwpid_t	 kkst_tid;			/* ID of thread. */
-	int	 kkst_state;			/* Validity of stack. */
-	char	 kkst_trace[KKST_MAXLEN];	/* String representing stack. */
-	int	 _kkst_ispare[16];		/* Space for more stuff. */
-};
-
-struct kinfo_sigtramp {
-	void	*ksigtramp_start;
-	void	*ksigtramp_end;
-	void	*ksigtramp_spare[4];
-};
-
-#ifdef _KERNEL
-/* Flags for kern_proc_out function. */
-#define KERN_PROC_NOTHREADS	0x1
-#define KERN_PROC_MASK32	0x2
-
-struct sbuf;
-
-/*
- * The kern_proc out functions are helper functions to dump process
- * miscellaneous kinfo structures to sbuf.  The main consumers are KERN_PROC
- * sysctls but they may also be used by other kernel subsystems.
- *
- * The functions manipulate the process locking state and expect the process
- * to be locked on enter.  On return the process is unlocked.
- */
-
-int	kern_proc_filedesc_out(struct proc *p, struct sbuf *sb, ssize_t maxlen);
-int	kern_proc_out(struct proc *p, struct sbuf *sb, int flags);
-int	kern_proc_vmmap_out(struct proc *p, struct sbuf *sb);
-
-int	vntype_to_kinfo(int vtype);
-#endif /* !_KERNEL */
-
-#endif
diff --git a/include.new/sys/utsname.h b/include.new/sys/utsname.h
deleted file mode 100644
index 7c01e7b..0000000
--- a/include.new/sys/utsname.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chuck Karish of Mindcraft, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)utsname.h	8.1 (Berkeley) 1/4/94
- * $FreeBSD: releng/10.2/sys/sys/utsname.h 127976 2004-04-07 04:19:52Z imp $
- */
-
-#ifndef	_SYS_UTSNAME_H
-#define	_SYS_UTSNAME_H
-
-#ifdef _KERNEL
-#define	SYS_NMLN	32		/* uname(2) for the FreeBSD 1.1 ABI. */
-#endif
-
-#ifndef SYS_NMLN
-#define	SYS_NMLN	256		/* User can override. */
-#endif
-
-struct utsname {
-	char	sysname[SYS_NMLN];	/* Name of this OS. */
-	char	nodename[SYS_NMLN];	/* Name of this network node. */
-	char	release[SYS_NMLN];	/* Release level. */
-	char	version[SYS_NMLN];	/* Version level. */
-	char	machine[SYS_NMLN];	/* Hardware type. */
-};
-
-#include <sys/cdefs.h>
-
-#ifndef _KERNEL
-__BEGIN_DECLS
-int	__xuname(int, void *);		/* Variable record size. */
-__END_DECLS
-
-static __inline int
-uname(struct utsname *name)
-{
-	return __xuname(SYS_NMLN, (void *)name);
-}
-#endif	/* _KERNEL */
-
-#endif	/* !_SYS_UTSNAME_H */
diff --git a/include.new/sys/uuid.h b/include.new/sys/uuid.h
deleted file mode 100644
index c5d764c..0000000
--- a/include.new/sys/uuid.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/uuid.h 253590 2013-07-24 04:24:21Z marcel $
- */
-
-#ifndef _SYS_UUID_H_
-#define	_SYS_UUID_H_
-
-#include <sys/cdefs.h>
-
-/* Length of a node address (an IEEE 802 address). */
-#define	_UUID_NODE_LEN		6
-
-/*
- * See also:
- *      http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt
- *      http://www.opengroup.org/onlinepubs/009629399/apdxa.htm
- *
- * A DCE 1.1 compatible source representation of UUIDs.
- */
-struct uuid {
-	uint32_t	time_low;
-	uint16_t	time_mid;
-	uint16_t	time_hi_and_version;
-	uint8_t		clock_seq_hi_and_reserved;
-	uint8_t		clock_seq_low;
-	uint8_t		node[_UUID_NODE_LEN];
-};
-
-#ifdef _KERNEL
-
-#define	UUID_NODE_LEN	_UUID_NODE_LEN
-
-struct sbuf;
-
-struct uuid *kern_uuidgen(struct uuid *, size_t);
-
-int uuid_ether_add(const uint8_t *);
-int uuid_ether_del(const uint8_t *);
-
-int snprintf_uuid(char *, size_t, struct uuid *);
-int printf_uuid(struct uuid *);
-int sbuf_printf_uuid(struct sbuf *, struct uuid *);
-int parse_uuid(const char *, struct uuid *);
-
-void be_uuid_dec(void const *buf, struct uuid *uuid);
-void be_uuid_enc(void *buf, struct uuid const *uuid);
-void le_uuid_dec(void const *buf, struct uuid *uuid);
-void le_uuid_enc(void *buf, struct uuid const *uuid);
-
-#else	/* _KERNEL */
-
-/* XXX namespace pollution? */
-typedef struct uuid uuid_t;
-
-__BEGIN_DECLS
-int	uuidgen(struct uuid *, int);
-__END_DECLS
-
-#endif	/* _KERNEL */
-
-#endif /* _SYS_UUID_H_ */
diff --git a/include.new/sys/vdso.h b/include.new/sys/vdso.h
deleted file mode 100644
index afa26bc..0000000
--- a/include.new/sys/vdso.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright 2012 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/vdso.h 246117 2013-01-30 12:48:16Z kib $
- */
-
-#ifndef _SYS_VDSO_H
-#define	_SYS_VDSO_H
-
-#include <sys/types.h>
-#include <machine/vdso.h>
-
-struct vdso_timehands {
-	uint32_t	th_algo;
-	uint32_t	th_gen;
-	uint64_t	th_scale;
-	uint32_t 	th_offset_count;
-	uint32_t	th_counter_mask;
-	struct bintime	th_offset;
-	struct bintime	th_boottime;
-	VDSO_TIMEHANDS_MD
-};
-
-struct vdso_timekeep {
-	uint32_t	tk_ver;
-	uint32_t	tk_enabled;
-	uint32_t	tk_current;
-	struct vdso_timehands	tk_th[];
-};
-
-#define	VDSO_TK_CURRENT_BUSY	0xffffffff
-#define	VDSO_TK_VER_1		0x1
-#define	VDSO_TK_VER_CURR	VDSO_TK_VER_1
-#define	VDSO_TH_ALGO_1		0x1
-
-#ifndef _KERNEL
-
-struct timespec;
-struct timeval;
-struct timezone;
-
-int __vdso_clock_gettime(clockid_t clock_id, struct timespec *ts);
-int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz);
-u_int __vdso_gettc(const struct vdso_timehands *vdso_th);
-int __vdso_gettimekeep(struct vdso_timekeep **tk);
-
-#endif
-
-#ifdef _KERNEL
-
-void timekeep_push_vdso(void);
-
-uint32_t tc_fill_vdso_timehands(struct vdso_timehands *vdso_th);
-
-/*
- * The cpu_fill_vdso_timehands() function should fill MD-part of the
- * struct vdso_timehands, which is both machine- and
- * timecounter-depended. The return value should be 1 if fast
- * userspace timecounter is enabled by hardware, and 0 otherwise. The
- * global sysctl enable override is handled by machine-independed code
- * after cpu_fill_vdso_timehands() call is made.
- */
-uint32_t cpu_fill_vdso_timehands(struct vdso_timehands *vdso_th);
-
-#define	VDSO_TH_NUM	4
-
-#ifdef COMPAT_FREEBSD32
-struct bintime32 {
-	uint32_t	sec;
-	uint32_t	frac[2];
-};
-
-struct vdso_timehands32 {
-	uint32_t	th_algo;
-	uint32_t	th_gen;
-	uint32_t	th_scale[2];
-	uint32_t 	th_offset_count;
-	uint32_t	th_counter_mask;
-	struct bintime32	th_offset;
-	struct bintime32	th_boottime;
-	VDSO_TIMEHANDS_MD32
-};
-
-struct vdso_timekeep32 {
-	uint32_t	tk_ver;
-	uint32_t	tk_enabled;
-	uint32_t	tk_current;
-	struct vdso_timehands32	tk_th[];
-};
-
-uint32_t tc_fill_vdso_timehands32(struct vdso_timehands32 *vdso_th32);
-uint32_t cpu_fill_vdso_timehands32(struct vdso_timehands32 *vdso_th32);
-
-#endif
-#endif
-
-#endif
diff --git a/include.new/sys/vmem.h b/include.new/sys/vmem.h
deleted file mode 100644
index add27be..0000000
--- a/include.new/sys/vmem.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * Copyright (c)2006 YAMAMOTO Takashi,
- * 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.
- *
- * 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.
- */
-/* From	$NetBSD: vmem.h,v 1.20 2013/01/29 21:26:24 para Exp $	*/
-
-/* $FreeBSD: releng/10.2/sys/sys/vmem.h 282361 2015-05-03 07:13:14Z mav $ */
-
-#ifndef _SYS_VMEM_H_
-#define	_SYS_VMEM_H_
-
-#include <sys/types.h>
-
-#ifdef _KERNEL
-
-typedef struct vmem vmem_t;
-
-typedef uintptr_t	vmem_addr_t;
-typedef size_t		vmem_size_t;
-
-#define	VMEM_ADDR_MIN	0
-#define	VMEM_ADDR_MAX	(~(vmem_addr_t)0)
-
-typedef int (vmem_import_t)(void *, vmem_size_t, int, vmem_addr_t *);
-typedef void (vmem_release_t)(void *, vmem_addr_t, vmem_size_t);
-typedef void (vmem_reclaim_t)(vmem_t *, int);
-
-/*
- * Create a vmem:
- *	name		- Name of the region
- *	base		- Initial span start (optional)
- *	size		- Initial span size
- *	quantum		- Natural unit of allocation (ie PAGE_SIZE, 1, etc)
- *	qcache_max	- Maximum size to quantum cache.  This creates a UMA
- *			  cache for each multiple of quantum up to qcache_max.
- *	flags		- M_* flags
- */
-vmem_t *vmem_create(const char *name, vmem_addr_t base,
-    vmem_size_t size, vmem_size_t quantum, vmem_size_t qcache_max, int flags);
-vmem_t *vmem_init(vmem_t *vm, const char *name, vmem_addr_t base,
-    vmem_size_t size, vmem_size_t quantum, vmem_size_t qcache_max, int flags);
-void vmem_destroy(vmem_t *);
-
-/*
- * Set callbacks for bringing in dynamic regions:
- *	importfn	- Backing store import routine.
- *	releasefn	- Backing store release routine.
- *	arg		- Backing store argument
- *	import_quantum	- Size to import from backing store
- */
-
-void vmem_set_import(vmem_t *vm, vmem_import_t *importfn,
-    vmem_release_t *releasefn, void *arg, vmem_size_t import_quantum);
-
-/*
- * Set a callback for reclaiming memory when space is exhausted:
- */
-void vmem_set_reclaim(vmem_t *vm, vmem_reclaim_t *reclaimfn);
-
-/*
- * Allocate and free linear regions from a vmem.  Must specify
- * BESTFIT or FIRSTFIT.  Free is non-blocking.  These routines
- * respect the quantum caches.
- */
-int vmem_alloc(vmem_t *vm, vmem_size_t size, int flags, vmem_addr_t *addrp);
-void vmem_free(vmem_t *vm, vmem_addr_t addr, vmem_size_t size);
-
-/*
- * Constrained allocate and free routines.  These bypass the quantum cache.
- *	size		- Size in units of 1, not quantum.
- *	align		- Required alignment of the start of region
- *	phase		- Offset from alignment
- *	nocross		- Illegal boundary
- *	minaddr		- Minimum allowed address for last byte
- *	maxaddr		- Maximum allowed address for first byte
- *	flags		- M_* flags
- *	addrp		- result
- */
-int vmem_xalloc(vmem_t *vm, vmem_size_t size, vmem_size_t align,
-    vmem_size_t phase, vmem_size_t nocross, vmem_addr_t minaddr,
-    vmem_addr_t maxaddr, int flags, vmem_addr_t *addrp);
-void vmem_xfree(vmem_t *vm, vmem_addr_t addr, vmem_size_t size);
-
-/*
- * Add a static region to a vmem after create.  This won't be freed
- * until the vmem is destroyed.
- */
-int vmem_add(vmem_t *vm, vmem_addr_t addr, vmem_size_t size, int flags);
-
-/*
- * Given roundup size to the vmem's native quantum size.
- */
-vmem_size_t vmem_roundup_size(vmem_t *vm, vmem_size_t size);
-
-/*
- * Report vmem utilization according to the requested type.
- */
-vmem_size_t vmem_size(vmem_t *vm, int typemask);
-
-void vmem_whatis(vmem_addr_t addr, int (*fn)(const char *, ...)
-    __printflike(1, 2));
-void vmem_print(vmem_addr_t addr, const char *, int (*fn)(const char *, ...)
-    __printflike(1, 2));
-void vmem_printall(const char *, int (*fn)(const char *, ...)
-    __printflike(1, 2));
-void vmem_startup(void);
-
-/* vmem_size typemask */
-#define VMEM_ALLOC	0x01
-#define VMEM_FREE	0x02
-#define VMEM_MAXFREE	0x10
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_VMEM_H_ */
diff --git a/include.new/sys/vmmeter.h b/include.new/sys/vmmeter.h
deleted file mode 100644
index 92845c0..0000000
--- a/include.new/sys/vmmeter.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)vmmeter.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD: releng/10.2/sys/sys/vmmeter.h 254304 2013-08-13 21:56:16Z jeff $
- */
-
-#ifndef _SYS_VMMETER_H_
-#define _SYS_VMMETER_H_
-
-/*
- * This value is used by ps(1) to change sleep state flag from 'S' to
- * 'I' and by the sched process to set the alarm clock.
- */
-#define	MAXSLP			20
-
-/*
- * System wide statistics counters.
- * Locking:
- *      a - locked by atomic operations
- *      c - constant after initialization
- *      f - locked by vm_page_queue_free_mtx
- *      p - locked by being in the PCPU and atomicity respect to interrupts
- *      q - changes are synchronized by the corresponding vm_pagequeue lock
- */
-struct vmmeter {
-	/*
-	 * General system activity.
-	 */
-	u_int v_swtch;		/* (p) context switches */
-	u_int v_trap;		/* (p) calls to trap */
-	u_int v_syscall;	/* (p) calls to syscall() */
-	u_int v_intr;		/* (p) device interrupts */
-	u_int v_soft;		/* (p) software interrupts */
-	/*
-	 * Virtual memory activity.
-	 */
-	u_int v_vm_faults;	/* (p) address memory faults */
-	u_int v_io_faults;	/* (p) page faults requiring I/O */
-	u_int v_cow_faults;	/* (p) copy-on-writes faults */
-	u_int v_cow_optim;	/* (p) optimized copy-on-writes faults */
-	u_int v_zfod;		/* (p) pages zero filled on demand */
-	u_int v_ozfod;		/* (p) optimized zero fill pages */
-	u_int v_swapin;		/* (p) swap pager pageins */
-	u_int v_swapout;	/* (p) swap pager pageouts */
-	u_int v_swappgsin;	/* (p) swap pager pages paged in */
-	u_int v_swappgsout;	/* (p) swap pager pages paged out */
-	u_int v_vnodein;	/* (p) vnode pager pageins */
-	u_int v_vnodeout;	/* (p) vnode pager pageouts */
-	u_int v_vnodepgsin;	/* (p) vnode_pager pages paged in */
-	u_int v_vnodepgsout;	/* (p) vnode pager pages paged out */
-	u_int v_intrans;	/* (p) intransit blocking page faults */
-	u_int v_reactivated;	/* (f) pages reactivated from free list */
-	u_int v_pdwakeups;	/* (f) times daemon has awaken from sleep */
-	u_int v_pdpages;	/* (p) pages analyzed by daemon */
-
-	u_int v_tcached;	/* (p) total pages cached */
-	u_int v_dfree;		/* (p) pages freed by daemon */
-	u_int v_pfree;		/* (p) pages freed by exiting processes */
-	u_int v_tfree;		/* (p) total pages freed */
-	/*
-	 * Distribution of page usages.
-	 */
-	u_int v_page_size;	/* (c) page size in bytes */
-	u_int v_page_count;	/* (c) total number of pages in system */
-	u_int v_free_reserved;	/* (c) pages reserved for deadlock */
-	u_int v_free_target;	/* (c) pages desired free */
-	u_int v_free_min;	/* (c) pages desired free */
-	u_int v_free_count;	/* (f) pages free */
-	u_int v_wire_count;	/* (a) pages wired down */
-	u_int v_active_count;	/* (q) pages active */
-	u_int v_inactive_target; /* (c) pages desired inactive */
-	u_int v_inactive_count;	/* (q) pages inactive */
-	u_int v_cache_count;	/* (f) pages on cache queue */
-	u_int v_cache_min;	/* (c) min pages desired on cache queue */
-	u_int v_cache_max;	/* (c) max pages in cached obj (unused) */
-	u_int v_pageout_free_min;   /* (c) min pages reserved for kernel */
-	u_int v_interrupt_free_min; /* (c) reserved pages for int code */
-	u_int v_free_severe;	/* (c) severe page depletion point */
-	/*
-	 * Fork/vfork/rfork activity.
-	 */
-	u_int v_forks;		/* (p) fork() calls */
-	u_int v_vforks;		/* (p) vfork() calls */
-	u_int v_rforks;		/* (p) rfork() calls */
-	u_int v_kthreads;	/* (p) fork() calls by kernel */
-	u_int v_forkpages;	/* (p) VM pages affected by fork() */
-	u_int v_vforkpages;	/* (p) VM pages affected by vfork() */
-	u_int v_rforkpages;	/* (p) VM pages affected by rfork() */
-	u_int v_kthreadpages;	/* (p) VM pages affected by fork() by kernel */
-};
-#ifdef _KERNEL
-
-extern struct vmmeter cnt;
-
-extern int vm_pageout_wakeup_thresh;
-
-/*
- * Return TRUE if we are under our severe low-free-pages threshold
- *
- * This routine is typically used at the user<->system interface to determine
- * whether we need to block in order to avoid a low memory deadlock.
- */
-
-static __inline 
-int
-vm_page_count_severe(void)
-{
-    return (cnt.v_free_severe > (cnt.v_free_count + cnt.v_cache_count));
-}
-
-/*
- * Return TRUE if we are under our minimum low-free-pages threshold.
- *
- * This routine is typically used within the system to determine whether
- * we can execute potentially very expensive code in terms of memory.  It
- * is also used by the pageout daemon to calculate when to sleep, when
- * to wake waiters up, and when (after making a pass) to become more
- * desparate.
- */
-
-static __inline 
-int
-vm_page_count_min(void)
-{
-    return (cnt.v_free_min > (cnt.v_free_count + cnt.v_cache_count));
-}
-
-/*
- * Return TRUE if we have not reached our free page target during
- * free page recovery operations.
- */
-
-static __inline 
-int
-vm_page_count_target(void)
-{
-    return (cnt.v_free_target > (cnt.v_free_count + cnt.v_cache_count));
-}
-
-/*
- * Return the number of pages we need to free-up or cache
- * A positive number indicates that we do not have enough free pages.
- */
-
-static __inline 
-int
-vm_paging_target(void)
-{
-    return (cnt.v_free_target - (cnt.v_free_count + cnt.v_cache_count));
-}
-
-/*
- * Returns TRUE if the pagedaemon needs to be woken up.
- */
-
-static __inline 
-int
-vm_paging_needed(void)
-{
-    return (cnt.v_free_count + cnt.v_cache_count < vm_pageout_wakeup_thresh);
-}
-
-#endif
-
-/* systemwide totals computed every five seconds */
-struct vmtotal {
-	int16_t	t_rq;		/* length of the run queue */
-	int16_t	t_dw;		/* jobs in ``disk wait'' (neg priority) */
-	int16_t	t_pw;		/* jobs in page wait */
-	int16_t	t_sl;		/* jobs sleeping in core */
-	int16_t	t_sw;		/* swapped out runnable/short block jobs */
-	int32_t	t_vm;		/* total virtual memory */
-	int32_t	t_avm;		/* active virtual memory */
-	int32_t	t_rm;		/* total real memory in use */
-	int32_t	t_arm;		/* active real memory */
-	int32_t	t_vmshr;	/* shared virtual memory */
-	int32_t	t_avmshr;	/* active shared virtual memory */
-	int32_t	t_rmshr;	/* shared real memory */
-	int32_t	t_armshr;	/* active shared real memory */
-	int32_t	t_free;		/* free memory pages */
-};
-
-#endif
diff --git a/include.new/sys/vnode.h b/include.new/sys/vnode.h
deleted file mode 100644
index fcd9c9b..0000000
--- a/include.new/sys/vnode.h
+++ /dev/null
@@ -1,864 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- * 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.
- *
- *	@(#)vnode.h	8.7 (Berkeley) 2/4/94
- * $FreeBSD: releng/10.2/sys/sys/vnode.h 284202 2015-06-10 02:20:58Z kib $
- */
-
-#ifndef _SYS_VNODE_H_
-#define	_SYS_VNODE_H_
-
-#include <sys/bufobj.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/lockmgr.h>
-#include <sys/mutex.h>
-#include <sys/rangelock.h>
-#include <sys/selinfo.h>
-#include <sys/uio.h>
-#include <sys/acl.h>
-#include <sys/ktr.h>
-
-/*
- * The vnode is the focus of all file activity in UNIX.  There is a
- * unique vnode allocated for each active file, each current directory,
- * each mounted-on file, text file, and the root.
- */
-
-/*
- * Vnode types.  VNON means no type.
- */
-enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VSOCK, VFIFO, VBAD,
-		  VMARKER };
-
-/*
- * Each underlying filesystem allocates its own private area and hangs
- * it from v_data.  If non-null, this area is freed in getnewvnode().
- */
-
-struct namecache;
-
-struct vpollinfo {
-	struct	mtx vpi_lock;		/* lock to protect below */
-	struct	selinfo vpi_selinfo;	/* identity of poller(s) */
-	short	vpi_events;		/* what they are looking for */
-	short	vpi_revents;		/* what has happened */
-};
-
-/*
- * Reading or writing any of these items requires holding the appropriate lock.
- *
- * Lock reference:
- *	c - namecache mutex
- *	f - freelist mutex
- *	i - interlock
- *	m - mount point interlock
- *	p - pollinfo lock
- *	u - Only a reference to the vnode is needed to read.
- *	v - vnode lock
- *
- * Vnodes may be found on many lists.  The general way to deal with operating
- * on a vnode that is on a list is:
- *	1) Lock the list and find the vnode.
- *	2) Lock interlock so that the vnode does not go away.
- *	3) Unlock the list to avoid lock order reversals.
- *	4) vget with LK_INTERLOCK and check for ENOENT, or
- *	5) Check for DOOMED if the vnode lock is not required.
- *	6) Perform your operation, then vput().
- */
-
-#if defined(_KERNEL) || defined(_KVM_VNODE)
-
-struct vnode {
-	/*
-	 * Fields which define the identity of the vnode.  These fields are
-	 * owned by the filesystem (XXX: and vgone() ?)
-	 */
-	const char *v_tag;			/* u type of underlying data */
-	struct	vop_vector *v_op;		/* u vnode operations vector */
-	void	*v_data;			/* u private data for fs */
-
-	/*
-	 * Filesystem instance stuff
-	 */
-	struct	mount *v_mount;			/* u ptr to vfs we are in */
-	TAILQ_ENTRY(vnode) v_nmntvnodes;	/* m vnodes for mount point */
-
-	/*
-	 * Type specific fields, only one applies to any given vnode.
-	 * See #defines below for renaming to v_* namespace.
-	 */
-	union {
-		struct mount	*vu_mount;	/* v ptr to mountpoint (VDIR) */
-		struct socket	*vu_socket;	/* v unix domain net (VSOCK) */
-		struct cdev	*vu_cdev; 	/* v device (VCHR, VBLK) */
-		struct fifoinfo	*vu_fifoinfo;	/* v fifo (VFIFO) */
-	} v_un;
-
-	/*
-	 * vfs_hash: (mount + inode) -> vnode hash.  The hash value
-	 * itself is grouped with other int fields, to avoid padding.
-	 */
-	LIST_ENTRY(vnode)	v_hashlist;
-
-	/*
-	 * VFS_namecache stuff
-	 */
-	LIST_HEAD(, namecache) v_cache_src;	/* c Cache entries from us */
-	TAILQ_HEAD(, namecache) v_cache_dst;	/* c Cache entries to us */
-	struct namecache *v_cache_dd;		/* c Cache entry for .. vnode */
-
-	/*
-	 * Locking
-	 */
-	struct	lock v_lock;			/* u (if fs don't have one) */
-	struct	mtx v_interlock;		/* lock for "i" things */
-	struct	lock *v_vnlock;			/* u pointer to vnode lock */
-
-	/*
-	 * The machinery of being a vnode
-	 */
-	TAILQ_ENTRY(vnode) v_actfreelist;	/* f vnode active/free lists */
-	struct bufobj	v_bufobj;		/* * Buffer cache object */
-
-	/*
-	 * Hooks for various subsystems and features.
-	 */
-	struct vpollinfo *v_pollinfo;		/* i Poll events, p for *v_pi */
-	struct label *v_label;			/* MAC label for vnode */
-	struct lockf *v_lockf;		/* Byte-level advisory lock list */
-	struct rangelock v_rl;			/* Byte-range lock */
-
-	/*
-	 * clustering stuff
-	 */
-	daddr_t	v_cstart;			/* v start block of cluster */
-	daddr_t	v_lasta;			/* v last allocation  */
-	daddr_t	v_lastw;			/* v last write  */
-	int	v_clen;				/* v length of cur. cluster */
-
-	int	v_holdcnt;			/* i prevents recycling. */
-	int	v_usecount;			/* i ref count of users */
-	u_int	v_iflag;			/* i vnode flags (see below) */
-	u_int	v_vflag;			/* v vnode flags */
-	int	v_writecount;			/* v ref count of writers */
-	u_int	v_hash;
-	enum	vtype v_type;			/* u vnode type */
-};
-
-#endif /* defined(_KERNEL) || defined(_KVM_VNODE) */
-
-#define	v_mountedhere	v_un.vu_mount
-#define	v_socket	v_un.vu_socket
-#define	v_rdev		v_un.vu_cdev
-#define	v_fifoinfo	v_un.vu_fifoinfo
-
-/* XXX: These are temporary to avoid a source sweep at this time */
-#define v_object	v_bufobj.bo_object
-
-/*
- * Userland version of struct vnode, for sysctl.
- */
-struct xvnode {
-	size_t	xv_size;			/* sizeof(struct xvnode) */
-	void	*xv_vnode;			/* address of real vnode */
-	u_long	xv_flag;			/* vnode vflags */
-	int	xv_usecount;			/* reference count of users */
-	int	xv_writecount;			/* reference count of writers */
-	int	xv_holdcnt;			/* page & buffer references */
-	u_long	xv_id;				/* capability identifier */
-	void	*xv_mount;			/* address of parent mount */
-	long	xv_numoutput;			/* num of writes in progress */
-	enum	vtype xv_type;			/* vnode type */
-	union {
-		void	*xvu_socket;		/* socket, if VSOCK */
-		void	*xvu_fifo;		/* fifo, if VFIFO */
-		dev_t	xvu_rdev;		/* maj/min, if VBLK/VCHR */
-		struct {
-			dev_t	xvu_dev;	/* device, if VDIR/VREG/VLNK */
-			ino_t	xvu_ino;	/* id, if VDIR/VREG/VLNK */
-		} xv_uns;
-	} xv_un;
-};
-#define xv_socket	xv_un.xvu_socket
-#define xv_fifo		xv_un.xvu_fifo
-#define xv_rdev		xv_un.xvu_rdev
-#define xv_dev		xv_un.xv_uns.xvu_dev
-#define xv_ino		xv_un.xv_uns.xvu_ino
-
-/* We don't need to lock the knlist */
-#define	VN_KNLIST_EMPTY(vp) ((vp)->v_pollinfo == NULL ||	\
-	    KNLIST_EMPTY(&(vp)->v_pollinfo->vpi_selinfo.si_note))
-
-#define VN_KNOTE(vp, b, a)					\
-	do {							\
-		if (!VN_KNLIST_EMPTY(vp))			\
-			KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), \
-			    (a) | KNF_NOKQLOCK);		\
-	} while (0)
-#define	VN_KNOTE_LOCKED(vp, b)		VN_KNOTE(vp, b, KNF_LISTLOCKED)
-#define	VN_KNOTE_UNLOCKED(vp, b)	VN_KNOTE(vp, b, 0)
-
-/*
- * Vnode flags.
- *	VI flags are protected by interlock and live in v_iflag
- *	VV flags are protected by the vnode lock and live in v_vflag
- *
- *	VI_DOOMED is doubly protected by the interlock and vnode lock.  Both
- *	are required for writing but the status may be checked with either.
- */
-#define	VI_MOUNT	0x0020	/* Mount in progress */
-#define	VI_AGE		0x0040	/* Insert vnode at head of free list */
-#define	VI_DOOMED	0x0080	/* This vnode is being recycled */
-#define	VI_FREE		0x0100	/* This vnode is on the freelist */
-#define	VI_ACTIVE	0x0200	/* This vnode is on the active list */
-#define	VI_DOINGINACT	0x0800	/* VOP_INACTIVE is in progress */
-#define	VI_OWEINACT	0x1000	/* Need to call inactive */
-
-#define	VV_ROOT		0x0001	/* root of its filesystem */
-#define	VV_ISTTY	0x0002	/* vnode represents a tty */
-#define	VV_NOSYNC	0x0004	/* unlinked, stop syncing */
-#define	VV_ETERNALDEV	0x0008	/* device that is never destroyed */
-#define	VV_CACHEDLABEL	0x0010	/* Vnode has valid cached MAC label */
-#define	VV_TEXT		0x0020	/* vnode is a pure text prototype */
-#define	VV_COPYONWRITE	0x0040	/* vnode is doing copy-on-write */
-#define	VV_SYSTEM	0x0080	/* vnode being used by kernel */
-#define	VV_PROCDEP	0x0100	/* vnode is process dependent */
-#define	VV_NOKNOTE	0x0200	/* don't activate knotes on this vnode */
-#define	VV_DELETED	0x0400	/* should be removed */
-#define	VV_MD		0x0800	/* vnode backs the md device */
-#define	VV_FORCEINSMQ	0x1000	/* force the insmntque to succeed */
-
-/*
- * Vnode attributes.  A field value of VNOVAL represents a field whose value
- * is unavailable (getattr) or which is not to be changed (setattr).
- */
-struct vattr {
-	enum vtype	va_type;	/* vnode type (for create) */
-	u_short		va_mode;	/* files access mode and type */
-	short		va_nlink;	/* number of references to file */
-	uid_t		va_uid;		/* owner user id */
-	gid_t		va_gid;		/* owner group id */
-	dev_t		va_fsid;	/* filesystem id */
-	long		va_fileid;	/* file id */
-	u_quad_t	va_size;	/* file size in bytes */
-	long		va_blocksize;	/* blocksize preferred for i/o */
-	struct timespec	va_atime;	/* time of last access */
-	struct timespec	va_mtime;	/* time of last modification */
-	struct timespec	va_ctime;	/* time file changed */
-	struct timespec	va_birthtime;	/* time file created */
-	u_long		va_gen;		/* generation number of file */
-	u_long		va_flags;	/* flags defined for file */
-	dev_t		va_rdev;	/* device the special file represents */
-	u_quad_t	va_bytes;	/* bytes of disk space held by file */
-	u_quad_t	va_filerev;	/* file modification number */
-	u_int		va_vaflags;	/* operations flags, see below */
-	long		va_spare;	/* remain quad aligned */
-};
-
-/*
- * Flags for va_vaflags.
- */
-#define	VA_UTIMES_NULL	0x01		/* utimes argument was NULL */
-#define	VA_EXCLUSIVE	0x02		/* exclusive create request */
-
-/*
- * Flags for ioflag. (high 16 bits used to ask for read-ahead and
- * help with write clustering)
- * NB: IO_NDELAY and IO_DIRECT are linked to fcntl.h
- */
-#define	IO_UNIT		0x0001		/* do I/O as atomic unit */
-#define	IO_APPEND	0x0002		/* append write to end */
-#define	IO_NDELAY	0x0004		/* FNDELAY flag set in file table */
-#define	IO_NODELOCKED	0x0008		/* underlying node already locked */
-#define	IO_ASYNC	0x0010		/* bawrite rather then bdwrite */
-#define	IO_VMIO		0x0020		/* data already in VMIO space */
-#define	IO_INVAL	0x0040		/* invalidate after I/O */
-#define	IO_SYNC		0x0080		/* do I/O synchronously */
-#define	IO_DIRECT	0x0100		/* attempt to bypass buffer cache */
-#define	IO_EXT		0x0400		/* operate on external attributes */
-#define	IO_NORMAL	0x0800		/* operate on regular data */
-#define	IO_NOMACCHECK	0x1000		/* MAC checks unnecessary */
-#define	IO_BUFLOCKED	0x2000		/* ffs flag; indir buf is locked */
-#define	IO_RANGELOCKED	0x4000		/* range locked */
-
-#define IO_SEQMAX	0x7F		/* seq heuristic max value */
-#define IO_SEQSHIFT	16		/* seq heuristic in upper 16 bits */
-
-/*
- * Flags for accmode_t.
- */
-#define	VEXEC			000000000100 /* execute/search permission */
-#define	VWRITE			000000000200 /* write permission */
-#define	VREAD			000000000400 /* read permission */
-#define	VADMIN			000000010000 /* being the file owner */
-#define	VAPPEND			000000040000 /* permission to write/append */
-/*
- * VEXPLICIT_DENY makes VOP_ACCESSX(9) return EPERM or EACCES only
- * if permission was denied explicitly, by a "deny" rule in NFSv4 ACL,
- * and 0 otherwise.  This never happens with ordinary unix access rights
- * or POSIX.1e ACLs.  Obviously, VEXPLICIT_DENY must be OR-ed with
- * some other V* constant.
- */
-#define	VEXPLICIT_DENY		000000100000
-#define	VREAD_NAMED_ATTRS 	000000200000 /* not used */
-#define	VWRITE_NAMED_ATTRS 	000000400000 /* not used */
-#define	VDELETE_CHILD	 	000001000000
-#define	VREAD_ATTRIBUTES 	000002000000 /* permission to stat(2) */
-#define	VWRITE_ATTRIBUTES 	000004000000 /* change {m,c,a}time */
-#define	VDELETE		 	000010000000
-#define	VREAD_ACL	 	000020000000 /* read ACL and file mode */
-#define	VWRITE_ACL	 	000040000000 /* change ACL and/or file mode */
-#define	VWRITE_OWNER	 	000100000000 /* change file owner */
-#define	VSYNCHRONIZE	 	000200000000 /* not used */
-
-/*
- * Permissions that were traditionally granted only to the file owner.
- */
-#define VADMIN_PERMS	(VADMIN | VWRITE_ATTRIBUTES | VWRITE_ACL | \
-    VWRITE_OWNER)
-
-/*
- * Permissions that were traditionally granted to everyone.
- */
-#define VSTAT_PERMS	(VREAD_ATTRIBUTES | VREAD_ACL)
-
-/*
- * Permissions that allow to change the state of the file in any way.
- */
-#define VMODIFY_PERMS	(VWRITE | VAPPEND | VADMIN_PERMS | VDELETE_CHILD | \
-    VDELETE)
-
-/*
- * Token indicating no attribute value yet assigned.
- */
-#define	VNOVAL	(-1)
-
-/*
- * LK_TIMELOCK timeout for vnode locks (used mainly by the pageout daemon)
- */
-#define VLKTIMEOUT	(hz / 20 + 1)
-
-#ifdef _KERNEL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_VNODE);
-#endif
-
-/*
- * Convert between vnode types and inode formats (since POSIX.1
- * defines mode word of stat structure in terms of inode formats).
- */
-extern enum vtype	iftovt_tab[];
-extern int		vttoif_tab[];
-#define	IFTOVT(mode)	(iftovt_tab[((mode) & S_IFMT) >> 12])
-#define	VTTOIF(indx)	(vttoif_tab[(int)(indx)])
-#define	MAKEIMODE(indx, mode)	(int)(VTTOIF(indx) | (mode))
-
-/*
- * Flags to various vnode functions.
- */
-#define	SKIPSYSTEM	0x0001	/* vflush: skip vnodes marked VSYSTEM */
-#define	FORCECLOSE	0x0002	/* vflush: force file closure */
-#define	WRITECLOSE	0x0004	/* vflush: only close writable files */
-#define	EARLYFLUSH	0x0008	/* vflush: early call for ffs_flushfiles */
-#define	V_SAVE		0x0001	/* vinvalbuf: sync file first */
-#define	V_ALT		0x0002	/* vinvalbuf: invalidate only alternate bufs */
-#define	V_NORMAL	0x0004	/* vinvalbuf: invalidate only regular bufs */
-#define	V_CLEANONLY	0x0008	/* vinvalbuf: invalidate only clean bufs */
-#define	REVOKEALL	0x0001	/* vop_revoke: revoke all aliases */
-#define	V_WAIT		0x0001	/* vn_start_write: sleep for suspend */
-#define	V_NOWAIT	0x0002	/* vn_start_write: don't sleep for suspend */
-#define	V_XSLEEP	0x0004	/* vn_start_write: just return after sleep */
-#define	V_MNTREF	0x0010	/* vn_start_write: mp is already ref-ed */
-
-#define	VR_START_WRITE	0x0001	/* vfs_write_resume: start write atomically */
-#define	VR_NO_SUSPCLR	0x0002	/* vfs_write_resume: do not clear suspension */
-
-#define	VS_SKIP_UNMOUNT	0x0001	/* vfs_write_suspend: fail if the
-				   filesystem is being unmounted */
-
-#define	VREF(vp)	vref(vp)
-
-#ifdef DIAGNOSTIC
-#define	VATTR_NULL(vap)	vattr_null(vap)
-#else
-#define	VATTR_NULL(vap)	(*(vap) = va_null)	/* initialize a vattr */
-#endif /* DIAGNOSTIC */
-
-#define	NULLVP	((struct vnode *)NULL)
-
-/*
- * Global vnode data.
- */
-extern	struct vnode *rootvnode;	/* root (i.e. "/") vnode */
-extern	int async_io_version;		/* 0 or POSIX version of AIO i'face */
-extern	int desiredvnodes;		/* number of vnodes desired */
-extern	struct uma_zone *namei_zone;
-extern	struct vattr va_null;		/* predefined null vattr structure */
-
-#define	VI_LOCK(vp)	mtx_lock(&(vp)->v_interlock)
-#define	VI_LOCK_FLAGS(vp, flags) mtx_lock_flags(&(vp)->v_interlock, (flags))
-#define	VI_TRYLOCK(vp)	mtx_trylock(&(vp)->v_interlock)
-#define	VI_UNLOCK(vp)	mtx_unlock(&(vp)->v_interlock)
-#define	VI_MTX(vp)	(&(vp)->v_interlock)
-
-#define	VN_LOCK_AREC(vp)	lockallowrecurse((vp)->v_vnlock)
-#define	VN_LOCK_ASHARE(vp)	lockallowshare((vp)->v_vnlock)
-#define	VN_LOCK_DSHARE(vp)	lockdisableshare((vp)->v_vnlock)
-
-#endif /* _KERNEL */
-
-/*
- * Mods for extensibility.
- */
-
-/*
- * Flags for vdesc_flags:
- */
-#define	VDESC_MAX_VPS		16
-/* Low order 16 flag bits are reserved for willrele flags for vp arguments. */
-#define	VDESC_VP0_WILLRELE	0x0001
-#define	VDESC_VP1_WILLRELE	0x0002
-#define	VDESC_VP2_WILLRELE	0x0004
-#define	VDESC_VP3_WILLRELE	0x0008
-#define	VDESC_NOMAP_VPP		0x0100
-#define	VDESC_VPP_WILLRELE	0x0200
-
-/*
- * A generic structure.
- * This can be used by bypass routines to identify generic arguments.
- */
-struct vop_generic_args {
-	struct vnodeop_desc *a_desc;
-	/* other random data follows, presumably */
-};
-
-typedef int vop_bypass_t(struct vop_generic_args *);
-
-/*
- * VDESC_NO_OFFSET is used to identify the end of the offset list
- * and in places where no such field exists.
- */
-#define VDESC_NO_OFFSET -1
-
-/*
- * This structure describes the vnode operation taking place.
- */
-struct vnodeop_desc {
-	char	*vdesc_name;		/* a readable name for debugging */
-	int	 vdesc_flags;		/* VDESC_* flags */
-	vop_bypass_t	*vdesc_call;	/* Function to call */
-
-	/*
-	 * These ops are used by bypass routines to map and locate arguments.
-	 * Creds and procs are not needed in bypass routines, but sometimes
-	 * they are useful to (for example) transport layers.
-	 * Nameidata is useful because it has a cred in it.
-	 */
-	int	*vdesc_vp_offsets;	/* list ended by VDESC_NO_OFFSET */
-	int	vdesc_vpp_offset;	/* return vpp location */
-	int	vdesc_cred_offset;	/* cred location, if any */
-	int	vdesc_thread_offset;	/* thread location, if any */
-	int	vdesc_componentname_offset; /* if any */
-};
-
-#ifdef _KERNEL
-/*
- * A list of all the operation descs.
- */
-extern struct vnodeop_desc *vnodeop_descs[];
-
-#define	VOPARG_OFFSETOF(s_type, field)	__offsetof(s_type, field)
-#define	VOPARG_OFFSETTO(s_type, s_offset, struct_p) \
-    ((s_type)(((char*)(struct_p)) + (s_offset)))
-
-
-#ifdef DEBUG_VFS_LOCKS
-/*
- * Support code to aid in debugging VFS locking problems.  Not totally
- * reliable since if the thread sleeps between changing the lock
- * state and checking it with the assert, some other thread could
- * change the state.  They are good enough for debugging a single
- * filesystem using a single-threaded test.
- */
-void	assert_vi_locked(struct vnode *vp, const char *str);
-void	assert_vi_unlocked(struct vnode *vp, const char *str);
-void	assert_vop_elocked(struct vnode *vp, const char *str);
-#if 0
-void	assert_vop_elocked_other(struct vnode *vp, const char *str);
-#endif
-void	assert_vop_locked(struct vnode *vp, const char *str);
-#if 0
-voi0	assert_vop_slocked(struct vnode *vp, const char *str);
-#endif
-void	assert_vop_unlocked(struct vnode *vp, const char *str);
-
-#define	ASSERT_VI_LOCKED(vp, str)	assert_vi_locked((vp), (str))
-#define	ASSERT_VI_UNLOCKED(vp, str)	assert_vi_unlocked((vp), (str))
-#define	ASSERT_VOP_ELOCKED(vp, str)	assert_vop_elocked((vp), (str))
-#if 0
-#define	ASSERT_VOP_ELOCKED_OTHER(vp, str) assert_vop_locked_other((vp), (str))
-#endif
-#define	ASSERT_VOP_LOCKED(vp, str)	assert_vop_locked((vp), (str))
-#if 0
-#define	ASSERT_VOP_SLOCKED(vp, str)	assert_vop_slocked((vp), (str))
-#endif
-#define	ASSERT_VOP_UNLOCKED(vp, str)	assert_vop_unlocked((vp), (str))
-
-#else /* !DEBUG_VFS_LOCKS */
-
-#define	ASSERT_VI_LOCKED(vp, str)	((void)0)
-#define	ASSERT_VI_UNLOCKED(vp, str)	((void)0)
-#define	ASSERT_VOP_ELOCKED(vp, str)	((void)0)
-#if 0
-#define	ASSERT_VOP_ELOCKED_OTHER(vp, str)
-#endif
-#define	ASSERT_VOP_LOCKED(vp, str)	((void)0)
-#if 0
-#define	ASSERT_VOP_SLOCKED(vp, str)
-#endif
-#define	ASSERT_VOP_UNLOCKED(vp, str)	((void)0)
-#endif /* DEBUG_VFS_LOCKS */
-
-
-/*
- * This call works for vnodes in the kernel.
- */
-#define VCALL(c) ((c)->a_desc->vdesc_call(c))
-
-#define DOINGASYNC(vp)	   					\
-	(((vp)->v_mount->mnt_kern_flag & MNTK_ASYNC) != 0 &&	\
-	 ((curthread->td_pflags & TDP_SYNCIO) == 0))
-
-/*
- * VMIO support inline
- */
-
-extern int vmiodirenable;
-
-static __inline int
-vn_canvmio(struct vnode *vp)
-{
-      if (vp && (vp->v_type == VREG || (vmiodirenable && vp->v_type == VDIR)))
-		return(TRUE);
-	return(FALSE);
-}
-
-/*
- * Finally, include the default set of vnode operations.
- */
-#include "vnode_if.h"
-
-/* vn_open_flags */
-#define	VN_OPEN_NOAUDIT		0x00000001
-#define	VN_OPEN_NOCAPCHECK	0x00000002
-#define	VN_OPEN_NAMECACHE	0x00000004
-
-/*
- * Public vnode manipulation functions.
- */
-struct componentname;
-struct file;
-struct mount;
-struct nameidata;
-struct ostat;
-struct thread;
-struct proc;
-struct stat;
-struct nstat;
-struct ucred;
-struct uio;
-struct vattr;
-struct vnode;
-
-typedef int (*vn_get_ino_t)(struct mount *, void *, int, struct vnode **);
-
-/* cache_* may belong in namei.h. */
-#define	cache_enter(dvp, vp, cnp)					\
-	cache_enter_time(dvp, vp, cnp, NULL, NULL)
-void	cache_enter_time(struct vnode *dvp, struct vnode *vp,
-	    struct componentname *cnp, struct timespec *tsp,
-	    struct timespec *dtsp);
-int	cache_lookup(struct vnode *dvp, struct vnode **vpp,
-	    struct componentname *cnp, struct timespec *tsp, int *ticksp);
-void	cache_purge(struct vnode *vp);
-void	cache_purge_negative(struct vnode *vp);
-void	cache_purgevfs(struct mount *mp);
-int	change_dir(struct vnode *vp, struct thread *td);
-int	change_root(struct vnode *vp, struct thread *td);
-void	cvtstat(struct stat *st, struct ostat *ost);
-void	cvtnstat(struct stat *sb, struct nstat *nsb);
-int	getnewvnode(const char *tag, struct mount *mp, struct vop_vector *vops,
-	    struct vnode **vpp);
-void	getnewvnode_reserve(u_int count);
-void	getnewvnode_drop_reserve(void);
-int	insmntque1(struct vnode *vp, struct mount *mp,
-	    void (*dtr)(struct vnode *, void *), void *dtr_arg);
-int	insmntque(struct vnode *vp, struct mount *mp);
-u_quad_t init_va_filerev(void);
-int	speedup_syncer(void);
-int	vn_vptocnp(struct vnode **vp, struct ucred *cred, char *buf,
-	    u_int *buflen);
-#define textvp_fullpath(p, rb, rfb) \
-	vn_fullpath(FIRST_THREAD_IN_PROC(p), (p)->p_textvp, rb, rfb)
-int	vn_fullpath(struct thread *td, struct vnode *vn,
-	    char **retbuf, char **freebuf);
-int	vn_fullpath_global(struct thread *td, struct vnode *vn,
-	    char **retbuf, char **freebuf);
-struct vnode *
-	vn_dir_dd_ino(struct vnode *vp);
-int	vn_commname(struct vnode *vn, char *buf, u_int buflen);
-int	vn_path_to_global_path(struct thread *td, struct vnode *vp,
-	    char *path, u_int pathlen);
-int	vaccess(enum vtype type, mode_t file_mode, uid_t file_uid,
-	    gid_t file_gid, accmode_t accmode, struct ucred *cred,
-	    int *privused);
-int	vaccess_acl_nfs4(enum vtype type, uid_t file_uid, gid_t file_gid,
-	    struct acl *aclp, accmode_t accmode, struct ucred *cred,
-	    int *privused);
-int	vaccess_acl_posix1e(enum vtype type, uid_t file_uid,
-	    gid_t file_gid, struct acl *acl, accmode_t accmode,
-	    struct ucred *cred, int *privused);
-void	vattr_null(struct vattr *vap);
-int	vcount(struct vnode *vp);
-void	vdrop(struct vnode *);
-void	vdropl(struct vnode *);
-int	vflush(struct mount *mp, int rootrefs, int flags, struct thread *td);
-int	vget(struct vnode *vp, int lockflag, struct thread *td);
-void	vgone(struct vnode *vp);
-void	vhold(struct vnode *);
-void	vholdl(struct vnode *);
-void	vinactive(struct vnode *, struct thread *);
-int	vinvalbuf(struct vnode *vp, int save, int slpflag, int slptimeo);
-int	vtruncbuf(struct vnode *vp, struct ucred *cred, off_t length,
-	    int blksize);
-void	vunref(struct vnode *);
-void	vn_printf(struct vnode *vp, const char *fmt, ...) __printflike(2,3);
-#define vprint(label, vp) vn_printf((vp), "%s\n", (label))
-int	vrecycle(struct vnode *vp);
-int	vn_bmap_seekhole(struct vnode *vp, u_long cmd, off_t *off,
-	    struct ucred *cred);
-int	vn_close(struct vnode *vp,
-	    int flags, struct ucred *file_cred, struct thread *td);
-void	vn_finished_write(struct mount *mp);
-void	vn_finished_secondary_write(struct mount *mp);
-int	vn_isdisk(struct vnode *vp, int *errp);
-int	_vn_lock(struct vnode *vp, int flags, char *file, int line);
-#define vn_lock(vp, flags) _vn_lock(vp, flags, __FILE__, __LINE__)
-int	vn_open(struct nameidata *ndp, int *flagp, int cmode, struct file *fp);
-int	vn_open_cred(struct nameidata *ndp, int *flagp, int cmode,
-	    u_int vn_open_flags, struct ucred *cred, struct file *fp);
-int	vn_open_vnode(struct vnode *vp, int fmode, struct ucred *cred,
-	    struct thread *td, struct file *fp);
-void	vn_pages_remove(struct vnode *vp, vm_pindex_t start, vm_pindex_t end);
-int	vn_pollrecord(struct vnode *vp, struct thread *p, int events);
-int	vn_rdwr(enum uio_rw rw, struct vnode *vp, void *base,
-	    int len, off_t offset, enum uio_seg segflg, int ioflg,
-	    struct ucred *active_cred, struct ucred *file_cred, ssize_t *aresid,
-	    struct thread *td);
-int	vn_rdwr_inchunks(enum uio_rw rw, struct vnode *vp, void *base,
-	    size_t len, off_t offset, enum uio_seg segflg, int ioflg,
-	    struct ucred *active_cred, struct ucred *file_cred, size_t *aresid,
-	    struct thread *td);
-int	vn_rlimit_fsize(const struct vnode *vn, const struct uio *uio,
-	    const struct thread *td);
-int	vn_stat(struct vnode *vp, struct stat *sb, struct ucred *active_cred,
-	    struct ucred *file_cred, struct thread *td);
-int	vn_start_write(struct vnode *vp, struct mount **mpp, int flags);
-int	vn_start_secondary_write(struct vnode *vp, struct mount **mpp,
-	    int flags);
-int	vn_writechk(struct vnode *vp);
-int	vn_extattr_get(struct vnode *vp, int ioflg, int attrnamespace,
-	    const char *attrname, int *buflen, char *buf, struct thread *td);
-int	vn_extattr_set(struct vnode *vp, int ioflg, int attrnamespace,
-	    const char *attrname, int buflen, char *buf, struct thread *td);
-int	vn_extattr_rm(struct vnode *vp, int ioflg, int attrnamespace,
-	    const char *attrname, struct thread *td);
-int	vn_vget_ino(struct vnode *vp, ino_t ino, int lkflags,
-	    struct vnode **rvp);
-int	vn_vget_ino_gen(struct vnode *vp, vn_get_ino_t alloc,
-	    void *alloc_arg, int lkflags, struct vnode **rvp);
-int	vn_utimes_perm(struct vnode *vp, struct vattr *vap,
-	    struct ucred *cred, struct thread *td);
-
-int	vn_io_fault_uiomove(char *data, int xfersize, struct uio *uio);
-int	vn_io_fault_pgmove(vm_page_t ma[], vm_offset_t offset, int xfersize,
-	    struct uio *uio);
-
-#define	vn_rangelock_unlock(vp, cookie)					\
-	rangelock_unlock(&(vp)->v_rl, (cookie), VI_MTX(vp))
-#define	vn_rangelock_unlock_range(vp, cookie, start, end)		\
-	rangelock_unlock_range(&(vp)->v_rl, (cookie), (start), (end), 	\
-	    VI_MTX(vp))
-#define	vn_rangelock_rlock(vp, start, end)				\
-	rangelock_rlock(&(vp)->v_rl, (start), (end), VI_MTX(vp))
-#define	vn_rangelock_wlock(vp, start, end)				\
-	rangelock_wlock(&(vp)->v_rl, (start), (end), VI_MTX(vp))
-
-int	vfs_cache_lookup(struct vop_lookup_args *ap);
-void	vfs_timestamp(struct timespec *);
-void	vfs_write_resume(struct mount *mp, int flags);
-int	vfs_write_suspend(struct mount *mp, int flags);
-int	vfs_write_suspend_umnt(struct mount *mp);
-int	vop_stdbmap(struct vop_bmap_args *);
-int	vop_stdfsync(struct vop_fsync_args *);
-int	vop_stdgetwritemount(struct vop_getwritemount_args *);
-int	vop_stdgetpages(struct vop_getpages_args *);
-int	vop_stdinactive(struct vop_inactive_args *);
-int	vop_stdislocked(struct vop_islocked_args *);
-int	vop_stdkqfilter(struct vop_kqfilter_args *);
-int	vop_stdlock(struct vop_lock1_args *);
-int	vop_stdputpages(struct vop_putpages_args *);
-int	vop_stdunlock(struct vop_unlock_args *);
-int	vop_nopoll(struct vop_poll_args *);
-int	vop_stdaccess(struct vop_access_args *ap);
-int	vop_stdaccessx(struct vop_accessx_args *ap);
-int	vop_stdadvise(struct vop_advise_args *ap);
-int	vop_stdadvlock(struct vop_advlock_args *ap);
-int	vop_stdadvlockasync(struct vop_advlockasync_args *ap);
-int	vop_stdadvlockpurge(struct vop_advlockpurge_args *ap);
-int	vop_stdallocate(struct vop_allocate_args *ap);
-int	vop_stdpathconf(struct vop_pathconf_args *);
-int	vop_stdpoll(struct vop_poll_args *);
-int	vop_stdvptocnp(struct vop_vptocnp_args *ap);
-int	vop_stdvptofh(struct vop_vptofh_args *ap);
-int	vop_stdunp_bind(struct vop_unp_bind_args *ap);
-int	vop_stdunp_connect(struct vop_unp_connect_args *ap);
-int	vop_stdunp_detach(struct vop_unp_detach_args *ap);
-int	vop_eopnotsupp(struct vop_generic_args *ap);
-int	vop_ebadf(struct vop_generic_args *ap);
-int	vop_einval(struct vop_generic_args *ap);
-int	vop_enoent(struct vop_generic_args *ap);
-int	vop_enotty(struct vop_generic_args *ap);
-int	vop_null(struct vop_generic_args *ap);
-int	vop_panic(struct vop_generic_args *ap);
-int	dead_poll(struct vop_poll_args *ap);
-int	dead_read(struct vop_read_args *ap);
-int	dead_write(struct vop_write_args *ap);
-
-/* These are called from within the actual VOPS. */
-void	vop_create_post(void *a, int rc);
-void	vop_deleteextattr_post(void *a, int rc);
-void	vop_link_post(void *a, int rc);
-void	vop_lock_pre(void *a);
-void	vop_lock_post(void *a, int rc);
-void	vop_lookup_post(void *a, int rc);
-void	vop_lookup_pre(void *a);
-void	vop_mkdir_post(void *a, int rc);
-void	vop_mknod_post(void *a, int rc);
-void	vop_remove_post(void *a, int rc);
-void	vop_rename_post(void *a, int rc);
-void	vop_rename_pre(void *a);
-void	vop_rmdir_post(void *a, int rc);
-void	vop_setattr_post(void *a, int rc);
-void	vop_setextattr_post(void *a, int rc);
-void	vop_strategy_pre(void *a);
-void	vop_symlink_post(void *a, int rc);
-void	vop_unlock_post(void *a, int rc);
-void	vop_unlock_pre(void *a);
-
-void	vop_rename_fail(struct vop_rename_args *ap);
-
-#define	VOP_WRITE_PRE(ap)						\
-	struct vattr va;						\
-	int error, osize, ooffset, noffset;				\
-									\
-	osize = ooffset = noffset = 0;					\
-	if (!VN_KNLIST_EMPTY((ap)->a_vp)) {				\
-		error = VOP_GETATTR((ap)->a_vp, &va, (ap)->a_cred);	\
-		if (error)						\
-			return (error);					\
-		ooffset = (ap)->a_uio->uio_offset;			\
-		osize = va.va_size;					\
-	}
-
-#define VOP_WRITE_POST(ap, ret)						\
-	noffset = (ap)->a_uio->uio_offset;				\
-	if (noffset > ooffset && !VN_KNLIST_EMPTY((ap)->a_vp)) {	\
-		VFS_KNOTE_LOCKED((ap)->a_vp, NOTE_WRITE			\
-		    | (noffset > osize ? NOTE_EXTEND : 0));		\
-	}
-
-#define VOP_LOCK(vp, flags) VOP_LOCK1(vp, flags, __FILE__, __LINE__)
-
-
-void	vput(struct vnode *vp);
-void	vrele(struct vnode *vp);
-void	vref(struct vnode *vp);
-int	vrefcnt(struct vnode *vp);
-void 	v_addpollinfo(struct vnode *vp);
-
-int vnode_create_vobject(struct vnode *vp, off_t size, struct thread *td);
-void vnode_destroy_vobject(struct vnode *vp);
-
-extern struct vop_vector fifo_specops;
-extern struct vop_vector dead_vnodeops;
-extern struct vop_vector default_vnodeops;
-extern struct vop_vector devfs_specops;
-
-#define VOP_PANIC	((void*)(uintptr_t)vop_panic)
-#define VOP_NULL	((void*)(uintptr_t)vop_null)
-#define VOP_EBADF	((void*)(uintptr_t)vop_ebadf)
-#define VOP_ENOTTY	((void*)(uintptr_t)vop_enotty)
-#define VOP_EINVAL	((void*)(uintptr_t)vop_einval)
-#define VOP_ENOENT	((void*)(uintptr_t)vop_enoent)
-#define VOP_EOPNOTSUPP	((void*)(uintptr_t)vop_eopnotsupp)
-
-/* fifo_vnops.c */
-int	fifo_printinfo(struct vnode *);
-
-/* vfs_hash.c */
-typedef int vfs_hash_cmp_t(struct vnode *vp, void *arg);
-
-int vfs_hash_get(const struct mount *mp, u_int hash, int flags, struct thread *td, struct vnode **vpp, vfs_hash_cmp_t *fn, void *arg);
-u_int vfs_hash_index(struct vnode *vp);
-int vfs_hash_insert(struct vnode *vp, u_int hash, int flags, struct thread *td, struct vnode **vpp, vfs_hash_cmp_t *fn, void *arg);
-void vfs_hash_rehash(struct vnode *vp, u_int hash);
-void vfs_hash_remove(struct vnode *vp);
-
-int vfs_kqfilter(struct vop_kqfilter_args *);
-void vfs_mark_atime(struct vnode *vp, struct ucred *cred);
-struct dirent;
-int vfs_read_dirent(struct vop_readdir_args *ap, struct dirent *dp, off_t off);
-
-int vfs_unixify_accmode(accmode_t *accmode);
-
-void vfs_unp_reclaim(struct vnode *vp);
-
-int setfmode(struct thread *td, struct ucred *cred, struct vnode *vp, int mode);
-int setfown(struct thread *td, struct ucred *cred, struct vnode *vp, uid_t uid,
-    gid_t gid);
-int vn_chmod(struct file *fp, mode_t mode, struct ucred *active_cred,
-    struct thread *td);
-int vn_chown(struct file *fp, uid_t uid, gid_t gid, struct ucred *active_cred,
-    struct thread *td);
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_VNODE_H_ */
diff --git a/include.new/sys/vtoc.h b/include.new/sys/vtoc.h
deleted file mode 100644
index d7de2e3..0000000
--- a/include.new/sys/vtoc.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 2008 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/vtoc.h 236023 2012-05-25 20:33:34Z marcel $
- */
-
-#ifndef _SYS_VTOC_H_
-#define	_SYS_VTOC_H_
-
-#define	VTOC_TAG_UNASSIGNED	0x00
-#define	VTOC_TAG_BOOT		0x01
-#define	VTOC_TAG_ROOT		0x02
-#define	VTOC_TAG_SWAP		0x03
-#define	VTOC_TAG_USR		0x04
-#define	VTOC_TAG_BACKUP		0x05	/* "c" partition */
-#define	VTOC_TAG_STAND		0x06
-#define	VTOC_TAG_VAR		0x07
-#define	VTOC_TAG_HOME		0x08
-#define	VTOC_TAG_ALTSCTR	0x09	/* alternate sector partition */
-#define	VTOC_TAG_CACHE		0x0a	/* Solaris cachefs partition */
-#define	VTOC_TAG_VXVM_PUB	0x0e	/* VxVM public region */
-#define	VTOC_TAG_VXVM_PRIV	0x0f	/* VxVM private region */
-
-/* NetBSD/mips defines this */
-#define	VTOC_TAG_NETBSD_FFS	0xff
-
-/* FreeBSD tags: the high byte equals ELFOSABI_FREEBSD */
-#define	VTOC_TAG_FREEBSD_SWAP	0x0901
-#define	VTOC_TAG_FREEBSD_UFS	0x0902
-#define	VTOC_TAG_FREEBSD_VINUM	0x0903
-#define	VTOC_TAG_FREEBSD_ZFS	0x0904
-#define	VTOC_TAG_FREEBSD_NANDFS	0x0905
-
-#define	VTOC_FLAG_UNMNT		0x01	/* unmountable partition */
-#define	VTOC_FLAG_RDONLY	0x10    /* partition is read/only */
-
-#define	VTOC_ASCII_LEN	128
-#define	VTOC_BOOTSIZE	8192		/* 16 sectors */
-#define	VTOC_MAGIC	0xdabe
-#define	VTOC_RAW_PART	2
-#define	VTOC_SANITY	0x600ddeee
-#define	VTOC_VERSION	1
-#define	VTOC_VOLUME_LEN	8
-
-#define	VTOC8_NPARTS	8
-
-struct vtoc8 {
-	char		ascii[VTOC_ASCII_LEN];
-	uint32_t	version;
-	char		volume[VTOC_VOLUME_LEN];
-	uint16_t	nparts;
-	struct {
-		uint16_t	tag;
-		uint16_t	flag;
-	} part[VTOC8_NPARTS] __packed;
-	uint16_t	__alignment;
-	uint32_t	bootinfo[3];
-	uint32_t	sanity;
-	uint32_t	reserved[10];
-	uint32_t	timestamp[VTOC8_NPARTS];
-	uint16_t	wskip;
-	uint16_t	rskip;
-	char		padding[152];
-	uint16_t	rpm;
-	uint16_t	physcyls;
-	uint16_t	sparesecs;
-	uint16_t	spare1[2];
-	uint16_t	interleave;
-	uint16_t	ncyls;
-	uint16_t	altcyls;
-	uint16_t	nheads;
-	uint16_t	nsecs;
-	uint16_t	spare2[2];
-	struct {
-		uint32_t	cyl;
-		uint32_t	nblks;
-	} map[VTOC8_NPARTS];
-	uint16_t	magic;
-	uint16_t	cksum;
-} __packed;
-
-#ifdef CTASSERT
-CTASSERT(sizeof(struct vtoc8) == 512);
-#endif
-
-#endif /* _SYS_VTOC_H_ */
diff --git a/include.new/sys/wait.h b/include.new/sys/wait.h
deleted file mode 100644
index 9d370c3..0000000
--- a/include.new/sys/wait.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)wait.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD: releng/10.2/sys/sys/wait.h 254218 2013-08-11 14:15:01Z jilles $
- */
-
-#ifndef _SYS_WAIT_H_
-#define _SYS_WAIT_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file holds definitions relevant to the wait4 system call and the
- * alternate interfaces that use it (wait, wait3, waitpid).
- */
-
-/*
- * Macros to test the exit status returned by wait and extract the relevant
- * values.
- */
-#if __BSD_VISIBLE
-#define	WCOREFLAG	0200
-#endif
-#define	_W_INT(i)	(i)
-
-#define	_WSTATUS(x)	(_W_INT(x) & 0177)
-#define	_WSTOPPED	0177		/* _WSTATUS if process is stopped */
-#define	WIFSTOPPED(x)	(_WSTATUS(x) == _WSTOPPED)
-#define	WSTOPSIG(x)	(_W_INT(x) >> 8)
-#define	WIFSIGNALED(x)	(_WSTATUS(x) != _WSTOPPED && _WSTATUS(x) != 0 && (x) != 0x13)
-#define	WTERMSIG(x)	(_WSTATUS(x))
-#define	WIFEXITED(x)	(_WSTATUS(x) == 0)
-#define	WEXITSTATUS(x)	(_W_INT(x) >> 8)
-#define	WIFCONTINUED(x)	(x == 0x13)	/* 0x13 == SIGCONT */
-#if __BSD_VISIBLE
-#define	WCOREDUMP(x)	(_W_INT(x) & WCOREFLAG)
-
-#define	W_EXITCODE(ret, sig)	((ret) << 8 | (sig))
-#define	W_STOPCODE(sig)		((sig) << 8 | _WSTOPPED)
-#endif
-
-/*
- * Option bits for the third argument of wait4.  WNOHANG causes the
- * wait to not hang if there are no stopped or terminated processes, rather
- * returning an error indication in this case (pid==0).  WUNTRACED
- * indicates that the caller should receive status about untraced children
- * which stop due to signals.  If children are stopped and a wait without
- * this option is done, it is as though they were still running... nothing
- * about them is returned. WNOWAIT only request information about zombie,
- * leaving the proc around, available for later waits.
- */
-#define	WNOHANG		1	/* Don't hang in wait. */
-#define	WUNTRACED	2	/* Tell about stopped, untraced children. */
-#define	WSTOPPED	WUNTRACED   /* SUS compatibility */
-#define	WCONTINUED	4	/* Report a job control continued process. */
-#define	WNOWAIT		8	/* Poll only. Don't delete the proc entry. */
-#define	WEXITED		16	/* Wait for exited processes. */
-#define	WTRAPPED	32	/* Wait for a process to hit a trap or
-				   a breakpoint. */
-
-#if __BSD_VISIBLE
-#define	WLINUXCLONE 0x80000000	/* Wait for kthread spawned from linux_clone. */
-#endif
-
-#ifndef _IDTYPE_T_DECLARED
-typedef enum
-#if __BSD_VISIBLE
-	idtype		/* pollutes XPG4.2 namespace */
-#endif
-		{
-	/*
-	 * These names were mostly lifted from Solaris source code and
-	 * still use Solaris style naming to avoid breaking any
-	 * OpenSolaris code which has been ported to FreeBSD.  There
-	 * is no clear FreeBSD counterpart for all of the names, but
-	 * some have a clear correspondence to FreeBSD entities.
-	 *
-	 * The numerical values are kept synchronized with the Solaris
-	 * values.
-	 */
-	P_PID,			/* A process identifier. */
-	P_PPID,			/* A parent process identifier.	*/
-	P_PGID,			/* A process group identifier. */
-	P_SID,			/* A session identifier. */
-	P_CID,			/* A scheduling class identifier. */
-	P_UID,			/* A user identifier. */
-	P_GID,			/* A group identifier. */
-	P_ALL,			/* All processes. */
-	P_LWPID,		/* An LWP identifier. */
-	P_TASKID,		/* A task identifier. */
-	P_PROJID,		/* A project identifier. */
-	P_POOLID,		/* A pool identifier. */
-	P_JAILID,		/* A zone identifier. */
-	P_CTID,			/* A (process) contract identifier. */
-	P_CPUID,		/* CPU identifier. */
-	P_PSETID		/* Processor set identifier. */
-} idtype_t;			/* The type of id_t we are using. */
-
-#if __BSD_VISIBLE
-#define	P_ZONEID	P_JAILID
-#endif
-#define	_IDTYPE_T_DECLARED
-#endif
-
-/*
- * Tokens for special values of the "pid" parameter to wait4.
- * Extended struct __wrusage to collect rusage for both the target
- * process and its children within one wait6() call.
- */
-#if __BSD_VISIBLE
-#define	WAIT_ANY	(-1)	/* any process */
-#define	WAIT_MYPGRP	0	/* any process in my process group */
-#endif /* __BSD_VISIBLE */
-
-#ifndef _KERNEL
-#include <sys/types.h>
-
-__BEGIN_DECLS
-struct __siginfo;
-pid_t	wait(int *);
-pid_t	waitpid(pid_t, int *, int);
-#if __POSIX_VISIBLE >= 200112
-int	waitid(idtype_t, id_t, struct __siginfo *, int);
-#endif
-#if __BSD_VISIBLE
-struct rusage;
-struct __wrusage;
-pid_t	wait3(int *, int, struct rusage *);
-pid_t	wait4(pid_t, int *, int, struct rusage *);
-pid_t	wait6(idtype_t, id_t, int *, int, struct __wrusage *,
-	    struct __siginfo *);
-#endif
-__END_DECLS
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_WAIT_H_ */
diff --git a/include.new/sys/watchdog.h b/include.new/sys/watchdog.h
deleted file mode 100644
index 9321817..0000000
--- a/include.new/sys/watchdog.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 2003 Poul-Henning Kamp
- * Copyright (c) 2013 iXsystems.com,
- *                    author: Alfred Perlstein <alfred@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.
- *
- * 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: releng/10.2/sys/sys/watchdog.h 247405 2013-02-27 19:03:31Z alfred $
- */
-#ifndef _SYS_WATCHDOG_H
-#define	_SYS_WATCHDOG_H
-
-#include <sys/ioccom.h>
-
-#define	_PATH_WATCHDOG	"fido"
-
-#define WDIOCPATPAT	_IOW('W', 42, u_int)	/* pat the watchdog */
-#define WDIOC_SETTIMEOUT    _IOW('W', 43, int)	/* set/reset the timer */
-#define WDIOC_GETTIMEOUT    _IOR('W', 44, int)	/* get total timeout */
-#define WDIOC_GETTIMELEFT   _IOR('W', 45, int)	/* get time left */
-#define WDIOC_GETPRETIMEOUT _IOR('W', 46, int)	/* get the pre-timeout */
-#define WDIOC_SETPRETIMEOUT _IOW('W', 47, int)	/* set the pre-timeout */
-/* set the action when a pre-timeout occurs see: WD_SOFT_* */
-#define WDIOC_SETPRETIMEOUTACT _IOW('W', 48, int)
-
-/* use software watchdog instead of hardware */
-#define WDIOC_SETSOFT	_IOW('W', 49, int)
-#define WDIOC_SETSOFTTIMEOUTACT	_IOW('W', 50, int)
-
-#define WD_ACTIVE	0x8000000
-	/* 
-	 * Watchdog reset, timeout set to value in WD_INTERVAL field.
-	 * The kernel will arm the watchdog and unless the userland
-	 * program calls WDIOCPATPAT again before the timer expires
-	 * the system will reinitialize.
-	 */
-
-#define WD_PASSIVE	0x0400000
-	/*
-	 * Set the watchdog in passive mode.
-	 * The kernel will chose an appropriate timeout duration and
-	 * periodically reset the timer provided everything looks all
-	 * right to the kernel.
- 	 */
-
-#define WD_LASTVAL	0x0200000
-	/*
-	 * Use the already last used timeout value.
-	 * The kernel will use as timeout the last valid timeout provided.
- 	 */
-
-#define WD_INTERVAL	0x00000ff
-	/*
-	 * Mask for duration bits.
-	 * The watchdog will have a nominal patience of 2^N * nanoseconds.
-	 * Example:  N == 30 gives a patience of 2^30 nanoseconds ~= 1 second.
-	 * NB: Expect variance in the +/- 10-20% range.
-	 */
-
-/* Handy macros for humans not used to power of two nanoseconds */
-#define WD_TO_NEVER	0
-#define WD_TO_1MS	20
-#define WD_TO_125MS	27
-#define WD_TO_250MS	28
-#define WD_TO_500MS	29
-#define WD_TO_1SEC	30
-#define WD_TO_2SEC	31
-#define WD_TO_4SEC	32
-#define WD_TO_8SEC	33
-#define WD_TO_16SEC	34
-#define WD_TO_32SEC	35
-#define WD_TO_64SEC	36
-#define WD_TO_128SEC	37
-
-/* action on pre-timeout trigger */
-#define	WD_SOFT_PANIC	0x01	/* panic */
-#define	WD_SOFT_DDB	0x02	/* enter debugger */
-#define	WD_SOFT_LOG	0x04	/* log(9) */
-#define	WD_SOFT_PRINTF	0x08	/* printf(9) */
-#define WD_SOFT_MASK	0x0f	/* all of the above */
-
-#ifdef _KERNEL
-
-#include <sys/eventhandler.h>
-
-typedef void (*watchdog_fn)(void *, u_int, int *);
-
-EVENTHANDLER_DECLARE(watchdog_list, watchdog_fn);
-
-u_int	wdog_kern_last_timeout(void);
-int	wdog_kern_pat(u_int utim);
-#endif
-
-#endif /* _SYS_WATCHDOG_H */
diff --git a/include.new/sys/xrpuio.h b/include.new/sys/xrpuio.h
deleted file mode 100644
index b467f9c..0000000
--- a/include.new/sys/xrpuio.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD: src/sys/sys/xrpuio.h,v 1.3 2005/01/07 02:29:24 imp Exp $
- *
- */
-
-#ifndef _SYS_XRPUIO_H_
-#define _SYS_XRPUIO_H_
-
-#include <sys/ioccom.h>
-
-#define XRPU_MAX_PPS	16
-struct xrpu_timecounting {
-
-	/* The timecounter itself */
-	u_int		xt_addr_trigger;
-	u_int		xt_addr_latch;
-	unsigned	xt_mask;
-	uint32_t	xt_frequency;
-	char		xt_name[16];
-
-	/* The PPS latches */
-	struct {
-		u_int	xt_addr_assert;
-		u_int	xt_addr_clear;
-	} xt_pps[XRPU_MAX_PPS];
-};
-
-#define XRPU_IOC_TIMECOUNTING _IOW('6', 1, struct xrpu_timecounting)
-
-#endif /* _SYS_XRPUIO_H_ */
diff --git a/include.new/sysexits.h b/include.new/sysexits.h
deleted file mode 100644
index 7cb16f1..0000000
--- a/include.new/sysexits.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 1987, 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. 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.
- *
- *	@(#)sysexits.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: releng/10.2/include/sysexits.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef	_SYSEXITS_H_
-#define	_SYSEXITS_H_
-
-/*
- *  SYSEXITS.H -- Exit status codes for system programs.
- *
- *	This include file attempts to categorize possible error
- *	exit statuses for system programs, notably delivermail
- *	and the Berkeley network.
- *
- *	Error numbers begin at EX__BASE to reduce the possibility of
- *	clashing with other exit statuses that random programs may
- *	already return.  The meaning of the codes is approximately
- *	as follows:
- *
- *	EX_USAGE -- The command was used incorrectly, e.g., with
- *		the wrong number of arguments, a bad flag, a bad
- *		syntax in a parameter, or whatever.
- *	EX_DATAERR -- The input data was incorrect in some way.
- *		This should only be used for user's data & not
- *		system files.
- *	EX_NOINPUT -- An input file (not a system file) did not
- *		exist or was not readable.  This could also include
- *		errors like "No message" to a mailer (if it cared
- *		to catch it).
- *	EX_NOUSER -- The user specified did not exist.  This might
- *		be used for mail addresses or remote logins.
- *	EX_NOHOST -- The host specified did not exist.  This is used
- *		in mail addresses or network requests.
- *	EX_UNAVAILABLE -- A service is unavailable.  This can occur
- *		if a support program or file does not exist.  This
- *		can also be used as a catchall message when something
- *		you wanted to do doesn't work, but you don't know
- *		why.
- *	EX_SOFTWARE -- An internal software error has been detected.
- *		This should be limited to non-operating system related
- *		errors as possible.
- *	EX_OSERR -- An operating system error has been detected.
- *		This is intended to be used for such things as "cannot
- *		fork", "cannot create pipe", or the like.  It includes
- *		things like getuid returning a user that does not
- *		exist in the passwd file.
- *	EX_OSFILE -- Some system file (e.g., /etc/passwd, /etc/utmp,
- *		etc.) does not exist, cannot be opened, or has some
- *		sort of error (e.g., syntax error).
- *	EX_CANTCREAT -- A (user specified) output file cannot be
- *		created.
- *	EX_IOERR -- An error occurred while doing I/O on some file.
- *	EX_TEMPFAIL -- temporary failure, indicating something that
- *		is not really an error.  In sendmail, this means
- *		that a mailer (e.g.) could not create a connection,
- *		and the request should be reattempted later.
- *	EX_PROTOCOL -- the remote system returned something that
- *		was "not possible" during a protocol exchange.
- *	EX_NOPERM -- You did not have sufficient permission to
- *		perform the operation.  This is not intended for
- *		file system problems, which should use NOINPUT or
- *		CANTCREAT, but rather for higher level permissions.
- */
-
-#define EX_OK		0	/* successful termination */
-
-#define EX__BASE	64	/* base value for error messages */
-
-#define EX_USAGE	64	/* command line usage error */
-#define EX_DATAERR	65	/* data format error */
-#define EX_NOINPUT	66	/* cannot open input */
-#define EX_NOUSER	67	/* addressee unknown */
-#define EX_NOHOST	68	/* host name unknown */
-#define EX_UNAVAILABLE	69	/* service unavailable */
-#define EX_SOFTWARE	70	/* internal software error */
-#define EX_OSERR	71	/* system error (e.g., can't fork) */
-#define EX_OSFILE	72	/* critical OS file missing */
-#define EX_CANTCREAT	73	/* can't create (user) output file */
-#define EX_IOERR	74	/* input/output error */
-#define EX_TEMPFAIL	75	/* temp failure; user is invited to retry */
-#define EX_PROTOCOL	76	/* remote error in protocol */
-#define EX_NOPERM	77	/* permission denied */
-#define EX_CONFIG	78	/* configuration error */
-
-#define EX__MAX	78	/* maximum listed value */
-
-#endif /* !_SYSEXITS_H_ */
diff --git a/include.new/syslog.h b/include.new/syslog.h
deleted file mode 100644
index 5b97fad..0000000
--- a/include.new/syslog.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 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.
- * 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.
- *
- *	@(#)syslog.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/sys/sys/syslog.h 249311 2013-04-09 16:16:34Z ed $
- */
-
-#ifndef _SYS_SYSLOG_H_
-#define _SYS_SYSLOG_H_
-
-#define	_PATH_LOG	"/var/run/log"
-#define	_PATH_LOG_PRIV	"/var/run/logpriv"
-#define	_PATH_OLDLOG	"/dev/log"	/* backward compatibility */
-
-/*
- * priorities/facilities are encoded into a single 32-bit quantity, where the
- * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility
- * (0-big number).  Both the priorities and the facilities map roughly
- * one-to-one to strings in the syslogd(8) source code.  This mapping is
- * included in this file.
- *
- * priorities (these are ordered)
- */
-#define	LOG_EMERG	0	/* system is unusable */
-#define	LOG_ALERT	1	/* action must be taken immediately */
-#define	LOG_CRIT	2	/* critical conditions */
-#define	LOG_ERR		3	/* error conditions */
-#define	LOG_WARNING	4	/* warning conditions */
-#define	LOG_NOTICE	5	/* normal but significant condition */
-#define	LOG_INFO	6	/* informational */
-#define	LOG_DEBUG	7	/* debug-level messages */
-
-#define	LOG_PRIMASK	0x07	/* mask to extract priority part (internal) */
-				/* extract priority */
-#define	LOG_PRI(p)	((p) & LOG_PRIMASK)
-#define	LOG_MAKEPRI(fac, pri)	((fac) | (pri))
-
-#ifdef SYSLOG_NAMES
-#define	INTERNAL_NOPRI	0x10	/* the "no priority" priority */
-				/* mark "facility" */
-#define	INTERNAL_MARK	LOG_MAKEPRI((LOG_NFACILITIES<<3), 0)
-typedef struct _code {
-	const char	*c_name;
-	int		c_val;
-} CODE;
-
-static const CODE prioritynames[] = {
-	{ "alert",	LOG_ALERT,	},
-	{ "crit",	LOG_CRIT,	},
-	{ "debug",	LOG_DEBUG,	},
-	{ "emerg",	LOG_EMERG,	},
-	{ "err",	LOG_ERR,	},
-	{ "error",	LOG_ERR,	},	/* DEPRECATED */
-	{ "info",	LOG_INFO,	},
-	{ "none",	INTERNAL_NOPRI,	},	/* INTERNAL */
-	{ "notice",	LOG_NOTICE,	},
-	{ "panic", 	LOG_EMERG,	},	/* DEPRECATED */
-	{ "warn",	LOG_WARNING,	},	/* DEPRECATED */
-	{ "warning",	LOG_WARNING,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-/* facility codes */
-#define	LOG_KERN	(0<<3)	/* kernel messages */
-#define	LOG_USER	(1<<3)	/* random user-level messages */
-#define	LOG_MAIL	(2<<3)	/* mail system */
-#define	LOG_DAEMON	(3<<3)	/* system daemons */
-#define	LOG_AUTH	(4<<3)	/* authorization messages */
-#define	LOG_SYSLOG	(5<<3)	/* messages generated internally by syslogd */
-#define	LOG_LPR		(6<<3)	/* line printer subsystem */
-#define	LOG_NEWS	(7<<3)	/* network news subsystem */
-#define	LOG_UUCP	(8<<3)	/* UUCP subsystem */
-#define	LOG_CRON	(9<<3)	/* clock daemon */
-#define	LOG_AUTHPRIV	(10<<3)	/* authorization messages (private) */
-				/* Facility #10 clashes in DEC UNIX, where */
-				/* it's defined as LOG_MEGASAFE for AdvFS  */
-				/* event logging.                          */
-#define	LOG_FTP		(11<<3)	/* ftp daemon */
-#define	LOG_NTP		(12<<3)	/* NTP subsystem */
-#define	LOG_SECURITY	(13<<3) /* security subsystems (firewalling, etc.) */
-#define	LOG_CONSOLE	(14<<3) /* /dev/console output */
-
-	/* other codes through 15 reserved for system use */
-#define	LOG_LOCAL0	(16<<3)	/* reserved for local use */
-#define	LOG_LOCAL1	(17<<3)	/* reserved for local use */
-#define	LOG_LOCAL2	(18<<3)	/* reserved for local use */
-#define	LOG_LOCAL3	(19<<3)	/* reserved for local use */
-#define	LOG_LOCAL4	(20<<3)	/* reserved for local use */
-#define	LOG_LOCAL5	(21<<3)	/* reserved for local use */
-#define	LOG_LOCAL6	(22<<3)	/* reserved for local use */
-#define	LOG_LOCAL7	(23<<3)	/* reserved for local use */
-
-#define	LOG_NFACILITIES	24	/* current number of facilities */
-#define	LOG_FACMASK	0x03f8	/* mask to extract facility part */
-				/* facility of pri */
-#define	LOG_FAC(p)	(((p) & LOG_FACMASK) >> 3)
-
-#ifdef SYSLOG_NAMES
-static const CODE facilitynames[] = {
-	{ "auth",	LOG_AUTH,	},
-	{ "authpriv",	LOG_AUTHPRIV,	},
-	{ "console", 	LOG_CONSOLE,	},
-	{ "cron", 	LOG_CRON,	},
-	{ "daemon",	LOG_DAEMON,	},
-	{ "ftp",	LOG_FTP,	},
-	{ "kern",	LOG_KERN,	},
-	{ "lpr",	LOG_LPR,	},
-	{ "mail",	LOG_MAIL,	},
-	{ "mark", 	INTERNAL_MARK,	},	/* INTERNAL */
-	{ "news",	LOG_NEWS,	},
-	{ "ntp",	LOG_NTP,	},
-	{ "security",	LOG_SECURITY,	},
-	{ "syslog",	LOG_SYSLOG,	},
-	{ "user",	LOG_USER,	},
-	{ "uucp",	LOG_UUCP,	},
-	{ "local0",	LOG_LOCAL0,	},
-	{ "local1",	LOG_LOCAL1,	},
-	{ "local2",	LOG_LOCAL2,	},
-	{ "local3",	LOG_LOCAL3,	},
-	{ "local4",	LOG_LOCAL4,	},
-	{ "local5",	LOG_LOCAL5,	},
-	{ "local6",	LOG_LOCAL6,	},
-	{ "local7",	LOG_LOCAL7,	},
-	{ NULL,		-1,		}
-};
-#endif
-
-#ifdef _KERNEL
-#define	LOG_PRINTF	-1	/* pseudo-priority to indicate use of printf */
-#endif
-
-/*
- * arguments to setlogmask.
- */
-#define	LOG_MASK(pri)	(1 << (pri))		/* mask for one priority */
-#define	LOG_UPTO(pri)	((1 << ((pri)+1)) - 1)	/* all priorities through pri */
-
-/*
- * Option flags for openlog.
- *
- * LOG_ODELAY no longer does anything.
- * LOG_NDELAY is the inverse of what it used to be.
- */
-#define	LOG_PID		0x01	/* log the pid with each message */
-#define	LOG_CONS	0x02	/* log on the console if errors in sending */
-#define	LOG_ODELAY	0x04	/* delay open until first syslog() (default) */
-#define	LOG_NDELAY	0x08	/* don't delay open */
-#define	LOG_NOWAIT	0x10	/* don't wait for console forks: DEPRECATED */
-#define	LOG_PERROR	0x20	/* log to stderr as well */
-
-#ifdef _KERNEL
-
-#else /* not _KERNEL */
-
-/*
- * Don't use va_list in the vsyslog() prototype.   Va_list is typedef'd in two
- * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
- * of them here we may collide with the utility's includes.  It's unreasonable
- * for utilities to have to include one of them to include syslog.h, so we get
- * __va_list from <sys/_types.h> and use it.
- */
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-__BEGIN_DECLS
-void	closelog(void);
-void	openlog(const char *, int, int);
-int	setlogmask(int);
-void	syslog(int, const char *, ...) __printflike(2, 3);
-#if __BSD_VISIBLE
-void	vsyslog(int, const char *, __va_list) __printflike(2, 0);
-#endif
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif
diff --git a/include.new/taclib.h b/include.new/taclib.h
deleted file mode 100644
index 2ba9910..0000000
--- a/include.new/taclib.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * Copyright (c) 1998, 2001, Juniper Networks, Inc.
- * 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.
- *
- * 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: releng/10.2/lib/libtacplus/taclib.h 200399 2009-12-11 07:53:44Z syrinx $
- */
-
-#ifndef _TACLIB_H_
-#define _TACLIB_H_
-
-#include <sys/types.h>
-
-struct tac_handle;
-
-/* Flags for tac_add_server(). */
-#define TAC_SRVR_SINGLE_CONNECT	0x04	/* Keep connection open for multiple
-					   sessions. */
-
-/* Disassembly of tac_send_authen() return value. */
-#define	TAC_AUTHEN_STATUS(s)	((s) & 0xff)
-#define TAC_AUTHEN_NOECHO(s)	((s) & (1<<8))
-
-/* Disassembly of tac_send_author() return value. */
-#define	TAC_AUTHOR_STATUS(s)	((s) & 0xff)
-#define TAC_AUTHEN_AV_COUNT(s)	(((s)>>8) & 0xff)
-
-/* Privilege levels */
-#define TAC_PRIV_LVL_MIN	0x00
-#define TAC_PRIV_LVL_USER	0x01
-#define TAC_PRIV_LVL_ROOT	0x0f
-#define TAC_PRIV_LVL_MAX	0x0f
-
-/* Authentication actions */
-#define TAC_AUTHEN_LOGIN	0x01
-#define TAC_AUTHEN_CHPASS	0x02
-#define TAC_AUTHEN_SENDPASS	0x03
-#define TAC_AUTHEN_SENDAUTH	0x04
-
-/* Authentication types */
-#define TAC_AUTHEN_TYPE_ASCII	0x01
-#define TAC_AUTHEN_TYPE_PAP	0x02
-#define TAC_AUTHEN_TYPE_CHAP	0x03
-#define TAC_AUTHEN_TYPE_ARAP	0x04
-#define TAC_AUTHEN_TYPE_MSCHAP	0x05
-
-/* Authentication services */
-#define TAC_AUTHEN_SVC_NONE	0x00
-#define TAC_AUTHEN_SVC_LOGIN	0x01
-#define TAC_AUTHEN_SVC_ENABLE	0x02
-#define TAC_AUTHEN_SVC_PPP	0x03
-#define TAC_AUTHEN_SVC_ARAP	0x04
-#define TAC_AUTHEN_SVC_PT	0x05
-#define TAC_AUTHEN_SVC_RCMD	0x06
-#define TAC_AUTHEN_SVC_X25	0x07
-#define TAC_AUTHEN_SVC_NASI	0x08
-#define TAC_AUTHEN_SVC_FWPROXY	0x09
-
-/* Authentication reply status codes */
-#define TAC_AUTHEN_STATUS_PASS		0x01
-#define TAC_AUTHEN_STATUS_FAIL		0x02
-#define TAC_AUTHEN_STATUS_GETDATA	0x03
-#define TAC_AUTHEN_STATUS_GETUSER	0x04
-#define TAC_AUTHEN_STATUS_GETPASS	0x05
-#define TAC_AUTHEN_STATUS_RESTART	0x06
-#define TAC_AUTHEN_STATUS_ERROR		0x07
-#define TAC_AUTHEN_STATUS_FOLLOW	0x21
-
-/* Authorization authenticatication methods */
-#define TAC_AUTHEN_METH_NOT_SET         0x00
-#define TAC_AUTHEN_METH_NONE            0x01
-#define TAC_AUTHEN_METH_KRB5            0x02
-#define TAC_AUTHEN_METH_LINE            0x03
-#define TAC_AUTHEN_METH_ENABLE          0x04
-#define TAC_AUTHEN_METH_LOCAL           0x05
-#define TAC_AUTHEN_METH_TACACSPLUS      0x06
-#define TAC_AUTHEN_METH_RCMD            0x20
-/* If adding more, see comments in protocol_version() in taclib.c */
-
-/* Authorization status */
-#define TAC_AUTHOR_STATUS_PASS_ADD      0x01
-#define TAC_AUTHOR_STATUS_PASS_REPL     0x02
-#define TAC_AUTHOR_STATUS_FAIL          0x10
-#define TAC_AUTHOR_STATUS_ERROR         0x11
-
-/* Accounting actions */
-#define TAC_ACCT_MORE			0x1
-#define TAC_ACCT_START			0x2
-#define TAC_ACCT_STOP			0x4
-#define TAC_ACCT_WATCHDOG		0x8
-
-/* Accounting status */
-#define TAC_ACCT_STATUS_SUCCESS		0x1
-#define TAC_ACCT_STATUS_ERROR		0x2
-#define TAC_ACCT_STATUS_FOLLOW		0x21
-
-__BEGIN_DECLS
-int			 tac_add_server(struct tac_handle *,
-			    const char *, int, const char *, int, int);
-void			 tac_close(struct tac_handle *);
-int			 tac_config(struct tac_handle *, const char *);
-int			 tac_create_authen(struct tac_handle *, int, int, int);
-void			*tac_get_data(struct tac_handle *, size_t *);
-char			*tac_get_msg(struct tac_handle *);
-struct tac_handle	*tac_open(void);
-int			 tac_send_authen(struct tac_handle *);
-int			 tac_set_data(struct tac_handle *,
-			    const void *, size_t);
-int			 tac_set_msg(struct tac_handle *, const char *);
-int			 tac_set_port(struct tac_handle *, const char *);
-int			 tac_set_priv(struct tac_handle *, int);
-int			 tac_set_rem_addr(struct tac_handle *, const char *);
-int			 tac_set_user(struct tac_handle *, const char *);
-const char		*tac_strerror(struct tac_handle *);
-int			 tac_send_author(struct tac_handle *);
-int			 tac_create_author(struct tac_handle *, int, int, int);
-int			 tac_set_av(struct tac_handle *, u_int, const char *);
-char			*tac_get_av(struct tac_handle *, u_int);
-char			*tac_get_av_value(struct tac_handle *, const char *);
-void			 tac_clear_avs(struct tac_handle *);
-int			 tac_create_acct(struct tac_handle *, int, int, int, int);
-int			 tac_send_acct(struct tac_handle *);
-__END_DECLS
-
-#endif /* _TACLIB_H_ */
diff --git a/include.new/tar.h b/include.new/tar.h
deleted file mode 100644
index 43a6ba4..0000000
--- a/include.new/tar.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chuck Karish of Mindcraft, Inc.
- *
- * 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. 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.
- *
- *	@(#)tar.h	8.2 (Berkeley) 1/4/94
- *
- * $FreeBSD: releng/10.2/include/tar.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _TAR_H
-#define _TAR_H
-
-#define	TMAGIC		"ustar"	/* ustar and a null */
-#define	TMAGLEN		6
-#define	TVERSION	"00"	/* 00 and no null */
-#define	TVERSLEN	2
-
-/* Values used in typeflag field */
-#define	REGTYPE		'0'	/* Regular file */
-#define	AREGTYPE	'\0'	/* Regular file */
-#define	LNKTYPE		'1'	/* Link */
-#define	SYMTYPE		'2'	/* Reserved */
-#define	CHRTYPE		'3'	/* Character special */
-#define	BLKTYPE		'4'	/* Block special */
-#define	DIRTYPE		'5'	/* Directory */
-#define	FIFOTYPE	'6'	/* FIFO special */
-#define	CONTTYPE	'7'	/* Reserved */
-
-/* Bits used in the mode field - values in octal */
-#define	TSUID		04000	/* Set UID on execution */
-#define	TSGID		02000	/* Set GID on execution */
-#define	TSVTX		01000	/* Reserved */
-				/* File permissions */
-#define	TUREAD		00400	/* Read by owner */
-#define	TUWRITE		00200	/* Write by owner */
-#define	TUEXEC		00100	/* Execute/Search by owner */
-#define	TGREAD		00040	/* Read by group */
-#define	TGWRITE		00020	/* Write by group */
-#define	TGEXEC		00010	/* Execute/Search by group */
-#define	TOREAD		00004	/* Read by other */
-#define	TOWRITE		00002	/* Write by other */
-#define	TOEXEC		00001	/* Execute/Search by other */
-
-#endif
diff --git a/include.new/tcpd.h b/include.new/tcpd.h
deleted file mode 100644
index fa9a0a9..0000000
--- a/include.new/tcpd.h
+++ /dev/null
@@ -1,226 +0,0 @@
- /*
-  * @(#) tcpd.h 1.5 96/03/19 16:22:24
-  * 
-  * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
-  *
-  * $FreeBSD: releng/10.2/contrib/tcp_wrappers/tcpd.h 277281 2015-01-17 01:20:28Z pfg $
-  */
-
-/* Structure to describe one communications endpoint. */
-
-#define	STRING_LENGTH	128		/* hosts, users, processes */
-
-struct host_info {
-    char    name[STRING_LENGTH];	/* access via eval_hostname(host) */
-    char    addr[STRING_LENGTH];	/* access via eval_hostaddr(host) */
-#ifdef INET6
-    struct sockaddr *sin;		/* socket address or 0 */
-#else
-    struct sockaddr_in *sin;		/* socket address or 0 */
-#endif
-    struct t_unitdata *unit;		/* TLI transport address or 0 */
-    struct request_info *request;	/* for shared information */
-};
-
-/* Structure to describe what we know about a service request. */
-
-struct request_info {
-    int     fd;				/* socket handle */
-    char    user[STRING_LENGTH];	/* access via eval_user(request) */
-    char    daemon[STRING_LENGTH];	/* access via eval_daemon(request) */
-    char    pid[10];			/* access via eval_pid(request) */
-    struct host_info client[1];		/* client endpoint info */
-    struct host_info server[1];		/* server endpoint info */
-    void  (*sink) (int);		/* datagram sink function or 0 */
-    void  (*hostname) (struct host_info *); /* address to printable hostname */
-    void  (*hostaddr) (struct host_info *); /* address to printable address */
-    void  (*cleanup) (struct request_info *); /* cleanup function or 0 */
-    struct netconfig *config;		/* netdir handle */
-};
-
-/* Common string operations. Less clutter should be more readable. */
-
-#define	STRN_CPY(d,s,l)	{ strncpy((d),(s),(l)); (d)[(l)-1] = 0; }
-
-#define	STRN_EQ(x,y,l)	(strncasecmp((x),(y),(l)) == 0)
-#define	STRN_NE(x,y,l)	(strncasecmp((x),(y),(l)) != 0)
-#define	STR_EQ(x,y)	(strcasecmp((x),(y)) == 0)
-#define	STR_NE(x,y)	(strcasecmp((x),(y)) != 0)
-
- /*
-  * Initially, all above strings have the empty value. Information that
-  * cannot be determined at runtime is set to "unknown", so that we can
-  * distinguish between `unavailable' and `not yet looked up'. A hostname
-  * that we do not believe in is set to "paranoid".
-  */
-
-#define	STRING_UNKNOWN	"unknown"	/* lookup failed */
-#define	STRING_PARANOID	"paranoid"	/* hostname conflict */
-
-extern char unknown[];
-extern char paranoid[];
-
-#define	HOSTNAME_KNOWN(s) (STR_NE((s),unknown) && STR_NE((s),paranoid))
-
-#define	NOT_INADDR(s) (s[strspn(s,"01234567890./")] != 0)
-
-/* Global functions. */
-
-#if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
-extern void fromhost();			/* get/validate client host info */
-#else
-#define	fromhost sock_host		/* no TLI support needed */
-#endif
-
-extern int hosts_access();		/* access control */
-extern int hosts_ctl();			/* wrapper around request_init() */
-extern void shell_cmd();		/* execute shell command */
-extern char *percent_x();		/* do %<char> expansion */
-extern void rfc931();			/* client name from RFC 931 daemon */
-extern void clean_exit();		/* clean up and exit */
-extern void refuse();			/* clean up and exit */
-extern char *xgets();			/* fgets() on steroids */
-extern char *split_at();		/* strchr() and split */
-extern unsigned long dot_quad_addr();	/* restricted inet_addr() */
-
-/* Global variables. */
-
-extern int allow_severity;		/* for connection logging */
-extern int deny_severity;		/* for connection logging */
-extern char *hosts_allow_table;		/* for verification mode redirection */
-extern char *hosts_deny_table;		/* for verification mode redirection */
-extern int hosts_access_verbose;	/* for verbose matching mode */
-extern int rfc931_timeout;		/* user lookup timeout */
-extern int resident;			/* > 0 if resident process */
-
- /*
-  * Routines for controlled initialization and update of request structure
-  * attributes. Each attribute has its own key.
-  */
-
-#ifdef __STDC__
-extern struct request_info *request_init(struct request_info *,...);
-extern struct request_info *request_set(struct request_info *,...);
-#else
-extern struct request_info *request_init();	/* initialize request */
-extern struct request_info *request_set();	/* update request structure */
-#endif
-
-#define	RQ_FILE		1		/* file descriptor */
-#define	RQ_DAEMON	2		/* server process (argv[0]) */
-#define	RQ_USER		3		/* client user name */
-#define	RQ_CLIENT_NAME	4		/* client host name */
-#define	RQ_CLIENT_ADDR	5		/* client host address */
-#define	RQ_CLIENT_SIN	6		/* client endpoint (internal) */
-#define	RQ_SERVER_NAME	7		/* server host name */
-#define	RQ_SERVER_ADDR	8		/* server host address */
-#define	RQ_SERVER_SIN	9		/* server endpoint (internal) */
-
- /*
-  * Routines for delayed evaluation of request attributes. Each attribute
-  * type has its own access method. The trivial ones are implemented by
-  * macros. The other ones are wrappers around the transport-specific host
-  * name, address, and client user lookup methods. The request_info and
-  * host_info structures serve as caches for the lookup results.
-  */
-
-extern char *eval_user();		/* client user */
-extern char *eval_hostname();		/* printable hostname */
-extern char *eval_hostaddr();		/* printable host address */
-extern char *eval_hostinfo();		/* host name or address */
-extern char *eval_client();		/* whatever is available */
-extern char *eval_server();		/* whatever is available */
-#define	eval_daemon(r)	((r)->daemon)	/* daemon process name */
-#define	eval_pid(r)	((r)->pid)	/* process id */
-
-/* Socket-specific methods, including DNS hostname lookups. */
-
-extern void sock_host();		/* look up endpoint addresses */
-extern void sock_hostname();		/* translate address to hostname */
-extern void sock_hostaddr();		/* address to printable address */
-#define	sock_methods(r) \
-	{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
-
-/* The System V Transport-Level Interface (TLI) interface. */
-
-#if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
-extern void tli_host();			/* look up endpoint addresses etc. */
-#endif
-
- /*
-  * Problem reporting interface. Additional file/line context is reported
-  * when available. The jump buffer (tcpd_buf) is not declared here, or
-  * everyone would have to include <setjmp.h>.
-  */
-
-#ifdef __STDC__
-extern void tcpd_warn(char *, ...);	/* report problem and proceed */
-extern void tcpd_jump(char *, ...);	/* report problem and jump */
-#else
-extern void tcpd_warn();
-extern void tcpd_jump();
-#endif
-
-struct tcpd_context {
-    char   *file;			/* current file */
-    int     line;			/* current line */
-};
-extern struct tcpd_context tcpd_context;
-
- /*
-  * While processing access control rules, error conditions are handled by
-  * jumping back into the hosts_access() routine. This is cleaner than
-  * checking the return value of each and every silly little function. The
-  * (-1) returns are here because zero is already taken by longjmp().
-  */
-
-#define	AC_PERMIT	1		/* permit access */
-#define	AC_DENY		(-1)		/* deny_access */
-#define	AC_ERROR	AC_DENY		/* XXX */
-
- /*
-  * In verification mode an option function should just say what it would do,
-  * instead of really doing it. An option function that would not return
-  * should clear the dry_run flag to inform the caller of this unusual
-  * behavior.
-  */
-
-extern void process_options();		/* execute options */
-extern int dry_run;			/* verification flag */
-
-/* Bug workarounds. */
-
-#ifdef INET_ADDR_BUG			/* inet_addr() returns struct */
-#define	inet_addr fix_inet_addr
-extern long fix_inet_addr();
-#endif
-
-#ifdef BROKEN_FGETS			/* partial reads from sockets */
-#define	fgets fix_fgets
-extern char *fix_fgets();
-#endif
-
-#ifdef RECVFROM_BUG			/* no address family info */
-#define	recvfrom fix_recvfrom
-extern int fix_recvfrom();
-#endif
-
-#ifdef GETPEERNAME_BUG			/* claims success with UDP */
-#define	getpeername fix_getpeername
-extern int fix_getpeername();
-#endif
-
-#ifdef SOLARIS_24_GETHOSTBYNAME_BUG	/* lists addresses as aliases */
-#define	gethostbyname fix_gethostbyname
-extern struct hostent *fix_gethostbyname();
-#endif
-
-#ifdef USE_STRSEP			/* libc calls strtok() */
-#define	strtok	fix_strtok
-extern char *fix_strtok();
-#endif
-
-#ifdef LIBC_CALLS_STRTOK		/* libc calls strtok() */
-#define	strtok	my_strtok
-extern char *my_strtok();
-#endif
diff --git a/include.new/term.h b/include.new/term.h
deleted file mode 100644
index 0b71ce7..0000000
--- a/include.new/term.h
+++ /dev/null
@@ -1,792 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************/
-/* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995                */
-/*    and: Eric S. Raymond <esr@snark.thyrsus.com>                          */
-/*    and: Thomas E. Dickey                        1995-on                  */
-/****************************************************************************/
-
-/* $Id: term.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-/*
-**	term.h -- Definition of struct term
-*/
-
-#ifndef NCURSES_TERM_H_incl
-#define NCURSES_TERM_H_incl 1
-
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "5.7"
-
-#include <ncurses_dll.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Make this file self-contained by providing defaults for the HAVE_TERMIO[S]_H
- * definition (based on the system for which this was configured).
- */
-
-#undef  NCURSES_CONST
-#define NCURSES_CONST const
-
-#undef  NCURSES_SBOOL
-#define NCURSES_SBOOL char
-
-#undef  NCURSES_XNAMES
-#define NCURSES_XNAMES 1
-
-/* We will use these symbols to hide differences between
- * termios/termio/sgttyb interfaces.
- */
-#undef  TTY
-#undef  SET_TTY
-#undef  GET_TTY
-
-/* Assume POSIX termio if we have the header and function */
-/* #if HAVE_TERMIOS_H && HAVE_TCGETATTR */
-#if 1 && 1
-
-#undef  TERMIOS
-#define TERMIOS 1
-
-#include <termios.h>
-#define TTY struct termios
-
-#else /* !HAVE_TERMIOS_H */
-
-/* #if HAVE_TERMIO_H */
-#if 0
-
-#undef  TERMIOS
-#define TERMIOS 1
-
-#include <termio.h>
-#define TTY struct termio
-
-/* Add definitions to make termio look like termios.
- * But ifdef it, since there are some implementations
- * that try to do this for us in a fake <termio.h>.
- */
-#ifndef TCSANOW
-#define TCSANOW TCSETA
-#endif
-#ifndef TCSADRAIN
-#define TCSADRAIN TCSETAW
-#endif
-#ifndef TCSAFLUSH
-#define TCSAFLUSH TCSETAF
-#endif
-#ifndef tcsetattr
-#define tcsetattr(fd, cmd, arg) ioctl(fd, cmd, arg)
-#endif
-#ifndef tcgetattr
-#define tcgetattr(fd, arg) ioctl(fd, TCGETA, arg)
-#endif
-#ifndef cfgetospeed
-#define cfgetospeed(t) ((t)->c_cflag & CBAUD)
-#endif
-#ifndef TCIFLUSH 
-#define TCIFLUSH 0
-#endif
-#ifndef TCOFLUSH 
-#define TCOFLUSH 1
-#endif
-#ifndef TCIOFLUSH 
-#define TCIOFLUSH 2
-#endif
-#ifndef tcflush
-#define tcflush(fd, arg) ioctl(fd, TCFLSH, arg)
-#endif
-
-#else /* !HAVE_TERMIO_H */
-
-#undef TERMIOS
-#include <sgtty.h>
-#include <sys/ioctl.h>
-#define TTY struct sgttyb
-
-#endif /* HAVE_TERMIO_H */
-
-#endif /* HAVE_TERMIOS_H */
-
-#ifdef TERMIOS
-#define GET_TTY(fd, buf) tcgetattr(fd, buf)
-#define SET_TTY(fd, buf) tcsetattr(fd, TCSADRAIN, buf)
-#else
-#define GET_TTY(fd, buf) gtty(fd, buf)
-#define SET_TTY(fd, buf) stty(fd, buf)
-#endif
-
-#define NAMESIZE 256
-
-#define CUR cur_term->type.
-
-#define auto_left_margin               CUR Booleans[0]
-#define auto_right_margin              CUR Booleans[1]
-#define no_esc_ctlc                    CUR Booleans[2]
-#define ceol_standout_glitch           CUR Booleans[3]
-#define eat_newline_glitch             CUR Booleans[4]
-#define erase_overstrike               CUR Booleans[5]
-#define generic_type                   CUR Booleans[6]
-#define hard_copy                      CUR Booleans[7]
-#define has_meta_key                   CUR Booleans[8]
-#define has_status_line                CUR Booleans[9]
-#define insert_null_glitch             CUR Booleans[10]
-#define memory_above                   CUR Booleans[11]
-#define memory_below                   CUR Booleans[12]
-#define move_insert_mode               CUR Booleans[13]
-#define move_standout_mode             CUR Booleans[14]
-#define over_strike                    CUR Booleans[15]
-#define status_line_esc_ok             CUR Booleans[16]
-#define dest_tabs_magic_smso           CUR Booleans[17]
-#define tilde_glitch                   CUR Booleans[18]
-#define transparent_underline          CUR Booleans[19]
-#define xon_xoff                       CUR Booleans[20]
-#define needs_xon_xoff                 CUR Booleans[21]
-#define prtr_silent                    CUR Booleans[22]
-#define hard_cursor                    CUR Booleans[23]
-#define non_rev_rmcup                  CUR Booleans[24]
-#define no_pad_char                    CUR Booleans[25]
-#define non_dest_scroll_region         CUR Booleans[26]
-#define can_change                     CUR Booleans[27]
-#define back_color_erase               CUR Booleans[28]
-#define hue_lightness_saturation       CUR Booleans[29]
-#define col_addr_glitch                CUR Booleans[30]
-#define cr_cancels_micro_mode          CUR Booleans[31]
-#define has_print_wheel                CUR Booleans[32]
-#define row_addr_glitch                CUR Booleans[33]
-#define semi_auto_right_margin         CUR Booleans[34]
-#define cpi_changes_res                CUR Booleans[35]
-#define lpi_changes_res                CUR Booleans[36]
-#define columns                        CUR Numbers[0]
-#define init_tabs                      CUR Numbers[1]
-#define lines                          CUR Numbers[2]
-#define lines_of_memory                CUR Numbers[3]
-#define magic_cookie_glitch            CUR Numbers[4]
-#define padding_baud_rate              CUR Numbers[5]
-#define virtual_terminal               CUR Numbers[6]
-#define width_status_line              CUR Numbers[7]
-#define num_labels                     CUR Numbers[8]
-#define label_height                   CUR Numbers[9]
-#define label_width                    CUR Numbers[10]
-#define max_attributes                 CUR Numbers[11]
-#define maximum_windows                CUR Numbers[12]
-#define max_colors                     CUR Numbers[13]
-#define max_pairs                      CUR Numbers[14]
-#define no_color_video                 CUR Numbers[15]
-#define buffer_capacity                CUR Numbers[16]
-#define dot_vert_spacing               CUR Numbers[17]
-#define dot_horz_spacing               CUR Numbers[18]
-#define max_micro_address              CUR Numbers[19]
-#define max_micro_jump                 CUR Numbers[20]
-#define micro_col_size                 CUR Numbers[21]
-#define micro_line_size                CUR Numbers[22]
-#define number_of_pins                 CUR Numbers[23]
-#define output_res_char                CUR Numbers[24]
-#define output_res_line                CUR Numbers[25]
-#define output_res_horz_inch           CUR Numbers[26]
-#define output_res_vert_inch           CUR Numbers[27]
-#define print_rate                     CUR Numbers[28]
-#define wide_char_size                 CUR Numbers[29]
-#define buttons                        CUR Numbers[30]
-#define bit_image_entwining            CUR Numbers[31]
-#define bit_image_type                 CUR Numbers[32]
-#define back_tab                       CUR Strings[0]
-#define bell                           CUR Strings[1]
-#define carriage_return                CUR Strings[2]
-#define change_scroll_region           CUR Strings[3]
-#define clear_all_tabs                 CUR Strings[4]
-#define clear_screen                   CUR Strings[5]
-#define clr_eol                        CUR Strings[6]
-#define clr_eos                        CUR Strings[7]
-#define column_address                 CUR Strings[8]
-#define command_character              CUR Strings[9]
-#define cursor_address                 CUR Strings[10]
-#define cursor_down                    CUR Strings[11]
-#define cursor_home                    CUR Strings[12]
-#define cursor_invisible               CUR Strings[13]
-#define cursor_left                    CUR Strings[14]
-#define cursor_mem_address             CUR Strings[15]
-#define cursor_normal                  CUR Strings[16]
-#define cursor_right                   CUR Strings[17]
-#define cursor_to_ll                   CUR Strings[18]
-#define cursor_up                      CUR Strings[19]
-#define cursor_visible                 CUR Strings[20]
-#define delete_character               CUR Strings[21]
-#define delete_line                    CUR Strings[22]
-#define dis_status_line                CUR Strings[23]
-#define down_half_line                 CUR Strings[24]
-#define enter_alt_charset_mode         CUR Strings[25]
-#define enter_blink_mode               CUR Strings[26]
-#define enter_bold_mode                CUR Strings[27]
-#define enter_ca_mode                  CUR Strings[28]
-#define enter_delete_mode              CUR Strings[29]
-#define enter_dim_mode                 CUR Strings[30]
-#define enter_insert_mode              CUR Strings[31]
-#define enter_secure_mode              CUR Strings[32]
-#define enter_protected_mode           CUR Strings[33]
-#define enter_reverse_mode             CUR Strings[34]
-#define enter_standout_mode            CUR Strings[35]
-#define enter_underline_mode           CUR Strings[36]
-#define erase_chars                    CUR Strings[37]
-#define exit_alt_charset_mode          CUR Strings[38]
-#define exit_attribute_mode            CUR Strings[39]
-#define exit_ca_mode                   CUR Strings[40]
-#define exit_delete_mode               CUR Strings[41]
-#define exit_insert_mode               CUR Strings[42]
-#define exit_standout_mode             CUR Strings[43]
-#define exit_underline_mode            CUR Strings[44]
-#define flash_screen                   CUR Strings[45]
-#define form_feed                      CUR Strings[46]
-#define from_status_line               CUR Strings[47]
-#define init_1string                   CUR Strings[48]
-#define init_2string                   CUR Strings[49]
-#define init_3string                   CUR Strings[50]
-#define init_file                      CUR Strings[51]
-#define insert_character               CUR Strings[52]
-#define insert_line                    CUR Strings[53]
-#define insert_padding                 CUR Strings[54]
-#define key_backspace                  CUR Strings[55]
-#define key_catab                      CUR Strings[56]
-#define key_clear                      CUR Strings[57]
-#define key_ctab                       CUR Strings[58]
-#define key_dc                         CUR Strings[59]
-#define key_dl                         CUR Strings[60]
-#define key_down                       CUR Strings[61]
-#define key_eic                        CUR Strings[62]
-#define key_eol                        CUR Strings[63]
-#define key_eos                        CUR Strings[64]
-#define key_f0                         CUR Strings[65]
-#define key_f1                         CUR Strings[66]
-#define key_f10                        CUR Strings[67]
-#define key_f2                         CUR Strings[68]
-#define key_f3                         CUR Strings[69]
-#define key_f4                         CUR Strings[70]
-#define key_f5                         CUR Strings[71]
-#define key_f6                         CUR Strings[72]
-#define key_f7                         CUR Strings[73]
-#define key_f8                         CUR Strings[74]
-#define key_f9                         CUR Strings[75]
-#define key_home                       CUR Strings[76]
-#define key_ic                         CUR Strings[77]
-#define key_il                         CUR Strings[78]
-#define key_left                       CUR Strings[79]
-#define key_ll                         CUR Strings[80]
-#define key_npage                      CUR Strings[81]
-#define key_ppage                      CUR Strings[82]
-#define key_right                      CUR Strings[83]
-#define key_sf                         CUR Strings[84]
-#define key_sr                         CUR Strings[85]
-#define key_stab                       CUR Strings[86]
-#define key_up                         CUR Strings[87]
-#define keypad_local                   CUR Strings[88]
-#define keypad_xmit                    CUR Strings[89]
-#define lab_f0                         CUR Strings[90]
-#define lab_f1                         CUR Strings[91]
-#define lab_f10                        CUR Strings[92]
-#define lab_f2                         CUR Strings[93]
-#define lab_f3                         CUR Strings[94]
-#define lab_f4                         CUR Strings[95]
-#define lab_f5                         CUR Strings[96]
-#define lab_f6                         CUR Strings[97]
-#define lab_f7                         CUR Strings[98]
-#define lab_f8                         CUR Strings[99]
-#define lab_f9                         CUR Strings[100]
-#define meta_off                       CUR Strings[101]
-#define meta_on                        CUR Strings[102]
-#define newline                        CUR Strings[103]
-#define pad_char                       CUR Strings[104]
-#define parm_dch                       CUR Strings[105]
-#define parm_delete_line               CUR Strings[106]
-#define parm_down_cursor               CUR Strings[107]
-#define parm_ich                       CUR Strings[108]
-#define parm_index                     CUR Strings[109]
-#define parm_insert_line               CUR Strings[110]
-#define parm_left_cursor               CUR Strings[111]
-#define parm_right_cursor              CUR Strings[112]
-#define parm_rindex                    CUR Strings[113]
-#define parm_up_cursor                 CUR Strings[114]
-#define pkey_key                       CUR Strings[115]
-#define pkey_local                     CUR Strings[116]
-#define pkey_xmit                      CUR Strings[117]
-#define print_screen                   CUR Strings[118]
-#define prtr_off                       CUR Strings[119]
-#define prtr_on                        CUR Strings[120]
-#define repeat_char                    CUR Strings[121]
-#define reset_1string                  CUR Strings[122]
-#define reset_2string                  CUR Strings[123]
-#define reset_3string                  CUR Strings[124]
-#define reset_file                     CUR Strings[125]
-#define restore_cursor                 CUR Strings[126]
-#define row_address                    CUR Strings[127]
-#define save_cursor                    CUR Strings[128]
-#define scroll_forward                 CUR Strings[129]
-#define scroll_reverse                 CUR Strings[130]
-#define set_attributes                 CUR Strings[131]
-#define set_tab                        CUR Strings[132]
-#define set_window                     CUR Strings[133]
-#define tab                            CUR Strings[134]
-#define to_status_line                 CUR Strings[135]
-#define underline_char                 CUR Strings[136]
-#define up_half_line                   CUR Strings[137]
-#define init_prog                      CUR Strings[138]
-#define key_a1                         CUR Strings[139]
-#define key_a3                         CUR Strings[140]
-#define key_b2                         CUR Strings[141]
-#define key_c1                         CUR Strings[142]
-#define key_c3                         CUR Strings[143]
-#define prtr_non                       CUR Strings[144]
-#define char_padding                   CUR Strings[145]
-#define acs_chars                      CUR Strings[146]
-#define plab_norm                      CUR Strings[147]
-#define key_btab                       CUR Strings[148]
-#define enter_xon_mode                 CUR Strings[149]
-#define exit_xon_mode                  CUR Strings[150]
-#define enter_am_mode                  CUR Strings[151]
-#define exit_am_mode                   CUR Strings[152]
-#define xon_character                  CUR Strings[153]
-#define xoff_character                 CUR Strings[154]
-#define ena_acs                        CUR Strings[155]
-#define label_on                       CUR Strings[156]
-#define label_off                      CUR Strings[157]
-#define key_beg                        CUR Strings[158]
-#define key_cancel                     CUR Strings[159]
-#define key_close                      CUR Strings[160]
-#define key_command                    CUR Strings[161]
-#define key_copy                       CUR Strings[162]
-#define key_create                     CUR Strings[163]
-#define key_end                        CUR Strings[164]
-#define key_enter                      CUR Strings[165]
-#define key_exit                       CUR Strings[166]
-#define key_find                       CUR Strings[167]
-#define key_help                       CUR Strings[168]
-#define key_mark                       CUR Strings[169]
-#define key_message                    CUR Strings[170]
-#define key_move                       CUR Strings[171]
-#define key_next                       CUR Strings[172]
-#define key_open                       CUR Strings[173]
-#define key_options                    CUR Strings[174]
-#define key_previous                   CUR Strings[175]
-#define key_print                      CUR Strings[176]
-#define key_redo                       CUR Strings[177]
-#define key_reference                  CUR Strings[178]
-#define key_refresh                    CUR Strings[179]
-#define key_replace                    CUR Strings[180]
-#define key_restart                    CUR Strings[181]
-#define key_resume                     CUR Strings[182]
-#define key_save                       CUR Strings[183]
-#define key_suspend                    CUR Strings[184]
-#define key_undo                       CUR Strings[185]
-#define key_sbeg                       CUR Strings[186]
-#define key_scancel                    CUR Strings[187]
-#define key_scommand                   CUR Strings[188]
-#define key_scopy                      CUR Strings[189]
-#define key_screate                    CUR Strings[190]
-#define key_sdc                        CUR Strings[191]
-#define key_sdl                        CUR Strings[192]
-#define key_select                     CUR Strings[193]
-#define key_send                       CUR Strings[194]
-#define key_seol                       CUR Strings[195]
-#define key_sexit                      CUR Strings[196]
-#define key_sfind                      CUR Strings[197]
-#define key_shelp                      CUR Strings[198]
-#define key_shome                      CUR Strings[199]
-#define key_sic                        CUR Strings[200]
-#define key_sleft                      CUR Strings[201]
-#define key_smessage                   CUR Strings[202]
-#define key_smove                      CUR Strings[203]
-#define key_snext                      CUR Strings[204]
-#define key_soptions                   CUR Strings[205]
-#define key_sprevious                  CUR Strings[206]
-#define key_sprint                     CUR Strings[207]
-#define key_sredo                      CUR Strings[208]
-#define key_sreplace                   CUR Strings[209]
-#define key_sright                     CUR Strings[210]
-#define key_srsume                     CUR Strings[211]
-#define key_ssave                      CUR Strings[212]
-#define key_ssuspend                   CUR Strings[213]
-#define key_sundo                      CUR Strings[214]
-#define req_for_input                  CUR Strings[215]
-#define key_f11                        CUR Strings[216]
-#define key_f12                        CUR Strings[217]
-#define key_f13                        CUR Strings[218]
-#define key_f14                        CUR Strings[219]
-#define key_f15                        CUR Strings[220]
-#define key_f16                        CUR Strings[221]
-#define key_f17                        CUR Strings[222]
-#define key_f18                        CUR Strings[223]
-#define key_f19                        CUR Strings[224]
-#define key_f20                        CUR Strings[225]
-#define key_f21                        CUR Strings[226]
-#define key_f22                        CUR Strings[227]
-#define key_f23                        CUR Strings[228]
-#define key_f24                        CUR Strings[229]
-#define key_f25                        CUR Strings[230]
-#define key_f26                        CUR Strings[231]
-#define key_f27                        CUR Strings[232]
-#define key_f28                        CUR Strings[233]
-#define key_f29                        CUR Strings[234]
-#define key_f30                        CUR Strings[235]
-#define key_f31                        CUR Strings[236]
-#define key_f32                        CUR Strings[237]
-#define key_f33                        CUR Strings[238]
-#define key_f34                        CUR Strings[239]
-#define key_f35                        CUR Strings[240]
-#define key_f36                        CUR Strings[241]
-#define key_f37                        CUR Strings[242]
-#define key_f38                        CUR Strings[243]
-#define key_f39                        CUR Strings[244]
-#define key_f40                        CUR Strings[245]
-#define key_f41                        CUR Strings[246]
-#define key_f42                        CUR Strings[247]
-#define key_f43                        CUR Strings[248]
-#define key_f44                        CUR Strings[249]
-#define key_f45                        CUR Strings[250]
-#define key_f46                        CUR Strings[251]
-#define key_f47                        CUR Strings[252]
-#define key_f48                        CUR Strings[253]
-#define key_f49                        CUR Strings[254]
-#define key_f50                        CUR Strings[255]
-#define key_f51                        CUR Strings[256]
-#define key_f52                        CUR Strings[257]
-#define key_f53                        CUR Strings[258]
-#define key_f54                        CUR Strings[259]
-#define key_f55                        CUR Strings[260]
-#define key_f56                        CUR Strings[261]
-#define key_f57                        CUR Strings[262]
-#define key_f58                        CUR Strings[263]
-#define key_f59                        CUR Strings[264]
-#define key_f60                        CUR Strings[265]
-#define key_f61                        CUR Strings[266]
-#define key_f62                        CUR Strings[267]
-#define key_f63                        CUR Strings[268]
-#define clr_bol                        CUR Strings[269]
-#define clear_margins                  CUR Strings[270]
-#define set_left_margin                CUR Strings[271]
-#define set_right_margin               CUR Strings[272]
-#define label_format                   CUR Strings[273]
-#define set_clock                      CUR Strings[274]
-#define display_clock                  CUR Strings[275]
-#define remove_clock                   CUR Strings[276]
-#define create_window                  CUR Strings[277]
-#define goto_window                    CUR Strings[278]
-#define hangup                         CUR Strings[279]
-#define dial_phone                     CUR Strings[280]
-#define quick_dial                     CUR Strings[281]
-#define tone                           CUR Strings[282]
-#define pulse                          CUR Strings[283]
-#define flash_hook                     CUR Strings[284]
-#define fixed_pause                    CUR Strings[285]
-#define wait_tone                      CUR Strings[286]
-#define user0                          CUR Strings[287]
-#define user1                          CUR Strings[288]
-#define user2                          CUR Strings[289]
-#define user3                          CUR Strings[290]
-#define user4                          CUR Strings[291]
-#define user5                          CUR Strings[292]
-#define user6                          CUR Strings[293]
-#define user7                          CUR Strings[294]
-#define user8                          CUR Strings[295]
-#define user9                          CUR Strings[296]
-#define orig_pair                      CUR Strings[297]
-#define orig_colors                    CUR Strings[298]
-#define initialize_color               CUR Strings[299]
-#define initialize_pair                CUR Strings[300]
-#define set_color_pair                 CUR Strings[301]
-#define set_foreground                 CUR Strings[302]
-#define set_background                 CUR Strings[303]
-#define change_char_pitch              CUR Strings[304]
-#define change_line_pitch              CUR Strings[305]
-#define change_res_horz                CUR Strings[306]
-#define change_res_vert                CUR Strings[307]
-#define define_char                    CUR Strings[308]
-#define enter_doublewide_mode          CUR Strings[309]
-#define enter_draft_quality            CUR Strings[310]
-#define enter_italics_mode             CUR Strings[311]
-#define enter_leftward_mode            CUR Strings[312]
-#define enter_micro_mode               CUR Strings[313]
-#define enter_near_letter_quality      CUR Strings[314]
-#define enter_normal_quality           CUR Strings[315]
-#define enter_shadow_mode              CUR Strings[316]
-#define enter_subscript_mode           CUR Strings[317]
-#define enter_superscript_mode         CUR Strings[318]
-#define enter_upward_mode              CUR Strings[319]
-#define exit_doublewide_mode           CUR Strings[320]
-#define exit_italics_mode              CUR Strings[321]
-#define exit_leftward_mode             CUR Strings[322]
-#define exit_micro_mode                CUR Strings[323]
-#define exit_shadow_mode               CUR Strings[324]
-#define exit_subscript_mode            CUR Strings[325]
-#define exit_superscript_mode          CUR Strings[326]
-#define exit_upward_mode               CUR Strings[327]
-#define micro_column_address           CUR Strings[328]
-#define micro_down                     CUR Strings[329]
-#define micro_left                     CUR Strings[330]
-#define micro_right                    CUR Strings[331]
-#define micro_row_address              CUR Strings[332]
-#define micro_up                       CUR Strings[333]
-#define order_of_pins                  CUR Strings[334]
-#define parm_down_micro                CUR Strings[335]
-#define parm_left_micro                CUR Strings[336]
-#define parm_right_micro               CUR Strings[337]
-#define parm_up_micro                  CUR Strings[338]
-#define select_char_set                CUR Strings[339]
-#define set_bottom_margin              CUR Strings[340]
-#define set_bottom_margin_parm         CUR Strings[341]
-#define set_left_margin_parm           CUR Strings[342]
-#define set_right_margin_parm          CUR Strings[343]
-#define set_top_margin                 CUR Strings[344]
-#define set_top_margin_parm            CUR Strings[345]
-#define start_bit_image                CUR Strings[346]
-#define start_char_set_def             CUR Strings[347]
-#define stop_bit_image                 CUR Strings[348]
-#define stop_char_set_def              CUR Strings[349]
-#define subscript_characters           CUR Strings[350]
-#define superscript_characters         CUR Strings[351]
-#define these_cause_cr                 CUR Strings[352]
-#define zero_motion                    CUR Strings[353]
-#define char_set_names                 CUR Strings[354]
-#define key_mouse                      CUR Strings[355]
-#define mouse_info                     CUR Strings[356]
-#define req_mouse_pos                  CUR Strings[357]
-#define get_mouse                      CUR Strings[358]
-#define set_a_foreground               CUR Strings[359]
-#define set_a_background               CUR Strings[360]
-#define pkey_plab                      CUR Strings[361]
-#define device_type                    CUR Strings[362]
-#define code_set_init                  CUR Strings[363]
-#define set0_des_seq                   CUR Strings[364]
-#define set1_des_seq                   CUR Strings[365]
-#define set2_des_seq                   CUR Strings[366]
-#define set3_des_seq                   CUR Strings[367]
-#define set_lr_margin                  CUR Strings[368]
-#define set_tb_margin                  CUR Strings[369]
-#define bit_image_repeat               CUR Strings[370]
-#define bit_image_newline              CUR Strings[371]
-#define bit_image_carriage_return      CUR Strings[372]
-#define color_names                    CUR Strings[373]
-#define define_bit_image_region        CUR Strings[374]
-#define end_bit_image_region           CUR Strings[375]
-#define set_color_band                 CUR Strings[376]
-#define set_page_length                CUR Strings[377]
-#define display_pc_char                CUR Strings[378]
-#define enter_pc_charset_mode          CUR Strings[379]
-#define exit_pc_charset_mode           CUR Strings[380]
-#define enter_scancode_mode            CUR Strings[381]
-#define exit_scancode_mode             CUR Strings[382]
-#define pc_term_options                CUR Strings[383]
-#define scancode_escape                CUR Strings[384]
-#define alt_scancode_esc               CUR Strings[385]
-#define enter_horizontal_hl_mode       CUR Strings[386]
-#define enter_left_hl_mode             CUR Strings[387]
-#define enter_low_hl_mode              CUR Strings[388]
-#define enter_right_hl_mode            CUR Strings[389]
-#define enter_top_hl_mode              CUR Strings[390]
-#define enter_vertical_hl_mode         CUR Strings[391]
-#define set_a_attributes               CUR Strings[392]
-#define set_pglen_inch                 CUR Strings[393]
-
-#define BOOLWRITE 37
-#define NUMWRITE  33
-#define STRWRITE  394
-
-/* older synonyms for some capabilities */
-#define beehive_glitch	no_esc_ctlc
-#define teleray_glitch	dest_tabs_magic_smso
-#define micro_char_size micro_col_size
-
-#ifdef __INTERNAL_CAPS_VISIBLE
-#define termcap_init2                  CUR Strings[394]
-#define termcap_reset                  CUR Strings[395]
-#define magic_cookie_glitch_ul         CUR Numbers[33]
-#define backspaces_with_bs             CUR Booleans[37]
-#define crt_no_scrolling               CUR Booleans[38]
-#define no_correctly_working_cr        CUR Booleans[39]
-#define carriage_return_delay          CUR Numbers[34]
-#define new_line_delay                 CUR Numbers[35]
-#define linefeed_if_not_lf             CUR Strings[396]
-#define backspace_if_not_bs            CUR Strings[397]
-#define gnu_has_meta_key               CUR Booleans[40]
-#define linefeed_is_newline            CUR Booleans[41]
-#define backspace_delay                CUR Numbers[36]
-#define horizontal_tab_delay           CUR Numbers[37]
-#define number_of_function_keys        CUR Numbers[38]
-#define other_non_function_keys        CUR Strings[398]
-#define arrow_key_map                  CUR Strings[399]
-#define has_hardware_tabs              CUR Booleans[42]
-#define return_does_clr_eol            CUR Booleans[43]
-#define acs_ulcorner                   CUR Strings[400]
-#define acs_llcorner                   CUR Strings[401]
-#define acs_urcorner                   CUR Strings[402]
-#define acs_lrcorner                   CUR Strings[403]
-#define acs_ltee                       CUR Strings[404]
-#define acs_rtee                       CUR Strings[405]
-#define acs_btee                       CUR Strings[406]
-#define acs_ttee                       CUR Strings[407]
-#define acs_hline                      CUR Strings[408]
-#define acs_vline                      CUR Strings[409]
-#define acs_plus                       CUR Strings[410]
-#define memory_lock                    CUR Strings[411]
-#define memory_unlock                  CUR Strings[412]
-#define box_chars_1                    CUR Strings[413]
-#endif /* __INTERNAL_CAPS_VISIBLE */
-
-
-/*
- * Predefined terminfo array sizes
- */
-#define BOOLCOUNT 44
-#define NUMCOUNT  39
-#define STRCOUNT  414
-
-/* used by code for comparing entries */
-#define acs_chars_index	 146
-
-typedef struct termtype {	/* in-core form of terminfo data */
-    char  *term_names;		/* str_table offset of term names */
-    char  *str_table;		/* pointer to string table */
-    NCURSES_SBOOL  *Booleans;	/* array of boolean values */
-    short *Numbers;		/* array of integer values */
-    char  **Strings;		/* array of string offsets */
-
-#if NCURSES_XNAMES
-    char  *ext_str_table;	/* pointer to extended string table */
-    char  **ext_Names;		/* corresponding names */
-
-    unsigned short num_Booleans;/* count total Booleans */
-    unsigned short num_Numbers;	/* count total Numbers */
-    unsigned short num_Strings;	/* count total Strings */
-
-    unsigned short ext_Booleans;/* count extensions to Booleans */
-    unsigned short ext_Numbers;	/* count extensions to Numbers */
-    unsigned short ext_Strings;	/* count extensions to Strings */
-#endif /* NCURSES_XNAMES */
-
-} TERMTYPE;
-
-typedef struct term {		/* describe an actual terminal */
-    TERMTYPE	type;		/* terminal type description */
-    short	Filedes;	/* file description being written to */
-    TTY		Ottyb,		/* original state of the terminal */
-		Nttyb;		/* current state of the terminal */
-    int		_baudrate;	/* used to compute padding */
-    char *      _termname;      /* used for termname() */
-} TERMINAL;
-
-#if 0 || 0
-NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numcodes);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numfnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strnames);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);
-NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);
-
-#define cur_term   NCURSES_PUBLIC_VAR(cur_term())
-#define boolnames  NCURSES_PUBLIC_VAR(boolnames())
-#define boolcodes  NCURSES_PUBLIC_VAR(boolcodes())
-#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())
-#define numnames   NCURSES_PUBLIC_VAR(numnames())
-#define numcodes   NCURSES_PUBLIC_VAR(numcodes())
-#define numfnames  NCURSES_PUBLIC_VAR(numfnames())
-#define strnames   NCURSES_PUBLIC_VAR(strnames())
-#define strcodes   NCURSES_PUBLIC_VAR(strcodes())
-#define strfnames  NCURSES_PUBLIC_VAR(strfnames())
-
-#else
-
-extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;
-
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numcodes[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numfnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strnames[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strcodes[];
-extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[];
-
-#endif
-
-/* internals */
-extern NCURSES_EXPORT(int) _nc_set_tty_mode (TTY *buf);
-extern NCURSES_EXPORT(int) _nc_get_tty_mode (TTY *buf);
-extern NCURSES_EXPORT(int) _nc_read_entry (const char * const, char * const, TERMTYPE *const);
-extern NCURSES_EXPORT(int) _nc_read_file_entry (const char *const, TERMTYPE *);
-extern NCURSES_EXPORT(int) _nc_read_termtype (TERMTYPE *, char *, int);
-extern NCURSES_EXPORT(char *) _nc_first_name (const char *const);
-extern NCURSES_EXPORT(int) _nc_name_match (const char *const, const char *const, const char *const);
-extern NCURSES_EXPORT(const TERMTYPE *) _nc_fallback (const char *);
-
-/* entry points */
-extern NCURSES_EXPORT(TERMINAL *) set_curterm (TERMINAL *);
-extern NCURSES_EXPORT(int) del_curterm (TERMINAL *);
-
-/* miscellaneous entry points */
-extern NCURSES_EXPORT(int) restartterm (NCURSES_CONST char *, int, int *);
-extern NCURSES_EXPORT(int) setupterm (NCURSES_CONST char *,int,int *);
-
-/* terminfo entry points, also declared in curses.h */
-#if !defined(__NCURSES_H)
-extern NCURSES_EXPORT(char *) tigetstr (NCURSES_CONST char *);
-extern NCURSES_EXPORT_VAR(char) ttytype[];
-extern NCURSES_EXPORT(int) putp (const char *);
-extern NCURSES_EXPORT(int) tigetflag (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);
-
-#if 1 /* NCURSES_TPARM_VARARGS */
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
-#else
-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
-extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
-#endif
-
-#endif /* __NCURSES_H */
-
-/* termcap database emulation (XPG4 uses const only for 2nd param of tgetent) */
-#if !defined(NCURSES_TERMCAP_H_incl)
-extern NCURSES_EXPORT(char *) tgetstr (NCURSES_CONST char *, char **);
-extern NCURSES_EXPORT(char *) tgoto (const char *, int, int);
-extern NCURSES_EXPORT(int) tgetent (char *, const char *);
-extern NCURSES_EXPORT(int) tgetflag (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tgetnum (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tputs (const char *, int, int (*)(int));
-#endif /* NCURSES_TERMCAP_H_incl */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NCURSES_TERM_H_incl */
diff --git a/include.new/termcap.h b/include.new/termcap.h
deleted file mode 100644
index 66a8282..0000000
--- a/include.new/termcap.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- ****************************************************************************/
-
-/* $Id: termcap.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef NCURSES_TERMCAP_H_incl
-#define NCURSES_TERMCAP_H_incl	1
-
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "5.7"
-
-#include <ncurses_dll.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
-
-#include <sys/types.h>
-
-#undef  NCURSES_CONST 
-#define NCURSES_CONST const 
-
-#undef  NCURSES_OSPEED 
-#define NCURSES_OSPEED short 
-
-extern NCURSES_EXPORT_VAR(char) PC;
-extern NCURSES_EXPORT_VAR(char *) UP;
-extern NCURSES_EXPORT_VAR(char *) BC;
-extern NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed; 
-
-#if !defined(NCURSES_TERM_H_incl)
-extern NCURSES_EXPORT(char *) tgetstr (NCURSES_CONST char *, char **);
-extern NCURSES_EXPORT(char *) tgoto (const char *, int, int);
-extern NCURSES_EXPORT(int) tgetent (char *, const char *);
-extern NCURSES_EXPORT(int) tgetflag (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tgetnum (NCURSES_CONST char *);
-extern NCURSES_EXPORT(int) tputs (const char *, int, int (*)(int));
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NCURSES_TERMCAP_H_incl */
diff --git a/include.new/termios.h b/include.new/termios.h
deleted file mode 100644
index e75abb9..0000000
--- a/include.new/termios.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 1988, 1989, 1993, 1994
- *	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. 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.
- *
- *	@(#)termios.h	8.3 (Berkeley) 3/28/94
- * $FreeBSD: releng/10.2/include/termios.h 214680 2010-11-02 17:00:56Z ed $
- */
-
-#ifndef _TERMIOS_H_
-#define	_TERMIOS_H_
-
-#include <sys/cdefs.h>
-#include <sys/_termios.h>
-#include <sys/_types.h>
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-#ifndef _POSIX_SOURCE
-#define	OXTABS		TAB3
-#define	MDMBUF		CCAR_OFLOW
-#endif 
-
-#ifndef _POSIX_SOURCE
-#define	CCEQ(val, c)	((c) == (val) && (val) != _POSIX_VDISABLE)
-#endif
-
-/*
- * Commands passed to tcsetattr() for setting the termios structure.
- */
-#define	TCSANOW		0		/* make change immediate */
-#define	TCSADRAIN	1		/* drain output, then change */
-#define	TCSAFLUSH	2		/* drain output, flush input */
-#ifndef _POSIX_SOURCE
-#define	TCSASOFT	0x10		/* flag - don't alter h.w. state */
-#endif
-
-#define	TCIFLUSH	1
-#define	TCOFLUSH	2
-#define	TCIOFLUSH	3
-#define	TCOOFF		1
-#define	TCOON		2
-#define	TCIOFF		3
-#define	TCION		4
-
-__BEGIN_DECLS
-speed_t	cfgetispeed(const struct termios *);
-speed_t	cfgetospeed(const struct termios *);
-int	cfsetispeed(struct termios *, speed_t);
-int	cfsetospeed(struct termios *, speed_t);
-int	tcgetattr(int, struct termios *);
-int	tcsetattr(int, int, const struct termios *);
-int	tcdrain(int);
-int	tcflow(int, int);
-int	tcflush(int, int);
-int	tcsendbreak(int, int);
-
-#if __POSIX_VISIBLE >= 200112 || __BSD_VISIBLE
-pid_t	tcgetsid(int);
-#endif
-#if __BSD_VISIBLE
-int	tcsetsid(int, pid_t);
-
-void	cfmakeraw(struct termios *);
-void	cfmakesane(struct termios *);
-int	cfsetspeed(struct termios *, speed_t);
-#endif
-__END_DECLS
-
-#endif /* !_TERMIOS_H_ */
-
-#ifndef _POSIX_SOURCE
-#include <sys/ttycom.h>
-#include <sys/ttydefaults.h>
-#endif
diff --git a/include.new/tgmath.h b/include.new/tgmath.h
deleted file mode 100644
index 3d8b109..0000000
--- a/include.new/tgmath.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*-
- * Copyright (c) 2004 Stefan Farfeleder.
- * All rights reserved.
- *
- * Copyright (c) 2012 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/include/tgmath.h 249995 2013-04-27 21:18:34Z ed $
- */
-
-#ifndef _TGMATH_H_
-#define	_TGMATH_H_
-
-#include <complex.h>
-#include <math.h>
-
-/*
- * This implementation of <tgmath.h> uses the two following macros,
- * which are based on the macros described in C11 proposal N1404:
- * __tg_impl_simple(x, y, z, fnl, fn, fnf, ...)
- *	Invokes fnl() if the corresponding real type of x, y or z is long
- *	double, fn() if it is double or any has an integer type, and fnf()
- *	otherwise.
- * __tg_impl_full(x, y, cfnl, cfn, cfnf, fnl, fn, fnf, ...)
- *	Invokes [c]fnl() if the corresponding real type of x or y is long
- *	double, [c]fn() if it is double or any has an integer type, and
- *	[c]fnf() otherwise.  The function with the 'c' prefix is called if
- *	any of x or y is a complex number.
- * Both macros call the chosen function with all additional arguments passed
- * to them, as given by __VA_ARGS__.
- *
- * Note that these macros cannot be implemented with C's ?: operator,
- * because the return type of the whole expression would incorrectly be long
- * double complex regardless of the argument types.
- *
- * The structure of the C11 implementation of these macros can in
- * principle be reused for non-C11 compilers, but due to an integer
- * promotion bug for complex types in GCC 4.2, simply let non-C11
- * compilers use an inefficient yet reliable version.
- */
-
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \
-    __has_extension(c_generic_selections)
-#define	__tg_generic(x, cfnl, cfn, cfnf, fnl, fn, fnf)			\
-	_Generic(x,							\
-		long double _Complex: cfnl,				\
-		double _Complex: cfn,					\
-		float _Complex: cfnf,					\
-		long double: fnl,					\
-		default: fn,						\
-		float: fnf						\
-	)
-#define	__tg_type(x)							\
-	__tg_generic(x, (long double _Complex)0, (double _Complex)0,	\
-	    (float _Complex)0, (long double)0, (double)0, (float)0)
-#define	__tg_impl_simple(x, y, z, fnl, fn, fnf, ...)			\
-	__tg_generic(							\
-	    __tg_type(x) + __tg_type(y) + __tg_type(z),			\
-	    fnl, fn, fnf, fnl, fn, fnf)(__VA_ARGS__)
-#define	__tg_impl_full(x, y, cfnl, cfn, cfnf, fnl, fn, fnf, ...)	\
-	__tg_generic(							\
-	    __tg_type(x) + __tg_type(y),				\
-	    cfnl, cfn, cfnf, fnl, fn, fnf)(__VA_ARGS__)
-#elif defined(__generic)
-#define	__tg_generic_simple(x, fnl, fn, fnf)				\
-	__generic(x, long double _Complex, fnl,				\
-	    __generic(x, double _Complex, fn,				\
-	        __generic(x, float _Complex, fnf,			\
-	            __generic(x, long double, fnl,			\
-	                __generic(x, float, fnf, fn)))))
-#define	__tg_impl_simple(x, y, z, fnl, fn, fnf, ...)			\
-	__tg_generic_simple(x,						\
-	    __tg_generic_simple(y,					\
-	        __tg_generic_simple(z, fnl, fnl, fnl),			\
-	        __tg_generic_simple(z, fnl, fnl, fnl),			\
-	        __tg_generic_simple(z, fnl, fnl, fnl)),			\
-	    __tg_generic_simple(y,					\
-	        __tg_generic_simple(z, fnl, fnl, fnl),			\
-	        __tg_generic_simple(z, fnl, fn , fn ),			\
-	        __tg_generic_simple(z, fnl, fn , fn )),			\
-	    __tg_generic_simple(y,					\
-	        __tg_generic_simple(z, fnl, fnl, fnl),			\
-	        __tg_generic_simple(z, fnl, fn , fn ),			\
-	        __tg_generic_simple(z, fnl, fn , fnf)))(__VA_ARGS__)
-#define	__tg_generic_full(x, cfnl, cfn, cfnf, fnl, fn, fnf)		\
-	__generic(x, long double _Complex, cfnl,			\
-	    __generic(x, double _Complex, cfn,				\
-	        __generic(x, float _Complex, cfnf,			\
-	            __generic(x, long double, fnl,			\
-	                __generic(x, float, fnf, fn)))))
-#define	__tg_impl_full(x, y, cfnl, cfn, cfnf, fnl, fn, fnf, ...)	\
-	__tg_generic_full(x,						\
-	    __tg_generic_full(y, cfnl, cfnl, cfnl, cfnl, cfnl, cfnl),	\
-	    __tg_generic_full(y, cfnl, cfn , cfn , cfnl, cfn , cfn ),	\
-	    __tg_generic_full(y, cfnl, cfn , cfnf, cfnl, cfn , cfnf),	\
-	    __tg_generic_full(y, cfnl, cfnl, cfnl, fnl , fnl , fnl ),	\
-	    __tg_generic_full(y, cfnl, cfn , cfn , fnl , fn  , fn  ),	\
-	    __tg_generic_full(y, cfnl, cfn , cfnf, fnl , fn  , fnf ))	\
-	    (__VA_ARGS__)
-#else
-#error "<tgmath.h> not implemented for this compiler"
-#endif
-
-/* Macros to save lots of repetition below */
-#define	__tg_simple(x, fn)						\
-	__tg_impl_simple(x, x, x, fn##l, fn, fn##f, x)
-#define	__tg_simple2(x, y, fn)						\
-	__tg_impl_simple(x, x, y, fn##l, fn, fn##f, x, y)
-#define	__tg_simple3(x, y, z, fn)					\
-	__tg_impl_simple(x, y, z, fn##l, fn, fn##f, x, y, z)
-#define	__tg_simplev(x, fn, ...)					\
-	__tg_impl_simple(x, x, x, fn##l, fn, fn##f, __VA_ARGS__)
-#define	__tg_full(x, fn)						\
-	__tg_impl_full(x, x, c##fn##l, c##fn, c##fn##f, fn##l, fn, fn##f, x)
-#define	__tg_full2(x, y, fn)						\
-	__tg_impl_full(x, y, c##fn##l, c##fn, c##fn##f, fn##l, fn, fn##f, x, y)
-
-/* 7.22#4 -- These macros expand to real or complex functions, depending on
- * the type of their arguments. */
-#define	acos(x)		__tg_full(x, acos)
-#define	asin(x)		__tg_full(x, asin)
-#define	atan(x)		__tg_full(x, atan)
-#define	acosh(x)	__tg_full(x, acosh)
-#define	asinh(x)	__tg_full(x, asinh)
-#define	atanh(x)	__tg_full(x, atanh)
-#define	cos(x)		__tg_full(x, cos)
-#define	sin(x)		__tg_full(x, sin)
-#define	tan(x)		__tg_full(x, tan)
-#define	cosh(x)		__tg_full(x, cosh)
-#define	sinh(x)		__tg_full(x, sinh)
-#define	tanh(x)		__tg_full(x, tanh)
-#define	exp(x)		__tg_full(x, exp)
-#define	log(x)		__tg_full(x, log)
-#define	pow(x, y)	__tg_full2(x, y, pow)
-#define	sqrt(x)		__tg_full(x, sqrt)
-
-/* "The corresponding type-generic macro for fabs and cabs is fabs." */
-#define	fabs(x)		__tg_impl_full(x, x, cabsl, cabs, cabsf,	\
-    			    fabsl, fabs, fabsf, x)
-
-/* 7.22#5 -- These macros are only defined for arguments with real type. */
-#define	atan2(x, y)	__tg_simple2(x, y, atan2)
-#define	cbrt(x)		__tg_simple(x, cbrt)
-#define	ceil(x)		__tg_simple(x, ceil)
-#define	copysign(x, y)	__tg_simple2(x, y, copysign)
-#define	erf(x)		__tg_simple(x, erf)
-#define	erfc(x)		__tg_simple(x, erfc)
-#define	exp2(x)		__tg_simple(x, exp2)
-#define	expm1(x)	__tg_simple(x, expm1)
-#define	fdim(x, y)	__tg_simple2(x, y, fdim)
-#define	floor(x)	__tg_simple(x, floor)
-#define	fma(x, y, z)	__tg_simple3(x, y, z, fma)
-#define	fmax(x, y)	__tg_simple2(x, y, fmax)
-#define	fmin(x, y)	__tg_simple2(x, y, fmin)
-#define	fmod(x, y)	__tg_simple2(x, y, fmod)
-#define	frexp(x, y)	__tg_simplev(x, frexp, x, y)
-#define	hypot(x, y)	__tg_simple2(x, y, hypot)
-#define	ilogb(x)	__tg_simple(x, ilogb)
-#define	ldexp(x, y)	__tg_simplev(x, ldexp, x, y)
-#define	lgamma(x)	__tg_simple(x, lgamma)
-#define	llrint(x)	__tg_simple(x, llrint)
-#define	llround(x)	__tg_simple(x, llround)
-#define	log10(x)	__tg_simple(x, log10)
-#define	log1p(x)	__tg_simple(x, log1p)
-#define	log2(x)		__tg_simple(x, log2)
-#define	logb(x)		__tg_simple(x, logb)
-#define	lrint(x)	__tg_simple(x, lrint)
-#define	lround(x)	__tg_simple(x, lround)
-#define	nearbyint(x)	__tg_simple(x, nearbyint)
-#define	nextafter(x, y)	__tg_simple2(x, y, nextafter)
-#define	nexttoward(x, y) __tg_simplev(x, nexttoward, x, y)
-#define	remainder(x, y)	__tg_simple2(x, y, remainder)
-#define	remquo(x, y, z)	__tg_impl_simple(x, x, y, remquol, remquo,	\
-			    remquof, x, y, z)
-#define	rint(x)		__tg_simple(x, rint)
-#define	round(x)	__tg_simple(x, round)
-#define	scalbn(x, y)	__tg_simplev(x, scalbn, x, y)
-#define	scalbln(x, y)	__tg_simplev(x, scalbln, x, y)
-#define	tgamma(x)	__tg_simple(x, tgamma)
-#define	trunc(x)	__tg_simple(x, trunc)
-
-/* 7.22#6 -- These macros always expand to complex functions. */
-#define	carg(x)		__tg_simple(x, carg)
-#define	cimag(x)	__tg_simple(x, cimag)
-#define	conj(x)		__tg_simple(x, conj)
-#define	cproj(x)	__tg_simple(x, cproj)
-#define	creal(x)	__tg_simple(x, creal)
-
-#endif /* !_TGMATH_H_ */
diff --git a/include.new/thread_db.h b/include.new/thread_db.h
deleted file mode 100644
index bc1e10c..0000000
--- a/include.new/thread_db.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2004 David Xu <davidxu@freebsd.org>
- * Copyright (c) 2004 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/lib/libthread_db/thread_db.h 209689 2010-07-04 12:08:04Z kib $
- */
-
-#ifndef _THREAD_DB_H_
-#define	_THREAD_DB_H_
-
-#include <sys/procfs.h>
-#include <pthread.h>
-
-typedef enum {
-	TD_ERR = -1,		/* Unspecified error. */
-	TD_OK = 0,		/* No error. */
-	TD_BADKEY,
-	TD_BADPH,
-	TD_BADSH,
-	TD_BADTA,
-	TD_BADTH,
-	TD_DBERR,
-	TD_MALLOC,
-	TD_NOAPLIC,
-	TD_NOCAPAB,
-	TD_NOEVENT,
-	TD_NOFPREGS,
-	TD_NOLIBTHREAD,
-	TD_NOLWP,
-	TD_NOMSG,
-	TD_NOSV,
-	TD_NOTHR,
-	TD_NOTSD,
-	TD_NOXREGS,
-	TD_PARTIALREG
-} td_err_e;
-
-struct ps_prochandle;
-typedef struct td_thragent td_thragent_t;
-typedef long thread_t;			/* Must be an integral type. */
-
-typedef struct {
-	const td_thragent_t *th_ta;
-	psaddr_t	th_thread;
-	thread_t	th_tid;
-} td_thrhandle_t;			/* Used non-opaguely. */
-
-/*
- * Events.
- */
-
-typedef enum {
-	TD_EVENT_NONE = 0,
-	TD_CATCHSIG =	0x0001,
-	TD_CONCURRENCY=	0x0002,
-	TD_CREATE =	0x0004,
-	TD_DEATH =	0x0008,
-	TD_IDLE =	0x0010,
-	TD_LOCK_TRY =	0x0020,
-	TD_PREEMPT =	0x0040,
-	TD_PRI_INHERIT=	0x0080,
-	TD_READY =	0x0100,
-	TD_REAP =	0x0200,
-	TD_SLEEP =	0x0400,
-	TD_SWITCHFROM =	0x0800,
-	TD_SWITCHTO =	0x1000,
-	TD_TIMEOUT =	0x2000,
-	TD_ALL_EVENTS = ~0
-} td_thr_events_e;
-
-/* Compatibility with Linux. */
-#define	td_event_e	td_thr_events_e
-
-typedef struct {
-	td_thr_events_e	event;
-	psaddr_t	th_p;
-	uintptr_t	data;
-} td_event_msg_t;
-
-typedef unsigned int td_thr_events_t;
-
-typedef enum {
-	NOTIFY_BPT,		/* User inserted breakpoint. */
-	NOTIFY_AUTOBPT,		/* Automatic breakpoint. */
-	NOTIFY_SYSCALL		/* Invocation of system call. */
-} td_notify_e;
-
-typedef struct {
-	td_notify_e	type;
-	union {
-		psaddr_t bptaddr;
-		int syscallno;
-	} u;
-} td_notify_t;
-
-static __inline void
-td_event_addset(td_thr_events_t *es, td_thr_events_e e)
-{
-	*es |= e;
-}
-
-static __inline void
-td_event_delset(td_thr_events_t *es, td_thr_events_e e)
-{
-	*es &= ~e;
-}
-
-static __inline void
-td_event_emptyset(td_thr_events_t *es)
-{
-	*es = TD_EVENT_NONE;
-}
-
-static __inline void
-td_event_fillset(td_thr_events_t *es)
-{
-	*es = TD_ALL_EVENTS;
-}
-
-static __inline int
-td_eventisempty(td_thr_events_t *es)
-{
-	return ((*es == TD_EVENT_NONE) ? 1 : 0);
-}
-
-static __inline int
-td_eventismember(td_thr_events_t *es, td_thr_events_e e)
-{
-	return ((*es & e) ? 1 : 0);
-}
-
-/*
- * Thread info.
- */
-
-typedef enum {
-	TD_THR_UNKNOWN = -1,
-	TD_THR_ANY_STATE = 0,
-	TD_THR_ACTIVE,
-	TD_THR_RUN,
-	TD_THR_SLEEP,
-	TD_THR_STOPPED,
-	TD_THR_STOPPED_ASLEEP,
-	TD_THR_ZOMBIE
-} td_thr_state_e;
-
-typedef enum
-{
-	TD_THR_SYSTEM = 1,
-	TD_THR_USER
-} td_thr_type_e;
-
-typedef pthread_key_t thread_key_t;
-
-typedef struct {
-	const td_thragent_t *ti_ta_p;
-	thread_t	ti_tid;
-	psaddr_t	ti_thread;
-	td_thr_state_e	ti_state;
-	td_thr_type_e	ti_type;
-	td_thr_events_t	ti_events;
-	int		ti_pri;
-	lwpid_t		ti_lid;
-	char		ti_db_suspended;
-	char		ti_traceme;
-	sigset_t	ti_sigmask;
-	sigset_t	ti_pending;
-	psaddr_t	ti_tls;
-	psaddr_t	ti_startfunc;
-	psaddr_t	ti_stkbase;
-	size_t		ti_stksize;
-	siginfo_t	ti_siginfo;
-} td_thrinfo_t;
-
-/*
- * Prototypes.
- */
-
-typedef int td_key_iter_f(thread_key_t, void (*)(void *), void *);
-typedef int td_thr_iter_f(const td_thrhandle_t *, void *);
-
-/* Flags for `td_ta_thr_iter'. */
-#define	TD_THR_ANY_USER_FLAGS	0xffffffff
-#define	TD_THR_LOWEST_PRIORITY	-20
-#define	TD_SIGNO_MASK		NULL
-
-__BEGIN_DECLS
-td_err_e td_init(void);
-
-td_err_e td_ta_clear_event(const td_thragent_t *, td_thr_events_t *);
-td_err_e td_ta_delete(td_thragent_t *);
-td_err_e td_ta_event_addr(const td_thragent_t *, td_thr_events_e,
-    td_notify_t *);
-td_err_e td_ta_event_getmsg(const td_thragent_t *, td_event_msg_t *);
-td_err_e td_ta_map_id2thr(const td_thragent_t *, thread_t, td_thrhandle_t *);
-td_err_e td_ta_map_lwp2thr(const td_thragent_t *, lwpid_t, td_thrhandle_t *);
-td_err_e td_ta_new(struct ps_prochandle *, td_thragent_t **);
-td_err_e td_ta_set_event(const td_thragent_t *, td_thr_events_t *);
-td_err_e td_ta_thr_iter(const td_thragent_t *, td_thr_iter_f *, void *,
-    td_thr_state_e, int, sigset_t *, unsigned int);
-td_err_e td_ta_tsd_iter(const td_thragent_t *, td_key_iter_f *, void *);
-
-td_err_e td_thr_clear_event(const td_thrhandle_t *, td_thr_events_t *);
-td_err_e td_thr_dbresume(const td_thrhandle_t *);
-td_err_e td_thr_dbsuspend(const td_thrhandle_t *);
-td_err_e td_thr_event_enable(const td_thrhandle_t *, int);
-td_err_e td_thr_event_getmsg(const td_thrhandle_t *, td_event_msg_t *);
-td_err_e td_thr_get_info(const td_thrhandle_t *, td_thrinfo_t *);
-#ifdef __i386__
-td_err_e td_thr_getxmmregs(const td_thrhandle_t *, char *);
-#endif
-td_err_e td_thr_getfpregs(const td_thrhandle_t *, prfpregset_t *);
-td_err_e td_thr_getgregs(const td_thrhandle_t *, prgregset_t);
-td_err_e td_thr_set_event(const td_thrhandle_t *, td_thr_events_t *);
-#ifdef __i386__
-td_err_e td_thr_setxmmregs(const td_thrhandle_t *, const char *);
-#endif
-td_err_e td_thr_setfpregs(const td_thrhandle_t *, const prfpregset_t *);
-td_err_e td_thr_setgregs(const td_thrhandle_t *, const prgregset_t);
-td_err_e td_thr_validate(const td_thrhandle_t *);
-td_err_e td_thr_tls_get_addr(const td_thrhandle_t *, psaddr_t, size_t,
-    psaddr_t *);
-
-/* FreeBSD specific extensions. */
-td_err_e td_thr_sstep(const td_thrhandle_t *, int);
-__END_DECLS
-
-#endif /* _THREAD_DB_H_ */
diff --git a/include.new/threads.h b/include.new/threads.h
deleted file mode 100644
index 611ee32..0000000
--- a/include.new/threads.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 2011 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/lib/libstdthreads/threads.h 228904 2011-12-26 21:51:53Z ed $
- */
-
-#ifndef _THREADS_H_
-#define	_THREADS_H_
-
-#include <time.h>
-
-/*
- * The C11 threads interface.
- *
- * This interface is implemented as a light-weight wrapper around
- * <pthread.h>.  To prevent namespace pollution, the once_flag object,
- * its corresponding ONCE_FLAG_INIT and TSS_DTOR_ITERATIONS have been
- * copied from this header file.  They must be kept in sync.
- */
-
-typedef struct pthread_cond	*cnd_t;
-typedef struct pthread_mutex	*mtx_t;
-typedef struct pthread		*thrd_t;
-typedef int			 tss_t;
-
-typedef struct {
-	int	__state;
-	mtx_t	__mutex;
-} once_flag;
-
-typedef void (*tss_dtor_t)(void *);
-typedef int (*thrd_start_t)(void *);
-
-enum {
-	mtx_plain = 0x1,
-	mtx_recursive = 0x2,
-	mtx_timed = 0x4
-};
-
-enum {
-	thrd_busy = 1,
-	thrd_error = 2,
-	thrd_nomem = 3,
-	thrd_success = 4,
-	thrd_timedout = 5
-};
-
-#if !defined(__cplusplus) || __cplusplus < 201103L
-#define	thread_local		_Thread_local
-#endif
-#define	ONCE_FLAG_INIT		{ 0, NULL }
-#define	TSS_DTOR_ITERATIONS	4
-
-__BEGIN_DECLS
-void	call_once(once_flag *, void (*)(void));
-int	cnd_broadcast(cnd_t *);
-void	cnd_destroy(cnd_t *);
-int	cnd_init(cnd_t *);
-int	cnd_signal(cnd_t *);
-int	cnd_timedwait(cnd_t *__restrict, mtx_t *__restrict,
-    const struct timespec *__restrict);
-int	cnd_wait(cnd_t *, mtx_t *);
-void	mtx_destroy(mtx_t *);
-int	mtx_init(mtx_t *, int);
-int	mtx_lock(mtx_t *);
-int	mtx_timedlock(mtx_t *__restrict, const struct timespec *__restrict);
-int	mtx_trylock(mtx_t *);
-int	mtx_unlock(mtx_t *);
-int	thrd_create(thrd_t *, thrd_start_t, void *);
-thrd_t	thrd_current(void);
-int	thrd_detach(thrd_t);
-int	thrd_equal(thrd_t, thrd_t);
-_Noreturn void
-	thrd_exit(int);
-int	thrd_join(thrd_t, int *);
-int	thrd_sleep(const struct timespec *, struct timespec *);
-void	thrd_yield(void);
-int	tss_create(tss_t *, tss_dtor_t);
-void	tss_delete(tss_t);
-void *	tss_get(tss_t);
-int	tss_set(tss_t, void *);
-__END_DECLS
-
-#endif /* !_THREADS_H_ */
diff --git a/include.new/time.h b/include.new/time.h
deleted file mode 100644
index 2fbf7d0..0000000
--- a/include.new/time.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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. 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.
- *
- *	@(#)time.h	8.3 (Berkeley) 1/21/94
- */
-
-/*
- * $FreeBSD: releng/10.2/include/time.h 245428 2013-01-14 18:01:19Z dim $
- */
-
-#ifndef _TIME_H_
-#define	_TIME_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-
-#if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 || __BSD_VISIBLE
-/*
- * Frequency of the clock ticks reported by times().  Deprecated - use
- * sysconf(_SC_CLK_TCK) instead.  (Removed in 1003.1-2001.)
- */
-#define	CLK_TCK		128
-#endif
-
-/* Frequency of the clock ticks reported by clock().  */
-#define	CLOCKS_PER_SEC	128
-
-#ifndef _CLOCK_T_DECLARED
-typedef	__clock_t	clock_t;
-#define	_CLOCK_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#if __POSIX_VISIBLE >= 199309
-/*
- * New in POSIX 1003.1b-1993.
- */
-#ifndef _CLOCKID_T_DECLARED
-typedef	__clockid_t	clockid_t;
-#define	_CLOCKID_T_DECLARED
-#endif
-
-#ifndef _TIMER_T_DECLARED
-typedef	__timer_t	timer_t;
-#define	_TIMER_T_DECLARED
-#endif
-
-#include <sys/timespec.h>
-#endif /* __POSIX_VISIBLE >= 199309 */
-
-#if __POSIX_VISIBLE >= 200112
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-#endif
-
-/* These macros are also in sys/time.h. */
-#if !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112
-#define CLOCK_REALTIME	0
-#ifdef __BSD_VISIBLE
-#define CLOCK_VIRTUAL	1
-#define CLOCK_PROF	2
-#endif
-#define CLOCK_MONOTONIC	4
-#define CLOCK_UPTIME	5		/* FreeBSD-specific. */
-#define CLOCK_UPTIME_PRECISE	7	/* FreeBSD-specific. */
-#define CLOCK_UPTIME_FAST	8	/* FreeBSD-specific. */
-#define CLOCK_REALTIME_PRECISE	9	/* FreeBSD-specific. */
-#define CLOCK_REALTIME_FAST	10	/* FreeBSD-specific. */
-#define CLOCK_MONOTONIC_PRECISE	11	/* FreeBSD-specific. */
-#define CLOCK_MONOTONIC_FAST	12	/* FreeBSD-specific. */
-#define CLOCK_SECOND	13		/* FreeBSD-specific. */
-#define CLOCK_THREAD_CPUTIME_ID	14
-#define	CLOCK_PROCESS_CPUTIME_ID	15
-#endif /* !defined(CLOCK_REALTIME) && __POSIX_VISIBLE >= 200112 */
-
-#if !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112
-#if __BSD_VISIBLE
-#define TIMER_RELTIME	0x0	/* relative timer */
-#endif
-#define TIMER_ABSTIME	0x1	/* absolute timer */
-#endif /* !defined(TIMER_ABSTIME) && __POSIX_VISIBLE >= 200112 */
-
-struct tm {
-	int	tm_sec;		/* seconds after the minute [0-60] */
-	int	tm_min;		/* minutes after the hour [0-59] */
-	int	tm_hour;	/* hours since midnight [0-23] */
-	int	tm_mday;	/* day of the month [1-31] */
-	int	tm_mon;		/* months since January [0-11] */
-	int	tm_year;	/* years since 1900 */
-	int	tm_wday;	/* days since Sunday [0-6] */
-	int	tm_yday;	/* days since January 1 [0-365] */
-	int	tm_isdst;	/* Daylight Savings Time flag */
-	long	tm_gmtoff;	/* offset from UTC in seconds */
-	char	*tm_zone;	/* timezone abbreviation */
-};
-
-#if __POSIX_VISIBLE
-extern char *tzname[];
-#endif
-
-__BEGIN_DECLS
-char *asctime(const struct tm *);
-clock_t clock(void);
-char *ctime(const time_t *);
-double difftime(time_t, time_t);
-/* XXX missing: getdate() */
-struct tm *gmtime(const time_t *);
-struct tm *localtime(const time_t *);
-time_t mktime(struct tm *);
-size_t strftime(char * __restrict, size_t, const char * __restrict,
-    const struct tm * __restrict);
-time_t time(time_t *);
-#if __POSIX_VISIBLE >= 200112
-struct sigevent;
-int timer_create(clockid_t, struct sigevent *__restrict, timer_t *__restrict);
-int timer_delete(timer_t);
-int timer_gettime(timer_t, struct itimerspec *);
-int timer_getoverrun(timer_t);
-int timer_settime(timer_t, int, const struct itimerspec *__restrict,
-	struct itimerspec *__restrict);
-#endif
-#if __POSIX_VISIBLE
-void tzset(void);
-#endif
-
-#if __POSIX_VISIBLE >= 199309
-int clock_getres(clockid_t, struct timespec *);
-int clock_gettime(clockid_t, struct timespec *);
-int clock_settime(clockid_t, const struct timespec *);
-/* XXX missing: clock_nanosleep() */
-int nanosleep(const struct timespec *, struct timespec *);
-#endif /* __POSIX_VISIBLE >= 199309 */
-
-#if __POSIX_VISIBLE >= 200112
-int clock_getcpuclockid(pid_t, clockid_t *);
-#endif
-
-#if __POSIX_VISIBLE >= 199506
-char *asctime_r(const struct tm *, char *);
-char *ctime_r(const time_t *, char *);
-struct tm *gmtime_r(const time_t *, struct tm *);
-struct tm *localtime_r(const time_t *, struct tm *);
-#endif
-
-#if __XSI_VISIBLE
-char *strptime(const char * __restrict, const char * __restrict,
-    struct tm * __restrict);
-#endif
-
-#if __BSD_VISIBLE
-char *timezone(int, int);	/* XXX XSI conflict */
-void tzsetwall(void);
-time_t timelocal(struct tm * const);
-time_t timegm(struct tm * const);
-#endif /* __BSD_VISIBLE */
-
-#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
-#include <xlocale/_time.h>
-#endif
-__END_DECLS
-
-#endif /* !_TIME_H_ */
diff --git a/include.new/timeconv.h b/include.new/timeconv.h
deleted file mode 100644
index 2a8621b..0000000
--- a/include.new/timeconv.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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. 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.
- *
- *	@(#)time.h	8.3 (Berkeley) 1/21/94
- */
-
-/*
- * $FreeBSD: releng/10.2/include/timeconv.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef _TIMECONV_H_
-#define	_TIMECONV_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-time_t _time32_to_time(__int32_t t32);
-__int32_t _time_to_time32(time_t t);
-time_t _time64_to_time(__int64_t t64);
-__int64_t _time_to_time64(time_t t);
-long _time_to_long(time_t t);
-time_t _long_to_time(long tlong);
-int _time_to_int(time_t t);
-time_t _int_to_time(int tint);
-
-#endif /* _TIMECONV_H_ */
diff --git a/include.new/timers.h b/include.new/timers.h
deleted file mode 100644
index 95585a4..0000000
--- a/include.new/timers.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ==== timers.h ============================================================
- * Copyright (c) 1994 by Chris Provenzano, proven@mit.edu
- * 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 Chris Provenzano.
- * 4. The name of Chris Provenzano may not be used to endorse or promote
- *	  products derived from this software without specific prior written
- *	  permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CHRIS PROVENZANO ``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 CHRIS PROVENZANO 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: releng/10.2/include/timers.h 50473 1999-08-27 23:45:13Z peter $
- *
- * Description : Basic timers header.
- *
- *  1.00 94/06/13 proven
- *      -Started coding this file.
- */
-
-#ifndef _TIMERS_H_
-#define	_TIMERS_H_
-
-#include <sys/timers.h>
-
-#endif
diff --git a/include.new/ttyent.h b/include.new/ttyent.h
deleted file mode 100644
index d4d98a6..0000000
--- a/include.new/ttyent.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 1989, 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. 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.
- *
- *	@(#)ttyent.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/ttyent.h 267236 2014-06-08 17:50:07Z nwhitehorn $
- */
-
-#ifndef	_TTYENT_H_
-#define	_TTYENT_H_
-
-#define	_PATH_TTYS	"/etc/ttys"
-
-#define	_TTYS_OFF	"off"
-#define	_TTYS_ON	"on"
-#define	_TTYS_ONIFCONSOLE "onifconsole"
-#define	_TTYS_SECURE	"secure"
-#define	_TTYS_INSECURE	"insecure"
-#define	_TTYS_WINDOW	"window"
-#define	_TTYS_GROUP	"group"
-#define	_TTYS_NOGROUP	"none"
-#define	_TTYS_DIALUP	"dialup"
-#define	_TTYS_NETWORK	"network"
-
-struct ttyent {
-	char	*ty_name;	/* terminal device name */
-	char	*ty_getty;	/* command to execute, usually getty */
-	char	*ty_type;	/* terminal type for termcap */
-#define	TTY_ON		0x01	/* enable logins (start ty_getty program) */
-#define	TTY_SECURE	0x02	/* allow uid of 0 to login */
-#define	TTY_DIALUP	0x04	/* is a dialup tty */
-#define	TTY_NETWORK	0x08	/* is a network tty */
-	int	ty_status;	/* status flags */
-	char 	*ty_window;	/* command to start up window manager */
-	char	*ty_comment;	/* comment field */
-	char	*ty_group;	/* tty group */
-};
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-struct ttyent *getttyent(void);
-struct ttyent *getttynam(const char *);
-int setttyent(void);
-int endttyent(void);
-int isdialuptty(const char *);
-int isnettty(const char *);
-__END_DECLS
-
-#endif /* !_TTYENT_H_ */
diff --git a/include.new/uchar.h b/include.new/uchar.h
deleted file mode 100644
index 2cb6d85..0000000
--- a/include.new/uchar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2013 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/include/uchar.h 250985 2013-05-25 16:58:12Z ed $
- */
-
-#ifndef _UCHAR_H_
-#define	_UCHAR_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _CHAR16_T_DECLARED
-typedef	__char16_t	char16_t;
-#define	_CHAR16_T_DECLARED
-#endif
-
-#ifndef _CHAR32_T_DECLARED
-typedef	__char32_t	char32_t;
-#define	_CHAR32_T_DECLARED
-#endif
-
-#ifndef _MBSTATE_T_DECLARED
-typedef	__mbstate_t	mbstate_t;
-#define	_MBSTATE_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-__BEGIN_DECLS
-size_t	c16rtomb(char * __restrict, char16_t, mbstate_t * __restrict);
-size_t	c32rtomb(char * __restrict, char32_t, mbstate_t * __restrict);
-size_t	mbrtoc16(char16_t * __restrict, const char * __restrict, size_t,
-    mbstate_t * __restrict);
-size_t	mbrtoc32(char32_t * __restrict, const char * __restrict, size_t,
-    mbstate_t * __restrict);
-#if __BSD_VISIBLE || defined(_XLOCALE_H_)
-#include <xlocale/_uchar.h>
-#endif
-__END_DECLS
-
-#endif /* !_UCHAR_H_ */
diff --git a/include.new/ucontext.h b/include.new/ucontext.h
deleted file mode 100644
index 4ca3aa5..0000000
--- a/include.new/ucontext.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 1999 Marcel Moolenaar
- * 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 
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/sys/ucontext.h 278347 2015-02-07 08:47:15Z kib $
- */
-
-#ifndef _SYS_UCONTEXT_H_
-#define	_SYS_UCONTEXT_H_
-
-#include <sys/signal.h>
-#include <machine/ucontext.h>
-
-typedef struct __ucontext {
-	/*
-	 * Keep the order of the first two fields. Also,
-	 * keep them the first two fields in the structure.
-	 * This way we can have a union with struct
-	 * sigcontext and ucontext_t. This allows us to
-	 * support them both at the same time.
-	 * note: the union is not defined, though.
-	 */
-	sigset_t	uc_sigmask;
-	mcontext_t	uc_mcontext;
-
-	struct __ucontext *uc_link;
-	stack_t		uc_stack;
-	int		uc_flags;
-#define	UCF_SWAPPED	0x00000001	/* Used by swapcontext(3). */
-	int		__spare__[4];
-} ucontext_t;
-
-#if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
-#if defined(__i386__)
-struct ucontext4 {
-	sigset_t	uc_sigmask;
-	struct mcontext4 uc_mcontext;
-	struct ucontext4 *uc_link;
-	stack_t		uc_stack;
-	int		__spare__[8];
-};
-#else	/* __i386__ */
-#define ucontext4 ucontext
-#endif	/* __i386__ */
-#endif	/* _KERNEL */
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-
-int	getcontext(ucontext_t *) __returns_twice;
-ucontext_t *getcontextx(void);
-int	setcontext(const ucontext_t *);
-void	makecontext(ucontext_t *, void (*)(void), int, ...);
-int	signalcontext(ucontext_t *, int, __sighandler_t *);
-int	swapcontext(ucontext_t *, const ucontext_t *);
-
-#if __BSD_VISIBLE
-int __getcontextx_size(void);
-int __fillcontextx(char *ctx) __returns_twice;
-int __fillcontextx2(char *ctx);
-#endif
-
-__END_DECLS
-
-#else /* _KERNEL */
-
-struct thread;
-
-/*
- * Flags for get_mcontext().  The low order 4 bits (i.e a mask of 0x0f) are
- * reserved for use by machine independent code.  All other bits are for use
- * by machine dependent code.
- */
-#define	GET_MC_CLEAR_RET	1
-
-/* Machine-dependent functions: */
-int	get_mcontext(struct thread *, mcontext_t *, int);
-int	set_mcontext(struct thread *, mcontext_t *);
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_UCONTEXT_H_ */
diff --git a/include.new/ufs/ffs/ffs_extern.h b/include.new/ufs/ffs/ffs_extern.h
deleted file mode 100644
index fb5e1b5..0000000
--- a/include.new/ufs/ffs/ffs_extern.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)ffs_extern.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/ufs/ffs/ffs_extern.h 262779 2014-03-05 04:23:19Z pfg $
- */
-
-#ifndef _UFS_FFS_EXTERN_H
-#define	_UFS_FFS_EXTERN_H
-
-#ifndef _KERNEL
-#error "No user-serving parts inside"
-#else
-
-struct buf;
-struct cg;
-struct fid;
-struct fs;
-struct inode;
-struct malloc_type;
-struct mount;
-struct thread;
-struct sockaddr;
-struct statfs;
-struct ucred;
-struct vnode;
-struct vop_fsync_args;
-struct vop_reallocblks_args;
-struct workhead;
-
-int	ffs_alloc(struct inode *, ufs2_daddr_t, ufs2_daddr_t, int, int,
-	    struct ucred *, ufs2_daddr_t *);
-int	ffs_balloc_ufs1(struct vnode *a_vp, off_t a_startoffset, int a_size,
-            struct ucred *a_cred, int a_flags, struct buf **a_bpp);
-int	ffs_balloc_ufs2(struct vnode *a_vp, off_t a_startoffset, int a_size,
-            struct ucred *a_cred, int a_flags, struct buf **a_bpp);
-int	ffs_blkatoff(struct vnode *, off_t, char **, struct buf **);
-void	ffs_blkfree(struct ufsmount *, struct fs *, struct vnode *,
-	    ufs2_daddr_t, long, ino_t, enum vtype, struct workhead *);
-ufs2_daddr_t ffs_blkpref_ufs1(struct inode *, ufs_lbn_t, int, ufs1_daddr_t *);
-ufs2_daddr_t ffs_blkpref_ufs2(struct inode *, ufs_lbn_t, int, ufs2_daddr_t *);
-int	ffs_checkfreefile(struct fs *, struct vnode *, ino_t);
-void	ffs_clrblock(struct fs *, u_char *, ufs1_daddr_t);
-void	ffs_clusteracct(struct fs *, struct cg *, ufs1_daddr_t, int);
-void	ffs_bdflush(struct bufobj *, struct buf *);
-int	ffs_copyonwrite(struct vnode *, struct buf *);
-int	ffs_flushfiles(struct mount *, int, struct thread *);
-void	ffs_fragacct(struct fs *, int, int32_t [], int);
-int	ffs_freefile(struct ufsmount *, struct fs *, struct vnode *, ino_t,
-	    int, struct workhead *);
-void	ffs_fserr(struct fs *, ino_t, char *);
-int	ffs_isblock(struct fs *, u_char *, ufs1_daddr_t);
-int	ffs_isfreeblock(struct fs *, u_char *, ufs1_daddr_t);
-void	ffs_load_inode(struct buf *, struct inode *, struct fs *, ino_t);
-int	ffs_mountroot(void);
-void	ffs_oldfscompat_write(struct fs *, struct ufsmount *);
-int	ffs_own_mount(const struct mount *mp);
-int	ffs_reallocblks(struct vop_reallocblks_args *);
-int	ffs_realloccg(struct inode *, ufs2_daddr_t, ufs2_daddr_t,
-	    ufs2_daddr_t, int, int, int, struct ucred *, struct buf **);
-int	ffs_reload(struct mount *, struct thread *, int);
-int	ffs_sbupdate(struct ufsmount *, int, int);
-void	ffs_setblock(struct fs *, u_char *, ufs1_daddr_t);
-int	ffs_snapblkfree(struct fs *, struct vnode *, ufs2_daddr_t, long, ino_t,
-	    enum vtype, struct workhead *);
-void	ffs_snapremove(struct vnode *vp);
-int	ffs_snapshot(struct mount *mp, char *snapfile);
-void	ffs_snapshot_mount(struct mount *mp);
-void	ffs_snapshot_unmount(struct mount *mp);
-void	process_deferred_inactive(struct mount *mp);
-void	ffs_sync_snap(struct mount *, int);
-int	ffs_syncvnode(struct vnode *vp, int waitfor, int flags);
-int	ffs_truncate(struct vnode *, off_t, int, struct ucred *);
-int	ffs_update(struct vnode *, int);
-int	ffs_valloc(struct vnode *, int, struct ucred *, struct vnode **);
-
-int	ffs_vfree(struct vnode *, ino_t, int);
-vfs_vget_t ffs_vget;
-int	ffs_vgetf(struct mount *, ino_t, int, struct vnode **, int);
-void	ffs_susp_initialize(void);
-void	ffs_susp_uninitialize(void);
-
-#define	FFSV_FORCEINSMQ	0x0001
-
-extern struct vop_vector ffs_vnodeops1;
-extern struct vop_vector ffs_fifoops1;
-extern struct vop_vector ffs_vnodeops2;
-extern struct vop_vector ffs_fifoops2;
-
-/*
- * Soft update function prototypes.
- */
-
-int	softdep_check_suspend(struct mount *, struct vnode *,
-	  int, int, int, int);
-void	softdep_get_depcounts(struct mount *, int *, int *);
-void	softdep_initialize(void);
-void	softdep_uninitialize(void);
-int	softdep_mount(struct vnode *, struct mount *, struct fs *,
-	    struct ucred *);
-void	softdep_unmount(struct mount *);
-int	softdep_move_dependencies(struct buf *, struct buf *);
-int	softdep_flushworklist(struct mount *, int *, struct thread *);
-int	softdep_flushfiles(struct mount *, int, struct thread *);
-void	softdep_update_inodeblock(struct inode *, struct buf *, int);
-void	softdep_load_inodeblock(struct inode *);
-void	softdep_freefile(struct vnode *, ino_t, int);
-int	softdep_request_cleanup(struct fs *, struct vnode *,
-	    struct ucred *, int);
-void	softdep_setup_freeblocks(struct inode *, off_t, int);
-void	softdep_setup_inomapdep(struct buf *, struct inode *, ino_t, int);
-void	softdep_setup_blkmapdep(struct buf *, struct mount *, ufs2_daddr_t,
-	    int, int);
-void	softdep_setup_allocdirect(struct inode *, ufs_lbn_t, ufs2_daddr_t,
-	    ufs2_daddr_t, long, long, struct buf *);
-void	softdep_setup_allocext(struct inode *, ufs_lbn_t, ufs2_daddr_t,
-	    ufs2_daddr_t, long, long, struct buf *);
-void	softdep_setup_allocindir_meta(struct buf *, struct inode *,
-	    struct buf *, int, ufs2_daddr_t);
-void	softdep_setup_allocindir_page(struct inode *, ufs_lbn_t,
-	    struct buf *, int, ufs2_daddr_t, ufs2_daddr_t, struct buf *);
-void	softdep_setup_blkfree(struct mount *, struct buf *, ufs2_daddr_t, int,
-	    struct workhead *);
-void	softdep_setup_inofree(struct mount *, struct buf *, ino_t,
-	    struct workhead *);
-void	softdep_setup_sbupdate(struct ufsmount *, struct fs *, struct buf *);
-void	softdep_fsync_mountdev(struct vnode *);
-int	softdep_sync_metadata(struct vnode *);
-int	softdep_sync_buf(struct vnode *, struct buf *, int);
-int     softdep_fsync(struct vnode *);
-int	softdep_prealloc(struct vnode *, int);
-int	softdep_journal_lookup(struct mount *, struct vnode **);
-void	softdep_journal_freeblocks(struct inode *, struct ucred *, off_t, int);
-void	softdep_journal_fsync(struct inode *);
-void	softdep_buf_append(struct buf *, struct workhead *);
-void	softdep_inode_append(struct inode *, struct ucred *, struct workhead *);
-void	softdep_freework(struct workhead *);
-
-
-/*
- * Things to request flushing in softdep_request_cleanup()
- */
-#define	FLUSH_INODES		1
-#define	FLUSH_INODES_WAIT	2
-#define	FLUSH_BLOCKS		3
-#define	FLUSH_BLOCKS_WAIT	4
-/*
- * Flag to ffs_syncvnode() to request flushing of data only,
- * but skip the ffs_update() on the inode itself. Used to avoid
- * deadlock when flushing snapshot inodes while holding snaplk.
- */
-#define	NO_INO_UPDT		0x00000001
-
-int	ffs_rdonly(struct inode *);
-
-TAILQ_HEAD(snaphead, inode);
-
-struct snapdata {
-	LIST_ENTRY(snapdata) sn_link;
-	struct snaphead sn_head;
-	daddr_t sn_listsize;
-	daddr_t *sn_blklist;
-	struct lock sn_lock;
-};
-
-#endif /* _KERNEL */
-
-#endif /* !_UFS_FFS_EXTERN_H */
diff --git a/include.new/ufs/ffs/fs.h b/include.new/ufs/ffs/fs.h
deleted file mode 100644
index 5f0db2c..0000000
--- a/include.new/ufs/ffs/fs.h
+++ /dev/null
@@ -1,778 +0,0 @@
-/*-
- * 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.
- * 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.
- *
- *	@(#)fs.h	8.13 (Berkeley) 3/21/95
- * $FreeBSD: releng/10.2/sys/ufs/ffs/fs.h 262779 2014-03-05 04:23:19Z pfg $
- */
-
-#ifndef _UFS_FFS_FS_H_
-#define	_UFS_FFS_FS_H_
-
-#include <sys/mount.h>
-#include <ufs/ufs/dinode.h>
-
-/*
- * Each disk drive contains some number of filesystems.
- * A filesystem consists of a number of cylinder groups.
- * Each cylinder group has inodes and data.
- *
- * A filesystem is described by its super-block, which in turn
- * describes the cylinder groups.  The super-block is critical
- * data and is replicated in each cylinder group to protect against
- * catastrophic loss.  This is done at `newfs' time and the critical
- * super-block data does not change, so the copies need not be
- * referenced further unless disaster strikes.
- *
- * For filesystem fs, the offsets of the various blocks of interest
- * are given in the super block as:
- *	[fs->fs_sblkno]		Super-block
- *	[fs->fs_cblkno]		Cylinder group block
- *	[fs->fs_iblkno]		Inode blocks
- *	[fs->fs_dblkno]		Data blocks
- * The beginning of cylinder group cg in fs, is given by
- * the ``cgbase(fs, cg)'' macro.
- *
- * Depending on the architecture and the media, the superblock may
- * reside in any one of four places. For tiny media where every block
- * counts, it is placed at the very front of the partition. Historically,
- * UFS1 placed it 8K from the front to leave room for the disk label and
- * a small bootstrap. For UFS2 it got moved to 64K from the front to leave
- * room for the disk label and a bigger bootstrap, and for really piggy
- * systems we check at 256K from the front if the first three fail. In
- * all cases the size of the superblock will be SBLOCKSIZE. All values are
- * given in byte-offset form, so they do not imply a sector size. The
- * SBLOCKSEARCH specifies the order in which the locations should be searched.
- */
-#define	SBLOCK_FLOPPY	     0
-#define	SBLOCK_UFS1	  8192
-#define	SBLOCK_UFS2	 65536
-#define	SBLOCK_PIGGY	262144
-#define	SBLOCKSIZE	  8192
-#define	SBLOCKSEARCH \
-	{ SBLOCK_UFS2, SBLOCK_UFS1, SBLOCK_FLOPPY, SBLOCK_PIGGY, -1 }
-
-/*
- * Max number of fragments per block. This value is NOT tweakable.
- */
-#define	MAXFRAG 	8
-
-/*
- * Addresses stored in inodes are capable of addressing fragments
- * of `blocks'. File system blocks of at most size MAXBSIZE can
- * be optionally broken into 2, 4, or 8 pieces, each of which is
- * addressable; these pieces may be DEV_BSIZE, or some multiple of
- * a DEV_BSIZE unit.
- *
- * Large files consist of exclusively large data blocks.  To avoid
- * undue wasted disk space, the last data block of a small file may be
- * allocated as only as many fragments of a large block as are
- * necessary.  The filesystem format retains only a single pointer
- * to such a fragment, which is a piece of a single large block that
- * has been divided.  The size of such a fragment is determinable from
- * information in the inode, using the ``blksize(fs, ip, lbn)'' macro.
- *
- * The filesystem records space availability at the fragment level;
- * to determine block availability, aligned fragments are examined.
- */
-
-/*
- * MINBSIZE is the smallest allowable block size.
- * In order to insure that it is possible to create files of size
- * 2^32 with only two levels of indirection, MINBSIZE is set to 4096.
- * MINBSIZE must be big enough to hold a cylinder group block,
- * thus changes to (struct cg) must keep its size within MINBSIZE.
- * Note that super blocks are always of size SBLOCKSIZE,
- * and that both SBLOCKSIZE and MAXBSIZE must be >= MINBSIZE.
- */
-#define	MINBSIZE	4096
-
-/*
- * The path name on which the filesystem is mounted is maintained
- * in fs_fsmnt. MAXMNTLEN defines the amount of space allocated in
- * the super block for this name.
- */
-#define	MAXMNTLEN	468
-
-/*
- * The volume name for this filesystem is maintained in fs_volname.
- * MAXVOLLEN defines the length of the buffer allocated.
- */
-#define	MAXVOLLEN	32
-
-/*
- * There is a 128-byte region in the superblock reserved for in-core
- * pointers to summary information. Originally this included an array
- * of pointers to blocks of struct csum; now there are just a few
- * pointers and the remaining space is padded with fs_ocsp[].
- *
- * NOCSPTRS determines the size of this padding. One pointer (fs_csp)
- * is taken away to point to a contiguous array of struct csum for
- * all cylinder groups; a second (fs_maxcluster) points to an array
- * of cluster sizes that is computed as cylinder groups are inspected,
- * and the third points to an array that tracks the creation of new
- * directories. A fourth pointer, fs_active, is used when creating
- * snapshots; it points to a bitmap of cylinder groups for which the
- * free-block bitmap has changed since the snapshot operation began.
- */
-#define	NOCSPTRS	((128 / sizeof(void *)) - 4)
-
-/*
- * A summary of contiguous blocks of various sizes is maintained
- * in each cylinder group. Normally this is set by the initial
- * value of fs_maxcontig. To conserve space, a maximum summary size
- * is set by FS_MAXCONTIG.
- */
-#define	FS_MAXCONTIG	16
-
-/*
- * MINFREE gives the minimum acceptable percentage of filesystem
- * blocks which may be free. If the freelist drops below this level
- * only the superuser may continue to allocate blocks. This may
- * be set to 0 if no reserve of free blocks is deemed necessary,
- * however throughput drops by fifty percent if the filesystem
- * is run at between 95% and 100% full; thus the minimum default
- * value of fs_minfree is 5%. However, to get good clustering
- * performance, 10% is a better choice. hence we use 10% as our
- * default value. With 10% free space, fragmentation is not a
- * problem, so we choose to optimize for time.
- */
-#define	MINFREE		8
-#define	DEFAULTOPT	FS_OPTTIME
-
-/*
- * Grigoriy Orlov <gluk@ptci.ru> has done some extensive work to fine
- * tune the layout preferences for directories within a filesystem.
- * His algorithm can be tuned by adjusting the following parameters
- * which tell the system the average file size and the average number
- * of files per directory. These defaults are well selected for typical
- * filesystems, but may need to be tuned for odd cases like filesystems
- * being used for squid caches or news spools.
- */
-#define	AVFILESIZ	16384	/* expected average file size */
-#define	AFPDIR		64	/* expected number of files per directory */
-
-/*
- * The maximum number of snapshot nodes that can be associated
- * with each filesystem. This limit affects only the number of
- * snapshot files that can be recorded within the superblock so
- * that they can be found when the filesystem is mounted. However,
- * maintaining too many will slow the filesystem performance, so
- * having this limit is a good idea.
- */
-#define	FSMAXSNAP 20
-
-/*
- * Used to identify special blocks in snapshots:
- *
- * BLK_NOCOPY - A block that was unallocated at the time the snapshot
- *	was taken, hence does not need to be copied when written.
- * BLK_SNAP - A block held by another snapshot that is not needed by this
- *	snapshot. When the other snapshot is freed, the BLK_SNAP entries
- *	are converted to BLK_NOCOPY. These are needed to allow fsck to
- *	identify blocks that are in use by other snapshots (which are
- *	expunged from this snapshot).
- */
-#define	BLK_NOCOPY ((ufs2_daddr_t)(1))
-#define	BLK_SNAP ((ufs2_daddr_t)(2))
-
-/*
- * Sysctl values for the fast filesystem.
- */
-#define	FFS_ADJ_REFCNT		 1	/* adjust inode reference count */
-#define	FFS_ADJ_BLKCNT		 2	/* adjust inode used block count */
-#define	FFS_BLK_FREE		 3	/* free range of blocks in map */
-#define	FFS_DIR_FREE		 4	/* free specified dir inodes in map */
-#define	FFS_FILE_FREE		 5	/* free specified file inodes in map */
-#define	FFS_SET_FLAGS		 6	/* set filesystem flags */
-#define	FFS_ADJ_NDIR		 7	/* adjust number of directories */
-#define	FFS_ADJ_NBFREE		 8	/* adjust number of free blocks */
-#define	FFS_ADJ_NIFREE		 9	/* adjust number of free inodes */
-#define	FFS_ADJ_NFFREE		10 	/* adjust number of free frags */
-#define	FFS_ADJ_NUMCLUSTERS	11	/* adjust number of free clusters */
-#define	FFS_SET_CWD		12	/* set current directory */
-#define	FFS_SET_DOTDOT		13	/* set inode number for ".." */
-#define	FFS_UNLINK		14	/* remove a name in the filesystem */
-#define	FFS_SET_INODE		15	/* update an on-disk inode */
-#define	FFS_SET_BUFOUTPUT	16	/* set buffered writing on descriptor */
-#define	FFS_MAXID		16	/* number of valid ffs ids */
-
-/*
- * Command structure passed in to the filesystem to adjust filesystem values.
- */
-#define	FFS_CMD_VERSION		0x19790518	/* version ID */
-struct fsck_cmd {
-	int32_t	version;	/* version of command structure */
-	int32_t	handle;		/* reference to filesystem to be changed */
-	int64_t	value;		/* inode or block number to be affected */
-	int64_t	size;		/* amount or range to be adjusted */
-	int64_t	spare;		/* reserved for future use */
-};
-
-/*
- * Per cylinder group information; summarized in blocks allocated
- * from first cylinder group data blocks.  These blocks have to be
- * read in from fs_csaddr (size fs_cssize) in addition to the
- * super block.
- */
-struct csum {
-	int32_t	cs_ndir;		/* number of directories */
-	int32_t	cs_nbfree;		/* number of free blocks */
-	int32_t	cs_nifree;		/* number of free inodes */
-	int32_t	cs_nffree;		/* number of free frags */
-};
-struct csum_total {
-	int64_t	cs_ndir;		/* number of directories */
-	int64_t	cs_nbfree;		/* number of free blocks */
-	int64_t	cs_nifree;		/* number of free inodes */
-	int64_t	cs_nffree;		/* number of free frags */
-	int64_t	cs_numclusters;		/* number of free clusters */
-	int64_t	cs_spare[3];		/* future expansion */
-};
-
-/*
- * Super block for an FFS filesystem.
- */
-struct fs {
-	int32_t	 fs_firstfield;		/* historic filesystem linked list, */
-	int32_t	 fs_unused_1;		/*     used for incore super blocks */
-	int32_t	 fs_sblkno;		/* offset of super-block in filesys */
-	int32_t	 fs_cblkno;		/* offset of cyl-block in filesys */
-	int32_t	 fs_iblkno;		/* offset of inode-blocks in filesys */
-	int32_t	 fs_dblkno;		/* offset of first data after cg */
-	int32_t	 fs_old_cgoffset;	/* cylinder group offset in cylinder */
-	int32_t	 fs_old_cgmask;		/* used to calc mod fs_ntrak */
-	int32_t  fs_old_time;		/* last time written */
-	int32_t	 fs_old_size;		/* number of blocks in fs */
-	int32_t	 fs_old_dsize;		/* number of data blocks in fs */
-	uint32_t fs_ncg;		/* number of cylinder groups */
-	int32_t	 fs_bsize;		/* size of basic blocks in fs */
-	int32_t	 fs_fsize;		/* size of frag blocks in fs */
-	int32_t	 fs_frag;		/* number of frags in a block in fs */
-/* these are configuration parameters */
-	int32_t	 fs_minfree;		/* minimum percentage of free blocks */
-	int32_t	 fs_old_rotdelay;	/* num of ms for optimal next block */
-	int32_t	 fs_old_rps;		/* disk revolutions per second */
-/* these fields can be computed from the others */
-	int32_t	 fs_bmask;		/* ``blkoff'' calc of blk offsets */
-	int32_t	 fs_fmask;		/* ``fragoff'' calc of frag offsets */
-	int32_t	 fs_bshift;		/* ``lblkno'' calc of logical blkno */
-	int32_t	 fs_fshift;		/* ``numfrags'' calc number of frags */
-/* these are configuration parameters */
-	int32_t	 fs_maxcontig;		/* max number of contiguous blks */
-	int32_t	 fs_maxbpg;		/* max number of blks per cyl group */
-/* these fields can be computed from the others */
-	int32_t	 fs_fragshift;		/* block to frag shift */
-	int32_t	 fs_fsbtodb;		/* fsbtodb and dbtofsb shift constant */
-	int32_t	 fs_sbsize;		/* actual size of super block */
-	int32_t	 fs_spare1[2];		/* old fs_csmask */
-					/* old fs_csshift */
-	int32_t	 fs_nindir;		/* value of NINDIR */
-	uint32_t fs_inopb;		/* value of INOPB */
-	int32_t	 fs_old_nspf;		/* value of NSPF */
-/* yet another configuration parameter */
-	int32_t	 fs_optim;		/* optimization preference, see below */
-	int32_t	 fs_old_npsect;		/* # sectors/track including spares */
-	int32_t	 fs_old_interleave;	/* hardware sector interleave */
-	int32_t	 fs_old_trackskew;	/* sector 0 skew, per track */
-	int32_t	 fs_id[2];		/* unique filesystem id */
-/* sizes determined by number of cylinder groups and their sizes */
-	int32_t	 fs_old_csaddr;		/* blk addr of cyl grp summary area */
-	int32_t	 fs_cssize;		/* size of cyl grp summary area */
-	int32_t	 fs_cgsize;		/* cylinder group size */
-	int32_t	 fs_spare2;		/* old fs_ntrak */
-	int32_t	 fs_old_nsect;		/* sectors per track */
-	int32_t  fs_old_spc;		/* sectors per cylinder */
-	int32_t	 fs_old_ncyl;		/* cylinders in filesystem */
-	int32_t	 fs_old_cpg;		/* cylinders per group */
-	uint32_t fs_ipg;		/* inodes per group */
-	int32_t	 fs_fpg;		/* blocks per group * fs_frag */
-/* this data must be re-computed after crashes */
-	struct	csum fs_old_cstotal;	/* cylinder summary information */
-/* these fields are cleared at mount time */
-	int8_t   fs_fmod;		/* super block modified flag */
-	int8_t   fs_clean;		/* filesystem is clean flag */
-	int8_t 	 fs_ronly;		/* mounted read-only flag */
-	int8_t   fs_old_flags;		/* old FS_ flags */
-	u_char	 fs_fsmnt[MAXMNTLEN];	/* name mounted on */
-	u_char	 fs_volname[MAXVOLLEN];	/* volume name */
-	u_int64_t fs_swuid;		/* system-wide uid */
-	int32_t  fs_pad;		/* due to alignment of fs_swuid */
-/* these fields retain the current block allocation info */
-	int32_t	 fs_cgrotor;		/* last cg searched */
-	void 	*fs_ocsp[NOCSPTRS];	/* padding; was list of fs_cs buffers */
-	u_int8_t *fs_contigdirs;	/* (u) # of contig. allocated dirs */
-	struct	csum *fs_csp;		/* (u) cg summary info buffer */
-	int32_t	*fs_maxcluster;		/* (u) max cluster in each cyl group */
-	u_int	*fs_active;		/* (u) used by snapshots to track fs */
-	int32_t	 fs_old_cpc;		/* cyl per cycle in postbl */
-	int32_t	 fs_maxbsize;		/* maximum blocking factor permitted */
-	int64_t	 fs_unrefs;		/* number of unreferenced inodes */
-	int64_t  fs_providersize;	/* size of underlying GEOM provider */
-	int64_t	 fs_metaspace;		/* size of area reserved for metadata */
-	int64_t	 fs_sparecon64[14];	/* old rotation block list head */
-	int64_t	 fs_sblockloc;		/* byte offset of standard superblock */
-	struct	csum_total fs_cstotal;	/* (u) cylinder summary information */
-	ufs_time_t fs_time;		/* last time written */
-	int64_t	 fs_size;		/* number of blocks in fs */
-	int64_t	 fs_dsize;		/* number of data blocks in fs */
-	ufs2_daddr_t fs_csaddr;		/* blk addr of cyl grp summary area */
-	int64_t	 fs_pendingblocks;	/* (u) blocks being freed */
-	uint32_t fs_pendinginodes;	/* (u) inodes being freed */
-	uint32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */
-	uint32_t fs_avgfilesize;	/* expected average file size */
-	uint32_t fs_avgfpdir;		/* expected # of files per directory */
-	int32_t	 fs_save_cgsize;	/* save real cg size to use fs_bsize */
-	ufs_time_t fs_mtime;		/* Last mount or fsck time. */
-	int32_t  fs_sujfree;		/* SUJ free list */
-	int32_t	 fs_sparecon32[23];	/* reserved for future constants */
-	int32_t  fs_flags;		/* see FS_ flags below */
-	int32_t	 fs_contigsumsize;	/* size of cluster summary array */
-	int32_t	 fs_maxsymlinklen;	/* max length of an internal symlink */
-	int32_t	 fs_old_inodefmt;	/* format of on-disk inodes */
-	u_int64_t fs_maxfilesize;	/* maximum representable file size */
-	int64_t	 fs_qbmask;		/* ~fs_bmask for use with 64-bit size */
-	int64_t	 fs_qfmask;		/* ~fs_fmask for use with 64-bit size */
-	int32_t	 fs_state;		/* validate fs_clean field */
-	int32_t	 fs_old_postblformat;	/* format of positional layout tables */
-	int32_t	 fs_old_nrpos;		/* number of rotational positions */
-	int32_t	 fs_spare5[2];		/* old fs_postbloff */
-					/* old fs_rotbloff */
-	int32_t	 fs_magic;		/* magic number */
-};
-
-/* Sanity checking. */
-#ifdef CTASSERT
-CTASSERT(sizeof(struct fs) == 1376);
-#endif
-
-/*
- * Filesystem identification
- */
-#define	FS_UFS1_MAGIC	0x011954	/* UFS1 fast filesystem magic number */
-#define	FS_UFS2_MAGIC	0x19540119	/* UFS2 fast filesystem magic number */
-#define	FS_BAD_MAGIC	0x19960408	/* UFS incomplete newfs magic number */
-#define	FS_OKAY		0x7c269d38	/* superblock checksum */
-#define	FS_42INODEFMT	-1		/* 4.2BSD inode format */
-#define	FS_44INODEFMT	2		/* 4.4BSD inode format */
-
-/*
- * Preference for optimization.
- */
-#define	FS_OPTTIME	0	/* minimize allocation time */
-#define	FS_OPTSPACE	1	/* minimize disk fragmentation */
-
-/*
- * Filesystem flags.
- *
- * The FS_UNCLEAN flag is set by the kernel when the filesystem was
- * mounted with fs_clean set to zero. The FS_DOSOFTDEP flag indicates
- * that the filesystem should be managed by the soft updates code.
- * Note that the FS_NEEDSFSCK flag is set and cleared only by the
- * fsck utility. It is set when background fsck finds an unexpected
- * inconsistency which requires a traditional foreground fsck to be
- * run. Such inconsistencies should only be found after an uncorrectable
- * disk error. A foreground fsck will clear the FS_NEEDSFSCK flag when
- * it has successfully cleaned up the filesystem. The kernel uses this
- * flag to enforce that inconsistent filesystems be mounted read-only.
- * The FS_INDEXDIRS flag when set indicates that the kernel maintains
- * on-disk auxiliary indexes (such as B-trees) for speeding directory
- * accesses. Kernels that do not support auxiliary indicies clear the
- * flag to indicate that the indicies need to be rebuilt (by fsck) before
- * they can be used.
- *
- * FS_ACLS indicates that POSIX.1e ACLs are administratively enabled
- * for the file system, so they should be loaded from extended attributes,
- * observed for access control purposes, and be administered by object
- * owners.  FS_NFS4ACLS indicates that NFSv4 ACLs are administratively
- * enabled.  This flag is mutually exclusive with FS_ACLS.  FS_MULTILABEL
- * indicates that the TrustedBSD MAC Framework should attempt to back MAC
- * labels into extended attributes on the file system rather than maintain
- * a single mount label for all objects.
- */
-#define	FS_UNCLEAN	0x0001	/* filesystem not clean at mount */
-#define	FS_DOSOFTDEP	0x0002	/* filesystem using soft dependencies */
-#define	FS_NEEDSFSCK	0x0004	/* filesystem needs sync fsck before mount */
-#define	FS_SUJ       	0x0008	/* Filesystem using softupdate journal */
-#define	FS_ACLS		0x0010	/* file system has POSIX.1e ACLs enabled */
-#define	FS_MULTILABEL	0x0020	/* file system is MAC multi-label */
-#define	FS_GJOURNAL	0x0040	/* gjournaled file system */
-#define	FS_FLAGS_UPDATED 0x0080	/* flags have been moved to new location */
-#define	FS_NFS4ACLS	0x0100	/* file system has NFSv4 ACLs enabled */
-#define	FS_INDEXDIRS	0x0200	/* kernel supports indexed directories */
-#define	FS_TRIM		0x0400	/* issue BIO_DELETE for deleted blocks */
-
-/*
- * Macros to access bits in the fs_active array.
- */
-#define	ACTIVECGNUM(fs, cg)	((fs)->fs_active[(cg) / (NBBY * sizeof(int))])
-#define	ACTIVECGOFF(cg)		(1 << ((cg) % (NBBY * sizeof(int))))
-#define	ACTIVESET(fs, cg)	do {					\
-	if ((fs)->fs_active)						\
-		ACTIVECGNUM((fs), (cg)) |= ACTIVECGOFF((cg));		\
-} while (0)
-#define	ACTIVECLEAR(fs, cg)	do {					\
-	if ((fs)->fs_active)						\
-		ACTIVECGNUM((fs), (cg)) &= ~ACTIVECGOFF((cg));		\
-} while (0)
-
-/*
- * The size of a cylinder group is calculated by CGSIZE. The maximum size
- * is limited by the fact that cylinder groups are at most one block.
- * Its size is derived from the size of the maps maintained in the
- * cylinder group and the (struct cg) size.
- */
-#define	CGSIZE(fs) \
-    /* base cg */	(sizeof(struct cg) + sizeof(int32_t) + \
-    /* old btotoff */	(fs)->fs_old_cpg * sizeof(int32_t) + \
-    /* old boff */	(fs)->fs_old_cpg * sizeof(u_int16_t) + \
-    /* inode map */	howmany((fs)->fs_ipg, NBBY) + \
-    /* block map */	howmany((fs)->fs_fpg, NBBY) +\
-    /* if present */	((fs)->fs_contigsumsize <= 0 ? 0 : \
-    /* cluster sum */	(fs)->fs_contigsumsize * sizeof(int32_t) + \
-    /* cluster map */	howmany(fragstoblks(fs, (fs)->fs_fpg), NBBY)))
-
-/*
- * The minimal number of cylinder groups that should be created.
- */
-#define	MINCYLGRPS	4
-
-/*
- * Convert cylinder group to base address of its global summary info.
- */
-#define	fs_cs(fs, indx) fs_csp[indx]
-
-/*
- * Cylinder group block for a filesystem.
- */
-#define	CG_MAGIC	0x090255
-struct cg {
-	int32_t	 cg_firstfield;		/* historic cyl groups linked list */
-	int32_t	 cg_magic;		/* magic number */
-	int32_t  cg_old_time;		/* time last written */
-	uint32_t cg_cgx;		/* we are the cgx'th cylinder group */
-	int16_t	 cg_old_ncyl;		/* number of cyl's this cg */
-	int16_t  cg_old_niblk;		/* number of inode blocks this cg */
-	uint32_t cg_ndblk;		/* number of data blocks this cg */
-	struct	 csum cg_cs;		/* cylinder summary information */
-	uint32_t cg_rotor;		/* position of last used block */
-	uint32_t cg_frotor;		/* position of last used frag */
-	uint32_t cg_irotor;		/* position of last used inode */
-	uint32_t cg_frsum[MAXFRAG];	/* counts of available frags */
-	int32_t	 cg_old_btotoff;	/* (int32) block totals per cylinder */
-	int32_t	 cg_old_boff;		/* (u_int16) free block positions */
-	uint32_t cg_iusedoff;		/* (u_int8) used inode map */
-	uint32_t cg_freeoff;		/* (u_int8) free block map */
-	uint32_t cg_nextfreeoff;	/* (u_int8) next available space */
-	uint32_t cg_clustersumoff;	/* (u_int32) counts of avail clusters */
-	uint32_t cg_clusteroff;		/* (u_int8) free cluster map */
-	uint32_t cg_nclusterblks;	/* number of clusters this cg */
-	uint32_t cg_niblk;		/* number of inode blocks this cg */
-	uint32_t cg_initediblk;		/* last initialized inode */
-	uint32_t cg_unrefs;		/* number of unreferenced inodes */
-	int32_t	 cg_sparecon32[2];	/* reserved for future use */
-	ufs_time_t cg_time;		/* time last written */
-	int64_t	 cg_sparecon64[3];	/* reserved for future use */
-	u_int8_t cg_space[1];		/* space for cylinder group maps */
-/* actually longer */
-};
-
-/*
- * Macros for access to cylinder group array structures
- */
-#define	cg_chkmagic(cgp) ((cgp)->cg_magic == CG_MAGIC)
-#define	cg_inosused(cgp) \
-    ((u_int8_t *)((u_int8_t *)(cgp) + (cgp)->cg_iusedoff))
-#define	cg_blksfree(cgp) \
-    ((u_int8_t *)((u_int8_t *)(cgp) + (cgp)->cg_freeoff))
-#define	cg_clustersfree(cgp) \
-    ((u_int8_t *)((u_int8_t *)(cgp) + (cgp)->cg_clusteroff))
-#define	cg_clustersum(cgp) \
-    ((int32_t *)((uintptr_t)(cgp) + (cgp)->cg_clustersumoff))
-
-/*
- * Turn filesystem block numbers into disk block addresses.
- * This maps filesystem blocks to device size blocks.
- */
-#define	fsbtodb(fs, b)	((daddr_t)(b) << (fs)->fs_fsbtodb)
-#define	dbtofsb(fs, b)	((b) >> (fs)->fs_fsbtodb)
-
-/*
- * Cylinder group macros to locate things in cylinder groups.
- * They calc filesystem addresses of cylinder group data structures.
- */
-#define	cgbase(fs, c)	(((ufs2_daddr_t)(fs)->fs_fpg) * (c))
-#define	cgdata(fs, c)	(cgdmin(fs, c) + (fs)->fs_metaspace)	/* data zone */
-#define	cgmeta(fs, c)	(cgdmin(fs, c))				/* meta data */
-#define	cgdmin(fs, c)	(cgstart(fs, c) + (fs)->fs_dblkno)	/* 1st data */
-#define	cgimin(fs, c)	(cgstart(fs, c) + (fs)->fs_iblkno)	/* inode blk */
-#define	cgsblock(fs, c)	(cgstart(fs, c) + (fs)->fs_sblkno)	/* super blk */
-#define	cgtod(fs, c)	(cgstart(fs, c) + (fs)->fs_cblkno)	/* cg block */
-#define	cgstart(fs, c)							\
-       ((fs)->fs_magic == FS_UFS2_MAGIC ? cgbase(fs, c) :		\
-       (cgbase(fs, c) + (fs)->fs_old_cgoffset * ((c) & ~((fs)->fs_old_cgmask))))
-
-/*
- * Macros for handling inode numbers:
- *     inode number to filesystem block offset.
- *     inode number to cylinder group number.
- *     inode number to filesystem block address.
- */
-#define	ino_to_cg(fs, x)	(((ino_t)(x)) / (fs)->fs_ipg)
-#define	ino_to_fsba(fs, x)						\
-	((ufs2_daddr_t)(cgimin(fs, ino_to_cg(fs, (ino_t)(x))) +		\
-	    (blkstofrags((fs), ((((ino_t)(x)) % (fs)->fs_ipg) / INOPB(fs))))))
-#define	ino_to_fsbo(fs, x)	(((ino_t)(x)) % INOPB(fs))
-
-/*
- * Give cylinder group number for a filesystem block.
- * Give cylinder group block number for a filesystem block.
- */
-#define	dtog(fs, d)	((d) / (fs)->fs_fpg)
-#define	dtogd(fs, d)	((d) % (fs)->fs_fpg)
-
-/*
- * Extract the bits for a block from a map.
- * Compute the cylinder and rotational position of a cyl block addr.
- */
-#define	blkmap(fs, map, loc) \
-    (((map)[(loc) / NBBY] >> ((loc) % NBBY)) & (0xff >> (NBBY - (fs)->fs_frag)))
-
-/*
- * The following macros optimize certain frequently calculated
- * quantities by using shifts and masks in place of divisions
- * modulos and multiplications.
- */
-#define	blkoff(fs, loc)		/* calculates (loc % fs->fs_bsize) */ \
-	((loc) & (fs)->fs_qbmask)
-#define	fragoff(fs, loc)	/* calculates (loc % fs->fs_fsize) */ \
-	((loc) & (fs)->fs_qfmask)
-#define	lfragtosize(fs, frag)	/* calculates ((off_t)frag * fs->fs_fsize) */ \
-	(((off_t)(frag)) << (fs)->fs_fshift)
-#define	lblktosize(fs, blk)	/* calculates ((off_t)blk * fs->fs_bsize) */ \
-	(((off_t)(blk)) << (fs)->fs_bshift)
-/* Use this only when `blk' is known to be small, e.g., < NDADDR. */
-#define	smalllblktosize(fs, blk)    /* calculates (blk * fs->fs_bsize) */ \
-	((blk) << (fs)->fs_bshift)
-#define	lblkno(fs, loc)		/* calculates (loc / fs->fs_bsize) */ \
-	((loc) >> (fs)->fs_bshift)
-#define	numfrags(fs, loc)	/* calculates (loc / fs->fs_fsize) */ \
-	((loc) >> (fs)->fs_fshift)
-#define	blkroundup(fs, size)	/* calculates roundup(size, fs->fs_bsize) */ \
-	(((size) + (fs)->fs_qbmask) & (fs)->fs_bmask)
-#define	fragroundup(fs, size)	/* calculates roundup(size, fs->fs_fsize) */ \
-	(((size) + (fs)->fs_qfmask) & (fs)->fs_fmask)
-#define	fragstoblks(fs, frags)	/* calculates (frags / fs->fs_frag) */ \
-	((frags) >> (fs)->fs_fragshift)
-#define	blkstofrags(fs, blks)	/* calculates (blks * fs->fs_frag) */ \
-	((blks) << (fs)->fs_fragshift)
-#define	fragnum(fs, fsb)	/* calculates (fsb % fs->fs_frag) */ \
-	((fsb) & ((fs)->fs_frag - 1))
-#define	blknum(fs, fsb)		/* calculates rounddown(fsb, fs->fs_frag) */ \
-	((fsb) &~ ((fs)->fs_frag - 1))
-
-/*
- * Determine the number of available frags given a
- * percentage to hold in reserve.
- */
-#define	freespace(fs, percentreserved) \
-	(blkstofrags((fs), (fs)->fs_cstotal.cs_nbfree) + \
-	(fs)->fs_cstotal.cs_nffree - \
-	(((off_t)((fs)->fs_dsize)) * (percentreserved) / 100))
-
-/*
- * Determining the size of a file block in the filesystem.
- */
-#define	blksize(fs, ip, lbn) \
-	(((lbn) >= NDADDR || (ip)->i_size >= smalllblktosize(fs, (lbn) + 1)) \
-	    ? (fs)->fs_bsize \
-	    : (fragroundup(fs, blkoff(fs, (ip)->i_size))))
-#define	sblksize(fs, size, lbn) \
-	(((lbn) >= NDADDR || (size) >= ((lbn) + 1) << (fs)->fs_bshift) \
-	  ? (fs)->fs_bsize \
-	  : (fragroundup(fs, blkoff(fs, (size)))))
-
-/*
- * Number of indirects in a filesystem block.
- */
-#define	NINDIR(fs)	((fs)->fs_nindir)
-
-/*
- * Indirect lbns are aligned on NDADDR addresses where single indirects
- * are the negated address of the lowest lbn reachable, double indirects
- * are this lbn - 1 and triple indirects are this lbn - 2.  This yields
- * an unusual bit order to determine level.
- */
-static inline int
-lbn_level(ufs_lbn_t lbn)
-{
-	if (lbn >= 0)
-		return 0;
-	switch (lbn & 0x3) {
-	case 0:
-		return (0);
-	case 1:
-		break;
-	case 2:
-		return (2);
-	case 3:
-		return (1);
-	default:
-		break;
-	}
-	return (-1);
-}
-
-static inline ufs_lbn_t
-lbn_offset(struct fs *fs, int level)
-{
-	ufs_lbn_t res;
-
-	for (res = 1; level > 0; level--)
-		res *= NINDIR(fs);
-	return (res);
-}
-
-/*
- * Number of inodes in a secondary storage block/fragment.
- */
-#define	INOPB(fs)	((fs)->fs_inopb)
-#define	INOPF(fs)	((fs)->fs_inopb >> (fs)->fs_fragshift)
-
-/*
- * Softdep journal record format.
- */
-
-#define	JOP_ADDREF	1	/* Add a reference to an inode. */
-#define	JOP_REMREF	2	/* Remove a reference from an inode. */
-#define	JOP_NEWBLK	3	/* Allocate a block. */
-#define	JOP_FREEBLK	4	/* Free a block or a tree of blocks. */
-#define	JOP_MVREF	5	/* Move a reference from one off to another. */
-#define	JOP_TRUNC	6	/* Partial truncation record. */
-#define	JOP_SYNC	7	/* fsync() complete record. */
-
-#define	JREC_SIZE	32	/* Record and segment header size. */
-
-#define	SUJ_MIN		(4 * 1024 * 1024)	/* Minimum journal size */
-#define	SUJ_MAX		(32 * 1024 * 1024)	/* Maximum journal size */
-#define	SUJ_FILE	".sujournal"		/* Journal file name */
-
-/*
- * Size of the segment record header.  There is at most one for each disk
- * block in the journal.  The segment header is followed by an array of
- * records.  fsck depends on the first element in each record being 'op'
- * and the second being 'ino'.  Segments may span multiple disk blocks but
- * the header is present on each.
- */
-struct jsegrec {
-	uint64_t	jsr_seq;	/* Our sequence number */
-	uint64_t	jsr_oldest;	/* Oldest valid sequence number */
-	uint16_t	jsr_cnt;	/* Count of valid records */
-	uint16_t	jsr_blocks;	/* Count of device bsize blocks. */
-	uint32_t	jsr_crc;	/* 32bit crc of the valid space */
-	ufs_time_t	jsr_time;	/* timestamp for mount instance */
-};
-
-/*
- * Reference record.  Records a single link count modification.
- */
-struct jrefrec {
-	uint32_t	jr_op;
-	uint32_t	jr_ino;
-	uint32_t	jr_parent;
-	uint16_t	jr_nlink;
-	uint16_t	jr_mode;
-	int64_t		jr_diroff;
-	uint64_t	jr_unused;
-};
-
-/*
- * Move record.  Records a reference moving within a directory block.  The
- * nlink is unchanged but we must search both locations.
- */
-struct jmvrec {
-	uint32_t	jm_op;
-	uint32_t	jm_ino;
-	uint32_t	jm_parent;
-	uint16_t	jm_unused;
-	int64_t		jm_oldoff;
-	int64_t		jm_newoff;
-};
-
-/*
- * Block record.  A set of frags or tree of blocks starting at an indirect are
- * freed or a set of frags are allocated.
- */
-struct jblkrec {
-	uint32_t	jb_op;
-	uint32_t	jb_ino;
-	ufs2_daddr_t	jb_blkno;
-	ufs_lbn_t	jb_lbn;
-	uint16_t	jb_frags;
-	uint16_t	jb_oldfrags;
-	uint32_t	jb_unused;
-};
-
-/*
- * Truncation record.  Records a partial truncation so that it may be
- * completed at check time.  Also used for sync records.
- */
-struct jtrncrec {
-	uint32_t	jt_op;
-	uint32_t	jt_ino;
-	int64_t		jt_size;
-	uint32_t	jt_extsize;
-	uint32_t	jt_pad[3];
-};
-
-union jrec {
-	struct jsegrec	rec_jsegrec;
-	struct jrefrec	rec_jrefrec;
-	struct jmvrec	rec_jmvrec;
-	struct jblkrec	rec_jblkrec;
-	struct jtrncrec	rec_jtrncrec;
-};
-
-#ifdef CTASSERT
-CTASSERT(sizeof(struct jsegrec) == JREC_SIZE);
-CTASSERT(sizeof(struct jrefrec) == JREC_SIZE);
-CTASSERT(sizeof(struct jmvrec) == JREC_SIZE);
-CTASSERT(sizeof(struct jblkrec) == JREC_SIZE);
-CTASSERT(sizeof(struct jtrncrec) == JREC_SIZE);
-CTASSERT(sizeof(union jrec) == JREC_SIZE);
-#endif
-
-extern int inside[], around[];
-extern u_char *fragtbl[];
-
-/*
- * IOCTLs used for filesystem write suspension.
- */
-#define	UFSSUSPEND	_IOW('U', 1, fsid_t)
-#define	UFSRESUME	_IO('U', 2)
-
-#endif
diff --git a/include.new/ufs/ffs/softdep.h b/include.new/ufs/ffs/softdep.h
deleted file mode 100644
index 51add3e..0000000
--- a/include.new/ufs/ffs/softdep.h
+++ /dev/null
@@ -1,1098 +0,0 @@
-/*-
- * Copyright 1998, 2000 Marshall Kirk McKusick. All Rights Reserved.
- *
- * The soft updates code is derived from the appendix of a University
- * of Michigan technical report (Gregory R. Ganger and Yale N. Patt,
- * "Soft Updates: A Solution to the Metadata Update Problem in File
- * Systems", CSE-TR-254-95, August 1995).
- *
- * Further information about soft updates can be obtained from:
- *
- *	Marshall Kirk McKusick		http://www.mckusick.com/softdep/
- *	1614 Oxford Street		mckusick@mckusick.com
- *	Berkeley, CA 94709-1608		+1-510-843-9542
- *	USA
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY MARSHALL KIRK MCKUSICK ``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 MARSHALL KIRK MCKUSICK 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.
- *
- *	@(#)softdep.h	9.7 (McKusick) 6/21/00
- * $FreeBSD: releng/10.2/sys/ufs/ffs/softdep.h 278667 2015-02-13 08:40:10Z kib $
- */
-
-#include <sys/queue.h>
-
-/*
- * Allocation dependencies are handled with undo/redo on the in-memory
- * copy of the data. A particular data dependency is eliminated when
- * it is ALLCOMPLETE: that is ATTACHED, DEPCOMPLETE, and COMPLETE.
- * 
- * The ATTACHED flag means that the data is not currently being written
- * to disk.
- * 
- * The UNDONE flag means that the data has been rolled back to a safe
- * state for writing to the disk. When the I/O completes, the data is
- * restored to its current form and the state reverts to ATTACHED.
- * The data must be locked throughout the rollback, I/O, and roll
- * forward so that the rolled back information is never visible to
- * user processes.
- *
- * The COMPLETE flag indicates that the item has been written. For example,
- * a dependency that requires that an inode be written will be marked
- * COMPLETE after the inode has been written to disk.
- * 
- * The DEPCOMPLETE flag indicates the completion of any other
- * dependencies such as the writing of a cylinder group map has been
- * completed. A dependency structure may be freed only when both it
- * and its dependencies have completed and any rollbacks that are in
- * progress have finished as indicated by the set of ALLCOMPLETE flags
- * all being set.
- * 
- * The two MKDIR flags indicate additional dependencies that must be done
- * when creating a new directory. MKDIR_BODY is cleared when the directory
- * data block containing the "." and ".." entries has been written.
- * MKDIR_PARENT is cleared when the parent inode with the increased link
- * count for ".." has been written. When both MKDIR flags have been
- * cleared, the DEPCOMPLETE flag is set to indicate that the directory
- * dependencies have been completed. The writing of the directory inode
- * itself sets the COMPLETE flag which then allows the directory entry for
- * the new directory to be written to disk. The RMDIR flag marks a dirrem
- * structure as representing the removal of a directory rather than a
- * file. When the removal dependencies are completed, additional work needs
- * to be done* (an additional decrement of the associated inode, and a
- * decrement of the parent inode).
- *
- * The DIRCHG flag marks a diradd structure as representing the changing
- * of an existing entry rather than the addition of a new one. When
- * the update is complete the dirrem associated with the inode for
- * the old name must be added to the worklist to do the necessary
- * reference count decrement.
- * 
- * The GOINGAWAY flag indicates that the data structure is frozen from
- * further change until its dependencies have been completed and its
- * resources freed after which it will be discarded.
- *
- * The IOSTARTED flag prevents multiple calls to the I/O start routine from
- * doing multiple rollbacks.
- *
- * The NEWBLOCK flag marks pagedep structures that have just been allocated,
- * so must be claimed by the inode before all dependencies are complete.
- *
- * The INPROGRESS flag marks worklist structures that are still on the
- * worklist, but are being considered for action by some process.
- *
- * The UFS1FMT flag indicates that the inode being processed is a ufs1 format.
- *
- * The EXTDATA flag indicates that the allocdirect describes an
- * extended-attributes dependency.
- *
- * The ONWORKLIST flag shows whether the structure is currently linked
- * onto a worklist.
- *
- * The UNLINK* flags track the progress of updating the on-disk linked
- * list of active but unlinked inodes. When an inode is first unlinked
- * it is marked as UNLINKED. When its on-disk di_freelink has been
- * written its UNLINKNEXT flags is set. When its predecessor in the
- * list has its di_freelink pointing at us its UNLINKPREV is set.
- * When the on-disk list can reach it from the superblock, its
- * UNLINKONLIST flag is set. Once all of these flags are set, it
- * is safe to let its last name be removed.
- */
-#define	ATTACHED	0x000001
-#define	UNDONE		0x000002
-#define	COMPLETE	0x000004
-#define	DEPCOMPLETE	0x000008
-#define	MKDIR_PARENT	0x000010 /* diradd, mkdir, jaddref, jsegdep only */
-#define	MKDIR_BODY	0x000020 /* diradd, mkdir, jaddref only */
-#define	RMDIR		0x000040 /* dirrem only */
-#define	DIRCHG		0x000080 /* diradd, dirrem only */
-#define	GOINGAWAY	0x000100 /* indirdep, jremref only */
-#define	IOSTARTED	0x000200 /* inodedep, pagedep, bmsafemap only */
-#define	DELAYEDFREE	0x000400 /* allocindirect free delayed. */
-#define	NEWBLOCK	0x000800 /* pagedep, jaddref only */
-#define	INPROGRESS	0x001000 /* dirrem, freeblks, freefrag, freefile only */
-#define	UFS1FMT		0x002000 /* indirdep only */
-#define	EXTDATA		0x004000 /* allocdirect only */
-#define ONWORKLIST	0x008000
-#define	IOWAITING	0x010000 /* Thread is waiting for IO to complete. */
-#define	ONDEPLIST	0x020000 /* Structure is on a dependency list. */
-#define	UNLINKED	0x040000 /* inodedep has been unlinked. */
-#define	UNLINKNEXT	0x080000 /* inodedep has valid di_freelink */
-#define	UNLINKPREV	0x100000 /* inodedep is pointed at in the unlink list */
-#define	UNLINKONLIST	0x200000 /* inodedep is in the unlinked list on disk */
-#define	UNLINKLINKS	(UNLINKNEXT | UNLINKPREV)
-
-#define	ALLCOMPLETE	(ATTACHED | COMPLETE | DEPCOMPLETE)
-
-/*
- * Values for each of the soft dependency types.
- */
-#define	D_PAGEDEP	0
-#define	D_INODEDEP	1
-#define	D_BMSAFEMAP	2
-#define	D_NEWBLK	3
-#define	D_ALLOCDIRECT	4
-#define	D_INDIRDEP	5
-#define	D_ALLOCINDIR	6
-#define	D_FREEFRAG	7
-#define	D_FREEBLKS	8
-#define	D_FREEFILE	9
-#define	D_DIRADD	10
-#define	D_MKDIR		11
-#define	D_DIRREM	12
-#define	D_NEWDIRBLK	13
-#define	D_FREEWORK	14
-#define	D_FREEDEP	15
-#define	D_JADDREF	16
-#define	D_JREMREF	17
-#define	D_JMVREF	18
-#define	D_JNEWBLK	19
-#define	D_JFREEBLK	20
-#define	D_JFREEFRAG	21
-#define	D_JSEG		22
-#define	D_JSEGDEP	23
-#define	D_SBDEP		24
-#define	D_JTRUNC	25
-#define	D_JFSYNC	26
-#define	D_SENTINEL	27
-#define	D_LAST		D_SENTINEL
-
-/*
- * The workitem queue.
- * 
- * It is sometimes useful and/or necessary to clean up certain dependencies
- * in the background rather than during execution of an application process
- * or interrupt service routine. To realize this, we append dependency
- * structures corresponding to such tasks to a "workitem" queue. In a soft
- * updates implementation, most pending workitems should not wait for more
- * than a couple of seconds, so the filesystem syncer process awakens once
- * per second to process the items on the queue.
- */
-
-/* LIST_HEAD(workhead, worklist);	-- declared in buf.h */
-
-/*
- * Each request can be linked onto a work queue through its worklist structure.
- * To avoid the need for a pointer to the structure itself, this structure
- * MUST be declared FIRST in each type in which it appears! If more than one
- * worklist is needed in the structure, then a wk_data field must be added
- * and the macros below changed to use it.
- */
-struct worklist {
-	LIST_ENTRY(worklist)	wk_list;	/* list of work requests */
-	struct mount		*wk_mp;		/* Mount we live in */
-	unsigned int		wk_type:8,	/* type of request */
-				wk_state:24;	/* state flags */
-};
-#define	WK_DATA(wk) ((void *)(wk))
-#define	WK_PAGEDEP(wk) ((struct pagedep *)(wk))
-#define	WK_INODEDEP(wk) ((struct inodedep *)(wk))
-#define	WK_BMSAFEMAP(wk) ((struct bmsafemap *)(wk))
-#define	WK_NEWBLK(wk)  ((struct newblk *)(wk))
-#define	WK_ALLOCDIRECT(wk) ((struct allocdirect *)(wk))
-#define	WK_INDIRDEP(wk) ((struct indirdep *)(wk))
-#define	WK_ALLOCINDIR(wk) ((struct allocindir *)(wk))
-#define	WK_FREEFRAG(wk) ((struct freefrag *)(wk))
-#define	WK_FREEBLKS(wk) ((struct freeblks *)(wk))
-#define	WK_FREEWORK(wk) ((struct freework *)(wk))
-#define	WK_FREEFILE(wk) ((struct freefile *)(wk))
-#define	WK_DIRADD(wk) ((struct diradd *)(wk))
-#define	WK_MKDIR(wk) ((struct mkdir *)(wk))
-#define	WK_DIRREM(wk) ((struct dirrem *)(wk))
-#define	WK_NEWDIRBLK(wk) ((struct newdirblk *)(wk))
-#define	WK_JADDREF(wk) ((struct jaddref *)(wk))
-#define	WK_JREMREF(wk) ((struct jremref *)(wk))
-#define	WK_JMVREF(wk) ((struct jmvref *)(wk))
-#define	WK_JSEGDEP(wk) ((struct jsegdep *)(wk))
-#define	WK_JSEG(wk) ((struct jseg *)(wk))
-#define	WK_JNEWBLK(wk) ((struct jnewblk *)(wk))
-#define	WK_JFREEBLK(wk) ((struct jfreeblk *)(wk))
-#define	WK_FREEDEP(wk) ((struct freedep *)(wk))
-#define	WK_JFREEFRAG(wk) ((struct jfreefrag *)(wk))
-#define	WK_SBDEP(wk) ((struct sbdep *)(wk))
-#define	WK_JTRUNC(wk) ((struct jtrunc *)(wk))
-#define	WK_JFSYNC(wk) ((struct jfsync *)(wk))
-
-/*
- * Various types of lists
- */
-LIST_HEAD(dirremhd, dirrem);
-LIST_HEAD(diraddhd, diradd);
-LIST_HEAD(newblkhd, newblk);
-LIST_HEAD(inodedephd, inodedep);
-LIST_HEAD(allocindirhd, allocindir);
-LIST_HEAD(allocdirecthd, allocdirect);
-TAILQ_HEAD(allocdirectlst, allocdirect);
-LIST_HEAD(indirdephd, indirdep);
-LIST_HEAD(jaddrefhd, jaddref);
-LIST_HEAD(jremrefhd, jremref);
-LIST_HEAD(jmvrefhd, jmvref);
-LIST_HEAD(jnewblkhd, jnewblk);
-LIST_HEAD(jblkdephd, jblkdep);
-LIST_HEAD(freeworkhd, freework);
-TAILQ_HEAD(freeworklst, freework);
-TAILQ_HEAD(jseglst, jseg);
-TAILQ_HEAD(inoreflst, inoref);
-TAILQ_HEAD(freeblklst, freeblks);
-
-/*
- * The "pagedep" structure tracks the various dependencies related to
- * a particular directory page. If a directory page has any dependencies,
- * it will have a pagedep linked to its associated buffer. The
- * pd_dirremhd list holds the list of dirrem requests which decrement
- * inode reference counts. These requests are processed after the
- * directory page with the corresponding zero'ed entries has been
- * written. The pd_diraddhd list maintains the list of diradd requests
- * which cannot be committed until their corresponding inode has been
- * written to disk. Because a directory may have many new entries
- * being created, several lists are maintained hashed on bits of the
- * offset of the entry into the directory page to keep the lists from
- * getting too long. Once a new directory entry has been cleared to
- * be written, it is moved to the pd_pendinghd list. After the new
- * entry has been written to disk it is removed from the pd_pendinghd
- * list, any removed operations are done, and the dependency structure
- * is freed.
- */
-#define	DAHASHSZ 5
-#define	DIRADDHASH(offset) (((offset) >> 2) % DAHASHSZ)
-struct pagedep {
-	struct	worklist pd_list;	/* page buffer */
-#	define	pd_state pd_list.wk_state /* check for multiple I/O starts */
-	LIST_ENTRY(pagedep) pd_hash;	/* hashed lookup */
-	ino_t	pd_ino;			/* associated file */
-	ufs_lbn_t pd_lbn;		/* block within file */
-	struct	newdirblk *pd_newdirblk; /* associated newdirblk if NEWBLOCK */
-	struct	dirremhd pd_dirremhd;	/* dirrem's waiting for page */
-	struct	diraddhd pd_diraddhd[DAHASHSZ]; /* diradd dir entry updates */
-	struct	diraddhd pd_pendinghd;	/* directory entries awaiting write */
-	struct	jmvrefhd pd_jmvrefhd;	/* Dependent journal writes. */
-};
-
-/*
- * The "inodedep" structure tracks the set of dependencies associated
- * with an inode. One task that it must manage is delayed operations
- * (i.e., work requests that must be held until the inodedep's associated
- * inode has been written to disk). Getting an inode from its incore 
- * state to the disk requires two steps to be taken by the filesystem
- * in this order: first the inode must be copied to its disk buffer by
- * the VOP_UPDATE operation; second the inode's buffer must be written
- * to disk. To ensure that both operations have happened in the required
- * order, the inodedep maintains two lists. Delayed operations are
- * placed on the id_inowait list. When the VOP_UPDATE is done, all
- * operations on the id_inowait list are moved to the id_bufwait list.
- * When the buffer is written, the items on the id_bufwait list can be
- * safely moved to the work queue to be processed. A second task of the
- * inodedep structure is to track the status of block allocation within
- * the inode.  Each block that is allocated is represented by an
- * "allocdirect" structure (see below). It is linked onto the id_newinoupdt
- * list until both its contents and its allocation in the cylinder
- * group map have been written to disk. Once these dependencies have been
- * satisfied, it is removed from the id_newinoupdt list and any followup
- * actions such as releasing the previous block or fragment are placed
- * on the id_inowait list. When an inode is updated (a VOP_UPDATE is
- * done), the "inodedep" structure is linked onto the buffer through
- * its worklist. Thus, it will be notified when the buffer is about
- * to be written and when it is done. At the update time, all the
- * elements on the id_newinoupdt list are moved to the id_inoupdt list
- * since those changes are now relevant to the copy of the inode in the
- * buffer. Also at update time, the tasks on the id_inowait list are
- * moved to the id_bufwait list so that they will be executed when
- * the updated inode has been written to disk. When the buffer containing
- * the inode is written to disk, any updates listed on the id_inoupdt
- * list are rolled back as they are not yet safe. Following the write,
- * the changes are once again rolled forward and any actions on the
- * id_bufwait list are processed (since those actions are now safe).
- * The entries on the id_inoupdt and id_newinoupdt lists must be kept
- * sorted by logical block number to speed the calculation of the size
- * of the rolled back inode (see explanation in initiate_write_inodeblock).
- * When a directory entry is created, it is represented by a diradd.
- * The diradd is added to the id_inowait list as it cannot be safely
- * written to disk until the inode that it represents is on disk. After
- * the inode is written, the id_bufwait list is processed and the diradd
- * entries are moved to the id_pendinghd list where they remain until
- * the directory block containing the name has been written to disk.
- * The purpose of keeping the entries on the id_pendinghd list is so that
- * the softdep_fsync function can find and push the inode's directory
- * name(s) as part of the fsync operation for that file.
- */
-struct inodedep {
-	struct	worklist id_list;	/* buffer holding inode block */
-#	define	id_state id_list.wk_state /* inode dependency state */
-	LIST_ENTRY(inodedep) id_hash;	/* hashed lookup */
-	TAILQ_ENTRY(inodedep) id_unlinked;	/* Unlinked but ref'd inodes */
-	struct	fs *id_fs;		/* associated filesystem */
-	ino_t	id_ino;			/* dependent inode */
-	nlink_t	id_nlinkdelta;		/* saved effective link count */
-	nlink_t	id_savednlink;		/* Link saved during rollback */
-	LIST_ENTRY(inodedep) id_deps;	/* bmsafemap's list of inodedep's */
-	struct	bmsafemap *id_bmsafemap; /* related bmsafemap (if pending) */
-	struct	diradd *id_mkdiradd;	/* diradd for a mkdir. */
-	struct	inoreflst id_inoreflst;	/* Inode reference adjustments. */
-	long	id_savedextsize;	/* ext size saved during rollback */
-	off_t	id_savedsize;		/* file size saved during rollback */
-	struct	dirremhd id_dirremhd;	/* Removals pending. */
-	struct	workhead id_pendinghd;	/* entries awaiting directory write */
-	struct	workhead id_bufwait;	/* operations after inode written */
-	struct	workhead id_inowait;	/* operations waiting inode update */
-	struct	allocdirectlst id_inoupdt; /* updates before inode written */
-	struct	allocdirectlst id_newinoupdt; /* updates when inode written */
-	struct	allocdirectlst id_extupdt; /* extdata updates pre-inode write */
-	struct	allocdirectlst id_newextupdt; /* extdata updates at ino write */
-	struct	freeblklst id_freeblklst; /* List of partial truncates. */
-	union {
-	struct	ufs1_dinode *idu_savedino1; /* saved ufs1_dinode contents */
-	struct	ufs2_dinode *idu_savedino2; /* saved ufs2_dinode contents */
-	} id_un;
-};
-#define	id_savedino1 id_un.idu_savedino1
-#define	id_savedino2 id_un.idu_savedino2
-
-/*
- * A "bmsafemap" structure maintains a list of dependency structures
- * that depend on the update of a particular cylinder group map.
- * It has lists for newblks, allocdirects, allocindirs, and inodedeps.
- * It is attached to the buffer of a cylinder group block when any of
- * these things are allocated from the cylinder group. It is freed
- * after the cylinder group map is written and the state of its
- * dependencies are updated with DEPCOMPLETE to indicate that it has
- * been processed.
- */
-struct bmsafemap {
-	struct	worklist sm_list;	/* cylgrp buffer */
-#	define	sm_state sm_list.wk_state
-	LIST_ENTRY(bmsafemap) sm_hash;	/* Hash links. */
-	LIST_ENTRY(bmsafemap) sm_next;	/* Mount list. */
-	int	sm_cg;
-	struct	buf *sm_buf;		/* associated buffer */
-	struct	allocdirecthd sm_allocdirecthd; /* allocdirect deps */
-	struct	allocdirecthd sm_allocdirectwr; /* writing allocdirect deps */
-	struct	allocindirhd sm_allocindirhd; /* allocindir deps */
-	struct	allocindirhd sm_allocindirwr; /* writing allocindir deps */
-	struct	inodedephd sm_inodedephd; /* inodedep deps */
-	struct	inodedephd sm_inodedepwr; /* writing inodedep deps */
-	struct	newblkhd sm_newblkhd;	/* newblk deps */
-	struct	newblkhd sm_newblkwr;	/* writing newblk deps */
-	struct	jaddrefhd sm_jaddrefhd;	/* Pending inode allocations. */
-	struct	jnewblkhd sm_jnewblkhd;	/* Pending block allocations. */
-	struct	workhead sm_freehd;	/* Freedep deps. */
-	struct	workhead sm_freewr;	/* Written freedeps. */
-};
-
-/*
- * A "newblk" structure is attached to a bmsafemap structure when a block
- * or fragment is allocated from a cylinder group. Its state is set to
- * DEPCOMPLETE when its cylinder group map is written. It is converted to
- * an allocdirect or allocindir allocation once the allocator calls the
- * appropriate setup function. It will initially be linked onto a bmsafemap
- * list. Once converted it can be linked onto the lists described for
- * allocdirect or allocindir as described below.
- */ 
-struct newblk {
-	struct	worklist nb_list;	/* See comment above. */
-#	define	nb_state nb_list.wk_state
-	LIST_ENTRY(newblk) nb_hash;	/* Hashed lookup. */
-	LIST_ENTRY(newblk) nb_deps;	/* Bmsafemap's list of newblks. */
-	struct	jnewblk *nb_jnewblk;	/* New block journal entry. */
-	struct	bmsafemap *nb_bmsafemap;/* Cylgrp dep (if pending). */
-	struct	freefrag *nb_freefrag;	/* Fragment to be freed (if any). */
-	struct	indirdephd nb_indirdeps; /* Children indirect blocks. */
-	struct	workhead nb_newdirblk;	/* Dir block to notify when written. */
-	struct	workhead nb_jwork;	/* Journal work pending. */
-	ufs2_daddr_t	nb_newblkno;	/* New value of block pointer. */
-};
-
-/*
- * An "allocdirect" structure is attached to an "inodedep" when a new block
- * or fragment is allocated and pointed to by the inode described by
- * "inodedep". The worklist is linked to the buffer that holds the block.
- * When the block is first allocated, it is linked to the bmsafemap
- * structure associated with the buffer holding the cylinder group map
- * from which it was allocated. When the cylinder group map is written
- * to disk, ad_state has the DEPCOMPLETE flag set. When the block itself
- * is written, the COMPLETE flag is set. Once both the cylinder group map
- * and the data itself have been written, it is safe to write the inode
- * that claims the block. If there was a previous fragment that had been
- * allocated before the file was increased in size, the old fragment may
- * be freed once the inode claiming the new block is written to disk.
- * This ad_fragfree request is attached to the id_inowait list of the
- * associated inodedep (pointed to by ad_inodedep) for processing after
- * the inode is written. When a block is allocated to a directory, an
- * fsync of a file whose name is within that block must ensure not only
- * that the block containing the file name has been written, but also
- * that the on-disk inode references that block. When a new directory
- * block is created, we allocate a newdirblk structure which is linked
- * to the associated allocdirect (on its ad_newdirblk list). When the
- * allocdirect has been satisfied, the newdirblk structure is moved to
- * the inodedep id_bufwait list of its directory to await the inode
- * being written. When the inode is written, the directory entries are
- * fully committed and can be deleted from their pagedep->id_pendinghd
- * and inodedep->id_pendinghd lists.
- */
-struct allocdirect {
-	struct	newblk ad_block;	/* Common block logic */
-#	define	ad_list ad_block.nb_list /* block pointer worklist */
-#	define	ad_state ad_list.wk_state /* block pointer state */
-	TAILQ_ENTRY(allocdirect) ad_next; /* inodedep's list of allocdirect's */
-	struct	inodedep *ad_inodedep;	/* associated inodedep */
-	ufs2_daddr_t	ad_oldblkno;	/* old value of block pointer */
-	int		ad_offset;	/* Pointer offset in parent. */
-	long		ad_newsize;	/* size of new block */
-	long		ad_oldsize;	/* size of old block */
-};
-#define	ad_newblkno	ad_block.nb_newblkno
-#define	ad_freefrag	ad_block.nb_freefrag
-#define	ad_newdirblk	ad_block.nb_newdirblk
-
-/*
- * A single "indirdep" structure manages all allocation dependencies for
- * pointers in an indirect block. The up-to-date state of the indirect
- * block is stored in ir_savedata. The set of pointers that may be safely
- * written to the disk is stored in ir_safecopy. The state field is used
- * only to track whether the buffer is currently being written (in which
- * case it is not safe to update ir_safecopy). Ir_deplisthd contains the
- * list of allocindir structures, one for each block that needs to be
- * written to disk. Once the block and its bitmap allocation have been
- * written the safecopy can be updated to reflect the allocation and the
- * allocindir structure freed. If ir_state indicates that an I/O on the
- * indirect block is in progress when ir_safecopy is to be updated, the
- * update is deferred by placing the allocindir on the ir_donehd list.
- * When the I/O on the indirect block completes, the entries on the
- * ir_donehd list are processed by updating their corresponding ir_safecopy
- * pointers and then freeing the allocindir structure.
- */
-struct indirdep {
-	struct	worklist ir_list;	/* buffer holding indirect block */
-#	define	ir_state ir_list.wk_state /* indirect block pointer state */
-	LIST_ENTRY(indirdep) ir_next;	/* alloc{direct,indir} list */
-	TAILQ_HEAD(, freework) ir_trunc;	/* List of truncations. */
-	caddr_t	ir_saveddata;		/* buffer cache contents */
-	struct	buf *ir_savebp;		/* buffer holding safe copy */
-	struct	buf *ir_bp;		/* buffer holding live copy */
-	struct	allocindirhd ir_completehd; /* waiting for indirdep complete */
-	struct	allocindirhd ir_writehd; /* Waiting for the pointer write. */
-	struct	allocindirhd ir_donehd;	/* done waiting to update safecopy */
-	struct	allocindirhd ir_deplisthd; /* allocindir deps for this block */
-	struct	freeblks *ir_freeblks;	/* Freeblks that frees this indir. */
-};
-
-/*
- * An "allocindir" structure is attached to an "indirdep" when a new block
- * is allocated and pointed to by the indirect block described by the
- * "indirdep". The worklist is linked to the buffer that holds the new block.
- * When the block is first allocated, it is linked to the bmsafemap
- * structure associated with the buffer holding the cylinder group map
- * from which it was allocated. When the cylinder group map is written
- * to disk, ai_state has the DEPCOMPLETE flag set. When the block itself
- * is written, the COMPLETE flag is set. Once both the cylinder group map
- * and the data itself have been written, it is safe to write the entry in
- * the indirect block that claims the block; the "allocindir" dependency 
- * can then be freed as it is no longer applicable.
- */
-struct allocindir {
-	struct	newblk ai_block;	/* Common block area */
-#	define	ai_state ai_block.nb_list.wk_state /* indirect pointer state */
-	LIST_ENTRY(allocindir) ai_next;	/* indirdep's list of allocindir's */
-	struct	indirdep *ai_indirdep;	/* address of associated indirdep */
-	ufs2_daddr_t	ai_oldblkno;	/* old value of block pointer */
-	ufs_lbn_t	ai_lbn;		/* Logical block number. */
-	int		ai_offset;	/* Pointer offset in parent. */
-};
-#define	ai_newblkno	ai_block.nb_newblkno
-#define	ai_freefrag	ai_block.nb_freefrag
-#define	ai_newdirblk	ai_block.nb_newdirblk
-
-/*
- * The allblk union is used to size the newblk structure on allocation so
- * that it may be any one of three types.
- */
-union allblk {
-	struct	allocindir ab_allocindir;
-	struct	allocdirect ab_allocdirect;
-	struct	newblk	ab_newblk;
-};
-
-/*
- * A "freefrag" structure is attached to an "inodedep" when a previously
- * allocated fragment is replaced with a larger fragment, rather than extended.
- * The "freefrag" structure is constructed and attached when the replacement
- * block is first allocated. It is processed after the inode claiming the
- * bigger block that replaces it has been written to disk.
- */
-struct freefrag {
-	struct	worklist ff_list;	/* id_inowait or delayed worklist */
-#	define	ff_state ff_list.wk_state
-	struct	worklist *ff_jdep;	/* Associated journal entry. */
-	struct	workhead ff_jwork;	/* Journal work pending. */
-	ufs2_daddr_t ff_blkno;		/* fragment physical block number */
-	long	ff_fragsize;		/* size of fragment being deleted */
-	ino_t	ff_inum;		/* owning inode number */
-	enum	vtype ff_vtype;		/* owning inode's file type */
-};
-
-/*
- * A "freeblks" structure is attached to an "inodedep" when the
- * corresponding file's length is reduced to zero. It records all
- * the information needed to free the blocks of a file after its
- * zero'ed inode has been written to disk.  The actual work is done
- * by child freework structures which are responsible for individual
- * inode pointers while freeblks is responsible for retiring the
- * entire operation when it is complete and holding common members.
- */
-struct freeblks {
-	struct	worklist fb_list;	/* id_inowait or delayed worklist */
-#	define	fb_state fb_list.wk_state /* inode and dirty block state */
-	TAILQ_ENTRY(freeblks) fb_next;	/* List of inode truncates. */
-	struct	jblkdephd fb_jblkdephd;	/* Journal entries pending */
-	struct	workhead fb_freeworkhd;	/* Work items pending */
-	struct	workhead fb_jwork;	/* Journal work pending */
-	struct	vnode *fb_devvp;	/* filesystem device vnode */
-#ifdef QUOTA
-	struct	dquot *fb_quota[MAXQUOTAS]; /* quotas to be adjusted */
-#endif
-	uint64_t fb_modrev;		/* Inode revision at start of trunc. */
-	off_t	fb_len;			/* Length we're truncating to. */
-	ufs2_daddr_t fb_chkcnt;		/* Blocks released. */
-	ino_t	fb_inum;		/* inode owner of blocks */
-	enum	vtype fb_vtype;		/* inode owner's file type */
-	uid_t	fb_uid;			/* uid of previous owner of blocks */
-	int	fb_ref;			/* Children outstanding. */
-	int	fb_cgwait;		/* cg writes outstanding. */
-};
-
-/*
- * A "freework" structure handles the release of a tree of blocks or a single
- * block.  Each indirect block in a tree is allocated its own freework
- * structure so that the indirect block may be freed only when all of its
- * children are freed.  In this way we enforce the rule that an allocated
- * block must have a valid path to a root that is journaled.  Each child
- * block acquires a reference and when the ref hits zero the parent ref
- * is decremented.  If there is no parent the freeblks ref is decremented.
- */
-struct freework {
-	struct	worklist fw_list;		/* Delayed worklist. */
-#	define	fw_state fw_list.wk_state
-	LIST_ENTRY(freework) fw_segs;		/* Seg list. */
-	TAILQ_ENTRY(freework) fw_next;		/* Hash/Trunc list. */
-	struct	jnewblk	 *fw_jnewblk;		/* Journal entry to cancel. */
-	struct	freeblks *fw_freeblks;		/* Root of operation. */
-	struct	freework *fw_parent;		/* Parent indirect. */
-	struct	indirdep *fw_indir;		/* indirect block. */
-	ufs2_daddr_t	 fw_blkno;		/* Our block #. */
-	ufs_lbn_t	 fw_lbn;		/* Original lbn before free. */
-	uint16_t	 fw_frags;		/* Number of frags. */
-	uint16_t	 fw_ref;		/* Number of children out. */
-	uint16_t	 fw_off;		/* Current working position. */
-	uint16_t	 fw_start;		/* Start of partial truncate. */
-};
-
-/*
- * A "freedep" structure is allocated to track the completion of a bitmap
- * write for a freework.  One freedep may cover many freed blocks so long
- * as they reside in the same cylinder group.  When the cg is written
- * the freedep decrements the ref on the freework which may permit it
- * to be freed as well.
- */
-struct freedep {
-	struct	worklist fd_list;	/* Delayed worklist. */
-	struct	freework *fd_freework;	/* Parent freework. */
-};
-
-/*
- * A "freefile" structure is attached to an inode when its
- * link count is reduced to zero. It marks the inode as free in
- * the cylinder group map after the zero'ed inode has been written
- * to disk and any associated blocks and fragments have been freed.
- */
-struct freefile {
-	struct	worklist fx_list;	/* id_inowait or delayed worklist */
-	mode_t	fx_mode;		/* mode of inode */
-	ino_t	fx_oldinum;		/* inum of the unlinked file */
-	struct	vnode *fx_devvp;	/* filesystem device vnode */
-	struct	workhead fx_jwork;	/* journal work pending. */
-};
-
-/*
- * A "diradd" structure is linked to an "inodedep" id_inowait list when a
- * new directory entry is allocated that references the inode described
- * by "inodedep". When the inode itself is written (either the initial
- * allocation for new inodes or with the increased link count for
- * existing inodes), the COMPLETE flag is set in da_state. If the entry
- * is for a newly allocated inode, the "inodedep" structure is associated
- * with a bmsafemap which prevents the inode from being written to disk
- * until the cylinder group has been updated. Thus the da_state COMPLETE
- * flag cannot be set until the inode bitmap dependency has been removed.
- * When creating a new file, it is safe to write the directory entry that
- * claims the inode once the referenced inode has been written. Since
- * writing the inode clears the bitmap dependencies, the DEPCOMPLETE flag
- * in the diradd can be set unconditionally when creating a file. When
- * creating a directory, there are two additional dependencies described by
- * mkdir structures (see their description below). When these dependencies
- * are resolved the DEPCOMPLETE flag is set in the diradd structure.
- * If there are multiple links created to the same inode, there will be
- * a separate diradd structure created for each link. The diradd is
- * linked onto the pg_diraddhd list of the pagedep for the directory
- * page that contains the entry. When a directory page is written,
- * the pg_diraddhd list is traversed to rollback any entries that are
- * not yet ready to be written to disk. If a directory entry is being
- * changed (by rename) rather than added, the DIRCHG flag is set and
- * the da_previous entry points to the entry that will be "removed"
- * once the new entry has been committed. During rollback, entries
- * with da_previous are replaced with the previous inode number rather
- * than zero.
- *
- * The overlaying of da_pagedep and da_previous is done to keep the
- * structure down. If a da_previous entry is present, the pointer to its
- * pagedep is available in the associated dirrem entry. If the DIRCHG flag
- * is set, the da_previous entry is valid; if not set the da_pagedep entry
- * is valid. The DIRCHG flag never changes; it is set when the structure
- * is created if appropriate and is never cleared.
- */
-struct diradd {
-	struct	worklist da_list;	/* id_inowait or id_pendinghd list */
-#	define	da_state da_list.wk_state /* state of the new directory entry */
-	LIST_ENTRY(diradd) da_pdlist;	/* pagedep holding directory block */
-	doff_t	da_offset;		/* offset of new dir entry in dir blk */
-	ino_t	da_newinum;		/* inode number for the new dir entry */
-	union {
-	struct	dirrem *dau_previous;	/* entry being replaced in dir change */
-	struct	pagedep *dau_pagedep;	/* pagedep dependency for addition */
-	} da_un;
-	struct workhead da_jwork;	/* Journal work awaiting completion. */
-};
-#define	da_previous da_un.dau_previous
-#define	da_pagedep da_un.dau_pagedep
-
-/*
- * Two "mkdir" structures are needed to track the additional dependencies
- * associated with creating a new directory entry. Normally a directory
- * addition can be committed as soon as the newly referenced inode has been
- * written to disk with its increased link count. When a directory is
- * created there are two additional dependencies: writing the directory
- * data block containing the "." and ".." entries (MKDIR_BODY) and writing
- * the parent inode with the increased link count for ".." (MKDIR_PARENT).
- * These additional dependencies are tracked by two mkdir structures that
- * reference the associated "diradd" structure. When they have completed,
- * they set the DEPCOMPLETE flag on the diradd so that it knows that its
- * extra dependencies have been completed. The md_state field is used only
- * to identify which type of dependency the mkdir structure is tracking.
- * It is not used in the mainline code for any purpose other than consistency
- * checking. All the mkdir structures in the system are linked together on
- * a list. This list is needed so that a diradd can find its associated
- * mkdir structures and deallocate them if it is prematurely freed (as for
- * example if a mkdir is immediately followed by a rmdir of the same directory).
- * Here, the free of the diradd must traverse the list to find the associated
- * mkdir structures that reference it. The deletion would be faster if the
- * diradd structure were simply augmented to have two pointers that referenced
- * the associated mkdir's. However, this would increase the size of the diradd
- * structure to speed a very infrequent operation.
- */
-struct mkdir {
-	struct	worklist md_list;	/* id_inowait or buffer holding dir */
-#	define	md_state md_list.wk_state /* type: MKDIR_PARENT or MKDIR_BODY */
-	struct	diradd *md_diradd;	/* associated diradd */
-	struct	jaddref *md_jaddref;	/* dependent jaddref. */
-	struct	buf *md_buf;		/* MKDIR_BODY: buffer holding dir */
-	LIST_ENTRY(mkdir) md_mkdirs;	/* list of all mkdirs */
-};
-
-/*
- * A "dirrem" structure describes an operation to decrement the link
- * count on an inode. The dirrem structure is attached to the pg_dirremhd
- * list of the pagedep for the directory page that contains the entry.
- * It is processed after the directory page with the deleted entry has
- * been written to disk.
- */
-struct dirrem {
-	struct	worklist dm_list;	/* delayed worklist */
-#	define	dm_state dm_list.wk_state /* state of the old directory entry */
-	LIST_ENTRY(dirrem) dm_next;	/* pagedep's list of dirrem's */
-	LIST_ENTRY(dirrem) dm_inonext;	/* inodedep's list of dirrem's */
-	struct	jremrefhd dm_jremrefhd;	/* Pending remove reference deps. */
-	ino_t	dm_oldinum;		/* inum of the removed dir entry */
-	doff_t	dm_offset;		/* offset of removed dir entry in blk */
-	union {
-	struct	pagedep *dmu_pagedep;	/* pagedep dependency for remove */
-	ino_t	dmu_dirinum;		/* parent inode number (for rmdir) */
-	} dm_un;
-	struct workhead dm_jwork;	/* Journal work awaiting completion. */
-};
-#define	dm_pagedep dm_un.dmu_pagedep
-#define	dm_dirinum dm_un.dmu_dirinum
-
-/*
- * A "newdirblk" structure tracks the progress of a newly allocated
- * directory block from its creation until it is claimed by its on-disk
- * inode. When a block is allocated to a directory, an fsync of a file
- * whose name is within that block must ensure not only that the block
- * containing the file name has been written, but also that the on-disk
- * inode references that block. When a new directory block is created,
- * we allocate a newdirblk structure which is linked to the associated
- * allocdirect (on its ad_newdirblk list). When the allocdirect has been
- * satisfied, the newdirblk structure is moved to the inodedep id_bufwait
- * list of its directory to await the inode being written. When the inode
- * is written, the directory entries are fully committed and can be
- * deleted from their pagedep->id_pendinghd and inodedep->id_pendinghd
- * lists. Note that we could track directory blocks allocated to indirect
- * blocks using a similar scheme with the allocindir structures. Rather
- * than adding this level of complexity, we simply write those newly 
- * allocated indirect blocks synchronously as such allocations are rare.
- * In the case of a new directory the . and .. links are tracked with
- * a mkdir rather than a pagedep.  In this case we track the mkdir
- * so it can be released when it is written.  A workhead is used
- * to simplify canceling a mkdir that is removed by a subsequent dirrem.
- */
-struct newdirblk {
-	struct	worklist db_list;	/* id_inowait or pg_newdirblk */
-#	define	db_state db_list.wk_state
-	struct	pagedep *db_pagedep;	/* associated pagedep */
-	struct	workhead db_mkdir;
-};
-
-/*
- * The inoref structure holds the elements common to jaddref and jremref
- * so they may easily be queued in-order on the inodedep.
- */
-struct inoref {
-	struct	worklist if_list;	/* Journal pending or jseg entries. */
-#	define	if_state if_list.wk_state
-	TAILQ_ENTRY(inoref) if_deps;	/* Links for inodedep. */
-	struct	jsegdep	*if_jsegdep;	/* Will track our journal record. */
-	off_t		if_diroff;	/* Directory offset. */
-	ino_t		if_ino;		/* Inode number. */
-	ino_t		if_parent;	/* Parent inode number. */
-	nlink_t		if_nlink;	/* nlink before addition. */
-	uint16_t	if_mode;	/* File mode, needed for IFMT. */
-};
-
-/*
- * A "jaddref" structure tracks a new reference (link count) on an inode
- * and prevents the link count increase and bitmap allocation until a
- * journal entry can be written.  Once the journal entry is written,
- * the inode is put on the pendinghd of the bmsafemap and a diradd or
- * mkdir entry is placed on the bufwait list of the inode.  The DEPCOMPLETE
- * flag is used to indicate that all of the required information for writing
- * the journal entry is present.  MKDIR_BODY and MKDIR_PARENT are used to
- * differentiate . and .. links from regular file names.  NEWBLOCK indicates
- * a bitmap is still pending.  If a new reference is canceled by a delete
- * prior to writing the journal the jaddref write is canceled and the
- * structure persists to prevent any disk-visible changes until it is
- * ultimately released when the file is freed or the link is dropped again.
- */
-struct jaddref {
-	struct	inoref	ja_ref;		/* see inoref above. */
-#	define	ja_list	ja_ref.if_list	/* Jrnl pending, id_inowait, dm_jwork.*/
-#	define	ja_state ja_ref.if_list.wk_state
-	LIST_ENTRY(jaddref) ja_bmdeps;	/* Links for bmsafemap. */
-	union {
-		struct	diradd	*jau_diradd;	/* Pending diradd. */
-		struct	mkdir	*jau_mkdir;	/* MKDIR_{PARENT,BODY} */
-	} ja_un;
-};
-#define	ja_diradd	ja_un.jau_diradd
-#define	ja_mkdir	ja_un.jau_mkdir
-#define	ja_diroff	ja_ref.if_diroff
-#define	ja_ino		ja_ref.if_ino
-#define	ja_parent	ja_ref.if_parent
-#define	ja_mode		ja_ref.if_mode
-
-/*
- * A "jremref" structure tracks a removed reference (unlink) on an
- * inode and prevents the directory remove from proceeding until the
- * journal entry is written.  Once the journal has been written the remove
- * may proceed as normal. 
- */
-struct jremref {
-	struct	inoref	jr_ref;		/* see inoref above. */
-#	define	jr_list	jr_ref.if_list	/* Linked to softdep_journal_pending. */
-#	define	jr_state jr_ref.if_list.wk_state
-	LIST_ENTRY(jremref) jr_deps;	/* Links for dirrem. */
-	struct	dirrem	*jr_dirrem;	/* Back pointer to dirrem. */
-};
-
-/*
- * A "jmvref" structure tracks a name relocations within the same
- * directory block that occur as a result of directory compaction.
- * It prevents the updated directory entry from being written to disk
- * until the journal entry is written. Once the journal has been
- * written the compacted directory may be written to disk.
- */
-struct jmvref {
-	struct	worklist jm_list;	/* Linked to softdep_journal_pending. */
-	LIST_ENTRY(jmvref) jm_deps;	/* Jmvref on pagedep. */
-	struct pagedep	*jm_pagedep;	/* Back pointer to pagedep. */
-	ino_t		jm_parent;	/* Containing directory inode number. */
-	ino_t		jm_ino;		/* Inode number of our entry. */
-	off_t		jm_oldoff;	/* Our old offset in directory. */
-	off_t		jm_newoff;	/* Our new offset in directory. */
-};
-
-/*
- * A "jnewblk" structure tracks a newly allocated block or fragment and
- * prevents the direct or indirect block pointer as well as the cg bitmap
- * from being written until it is logged.  After it is logged the jsegdep
- * is attached to the allocdirect or allocindir until the operation is
- * completed or reverted.  If the operation is reverted prior to the journal
- * write the jnewblk structure is maintained to prevent the bitmaps from
- * reaching the disk.  Ultimately the jnewblk structure will be passed
- * to the free routine as the in memory cg is modified back to the free
- * state at which time it can be released. It may be held on any of the
- * fx_jwork, fw_jwork, fb_jwork, ff_jwork, nb_jwork, or ir_jwork lists.
- */
-struct jnewblk {
-	struct	worklist jn_list;	/* See lists above. */
-#	define	jn_state jn_list.wk_state
-	struct	jsegdep	*jn_jsegdep;	/* Will track our journal record. */
-	LIST_ENTRY(jnewblk) jn_deps;	/* Jnewblks on sm_jnewblkhd. */
-	struct	worklist *jn_dep;	/* Dependency to ref completed seg. */
-	ufs_lbn_t	jn_lbn;		/* Lbn to which allocated. */
-	ufs2_daddr_t	jn_blkno;	/* Blkno allocated */
-	ino_t		jn_ino;		/* Ino to which allocated. */
-	int		jn_oldfrags;	/* Previous fragments when extended. */
-	int		jn_frags;	/* Number of fragments. */
-};
-
-/*
- * A "jblkdep" structure tracks jfreeblk and jtrunc records attached to a
- * freeblks structure.
- */
-struct jblkdep {
-	struct	worklist jb_list;	/* For softdep journal pending. */
-	struct	jsegdep *jb_jsegdep;	/* Reference to the jseg. */
-	struct	freeblks *jb_freeblks;	/* Back pointer to freeblks. */
-	LIST_ENTRY(jblkdep) jb_deps;	/* Dep list on freeblks. */
-
-};
-
-/*
- * A "jfreeblk" structure tracks the journal write for freeing a block
- * or tree of blocks.  The block pointer must not be cleared in the inode
- * or indirect prior to the jfreeblk being written to the journal.
- */
-struct jfreeblk {
-	struct	jblkdep	jf_dep;		/* freeblks linkage. */
-	ufs_lbn_t	jf_lbn;		/* Lbn from which blocks freed. */
-	ufs2_daddr_t	jf_blkno;	/* Blkno being freed. */
-	ino_t		jf_ino;		/* Ino from which blocks freed. */
-	int		jf_frags;	/* Number of frags being freed. */
-};
-
-/*
- * A "jfreefrag" tracks the freeing of a single block when a fragment is
- * extended or an indirect page is replaced.  It is not part of a larger
- * freeblks operation.
- */
-struct jfreefrag {
-	struct	worklist fr_list;	/* Linked to softdep_journal_pending. */
-#	define	fr_state fr_list.wk_state
-	struct	jsegdep	*fr_jsegdep;	/* Will track our journal record. */
-	struct freefrag	*fr_freefrag;	/* Back pointer to freefrag. */
-	ufs_lbn_t	fr_lbn;		/* Lbn from which frag freed. */
-	ufs2_daddr_t	fr_blkno;	/* Blkno being freed. */
-	ino_t		fr_ino;		/* Ino from which frag freed. */
-	int		fr_frags;	/* Size of frag being freed. */
-};
-
-/*
- * A "jtrunc" journals the intent to truncate an inode's data or extent area.
- */
-struct jtrunc {
-	struct	jblkdep	jt_dep;		/* freeblks linkage. */
-	off_t		jt_size;	/* Final file size. */
-	int		jt_extsize;	/* Final extent size. */
-	ino_t		jt_ino;		/* Ino being truncated. */
-};
-
-/*
- * A "jfsync" journals the completion of an fsync which invalidates earlier
- * jtrunc records in the journal.
- */
-struct jfsync {
-	struct worklist	jfs_list;	/* For softdep journal pending. */
-	off_t		jfs_size;	/* Sync file size. */
-	int		jfs_extsize;	/* Sync extent size. */
-	ino_t		jfs_ino;	/* ino being synced. */
-};
-
-/*
- * A "jsegdep" structure tracks a single reference to a written journal
- * segment so the journal space can be reclaimed when all dependencies
- * have been written. It can hang off of id_inowait, dm_jwork, da_jwork,
- * nb_jwork, ff_jwork, or fb_jwork lists.
- */
-struct jsegdep {
-	struct	worklist jd_list;	/* See above for lists. */
-#	define	jd_state jd_list.wk_state
-	struct	jseg	*jd_seg;	/* Our journal record. */
-};
-
-/*
- * A "jseg" structure contains all of the journal records written in a
- * single disk write.  The jaddref and jremref structures are linked into
- * js_entries so thay may be completed when the write completes.  The
- * js_entries also include the write dependency structures: jmvref,
- * jnewblk, jfreeblk, jfreefrag, and jtrunc.  The js_refs field counts
- * the number of entries on the js_entries list. Thus there is a single
- * jseg entry to describe each journal write.
- */
-struct jseg {
-	struct	worklist js_list;	/* b_deps link for journal */
-#	define	js_state js_list.wk_state
-	struct	workhead js_entries;	/* Entries awaiting write */
-	LIST_HEAD(, freework) js_indirs;/* List of indirects in this seg. */
-	TAILQ_ENTRY(jseg) js_next;	/* List of all unfinished segments. */
-	struct	jblocks *js_jblocks;	/* Back pointer to block/seg list */
-	struct	buf *js_buf;		/* Buffer while unwritten */
-	uint64_t js_seq;		/* Journal record sequence number. */
-	uint64_t js_oldseq;		/* Oldest valid sequence number. */
-	int	js_size;		/* Size of journal record in bytes. */
-	int	js_cnt;			/* Total items allocated. */
-	int	js_refs;		/* Count of js_entries items. */
-};
-
-/*
- * A 'sbdep' structure tracks the head of the free inode list and
- * superblock writes.  This makes sure the superblock is always pointing at
- * the first possible unlinked inode for the suj recovery process.  If a
- * block write completes and we discover a new head is available the buf
- * is dirtied and the dep is kept. See the description of the UNLINK*
- * flags above for more details.
- */
-struct sbdep {
-	struct	worklist sb_list;	/* b_dep linkage */
-	struct	fs	*sb_fs;		/* Filesystem pointer within buf. */
-	struct	ufsmount *sb_ump;	/* Our mount structure */
-};
-
-/*
- * Private journaling structures.
- */
-struct jblocks {
-	struct jseglst	jb_segs;	/* TAILQ of current segments. */
-	struct jseg	*jb_writeseg;	/* Next write to complete. */
-	struct jseg	*jb_oldestseg;	/* Oldest segment with valid entries. */
-	struct jextent	*jb_extent;	/* Extent array. */
-	uint64_t	jb_nextseq;	/* Next sequence number. */
-	uint64_t	jb_oldestwrseq;	/* Oldest written sequence number. */
-	uint8_t		jb_needseg;	/* Need a forced segment. */
-	uint8_t		jb_suspended;	/* Did journal suspend writes? */
-	int		jb_avail;	/* Available extents. */
-	int		jb_used;	/* Last used extent. */
-	int		jb_head;	/* Allocator head. */
-	int		jb_off;		/* Allocator extent offset. */
-	int		jb_blocks;	/* Total disk blocks covered. */
-	int		jb_free;	/* Total disk blocks free. */
-	int		jb_min;		/* Minimum free space. */
-	int		jb_low;		/* Low on space. */
-	int		jb_age;		/* Insertion time of oldest rec. */
-};
-
-struct jextent {
-	ufs2_daddr_t	je_daddr;	/* Disk block address. */
-	int		je_blocks;	/* Disk block count. */
-};
-
-/*
- * Hash table declarations.
- */
-LIST_HEAD(mkdirlist, mkdir);
-LIST_HEAD(pagedep_hashhead, pagedep);
-LIST_HEAD(inodedep_hashhead, inodedep);
-LIST_HEAD(newblk_hashhead, newblk);
-LIST_HEAD(bmsafemap_hashhead, bmsafemap);
-TAILQ_HEAD(indir_hashhead, freework);
-
-/*
- * Per-filesystem soft dependency data.
- * Allocated at mount and freed at unmount.
- */
-struct mount_softdeps {
-	struct	rwlock sd_fslock;		/* softdep lock */
-	struct	workhead sd_workitem_pending;	/* softdep work queue */
-	struct	worklist *sd_worklist_tail;	/* Tail pointer for above */
-	struct	workhead sd_journal_pending;	/* journal work queue */
-	struct	worklist *sd_journal_tail;	/* Tail pointer for above */
-	struct	jblocks *sd_jblocks;		/* Journal block information */
-	struct	inodedeplst sd_unlinked;	/* Unlinked inodes */
-	struct	bmsafemaphd sd_dirtycg;		/* Dirty CGs */
-	struct	mkdirlist sd_mkdirlisthd;	/* Track mkdirs */
-	struct	pagedep_hashhead *sd_pdhash;	/* pagedep hash table */
-	u_long	sd_pdhashsize;			/* pagedep hash table size-1 */
-	long	sd_pdnextclean;			/* next hash bucket to clean */
-	struct	inodedep_hashhead *sd_idhash;	/* inodedep hash table */
-	u_long	sd_idhashsize;			/* inodedep hash table size-1 */
-	long	sd_idnextclean;			/* next hash bucket to clean */
-	struct	newblk_hashhead *sd_newblkhash;	/* newblk hash table */
-	u_long	sd_newblkhashsize;		/* newblk hash table size-1 */
-	struct	bmsafemap_hashhead *sd_bmhash;	/* bmsafemap hash table */
-	u_long	sd_bmhashsize;			/* bmsafemap hash table size-1*/
-	struct	indir_hashhead *sd_indirhash;	/* indir hash table */
-	u_long	sd_indirhashsize;		/* indir hash table size-1 */
-	int	sd_on_journal;			/* Items on the journal list */
-	int	sd_on_worklist;			/* Items on the worklist */
-	int	sd_deps;			/* Total dependency count */
-	int	sd_accdeps;			/* accumulated dep count */
-	int	sd_req;				/* Wakeup when deps hits 0. */
-	int	sd_flags;			/* comm with flushing thread */
-	int	sd_cleanups;			/* Calls to cleanup */
-	struct	thread *sd_flushtd;		/* thread handling flushing */
-	TAILQ_ENTRY(mount_softdeps) sd_next;	/* List of softdep filesystem */
-	struct	ufsmount *sd_ump;		/* our ufsmount structure */
-	u_long	sd_curdeps[D_LAST + 1];		/* count of current deps */
-};
-/*
- * Flags for communicating with the syncer thread.
- */
-#define FLUSH_EXIT	0x0001	/* time to exit */
-#define FLUSH_CLEANUP	0x0002	/* need to clear out softdep structures */
-#define	FLUSH_STARTING	0x0004	/* flush thread not yet started */
-
-/*
- * Keep the old names from when these were in the ufsmount structure.
- */
-#define	softdep_workitem_pending	um_softdep->sd_workitem_pending
-#define	softdep_worklist_tail		um_softdep->sd_worklist_tail
-#define	softdep_journal_pending		um_softdep->sd_journal_pending
-#define	softdep_journal_tail		um_softdep->sd_journal_tail
-#define	softdep_jblocks			um_softdep->sd_jblocks
-#define	softdep_unlinked		um_softdep->sd_unlinked
-#define	softdep_dirtycg			um_softdep->sd_dirtycg
-#define	softdep_mkdirlisthd		um_softdep->sd_mkdirlisthd
-#define	pagedep_hashtbl			um_softdep->sd_pdhash
-#define	pagedep_hash_size		um_softdep->sd_pdhashsize
-#define	pagedep_nextclean		um_softdep->sd_pdnextclean
-#define	inodedep_hashtbl		um_softdep->sd_idhash
-#define	inodedep_hash_size		um_softdep->sd_idhashsize
-#define	inodedep_nextclean		um_softdep->sd_idnextclean
-#define	newblk_hashtbl			um_softdep->sd_newblkhash
-#define	newblk_hash_size		um_softdep->sd_newblkhashsize
-#define	bmsafemap_hashtbl		um_softdep->sd_bmhash
-#define	bmsafemap_hash_size		um_softdep->sd_bmhashsize
-#define	indir_hashtbl			um_softdep->sd_indirhash
-#define	indir_hash_size			um_softdep->sd_indirhashsize
-#define	softdep_on_journal		um_softdep->sd_on_journal
-#define	softdep_on_worklist		um_softdep->sd_on_worklist
-#define	softdep_deps			um_softdep->sd_deps
-#define	softdep_accdeps			um_softdep->sd_accdeps
-#define	softdep_req			um_softdep->sd_req
-#define	softdep_flags			um_softdep->sd_flags
-#define	softdep_flushtd			um_softdep->sd_flushtd
-#define	softdep_curdeps			um_softdep->sd_curdeps
diff --git a/include.new/ufs/ufs/acl.h b/include.new/ufs/ufs/acl.h
deleted file mode 100644
index b2a917e..0000000
--- a/include.new/ufs/ufs/acl.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1999-2001 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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: releng/10.2/sys/ufs/ufs/acl.h 200796 2009-12-21 19:39:10Z trasz $
- */
-/*
- * Developed by the TrustedBSD Project.
- * Support for POSIX.1e access control lists.
- */
-
-#ifndef _UFS_UFS_ACL_H_
-#define	_UFS_UFS_ACL_H_
-
-#ifdef _KERNEL
-
-int	ufs_getacl_nfs4_internal(struct vnode *vp, struct acl *aclp, struct thread *td);
-int	ufs_setacl_nfs4_internal(struct vnode *vp, struct acl *aclp, struct thread *td);
-void	ufs_sync_acl_from_inode(struct inode *ip, struct acl *acl);
-void	ufs_sync_inode_from_acl(struct acl *acl, struct inode *ip);
-
-int	ufs_getacl(struct vop_getacl_args *);
-int	ufs_setacl(struct vop_setacl_args *);
-int	ufs_aclcheck(struct vop_aclcheck_args *);
-
-#endif /* !_KERNEL */
-
-#endif /* !_UFS_UFS_ACL_H_ */
diff --git a/include.new/ufs/ufs/dinode.h b/include.new/ufs/ufs/dinode.h
deleted file mode 100644
index 67b15fa..0000000
--- a/include.new/ufs/ufs/dinode.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*-
- * Copyright (c) 2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by Marshall
- * Kirk McKusick and Network Associates Laboratories, the Security
- * Research Division of Network Associates, Inc. under DARPA/SPAWAR
- * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
- * research program
- *
- * 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.
- *
- * 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.
- *
- * Copyright (c) 1982, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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 names of the authors 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.
- *
- *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/ufs/ufs/dinode.h 259223 2013-12-11 19:25:17Z pfg $
- */
-
-#ifndef _UFS_UFS_DINODE_H_
-#define	_UFS_UFS_DINODE_H_
-
-/*
- * The root inode is the root of the filesystem.  Inode 0 can't be used for
- * normal purposes and historically bad blocks were linked to inode 1, thus
- * the root inode is 2.  (Inode 1 is no longer used for this purpose, however
- * numerous dump tapes make this assumption, so we are stuck with it).
- */
-#define	ROOTINO	((ino_t)2)
-
-/*
- * The Whiteout inode# is a dummy non-zero inode number which will
- * never be allocated to a real file.  It is used as a place holder
- * in the directory entry which has been tagged as a DT_WHT entry.
- * See the comments about ROOTINO above.
- */
-#define	WINO	((ino_t)1)
-
-/*
- * The size of physical and logical block numbers and time fields in UFS.
- */
-typedef	int32_t	ufs1_daddr_t;
-typedef	int64_t	ufs2_daddr_t;
-typedef int64_t ufs_lbn_t;
-typedef int64_t ufs_time_t;
-
-/* File permissions. */
-#define	IEXEC		0000100		/* Executable. */
-#define	IWRITE		0000200		/* Writeable. */
-#define	IREAD		0000400		/* Readable. */
-#define	ISVTX		0001000		/* Sticky bit. */
-#define	ISGID		0002000		/* Set-gid. */
-#define	ISUID		0004000		/* Set-uid. */
-
-/* File types. */
-#define	IFMT		0170000		/* Mask of file type. */
-#define	IFIFO		0010000		/* Named pipe (fifo). */
-#define	IFCHR		0020000		/* Character device. */
-#define	IFDIR		0040000		/* Directory file. */
-#define	IFBLK		0060000		/* Block device. */
-#define	IFREG		0100000		/* Regular file. */
-#define	IFLNK		0120000		/* Symbolic link. */
-#define	IFSOCK		0140000		/* UNIX domain socket. */
-#define	IFWHT		0160000		/* Whiteout. */
-
-/*
- * A dinode contains all the meta-data associated with a UFS2 file.
- * This structure defines the on-disk format of a dinode. Since
- * this structure describes an on-disk structure, all its fields
- * are defined by types with precise widths.
- */
-
-#define	NXADDR	2			/* External addresses in inode. */
-#define	NDADDR	12			/* Direct addresses in inode. */
-#define	NIADDR	3			/* Indirect addresses in inode. */
-
-struct ufs2_dinode {
-	u_int16_t	di_mode;	/*   0: IFMT, permissions; see below. */
-	int16_t		di_nlink;	/*   2: File link count. */
-	uint32_t	di_uid;		/*   4: File owner. */
-	uint32_t	di_gid;		/*   8: File group. */
-	uint32_t	di_blksize;	/*  12: Inode blocksize. */
-	u_int64_t	di_size;	/*  16: File byte count. */
-	u_int64_t	di_blocks;	/*  24: Blocks actually held. */
-	ufs_time_t	di_atime;	/*  32: Last access time. */
-	ufs_time_t	di_mtime;	/*  40: Last modified time. */
-	ufs_time_t	di_ctime;	/*  48: Last inode change time. */
-	ufs_time_t	di_birthtime;	/*  56: Inode creation time. */
-	int32_t		di_mtimensec;	/*  64: Last modified time. */
-	int32_t		di_atimensec;	/*  68: Last access time. */
-	int32_t		di_ctimensec;	/*  72: Last inode change time. */
-	int32_t		di_birthnsec;	/*  76: Inode creation time. */
-	uint32_t	di_gen;		/*  80: Generation number. */
-	uint32_t	di_kernflags;	/*  84: Kernel flags. */
-	uint32_t	di_flags;	/*  88: Status flags (chflags). */
-	uint32_t	di_extsize;	/*  92: External attributes size. */
-	ufs2_daddr_t	di_extb[NXADDR];/*  96: External attributes block. */
-	ufs2_daddr_t	di_db[NDADDR];	/* 112: Direct disk blocks. */
-	ufs2_daddr_t	di_ib[NIADDR];	/* 208: Indirect disk blocks. */
-	u_int64_t	di_modrev;	/* 232: i_modrev for NFSv4 */
-	uint32_t	di_freelink;	/* 240: SUJ: Next unlinked inode. */
-	uint32_t	di_spare[3];	/* 244: Reserved; currently unused */
-};
-
-/*
- * The di_db fields may be overlaid with other information for
- * file types that do not have associated disk storage. Block
- * and character devices overlay the first data block with their
- * dev_t value. Short symbolic links place their path in the
- * di_db area.
- */
-#define	di_rdev di_db[0]
-
-/*
- * A UFS1 dinode contains all the meta-data associated with a UFS1 file.
- * This structure defines the on-disk format of a UFS1 dinode. Since
- * this structure describes an on-disk structure, all its fields
- * are defined by types with precise widths.
- */
-struct ufs1_dinode {
-	u_int16_t	di_mode;	/*   0: IFMT, permissions; see below. */
-	int16_t		di_nlink;	/*   2: File link count. */
-	uint32_t	di_freelink;	/*   4: SUJ: Next unlinked inode. */
-	u_int64_t	di_size;	/*   8: File byte count. */
-	int32_t		di_atime;	/*  16: Last access time. */
-	int32_t		di_atimensec;	/*  20: Last access time. */
-	int32_t		di_mtime;	/*  24: Last modified time. */
-	int32_t		di_mtimensec;	/*  28: Last modified time. */
-	int32_t		di_ctime;	/*  32: Last inode change time. */
-	int32_t		di_ctimensec;	/*  36: Last inode change time. */
-	ufs1_daddr_t	di_db[NDADDR];	/*  40: Direct disk blocks. */
-	ufs1_daddr_t	di_ib[NIADDR];	/*  88: Indirect disk blocks. */
-	uint32_t	di_flags;	/* 100: Status flags (chflags). */
-	uint32_t	di_blocks;	/* 104: Blocks actually held. */
-	uint32_t	di_gen;		/* 108: Generation number. */
-	uint32_t	di_uid;		/* 112: File owner. */
-	uint32_t	di_gid;		/* 116: File group. */
-	u_int64_t	di_modrev;	/* 120: i_modrev for NFSv4 */
-};
-
-#endif /* _UFS_UFS_DINODE_H_ */
diff --git a/include.new/ufs/ufs/dir.h b/include.new/ufs/ufs/dir.h
deleted file mode 100644
index 35484bb..0000000
--- a/include.new/ufs/ufs/dir.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)dir.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: releng/10.2/sys/ufs/ufs/dir.h 262779 2014-03-05 04:23:19Z pfg $
- */
-
-#ifndef _UFS_UFS_DIR_H_
-#define	_UFS_UFS_DIR_H_
-
-/*
- * Theoretically, directories can be more than 2Gb in length, however, in
- * practice this seems unlikely. So, we define the type doff_t as a 32-bit
- * quantity to keep down the cost of doing lookup on a 32-bit machine.
- */
-#define	doff_t		int32_t
-#define	MAXDIRSIZE	(0x7fffffff)
-
-/*
- * A directory consists of some number of blocks of DIRBLKSIZ
- * bytes, where DIRBLKSIZ is chosen such that it can be transferred
- * to disk in a single atomic operation (e.g. 512 bytes on most machines).
- *
- * Each DIRBLKSIZ byte block contains some number of directory entry
- * structures, which are of variable length.  Each directory entry has
- * a struct direct at the front of it, containing its inode number,
- * the length of the entry, and the length of the name contained in
- * the entry.  These are followed by the name padded to a 4 byte boundary
- * with null bytes.  All names are guaranteed null terminated.
- * The maximum length of a name in a directory is MAXNAMLEN.
- *
- * The macro DIRSIZ(fmt, dp) gives the amount of space required to represent
- * a directory entry.  Free space in a directory is represented by
- * entries which have dp->d_reclen > DIRSIZ(fmt, dp).  All DIRBLKSIZ bytes
- * in a directory block are claimed by the directory entries.  This
- * usually results in the last entry in a directory having a large
- * dp->d_reclen.  When entries are deleted from a directory, the
- * space is returned to the previous entry in the same directory
- * block by increasing its dp->d_reclen.  If the first entry of
- * a directory block is free, then its dp->d_ino is set to 0.
- * Entries other than the first in a directory do not normally have
- * dp->d_ino set to 0.
- */
-#define	DIRBLKSIZ	DEV_BSIZE
-#define	MAXNAMLEN	255
-
-struct	direct {
-	uint32_t d_ino;		/* inode number of entry */
-	u_int16_t d_reclen;		/* length of this record */
-	u_int8_t  d_type; 		/* file type, see below */
-	u_int8_t  d_namlen;		/* length of string in d_name */
-	char	  d_name[MAXNAMLEN + 1];/* name with length <= MAXNAMLEN */
-};
-
-/*
- * File types
- */
-#define	DT_UNKNOWN	 0
-#define	DT_FIFO		 1
-#define	DT_CHR		 2
-#define	DT_DIR		 4
-#define	DT_BLK		 6
-#define	DT_REG		 8
-#define	DT_LNK		10
-#define	DT_SOCK		12
-#define	DT_WHT		14
-
-/*
- * Convert between stat structure types and directory types.
- */
-#define	IFTODT(mode)	(((mode) & 0170000) >> 12)
-#define	DTTOIF(dirtype)	((dirtype) << 12)
-
-/*
- * The DIRSIZ macro gives the minimum record length which will hold
- * the directory entry.  This requires the amount of space in struct direct
- * without the d_name field, plus enough space for the name with a terminating
- * null byte (dp->d_namlen+1), rounded up to a 4 byte boundary.
- *
- * 
- */
-#define	DIRECTSIZ(namlen)						\
-	(((uintptr_t)&((struct direct *)0)->d_name +			\
-	  ((namlen)+1)*sizeof(((struct direct *)0)->d_name[0]) + 3) & ~3)
-#if (BYTE_ORDER == LITTLE_ENDIAN)
-#define	DIRSIZ(oldfmt, dp) \
-    ((oldfmt) ? DIRECTSIZ((dp)->d_type) : DIRECTSIZ((dp)->d_namlen))
-#else
-#define	DIRSIZ(oldfmt, dp) \
-    DIRECTSIZ((dp)->d_namlen)
-#endif
-#define	OLDDIRFMT	1
-#define	NEWDIRFMT	0
-
-/*
- * Template for manipulating directories.  Should use struct direct's,
- * but the name field is MAXNAMLEN - 1, and this just won't do.
- */
-struct dirtemplate {
-	uint32_t	dot_ino;
-	int16_t		dot_reclen;
-	u_int8_t	dot_type;
-	u_int8_t	dot_namlen;
-	char		dot_name[4];	/* must be multiple of 4 */
-	uint32_t	dotdot_ino;
-	int16_t		dotdot_reclen;
-	u_int8_t	dotdot_type;
-	u_int8_t	dotdot_namlen;
-	char		dotdot_name[4];	/* ditto */
-};
-
-/*
- * This is the old format of directories, sanz type element.
- */
-struct odirtemplate {
-	uint32_t	dot_ino;
-	int16_t		dot_reclen;
-	u_int16_t	dot_namlen;
-	char		dot_name[4];	/* must be multiple of 4 */
-	uint32_t	dotdot_ino;
-	int16_t		dotdot_reclen;
-	u_int16_t	dotdot_namlen;
-	char		dotdot_name[4];	/* ditto */
-};
-#endif /* !_DIR_H_ */
diff --git a/include.new/ufs/ufs/dirhash.h b/include.new/ufs/ufs/dirhash.h
deleted file mode 100644
index 74e3c77..0000000
--- a/include.new/ufs/ufs/dirhash.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * Copyright (c) 2001 Ian Dowse.  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.
- *
- * 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: releng/10.2/sys/ufs/ufs/dirhash.h 262779 2014-03-05 04:23:19Z pfg $
- */
-
-#ifndef _UFS_UFS_DIRHASH_H_
-#define	_UFS_UFS_DIRHASH_H_
-
-#include <sys/_lock.h>
-#include <sys/_sx.h>
-
-/*
- * For fast operations on large directories, we maintain a hash
- * that maps the file name to the offset of the directory entry within
- * the directory file.
- *
- * The hashing uses a dumb spillover to the next free slot on
- * collisions, so we must keep the utilisation low to avoid
- * long linear searches. Deleted entries that are not the last
- * in a chain must be marked DIRHASH_DEL.
- *
- * We also maintain information about free space in each block
- * to speed up creations.
- */
-#define	DIRHASH_EMPTY	(-1)	/* entry unused */
-#define	DIRHASH_DEL	(-2)	/* deleted entry; may be part of chain */
-
-#define	DIRALIGN	4
-#define	DH_NFSTATS	(DIRECTSIZ(MAXNAMLEN + 1) / DIRALIGN)
-				 /* max DIRALIGN words in a directory entry */
-
-/*
- * Dirhash uses a score mechanism to achieve a hybrid between a
- * least-recently-used and a least-often-used algorithm for entry
- * recycling. The score is incremented when a directory is used, and
- * decremented when the directory is a candidate for recycling. When
- * the score reaches zero, the hash is recycled. Hashes are linked
- * together on a TAILQ list, and hashes with higher scores filter
- * towards the tail (most recently used) end of the list.
- *
- * New hash entries are given an inital score of DH_SCOREINIT and are
- * placed at the most-recently-used end of the list. This helps a lot
- * in the worst-case case scenario where every directory access is
- * to a directory that is not hashed (i.e. the working set of hash
- * candidates is much larger than the configured memry limit). In this
- * case it limits the number of hash builds to 1/DH_SCOREINIT of the
- * number of accesses.
- */ 
-#define	DH_SCOREINIT	8	/* initial dh_score when dirhash built */
-#define	DH_SCOREMAX	64	/* max dh_score value */
-
-/*
- * The main hash table has 2 levels. It is an array of pointers to
- * blocks of DH_NBLKOFF offsets.
- */
-#define	DH_BLKOFFSHIFT	8
-#define	DH_NBLKOFF	(1 << DH_BLKOFFSHIFT)
-#define	DH_BLKOFFMASK	(DH_NBLKOFF - 1)
-
-#define	DH_ENTRY(dh, slot) \
-    ((dh)->dh_hash[(slot) >> DH_BLKOFFSHIFT][(slot) & DH_BLKOFFMASK])
-
-struct dirhash {
-	struct sx dh_lock;	/* protects all fields except list & score */
-	int	dh_refcount;
-
-	doff_t	**dh_hash;	/* the hash array (2-level) */
-	int	dh_narrays;	/* number of entries in dh_hash */
-	int	dh_hlen;	/* total slots in the 2-level hash array */
-	int	dh_hused;	/* entries in use */
-	int	dh_memreq;	/* Memory used. */
-
-	/* Free space statistics. XXX assumes DIRBLKSIZ is 512. */
-	u_int8_t *dh_blkfree;	/* free DIRALIGN words in each dir block */
-	int	dh_nblk;	/* size of dh_blkfree array */
-	int	dh_dirblks;	/* number of DIRBLKSIZ blocks in dir */
-	int	dh_firstfree[DH_NFSTATS + 1]; /* first blk with N words free */
-
-	doff_t	dh_seqoff;	/* sequential access optimisation offset */
-
-	int	dh_score;	/* access count for this dirhash */
-
-	int	dh_onlist;	/* true if on the ufsdirhash_list chain */
-
-	time_t	dh_lastused;	/* time the dirhash was last read or written*/
-
-	/* Protected by ufsdirhash_mtx. */
-	TAILQ_ENTRY(dirhash) dh_list;	/* chain of all dirhashes */
-};
-
-
-/*
- * Dirhash functions.
- */
-void	ufsdirhash_init(void);
-void	ufsdirhash_uninit(void);
-int	ufsdirhash_build(struct inode *);
-doff_t	ufsdirhash_findfree(struct inode *, int, int *);
-doff_t	ufsdirhash_enduseful(struct inode *);
-int	ufsdirhash_lookup(struct inode *, char *, int, doff_t *, struct buf **,
-	    doff_t *);
-void	ufsdirhash_newblk(struct inode *, doff_t);
-void	ufsdirhash_add(struct inode *, struct direct *, doff_t);
-void	ufsdirhash_remove(struct inode *, struct direct *, doff_t);
-void	ufsdirhash_move(struct inode *, struct direct *, doff_t, doff_t);
-void	ufsdirhash_dirtrunc(struct inode *, doff_t);
-void	ufsdirhash_free(struct inode *);
-
-void	ufsdirhash_checkblock(struct inode *, char *, doff_t);
-
-#endif /* !_UFS_UFS_DIRHASH_H_ */
diff --git a/include.new/ufs/ufs/extattr.h b/include.new/ufs/ufs/extattr.h
deleted file mode 100644
index 358e17a..0000000
--- a/include.new/ufs/ufs/extattr.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*-
- * Copyright (c) 1999-2001 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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: releng/10.2/sys/ufs/ufs/extattr.h 262779 2014-03-05 04:23:19Z pfg $
- */
-/*
- * Developed by the TrustedBSD Project.
- * Support for extended filesystem attributes.
- */
-
-#ifndef _UFS_UFS_EXTATTR_H_
-#define	_UFS_UFS_EXTATTR_H_
-
-#define	UFS_EXTATTR_MAGIC		0x00b5d5ec
-#define	UFS_EXTATTR_VERSION		0x00000003
-#define	UFS_EXTATTR_FSROOTSUBDIR	".attribute"
-#define	UFS_EXTATTR_SUBDIR_SYSTEM	"system"
-#define	UFS_EXTATTR_SUBDIR_USER		"user"
-#define	UFS_EXTATTR_MAXEXTATTRNAME	65	/* including null */
-
-#define	UFS_EXTATTR_ATTR_FLAG_INUSE	0x00000001	/* attr has been set */
-#define	UFS_EXTATTR_PERM_KERNEL		0x00000000
-#define	UFS_EXTATTR_PERM_ROOT		0x00000001
-#define	UFS_EXTATTR_PERM_OWNER		0x00000002
-#define	UFS_EXTATTR_PERM_ANYONE		0x00000003
-
-#define	UFS_EXTATTR_UEPM_INITIALIZED	0x00000001
-#define	UFS_EXTATTR_UEPM_STARTED	0x00000002
-
-#define	UFS_EXTATTR_CMD_START		0x00000001
-#define	UFS_EXTATTR_CMD_STOP		0x00000002
-#define	UFS_EXTATTR_CMD_ENABLE		0x00000003
-#define	UFS_EXTATTR_CMD_DISABLE		0x00000004
-
-struct ufs_extattr_fileheader {
-	u_int	uef_magic;	/* magic number for sanity checking */
-	u_int	uef_version;	/* version of attribute file */
-	u_int	uef_size;	/* size of attributes, w/o header */
-};
-
-struct ufs_extattr_header {
-	u_int	ueh_flags;	/* flags for attribute */
-	u_int	ueh_len;	/* local defined length; <= uef_size */
-	uint32_t	ueh_i_gen;	/* generation number for sanity */
-	/* data follows the header */
-};
-
-/*
- * This structure defines the required fields of an extended-attribute header.
- */
-struct extattr {
-	int32_t	ea_length;	    /* length of this attribute */
-	int8_t	ea_namespace;	    /* name space of this attribute */
-	int8_t	ea_contentpadlen;   /* bytes of padding at end of attribute */
-	int8_t	ea_namelength;	    /* length of attribute name */
-	char	ea_name[1];	    /* null-terminated attribute name */
-	/* extended attribute content follows */
-};
-
-/*
- * These macros are used to access and manipulate an extended attribute:
- *
- * EXTATTR_NEXT(eap) returns a pointer to the next extended attribute
- *	following eap.
- * EXTATTR_CONTENT(eap) returns a pointer to the extended attribute
- *	content referenced by eap.
- * EXTATTR_CONTENT_SIZE(eap) returns the size of the extended attribute
- *	content referenced by eap.
- * EXTATTR_SET_LENGTHS(eap, contentsize) called after initializing the
- *	attribute name to calculate and set the ea_length, ea_namelength,
- *	and ea_contentpadlen fields of the extended attribute structure.
- */
-#define	EXTATTR_NEXT(eap) \
-	((struct extattr *)(((void *)(eap)) + (eap)->ea_length))
-#define	EXTATTR_CONTENT(eap) (((void *)(eap)) + EXTATTR_BASE_LENGTH(eap))
-#define	EXTATTR_CONTENT_SIZE(eap) \
-	((eap)->ea_length - EXTATTR_BASE_LENGTH(eap) - (eap)->ea_contentpadlen)
-#define	EXTATTR_BASE_LENGTH(eap) \
-	((sizeof(struct extattr) + (eap)->ea_namelength + 7) & ~7)
-#define	EXTATTR_SET_LENGTHS(eap, contentsize) do { \
-	KASSERT(((eap)->ea_name[0] != 0), \
-		("Must initialize name before setting lengths")); \
-	(eap)->ea_namelength = strlen((eap)->ea_name); \
-	(eap)->ea_contentpadlen = ((contentsize) % 8) ? \
-		8 - ((contentsize) % 8) : 0; \
-	(eap)->ea_length = EXTATTR_BASE_LENGTH(eap) + \
-		(contentsize) + (eap)->ea_contentpadlen; \
-} while (0)
-
-#ifdef _KERNEL
-
-#include <sys/_sx.h>
-
-struct vnode;
-LIST_HEAD(ufs_extattr_list_head, ufs_extattr_list_entry);
-struct ufs_extattr_list_entry {
-	LIST_ENTRY(ufs_extattr_list_entry)	uele_entries;
-	struct ufs_extattr_fileheader		uele_fileheader;
-	int	uele_attrnamespace;
-	char	uele_attrname[UFS_EXTATTR_MAXEXTATTRNAME];
-	struct vnode	*uele_backing_vnode;
-};
-
-struct ucred;
-struct ufs_extattr_per_mount {
-	struct sx	uepm_lock;
-	struct ufs_extattr_list_head	uepm_list;
-	struct ucred	*uepm_ucred;
-	int	uepm_flags;
-};
-
-void	ufs_extattr_uepm_init(struct ufs_extattr_per_mount *uepm);
-void	ufs_extattr_uepm_destroy(struct ufs_extattr_per_mount *uepm);
-int	ufs_extattr_start(struct mount *mp, struct thread *td);
-int	ufs_extattr_autostart(struct mount *mp, struct thread *td);
-int	ufs_extattr_stop(struct mount *mp, struct thread *td);
-int	ufs_extattrctl(struct mount *mp, int cmd, struct vnode *filename,
-	    int attrnamespace, const char *attrname);
-int	ufs_getextattr(struct vop_getextattr_args *ap);
-int	ufs_deleteextattr(struct vop_deleteextattr_args *ap);
-int	ufs_setextattr(struct vop_setextattr_args *ap);
-void	ufs_extattr_vnode_inactive(struct vnode *vp, struct thread *td);
-
-#else
-
-/* User-level definition of KASSERT for macros above */
-#define	KASSERT(cond, str) do { \
-        if (!(cond)) { printf("panic: "); printf(str); printf("\n"); exit(1); }\
-} while (0)
-
-#endif /* !_KERNEL */
-
-#endif /* !_UFS_UFS_EXTATTR_H_ */
diff --git a/include.new/ufs/ufs/gjournal.h b/include.new/ufs/ufs/gjournal.h
deleted file mode 100644
index f29c0c8..0000000
--- a/include.new/ufs/ufs/gjournal.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2005-2006 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/ufs/ufs/gjournal.h 262779 2014-03-05 04:23:19Z pfg $
- */
-
-#ifndef _UFS_UFS_GJOURNAL_H_
-#define	_UFS_UFS_GJOURNAL_H_
-
-/*
- * GEOM journal function prototypes.
- */
-void	ufs_gjournal_orphan(struct vnode *fvp);
-void	ufs_gjournal_close(struct vnode *vp);
-#endif /* !_UFS_UFS_GJOURNAL_H_ */
diff --git a/include.new/ufs/ufs/inode.h b/include.new/ufs/ufs/inode.h
deleted file mode 100644
index a21f317..0000000
--- a/include.new/ufs/ufs/inode.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*-
- * Copyright (c) 1982, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD: releng/10.2/sys/ufs/ufs/inode.h 283640 2015-05-28 00:11:36Z mckusick $
- */
-
-#ifndef _UFS_UFS_INODE_H_
-#define	_UFS_UFS_INODE_H_
-
-#include <sys/lock.h>
-#include <sys/queue.h>
-#include <ufs/ufs/dinode.h>
-
-/*
- * This must agree with the definition in <ufs/ufs/dir.h>.
- */
-#define	doff_t		int32_t
-
-/*
- * The inode is used to describe each active (or recently active) file in the
- * UFS filesystem. It is composed of two types of information. The first part
- * is the information that is needed only while the file is active (such as
- * the identity of the file and linkage to speed its lookup). The second part
- * is the permanent meta-data associated with the file which is read in
- * from the permanent dinode from long term storage when the file becomes
- * active, and is put back when the file is no longer being used.
- *
- * An inode may only be changed while holding either the exclusive
- * vnode lock or the shared vnode lock and the vnode interlock. We use
- * the latter only for "read" and "get" operations that require
- * changing i_flag, or a timestamp. This locking protocol allows executing
- * those operations without having to upgrade the vnode lock from shared to
- * exclusive.
- */
-struct inode {
-	TAILQ_ENTRY(inode) i_nextsnap; /* snapshot file list. */
-	struct	vnode  *i_vnode;/* Vnode associated with this inode. */
-	struct	ufsmount *i_ump;/* Ufsmount point associated with this inode. */
-	uint32_t i_flag;	/* flags, see below */
-	struct cdev *i_dev;	/* Device associated with the inode. */
-	ino_t	  i_number;	/* The identity of the inode. */
-	int	  i_effnlink;	/* i_nlink when I/O completes */
-
-	struct	 fs *i_fs;	/* Associated filesystem superblock. */
-	struct	 dquot *i_dquot[MAXQUOTAS]; /* Dquot structures. */
-	/*
-	 * Side effects; used during directory lookup.
-	 */
-	int32_t	  i_count;	/* Size of free slot in directory. */
-	doff_t	  i_endoff;	/* End of useful stuff in directory. */
-	doff_t	  i_diroff;	/* Offset in dir, where we found last entry. */
-	doff_t	  i_offset;	/* Offset of free space in directory. */
-
-	union {
-		struct dirhash *dirhash; /* Hashing for large directories. */
-		daddr_t *snapblklist;    /* Collect expunged snapshot blocks. */
-	} i_un;
-
-	int	i_nextclustercg; /* last cg searched for cluster */
-
-	/*
-	 * Data for extended attribute modification.
- 	 */
-	u_char	  *i_ea_area;	/* Pointer to malloced copy of EA area */
-	unsigned  i_ea_len;	/* Length of i_ea_area */
-	int	  i_ea_error;	/* First errno in transaction */
-	int	  i_ea_refs;	/* Number of users of EA area */
-
-	/*
-	 * Copies from the on-disk dinode itself.
-	 */
-	u_int16_t i_mode;	/* IFMT, permissions; see below. */
-	int16_t	  i_nlink;	/* File link count. */
-	u_int64_t i_size;	/* File byte count. */
-	uint32_t i_flags;	/* Status flags (chflags). */
-	u_int64_t i_gen;	/* Generation number. */
-	uint32_t i_uid;	/* File owner. */
-	uint32_t i_gid;	/* File group. */
-	/*
-	 * The real copy of the on-disk inode.
-	 */
-	union {
-		struct ufs1_dinode *din1;	/* UFS1 on-disk dinode. */
-		struct ufs2_dinode *din2;	/* UFS2 on-disk dinode. */
-	} dinode_u;
-};
-/*
- * These flags are kept in i_flag.
- */
-#define	IN_ACCESS	0x0001		/* Access time update request. */
-#define	IN_CHANGE	0x0002		/* Inode change time update request. */
-#define	IN_UPDATE	0x0004		/* Modification time update request. */
-#define	IN_MODIFIED	0x0008		/* Inode has been modified. */
-#define	IN_NEEDSYNC	0x0010		/* Inode requires fsync. */
-#define	IN_LAZYMOD	0x0040		/* Modified, but don't write yet. */
-#define	IN_LAZYACCESS	0x0100		/* Process IN_ACCESS after the
-					   suspension finished */
-#define	IN_EA_LOCKED	0x0200
-#define	IN_EA_LOCKWAIT	0x0400
-
-#define	IN_TRUNCATED	0x0800		/* Journaled truncation pending. */
-
-#define	i_devvp i_ump->um_devvp
-#define	i_umbufobj i_ump->um_bo
-#define	i_dirhash i_un.dirhash
-#define	i_snapblklist i_un.snapblklist
-#define	i_din1 dinode_u.din1
-#define	i_din2 dinode_u.din2
-
-#ifdef _KERNEL
-/*
- * The DIP macro is used to access fields in the dinode that are
- * not cached in the inode itself.
- */
-#define	DIP(ip, field) \
-	(((ip)->i_ump->um_fstype == UFS1) ? \
-	(ip)->i_din1->d##field : (ip)->i_din2->d##field)
-#define	DIP_SET(ip, field, val) do { \
-	if ((ip)->i_ump->um_fstype == UFS1) \
-		(ip)->i_din1->d##field = (val); \
-	else \
-		(ip)->i_din2->d##field = (val); \
-	} while (0)
-
-#define	SHORTLINK(ip) \
-	(((ip)->i_ump->um_fstype == UFS1) ? \
-	(caddr_t)(ip)->i_din1->di_db : (caddr_t)(ip)->i_din2->di_db)
-#define	IS_SNAPSHOT(ip)		((ip)->i_flags & SF_SNAPSHOT)
-
-/*
- * Structure used to pass around logical block paths generated by
- * ufs_getlbns and used by truncate and bmap code.
- */
-struct indir {
-	ufs2_daddr_t in_lbn;		/* Logical block number. */
-	int	in_off;			/* Offset in buffer. */
-};
-
-/* Convert between inode pointers and vnode pointers. */
-#define	VTOI(vp)	((struct inode *)(vp)->v_data)
-#define	ITOV(ip)	((ip)->i_vnode)
-
-/* Determine if soft dependencies are being done */
-#define	DOINGSOFTDEP(vp)   ((vp)->v_mount->mnt_flag & (MNT_SOFTDEP | MNT_SUJ))
-#define	MOUNTEDSOFTDEP(mp) ((mp)->mnt_flag & (MNT_SOFTDEP | MNT_SUJ))
-#define	DOINGSUJ(vp)	   ((vp)->v_mount->mnt_flag & MNT_SUJ)
-#define	MOUNTEDSUJ(mp)	   ((mp)->mnt_flag & MNT_SUJ)
-
-/* This overlays the fid structure (see mount.h). */
-struct ufid {
-	u_int16_t ufid_len;	/* Length of structure. */
-	u_int16_t ufid_pad;	/* Force 32-bit alignment. */
-	uint32_t  ufid_ino;	/* File number (ino). */
-	uint32_t  ufid_gen;	/* Generation number. */
-};
-#endif /* _KERNEL */
-
-#endif /* !_UFS_UFS_INODE_H_ */
diff --git a/include.new/ufs/ufs/quota.h b/include.new/ufs/ufs/quota.h
deleted file mode 100644
index 0f207d5..0000000
--- a/include.new/ufs/ufs/quota.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Robert Elz at The University of Melbourne.
- *
- * 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.
- * 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.
- *
- *	@(#)quota.h	8.3 (Berkeley) 8/19/94
- * $FreeBSD: releng/10.2/sys/ufs/ufs/quota.h 262779 2014-03-05 04:23:19Z pfg $
- */
-
-#ifndef _UFS_UFS_QUOTA_H_
-#define	_UFS_UFS_QUOTA_H_
-
-/*
- * Definitions for disk quotas imposed on the average user
- * (big brother finally hits UNIX).
- *
- * The following constants define the amount of time given a user before the
- * soft limits are treated as hard limits (usually resulting in an allocation
- * failure). The timer is started when the user crosses their soft limit, it
- * is reset when they go below their soft limit.
- */
-#define	MAX_IQ_TIME	(7*24*60*60)	/* seconds in 1 week */
-#define	MAX_DQ_TIME	(7*24*60*60)	/* seconds in 1 week */
-
-/*
- * The following constants define the usage of the quota file array in the
- * ufsmount structure and dquot array in the inode structure.  The semantics
- * of the elements of these arrays are defined in the routine getinoquota;
- * the remainder of the quota code treats them generically and need not be
- * inspected when changing the size of the array.
- */
-#define	MAXQUOTAS	2
-#define	USRQUOTA	0	/* element used for user quotas */
-#define	GRPQUOTA	1	/* element used for group quotas */
-
-/*
- * Definitions for the default names of the quotas files.
- */
-#define	INITQFNAMES { \
-	"user",		/* USRQUOTA */ \
-	"group",	/* GRPQUOTA */ \
-	"undefined", \
-}
-#define	QUOTAFILENAME	"quota"
-#define	QUOTAGROUP	"operator"
-
-/*
- * Command definitions for the 'quotactl' system call.  The commands are
- * broken into a main command defined below and a subcommand that is used
- * to convey the type of quota that is being manipulated (see above).
- */
-#define	SUBCMDMASK	0x00ff
-#define	SUBCMDSHIFT	8
-#define	QCMD(cmd, type)	(((cmd) << SUBCMDSHIFT) | ((type) & SUBCMDMASK))
-
-#define	Q_QUOTAON	0x0100	/* enable quotas */
-#define	Q_QUOTAOFF	0x0200	/* disable quotas */
-#define	Q_GETQUOTA32	0x0300	/* get limits and usage (32-bit version) */
-#define	Q_SETQUOTA32	0x0400	/* set limits and usage (32-bit version) */
-#define	Q_SETUSE32	0x0500	/* set usage (32-bit version) */
-#define	Q_SYNC		0x0600	/* sync disk copy of a filesystems quotas */
-#define	Q_GETQUOTA	0x0700	/* get limits and usage (64-bit version) */
-#define	Q_SETQUOTA	0x0800	/* set limits and usage (64-bit version) */
-#define	Q_SETUSE	0x0900	/* set usage (64-bit version) */
-#define	Q_GETQUOTASIZE	0x0A00	/* get bit-size of quota file fields */
-
-/*
- * The following structure defines the format of the disk quota file
- * (as it appears on disk) - the file is an array of these structures
- * indexed by user or group number.  The setquota system call establishes
- * the vnode for each quota file (a pointer is retained in the ufsmount
- * structure).
- */
-struct dqblk32 {
-	uint32_t dqb_bhardlimit;	/* absolute limit on disk blks alloc */
-	uint32_t dqb_bsoftlimit;	/* preferred limit on disk blks */
-	uint32_t dqb_curblocks;	/* current block count */
-	uint32_t dqb_ihardlimit;	/* maximum # allocated inodes + 1 */
-	uint32_t dqb_isoftlimit;	/* preferred inode limit */
-	uint32_t dqb_curinodes;	/* current # allocated inodes */
-	int32_t   dqb_btime;		/* time limit for excessive disk use */
-	int32_t   dqb_itime;		/* time limit for excessive files */
-};
-
-struct dqblk64 {
-	u_int64_t dqb_bhardlimit;	/* absolute limit on disk blks alloc */
-	u_int64_t dqb_bsoftlimit;	/* preferred limit on disk blks */
-	u_int64_t dqb_curblocks;	/* current block count */
-	u_int64_t dqb_ihardlimit;	/* maximum # allocated inodes + 1 */
-	u_int64_t dqb_isoftlimit;	/* preferred inode limit */
-	u_int64_t dqb_curinodes;	/* current # allocated inodes */
-	int64_t   dqb_btime;		/* time limit for excessive disk use */
-	int64_t   dqb_itime;		/* time limit for excessive files */
-};
-
-#define	dqblk dqblk64
-
-#define	Q_DQHDR64_MAGIC "QUOTA64"
-#define	Q_DQHDR64_VERSION 0x20081104
-
-struct dqhdr64 {
-	char	  dqh_magic[8];		/* Q_DQHDR64_MAGIC */
-	uint32_t  dqh_version;		/* Q_DQHDR64_VERSION */
-	uint32_t  dqh_hdrlen;		/* header length */
-	uint32_t  dqh_reclen;		/* record length */
-	char	  dqh_unused[44];	/* reserved for future extension */
-};
-
-#ifdef _KERNEL
-
-#include <sys/queue.h>
-
-/*
- * The following structure records disk usage for a user or group on a
- * filesystem. There is one allocated for each quota that exists on any
- * filesystem for the current user or group. A cache is kept of recently
- * used entries.
- * (h) protected by dqhlock
- */
-struct dquot {
-	LIST_ENTRY(dquot) dq_hash;	/* (h) hash list */
-	TAILQ_ENTRY(dquot) dq_freelist;	/* (h) free list */
-	struct mtx dq_lock;		/* lock for concurrency */
-	u_int16_t dq_flags;		/* flags, see below */
-	u_int16_t dq_type;		/* quota type of this dquot */
-	uint32_t dq_cnt;		/* (h) count of active references */
-	uint32_t dq_id;		/* identifier this applies to */
-	struct ufsmount *dq_ump;	/* (h) filesystem that this is
-					   taken from */
-	struct dqblk64 dq_dqb;		/* actual usage & quotas */
-};
-/*
- * Flag values.
- */
-#define	DQ_LOCK		0x01		/* this quota locked (no MODS) */
-#define	DQ_WANT		0x02		/* wakeup on unlock */
-#define	DQ_MOD		0x04		/* this quota modified since read */
-#define	DQ_FAKE		0x08		/* no limits here, just usage */
-#define	DQ_BLKS		0x10		/* has been warned about blk limit */
-#define	DQ_INODS	0x20		/* has been warned about inode limit */
-/*
- * Shorthand notation.
- */
-#define	dq_bhardlimit	dq_dqb.dqb_bhardlimit
-#define	dq_bsoftlimit	dq_dqb.dqb_bsoftlimit
-#define	dq_curblocks	dq_dqb.dqb_curblocks
-#define	dq_ihardlimit	dq_dqb.dqb_ihardlimit
-#define	dq_isoftlimit	dq_dqb.dqb_isoftlimit
-#define	dq_curinodes	dq_dqb.dqb_curinodes
-#define	dq_btime	dq_dqb.dqb_btime
-#define	dq_itime	dq_dqb.dqb_itime
-
-/*
- * If the system has never checked for a quota for this file, then it is
- * set to NODQUOT.  Once a write attempt is made the inode pointer is set
- * to reference a dquot structure.
- */
-#define	NODQUOT		NULL
-
-/*
- * Flags to chkdq() and chkiq()
- */
-#define	FORCE	0x01	/* force usage changes independent of limits */
-#define	CHOWN	0x02	/* (advisory) change initiated by chown */
-
-/*
- * Macros to avoid subroutine calls to trivial functions.
- */
-#ifdef DIAGNOSTIC
-#define	DQREF(dq)	dqref(dq)
-#else
-#define	DQREF(dq)	(dq)->dq_cnt++
-#endif
-
-#define	DQI_LOCK(dq)	mtx_lock(&(dq)->dq_lock)
-#define	DQI_UNLOCK(dq)	mtx_unlock(&(dq)->dq_lock)
-
-#define	DQI_WAIT(dq, prio, msg) do {		\
-	while ((dq)->dq_flags & DQ_LOCK) {	\
-		(dq)->dq_flags |= DQ_WANT;	\
-		(void) msleep((dq),		\
-		    &(dq)->dq_lock, (prio), (msg), 0); \
-	}					\
-} while (0)
-
-#define	DQI_WAKEUP(dq) do {			\
-	if ((dq)->dq_flags & DQ_WANT)		\
-		wakeup((dq));			\
-	(dq)->dq_flags &= ~(DQ_WANT|DQ_LOCK);	\
-} while (0)
-
-struct inode;
-struct mount;
-struct thread;
-struct ucred;
-struct vnode;
-
-int	chkdq(struct inode *, int64_t, struct ucred *, int);
-int	chkiq(struct inode *, int, struct ucred *, int);
-void	dqinit(void);
-void	dqrele(struct vnode *, struct dquot *);
-void	dquninit(void);
-int	getinoquota(struct inode *);
-int	qsync(struct mount *);
-int	qsyncvp(struct vnode *);
-int	quotaoff(struct thread *, struct mount *, int);
-int	quotaon(struct thread *, struct mount *, int, void *);
-int	getquota32(struct thread *, struct mount *, u_long, int, void *);
-int	setquota32(struct thread *, struct mount *, u_long, int, void *);
-int	setuse32(struct thread *, struct mount *, u_long, int, void *);
-int	getquota(struct thread *, struct mount *, u_long, int, void *);
-int	setquota(struct thread *, struct mount *, u_long, int, void *);
-int	setuse(struct thread *, struct mount *, u_long, int, void *);
-int	getquotasize(struct thread *, struct mount *, u_long, int, void *);
-vfs_quotactl_t ufs_quotactl;
-
-#ifdef SOFTUPDATES
-int	quotaref(struct vnode *, struct dquot **);
-void	quotarele(struct dquot **);
-void	quotaadj(struct dquot **, struct ufsmount *, int64_t);
-#endif /* SOFTUPDATES */
-
-#else /* !_KERNEL */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	quotactl(const char *, int, int, void *);
-__END_DECLS
-
-#endif /* _KERNEL */
-
-#endif /* !_UFS_UFS_QUOTA_H_ */
diff --git a/include.new/ufs/ufs/ufs_extern.h b/include.new/ufs/ufs/ufs_extern.h
deleted file mode 100644
index d874b76..0000000
--- a/include.new/ufs/ufs/ufs_extern.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)ufs_extern.h	8.10 (Berkeley) 5/14/95
- * $FreeBSD: releng/10.2/sys/ufs/ufs/ufs_extern.h 262779 2014-03-05 04:23:19Z pfg $
- */
-
-#ifndef _UFS_UFS_EXTERN_H_
-#define	_UFS_UFS_EXTERN_H_
-
-struct componentname;
-struct direct;
-struct indir;
-struct inode;
-struct mount;
-struct thread;
-struct sockaddr;
-struct ucred;
-struct ufid;
-struct vfsconf;
-struct vnode;
-struct vop_bmap_args;
-struct vop_cachedlookup_args;
-struct vop_generic_args;
-struct vop_inactive_args;
-struct vop_reclaim_args;
-
-extern struct vop_vector ufs_fifoops;
-extern struct vop_vector ufs_vnodeops;
-
-int	 ufs_bmap(struct vop_bmap_args *);
-int	 ufs_bmaparray(struct vnode *, ufs2_daddr_t, ufs2_daddr_t *,
-	    struct buf *, int *, int *);
-int	 ufs_fhtovp(struct mount *, struct ufid *, int, struct vnode **);
-int	 ufs_checkpath(ino_t, ino_t, struct inode *, struct ucred *, ino_t *);
-void	 ufs_dirbad(struct inode *, doff_t, char *);
-int	 ufs_dirbadentry(struct vnode *, struct direct *, int);
-int	 ufs_dirempty(struct inode *, ino_t, struct ucred *);
-int	 ufs_extread(struct vop_read_args *);
-int	 ufs_extwrite(struct vop_write_args *);
-void	 ufs_makedirentry(struct inode *, struct componentname *,
-	    struct direct *);
-int	 ufs_direnter(struct vnode *, struct vnode *, struct direct *,
-	    struct componentname *, struct buf *, int);
-int	 ufs_dirremove(struct vnode *, struct inode *, int, int);
-int	 ufs_dirrewrite(struct inode *, struct inode *, ino_t, int, int);
-int	 ufs_lookup_ino(struct vnode *, struct vnode **, struct componentname *,
-	    ino_t *);
-int	 ufs_getlbns(struct vnode *, ufs2_daddr_t, struct indir *, int *);
-int	 ufs_inactive(struct vop_inactive_args *);
-int	 ufs_init(struct vfsconf *);
-void	 ufs_itimes(struct vnode *vp);
-int	 ufs_lookup(struct vop_cachedlookup_args *);
-void	 ufs_prepare_reclaim(struct vnode *vp);
-int	 ufs_readdir(struct vop_readdir_args *);
-int	 ufs_reclaim(struct vop_reclaim_args *);
-void	 ffs_snapgone(struct inode *);
-vfs_root_t ufs_root;
-int	 ufs_uninit(struct vfsconf *);
-int	 ufs_vinit(struct mount *, struct vop_vector *, struct vnode **);
-
-#include <sys/sysctl.h>
-SYSCTL_DECL(_vfs_ufs);
-
-/*
- * Soft update function prototypes.
- */
-int	softdep_setup_directory_add(struct buf *, struct inode *, off_t,
-	    ino_t, struct buf *, int);
-void	softdep_change_directoryentry_offset(struct buf *, struct inode *,
-	    caddr_t, caddr_t, caddr_t, int);
-void	softdep_setup_remove(struct buf *,struct inode *, struct inode *, int);
-void	softdep_setup_directory_change(struct buf *, struct inode *,
-	    struct inode *, ino_t, int);
-void	softdep_change_linkcnt(struct inode *);
-int	softdep_slowdown(struct vnode *);
-void	softdep_setup_create(struct inode *, struct inode *);
-void	softdep_setup_dotdot_link(struct inode *, struct inode *);
-void	softdep_setup_link(struct inode *, struct inode *);
-void	softdep_setup_mkdir(struct inode *, struct inode *);
-void	softdep_setup_rmdir(struct inode *, struct inode *);
-void	softdep_setup_unlink(struct inode *, struct inode *);
-void	softdep_revert_create(struct inode *, struct inode *);
-void	softdep_revert_link(struct inode *, struct inode *);
-void	softdep_revert_mkdir(struct inode *, struct inode *);
-void	softdep_revert_rmdir(struct inode *, struct inode *);
-
-/*
- * Flags to low-level allocation routines.  The low 16-bits are reserved
- * for IO_ flags from vnode.h.
- *
- * Note: The general vfs code typically limits the sequential heuristic
- * count to 127.  See sequential_heuristic() in kern/vfs_vnops.c
- */
-#define	BA_CLRBUF	0x00010000	/* Clear invalid areas of buffer. */
-#define	BA_METAONLY	0x00020000	/* Return indirect block buffer. */
-#define	BA_UNMAPPED	0x00040000	/* Do not mmap resulted buffer. */
-#define	BA_SEQMASK	0x7F000000	/* Bits holding seq heuristic. */
-#define	BA_SEQSHIFT	24
-#define	BA_SEQMAX	0x7F
-
-#endif /* !_UFS_UFS_EXTERN_H_ */
diff --git a/include.new/ufs/ufs/ufsmount.h b/include.new/ufs/ufs/ufsmount.h
deleted file mode 100644
index 1b76043..0000000
--- a/include.new/ufs/ufs/ufsmount.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 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.
- * 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.
- *
- *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD: releng/10.2/sys/ufs/ufs/ufsmount.h 262779 2014-03-05 04:23:19Z pfg $
- */
-
-#ifndef _UFS_UFS_UFSMOUNT_H_
-#define	_UFS_UFS_UFSMOUNT_H_
-
-#include <sys/buf.h>	/* XXX For struct workhead. */
-
-/*
- * Arguments to mount UFS-based filesystems
- */
-struct ufs_args {
-	char	*fspec;			/* block special device to mount */
-	struct	oexport_args export;	/* network export information */
-};
-
-#ifdef _KERNEL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_UFSMNT);
-#endif
-
-struct buf;
-struct inode;
-struct nameidata;
-struct timeval;
-struct ucred;
-struct uio;
-struct vnode;
-struct ufs_extattr_per_mount;
-struct jblocks;
-struct inodedep;
-
-TAILQ_HEAD(inodedeplst, inodedep);
-LIST_HEAD(bmsafemaphd, bmsafemap);
-
-/* This structure describes the UFS specific mount structure data. */
-struct ufsmount {
-	struct	mount *um_mountp;		/* filesystem vfs structure */
-	struct	cdev *um_dev;			/* device mounted */
-	struct	g_consumer *um_cp;
-	struct	bufobj *um_bo;			/* Buffer cache object */
-	struct	vnode *um_devvp;		/* block device mounted vnode */
-	u_long	um_fstype;			/* type of filesystem */
-	struct	fs *um_fs;			/* pointer to superblock */
-	struct	ufs_extattr_per_mount um_extattr;	/* extended attrs */
-	u_long	um_nindir;			/* indirect ptrs per block */
-	u_long	um_bptrtodb;			/* indir ptr to disk block */
-	u_long	um_seqinc;			/* inc between seq blocks */
-	struct	mtx um_lock;			/* Protects ufsmount & fs */
-	pid_t	um_fsckpid;			/* PID permitted fsck sysctls */
-	struct	mount_softdeps *um_softdep;	/* softdep mgmt structure */
-	struct	vnode *um_quotas[MAXQUOTAS];	/* pointer to quota files */
-	struct	ucred *um_cred[MAXQUOTAS];	/* quota file access cred */
-	time_t	um_btime[MAXQUOTAS];		/* block quota time limit */
-	time_t	um_itime[MAXQUOTAS];		/* inode quota time limit */
-	char	um_qflags[MAXQUOTAS];		/* quota specific flags */
-	int64_t	um_savedmaxfilesize;		/* XXX - limit maxfilesize */
-	int	um_candelete;			/* devvp supports TRIM */
-	int	um_writesuspended;		/* suspension in progress */
-	int	(*um_balloc)(struct vnode *, off_t, int, struct ucred *, int, struct buf **);
-	int	(*um_blkatoff)(struct vnode *, off_t, char **, struct buf **);
-	int	(*um_truncate)(struct vnode *, off_t, int, struct ucred *);
-	int	(*um_update)(struct vnode *, int);
-	int	(*um_valloc)(struct vnode *, int, struct ucred *, struct vnode **);
-	int	(*um_vfree)(struct vnode *, ino_t, int);
-	void	(*um_ifree)(struct ufsmount *, struct inode *);
-	int	(*um_rdonly)(struct inode *);
-	void	(*um_snapgone)(struct inode *);
-};
-
-#define	UFS_BALLOC(aa, bb, cc, dd, ee, ff) VFSTOUFS((aa)->v_mount)->um_balloc(aa, bb, cc, dd, ee, ff)
-#define	UFS_BLKATOFF(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_blkatoff(aa, bb, cc, dd)
-#define	UFS_TRUNCATE(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_truncate(aa, bb, cc, dd)
-#define	UFS_UPDATE(aa, bb) VFSTOUFS((aa)->v_mount)->um_update(aa, bb)
-#define	UFS_VALLOC(aa, bb, cc, dd) VFSTOUFS((aa)->v_mount)->um_valloc(aa, bb, cc, dd)
-#define	UFS_VFREE(aa, bb, cc) VFSTOUFS((aa)->v_mount)->um_vfree(aa, bb, cc)
-#define	UFS_IFREE(aa, bb) ((aa)->um_ifree(aa, bb))
-#define	UFS_RDONLY(aa) ((aa)->i_ump->um_rdonly(aa))
-#define	UFS_SNAPGONE(aa) ((aa)->i_ump->um_snapgone(aa))
-
-#define	UFS_LOCK(aa)	mtx_lock(&(aa)->um_lock)
-#define	UFS_UNLOCK(aa)	mtx_unlock(&(aa)->um_lock)
-#define	UFS_MTX(aa)	(&(aa)->um_lock)
-
-/*
- * Filesystem types
- */
-#define	UFS1	1
-#define	UFS2	2
-
-/*
- * Flags describing the state of quotas.
- */
-#define	QTF_OPENING	0x01			/* Q_QUOTAON in progress */
-#define	QTF_CLOSING	0x02			/* Q_QUOTAOFF in progress */
-#define	QTF_64BIT	0x04			/* 64-bit quota file */
-
-/* Convert mount ptr to ufsmount ptr. */
-#define	VFSTOUFS(mp)	((struct ufsmount *)((mp)->mnt_data))
-#define	UFSTOVFS(ump)	(ump)->um_mountp
-
-/*
- * Macros to access filesystem parameters in the ufsmount structure.
- * Used by ufs_bmap.
- */
-#define	MNINDIR(ump)			((ump)->um_nindir)
-#define	blkptrtodb(ump, b)		((b) << (ump)->um_bptrtodb)
-#define	is_sequential(ump, a, b)	((b) == (a) + ump->um_seqinc)
-#endif /* _KERNEL */
-
-#endif
diff --git a/include.new/ugidfw.h b/include.new/ugidfw.h
deleted file mode 100644
index a0863bf..0000000
--- a/include.new/ugidfw.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 2002, 2004 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by Network Associates
- * Laboratories, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libugidfw/ugidfw.h 157986 2006-04-23 17:06:18Z dwmalone $
- */
-
-#ifndef _UGIDFW_H
-#define	_UGIDFW_H
-
-__BEGIN_DECLS
-int	bsde_rule_to_string(struct mac_bsdextended_rule *rule, char *buf,
-	    size_t buflen);
-int	bsde_parse_mode(int argc, char *argv[], mode_t *mode, size_t buflen,
-	    char *errstr);
-int	bsde_parse_rule(int argc, char *argv[],
-	    struct mac_bsdextended_rule *rule, size_t buflen, char *errstr);
-int	bsde_parse_rule_string(const char *string,
-	    struct mac_bsdextended_rule *rule, size_t buflen, char *errstr);
-int	bsde_get_mib(const char *string, int *name, size_t *namelen);
-int	bsde_get_rule_count(size_t buflen, char *errstr);
-int	bsde_get_rule_slots(size_t buflen, char *errstr);
-int	bsde_get_rule(int rulenum, struct mac_bsdextended_rule *rule,
-	    size_t errlen, char *errstr);
-int	bsde_delete_rule(int rulenum, size_t buflen, char *errstr);
-int	bsde_set_rule(int rulenum, struct mac_bsdextended_rule *rule,
-	    size_t buflen, char *errstr);
-int	bsde_add_rule(int *rulename, struct mac_bsdextended_rule *rule,
-	    size_t buflen, char *errstr);
-__END_DECLS
-
-#endif
diff --git a/include.new/ulimit.h b/include.new/ulimit.h
deleted file mode 100644
index bd229d6..0000000
--- a/include.new/ulimit.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2002 Kyle Martin <mkm@ieee.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.
- *
- * 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: releng/10.2/include/ulimit.h 108910 2003-01-08 01:18:13Z tjr $
- */
-
-#ifndef _ULIMIT_H_
-#define	_ULIMIT_H_
-
-#include <sys/cdefs.h>
-
-#define	UL_GETFSIZE	1
-#define	UL_SETFSIZE	2
-
-__BEGIN_DECLS
-long	ulimit(int, ...);
-__END_DECLS
-
-#endif /* !_ULIMIT_H_ */
diff --git a/include.new/ulog.h b/include.new/ulog.h
deleted file mode 100644
index 16a8b9f..0000000
--- a/include.new/ulog.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2009 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/lib/libulog/ulog.h 202215 2010-01-13 18:53:06Z ed $
- */
-
-#ifndef _ULOG_H_
-#define	_ULOG_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-void	ulog_login(const char *, const char *, const char *);
-void	ulog_login_pseudo(int, const char *);
-void	ulog_logout(const char *);
-void	ulog_logout_pseudo(int);
-__END_DECLS
-
-#endif /* !_ULOG_H_ */
diff --git a/include.new/unctrl.h b/include.new/unctrl.h
deleted file mode 100644
index 5e70774..0000000
--- a/include.new/unctrl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
- *                                                                          *
- * Permission is hereby granted, free of charge, to any person obtaining a  *
- * copy of this software and associated documentation files (the            *
- * "Software"), to deal in the Software without restriction, including      *
- * without limitation the rights to use, copy, modify, merge, publish,      *
- * distribute, distribute with modifications, sublicense, and/or sell       *
- * copies of the Software, and to permit persons to whom the Software is    *
- * furnished to do so, subject to the following conditions:                 *
- *                                                                          *
- * The above copyright notice and this permission notice shall be included  *
- * in all copies or substantial portions of the Software.                   *
- *                                                                          *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
- * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
- *                                                                          *
- * Except as contained in this notice, the name(s) of the above copyright   *
- * holders shall not be used in advertising or otherwise to promote the     *
- * sale, use or other dealings in this Software without prior written       *
- * authorization.                                                           *
- ****************************************************************************/
-
-/****************************************************************************
- *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
- *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
- ****************************************************************************/
-
-/*
- * unctrl.h
- *
- * Display a printable version of a control character.
- * Control characters are displayed in caret notation (^x), DELETE is displayed
- * as ^?. Printable characters are displayed as is.
- */
-
-/* $Id: unctrl.h 103 2016-01-12 05:32:24Z reddawg $ */
-
-#ifndef NCURSES_UNCTRL_H_incl
-#define NCURSES_UNCTRL_H_incl	1
-
-#undef  NCURSES_VERSION
-#define NCURSES_VERSION "5.7"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <curses.h>
-
-#undef unctrl
-NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NCURSES_UNCTRL_H_incl */
diff --git a/include.new/unistd.h b/include.new/unistd.h
deleted file mode 100644
index 9856427..0000000
--- a/include.new/unistd.h
+++ /dev/null
@@ -1,592 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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. 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.
- *
- *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- * $FreeBSD: releng/10.2/include/unistd.h 254409 2013-08-16 13:10:30Z jilles $
- */
-
-#ifndef _UNISTD_H_
-#define	_UNISTD_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>			/* XXX adds too much pollution. */
-#include <sys/unistd.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef _SSIZE_T_DECLARED
-typedef	__ssize_t	ssize_t;
-#define	_SSIZE_T_DECLARED
-#endif
-
-#ifndef _UID_T_DECLARED
-typedef	__uid_t		uid_t;
-#define	_UID_T_DECLARED
-#endif
-
-#ifndef _USECONDS_T_DECLARED
-typedef	__useconds_t	useconds_t;
-#define	_USECONDS_T_DECLARED
-#endif
-
-#define	STDIN_FILENO	0	/* standard input file descriptor */
-#define	STDOUT_FILENO	1	/* standard output file descriptor */
-#define	STDERR_FILENO	2	/* standard error file descriptor */
-
-#if __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-#define	F_ULOCK		0	/* unlock locked section */
-#define	F_LOCK		1	/* lock a section for exclusive use */
-#define	F_TLOCK		2	/* test and lock a section for exclusive use */
-#define	F_TEST		3	/* test a section for locks by other procs */
-#endif
-
-/*
- * POSIX options and option groups we unconditionally do or don't
- * implement.  This list includes those options which are exclusively
- * implemented (or not) in user mode.  Please keep this list in
- * alphabetical order.
- *
- * Anything which is defined as zero below **must** have an
- * implementation for the corresponding sysconf() which is able to
- * determine conclusively whether or not the feature is supported.
- * Anything which is defined as other than -1 below **must** have
- * complete headers, types, and function declarations as specified by
- * the POSIX standard; however, if the relevant sysconf() function
- * returns -1, the functions may be stubbed out.
- */
-#define	_POSIX_BARRIERS			200112L
-#define	_POSIX_CPUTIME			200112L
-#define	_POSIX_READER_WRITER_LOCKS	200112L
-#define	_POSIX_REGEXP			1
-#define	_POSIX_SHELL			1
-#define	_POSIX_SPAWN			200112L
-#define	_POSIX_SPIN_LOCKS		200112L
-#define	_POSIX_THREAD_ATTR_STACKADDR	200112L
-#define	_POSIX_THREAD_ATTR_STACKSIZE	200112L
-#define	_POSIX_THREAD_CPUTIME		200112L
-#define	_POSIX_THREAD_PRIO_INHERIT	200112L
-#define	_POSIX_THREAD_PRIO_PROTECT	200112L
-#define	_POSIX_THREAD_PRIORITY_SCHEDULING 200112L
-#define	_POSIX_THREAD_PROCESS_SHARED	-1
-#define	_POSIX_THREAD_SAFE_FUNCTIONS	-1
-#define	_POSIX_THREAD_SPORADIC_SERVER	-1
-#define	_POSIX_THREADS			200112L
-#define	_POSIX_TRACE			-1
-#define	_POSIX_TRACE_EVENT_FILTER	-1
-#define	_POSIX_TRACE_INHERIT		-1
-#define	_POSIX_TRACE_LOG		-1
-#define	_POSIX2_C_BIND			200112L	/* mandatory */
-#define	_POSIX2_C_DEV			-1 /* need c99 utility */
-#define	_POSIX2_CHAR_TERM		1
-#define	_POSIX2_FORT_DEV		-1 /* need fort77 utility */
-#define	_POSIX2_FORT_RUN		200112L
-#define	_POSIX2_LOCALEDEF		-1
-#define	_POSIX2_PBS			-1
-#define	_POSIX2_PBS_ACCOUNTING		-1
-#define	_POSIX2_PBS_CHECKPOINT		-1
-#define	_POSIX2_PBS_LOCATE		-1
-#define	_POSIX2_PBS_MESSAGE		-1
-#define	_POSIX2_PBS_TRACK		-1
-#define	_POSIX2_SW_DEV			-1 /* XXX ??? */
-#define	_POSIX2_UPE			200112L
-#define	_V6_ILP32_OFF32			-1
-#define	_V6_ILP32_OFFBIG		0
-#define	_V6_LP64_OFF64			0
-#define	_V6_LPBIG_OFFBIG		-1
-
-#if __XSI_VISIBLE
-#define	_XOPEN_CRYPT			-1 /* XXX ??? */
-#define	_XOPEN_ENH_I18N			-1 /* mandatory in XSI */
-#define	_XOPEN_LEGACY			-1
-#define	_XOPEN_REALTIME			-1
-#define	_XOPEN_REALTIME_THREADS		-1
-#define	_XOPEN_UNIX			-1
-#endif
-
-/* Define the POSIX.2 version we target for compliance. */
-#define	_POSIX2_VERSION		199212L
-
-/*
- * POSIX-style system configuration variable accessors (for the
- * sysconf function).  The kernel does not directly implement the
- * sysconf() interface; rather, a C library stub translates references
- * to sysconf() into calls to sysctl() using a giant switch statement.
- * Those that are marked `user' are implemented entirely in the C
- * library and never query the kernel.  pathconf() is implemented
- * directly by the kernel so those are not defined here.
- */
-#define	_SC_ARG_MAX		 1
-#define	_SC_CHILD_MAX		 2
-#define	_SC_CLK_TCK		 3
-#define	_SC_NGROUPS_MAX		 4
-#define	_SC_OPEN_MAX		 5
-#define	_SC_JOB_CONTROL		 6
-#define	_SC_SAVED_IDS		 7
-#define	_SC_VERSION		 8
-#define	_SC_BC_BASE_MAX		 9 /* user */
-#define	_SC_BC_DIM_MAX		10 /* user */
-#define	_SC_BC_SCALE_MAX	11 /* user */
-#define	_SC_BC_STRING_MAX	12 /* user */
-#define	_SC_COLL_WEIGHTS_MAX	13 /* user */
-#define	_SC_EXPR_NEST_MAX	14 /* user */
-#define	_SC_LINE_MAX		15 /* user */
-#define	_SC_RE_DUP_MAX		16 /* user */
-#define	_SC_2_VERSION		17 /* user */
-#define	_SC_2_C_BIND		18 /* user */
-#define	_SC_2_C_DEV		19 /* user */
-#define	_SC_2_CHAR_TERM		20 /* user */
-#define	_SC_2_FORT_DEV		21 /* user */
-#define	_SC_2_FORT_RUN		22 /* user */
-#define	_SC_2_LOCALEDEF		23 /* user */
-#define	_SC_2_SW_DEV		24 /* user */
-#define	_SC_2_UPE		25 /* user */
-#define	_SC_STREAM_MAX		26 /* user */
-#define	_SC_TZNAME_MAX		27 /* user */
-
-#if __POSIX_VISIBLE >= 199309
-#define	_SC_ASYNCHRONOUS_IO	28
-#define	_SC_MAPPED_FILES	29
-#define	_SC_MEMLOCK		30
-#define	_SC_MEMLOCK_RANGE	31
-#define	_SC_MEMORY_PROTECTION	32
-#define	_SC_MESSAGE_PASSING	33
-#define	_SC_PRIORITIZED_IO	34
-#define	_SC_PRIORITY_SCHEDULING	35
-#define	_SC_REALTIME_SIGNALS	36
-#define	_SC_SEMAPHORES		37
-#define	_SC_FSYNC		38
-#define	_SC_SHARED_MEMORY_OBJECTS 39
-#define	_SC_SYNCHRONIZED_IO	40
-#define	_SC_TIMERS		41
-#define	_SC_AIO_LISTIO_MAX	42
-#define	_SC_AIO_MAX		43
-#define	_SC_AIO_PRIO_DELTA_MAX	44
-#define	_SC_DELAYTIMER_MAX	45
-#define	_SC_MQ_OPEN_MAX		46
-#define	_SC_PAGESIZE		47
-#define	_SC_RTSIG_MAX		48
-#define	_SC_SEM_NSEMS_MAX	49
-#define	_SC_SEM_VALUE_MAX	50
-#define	_SC_SIGQUEUE_MAX	51
-#define	_SC_TIMER_MAX		52
-#endif
-
-#if __POSIX_VISIBLE >= 200112
-#define	_SC_2_PBS		59 /* user */
-#define	_SC_2_PBS_ACCOUNTING	60 /* user */
-#define	_SC_2_PBS_CHECKPOINT	61 /* user */
-#define	_SC_2_PBS_LOCATE	62 /* user */
-#define	_SC_2_PBS_MESSAGE	63 /* user */
-#define	_SC_2_PBS_TRACK		64 /* user */
-#define	_SC_ADVISORY_INFO	65
-#define	_SC_BARRIERS		66 /* user */
-#define	_SC_CLOCK_SELECTION	67
-#define	_SC_CPUTIME		68
-#define	_SC_FILE_LOCKING	69
-#define	_SC_GETGR_R_SIZE_MAX	70 /* user */
-#define	_SC_GETPW_R_SIZE_MAX	71 /* user */
-#define	_SC_HOST_NAME_MAX	72
-#define	_SC_LOGIN_NAME_MAX	73
-#define	_SC_MONOTONIC_CLOCK	74
-#define	_SC_MQ_PRIO_MAX		75
-#define	_SC_READER_WRITER_LOCKS	76 /* user */
-#define	_SC_REGEXP		77 /* user */
-#define	_SC_SHELL		78 /* user */
-#define	_SC_SPAWN		79 /* user */
-#define	_SC_SPIN_LOCKS		80 /* user */
-#define	_SC_SPORADIC_SERVER	81
-#define	_SC_THREAD_ATTR_STACKADDR 82 /* user */
-#define	_SC_THREAD_ATTR_STACKSIZE 83 /* user */
-#define	_SC_THREAD_CPUTIME	84 /* user */
-#define	_SC_THREAD_DESTRUCTOR_ITERATIONS 85 /* user */
-#define	_SC_THREAD_KEYS_MAX	86 /* user */
-#define	_SC_THREAD_PRIO_INHERIT	87 /* user */
-#define	_SC_THREAD_PRIO_PROTECT	88 /* user */
-#define	_SC_THREAD_PRIORITY_SCHEDULING 89 /* user */
-#define	_SC_THREAD_PROCESS_SHARED 90 /* user */
-#define	_SC_THREAD_SAFE_FUNCTIONS 91 /* user */
-#define	_SC_THREAD_SPORADIC_SERVER 92 /* user */
-#define	_SC_THREAD_STACK_MIN	93 /* user */
-#define	_SC_THREAD_THREADS_MAX	94 /* user */
-#define	_SC_TIMEOUTS		95 /* user */
-#define	_SC_THREADS		96 /* user */
-#define	_SC_TRACE		97 /* user */
-#define	_SC_TRACE_EVENT_FILTER	98 /* user */
-#define	_SC_TRACE_INHERIT	99 /* user */
-#define	_SC_TRACE_LOG		100 /* user */
-#define	_SC_TTY_NAME_MAX	101 /* user */
-#define	_SC_TYPED_MEMORY_OBJECTS 102
-#define	_SC_V6_ILP32_OFF32	103 /* user */
-#define	_SC_V6_ILP32_OFFBIG	104 /* user */
-#define	_SC_V6_LP64_OFF64	105 /* user */
-#define	_SC_V6_LPBIG_OFFBIG	106 /* user */
-#define	_SC_IPV6		118
-#define	_SC_RAW_SOCKETS		119
-#define	_SC_SYMLOOP_MAX		120
-#endif
-
-#if __XSI_VISIBLE
-#define	_SC_ATEXIT_MAX		107 /* user */
-#define	_SC_IOV_MAX		56
-#define	_SC_PAGE_SIZE		_SC_PAGESIZE
-#define	_SC_XOPEN_CRYPT		108 /* user */
-#define	_SC_XOPEN_ENH_I18N	109 /* user */
-#define	_SC_XOPEN_LEGACY	110 /* user */
-#define	_SC_XOPEN_REALTIME	111
-#define	_SC_XOPEN_REALTIME_THREADS 112
-#define	_SC_XOPEN_SHM		113
-#define	_SC_XOPEN_STREAMS	114
-#define	_SC_XOPEN_UNIX		115
-#define	_SC_XOPEN_VERSION	116
-#define	_SC_XOPEN_XCU_VERSION	117 /* user */
-#endif
-
-#if __BSD_VISIBLE
-#define	_SC_NPROCESSORS_CONF	57
-#define	_SC_NPROCESSORS_ONLN	58
-#define	_SC_CPUSET_SIZE		122
-#endif
-
-/* Extensions found in Solaris and Linux. */
-#define	_SC_PHYS_PAGES		121
-
-/* Keys for the confstr(3) function. */
-#if __POSIX_VISIBLE >= 199209
-#define	_CS_PATH		1	/* default value of PATH */
-#endif
-
-#if __POSIX_VISIBLE >= 200112
-#define	_CS_POSIX_V6_ILP32_OFF32_CFLAGS		2
-#define	_CS_POSIX_V6_ILP32_OFF32_LDFLAGS	3
-#define	_CS_POSIX_V6_ILP32_OFF32_LIBS		4
-#define	_CS_POSIX_V6_ILP32_OFFBIG_CFLAGS	5
-#define	_CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS	6
-#define	_CS_POSIX_V6_ILP32_OFFBIG_LIBS		7
-#define	_CS_POSIX_V6_LP64_OFF64_CFLAGS		8
-#define	_CS_POSIX_V6_LP64_OFF64_LDFLAGS		9
-#define	_CS_POSIX_V6_LP64_OFF64_LIBS		10
-#define	_CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS	11
-#define	_CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS	12
-#define	_CS_POSIX_V6_LPBIG_OFFBIG_LIBS		13
-#define	_CS_POSIX_V6_WIDTH_RESTRICTED_ENVS	14
-#endif
-
-__BEGIN_DECLS
-/* 1003.1-1990 */
-void	 _exit(int) __dead2;
-int	 access(const char *, int);
-unsigned int	 alarm(unsigned int);
-int	 chdir(const char *);
-int	 chown(const char *, uid_t, gid_t);
-int	 close(int);
-void	 closefrom(int);
-int	 dup(int);
-int	 dup2(int, int);
-int	 execl(const char *, const char *, ...);
-int	 execle(const char *, const char *, ...);
-int	 execlp(const char *, const char *, ...);
-int	 execv(const char *, char * const *);
-int	 execve(const char *, char * const *, char * const *);
-int	 execvp(const char *, char * const *);
-pid_t	 fork(void);
-long	 fpathconf(int, int);
-char	*getcwd(char *, size_t);
-gid_t	 getegid(void);
-uid_t	 geteuid(void);
-gid_t	 getgid(void);
-int	 getgroups(int, gid_t []);
-char	*getlogin(void);
-pid_t	 getpgrp(void);
-pid_t	 getpid(void);
-pid_t	 getppid(void);
-uid_t	 getuid(void);
-int	 isatty(int);
-int	 link(const char *, const char *);
-#ifndef _LSEEK_DECLARED
-#define	_LSEEK_DECLARED
-off_t	 lseek(int, off_t, int);
-#endif
-long	 pathconf(const char *, int);
-int	 pause(void);
-int	 pipe(int *);
-ssize_t	 read(int, void *, size_t);
-int	 rmdir(const char *);
-int	 setgid(gid_t);
-int	 setpgid(pid_t, pid_t);
-pid_t	 setsid(void);
-int	 setuid(uid_t);
-unsigned int	 sleep(unsigned int);
-long	 sysconf(int);
-pid_t	 tcgetpgrp(int);
-int	 tcsetpgrp(int, pid_t);
-char	*ttyname(int);
-int	ttyname_r(int, char *, size_t);
-int	 unlink(const char *);
-ssize_t	 write(int, const void *, size_t);
-
-/* 1003.2-1992 */
-#if __POSIX_VISIBLE >= 199209 || __XSI_VISIBLE
-size_t	 confstr(int, char *, size_t);
-#ifndef _GETOPT_DECLARED
-#define	_GETOPT_DECLARED
-int	 getopt(int, char * const [], const char *);
-
-extern char *optarg;			/* getopt(3) external variables */
-extern int optind, opterr, optopt;
-#endif /* _GETOPT_DECLARED */
-#endif
-
-/* ISO/IEC 9945-1: 1996 */
-#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE
-int	 fsync(int);
-
-/*
- * ftruncate() was in the POSIX Realtime Extension (it's used for shared
- * memory), but truncate() was not.
- */
-#ifndef _FTRUNCATE_DECLARED
-#define	_FTRUNCATE_DECLARED
-int	 ftruncate(int, off_t);
-#endif
-#endif
-
-#if __POSIX_VISIBLE >= 199506
-int	 getlogin_r(char *, int);
-#endif
-
-/* 1003.1-2001 */
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-int	 fchown(int, uid_t, gid_t);
-ssize_t	 readlink(const char * __restrict, char * __restrict, size_t);
-#endif
-#if __POSIX_VISIBLE >= 200112
-int	 gethostname(char *, size_t);
-int	 setegid(gid_t);
-int	 seteuid(uid_t);
-#endif
-
-/* 1003.1-2008 */
-#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE
-int	 getsid(pid_t _pid);
-int	 fchdir(int);
-int	 getpgid(pid_t _pid);
-int	 lchown(const char *, uid_t, gid_t);
-ssize_t	 pread(int, void *, size_t, off_t);
-ssize_t	 pwrite(int, const void *, size_t, off_t);
-
-/* See comment at ftruncate() above. */
-#ifndef _TRUNCATE_DECLARED
-#define	_TRUNCATE_DECLARED
-int	 truncate(const char *, off_t);
-#endif
-#endif /* __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE */
-
-#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
-int	faccessat(int, const char *, int, int);
-int	fchownat(int, const char *, uid_t, gid_t, int);
-int	fexecve(int, char *const [], char *const []);
-int	linkat(int, const char *, int, const char *, int);
-ssize_t	readlinkat(int, const char * __restrict, char * __restrict, size_t);
-int	symlinkat(const char *, int, const char *);
-int	unlinkat(int, const char *, int);
-#endif /* __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE */
-
-/*
- * symlink() was originally in POSIX.1a, which was withdrawn after
- * being overtaken by events (1003.1-2001).  It was in XPG4.2, and of
- * course has been in BSD since 4.2.
- */
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 402 || __BSD_VISIBLE
-int	 symlink(const char * __restrict, const char * __restrict);
-#endif
-
-/* X/Open System Interfaces */
-#if __XSI_VISIBLE
-char	*crypt(const char *, const char *);
-/* char	*ctermid(char *); */		/* XXX ??? */
-int	 encrypt(char *, int);
-long	 gethostid(void);
-int	 lockf(int, int, off_t);
-int	 nice(int);
-int	 setpgrp(pid_t _pid, pid_t _pgrp); /* obsoleted by setpgid() */
-int	 setregid(gid_t, gid_t);
-int	 setreuid(uid_t, uid_t);
-
-#ifndef _SWAB_DECLARED
-#define _SWAB_DECLARED
-void	 swab(const void * __restrict, void * __restrict, ssize_t);
-#endif /* _SWAB_DECLARED */
-
-void	 sync(void);
-
-#endif /* __XSI_VISIBLE */
-
-#if (__XSI_VISIBLE && __XSI_VISIBLE <= 500) || __BSD_VISIBLE
-int	 brk(const void *);
-int	 chroot(const char *);
-int	 getdtablesize(void);
-int	 getpagesize(void) __pure2;
-char	*getpass(const char *);
-void	*sbrk(intptr_t);
-#endif
-
-#if (__XSI_VISIBLE && __XSI_VISIBLE <= 600) || __BSD_VISIBLE
-char	*getwd(char *);			/* obsoleted by getcwd() */
-useconds_t
-	 ualarm(useconds_t, useconds_t);
-int	 usleep(useconds_t);
-pid_t	 vfork(void) __returns_twice;
-#endif
-
-#if __BSD_VISIBLE
-struct timeval;				/* select(2) */
-int	 acct(const char *);
-int	 async_daemon(void);
-int	 check_utility_compat(const char *);
-const char *
-	 crypt_get_format(void);
-int	 crypt_set_format(const char *);
-int	 des_cipher(const char *, char *, long, int);
-int	 des_setkey(const char *key);
-int	 dup3(int, int, int);
-int	 eaccess(const char *, int);
-void	 endusershell(void);
-int	 exect(const char *, char * const *, char * const *);
-int	 execvP(const char *, const char *, char * const *);
-int	 feature_present(const char *);
-char	*fflagstostr(u_long);
-int	 getdomainname(char *, int);
-int	 getgrouplist(const char *, gid_t, gid_t *, int *);
-int	 getloginclass(char *, size_t);
-mode_t	 getmode(const void *, mode_t);
-int	 getosreldate(void);
-int	 getpeereid(int, uid_t *, gid_t *);
-int	 getresgid(gid_t *, gid_t *, gid_t *);
-int	 getresuid(uid_t *, uid_t *, uid_t *);
-char	*getusershell(void);
-int	 initgroups(const char *, gid_t);
-int	 iruserok(unsigned long, int, const char *, const char *);
-int	 iruserok_sa(const void *, int, int, const char *, const char *);
-int	 issetugid(void);
-void	__FreeBSD_libc_enter_restricted_mode(void);
-long	 lpathconf(const char *, int);
-#ifndef _MKDTEMP_DECLARED
-char	*mkdtemp(char *);
-#define	_MKDTEMP_DECLARED
-#endif
-#ifndef	_MKNOD_DECLARED
-int	 mknod(const char *, mode_t, dev_t);
-#define	_MKNOD_DECLARED
-#endif
-#ifndef _MKSTEMP_DECLARED
-int	 mkstemp(char *);
-#define	_MKSTEMP_DECLARED
-#endif
-int	 mkstemps(char *, int);
-#ifndef _MKTEMP_DECLARED
-char	*mktemp(char *);
-#define	_MKTEMP_DECLARED
-#endif
-int	 nfssvc(int, void *);
-int	 nlm_syscall(int, int, int, char **);
-int	 pipe2(int *, int);
-int	 profil(char *, size_t, vm_offset_t, int);
-int	 rcmd(char **, int, const char *, const char *, const char *, int *);
-int	 rcmd_af(char **, int, const char *,
-		const char *, const char *, int *, int);
-int	 rcmdsh(char **, int, const char *,
-		const char *, const char *, const char *);
-char	*re_comp(const char *);
-int	 re_exec(const char *);
-int	 reboot(int);
-int	 revoke(const char *);
-pid_t	 rfork(int);
-pid_t	 rfork_thread(int, void *, int (*)(void *), void *);
-int	 rresvport(int *);
-int	 rresvport_af(int *, int);
-int	 ruserok(const char *, int, const char *, const char *);
-#if __BSD_VISIBLE
-#ifndef _SELECT_DECLARED
-#define	_SELECT_DECLARED
-int	 select(int, fd_set *, fd_set *, fd_set *, struct timeval *);
-#endif
-#endif
-int	 setdomainname(const char *, int);
-int	 setgroups(int, const gid_t *);
-void	 sethostid(long);
-int	 sethostname(const char *, int);
-#ifndef _SETKEY_DECLARED
-int	 setkey(const char *);
-#define	_SETKEY_DECLARED
-#endif
-int	 setlogin(const char *);
-int	 setloginclass(const char *);
-void	*setmode(const char *);
-void	 setproctitle(const char *_fmt, ...) __printf0like(1, 2);
-int	 setresgid(gid_t, gid_t, gid_t);
-int	 setresuid(uid_t, uid_t, uid_t);
-int	 setrgid(gid_t);
-int	 setruid(uid_t);
-void	 setusershell(void);
-int	 strtofflags(char **, u_long *, u_long *);
-int	 swapon(const char *);
-int	 swapoff(const char *);
-int	 syscall(int, ...);
-off_t	 __syscall(quad_t, ...);
-int	 undelete(const char *);
-int	 unwhiteout(const char *);
-void	*valloc(size_t);			/* obsoleted by malloc() */
-
-#ifndef _OPTRESET_DECLARED
-#define	_OPTRESET_DECLARED
-extern int optreset;			/* getopt(3) external variable */
-#endif
-#endif /* __BSD_VISIBLE */
-__END_DECLS
-
-#endif /* !_UNISTD_H_ */
diff --git a/include.new/usb.h b/include.new/usb.h
deleted file mode 100644
index 3f60dab..0000000
--- a/include.new/usb.h
+++ /dev/null
@@ -1,314 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libusb/usb.h 248236 2013-03-13 12:23:14Z hselasky $ */
-/*-
- * Copyright (c) 2008 Hans Petter Selasky. 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.
- *
- * 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.
- */
-
-#ifndef _LIBUSB20_COMPAT_01_H_
-#define	_LIBUSB20_COMPAT_01_H_
-
-#ifndef LIBUSB_GLOBAL_INCLUDE_FILE
-#include <stdint.h>
-#include <sys/param.h>
-#include <sys/endian.h>
-#endif
-
-/* USB interface class codes */
-
-#define	USB_CLASS_PER_INTERFACE         0
-#define	USB_CLASS_AUDIO                 1
-#define	USB_CLASS_COMM                  2
-#define	USB_CLASS_HID                   3
-#define	USB_CLASS_PRINTER               7
-#define	USB_CLASS_PTP                   6
-#define	USB_CLASS_MASS_STORAGE          8
-#define	USB_CLASS_HUB                   9
-#define	USB_CLASS_DATA                  10
-#define	USB_CLASS_VENDOR_SPEC           0xff
-
-/* USB descriptor types */
-
-#define	USB_DT_DEVICE                   0x01
-#define	USB_DT_CONFIG                   0x02
-#define	USB_DT_STRING                   0x03
-#define	USB_DT_INTERFACE                0x04
-#define	USB_DT_ENDPOINT                 0x05
-
-#define	USB_DT_HID                      0x21
-#define	USB_DT_REPORT                   0x22
-#define	USB_DT_PHYSICAL                 0x23
-#define	USB_DT_HUB                      0x29
-
-/* USB descriptor type sizes */
-
-#define	USB_DT_DEVICE_SIZE              18
-#define	USB_DT_CONFIG_SIZE              9
-#define	USB_DT_INTERFACE_SIZE           9
-#define	USB_DT_ENDPOINT_SIZE            7
-#define	USB_DT_ENDPOINT_AUDIO_SIZE      9
-#define	USB_DT_HUB_NONVAR_SIZE          7
-
-/* USB descriptor header */
-struct usb_descriptor_header {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-};
-
-/* USB string descriptor */
-struct usb_string_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint16_t wData[1];
-};
-
-/* USB HID descriptor */
-struct usb_hid_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint16_t bcdHID;
-	uint8_t	bCountryCode;
-	uint8_t	bNumDescriptors;
-	/* uint8_t  bReportDescriptorType; */
-	/* uint16_t wDescriptorLength; */
-	/* ... */
-};
-
-/* USB endpoint descriptor */
-#define	USB_MAXENDPOINTS        32
-struct usb_endpoint_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint8_t	bEndpointAddress;
-#define	USB_ENDPOINT_ADDRESS_MASK       0x0f
-#define	USB_ENDPOINT_DIR_MASK           0x80
-	uint8_t	bmAttributes;
-#define	USB_ENDPOINT_TYPE_MASK          0x03
-#define	USB_ENDPOINT_TYPE_CONTROL       0
-#define	USB_ENDPOINT_TYPE_ISOCHRONOUS   1
-#define	USB_ENDPOINT_TYPE_BULK          2
-#define	USB_ENDPOINT_TYPE_INTERRUPT     3
-	uint16_t wMaxPacketSize;
-	uint8_t	bInterval;
-	uint8_t	bRefresh;
-	uint8_t	bSynchAddress;
-
-	uint8_t *extra;			/* Extra descriptors */
-	int	extralen;
-};
-
-/* USB interface descriptor */
-#define	USB_MAXINTERFACES       32
-struct usb_interface_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint8_t	bInterfaceNumber;
-	uint8_t	bAlternateSetting;
-	uint8_t	bNumEndpoints;
-	uint8_t	bInterfaceClass;
-	uint8_t	bInterfaceSubClass;
-	uint8_t	bInterfaceProtocol;
-	uint8_t	iInterface;
-
-	struct usb_endpoint_descriptor *endpoint;
-
-	uint8_t *extra;			/* Extra descriptors */
-	int	extralen;
-};
-
-#define	USB_MAXALTSETTING       128	/* Hard limit */
-struct usb_interface {
-	struct usb_interface_descriptor *altsetting;
-
-	int	num_altsetting;
-};
-
-/* USB configuration descriptor */
-#define	USB_MAXCONFIG           8
-struct usb_config_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint16_t wTotalLength;
-	uint8_t	bNumInterfaces;
-	uint8_t	bConfigurationValue;
-	uint8_t	iConfiguration;
-	uint8_t	bmAttributes;
-	uint8_t	MaxPower;
-
-	struct usb_interface *interface;
-
-	uint8_t *extra;			/* Extra descriptors */
-	int	extralen;
-};
-
-/* USB device descriptor */
-struct usb_device_descriptor {
-	uint8_t	bLength;
-	uint8_t	bDescriptorType;
-	uint16_t bcdUSB;
-	uint8_t	bDeviceClass;
-	uint8_t	bDeviceSubClass;
-	uint8_t	bDeviceProtocol;
-	uint8_t	bMaxPacketSize0;
-	uint16_t idVendor;
-	uint16_t idProduct;
-	uint16_t bcdDevice;
-	uint8_t	iManufacturer;
-	uint8_t	iProduct;
-	uint8_t	iSerialNumber;
-	uint8_t	bNumConfigurations;
-};
-
-/* USB setup packet */
-struct usb_ctrl_setup {
-	uint8_t	bRequestType;
-#define	USB_RECIP_DEVICE                0x00
-#define	USB_RECIP_INTERFACE             0x01
-#define	USB_RECIP_ENDPOINT              0x02
-#define	USB_RECIP_OTHER                 0x03
-#define	USB_TYPE_STANDARD               (0x00 << 5)
-#define	USB_TYPE_CLASS                  (0x01 << 5)
-#define	USB_TYPE_VENDOR                 (0x02 << 5)
-#define	USB_TYPE_RESERVED               (0x03 << 5)
-#define	USB_ENDPOINT_IN                 0x80
-#define	USB_ENDPOINT_OUT                0x00
-	uint8_t	bRequest;
-#define	USB_REQ_GET_STATUS              0x00
-#define	USB_REQ_CLEAR_FEATURE           0x01
-#define	USB_REQ_SET_FEATURE             0x03
-#define	USB_REQ_SET_ADDRESS             0x05
-#define	USB_REQ_GET_DESCRIPTOR          0x06
-#define	USB_REQ_SET_DESCRIPTOR          0x07
-#define	USB_REQ_GET_CONFIGURATION       0x08
-#define	USB_REQ_SET_CONFIGURATION       0x09
-#define	USB_REQ_GET_INTERFACE           0x0A
-#define	USB_REQ_SET_INTERFACE           0x0B
-#define	USB_REQ_SYNCH_FRAME             0x0C
-	uint16_t wValue;
-	uint16_t wIndex;
-	uint16_t wLength;
-};
-
-/* Error codes */
-#define	USB_ERROR_BEGIN                 500000
-
-/* Byte swapping */
-#define	USB_LE16_TO_CPU(x) le16toh(x)
-
-/* Data types */
-struct usb_device;
-struct usb_bus;
-
-/*
- * To maintain compatibility with applications already built with libusb,
- * we must only add entries to the end of this structure. NEVER delete or
- * move members and only change types if you really know what you're doing.
- */
-struct usb_device {
-	struct usb_device *next;
-	struct usb_device *prev;
-
-	char	filename[PATH_MAX + 1];
-
-	struct usb_bus *bus;
-
-	struct usb_device_descriptor descriptor;
-	struct usb_config_descriptor *config;
-
-	void   *dev;
-
-	uint8_t	devnum;
-
-	uint8_t	num_children;
-	struct usb_device **children;
-};
-
-struct usb_bus {
-	struct usb_bus *next;
-	struct usb_bus *prev;
-
-	char	dirname[PATH_MAX + 1];
-
-	struct usb_device *devices;
-	uint32_t location;
-
-	struct usb_device *root_dev;
-};
-
-struct usb_dev_handle;
-typedef struct usb_dev_handle usb_dev_handle;
-
-/* Variables */
-extern struct usb_bus *usb_busses;
-
-#ifdef __cplusplus
-extern	"C" {
-#endif
-#if 0
-}					/* style */
-
-#endif
-
-/* Function prototypes from "libusb20_compat01.c" */
-
-usb_dev_handle *usb_open(struct usb_device *dev);
-int	usb_close(usb_dev_handle * dev);
-int	usb_get_string(usb_dev_handle * dev, int index, int langid, char *buf, size_t buflen);
-int	usb_get_string_simple(usb_dev_handle * dev, int index, char *buf, size_t buflen);
-int	usb_get_descriptor_by_endpoint(usb_dev_handle * udev, int ep, uint8_t type, uint8_t index, void *buf, int size);
-int	usb_get_descriptor(usb_dev_handle * udev, uint8_t type, uint8_t index, void *buf, int size);
-int	usb_parse_descriptor(uint8_t *source, char *description, void *dest);
-int	usb_parse_configuration(struct usb_config_descriptor *config, uint8_t *buffer);
-void	usb_destroy_configuration(struct usb_device *dev);
-void	usb_fetch_and_parse_descriptors(usb_dev_handle * udev);
-int	usb_bulk_write(usb_dev_handle * dev, int ep, char *bytes, int size, int timeout);
-int	usb_bulk_read(usb_dev_handle * dev, int ep, char *bytes, int size, int timeout);
-int	usb_interrupt_write(usb_dev_handle * dev, int ep, char *bytes, int size, int timeout);
-int	usb_interrupt_read(usb_dev_handle * dev, int ep, char *bytes, int size, int timeout);
-int	usb_control_msg(usb_dev_handle * dev, int requesttype, int request, int value, int index, char *bytes, int size, int timeout);
-int	usb_set_configuration(usb_dev_handle * dev, int configuration);
-int	usb_claim_interface(usb_dev_handle * dev, int interface);
-int	usb_release_interface(usb_dev_handle * dev, int interface);
-int	usb_set_altinterface(usb_dev_handle * dev, int alternate);
-int	usb_resetep(usb_dev_handle * dev, unsigned int ep);
-int	usb_clear_halt(usb_dev_handle * dev, unsigned int ep);
-int	usb_reset(usb_dev_handle * dev);
-int	usb_check_connected(usb_dev_handle * dev);
-const char *usb_strerror(void);
-void	usb_init(void);
-void	usb_set_debug(int level);
-int	usb_find_busses(void);
-int	usb_find_devices(void);
-struct usb_device *usb_device(usb_dev_handle * dev);
-struct usb_bus *usb_get_busses(void);
-int	usb_get_driver_np(usb_dev_handle * dev, int interface, char *name, int namelen);
-int	usb_detach_kernel_driver_np(usb_dev_handle * dev, int interface);
-
-#if 0
-{					/* style */
-#endif
-#ifdef __cplusplus
-}
-
-#endif
-
-#endif					/* _LIBUSB20_COMPAT01_H_ */
diff --git a/include.new/usbhid.h b/include.new/usbhid.h
deleted file mode 100644
index e2d2ce2..0000000
--- a/include.new/usbhid.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*	$NetBSD: usb.h,v 1.8 2000/08/13 22:22:02 augustss Exp $	*/
-
-/*
- * Copyright (c) 1999 Lennart Augustsson <augustss@netbsd.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.
- *
- * 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: releng/10.2/lib/libusbhid/usbhid.h 225839 2011-09-28 14:52:25Z mav $
- *
- */
-
-#include <stdint.h>
-
-typedef struct report_desc *report_desc_t;
-
-typedef struct hid_data *hid_data_t;
-
-typedef enum hid_kind {
-	hid_input, hid_output, hid_feature, hid_collection, hid_endcollection
-} hid_kind_t;
-
-typedef struct hid_item {
-	/* Global */
-	uint32_t _usage_page;
-	int32_t logical_minimum;
-	int32_t logical_maximum;
-	int32_t physical_minimum;
-	int32_t physical_maximum;
-	int32_t unit_exponent;
-	int32_t unit;
-	int32_t report_size;
-	int32_t report_ID;
-#define NO_REPORT_ID 0
-	int32_t report_count;
-	/* Local */
-	uint32_t usage;
-	int32_t usage_minimum;
-	int32_t usage_maximum;
-	int32_t designator_index;
-	int32_t designator_minimum;
-	int32_t designator_maximum;
-	int32_t string_index;
-	int32_t string_minimum;
-	int32_t string_maximum;
-	int32_t set_delimiter;
-	/* Misc */
-	int32_t collection;
-	int	collevel;
-	enum hid_kind kind;
-	uint32_t flags;
-	/* Location */
-	uint32_t pos;
-	/* unused */
-	struct hid_item *next;
-} hid_item_t;
-
-#define HID_PAGE(u) (((u) >> 16) & 0xffff)
-#define HID_USAGE(u) ((u) & 0xffff)
-#define HID_HAS_GET_SET_REPORT 1
-
-__BEGIN_DECLS
-
-/* Obtaining a report descriptor, descr.c: */
-report_desc_t hid_get_report_desc(int file);
-report_desc_t hid_use_report_desc(unsigned char *data, unsigned int size);
-void hid_dispose_report_desc(report_desc_t);
-int hid_get_report_id(int file);
-int hid_set_immed(int fd, int enable);
-
-/* Parsing of a HID report descriptor, parse.c: */
-hid_data_t hid_start_parse(report_desc_t d, int kindset, int id);
-void hid_end_parse(hid_data_t s);
-int hid_get_item(hid_data_t s, hid_item_t *h);
-int hid_report_size(report_desc_t d, enum hid_kind k, int id);
-int hid_locate(report_desc_t d, unsigned int usage, enum hid_kind k,
-    hid_item_t *h, int id);
-
-/* Conversion to/from usage names, usage.c: */
-const char *hid_usage_page(int i);
-const char *hid_usage_in_page(unsigned int u);
-void hid_init(const char *file);
-int hid_parse_usage_in_page(const char *name);
-int hid_parse_usage_page(const char *name);
-
-/* Extracting/insertion of data, data.c: */
-int32_t hid_get_data(const void *p, const hid_item_t *h);
-void hid_set_data(void *p, const hid_item_t *h, int32_t data);
-int hid_get_report(int fd, enum hid_kind k,
-    unsigned char *data, unsigned int size);
-int hid_set_report(int fd, enum hid_kind k,
-    unsigned char *data, unsigned int size);
-
-__END_DECLS
diff --git a/include.new/utempter.h b/include.new/utempter.h
deleted file mode 100644
index 25afd61..0000000
--- a/include.new/utempter.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2009 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/lib/libulog/utempter.h 200185 2009-12-06 20:30:21Z ed $
- */
-
-#ifndef _UTEMPTER_H_
-#define	_UTEMPTER_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	utempter_add_record(int, const char *);
-int	utempter_remove_added_record(void);
-int	utempter_remove_record(int);
-
-void	addToUtmp(const char *, const char *, int);
-void	removeFromUtmp(void);
-void	removeLineFromUtmp(const char *, int);
-__END_DECLS
-
-#endif /* !_UTEMPTER_H_ */
diff --git a/include.new/utime.h b/include.new/utime.h
deleted file mode 100644
index 8ab76bc..0000000
--- a/include.new/utime.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- *	@(#)utime.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: releng/10.2/include/utime.h 203964 2010-02-16 19:39:50Z imp $
- */
-
-#ifndef	_UTIME_H_
-#define	_UTIME_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-struct utimbuf {
-	time_t actime;		/* Access time */
-	time_t modtime;		/* Modification time */
-};
-
-__BEGIN_DECLS
-int utime(const char *, const struct utimbuf *);
-__END_DECLS
-
-#endif /* !_UTIME_H_ */
diff --git a/include.new/utmp.h b/include.new/utmp.h
deleted file mode 100644
index fdd9acc..0000000
--- a/include.new/utmp.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: src/include/utmp.h,v 1.10 2001/10/27 20:40:54 peter Exp $
- */
-
-#ifndef	_UTMP_H_
-#define	_UTMP_H_
-
-#define	_PATH_UTMP	"/var/run/utmp"
-#define	_PATH_WTMP	"/var/log/wtmp"
-#define	_PATH_LASTLOG	"/var/log/lastlog"
-
-#define	UT_NAMESIZE	16	/* see MAXLOGNAME in <sys/param.h> */
-#define	UT_LINESIZE	8
-#define	UT_HOSTSIZE	16
-
-struct lastlog {
-	int32_t	ll_time;
-	char	ll_line[UT_LINESIZE];
-	char	ll_host[UT_HOSTSIZE];
-};
-
-struct utmp {
-	char	ut_line[UT_LINESIZE];
-	char	ut_name[UT_NAMESIZE];
-	char	ut_host[UT_HOSTSIZE];
-	int32_t	ut_time;
-};
-
-#endif /* !_UTMP_H_ */
diff --git a/include.new/utmpx.h b/include.new/utmpx.h
deleted file mode 100644
index 70c959a..0000000
--- a/include.new/utmpx.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * Copyright (c) 2010 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/include/utmpx.h 202188 2010-01-13 17:29:55Z ed $
- */
-
-#ifndef _UTMPX_H_
-#define	_UTMPX_H_
-
-#include <sys/cdefs.h>
-#include <sys/_timeval.h>
-#include <sys/_types.h>
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-struct utmpx {
-	short		ut_type;	/* Type of entry. */
-	struct timeval	ut_tv;		/* Time entry was made. */
-	char		ut_id[8];	/* Record identifier. */
-	pid_t		ut_pid;		/* Process ID. */
-	char		ut_user[32];	/* User login name. */
-	char		ut_line[16];	/* Device name. */
-#if __BSD_VISIBLE
-	char		ut_host[128];	/* Remote hostname. */
-#else
-	char		__ut_host[128];
-#endif
-	char		__ut_spare[64];
-};
-
-#define	EMPTY		0	/* No valid user accounting information. */
-#define	BOOT_TIME	1	/* Time of system boot. */
-#define	OLD_TIME	2	/* Time when system clock changed. */
-#define	NEW_TIME	3	/* Time after system clock changed. */
-#define	USER_PROCESS	4	/* A process. */
-#define	INIT_PROCESS	5	/* A process spawned by the init process. */
-#define	LOGIN_PROCESS	6	/* The session leader of a logged-in user. */
-#define	DEAD_PROCESS	7	/* A session leader who has exited. */
-#if __BSD_VISIBLE
-#define	SHUTDOWN_TIME	8	/* Time of system shutdown. */
-#endif
-
-#if __BSD_VISIBLE
-#define	UTXDB_ACTIVE	0	/* Active login sessions. */
-#define	UTXDB_LASTLOGIN	1	/* Last login sessions. */
-#define	UTXDB_LOG	2	/* Log indexed by time. */
-#endif
-
-__BEGIN_DECLS
-void	endutxent(void);
-struct utmpx *getutxent(void);
-struct utmpx *getutxid(const struct utmpx *);
-struct utmpx *getutxline(const struct utmpx *);
-struct utmpx *pututxline(const struct utmpx *);
-void	setutxent(void);
-
-#if __BSD_VISIBLE
-struct utmpx *getutxuser(const char *);
-int	setutxdb(int, const char *);
-#endif
-__END_DECLS
-
-#endif /* !_UTMPX_H_ */
diff --git a/include.new/uuid.h b/include.new/uuid.h
deleted file mode 100644
index 69fd6f4..0000000
--- a/include.new/uuid.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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: releng/10.2/include/uuid.h 183057 2008-09-15 23:47:19Z emax $
- */
-
-#ifndef _UUID_H_
-#define	_UUID_H_
-
-#include <sys/types.h>
-#include <sys/uuid.h>
-
-/*
- * This implementation mostly conforms to the DCE 1.1 specification.
- * See Also:
- *	uuidgen(1), uuidgen(2), uuid(3)
- */
-
-/* Status codes returned by the functions. */
-#define	uuid_s_ok			0
-#define	uuid_s_bad_version		1
-#define	uuid_s_invalid_string_uuid	2
-#define	uuid_s_no_memory		3
-
-__BEGIN_DECLS
-int32_t	uuid_compare(const uuid_t *, const uuid_t *, uint32_t *);
-void	uuid_create(uuid_t *, uint32_t *);
-void	uuid_create_nil(uuid_t *, uint32_t *);
-int32_t	uuid_equal(const uuid_t *, const uuid_t *, uint32_t *);
-void	uuid_from_string(const char *, uuid_t *, uint32_t *);
-uint16_t uuid_hash(const uuid_t *, uint32_t *);
-int32_t	uuid_is_nil(const uuid_t *, uint32_t *);
-void	uuid_to_string(const uuid_t *, char **, uint32_t *);
-void	uuid_enc_le(void *, const uuid_t *);
-void	uuid_dec_le(const void *, uuid_t *);
-void	uuid_enc_be(void *, const uuid_t *);
-void	uuid_dec_be(const void *, uuid_t *);
-__END_DECLS
-
-#endif	/* _UUID_H_ */
diff --git a/include.new/varargs.h b/include.new/varargs.h
deleted file mode 100644
index d900cbd..0000000
--- a/include.new/varargs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2003 Alexander Kabaev
- * 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.
- *
- * 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: releng/10.2/include/varargs.h 119630 2003-09-01 03:28:25Z kan $
- */
-
-#ifndef _VARARGS_H_
-#define	_VARARGS_H_
-
-#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ > 2 || __GNUC__ >= 4)
-
-#error "<varargs.h> is obsolete with this version of GCC."
-#error "Change your code to use <stdarg.h> instead."
-
-#else	/* ! __GNUC__ post GCC 3.3 */
-
-#include <machine/varargs.h>
-
-#endif /* __GNUC__ post GCC 3.3 */
-
-#endif /* !_VARARGS_H_ */
diff --git a/include.new/vgl.h b/include.new/vgl.h
deleted file mode 100644
index dd5d08e..0000000
--- a/include.new/vgl.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * Copyright (c) 1991-1997 Søren Schmidt
- * 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
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/lib/libvgl/vgl.h 229784 2012-01-07 16:13:56Z uqs $
- */
-
-#ifndef _VGL_H_
-#define _VGL_H_
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <machine/cpufunc.h>
-
-typedef unsigned char byte;
-typedef struct {
-  byte 	Type;
-  int  	Xsize, Ysize;
-  int  	VXsize, VYsize;
-  int   Xorigin, Yorigin;
-  byte 	*Bitmap;
-  int	PixelBytes;
-} VGLBitmap;
-
-#define VGLBITMAP_INITIALIZER(t, x, y, bits)	\
-	{ (t), (x), (y), (x), (y), 0, 0, (bits) }
-
-/*
- * Defined Type's
- */
-#define MEMBUF		0
-#define VIDBUF4		1
-#define VIDBUF8		2
-#define VIDBUF8X	3
-#define VIDBUF8S	4
-#define VIDBUF4S	5
-#define VIDBUF16	6		/* Direct Color linear buffer */
-#define VIDBUF24	7		/* Direct Color linear buffer */
-#define VIDBUF32	8		/* Direct Color linear buffer */
-#define VIDBUF16S	9		/* Direct Color segmented buffer */
-#define VIDBUF24S	10		/* Direct Color segmented buffer */
-#define VIDBUF32S	11		/* Direct Color segmented buffer */
-#define NOBUF		255
-
-typedef struct VGLText {
-  byte	Width, Height;
-  byte	*BitmapArray;
-} VGLText;
-
-typedef struct VGLObject {
-  int	  	Id;
-  int	  	Type;
-  int	  	Status;
-  int	  	Xpos, Ypos;
-  int	  	Xhot, Yhot;
-  VGLBitmap 	*Image;
-  VGLBitmap 	*Mask;
-  int		(*CallBackFunction)();
-} VGLObject;
-
-#define MOUSE_IMG_SIZE		16
-#define VGL_MOUSEHIDE		0
-#define VGL_MOUSESHOW		1
-#define VGL_MOUSEFREEZE		0
-#define VGL_MOUSEUNFREEZE	1
-#define VGL_DIR_RIGHT		0
-#define VGL_DIR_UP		1
-#define VGL_DIR_LEFT		2
-#define VGL_DIR_DOWN		3
-#define VGL_RAWKEYS		1
-#define VGL_CODEKEYS		2
-#define VGL_XLATEKEYS		3
-
-extern video_adapter_info_t	VGLAdpInfo;
-extern video_info_t		VGLModeInfo;
-extern VGLBitmap 		*VGLDisplay;
-extern byte 			*VGLBuf;
-
-/*
- * Prototypes
- */
-/* bitmap.c */
-int __VGLBitmapCopy(VGLBitmap *src, int srcx, int srcy, VGLBitmap *dst, int dstx, int dsty, int width, int hight);
-int VGLBitmapCopy(VGLBitmap *src, int srcx, int srcy, VGLBitmap *dst, int dstx, int dsty, int width, int hight);
-VGLBitmap *VGLBitmapCreate(int type, int xsize, int ysize, byte *bits);
-void VGLBitmapDestroy(VGLBitmap *object);
-int VGLBitmapAllocateBits(VGLBitmap *object);
-/* keyboard.c */
-int VGLKeyboardInit(int mode);
-void VGLKeyboardEnd(void);
-int VGLKeyboardGetCh(void);
-/* main.c */
-void VGLEnd(void);
-int VGLInit(int mode);
-void VGLCheckSwitch(void);
-int VGLSetVScreenSize(VGLBitmap *object, int VXsize, int VYsize);
-int VGLPanScreen(VGLBitmap *object, int x, int y);
-int VGLSetSegment(unsigned int offset);
-/* mouse.c */
-void VGLMousePointerShow(void);
-void VGLMousePointerHide(void);
-void VGLMouseMode(int mode);
-void VGLMouseAction(int dummy);
-void VGLMouseSetImage(VGLBitmap *AndMask, VGLBitmap *OrMask);
-void VGLMouseSetStdImage(void);
-int VGLMouseInit(int mode);
-int VGLMouseStatus(int *x, int *y, char *buttons);
-int VGLMouseFreeze(int x, int y, int width, int hight, byte color);
-void VGLMouseUnFreeze(void);
-/* simple.c */
-void VGLSetXY(VGLBitmap *object, int x, int y, u_long color);
-u_long VGLGetXY(VGLBitmap *object, int x, int y);
-void VGLLine(VGLBitmap *object, int x1, int y1, int x2, int y2, u_long color);
-void VGLBox(VGLBitmap *object, int x1, int y1, int x2, int y2, u_long color);
-void VGLFilledBox(VGLBitmap *object, int x1, int y1, int x2, int y2, u_long color);
-void VGLEllipse(VGLBitmap *object, int xc, int yc, int a, int b, u_long color);
-void VGLFilledEllipse(VGLBitmap *object, int xc, int yc, int a, int b, u_long color);
-void VGLClear(VGLBitmap *object, u_long color);
-void VGLRestorePalette(void);
-void VGLSavePalette(void);
-void VGLSetPalette(byte *red, byte *green, byte *blue);
-void VGLSetPaletteIndex(byte color, byte red, byte green, byte blue);
-void VGLSetBorder(byte color);
-void VGLBlankDisplay(int blank);
-/* text.c */
-int VGLTextSetFontFile(char *filename);
-void VGLBitmapPutChar(VGLBitmap *Object, int x, int y, byte ch, byte fgcol, byte bgcol, int fill, int dir);
-void VGLBitmapString(VGLBitmap *Object, int x, int y, char *str, byte fgcol, byte bgcol, int fill, int dir);
-
-#endif /* !_VGL_H_ */
diff --git a/include.new/vis.h b/include.new/vis.h
deleted file mode 100644
index 1eef8fe..0000000
--- a/include.new/vis.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*	$NetBSD: vis.h,v 1.21 2013/02/20 17:01:15 christos Exp $	*/
-/*	$FreeBSD: releng/10.2/contrib/libc-vis/vis.h 248302 2013-03-14 23:51:47Z brooks $	*/
-
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- */
-
-#ifndef _VIS_H_
-#define	_VIS_H_
-
-#include <sys/types.h>
-
-/*
- * to select alternate encoding format
- */
-#define	VIS_OCTAL	0x0001	/* use octal \ddd format */
-#define	VIS_CSTYLE	0x0002	/* use \[nrft0..] where appropiate */
-
-/*
- * to alter set of characters encoded (default is to encode all
- * non-graphic except space, tab, and newline).
- */
-#define	VIS_SP		0x0004	/* also encode space */
-#define	VIS_TAB		0x0008	/* also encode tab */
-#define	VIS_NL		0x0010	/* also encode newline */
-#define	VIS_WHITE	(VIS_SP | VIS_TAB | VIS_NL)
-#define	VIS_SAFE	0x0020	/* only encode "unsafe" characters */
-
-/*
- * other
- */
-#define	VIS_NOSLASH	0x0040	/* inhibit printing '\' */
-#define	VIS_HTTP1808	0x0080	/* http-style escape % hex hex */
-#define	VIS_HTTPSTYLE	0x0080	/* http-style escape % hex hex */
-#define	VIS_GLOB	0x0100	/* encode glob(3) magic characters */
-#define	VIS_MIMESTYLE	0x0200	/* mime-style escape = HEX HEX */
-#define	VIS_HTTP1866	0x0400	/* http-style &#num; or &string; */
-#define	VIS_NOESCAPE	0x0800	/* don't decode `\' */
-#define	_VIS_END	0x1000	/* for unvis */
-
-/*
- * unvis return codes
- */
-#define	UNVIS_VALID	 1	/* character valid */
-#define	UNVIS_VALIDPUSH	 2	/* character valid, push back passed char */
-#define	UNVIS_NOCHAR	 3	/* valid sequence, no character produced */
-#define	UNVIS_SYNBAD	-1	/* unrecognized escape sequence */
-#define	UNVIS_ERROR	-2	/* decoder in unknown state (unrecoverable) */
-
-/*
- * unvis flags
- */
-#define	UNVIS_END	_VIS_END	/* no more characters */
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-char	*vis(char *, int, int, int);
-char	*nvis(char *, size_t, int, int, int);
-
-char	*svis(char *, int, int, int, const char *);
-char	*snvis(char *, size_t, int, int, int, const char *);
-
-int	strvis(char *, const char *, int);
-int	strnvis(char *, size_t, const char *, int);
-
-int	strsvis(char *, const char *, int, const char *);
-int	strsnvis(char *, size_t, const char *, int, const char *);
-
-int	strvisx(char *, const char *, size_t, int);
-int	strnvisx(char *, size_t, const char *, size_t, int);
-int 	strenvisx(char *, size_t, const char *, size_t, int, int *);
-
-int	strsvisx(char *, const char *, size_t, int, const char *);
-int	strsnvisx(char *, size_t, const char *, size_t, int, const char *);
-int	strsenvisx(char *, size_t, const char *, size_t , int, const char *,
-    int *);
-
-int	strunvis(char *, const char *);
-int	strnunvis(char *, size_t, const char *);
-
-int	strunvisx(char *, const char *, int);
-int	strnunvisx(char *, size_t, const char *, int);
-
-#ifndef __LIBC12_SOURCE__
-int	unvis(char *, int, int *, int);
-#endif
-__END_DECLS
-
-#endif /* !_VIS_H_ */
diff --git a/include.new/vm/_vm_radix.h b/include.new/vm/_vm_radix.h
deleted file mode 100644
index 24bb35c..0000000
--- a/include.new/vm/_vm_radix.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2013 EMC Corp.
- * Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
- * Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
- * 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.
- *
- * 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: releng/10.2/sys/vm/_vm_radix.h 254141 2013-08-09 11:28:55Z attilio $
- */
-
-#ifndef __VM_RADIX_H_
-#define __VM_RADIX_H_
-
-/*
- * Radix tree root.
- */
-struct vm_radix {
-	uintptr_t	rt_root;
-	uint8_t		rt_flags;
-};
-
-#define	RT_INSERT_INPROG	0x01
-#define	RT_TRIE_MODIFIED	0x02
-
-#ifdef _KERNEL
-
-static __inline boolean_t
-vm_radix_is_empty(struct vm_radix *rtree)
-{
-
-	return (rtree->rt_root == 0);
-}
-
-#endif /* _KERNEL */
-#endif /* !__VM_RADIX_H_ */
diff --git a/include.new/vm/memguard.h b/include.new/vm/memguard.h
deleted file mode 100644
index f8d8d95..0000000
--- a/include.new/vm/memguard.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 2005,
- *     Bosko Milekic <bmilekic@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/vm/memguard.h 254025 2013-08-07 06:21:20Z jeff $
- */
-
-#ifndef _VM_MEMGUARD_H_
-#define	_VM_MEMGUARD_H_
-
-#include "opt_vm.h"
-
-struct malloc_type;
-struct vm_map;
-struct vmem;
-
-#ifdef DEBUG_MEMGUARD
-unsigned long	memguard_fudge(unsigned long, const struct vm_map *);
-void	memguard_init(struct vmem *);
-void 	*memguard_alloc(unsigned long, int);
-void	*memguard_realloc(void *, unsigned long, struct malloc_type *, int);
-void	memguard_free(void *);
-int	memguard_cmp_mtp(struct malloc_type *, unsigned long);
-int	memguard_cmp_zone(uma_zone_t);
-int	is_memguard_addr(void *);
-#else
-#define	memguard_fudge(size, xxx)	(size)
-#define	memguard_init(map)		do { } while (0)
-#define	memguard_alloc(size, flags)	NULL
-#define	memguard_realloc(a, s, mtp, f)	NULL
-#define	memguard_free(addr)		do { } while (0)
-#define	memguard_cmp_mtp(mtp, size)	0
-#define	memguard_cmp_zone(zone)		0
-#define	is_memguard_addr(addr)		0
-#endif
-
-#endif /* _VM_MEMGUARD_H_ */
diff --git a/include.new/vm/pmap.h b/include.new/vm/pmap.h
deleted file mode 100644
index b5eee21..0000000
--- a/include.new/vm/pmap.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * 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.
- * 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.
- *
- *	from: @(#)pmap.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Avadis Tevanian, Jr.
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/vm/pmap.h 270920 2014-09-01 07:58:15Z kib $
- */
-
-/*
- *	Machine address mapping definitions -- machine-independent
- *	section.  [For machine-dependent section, see "machine/pmap.h".]
- */
-
-#ifndef	_PMAP_VM_
-#define	_PMAP_VM_
-/*
- * Each machine dependent implementation is expected to
- * keep certain statistics.  They may do this anyway they
- * so choose, but are expected to return the statistics
- * in the following structure.
- */
-struct pmap_statistics {
-	long resident_count;	/* # of pages mapped (total) */
-	long wired_count;	/* # of pages wired */
-};
-typedef struct pmap_statistics *pmap_statistics_t;
-
-/*
- * Each machine-dependent implementation is required to provide:
- *
- * vm_memattr_t	pmap_page_get_memattr(vm_page_t);
- * boolean_t	pmap_page_is_mapped(vm_page_t);
- * boolean_t	pmap_page_is_write_mapped(vm_page_t);
- * void		pmap_page_set_memattr(vm_page_t, vm_memattr_t);
- */
-#include <machine/pmap.h>
-
-#ifdef _KERNEL
-struct thread;
-
-/*
- * Updates to kernel_vm_end are synchronized by the kernel_map's system mutex.
- */
-extern vm_offset_t kernel_vm_end;
-
-/*
- * Flags for pmap_enter().  The bits in the low-order byte are reserved
- * for the protection code (vm_prot_t) that describes the fault type.
- */
-#define	PMAP_ENTER_NOSLEEP	0x0100
-#define	PMAP_ENTER_WIRED	0x0200
-
-void		 pmap_activate(struct thread *td);
-void		 pmap_advise(pmap_t pmap, vm_offset_t sva, vm_offset_t eva,
-		    int advice);
-void		 pmap_align_superpage(vm_object_t, vm_ooffset_t, vm_offset_t *,
-		    vm_size_t);
-void		 pmap_clear_modify(vm_page_t m);
-void		 pmap_copy(pmap_t, pmap_t, vm_offset_t, vm_size_t, vm_offset_t);
-void		 pmap_copy_page(vm_page_t, vm_page_t);
-void		 pmap_copy_pages(vm_page_t ma[], vm_offset_t a_offset,
-		    vm_page_t mb[], vm_offset_t b_offset, int xfersize);
-int		 pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m,
-		    vm_prot_t prot, u_int flags, int8_t psind);
-void		 pmap_enter_object(pmap_t pmap, vm_offset_t start,
-		    vm_offset_t end, vm_page_t m_start, vm_prot_t prot);
-void		 pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m,
-		    vm_prot_t prot);
-vm_paddr_t	 pmap_extract(pmap_t pmap, vm_offset_t va);
-vm_page_t	 pmap_extract_and_hold(pmap_t pmap, vm_offset_t va,
-		    vm_prot_t prot);
-void		 pmap_growkernel(vm_offset_t);
-void		 pmap_init(void);
-boolean_t	 pmap_is_modified(vm_page_t m);
-boolean_t	 pmap_is_prefaultable(pmap_t pmap, vm_offset_t va);
-boolean_t	 pmap_is_referenced(vm_page_t m);
-vm_offset_t	 pmap_map(vm_offset_t *, vm_paddr_t, vm_paddr_t, int);
-int		 pmap_mincore(pmap_t pmap, vm_offset_t addr,
-		    vm_paddr_t *locked_pa);
-void		 pmap_object_init_pt(pmap_t pmap, vm_offset_t addr,
-		    vm_object_t object, vm_pindex_t pindex, vm_size_t size);
-boolean_t	 pmap_page_exists_quick(pmap_t pmap, vm_page_t m);
-void		 pmap_page_init(vm_page_t m);
-int		 pmap_page_wired_mappings(vm_page_t m);
-int		 pmap_pinit(pmap_t);
-void		 pmap_pinit0(pmap_t);
-void		 pmap_protect(pmap_t, vm_offset_t, vm_offset_t, vm_prot_t);
-void		 pmap_qenter(vm_offset_t, vm_page_t *, int);
-void		 pmap_qremove(vm_offset_t, int);
-void		 pmap_release(pmap_t);
-void		 pmap_remove(pmap_t, vm_offset_t, vm_offset_t);
-void		 pmap_remove_all(vm_page_t m);
-void		 pmap_remove_pages(pmap_t);
-void		 pmap_remove_write(vm_page_t m);
-void		 pmap_sync_icache(pmap_t, vm_offset_t, vm_size_t);
-boolean_t	 pmap_ts_referenced(vm_page_t m);
-void		 pmap_unwire(pmap_t pmap, vm_offset_t start, vm_offset_t end);
-void		 pmap_zero_page(vm_page_t);
-void		 pmap_zero_page_area(vm_page_t, int off, int size);
-void		 pmap_zero_page_idle(vm_page_t);
-
-#define	pmap_resident_count(pm)	((pm)->pm_stats.resident_count)
-#define	pmap_wired_count(pm)	((pm)->pm_stats.wired_count)
-
-#endif /* _KERNEL */
-#endif /* _PMAP_VM_ */
diff --git a/include.new/vm/redzone.h b/include.new/vm/redzone.h
deleted file mode 100644
index 753b4df..0000000
--- a/include.new/vm/redzone.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2006 Pawel Jakub Dawidek <pjd@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.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/vm/redzone.h 155086 2006-01-31 11:09:21Z pjd $
- */
-
-#ifndef	_VM_REDZONE_H_
-#define	_VM_REDZONE_H_
-
-u_long redzone_get_size(caddr_t naddr);
-u_long redzone_size_ntor(u_long nsize);
-void *redzone_addr_ntor(caddr_t naddr);
-void *redzone_setup(caddr_t raddr, u_long nsize);
-void redzone_check(caddr_t naddr);
-
-#endif	/* _VM_REDZONE_H_ */
diff --git a/include.new/vm/swap_pager.h b/include.new/vm/swap_pager.h
deleted file mode 100644
index 6099d57..0000000
--- a/include.new/vm/swap_pager.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 1990 University of Utah.
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * 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.
- * 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.
- *
- *	from: @(#)swap_pager.h	7.1 (Berkeley) 12/5/90
- * $FreeBSD: releng/10.2/sys/vm/swap_pager.h 248514 2013-03-19 14:39:27Z kib $
- */
-
-#ifndef	_VM_SWAP_PAGER_H_
-#define	_VM_SWAP_PAGER_H_ 1
-
-typedef	int32_t	swblk_t;	/*
-				 * swap offset.  This is the type used to
-				 * address the "virtual swap device" and
-				 * therefore the maximum swap space is
-				 * 2^32 pages.
-				 */
-
-struct buf;
-struct swdevt;
-typedef void sw_strategy_t(struct buf *, struct swdevt *);
-typedef void sw_close_t(struct thread *, struct swdevt *);
-
-/*
- * Swap device table
- */
-struct swdevt {
-	int	sw_flags;
-	int	sw_nblks;
-	int     sw_used;
-	dev_t	sw_dev;
-	struct vnode *sw_vp;
-	void	*sw_id;
-	swblk_t	sw_first;
-	swblk_t	sw_end;
-	struct blist *sw_blist;
-	TAILQ_ENTRY(swdevt)	sw_list;
-	sw_strategy_t		*sw_strategy;
-	sw_close_t		*sw_close;
-};
-
-#define	SW_UNMAPPED	0x01
-#define	SW_CLOSING	0x04
-
-#ifdef _KERNEL
-
-extern int swap_pager_full;
-extern int swap_pager_avail;
-
-struct xswdev;
-int swap_dev_info(int name, struct xswdev *xs, char *devname, size_t len);
-void swap_pager_copy(vm_object_t, vm_object_t, vm_pindex_t, int);
-void swap_pager_freespace(vm_object_t, vm_pindex_t, vm_size_t);
-void swap_pager_swap_init(void);
-int swap_pager_isswapped(vm_object_t, struct swdevt *);
-int swap_pager_reserve(vm_object_t, vm_pindex_t, vm_size_t);
-void swap_pager_status(int *total, int *used);
-void swapoff_all(void);
-
-#endif				/* _KERNEL */
-#endif				/* _VM_SWAP_PAGER_H_ */
diff --git a/include.new/vm/uma.h b/include.new/vm/uma.h
deleted file mode 100644
index 4013325..0000000
--- a/include.new/vm/uma.h
+++ /dev/null
@@ -1,695 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003, 2004, 2005 Jeffrey Roberson <jeff@FreeBSD.org>
- * Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/vm/uma.h 283310 2015-05-23 09:14:29Z kib $
- *
- */
-
-/*
- * uma.h - External definitions for the Universal Memory Allocator
- *
-*/
-
-#ifndef _VM_UMA_H_
-#define _VM_UMA_H_
-
-#include <sys/param.h>		/* For NULL */
-#include <sys/malloc.h>		/* For M_* */
-
-/* User visible parameters */
-#define UMA_SMALLEST_UNIT       (PAGE_SIZE / 256) /* Smallest item allocated */
-
-/* Types and type defs */
-
-struct uma_zone;
-/* Opaque type used as a handle to the zone */
-typedef struct uma_zone * uma_zone_t;
-
-void zone_drain(uma_zone_t);
-
-/*
- * Item constructor
- *
- * Arguments:
- *	item  A pointer to the memory which has been allocated.
- *	arg   The arg field passed to uma_zalloc_arg
- *	size  The size of the allocated item
- *	flags See zalloc flags
- *
- * Returns:
- *	0      on success
- *      errno  on failure
- *
- * Discussion:
- *	The constructor is called just before the memory is returned
- *	to the user. It may block if necessary.
- */
-typedef int (*uma_ctor)(void *mem, int size, void *arg, int flags);
-
-/*
- * Item destructor
- *
- * Arguments:
- *	item  A pointer to the memory which has been allocated.
- *	size  The size of the item being destructed.
- *	arg   Argument passed through uma_zfree_arg
- *
- * Returns:
- *	Nothing
- *
- * Discussion:
- *	The destructor may perform operations that differ from those performed
- *	by the initializer, but it must leave the object in the same state.
- *	This IS type stable storage.  This is called after EVERY zfree call.
- */
-typedef void (*uma_dtor)(void *mem, int size, void *arg);
-
-/*
- * Item initializer
- *
- * Arguments:
- *	item  A pointer to the memory which has been allocated.
- *	size  The size of the item being initialized.
- *	flags See zalloc flags
- *
- * Returns:
- *	0      on success
- *      errno  on failure
- *
- * Discussion:
- *	The initializer is called when the memory is cached in the uma zone.
- *	The initializer and the destructor should leave the object in the same
- *	state.
- */
-typedef int (*uma_init)(void *mem, int size, int flags);
-
-/*
- * Item discard function
- *
- * Arguments:
- *	item  A pointer to memory which has been 'freed' but has not left the
- *	      zone's cache.
- *	size  The size of the item being discarded.
- *
- * Returns:
- *	Nothing
- *
- * Discussion:
- *	This routine is called when memory leaves a zone and is returned to the
- *	system for other uses.  It is the counter-part to the init function.
- */
-typedef void (*uma_fini)(void *mem, int size);
-
-/*
- * Import new memory into a cache zone.
- */
-typedef int (*uma_import)(void *arg, void **store, int count, int flags);
-
-/*
- * Free memory from a cache zone.
- */
-typedef void (*uma_release)(void *arg, void **store, int count);
-
-/*
- * What's the difference between initializing and constructing?
- *
- * The item is initialized when it is cached, and this is the state that the
- * object should be in when returned to the allocator. The purpose of this is
- * to remove some code which would otherwise be called on each allocation by
- * utilizing a known, stable state.  This differs from the constructor which
- * will be called on EVERY allocation.
- *
- * For example, in the initializer you may want to initialize embedded locks,
- * NULL list pointers, set up initial states, magic numbers, etc.  This way if
- * the object is held in the allocator and re-used it won't be necessary to
- * re-initialize it.
- *
- * The constructor may be used to lock a data structure, link it on to lists,
- * bump reference counts or total counts of outstanding structures, etc.
- *
- */
-
-
-/* Function proto types */
-
-/*
- * Create a new uma zone
- *
- * Arguments:
- *	name  The text name of the zone for debugging and stats. This memory
- *		should not be freed until the zone has been deallocated.
- *	size  The size of the object that is being created.
- *	ctor  The constructor that is called when the object is allocated.
- *	dtor  The destructor that is called when the object is freed.
- *	init  An initializer that sets up the initial state of the memory.
- *	fini  A discard function that undoes initialization done by init.
- *		ctor/dtor/init/fini may all be null, see notes above.
- *	align A bitmask that corresponds to the requested alignment
- *		eg 4 would be 0x3
- *	flags A set of parameters that control the behavior of the zone.
- *
- * Returns:
- *	A pointer to a structure which is intended to be opaque to users of
- *	the interface.  The value may be null if the wait flag is not set.
- */
-uma_zone_t uma_zcreate(const char *name, size_t size, uma_ctor ctor,
-		    uma_dtor dtor, uma_init uminit, uma_fini fini,
-		    int align, uint32_t flags);
-
-/*
- * Create a secondary uma zone
- *
- * Arguments:
- *	name  The text name of the zone for debugging and stats. This memory
- *		should not be freed until the zone has been deallocated.
- *	ctor  The constructor that is called when the object is allocated.
- *	dtor  The destructor that is called when the object is freed.
- *	zinit  An initializer that sets up the initial state of the memory
- *		as the object passes from the Keg's slab to the Zone's cache.
- *	zfini  A discard function that undoes initialization done by init
- *		as the object passes from the Zone's cache to the Keg's slab.
- *
- *		ctor/dtor/zinit/zfini may all be null, see notes above.
- *		Note that the zinit and zfini specified here are NOT
- *		exactly the same as the init/fini specified to uma_zcreate()
- *		when creating a master zone.  These zinit/zfini are called
- *		on the TRANSITION from keg to zone (and vice-versa). Once
- *		these are set, the primary zone may alter its init/fini
- *		(which are called when the object passes from VM to keg)
- *		using uma_zone_set_init/fini()) as well as its own
- *		zinit/zfini (unset by default for master zone) with
- *		uma_zone_set_zinit/zfini() (note subtle 'z' prefix).
- *
- *	master  A reference to this zone's Master Zone (Primary Zone),
- *		which contains the backing Keg for the Secondary Zone
- *		being added.
- *
- * Returns:
- *	A pointer to a structure which is intended to be opaque to users of
- *	the interface.  The value may be null if the wait flag is not set.
- */
-uma_zone_t uma_zsecond_create(char *name, uma_ctor ctor, uma_dtor dtor,
-		    uma_init zinit, uma_fini zfini, uma_zone_t master);
-
-/*
- * Add a second master to a secondary zone.  This provides multiple data
- * backends for objects with the same size.  Both masters must have
- * compatible allocation flags.  Presently, UMA_ZONE_MALLOC type zones are
- * the only supported.
- *
- * Returns:
- *	Error on failure, 0 on success.
- */
-int uma_zsecond_add(uma_zone_t zone, uma_zone_t master);
-
-/*
- * Create cache-only zones.
- *
- * This allows uma's per-cpu cache facilities to handle arbitrary
- * pointers.  Consumers must specify the import and release functions to
- * fill and destroy caches.  UMA does not allocate any memory for these
- * zones.  The 'arg' parameter is passed to import/release and is caller
- * specific.
- */
-uma_zone_t uma_zcache_create(char *name, int size, uma_ctor ctor, uma_dtor dtor,
-		    uma_init zinit, uma_fini zfini, uma_import zimport,
-		    uma_release zrelease, void *arg, int flags);
-
-/*
- * Definitions for uma_zcreate flags
- *
- * These flags share space with UMA_ZFLAGs in uma_int.h.  Be careful not to
- * overlap when adding new features.  0xf0000000 is in use by uma_int.h.
- */
-#define UMA_ZONE_PAGEABLE	0x0001	/* Return items not fully backed by
-					   physical memory XXX Not yet */
-#define UMA_ZONE_ZINIT		0x0002	/* Initialize with zeros */
-#define UMA_ZONE_STATIC		0x0004	/* Statically sized zone */
-#define UMA_ZONE_OFFPAGE	0x0008	/* Force the slab structure allocation
-					   off of the real memory */
-#define UMA_ZONE_MALLOC		0x0010	/* For use by malloc(9) only! */
-#define UMA_ZONE_NOFREE		0x0020	/* Do not free slabs of this type! */
-#define UMA_ZONE_MTXCLASS	0x0040	/* Create a new lock class */
-#define	UMA_ZONE_VM		0x0080	/*
-					 * Used for internal vm datastructures
-					 * only.
-					 */
-#define	UMA_ZONE_HASH		0x0100	/*
-					 * Use a hash table instead of caching
-					 * information in the vm_page.
-					 */
-#define	UMA_ZONE_SECONDARY	0x0200	/* Zone is a Secondary Zone */
-#define	UMA_ZONE_REFCNT		0x0400	/* Allocate refcnts in slabs */
-#define	UMA_ZONE_MAXBUCKET	0x0800	/* Use largest buckets */
-#define	UMA_ZONE_CACHESPREAD	0x1000	/*
-					 * Spread memory start locations across
-					 * all possible cache lines.  May
-					 * require many virtually contiguous
-					 * backend pages and can fail early.
-					 */
-#define	UMA_ZONE_VTOSLAB	0x2000	/* Zone uses vtoslab for lookup. */
-#define	UMA_ZONE_NODUMP		0x4000	/*
-					 * Zone's pages will not be included in
-					 * mini-dumps.
-					 */
-#define	UMA_ZONE_PCPU		0x8000	/*
-					 * Allocates mp_ncpus slabs sized to
-					 * sizeof(struct pcpu).
-					 */
-
-/*
- * These flags are shared between the keg and zone.  In zones wishing to add
- * new kegs these flags must be compatible.  Some are determined based on
- * physical parameters of the request and may not be provided by the consumer.
- */
-#define	UMA_ZONE_INHERIT						\
-    (UMA_ZONE_OFFPAGE | UMA_ZONE_MALLOC | UMA_ZONE_NOFREE |		\
-    UMA_ZONE_HASH | UMA_ZONE_REFCNT | UMA_ZONE_VTOSLAB | UMA_ZONE_PCPU)
-
-/* Definitions for align */
-#define UMA_ALIGN_PTR	(sizeof(void *) - 1)	/* Alignment fit for ptr */
-#define UMA_ALIGN_LONG	(sizeof(long) - 1)	/* "" long */
-#define UMA_ALIGN_INT	(sizeof(int) - 1)	/* "" int */
-#define UMA_ALIGN_SHORT	(sizeof(short) - 1)	/* "" short */
-#define UMA_ALIGN_CHAR	(sizeof(char) - 1)	/* "" char */
-#define UMA_ALIGN_CACHE	(0 - 1)			/* Cache line size align */
-
-/*
- * Destroys an empty uma zone.  If the zone is not empty uma complains loudly.
- *
- * Arguments:
- *	zone  The zone we want to destroy.
- *
- */
-void uma_zdestroy(uma_zone_t zone);
-
-/*
- * Allocates an item out of a zone
- *
- * Arguments:
- *	zone  The zone we are allocating from
- *	arg   This data is passed to the ctor function
- *	flags See sys/malloc.h for available flags.
- *
- * Returns:
- *	A non-null pointer to an initialized element from the zone is
- *	guaranteed if the wait flag is M_WAITOK.  Otherwise a null pointer
- *	may be returned if the zone is empty or the ctor failed.
- */
-
-void *uma_zalloc_arg(uma_zone_t zone, void *arg, int flags);
-
-/*
- * Allocates an item out of a zone without supplying an argument
- *
- * This is just a wrapper for uma_zalloc_arg for convenience.
- *
- */
-static __inline void *uma_zalloc(uma_zone_t zone, int flags);
-
-static __inline void *
-uma_zalloc(uma_zone_t zone, int flags)
-{
-	return uma_zalloc_arg(zone, NULL, flags);
-}
-
-/*
- * Frees an item back into the specified zone.
- *
- * Arguments:
- *	zone  The zone the item was originally allocated out of.
- *	item  The memory to be freed.
- *	arg   Argument passed to the destructor
- *
- * Returns:
- *	Nothing.
- */
-
-void uma_zfree_arg(uma_zone_t zone, void *item, void *arg);
-
-/*
- * Frees an item back to a zone without supplying an argument
- *
- * This is just a wrapper for uma_zfree_arg for convenience.
- *
- */
-static __inline void uma_zfree(uma_zone_t zone, void *item);
-
-static __inline void
-uma_zfree(uma_zone_t zone, void *item)
-{
-	uma_zfree_arg(zone, item, NULL);
-}
-
-/*
- * XXX The rest of the prototypes in this header are h0h0 magic for the VM.
- * If you think you need to use it for a normal zone you're probably incorrect.
- */
-
-/*
- * Backend page supplier routines
- *
- * Arguments:
- *	zone  The zone that is requesting pages.
- *	size  The number of bytes being requested.
- *	pflag Flags for these memory pages, see below.
- *	wait  Indicates our willingness to block.
- *
- * Returns:
- *	A pointer to the allocated memory or NULL on failure.
- */
-
-typedef void *(*uma_alloc)(uma_zone_t zone, int size, uint8_t *pflag, int wait);
-
-/*
- * Backend page free routines
- *
- * Arguments:
- *	item  A pointer to the previously allocated pages.
- *	size  The original size of the allocation.
- *	pflag The flags for the slab.  See UMA_SLAB_* below.
- *
- * Returns:
- *	None
- */
-typedef void (*uma_free)(void *item, int size, uint8_t pflag);
-
-
-
-/*
- * Sets up the uma allocator. (Called by vm_mem_init)
- *
- * Arguments:
- *	bootmem  A pointer to memory used to bootstrap the system.
- *
- * Returns:
- *	Nothing
- *
- * Discussion:
- *	This memory is used for zones which allocate things before the
- *	backend page supplier can give us pages.  It should be
- *	UMA_SLAB_SIZE * boot_pages bytes. (see uma_int.h)
- *
- */
-
-void uma_startup(void *bootmem, int boot_pages);
-
-/*
- * Finishes starting up the allocator.  This should
- * be called when kva is ready for normal allocs.
- *
- * Arguments:
- *	None
- *
- * Returns:
- *	Nothing
- *
- * Discussion:
- *	uma_startup2 is called by kmeminit() to enable us of uma for malloc.
- */
-
-void uma_startup2(void);
-
-/*
- * Reclaims unused memory for all zones
- *
- * Arguments:
- *	None
- * Returns:
- *	None
- *
- * This should only be called by the page out daemon.
- */
-
-void uma_reclaim(void);
-
-/*
- * Sets the alignment mask to be used for all zones requesting cache
- * alignment.  Should be called by MD boot code prior to starting VM/UMA.
- *
- * Arguments:
- *	align The alignment mask
- *
- * Returns:
- *	Nothing
- */
-void uma_set_align(int align);
-
-/*
- * Set a reserved number of items to hold for M_USE_RESERVE allocations.  All
- * other requests must allocate new backing pages.
- */
-void uma_zone_reserve(uma_zone_t zone, int nitems);
-
-/*
- * Reserves the maximum KVA space required by the zone and configures the zone
- * to use a VM_ALLOC_NOOBJ-based backend allocator.
- *
- * Arguments:
- *	zone  The zone to update.
- *	nitems  The upper limit on the number of items that can be allocated.
- *
- * Returns:
- *	0  if KVA space can not be allocated
- *	1  if successful
- *
- * Discussion:
- *	When the machine supports a direct map and the zone's items are smaller
- *	than a page, the zone will use the direct map instead of allocating KVA
- *	space.
- */
-int uma_zone_reserve_kva(uma_zone_t zone, int nitems);
-
-/*
- * Sets a high limit on the number of items allowed in a zone
- *
- * Arguments:
- *	zone  The zone to limit
- *	nitems  The requested upper limit on the number of items allowed
- *
- * Returns:
- *	int  The effective value of nitems after rounding up based on page size
- */
-int uma_zone_set_max(uma_zone_t zone, int nitems);
-
-/*
- * Obtains the effective limit on the number of items in a zone
- *
- * Arguments:
- *	zone  The zone to obtain the effective limit from
- *
- * Return:
- *	0  No limit
- *	int  The effective limit of the zone
- */
-int uma_zone_get_max(uma_zone_t zone);
-
-/*
- * Sets a warning to be printed when limit is reached
- *
- * Arguments:
- *	zone  The zone we will warn about
- *	warning  Warning content
- *
- * Returns:
- *	Nothing
- */
-void uma_zone_set_warning(uma_zone_t zone, const char *warning);
-
-/*
- * Obtains the approximate current number of items allocated from a zone
- *
- * Arguments:
- *	zone  The zone to obtain the current allocation count from
- *
- * Return:
- *	int  The approximate current number of items allocated from the zone
- */
-int uma_zone_get_cur(uma_zone_t zone);
-
-/*
- * The following two routines (uma_zone_set_init/fini)
- * are used to set the backend init/fini pair which acts on an
- * object as it becomes allocated and is placed in a slab within
- * the specified zone's backing keg.  These should probably not
- * be changed once allocations have already begun, but only be set
- * immediately upon zone creation.
- */
-void uma_zone_set_init(uma_zone_t zone, uma_init uminit);
-void uma_zone_set_fini(uma_zone_t zone, uma_fini fini);
-
-/*
- * The following two routines (uma_zone_set_zinit/zfini) are
- * used to set the zinit/zfini pair which acts on an object as
- * it passes from the backing Keg's slab cache to the
- * specified Zone's bucket cache.  These should probably not
- * be changed once allocations have already begun, but only be set
- * immediately upon zone creation.
- */
-void uma_zone_set_zinit(uma_zone_t zone, uma_init zinit);
-void uma_zone_set_zfini(uma_zone_t zone, uma_fini zfini);
-
-/*
- * Replaces the standard backend allocator for this zone.
- *
- * Arguments:
- *	zone   The zone whose backend allocator is being changed.
- *	allocf A pointer to the allocation function
- *
- * Returns:
- *	Nothing
- *
- * Discussion:
- *	This could be used to implement pageable allocation, or perhaps
- *	even DMA allocators if used in conjunction with the OFFPAGE
- *	zone flag.
- */
-
-void uma_zone_set_allocf(uma_zone_t zone, uma_alloc allocf);
-
-/*
- * Used for freeing memory provided by the allocf above
- *
- * Arguments:
- *	zone  The zone that intends to use this free routine.
- *	freef The page freeing routine.
- *
- * Returns:
- *	Nothing
- */
-
-void uma_zone_set_freef(uma_zone_t zone, uma_free freef);
-
-/*
- * These flags are setable in the allocf and visible in the freef.
- */
-#define UMA_SLAB_BOOT	0x01		/* Slab alloced from boot pages */
-#define UMA_SLAB_KMEM	0x02		/* Slab alloced from kmem_map */
-#define UMA_SLAB_KERNEL	0x04		/* Slab alloced from kernel_map */
-#define UMA_SLAB_PRIV	0x08		/* Slab alloced from priv allocator */
-#define UMA_SLAB_OFFP	0x10		/* Slab is managed separately  */
-#define UMA_SLAB_MALLOC	0x20		/* Slab is a large malloc slab */
-/* 0x40 and 0x80 are available */
-
-/*
- * Used to pre-fill a zone with some number of items
- *
- * Arguments:
- *	zone    The zone to fill
- *	itemcnt The number of items to reserve
- *
- * Returns:
- *	Nothing
- *
- * NOTE: This is blocking and should only be done at startup
- */
-void uma_prealloc(uma_zone_t zone, int itemcnt);
-
-/*
- * Used to lookup the reference counter allocated for an item
- * from a UMA_ZONE_REFCNT zone.  For UMA_ZONE_REFCNT zones,
- * reference counters are allocated for items and stored in
- * the underlying slab header.
- *
- * Arguments:
- *	zone  The UMA_ZONE_REFCNT zone to which the item belongs.
- *	item  The address of the item for which we want a refcnt.
- *
- * Returns:
- *	A pointer to a uint32_t reference counter.
- */
-uint32_t *uma_find_refcnt(uma_zone_t zone, void *item);
-
-/*
- * Used to determine if a fixed-size zone is exhausted.
- *
- * Arguments:
- *	zone    The zone to check
- *
- * Returns:
- *	Non-zero if zone is exhausted.
- */
-int uma_zone_exhausted(uma_zone_t zone);
-int uma_zone_exhausted_nolock(uma_zone_t zone);
-
-/*
- * Common UMA_ZONE_PCPU zones.
- */
-extern uma_zone_t pcpu_zone_64;
-extern uma_zone_t pcpu_zone_ptr;
-
-/*
- * Exported statistics structures to be used by user space monitoring tools.
- * Statistics stream consists of a uma_stream_header, followed by a series of
- * alternative uma_type_header and uma_type_stat structures.
- */
-#define	UMA_STREAM_VERSION	0x00000001
-struct uma_stream_header {
-	uint32_t	ush_version;	/* Stream format version. */
-	uint32_t	ush_maxcpus;	/* Value of MAXCPU for stream. */
-	uint32_t	ush_count;	/* Number of records. */
-	uint32_t	_ush_pad;	/* Pad/reserved field. */
-};
-
-#define	UTH_MAX_NAME	32
-#define	UTH_ZONE_SECONDARY	0x00000001
-struct uma_type_header {
-	/*
-	 * Static per-zone data, some extracted from the supporting keg.
-	 */
-	char		uth_name[UTH_MAX_NAME];
-	uint32_t	uth_align;	/* Keg: alignment. */
-	uint32_t	uth_size;	/* Keg: requested size of item. */
-	uint32_t	uth_rsize;	/* Keg: real size of item. */
-	uint32_t	uth_maxpages;	/* Keg: maximum number of pages. */
-	uint32_t	uth_limit;	/* Keg: max items to allocate. */
-
-	/*
-	 * Current dynamic zone/keg-derived statistics.
-	 */
-	uint32_t	uth_pages;	/* Keg: pages allocated. */
-	uint32_t	uth_keg_free;	/* Keg: items free. */
-	uint32_t	uth_zone_free;	/* Zone: items free. */
-	uint32_t	uth_bucketsize;	/* Zone: desired bucket size. */
-	uint32_t	uth_zone_flags;	/* Zone: flags. */
-	uint64_t	uth_allocs;	/* Zone: number of allocations. */
-	uint64_t	uth_frees;	/* Zone: number of frees. */
-	uint64_t	uth_fails;	/* Zone: number of alloc failures. */
-	uint64_t	uth_sleeps;	/* Zone: number of alloc sleeps. */
-	uint64_t	_uth_reserved1[2];	/* Reserved. */
-};
-
-struct uma_percpu_stat {
-	uint64_t	ups_allocs;	/* Cache: number of allocations. */
-	uint64_t	ups_frees;	/* Cache: number of frees. */
-	uint64_t	ups_cache_free;	/* Cache: free items in cache. */
-	uint64_t	_ups_reserved[5];	/* Reserved. */
-};
-
-void uma_reclaim_wakeup(void);
-void uma_reclaim_worker(void *);
-
-#endif	/* _VM_UMA_H_ */
diff --git a/include.new/vm/uma_dbg.h b/include.new/vm/uma_dbg.h
deleted file mode 100644
index 4460ead..0000000
--- a/include.new/vm/uma_dbg.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003, 2004, 2005 Jeffrey Roberson <jeff@FreeBSD.org>
- * Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/vm/uma_dbg.h 148078 2005-07-16 09:51:52Z rwatson $
- *
- */
-
-/* 
- *
- * This file includes definitions, structures, prototypes, and inlines used
- * when debugging users of the UMA interface.
- *
- */
-
-#ifndef VM_UMA_DBG_H
-#define VM_UMA_DBG_H
-
-int trash_ctor(void *mem, int size, void *arg, int flags);
-void trash_dtor(void *mem, int size, void *arg);
-int trash_init(void *mem, int size, int flags);
-void trash_fini(void *mem, int size);
-
-/* For use only by malloc */
-int mtrash_ctor(void *mem, int size, void *arg, int flags);
-void mtrash_dtor(void *mem, int size, void *arg);
-int mtrash_init(void *mem, int size, int flags);
-void mtrash_fini(void *mem, int size);
-
-void uma_dbg_free(uma_zone_t zone, uma_slab_t slab, void *item);
-void uma_dbg_alloc(uma_zone_t zone, uma_slab_t slab, void *item);
-
-#endif /* VM_UMA_DBG_H */
diff --git a/include.new/vm/uma_int.h b/include.new/vm/uma_int.h
deleted file mode 100644
index 7571a81..0000000
--- a/include.new/vm/uma_int.h
+++ /dev/null
@@ -1,431 +0,0 @@
-/*-
- * Copyright (c) 2002-2005, 2009, 2013 Jeffrey Roberson <jeff@FreeBSD.org>
- * Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/vm/uma_int.h 281943 2015-04-24 17:05:18Z scottl $
- *
- */
-
-/* 
- * This file includes definitions, structures, prototypes, and inlines that
- * should not be used outside of the actual implementation of UMA.
- */
-
-/* 
- * Here's a quick description of the relationship between the objects:
- *
- * Kegs contain lists of slabs which are stored in either the full bin, empty
- * bin, or partially allocated bin, to reduce fragmentation.  They also contain
- * the user supplied value for size, which is adjusted for alignment purposes
- * and rsize is the result of that.  The Keg also stores information for
- * managing a hash of page addresses that maps pages to uma_slab_t structures
- * for pages that don't have embedded uma_slab_t's.
- *  
- * The uma_slab_t may be embedded in a UMA_SLAB_SIZE chunk of memory or it may
- * be allocated off the page from a special slab zone.  The free list within a
- * slab is managed with a bitmask.  For item sizes that would yield more than
- * 10% memory waste we potentially allocate a separate uma_slab_t if this will
- * improve the number of items per slab that will fit.  
- *
- * The only really gross cases, with regards to memory waste, are for those
- * items that are just over half the page size.   You can get nearly 50% waste,
- * so you fall back to the memory footprint of the power of two allocator. I
- * have looked at memory allocation sizes on many of the machines available to
- * me, and there does not seem to be an abundance of allocations at this range
- * so at this time it may not make sense to optimize for it.  This can, of 
- * course, be solved with dynamic slab sizes.
- *
- * Kegs may serve multiple Zones but by far most of the time they only serve
- * one.  When a Zone is created, a Keg is allocated and setup for it.  While
- * the backing Keg stores slabs, the Zone caches Buckets of items allocated
- * from the slabs.  Each Zone is equipped with an init/fini and ctor/dtor
- * pair, as well as with its own set of small per-CPU caches, layered above
- * the Zone's general Bucket cache.
- *
- * The PCPU caches are protected by critical sections, and may be accessed
- * safely only from their associated CPU, while the Zones backed by the same
- * Keg all share a common Keg lock (to coalesce contention on the backing
- * slabs).  The backing Keg typically only serves one Zone but in the case of
- * multiple Zones, one of the Zones is considered the Master Zone and all
- * Zone-related stats from the Keg are done in the Master Zone.  For an
- * example of a Multi-Zone setup, refer to the Mbuf allocation code.
- */
-
-/*
- *	This is the representation for normal (Non OFFPAGE slab)
- *
- *	i == item
- *	s == slab pointer
- *
- *	<----------------  Page (UMA_SLAB_SIZE) ------------------>
- *	___________________________________________________________
- *     | _  _  _  _  _  _  _  _  _  _  _  _  _  _  _   ___________ |
- *     ||i||i||i||i||i||i||i||i||i||i||i||i||i||i||i| |slab header||
- *     ||_||_||_||_||_||_||_||_||_||_||_||_||_||_||_| |___________|| 
- *     |___________________________________________________________|
- *
- *
- *	This is an OFFPAGE slab. These can be larger than UMA_SLAB_SIZE.
- *
- *	___________________________________________________________
- *     | _  _  _  _  _  _  _  _  _  _  _  _  _  _  _  _  _  _  _   |
- *     ||i||i||i||i||i||i||i||i||i||i||i||i||i||i||i||i||i||i||i|  |
- *     ||_||_||_||_||_||_||_||_||_||_||_||_||_||_||_||_||_||_||_|  |
- *     |___________________________________________________________|
- *       ___________    ^
- *	|slab header|   |
- *	|___________|---*
- *
- */
-
-#ifndef VM_UMA_INT_H
-#define VM_UMA_INT_H
-
-#define UMA_SLAB_SIZE	PAGE_SIZE	/* How big are our slabs? */
-#define UMA_SLAB_MASK	(PAGE_SIZE - 1)	/* Mask to get back to the page */
-#define UMA_SLAB_SHIFT	PAGE_SHIFT	/* Number of bits PAGE_MASK */
-
-#define UMA_BOOT_PAGES		64	/* Pages allocated for startup */
-
-/* Max waste percentage before going to off page slab management */
-#define UMA_MAX_WASTE	10
-
-/*
- * I doubt there will be many cases where this is exceeded. This is the initial
- * size of the hash table for uma_slabs that are managed off page. This hash
- * does expand by powers of two.  Currently it doesn't get smaller.
- */
-#define UMA_HASH_SIZE_INIT	32		
-
-/* 
- * I should investigate other hashing algorithms.  This should yield a low
- * number of collisions if the pages are relatively contiguous.
- */
-
-#define UMA_HASH(h, s) ((((uintptr_t)s) >> UMA_SLAB_SHIFT) & (h)->uh_hashmask)
-
-#define UMA_HASH_INSERT(h, s, mem)					\
-		SLIST_INSERT_HEAD(&(h)->uh_slab_hash[UMA_HASH((h),	\
-		    (mem))], (s), us_hlink)
-#define UMA_HASH_REMOVE(h, s, mem)					\
-		SLIST_REMOVE(&(h)->uh_slab_hash[UMA_HASH((h),		\
-		    (mem))], (s), uma_slab, us_hlink)
-
-/* Hash table for freed address -> slab translation */
-
-SLIST_HEAD(slabhead, uma_slab);
-
-struct uma_hash {
-	struct slabhead	*uh_slab_hash;	/* Hash table for slabs */
-	int		uh_hashsize;	/* Current size of the hash table */
-	int		uh_hashmask;	/* Mask used during hashing */
-};
-
-/*
- * align field or structure to cache line
- */
-#if defined(__amd64__)
-#define UMA_ALIGN	__aligned(CACHE_LINE_SIZE)
-#else
-#define UMA_ALIGN
-#endif
-
-/*
- * Structures for per cpu queues.
- */
-
-struct uma_bucket {
-	LIST_ENTRY(uma_bucket)	ub_link;	/* Link into the zone */
-	int16_t	ub_cnt;				/* Count of free items. */
-	int16_t	ub_entries;			/* Max items. */
-	void	*ub_bucket[];			/* actual allocation storage */
-};
-
-typedef struct uma_bucket * uma_bucket_t;
-
-struct uma_cache {
-	uma_bucket_t	uc_freebucket;	/* Bucket we're freeing to */
-	uma_bucket_t	uc_allocbucket;	/* Bucket to allocate from */
-	uint64_t	uc_allocs;	/* Count of allocations */
-	uint64_t	uc_frees;	/* Count of frees */
-} UMA_ALIGN;
-
-typedef struct uma_cache * uma_cache_t;
-
-/*
- * Keg management structure
- *
- * TODO: Optimize for cache line size
- *
- */
-struct uma_keg {
-	struct mtx_padalign	uk_lock;	/* Lock for the keg */
-	struct uma_hash	uk_hash;
-
-	LIST_HEAD(,uma_zone)	uk_zones;	/* Keg's zones */
-	LIST_HEAD(,uma_slab)	uk_part_slab;	/* partially allocated slabs */
-	LIST_HEAD(,uma_slab)	uk_free_slab;	/* empty slab list */
-	LIST_HEAD(,uma_slab)	uk_full_slab;	/* full slabs */
-
-	uint32_t	uk_align;	/* Alignment mask */
-	uint32_t	uk_pages;	/* Total page count */
-	uint32_t	uk_free;	/* Count of items free in slabs */
-	uint32_t	uk_reserve;	/* Number of reserved items. */
-	uint32_t	uk_size;	/* Requested size of each item */
-	uint32_t	uk_rsize;	/* Real size of each item */
-	uint32_t	uk_maxpages;	/* Maximum number of pages to alloc */
-
-	uma_init	uk_init;	/* Keg's init routine */
-	uma_fini	uk_fini;	/* Keg's fini routine */
-	uma_alloc	uk_allocf;	/* Allocation function */
-	uma_free	uk_freef;	/* Free routine */
-
-	u_long		uk_offset;	/* Next free offset from base KVA */
-	vm_offset_t	uk_kva;		/* Zone base KVA */
-	uma_zone_t	uk_slabzone;	/* Slab zone backing us, if OFFPAGE */
-
-	uint16_t	uk_slabsize;	/* Slab size for this keg */
-	uint16_t	uk_pgoff;	/* Offset to uma_slab struct */
-	uint16_t	uk_ppera;	/* pages per allocation from backend */
-	uint16_t	uk_ipers;	/* Items per slab */
-	uint32_t	uk_flags;	/* Internal flags */
-
-	/* Least used fields go to the last cache line. */
-	const char	*uk_name;		/* Name of creating zone. */
-	LIST_ENTRY(uma_keg)	uk_link;	/* List of all kegs */
-};
-typedef struct uma_keg	* uma_keg_t;
-
-/*
- * Free bits per-slab.
- */
-#define	SLAB_SETSIZE	(PAGE_SIZE / UMA_SMALLEST_UNIT)
-BITSET_DEFINE(slabbits, SLAB_SETSIZE);
-
-/*
- * The slab structure manages a single contiguous allocation from backing
- * store and subdivides it into individually allocatable items.
- */
-struct uma_slab {
-	uma_keg_t	us_keg;			/* Keg we live in */
-	union {
-		LIST_ENTRY(uma_slab)	_us_link;	/* slabs in zone */
-		unsigned long	_us_size;	/* Size of allocation */
-	} us_type;
-	SLIST_ENTRY(uma_slab)	us_hlink;	/* Link for hash table */
-	uint8_t		*us_data;		/* First item */
-	struct slabbits	us_free;		/* Free bitmask. */
-#ifdef INVARIANTS
-	struct slabbits	us_debugfree;		/* Debug bitmask. */
-#endif
-	uint16_t	us_freecount;		/* How many are free? */
-	uint8_t		us_flags;		/* Page flags see uma.h */
-	uint8_t		us_pad;			/* Pad to 32bits, unused. */
-};
-
-#define	us_link	us_type._us_link
-#define	us_size	us_type._us_size
-
-/*
- * The slab structure for UMA_ZONE_REFCNT zones for whose items we
- * maintain reference counters in the slab for.
- */
-struct uma_slab_refcnt {
-	struct uma_slab		us_head;	/* slab header data */
-	uint32_t		us_refcnt[0];	/* Actually larger. */
-};
-
-typedef struct uma_slab * uma_slab_t;
-typedef struct uma_slab_refcnt * uma_slabrefcnt_t;
-typedef uma_slab_t (*uma_slaballoc)(uma_zone_t, uma_keg_t, int);
-
-struct uma_klink {
-	LIST_ENTRY(uma_klink)	kl_link;
-	uma_keg_t		kl_keg;
-};
-typedef struct uma_klink *uma_klink_t;
-
-/*
- * Zone management structure 
- *
- * TODO: Optimize for cache line size
- *
- */
-struct uma_zone {
-	struct mtx_padalign	uz_lock;	/* Lock for the zone */
-	struct mtx_padalign	*uz_lockptr;
-	const char		*uz_name;	/* Text name of the zone */
-
-	LIST_ENTRY(uma_zone)	uz_link;	/* List of all zones in keg */
-	LIST_HEAD(,uma_bucket)	uz_buckets;	/* full buckets */
-
-	LIST_HEAD(,uma_klink)	uz_kegs;	/* List of kegs. */
-	struct uma_klink	uz_klink;	/* klink for first keg. */
-
-	uma_slaballoc	uz_slab;	/* Allocate a slab from the backend. */
-	uma_ctor	uz_ctor;	/* Constructor for each allocation */
-	uma_dtor	uz_dtor;	/* Destructor */
-	uma_init	uz_init;	/* Initializer for each item */
-	uma_fini	uz_fini;	/* Finalizer for each item. */
-	uma_import	uz_import;	/* Import new memory to cache. */
-	uma_release	uz_release;	/* Release memory from cache. */
-	void		*uz_arg;	/* Import/release argument. */
-
-	uint32_t	uz_flags;	/* Flags inherited from kegs */
-	uint32_t	uz_size;	/* Size inherited from kegs */
-
-	volatile u_long	uz_allocs UMA_ALIGN; /* Total number of allocations */
-	volatile u_long	uz_fails;	/* Total number of alloc failures */
-	volatile u_long	uz_frees;	/* Total number of frees */
-	uint64_t	uz_sleeps;	/* Total number of alloc sleeps */
-	uint16_t	uz_count;	/* Amount of items in full bucket */
-	uint16_t	uz_count_min;	/* Minimal amount of items there */
-
-	/* The next three fields are used to print a rate-limited warnings. */
-	const char	*uz_warning;	/* Warning to print on failure */
-	struct timeval	uz_ratecheck;	/* Warnings rate-limiting */
-
-	/*
-	 * This HAS to be the last item because we adjust the zone size
-	 * based on NCPU and then allocate the space for the zones.
-	 */
-	struct uma_cache	uz_cpu[1]; /* Per cpu caches */
-};
-
-/*
- * These flags must not overlap with the UMA_ZONE flags specified in uma.h.
- */
-#define	UMA_ZFLAG_MULTI		0x04000000	/* Multiple kegs in the zone. */
-#define	UMA_ZFLAG_DRAINING	0x08000000	/* Running zone_drain. */
-#define	UMA_ZFLAG_BUCKET	0x10000000	/* Bucket zone. */
-#define UMA_ZFLAG_INTERNAL	0x20000000	/* No offpage no PCPU. */
-#define UMA_ZFLAG_FULL		0x40000000	/* Reached uz_maxpages */
-#define UMA_ZFLAG_CACHEONLY	0x80000000	/* Don't ask VM for buckets. */
-
-#define	UMA_ZFLAG_INHERIT						\
-    (UMA_ZFLAG_INTERNAL | UMA_ZFLAG_CACHEONLY | UMA_ZFLAG_BUCKET)
-
-static inline uma_keg_t
-zone_first_keg(uma_zone_t zone)
-{
-	uma_klink_t klink;
-
-	klink = LIST_FIRST(&zone->uz_kegs);
-	return (klink != NULL) ? klink->kl_keg : NULL;
-}
-
-#undef UMA_ALIGN
-
-#ifdef _KERNEL
-/* Internal prototypes */
-static __inline uma_slab_t hash_sfind(struct uma_hash *hash, uint8_t *data);
-void *uma_large_malloc(int size, int wait);
-void uma_large_free(uma_slab_t slab);
-
-/* Lock Macros */
-
-#define	KEG_LOCK_INIT(k, lc)					\
-	do {							\
-		if ((lc))					\
-			mtx_init(&(k)->uk_lock, (k)->uk_name,	\
-			    (k)->uk_name, MTX_DEF | MTX_DUPOK);	\
-		else						\
-			mtx_init(&(k)->uk_lock, (k)->uk_name,	\
-			    "UMA zone", MTX_DEF | MTX_DUPOK);	\
-	} while (0)
-
-#define	KEG_LOCK_FINI(k)	mtx_destroy(&(k)->uk_lock)
-#define	KEG_LOCK(k)	mtx_lock(&(k)->uk_lock)
-#define	KEG_UNLOCK(k)	mtx_unlock(&(k)->uk_lock)
-
-#define	ZONE_LOCK_INIT(z, lc)					\
-	do {							\
-		if ((lc))					\
-			mtx_init(&(z)->uz_lock, (z)->uz_name,	\
-			    (z)->uz_name, MTX_DEF | MTX_DUPOK);	\
-		else						\
-			mtx_init(&(z)->uz_lock, (z)->uz_name,	\
-			    "UMA zone", MTX_DEF | MTX_DUPOK);	\
-	} while (0)
-	    
-#define	ZONE_LOCK(z)	mtx_lock((z)->uz_lockptr)
-#define	ZONE_TRYLOCK(z)	mtx_trylock((z)->uz_lockptr)
-#define	ZONE_UNLOCK(z)	mtx_unlock((z)->uz_lockptr)
-#define	ZONE_LOCK_FINI(z)	mtx_destroy(&(z)->uz_lock)
-
-/*
- * Find a slab within a hash table.  This is used for OFFPAGE zones to lookup
- * the slab structure.
- *
- * Arguments:
- *	hash  The hash table to search.
- *	data  The base page of the item.
- *
- * Returns:
- *	A pointer to a slab if successful, else NULL.
- */
-static __inline uma_slab_t
-hash_sfind(struct uma_hash *hash, uint8_t *data)
-{
-        uma_slab_t slab;
-        int hval;
-
-        hval = UMA_HASH(hash, data);
-
-        SLIST_FOREACH(slab, &hash->uh_slab_hash[hval], us_hlink) {
-                if ((uint8_t *)slab->us_data == data)
-                        return (slab);
-        }
-        return (NULL);
-}
-
-static __inline uma_slab_t
-vtoslab(vm_offset_t va)
-{
-	vm_page_t p;
-
-	p = PHYS_TO_VM_PAGE(pmap_kextract(va));
-	return ((uma_slab_t)p->plinks.s.pv);
-}
-
-static __inline void
-vsetslab(vm_offset_t va, uma_slab_t slab)
-{
-	vm_page_t p;
-
-	p = PHYS_TO_VM_PAGE(pmap_kextract(va));
-	p->plinks.s.pv = slab;
-}
-
-/*
- * The following two functions may be defined by architecture specific code
- * if they can provide more effecient allocation functions.  This is useful
- * for using direct mapped addresses.
- */
-void *uma_small_alloc(uma_zone_t zone, int bytes, uint8_t *pflag, int wait);
-void uma_small_free(void *mem, int size, uint8_t flags);
-#endif /* _KERNEL */
-
-#endif /* VM_UMA_INT_H */
diff --git a/include.new/vm/vm.h b/include.new/vm/vm.h
deleted file mode 100644
index 614f49a..0000000
--- a/include.new/vm/vm.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- *
- *	@(#)vm.h	8.2 (Berkeley) 12/13/93
- *	@(#)vm_prot.h	8.1 (Berkeley) 6/11/93
- *	@(#)vm_inherit.h	8.1 (Berkeley) 6/11/93
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/vm/vm.h 253604 2013-07-24 09:45:31Z avg $
- */
-
-#ifndef VM_H
-#define VM_H
-
-#include <machine/vm.h>
-
-typedef char vm_inherit_t;	/* inheritance codes */
-
-#define	VM_INHERIT_SHARE	((vm_inherit_t) 0)
-#define	VM_INHERIT_COPY		((vm_inherit_t) 1)
-#define	VM_INHERIT_NONE		((vm_inherit_t) 2)
-#define	VM_INHERIT_DEFAULT	VM_INHERIT_COPY
-
-typedef u_char vm_prot_t;	/* protection codes */
-
-#define	VM_PROT_NONE		((vm_prot_t) 0x00)
-#define	VM_PROT_READ		((vm_prot_t) 0x01)
-#define	VM_PROT_WRITE		((vm_prot_t) 0x02)
-#define	VM_PROT_EXECUTE		((vm_prot_t) 0x04)
-#define	VM_PROT_COPY		((vm_prot_t) 0x08)	/* copy-on-read */
-
-#define	VM_PROT_ALL		(VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
-#define VM_PROT_RW		(VM_PROT_READ|VM_PROT_WRITE)
-#define	VM_PROT_DEFAULT		VM_PROT_ALL
-
-enum obj_type { OBJT_DEFAULT, OBJT_SWAP, OBJT_VNODE, OBJT_DEVICE, OBJT_PHYS,
-		OBJT_DEAD, OBJT_SG, OBJT_MGTDEVICE };
-typedef u_char objtype_t;
-
-union vm_map_object;
-typedef union vm_map_object vm_map_object_t;
-
-struct vm_map_entry;
-typedef struct vm_map_entry *vm_map_entry_t;
-
-struct vm_map;
-typedef struct vm_map *vm_map_t;
-
-struct vm_object;
-typedef struct vm_object *vm_object_t;
-
-#ifndef _KERNEL
-/*
- * This is defined in <sys/types.h> for the kernel so that non-vm kernel
- * sources (mainly Mach-derived ones such as ddb) don't have to include
- * vm stuff.  Defining it there for applications might break things.
- * Define it here for "applications" that include vm headers (e.g.,
- * genassym).
- */
-typedef int boolean_t;
-
-/*
- * The exact set of memory attributes is machine dependent.  However, every
- * machine is required to define VM_MEMATTR_DEFAULT.
- */
-typedef	char vm_memattr_t;	/* memory attribute codes */
-
-/*
- * This is defined in <sys/types.h> for the kernel so that vnode_if.h
- * doesn't have to include <vm/vm.h>.
- */
-struct vm_page;
-typedef struct vm_page *vm_page_t;
-#endif				/* _KERNEL */
-
-struct vm_reserv;
-typedef struct vm_reserv *vm_reserv_t;
-
-/*
- * Information passed from the machine-independant VM initialization code
- * for use by machine-dependant code (mainly for MMU support)
- */
-struct kva_md_info {
-	vm_offset_t	buffer_sva;
-	vm_offset_t	buffer_eva;
-	vm_offset_t	clean_sva;
-	vm_offset_t	clean_eva;
-};
-
-extern struct kva_md_info	kmi;
-extern void vm_ksubmap_init(struct kva_md_info *);
-
-extern int old_mlock;
-
-struct ucred;
-int swap_reserve(vm_ooffset_t incr);
-int swap_reserve_by_cred(vm_ooffset_t incr, struct ucred *cred);
-void swap_reserve_force(vm_ooffset_t incr);
-void swap_release(vm_ooffset_t decr);
-void swap_release_by_cred(vm_ooffset_t decr, struct ucred *cred);
-void swapper(void);
-
-#endif				/* VM_H */
-
diff --git a/include.new/vm/vm_extern.h b/include.new/vm/vm_extern.h
deleted file mode 100644
index bb532bd..0000000
--- a/include.new/vm/vm_extern.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $FreeBSD: releng/10.2/sys/vm/vm_extern.h 270920 2014-09-01 07:58:15Z kib $
- */
-
-#ifndef _VM_EXTERN_H_
-#define	_VM_EXTERN_H_
-
-struct pmap;
-struct proc;
-struct vmspace;
-struct vnode;
-struct vmem;
-
-#ifdef _KERNEL
-
-/* These operate on kernel virtual addresses only. */
-vm_offset_t kva_alloc(vm_size_t);
-void kva_free(vm_offset_t, vm_size_t);
-
-/* These operate on pageable virtual addresses. */
-vm_offset_t kmap_alloc_wait(vm_map_t, vm_size_t);
-void kmap_free_wakeup(vm_map_t, vm_offset_t, vm_size_t);
-
-/* These operate on virtual addresses backed by memory. */
-vm_offset_t kmem_alloc_attr(struct vmem *, vm_size_t size, int flags,
-    vm_paddr_t low, vm_paddr_t high, vm_memattr_t memattr);
-vm_offset_t kmem_alloc_contig(struct vmem *, vm_size_t size, int flags,
-    vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary,
-    vm_memattr_t memattr);
-vm_offset_t kmem_malloc(struct vmem *, vm_size_t size, int flags);
-void kmem_free(struct vmem *, vm_offset_t, vm_size_t);
-
-/* This provides memory for previously allocated address space. */
-int kmem_back(vm_object_t, vm_offset_t, vm_size_t, int);
-void kmem_unback(vm_object_t, vm_offset_t, vm_size_t);
-
-/* Bootstrapping. */
-vm_map_t kmem_suballoc(vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t,
-    boolean_t);
-void kmem_init(vm_offset_t, vm_offset_t);
-void kmem_init_zero_region(void);
-void kmeminit(void);
-
-void swapout_procs(int);
-int kernacc(void *, int, int);
-int useracc(void *, int, int);
-int vm_fault(vm_map_t, vm_offset_t, vm_prot_t, int);
-void vm_fault_copy_entry(vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t,
-    vm_ooffset_t *);
-int vm_fault_disable_pagefaults(void);
-void vm_fault_enable_pagefaults(int save);
-int vm_fault_hold(vm_map_t map, vm_offset_t vaddr, vm_prot_t fault_type,
-    int fault_flags, vm_page_t *m_hold);
-int vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len,
-    vm_prot_t prot, vm_page_t *ma, int max_count);
-int vm_forkproc(struct thread *, struct proc *, struct thread *, struct vmspace *, int);
-void vm_waitproc(struct proc *);
-int vm_mmap(vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, objtype_t, void *, vm_ooffset_t);
-int vm_mmap_to_errno(int rv);
-void vm_set_page_size(void);
-void vm_sync_icache(vm_map_t, vm_offset_t, vm_size_t);
-typedef int (*pmap_pinit_t)(struct pmap *pmap);
-struct vmspace *vmspace_alloc(vm_offset_t, vm_offset_t, pmap_pinit_t);
-struct vmspace *vmspace_fork(struct vmspace *, vm_ooffset_t *);
-int vmspace_exec(struct proc *, vm_offset_t, vm_offset_t);
-int vmspace_unshare(struct proc *);
-void vmspace_exit(struct thread *);
-struct vmspace *vmspace_acquire_ref(struct proc *);
-void vmspace_free(struct vmspace *);
-void vmspace_exitfree(struct proc *);
-void vnode_pager_setsize(struct vnode *, vm_ooffset_t);
-int vslock(void *, size_t);
-void vsunlock(void *, size_t);
-struct sf_buf *vm_imgact_map_page(vm_object_t object, vm_ooffset_t offset);
-void vm_imgact_unmap_page(struct sf_buf *sf);
-void vm_thread_dispose(struct thread *td);
-int vm_thread_new(struct thread *td, int pages);
-int vm_mlock(struct proc *, struct ucred *, const void *, size_t);
-#endif				/* _KERNEL */
-#endif				/* !_VM_EXTERN_H_ */
diff --git a/include.new/vm/vm_kern.h b/include.new/vm/vm_kern.h
deleted file mode 100644
index cdee136..0000000
--- a/include.new/vm/vm_kern.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * 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.
- * 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.
- *
- *	from: @(#)vm_kern.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/vm/vm_kern.h 254307 2013-08-13 22:40:43Z jeff $
- */
-
-#ifndef _VM_VM_KERN_H_
-#define _VM_VM_KERN_H_ 1
-
-/* Kernel memory management definitions. */
-extern vm_map_t kernel_map;
-extern vm_map_t exec_map;
-extern vm_map_t pipe_map;
-extern struct vmem *kernel_arena;
-extern struct vmem *kmem_arena;
-extern struct vmem *buffer_arena;
-extern struct vmem *transient_arena;
-extern struct vmem *memguard_arena;
-extern vm_offset_t swapbkva;
-extern u_long vm_kmem_size;
-
-#endif				/* _VM_VM_KERN_H_ */
diff --git a/include.new/vm/vm_map.h b/include.new/vm/vm_map.h
deleted file mode 100644
index 9e377a8..0000000
--- a/include.new/vm/vm_map.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * 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.
- * 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.
- *
- *	@(#)vm_map.h	8.9 (Berkeley) 5/17/95
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/vm/vm_map.h 267901 2014-06-26 08:30:08Z kib $
- */
-
-/*
- *	Virtual memory map module definitions.
- */
-#ifndef	_VM_MAP_
-#define	_VM_MAP_
-
-#include <sys/lock.h>
-#include <sys/sx.h>
-#include <sys/_mutex.h>
-
-/*
- *	Types defined:
- *
- *	vm_map_t		the high-level address map data structure.
- *	vm_map_entry_t		an entry in an address map.
- */
-
-typedef u_char vm_flags_t;
-typedef u_int vm_eflags_t;
-
-/*
- *	Objects which live in maps may be either VM objects, or
- *	another map (called a "sharing map") which denotes read-write
- *	sharing with other maps.
- */
-union vm_map_object {
-	struct vm_object *vm_object;	/* object object */
-	struct vm_map *sub_map;		/* belongs to another map */
-};
-
-/*
- *	Address map entries consist of start and end addresses,
- *	a VM object (or sharing map) and offset into that object,
- *	and user-exported inheritance and protection information.
- *	Also included is control information for virtual copy operations.
- */
-struct vm_map_entry {
-	struct vm_map_entry *prev;	/* previous entry */
-	struct vm_map_entry *next;	/* next entry */
-	struct vm_map_entry *left;	/* left child in binary search tree */
-	struct vm_map_entry *right;	/* right child in binary search tree */
-	vm_offset_t start;		/* start address */
-	vm_offset_t end;		/* end address */
-	vm_offset_t avail_ssize;	/* amt can grow if this is a stack */
-	vm_size_t adj_free;		/* amount of adjacent free space */
-	vm_size_t max_free;		/* max free space in subtree */
-	union vm_map_object object;	/* object I point to */
-	vm_ooffset_t offset;		/* offset into object */
-	vm_eflags_t eflags;		/* map entry flags */
-	vm_prot_t protection;		/* protection code */
-	vm_prot_t max_protection;	/* maximum protection */
-	vm_inherit_t inheritance;	/* inheritance */
-	uint8_t read_ahead;		/* pages in the read-ahead window */
-	int wired_count;		/* can be paged if = 0 */
-	vm_pindex_t next_read;		/* index of the next sequential read */
-	struct ucred *cred;		/* tmp storage for creator ref */
-	struct thread *wiring_thread;
-};
-
-#define MAP_ENTRY_NOSYNC		0x0001
-#define MAP_ENTRY_IS_SUB_MAP		0x0002
-#define MAP_ENTRY_COW			0x0004
-#define MAP_ENTRY_NEEDS_COPY		0x0008
-#define MAP_ENTRY_NOFAULT		0x0010
-#define MAP_ENTRY_USER_WIRED		0x0020
-
-#define MAP_ENTRY_BEHAV_NORMAL		0x0000	/* default behavior */
-#define MAP_ENTRY_BEHAV_SEQUENTIAL	0x0040	/* expect sequential access */
-#define MAP_ENTRY_BEHAV_RANDOM		0x0080	/* expect random access */
-#define MAP_ENTRY_BEHAV_RESERVED	0x00C0	/* future use */
-
-#define MAP_ENTRY_BEHAV_MASK		0x00C0
-
-#define MAP_ENTRY_IN_TRANSITION		0x0100	/* entry being changed */
-#define MAP_ENTRY_NEEDS_WAKEUP		0x0200	/* waiters in transition */
-#define MAP_ENTRY_NOCOREDUMP		0x0400	/* don't include in a core */
-
-#define	MAP_ENTRY_GROWS_DOWN		0x1000	/* Top-down stacks */
-#define	MAP_ENTRY_GROWS_UP		0x2000	/* Bottom-up stacks */
-
-#define	MAP_ENTRY_WIRE_SKIPPED		0x4000
-#define	MAP_ENTRY_VN_WRITECNT		0x8000	/* writeable vnode mapping */
-
-#ifdef	_KERNEL
-static __inline u_char
-vm_map_entry_behavior(vm_map_entry_t entry)
-{
-	return (entry->eflags & MAP_ENTRY_BEHAV_MASK);
-}
-
-static __inline int
-vm_map_entry_user_wired_count(vm_map_entry_t entry)
-{
-	if (entry->eflags & MAP_ENTRY_USER_WIRED)
-		return (1);
-	return (0);
-}
-
-static __inline int
-vm_map_entry_system_wired_count(vm_map_entry_t entry)
-{
-	return (entry->wired_count - vm_map_entry_user_wired_count(entry));
-}
-#endif	/* _KERNEL */
-
-/*
- *	A map is a set of map entries.  These map entries are
- *	organized both as a binary search tree and as a doubly-linked
- *	list.  Both structures are ordered based upon the start and
- *	end addresses contained within each map entry.  Sleator and
- *	Tarjan's top-down splay algorithm is employed to control
- *	height imbalance in the binary search tree.
- *
- * List of locks
- *	(c)	const until freed
- */
-struct vm_map {
-	struct vm_map_entry header;	/* List of entries */
-	struct sx lock;			/* Lock for map data */
-	struct mtx system_mtx;
-	int nentries;			/* Number of entries */
-	vm_size_t size;			/* virtual size */
-	u_int timestamp;		/* Version number */
-	u_char needs_wakeup;
-	u_char system_map;		/* (c) Am I a system map? */
-	vm_flags_t flags;		/* flags for this vm_map */
-	vm_map_entry_t root;		/* Root of a binary search tree */
-	pmap_t pmap;			/* (c) Physical map */
-#define	min_offset	header.start	/* (c) */
-#define	max_offset	header.end	/* (c) */
-	int busy;
-};
-
-/*
- * vm_flags_t values
- */
-#define MAP_WIREFUTURE		0x01	/* wire all future pages */
-#define	MAP_BUSY_WAKEUP		0x02
-
-#ifdef	_KERNEL
-static __inline vm_offset_t
-vm_map_max(const struct vm_map *map)
-{
-	return (map->max_offset);
-}
-
-static __inline vm_offset_t
-vm_map_min(const struct vm_map *map)
-{
-	return (map->min_offset);
-}
-
-static __inline pmap_t
-vm_map_pmap(vm_map_t map)
-{
-	return (map->pmap);
-}
-
-static __inline void
-vm_map_modflags(vm_map_t map, vm_flags_t set, vm_flags_t clear)
-{
-	map->flags = (map->flags | set) & ~clear;
-}
-#endif	/* _KERNEL */
-
-/*
- * Shareable process virtual address space.
- *
- * List of locks
- *	(c)	const until freed
- */
-struct vmspace {
-	struct vm_map vm_map;	/* VM address map */
-	struct shmmap_state *vm_shm;	/* SYS5 shared memory private data XXX */
-	segsz_t vm_swrss;	/* resident set size before last swap */
-	segsz_t vm_tsize;	/* text size (pages) XXX */
-	segsz_t vm_dsize;	/* data size (pages) XXX */
-	segsz_t vm_ssize;	/* stack size (pages) */
-	caddr_t vm_taddr;	/* (c) user virtual address of text */
-	caddr_t vm_daddr;	/* (c) user virtual address of data */
-	caddr_t vm_maxsaddr;	/* user VA at max stack growth */
-	volatile int vm_refcnt;	/* number of references */
-	/*
-	 * Keep the PMAP last, so that CPU-specific variations of that
-	 * structure on a single architecture don't result in offset
-	 * variations of the machine-independent fields in the vmspace.
-	 */
-	struct pmap vm_pmap;	/* private physical map */
-};
-
-#ifdef	_KERNEL
-static __inline pmap_t
-vmspace_pmap(struct vmspace *vmspace)
-{
-	return &vmspace->vm_pmap;
-}
-#endif	/* _KERNEL */
-
-#ifdef	_KERNEL
-/*
- *	Macros:		vm_map_lock, etc.
- *	Function:
- *		Perform locking on the data portion of a map.  Note that
- *		these macros mimic procedure calls returning void.  The
- *		semicolon is supplied by the user of these macros, not
- *		by the macros themselves.  The macros can safely be used
- *		as unbraced elements in a higher level statement.
- */
-
-void _vm_map_lock(vm_map_t map, const char *file, int line);
-void _vm_map_unlock(vm_map_t map, const char *file, int line);
-int _vm_map_unlock_and_wait(vm_map_t map, int timo, const char *file, int line);
-void _vm_map_lock_read(vm_map_t map, const char *file, int line);
-void _vm_map_unlock_read(vm_map_t map, const char *file, int line);
-int _vm_map_trylock(vm_map_t map, const char *file, int line);
-int _vm_map_trylock_read(vm_map_t map, const char *file, int line);
-int _vm_map_lock_upgrade(vm_map_t map, const char *file, int line);
-void _vm_map_lock_downgrade(vm_map_t map, const char *file, int line);
-int vm_map_locked(vm_map_t map);
-void vm_map_wakeup(vm_map_t map);
-void vm_map_busy(vm_map_t map);
-void vm_map_unbusy(vm_map_t map);
-void vm_map_wait_busy(vm_map_t map);
-
-#define	vm_map_lock(map)	_vm_map_lock(map, LOCK_FILE, LOCK_LINE)
-#define	vm_map_unlock(map)	_vm_map_unlock(map, LOCK_FILE, LOCK_LINE)
-#define	vm_map_unlock_and_wait(map, timo)	\
-			_vm_map_unlock_and_wait(map, timo, LOCK_FILE, LOCK_LINE)
-#define	vm_map_lock_read(map)	_vm_map_lock_read(map, LOCK_FILE, LOCK_LINE)
-#define	vm_map_unlock_read(map)	_vm_map_unlock_read(map, LOCK_FILE, LOCK_LINE)
-#define	vm_map_trylock(map)	_vm_map_trylock(map, LOCK_FILE, LOCK_LINE)
-#define	vm_map_trylock_read(map)	\
-			_vm_map_trylock_read(map, LOCK_FILE, LOCK_LINE)
-#define	vm_map_lock_upgrade(map)	\
-			_vm_map_lock_upgrade(map, LOCK_FILE, LOCK_LINE)
-#define	vm_map_lock_downgrade(map)	\
-			_vm_map_lock_downgrade(map, LOCK_FILE, LOCK_LINE)
-
-long vmspace_resident_count(struct vmspace *vmspace);
-#endif	/* _KERNEL */
-
-
-/* XXX: number of kernel maps and entries to statically allocate */
-#define MAX_KMAP	10
-#define	MAX_KMAPENT	128
-
-/*
- * Copy-on-write flags for vm_map operations
- */
-#define MAP_INHERIT_SHARE	0x0001
-#define MAP_COPY_ON_WRITE	0x0002
-#define MAP_NOFAULT		0x0004
-#define MAP_PREFAULT		0x0008
-#define MAP_PREFAULT_PARTIAL	0x0010
-#define MAP_DISABLE_SYNCER	0x0020
-#define	MAP_CHECK_EXCL		0x0040
-#define MAP_DISABLE_COREDUMP	0x0100
-#define MAP_PREFAULT_MADVISE	0x0200	/* from (user) madvise request */
-#define	MAP_VN_WRITECOUNT	0x0400
-#define	MAP_STACK_GROWS_DOWN	0x1000
-#define	MAP_STACK_GROWS_UP	0x2000
-#define	MAP_ACC_CHARGED		0x4000
-#define	MAP_ACC_NO_CHARGE	0x8000
-
-/*
- * vm_fault option flags
- */
-#define VM_FAULT_NORMAL 0		/* Nothing special */
-#define VM_FAULT_CHANGE_WIRING 1	/* Change the wiring as appropriate */
-#define	VM_FAULT_DIRTY 2		/* Dirty the page; use w/VM_PROT_COPY */
-
-/*
- * Initially, mappings are slightly sequential.  The maximum window size must
- * account for the map entry's "read_ahead" field being defined as an uint8_t.
- */
-#define	VM_FAULT_READ_AHEAD_MIN		7
-#define	VM_FAULT_READ_AHEAD_INIT	15
-#define	VM_FAULT_READ_AHEAD_MAX		min(atop(MAXPHYS) - 1, UINT8_MAX)
-
-/*
- * The following "find_space" options are supported by vm_map_find().
- *
- * For VMFS_ALIGNED_SPACE, the desired alignment is specified to
- * the macro argument as log base 2 of the desired alignment.
- */
-#define	VMFS_NO_SPACE		0	/* don't find; use the given range */
-#define	VMFS_ANY_SPACE		1	/* find a range with any alignment */
-#define	VMFS_OPTIMAL_SPACE	2	/* find a range with optimal alignment*/
-#define	VMFS_SUPER_SPACE	3	/* find a superpage-aligned range */
-#define	VMFS_ALIGNED_SPACE(x)	((x) << 8) /* find a range with fixed alignment */
-
-/*
- * vm_map_wire and vm_map_unwire option flags
- */
-#define VM_MAP_WIRE_SYSTEM	0	/* wiring in a kernel map */
-#define VM_MAP_WIRE_USER	1	/* wiring in a user map */
-
-#define VM_MAP_WIRE_NOHOLES	0	/* region must not have holes */
-#define VM_MAP_WIRE_HOLESOK	2	/* region may have holes */
-
-#define VM_MAP_WIRE_WRITE	4	/* Validate writable. */
-
-#ifdef _KERNEL
-boolean_t vm_map_check_protection (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t);
-vm_map_t vm_map_create(pmap_t, vm_offset_t, vm_offset_t);
-int vm_map_delete(vm_map_t, vm_offset_t, vm_offset_t);
-int vm_map_find(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t *, vm_size_t,
-    vm_offset_t, int, vm_prot_t, vm_prot_t, int);
-int vm_map_fixed(vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t, vm_size_t,
-    vm_prot_t, vm_prot_t, int);
-int vm_map_findspace (vm_map_t, vm_offset_t, vm_size_t, vm_offset_t *);
-int vm_map_inherit (vm_map_t, vm_offset_t, vm_offset_t, vm_inherit_t);
-void vm_map_init(vm_map_t, pmap_t, vm_offset_t, vm_offset_t);
-int vm_map_insert (vm_map_t, vm_object_t, vm_ooffset_t, vm_offset_t, vm_offset_t, vm_prot_t, vm_prot_t, int);
-int vm_map_lookup (vm_map_t *, vm_offset_t, vm_prot_t, vm_map_entry_t *, vm_object_t *,
-    vm_pindex_t *, vm_prot_t *, boolean_t *);
-int vm_map_lookup_locked(vm_map_t *, vm_offset_t, vm_prot_t, vm_map_entry_t *, vm_object_t *,
-    vm_pindex_t *, vm_prot_t *, boolean_t *);
-void vm_map_lookup_done (vm_map_t, vm_map_entry_t);
-boolean_t vm_map_lookup_entry (vm_map_t, vm_offset_t, vm_map_entry_t *);
-void vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot,
-    vm_object_t object, vm_pindex_t pindex, vm_size_t size, int flags);
-int vm_map_protect (vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t, boolean_t);
-int vm_map_remove (vm_map_t, vm_offset_t, vm_offset_t);
-void vm_map_startup (void);
-int vm_map_submap (vm_map_t, vm_offset_t, vm_offset_t, vm_map_t);
-int vm_map_sync(vm_map_t, vm_offset_t, vm_offset_t, boolean_t, boolean_t);
-int vm_map_madvise (vm_map_t, vm_offset_t, vm_offset_t, int);
-void vm_map_simplify_entry (vm_map_t, vm_map_entry_t);
-int vm_map_stack (vm_map_t, vm_offset_t, vm_size_t, vm_prot_t, vm_prot_t, int);
-int vm_map_growstack (struct proc *p, vm_offset_t addr);
-int vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
-    int flags);
-int vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
-    int flags);
-long vmspace_swap_count(struct vmspace *vmspace);
-#endif				/* _KERNEL */
-#endif				/* _VM_MAP_ */
diff --git a/include.new/vm/vm_object.h b/include.new/vm/vm_object.h
deleted file mode 100644
index b390436..0000000
--- a/include.new/vm/vm_object.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * 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.
- * 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.
- *
- *	from: @(#)vm_object.h	8.3 (Berkeley) 1/12/94
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/vm/vm_object.h 286276 2015-08-04 05:18:24Z kib $
- */
-
-/*
- *	Virtual memory object module definitions.
- */
-
-#ifndef	_VM_OBJECT_
-#define	_VM_OBJECT_
-
-#include <sys/queue.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#include <sys/_rwlock.h>
-
-#include <vm/_vm_radix.h>
-
-/*
- *	Types defined:
- *
- *	vm_object_t		Virtual memory object.
- *
- *	The root of cached pages pool is protected by both the per-object lock
- *	and the free pages queue mutex.
- *	On insert in the cache radix trie, the per-object lock is expected
- *	to be already held and the free pages queue mutex will be
- *	acquired during the operation too.
- *	On remove and lookup from the cache radix trie, only the free
- *	pages queue mutex is expected to be locked.
- *	These rules allow for reliably checking for the presence of cached
- *	pages with only the per-object lock held, thereby reducing contention
- *	for the free pages queue mutex.
- *
- * List of locks
- *	(c)	const until freed
- *	(o)	per-object lock 
- *	(f)	free pages queue mutex
- *
- */
-
-struct vm_object {
-	struct rwlock lock;
-	TAILQ_ENTRY(vm_object) object_list; /* list of all objects */
-	LIST_HEAD(, vm_object) shadow_head; /* objects that this is a shadow for */
-	LIST_ENTRY(vm_object) shadow_list; /* chain of shadow objects */
-	TAILQ_HEAD(respgs, vm_page) memq; /* list of resident pages */
-	struct vm_radix rtree;		/* root of the resident page radix trie*/
-	vm_pindex_t size;		/* Object size */
-	int generation;			/* generation ID */
-	int ref_count;			/* How many refs?? */
-	int shadow_count;		/* how many objects that this is a shadow for */
-	vm_memattr_t memattr;		/* default memory attribute for pages */
-	objtype_t type;			/* type of pager */
-	u_short flags;			/* see below */
-	u_short pg_color;		/* (c) color of first page in obj */
-	u_int paging_in_progress;	/* Paging (in or out) so don't collapse or destroy */
-	int resident_page_count;	/* number of resident pages */
-	struct vm_object *backing_object; /* object that I'm a shadow of */
-	vm_ooffset_t backing_object_offset;/* Offset in backing object */
-	TAILQ_ENTRY(vm_object) pager_object_list; /* list of all objects of this pager type */
-	LIST_HEAD(, vm_reserv) rvq;	/* list of reservations */
-	struct vm_radix cache;		/* (o + f) root of the cache page radix trie */
-	void *handle;
-	union {
-		/*
-		 * VNode pager
-		 *
-		 *	vnp_size - current size of file
-		 */
-		struct {
-			off_t vnp_size;
-			vm_ooffset_t writemappings;
-		} vnp;
-
-		/*
-		 * Device pager
-		 *
-		 *	devp_pglist - list of allocated pages
-		 */
-		struct {
-			TAILQ_HEAD(, vm_page) devp_pglist;
-			struct cdev_pager_ops *ops;
-			struct cdev *dev;
-		} devp;
-
-		/*
-		 * SG pager
-		 *
-		 *	sgp_pglist - list of allocated pages
-		 */
-		struct {
-			TAILQ_HEAD(, vm_page) sgp_pglist;
-		} sgp;
-
-		/*
-		 * Swap pager
-		 *
-		 *	swp_tmpfs - back-pointer to the tmpfs vnode,
-		 *		     if any, which uses the vm object
-		 *		     as backing store.  The handle
-		 *		     cannot be reused for linking,
-		 *		     because the vnode can be
-		 *		     reclaimed and recreated, making
-		 *		     the handle changed and hash-chain
-		 *		     invalid.
-		 *
-		 *	swp_bcount - number of swap 'swblock' metablocks, each
-		 *		     contains up to 16 swapblk assignments.
-		 *		     see vm/swap_pager.h
-		 */
-		struct {
-			void *swp_tmpfs;
-			int swp_bcount;
-		} swp;
-	} un_pager;
-	struct ucred *cred;
-	vm_ooffset_t charge;
-};
-
-/*
- * Flags
- */
-#define	OBJ_FICTITIOUS	0x0001		/* (c) contains fictitious pages */
-#define	OBJ_UNMANAGED	0x0002		/* (c) contains unmanaged pages */
-#define OBJ_ACTIVE	0x0004		/* active objects */
-#define OBJ_DEAD	0x0008		/* dead objects (during rundown) */
-#define	OBJ_NOSPLIT	0x0010		/* dont split this object */
-#define OBJ_PIPWNT	0x0040		/* paging in progress wanted */
-#define OBJ_MIGHTBEDIRTY 0x0100		/* object might be dirty, only for vnode */
-#define	OBJ_TMPFS_NODE	0x0200		/* object belongs to tmpfs VREG node */
-#define	OBJ_TMPFS_DIRTY	0x0400		/* dirty tmpfs obj */
-#define	OBJ_COLORED	0x1000		/* pg_color is defined */
-#define	OBJ_ONEMAPPING	0x2000		/* One USE (a single, non-forked) mapping flag */
-#define	OBJ_DISCONNECTWNT 0x4000	/* disconnect from vnode wanted */
-#define	OBJ_TMPFS	0x8000		/* has tmpfs vnode allocated */
-
-#define IDX_TO_OFF(idx) (((vm_ooffset_t)(idx)) << PAGE_SHIFT)
-#define OFF_TO_IDX(off) ((vm_pindex_t)(((vm_ooffset_t)(off)) >> PAGE_SHIFT))
-
-#ifdef	_KERNEL
-
-#define OBJPC_SYNC	0x1			/* sync I/O */
-#define OBJPC_INVAL	0x2			/* invalidate */
-#define OBJPC_NOSYNC	0x4			/* skip if PG_NOSYNC */
-
-/*
- * The following options are supported by vm_object_page_remove().
- */
-#define	OBJPR_CLEANONLY	0x1		/* Don't remove dirty pages. */
-#define	OBJPR_NOTMAPPED	0x2		/* Don't unmap pages. */
-
-TAILQ_HEAD(object_q, vm_object);
-
-extern struct object_q vm_object_list;	/* list of allocated objects */
-extern struct mtx vm_object_list_mtx;	/* lock for object list and count */
-
-extern struct vm_object kernel_object_store;
-extern struct vm_object kmem_object_store;
-
-#define	kernel_object	(&kernel_object_store)
-#define	kmem_object	(&kmem_object_store)
-
-#define	VM_OBJECT_ASSERT_LOCKED(object)					\
-	rw_assert(&(object)->lock, RA_LOCKED)
-#define	VM_OBJECT_ASSERT_RLOCKED(object)				\
-	rw_assert(&(object)->lock, RA_RLOCKED)
-#define	VM_OBJECT_ASSERT_WLOCKED(object)				\
-	rw_assert(&(object)->lock, RA_WLOCKED)
-#define	VM_OBJECT_ASSERT_UNLOCKED(object)				\
-	rw_assert(&(object)->lock, RA_UNLOCKED)
-#define	VM_OBJECT_LOCK_DOWNGRADE(object)				\
-	rw_downgrade(&(object)->lock)
-#define	VM_OBJECT_RLOCK(object)						\
-	rw_rlock(&(object)->lock)
-#define	VM_OBJECT_RUNLOCK(object)					\
-	rw_runlock(&(object)->lock)
-#define	VM_OBJECT_SLEEP(object, wchan, pri, wmesg, timo)		\
-	rw_sleep((wchan), &(object)->lock, (pri), (wmesg), (timo))
-#define	VM_OBJECT_TRYRLOCK(object)					\
-	rw_try_rlock(&(object)->lock)
-#define	VM_OBJECT_TRYWLOCK(object)					\
-	rw_try_wlock(&(object)->lock)
-#define	VM_OBJECT_TRYUPGRADE(object)					\
-	rw_try_upgrade(&(object)->lock)
-#define	VM_OBJECT_WLOCK(object)						\
-	rw_wlock(&(object)->lock)
-#define	VM_OBJECT_WUNLOCK(object)					\
-	rw_wunlock(&(object)->lock)
-
-/*
- *	The object must be locked or thread private.
- */
-static __inline void
-vm_object_set_flag(vm_object_t object, u_short bits)
-{
-
-	object->flags |= bits;
-}
-
-void vm_object_clear_flag(vm_object_t object, u_short bits);
-void vm_object_pip_add(vm_object_t object, short i);
-void vm_object_pip_subtract(vm_object_t object, short i);
-void vm_object_pip_wakeup(vm_object_t object);
-void vm_object_pip_wakeupn(vm_object_t object, short i);
-void vm_object_pip_wait(vm_object_t object, char *waitid);
-
-static __inline boolean_t
-vm_object_cache_is_empty(vm_object_t object)
-{
-
-	return (vm_radix_is_empty(&object->cache));
-}
-
-vm_object_t vm_object_allocate (objtype_t, vm_pindex_t);
-boolean_t vm_object_coalesce(vm_object_t, vm_ooffset_t, vm_size_t, vm_size_t,
-   boolean_t);
-void vm_object_collapse (vm_object_t);
-void vm_object_deallocate (vm_object_t);
-void vm_object_destroy (vm_object_t);
-void vm_object_terminate (vm_object_t);
-void vm_object_set_writeable_dirty (vm_object_t);
-void vm_object_init (void);
-void vm_object_madvise(vm_object_t, vm_pindex_t, vm_pindex_t, int);
-void vm_object_page_cache(vm_object_t object, vm_pindex_t start,
-    vm_pindex_t end);
-boolean_t vm_object_page_clean(vm_object_t object, vm_ooffset_t start,
-    vm_ooffset_t end, int flags);
-void vm_object_page_remove(vm_object_t object, vm_pindex_t start,
-    vm_pindex_t end, int options);
-boolean_t vm_object_populate(vm_object_t, vm_pindex_t, vm_pindex_t);
-void vm_object_print(long addr, boolean_t have_addr, long count, char *modif);
-void vm_object_reference (vm_object_t);
-void vm_object_reference_locked(vm_object_t);
-int  vm_object_set_memattr(vm_object_t object, vm_memattr_t memattr);
-void vm_object_shadow (vm_object_t *, vm_ooffset_t *, vm_size_t);
-void vm_object_split(vm_map_entry_t);
-boolean_t vm_object_sync(vm_object_t, vm_ooffset_t, vm_size_t, boolean_t,
-    boolean_t);
-void vm_object_unwire(vm_object_t object, vm_ooffset_t offset,
-    vm_size_t length, uint8_t queue);
-#endif				/* _KERNEL */
-
-#endif				/* _VM_OBJECT_ */
diff --git a/include.new/vm/vm_page.h b/include.new/vm/vm_page.h
deleted file mode 100644
index de41cec..0000000
--- a/include.new/vm/vm_page.h
+++ /dev/null
@@ -1,661 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * 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.
- * 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.
- *
- *	from: @(#)vm_page.h	8.2 (Berkeley) 12/13/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/vm/vm_page.h 270440 2014-08-24 07:57:50Z kib $
- */
-
-/*
- *	Resident memory system definitions.
- */
-
-#ifndef	_VM_PAGE_
-#define	_VM_PAGE_
-
-#include <vm/pmap.h>
-
-/*
- *	Management of resident (logical) pages.
- *
- *	A small structure is kept for each resident
- *	page, indexed by page number.  Each structure
- *	is an element of several collections:
- *
- *		A radix tree used to quickly
- *		perform object/offset lookups
- *
- *		A list of all pages for a given object,
- *		so they can be quickly deactivated at
- *		time of deallocation.
- *
- *		An ordered list of pages due for pageout.
- *
- *	In addition, the structure contains the object
- *	and offset to which this page belongs (for pageout),
- *	and sundry status bits.
- *
- *	In general, operations on this structure's mutable fields are
- *	synchronized using either one of or a combination of the lock on the
- *	object that the page belongs to (O), the pool lock for the page (P),
- *	or the lock for either the free or paging queue (Q).  If a field is
- *	annotated below with two of these locks, then holding either lock is
- *	sufficient for read access, but both locks are required for write
- *	access.
- *
- *	In contrast, the synchronization of accesses to the page's
- *	dirty field is machine dependent (M).  In the
- *	machine-independent layer, the lock on the object that the
- *	page belongs to must be held in order to operate on the field.
- *	However, the pmap layer is permitted to set all bits within
- *	the field without holding that lock.  If the underlying
- *	architecture does not support atomic read-modify-write
- *	operations on the field's type, then the machine-independent
- *	layer uses a 32-bit atomic on the aligned 32-bit word that
- *	contains the dirty field.  In the machine-independent layer,
- *	the implementation of read-modify-write operations on the
- *	field is encapsulated in vm_page_clear_dirty_mask().
- */
-
-#if PAGE_SIZE == 4096
-#define VM_PAGE_BITS_ALL 0xffu
-typedef uint8_t vm_page_bits_t;
-#elif PAGE_SIZE == 8192
-#define VM_PAGE_BITS_ALL 0xffffu
-typedef uint16_t vm_page_bits_t;
-#elif PAGE_SIZE == 16384
-#define VM_PAGE_BITS_ALL 0xffffffffu
-typedef uint32_t vm_page_bits_t;
-#elif PAGE_SIZE == 32768
-#define VM_PAGE_BITS_ALL 0xfffffffffffffffflu
-typedef uint64_t vm_page_bits_t;
-#endif
-
-struct vm_page {
-	union {
-		TAILQ_ENTRY(vm_page) q; /* page queue or free list (Q) */
-		struct {
-			SLIST_ENTRY(vm_page) ss; /* private slists */
-			void *pv;
-		} s;
-		struct {
-			u_long p;
-			u_long v;
-		} memguard;
-	} plinks;
-	TAILQ_ENTRY(vm_page) listq;	/* pages in same object (O) */
-	vm_object_t object;		/* which object am I in (O,P) */
-	vm_pindex_t pindex;		/* offset into object (O,P) */
-	vm_paddr_t phys_addr;		/* physical address of page */
-	struct md_page md;		/* machine dependant stuff */
-	u_int wire_count;		/* wired down maps refs (P) */
-	volatile u_int busy_lock;	/* busy owners lock */
-	uint16_t hold_count;		/* page hold count (P) */
-	uint16_t flags;			/* page PG_* flags (P) */
-	uint8_t aflags;			/* access is atomic */
-	uint8_t oflags;			/* page VPO_* flags (O) */
-	uint8_t	queue;			/* page queue index (P,Q) */
-	int8_t segind;
-	uint8_t	order;			/* index of the buddy queue */
-	uint8_t pool;
-	u_char	act_count;		/* page usage count (P) */
-	/* NOTE that these must support one bit per DEV_BSIZE in a page */
-	/* so, on normal X86 kernels, they must be at least 8 bits wide */
-	vm_page_bits_t valid;		/* map of valid DEV_BSIZE chunks (O) */
-	vm_page_bits_t dirty;		/* map of dirty DEV_BSIZE chunks (M) */
-	int8_t psind;			/* pagesizes[] index (O) */
-};
-
-/*
- * Page flags stored in oflags:
- *
- * Access to these page flags is synchronized by the lock on the object
- * containing the page (O).
- *
- * Note: VPO_UNMANAGED (used by OBJT_DEVICE, OBJT_PHYS and OBJT_SG)
- * 	 indicates that the page is not under PV management but
- * 	 otherwise should be treated as a normal page.  Pages not
- * 	 under PV management cannot be paged out via the
- * 	 object/vm_page_t because there is no knowledge of their pte
- * 	 mappings, and such pages are also not on any PQ queue.
- *
- */
-#define	VPO_UNUSED01	0x01		/* --available-- */
-#define	VPO_SWAPSLEEP	0x02		/* waiting for swap to finish */
-#define	VPO_UNMANAGED	0x04		/* no PV management for page */
-#define	VPO_SWAPINPROG	0x08		/* swap I/O in progress on page */
-#define	VPO_NOSYNC	0x10		/* do not collect for syncer */
-
-/*
- * Busy page implementation details.
- * The algorithm is taken mostly by rwlock(9) and sx(9) locks implementation,
- * even if the support for owner identity is removed because of size
- * constraints.  Checks on lock recursion are then not possible, while the
- * lock assertions effectiveness is someway reduced.
- */
-#define	VPB_BIT_SHARED		0x01
-#define	VPB_BIT_EXCLUSIVE	0x02
-#define	VPB_BIT_WAITERS		0x04
-#define	VPB_BIT_FLAGMASK						\
-	(VPB_BIT_SHARED | VPB_BIT_EXCLUSIVE | VPB_BIT_WAITERS)
-
-#define	VPB_SHARERS_SHIFT	3
-#define	VPB_SHARERS(x)							\
-	(((x) & ~VPB_BIT_FLAGMASK) >> VPB_SHARERS_SHIFT)
-#define	VPB_SHARERS_WORD(x)	((x) << VPB_SHARERS_SHIFT | VPB_BIT_SHARED)
-#define	VPB_ONE_SHARER		(1 << VPB_SHARERS_SHIFT)
-
-#define	VPB_SINGLE_EXCLUSIVER	VPB_BIT_EXCLUSIVE
-
-#define	VPB_UNBUSIED		VPB_SHARERS_WORD(0)
-
-#define	PQ_NONE		255
-#define	PQ_INACTIVE	0
-#define	PQ_ACTIVE	1
-#define	PQ_COUNT	2
-
-TAILQ_HEAD(pglist, vm_page);
-SLIST_HEAD(spglist, vm_page);
-
-struct vm_pagequeue {
-	struct mtx	pq_mutex;
-	struct pglist	pq_pl;
-	int		pq_cnt;
-	int		* const pq_vcnt;
-	const char	* const pq_name;
-} __aligned(CACHE_LINE_SIZE);
-
-
-struct vm_domain {
-	struct vm_pagequeue vmd_pagequeues[PQ_COUNT];
-	u_int vmd_page_count;
-	u_int vmd_free_count;
-	long vmd_segs;	/* bitmask of the segments */
-	boolean_t vmd_oom;
-	int vmd_pass;	/* local pagedaemon pass */
-	struct vm_page vmd_marker; /* marker for pagedaemon private use */
-};
-
-extern struct vm_domain vm_dom[MAXMEMDOM];
-
-#define	vm_pagequeue_assert_locked(pq)	mtx_assert(&(pq)->pq_mutex, MA_OWNED)
-#define	vm_pagequeue_lock(pq)		mtx_lock(&(pq)->pq_mutex)
-#define	vm_pagequeue_unlock(pq)		mtx_unlock(&(pq)->pq_mutex)
-
-#ifdef _KERNEL
-static __inline void
-vm_pagequeue_cnt_add(struct vm_pagequeue *pq, int addend)
-{
-
-#ifdef notyet
-	vm_pagequeue_assert_locked(pq);
-#endif
-	pq->pq_cnt += addend;
-	atomic_add_int(pq->pq_vcnt, addend);
-}
-#define	vm_pagequeue_cnt_inc(pq)	vm_pagequeue_cnt_add((pq), 1)
-#define	vm_pagequeue_cnt_dec(pq)	vm_pagequeue_cnt_add((pq), -1)
-#endif	/* _KERNEL */
-
-extern struct mtx_padalign vm_page_queue_free_mtx;
-extern struct mtx_padalign pa_lock[];
-
-#if defined(__arm__)
-#define	PDRSHIFT	PDR_SHIFT
-#elif !defined(PDRSHIFT)
-#define PDRSHIFT	21
-#endif
-
-#define	pa_index(pa)	((pa) >> PDRSHIFT)
-#define	PA_LOCKPTR(pa)	((struct mtx *)(&pa_lock[pa_index(pa) % PA_LOCK_COUNT]))
-#define	PA_LOCKOBJPTR(pa)	((struct lock_object *)PA_LOCKPTR((pa)))
-#define	PA_LOCK(pa)	mtx_lock(PA_LOCKPTR(pa))
-#define	PA_TRYLOCK(pa)	mtx_trylock(PA_LOCKPTR(pa))
-#define	PA_UNLOCK(pa)	mtx_unlock(PA_LOCKPTR(pa))
-#define	PA_UNLOCK_COND(pa) 			\
-	do {		   			\
-		if ((pa) != 0) {		\
-			PA_UNLOCK((pa));	\
-			(pa) = 0;		\
-		}				\
-	} while (0)
-
-#define	PA_LOCK_ASSERT(pa, a)	mtx_assert(PA_LOCKPTR(pa), (a))
-
-#ifdef KLD_MODULE
-#define	vm_page_lock(m)		vm_page_lock_KBI((m), LOCK_FILE, LOCK_LINE)
-#define	vm_page_unlock(m)	vm_page_unlock_KBI((m), LOCK_FILE, LOCK_LINE)
-#define	vm_page_trylock(m)	vm_page_trylock_KBI((m), LOCK_FILE, LOCK_LINE)
-#else	/* !KLD_MODULE */
-#define	vm_page_lockptr(m)	(PA_LOCKPTR(VM_PAGE_TO_PHYS((m))))
-#define	vm_page_lock(m)		mtx_lock(vm_page_lockptr((m)))
-#define	vm_page_unlock(m)	mtx_unlock(vm_page_lockptr((m)))
-#define	vm_page_trylock(m)	mtx_trylock(vm_page_lockptr((m)))
-#endif
-#if defined(INVARIANTS)
-#define	vm_page_assert_locked(m)		\
-    vm_page_assert_locked_KBI((m), __FILE__, __LINE__)
-#define	vm_page_lock_assert(m, a)		\
-    vm_page_lock_assert_KBI((m), (a), __FILE__, __LINE__)
-#else
-#define	vm_page_assert_locked(m)
-#define	vm_page_lock_assert(m, a)
-#endif
-
-/*
- * The vm_page's aflags are updated using atomic operations.  To set or clear
- * these flags, the functions vm_page_aflag_set() and vm_page_aflag_clear()
- * must be used.  Neither these flags nor these functions are part of the KBI.
- *
- * PGA_REFERENCED may be cleared only if the page is locked.  It is set by
- * both the MI and MD VM layers.  However, kernel loadable modules should not
- * directly set this flag.  They should call vm_page_reference() instead.
- *
- * PGA_WRITEABLE is set exclusively on managed pages by pmap_enter().
- * When it does so, the object must be locked, or the page must be
- * exclusive busied.  The MI VM layer must never access this flag
- * directly.  Instead, it should call pmap_page_is_write_mapped().
- *
- * PGA_EXECUTABLE may be set by pmap routines, and indicates that a page has
- * at least one executable mapping.  It is not consumed by the MI VM layer.
- */
-#define	PGA_WRITEABLE	0x01		/* page may be mapped writeable */
-#define	PGA_REFERENCED	0x02		/* page has been referenced */
-#define	PGA_EXECUTABLE	0x04		/* page may be mapped executable */
-
-/*
- * Page flags.  If changed at any other time than page allocation or
- * freeing, the modification must be protected by the vm_page lock.
- */
-#define	PG_CACHED	0x0001		/* page is cached */
-#define	PG_FREE		0x0002		/* page is free */
-#define	PG_FICTITIOUS	0x0004		/* physical page doesn't exist */
-#define	PG_ZERO		0x0008		/* page is zeroed */
-#define	PG_MARKER	0x0010		/* special queue marker page */
-#define	PG_WINATCFLS	0x0040		/* flush dirty page on inactive q */
-#define	PG_NODUMP	0x0080		/* don't include this page in a dump */
-#define	PG_UNHOLDFREE	0x0100		/* delayed free of a held page */
-
-/*
- * Misc constants.
- */
-#define ACT_DECLINE		1
-#define ACT_ADVANCE		3
-#define ACT_INIT		5
-#define ACT_MAX			64
-
-#ifdef _KERNEL
-
-#include <sys/systm.h>
-
-#include <machine/atomic.h>
-
-/*
- * Each pageable resident page falls into one of four lists:
- *
- *	free
- *		Available for allocation now.
- *
- *	cache
- *		Almost available for allocation. Still associated with
- *		an object, but clean and immediately freeable.
- *
- * The following lists are LRU sorted:
- *
- *	inactive
- *		Low activity, candidates for reclamation.
- *		This is the list of pages that should be
- *		paged out next.
- *
- *	active
- *		Pages that are "active" i.e. they have been
- *		recently referenced.
- *
- */
-
-extern int vm_page_zero_count;
-
-extern vm_page_t vm_page_array;		/* First resident page in table */
-extern long vm_page_array_size;		/* number of vm_page_t's */
-extern long first_page;			/* first physical page number */
-
-#define	VM_PAGE_IS_FREE(m)	(((m)->flags & PG_FREE) != 0)
-
-#define VM_PAGE_TO_PHYS(entry)	((entry)->phys_addr)
-
-vm_page_t PHYS_TO_VM_PAGE(vm_paddr_t pa);
-
-/* page allocation classes: */
-#define VM_ALLOC_NORMAL		0
-#define VM_ALLOC_INTERRUPT	1
-#define VM_ALLOC_SYSTEM		2
-#define	VM_ALLOC_CLASS_MASK	3
-/* page allocation flags: */
-#define	VM_ALLOC_WIRED		0x0020	/* non pageable */
-#define	VM_ALLOC_ZERO		0x0040	/* Try to obtain a zeroed page */
-#define	VM_ALLOC_NOOBJ		0x0100	/* No associated object */
-#define	VM_ALLOC_NOBUSY		0x0200	/* Do not busy the page */
-#define	VM_ALLOC_IFCACHED	0x0400	/* Fail if the page is not cached */
-#define	VM_ALLOC_IFNOTCACHED	0x0800	/* Fail if the page is cached */
-#define	VM_ALLOC_IGN_SBUSY	0x1000	/* vm_page_grab() only */
-#define	VM_ALLOC_NODUMP		0x2000	/* don't include in dump */
-#define	VM_ALLOC_SBUSY		0x4000	/* Shared busy the page */
-
-#define	VM_ALLOC_COUNT_SHIFT	16
-#define	VM_ALLOC_COUNT(count)	((count) << VM_ALLOC_COUNT_SHIFT)
-
-#ifdef M_NOWAIT
-static inline int
-malloc2vm_flags(int malloc_flags)
-{
-	int pflags;
-
-	KASSERT((malloc_flags & M_USE_RESERVE) == 0 ||
-	    (malloc_flags & M_NOWAIT) != 0,
-	    ("M_USE_RESERVE requires M_NOWAIT"));
-	pflags = (malloc_flags & M_USE_RESERVE) != 0 ? VM_ALLOC_INTERRUPT :
-	    VM_ALLOC_SYSTEM;
-	if ((malloc_flags & M_ZERO) != 0)
-		pflags |= VM_ALLOC_ZERO;
-	if ((malloc_flags & M_NODUMP) != 0)
-		pflags |= VM_ALLOC_NODUMP;
-	return (pflags);
-}
-#endif
-
-void vm_page_busy_downgrade(vm_page_t m);
-void vm_page_busy_sleep(vm_page_t m, const char *msg);
-void vm_page_flash(vm_page_t m);
-void vm_page_hold(vm_page_t mem);
-void vm_page_unhold(vm_page_t mem);
-void vm_page_free(vm_page_t m);
-void vm_page_free_zero(vm_page_t m);
-
-void vm_page_activate (vm_page_t);
-void vm_page_advise(vm_page_t m, int advice);
-vm_page_t vm_page_alloc (vm_object_t, vm_pindex_t, int);
-vm_page_t vm_page_alloc_contig(vm_object_t object, vm_pindex_t pindex, int req,
-    u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment,
-    vm_paddr_t boundary, vm_memattr_t memattr);
-vm_page_t vm_page_alloc_freelist(int, int);
-vm_page_t vm_page_grab (vm_object_t, vm_pindex_t, int);
-void vm_page_cache(vm_page_t);
-void vm_page_cache_free(vm_object_t, vm_pindex_t, vm_pindex_t);
-void vm_page_cache_transfer(vm_object_t, vm_pindex_t, vm_object_t);
-int vm_page_try_to_cache (vm_page_t);
-int vm_page_try_to_free (vm_page_t);
-void vm_page_deactivate (vm_page_t);
-void vm_page_dequeue(vm_page_t m);
-void vm_page_dequeue_locked(vm_page_t m);
-vm_page_t vm_page_find_least(vm_object_t, vm_pindex_t);
-vm_page_t vm_page_getfake(vm_paddr_t paddr, vm_memattr_t memattr);
-void vm_page_initfake(vm_page_t m, vm_paddr_t paddr, vm_memattr_t memattr);
-int vm_page_insert (vm_page_t, vm_object_t, vm_pindex_t);
-boolean_t vm_page_is_cached(vm_object_t object, vm_pindex_t pindex);
-vm_page_t vm_page_lookup (vm_object_t, vm_pindex_t);
-vm_page_t vm_page_next(vm_page_t m);
-int vm_page_pa_tryrelock(pmap_t, vm_paddr_t, vm_paddr_t *);
-struct vm_pagequeue *vm_page_pagequeue(vm_page_t m);
-vm_page_t vm_page_prev(vm_page_t m);
-boolean_t vm_page_ps_is_valid(vm_page_t m);
-void vm_page_putfake(vm_page_t m);
-void vm_page_readahead_finish(vm_page_t m);
-void vm_page_reference(vm_page_t m);
-void vm_page_remove (vm_page_t);
-int vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t);
-vm_page_t vm_page_replace(vm_page_t mnew, vm_object_t object,
-    vm_pindex_t pindex);
-void vm_page_requeue(vm_page_t m);
-void vm_page_requeue_locked(vm_page_t m);
-int vm_page_sbusied(vm_page_t m);
-void vm_page_set_valid_range(vm_page_t m, int base, int size);
-int vm_page_sleep_if_busy(vm_page_t m, const char *msg);
-vm_offset_t vm_page_startup(vm_offset_t vaddr);
-void vm_page_sunbusy(vm_page_t m);
-int vm_page_trysbusy(vm_page_t m);
-void vm_page_unhold_pages(vm_page_t *ma, int count);
-void vm_page_unwire (vm_page_t, int);
-void vm_page_updatefake(vm_page_t m, vm_paddr_t paddr, vm_memattr_t memattr);
-void vm_page_wire (vm_page_t);
-void vm_page_xunbusy_hard(vm_page_t m);
-void vm_page_set_validclean (vm_page_t, int, int);
-void vm_page_clear_dirty (vm_page_t, int, int);
-void vm_page_set_invalid (vm_page_t, int, int);
-int vm_page_is_valid (vm_page_t, int, int);
-void vm_page_test_dirty (vm_page_t);
-vm_page_bits_t vm_page_bits(int base, int size);
-void vm_page_zero_invalid(vm_page_t m, boolean_t setvalid);
-void vm_page_free_toq(vm_page_t m);
-void vm_page_zero_idle_wakeup(void);
-
-void vm_page_dirty_KBI(vm_page_t m);
-void vm_page_lock_KBI(vm_page_t m, const char *file, int line);
-void vm_page_unlock_KBI(vm_page_t m, const char *file, int line);
-int vm_page_trylock_KBI(vm_page_t m, const char *file, int line);
-#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT)
-void vm_page_assert_locked_KBI(vm_page_t m, const char *file, int line);
-void vm_page_lock_assert_KBI(vm_page_t m, int a, const char *file, int line);
-#endif
-
-#define	vm_page_assert_sbusied(m)					\
-	KASSERT(vm_page_sbusied(m),					\
-	    ("vm_page_assert_sbusied: page %p not shared busy @ %s:%d", \
-	    (void *)m, __FILE__, __LINE__));
-
-#define	vm_page_assert_unbusied(m)					\
-	KASSERT(!vm_page_busied(m),					\
-	    ("vm_page_assert_unbusied: page %p busy @ %s:%d",		\
-	    (void *)m, __FILE__, __LINE__));
-
-#define	vm_page_assert_xbusied(m)					\
-	KASSERT(vm_page_xbusied(m),					\
-	    ("vm_page_assert_xbusied: page %p not exclusive busy @ %s:%d", \
-	    (void *)m, __FILE__, __LINE__));
-
-#define	vm_page_busied(m)						\
-	((m)->busy_lock != VPB_UNBUSIED)
-
-#define	vm_page_sbusy(m) do {						\
-	if (!vm_page_trysbusy(m))					\
-		panic("%s: page %p failed shared busing", __func__, m);	\
-} while (0)
-
-#define	vm_page_tryxbusy(m)						\
-	(atomic_cmpset_acq_int(&m->busy_lock, VPB_UNBUSIED,		\
-	    VPB_SINGLE_EXCLUSIVER))
-
-#define	vm_page_xbusied(m)						\
-	((m->busy_lock & VPB_SINGLE_EXCLUSIVER) != 0)
-
-#define	vm_page_xbusy(m) do {						\
-	if (!vm_page_tryxbusy(m))					\
-		panic("%s: page %p failed exclusive busing", __func__,	\
-		    m);							\
-} while (0)
-
-#define	vm_page_xunbusy(m) do {						\
-	if (!atomic_cmpset_rel_int(&(m)->busy_lock,			\
-	    VPB_SINGLE_EXCLUSIVER, VPB_UNBUSIED))			\
-		vm_page_xunbusy_hard(m);				\
-} while (0)
-
-#ifdef INVARIANTS
-void vm_page_object_lock_assert(vm_page_t m);
-#define	VM_PAGE_OBJECT_LOCK_ASSERT(m)	vm_page_object_lock_assert(m)
-void vm_page_assert_pga_writeable(vm_page_t m, uint8_t bits);
-#define	VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits)				\
-	vm_page_assert_pga_writeable(m, bits)
-#else
-#define	VM_PAGE_OBJECT_LOCK_ASSERT(m)	(void)0
-#define	VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits)	(void)0
-#endif
-
-/*
- * We want to use atomic updates for the aflags field, which is 8 bits wide.
- * However, not all architectures support atomic operations on 8-bit
- * destinations.  In order that we can easily use a 32-bit operation, we
- * require that the aflags field be 32-bit aligned.
- */
-CTASSERT(offsetof(struct vm_page, aflags) % sizeof(uint32_t) == 0);
-
-/*
- *	Clear the given bits in the specified page.
- */
-static inline void
-vm_page_aflag_clear(vm_page_t m, uint8_t bits)
-{
-	uint32_t *addr, val;
-
-	/*
-	 * The PGA_REFERENCED flag can only be cleared if the page is locked.
-	 */
-	if ((bits & PGA_REFERENCED) != 0)
-		vm_page_assert_locked(m);
-
-	/*
-	 * Access the whole 32-bit word containing the aflags field with an
-	 * atomic update.  Parallel non-atomic updates to the other fields
-	 * within this word are handled properly by the atomic update.
-	 */
-	addr = (void *)&m->aflags;
-	KASSERT(((uintptr_t)addr & (sizeof(uint32_t) - 1)) == 0,
-	    ("vm_page_aflag_clear: aflags is misaligned"));
-	val = bits;
-#if BYTE_ORDER == BIG_ENDIAN
-	val <<= 24;
-#endif
-	atomic_clear_32(addr, val);
-}
-
-/*
- *	Set the given bits in the specified page.
- */
-static inline void
-vm_page_aflag_set(vm_page_t m, uint8_t bits)
-{
-	uint32_t *addr, val;
-
-	VM_PAGE_ASSERT_PGA_WRITEABLE(m, bits);
-
-	/*
-	 * Access the whole 32-bit word containing the aflags field with an
-	 * atomic update.  Parallel non-atomic updates to the other fields
-	 * within this word are handled properly by the atomic update.
-	 */
-	addr = (void *)&m->aflags;
-	KASSERT(((uintptr_t)addr & (sizeof(uint32_t) - 1)) == 0,
-	    ("vm_page_aflag_set: aflags is misaligned"));
-	val = bits;
-#if BYTE_ORDER == BIG_ENDIAN
-	val <<= 24;
-#endif
-	atomic_set_32(addr, val);
-} 
-
-/*
- *	vm_page_dirty:
- *
- *	Set all bits in the page's dirty field.
- *
- *	The object containing the specified page must be locked if the
- *	call is made from the machine-independent layer.
- *
- *	See vm_page_clear_dirty_mask().
- */
-static __inline void
-vm_page_dirty(vm_page_t m)
-{
-
-	/* Use vm_page_dirty_KBI() under INVARIANTS to save memory. */
-#if defined(KLD_MODULE) || defined(INVARIANTS)
-	vm_page_dirty_KBI(m);
-#else
-	m->dirty = VM_PAGE_BITS_ALL;
-#endif
-}
-
-/*
- *	vm_page_remque:
- *
- *	If the given page is in a page queue, then remove it from that page
- *	queue.
- *
- *	The page must be locked.
- */
-static inline void
-vm_page_remque(vm_page_t m)
-{
-
-	if (m->queue != PQ_NONE)
-		vm_page_dequeue(m);
-}
-
-/*
- *	vm_page_undirty:
- *
- *	Set page to not be dirty.  Note: does not clear pmap modify bits
- */
-static __inline void
-vm_page_undirty(vm_page_t m)
-{
-
-	VM_PAGE_OBJECT_LOCK_ASSERT(m);
-	m->dirty = 0;
-}
-
-#endif				/* _KERNEL */
-#endif				/* !_VM_PAGE_ */
diff --git a/include.new/vm/vm_pageout.h b/include.new/vm/vm_pageout.h
deleted file mode 100644
index e55b5a3..0000000
--- a/include.new/vm/vm_pageout.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * 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.
- * 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.
- *
- *	from: @(#)vm_pageout.h	8.2 (Berkeley) 1/12/94
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Avadis Tevanian, Jr.
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/vm/vm_pageout.h 238561 2012-07-18 05:21:34Z alc $
- */
-
-#ifndef _VM_VM_PAGEOUT_H_
-#define _VM_VM_PAGEOUT_H_
-
-/*
- *	Header file for pageout daemon.
- */
-
-/*
- *	Exported data structures.
- */
-
-extern int vm_page_max_wired;
-extern int vm_pages_needed;	/* should be some "event" structure */
-extern int vm_pageout_pages_needed;
-extern int vm_pageout_deficit;
-extern int vm_pageout_page_count;
-
-/*
- * Swap out requests
- */
-#define VM_SWAP_NORMAL 1
-#define VM_SWAP_IDLE 2
-
-#define	VM_OOM_MEM	1
-#define	VM_OOM_SWAPZ	2
-
-/*
- *	Exported routines.
- */
-
-/*
- *	Signal pageout-daemon and wait for it.
- */
-
-extern void pagedaemon_wakeup(void);
-#define VM_WAIT vm_wait()
-#define VM_WAITPFAULT vm_waitpfault()
-extern void vm_wait(void);
-extern void vm_waitpfault(void);
-
-#ifdef _KERNEL
-int vm_pageout_flush(vm_page_t *, int, int, int, int *, boolean_t *);
-void vm_pageout_grow_cache(int, vm_paddr_t, vm_paddr_t);
-void vm_pageout_oom(int shortage);
-#endif
-#endif	/* _VM_VM_PAGEOUT_H_ */
diff --git a/include.new/vm/vm_pager.h b/include.new/vm/vm_pager.h
deleted file mode 100644
index 4770b43..0000000
--- a/include.new/vm/vm_pager.h
+++ /dev/null
@@ -1,210 +0,0 @@
-/*-
- * Copyright (c) 1990 University of Utah.
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * 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.
- * 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.
- *
- *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $FreeBSD: releng/10.2/sys/vm/vm_pager.h 269915 2014-08-13 06:58:42Z kib $
- */
-
-/*
- * Pager routine interface definition.
- */
-
-#ifndef	_VM_PAGER_
-#define	_VM_PAGER_
-
-#include <sys/queue.h>
-
-TAILQ_HEAD(pagerlst, vm_object);
-
-typedef void pgo_init_t(void);
-typedef vm_object_t pgo_alloc_t(void *, vm_ooffset_t, vm_prot_t, vm_ooffset_t,
-    struct ucred *);
-typedef void pgo_dealloc_t(vm_object_t);
-typedef int pgo_getpages_t(vm_object_t, vm_page_t *, int, int);
-typedef void pgo_putpages_t(vm_object_t, vm_page_t *, int, int, int *);
-typedef boolean_t pgo_haspage_t(vm_object_t, vm_pindex_t, int *, int *);
-typedef void pgo_pageunswapped_t(vm_page_t);
-
-struct pagerops {
-	pgo_init_t	*pgo_init;		/* Initialize pager. */
-	pgo_alloc_t	*pgo_alloc;		/* Allocate pager. */
-	pgo_dealloc_t	*pgo_dealloc;		/* Disassociate. */
-	pgo_getpages_t	*pgo_getpages;		/* Get (read) page. */
-	pgo_putpages_t	*pgo_putpages;		/* Put (write) page. */
-	pgo_haspage_t	*pgo_haspage;		/* Does pager have page? */
-	pgo_pageunswapped_t *pgo_pageunswapped;
-};
-
-extern struct pagerops defaultpagerops;
-extern struct pagerops swappagerops;
-extern struct pagerops vnodepagerops;
-extern struct pagerops devicepagerops;
-extern struct pagerops physpagerops;
-extern struct pagerops sgpagerops;
-extern struct pagerops mgtdevicepagerops;
-
-/*
- * get/put return values
- * OK	 operation was successful
- * BAD	 specified data was out of the accepted range
- * FAIL	 specified data was in range, but doesn't exist
- * PEND	 operations was initiated but not completed
- * ERROR error while accessing data that is in range and exists
- * AGAIN temporary resource shortage prevented operation from happening
- */
-#define	VM_PAGER_OK	0
-#define	VM_PAGER_BAD	1
-#define	VM_PAGER_FAIL	2
-#define	VM_PAGER_PEND	3
-#define	VM_PAGER_ERROR	4
-#define VM_PAGER_AGAIN	5
-
-#define	VM_PAGER_PUT_SYNC		0x0001
-#define	VM_PAGER_PUT_INVAL		0x0002
-#define VM_PAGER_CLUSTER_OK		0x0008
-
-#ifdef _KERNEL
-
-extern struct pagerops *pagertab[];
-extern struct mtx_padalign pbuf_mtx;
-
-vm_object_t vm_pager_allocate(objtype_t, void *, vm_ooffset_t, vm_prot_t,
-    vm_ooffset_t, struct ucred *);
-void vm_pager_bufferinit(void);
-void vm_pager_deallocate(vm_object_t);
-static __inline int vm_pager_get_pages(vm_object_t, vm_page_t *, int, int);
-static __inline boolean_t vm_pager_has_page(vm_object_t, vm_pindex_t, int *, int *);
-void vm_pager_init(void);
-vm_object_t vm_pager_object_lookup(struct pagerlst *, void *);
-
-/*
- *	vm_page_get_pages:
- *
- *	Retrieve pages from the VM system in order to map them into an object
- *	( or into VM space somewhere ).  If the pagein was successful, we
- *	must fully validate it.
- */
-static __inline int
-vm_pager_get_pages(
-	vm_object_t object,
-	vm_page_t *m,
-	int count,
-	int reqpage
-) {
-	int r;
-
-	VM_OBJECT_ASSERT_WLOCKED(object);
-	r = (*pagertab[object->type]->pgo_getpages)(object, m, count, reqpage);
-	if (r == VM_PAGER_OK && m[reqpage]->valid != VM_PAGE_BITS_ALL) {
-		vm_page_zero_invalid(m[reqpage], TRUE);
-	}
-	return (r);
-}
-
-static __inline void
-vm_pager_put_pages(
-	vm_object_t object,
-	vm_page_t *m,
-	int count,
-	int flags,
-	int *rtvals
-) {
-
-	VM_OBJECT_ASSERT_WLOCKED(object);
-	(*pagertab[object->type]->pgo_putpages)
-	    (object, m, count, flags, rtvals);
-}
-
-/*
- *	vm_pager_haspage
- *
- *	Check to see if an object's pager has the requested page.  The
- *	object's pager will also set before and after to give the caller
- *	some idea of the number of pages before and after the requested
- *	page can be I/O'd efficiently.
- *
- *	The object must be locked.
- */
-static __inline boolean_t
-vm_pager_has_page(
-	vm_object_t object,
-	vm_pindex_t offset, 
-	int *before,
-	int *after
-) {
-	boolean_t ret;
-
-	VM_OBJECT_ASSERT_WLOCKED(object);
-	ret = (*pagertab[object->type]->pgo_haspage)
-	    (object, offset, before, after);
-	return (ret);
-} 
-
-/* 
- *      vm_pager_page_unswapped
- * 
- *	Destroy swap associated with the page.
- * 
- *	The object containing the page must be locked.
- *      This function may not block.
- *
- *	XXX: A much better name would be "vm_pager_page_dirtied()"
- *	XXX: It is not obvious if this could be profitably used by any
- *	XXX: pagers besides the swap_pager or if it should even be a
- *	XXX: generic pager_op in the first place.
- */
-static __inline void
-vm_pager_page_unswapped(vm_page_t m)
-{
-
-	VM_OBJECT_ASSERT_LOCKED(m->object);
-	if (pagertab[m->object->type]->pgo_pageunswapped)
-		(*pagertab[m->object->type]->pgo_pageunswapped)(m);
-}
-
-struct cdev_pager_ops {
-	int (*cdev_pg_fault)(vm_object_t vm_obj, vm_ooffset_t offset,
-	    int prot, vm_page_t *mres);
-	int (*cdev_pg_ctor)(void *handle, vm_ooffset_t size, vm_prot_t prot,
-	    vm_ooffset_t foff, struct ucred *cred, u_short *color);
-	void (*cdev_pg_dtor)(void *handle);
-};
-
-vm_object_t cdev_pager_allocate(void *handle, enum obj_type tp,
-    struct cdev_pager_ops *ops, vm_ooffset_t size, vm_prot_t prot,
-    vm_ooffset_t foff, struct ucred *cred);
-vm_object_t cdev_pager_lookup(void *handle);
-void cdev_pager_free_page(vm_object_t object, vm_page_t m);
-
-#endif				/* _KERNEL */
-#endif				/* _VM_PAGER_ */
diff --git a/include.new/vm/vm_param.h b/include.new/vm/vm_param.h
deleted file mode 100644
index e65a9f7..0000000
--- a/include.new/vm/vm_param.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * The Mach Operating System project at Carnegie-Mellon University.
- *
- * 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.
- * 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.
- *
- *	from: @(#)vm_param.h	8.1 (Berkeley) 6/11/93
- *
- *
- * Copyright (c) 1987, 1990 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Avadis Tevanian, Jr., Michael Wayne Young
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/sys/vm/vm_param.h 254168 2013-08-09 23:47:43Z zont $
- */
-
-/*
- *	Machine independent virtual memory parameters.
- */
-
-#ifndef	_VM_PARAM_
-#define	_VM_PARAM_
-
-#include <machine/vmparam.h>
-
-/*
- * CTL_VM identifiers
- */
-#define	VM_TOTAL		1	/* struct vmtotal */
-#define	VM_METER                VM_TOTAL/* deprecated, use VM_TOTAL */
-#define	VM_LOADAVG	 	2	/* struct loadavg */
-#define VM_V_FREE_MIN		3	/* cnt.v_free_min */
-#define VM_V_FREE_TARGET	4	/* cnt.v_free_target */
-#define VM_V_FREE_RESERVED	5	/* cnt.v_free_reserved */
-#define VM_V_INACTIVE_TARGET	6	/* cnt.v_inactive_target */
-#define	VM_V_CACHE_MIN		7	/* cnt.v_cache_min */
-#define	VM_V_CACHE_MAX		8	/* cnt.v_cache_max */
-#define VM_V_PAGEOUT_FREE_MIN	9	/* cnt.v_pageout_free_min */
-#define	VM_OBSOLETE_10		10	/* pageout algorithm */
-#define VM_SWAPPING_ENABLED	11	/* swapping enabled */
-#define	VM_MAXID		12	/* number of valid vm ids */
-
-/*
- * Structure for swap device statistics
- */
-#define XSWDEV_VERSION	1
-struct xswdev {
-	u_int	xsw_version;
-	dev_t	xsw_dev;
-	int	xsw_flags;
-	int	xsw_nblks;
-	int     xsw_used;
-};
-
-/*
- *	Return values from the VM routines.
- */
-#define	KERN_SUCCESS		0
-#define	KERN_INVALID_ADDRESS	1
-#define	KERN_PROTECTION_FAILURE	2
-#define	KERN_NO_SPACE		3
-#define	KERN_INVALID_ARGUMENT	4
-#define	KERN_FAILURE		5
-#define	KERN_RESOURCE_SHORTAGE	6
-#define	KERN_NOT_RECEIVER	7
-#define	KERN_NO_ACCESS		8
-
-#ifndef PA_LOCK_COUNT
-#ifdef SMP
-#define	PA_LOCK_COUNT	32
-#else
-#define PA_LOCK_COUNT	1
-#endif	/* !SMP */
-#endif	/* !PA_LOCK_COUNT */
-
-#ifndef ASSEMBLER
-#ifdef _KERNEL
-#define num_pages(x) \
-	((vm_offset_t)((((vm_offset_t)(x)) + PAGE_MASK) >> PAGE_SHIFT))
-extern	unsigned long maxtsiz;
-extern	unsigned long dfldsiz;
-extern	unsigned long maxdsiz;
-extern	unsigned long dflssiz;
-extern	unsigned long maxssiz;
-extern	unsigned long sgrowsiz;
-#endif				/* _KERNEL */
-#endif				/* ASSEMBLER */
-#endif				/* _VM_PARAM_ */
diff --git a/include.new/vm/vm_phys.h b/include.new/vm/vm_phys.h
deleted file mode 100644
index fe7c86d..0000000
--- a/include.new/vm/vm_phys.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 2002-2006 Rice University
- * Copyright (c) 2007 Alan L. Cox <alc@cs.rice.edu>
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by Alan L. Cox,
- * Olivier Crameri, Peter Druschel, Sitaram Iyer, and Juan Navarro.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
- * HOLDERS 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: releng/10.2/sys/vm/vm_phys.h 285634 2015-07-16 14:41:58Z kib $
- */
-
-/*
- *	Physical memory system definitions
- */
-
-#ifndef	_VM_PHYS_H_
-#define	_VM_PHYS_H_
-
-#ifdef _KERNEL
-
-/* Domains must be dense (non-sparse) and zero-based. */
-struct mem_affinity {
-	vm_paddr_t start;
-	vm_paddr_t end;
-	int domain;
-};
-
-struct vm_freelist {
-	struct pglist pl;
-	int lcnt;
-};
-
-struct vm_phys_seg {
-	vm_paddr_t	start;
-	vm_paddr_t	end;
-	vm_page_t	first_page;
-	int		domain;
-	struct vm_freelist (*free_queues)[VM_NFREEPOOL][VM_NFREEORDER];
-};
-
-extern struct mem_affinity *mem_affinity;
-extern int vm_ndomains;
-extern struct vm_phys_seg vm_phys_segs[];
-extern int vm_phys_nsegs;
-
-/*
- * The following functions are only to be used by the virtual memory system.
- */
-void vm_phys_add_page(vm_paddr_t pa);
-void vm_phys_add_seg(vm_paddr_t start, vm_paddr_t end);
-vm_page_t vm_phys_alloc_contig(u_long npages, vm_paddr_t low, vm_paddr_t high,
-    u_long alignment, vm_paddr_t boundary);
-vm_page_t vm_phys_alloc_freelist_pages(int freelist, int pool, int order);
-vm_page_t vm_phys_alloc_pages(int pool, int order);
-boolean_t vm_phys_domain_intersects(long mask, vm_paddr_t low, vm_paddr_t high);
-int vm_phys_fictitious_reg_range(vm_paddr_t start, vm_paddr_t end,
-    vm_memattr_t memattr);
-void vm_phys_fictitious_unreg_range(vm_paddr_t start, vm_paddr_t end);
-vm_page_t vm_phys_fictitious_to_vm_page(vm_paddr_t pa);
-void vm_phys_free_contig(vm_page_t m, u_long npages);
-void vm_phys_free_pages(vm_page_t m, int order);
-void vm_phys_init(void);
-vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa);
-void vm_phys_set_pool(int pool, vm_page_t m, int order);
-boolean_t vm_phys_unfree_page(vm_page_t m);
-boolean_t vm_phys_zero_pages_idle(void);
-
-/*
- *	vm_phys_domain:
- *
- * 	Return the memory domain the page belongs to.
- */
-static inline struct vm_domain *
-vm_phys_domain(vm_page_t m)
-{
-#if MAXMEMDOM > 1
-	int domn, segind;
-
-	/* XXXKIB try to assert that the page is managed */
-	segind = m->segind;
-	KASSERT(segind < vm_phys_nsegs, ("segind %d m %p", segind, m));
-	domn = vm_phys_segs[segind].domain;
-	KASSERT(domn < vm_ndomains, ("domain %d m %p", domn, m));
-	return (&vm_dom[domn]);
-#else
-	return (&vm_dom[0]);
-#endif
-}
-
-static inline void
-vm_phys_freecnt_adj(vm_page_t m, int adj)
-{
-
-	mtx_assert(&vm_page_queue_free_mtx, MA_OWNED);
-	cnt.v_free_count += adj;
-	vm_phys_domain(m)->vmd_free_count += adj;
-}
-
-#endif	/* _KERNEL */
-#endif	/* !_VM_PHYS_H_ */
diff --git a/include.new/vm/vm_radix.h b/include.new/vm/vm_radix.h
deleted file mode 100644
index fc0dda2..0000000
--- a/include.new/vm/vm_radix.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2013 EMC Corp.
- * Copyright (c) 2011 Jeffrey Roberson <jeff@freebsd.org>
- * Copyright (c) 2008 Mayur Shardul <mayur.shardul@gmail.com>
- * 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.
- *
- * 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: releng/10.2/sys/vm/vm_radix.h 266591 2014-05-23 17:47:49Z alc $
- */
-
-#ifndef _VM_RADIX_H_
-#define _VM_RADIX_H_
-
-#include <vm/_vm_radix.h>
-
-#ifdef _KERNEL
-
-void		vm_radix_init(void);
-int		vm_radix_insert(struct vm_radix *rtree, vm_page_t page);
-boolean_t	vm_radix_is_singleton(struct vm_radix *rtree);
-vm_page_t	vm_radix_lookup(struct vm_radix *rtree, vm_pindex_t index);
-vm_page_t	vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index);
-vm_page_t	vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index);
-void		vm_radix_reclaim_allnodes(struct vm_radix *rtree);
-void		vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index);
-vm_page_t	vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage);
-
-#endif /* _KERNEL */
-#endif /* !_VM_RADIX_H_ */
diff --git a/include.new/vm/vm_reserv.h b/include.new/vm/vm_reserv.h
deleted file mode 100644
index 72ee223..0000000
--- a/include.new/vm/vm_reserv.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2002-2006 Rice University
- * Copyright (c) 2007-2008 Alan L. Cox <alc@cs.rice.edu>
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by Alan L. Cox,
- * Olivier Crameri, Peter Druschel, Sitaram Iyer, and Juan Navarro.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
- * HOLDERS 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: releng/10.2/sys/vm/vm_reserv.h 250577 2013-05-12 16:50:18Z alc $
- */
-
-/*
- *	Superpage reservation management definitions
- */
-
-#ifndef	_VM_RESERV_H_
-#define	_VM_RESERV_H_
-
-#ifdef _KERNEL
-
-#if VM_NRESERVLEVEL > 0
-
-/*
- * The following functions are only to be used by the virtual memory system.
- */
-vm_page_t	vm_reserv_alloc_contig(vm_object_t object, vm_pindex_t pindex,
-		    u_long npages, vm_paddr_t low, vm_paddr_t high,
-		    u_long alignment, vm_paddr_t boundary);
-vm_page_t	vm_reserv_alloc_page(vm_object_t object, vm_pindex_t pindex,
-		    vm_page_t mpred);
-void		vm_reserv_break_all(vm_object_t object);
-boolean_t	vm_reserv_free_page(vm_page_t m);
-void		vm_reserv_init(void);
-int		vm_reserv_level_iffullpop(vm_page_t m);
-boolean_t	vm_reserv_reactivate_page(vm_page_t m);
-boolean_t	vm_reserv_reclaim_contig(u_long npages, vm_paddr_t low,
-		    vm_paddr_t high, u_long alignment, vm_paddr_t boundary);
-boolean_t	vm_reserv_reclaim_inactive(void);
-void		vm_reserv_rename(vm_page_t m, vm_object_t new_object,
-		    vm_object_t old_object, vm_pindex_t old_object_offset);
-vm_paddr_t	vm_reserv_startup(vm_offset_t *vaddr, vm_paddr_t end,
-		    vm_paddr_t high_water);
-
-#endif	/* VM_NRESERVLEVEL > 0 */
-#endif	/* _KERNEL */
-#endif	/* !_VM_RESERV_H_ */
diff --git a/include.new/vm/vnode_pager.h b/include.new/vm/vnode_pager.h
deleted file mode 100644
index 2e3a609..0000000
--- a/include.new/vm/vnode_pager.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990 University of Utah.
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * 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.
- * 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.
- *
- *	@(#)vnode_pager.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: releng/10.2/sys/vm/vnode_pager.h 232071 2012-02-23 21:07:16Z kib $
- */
-
-#ifndef	_VNODE_PAGER_
-#define	_VNODE_PAGER_	1
-
-#ifdef _KERNEL
-
-int vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *m,
-					  int count, int reqpage);
-int vnode_pager_generic_putpages(struct vnode *vp, vm_page_t *m,
-					  int count, boolean_t sync,
-					  int *rtvals);
-
-void vnode_pager_release_writecount(vm_object_t object, vm_offset_t start,
-    vm_offset_t end);
-void vnode_pager_undirty_pages(vm_page_t *ma, int *rtvals, int written);
-void vnode_pager_update_writecount(vm_object_t object, vm_offset_t start,
-    vm_offset_t end);
-
-#endif				/* _KERNEL */
-#endif				/* _VNODE_PAGER_ */
diff --git a/include.new/wchar.h b/include.new/wchar.h
deleted file mode 100644
index f5c63ac..0000000
--- a/include.new/wchar.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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: releng/10.2/include/wchar.h 264496 2014-04-15 09:41:52Z tijl $
- */
-
-/*-
- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- *	$NetBSD: wchar.h,v 1.8 2000/12/22 05:31:42 itojun Exp $
- */
-
-#ifndef _WCHAR_H_
-#define _WCHAR_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-#include <machine/_limits.h>
-#include <_ctype.h>
-
-#ifndef _MBSTATE_T_DECLARED
-typedef	__mbstate_t	mbstate_t;
-#define	_MBSTATE_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef	__cplusplus
-#ifndef _WCHAR_T_DECLARED
-typedef	___wchar_t	wchar_t;
-#define	_WCHAR_T_DECLARED
-#endif
-#endif
-
-#ifndef _WINT_T_DECLARED
-typedef	__wint_t	wint_t;
-#define	_WINT_T_DECLARED
-#endif
-
-#define	WCHAR_MIN	__WCHAR_MIN
-#define	WCHAR_MAX	__WCHAR_MAX
-
-#ifndef WEOF
-#define	WEOF 	((wint_t)-1)
-#endif
-
-#ifndef _STDFILE_DECLARED
-#define _STDFILE_DECLARED
-typedef struct __sFILE FILE;
-#endif
-struct tm;
-
-__BEGIN_DECLS
-wint_t	btowc(int);
-wint_t	fgetwc(FILE *);
-wchar_t	*
-	fgetws(wchar_t * __restrict, int, FILE * __restrict);
-wint_t	fputwc(wchar_t, FILE *);
-int	fputws(const wchar_t * __restrict, FILE * __restrict);
-int	fwide(FILE *, int);
-int	fwprintf(FILE * __restrict, const wchar_t * __restrict, ...);
-int	fwscanf(FILE * __restrict, const wchar_t * __restrict, ...);
-wint_t	getwc(FILE *);
-wint_t	getwchar(void);
-size_t	mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
-size_t	mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-	    mbstate_t * __restrict);
-int	mbsinit(const mbstate_t *);
-size_t	mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
-	    mbstate_t * __restrict);
-wint_t	putwc(wchar_t, FILE *);
-wint_t	putwchar(wchar_t);
-int	swprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict,
-	    ...);
-int	swscanf(const wchar_t * __restrict, const wchar_t * __restrict, ...);
-wint_t	ungetwc(wint_t, FILE *);
-int	vfwprintf(FILE * __restrict, const wchar_t * __restrict,
-	    __va_list);
-int	vswprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict,
-	    __va_list);
-int	vwprintf(const wchar_t * __restrict, __va_list);
-size_t	wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-wchar_t	*wcscat(wchar_t * __restrict, const wchar_t * __restrict);
-wchar_t	*wcschr(const wchar_t *, wchar_t) __pure;
-int	wcscmp(const wchar_t *, const wchar_t *) __pure;
-int	wcscoll(const wchar_t *, const wchar_t *);
-wchar_t	*wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
-size_t	wcscspn(const wchar_t *, const wchar_t *) __pure;
-size_t	wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict,
-	    const struct tm * __restrict);
-size_t	wcslen(const wchar_t *) __pure;
-wchar_t	*wcsncat(wchar_t * __restrict, const wchar_t * __restrict,
-	    size_t);
-int	wcsncmp(const wchar_t *, const wchar_t *, size_t) __pure;
-wchar_t	*wcsncpy(wchar_t * __restrict , const wchar_t * __restrict, size_t);
-wchar_t	*wcspbrk(const wchar_t *, const wchar_t *) __pure;
-wchar_t	*wcsrchr(const wchar_t *, wchar_t) __pure;
-size_t	wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
-	    mbstate_t * __restrict);
-size_t	wcsspn(const wchar_t *, const wchar_t *) __pure;
-wchar_t	*wcsstr(const wchar_t * __restrict, const wchar_t * __restrict)
-	    __pure;
-size_t	wcsxfrm(wchar_t * __restrict, const wchar_t * __restrict, size_t);
-int	wctob(wint_t);
-double	wcstod(const wchar_t * __restrict, wchar_t ** __restrict);
-wchar_t	*wcstok(wchar_t * __restrict, const wchar_t * __restrict,
-	    wchar_t ** __restrict);
-long	 wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int);
-unsigned long
-	 wcstoul(const wchar_t * __restrict, wchar_t ** __restrict, int);
-wchar_t	*wmemchr(const wchar_t *, wchar_t, size_t) __pure;
-int	wmemcmp(const wchar_t *, const wchar_t *, size_t) __pure;
-wchar_t	*wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t);
-wchar_t	*wmemmove(wchar_t *, const wchar_t *, size_t);
-wchar_t	*wmemset(wchar_t *, wchar_t, size_t);
-int	wprintf(const wchar_t * __restrict, ...);
-int	wscanf(const wchar_t * __restrict, ...);
-
-#ifndef _STDSTREAM_DECLARED
-extern FILE *__stdinp;
-extern FILE *__stdoutp;
-extern FILE *__stderrp;
-#define	_STDSTREAM_DECLARED
-#endif
-
-#define	getwc(fp)	fgetwc(fp)
-#define	getwchar()	fgetwc(__stdinp)
-#define	putwc(wc, fp)	fputwc(wc, fp)
-#define	putwchar(wc)	fputwc(wc, __stdoutp)
-
-#if __ISO_C_VISIBLE >= 1999
-int	vfwscanf(FILE * __restrict, const wchar_t * __restrict,
-	    __va_list);
-int	vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
-	    __va_list);
-int	vwscanf(const wchar_t * __restrict, __va_list);
-float	wcstof(const wchar_t * __restrict, wchar_t ** __restrict);
-long double
-	wcstold(const wchar_t * __restrict, wchar_t ** __restrict);
-#ifdef __LONG_LONG_SUPPORTED
-/* LONGLONG */
-long long
-	wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int);
-/* LONGLONG */
-unsigned long long
-	 wcstoull(const wchar_t * __restrict, wchar_t ** __restrict, int);
-#endif
-#endif	/* __ISO_C_VISIBLE >= 1999 */
-
-#if __XSI_VISIBLE
-int	wcswidth(const wchar_t *, size_t);
-int	wcwidth(wchar_t);
-#define	wcwidth(_c)	__wcwidth(_c)
-#endif
-
-#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE
-size_t	mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
-	    size_t, mbstate_t * __restrict);
-FILE	*open_wmemstream(wchar_t **, size_t *);
-wchar_t	*wcpcpy(wchar_t * __restrict, const wchar_t * __restrict);
-wchar_t	*wcpncpy(wchar_t * __restrict, const wchar_t * __restrict, size_t);
-wchar_t	*wcsdup(const wchar_t *) __malloc_like;
-int	wcscasecmp(const wchar_t *, const wchar_t *);
-int	wcsncasecmp(const wchar_t *, const wchar_t *, size_t n);
-size_t	wcsnlen(const wchar_t *, size_t) __pure;
-size_t	wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
-	    size_t, mbstate_t * __restrict);
-#endif
-
-#if __BSD_VISIBLE
-wchar_t	*fgetwln(FILE * __restrict, size_t * __restrict);
-size_t	wcslcat(wchar_t *, const wchar_t *, size_t);
-size_t	wcslcpy(wchar_t *, const wchar_t *, size_t);
-#endif
-
-#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
-#include <xlocale/_wchar.h>
-#endif
-__END_DECLS
-
-#endif /* !_WCHAR_H_ */
diff --git a/include.new/wctype.h b/include.new/wctype.h
deleted file mode 100644
index a92189d..0000000
--- a/include.new/wctype.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp
- *	$NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $
- * $FreeBSD: releng/10.2/include/wctype.h 232498 2012-03-04 15:31:13Z theraven $
- */
-
-#ifndef _WCTYPE_H_
-#define	_WCTYPE_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#include <_ctype.h>
-
-#ifndef _WCTRANS_T
-typedef	int	wctrans_t;
-#define	_WCTRANS_T
-#endif
-
-#ifndef _WCTYPE_T
-typedef	unsigned long	wctype_t;
-#define	_WCTYPE_T
-#endif
-
-#ifndef _WINT_T_DECLARED
-typedef	__wint_t	wint_t;
-#define	_WINT_T_DECLARED
-#endif
-
-#ifndef WEOF
-#define	WEOF	((wint_t)-1)
-#endif
-
-__BEGIN_DECLS
-int	iswalnum(wint_t);
-int	iswalpha(wint_t);
-int	iswblank(wint_t);
-int	iswcntrl(wint_t);
-int	iswctype(wint_t, wctype_t);
-int	iswdigit(wint_t);
-int	iswgraph(wint_t);
-int	iswlower(wint_t);
-int	iswprint(wint_t);
-int	iswpunct(wint_t);
-int	iswspace(wint_t);
-int	iswupper(wint_t);
-int	iswxdigit(wint_t);
-wint_t	towctrans(wint_t, wctrans_t);
-wint_t	towlower(wint_t);
-wint_t	towupper(wint_t);
-wctrans_t
-	wctrans(const char *);
-wctype_t
-	wctype(const char *);
-
-#if __BSD_VISIBLE
-wint_t	iswascii(wint_t);
-wint_t	iswhexnumber(wint_t);
-wint_t	iswideogram(wint_t);
-wint_t	iswnumber(wint_t);
-wint_t	iswphonogram(wint_t);
-wint_t	iswrune(wint_t);
-wint_t	iswspecial(wint_t);
-wint_t	nextwctype(wint_t, wctype_t);
-#endif
-
-#if __POSIX_VISIBLE >= 200809
-#define _XLOCALE_WCTYPES 1
-#include <xlocale/_ctype.h>
-#endif /* __POSIX_VISIBLE >= 200809 */
-__END_DECLS
-
-#ifndef __cplusplus
-#define	iswalnum(wc)		__istype((wc), _CTYPE_A|_CTYPE_D)
-#define	iswalpha(wc)		__istype((wc), _CTYPE_A)
-#define	iswblank(wc)		__istype((wc), _CTYPE_B)
-#define	iswcntrl(wc)		__istype((wc), _CTYPE_C)
-#define	iswctype(wc, charclass)	__istype((wc), (charclass))
-#define	iswdigit(wc)		__isctype((wc), _CTYPE_D)
-#define	iswgraph(wc)		__istype((wc), _CTYPE_G)
-#define	iswlower(wc)		__istype((wc), _CTYPE_L)
-#define	iswprint(wc)		__istype((wc), _CTYPE_R)
-#define	iswpunct(wc)		__istype((wc), _CTYPE_P)
-#define	iswspace(wc)		__istype((wc), _CTYPE_S)
-#define	iswupper(wc)		__istype((wc), _CTYPE_U)
-#define	iswxdigit(wc)		__isctype((wc), _CTYPE_X)
-#define	towlower(wc)		__tolower(wc)
-#define	towupper(wc)		__toupper(wc)
-
-#if __BSD_VISIBLE
-#define	iswascii(wc)		(((wc) & ~0x7F) == 0)
-#define	iswhexnumber(wc)	__istype((wc), _CTYPE_X)
-#define	iswideogram(wc)		__istype((wc), _CTYPE_I)
-#define	iswnumber(wc)		__istype((wc), _CTYPE_D)
-#define	iswphonogram(wc)	__istype((wc), _CTYPE_Q)
-#define	iswrune(wc)		__istype((wc), 0xFFFFFF00L)
-#define	iswspecial(wc)		__istype((wc), _CTYPE_T)
-#endif /* __BSD_VISIBLE */
-#endif /* __cplusplus */
-
-#endif		/* _WCTYPE_H_ */
diff --git a/include.new/wind.h b/include.new/wind.h
deleted file mode 100644
index dd55ea3..0000000
--- a/include.new/wind.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2004 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-#ifndef _WIND_H_
-#define _WIND_H_
-
-#include <stddef.h>
-#include <krb5-types.h>
-
-#include <wind_err.h>
-
-typedef unsigned int wind_profile_flags;
-
-#define WIND_PROFILE_NAME 			0x00000001
-#define WIND_PROFILE_SASL 			0x00000002
-#define WIND_PROFILE_LDAP 			0x00000004
-#define WIND_PROFILE_LDAP_CASE			0x00000008
-
-#define WIND_PROFILE_LDAP_CASE_EXACT_ATTRIBUTE	0x00010000
-#define WIND_PROFILE_LDAP_CASE_EXACT_ASSERTION	0x00020000
-#define WIND_PROFILE_LDAP_NUMERIC		0x00040000
-#define WIND_PROFILE_LDAP_TELEPHONE		0x00080000
-
-
-/* flags to wind_ucs2read/wind_ucs2write */
-#define WIND_RW_LE	1
-#define WIND_RW_BE	2
-#define WIND_RW_BOM	4
-
-int wind_stringprep(const uint32_t *, size_t,
-		    uint32_t *, size_t *,
-		    wind_profile_flags);
-int wind_profile(const char *, wind_profile_flags *);
-
-int wind_punycode_label_toascii(const uint32_t *, size_t,
-				char *, size_t *);
-
-int wind_utf8ucs4(const char *, uint32_t *, size_t *);
-int wind_utf8ucs4_length(const char *, size_t *);
-
-int wind_ucs4utf8(const uint32_t *, size_t, char *, size_t *);
-int wind_ucs4utf8_length(const uint32_t *, size_t, size_t *);
-
-int wind_utf8ucs2(const char *, uint16_t *, size_t *);
-int wind_utf8ucs2_length(const char *, size_t *);
-
-int wind_ucs2utf8(const uint16_t *, size_t, char *, size_t *);
-int wind_ucs2utf8_length(const uint16_t *, size_t, size_t *);
-
-
-int wind_ucs2read(const void *, size_t, unsigned int *, uint16_t *, size_t *);
-int wind_ucs2write(const uint16_t *, size_t, unsigned int *, void *, size_t *);
-
-#endif /* _WIND_H_ */
diff --git a/include.new/wind_err.h b/include.new/wind_err.h
deleted file mode 100644
index dade791..0000000
--- a/include.new/wind_err.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Generated from /usr/src/kerberos5/lib/libwind/../../../crypto/heimdal/lib/wind/wind_err.et */
-/* $Id$ */
-
-#ifndef __wind_err_h__
-#define __wind_err_h__
-
-struct et_list;
-
-void initialize_wind_error_table_r(struct et_list **);
-
-void initialize_wind_error_table(void);
-#define init_wind_err_tbl initialize_wind_error_table
-
-typedef enum wind_error_number{
-	WIND_ERR_NONE = -969269760,
-	WIND_ERR_NO_PROFILE = -969269759,
-	WIND_ERR_OVERRUN = -969269758,
-	WIND_ERR_UNDERUN = -969269757,
-	WIND_ERR_LENGTH_NOT_MOD2 = -969269756,
-	WIND_ERR_LENGTH_NOT_MOD4 = -969269755,
-	WIND_ERR_INVALID_UTF8 = -969269754,
-	WIND_ERR_INVALID_UTF16 = -969269753,
-	WIND_ERR_INVALID_UTF32 = -969269752,
-	WIND_ERR_NO_BOM = -969269751,
-	WIND_ERR_NOT_UTF16 = -969269750
-} wind_error_number;
-
-#define ERROR_TABLE_BASE_wind -969269760
-
-#define COM_ERR_BINDDOMAIN_wind "heim_com_err-969269760"
-
-#endif /* __wind_err_h__ */
diff --git a/include.new/wordexp.h b/include.new/wordexp.h
deleted file mode 100644
index f520af0..0000000
--- a/include.new/wordexp.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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: releng/10.2/include/wordexp.h 131331 2004-06-30 13:55:08Z tjr $
- */
-
-#ifndef _WORDEXP_H_
-#define	_WORDEXP_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#if __XSI_VISIBLE && !defined(_SIZE_T_DECLARED)
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-typedef struct {
-	__size_t	we_wordc;	/* count of words matched */
-	char		**we_wordv;	/* pointer to list of words */
-	__size_t	we_offs;	/* slots to reserve in we_wordv */
-	char		*we_strings;	/* storage for wordv strings */
-	__size_t	we_nbytes;	/* size of we_strings */
-} wordexp_t;
-
-/*
- * Flags for wordexp().
- */
-#define	WRDE_APPEND	0x1		/* append to previously generated */
-#define	WRDE_DOOFFS	0x2		/* we_offs member is valid */
-#define	WRDE_NOCMD	0x4		/* disallow command substitution */
-#define	WRDE_REUSE	0x8		/* reuse wordexp_t */
-#define	WRDE_SHOWERR	0x10		/* don't redirect stderr to /dev/null */
-#define	WRDE_UNDEF	0x20		/* disallow undefined shell vars */
-
-/*
- * Return values from wordexp().
- */
-#define	WRDE_BADCHAR	1		/* unquoted special character */
-#define	WRDE_BADVAL	2		/* undefined variable */
-#define	WRDE_CMDSUB	3		/* command substitution not allowed */
-#define	WRDE_NOSPACE	4		/* no memory for result */
-#if __XSI_VISIBLE
-#define	WRDE_NOSYS	5		/* obsolete, reserved */
-#endif
-#define	WRDE_SYNTAX	6		/* shell syntax error */
-
-__BEGIN_DECLS
-int	wordexp(const char * __restrict, wordexp_t * __restrict, int);
-void	wordfree(wordexp_t *);
-__END_DECLS
-
-#endif /* !_WORDEXP_H_ */
diff --git a/include.new/x86/_align.h b/include.new/x86/_align.h
deleted file mode 100644
index bd96bee..0000000
--- a/include.new/x86/_align.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2001 David E. O'Brien
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- *
- *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD: releng/10.2/sys/x86/include/_align.h 215856 2010-11-26 10:59:20Z tijl $
- */
-
-#ifndef _X86_INCLUDE__ALIGN_H_
-#define	_X86_INCLUDE__ALIGN_H_
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...).   The result is unsigned int
- * and must be cast to any desired pointer type.
- */
-#define	_ALIGNBYTES	(sizeof(register_t) - 1)
-#define	_ALIGN(p)	(((uintptr_t)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
-
-#endif /* !_X86_INCLUDE__ALIGN_H_ */
diff --git a/include.new/x86/_inttypes.h b/include.new/x86/_inttypes.h
deleted file mode 100644
index 077da3b..0000000
--- a/include.new/x86/_inttypes.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- *	From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $
- * $FreeBSD: releng/10.2/sys/x86/include/_inttypes.h 217157 2011-01-08 18:09:48Z tijl $
- */
-
-#ifndef _MACHINE_INTTYPES_H_
-#define	_MACHINE_INTTYPES_H_
-
-/*
- * Macros for format specifiers.
- */
-
-#ifdef __LP64__
-#define	__PRI64		"l"
-#define	__PRIptr	"l"
-#else
-#define	__PRI64		"ll"
-#define	__PRIptr
-#endif
-
-/* fprintf(3) macros for signed integers. */
-
-#define	PRId8		"d"		/* int8_t */
-#define	PRId16		"d"		/* int16_t */
-#define	PRId32		"d"		/* int32_t */
-#define	PRId64		__PRI64"d"	/* int64_t */
-#define	PRIdLEAST8	"d"		/* int_least8_t */
-#define	PRIdLEAST16	"d"		/* int_least16_t */
-#define	PRIdLEAST32	"d"		/* int_least32_t */
-#define	PRIdLEAST64	__PRI64"d"	/* int_least64_t */
-#define	PRIdFAST8	"d"		/* int_fast8_t */
-#define	PRIdFAST16	"d"		/* int_fast16_t */
-#define	PRIdFAST32	"d"		/* int_fast32_t */
-#define	PRIdFAST64	__PRI64"d"	/* int_fast64_t */
-#define	PRIdMAX		"jd"		/* intmax_t */
-#define	PRIdPTR		__PRIptr"d"	/* intptr_t */
-
-#define	PRIi8		"i"		/* int8_t */
-#define	PRIi16		"i"		/* int16_t */
-#define	PRIi32		"i"		/* int32_t */
-#define	PRIi64		__PRI64"i"	/* int64_t */
-#define	PRIiLEAST8	"i"		/* int_least8_t  */
-#define	PRIiLEAST16	"i"		/* int_least16_t */
-#define	PRIiLEAST32	"i"		/* int_least32_t */
-#define	PRIiLEAST64	__PRI64"i"	/* int_least64_t */
-#define	PRIiFAST8	"i"		/* int_fast8_t */
-#define	PRIiFAST16	"i"		/* int_fast16_t */
-#define	PRIiFAST32	"i"		/* int_fast32_t */
-#define	PRIiFAST64	__PRI64"i"	/* int_fast64_t */
-#define	PRIiMAX		"ji"		/* intmax_t */
-#define	PRIiPTR		__PRIptr"i"	/* intptr_t */
-
-/* fprintf(3) macros for unsigned integers. */
-
-#define	PRIo8		"o"		/* uint8_t */
-#define	PRIo16		"o"		/* uint16_t */
-#define	PRIo32		"o"		/* uint32_t */
-#define	PRIo64		__PRI64"o"	/* uint64_t */
-#define	PRIoLEAST8	"o"		/* uint_least8_t */
-#define	PRIoLEAST16	"o"		/* uint_least16_t */
-#define	PRIoLEAST32	"o"		/* uint_least32_t */
-#define	PRIoLEAST64	__PRI64"o"	/* uint_least64_t */
-#define	PRIoFAST8	"o"		/* uint_fast8_t */
-#define	PRIoFAST16	"o"		/* uint_fast16_t */
-#define	PRIoFAST32	"o"		/* uint_fast32_t */
-#define	PRIoFAST64	__PRI64"o"	/* uint_fast64_t */
-#define	PRIoMAX		"jo"		/* uintmax_t */
-#define	PRIoPTR		__PRIptr"o"	/* uintptr_t */
-
-#define	PRIu8		"u"		/* uint8_t */
-#define	PRIu16		"u"		/* uint16_t */
-#define	PRIu32		"u"		/* uint32_t */
-#define	PRIu64		__PRI64"u"	/* uint64_t */
-#define	PRIuLEAST8	"u"		/* uint_least8_t */
-#define	PRIuLEAST16	"u"		/* uint_least16_t */
-#define	PRIuLEAST32	"u"		/* uint_least32_t */
-#define	PRIuLEAST64	__PRI64"u"	/* uint_least64_t */
-#define	PRIuFAST8	"u"		/* uint_fast8_t */
-#define	PRIuFAST16	"u"		/* uint_fast16_t */
-#define	PRIuFAST32	"u"		/* uint_fast32_t */
-#define	PRIuFAST64	__PRI64"u"	/* uint_fast64_t */
-#define	PRIuMAX		"ju"		/* uintmax_t */
-#define	PRIuPTR		__PRIptr"u"	/* uintptr_t */
-
-#define	PRIx8		"x"		/* uint8_t */
-#define	PRIx16		"x"		/* uint16_t */
-#define	PRIx32		"x"		/* uint32_t */
-#define	PRIx64		__PRI64"x"	/* uint64_t */
-#define	PRIxLEAST8	"x"		/* uint_least8_t */
-#define	PRIxLEAST16	"x"		/* uint_least16_t */
-#define	PRIxLEAST32	"x"		/* uint_least32_t */
-#define	PRIxLEAST64	__PRI64"x"	/* uint_least64_t */
-#define	PRIxFAST8	"x"		/* uint_fast8_t */
-#define	PRIxFAST16	"x"		/* uint_fast16_t */
-#define	PRIxFAST32	"x"		/* uint_fast32_t */
-#define	PRIxFAST64	__PRI64"x"	/* uint_fast64_t */
-#define	PRIxMAX		"jx"		/* uintmax_t */
-#define	PRIxPTR		__PRIptr"x"	/* uintptr_t */
-
-#define	PRIX8		"X"		/* uint8_t */
-#define	PRIX16		"X"		/* uint16_t */
-#define	PRIX32		"X"		/* uint32_t */
-#define	PRIX64		__PRI64"X"	/* uint64_t */
-#define	PRIXLEAST8	"X"		/* uint_least8_t */
-#define	PRIXLEAST16	"X"		/* uint_least16_t */
-#define	PRIXLEAST32	"X"		/* uint_least32_t */
-#define	PRIXLEAST64	__PRI64"X"	/* uint_least64_t */
-#define	PRIXFAST8	"X"		/* uint_fast8_t */
-#define	PRIXFAST16	"X"		/* uint_fast16_t */
-#define	PRIXFAST32	"X"		/* uint_fast32_t */
-#define	PRIXFAST64	__PRI64"X"	/* uint_fast64_t */
-#define	PRIXMAX		"jX"		/* uintmax_t */
-#define	PRIXPTR		__PRIptr"X"	/* uintptr_t */
-
-/* fscanf(3) macros for signed integers. */
-
-#define	SCNd8		"hhd"		/* int8_t */
-#define	SCNd16		"hd"		/* int16_t */
-#define	SCNd32		"d"		/* int32_t */
-#define	SCNd64		__PRI64"d"	/* int64_t */
-#define	SCNdLEAST8	"hhd"		/* int_least8_t */
-#define	SCNdLEAST16	"hd"		/* int_least16_t */
-#define	SCNdLEAST32	"d"		/* int_least32_t */
-#define	SCNdLEAST64	__PRI64"d"	/* int_least64_t */
-#define	SCNdFAST8	"d"		/* int_fast8_t */
-#define	SCNdFAST16	"d"		/* int_fast16_t */
-#define	SCNdFAST32	"d"		/* int_fast32_t */
-#define	SCNdFAST64	__PRI64"d"	/* int_fast64_t */
-#define	SCNdMAX		"jd"		/* intmax_t */
-#define	SCNdPTR		__PRIptr"d"	/* intptr_t */
-
-#define	SCNi8		"hhi"		/* int8_t */
-#define	SCNi16		"hi"		/* int16_t */
-#define	SCNi32		"i"		/* int32_t */
-#define	SCNi64		__PRI64"i"	/* int64_t */
-#define	SCNiLEAST8	"hhi"		/* int_least8_t */
-#define	SCNiLEAST16	"hi"		/* int_least16_t */
-#define	SCNiLEAST32	"i"		/* int_least32_t */
-#define	SCNiLEAST64	__PRI64"i"	/* int_least64_t */
-#define	SCNiFAST8	"i"		/* int_fast8_t */
-#define	SCNiFAST16	"i"		/* int_fast16_t */
-#define	SCNiFAST32	"i"		/* int_fast32_t */
-#define	SCNiFAST64	__PRI64"i"	/* int_fast64_t */
-#define	SCNiMAX		"ji"		/* intmax_t */
-#define	SCNiPTR		__PRIptr"i"	/* intptr_t */
-
-/* fscanf(3) macros for unsigned integers. */
-
-#define	SCNo8		"hho"		/* uint8_t */
-#define	SCNo16		"ho"		/* uint16_t */
-#define	SCNo32		"o"		/* uint32_t */
-#define	SCNo64		__PRI64"o"	/* uint64_t */
-#define	SCNoLEAST8	"hho"		/* uint_least8_t */
-#define	SCNoLEAST16	"ho"		/* uint_least16_t */
-#define	SCNoLEAST32	"o"		/* uint_least32_t */
-#define	SCNoLEAST64	__PRI64"o"	/* uint_least64_t */
-#define	SCNoFAST8	"o"		/* uint_fast8_t */
-#define	SCNoFAST16	"o"		/* uint_fast16_t */
-#define	SCNoFAST32	"o"		/* uint_fast32_t */
-#define	SCNoFAST64	__PRI64"o"	/* uint_fast64_t */
-#define	SCNoMAX		"jo"		/* uintmax_t */
-#define	SCNoPTR		__PRIptr"o"	/* uintptr_t */
-
-#define	SCNu8		"hhu"		/* uint8_t */
-#define	SCNu16		"hu"		/* uint16_t */
-#define	SCNu32		"u"		/* uint32_t */
-#define	SCNu64		__PRI64"u"	/* uint64_t */
-#define	SCNuLEAST8	"hhu"		/* uint_least8_t */
-#define	SCNuLEAST16	"hu"		/* uint_least16_t */
-#define	SCNuLEAST32	"u"		/* uint_least32_t */
-#define	SCNuLEAST64	__PRI64"u"	/* uint_least64_t */
-#define	SCNuFAST8	"u"		/* uint_fast8_t */
-#define	SCNuFAST16	"u"		/* uint_fast16_t */
-#define	SCNuFAST32	"u"		/* uint_fast32_t */
-#define	SCNuFAST64	__PRI64"u"	/* uint_fast64_t */
-#define	SCNuMAX		"ju"		/* uintmax_t */
-#define	SCNuPTR		__PRIptr"u"	/* uintptr_t */
-
-#define	SCNx8		"hhx"		/* uint8_t */
-#define	SCNx16		"hx"		/* uint16_t */
-#define	SCNx32		"x"		/* uint32_t */
-#define	SCNx64		__PRI64"x"	/* uint64_t */
-#define	SCNxLEAST8	"hhx"		/* uint_least8_t */
-#define	SCNxLEAST16	"hx"		/* uint_least16_t */
-#define	SCNxLEAST32	"x"		/* uint_least32_t */
-#define	SCNxLEAST64	__PRI64"x"	/* uint_least64_t */
-#define	SCNxFAST8	"x"		/* uint_fast8_t */
-#define	SCNxFAST16	"x"		/* uint_fast16_t */
-#define	SCNxFAST32	"x"		/* uint_fast32_t */
-#define	SCNxFAST64	__PRI64"x"	/* uint_fast64_t */
-#define	SCNxMAX		"jx"		/* uintmax_t */
-#define	SCNxPTR		__PRIptr"x"	/* uintptr_t */
-
-#endif /* !_MACHINE_INTTYPES_H_ */
diff --git a/include.new/x86/_limits.h b/include.new/x86/_limits.h
deleted file mode 100644
index 54fe57d..0000000
--- a/include.new/x86/_limits.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 1988, 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.
- * 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.
- *
- *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD: releng/10.2/sys/x86/include/_limits.h 235939 2012-05-24 21:44:46Z obrien $
- */
-
-#ifndef	_MACHINE__LIMITS_H_
-#define	_MACHINE__LIMITS_H_
-
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- */
-
-#define	__CHAR_BIT	8		/* number of bits in a char */
-
-#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	__SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
-
-#define	__UCHAR_MAX	0xff		/* max value for an unsigned char */
-
-#define	__USHRT_MAX	0xffff		/* max value for an unsigned short */
-#define	__SHRT_MAX	0x7fff		/* max value for a short */
-#define	__SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
-
-#define	__UINT_MAX	0xffffffff	/* max value for an unsigned int */
-#define	__INT_MAX	0x7fffffff	/* max value for an int */
-#define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
-
-#ifdef	__LP64__
-#define	__ULONG_MAX	0xffffffffffffffff	/* max for an unsigned long */
-#define	__LONG_MAX	0x7fffffffffffffff	/* max for a long */
-#define	__LONG_MIN	(-0x7fffffffffffffff - 1) /* min for a long */
-#else
-#define	__ULONG_MAX	0xffffffffUL
-#define	__LONG_MAX	0x7fffffffL
-#define	__LONG_MIN	(-0x7fffffffL - 1)
-#endif
-
-			/* max value for an unsigned long long */
-#define	__ULLONG_MAX	0xffffffffffffffffULL
-#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
-#define	__LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
-
-#ifdef	__LP64__
-#define	__SSIZE_MAX	__LONG_MAX	/* max value for a ssize_t */
-#define	__SIZE_T_MAX	__ULONG_MAX	/* max value for a size_t */
-#define	__OFF_MAX	__LONG_MAX	/* max value for an off_t */
-#define	__OFF_MIN	__LONG_MIN	/* min value for an off_t */
-/* Quads and longs are the same on the amd64.  Ensure they stay in sync. */
-#define	__UQUAD_MAX	__ULONG_MAX	/* max value for a uquad_t */
-#define	__QUAD_MAX	__LONG_MAX	/* max value for a quad_t */
-#define	__QUAD_MIN	__LONG_MIN	/* min value for a quad_t */
-#define	__LONG_BIT	64
-#else
-#define	__SSIZE_MAX	__INT_MAX
-#define	__SIZE_T_MAX	__UINT_MAX
-#define	__OFF_MAX	__LLONG_MAX
-#define	__OFF_MIN	__LLONG_MIN
-#define	__UQUAD_MAX	__ULLONG_MAX
-#define	__QUAD_MAX	__LLONG_MAX
-#define	__QUAD_MIN	__LLONG_MIN
-#define	__LONG_BIT	32
-#endif
-
-#define	__WORD_BIT	32
-
-/* Minimum signal stack size. */
-#define	__MINSIGSTKSZ	(512 * 4)
-
-#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/include.new/x86/_stdint.h b/include.new/x86/_stdint.h
deleted file mode 100644
index bdd3dd4..0000000
--- a/include.new/x86/_stdint.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*-
- * Copyright (c) 2001, 2002 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/sys/x86/include/_stdint.h 237517 2012-06-24 04:15:58Z andrew $
- */
-
-#ifndef _MACHINE__STDINT_H_
-#define	_MACHINE__STDINT_H_
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-
-#define	INT8_C(c)		(c)
-#define	INT16_C(c)		(c)
-#define	INT32_C(c)		(c)
-
-#define	UINT8_C(c)		(c)
-#define	UINT16_C(c)		(c)
-#define	UINT32_C(c)		(c ## U)
-
-#ifdef	__LP64__
-#define	INT64_C(c)		(c ## L)
-#define	UINT64_C(c)		(c ## UL)
-#else
-#define	INT64_C(c)		(c ## LL)
-#define	UINT64_C(c)		(c ## ULL)
-#endif
-
-#define	INTMAX_C(c)		INT64_C(c)
-#define	UINTMAX_C(c)		UINT64_C(c)
-
-#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.1 Limits of exact-width integer types
- */
-#define	INT8_MIN	(-0x7f-1)
-#define	INT16_MIN	(-0x7fff-1)
-#define	INT32_MIN	(-0x7fffffff-1)
-
-#define	INT8_MAX	0x7f
-#define	INT16_MAX	0x7fff
-#define	INT32_MAX	0x7fffffff
-
-#define	UINT8_MAX	0xff
-#define	UINT16_MAX	0xffff
-#define	UINT32_MAX	0xffffffffU
-
-#ifdef __LP64__
-#define	INT64_MIN	(-0x7fffffffffffffff-1)
-#define	INT64_MAX	0x7fffffffffffffff
-#define	UINT64_MAX	0xffffffffffffffff
-#else
-#define	INT64_MIN	(-0x7fffffffffffffffLL-1)
-#define	INT64_MAX	0x7fffffffffffffffLL
-#define	UINT64_MAX	0xffffffffffffffffULL
-#endif
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.2  Limits of minimum-width integer types
- */
-/* Minimum values of minimum-width signed integer types. */
-#define	INT_LEAST8_MIN	INT8_MIN
-#define	INT_LEAST16_MIN	INT16_MIN
-#define	INT_LEAST32_MIN	INT32_MIN
-#define	INT_LEAST64_MIN	INT64_MIN
-
-/* Maximum values of minimum-width signed integer types. */
-#define	INT_LEAST8_MAX	INT8_MAX
-#define	INT_LEAST16_MAX	INT16_MAX
-#define	INT_LEAST32_MAX	INT32_MAX
-#define	INT_LEAST64_MAX	INT64_MAX
-
-/* Maximum values of minimum-width unsigned integer types. */
-#define	UINT_LEAST8_MAX	 UINT8_MAX
-#define	UINT_LEAST16_MAX UINT16_MAX
-#define	UINT_LEAST32_MAX UINT32_MAX
-#define	UINT_LEAST64_MAX UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.3  Limits of fastest minimum-width integer types
- */
-/* Minimum values of fastest minimum-width signed integer types. */
-#define	INT_FAST8_MIN	INT32_MIN
-#define	INT_FAST16_MIN	INT32_MIN
-#define	INT_FAST32_MIN	INT32_MIN
-#define	INT_FAST64_MIN	INT64_MIN
-
-/* Maximum values of fastest minimum-width signed integer types. */
-#define	INT_FAST8_MAX	INT32_MAX
-#define	INT_FAST16_MAX	INT32_MAX
-#define	INT_FAST32_MAX	INT32_MAX
-#define	INT_FAST64_MAX	INT64_MAX
-
-/* Maximum values of fastest minimum-width unsigned integer types. */
-#define	UINT_FAST8_MAX	UINT32_MAX
-#define	UINT_FAST16_MAX	UINT32_MAX
-#define	UINT_FAST32_MAX	UINT32_MAX
-#define	UINT_FAST64_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.4  Limits of integer types capable of holding object pointers
- */
-#ifdef	__LP64__
-#define	INTPTR_MIN	INT64_MIN
-#define	INTPTR_MAX	INT64_MAX
-#define	UINTPTR_MAX	UINT64_MAX
-#else
-#define	INTPTR_MIN	INT32_MIN
-#define	INTPTR_MAX	INT32_MAX
-#define	UINTPTR_MAX	UINT32_MAX
-#endif
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.5  Limits of greatest-width integer types
- */
-#define	INTMAX_MIN	INT64_MIN
-#define	INTMAX_MAX	INT64_MAX
-#define	UINTMAX_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.3  Limits of other integer types
- */
-#ifdef	__LP64__
-/* Limits of ptrdiff_t. */
-#define	PTRDIFF_MIN	INT64_MIN	
-#define	PTRDIFF_MAX	INT64_MAX
-
-/* Limits of sig_atomic_t. */
-#define	SIG_ATOMIC_MIN	LONG_MIN
-#define	SIG_ATOMIC_MAX	LONG_MAX
-
-/* Limit of size_t. */
-#define	SIZE_MAX	UINT64_MAX
-#else
-#define	PTRDIFF_MIN	INT32_MIN
-#define	PTRDIFF_MAX	INT32_MAX
-#define	SIG_ATOMIC_MIN	INT32_MIN
-#define	SIG_ATOMIC_MAX	INT32_MAX
-#define	SIZE_MAX	UINT32_MAX
-#endif
-
-/* Limits of wint_t. */
-#define	WINT_MIN	INT32_MIN
-#define	WINT_MAX	INT32_MAX
-
-#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
-
-#endif /* !_MACHINE__STDINT_H_ */
diff --git a/include.new/x86/_types.h b/include.new/x86/_types.h
deleted file mode 100644
index 3da8437..0000000
--- a/include.new/x86/_types.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 1990, 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.
- *
- *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
- *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD: releng/10.2/sys/x86/include/_types.h 264496 2014-04-15 09:41:52Z tijl $
- */
-
-#ifndef _MACHINE__TYPES_H_
-#define	_MACHINE__TYPES_H_
-
-#ifndef _SYS_CDEFS_H_
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
-#define __NO_STRICT_ALIGNMENT
-
-/*
- * Basic types upon which most other types are built.
- */
-typedef	signed char		__int8_t;
-typedef	unsigned char		__uint8_t;
-typedef	short			__int16_t;
-typedef	unsigned short		__uint16_t;
-typedef	int			__int32_t;
-typedef	unsigned int		__uint32_t;
-#ifdef	__LP64__
-typedef	long			__int64_t;
-typedef	unsigned long		__uint64_t;
-#else
-#ifndef lint
-__extension__
-#endif
-/* LONGLONG */
-typedef	long long		__int64_t;
-#ifndef lint
-__extension__
-#endif
-/* LONGLONG */
-typedef	unsigned long long	__uint64_t;
-#endif
-
-/*
- * Standard type definitions.
- */
-#ifdef	__LP64__
-typedef	__int32_t	__clock_t;		/* clock()... */
-typedef	__int64_t	__critical_t;
-typedef	double		__double_t;
-typedef	float		__float_t;
-typedef	__int64_t	__intfptr_t;
-typedef	__int64_t	__intptr_t;
-#else
-typedef	unsigned long	__clock_t;
-typedef	__int32_t	__critical_t;
-typedef	long double	__double_t;
-typedef	long double	__float_t;
-typedef	__int32_t	__intfptr_t;
-typedef	__int32_t	__intptr_t;
-#endif
-typedef	__int64_t	__intmax_t;
-typedef	__int32_t	__int_fast8_t;
-typedef	__int32_t	__int_fast16_t;
-typedef	__int32_t	__int_fast32_t;
-typedef	__int64_t	__int_fast64_t;
-typedef	__int8_t	__int_least8_t;
-typedef	__int16_t	__int_least16_t;
-typedef	__int32_t	__int_least32_t;
-typedef	__int64_t	__int_least64_t;
-#ifdef	__LP64__
-typedef	__int64_t	__ptrdiff_t;		/* ptr1 - ptr2 */
-typedef	__int64_t	__register_t;
-typedef	__int64_t	__segsz_t;		/* segment size (in pages) */
-typedef	__uint64_t	__size_t;		/* sizeof() */
-typedef	__int64_t	__ssize_t;		/* byte count or error */
-typedef	__int64_t	__time_t;		/* time()... */
-typedef	__uint64_t	__uintfptr_t;
-typedef	__uint64_t	__uintptr_t;
-#else
-typedef	__int32_t	__ptrdiff_t;
-typedef	__int32_t	__register_t;
-typedef	__int32_t	__segsz_t;
-typedef	__uint32_t	__size_t;
-typedef	__int32_t	__ssize_t;
-typedef	__int32_t	__time_t;
-typedef	__uint32_t	__uintfptr_t;
-typedef	__uint32_t	__uintptr_t;
-#endif
-typedef	__uint64_t	__uintmax_t;
-typedef	__uint32_t	__uint_fast8_t;
-typedef	__uint32_t	__uint_fast16_t;
-typedef	__uint32_t	__uint_fast32_t;
-typedef	__uint64_t	__uint_fast64_t;
-typedef	__uint8_t	__uint_least8_t;
-typedef	__uint16_t	__uint_least16_t;
-typedef	__uint32_t	__uint_least32_t;
-typedef	__uint64_t	__uint_least64_t;
-#ifdef	__LP64__
-typedef	__uint64_t	__u_register_t;
-typedef	__uint64_t	__vm_offset_t;
-typedef	__uint64_t	__vm_paddr_t;
-typedef	__uint64_t	__vm_size_t;
-#else
-typedef	__uint32_t	__u_register_t;
-typedef	__uint32_t	__vm_offset_t;
-#ifdef PAE
-typedef	__uint64_t	__vm_paddr_t;
-#else
-typedef	__uint32_t	__vm_paddr_t;
-#endif
-typedef	__uint32_t	__vm_size_t;
-#endif
-typedef	__int64_t	__vm_ooffset_t;
-typedef	__uint64_t	__vm_pindex_t;
-typedef	int		___wchar_t;
-
-#define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
-#define	__WCHAR_MAX	__INT_MAX	/* max value for a wchar_t */
-
-/*
- * Unusual type definitions.
- */
-#ifdef __GNUCLIKE_BUILTIN_VARARGS
-typedef	__builtin_va_list	__va_list;	/* internally known to gcc */
-#elif defined(lint)
-typedef	char *			__va_list;	/* pretend */
-#endif
-#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \
-    && !defined(__NO_GNUC_VA_LIST)
-#define __GNUC_VA_LIST
-typedef __va_list		__gnuc_va_list;	/* compatibility w/GNU headers*/
-#endif
-
-#endif /* !_MACHINE__TYPES_H_ */
diff --git a/include.new/x86/acpica_machdep.h b/include.new/x86/acpica_machdep.h
deleted file mode 100644
index f9d0443..0000000
--- a/include.new/x86/acpica_machdep.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2002 Mitsuru IWASAKI
- * 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.
- *
- * 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: releng/10.2/sys/x86/include/acpica_machdep.h 259073 2013-12-07 18:23:29Z peter $
- */
-
-/******************************************************************************
- *
- * Name: acpica_machdep.h - arch-specific defines, etc.
- *       $Revision$
- *
- *****************************************************************************/
-
-#ifndef __ACPICA_MACHDEP_H__
-#define	__ACPICA_MACHDEP_H__
-
-#ifdef _KERNEL
-/*
- * Calling conventions:
- *
- * ACPI_SYSTEM_XFACE        - Interfaces to host OS (handlers, threads)
- * ACPI_EXTERNAL_XFACE      - External ACPI interfaces 
- * ACPI_INTERNAL_XFACE      - Internal ACPI interfaces
- * ACPI_INTERNAL_VAR_XFACE  - Internal variable-parameter list interfaces
- */
-#define	ACPI_SYSTEM_XFACE
-#define	ACPI_EXTERNAL_XFACE
-#define	ACPI_INTERNAL_XFACE
-#define	ACPI_INTERNAL_VAR_XFACE
-
-/* Asm macros */
-
-#define	ACPI_ASM_MACROS
-#define	BREAKPOINT3
-#define	ACPI_DISABLE_IRQS() disable_intr()
-#define	ACPI_ENABLE_IRQS()  enable_intr()
-
-#define	ACPI_FLUSH_CPU_CACHE()	wbinvd()
-
-/* Section 5.2.10.1: global lock acquire/release functions */
-int	acpi_acquire_global_lock(volatile uint32_t *);
-int	acpi_release_global_lock(volatile uint32_t *);
-#define	ACPI_ACQUIRE_GLOBAL_LOCK(GLptr, Acq)	do {			\
-	(Acq) = acpi_acquire_global_lock(&((GLptr)->GlobalLock));	\
-} while (0)
-#define	ACPI_RELEASE_GLOBAL_LOCK(GLptr, Acq)	do {			\
-	(Acq) = acpi_release_global_lock(&((GLptr)->GlobalLock));	\
-} while (0)
- 
-void	acpi_SetDefaultIntrModel(int model);
-void	acpi_cpu_c1(void);
-void	*acpi_map_table(vm_paddr_t pa, const char *sig);
-void	acpi_unmap_table(void *table);
-vm_paddr_t acpi_find_table(const char *sig);
-
-#endif /* _KERNEL */
-
-#endif /* __ACPICA_MACHDEP_H__ */
diff --git a/include.new/x86/apicreg.h b/include.new/x86/apicreg.h
deleted file mode 100644
index 282aeb6..0000000
--- a/include.new/x86/apicreg.h
+++ /dev/null
@@ -1,455 +0,0 @@
-/*-
- * Copyright (c) 1996, by Peter Wemm and Steve Passe
- * 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. The name of the developer 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: releng/10.2/sys/x86/include/apicreg.h 262141 2014-02-18 01:15:32Z jhb $
- */
-
-#ifndef _X86_APICREG_H_
-#define _X86_APICREG_H_
-
-/*
- * Local && I/O APIC definitions.
- */
-
-/*
- * Pentium P54C+ Built-in APIC
- * (Advanced programmable Interrupt Controller)
- * 
- * Base Address of Built-in APIC in memory location
- * is 0xfee00000.
- * 
- * Map of APIC Registers:
- * 
- * Offset (hex)    Description                     Read/Write state
- * 000             Reserved
- * 010             Reserved
- * 020 ID          Local APIC ID                   R/W
- * 030 VER         Local APIC Version              R
- * 040             Reserved
- * 050             Reserved
- * 060             Reserved
- * 070             Reserved
- * 080             Task Priority Register          R/W
- * 090             Arbitration Priority Register   R
- * 0A0             Processor Priority Register     R
- * 0B0             EOI Register                    W
- * 0C0 RRR         Remote read                     R
- * 0D0             Logical Destination             R/W
- * 0E0             Destination Format Register     0..27 R;  28..31 R/W
- * 0F0 SVR         Spurious Interrupt Vector Reg.  0..3  R;  4..9   R/W
- * 100             ISR  000-031                    R
- * 110             ISR  032-063                    R
- * 120             ISR  064-095                    R
- * 130             ISR  095-128                    R
- * 140             ISR  128-159                    R
- * 150             ISR  160-191                    R
- * 160             ISR  192-223                    R
- * 170             ISR  224-255                    R
- * 180             TMR  000-031                    R
- * 190             TMR  032-063                    R
- * 1A0             TMR  064-095                    R
- * 1B0             TMR  095-128                    R
- * 1C0             TMR  128-159                    R
- * 1D0             TMR  160-191                    R
- * 1E0             TMR  192-223                    R
- * 1F0             TMR  224-255                    R
- * 200             IRR  000-031                    R
- * 210             IRR  032-063                    R
- * 220             IRR  064-095                    R
- * 230             IRR  095-128                    R
- * 240             IRR  128-159                    R
- * 250             IRR  160-191                    R
- * 260             IRR  192-223                    R
- * 270             IRR  224-255                    R
- * 280             Error Status Register           R
- * 290             Reserved
- * 2A0             Reserved
- * 2B0             Reserved
- * 2C0             Reserved
- * 2D0             Reserved
- * 2E0             Reserved
- * 2F0             Local Vector Table (CMCI)       R/W
- * 300 ICR_LOW     Interrupt Command Reg. (0-31)   R/W
- * 310 ICR_HI      Interrupt Command Reg. (32-63)  R/W
- * 320             Local Vector Table (Timer)      R/W
- * 330             Local Vector Table (Thermal)    R/W (PIV+)
- * 340             Local Vector Table (Performance) R/W (P6+)
- * 350 LVT1        Local Vector Table (LINT0)      R/W
- * 360 LVT2        Local Vector Table (LINT1)      R/W
- * 370 LVT3        Local Vector Table (ERROR)      R/W
- * 380             Initial Count Reg. for Timer    R/W
- * 390             Current Count of Timer          R
- * 3A0             Reserved
- * 3B0             Reserved
- * 3C0             Reserved
- * 3D0             Reserved
- * 3E0             Timer Divide Configuration Reg. R/W
- * 3F0             Reserved
- */
-
-
-/******************************************************************************
- * global defines, etc.
- */
-
-
-/******************************************************************************
- * LOCAL APIC structure
- */
-
-#ifndef LOCORE
-#include <sys/types.h>
-
-#define PAD3	int : 32; int : 32; int : 32
-#define PAD4	int : 32; int : 32; int : 32; int : 32
-
-struct LAPIC {
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	uint32_t id;		PAD3;
-	uint32_t version;	PAD3;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	uint32_t tpr;		PAD3;
-	uint32_t apr;		PAD3;
-	uint32_t ppr;		PAD3;
-	uint32_t eoi;		PAD3;
-	/* reserved */		PAD4;
-	uint32_t ldr;		PAD3;
-	uint32_t dfr;		PAD3;
-	uint32_t svr;		PAD3;
-	uint32_t isr0;		PAD3;
-	uint32_t isr1;		PAD3;
-	uint32_t isr2;		PAD3;
-	uint32_t isr3;		PAD3;
-	uint32_t isr4;		PAD3;
-	uint32_t isr5;		PAD3;
-	uint32_t isr6;		PAD3;
-	uint32_t isr7;		PAD3;
-	uint32_t tmr0;		PAD3;
-	uint32_t tmr1;		PAD3;
-	uint32_t tmr2;		PAD3;
-	uint32_t tmr3;		PAD3;
-	uint32_t tmr4;		PAD3;
-	uint32_t tmr5;		PAD3;
-	uint32_t tmr6;		PAD3;
-	uint32_t tmr7;		PAD3;
-	uint32_t irr0;		PAD3;
-	uint32_t irr1;		PAD3;
-	uint32_t irr2;		PAD3;
-	uint32_t irr3;		PAD3;
-	uint32_t irr4;		PAD3;
-	uint32_t irr5;		PAD3;
-	uint32_t irr6;		PAD3;
-	uint32_t irr7;		PAD3;
-	uint32_t esr;		PAD3;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	uint32_t lvt_cmci;	PAD3;
-	uint32_t icr_lo;	PAD3;
-	uint32_t icr_hi;	PAD3;
-	uint32_t lvt_timer;	PAD3;
-	uint32_t lvt_thermal;	PAD3;
-	uint32_t lvt_pcint;	PAD3;
-	uint32_t lvt_lint0;	PAD3;
-	uint32_t lvt_lint1;	PAD3;
-	uint32_t lvt_error;	PAD3;
-	uint32_t icr_timer;	PAD3;
-	uint32_t ccr_timer;	PAD3;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	/* reserved */		PAD4;
-	uint32_t dcr_timer;	PAD3;
-	/* reserved */		PAD4;
-};
-
-typedef struct LAPIC lapic_t;
-
-/******************************************************************************
- * I/O APIC structure
- */
-
-struct IOAPIC {
-	uint32_t ioregsel;	PAD3;
-	uint32_t iowin;	PAD3;
-};
-
-typedef struct IOAPIC ioapic_t;
-
-#undef PAD4
-#undef PAD3
-
-#endif  /* !LOCORE */
-
-
-/******************************************************************************
- * various code 'logical' values
- */
-
-/******************************************************************************
- * LOCAL APIC defines
- */
-
-/* default physical locations of LOCAL (CPU) APICs */
-#define DEFAULT_APIC_BASE	0xfee00000
-
-/* constants relating to APIC ID registers */
-#define APIC_ID_MASK		0xff000000
-#define	APIC_ID_SHIFT		24
-#define	APIC_ID_CLUSTER		0xf0
-#define	APIC_ID_CLUSTER_ID	0x0f
-#define	APIC_MAX_CLUSTER	0xe
-#define	APIC_MAX_INTRACLUSTER_ID 3
-#define	APIC_ID_CLUSTER_SHIFT	4
-
-/* fields in VER */
-#define APIC_VER_VERSION	0x000000ff
-#define APIC_VER_MAXLVT		0x00ff0000
-#define MAXLVTSHIFT		16
-#define APIC_VER_EOI_SUPPRESSION 0x01000000
-
-/* fields in LDR */
-#define	APIC_LDR_RESERVED	0x00ffffff
-
-/* fields in DFR */
-#define	APIC_DFR_RESERVED	0x0fffffff
-#define	APIC_DFR_MODEL_MASK	0xf0000000
-#define	APIC_DFR_MODEL_FLAT	0xf0000000
-#define	APIC_DFR_MODEL_CLUSTER	0x00000000
-
-/* fields in SVR */
-#define APIC_SVR_VECTOR		0x000000ff
-#define APIC_SVR_VEC_PROG	0x000000f0
-#define APIC_SVR_VEC_FIX	0x0000000f
-#define APIC_SVR_ENABLE		0x00000100
-# define APIC_SVR_SWDIS		0x00000000
-# define APIC_SVR_SWEN		0x00000100
-#define APIC_SVR_FOCUS		0x00000200
-# define APIC_SVR_FEN		0x00000000
-# define APIC_SVR_FDIS		0x00000200
-#define APIC_SVR_EOI_SUPPRESSION 0x00001000
-
-/* fields in TPR */
-#define APIC_TPR_PRIO		0x000000ff
-# define APIC_TPR_INT		0x000000f0
-# define APIC_TPR_SUB		0x0000000f
-
-/* fields in ESR */
-#define	APIC_ESR_SEND_CS_ERROR		0x00000001
-#define	APIC_ESR_RECEIVE_CS_ERROR	0x00000002
-#define	APIC_ESR_SEND_ACCEPT		0x00000004
-#define	APIC_ESR_RECEIVE_ACCEPT		0x00000008
-#define	APIC_ESR_SEND_ILLEGAL_VECTOR	0x00000020
-#define	APIC_ESR_RECEIVE_ILLEGAL_VECTOR	0x00000040
-#define	APIC_ESR_ILLEGAL_REGISTER	0x00000080
-
-/* fields in ICR_LOW */
-#define APIC_VECTOR_MASK	0x000000ff
-
-#define APIC_DELMODE_MASK	0x00000700
-# define APIC_DELMODE_FIXED	0x00000000
-# define APIC_DELMODE_LOWPRIO	0x00000100
-# define APIC_DELMODE_SMI	0x00000200
-# define APIC_DELMODE_RR	0x00000300
-# define APIC_DELMODE_NMI	0x00000400
-# define APIC_DELMODE_INIT	0x00000500
-# define APIC_DELMODE_STARTUP	0x00000600
-# define APIC_DELMODE_RESV	0x00000700
-
-#define APIC_DESTMODE_MASK	0x00000800
-# define APIC_DESTMODE_PHY	0x00000000
-# define APIC_DESTMODE_LOG	0x00000800
-
-#define APIC_DELSTAT_MASK	0x00001000
-# define APIC_DELSTAT_IDLE	0x00000000
-# define APIC_DELSTAT_PEND	0x00001000
-
-#define APIC_RESV1_MASK		0x00002000
-
-#define APIC_LEVEL_MASK		0x00004000
-# define APIC_LEVEL_DEASSERT	0x00000000
-# define APIC_LEVEL_ASSERT	0x00004000
-
-#define APIC_TRIGMOD_MASK	0x00008000
-# define APIC_TRIGMOD_EDGE	0x00000000
-# define APIC_TRIGMOD_LEVEL	0x00008000
-
-#define APIC_RRSTAT_MASK	0x00030000
-# define APIC_RRSTAT_INVALID	0x00000000
-# define APIC_RRSTAT_INPROG	0x00010000
-# define APIC_RRSTAT_VALID	0x00020000
-# define APIC_RRSTAT_RESV	0x00030000
-
-#define APIC_DEST_MASK		0x000c0000
-# define APIC_DEST_DESTFLD	0x00000000
-# define APIC_DEST_SELF		0x00040000
-# define APIC_DEST_ALLISELF	0x00080000
-# define APIC_DEST_ALLESELF	0x000c0000
-
-#define APIC_RESV2_MASK		0xfff00000
-
-#define	APIC_ICRLO_RESV_MASK	(APIC_RESV1_MASK | APIC_RESV2_MASK)
-
-/* fields in LVT1/2 */
-#define APIC_LVT_VECTOR		0x000000ff
-#define APIC_LVT_DM		0x00000700
-# define APIC_LVT_DM_FIXED	0x00000000
-# define APIC_LVT_DM_SMI	0x00000200
-# define APIC_LVT_DM_NMI	0x00000400
-# define APIC_LVT_DM_INIT	0x00000500
-# define APIC_LVT_DM_EXTINT	0x00000700
-#define APIC_LVT_DS		0x00001000
-#define APIC_LVT_IIPP		0x00002000
-#define APIC_LVT_IIPP_INTALO	0x00002000
-#define APIC_LVT_IIPP_INTAHI	0x00000000
-#define APIC_LVT_RIRR		0x00004000
-#define APIC_LVT_TM		0x00008000
-#define APIC_LVT_M		0x00010000
-
-
-/* fields in LVT Timer */
-#define APIC_LVTT_VECTOR	0x000000ff
-#define APIC_LVTT_DS		0x00001000
-#define APIC_LVTT_M		0x00010000
-#define APIC_LVTT_TM		0x00020000
-# define APIC_LVTT_TM_ONE_SHOT	0x00000000
-# define APIC_LVTT_TM_PERIODIC	0x00020000
-
-
-/* APIC timer current count */
-#define	APIC_TIMER_MAX_COUNT	0xffffffff
-
-/* fields in TDCR */
-#define APIC_TDCR_2		0x00
-#define APIC_TDCR_4		0x01
-#define APIC_TDCR_8		0x02
-#define APIC_TDCR_16		0x03
-#define APIC_TDCR_32		0x08
-#define APIC_TDCR_64		0x09
-#define APIC_TDCR_128		0x0a
-#define APIC_TDCR_1		0x0b
-
-/* LVT table indices */
-#define	APIC_LVT_LINT0		0
-#define	APIC_LVT_LINT1		1
-#define	APIC_LVT_TIMER		2
-#define	APIC_LVT_ERROR		3
-#define	APIC_LVT_PMC		4
-#define	APIC_LVT_THERMAL	5
-#define	APIC_LVT_CMCI		6
-#define	APIC_LVT_MAX		APIC_LVT_CMCI
-
-/******************************************************************************
- * I/O APIC defines
- */
-
-/* default physical locations of an IO APIC */
-#define DEFAULT_IO_APIC_BASE	0xfec00000
-
-/* window register offset */
-#define IOAPIC_WINDOW		0x10
-#define IOAPIC_EOIR		0x40
-
-/* indexes into IO APIC */
-#define IOAPIC_ID		0x00
-#define IOAPIC_VER		0x01
-#define IOAPIC_ARB		0x02
-#define IOAPIC_REDTBL		0x10
-#define IOAPIC_REDTBL0		IOAPIC_REDTBL
-#define IOAPIC_REDTBL1		(IOAPIC_REDTBL+0x02)
-#define IOAPIC_REDTBL2		(IOAPIC_REDTBL+0x04)
-#define IOAPIC_REDTBL3		(IOAPIC_REDTBL+0x06)
-#define IOAPIC_REDTBL4		(IOAPIC_REDTBL+0x08)
-#define IOAPIC_REDTBL5		(IOAPIC_REDTBL+0x0a)
-#define IOAPIC_REDTBL6		(IOAPIC_REDTBL+0x0c)
-#define IOAPIC_REDTBL7		(IOAPIC_REDTBL+0x0e)
-#define IOAPIC_REDTBL8		(IOAPIC_REDTBL+0x10)
-#define IOAPIC_REDTBL9		(IOAPIC_REDTBL+0x12)
-#define IOAPIC_REDTBL10		(IOAPIC_REDTBL+0x14)
-#define IOAPIC_REDTBL11		(IOAPIC_REDTBL+0x16)
-#define IOAPIC_REDTBL12		(IOAPIC_REDTBL+0x18)
-#define IOAPIC_REDTBL13		(IOAPIC_REDTBL+0x1a)
-#define IOAPIC_REDTBL14		(IOAPIC_REDTBL+0x1c)
-#define IOAPIC_REDTBL15		(IOAPIC_REDTBL+0x1e)
-#define IOAPIC_REDTBL16		(IOAPIC_REDTBL+0x20)
-#define IOAPIC_REDTBL17		(IOAPIC_REDTBL+0x22)
-#define IOAPIC_REDTBL18		(IOAPIC_REDTBL+0x24)
-#define IOAPIC_REDTBL19		(IOAPIC_REDTBL+0x26)
-#define IOAPIC_REDTBL20		(IOAPIC_REDTBL+0x28)
-#define IOAPIC_REDTBL21		(IOAPIC_REDTBL+0x2a)
-#define IOAPIC_REDTBL22		(IOAPIC_REDTBL+0x2c)
-#define IOAPIC_REDTBL23		(IOAPIC_REDTBL+0x2e)
-
-/* fields in VER */
-#define IOART_VER_VERSION	0x000000ff
-#define IOART_VER_MAXREDIR	0x00ff0000
-#define MAXREDIRSHIFT		16
-
-/*
- * fields in the IO APIC's redirection table entries
- */
-#define IOART_DEST	APIC_ID_MASK	/* broadcast addr: all APICs */
-
-#define IOART_RESV	0x00fe0000	/* reserved */
-
-#define IOART_INTMASK	0x00010000	/* R/W: INTerrupt mask */
-# define IOART_INTMCLR	0x00000000	/*       clear, allow INTs */
-# define IOART_INTMSET	0x00010000	/*       set, inhibit INTs */
-
-#define IOART_TRGRMOD	0x00008000	/* R/W: trigger mode */
-# define IOART_TRGREDG	0x00000000	/*       edge */
-# define IOART_TRGRLVL	0x00008000	/*       level */
-
-#define IOART_REM_IRR	0x00004000	/* RO: remote IRR */
-
-#define IOART_INTPOL	0x00002000	/* R/W: INT input pin polarity */
-# define IOART_INTAHI	0x00000000	/*      active high */
-# define IOART_INTALO	0x00002000	/*      active low */
-
-#define IOART_DELIVS	0x00001000	/* RO: delivery status */
-
-#define IOART_DESTMOD	0x00000800	/* R/W: destination mode */
-# define IOART_DESTPHY	0x00000000	/*      physical */
-# define IOART_DESTLOG	0x00000800	/*      logical */
-
-#define IOART_DELMOD	0x00000700	/* R/W: delivery mode */
-# define IOART_DELFIXED	0x00000000	/*       fixed */
-# define IOART_DELLOPRI	0x00000100	/*       lowest priority */
-# define IOART_DELSMI	0x00000200	/*       System Management INT */
-# define IOART_DELRSV1	0x00000300	/*       reserved */
-# define IOART_DELNMI	0x00000400	/*       NMI signal */
-# define IOART_DELINIT	0x00000500	/*       INIT signal */
-# define IOART_DELRSV2	0x00000600	/*       reserved */
-# define IOART_DELEXINT	0x00000700	/*       External INTerrupt */
-
-#define IOART_INTVEC	0x000000ff	/* R/W: INTerrupt vector field */
-
-#endif /* _X86_APICREG_H_ */
diff --git a/include.new/x86/apm_bios.h b/include.new/x86/apm_bios.h
deleted file mode 100644
index fa03068..0000000
--- a/include.new/x86/apm_bios.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*-
- * APM (Advanced Power Management) BIOS Device Driver
- *
- * Copyright (c) 1994-1995 by HOSOKAWA, Tatsumi <hosokawa@mt.cs.keio.ac.jp>
- *
- * This software may be used, modified, copied, and distributed, in
- * both source and binary form provided that the above copyright and
- * these terms are retained. Under no circumstances is the author
- * responsible for the proper functioning of this software, nor does
- * the author assume any responsibility for damages incurred with its
- * use.
- *
- * Aug, 1994	Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD)
- *
- * $FreeBSD: releng/10.2/sys/x86/include/apm_bios.h 215140 2010-11-11 19:36:21Z jkim $
- */
-
-#ifndef _X86_APM_BIOS_H_
-#define	_X86_APM_BIOS_H_
-
-#ifndef _KERNEL
-#include <sys/types.h>
-#endif
-#include <sys/ioccom.h>
-
-/* BIOS id */
-#define APM_BIOS		0x53
-#define APM_INT			0x15
-
-/* APM flags */
-#define APM_16BIT_SUPPORT	0x01
-#define APM_32BIT_SUPPORT	0x02
-#define APM_CPUIDLE_SLOW	0x04
-#define APM_DISABLED		0x08
-#define APM_DISENGAGED		0x10
-
-/* APM initializer physical address */
-#define APM_OURADDR		0x00080000
-
-/* APM functions */
-#define APM_INSTCHECK		0x00
-#define APM_REALCONNECT		0x01
-#define APM_PROT16CONNECT	0x02
-#define APM_PROT32CONNECT	0x03
-#define APM_DISCONNECT		0x04
-#define APM_CPUIDLE		0x05
-#define APM_CPUBUSY		0x06
-#define APM_SETPWSTATE		0x07
-#define APM_ENABLEDISABLEPM	0x08
-#define APM_RESTOREDEFAULT	0x09
-#define	APM_GETPWSTATUS		0x0a
-#define APM_GETPMEVENT		0x0b
-#define APM_GETPWSTATE		0x0c
-#define APM_ENABLEDISABLEDPM	0x0d
-#define APM_DRVVERSION		0x0e
-#define APM_ENGAGEDISENGAGEPM	0x0f
-#define APM_GETCAPABILITIES	0x10
-#define APM_RESUMETIMER		0x11
-#define APM_RESUMEONRING	0x12
-#define APM_TIMERREQUESTS	0x13
-#define APM_OEMFUNC		0x80
-
-/* error code */
-#define APME_OK			0x00
-#define APME_PMDISABLED		0x01
-#define APME_REALESTABLISHED	0x02
-#define APME_NOTCONNECTED	0x03
-#define APME_PROT16ESTABLISHED	0x05
-#define APME_PROT16NOTSUPPORTED	0x06
-#define APME_PROT32ESTABLISHED	0x07
-#define APME_PROT32NOTDUPPORTED	0x08
-#define APME_UNKNOWNDEVICEID	0x09
-#define APME_OUTOFRANGE		0x0a
-#define APME_NOTENGAGED		0x0b
-#define APME_CANTENTERSTATE	0x60
-#define APME_NOPMEVENT		0x80
-#define APME_NOAPMPRESENT	0x86
-
-
-/* device code */
-#define PMDV_APMBIOS		0x0000
-#define PMDV_ALLDEV		0x0001
-#define PMDV_DISP0		0x0100
-#define PMDV_DISP1		0x0101
-#define PMDV_DISPALL		0x01ff
-#define PMDV_2NDSTORAGE0	0x0200
-#define PMDV_2NDSTORAGE1	0x0201
-#define PMDV_2NDSTORAGE2	0x0202
-#define PMDV_2NDSTORAGE3	0x0203
-#define PMDV_PARALLEL0		0x0300
-#define PMDV_PARALLEL1		0x0301
-#define PMDV_SERIAL0		0x0400
-#define PMDV_SERIAL1		0x0401
-#define PMDV_SERIAL2		0x0402
-#define PMDV_SERIAL3		0x0403
-#define PMDV_SERIAL4		0x0404
-#define PMDV_SERIAL5		0x0405
-#define PMDV_SERIAL6		0x0406
-#define PMDV_SERIAL7		0x0407
-#define PMDV_NET0		0x0500
-#define PMDV_NET1		0x0501
-#define PMDV_NET2		0x0502
-#define PMDV_NET3		0x0503
-#define PMDV_PCMCIA0		0x0600
-#define PMDV_PCMCIA1		0x0601
-#define PMDV_PCMCIA2		0x0602
-#define PMDV_PCMCIA3		0x0603
-/* 0x0700 - 0x7fff	Reserved			*/
-#define PMDV_BATT_BASE		0x8000
-#define PMDV_BATT0		0x8001
-#define PMDV_BATT1		0x8002
-#define PMDV_BATT_ALL		0x80ff
-/* 0x8100 - 0xdfff	Reserved			*/
-/* 0xe000 - 0xefff	OEM-defined power device IDs	*/
-/* 0xf000 - 0xffff	Reserved			*/
-
-/* Power state */
-#define PMST_APMENABLED		0x0000
-#define PMST_STANDBY		0x0001
-#define PMST_SUSPEND		0x0002
-#define PMST_OFF		0x0003
-#define PMST_LASTREQNOTIFY	0x0004
-#define PMST_LASTREQREJECT	0x0005
-/* 0x0006 - 0x001f	Reserved system states		*/
-/* 0x0020 - 0x003f	OEM-defined system states	*/
-/* 0x0040 - 0x007f	OEM-defined device states	*/
-/* 0x0080 - 0xffff	Reserved device states		*/
-
-#if !defined(ASSEMBLER) && !defined(INITIALIZER)
-
-/* C definitions */
-struct apmhook {
-	struct apmhook	*ah_next;
-	int		(*ah_fun)(void *ah_arg);
-	void		*ah_arg;
-	const char	*ah_name;
-	int		ah_order;
-};
-#define APM_HOOK_NONE		(-1)
-#define APM_HOOK_SUSPEND        0
-#define APM_HOOK_RESUME         1
-#define NAPM_HOOK               2
-
-#ifdef _KERNEL
-
-void apm_suspend(int state);
-struct apmhook *apm_hook_establish (int apmh, struct apmhook *);
-void apm_hook_disestablish (int apmh, struct apmhook *);
-void apm_cpu_idle(void);
-void apm_cpu_busy(void);
-
-#endif
-
-#endif /* !ASSEMBLER && !INITIALIZER */
-
-#define APM_MIN_ORDER		0x00
-#define APM_MID_ORDER		0x80
-#define APM_MAX_ORDER		0xff
-
-/* power management event code */
-#define PMEV_NOEVENT		0x0000
-#define PMEV_STANDBYREQ		0x0001
-#define PMEV_SUSPENDREQ		0x0002
-#define PMEV_NORMRESUME		0x0003
-#define PMEV_CRITRESUME		0x0004
-#define PMEV_BATTERYLOW		0x0005
-#define PMEV_POWERSTATECHANGE	0x0006
-#define PMEV_UPDATETIME		0x0007
-#define PMEV_CRITSUSPEND	0x0008
-#define PMEV_USERSTANDBYREQ	0x0009
-#define PMEV_USERSUSPENDREQ	0x000a
-#define PMEV_STANDBYRESUME	0x000b
-#define PMEV_CAPABILITIESCHANGE 0x000c
-/* 0x000d - 0x00ff	Reserved system events	*/
-/* 0x0100 - 0x01ff	Reserved device events	*/
-/* 0x0200 - 0x02ff	OEM-defined APM events	*/
-/* 0x0300 - 0xffff	Reserved		*/
-#define PMEV_DEFAULT		0xffffffff	/* used for customization */
-
-#if !defined(ASSEMBLER) && !defined(INITIALIZER)
-
-/*
- * Old apm_info structure, returned by the APMIO_GETINFO_OLD ioctl.  This
- * is for backward compatibility with old executables.
- */
-typedef struct apm_info_old {
-	u_int	ai_major;	/* APM major version */
-	u_int	ai_minor;	/* APM minor version */
-	u_int	ai_acline;	/* AC line status */
-	u_int	ai_batt_stat;	/* Battery status */
-	u_int	ai_batt_life;	/* Remaining battery life */
-	u_int	ai_status;	/* Status of APM support (enabled/disabled) */
-} *apm_info_old_t;
-
-/*
- * Structure returned by the APMIO_GETINFO ioctl.
- *
- * In the comments below, the parenthesized numbers indicate the minimum
- * value of ai_infoversion for which each field is valid.
- */
-typedef struct apm_info {
-	u_int	ai_infoversion;	/* Indicates which fields are valid */
-	u_int	ai_major;	/* APM major version (0) */
-	u_int	ai_minor;	/* APM minor version (0) */
-	u_int	ai_acline;	/* AC line status (0) */
-	u_int	ai_batt_stat;	/* Battery status (0) */
-	u_int	ai_batt_life;	/* Remaining battery life in percent (0) */
-	int	ai_batt_time;	/* Remaining battery time in seconds (0) */
-	u_int	ai_status;	/* True if enabled (0) */
-	u_int	ai_batteries;	/* Number of batteries (1) */
-	u_int	ai_capabilities;/* APM Capabilities (1) */
-	u_int	ai_spare[6];	/* For future expansion */
-} *apm_info_t;
-
-/* Battery flag */
-#define APM_BATT_HIGH		0x01
-#define APM_BATT_LOW		0x02
-#define APM_BATT_CRITICAL	0x04
-#define APM_BATT_CHARGING	0x08
-#define APM_BATT_NOT_PRESENT	0x10
-#define APM_BATT_NO_SYSTEM	0x80
-
-typedef struct apm_pwstatus {
-	u_int	ap_device;	/* Device code of battery */
-	u_int	ap_acline;	/* AC line status (0) */
-	u_int	ap_batt_stat;	/* Battery status (0) */
-	u_int	ap_batt_flag;	/* Battery flag (0) */
-	u_int	ap_batt_life;	/* Remaining battery life in percent (0) */
-	int	ap_batt_time;	/* Remaining battery time in seconds (0) */
-} *apm_pwstatus_t;
-
-struct apm_bios_arg {
-        uint32_t eax;
-        uint32_t ebx;
-        uint32_t ecx;
-        uint32_t edx;
-        uint32_t esi;
-        uint32_t edi;
-};
-
-struct apm_event_info {
-	u_int type;
-	u_int index;
-	u_int spare[8];
-};
-
-#define APMIO_SUSPEND		_IO('P', 1)
-#define APMIO_GETINFO_OLD	_IOR('P', 2, struct apm_info_old)
-#define APMIO_ENABLE		_IO('P', 5)
-#define APMIO_DISABLE		_IO('P', 6)
-#define APMIO_HALTCPU		_IO('P', 7)
-#define APMIO_NOTHALTCPU	_IO('P', 8)
-#define APMIO_DISPLAY		_IOW('P', 9, int)
-#define APMIO_BIOS		_IOWR('P', 10, struct apm_bios_arg)
-#define APMIO_GETINFO		_IOR('P', 11, struct apm_info)
-#define APMIO_STANDBY		_IO('P', 12)
-#define APMIO_GETPWSTATUS	_IOWR('P', 13, struct apm_pwstatus)
-/* for /dev/apmctl */
-#define APMIO_NEXTEVENT		_IOR('A', 100, struct apm_event_info)
-#define APMIO_REJECTLASTREQ	_IO('P', 101)
-
-#endif /* !ASSEMBLER && !INITIALIZER */
-
-#endif /* !_X86_APM_BIOS_H_ */
diff --git a/include.new/x86/bus.h b/include.new/x86/bus.h
deleted file mode 100644
index 84b3550..0000000
--- a/include.new/x86/bus.h
+++ /dev/null
@@ -1,1121 +0,0 @@
-/*-
- * Copyright (c) KATO Takenori, 1999.
- *
- * All rights reserved.  Unpublished rights reserved under the copyright
- * laws of Japan.
- *
- * 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 as
- *    the first lines of this file unmodified.
- * 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 ``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 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: releng/10.2/sys/x86/include/bus.h 263687 2014-03-24 13:48:04Z emaste $
- */
-
-/*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
- * NASA Ames Research Center.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*-
- * Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
- * Copyright (c) 1996 Christopher G. Demetriou.  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 Christopher G. Demetriou
- *	for the NetBSD Project.
- * 4. 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 ``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 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.
- */
-
-#ifndef _X86_BUS_H_
-#define _X86_BUS_H_
-
-#include <machine/_bus.h>
-#include <machine/cpufunc.h>
-
-#ifndef __GNUCLIKE_ASM
-# ifndef lint
-#  error "no assembler code for your compiler"
-# endif
-#endif
-
-/*
- * Values for the x86 bus space tag, not to be used directly by MI code.
- */
-#define	X86_BUS_SPACE_IO	0	/* space is i/o space */
-#define	X86_BUS_SPACE_MEM	1	/* space is mem space */
-
-#define BUS_SPACE_MAXSIZE_24BIT	0xFFFFFF
-#define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
-#define BUS_SPACE_MAXSIZE	0xFFFFFFFF
-#define BUS_SPACE_MAXADDR_24BIT	0xFFFFFF
-#define BUS_SPACE_MAXADDR_32BIT 0xFFFFFFFF
-#if defined(__amd64__) || defined(PAE)
-#define BUS_SPACE_MAXADDR	0xFFFFFFFFFFFFFFFFULL
-#else
-#define BUS_SPACE_MAXADDR	0xFFFFFFFF
-#endif
-
-#define BUS_SPACE_INVALID_DATA	(~0)
-#define BUS_SPACE_UNRESTRICTED	(~0)
-
-/*
- * Map a region of device bus space into CPU virtual address space.
- */
-
-static __inline int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
-				  bus_size_t size, int flags,
-				  bus_space_handle_t *bshp);
-
-static __inline int
-bus_space_map(bus_space_tag_t t __unused, bus_addr_t addr,
-	      bus_size_t size __unused, int flags __unused,
-	      bus_space_handle_t *bshp)
-{
-
-	*bshp = addr;
-	return (0);
-}
-
-/*
- * Unmap a region of device bus space.
- */
-
-static __inline void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh,
-				     bus_size_t size);
-
-static __inline void
-bus_space_unmap(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused,
-		bus_size_t size __unused)
-{
-}
-
-/*
- * Get a new handle for a subregion of an already-mapped area of bus space.
- */
-
-static __inline int bus_space_subregion(bus_space_tag_t t,
-					bus_space_handle_t bsh,
-					bus_size_t offset, bus_size_t size,
-					bus_space_handle_t *nbshp);
-
-static __inline int
-bus_space_subregion(bus_space_tag_t t __unused, bus_space_handle_t bsh,
-		    bus_size_t offset, bus_size_t size __unused,
-		    bus_space_handle_t *nbshp)
-{
-
-	*nbshp = bsh + offset;
-	return (0);
-}
-
-/*
- * Allocate a region of memory that is accessible to devices in bus space.
- */
-
-int	bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart,
-			bus_addr_t rend, bus_size_t size, bus_size_t align,
-			bus_size_t boundary, int flags, bus_addr_t *addrp,
-			bus_space_handle_t *bshp);
-
-/*
- * Free a region of bus space accessible memory.
- */
-
-static __inline void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh,
-				    bus_size_t size);
-
-static __inline void
-bus_space_free(bus_space_tag_t t __unused, bus_space_handle_t bsh __unused,
-	       bus_size_t size __unused)
-{
-}
-
-
-/*
- * Read a 1, 2, 4, or 8 byte quantity from bus space
- * described by tag/handle/offset.
- */
-static __inline u_int8_t bus_space_read_1(bus_space_tag_t tag,
-					  bus_space_handle_t handle,
-					  bus_size_t offset);
-
-static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag,
-					   bus_space_handle_t handle,
-					   bus_size_t offset);
-
-static __inline uint32_t bus_space_read_4(bus_space_tag_t tag,
-					   bus_space_handle_t handle,
-					   bus_size_t offset);
-
-#ifdef __amd64__
-static __inline uint64_t bus_space_read_8(bus_space_tag_t tag,
-					  bus_space_handle_t handle,
-					  bus_size_t offset);
-#endif
-
-static __inline u_int8_t
-bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle,
-		 bus_size_t offset)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		return (inb(handle + offset));
-	return (*(volatile u_int8_t *)(handle + offset));
-}
-
-static __inline u_int16_t
-bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle,
-		 bus_size_t offset)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		return (inw(handle + offset));
-	return (*(volatile u_int16_t *)(handle + offset));
-}
-
-static __inline uint32_t
-bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle,
-		 bus_size_t offset)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		return (inl(handle + offset));
-	return (*(volatile uint32_t *)(handle + offset));
-}
-
-#ifdef __amd64__
-static __inline uint64_t
-bus_space_read_8(bus_space_tag_t tag, bus_space_handle_t handle,
-		 bus_size_t offset)
-{
-
-	if (tag == X86_BUS_SPACE_IO) /* No 8 byte IO space access on x86 */
-		return (BUS_SPACE_INVALID_DATA);
-	return (*(volatile uint64_t *)(handle + offset));
-}
-#endif
-
-/*
- * Read `count' 1, 2, 4, or 8 byte quantities from bus space
- * described by tag/handle/offset and copy into buffer provided.
- */
-static __inline void bus_space_read_multi_1(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int8_t *addr,
-					    size_t count);
-
-static __inline void bus_space_read_multi_2(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int16_t *addr,
-					    size_t count);
-
-static __inline void bus_space_read_multi_4(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, uint32_t *addr,
-					    size_t count);
-
-static __inline void
-bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int8_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		insb(bsh + offset, addr, count);
-	else {
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	movb (%2),%%al				\n\
-			stosb					\n\
-			loop 1b"				:
-		    "=D" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
-		    "%eax", "memory");
-#endif
-	}
-}
-
-static __inline void
-bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int16_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		insw(bsh + offset, addr, count);
-	else {
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	movw (%2),%%ax				\n\
-			stosw					\n\
-			loop 1b"				:
-		    "=D" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
-		    "%eax", "memory");
-#endif
-	}
-}
-
-static __inline void
-bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, uint32_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		insl(bsh + offset, addr, count);
-	else {
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	movl (%2),%%eax				\n\
-			stosl					\n\
-			loop 1b"				:
-		    "=D" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
-		    "%eax", "memory");
-#endif
-	}
-}
-
-#if 0	/* Cause a link error for bus_space_read_multi_8 */
-#define	bus_space_read_multi_8	!!! bus_space_read_multi_8 unimplemented !!!
-#endif
-
-/*
- * Read `count' 1, 2, 4, or 8 byte quantities from bus space
- * described by tag/handle and starting at `offset' and copy into
- * buffer provided.
- */
-static __inline void bus_space_read_region_1(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset, u_int8_t *addr,
-					     size_t count);
-
-static __inline void bus_space_read_region_2(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset, u_int16_t *addr,
-					     size_t count);
-
-static __inline void bus_space_read_region_4(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset, uint32_t *addr,
-					     size_t count);
-
-
-static __inline void
-bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, u_int8_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO) {
-		int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	inb %w2,%%al				\n\
-			stosb					\n\
-			incl %2					\n\
-			loop 1b"				:
-		    "=D" (addr), "=c" (count), "=d" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
-		    "%eax", "memory", "cc");
-#endif
-	} else {
-		bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-			repne					\n\
-			movsb"					:
-		    "=D" (addr), "=c" (count), "=S" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
-		    "memory", "cc");
-#endif
-	}
-}
-
-static __inline void
-bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, u_int16_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO) {
-		int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	inw %w2,%%ax				\n\
-			stosw					\n\
-			addl $2,%2				\n\
-			loop 1b"				:
-		    "=D" (addr), "=c" (count), "=d" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
-		    "%eax", "memory", "cc");
-#endif
-	} else {
-		bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-			repne					\n\
-			movsw"					:
-		    "=D" (addr), "=c" (count), "=S" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
-		    "memory", "cc");
-#endif
-	}
-}
-
-static __inline void
-bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, uint32_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO) {
-		int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	inl %w2,%%eax				\n\
-			stosl					\n\
-			addl $4,%2				\n\
-			loop 1b"				:
-		    "=D" (addr), "=c" (count), "=d" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
-		    "%eax", "memory", "cc");
-#endif
-	} else {
-		bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-			repne					\n\
-			movsl"					:
-		    "=D" (addr), "=c" (count), "=S" (_port_)	:
-		    "0" (addr), "1" (count), "2" (_port_)	:
-		    "memory", "cc");
-#endif
-	}
-}
-
-#if 0	/* Cause a link error for bus_space_read_region_8 */
-#define	bus_space_read_region_8	!!! bus_space_read_region_8 unimplemented !!!
-#endif
-
-/*
- * Write the 1, 2, 4, or 8 byte value `value' to bus space
- * described by tag/handle/offset.
- */
-
-static __inline void bus_space_write_1(bus_space_tag_t tag,
-				       bus_space_handle_t bsh,
-				       bus_size_t offset, u_int8_t value);
-
-static __inline void bus_space_write_2(bus_space_tag_t tag,
-				       bus_space_handle_t bsh,
-				       bus_size_t offset, u_int16_t value);
-
-static __inline void bus_space_write_4(bus_space_tag_t tag,
-				       bus_space_handle_t bsh,
-				       bus_size_t offset, uint32_t value);
-
-#ifdef __amd64__
-static __inline void bus_space_write_8(bus_space_tag_t tag,
-				       bus_space_handle_t bsh,
-				       bus_size_t offset, uint64_t value);
-#endif
-
-static __inline void
-bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int8_t value)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		outb(bsh + offset, value);
-	else
-		*(volatile u_int8_t *)(bsh + offset) = value;
-}
-
-static __inline void
-bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int16_t value)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		outw(bsh + offset, value);
-	else
-		*(volatile u_int16_t *)(bsh + offset) = value;
-}
-
-static __inline void
-bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, uint32_t value)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		outl(bsh + offset, value);
-	else
-		*(volatile uint32_t *)(bsh + offset) = value;
-}
-
-#ifdef __amd64__
-static __inline void
-bus_space_write_8(bus_space_tag_t tag, bus_space_handle_t bsh,
-		  bus_size_t offset, uint64_t value)
-{
-
-	if (tag == X86_BUS_SPACE_IO) /* No 8 byte IO space access on x86 */
-		return;
-	else
-		*(volatile uint64_t *)(bsh + offset) = value;
-}
-#endif
-
-/*
- * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
- * provided to bus space described by tag/handle/offset.
- */
-
-static __inline void bus_space_write_multi_1(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset,
-					     const u_int8_t *addr,
-					     size_t count);
-static __inline void bus_space_write_multi_2(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset,
-					     const u_int16_t *addr,
-					     size_t count);
-
-static __inline void bus_space_write_multi_4(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset,
-					     const uint32_t *addr,
-					     size_t count);
-
-static __inline void
-bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, const u_int8_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		outsb(bsh + offset, addr, count);
-	else {
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	lodsb					\n\
-			movb %%al,(%2)				\n\
-			loop 1b"				:
-		    "=S" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
-		    "%eax", "memory", "cc");
-#endif
-	}
-}
-
-static __inline void
-bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, const u_int16_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		outsw(bsh + offset, addr, count);
-	else {
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	lodsw					\n\
-			movw %%ax,(%2)				\n\
-			loop 1b"				:
-		    "=S" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
-		    "%eax", "memory", "cc");
-#endif
-	}
-}
-
-static __inline void
-bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, const uint32_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO)
-		outsl(bsh + offset, addr, count);
-	else {
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	lodsl					\n\
-			movl %%eax,(%2)				\n\
-			loop 1b"				:
-		    "=S" (addr), "=c" (count)			:
-		    "r" (bsh + offset), "0" (addr), "1" (count)	:
-		    "%eax", "memory", "cc");
-#endif
-	}
-}
-
-#if 0	/* Cause a link error for bus_space_write_multi_8 */
-#define	bus_space_write_multi_8(t, h, o, a, c)				\
-			!!! bus_space_write_multi_8 unimplemented !!!
-#endif
-
-/*
- * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
- * to bus space described by tag/handle starting at `offset'.
- */
-
-static __inline void bus_space_write_region_1(bus_space_tag_t tag,
-					      bus_space_handle_t bsh,
-					      bus_size_t offset,
-					      const u_int8_t *addr,
-					      size_t count);
-static __inline void bus_space_write_region_2(bus_space_tag_t tag,
-					      bus_space_handle_t bsh,
-					      bus_size_t offset,
-					      const u_int16_t *addr,
-					      size_t count);
-static __inline void bus_space_write_region_4(bus_space_tag_t tag,
-					      bus_space_handle_t bsh,
-					      bus_size_t offset,
-					      const uint32_t *addr,
-					      size_t count);
-
-static __inline void
-bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-			 bus_size_t offset, const u_int8_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO) {
-		int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	lodsb					\n\
-			outb %%al,%w0				\n\
-			incl %0					\n\
-			loop 1b"				:
-		    "=d" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
-		    "%eax", "memory", "cc");
-#endif
-	} else {
-		bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-			repne					\n\
-			movsb"					:
-		    "=D" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
-		    "memory", "cc");
-#endif
-	}
-}
-
-static __inline void
-bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-			 bus_size_t offset, const u_int16_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO) {
-		int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	lodsw					\n\
-			outw %%ax,%w0				\n\
-			addl $2,%0				\n\
-			loop 1b"				:
-		    "=d" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
-		    "%eax", "memory", "cc");
-#endif
-	} else {
-		bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-			repne					\n\
-			movsw"					:
-		    "=D" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
-		    "memory", "cc");
-#endif
-	}
-}
-
-static __inline void
-bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-			 bus_size_t offset, const uint32_t *addr, size_t count)
-{
-
-	if (tag == X86_BUS_SPACE_IO) {
-		int _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-		1:	lodsl					\n\
-			outl %%eax,%w0				\n\
-			addl $4,%0				\n\
-			loop 1b"				:
-		    "=d" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
-		    "%eax", "memory", "cc");
-#endif
-	} else {
-		bus_space_handle_t _port_ = bsh + offset;
-#ifdef __GNUCLIKE_ASM
-		__asm __volatile("				\n\
-			cld					\n\
-			repne					\n\
-			movsl"					:
-		    "=D" (_port_), "=S" (addr), "=c" (count)	:
-		    "0" (_port_), "1" (addr), "2" (count)	:
-		    "memory", "cc");
-#endif
-	}
-}
-
-#if 0	/* Cause a link error for bus_space_write_region_8 */
-#define	bus_space_write_region_8					\
-			!!! bus_space_write_region_8 unimplemented !!!
-#endif
-
-/*
- * Write the 1, 2, 4, or 8 byte value `val' to bus space described
- * by tag/handle/offset `count' times.
- */
-
-static __inline void bus_space_set_multi_1(bus_space_tag_t tag,
-					   bus_space_handle_t bsh,
-					   bus_size_t offset,
-					   u_int8_t value, size_t count);
-static __inline void bus_space_set_multi_2(bus_space_tag_t tag,
-					   bus_space_handle_t bsh,
-					   bus_size_t offset,
-					   u_int16_t value, size_t count);
-static __inline void bus_space_set_multi_4(bus_space_tag_t tag,
-					   bus_space_handle_t bsh,
-					   bus_size_t offset,
-					   uint32_t value, size_t count);
-
-static __inline void
-bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-		      bus_size_t offset, u_int8_t value, size_t count)
-{
-	bus_space_handle_t addr = bsh + offset;
-
-	if (tag == X86_BUS_SPACE_IO)
-		while (count--)
-			outb(addr, value);
-	else
-		while (count--)
-			*(volatile u_int8_t *)(addr) = value;
-}
-
-static __inline void
-bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-		     bus_size_t offset, u_int16_t value, size_t count)
-{
-	bus_space_handle_t addr = bsh + offset;
-
-	if (tag == X86_BUS_SPACE_IO)
-		while (count--)
-			outw(addr, value);
-	else
-		while (count--)
-			*(volatile u_int16_t *)(addr) = value;
-}
-
-static __inline void
-bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-		      bus_size_t offset, uint32_t value, size_t count)
-{
-	bus_space_handle_t addr = bsh + offset;
-
-	if (tag == X86_BUS_SPACE_IO)
-		while (count--)
-			outl(addr, value);
-	else
-		while (count--)
-			*(volatile uint32_t *)(addr) = value;
-}
-
-#if 0	/* Cause a link error for bus_space_set_multi_8 */
-#define	bus_space_set_multi_8 !!! bus_space_set_multi_8 unimplemented !!!
-#endif
-
-/*
- * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
- * by tag/handle starting at `offset'.
- */
-
-static __inline void bus_space_set_region_1(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int8_t value,
-					    size_t count);
-static __inline void bus_space_set_region_2(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int16_t value,
-					    size_t count);
-static __inline void bus_space_set_region_4(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, uint32_t value,
-					    size_t count);
-
-static __inline void
-bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int8_t value, size_t count)
-{
-	bus_space_handle_t addr = bsh + offset;
-
-	if (tag == X86_BUS_SPACE_IO)
-		for (; count != 0; count--, addr++)
-			outb(addr, value);
-	else
-		for (; count != 0; count--, addr++)
-			*(volatile u_int8_t *)(addr) = value;
-}
-
-static __inline void
-bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int16_t value, size_t count)
-{
-	bus_space_handle_t addr = bsh + offset;
-
-	if (tag == X86_BUS_SPACE_IO)
-		for (; count != 0; count--, addr += 2)
-			outw(addr, value);
-	else
-		for (; count != 0; count--, addr += 2)
-			*(volatile u_int16_t *)(addr) = value;
-}
-
-static __inline void
-bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, uint32_t value, size_t count)
-{
-	bus_space_handle_t addr = bsh + offset;
-
-	if (tag == X86_BUS_SPACE_IO)
-		for (; count != 0; count--, addr += 4)
-			outl(addr, value);
-	else
-		for (; count != 0; count--, addr += 4)
-			*(volatile uint32_t *)(addr) = value;
-}
-
-#if 0	/* Cause a link error for bus_space_set_region_8 */
-#define	bus_space_set_region_8	!!! bus_space_set_region_8 unimplemented !!!
-#endif
-
-/*
- * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
- * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
- */
-
-static __inline void bus_space_copy_region_1(bus_space_tag_t tag,
-					     bus_space_handle_t bsh1,
-					     bus_size_t off1,
-					     bus_space_handle_t bsh2,
-					     bus_size_t off2, size_t count);
-
-static __inline void bus_space_copy_region_2(bus_space_tag_t tag,
-					     bus_space_handle_t bsh1,
-					     bus_size_t off1,
-					     bus_space_handle_t bsh2,
-					     bus_size_t off2, size_t count);
-
-static __inline void bus_space_copy_region_4(bus_space_tag_t tag,
-					     bus_space_handle_t bsh1,
-					     bus_size_t off1,
-					     bus_space_handle_t bsh2,
-					     bus_size_t off2, size_t count);
-
-static __inline void
-bus_space_copy_region_1(bus_space_tag_t tag, bus_space_handle_t bsh1,
-			bus_size_t off1, bus_space_handle_t bsh2,
-			bus_size_t off2, size_t count)
-{
-	bus_space_handle_t addr1 = bsh1 + off1;
-	bus_space_handle_t addr2 = bsh2 + off2;
-
-	if (tag == X86_BUS_SPACE_IO) {
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1++, addr2++)
-				outb(addr2, inb(addr1));
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += (count - 1), addr2 += (count - 1);
-			    count != 0; count--, addr1--, addr2--)
-				outb(addr2, inb(addr1));
-		}
-	} else {
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1++, addr2++)
-				*(volatile u_int8_t *)(addr2) =
-				    *(volatile u_int8_t *)(addr1);
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += (count - 1), addr2 += (count - 1);
-			    count != 0; count--, addr1--, addr2--)
-				*(volatile u_int8_t *)(addr2) =
-				    *(volatile u_int8_t *)(addr1);
-		}
-	}
-}
-
-static __inline void
-bus_space_copy_region_2(bus_space_tag_t tag, bus_space_handle_t bsh1,
-			bus_size_t off1, bus_space_handle_t bsh2,
-			bus_size_t off2, size_t count)
-{
-	bus_space_handle_t addr1 = bsh1 + off1;
-	bus_space_handle_t addr2 = bsh2 + off2;
-
-	if (tag == X86_BUS_SPACE_IO) {
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1 += 2, addr2 += 2)
-				outw(addr2, inw(addr1));
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1);
-			    count != 0; count--, addr1 -= 2, addr2 -= 2)
-				outw(addr2, inw(addr1));
-		}
-	} else {
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1 += 2, addr2 += 2)
-				*(volatile u_int16_t *)(addr2) =
-				    *(volatile u_int16_t *)(addr1);
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1);
-			    count != 0; count--, addr1 -= 2, addr2 -= 2)
-				*(volatile u_int16_t *)(addr2) =
-				    *(volatile u_int16_t *)(addr1);
-		}
-	}
-}
-
-static __inline void
-bus_space_copy_region_4(bus_space_tag_t tag, bus_space_handle_t bsh1,
-			bus_size_t off1, bus_space_handle_t bsh2,
-			bus_size_t off2, size_t count)
-{
-	bus_space_handle_t addr1 = bsh1 + off1;
-	bus_space_handle_t addr2 = bsh2 + off2;
-
-	if (tag == X86_BUS_SPACE_IO) {
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1 += 4, addr2 += 4)
-				outl(addr2, inl(addr1));
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1);
-			    count != 0; count--, addr1 -= 4, addr2 -= 4)
-				outl(addr2, inl(addr1));
-		}
-	} else {
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1 += 4, addr2 += 4)
-				*(volatile uint32_t *)(addr2) =
-				    *(volatile uint32_t *)(addr1);
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1);
-			    count != 0; count--, addr1 -= 4, addr2 -= 4)
-				*(volatile uint32_t *)(addr2) =
-				    *(volatile uint32_t *)(addr1);
-		}
-	}
-}
-
-#if 0	/* Cause a link error for bus_space_copy_8 */
-#define	bus_space_copy_region_8	!!! bus_space_copy_region_8 unimplemented !!!
-#endif
-
-/*
- * Bus read/write barrier methods.
- *
- *	void bus_space_barrier(bus_space_tag_t tag, bus_space_handle_t bsh,
- *			       bus_size_t offset, bus_size_t len, int flags);
- *
- *
- * Note that BUS_SPACE_BARRIER_WRITE doesn't do anything other than
- * prevent reordering by the compiler; all Intel x86 processors currently
- * retire operations outside the CPU in program order.
- */
-#define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */
-#define	BUS_SPACE_BARRIER_WRITE	0x02		/* force write barrier */
-
-static __inline void
-bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused,
-		  bus_size_t offset __unused, bus_size_t len __unused, int flags)
-{
-#ifdef __GNUCLIKE_ASM
-	if (flags & BUS_SPACE_BARRIER_READ)
-#ifdef __amd64__
-		__asm __volatile("lock; addl $0,0(%%rsp)" : : : "memory");
-#else
-		__asm __volatile("lock; addl $0,0(%%esp)" : : : "memory");
-#endif
-	else
-		__compiler_membar();
-#endif
-}
-
-#ifdef BUS_SPACE_NO_LEGACY
-#undef inb
-#undef outb
-#define inb(a) compiler_error
-#define inw(a) compiler_error
-#define inl(a) compiler_error
-#define outb(a, b) compiler_error
-#define outw(a, b) compiler_error
-#define outl(a, b) compiler_error
-#endif
-
-#include <machine/bus_dma.h>
-
-/*
- * Stream accesses are the same as normal accesses on x86; there are no
- * supported bus systems with an endianess different from the host one.
- */
-#define	bus_space_read_stream_1(t, h, o)	bus_space_read_1((t), (h), (o))
-#define	bus_space_read_stream_2(t, h, o)	bus_space_read_2((t), (h), (o))
-#define	bus_space_read_stream_4(t, h, o)	bus_space_read_4((t), (h), (o))
-
-#define	bus_space_read_multi_stream_1(t, h, o, a, c) \
-	bus_space_read_multi_1((t), (h), (o), (a), (c))
-#define	bus_space_read_multi_stream_2(t, h, o, a, c) \
-	bus_space_read_multi_2((t), (h), (o), (a), (c))
-#define	bus_space_read_multi_stream_4(t, h, o, a, c) \
-	bus_space_read_multi_4((t), (h), (o), (a), (c))
-
-#define	bus_space_write_stream_1(t, h, o, v) \
-	bus_space_write_1((t), (h), (o), (v))
-#define	bus_space_write_stream_2(t, h, o, v) \
-	bus_space_write_2((t), (h), (o), (v))
-#define	bus_space_write_stream_4(t, h, o, v) \
-	bus_space_write_4((t), (h), (o), (v))
-
-#define	bus_space_write_multi_stream_1(t, h, o, a, c) \
-	bus_space_write_multi_1((t), (h), (o), (a), (c))
-#define	bus_space_write_multi_stream_2(t, h, o, a, c) \
-	bus_space_write_multi_2((t), (h), (o), (a), (c))
-#define	bus_space_write_multi_stream_4(t, h, o, a, c) \
-	bus_space_write_multi_4((t), (h), (o), (a), (c))
-
-#define	bus_space_set_multi_stream_1(t, h, o, v, c) \
-	bus_space_set_multi_1((t), (h), (o), (v), (c))
-#define	bus_space_set_multi_stream_2(t, h, o, v, c) \
-	bus_space_set_multi_2((t), (h), (o), (v), (c))
-#define	bus_space_set_multi_stream_4(t, h, o, v, c) \
-	bus_space_set_multi_4((t), (h), (o), (v), (c))
-
-#define	bus_space_read_region_stream_1(t, h, o, a, c) \
-	bus_space_read_region_1((t), (h), (o), (a), (c))
-#define	bus_space_read_region_stream_2(t, h, o, a, c) \
-	bus_space_read_region_2((t), (h), (o), (a), (c))
-#define	bus_space_read_region_stream_4(t, h, o, a, c) \
-	bus_space_read_region_4((t), (h), (o), (a), (c))
-
-#define	bus_space_write_region_stream_1(t, h, o, a, c) \
-	bus_space_write_region_1((t), (h), (o), (a), (c))
-#define	bus_space_write_region_stream_2(t, h, o, a, c) \
-	bus_space_write_region_2((t), (h), (o), (a), (c))
-#define	bus_space_write_region_stream_4(t, h, o, a, c) \
-	bus_space_write_region_4((t), (h), (o), (a), (c))
-
-#define	bus_space_set_region_stream_1(t, h, o, v, c) \
-	bus_space_set_region_1((t), (h), (o), (v), (c))
-#define	bus_space_set_region_stream_2(t, h, o, v, c) \
-	bus_space_set_region_2((t), (h), (o), (v), (c))
-#define	bus_space_set_region_stream_4(t, h, o, v, c) \
-	bus_space_set_region_4((t), (h), (o), (v), (c))
-
-#define	bus_space_copy_region_stream_1(t, h1, o1, h2, o2, c) \
-	bus_space_copy_region_1((t), (h1), (o1), (h2), (o2), (c))
-#define	bus_space_copy_region_stream_2(t, h1, o1, h2, o2, c) \
-	bus_space_copy_region_2((t), (h1), (o1), (h2), (o2), (c))
-#define	bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c) \
-	bus_space_copy_region_4((t), (h1), (o1), (h2), (o2), (c))
-
-#endif /* _X86_BUS_H_ */
diff --git a/include.new/x86/busdma_impl.h b/include.new/x86/busdma_impl.h
deleted file mode 100644
index b164087..0000000
--- a/include.new/x86/busdma_impl.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 2013 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Konstantin Belousov <kib@FreeBSD.org>
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/sys/x86/include/busdma_impl.h 259512 2013-12-17 13:49:35Z kib $
- */
-
-#ifndef	__X86_BUSDMA_IMPL_H
-#define	__X86_BUSDMA_IMPL_H
-
-struct bus_dma_tag_common {
-	struct bus_dma_impl *impl;
-	struct bus_dma_tag_common *parent;
-	bus_size_t	  alignment;
-	bus_addr_t	  boundary;
-	bus_addr_t	  lowaddr;
-	bus_addr_t	  highaddr;
-	bus_dma_filter_t *filter;
-	void		 *filterarg;
-	bus_size_t	  maxsize;
-	u_int		  nsegments;
-	bus_size_t	  maxsegsz;
-	int		  flags;
-	bus_dma_lock_t	 *lockfunc;
-	void		 *lockfuncarg;
-	int		  ref_count;
-};
-
-struct bus_dma_impl {
-	int (*tag_create)(bus_dma_tag_t parent,
-	    bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr,
-	    bus_addr_t highaddr, bus_dma_filter_t *filter,
-	    void *filterarg, bus_size_t maxsize, int nsegments,
-	    bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
-	    void *lockfuncarg, bus_dma_tag_t *dmat);
-	int (*tag_destroy)(bus_dma_tag_t dmat);
-	int (*map_create)(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp);
-	int (*map_destroy)(bus_dma_tag_t dmat, bus_dmamap_t map);
-	int (*mem_alloc)(bus_dma_tag_t dmat, void** vaddr, int flags,
-	    bus_dmamap_t *mapp);
-	void (*mem_free)(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map);
-	int (*load_ma)(bus_dma_tag_t dmat, bus_dmamap_t map,
-	    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
-	    bus_dma_segment_t *segs, int *segp);
-	int (*load_phys)(bus_dma_tag_t dmat, bus_dmamap_t map,
-	    vm_paddr_t buf, bus_size_t buflen, int flags,
-	    bus_dma_segment_t *segs, int *segp);
-	int (*load_buffer)(bus_dma_tag_t dmat, bus_dmamap_t map,
-	    void *buf, bus_size_t buflen, pmap_t pmap, int flags,
-	    bus_dma_segment_t *segs, int *segp);
-	void (*map_waitok)(bus_dma_tag_t dmat, bus_dmamap_t map,
-	    struct memdesc *mem, bus_dmamap_callback_t *callback,
-	    void *callback_arg);
-	bus_dma_segment_t *(*map_complete)(bus_dma_tag_t dmat, bus_dmamap_t map,
-	    bus_dma_segment_t *segs, int nsegs, int error);
-	void (*map_unload)(bus_dma_tag_t dmat, bus_dmamap_t map);
-	void (*map_sync)(bus_dma_tag_t dmat, bus_dmamap_t map,
-	    bus_dmasync_op_t op);
-};
-
-void bus_dma_dflt_lock(void *arg, bus_dma_lock_op_t op);
-int bus_dma_run_filter(struct bus_dma_tag_common *dmat, bus_addr_t paddr);
-int common_bus_dma_tag_create(struct bus_dma_tag_common *parent,
-    bus_size_t alignment,
-    bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
-    bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize,
-    int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
-    void *lockfuncarg, size_t sz, void **dmat);
-
-extern struct bus_dma_impl bus_dma_bounce_impl;
-
-#endif
diff --git a/include.new/x86/elf.h b/include.new/x86/elf.h
deleted file mode 100644
index cbf5f2e..0000000
--- a/include.new/x86/elf.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*-
- * Copyright (c) 1996-1997 John D. Polstra.
- * 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.
- *
- * 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: releng/10.2/sys/x86/include/elf.h 247047 2013-02-20 17:39:52Z kib $
- */
-
-#ifndef _MACHINE_ELF_H_
-#define	_MACHINE_ELF_H_ 1
-
-#if defined(__i386__) || defined(_MACHINE_ELF_WANT_32BIT)
-
-/*
- * ELF definitions for the i386 architecture.
- */
-
-#include <sys/elf32.h>	/* Definitions common to all 32 bit architectures. */
-#if defined(__ELF_WORD_SIZE) && __ELF_WORD_SIZE == 64
-#include <sys/elf64.h>	/* Definitions common to all 64 bit architectures. */
-#endif
-
-#ifndef __ELF_WORD_SIZE
-#define	__ELF_WORD_SIZE	32	/* Used by <sys/elf_generic.h> */
-#endif
-
-#include <sys/elf_generic.h>
-
-#define	ELF_ARCH	EM_386
-
-#define	ELF_MACHINE_OK(x) ((x) == EM_386 || (x) == EM_486)
-
-/*
- * Auxiliary vector entries for passing information to the interpreter.
- *
- * The i386 supplement to the SVR4 ABI specification names this "auxv_t",
- * but POSIX lays claim to all symbols ending with "_t".
- */
-
-typedef struct {	/* Auxiliary vector entry on initial stack */
-	int	a_type;			/* Entry type. */
-	union {
-		long	a_val;		/* Integer value. */
-		void	*a_ptr;		/* Address. */
-		void	(*a_fcn)(void);	/* Function pointer (not used). */
-	} a_un;
-} Elf32_Auxinfo;
-
-#if __ELF_WORD_SIZE == 64
-/* Fake for amd64 loader support */
-typedef struct {
-	int fake;
-} Elf64_Auxinfo;
-#endif
-
-__ElfType(Auxinfo);
-
-/* Values for a_type. */
-#define	AT_NULL		0	/* Terminates the vector. */
-#define	AT_IGNORE	1	/* Ignored entry. */
-#define	AT_EXECFD	2	/* File descriptor of program to load. */
-#define	AT_PHDR		3	/* Program header of program already loaded. */
-#define	AT_PHENT	4	/* Size of each program header entry. */
-#define	AT_PHNUM	5	/* Number of program header entries. */
-#define	AT_PAGESZ	6	/* Page size in bytes. */
-#define	AT_BASE		7	/* Interpreter's base address. */
-#define	AT_FLAGS	8	/* Flags (unused for i386). */
-#define	AT_ENTRY	9	/* Where interpreter should transfer control. */
-#define	AT_NOTELF	10	/* Program is not ELF ?? */
-#define	AT_UID		11	/* Real uid. */
-#define	AT_EUID		12	/* Effective uid. */
-#define	AT_GID		13	/* Real gid. */
-#define	AT_EGID		14	/* Effective gid. */
-#define	AT_EXECPATH	15	/* Path to the executable. */
-#define	AT_CANARY	16	/* Canary for SSP. */
-#define	AT_CANARYLEN	17	/* Length of the canary. */
-#define	AT_OSRELDATE	18	/* OSRELDATE. */
-#define	AT_NCPUS	19	/* Number of CPUs. */
-#define	AT_PAGESIZES	20	/* Pagesizes. */
-#define	AT_PAGESIZESLEN	21	/* Number of pagesizes. */
-#define	AT_TIMEKEEP	22	/* Pointer to timehands. */
-#define	AT_STACKPROT	23	/* Initial stack protection. */
-
-#define	AT_COUNT	24	/* Count of defined aux entry types. */
-
-/*
- * Relocation types.
- */
-
-#define	R_386_COUNT	38	/* Count of defined relocation types. */
-
-/* Define "machine" characteristics */
-#define	ELF_TARG_CLASS	ELFCLASS32
-#define	ELF_TARG_DATA	ELFDATA2LSB
-#define	ELF_TARG_MACH	EM_386
-#define	ELF_TARG_VER	1
-
-#define	ET_DYN_LOAD_ADDR 0x01001000
-
-#elif defined(__amd64__)
-
-/*
- * ELF definitions for the AMD64 architecture.
- */
-
-#ifndef __ELF_WORD_SIZE
-#define	__ELF_WORD_SIZE	64	/* Used by <sys/elf_generic.h> */
-#endif
-#include <sys/elf32.h>	/* Definitions common to all 32 bit architectures. */
-#include <sys/elf64.h>	/* Definitions common to all 64 bit architectures. */
-#include <sys/elf_generic.h>
-
-#define	ELF_ARCH	EM_X86_64
-#define	ELF_ARCH32	EM_386
-
-#define	ELF_MACHINE_OK(x) ((x) == EM_X86_64)
-
-/*
- * Auxiliary vector entries for passing information to the interpreter.
- *
- * The i386 supplement to the SVR4 ABI specification names this "auxv_t",
- * but POSIX lays claim to all symbols ending with "_t".
- */
-typedef struct {	/* Auxiliary vector entry on initial stack */
-	int	a_type;			/* Entry type. */
-	union {
-		int	a_val;		/* Integer value. */
-	} a_un;
-} Elf32_Auxinfo;
-
-
-typedef struct {	/* Auxiliary vector entry on initial stack */
-	long	a_type;			/* Entry type. */
-	union {
-		long	a_val;		/* Integer value. */
-		void	*a_ptr;		/* Address. */
-		void	(*a_fcn)(void);	/* Function pointer (not used). */
-	} a_un;
-} Elf64_Auxinfo;
-
-__ElfType(Auxinfo);
-
-/* Values for a_type. */
-#define	AT_NULL		0	/* Terminates the vector. */
-#define	AT_IGNORE	1	/* Ignored entry. */
-#define	AT_EXECFD	2	/* File descriptor of program to load. */
-#define	AT_PHDR		3	/* Program header of program already loaded. */
-#define	AT_PHENT	4	/* Size of each program header entry. */
-#define	AT_PHNUM	5	/* Number of program header entries. */
-#define	AT_PAGESZ	6	/* Page size in bytes. */
-#define	AT_BASE		7	/* Interpreter's base address. */
-#define	AT_FLAGS	8	/* Flags (unused for i386). */
-#define	AT_ENTRY	9	/* Where interpreter should transfer control. */
-#define	AT_NOTELF	10	/* Program is not ELF ?? */
-#define	AT_UID		11	/* Real uid. */
-#define	AT_EUID		12	/* Effective uid. */
-#define	AT_GID		13	/* Real gid. */
-#define	AT_EGID		14	/* Effective gid. */
-#define	AT_EXECPATH	15	/* Path to the executable. */
-#define	AT_CANARY	16	/* Canary for SSP */
-#define	AT_CANARYLEN	17	/* Length of the canary. */
-#define	AT_OSRELDATE	18	/* OSRELDATE. */
-#define	AT_NCPUS	19	/* Number of CPUs. */
-#define	AT_PAGESIZES	20	/* Pagesizes. */
-#define	AT_PAGESIZESLEN	21	/* Number of pagesizes. */
-#define	AT_TIMEKEEP	22	/* Pointer to timehands. */
-#define	AT_STACKPROT	23	/* Initial stack protection. */
-
-#define	AT_COUNT	24	/* Count of defined aux entry types. */
-
-/*
- * Relocation types.
- */
-
-#define	R_X86_64_COUNT	24	/* Count of defined relocation types. */
-
-/* Define "machine" characteristics */
-#if __ELF_WORD_SIZE == 32
-#define ELF_TARG_CLASS  ELFCLASS32
-#else
-#define ELF_TARG_CLASS  ELFCLASS64
-#endif
-#define	ELF_TARG_DATA	ELFDATA2LSB
-#define	ELF_TARG_MACH	EM_X86_64
-#define	ELF_TARG_VER	1
-
-#if __ELF_WORD_SIZE == 32
-#define	ET_DYN_LOAD_ADDR 0x01001000
-#else
-#define	ET_DYN_LOAD_ADDR 0x01021000
-#endif
-
-#endif /* __i386__, __amd64__ */
-
-#endif /* !_MACHINE_ELF_H_ */
diff --git a/include.new/x86/endian.h b/include.new/x86/endian.h
deleted file mode 100644
index d8387cf..0000000
--- a/include.new/x86/endian.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * Copyright (c) 1987, 1991 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.
- * 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.
- *
- *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD: releng/10.2/sys/x86/include/endian.h 233684 2012-03-29 23:31:48Z dim $
- */
-
-#ifndef _MACHINE_ENDIAN_H_
-#define	_MACHINE_ENDIAN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/*
- * Define the order of 32-bit words in 64-bit words.
- */
-#define	_QUAD_HIGHWORD 1
-#define	_QUAD_LOWWORD 0
-
-/*
- * Definitions for byte order, according to byte significance from low
- * address to high.
- */
-#define	_LITTLE_ENDIAN	1234	/* LSB first: i386, vax */
-#define	_BIG_ENDIAN	4321	/* MSB first: 68000, ibm, net */
-#define	_PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
-
-#define	_BYTE_ORDER	_LITTLE_ENDIAN
-
-/*
- * Deprecated variants that don't have enough underscores to be useful in more
- * strict namespaces.
- */
-#if __BSD_VISIBLE
-#define	LITTLE_ENDIAN	_LITTLE_ENDIAN
-#define	BIG_ENDIAN	_BIG_ENDIAN
-#define	PDP_ENDIAN	_PDP_ENDIAN
-#define	BYTE_ORDER	_BYTE_ORDER
-#endif
-
-#define	__bswap16_gen(x)	(__uint16_t)((x) << 8 | (x) >> 8)
-#define	__bswap32_gen(x)		\
-	(((__uint32_t)__bswap16((x) & 0xffff) << 16) | __bswap16((x) >> 16))
-#define	__bswap64_gen(x)		\
-	(((__uint64_t)__bswap32((x) & 0xffffffff) << 32) | __bswap32((x) >> 32))
-
-#ifdef __GNUCLIKE_BUILTIN_CONSTANT_P
-#define	__bswap16(x)				\
-	((__uint16_t)(__builtin_constant_p(x) ?	\
-	    __bswap16_gen((__uint16_t)(x)) : __bswap16_var(x)))
-#define	__bswap32(x)			\
-	(__builtin_constant_p(x) ?	\
-	    __bswap32_gen((__uint32_t)(x)) : __bswap32_var(x))
-#define	__bswap64(x)			\
-	(__builtin_constant_p(x) ?	\
-	    __bswap64_gen((__uint64_t)(x)) : __bswap64_var(x))
-#else
-/* XXX these are broken for use in static initializers. */
-#define	__bswap16(x)	__bswap16_var(x)
-#define	__bswap32(x)	__bswap32_var(x)
-#define	__bswap64(x)	__bswap64_var(x)
-#endif
-
-/* These are defined as functions to avoid multiple evaluation of x. */
-
-static __inline __uint16_t
-__bswap16_var(__uint16_t _x)
-{
-
-	return (__bswap16_gen(_x));
-}
-
-static __inline __uint32_t
-__bswap32_var(__uint32_t _x)
-{
-
-#ifdef __GNUCLIKE_ASM
-	__asm("bswap %0" : "+r" (_x));
-	return (_x);
-#else
-	return (__bswap32_gen(_x));
-#endif
-}
-
-static __inline __uint64_t
-__bswap64_var(__uint64_t _x)
-{
-
-#if defined(__amd64__) && defined(__GNUCLIKE_ASM)
-	__asm("bswap %0" : "+r" (_x));
-	return (_x);
-#else
-	/*
-	 * It is important for the optimizations that the following is not
-	 * really generic, but expands to 2 __bswap32_var()'s.
-	 */
-	return (__bswap64_gen(_x));
-#endif
-}
-
-#define	__htonl(x)	__bswap32(x)
-#define	__htons(x)	__bswap16(x)
-#define	__ntohl(x)	__bswap32(x)
-#define	__ntohs(x)	__bswap16(x)
-
-#endif /* !_MACHINE_ENDIAN_H_ */
diff --git a/include.new/x86/fdt.h b/include.new/x86/fdt.h
deleted file mode 100644
index 7fea971..0000000
--- a/include.new/x86/fdt.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2013 Juniper Networks, Inc.
- * 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.
- *
- * 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: releng/10.2/sys/x86/include/fdt.h 266084 2014-05-14 19:18:58Z ian $
- */
-
-#ifndef _MACHINE_FDT_H_
-#define _MACHINE_FDT_H_
-
-__BEGIN_DECLS
-int x86_init_fdt(void);
-__END_DECLS
-
-#endif /* _MACHINE_FDT_H_ */
diff --git a/include.new/x86/float.h b/include.new/x86/float.h
deleted file mode 100644
index 514b430..0000000
--- a/include.new/x86/float.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 1989 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.
- * 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.
- *
- *	from: @(#)float.h	7.1 (Berkeley) 5/8/90
- * $FreeBSD: releng/10.2/sys/x86/include/float.h 235939 2012-05-24 21:44:46Z obrien $
- */
-
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_ 1
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-extern int __flt_rounds(void);
-__END_DECLS
-
-#define FLT_RADIX	2		/* b */
-#define FLT_ROUNDS	__flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#ifdef __LP64__
-#define	FLT_EVAL_METHOD	0		/* no promotions */
-#else
-#define	FLT_EVAL_METHOD	(-1)		/* i387 semantics are...interesting */
-#endif
-#define	DECIMAL_DIG	21		/* max precision in decimal digits */
-#endif
-
-#define FLT_MANT_DIG	24		/* p */
-#define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
-#define FLT_DIG		6		/* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP	(-125)		/* emin */
-#define FLT_MIN		1.17549435E-38F	/* b**(emin-1) */
-#define FLT_MIN_10_EXP	(-37)		/* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP	128		/* emax */
-#define FLT_MAX		3.40282347E+38F	/* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP	38		/* floor(log10((1-b**(-p))*b**emax)) */
-#if __ISO_C_VISIBLE >= 2011
-#define	FLT_TRUE_MIN	1.40129846E-45F	/* b**(emin-p) */
-#define	FLT_DECIMAL_DIG	9		/* ceil(1+p*log10(b)) */
-#define	FLT_HAS_SUBNORM	1
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-#define DBL_MANT_DIG	53
-#define DBL_EPSILON	2.2204460492503131E-16
-#define DBL_DIG		15
-#define DBL_MIN_EXP	(-1021)
-#define DBL_MIN		2.2250738585072014E-308
-#define DBL_MIN_10_EXP	(-307)
-#define DBL_MAX_EXP	1024
-#define DBL_MAX		1.7976931348623157E+308
-#define DBL_MAX_10_EXP	308
-#if __ISO_C_VISIBLE >= 2011
-#define	DBL_TRUE_MIN	4.9406564584124654E-324
-#define	DBL_DECIMAL_DIG	17
-#define	DBL_HAS_SUBNORM	1
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-#define LDBL_MANT_DIG	64
-#define LDBL_EPSILON	1.0842021724855044340E-19L
-#define LDBL_DIG	18
-#define LDBL_MIN_EXP	(-16381)
-#define LDBL_MIN	3.3621031431120935063E-4932L
-#define LDBL_MIN_10_EXP	(-4931)
-#define LDBL_MAX_EXP	16384
-#define LDBL_MAX	1.1897314953572317650E+4932L
-#define LDBL_MAX_10_EXP	4932
-#if __ISO_C_VISIBLE >= 2011
-#define	LDBL_TRUE_MIN	3.6451995318824746025E-4951L
-#define	LDBL_DECIMAL_DIG 21
-#define	LDBL_HAS_SUBNORM 1
-#endif /* __ISO_C_VISIBLE >= 2011 */
-
-#endif /* _MACHINE_FLOAT_H_ */
diff --git a/include.new/x86/fpu.h b/include.new/x86/fpu.h
deleted file mode 100644
index e8fecbc..0000000
--- a/include.new/x86/fpu.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD: releng/10.2/sys/x86/include/fpu.h 279211 2015-02-23 18:38:41Z jhb $
- */
-
-/*
- * Floating Point Data Structures and Constants
- * W. Jolitz 1/90
- */
-
-#ifndef _X86_FPU_H_
-#define	_X86_FPU_H_
-
-/* Environment information of floating point unit. */
-struct env87 {
-	int32_t		en_cw;		/* control word (16bits) */
-	int32_t		en_sw;		/* status word (16bits) */
-	int32_t		en_tw;		/* tag word (16bits) */
-	int32_t		en_fip;		/* fp instruction pointer */
-	uint16_t	en_fcs;		/* fp code segment selector */
-	uint16_t	en_opcode;	/* opcode last executed (11 bits) */
-	int32_t		en_foo;		/* fp operand offset */
-	int32_t		en_fos;		/* fp operand segment selector */
-};
-
-/* Contents of each x87 floating point accumulator. */
-struct fpacc87 {
-	uint8_t		fp_bytes[10];
-};
-
-/* Floating point context. (i386 fnsave/frstor) */
-struct save87 {
-	struct env87	sv_env;		/* floating point control/status */
-	struct fpacc87	sv_ac[8];	/* accumulator contents, 0-7 */
-	uint8_t		sv_pad0[4];	/* saved status word (now unused) */
-	uint8_t		sv_pad[64];
-};
-
-/* Contents of each SSE extended accumulator. */
-struct xmmacc {
-	uint8_t		xmm_bytes[16];
-};
-
-/* Contents of the upper 16 bytes of each AVX extended accumulator. */
-struct ymmacc {
-	uint8_t		ymm_bytes[16];
-};
-
-/* Rename structs below depending on machine architecture. */
-#ifdef __i386__
-#define	__envxmm32	envxmm
-#else
-#define	__envxmm32	envxmm32
-#define	__envxmm64	envxmm
-#endif
-
-struct __envxmm32 {
-	uint16_t	en_cw;		/* control word (16bits) */
-	uint16_t	en_sw;		/* status word (16bits) */
-	uint16_t	en_tw;		/* tag word (16bits) */
-	uint16_t	en_opcode;	/* opcode last executed (11 bits) */
-	uint32_t	en_fip;		/* fp instruction pointer */
-	uint16_t	en_fcs;		/* fp code segment selector */
-	uint16_t	en_pad0;	/* padding */
-	uint32_t	en_foo;		/* fp operand offset */
-	uint16_t	en_fos;		/* fp operand segment selector */
-	uint16_t	en_pad1;	/* padding */
-	uint32_t	en_mxcsr;	/* SSE control/status register */
-	uint32_t	en_mxcsr_mask;	/* valid bits in mxcsr */
-};
-
-struct __envxmm64 {
-	uint16_t	en_cw;		/* control word (16bits) */
-	uint16_t	en_sw;		/* status word (16bits) */
-	uint8_t		en_tw;		/* tag word (8bits) */
-	uint8_t		en_zero;
-	uint16_t	en_opcode;	/* opcode last executed (11 bits ) */
-	uint64_t	en_rip;		/* fp instruction pointer */
-	uint64_t	en_rdp;		/* fp operand pointer */
-	uint32_t	en_mxcsr;	/* SSE control/status register */
-	uint32_t	en_mxcsr_mask;	/* valid bits in mxcsr */
-};
-
-/* Floating point context. (i386 fxsave/fxrstor) */
-struct savexmm {
-	struct __envxmm32	sv_env;
-	struct {
-		struct fpacc87	fp_acc;
-		uint8_t		fp_pad[6];      /* padding */
-	} sv_fp[8];
-	struct xmmacc		sv_xmm[8];
-	uint8_t			sv_pad[224];
-} __aligned(16);
-
-#ifdef __i386__
-union savefpu {
-	struct save87	sv_87;
-	struct savexmm	sv_xmm;
-};
-#else
-/* Floating point context. (amd64 fxsave/fxrstor) */
-struct savefpu {
-	struct __envxmm64	sv_env;
-	struct {
-		struct fpacc87	fp_acc;
-		uint8_t		fp_pad[6];	/* padding */
-	} sv_fp[8];
-	struct xmmacc		sv_xmm[16];
-	uint8_t			sv_pad[96];
-} __aligned(16);
-#endif
-
-struct xstate_hdr {
-	uint64_t	xstate_bv;
-	uint64_t	xstate_xcomp_bv;
-	uint8_t		xstate_rsrv0[8];
-	uint8_t		xstate_rsrv[40];
-};
-#define	XSTATE_XCOMP_BV_COMPACT	(1ULL << 63)
-
-struct savexmm_xstate {
-	struct xstate_hdr	sx_hd;
-	struct ymmacc		sx_ymm[16];
-};
-
-struct savexmm_ymm {
-	struct __envxmm32	sv_env;
-	struct {
-		struct fpacc87	fp_acc;
-		int8_t		fp_pad[6];	/* padding */
-	} sv_fp[8];
-	struct xmmacc		sv_xmm[16];
-	uint8_t			sv_pad[96];
-	struct savexmm_xstate	sv_xstate;
-} __aligned(64);
-
-struct savefpu_xstate {
-	struct xstate_hdr	sx_hd;
-	struct ymmacc		sx_ymm[16];
-};
-
-struct savefpu_ymm {
-	struct __envxmm64	sv_env;
-	struct {
-		struct fpacc87	fp_acc;
-		int8_t		fp_pad[6];	/* padding */
-	} sv_fp[8];
-	struct xmmacc		sv_xmm[16];
-	uint8_t			sv_pad[96];
-	struct savefpu_xstate	sv_xstate;
-} __aligned(64);
-
-#undef __envxmm32
-#undef __envxmm64
-
-/*
- * The hardware default control word for i387's and later coprocessors is
- * 0x37F, giving:
- *
- *	round to nearest
- *	64-bit precision
- *	all exceptions masked.
- *
- * FreeBSD/i386 uses 53 bit precision for things like fadd/fsub/fsqrt etc
- * because of the difference between memory and fpu register stack arguments.
- * If its using an intermediate fpu register, it has 80/64 bits to work
- * with.  If it uses memory, it has 64/53 bits to work with.  However,
- * gcc is aware of this and goes to a fair bit of trouble to make the
- * best use of it.
- *
- * This is mostly academic for AMD64, because the ABI prefers the use
- * SSE2 based math.  For FreeBSD/amd64, we go with the default settings.
- */
-#define	__INITIAL_FPUCW__	0x037F
-#define	__INITIAL_FPUCW_I386__	0x127F
-#define	__INITIAL_NPXCW__	__INITIAL_FPUCW_I386__
-#define	__INITIAL_MXCSR__	0x1F80
-#define	__INITIAL_MXCSR_MASK__	0xFFBF
-
-/*
- * The current value of %xcr0 is saved in the sv_pad[] field of the FPU
- * state in the NT_X86_XSTATE note in core dumps.  This offset is chosen
- * to match the offset used by NT_X86_XSTATE in other systems.
- */
-#define	X86_XSTATE_XCR0_OFFSET	464
-
-#endif /* !_X86_FPU_H_ */
diff --git a/include.new/x86/frame.h b/include.new/x86/frame.h
deleted file mode 100644
index 3c8f91a..0000000
--- a/include.new/x86/frame.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 2003 Peter Wemm.
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)frame.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD: releng/10.2/sys/x86/include/frame.h 247047 2013-02-20 17:39:52Z kib $
- */
-
-#ifndef _MACHINE_FRAME_H_
-#define _MACHINE_FRAME_H_ 1
-
-/*
- * System stack frames.
- */
-
-#ifdef __i386__
-/*
- * Exception/Trap Stack Frame
- */
-
-struct trapframe {
-	int	tf_fs;
-	int	tf_es;
-	int	tf_ds;
-	int	tf_edi;
-	int	tf_esi;
-	int	tf_ebp;
-	int	tf_isp;
-	int	tf_ebx;
-	int	tf_edx;
-	int	tf_ecx;
-	int	tf_eax;
-	int	tf_trapno;
-	/* below portion defined in 386 hardware */
-	int	tf_err;
-	int	tf_eip;
-	int	tf_cs;
-	int	tf_eflags;
-	/* below only when crossing rings (e.g. user to kernel) */
-	int	tf_esp;
-	int	tf_ss;
-};
-
-/* Superset of trap frame, for traps from virtual-8086 mode */
-
-struct trapframe_vm86 {
-	int	tf_fs;
-	int	tf_es;
-	int	tf_ds;
-	int	tf_edi;
-	int	tf_esi;
-	int	tf_ebp;
-	int	tf_isp;
-	int	tf_ebx;
-	int	tf_edx;
-	int	tf_ecx;
-	int	tf_eax;
-	int	tf_trapno;
-	/* below portion defined in 386 hardware */
-	int	tf_err;
-	int	tf_eip;
-	int	tf_cs;
-	int	tf_eflags;
-	/* below only when crossing rings (e.g. user to kernel) */
-	int	tf_esp;
-	int	tf_ss;
-	/* below only when switching out of VM86 mode */
-	int	tf_vm86_es;
-	int	tf_vm86_ds;
-	int	tf_vm86_fs;
-	int	tf_vm86_gs;
-};
-#endif /* __i386__ */
-
-#ifdef __amd64__
-/*
- * Exception/Trap Stack Frame
- *
- * The ordering of this is specifically so that we can take first 6
- * the syscall arguments directly from the beginning of the frame.
- */
-
-struct trapframe {
-	register_t	tf_rdi;
-	register_t	tf_rsi;
-	register_t	tf_rdx;
-	register_t	tf_rcx;
-	register_t	tf_r8;
-	register_t	tf_r9;
-	register_t	tf_rax;
-	register_t	tf_rbx;
-	register_t	tf_rbp;
-	register_t	tf_r10;
-	register_t	tf_r11;
-	register_t	tf_r12;
-	register_t	tf_r13;
-	register_t	tf_r14;
-	register_t	tf_r15;
-	uint32_t	tf_trapno;
-	uint16_t	tf_fs;
-	uint16_t	tf_gs;
-	register_t	tf_addr;
-	uint32_t	tf_flags;
-	uint16_t	tf_es;
-	uint16_t	tf_ds;
-	/* below portion defined in hardware */
-	register_t	tf_err;
-	register_t	tf_rip;
-	register_t	tf_cs;
-	register_t	tf_rflags;
-	register_t	tf_rsp;
-	register_t	tf_ss;
-};
-
-#define	TF_HASSEGS	0x1
-#define	TF_HASBASES	0x2
-#define	TF_HASFPXSTATE	0x4
-#endif /* __amd64__ */
-
-#endif /* _MACHINE_FRAME_H_ */
diff --git a/include.new/x86/legacyvar.h b/include.new/x86/legacyvar.h
deleted file mode 100644
index 84f57f2..0000000
--- a/include.new/x86/legacyvar.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- *
- * 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: releng/10.2/sys/x86/include/legacyvar.h 280970 2015-04-01 21:48:54Z jhb $
- */
-
-#ifndef _X86_LEGACYVAR_H_
-#define	_X86_LEGACYVAR_H_
-
-enum legacy_device_ivars {
-	LEGACY_IVAR_PCIDOMAIN,
-	LEGACY_IVAR_PCIBUS,
-	LEGACY_IVAR_PCISLOT,
-	LEGACY_IVAR_PCIFUNC
-};
-
-#define LEGACY_ACCESSOR(var, ivar, type)				\
-    __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type)
-
-LEGACY_ACCESSOR(pcidomain,		PCIDOMAIN,	uint32_t)
-LEGACY_ACCESSOR(pcibus,			PCIBUS,		uint32_t)
-LEGACY_ACCESSOR(pcislot,		PCISLOT,	int)
-LEGACY_ACCESSOR(pcifunc,		PCIFUNC,	int)
-
-#undef LEGACY_ACCESSOR
-
-int	legacy_pcib_maxslots(device_t dev);
-uint32_t legacy_pcib_read_config(device_t dev, u_int bus, u_int slot,
-    u_int func, u_int reg, int bytes);
-int	legacy_pcib_read_ivar(device_t dev, device_t child, int which,
-    uintptr_t *result);
-void	legacy_pcib_write_config(device_t dev, u_int bus, u_int slot,
-    u_int func, u_int reg, uint32_t data, int bytes);
-int	legacy_pcib_write_ivar(device_t dev, device_t child, int which,
-    uintptr_t value);
-struct resource *legacy_pcib_alloc_resource(device_t dev, device_t child,
-    int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
-int	legacy_pcib_adjust_resource(device_t dev, device_t child, int type,
-    struct resource *r, u_long start, u_long end);
-int	legacy_pcib_release_resource(device_t dev, device_t child, int type,
-    int rid, struct resource *r);
-int	legacy_pcib_alloc_msi(device_t pcib, device_t dev, int count,
-    int maxcount, int *irqs);
-int	legacy_pcib_alloc_msix(device_t pcib, device_t dev, int *irq);
-int	legacy_pcib_map_msi(device_t pcib, device_t dev, int irq,
-    uint64_t *addr, uint32_t *data);
-
-#endif /* !_X86_LEGACYVAR_H_ */
diff --git a/include.new/x86/mca.h b/include.new/x86/mca.h
deleted file mode 100644
index 5c1985f..0000000
--- a/include.new/x86/mca.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2009 Hudson River Trading LLC
- * Written by: John H. Baldwin <jhb@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.
- *
- * 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: releng/10.2/sys/x86/include/mca.h 283927 2015-06-02 19:20:39Z jhb $
- */
-
-#ifndef __X86_MCA_H__
-#define	__X86_MCA_H__
-
-struct mca_record {
-	uint64_t	mr_status;
-	uint64_t	mr_addr;
-	uint64_t	mr_misc;
-	uint64_t	mr_tsc;
-	int		mr_apic_id;
-	int		mr_bank;
-	uint64_t	mr_mcg_cap;
-	uint64_t	mr_mcg_status;
-	int		mr_cpu_id;
-	int		mr_cpu_vendor_id;
-	int		mr_cpu;
-};
-
-#ifdef _KERNEL
-
-void	cmc_intr(void);
-void	mca_init(void);
-void	mca_intr(void);
-void	mca_resume(void);
-
-#endif
-
-#endif /* !__X86_MCA_H__ */
diff --git a/include.new/x86/mptable.h b/include.new/x86/mptable.h
deleted file mode 100644
index 9b77776..0000000
--- a/include.new/x86/mptable.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/*-
- * Copyright (c) 1996, by Steve Passe
- * 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. The name of the developer 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: releng/10.2/sys/x86/include/mptable.h 259837 2013-12-24 19:10:56Z jhb $
- */
-
-#ifndef __MACHINE_MPTABLE_H__
-#define	__MACHINE_MPTABLE_H__
-
-enum busTypes {
-    NOBUS = 0,
-    EISA = 3,
-    ISA = 6,
-    MCA = 9,
-    PCI = 13,
-    MAX_BUSTYPE = 18,
-    UNKNOWN_BUSTYPE = 0xff
-};
-
-/* MP Floating Pointer Structure */
-typedef struct MPFPS {
-	char    signature[4];
-	uint32_t pap;
-	u_char  length;
-	u_char  spec_rev;
-	u_char  checksum;
-	u_char  config_type;
-	u_char  mpfb2;
-	u_char  mpfb3;
-	u_char  mpfb4;
-	u_char  mpfb5;
-}      *mpfps_t;
-
-#define	MPFB2_IMCR_PRESENT	0x80
-#define	MPFB2_MUL_CLK_SRCS	0x40
-
-/* MP Configuration Table Header */
-typedef struct MPCTH {
-	char    signature[4];
-	u_short base_table_length;
-	u_char  spec_rev;
-	u_char  checksum;
-	u_char  oem_id[8];
-	u_char  product_id[12];
-	uint32_t oem_table_pointer;
-	u_short oem_table_size;
-	u_short entry_count;
-	uint32_t apic_address;
-	u_short extended_table_length;
-	u_char  extended_table_checksum;
-	u_char  reserved;
-}      *mpcth_t;
-
-/* Base table entries */
-
-#define	MPCT_ENTRY_PROCESSOR	0
-#define	MPCT_ENTRY_BUS		1
-#define	MPCT_ENTRY_IOAPIC	2
-#define	MPCT_ENTRY_INT		3
-#define	MPCT_ENTRY_LOCAL_INT	4
-
-typedef struct PROCENTRY {
-	u_char  type;
-	u_char  apic_id;
-	u_char  apic_version;
-	u_char  cpu_flags;
-	uint32_t cpu_signature;
-	uint32_t feature_flags;
-	uint32_t reserved1;
-	uint32_t reserved2;
-}      *proc_entry_ptr;
-
-#define PROCENTRY_FLAG_EN	0x01
-#define PROCENTRY_FLAG_BP	0x02
-
-typedef struct BUSENTRY {
-	u_char  type;
-	u_char  bus_id;
-	char    bus_type[6];
-}      *bus_entry_ptr;
-
-typedef struct IOAPICENTRY {
-	u_char  type;
-	u_char  apic_id;
-	u_char  apic_version;
-	u_char  apic_flags;
-	uint32_t apic_address;
-}      *io_apic_entry_ptr;
-
-#define IOAPICENTRY_FLAG_EN	0x01
-
-typedef struct INTENTRY {
-	u_char  type;
-	u_char  int_type;
-	u_short int_flags;
-	u_char  src_bus_id;
-	u_char  src_bus_irq;
-	u_char  dst_apic_id;
-	u_char  dst_apic_int;
-}      *int_entry_ptr;
-
-#define	INTENTRY_TYPE_INT  	0
-#define	INTENTRY_TYPE_NMI	1
-#define	INTENTRY_TYPE_SMI	2
-#define	INTENTRY_TYPE_EXTINT	3
-
-#define	INTENTRY_FLAGS_POLARITY			0x3
-#define	INTENTRY_FLAGS_POLARITY_CONFORM		0x0
-#define	INTENTRY_FLAGS_POLARITY_ACTIVEHI	0x1
-#define	INTENTRY_FLAGS_POLARITY_ACTIVELO	0x3
-#define	INTENTRY_FLAGS_TRIGGER			0xc
-#define	INTENTRY_FLAGS_TRIGGER_CONFORM		0x0
-#define	INTENTRY_FLAGS_TRIGGER_EDGE		0x4
-#define	INTENTRY_FLAGS_TRIGGER_LEVEL		0xc
-
-/* Extended table entries */
-
-typedef	struct EXTENTRY {
-	u_char	type;
-	u_char	length;
-}      *ext_entry_ptr;
-
-#define	MPCT_EXTENTRY_SAS	0x80
-#define	MPCT_EXTENTRY_BHD	0x81
-#define	MPCT_EXTENTRY_CBASM	0x82
-
-typedef struct SASENTRY {
-	u_char	type;
-	u_char	length;
-	u_char	bus_id;
-	u_char	address_type;
-	uint64_t address_base;
-	uint64_t address_length;
-} __attribute__((__packed__)) *sas_entry_ptr;
-
-#define	SASENTRY_TYPE_IO	0
-#define	SASENTRY_TYPE_MEMORY	1
-#define	SASENTRY_TYPE_PREFETCH	2
-
-typedef struct BHDENTRY {
-	u_char	type;
-	u_char	length;
-	u_char	bus_id;
-	u_char	bus_info;
-	u_char	parent_bus;
-	u_char	reserved[3];
-}      *bhd_entry_ptr;
-
-#define	BHDENTRY_INFO_SUBTRACTIVE_DECODE	0x1
-
-typedef struct CBASMENTRY {
-	u_char	type;
-	u_char	length;
-	u_char	bus_id;
-	u_char	address_mod;
-	u_int	predefined_range;
-}      *cbasm_entry_ptr;
-
-#define	CBASMENTRY_ADDRESS_MOD_ADD		0x0
-#define	CBASMENTRY_ADDRESS_MOD_SUBTRACT		0x1
-
-#define	CBASMENTRY_RANGE_ISA_IO		0
-#define	CBASMENTRY_RANGE_VGA_IO		1
-
-/* descriptions of MP table entries */
-typedef struct BASETABLE_ENTRY {
-	u_char  type;
-	u_char  length;
-	char    name[16];
-}       basetable_entry;
-
-#ifdef _KERNEL
-struct mptable_hostb_softc {
-#ifdef NEW_PCIB
-	struct pcib_host_resources sc_host_res;
-	int		sc_decodes_vga_io;
-	int		sc_decodes_isa_io;
-#endif
-};
-
-#ifdef NEW_PCIB
-void	mptable_pci_host_res_init(device_t pcib);
-#endif
-int	mptable_pci_probe_table(int bus);
-int	mptable_pci_route_interrupt(device_t pcib, device_t dev, int pin);
-#endif
-#endif /* !__MACHINE_MPTABLE_H__ */
diff --git a/include.new/x86/ofw_machdep.h b/include.new/x86/ofw_machdep.h
deleted file mode 100644
index 0c3bbad..0000000
--- a/include.new/x86/ofw_machdep.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2013 Juniper Networks, Inc.
- * 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.
- *
- * 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: releng/10.2/sys/x86/include/ofw_machdep.h 266084 2014-05-14 19:18:58Z ian $
- */
-
-#ifndef _MACHINE_OFW_MACHDEP_H_
-#define _MACHINE_OFW_MACHDEP_H_
-
-#include <x86/bus.h>
-#include <vm/vm.h>
-
-typedef	uint32_t	cell_t;
-
-struct mem_region {
-	vm_offset_t	mr_start;
-	vm_size_t	mr_size;
-};
-
-#endif /* _MACHINE_OFW_MACHDEP_H_ */
diff --git a/include.new/x86/pci_cfgreg.h b/include.new/x86/pci_cfgreg.h
deleted file mode 100644
index 06c8e52..0000000
--- a/include.new/x86/pci_cfgreg.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1997, Stefan Esser <se@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/x86/include/pci_cfgreg.h 223440 2011-06-22 21:04:13Z jhb $
- *
- */
-
-#ifndef __X86_PCI_CFGREG_H__
-#define	__X86_PCI_CFGREG_H__
-
-#define CONF1_ADDR_PORT    0x0cf8
-#define CONF1_DATA_PORT    0x0cfc
-
-#define CONF1_ENABLE       0x80000000ul
-#define CONF1_ENABLE_CHK   0x80000000ul
-#define CONF1_ENABLE_MSK   0x7f000000ul
-#define CONF1_ENABLE_CHK1  0xff000001ul
-#define CONF1_ENABLE_MSK1  0x80000001ul
-#define CONF1_ENABLE_RES1  0x80000000ul
-
-#define CONF2_ENABLE_PORT  0x0cf8
-#define CONF2_FORWARD_PORT 0x0cfa
-
-#define CONF2_ENABLE_CHK   0x0e
-#define CONF2_ENABLE_RES   0x0e
-
-u_long		hostb_alloc_start(int type, u_long start, u_long end, u_long count);
-int		pcie_cfgregopen(uint64_t base, uint8_t minbus, uint8_t maxbus);
-int		pci_cfgregopen(void);
-uint32_t	pci_cfgregread(int bus, int slot, int func, int reg, int bytes);
-void		pci_cfgregwrite(int bus, int slot, int func, int reg, uint32_t data, int bytes);
-#ifdef __HAVE_PIR
-void		pci_pir_open(void);
-int		pci_pir_probe(int bus, int require_parse);
-int		pci_pir_route_interrupt(int bus, int device, int func, int pin);
-#endif
-
-#endif /* !__X86_PCI_CFGREG_H__ */
diff --git a/include.new/x86/psl.h b/include.new/x86/psl.h
deleted file mode 100644
index 688b899..0000000
--- a/include.new/x86/psl.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)psl.h	5.2 (Berkeley) 1/18/91
- * $FreeBSD: releng/10.2/sys/x86/include/psl.h 258559 2013-11-25 15:58:48Z emaste $
- */
-
-#ifndef _MACHINE_PSL_H_
-#define	_MACHINE_PSL_H_
-
-/*
- * 386 processor status longword.
- */
-#define	PSL_C		0x00000001	/* carry bit */
-#define	PSL_PF		0x00000004	/* parity bit */
-#define	PSL_AF		0x00000010	/* bcd carry bit */
-#define	PSL_Z		0x00000040	/* zero bit */
-#define	PSL_N		0x00000080	/* negative bit */
-#define	PSL_T		0x00000100	/* trace enable bit */
-#define	PSL_I		0x00000200	/* interrupt enable bit */
-#define	PSL_D		0x00000400	/* string instruction direction bit */
-#define	PSL_V		0x00000800	/* overflow bit */
-#define	PSL_IOPL	0x00003000	/* i/o privilege level */
-#define	PSL_NT		0x00004000	/* nested task bit */
-#define	PSL_RF		0x00010000	/* resume flag bit */
-#define	PSL_VM		0x00020000	/* virtual 8086 mode bit */
-#define	PSL_AC		0x00040000	/* alignment checking */
-#define	PSL_VIF		0x00080000	/* virtual interrupt enable */
-#define	PSL_VIP		0x00100000	/* virtual interrupt pending */
-#define	PSL_ID		0x00200000	/* identification bit */
-
-/*
- * The i486 manual says that we are not supposed to change reserved flags,
- * but this is too much trouble since the reserved flags depend on the cpu
- * and setting them to their historical values works in practice.
- */
-#define	PSL_RESERVED_DEFAULT	0x00000002
-
-/*
- * Initial flags for kernel and user mode.  The kernel later inherits
- * PSL_I and some other flags from user mode.
- */
-#define	PSL_KERNEL	PSL_RESERVED_DEFAULT
-#define	PSL_USER	(PSL_RESERVED_DEFAULT | PSL_I)
-
-/*
- * Bits that can be changed in user mode on 486's.  We allow these bits
- * to be changed using ptrace(), sigreturn() and procfs.  Setting PS_NT
- * is undesirable but it may as well be allowed since users can inflict
- * it on the kernel directly.  Changes to PSL_AC are silently ignored on
- * 386's.
- *
- * Users are allowed to change the privileged flag PSL_RF.  The cpu sets PSL_RF
- * in tf_eflags for faults.  Debuggers should sometimes set it there too.
- * tf_eflags is kept in the signal context during signal handling and there is
- * no other place to remember it, so the PSL_RF bit may be corrupted by the
- * signal handler without us knowing.  Corruption of the PSL_RF bit at worst
- * causes one more or one less debugger trap, so allowing it is fairly
- * harmless.   
- */
-#define	PSL_USERCHANGE (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_T \
-			| PSL_D | PSL_V | PSL_NT | PSL_RF | PSL_AC | PSL_ID)
-
-#endif /* !_MACHINE_PSL_H_ */
diff --git a/include.new/x86/ptrace.h b/include.new/x86/ptrace.h
deleted file mode 100644
index ffd2ff2..0000000
--- a/include.new/x86/ptrace.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- *
- *	@(#)ptrace.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: releng/10.2/sys/x86/include/ptrace.h 279211 2015-02-23 18:38:41Z jhb $
- */
-
-#ifndef _MACHINE_PTRACE_H_
-#define _MACHINE_PTRACE_H_
-
-#define	__HAVE_PTRACE_MACHDEP
-
-/*
- * On amd64 (PT_FIRSTMACH + 0) and (PT_FIRSTMACH + 1) are old values for
- * PT_GETXSTATE_OLD and PT_SETXSTATE_OLD.  They should not be (re)used.
- */
-
-#ifdef __i386__
-#define	PT_GETXMMREGS	(PT_FIRSTMACH + 0)
-#define	PT_SETXMMREGS	(PT_FIRSTMACH + 1)
-#endif
-#ifdef _KERNEL
-#define	PT_GETXSTATE_OLD (PT_FIRSTMACH + 2)
-#define	PT_SETXSTATE_OLD (PT_FIRSTMACH + 3)
-#endif
-#define	PT_GETXSTATE_INFO (PT_FIRSTMACH + 4)
-#define	PT_GETXSTATE	(PT_FIRSTMACH + 5)
-#define	PT_SETXSTATE	(PT_FIRSTMACH + 6)
-
-/* Argument structure for PT_GETXSTATE_INFO. */
-struct ptrace_xstate_info {
-	uint64_t	xsave_mask;
-	uint32_t	xsave_len;
-};
-
-#endif
diff --git a/include.new/x86/reg.h b/include.new/x86/reg.h
deleted file mode 100644
index 174ffa4..0000000
--- a/include.new/x86/reg.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*-
- * Copyright (c) 2003 Peter Wemm.
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD: releng/10.2/sys/x86/include/reg.h 283910 2015-06-02 14:54:53Z jhb $
- */
-
-#ifndef _MACHINE_REG_H_
-#define	_MACHINE_REG_H_
-
-#include <machine/_types.h>
-
-#ifdef __i386__
-/*
- * Indices for registers in `struct trapframe' and `struct regs'.
- *
- * This interface is deprecated.  In the kernel, it is only used in FPU
- * emulators to convert from register numbers encoded in instructions to
- * register values.  Everything else just accesses the relevant struct
- * members.  In userland, debuggers tend to abuse this interface since
- * they don't understand that `struct regs' is a struct.  I hope they have
- * stopped accessing the registers in the trap frame via PT_{READ,WRITE}_U
- * and we can stop supporting the user area soon.
- */
-#define	tFS	(0)
-#define	tES	(1)
-#define	tDS	(2)
-#define	tEDI	(3)
-#define	tESI	(4)
-#define	tEBP	(5)
-#define	tISP	(6)
-#define	tEBX	(7)
-#define	tEDX	(8)
-#define	tECX	(9)
-#define	tEAX	(10)
-#define	tERR	(12)
-#define	tEIP	(13)
-#define	tCS	(14)
-#define	tEFLAGS	(15)
-#define	tESP	(16)
-#define	tSS	(17)
-
-/*
- * Indices for registers in `struct regs' only.
- *
- * Some registers live in the pcb and are only in an "array" with the
- * other registers in application interfaces that copy all the registers
- * to or from a `struct regs'.
- */
-#define	tGS	(18)
-#endif /* __i386__ */
-
-/* Rename the structs below depending on the machine architecture. */
-#ifdef	__i386__
-#define	__reg32		reg
-#define	__fpreg32	fpreg
-#define	__dbreg32	dbreg
-#else
-#define	__reg32		reg32
-#define	__reg64		reg
-#define	__fpreg32	fpreg32
-#define	__fpreg64	fpreg
-#define	__dbreg32	dbreg32
-#define	__dbreg64	dbreg
-#define	__HAVE_REG32
-#endif
-
-/*
- * Register set accessible via /proc/$pid/regs and PT_{SET,GET}REGS.
- */
-struct __reg32 {
-	__uint32_t	r_fs;
-	__uint32_t	r_es;
-	__uint32_t	r_ds;
-	__uint32_t	r_edi;
-	__uint32_t	r_esi;
-	__uint32_t	r_ebp;
-	__uint32_t	r_isp;
-	__uint32_t	r_ebx;
-	__uint32_t	r_edx;
-	__uint32_t	r_ecx;
-	__uint32_t	r_eax;
-	__uint32_t	r_trapno;
-	__uint32_t	r_err;
-	__uint32_t	r_eip;
-	__uint32_t	r_cs;
-	__uint32_t	r_eflags;
-	__uint32_t	r_esp;
-	__uint32_t	r_ss;
-	__uint32_t	r_gs;
-};
-
-struct __reg64 {
-	__int64_t	r_r15;
-	__int64_t	r_r14;
-	__int64_t	r_r13;
-	__int64_t	r_r12;
-	__int64_t	r_r11;
-	__int64_t	r_r10;
-	__int64_t	r_r9;
-	__int64_t	r_r8;
-	__int64_t	r_rdi;
-	__int64_t	r_rsi;
-	__int64_t	r_rbp;
-	__int64_t	r_rbx;
-	__int64_t	r_rdx;
-	__int64_t	r_rcx;
-	__int64_t	r_rax;
-	__uint32_t	r_trapno;
-	__uint16_t	r_fs;
-	__uint16_t	r_gs;
-	__uint32_t	r_err;
-	__uint16_t	r_es;
-	__uint16_t	r_ds;
-	__int64_t	r_rip;
-	__int64_t	r_cs;
-	__int64_t	r_rflags;
-	__int64_t	r_rsp;
-	__int64_t	r_ss;
-};
-
-/*
- * Register set accessible via /proc/$pid/fpregs.
- *
- * XXX should get struct from fpu.h.  Here we give a slightly
- * simplified struct.  This may be too much detail.  Perhaps
- * an array of unsigned longs is best.
- */
-struct __fpreg32 {
-	__uint32_t	fpr_env[7];
-	__uint8_t	fpr_acc[8][10];
-	__uint32_t	fpr_ex_sw;
-	__uint8_t	fpr_pad[64];
-};
-
-struct __fpreg64 {
-	__uint64_t	fpr_env[4];
-	__uint8_t	fpr_acc[8][16];
-	__uint8_t	fpr_xacc[16][16];
-	__uint64_t	fpr_spare[12];
-};
-
-/*
- * Register set accessible via PT_GETXMMREGS (i386).
- */
-struct xmmreg {
-	/*
-	 * XXX should get struct from npx.h.  Here we give a slightly
-	 * simplified struct.  This may be too much detail.  Perhaps
-	 * an array of unsigned longs is best.
-	 */
-	__uint32_t	xmm_env[8];
-	__uint8_t	xmm_acc[8][16];
-	__uint8_t	xmm_reg[8][16];
-	__uint8_t	xmm_pad[224];
-};
-
-/*
- * Register set accessible via /proc/$pid/dbregs.
- */
-struct __dbreg32 {
-	__uint32_t	dr[8];	/* debug registers */
-				/* Index 0-3: debug address registers */
-				/* Index 4-5: reserved */
-				/* Index 6: debug status */
-				/* Index 7: debug control */
-};
-
-struct __dbreg64 {
-	__uint64_t	dr[16];	/* debug registers */
-				/* Index 0-3: debug address registers */
-				/* Index 4-5: reserved */
-				/* Index 6: debug status */
-				/* Index 7: debug control */
-				/* Index 8-15: reserved */
-};
-
-#define	DBREG_DR7_LOCAL_ENABLE	0x01
-#define	DBREG_DR7_GLOBAL_ENABLE	0x02
-#define	DBREG_DR7_LEN_1		0x00	/* 1 byte length          */
-#define	DBREG_DR7_LEN_2		0x01
-#define	DBREG_DR7_LEN_4		0x03
-#define	DBREG_DR7_LEN_8		0x02
-#define	DBREG_DR7_EXEC		0x00	/* break on execute       */
-#define	DBREG_DR7_WRONLY	0x01	/* break on write         */
-#define	DBREG_DR7_RDWR		0x03	/* break on read or write */
-#define	DBREG_DR7_MASK(i)	\
-	((__u_register_t)(0xf) << ((i) * 4 + 16) | 0x3 << (i) * 2)
-#define	DBREG_DR7_SET(i, len, access, enable)				\
-	((__u_register_t)((len) << 2 | (access)) << ((i) * 4 + 16) | 	\
-	(enable) << (i) * 2)
-#define	DBREG_DR7_GD		0x2000
-#define	DBREG_DR7_ENABLED(d, i)	(((d) & 0x3 << (i) * 2) != 0)
-#define	DBREG_DR7_ACCESS(d, i)	((d) >> ((i) * 4 + 16) & 0x3)
-#define	DBREG_DR7_LEN(d, i)	((d) >> ((i) * 4 + 18) & 0x3)
-
-#define	DBREG_DRX(d,x)	((d)->dr[(x)])	/* reference dr0 - dr7 by
-					   register number */
-
-#undef __reg32
-#undef __reg64
-#undef __fpreg32
-#undef __fpreg64
-#undef __dbreg32
-#undef __dbreg64
-
-#ifdef _KERNEL
-/*
- * XXX these interfaces are MI, so they should be declared in a MI place.
- */
-int	fill_regs(struct thread *, struct reg *);
-int	fill_frame_regs(struct trapframe *, struct reg *);
-int	set_regs(struct thread *, struct reg *);
-int	fill_fpregs(struct thread *, struct fpreg *);
-int	set_fpregs(struct thread *, struct fpreg *);
-int	fill_dbregs(struct thread *, struct dbreg *);
-int	set_dbregs(struct thread *, struct dbreg *);
-#ifdef COMPAT_FREEBSD32
-int	fill_regs32(struct thread *, struct reg32 *);
-int	set_regs32(struct thread *, struct reg32 *);
-int	fill_fpregs32(struct thread *, struct fpreg32 *);
-int	set_fpregs32(struct thread *, struct fpreg32 *);
-int	fill_dbregs32(struct thread *, struct dbreg32 *);
-int	set_dbregs32(struct thread *, struct dbreg32 *);
-#endif
-#endif
-
-#endif /* !_MACHINE_REG_H_ */
diff --git a/include.new/x86/segments.h b/include.new/x86/segments.h
deleted file mode 100644
index 20a996d..0000000
--- a/include.new/x86/segments.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*-
- * Copyright (c) 1989, 1990 William F. Jolitz
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)segments.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: releng/10.2/sys/x86/include/segments.h 255040 2013-08-29 19:52:18Z gibbs $
- */
-
-#ifndef _X86_SEGMENTS_H_
-#define	_X86_SEGMENTS_H_
-
-/*
- * X86 Segmentation Data Structures and definitions
- */
-
-/*
- * Selectors
- */
-#define	SEL_RPL_MASK	3		/* requester priv level */
-#define	ISPL(s)		((s)&3)		/* priority level of a selector */
-#ifdef XEN
-#define	SEL_KPL		1		/* kernel priority level */
-#else
-#define	SEL_KPL		0		/* kernel priority level */
-#endif
-#define	SEL_UPL		3		/* user priority level */
-#define	ISLDT(s)	((s)&SEL_LDT)	/* is it local or global */
-#define	SEL_LDT		4		/* local descriptor table */
-#define	IDXSEL(s)	(((s)>>3) & 0x1fff) /* index of selector */
-#define	LSEL(s,r)	(((s)<<3) | SEL_LDT | r) /* a local selector */
-#define	GSEL(s,r)	(((s)<<3) | r)	/* a global selector */
-
-/*
- * User segment descriptors (%cs, %ds etc for i386 apps. 64 bit wide)
- * For long-mode apps, %cs only has the conforming bit in sd_type, the sd_dpl,
- * sd_p, sd_l and sd_def32 which must be zero).  %ds only has sd_p.
- */
-struct segment_descriptor {
-	unsigned sd_lolimit:16;		/* segment extent (lsb) */
-	unsigned sd_lobase:24;		/* segment base address (lsb) */
-	unsigned sd_type:5;		/* segment type */
-	unsigned sd_dpl:2;		/* segment descriptor priority level */
-	unsigned sd_p:1;		/* segment descriptor present */
-	unsigned sd_hilimit:4;		/* segment extent (msb) */
-	unsigned sd_xx:2;		/* unused */
-	unsigned sd_def32:1;		/* default 32 vs 16 bit size */
-	unsigned sd_gran:1;		/* limit granularity (byte/page units)*/
-	unsigned sd_hibase:8;		/* segment base address  (msb) */
-} __packed;
-
-struct user_segment_descriptor {
-	unsigned sd_lolimit:16;		/* segment extent (lsb) */
-	unsigned sd_lobase:24;		/* segment base address (lsb) */
-	unsigned sd_type:5;		/* segment type */
-	unsigned sd_dpl:2;		/* segment descriptor priority level */
-	unsigned sd_p:1;		/* segment descriptor present */
-	unsigned sd_hilimit:4;		/* segment extent (msb) */
-	unsigned sd_xx:1;		/* unused */
-	unsigned sd_long:1;		/* long mode (cs only) */
-	unsigned sd_def32:1;		/* default 32 vs 16 bit size */
-	unsigned sd_gran:1;		/* limit granularity (byte/page units)*/
-	unsigned sd_hibase:8;		/* segment base address  (msb) */
-} __packed;
-
-#define	USD_GETBASE(sd)		(((sd)->sd_lobase) | (sd)->sd_hibase << 24)
-#define	USD_SETBASE(sd, b)	(sd)->sd_lobase = (b);	\
-				(sd)->sd_hibase = ((b) >> 24);
-#define	USD_GETLIMIT(sd)	(((sd)->sd_lolimit) | (sd)->sd_hilimit << 16)
-#define	USD_SETLIMIT(sd, l)	(sd)->sd_lolimit = (l);	\
-				(sd)->sd_hilimit = ((l) >> 16);
-
-#ifdef __i386__
-/*
- * Gate descriptors (e.g. indirect descriptors)
- */
-struct gate_descriptor {
-	unsigned gd_looffset:16;	/* gate offset (lsb) */
-	unsigned gd_selector:16;	/* gate segment selector */
-	unsigned gd_stkcpy:5;		/* number of stack wds to cpy */
-	unsigned gd_xx:3;		/* unused */
-	unsigned gd_type:5;		/* segment type */
-	unsigned gd_dpl:2;		/* segment descriptor priority level */
-	unsigned gd_p:1;		/* segment descriptor present */
-	unsigned gd_hioffset:16;	/* gate offset (msb) */
-} __packed;
-
-/*
- * Generic descriptor
- */
-union descriptor {
-	struct segment_descriptor sd;
-	struct gate_descriptor gd;
-};
-#else
-/*
- * Gate descriptors (e.g. indirect descriptors, trap, interrupt etc. 128 bit)
- * Only interrupt and trap gates have gd_ist.
- */
-struct gate_descriptor {
-	uint64_t gd_looffset:16;	/* gate offset (lsb) */
-	uint64_t gd_selector:16;	/* gate segment selector */
-	uint64_t gd_ist:3;		/* IST table index */
-	uint64_t gd_xx:5;		/* unused */
-	uint64_t gd_type:5;		/* segment type */
-	uint64_t gd_dpl:2;		/* segment descriptor priority level */
-	uint64_t gd_p:1;		/* segment descriptor present */
-	uint64_t gd_hioffset:48;	/* gate offset (msb) */
-	uint64_t sd_xx1:32;
-} __packed;
-
-/*
- * Generic descriptor
- */
-union descriptor {
-	struct user_segment_descriptor sd;
-	struct gate_descriptor gd;
-};
-#endif
-
-	/* system segments and gate types */
-#define	SDT_SYSNULL	 0	/* system null */
-#define	SDT_SYS286TSS	 1	/* system 286 TSS available */
-#define	SDT_SYSLDT	 2	/* system local descriptor table */
-#define	SDT_SYS286BSY	 3	/* system 286 TSS busy */
-#define	SDT_SYS286CGT	 4	/* system 286 call gate */
-#define	SDT_SYSTASKGT	 5	/* system task gate */
-#define	SDT_SYS286IGT	 6	/* system 286 interrupt gate */
-#define	SDT_SYS286TGT	 7	/* system 286 trap gate */
-#define	SDT_SYSNULL2	 8	/* system null again */
-#define	SDT_SYS386TSS	 9	/* system 386 TSS available */
-#define	SDT_SYSTSS	 9	/* system available 64 bit TSS */
-#define	SDT_SYSNULL3	10	/* system null again */
-#define	SDT_SYS386BSY	11	/* system 386 TSS busy */
-#define	SDT_SYSBSY	11	/* system busy 64 bit TSS */
-#define	SDT_SYS386CGT	12	/* system 386 call gate */
-#define	SDT_SYSCGT	12	/* system 64 bit call gate */
-#define	SDT_SYSNULL4	13	/* system null again */
-#define	SDT_SYS386IGT	14	/* system 386 interrupt gate */
-#define	SDT_SYSIGT	14	/* system 64 bit interrupt gate */
-#define	SDT_SYS386TGT	15	/* system 386 trap gate */
-#define	SDT_SYSTGT	15	/* system 64 bit trap gate */
-
-	/* memory segment types */
-#define	SDT_MEMRO	16	/* memory read only */
-#define	SDT_MEMROA	17	/* memory read only accessed */
-#define	SDT_MEMRW	18	/* memory read write */
-#define	SDT_MEMRWA	19	/* memory read write accessed */
-#define	SDT_MEMROD	20	/* memory read only expand dwn limit */
-#define	SDT_MEMRODA	21	/* memory read only expand dwn limit accessed */
-#define	SDT_MEMRWD	22	/* memory read write expand dwn limit */
-#define	SDT_MEMRWDA	23	/* memory read write expand dwn limit accessed*/
-#define	SDT_MEME	24	/* memory execute only */
-#define	SDT_MEMEA	25	/* memory execute only accessed */
-#define	SDT_MEMER	26	/* memory execute read */
-#define	SDT_MEMERA	27	/* memory execute read accessed */
-#define	SDT_MEMEC	28	/* memory execute only conforming */
-#define	SDT_MEMEAC	29	/* memory execute only accessed conforming */
-#define	SDT_MEMERC	30	/* memory execute read conforming */
-#define	SDT_MEMERAC	31	/* memory execute read accessed conforming */
-
-/*
- * Size of IDT table
- */
-#define	NIDT		256	/* 32 reserved, 0x80 syscall, most are h/w */
-#define	NRSVIDT		32	/* reserved entries for cpu exceptions */
-
-/*
- * Entries in the Interrupt Descriptor Table (IDT)
- */
-#define	IDT_DE		0	/* #DE: Divide Error */
-#define	IDT_DB		1	/* #DB: Debug */
-#define	IDT_NMI		2	/* Nonmaskable External Interrupt */
-#define	IDT_BP		3	/* #BP: Breakpoint */
-#define	IDT_OF		4	/* #OF: Overflow */
-#define	IDT_BR		5	/* #BR: Bound Range Exceeded */
-#define	IDT_UD		6	/* #UD: Undefined/Invalid Opcode */
-#define	IDT_NM		7	/* #NM: No Math Coprocessor */
-#define	IDT_DF		8	/* #DF: Double Fault */
-#define	IDT_FPUGP	9	/* Coprocessor Segment Overrun */
-#define	IDT_TS		10	/* #TS: Invalid TSS */
-#define	IDT_NP		11	/* #NP: Segment Not Present */
-#define	IDT_SS		12	/* #SS: Stack Segment Fault */
-#define	IDT_GP		13	/* #GP: General Protection Fault */
-#define	IDT_PF		14	/* #PF: Page Fault */
-#define	IDT_MF		16	/* #MF: FPU Floating-Point Error */
-#define	IDT_AC		17	/* #AC: Alignment Check */
-#define	IDT_MC		18	/* #MC: Machine Check */
-#define	IDT_XF		19	/* #XF: SIMD Floating-Point Exception */
-#define	IDT_IO_INTS	NRSVIDT	/* Base of IDT entries for I/O interrupts. */
-#define	IDT_SYSCALL	0x80	/* System Call Interrupt Vector */
-#define	IDT_DTRACE_RET	0x92	/* DTrace pid provider Interrupt Vector */
-#define	IDT_EVTCHN	0x93	/* Xen HVM Event Channel Interrupt Vector */
-
-#if defined(__i386__) || defined(__ia64__)
-/*
- * Entries in the Global Descriptor Table (GDT)
- * Note that each 4 entries share a single 32 byte L1 cache line.
- * Some of the fast syscall instructions require a specific order here.
- */
-#define	GNULL_SEL	0	/* Null Descriptor */
-#define	GPRIV_SEL	1	/* SMP Per-Processor Private Data */
-#define	GUFS_SEL	2	/* User %fs Descriptor (order critical: 1) */
-#define	GUGS_SEL	3	/* User %gs Descriptor (order critical: 2) */
-#define	GCODE_SEL	4	/* Kernel Code Descriptor (order critical: 1) */
-#define	GDATA_SEL	5	/* Kernel Data Descriptor (order critical: 2) */
-#define	GUCODE_SEL	6	/* User Code Descriptor (order critical: 3) */
-#define	GUDATA_SEL	7	/* User Data Descriptor (order critical: 4) */
-#define	GBIOSLOWMEM_SEL	8	/* BIOS low memory access (must be entry 8) */
-#define	GPROC0_SEL	9	/* Task state process slot zero and up */
-#define	GLDT_SEL	10	/* Default User LDT */
-#define	GUSERLDT_SEL	11	/* User LDT */
-#define	GPANIC_SEL	12	/* Task state to consider panic from */
-#define	GBIOSCODE32_SEL	13	/* BIOS interface (32bit Code) */
-#define	GBIOSCODE16_SEL	14	/* BIOS interface (16bit Code) */
-#define	GBIOSDATA_SEL	15	/* BIOS interface (Data) */
-#define	GBIOSUTIL_SEL	16	/* BIOS interface (Utility) */
-#define	GBIOSARGS_SEL	17	/* BIOS interface (Arguments) */
-#define	GNDIS_SEL	18	/* For the NDIS layer */
-#ifdef XEN
-#define	NGDT		9
-#else
-#define	NGDT		19
-#endif
-
-/*
- * Entries in the Local Descriptor Table (LDT)
- */
-#define	LSYS5CALLS_SEL	0	/* forced by intel BCS */
-#define	LSYS5SIGR_SEL	1
-#define	L43BSDCALLS_SEL	2	/* notyet */
-#define	LUCODE_SEL	3
-#define	LSOL26CALLS_SEL	4	/* Solaris >= 2.6 system call gate */
-#define	LUDATA_SEL	5
-/* separate stack, es,fs,gs sels ? */
-/* #define	LPOSIXCALLS_SEL	5*/	/* notyet */
-#define	LBSDICALLS_SEL	16	/* BSDI system call gate */
-#define	NLDT		(LBSDICALLS_SEL + 1)
-
-#else /* !__i386__ && !__ia64__ */
-/*
- * Entries in the Global Descriptor Table (GDT)
- */
-#define	GNULL_SEL	0	/* Null Descriptor */
-#define	GNULL2_SEL	1	/* Null Descriptor */
-#define	GUFS32_SEL	2	/* User 32 bit %fs Descriptor */
-#define	GUGS32_SEL	3	/* User 32 bit %gs Descriptor */
-#define	GCODE_SEL	4	/* Kernel Code Descriptor */
-#define	GDATA_SEL	5	/* Kernel Data Descriptor */
-#define	GUCODE32_SEL	6	/* User 32 bit code Descriptor */
-#define	GUDATA_SEL	7	/* User 32/64 bit Data Descriptor */
-#define	GUCODE_SEL	8	/* User 64 bit Code Descriptor */
-#define	GPROC0_SEL	9	/* TSS for entering kernel etc */
-/* slot 10 is second half of GPROC0_SEL */
-#define	GUSERLDT_SEL	11	/* LDT */
-/* slot 12 is second half of GUSERLDT_SEL */
-#define	NGDT 		13
-#endif /* __i386__ || __ia64__ */
-
-#endif /* !_X86_SEGMENTS_H_ */
diff --git a/include.new/x86/setjmp.h b/include.new/x86/setjmp.h
deleted file mode 100644
index e563d14..0000000
--- a/include.new/x86/setjmp.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- *
- * $FreeBSD: releng/10.2/sys/x86/include/setjmp.h 232275 2012-02-28 22:17:52Z tijl $
- */
-
-#ifndef _MACHINE_SETJMP_H_
-#define	_MACHINE_SETJMP_H_
-
-#include <sys/cdefs.h>
-
-#define	_JBLEN	12		/* Size of the jmp_buf on AMD64. */
-
-/*
- * jmp_buf and sigjmp_buf are encapsulated in different structs to force
- * compile-time diagnostics for mismatches.  The structs are the same
- * internally to avoid some run-time errors for mismatches.
- */
-#if __BSD_VISIBLE || __POSIX_VISIBLE || __XSI_VISIBLE
-typedef	struct _sigjmp_buf { long _sjb[_JBLEN]; } sigjmp_buf[1];
-#endif
-
-typedef	struct _jmp_buf { long _jb[_JBLEN]; } jmp_buf[1];
-
-#endif /* !_MACHINE_SETJMP_H_ */
diff --git a/include.new/x86/sigframe.h b/include.new/x86/sigframe.h
deleted file mode 100644
index 2c211b9..0000000
--- a/include.new/x86/sigframe.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 1999 Marcel Moolenaar
- * 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 
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/x86/include/sigframe.h 247047 2013-02-20 17:39:52Z kib $
- */
-
-#ifndef _X86_SIGFRAME_H_
-#define	_X86_SIGFRAME_H_
-
-/*
- * Signal frames, arguments passed to application signal handlers.
- */
-
-#ifdef __i386__
-struct sigframe {
-	/*
-	 * The first four members may be used by applications.
-	 *
-	 * NOTE: The 4th argument is undocumented, ill commented
-	 * on and seems to be somewhat BSD "standard".  Handlers
-	 * installed with sigvec may be using it.
-	 */
-	register_t	sf_signum;
-	register_t	sf_siginfo;	/* code or pointer to sf_si */
-	register_t	sf_ucontext;	/* points to sf_uc */
-	register_t	sf_addr;	/* undocumented 4th arg */
-
-	union {
-		__siginfohandler_t	*sf_action;
-		__sighandler_t		*sf_handler;
-	} sf_ahu;
-	ucontext_t	sf_uc;		/* = *sf_ucontext */
-	siginfo_t	sf_si;		/* = *sf_siginfo (SA_SIGINFO case) */
-};
-#endif /* __i386__ */
-
-#ifdef __amd64__
-struct sigframe {
-	union {
-		__siginfohandler_t	*sf_action;
-		__sighandler_t		*sf_handler;
-	} sf_ahu;
-	ucontext_t	sf_uc;		/* = *sf_ucontext */
-	siginfo_t	sf_si;		/* = *sf_siginfo (SA_SIGINFO case) */
-};
-#endif /* __amd64__ */
-
-#endif /* _X86_SIGFRAME_H_ */
diff --git a/include.new/x86/signal.h b/include.new/x86/signal.h
deleted file mode 100644
index 4626030..0000000
--- a/include.new/x86/signal.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*-
- * Copyright (c) 1986, 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 2003 Peter Wemm.
- *
- * 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.
- * 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.
- *
- *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: releng/10.2/sys/x86/include/signal.h 247047 2013-02-20 17:39:52Z kib $
- */
-
-#ifndef _X86_SIGNAL_H
-#define	_X86_SIGNAL_H 1
-
-/*
- * Machine-dependent signal definitions
- */
-
-#include <sys/cdefs.h>
-#include <sys/_sigset.h>
-
-#if __BSD_VISIBLE
-#include <machine/trap.h>	/* codes for SIGILL, SIGFPE */
-#endif
-
-#ifdef __i386__
-typedef int sig_atomic_t;
-
-#if __BSD_VISIBLE
-struct sigcontext {
-	struct __sigset sc_mask;	/* signal mask to restore */
-	int	sc_onstack;		/* sigstack state to restore */
-	int	sc_gs;			/* machine state (struct trapframe) */
-	int	sc_fs;
-	int	sc_es;
-	int	sc_ds;
-	int	sc_edi;
-	int	sc_esi;
-	int	sc_ebp;
-	int	sc_isp;
-	int	sc_ebx;
-	int	sc_edx;
-	int	sc_ecx;
-	int	sc_eax;
-	int	sc_trapno;
-	int	sc_err;
-	int	sc_eip;
-	int	sc_cs;
-	int	sc_efl;
-	int	sc_esp;
-	int	sc_ss;
-	int	sc_len;			/* sizeof(mcontext_t) */
-	/*
-	 * See <machine/ucontext.h> and <machine/npx.h> for
-	 * the following fields.
-	 */
-	int	sc_fpformat;
-	int	sc_ownedfp;
-	int	sc_flags;
-	int	sc_fpstate[128] __aligned(16);
-
-	int	sc_fsbase;
-	int	sc_gsbase;
-
-	int	sc_xfpustate;
-	int	sc_xfpustate_len;
-
-	int	sc_spare2[4];
-};
-
-#define	sc_sp		sc_esp
-#define	sc_fp		sc_ebp
-#define	sc_pc		sc_eip
-#define	sc_ps		sc_efl
-#define	sc_eflags	sc_efl
-
-#endif /* __BSD_VISIBLE */
-#endif /* __i386__ */
-
-#ifdef __amd64__
-typedef long sig_atomic_t;
-
-#if __BSD_VISIBLE
-/*
- * Information pushed on stack when a signal is delivered.
- * This is used by the kernel to restore state following
- * execution of the signal handler.  It is also made available
- * to the handler to allow it to restore state properly if
- * a non-standard exit is performed.
- *
- * The sequence of the fields/registers after sc_mask in struct
- * sigcontext must match those in mcontext_t and struct trapframe.
- */
-struct sigcontext {
-	struct __sigset sc_mask;	/* signal mask to restore */
-	long	sc_onstack;		/* sigstack state to restore */
-	long	sc_rdi;		/* machine state (struct trapframe) */
-	long	sc_rsi;
-	long	sc_rdx;
-	long	sc_rcx;
-	long	sc_r8;
-	long	sc_r9;
-	long	sc_rax;
-	long	sc_rbx;
-	long	sc_rbp;
-	long	sc_r10;
-	long	sc_r11;
-	long	sc_r12;
-	long	sc_r13;
-	long	sc_r14;
-	long	sc_r15;
-	int	sc_trapno;
-	short	sc_fs;
-	short	sc_gs;
-	long	sc_addr;
-	int	sc_flags;
-	short	sc_es;
-	short	sc_ds;
-	long	sc_err;
-	long	sc_rip;
-	long	sc_cs;
-	long	sc_rflags;
-	long	sc_rsp;
-	long	sc_ss;
-	long	sc_len;			/* sizeof(mcontext_t) */
-	/*
-	 * See <machine/ucontext.h> and <machine/fpu.h> for the following
-	 * fields.
-	 */
-	long	sc_fpformat;
-	long	sc_ownedfp;
-	long	sc_fpstate[64] __aligned(16);
-
-	long	sc_fsbase;
-	long	sc_gsbase;
-
-	long	sc_xfpustate;
-	long	sc_xfpustate_len;
-
-	long	sc_spare[4];
-};
-#endif /* __BSD_VISIBLE */
-#endif /* __amd64__ */
-
-#endif
diff --git a/include.new/x86/specialreg.h b/include.new/x86/specialreg.h
deleted file mode 100644
index f6bccd7..0000000
--- a/include.new/x86/specialreg.h
+++ /dev/null
@@ -1,842 +0,0 @@
-/*-
- * Copyright (c) 1991 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.
- * 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.
- *
- *	from: @(#)specialreg.h	7.1 (Berkeley) 5/9/91
- * $FreeBSD: releng/10.2/sys/x86/include/specialreg.h 284900 2015-06-28 03:22:26Z neel $
- */
-
-#ifndef _MACHINE_SPECIALREG_H_
-#define	_MACHINE_SPECIALREG_H_
-
-/*
- * Bits in 386 special registers:
- */
-#define	CR0_PE	0x00000001	/* Protected mode Enable */
-#define	CR0_MP	0x00000002	/* "Math" (fpu) Present */
-#define	CR0_EM	0x00000004	/* EMulate FPU instructions. (trap ESC only) */
-#define	CR0_TS	0x00000008	/* Task Switched (if MP, trap ESC and WAIT) */
-#define	CR0_PG	0x80000000	/* PaGing enable */
-
-/*
- * Bits in 486 special registers:
- */
-#define	CR0_NE	0x00000020	/* Numeric Error enable (EX16 vs IRQ13) */
-#define	CR0_WP	0x00010000	/* Write Protect (honor page protect in
-							   all modes) */
-#define	CR0_AM	0x00040000	/* Alignment Mask (set to enable AC flag) */
-#define	CR0_NW  0x20000000	/* Not Write-through */
-#define	CR0_CD  0x40000000	/* Cache Disable */
-
-#define	CR3_PCID_SAVE 0x8000000000000000
-
-/*
- * Bits in PPro special registers
- */
-#define	CR4_VME	0x00000001	/* Virtual 8086 mode extensions */
-#define	CR4_PVI	0x00000002	/* Protected-mode virtual interrupts */
-#define	CR4_TSD	0x00000004	/* Time stamp disable */
-#define	CR4_DE	0x00000008	/* Debugging extensions */
-#define	CR4_PSE	0x00000010	/* Page size extensions */
-#define	CR4_PAE	0x00000020	/* Physical address extension */
-#define	CR4_MCE	0x00000040	/* Machine check enable */
-#define	CR4_PGE	0x00000080	/* Page global enable */
-#define	CR4_PCE	0x00000100	/* Performance monitoring counter enable */
-#define	CR4_FXSR 0x00000200	/* Fast FPU save/restore used by OS */
-#define	CR4_XMM	0x00000400	/* enable SIMD/MMX2 to use except 16 */
-#define	CR4_VMXE 0x00002000	/* enable VMX operation (Intel-specific) */
-#define	CR4_FSGSBASE 0x00010000	/* Enable FS/GS BASE accessing instructions */
-#define	CR4_PCIDE 0x00020000	/* Enable Context ID */
-#define	CR4_XSAVE 0x00040000	/* XSETBV/XGETBV */
-#define	CR4_SMEP 0x00100000	/* Supervisor-Mode Execution Prevention */
-
-/*
- * Bits in AMD64 special registers.  EFER is 64 bits wide.
- */
-#define	EFER_SCE 0x000000001	/* System Call Extensions (R/W) */
-#define	EFER_LME 0x000000100	/* Long mode enable (R/W) */
-#define	EFER_LMA 0x000000400	/* Long mode active (R) */
-#define	EFER_NXE 0x000000800	/* PTE No-Execute bit enable (R/W) */
-#define	EFER_SVM 0x000001000	/* SVM enable bit for AMD, reserved for Intel */
-#define	EFER_LMSLE 0x000002000	/* Long Mode Segment Limit Enable */
-#define	EFER_FFXSR 0x000004000	/* Fast FXSAVE/FSRSTOR */
-#define	EFER_TCE   0x000008000	/* Translation Cache Extension */
-
-/*
- * Intel Extended Features registers
- */
-#define	XCR0	0		/* XFEATURE_ENABLED_MASK register */
-
-#define	XFEATURE_ENABLED_X87		0x00000001
-#define	XFEATURE_ENABLED_SSE		0x00000002
-#define	XFEATURE_ENABLED_YMM_HI128	0x00000004
-#define	XFEATURE_ENABLED_AVX		XFEATURE_ENABLED_YMM_HI128
-#define	XFEATURE_ENABLED_BNDREGS	0x00000008
-#define	XFEATURE_ENABLED_BNDCSR		0x00000010
-#define	XFEATURE_ENABLED_OPMASK		0x00000020
-#define	XFEATURE_ENABLED_ZMM_HI256	0x00000040
-#define	XFEATURE_ENABLED_HI16_ZMM	0x00000080
-
-#define	XFEATURE_AVX					\
-    (XFEATURE_ENABLED_X87 | XFEATURE_ENABLED_SSE | XFEATURE_ENABLED_AVX)
-#define	XFEATURE_AVX512						\
-    (XFEATURE_ENABLED_OPMASK | XFEATURE_ENABLED_ZMM_HI256 |	\
-    XFEATURE_ENABLED_HI16_ZMM)
-#define	XFEATURE_MPX					\
-    (XFEATURE_ENABLED_BNDREGS | XFEATURE_ENABLED_BNDCSR)
-
-/*
- * CPUID instruction features register
- */
-#define	CPUID_FPU	0x00000001
-#define	CPUID_VME	0x00000002
-#define	CPUID_DE	0x00000004
-#define	CPUID_PSE	0x00000008
-#define	CPUID_TSC	0x00000010
-#define	CPUID_MSR	0x00000020
-#define	CPUID_PAE	0x00000040
-#define	CPUID_MCE	0x00000080
-#define	CPUID_CX8	0x00000100
-#define	CPUID_APIC	0x00000200
-#define	CPUID_B10	0x00000400
-#define	CPUID_SEP	0x00000800
-#define	CPUID_MTRR	0x00001000
-#define	CPUID_PGE	0x00002000
-#define	CPUID_MCA	0x00004000
-#define	CPUID_CMOV	0x00008000
-#define	CPUID_PAT	0x00010000
-#define	CPUID_PSE36	0x00020000
-#define	CPUID_PSN	0x00040000
-#define	CPUID_CLFSH	0x00080000
-#define	CPUID_B20	0x00100000
-#define	CPUID_DS	0x00200000
-#define	CPUID_ACPI	0x00400000
-#define	CPUID_MMX	0x00800000
-#define	CPUID_FXSR	0x01000000
-#define	CPUID_SSE	0x02000000
-#define	CPUID_XMM	0x02000000
-#define	CPUID_SSE2	0x04000000
-#define	CPUID_SS	0x08000000
-#define	CPUID_HTT	0x10000000
-#define	CPUID_TM	0x20000000
-#define	CPUID_IA64	0x40000000
-#define	CPUID_PBE	0x80000000
-
-#define	CPUID2_SSE3	0x00000001
-#define	CPUID2_PCLMULQDQ 0x00000002
-#define	CPUID2_DTES64	0x00000004
-#define	CPUID2_MON	0x00000008
-#define	CPUID2_DS_CPL	0x00000010
-#define	CPUID2_VMX	0x00000020
-#define	CPUID2_SMX	0x00000040
-#define	CPUID2_EST	0x00000080
-#define	CPUID2_TM2	0x00000100
-#define	CPUID2_SSSE3	0x00000200
-#define	CPUID2_CNXTID	0x00000400
-#define	CPUID2_FMA	0x00001000
-#define	CPUID2_CX16	0x00002000
-#define	CPUID2_XTPR	0x00004000
-#define	CPUID2_PDCM	0x00008000
-#define	CPUID2_PCID	0x00020000
-#define	CPUID2_DCA	0x00040000
-#define	CPUID2_SSE41	0x00080000
-#define	CPUID2_SSE42	0x00100000
-#define	CPUID2_X2APIC	0x00200000
-#define	CPUID2_MOVBE	0x00400000
-#define	CPUID2_POPCNT	0x00800000
-#define	CPUID2_TSCDLT	0x01000000
-#define	CPUID2_AESNI	0x02000000
-#define	CPUID2_XSAVE	0x04000000
-#define	CPUID2_OSXSAVE	0x08000000
-#define	CPUID2_AVX	0x10000000
-#define	CPUID2_F16C	0x20000000
-#define	CPUID2_RDRAND	0x40000000
-#define	CPUID2_HV	0x80000000
-
-/*
- * Important bits in the Thermal and Power Management flags
- * CPUID.6 EAX and ECX.
- */
-#define	CPUTPM1_SENSOR	0x00000001
-#define	CPUTPM1_TURBO	0x00000002
-#define	CPUTPM1_ARAT	0x00000004
-#define	CPUTPM2_EFFREQ	0x00000001
-
-/*
- * Important bits in the AMD extended cpuid flags
- */
-#define	AMDID_SYSCALL	0x00000800
-#define	AMDID_MP	0x00080000
-#define	AMDID_NX	0x00100000
-#define	AMDID_EXT_MMX	0x00400000
-#define	AMDID_FFXSR	0x02000000
-#define	AMDID_PAGE1GB	0x04000000
-#define	AMDID_RDTSCP	0x08000000
-#define	AMDID_LM	0x20000000
-#define	AMDID_EXT_3DNOW	0x40000000
-#define	AMDID_3DNOW	0x80000000
-
-#define	AMDID2_LAHF	0x00000001
-#define	AMDID2_CMP	0x00000002
-#define	AMDID2_SVM	0x00000004
-#define	AMDID2_EXT_APIC	0x00000008
-#define	AMDID2_CR8	0x00000010
-#define	AMDID2_ABM	0x00000020
-#define	AMDID2_SSE4A	0x00000040
-#define	AMDID2_MAS	0x00000080
-#define	AMDID2_PREFETCH	0x00000100
-#define	AMDID2_OSVW	0x00000200
-#define	AMDID2_IBS	0x00000400
-#define	AMDID2_XOP	0x00000800
-#define	AMDID2_SKINIT	0x00001000
-#define	AMDID2_WDT	0x00002000
-#define	AMDID2_LWP	0x00008000
-#define	AMDID2_FMA4	0x00010000
-#define	AMDID2_TCE	0x00020000
-#define	AMDID2_NODE_ID	0x00080000
-#define	AMDID2_TBM	0x00200000
-#define	AMDID2_TOPOLOGY	0x00400000
-#define	AMDID2_PCXC	0x00800000
-#define	AMDID2_PNXC	0x01000000
-#define	AMDID2_DBE	0x04000000
-#define	AMDID2_PTSC	0x08000000
-#define	AMDID2_PTSCEL2I	0x10000000
-
-/*
- * CPUID instruction 1 eax info
- */
-#define	CPUID_STEPPING		0x0000000f
-#define	CPUID_MODEL		0x000000f0
-#define	CPUID_FAMILY		0x00000f00
-#define	CPUID_EXT_MODEL		0x000f0000
-#define	CPUID_EXT_FAMILY	0x0ff00000
-#ifdef __i386__
-#define	CPUID_TO_MODEL(id) \
-    ((((id) & CPUID_MODEL) >> 4) | \
-    ((((id) & CPUID_FAMILY) >= 0x600) ? \
-    (((id) & CPUID_EXT_MODEL) >> 12) : 0))
-#define	CPUID_TO_FAMILY(id) \
-    ((((id) & CPUID_FAMILY) >> 8) + \
-    ((((id) & CPUID_FAMILY) == 0xf00) ? \
-    (((id) & CPUID_EXT_FAMILY) >> 20) : 0))
-#else
-#define	CPUID_TO_MODEL(id) \
-    ((((id) & CPUID_MODEL) >> 4) | \
-    (((id) & CPUID_EXT_MODEL) >> 12))
-#define	CPUID_TO_FAMILY(id) \
-    ((((id) & CPUID_FAMILY) >> 8) + \
-    (((id) & CPUID_EXT_FAMILY) >> 20))
-#endif
-
-/*
- * CPUID instruction 1 ebx info
- */
-#define	CPUID_BRAND_INDEX	0x000000ff
-#define	CPUID_CLFUSH_SIZE	0x0000ff00
-#define	CPUID_HTT_CORES		0x00ff0000
-#define	CPUID_LOCAL_APIC_ID	0xff000000
-
-/*
- * CPUID instruction 5 info
- */
-#define	CPUID5_MON_MIN_SIZE	0x0000ffff	/* eax */
-#define	CPUID5_MON_MAX_SIZE	0x0000ffff	/* ebx */
-#define	CPUID5_MON_MWAIT_EXT	0x00000001	/* ecx */
-#define	CPUID5_MWAIT_INTRBREAK	0x00000002	/* ecx */
-
-/*
- * MWAIT cpu power states.  Lower 4 bits are sub-states.
- */
-#define	MWAIT_C0	0xf0
-#define	MWAIT_C1	0x00
-#define	MWAIT_C2	0x10
-#define	MWAIT_C3	0x20
-#define	MWAIT_C4	0x30
-
-/*
- * MWAIT extensions.
- */
-/* Interrupt breaks MWAIT even when masked. */
-#define	MWAIT_INTRBREAK		0x00000001
-
-/*
- * CPUID instruction 6 ecx info
- */
-#define	CPUID_PERF_STAT		0x00000001
-#define	CPUID_PERF_BIAS		0x00000008
-
-/* 
- * CPUID instruction 0xb ebx info.
- */
-#define	CPUID_TYPE_INVAL	0
-#define	CPUID_TYPE_SMT		1
-#define	CPUID_TYPE_CORE		2
-
-/*
- * CPUID instruction 0xd Processor Extended State Enumeration Sub-leaf 1
- */
-#define	CPUID_EXTSTATE_XSAVEOPT	0x00000001
-#define	CPUID_EXTSTATE_XSAVEC	0x00000002
-#define	CPUID_EXTSTATE_XINUSE	0x00000004
-#define	CPUID_EXTSTATE_XSAVES	0x00000008
-
-/*
- * AMD extended function 8000_0007h edx info
- */
-#define	AMDPM_TS		0x00000001
-#define	AMDPM_FID		0x00000002
-#define	AMDPM_VID		0x00000004
-#define	AMDPM_TTP		0x00000008
-#define	AMDPM_TM		0x00000010
-#define	AMDPM_STC		0x00000020
-#define	AMDPM_100MHZ_STEPS	0x00000040
-#define	AMDPM_HW_PSTATE		0x00000080
-#define	AMDPM_TSC_INVARIANT	0x00000100
-#define	AMDPM_CPB		0x00000200
-
-/*
- * AMD extended function 8000_0008h ecx info
- */
-#define	AMDID_CMP_CORES		0x000000ff
-#define	AMDID_COREID_SIZE	0x0000f000
-#define	AMDID_COREID_SIZE_SHIFT	12
-
-/*
- * CPUID instruction 7 Structured Extended Features, leaf 0 ebx info
- */
-#define	CPUID_STDEXT_FSGSBASE	0x00000001
-#define	CPUID_STDEXT_TSC_ADJUST	0x00000002
-#define	CPUID_STDEXT_BMI1	0x00000008
-#define	CPUID_STDEXT_HLE	0x00000010
-#define	CPUID_STDEXT_AVX2	0x00000020
-#define	CPUID_STDEXT_SMEP	0x00000080
-#define	CPUID_STDEXT_BMI2	0x00000100
-#define	CPUID_STDEXT_ERMS	0x00000200
-#define	CPUID_STDEXT_INVPCID	0x00000400
-#define	CPUID_STDEXT_RTM	0x00000800
-#define	CPUID_STDEXT_MPX	0x00004000
-#define	CPUID_STDEXT_AVX512F	0x00010000
-#define	CPUID_STDEXT_RDSEED	0x00040000
-#define	CPUID_STDEXT_ADX	0x00080000
-#define	CPUID_STDEXT_SMAP	0x00100000
-#define	CPUID_STDEXT_CLFLUSHOPT	0x00800000
-#define	CPUID_STDEXT_PROCTRACE	0x02000000
-#define	CPUID_STDEXT_AVX512PF	0x04000000
-#define	CPUID_STDEXT_AVX512ER	0x08000000
-#define	CPUID_STDEXT_AVX512CD	0x10000000
-#define	CPUID_STDEXT_SHA	0x20000000
-
-/*
- * CPUID manufacturers identifiers
- */
-#define	AMD_VENDOR_ID		"AuthenticAMD"
-#define	CENTAUR_VENDOR_ID	"CentaurHauls"
-#define	CYRIX_VENDOR_ID		"CyrixInstead"
-#define	INTEL_VENDOR_ID		"GenuineIntel"
-#define	NEXGEN_VENDOR_ID	"NexGenDriven"
-#define	NSC_VENDOR_ID		"Geode by NSC"
-#define	RISE_VENDOR_ID		"RiseRiseRise"
-#define	SIS_VENDOR_ID		"SiS SiS SiS "
-#define	TRANSMETA_VENDOR_ID	"GenuineTMx86"
-#define	UMC_VENDOR_ID		"UMC UMC UMC "
-
-/*
- * Model-specific registers for the i386 family
- */
-#define	MSR_P5_MC_ADDR		0x000
-#define	MSR_P5_MC_TYPE		0x001
-#define	MSR_TSC			0x010
-#define	MSR_P5_CESR		0x011
-#define	MSR_P5_CTR0		0x012
-#define	MSR_P5_CTR1		0x013
-#define	MSR_IA32_PLATFORM_ID	0x017
-#define	MSR_APICBASE		0x01b
-#define	MSR_EBL_CR_POWERON	0x02a
-#define	MSR_TEST_CTL		0x033
-#define	MSR_IA32_FEATURE_CONTROL 0x03a
-#define	MSR_BIOS_UPDT_TRIG	0x079
-#define	MSR_BBL_CR_D0		0x088
-#define	MSR_BBL_CR_D1		0x089
-#define	MSR_BBL_CR_D2		0x08a
-#define	MSR_BIOS_SIGN		0x08b
-#define	MSR_PERFCTR0		0x0c1
-#define	MSR_PERFCTR1		0x0c2
-#define	MSR_PLATFORM_INFO	0x0ce
-#define	MSR_MPERF		0x0e7
-#define	MSR_APERF		0x0e8
-#define	MSR_IA32_EXT_CONFIG	0x0ee	/* Undocumented. Core Solo/Duo only */
-#define	MSR_MTRRcap		0x0fe
-#define	MSR_BBL_CR_ADDR		0x116
-#define	MSR_BBL_CR_DECC		0x118
-#define	MSR_BBL_CR_CTL		0x119
-#define	MSR_BBL_CR_TRIG		0x11a
-#define	MSR_BBL_CR_BUSY		0x11b
-#define	MSR_BBL_CR_CTL3		0x11e
-#define	MSR_SYSENTER_CS_MSR	0x174
-#define	MSR_SYSENTER_ESP_MSR	0x175
-#define	MSR_SYSENTER_EIP_MSR	0x176
-#define	MSR_MCG_CAP		0x179
-#define	MSR_MCG_STATUS		0x17a
-#define	MSR_MCG_CTL		0x17b
-#define	MSR_EVNTSEL0		0x186
-#define	MSR_EVNTSEL1		0x187
-#define	MSR_THERM_CONTROL	0x19a
-#define	MSR_THERM_INTERRUPT	0x19b
-#define	MSR_THERM_STATUS	0x19c
-#define	MSR_IA32_MISC_ENABLE	0x1a0
-#define	MSR_IA32_TEMPERATURE_TARGET	0x1a2
-#define	MSR_TURBO_RATIO_LIMIT	0x1ad
-#define	MSR_TURBO_RATIO_LIMIT1	0x1ae
-#define	MSR_DEBUGCTLMSR		0x1d9
-#define	MSR_LASTBRANCHFROMIP	0x1db
-#define	MSR_LASTBRANCHTOIP	0x1dc
-#define	MSR_LASTINTFROMIP	0x1dd
-#define	MSR_LASTINTTOIP		0x1de
-#define	MSR_ROB_CR_BKUPTMPDR6	0x1e0
-#define	MSR_MTRRVarBase		0x200
-#define	MSR_MTRR64kBase		0x250
-#define	MSR_MTRR16kBase		0x258
-#define	MSR_MTRR4kBase		0x268
-#define	MSR_PAT			0x277
-#define	MSR_MC0_CTL2		0x280
-#define	MSR_MTRRdefType		0x2ff
-#define	MSR_MC0_CTL		0x400
-#define	MSR_MC0_STATUS		0x401
-#define	MSR_MC0_ADDR		0x402
-#define	MSR_MC0_MISC		0x403
-#define	MSR_MC1_CTL		0x404
-#define	MSR_MC1_STATUS		0x405
-#define	MSR_MC1_ADDR		0x406
-#define	MSR_MC1_MISC		0x407
-#define	MSR_MC2_CTL		0x408
-#define	MSR_MC2_STATUS		0x409
-#define	MSR_MC2_ADDR		0x40a
-#define	MSR_MC2_MISC		0x40b
-#define	MSR_MC3_CTL		0x40c
-#define	MSR_MC3_STATUS		0x40d
-#define	MSR_MC3_ADDR		0x40e
-#define	MSR_MC3_MISC		0x40f
-#define	MSR_MC4_CTL		0x410
-#define	MSR_MC4_STATUS		0x411
-#define	MSR_MC4_ADDR		0x412
-#define	MSR_MC4_MISC		0x413
-#define	MSR_RAPL_POWER_UNIT	0x606
-#define	MSR_PKG_ENERGY_STATUS	0x611
-#define	MSR_DRAM_ENERGY_STATUS	0x619
-#define	MSR_PP0_ENERGY_STATUS	0x639
-#define	MSR_PP1_ENERGY_STATUS	0x641
-
-/*
- * VMX MSRs
- */
-#define	MSR_VMX_BASIC		0x480
-#define	MSR_VMX_PINBASED_CTLS	0x481
-#define	MSR_VMX_PROCBASED_CTLS	0x482
-#define	MSR_VMX_EXIT_CTLS	0x483
-#define	MSR_VMX_ENTRY_CTLS	0x484
-#define	MSR_VMX_CR0_FIXED0	0x486
-#define	MSR_VMX_CR0_FIXED1	0x487
-#define	MSR_VMX_CR4_FIXED0	0x488
-#define	MSR_VMX_CR4_FIXED1	0x489
-#define	MSR_VMX_PROCBASED_CTLS2	0x48b
-#define	MSR_VMX_EPT_VPID_CAP	0x48c
-#define	MSR_VMX_TRUE_PINBASED_CTLS	0x48d
-#define	MSR_VMX_TRUE_PROCBASED_CTLS	0x48e
-#define	MSR_VMX_TRUE_EXIT_CTLS	0x48f
-#define	MSR_VMX_TRUE_ENTRY_CTLS	0x490
-
-/*
- * X2APIC MSRs
- */
-#define	MSR_APIC_ID		0x802
-#define	MSR_APIC_VERSION	0x803
-#define	MSR_APIC_TPR		0x808
-#define	MSR_APIC_EOI		0x80b
-#define	MSR_APIC_LDR		0x80d
-#define	MSR_APIC_SVR		0x80f
-#define	MSR_APIC_ISR0		0x810
-#define	MSR_APIC_ISR1		0x811
-#define	MSR_APIC_ISR2		0x812
-#define	MSR_APIC_ISR3		0x813
-#define	MSR_APIC_ISR4		0x814
-#define	MSR_APIC_ISR5		0x815
-#define	MSR_APIC_ISR6		0x816
-#define	MSR_APIC_ISR7		0x817
-#define	MSR_APIC_TMR0		0x818
-#define	MSR_APIC_IRR0		0x820
-#define	MSR_APIC_ESR		0x828
-#define	MSR_APIC_LVT_CMCI	0x82F
-#define	MSR_APIC_ICR		0x830
-#define	MSR_APIC_LVT_TIMER	0x832
-#define	MSR_APIC_LVT_THERMAL	0x833
-#define	MSR_APIC_LVT_PCINT	0x834
-#define	MSR_APIC_LVT_LINT0	0x835
-#define	MSR_APIC_LVT_LINT1	0x836
-#define	MSR_APIC_LVT_ERROR	0x837
-#define	MSR_APIC_ICR_TIMER	0x838
-#define	MSR_APIC_CCR_TIMER	0x839
-#define	MSR_APIC_DCR_TIMER	0x83e
-#define	MSR_APIC_SELF_IPI	0x83f
-
-#define	MSR_IA32_XSS		0xda0
-
-/*
- * Constants related to MSR's.
- */
-#define	APICBASE_RESERVED	0x000002ff
-#define	APICBASE_BSP		0x00000100
-#define	APICBASE_X2APIC		0x00000400
-#define	APICBASE_ENABLED	0x00000800
-#define	APICBASE_ADDRESS	0xfffff000
-
-/* MSR_IA32_FEATURE_CONTROL related */
-#define	IA32_FEATURE_CONTROL_LOCK	0x01	/* lock bit */
-#define	IA32_FEATURE_CONTROL_SMX_EN	0x02	/* enable VMX inside SMX */
-#define	IA32_FEATURE_CONTROL_VMX_EN	0x04	/* enable VMX outside SMX */
-
-/*
- * PAT modes.
- */
-#define	PAT_UNCACHEABLE		0x00
-#define	PAT_WRITE_COMBINING	0x01
-#define	PAT_WRITE_THROUGH	0x04
-#define	PAT_WRITE_PROTECTED	0x05
-#define	PAT_WRITE_BACK		0x06
-#define	PAT_UNCACHED		0x07
-#define	PAT_VALUE(i, m)		((long long)(m) << (8 * (i)))
-#define	PAT_MASK(i)		PAT_VALUE(i, 0xff)
-
-/*
- * Constants related to MTRRs
- */
-#define	MTRR_UNCACHEABLE	0x00
-#define	MTRR_WRITE_COMBINING	0x01
-#define	MTRR_WRITE_THROUGH	0x04
-#define	MTRR_WRITE_PROTECTED	0x05
-#define	MTRR_WRITE_BACK		0x06
-#define	MTRR_N64K		8	/* numbers of fixed-size entries */
-#define	MTRR_N16K		16
-#define	MTRR_N4K		64
-#define	MTRR_CAP_WC		0x0000000000000400
-#define	MTRR_CAP_FIXED		0x0000000000000100
-#define	MTRR_CAP_VCNT		0x00000000000000ff
-#define	MTRR_DEF_ENABLE		0x0000000000000800
-#define	MTRR_DEF_FIXED_ENABLE	0x0000000000000400
-#define	MTRR_DEF_TYPE		0x00000000000000ff
-#define	MTRR_PHYSBASE_PHYSBASE	0x000ffffffffff000
-#define	MTRR_PHYSBASE_TYPE	0x00000000000000ff
-#define	MTRR_PHYSMASK_PHYSMASK	0x000ffffffffff000
-#define	MTRR_PHYSMASK_VALID	0x0000000000000800
-
-/*
- * Cyrix configuration registers, accessible as IO ports.
- */
-#define	CCR0			0xc0	/* Configuration control register 0 */
-#define	CCR0_NC0		0x01	/* First 64K of each 1M memory region is
-								   non-cacheable */
-#define	CCR0_NC1		0x02	/* 640K-1M region is non-cacheable */
-#define	CCR0_A20M		0x04	/* Enables A20M# input pin */
-#define	CCR0_KEN		0x08	/* Enables KEN# input pin */
-#define	CCR0_FLUSH		0x10	/* Enables FLUSH# input pin */
-#define	CCR0_BARB		0x20	/* Flushes internal cache when entering hold
-								   state */
-#define	CCR0_CO			0x40	/* Cache org: 1=direct mapped, 0=2x set
-								   assoc */
-#define	CCR0_SUSPEND	0x80	/* Enables SUSP# and SUSPA# pins */
-
-#define	CCR1			0xc1	/* Configuration control register 1 */
-#define	CCR1_RPL		0x01	/* Enables RPLSET and RPLVAL# pins */
-#define	CCR1_SMI		0x02	/* Enables SMM pins */
-#define	CCR1_SMAC		0x04	/* System management memory access */
-#define	CCR1_MMAC		0x08	/* Main memory access */
-#define	CCR1_NO_LOCK	0x10	/* Negate LOCK# */
-#define	CCR1_SM3		0x80	/* SMM address space address region 3 */
-
-#define	CCR2			0xc2
-#define	CCR2_WB			0x02	/* Enables WB cache interface pins */
-#define	CCR2_SADS		0x02	/* Slow ADS */
-#define	CCR2_LOCK_NW	0x04	/* LOCK NW Bit */
-#define	CCR2_SUSP_HLT	0x08	/* Suspend on HALT */
-#define	CCR2_WT1		0x10	/* WT region 1 */
-#define	CCR2_WPR1		0x10	/* Write-protect region 1 */
-#define	CCR2_BARB		0x20	/* Flushes write-back cache when entering
-								   hold state. */
-#define	CCR2_BWRT		0x40	/* Enables burst write cycles */
-#define	CCR2_USE_SUSP	0x80	/* Enables suspend pins */
-
-#define	CCR3			0xc3
-#define	CCR3_SMILOCK	0x01	/* SMM register lock */
-#define	CCR3_NMI		0x02	/* Enables NMI during SMM */
-#define	CCR3_LINBRST	0x04	/* Linear address burst cycles */
-#define	CCR3_SMMMODE	0x08	/* SMM Mode */
-#define	CCR3_MAPEN0		0x10	/* Enables Map0 */
-#define	CCR3_MAPEN1		0x20	/* Enables Map1 */
-#define	CCR3_MAPEN2		0x40	/* Enables Map2 */
-#define	CCR3_MAPEN3		0x80	/* Enables Map3 */
-
-#define	CCR4			0xe8
-#define	CCR4_IOMASK		0x07
-#define	CCR4_MEM		0x08	/* Enables momory bypassing */
-#define	CCR4_DTE		0x10	/* Enables directory table entry cache */
-#define	CCR4_FASTFPE	0x20	/* Fast FPU exception */
-#define	CCR4_CPUID		0x80	/* Enables CPUID instruction */
-
-#define	CCR5			0xe9
-#define	CCR5_WT_ALLOC	0x01	/* Write-through allocate */
-#define	CCR5_SLOP		0x02	/* LOOP instruction slowed down */
-#define	CCR5_LBR1		0x10	/* Local bus region 1 */
-#define	CCR5_ARREN		0x20	/* Enables ARR region */
-
-#define	CCR6			0xea
-
-#define	CCR7			0xeb
-
-/* Performance Control Register (5x86 only). */
-#define	PCR0			0x20
-#define	PCR0_RSTK		0x01	/* Enables return stack */
-#define	PCR0_BTB		0x02	/* Enables branch target buffer */
-#define	PCR0_LOOP		0x04	/* Enables loop */
-#define	PCR0_AIS		0x08	/* Enables all instrcutions stalled to
-								   serialize pipe. */
-#define	PCR0_MLR		0x10	/* Enables reordering of misaligned loads */
-#define	PCR0_BTBRT		0x40	/* Enables BTB test register. */
-#define	PCR0_LSSER		0x80	/* Disable reorder */
-
-/* Device Identification Registers */
-#define	DIR0			0xfe
-#define	DIR1			0xff
-
-/*
- * Machine Check register constants.
- */
-#define	MCG_CAP_COUNT		0x000000ff
-#define	MCG_CAP_CTL_P		0x00000100
-#define	MCG_CAP_EXT_P		0x00000200
-#define	MCG_CAP_CMCI_P		0x00000400
-#define	MCG_CAP_TES_P		0x00000800
-#define	MCG_CAP_EXT_CNT		0x00ff0000
-#define	MCG_CAP_SER_P		0x01000000
-#define	MCG_STATUS_RIPV		0x00000001
-#define	MCG_STATUS_EIPV		0x00000002
-#define	MCG_STATUS_MCIP		0x00000004
-#define	MCG_CTL_ENABLE		0xffffffffffffffff
-#define	MCG_CTL_DISABLE		0x0000000000000000
-#define	MSR_MC_CTL(x)		(MSR_MC0_CTL + (x) * 4)
-#define	MSR_MC_STATUS(x)	(MSR_MC0_STATUS + (x) * 4)
-#define	MSR_MC_ADDR(x)		(MSR_MC0_ADDR + (x) * 4)
-#define	MSR_MC_MISC(x)		(MSR_MC0_MISC + (x) * 4)
-#define	MSR_MC_CTL2(x)		(MSR_MC0_CTL2 + (x))	/* If MCG_CAP_CMCI_P */
-#define	MC_STATUS_MCA_ERROR	0x000000000000ffff
-#define	MC_STATUS_MODEL_ERROR	0x00000000ffff0000
-#define	MC_STATUS_OTHER_INFO	0x01ffffff00000000
-#define	MC_STATUS_COR_COUNT	0x001fffc000000000	/* If MCG_CAP_CMCI_P */
-#define	MC_STATUS_TES_STATUS	0x0060000000000000	/* If MCG_CAP_TES_P */
-#define	MC_STATUS_AR		0x0080000000000000	/* If MCG_CAP_TES_P */
-#define	MC_STATUS_S		0x0100000000000000	/* If MCG_CAP_TES_P */
-#define	MC_STATUS_PCC		0x0200000000000000
-#define	MC_STATUS_ADDRV		0x0400000000000000
-#define	MC_STATUS_MISCV		0x0800000000000000
-#define	MC_STATUS_EN		0x1000000000000000
-#define	MC_STATUS_UC		0x2000000000000000
-#define	MC_STATUS_OVER		0x4000000000000000
-#define	MC_STATUS_VAL		0x8000000000000000
-#define	MC_MISC_RA_LSB		0x000000000000003f	/* If MCG_CAP_SER_P */
-#define	MC_MISC_ADDRESS_MODE	0x00000000000001c0	/* If MCG_CAP_SER_P */
-#define	MC_CTL2_THRESHOLD	0x0000000000007fff
-#define	MC_CTL2_CMCI_EN		0x0000000040000000
-
-/*
- * The following four 3-byte registers control the non-cacheable regions.
- * These registers must be written as three separate bytes.
- *
- * NCRx+0: A31-A24 of starting address
- * NCRx+1: A23-A16 of starting address
- * NCRx+2: A15-A12 of starting address | NCR_SIZE_xx.
- *
- * The non-cacheable region's starting address must be aligned to the
- * size indicated by the NCR_SIZE_xx field.
- */
-#define	NCR1	0xc4
-#define	NCR2	0xc7
-#define	NCR3	0xca
-#define	NCR4	0xcd
-
-#define	NCR_SIZE_0K	0
-#define	NCR_SIZE_4K	1
-#define	NCR_SIZE_8K	2
-#define	NCR_SIZE_16K	3
-#define	NCR_SIZE_32K	4
-#define	NCR_SIZE_64K	5
-#define	NCR_SIZE_128K	6
-#define	NCR_SIZE_256K	7
-#define	NCR_SIZE_512K	8
-#define	NCR_SIZE_1M	9
-#define	NCR_SIZE_2M	10
-#define	NCR_SIZE_4M	11
-#define	NCR_SIZE_8M	12
-#define	NCR_SIZE_16M	13
-#define	NCR_SIZE_32M	14
-#define	NCR_SIZE_4G	15
-
-/*
- * The address region registers are used to specify the location and
- * size for the eight address regions.
- *
- * ARRx + 0: A31-A24 of start address
- * ARRx + 1: A23-A16 of start address
- * ARRx + 2: A15-A12 of start address | ARR_SIZE_xx
- */
-#define	ARR0	0xc4
-#define	ARR1	0xc7
-#define	ARR2	0xca
-#define	ARR3	0xcd
-#define	ARR4	0xd0
-#define	ARR5	0xd3
-#define	ARR6	0xd6
-#define	ARR7	0xd9
-
-#define	ARR_SIZE_0K		0
-#define	ARR_SIZE_4K		1
-#define	ARR_SIZE_8K		2
-#define	ARR_SIZE_16K	3
-#define	ARR_SIZE_32K	4
-#define	ARR_SIZE_64K	5
-#define	ARR_SIZE_128K	6
-#define	ARR_SIZE_256K	7
-#define	ARR_SIZE_512K	8
-#define	ARR_SIZE_1M		9
-#define	ARR_SIZE_2M		10
-#define	ARR_SIZE_4M		11
-#define	ARR_SIZE_8M		12
-#define	ARR_SIZE_16M	13
-#define	ARR_SIZE_32M	14
-#define	ARR_SIZE_4G		15
-
-/*
- * The region control registers specify the attributes associated with
- * the ARRx addres regions.
- */
-#define	RCR0	0xdc
-#define	RCR1	0xdd
-#define	RCR2	0xde
-#define	RCR3	0xdf
-#define	RCR4	0xe0
-#define	RCR5	0xe1
-#define	RCR6	0xe2
-#define	RCR7	0xe3
-
-#define	RCR_RCD	0x01	/* Disables caching for ARRx (x = 0-6). */
-#define	RCR_RCE	0x01	/* Enables caching for ARR7. */
-#define	RCR_WWO	0x02	/* Weak write ordering. */
-#define	RCR_WL	0x04	/* Weak locking. */
-#define	RCR_WG	0x08	/* Write gathering. */
-#define	RCR_WT	0x10	/* Write-through. */
-#define	RCR_NLB	0x20	/* LBA# pin is not asserted. */
-
-/* AMD Write Allocate Top-Of-Memory and Control Register */
-#define	AMD_WT_ALLOC_TME	0x40000	/* top-of-memory enable */
-#define	AMD_WT_ALLOC_PRE	0x20000	/* programmable range enable */
-#define	AMD_WT_ALLOC_FRE	0x10000	/* fixed (A0000-FFFFF) range enable */
-
-/* AMD64 MSR's */
-#define	MSR_EFER	0xc0000080	/* extended features */
-#define	MSR_STAR	0xc0000081	/* legacy mode SYSCALL target/cs/ss */
-#define	MSR_LSTAR	0xc0000082	/* long mode SYSCALL target rip */
-#define	MSR_CSTAR	0xc0000083	/* compat mode SYSCALL target rip */
-#define	MSR_SF_MASK	0xc0000084	/* syscall flags mask */
-#define	MSR_FSBASE	0xc0000100	/* base address of the %fs "segment" */
-#define	MSR_GSBASE	0xc0000101	/* base address of the %gs "segment" */
-#define	MSR_KGSBASE	0xc0000102	/* base address of the kernel %gs */
-#define	MSR_PERFEVSEL0	0xc0010000
-#define	MSR_PERFEVSEL1	0xc0010001
-#define	MSR_PERFEVSEL2	0xc0010002
-#define	MSR_PERFEVSEL3	0xc0010003
-#define	MSR_K7_PERFCTR0	0xc0010004
-#define	MSR_K7_PERFCTR1	0xc0010005
-#define	MSR_K7_PERFCTR2	0xc0010006
-#define	MSR_K7_PERFCTR3	0xc0010007
-#define	MSR_SYSCFG	0xc0010010
-#define	MSR_HWCR	0xc0010015
-#define	MSR_IORRBASE0	0xc0010016
-#define	MSR_IORRMASK0	0xc0010017
-#define	MSR_IORRBASE1	0xc0010018
-#define	MSR_IORRMASK1	0xc0010019
-#define	MSR_TOP_MEM	0xc001001a	/* boundary for ram below 4G */
-#define	MSR_TOP_MEM2	0xc001001d	/* boundary for ram above 4G */
-#define	MSR_NB_CFG1	0xc001001f	/* NB configuration 1 */
-#define	MSR_P_STATE_LIMIT 0xc0010061	/* P-state Current Limit Register */
-#define	MSR_P_STATE_CONTROL 0xc0010062	/* P-state Control Register */
-#define	MSR_P_STATE_STATUS 0xc0010063	/* P-state Status Register */
-#define	MSR_P_STATE_CONFIG(n) (0xc0010064 + (n)) /* P-state Config */
-#define	MSR_SMM_ADDR	0xc0010112	/* SMM TSEG base address */
-#define	MSR_SMM_MASK	0xc0010113	/* SMM TSEG address mask */
-#define	MSR_IC_CFG	0xc0011021	/* Instruction Cache Configuration */
-#define	MSR_K8_UCODE_UPDATE	0xc0010020	/* update microcode */
-#define	MSR_MC0_CTL_MASK	0xc0010044
-#define	MSR_VM_CR		0xc0010114 /* SVM: feature control */
-#define	MSR_VM_HSAVE_PA		0xc0010117 /* SVM: host save area address */
-
-/* MSR_VM_CR related */
-#define	VM_CR_SVMDIS		0x10	/* SVM: disabled by BIOS */
-
-/* VIA ACE crypto featureset: for via_feature_rng */
-#define	VIA_HAS_RNG		1	/* cpu has RNG */
-
-/* VIA ACE crypto featureset: for via_feature_xcrypt */
-#define	VIA_HAS_AES		1	/* cpu has AES */
-#define	VIA_HAS_SHA		2	/* cpu has SHA1 & SHA256 */
-#define	VIA_HAS_MM		4	/* cpu has RSA instructions */
-#define	VIA_HAS_AESCTR		8	/* cpu has AES-CTR instructions */
-
-/* Centaur Extended Feature flags */
-#define	VIA_CPUID_HAS_RNG	0x000004
-#define	VIA_CPUID_DO_RNG	0x000008
-#define	VIA_CPUID_HAS_ACE	0x000040
-#define	VIA_CPUID_DO_ACE	0x000080
-#define	VIA_CPUID_HAS_ACE2	0x000100
-#define	VIA_CPUID_DO_ACE2	0x000200
-#define	VIA_CPUID_HAS_PHE	0x000400
-#define	VIA_CPUID_DO_PHE	0x000800
-#define	VIA_CPUID_HAS_PMM	0x001000
-#define	VIA_CPUID_DO_PMM	0x002000
-
-/* VIA ACE xcrypt-* instruction context control options */
-#define	VIA_CRYPT_CWLO_ROUND_M		0x0000000f
-#define	VIA_CRYPT_CWLO_ALG_M		0x00000070
-#define	VIA_CRYPT_CWLO_ALG_AES		0x00000000
-#define	VIA_CRYPT_CWLO_KEYGEN_M		0x00000080
-#define	VIA_CRYPT_CWLO_KEYGEN_HW	0x00000000
-#define	VIA_CRYPT_CWLO_KEYGEN_SW	0x00000080
-#define	VIA_CRYPT_CWLO_NORMAL		0x00000000
-#define	VIA_CRYPT_CWLO_INTERMEDIATE	0x00000100
-#define	VIA_CRYPT_CWLO_ENCRYPT		0x00000000
-#define	VIA_CRYPT_CWLO_DECRYPT		0x00000200
-#define	VIA_CRYPT_CWLO_KEY128		0x0000000a	/* 128bit, 10 rds */
-#define	VIA_CRYPT_CWLO_KEY192		0x0000040c	/* 192bit, 12 rds */
-#define	VIA_CRYPT_CWLO_KEY256		0x0000080e	/* 256bit, 15 rds */
-
-#endif /* !_MACHINE_SPECIALREG_H_ */
diff --git a/include.new/x86/stdarg.h b/include.new/x86/stdarg.h
deleted file mode 100644
index c12c70b..0000000
--- a/include.new/x86/stdarg.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2002 David E. O'Brien.  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. 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 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: releng/10.2/sys/x86/include/stdarg.h 256105 2013-10-07 10:01:23Z phk $
- */
-
-#ifndef _MACHINE_STDARG_H_
-#define	_MACHINE_STDARG_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _VA_LIST_DECLARED
-#define	_VA_LIST_DECLARED
-typedef	__va_list	va_list;
-#endif
-
-#ifdef __GNUCLIKE_BUILTIN_STDARG
-
-#define	va_start(ap, last) \
-	__builtin_va_start((ap), (last))
-
-#define	va_arg(ap, type) \
-	__builtin_va_arg((ap), type)
-
-#define	__va_copy(dest, src) \
-	__builtin_va_copy((dest), (src))
-
-#if __ISO_C_VISIBLE >= 1999
-#define	va_copy(dest, src) \
-	__va_copy(dest, src)
-#endif
-
-#define	va_end(ap) \
-	__builtin_va_end(ap)
-
-#elif defined(lint)
-/* Provide a fake implementation for lint's benefit */
-#define	__va_size(type) \
-	(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
-#define	va_start(ap, last) \
-	((ap) = (va_list)&(last) + __va_size(last))
-#define va_copy(dst, src) \
-	((dst) = (src))
-#define	va_arg(ap, type) \
-	(*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
-#define	va_end(ap)
-
-#else
-#error this file needs to be ported to your compiler
-#endif
-
-#endif /* !_MACHINE_STDARG_H_ */
diff --git a/include.new/x86/sysarch.h b/include.new/x86/sysarch.h
deleted file mode 100644
index 9bb7d07..0000000
--- a/include.new/x86/sysarch.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * Copyright (c) 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/sys/x86/include/sysarch.h 233209 2012-03-19 21:57:31Z tijl $
- */
-
-/*
- * Architecture specific syscalls (X86)
- */
-#ifndef _MACHINE_SYSARCH_H_
-#define _MACHINE_SYSARCH_H_
-
-#include <sys/cdefs.h>
-
-#define I386_GET_LDT	0
-#define I386_SET_LDT	1
-#define	LDT_AUTO_ALLOC	0xffffffff
-				/* I386_IOPL */
-#define I386_GET_IOPERM	3
-#define I386_SET_IOPERM	4
-				/* xxxxx */
-#define	I386_VM86		6	/* XXX Not implementable on amd64 */
-#define	I386_GET_FSBASE		7
-#define	I386_SET_FSBASE		8
-#define	I386_GET_GSBASE		9
-#define	I386_SET_GSBASE		10
-#define	I386_GET_XFPUSTATE	11
-
-/* Leave space for 0-127 for to avoid translating syscalls */
-#define	AMD64_GET_FSBASE	128
-#define	AMD64_SET_FSBASE	129
-#define	AMD64_GET_GSBASE	130
-#define	AMD64_SET_GSBASE	131
-#define	AMD64_GET_XFPUSTATE	132
-
-struct i386_ioperm_args {
-	unsigned int start;
-	unsigned int length;
-	int	enable;
-};
-
-#ifdef __i386__
-struct i386_ldt_args {
-	unsigned int start;
-	union descriptor *descs;
-	unsigned int num;
-};
-
-struct i386_vm86_args {
-	int	sub_op;			/* sub-operation to perform */
-	char	*sub_args;		/* args */
-};
-
-struct i386_get_xfpustate {
-	void *addr;
-	int len;
-};
-#else
-struct i386_ldt_args {
-	unsigned int start;
-	struct user_segment_descriptor *descs __packed;
-	unsigned int num;
-};
-
-struct i386_get_xfpustate {
-	unsigned int addr;
-	int len;
-};
-
-struct amd64_get_xfpustate {
-	void *addr;
-	int len;
-};
-#endif
-
-#ifndef _KERNEL
-union descriptor;
-struct dbreg;
-
-__BEGIN_DECLS
-int i386_get_ldt(int, union descriptor *, int);
-int i386_set_ldt(int, union descriptor *, int);
-int i386_get_ioperm(unsigned int, unsigned int *, int *);
-int i386_set_ioperm(unsigned int, unsigned int, int);
-int i386_vm86(int, void *);
-int i386_get_fsbase(void **);
-int i386_get_gsbase(void **);
-int i386_set_fsbase(void *);
-int i386_set_gsbase(void *);
-int i386_set_watch(int, unsigned int, int, int, struct dbreg *);
-int i386_clr_watch(int, struct dbreg *);
-int amd64_get_fsbase(void **);
-int amd64_get_gsbase(void **);
-int amd64_set_fsbase(void *);
-int amd64_set_gsbase(void *);
-int sysarch(int, void *);
-__END_DECLS
-#else
-struct thread;
-union descriptor;
-
-int i386_get_ldt(struct thread *, struct i386_ldt_args *);
-int i386_set_ldt(struct thread *, struct i386_ldt_args *, union descriptor *);
-int i386_get_ioperm(struct thread *, struct i386_ioperm_args *);
-int i386_set_ioperm(struct thread *, struct i386_ioperm_args *);
-int amd64_get_ldt(struct thread *, struct i386_ldt_args *);
-int amd64_set_ldt(struct thread *, struct i386_ldt_args *,
-    struct user_segment_descriptor *);
-int amd64_get_ioperm(struct thread *, struct i386_ioperm_args *);
-int amd64_set_ioperm(struct thread *, struct i386_ioperm_args *);
-#endif
-
-#endif /* !_MACHINE_SYSARCH_H_ */
diff --git a/include.new/x86/trap.h b/include.new/x86/trap.h
deleted file mode 100644
index a622760..0000000
--- a/include.new/x86/trap.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD: releng/10.2/sys/x86/include/trap.h 262042 2014-02-17 12:57:13Z avg $
- */
-
-#ifndef _MACHINE_TRAP_H_
-#define	_MACHINE_TRAP_H_
-
-/*
- * Trap type values
- * also known in trap.c for name strings
- */
-
-#define	T_PRIVINFLT	1	/* privileged instruction */
-#define	T_BPTFLT	3	/* breakpoint instruction */
-#define	T_ARITHTRAP	6	/* arithmetic trap */
-#define	T_PROTFLT	9	/* protection fault */
-#define	T_TRCTRAP	10	/* debug exception (sic) */
-#define	T_PAGEFLT	12	/* page fault */
-#define	T_ALIGNFLT	14	/* alignment fault */
-
-#define	T_DIVIDE	18	/* integer divide fault */
-#define	T_NMI		19	/* non-maskable trap */
-#define	T_OFLOW		20	/* overflow trap */
-#define	T_BOUND		21	/* bound instruction fault */
-#define	T_DNA		22	/* device not available fault */
-#define	T_DOUBLEFLT	23	/* double fault */
-#define	T_FPOPFLT	24	/* fp coprocessor operand fetch fault */
-#define	T_TSSFLT	25	/* invalid tss fault */
-#define	T_SEGNPFLT	26	/* segment not present fault */
-#define	T_STKFLT	27	/* stack fault */
-#define	T_MCHK		28	/* machine check trap */
-#define	T_XMMFLT	29	/* SIMD floating-point exception */
-#define	T_RESERVED	30	/* reserved (unknown) */
-#define	T_DTRACE_RET	32	/* DTrace pid return */
-
-/* XXX most of the following codes aren't used, but could be. */
-
-/* definitions for <sys/signal.h> */
-#define	    ILL_RESAD_FAULT	T_RESADFLT
-#define	    ILL_PRIVIN_FAULT	T_PRIVINFLT
-#define	    ILL_RESOP_FAULT	T_RESOPFLT
-#define	    ILL_ALIGN_FAULT	T_ALIGNFLT
-#define	    ILL_FPOP_FAULT	T_FPOPFLT	/* coprocessor operand fault */
-
-/* old FreeBSD macros, deprecated */
-#define	FPE_INTOVF_TRAP	0x1	/* integer overflow */
-#define	FPE_INTDIV_TRAP	0x2	/* integer divide by zero */
-#define	FPE_FLTDIV_TRAP	0x3	/* floating/decimal divide by zero */
-#define	FPE_FLTOVF_TRAP	0x4	/* floating overflow */
-#define	FPE_FLTUND_TRAP	0x5	/* floating underflow */
-#define	FPE_FPU_NP_TRAP	0x6	/* floating point unit not present  */
-#define	FPE_SUBRNG_TRAP	0x7	/* subrange out of bounds */
-
-/* codes for SIGBUS */
-#define	    BUS_PAGE_FAULT	T_PAGEFLT	/* page fault protection base */
-#define	    BUS_SEGNP_FAULT	T_SEGNPFLT	/* segment not present */
-#define	    BUS_STK_FAULT	T_STKFLT	/* stack segment */
-#define	    BUS_SEGM_FAULT	T_RESERVED	/* segment protection base */
-
-/* Trap's coming from user mode */
-#define	T_USER	0x100
-
-#endif /* !_MACHINE_TRAP_H_ */
diff --git a/include.new/x86/ucontext.h b/include.new/x86/ucontext.h
deleted file mode 100644
index 5d46bb8..0000000
--- a/include.new/x86/ucontext.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*-
- * Copyright (c) 2003 Peter Wemm
- * Copyright (c) 1999 Marcel Moolenaar
- * 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 
- *    in this position and unchanged.
- * 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 ``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 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: releng/10.2/sys/x86/include/ucontext.h 247047 2013-02-20 17:39:52Z kib $
- */
-
-#ifndef _X86_UCONTEXT_H_
-#define	_X86_UCONTEXT_H_
-
-#ifdef __i386__
-/* Keep _MC_* values similar to amd64 */
-#define	_MC_HASSEGS	0x1
-#define	_MC_HASBASES	0x2
-#define	_MC_HASFPXSTATE	0x4
-#define	_MC_FLAG_MASK	(_MC_HASSEGS | _MC_HASBASES | _MC_HASFPXSTATE)
-
-typedef struct __mcontext {
-	/*
-	 * The definition of mcontext_t must match the layout of
-	 * struct sigcontext after the sc_mask member.  This is so
-	 * that we can support sigcontext and ucontext_t at the same
-	 * time.
-	 */
-	__register_t	mc_onstack;	/* XXX - sigcontext compat. */
-	__register_t	mc_gs;		/* machine state (struct trapframe) */
-	__register_t	mc_fs;
-	__register_t	mc_es;
-	__register_t	mc_ds;
-	__register_t	mc_edi;
-	__register_t	mc_esi;
-	__register_t	mc_ebp;
-	__register_t	mc_isp;
-	__register_t	mc_ebx;
-	__register_t	mc_edx;
-	__register_t	mc_ecx;
-	__register_t	mc_eax;
-	__register_t	mc_trapno;
-	__register_t	mc_err;
-	__register_t	mc_eip;
-	__register_t	mc_cs;
-	__register_t	mc_eflags;
-	__register_t	mc_esp;
-	__register_t	mc_ss;
-
-	int	mc_len;			/* sizeof(mcontext_t) */
-#define	_MC_FPFMT_NODEV		0x10000	/* device not present or configured */
-#define	_MC_FPFMT_387		0x10001
-#define	_MC_FPFMT_XMM		0x10002
-	int	mc_fpformat;
-#define	_MC_FPOWNED_NONE	0x20000	/* FP state not used */
-#define	_MC_FPOWNED_FPU		0x20001	/* FP state came from FPU */
-#define	_MC_FPOWNED_PCB		0x20002	/* FP state came from PCB */
-	int	mc_ownedfp;
-	__register_t mc_flags;
-	/*
-	 * See <machine/npx.h> for the internals of mc_fpstate[].
-	 */
-	int	mc_fpstate[128] __aligned(16);
-
-	__register_t mc_fsbase;
-	__register_t mc_gsbase;
-
-	__register_t mc_xfpustate;
-	__register_t mc_xfpustate_len;
-
-	int	mc_spare2[4];
-} mcontext_t;
-#endif /* __i386__ */
-
-#ifdef __amd64__
-/*
- * mc_trapno bits. Shall be in sync with TF_XXX.
- */
-#define	_MC_HASSEGS	0x1
-#define	_MC_HASBASES	0x2
-#define	_MC_HASFPXSTATE	0x4
-#define	_MC_FLAG_MASK	(_MC_HASSEGS | _MC_HASBASES | _MC_HASFPXSTATE)
-
-typedef struct __mcontext {
-	/*
-	 * The definition of mcontext_t must match the layout of
-	 * struct sigcontext after the sc_mask member.  This is so
-	 * that we can support sigcontext and ucontext_t at the same
-	 * time.
-	 */
-	__register_t	mc_onstack;	/* XXX - sigcontext compat. */
-	__register_t	mc_rdi;		/* machine state (struct trapframe) */
-	__register_t	mc_rsi;
-	__register_t	mc_rdx;
-	__register_t	mc_rcx;
-	__register_t	mc_r8;
-	__register_t	mc_r9;
-	__register_t	mc_rax;
-	__register_t	mc_rbx;
-	__register_t	mc_rbp;
-	__register_t	mc_r10;
-	__register_t	mc_r11;
-	__register_t	mc_r12;
-	__register_t	mc_r13;
-	__register_t	mc_r14;
-	__register_t	mc_r15;
-	__uint32_t	mc_trapno;
-	__uint16_t	mc_fs;
-	__uint16_t	mc_gs;
-	__register_t	mc_addr;
-	__uint32_t	mc_flags;
-	__uint16_t	mc_es;
-	__uint16_t	mc_ds;
-	__register_t	mc_err;
-	__register_t	mc_rip;
-	__register_t	mc_cs;
-	__register_t	mc_rflags;
-	__register_t	mc_rsp;
-	__register_t	mc_ss;
-
-	long	mc_len;			/* sizeof(mcontext_t) */
-
-#define	_MC_FPFMT_NODEV		0x10000	/* device not present or configured */
-#define	_MC_FPFMT_XMM		0x10002
-	long	mc_fpformat;
-#define	_MC_FPOWNED_NONE	0x20000	/* FP state not used */
-#define	_MC_FPOWNED_FPU		0x20001	/* FP state came from FPU */
-#define	_MC_FPOWNED_PCB		0x20002	/* FP state came from PCB */
-	long	mc_ownedfp;
-	/*
-	 * See <machine/fpu.h> for the internals of mc_fpstate[].
-	 */
-	long	mc_fpstate[64] __aligned(16);
-
-	__register_t	mc_fsbase;
-	__register_t	mc_gsbase;
-
-	__register_t	mc_xfpustate;
-	__register_t	mc_xfpustate_len;
-
-	long	mc_spare[4];
-} mcontext_t;
-#endif /* __amd64__ */
-
-#endif /* !_X86_UCONTEXT_H_ */
diff --git a/include.new/x86/vdso.h b/include.new/x86/vdso.h
deleted file mode 100644
index 658dd35..0000000
--- a/include.new/x86/vdso.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright 2012 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/x86/include/vdso.h 237433 2012-06-22 07:06:40Z kib $
- */
-
-#ifndef _X86_VDSO_H
-#define	_X86_VDSO_H
-
-#define	VDSO_TIMEHANDS_MD			\
-	uint32_t	th_x86_shift;		\
-	uint32_t	th_res[7];
-
-#ifdef _KERNEL
-#ifdef COMPAT_FREEBSD32
-
-#define	VDSO_TIMEHANDS_MD32	VDSO_TIMEHANDS_MD
-
-#endif
-#endif
-#endif
diff --git a/include.new/x86/vmware.h b/include.new/x86/vmware.h
deleted file mode 100644
index 282021d..0000000
--- a/include.new/x86/vmware.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2011-2014 Jung-uk Kim <jkim@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.
- *
- * 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: releng/10.2/sys/x86/include/vmware.h 278522 2015-02-10 16:34:42Z jhb $
- */
-
-#ifndef _X86_VMWARE_H_
-#define	_X86_VMWARE_H_
-
-#define	VMW_HVMAGIC		0x564d5868
-#define	VMW_HVPORT		0x5658
-#define	VMW_HVCMD_GETVERSION	10
-#define	VMW_HVCMD_GETHZ		45
-
-static __inline void
-vmware_hvcall(u_int cmd, u_int *p)
-{
-
-	__asm __volatile("inl %w3, %0"
-	: "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
-	: "0" (VMW_HVMAGIC), "1" (UINT_MAX), "2" (cmd), "3" (VMW_HVPORT)
-	: "memory");
-}
-
-#endif /* !_X86_VMWARE_H_ */
diff --git a/include.new/xdbm.h b/include.new/xdbm.h
deleted file mode 100644
index c2c6c28..0000000
--- a/include.new/xdbm.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- */
-
-/* $Id$ */
-
-/* Generic *dbm include file */
-
-#ifndef __XDBM_H__
-#define __XDBM_H__
-
-#if HAVE_DB_NDBM
-#define DB_DBM_HSEARCH 1
-#include <db.h>
-#elif HAVE_NDBM
-#if defined(HAVE_GDBM_NDBM_H)
-#include <gdbm/ndbm.h>
-#elif defined(HAVE_NDBM_H)
-#include <ndbm.h>
-#endif
-#endif /* HAVE_NDBM */
-
-#endif /* __XDBM_H__ */
diff --git a/include.new/xlocale.h b/include.new/xlocale.h
deleted file mode 100644
index 36fd2c9..0000000
--- a/include.new/xlocale.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale.h 232498 2012-03-04 15:31:13Z theraven $
- */
-
-#ifndef _XLOCALE_H_
-#define _XLOCALE_H_
-
-#include <locale.h>
-__BEGIN_DECLS
-#include <xlocale/_locale.h>
-
-#ifdef _STRING_H_
-#include <xlocale/_string.h>
-#endif
-
-#ifdef _INTTYPES_H_
-#include <xlocale/_inttypes.h>
-#endif
-
-#ifdef _MONETARY_H_
-#include <xlocale/_monetary.h>
-#endif
-
-#ifdef _STDLIB_H_
-#include <xlocale/_stdlib.h>
-#endif
-
-#ifdef _TIME_H_
-#include <xlocale/_time.h>
-#endif
-
-#ifdef _LANGINFO_H_
-#include <xlocale/_langinfo.h>
-#endif
-
-#ifdef _CTYPE_H_
-#include <xlocale/_ctype.h>
-#endif
-
-#ifdef _WCTYPE_H_
-#define _XLOCALE_WCTYPES 1
-#include <xlocale/_ctype.h>
-#endif
-
-#ifdef _STDIO_H_
-#include <xlocale/_stdio.h>
-#endif
-
-#ifdef _WCHAR_H_
-#include <xlocale/_wchar.h>
-#endif
-
-
-
-struct lconv	*localeconv_l(locale_t);
-__END_DECLS
-
-#endif
diff --git a/include.new/xlocale/_ctype.h b/include.new/xlocale/_ctype.h
deleted file mode 100644
index c6a5d8d..0000000
--- a/include.new/xlocale/_ctype.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*-
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_ctype.h 243032 2012-11-14 17:44:37Z demon $
- */
-
-
-#if	(defined(_XLOCALE_WCTYPES) && !defined(_XLOCALE_WCTYPE_H)) || \
-	(!defined(_XLOCALE_WCTYPES) && !defined(_XLOCALE_CTYPE_H))
-
-#ifdef _XLOCALE_WCTYPES
-#define _XLOCALE_WCTYPE_H
-#else
-#define _XLOCALE_CTYPE_H
-#endif
-
-#ifndef _LOCALE_T_DEFINED
-#define _LOCALE_T_DEFINED
-typedef struct	_xlocale *locale_t;
-#endif
-
-#ifndef _XLOCALE_RUN_FUNCTIONS_DEFINED
-#define _XLOCALE_RUN_FUNCTIONS_DEFINED 1
-unsigned long	 ___runetype_l(__ct_rune_t, locale_t) __pure;
-__ct_rune_t	 ___tolower_l(__ct_rune_t, locale_t) __pure;
-__ct_rune_t	 ___toupper_l(__ct_rune_t, locale_t) __pure;
-_RuneLocale	*__runes_for_locale(locale_t, int*);
-#endif
-
-#ifndef _XLOCALE_INLINE
-#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
-/* GNU89 inline has nonstandard semantics. */
-#define _XLOCALE_INLINE extern __inline
-#else
-/* Hack to work around people who define inline away */
-#ifdef inline
-#define _XLOCALE_INLINE static __inline
-#else
-/* Define with C++ / C99 compatible semantics */
-#define _XLOCALE_INLINE inline
-#endif
-#endif
-#endif /* _XLOCALE_INLINE */
-
-#ifdef _XLOCALE_WCTYPES
-_XLOCALE_INLINE int
-__maskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
-_XLOCALE_INLINE int
-__istype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
-
-_XLOCALE_INLINE int
-__maskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
-{
-	int __limit;
-	_RuneLocale *runes = __runes_for_locale(__loc, &__limit);
-	return ((__c < 0 || __c >= _CACHED_RUNES) ? ___runetype_l(__c, __loc) :
-	        runes->__runetype[__c]) & __f;
-}
-
-_XLOCALE_INLINE int
-__istype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
-{
-	return (!!__maskrune_l(__c, __f, __loc));
-}
-
-#define XLOCALE_ISCTYPE(fname, cat) \
-		_XLOCALE_INLINE int isw##fname##_l(int, locale_t);\
-		_XLOCALE_INLINE int isw##fname##_l(int __c, locale_t __l)\
-		{ return __istype_l(__c, cat, __l); }
-#else
-_XLOCALE_INLINE int
-__sbmaskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
-_XLOCALE_INLINE int
-__sbistype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc);
-
-_XLOCALE_INLINE int
-__sbmaskrune_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
-{
-	int __limit;
-	_RuneLocale *runes = __runes_for_locale(__loc, &__limit);
-	return (__c < 0 || __c >= __limit) ? 0 :
-	       runes->__runetype[__c] & __f;
-}
-
-_XLOCALE_INLINE int
-__sbistype_l(__ct_rune_t __c, unsigned long __f, locale_t __loc)
-{
-	return (!!__sbmaskrune_l(__c, __f, __loc));
-}
-
-#define XLOCALE_ISCTYPE(__fname, __cat) \
-		_XLOCALE_INLINE int is##__fname##_l(int, locale_t); \
-		_XLOCALE_INLINE int is##__fname##_l(int __c, locale_t __l)\
-		{ return __sbistype_l(__c, __cat, __l); }
-#endif
-
-XLOCALE_ISCTYPE(alnum, _CTYPE_A|_CTYPE_D)
-XLOCALE_ISCTYPE(alpha, _CTYPE_A)
-XLOCALE_ISCTYPE(blank, _CTYPE_B)
-XLOCALE_ISCTYPE(cntrl, _CTYPE_C)
-XLOCALE_ISCTYPE(digit, _CTYPE_D)
-XLOCALE_ISCTYPE(graph, _CTYPE_G)
-XLOCALE_ISCTYPE(hexnumber, _CTYPE_X)
-XLOCALE_ISCTYPE(ideogram, _CTYPE_I)
-XLOCALE_ISCTYPE(lower, _CTYPE_L)
-XLOCALE_ISCTYPE(number, _CTYPE_D)
-XLOCALE_ISCTYPE(phonogram, _CTYPE_Q)
-XLOCALE_ISCTYPE(print, _CTYPE_R)
-XLOCALE_ISCTYPE(punct, _CTYPE_P)
-XLOCALE_ISCTYPE(rune, 0xFFFFFF00L)
-XLOCALE_ISCTYPE(space, _CTYPE_S)
-XLOCALE_ISCTYPE(special, _CTYPE_T)
-XLOCALE_ISCTYPE(upper, _CTYPE_U)
-XLOCALE_ISCTYPE(xdigit, _CTYPE_X)
-#undef XLOCALE_ISCTYPE
-
-#ifdef _XLOCALE_WCTYPES
-_XLOCALE_INLINE int towlower_l(int, locale_t);
-_XLOCALE_INLINE int __wcwidth_l(__ct_rune_t, locale_t);
-_XLOCALE_INLINE int towupper_l(int, locale_t);
-
-_XLOCALE_INLINE int towlower_l(int __c, locale_t __l)
-{
-	int __limit;
-	_RuneLocale *__runes = __runes_for_locale(__l, &__limit);
-	return (__c < 0 || __c >= _CACHED_RUNES) ? ___tolower_l(__c, __l) :
-	       __runes->__maplower[__c];
-}
-_XLOCALE_INLINE int towupper_l(int __c, locale_t __l)
-{
-	int __limit;
-	_RuneLocale *__runes = __runes_for_locale(__l, &__limit);
-	return (__c < 0 || __c >= _CACHED_RUNES) ? ___toupper_l(__c, __l) :
-	       __runes->__mapupper[__c];
-}
-_XLOCALE_INLINE int
-__wcwidth_l(__ct_rune_t _c, locale_t __l)
-{
-	unsigned int _x;
-
-	if (_c == 0)
-		return (0);
-	_x = (unsigned int)__maskrune_l(_c, _CTYPE_SWM|_CTYPE_R, __l);
-	if ((_x & _CTYPE_SWM) != 0)
-		return ((_x & _CTYPE_SWM) >> _CTYPE_SWS);
-	return ((_x & _CTYPE_R) != 0 ? 1 : -1);
-}
-int iswctype_l(wint_t __wc, wctype_t __charclass, locale_t __l);
-wctype_t wctype_l(const char *property, locale_t __l);
-wint_t towctrans_l(wint_t __wc, wctrans_t desc, locale_t __l);
-wint_t nextwctype_l(wint_t __wc, wctype_t wct, locale_t __l);
-wctrans_t wctrans_l(const char *__charclass, locale_t __l);
-#undef _XLOCALE_WCTYPES
-#else
-_XLOCALE_INLINE int digittoint_l(int, locale_t);
-_XLOCALE_INLINE int tolower_l(int, locale_t);
-_XLOCALE_INLINE int toupper_l(int, locale_t);
-
-_XLOCALE_INLINE int digittoint_l(int __c, locale_t __l)
-{ return __sbmaskrune_l((__c), 0xFF, __l); }
-
-_XLOCALE_INLINE int tolower_l(int __c, locale_t __l)
-{
-	int __limit;
-	_RuneLocale *__runes = __runes_for_locale(__l, &__limit);
-	return (__c < 0 || __c >= __limit) ? __c :
-	       __runes->__maplower[__c];
-}
-_XLOCALE_INLINE int toupper_l(int __c, locale_t __l)
-{
-	int __limit;
-	_RuneLocale *__runes = __runes_for_locale(__l, &__limit);
-	return (__c < 0 || __c >= __limit) ? __c :
-	       __runes->__mapupper[__c];
-}
-#endif
-#endif /* (defined(_XLOCALE_WCTYPES) && !defined(_XLOCALE_WCTYPE_H)) || \
-	(!defined(_XLOCALE_WCTYPES) && !defined(_XLOCALE_CTYPE_H)) */
diff --git a/include.new/xlocale/_inttypes.h b/include.new/xlocale/_inttypes.h
deleted file mode 100644
index b05f10a..0000000
--- a/include.new/xlocale/_inttypes.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_inttypes.h 231673 2012-02-14 12:03:23Z theraven $
- */
-
-
-/*
- * Extended locale versions of the locale-aware functions from inttypes.h.
- * Include <inttypes.h> before <xlocale.h> to expose these.
- */
-intmax_t	strtoimax_l(const char * __restrict, char ** __restrict,
-		    int, locale_t);
-uintmax_t	strtoumax_l(const char * __restrict, char ** __restrict, int,
-		    locale_t);
-intmax_t	wcstoimax_l(const wchar_t * __restrict, wchar_t ** __restrict,
-		    int , locale_t);
-uintmax_t	wcstoumax_l(const wchar_t * __restrict, wchar_t ** __restrict,
-		    int, locale_t);
diff --git a/include.new/xlocale/_langinfo.h b/include.new/xlocale/_langinfo.h
deleted file mode 100644
index 66e865d..0000000
--- a/include.new/xlocale/_langinfo.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_langinfo.h 231673 2012-02-14 12:03:23Z theraven $
- */
-
-#ifndef _XLOCALE_LANGINFO_H
-#define _XLOCALE_LANGINFO_H
-
-#ifndef _LOCALE_T_DEFINED
-#define _LOCALE_T_DEFINED
-typedef struct	_xlocale *locale_t;
-#endif
-
-char	*nl_langinfo_l(nl_item, locale_t);
-
-#endif /* _XLOCALE_LANGINFO_H */
diff --git a/include.new/xlocale/_locale.h b/include.new/xlocale/_locale.h
deleted file mode 100644
index 81a5f08..0000000
--- a/include.new/xlocale/_locale.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_locale.h 231673 2012-02-14 12:03:23Z theraven $
- */
-
-#ifndef _XLOCALE_LOCALE_H
-#define _XLOCALE_LOCALE_H
-
-#define LC_COLLATE_MASK  (1<<0)
-#define LC_CTYPE_MASK    (1<<1)
-#define LC_MESSAGES_MASK (1<<2)
-#define LC_MONETARY_MASK (1<<3)
-#define LC_NUMERIC_MASK  (1<<4)
-#define LC_TIME_MASK     (1<<5)
-#define LC_ALL_MASK      (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | \
-			  LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK)
-#define LC_GLOBAL_LOCALE ((locale_t)-1)
-
-#ifndef _LOCALE_T_DEFINED
-#define _LOCALE_T_DEFINED
-typedef struct	_xlocale *locale_t;
-#endif
-
-locale_t	 duplocale(locale_t base);
-int		 freelocale(locale_t loc);
-locale_t	 newlocale(int mask, const char *locale, locale_t base);
-const char	*querylocale(int mask, locale_t loc);
-locale_t	 uselocale(locale_t loc);
-
-#endif /* _XLOCALE_LOCALE_H */
diff --git a/include.new/xlocale/_monetary.h b/include.new/xlocale/_monetary.h
deleted file mode 100644
index 10c8851..0000000
--- a/include.new/xlocale/_monetary.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_monetary.h 231673 2012-02-14 12:03:23Z theraven $
- */
-
-#ifndef _LOCALE_T_DEFINED
-#define _LOCALE_T_DEFINED
-typedef struct	_xlocale *locale_t;
-#endif
-
-#if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_)
-#ifndef _XLOCALE_MONETARY_H
-#define _XLOCALE_MONETARY_H
-
-ssize_t strfmon_l(char *, size_t, locale_t, const char *, ...)
-    __strfmonlike(4, 5);
-
-#endif /* _XLOCALE_MONETARY_H */
-#endif /* __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) */
diff --git a/include.new/xlocale/_stdio.h b/include.new/xlocale/_stdio.h
deleted file mode 100644
index 60a8608..0000000
--- a/include.new/xlocale/_stdio.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_stdio.h 231673 2012-02-14 12:03:23Z theraven $
- */
-
-int	 asprintf_l(char **, locale_t, const char *, ...) __printflike(3, 4);
-int	 dprintf_l(int, locale_t, const char * __restrict, ...)
-	    __printflike(3, 4);
-int	 fprintf_l(FILE * __restrict, locale_t, const char * __restrict, ...)
-	    __printflike(3, 4);
-int	 fscanf_l(FILE * __restrict, locale_t, const char * __restrict, ...)
-	    __scanflike(3, 4);
-int	 printf_l(locale_t, const char * __restrict, ...) __printflike(2, 3);
-int	 scanf_l(locale_t, const char * __restrict, ...) __scanflike(2, 3);
-int	 snprintf_l(char * __restrict, size_t, locale_t,
-	    const char * __restrict, ...) __printflike(4, 5);
-int	 sprintf_l(char * __restrict, locale_t, const char * __restrict, ...)
-	    __printflike(3, 4);
-int	 sscanf_l(const char * __restrict, locale_t, const char * __restrict,
-	    ...) __scanflike(3, 4);
-int	 vfprintf_l(FILE * __restrict, locale_t, const char * __restrict,
-	    __va_list) __printflike(3, 0);
-int	 vprintf_l(locale_t, const char * __restrict, __va_list)
-	    __printflike(2, 0);
-int	 vsprintf_l(char * __restrict, locale_t, const char * __restrict,
-	    __va_list) __printflike(3, 0);
-int	 vfscanf_l(FILE * __restrict, locale_t, const char * __restrict,
-	    __va_list) __scanflike(3, 0);
-int	 vscanf_l(locale_t, const char * __restrict, __va_list)
-	    __scanflike(2, 0);
-int	 vsnprintf_l(char * __restrict, size_t, locale_t,
-	    const char * __restrict, __va_list) __printflike(4, 0);
-int	 vsscanf_l(const char * __restrict, locale_t, const char * __restrict,
-	    __va_list) __scanflike(3, 0);
-int	 vdprintf_l(int, locale_t, const char * __restrict, __va_list)
-	    __printflike(3, 0);
-int	 vasprintf_l(char **, locale_t, const char *, __va_list)
-	    __printflike(3, 0);
diff --git a/include.new/xlocale/_stdlib.h b/include.new/xlocale/_stdlib.h
deleted file mode 100644
index aa2a23b..0000000
--- a/include.new/xlocale/_stdlib.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_stdlib.h 231673 2012-02-14 12:03:23Z theraven $
- */
-
-/*
- * Extended locale versions of the locale-aware functions from stdlib.h.
- *
- * Include <stdlib.h> before <xlocale.h> to expose these.
- */
-double			 atof_l(const char *, locale_t);
-int			 atoi_l(const char *, locale_t);
-long			 atol_l(const char *, locale_t);
-long long		 atoll_l(const char *, locale_t);
-int			 mblen_l(const char *, size_t, locale_t);
-size_t			 mbstowcs_l(wchar_t * __restrict,
-			    const char * __restrict, size_t, locale_t);
-int			 mbtowc_l(wchar_t * __restrict,
-			    const char * __restrict, size_t, locale_t);
-double			 strtod_l(const char *, char **, locale_t);
-float			 strtof_l(const char *, char **, locale_t);
-long			 strtol_l(const char *, char **, int, locale_t);
-long double		 strtold_l(const char *, char **, locale_t);
-long long		 strtoll_l(const char *, char **, int, locale_t);
-unsigned long		 strtoul_l(const char *, char **, int, locale_t);
-unsigned long long	 strtoull_l(const char *, char **, int, locale_t);
-size_t			 wcstombs_l(char * __restrict,
-			    const wchar_t * __restrict, size_t, locale_t);
-int			 wctomb_l(char *, wchar_t, locale_t);
-
-int			 ___mb_cur_max_l(locale_t);
-#define MB_CUR_MAX_L(x) (___mb_cur_max_l(x))
-
diff --git a/include.new/xlocale/_string.h b/include.new/xlocale/_string.h
deleted file mode 100644
index d3c0a61..0000000
--- a/include.new/xlocale/_string.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_string.h 267465 2014-06-14 02:57:40Z pfg $
- */
-
-#ifndef _LOCALE_T_DEFINED
-#define _LOCALE_T_DEFINED
-typedef struct	_xlocale *locale_t;
-#endif
-
-/*
- * This file is included from both string.h and xlocale.h.  We need to expose
- * the declarations unconditionally if we are included from xlocale.h, but only
- * if we are in POSIX2008 mode if included from string.h.
- */
-
-#ifndef _XLOCALE_STRING1_H
-#define _XLOCALE_STRING1_H
-
-/*
- * POSIX2008 functions
- */
-int	 strcoll_l(const char *, const char *, locale_t);
-size_t	 strxfrm_l(char *, const char *, size_t, locale_t);
-#endif /* _XLOCALE_STRING1_H */
-
-/*
- * xlocale extensions
- */
-#ifdef _XLOCALE_H_
-#ifndef _XLOCALE_STRING2_H
-#define _XLOCALE_STRING2_H
-char	*strcasestr_l(const char *, const char *, locale_t);
-
-#endif /* _XLOCALE_STRING2_H */
-#endif /* _XLOCALE_H_ */
diff --git a/include.new/xlocale/_strings.h b/include.new/xlocale/_strings.h
deleted file mode 100644
index eb1bc9e..0000000
--- a/include.new/xlocale/_strings.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_strings.h 267465 2014-06-14 02:57:40Z pfg $
- */
-
-#ifndef _LOCALE_T_DEFINED
-#define _LOCALE_T_DEFINED
-typedef struct	_xlocale *locale_t;
-#endif
-
-/*
- * This file is included from both strings.h and xlocale.h.  We need to expose
- * the declarations unconditionally if we are included from xlocale.h, but only
- * if we are in POSIX2008 mode if included from string.h.
- */
-
-#ifndef _XLOCALE_STRINGS1_H
-#define _XLOCALE_STRINGS1_H
-
-/*
- * POSIX2008 functions
- */
-int	 strcasecmp_l(const char *, const char *, locale_t);
-int	 strncasecmp_l(const char *, const char *, size_t, locale_t);
-#endif /* _XLOCALE_STRINGS1_H */
diff --git a/include.new/xlocale/_time.h b/include.new/xlocale/_time.h
deleted file mode 100644
index 9ebc954..0000000
--- a/include.new/xlocale/_time.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_time.h 231673 2012-02-14 12:03:23Z theraven $
- */
-
-#ifndef _LOCALE_T_DEFINED
-#define _LOCALE_T_DEFINED
-typedef struct	_xlocale *locale_t;
-#endif
-
-/*
- * This file is included from both locale.h and xlocale.h.  We need to expose
- * the declarations unconditionally if we are included from xlocale.h, but only
- * if we are in POSIX2008 mode if included from locale.h.
- */
-#ifndef _XLOCALE_LOCALE1_H
-#define _XLOCALE_LOCALE1_H
-
-size_t	 strftime_l(char * __restrict, size_t, const char * __restrict,
-	    const struct tm * __restrict, locale_t) __strftimelike(3, 0);
-
-#endif /* _XLOCALE_LOCALE1_H */
-
-#ifdef _XLOCALE_H_
-#ifndef _XLOCALE_LOCALE2_H
-#define _XLOCALE_LOCALE2_H
-
-char	*strptime_l(const char * __restrict, const char * __restrict,
-           struct tm * __restrict, locale_t);
-
-#endif /* _XLOCALE_LOCALE2_H */
-#endif /* _XLOCALE_H_ */
diff --git a/include.new/xlocale/_uchar.h b/include.new/xlocale/_uchar.h
deleted file mode 100644
index 78289a9..0000000
--- a/include.new/xlocale/_uchar.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2013 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/include/xlocale/_uchar.h 250883 2013-05-21 19:59:37Z ed $
- */
-
-#ifndef _LOCALE_T_DEFINED
-#define _LOCALE_T_DEFINED
-typedef struct	_xlocale *locale_t;
-#endif
-
-#ifndef _XLOCALE_UCHAR_H_
-#define _XLOCALE_UCHAR_H_
-
-size_t	c16rtomb_l(char * __restrict, char16_t, mbstate_t * __restrict,
-    locale_t);
-size_t	c32rtomb_l(char * __restrict, char32_t, mbstate_t * __restrict,
-    locale_t);
-size_t	mbrtoc16_l(char16_t * __restrict, const char * __restrict, size_t,
-    mbstate_t * __restrict, locale_t);
-size_t	mbrtoc32_l(char32_t * __restrict, const char * __restrict, size_t,
-    mbstate_t * __restrict, locale_t);
-
-#endif /* _XLOCALE_UCHAR_H_ */
diff --git a/include.new/xlocale/_wchar.h b/include.new/xlocale/_wchar.h
deleted file mode 100644
index 078ddde..0000000
--- a/include.new/xlocale/_wchar.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*-
- * Copyright (c) 2011, 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/include/xlocale/_wchar.h 231673 2012-02-14 12:03:23Z theraven $
- */
-
-#ifndef _LOCALE_T_DEFINED
-#define _LOCALE_T_DEFINED
-typedef struct	_xlocale *locale_t;
-#endif
-
-#ifndef _XLOCALE_WCHAR1_H
-#define _XLOCALE_WCHAR1_H
-int			 wcscasecmp_l(const wchar_t *, const wchar_t *,
-			   locale_t);
-int			 wcsncasecmp_l(const wchar_t *, const wchar_t *, size_t,
-			   locale_t);
-int			 wcscoll_l(const wchar_t *, const wchar_t *, locale_t);
-size_t			 wcsxfrm_l(wchar_t * __restrict,
-			   const wchar_t * __restrict, size_t, locale_t);
-
-#endif /* _XLOCALE_WCHAR1_H */
-
-/*
- * Only declare the non-POSIX functions if we're included from xlocale.h.
- */
-
-#ifdef _XLOCALE_H_
-#ifndef _XLOCALE_WCHAR2_H
-#define _XLOCALE_WCHAR2_H
-
-wint_t			 btowc_l(int, locale_t);
-wint_t			 fgetwc_l(FILE *, locale_t);
-wchar_t			*fgetws_l(wchar_t * __restrict, int, FILE * __restrict,
-			    locale_t);
-wint_t			 fputwc_l(wchar_t, FILE *, locale_t);
-int			 fputws_l(const wchar_t * __restrict, FILE * __restrict,
-			   locale_t);
-int			 fwprintf_l(FILE * __restrict, locale_t,
-			    const wchar_t * __restrict, ...);
-int			 fwscanf_l(FILE * __restrict, locale_t,
-			    const wchar_t * __restrict, ...);
-wint_t			 getwc_l(FILE *, locale_t);
-wint_t			 getwchar_l(locale_t);
-size_t			 mbrlen_l(const char * __restrict, size_t,
-			   mbstate_t * __restrict, locale_t);
-size_t			 mbrtowc_l(wchar_t * __restrict,
-			    const char * __restrict, size_t,
-			    mbstate_t * __restrict, locale_t);
-int			 mbsinit_l(const mbstate_t *, locale_t);
-size_t			 mbsrtowcs_l(wchar_t * __restrict,
-			    const char ** __restrict, size_t,
-			    mbstate_t * __restrict, locale_t);
-wint_t			 putwc_l(wchar_t, FILE *, locale_t);
-wint_t			 putwchar_l(wchar_t, locale_t);
-int			 swprintf_l(wchar_t * __restrict, size_t n, locale_t,
-			    const wchar_t * __restrict, ...);
-int			 swscanf_l(const wchar_t * __restrict, locale_t,
-			   const wchar_t * __restrict, ...);
-wint_t			 ungetwc_l(wint_t, FILE *, locale_t);
-int			 vfwprintf_l(FILE * __restrict, locale_t,
-			    const wchar_t * __restrict, __va_list);
-int			 vswprintf_l(wchar_t * __restrict, size_t n, locale_t,
-			    const wchar_t * __restrict, __va_list);
-int			 vwprintf_l(locale_t, const wchar_t * __restrict,
-			    __va_list);
-size_t			 wcrtomb_l(char * __restrict, wchar_t,
-			    mbstate_t * __restrict, locale_t);
-size_t			 wcsftime_l(wchar_t * __restrict, size_t,
-			    const wchar_t * __restrict,
-			    const struct tm * __restrict, locale_t);
-size_t			 wcsrtombs_l(char * __restrict,
-			    const wchar_t ** __restrict, size_t,
-			    mbstate_t * __restrict, locale_t);
-double			 wcstod_l(const wchar_t * __restrict,
-			    wchar_t ** __restrict, locale_t);
-long			 wcstol_l(const wchar_t * __restrict,
-			    wchar_t ** __restrict, int, locale_t);
-unsigned long		 wcstoul_l(const wchar_t * __restrict,
-			    wchar_t ** __restrict, int, locale_t);
-int			 wcswidth_l(const wchar_t *, size_t, locale_t);
-int			 wctob_l(wint_t, locale_t);
-int			 wcwidth_l(wchar_t, locale_t);
-int			 wprintf_l(locale_t, const wchar_t * __restrict, ...);
-int			 wscanf_l(locale_t, const wchar_t * __restrict, ...);
-int			 vfwscanf_l(FILE * __restrict, locale_t,
-			    const wchar_t * __restrict, __va_list);
-int			 vswscanf_l(const wchar_t * __restrict, locale_t,
-			    const wchar_t *__restrict, __va_list);
-int			 vwscanf_l(locale_t, const wchar_t * __restrict,
-			    __va_list);
-float			 wcstof_l(const wchar_t * __restrict,
-			    wchar_t ** __restrict, locale_t);
-long double		 wcstold_l(const wchar_t * __restrict,
-			    wchar_t ** __restrict, locale_t);
-long long		 wcstoll_l(const wchar_t * __restrict,
-			    wchar_t ** __restrict, int, locale_t);
-unsigned long long	 wcstoull_l(const wchar_t * __restrict,
-			    wchar_t ** __restrict, int, locale_t);
-size_t			 mbsnrtowcs_l(wchar_t * __restrict,
-			    const char ** __restrict, size_t, size_t,
-			    mbstate_t * __restrict, locale_t);
-size_t			 wcsnrtombs_l(char * __restrict,
-			    const wchar_t ** __restrict, size_t, size_t,
-			    mbstate_t * __restrict, locale_t);
-
-#endif /* _XLOCALE_WCHAR_H */
-#endif /* _XLOCALE_H_ */
diff --git a/include.new/xmmintrin.h b/include.new/xmmintrin.h
deleted file mode 100644
index 921806f..0000000
--- a/include.new/xmmintrin.h
+++ /dev/null
@@ -1,1219 +0,0 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-
-   This file is part of GCC.
-
-   GCC is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   GCC is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-/* As a special exception, if you include this header file into source
-   files compiled by GCC, this header file does not by itself cause
-   the resulting executable to be covered by the GNU General Public
-   License.  This exception does not however invalidate any other
-   reasons why the executable file might be covered by the GNU General
-   Public License.  */
-
-/* Implemented from the specification included in the Intel C++ Compiler
-   User Guide and Reference, version 8.0.  */
-
-#ifndef _XMMINTRIN_H_INCLUDED
-#define _XMMINTRIN_H_INCLUDED
-
-#ifndef __SSE__
-# error "SSE instruction set not enabled"
-#else
-
-/* We need type definitions from the MMX header file.  */
-#include <mmintrin.h>
-
-/* The data type intended for user use.  */
-typedef float __m128 __attribute__ ((__mode__(__V4SF__)));
-
-/* Internal data types for implementing the intrinsics.  */
-typedef float __v4sf __attribute__ ((__mode__(__V4SF__)));
-
-/* Create a selector for use with the SHUFPS instruction.  */
-#define _MM_SHUFFLE(fp3,fp2,fp1,fp0) \
- (((fp3) << 6) | ((fp2) << 4) | ((fp1) << 2) | (fp0))
-
-/* Constants for use with _mm_prefetch.  */
-enum _mm_hint
-{
-  _MM_HINT_T0 = 3,
-  _MM_HINT_T1 = 2,
-  _MM_HINT_T2 = 1,
-  _MM_HINT_NTA = 0
-};
-
-/* Bits in the MXCSR.  */
-#define _MM_EXCEPT_MASK       0x003f
-#define _MM_EXCEPT_INVALID    0x0001
-#define _MM_EXCEPT_DENORM     0x0002
-#define _MM_EXCEPT_DIV_ZERO   0x0004
-#define _MM_EXCEPT_OVERFLOW   0x0008
-#define _MM_EXCEPT_UNDERFLOW  0x0010
-#define _MM_EXCEPT_INEXACT    0x0020
-
-#define _MM_MASK_MASK         0x1f80
-#define _MM_MASK_INVALID      0x0080
-#define _MM_MASK_DENORM       0x0100
-#define _MM_MASK_DIV_ZERO     0x0200
-#define _MM_MASK_OVERFLOW     0x0400
-#define _MM_MASK_UNDERFLOW    0x0800
-#define _MM_MASK_INEXACT      0x1000
-
-#define _MM_ROUND_MASK        0x6000
-#define _MM_ROUND_NEAREST     0x0000
-#define _MM_ROUND_DOWN        0x2000
-#define _MM_ROUND_UP          0x4000
-#define _MM_ROUND_TOWARD_ZERO 0x6000
-
-#define _MM_FLUSH_ZERO_MASK   0x8000
-#define _MM_FLUSH_ZERO_ON     0x8000
-#define _MM_FLUSH_ZERO_OFF    0x0000
-
-/* Perform the respective operation on the lower SPFP (single-precision
-   floating-point) values of A and B; the upper three SPFP values are
-   passed through from A.  */
-
-static __inline __m128
-_mm_add_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_addss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_sub_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_subss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_mul_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_mulss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_div_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_divss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_sqrt_ss (__m128 __A)
-{
-  return (__m128) __builtin_ia32_sqrtss ((__v4sf)__A);
-}
-
-static __inline __m128
-_mm_rcp_ss (__m128 __A)
-{
-  return (__m128) __builtin_ia32_rcpss ((__v4sf)__A);
-}
-
-static __inline __m128
-_mm_rsqrt_ss (__m128 __A)
-{
-  return (__m128) __builtin_ia32_rsqrtss ((__v4sf)__A);
-}
-
-static __inline __m128
-_mm_min_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_minss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_max_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_maxss ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Perform the respective operation on the four SPFP values in A and B.  */
-
-static __inline __m128
-_mm_add_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_addps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_sub_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_subps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_mul_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_mulps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_div_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_divps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_sqrt_ps (__m128 __A)
-{
-  return (__m128) __builtin_ia32_sqrtps ((__v4sf)__A);
-}
-
-static __inline __m128
-_mm_rcp_ps (__m128 __A)
-{
-  return (__m128) __builtin_ia32_rcpps ((__v4sf)__A);
-}
-
-static __inline __m128
-_mm_rsqrt_ps (__m128 __A)
-{
-  return (__m128) __builtin_ia32_rsqrtps ((__v4sf)__A);
-}
-
-static __inline __m128
-_mm_min_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_minps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_max_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_maxps ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Perform logical bit-wise operations on 128-bit values.  */
-
-static __inline __m128
-_mm_and_ps (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_andps (__A, __B);
-}
-
-static __inline __m128
-_mm_andnot_ps (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_andnps (__A, __B);
-}
-
-static __inline __m128
-_mm_or_ps (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_orps (__A, __B);
-}
-
-static __inline __m128
-_mm_xor_ps (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_xorps (__A, __B);
-}
-
-/* Perform a comparison on the lower SPFP values of A and B.  If the
-   comparison is true, place a mask of all ones in the result, otherwise a
-   mask of zeros.  The upper three SPFP values are passed through from A.  */
-
-static __inline __m128
-_mm_cmpeq_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpeqss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmplt_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpltss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmple_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpless ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpgt_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_movss ((__v4sf) __A,
-					(__v4sf)
-					__builtin_ia32_cmpltss ((__v4sf) __B,
-								(__v4sf)
-								__A));
-}
-
-static __inline __m128
-_mm_cmpge_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_movss ((__v4sf) __A,
-					(__v4sf)
-					__builtin_ia32_cmpless ((__v4sf) __B,
-								(__v4sf)
-								__A));
-}
-
-static __inline __m128
-_mm_cmpneq_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpneqss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpnlt_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpnltss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpnle_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpnless ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpngt_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_movss ((__v4sf) __A,
-					(__v4sf)
-					__builtin_ia32_cmpnltss ((__v4sf) __B,
-								 (__v4sf)
-								 __A));
-}
-
-static __inline __m128
-_mm_cmpnge_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_movss ((__v4sf) __A,
-					(__v4sf)
-					__builtin_ia32_cmpnless ((__v4sf) __B,
-								 (__v4sf)
-								 __A));
-}
-
-static __inline __m128
-_mm_cmpord_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpordss ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpunord_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpunordss ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Perform a comparison on the four SPFP values of A and B.  For each
-   element, if the comparison is true, place a mask of all ones in the
-   result, otherwise a mask of zeros.  */
-
-static __inline __m128
-_mm_cmpeq_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpeqps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmplt_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpltps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmple_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpleps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpgt_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpgtps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpge_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpgeps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpneq_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpneqps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpnlt_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpnltps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpnle_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpnleps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpngt_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpngtps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpnge_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpngeps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpord_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpordps ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline __m128
-_mm_cmpunord_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_cmpunordps ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Compare the lower SPFP values of A and B and return 1 if true
-   and 0 if false.  */
-
-static __inline int
-_mm_comieq_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_comieq ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_comilt_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_comilt ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_comile_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_comile ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_comigt_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_comigt ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_comige_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_comige ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_comineq_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_comineq ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_ucomieq_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_ucomieq ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_ucomilt_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_ucomilt ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_ucomile_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_ucomile ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_ucomigt_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_ucomigt ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_ucomige_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_ucomige ((__v4sf)__A, (__v4sf)__B);
-}
-
-static __inline int
-_mm_ucomineq_ss (__m128 __A, __m128 __B)
-{
-  return __builtin_ia32_ucomineq ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Convert the lower SPFP value to a 32-bit integer according to the current
-   rounding mode.  */
-static __inline int
-_mm_cvtss_si32 (__m128 __A)
-{
-  return __builtin_ia32_cvtss2si ((__v4sf) __A);
-}
-
-static __inline int
-_mm_cvt_ss2si (__m128 __A)
-{
-  return _mm_cvtss_si32 (__A);
-}
-
-#ifdef __x86_64__
-/* Convert the lower SPFP value to a 32-bit integer according to the current
-   rounding mode.  */
-static __inline long long
-_mm_cvtss_si64x (__m128 __A)
-{
-  return __builtin_ia32_cvtss2si64 ((__v4sf) __A);
-}
-#endif
-
-/* Convert the two lower SPFP values to 32-bit integers according to the
-   current rounding mode.  Return the integers in packed form.  */
-static __inline __m64
-_mm_cvtps_pi32 (__m128 __A)
-{
-  return (__m64) __builtin_ia32_cvtps2pi ((__v4sf) __A);
-}
-
-static __inline __m64
-_mm_cvt_ps2pi (__m128 __A)
-{
-  return _mm_cvtps_pi32 (__A);
-}
-
-/* Truncate the lower SPFP value to a 32-bit integer.  */
-static __inline int
-_mm_cvttss_si32 (__m128 __A)
-{
-  return __builtin_ia32_cvttss2si ((__v4sf) __A);
-}
-
-static __inline int
-_mm_cvtt_ss2si (__m128 __A)
-{
-  return _mm_cvttss_si32 (__A);
-}
-
-#ifdef __x86_64__
-/* Truncate the lower SPFP value to a 32-bit integer.  */
-static __inline long long
-_mm_cvttss_si64x (__m128 __A)
-{
-  return __builtin_ia32_cvttss2si64 ((__v4sf) __A);
-}
-#endif
-
-/* Truncate the two lower SPFP values to 32-bit integers.  Return the
-   integers in packed form.  */
-static __inline __m64
-_mm_cvttps_pi32 (__m128 __A)
-{
-  return (__m64) __builtin_ia32_cvttps2pi ((__v4sf) __A);
-}
-
-static __inline __m64
-_mm_cvtt_ps2pi (__m128 __A)
-{
-  return _mm_cvttps_pi32 (__A);
-}
-
-/* Convert B to a SPFP value and insert it as element zero in A.  */
-static __inline __m128
-_mm_cvtsi32_ss (__m128 __A, int __B)
-{
-  return (__m128) __builtin_ia32_cvtsi2ss ((__v4sf) __A, __B);
-}
-
-static __inline __m128
-_mm_cvt_si2ss (__m128 __A, int __B)
-{
-  return _mm_cvtsi32_ss (__A, __B);
-}
-
-#ifdef __x86_64__
-/* Convert B to a SPFP value and insert it as element zero in A.  */
-static __inline __m128
-_mm_cvtsi64x_ss (__m128 __A, long long __B)
-{
-  return (__m128) __builtin_ia32_cvtsi642ss ((__v4sf) __A, __B);
-}
-#endif
-
-/* Convert the two 32-bit values in B to SPFP form and insert them
-   as the two lower elements in A.  */
-static __inline __m128
-_mm_cvtpi32_ps (__m128 __A, __m64 __B)
-{
-  return (__m128) __builtin_ia32_cvtpi2ps ((__v4sf) __A, (__v2si)__B);
-}
-
-static __inline __m128
-_mm_cvt_pi2ps (__m128 __A, __m64 __B)
-{
-  return _mm_cvtpi32_ps (__A, __B);
-}
-
-/* Convert the four signed 16-bit values in A to SPFP form.  */
-static __inline __m128
-_mm_cvtpi16_ps (__m64 __A)
-{
-  __v4hi __sign;
-  __v2si __hisi, __losi;
-  __v4sf __r;
-
-  /* This comparison against zero gives us a mask that can be used to
-     fill in the missing sign bits in the unpack operations below, so
-     that we get signed values after unpacking.  */
-  __sign = (__v4hi) __builtin_ia32_mmx_zero ();
-  __sign = __builtin_ia32_pcmpgtw (__sign, (__v4hi)__A);
-
-  /* Convert the four words to doublewords.  */
-  __hisi = (__v2si) __builtin_ia32_punpckhwd ((__v4hi)__A, __sign);
-  __losi = (__v2si) __builtin_ia32_punpcklwd ((__v4hi)__A, __sign);
-
-  /* Convert the doublewords to floating point two at a time.  */
-  __r = (__v4sf) __builtin_ia32_setzerops ();
-  __r = __builtin_ia32_cvtpi2ps (__r, __hisi);
-  __r = __builtin_ia32_movlhps (__r, __r);
-  __r = __builtin_ia32_cvtpi2ps (__r, __losi);
-
-  return (__m128) __r;
-}
-
-/* Convert the four unsigned 16-bit values in A to SPFP form.  */
-static __inline __m128
-_mm_cvtpu16_ps (__m64 __A)
-{
-  __v4hi __zero = (__v4hi) __builtin_ia32_mmx_zero ();
-  __v2si __hisi, __losi;
-  __v4sf __r;
-
-  /* Convert the four words to doublewords.  */
-  __hisi = (__v2si) __builtin_ia32_punpckhwd ((__v4hi)__A, __zero);
-  __losi = (__v2si) __builtin_ia32_punpcklwd ((__v4hi)__A, __zero);
-
-  /* Convert the doublewords to floating point two at a time.  */
-  __r = (__v4sf) __builtin_ia32_setzerops ();
-  __r = __builtin_ia32_cvtpi2ps (__r, __hisi);
-  __r = __builtin_ia32_movlhps (__r, __r);
-  __r = __builtin_ia32_cvtpi2ps (__r, __losi);
-
-  return (__m128) __r;
-}
-
-/* Convert the low four signed 8-bit values in A to SPFP form.  */
-static __inline __m128
-_mm_cvtpi8_ps (__m64 __A)
-{
-  __v8qi __sign;
-
-  /* This comparison against zero gives us a mask that can be used to
-     fill in the missing sign bits in the unpack operations below, so
-     that we get signed values after unpacking.  */
-  __sign = (__v8qi) __builtin_ia32_mmx_zero ();
-  __sign = __builtin_ia32_pcmpgtb (__sign, (__v8qi)__A);
-
-  /* Convert the four low bytes to words.  */
-  __A = (__m64) __builtin_ia32_punpcklbw ((__v8qi)__A, __sign);
-
-  return _mm_cvtpi16_ps(__A);
-}
-
-/* Convert the low four unsigned 8-bit values in A to SPFP form.  */
-static __inline __m128
-_mm_cvtpu8_ps(__m64 __A)
-{
-  __v8qi __zero = (__v8qi) __builtin_ia32_mmx_zero ();
-  __A = (__m64) __builtin_ia32_punpcklbw ((__v8qi)__A, __zero);
-  return _mm_cvtpu16_ps(__A);
-}
-
-/* Convert the four signed 32-bit values in A and B to SPFP form.  */
-static __inline __m128
-_mm_cvtpi32x2_ps(__m64 __A, __m64 __B)
-{
-  __v4sf __zero = (__v4sf) __builtin_ia32_setzerops ();
-  __v4sf __sfa = __builtin_ia32_cvtpi2ps (__zero, (__v2si)__A);
-  __v4sf __sfb = __builtin_ia32_cvtpi2ps (__zero, (__v2si)__B);
-  return (__m128) __builtin_ia32_movlhps (__sfa, __sfb);
-}
-
-/* Convert the four SPFP values in A to four signed 16-bit integers.  */
-static __inline __m64
-_mm_cvtps_pi16(__m128 __A)
-{
-  __v4sf __hisf = (__v4sf)__A;
-  __v4sf __losf = __builtin_ia32_movhlps (__hisf, __hisf);
-  __v2si __hisi = __builtin_ia32_cvtps2pi (__hisf);
-  __v2si __losi = __builtin_ia32_cvtps2pi (__losf);
-  return (__m64) __builtin_ia32_packssdw (__hisi, __losi);
-}
-
-/* Convert the four SPFP values in A to four signed 8-bit integers.  */
-static __inline __m64
-_mm_cvtps_pi8(__m128 __A)
-{
-  __v4hi __tmp = (__v4hi) _mm_cvtps_pi16 (__A);
-  __v4hi __zero = (__v4hi) __builtin_ia32_mmx_zero ();
-  return (__m64) __builtin_ia32_packsswb (__tmp, __zero);
-}
-
-/* Selects four specific SPFP values from A and B based on MASK.  */
-#if 0
-static __inline __m128
-_mm_shuffle_ps (__m128 __A, __m128 __B, int __mask)
-{
-  return (__m128) __builtin_ia32_shufps ((__v4sf)__A, (__v4sf)__B, __mask);
-}
-#else
-#define _mm_shuffle_ps(A, B, MASK) \
- ((__m128) __builtin_ia32_shufps ((__v4sf)(A), (__v4sf)(B), (MASK)))
-#endif
-
-
-/* Selects and interleaves the upper two SPFP values from A and B.  */
-static __inline __m128
-_mm_unpackhi_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_unpckhps ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Selects and interleaves the lower two SPFP values from A and B.  */
-static __inline __m128
-_mm_unpacklo_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_unpcklps ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Sets the upper two SPFP values with 64-bits of data loaded from P;
-   the lower two values are passed through from A.  */
-static __inline __m128
-_mm_loadh_pi (__m128 __A, __m64 const *__P)
-{
-  return (__m128) __builtin_ia32_loadhps ((__v4sf)__A, (__v2si *)__P);
-}
-
-/* Stores the upper two SPFP values of A into P.  */
-static __inline void
-_mm_storeh_pi (__m64 *__P, __m128 __A)
-{
-  __builtin_ia32_storehps ((__v2si *)__P, (__v4sf)__A);
-}
-
-/* Moves the upper two values of B into the lower two values of A.  */
-static __inline __m128
-_mm_movehl_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_movhlps ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Moves the lower two values of B into the upper two values of A.  */
-static __inline __m128
-_mm_movelh_ps (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_movlhps ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Sets the lower two SPFP values with 64-bits of data loaded from P;
-   the upper two values are passed through from A.  */
-static __inline __m128
-_mm_loadl_pi (__m128 __A, __m64 const *__P)
-{
-  return (__m128) __builtin_ia32_loadlps ((__v4sf)__A, (__v2si *)__P);
-}
-
-/* Stores the lower two SPFP values of A into P.  */
-static __inline void
-_mm_storel_pi (__m64 *__P, __m128 __A)
-{
-  __builtin_ia32_storelps ((__v2si *)__P, (__v4sf)__A);
-}
-
-/* Creates a 4-bit mask from the most significant bits of the SPFP values.  */
-static __inline int
-_mm_movemask_ps (__m128 __A)
-{
-  return __builtin_ia32_movmskps ((__v4sf)__A);
-}
-
-/* Return the contents of the control register.  */
-static __inline unsigned int
-_mm_getcsr (void)
-{
-  return __builtin_ia32_stmxcsr ();
-}
-
-/* Read exception bits from the control register.  */
-static __inline unsigned int
-_MM_GET_EXCEPTION_STATE (void)
-{
-  return _mm_getcsr() & _MM_EXCEPT_MASK;
-}
-
-static __inline unsigned int
-_MM_GET_EXCEPTION_MASK (void)
-{
-  return _mm_getcsr() & _MM_MASK_MASK;
-}
-
-static __inline unsigned int
-_MM_GET_ROUNDING_MODE (void)
-{
-  return _mm_getcsr() & _MM_ROUND_MASK;
-}
-
-static __inline unsigned int
-_MM_GET_FLUSH_ZERO_MODE (void)
-{
-  return _mm_getcsr() & _MM_FLUSH_ZERO_MASK;
-}
-
-/* Set the control register to I.  */
-static __inline void
-_mm_setcsr (unsigned int __I)
-{
-  __builtin_ia32_ldmxcsr (__I);
-}
-
-/* Set exception bits in the control register.  */
-static __inline void
-_MM_SET_EXCEPTION_STATE(unsigned int __mask)
-{
-  _mm_setcsr((_mm_getcsr() & ~_MM_EXCEPT_MASK) | __mask);
-}
-
-static __inline void
-_MM_SET_EXCEPTION_MASK (unsigned int __mask)
-{
-  _mm_setcsr((_mm_getcsr() & ~_MM_MASK_MASK) | __mask);
-}
-
-static __inline void
-_MM_SET_ROUNDING_MODE (unsigned int __mode)
-{
-  _mm_setcsr((_mm_getcsr() & ~_MM_ROUND_MASK) | __mode);
-}
-
-static __inline void
-_MM_SET_FLUSH_ZERO_MODE (unsigned int __mode)
-{
-  _mm_setcsr((_mm_getcsr() & ~_MM_FLUSH_ZERO_MASK) | __mode);
-}
-
-/* Create a vector with element 0 as *P and the rest zero.  */
-static __inline __m128
-_mm_load_ss (float const *__P)
-{
-  return (__m128) __builtin_ia32_loadss (__P);
-}
-
-/* Create a vector with all four elements equal to *P.  */
-static __inline __m128
-_mm_load1_ps (float const *__P)
-{
-  __v4sf __tmp = __builtin_ia32_loadss (__P);
-  return (__m128) __builtin_ia32_shufps (__tmp, __tmp, _MM_SHUFFLE (0,0,0,0));
-}
-
-static __inline __m128
-_mm_load_ps1 (float const *__P)
-{
-  return _mm_load1_ps (__P);
-}
-
-/* Load four SPFP values from P.  The address must be 16-byte aligned.  */
-static __inline __m128
-_mm_load_ps (float const *__P)
-{
-  return (__m128) __builtin_ia32_loadaps (__P);
-}
-
-/* Load four SPFP values from P.  The address need not be 16-byte aligned.  */
-static __inline __m128
-_mm_loadu_ps (float const *__P)
-{
-  return (__m128) __builtin_ia32_loadups (__P);
-}
-
-/* Load four SPFP values in reverse order.  The address must be aligned.  */
-static __inline __m128
-_mm_loadr_ps (float const *__P)
-{
-  __v4sf __tmp = __builtin_ia32_loadaps (__P);
-  return (__m128) __builtin_ia32_shufps (__tmp, __tmp, _MM_SHUFFLE (0,1,2,3));
-}
-
-/* Create a vector with element 0 as F and the rest zero.  */
-static __inline __m128
-_mm_set_ss (float __F)
-{
-  return (__m128) __builtin_ia32_loadss (&__F);
-}
-
-/* Create a vector with all four elements equal to F.  */
-static __inline __m128
-_mm_set1_ps (float __F)
-{
-  __v4sf __tmp = __builtin_ia32_loadss (&__F);
-  return (__m128) __builtin_ia32_shufps (__tmp, __tmp, _MM_SHUFFLE (0,0,0,0));
-}
-
-static __inline __m128
-_mm_set_ps1 (float __F)
-{
-  return _mm_set1_ps (__F);
-}
-
-/* Create the vector [Z Y X W].  */
-static __inline __m128
-_mm_set_ps (const float __Z, const float __Y, const float __X, const float __W)
-{
-  return (__v4sf) {__W, __X, __Y, __Z};
-}
-
-/* Create the vector [W X Y Z].  */
-static __inline __m128
-_mm_setr_ps (float __Z, float __Y, float __X, float __W)
-{
-  return _mm_set_ps (__W, __X, __Y, __Z);
-}
-
-/* Create a vector of zeros.  */
-static __inline __m128
-_mm_setzero_ps (void)
-{
-  return (__m128) __builtin_ia32_setzerops ();
-}
-
-/* Stores the lower SPFP value.  */
-static __inline void
-_mm_store_ss (float *__P, __m128 __A)
-{
-  __builtin_ia32_storess (__P, (__v4sf)__A);
-}
-
-/* Store the lower SPFP value across four words.  */
-static __inline void
-_mm_store1_ps (float *__P, __m128 __A)
-{
-  __v4sf __va = (__v4sf)__A;
-  __v4sf __tmp = __builtin_ia32_shufps (__va, __va, _MM_SHUFFLE (0,0,0,0));
-  __builtin_ia32_storeaps (__P, __tmp);
-}
-
-static __inline void
-_mm_store_ps1 (float *__P, __m128 __A)
-{
-  _mm_store1_ps (__P, __A);
-}
-
-/* Store four SPFP values.  The address must be 16-byte aligned.  */
-static __inline void
-_mm_store_ps (float *__P, __m128 __A)
-{
-  __builtin_ia32_storeaps (__P, (__v4sf)__A);
-}
-
-/* Store four SPFP values.  The address need not be 16-byte aligned.  */
-static __inline void
-_mm_storeu_ps (float *__P, __m128 __A)
-{
-  __builtin_ia32_storeups (__P, (__v4sf)__A);
-}
-
-/* Store four SPFP values in reverse order.  The address must be aligned.  */
-static __inline void
-_mm_storer_ps (float *__P, __m128 __A)
-{
-  __v4sf __va = (__v4sf)__A;
-  __v4sf __tmp = __builtin_ia32_shufps (__va, __va, _MM_SHUFFLE (0,1,2,3));
-  __builtin_ia32_storeaps (__P, __tmp);
-}
-
-/* Sets the low SPFP value of A from the low value of B.  */
-static __inline __m128
-_mm_move_ss (__m128 __A, __m128 __B)
-{
-  return (__m128) __builtin_ia32_movss ((__v4sf)__A, (__v4sf)__B);
-}
-
-/* Extracts one of the four words of A.  The selector N must be immediate.  */
-#if 0
-static __inline int
-_mm_extract_pi16 (__m64 __A, int __N)
-{
-  return __builtin_ia32_pextrw ((__v4hi)__A, __N);
-}
-
-static __inline int
-_m_pextrw (__m64 __A, int __N)
-{
-  return _mm_extract_pi16 (__A, __N);
-}
-#else
-#define _mm_extract_pi16(A, N) \
-  __builtin_ia32_pextrw ((__v4hi)(A), (N))
-#define _m_pextrw(A, N)		_mm_extract_pi16((A), (N))
-#endif
-
-/* Inserts word D into one of four words of A.  The selector N must be
-   immediate.  */
-#if 0
-static __inline __m64
-_mm_insert_pi16 (__m64 __A, int __D, int __N)
-{
-  return (__m64)__builtin_ia32_pinsrw ((__v4hi)__A, __D, __N);
-}
-
-static __inline __m64
-_m_pinsrw (__m64 __A, int __D, int __N)
-{
-  return _mm_insert_pi16 (__A, __D, __N);
-}
-#else
-#define _mm_insert_pi16(A, D, N) \
-  ((__m64) __builtin_ia32_pinsrw ((__v4hi)(A), (D), (N)))
-#define _m_pinsrw(A, D, N)	 _mm_insert_pi16((A), (D), (N))
-#endif
-
-/* Compute the element-wise maximum of signed 16-bit values.  */
-static __inline __m64
-_mm_max_pi16 (__m64 __A, __m64 __B)
-{
-  return (__m64) __builtin_ia32_pmaxsw ((__v4hi)__A, (__v4hi)__B);
-}
-
-static __inline __m64
-_m_pmaxsw (__m64 __A, __m64 __B)
-{
-  return _mm_max_pi16 (__A, __B);
-}
-
-/* Compute the element-wise maximum of unsigned 8-bit values.  */
-static __inline __m64
-_mm_max_pu8 (__m64 __A, __m64 __B)
-{
-  return (__m64) __builtin_ia32_pmaxub ((__v8qi)__A, (__v8qi)__B);
-}
-
-static __inline __m64
-_m_pmaxub (__m64 __A, __m64 __B)
-{
-  return _mm_max_pu8 (__A, __B);
-}
-
-/* Compute the element-wise minimum of signed 16-bit values.  */
-static __inline __m64
-_mm_min_pi16 (__m64 __A, __m64 __B)
-{
-  return (__m64) __builtin_ia32_pminsw ((__v4hi)__A, (__v4hi)__B);
-}
-
-static __inline __m64
-_m_pminsw (__m64 __A, __m64 __B)
-{
-  return _mm_min_pi16 (__A, __B);
-}
-
-/* Compute the element-wise minimum of unsigned 8-bit values.  */
-static __inline __m64
-_mm_min_pu8 (__m64 __A, __m64 __B)
-{
-  return (__m64) __builtin_ia32_pminub ((__v8qi)__A, (__v8qi)__B);
-}
-
-static __inline __m64
-_m_pminub (__m64 __A, __m64 __B)
-{
-  return _mm_min_pu8 (__A, __B);
-}
-
-/* Create an 8-bit mask of the signs of 8-bit values.  */
-static __inline int
-_mm_movemask_pi8 (__m64 __A)
-{
-  return __builtin_ia32_pmovmskb ((__v8qi)__A);
-}
-
-static __inline int
-_m_pmovmskb (__m64 __A)
-{
-  return _mm_movemask_pi8 (__A);
-}
-
-/* Multiply four unsigned 16-bit values in A by four unsigned 16-bit values
-   in B and produce the high 16 bits of the 32-bit results.  */
-static __inline __m64
-_mm_mulhi_pu16 (__m64 __A, __m64 __B)
-{
-  return (__m64) __builtin_ia32_pmulhuw ((__v4hi)__A, (__v4hi)__B);
-}
-
-static __inline __m64
-_m_pmulhuw (__m64 __A, __m64 __B)
-{
-  return _mm_mulhi_pu16 (__A, __B);
-}
-
-/* Return a combination of the four 16-bit values in A.  The selector
-   must be an immediate.  */
-#if 0
-static __inline __m64
-_mm_shuffle_pi16 (__m64 __A, int __N)
-{
-  return (__m64) __builtin_ia32_pshufw ((__v4hi)__A, __N);
-}
-
-static __inline __m64
-_m_pshufw (__m64 __A, int __N)
-{
-  return _mm_shuffle_pi16 (__A, __N);
-}
-#else
-#define _mm_shuffle_pi16(A, N) \
-  ((__m64) __builtin_ia32_pshufw ((__v4hi)(A), (N)))
-#define _m_pshufw(A, N)		_mm_shuffle_pi16 ((A), (N))
-#endif
-
-/* Conditionally store byte elements of A into P.  The high bit of each
-   byte in the selector N determines whether the corresponding byte from
-   A is stored.  */
-static __inline void
-_mm_maskmove_si64 (__m64 __A, __m64 __N, char *__P)
-{
-  __builtin_ia32_maskmovq ((__v8qi)__A, (__v8qi)__N, __P);
-}
-
-static __inline void
-_m_maskmovq (__m64 __A, __m64 __N, char *__P)
-{
-  _mm_maskmove_si64 (__A, __N, __P);
-}
-
-/* Compute the rounded averages of the unsigned 8-bit values in A and B.  */
-static __inline __m64
-_mm_avg_pu8 (__m64 __A, __m64 __B)
-{
-  return (__m64) __builtin_ia32_pavgb ((__v8qi)__A, (__v8qi)__B);
-}
-
-static __inline __m64
-_m_pavgb (__m64 __A, __m64 __B)
-{
-  return _mm_avg_pu8 (__A, __B);
-}
-
-/* Compute the rounded averages of the unsigned 16-bit values in A and B.  */
-static __inline __m64
-_mm_avg_pu16 (__m64 __A, __m64 __B)
-{
-  return (__m64) __builtin_ia32_pavgw ((__v4hi)__A, (__v4hi)__B);
-}
-
-static __inline __m64
-_m_pavgw (__m64 __A, __m64 __B)
-{
-  return _mm_avg_pu16 (__A, __B);
-}
-
-/* Compute the sum of the absolute differences of the unsigned 8-bit
-   values in A and B.  Return the value in the lower 16-bit word; the
-   upper words are cleared.  */
-static __inline __m64
-_mm_sad_pu8 (__m64 __A, __m64 __B)
-{
-  return (__m64) __builtin_ia32_psadbw ((__v8qi)__A, (__v8qi)__B);
-}
-
-static __inline __m64
-_m_psadbw (__m64 __A, __m64 __B)
-{
-  return _mm_sad_pu8 (__A, __B);
-}
-
-/* Loads one cache line from address P to a location "closer" to the
-   processor.  The selector I specifies the type of prefetch operation.  */
-#if 0
-static __inline void
-_mm_prefetch (void *__P, enum _mm_hint __I)
-{
-  __builtin_prefetch (__P, 0, __I);
-}
-#else
-#define _mm_prefetch(P, I) \
-  __builtin_prefetch ((P), 0, (I))
-#endif
-
-/* Stores the data in A to the address P without polluting the caches.  */
-static __inline void
-_mm_stream_pi (__m64 *__P, __m64 __A)
-{
-  __builtin_ia32_movntq ((unsigned long long *)__P, (unsigned long long)__A);
-}
-
-/* Likewise.  The address must be 16-byte aligned.  */
-static __inline void
-_mm_stream_ps (float *__P, __m128 __A)
-{
-  __builtin_ia32_movntps (__P, (__v4sf)__A);
-}
-
-/* Guarantees that every preceding store is globally visible before
-   any subsequent store.  */
-static __inline void
-_mm_sfence (void)
-{
-  __builtin_ia32_sfence ();
-}
-
-/* The execution of the next instruction is delayed by an implementation
-   specific amount of time.  The instruction does not modify the
-   architectural state.  */
-static __inline void
-_mm_pause (void)
-{
-  __asm__ __volatile__ ("rep; nop" : : );
-}
-
-/* Transpose the 4x4 matrix composed of row[0-3].  */
-#define _MM_TRANSPOSE4_PS(row0, row1, row2, row3)			\
-do {									\
-  __v4sf __r0 = (row0), __r1 = (row1), __r2 = (row2), __r3 = (row3);	\
-  __v4sf __t0 = __builtin_ia32_shufps (__r0, __r1, 0x44);		\
-  __v4sf __t2 = __builtin_ia32_shufps (__r0, __r1, 0xEE);		\
-  __v4sf __t1 = __builtin_ia32_shufps (__r2, __r3, 0x44);		\
-  __v4sf __t3 = __builtin_ia32_shufps (__r2, __r3, 0xEE);		\
-  (row0) = __builtin_ia32_shufps (__t0, __t1, 0x88);			\
-  (row1) = __builtin_ia32_shufps (__t0, __t1, 0xDD);			\
-  (row2) = __builtin_ia32_shufps (__t2, __t3, 0x88);			\
-  (row3) = __builtin_ia32_shufps (__t2, __t3, 0xDD);			\
-} while (0)
-
-/* For backward source compatibility.  */
-#include <emmintrin.h>
-
-#endif /* __SSE__ */
-#endif /* _XMMINTRIN_H_INCLUDED */
diff --git a/include.new/ypclnt.h b/include.new/ypclnt.h
deleted file mode 100644
index 709f67a..0000000
--- a/include.new/ypclnt.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by ThinkSec AS and
- * NAI Labs, the Security Research Division of Network Associates, Inc.
- * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
- * DARPA CHATS research program.
- *
- * 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: releng/10.2/lib/libypclnt/ypclnt.h 160804 2006-07-28 21:34:37Z stefanf $
- */
-
-#ifndef _YPCLNT_H_INCLUDED
-
-typedef struct ypclnt ypclnt_t;
-struct ypclnt {
-	char	*domain;	/* Domain name */
-	char	*map;		/* Map name */
-	char	*server;	/* Server name */
-	char	*error;		/* Error message */
-};
-
-struct passwd;
-
-ypclnt_t	*ypclnt_new(const char *, const char *, const char *);
-void		 ypclnt_free(ypclnt_t *);
-void		 ypclnt_error(ypclnt_t *, const char *, const char *, ...);
-int		 ypclnt_connect(ypclnt_t *);
-int		 ypclnt_havepasswdd(ypclnt_t *);
-int		 ypclnt_passwd(ypclnt_t *, const struct passwd *, const char *);
-
-#endif
diff --git a/include.new/zconf.h b/include.new/zconf.h
deleted file mode 100644
index 6c962d2..0000000
--- a/include.new/zconf.h
+++ /dev/null
@@ -1,519 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2013 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* @(#) $FreeBSD: releng/10.2/lib/libz/zconf.h 250261 2013-05-05 06:20:49Z delphij $ */
-
-#ifndef ZCONF_H
-#define ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- * Even better than compiling with -DZ_PREFIX would be to use configure to set
- * this permanently in zconf.h using "./configure --zprefix".
- */
-#ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
-#  define Z_PREFIX_SET
-
-/* all linked symbols */
-#  define _dist_code            z__dist_code
-#  define _length_code          z__length_code
-#  define _tr_align             z__tr_align
-#  define _tr_flush_bits        z__tr_flush_bits
-#  define _tr_flush_block       z__tr_flush_block
-#  define _tr_init              z__tr_init
-#  define _tr_stored_block      z__tr_stored_block
-#  define _tr_tally             z__tr_tally
-#  define adler32               z_adler32
-#  define adler32_combine       z_adler32_combine
-#  define adler32_combine64     z_adler32_combine64
-#  ifndef Z_SOLO
-#    define compress              z_compress
-#    define compress2             z_compress2
-#    define compressBound         z_compressBound
-#  endif
-#  define crc32                 z_crc32
-#  define crc32_combine         z_crc32_combine
-#  define crc32_combine64       z_crc32_combine64
-#  define deflate               z_deflate
-#  define deflateBound          z_deflateBound
-#  define deflateCopy           z_deflateCopy
-#  define deflateEnd            z_deflateEnd
-#  define deflateInit2_         z_deflateInit2_
-#  define deflateInit_          z_deflateInit_
-#  define deflateParams         z_deflateParams
-#  define deflatePending        z_deflatePending
-#  define deflatePrime          z_deflatePrime
-#  define deflateReset          z_deflateReset
-#  define deflateResetKeep      z_deflateResetKeep
-#  define deflateSetDictionary  z_deflateSetDictionary
-#  define deflateSetHeader      z_deflateSetHeader
-#  define deflateTune           z_deflateTune
-#  define deflate_copyright     z_deflate_copyright
-#  define get_crc_table         z_get_crc_table
-#  ifndef Z_SOLO
-#    define gz_error              z_gz_error
-#    define gz_intmax             z_gz_intmax
-#    define gz_strwinerror        z_gz_strwinerror
-#    define gzbuffer              z_gzbuffer
-#    define gzclearerr            z_gzclearerr
-#    define gzclose               z_gzclose
-#    define gzclose_r             z_gzclose_r
-#    define gzclose_w             z_gzclose_w
-#    define gzdirect              z_gzdirect
-#    define gzdopen               z_gzdopen
-#    define gzeof                 z_gzeof
-#    define gzerror               z_gzerror
-#    define gzflush               z_gzflush
-#    define gzgetc                z_gzgetc
-#    define gzgetc_               z_gzgetc_
-#    define gzgets                z_gzgets
-#    define gzoffset              z_gzoffset
-#    define gzoffset64            z_gzoffset64
-#    define gzopen                z_gzopen
-#    define gzopen64              z_gzopen64
-#    ifdef _WIN32
-#      define gzopen_w              z_gzopen_w
-#    endif
-#    define gzprintf              z_gzprintf
-#    define gzvprintf             z_gzvprintf
-#    define gzputc                z_gzputc
-#    define gzputs                z_gzputs
-#    define gzread                z_gzread
-#    define gzrewind              z_gzrewind
-#    define gzseek                z_gzseek
-#    define gzseek64              z_gzseek64
-#    define gzsetparams           z_gzsetparams
-#    define gztell                z_gztell
-#    define gztell64              z_gztell64
-#    define gzungetc              z_gzungetc
-#    define gzwrite               z_gzwrite
-#  endif
-#  define inflate               z_inflate
-#  define inflateBack           z_inflateBack
-#  define inflateBackEnd        z_inflateBackEnd
-#  define inflateBackInit_      z_inflateBackInit_
-#  define inflateCopy           z_inflateCopy
-#  define inflateEnd            z_inflateEnd
-#  define inflateGetHeader      z_inflateGetHeader
-#  define inflateInit2_         z_inflateInit2_
-#  define inflateInit_          z_inflateInit_
-#  define inflateMark           z_inflateMark
-#  define inflatePrime          z_inflatePrime
-#  define inflateReset          z_inflateReset
-#  define inflateReset2         z_inflateReset2
-#  define inflateSetDictionary  z_inflateSetDictionary
-#  define inflateGetDictionary  z_inflateGetDictionary
-#  define inflateSync           z_inflateSync
-#  define inflateSyncPoint      z_inflateSyncPoint
-#  define inflateUndermine      z_inflateUndermine
-#  define inflateResetKeep      z_inflateResetKeep
-#  define inflate_copyright     z_inflate_copyright
-#  define inflate_fast          z_inflate_fast
-#  define inflate_table         z_inflate_table
-#  ifndef Z_SOLO
-#    define uncompress            z_uncompress
-#  endif
-#  define zError                z_zError
-#  ifndef Z_SOLO
-#    define zcalloc               z_zcalloc
-#    define zcfree                z_zcfree
-#  endif
-#  define zlibCompileFlags      z_zlibCompileFlags
-#  define zlibVersion           z_zlibVersion
-
-/* all zlib typedefs in zlib.h and zconf.h */
-#  define Byte                  z_Byte
-#  define Bytef                 z_Bytef
-#  define alloc_func            z_alloc_func
-#  define charf                 z_charf
-#  define free_func             z_free_func
-#  ifndef Z_SOLO
-#    define gzFile                z_gzFile
-#  endif
-#  define gz_header             z_gz_header
-#  define gz_headerp            z_gz_headerp
-#  define in_func               z_in_func
-#  define intf                  z_intf
-#  define out_func              z_out_func
-#  define uInt                  z_uInt
-#  define uIntf                 z_uIntf
-#  define uLong                 z_uLong
-#  define uLongf                z_uLongf
-#  define voidp                 z_voidp
-#  define voidpc                z_voidpc
-#  define voidpf                z_voidpf
-
-/* all zlib structs in zlib.h and zconf.h */
-#  define gz_header_s           z_gz_header_s
-#  define internal_state        z_internal_state
-
-#endif
-
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2)
-#  define OS2
-#endif
-#if defined(_WINDOWS) && !defined(WINDOWS)
-#  define WINDOWS
-#endif
-#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__)
-#  ifndef WIN32
-#    define WIN32
-#  endif
-#endif
-#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32)
-#  if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__)
-#    ifndef SYS16BIT
-#      define SYS16BIT
-#    endif
-#  endif
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#ifdef SYS16BIT
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#ifdef __STDC_VERSION__
-#  ifndef STDC
-#    define STDC
-#  endif
-#  if __STDC_VERSION__ >= 199901L
-#    ifndef STDC99
-#      define STDC99
-#    endif
-#  endif
-#endif
-#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32))
-#  define STDC
-#endif
-#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__))
-#  define STDC
-#endif
-
-#if defined(__OS400__) && !defined(STDC)    /* iSeries (formerly AS/400). */
-#  define STDC
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const       /* note: need a more gentle solution here */
-#  endif
-#endif
-
-#if defined(ZLIB_CONST) && !defined(z_const)
-#  define z_const const
-#else
-#  define z_const
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-#ifndef Z_ARG /* function prototypes for stdarg */
-#  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define Z_ARG(args)  args
-#  else
-#    define Z_ARG(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#ifdef SYS16BIT
-#  if defined(M_I86SM) || defined(M_I86MM)
-     /* MSC small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef _MSC_VER
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#  if (defined(__SMALL__) || defined(__MEDIUM__))
-     /* Turbo C small or medium model */
-#    define SMALL_MEDIUM
-#    ifdef __BORLANDC__
-#      define FAR _far
-#    else
-#      define FAR far
-#    endif
-#  endif
-#endif
-
-#if defined(WINDOWS) || defined(WIN32)
-   /* If building or using zlib as a DLL, define ZLIB_DLL.
-    * This is not mandatory, but it offers a little performance increase.
-    */
-#  ifdef ZLIB_DLL
-#    if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500))
-#      ifdef ZLIB_INTERNAL
-#        define ZEXTERN extern __declspec(dllexport)
-#      else
-#        define ZEXTERN extern __declspec(dllimport)
-#      endif
-#    endif
-#  endif  /* ZLIB_DLL */
-   /* If building or using zlib with the WINAPI/WINAPIV calling convention,
-    * define ZLIB_WINAPI.
-    * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI.
-    */
-#  ifdef ZLIB_WINAPI
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-     /* No need for _export, use ZLIB.DEF instead. */
-     /* For complete Windows compatibility, use WINAPI, not __stdcall. */
-#    define ZEXPORT WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA WINAPIV
-#    else
-#      define ZEXPORTVA FAR CDECL
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  ifdef ZLIB_DLL
-#    ifdef ZLIB_INTERNAL
-#      define ZEXPORT   __declspec(dllexport)
-#      define ZEXPORTVA __declspec(dllexport)
-#    else
-#      define ZEXPORT   __declspec(dllimport)
-#      define ZEXPORTVA __declspec(dllimport)
-#    endif
-#  endif
-#endif
-
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
-#ifndef FAR
-#  define FAR
-#endif
-
-#if !defined(__MACTYPES__)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void const *voidpc;
-   typedef void FAR   *voidpf;
-   typedef void       *voidp;
-#else
-   typedef Byte const *voidpc;
-   typedef Byte FAR   *voidpf;
-   typedef Byte       *voidp;
-#endif
-
-#if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC)
-#  include <limits.h>
-#  if (UINT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned
-#  elif (ULONG_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned long
-#  elif (USHRT_MAX == 0xffffffffUL)
-#    define Z_U4 unsigned short
-#  endif
-#endif
-
-#ifdef Z_U4
-   typedef Z_U4 z_crc_t;
-#else
-   typedef unsigned long z_crc_t;
-#endif
-
-#if 0    /* was set to #if 0 by ./configure */
-#  define Z_HAVE_UNISTD_H
-#endif
-
-#ifdef HAVE_STDARG_H    /* may be set to #if 1 by ./configure */
-#  define Z_HAVE_STDARG_H
-#endif
-
-#ifdef STDC
-#  ifndef Z_SOLO
-#    include <sys/types.h>      /* for off_t */
-#  endif
-#endif
-
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-#    include <stdarg.h>         /* for va_list */
-#  endif
-#endif
-
-#ifdef _WIN32
-#  ifndef Z_SOLO
-#    include <stddef.h>         /* for wchar_t */
-#  endif
-#endif
-
-/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and
- * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even
- * though the former does not conform to the LFS document), but considering
- * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as
- * equivalently requesting no 64-bit operations
- */
-#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1
-#  undef _LARGEFILE64_SOURCE
-#endif
-
-#if defined(__WATCOMC__) && !defined(Z_HAVE_UNISTD_H)
-#  define Z_HAVE_UNISTD_H
-#endif
-#ifndef Z_SOLO
-#  if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE)
-#    include <unistd.h>         /* for SEEK_*, off_t, and _LFS64_LARGEFILE */
-#    ifdef VMS
-#      include <unixio.h>       /* for off_t */
-#    endif
-#    ifndef z_off_t
-#      define z_off_t off_t
-#    endif
-#  endif
-#endif
-
-#if defined(_LFS64_LARGEFILE) && _LFS64_LARGEFILE-0
-#  define Z_LFS64
-#endif
-
-#if defined(_LARGEFILE64_SOURCE) && defined(Z_LFS64)
-#  define Z_LARGE64
-#endif
-
-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS-0 == 64 && defined(Z_LFS64)
-#  define Z_WANT64
-#endif
-
-#if !defined(SEEK_SET) && !defined(Z_SOLO)
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-
-/*
- * This is hard-configured for FreeBSD.
- */
-#define	z_off_t	off_t
-#ifndef _FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
-
-#ifndef z_off_t
-#  define z_off_t long
-#endif
-
-#if !defined(_WIN32) && defined(Z_LARGE64)
-#  define z_off64_t off64_t
-#else
-#  if defined(_WIN32) && !defined(__GNUC__) && !defined(Z_SOLO)
-#    define z_off64_t __int64
-#  else
-#    define z_off64_t z_off_t
-#  endif
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-  #pragma map(deflateInit_,"DEIN")
-  #pragma map(deflateInit2_,"DEIN2")
-  #pragma map(deflateEnd,"DEEND")
-  #pragma map(deflateBound,"DEBND")
-  #pragma map(inflateInit_,"ININ")
-  #pragma map(inflateInit2_,"ININ2")
-  #pragma map(inflateEnd,"INEND")
-  #pragma map(inflateSync,"INSY")
-  #pragma map(inflateSetDictionary,"INSEDI")
-  #pragma map(compressBound,"CMBND")
-  #pragma map(inflate_table,"INTABL")
-  #pragma map(inflate_fast,"INFA")
-  #pragma map(inflate_copyright,"INCOPY")
-#endif
-
-#endif /* ZCONF_H */
diff --git a/include.new/zlib.h b/include.new/zlib.h
deleted file mode 100644
index 3e0c767..0000000
--- a/include.new/zlib.h
+++ /dev/null
@@ -1,1768 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.8, April 28th, 2013
-
-  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
-  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
-*/
-
-#ifndef ZLIB_H
-#define ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.2.8"
-#define ZLIB_VERNUM 0x1280
-#define ZLIB_VER_MAJOR 1
-#define ZLIB_VER_MINOR 2
-#define ZLIB_VER_REVISION 8
-#define ZLIB_VER_SUBREVISION 0
-
-/*
-    The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed data.
-  This version of the library supports only one compression method (deflation)
-  but other algorithms will be added later and will have the same stream
-  interface.
-
-    Compression can be done in a single step if the buffers are large enough,
-  or can be done by repeated calls of the compression function.  In the latter
-  case, the application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-    The compressed data format used by default by the in-memory functions is
-  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
-  around a deflate stream, which is itself documented in RFC 1951.
-
-    The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio using the functions that start
-  with "gz".  The gzip format is different from the zlib format.  gzip is a
-  gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.
-
-    This library can optionally read and write gzip streams in memory as well.
-
-    The zlib format was designed to be compact and fast for use in memory
-  and on communications channels.  The gzip format was designed for single-
-  file compression on file systems, has a larger header than zlib to maintain
-  directory information, and uses a different, slower check method than zlib.
-
-    The library does not install any signal handler.  The decoder checks
-  the consistency of the compressed data, so the library should never crash
-  even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    z_const Bytef *next_in;     /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total number of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total number of bytes output so far */
-
-    z_const char *msg;  /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: binary or text */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-     gzip header information passed to and from zlib routines.  See RFC 1952
-  for more details on the meanings of these fields.
-*/
-typedef struct gz_header_s {
-    int     text;       /* true if compressed data believed to be text */
-    uLong   time;       /* modification time */
-    int     xflags;     /* extra flags (not used when writing a gzip file) */
-    int     os;         /* operating system */
-    Bytef   *extra;     /* pointer to extra field or Z_NULL if none */
-    uInt    extra_len;  /* extra field length (valid if extra != Z_NULL) */
-    uInt    extra_max;  /* space at extra (only when reading header) */
-    Bytef   *name;      /* pointer to zero-terminated file name or Z_NULL */
-    uInt    name_max;   /* space at name (only when reading header) */
-    Bytef   *comment;   /* pointer to zero-terminated comment or Z_NULL */
-    uInt    comm_max;   /* space at comment (only when reading header) */
-    int     hcrc;       /* true if there was or will be a header crc */
-    int     done;       /* true when done reading gzip header (not used
-                           when writing a gzip file) */
-} gz_header;
-
-typedef gz_header FAR *gz_headerp;
-
-/*
-     The application must update next_in and avail_in when avail_in has dropped
-   to zero.  It must update next_out and avail_out when avail_out has dropped
-   to zero.  The application must initialize zalloc, zfree and opaque before
-   calling the init function.  All other fields are set by the compression
-   library and must not be updated by the application.
-
-     The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree.  This can be useful for custom
-   memory management.  The compression library attaches no meaning to the
-   opaque value.
-
-     zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-     On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this if
-   the symbol MAXSEG_64K is defined (see zconf.h).  WARNING: On MSDOS, pointers
-   returned by zalloc for objects of exactly 65536 bytes *must* have their
-   offset normalized to zero.  The default allocation function provided by this
-   library ensures this (see zutil.c).  To reduce memory requirements and avoid
-   any allocation of 64K objects, at the expense of compression ratio, compile
-   the library with -DMAX_WBITS=14 (see zconf.h).
-
-     The fields total_in and total_out can be used for statistics or progress
-   reports.  After compression, total_in holds the total size of the
-   uncompressed data and may be saved for use in the decompressor (particularly
-   if the decompressor wants to decompress everything in a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-#define Z_BLOCK         5
-#define Z_TREES         6
-/* Allowed flush values; see deflate() and inflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative values
- * are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_RLE                 3
-#define Z_FIXED               4
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_TEXT     1
-#define Z_ASCII    Z_TEXT   /* for compatibility with 1.2.2 and earlier */
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field (though see inflate()) */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is not
-   compatible with the zlib.h header file used by the application.  This check
-   is automatically made by deflateInit and inflateInit.
- */
-
-/*
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression.  The fields
-   zalloc, zfree and opaque must be initialized before by the caller.  If
-   zalloc and zfree are set to Z_NULL, deflateInit updates them to use default
-   allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at all
-   (the input data is simply copied a block at a time).  Z_DEFAULT_COMPRESSION
-   requests a default compromise between speed and compression (currently
-   equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if level is not a valid compression level, or
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).  msg is set to null
-   if there is no error message.  deflateInit does not perform any compression:
-   this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows.  deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).  Some
-    output may be provided even if flush is not set.
-
-    Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating avail_in or avail_out accordingly; avail_out should
-  never be zero before the call.  The application can consume the compressed
-  output when it wants, for example when the output buffer is full (avail_out
-  == 0), or after each call of deflate().  If deflate returns Z_OK and with
-  zero avail_out, it must be called again after making room in the output
-  buffer because there might be more output pending.
-
-    Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to
-  decide how much data to accumulate before producing output, in order to
-  maximize compression.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far.  (In
-  particular avail_in is zero after the call if enough output space has been
-  provided before the call.) Flushing may degrade compression for some
-  compression algorithms and so it should be used only when necessary.  This
-  completes the current deflate block and follows it with an empty stored block
-  that is three bits plus filler bits to the next byte, followed by four bytes
-  (00 00 ff ff).
-
-    If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the
-  output buffer, but the output is not aligned to a byte boundary.  All of the
-  input data so far will be available to the decompressor, as for Z_SYNC_FLUSH.
-  This completes the current deflate block and follows it with an empty fixed
-  codes block that is 10 bits long.  This assures that enough bytes are output
-  in order for the decompressor to finish the block before the empty fixed code
-  block.
-
-    If flush is set to Z_BLOCK, a deflate block is completed and emitted, as
-  for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to
-  seven bits of the current block are held to be written as the next byte after
-  the next deflate block is completed.  In this case, the decompressor may not
-  be provided enough bits at this point in order to complete decompression of
-  the data provided so far to the compressor.  It may need to wait for the next
-  block to be emitted.  This is for advanced applications that need to control
-  the emission of deflate blocks.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired.  Using Z_FULL_FLUSH too often can seriously degrade
-  compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).  In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that
-  avail_out is greater than six to avoid repeated flush markers due to
-  avail_out == 0 on return.
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there was
-  enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error.  After
-  deflate has returned Z_STREAM_END, the only possible operations on the stream
-  are deflateReset or deflateEnd.
-
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step.  In this case, avail_out must be at least the
-  value returned by deflateBound (see below).  Then deflate is guaranteed to
-  return Z_STREAM_END.  If not enough output space is provided, deflate will
-  not return Z_STREAM_END, and it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update strm->data_type if it can make a good guess about
-  the input data type (Z_BINARY or Z_TEXT).  In doubt, the data is considered
-  binary.  This field is only for information purposes and does not affect the
-  compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).  Note that Z_BUF_ERROR is not
-  fatal, and deflate() can be called again with more input and more output
-  space to continue compressing.
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded).  In the error case, msg
-   may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/*
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression.  The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller.  If next_in is not Z_NULL and avail_in is large enough (the
-   exact value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit() does not process any header information -- that is deferred
-   until inflate() is called.
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full.  It may introduce
-  some output latency (reading input without producing any output) except when
-  forced to flush.
-
-  The detailed semantics are as follows.  inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly.  If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing will
-    resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there is
-    no more input data or no more space in the output buffer (see below about
-    the flush parameter).
-
-    Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming more
-  output, and updating the next_* and avail_* values accordingly.  The
-  application can consume the uncompressed output when it wants, for example
-  when the output buffer is full (avail_out == 0), or after each call of
-  inflate().  If inflate returns Z_OK and with zero avail_out, it must be
-  called again after making room in the output buffer because there might be
-  more output pending.
-
-    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH,
-  Z_BLOCK, or Z_TREES.  Z_SYNC_FLUSH requests that inflate() flush as much
-  output as possible to the output buffer.  Z_BLOCK requests that inflate()
-  stop if and when it gets to the next deflate block boundary.  When decoding
-  the zlib or gzip format, this will cause inflate() to return immediately
-  after the header and before the first block.  When doing a raw inflate,
-  inflate() will go ahead and process the first block, and will return when it
-  gets to the end of that block, or when it runs out of data.
-
-    The Z_BLOCK option assists in appending to or combining deflate streams.
-  Also to assist in this, on return inflate() will set strm->data_type to the
-  number of unused bits in the last byte taken from strm->next_in, plus 64 if
-  inflate() is currently decoding the last block in the deflate stream, plus
-  128 if inflate() returned immediately after decoding an end-of-block code or
-  decoding the complete header up to just before the first byte of the deflate
-  stream.  The end-of-block will not be indicated until all of the uncompressed
-  data from that block has been written to strm->next_out.  The number of
-  unused bits may in general be greater than seven, except when bit 7 of
-  data_type is set, in which case the number of unused bits will be less than
-  eight.  data_type is set as noted here every time inflate() returns for all
-  flush options, and so can be used to determine the amount of currently
-  consumed input in bits.
-
-    The Z_TREES option behaves as Z_BLOCK does, but it also returns when the
-  end of each deflate block header is reached, before any actual data in that
-  block is decoded.  This allows the caller to determine the length of the
-  deflate block header for later use in random access within a deflate block.
-  256 is added to the value of strm->data_type when inflate() returns
-  immediately after reaching the end of the deflate block header.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error.  However if all decompression is to be performed in a single step (a
-  single call of inflate), the parameter flush should be set to Z_FINISH.  In
-  this case all pending input is processed and all pending output is flushed;
-  avail_out must be large enough to hold all of the uncompressed data for the
-  operation to complete.  (The size of the uncompressed data may have been
-  saved by the compressor for this purpose.) The use of Z_FINISH is not
-  required to perform an inflation in one step.  However it may be used to
-  inform inflate that a faster approach can be used for the single inflate()
-  call.  Z_FINISH also informs inflate to not maintain a sliding window if the
-  stream completes, which reduces inflate's memory footprint.  If the stream
-  does not complete, either because not all of the stream is provided or not
-  enough output space is provided, then a sliding window will be allocated and
-  inflate() can be called again to continue the operation as if Z_NO_FLUSH had
-  been used.
-
-     In this implementation, inflate() always flushes as much output as
-  possible to the output buffer, and always uses the faster approach on the
-  first call.  So the effects of the flush parameter in this implementation are
-  on the return value of inflate() as noted below, when inflate() returns early
-  when Z_BLOCK or Z_TREES is used, and when inflate() avoids the allocation of
-  memory for a sliding window when Z_FINISH is used.
-
-     If a preset dictionary is needed after this call (see inflateSetDictionary
-  below), inflate sets strm->adler to the Adler-32 checksum of the dictionary
-  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
-  strm->adler to the Adler-32 checksum of all output produced so far (that is,
-  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
-  below.  At the end of the stream, inflate() checks that its computed adler32
-  checksum is equal to that saved by the compressor and returns Z_STREAM_END
-  only if the checksum is correct.
-
-    inflate() can decompress and check either zlib-wrapped or gzip-wrapped
-  deflate data.  The header type is detected automatically, if requested when
-  initializing with inflateInit2().  Any information contained in the gzip
-  header is not retained, so applications that need that information should
-  instead use raw inflate, see inflateInit2() below, or inflateBack() and
-  perform their own processing of the gzip header and trailer.  When processing
-  gzip-wrapped deflate data, strm->adler32 is set to the CRC-32 of the output
-  producted so far.  The CRC-32 is checked against the gzip trailer.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect check
-  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory,
-  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  output buffer when Z_FINISH is used.  Note that Z_BUF_ERROR is not fatal, and
-  inflate() can be called again with more input and more output space to
-  continue decompressing.  If Z_DATA_ERROR is returned, the application may
-  then call inflateSync() to look for a good compression block if a partial
-  recovery of the data is desired.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any pending
-   output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent.  In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options.  The
-   fields next_in, zalloc, zfree and opaque must be initialized before by the
-   caller.
-
-     The method parameter is the compression method.  It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library.  Larger values of this parameter result in better
-   compression at the expense of memory usage.  The default value is 15 if
-   deflateInit is used instead.
-
-     windowBits can also be -8..-15 for raw deflate.  In this case, -windowBits
-   determines the window size.  deflate() will then generate raw deflate data
-   with no zlib header or trailer, and will not compute an adler32 check value.
-
-     windowBits can also be greater than 15 for optional gzip encoding.  Add
-   16 to windowBits to write a simple gzip header and trailer around the
-   compressed data instead of a zlib wrapper.  The gzip header will have no
-   file name, no extra data, no comment, no modification time (set to zero), no
-   header crc, and the operating system will be set to 255 (unknown).  If a
-   gzip stream is being written, strm->adler is a crc32 instead of an adler32.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state.  memLevel=1 uses minimum memory but is
-   slow and reduces compression ratio; memLevel=9 uses maximum memory for
-   optimal speed.  The default value is 8.  See zconf.h for total memory usage
-   as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm.  Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match), or Z_RLE to limit match distances to one (run-length
-   encoding).  Filtered data consists mostly of small values with a somewhat
-   random distribution.  In this case, the compression algorithm is tuned to
-   compress them better.  The effect of Z_FILTERED is to force more Huffman
-   coding and less string matching; it is somewhat intermediate between
-   Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY.  Z_RLE is designed to be almost as
-   fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data.  The
-   strategy parameter only affects the compression ratio but not the
-   correctness of the compressed output even if it is not set appropriately.
-   Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler
-   decoder for special applications.
-
-     deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid
-   method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is
-   incompatible with the version assumed by the caller (ZLIB_VERSION).  msg is
-   set to null if there is no error message.  deflateInit2 does not perform any
-   compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output.  When using the zlib format, this
-   function must be called immediately after deflateInit, deflateInit2 or
-   deflateReset, and before any call of deflate.  When doing raw deflate, this
-   function must be called either before any call of deflate, or immediately
-   after the completion of a deflate block, i.e. after all input has been
-   consumed and all output has been delivered when using any of the flush
-   options Z_BLOCK, Z_PARTIAL_FLUSH, Z_SYNC_FLUSH, or Z_FULL_FLUSH.  The
-   compressor and decompressor must use exactly the same dictionary (see
-   inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary.  Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size
-   provided in deflateInit or deflateInit2.  Thus the strings most likely to be
-   useful should be put at the end of the dictionary, not at the front.  In
-   addition, the current implementation of deflate will use at most the window
-   size minus 262 bytes of the provided dictionary.
-
-     Upon return of this function, strm->adler is set to the adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor.  (The adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.) If a raw deflate was requested, then the
-   adler32 value is not computed and strm->adler is not set.
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if not at a block boundary for raw deflate).  deflateSetDictionary does
-   not perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter.  The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and can
-   consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.  The
-   stream will keep the same compression level and any other attributes that
-   may have been set by deflateInit2.
-
-     deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-                                      int level,
-                                      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different strategy.
-   If the compression level is changed, the input available so far is
-   compressed with the old level (and may be flushed); the new level will take
-   effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to be
-   compressed and flushed.  In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if
-   strm->avail_out was zero.
-*/
-
-ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm,
-                                    int good_length,
-                                    int max_lazy,
-                                    int nice_length,
-                                    int max_chain));
-/*
-     Fine tune deflate's internal compression parameters.  This should only be
-   used by someone who understands the algorithm used by zlib's deflate for
-   searching for the best matching string, and even then only by the most
-   fanatic optimizer trying to squeeze out the last compressed bit for their
-   specific input data.  Read the deflate.c source code for the meaning of the
-   max_lazy, good_length, nice_length, and max_chain parameters.
-
-     deflateTune() can be called after deflateInit() or deflateInit2(), and
-   returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream.
- */
-
-ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm,
-                                       uLong sourceLen));
-/*
-     deflateBound() returns an upper bound on the compressed size after
-   deflation of sourceLen bytes.  It must be called after deflateInit() or
-   deflateInit2(), and after deflateSetHeader(), if used.  This would be used
-   to allocate an output buffer for deflation in a single pass, and so would be
-   called before deflate().  If that first deflate() call is provided the
-   sourceLen input bytes, an output buffer allocated to the size returned by
-   deflateBound(), and the flush value Z_FINISH, then deflate() is guaranteed
-   to return Z_STREAM_END.  Note that it is possible for the compressed size to
-   be larger than the value returned by deflateBound() if flush options other
-   than Z_FINISH or Z_NO_FLUSH are used.
-*/
-
-ZEXTERN int ZEXPORT deflatePending OF((z_streamp strm,
-                                       unsigned *pending,
-                                       int *bits));
-/*
-     deflatePending() returns the number of bytes and bits of output that have
-   been generated, but not yet provided in the available output.  The bytes not
-   provided would be due to the available output space having being consumed.
-   The number of bits of output not provided are between 0 and 7, where they
-   await more bits to join them in order to fill out a full byte.  If pending
-   or bits are Z_NULL, then those values are not set.
-
-     deflatePending returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
- */
-
-ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     deflatePrime() inserts bits in the deflate output stream.  The intent
-   is that this function is used to start off the deflate output with the bits
-   leftover from a previous deflate stream when appending to it.  As such, this
-   function can only be used for raw deflate, and must be used before the first
-   deflate() call after a deflateInit2() or deflateReset().  bits must be less
-   than or equal to 16, and that many of the least significant bits of value
-   will be inserted in the output.
-
-     deflatePrime returns Z_OK if success, Z_BUF_ERROR if there was not enough
-   room in the internal buffer to insert the bits, or Z_STREAM_ERROR if the
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     deflateSetHeader() provides gzip header information for when a gzip
-   stream is requested by deflateInit2().  deflateSetHeader() may be called
-   after deflateInit2() or deflateReset() and before the first call of
-   deflate().  The text, time, os, extra field, name, and comment information
-   in the provided gz_header structure are written to the gzip header (xflag is
-   ignored -- the extra flags are set according to the compression level).  The
-   caller must assure that, if not Z_NULL, name and comment are terminated with
-   a zero byte, and that if extra is not Z_NULL, that extra_len bytes are
-   available there.  If hcrc is true, a gzip header crc is included.  Note that
-   the current versions of the command-line version of gzip (up through version
-   1.3.x) do not support header crc's, and will report that it is a "multi-part
-   gzip file" and give up.
-
-     If deflateSetHeader is not used, the default gzip header has text false,
-   the time set to zero, and os set to 255, with no extra, name, or comment
-   fields.  The gzip header is returned to the default state by deflateReset().
-
-     deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter.  The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library.  The default value is 15 if inflateInit is used
-   instead.  windowBits must be greater than or equal to the windowBits value
-   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   deflateInit2() was not used.  If a compressed stream with a larger window
-   size is given as input, inflate() will return with the error code
-   Z_DATA_ERROR instead of trying to allocate a larger window.
-
-     windowBits can also be zero to request that inflate use the window size in
-   the zlib header of the compressed stream.
-
-     windowBits can also be -8..-15 for raw inflate.  In this case, -windowBits
-   determines the window size.  inflate() will then process raw deflate data,
-   not looking for a zlib or gzip header, not generating a check value, and not
-   looking for any check values for comparison at the end of the stream.  This
-   is for use with other formats that use the deflate compressed data format
-   such as zip.  Those formats provide their own check values.  If a custom
-   format is developed using the raw deflate format for compressed data, it is
-   recommended that a check value such as an adler32 or a crc32 be applied to
-   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
-   most applications, the zlib format should be used as is.  Note that comments
-   above on the use in deflateInit2() applies to the magnitude of windowBits.
-
-     windowBits can also be greater than 15 for optional gzip decoding.  Add
-   32 to windowBits to enable zlib and gzip decoding with automatic header
-   detection, or add 16 to decode only the gzip format (the zlib format will
-   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is a
-   crc32 instead of an adler32.
-
-     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller, or Z_STREAM_ERROR if the parameters are
-   invalid, such as a null pointer to the structure.  msg is set to null if
-   there is no error message.  inflateInit2 does not perform any decompression
-   apart from possibly reading the zlib header if present: actual decompression
-   will be done by inflate().  (So next_in and avail_in may be modified, but
-   next_out and avail_out are unused and unchanged.) The current implementation
-   of inflateInit2() does not process any header information -- that is
-   deferred until inflate() is called.
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence.  This function must be called immediately after a call of inflate,
-   if that call returned Z_NEED_DICT.  The dictionary chosen by the compressor
-   can be determined from the adler32 value returned by that call of inflate.
-   The compressor and decompressor must use exactly the same dictionary (see
-   deflateSetDictionary).  For raw inflate, this function can be called at any
-   time to set the dictionary.  If the provided dictionary is smaller than the
-   window and there is already data in the window, then the provided dictionary
-   will amend what's there.  The application must insure that the dictionary
-   that was used for compression is provided.
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (e.g.  dictionary being Z_NULL) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect adler32 value).  inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
-                                             Bytef *dictionary,
-                                             uInt  *dictLength));
-/*
-     Returns the sliding dictionary being maintained by inflate.  dictLength is
-   set to the number of bytes in the dictionary, and that many bytes are copied
-   to dictionary.  dictionary must have enough space, where 32768 bytes is
-   always enough.  If inflateGetDictionary() is called with dictionary equal to
-   Z_NULL, then only the dictionary length is returned, and nothing is copied.
-   Similary, if dictLength is Z_NULL, then it is not set.
-
-     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
-   stream state is inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/*
-     Skips invalid compressed data until a possible full flush point (see above
-   for the description of deflate with Z_FULL_FLUSH) can be found, or until all
-   available input is skipped.  No output is provided.
-
-     inflateSync searches for a 00 00 FF FF pattern in the compressed data.
-   All full flush points have this pattern, but not all occurrences of this
-   pattern are full flush points.
-
-     inflateSync returns Z_OK if a possible full flush point has been found,
-   Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
-   has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
-   In the success case, the application may save the current current value of
-   total_in which indicates where valid compressed data was found.  In the
-   error case, the application may repeatedly call inflateSync, providing more
-   input each time, until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when randomly accessing a large stream.  The
-   first pass through the stream can periodically record the inflate state,
-   allowing restarting inflate at those points when randomly accessing the
-   stream.
-
-     inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being Z_NULL).  msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.  The
-   stream will keep attributes that may have been set by inflateInit2.
-
-     inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL).
-*/
-
-ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm,
-                                      int windowBits));
-/*
-     This function is the same as inflateReset, but it also permits changing
-   the wrap and window size requests.  The windowBits parameter is interpreted
-   the same as it is for inflateInit2.
-
-     inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being Z_NULL), or if
-   the windowBits parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm,
-                                     int bits,
-                                     int value));
-/*
-     This function inserts bits in the inflate input stream.  The intent is
-   that this function is used to start inflating at a bit position in the
-   middle of a byte.  The provided bits will be used before any bytes are used
-   from next_in.  This function should only be used with raw inflate, and
-   should be used before the first inflate() call after inflateInit2() or
-   inflateReset().  bits must be less than or equal to 16, and that many of the
-   least significant bits of value will be inserted in the input.
-
-     If bits is negative, then the input stream bit buffer is emptied.  Then
-   inflatePrime() can be called again to put bits in the buffer.  This is used
-   to clear out bits leftover after feeding inflate a block description prior
-   to feeding inflate codes.
-
-     inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm));
-/*
-     This function returns two values, one in the lower 16 bits of the return
-   value, and the other in the remaining upper bits, obtained by shifting the
-   return value down 16 bits.  If the upper value is -1 and the lower value is
-   zero, then inflate() is currently decoding information outside of a block.
-   If the upper value is -1 and the lower value is non-zero, then inflate is in
-   the middle of a stored block, with the lower value equaling the number of
-   bytes from the input remaining to copy.  If the upper value is not -1, then
-   it is the number of bits back from the current bit position in the input of
-   the code (literal or length/distance pair) currently being processed.  In
-   that case the lower value is the number of bytes already emitted for that
-   code.
-
-     A code is being processed if inflate is waiting for more input to complete
-   decoding of the code, or if it has completed decoding but is waiting for
-   more output space to write the literal or match data.
-
-     inflateMark() is used to mark locations in the input data for random
-   access, which may be at bit positions, and to note those cases where the
-   output of a code may span boundaries of random access blocks.  The current
-   location in the input stream can be determined from avail_in and data_type
-   as noted in the description for the Z_BLOCK flush parameter for inflate.
-
-     inflateMark returns the value noted above or -1 << 16 if the provided
-   source stream state was inconsistent.
-*/
-
-ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm,
-                                         gz_headerp head));
-/*
-     inflateGetHeader() requests that gzip header information be stored in the
-   provided gz_header structure.  inflateGetHeader() may be called after
-   inflateInit2() or inflateReset(), and before the first call of inflate().
-   As inflate() processes the gzip stream, head->done is zero until the header
-   is completed, at which time head->done is set to one.  If a zlib stream is
-   being decoded, then head->done is set to -1 to indicate that there will be
-   no gzip header information forthcoming.  Note that Z_BLOCK or Z_TREES can be
-   used to force inflate() to return immediately after header processing is
-   complete and before any actual data is decompressed.
-
-     The text, time, xflags, and os fields are filled in with the gzip header
-   contents.  hcrc is set to true if there is a header CRC.  (The header CRC
-   was valid if done is set to one.) If extra is not Z_NULL, then extra_max
-   contains the maximum number of bytes to write to extra.  Once done is true,
-   extra_len contains the actual extra field length, and extra contains the
-   extra field, or that field truncated if extra_max is less than extra_len.
-   If name is not Z_NULL, then up to name_max characters are written there,
-   terminated with a zero unless the length is greater than name_max.  If
-   comment is not Z_NULL, then up to comm_max characters are written there,
-   terminated with a zero unless the length is greater than comm_max.  When any
-   of extra, name, or comment are not Z_NULL and the respective field is not
-   present in the header, then that field is set to Z_NULL to signal its
-   absence.  This allows the use of deflateSetHeader() with the returned
-   structure to duplicate the header.  However if those fields are set to
-   allocated memory, then the application will need to save those pointers
-   elsewhere so that they can be eventually freed.
-
-     If inflateGetHeader is not used, then the header information is simply
-   discarded.  The header is always checked for validity, including the header
-   CRC if present.  inflateReset() will reset the process to discard the header
-   information.  The application would need to call inflateGetHeader() again to
-   retrieve the header from the next gzip stream.
-
-     inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent.
-*/
-
-/*
-ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits,
-                                        unsigned char FAR *window));
-
-     Initialize the internal stream state for decompression using inflateBack()
-   calls.  The fields zalloc, zfree and opaque in strm must be initialized
-   before the call.  If zalloc and zfree are Z_NULL, then the default library-
-   derived memory allocation routines are used.  windowBits is the base two
-   logarithm of the window size, in the range 8..15.  window is a caller
-   supplied buffer of that size.  Except for special applications where it is
-   assured that deflate was used with small window sizes, windowBits must be 15
-   and a 32K byte window must be supplied to be able to decompress general
-   deflate streams.
-
-     See inflateBack() for the usage of these routines.
-
-     inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-   the parameters are invalid, Z_MEM_ERROR if the internal state could not be
-   allocated, or Z_VERSION_ERROR if the version of the library does not match
-   the version of the header file.
-*/
-
-typedef unsigned (*in_func) OF((void FAR *,
-                                z_const unsigned char FAR * FAR *));
-typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned));
-
-ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm,
-                                    in_func in, void FAR *in_desc,
-                                    out_func out, void FAR *out_desc));
-/*
-     inflateBack() does a raw inflate with a single call using a call-back
-   interface for input and output.  This is potentially more efficient than
-   inflate() for file i/o applications, in that it avoids copying between the
-   output and the sliding window by simply making the window itself the output
-   buffer.  inflate() can be faster on modern CPUs when used with large
-   buffers.  inflateBack() trusts the application to not change the output
-   buffer passed by the output function, at least until inflateBack() returns.
-
-     inflateBackInit() must be called first to allocate the internal state
-   and to initialize the state with the user-provided window buffer.
-   inflateBack() may then be used multiple times to inflate a complete, raw
-   deflate stream with each call.  inflateBackEnd() is then called to free the
-   allocated state.
-
-     A raw deflate stream is one with no zlib or gzip header or trailer.
-   This routine would normally be used in a utility that reads zip or gzip
-   files and writes out uncompressed files.  The utility would decode the
-   header and process the trailer on its own, hence this routine expects only
-   the raw deflate stream to decompress.  This is different from the normal
-   behavior of inflate(), which expects either a zlib or gzip header and
-   trailer around the deflate stream.
-
-     inflateBack() uses two subroutines supplied by the caller that are then
-   called by inflateBack() for input and output.  inflateBack() calls those
-   routines until it reads a complete deflate stream and writes out all of the
-   uncompressed data, or until it encounters an error.  The function's
-   parameters and return types are defined above in the in_func and out_func
-   typedefs.  inflateBack() will call in(in_desc, &buf) which should return the
-   number of bytes of provided input, and a pointer to that input in buf.  If
-   there is no input available, in() must return zero--buf is ignored in that
-   case--and inflateBack() will return a buffer error.  inflateBack() will call
-   out(out_desc, buf, len) to write the uncompressed data buf[0..len-1].  out()
-   should return zero on success, or non-zero on failure.  If out() returns
-   non-zero, inflateBack() will return with an error.  Neither in() nor out()
-   are permitted to change the contents of the window provided to
-   inflateBackInit(), which is also the buffer that out() uses to write from.
-   The length written by out() will be at most the window size.  Any non-zero
-   amount of input may be provided by in().
-
-     For convenience, inflateBack() can be provided input on the first call by
-   setting strm->next_in and strm->avail_in.  If that input is exhausted, then
-   in() will be called.  Therefore strm->next_in must be initialized before
-   calling inflateBack().  If strm->next_in is Z_NULL, then in() will be called
-   immediately for input.  If strm->next_in is not Z_NULL, then strm->avail_in
-   must also be initialized, and then if strm->avail_in is not zero, input will
-   initially be taken from strm->next_in[0 ..  strm->avail_in - 1].
-
-     The in_desc and out_desc parameters of inflateBack() is passed as the
-   first parameter of in() and out() respectively when they are called.  These
-   descriptors can be optionally used to pass any information that the caller-
-   supplied in() and out() functions need to do their job.
-
-     On return, inflateBack() will set strm->next_in and strm->avail_in to
-   pass back any unused input that was provided by the last in() call.  The
-   return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR
-   if in() or out() returned an error, Z_DATA_ERROR if there was a format error
-   in the deflate stream (in which case strm->msg is set to indicate the nature
-   of the error), or Z_STREAM_ERROR if the stream was not properly initialized.
-   In the case of Z_BUF_ERROR, an input or output error can be distinguished
-   using strm->next_in which will be Z_NULL only if in() returned an error.  If
-   strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning
-   non-zero.  (in() will always be called before out(), so strm->next_in is
-   assured to be defined if out() returns non-zero.) Note that inflateBack()
-   cannot return Z_OK.
-*/
-
-ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm));
-/*
-     All memory allocated by inflateBackInit() is freed.
-
-     inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream
-   state was inconsistent.
-*/
-
-ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void));
-/* Return flags indicating compile-time options.
-
-    Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other:
-     1.0: size of uInt
-     3.2: size of uLong
-     5.4: size of voidpf (pointer)
-     7.6: size of z_off_t
-
-    Compiler, assembler, and debug options:
-     8: DEBUG
-     9: ASMV or ASMINF -- use ASM code
-     10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention
-     11: 0 (reserved)
-
-    One-time table building (smaller code, but not thread-safe if true):
-     12: BUILDFIXED -- build static block decoding tables when needed
-     13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed
-     14,15: 0 (reserved)
-
-    Library content (indicates missing functionality):
-     16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking
-                          deflate code when not needed)
-     17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect
-                    and decode gzip streams (to avoid linking crc code)
-     18-19: 0 (reserved)
-
-    Operation variations (changes in library functionality):
-     20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate
-     21: FASTEST -- deflate algorithm with only one, lowest compression level
-     22,23: 0 (reserved)
-
-    The sprintf variant used by gzprintf (zero is best):
-     24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format
-     25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure!
-     26: 0 = returns value, 1 = void -- 1 means inferred string length returned
-
-    Remainder:
-     27-31: 0 (reserved)
- */
-
-#ifndef Z_SOLO
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the basic
-   stream-oriented functions.  To simplify the interface, some default options
-   are assumed (compression level and memory usage, standard memory allocation
-   functions).  The source code of these utility functions can be modified if
-   you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer.  The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer.  Upon entry, destLen is the total size of the
-   destination buffer, which must be at least the value returned by
-   compressBound(sourceLen).  Upon exit, destLen is the actual size of the
-   compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen));
-/*
-     compressBound() returns an upper bound on the compressed size after
-   compress() or compress2() on sourceLen bytes.  It would be used before a
-   compress() or compress2() call to allocate the destination buffer.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer.  Upon entry, destLen is the total size
-   of the destination buffer, which must be large enough to hold the entire
-   uncompressed data.  (The size of the uncompressed data must have been saved
-   previously by the compressor and transmitted to the decompressor by some
-   mechanism outside the scope of this compression library.) Upon exit, destLen
-   is the actual size of the uncompressed buffer.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete.  In
-   the case where there is not enough room, uncompress() will fill the output
-   buffer with the uncompressed data up to that point.
-*/
-
-                        /* gzip file access functions */
-
-/*
-     This library supports reading and writing files in gzip (.gz) format with
-   an interface similar to that of stdio, using the functions that start with
-   "gz".  The gzip format is different from the zlib format.  gzip is a gzip
-   wrapper, documented in RFC 1952, wrapped around a deflate stream.
-*/
-
-typedef struct gzFile_s *gzFile;    /* semi-opaque gzip file descriptor */
-
-/*
-ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode));
-
-     Opens a gzip (.gz) file for reading or writing.  The mode parameter is as
-   in fopen ("rb" or "wb") but can also include a compression level ("wb9") or
-   a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only
-   compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F'
-   for fixed code compression as in "wb9F".  (See the description of
-   deflateInit2 for more information about the strategy parameter.)  'T' will
-   request transparent writing or appending with no compression and not using
-   the gzip format.
-
-     "a" can be used instead of "w" to request that the gzip stream that will
-   be written be appended to the file.  "+" will result in an error, since
-   reading and writing to the same gzip file is not supported.  The addition of
-   "x" when writing will create the file exclusively, which fails if the file
-   already exists.  On systems that support it, the addition of "e" when
-   reading or writing will set the flag to close the file on an execve() call.
-
-     These functions, as well as gzip, will read and decode a sequence of gzip
-   streams in a file.  The append function of gzopen() can be used to create
-   such a file.  (Also see gzflush() for another way to do this.)  When
-   appending, gzopen does not test whether the file begins with a gzip stream,
-   nor does it look for the end of the gzip streams to begin appending.  gzopen
-   will simply append a gzip stream to the existing file.
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.  When
-   reading, this will be detected automatically by looking for the magic two-
-   byte gzip header.
-
-     gzopen returns NULL if the file could not be opened, if there was
-   insufficient memory to allocate the gzFile state, or if an invalid mode was
-   specified (an 'r', 'w', or 'a' was not provided, or '+' was provided).
-   errno can be checked to determine if the reason gzopen failed was that the
-   file could not be opened.
-*/
-
-ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode));
-/*
-     gzdopen associates a gzFile with the file descriptor fd.  File descriptors
-   are obtained from calls like open, dup, creat, pipe or fileno (if the file
-   has been previously opened with fopen).  The mode parameter is as in gzopen.
-
-     The next call of gzclose on the returned gzFile will also close the file
-   descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor
-   fd.  If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd,
-   mode);.  The duplicated descriptor should be saved to avoid a leak, since
-   gzdopen does not close fd if it fails.  If you are using fileno() to get the
-   file descriptor from a FILE *, then you will have to use dup() to avoid
-   double-close()ing the file descriptor.  Both gzclose() and fclose() will
-   close the associated file descriptor, so they need to have different file
-   descriptors.
-
-     gzdopen returns NULL if there was insufficient memory to allocate the
-   gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not
-   provided, or '+' was provided), or if fd is -1.  The file descriptor is not
-   used until the next gz* read, write, seek, or close operation, so gzdopen
-   will not detect if fd is invalid (unless fd is -1).
-*/
-
-ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size));
-/*
-     Set the internal buffer size used by this library's functions.  The
-   default buffer size is 8192 bytes.  This function must be called after
-   gzopen() or gzdopen(), and before any other calls that read or write the
-   file.  The buffer memory allocation is always deferred to the first read or
-   write.  Two buffers are allocated, either both of the specified size when
-   writing, or one of the specified size and the other twice that size when
-   reading.  A larger buffer size of, for example, 64K or 128K bytes will
-   noticeably increase the speed of decompression (reading).
-
-     The new buffer size also affects the maximum length for gzprintf().
-
-     gzbuffer() returns 0 on success, or -1 on failure, such as being called
-   too late.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy.  See the description
-   of deflateInit2 for the meaning of these parameters.
-
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.  If
-   the input file is not in gzip format, gzread copies the given number of
-   bytes into the buffer directly from the file.
-
-     After reaching the end of a gzip stream in the input, gzread will continue
-   to read, looking for another gzip stream.  Any number of gzip streams may be
-   concatenated in the input file, and will all be decompressed by gzread().
-   If something other than a gzip stream is encountered after a gzip stream,
-   that remaining trailing garbage is ignored (and no error is returned).
-
-     gzread can be used to read a gzip file that is being concurrently written.
-   Upon reaching the end of the input, gzread will return with the available
-   data.  If the error code returned by gzerror is Z_OK or Z_BUF_ERROR, then
-   gzclearerr can be used to clear the end of file indicator in order to permit
-   gzread to be tried again.  Z_OK indicates that a gzip stream was completed
-   on the last gzread.  Z_BUF_ERROR indicates that the input file ended in the
-   middle of a gzip stream.  Note that gzread does not return -1 in the event
-   of an incomplete gzip stream.  This error is deferred until gzclose(), which
-   will return Z_BUF_ERROR if the last gzread ended in the middle of a gzip
-   stream.  Alternatively, gzerror can be used before gzclose to detect this
-   case.
-
-     gzread returns the number of uncompressed bytes actually read, less than
-   len for end of file, or -1 for error.
-*/
-
-ZEXTERN int ZEXPORT gzwrite OF((gzFile file,
-                                voidpc buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes written or 0 in case of
-   error.
-*/
-
-ZEXTERN int ZEXPORTVA gzprintf Z_ARG((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the arguments to the compressed file under
-   control of the format string, as in fprintf.  gzprintf returns the number of
-   uncompressed bytes actually written, or 0 in case of error.  The number of
-   uncompressed bytes written is limited to 8191, or one less than the buffer
-   size given to gzbuffer().  The caller should assure that this limit is not
-   exceeded.  If it is exceeded, then gzprintf() will return an error (0) with
-   nothing written.  In this case, there may also be a buffer overflow with
-   unpredictable consequences, which is possible only if zlib was compiled with
-   the insecure functions sprintf() or vsprintf() because the secure snprintf()
-   or vsnprintf() functions were not available.  This can be determined using
-   zlibCompileFlags().
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-     Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-
-     gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-     Reads bytes from the compressed file until len-1 characters are read, or a
-   newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  If any characters are read or if len == 1, the
-   string is terminated with a null character.  If no characters are read due
-   to an end-of-file or len < 1, then the buffer is left untouched.
-
-     gzgets returns buf which is a null-terminated string, or it returns NULL
-   for end-of-file or in case of error.  If there was an error, the contents at
-   buf are indeterminate.
-*/
-
-ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
-/*
-     Writes c, converted to an unsigned char, into the compressed file.  gzputc
-   returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
-/*
-     Reads one byte from the compressed file.  gzgetc returns this byte or -1
-   in case of end of file or error.  This is implemented as a macro for speed.
-   As such, it does not do all of the checking the other functions do.  I.e.
-   it does not check to see if file is NULL, nor whether the structure file
-   points to has been clobbered or not.
-*/
-
-ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file));
-/*
-     Push one character back onto the stream to be read as the first character
-   on the next read.  At least one character of push-back is allowed.
-   gzungetc() returns the character pushed, or -1 on failure.  gzungetc() will
-   fail if c is -1, and may fail if a character has been pushed but not read
-   yet.  If gzungetc is used immediately after gzopen or gzdopen, at least the
-   output buffer size of pushed characters is allowed.  (See gzbuffer above.)
-   The pushed character will be discarded if the stream is repositioned with
-   gzseek() or gzrewind().
-*/
-
-ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file.  The parameter flush
-   is as in the deflate() function.  The return value is the zlib error number
-   (see function gzerror below).  gzflush is only permitted when writing.
-
-     If the flush parameter is Z_FINISH, the remaining data is written and the
-   gzip stream is completed in the output.  If gzwrite() is called again, a new
-   gzip stream will be started in the output.  gzread() is able to read such
-   concatented gzip streams.
-
-     gzflush should be called only when strictly necessary because it will
-   degrade compression if called too often.
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file,
-                                   z_off_t offset, int whence));
-
-     Sets the starting position for the next gzread or gzwrite on the given
-   compressed file.  The offset represents a number of bytes in the
-   uncompressed data stream.  The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow.  If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-     gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-     gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-
-     Returns the starting position for the next gzread or gzwrite on the given
-   compressed file.  This position represents a number of bytes in the
-   uncompressed data stream, and is zero when starting, even if appending or
-   reading a gzip stream from the middle of a file using gzdopen().
-
-     gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-/*
-ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file));
-
-     Returns the current offset in the file being read or written.  This offset
-   includes the count of bytes that precede the gzip stream, for example when
-   appending or when using gzdopen() for reading.  When reading, the offset
-   does not include as yet unused buffered input.  This information can be used
-   for a progress indicator.  On error, gzoffset() returns -1.
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns true (1) if the end-of-file indicator has been set while reading,
-   false (0) otherwise.  Note that the end-of-file indicator is set only if the
-   read tried to go past the end of the input, but came up short.  Therefore,
-   just like feof(), gzeof() may return false even if there is no more data to
-   read, in the event that the last read request was for the exact number of
-   bytes remaining in the input file.  This will happen if the input file size
-   is an exact multiple of the buffer size.
-
-     If gzeof() returns true, then the read functions will return no more data,
-   unless the end-of-file indicator is reset by gzclearerr() and the input file
-   has grown since the previous end of file was detected.
-*/
-
-ZEXTERN int ZEXPORT gzdirect OF((gzFile file));
-/*
-     Returns true (1) if file is being copied directly while reading, or false
-   (0) if file is a gzip stream being decompressed.
-
-     If the input file is empty, gzdirect() will return true, since the input
-   does not contain a gzip stream.
-
-     If gzdirect() is used immediately after gzopen() or gzdopen() it will
-   cause buffers to be allocated to allow reading the file to determine if it
-   is a gzip file.  Therefore if gzbuffer() is used, it should be called before
-   gzdirect().
-
-     When writing, gzdirect() returns true (1) if transparent writing was
-   requested ("wT" for the gzopen() mode), or false (0) otherwise.  (Note:
-   gzdirect() is not needed when writing.  Transparent writing must be
-   explicitly requested, so the application already knows the answer.  When
-   linking statically, using gzdirect() will include all of the zlib code for
-   gzip file reading and decompression, which may not be desired.)
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file and
-   deallocates the (de)compression state.  Note that once file is closed, you
-   cannot call gzerror with file, since its structures have been deallocated.
-   gzclose must not be called more than once on the same file, just as free
-   must not be called more than once on the same allocation.
-
-     gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a
-   file operation error, Z_MEM_ERROR if out of memory, Z_BUF_ERROR if the
-   last read ended in the middle of a gzip stream, or Z_OK on success.
-*/
-
-ZEXTERN int ZEXPORT gzclose_r OF((gzFile file));
-ZEXTERN int ZEXPORT gzclose_w OF((gzFile file));
-/*
-     Same as gzclose(), but gzclose_r() is only for use when reading, and
-   gzclose_w() is only for use when writing or appending.  The advantage to
-   using these instead of gzclose() is that they avoid linking in zlib
-   compression or decompression code that is not used when only reading or only
-   writing respectively.  If gzclose() is used, then both compression and
-   decompression code will be included the application when linking to a static
-   zlib library.
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the given
-   compressed file.  errnum is set to zlib error number.  If an error occurred
-   in the file system and not in the compression library, errnum is set to
-   Z_ERRNO and the application may consult errno to get the exact error code.
-
-     The application must not modify the returned string.  Future calls to
-   this function may invalidate the previously returned string.  If file is
-   closed, then the string previously returned by gzerror will no longer be
-   available.
-
-     gzerror() should be used to distinguish errors from end-of-file for those
-   functions above that do not distinguish those cases in their return values.
-*/
-
-ZEXTERN void ZEXPORT gzclearerr OF((gzFile file));
-/*
-     Clears the error and end-of-file flags for file.  This is analogous to the
-   clearerr() function in stdio.  This is useful for continuing to read a gzip
-   file that is being written concurrently.
-*/
-
-#endif /* !Z_SOLO */
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the compression
-   library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum.  If buf is Z_NULL, this function returns the
-   required initial value for the checksum.
-
-     An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster.
-
-   Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2,
-                                          z_off_t len2));
-
-     Combine two Adler-32 checksums into one.  For two sequences of bytes, seq1
-   and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for
-   each, adler1 and adler2.  adler32_combine() returns the Adler-32 checksum of
-   seq1 and seq2 concatenated, requiring only adler1, adler2, and len2.  Note
-   that the z_off_t type (like off_t) is a signed integer.  If len2 is
-   negative, the result has no meaning or utility.
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running CRC-32 with the bytes buf[0..len-1] and return the
-   updated CRC-32.  If buf is Z_NULL, this function returns the required
-   initial value for the crc.  Pre- and post-conditioning (one's complement) is
-   performed within this function so it shouldn't be done by the application.
-
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-/*
-ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2));
-
-     Combine two CRC-32 check values into one.  For two sequences of bytes,
-   seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
-   calculated for each, crc1 and crc2.  crc32_combine() returns the CRC-32
-   check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
-   len2.
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits,
-                                         unsigned char FAR *window,
-                                         const char *version,
-                                         int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm), ZLIB_VERSION, (int)sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy), ZLIB_VERSION, (int)sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, \
-                      (int)sizeof(z_stream))
-#define inflateBackInit(strm, windowBits, window) \
-        inflateBackInit_((strm), (windowBits), (window), \
-                      ZLIB_VERSION, (int)sizeof(z_stream))
-
-#ifndef Z_SOLO
-
-/* gzgetc() macro and its supporting function and exposed data structure.  Note
- * that the real internal state is much larger than the exposed structure.
- * This abbreviated structure exposes just enough for the gzgetc() macro.  The
- * user should not mess with these exposed elements, since their names or
- * behavior could change in the future, perhaps even capriciously.  They can
- * only be used by the gzgetc() macro.  You have been warned.
- */
-struct gzFile_s {
-    unsigned have;
-    unsigned char *next;
-    z_off64_t pos;
-};
-ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
-#ifdef Z_PREFIX_SET
-#  undef z_gzgetc
-#  define z_gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#else
-#  define gzgetc(g) \
-          ((g)->have ? ((g)->have--, (g)->pos++, *((g)->next)++) : gzgetc(g))
-#endif
-
-/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or
- * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if
- * both are true, the application gets the *64 functions, and the regular
- * functions are changed to 64 bits) -- in case these are set on systems
- * without large file support, _LFS64_LARGEFILE must also be true
- */
-#ifdef Z_LARGE64
-   ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-   ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int));
-   ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile));
-   ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t));
-   ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t));
-#endif
-
-#if !defined(ZLIB_INTERNAL) && defined(Z_WANT64)
-#  ifdef Z_PREFIX_SET
-#    define z_gzopen z_gzopen64
-#    define z_gzseek z_gzseek64
-#    define z_gztell z_gztell64
-#    define z_gzoffset z_gzoffset64
-#    define z_adler32_combine z_adler32_combine64
-#    define z_crc32_combine z_crc32_combine64
-#  else
-#    define gzopen gzopen64
-#    define gzseek gzseek64
-#    define gztell gztell64
-#    define gzoffset gzoffset64
-#    define adler32_combine adler32_combine64
-#    define crc32_combine crc32_combine64
-#  endif
-#  ifndef Z_LARGE64
-     ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *));
-     ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int));
-     ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile));
-     ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile));
-     ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t));
-     ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t));
-#  endif
-#else
-   ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *));
-   ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int));
-   ZEXTERN z_off_t ZEXPORT gztell OF((gzFile));
-   ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile));
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-#endif
-
-#else /* Z_SOLO */
-
-   ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t));
-   ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t));
-
-#endif /* !Z_SOLO */
-
-/* hack for buggy compilers */
-#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;};
-#endif
-
-/* undocumented functions */
-ZEXTERN const char   * ZEXPORT zError           OF((int));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp));
-ZEXTERN const z_crc_t FAR * ZEXPORT get_crc_table    OF((void));
-ZEXTERN int            ZEXPORT inflateUndermine OF((z_streamp, int));
-ZEXTERN int            ZEXPORT inflateResetKeep OF((z_streamp));
-ZEXTERN int            ZEXPORT deflateResetKeep OF((z_streamp));
-#if defined(_WIN32) && !defined(Z_SOLO)
-ZEXTERN gzFile         ZEXPORT gzopen_w OF((const wchar_t *path,
-                                            const char *mode));
-#endif
-#if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#  ifndef Z_SOLO
-ZEXTERN int            ZEXPORTVA gzvprintf Z_ARG((gzFile file,
-                                                  const char *format,
-                                                  va_list va));
-#  endif
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZLIB_H */
diff --git a/include/ansi.h b/include/ansi.h
deleted file mode 100644
index 825b4a6..0000000
--- a/include/ansi.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* The <ansi.h> header attempts to decide whether the compiler has enough
- * conformance to Standard C for Minix to take advantage of.  If so, the
- * symbol _ANSI is defined (as 31415).  Otherwise _ANSI is not defined
- * here, but it may be defined by applications that want to bend the rules.
- * The magic number in the definition is to inhibit unnecessary bending
- * of the rules.  (For consistency with the new '#ifdef _ANSI" tests in
- * the headers, _ANSI should really be defined as nothing, but that would
- * break many library routines that use "#if _ANSI".)
-
- * If _ANSI ends up being defined, a macro
- *
- *	_PROTOTYPE(function, params)
- *
- * is defined.  This macro expands in different ways, generating either
- * ANSI Standard C prototypes or old-style K&R (Kernighan & Ritchie)
- * prototypes, as needed.  Finally, some programs use _CONST, _VOIDSTAR etc
- * in such a way that they are portable over both ANSI and K&R compilers.
- * The appropriate macros are defined here.
- */
-
-#ifndef _ANSI_H
-#define _ANSI_H
-
-#if __STDC__ == 1
-#define _ANSI		31459	/* compiler claims full ANSI conformance */
-#endif
-
-#ifdef __GNUC__
-#define _ANSI		31459	/* gcc conforms enough even in non-ANSI mode */
-#endif
-
-#ifdef _ANSI
-
-/* Keep everything for ANSI prototypes. */
-#define	_PROTOTYPE(function, params)	function params
-#define	_ARGS(params)			params
-
-#define	_VOIDSTAR	void *
-#define	_VOID		void
-#define	_CONST		const
-#define	_VOLATILE	volatile
-#define _SIZET		size_t
-
-#else
-
-/* Throw away the parameters for K&R prototypes. */
-#define	_PROTOTYPE(function, params)	function()
-#define	_ARGS(params)			()
-
-#define	_VOIDSTAR	void *
-#define	_VOID		void
-#define	_CONST
-#define	_VOLATILE
-#define _SIZET		int
-
-#endif /* _ANSI */
-
-#endif /* ANSI_H */
diff --git a/include/api/ubix.h b/include/api/ubix.h
deleted file mode 100644
index 9bd8422..0000000
--- a/include/api/ubix.h
+++ /dev/null
@@ -1 +0,0 @@
-int ubix_test();
diff --git a/include/ctype.h b/include/ctype.h
deleted file mode 100644
index ece6382..0000000
--- a/include/ctype.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- *
- *	@(#)ctype.h	8.4 (Berkeley) 1/21/94
- *      $FreeBSD: src/include/ctype.h,v 1.24 2002/09/09 05:38:05 mike Exp $
- */
-
-#ifndef _CTYPE_H_
-#define	_CTYPE_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#define	_CTYPE_A	0x00000100L		/* Alpha */
-#define	_CTYPE_C	0x00000200L		/* Control */
-#define	_CTYPE_D	0x00000400L		/* Digit */
-#define	_CTYPE_G	0x00000800L		/* Graph */
-#define	_CTYPE_L	0x00001000L		/* Lower */
-#define	_CTYPE_P	0x00002000L		/* Punct */
-#define	_CTYPE_S	0x00004000L		/* Space */
-#define	_CTYPE_U	0x00008000L		/* Upper */
-#define	_CTYPE_X	0x00010000L		/* X digit */
-#define	_CTYPE_B	0x00020000L		/* Blank */
-#define	_CTYPE_R	0x00040000L		/* Print */
-#define	_CTYPE_I	0x00080000L		/* Ideogram */
-#define	_CTYPE_T	0x00100000L		/* Special */
-#define	_CTYPE_Q	0x00200000L		/* Phonogram */
-#define	_CTYPE_SW0	0x20000000L		/* 0 width character */
-#define	_CTYPE_SW1	0x40000000L		/* 1 width character */
-#define	_CTYPE_SW2	0x80000000L		/* 2 width character */
-#define	_CTYPE_SW3	0xc0000000L		/* 3 width character */
-
-__BEGIN_DECLS
-int	isalnum(int);
-int	isalpha(int);
-int	iscntrl(int);
-int	isdigit(int);
-int	isgraph(int);
-int	islower(int);
-int	isprint(int);
-int	ispunct(int);
-int	isspace(int);
-int	isupper(int);
-int	isxdigit(int);
-int	tolower(int);
-int	toupper(int);
-
-#if __XSI_VISIBLE
-int	_tolower(int);
-int	_toupper(int);
-int	isascii(int);
-int	toascii(int);
-#endif
-
-#if __BSD_VISIBLE
-int	digittoint(int);
-int	isblank(int);
-int	ishexnumber(int);
-int	isideogram(int);
-int	isnumber(int);
-int	isphonogram(int);
-int	isrune(int);
-int	isspecial(int);
-#endif
-__END_DECLS
-
-#define	isalnum(c)	__istype((c), _CTYPE_A|_CTYPE_D)
-#define	isalpha(c)	__istype((c), _CTYPE_A)
-#define	iscntrl(c)	__istype((c), _CTYPE_C)
-#define	isdigit(c)	__isctype((c), _CTYPE_D) /* ANSI -- locale independent */
-#define	isgraph(c)	__istype((c), _CTYPE_G)
-#define	islower(c)	__istype((c), _CTYPE_L)
-#define	isprint(c)	__istype((c), _CTYPE_R)
-#define	ispunct(c)	__istype((c), _CTYPE_P)
-#define	isspace(c)	__istype((c), _CTYPE_S)
-#define	isupper(c)	__istype((c), _CTYPE_U)
-#define	isxdigit(c)	__isctype((c), _CTYPE_X) /* ANSI -- locale independent */
-#define	tolower(c)	__tolower(c)
-#define	toupper(c)	__toupper(c)
-
-#if __XSI_VISIBLE
-/*
- * POSIX.1-2001 specifies _tolower() and _toupper() to be macros equivalent to
- * tolower() and toupper() respectively, minus extra checking to ensure that
- * the argument is a lower or uppercase letter respectively.  We've chosen to
- * implement these macros with the same error checking as tolower() and
- * toupper() since this doesn't violate the specification itself, only its
- * intent.  We purposely leave _tolower() and _toupper() undocumented to
- * discourage their use.
- *
- * XXX isascii() and toascii() should similarly be undocumented.
- */
-#define	_tolower(c)	__tolower(c)
-#define	_toupper(c)	__toupper(c)
-#define	isascii(c)	(((c) & ~0x7F) == 0)
-#define	toascii(c)	((c) & 0x7F)
-#endif
-
-#if __BSD_VISIBLE
-#define	digittoint(c)	__maskrune((c), 0xFF)
-#define	isblank(c)	__istype((c), _CTYPE_B)
-#define	ishexnumber(c)	__istype((c), _CTYPE_X)
-#define	isideogram(c)	__istype((c), _CTYPE_I)
-#define	isnumber(c)	__istype((c), _CTYPE_D)
-#define	isphonogram(c)	__istype((c), _CTYPE_Q)
-#define	isrune(c)	__istype((c), 0xFFFFFF00L)
-#define	isspecial(c)	__istype((c), _CTYPE_T)
-#endif
-
-/* See comments in <sys/_types.h> about __ct_rune_t. */
-__BEGIN_DECLS
-unsigned long	___runetype(__ct_rune_t);
-__ct_rune_t	___tolower(__ct_rune_t);
-__ct_rune_t	___toupper(__ct_rune_t);
-__END_DECLS
-
-/*
- * _EXTERNALIZE_CTYPE_INLINES_ is defined in locale/nomacros.c to tell us
- * to generate code for extern versions of all our inline functions.
- */
-#ifdef _EXTERNALIZE_CTYPE_INLINES_
-#define	_USE_CTYPE_INLINE_
-#define	static
-#define	__inline
-#endif
-
-/*
- * <runetype.h> brings namespace pollution (struct member names).  This prevents
- * us from using the inline optimizations in the more strict __POSIX_VISIBLE and
- * __XSI_VISIBLE namespaces.  To fix this properly would require that we rename
- * member names of long-standing structs, or something equally evil.
- */
-#if !__BSD_VISIBLE && !defined(_USE_CTYPE_INLINE_) && \
-    !defined(_DONT_USE_CTYPE_INLINE_)
-#define	_DONT_USE_CTYPE_INLINE_
-#endif
-
-/*
- * Use inline functions if we are allowed to and the compiler supports them.
- */
-#if !defined(_DONT_USE_CTYPE_INLINE_) && \
-    (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus))
-
-#include <runetype.h>
-
-static __inline int
-__maskrune(__ct_rune_t _c, unsigned long _f)
-{
-	return ((_c < 0 || _c >= _CACHED_RUNES) ? ___runetype(_c) :
-		_CurrentRuneLocale->runetype[_c]) & _f;
-}
-
-static __inline int
-__istype(__ct_rune_t _c, unsigned long _f)
-{
-	return (!!__maskrune(_c, _f));
-}
-
-static __inline int
-__isctype(__ct_rune_t _c, unsigned long _f)
-{
-	return (_c < 0 || _c >= _CACHED_RUNES) ? 0 :
-	       !!(_DefaultRuneLocale.runetype[_c] & _f);
-}
-
-static __inline __ct_rune_t
-__toupper(__ct_rune_t _c)
-{
-	return (_c < 0 || _c >= _CACHED_RUNES) ? ___toupper(_c) :
-	       _CurrentRuneLocale->mapupper[_c];
-}
-
-static __inline __ct_rune_t
-__tolower(__ct_rune_t _c)
-{
-	return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) :
-	       _CurrentRuneLocale->maplower[_c];
-}
-
-#else /* not using inlines */
-
-__BEGIN_DECLS
-int		__maskrune(__ct_rune_t, unsigned long);
-int		__istype(__ct_rune_t, unsigned long);
-int		__isctype(__ct_rune_t, unsigned long);
-__ct_rune_t	__toupper(__ct_rune_t);
-__ct_rune_t	__tolower(__ct_rune_t);
-__END_DECLS
-#endif /* using inlines */
-
-#endif /* !_CTYPE_H_ */
diff --git a/include/ctypes.h b/include/ctypes.h
deleted file mode 100644
index 7811bda..0000000
--- a/include/ctypes.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ctypes.h 88 2016-01-12 00:11:29Z reddawg $
-
-**************************************************************************************/
-
-int  toupper(int c);
-int  tolower(int c);
diff --git a/include/err.h b/include/err.h
deleted file mode 100644
index a3c04cf..0000000
--- a/include/err.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 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.
- *
- *	@(#)err.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/err.h,v 1.11 2002/08/21 16:19:55 mike Exp $
- */
-
-#ifndef _ERR_H_
-#define	_ERR_H_
-
-/*
- * Don't use va_list in the err/warn prototypes.   Va_list is typedef'd in two
- * places (<machine/varargs.h> and <machine/stdarg.h>), so if we include one
- * of them here we may collide with the utility's includes.  It's unreasonable
- * for utilities to have to include one of them to include err.h, so we get
- * __va_list from <sys/_types.h> and use it.
- */
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-__BEGIN_DECLS
-void	err(int, const char *, ...) __dead2 __printf0like(2, 3);
-void	verr(int, const char *, __va_list) __dead2 __printf0like(2, 0);
-void	errc(int, int, const char *, ...) __dead2 __printf0like(3, 4);
-void	verrc(int, int, const char *, __va_list) __dead2
-	    __printf0like(3, 0);
-void	errx(int, const char *, ...) __dead2 __printf0like(2, 3);
-void	verrx(int, const char *, __va_list) __dead2 __printf0like(2, 0);
-void	warn(const char *, ...) __printf0like(1, 2);
-void	vwarn(const char *, __va_list) __printf0like(1, 0);
-void	warnc(int, const char *, ...) __printf0like(2, 3);
-void	vwarnc(int, const char *, __va_list) __printf0like(2, 0);
-void	warnx(const char *, ...) __printflike(1, 2);
-void	vwarnx(const char *, __va_list) __printflike(1, 0);
-void	err_set_file(void *);
-void	err_set_exit(void (*)(int));
-__END_DECLS
-
-#endif /* !_ERR_H_ */
diff --git a/include/errno.h b/include/errno.h
deleted file mode 100644
index 524b156..0000000
--- a/include/errno.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)errno.h	8.5 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/sys/errno.h,v 1.25 2002/10/07 06:25:23 phk Exp $
- */
-
-#ifndef _SYS_ERRNO_H_
-#define _SYS_ERRNO_H_
-
-#ifndef _KERNEL
-#include <sys/cdefs.h>
-__BEGIN_DECLS
-int *	__error(void);
-__END_DECLS
-#define	errno		(* __error())
-#endif
-
-#define	EPERM		1		/* Operation not permitted */
-#define	ENOENT		2		/* No such file or directory */
-#define	ESRCH		3		/* No such process */
-#define	EINTR		4		/* Interrupted system call */
-#define	EIO		5		/* Input/output error */
-#define	ENXIO		6		/* Device not configured */
-#define	E2BIG		7		/* Argument list too long */
-#define	ENOEXEC		8		/* Exec format error */
-#define	EBADF		9		/* Bad file descriptor */
-#define	ECHILD		10		/* No child processes */
-#define	EDEADLK		11		/* Resource deadlock avoided */
-					/* 11 was EAGAIN */
-#define	ENOMEM		12		/* Cannot allocate memory */
-#define	EACCES		13		/* Permission denied */
-#define	EFAULT		14		/* Bad address */
-#ifndef _POSIX_SOURCE
-#define	ENOTBLK		15		/* Block device required */
-#endif
-#define	EBUSY		16		/* Device busy */
-#define	EEXIST		17		/* File exists */
-#define	EXDEV		18		/* Cross-device link */
-#define	ENODEV		19		/* Operation not supported by device */
-#define	ENOTDIR		20		/* Not a directory */
-#define	EISDIR		21		/* Is a directory */
-#define	EINVAL		22		/* Invalid argument */
-#define	ENFILE		23		/* Too many open files in system */
-#define	EMFILE		24		/* Too many open files */
-#define	ENOTTY		25		/* Inappropriate ioctl for device */
-#ifndef _POSIX_SOURCE
-#define	ETXTBSY		26		/* Text file busy */
-#endif
-#define	EFBIG		27		/* File too large */
-#define	ENOSPC		28		/* No space left on device */
-#define	ESPIPE		29		/* Illegal seek */
-#define	EROFS		30		/* Read-only filesystem */
-#define	EMLINK		31		/* Too many links */
-#define	EPIPE		32		/* Broken pipe */
-
-/* math software */
-#define	EDOM		33		/* Numerical argument out of domain */
-#define	ERANGE		34		/* Result too large */
-
-/* non-blocking and interrupt i/o */
-#define	EAGAIN		35		/* Resource temporarily unavailable */
-#ifndef _POSIX_SOURCE
-#define	EWOULDBLOCK	EAGAIN		/* Operation would block */
-#define	EINPROGRESS	36		/* Operation now in progress */
-#define	EALREADY	37		/* Operation already in progress */
-
-/* ipc/network software -- argument errors */
-#define	ENOTSOCK	38		/* Socket operation on non-socket */
-#define	EDESTADDRREQ	39		/* Destination address required */
-#define	EMSGSIZE	40		/* Message too long */
-#define	EPROTOTYPE	41		/* Protocol wrong type for socket */
-#define	ENOPROTOOPT	42		/* Protocol not available */
-#define	EPROTONOSUPPORT	43		/* Protocol not supported */
-#define	ESOCKTNOSUPPORT	44		/* Socket type not supported */
-#define	EOPNOTSUPP	45		/* Operation not supported */
-#define	ENOTSUP		EOPNOTSUPP	/* Operation not supported */
-#define	EPFNOSUPPORT	46		/* Protocol family not supported */
-#define	EAFNOSUPPORT	47		/* Address family not supported by protocol family */
-#define	EADDRINUSE	48		/* Address already in use */
-#define	EADDRNOTAVAIL	49		/* Can't assign requested address */
-
-/* ipc/network software -- operational errors */
-#define	ENETDOWN	50		/* Network is down */
-#define	ENETUNREACH	51		/* Network is unreachable */
-#define	ENETRESET	52		/* Network dropped connection on reset */
-#define	ECONNABORTED	53		/* Software caused connection abort */
-#define	ECONNRESET	54		/* Connection reset by peer */
-#define	ENOBUFS		55		/* No buffer space available */
-#define	EISCONN		56		/* Socket is already connected */
-#define	ENOTCONN	57		/* Socket is not connected */
-#define	ESHUTDOWN	58		/* Can't send after socket shutdown */
-#define	ETOOMANYREFS	59		/* Too many references: can't splice */
-#define	ETIMEDOUT	60		/* Operation timed out */
-#define	ECONNREFUSED	61		/* Connection refused */
-
-#define	ELOOP		62		/* Too many levels of symbolic links */
-#endif /* _POSIX_SOURCE */
-#define	ENAMETOOLONG	63		/* File name too long */
-
-/* should be rearranged */
-#ifndef _POSIX_SOURCE
-#define	EHOSTDOWN	64		/* Host is down */
-#define	EHOSTUNREACH	65		/* No route to host */
-#endif /* _POSIX_SOURCE */
-#define	ENOTEMPTY	66		/* Directory not empty */
-
-/* quotas & mush */
-#ifndef _POSIX_SOURCE
-#define	EPROCLIM	67		/* Too many processes */
-#define	EUSERS		68		/* Too many users */
-#define	EDQUOT		69		/* Disc quota exceeded */
-
-/* Network File System */
-#define	ESTALE		70		/* Stale NFS file handle */
-#define	EREMOTE		71		/* Too many levels of remote in path */
-#define	EBADRPC		72		/* RPC struct is bad */
-#define	ERPCMISMATCH	73		/* RPC version wrong */
-#define	EPROGUNAVAIL	74		/* RPC prog. not avail */
-#define	EPROGMISMATCH	75		/* Program version wrong */
-#define	EPROCUNAVAIL	76		/* Bad procedure for program */
-#endif /* _POSIX_SOURCE */
-
-#define	ENOLCK		77		/* No locks available */
-#define	ENOSYS		78		/* Function not implemented */
-
-#ifndef _POSIX_SOURCE
-#define	EFTYPE		79		/* Inappropriate file type or format */
-#define	EAUTH		80		/* Authentication error */
-#define	ENEEDAUTH	81		/* Need authenticator */
-#define	EIDRM		82		/* Identifier removed */
-#define	ENOMSG		83		/* No message of desired type */
-#define	EOVERFLOW	84		/* Value too large to be stored in data type */
-#define	ECANCELED	85		/* Operation canceled */
-#define	EILSEQ		86		/* Illegal byte sequence */
-#define	ENOATTR		87		/* Attribute not found */
-
-#define EDOOFUS		88		/* Programming error */
-
-#define	ELAST		88		/* Must be equal largest errno */
-
-#endif /* _POSIX_SOURCE */
-
-#ifdef _KERNEL
-/* pseudo-errors returned inside kernel to modify return to process */
-#define	ERESTART	(-1)		/* restart syscall */
-#define	EJUSTRETURN	(-2)		/* don't modify regs, just return */
-#define	ENOIOCTL	(-3)		/* ioctl not handled by this layer */
-#define	EDIRIOCTL	(-4)		/* do direct ioctl in GEOM */
-#endif
-
-#endif
diff --git a/include/fcntl.h b/include/fcntl.h
deleted file mode 100644
index 520391c..0000000
--- a/include/fcntl.h
+++ /dev/null
@@ -1,233 +0,0 @@
-/*-
- * Copyright (c) 1983, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)fcntl.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/sys/fcntl.h,v 1.15 2003/06/20 07:59:59 phk Exp $
- */
-
-#ifndef _SYS_FCNTL_H_
-#define	_SYS_FCNTL_H_
-
-/*
- * This file includes the definitions for open and fcntl
- * described by POSIX for <fcntl.h>; it also includes
- * related kernel definitions.
- */
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _PID_T_DECLARED
-typedef	__pid_t		pid_t;
-#define	_PID_T_DECLARED
-#endif
-
-/*
- * File status flags: these are used by open(2), fcntl(2).
- * They are also used (indirectly) in the kernel file structure f_flags,
- * which is a superset of the open/fcntl flags.  Open flags and f_flags
- * are inter-convertible using OFLAGS(fflags) and FFLAGS(oflags).
- * Open/fcntl flags begin with O_; kernel-internal flags begin with F.
- */
-/* open-only flags */
-#define	O_RDONLY	0x0000		/* open for reading only */
-#define	O_WRONLY	0x0001		/* open for writing only */
-#define	O_RDWR		0x0002		/* open for reading and writing */
-#define	O_ACCMODE	0x0003		/* mask for above modes */
-
-/*
- * Kernel encoding of open mode; separate read and write bits that are
- * independently testable: 1 greater than the above.
- *
- * XXX
- * FREAD and FWRITE are excluded from the #ifdef _KERNEL so that TIOCFLUSH,
- * which was documented to use FREAD/FWRITE, continues to work.
- */
-#if __BSD_VISIBLE
-#define	FREAD		0x0001
-#define	FWRITE		0x0002
-#endif
-#define	O_NONBLOCK	0x0004		/* no delay */
-#define	O_APPEND	0x0008		/* set append mode */
-#if __BSD_VISIBLE
-#define	O_SHLOCK	0x0010		/* open with shared file lock */
-#define	O_EXLOCK	0x0020		/* open with exclusive file lock */
-#define	O_ASYNC		0x0040		/* signal pgrp when data ready */
-#define	O_FSYNC		0x0080		/* synchronous writes */
-#endif
-#define	O_SYNC		0x0080		/* POSIX synonym for O_FSYNC */
-#if __BSD_VISIBLE
-#define	O_NOFOLLOW	0x0100		/* don't follow symlinks */
-#endif
-#define	O_CREAT		0x0200		/* create if nonexistent */
-#define	O_TRUNC		0x0400		/* truncate to zero length */
-#define	O_EXCL		0x0800		/* error if already exists */
-#ifdef _KERNEL
-#define	FHASLOCK	0x4000		/* descriptor holds advisory lock */
-#endif
-
-/* Defined by POSIX 1003.1; BSD default, but must be distinct from O_RDONLY. */
-#define	O_NOCTTY	0x8000		/* don't assign controlling terminal */
-
-#if __BSD_VISIBLE
-/* Attempt to bypass buffer cache */
-#define O_DIRECT	0x00010000
-#endif
-
-/*
- * XXX missing O_DSYNC, O_RSYNC.
- */
-
-#ifdef _KERNEL
-/* convert from open() flags to/from fflags; convert O_RD/WR to FREAD/FWRITE */
-#define	FFLAGS(oflags)	((oflags) + 1)
-#define	OFLAGS(fflags)	((fflags) - 1)
-
-/* bits to save after open */
-#define	FMASK		(FREAD|FWRITE|FAPPEND|FASYNC|FFSYNC|FNONBLOCK|O_DIRECT)
-/* bits settable by fcntl(F_SETFL, ...) */
-#define	FCNTLFLAGS	(FAPPEND|FASYNC|FFSYNC|FNONBLOCK|FPOSIXSHM|O_DIRECT)
-#endif
-
-/*
- * The O_* flags used to have only F* names, which were used in the kernel
- * and by fcntl.  We retain the F* names for the kernel f_flag field
- * and for backward compatibility for fcntl.  These flags are deprecated.
- */
-#if __BSD_VISIBLE
-#define	FAPPEND		O_APPEND	/* kernel/compat */
-#define	FASYNC		O_ASYNC		/* kernel/compat */
-#define	FFSYNC		O_FSYNC		/* kernel */
-#define	FNONBLOCK	O_NONBLOCK	/* kernel */
-#define	FNDELAY		O_NONBLOCK	/* compat */
-#define	O_NDELAY	O_NONBLOCK	/* compat */
-#endif
-
-/*
- * We are out of bits in f_flag (which is a short).  However,
- * the flag bits not set in FMASK are only meaningful in the
- * initial open syscall.  Those bits can thus be given a
- * different meaning for fcntl(2).
- */
-#if __BSD_VISIBLE
-
-/*
- * Set by shm_open(3) to get automatic MAP_ASYNC behavior
- * for POSIX shared memory objects (which are otherwise
- * implemented as plain files).
- */
-#define	FPOSIXSHM	O_NOFOLLOW
-#endif
-
-/*
- * Constants used for fcntl(2)
- */
-
-/* command values */
-#define	F_DUPFD		0		/* duplicate file descriptor */
-#define	F_GETFD		1		/* get file descriptor flags */
-#define	F_SETFD		2		/* set file descriptor flags */
-#define	F_GETFL		3		/* get file status flags */
-#define	F_SETFL		4		/* set file status flags */
-#if __BSD_VISIBLE || __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-#define	F_GETOWN	5		/* get SIGIO/SIGURG proc/pgrp */
-#define F_SETOWN	6		/* set SIGIO/SIGURG proc/pgrp */
-#endif
-#define	F_GETLK		7		/* get record locking information */
-#define	F_SETLK		8		/* set record locking information */
-#define	F_SETLKW	9		/* F_SETLK; wait if blocked */
-
-/* file descriptor flags (F_GETFD, F_SETFD) */
-#define	FD_CLOEXEC	1		/* close-on-exec flag */
-
-/* record locking flags (F_GETLK, F_SETLK, F_SETLKW) */
-#define	F_RDLCK		1		/* shared or read lock */
-#define	F_UNLCK		2		/* unlock */
-#define	F_WRLCK		3		/* exclusive or write lock */
-#ifdef _KERNEL
-#define	F_WAIT		0x010		/* Wait until lock is granted */
-#define	F_FLOCK		0x020	 	/* Use flock(2) semantics for lock */
-#define	F_POSIX		0x040	 	/* Use POSIX semantics for lock */
-#endif
-
-/*
- * Advisory file segment locking data type -
- * information passed to system by user
- */
-struct flock {
-	off_t	l_start;	/* starting offset */
-	off_t	l_len;		/* len = 0 means until end of file */
-	pid_t	l_pid;		/* lock owner */
-	short	l_type;		/* lock type: read/write, etc. */
-	short	l_whence;	/* type of l_start */
-};
-
-
-#if __BSD_VISIBLE
-/* lock operations for flock(2) */
-#define	LOCK_SH		0x01		/* shared file lock */
-#define	LOCK_EX		0x02		/* exclusive file lock */
-#define	LOCK_NB		0x04		/* don't block when locking */
-#define	LOCK_UN		0x08		/* unlock file */
-#endif
-
-/*
- * XXX missing posix_fadvise() and posix_fallocate(), and POSIX_FADV_* macros.
- */
-
-#ifndef _KERNEL
-__BEGIN_DECLS
-int	open(const char *, int, ...);
-int	creat(const char *, mode_t);
-int	fcntl(int, int, ...);
-#if __BSD_VISIBLE
-int	flock(int, int);
-#endif
-__END_DECLS
-#endif
-
-#endif /* !_SYS_FCNTL_H_ */
diff --git a/include/limits.h b/include/limits.h
deleted file mode 100644
index 587f01f..0000000
--- a/include/limits.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*-
- * Copyright (c) 1988, 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.
- *
- *	@(#)limits.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/include/limits.h,v 1.16 2003/04/29 13:35:58 kan Exp $
- */
-
-#ifndef _LIMITS_H_
-#define	_LIMITS_H_
-
-#include <sys/cdefs.h>
-
-#if __POSIX_VISIBLE
-#define	_POSIX_ARG_MAX		4096
-#define	_POSIX_CHILD_MAX	25
-#define	_POSIX_LINK_MAX		8
-#define	_POSIX_MAX_CANON	255
-#define	_POSIX_MAX_INPUT	255
-#define	_POSIX_NAME_MAX		14
-#define	_POSIX_NGROUPS_MAX	8
-#define	_POSIX_OPEN_MAX		20
-#define	_POSIX_PATH_MAX		256
-#define	_POSIX_PIPE_BUF		512
-#define	_POSIX_SSIZE_MAX	32767
-#define	_POSIX_STREAM_MAX	8
-#define	_POSIX_TZNAME_MAX	6
-
-#define	BC_BASE_MAX		   99	/* max ibase/obase values in bc(1) */
-#define	BC_DIM_MAX		 2048	/* max array elements in bc(1) */
-#define	BC_SCALE_MAX		   99	/* max scale value in bc(1) */
-#define	BC_STRING_MAX		 1000	/* max const string length in bc(1) */
-#define	COLL_WEIGHTS_MAX	    0	/* max weights for order keyword */
-#define	EXPR_NEST_MAX		   32	/* max expressions nested in expr(1) */
-#define	LINE_MAX		 2048	/* max bytes in an input line */
-#define	RE_DUP_MAX		  255	/* max RE's in interval notation */
-
-#define	_POSIX2_BC_BASE_MAX	99
-#define	_POSIX2_BC_DIM_MAX	2048
-#define	_POSIX2_BC_SCALE_MAX	99
-#define	_POSIX2_BC_STRING_MAX	1000
-#define	_POSIX2_EQUIV_CLASS_MAX	2
-#define	_POSIX2_EXPR_NEST_MAX	32
-#define	_POSIX2_LINE_MAX	2048
-#define	_POSIX2_RE_DUP_MAX	255
-#endif
-
-#if __POSIX_VISIBLE >= 199309
-#define	_POSIX_AIO_LISTIO_MAX	16
-#define	_POSIX_AIO_MAX		1
-#define	_POSIX_DELAYTIMER_MAX	32
-#define	_POSIX_MQ_OPEN_MAX	8
-#define	_POSIX_MQ_PRIO_MAX	32
-#define	_POSIX_RTSIG_MAX	8
-#define	_POSIX_SEM_NSEMS_MAX	256
-#define	_POSIX_SEM_VALUE_MAX	32767
-#define	_POSIX_SIGQUEUE_MAX	32
-#define	_POSIX_TIMER_MAX	32
-#endif
-
-#if __POSIX_VISIBLE >= 199506
-#define	_POSIX_THREAD_DESTRUCTOR_ITERATIONS 4
-#define	_POSIX_THREAD_KEYS_MAX	128
-#define	_POSIX_THREAD_THREADS_MAX 64
-#endif
-
-#if __POSIX_VISIBLE >= 200112
-#define	_POSIX_HOST_NAME_MAX	255
-#define	_POSIX_LOGIN_NAME_MAX	9
-#define	_POSIX_SS_REPL_MAX	4
-#define	_POSIX_SYMLINK_MAX	255
-#define	_POSIX_SYMLOOP_MAX	8
-#define	_POSIX_TRACE_EVENT_NAME_MAX 30
-#define	_POSIX_TRACE_NAME_MAX	8
-#define	_POSIX_TRACE_SYS_MAX	8
-#define	_POSIX_TRACE_USER_EVENT_MAX 32
-#define	_POSIX_TTY_NAME_MAX	9
-#define	_POSIX2_CHARCLASS_NAME_MAX 14
-#define	_POSIX2_COLL_WEIGHTS_MAX 2
-
-#define	_POSIX_RE_DUP_MAX	_POSIX2_RE_DUP_MAX
-#endif
-
-#if __XSI_VISIBLE
-#define	_XOPEN_IOV_MAX		16
-#define	_XOPEN_NAME_MAX		255
-#define	_XOPEN_PATH_MAX		1024
-#define	PASS_MAX		128	/* _PASSWORD_LEN from <pwd.h> */
-
-#define	NL_ARGMAX		99	/* max # of position args for printf */
-#define	NL_LANGMAX		31	/* max LANG name length */
-#define	NL_MSGMAX		32767
-#define	NL_NMAX			1
-#define	NL_SETMAX		255
-#define	NL_TEXTMAX		2048
-#endif
-
-#define	MB_LEN_MAX		6	/* 31-bit UTF-8 */
-
-#include <sys/limits.h>
-
-#if __POSIX_VISIBLE
-#include <sys/syslimits.h>
-#endif
-
-#endif /* !_LIMITS_H_ */
diff --git a/include/machine/_limits.h b/include/machine/_limits.h
deleted file mode 100644
index 5be49ff..0000000
--- a/include/machine/_limits.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- *
- *	@(#)limits.h	8.3 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/i386/include/_limits.h,v 1.25 2003/05/19 20:29:06 kan Exp $
- */
-
-#ifndef _MACHINE__LIMITS_H_
-#define	_MACHINE__LIMITS_H_
-
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- * These numbers are for the default configuration of gcc.  They work for
- * some other compilers as well, but this should not be depended on.
- */
-
-#define	__CHAR_BIT	8		/* number of bits in a char */
-
-#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	__SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
-
-#define	__UCHAR_MAX	0xff		/* max value for an unsigned char */
-
-#define	__USHRT_MAX	0xffff		/* max value for an unsigned short */
-#define	__SHRT_MAX	0x7fff		/* max value for a short */
-#define	__SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
-
-#define	__UINT_MAX	0xffffffffU	/* max value for an unsigned int */
-#define	__INT_MAX	0x7fffffff	/* max value for an int */
-#define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
-
-/* Bad hack for gcc configured to give 64-bit longs. */
-#ifdef _LARGE_LONG
-#define	__ULONG_MAX	0xffffffffffffffffUL
-#define	__LONG_MAX	0x7fffffffffffffffL
-#define	__LONG_MIN	(-0x7fffffffffffffffL - 1)
-#else
-#define	__ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
-#define	__LONG_MAX	0x7fffffffL	/* max value for a long */
-#define	__LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
-#endif
-
-			/* max value for an unsigned long long */
-#define	__ULLONG_MAX	0xffffffffffffffffULL
-#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
-#define	__LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
-
-#define	__SSIZE_MAX	__INT_MAX	/* max value for a ssize_t */
-
-#define	__SIZE_T_MAX	__UINT_MAX	/* max value for a size_t */
-
-#define	__OFF_MAX	__LLONG_MAX	/* max value for an off_t */
-#define	__OFF_MIN	__LLONG_MIN	/* min value for an off_t */
-
-/* Quads and long longs are the same size.  Ensure they stay in sync. */
-#define	__UQUAD_MAX	__ULLONG_MAX	/* max value for a uquad_t */
-#define	__QUAD_MAX	__LLONG_MAX	/* max value for a quad_t */
-#define	__QUAD_MIN	__LLONG_MIN	/* min value for a quad_t */
-
-#ifdef _LARGE_LONG
-#define	__LONG_BIT	64
-#else
-#define	__LONG_BIT	32
-#endif
-#define	__WORD_BIT	32
-
-#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/include/machine/_stdint.h b/include/machine/_stdint.h
deleted file mode 100644
index fbd3ced..0000000
--- a/include/machine/_stdint.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * Copyright (c) 2001, 2002 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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/i386/include/_stdint.h,v 1.1 2002/07/29 17:41:07 mike Exp $
- */
-
-#ifndef _MACHINE__STDINT_H_
-#define	_MACHINE__STDINT_H_
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS)
-
-#define	INT8_C(c)		(c)
-#define	INT16_C(c)		(c)
-#define	INT32_C(c)		(c)
-#define	INT64_C(c)		(c ## LL)
-
-#define	UINT8_C(c)		(c)
-#define	UINT16_C(c)		(c)
-#define	UINT32_C(c)		(c ## U)
-#define	UINT64_C(c)		(c ## ULL)
-
-#define	INTMAX_C(c)		(c ## LL)
-#define	UINTMAX_C(c)		(c ## ULL)
-
-#endif /* !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) */
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS)
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.1 Limits of exact-width integer types
- */
-/* Minimum values of exact-width signed integer types. */
-#define	INT8_MIN	(-0x7f-1)
-#define	INT16_MIN	(-0x7fff-1)
-#define	INT32_MIN	(-0x7fffffff-1)
-#define	INT64_MIN	(-0x7fffffffffffffffLL-1)
-
-/* Maximum values of exact-width signed integer types. */
-#define	INT8_MAX	0x7f
-#define	INT16_MAX	0x7fff
-#define	INT32_MAX	0x7fffffff
-#define	INT64_MAX	0x7fffffffffffffffLL
-
-/* Maximum values of exact-width unsigned integer types. */
-#define	UINT8_MAX	0xff
-#define	UINT16_MAX	0xffff
-#define	UINT32_MAX	0xffffffffU
-#define	UINT64_MAX	0xffffffffffffffffULL
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.2  Limits of minimum-width integer types
- */
-/* Minimum values of minimum-width signed integer types. */
-#define	INT_LEAST8_MIN	INT8_MIN
-#define	INT_LEAST16_MIN	INT16_MIN
-#define	INT_LEAST32_MIN	INT32_MIN
-#define	INT_LEAST64_MIN	INT64_MIN
-
-/* Maximum values of minimum-width signed integer types. */
-#define	INT_LEAST8_MAX	INT8_MAX
-#define	INT_LEAST16_MAX	INT16_MAX
-#define	INT_LEAST32_MAX	INT32_MAX
-#define	INT_LEAST64_MAX	INT64_MAX
-
-/* Maximum values of minimum-width unsigned integer types. */
-#define	UINT_LEAST8_MAX	 UINT8_MAX
-#define	UINT_LEAST16_MAX UINT16_MAX
-#define	UINT_LEAST32_MAX UINT32_MAX
-#define	UINT_LEAST64_MAX UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.3  Limits of fastest minimum-width integer types
- */
-/* Minimum values of fastest minimum-width signed integer types. */
-#define	INT_FAST8_MIN	INT32_MIN
-#define	INT_FAST16_MIN	INT32_MIN
-#define	INT_FAST32_MIN	INT32_MIN
-#define	INT_FAST64_MIN	INT64_MIN
-
-/* Maximum values of fastest minimum-width signed integer types. */
-#define	INT_FAST8_MAX	INT32_MAX
-#define	INT_FAST16_MAX	INT32_MAX
-#define	INT_FAST32_MAX	INT32_MAX
-#define	INT_FAST64_MAX	INT64_MAX
-
-/* Maximum values of fastest minimum-width unsigned integer types. */
-#define	UINT_FAST8_MAX	UINT32_MAX
-#define	UINT_FAST16_MAX	UINT32_MAX
-#define	UINT_FAST32_MAX	UINT32_MAX
-#define	UINT_FAST64_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.4  Limits of integer types capable of holding object pointers
- */
-#define	INTPTR_MIN	INT32_MIN
-#define	INTPTR_MAX	INT32_MAX
-#define	UINTPTR_MAX	UINT32_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.2.5  Limits of greatest-width integer types
- */
-#define	INTMAX_MIN	INT64_MIN
-#define	INTMAX_MAX	INT64_MAX
-#define	UINTMAX_MAX	UINT64_MAX
-
-/*
- * ISO/IEC 9899:1999
- * 7.18.3  Limits of other integer types
- */
-/* Limits of ptrdiff_t. */
-#define	PTRDIFF_MIN	INT32_MIN	
-#define	PTRDIFF_MAX	INT32_MAX
-
-/* Limits of sig_atomic_t. */
-#define	SIG_ATOMIC_MIN	INT32_MIN
-#define	SIG_ATOMIC_MAX	INT32_MAX
-
-/* Limit of size_t. */
-#define	SIZE_MAX	UINT32_MAX
-
-#ifndef WCHAR_MIN /* Also possibly defined in <wchar.h> */
-/* Limits of wchar_t. */
-#define	WCHAR_MIN	INT32_MIN
-#define	WCHAR_MAX	INT32_MAX
-
-/* Limits of wint_t. */
-#define	WINT_MIN	INT32_MIN
-#define	WINT_MAX	INT32_MAX
-#endif
-
-#endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */
-
-#endif /* !_MACHINE__STDINT_H_ */
diff --git a/include/machine/_types.h b/include/machine/_types.h
deleted file mode 100644
index d57eb23..0000000
--- a/include/machine/_types.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 1990, 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.
- *
- *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
- *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
- * $FreeBSD: src/sys/i386/include/_types.h,v 1.7 2003/03/30 05:24:52 jake Exp $
- */
-
-#ifndef _MACHINE__TYPES_H_
-#define	_MACHINE__TYPES_H_
-
-/*
- * Basic types upon which most other types are built.
- */
-typedef	__signed char		__int8_t;
-typedef	unsigned char		__uint8_t;
-typedef	short			__int16_t;
-typedef	unsigned short		__uint16_t;
-typedef	int			__int32_t;
-typedef	unsigned int		__uint32_t;
-
-#if defined(lint)
-/* LONGLONG */
-typedef	long long		__int64_t;
-/* LONGLONG */
-typedef	unsigned long long	__uint64_t;
-#elif defined(__GNUC__)
-typedef	int __attribute__((__mode__(__DI__)))		__int64_t;
-typedef	unsigned int __attribute__((__mode__(__DI__)))	__uint64_t;
-#else
-/* LONGLONG */
-typedef	long long		__int64_t;
-/* LONGLONG */
-typedef	unsigned long long	__uint64_t;
-#endif
-
-/*
- * Standard type definitions.
- */
-typedef	unsigned long	__clock_t;		/* clock()... */
-typedef	__int32_t	__critical_t;
-typedef	double		__double_t;
-typedef	double		__float_t;
-typedef	__int32_t	__intfptr_t;
-typedef	__int64_t	__intmax_t;
-typedef	__int32_t	__intptr_t;
-typedef	__int32_t	__int_fast8_t;
-typedef	__int32_t	__int_fast16_t;
-typedef	__int32_t	__int_fast32_t;
-typedef	__int64_t	__int_fast64_t;
-typedef	__int8_t	__int_least8_t;
-typedef	__int16_t	__int_least16_t;
-typedef	__int32_t	__int_least32_t;
-typedef	__int64_t	__int_least64_t;
-typedef	__int32_t	__ptrdiff_t;		/* ptr1 - ptr2 */
-typedef	__int32_t	__register_t;
-typedef	__int32_t	__segsz_t;		/* segment size (in pages) */
-typedef	__uint32_t	__size_t;		/* sizeof() */
-typedef	__int32_t	__ssize_t;		/* byte count or error */
-typedef	__int32_t	__time_t;		/* time()... */
-typedef	__uint32_t	__uintfptr_t;
-typedef	__uint64_t	__uintmax_t;
-typedef	__uint32_t	__uintptr_t;
-typedef	__uint32_t	__uint_fast8_t;
-typedef	__uint32_t	__uint_fast16_t;
-typedef	__uint32_t	__uint_fast32_t;
-typedef	__uint64_t	__uint_fast64_t;
-typedef	__uint8_t	__uint_least8_t;
-typedef	__uint16_t	__uint_least16_t;
-typedef	__uint32_t	__uint_least32_t;
-typedef	__uint64_t	__uint_least64_t;
-typedef	__uint32_t	__u_register_t;
-typedef	__uint32_t	__vm_offset_t;
-typedef	__int64_t	__vm_ooffset_t;
-#ifdef PAE
-typedef	__uint64_t	__vm_paddr_t;
-#else
-typedef	__uint32_t	__vm_paddr_t;
-#endif
-typedef	__uint64_t	__vm_pindex_t;
-typedef	__uint32_t	__vm_size_t;
-
-/*
- * Unusual type definitions.
- */
-#if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3)
-typedef __builtin_va_list	__va_list;	/* internally known to gcc */
-#else
-typedef	char *			__va_list;
-#endif /* post GCC 2.95 */
-#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST)
-#define __GNUC_VA_LIST
-typedef __va_list		__gnuc_va_list;	/* compatibility w/GNU headers*/
-#endif
-
-#endif /* !_MACHINE__TYPES_H_ */
diff --git a/include/machine/endian.h b/include/machine/endian.h
deleted file mode 100644
index ca63ae7..0000000
--- a/include/machine/endian.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * Copyright (c) 1987, 1991 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.
- *
- *	@(#)endian.h	7.8 (Berkeley) 4/3/91
- * $FreeBSD: src/sys/i386/include/endian.h,v 1.37 2003/09/22 21:46:47 peter Exp $
- */
-
-#ifndef _MACHINE_ENDIAN_H_
-#define	_MACHINE_ENDIAN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/*
- * Define the order of 32-bit words in 64-bit words.
- */
-#define	_QUAD_HIGHWORD 1
-#define	_QUAD_LOWWORD 0
-
-/*
- * Definitions for byte order, according to byte significance from low
- * address to high.
- */
-#define	_LITTLE_ENDIAN	1234	/* LSB first: i386, vax */
-#define	_BIG_ENDIAN	4321	/* MSB first: 68000, ibm, net */
-#define	_PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
-
-#define	_BYTE_ORDER	_LITTLE_ENDIAN
-
-/*
- * Deprecated variants that don't have enough underscores to be useful in more
- * strict namespaces.
- */
-#if __BSD_VISIBLE
-#define	LITTLE_ENDIAN	_LITTLE_ENDIAN
-#define	BIG_ENDIAN	_BIG_ENDIAN
-#define	PDP_ENDIAN	_PDP_ENDIAN
-#define	BYTE_ORDER	_BYTE_ORDER
-#endif
-
-#ifdef __GNUC__
-
-#define __word_swap_int_var(x) \
-__extension__ ({ register __uint32_t __X = (x); \
-   __asm ("rorl $16, %0" : "+r" (__X)); \
-   __X; })
-
-#ifdef __OPTIMIZE__
-
-#define	__word_swap_int_const(x) \
-	((((x) & 0xffff0000) >> 16) | \
-	 (((x) & 0x0000ffff) << 16))
-#define	__word_swap_int(x) (__builtin_constant_p(x) ? \
-	__word_swap_int_const(x) : __word_swap_int_var(x))
-
-#else	/* __OPTIMIZE__ */
-
-#define	__word_swap_int(x) __word_swap_int_var(x)
-
-#endif	/* __OPTIMIZE__ */
-
-#if defined(_KERNEL) && (defined(I486_CPU) || defined(I586_CPU) || defined(I686_CPU)) && !defined(I386_CPU)
-
-#define __byte_swap_int_var(x) \
-__extension__ ({ register __uint32_t __X = (x); \
-   __asm ("bswap %0" : "+r" (__X)); \
-   __X; })
-#else
-
-#define __byte_swap_int_var(x) \
-__extension__ ({ register __uint32_t __X = (x); \
-   __asm ("xchgb %h0, %b0\n\trorl $16, %0\n\txchgb %h0, %b0" \
-       : "+q" (__X)); \
-   __X; })
-#endif
-
-#ifdef __OPTIMIZE__
-
-#define	__byte_swap_int_const(x) \
-	((((x) & 0xff000000) >> 24) | \
-	 (((x) & 0x00ff0000) >>  8) | \
-	 (((x) & 0x0000ff00) <<  8) | \
-	 (((x) & 0x000000ff) << 24))
-#define	__byte_swap_int(x) (__builtin_constant_p(x) ? \
-	__byte_swap_int_const(x) : __byte_swap_int_var(x))
-
-#else	/* __OPTIMIZE__ */
-
-#define	__byte_swap_int(x) __byte_swap_int_var(x)
-
-#endif	/* __OPTIMIZE__ */
-
-#define __byte_swap_word_var(x) \
-__extension__ ({ register __uint16_t __X = (x); \
-   __asm ("xchgb %h0, %b0" : "+q" (__X)); \
-   __X; })
-
-#ifdef __OPTIMIZE__
-
-#define	__byte_swap_word_const(x) \
-	((((x) & 0xff00) >> 8) | \
-	 (((x) & 0x00ff) << 8))
-
-#define	__byte_swap_word(x) (__builtin_constant_p(x) ? \
-	__byte_swap_word_const(x) : __byte_swap_word_var(x))
-
-#else	/* __OPTIMIZE__ */
-
-#define	__byte_swap_word(x) __byte_swap_word_var(x)
-
-#endif	/* __OPTIMIZE__ */
-
-static __inline __uint64_t
-__bswap64(__uint64_t _x)
-{
-
-	return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
-	    ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
-	    ((_x << 24) & ((__uint64_t)0xff << 40)) |
-	    ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
-}
-
-static __inline __uint32_t
-__bswap32(__uint32_t _x)
-{
-
-	return (__byte_swap_int(_x));
-}
-
-static __inline __uint16_t
-__bswap16(__uint16_t _x)
-{
-
-	return (__byte_swap_word(_x));
-}
-
-#define	__htonl(x)	__bswap32(x)
-#define	__htons(x)	__bswap16(x)
-#define	__ntohl(x)	__bswap32(x)
-#define	__ntohs(x)	__bswap16(x)
-
-#else /* !__GNUC__ */
-
-/*
- * No optimizations are available for this compiler.  Fall back to
- * non-optimized functions by defining the constant usually used to prevent
- * redefinition.
- */
-#define	_BYTEORDER_FUNC_DEFINED
-
-#endif /* __GNUC__ */
-
-#endif /* !_MACHINE_ENDIAN_H_ */
diff --git a/include/machine/param.h b/include/machine/param.h
deleted file mode 100644
index 68f8020..0000000
--- a/include/machine/param.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- *
- *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
- * $FreeBSD: src/sys/i386/include/param.h,v 1.69 2003/06/14 23:23:53 alc Exp $
- */
-
-/*
- * Machine dependent constants for Intel 386.
- */
-
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...).   The result is unsigned int
- * and must be cast to any desired pointer type.
- */
-#ifndef _ALIGNBYTES
-#define _ALIGNBYTES	(sizeof(int) - 1)
-#endif
-#ifndef _ALIGN
-#define _ALIGN(p)	(((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
-#endif
-
-#ifndef _MACHINE
-#define	_MACHINE	i386
-#endif
-#ifndef _MACHINE_ARCH
-#define	_MACHINE_ARCH	i386
-#endif
-
-#ifndef _NO_NAMESPACE_POLLUTION
-
-#ifndef _MACHINE_PARAM_H_
-#define	_MACHINE_PARAM_H_
-
-#ifndef MACHINE
-#define MACHINE		"i386"
-#endif
-#ifndef MACHINE_ARCH
-#define	MACHINE_ARCH	"i386"
-#endif
-#define MID_MACHINE	MID_I386
-
-#ifdef SMP
-#define MAXCPU		16
-#else
-#define MAXCPU		1
-#endif /* SMP */
-
-#define ALIGNBYTES	_ALIGNBYTES
-#define ALIGN(p)	_ALIGN(p)
-
-#define PAGE_SHIFT	12		/* LOG2(PAGE_SIZE) */
-#define PAGE_SIZE	(1<<PAGE_SHIFT)	/* bytes/page */
-#define PAGE_MASK	(PAGE_SIZE-1)
-#define NPTEPG		(PAGE_SIZE/(sizeof (pt_entry_t)))
-
-#ifdef PAE
-#define NPGPTD		4
-#define PDRSHIFT	21		/* LOG2(NBPDR) */
-#else
-#define NPGPTD		1
-#define PDRSHIFT	22		/* LOG2(NBPDR) */
-#endif
-
-#define NBPTD		(NPGPTD<<PAGE_SHIFT)
-#define NPDEPTD		(NBPTD/(sizeof (pd_entry_t)))
-#define NPDEPG		(PAGE_SIZE/(sizeof (pd_entry_t)))
-#define NBPDR		(1<<PDRSHIFT)	/* bytes/page dir */
-#define PDRMASK		(NBPDR-1)
-
-#define IOPAGES	2		/* pages of i/o permission bitmap */
-
-#ifndef KSTACK_PAGES
-#define KSTACK_PAGES 2		/* Includes pcb! */
-#endif
-#define KSTACK_GUARD_PAGES 1	/* pages of kstack guard; 0 disables */
-#define UAREA_PAGES 1		/* holds struct user WITHOUT PCB (see def.) */
-
-/*
- * Ceiling on amount of swblock kva space, can be changed via
- * the kern.maxswzone /boot/loader.conf variable.
- */
-#ifndef VM_SWZONE_SIZE_MAX
-#define VM_SWZONE_SIZE_MAX	(32 * 1024 * 1024)
-#endif
-
-/*
- * Ceiling on size of buffer cache (really only effects write queueing,
- * the VM page cache is not effected), can be changed via
- * the kern.maxbcache /boot/loader.conf variable.
- */
-#ifndef VM_BCACHE_SIZE_MAX
-#define VM_BCACHE_SIZE_MAX	(200 * 1024 * 1024)
-#endif
-
-/*
- * Mach derived conversion macros
- */
-#define trunc_page(x)		((x) & ~PAGE_MASK)
-#define round_page(x)		(((x) + PAGE_MASK) & ~PAGE_MASK)
-#define trunc_4mpage(x)		((x) & ~PDRMASK)
-#define round_4mpage(x)		((((x)) + PDRMASK) & ~PDRMASK)
-
-#define atop(x)			((x) >> PAGE_SHIFT)
-#define ptoa(x)			((x) << PAGE_SHIFT)
-
-#define i386_btop(x)		((x) >> PAGE_SHIFT)
-#define i386_ptob(x)		((x) << PAGE_SHIFT)
-
-#define	pgtok(x)		((x) * (PAGE_SIZE / 1024))
-
-#endif /* !_MACHINE_PARAM_H_ */
-#endif /* !_NO_NAMESPACE_POLLUTION */
diff --git a/include/machine/signal.h b/include/machine/signal.h
deleted file mode 100644
index 0009d76..0000000
--- a/include/machine/signal.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 1986, 1989, 1991, 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.
- *
- *	@(#)signal.h	8.1 (Berkeley) 6/11/93
- * $FreeBSD: src/sys/i386/include/signal.h,v 1.20 2002/12/02 19:58:55 deischen Exp $
- */
-
-#ifndef _MACHINE_SIGNAL_H_
-#define	_MACHINE_SIGNAL_H_
-
-#include <sys/cdefs.h>
-#include <sys/_sigset.h>
-
-/*
- * Machine-dependent signal definitions
- */
-
-typedef int sig_atomic_t;
-
-#if __XSI_VISIBLE
-/*
- * Minimum signal stack size. The current signal frame
- * for i386 is 408 bytes large.
- */
-#define	MINSIGSTKSZ	(512 * 4)
-#endif
-
-#if __BSD_VISIBLE
-#include <machine/trap.h>	/* codes for SIGILL, SIGFPE */
-
-/*
- * Only the kernel should need these old type definitions.
- */
-#if defined(_KERNEL) && defined(COMPAT_43)
-/*
- * Information pushed on stack when a signal is delivered.
- * This is used by the kernel to restore state following
- * execution of the signal handler.  It is also made available
- * to the handler to allow it to restore state properly if
- * a non-standard exit is performed.
- */
-struct osigcontext {
-	int	sc_onstack;		/* sigstack state to restore */
-	osigset_t sc_mask;		/* signal mask to restore */
-	int	sc_esp;			/* machine state follows: */
-	int	sc_ebp;
-	int	sc_isp;
-	int	sc_eip;
-	int	sc_efl;
-	int	sc_es;
-	int	sc_ds;
-	int	sc_cs;
-	int	sc_ss;
-	int	sc_edi;
-	int	sc_esi;
-	int	sc_ebx;
-	int	sc_edx;
-	int	sc_ecx;
-	int	sc_eax;
-	int	sc_gs;
-	int	sc_fs;
-	int	sc_trapno;
-	int	sc_err;
-};
-#endif
-
-/*
- * The sequence of the fields/registers in struct sigcontext should match
- * those in mcontext_t.
- */
-struct sigcontext {
-	struct __sigset sc_mask;	/* signal mask to restore */
-	int	sc_onstack;		/* sigstack state to restore */
-	int	sc_gs;			/* machine state (struct trapframe) */
-	int	sc_fs;
-	int	sc_es;
-	int	sc_ds;
-	int	sc_edi;
-	int	sc_esi;
-	int	sc_ebp;
-	int	sc_isp;
-	int	sc_ebx;
-	int	sc_edx;
-	int	sc_ecx;
-	int	sc_eax;
-	int	sc_trapno;
-	int	sc_err;
-	int	sc_eip;
-	int	sc_cs;
-	int	sc_efl;
-	int	sc_esp;
-	int	sc_ss;
-	int	sc_len;			/* sizeof(mcontext_t) */
-	/*
-	 * XXX - See <machine/ucontext.h> and <machine/npx.h> for
-	 *       the following fields.
-	 */
-	int	sc_fpformat;
-	int	sc_ownedfp;
-	int	sc_spare1[1];
-	int	sc_fpstate[128] __aligned(16);
-	int	sc_spare2[8];
-};
-
-#define	sc_sp		sc_esp
-#define	sc_fp		sc_ebp
-#define	sc_pc		sc_eip
-#define	sc_ps		sc_efl
-#define	sc_eflags	sc_efl
-
-#endif /* __BSD_VISIBLE */
-
-#endif /* !_MACHINE_SIGNAL_H_ */
diff --git a/include/machine/trap.h b/include/machine/trap.h
deleted file mode 100644
index c32c70b..0000000
--- a/include/machine/trap.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- *
- *	from: @(#)trap.h	5.4 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/i386/include/trap.h,v 1.13 2001/07/12 06:32:51 peter Exp $
- */
-
-#ifndef _MACHINE_TRAP_H_
-#define	_MACHINE_TRAP_H_
-
-/*
- * Trap type values
- * also known in trap.c for name strings
- */
-
-#define	T_PRIVINFLT	1	/* privileged instruction */
-#define	T_BPTFLT	3	/* breakpoint instruction */
-#define	T_ARITHTRAP	6	/* arithmetic trap */
-#define	T_PROTFLT	9	/* protection fault */
-#define	T_TRCTRAP	10	/* debug exception (sic) */
-#define	T_PAGEFLT	12	/* page fault */
-#define	T_ALIGNFLT	14	/* alignment fault */
-
-#define	T_DIVIDE	18	/* integer divide fault */
-#define	T_NMI		19	/* non-maskable trap */
-#define	T_OFLOW		20	/* overflow trap */
-#define	T_BOUND		21	/* bound instruction fault */
-#define	T_DNA		22	/* device not available fault */
-#define	T_DOUBLEFLT	23	/* double fault */
-#define	T_FPOPFLT	24	/* fp coprocessor operand fetch fault */
-#define	T_TSSFLT	25	/* invalid tss fault */
-#define	T_SEGNPFLT	26	/* segment not present fault */
-#define	T_STKFLT	27	/* stack fault */
-#define	T_MCHK		28	/* machine check trap */
-#define	T_XMMFLT	29	/* SIMD floating-point exception */
-#define	T_RESERVED	30	/* reserved (unknown) */
-
-/* XXX most of the following codes aren't used, but could be. */
-
-/* definitions for <sys/signal.h> */
-#define	    ILL_RESAD_FAULT	T_RESADFLT
-#define	    ILL_PRIVIN_FAULT	T_PRIVINFLT
-#define	    ILL_RESOP_FAULT	T_RESOPFLT
-#define	    ILL_ALIGN_FAULT	T_ALIGNFLT
-#define	    ILL_FPOP_FAULT	T_FPOPFLT	/* coprocessor operand fault */
-
-/* portable macros for SIGFPE/ARITHTRAP */
-#define FPE_INTOVF	1	/* integer overflow */
-#define FPE_INTDIV	2	/* integer divide by zero */
-#define FPE_FLTDIV	3	/* floating point divide by zero */
-#define FPE_FLTOVF	4	/* floating point overflow */
-#define FPE_FLTUND	5	/* floating point underflow */
-#define FPE_FLTRES	6	/* floating point inexact result */
-#define FPE_FLTINV	7	/* invalid floating point operation */
-#define FPE_FLTSUB	8	/* subscript out of range */
-
-/* old FreeBSD macros, deprecated */
-#define	FPE_INTOVF_TRAP	0x1	/* integer overflow */
-#define	FPE_INTDIV_TRAP	0x2	/* integer divide by zero */
-#define	FPE_FLTDIV_TRAP	0x3	/* floating/decimal divide by zero */
-#define	FPE_FLTOVF_TRAP	0x4	/* floating overflow */
-#define	FPE_FLTUND_TRAP	0x5	/* floating underflow */
-#define	FPE_FPU_NP_TRAP	0x6	/* floating point unit not present  */
-#define	FPE_SUBRNG_TRAP	0x7	/* subrange out of bounds */
-
-/* codes for SIGBUS */
-#define	    BUS_PAGE_FAULT	T_PAGEFLT	/* page fault protection base */
-#define	    BUS_SEGNP_FAULT	T_SEGNPFLT	/* segment not present */
-#define	    BUS_STK_FAULT	T_STKFLT	/* stack segment */
-#define	    BUS_SEGM_FAULT	T_RESERVED	/* segment protection base */
-
-/* Trap's coming from user mode */
-#define	T_USER	0x100
-
-#endif /* !_MACHINE_TRAP_H_ */
diff --git a/include/math.h b/include/math.h
deleted file mode 100644
index 2435391..0000000
--- a/include/math.h
+++ /dev/null
@@ -1,2 +0,0 @@
-double sqrt(double val);
-double atan(double val);
diff --git a/include/paths.h b/include/paths.h
deleted file mode 100644
index 952a3ae..0000000
--- a/include/paths.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- *
- *	@(#)paths.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/paths.h,v 1.25 2004/01/04 17:17:46 iedowse Exp $
- */
-
-#ifndef _PATHS_H_
-#define	_PATHS_H_
-
-#include <sys/cdefs.h>
-
-/* Default search path. */
-#define	_PATH_DEFPATH	"/usr/bin:/bin"
-/* All standard utilities path. */
-#define	_PATH_STDPATH \
-	"/usr/bin:/bin:/usr/sbin:/sbin:"
-/* Locate system binaries */
-#define _PATH_SYSPATH	\
-	"/sbin:/usr/sbin"
-
-#define	_PATH_AUTHCONF	"/etc/auth.conf"
-#define	_PATH_BSHELL	"/bin/sh"
-#define	_PATH_CAPABILITY	"/etc/capability"
-#define	_PATH_CAPABILITY_DB	"/etc/capability.db"
-#define	_PATH_CONSOLE	"/dev/console"
-#define	_PATH_CP	"/bin/cp"
-#define	_PATH_CSHELL	"/bin/csh"
-#define	_PATH_DEFTAPE	"/dev/sa0"
-#define	_PATH_DEVNULL	"/dev/null"
-#define	_PATH_DEVZERO	"/dev/zero"
-#define	_PATH_DRUM	"/dev/drum"
-#define	_PATH_ETC	"/etc"
-#define	_PATH_FTPUSERS	"/etc/ftpusers"
-#define	_PATH_HALT	"/sbin/halt"
-#define	_PATH_IFCONFIG	"/sbin/ifconfig"
-#define	_PATH_KMEM	"/dev/kmem"
-#define	_PATH_LIBMAP_CONF	"/etc/libmap.conf"
-#define	_PATH_LOCALE	"/usr/share/locale"
-#define	_PATH_LOGIN	"/usr/bin/login"
-#define	_PATH_MAILDIR	"/var/mail"
-#define	_PATH_MAN	"/usr/share/man"
-#define	_PATH_MDCONFIG	"/sbin/mdconfig"
-#define	_PATH_MEM	"/dev/mem"
-#define	_PATH_MKSNAP_FFS	"/sbin/mksnap_ffs"
-#define	_PATH_MOUNT	"/sbin/mount"
-#define	_PATH_NEWFS	"/sbin/newfs"
-#define	_PATH_NOLOGIN	"/var/run/nologin"
-#define	_PATH_RCP	"/bin/rcp"
-#define	_PATH_REBOOT	"/sbin/reboot"
-#define	_PATH_RLOGIN	"/usr/bin/rlogin"
-#define	_PATH_RM	"/bin/rm"
-#define	_PATH_RSH	"/usr/bin/rsh"
-#define	_PATH_SENDMAIL	"/usr/sbin/sendmail"
-#define	_PATH_SHELLS	"/etc/shells"
-#define	_PATH_TTY	"/dev/tty"
-#define	_PATH_UNIX	"don't use _PATH_UNIX"
-#define	_PATH_VI	"/usr/bin/vi"
-#define	_PATH_WALL	"/usr/bin/wall"
-
-/* Provide trailing slash, since mostly used for building pathnames. */
-#define	_PATH_DEV	"/dev/"
-#define	_PATH_TMP	"/tmp/"
-#define	_PATH_VARDB	"/var/db/"
-#define	_PATH_VARRUN	"/var/run/"
-#define	_PATH_VARTMP	"/var/tmp/"
-#define	_PATH_YP	"/var/yp/"
-#define	_PATH_UUCPLOCK	"/var/spool/lock/"
-
-/* How to get the correct name of the kernel. */
-__BEGIN_DECLS
-const char *getbootfile(void);
-__END_DECLS
-
-#ifdef RESCUE
-#undef	_PATH_DEFPATH
-#define	_PATH_DEFPATH	"/rescue:/usr/bin:/bin"
-#undef	_PATH_STDPATH
-#define	_PATH_STDPATH	"/rescue:/usr/bin:/bin:/usr/sbin:/sbin"
-#undef	_PATH_SYSPATH
-#define	_PATH_SYSPATH	"/rescue:/sbin:/usr/sbin"
-#undef	_PATH_BSHELL
-#define	_PATH_BSHELL	"/rescue/sh"
-#undef	_PATH_CP
-#define	_PATH_CP	"/rescue/cp"
-#undef	_PATH_CSHELL
-#define	_PATH_CSHELL	"/rescue/csh"
-#undef	_PATH_HALT
-#define	_PATH_HALT	"/rescue/halt"
-#undef	_PATH_IFCONFIG
-#define	_PATH_IFCONFIG	"/rescue/ifconfig"
-#undef	_PATH_MDCONFIG
-#define	_PATH_MDCONFIG	"/rescue/mdconfig"
-#undef	_PATH_MOUNT
-#define	_PATH_MOUNT	"/rescue/mount"
-#undef	_PATH_NEWFS
-#define	_PATH_NEWFS	"/rescue/newfs"
-#undef	_PATH_RCP
-#define	_PATH_RCP	"/rescue/rcp"
-#undef	_PATH_REBOOT
-#define	_PATH_REBOOT	"/rescue/reboot"
-#undef	_PATH_RM
-#define	_PATH_RM	"/rescue/rm"
-#undef	_PATH_VI
-#define	_PATH_VI	"/rescue/vi"
-#undef	_PATH_WALL
-#define	_PATH_WALL	"/rescue/wall"
-#endif /* RESCUE */
-
-#endif /* !_PATHS_H_ */
diff --git a/include/quad.h b/include/quad.h
deleted file mode 100644
index 4f65864..0000000
--- a/include/quad.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <sys/types.h>
-
-quad_t __divdi3(quad_t a,quad_t b);
-u_quad_t __udivdi3(u_quad_t a,u_quad_t b);
diff --git a/include/regex.h b/include/regex.h
deleted file mode 100644
index a58db6f..0000000
--- a/include/regex.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * Copyright (c) 1992 Henry Spencer.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer of the University of Toronto.
- *
- * 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.
- *
- *	@(#)regex.h	8.2 (Berkeley) 1/3/94
- * $FreeBSD: src/include/regex.h,v 1.10 2003/12/18 10:41:39 jkh Exp $
- */
-
-#ifndef _REGEX_H_
-#define	_REGEX_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/* types */
-typedef	__off_t		regoff_t;
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-typedef struct {
-	int re_magic;
-	size_t re_nsub;		/* number of parenthesized subexpressions */
-	__const char *re_endp;	/* end pointer for REG_PEND */
-	struct re_guts *re_g;	/* none of your business :-) */
-} regex_t;
-
-typedef struct {
-	regoff_t rm_so;		/* start of match */
-	regoff_t rm_eo;		/* end of match */
-} regmatch_t;
-
-/* regcomp() flags */
-#define	REG_BASIC	0000
-#define	REG_EXTENDED	0001
-#define	REG_ICASE	0002
-#define	REG_NOSUB	0004
-#define	REG_NEWLINE	0010
-#define	REG_NOSPEC	0020
-#define	REG_PEND	0040
-#define	REG_DUMP	0200
-
-/* regerror() flags */
-#define	REG_ENOSYS	(-1)
-#define	REG_NOMATCH	 1
-#define	REG_BADPAT	 2
-#define	REG_ECOLLATE	 3
-#define	REG_ECTYPE	 4
-#define	REG_EESCAPE	 5
-#define	REG_ESUBREG	 6
-#define	REG_EBRACK	 7
-#define	REG_EPAREN	 8
-#define	REG_EBRACE	 9
-#define	REG_BADBR	10
-#define	REG_ERANGE	11
-#define	REG_ESPACE	12
-#define	REG_BADRPT	13
-#define	REG_EMPTY	14
-#define	REG_ASSERT	15
-#define	REG_INVARG	16
-#define	REG_ATOI	255	/* convert name to number (!) */
-#define	REG_ITOA	0400	/* convert number to name (!) */
-
-/* regexec() flags */
-#define	REG_NOTBOL	00001
-#define	REG_NOTEOL	00002
-#define	REG_STARTEND	00004
-#define	REG_TRACE	00400	/* tracing of execution */
-#define	REG_LARGE	01000	/* force large representation */
-#define	REG_BACKR	02000	/* force use of backref code */
-
-__BEGIN_DECLS
-int	regcomp(regex_t * __restrict, const char * __restrict, int);
-size_t	regerror(int, const regex_t * __restrict, char * __restrict, size_t);
-/*
- * XXX forth parameter should be `regmatch_t [__restrict]', but isn't because
- * of a bug in GCC 3.2 (when -std=c99 is specified) which perceives this as a
- * syntax error.
- */
-int	regexec(const regex_t * __restrict, const char * __restrict, size_t,
-	    regmatch_t * __restrict, int);
-void	regfree(regex_t *);
-__END_DECLS
-
-#endif /* !_REGEX_H_ */
diff --git a/include/rune.h b/include/rune.h
deleted file mode 100644
index b1e6115..0000000
--- a/include/rune.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- *
- *	@(#)rune.h	8.1 (Berkeley) 6/27/93
- * $FreeBSD: src/include/rune.h,v 1.4 2003/06/25 22:28:33 phantom Exp $
- */
-
-#ifndef	_RUNE_H_
-#define	_RUNE_H_
-
-#include <stdio.h>
-#include <runetype.h>
-
-#ifndef _RUNE_T_DECLARED
-#define	_RUNE_T_DECLARED
-typedef	__rune_t	rune_t;
-#endif
-
-#define _INVALID_RUNE   _CurrentRuneLocale->invalid_rune
-
-#define __sgetrune      _CurrentRuneLocale->sgetrune
-#define __sputrune      _CurrentRuneLocale->sputrune
-
-#define sgetrune(s, n, r)       (*__sgetrune)((s), (n), (r))
-#define sputrune(c, s, n, r)    (*__sputrune)((c), (s), (n), (r))
-
-__BEGIN_DECLS
-char	*mbrune(const char *, rune_t);
-char	*mbrrune(const char *, rune_t);
-char	*mbmb(const char *, char *);
-long	 fgetrune(FILE *);
-int	 fputrune(rune_t, FILE *);
-int	 fungetrune(rune_t, FILE *);
-int	 setrunelocale(char *);
-void	 setinvalidrune(rune_t);
-__END_DECLS
-
-#endif	/*! _RUNE_H_ */
diff --git a/include/runetype.h b/include/runetype.h
deleted file mode 100644
index d7001f0..0000000
--- a/include/runetype.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- *
- *	@(#)runetype.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/runetype.h,v 1.8 2002/09/06 04:22:54 mike Exp $
- */
-
-#ifndef	_RUNETYPE_H_
-#define	_RUNETYPE_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#define	_CACHED_RUNES	(1 <<8 )	/* Must be a power of 2 */
-#define	_CRMASK		(~(_CACHED_RUNES - 1))
-
-/*
- * The lower 8 bits of runetype[] contain the digit value of the rune.
- */
-typedef struct {
-	__rune_t	min;		/* First rune of the range */
-	__rune_t	max;		/* Last rune (inclusive) of the range */
-	__rune_t	map;		/* What first maps to in maps */
-	unsigned long	*types;		/* Array of types in range */
-} _RuneEntry;
-
-typedef struct {
-	int		nranges;	/* Number of ranges stored */
-	_RuneEntry	*ranges;	/* Pointer to the ranges */
-} _RuneRange;
-
-typedef struct {
-	char		magic[8];	/* Magic saying what version we are */
-	char		encoding[32];	/* ASCII name of this encoding */
-
-	__rune_t	(*sgetrune)(const char *, __size_t, char const **);
-	int		(*sputrune)(__rune_t, char *, __size_t, char **);
-	__rune_t	invalid_rune;
-
-	unsigned long	runetype[_CACHED_RUNES];
-	__rune_t	maplower[_CACHED_RUNES];
-	__rune_t	mapupper[_CACHED_RUNES];
-
-	/*
-	 * The following are to deal with Runes larger than _CACHED_RUNES - 1.
-	 * Their data is actually contiguous with this structure so as to make
-	 * it easier to read/write from/to disk.
-	 */
-	_RuneRange	runetype_ext;
-	_RuneRange	maplower_ext;
-	_RuneRange	mapupper_ext;
-
-	void		*variable;	/* Data which depends on the encoding */
-	int		variable_len;	/* how long that data is */
-} _RuneLocale;
-
-#define	_RUNE_MAGIC_1	"RuneMagi"	/* Indicates version 0 of RuneLocale */
-
-extern _RuneLocale _DefaultRuneLocale;
-extern _RuneLocale *_CurrentRuneLocale;
-
-#endif	/* !_RUNETYPE_H_ */
diff --git a/include/stdarg.h b/include/stdarg.h
deleted file mode 100644
index 685342c..0000000
--- a/include/stdarg.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: stdarg.h 111 2016-01-13 05:50:42Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _STDARG_H
-#define _STDARG_H
-
-typedef char *vaList;
-
-/*
-#define _vaSize(TYPE) (((sizeof(TYPE) + sizeof(int) -1) / sizeof(int)) * sizeof(int))
-#define vaStart(AP, LASTARG) (AP=((vaList)&(LASTARG) + _vaSize(LASTARG)))
-#define vaEnd(AP)
-#define vaArg(AP, TYPE) (AP += _vaSize(TYPE), *((TYPE *)(AP - _vaSize(TYPE))))
-*/
-
-#define vaStart(ap, last) \
-        __builtin_va_start((ap), (last))
-
-#define vaArg(ap, type) \
-        __builtin_va_arg((ap), type)
-
-#define __va_copy(dest, src) \
-        __builtin_va_copy((dest), (src))
-
-#define vaEnd(ap) \
-        __builtin_va_end(ap)
-
-
-#endif
diff --git a/include/stddef.h b/include/stddef.h
deleted file mode 100644
index a331305..0000000
--- a/include/stddef.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- *
- *	@(#)stddef.h	8.1 (Berkeley) 6/2/93
- *
- * $FreeBSD: src/include/stddef.h,v 1.10 2003/12/07 21:10:06 marcel Exp $
- */
-
-#ifndef _STDDEF_H_
-#define _STDDEF_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-
-typedef	__ptrdiff_t	ptrdiff_t;
-
-#if __BSD_VISIBLE
-#ifndef _RUNE_T_DECLARED
-typedef	__rune_t	rune_t;
-#define	_RUNE_T_DECLARED
-#endif
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef	__cplusplus
-#ifndef _WCHAR_T_DECLARED
-typedef	__wchar_t	wchar_t;
-#define	_WCHAR_T_DECLARED
-#endif
-#endif
-
-#define	offsetof(type, member)	__offsetof(type, member)
-
-#endif /* _STDDEF_H_ */
diff --git a/include/stdint.h b/include/stdint.h
deleted file mode 100644
index b0d6632..0000000
--- a/include/stdint.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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/stdint.h,v 1.4 2002/08/21 16:20:01 mike Exp $
- */
-
-#ifndef _SYS_STDINT_H_
-#define _SYS_STDINT_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#include <machine/_stdint.h>
-
-#ifndef _INT8_T_DECLARED
-typedef	__int8_t		int8_t;
-#define	_INT8_T_DECLARED
-#endif
-
-#ifndef _INT16_T_DECLARED
-typedef	__int16_t		int16_t;
-#define	_INT16_T_DECLARED
-#endif
-
-#ifndef _INT32_T_DECLARED
-typedef	__int32_t		int32_t;
-#define	_INT32_T_DECLARED
-#endif
-
-#ifndef _INT64_T_DECLARED
-typedef	__int64_t		int64_t;
-#define	_INT64_T_DECLARED
-#endif
-
-#ifndef _UINT8_T_DECLARED
-typedef	__uint8_t		uint8_t;
-#define	_UINT8_T_DECLARED
-#endif
-
-#ifndef _UINT16_T_DECLARED
-typedef	__uint16_t		uint16_t;
-#define	_UINT16_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef	__uint32_t		uint32_t;
-#define	_UINT32_T_DECLARED
-#endif
-
-#ifndef _UINT64_T_DECLARED
-typedef	__uint64_t		uint64_t;
-#define	_UINT64_T_DECLARED
-#endif
-
-typedef	__int_least8_t		int_least8_t;
-typedef	__int_least16_t		int_least16_t;
-typedef	__int_least32_t		int_least32_t;
-typedef	__int_least64_t		int_least64_t;
-
-typedef	__uint_least8_t		uint_least8_t;
-typedef	__uint_least16_t	uint_least16_t;
-typedef	__uint_least32_t	uint_least32_t;
-typedef	__uint_least64_t	uint_least64_t;
-
-typedef	__int_fast8_t		int_fast8_t;
-typedef	__int_fast16_t		int_fast16_t;
-typedef	__int_fast32_t		int_fast32_t;
-typedef	__int_fast64_t		int_fast64_t;
-
-typedef	__uint_fast8_t		uint_fast8_t;
-typedef	__uint_fast16_t		uint_fast16_t;
-typedef	__uint_fast32_t		uint_fast32_t;
-typedef	__uint_fast64_t		uint_fast64_t;
-
-typedef	__intmax_t		intmax_t;
-typedef	__uintmax_t		uintmax_t;
-
-#ifndef _INTPTR_T_DECLARED
-typedef	__intptr_t		intptr_t;
-typedef	__uintptr_t		uintptr_t;
-#define	_INTPTR_T_DECLARED
-#endif
-
-#endif /* !_SYS_STDINT_H_ */
diff --git a/include/stdio.h b/include/stdio.h
deleted file mode 100644
index b2a32cb..0000000
--- a/include/stdio.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: stdio.h 88 2016-01-12 00:11:29Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _STDIO_H
-#define _STDIO_H
-
-#include <sys/types.h>
-#include <wchar.h>
-#include <stdarg.h>
-
-/* Type Definitions */
-
-typedef struct fileDescriptor {
-  uLong  fd;
-  uInt32 size;
-  } FILE;
-
-/* Definitions */
-
-extern FILE fdTable[];
-
-#define stdin   (&fdTable[0])
-#define stdout  (&fdTable[1])
-#define stderr  (&fdTable[2])
-
-#define SEEK_SET 0
-
-#define EOF     (-1)
-
-/* Functions Definitions */
-
-int fprintf(FILE *, const char *,...);
-int printf(const char *, ...);
-int vfprintf(FILE *,const char *,vaList args);
-int vsprintf(char *buf,const char *fmt,vaList args);
-FILE *fopen(const char *,const char *);
-int fwrite(const void *ptr,int size,int nmemb,FILE *fd);
-int fgetc(FILE *fd);
-
-//New Functions Listed From Here On Till I'm Done Writing A libc
-int sprintf(char *string, const char *format, ...);
-char *gets(char *string);
-size_t fread(void *pointer,size_t size,size_t count, FILE *stream);
-int fclose(FILE *fp);
-int fseek(FILE *,long offset,int whence);
-
-
-/**** Proper LIBC Stuff ****/
-
-typedef    __off_t         fpos_t;
-
-extern __const int sys_nerr;
-extern __const char *__const sys_errlist[];
-
-
-int      asprintf(char **, const char *, ...) __printflike(2, 3);
-int      feof(FILE *);
-char    *fgets(char * __restrict, int, FILE * __restrict);
-int      fflush(FILE *);
-/**** END ****/
-
-#endif
-
diff --git a/include/stdlib.h b/include/stdlib.h
deleted file mode 100644
index c0b9c67..0000000
--- a/include/stdlib.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: stdlib.h 88 2016-01-12 00:11:29Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _STDLIB_H
-#define _STDLIB_H
-
-#include <sys/types.h>
-
-extern int __mb_cur_max;
-#define MB_CUR_MAX      __mb_cur_max
-
-void exit(int);
-void *malloc(uInt len);
-void free(void *);
-int abs(int val);
-int atoi(const char *str);
-long strtol(const char * __restrict nptr, char ** __restrict endptr, int base);
-
-const char *getprogname(void);
-
-#endif
diff --git a/include/string.h b/include/string.h
deleted file mode 100644
index 57e2804..0000000
--- a/include/string.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: string.h 88 2016-01-12 00:11:29Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _STRING_H
-#define _STRING_H
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-#include <strings.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef __size_t        size_t;
-#define _SIZE_T_DECLARED
-#endif
-
-void    *memccpy(void * __restrict, const void * __restrict, int, size_t);
-int      memcmp(const void *, const void *, size_t);
-void    *memcpy(void * __restrict, const void * __restrict, size_t);
-void    *memmove(void *, const void *, size_t);
-void    *memset(void *, int, size_t);
-char    *stpcpy(char *, const char *);
-char    *strcasestr(const char *, const char *);
-char    *strcat(char * __restrict, const char * __restrict);
-char    *strchr(const char *, int);
-int      strcmp(const char *, const char *);
-char    *strcpy(char * __restrict, const char * __restrict);
-size_t   strcspn(const char *, const char *);
-char    *strdup(const char *);
-char    *strerror(int);
-int      strerror_r(int, char *, size_t);
-size_t   strlcat(char *, const char *, size_t);
-size_t   strlcpy(char *, const char *, size_t);
-size_t   strlen(const char *);
-void     strmode(int, char *);
-char    *strncat(char * __restrict, const char * __restrict, size_t);
-int      strncmp(const char *, const char *, size_t);
-char    *strncpy(char * __restrict, const char * __restrict, size_t);
-char    *strnstr(const char *, const char *, size_t);
-char    *strpbrk(const char *, const char *);
-char    *strrchr(const char *, int);
-char    *strsep(char **, const char *);
-size_t   strspn(const char *, const char *);
-char    *strstr(const char *, const char *);
-char    *strtok(char * __restrict, const char * __restrict);
-char    *strtok_r(char *, const char *, char **);
-void     swab(const void *, void *, size_t);
-
-#endif
diff --git a/include/strings.h b/include/strings.h
deleted file mode 100644
index 505d5d0..0000000
--- a/include/strings.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: strings.h 88 2016-01-12 00:11:29Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _STRINGS_H
-#define _STRINGS_H
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#ifndef _SIZE_T_DECLARED
-typedef __size_t        size_t;
-#define _SIZE_T_DECLARED
-#endif
-
-int      bcmp(const void *, const void *, size_t);      /* LEGACY */
-void     bcopy(const void *, void *, size_t);           /* LEGACY */
-void     bzero(void *, size_t);                         /* LEGACY */
-int      ffs(int);
-char    *index(const char *, int);
-char    *rindex(const char *, int);
-int      strcasecmp(const char *, const char *);
-int      strncasecmp(const char *, const char *, size_t);
-
-#endif
-
-/***
- $Log: strings.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:08  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:29  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:14:09  reddawg
- no message
-
- Revision 1.1  2004/07/28 18:45:39  reddawg
- movement of files
-
- END
- ***/
-
diff --git a/include/sys/_null.h b/include/sys/_null.h
deleted file mode 100644
index 359eed0..0000000
--- a/include/sys/_null.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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/_null.h,v 1.5 2003/12/26 06:11:43 obrien Exp $
- */
-
-#ifndef NULL
-
-#ifdef _KERNEL
-#define	NULL	(void *)0
-#else
-#if defined(__LP64__)
-#define	NULL	0L
-#else
-#define	NULL	0
-#endif
-#endif	/* _KERNEL */
-
-#endif
diff --git a/include/sys/_sigset.h b/include/sys/_sigset.h
deleted file mode 100644
index bae3341..0000000
--- a/include/sys/_sigset.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1982, 1986, 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD: src/sys/sys/_sigset.h,v 1.34 2002/10/25 19:10:58 peter Exp $
- */
-
-#ifndef _SYS__SIGSET_H_
-#define	_SYS__SIGSET_H_
-
-/*
- * sigset_t macros.
- */
-#define	_SIG_WORDS	4
-#define	_SIG_MAXSIG	128
-#define	_SIG_IDX(sig)	((sig) - 1)
-#define	_SIG_WORD(sig)	(_SIG_IDX(sig) >> 5)
-#define	_SIG_BIT(sig)	(1 << (_SIG_IDX(sig) & 31))
-#define	_SIG_VALID(sig)	((sig) <= _SIG_MAXSIG && (sig) > 0)
-
-typedef struct __sigset {
-	__uint32_t __bits[_SIG_WORDS];
-} __sigset_t;
-
-#if defined(_KERNEL) && defined(COMPAT_43)
-typedef unsigned int osigset_t;
-#endif
-
-#endif /* !_SYS__SIGSET_H_ */
diff --git a/include/sys/_timeval.h b/include/sys/_timeval.h
deleted file mode 100644
index 9784bcf..0000000
--- a/include/sys/_timeval.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@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.
- *
- * 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/_timeval.h,v 1.1 2002/12/31 04:08:41 mike Exp $
- */
-
-#ifndef _SYS__TIMEVAL_H_
-#define _SYS__TIMEVAL_H_
-
-#include <sys/_types.h>
-
-#ifndef _SUSECONDS_T_DECLARED
-typedef	__suseconds_t	suseconds_t;
-#define	_SUSECONDS_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-/*
- * Structure returned by gettimeofday(2) system call, and used in other calls.
- */
-struct timeval {
-	long		tv_sec;		/* seconds (XXX should be time_t) */
-	suseconds_t	tv_usec;	/* and microseconds */
-};
-
-#endif /* !_SYS__TIMEVAL_H_ */
diff --git a/include/sys/_types.h b/include/sys/_types.h
deleted file mode 100644
index c5156c0..0000000
--- a/include/sys/_types.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@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.
- *
- * 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/_types.h,v 1.14 2003/03/28 15:27:30 mike Exp $
- */
-
-#ifndef _SYS__TYPES_H_
-#define _SYS__TYPES_H_
-
-#include <sys/cdefs.h>
-#include <machine/_types.h>
-
-/*
- * Standard type definitions.
- */
-typedef	__int32_t	__clockid_t;	/* clock_gettime()... */
-typedef	__uint32_t	__fflags_t;	/* file flags */
-typedef	__uint64_t	__fsblkcnt_t;
-typedef	__uint64_t	__fsfilcnt_t;
-typedef	__uint32_t	__gid_t;
-typedef	__int64_t	__id_t;		/* can hold a gid_t, pid_t, or uid_t */
-typedef	__uint32_t	__ino_t;	/* inode number */
-typedef	long		__key_t;	/* IPC key (for Sys V IPC) */
-typedef	__uint16_t	__mode_t;	/* permissions */
-typedef	int		__nl_item;
-typedef	__uint16_t	__nlink_t;	/* link count */
-typedef	__int64_t	__off_t;	/* file offset */
-typedef	__int32_t	__pid_t;	/* process [group] */
-typedef	__int64_t	__rlim_t;	/* resource limit (XXX not unsigned) */
-typedef	__uint8_t	__sa_family_t;
-typedef	__uint32_t	__socklen_t;
-typedef	long		__suseconds_t;	/* microseconds (signed) */
-typedef	__int32_t	__timer_t;	/* timer_gettime()... */
-typedef	__uint32_t	__udev_t;	/* device number */
-typedef	__uint32_t	__uid_t;
-typedef	unsigned int	__useconds_t;	/* microseconds (unsigned) */
-
-/*
- * Unusual type definitions.
- */
-/*
- * rune_t is declared to be an ``int'' instead of the more natural
- * ``unsigned long'' or ``long''.  Two things are happening here.  It is not
- * unsigned so that EOF (-1) can be naturally assigned to it and used.  Also,
- * it looks like 10646 will be a 31 bit standard.  This means that if your
- * ints cannot hold 32 bits, you will be in trouble.  The reason an int was
- * chosen over a long is that the is*() and to*() routines take ints (says
- * ANSI C), but they use __ct_rune_t instead of int.
- *
- * NOTE: rune_t is not covered by ANSI nor other standards, and should not
- * be instantiated outside of lib/libc/locale.  Use wchar_t.  wchar_t and
- * rune_t must be the same type.  Also, wint_t must be no narrower than
- * wchar_t, and should be able to hold all members of the largest
- * character set plus one extra value (WEOF), and must be at least 16 bits.
- */
-typedef	int		__ct_rune_t;
-#ifndef __HMM
-typedef __ct_rune_t     __wchar_t;
-typedef	__ct_rune_t	__rune_t;
-#endif
-typedef	__ct_rune_t	__wint_t;
-
-/*
- * dev_t has differing meanings in userland and the kernel.
- */
-#ifdef _KERNEL
-struct cdev;
-typedef	struct cdev	*__dev_t;
-#else
-typedef	__udev_t	__dev_t;		/* device number */
-#endif
-
-/*
- * mbstate_t is an opaque object to keep conversion state during multibyte
- * stream conversions.
- */
-typedef union {
-	char		__mbstate8[128];
-	__int64_t	_mbstateL;		/* for alignment */
-} __mbstate_t;
-
-#endif /* !_SYS__TYPES_H_ */
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
deleted file mode 100644
index b2fd8af..0000000
--- a/include/sys/cdefs.h
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Berkeley Software Design, Inc.
- *
- * 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.
- *
- *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/cdefs.h,v 1.79 2003/10/31 05:42:53 peter Exp $
- */
-
-#ifndef	_SYS_CDEFS_H_
-#define	_SYS_CDEFS_H_
-
-#if defined(__cplusplus)
-#define	__BEGIN_DECLS	extern "C" {
-#define	__END_DECLS	}
-#else
-#define	__BEGIN_DECLS
-#define	__END_DECLS
-#endif
-
-/*
- * Macro to test if we're using a specific version of gcc or later.
- */
-#ifdef __GNUC__
-#define	__GNUC_PREREQ__(ma, mi)	\
-	(__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi))
-#else
-#define	__GNUC_PREREQ__(ma, mi)	0
-#endif
-
-/*
- * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
- * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
- * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI
- * mode -- there must be no spaces between its arguments, and for nested
- * __CONCAT's, all the __CONCAT's must be at the left.  __CONCAT can also
- * concatenate double-quoted strings produced by the __STRING macro, but
- * this only works with ANSI C.
- *
- * __XSTRING is like __STRING, but it expands any macros in its argument
- * first.  It is only available with ANSI C.
- */
-#if defined(__STDC__) || defined(__cplusplus)
-#define	__P(protos)	protos		/* full-blown ANSI C */
-#define	__CONCAT1(x,y)	x ## y
-#define	__CONCAT(x,y)	__CONCAT1(x,y)
-#define	__STRING(x)	#x		/* stringify without expanding x */
-#define	__XSTRING(x)	__STRING(x)	/* expand x, then stringify */
-
-#define	__const		const		/* define reserved names to standard */
-#define	__signed	signed
-#define	__volatile	volatile
-#if defined(__cplusplus)
-#define	__inline	inline		/* convert to C++ keyword */
-#else
-#ifndef __GNUC__
-#define	__inline			/* delete GCC keyword */
-#endif /* !__GNUC__ */
-#endif /* !__cplusplus */
-
-#else	/* !(__STDC__ || __cplusplus) */
-#define	__P(protos)	()		/* traditional C preprocessor */
-#define	__CONCAT(x,y)	x/**/y
-#define	__STRING(x)	"x"
-
-#ifndef __GNUC__
-#define	__const				/* delete pseudo-ANSI C keywords */
-#define	__inline
-#define	__signed
-#define	__volatile
-/*
- * In non-ANSI C environments, new programs will want ANSI-only C keywords
- * deleted from the program and old programs will want them left alone.
- * When using a compiler other than gcc, programs using the ANSI C keywords
- * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
- * When using "gcc -traditional", we assume that this is the intent; if
- * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
- */
-#ifndef	NO_ANSI_KEYWORDS
-#define	const				/* delete ANSI C keywords */
-#define	inline
-#define	signed
-#define	volatile
-#endif	/* !NO_ANSI_KEYWORDS */
-#endif	/* !__GNUC__ */
-#endif	/* !(__STDC__ || __cplusplus) */
-
-/*
- * Compiler-dependent macros to help declare dead (non-returning) and
- * pure (no side effects) functions, and unused variables.  They are
- * null except for versions of gcc that are known to support the features
- * properly (old versions of gcc-2 supported the dead and pure features
- * in a different (wrong) way).  If we do not provide an implementation
- * for a given compiler, let the compile fail if it is told to use
- * a feature that we cannot live without.
- */
-#ifdef lint
-#define	__dead2
-#define	__pure2
-#define	__unused
-#define	__packed
-#define	__aligned(x)
-#define	__section(x)
-#else
-#if !__GNUC_PREREQ__(2, 5)
-#define	__dead2
-#define	__pure2
-#define	__unused
-#endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7
-#define	__dead2		__attribute__((__noreturn__))
-#define	__pure2		__attribute__((__const__))
-#define	__unused
-/* XXX Find out what to do for __packed, __aligned and __section */
-#endif
-#if __GNUC_PREREQ__(2, 7)
-#define	__dead2		__attribute__((__noreturn__))
-#define	__pure2		__attribute__((__const__))
-#define	__unused	__attribute__((__unused__))
-#define	__packed	__attribute__((__packed__))
-#define	__aligned(x)	__attribute__((__aligned__(x)))
-#define	__section(x)	__attribute__((__section__(x)))
-#endif
-#endif
-
-#if __GNUC_PREREQ__(3, 1)
-#define	__always_inline	__attribute__((__always_inline__))
-#else
-#define	__always_inline
-#endif
-
-#if __GNUC_PREREQ__(3, 3)
-#define __nonnull(x)	__attribute__((__nonnull__(x)))
-#else
-#define __nonnull(x)
-#endif
-
-/* XXX: should use `#if __STDC_VERSION__ < 199901'. */
-#if !__GNUC_PREREQ__(2, 7)
-#define	__func__	NULL
-#endif
-
-#if __GNUC__ >= 2 && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
-#define	__LONG_LONG_SUPPORTED
-#endif
-
-/*
- * GCC 2.95 provides `__restrict' as an extension to C90 to support the
- * C99-specific `restrict' type qualifier.  We happen to use `__restrict' as
- * a way to define the `restrict' type qualifier without disturbing older
- * software that is unaware of C99 keywords.
- */
-#if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901
-#define	__restrict
-#else
-#define	__restrict	restrict
-#endif
-#endif
-
-/*
- * GNU C version 2.96 adds explicit branch prediction so that
- * the CPU back-end can hint the processor and also so that
- * code blocks can be reordered such that the predicted path
- * sees a more linear flow, thus improving cache behavior, etc.
- *
- * The following two macros provide us with a way to utilize this
- * compiler feature.  Use __predict_true() if you expect the expression
- * to evaluate to true, and __predict_false() if you expect the
- * expression to evaluate to false.
- *
- * A few notes about usage:
- *
- *	* Generally, __predict_false() error condition checks (unless
- *	  you have some _strong_ reason to do otherwise, in which case
- *	  document it), and/or __predict_true() `no-error' condition
- *	  checks, assuming you want to optimize for the no-error case.
- *
- *	* Other than that, if you don't know the likelihood of a test
- *	  succeeding from empirical or other `hard' evidence, don't
- *	  make predictions.
- *
- *	* These are meant to be used in places that are run `a lot'.
- *	  It is wasteful to make predictions in code that is run
- *	  seldomly (e.g. at subsystem initialization time) as the
- *	  basic block reordering that this affects can often generate
- *	  larger code.
- */
-#if __GNUC_PREREQ__(2, 96)
-#define __predict_true(exp)     __builtin_expect((exp), 1)
-#define __predict_false(exp)    __builtin_expect((exp), 0)
-#else
-#define __predict_true(exp)     (exp)
-#define __predict_false(exp)    (exp)
-#endif
-
-/*
- * We define this here since <stddef.h>, <sys/queue.h>, and <sys/types.h>
- * require it.
- */
-#define	__offsetof(type, field)	((size_t)(&((type *)0)->field))
-
-/*
- * Compiler-dependent macros to declare that functions take printf-like
- * or scanf-like arguments.  They are null except for versions of gcc
- * that are known to support the features properly (old versions of gcc-2
- * didn't permit keeping the keywords out of the application namespace).
- */
-#if !__GNUC_PREREQ__(2, 7)
-#define	__printflike(fmtarg, firstvararg)
-#define	__scanflike(fmtarg, firstvararg)
-#else
-#define	__printflike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
-#define	__scanflike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__scanf__, fmtarg, firstvararg)))
-#endif
-
-/* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
-#if __FreeBSD_cc_version >= 300001
-#define	__printf0like(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__printf0__, fmtarg, firstvararg)))
-#else
-#define	__printf0like(fmtarg, firstvararg)
-#endif
-
-#ifdef __GNUC__
-#define	__strong_reference(sym,aliassym)	\
-	extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)));
-#ifdef __STDC__
-#define	__weak_reference(sym,alias)	\
-	__asm__(".weak " #alias);	\
-	__asm__(".equ "  #alias ", " #sym)
-#define	__warn_references(sym,msg)	\
-	__asm__(".section .gnu.warning." #sym);	\
-	__asm__(".asciz \"" msg "\"");	\
-	__asm__(".previous")
-#else
-#define	__weak_reference(sym,alias)	\
-	__asm__(".weak alias");		\
-	__asm__(".equ alias, sym")
-#define	__warn_references(sym,msg)	\
-	__asm__(".section .gnu.warning.sym"); \
-	__asm__(".asciz \"msg\"");	\
-	__asm__(".previous")
-#endif	/* __STDC__ */
-#endif	/* __GNUC__ */
-
-#ifdef __GNUC__
-#define	__IDSTRING(name,string)	__asm__(".ident\t\"" string "\"")
-#else
-/*
- * The following definition might not work well if used in header files,
- * but it should be better than nothing.  If you want a "do nothing"
- * version, then it should generate some harmless declaration, such as:
- *    #define __IDSTRING(name,string)	struct __hack
- */
-#define	__IDSTRING(name,string)	static const char name[] __unused = string
-#endif
-
-/*
- * Embed the rcs id of a source file in the resulting library.  Note that in
- * more recent ELF binutils, we use .ident allowing the ID to be stripped.
- * Usage:
- *	__FBSDID("$FreeBSD: src/sys/sys/cdefs.h,v 1.79 2003/10/31 05:42:53 peter Exp $");
- */
-#ifndef	__FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
-#define	__FBSDID(s)	__IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-#else
-#define	__FBSDID(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__RCSID
-#ifndef	NO__RCSID
-#define	__RCSID(s)	__IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-#else
-#define	__RCSID(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__RCSID_SOURCE
-#ifndef	NO__RCSID_SOURCE
-#define	__RCSID_SOURCE(s)	__IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s)
-#else
-#define	__RCSID_SOURCE(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__SCCSID
-#ifndef	NO__SCCSID
-#define	__SCCSID(s)	__IDSTRING(__CONCAT(__sccsid_,__LINE__),s)
-#else
-#define	__SCCSID(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__COPYRIGHT
-#ifndef	NO__COPYRIGHT
-#define	__COPYRIGHT(s)	__IDSTRING(__CONCAT(__copyright_,__LINE__),s)
-#else
-#define	__COPYRIGHT(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__DECONST
-#define	__DECONST(type, var)	((type)(uintptr_t)(const void *)(var))
-#endif
-
-#ifndef	__DEVOLATILE
-#define	__DEVOLATILE(type, var)	((type)(uintptr_t)(volatile void *)(var))
-#endif
-
-#ifndef	__DEQUALIFY
-#define	__DEQUALIFY(type, var)	((type)(uintptr_t)(const volatile void *)(var))
-#endif
-
-/*-
- * The following definitions are an extension of the behavior originally
- * implemented in <sys/_posix.h>, but with a different level of granularity.
- * POSIX.1 requires that the macros we test be defined before any standard
- * header file is included.
- *
- * Here's a quick run-down of the versions:
- *  defined(_POSIX_SOURCE)		1003.1-1988
- *  _POSIX_C_SOURCE == 1		1003.1-1990
- *  _POSIX_C_SOURCE == 2		1003.2-1992 C Language Binding Option
- *  _POSIX_C_SOURCE == 199309		1003.1b-1993
- *  _POSIX_C_SOURCE == 199506		1003.1c-1995, 1003.1i-1995,
- *					and the omnibus ISO/IEC 9945-1: 1996
- *  _POSIX_C_SOURCE == 200112		1003.1-2001
- *
- * In addition, the X/Open Portability Guide, which is now the Single UNIX
- * Specification, defines a feature-test macro which indicates the version of
- * that specification, and which subsumes _POSIX_C_SOURCE.
- *
- * Our macros begin with two underscores to avoid namespace screwage.
- */
-
-/* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1
-#undef _POSIX_C_SOURCE		/* Probably illegal, but beyond caring now. */
-#define	_POSIX_C_SOURCE		199009
-#endif
-
-/* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		199209
-#endif
-
-/* Deal with various X/Open Portability Guides and Single UNIX Spec. */
-#ifdef _XOPEN_SOURCE
-#if _XOPEN_SOURCE - 0 >= 600
-#define	__XSI_VISIBLE		600
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		200112
-#elif _XOPEN_SOURCE - 0 >= 500
-#define	__XSI_VISIBLE		500
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		199506
-#endif
-#endif
-
-/*
- * Deal with all versions of POSIX.  The ordering relative to the tests above is
- * important.
- */
-#if defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE)
-#define	_POSIX_C_SOURCE		198808
-#endif
-#ifdef _POSIX_C_SOURCE
-#if _POSIX_C_SOURCE >= 200112
-#define	__POSIX_VISIBLE		200112
-#define	__ISO_C_VISIBLE		1999
-#elif _POSIX_C_SOURCE >= 199506
-#define	__POSIX_VISIBLE		199506
-#define	__ISO_C_VISIBLE		1990
-#elif _POSIX_C_SOURCE >= 199309
-#define	__POSIX_VISIBLE		199309
-#define	__ISO_C_VISIBLE		1990
-#elif _POSIX_C_SOURCE >= 199209
-#define	__POSIX_VISIBLE		199209
-#define	__ISO_C_VISIBLE		1990
-#elif _POSIX_C_SOURCE >= 199009
-#define	__POSIX_VISIBLE		199009
-#define	__ISO_C_VISIBLE		1990
-#else
-#define	__POSIX_VISIBLE		198808
-#define	__ISO_C_VISIBLE		0
-#endif /* _POSIX_C_SOURCE */
-#else
-/*-
- * Deal with _ANSI_SOURCE:
- * If it is defined, and no other compilation environment is explicitly
- * requested, then define our internal feature-test macros to zero.  This
- * makes no difference to the preprocessor (undefined symbols in preprocessing
- * expressions are defined to have value zero), but makes it more convenient for
- * a test program to print out the values.
- *
- * If a program mistakenly defines _ANSI_SOURCE and some other macro such as
- * _POSIX_C_SOURCE, we will assume that it wants the broader compilation
- * environment (and in fact we will never get here).
- */
-#if defined(_ANSI_SOURCE)	/* Hide almost everything. */
-#define	__POSIX_VISIBLE		0
-#define	__XSI_VISIBLE		0
-#define	__BSD_VISIBLE		0
-#define	__ISO_C_VISIBLE		1990
-#elif defined(_C99_SOURCE)	/* Localism to specify strict C99 env. */
-#define	__POSIX_VISIBLE		0
-#define	__XSI_VISIBLE		0
-#define	__BSD_VISIBLE		0
-#define	__ISO_C_VISIBLE		1999
-#else				/* Default environment: show everything. */
-#define	__POSIX_VISIBLE		200112
-#define	__XSI_VISIBLE		600
-#define	__BSD_VISIBLE		1
-#define	__ISO_C_VISIBLE		1999
-#endif
-#endif
-
-#endif /* !_SYS_CDEFS_H_ */
diff --git a/include/sys/disk.h b/include/sys/disk.h
deleted file mode 100644
index 5070a51..0000000
--- a/include/sys/disk.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD: src/sys/sys/disk.h,v 1.39 2003/04/01 18:55:04 phk Exp $
- *
- */
-
-#ifndef _SYS_DISK_H_
-#define	_SYS_DISK_H_
-
-#include <sys/ioccom.h>
-
-#ifdef _KERNEL
-
-#ifndef _SYS_CONF_H_
-#include <sys/conf.h>	/* XXX: temporary to avoid breakage */
-#endif
-
-struct disk;
-struct disk *disk_enumerate(struct disk *disk);
-void disk_err(struct bio *bp, const char *what, int blkdone, int nl);
-
-#endif
-
-#define DIOCGSECTORSIZE	_IOR('d', 128, uInt32)
-	/*-
-	 * Get the sectorsize of the device in bytes.  The sectorsize is the
-	 * smallest unit of data which can be transfered from this device.
-	 * Usually this is a power of two but it may not be. (ie: CDROM audio)
-	 */
-
-#define DIOCGMEDIASIZE	_IOR('d', 129, off_t)	/* Get media size in bytes */
-	/*-
-	 * Get the size of the entire device in bytes.  This should be a
-	 * multiple of the sectorsize.
-	 */
-
-#define DIOCGFWSECTORS	_IOR('d', 130, uInt32)	/* Get firmware sectorcount */
-	/*-
-	 * Get the firmwares notion of number of sectors per track.  This
-	 * value is mostly used for compatibility with various ill designed
-	 * disk label formats.  Don't use it unless you have to.
-	 */
-
-#define DIOCGFWHEADS	_IOR('d', 131, uInt32)	/* Get firmware headcount */
-	/*-
-	 * Get the firmwares notion of number of heads per cylinder.  This
-	 * value is mostly used for compatibility with various ill designed
-	 * disk label formats.  Don't use it unless you have to.
-	 */
-
-#define DIOCSKERNELDUMP _IOW('d', 133, uInt32)	/* Set/Clear kernel dumps */
-	/*-
-	 * Enable/Disable (the argument is boolean) the device for kernel
-	 * core dumps.
-	 */
-	
-#define DIOCGFRONTSTUFF _IOR('d', 134, off_t)
-	/*-
-	 * Many disk formats have some amount of space reserved at the
-	 * start of the disk to hold bootblocks, various disklabels and
-	 * similar stuff.  This ioctl returns the number of such bytes
-	 * which may apply to the device.
-	 */
-
-#endif /* _SYS_DISK_H_ */
diff --git a/include/sys/diskmbr.h b/include/sys/diskmbr.h
deleted file mode 100644
index 54d49c6..0000000
--- a/include/sys/diskmbr.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1987, 1988, 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.
- *
- *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $FreeBSD: src/sys/sys/diskmbr.h,v 1.98 2003/04/13 21:52:22 phk Exp $
- */
-
-#ifndef _SYS_DISKMBR_H_
-#define	_SYS_DISKMBR_H_
-
-#include <sys/ioccom.h>
-
-#define	DOSBBSECTOR	0	/* DOS boot block relative sector number */
-#define	DOSPARTOFF	446
-#define	DOSPARTSIZE	16
-#define	NDOSPART	4
-#define	NEXTDOSPART	32
-#define	DOSMAGICOFFSET	510
-#define	DOSMAGIC	0xAA55
-
-#define	DOSPTYP_386BSD	0xa5	/* 386BSD partition type */
-#define	DOSPTYP_LINSWP	0x82	/* Linux swap partition */
-#define	DOSPTYP_LINUX	0x83	/* Linux partition */
-#define	DOSPTYP_PMBR	0xee	/* GPT Protective MBR */
-#define	DOSPTYP_EXT	5	/* DOS extended partition */
-#define	DOSPTYP_EXTLBA	15	/* DOS extended partition */
-
-struct dos_partition {
-	unsigned char	dp_flag;	/* bootstrap flags */
-	unsigned char	dp_shd;		/* starting head */
-	unsigned char	dp_ssect;	/* starting sector */
-	unsigned char	dp_scyl;	/* starting cylinder */
-	unsigned char	dp_typ;		/* partition type */
-	unsigned char	dp_ehd;		/* end head */
-	unsigned char	dp_esect;	/* end sector */
-	unsigned char	dp_ecyl;	/* end cylinder */
-	uInt32	dp_start;	/* absolute starting sector number */
-	uInt32	dp_size;	/* partition size in sectors */
-};
-#ifdef CTASSERT
-CTASSERT(sizeof (struct dos_partition) == DOSPARTSIZE);
-#endif
-
-void dos_partition_dec(void const *pp, struct dos_partition *d);
-void dos_partition_enc(void *pp, struct dos_partition *d);
-
-#define	DPSECT(s) ((s) & 0x3f)		/* isolate relevant bits of sector */
-#define	DPCYL(c, s) ((c) + (((s) & 0xc0)<<2)) /* and those that are cylinder */
-
-#define DIOCSMBR 	_IOW('M', 129, uInt8[512])
-
-#endif /* !_SYS_DISKMBR_H_ */
diff --git a/include/sys/endian.h b/include/sys/endian.h
deleted file mode 100644
index f01c874..0000000
--- a/include/sys/endian.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*-
- * Copyright (c) 2002 Thomas Moestl <tmm@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.
- *
- * 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/endian.h,v 1.6 2003/10/15 20:05:57 obrien Exp $
- */
-
-#ifndef _SYS_ENDIAN_H_
-#define _SYS_ENDIAN_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <machine/endian.h>
-
-#ifndef _UINT16_T_DECLARED
-typedef	__uInt16	uInt16;
-#define	_UINT16_T_DECLARED
-#endif
- 
-#ifndef _UINT32_T_DECLARED
-typedef	__uInt32	uInt32;
-#define	_UINT32_T_DECLARED
-#endif
- 
-#ifndef _UINT64_T_DECLARED
-typedef	__uInt64	uInt64;
-#define	_UINT64_T_DECLARED
-#endif
- 
-/*
- * General byte order swapping functions.
- */
-#define	bswap16(x)	__bswap16(x)
-#define	bswap32(x)	__bswap32(x)
-#define	bswap64(x)	__bswap64(x)
-
-/*
- * Host to big endian, host to little endian, big endian to host, and little
- * endian to host byte order functions as detailed in byteorder(9).
- */
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define	htobe16(x)	bswap16((x))
-#define	htobe32(x)	bswap32((x))
-#define	htobe64(x)	bswap64((x))
-#define	htole16(x)	((uInt16)(x))
-#define	htole32(x)	((uInt32)(x))
-#define	htole64(x)	((uInt64)(x))
-
-#define	be16toh(x)	bswap16((x))
-#define	be32toh(x)	bswap32((x))
-#define	be64toh(x)	bswap64((x))
-#define	le16toh(x)	((uInt16)(x))
-#define	le32toh(x)	((uInt32)(x))
-#define	le64toh(x)	((uInt64)(x))
-#else /* _BYTE_ORDER != _LITTLE_ENDIAN */
-#define	htobe16(x)	((uInt16)(x))
-#define	htobe32(x)	((uInt32)(x))
-#define	htobe64(x)	((uInt64)(x))
-#define	htole16(x)	bswap16((x))
-#define	htole32(x)	bswap32((x))
-#define	htole64(x)	bswap64((x))
-
-#define	be16toh(x)	((uInt16)(x))
-#define	be32toh(x)	((uInt32)(x))
-#define	be64toh(x)	((uInt64)(x))
-#define	le16toh(x)	bswap16((x))
-#define	le32toh(x)	bswap32((x))
-#define	le64toh(x)	bswap64((x))
-#endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
-
-/* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
-
-static __inline uInt16
-be16dec(const void *pp)
-{
-	unsigned char const *p = (unsigned char const *)pp;
-
-	return ((p[0] << 8) | p[1]);
-}
-
-static __inline uInt32
-be32dec(const void *pp)
-{
-	unsigned char const *p = (unsigned char const *)pp;
-
-	return ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]);
-}
-
-static __inline uInt64
-be64dec(const void *pp)
-{
-	unsigned char const *p = (unsigned char const *)pp;
-
-	return (((uInt64)be32dec(p) << 32) | be32dec(p + 4));
-}
-
-static __inline uInt16
-le16dec(const void *pp)
-{
-	unsigned char const *p = (unsigned char const *)pp;
-
-	return ((p[1] << 8) | p[0]);
-}
-
-static __inline uInt32
-le32dec(const void *pp)
-{
-	unsigned char const *p = (unsigned char const *)pp;
-
-	return ((p[3] << 24) | (p[2] << 16) | (p[1] << 8) | p[0]);
-}
-
-static __inline uInt64
-le64dec(const void *pp)
-{
-	unsigned char const *p = (unsigned char const *)pp;
-
-	return (((uInt64)le32dec(p + 4) << 32) | le32dec(p));
-}
-
-static __inline void
-be16enc(void *pp, uInt16 u)
-{
-	unsigned char *p = (unsigned char *)pp;
-
-	p[0] = (u >> 8) & 0xff;
-	p[1] = u & 0xff;
-}
-
-static __inline void
-be32enc(void *pp, uInt32 u)
-{
-	unsigned char *p = (unsigned char *)pp;
-
-	p[0] = (u >> 24) & 0xff;
-	p[1] = (u >> 16) & 0xff;
-	p[2] = (u >> 8) & 0xff;
-	p[3] = u & 0xff;
-}
-
-static __inline void
-be64enc(void *pp, uInt64 u)
-{
-	unsigned char *p = (unsigned char *)pp;
-
-	be32enc(p, u >> 32);
-	be32enc(p + 4, u & 0xffffffff);
-}
-
-static __inline void
-le16enc(void *pp, uInt16 u)
-{
-	unsigned char *p = (unsigned char *)pp;
-
-	p[0] = u & 0xff;
-	p[1] = (u >> 8) & 0xff;
-}
-
-static __inline void
-le32enc(void *pp, uInt32 u)
-{
-	unsigned char *p = (unsigned char *)pp;
-
-	p[0] = u & 0xff;
-	p[1] = (u >> 8) & 0xff;
-	p[2] = (u >> 16) & 0xff;
-	p[3] = (u >> 24) & 0xff;
-}
-
-static __inline void
-le64enc(void *pp, uInt64 u)
-{
-	unsigned char *p = (unsigned char *)pp;
-
-	le32enc(p, u & 0xffffffff);
-	le32enc(p + 4, u >> 32);
-}
-
-#endif	/* _SYS_ENDIAN_H_ */
diff --git a/include/sys/ioccom.h b/include/sys/ioccom.h
deleted file mode 100644
index 4a063e9..0000000
--- a/include/sys/ioccom.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1990, 1993, 1994
- *	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.
- *
- *	@(#)ioccom.h	8.2 (Berkeley) 3/28/94
- * $FreeBSD: src/sys/sys/ioccom.h,v 1.14 2002/04/10 04:53:37 imp Exp $
- */
-
-#ifndef	_SYS_IOCCOM_H_
-#define	_SYS_IOCCOM_H_
-
-/*
- * Ioctl's have the command encoded in the lower word, and the size of
- * any in or out parameters in the upper word.  The high 3 bits of the
- * upper word are used to encode the in/out status of the parameter.
- */
-#define	IOCPARM_MASK	0x1fff		/* parameter length, at most 13 bits */
-#define	IOCPARM_LEN(x)	(((x) >> 16) & IOCPARM_MASK)
-#define	IOCBASECMD(x)	((x) & ~(IOCPARM_MASK << 16))
-#define	IOCGROUP(x)	(((x) >> 8) & 0xff)
-
-#define	IOCPARM_MAX	PAGE_SIZE		/* max size of ioctl, mult. of PAGE_SIZE */
-#define	IOC_VOID	0x20000000	/* no parameters */
-#define	IOC_OUT		0x40000000	/* copy out parameters */
-#define	IOC_IN		0x80000000	/* copy in parameters */
-#define	IOC_INOUT	(IOC_IN|IOC_OUT)
-#define	IOC_DIRMASK	0xe0000000	/* mask for IN/OUT/VOID */
-
-#define	_IOC(inout,group,num,len) \
-	((unsigned long)(inout | ((len & IOCPARM_MASK) << 16) | ((group) << 8) | (num)))
-#define	_IO(g,n)	_IOC(IOC_VOID,	(g), (n), 0)
-#define	_IOR(g,n,t)	_IOC(IOC_OUT,	(g), (n), sizeof(t))
-#define	_IOW(g,n,t)	_IOC(IOC_IN,	(g), (n), sizeof(t))
-/* this should be _IORW, but stdio got there first */
-#define	_IOWR(g,n,t)	_IOC(IOC_INOUT,	(g), (n), sizeof(t))
-
-#ifndef _KERNEL
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	ioctl(int, unsigned long, ...);
-__END_DECLS
-
-#endif
-
-#endif /* !_SYS_IOCCOM_H_ */
diff --git a/include/sys/limits.h b/include/sys/limits.h
deleted file mode 100644
index 20f2f74..0000000
--- a/include/sys/limits.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- *
- * $FreeBSD: src/sys/sys/limits.h,v 1.6 2004/02/26 03:53:54 mlaier Exp $
- */
-
-#ifndef _SYS_LIMITS_H_
-#define	_SYS_LIMITS_H_
-
-#include <sys/cdefs.h>
-#include <machine/_limits.h>
-
-#define	CHAR_BIT	__CHAR_BIT	/* number of bits in a char */
-
-#define	SCHAR_MAX	__SCHAR_MAX	/* max value for a signed char */
-#define	SCHAR_MIN	__SCHAR_MIN	/* min value for a signed char */
-
-#define	UCHAR_MAX	__UCHAR_MAX	/* max value for an unsigned char */
-
-#ifdef __CHAR_UNSIGNED__
-#define	CHAR_MAX	UCHAR_MAX	/* max value for a char */
-#define	CHAR_MIN	0		/* min value for a char */
-#else
-#define	CHAR_MAX	SCHAR_MAX
-#define	CHAR_MIN	SCHAR_MIN
-#endif
-
-#define	USHRT_MAX	__USHRT_MAX	/* max value for an unsigned short */
-#define	SHRT_MAX	__SHRT_MAX	/* max value for a short */
-#define	SHRT_MIN	__SHRT_MIN	/* min value for a short */
-
-#define	UINT_MAX	__UINT_MAX	/* max value for an unsigned int */
-#define	INT_MAX		__INT_MAX	/* max value for an int */
-#define	INT_MIN		__INT_MIN	/* min value for an int */
-
-#define	ULONG_MAX	__ULONG_MAX	/* max for an unsigned long */
-#define	LONG_MAX	__LONG_MAX	/* max for a long */
-#define	LONG_MIN	__LONG_MIN	/* min for a long */
-
-#define	UID_MAX		UINT_MAX	/* max value for a uid_t */
-#define	GID_MAX		UINT_MAX	/* max value for a gid_t */
-
-#ifdef __LONG_LONG_SUPPORTED
-#define	ULLONG_MAX	__ULLONG_MAX	/* max for an unsigned long long */
-#define	LLONG_MAX	__LLONG_MAX	/* max for a long long */
-#define	LLONG_MIN	__LLONG_MIN	/* min for a long long */
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SSIZE_MAX	__SSIZE_MAX	/* max value for an ssize_t */
-#endif
-
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-#define	SIZE_T_MAX	__SIZE_T_MAX	/* max value for a size_t */
-
-#define	OFF_MAX		__OFF_MAX	/* max value for an off_t */
-#define	OFF_MIN		__OFF_MIN	/* min value for an off_t */
-#endif
-
-#if __BSD_VISIBLE
-#define	UQUAD_MAX	(__UQUAD_MAX)	/* max value for a uquad_t */
-#define	QUAD_MAX	(__QUAD_MAX)	/* max value for a quad_t */
-#define	QUAD_MIN	(__QUAD_MIN)	/* min value for a quad_t */
-#endif
-
-#if __XSI_VISIBLE
-#define	LONG_BIT	__LONG_BIT
-#define	WORD_BIT	__WORD_BIT
-#endif
-
-#endif /* !_SYS_LIMITS_H_ */
diff --git a/include/sys/mman.h b/include/sys/mman.h
deleted file mode 100644
index a0e8b7b..0000000
--- a/include/sys/mman.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mman.h 89 2016-01-12 00:20:40Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _MMAN_H
-#define _MMAN_H
-
-#include <sys/types.h>
-
-void *mmap(void *, size_t, int, int, int, off_t);
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/include/sys/mount.h b/include/sys/mount.h
deleted file mode 100644
index 93e6182..0000000
--- a/include/sys/mount.h
+++ /dev/null
@@ -1,577 +0,0 @@
-/*
- * Copyright (c) 1989, 1991, 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.
- *
- *	@(#)mount.h	8.21 (Berkeley) 5/20/95
- * $FreeBSD: src/sys/sys/mount.h,v 1.153 2004/02/02 18:24:29 pjd Exp $
- */
-
-#ifndef _SYS_MOUNT_H_
-#define _SYS_MOUNT_H_
-
-#include <sys/ucred.h>
-#include <sys/queue.h>
-#ifdef _KERNEL
-#include <sys/lockmgr.h>
-#include <sys/_lock.h>
-#include <sys/_mutex.h>
-#endif
-
-typedef struct fsid { int32_t val[2]; } fsid_t;	/* filesystem id type */
-
-/*
- * File identifier.
- * These are unique per filesystem on a single machine.
- */
-#define	MAXFIDSZ	16
-
-struct fid {
-	uInt16		fid_len;		/* length of data in bytes */
-	uInt16		fid_reserved;		/* force longword alignment */
-	char		fid_data[MAXFIDSZ];	/* data (variable length) */
-};
-
-/*
- * filesystem statistics
- */
-#define	MFSNAMELEN	16		/* length of type name including null */
-#define	MNAMELEN	88		/* size of on/from name bufs */
-#define	STATFS_VERSION	0x20030518	/* current version number */
-struct statfs {
-	uInt32 f_version;		/* structure version number */
-	uInt32 f_type;		/* type of filesystem */
-	uInt64 f_flags;		/* copy of mount exported flags */
-	uInt64 f_bsize;		/* filesystem fragment size */
-	uInt64 f_iosize;		/* optimal transfer block size */
-	uInt64 f_blocks;		/* total data blocks in filesystem */
-	uInt64 f_bfree;		/* free blocks in filesystem */
-	int64_t	 f_bavail;		/* free blocks avail to non-superuser */
-	uInt64 f_files;		/* total file nodes in filesystem */
-	int64_t	 f_ffree;		/* free nodes avail to non-superuser */
-	uInt64 f_syncwrites;		/* count of sync writes since mount */
-	uInt64 f_asyncwrites;		/* count of async writes since mount */
-	uInt64 f_syncreads;		/* count of sync reads since mount */
-	uInt64 f_asyncreads;		/* count of async reads since mount */
-	uInt64 f_spare[10];		/* unused spare */
-	uInt32 f_namemax;		/* maximum filename length */
-	uid_t	  f_owner;		/* user that mounted the filesystem */
-	fsid_t	  f_fsid;		/* filesystem id */
-	char	  f_charspare[80];	    /* spare string space */
-	char	  f_fstypename[MFSNAMELEN]; /* filesystem type name */
-	char	  f_mntfromname[MNAMELEN];  /* mounted filesystem */
-	char	  f_mntonname[MNAMELEN];    /* directory on which mounted */
-};
-
-#ifdef _KERNEL
-#define	OMFSNAMELEN	16	/* length of fs type name, including null */
-#define	OMNAMELEN	(88 - 2 * sizeof(long))	/* size of on/from name bufs */
-
-/* XXX getfsstat.2 is out of date with write and read counter changes here. */
-/* XXX statfs.2 is out of date with read counter changes here. */
-struct ostatfs {
-	long	f_spare2;		/* placeholder */
-	long	f_bsize;		/* fundamental filesystem block size */
-	long	f_iosize;		/* optimal transfer block size */
-	long	f_blocks;		/* total data blocks in filesystem */
-	long	f_bfree;		/* free blocks in fs */
-	long	f_bavail;		/* free blocks avail to non-superuser */
-	long	f_files;		/* total file nodes in filesystem */
-	long	f_ffree;		/* free file nodes in fs */
-	fsid_t	f_fsid;			/* filesystem id */
-	uid_t	f_owner;		/* user that mounted the filesystem */
-	int	f_type;			/* type of filesystem */
-	int	f_flags;		/* copy of mount exported flags */
-	long	f_syncwrites;		/* count of sync writes since mount */
-	long	f_asyncwrites;		/* count of async writes since mount */
-	char	f_fstypename[OMFSNAMELEN]; /* fs type name */
-	char	f_mntonname[OMNAMELEN];	/* directory on which mounted */
-	long	f_syncreads;		/* count of sync reads since mount */
-	long	f_asyncreads;		/* count of async reads since mount */
-	short	f_spares1;		/* unused spare */
-	char	f_mntfromname[OMNAMELEN];/* mounted filesystem */
-	short	f_spares2;		/* unused spare */
-	/*
-	 * XXX on machines where longs are aligned to 8-byte boundaries, there
-	 * is an unnamed int32_t here.  This spare was after the apparent end
-	 * of the struct until we bit off the read counters from f_mntonname.
-	 */
-	long	f_spare[2];		/* unused spare */
-};
-
-#define	MMAXOPTIONLEN	65536		/* maximum length of a mount option */
-
-TAILQ_HEAD(vnodelst, vnode);
-TAILQ_HEAD(vfsoptlist, vfsopt);
-struct vfsopt {
-	TAILQ_ENTRY(vfsopt) link;
-	char	*name;
-	void	*value;
-	int	len;
-};
-
-/*
- * Structure per mounted filesystem.  Each mounted filesystem has an
- * array of operations and an instance record.  The filesystems are
- * put on a doubly linked list.
- *
- * NOTE: mnt_nvnodelist and mnt_reservedvnlist.  At the moment vnodes
- * are linked into mnt_nvnodelist.  At some point in the near future the
- * vnode list will be split into a 'dirty' and 'clean' list. mnt_nvnodelist
- * will become the dirty list and mnt_reservedvnlist will become the 'clean'
- * list.  Filesystem kld's syncing code should remain compatible since
- * they only need to scan the dirty vnode list (nvnodelist -> dirtyvnodelist).
- */
-struct mount {
-	TAILQ_ENTRY(mount) mnt_list;		/* mount list */
-	struct vfsops	*mnt_op;		/* operations on fs */
-	struct vfsconf	*mnt_vfc;		/* configuration info */
-	struct vnode	*mnt_vnodecovered;	/* vnode we mounted on */
-	struct vnode	*mnt_syncer;		/* syncer vnode */
-	struct vnodelst	mnt_nvnodelist;		/* list of vnodes this mount */
-	struct vnodelst	mnt_reservedvnlist;	/* (future) dirty vnode list */
-	struct lock	mnt_lock;		/* mount structure lock */
-	struct mtx	mnt_mtx;		/* mount structure interlock */
-	int		mnt_writeopcount;	/* write syscalls in progress */
-	int		mnt_flag;		/* flags shared with user */
-	struct vfsoptlist *mnt_opt;		/* current mount options */
-	struct vfsoptlist *mnt_optnew;		/* new options passed to fs */
-	int		mnt_kern_flag;		/* kernel only flags */
-	int		mnt_maxsymlinklen;	/* max size of short symlink */
-	struct statfs	mnt_stat;		/* cache of filesystem stats */
-	struct ucred	*mnt_cred;		/* credentials of mounter */
-	qaddr_t		mnt_data;		/* private data */
-	time_t		mnt_time;		/* last time written*/
-	int		mnt_iosize_max;		/* max size for clusters, etc */
-	struct netexport *mnt_export;		/* export list */
-	struct label	*mnt_mntlabel;		/* MAC label for the mount */
-	struct label	*mnt_fslabel;		/* MAC label for the fs */
-	int		mnt_nvnodelistsize;	/* # of vnodes on this mount */
-};
-
-
-#define	MNT_ILOCK(mp)	mtx_lock(&(mp)->mnt_mtx)
-#define	MNT_IUNLOCK(mp)	mtx_unlock(&(mp)->mnt_mtx)
-
-#endif /* _KERNEL */
-
-/*
- * User specifiable flags.
- */
-#define	MNT_RDONLY	0x00000001	/* read only filesystem */
-#define	MNT_SYNCHRONOUS	0x00000002	/* filesystem written synchronously */
-#define	MNT_NOEXEC	0x00000004	/* can't exec from filesystem */
-#define	MNT_NOSUID	0x00000008	/* don't honor setuid bits on fs */
-#define	MNT_NODEV	0x00000010	/* don't interpret special files */
-#define	MNT_UNION	0x00000020	/* union with underlying filesystem */
-#define	MNT_ASYNC	0x00000040	/* filesystem written asynchronously */
-#define	MNT_SUIDDIR	0x00100000	/* special handling of SUID on dirs */
-#define	MNT_SOFTDEP	0x00200000	/* soft updates being done */
-#define	MNT_NOSYMFOLLOW	0x00400000	/* do not follow symlinks */
-#define	MNT_JAILDEVFS	0x02000000	/* jail-friendly DEVFS behaviour */
-#define	MNT_MULTILABEL	0x04000000	/* MAC support for individual objects */
-#define	MNT_ACLS	0x08000000	/* ACL support enabled */
-#define	MNT_NOATIME	0x10000000	/* disable update of file access time */
-#define	MNT_NOCLUSTERR	0x40000000	/* disable cluster read */
-#define	MNT_NOCLUSTERW	0x80000000	/* disable cluster write */
-
-/*
- * NFS export related mount flags.
- */
-#define	MNT_EXRDONLY	0x00000080	/* exported read only */
-#define	MNT_EXPORTED	0x00000100	/* filesystem is exported */
-#define	MNT_DEFEXPORTED	0x00000200	/* exported to the world */
-#define	MNT_EXPORTANON	0x00000400	/* use anon uid mapping for everyone */
-#define	MNT_EXKERB	0x00000800	/* exported with Kerberos uid mapping */
-#define	MNT_EXPUBLIC	0x20000000	/* public export (WebNFS) */
-
-/*
- * Flags set by internal operations,
- * but visible to the user.
- * XXX some of these are not quite right.. (I've never seen the root flag set)
- */
-#define	MNT_LOCAL	0x00001000	/* filesystem is stored locally */
-#define	MNT_QUOTA	0x00002000	/* quotas are enabled on filesystem */
-#define	MNT_ROOTFS	0x00004000	/* identifies the root filesystem */
-#define	MNT_USER	0x00008000	/* mounted by a user */
-#define	MNT_IGNORE	0x00800000	/* do not show entry in df */
-
-/*
- * Mask of flags that are visible to statfs().
- * XXX I think that this could now become (~(MNT_CMDFLAGS))
- * but the 'mount' program may need changing to handle this.
- */
-#define	MNT_VISFLAGMASK	(MNT_RDONLY	| MNT_SYNCHRONOUS | MNT_NOEXEC	| \
-			MNT_NOSUID	| MNT_NODEV	| MNT_UNION	| \
-			MNT_ASYNC	| MNT_EXRDONLY	| MNT_EXPORTED	| \
-			MNT_DEFEXPORTED	| MNT_EXPORTANON| MNT_EXKERB	| \
-			MNT_LOCAL	| MNT_USER	| MNT_QUOTA	| \
-			MNT_ROOTFS	| MNT_NOATIME	| MNT_NOCLUSTERR| \
-			MNT_NOCLUSTERW	| MNT_SUIDDIR	| MNT_SOFTDEP	| \
-			MNT_IGNORE	| MNT_EXPUBLIC	| MNT_NOSYMFOLLOW | \
-			MNT_JAILDEVFS	| MNT_MULTILABEL | MNT_ACLS)
-
-/* Mask of flags that can be updated. */
-#define	MNT_UPDATEMASK (MNT_NOSUID	| MNT_NOEXEC	| MNT_NODEV	| \
-			MNT_SYNCHRONOUS	| MNT_UNION	| MNT_ASYNC	| \
-			MNT_NOATIME | \
-			MNT_NOSYMFOLLOW	| MNT_IGNORE	| MNT_JAILDEVFS	| \
-			MNT_NOCLUSTERR	| MNT_NOCLUSTERW | MNT_SUIDDIR	| \
-			MNT_ACLS	| MNT_USER)
-
-/*
- * External filesystem command modifier flags.
- * Unmount can use the MNT_FORCE flag.
- * XXX These are not STATES and really should be somewhere else.
- */
-#define	MNT_UPDATE	0x00010000	/* not a real mount, just an update */
-#define	MNT_DELEXPORT	0x00020000	/* delete export host lists */
-#define	MNT_RELOAD	0x00040000	/* reload filesystem data */
-#define	MNT_FORCE	0x00080000	/* force unmount or readonly change */
-#define	MNT_SNAPSHOT	0x01000000	/* snapshot the filesystem */
-#define	MNT_BYFSID	0x08000000	/* specify filesystem by ID. */
-#define MNT_CMDFLAGS   (MNT_UPDATE	| MNT_DELEXPORT	| MNT_RELOAD	| \
-			MNT_FORCE	| MNT_SNAPSHOT	| MNT_BYFSID)
-/*
- * Internal filesystem control flags stored in mnt_kern_flag.
- *
- * MNTK_UNMOUNT locks the mount entry so that name lookup cannot proceed
- * past the mount point.  This keeps the subtree stable during mounts
- * and unmounts.
- *
- * MNTK_UNMOUNTF permits filesystems to detect a forced unmount while
- * dounmount() is still waiting to lock the mountpoint. This allows
- * the filesystem to cancel operations that might otherwise deadlock
- * with the unmount attempt (used by NFS).
- */
-#define MNTK_UNMOUNTF	0x00000001	/* forced unmount in progress */
-#define MNTK_UNMOUNT	0x01000000	/* unmount in progress */
-#define	MNTK_MWAIT	0x02000000	/* waiting for unmount to finish */
-#define MNTK_WANTRDWR	0x04000000	/* upgrade to read/write requested */
-#define	MNTK_SUSPEND	0x08000000	/* request write suspension */
-#define	MNTK_SUSPENDED	0x10000000	/* write operations are suspended */
-
-/*
- * Sysctl CTL_VFS definitions.
- *
- * Second level identifier specifies which filesystem. Second level
- * identifier VFS_VFSCONF returns information about all filesystems.
- * Second level identifier VFS_GENERIC is non-terminal.
- */
-#define	VFS_VFSCONF		0	/* get configured filesystems */
-#define	VFS_GENERIC		0	/* generic filesystem information */
-/*
- * Third level identifiers for VFS_GENERIC are given below; third
- * level identifiers for specific filesystems are given in their
- * mount specific header files.
- */
-#define VFS_MAXTYPENUM	1	/* int: highest defined filesystem type */
-#define VFS_CONF	2	/* struct: vfsconf for filesystem given
-				   as next argument */
-
-/*
- * Flags for various system call interfaces.
- *
- * waitfor flags to vfs_sync() and getfsstat()
- */
-#define MNT_WAIT	1	/* synchronously wait for I/O to complete */
-#define MNT_NOWAIT	2	/* start all I/O, but do not wait for it */
-#define MNT_LAZY	3	/* push data not written by filesystem syncer */
-
-/*
- * Generic file handle
- */
-struct fhandle {
-	fsid_t	fh_fsid;	/* Filesystem id of mount point */
-	struct	fid fh_fid;	/* Filesys specific id */
-};
-typedef struct fhandle	fhandle_t;
-
-/*
- * Export arguments for local filesystem mount calls.
- */
-struct export_args {
-	int	ex_flags;		/* export related flags */
-	uid_t	ex_root;		/* mapping for root uid */
-	struct	xucred ex_anon;		/* mapping for anonymous user */
-	struct	sockaddr *ex_addr;	/* net address to which exported */
-	uInt8	ex_addrlen;		/* and the net address length */
-	struct	sockaddr *ex_mask;	/* mask of valid bits in saddr */
-	uInt8	ex_masklen;		/* and the smask length */
-	char	*ex_indexfile;		/* index file for WebNFS URLs */
-};
-
-/*
- * Structure holding information for a publicly exported filesystem
- * (WebNFS). Currently the specs allow just for one such filesystem.
- */
-struct nfs_public {
-	int		np_valid;	/* Do we hold valid information */
-	fhandle_t	np_handle;	/* Filehandle for pub fs (internal) */
-	struct mount	*np_mount;	/* Mountpoint of exported fs */
-	char		*np_index;	/* Index file */
-};
-
-/*
- * Filesystem configuration information. One of these exists for each
- * type of filesystem supported by the kernel. These are searched at
- * mount time to identify the requested filesystem.
- */
-struct vfsconf {
-	struct	vfsops *vfc_vfsops;	/* filesystem operations vector */
-	char	vfc_name[MFSNAMELEN];	/* filesystem type name */
-	int	vfc_typenum;		/* historic filesystem type number */
-	int	vfc_refcount;		/* number mounted of this type */
-	int	vfc_flags;		/* permanent flags */
-	struct	vfsoptdecl *vfc_opts;	/* mount options */
-	struct	vfsconf *vfc_next;	/* next in list */
-};
-
-/* Userland version of the struct vfsconf. */
-struct xvfsconf {
-	struct	vfsops *vfc_vfsops;	/* filesystem operations vector */
-	char	vfc_name[MFSNAMELEN];	/* filesystem type name */
-	int	vfc_typenum;		/* historic filesystem type number */
-	int	vfc_refcount;		/* number mounted of this type */
-	int	vfc_flags;		/* permanent flags */
-	struct	vfsconf *vfc_next;	/* next in list */
-};
-
-struct ovfsconf {
-	void	*vfc_vfsops;
-	char	vfc_name[32];
-	int	vfc_index;
-	int	vfc_refcount;
-	int	vfc_flags;
-};
-
-/*
- * NB: these flags refer to IMPLEMENTATION properties, not properties of
- * any actual mounts; i.e., it does not make sense to change the flags.
- */
-#define	VFCF_STATIC	0x00010000	/* statically compiled into kernel */
-#define	VFCF_NETWORK	0x00020000	/* may get data over the network */
-#define	VFCF_READONLY	0x00040000	/* writes are not implemented */
-#define VFCF_SYNTHETIC	0x00080000	/* data does not represent real files */
-#define	VFCF_LOOPBACK	0x00100000	/* aliases some other mounted FS */
-#define	VFCF_UNICODE	0x00200000	/* stores file names as Unicode*/
-
-struct iovec;
-struct uio;
-
-#ifdef _KERNEL
-
-#ifdef MALLOC_DECLARE
-MALLOC_DECLARE(M_MOUNT);
-#endif
-extern int maxvfsconf;		/* highest defined filesystem type */
-extern int nfs_mount_type;	/* vfc_typenum for nfs, or -1 */
-extern struct vfsconf *vfsconf;	/* head of list of filesystem types */
-
-/*
- * Operations supported on mounted filesystem.
- */
-struct mount_args;
-struct nameidata;
-
-typedef int vfs_mount_t(struct mount *mp, char *path, caddr_t data,
-			struct nameidata *ndp, struct thread *td);
-typedef int vfs_start_t(struct mount *mp, int flags, struct thread *td);
-typedef int vfs_unmount_t(struct mount *mp, int mntflags, struct thread *td);
-typedef int vfs_root_t(struct mount *mp, struct vnode **vpp);
-typedef	int vfs_quotactl_t(struct mount *mp, int cmds, uid_t uid,
-		    caddr_t arg, struct thread *td);
-typedef	int vfs_statfs_t(struct mount *mp, struct statfs *sbp,
-		    struct thread *td);
-typedef	int vfs_sync_t(struct mount *mp, int waitfor, struct ucred *cred,
-		    struct thread *td);
-typedef	int vfs_vget_t(struct mount *mp, ino_t ino, int flags,
-		    struct vnode **vpp);
-typedef	int vfs_fhtovp_t(struct mount *mp, struct fid *fhp, struct vnode **vpp);
-typedef	int vfs_checkexp_t(struct mount *mp, struct sockaddr *nam,
-		    int *extflagsp, struct ucred **credanonp);
-typedef	int vfs_vptofh_t(struct vnode *vp, struct fid *fhp);
-typedef	int vfs_init_t(struct vfsconf *);
-typedef	int vfs_uninit_t(struct vfsconf *);
-typedef	int vfs_extattrctl_t(struct mount *mp, int cmd,
-		    struct vnode *filename_vp, int attrnamespace,
-		    const char *attrname, struct thread *td);
-typedef	int vfs_nmount_t(struct mount *mp, struct nameidata *ndp,
-		    struct thread *td);
-
-struct vfsops {
-	vfs_mount_t		*vfs_mount;
-	vfs_start_t		*vfs_start;
-	vfs_unmount_t		*vfs_unmount;
-	vfs_root_t		*vfs_root;
-	vfs_quotactl_t		*vfs_quotactl;
-	vfs_statfs_t		*vfs_statfs;
-	vfs_sync_t		*vfs_sync;
-	vfs_vget_t		*vfs_vget;
-	vfs_fhtovp_t		*vfs_fhtovp;
-	vfs_checkexp_t		*vfs_checkexp;
-	vfs_vptofh_t		*vfs_vptofh;
-	vfs_init_t		*vfs_init;
-	vfs_uninit_t		*vfs_uninit;
-	vfs_extattrctl_t	*vfs_extattrctl;
-	/* Additions below are not binary compatible with 5.0 and below. */
-	vfs_nmount_t		*vfs_nmount;
-};
-
-#define VFS_NMOUNT(MP, NDP, P)    (*(MP)->mnt_op->vfs_nmount)(MP, NDP, P)
-#define VFS_MOUNT(MP, PATH, DATA, NDP, P) \
-	(*(MP)->mnt_op->vfs_mount)(MP, PATH, DATA, NDP, P)
-#define VFS_START(MP, FLAGS, P)	  (*(MP)->mnt_op->vfs_start)(MP, FLAGS, P)
-#define VFS_UNMOUNT(MP, FORCE, P) (*(MP)->mnt_op->vfs_unmount)(MP, FORCE, P)
-#define VFS_ROOT(MP, VPP)	  (*(MP)->mnt_op->vfs_root)(MP, VPP)
-#define VFS_QUOTACTL(MP,C,U,A,P)  (*(MP)->mnt_op->vfs_quotactl)(MP, C, U, A, P)
-#define VFS_STATFS(MP, SBP, P)	  (*(MP)->mnt_op->vfs_statfs)(MP, SBP, P)
-#define VFS_SYNC(MP, WAIT, C, P)  (*(MP)->mnt_op->vfs_sync)(MP, WAIT, C, P)
-#define VFS_VGET(MP, INO, FLAGS, VPP) \
-	(*(MP)->mnt_op->vfs_vget)(MP, INO, FLAGS, VPP)
-#define VFS_FHTOVP(MP, FIDP, VPP) \
-	(*(MP)->mnt_op->vfs_fhtovp)(MP, FIDP, VPP)
-#define	VFS_VPTOFH(VP, FIDP)	  (*(VP)->v_mount->mnt_op->vfs_vptofh)(VP, FIDP)
-#define VFS_CHECKEXP(MP, NAM, EXFLG, CRED) \
-	(*(MP)->mnt_op->vfs_checkexp)(MP, NAM, EXFLG, CRED)
-#define VFS_EXTATTRCTL(MP, C, FN, NS, N, P) \
-	(*(MP)->mnt_op->vfs_extattrctl)(MP, C, FN, NS, N, P)
-
-#include <sys/module.h>
-
-#define VFS_SET(vfsops, fsname, flags) \
-	static struct vfsconf fsname ## _vfsconf = {		\
-		&vfsops,					\
-		#fsname,					\
-		-1,						\
-		0,						\
-		flags						\
-	};							\
-	static moduledata_t fsname ## _mod = {			\
-		#fsname,					\
-		vfs_modevent,					\
-		& fsname ## _vfsconf				\
-	};							\
-	DECLARE_MODULE(fsname, fsname ## _mod, SI_SUB_VFS, SI_ORDER_MIDDLE)
-
-extern	char *mountrootfsname;
-
-/*
- * exported vnode operations
- */
-int	dounmount(struct mount *, int, struct thread *td);
-int	kernel_mount(struct iovec *iovp, unsigned int iovcnt, int flags);
-int	kernel_vmount(int flags, ...);
-int	vfs_getopt(struct vfsoptlist *, const char *, void **, int *);
-int	vfs_copyopt(struct vfsoptlist *, const char *, void *, int);
-int	vfs_mount(struct thread *td, const char *type, char *path,
-	    int flags, void *data);
-int	vfs_setpublicfs			    /* set publicly exported fs */
-	    (struct mount *, struct netexport *, struct export_args *);
-int	vfs_lock(struct mount *);         /* lock a vfs */
-void	vfs_msync(struct mount *, int);
-void	vfs_unlock(struct mount *);       /* unlock a vfs */
-int	vfs_busy(struct mount *, int, struct mtx *, struct thread *td);
-int	vfs_export			 /* process mount export info */
-	    (struct mount *, struct export_args *);
-struct	netcred *vfs_export_lookup	    /* lookup host in fs export list */
-	    (struct mount *, struct sockaddr *);
-int	vfs_allocate_syncvnode(struct mount *);
-void	vfs_getnewfsid(struct mount *);
-dev_t	vfs_getrootfsid(struct mount *);
-struct	mount *vfs_getvfs(fsid_t *);      /* return vfs given fsid */
-int	vfs_modevent(module_t, int, void *);
-int	vfs_mountedon(struct vnode *);    /* is a vfs mounted on vp */
-void	vfs_mountroot(void);			/* mount our root filesystem */
-int	vfs_rootmountalloc(char *, char *, struct mount **);
-void	vfs_mount_destroy(struct mount *, struct thread *);
-void	vfs_unbusy(struct mount *, struct thread *td);
-void	vfs_unmountall(void);
-int	vfs_register(struct vfsconf *);
-int	vfs_unregister(struct vfsconf *);
-extern	TAILQ_HEAD(mntlist, mount) mountlist;	/* mounted filesystem list */
-extern	struct mtx mountlist_mtx;
-extern	struct nfs_public nfs_pub;
-
-/*
- * Declarations for these vfs default operations are located in
- * kern/vfs_default.c, they should be used instead of making "dummy"
- * functions or casting entries in the VFS op table to "enopnotsupp()".
- */
-vfs_start_t		vfs_stdstart;
-vfs_root_t		vfs_stdroot;
-vfs_quotactl_t		vfs_stdquotactl;
-vfs_statfs_t		vfs_stdstatfs;
-vfs_sync_t		vfs_stdsync;
-vfs_sync_t		vfs_stdnosync;
-vfs_vget_t		vfs_stdvget;
-vfs_fhtovp_t		vfs_stdfhtovp;
-vfs_checkexp_t		vfs_stdcheckexp;
-vfs_vptofh_t		vfs_stdvptofh;
-vfs_init_t		vfs_stdinit;
-vfs_uninit_t		vfs_stduninit;
-vfs_extattrctl_t	vfs_stdextattrctl;
-
-/* XXX - these should be indirect functions!!! */
-int	softdep_fsync(struct vnode *);
-int	softdep_process_worklist(struct mount *);
-
-#else /* !_KERNEL */
-
-#include <sys/cdefs.h>
-
-struct stat;
-
-__BEGIN_DECLS
-int	fhopen(const struct fhandle *, int);
-int	fhstat(const struct fhandle *, struct stat *);
-int	fhstatfs(const struct fhandle *, struct statfs *);
-int	fstatfs(int, struct statfs *);
-int	getfh(const char *, fhandle_t *);
-int	getfsstat(struct statfs *, long, int);
-int	getmntinfo(struct statfs **, int);
-int	mount(const char *, const char *, int, void *);
-int	nmount(struct iovec *, uInt32, int);
-int	statfs(const char *, struct statfs *);
-int	unmount(const char *, int);
-
-/* C library stuff */
-void	endvfsent(void);
-struct	ovfsconf *getvfsbytype(int);
-struct	ovfsconf *getvfsent(void);
-int	getvfsbyname(const char *, struct xvfsconf *);
-void	setvfsent(int);
-int	vfsisloadable(const char *);
-int	vfsload(const char *);
-__END_DECLS
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_MOUNT_H_ */
diff --git a/include/sys/mpi.h b/include/sys/mpi.h
deleted file mode 100644
index a924a19..0000000
--- a/include/sys/mpi.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mpi.h 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _MPI_H
-#define _MPI_H
-
-#include <sys/types.h>
-
-#define MESSAGE_LENGTH 248
-
-struct mpi_message {
-  char               data[MESSAGE_LENGTH];
-  uInt32             header;
-  struct mpi_message *next;
-  };
-
-typedef struct mpi_message mpi_message_t;
-
-
-int mpi_createMbox(char *);
-int mpi_destroyMbox(char *);
-int mpi_postMessage(char *,uInt32,mpi_message_t *);
-int mpi_fetchMessage(char *,mpi_message_t *);
-int mpi_fpam(uInt32 type,void *);
-
-#endif
-
-/***
- $Log: mpi.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:08  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:29  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:14:16  reddawg
- no message
-
- Revision 1.5  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.4  2004/05/28 03:53:30  reddawg
- mpi: oops can't forget userland
-
- Revision 1.3  2004/05/26 15:39:22  reddawg
- mpi: brought mpiDestroyMbox(char *name) in to the userland
-
- Revision 1.2  2004/05/25 18:48:48  reddawg
- Userland now uses MESSAGE_LENGTH
-
- Revision 1.1  2004/05/25 15:43:27  reddawg
- Added Userland MPI access
-
- Revision 1.1  2004/05/25 14:07:01  reddawg
- Sorry we can't forget the headers files
-
- END
- ***/
-
diff --git a/include/sys/param.h b/include/sys/param.h
deleted file mode 100644
index 711abe3..0000000
--- a/include/sys/param.h
+++ /dev/null
@@ -1,331 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.181 2004/02/25 01:27:32 ache Exp $
- */
-
-#ifndef _SYS_PARAM_H_
-#define _SYS_PARAM_H_
-
-#include <sys/_null.h>
-
-#define	BSD	199506		/* System version (year & month). */
-#define BSD4_3	1
-#define BSD4_4	1
-
-/* 
- * __FreeBSD_version numbers are documented in the Porter's Handbook.
- * If you bump the version for any reason, you should update the documentation
- * there.
- * Currently this lives here:
- *
- *	doc/en_US.ISO8859-1/books/porters-handbook/book.sgml
- *
- * scheme is:  <major><two digit minor><0 if release branch, otherwise 1>xx
- */
-#undef __FreeBSD_version
-#define __FreeBSD_version 502104	/* Master, propagated to newvers */
-
-#ifndef LOCORE
-#include <sys/types.h>
-#endif
-
-/*
- * Machine-independent constants (some used in following include files).
- * Redefined constants are from POSIX 1003.1 limits file.
- *
- * MAXCOMLEN should be >= sizeof(ac_comm) (see <acct.h>)
- * MAXLOGNAME should be == UT_NAMESIZE+1 (see <utmp.h>)
- */
-#include <sys/syslimits.h>
-
-#define	MAXCOMLEN	19		/* max command name remembered */
-#define	MAXINTERP	32		/* max interpreter file name length */
-#define	MAXLOGNAME	17		/* max login name length (incl. NUL) */
-#define	MAXUPRC		CHILD_MAX	/* max simultaneous processes */
-#define	NCARGS		ARG_MAX		/* max bytes for an exec function */
-#define	NGROUPS		NGROUPS_MAX	/* max number groups */
-#define	NOFILE		OPEN_MAX	/* max open files per process */
-#define	NOGROUP		65535		/* marker for empty group set member */
-#define MAXHOSTNAMELEN	256		/* max hostname size */
-#define SPECNAMELEN	63		/* max length of devicename */
-
-/* More types and definitions used throughout the kernel. */
-#ifdef _KERNEL
-#if (defined(BURN_BRIDGES) || __FreeBSD_version >= 600000) \
-	&& defined(OBSOLETE_IN_6)
-#error "This file contains obsolete code to be removed in 6.0-current"
-#endif
-#include <sys/cdefs.h>
-#include <sys/errno.h>
-#include <sys/time.h>
-#include <sys/priority.h>
-
-#define	FALSE	0
-#define	TRUE	1
-#endif
-
-#ifndef _KERNEL
-/* Signals. */
-#include <sys/signal.h>
-#endif
-
-/* Machine type dependent parameters. */
-#include <machine/param.h>
-#ifndef _KERNEL
-#include <sys/limits.h>
-#endif
-
-#ifndef _NO_NAMESPACE_POLLUTION
-
-#ifndef DEV_BSHIFT
-#define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
-#endif
-#define	DEV_BSIZE	(1<<DEV_BSHIFT)
-
-#ifndef BLKDEV_IOSIZE
-#define BLKDEV_IOSIZE  PAGE_SIZE	/* default block device I/O size */
-#endif
-#ifndef DFLTPHYS
-#define DFLTPHYS	(64 * 1024)	/* default max raw I/O transfer size */
-#endif
-#ifndef MAXPHYS
-#define MAXPHYS		(128 * 1024)	/* max raw I/O transfer size */
-#endif
-#ifndef MAXDUMPPGS
-#define MAXDUMPPGS	(DFLTPHYS/PAGE_SIZE)
-#endif
-
-/*
- * Constants related to network buffer management.
- * MCLBYTES must be no larger than PAGE_SIZE.
- */
-#ifndef	MSIZE
-#define MSIZE		256		/* size of an mbuf */
-#endif	/* MSIZE */
-
-#ifndef	MCLSHIFT
-#define MCLSHIFT	11		/* convert bytes to mbuf clusters */
-#endif	/* MCLSHIFT */
-
-#define MCLBYTES	(1 << MCLSHIFT)	/* size of an mbuf cluster */
-
-/*
- * Some macros for units conversion
- */
-
-/* clicks to bytes */
-#ifndef ctob
-#define ctob(x)	((x)<<PAGE_SHIFT)
-#endif
-
-/* bytes to clicks */
-#ifndef btoc
-#define btoc(x)	(((vm_offset_t)(x)+PAGE_MASK)>>PAGE_SHIFT)
-#endif
-
-/*
- * btodb() is messy and perhaps slow because `bytes' may be an off_t.  We
- * want to shift an unsigned type to avoid sign extension and we don't
- * want to widen `bytes' unnecessarily.  Assume that the result fits in
- * a daddr_t.
- */
-#ifndef btodb
-#define btodb(bytes)	 		/* calculates (bytes / DEV_BSIZE) */ \
-	(sizeof (bytes) > sizeof(long) \
-	 ? (daddr_t)((unsigned long long)(bytes) >> DEV_BSHIFT) \
-	 : (daddr_t)((unsigned long)(bytes) >> DEV_BSHIFT))
-#endif
-
-#ifndef dbtob
-#define dbtob(db)			/* calculates (db * DEV_BSIZE) */ \
-	((off_t)(db) << DEV_BSHIFT)
-#endif
-
-#endif /* _NO_NAMESPACE_POLLUTION */
-
-#define	PRIMASK	0x0ff
-#define	PCATCH	0x100		/* OR'd with pri for tsleep to check signals */
-#define	PDROP	0x200	/* OR'd with pri to stop re-entry of interlock mutex */
-
-#define	NZERO	0		/* default "nice" */
-
-#define	NBBY	8		/* number of bits in a byte */
-#define	NBPW	sizeof(int)	/* number of bytes per word (integer) */
-
-#define	CMASK	022		/* default file mask: S_IWGRP|S_IWOTH */
-#ifdef _KERNEL
-#define	NOUDEV	(udev_t)(-1)	/* non-existent device */
-#define	NOMAJ	256		/* non-existent device */
-#define	NODEV	NULL		/* non-existent device */
-#else
-#define	NODEV	(dev_t)(-1)	/* non-existent device */
-#endif
-
-#define	CBLOCK	128		/* Clist block size, must be a power of 2. */
-#define CBQSIZE	(CBLOCK/NBBY)	/* Quote bytes/cblock - can do better. */
-				/* Data chars/clist. */
-#define	CBSIZE	(CBLOCK - sizeof(struct cblock *) - CBQSIZE)
-#define	CROUND	(CBLOCK - 1)	/* Clist rounding. */
-
-/*
- * File system parameters and macros.
- *
- * MAXBSIZE -	Filesystems are made out of blocks of at most MAXBSIZE bytes
- *		per block.  MAXBSIZE may be made larger without effecting
- *		any existing filesystems as long as it does not exceed MAXPHYS,
- *		and may be made smaller at the risk of not being able to use
- *		filesystems which require a block size exceeding MAXBSIZE.
- *
- * BKVASIZE -	Nominal buffer space per buffer, in bytes.  BKVASIZE is the
- *		minimum KVM memory reservation the kernel is willing to make.
- *		Filesystems can of course request smaller chunks.  Actual 
- *		backing memory uses a chunk size of a page (PAGE_SIZE).
- *
- *		If you make BKVASIZE too small you risk seriously fragmenting
- *		the buffer KVM map which may slow things down a bit.  If you
- *		make it too big the kernel will not be able to optimally use 
- *		the KVM memory reserved for the buffer cache and will wind 
- *		up with too-few buffers.
- *
- *		The default is 16384, roughly 2x the block size used by a
- *		normal UFS filesystem.
- */
-#define MAXBSIZE	65536	/* must be power of 2 */
-#define BKVASIZE	16384	/* must be power of 2 */
-#define BKVAMASK	(BKVASIZE-1)
-
-/*
- * MAXPATHLEN defines the longest permissible path length after expanding
- * symbolic links. It is used to allocate a temporary buffer from the buffer
- * pool in which to do the name expansion, hence should be a power of two,
- * and must be less than or equal to MAXBSIZE.  MAXSYMLINKS defines the
- * maximum number of symbolic links that may be expanded in a path name.
- * It should be set high enough to allow all legitimate uses, but halt
- * infinite loops reasonably quickly.
- */
-#define	MAXPATHLEN	PATH_MAX
-#define MAXSYMLINKS	32
-
-/* Bit map related macros. */
-#define	setbit(a,i)	((a)[(i)/NBBY] |= 1<<((i)%NBBY))
-#define	clrbit(a,i)	((a)[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-#define	isset(a,i)	((a)[(i)/NBBY] & (1<<((i)%NBBY)))
-#define	isclr(a,i)	(((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-
-/* Macros for counting and rounding. */
-#ifndef howmany
-#define	howmany(x, y)	(((x)+((y)-1))/(y))
-#endif
-#define	rounddown(x, y)	(((x)/(y))*(y))
-#define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
-#define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
-#define powerof2(x)	((((x)-1)&(x))==0)
-
-/* Macros for min/max. */
-#define	MIN(a,b) (((a)<(b))?(a):(b))
-#define	MAX(a,b) (((a)>(b))?(a):(b))
-
-#ifdef _KERNEL
-/*
- * Basic byte order function prototypes for non-inline functions.
- */
-#ifndef _BYTEORDER_PROTOTYPED
-#define	_BYTEORDER_PROTOTYPED
-__BEGIN_DECLS
-__uint32_t	 htonl(__uint32_t);
-__uint16_t	 htons(__uint16_t);
-__uint32_t	 ntohl(__uint32_t);
-__uint16_t	 ntohs(__uint16_t);
-__END_DECLS
-#endif
-
-#ifndef lint
-#ifndef _BYTEORDER_FUNC_DEFINED
-#define	_BYTEORDER_FUNC_DEFINED
-#define	htonl(x)	__htonl(x)
-#define	htons(x)	__htons(x)
-#define	ntohl(x)	__ntohl(x)
-#define	ntohs(x)	__ntohs(x)
-#endif /* !_BYTEORDER_FUNC_DEFINED */
-#endif /* lint */
-#endif /* _KERNEL */
-
-/*
- * Constants for setting the parameters of the kernel memory allocator.
- *
- * 2 ** MINBUCKET is the smallest unit of memory that will be
- * allocated. It must be at least large enough to hold a pointer.
- *
- * Units of memory less or equal to MAXALLOCSAVE will permanently
- * allocate physical memory; requests for these size pieces of
- * memory are quite fast. Allocations greater than MAXALLOCSAVE must
- * always allocate and free physical memory; requests for these
- * size allocations should be done infrequently as they will be slow.
- *
- * Constraints: PAGE_SIZE <= MAXALLOCSAVE <= 2 ** (MINBUCKET + 14), and
- * MAXALLOCSIZE must be a power of two.
- */
-#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__)
-#define MINBUCKET	5		/* 5 => min allocation of 32 bytes */
-#else
-#define MINBUCKET	4		/* 4 => min allocation of 16 bytes */
-#endif
-#define MAXALLOCSAVE	(2 * PAGE_SIZE)
-
-/*
- * Scale factor for scaled integers used to count %cpu time and load avgs.
- *
- * The number of CPU `tick's that map to a unique `%age' can be expressed
- * by the formula (1 / (2 ^ (FSHIFT - 11))).  The maximum load average that
- * can be calculated (assuming 32 bits) can be closely approximated using
- * the formula (2 ^ (2 * (16 - FSHIFT))) for (FSHIFT < 15).
- *
- * For the scheduler to maintain a 1:1 mapping of CPU `tick' to `%age',
- * FSHIFT must be at least 11; this gives us a maximum load avg of ~1024.
- */
-#define	FSHIFT	11		/* bits to right of fixed binary point */
-#define FSCALE	(1<<FSHIFT)
-
-#define dbtoc(db)			/* calculates devblks to pages */ \
-	((db + (ctodb(1) - 1)) >> (PAGE_SHIFT - DEV_BSHIFT))
- 
-#define ctodb(db)			/* calculates pages to devblks */ \
-	((db) << (PAGE_SHIFT - DEV_BSHIFT))
-
-#endif	/* _SYS_PARAM_H_ */
diff --git a/include/sys/queue.h b/include/sys/queue.h
deleted file mode 100644
index b93015e..0000000
--- a/include/sys/queue.h
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * Copyright (c) 1991, 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.
- *
- *	@(#)queue.h	8.5 (Berkeley) 8/20/94
- * $FreeBSD: src/sys/sys/queue.h,v 1.56 2003/08/14 14:49:26 kan Exp $
- */
-
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
-
-#include <sys/cdefs.h>
-
-/*
- * This file defines four types of data structures: singly-linked lists,
- * singly-linked tail queues, lists and tail queues.
- *
- * A singly-linked list is headed by a single forward pointer. The elements
- * are singly linked for minimum space and pointer manipulation overhead at
- * the expense of O(n) removal for arbitrary elements. New elements can be
- * added to the list after an existing element or at the head of the list.
- * Elements being removed from the head of the list should use the explicit
- * macro for this purpose for optimum efficiency. A singly-linked list may
- * only be traversed in the forward direction.  Singly-linked lists are ideal
- * for applications with large datasets and few or no removals or for
- * implementing a LIFO queue.
- *
- * A singly-linked tail queue is headed by a pair of pointers, one to the
- * head of the list and the other to the tail of the list. The elements are
- * singly linked for minimum space and pointer manipulation overhead at the
- * expense of O(n) removal for arbitrary elements. New elements can be added
- * to the list after an existing element, at the head of the list, or at the
- * end of the list. Elements being removed from the head of the tail queue
- * should use the explicit macro for this purpose for optimum efficiency.
- * A singly-linked tail queue may only be traversed in the forward direction.
- * Singly-linked tail queues are ideal for applications with large datasets
- * and few or no removals or for implementing a FIFO queue.
- *
- * A list is headed by a single forward pointer (or an array of forward
- * pointers for a hash table header). The elements are doubly linked
- * so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before
- * or after an existing element or at the head of the list. A list
- * may only be traversed in the forward direction.
- *
- * A tail queue is headed by a pair of pointers, one to the head of the
- * list and the other to the tail of the list. The elements are doubly
- * linked so that an arbitrary element can be removed without a need to
- * traverse the list. New elements can be added to the list before or
- * after an existing element, at the head of the list, or at the end of
- * the list. A tail queue may be traversed in either direction.
- *
- * For details on the use of these macros, see the queue(3) manual page.
- *
- *
- *				SLIST	LIST	STAILQ	TAILQ
- * _HEAD			+	+	+	+
- * _HEAD_INITIALIZER		+	+	+	+
- * _ENTRY			+	+	+	+
- * _INIT			+	+	+	+
- * _EMPTY			+	+	+	+
- * _FIRST			+	+	+	+
- * _NEXT			+	+	+	+
- * _PREV			-	-	-	+
- * _LAST			-	-	+	+
- * _FOREACH			+	+	+	+
- * _FOREACH_SAFE		+	+	+	+
- * _FOREACH_REVERSE		-	-	-	+
- * _FOREACH_REVERSE_SAFE	-	-	-	+
- * _INSERT_HEAD			+	+	+	+
- * _INSERT_BEFORE		-	+	-	+
- * _INSERT_AFTER		+	+	+	+
- * _INSERT_TAIL			-	-	+	+
- * _CONCAT			-	-	+	+
- * _REMOVE_HEAD			+	-	+	-
- * _REMOVE			+	+	+	+
- *
- */
-#define	QUEUE_MACRO_DEBUG 0
-#if QUEUE_MACRO_DEBUG
-/* Store the last 2 places the queue element or head was altered */
-struct qm_trace {
-	char * lastfile;
-	int lastline;
-	char * prevfile;
-	int prevline;
-};
-
-#define	TRACEBUF	struct qm_trace trace;
-#define	TRASHIT(x)	do {(x) = (void *)-1;} while (0)
-
-#define	QMD_TRACE_HEAD(head) do {					\
-	(head)->trace.prevline = (head)->trace.lastline;		\
-	(head)->trace.prevfile = (head)->trace.lastfile;		\
-	(head)->trace.lastline = __LINE__;				\
-	(head)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#define	QMD_TRACE_ELEM(elem) do {					\
-	(elem)->trace.prevline = (elem)->trace.lastline;		\
-	(elem)->trace.prevfile = (elem)->trace.lastfile;		\
-	(elem)->trace.lastline = __LINE__;				\
-	(elem)->trace.lastfile = __FILE__;				\
-} while (0)
-
-#else
-#define	QMD_TRACE_ELEM(elem)
-#define	QMD_TRACE_HEAD(head)
-#define	TRACEBUF
-#define	TRASHIT(x)
-#endif	/* QUEUE_MACRO_DEBUG */
-
-/*
- * Singly-linked List declarations.
- */
-#define	SLIST_HEAD(name, type)						\
-struct name {								\
-	struct type *slh_first;	/* first element */			\
-}
-
-#define	SLIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	SLIST_ENTRY(type)						\
-struct {								\
-	struct type *sle_next;	/* next element */			\
-}
-
-/*
- * Singly-linked List functions.
- */
-#define	SLIST_EMPTY(head)	((head)->slh_first == NULL)
-
-#define	SLIST_FIRST(head)	((head)->slh_first)
-
-#define	SLIST_FOREACH(var, head, field)					\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var);							\
-	    (var) = SLIST_NEXT((var), field))
-
-#define	SLIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = SLIST_FIRST((head));				\
-	    (var) && ((tvar) = SLIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	SLIST_FOREACH_PREVPTR(var, varp, head, field)			\
-	for ((varp) = &SLIST_FIRST((head));				\
-	    ((var) = *(varp)) != NULL;					\
-	    (varp) = &SLIST_NEXT((var), field))
-
-#define	SLIST_INIT(head) do {						\
-	SLIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	SLIST_INSERT_AFTER(slistelm, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_NEXT((slistelm), field);	\
-	SLIST_NEXT((slistelm), field) = (elm);				\
-} while (0)
-
-#define	SLIST_INSERT_HEAD(head, elm, field) do {			\
-	SLIST_NEXT((elm), field) = SLIST_FIRST((head));			\
-	SLIST_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	SLIST_NEXT(elm, field)	((elm)->field.sle_next)
-
-#define	SLIST_REMOVE(head, elm, type, field) do {			\
-	if (SLIST_FIRST((head)) == (elm)) {				\
-		SLIST_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = SLIST_FIRST((head));		\
-		while (SLIST_NEXT(curelm, field) != (elm))		\
-			curelm = SLIST_NEXT(curelm, field);		\
-		SLIST_NEXT(curelm, field) =				\
-		    SLIST_NEXT(SLIST_NEXT(curelm, field), field);	\
-	}								\
-} while (0)
-
-#define	SLIST_REMOVE_HEAD(head, field) do {				\
-	SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field);	\
-} while (0)
-
-/*
- * Singly-linked Tail queue declarations.
- */
-#define	STAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *stqh_first;/* first element */			\
-	struct type **stqh_last;/* addr of last next element */		\
-}
-
-#define	STAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).stqh_first }
-
-#define	STAILQ_ENTRY(type)						\
-struct {								\
-	struct type *stqe_next;	/* next element */			\
-}
-
-/*
- * Singly-linked Tail queue functions.
- */
-#define	STAILQ_CONCAT(head1, head2) do {				\
-	if (!STAILQ_EMPTY((head2))) {					\
-		*(head1)->stqh_last = (head2)->stqh_first;		\
-		(head1)->stqh_last = (head2)->stqh_last;		\
-		STAILQ_INIT((head2));					\
-	}								\
-} while (0)
-
-#define	STAILQ_EMPTY(head)	((head)->stqh_first == NULL)
-
-#define	STAILQ_FIRST(head)	((head)->stqh_first)
-
-#define	STAILQ_FOREACH(var, head, field)				\
-	for((var) = STAILQ_FIRST((head));				\
-	   (var);							\
-	   (var) = STAILQ_NEXT((var), field))
-
-
-#define	STAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = STAILQ_FIRST((head));				\
-	    (var) && ((tvar) = STAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	STAILQ_INIT(head) do {						\
-	STAILQ_FIRST((head)) = NULL;					\
-	(head)->stqh_last = &STAILQ_FIRST((head));			\
-} while (0)
-
-#define	STAILQ_INSERT_AFTER(head, tqelm, elm, field) do {		\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_NEXT((tqelm), field) = (elm);				\
-} while (0)
-
-#define	STAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((STAILQ_NEXT((elm), field) = STAILQ_FIRST((head))) == NULL)	\
-		(head)->stqh_last = &STAILQ_NEXT((elm), field);		\
-	STAILQ_FIRST((head)) = (elm);					\
-} while (0)
-
-#define	STAILQ_INSERT_TAIL(head, elm, field) do {			\
-	STAILQ_NEXT((elm), field) = NULL;				\
-	*(head)->stqh_last = (elm);					\
-	(head)->stqh_last = &STAILQ_NEXT((elm), field);			\
-} while (0)
-
-#define	STAILQ_LAST(head, type, field)					\
-	(STAILQ_EMPTY((head)) ?						\
-		NULL :							\
-	        ((struct type *)					\
-		((char *)((head)->stqh_last) - __offsetof(struct type, field))))
-
-#define	STAILQ_NEXT(elm, field)	((elm)->field.stqe_next)
-
-#define	STAILQ_REMOVE(head, elm, type, field) do {			\
-	if (STAILQ_FIRST((head)) == (elm)) {				\
-		STAILQ_REMOVE_HEAD((head), field);			\
-	}								\
-	else {								\
-		struct type *curelm = STAILQ_FIRST((head));		\
-		while (STAILQ_NEXT(curelm, field) != (elm))		\
-			curelm = STAILQ_NEXT(curelm, field);		\
-		if ((STAILQ_NEXT(curelm, field) =			\
-		     STAILQ_NEXT(STAILQ_NEXT(curelm, field), field)) == NULL)\
-			(head)->stqh_last = &STAILQ_NEXT((curelm), field);\
-	}								\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD(head, field) do {				\
-	if ((STAILQ_FIRST((head)) =					\
-	     STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL)		\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-#define	STAILQ_REMOVE_HEAD_UNTIL(head, elm, field) do {			\
-	if ((STAILQ_FIRST((head)) = STAILQ_NEXT((elm), field)) == NULL)	\
-		(head)->stqh_last = &STAILQ_FIRST((head));		\
-} while (0)
-
-/*
- * List declarations.
- */
-#define	LIST_HEAD(name, type)						\
-struct name {								\
-	struct type *lh_first;	/* first element */			\
-}
-
-#define	LIST_HEAD_INITIALIZER(head)					\
-	{ NULL }
-
-#define	LIST_ENTRY(type)						\
-struct {								\
-	struct type *le_next;	/* next element */			\
-	struct type **le_prev;	/* address of previous next element */	\
-}
-
-/*
- * List functions.
- */
-
-#define	LIST_EMPTY(head)	((head)->lh_first == NULL)
-
-#define	LIST_FIRST(head)	((head)->lh_first)
-
-#define	LIST_FOREACH(var, head, field)					\
-	for ((var) = LIST_FIRST((head));				\
-	    (var);							\
-	    (var) = LIST_NEXT((var), field))
-
-#define	LIST_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = LIST_FIRST((head));				\
-	    (var) && ((tvar) = LIST_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	LIST_INIT(head) do {						\
-	LIST_FIRST((head)) = NULL;					\
-} while (0)
-
-#define	LIST_INSERT_AFTER(listelm, elm, field) do {			\
-	if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
-		LIST_NEXT((listelm), field)->field.le_prev =		\
-		    &LIST_NEXT((elm), field);				\
-	LIST_NEXT((listelm), field) = (elm);				\
-	(elm)->field.le_prev = &LIST_NEXT((listelm), field);		\
-} while (0)
-
-#define	LIST_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.le_prev = (listelm)->field.le_prev;		\
-	LIST_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.le_prev = (elm);				\
-	(listelm)->field.le_prev = &LIST_NEXT((elm), field);		\
-} while (0)
-
-#define	LIST_INSERT_HEAD(head, elm, field) do {				\
-	if ((LIST_NEXT((elm), field) = LIST_FIRST((head))) != NULL)	\
-		LIST_FIRST((head))->field.le_prev = &LIST_NEXT((elm), field);\
-	LIST_FIRST((head)) = (elm);					\
-	(elm)->field.le_prev = &LIST_FIRST((head));			\
-} while (0)
-
-#define	LIST_NEXT(elm, field)	((elm)->field.le_next)
-
-#define	LIST_REMOVE(elm, field) do {					\
-	if (LIST_NEXT((elm), field) != NULL)				\
-		LIST_NEXT((elm), field)->field.le_prev = 		\
-		    (elm)->field.le_prev;				\
-	*(elm)->field.le_prev = LIST_NEXT((elm), field);		\
-} while (0)
-
-/*
- * Tail queue declarations.
- */
-#define	TAILQ_HEAD(name, type)						\
-struct name {								\
-	struct type *tqh_first;	/* first element */			\
-	struct type **tqh_last;	/* addr of last next element */		\
-	TRACEBUF							\
-}
-
-#define	TAILQ_HEAD_INITIALIZER(head)					\
-	{ NULL, &(head).tqh_first }
-
-#define	TAILQ_ENTRY(type)						\
-struct {								\
-	struct type *tqe_next;	/* next element */			\
-	struct type **tqe_prev;	/* address of previous next element */	\
-	TRACEBUF							\
-}
-
-/*
- * Tail queue functions.
- */
-#define	TAILQ_CONCAT(head1, head2, field) do {				\
-	if (!TAILQ_EMPTY(head2)) {					\
-		*(head1)->tqh_last = (head2)->tqh_first;		\
-		(head2)->tqh_first->field.tqe_prev = (head1)->tqh_last;	\
-		(head1)->tqh_last = (head2)->tqh_last;			\
-		TAILQ_INIT((head2));					\
-		QMD_TRACE_HEAD(head);					\
-		QMD_TRACE_HEAD(head2);					\
-	}								\
-} while (0)
-
-#define	TAILQ_EMPTY(head)	((head)->tqh_first == NULL)
-
-#define	TAILQ_FIRST(head)	((head)->tqh_first)
-
-#define	TAILQ_FOREACH(var, head, field)					\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var);							\
-	    (var) = TAILQ_NEXT((var), field))
-
-#define	TAILQ_FOREACH_SAFE(var, head, field, tvar)			\
-	for ((var) = TAILQ_FIRST((head));				\
-	    (var) && ((tvar) = TAILQ_NEXT((var), field), 1);		\
-	    (var) = (tvar))
-
-#define	TAILQ_FOREACH_REVERSE(var, head, headname, field)		\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var);							\
-	    (var) = TAILQ_PREV((var), headname, field))
-
-#define	TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar)	\
-	for ((var) = TAILQ_LAST((head), headname);			\
-	    (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1);	\
-	    (var) = (tvar))
-
-#define	TAILQ_INIT(head) do {						\
-	TAILQ_FIRST((head)) = NULL;					\
-	(head)->tqh_last = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-} while (0)
-
-#define	TAILQ_INSERT_AFTER(head, listelm, elm, field) do {		\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    &TAILQ_NEXT((elm), field);				\
-	else {								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	TAILQ_NEXT((listelm), field) = (elm);				\
-	(elm)->field.tqe_prev = &TAILQ_NEXT((listelm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_BEFORE(listelm, elm, field) do {			\
-	(elm)->field.tqe_prev = (listelm)->field.tqe_prev;		\
-	TAILQ_NEXT((elm), field) = (listelm);				\
-	*(listelm)->field.tqe_prev = (elm);				\
-	(listelm)->field.tqe_prev = &TAILQ_NEXT((elm), field);		\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-	QMD_TRACE_ELEM(&listelm->field);				\
-} while (0)
-
-#define	TAILQ_INSERT_HEAD(head, elm, field) do {			\
-	if ((TAILQ_NEXT((elm), field) = TAILQ_FIRST((head))) != NULL)	\
-		TAILQ_FIRST((head))->field.tqe_prev =			\
-		    &TAILQ_NEXT((elm), field);				\
-	else								\
-		(head)->tqh_last = &TAILQ_NEXT((elm), field);		\
-	TAILQ_FIRST((head)) = (elm);					\
-	(elm)->field.tqe_prev = &TAILQ_FIRST((head));			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_INSERT_TAIL(head, elm, field) do {			\
-	TAILQ_NEXT((elm), field) = NULL;				\
-	(elm)->field.tqe_prev = (head)->tqh_last;			\
-	*(head)->tqh_last = (elm);					\
-	(head)->tqh_last = &TAILQ_NEXT((elm), field);			\
-	QMD_TRACE_HEAD(head);						\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-#define	TAILQ_LAST(head, headname)					\
-	(*(((struct headname *)((head)->tqh_last))->tqh_last))
-
-#define	TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)
-
-#define	TAILQ_PREV(elm, headname, field)				\
-	(*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-#define	TAILQ_REMOVE(head, elm, field) do {				\
-	if ((TAILQ_NEXT((elm), field)) != NULL)				\
-		TAILQ_NEXT((elm), field)->field.tqe_prev = 		\
-		    (elm)->field.tqe_prev;				\
-	else {								\
-		(head)->tqh_last = (elm)->field.tqe_prev;		\
-		QMD_TRACE_HEAD(head);					\
-	}								\
-	*(elm)->field.tqe_prev = TAILQ_NEXT((elm), field);		\
-	TRASHIT((elm)->field.tqe_next);					\
-	TRASHIT((elm)->field.tqe_prev);					\
-	QMD_TRACE_ELEM(&(elm)->field);					\
-} while (0)
-
-
-#ifdef _KERNEL
-
-/*
- * XXX insque() and remque() are an old way of handling certain queues.
- * They bogusly assumes that all queue heads look alike.
- */
-
-struct quehead {
-	struct quehead *qh_link;
-	struct quehead *qh_rlink;
-};
-
-#ifdef	__GNUC__
-
-static __inline void
-insque(void *a, void *b)
-{
-	struct quehead *element = (struct quehead *)a,
-		 *head = (struct quehead *)b;
-
-	element->qh_link = head->qh_link;
-	element->qh_rlink = head;
-	head->qh_link = element;
-	element->qh_link->qh_rlink = element;
-}
-
-static __inline void
-remque(void *a)
-{
-	struct quehead *element = (struct quehead *)a;
-
-	element->qh_link->qh_rlink = element->qh_rlink;
-	element->qh_rlink->qh_link = element->qh_link;
-	element->qh_rlink = 0;
-}
-
-#else /* !__GNUC__ */
-
-void	insque(void *a, void *b);
-void	remque(void *a);
-
-#endif /* __GNUC__ */
-
-#endif /* _KERNEL */
-
-#endif /* !_SYS_QUEUE_H_ */
diff --git a/include/sys/sched.h b/include/sys/sched.h
deleted file mode 100644
index 5e85737..0000000
--- a/include/sys/sched.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _SCHED_H
-#define _SCHED_H
-
-int sched_yield();
-
-#endif
-
diff --git a/include/sys/signal.h b/include/sys/signal.h
deleted file mode 100644
index 862f204..0000000
--- a/include/sys/signal.h
+++ /dev/null
@@ -1,358 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)signal.h	8.4 (Berkeley) 5/4/95
- * $FreeBSD: src/sys/sys/signal.h,v 1.42 2003/03/31 23:31:50 jeff Exp $
- */
-
-#ifndef _SYS_SIGNAL_H_
-#define	_SYS_SIGNAL_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-#include <sys/_sigset.h>
-
-#include <machine/signal.h>	/* sig_atomic_t; trap codes; sigcontext */
-
-/*
- * System defined signals.
- */
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGHUP		1	/* hangup */
-#endif
-#define	SIGINT		2	/* interrupt */
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGQUIT		3	/* quit */
-#endif
-#define	SIGILL		4	/* illegal instr. (not reset when caught) */
-#if __XSI_VISIBLE
-#define	SIGTRAP		5	/* trace trap (not reset when caught) */
-#endif
-#define	SIGABRT		6	/* abort() */
-#if __BSD_VISIBLE
-#define	SIGIOT		SIGABRT	/* compatibility */
-#define	SIGEMT		7	/* EMT instruction */
-#endif
-#define	SIGFPE		8	/* floating point exception */
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGKILL		9	/* kill (cannot be caught or ignored) */
-#endif
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-#define	SIGBUS		10	/* bus error */
-#endif
-#define	SIGSEGV		11	/* segmentation violation */
-#if __BSD_VISIBLE
-#define	SIGSYS		12	/* non-existent system call invoked */
-#endif
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGPIPE		13	/* write on a pipe with no one to read it */
-#define	SIGALRM		14	/* alarm clock */
-#endif
-#define	SIGTERM		15	/* software termination signal from kill */
-#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-#define	SIGURG		16	/* urgent condition on IO channel */
-#endif
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGSTOP		17	/* sendable stop signal not from tty */
-#define	SIGTSTP		18	/* stop signal from tty */
-#define	SIGCONT		19	/* continue a stopped process */
-#define	SIGCHLD		20	/* to parent on child stop or exit */
-#define	SIGTTIN		21	/* to readers pgrp upon background tty read */
-#define	SIGTTOU		22	/* like TTIN if (tp->t_local&LTOSTOP) */
-#endif
-#if __BSD_VISIBLE
-#define	SIGIO		23	/* input/output possible signal */
-#endif
-#if __XSI_VISIBLE
-#define	SIGXCPU		24	/* exceeded CPU time limit */
-#define	SIGXFSZ		25	/* exceeded file size limit */
-#define	SIGVTALRM	26	/* virtual time alarm */
-#define	SIGPROF		27	/* profiling time alarm */
-#endif
-#if __BSD_VISIBLE
-#define	SIGWINCH	28	/* window size changes */
-#define	SIGINFO		29	/* information request */
-#endif
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SIGUSR1		30	/* user defined signal 1 */
-#define	SIGUSR2		31	/* user defined signal 2 */
-#endif
-#if __BSD_VISIBLE
-#define	SIGTHR		32	/* Thread interrupt. */
-#endif
-/*
- * XXX missing SIGRTMIN, SIGRTMAX.
- */
-
-#define	SIG_DFL		((__sighandler_t *)0)
-#define	SIG_IGN		((__sighandler_t *)1)
-#define	SIG_ERR		((__sighandler_t *)-1)
-/*
- * XXX missing SIG_HOLD.
- */
-
-/*-
- * Type of a signal handling function.
- *
- * Language spec sez signal handlers take exactly one arg, even though we
- * actually supply three.  Ugh!
- *
- * We don't try to hide the difference by leaving out the args because
- * that would cause warnings about conformant programs.  Nonconformant
- * programs can avoid the warnings by casting to (__sighandler_t *) or
- * sig_t before calling signal() or assigning to sa_handler or sv_handler.
- *
- * The kernel should reverse the cast before calling the function.  It
- * has no way to do this, but on most machines 1-arg and 3-arg functions
- * have the same calling protocol so there is no problem in practice.
- * A bit in sa_flags could be used to specify the number of args.
- */
-typedef	void __sighandler_t(int);
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#ifndef _SIGSET_T_DECLARED
-#define	_SIGSET_T_DECLARED
-typedef	__sigset_t	sigset_t;
-#endif
-#endif
-
-#if __POSIX_VISIBLE >= 199309 || __XSI_VISIBLE >= 500
-union sigval {
-	/* Members as suggested by Annex C of POSIX 1003.1b. */
-	int	sigval_int;
-	void	*sigval_ptr;
-};
-#endif
-
-#if __POSIX_VISIBLE >= 199309
-struct sigevent {
-	int	sigev_notify;		/* Notification type */
-	union {
-		int	__sigev_signo;	/* Signal number */
-		int	__sigev_notify_kqueue;
-	} __sigev_u;
-	union sigval sigev_value;	/* Signal value */
-/*
- * XXX missing sigev_notify_function, sigev_notify_attributes.
- */
-};
-#define	sigev_signo		__sigev_u.__sigev_signo
-#if __BSD_VISIBLE
-#define	sigev_notify_kqueue	__sigev_u.__sigev_notify_kqueue
-#endif
-
-#define	SIGEV_NONE	0		/* No async notification */
-#define	SIGEV_SIGNAL	1		/* Generate a queued signal */
-#if __BSD_VISIBLE
-#define	SIGEV_KEVENT	3		/* Generate a kevent */
-#endif
-/*
- * XXX missing SIGEV_THREAD.
- */
-#endif /* __POSIX_VISIBLE >= 199309 */
-
-#if __POSIX_VISIBLE >= 199309 || __XSI_VISIBLE
-typedef	struct __siginfo {
-	int	si_signo;		/* signal number */
-	int	si_errno;		/* errno association */
-	/*
-	 * Cause of signal, one of the SI_ macros or signal-specific
-	 * values, i.e. one of the FPE_... values for SIGFPE.  This
-	 * value is equivalent to the second argument to an old-style
-	 * FreeBSD signal handler.
-	 */
-	int	si_code;		/* signal code */
-	__pid_t	si_pid;			/* sending process */
-	__uid_t	si_uid;			/* sender's ruid */
-	int	si_status;		/* exit value */
-	void	*si_addr;		/* faulting instruction */
-	union sigval si_value;		/* signal value */
-	long	si_band;		/* band event for SIGPOLL */
-	int	__spare__[7];		/* gimme some slack */
-} siginfo_t;
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-struct __siginfo;
-
-/*
- * Signal vector "template" used in sigaction call.
- */
-struct sigaction {
-	union {
-		void    (*__sa_handler)(int);
-		void    (*__sa_sigaction)(int, struct __siginfo *, void *);
-	} __sigaction_u;		/* signal handler */
-	int	sa_flags;		/* see signal options below */
-	sigset_t sa_mask;		/* signal mask to apply */
-};
-
-#define	sa_handler	__sigaction_u.__sa_handler
-#endif
-
-#if __XSI_VISIBLE
-/* If SA_SIGINFO is set, sa_sigaction must be used instead of sa_handler. */
-#define	sa_sigaction	__sigaction_u.__sa_sigaction
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SA_NOCLDSTOP	0x0008	/* do not generate SIGCHLD on child stop */
-#endif /* __POSIX_VISIBLE || __XSI_VISIBLE */
-
-#if __XSI_VISIBLE
-#define	SA_ONSTACK	0x0001	/* take signal on signal stack */
-#define	SA_RESTART	0x0002	/* restart system call on signal return */
-#define	SA_RESETHAND	0x0004	/* reset to SIG_DFL when taking signal */
-#define	SA_NODEFER	0x0010	/* don't mask the signal we're delivering */
-#define	SA_NOCLDWAIT	0x0020	/* don't keep zombies around */
-#define	SA_SIGINFO	0x0040	/* signal handler with SA_SIGINFO args */
-#endif
-#if __BSD_VISIBLE
-/* XXX dubious. */
-#ifdef COMPAT_SUNOS
-#define	SA_USERTRAMP	0x0100	/* do not bounce off kernel's sigtramp */
-#endif
-#endif
-
-#if __BSD_VISIBLE
-#define	NSIG		32	/* number of old signals (counting 0) */
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-#define	SI_USER		0x10001
-#define	SI_QUEUE	0x10002
-#define	SI_TIMER	0x10003
-#define	SI_ASYNCIO	0x10004
-#define	SI_MESGQ	0x10005
-#endif
-#if __BSD_VISIBLE
-#define	SI_UNDEFINED	0
-#endif
-
-#if __BSD_VISIBLE
-typedef	__sighandler_t	*sig_t;	/* type of pointer to a signal function */
-typedef	void __siginfohandler_t(int, struct __siginfo *, void *);
-#endif
-
-#if __XSI_VISIBLE
-/*
- * Structure used in sigaltstack call.
- */
-#if __BSD_VISIBLE
-typedef	struct sigaltstack {
-#else
-typedef	struct {
-#endif
-	char	*ss_sp;			/* signal stack base */
-	__size_t ss_size;		/* signal stack length */
-	int	ss_flags;		/* SS_DISABLE and/or SS_ONSTACK */
-} stack_t;
-
-#define	SS_ONSTACK	0x0001	/* take signal on alternate stack */
-#define	SS_DISABLE	0x0004	/* disable taking signals on alternate stack */
-#define	SIGSTKSZ	(MINSIGSTKSZ + 32768)	/* recommended stack size */
-#endif
-
-#if __BSD_VISIBLE
-/*
- * 4.3 compatibility:
- * Signal vector "template" used in sigvec call.
- */
-struct sigvec {
-	__sighandler_t *sv_handler;	/* signal handler */
-	int	sv_mask;		/* signal mask to apply */
-	int	sv_flags;		/* see signal options below */
-};
-
-#define	SV_ONSTACK	SA_ONSTACK
-#define	SV_INTERRUPT	SA_RESTART	/* same bit, opposite sense */
-#define	SV_RESETHAND	SA_RESETHAND
-#define	SV_NODEFER	SA_NODEFER
-#define	SV_NOCLDSTOP	SA_NOCLDSTOP
-#define	SV_SIGINFO	SA_SIGINFO
-#define	sv_onstack	sv_flags	/* isn't compatibility wonderful! */
-#endif
-
-/* Keep this in one place only */
-#if defined(_KERNEL) && defined(COMPAT_43) && \
-    !defined(__i386__) && !defined(__alpha__)
-struct osigcontext {
-	int _not_used;
-};
-#endif
-
-#if __XSI_VISIBLE
-/*
- * Structure used in sigstack call.
- */
-struct sigstack {
-	/* XXX ss_sp's type should be `void *'. */
-	char	*ss_sp;			/* signal stack pointer */
-	int	ss_onstack;		/* current status */
-};
-#endif
-
-#if __BSD_VISIBLE || __POSIX_VISIBLE > 0 && __POSIX_VISIBLE <= 200112
-/*
- * Macro for converting signal number to a mask suitable for
- * sigblock().
- */
-#define	sigmask(m)	(1 << ((m)-1))
-#endif
-
-#if __BSD_VISIBLE
-#define	BADSIG		SIG_ERR
-#endif
-
-#if __POSIX_VISIBLE || __XSI_VISIBLE
-/*
- * Flags for sigprocmask:
- */
-#define	SIG_BLOCK	1	/* block specified signal set */
-#define	SIG_UNBLOCK	2	/* unblock specified signal set */
-#define	SIG_SETMASK	3	/* set specified signal set */
-#endif
-
-/*
- * For historical reasons; programs expect signal's return value to be
- * defined by <sys/signal.h>.
- */
-__BEGIN_DECLS
-__sighandler_t *signal(int, __sighandler_t *);
-__END_DECLS
-
-#endif /* !_SYS_SIGNAL_H_ */
diff --git a/include/sys/stat.h b/include/sys/stat.h
deleted file mode 100644
index 585ccd3..0000000
--- a/include/sys/stat.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986, 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)stat.h	8.12 (Berkeley) 6/16/95
- * $FreeBSD: src/sys/sys/stat.h,v 1.37 2003/05/22 17:07:57 mike Exp $
- */
-
-#ifndef _SYS_STAT_H_
-#define	_SYS_STAT_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/* XXX missing blkcnt_t, blksize_t. */
-
-#ifndef _DEV_T_DECLARED
-typedef	__dev_t		dev_t;
-#define	_DEV_T_DECLARED
-#endif
-
-#ifndef _FFLAGS_T_DECLARED
-typedef	__fflags_t	fflags_t;
-#define	_FFLAGS_T_DECLARED
-#endif
-
-#ifndef _GID_T_DECLARED
-typedef	__gid_t		gid_t;
-#define	_GID_T_DECLARED
-#endif
-
-#ifndef _INO_T_DECLARED
-typedef	__ino_t		ino_t;
-#define	_INO_T_DECLARED
-#endif
-
-#ifndef _MODE_T_DECLARED
-typedef	__mode_t	mode_t;
-#define	_MODE_T_DECLARED
-#endif
-
-#ifndef _NLINK_T_DECLARED
-typedef	__nlink_t	nlink_t;
-#define	_NLINK_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef	__off_t		off_t;
-#define	_OFF_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-#ifndef _UID_T_DECLARED
-typedef	__uid_t		uid_t;
-#define	_UID_T_DECLARED
-#endif
-
-#if !defined(_KERNEL) && __BSD_VISIBLE
-/*
- * XXX we need this for struct timespec.  We get miscellaneous namespace
- * pollution with it.
- */
-#include <sys/time.h>
-#endif
-
-#if !__BSD_VISIBLE
-#include <sys/_timespec.h>
-#endif
-
-#if __BSD_VISIBLE
-struct ostat {
-	__uint16_t st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
-	mode_t	  st_mode;		/* inode protection mode */
-	nlink_t	  st_nlink;		/* number of hard links */
-	__uint16_t st_uid;		/* user ID of the file's owner */
-	__uint16_t st_gid;		/* group ID of the file's group */
-	__uint16_t st_rdev;		/* device type */
-	__int32_t st_size;		/* file size, in bytes */
-	struct	timespec st_atimespec;	/* time of last access */
-	struct	timespec st_mtimespec;	/* time of last data modification */
-	struct	timespec st_ctimespec;	/* time of last file status change */
-	__int32_t st_blksize;		/* optimal blocksize for I/O */
-	__int32_t st_blocks;		/* blocks allocated for file */
-	fflags_t  st_flags;		/* user defined flags for file */
-	__uint32_t st_gen;		/* file generation number */
-};
-#endif /* __BSD_VISIBLE */
-
-struct stat {
-	__udev_t  st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
-	mode_t	  st_mode;		/* inode protection mode */
-	nlink_t	  st_nlink;		/* number of hard links */
-	uid_t	  st_uid;		/* user ID of the file's owner */
-	gid_t	  st_gid;		/* group ID of the file's group */
-	__udev_t  st_rdev;		/* device type */
-#if __BSD_VISIBLE
-	struct	timespec st_atimespec;	/* time of last access */
-	struct	timespec st_mtimespec;	/* time of last data modification */
-	struct	timespec st_ctimespec;	/* time of last file status change */
-#else
-	time_t	  st_atime;		/* time of last access */
-	long	  st_atimensec;		/* nsec of last access */
-	time_t	  st_mtime;		/* time of last data modification */
-	long	  st_mtimensec;		/* nsec of last data modification */
-	time_t	  st_ctime;		/* time of last file status change */
-	long	  st_ctimensec;		/* nsec of last file status change */
-#endif
-	off_t	  st_size;		/* file size, in bytes */
-	__int64_t st_blocks;		/* blocks allocated for file */
-	__uint32_t st_blksize;		/* optimal blocksize for I/O */
-	fflags_t  st_flags;		/* user defined flags for file */
-	__uint32_t st_gen;		/* file generation number */
-	__int32_t st_lspare;
-#if __BSD_VISIBLE
-	struct timespec st_birthtimespec; /* time of file creation */
-	/*
-	 * Explicitly pad st_birthtimespec to 16 bytes so that the size of
-	 * struct stat is backwards compatible.  We use bitfields instead
-	 * of an array of chars so that this doesn't require a C99 compiler
-	 * to compile if the size of the padding is 0.  We use 2 bitfields
-	 * to cover up to 64 bits on 32-bit machines.  We assume that
-	 * CHAR_BIT is 8...
-	 */
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-#else
-	time_t	  st_birthtime;		/* time of file creation */
-	long	  st_birthtimensec;	/* nsec of file creation */
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
-#endif
-};
-
-#if __BSD_VISIBLE
-struct nstat {
-	__udev_t st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
-	__uint32_t st_mode;		/* inode protection mode */
-	__uint32_t st_nlink;		/* number of hard links */
-	uid_t	  st_uid;		/* user ID of the file's owner */
-	gid_t	  st_gid;		/* group ID of the file's group */
-	__udev_t st_rdev;		/* device type */
-	struct	timespec st_atimespec;	/* time of last access */
-	struct	timespec st_mtimespec;	/* time of last data modification */
-	struct	timespec st_ctimespec;	/* time of last file status change */
-	off_t	  st_size;		/* file size, in bytes */
-	__int64_t st_blocks;		/* blocks allocated for file */
-	__uint32_t st_blksize;		/* optimal blocksize for I/O */
-	fflags_t  st_flags;		/* user defined flags for file */
-	__uint32_t st_gen;		/* file generation number */
-	struct timespec st_birthtimespec; /* time of file creation */
-	/*
-	 * See above about the following padding.
-	 */
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-};
-#endif
-
-#if __BSD_VISIBLE
-#define st_atime st_atimespec.tv_sec
-#define st_mtime st_mtimespec.tv_sec
-#define st_ctime st_ctimespec.tv_sec
-#define st_birthtime st_birthtimespec.tv_sec
-#endif
-
-#define	S_ISUID	0004000			/* set user id on execution */
-#define	S_ISGID	0002000			/* set group id on execution */
-#if __BSD_VISIBLE
-#define	S_ISTXT	0001000			/* sticky bit */
-#endif
-
-#define	S_IRWXU	0000700			/* RWX mask for owner */
-#define	S_IRUSR	0000400			/* R for owner */
-#define	S_IWUSR	0000200			/* W for owner */
-#define	S_IXUSR	0000100			/* X for owner */
-
-#if __BSD_VISIBLE
-#define	S_IREAD		S_IRUSR
-#define	S_IWRITE	S_IWUSR
-#define	S_IEXEC		S_IXUSR
-#endif
-
-#define	S_IRWXG	0000070			/* RWX mask for group */
-#define	S_IRGRP	0000040			/* R for group */
-#define	S_IWGRP	0000020			/* W for group */
-#define	S_IXGRP	0000010			/* X for group */
-
-#define	S_IRWXO	0000007			/* RWX mask for other */
-#define	S_IROTH	0000004			/* R for other */
-#define	S_IWOTH	0000002			/* W for other */
-#define	S_IXOTH	0000001			/* X for other */
-
-#if __XSI_VISIBLE
-#define	S_IFMT	 0170000		/* type of file mask */
-#define	S_IFIFO	 0010000		/* named pipe (fifo) */
-#define	S_IFCHR	 0020000		/* character special */
-#define	S_IFDIR	 0040000		/* directory */
-#define	S_IFBLK	 0060000		/* block special */
-#define	S_IFREG	 0100000		/* regular */
-#define	S_IFLNK	 0120000		/* symbolic link */
-#define	S_IFSOCK 0140000		/* socket */
-#define	S_ISVTX	 0001000		/* save swapped text even after use */
-#endif
-#if __BSD_VISIBLE
-#define	S_IFWHT  0160000		/* whiteout */
-#endif
-
-#define	S_ISDIR(m)	(((m) & 0170000) == 0040000)	/* directory */
-#define	S_ISCHR(m)	(((m) & 0170000) == 0020000)	/* char special */
-#define	S_ISBLK(m)	(((m) & 0170000) == 0060000)	/* block special */
-#define	S_ISREG(m)	(((m) & 0170000) == 0100000)	/* regular file */
-#define	S_ISFIFO(m)	(((m) & 0170000) == 0010000)	/* fifo or socket */
-#if __POSIX_VISIBLE >= 200112
-#define	S_ISLNK(m)	(((m) & 0170000) == 0120000)	/* symbolic link */
-#define	S_ISSOCK(m)	(((m) & 0170000) == 0140000)	/* socket */
-#endif
-#if __XSI_VISIBLE
-#define	S_ISWHT(m)	(((m) & 0170000) == 0160000)	/* whiteout */
-#endif
-
-#if __BSD_VISIBLE
-#define	ACCESSPERMS	(S_IRWXU|S_IRWXG|S_IRWXO)	/* 0777 */
-							/* 7777 */
-#define	ALLPERMS	(S_ISUID|S_ISGID|S_ISTXT|S_IRWXU|S_IRWXG|S_IRWXO)
-							/* 0666 */
-#define	DEFFILEMODE	(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
-
-#define S_BLKSIZE	512		/* block size used in the stat struct */
-
-/*
- * Definitions of flags stored in file flags word.
- *
- * Super-user and owner changeable flags.
- */
-#define	UF_SETTABLE	0x0000ffff	/* mask of owner changeable flags */
-#define	UF_NODUMP	0x00000001	/* do not dump file */
-#define	UF_IMMUTABLE	0x00000002	/* file may not be changed */
-#define	UF_APPEND	0x00000004	/* writes to file may only append */
-#define UF_OPAQUE	0x00000008	/* directory is opaque wrt. union */
-#define UF_NOUNLINK	0x00000010	/* file may not be removed or renamed */
-/*
- * Super-user changeable flags.
- */
-#define	SF_SETTABLE	0xffff0000	/* mask of superuser changeable flags */
-#define	SF_ARCHIVED	0x00010000	/* file is archived */
-#define	SF_IMMUTABLE	0x00020000	/* file may not be changed */
-#define	SF_APPEND	0x00040000	/* writes to file may only append */
-#define	SF_NOUNLINK	0x00100000	/* file may not be removed or renamed */
-#define	SF_SNAPSHOT	0x00200000	/* snapshot inode */
-
-#ifdef _KERNEL
-/*
- * Shorthand abbreviations of above.
- */
-#define	OPAQUE		(UF_OPAQUE)
-#define	APPEND		(UF_APPEND | SF_APPEND)
-#define	IMMUTABLE	(UF_IMMUTABLE | SF_IMMUTABLE)
-#define	NOUNLINK	(UF_NOUNLINK | SF_NOUNLINK)
-#endif
-
-#endif /* __BSD_VISIBLE */
-
-#ifndef _KERNEL
-__BEGIN_DECLS
-#if __BSD_VISIBLE
-int	chflags(const char *, unsigned long);
-#endif
-int	chmod(const char *, mode_t);
-#if __BSD_VISIBLE
-int	fchflags(int, unsigned long);
-int	fchmod(int, mode_t);
-#endif
-int	fstat(int, struct stat *);
-#if __BSD_VISIBLE
-int	lchflags(const char *, int);
-int	lchmod(const char *, mode_t);
-#endif
-#if __POSIX_VISIBLE >= 200112
-int	lstat(const char *, struct stat *);
-#endif
-int	mkdir(const char *, mode_t);
-int	mkfifo(const char *, mode_t);
-int	stat(const char *, struct stat *);
-mode_t	umask(mode_t);
-__END_DECLS
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_STAT_H_ */
diff --git a/include/sys/sys.h b/include/sys/sys.h
deleted file mode 100644
index 6a23f01..0000000
--- a/include/sys/sys.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sys.h 158 2016-01-19 02:08:13Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _SYS_H
-#define _SYS_H
-
-int execve(char *,char **argv,char **env);
-int pidStatus(int pid);
-void *getPage(int count);
-void *getDrives();
-int getuptime();
-int gettime();
-int startSDE();
-
-#endif
-
diff --git a/include/sys/syslimits.h b/include/sys/syslimits.h
deleted file mode 100644
index 03cf0ee..0000000
--- a/include/sys/syslimits.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- *
- *	@(#)syslimits.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/sys/sys/syslimits.h,v 1.16 2003/09/10 19:08:16 obrien Exp $
- */
-
-#ifndef _SYS_SYSLIMITS_H_
-#define _SYS_SYSLIMITS_H_
-
-#if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_)
-#if __GNUC__
-#warning "No user-serviceable parts inside."
-#endif
-#endif
-
-/*
- * Do not add any new variables here.  (See the comment at the end of
- * the file for why.)
- */
-#define	ARG_MAX			65536	/* max bytes for an exec function */
-#ifndef CHILD_MAX
-#define	CHILD_MAX		   40	/* max simultaneous processes */
-#endif
-#define	LINK_MAX		32767	/* max file link count */
-#define	MAX_CANON		  255	/* max bytes in term canon input line */
-#define	MAX_INPUT		  255	/* max bytes in terminal input */
-#define	NAME_MAX		  255	/* max bytes in a file name */
-#define	NGROUPS_MAX		   16	/* max supplemental group id's */
-#ifndef OPEN_MAX
-#define	OPEN_MAX		   64	/* max open files per process */
-#endif
-#define	PATH_MAX		 1024	/* max bytes in pathname */
-#define	PIPE_BUF		  512	/* max bytes for atomic pipe writes */
-#define	IOV_MAX			 1024	/* max elements in i/o vector */
-
-/*
- * We leave the following values undefined to force applications to either
- * assume conservative values or call sysconf() to get the current value.
- *
- * HOST_NAME_MAX
- *
- * (We should do this for most of the values currently defined here,
- * but many programs are not prepared to deal with this yet.)
- */
-#endif
diff --git a/include/sys/time.h b/include/sys/time.h
deleted file mode 100644
index 1b15b48..0000000
--- a/include/sys/time.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * 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.
- *
- *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * $FreeBSD: src/sys/sys/time.h,v 1.64 2004/02/29 10:55:15 phk Exp $
- */
-
-#ifndef _SYS_TIME_H_
-#define _SYS_TIME_H_
-
-#include <sys/_timeval.h>
-#include <sys/types.h>
-#include <sys/timespec.h>
-
-struct timezone {
-	int	tz_minuteswest;	/* minutes west of Greenwich */
-	int	tz_dsttime;	/* type of dst correction */
-};
-#define	DST_NONE	0	/* not on dst */
-#define	DST_USA		1	/* USA style dst */
-#define	DST_AUST	2	/* Australian style dst */
-#define	DST_WET		3	/* Western European dst */
-#define	DST_MET		4	/* Middle European dst */
-#define	DST_EET		5	/* Eastern European dst */
-#define	DST_CAN		6	/* Canada */
-
-#if __BSD_VISIBLE
-struct bintime {
-	time_t	sec;
-	uInt64 frac;
-};
-
-static __inline void
-bintime_addx(struct bintime *bt, uInt64 x)
-{
-	uInt64 u;
-
-	u = bt->frac;
-	bt->frac += x;
-	if (u > bt->frac)
-		bt->sec++;
-}
-
-static __inline void
-bintime_add(struct bintime *bt, const struct bintime *bt2)
-{
-	uInt64 u;
-
-	u = bt->frac;
-	bt->frac += bt2->frac;
-	if (u > bt->frac)
-		bt->sec++;
-	bt->sec += bt2->sec;
-}
-
-static __inline void
-bintime_sub(struct bintime *bt, const struct bintime *bt2)
-{
-	uInt64 u;
-
-	u = bt->frac;
-	bt->frac -= bt2->frac;
-	if (u < bt->frac)
-		bt->sec--;
-	bt->sec -= bt2->sec;
-}
-
-/*-
- * Background information:
- *
- * When converting between timestamps on parallel timescales of differing
- * resolutions it is historical and scientific practice to round down rather
- * than doing 4/5 rounding.
- *
- *   The date changes at midnight, not at noon.
- *
- *   Even at 15:59:59.999999999 it's not four'o'clock.
- *
- *   time_second ticks after N.999999999 not after N.4999999999
- */
-
-static __inline void
-bintime2timespec(const struct bintime *bt, struct timespec *ts)
-{
-
-	ts->tv_sec = bt->sec;
-	ts->tv_nsec = ((uInt64)1000000000 * (uInt32)(bt->frac >> 32)) >> 32;
-}
-
-static __inline void
-timespec2bintime(const struct timespec *ts, struct bintime *bt)
-{
-
-	bt->sec = ts->tv_sec;
-	/* 18446744073 = int(2^64 / 1000000000) */
-	bt->frac = ts->tv_nsec * (uInt64)18446744073LL; 
-}
-
-static __inline void
-bintime2timeval(const struct bintime *bt, struct timeval *tv)
-{
-
-	tv->tv_sec = bt->sec;
-	tv->tv_usec = ((uInt64)1000000 * (uInt32)(bt->frac >> 32)) >> 32;
-}
-
-static __inline void
-timeval2bintime(const struct timeval *tv, struct bintime *bt)
-{
-
-	bt->sec = tv->tv_sec;
-	/* 18446744073709 = int(2^64 / 1000000) */
-	bt->frac = tv->tv_usec * (uInt64)18446744073709LL;
-}
-#endif /* __BSD_VISIBLE */
-
-#ifdef _KERNEL
-
-/* Operations on timespecs */
-#define	timespecclear(tvp)	((tvp)->tv_sec = (tvp)->tv_nsec = 0)
-#define	timespecisset(tvp)	((tvp)->tv_sec || (tvp)->tv_nsec)
-#define	timespeccmp(tvp, uvp, cmp)					\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
-	    ((tvp)->tv_nsec cmp (uvp)->tv_nsec) :			\
-	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#define timespecadd(vvp, uvp)						\
-	do {								\
-		(vvp)->tv_sec += (uvp)->tv_sec;				\
-		(vvp)->tv_nsec += (uvp)->tv_nsec;			\
-		if ((vvp)->tv_nsec >= 1000000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_nsec -= 1000000000;			\
-		}							\
-	} while (0)
-#define timespecsub(vvp, uvp)						\
-	do {								\
-		(vvp)->tv_sec -= (uvp)->tv_sec;				\
-		(vvp)->tv_nsec -= (uvp)->tv_nsec;			\
-		if ((vvp)->tv_nsec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_nsec += 1000000000;			\
-		}							\
-	} while (0)
-
-/* Operations on timevals. */
-
-#define	timevalclear(tvp)		((tvp)->tv_sec = (tvp)->tv_usec = 0)
-#define	timevalisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timevalcmp(tvp, uvp, cmp)					\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
-	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
-	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-
-/* timevaladd and timevalsub are not inlined */
-
-#endif /* _KERNEL */
-
-#ifndef _KERNEL			/* NetBSD/OpenBSD compatible interfaces */
-
-#define	timerclear(tvp)		((tvp)->tv_sec = (tvp)->tv_usec = 0)
-#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timercmp(tvp, uvp, cmp)					\
-	(((tvp)->tv_sec == (uvp)->tv_sec) ?				\
-	    ((tvp)->tv_usec cmp (uvp)->tv_usec) :			\
-	    ((tvp)->tv_sec cmp (uvp)->tv_sec))
-#define timeradd(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec >= 1000000) {			\
-			(vvp)->tv_sec++;				\
-			(vvp)->tv_usec -= 1000000;			\
-		}							\
-	} while (0)
-#define timersub(tvp, uvp, vvp)						\
-	do {								\
-		(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec;		\
-		(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec;	\
-		if ((vvp)->tv_usec < 0) {				\
-			(vvp)->tv_sec--;				\
-			(vvp)->tv_usec += 1000000;			\
-		}							\
-	} while (0)
-#endif
-
-/*
- * Names of the interval timers, and structure
- * defining a timer setting.
- */
-#define	ITIMER_REAL	0
-#define	ITIMER_VIRTUAL	1
-#define	ITIMER_PROF	2
-
-struct itimerval {
-	struct	timeval it_interval;	/* timer interval */
-	struct	timeval it_value;	/* current value */
-};
-
-/*
- * Getkerninfo clock information structure
- */
-struct clockinfo {
-	int	hz;		/* clock frequency */
-	int	tick;		/* micro-seconds per hz tick */
-	int	spare;
-	int	stathz;		/* statistics clock frequency */
-	int	profhz;		/* profiling clock frequency */
-};
-
-/* CLOCK_REALTIME and TIMER_ABSTIME are supposed to be in time.h */
-
-#ifndef CLOCK_REALTIME
-#define CLOCK_REALTIME	0
-#endif
-#define CLOCK_VIRTUAL	1
-#define CLOCK_PROF	2
-#define CLOCK_MONOTONIC	4
-
-#define TIMER_RELTIME	0x0	/* relative timer */
-#ifndef TIMER_ABSTIME
-#define TIMER_ABSTIME	0x1	/* absolute timer */
-#endif
-
-#ifdef _KERNEL
-extern time_t	time_second;
-extern time_t	time_uptime;
-extern struct timeval boottime;
-
-/*
- * Functions for looking at our clock: [get]{bin,nano,micro}[up]time()
- *
- * Functions without the "get" prefix returns the best timestamp
- * we can produce in the given format.
- *
- * "bin"   == struct bintime  == seconds + 64 bit fraction of seconds.
- * "nano"  == struct timespec == seconds + nanoseconds.
- * "micro" == struct timeval  == seconds + microseconds.
- *              
- * Functions containing "up" returns time relative to boot and
- * should be used for calculating time intervals.
- *
- * Functions without "up" returns GMT time.
- *
- * Functions with the "get" prefix returns a less precise result
- * much faster than the functions without "get" prefix and should
- * be used where a precision of 10 msec is acceptable or where
- * performance is priority. (NB: "precision", _not_ "resolution" !) 
- * 
- */
-
-void	binuptime(struct bintime *bt);
-void	nanouptime(struct timespec *tsp);
-void	microuptime(struct timeval *tvp);
-
-void	bintime(struct bintime *bt);
-void	nanotime(struct timespec *tsp);
-void	microtime(struct timeval *tvp);
-
-void	getbinuptime(struct bintime *bt);
-void	getnanouptime(struct timespec *tsp);
-void	getmicrouptime(struct timeval *tvp);
-
-void	getbintime(struct bintime *bt);
-void	getnanotime(struct timespec *tsp);
-void	getmicrotime(struct timeval *tvp);
-
-/* Other functions */
-int	itimerdecr(struct itimerval *itp, int usec);
-int	itimerfix(struct timeval *tv);
-int	ppsratecheck(struct timeval *, int *, int);
-int	ratecheck(struct timeval *, const struct timeval *);
-void	timevaladd(struct timeval *t1, const struct timeval *t2);
-void	timevalsub(struct timeval *t1, const struct timeval *t2);
-int	tvtohz(struct timeval *tv);
-#else /* !_KERNEL */
-#include <time.h>
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int	adjtime(const struct timeval *, struct timeval *);
-int	futimes(int, const struct timeval *);
-int	getitimer(int, struct itimerval *);
-int	gettimeofday(struct timeval *, struct timezone *);
-int	lutimes(const char *, const struct timeval *);
-int	setitimer(int, const struct itimerval *, struct itimerval *);
-int	settimeofday(const struct timeval *, const struct timezone *);
-int	utimes(const char *, const struct timeval *);
-__END_DECLS
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_TIME_H_ */
diff --git a/include/sys/timespec.h b/include/sys/timespec.h
deleted file mode 100644
index 0cc0212..0000000
--- a/include/sys/timespec.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.
- *
- *	@(#)time.h	8.5 (Berkeley) 5/4/95
- * from: FreeBSD: src/sys/sys/time.h,v 1.43 2000/03/20 14:09:05 phk Exp
- *	$FreeBSD: src/sys/sys/timespec.h,v 1.2 2002/08/21 16:20:01 mike Exp $
- */
-
-/*
- * Prerequisites: <sys/cdefs.h>, <sys/_types.h>
- */
-
-#ifndef _SYS_TIMESPEC_H_
-#define _SYS_TIMESPEC_H_
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-struct timespec {
-	time_t	tv_sec;		/* seconds */
-	long	tv_nsec;	/* and nanoseconds */
-};
-
-#if __BSD_VISIBLE
-#define	TIMEVAL_TO_TIMESPEC(tv, ts)					\
-	do {								\
-		(ts)->tv_sec = (tv)->tv_sec;				\
-		(ts)->tv_nsec = (tv)->tv_usec * 1000;			\
-	} while (0)
-#define	TIMESPEC_TO_TIMEVAL(tv, ts)					\
-	do {								\
-		(tv)->tv_sec = (ts)->tv_sec;				\
-		(tv)->tv_usec = (ts)->tv_nsec / 1000;			\
-	} while (0)
-
-#endif /* __BSD_VISIBLE */
-
-#endif /* _SYS_TIMESPEC_H_ */
diff --git a/include/sys/types.h b/include/sys/types.h
deleted file mode 100644
index 2451195..0000000
--- a/include/sys/types.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: types.h 89 2016-01-12 00:20:40Z reddawg $
-
-**************************************************************************************/
-
-#ifndef TYPES_H
-#define TYPES_H
-
-#include <wchar.h>
-
-
-
-/**** NEW TYPEDEFS ****/
-#ifndef _INTPTR_T_DECLARED
-typedef __intptr_t      intptr_t;
-typedef __uintptr_t     uintptr_t;
-#define _INTPTR_T_DECLARED
-#endif
-
-#ifndef _OFF_T_DECLARED
-typedef __off_t         off_t;
-#define _OFF_T_DECLARED
-#endif
-
-#ifndef _SSIZE_T_DECLARED
-typedef __ssize_t       ssize_t;
-#define _SSIZE_T_DECLARED
-#endif
-
-#ifndef _UINT64_T_DECLARED
-typedef __uint64_t      uInt64;
-#define _UINT64_T_DECLARED
-#endif
-
-#ifndef _INT32_T_DECLARED
-typedef __int32_t       int32_t;
-#define _INT32_T_DECLARED
-#endif
-
-#ifndef _INT64_T_DECLARED
-typedef __int64_t       int64_t;
-#define _INT64_T_DECLARED
-#endif
-
-
-/**** END ****/
-
-typedef unsigned char   u_char;
-typedef unsigned int    u_int;
-
-typedef unsigned short uShort;
-typedef unsigned long  uLong;
-typedef unsigned char  uChar;
-typedef unsigned int   uInt;
-
-typedef unsigned char  uInt8;
-typedef unsigned short uInt16;
-typedef unsigned int  uInt32;
-
-typedef long long int quad_t;
-typedef unsigned long long int u_quad_t;
- 
-#ifndef NULL
-#define NULL 0x0
-#endif
-
-#ifndef NOBOOL
-typedef enum { FALSE=0,TRUE=1 } bool;
-#endif
-
-
-
-#endif
diff --git a/include/sys/ucred.h b/include/sys/ucred.h
deleted file mode 100644
index b8c1a6b..0000000
--- a/include/sys/ucred.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- *
- *	@(#)ucred.h	8.4 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/sys/ucred.h,v 1.48 2003/11/12 15:07:18 bde Exp $
- */
-
-#ifndef _SYS_UCRED_H_
-#define	_SYS_UCRED_H_
-
-/*
- * Credentials.
- *
- * Please do not inspect cr_uid directly to determine superuserness.
- * Only the suser() or suser_cred() function should be used for this.
- */
-#if defined(_KERNEL) || defined(_WANT_UCRED)
-struct ucred {
-	uInt32	cr_ref;			/* reference count */
-#define	cr_startcopy cr_uid
-	uid_t	cr_uid;			/* effective user id */
-	uid_t	cr_ruid;		/* real user id */
-	uid_t	cr_svuid;		/* saved user id */
-	short	cr_ngroups;		/* number of groups */
-	gid_t	cr_groups[NGROUPS];	/* groups */
-	gid_t	cr_rgid;		/* real group id */
-	gid_t	cr_svgid;		/* saved user id */
-	struct uidinfo	*cr_uidinfo;	/* per euid resource consumption */
-	struct uidinfo	*cr_ruidinfo;	/* per ruid resource consumption */
-	struct prison	*cr_prison;	/* jail(2) */
-#define	cr_endcopy	cr_label
-	struct label	*cr_label;	/* MAC label */
-	struct mtx	*cr_mtxp;      	/* protect refcount */
-};
-#define	NOCRED	((struct ucred *)0)	/* no credential available */
-#define	FSCRED	((struct ucred *)-1)	/* filesystem credential */
-#endif /* _KERNEL || _WANT_UCRED */
-
-/*
- * This is the external representation of struct ucred.
- */
-struct xucred {
-	uInt32	cr_version;		/* structure layout version */
-	uid_t	cr_uid;			/* effective user id */
-	short	cr_ngroups;		/* number of groups */
-	gid_t	cr_groups[NGROUPS];	/* groups */
-	void	*_cr_unused1;		/* compatibility with old ucred */
-};
-#define	XUCRED_VERSION	0
-
-/* This can be used for both ucred and xucred structures. */
-#define	cr_gid cr_groups[0]
-
-#ifdef _KERNEL
-struct thread;
-
-void	change_egid(struct ucred *newcred, gid_t egid);
-void	change_euid(struct ucred *newcred, struct uidinfo *euip);
-void	change_rgid(struct ucred *newcred, gid_t rgid);
-void	change_ruid(struct ucred *newcred, struct uidinfo *ruip);
-void	change_svgid(struct ucred *newcred, gid_t svgid);
-void	change_svuid(struct ucred *newcred, uid_t svuid);
-void	crcopy(struct ucred *dest, struct ucred *src);
-struct ucred	*crdup(struct ucred *cr);
-#ifdef DIAGNOSTIC
-void	cred_free_thread(struct thread *td);
-#endif
-void	cred_update_thread(struct thread *td);
-void	crfree(struct ucred *cr);
-struct ucred	*crget(void);
-struct ucred	*crhold(struct ucred *cr);
-int	crshared(struct ucred *cr);
-void	cru2x(struct ucred *cr, struct xucred *xcr);
-int	groupmember(gid_t gid, struct ucred *cred);
-#endif /* _KERNEL */
-
-#endif /* !_SYS_UCRED_H_ */
diff --git a/include/time.h b/include/time.h
deleted file mode 100644
index 2b05e1b..0000000
--- a/include/time.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)time.h	8.3 (Berkeley) 1/21/94
- */
-
-/*
- * $FreeBSD: src/include/time.h,v 1.31 2003/12/07 21:10:06 marcel Exp $
- */
-
-#ifndef _TIME_H_
-#define	_TIME_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-
-#if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 || __BSD_VISIBLE
-/*
- * Frequency of the clock ticks reported by times().  Deprecated - use
- * sysconf(_SC_CLK_TCK) instead.  (Removed in 1003.1-2001.)
- */
-#define	CLK_TCK		128
-#endif
-
-/* Frequency of the clock ticks reported by clock().  */
-#define	CLOCKS_PER_SEC	128
-
-#ifndef _CLOCK_T_DECLARED
-typedef	__clock_t	clock_t;
-#define	_CLOCK_T_DECLARED
-#endif
-
-#ifndef _TIME_T_DECLARED
-typedef	__time_t	time_t;
-#define	_TIME_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#if __POSIX_VISIBLE >= 199309
-/*
- * New in POSIX 1003.1b-1993.
- */
-#ifndef _CLOCKID_T_DECLARED
-typedef	__clockid_t	clockid_t;
-#define	_CLOCKID_T_DECLARED
-#endif
-
-#ifndef _TIMER_T_DECLARED
-typedef	__timer_t	timer_t;
-#define	_TIMER_T_DECLARED
-#endif
-
-#include <sys/timespec.h>
-#endif /* __POSIX_VISIBLE >= 199309 */
-
-struct tm {
-	int	tm_sec;		/* seconds after the minute [0-60] */
-	int	tm_min;		/* minutes after the hour [0-59] */
-	int	tm_hour;	/* hours since midnight [0-23] */
-	int	tm_mday;	/* day of the month [1-31] */
-	int	tm_mon;		/* months since January [0-11] */
-	int	tm_year;	/* years since 1900 */
-	int	tm_wday;	/* days since Sunday [0-6] */
-	int	tm_yday;	/* days since January 1 [0-365] */
-	int	tm_isdst;	/* Daylight Savings Time flag */
-	long	tm_gmtoff;	/* offset from UTC in seconds */
-	char	*tm_zone;	/* timezone abbreviation */
-};
-
-#if __POSIX_VISIBLE
-extern char *tzname[];
-#endif
-
-__BEGIN_DECLS
-char *asctime(const struct tm *);
-clock_t clock(void);
-char *ctime(const time_t *);
-double difftime(time_t, time_t);
-struct tm *gmtime(const time_t *);
-struct tm *localtime(const time_t *);
-time_t mktime(struct tm *);
-size_t strftime(char * __restrict, size_t, const char * __restrict,
-    const struct tm * __restrict);
-time_t time(time_t *);
-
-#if __POSIX_VISIBLE
-void tzset(void);
-#endif
-
-#if __POSIX_VISIBLE >= 199309
-int clock_getres(clockid_t, struct timespec *);
-int clock_gettime(clockid_t, struct timespec *);
-int clock_settime(clockid_t, const struct timespec *);
-int nanosleep(const struct timespec *, struct timespec *);
-#endif /* __POSIX_VISIBLE >= 199309 */
-
-#if __POSIX_VISIBLE >= 199506
-char *asctime_r(const struct tm *, char *);
-char *ctime_r(const time_t *, char *);
-struct tm *gmtime_r(const time_t *, struct tm *);
-struct tm *localtime_r(const time_t *, struct tm *);
-#endif
-
-#if __XSI_VISIBLE
-char *strptime(const char * __restrict, const char * __restrict,
-    struct tm * __restrict);
-#endif
-
-#if __BSD_VISIBLE
-char *timezone(int, int);
-void tzsetwall(void);
-time_t timelocal(struct tm * const);
-time_t timegm(struct tm * const);
-#endif /* __BSD_VISIBLE */
-__END_DECLS
-
-#endif /* !_TIME_H_ */
diff --git a/include/unistd.h b/include/unistd.h
deleted file mode 100644
index 931c9c0..0000000
--- a/include/unistd.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: unistd.h 88 2016-01-12 00:11:29Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _UNISTD_H
-#define _UNISTD_H
-
-#include <sys/types.h>
-#include <fcntl.h>
-
-#ifndef _GETOPT_DECLARED
-#define _GETOPT_DECLARED
-int      getopt(int, char * const [], const char *);
-extern char *optarg;                    /* getopt(3) external variables */
-extern int optind, opterr, optopt;
-#endif /* _GETOPT_DECLARED */
-
-ssize_t  write(int, const void *, size_t);
-off_t    lseek(int, off_t, int);
-
-#ifndef _GID_T_DECLARED
-typedef __gid_t         gid_t;
-#define _GID_T_DECLARED
-#endif
-
-
-#ifndef _UID_T_DECLARED
-typedef __uid_t         uid_t;
-#define _UID_T_DECLARED
-#endif
-
-
-/**** END ****/
-
-
-uShort getpid(void);
-pid_t fork();
-
-//New Functions Added Belong Under Here
-char *getcwd(char *buffer,uInt32 size);
-int  setuid(int);
-int  setgid(int);
-int  getuid(void);
-int  getgid(void);
-int  chdir(const char *path);
-int unlink(const char *path);
-
-#endif
diff --git a/include/wchar.h b/include/wchar.h
deleted file mode 100644
index cc1bbce..0000000
--- a/include/wchar.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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/include/wchar.h,v 1.36 2003/12/07 21:10:06 marcel Exp $
- */
-
-/*-
- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Julian Coleman.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- *	$NetBSD: wchar.h,v 1.8 2000/12/22 05:31:42 itojun Exp $
- */
-
-#ifndef _WCHAR_H_
-#define _WCHAR_H_
-
-#include <sys/cdefs.h>
-#include <sys/_null.h>
-#include <sys/_types.h>
-#include <machine/_limits.h>
-
-#ifndef _MBSTATE_T_DECLARED
-typedef	__mbstate_t	mbstate_t;
-#define	_MBSTATE_T_DECLARED
-#endif
-
-#ifndef _SIZE_T_DECLARED
-typedef	__size_t	size_t;
-#define	_SIZE_T_DECLARED
-#endif
-
-#ifndef	__cplusplus
-#ifndef _WCHAR_T_DECLARED
-typedef	__wchar_t	wchar_t;
-#define	_WCHAR_T_DECLARED
-#endif
-#endif
-
-#ifndef _WINT_T_DECLARED
-typedef	__wint_t	wint_t;
-#define	_WINT_T_DECLARED
-#endif
-
-#ifndef	WCHAR_MIN 
-#define	WCHAR_MIN	__INT_MIN
-#define	WCHAR_MAX	__INT_MAX
-#endif
-
-#ifndef WEOF
-#define	WEOF 	((wint_t)-1)
-#endif
-
-struct __sFILE;
-struct tm;
-
-__BEGIN_DECLS
-wint_t	btowc(int);
-wint_t	fgetwc(struct __sFILE *);
-wchar_t	*
-	fgetws(wchar_t * __restrict, int, struct __sFILE * __restrict);
-wint_t	fputwc(wchar_t, struct __sFILE *);
-int	fputws(const wchar_t * __restrict, struct __sFILE * __restrict);
-int	fwide(struct __sFILE *, int);
-int	fwprintf(struct __sFILE * __restrict, const wchar_t * __restrict, ...);
-int	fwscanf(struct __sFILE * __restrict, const wchar_t * __restrict, ...);
-wint_t	getwc(struct __sFILE *);
-wint_t	getwchar(void);
-size_t	mbrlen(const char * __restrict, size_t, mbstate_t * __restrict);
-size_t	mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-	    mbstate_t * __restrict);
-int	mbsinit(const mbstate_t *);
-size_t	mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t,
-	    mbstate_t * __restrict);
-wint_t	putwc(wchar_t, struct __sFILE *);
-wint_t	putwchar(wchar_t);
-int	swprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict,
-	    ...);
-int	swscanf(const wchar_t * __restrict, const wchar_t * __restrict, ...);
-wint_t	ungetwc(wint_t, struct __sFILE *);
-int	vfwprintf(struct __sFILE * __restrict, const wchar_t * __restrict,
-	    __va_list);
-int	vswprintf(wchar_t * __restrict, size_t n, const wchar_t * __restrict,
-	    __va_list);
-int	vwprintf(const wchar_t * __restrict, __va_list);
-size_t	wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-wchar_t	*wcscat(wchar_t * __restrict, const wchar_t * __restrict);
-wchar_t	*wcschr(const wchar_t *, wchar_t);
-int	wcscmp(const wchar_t *, const wchar_t *);
-int	wcscoll(const wchar_t *, const wchar_t *);
-wchar_t	*wcscpy(wchar_t * __restrict, const wchar_t * __restrict);
-size_t	wcscspn(const wchar_t *, const wchar_t *);
-size_t	wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict,
-	    const struct tm * __restrict);
-size_t	wcslen(const wchar_t *);
-wchar_t	*wcsncat(wchar_t * __restrict, const wchar_t * __restrict,
-	    size_t);
-int	wcsncmp(const wchar_t *, const wchar_t *, size_t);
-wchar_t	*wcsncpy(wchar_t * __restrict , const wchar_t * __restrict, size_t);
-wchar_t	*wcspbrk(const wchar_t *, const wchar_t *);
-wchar_t	*wcsrchr(const wchar_t *, wchar_t);
-size_t	wcsrtombs(char * __restrict, const wchar_t ** __restrict, size_t,
-	    mbstate_t * __restrict);
-size_t	wcsspn(const wchar_t *, const wchar_t *);
-wchar_t	*wcsstr(const wchar_t * __restrict, const wchar_t * __restrict);
-size_t	wcsxfrm(wchar_t * __restrict, const wchar_t * __restrict, size_t);
-int	wctob(wint_t);
-double	wcstod(const wchar_t * __restrict, wchar_t ** __restrict);
-wchar_t	*wcstok(wchar_t * __restrict, const wchar_t * __restrict,
-	    wchar_t ** __restrict);
-long	 wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int);
-unsigned long
-	 wcstoul(const wchar_t * __restrict, wchar_t ** __restrict, int);
-wchar_t	*wmemchr(const wchar_t *, wchar_t, size_t);
-int	wmemcmp(const wchar_t *, const wchar_t *, size_t);
-wchar_t	*wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t);
-wchar_t	*wmemmove(wchar_t *, const wchar_t *, size_t);
-wchar_t	*wmemset(wchar_t *, wchar_t, size_t);
-int	wprintf(const wchar_t * __restrict, ...);
-int	wscanf(const wchar_t * __restrict, ...);
-
-#if __ISO_C_VISIBLE >= 1999
-int	vfwscanf(struct __sFILE * __restrict, const wchar_t * __restrict,
-	    __va_list);
-int	vswscanf(const wchar_t * __restrict, const wchar_t * __restrict,
-	    __va_list);
-int	vwscanf(const wchar_t * __restrict, __va_list);
-float	wcstof(const wchar_t * __restrict, wchar_t ** __restrict);
-long double
-	wcstold(const wchar_t * __restrict, wchar_t ** __restrict);
-#ifdef __LONG_LONG_SUPPORTED
-/* LONGLONG */
-long long
-	wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int);
-/* LONGLONG */
-unsigned long long
-	 wcstoull(const wchar_t * __restrict, wchar_t ** __restrict, int);
-#endif
-#endif	/* __ISO_C_VISIBLE >= 1999 */
-
-#if __XSI_VISIBLE
-int	wcswidth(const wchar_t *, size_t);
-int	wcwidth(wchar_t);
-#endif
-
-#if __BSD_VISIBLE
-size_t	wcslcat(wchar_t *, const wchar_t *, size_t);
-size_t	wcslcpy(wchar_t *, const wchar_t *, size_t);
-#endif
-__END_DECLS
-
-#endif /* !_WCHAR_H_ */
diff --git a/lib/Makefile b/lib/Makefile
deleted file mode 100644
index 1d10476..0000000
--- a/lib/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: Makefile 121 2016-01-14 03:18:20Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-all: csu-code ubix_api-code libc_old-code ubix-code #libc-code# libcpp-code
-# bin tools
-# depend kernel tools
-
-csu-code: csu
-	(cd csu;make)
-
-ubix_api-code: ubix_api
-	(cd ubix_api;make)
-
-libc_old-code: libc_old
-	(cd libc_old;make)
-
-libc-code: libc
-	(cd libc;make)
-
-objgfx40: src
-	(cd objgfx40;make)
-
-views: src
-	(cd src/lib/views/sunlight;make)
-
-ubix-code: ubix
-	(cd ubix;make)
-
-libcpp-code: libcpp
-	(cd libcpp;make)
-
-bin: src
-	(cd src/bin;make)
-
-libstdc++: src
-	(cd src/lib/libstdc++;make)
-
-tools: src
-	(cd src/tools;make)
-
-install:
-	(cd src/sys;make install)
-	
-clean:
-	#(cd src/sys;make clean)
-	(cd csu;make clean)
-	(cd ubix_api;make clean)
-	(cd libc_old;make clean)
-	(cd libc;make clean)
-	(cd ubix;make clean)
diff --git a/lib/Makefile.incl b/lib/Makefile.incl
deleted file mode 100644
index c2b1de8..0000000
--- a/lib/Makefile.incl
+++ /dev/null
@@ -1,11 +0,0 @@
-# $Id: Makefile.inc 103 2016-01-12 05:32:24Z reddawg $
-# 'lib' options
-
-LDFLAGS = -Bshareable
-#CFLAGS = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Wall -Wno-format-y2k -Wno-uninitialized
-CFLAGS = -m32 -fno-builtin -Wno-uninitialized -O2 -fno-strict-aliasing -pipe 
-
-INCLUDES = -I../include -I../../../include -I../i386 -I../include
-
-INCLUDES = -I${INCLUDE}
-CFLAGS = -m32 ${WFLAGS} -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -O
diff --git a/lib/csu/Makefile b/lib/csu/Makefile
deleted file mode 100644
index 7d1f627..0000000
--- a/lib/csu/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-.include <ubix.own.mk>
-
-CSU_MACHINE_ARCH?=      ${MACHINE_ARCH}
-CSU_MACHINE_CPU?=       ${MACHINE_CPU}
-
-.if !empty(CSU_MACHINE_ARCH:Mearm*)
-ARCHDIR:=       ${.CURDIR}/arch/earm
-.elif exists(${.CURDIR}/arch/${CSU_MACHINE_ARCH}/Makefile.incl)
-ARCHDIR:=       ${.CURDIR}/arch/${CSU_MACHINE_ARCH}
-.elif exists(${.CURDIR}/arch/${CSU_MACHINE_CPU}/Makefile.incl)
-ARCHDIR:=       ${.CURDIR}/arch/${CSU_MACHINE_CPU}
-.else
-.error Architecture (${CSU_MACHINE_ARCH} or ${CSU_MACHINE_CPU}) unsupported
-.endif
-
-
-.PATH:  ${ARCHDIR}
-.include "${ARCHDIR}/Makefile.incl"
-.include "${.CURDIR}/common/Makefile.incl"
diff --git a/lib/csu/Makefile.old b/lib/csu/Makefile.old
deleted file mode 100644
index 27f9265..0000000
--- a/lib/csu/Makefile.old
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: Makefile 141 2016-01-17 02:05:18Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-.include <ubix.own.mk>
-
-# Include Global 'Source' Options
-#include ../../Makefile.incl
-#include ../Makefile.incl
-
-CFLAGS = -m32 -nostdlib -nostdinc -fno-builtin -Wno-uninitialized -O2 -fno-strict-aliasing -pipe -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls
-#-DGCRT
-
-INCLUDES+= -I../libc/include
-# -I../../include.new
-
-#Objects
-OBJS = crtn.o crti.o crt1.o crtbrand.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/csu/arch/i386/Makefile.incl b/lib/csu/arch/i386/Makefile.incl
deleted file mode 100644
index 07c4bae..0000000
--- a/lib/csu/arch/i386/Makefile.incl
+++ /dev/null
@@ -1 +0,0 @@
-CPPFLAGS+=      -DELFSIZE=32
diff --git a/lib/csu/arch/i386/crt1.c b/lib/csu/arch/i386/crt1.c
deleted file mode 100644
index 6cdb2a8..0000000
--- a/lib/csu/arch/i386/crt1.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* LINTLIBRARY */
-/*-
- * Copyright 1996-1998 John D. Polstra.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#ifndef lint
-#ifndef __GNUC__
-#error "GCC is needed to compile this file"
-#endif
-#endif /* lint */
-
-#include <stdlib.h>
-
-#include "libc_private.h"
-#include "crtbrand.c"
-
-extern int _DYNAMIC;
-#pragma weak _DYNAMIC
-
-typedef void (*fptr)(void);
-
-extern void _fini(void);
-extern void _init(void);
-extern int main(int, char **, char **);
-extern void _start(char *, ...);
-
-#ifdef GCRT
-extern void _mcleanup(void);
-extern void monstartup(void *, void *);
-extern int eprol;
-extern int etext;
-#endif
-
-char **environ;
-const char *__progname = "";
-
-static __inline fptr
-get_rtld_cleanup(void)
-{
-	fptr retval;
-
-#ifdef	__GNUC__
-	__asm__("movl %%edx,%0" : "=rm"(retval));
-#else
-	retval = (fptr)0; /* XXXX Fix this for other compilers */
-#endif
-	return(retval);
-}
-
-/* The entry function. */
-void
-_start(char *ap, ...)
-{
-	fptr cleanup;
-	int argc;
-	char **argv;
-	char **env;
-	const char *s;
-
-#ifdef __GNUC__
-	__asm__("and $0xfffffff0,%esp");
-#endif
-	cleanup = get_rtld_cleanup();
-	argv = &ap;
-	argc = *(long *)(void *)(argv - 1);
-	env = argv + argc + 1;
-	environ = env;
-
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
-
-	if (&_DYNAMIC != NULL)
-		atexit(cleanup);
-	else
-		_init_tls();
-
-#ifdef GCRT
-	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
-	monstartup(&eprol, &etext);
-#endif
-	_init();
-	exit( main(argc, argv, env) );
-}
-
-#ifdef GCRT
-__asm__(".text");
-__asm__("eprol:");
-__asm__(".previous");
-#endif
-
-__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.14 2005/05/19 07:36:07 dfr Exp $\"");
diff --git a/lib/csu/arch/i386/crtbrand.c b/lib/csu/arch/i386/crtbrand.c
deleted file mode 100644
index f17a450..0000000
--- a/lib/csu/arch/i386/crtbrand.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright 2000 David E. O'Brien, John D. Polstra.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-
-#define ABI_VENDOR	"UbixOS"
-#define ABI_SECTION	".note.ABI-tag"
-#define ABI_NOTETYPE	1
-
-/*
- * Special ".note" entry specifying the ABI version.  See
- * http://www.netbsd.org/Documentation/kernel/elf-notes.html
- * for more information.
- */
-static const struct {
-    int32_t	namesz;
-    int32_t	descsz;
-    int32_t	type;
-    char	name[sizeof ABI_VENDOR];
-    int32_t	desc;
-} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __unused = {
-    sizeof ABI_VENDOR,
-    sizeof(int32_t),
-    ABI_NOTETYPE,
-    ABI_VENDOR,
-    __UbixOS_version
-};
diff --git a/lib/csu/arch/i386/crti.S b/lib/csu/arch/i386/crti.S
deleted file mode 100644
index ff895cb..0000000
--- a/lib/csu/arch/i386/crti.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright 1996, 1997, 1998, 2000 John D. Polstra.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-	.section .init,"ax",@progbits
-	.align	4
-	.globl	_init
-	.type	_init,@function
-_init:
-	sub	$12,%esp	/* re-align stack pointer */
-
-	.section .fini,"ax",@progbits
-	.align	4
-	.globl	_fini
-	.type	_fini,@function
-_fini:
-	sub	$12,%esp	/* re-align stack pointer */
-
-	.section .rodata
-.ascii "$FreeBSD: src/lib/csu/i386-elf/crti.S,v 1.7 2005/05/19 07:31:06 dfr Exp $\0"
diff --git a/lib/csu/arch/i386/crtn.S b/lib/csu/arch/i386/crtn.S
deleted file mode 100644
index 8e820e3..0000000
--- a/lib/csu/arch/i386/crtn.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright 1996, 1997, 1998, 2000 John D. Polstra.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-	.section .init,"ax",@progbits
-	add	$12,%esp
-	ret
-
-	.section .fini,"ax",@progbits
-	add	$12,%esp
-	ret
-
-	.section .rodata
-.ascii "$FreeBSD: src/lib/csu/i386-elf/crtn.S,v 1.6 2005/05/19 07:31:06 dfr Exp $\0"
diff --git a/lib/csu/common/Makefile.incl b/lib/csu/common/Makefile.incl
deleted file mode 100644
index 61b5e02..0000000
--- a/lib/csu/common/Makefile.incl
+++ /dev/null
@@ -1,131 +0,0 @@
-.include <ubix.own.mk>
-
-PICFLAGS ?= -fPIC
-
-COMMON_DIR:=    ${.CURDIR}/common
-.PATH:          ${COMMON_DIR}
-
-CPPFLAGS+=      -I${UBIXSRCDIR}/libexec/ld.elf_so -I${COMMON_DIR} -I.
-
-OBJS+=          crt1.o gcrt0.o crti.o crtn.o
-OBJS+=          crtbegin.o crtend.o
-
-.if defined(${MKPIC}) && ${MKPIC} == "yes"
-OBJS+=          crtbeginS.o
-CFLAGS.crtbegin.c+= -fPIE
-.endif
-.if ${MACHINE_ARCH} == "alpha"
-OBJS+=          crtfm.o
-.endif
-
-.if ${CSU_MACHINE_ARCH} == "sparc64"
-# create helper objects for the compiler to mark compiler memory models
-.for m in medlow medmid medany
-sparc_mc${m}.o: compident.S sysident_assym.h
-        ${CC} ${ASFLAGS} -I. -DCONTENT=\"${m}\\0\\0\" -DCONTENTLENGTH=8 -c \
-                -o $@ ${COMMON_DIR}/compident.S
-.endfor
-OBJS += sparc_mcmedlow.o sparc_mcmedmid.o sparc_mcmedany.o
-.endif
-
-realall: ${OBJS}
-
-.if exists(${ARCHDIR}/crtbegin.S)
-crtbegin.o: crtbegin.S
-        ${_MKTARGET_COMPILE}
-        ${COMPILE.S} ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o
-.else
-crtbegin.o: crtbegin.c crtbegin.h
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${CFLAGS.crtbegin.c} ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
-.endif
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
-	rm -f ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-.if exists(${ARCHDIR}/crtbegin.S)
-crtbeginS.o: crtbegin.S
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${PICFLAGS} -DSHARED ${ARCHDIR}/crtbegin.S -o ${.TARGET}.o
-.else
-crtbeginS.o: crtbegin.c crtbegin.h
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${PICFLAGS} -DSHARED ${COMMON_DIR}/crtbegin.c -o ${.TARGET}.o
-.endif
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
-	rm -f ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-crtend.o: crtend.S
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${ARCHDIR}/crtend.S -o ${.TARGET}.o
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
-	rm -f ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-.if ${MKPIC} != "no"
-MY_PICFLAGS=    ${PICFLAGS}
-.else
-MY_PICFLAGS=
-.endif
-
-crt0.o: crt0.S crt0-common.c
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${ARCHDIR}/crt0.S -o ${.TARGET}.S.o
-	${COMPILE.c} ${MY_PICFLAGS} ${COMMON_DIR}/crt0-common.c -o ${.TARGET}.c.o
-	${LD} -r -o ${.TARGET}.o ${.TARGET}.S.o ${.TARGET}.c.o
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
-	rm -f ${.TARGET}.S.o ${.TARGET}.c.o ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-gcrt0.o: crt0.S crt0-common.c
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${ARCHDIR}/crt0.S -o ${.TARGET}.S.o
-	${COMPILE.c} ${MY_PICFLAGS} -DMCRT0 ${COMMON_DIR}/crt0-common.c -o ${.TARGET}.c.o
-	${LD} -r -o ${.TARGET}.o ${.TARGET}.S.o ${.TARGET}.c.o
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
-	rm -f ${.TARGET}.S.o ${.TARGET}.c.o ${.TARGET}.o
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-.if ${MACHINE_ARCH} == "alpha"
-# can't do this in Makefile.inc otherwise it will before realall:
-crtfm.o: crtfm.c
-        ${_MKTARGET_COMPILE}
-        ${COMPILE.c} ${.ALLSRC} -o ${.TARGET}.o
-        ${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}.o ${.TARGET}
-        rm -f ${.TARGET}.o
-.endif
-
-GENASSYM_CONF=  ${COMMON_DIR}/sysident_assym.cf
-sysident_assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} ${UBIXSRCDIR}/sys/sys/param.h
-	${_MKTARGET_CREATE}
-	cat ${COMMON_DIR}/sysident_assym.cf | \
-	    ${TOOL_GENASSYM} -- ${CC} ${CFLAGS:N-Wa,*} ${CPPFLAGS} ${PROF} \
-	    ${GENASSYM_CPPFLAGS} > sysident_assym.h.tmp && \
-	mv -f sysident_assym.h.tmp sysident_assym.h
-
-CLEANFILES+=    sysident_assym.h
-
-crti.o: crti.S sysident_assym.h sysident.S
-crtn.o: crtn.S
-
-FILES=${OBJS}
-FILESDIR=${LIBDIR}
-CLEANFILES+=${OBJS}
-
-.if ${MKPIC} == "yes"
-SYMLINKS+=      crtbegin.o ${LIBDIR}/crtbeginT.o
-SYMLINKS+=      crtend.o ${LIBDIR}/crtendS.o
-.endif
-
-.include <ubix.prog.mk>
diff --git a/lib/csu/crt1.c b/lib/csu/crt1.c
deleted file mode 100644
index 6cdb2a8..0000000
--- a/lib/csu/crt1.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/* LINTLIBRARY */
-/*-
- * Copyright 1996-1998 John D. Polstra.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#ifndef lint
-#ifndef __GNUC__
-#error "GCC is needed to compile this file"
-#endif
-#endif /* lint */
-
-#include <stdlib.h>
-
-#include "libc_private.h"
-#include "crtbrand.c"
-
-extern int _DYNAMIC;
-#pragma weak _DYNAMIC
-
-typedef void (*fptr)(void);
-
-extern void _fini(void);
-extern void _init(void);
-extern int main(int, char **, char **);
-extern void _start(char *, ...);
-
-#ifdef GCRT
-extern void _mcleanup(void);
-extern void monstartup(void *, void *);
-extern int eprol;
-extern int etext;
-#endif
-
-char **environ;
-const char *__progname = "";
-
-static __inline fptr
-get_rtld_cleanup(void)
-{
-	fptr retval;
-
-#ifdef	__GNUC__
-	__asm__("movl %%edx,%0" : "=rm"(retval));
-#else
-	retval = (fptr)0; /* XXXX Fix this for other compilers */
-#endif
-	return(retval);
-}
-
-/* The entry function. */
-void
-_start(char *ap, ...)
-{
-	fptr cleanup;
-	int argc;
-	char **argv;
-	char **env;
-	const char *s;
-
-#ifdef __GNUC__
-	__asm__("and $0xfffffff0,%esp");
-#endif
-	cleanup = get_rtld_cleanup();
-	argv = &ap;
-	argc = *(long *)(void *)(argv - 1);
-	env = argv + argc + 1;
-	environ = env;
-
-	if (argc > 0 && argv[0] != NULL) {
-		__progname = argv[0];
-		for (s = __progname; *s != '\0'; s++)
-			if (*s == '/')
-				__progname = s + 1;
-	}
-
-	if (&_DYNAMIC != NULL)
-		atexit(cleanup);
-	else
-		_init_tls();
-
-#ifdef GCRT
-	atexit(_mcleanup);
-#endif
-	atexit(_fini);
-#ifdef GCRT
-	monstartup(&eprol, &etext);
-#endif
-	_init();
-	exit( main(argc, argv, env) );
-}
-
-#ifdef GCRT
-__asm__(".text");
-__asm__("eprol:");
-__asm__(".previous");
-#endif
-
-__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.14 2005/05/19 07:36:07 dfr Exp $\"");
diff --git a/lib/csu/crtbrand.c b/lib/csu/crtbrand.c
deleted file mode 100644
index f17a450..0000000
--- a/lib/csu/crtbrand.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright 2000 David E. O'Brien, John D. Polstra.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-
-#define ABI_VENDOR	"UbixOS"
-#define ABI_SECTION	".note.ABI-tag"
-#define ABI_NOTETYPE	1
-
-/*
- * Special ".note" entry specifying the ABI version.  See
- * http://www.netbsd.org/Documentation/kernel/elf-notes.html
- * for more information.
- */
-static const struct {
-    int32_t	namesz;
-    int32_t	descsz;
-    int32_t	type;
-    char	name[sizeof ABI_VENDOR];
-    int32_t	desc;
-} abitag __attribute__ ((section (ABI_SECTION), aligned(4))) __unused = {
-    sizeof ABI_VENDOR,
-    sizeof(int32_t),
-    ABI_NOTETYPE,
-    ABI_VENDOR,
-    __UbixOS_version
-};
diff --git a/lib/csu/crti.S b/lib/csu/crti.S
deleted file mode 100644
index ff895cb..0000000
--- a/lib/csu/crti.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright 1996, 1997, 1998, 2000 John D. Polstra.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-	.section .init,"ax",@progbits
-	.align	4
-	.globl	_init
-	.type	_init,@function
-_init:
-	sub	$12,%esp	/* re-align stack pointer */
-
-	.section .fini,"ax",@progbits
-	.align	4
-	.globl	_fini
-	.type	_fini,@function
-_fini:
-	sub	$12,%esp	/* re-align stack pointer */
-
-	.section .rodata
-.ascii "$FreeBSD: src/lib/csu/i386-elf/crti.S,v 1.7 2005/05/19 07:31:06 dfr Exp $\0"
diff --git a/lib/csu/crtn.S b/lib/csu/crtn.S
deleted file mode 100644
index 8e820e3..0000000
--- a/lib/csu/crtn.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright 1996, 1997, 1998, 2000 John D. Polstra.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-	.section .init,"ax",@progbits
-	add	$12,%esp
-	ret
-
-	.section .fini,"ax",@progbits
-	add	$12,%esp
-	ret
-
-	.section .rodata
-.ascii "$FreeBSD: src/lib/csu/i386-elf/crtn.S,v 1.6 2005/05/19 07:31:06 dfr Exp $\0"
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
deleted file mode 100644
index adc2be8..0000000
--- a/lib/libc/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Objects
-OBJS =
-
-AR = ar
-
-LPIC = pic.a
-
-#Sub Sections
-SUBS = ./*/*.o ./db/*/*.o ./i386/*/*.o
-
-#Output
-OUTPUT = libc.so
-
-lib.so: $(OBJS)
-	(cd yp;make)
-	(cd xdr;make)
-	(cd uuid;make)
-	(cd uthread;make)
-	(cd sys;make)
-	(cd string;make)
-	(cd stdtime;make)
-	(cd stdlib;make)
-	(cd stdio;make)
-	(cd rpc;make)
-	(cd resolv;make)
-	(cd regex;make)
-	(cd quad;make)
-	(cd posix1e;make)
-	(cd nls;make)
-	(cd net;make)
-	(cd nameser;make)
-	(cd locale;make)
-	(cd isc;make)
-	(cd inet;make)
-	(cd i386;make)
-	(cd gmon;make)
-	(cd gen;make)
-	(cd gdtoa;make)
-	(cd db;make)
-	(cd compat-43;make)
-	$(CC) -nostdlib -shared -Wl,-soname,libc.so -o $(OUTPUT) $(OBJS) $(SUBS)
-
-pic.a: $(OBJS)
-	$(AR) cq $(LPIC) $(OBJS) $(SUBS)
-	ranlib $(LPIC)
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -Wall -nostdinc -O -I./include -c -o $@ $<
- 
-.cc.s:
-	$(CXX)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -nostdinc -O -I./include -c $<
-
-.c.s:
-	$(CC)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall -nostdinc -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
-	(cd yp;make clean)
-	(cd xdr;make clean)
-	(cd uuid;make clean)
-	(cd uthread;make clean)
-	(cd sys;make clean)
-	(cd string;make clean)
-	(cd stdtime;make clean)
-	(cd stdlib;make clean)
-	(cd stdio;make clean)
-	(cd rpc;make clean)
-	(cd resolv;make clean)
-	(cd regex;make clean)
-	(cd quad;make clean)
-	(cd posix1e;make clean)
-	(cd nls;make clean)
-	(cd net;make clean)
-	(cd nameser;make clean)
-	(cd locale;make clean)
-	(cd isc;make clean)
-	(cd inet;make clean)
-	(cd i386;make clean)
-	(cd gmon;make clean)
-	(cd gen;make clean)
-	(cd gdtoa;make clean)
-	(cd db;make clean)
-	(cd compat-43;make clean)
diff --git a/lib/libc/Makefile.incl b/lib/libc/Makefile.incl
deleted file mode 100644
index f26452b..0000000
--- a/lib/libc/Makefile.incl
+++ /dev/null
@@ -1,4 +0,0 @@
-#MrOlsen (2016-01-11) NOTE Temp Disable INCLUDES = -I../include -I../../../include.new
-INCLUDES+=-I../include -I../locale
-CFLAGS = -fpic -DPIC -O2 -fno-strict-aliasing -pipe -D__DBINTERFACE_PRIVATE -DPOSIX_MISTAKE -DBROKEN_DES -DPORTMAP -DDES_BUILTIN -DYP -DHESIOD -Wsystem-headers -Wall -Wno-format-y2k -Wno-uninitialized
-CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc #-DPIC
diff --git a/lib/libc/compat-43/Makefile b/lib/libc/compat-43/Makefile
deleted file mode 100644
index c869a28..0000000
--- a/lib/libc/compat-43/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = creat.o gethostid.o getwd.o killpg.o sethostid.o setpgrp.o setrgid.o setruid.o sigcompat.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/compat-43/creat.c b/lib/libc/compat-43/creat.c
deleted file mode 100644
index 7af5b25..0000000
--- a/lib/libc/compat-43/creat.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)creat.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/creat.c,v 1.7 2002/03/22 21:51:56 obrien Exp $");
-
-#include "namespace.h"
-#include <fcntl.h>
-#include "un-namespace.h"
-
-int
-__creat(const char *path, mode_t mode)
-{
-	return(_open(path, O_WRONLY|O_CREAT|O_TRUNC, mode));
-}
-__weak_reference(__creat, creat);
-__weak_reference(__creat, _creat);
diff --git a/lib/libc/compat-43/gethostid.c b/lib/libc/compat-43/gethostid.c
deleted file mode 100644
index 0f08fad..0000000
--- a/lib/libc/compat-43/gethostid.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/gethostid.c,v 1.3 2002/05/28 16:56:57 alfred Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-long
-gethostid(void)
-{
-	int mib[2];
-	size_t size;
-	long value;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTID;
-	size = sizeof value;
-	if (sysctl(mib, 2, &value, &size, NULL, 0) == -1)
-		return (-1);
-	return (value);
-}
diff --git a/lib/libc/compat-43/getwd.c b/lib/libc/compat-43/getwd.c
deleted file mode 100644
index 9d52a4a..0000000
--- a/lib/libc/compat-43/getwd.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getwd.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/getwd.c,v 1.5 2005/02/27 18:39:02 phantom Exp $");
-
-#include <sys/param.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-char *
-getwd(char *buf)
-{
-	char *p;
-
-	if ( (p = getcwd(buf, MAXPATHLEN)) )
-		return(p);
-	(void)strerror_r(errno, buf, MAXPATHLEN);
-	return((char *)NULL);
-}
diff --git a/lib/libc/compat-43/killpg.c b/lib/libc/compat-43/killpg.c
deleted file mode 100644
index a6220f7..0000000
--- a/lib/libc/compat-43/killpg.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)killpg.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/killpg.c,v 1.4 2002/05/28 16:56:57 alfred Exp $");
-
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-/*
- * Backwards-compatible killpg().
- */
-int
-killpg(pid_t pgid, int sig)
-{
-	if (pgid == 1) {
-		errno = ESRCH;
-		return (-1);
-	}
-	return (kill(-pgid, sig));
-}
diff --git a/lib/libc/compat-43/sethostid.c b/lib/libc/compat-43/sethostid.c
deleted file mode 100644
index a23ec8e..0000000
--- a/lib/libc/compat-43/sethostid.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sethostid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/sethostid.c,v 1.3 2002/05/28 16:56:57 alfred Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-long
-sethostid(long hostid)
-{
-	int mib[2];
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTID;
-	if (sysctl(mib, 2, NULL, NULL, &hostid, sizeof hostid) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc/compat-43/setpgrp.c b/lib/libc/compat-43/setpgrp.c
deleted file mode 100644
index 0c07ce8..0000000
--- a/lib/libc/compat-43/setpgrp.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setpgrp.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/setpgrp.c,v 1.4 2002/05/28 16:56:57 alfred Exp $");
-
-#include <sys/types.h>
-#include <unistd.h>
-
-int
-setpgrp(pid_t pid, pid_t pgid)
-{
-	return(setpgid(pid, pgid));
-}
diff --git a/lib/libc/compat-43/setrgid.c b/lib/libc/compat-43/setrgid.c
deleted file mode 100644
index 360e562..0000000
--- a/lib/libc/compat-43/setrgid.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setrgid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/setrgid.c,v 1.3 2002/05/28 16:56:57 alfred Exp $");
-
-#include <unistd.h>
-
-int
-setrgid(gid_t rgid)
-{
-
-	return (setregid(rgid, -1));
-}
diff --git a/lib/libc/compat-43/setruid.c b/lib/libc/compat-43/setruid.c
deleted file mode 100644
index 5fb6d60..0000000
--- a/lib/libc/compat-43/setruid.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setruid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/setruid.c,v 1.3 2002/05/28 16:56:57 alfred Exp $");
-
-#include <unistd.h>
-
-int
-setruid(uid_t ruid)
-{
-
-	return (setreuid(ruid, -1));
-}
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
deleted file mode 100644
index 37ba978..0000000
--- a/lib/libc/compat-43/sigcompat.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sigcompat.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/compat-43/sigcompat.c,v 1.10 2002/03/22 21:51:56 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <signal.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-int
-sigvec(signo, sv, osv)
-	int signo;
-	struct sigvec *sv, *osv;
-{
-	struct sigaction sa, osa;
-	struct sigaction *sap, *osap;
-	int ret;
-
-	if (sv != NULL) {
-		sa.sa_handler = sv->sv_handler;
-		sa.sa_flags = sv->sv_flags ^ SV_INTERRUPT;
-		sigemptyset(&sa.sa_mask);
-		sa.sa_mask.__bits[0] = sv->sv_mask;
-		sap = &sa;
-	} else
-		sap = NULL;
-	osap = osv != NULL ? &osa : NULL;
-	ret = _sigaction(signo, sap, osap);
-	if (ret == 0 && osv != NULL) {
-		osv->sv_handler = osa.sa_handler;
-		osv->sv_flags = osa.sa_flags ^ SV_INTERRUPT;
-		osv->sv_mask = osa.sa_mask.__bits[0];
-	}
-	return (ret);
-}
-
-int
-sigsetmask(mask)
-	int mask;
-{
-	sigset_t set, oset;
-	int n;
-
-	sigemptyset(&set);
-	set.__bits[0] = mask;
-	n = _sigprocmask(SIG_SETMASK, &set, &oset);
-	if (n)
-		return (n);
-	return (oset.__bits[0]);
-}
-
-int
-sigblock(mask)
-	int mask;
-{
-	sigset_t set, oset;
-	int n;
-
-	sigemptyset(&set);
-	set.__bits[0] = mask;
-	n = _sigprocmask(SIG_BLOCK, &set, &oset);
-	if (n)
-		return (n);
-	return (oset.__bits[0]);
-}
-
-int
-sigpause(mask)
-	int mask;
-{
-	sigset_t set;
-
-	sigemptyset(&set);
-	set.__bits[0] = mask;
-	return (_sigsuspend(&set));
-}
diff --git a/lib/libc/db/Makefile b/lib/libc/db/Makefile
deleted file mode 100755
index e61803a..0000000
--- a/lib/libc/db/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-all: 
-	(cd btree;make)
-	(cd db;make)
-	(cd hash;make)
-	(cd mpool;make)
-	(cd recno;make)
-
-# Clean up the junk
-clean:
-	(cd btree;make clean)
-	(cd db;make clean)
-	(cd hash;make clean)
-	(cd mpool;make clean)
-	(cd recno;make clean)
diff --git a/lib/libc/db/Makefile.incl b/lib/libc/db/Makefile.incl
deleted file mode 100755
index 55ed355..0000000
--- a/lib/libc/db/Makefile.incl
+++ /dev/null
@@ -1,2 +0,0 @@
-INCLUDES = -I../../include -I../../../../include.new
-CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc
diff --git a/lib/libc/db/README b/lib/libc/db/README
deleted file mode 100644
index bed2c92..0000000
--- a/lib/libc/db/README
+++ /dev/null
@@ -1,40 +0,0 @@
-#	@(#)README	8.27 (Berkeley) 9/1/94
-
-This is version 1.85 of the Berkeley DB code.
-
-For information on compiling and installing this software, see the file
-PORT/README.
-
-Newer versions of this software will periodically be made available by
-anonymous ftp from ftp.cs.berkeley.edu.  An archive in compressed format
-is in ucb/4bsd/db.tar.Z, or in gzip format in ucb/4bsd/db.tar.gz.  If
-you'd like to receive announcements of future releases of this software,
-send email to the contact address below.
-
-Email questions may be addressed to Keith Bostic at bostic@cs.berkeley.edu.
-
-============================================
-Distribution contents:
-
-Makefile.inc	Ignore this, it's the 4.4BSD subsystem Makefile.
-PORT		The per OS/architecture directories to use to build
-		libdb.a, if you're not running 4.4BSD.  See the file
-		PORT/README for more information.
-README		This file.
-btree		The B+tree routines.
-changelog	List of changes, per version.
-db		The dbopen(3) interface routine.
-docs		Various USENIX papers, and the formatted manual pages.
-hash		The extended linear hashing routines.
-man		The unformatted manual pages.
-mpool		The memory pool routines.
-recno		The fixed/variable length record routines.
-test		Test package.
-
-============================================
-Debugging:
-
-If you're running a memory checker (e.g. Purify) on DB, make sure that
-you recompile it with "-DPURIFY" in the CFLAGS, first.  By default,
-allocated pages are not initialized by the DB code, and they will show
-up as reads of uninitialized memory in the buffer write routines.
diff --git a/lib/libc/db/btree/Makefile b/lib/libc/db/btree/Makefile
deleted file mode 100644
index b5e17cc..0000000
--- a/lib/libc/db/btree/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../ -I../../include
-
-#Objects
-OBJS = bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o bt_open.o bt_overflow.o bt_page.o bt_put.o bt_search.o bt_seq.o bt_split.o bt_utils.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/db/btree/bt_close.c b/lib/libc/db/btree/bt_close.c
deleted file mode 100644
index c211d5b..0000000
--- a/lib/libc/db/btree/bt_close.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_close.c	8.7 (Berkeley) 8/17/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_close.c,v 1.8 2002/03/22 21:52:00 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-#include "btree.h"
-
-static int bt_meta(BTREE *);
-
-/*
- * BT_CLOSE -- Close a btree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__bt_close(dbp)
-	DB *dbp;
-{
-	BTREE *t;
-	int fd;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Sync the tree. */
-	if (__bt_sync(dbp, 0) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Close the memory pool. */
-	if (mpool_close(t->bt_mp) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Free random memory. */
-	if (t->bt_cursor.key.data != NULL) {
-		free(t->bt_cursor.key.data);
-		t->bt_cursor.key.size = 0;
-		t->bt_cursor.key.data = NULL;
-	}
-	if (t->bt_rkey.data) {
-		free(t->bt_rkey.data);
-		t->bt_rkey.size = 0;
-		t->bt_rkey.data = NULL;
-	}
-	if (t->bt_rdata.data) {
-		free(t->bt_rdata.data);
-		t->bt_rdata.size = 0;
-		t->bt_rdata.data = NULL;
-	}
-
-	fd = t->bt_fd;
-	free(t);
-	free(dbp);
-	return (_close(fd) ? RET_ERROR : RET_SUCCESS);
-}
-
-/*
- * BT_SYNC -- sync the btree to disk.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__bt_sync(dbp, flags)
-	const DB *dbp;
-	u_int flags;
-{
-	BTREE *t;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Sync doesn't currently take any flags. */
-	if (flags != 0) {
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (F_ISSET(t, B_INMEM | B_RDONLY) || !F_ISSET(t, B_MODIFIED))
-		return (RET_SUCCESS);
-
-	if (F_ISSET(t, B_METADIRTY) && bt_meta(t) == RET_ERROR)
-		return (RET_ERROR);
-
-	if ((status = mpool_sync(t->bt_mp)) == RET_SUCCESS)
-		F_CLR(t, B_MODIFIED);
-
-	return (status);
-}
-
-/*
- * BT_META -- write the tree meta data to disk.
- *
- * Parameters:
- *	t:	tree
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-bt_meta(t)
-	BTREE *t;
-{
-	BTMETA m;
-	void *p;
-
-	if ((p = mpool_get(t->bt_mp, P_META, 0)) == NULL)
-		return (RET_ERROR);
-
-	/* Fill in metadata. */
-	m.magic = BTREEMAGIC;
-	m.version = BTREEVERSION;
-	m.psize = t->bt_psize;
-	m.free = t->bt_free;
-	m.nrecs = t->bt_nrecs;
-	m.flags = F_ISSET(t, SAVEMETA);
-
-	memmove(p, &m, sizeof(BTMETA));
-	mpool_put(t->bt_mp, p, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/btree/bt_conv.c b/lib/libc/db/btree/bt_conv.c
deleted file mode 100644
index 86d6b2c..0000000
--- a/lib/libc/db/btree/bt_conv.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_conv.c,v 1.2 2002/03/21 22:46:25 obrien Exp $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-static void mswap(PAGE *);
-
-/*
- * __BT_BPGIN, __BT_BPGOUT --
- *	Convert host-specific number layout to/from the host-independent
- *	format stored on disk.
- *
- * Parameters:
- *	t:	tree
- *	pg:	page number
- *	h:	page to convert
- */
-void
-__bt_pgin(t, pg, pp)
-	void *t;
-	pgno_t pg;
-	void *pp;
-{
-	PAGE *h;
-	indx_t i, top;
-	u_char flags;
-	char *p;
-
-	if (!F_ISSET(((BTREE *)t), B_NEEDSWAP))
-		return;
-	if (pg == P_META) {
-		mswap(pp);
-		return;
-	}
-
-	h = pp;
-	M_32_SWAP(h->pgno);
-	M_32_SWAP(h->prevpg);
-	M_32_SWAP(h->nextpg);
-	M_32_SWAP(h->flags);
-	M_16_SWAP(h->lower);
-	M_16_SWAP(h->upper);
-
-	top = NEXTINDEX(h);
-	if ((h->flags & P_TYPE) == P_BINTERNAL)
-		for (i = 0; i < top; i++) {
-			M_16_SWAP(h->linp[i]);
-			p = (char *)GETBINTERNAL(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(pgno_t);
-			if (*(u_char *)p & P_BIGKEY) {
-				p += sizeof(u_char);
-				P_32_SWAP(p);
-				p += sizeof(pgno_t);
-				P_32_SWAP(p);
-			}
-		}
-	else if ((h->flags & P_TYPE) == P_BLEAF)
-		for (i = 0; i < top; i++) {
-			M_16_SWAP(h->linp[i]);
-			p = (char *)GETBLEAF(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			flags = *(u_char *)p;
-			if (flags & (P_BIGKEY | P_BIGDATA)) {
-				p += sizeof(u_char);
-				if (flags & P_BIGKEY) {
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-				if (flags & P_BIGDATA) {
-					p += sizeof(uint32_t);
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-			}
-		}
-}
-
-void
-__bt_pgout(t, pg, pp)
-	void *t;
-	pgno_t pg;
-	void *pp;
-{
-	PAGE *h;
-	indx_t i, top;
-	u_char flags;
-	char *p;
-
-	if (!F_ISSET(((BTREE *)t), B_NEEDSWAP))
-		return;
-	if (pg == P_META) {
-		mswap(pp);
-		return;
-	}
-
-	h = pp;
-	top = NEXTINDEX(h);
-	if ((h->flags & P_TYPE) == P_BINTERNAL)
-		for (i = 0; i < top; i++) {
-			p = (char *)GETBINTERNAL(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(pgno_t);
-			if (*(u_char *)p & P_BIGKEY) {
-				p += sizeof(u_char);
-				P_32_SWAP(p);
-				p += sizeof(pgno_t);
-				P_32_SWAP(p);
-			}
-			M_16_SWAP(h->linp[i]);
-		}
-	else if ((h->flags & P_TYPE) == P_BLEAF)
-		for (i = 0; i < top; i++) {
-			p = (char *)GETBLEAF(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			flags = *(u_char *)p;
-			if (flags & (P_BIGKEY | P_BIGDATA)) {
-				p += sizeof(u_char);
-				if (flags & P_BIGKEY) {
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-				if (flags & P_BIGDATA) {
-					p += sizeof(uint32_t);
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-			}
-			M_16_SWAP(h->linp[i]);
-		}
-
-	M_32_SWAP(h->pgno);
-	M_32_SWAP(h->prevpg);
-	M_32_SWAP(h->nextpg);
-	M_32_SWAP(h->flags);
-	M_16_SWAP(h->lower);
-	M_16_SWAP(h->upper);
-}
-
-/*
- * MSWAP -- Actually swap the bytes on the meta page.
- *
- * Parameters:
- *	p:	page to convert
- */
-static void
-mswap(pg)
-	PAGE *pg;
-{
-	char *p;
-
-	p = (char *)pg;
-	P_32_SWAP(p);		/* magic */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* version */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* psize */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* free */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* nrecs */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* flags */
-	p += sizeof(uint32_t);
-}
diff --git a/lib/libc/db/btree/bt_debug.c b/lib/libc/db/btree/bt_debug.c
deleted file mode 100644
index ffda6d9..0000000
--- a/lib/libc/db/btree/bt_debug.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.3 2004/09/10 05:41:41 kuriyama Exp $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-#ifdef DEBUG
-/*
- * BT_DUMP -- Dump the tree
- *
- * Parameters:
- *	dbp:	pointer to the DB
- */
-void
-__bt_dump(dbp)
-	DB *dbp;
-{
-	BTREE *t;
-	PAGE *h;
-	pgno_t i;
-	char *sep;
-
-	t = dbp->internal;
-	(void)fprintf(stderr, "%s: pgsz %d",
-	    F_ISSET(t, B_INMEM) ? "memory" : "disk", t->bt_psize);
-	if (F_ISSET(t, R_RECNO))
-		(void)fprintf(stderr, " keys %u", t->bt_nrecs);
-#undef X
-#define	X(flag, name) \
-	if (F_ISSET(t, flag)) { \
-		(void)fprintf(stderr, "%s%s", sep, name); \
-		sep = ", "; \
-	}
-	if (t->flags != 0) {
-		sep = " flags (";
-		X(R_FIXLEN,	"FIXLEN");
-		X(B_INMEM,	"INMEM");
-		X(B_NODUPS,	"NODUPS");
-		X(B_RDONLY,	"RDONLY");
-		X(R_RECNO,	"RECNO");
-		X(B_METADIRTY,"METADIRTY");
-		(void)fprintf(stderr, ")\n");
-	}
-#undef X
-
-	for (i = P_ROOT; (h = mpool_get(t->bt_mp, i, 0)) != NULL; ++i) {
-		__bt_dpage(h);
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
-}
-
-/*
- * BT_DMPAGE -- Dump the meta page
- *
- * Parameters:
- *	h:	pointer to the PAGE
- */
-void
-__bt_dmpage(h)
-	PAGE *h;
-{
-	BTMETA *m;
-	char *sep;
-
-	m = (BTMETA *)h;
-	(void)fprintf(stderr, "magic %x\n", m->magic);
-	(void)fprintf(stderr, "version %u\n", m->version);
-	(void)fprintf(stderr, "psize %u\n", m->psize);
-	(void)fprintf(stderr, "free %u\n", m->free);
-	(void)fprintf(stderr, "nrecs %u\n", m->nrecs);
-	(void)fprintf(stderr, "flags %u", m->flags);
-#undef X
-#define	X(flag, name) \
-	if (m->flags & flag) { \
-		(void)fprintf(stderr, "%s%s", sep, name); \
-		sep = ", "; \
-	}
-	if (m->flags) {
-		sep = " (";
-		X(B_NODUPS,	"NODUPS");
-		X(R_RECNO,	"RECNO");
-		(void)fprintf(stderr, ")");
-	}
-}
-
-/*
- * BT_DNPAGE -- Dump the page
- *
- * Parameters:
- *	n:	page number to dump.
- */
-void
-__bt_dnpage(dbp, pgno)
-	DB *dbp;
-	pgno_t pgno;
-{
-	BTREE *t;
-	PAGE *h;
-
-	t = dbp->internal;
-	if ((h = mpool_get(t->bt_mp, pgno, 0)) != NULL) {
-		__bt_dpage(h);
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
-}
-
-/*
- * BT_DPAGE -- Dump the page
- *
- * Parameters:
- *	h:	pointer to the PAGE
- */
-void
-__bt_dpage(h)
-	PAGE *h;
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	RINTERNAL *ri;
-	RLEAF *rl;
-	indx_t cur, top;
-	char *sep;
-
-	(void)fprintf(stderr, "    page %d: (", h->pgno);
-#undef X
-#define	X(flag, name) \
-	if (h->flags & flag) { \
-		(void)fprintf(stderr, "%s%s", sep, name); \
-		sep = ", "; \
-	}
-	sep = "";
-	X(P_BINTERNAL,	"BINTERNAL")		/* types */
-	X(P_BLEAF,	"BLEAF")
-	X(P_RINTERNAL,	"RINTERNAL")		/* types */
-	X(P_RLEAF,	"RLEAF")
-	X(P_OVERFLOW,	"OVERFLOW")
-	X(P_PRESERVE,	"PRESERVE");
-	(void)fprintf(stderr, ")\n");
-#undef X
-
-	(void)fprintf(stderr, "\tprev %2d next %2d", h->prevpg, h->nextpg);
-	if (h->flags & P_OVERFLOW)
-		return;
-
-	top = NEXTINDEX(h);
-	(void)fprintf(stderr, " lower %3d upper %3d nextind %d\n",
-	    h->lower, h->upper, top);
-	for (cur = 0; cur < top; cur++) {
-		(void)fprintf(stderr, "\t[%03d] %4d ", cur, h->linp[cur]);
-		switch (h->flags & P_TYPE) {
-		case P_BINTERNAL:
-			bi = GETBINTERNAL(h, cur);
-			(void)fprintf(stderr,
-			    "size %03d pgno %03d", bi->ksize, bi->pgno);
-			if (bi->flags & P_BIGKEY)
-				(void)fprintf(stderr, " (indirect)");
-			else if (bi->ksize)
-				(void)fprintf(stderr,
-				    " {%.*s}", (int)bi->ksize, bi->bytes);
-			break;
-		case P_RINTERNAL:
-			ri = GETRINTERNAL(h, cur);
-			(void)fprintf(stderr, "entries %03d pgno %03d",
-				ri->nrecs, ri->pgno);
-			break;
-		case P_BLEAF:
-			bl = GETBLEAF(h, cur);
-			if (bl->flags & P_BIGKEY)
-				(void)fprintf(stderr,
-				    "big key page %u size %u/",
-				    *(pgno_t *)bl->bytes,
-				    *(uint32_t *)(bl->bytes + sizeof(pgno_t)));
-			else if (bl->ksize)
-				(void)fprintf(stderr, "%.*s/",
-				    bl->ksize, bl->bytes);
-			if (bl->flags & P_BIGDATA)
-				(void)fprintf(stderr,
-				    "big data page %u size %u",
-				    *(pgno_t *)(bl->bytes + bl->ksize),
-				    *(uint32_t *)(bl->bytes + bl->ksize +
-				    sizeof(pgno_t)));
-			else if (bl->dsize)
-				(void)fprintf(stderr, "%.*s",
-				    (int)bl->dsize, bl->bytes + bl->ksize);
-			break;
-		case P_RLEAF:
-			rl = GETRLEAF(h, cur);
-			if (rl->flags & P_BIGDATA)
-				(void)fprintf(stderr,
-				    "big data page %u size %u",
-				    *(pgno_t *)rl->bytes,
-				    *(uint32_t *)(rl->bytes + sizeof(pgno_t)));
-			else if (rl->dsize)
-				(void)fprintf(stderr,
-				    "%.*s", (int)rl->dsize, rl->bytes);
-			break;
-		}
-		(void)fprintf(stderr, "\n");
-	}
-}
-#endif
-
-#ifdef STATISTICS
-/*
- * BT_STAT -- Gather/print the tree statistics
- *
- * Parameters:
- *	dbp:	pointer to the DB
- */
-void
-__bt_stat(dbp)
-	DB *dbp;
-{
-	extern u_long bt_cache_hit, bt_cache_miss, bt_pfxsaved, bt_rootsplit;
-	extern u_long bt_sortsplit, bt_split;
-	BTREE *t;
-	PAGE *h;
-	pgno_t i, pcont, pinternal, pleaf;
-	u_long ifree, lfree, nkeys;
-	int levels;
-
-	t = dbp->internal;
-	pcont = pinternal = pleaf = 0;
-	nkeys = ifree = lfree = 0;
-	for (i = P_ROOT; (h = mpool_get(t->bt_mp, i, 0)) != NULL; ++i) {
-		switch (h->flags & P_TYPE) {
-		case P_BINTERNAL:
-		case P_RINTERNAL:
-			++pinternal;
-			ifree += h->upper - h->lower;
-			break;
-		case P_BLEAF:
-		case P_RLEAF:
-			++pleaf;
-			lfree += h->upper - h->lower;
-			nkeys += NEXTINDEX(h);
-			break;
-		case P_OVERFLOW:
-			++pcont;
-			break;
-		}
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
-
-	/* Count the levels of the tree. */
-	for (i = P_ROOT, levels = 0 ;; ++levels) {
-		h = mpool_get(t->bt_mp, i, 0);
-		if (h->flags & (P_BLEAF|P_RLEAF)) {
-			if (levels == 0)
-				levels = 1;
-			(void)mpool_put(t->bt_mp, h, 0);
-			break;
-		}
-		i = F_ISSET(t, R_RECNO) ?
-		    GETRINTERNAL(h, 0)->pgno :
-		    GETBINTERNAL(h, 0)->pgno;
-		(void)mpool_put(t->bt_mp, h, 0);
-	}
-
-	(void)fprintf(stderr, "%d level%s with %ld keys",
-	    levels, levels == 1 ? "" : "s", nkeys);
-	if (F_ISSET(t, R_RECNO))
-		(void)fprintf(stderr, " (%d header count)", t->bt_nrecs);
-	(void)fprintf(stderr,
-	    "\n%u pages (leaf %d, internal %d, overflow %d)\n",
-	    pinternal + pleaf + pcont, pleaf, pinternal, pcont);
-	(void)fprintf(stderr, "%ld cache hits, %ld cache misses\n",
-	    bt_cache_hit, bt_cache_miss);
-	(void)fprintf(stderr, "%lu splits (%lu root splits, %lu sort splits)\n",
-	    bt_split, bt_rootsplit, bt_sortsplit);
-	pleaf *= t->bt_psize - BTDATAOFF;
-	if (pleaf)
-		(void)fprintf(stderr,
-		    "%.0f%% leaf fill (%ld bytes used, %ld bytes free)\n",
-		    ((double)(pleaf - lfree) / pleaf) * 100,
-		    pleaf - lfree, lfree);
-	pinternal *= t->bt_psize - BTDATAOFF;
-	if (pinternal)
-		(void)fprintf(stderr,
-		    "%.0f%% internal fill (%ld bytes used, %ld bytes free\n",
-		    ((double)(pinternal - ifree) / pinternal) * 100,
-		    pinternal - ifree, ifree);
-	if (bt_pfxsaved)
-		(void)fprintf(stderr, "prefix checking removed %lu bytes.\n",
-		    bt_pfxsaved);
-}
-#endif
diff --git a/lib/libc/db/btree/bt_delete.c b/lib/libc/db/btree/bt_delete.c
deleted file mode 100644
index 08d0d86..0000000
--- a/lib/libc/db/btree/bt_delete.c
+++ /dev/null
@@ -1,659 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_delete.c	8.13 (Berkeley) 7/28/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_delete.c,v 1.2 2002/03/21 22:46:25 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int __bt_bdelete(BTREE *, const DBT *);
-static int __bt_curdel(BTREE *, const DBT *, PAGE *, u_int);
-static int __bt_pdelete(BTREE *, PAGE *);
-static int __bt_relink(BTREE *, PAGE *);
-static int __bt_stkacq(BTREE *, PAGE **, CURSOR *);
-
-/*
- * __bt_delete
- *	Delete the item(s) referenced by a key.
- *
- * Return RET_SPECIAL if the key is not found.
- */
-int
-__bt_delete(dbp, key, flags)
-	const DB *dbp;
-	const DBT *key;
-	u_int flags;
-{
-	BTREE *t;
-	CURSOR *c;
-	PAGE *h;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Check for change to a read-only tree. */
-	if (F_ISSET(t, B_RDONLY)) {
-		errno = EPERM;
-		return (RET_ERROR);
-	}
-
-	switch (flags) {
-	case 0:
-		status = __bt_bdelete(t, key);
-		break;
-	case R_CURSOR:
-		/*
-		 * If flags is R_CURSOR, delete the cursor.  Must already
-		 * have started a scan and not have already deleted it.
-		 */
-		c = &t->bt_cursor;
-		if (F_ISSET(c, CURS_INIT)) {
-			if (F_ISSET(c, CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE))
-				return (RET_SPECIAL);
-			if ((h = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL)
-				return (RET_ERROR);
-
-			/*
-			 * If the page is about to be emptied, we'll need to
-			 * delete it, which means we have to acquire a stack.
-			 */
-			if (NEXTINDEX(h) == 1)
-				if (__bt_stkacq(t, &h, &t->bt_cursor))
-					return (RET_ERROR);
-
-			status = __bt_dleaf(t, NULL, h, c->pg.index);
-
-			if (NEXTINDEX(h) == 0 && status == RET_SUCCESS) {
-				if (__bt_pdelete(t, h))
-					return (RET_ERROR);
-			} else
-				mpool_put(t->bt_mp,
-				    h, status == RET_SUCCESS ? MPOOL_DIRTY : 0);
-			break;
-		}
-		/* FALLTHROUGH */
-	default:
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-	if (status == RET_SUCCESS)
-		F_SET(t, B_MODIFIED);
-	return (status);
-}
-
-/*
- * __bt_stkacq --
- *	Acquire a stack so we can delete a cursor entry.
- *
- * Parameters:
- *	  t:	tree
- *	 hp:	pointer to current, pinned PAGE pointer
- *	  c:	pointer to the cursor
- *
- * Returns:
- *	0 on success, 1 on failure
- */
-static int
-__bt_stkacq(t, hp, c)
-	BTREE *t;
-	PAGE **hp;
-	CURSOR *c;
-{
-	BINTERNAL *bi;
-	EPG *e;
-	EPGNO *parent;
-	PAGE *h;
-	indx_t index;
-	pgno_t pgno;
-	recno_t nextpg, prevpg;
-	int exact, level;
-	
-	/*
-	 * Find the first occurrence of the key in the tree.  Toss the
-	 * currently locked page so we don't hit an already-locked page.
-	 */
-	h = *hp;
-	mpool_put(t->bt_mp, h, 0);
-	if ((e = __bt_search(t, &c->key, &exact)) == NULL)
-		return (1);
-	h = e->page;
-
-	/* See if we got it in one shot. */
-	if (h->pgno == c->pg.pgno)
-		goto ret;
-
-	/*
-	 * Move right, looking for the page.  At each move we have to move
-	 * up the stack until we don't have to move to the next page.  If
-	 * we have to change pages at an internal level, we have to fix the
-	 * stack back up.
-	 */
-	while (h->pgno != c->pg.pgno) {
-		if ((nextpg = h->nextpg) == P_INVALID)
-			break;
-		mpool_put(t->bt_mp, h, 0);
-
-		/* Move up the stack. */
-		for (level = 0; (parent = BT_POP(t)) != NULL; ++level) {
-			/* Get the parent page. */
-			if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-				return (1);
-
-			/* Move to the next index. */
-			if (parent->index != NEXTINDEX(h) - 1) {
-				index = parent->index + 1;
-				BT_PUSH(t, h->pgno, index);
-				break;
-			}
-			mpool_put(t->bt_mp, h, 0);
-		}
-
-		/* Restore the stack. */
-		while (level--) {
-			/* Push the next level down onto the stack. */
-			bi = GETBINTERNAL(h, index);
-			pgno = bi->pgno;
-			BT_PUSH(t, pgno, 0);
-
-			/* Lose the currently pinned page. */
-			mpool_put(t->bt_mp, h, 0);
-
-			/* Get the next level down. */
-			if ((h = mpool_get(t->bt_mp, pgno, 0)) == NULL)
-				return (1);
-			index = 0;
-		}
-		mpool_put(t->bt_mp, h, 0);
-		if ((h = mpool_get(t->bt_mp, nextpg, 0)) == NULL)
-			return (1);
-	}
-
-	if (h->pgno == c->pg.pgno)
-		goto ret;
-
-	/* Reacquire the original stack. */
-	mpool_put(t->bt_mp, h, 0);
-	if ((e = __bt_search(t, &c->key, &exact)) == NULL)
-		return (1);
-	h = e->page;
-
-	/*
-	 * Move left, looking for the page.  At each move we have to move
-	 * up the stack until we don't have to change pages to move to the
-	 * next page.  If we have to change pages at an internal level, we
-	 * have to fix the stack back up.
-	 */
-	while (h->pgno != c->pg.pgno) {
-		if ((prevpg = h->prevpg) == P_INVALID)
-			break;
-		mpool_put(t->bt_mp, h, 0);
-
-		/* Move up the stack. */
-		for (level = 0; (parent = BT_POP(t)) != NULL; ++level) {
-			/* Get the parent page. */
-			if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-				return (1);
-
-			/* Move to the next index. */
-			if (parent->index != 0) {
-				index = parent->index - 1;
-				BT_PUSH(t, h->pgno, index);
-				break;
-			}
-			mpool_put(t->bt_mp, h, 0);
-		}
-
-		/* Restore the stack. */
-		while (level--) {
-			/* Push the next level down onto the stack. */
-			bi = GETBINTERNAL(h, index);
-			pgno = bi->pgno;
-
-			/* Lose the currently pinned page. */
-			mpool_put(t->bt_mp, h, 0);
-
-			/* Get the next level down. */
-			if ((h = mpool_get(t->bt_mp, pgno, 0)) == NULL)
-				return (1);
-
-			index = NEXTINDEX(h) - 1;
-			BT_PUSH(t, pgno, index);
-		}
-		mpool_put(t->bt_mp, h, 0);
-		if ((h = mpool_get(t->bt_mp, prevpg, 0)) == NULL)
-			return (1);
-	}
-	
-
-ret:	mpool_put(t->bt_mp, h, 0);
-	return ((*hp = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL);
-}
-
-/*
- * __bt_bdelete --
- *	Delete all key/data pairs matching the specified key.
- *
- * Parameters:
- *	  t:	tree
- *	key:	key to delete
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-static int
-__bt_bdelete(t, key)
-	BTREE *t;
-	const DBT *key;
-{
-	EPG *e;
-	PAGE *h;
-	int deleted, exact, redo;
-
-	deleted = 0;
-
-	/* Find any matching record; __bt_search pins the page. */
-loop:	if ((e = __bt_search(t, key, &exact)) == NULL)
-		return (deleted ? RET_SUCCESS : RET_ERROR);
-	if (!exact) {
-		mpool_put(t->bt_mp, e->page, 0);
-		return (deleted ? RET_SUCCESS : RET_SPECIAL);
-	}
-
-	/*
-	 * Delete forward, then delete backward, from the found key.  If
-	 * there are duplicates and we reach either side of the page, do
-	 * the key search again, so that we get them all.
-	 */
-	redo = 0;
-	h = e->page;
-	do {
-		if (__bt_dleaf(t, key, h, e->index)) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		if (F_ISSET(t, B_NODUPS)) {
-			if (NEXTINDEX(h) == 0) {
-				if (__bt_pdelete(t, h))
-					return (RET_ERROR);
-			} else
-				mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			return (RET_SUCCESS);
-		}
-		deleted = 1;
-	} while (e->index < NEXTINDEX(h) && __bt_cmp(t, key, e) == 0);
-
-	/* Check for right-hand edge of the page. */
-	if (e->index == NEXTINDEX(h))
-		redo = 1;
-
-	/* Delete from the key to the beginning of the page. */
-	while (e->index-- > 0) {
-		if (__bt_cmp(t, key, e) != 0)
-			break;
-		if (__bt_dleaf(t, key, h, e->index) == RET_ERROR) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		if (e->index == 0)
-			redo = 1;
-	}
-
-	/* Check for an empty page. */
-	if (NEXTINDEX(h) == 0) {
-		if (__bt_pdelete(t, h))
-			return (RET_ERROR);
-		goto loop;
-	}
-
-	/* Put the page. */
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	if (redo)
-		goto loop;
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_pdelete --
- *	Delete a single page from the tree.
- *
- * Parameters:
- *	t:	tree
- *	h:	leaf page
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- *
- * Side-effects:
- *	mpool_put's the page
- */
-static int
-__bt_pdelete(t, h)
-	BTREE *t;
-	PAGE *h;
-{
-	BINTERNAL *bi;
-	PAGE *pg;
-	EPGNO *parent;
-	indx_t cnt, index, *ip, offset;
-	uint32_t nksize;
-	char *from;
-
-	/*
-	 * Walk the parent page stack -- a LIFO stack of the pages that were
-	 * traversed when we searched for the page where the delete occurred.
-	 * Each stack entry is a page number and a page index offset.  The
-	 * offset is for the page traversed on the search.  We've just deleted
-	 * a page, so we have to delete the key from the parent page.
-	 *
-	 * If the delete from the parent page makes it empty, this process may
-	 * continue all the way up the tree.  We stop if we reach the root page
-	 * (which is never deleted, it's just not worth the effort) or if the
-	 * delete does not empty the page.
-	 */
-	while ((parent = BT_POP(t)) != NULL) {
-		/* Get the parent page. */
-		if ((pg = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-			return (RET_ERROR);
-		
-		index = parent->index;
-		bi = GETBINTERNAL(pg, index);
-
-		/* Free any overflow pages. */
-		if (bi->flags & P_BIGKEY &&
-		    __ovfl_delete(t, bi->bytes) == RET_ERROR) {
-			mpool_put(t->bt_mp, pg, 0);
-			return (RET_ERROR);
-		}
-
-		/*
-		 * Free the parent if it has only the one key and it's not the
-		 * root page. If it's the rootpage, turn it back into an empty
-		 * leaf page.
-		 */
-		if (NEXTINDEX(pg) == 1)
-			if (pg->pgno == P_ROOT) {
-				pg->lower = BTDATAOFF;
-				pg->upper = t->bt_psize;
-				pg->flags = P_BLEAF;
-			} else {
-				if (__bt_relink(t, pg) || __bt_free(t, pg))
-					return (RET_ERROR);
-				continue;
-			}
-		else {
-			/* Pack remaining key items at the end of the page. */
-			nksize = NBINTERNAL(bi->ksize);
-			from = (char *)pg + pg->upper;
-			memmove(from + nksize, from, (char *)bi - from);
-			pg->upper += nksize;
-
-			/* Adjust indices' offsets, shift the indices down. */
-			offset = pg->linp[index];
-			for (cnt = index, ip = &pg->linp[0]; cnt--; ++ip)
-				if (ip[0] < offset)
-					ip[0] += nksize;
-			for (cnt = NEXTINDEX(pg) - index; --cnt; ++ip)
-				ip[0] = ip[1] < offset ? ip[1] + nksize : ip[1];
-			pg->lower -= sizeof(indx_t);
-		}
-
-		mpool_put(t->bt_mp, pg, MPOOL_DIRTY);
-		break;
-	}
-
-	/* Free the leaf page, as long as it wasn't the root. */
-	if (h->pgno == P_ROOT) {
-		mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-		return (RET_SUCCESS);
-	}
-	return (__bt_relink(t, h) || __bt_free(t, h));
-}
-
-/*
- * __bt_dleaf --
- *	Delete a single record from a leaf page.
- *
- * Parameters:
- *	t:	tree
- *    key:	referenced key
- *	h:	page
- *	index:	index on page to delete
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__bt_dleaf(t, key, h, index)
-	BTREE *t;
-	const DBT *key;
-	PAGE *h;
-	u_int index;
-{
-	BLEAF *bl;
-	indx_t cnt, *ip, offset;
-	uint32_t nbytes;
-	void *to;
-	char *from;
-
-	/* If this record is referenced by the cursor, delete the cursor. */
-	if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-	    !F_ISSET(&t->bt_cursor, CURS_ACQUIRE) &&
-	    t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index == index &&
-	    __bt_curdel(t, key, h, index))
-		return (RET_ERROR);
-
-	/* If the entry uses overflow pages, make them available for reuse. */
-	to = bl = GETBLEAF(h, index);
-	if (bl->flags & P_BIGKEY && __ovfl_delete(t, bl->bytes) == RET_ERROR)
-		return (RET_ERROR);
-	if (bl->flags & P_BIGDATA &&
-	    __ovfl_delete(t, bl->bytes + bl->ksize) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Pack the remaining key/data items at the end of the page. */
-	nbytes = NBLEAF(bl);
-	from = (char *)h + h->upper;
-	memmove(from + nbytes, from, (char *)to - from);
-	h->upper += nbytes;
-
-	/* Adjust the indices' offsets, shift the indices down. */
-	offset = h->linp[index];
-	for (cnt = index, ip = &h->linp[0]; cnt--; ++ip)
-		if (ip[0] < offset)
-			ip[0] += nbytes;
-	for (cnt = NEXTINDEX(h) - index; --cnt; ++ip)
-		ip[0] = ip[1] < offset ? ip[1] + nbytes : ip[1];
-	h->lower -= sizeof(indx_t);
-
-	/* If the cursor is on this page, adjust it as necessary. */
-	if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-	    !F_ISSET(&t->bt_cursor, CURS_ACQUIRE) &&
-	    t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index > index)
-		--t->bt_cursor.pg.index;
-
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_curdel --
- *	Delete the cursor.
- *
- * Parameters:
- *	t:	tree
- *    key:	referenced key (or NULL)
- *	h:	page
- *  index:	index on page to delete
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-static int
-__bt_curdel(t, key, h, index)
-	BTREE *t;
-	const DBT *key;
-	PAGE *h;
-	u_int index;
-{
-	CURSOR *c;
-	EPG e;
-	PAGE *pg;
-	int curcopy, status;
-
-	/*
-	 * If there are duplicates, move forward or backward to one.
-	 * Otherwise, copy the key into the cursor area.
-	 */
-	c = &t->bt_cursor;
-	F_CLR(c, CURS_AFTER | CURS_BEFORE | CURS_ACQUIRE);
-
-	curcopy = 0;
-	if (!F_ISSET(t, B_NODUPS)) {
-		/*
-		 * We're going to have to do comparisons.  If we weren't
-		 * provided a copy of the key, i.e. the user is deleting
-		 * the current cursor position, get one.
-		 */
-		if (key == NULL) {
-			e.page = h;
-			e.index = index;
-			if ((status = __bt_ret(t, &e,
-			    &c->key, &c->key, NULL, NULL, 1)) != RET_SUCCESS)
-				return (status);
-			curcopy = 1;
-			key = &c->key;
-		}
-		/* Check previous key, if not at the beginning of the page. */
-		if (index > 0) { 
-			e.page = h;
-			e.index = index - 1;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_BEFORE);
-				goto dup2;
-			}
-		}
-		/* Check next key, if not at the end of the page. */
-		if (index < NEXTINDEX(h) - 1) {
-			e.page = h;
-			e.index = index + 1;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_AFTER);
-				goto dup2;
-			}
-		}
-		/* Check previous key if at the beginning of the page. */
-		if (index == 0 && h->prevpg != P_INVALID) {
-			if ((pg = mpool_get(t->bt_mp, h->prevpg, 0)) == NULL)
-				return (RET_ERROR);
-			e.page = pg;
-			e.index = NEXTINDEX(pg) - 1;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_BEFORE);
-				goto dup1;
-			}
-			mpool_put(t->bt_mp, pg, 0);
-		}
-		/* Check next key if at the end of the page. */
-		if (index == NEXTINDEX(h) - 1 && h->nextpg != P_INVALID) {
-			if ((pg = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL)
-				return (RET_ERROR);
-			e.page = pg;
-			e.index = 0;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_AFTER);
-dup1:				mpool_put(t->bt_mp, pg, 0);
-dup2:				c->pg.pgno = e.page->pgno;
-				c->pg.index = e.index;
-				return (RET_SUCCESS);
-			}
-			mpool_put(t->bt_mp, pg, 0);
-		}
-	}
-	e.page = h;
-	e.index = index;
-	if (curcopy || (status =
-	    __bt_ret(t, &e, &c->key, &c->key, NULL, NULL, 1)) == RET_SUCCESS) {
-		F_SET(c, CURS_ACQUIRE);
-		return (RET_SUCCESS);
-	}
-	return (status);
-}
-
-/*
- * __bt_relink --
- *	Link around a deleted page.
- *
- * Parameters:
- *	t:	tree
- *	h:	page to be deleted
- */
-static int
-__bt_relink(t, h)
-	BTREE *t;
-	PAGE *h;
-{
-	PAGE *pg;
-
-	if (h->nextpg != P_INVALID) {
-		if ((pg = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL)
-			return (RET_ERROR);
-		pg->prevpg = h->prevpg;
-		mpool_put(t->bt_mp, pg, MPOOL_DIRTY);
-	}
-	if (h->prevpg != P_INVALID) {
-		if ((pg = mpool_get(t->bt_mp, h->prevpg, 0)) == NULL)
-			return (RET_ERROR);
-		pg->nextpg = h->nextpg;
-		mpool_put(t->bt_mp, pg, MPOOL_DIRTY);
-	}
-	return (0);
-}
diff --git a/lib/libc/db/btree/bt_get.c b/lib/libc/db/btree/bt_get.c
deleted file mode 100644
index 0d91ae4..0000000
--- a/lib/libc/db/btree/bt_get.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_get.c	8.6 (Berkeley) 7/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_get.c,v 1.2 2002/03/22 21:52:01 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * __BT_GET -- Get a record from the btree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key to find
- *	data:	data to return
- *	flag:	currently unused
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-int
-__bt_get(dbp, key, data, flags)
-	const DB *dbp;
-	const DBT *key;
-	DBT *data;
-	u_int flags;
-{
-	BTREE *t;
-	EPG *e;
-	int exact, status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Get currently doesn't take any flags. */
-	if (flags) {
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if ((e = __bt_search(t, key, &exact)) == NULL)
-		return (RET_ERROR);
-	if (!exact) {
-		mpool_put(t->bt_mp, e->page, 0);
-		return (RET_SPECIAL);
-	}
-
-	status = __bt_ret(t, e, NULL, NULL, data, &t->bt_rdata, 0);
-
-	/*
-	 * If the user is doing concurrent access, we copied the
-	 * key/data, toss the page.
-	 */
-	if (F_ISSET(t, B_DB_LOCK))
-		mpool_put(t->bt_mp, e->page, 0);
-	else
-		t->bt_pinned = e->page;
-	return (status);
-}
diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c
deleted file mode 100644
index 385be9e..0000000
--- a/lib/libc/db/btree/bt_open.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_open.c	8.10 (Berkeley) 8/17/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_open.c,v 1.11 2002/03/22 21:52:01 obrien Exp $");
-
-/*
- * Implementation of btree access method for 4.4BSD.
- *
- * The design here was originally based on that of the btree access method
- * used in the Postgres database system at UC Berkeley.  This implementation
- * is wholly independent of the Postgres code.
- */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-#include "btree.h"
-
-#ifdef DEBUG
-#undef	MINPSIZE
-#define	MINPSIZE	128
-#endif
-
-static int byteorder(void);
-static int nroot(BTREE *);
-static int tmp(void);
-
-/*
- * __BT_OPEN -- Open a btree.
- *
- * Creates and fills a DB struct, and calls the routine that actually
- * opens the btree.
- *
- * Parameters:
- *	fname:	filename (NULL for in-memory trees)
- *	flags:	open flag bits
- *	mode:	open permission bits
- *	b:	BTREEINFO pointer
- *
- * Returns:
- *	NULL on failure, pointer to DB on success.
- *
- */
-DB *
-__bt_open(fname, flags, mode, openinfo, dflags)
-	const char *fname;
-	int flags, mode, dflags;
-	const BTREEINFO *openinfo;
-{
-	struct stat sb;
-	BTMETA m;
-	BTREE *t;
-	BTREEINFO b;
-	DB *dbp;
-	pgno_t ncache;
-	ssize_t nr;
-	int machine_lorder;
-
-	t = NULL;
-
-	/*
-	 * Intention is to make sure all of the user's selections are okay
-	 * here and then use them without checking.  Can't be complete, since
-	 * we don't know the right page size, lorder or flags until the backing
-	 * file is opened.  Also, the file's page size can cause the cachesize
-	 * to change.
-	 */
-	machine_lorder = byteorder();
-	if (openinfo) {
-		b = *openinfo;
-
-		/* Flags: R_DUP. */
-		if (b.flags & ~(R_DUP))
-			goto einval;
-
-		/*
-		 * Page size must be indx_t aligned and >= MINPSIZE.  Default
-		 * page size is set farther on, based on the underlying file
-		 * transfer size.
-		 */
-		if (b.psize &&
-		    (b.psize < MINPSIZE || b.psize > MAX_PAGE_OFFSET + 1 ||
-		    b.psize & (sizeof(indx_t) - 1) ))
-			goto einval;
-
-		/* Minimum number of keys per page; absolute minimum is 2. */
-		if (b.minkeypage) {
-			if (b.minkeypage < 2)
-				goto einval;
-		} else
-			b.minkeypage = DEFMINKEYPAGE;
-
-		/* If no comparison, use default comparison and prefix. */
-		if (b.compare == NULL) {
-			b.compare = __bt_defcmp;
-			if (b.prefix == NULL)
-				b.prefix = __bt_defpfx;
-		}
-
-		if (b.lorder == 0)
-			b.lorder = machine_lorder;
-	} else {
-		b.compare = __bt_defcmp;
-		b.cachesize = 0;
-		b.flags = 0;
-		b.lorder = machine_lorder;
-		b.minkeypage = DEFMINKEYPAGE;
-		b.prefix = __bt_defpfx;
-		b.psize = 0;
-	}
-
-	/* Check for the ubiquitous PDP-11. */
-	if (b.lorder != BIG_ENDIAN && b.lorder != LITTLE_ENDIAN)
-		goto einval;
-
-	/* Allocate and initialize DB and BTREE structures. */
-	if ((t = (BTREE *)malloc(sizeof(BTREE))) == NULL)
-		goto err;
-	memset(t, 0, sizeof(BTREE));
-	t->bt_fd = -1;			/* Don't close unopened fd on error. */
-	t->bt_lorder = b.lorder;
-	t->bt_order = NOT;
-	t->bt_cmp = b.compare;
-	t->bt_pfx = b.prefix;
-	t->bt_rfd = -1;
-
-	if ((t->bt_dbp = dbp = (DB *)malloc(sizeof(DB))) == NULL)
-		goto err;
-	memset(t->bt_dbp, 0, sizeof(DB));
-	if (t->bt_lorder != machine_lorder)
-		F_SET(t, B_NEEDSWAP);
-
-	dbp->type = DB_BTREE;
-	dbp->internal = t;
-	dbp->close = __bt_close;
-	dbp->del = __bt_delete;
-	dbp->fd = __bt_fd;
-	dbp->get = __bt_get;
-	dbp->put = __bt_put;
-	dbp->seq = __bt_seq;
-	dbp->sync = __bt_sync;
-
-	/*
-	 * If no file name was supplied, this is an in-memory btree and we
-	 * open a backing temporary file.  Otherwise, it's a disk-based tree.
-	 */
-	if (fname) {
-		switch (flags & O_ACCMODE) {
-		case O_RDONLY:
-			F_SET(t, B_RDONLY);
-			break;
-		case O_RDWR:
-			break;
-		case O_WRONLY:
-		default:
-			goto einval;
-		}
-		
-		if ((t->bt_fd = _open(fname, flags, mode)) < 0)
-			goto err;
-
-	} else {
-		if ((flags & O_ACCMODE) != O_RDWR)
-			goto einval;
-		if ((t->bt_fd = tmp()) == -1)
-			goto err;
-		F_SET(t, B_INMEM);
-	}
-
-	if (_fcntl(t->bt_fd, F_SETFD, 1) == -1)
-		goto err;
-
-	if (_fstat(t->bt_fd, &sb))
-		goto err;
-	if (sb.st_size) {
-		if ((nr = _read(t->bt_fd, &m, sizeof(BTMETA))) < 0)
-			goto err;
-		if (nr != sizeof(BTMETA))
-			goto eftype;
-
-		/*
-		 * Read in the meta-data.  This can change the notion of what
-		 * the lorder, page size and flags are, and, when the page size
-		 * changes, the cachesize value can change too.  If the user
-		 * specified the wrong byte order for an existing database, we
-		 * don't bother to return an error, we just clear the NEEDSWAP
-		 * bit.
-		 */
-		if (m.magic == BTREEMAGIC)
-			F_CLR(t, B_NEEDSWAP);
-		else {
-			F_SET(t, B_NEEDSWAP);
-			M_32_SWAP(m.magic);
-			M_32_SWAP(m.version);
-			M_32_SWAP(m.psize);
-			M_32_SWAP(m.free);
-			M_32_SWAP(m.nrecs);
-			M_32_SWAP(m.flags);
-		}
-		if (m.magic != BTREEMAGIC || m.version != BTREEVERSION)
-			goto eftype;
-		if (m.psize < MINPSIZE || m.psize > MAX_PAGE_OFFSET + 1 ||
-		    m.psize & (sizeof(indx_t) - 1) )
-			goto eftype;
-		if (m.flags & ~SAVEMETA)
-			goto eftype;
-		b.psize = m.psize;
-		F_SET(t, m.flags);
-		t->bt_free = m.free;
-		t->bt_nrecs = m.nrecs;
-	} else {
-		/*
-		 * Set the page size to the best value for I/O to this file.
-		 * Don't overflow the page offset type.
-		 */
-		if (b.psize == 0) {
-			b.psize = sb.st_blksize;
-			if (b.psize < MINPSIZE)
-				b.psize = MINPSIZE;
-			if (b.psize > MAX_PAGE_OFFSET + 1)
-				b.psize = MAX_PAGE_OFFSET + 1;
-		}
-
-		/* Set flag if duplicates permitted. */
-		if (!(b.flags & R_DUP))
-			F_SET(t, B_NODUPS);
-
-		t->bt_free = P_INVALID;
-		t->bt_nrecs = 0;
-		F_SET(t, B_METADIRTY);
-	}
-
-	t->bt_psize = b.psize;
-
-	/* Set the cache size; must be a multiple of the page size. */
-	if (b.cachesize && b.cachesize & (b.psize - 1) )
-		b.cachesize += (~b.cachesize & (b.psize - 1) ) + 1;
-	if (b.cachesize < b.psize * MINCACHE)
-		b.cachesize = b.psize * MINCACHE;
-
-	/* Calculate number of pages to cache. */
-	ncache = (b.cachesize + t->bt_psize - 1) / t->bt_psize;
-
-	/*
-	 * The btree data structure requires that at least two keys can fit on
-	 * a page, but other than that there's no fixed requirement.  The user
-	 * specified a minimum number per page, and we translated that into the
-	 * number of bytes a key/data pair can use before being placed on an
-	 * overflow page.  This calculation includes the page header, the size
-	 * of the index referencing the leaf item and the size of the leaf item
-	 * structure.  Also, don't let the user specify a minkeypage such that
-	 * a key/data pair won't fit even if both key and data are on overflow
-	 * pages.
-	 */
-	t->bt_ovflsize = (t->bt_psize - BTDATAOFF) / b.minkeypage -
-	    (sizeof(indx_t) + NBLEAFDBT(0, 0));
-	if (t->bt_ovflsize < NBLEAFDBT(NOVFLSIZE, NOVFLSIZE) + sizeof(indx_t))
-		t->bt_ovflsize =
-		    NBLEAFDBT(NOVFLSIZE, NOVFLSIZE) + sizeof(indx_t);
-
-	/* Initialize the buffer pool. */
-	if ((t->bt_mp =
-	    mpool_open(NULL, t->bt_fd, t->bt_psize, ncache)) == NULL)
-		goto err;
-	if (!F_ISSET(t, B_INMEM))
-		mpool_filter(t->bt_mp, __bt_pgin, __bt_pgout, t);
-
-	/* Create a root page if new tree. */
-	if (nroot(t) == RET_ERROR)
-		goto err;
-
-	/* Global flags. */
-	if (dflags & DB_LOCK)
-		F_SET(t, B_DB_LOCK);
-	if (dflags & DB_SHMEM)
-		F_SET(t, B_DB_SHMEM);
-	if (dflags & DB_TXN)
-		F_SET(t, B_DB_TXN);
-
-	return (dbp);
-
-einval:	errno = EINVAL;
-	goto err;
-
-eftype:	errno = EFTYPE;
-	goto err;
-
-err:	if (t) {
-		if (t->bt_dbp)
-			free(t->bt_dbp);
-		if (t->bt_fd != -1)
-			(void)_close(t->bt_fd);
-		free(t);
-	}
-	return (NULL);
-}
-
-/*
- * NROOT -- Create the root of a new tree.
- *
- * Parameters:
- *	t:	tree
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-nroot(t)
-	BTREE *t;
-{
-	PAGE *meta, *root;
-	pgno_t npg;
-
-	if ((meta = mpool_get(t->bt_mp, 0, 0)) != NULL) {
-		mpool_put(t->bt_mp, meta, 0);
-		return (RET_SUCCESS);
-	}
-	if (errno != EINVAL)		/* It's OK to not exist. */
-		return (RET_ERROR);
-	errno = 0;
-
-	if ((meta = mpool_new(t->bt_mp, &npg)) == NULL)
-		return (RET_ERROR);
-
-	if ((root = mpool_new(t->bt_mp, &npg)) == NULL)
-		return (RET_ERROR);
-
-	if (npg != P_ROOT)
-		return (RET_ERROR);
-	root->pgno = npg;
-	root->prevpg = root->nextpg = P_INVALID;
-	root->lower = BTDATAOFF;
-	root->upper = t->bt_psize;
-	root->flags = P_BLEAF;
-	memset(meta, 0, t->bt_psize);
-	mpool_put(t->bt_mp, meta, MPOOL_DIRTY);
-	mpool_put(t->bt_mp, root, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
-
-static int
-tmp()
-{
-	sigset_t set, oset;
-	int fd;
-	char *envtmp = NULL;
-	char path[MAXPATHLEN];
-
-	if (issetugid() == 0)
-		envtmp = getenv("TMPDIR");
-	(void)snprintf(path,
-	    sizeof(path), "%s/bt.XXXXXXXXXX", envtmp ? envtmp : "/tmp");
-
-	(void)sigfillset(&set);
-	(void)_sigprocmask(SIG_BLOCK, &set, &oset);
-	if ((fd = mkstemp(path)) != -1)
-		(void)unlink(path);
-	(void)_sigprocmask(SIG_SETMASK, &oset, NULL);
-	return(fd);
-}
-
-static int
-byteorder()
-{
-	uint32_t x;
-	u_char *p;
-
-	x = 0x01020304;
-	p = (u_char *)&x;
-	switch (*p) {
-	case 1:
-		return (BIG_ENDIAN);
-	case 4:
-		return (LITTLE_ENDIAN);
-	default:
-		return (0);
-	}
-}
-
-int
-__bt_fd(dbp)
-        const DB *dbp;
-{
-	BTREE *t;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* In-memory database can't have a file descriptor. */
-	if (F_ISSET(t, B_INMEM)) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (t->bt_fd);
-}
diff --git a/lib/libc/db/btree/bt_overflow.c b/lib/libc/db/btree/bt_overflow.c
deleted file mode 100644
index 71abaa2..0000000
--- a/lib/libc/db/btree/bt_overflow.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_overflow.c	8.5 (Berkeley) 7/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_overflow.c,v 1.3 2002/03/22 21:52:01 obrien Exp $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * Big key/data code.
- *
- * Big key and data entries are stored on linked lists of pages.  The initial
- * reference is byte string stored with the key or data and is the page number
- * and size.  The actual record is stored in a chain of pages linked by the
- * nextpg field of the PAGE header.
- *
- * The first page of the chain has a special property.  If the record is used
- * by an internal page, it cannot be deleted and the P_PRESERVE bit will be set
- * in the header.
- *
- * XXX
- * A single DBT is written to each chain, so a lot of space on the last page
- * is wasted.  This is a fairly major bug for some data sets.
- */
-
-/*
- * __OVFL_GET -- Get an overflow key/data item.
- *
- * Parameters:
- *	t:	tree
- *	p:	pointer to { pgno_t, uint32_t }
- *	buf:	storage address
- *	bufsz:	storage size
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__ovfl_get(t, p, ssz, buf, bufsz)
-	BTREE *t;
-	void *p;
-	size_t *ssz;
-	void **buf;
-	size_t *bufsz;
-{
-	PAGE *h;
-	pgno_t pg;
-	size_t nb, plen;
-	uint32_t sz;
-
-	memmove(&pg, p, sizeof(pgno_t));
-	memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t));
-	*ssz = sz;
-
-#ifdef DEBUG
-	if (pg == P_INVALID || sz == 0)
-		abort();
-#endif
-	/* Make the buffer bigger as necessary. */
-	if (*bufsz < sz) {
-		*buf = (char *)(*buf == NULL ? malloc(sz) : reallocf(*buf, sz));
-		if (*buf == NULL)
-			return (RET_ERROR);
-		*bufsz = sz;
-	}
-
-	/*
-	 * Step through the linked list of pages, copying the data on each one
-	 * into the buffer.  Never copy more than the data's length.
-	 */
-	plen = t->bt_psize - BTDATAOFF;
-	for (p = *buf;; p = (char *)p + nb, pg = h->nextpg) {
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (RET_ERROR);
-
-		nb = MIN(sz, plen);
-		memmove(p, (char *)h + BTDATAOFF, nb);
-		mpool_put(t->bt_mp, h, 0);
-
-		if ((sz -= nb) == 0)
-			break;
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __OVFL_PUT -- Store an overflow key/data item.
- *
- * Parameters:
- *	t:	tree
- *	data:	DBT to store
- *	pgno:	storage page number
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__ovfl_put(t, dbt, pg)
-	BTREE *t;
-	const DBT *dbt;
-	pgno_t *pg;
-{
-	PAGE *h, *last;
-	void *p;
-	pgno_t npg;
-	size_t nb, plen;
-	uint32_t sz;
-
-	/*
-	 * Allocate pages and copy the key/data record into them.  Store the
-	 * number of the first page in the chain.
-	 */
-	plen = t->bt_psize - BTDATAOFF;
-	for (last = NULL, p = dbt->data, sz = dbt->size;;
-	    p = (char *)p + plen, last = h) {
-		if ((h = __bt_new(t, &npg)) == NULL)
-			return (RET_ERROR);
-
-		h->pgno = npg;
-		h->nextpg = h->prevpg = P_INVALID;
-		h->flags = P_OVERFLOW;
-		h->lower = h->upper = 0;
-
-		nb = MIN(sz, plen);
-		memmove((char *)h + BTDATAOFF, p, nb);
-
-		if (last) {
-			last->nextpg = h->pgno;
-			mpool_put(t->bt_mp, last, MPOOL_DIRTY);
-		} else
-			*pg = h->pgno;
-
-		if ((sz -= nb) == 0) {
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		}
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __OVFL_DELETE -- Delete an overflow chain.
- *
- * Parameters:
- *	t:	tree
- *	p:	pointer to { pgno_t, uint32_t }
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__ovfl_delete(t, p)
-	BTREE *t;
-	void *p;
-{
-	PAGE *h;
-	pgno_t pg;
-	size_t plen;
-	uint32_t sz;
-
-	memmove(&pg, p, sizeof(pgno_t));
-	memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t));
-
-#ifdef DEBUG
-	if (pg == P_INVALID || sz == 0)
-		abort();
-#endif
-	if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-		return (RET_ERROR);
-
-	/* Don't delete chains used by internal pages. */
-	if (h->flags & P_PRESERVE) {
-		mpool_put(t->bt_mp, h, 0);
-		return (RET_SUCCESS);
-	}
-
-	/* Step through the chain, calling the free routine for each page. */
-	for (plen = t->bt_psize - BTDATAOFF;; sz -= plen) {
-		pg = h->nextpg;
-		__bt_free(t, h);
-		if (sz <= plen)
-			break;
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (RET_ERROR);
-	}
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/btree/bt_page.c b/lib/libc/db/btree/bt_page.c
deleted file mode 100644
index 3392709..0000000
--- a/lib/libc/db/btree/bt_page.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_page.c	8.3 (Berkeley) 7/14/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_page.c,v 1.3 2002/03/22 21:52:01 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * __bt_free --
- *	Put a page on the freelist.
- *
- * Parameters:
- *	t:	tree
- *	h:	page to free
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- *
- * Side-effect:
- *	mpool_put's the page.
- */
-int
-__bt_free(t, h)
-	BTREE *t;
-	PAGE *h;
-{
-	/* Insert the page at the head of the free list. */
-	h->prevpg = P_INVALID;
-	h->nextpg = t->bt_free;
-	t->bt_free = h->pgno;
-	F_SET(t, B_METADIRTY);
-
-	/* Make sure the page gets written back. */
-	return (mpool_put(t->bt_mp, h, MPOOL_DIRTY));
-}
-
-/*
- * __bt_new --
- *	Get a new page, preferably from the freelist.
- *
- * Parameters:
- *	t:	tree
- *	npg:	storage for page number.
- *
- * Returns:
- *	Pointer to a page, NULL on error.
- */
-PAGE *
-__bt_new(t, npg)
-	BTREE *t;
-	pgno_t *npg;
-{
-	PAGE *h;
-
-	if (t->bt_free != P_INVALID &&
-	    (h = mpool_get(t->bt_mp, t->bt_free, 0)) != NULL) {
-		*npg = t->bt_free;
-		t->bt_free = h->nextpg;
-		F_SET(t, B_METADIRTY);
-		return (h);
-	}
-	return (mpool_new(t->bt_mp, npg));
-}
diff --git a/lib/libc/db/btree/bt_put.c b/lib/libc/db/btree/bt_put.c
deleted file mode 100644
index a2b0b16..0000000
--- a/lib/libc/db/btree/bt_put.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_put.c	8.8 (Berkeley) 7/26/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.4 2003/05/30 11:05:08 tmm Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-static EPG *bt_fast(BTREE *, const DBT *, const DBT *, int *);
-
-/*
- * __BT_PUT -- Add a btree item to the tree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key
- *	data:	data
- *	flag:	R_NOOVERWRITE
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key is already in the
- *	tree and R_NOOVERWRITE specified.
- */
-int
-__bt_put(dbp, key, data, flags)
-	const DB *dbp;
-	DBT *key;
-	const DBT *data;
-	u_int flags;
-{
-	BTREE *t;
-	DBT tkey, tdata;
-	EPG *e;
-	PAGE *h;
-	indx_t index, nxtindex;
-	pgno_t pg;
-	uint32_t nbytes, tmp;
-	int dflags, exact, status;
-	char *dest, db[NOVFLSIZE], kb[NOVFLSIZE];
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Check for change to a read-only tree. */
-	if (F_ISSET(t, B_RDONLY)) {
-		errno = EPERM;
-		return (RET_ERROR);
-	}
-
-	switch (flags) {
-	case 0:
-	case R_NOOVERWRITE:
-		break;
-	case R_CURSOR:
-		/*
-		 * If flags is R_CURSOR, put the cursor.  Must already
-		 * have started a scan and not have already deleted it.
-		 */
-		if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-		    !F_ISSET(&t->bt_cursor,
-		        CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE))
-			break;
-		/* FALLTHROUGH */
-	default:
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	/*
-	 * If the key/data pair won't fit on a page, store it on overflow
-	 * pages.  Only put the key on the overflow page if the pair are
-	 * still too big after moving the data to an overflow page.
-	 *
-	 * XXX
-	 * If the insert fails later on, the overflow pages aren't recovered.
-	 */
-	dflags = 0;
-	if (key->size + data->size > t->bt_ovflsize) {
-		if (key->size > t->bt_ovflsize) {
-storekey:		if (__ovfl_put(t, key, &pg) == RET_ERROR)
-				return (RET_ERROR);
-			tkey.data = kb;
-			tkey.size = NOVFLSIZE;
-			memmove(kb, &pg, sizeof(pgno_t));
-			tmp = key->size;
-			memmove(kb + sizeof(pgno_t),
-			    &tmp, sizeof(uint32_t));
-			dflags |= P_BIGKEY;
-			key = &tkey;
-		}
-		if (key->size + data->size > t->bt_ovflsize) {
-			if (__ovfl_put(t, data, &pg) == RET_ERROR)
-				return (RET_ERROR);
-			tdata.data = db;
-			tdata.size = NOVFLSIZE;
-			memmove(db, &pg, sizeof(pgno_t));
-			tmp = data->size;
-			memmove(db + sizeof(pgno_t),
-			    &tmp, sizeof(uint32_t));
-			dflags |= P_BIGDATA;
-			data = &tdata;
-		}
-		if (key->size + data->size > t->bt_ovflsize)
-			goto storekey;
-	}
-
-	/* Replace the cursor. */
-	if (flags == R_CURSOR) {
-		if ((h = mpool_get(t->bt_mp, t->bt_cursor.pg.pgno, 0)) == NULL)
-			return (RET_ERROR);
-		index = t->bt_cursor.pg.index;
-		goto delete;
-	}
-
-	/*
-	 * Find the key to delete, or, the location at which to insert.
-	 * Bt_fast and __bt_search both pin the returned page.
-	 */
-	if (t->bt_order == NOT || (e = bt_fast(t, key, data, &exact)) == NULL)
-		if ((e = __bt_search(t, key, &exact)) == NULL)
-			return (RET_ERROR);
-	h = e->page;
-	index = e->index;
-
-	/*
-	 * Add the key/data pair to the tree.  If an identical key is already
-	 * in the tree, and R_NOOVERWRITE is set, an error is returned.  If
-	 * R_NOOVERWRITE is not set, the key is either added (if duplicates are
-	 * permitted) or an error is returned.
-	 */
-	switch (flags) {
-	case R_NOOVERWRITE:
-		if (!exact)
-			break;
-		mpool_put(t->bt_mp, h, 0);
-		return (RET_SPECIAL);
-	default:
-		if (!exact || !F_ISSET(t, B_NODUPS))
-			break;
-		/*
-		 * !!!
-		 * Note, the delete may empty the page, so we need to put a
-		 * new entry into the page immediately.
-		 */
-delete:		if (__bt_dleaf(t, key, h, index) == RET_ERROR) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		break;
-	}
-
-	/*
-	 * If not enough room, or the user has put a ceiling on the number of
-	 * keys permitted in the page, split the page.  The split code will
-	 * insert the key and data and unpin the current page.  If inserting
-	 * into the offset array, shift the pointers up.
-	 */
-	nbytes = NBLEAFDBT(key->size, data->size);
-	if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
-		if ((status = __bt_split(t, h, key,
-		    data, dflags, nbytes, index)) != RET_SUCCESS)
-			return (status);
-		goto success;
-	}
-
-	if (index < (nxtindex = NEXTINDEX(h)))
-		memmove(h->linp + index + 1, h->linp + index,
-		    (nxtindex - index) * sizeof(indx_t));
-	h->lower += sizeof(indx_t);
-
-	h->linp[index] = h->upper -= nbytes;
-	dest = (char *)h + h->upper;
-	WR_BLEAF(dest, key, data, dflags);
-
-	/* If the cursor is on this page, adjust it as necessary. */
-	if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-	    !F_ISSET(&t->bt_cursor, CURS_ACQUIRE) &&
-	    t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index >= index)
-		++t->bt_cursor.pg.index;
-
-	if (t->bt_order == NOT) {
-		if (h->nextpg == P_INVALID) {
-			if (index == NEXTINDEX(h) - 1) {
-				t->bt_order = FORWARD;
-				t->bt_last.index = index;
-				t->bt_last.pgno = h->pgno;
-			}
-		} else if (h->prevpg == P_INVALID) {
-			if (index == 0) {
-				t->bt_order = BACK;
-				t->bt_last.index = 0;
-				t->bt_last.pgno = h->pgno;
-			}
-		}
-	}
-
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-success:
-	if (flags == R_SETCURSOR)
-		__bt_setcur(t, e->page->pgno, e->index);
-
-	F_SET(t, B_MODIFIED);
-	return (RET_SUCCESS);
-}
-
-#ifdef STATISTICS
-u_long bt_cache_hit, bt_cache_miss;
-#endif
-
-/*
- * BT_FAST -- Do a quick check for sorted data.
- *
- * Parameters:
- *	t:	tree
- *	key:	key to insert
- *
- * Returns:
- * 	EPG for new record or NULL if not found.
- */
-static EPG *
-bt_fast(t, key, data, exactp)
-	BTREE *t;
-	const DBT *key, *data;
-	int *exactp;
-{
-	PAGE *h;
-	uint32_t nbytes;
-	int cmp;
-
-	if ((h = mpool_get(t->bt_mp, t->bt_last.pgno, 0)) == NULL) {
-		t->bt_order = NOT;
-		return (NULL);
-	}
-	t->bt_cur.page = h;
-	t->bt_cur.index = t->bt_last.index;
-
-	/*
-	 * If won't fit in this page or have too many keys in this page,
-	 * have to search to get split stack.
-	 */
-	nbytes = NBLEAFDBT(key->size, data->size);
-	if (h->upper - h->lower < nbytes + sizeof(indx_t))
-		goto miss;
-
-	if (t->bt_order == FORWARD) {
-		if (t->bt_cur.page->nextpg != P_INVALID)
-			goto miss;
-		if (t->bt_cur.index != NEXTINDEX(h) - 1)
-			goto miss;
-		if ((cmp = __bt_cmp(t, key, &t->bt_cur)) < 0)
-			goto miss;
-		t->bt_last.index = cmp ? ++t->bt_cur.index : t->bt_cur.index;
-	} else {
-		if (t->bt_cur.page->prevpg != P_INVALID)
-			goto miss;
-		if (t->bt_cur.index != 0)
-			goto miss;
-		if ((cmp = __bt_cmp(t, key, &t->bt_cur)) > 0)
-			goto miss;
-		t->bt_last.index = 0;
-	}
-	*exactp = cmp == 0;
-#ifdef STATISTICS
-	++bt_cache_hit;
-#endif
-	return (&t->bt_cur);
-
-miss:
-#ifdef STATISTICS
-	++bt_cache_miss;
-#endif
-	t->bt_order = NOT;
-	mpool_put(t->bt_mp, h, 0);
-	return (NULL);
-}
diff --git a/lib/libc/db/btree/bt_search.c b/lib/libc/db/btree/bt_search.c
deleted file mode 100644
index cee177d..0000000
--- a/lib/libc/db/btree/bt_search.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_search.c	8.8 (Berkeley) 7/31/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_search.c,v 1.2 2002/03/21 22:46:25 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int __bt_snext(BTREE *, PAGE *, const DBT *, int *);
-static int __bt_sprev(BTREE *, PAGE *, const DBT *, int *);
-
-/*
- * __bt_search --
- *	Search a btree for a key.
- *
- * Parameters:
- *	t:	tree to search
- *	key:	key to find
- *	exactp:	pointer to exact match flag
- *
- * Returns:
- *	The EPG for matching record, if any, or the EPG for the location
- *	of the key, if it were inserted into the tree, is entered into
- *	the bt_cur field of the tree.  A pointer to the field is returned.
- */
-EPG *
-__bt_search(t, key, exactp)
-	BTREE *t;
-	const DBT *key;
-	int *exactp;
-{
-	PAGE *h;
-	indx_t base, index, lim;
-	pgno_t pg;
-	int cmp;
-
-	BT_CLR(t);
-	for (pg = P_ROOT;;) {
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (NULL);
-
-		/* Do a binary search on the current page. */
-		t->bt_cur.page = h;
-		for (base = 0, lim = NEXTINDEX(h); lim; lim >>= 1) {
-			t->bt_cur.index = index = base + (lim >> 1);
-			if ((cmp = __bt_cmp(t, key, &t->bt_cur)) == 0) {
-				if (h->flags & P_BLEAF) {
-					*exactp = 1;
-					return (&t->bt_cur);
-				}
-				goto next;
-			}
-			if (cmp > 0) {
-				base = index + 1;
-				--lim;
-			}
-		}
-
-		/*
-		 * If it's a leaf page, we're almost done.  If no duplicates
-		 * are allowed, or we have an exact match, we're done.  Else,
-		 * it's possible that there were matching keys on this page,
-		 * which later deleted, and we're on a page with no matches
-		 * while there are matches on other pages.  If at the start or
-		 * end of a page, check the adjacent page.
-		 */
-		if (h->flags & P_BLEAF) {
-			if (!F_ISSET(t, B_NODUPS)) {
-				if (base == 0 &&
-				    h->prevpg != P_INVALID &&
-				    __bt_sprev(t, h, key, exactp))
-					return (&t->bt_cur);
-				if (base == NEXTINDEX(h) &&
-				    h->nextpg != P_INVALID &&
-				    __bt_snext(t, h, key, exactp))
-					return (&t->bt_cur);
-			}
-			*exactp = 0;
-			t->bt_cur.index = base;
-			return (&t->bt_cur);
-		}
-
-		/*
-		 * No match found.  Base is the smallest index greater than
-		 * key and may be zero or a last + 1 index.  If it's non-zero,
-		 * decrement by one, and record the internal page which should
-		 * be a parent page for the key.  If a split later occurs, the
-		 * inserted page will be to the right of the saved page.
-		 */
-		index = base ? base - 1 : base;
-
-next:		BT_PUSH(t, h->pgno, index);
-		pg = GETBINTERNAL(h, index)->pgno;
-		mpool_put(t->bt_mp, h, 0);
-	}
-}
-
-/*
- * __bt_snext --
- *	Check for an exact match after the key.
- *
- * Parameters:
- *	t:	tree
- *	h:	current page
- *	key:	key
- *	exactp:	pointer to exact match flag
- *
- * Returns:
- *	If an exact match found.
- */
-static int
-__bt_snext(t, h, key, exactp)
-	BTREE *t;
-	PAGE *h;
-	const DBT *key;
-	int *exactp;
-{
-	EPG e;
-
-	/*
-	 * Get the next page.  The key is either an exact
-	 * match, or not as good as the one we already have.
-	 */
-	if ((e.page = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL)
-		return (0);
-	e.index = 0;
-	if (__bt_cmp(t, key, &e) == 0) {
-		mpool_put(t->bt_mp, h, 0);
-		t->bt_cur = e;
-		*exactp = 1;
-		return (1);
-	}
-	mpool_put(t->bt_mp, e.page, 0);
-	return (0);
-}
-
-/*
- * __bt_sprev --
- *	Check for an exact match before the key.
- *
- * Parameters:
- *	t:	tree
- *	h:	current page
- *	key:	key
- *	exactp:	pointer to exact match flag
- *
- * Returns:
- *	If an exact match found.
- */
-static int
-__bt_sprev(t, h, key, exactp)
-	BTREE *t;
-	PAGE *h;
-	const DBT *key;
-	int *exactp;
-{
-	EPG e;
-
-	/*
-	 * Get the previous page.  The key is either an exact
-	 * match, or not as good as the one we already have.
-	 */
-	if ((e.page = mpool_get(t->bt_mp, h->prevpg, 0)) == NULL)
-		return (0);
-	e.index = NEXTINDEX(e.page) - 1;
-	if (__bt_cmp(t, key, &e) == 0) {
-		mpool_put(t->bt_mp, h, 0);
-		t->bt_cur = e;
-		*exactp = 1;
-		return (1);
-	}
-	mpool_put(t->bt_mp, e.page, 0);
-	return (0);
-}
diff --git a/lib/libc/db/btree/bt_seq.c b/lib/libc/db/btree/bt_seq.c
deleted file mode 100644
index 662e195..0000000
--- a/lib/libc/db/btree/bt_seq.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_seq.c	8.7 (Berkeley) 7/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_seq.c,v 1.3 2002/03/21 22:46:25 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int __bt_first(BTREE *, const DBT *, EPG *, int *);
-static int __bt_seqadv(BTREE *, EPG *, int);
-static int __bt_seqset(BTREE *, EPG *, DBT *, int);
-
-/*
- * Sequential scan support.
- *
- * The tree can be scanned sequentially, starting from either end of the
- * tree or from any specific key.  A scan request before any scanning is
- * done is initialized as starting from the least node.
- */
-
-/*
- * __bt_seq --
- *	Btree sequential scan interface.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key for positioning and return value
- *	data:	data return value
- *	flags:	R_CURSOR, R_FIRST, R_LAST, R_NEXT, R_PREV.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-int
-__bt_seq(dbp, key, data, flags)
-	const DB *dbp;
-	DBT *key, *data;
-	u_int flags;
-{
-	BTREE *t;
-	EPG e;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/*
-	 * If scan unitialized as yet, or starting at a specific record, set
-	 * the scan to a specific key.  Both __bt_seqset and __bt_seqadv pin
-	 * the page the cursor references if they're successful.
-	 */
-	switch (flags) {
-	case R_NEXT:
-	case R_PREV:
-		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
-			status = __bt_seqadv(t, &e, flags);
-			break;
-		}
-		/* FALLTHROUGH */
-	case R_FIRST:
-	case R_LAST:
-	case R_CURSOR:
-		status = __bt_seqset(t, &e, key, flags);
-		break;
-	default:
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (status == RET_SUCCESS) {
-		__bt_setcur(t, e.page->pgno, e.index);
-
-		status =
-		    __bt_ret(t, &e, key, &t->bt_rkey, data, &t->bt_rdata, 0);
-
-		/*
-		 * If the user is doing concurrent access, we copied the
-		 * key/data, toss the page.
-		 */
-		if (F_ISSET(t, B_DB_LOCK))
-			mpool_put(t->bt_mp, e.page, 0);
-		else
-			t->bt_pinned = e.page;
-	}
-	return (status);
-}
-
-/*
- * __bt_seqset --
- *	Set the sequential scan to a specific key.
- *
- * Parameters:
- *	t:	tree
- *	ep:	storage for returned key
- *	key:	key for initial scan position
- *	flags:	R_CURSOR, R_FIRST, R_LAST, R_NEXT, R_PREV
- *
- * Side effects:
- *	Pins the page the cursor references.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-static int
-__bt_seqset(t, ep, key, flags)
-	BTREE *t;
-	EPG *ep;
-	DBT *key;
-	int flags;
-{
-	PAGE *h;
-	pgno_t pg;
-	int exact;
-
-	/*
-	 * Find the first, last or specific key in the tree and point the
-	 * cursor at it.  The cursor may not be moved until a new key has
-	 * been found.
-	 */
-	switch (flags) {
-	case R_CURSOR:				/* Keyed scan. */
-		/*
-		 * Find the first instance of the key or the smallest key
-		 * which is greater than or equal to the specified key.
-		 */
-		if (key->data == NULL || key->size == 0) {
-			errno = EINVAL;
-			return (RET_ERROR);
-		}
-		return (__bt_first(t, key, ep, &exact));
-	case R_FIRST:				/* First record. */
-	case R_NEXT:
-		/* Walk down the left-hand side of the tree. */
-		for (pg = P_ROOT;;) {
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-
-			/* Check for an empty tree. */
-			if (NEXTINDEX(h) == 0) {
-				mpool_put(t->bt_mp, h, 0);
-				return (RET_SPECIAL);
-			}
-
-			if (h->flags & (P_BLEAF | P_RLEAF))
-				break;
-			pg = GETBINTERNAL(h, 0)->pgno;
-			mpool_put(t->bt_mp, h, 0);
-		}
-		ep->page = h;
-		ep->index = 0;
-		break;
-	case R_LAST:				/* Last record. */
-	case R_PREV:
-		/* Walk down the right-hand side of the tree. */
-		for (pg = P_ROOT;;) {
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-
-			/* Check for an empty tree. */
-			if (NEXTINDEX(h) == 0) {
-				mpool_put(t->bt_mp, h, 0);
-				return (RET_SPECIAL);
-			}
-
-			if (h->flags & (P_BLEAF | P_RLEAF))
-				break;
-			pg = GETBINTERNAL(h, NEXTINDEX(h) - 1)->pgno;
-			mpool_put(t->bt_mp, h, 0);
-		}
-
-		ep->page = h;
-		ep->index = NEXTINDEX(h) - 1;
-		break;
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_seqadvance --
- *	Advance the sequential scan.
- *
- * Parameters:
- *	t:	tree
- *	flags:	R_NEXT, R_PREV
- *
- * Side effects:
- *	Pins the page the new key/data record is on.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-static int
-__bt_seqadv(t, ep, flags)
-	BTREE *t;
-	EPG *ep;
-	int flags;
-{
-	CURSOR *c;
-	PAGE *h;
-	indx_t index;
-	pgno_t pg;
-	int exact;
-
-	/*
-	 * There are a couple of states that we can be in.  The cursor has
-	 * been initialized by the time we get here, but that's all we know.
-	 */
-	c = &t->bt_cursor;
-
-	/*
-	 * The cursor was deleted where there weren't any duplicate records,
-	 * so the key was saved.  Find out where that key would go in the
-	 * current tree.  It doesn't matter if the returned key is an exact
-	 * match or not -- if it's an exact match, the record was added after
-	 * the delete so we can just return it.  If not, as long as there's
-	 * a record there, return it.
-	 */
-	if (F_ISSET(c, CURS_ACQUIRE))
-		return (__bt_first(t, &c->key, ep, &exact));
-
-	/* Get the page referenced by the cursor. */
-	if ((h = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL)
-		return (RET_ERROR);
-
-	/*
- 	 * Find the next/previous record in the tree and point the cursor at
-	 * it.  The cursor may not be moved until a new key has been found.
-	 */
-	switch (flags) {
-	case R_NEXT:			/* Next record. */
-		/*
-		 * The cursor was deleted in duplicate records, and moved
-		 * forward to a record that has yet to be returned.  Clear
-		 * that flag, and return the record.
-		 */
-		if (F_ISSET(c, CURS_AFTER))
-			goto usecurrent;
-		index = c->pg.index;
-		if (++index == NEXTINDEX(h)) {
-			pg = h->nextpg;
-			mpool_put(t->bt_mp, h, 0);
-			if (pg == P_INVALID)
-				return (RET_SPECIAL);
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-			index = 0;
-		}
-		break;
-	case R_PREV:			/* Previous record. */
-		/*
-		 * The cursor was deleted in duplicate records, and moved
-		 * backward to a record that has yet to be returned.  Clear
-		 * that flag, and return the record.
-		 */
-		if (F_ISSET(c, CURS_BEFORE)) {
-usecurrent:		F_CLR(c, CURS_AFTER | CURS_BEFORE);
-			ep->page = h;
-			ep->index = c->pg.index;
-			return (RET_SUCCESS);
-		}
-		index = c->pg.index;
-		if (index == 0) {
-			pg = h->prevpg;
-			mpool_put(t->bt_mp, h, 0);
-			if (pg == P_INVALID)
-				return (RET_SPECIAL);
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-			index = NEXTINDEX(h) - 1;
-		} else
-			--index;
-		break;
-	}
-
-	ep->page = h;
-	ep->index = index;
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_first --
- *	Find the first entry.
- *
- * Parameters:
- *	t:	the tree
- *    key:	the key
- *  erval:	return EPG
- * exactp:	pointer to exact match flag
- *
- * Returns:
- *	The first entry in the tree greater than or equal to key,
- *	or RET_SPECIAL if no such key exists.
- */
-static int
-__bt_first(t, key, erval, exactp)
-	BTREE *t;
-	const DBT *key;
-	EPG *erval;
-	int *exactp;
-{
-	PAGE *h;
-	EPG *ep, save;
-	pgno_t pg;
-
-	/*
-	 * Find any matching record; __bt_search pins the page.
-	 *
-	 * If it's an exact match and duplicates are possible, walk backwards
-	 * in the tree until we find the first one.  Otherwise, make sure it's
-	 * a valid key (__bt_search may return an index just past the end of a
-	 * page) and return it.
-	 */
-	if ((ep = __bt_search(t, key, exactp)) == NULL)
-		return (0);
-	if (*exactp) {
-		if (F_ISSET(t, B_NODUPS)) {
-			*erval = *ep;
-			return (RET_SUCCESS);
-		}
-			
-		/*
-		 * Walk backwards, as long as the entry matches and there are
-		 * keys left in the tree.  Save a copy of each match in case
-		 * we go too far.
-		 */
-		save = *ep;
-		h = ep->page;
-		do {
-			if (save.page->pgno != ep->page->pgno) {
-				mpool_put(t->bt_mp, save.page, 0);
-				save = *ep;
-			} else
-				save.index = ep->index;
-
-			/*
-			 * Don't unpin the page the last (or original) match
-			 * was on, but make sure it's unpinned if an error
-			 * occurs.
-			 */
-			if (ep->index == 0) {
-				if (h->prevpg == P_INVALID)
-					break;
-				if (h->pgno != save.page->pgno)
-					mpool_put(t->bt_mp, h, 0);
-				if ((h = mpool_get(t->bt_mp,
-				    h->prevpg, 0)) == NULL) {
-					if (h->pgno == save.page->pgno)
-						mpool_put(t->bt_mp,
-						    save.page, 0);
-					return (RET_ERROR);
-				}
-				ep->page = h;
-				ep->index = NEXTINDEX(h);
-			}
-			--ep->index;
-		} while (__bt_cmp(t, key, ep) == 0);
-
-		/*
-		 * Reach here with the last page that was looked at pinned,
-		 * which may or may not be the same as the last (or original)
-		 * match page.  If it's not useful, release it.
-		 */
-		if (h->pgno != save.page->pgno)
-			mpool_put(t->bt_mp, h, 0);
-
-		*erval = save;
-		return (RET_SUCCESS);
-	}
-
-	/* If at the end of a page, find the next entry. */
-	if (ep->index == NEXTINDEX(ep->page)) {
-		h = ep->page;
-		pg = h->nextpg;
-		mpool_put(t->bt_mp, h, 0);
-		if (pg == P_INVALID)
-			return (RET_SPECIAL);
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (RET_ERROR);
-		ep->index = 0;
-		ep->page = h;
-	}
-	*erval = *ep;
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_setcur --
- *	Set the cursor to an entry in the tree.
- *
- * Parameters:
- *	t:	the tree
- *   pgno:	page number
- *  index:	page index
- */
-void
-__bt_setcur(t, pgno, index)
-	BTREE *t;
-	pgno_t pgno;
-	u_int index;
-{
-	/* Lose any already deleted key. */
-	if (t->bt_cursor.key.data != NULL) {
-		free(t->bt_cursor.key.data);
-		t->bt_cursor.key.size = 0;
-		t->bt_cursor.key.data = NULL;
-	}
-	F_CLR(&t->bt_cursor, CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE);
-
-	/* Update the cursor. */
-	t->bt_cursor.pg.pgno = pgno;
-	t->bt_cursor.pg.index = index;
-	F_SET(&t->bt_cursor, CURS_INIT);
-}
diff --git a/lib/libc/db/btree/bt_split.c b/lib/libc/db/btree/bt_split.c
deleted file mode 100644
index 6c767ee..0000000
--- a/lib/libc/db/btree/bt_split.c
+++ /dev/null
@@ -1,827 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_split.c	8.9 (Berkeley) 7/26/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.7 2004/09/13 22:07:24 kuriyama Exp $");
-
-#include <sys/types.h>
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int	 bt_broot(BTREE *, PAGE *, PAGE *, PAGE *);
-static PAGE	*bt_page (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
-static int	 bt_preserve(BTREE *, pgno_t);
-static PAGE	*bt_psplit (BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t);
-static PAGE	*bt_root (BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
-static int	 bt_rroot(BTREE *, PAGE *, PAGE *, PAGE *);
-static recno_t	 rec_total(PAGE *);
-
-#ifdef STATISTICS
-u_long	bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved;
-#endif
-
-/*
- * __BT_SPLIT -- Split the tree.
- *
- * Parameters:
- *	t:	tree
- *	sp:	page to split
- *	key:	key to insert
- *	data:	data to insert
- *	flags:	BIGKEY/BIGDATA flags
- *	ilen:	insert length
- *	skip:	index to leave open
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__bt_split(t, sp, key, data, flags, ilen, argskip)
-	BTREE *t;
-	PAGE *sp;
-	const DBT *key, *data;
-	int flags;
-	size_t ilen;
-	uint32_t argskip;
-{
-	BINTERNAL *bi;
-	BLEAF *bl, *tbl;
-	DBT a, b;
-	EPGNO *parent;
-	PAGE *h, *l, *r, *lchild, *rchild;
-	indx_t nxtindex;
-	u_int16_t skip;
-	uint32_t n, nbytes, nksize;
-	int parentsplit;
-	char *dest;
-
-	/*
-	 * Split the page into two pages, l and r.  The split routines return
-	 * a pointer to the page into which the key should be inserted and with
-	 * skip set to the offset which should be used.  Additionally, l and r
-	 * are pinned.
-	 */
-	skip = argskip;
-	h = sp->pgno == P_ROOT ?
-	    bt_root(t, sp, &l, &r, &skip, ilen) :
-	    bt_page(t, sp, &l, &r, &skip, ilen);
-	if (h == NULL)
-		return (RET_ERROR);
-
-	/*
-	 * Insert the new key/data pair into the leaf page.  (Key inserts
-	 * always cause a leaf page to split first.)
-	 */
-	h->linp[skip] = h->upper -= ilen;
-	dest = (char *)h + h->upper;
-	if (F_ISSET(t, R_RECNO))
-		WR_RLEAF(dest, data, flags)
-	else
-		WR_BLEAF(dest, key, data, flags)
-
-	/* If the root page was split, make it look right. */
-	if (sp->pgno == P_ROOT &&
-	    (F_ISSET(t, R_RECNO) ?
-	    bt_rroot(t, sp, l, r) : bt_broot(t, sp, l, r)) == RET_ERROR)
-		goto err2;
-
-	/*
-	 * Now we walk the parent page stack -- a LIFO stack of the pages that
-	 * were traversed when we searched for the page that split.  Each stack
-	 * entry is a page number and a page index offset.  The offset is for
-	 * the page traversed on the search.  We've just split a page, so we
-	 * have to insert a new key into the parent page.
-	 *
-	 * If the insert into the parent page causes it to split, may have to
-	 * continue splitting all the way up the tree.  We stop if the root
-	 * splits or the page inserted into didn't have to split to hold the
-	 * new key.  Some algorithms replace the key for the old page as well
-	 * as the new page.  We don't, as there's no reason to believe that the
-	 * first key on the old page is any better than the key we have, and,
-	 * in the case of a key being placed at index 0 causing the split, the
-	 * key is unavailable.
-	 *
-	 * There are a maximum of 5 pages pinned at any time.  We keep the left
-	 * and right pages pinned while working on the parent.   The 5 are the
-	 * two children, left parent and right parent (when the parent splits)
-	 * and the root page or the overflow key page when calling bt_preserve.
-	 * This code must make sure that all pins are released other than the
-	 * root page or overflow page which is unlocked elsewhere.
-	 */
-	while ((parent = BT_POP(t)) != NULL) {
-		lchild = l;
-		rchild = r;
-
-		/* Get the parent page. */
-		if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-			goto err2;
-
-	 	/*
-		 * The new key goes ONE AFTER the index, because the split
-		 * was to the right.
-		 */
-		skip = parent->index + 1;
-
-		/*
-		 * Calculate the space needed on the parent page.
-		 *
-		 * Prefix trees: space hack when inserting into BINTERNAL
-		 * pages.  Retain only what's needed to distinguish between
-		 * the new entry and the LAST entry on the page to its left.
-		 * If the keys compare equal, retain the entire key.  Note,
-		 * we don't touch overflow keys, and the entire key must be
-		 * retained for the next-to-left most key on the leftmost
-		 * page of each level, or the search will fail.  Applicable
-		 * ONLY to internal pages that have leaf pages as children.
-		 * Further reduction of the key between pairs of internal
-		 * pages loses too much information.
-		 */
-		switch (rchild->flags & P_TYPE) {
-		case P_BINTERNAL:
-			bi = GETBINTERNAL(rchild, 0);
-			nbytes = NBINTERNAL(bi->ksize);
-			break;
-		case P_BLEAF:
-			bl = GETBLEAF(rchild, 0);
-			nbytes = NBINTERNAL(bl->ksize);
-			if (t->bt_pfx && !(bl->flags & P_BIGKEY) &&
-			    (h->prevpg != P_INVALID || skip > 1)) {
-				tbl = GETBLEAF(lchild, NEXTINDEX(lchild) - 1);
-				a.size = tbl->ksize;
-				a.data = tbl->bytes;
-				b.size = bl->ksize;
-				b.data = bl->bytes;
-				nksize = t->bt_pfx(&a, &b);
-				n = NBINTERNAL(nksize);
-				if (n < nbytes) {
-#ifdef STATISTICS
-					bt_pfxsaved += nbytes - n;
-#endif
-					nbytes = n;
-				} else
-					nksize = 0;
-			} else
-				nksize = 0;
-			break;
-		case P_RINTERNAL:
-		case P_RLEAF:
-			nbytes = NRINTERNAL;
-			break;
-		default:
-			abort();
-		}
-
-		/* Split the parent page if necessary or shift the indices. */
-		if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
-			sp = h;
-			h = h->pgno == P_ROOT ?
-			    bt_root(t, h, &l, &r, &skip, nbytes) :
-			    bt_page(t, h, &l, &r, &skip, nbytes);
-			if (h == NULL)
-				goto err1;
-			parentsplit = 1;
-		} else {
-			if (skip < (nxtindex = NEXTINDEX(h)))
-				memmove(h->linp + skip + 1, h->linp + skip,
-				    (nxtindex - skip) * sizeof(indx_t));
-			h->lower += sizeof(indx_t);
-			parentsplit = 0;
-		}
-
-		/* Insert the key into the parent page. */
-		switch (rchild->flags & P_TYPE) {
-		case P_BINTERNAL:
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)h + h->linp[skip];
-			memmove(dest, bi, nbytes);
-			((BINTERNAL *)dest)->pgno = rchild->pgno;
-			break;
-		case P_BLEAF:
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)h + h->linp[skip];
-			WR_BINTERNAL(dest, nksize ? nksize : bl->ksize,
-			    rchild->pgno, bl->flags & P_BIGKEY);
-			memmove(dest, bl->bytes, nksize ? nksize : bl->ksize);
-			if (bl->flags & P_BIGKEY &&
-			    bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
-				goto err1;
-			break;
-		case P_RINTERNAL:
-			/*
-			 * Update the left page count.  If split
-			 * added at index 0, fix the correct page.
-			 */
-			if (skip > 0)
-				dest = (char *)h + h->linp[skip - 1];
-			else
-				dest = (char *)l + l->linp[NEXTINDEX(l) - 1];
-			((RINTERNAL *)dest)->nrecs = rec_total(lchild);
-			((RINTERNAL *)dest)->pgno = lchild->pgno;
-
-			/* Update the right page count. */
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)h + h->linp[skip];
-			((RINTERNAL *)dest)->nrecs = rec_total(rchild);
-			((RINTERNAL *)dest)->pgno = rchild->pgno;
-			break;
-		case P_RLEAF:
-			/*
-			 * Update the left page count.  If split
-			 * added at index 0, fix the correct page.
-			 */
-			if (skip > 0)
-				dest = (char *)h + h->linp[skip - 1];
-			else
-				dest = (char *)l + l->linp[NEXTINDEX(l) - 1];
-			((RINTERNAL *)dest)->nrecs = NEXTINDEX(lchild);
-			((RINTERNAL *)dest)->pgno = lchild->pgno;
-
-			/* Update the right page count. */
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)h + h->linp[skip];
-			((RINTERNAL *)dest)->nrecs = NEXTINDEX(rchild);
-			((RINTERNAL *)dest)->pgno = rchild->pgno;
-			break;
-		default:
-			abort();
-		}
-
-		/* Unpin the held pages. */
-		if (!parentsplit) {
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		}
-
-		/* If the root page was split, make it look right. */
-		if (sp->pgno == P_ROOT &&
-		    (F_ISSET(t, R_RECNO) ?
-		    bt_rroot(t, sp, l, r) : bt_broot(t, sp, l, r)) == RET_ERROR)
-			goto err1;
-
-		mpool_put(t->bt_mp, lchild, MPOOL_DIRTY);
-		mpool_put(t->bt_mp, rchild, MPOOL_DIRTY);
-	}
-
-	/* Unpin the held pages. */
-	mpool_put(t->bt_mp, l, MPOOL_DIRTY);
-	mpool_put(t->bt_mp, r, MPOOL_DIRTY);
-
-	/* Clear any pages left on the stack. */
-	return (RET_SUCCESS);
-
-	/*
-	 * If something fails in the above loop we were already walking back
-	 * up the tree and the tree is now inconsistent.  Nothing much we can
-	 * do about it but release any memory we're holding.
-	 */
-err1:	mpool_put(t->bt_mp, lchild, MPOOL_DIRTY);
-	mpool_put(t->bt_mp, rchild, MPOOL_DIRTY);
-
-err2:	mpool_put(t->bt_mp, l, 0);
-	mpool_put(t->bt_mp, r, 0);
-	__dbpanic(t->bt_dbp);
-	return (RET_ERROR);
-}
-
-/*
- * BT_PAGE -- Split a non-root page of a btree.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	lp:	pointer to left page pointer
- *	rp:	pointer to right page pointer
- *	skip:	pointer to index to leave open
- *	ilen:	insert length
- *
- * Returns:
- *	Pointer to page in which to insert or NULL on error.
- */
-static PAGE *
-bt_page(t, h, lp, rp, skip, ilen)
-	BTREE *t;
-	PAGE *h, **lp, **rp;
-	indx_t *skip;
-	size_t ilen;
-{
-	PAGE *l, *r, *tp;
-	pgno_t npg;
-
-#ifdef STATISTICS
-	++bt_split;
-#endif
-	/* Put the new right page for the split into place. */
-	if ((r = __bt_new(t, &npg)) == NULL)
-		return (NULL);
-	r->pgno = npg;
-	r->lower = BTDATAOFF;
-	r->upper = t->bt_psize;
-	r->nextpg = h->nextpg;
-	r->prevpg = h->pgno;
-	r->flags = h->flags & P_TYPE;
-
-	/*
-	 * If we're splitting the last page on a level because we're appending
-	 * a key to it (skip is NEXTINDEX()), it's likely that the data is
-	 * sorted.  Adding an empty page on the side of the level is less work
-	 * and can push the fill factor much higher than normal.  If we're
-	 * wrong it's no big deal, we'll just do the split the right way next
-	 * time.  It may look like it's equally easy to do a similar hack for
-	 * reverse sorted data, that is, split the tree left, but it's not.
-	 * Don't even try.
-	 */
-	if (h->nextpg == P_INVALID && *skip == NEXTINDEX(h)) {
-#ifdef STATISTICS
-		++bt_sortsplit;
-#endif
-		h->nextpg = r->pgno;
-		r->lower = BTDATAOFF + sizeof(indx_t);
-		*skip = 0;
-		*lp = h;
-		*rp = r;
-		return (r);
-	}
-
-	/* Put the new left page for the split into place. */
-	if ((l = (PAGE *)malloc(t->bt_psize)) == NULL) {
-		mpool_put(t->bt_mp, r, 0);
-		return (NULL);
-	}
-#ifdef PURIFY
-	memset(l, 0xff, t->bt_psize);
-#endif
-	l->pgno = h->pgno;
-	l->nextpg = r->pgno;
-	l->prevpg = h->prevpg;
-	l->lower = BTDATAOFF;
-	l->upper = t->bt_psize;
-	l->flags = h->flags & P_TYPE;
-
-	/* Fix up the previous pointer of the page after the split page. */
-	if (h->nextpg != P_INVALID) {
-		if ((tp = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL) {
-			free(l);
-			/* XXX mpool_free(t->bt_mp, r->pgno); */
-			return (NULL);
-		}
-		tp->prevpg = r->pgno;
-		mpool_put(t->bt_mp, tp, MPOOL_DIRTY);
-	}
-
-	/*
-	 * Split right.  The key/data pairs aren't sorted in the btree page so
-	 * it's simpler to copy the data from the split page onto two new pages
-	 * instead of copying half the data to the right page and compacting
-	 * the left page in place.  Since the left page can't change, we have
-	 * to swap the original and the allocated left page after the split.
-	 */
-	tp = bt_psplit(t, h, l, r, skip, ilen);
-
-	/* Move the new left page onto the old left page. */
-	memmove(h, l, t->bt_psize);
-	if (tp == l)
-		tp = h;
-	free(l);
-
-	*lp = h;
-	*rp = r;
-	return (tp);
-}
-
-/*
- * BT_ROOT -- Split the root page of a btree.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	lp:	pointer to left page pointer
- *	rp:	pointer to right page pointer
- *	skip:	pointer to index to leave open
- *	ilen:	insert length
- *
- * Returns:
- *	Pointer to page in which to insert or NULL on error.
- */
-static PAGE *
-bt_root(t, h, lp, rp, skip, ilen)
-	BTREE *t;
-	PAGE *h, **lp, **rp;
-	indx_t *skip;
-	size_t ilen;
-{
-	PAGE *l, *r, *tp;
-	pgno_t lnpg, rnpg;
-
-#ifdef STATISTICS
-	++bt_split;
-	++bt_rootsplit;
-#endif
-	/* Put the new left and right pages for the split into place. */
-	if ((l = __bt_new(t, &lnpg)) == NULL ||
-	    (r = __bt_new(t, &rnpg)) == NULL)
-		return (NULL);
-	l->pgno = lnpg;
-	r->pgno = rnpg;
-	l->nextpg = r->pgno;
-	r->prevpg = l->pgno;
-	l->prevpg = r->nextpg = P_INVALID;
-	l->lower = r->lower = BTDATAOFF;
-	l->upper = r->upper = t->bt_psize;
-	l->flags = r->flags = h->flags & P_TYPE;
-
-	/* Split the root page. */
-	tp = bt_psplit(t, h, l, r, skip, ilen);
-
-	*lp = l;
-	*rp = r;
-	return (tp);
-}
-
-/*
- * BT_RROOT -- Fix up the recno root page after it has been split.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	l:	left page
- *	r:	right page
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-bt_rroot(t, h, l, r)
-	BTREE *t;
-	PAGE *h, *l, *r;
-{
-	char *dest;
-
-	/* Insert the left and right keys, set the header information. */
-	h->linp[0] = h->upper = t->bt_psize - NRINTERNAL;
-	dest = (char *)h + h->upper;
-	WR_RINTERNAL(dest,
-	    l->flags & P_RLEAF ? NEXTINDEX(l) : rec_total(l), l->pgno);
-
-	h->linp[1] = h->upper -= NRINTERNAL;
-	dest = (char *)h + h->upper;
-	WR_RINTERNAL(dest,
-	    r->flags & P_RLEAF ? NEXTINDEX(r) : rec_total(r), r->pgno);
-
-	h->lower = BTDATAOFF + 2 * sizeof(indx_t);
-
-	/* Unpin the root page, set to recno internal page. */
-	h->flags &= ~P_TYPE;
-	h->flags |= P_RINTERNAL;
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	return (RET_SUCCESS);
-}
-
-/*
- * BT_BROOT -- Fix up the btree root page after it has been split.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	l:	left page
- *	r:	right page
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-bt_broot(t, h, l, r)
-	BTREE *t;
-	PAGE *h, *l, *r;
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	uint32_t nbytes;
-	char *dest;
-
-	/*
-	 * If the root page was a leaf page, change it into an internal page.
-	 * We copy the key we split on (but not the key's data, in the case of
-	 * a leaf page) to the new root page.
-	 *
-	 * The btree comparison code guarantees that the left-most key on any
-	 * level of the tree is never used, so it doesn't need to be filled in.
-	 */
-	nbytes = NBINTERNAL(0);
-	h->linp[0] = h->upper = t->bt_psize - nbytes;
-	dest = (char *)h + h->upper;
-	WR_BINTERNAL(dest, 0, l->pgno, 0);
-
-	switch (h->flags & P_TYPE) {
-	case P_BLEAF:
-		bl = GETBLEAF(r, 0);
-		nbytes = NBINTERNAL(bl->ksize);
-		h->linp[1] = h->upper -= nbytes;
-		dest = (char *)h + h->upper;
-		WR_BINTERNAL(dest, bl->ksize, r->pgno, 0);
-		memmove(dest, bl->bytes, bl->ksize);
-
-		/*
-		 * If the key is on an overflow page, mark the overflow chain
-		 * so it isn't deleted when the leaf copy of the key is deleted.
-		 */
-		if (bl->flags & P_BIGKEY &&
-		    bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
-			return (RET_ERROR);
-		break;
-	case P_BINTERNAL:
-		bi = GETBINTERNAL(r, 0);
-		nbytes = NBINTERNAL(bi->ksize);
-		h->linp[1] = h->upper -= nbytes;
-		dest = (char *)h + h->upper;
-		memmove(dest, bi, nbytes);
-		((BINTERNAL *)dest)->pgno = r->pgno;
-		break;
-	default:
-		abort();
-	}
-
-	/* There are two keys on the page. */
-	h->lower = BTDATAOFF + 2 * sizeof(indx_t);
-
-	/* Unpin the root page, set to btree internal page. */
-	h->flags &= ~P_TYPE;
-	h->flags |= P_BINTERNAL;
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	return (RET_SUCCESS);
-}
-
-/*
- * BT_PSPLIT -- Do the real work of splitting the page.
- *
- * Parameters:
- *	t:	tree
- *	h:	page to be split
- *	l:	page to put lower half of data
- *	r:	page to put upper half of data
- *	pskip:	pointer to index to leave open
- *	ilen:	insert length
- *
- * Returns:
- *	Pointer to page in which to insert.
- */
-static PAGE *
-bt_psplit(t, h, l, r, pskip, ilen)
-	BTREE *t;
-	PAGE *h, *l, *r;
-	indx_t *pskip;
-	size_t ilen;
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	CURSOR *c;
-	RLEAF *rl;
-	PAGE *rval;
-	void *src;
-	indx_t full, half, nxt, off, skip, top, used;
-	uint32_t nbytes;
-	int bigkeycnt, isbigkey;
-
-	/*
-	 * Split the data to the left and right pages.  Leave the skip index
-	 * open.  Additionally, make some effort not to split on an overflow
-	 * key.  This makes internal page processing faster and can save
-	 * space as overflow keys used by internal pages are never deleted.
-	 */
-	bigkeycnt = 0;
-	skip = *pskip;
-	full = t->bt_psize - BTDATAOFF;
-	half = full / 2;
-	used = 0;
-	for (nxt = off = 0, top = NEXTINDEX(h); nxt < top; ++off) {
-		if (skip == off) {
-			nbytes = ilen;
-			isbigkey = 0;		/* XXX: not really known. */
-		} else
-			switch (h->flags & P_TYPE) {
-			case P_BINTERNAL:
-				src = bi = GETBINTERNAL(h, nxt);
-				nbytes = NBINTERNAL(bi->ksize);
-				isbigkey = bi->flags & P_BIGKEY;
-				break;
-			case P_BLEAF:
-				src = bl = GETBLEAF(h, nxt);
-				nbytes = NBLEAF(bl);
-				isbigkey = bl->flags & P_BIGKEY;
-				break;
-			case P_RINTERNAL:
-				src = GETRINTERNAL(h, nxt);
-				nbytes = NRINTERNAL;
-				isbigkey = 0;
-				break;
-			case P_RLEAF:
-				src = rl = GETRLEAF(h, nxt);
-				nbytes = NRLEAF(rl);
-				isbigkey = 0;
-				break;
-			default:
-				abort();
-			}
-
-		/*
-		 * If the key/data pairs are substantial fractions of the max
-		 * possible size for the page, it's possible to get situations
-		 * where we decide to try and copy too much onto the left page.
-		 * Make sure that doesn't happen.
-		 */
-		if ((skip <= off && used + nbytes + sizeof(indx_t) >= full)
-		    || nxt == top - 1) {
-			--off;
-			break;
-		}
-
-		/* Copy the key/data pair, if not the skipped index. */
-		if (skip != off) {
-			++nxt;
-
-			l->linp[off] = l->upper -= nbytes;
-			memmove((char *)l + l->upper, src, nbytes);
-		}
-
-		used += nbytes + sizeof(indx_t);
-		if (used >= half) {
-			if (!isbigkey || bigkeycnt == 3)
-				break;
-			else
-				++bigkeycnt;
-		}
-	}
-
-	/*
-	 * Off is the last offset that's valid for the left page.
-	 * Nxt is the first offset to be placed on the right page.
-	 */
-	l->lower += (off + 1) * sizeof(indx_t);
-
-	/*
-	 * If splitting the page that the cursor was on, the cursor has to be
-	 * adjusted to point to the same record as before the split.  If the
-	 * cursor is at or past the skipped slot, the cursor is incremented by
-	 * one.  If the cursor is on the right page, it is decremented by the
-	 * number of records split to the left page.
-	 */
-	c = &t->bt_cursor;
-	if (F_ISSET(c, CURS_INIT) && c->pg.pgno == h->pgno) {
-		if (c->pg.index >= skip)
-			++c->pg.index;
-		if (c->pg.index < nxt)			/* Left page. */
-			c->pg.pgno = l->pgno;
-		else {					/* Right page. */
-			c->pg.pgno = r->pgno;
-			c->pg.index -= nxt;
-		}
-	}
-
-	/*
-	 * If the skipped index was on the left page, just return that page.
-	 * Otherwise, adjust the skip index to reflect the new position on
-	 * the right page.
-	 */
-	if (skip <= off) {
-		skip = MAX_PAGE_OFFSET;
-		rval = l;
-	} else {
-		rval = r;
-		*pskip -= nxt;
-	}
-
-	for (off = 0; nxt < top; ++off) {
-		if (skip == nxt) {
-			++off;
-			skip = MAX_PAGE_OFFSET;
-		}
-		switch (h->flags & P_TYPE) {
-		case P_BINTERNAL:
-			src = bi = GETBINTERNAL(h, nxt);
-			nbytes = NBINTERNAL(bi->ksize);
-			break;
-		case P_BLEAF:
-			src = bl = GETBLEAF(h, nxt);
-			nbytes = NBLEAF(bl);
-			break;
-		case P_RINTERNAL:
-			src = GETRINTERNAL(h, nxt);
-			nbytes = NRINTERNAL;
-			break;
-		case P_RLEAF:
-			src = rl = GETRLEAF(h, nxt);
-			nbytes = NRLEAF(rl);
-			break;
-		default:
-			abort();
-		}
-		++nxt;
-		r->linp[off] = r->upper -= nbytes;
-		memmove((char *)r + r->upper, src, nbytes);
-	}
-	r->lower += off * sizeof(indx_t);
-
-	/* If the key is being appended to the page, adjust the index. */
-	if (skip == top)
-		r->lower += sizeof(indx_t);
-
-	return (rval);
-}
-
-/*
- * BT_PRESERVE -- Mark a chain of pages as used by an internal node.
- *
- * Chains of indirect blocks pointed to by leaf nodes get reclaimed when the
- * record that references them gets deleted.  Chains pointed to by internal
- * pages never get deleted.  This routine marks a chain as pointed to by an
- * internal page.
- *
- * Parameters:
- *	t:	tree
- *	pg:	page number of first page in the chain.
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-static int
-bt_preserve(t, pg)
-	BTREE *t;
-	pgno_t pg;
-{
-	PAGE *h;
-
-	if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-		return (RET_ERROR);
-	h->flags |= P_PRESERVE;
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
-
-/*
- * REC_TOTAL -- Return the number of recno entries below a page.
- *
- * Parameters:
- *	h:	page
- *
- * Returns:
- *	The number of recno entries below a page.
- *
- * XXX
- * These values could be set by the bt_psplit routine.  The problem is that the
- * entry has to be popped off of the stack etc. or the values have to be passed
- * all the way back to bt_split/bt_rroot and it's not very clean.
- */
-static recno_t
-rec_total(h)
-	PAGE *h;
-{
-	recno_t recs;
-	indx_t nxt, top;
-
-	for (recs = 0, nxt = 0, top = NEXTINDEX(h); nxt < top; ++nxt)
-		recs += GETRINTERNAL(h, nxt)->nrecs;
-	return (recs);
-}
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c
deleted file mode 100644
index e9acfb7..0000000
--- a/lib/libc/db/btree/bt_utils.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_utils.c,v 1.3 2003/01/01 18:48:42 schweikh Exp $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * __bt_ret --
- *	Build return key/data pair.
- *
- * Parameters:
- *	t:	tree
- *	e:	key/data pair to be returned
- *	key:	user's key structure (NULL if not to be filled in)
- *	rkey:	memory area to hold key
- *	data:	user's data structure (NULL if not to be filled in)
- *	rdata:	memory area to hold data
- *       copy:	always copy the key/data item
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__bt_ret(t, e, key, rkey, data, rdata, copy)
-	BTREE *t;
-	EPG *e;
-	DBT *key, *rkey, *data, *rdata;
-	int copy;
-{
-	BLEAF *bl;
-	void *p;
-
-	bl = GETBLEAF(e->page, e->index);
-
-	/*
-	 * We must copy big keys/data to make them contigous.  Otherwise,
-	 * leave the page pinned and don't copy unless the user specified
-	 * concurrent access.
-	 */
-	if (key == NULL)
-		goto dataonly;
-
-	if (bl->flags & P_BIGKEY) {
-		if (__ovfl_get(t, bl->bytes,
-		    &key->size, &rkey->data, &rkey->size))
-			return (RET_ERROR);
-		key->data = rkey->data;
-	} else if (copy || F_ISSET(t, B_DB_LOCK)) {
-		if (bl->ksize > rkey->size) {
-			p = (void *)(rkey->data == NULL ?
-			    malloc(bl->ksize) : realloc(rkey->data, bl->ksize));
-			if (p == NULL)
-				return (RET_ERROR);
-			rkey->data = p;
-			rkey->size = bl->ksize;
-		}
-		memmove(rkey->data, bl->bytes, bl->ksize);
-		key->size = bl->ksize;
-		key->data = rkey->data;
-	} else {
-		key->size = bl->ksize;
-		key->data = bl->bytes;
-	}
-
-dataonly:
-	if (data == NULL)
-		return (RET_SUCCESS);
-
-	if (bl->flags & P_BIGDATA) {
-		if (__ovfl_get(t, bl->bytes + bl->ksize,
-		    &data->size, &rdata->data, &rdata->size))
-			return (RET_ERROR);
-		data->data = rdata->data;
-	} else if (copy || F_ISSET(t, B_DB_LOCK)) {
-		/* Use +1 in case the first record retrieved is 0 length. */
-		if (bl->dsize + 1 > rdata->size) {
-			p = (void *)(rdata->data == NULL ?
-			    malloc(bl->dsize + 1) :
-			    realloc(rdata->data, bl->dsize + 1));
-			if (p == NULL)
-				return (RET_ERROR);
-			rdata->data = p;
-			rdata->size = bl->dsize + 1;
-		}
-		memmove(rdata->data, bl->bytes + bl->ksize, bl->dsize);
-		data->size = bl->dsize;
-		data->data = rdata->data;
-	} else {
-		data->size = bl->dsize;
-		data->data = bl->bytes + bl->ksize;
-	}
-
-	return (RET_SUCCESS);
-}
-
-/*
- * __BT_CMP -- Compare a key to a given record.
- *
- * Parameters:
- *	t:	tree
- *	k1:	DBT pointer of first arg to comparison
- *	e:	pointer to EPG for comparison
- *
- * Returns:
- *	< 0 if k1 is < record
- *	= 0 if k1 is = record
- *	> 0 if k1 is > record
- */
-int
-__bt_cmp(t, k1, e)
-	BTREE *t;
-	const DBT *k1;
-	EPG *e;
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	DBT k2;
-	PAGE *h;
-	void *bigkey;
-
-	/*
-	 * The left-most key on internal pages, at any level of the tree, is
-	 * guaranteed by the following code to be less than any user key.
-	 * This saves us from having to update the leftmost key on an internal
-	 * page when the user inserts a new key in the tree smaller than
-	 * anything we've yet seen.
-	 */
-	h = e->page;
-	if (e->index == 0 && h->prevpg == P_INVALID && !(h->flags & P_BLEAF))
-		return (1);
-
-	bigkey = NULL;
-	if (h->flags & P_BLEAF) {
-		bl = GETBLEAF(h, e->index);
-		if (bl->flags & P_BIGKEY)
-			bigkey = bl->bytes;
-		else {
-			k2.data = bl->bytes;
-			k2.size = bl->ksize;
-		}
-	} else {
-		bi = GETBINTERNAL(h, e->index);
-		if (bi->flags & P_BIGKEY)
-			bigkey = bi->bytes;
-		else {
-			k2.data = bi->bytes;
-			k2.size = bi->ksize;
-		}
-	}
-
-	if (bigkey) {
-		if (__ovfl_get(t, bigkey,
-		    &k2.size, &t->bt_rdata.data, &t->bt_rdata.size))
-			return (RET_ERROR);
-		k2.data = t->bt_rdata.data;
-	}
-	return ((*t->bt_cmp)(k1, &k2));
-}
-
-/*
- * __BT_DEFCMP -- Default comparison routine.
- *
- * Parameters:
- *	a:	DBT #1
- *	b: 	DBT #2
- *
- * Returns:
- *	< 0 if a is < b
- *	= 0 if a is = b
- *	> 0 if a is > b
- */
-int
-__bt_defcmp(a, b)
-	const DBT *a, *b;
-{
-	size_t len;
-	u_char *p1, *p2;
-
-	/*
-	 * XXX
-	 * If a size_t doesn't fit in an int, this routine can lose.
-	 * What we need is an integral type which is guaranteed to be
-	 * larger than a size_t, and there is no such thing.
-	 */
-	len = MIN(a->size, b->size);
-	for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2)
-		if (*p1 != *p2)
-			return ((int)*p1 - (int)*p2);
-	return ((int)a->size - (int)b->size);
-}
-
-/*
- * __BT_DEFPFX -- Default prefix routine.
- *
- * Parameters:
- *	a:	DBT #1
- *	b: 	DBT #2
- *
- * Returns:
- *	Number of bytes needed to distinguish b from a.
- */
-size_t
-__bt_defpfx(a, b)
-	const DBT *a, *b;
-{
-	u_char *p1, *p2;
-	size_t cnt, len;
-
-	cnt = 1;
-	len = MIN(a->size, b->size);
-	for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2, ++cnt)
-		if (*p1 != *p2)
-			return (cnt);
-
-	/* a->size must be <= b->size, or they wouldn't be in this order. */
-	return (a->size < b->size ? a->size + 1 : a->size);
-}
diff --git a/lib/libc/db/btree/btree.h b/lib/libc/db/btree/btree.h
deleted file mode 100644
index 1891842..0000000
--- a/lib/libc/db/btree/btree.h
+++ /dev/null
@@ -1,384 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- *
- *	@(#)btree.h	8.11 (Berkeley) 8/17/94
- * $FreeBSD: src/lib/libc/db/btree/btree.h,v 1.3 2002/03/22 23:41:40 obrien Exp $
- */
-
-/* Macros to set/clear/test flags. */
-#define	F_SET(p, f)	(p)->flags |= (f)
-#define	F_CLR(p, f)	(p)->flags &= ~(f)
-#define	F_ISSET(p, f)	((p)->flags & (f))
-
-#include <mpool.h>
-
-#define	DEFMINKEYPAGE	(2)		/* Minimum keys per page */
-#define	MINCACHE	(5)		/* Minimum cached pages */
-#define	MINPSIZE	(512)		/* Minimum page size */
-
-/*
- * Page 0 of a btree file contains a copy of the meta-data.  This page is also
- * used as an out-of-band page, i.e. page pointers that point to nowhere point
- * to page 0.  Page 1 is the root of the btree.
- */
-#define	P_INVALID	 0		/* Invalid tree page number. */
-#define	P_META		 0		/* Tree metadata page number. */
-#define	P_ROOT		 1		/* Tree root page number. */
-
-/*
- * There are five page layouts in the btree: btree internal pages (BINTERNAL),
- * btree leaf pages (BLEAF), recno internal pages (RINTERNAL), recno leaf pages
- * (RLEAF) and overflow pages.  All five page types have a page header (PAGE).
- * This implementation requires that values within structures NOT be padded.
- * (ANSI C permits random padding.)  If your compiler pads randomly you'll have
- * to do some work to get this package to run.
- */
-typedef struct _page {
-	pgno_t	pgno;			/* this page's page number */
-	pgno_t	prevpg;			/* left sibling */
-	pgno_t	nextpg;			/* right sibling */
-
-#define	P_BINTERNAL	0x01		/* btree internal page */
-#define	P_BLEAF		0x02		/* leaf page */
-#define	P_OVERFLOW	0x04		/* overflow page */
-#define	P_RINTERNAL	0x08		/* recno internal page */
-#define	P_RLEAF		0x10		/* leaf page */
-#define P_TYPE		0x1f		/* type mask */
-#define	P_PRESERVE	0x20		/* never delete this chain of pages */
-	uint32_t flags;
-
-	indx_t	lower;			/* lower bound of free space on page */
-	indx_t	upper;			/* upper bound of free space on page */
-	indx_t	linp[1];		/* indx_t-aligned VAR. LENGTH DATA */
-} PAGE;
-
-/* First and next index. */
-#define	BTDATAOFF							\
-	(sizeof(pgno_t) + sizeof(pgno_t) + sizeof(pgno_t) +		\
-	    sizeof(uint32_t) + sizeof(indx_t) + sizeof(indx_t))
-#define	NEXTINDEX(p)	(((p)->lower - BTDATAOFF) / sizeof(indx_t))
-
-/*
- * For pages other than overflow pages, there is an array of offsets into the
- * rest of the page immediately following the page header.  Each offset is to
- * an item which is unique to the type of page.  The h_lower offset is just
- * past the last filled-in index.  The h_upper offset is the first item on the
- * page.  Offsets are from the beginning of the page.
- *
- * If an item is too big to store on a single page, a flag is set and the item
- * is a { page, size } pair such that the page is the first page of an overflow
- * chain with size bytes of item.  Overflow pages are simply bytes without any
- * external structure.
- *
- * The page number and size fields in the items are pgno_t-aligned so they can
- * be manipulated without copying.  (This presumes that 32 bit items can be
- * manipulated on this system.)
- */
-#define	LALIGN(n)	(((n) + sizeof(pgno_t) - 1) & ~(sizeof(pgno_t) - 1))
-#define	NOVFLSIZE	(sizeof(pgno_t) + sizeof(uint32_t))
-
-/*
- * For the btree internal pages, the item is a key.  BINTERNALs are {key, pgno}
- * pairs, such that the key compares less than or equal to all of the records
- * on that page.  For a tree without duplicate keys, an internal page with two
- * consecutive keys, a and b, will have all records greater than or equal to a
- * and less than b stored on the page associated with a.  Duplicate keys are
- * somewhat special and can cause duplicate internal and leaf page records and
- * some minor modifications of the above rule.
- */
-typedef struct _binternal {
-	uint32_t ksize;		/* key size */
-	pgno_t	pgno;			/* page number stored on */
-#define	P_BIGDATA	0x01		/* overflow data */
-#define	P_BIGKEY	0x02		/* overflow key */
-	u_char	flags;
-	char	bytes[1];		/* data */
-} BINTERNAL;
-
-/* Get the page's BINTERNAL structure at index indx. */
-#define	GETBINTERNAL(pg, indx)						\
-	((BINTERNAL *)((char *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define NBINTERNAL(len)							\
-	LALIGN(sizeof(uint32_t) + sizeof(pgno_t) + sizeof(u_char) + (len))
-
-/* Copy a BINTERNAL entry to the page. */
-#define	WR_BINTERNAL(p, size, pgno, flags) {				\
-	*(uint32_t *)p = size;						\
-	p += sizeof(uint32_t);						\
-	*(pgno_t *)p = pgno;						\
-	p += sizeof(pgno_t);						\
-	*(u_char *)p = flags;						\
-	p += sizeof(u_char);						\
-}
-
-/*
- * For the recno internal pages, the item is a page number with the number of
- * keys found on that page and below.
- */
-typedef struct _rinternal {
-	recno_t	nrecs;			/* number of records */
-	pgno_t	pgno;			/* page number stored below */
-} RINTERNAL;
-
-/* Get the page's RINTERNAL structure at index indx. */
-#define	GETRINTERNAL(pg, indx)						\
-	((RINTERNAL *)((char *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define NRINTERNAL							\
-	LALIGN(sizeof(recno_t) + sizeof(pgno_t))
-
-/* Copy a RINTERAL entry to the page. */
-#define	WR_RINTERNAL(p, nrecs, pgno) {					\
-	*(recno_t *)p = nrecs;						\
-	p += sizeof(recno_t);						\
-	*(pgno_t *)p = pgno;						\
-}
-
-/* For the btree leaf pages, the item is a key and data pair. */
-typedef struct _bleaf {
-	uint32_t	ksize;		/* size of key */
-	uint32_t	dsize;		/* size of data */
-	u_char	flags;			/* P_BIGDATA, P_BIGKEY */
-	char	bytes[1];		/* data */
-} BLEAF;
-
-/* Get the page's BLEAF structure at index indx. */
-#define	GETBLEAF(pg, indx)						\
-	((BLEAF *)((char *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define NBLEAF(p)	NBLEAFDBT((p)->ksize, (p)->dsize)
-
-/* Get the number of bytes in the user's key/data pair. */
-#define NBLEAFDBT(ksize, dsize)						\
-	LALIGN(sizeof(uint32_t) + sizeof(uint32_t) + sizeof(u_char) +	\
-	    (ksize) + (dsize))
-
-/* Copy a BLEAF entry to the page. */
-#define	WR_BLEAF(p, key, data, flags) {					\
-	*(uint32_t *)p = key->size;					\
-	p += sizeof(uint32_t);						\
-	*(uint32_t *)p = data->size;					\
-	p += sizeof(uint32_t);						\
-	*(u_char *)p = flags;						\
-	p += sizeof(u_char);						\
-	memmove(p, key->data, key->size);				\
-	p += key->size;							\
-	memmove(p, data->data, data->size);				\
-}
-
-/* For the recno leaf pages, the item is a data entry. */
-typedef struct _rleaf {
-	uint32_t	dsize;		/* size of data */
-	u_char	flags;			/* P_BIGDATA */
-	char	bytes[1];
-} RLEAF;
-
-/* Get the page's RLEAF structure at index indx. */
-#define	GETRLEAF(pg, indx)						\
-	((RLEAF *)((char *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define NRLEAF(p)	NRLEAFDBT((p)->dsize)
-
-/* Get the number of bytes from the user's data. */
-#define	NRLEAFDBT(dsize)						\
-	LALIGN(sizeof(uint32_t) + sizeof(u_char) + (dsize))
-
-/* Copy a RLEAF entry to the page. */
-#define	WR_RLEAF(p, data, flags) {					\
-	*(uint32_t *)p = data->size;					\
-	p += sizeof(uint32_t);						\
-	*(u_char *)p = flags;						\
-	p += sizeof(u_char);						\
-	memmove(p, data->data, data->size);				\
-}
-
-/*
- * A record in the tree is either a pointer to a page and an index in the page
- * or a page number and an index.  These structures are used as a cursor, stack
- * entry and search returns as well as to pass records to other routines.
- *
- * One comment about searches.  Internal page searches must find the largest
- * record less than key in the tree so that descents work.  Leaf page searches
- * must find the smallest record greater than key so that the returned index
- * is the record's correct position for insertion.
- */
-typedef struct _epgno {
-	pgno_t	pgno;			/* the page number */
-	indx_t	index;			/* the index on the page */
-} EPGNO;
-
-typedef struct _epg {
-	PAGE	*page;			/* the (pinned) page */
-	indx_t	 index;			/* the index on the page */
-} EPG;
-
-/*
- * About cursors.  The cursor (and the page that contained the key/data pair
- * that it referenced) can be deleted, which makes things a bit tricky.  If
- * there are no duplicates of the cursor key in the tree (i.e. B_NODUPS is set
- * or there simply aren't any duplicates of the key) we copy the key that it
- * referenced when it's deleted, and reacquire a new cursor key if the cursor
- * is used again.  If there are duplicates keys, we move to the next/previous
- * key, and set a flag so that we know what happened.  NOTE: if duplicate (to
- * the cursor) keys are added to the tree during this process, it is undefined
- * if they will be returned or not in a cursor scan.
- *
- * The flags determine the possible states of the cursor:
- *
- * CURS_INIT	The cursor references *something*.
- * CURS_ACQUIRE	The cursor was deleted, and a key has been saved so that
- *		we can reacquire the right position in the tree.
- * CURS_AFTER, CURS_BEFORE
- *		The cursor was deleted, and now references a key/data pair
- *		that has not yet been returned, either before or after the
- *		deleted key/data pair.
- * XXX
- * This structure is broken out so that we can eventually offer multiple
- * cursors as part of the DB interface.
- */
-typedef struct _cursor {
-	EPGNO	 pg;			/* B: Saved tree reference. */
-	DBT	 key;			/* B: Saved key, or key.data == NULL. */
-	recno_t	 rcursor;		/* R: recno cursor (1-based) */
-
-#define	CURS_ACQUIRE	0x01		/*  B: Cursor needs to be reacquired. */
-#define	CURS_AFTER	0x02		/*  B: Unreturned cursor after key. */
-#define	CURS_BEFORE	0x04		/*  B: Unreturned cursor before key. */
-#define	CURS_INIT	0x08		/* RB: Cursor initialized. */
-	u_int8_t flags;
-} CURSOR;
-
-/*
- * The metadata of the tree.  The nrecs field is used only by the RECNO code.
- * This is because the btree doesn't really need it and it requires that every
- * put or delete call modify the metadata.
- */
-typedef struct _btmeta {
-	uint32_t	magic;		/* magic number */
-	uint32_t	version;	/* version */
-	uint32_t	psize;		/* page size */
-	uint32_t	free;		/* page number of first free page */
-	uint32_t	nrecs;		/* R: number of records */
-
-#define	SAVEMETA	(B_NODUPS | R_RECNO)
-	uint32_t	flags;		/* bt_flags & SAVEMETA */
-} BTMETA;
-
-/* The in-memory btree/recno data structure. */
-typedef struct _btree {
-	MPOOL	 *bt_mp;		/* memory pool cookie */
-
-	DB	 *bt_dbp;		/* pointer to enclosing DB */
-
-	EPG	  bt_cur;		/* current (pinned) page */
-	PAGE	 *bt_pinned;		/* page pinned across calls */
-
-	CURSOR	  bt_cursor;		/* cursor */
-
-#define	BT_PUSH(t, p, i) {						\
-	t->bt_sp->pgno = p; 						\
-	t->bt_sp->index = i; 						\
-	++t->bt_sp;							\
-}
-#define	BT_POP(t)	(t->bt_sp == t->bt_stack ? NULL : --t->bt_sp)
-#define	BT_CLR(t)	(t->bt_sp = t->bt_stack)
-	EPGNO	  bt_stack[50];		/* stack of parent pages */
-	EPGNO	 *bt_sp;		/* current stack pointer */
-
-	DBT	  bt_rkey;		/* returned key */
-	DBT	  bt_rdata;		/* returned data */
-
-	int	  bt_fd;		/* tree file descriptor */
-
-	pgno_t	  bt_free;		/* next free page */
-	uint32_t bt_psize;		/* page size */
-	indx_t	  bt_ovflsize;		/* cut-off for key/data overflow */
-	int	  bt_lorder;		/* byte order */
-					/* sorted order */
-	enum { NOT, BACK, FORWARD } bt_order;
-	EPGNO	  bt_last;		/* last insert */
-
-					/* B: key comparison function */
-	int	(*bt_cmp)(const DBT *, const DBT *);
-					/* B: prefix comparison function */
-	size_t	(*bt_pfx)(const DBT *, const DBT *);
-					/* R: recno input function */
-	int	(*bt_irec)(struct _btree *, recno_t);
-
-	FILE	 *bt_rfp;		/* R: record FILE pointer */
-	int	  bt_rfd;		/* R: record file descriptor */
-
-	caddr_t	  bt_cmap;		/* R: current point in mapped space */
-	caddr_t	  bt_smap;		/* R: start of mapped space */
-	caddr_t   bt_emap;		/* R: end of mapped space */
-	size_t	  bt_msize;		/* R: size of mapped region. */
-
-	recno_t	  bt_nrecs;		/* R: number of records */
-	size_t	  bt_reclen;		/* R: fixed record length */
-	u_char	  bt_bval;		/* R: delimiting byte/pad character */
-
-/*
- * NB:
- * B_NODUPS and R_RECNO are stored on disk, and may not be changed.
- */
-#define	B_INMEM		0x00001		/* in-memory tree */
-#define	B_METADIRTY	0x00002		/* need to write metadata */
-#define	B_MODIFIED	0x00004		/* tree modified */
-#define	B_NEEDSWAP	0x00008		/* if byte order requires swapping */
-#define	B_RDONLY	0x00010		/* read-only tree */
-
-#define	B_NODUPS	0x00020		/* no duplicate keys permitted */
-#define	R_RECNO		0x00080		/* record oriented tree */
-
-#define	R_CLOSEFP	0x00040		/* opened a file pointer */
-#define	R_EOF		0x00100		/* end of input file reached. */
-#define	R_FIXLEN	0x00200		/* fixed length records */
-#define	R_MEMMAPPED	0x00400		/* memory mapped file. */
-#define	R_INMEM		0x00800		/* in-memory file */
-#define	R_MODIFIED	0x01000		/* modified file */
-#define	R_RDONLY	0x02000		/* read-only file */
-
-#define	B_DB_LOCK	0x04000		/* DB_LOCK specified. */
-#define	B_DB_SHMEM	0x08000		/* DB_SHMEM specified. */
-#define	B_DB_TXN	0x10000		/* DB_TXN specified. */
-	uint32_t flags;
-} BTREE;
-
-#include "extern.h"
diff --git a/lib/libc/db/btree/extern.h b/lib/libc/db/btree/extern.h
deleted file mode 100644
index e356440..0000000
--- a/lib/libc/db/btree/extern.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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.
- *
- *	@(#)extern.h	8.10 (Berkeley) 7/20/94
- * $FreeBSD: src/lib/libc/db/btree/extern.h,v 1.3 2002/03/22 09:18:22 obrien Exp $
- */
-
-int	 __bt_close(DB *);
-int	 __bt_cmp(BTREE *, const DBT *, EPG *);
-int	 __bt_crsrdel(BTREE *, EPGNO *);
-int	 __bt_defcmp(const DBT *, const DBT *);
-size_t	 __bt_defpfx(const DBT *, const DBT *);
-int	 __bt_delete(const DB *, const DBT *, u_int);
-int	 __bt_dleaf(BTREE *, const DBT *, PAGE *, u_int);
-int	 __bt_fd(const DB *);
-int	 __bt_free(BTREE *, PAGE *);
-int	 __bt_get(const DB *, const DBT *, DBT *, u_int);
-PAGE	*__bt_new(BTREE *, pgno_t *);
-void	 __bt_pgin(void *, pgno_t, void *);
-void	 __bt_pgout(void *, pgno_t, void *);
-int	 __bt_push(BTREE *, pgno_t, int);
-int	 __bt_put(const DB *dbp, DBT *, const DBT *, u_int);
-int	 __bt_ret(BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int);
-EPG	*__bt_search(BTREE *, const DBT *, int *);
-int	 __bt_seq(const DB *, DBT *, DBT *, u_int);
-void	 __bt_setcur(BTREE *, pgno_t, u_int);
-int	 __bt_split(BTREE *, PAGE *,
-	    const DBT *, const DBT *, int, size_t, uint32_t);
-int	 __bt_sync(const DB *, u_int);
-
-int	 __ovfl_delete(BTREE *, void *);
-int	 __ovfl_get(BTREE *, void *, size_t *, void **, size_t *);
-int	 __ovfl_put(BTREE *, const DBT *, pgno_t *);
-
-#ifdef DEBUG
-void	 __bt_dnpage(DB *, pgno_t);
-void	 __bt_dpage(PAGE *);
-void	 __bt_dump(DB *);
-#endif
-#ifdef STATISTICS
-void	 __bt_stat(DB *);
-#endif
diff --git a/lib/libc/db/db/Makefile b/lib/libc/db/db/Makefile
deleted file mode 100644
index 750cf27..0000000
--- a/lib/libc/db/db/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../
-
-#Objects
-OBJS = db.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/db/db/db.c b/lib/libc/db/db/db.c
deleted file mode 100644
index 9c65e55..0000000
--- a/lib/libc/db/db/db.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)db.c	8.4 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/db/db.c,v 1.2 2002/03/22 21:52:01 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#include <db.h>
-
-DB *
-dbopen(fname, flags, mode, type, openinfo)
-	const char *fname;
-	int flags, mode;
-	DBTYPE type;
-	const void *openinfo;
-{
-
-#define	DB_FLAGS	(DB_LOCK | DB_SHMEM | DB_TXN)
-#define	USE_OPEN_FLAGS							\
-	(O_CREAT | O_EXCL | O_EXLOCK | O_NONBLOCK | O_RDONLY |		\
-	 O_RDWR | O_SHLOCK | O_TRUNC)
-
-	if ((flags & ~(USE_OPEN_FLAGS | DB_FLAGS)) == 0)
-		switch (type) {
-		case DB_BTREE:
-			return (__bt_open(fname, flags & USE_OPEN_FLAGS,
-			    mode, openinfo, flags & DB_FLAGS));
-		case DB_HASH:
-			return (__hash_open(fname, flags & USE_OPEN_FLAGS,
-			    mode, openinfo, flags & DB_FLAGS));
-		case DB_RECNO:
-			return (__rec_open(fname, flags & USE_OPEN_FLAGS,
-			    mode, openinfo, flags & DB_FLAGS));
-		}
-	errno = EINVAL;
-	return (NULL);
-}
-
-static int
-__dberr()
-{
-	return (RET_ERROR);
-}
-
-/*
- * __DBPANIC -- Stop.
- *
- * Parameters:
- *	dbp:	pointer to the DB structure.
- */
-void
-__dbpanic(dbp)
-	DB *dbp;
-{
-	/* The only thing that can succeed is a close. */
-	dbp->del = (int (*)())__dberr;
-	dbp->fd = (int (*)())__dberr;
-	dbp->get = (int (*)())__dberr;
-	dbp->put = (int (*)())__dberr;
-	dbp->seq = (int (*)())__dberr;
-	dbp->sync = (int (*)())__dberr;
-}
diff --git a/lib/libc/db/hash/Makefile b/lib/libc/db/hash/Makefile
deleted file mode 100644
index b0b99a9..0000000
--- a/lib/libc/db/hash/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../ -I../../include
-
-#Objects
-OBJS = hash.o hash_bigkey.o hash_buf.o hash_func.o hash_log2.o hash_page.o ndbm.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/db/hash/README b/lib/libc/db/hash/README
deleted file mode 100644
index f29ccf7..0000000
--- a/lib/libc/db/hash/README
+++ /dev/null
@@ -1,72 +0,0 @@
-#	@(#)README	8.1 (Berkeley) 6/4/93
-
-This package implements a superset of the hsearch and dbm/ndbm libraries.
-
-Test Programs:
-	All test programs which need key/data pairs expect them entered
-	with key and data on separate lines
-
-	tcreat3.c	
-		Takes 
-			bucketsize (bsize), 
-			fill factor (ffactor), and
-			initial number of elements (nelem).  
-		Creates a hash table named hashtest containing the 
-		keys/data pairs entered from standard in.
-	thash4.c
-		Takes
-			bucketsize (bsize), 
-			fill factor (ffactor), 
-			initial number of elements (nelem)
-			bytes of cache (ncached), and
-			file from which to read data  (fname)
-		Creates a table from the key/data pairs on standard in and
-		then does a read of each key/data in fname
-	tdel.c
-		Takes
-			bucketsize (bsize), and
-			fill factor (ffactor).
-			file from which to read data (fname)
-		Reads each key/data pair from fname and deletes the
-		key from the hash table hashtest
-	tseq.c
-		Reads the key/data pairs in the file hashtest and writes them
-		to standard out.
-	tread2.c
-		Takes
-			butes of cache (ncached).
-		Reads key/data pairs from standard in and looks them up
-		in the file hashtest.
-	tverify.c
-		Reads key/data pairs from standard in, looks them up
-		in the file hashtest, and verifies that the data is
-		correct.
-
-NOTES:
-
-The file search.h is provided for using the hsearch compatible interface
-on BSD systems.  On System V derived systems, search.h should appear in 
-/usr/include.
-
-The man page ../man/db.3 explains the interface to the hashing system.
-The file hash.ps is a postscript copy of a paper explaining
-the history, implementation, and performance of the hash package.
-
-"bugs" or idiosyncracies
-
-If you have a lot of overflows, it is possible to run out of overflow
-pages.  Currently, this will cause a message to be printed on stderr.
-Eventually, this will be indicated by a return error code.
-
-If you are using the ndbm interface and exit without flushing or closing the
-file, you may lose updates since the package buffers all writes.  Also,
-the db interface only creates a single database file.  To avoid overwriting
-the user's original file, the suffix ".db" is appended to the file name
-passed to dbm_open.  Additionally, if your code "knows" about the historic
-.dir and .pag files, it will break.  
-
-There is a fundamental difference between this package and the old hsearch.
-Hsearch requires the user to maintain the keys and data in the application's
-allocated memory while hash takes care of all storage management.  The down
-side is that the byte strings passed in the ENTRY structure must be null
-terminated (both the keys and the data).
diff --git a/lib/libc/db/hash/extern.h b/lib/libc/db/hash/extern.h
deleted file mode 100644
index 2c23e09..0000000
--- a/lib/libc/db/hash/extern.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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.
- *
- *	@(#)extern.h	8.4 (Berkeley) 6/16/94
- * $FreeBSD: src/lib/libc/db/hash/extern.h,v 1.3 2002/03/22 09:18:22 obrien Exp $
- */
-
-BUFHEAD	*__add_ovflpage(HTAB *, BUFHEAD *);
-int	 __addel(HTAB *, BUFHEAD *, const DBT *, const DBT *);
-int	 __big_delete(HTAB *, BUFHEAD *);
-int	 __big_insert(HTAB *, BUFHEAD *, const DBT *, const DBT *);
-int	 __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int);
-int	 __big_return(HTAB *, BUFHEAD *, int, DBT *, int);
-int	 __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
-		int, uint32_t, SPLIT_RETURN *);
-int	 __buf_free(HTAB *, int, int);
-void	 __buf_init(HTAB *, int);
-uint32_t	 __call_hash(HTAB *, char *, int);
-int	 __delpair(HTAB *, BUFHEAD *, int);
-int	 __expand_table(HTAB *);
-int	 __find_bigpair(HTAB *, BUFHEAD *, int, char *, int);
-u_int16_t	 __find_last_page(HTAB *, BUFHEAD **);
-void	 __free_ovflpage(HTAB *, BUFHEAD *);
-BUFHEAD	*__get_buf(HTAB *, uint32_t, BUFHEAD *, int);
-int	 __get_page(HTAB *, char *, uint32_t, int, int, int);
-int	 __ibitmap(HTAB *, int, int, int);
-uint32_t	 __log2(uint32_t);
-int	 __put_page(HTAB *, char *, uint32_t, int, int);
-void	 __reclaim_buf(HTAB *, BUFHEAD *);
-int	 __split_page(HTAB *, uint32_t, uint32_t);
-
-/* Default hash routine. */
-extern uint32_t (*__default_hash)(const void *, size_t);
-
-#ifdef HASH_STATISTICS
-extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
-#endif
diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c
deleted file mode 100644
index fd00d4f..0000000
--- a/lib/libc/db/hash/hash.c
+++ /dev/null
@@ -1,1006 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash.c,v 1.12 2004/09/10 05:41:41 kuriyama Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef DEBUG
-#include <assert.h>
-#endif
-#include "un-namespace.h"
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static int   alloc_segs(HTAB *, int);
-static int   flush_meta(HTAB *);
-static int   hash_access(HTAB *, ACTION, DBT *, DBT *);
-static int   hash_close(DB *);
-static int   hash_delete(const DB *, const DBT *, uint32_t);
-static int   hash_fd(const DB *);
-static int   hash_get(const DB *, const DBT *, DBT *, uint32_t);
-static int   hash_put(const DB *, DBT *, const DBT *, uint32_t);
-static void *hash_realloc(SEGMENT **, int, int);
-static int   hash_seq(const DB *, DBT *, DBT *, uint32_t);
-static int   hash_sync(const DB *, uint32_t);
-static int   hdestroy(HTAB *);
-static HTAB *init_hash(HTAB *, const char *, HASHINFO *);
-static int   init_htab(HTAB *, int);
-#if BYTE_ORDER == LITTLE_ENDIAN
-static void  swap_header(HTAB *);
-static void  swap_header_copy(HASHHDR *, HASHHDR *);
-#endif
-
-/* Fast arithmetic, relying on powers of 2, */
-#define MOD(x, y)		((x) & ((y) - 1))
-
-#define RETURN_ERROR(ERR, LOC)	{ save_errno = ERR; goto LOC; }
-
-/* Return values */
-#define	SUCCESS	 (0)
-#define	ERROR	(-1)
-#define	ABNORMAL (1)
-
-#ifdef HASH_STATISTICS
-int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
-#endif
-
-/************************** INTERFACE ROUTINES ***************************/
-/* OPEN/CLOSE */
-
-extern DB *
-__hash_open(file, flags, mode, info, dflags)
-	const char *file;
-	int flags, mode, dflags;
-	const HASHINFO *info;	/* Special directives for create */
-{
-	HTAB *hashp;
-	struct stat statbuf;
-	DB *dbp;
-	int bpages, hdrsize, new_table, nsegs, save_errno;
-
-	if ((flags & O_ACCMODE) == O_WRONLY) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (!(hashp = (HTAB *)calloc(1, sizeof(HTAB))))
-		return (NULL);
-	hashp->fp = -1;
-
-	/*
-	 * Even if user wants write only, we need to be able to read
-	 * the actual file, so we need to open it read/write. But, the
-	 * field in the hashp structure needs to be accurate so that
-	 * we can check accesses.
-	 */
-	hashp->flags = flags;
-
-	new_table = 0;
-	if (!file || (flags & O_TRUNC) ||
-	    (stat(file, &statbuf) && (errno == ENOENT))) {
-		if (errno == ENOENT)
-			errno = 0; /* Just in case someone looks at errno */
-		new_table = 1;
-	}
-	if (file) {
-		if ((hashp->fp = _open(file, flags, mode)) == -1)
-			RETURN_ERROR(errno, error0);
-
-		/* if the .db file is empty, and we had permission to create
-		   a new .db file, then reinitialize the database */
-		if ((flags & O_CREAT) &&
-		     _fstat(hashp->fp, &statbuf) == 0 && statbuf.st_size == 0)
-			new_table = 1;
-
-		(void)_fcntl(hashp->fp, F_SETFD, 1);
-	}
-	if (new_table) {
-		if (!(hashp = init_hash(hashp, file, (HASHINFO *)info)))
-			RETURN_ERROR(errno, error1);
-	} else {
-		/* Table already exists */
-		if (info && info->hash)
-			hashp->hash = info->hash;
-		else
-			hashp->hash = __default_hash;
-
-		hdrsize = _read(hashp->fp, &hashp->hdr, sizeof(HASHHDR));
-#if BYTE_ORDER == LITTLE_ENDIAN
-		swap_header(hashp);
-#endif
-		if (hdrsize == -1)
-			RETURN_ERROR(errno, error1);
-		if (hdrsize != sizeof(HASHHDR))
-			RETURN_ERROR(EFTYPE, error1);
-		/* Verify file type, versions and hash function */
-		if (hashp->MAGIC != HASHMAGIC)
-			RETURN_ERROR(EFTYPE, error1);
-#define	OLDHASHVERSION	1
-		if (hashp->VERSION != HASHVERSION &&
-		    hashp->VERSION != OLDHASHVERSION)
-			RETURN_ERROR(EFTYPE, error1);
-		if (hashp->hash(CHARKEY, sizeof(CHARKEY)) != hashp->H_CHARKEY)
-			RETURN_ERROR(EFTYPE, error1);
-		/*
-		 * Figure out how many segments we need.  Max_Bucket is the
-		 * maximum bucket number, so the number of buckets is
-		 * max_bucket + 1.
-		 */
-		nsegs = (hashp->MAX_BUCKET + 1 + hashp->SGSIZE - 1) /
-			 hashp->SGSIZE;
-		hashp->nsegs = 0;
-		if (alloc_segs(hashp, nsegs))
-			/*
-			 * If alloc_segs fails, table will have been destroyed
-			 * and errno will have been set.
-			 */
-			return (NULL);
-		/* Read in bitmaps */
-		bpages = (hashp->SPARES[hashp->OVFL_POINT] +
-		    (hashp->BSIZE << BYTE_SHIFT) - 1) >>
-		    (hashp->BSHIFT + BYTE_SHIFT);
-
-		hashp->nmaps = bpages;
-		(void)memset(&hashp->mapp[0], 0, bpages * sizeof(uint32_t *));
-	}
-
-	/* Initialize Buffer Manager */
-	if (info && info->cachesize)
-		__buf_init(hashp, info->cachesize);
-	else
-		__buf_init(hashp, DEF_BUFSIZE);
-
-	hashp->new_file = new_table;
-	hashp->save_file = file && (hashp->flags & O_RDWR);
-	hashp->cbucket = -1;
-	if (!(dbp = (DB *)malloc(sizeof(DB)))) {
-		save_errno = errno;
-		hdestroy(hashp);
-		errno = save_errno;
-		return (NULL);
-	}
-	dbp->internal = hashp;
-	dbp->close = hash_close;
-	dbp->del = hash_delete;
-	dbp->fd = hash_fd;
-	dbp->get = hash_get;
-	dbp->put = hash_put;
-	dbp->seq = hash_seq;
-	dbp->sync = hash_sync;
-	dbp->type = DB_HASH;
-
-#ifdef DEBUG
-	(void)fprintf(stderr,
-"%s\n%s%p\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%x\n%s%x\n%s%d\n%s%d\n",
-	    "init_htab:",
-	    "TABLE POINTER   ", hashp,
-	    "BUCKET SIZE     ", hashp->BSIZE,
-	    "BUCKET SHIFT    ", hashp->BSHIFT,
-	    "DIRECTORY SIZE  ", hashp->DSIZE,
-	    "SEGMENT SIZE    ", hashp->SGSIZE,
-	    "SEGMENT SHIFT   ", hashp->SSHIFT,
-	    "FILL FACTOR     ", hashp->FFACTOR,
-	    "MAX BUCKET      ", hashp->MAX_BUCKET,
-	    "OVFL POINT	     ", hashp->OVFL_POINT,
-	    "LAST FREED      ", hashp->LAST_FREED,
-	    "HIGH MASK       ", hashp->HIGH_MASK,
-	    "LOW  MASK       ", hashp->LOW_MASK,
-	    "NSEGS           ", hashp->nsegs,
-	    "NKEYS           ", hashp->NKEYS);
-#endif
-#ifdef HASH_STATISTICS
-	hash_overflows = hash_accesses = hash_collisions = hash_expansions = 0;
-#endif
-	return (dbp);
-
-error1:
-	if (hashp != NULL)
-		(void)_close(hashp->fp);
-
-error0:
-	free(hashp);
-	errno = save_errno;
-	return (NULL);
-}
-
-static int
-hash_close(dbp)
-	DB *dbp;
-{
-	HTAB *hashp;
-	int retval;
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = (HTAB *)dbp->internal;
-	retval = hdestroy(hashp);
-	free(dbp);
-	return (retval);
-}
-
-static int
-hash_fd(dbp)
-	const DB *dbp;
-{
-	HTAB *hashp;
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = (HTAB *)dbp->internal;
-	if (hashp->fp == -1) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (hashp->fp);
-}
-
-/************************** LOCAL CREATION ROUTINES **********************/
-static HTAB *
-init_hash(hashp, file, info)
-	HTAB *hashp;
-	const char *file;
-	HASHINFO *info;
-{
-	struct stat statbuf;
-	int nelem;
-
-	nelem = 1;
-	hashp->NKEYS = 0;
-	hashp->LORDER = BYTE_ORDER;
-	hashp->BSIZE = DEF_BUCKET_SIZE;
-	hashp->BSHIFT = DEF_BUCKET_SHIFT;
-	hashp->SGSIZE = DEF_SEGSIZE;
-	hashp->SSHIFT = DEF_SEGSIZE_SHIFT;
-	hashp->DSIZE = DEF_DIRSIZE;
-	hashp->FFACTOR = DEF_FFACTOR;
-	hashp->hash = __default_hash;
-	memset(hashp->SPARES, 0, sizeof(hashp->SPARES));
-	memset(hashp->BITMAPS, 0, sizeof (hashp->BITMAPS));
-
-	/* Fix bucket size to be optimal for file system */
-	if (file != NULL) {
-		if (stat(file, &statbuf))
-			return (NULL);
-		hashp->BSIZE = statbuf.st_blksize;
-		hashp->BSHIFT = __log2(hashp->BSIZE);
-	}
-
-	if (info) {
-		if (info->bsize) {
-			/* Round pagesize up to power of 2 */
-			hashp->BSHIFT = __log2(info->bsize);
-			hashp->BSIZE = 1 << hashp->BSHIFT;
-			if (hashp->BSIZE > MAX_BSIZE) {
-				errno = EINVAL;
-				return (NULL);
-			}
-		}
-		if (info->ffactor)
-			hashp->FFACTOR = info->ffactor;
-		if (info->hash)
-			hashp->hash = info->hash;
-		if (info->nelem)
-			nelem = info->nelem;
-		if (info->lorder) {
-			if (info->lorder != BIG_ENDIAN &&
-			    info->lorder != LITTLE_ENDIAN) {
-				errno = EINVAL;
-				return (NULL);
-			}
-			hashp->LORDER = info->lorder;
-		}
-	}
-	/* init_htab should destroy the table and set errno if it fails */
-	if (init_htab(hashp, nelem))
-		return (NULL);
-	else
-		return (hashp);
-}
-/*
- * This calls alloc_segs which may run out of memory.  Alloc_segs will destroy
- * the table and set errno, so we just pass the error information along.
- *
- * Returns 0 on No Error
- */
-static int
-init_htab(hashp, nelem)
-	HTAB *hashp;
-	int nelem;
-{
-	int nbuckets, nsegs;
-	int l2;
-
-	/*
-	 * Divide number of elements by the fill factor and determine a
-	 * desired number of buckets.  Allocate space for the next greater
-	 * power of two number of buckets.
-	 */
-	nelem = (nelem - 1) / hashp->FFACTOR + 1;
-
-	l2 = __log2(MAX(nelem, 2));
-	nbuckets = 1 << l2;
-
-	hashp->SPARES[l2] = l2 + 1;
-	hashp->SPARES[l2 + 1] = l2 + 1;
-	hashp->OVFL_POINT = l2;
-	hashp->LAST_FREED = 2;
-
-	/* First bitmap page is at: splitpoint l2 page offset 1 */
-	if (__ibitmap(hashp, OADDR_OF(l2, 1), l2 + 1, 0))
-		return (-1);
-
-	hashp->MAX_BUCKET = hashp->LOW_MASK = nbuckets - 1;
-	hashp->HIGH_MASK = (nbuckets << 1) - 1;
-	hashp->HDRPAGES = ((MAX(sizeof(HASHHDR), MINHDRSIZE) - 1) >>
-	    hashp->BSHIFT) + 1;
-
-	nsegs = (nbuckets - 1) / hashp->SGSIZE + 1;
-	nsegs = 1 << __log2(nsegs);
-
-	if (nsegs > hashp->DSIZE)
-		hashp->DSIZE = nsegs;
-	return (alloc_segs(hashp, nsegs));
-}
-
-/********************** DESTROY/CLOSE ROUTINES ************************/
-
-/*
- * Flushes any changes to the file if necessary and destroys the hashp
- * structure, freeing all allocated space.
- */
-static int
-hdestroy(hashp)
-	HTAB *hashp;
-{
-	int i, save_errno;
-
-	save_errno = 0;
-
-#ifdef HASH_STATISTICS
-	(void)fprintf(stderr, "hdestroy: accesses %ld collisions %ld\n",
-	    hash_accesses, hash_collisions);
-	(void)fprintf(stderr, "hdestroy: expansions %ld\n",
-	    hash_expansions);
-	(void)fprintf(stderr, "hdestroy: overflows %ld\n",
-	    hash_overflows);
-	(void)fprintf(stderr, "keys %ld maxp %d segmentcount %d\n",
-	    hashp->NKEYS, hashp->MAX_BUCKET, hashp->nsegs);
-
-	for (i = 0; i < NCACHED; i++)
-		(void)fprintf(stderr,
-		    "spares[%d] = %d\n", i, hashp->SPARES[i]);
-#endif
-	/*
-	 * Call on buffer manager to free buffers, and if required,
-	 * write them to disk.
-	 */
-	if (__buf_free(hashp, 1, hashp->save_file))
-		save_errno = errno;
-	if (hashp->dir) {
-		free(*hashp->dir);	/* Free initial segments */
-		/* Free extra segments */
-		while (hashp->exsegs--)
-			free(hashp->dir[--hashp->nsegs]);
-		free(hashp->dir);
-	}
-	if (flush_meta(hashp) && !save_errno)
-		save_errno = errno;
-	/* Free Bigmaps */
-	for (i = 0; i < hashp->nmaps; i++)
-		if (hashp->mapp[i])
-			free(hashp->mapp[i]);
-
-	if (hashp->fp != -1)
-		(void)_close(hashp->fp);
-
-	free(hashp);
-
-	if (save_errno) {
-		errno = save_errno;
-		return (ERROR);
-	}
-	return (SUCCESS);
-}
-/*
- * Write modified pages to disk
- *
- * Returns:
- *	 0 == OK
- *	-1 ERROR
- */
-static int
-hash_sync(dbp, flags)
-	const DB *dbp;
-	uint32_t flags;
-{
-	HTAB *hashp;
-
-	if (flags != 0) {
-		errno = EINVAL;
-		return (ERROR);
-	}
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = (HTAB *)dbp->internal;
-	if (!hashp->save_file)
-		return (0);
-	if (__buf_free(hashp, 0, 1) || flush_meta(hashp))
-		return (ERROR);
-	hashp->new_file = 0;
-	return (0);
-}
-
-/*
- * Returns:
- *	 0 == OK
- *	-1 indicates that errno should be set
- */
-static int
-flush_meta(hashp)
-	HTAB *hashp;
-{
-	HASHHDR *whdrp;
-#if BYTE_ORDER == LITTLE_ENDIAN
-	HASHHDR whdr;
-#endif
-	int fp, i, wsize;
-
-	if (!hashp->save_file)
-		return (0);
-	hashp->MAGIC = HASHMAGIC;
-	hashp->VERSION = HASHVERSION;
-	hashp->H_CHARKEY = hashp->hash(CHARKEY, sizeof(CHARKEY));
-
-	fp = hashp->fp;
-	whdrp = &hashp->hdr;
-#if BYTE_ORDER == LITTLE_ENDIAN
-	whdrp = &whdr;
-	swap_header_copy(&hashp->hdr, whdrp);
-#endif
-	if ((lseek(fp, (off_t)0, SEEK_SET) == -1) ||
-	    ((wsize = _write(fp, whdrp, sizeof(HASHHDR))) == -1))
-		return (-1);
-	else
-		if (wsize != sizeof(HASHHDR)) {
-			errno = EFTYPE;
-			hashp->error = errno;
-			return (-1);
-		}
-	for (i = 0; i < NCACHED; i++)
-		if (hashp->mapp[i])
-			if (__put_page(hashp, (char *)hashp->mapp[i],
-				hashp->BITMAPS[i], 0, 1))
-				return (-1);
-	return (0);
-}
-
-/*******************************SEARCH ROUTINES *****************************/
-/*
- * All the access routines return
- *
- * Returns:
- *	 0 on SUCCESS
- *	 1 to indicate an external ERROR (i.e. key not found, etc)
- *	-1 to indicate an internal ERROR (i.e. out of memory, etc)
- */
-static int
-hash_get(dbp, key, data, flag)
-	const DB *dbp;
-	const DBT *key;
-	DBT *data;
-	uint32_t flag;
-{
-	HTAB *hashp;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-	return (hash_access(hashp, HASH_GET, (DBT *)key, data));
-}
-
-static int
-hash_put(dbp, key, data, flag)
-	const DB *dbp;
-	DBT *key;
-	const DBT *data;
-	uint32_t flag;
-{
-	HTAB *hashp;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag && flag != R_NOOVERWRITE) {
-		hashp->error = EINVAL;
-		errno = EINVAL;
-		return (ERROR);
-	}
-	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-		hashp->error = errno = EPERM;
-		return (ERROR);
-	}
-	return (hash_access(hashp, flag == R_NOOVERWRITE ?
-	    HASH_PUTNEW : HASH_PUT, (DBT *)key, (DBT *)data));
-}
-
-static int
-hash_delete(dbp, key, flag)
-	const DB *dbp;
-	const DBT *key;
-	uint32_t flag;		/* Ignored */
-{
-	HTAB *hashp;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag && flag != R_CURSOR) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-		hashp->error = errno = EPERM;
-		return (ERROR);
-	}
-	return (hash_access(hashp, HASH_DELETE, (DBT *)key, NULL));
-}
-
-/*
- * Assume that hashp has been set in wrapper routine.
- */
-static int
-hash_access(hashp, action, key, val)
-	HTAB *hashp;
-	ACTION action;
-	DBT *key, *val;
-{
-	BUFHEAD *rbufp;
-	BUFHEAD *bufp, *save_bufp;
-	u_int16_t *bp;
-	int n, ndx, off, size;
-	char *kp;
-	u_int16_t pageno;
-
-#ifdef HASH_STATISTICS
-	hash_accesses++;
-#endif
-
-	off = hashp->BSIZE;
-	size = key->size;
-	kp = (char *)key->data;
-	rbufp = __get_buf(hashp, __call_hash(hashp, kp, size), NULL, 0);
-	if (!rbufp)
-		return (ERROR);
-	save_bufp = rbufp;
-
-	/* Pin the bucket chain */
-	rbufp->flags |= BUF_PIN;
-	for (bp = (u_int16_t *)rbufp->page, n = *bp++, ndx = 1; ndx < n;)
-		if (bp[1] >= REAL_KEY) {
-			/* Real key/data pair */
-			if (size == off - *bp &&
-			    memcmp(kp, rbufp->page + *bp, size) == 0)
-				goto found;
-			off = bp[1];
-#ifdef HASH_STATISTICS
-			hash_collisions++;
-#endif
-			bp += 2;
-			ndx += 2;
-		} else if (bp[1] == OVFLPAGE) {
-			rbufp = __get_buf(hashp, *bp, rbufp, 0);
-			if (!rbufp) {
-				save_bufp->flags &= ~BUF_PIN;
-				return (ERROR);
-			}
-			/* FOR LOOP INIT */
-			bp = (u_int16_t *)rbufp->page;
-			n = *bp++;
-			ndx = 1;
-			off = hashp->BSIZE;
-		} else if (bp[1] < REAL_KEY) {
-			if ((ndx =
-			    __find_bigpair(hashp, rbufp, ndx, kp, size)) > 0)
-				goto found;
-			if (ndx == -2) {
-				bufp = rbufp;
-				if (!(pageno =
-				    __find_last_page(hashp, &bufp))) {
-					ndx = 0;
-					rbufp = bufp;
-					break;	/* FOR */
-				}
-				rbufp = __get_buf(hashp, pageno, bufp, 0);
-				if (!rbufp) {
-					save_bufp->flags &= ~BUF_PIN;
-					return (ERROR);
-				}
-				/* FOR LOOP INIT */
-				bp = (u_int16_t *)rbufp->page;
-				n = *bp++;
-				ndx = 1;
-				off = hashp->BSIZE;
-			} else {
-				save_bufp->flags &= ~BUF_PIN;
-				return (ERROR);
-			}
-		}
-
-	/* Not found */
-	switch (action) {
-	case HASH_PUT:
-	case HASH_PUTNEW:
-		if (__addel(hashp, rbufp, key, val)) {
-			save_bufp->flags &= ~BUF_PIN;
-			return (ERROR);
-		} else {
-			save_bufp->flags &= ~BUF_PIN;
-			return (SUCCESS);
-		}
-	case HASH_GET:
-	case HASH_DELETE:
-	default:
-		save_bufp->flags &= ~BUF_PIN;
-		return (ABNORMAL);
-	}
-
-found:
-	switch (action) {
-	case HASH_PUTNEW:
-		save_bufp->flags &= ~BUF_PIN;
-		return (ABNORMAL);
-	case HASH_GET:
-		bp = (u_int16_t *)rbufp->page;
-		if (bp[ndx + 1] < REAL_KEY) {
-			if (__big_return(hashp, rbufp, ndx, val, 0))
-				return (ERROR);
-		} else {
-			val->data = (u_char *)rbufp->page + (int)bp[ndx + 1];
-			val->size = bp[ndx] - bp[ndx + 1];
-		}
-		break;
-	case HASH_PUT:
-		if ((__delpair(hashp, rbufp, ndx)) ||
-		    (__addel(hashp, rbufp, key, val))) {
-			save_bufp->flags &= ~BUF_PIN;
-			return (ERROR);
-		}
-		break;
-	case HASH_DELETE:
-		if (__delpair(hashp, rbufp, ndx))
-			return (ERROR);
-		break;
-	default:
-		abort();
-	}
-	save_bufp->flags &= ~BUF_PIN;
-	return (SUCCESS);
-}
-
-static int
-hash_seq(dbp, key, data, flag)
-	const DB *dbp;
-	DBT *key, *data;
-	uint32_t flag;
-{
-	uint32_t bucket;
-	BUFHEAD *bufp;
-	HTAB *hashp;
-	u_int16_t *bp, ndx;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag && flag != R_FIRST && flag != R_NEXT) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-#ifdef HASH_STATISTICS
-	hash_accesses++;
-#endif
-	if ((hashp->cbucket < 0) || (flag == R_FIRST)) {
-		hashp->cbucket = 0;
-		hashp->cndx = 1;
-		hashp->cpage = NULL;
-	}
-
-	for (bp = NULL; !bp || !bp[0]; ) {
-		if (!(bufp = hashp->cpage)) {
-			for (bucket = hashp->cbucket;
-			    bucket <= hashp->MAX_BUCKET;
-			    bucket++, hashp->cndx = 1) {
-				bufp = __get_buf(hashp, bucket, NULL, 0);
-				if (!bufp)
-					return (ERROR);
-				hashp->cpage = bufp;
-				bp = (u_int16_t *)bufp->page;
-				if (bp[0])
-					break;
-			}
-			hashp->cbucket = bucket;
-			if (hashp->cbucket > hashp->MAX_BUCKET) {
-				hashp->cbucket = -1;
-				return (ABNORMAL);
-			}
-		} else
-			bp = (u_int16_t *)hashp->cpage->page;
-
-#ifdef DEBUG
-		assert(bp);
-		assert(bufp);
-#endif
-		while (bp[hashp->cndx + 1] == OVFLPAGE) {
-			bufp = hashp->cpage =
-			    __get_buf(hashp, bp[hashp->cndx], bufp, 0);
-			if (!bufp)
-				return (ERROR);
-			bp = (u_int16_t *)(bufp->page);
-			hashp->cndx = 1;
-		}
-		if (!bp[0]) {
-			hashp->cpage = NULL;
-			++hashp->cbucket;
-		}
-	}
-	ndx = hashp->cndx;
-	if (bp[ndx + 1] < REAL_KEY) {
-		if (__big_keydata(hashp, bufp, key, data, 1))
-			return (ERROR);
-	} else {
-		key->data = (u_char *)hashp->cpage->page + bp[ndx];
-		key->size = (ndx > 1 ? bp[ndx - 1] : hashp->BSIZE) - bp[ndx];
-		data->data = (u_char *)hashp->cpage->page + bp[ndx + 1];
-		data->size = bp[ndx] - bp[ndx + 1];
-		ndx += 2;
-		if (ndx > bp[0]) {
-			hashp->cpage = NULL;
-			hashp->cbucket++;
-			hashp->cndx = 1;
-		} else
-			hashp->cndx = ndx;
-	}
-	return (SUCCESS);
-}
-
-/********************************* UTILITIES ************************/
-
-/*
- * Returns:
- *	 0 ==> OK
- *	-1 ==> Error
- */
-extern int
-__expand_table(hashp)
-	HTAB *hashp;
-{
-	uint32_t old_bucket, new_bucket;
-	int dirsize, new_segnum, spare_ndx;
-
-#ifdef HASH_STATISTICS
-	hash_expansions++;
-#endif
-	new_bucket = ++hashp->MAX_BUCKET;
-	old_bucket = (hashp->MAX_BUCKET & hashp->LOW_MASK);
-
-	new_segnum = new_bucket >> hashp->SSHIFT;
-
-	/* Check if we need a new segment */
-	if (new_segnum >= hashp->nsegs) {
-		/* Check if we need to expand directory */
-		if (new_segnum >= hashp->DSIZE) {
-			/* Reallocate directory */
-			dirsize = hashp->DSIZE * sizeof(SEGMENT *);
-			if (!hash_realloc(&hashp->dir, dirsize, dirsize << 1))
-				return (-1);
-			hashp->DSIZE = dirsize << 1;
-		}
-		if ((hashp->dir[new_segnum] =
-		    (SEGMENT)calloc(hashp->SGSIZE, sizeof(SEGMENT))) == NULL)
-			return (-1);
-		hashp->exsegs++;
-		hashp->nsegs++;
-	}
-	/*
-	 * If the split point is increasing (MAX_BUCKET's log base 2
-	 * * increases), we need to copy the current contents of the spare
-	 * split bucket to the next bucket.
-	 */
-	spare_ndx = __log2(hashp->MAX_BUCKET + 1);
-	if (spare_ndx > hashp->OVFL_POINT) {
-		hashp->SPARES[spare_ndx] = hashp->SPARES[hashp->OVFL_POINT];
-		hashp->OVFL_POINT = spare_ndx;
-	}
-
-	if (new_bucket > hashp->HIGH_MASK) {
-		/* Starting a new doubling */
-		hashp->LOW_MASK = hashp->HIGH_MASK;
-		hashp->HIGH_MASK = new_bucket | hashp->LOW_MASK;
-	}
-	/* Relocate records to the new bucket */
-	return (__split_page(hashp, old_bucket, new_bucket));
-}
-
-/*
- * If realloc guarantees that the pointer is not destroyed if the realloc
- * fails, then this routine can go away.
- */
-static void *
-hash_realloc(p_ptr, oldsize, newsize)
-	SEGMENT **p_ptr;
-	int oldsize, newsize;
-{
-	void *p;
-
-	if ( (p = malloc(newsize)) ) {
-		memmove(p, *p_ptr, oldsize);
-		memset((char *)p + oldsize, 0, newsize - oldsize);
-		free(*p_ptr);
-		*p_ptr = p;
-	}
-	return (p);
-}
-
-extern uint32_t
-__call_hash(hashp, k, len)
-	HTAB *hashp;
-	char *k;
-	int len;
-{
-	int n, bucket;
-
-	n = hashp->hash(k, len);
-	bucket = n & hashp->HIGH_MASK;
-	if (bucket > hashp->MAX_BUCKET)
-		bucket = bucket & hashp->LOW_MASK;
-	return (bucket);
-}
-
-/*
- * Allocate segment table.  On error, destroy the table and set errno.
- *
- * Returns 0 on success
- */
-static int
-alloc_segs(hashp, nsegs)
-	HTAB *hashp;
-	int nsegs;
-{
-	int i;
-	SEGMENT store;
-
-	int save_errno;
-
-	if ((hashp->dir =
-	    (SEGMENT *)calloc(hashp->DSIZE, sizeof(SEGMENT *))) == NULL) {
-		save_errno = errno;
-		(void)hdestroy(hashp);
-		errno = save_errno;
-		return (-1);
-	}
-	/* Allocate segments */
-	if ((store =
-	    (SEGMENT)calloc(nsegs << hashp->SSHIFT, sizeof(SEGMENT))) == NULL) {
-		save_errno = errno;
-		(void)hdestroy(hashp);
-		errno = save_errno;
-		return (-1);
-	}
-	for (i = 0; i < nsegs; i++, hashp->nsegs++)
-		hashp->dir[i] = &store[i << hashp->SSHIFT];
-	return (0);
-}
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-/*
- * Hashp->hdr needs to be byteswapped.
- */
-static void
-swap_header_copy(srcp, destp)
-	HASHHDR *srcp, *destp;
-{
-	int i;
-
-	P_32_COPY(srcp->magic, destp->magic);
-	P_32_COPY(srcp->version, destp->version);
-	P_32_COPY(srcp->lorder, destp->lorder);
-	P_32_COPY(srcp->bsize, destp->bsize);
-	P_32_COPY(srcp->bshift, destp->bshift);
-	P_32_COPY(srcp->dsize, destp->dsize);
-	P_32_COPY(srcp->ssize, destp->ssize);
-	P_32_COPY(srcp->sshift, destp->sshift);
-	P_32_COPY(srcp->ovfl_point, destp->ovfl_point);
-	P_32_COPY(srcp->last_freed, destp->last_freed);
-	P_32_COPY(srcp->max_bucket, destp->max_bucket);
-	P_32_COPY(srcp->high_mask, destp->high_mask);
-	P_32_COPY(srcp->low_mask, destp->low_mask);
-	P_32_COPY(srcp->ffactor, destp->ffactor);
-	P_32_COPY(srcp->nkeys, destp->nkeys);
-	P_32_COPY(srcp->hdrpages, destp->hdrpages);
-	P_32_COPY(srcp->h_charkey, destp->h_charkey);
-	for (i = 0; i < NCACHED; i++) {
-		P_32_COPY(srcp->spares[i], destp->spares[i]);
-		P_16_COPY(srcp->bitmaps[i], destp->bitmaps[i]);
-	}
-}
-
-static void
-swap_header(hashp)
-	HTAB *hashp;
-{
-	HASHHDR *hdrp;
-	int i;
-
-	hdrp = &hashp->hdr;
-
-	M_32_SWAP(hdrp->magic);
-	M_32_SWAP(hdrp->version);
-	M_32_SWAP(hdrp->lorder);
-	M_32_SWAP(hdrp->bsize);
-	M_32_SWAP(hdrp->bshift);
-	M_32_SWAP(hdrp->dsize);
-	M_32_SWAP(hdrp->ssize);
-	M_32_SWAP(hdrp->sshift);
-	M_32_SWAP(hdrp->ovfl_point);
-	M_32_SWAP(hdrp->last_freed);
-	M_32_SWAP(hdrp->max_bucket);
-	M_32_SWAP(hdrp->high_mask);
-	M_32_SWAP(hdrp->low_mask);
-	M_32_SWAP(hdrp->ffactor);
-	M_32_SWAP(hdrp->nkeys);
-	M_32_SWAP(hdrp->hdrpages);
-	M_32_SWAP(hdrp->h_charkey);
-	for (i = 0; i < NCACHED; i++) {
-		M_32_SWAP(hdrp->spares[i]);
-		M_16_SWAP(hdrp->bitmaps[i]);
-	}
-}
-#endif
diff --git a/lib/libc/db/hash/hash.h b/lib/libc/db/hash/hash.h
deleted file mode 100644
index 76237f3..0000000
--- a/lib/libc/db/hash/hash.h
+++ /dev/null
@@ -1,294 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- *
- *	@(#)hash.h	8.3 (Berkeley) 5/31/94
- * $FreeBSD: src/lib/libc/db/hash/hash.h,v 1.6 2002/03/21 22:46:26 obrien Exp $
- */
-
-/* Operations */
-typedef enum {
-	HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT
-} ACTION;
-
-/* Buffer Management structures */
-typedef struct _bufhead BUFHEAD;
-
-struct _bufhead {
-	BUFHEAD		*prev;		/* LRU links */
-	BUFHEAD		*next;		/* LRU links */
-	BUFHEAD		*ovfl;		/* Overflow page buffer header */
-	uint32_t	 addr;		/* Address of this page */
-	char		*page;		/* Actual page data */
-	char	 	flags;
-#define	BUF_MOD		0x0001
-#define BUF_DISK	0x0002
-#define	BUF_BUCKET	0x0004
-#define	BUF_PIN		0x0008
-};
-
-#define IS_BUCKET(X)	((X) & BUF_BUCKET)
-
-typedef BUFHEAD **SEGMENT;
-
-/* Hash Table Information */
-typedef struct hashhdr {		/* Disk resident portion */
-	int		magic;		/* Magic NO for hash tables */
-	int		version;	/* Version ID */
-	uint32_t	lorder;		/* Byte Order */
-	int		bsize;		/* Bucket/Page Size */
-	int		bshift;		/* Bucket shift */
-	int		dsize;		/* Directory Size */
-	int		ssize;		/* Segment Size */
-	int		sshift;		/* Segment shift */
-	int		ovfl_point;	/* Where overflow pages are being 
-					 * allocated */
-	int		last_freed;	/* Last overflow page freed */
-	int		max_bucket;	/* ID of Maximum bucket in use */
-	int		high_mask;	/* Mask to modulo into entire table */
-	int		low_mask;	/* Mask to modulo into lower half of 
-					 * table */
-	int		ffactor;	/* Fill factor */
-	int		nkeys;		/* Number of keys in hash table */
-	int		hdrpages;	/* Size of table header */
-	int		h_charkey;	/* value of hash(CHARKEY) */
-#define NCACHED	32			/* number of bit maps and spare 
-					 * points */
-	int		spares[NCACHED];/* spare pages for overflow */
-	u_int16_t	bitmaps[NCACHED];	/* address of overflow page 
-						 * bitmaps */
-} HASHHDR;
-
-typedef struct htab	 {		/* Memory resident data structure */
-	HASHHDR 	hdr;		/* Header */
-	int		nsegs;		/* Number of allocated segments */
-	int		exsegs;		/* Number of extra allocated 
-					 * segments */
-	uint32_t			/* Hash function */
-	    (*hash)(const void *, size_t);
-	int		flags;		/* Flag values */
-	int		fp;		/* File pointer */
-	char		*tmp_buf;	/* Temporary Buffer for BIG data */
-	char		*tmp_key;	/* Temporary Buffer for BIG keys */
-	BUFHEAD 	*cpage;		/* Current page */
-	int		cbucket;	/* Current bucket */
-	int		cndx;		/* Index of next item on cpage */
-	int		error;		/* Error Number -- for DBM 
-					 * compatibility */
-	int		new_file;	/* Indicates if fd is backing store 
-					 * or no */
-	int		save_file;	/* Indicates whether we need to flush 
-					 * file at
-					 * exit */
-	uint32_t	*mapp[NCACHED];	/* Pointers to page maps */
-	int		nmaps;		/* Initial number of bitmaps */
-	int		nbufs;		/* Number of buffers left to 
-					 * allocate */
-	BUFHEAD 	bufhead;	/* Header of buffer lru list */
-	SEGMENT 	*dir;		/* Hash Bucket directory */
-} HTAB;
-
-/*
- * Constants
- */
-#define	MAX_BSIZE		65536		/* 2^16 */
-#define MIN_BUFFERS		6
-#define MINHDRSIZE		512
-#define DEF_BUFSIZE		65536		/* 64 K */
-#define DEF_BUCKET_SIZE		4096
-#define DEF_BUCKET_SHIFT	12		/* log2(BUCKET) */
-#define DEF_SEGSIZE		256
-#define DEF_SEGSIZE_SHIFT	8		/* log2(SEGSIZE)	 */
-#define DEF_DIRSIZE		256
-#define DEF_FFACTOR		65536
-#define MIN_FFACTOR		4
-#define SPLTMAX			8
-#define CHARKEY			"%$sniglet^&"
-#define NUMKEY			1038583
-#define BYTE_SHIFT		3
-#define INT_TO_BYTE		2
-#define INT_BYTE_SHIFT		5
-#define ALL_SET			((uint32_t)0xFFFFFFFF)
-#define ALL_CLEAR		0
-
-#define PTROF(X)	((BUFHEAD *)((ptrdiff_t)(X)&~0x3))
-#define ISMOD(X)	((uint32_t)(ptrdiff_t)(X)&0x1)
-#define DOMOD(X)	((X) = (char *)((ptrdiff_t)(X)|0x1))
-#define ISDISK(X)	((uint32_t)(ptrdiff_t)(X)&0x2)
-#define DODISK(X)	((X) = (char *)((ptrdiff_t)(X)|0x2))
-
-#define BITS_PER_MAP	32
-
-/* Given the address of the beginning of a big map, clear/set the nth bit */
-#define CLRBIT(A, N)	((A)[(N)/BITS_PER_MAP] &= ~(1<<((N)%BITS_PER_MAP)))
-#define SETBIT(A, N)	((A)[(N)/BITS_PER_MAP] |= (1<<((N)%BITS_PER_MAP)))
-#define ISSET(A, N)	((A)[(N)/BITS_PER_MAP] & (1<<((N)%BITS_PER_MAP)))
-
-/* Overflow management */
-/*
- * Overflow page numbers are allocated per split point.  At each doubling of
- * the table, we can allocate extra pages.  So, an overflow page number has
- * the top 5 bits indicate which split point and the lower 11 bits indicate
- * which page at that split point is indicated (pages within split points are
- * numberered starting with 1).
- */
-
-#define SPLITSHIFT	11
-#define SPLITMASK	0x7FF
-#define SPLITNUM(N)	(((uint32_t)(N)) >> SPLITSHIFT)
-#define OPAGENUM(N)	((N) & SPLITMASK)
-#define	OADDR_OF(S,O)	((uint32_t)((uint32_t)(S) << SPLITSHIFT) + (O))
-
-#define BUCKET_TO_PAGE(B) \
-	(B) + hashp->HDRPAGES + ((B) ? hashp->SPARES[__log2((B)+1)-1] : 0)
-#define OADDR_TO_PAGE(B) 	\
-	BUCKET_TO_PAGE ( (1 << SPLITNUM((B))) -1 ) + OPAGENUM((B));
-
-/*
- * page.h contains a detailed description of the page format.
- *
- * Normally, keys and data are accessed from offset tables in the top of
- * each page which point to the beginning of the key and data.  There are
- * four flag values which may be stored in these offset tables which indicate
- * the following:
- *
- *
- * OVFLPAGE	Rather than a key data pair, this pair contains
- *		the address of an overflow page.  The format of
- *		the pair is:
- *		    OVERFLOW_PAGE_NUMBER OVFLPAGE
- *
- * PARTIAL_KEY	This must be the first key/data pair on a page
- *		and implies that page contains only a partial key.
- *		That is, the key is too big to fit on a single page
- *		so it starts on this page and continues on the next.
- *		The format of the page is:
- *		    KEY_OFF PARTIAL_KEY OVFL_PAGENO OVFLPAGE
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    PARTIAL_KEY -- 1
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- * FULL_KEY	This must be the first key/data pair on the page.  It
- *		is used in two cases.
- *
- *		Case 1:
- *		    There is a complete key on the page but no data
- *		    (because it wouldn't fit).  The next page contains
- *		    the data.
- *
- *		    Page format it:
- *		    KEY_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    FULL_KEY -- 2
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- *		Case 2:
- *		    This page contains no key, but part of a large
- *		    data field, which is continued on the next page.
- *
- *		    Page format it:
- *		    DATA_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
- *
- *		    KEY_OFF -- offset of the beginning of the data on
- *				this page
- *		    FULL_KEY -- 2
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- * FULL_KEY_DATA
- *		This must be the first key/data pair on the page.
- *		There are two cases:
- *
- *		Case 1:
- *		    This page contains a key and the beginning of the
- *		    data field, but the data field is continued on the
- *		    next page.
- *
- *		    Page format is:
- *		    KEY_OFF FULL_KEY_DATA OVFL_PAGENO DATA_OFF
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    FULL_KEY_DATA -- 3
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    DATA_OFF -- offset of the beginning of the data
- *
- *		Case 2:
- *		    This page contains the last page of a big data pair.
- *		    There is no key, only the  tail end of the data
- *		    on this page.
- *
- *		    Page format is:
- *		    DATA_OFF FULL_KEY_DATA <OVFL_PAGENO> <OVFLPAGE>
- *
- *		    DATA_OFF -- offset of the beginning of the data on
- *				this page
- *		    FULL_KEY_DATA -- 3
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- *		    OVFL_PAGENO and OVFLPAGE are optional (they are
- *		    not present if there is no next page).
- */
-
-#define OVFLPAGE	0
-#define PARTIAL_KEY	1
-#define FULL_KEY	2
-#define FULL_KEY_DATA	3
-#define	REAL_KEY	4
-
-/* Short hands for accessing structure */
-#define BSIZE		hdr.bsize
-#define BSHIFT		hdr.bshift
-#define DSIZE		hdr.dsize
-#define SGSIZE		hdr.ssize
-#define SSHIFT		hdr.sshift
-#define LORDER		hdr.lorder
-#define OVFL_POINT	hdr.ovfl_point
-#define	LAST_FREED	hdr.last_freed
-#define MAX_BUCKET	hdr.max_bucket
-#define FFACTOR		hdr.ffactor
-#define HIGH_MASK	hdr.high_mask
-#define LOW_MASK	hdr.low_mask
-#define NKEYS		hdr.nkeys
-#define HDRPAGES	hdr.hdrpages
-#define SPARES		hdr.spares
-#define BITMAPS		hdr.bitmaps
-#define VERSION		hdr.version
-#define MAGIC		hdr.magic
-#define NEXT_FREE	hdr.next_free
-#define H_CHARKEY	hdr.h_charkey
diff --git a/lib/libc/db/hash/hash_bigkey.c b/lib/libc/db/hash/hash_bigkey.c
deleted file mode 100644
index 64b3e33..0000000
--- a/lib/libc/db/hash/hash_bigkey.c
+++ /dev/null
@@ -1,670 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_bigkey.c,v 1.5 2003/02/16 17:29:09 nectar Exp $");
-
-/*
- * PACKAGE: hash
- * DESCRIPTION:
- *	Big key/data handling for the hashing package.
- *
- * ROUTINES:
- * External
- *	__big_keydata
- *	__big_split
- *	__big_insert
- *	__big_return
- *	__big_delete
- *	__find_last_page
- * Internal
- *	collect_key
- *	collect_data
- */
-
-#include <sys/param.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static int collect_key(HTAB *, BUFHEAD *, int, DBT *, int);
-static int collect_data(HTAB *, BUFHEAD *, int, int);
-
-/*
- * Big_insert
- *
- * You need to do an insert and the key/data pair is too big
- *
- * Returns:
- * 0 ==> OK
- *-1 ==> ERROR
- */
-extern int
-__big_insert(hashp, bufp, key, val)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	const DBT *key, *val;
-{
-	u_int16_t *p;
-	int key_size, n, val_size;
-	u_int16_t space, move_bytes, off;
-	char *cp, *key_data, *val_data;
-
-	cp = bufp->page;		/* Character pointer of p. */
-	p = (u_int16_t *)cp;
-
-	key_data = (char *)key->data;
-	key_size = key->size;
-	val_data = (char *)val->data;
-	val_size = val->size;
-
-	/* First move the Key */
-	for (space = FREESPACE(p) - BIGOVERHEAD; key_size;
-	    space = FREESPACE(p) - BIGOVERHEAD) {
-		move_bytes = MIN(space, key_size);
-		off = OFFSET(p) - move_bytes;
-		memmove(cp + off, key_data, move_bytes);
-		key_size -= move_bytes;
-		key_data += move_bytes;
-		n = p[0];
-		p[++n] = off;
-		p[0] = ++n;
-		FREESPACE(p) = off - PAGE_META(n);
-		OFFSET(p) = off;
-		p[n] = PARTIAL_KEY;
-		bufp = __add_ovflpage(hashp, bufp);
-		if (!bufp)
-			return (-1);
-		n = p[0];
-		if (!key_size) {
-			if (FREESPACE(p)) {
-				move_bytes = MIN(FREESPACE(p), val_size);
-				off = OFFSET(p) - move_bytes;
-				p[n] = off;
-				memmove(cp + off, val_data, move_bytes);
-				val_data += move_bytes;
-				val_size -= move_bytes;
-				p[n - 2] = FULL_KEY_DATA;
-				FREESPACE(p) = FREESPACE(p) - move_bytes;
-				OFFSET(p) = off;
-			} else
-				p[n - 2] = FULL_KEY;
-		}
-		p = (u_int16_t *)bufp->page;
-		cp = bufp->page;
-		bufp->flags |= BUF_MOD;
-	}
-
-	/* Now move the data */
-	for (space = FREESPACE(p) - BIGOVERHEAD; val_size;
-	    space = FREESPACE(p) - BIGOVERHEAD) {
-		move_bytes = MIN(space, val_size);
-		/*
-		 * Here's the hack to make sure that if the data ends on the
-		 * same page as the key ends, FREESPACE is at least one.
-		 */
-		if (space == val_size && val_size == val->size)
-			move_bytes--;
-		off = OFFSET(p) - move_bytes;
-		memmove(cp + off, val_data, move_bytes);
-		val_size -= move_bytes;
-		val_data += move_bytes;
-		n = p[0];
-		p[++n] = off;
-		p[0] = ++n;
-		FREESPACE(p) = off - PAGE_META(n);
-		OFFSET(p) = off;
-		if (val_size) {
-			p[n] = FULL_KEY;
-			bufp = __add_ovflpage(hashp, bufp);
-			if (!bufp)
-				return (-1);
-			cp = bufp->page;
-			p = (u_int16_t *)cp;
-		} else
-			p[n] = FULL_KEY_DATA;
-		bufp->flags |= BUF_MOD;
-	}
-	return (0);
-}
-
-/*
- * Called when bufp's page  contains a partial key (index should be 1)
- *
- * All pages in the big key/data pair except bufp are freed.  We cannot
- * free bufp because the page pointing to it is lost and we can't get rid
- * of its pointer.
- *
- * Returns:
- * 0 => OK
- *-1 => ERROR
- */
-extern int
-__big_delete(hashp, bufp)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-{
-	BUFHEAD *last_bfp, *rbufp;
-	u_int16_t *bp, pageno;
-	int key_done, n;
-
-	rbufp = bufp;
-	last_bfp = NULL;
-	bp = (u_int16_t *)bufp->page;
-	pageno = 0;
-	key_done = 0;
-
-	while (!key_done || (bp[2] != FULL_KEY_DATA)) {
-		if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA)
-			key_done = 1;
-
-		/*
-		 * If there is freespace left on a FULL_KEY_DATA page, then
-		 * the data is short and fits entirely on this page, and this
-		 * is the last page.
-		 */
-		if (bp[2] == FULL_KEY_DATA && FREESPACE(bp))
-			break;
-		pageno = bp[bp[0] - 1];
-		rbufp->flags |= BUF_MOD;
-		rbufp = __get_buf(hashp, pageno, rbufp, 0);
-		if (last_bfp)
-			__free_ovflpage(hashp, last_bfp);
-		last_bfp = rbufp;
-		if (!rbufp)
-			return (-1);		/* Error. */
-		bp = (u_int16_t *)rbufp->page;
-	}
-
-	/*
-	 * If we get here then rbufp points to the last page of the big
-	 * key/data pair.  Bufp points to the first one -- it should now be
-	 * empty pointing to the next page after this pair.  Can't free it
-	 * because we don't have the page pointing to it.
-	 */
-
-	/* This is information from the last page of the pair. */
-	n = bp[0];
-	pageno = bp[n - 1];
-
-	/* Now, bp is the first page of the pair. */
-	bp = (u_int16_t *)bufp->page;
-	if (n > 2) {
-		/* There is an overflow page. */
-		bp[1] = pageno;
-		bp[2] = OVFLPAGE;
-		bufp->ovfl = rbufp->ovfl;
-	} else
-		/* This is the last page. */
-		bufp->ovfl = NULL;
-	n -= 2;
-	bp[0] = n;
-	FREESPACE(bp) = hashp->BSIZE - PAGE_META(n);
-	OFFSET(bp) = hashp->BSIZE - 1;
-
-	bufp->flags |= BUF_MOD;
-	if (rbufp)
-		__free_ovflpage(hashp, rbufp);
-	if (last_bfp != rbufp)
-		__free_ovflpage(hashp, last_bfp);
-
-	hashp->NKEYS--;
-	return (0);
-}
-/*
- * Returns:
- *  0 = key not found
- * -1 = get next overflow page
- * -2 means key not found and this is big key/data
- * -3 error
- */
-extern int
-__find_bigpair(hashp, bufp, ndx, key, size)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int ndx;
-	char *key;
-	int size;
-{
-	u_int16_t *bp;
-	char *p;
-	int ksize;
-	u_int16_t bytes;
-	char *kkey;
-
-	bp = (u_int16_t *)bufp->page;
-	p = bufp->page;
-	ksize = size;
-	kkey = key;
-
-	for (bytes = hashp->BSIZE - bp[ndx];
-	    bytes <= size && bp[ndx + 1] == PARTIAL_KEY;
-	    bytes = hashp->BSIZE - bp[ndx]) {
-		if (memcmp(p + bp[ndx], kkey, bytes))
-			return (-2);
-		kkey += bytes;
-		ksize -= bytes;
-		bufp = __get_buf(hashp, bp[ndx + 2], bufp, 0);
-		if (!bufp)
-			return (-3);
-		p = bufp->page;
-		bp = (u_int16_t *)p;
-		ndx = 1;
-	}
-
-	if (bytes != ksize || memcmp(p + bp[ndx], kkey, bytes)) {
-#ifdef HASH_STATISTICS
-		++hash_collisions;
-#endif
-		return (-2);
-	} else
-		return (ndx);
-}
-
-/*
- * Given the buffer pointer of the first overflow page of a big pair,
- * find the end of the big pair
- *
- * This will set bpp to the buffer header of the last page of the big pair.
- * It will return the pageno of the overflow page following the last page
- * of the pair; 0 if there isn't any (i.e. big pair is the last key in the
- * bucket)
- */
-extern u_int16_t
-__find_last_page(hashp, bpp)
-	HTAB *hashp;
-	BUFHEAD **bpp;
-{
-	BUFHEAD *bufp;
-	u_int16_t *bp, pageno;
-	int n;
-
-	bufp = *bpp;
-	bp = (u_int16_t *)bufp->page;
-	for (;;) {
-		n = bp[0];
-
-		/*
-		 * This is the last page if: the tag is FULL_KEY_DATA and
-		 * either only 2 entries OVFLPAGE marker is explicit there
-		 * is freespace on the page.
-		 */
-		if (bp[2] == FULL_KEY_DATA &&
-		    ((n == 2) || (bp[n] == OVFLPAGE) || (FREESPACE(bp))))
-			break;
-
-		pageno = bp[n - 1];
-		bufp = __get_buf(hashp, pageno, bufp, 0);
-		if (!bufp)
-			return (0);	/* Need to indicate an error! */
-		bp = (u_int16_t *)bufp->page;
-	}
-
-	*bpp = bufp;
-	if (bp[0] > 2)
-		return (bp[3]);
-	else
-		return (0);
-}
-
-/*
- * Return the data for the key/data pair that begins on this page at this
- * index (index should always be 1).
- */
-extern int
-__big_return(hashp, bufp, ndx, val, set_current)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int ndx;
-	DBT *val;
-	int set_current;
-{
-	BUFHEAD *save_p;
-	u_int16_t *bp, len, off, save_addr;
-	char *tp;
-
-	bp = (u_int16_t *)bufp->page;
-	while (bp[ndx + 1] == PARTIAL_KEY) {
-		bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!bufp)
-			return (-1);
-		bp = (u_int16_t *)bufp->page;
-		ndx = 1;
-	}
-
-	if (bp[ndx + 1] == FULL_KEY) {
-		bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!bufp)
-			return (-1);
-		bp = (u_int16_t *)bufp->page;
-		save_p = bufp;
-		save_addr = save_p->addr;
-		off = bp[1];
-		len = 0;
-	} else
-		if (!FREESPACE(bp)) {
-			/*
-			 * This is a hack.  We can't distinguish between
-			 * FULL_KEY_DATA that contains complete data or
-			 * incomplete data, so we require that if the data
-			 * is complete, there is at least 1 byte of free
-			 * space left.
-			 */
-			off = bp[bp[0]];
-			len = bp[1] - off;
-			save_p = bufp;
-			save_addr = bufp->addr;
-			bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-			if (!bufp)
-				return (-1);
-			bp = (u_int16_t *)bufp->page;
-		} else {
-			/* The data is all on one page. */
-			tp = (char *)bp;
-			off = bp[bp[0]];
-			val->data = (u_char *)tp + off;
-			val->size = bp[1] - off;
-			if (set_current) {
-				if (bp[0] == 2) {	/* No more buckets in
-							 * chain */
-					hashp->cpage = NULL;
-					hashp->cbucket++;
-					hashp->cndx = 1;
-				} else {
-					hashp->cpage = __get_buf(hashp,
-					    bp[bp[0] - 1], bufp, 0);
-					if (!hashp->cpage)
-						return (-1);
-					hashp->cndx = 1;
-					if (!((u_int16_t *)
-					    hashp->cpage->page)[0]) {
-						hashp->cbucket++;
-						hashp->cpage = NULL;
-					}
-				}
-			}
-			return (0);
-		}
-
-	val->size = collect_data(hashp, bufp, (int)len, set_current);
-	if (val->size == -1)
-		return (-1);
-	if (save_p->addr != save_addr) {
-		/* We are pretty short on buffers. */
-		errno = EINVAL;			/* OUT OF BUFFERS */
-		return (-1);
-	}
-	memmove(hashp->tmp_buf, (save_p->page) + off, len);
-	val->data = (u_char *)hashp->tmp_buf;
-	return (0);
-}
-/*
- * Count how big the total datasize is by recursing through the pages.  Then
- * allocate a buffer and copy the data as you recurse up.
- */
-static int
-collect_data(hashp, bufp, len, set)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int len, set;
-{
-	u_int16_t *bp;
-	char *p;
-	BUFHEAD *xbp;
-	u_int16_t save_addr;
-	int mylen, totlen;
-
-	p = bufp->page;
-	bp = (u_int16_t *)p;
-	mylen = hashp->BSIZE - bp[1];
-	save_addr = bufp->addr;
-
-	if (bp[2] == FULL_KEY_DATA) {		/* End of Data */
-		totlen = len + mylen;
-		if (hashp->tmp_buf)
-			free(hashp->tmp_buf);
-		if ((hashp->tmp_buf = (char *)malloc(totlen)) == NULL)
-			return (-1);
-		if (set) {
-			hashp->cndx = 1;
-			if (bp[0] == 2) {	/* No more buckets in chain */
-				hashp->cpage = NULL;
-				hashp->cbucket++;
-			} else {
-				hashp->cpage =
-				    __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-				if (!hashp->cpage)
-					return (-1);
-				else if (!((u_int16_t *)hashp->cpage->page)[0]) {
-					hashp->cbucket++;
-					hashp->cpage = NULL;
-				}
-			}
-		}
-	} else {
-		xbp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!xbp || ((totlen =
-		    collect_data(hashp, xbp, len + mylen, set)) < 1))
-			return (-1);
-	}
-	if (bufp->addr != save_addr) {
-		errno = EINVAL;			/* Out of buffers. */
-		return (-1);
-	}
-	memmove(&hashp->tmp_buf[len], (bufp->page) + bp[1], mylen);
-	return (totlen);
-}
-
-/*
- * Fill in the key and data for this big pair.
- */
-extern int
-__big_keydata(hashp, bufp, key, val, set)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	DBT *key, *val;
-	int set;
-{
-	key->size = collect_key(hashp, bufp, 0, val, set);
-	if (key->size == -1)
-		return (-1);
-	key->data = (u_char *)hashp->tmp_key;
-	return (0);
-}
-
-/*
- * Count how big the total key size is by recursing through the pages.  Then
- * collect the data, allocate a buffer and copy the key as you recurse up.
- */
-static int
-collect_key(hashp, bufp, len, val, set)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int len;
-	DBT *val;
-	int set;
-{
-	BUFHEAD *xbp;
-	char *p;
-	int mylen, totlen;
-	u_int16_t *bp, save_addr;
-
-	p = bufp->page;
-	bp = (u_int16_t *)p;
-	mylen = hashp->BSIZE - bp[1];
-
-	save_addr = bufp->addr;
-	totlen = len + mylen;
-	if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA) {    /* End of Key. */
-		if (hashp->tmp_key != NULL)
-			free(hashp->tmp_key);
-		if ((hashp->tmp_key = (char *)malloc(totlen)) == NULL)
-			return (-1);
-		if (__big_return(hashp, bufp, 1, val, set))
-			return (-1);
-	} else {
-		xbp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!xbp || ((totlen =
-		    collect_key(hashp, xbp, totlen, val, set)) < 1))
-			return (-1);
-	}
-	if (bufp->addr != save_addr) {
-		errno = EINVAL;		/* MIS -- OUT OF BUFFERS */
-		return (-1);
-	}
-	memmove(&hashp->tmp_key[len], (bufp->page) + bp[1], mylen);
-	return (totlen);
-}
-
-/*
- * Returns:
- *  0 => OK
- * -1 => error
- */
-extern int
-__big_split(hashp, op, np, big_keyp, addr, obucket, ret)
-	HTAB *hashp;
-	BUFHEAD *op;	/* Pointer to where to put keys that go in old bucket */
-	BUFHEAD *np;	/* Pointer to new bucket page */
-			/* Pointer to first page containing the big key/data */
-	BUFHEAD *big_keyp;
-	int addr;	/* Address of big_keyp */
-	uint32_t   obucket;/* Old Bucket */
-	SPLIT_RETURN *ret;
-{
-	BUFHEAD *tmpp;
-	u_int16_t *tp;
-	BUFHEAD *bp;
-	DBT key, val;
-	uint32_t change;
-	u_int16_t free_space, n, off;
-
-	bp = big_keyp;
-
-	/* Now figure out where the big key/data goes */
-	if (__big_keydata(hashp, big_keyp, &key, &val, 0))
-		return (-1);
-	change = (__call_hash(hashp, key.data, key.size) != obucket);
-
-	if ( (ret->next_addr = __find_last_page(hashp, &big_keyp)) ) {
-		if (!(ret->nextp =
-		    __get_buf(hashp, ret->next_addr, big_keyp, 0)))
-			return (-1);;
-	} else
-		ret->nextp = NULL;
-
-	/* Now make one of np/op point to the big key/data pair */
-#ifdef DEBUG
-	assert(np->ovfl == NULL);
-#endif
-	if (change)
-		tmpp = np;
-	else
-		tmpp = op;
-
-	tmpp->flags |= BUF_MOD;
-#ifdef DEBUG1
-	(void)fprintf(stderr,
-	    "BIG_SPLIT: %d->ovfl was %d is now %d\n", tmpp->addr,
-	    (tmpp->ovfl ? tmpp->ovfl->addr : 0), (bp ? bp->addr : 0));
-#endif
-	tmpp->ovfl = bp;	/* one of op/np point to big_keyp */
-	tp = (u_int16_t *)tmpp->page;
-#ifdef DEBUG
-	assert(FREESPACE(tp) >= OVFLSIZE);
-#endif
-	n = tp[0];
-	off = OFFSET(tp);
-	free_space = FREESPACE(tp);
-	tp[++n] = (u_int16_t)addr;
-	tp[++n] = OVFLPAGE;
-	tp[0] = n;
-	OFFSET(tp) = off;
-	FREESPACE(tp) = free_space - OVFLSIZE;
-
-	/*
-	 * Finally, set the new and old return values. BIG_KEYP contains a
-	 * pointer to the last page of the big key_data pair. Make sure that
-	 * big_keyp has no following page (2 elements) or create an empty
-	 * following page.
-	 */
-
-	ret->newp = np;
-	ret->oldp = op;
-
-	tp = (u_int16_t *)big_keyp->page;
-	big_keyp->flags |= BUF_MOD;
-	if (tp[0] > 2) {
-		/*
-		 * There may be either one or two offsets on this page.  If
-		 * there is one, then the overflow page is linked on normally
-		 * and tp[4] is OVFLPAGE.  If there are two, tp[4] contains
-		 * the second offset and needs to get stuffed in after the
-		 * next overflow page is added.
-		 */
-		n = tp[4];
-		free_space = FREESPACE(tp);
-		off = OFFSET(tp);
-		tp[0] -= 2;
-		FREESPACE(tp) = free_space + OVFLSIZE;
-		OFFSET(tp) = off;
-		tmpp = __add_ovflpage(hashp, big_keyp);
-		if (!tmpp)
-			return (-1);
-		tp[4] = n;
-	} else
-		tmpp = big_keyp;
-
-	if (change)
-		ret->newp = tmpp;
-	else
-		ret->oldp = tmpp;
-	return (0);
-}
diff --git a/lib/libc/db/hash/hash_buf.c b/lib/libc/db/hash/hash_buf.c
deleted file mode 100644
index 5908723..0000000
--- a/lib/libc/db/hash/hash_buf.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_buf.c,v 1.7 2002/03/21 22:46:26 obrien Exp $");
-
-/*
- * PACKAGE: hash
- *
- * DESCRIPTION:
- *	Contains buffer management
- *
- * ROUTINES:
- * External
- *	__buf_init
- *	__get_buf
- *	__buf_free
- *	__reclaim_buf
- * Internal
- *	newbuf
- */
-
-#include <sys/param.h>
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static BUFHEAD *newbuf(HTAB *, uint32_t, BUFHEAD *);
-
-/* Unlink B from its place in the lru */
-#define BUF_REMOVE(B) { \
-	(B)->prev->next = (B)->next; \
-	(B)->next->prev = (B)->prev; \
-}
-
-/* Insert B after P */
-#define BUF_INSERT(B, P) { \
-	(B)->next = (P)->next; \
-	(B)->prev = (P); \
-	(P)->next = (B); \
-	(B)->next->prev = (B); \
-}
-
-#define	MRU	hashp->bufhead.next
-#define	LRU	hashp->bufhead.prev
-
-#define MRU_INSERT(B)	BUF_INSERT((B), &hashp->bufhead)
-#define LRU_INSERT(B)	BUF_INSERT((B), LRU)
-
-/*
- * We are looking for a buffer with address "addr".  If prev_bp is NULL, then
- * address is a bucket index.  If prev_bp is not NULL, then it points to the
- * page previous to an overflow page that we are trying to find.
- *
- * CAVEAT:  The buffer header accessed via prev_bp's ovfl field may no longer
- * be valid.  Therefore, you must always verify that its address matches the
- * address you are seeking.
- */
-extern BUFHEAD *
-__get_buf(hashp, addr, prev_bp, newpage)
-	HTAB *hashp;
-	uint32_t addr;
-	BUFHEAD *prev_bp;
-	int newpage;	/* If prev_bp set, indicates a new overflow page. */
-{
-	BUFHEAD *bp;
-	uint32_t is_disk_mask;
-	int is_disk, segment_ndx;
-	SEGMENT segp;
-
-	is_disk = 0;
-	is_disk_mask = 0;
-	if (prev_bp) {
-		bp = prev_bp->ovfl;
-		if (!bp || (bp->addr != addr))
-			bp = NULL;
-		if (!newpage)
-			is_disk = BUF_DISK;
-	} else {
-		/* Grab buffer out of directory */
-		segment_ndx = addr & (hashp->SGSIZE - 1);
-
-		/* valid segment ensured by __call_hash() */
-		segp = hashp->dir[addr >> hashp->SSHIFT];
-#ifdef DEBUG
-		assert(segp != NULL);
-#endif
-		bp = PTROF(segp[segment_ndx]);
-		is_disk_mask = ISDISK(segp[segment_ndx]);
-		is_disk = is_disk_mask || !hashp->new_file;
-	}
-
-	if (!bp) {
-		bp = newbuf(hashp, addr, prev_bp);
-		if (!bp ||
-		    __get_page(hashp, bp->page, addr, !prev_bp, is_disk, 0))
-			return (NULL);
-		if (!prev_bp)
-			segp[segment_ndx] =
-			    (BUFHEAD *)((ptrdiff_t)bp | is_disk_mask);
-	} else {
-		BUF_REMOVE(bp);
-		MRU_INSERT(bp);
-	}
-	return (bp);
-}
-
-/*
- * We need a buffer for this page. Either allocate one, or evict a resident
- * one (if we have as many buffers as we're allowed) and put this one in.
- *
- * If newbuf finds an error (returning NULL), it also sets errno.
- */
-static BUFHEAD *
-newbuf(hashp, addr, prev_bp)
-	HTAB *hashp;
-	uint32_t addr;
-	BUFHEAD *prev_bp;
-{
-	BUFHEAD *bp;		/* The buffer we're going to use */
-	BUFHEAD *xbp;		/* Temp pointer */
-	BUFHEAD *next_xbp;
-	SEGMENT segp;
-	int segment_ndx;
-	u_int16_t oaddr, *shortp;
-
-	oaddr = 0;
-	bp = LRU;
-	/*
-	 * If LRU buffer is pinned, the buffer pool is too small. We need to
-	 * allocate more buffers.
-	 */
-	if (hashp->nbufs || (bp->flags & BUF_PIN)) {
-		/* Allocate a new one */
-		if ((bp = (BUFHEAD *)malloc(sizeof(BUFHEAD))) == NULL)
-			return (NULL);
-#ifdef PURIFY
-		memset(bp, 0xff, sizeof(BUFHEAD));
-#endif
-		if ((bp->page = (char *)malloc(hashp->BSIZE)) == NULL) {
-			free(bp);
-			return (NULL);
-		}
-#ifdef PURIFY
-		memset(bp->page, 0xff, hashp->BSIZE);
-#endif
-		if (hashp->nbufs)
-			hashp->nbufs--;
-	} else {
-		/* Kick someone out */
-		BUF_REMOVE(bp);
-		/*
-		 * If this is an overflow page with addr 0, it's already been
-		 * flushed back in an overflow chain and initialized.
-		 */
-		if ((bp->addr != 0) || (bp->flags & BUF_BUCKET)) {
-			/*
-			 * Set oaddr before __put_page so that you get it
-			 * before bytes are swapped.
-			 */
-			shortp = (u_int16_t *)bp->page;
-			if (shortp[0])
-				oaddr = shortp[shortp[0] - 1];
-			if ((bp->flags & BUF_MOD) && __put_page(hashp, bp->page,
-			    bp->addr, (int)IS_BUCKET(bp->flags), 0))
-				return (NULL);
-			/*
-			 * Update the pointer to this page (i.e. invalidate it).
-			 *
-			 * If this is a new file (i.e. we created it at open
-			 * time), make sure that we mark pages which have been
-			 * written to disk so we retrieve them from disk later,
-			 * rather than allocating new pages.
-			 */
-			if (IS_BUCKET(bp->flags)) {
-				segment_ndx = bp->addr & (hashp->SGSIZE - 1);
-				segp = hashp->dir[bp->addr >> hashp->SSHIFT];
-#ifdef DEBUG
-				assert(segp != NULL);
-#endif
-
-				if (hashp->new_file &&
-				    ((bp->flags & BUF_MOD) ||
-				    ISDISK(segp[segment_ndx])))
-					segp[segment_ndx] = (BUFHEAD *)BUF_DISK;
-				else
-					segp[segment_ndx] = NULL;
-			}
-			/*
-			 * Since overflow pages can only be access by means of
-			 * their bucket, free overflow pages associated with
-			 * this bucket.
-			 */
-			for (xbp = bp; xbp->ovfl;) {
-				next_xbp = xbp->ovfl;
-				xbp->ovfl = 0;
-				xbp = next_xbp;
-
-				/* Check that ovfl pointer is up date. */
-				if (IS_BUCKET(xbp->flags) ||
-				    (oaddr != xbp->addr))
-					break;
-
-				shortp = (u_int16_t *)xbp->page;
-				if (shortp[0])
-					/* set before __put_page */
-					oaddr = shortp[shortp[0] - 1];
-				if ((xbp->flags & BUF_MOD) && __put_page(hashp,
-				    xbp->page, xbp->addr, 0, 0))
-					return (NULL);
-				xbp->addr = 0;
-				xbp->flags = 0;
-				BUF_REMOVE(xbp);
-				LRU_INSERT(xbp);
-			}
-		}
-	}
-
-	/* Now assign this buffer */
-	bp->addr = addr;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "NEWBUF1: %d->ovfl was %d is now %d\n",
-	    bp->addr, (bp->ovfl ? bp->ovfl->addr : 0), 0);
-#endif
-	bp->ovfl = NULL;
-	if (prev_bp) {
-		/*
-		 * If prev_bp is set, this is an overflow page, hook it in to
-		 * the buffer overflow links.
-		 */
-#ifdef DEBUG1
-		(void)fprintf(stderr, "NEWBUF2: %d->ovfl was %d is now %d\n",
-		    prev_bp->addr, (prev_bp->ovfl ? bp->ovfl->addr : 0),
-		    (bp ? bp->addr : 0));
-#endif
-		prev_bp->ovfl = bp;
-		bp->flags = 0;
-	} else
-		bp->flags = BUF_BUCKET;
-	MRU_INSERT(bp);
-	return (bp);
-}
-
-extern void
-__buf_init(hashp, nbytes)
-	HTAB *hashp;
-	int nbytes;
-{
-	BUFHEAD *bfp;
-	int npages;
-
-	bfp = &(hashp->bufhead);
-	npages = (nbytes + hashp->BSIZE - 1) >> hashp->BSHIFT;
-	npages = MAX(npages, MIN_BUFFERS);
-
-	hashp->nbufs = npages;
-	bfp->next = bfp;
-	bfp->prev = bfp;
-	/*
-	 * This space is calloc'd so these are already null.
-	 *
-	 * bfp->ovfl = NULL;
-	 * bfp->flags = 0;
-	 * bfp->page = NULL;
-	 * bfp->addr = 0;
-	 */
-}
-
-extern int
-__buf_free(hashp, do_free, to_disk)
-	HTAB *hashp;
-	int do_free, to_disk;
-{
-	BUFHEAD *bp;
-
-	/* Need to make sure that buffer manager has been initialized */
-	if (!LRU)
-		return (0);
-	for (bp = LRU; bp != &hashp->bufhead;) {
-		/* Check that the buffer is valid */
-		if (bp->addr || IS_BUCKET(bp->flags)) {
-			if (to_disk && (bp->flags & BUF_MOD) &&
-			    __put_page(hashp, bp->page,
-			    bp->addr, IS_BUCKET(bp->flags), 0))
-				return (-1);
-		}
-		/* Check if we are freeing stuff */
-		if (do_free) {
-			if (bp->page)
-				free(bp->page);
-			BUF_REMOVE(bp);
-			free(bp);
-			bp = LRU;
-		} else
-			bp = bp->prev;
-	}
-	return (0);
-}
-
-extern void
-__reclaim_buf(hashp, bp)
-	HTAB *hashp;
-	BUFHEAD *bp;
-{
-	bp->ovfl = 0;
-	bp->addr = 0;
-	bp->flags = 0;
-	BUF_REMOVE(bp);
-	LRU_INSERT(bp);
-}
diff --git a/lib/libc/db/hash/hash_func.c b/lib/libc/db/hash/hash_func.c
deleted file mode 100644
index afa66a0..0000000
--- a/lib/libc/db/hash/hash_func.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_func.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_func.c,v 1.5 2003/02/16 17:29:09 nectar Exp $");
-
-#include <sys/types.h>
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static uint32_t hash1(const void *, size_t) __unused;
-static uint32_t hash2(const void *, size_t) __unused;
-static uint32_t hash3(const void *, size_t) __unused;
-static uint32_t hash4(const void *, size_t);
-
-/* Global default hash function */
-uint32_t (*__default_hash)(const void *, size_t) = hash4;
-
-/*
- * HASH FUNCTIONS
- *
- * Assume that we've already split the bucket to which this key hashes,
- * calculate that bucket, and check that in fact we did already split it.
- *
- * This came from ejb's hsearch.
- */
-
-#define PRIME1		37
-#define PRIME2		1048583
-
-static uint32_t
-hash1(keyarg, len)
-	const void *keyarg;
-	size_t len;
-{
-	const u_char *key;
-	uint32_t h;
-
-	/* Convert string to integer */
-	for (key = keyarg, h = 0; len--;)
-		h = h * PRIME1 ^ (*key++ - ' ');
-	h %= PRIME2;
-	return (h);
-}
-
-/*
- * Phong's linear congruential hash
- */
-#define dcharhash(h, c)	((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c))
-
-static uint32_t
-hash2(keyarg, len)
-	const void *keyarg;
-	size_t len;
-{
-	const u_char *e, *key;
-	uint32_t h;
-	u_char c;
-
-	key = keyarg;
-	e = key + len;
-	for (h = 0; key != e;) {
-		c = *key++;
-		if (!c && key > e)
-			break;
-		dcharhash(h, c);
-	}
-	return (h);
-}
-
-/*
- * This is INCREDIBLY ugly, but fast.  We break the string up into 8 byte
- * units.  On the first time through the loop we get the "leftover bytes"
- * (strlen % 8).  On every other iteration, we perform 8 HASHC's so we handle
- * all 8 bytes.  Essentially, this saves us 7 cmp & branch instructions.  If
- * this routine is heavily used enough, it's worth the ugly coding.
- *
- * OZ's original sdbm hash
- */
-static uint32_t
-hash3(keyarg, len)
-	const void *keyarg;
-	size_t len;
-{
-	const u_char *key;
-	size_t loop;
-	uint32_t h;
-
-#define HASHC   h = *key++ + 65599 * h
-
-	h = 0;
-	key = keyarg;
-	if (len > 0) {
-		loop = (len + 8 - 1) >> 3;
-
-		switch (len & (8 - 1)) {
-		case 0:
-			do {
-				HASHC;
-				/* FALLTHROUGH */
-		case 7:
-				HASHC;
-				/* FALLTHROUGH */
-		case 6:
-				HASHC;
-				/* FALLTHROUGH */
-		case 5:
-				HASHC;
-				/* FALLTHROUGH */
-		case 4:
-				HASHC;
-				/* FALLTHROUGH */
-		case 3:
-				HASHC;
-				/* FALLTHROUGH */
-		case 2:
-				HASHC;
-				/* FALLTHROUGH */
-		case 1:
-				HASHC;
-			} while (--loop);
-		}
-	}
-	return (h);
-}
-
-/* Hash function from Chris Torek. */
-static uint32_t
-hash4(keyarg, len)
-	const void *keyarg;
-	size_t len;
-{
-	const u_char *key;
-	size_t loop;
-	uint32_t h;
-
-#define HASH4a   h = (h << 5) - h + *key++;
-#define HASH4b   h = (h << 5) + h + *key++;
-#define HASH4 HASH4b
-
-	h = 0;
-	key = keyarg;
-	if (len > 0) {
-		loop = (len + 8 - 1) >> 3;
-
-		switch (len & (8 - 1)) {
-		case 0:
-			do {
-				HASH4;
-				/* FALLTHROUGH */
-		case 7:
-				HASH4;
-				/* FALLTHROUGH */
-		case 6:
-				HASH4;
-				/* FALLTHROUGH */
-		case 5:
-				HASH4;
-				/* FALLTHROUGH */
-		case 4:
-				HASH4;
-				/* FALLTHROUGH */
-		case 3:
-				HASH4;
-				/* FALLTHROUGH */
-		case 2:
-				HASH4;
-				/* FALLTHROUGH */
-		case 1:
-				HASH4;
-			} while (--loop);
-		}
-	}
-	return (h);
-}
diff --git a/lib/libc/db/hash/hash_log2.c b/lib/libc/db/hash/hash_log2.c
deleted file mode 100644
index 88f307e..0000000
--- a/lib/libc/db/hash/hash_log2.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_log2.c	8.2 (Berkeley) 5/31/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_log2.c,v 1.2 2002/03/21 18:47:38 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <db.h>
-
-uint32_t
-__log2(num)
-	uint32_t num;
-{
-	uint32_t i, limit;
-
-	limit = 1;
-	for (i = 0; limit < num; limit = limit << 1, i++);
-	return (i);
-}
diff --git a/lib/libc/db/hash/hash_page.c b/lib/libc/db/hash/hash_page.c
deleted file mode 100644
index c98d82a..0000000
--- a/lib/libc/db/hash/hash_page.c
+++ /dev/null
@@ -1,948 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash_page.c,v 1.8 2002/03/21 22:46:26 obrien Exp $");
-
-/*
- * PACKAGE:  hashing
- *
- * DESCRIPTION:
- *	Page manipulation for hashing package.
- *
- * ROUTINES:
- *
- * External
- *	__get_page
- *	__add_ovflpage
- * Internal
- *	overflow_page
- *	open_temp
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef DEBUG
-#include <assert.h>
-#endif
-#include "un-namespace.h"
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static uint32_t	*fetch_bitmap(HTAB *, int);
-static uint32_t	 first_free(uint32_t);
-static int	 open_temp(HTAB *);
-static u_int16_t	 overflow_page(HTAB *);
-static void	 putpair(char *, const DBT *, const DBT *);
-static void	 squeeze_key(u_int16_t *, const DBT *, const DBT *);
-static int	 ugly_split
-(HTAB *, uint32_t, BUFHEAD *, BUFHEAD *, int, int);
-
-#define	PAGE_INIT(P) { \
-	((u_int16_t *)(P))[0] = 0; \
-	((u_int16_t *)(P))[1] = hashp->BSIZE - 3 * sizeof(u_int16_t); \
-	((u_int16_t *)(P))[2] = hashp->BSIZE; \
-}
-
-/*
- * This is called AFTER we have verified that there is room on the page for
- * the pair (PAIRFITS has returned true) so we go right ahead and start moving
- * stuff on.
- */
-static void
-putpair(p, key, val)
-	char *p;
-	const DBT *key, *val;
-{
-	u_int16_t *bp, n, off;
-
-	bp = (u_int16_t *)p;
-
-	/* Enter the key first. */
-	n = bp[0];
-
-	off = OFFSET(bp) - key->size;
-	memmove(p + off, key->data, key->size);
-	bp[++n] = off;
-
-	/* Now the data. */
-	off -= val->size;
-	memmove(p + off, val->data, val->size);
-	bp[++n] = off;
-
-	/* Adjust page info. */
-	bp[0] = n;
-	bp[n + 1] = off - ((n + 3) * sizeof(u_int16_t));
-	bp[n + 2] = off;
-}
-
-/*
- * Returns:
- *	 0 OK
- *	-1 error
- */
-extern int
-__delpair(hashp, bufp, ndx)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	int ndx;
-{
-	u_int16_t *bp, newoff;
-	int n;
-	u_int16_t pairlen;
-
-	bp = (u_int16_t *)bufp->page;
-	n = bp[0];
-
-	if (bp[ndx + 1] < REAL_KEY)
-		return (__big_delete(hashp, bufp));
-	if (ndx != 1)
-		newoff = bp[ndx - 1];
-	else
-		newoff = hashp->BSIZE;
-	pairlen = newoff - bp[ndx + 1];
-
-	if (ndx != (n - 1)) {
-		/* Hard Case -- need to shuffle keys */
-		int i;
-		char *src = bufp->page + (int)OFFSET(bp);
-		char *dst = src + (int)pairlen;
-		memmove(dst, src, bp[ndx + 1] - OFFSET(bp));
-
-		/* Now adjust the pointers */
-		for (i = ndx + 2; i <= n; i += 2) {
-			if (bp[i + 1] == OVFLPAGE) {
-				bp[i - 2] = bp[i];
-				bp[i - 1] = bp[i + 1];
-			} else {
-				bp[i - 2] = bp[i] + pairlen;
-				bp[i - 1] = bp[i + 1] + pairlen;
-			}
-		}
-	}
-	/* Finally adjust the page data */
-	bp[n] = OFFSET(bp) + pairlen;
-	bp[n - 1] = bp[n + 1] + pairlen + 2 * sizeof(u_int16_t);
-	bp[0] = n - 2;
-	hashp->NKEYS--;
-
-	bufp->flags |= BUF_MOD;
-	return (0);
-}
-/*
- * Returns:
- *	 0 ==> OK
- *	-1 ==> Error
- */
-extern int
-__split_page(hashp, obucket, nbucket)
-	HTAB *hashp;
-	uint32_t obucket, nbucket;
-{
-	BUFHEAD *new_bufp, *old_bufp;
-	u_int16_t *ino;
-	char *np;
-	DBT key, val;
-	int n, ndx, retval;
-	u_int16_t copyto, diff, off, moved;
-	char *op;
-
-	copyto = (u_int16_t)hashp->BSIZE;
-	off = (u_int16_t)hashp->BSIZE;
-	old_bufp = __get_buf(hashp, obucket, NULL, 0);
-	if (old_bufp == NULL)
-		return (-1);
-	new_bufp = __get_buf(hashp, nbucket, NULL, 0);
-	if (new_bufp == NULL)
-		return (-1);
-
-	old_bufp->flags |= (BUF_MOD | BUF_PIN);
-	new_bufp->flags |= (BUF_MOD | BUF_PIN);
-
-	ino = (u_int16_t *)(op = old_bufp->page);
-	np = new_bufp->page;
-
-	moved = 0;
-
-	for (n = 1, ndx = 1; n < ino[0]; n += 2) {
-		if (ino[n + 1] < REAL_KEY) {
-			retval = ugly_split(hashp, obucket, old_bufp, new_bufp,
-			    (int)copyto, (int)moved);
-			old_bufp->flags &= ~BUF_PIN;
-			new_bufp->flags &= ~BUF_PIN;
-			return (retval);
-
-		}
-		key.data = (u_char *)op + ino[n];
-		key.size = off - ino[n];
-
-		if (__call_hash(hashp, key.data, key.size) == obucket) {
-			/* Don't switch page */
-			diff = copyto - off;
-			if (diff) {
-				copyto = ino[n + 1] + diff;
-				memmove(op + copyto, op + ino[n + 1],
-				    off - ino[n + 1]);
-				ino[ndx] = copyto + ino[n] - ino[n + 1];
-				ino[ndx + 1] = copyto;
-			} else
-				copyto = ino[n + 1];
-			ndx += 2;
-		} else {
-			/* Switch page */
-			val.data = (u_char *)op + ino[n + 1];
-			val.size = ino[n] - ino[n + 1];
-			putpair(np, &key, &val);
-			moved += 2;
-		}
-
-		off = ino[n + 1];
-	}
-
-	/* Now clean up the page */
-	ino[0] -= moved;
-	FREESPACE(ino) = copyto - sizeof(u_int16_t) * (ino[0] + 3);
-	OFFSET(ino) = copyto;
-
-#ifdef DEBUG3
-	(void)fprintf(stderr, "split %d/%d\n",
-	    ((u_int16_t *)np)[0] / 2,
-	    ((u_int16_t *)op)[0] / 2);
-#endif
-	/* unpin both pages */
-	old_bufp->flags &= ~BUF_PIN;
-	new_bufp->flags &= ~BUF_PIN;
-	return (0);
-}
-
-/*
- * Called when we encounter an overflow or big key/data page during split
- * handling.  This is special cased since we have to begin checking whether
- * the key/data pairs fit on their respective pages and because we may need
- * overflow pages for both the old and new pages.
- *
- * The first page might be a page with regular key/data pairs in which case
- * we have a regular overflow condition and just need to go on to the next
- * page or it might be a big key/data pair in which case we need to fix the
- * big key/data pair.
- *
- * Returns:
- *	 0 ==> success
- *	-1 ==> failure
- */
-static int
-ugly_split(hashp, obucket, old_bufp, new_bufp, copyto, moved)
-	HTAB *hashp;
-	uint32_t obucket;	/* Same as __split_page. */
-	BUFHEAD *old_bufp, *new_bufp;
-	int copyto;	/* First byte on page which contains key/data values. */
-	int moved;		/* Number of pairs moved to new page. */
-{
-	BUFHEAD *bufp;		/* Buffer header for ino */
-	u_int16_t *ino;		/* Page keys come off of */
-	u_int16_t *np;		/* New page */
-	u_int16_t *op;		/* Page keys go on to if they aren't moving */
-
-	BUFHEAD *last_bfp;	/* Last buf header OVFL needing to be freed */
-	DBT key, val;
-	SPLIT_RETURN ret;
-	u_int16_t n, off, ov_addr, scopyto;
-	char *cino;		/* Character value of ino */
-
-	bufp = old_bufp;
-	ino = (u_int16_t *)old_bufp->page;
-	np = (u_int16_t *)new_bufp->page;
-	op = (u_int16_t *)old_bufp->page;
-	last_bfp = NULL;
-	scopyto = (u_int16_t)copyto;	/* ANSI */
-
-	n = ino[0] - 1;
-	while (n < ino[0]) {
-		if (ino[2] < REAL_KEY && ino[2] != OVFLPAGE) {
-			if (__big_split(hashp, old_bufp,
-			    new_bufp, bufp, bufp->addr, obucket, &ret))
-				return (-1);
-			old_bufp = ret.oldp;
-			if (!old_bufp)
-				return (-1);
-			op = (u_int16_t *)old_bufp->page;
-			new_bufp = ret.newp;
-			if (!new_bufp)
-				return (-1);
-			np = (u_int16_t *)new_bufp->page;
-			bufp = ret.nextp;
-			if (!bufp)
-				return (0);
-			cino = (char *)bufp->page;
-			ino = (u_int16_t *)cino;
-			last_bfp = ret.nextp;
-		} else if (ino[n + 1] == OVFLPAGE) {
-			ov_addr = ino[n];
-			/*
-			 * Fix up the old page -- the extra 2 are the fields
-			 * which contained the overflow information.
-			 */
-			ino[0] -= (moved + 2);
-			FREESPACE(ino) =
-			    scopyto - sizeof(u_int16_t) * (ino[0] + 3);
-			OFFSET(ino) = scopyto;
-
-			bufp = __get_buf(hashp, ov_addr, bufp, 0);
-			if (!bufp)
-				return (-1);
-
-			ino = (u_int16_t *)bufp->page;
-			n = 1;
-			scopyto = hashp->BSIZE;
-			moved = 0;
-
-			if (last_bfp)
-				__free_ovflpage(hashp, last_bfp);
-			last_bfp = bufp;
-		}
-		/* Move regular sized pairs of there are any */
-		off = hashp->BSIZE;
-		for (n = 1; (n < ino[0]) && (ino[n + 1] >= REAL_KEY); n += 2) {
-			cino = (char *)ino;
-			key.data = (u_char *)cino + ino[n];
-			key.size = off - ino[n];
-			val.data = (u_char *)cino + ino[n + 1];
-			val.size = ino[n] - ino[n + 1];
-			off = ino[n + 1];
-
-			if (__call_hash(hashp, key.data, key.size) == obucket) {
-				/* Keep on old page */
-				if (PAIRFITS(op, (&key), (&val)))
-					putpair((char *)op, &key, &val);
-				else {
-					old_bufp =
-					    __add_ovflpage(hashp, old_bufp);
-					if (!old_bufp)
-						return (-1);
-					op = (u_int16_t *)old_bufp->page;
-					putpair((char *)op, &key, &val);
-				}
-				old_bufp->flags |= BUF_MOD;
-			} else {
-				/* Move to new page */
-				if (PAIRFITS(np, (&key), (&val)))
-					putpair((char *)np, &key, &val);
-				else {
-					new_bufp =
-					    __add_ovflpage(hashp, new_bufp);
-					if (!new_bufp)
-						return (-1);
-					np = (u_int16_t *)new_bufp->page;
-					putpair((char *)np, &key, &val);
-				}
-				new_bufp->flags |= BUF_MOD;
-			}
-		}
-	}
-	if (last_bfp)
-		__free_ovflpage(hashp, last_bfp);
-	return (0);
-}
-
-/*
- * Add the given pair to the page
- *
- * Returns:
- *	0 ==> OK
- *	1 ==> failure
- */
-extern int
-__addel(hashp, bufp, key, val)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-	const DBT *key, *val;
-{
-	u_int16_t *bp, *sop;
-	int do_expand;
-
-	bp = (u_int16_t *)bufp->page;
-	do_expand = 0;
-	while (bp[0] && (bp[2] < REAL_KEY || bp[bp[0]] < REAL_KEY))
-		/* Exception case */
-		if (bp[2] == FULL_KEY_DATA && bp[0] == 2)
-			/* This is the last page of a big key/data pair
-			   and we need to add another page */
-			break;
-		else if (bp[2] < REAL_KEY && bp[bp[0]] != OVFLPAGE) {
-			bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-			if (!bufp)
-				return (-1);
-			bp = (u_int16_t *)bufp->page;
-		} else
-			/* Try to squeeze key on this page */
-			if (FREESPACE(bp) > PAIRSIZE(key, val)) {
-				squeeze_key(bp, key, val);
-				return (0);
-			} else {
-				bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-				if (!bufp)
-					return (-1);
-				bp = (u_int16_t *)bufp->page;
-			}
-
-	if (PAIRFITS(bp, key, val))
-		putpair(bufp->page, key, val);
-	else {
-		do_expand = 1;
-		bufp = __add_ovflpage(hashp, bufp);
-		if (!bufp)
-			return (-1);
-		sop = (u_int16_t *)bufp->page;
-
-		if (PAIRFITS(sop, key, val))
-			putpair((char *)sop, key, val);
-		else
-			if (__big_insert(hashp, bufp, key, val))
-				return (-1);
-	}
-	bufp->flags |= BUF_MOD;
-	/*
-	 * If the average number of keys per bucket exceeds the fill factor,
-	 * expand the table.
-	 */
-	hashp->NKEYS++;
-	if (do_expand ||
-	    (hashp->NKEYS / (hashp->MAX_BUCKET + 1) > hashp->FFACTOR))
-		return (__expand_table(hashp));
-	return (0);
-}
-
-/*
- *
- * Returns:
- *	pointer on success
- *	NULL on error
- */
-extern BUFHEAD *
-__add_ovflpage(hashp, bufp)
-	HTAB *hashp;
-	BUFHEAD *bufp;
-{
-	u_int16_t *sp;
-	u_int16_t ndx, ovfl_num;
-#ifdef DEBUG1
-	int tmp1, tmp2;
-#endif
-	sp = (u_int16_t *)bufp->page;
-
-	/* Check if we are dynamically determining the fill factor */
-	if (hashp->FFACTOR == DEF_FFACTOR) {
-		hashp->FFACTOR = sp[0] >> 1;
-		if (hashp->FFACTOR < MIN_FFACTOR)
-			hashp->FFACTOR = MIN_FFACTOR;
-	}
-	bufp->flags |= BUF_MOD;
-	ovfl_num = overflow_page(hashp);
-#ifdef DEBUG1
-	tmp1 = bufp->addr;
-	tmp2 = bufp->ovfl ? bufp->ovfl->addr : 0;
-#endif
-	if (!ovfl_num || !(bufp->ovfl = __get_buf(hashp, ovfl_num, bufp, 1)))
-		return (NULL);
-	bufp->ovfl->flags |= BUF_MOD;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "ADDOVFLPAGE: %d->ovfl was %d is now %d\n",
-	    tmp1, tmp2, bufp->ovfl->addr);
-#endif
-	ndx = sp[0];
-	/*
-	 * Since a pair is allocated on a page only if there's room to add
-	 * an overflow page, we know that the OVFL information will fit on
-	 * the page.
-	 */
-	sp[ndx + 4] = OFFSET(sp);
-	sp[ndx + 3] = FREESPACE(sp) - OVFLSIZE;
-	sp[ndx + 1] = ovfl_num;
-	sp[ndx + 2] = OVFLPAGE;
-	sp[0] = ndx + 2;
-#ifdef HASH_STATISTICS
-	hash_overflows++;
-#endif
-	return (bufp->ovfl);
-}
-
-/*
- * Returns:
- *	 0 indicates SUCCESS
- *	-1 indicates FAILURE
- */
-extern int
-__get_page(hashp, p, bucket, is_bucket, is_disk, is_bitmap)
-	HTAB *hashp;
-	char *p;
-	uint32_t bucket;
-	int is_bucket, is_disk, is_bitmap;
-{
-	int fd, page, size;
-	int rsize;
-	u_int16_t *bp;
-
-	fd = hashp->fp;
-	size = hashp->BSIZE;
-
-	if ((fd == -1) || !is_disk) {
-		PAGE_INIT(p);
-		return (0);
-	}
-	if (is_bucket)
-		page = BUCKET_TO_PAGE(bucket);
-	else
-		page = OADDR_TO_PAGE(bucket);
-	if ((lseek(fd, (off_t)page << hashp->BSHIFT, SEEK_SET) == -1) ||
-	    ((rsize = _read(fd, p, size)) == -1))
-		return (-1);
-	bp = (u_int16_t *)p;
-	if (!rsize)
-		bp[0] = 0;	/* We hit the EOF, so initialize a new page */
-	else
-		if (rsize != size) {
-			errno = EFTYPE;
-			return (-1);
-		}
-	if (!is_bitmap && !bp[0]) {
-		PAGE_INIT(p);
-	} else
-		if (hashp->LORDER != BYTE_ORDER) {
-			int i, max;
-
-			if (is_bitmap) {
-				max = hashp->BSIZE >> 2; /* divide by 4 */
-				for (i = 0; i < max; i++)
-					M_32_SWAP(((int *)p)[i]);
-			} else {
-				M_16_SWAP(bp[0]);
-				max = bp[0] + 2;
-				for (i = 1; i <= max; i++)
-					M_16_SWAP(bp[i]);
-			}
-		}
-	return (0);
-}
-
-/*
- * Write page p to disk
- *
- * Returns:
- *	 0 ==> OK
- *	-1 ==>failure
- */
-extern int
-__put_page(hashp, p, bucket, is_bucket, is_bitmap)
-	HTAB *hashp;
-	char *p;
-	uint32_t bucket;
-	int is_bucket, is_bitmap;
-{
-	int fd, page, size;
-	int wsize;
-
-	size = hashp->BSIZE;
-	if ((hashp->fp == -1) && open_temp(hashp))
-		return (-1);
-	fd = hashp->fp;
-
-	if (hashp->LORDER != BYTE_ORDER) {
-		int i;
-		int max;
-
-		if (is_bitmap) {
-			max = hashp->BSIZE >> 2;	/* divide by 4 */
-			for (i = 0; i < max; i++)
-				M_32_SWAP(((int *)p)[i]);
-		} else {
-			max = ((u_int16_t *)p)[0] + 2;
-			for (i = 0; i <= max; i++)
-				M_16_SWAP(((u_int16_t *)p)[i]);
-		}
-	}
-	if (is_bucket)
-		page = BUCKET_TO_PAGE(bucket);
-	else
-		page = OADDR_TO_PAGE(bucket);
-	if ((lseek(fd, (off_t)page << hashp->BSHIFT, SEEK_SET) == -1) ||
-	    ((wsize = _write(fd, p, size)) == -1))
-		/* Errno is set */
-		return (-1);
-	if (wsize != size) {
-		errno = EFTYPE;
-		return (-1);
-	}
-	return (0);
-}
-
-#define BYTE_MASK	((1 << INT_BYTE_SHIFT) -1)
-/*
- * Initialize a new bitmap page.  Bitmap pages are left in memory
- * once they are read in.
- */
-extern int
-__ibitmap(hashp, pnum, nbits, ndx)
-	HTAB *hashp;
-	int pnum, nbits, ndx;
-{
-	uint32_t *ip;
-	int clearbytes, clearints;
-
-	if ((ip = (uint32_t *)malloc(hashp->BSIZE)) == NULL)
-		return (1);
-	hashp->nmaps++;
-	clearints = ((nbits - 1) >> INT_BYTE_SHIFT) + 1;
-	clearbytes = clearints << INT_TO_BYTE;
-	(void)memset((char *)ip, 0, clearbytes);
-	(void)memset(((char *)ip) + clearbytes, 0xFF,
-	    hashp->BSIZE - clearbytes);
-	ip[clearints - 1] = ALL_SET << (nbits & BYTE_MASK);
-	SETBIT(ip, 0);
-	hashp->BITMAPS[ndx] = (u_int16_t)pnum;
-	hashp->mapp[ndx] = ip;
-	return (0);
-}
-
-static uint32_t
-first_free(map)
-	uint32_t map;
-{
-	uint32_t i, mask;
-
-	mask = 0x1;
-	for (i = 0; i < BITS_PER_MAP; i++) {
-		if (!(mask & map))
-			return (i);
-		mask = mask << 1;
-	}
-	return (i);
-}
-
-static u_int16_t
-overflow_page(hashp)
-	HTAB *hashp;
-{
-	uint32_t *freep;
-	int max_free, offset, splitnum;
-	u_int16_t addr;
-	int bit, first_page, free_bit, free_page, i, in_use_bits, j;
-#ifdef DEBUG2
-	int tmp1, tmp2;
-#endif
-	splitnum = hashp->OVFL_POINT;
-	max_free = hashp->SPARES[splitnum];
-
-	free_page = (max_free - 1) >> (hashp->BSHIFT + BYTE_SHIFT);
-	free_bit = (max_free - 1) & ((hashp->BSIZE << BYTE_SHIFT) - 1);
-
-	/* Look through all the free maps to find the first free block */
-	first_page = hashp->LAST_FREED >>(hashp->BSHIFT + BYTE_SHIFT);
-	for ( i = first_page; i <= free_page; i++ ) {
-		if (!(freep = (uint32_t *)hashp->mapp[i]) &&
-		    !(freep = fetch_bitmap(hashp, i)))
-			return (0);
-		if (i == free_page)
-			in_use_bits = free_bit;
-		else
-			in_use_bits = (hashp->BSIZE << BYTE_SHIFT) - 1;
-
-		if (i == first_page) {
-			bit = hashp->LAST_FREED &
-			    ((hashp->BSIZE << BYTE_SHIFT) - 1);
-			j = bit / BITS_PER_MAP;
-			bit = bit & ~(BITS_PER_MAP - 1);
-		} else {
-			bit = 0;
-			j = 0;
-		}
-		for (; bit <= in_use_bits; j++, bit += BITS_PER_MAP)
-			if (freep[j] != ALL_SET)
-				goto found;
-	}
-
-	/* No Free Page Found */
-	hashp->LAST_FREED = hashp->SPARES[splitnum];
-	hashp->SPARES[splitnum]++;
-	offset = hashp->SPARES[splitnum] -
-	    (splitnum ? hashp->SPARES[splitnum - 1] : 0);
-
-#define	OVMSG	"HASH: Out of overflow pages.  Increase page size\n"
-	if (offset > SPLITMASK) {
-		if (++splitnum >= NCACHED) {
-			(void)_write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-			return (0);
-		}
-		hashp->OVFL_POINT = splitnum;
-		hashp->SPARES[splitnum] = hashp->SPARES[splitnum-1];
-		hashp->SPARES[splitnum-1]--;
-		offset = 1;
-	}
-
-	/* Check if we need to allocate a new bitmap page */
-	if (free_bit == (hashp->BSIZE << BYTE_SHIFT) - 1) {
-		free_page++;
-		if (free_page >= NCACHED) {
-			(void)_write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-			return (0);
-		}
-		/*
-		 * This is tricky.  The 1 indicates that you want the new page
-		 * allocated with 1 clear bit.  Actually, you are going to
-		 * allocate 2 pages from this map.  The first is going to be
-		 * the map page, the second is the overflow page we were
-		 * looking for.  The init_bitmap routine automatically, sets
-		 * the first bit of itself to indicate that the bitmap itself
-		 * is in use.  We would explicitly set the second bit, but
-		 * don't have to if we tell init_bitmap not to leave it clear
-		 * in the first place.
-		 */
-		if (__ibitmap(hashp,
-		    (int)OADDR_OF(splitnum, offset), 1, free_page))
-			return (0);
-		hashp->SPARES[splitnum]++;
-#ifdef DEBUG2
-		free_bit = 2;
-#endif
-		offset++;
-		if (offset > SPLITMASK) {
-			if (++splitnum >= NCACHED) {
-				(void)_write(STDERR_FILENO, OVMSG,
-				    sizeof(OVMSG) - 1);
-				return (0);
-			}
-			hashp->OVFL_POINT = splitnum;
-			hashp->SPARES[splitnum] = hashp->SPARES[splitnum-1];
-			hashp->SPARES[splitnum-1]--;
-			offset = 0;
-		}
-	} else {
-		/*
-		 * Free_bit addresses the last used bit.  Bump it to address
-		 * the first available bit.
-		 */
-		free_bit++;
-		SETBIT(freep, free_bit);
-	}
-
-	/* Calculate address of the new overflow page */
-	addr = OADDR_OF(splitnum, offset);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "OVERFLOW_PAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    addr, free_bit, free_page);
-#endif
-	return (addr);
-
-found:
-	bit = bit + first_free(freep[j]);
-	SETBIT(freep, bit);
-#ifdef DEBUG2
-	tmp1 = bit;
-	tmp2 = i;
-#endif
-	/*
-	 * Bits are addressed starting with 0, but overflow pages are addressed
-	 * beginning at 1. Bit is a bit addressnumber, so we need to increment
-	 * it to convert it to a page number.
-	 */
-	bit = 1 + bit + (i * (hashp->BSIZE << BYTE_SHIFT));
-	if (bit >= hashp->LAST_FREED)
-		hashp->LAST_FREED = bit - 1;
-
-	/* Calculate the split number for this page */
-	for (i = 0; (i < splitnum) && (bit > hashp->SPARES[i]); i++);
-	offset = (i ? bit - hashp->SPARES[i - 1] : bit);
-	if (offset >= SPLITMASK)
-		return (0);	/* Out of overflow pages */
-	addr = OADDR_OF(i, offset);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "OVERFLOW_PAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    addr, tmp1, tmp2);
-#endif
-
-	/* Allocate and return the overflow page */
-	return (addr);
-}
-
-/*
- * Mark this overflow page as free.
- */
-extern void
-__free_ovflpage(hashp, obufp)
-	HTAB *hashp;
-	BUFHEAD *obufp;
-{
-	u_int16_t addr;
-	uint32_t *freep;
-	int bit_address, free_page, free_bit;
-	u_int16_t ndx;
-
-	addr = obufp->addr;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "Freeing %d\n", addr);
-#endif
-	ndx = (((u_int16_t)addr) >> SPLITSHIFT);
-	bit_address =
-	    (ndx ? hashp->SPARES[ndx - 1] : 0) + (addr & SPLITMASK) - 1;
-	 if (bit_address < hashp->LAST_FREED)
-		hashp->LAST_FREED = bit_address;
-	free_page = (bit_address >> (hashp->BSHIFT + BYTE_SHIFT));
-	free_bit = bit_address & ((hashp->BSIZE << BYTE_SHIFT) - 1);
-
-	if (!(freep = hashp->mapp[free_page]))
-		freep = fetch_bitmap(hashp, free_page);
-#ifdef DEBUG
-	/*
-	 * This had better never happen.  It means we tried to read a bitmap
-	 * that has already had overflow pages allocated off it, and we
-	 * failed to read it from the file.
-	 */
-	if (!freep)
-		assert(0);
-#endif
-	CLRBIT(freep, free_bit);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "FREE_OVFLPAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    obufp->addr, free_bit, free_page);
-#endif
-	__reclaim_buf(hashp, obufp);
-}
-
-/*
- * Returns:
- *	 0 success
- *	-1 failure
- */
-static int
-open_temp(hashp)
-	HTAB *hashp;
-{
-	sigset_t set, oset;
-	static char namestr[] = "_hashXXXXXX";
-
-	/* Block signals; make sure file goes away at process exit. */
-	(void)sigfillset(&set);
-	(void)_sigprocmask(SIG_BLOCK, &set, &oset);
-	if ((hashp->fp = mkstemp(namestr)) != -1) {
-		(void)unlink(namestr);
-		(void)_fcntl(hashp->fp, F_SETFD, 1);
-	}
-	(void)_sigprocmask(SIG_SETMASK, &oset, (sigset_t *)NULL);
-	return (hashp->fp != -1 ? 0 : -1);
-}
-
-/*
- * We have to know that the key will fit, but the last entry on the page is
- * an overflow pair, so we need to shift things.
- */
-static void
-squeeze_key(sp, key, val)
-	u_int16_t *sp;
-	const DBT *key, *val;
-{
-	char *p;
-	u_int16_t free_space, n, off, pageno;
-
-	p = (char *)sp;
-	n = sp[0];
-	free_space = FREESPACE(sp);
-	off = OFFSET(sp);
-
-	pageno = sp[n - 1];
-	off -= key->size;
-	sp[n - 1] = off;
-	memmove(p + off, key->data, key->size);
-	off -= val->size;
-	sp[n] = off;
-	memmove(p + off, val->data, val->size);
-	sp[0] = n + 2;
-	sp[n + 1] = pageno;
-	sp[n + 2] = OVFLPAGE;
-	FREESPACE(sp) = free_space - PAIRSIZE(key, val);
-	OFFSET(sp) = off;
-}
-
-static uint32_t *
-fetch_bitmap(hashp, ndx)
-	HTAB *hashp;
-	int ndx;
-{
-	if (ndx >= hashp->nmaps)
-		return (NULL);
-	if ((hashp->mapp[ndx] = (uint32_t *)malloc(hashp->BSIZE)) == NULL)
-		return (NULL);
-	if (__get_page(hashp,
-	    (char *)hashp->mapp[ndx], hashp->BITMAPS[ndx], 0, 1, 1)) {
-		free(hashp->mapp[ndx]);
-		return (NULL);
-	}
-	return (hashp->mapp[ndx]);
-}
-
-#ifdef DEBUG4
-int
-print_chain(addr)
-	int addr;
-{
-	BUFHEAD *bufp;
-	short *bp, oaddr;
-
-	(void)fprintf(stderr, "%d ", addr);
-	bufp = __get_buf(hashp, addr, NULL, 0);
-	bp = (short *)bufp->page;
-	while (bp[0] && ((bp[bp[0]] == OVFLPAGE) ||
-		((bp[0] > 2) && bp[2] < REAL_KEY))) {
-		oaddr = bp[bp[0] - 1];
-		(void)fprintf(stderr, "%d ", (int)oaddr);
-		bufp = __get_buf(hashp, (int)oaddr, bufp, 0);
-		bp = (short *)bufp->page;
-	}
-	(void)fprintf(stderr, "\n");
-}
-#endif
diff --git a/lib/libc/db/hash/ndbm.c b/lib/libc/db/hash/ndbm.c
deleted file mode 100644
index 8561c8c..0000000
--- a/lib/libc/db/hash/ndbm.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ndbm.c	8.4 (Berkeley) 7/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/ndbm.c,v 1.6 2002/03/22 21:52:01 obrien Exp $");
-
-/*
- * This package provides a dbm compatible interface to the new hashing
- * package described in db(3).
- */
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include <ndbm.h>
-#include "hash.h"
-
-/*
- * Returns:
- * 	*DBM on success
- *	 NULL on failure
- */
-extern DBM *
-dbm_open(file, flags, mode)
-	const char *file;
-	int flags, mode;
-{
-	HASHINFO info;
-	char path[MAXPATHLEN];
-
-	info.bsize = 4096;
-	info.ffactor = 40;
-	info.nelem = 1;
-	info.cachesize = 0;
-	info.hash = NULL;
-	info.lorder = 0;
-
-	if( strlen(file) >= sizeof(path) - strlen(DBM_SUFFIX)) {
-		errno = ENAMETOOLONG;
-		return(NULL);
-	}
-	(void)strcpy(path, file);
-	(void)strcat(path, DBM_SUFFIX);
-	return ((DBM *)__hash_open(path, flags, mode, &info, 0));
-}
-
-extern void
-dbm_close(db)
-	DBM *db;
-{
-	(void)(db->close)(db);
-}
-
-/*
- * Returns:
- *	DATUM on success
- *	NULL on failure
- */
-extern datum
-dbm_fetch(db, key)
-	DBM *db;
-	datum key;
-{
-	datum retdata;
-	int status;
-	DBT dbtkey, dbtretdata;
-
-	dbtkey.data = key.dptr;
-	dbtkey.size = key.dsize;
-	status = (db->get)(db, &dbtkey, &dbtretdata, 0);
-	if (status) {
-		dbtretdata.data = NULL;
-		dbtretdata.size = 0;
-	}
-	retdata.dptr = dbtretdata.data;
-	retdata.dsize = dbtretdata.size;
-	return (retdata);
-}
-
-/*
- * Returns:
- *	DATUM on success
- *	NULL on failure
- */
-extern datum
-dbm_firstkey(db)
-	DBM *db;
-{
-	int status;
-	datum retkey;
-	DBT dbtretkey, dbtretdata;
-
-	status = (db->seq)(db, &dbtretkey, &dbtretdata, R_FIRST);
-	if (status)
-		dbtretkey.data = NULL;
-	retkey.dptr = dbtretkey.data;
-	retkey.dsize = dbtretkey.size;
-	return (retkey);
-}
-
-/*
- * Returns:
- *	DATUM on success
- *	NULL on failure
- */
-extern datum
-dbm_nextkey(db)
-	DBM *db;
-{
-	int status;
-	datum retkey;
-	DBT dbtretkey, dbtretdata;
-
-	status = (db->seq)(db, &dbtretkey, &dbtretdata, R_NEXT);
-	if (status)
-		dbtretkey.data = NULL;
-	retkey.dptr = dbtretkey.data;
-	retkey.dsize = dbtretkey.size;
-	return (retkey);
-}
-
-/*
- * Returns:
- *	 0 on success
- *	<0 failure
- */
-extern int
-dbm_delete(db, key)
-	DBM *db;
-	datum key;
-{
-	int status;
-	DBT dbtkey;
-
-	dbtkey.data = key.dptr;
-	dbtkey.size = key.dsize;
-	status = (db->del)(db, &dbtkey, 0);
-	if (status)
-		return (-1);
-	else
-		return (0);
-}
-
-/*
- * Returns:
- *	 0 on success
- *	<0 failure
- *	 1 if DBM_INSERT and entry exists
- */
-extern int
-dbm_store(db, key, data, flags)
-	DBM *db;
-	datum key, data;
-	int flags;
-{
-	DBT dbtkey, dbtdata;
-
-	dbtkey.data = key.dptr;
-	dbtkey.size = key.dsize;
-	dbtdata.data = data.dptr;
-	dbtdata.size = data.dsize;
-	return ((db->put)(db, &dbtkey, &dbtdata,
-	    (flags == DBM_INSERT) ? R_NOOVERWRITE : 0));
-}
-
-extern int
-dbm_error(db)
-	DBM *db;
-{
-	HTAB *hp;
-
-	hp = (HTAB *)db->internal;
-	return (hp->error);
-}
-
-extern int
-dbm_clearerr(db)
-	DBM *db;
-{
-	HTAB *hp;
-
-	hp = (HTAB *)db->internal;
-	hp->error = 0;
-	return (0);
-}
-
-extern int
-dbm_dirfno(db)
-	DBM *db;
-{
-	return(((HTAB *)db->internal)->fp);
-}
diff --git a/lib/libc/db/hash/page.h b/lib/libc/db/hash/page.h
deleted file mode 100644
index 2cf7460..0000000
--- a/lib/libc/db/hash/page.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- *
- *	@(#)page.h	8.2 (Berkeley) 5/31/94
- * $FreeBSD: src/lib/libc/db/hash/page.h,v 1.2 2002/03/22 23:41:40 obrien Exp $
- */
-
-/*
- * Definitions for hashing page file format.
- */
-
-/*
- * routines dealing with a data page
- *
- * page format:
- *	+------------------------------+
- * p	| n | keyoff | datoff | keyoff |
- * 	+------------+--------+--------+
- *	| datoff | free  |  ptr  | --> |
- *	+--------+---------------------+
- *	|	 F R E E A R E A       |
- *	+--------------+---------------+
- *	|  <---- - - - | data          |
- *	+--------+-----+----+----------+
- *	|  key   | data     | key      |
- *	+--------+----------+----------+
- *
- * Pointer to the free space is always:  p[p[0] + 2]
- * Amount of free space on the page is:  p[p[0] + 1]
- */
-
-/*
- * How many bytes required for this pair?
- *	2 shorts in the table at the top of the page + room for the
- *	key and room for the data
- *
- * We prohibit entering a pair on a page unless there is also room to append
- * an overflow page. The reason for this it that you can get in a situation
- * where a single key/data pair fits on a page, but you can't append an
- * overflow page and later you'd have to split the key/data and handle like
- * a big pair.
- * You might as well do this up front.
- */
-
-#define	PAIRSIZE(K,D)	(2*sizeof(u_int16_t) + (K)->size + (D)->size)
-#define BIGOVERHEAD	(4*sizeof(u_int16_t))
-#define KEYSIZE(K)	(4*sizeof(u_int16_t) + (K)->size);
-#define OVFLSIZE	(2*sizeof(u_int16_t))
-#define FREESPACE(P)	((P)[(P)[0]+1])
-#define	OFFSET(P)	((P)[(P)[0]+2])
-#define PAIRFITS(P,K,D) \
-	(((P)[2] >= REAL_KEY) && \
-	    (PAIRSIZE((K),(D)) + OVFLSIZE) <= FREESPACE((P)))
-#define PAGE_META(N)	(((N)+3) * sizeof(u_int16_t))
-
-typedef struct {
-	BUFHEAD *newp;
-	BUFHEAD *oldp;
-	BUFHEAD *nextp;
-	u_int16_t next_addr;
-}       SPLIT_RETURN;
diff --git a/lib/libc/db/mpool/Makefile b/lib/libc/db/mpool/Makefile
deleted file mode 100644
index 618fce5..0000000
--- a/lib/libc/db/mpool/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../ -I../../include
-
-#Objects
-OBJS = mpool.o 
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/db/mpool/README b/lib/libc/db/mpool/README
deleted file mode 100644
index 0f01fbc..0000000
--- a/lib/libc/db/mpool/README
+++ /dev/null
@@ -1,7 +0,0 @@
-#	@(#)README	8.1 (Berkeley) 6/4/93
-
-These are the current memory pool routines.
-They aren't ready for prime time, yet, and
-the interface is expected to change.
-
---keith
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c
deleted file mode 100644
index 3a1c29d..0000000
--- a/lib/libc/db/mpool/mpool.c
+++ /dev/null
@@ -1,462 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mpool.c	8.5 (Berkeley) 7/26/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.12 2004/09/10 05:41:41 kuriyama Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-
-#define	__MPOOLINTERFACE_PRIVATE
-#include <mpool.h>
-
-static BKT *mpool_bkt(MPOOL *);
-static BKT *mpool_look(MPOOL *, pgno_t);
-static int  mpool_write(MPOOL *, BKT *);
-
-/*
- * mpool_open --
- *	Initialize a memory pool.
- */
-MPOOL *
-mpool_open(key, fd, pagesize, maxcache)
-	void *key;
-	int fd;
-	pgno_t pagesize, maxcache;
-{
-	struct stat sb;
-	MPOOL *mp;
-	int entry;
-
-	/*
-	 * Get information about the file.
-	 *
-	 * XXX
-	 * We don't currently handle pipes, although we should.
-	 */
-	if (_fstat(fd, &sb))
-		return (NULL);
-	if (!S_ISREG(sb.st_mode)) {
-		errno = ESPIPE;
-		return (NULL);
-	}
-
-	/* Allocate and initialize the MPOOL cookie. */
-	if ((mp = (MPOOL *)calloc(1, sizeof(MPOOL))) == NULL)
-		return (NULL);
-	TAILQ_INIT(&mp->lqh);
-	for (entry = 0; entry < HASHSIZE; ++entry)
-		TAILQ_INIT(&mp->hqh[entry]);
-	mp->maxcache = maxcache;
-	mp->npages = sb.st_size / pagesize;
-	mp->pagesize = pagesize;
-	mp->fd = fd;
-	return (mp);
-}
-
-/*
- * mpool_filter --
- *	Initialize input/output filters.
- */
-void
-mpool_filter(mp, pgin, pgout, pgcookie)
-	MPOOL *mp;
-	void (*pgin)(void *, pgno_t, void *);
-	void (*pgout)(void *, pgno_t, void *);
-	void *pgcookie;
-{
-	mp->pgin = pgin;
-	mp->pgout = pgout;
-	mp->pgcookie = pgcookie;
-}
-	
-/*
- * mpool_new --
- *	Get a new page of memory.
- */
-void *
-mpool_new(mp, pgnoaddr)
-	MPOOL *mp;
-	pgno_t *pgnoaddr;
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	if (mp->npages == MAX_PAGE_NUMBER) {
-		(void)fprintf(stderr, "mpool_new: page allocation overflow.\n");
-		abort();
-	}
-#ifdef STATISTICS
-	++mp->pagenew;
-#endif
-	/*
-	 * Get a BKT from the cache.  Assign a new page number, attach
-	 * it to the head of the hash chain, the tail of the lru chain,
-	 * and return.
-	 */
-	if ((bp = mpool_bkt(mp)) == NULL)
-		return (NULL);
-	*pgnoaddr = bp->pgno = mp->npages++;
-	bp->flags = MPOOL_PINNED;
-
-	head = &mp->hqh[HASHKEY(bp->pgno)];
-	TAILQ_INSERT_HEAD(head, bp, hq);
-	TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-	return (bp->page);
-}
-
-/*
- * mpool_get
- *	Get a page.
- */
-void *
-mpool_get(mp, pgno, flags)
-	MPOOL *mp;
-	pgno_t pgno;
-	u_int flags;				/* XXX not used? */
-{
-	struct _hqh *head;
-	BKT *bp;
-	off_t off;
-	int nr;
-
-	/* Check for attempt to retrieve a non-existent page. */
-	if (pgno >= mp->npages) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-#ifdef STATISTICS
-	++mp->pageget;
-#endif
-
-	/* Check for a page that is cached. */
-	if ((bp = mpool_look(mp, pgno)) != NULL) {
-#ifdef DEBUG
-		if (bp->flags & MPOOL_PINNED) {
-			(void)fprintf(stderr,
-			    "mpool_get: page %d already pinned\n", bp->pgno);
-			abort();
-		}
-#endif
-		/*
-		 * Move the page to the head of the hash chain and the tail
-		 * of the lru chain.
-		 */
-		head = &mp->hqh[HASHKEY(bp->pgno)];
-		TAILQ_REMOVE(head, bp, hq);
-		TAILQ_INSERT_HEAD(head, bp, hq);
-		TAILQ_REMOVE(&mp->lqh, bp, q);
-		TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-
-		/* Return a pinned page. */
-		bp->flags |= MPOOL_PINNED;
-		return (bp->page);
-	}
-
-	/* Get a page from the cache. */
-	if ((bp = mpool_bkt(mp)) == NULL)
-		return (NULL);
-
-	/* Read in the contents. */
-#ifdef STATISTICS
-	++mp->pageread;
-#endif
-	off = mp->pagesize * pgno;
-	nr = pread(mp->fd, bp->page, mp->pagesize, off);
-	if (nr != mp->pagesize) {
-		if (nr >= 0)
-			errno = EFTYPE;
-		return (NULL);
-	}
-
-	/* Set the page number, pin the page. */
-	bp->pgno = pgno;
-	bp->flags = MPOOL_PINNED;
-
-	/*
-	 * Add the page to the head of the hash chain and the tail
-	 * of the lru chain.
-	 */
-	head = &mp->hqh[HASHKEY(bp->pgno)];
-	TAILQ_INSERT_HEAD(head, bp, hq);
-	TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-
-	/* Run through the user's filter. */
-	if (mp->pgin != NULL)
-		(mp->pgin)(mp->pgcookie, bp->pgno, bp->page);
-
-	return (bp->page);
-}
-
-/*
- * mpool_put
- *	Return a page.
- */
-int
-mpool_put(mp, page, flags)
-	MPOOL *mp;
-	void *page;
-	u_int flags;
-{
-	BKT *bp;
-
-#ifdef STATISTICS
-	++mp->pageput;
-#endif
-	bp = (BKT *)((char *)page - sizeof(BKT));
-#ifdef DEBUG
-	if (!(bp->flags & MPOOL_PINNED)) {
-		(void)fprintf(stderr,
-		    "mpool_put: page %d not pinned\n", bp->pgno);
-		abort();
-	}
-#endif
-	bp->flags &= ~MPOOL_PINNED;
-	bp->flags |= flags & MPOOL_DIRTY;
-	return (RET_SUCCESS);
-}
-
-/*
- * mpool_close
- *	Close the buffer pool.
- */
-int
-mpool_close(mp)
-	MPOOL *mp;
-{
-	BKT *bp;
-
-	/* Free up any space allocated to the lru pages. */
-	while (!TAILQ_EMPTY(&mp->lqh)) {
-		bp = TAILQ_FIRST(&mp->lqh);
-		TAILQ_REMOVE(&mp->lqh, bp, q);
-		free(bp);
-	}
-
-	/* Free the MPOOL cookie. */
-	free(mp);
-	return (RET_SUCCESS);
-}
-
-/*
- * mpool_sync
- *	Sync the pool to disk.
- */
-int
-mpool_sync(mp)
-	MPOOL *mp;
-{
-	BKT *bp;
-
-	/* Walk the lru chain, flushing any dirty pages to disk. */
-	TAILQ_FOREACH(bp, &mp->lqh, q)
-		if (bp->flags & MPOOL_DIRTY &&
-		    mpool_write(mp, bp) == RET_ERROR)
-			return (RET_ERROR);
-
-	/* Sync the file descriptor. */
-	return (_fsync(mp->fd) ? RET_ERROR : RET_SUCCESS);
-}
-
-/*
- * mpool_bkt
- *	Get a page from the cache (or create one).
- */
-static BKT *
-mpool_bkt(mp)
-	MPOOL *mp;
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	/* If under the max cached, always create a new page. */
-	if (mp->curcache < mp->maxcache)
-		goto new;
-
-	/*
-	 * If the cache is max'd out, walk the lru list for a buffer we
-	 * can flush.  If we find one, write it (if necessary) and take it
-	 * off any lists.  If we don't find anything we grow the cache anyway.
-	 * The cache never shrinks.
-	 */
-	TAILQ_FOREACH(bp, &mp->lqh, q)
-		if (!(bp->flags & MPOOL_PINNED)) {
-			/* Flush if dirty. */
-			if (bp->flags & MPOOL_DIRTY &&
-			    mpool_write(mp, bp) == RET_ERROR)
-				return (NULL);
-#ifdef STATISTICS
-			++mp->pageflush;
-#endif
-			/* Remove from the hash and lru queues. */
-			head = &mp->hqh[HASHKEY(bp->pgno)];
-			TAILQ_REMOVE(head, bp, hq);
-			TAILQ_REMOVE(&mp->lqh, bp, q);
-#ifdef DEBUG
-			{ void *spage;
-				spage = bp->page;
-				memset(bp, 0xff, sizeof(BKT) + mp->pagesize);
-				bp->page = spage;
-			}
-#endif
-			return (bp);
-		}
-
-new:	if ((bp = (BKT *)malloc(sizeof(BKT) + mp->pagesize)) == NULL)
-		return (NULL);
-#ifdef STATISTICS
-	++mp->pagealloc;
-#endif
-#if defined(DEBUG) || defined(PURIFY)
-	memset(bp, 0xff, sizeof(BKT) + mp->pagesize);
-#endif
-	bp->page = (char *)bp + sizeof(BKT);
-	++mp->curcache;
-	return (bp);
-}
-
-/*
- * mpool_write
- *	Write a page to disk.
- */
-static int
-mpool_write(mp, bp)
-	MPOOL *mp;
-	BKT *bp;
-{
-	off_t off;
-
-#ifdef STATISTICS
-	++mp->pagewrite;
-#endif
-
-	/* Run through the user's filter. */
-	if (mp->pgout)
-		(mp->pgout)(mp->pgcookie, bp->pgno, bp->page);
-
-	off = mp->pagesize * bp->pgno;
-	if (pwrite(mp->fd, bp->page, mp->pagesize, off) != mp->pagesize)
-		return (RET_ERROR);
-
-	bp->flags &= ~MPOOL_DIRTY;
-	return (RET_SUCCESS);
-}
-
-/*
- * mpool_look
- *	Lookup a page in the cache.
- */
-static BKT *
-mpool_look(mp, pgno)
-	MPOOL *mp;
-	pgno_t pgno;
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	head = &mp->hqh[HASHKEY(pgno)];
-	TAILQ_FOREACH(bp, head, hq)
-		if (bp->pgno == pgno) {
-#ifdef STATISTICS
-			++mp->cachehit;
-#endif
-			return (bp);
-		}
-#ifdef STATISTICS
-	++mp->cachemiss;
-#endif
-	return (NULL);
-}
-
-#ifdef STATISTICS
-/*
- * mpool_stat
- *	Print out cache statistics.
- */
-void
-mpool_stat(mp)
-	MPOOL *mp;
-{
-	BKT *bp;
-	int cnt;
-	char *sep;
-
-	(void)fprintf(stderr, "%u pages in the file\n", mp->npages);
-	(void)fprintf(stderr,
-	    "page size %lu, cacheing %u pages of %u page max cache\n",
-	    mp->pagesize, mp->curcache, mp->maxcache);
-	(void)fprintf(stderr, "%lu page puts, %lu page gets, %lu page new\n",
-	    mp->pageput, mp->pageget, mp->pagenew);
-	(void)fprintf(stderr, "%lu page allocs, %lu page flushes\n",
-	    mp->pagealloc, mp->pageflush);
-	if (mp->cachehit + mp->cachemiss)
-		(void)fprintf(stderr,
-		    "%.0f%% cache hit rate (%lu hits, %lu misses)\n", 
-		    ((double)mp->cachehit / (mp->cachehit + mp->cachemiss))
-		    * 100, mp->cachehit, mp->cachemiss);
-	(void)fprintf(stderr, "%lu page reads, %lu page writes\n",
-	    mp->pageread, mp->pagewrite);
-
-	sep = "";
-	cnt = 0;
-	TAILQ_FOREACH(bp, &mp->lqh, q) {
-		(void)fprintf(stderr, "%s%d", sep, bp->pgno);
-		if (bp->flags & MPOOL_DIRTY)
-			(void)fprintf(stderr, "d");
-		if (bp->flags & MPOOL_PINNED)
-			(void)fprintf(stderr, "P");
-		if (++cnt == 10) {
-			sep = "\n";
-			cnt = 0;
-		} else
-			sep = ", ";
-			
-	}
-	(void)fprintf(stderr, "\n");
-}
-#endif
diff --git a/lib/libc/db/mpool/mpool.libtp b/lib/libc/db/mpool/mpool.libtp
deleted file mode 100644
index 0d82368..0000000
--- a/lib/libc/db/mpool/mpool.libtp
+++ /dev/null
@@ -1,746 +0,0 @@
-/******************************************************************************
-
-VERSION $FreeBSD: src/lib/libc/db/mpool/mpool.libtp,v 1.4 1999/08/27 23:58:23 peter Exp $
-PACKAGE: 	User Level Shared Memory Manager
-
-DESCRIPTION: 	
-	This package provides a buffer pool interface implemented as
-	a collection of file pages mapped into shared memory.
-
-	Based on Mark's buffer manager
-
-ROUTINES: 
-    External
-	buf_alloc
-	buf_flags
-	buf_get
-	buf_init
-	buf_last
-	buf_open
-	buf_pin
-	buf_sync
-	buf_unpin
-    Internal
-	bf_assign_buf
-	bf_fid_to_fd
-	bf_newbuf
-	bf_put_page
-	
-
-******************************************************************************/
-#include	<sys/types.h>
-#include	<assert.h>
-#include	<sys/file.h>
-#include	<sys/stat.h>
-#include	<stdio.h>
-#include	<errno.h>
-#include	"list.h"
-#include	"user.h"
-#include	"txn_sys.h"
-#include	"buf.h"
-#include	"semkeys.h"
-#include	"error.h"
-
-/*
-    we need to translate between some type of file id that the user 
-    process passes and a file descriptor.  For now, it's a nop.
-*/
-#define GET_MASTER      get_sem ( buf_spinlock )
-#define RELEASE_MASTER  release_sem ( buf_spinlock )
-
-#define	LRUID	*buf_lru
-#define	LRUP	(bufhdr_table+*buf_lru)
-#define	MRU	bufhdr_table[*buf_lru].lru.prev
-
-/* Global indicator that you have started reusing buffers */
-int	do_statistics = 0;
-/*
-    Process Statics (pointers into shared memory)
-*/
-static	BUF_T	*buf_table = 0;
-static	BUFHDR_T	*bufhdr_table;
-static	int	*buf_hash_table;
-static	int	*buf_lru;		/* LRU is the free list */
-static	int	buf_spinlock;
-static	FINFO_T	*buf_fids;
-static	int	*buf_sp;		/* Pointer to string free space */
-static	char	*buf_strings;
-
-/* Process Local FID->FD table */
-static	int	fds[NUM_FILE_ENTRIES];
-
-/* Static routines */
-static	BUFHDR_T	*bf_assign_buf();
-static	int		bf_fid_to_fd();
-static	BUFHDR_T	*bf_newbuf();
-static	int		bf_put_page();
-
-/*
-    Return  0 on success
-	    1 on failure
-*/
-extern int
-buf_init ( )
-{
-    ADDR_T	buf_region;
-    BUFHDR_T	*bhp;
-    int		i;
-    int		ref_count;
-    int		*spinlockp;
-
-    /*
-	Initialize Process local structures
-    */
-    for ( i = 0; i < NUM_FILE_ENTRIES; i++ ) {
-	fds[i] = -1;
-    }
-
-    buf_region = attach_region ( BUF_REGION_NAME, BUF_REGION_NUM,
-				 BUF_REGION_SIZE, &ref_count );
-    if ( !buf_region ) {
-	return (1);
-    }
-    error_log3 ( "Buf Region: ADDR: %d ID: %d SIZE: %d\n", buf_region,
-		    BUF_REGION_NUM, BUF_REGION_SIZE );
-
-    buf_table = (BUF_T *)buf_region;
-    bufhdr_table = (BUFHDR_T *)(buf_table + NUM_BUFS);
-    buf_hash_table = (int *)(bufhdr_table + NUM_BUFS);
-    buf_lru = buf_hash_table + NUMTABLE_ENTRIES;
-    spinlockp = buf_lru + 1;
-    buf_fids = (FINFO_T *)(spinlockp+1);
-    buf_sp = (int *)(buf_fids + NUM_FILE_ENTRIES);
-    buf_strings = (char *)(buf_sp + 1);
-
-    /* Create locking spinlock (gets creating holding the lock) */
-    buf_spinlock = create_sem ( BUF_SPIN_NAME, BUF_SPIN_NUM, ref_count <= 1 );
-    if ( buf_spinlock < 0 )  {
-	return(1);
-    }
-    if ( ref_count <= 1 ) {
-	*spinlockp = buf_spinlock;
-
-	/* Now initialize the buffer manager */
-
-	/* 1. Free list */
-	*buf_lru = 0;
-
-	/* 2. Buffer headers */
-	for ( i = 0, bhp = bufhdr_table; i < NUM_BUFS; bhp++, i++ ) {
-		bhp->lru.next = i+1;
-		bhp->lru.prev = i-1;
-		bhp->flags = 0;				/* All Flags off */
-		bhp->refcount = 0;
-		bhp->wait_proc = -1;			/* No sleepers */
-		LISTPE_INIT ( hash, bhp, i );		/* Hash chains */
-	}
-	bufhdr_table[0].lru.prev = NUM_BUFS-1;
-	bufhdr_table[NUM_BUFS-1].lru.next = 0;
-
-	/* 3. Hash Table */
-	for ( i = 0; i < NUMTABLE_ENTRIES; i++ ) {
-		buf_hash_table[i] = NUM_BUFS;
-	}
-
-	/* 4. File ID Table */
-	for ( i = 0; i < NUM_FILE_ENTRIES; i++ ) {
-		buf_fids[i].offset = -1;
-		buf_fids[i].npages = -1;
-		buf_fids[i].refcount = 0;
-	}
-
-	/* 5. Free String Pointer */
-	*buf_sp = (FILE_NAME_LEN*NUM_FILE_ENTRIES);
-	if (RELEASE_MASTER) {
-		return(1);
-	}
-	error_log0 ( "Initialized buffer region\n" );
-    } 
-    return (0);
-}
-
-extern	void
-buf_exit()
-{
-    int	ref;
-    int	i;
-
-    /* Flush Buffer Pool on Exit */
-    for ( i = 0; i < NUM_FILE_ENTRIES; i++ ) {
-	if ( fds[i] != -1 ) {
-		close ( fds[i] );
-	}
-    }
-    if ( buf_table ) {
-	detach_region ( buf_table, BUF_REGION_NUM, BUF_REGION_SIZE, &ref );
-    }
-    return;
-}
-
-/*
-	We need an empty buffer.  Find the LRU unpinned NON-Dirty page.
-*/
-static BUFHDR_T	*
-bf_newbuf()
-{
-    int		fd;
-    int		lruid;
-    int		nbytes;
-    int		ndx;
-    BUFHDR_T	*bhp;
-
-    lruid = LRUID;
-    for ( bhp = LRUP; 
-	  bhp->flags & (BUF_PINNED|BUF_IO_IN_PROGRESS); 
-	  bhp = LISTP_NEXTP (bufhdr_table, lru, bhp ) ) {
-
-	if ( bhp->lru.next == lruid ) {
-		/* OUT OF BUFFERS */
-		error_log1 ( "All buffers are pinned.  %s\n",
-				"Unable to grant buffer request" );
-		return(NULL);
-	}
-    }
-    /* BHP can be used */
-    if ( bhp->flags & BUF_DIRTY ) {
-	do_statistics = 1;
-	/* 
-	    MIS  Check for log flushed appropriately
-	*/
-	fd = bf_fid_to_fd(bhp->id.file_id);
-	if ( fd == -1 ) {
-	    error_log1 ("Invalid fid %d\n", bhp->id.file_id);
-	    return(NULL);
-	}
-	if ( bf_put_page(fd, bhp) < 0 ) {
-	    return(NULL);
-	}
-    }
-    /* Update Hash Pointers */
-    ndx = BUF_HASH ( bhp->id.file_id, bhp->id.obj_id );
-    LISTP_REMOVE(bufhdr_table, hash, bhp);
-    if ( buf_hash_table[ndx] == (bhp-bufhdr_table) ) {
-	if ( bhp->hash.next != (bhp-bufhdr_table) ) {
-		buf_hash_table[ndx] = bhp->hash.next;
-	} else {
-		buf_hash_table[ndx] = NUM_BUFS;
-	}
-    }
-    INIT_BUF(bhp); 
-
-    return(bhp);
-}
-/*
-    buf_alloc
-
-    Add a page to a file and return a buffer for it.
-
-*/
-ADDR_T
-buf_alloc ( fid, new_pageno )
-int	fid;
-int	*new_pageno;
-{
-	BUFHDR_T	*bhp;
-	int	fd;
-	int	len;
-	int	ndx;
-	OBJ_T	fobj;
-
-	if (GET_MASTER) {
-		return(NULL);
-	}
-	if ( buf_fids[fid].npages == -1 ) {
-	    /* initialize npages field */
-	    fd = bf_fid_to_fd ( fid );
-	}
-	assert (fid < NUM_FILE_ENTRIES);
-
-	*new_pageno = buf_fids[fid].npages;
-	if ( *new_pageno == -1 ) {
-	    RELEASE_MASTER;
-	    return ( NULL );
-	}
-	buf_fids[fid].npages++;
-	ndx = BUF_HASH ( fid, *new_pageno );
-	fobj.file_id = fid;
-	fobj.obj_id  = *new_pageno;
-	bhp = bf_assign_buf ( ndx, &fobj, BF_PIN|BF_DIRTY|BF_EMPTY, &len );
-	if ( RELEASE_MASTER ) {
-		/* Memory leak */
-		return(NULL);
-	}
-	if ( bhp ) {
-	    return ((ADDR_T)(buf_table+(bhp-bufhdr_table)));
-	} else {
-	    return ( NULL );
-	}
-}
-
-
-/*
-	Buffer Flags
-	BF_DIRTY		Mark page as dirty
-	BF_EMPTY		Don't initialize page, just get buffer
-	BF_PIN			Retrieve with pin 
-
-MIS
-Might want to add a flag that sets an LSN for this buffer is the
-DIRTY flag is set
-
-Eventually, you may want a flag that indicates the I/O and lock
-request should be shipped off together, but not for now.
-*/
-extern ADDR_T
-buf_get ( file_id, page_id, flags, len )
-int	file_id;
-int	page_id;
-u_long	flags;
-int	*len;		/* Number of bytes read into buffer */
-{
-	BUFHDR_T	*bhp;
-	int		bufid;
-	int		fd;
-	int		ndx;
-	int		next_bufid;
-	int		stat;
-	OBJ_T		fobj;	
-
-	ndx = BUF_HASH ( file_id, page_id );
-	fobj.file_id = (long) file_id;
-	fobj.obj_id = (long) page_id;
-	if ( GET_MASTER ) {
-		return(NULL);
-	}
-	/*
-		This could be a for loop, but we lose speed
-		by making all the cases general purpose so we
-		optimize for the no-collision case. 
-	*/
-	bufid = buf_hash_table[ndx]; 
-	if ( bufid < NUM_BUFS ) {
-	    for ( bhp = bufhdr_table+bufid; 
-		  !OBJ_EQ (bhp->id, fobj) || !(bhp->flags & BUF_VALID);
-		  bhp = LISTP_NEXTP ( bufhdr_table, hash, bhp ) ) {
-
-		if ( bhp->hash.next == bufid ) {
-		    goto not_found;
-		}
-	    }
-/* found */
-	    if ( flags & BF_PIN ) {
-		    bhp->flags |= BUF_PINNED;
-		    bhp->refcount++;
-#ifdef PIN_DEBUG
-	fprintf(stderr, "buf_get: %X PINNED (%d)\n", 
-			buf_table + (bhp-bufhdr_table), bhp->refcount);
-#endif
-	    }
-	    if ( flags & BF_DIRTY ) {
-		    bhp->flags |= BUF_DIRTY;
-	    }
-
-	    while ( bhp->flags & BUF_IO_IN_PROGRESS ) {
-		/* MIS -- eventually err check here */
-#ifdef DEBUG
-		printf("About to sleep on %d (me: %d\n)\n", bhp->wait_proc,
-			my_txnp - txn_table);
-#endif
-#ifdef WAIT_STATS
-		buf_waits++;
-#endif
-		stat = proc_sleep_on ( &(bhp->wait_proc), buf_spinlock );
-		if ( stat ) {
-			/* Memory leak */
-			return(NULL);
-		}
-		if (!( bhp->flags & BUF_IO_IN_PROGRESS) &&
-		    (!OBJ_EQ (bhp->id, fobj) || !(bhp->flags & BUF_VALID))) {
-			if (RELEASE_MASTER)
-				return(NULL);
-			return(buf_get ( file_id, page_id, flags, len ));
-		}
-	    }
-	    MAKE_MRU( bhp );
-	    *len = BUFSIZE;
-	} else {
-not_found:
-	    /* If you get here, the page isn't in the hash table */
-	    bhp = bf_assign_buf ( ndx, &fobj, flags, len );
-	}
-	/* Common code between found and not found */
-
-	if ( bhp && bhp->flags & BUF_NEWPAGE ) {
-	    *len = 0;
-	}
-	if (RELEASE_MASTER){
-		/* Memory leak */
-		return(NULL);
-	}
-	if ( bhp ) {
-	    return ((ADDR_T)(buf_table+(bhp-bufhdr_table)));
-	} else {
-	    return ( NULL );
-	}
-}
-
-/*
-	MIS - do I want to add file links to buffer pool?
-*/
-extern int
-buf_sync ( fid, close )
-int	fid;
-int	close;		/* should we dec refcount and possibly
-			   invalidate all the buffers */
-{
-    int	i;
-    int	fd;
-    int	invalidate;
-    BUFHDR_T	*bhp;
-
-    if ( (fd = bf_fid_to_fd ( fid )) < 0 ) {
-	return(1);
-    }
-    if (GET_MASTER) {
-	return(1);
-    }
-    invalidate = (buf_fids[fid].refcount == 1 && close);
-    if ( invalidate )
-	for ( bhp = bufhdr_table, i = 0; i < NUM_BUFS; bhp++, i++ ) {
-	    if (bhp->id.file_id == fid) {
-		if ((bhp->flags & BF_DIRTY) && (bf_put_page( fd, bhp ) < 0)) {
-			return(1);
-		}
-		bhp->id.file_id = -1;
-	    }
-	}
-    if (invalidate || close)
-	buf_fids[fid].refcount--;
-
-    if (RELEASE_MASTER) {
-	return(1);
-    }
-    return(0);
-
-
-}
-
-extern int
-buf_flags ( addr, set_flags, unset_flags )
-ADDR_T	addr;
-u_long	set_flags;
-u_long	unset_flags;
-{
-    int		bufid;
-    BUFHDR_T	*bhp;
-
-#ifdef PIN_DEBUG
-	fprintf(stderr, "buf_flags: %X setting %s%s%s%s%s releasing %s%s%s%s%s\n",
-	    addr, 
-	    set_flags&BUF_DIRTY ? "DIRTY " : "", 
-	    set_flags&BUF_VALID ? "VALID " : "", 
-	    set_flags&BUF_PINNED ? "PINNED " : "", 
-	    set_flags&BUF_IO_ERROR ? "IO_ERROR " : "", 
-	    set_flags&BUF_IO_IN_PROGRESS ? "IO_IN_PROG " : "", 
-	    set_flags&BUF_NEWPAGE ? "NEWPAGE " : "", 
-	    unset_flags&BUF_DIRTY ? "DIRTY " : "", 
-	    unset_flags&BUF_VALID ? "VALID " : "", 
-	    unset_flags&BUF_PINNED ? "PINNED " : "", 
-	    unset_flags&BUF_IO_ERROR ? "IO_ERROR " : "", 
-	    unset_flags&BUF_IO_IN_PROGRESS ? "IO_IN_PROG " : "", 
-	    unset_flags&BUF_NEWPAGE ? "NEWPAGE " : "" );
-#endif
-    if (!ADDR_OK(addr)) {
-	error_log1 ( "buf_pin: Invalid Buffer Address %x\n", addr );
-	return(1);
-    }
-    bufid = ((BUF_T *)addr) - buf_table;
-    assert ( bufid < NUM_BUFS);
-    bhp = &bufhdr_table[bufid];
-    if (GET_MASTER) {
-	return(1);
-    }
-    bhp->flags |= set_flags;
-    if ( set_flags & BUF_PINNED ) {
-	bhp->refcount++;
-    }
-    if ( set_flags & BUF_DIRTY ) {
-	unset_flags |= BUF_NEWPAGE;
-    }
-
-    if ( unset_flags & BUF_PINNED ) {
-	bhp->refcount--;
-	if ( bhp->refcount ) {
-		/* Turn off pin bit so it doesn't get unset */
-		unset_flags &= ~BUF_PINNED;
-	}
-    }
-    bhp->flags &= ~unset_flags;
-    MAKE_MRU(bhp);
-    if (RELEASE_MASTER) {
-	return(1);
-    }
-    return(0);
-}
-
-/*
-	Take a string name and produce an fid.
-
-	returns -1 on error
-
-	MIS -- this is a potential problem -- you keep actual names
-		here -- what if people run from different directories?
-*/
-extern	int
-buf_name_lookup ( fname )
-char	*fname;
-{
-    int	i;
-    int	fid;
-    int	ndx;
-
-    fid = -1;
-    if (GET_MASTER) {
-	    return(-1);
-    }
-    for ( i = 0; i < NUM_FILE_ENTRIES; i++ ) {
-	if ( buf_fids[i].offset == -1 ) {
-		fid = i;
-	} else {
-		if (!strcmp (fname, buf_strings+buf_fids[i].offset)) {
-			if (RELEASE_MASTER) {
-				return(-1);
-			}
-			buf_fids[i].refcount++;
-			return(i);
-		}
-	}
-    }
-    if ( fid == -1 ) {
-	error_log0 ( "No more file ID's\n" );
-    } else {
-	ndx = *buf_sp - strlen(fname) - 1;
-	if ( ndx < 0 ) {
-	    error_log0 ( "Out of string space\n" );
-	    fid = -1;
-	} else {
-	    *buf_sp = ndx;
-	    strcpy ( buf_strings+ndx, fname );
-	    buf_fids[fid].offset = ndx;
-	}
-	buf_fids[fid].refcount = 1;
-    }
-    if (RELEASE_MASTER) {
-	return(-1);
-    }
-    return(fid);
-}
-
-static	int
-bf_fid_to_fd ( fid ) 
-int	fid;
-{
-	struct stat sbuf;
-
-	assert ( (fid < NUM_FILE_ENTRIES) && (buf_fids[fid].offset != -1) );
-	if ( fds[fid] != -1 ) {
-	    return(fds[fid]);
-
-	}
-	fds[fid] = open ( buf_strings+buf_fids[fid].offset, O_RDWR|O_CREAT, 
-			  0666 );
-	if ( fds[fid] < 0 ) {
-	    error_log3 ( "Error Opening File %s FID: %d FD: %d.  Errno = %d\n", 
-			    buf_strings+buf_fids[fid].offset, fid, fds[fid], 
-			    errno );
-	    return(-1);
-	}
-	error_log3 ( "Opening File %s FID: %d FD: %d\n", 
-			buf_strings+buf_fids[fid].offset, fid, fds[fid] );
-	if ( buf_fids[fid].npages == -1 ) {
-		/* Initialize the npages field */
-		if ( fstat ( fds[fid], &sbuf ) ) {
-		    error_log3 ( "Error Fstating %s FID: %d.  Errno = %d\n", 
-				buf_strings+buf_fids[fid].offset, fid, errno );
-		} else {
-		    buf_fids[fid].npages = ( sbuf.st_size / BUFSIZE );
-		}
-	}
-
-	return ( fds[fid] );
-}
-
-static int
-bf_put_page ( fd, bhp ) 
-int	fd;
-BUFHDR_T	*bhp;
-{
-	int	nbytes;
-
-	assert ( (bhp-bufhdr_table) < NUM_BUFS );
-	if ( lseek ( fd, bhp->id.obj_id << BUFSHIFT, L_SET ) < 0 ) {
-	    return(-1);
-	}
-	bhp->flags |= BUF_IO_IN_PROGRESS;
-	if (RELEASE_MASTER) {
-	    return(-1);
-	}
-	nbytes = write(fd, buf_table[bhp-bufhdr_table], BUFSIZE);
-	if (GET_MASTER) {
-	    return(-2);
-	}
-	if ( nbytes < 0 ) {
-		error_log1 ("Write failed with error code %d\n", errno);
-		return(-1);
-	} else if ( nbytes != BUFSIZE ) {
-		error_log1 ("Short write: %d bytes of %d\n", nbytes, BUFSIZE );
-	}
-	bhp->flags &= ~(BUF_DIRTY|BUF_IO_IN_PROGRESS);
-	return (0);
-}
-
-static BUFHDR_T	*
-bf_assign_buf ( ndx, obj, flags, len )
-int	ndx;
-OBJ_T	*obj;
-u_long	flags;
-int	*len;		/* Number of bytes read */
-{
-    BUFHDR_T	*bhp;
-    int		fd;
-
-    assert ( obj->file_id < NUM_FILE_ENTRIES );
-    bhp = bf_newbuf();
-    if ( !bhp ) {
-	return(NULL);
-    }
-    OBJ_ASSIGN ( (*obj), bhp->id );
-    if ( buf_hash_table[ndx] >= NUM_BUFS ) {
-	buf_hash_table[ndx] = bhp-bufhdr_table;
-    } else {
-	LISTPE_INSERT ( bufhdr_table, hash, bhp, buf_hash_table[ndx] );
-    }
-
-    bhp->flags |= BUF_VALID;
-    if ( flags & BF_PIN ) {
-	bhp->flags |= BUF_PINNED;
-	bhp->refcount++;
-#ifdef PIN_DEBUG
-	fprintf(stderr, "bf_assign_buf: %X PINNED (%d)\n", 
-		buf_table + (bhp-bufhdr_table), bhp->refcount);
-#endif
-    }
-    fd = bf_fid_to_fd(obj->file_id);
-    if ( fd == -1 ) {
-	error_log1 ("Invalid fid %d\n", obj->file_id);
-	bhp->flags |= ~BUF_IO_ERROR;
-	return(NULL);
-    }
-    if ( obj->obj_id >= buf_fids[obj->file_id].npages) {
-	buf_fids[obj->file_id].npages = obj->obj_id+1;
-	*len = 0;
-    } else if ( flags & BF_EMPTY ) {
-	*len = 0;
-    } else {
-	bhp->flags |= BUF_IO_IN_PROGRESS;
-	if (RELEASE_MASTER) {
-		return(NULL);
-	}
-	if ( lseek ( fd, obj->obj_id << BUFSHIFT, L_SET ) < -1 ) {
-	    error_log2 ("Unable to perform seek on file: %d  to page %d",
-			obj->file_id, obj->obj_id );
-	    bhp->flags &= ~BUF_IO_IN_PROGRESS;
-	    bhp->flags |= ~BUF_IO_ERROR;
-	    return(NULL);
-	}
-	*len = read(fd, buf_table[bhp-bufhdr_table], BUFSIZE);
-	if ( *len < 0 ) {
-	    error_log2 ("Unable to perform read on file: %d  to page %d",
-			obj->file_id, obj->obj_id );
-	    bhp->flags &= ~BUF_IO_IN_PROGRESS;
-	    bhp->flags |= ~BUF_IO_ERROR;
-	    return(NULL);
-	} 
-	if (GET_MASTER) {
-		return(NULL);
-	}
-	bhp->flags &= ~BUF_IO_IN_PROGRESS;
-	if ( bhp->wait_proc != -1 ) {
-	    /* wake up waiter and anyone waiting on it */
-#ifdef DEBUG
-	    printf("Waking transaction %d due to completed I/O\n", 
-		bhp->wait_proc);
-#endif
-	    proc_wake_id ( bhp->wait_proc );
-	    bhp->wait_proc = -1;
-	}
-	MAKE_MRU(bhp);
-    }
-
-    if ( flags & BF_DIRTY ) {
-	bhp->flags |= BUF_DIRTY;
-    } else if ( *len < BUFSIZE ) {
-	bhp->flags |= BUF_NEWPAGE;
-    }
-    return ( bhp );
-}
-
-int
-buf_last ( fid )
-int	fid;
-{
-	int	val;
-
-	if (GET_MASTER) {
-		return(-1);
-	}
-	assert ( fid < NUM_FILE_ENTRIES );
-	if ( buf_fids[fid].npages == -1 ) {
-	    /* initialize npages field */
-	    (void) bf_fid_to_fd ( fid );
-	}
-	val = buf_fids[fid].npages;	
-	if ( val ) {
-		val--;			/* Convert to page number */
-	}
-	if (RELEASE_MASTER) {
-		return(-1);
-	}
-	return(val);
-}
-
-#ifdef DEBUG
-extern void
-buf_dump ( id, all )
-int	id;
-int	all;
-{
-	int i;
-	BUFHDR_T	*bhp;
-
-	printf ( "LRU + %d\n", *buf_lru );
-	if ( all ) {
-	    printf("ID\tFID\tPID\tLNEXT\tLPREV\tHNEXT\tHPREV\tSLEEP\tFLAG\tREFS\n");
-	    for ( bhp = bufhdr_table, i = 0; i < NUM_BUFS; bhp++, i++ ) {
-		    printf ( "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%x\t%d\n", i,
-			bhp->id.file_id, bhp->id.obj_id,
-			bhp->lru.next, bhp->lru.prev,
-			bhp->hash.next, bhp->hash.prev,
-			bhp->wait_proc, bhp->flags, bhp->refcount );
-	    }
-	} else {
-		if ( id >= NUM_BUFS ) {
-			printf ( "Buffer ID (%d) too high\n", id );
-			return;
-		}
-		bhp = bufhdr_table+id;
-		printf ( "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%x\t%d\n", i,
-		    bhp->id.file_id, bhp->id.obj_id,
-		    bhp->lru.next, bhp->lru.prev,
-		    bhp->hash.next, bhp->hash.prev,
-		    bhp->wait_proc, bhp->flags, bhp->refcount );
-	}
-	return;
-}
-#endif
-
diff --git a/lib/libc/db/recno/Makefile b/lib/libc/db/recno/Makefile
deleted file mode 100644
index 86e1207..0000000
--- a/lib/libc/db/recno/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../ -I../../include
-
-#Objects
-OBJS = rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o rec_search.o rec_seq.o rec_utils.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/db/recno/extern.h b/lib/libc/db/recno/extern.h
deleted file mode 100644
index 7cacd95..0000000
--- a/lib/libc/db/recno/extern.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- *
- *	@(#)extern.h	8.3 (Berkeley) 6/4/94
- * $FreeBSD: src/lib/libc/db/recno/extern.h,v 1.2 2002/03/21 22:46:28 obrien Exp $
- */
-
-#include "../btree/extern.h"
-
-int	 __rec_close(DB *);
-int	 __rec_delete(const DB *, const DBT *, u_int);
-int	 __rec_dleaf(BTREE *, PAGE *, uint32_t);
-int	 __rec_fd(const DB *);
-int	 __rec_fmap(BTREE *, recno_t);
-int	 __rec_fout(BTREE *);
-int	 __rec_fpipe(BTREE *, recno_t);
-int	 __rec_get(const DB *, const DBT *, DBT *, u_int);
-int	 __rec_iput(BTREE *, recno_t, const DBT *, u_int);
-int	 __rec_put(const DB *dbp, DBT *, const DBT *, u_int);
-int	 __rec_ret(BTREE *, EPG *, recno_t, DBT *, DBT *);
-EPG	*__rec_search(BTREE *, recno_t, enum SRCHOP);
-int	 __rec_seq(const DB *, DBT *, DBT *, u_int);
-int	 __rec_sync(const DB *, u_int);
-int	 __rec_vmap(BTREE *, recno_t);
-int	 __rec_vout(BTREE *);
-int	 __rec_vpipe(BTREE *, recno_t);
diff --git a/lib/libc/db/recno/rec_close.c b/lib/libc/db/recno/rec_close.c
deleted file mode 100644
index fea96ae..0000000
--- a/lib/libc/db/recno/rec_close.c
+++ /dev/null
@@ -1,188 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_close.c	8.6 (Berkeley) 8/18/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_close.c,v 1.7 2003/02/16 17:29:09 nectar Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/mman.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_CLOSE -- Close a recno tree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_close(dbp)
-	DB *dbp;
-{
-	BTREE *t;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	if (__rec_sync(dbp, 0) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Committed to closing. */
-	status = RET_SUCCESS;
-	if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
-		status = RET_ERROR;
-
-	if (!F_ISSET(t, R_INMEM)) {
-		if (F_ISSET(t, R_CLOSEFP)) {
-			if (fclose(t->bt_rfp))
-				status = RET_ERROR;
-		} else
-			if (_close(t->bt_rfd))
-				status = RET_ERROR;
-	}
-
-	if (__bt_close(dbp) == RET_ERROR)
-		status = RET_ERROR;
-
-	return (status);
-}
-
-/*
- * __REC_SYNC -- sync the recno tree to disk.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__rec_sync(dbp, flags)
-	const DB *dbp;
-	u_int flags;
-{
-	struct iovec iov[2];
-	BTREE *t;
-	DBT data, key;
-	off_t off;
-	recno_t scursor, trec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	if (flags == R_RECNOSYNC)
-		return (__bt_sync(dbp, 0));
-
-	if (F_ISSET(t, R_RDONLY | R_INMEM) || !F_ISSET(t, R_MODIFIED))
-		return (RET_SUCCESS);
-
-	/* Read any remaining records into the tree. */
-	if (!F_ISSET(t, R_EOF) && t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Rewind the file descriptor. */
-	if (lseek(t->bt_rfd, (off_t)0, SEEK_SET) != 0)
-		return (RET_ERROR);
-
-	/* Save the cursor. */
-	scursor = t->bt_cursor.rcursor;
-
-	key.size = sizeof(recno_t);
-	key.data = &trec;
-
-	if (F_ISSET(t, R_FIXLEN)) {
-		/*
-		 * We assume that fixed length records are all fixed length.
-		 * Any that aren't are either EINVAL'd or corrected by the
-		 * record put code.
-		 */
-		status = (dbp->seq)(dbp, &key, &data, R_FIRST);
-		while (status == RET_SUCCESS) {
-			if (_write(t->bt_rfd, data.data, data.size) !=
-			    data.size)
-				return (RET_ERROR);
-			status = (dbp->seq)(dbp, &key, &data, R_NEXT);
-		}
-	} else {
-		iov[1].iov_base = (char *)&t->bt_bval;
-		iov[1].iov_len = 1;
-
-		status = (dbp->seq)(dbp, &key, &data, R_FIRST);
-		while (status == RET_SUCCESS) {
-			iov[0].iov_base = data.data;
-			iov[0].iov_len = data.size;
-			if (_writev(t->bt_rfd, iov, 2) != data.size + 1)
-				return (RET_ERROR);
-			status = (dbp->seq)(dbp, &key, &data, R_NEXT);
-		}
-	}
-
-	/* Restore the cursor. */
-	t->bt_cursor.rcursor = scursor;
-
-	if (status == RET_ERROR)
-		return (RET_ERROR);
-	if ((off = lseek(t->bt_rfd, (off_t)0, SEEK_CUR)) == -1)
-		return (RET_ERROR);
-	if (ftruncate(t->bt_rfd, off))
-		return (RET_ERROR);
-	F_CLR(t, R_MODIFIED);
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/rec_delete.c b/lib/libc/db/recno/rec_delete.c
deleted file mode 100644
index 82c436b..0000000
--- a/lib/libc/db/recno/rec_delete.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_delete.c	8.7 (Berkeley) 7/14/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_delete.c,v 1.2 2002/03/21 22:46:28 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-static int rec_rdelete(BTREE *, recno_t);
-
-/*
- * __REC_DELETE -- Delete the item(s) referenced by a key.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key to delete
- *	flags:	R_CURSOR if deleting what the cursor references
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-int
-__rec_delete(dbp, key, flags)
-	const DB *dbp;
-	const DBT *key;
-	u_int flags;
-{
-	BTREE *t;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	switch(flags) {
-	case 0:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		if (nrec > t->bt_nrecs)
-			return (RET_SPECIAL);
-		--nrec;
-		status = rec_rdelete(t, nrec);
-		break;
-	case R_CURSOR:
-		if (!F_ISSET(&t->bt_cursor, CURS_INIT))
-			goto einval;
-		if (t->bt_nrecs == 0)
-			return (RET_SPECIAL);
-		status = rec_rdelete(t, t->bt_cursor.rcursor - 1);
-		if (status == RET_SUCCESS)
-			--t->bt_cursor.rcursor;
-		break;
-	default:
-einval:		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (status == RET_SUCCESS)
-		F_SET(t, B_MODIFIED | R_MODIFIED);
-	return (status);
-}
-
-/*
- * REC_RDELETE -- Delete the data matching the specified key.
- *
- * Parameters:
- *	tree:	tree
- *	nrec:	record to delete
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-static int
-rec_rdelete(t, nrec)
-	BTREE *t;
-	recno_t nrec;
-{
-	EPG *e;
-	PAGE *h;
-	int status;
-
-	/* Find the record; __rec_search pins the page. */
-	if ((e = __rec_search(t, nrec, SDELETE)) == NULL)
-		return (RET_ERROR);
-
-	/* Delete the record. */
-	h = e->page;
-	status = __rec_dleaf(t, h, e->index);
-	if (status != RET_SUCCESS) {
-		mpool_put(t->bt_mp, h, 0);
-		return (status);
-	}
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_DLEAF -- Delete a single record from a recno leaf page.
- *
- * Parameters:
- *	t:	tree
- *	index:	index on current page to delete
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__rec_dleaf(t, h, index)
-	BTREE *t;
-	PAGE *h;
-	uint32_t index;
-{
-	RLEAF *rl;
-	indx_t *ip, cnt, offset;
-	uint32_t nbytes;
-	char *from;
-	void *to;
-
-	/*
-	 * Delete a record from a recno leaf page.  Internal records are never
-	 * deleted from internal pages, regardless of the records that caused
-	 * them to be added being deleted.  Pages made empty by deletion are
-	 * not reclaimed.  They are, however, made available for reuse.
-	 *
-	 * Pack the remaining entries at the end of the page, shift the indices
-	 * down, overwriting the deleted record and its index.  If the record
-	 * uses overflow pages, make them available for reuse.
-	 */
-	to = rl = GETRLEAF(h, index);
-	if (rl->flags & P_BIGDATA && __ovfl_delete(t, rl->bytes) == RET_ERROR)
-		return (RET_ERROR);
-	nbytes = NRLEAF(rl);
-
-	/*
-	 * Compress the key/data pairs.  Compress and adjust the [BR]LEAF
-	 * offsets.  Reset the headers.
-	 */
-	from = (char *)h + h->upper;
-	memmove(from + nbytes, from, (char *)to - from);
-	h->upper += nbytes;
-
-	offset = h->linp[index];
-	for (cnt = &h->linp[index] - (ip = &h->linp[0]); cnt--; ++ip)
-		if (ip[0] < offset)
-			ip[0] += nbytes;
-	for (cnt = &h->linp[NEXTINDEX(h)] - ip; --cnt; ++ip)
-		ip[0] = ip[1] < offset ? ip[1] + nbytes : ip[1];
-	h->lower -= sizeof(indx_t);
-	--t->bt_nrecs;
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/rec_get.c b/lib/libc/db/recno/rec_get.c
deleted file mode 100644
index d9da658..0000000
--- a/lib/libc/db/recno/rec_get.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_get.c	8.9 (Berkeley) 8/18/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_get.c,v 1.5 2002/03/22 21:52:02 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_GET -- Get a record from the btree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key to find
- *	data:	data to return
- *	flag:	currently unused
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-int
-__rec_get(dbp, key, data, flags)
-	const DB *dbp;
-	const DBT *key;
-	DBT *data;
-	u_int flags;
-{
-	BTREE *t;
-	EPG *e;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Get currently doesn't take any flags, and keys of 0 are illegal. */
-	if (flags || (nrec = *(recno_t *)key->data) == 0) {
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	/*
-	 * If we haven't seen this record yet, try to find it in the
-	 * original file.
-	 */
-	if (nrec > t->bt_nrecs) {
-		if (F_ISSET(t, R_EOF | R_INMEM))
-			return (RET_SPECIAL);
-		if ((status = t->bt_irec(t, nrec)) != RET_SUCCESS)
-			return (status);
-	}
-
-	--nrec;
-	if ((e = __rec_search(t, nrec, SEARCH)) == NULL)
-		return (RET_ERROR);
-
-	status = __rec_ret(t, e, 0, NULL, data);
-	if (F_ISSET(t, B_DB_LOCK))
-		mpool_put(t->bt_mp, e->page, 0);
-	else
-		t->bt_pinned = e->page;
-	return (status);
-}
-
-/*
- * __REC_FPIPE -- Get fixed length records from a pipe.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_fpipe(t, top)
-	BTREE *t;
-	recno_t top;
-{
-	DBT data;
-	recno_t nrec;
-	size_t len;
-	int ch;
-	u_char *p;
-
-	if (t->bt_rdata.size < t->bt_reclen) {
-		t->bt_rdata.data = t->bt_rdata.data == NULL ?
-		    malloc(t->bt_reclen) :
-		    reallocf(t->bt_rdata.data, t->bt_reclen);
-		if (t->bt_rdata.data == NULL)
-			return (RET_ERROR);
-		t->bt_rdata.size = t->bt_reclen;
-	}
-	data.data = t->bt_rdata.data;
-	data.size = t->bt_reclen;
-
-	for (nrec = t->bt_nrecs; nrec < top;) {
-		len = t->bt_reclen;
-		for (p = t->bt_rdata.data;; *p++ = ch)
-			if ((ch = getc(t->bt_rfp)) == EOF || !--len) {
-				if (ch != EOF)
-					*p = ch;
-				if (len != 0)
-					memset(p, t->bt_bval, len);
-				if (__rec_iput(t,
-				    nrec, &data, 0) != RET_SUCCESS)
-					return (RET_ERROR);
-				++nrec;
-				break;
-			}
-		if (ch == EOF)
-			break;
-	}
-	if (nrec < top) {
-		F_SET(t, R_EOF);
-		return (RET_SPECIAL);
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_VPIPE -- Get variable length records from a pipe.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_vpipe(t, top)
-	BTREE *t;
-	recno_t top;
-{
-	DBT data;
-	recno_t nrec;
-	size_t len;
-	size_t sz;
-	int bval, ch;
-	u_char *p;
-
-	bval = t->bt_bval;
-	for (nrec = t->bt_nrecs; nrec < top; ++nrec) {
-		for (p = t->bt_rdata.data,
-		    sz = t->bt_rdata.size;; *p++ = ch, --sz) {
-			if ((ch = getc(t->bt_rfp)) == EOF || ch == bval) {
-				data.data = t->bt_rdata.data;
-				data.size = p - (u_char *)t->bt_rdata.data;
-				if (ch == EOF && data.size == 0)
-					break;
-				if (__rec_iput(t, nrec, &data, 0)
-				    != RET_SUCCESS)
-					return (RET_ERROR);
-				break;
-			}
-			if (sz == 0) {
-				len = p - (u_char *)t->bt_rdata.data;
-				t->bt_rdata.size += (sz = 256);
-				t->bt_rdata.data = t->bt_rdata.data == NULL ?
-				    malloc(t->bt_rdata.size) :
-				    reallocf(t->bt_rdata.data, t->bt_rdata.size);
-				if (t->bt_rdata.data == NULL)
-					return (RET_ERROR);
-				p = (u_char *)t->bt_rdata.data + len;
-			}
-		}
-		if (ch == EOF)
-			break;
-	}
-	if (nrec < top) {
-		F_SET(t, R_EOF);
-		return (RET_SPECIAL);
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_FMAP -- Get fixed length records from a file.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_fmap(t, top)
-	BTREE *t;
-	recno_t top;
-{
-	DBT data;
-	recno_t nrec;
-	u_char *sp, *ep, *p;
-	size_t len;
-
-	if (t->bt_rdata.size < t->bt_reclen) {
-		t->bt_rdata.data = t->bt_rdata.data == NULL ?
-		    malloc(t->bt_reclen) :
-		    reallocf(t->bt_rdata.data, t->bt_reclen);
-		if (t->bt_rdata.data == NULL)
-			return (RET_ERROR);
-		t->bt_rdata.size = t->bt_reclen;
-	}
-	data.data = t->bt_rdata.data;
-	data.size = t->bt_reclen;
-
-	sp = (u_char *)t->bt_cmap;
-	ep = (u_char *)t->bt_emap;
-	for (nrec = t->bt_nrecs; nrec < top; ++nrec) {
-		if (sp >= ep) {
-			F_SET(t, R_EOF);
-			return (RET_SPECIAL);
-		}
-		len = t->bt_reclen;
-		for (p = t->bt_rdata.data;
-		    sp < ep && len > 0; *p++ = *sp++, --len);
-		if (len != 0)
-			memset(p, t->bt_bval, len);
-		if (__rec_iput(t, nrec, &data, 0) != RET_SUCCESS)
-			return (RET_ERROR);
-	}
-	t->bt_cmap = (caddr_t)sp;
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_VMAP -- Get variable length records from a file.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_vmap(t, top)
-	BTREE *t;
-	recno_t top;
-{
-	DBT data;
-	u_char *sp, *ep;
-	recno_t nrec;
-	int bval;
-
-	sp = (u_char *)t->bt_cmap;
-	ep = (u_char *)t->bt_emap;
-	bval = t->bt_bval;
-
-	for (nrec = t->bt_nrecs; nrec < top; ++nrec) {
-		if (sp >= ep) {
-			F_SET(t, R_EOF);
-			return (RET_SPECIAL);
-		}
-		for (data.data = sp; sp < ep && *sp != bval; ++sp);
-		data.size = sp - (u_char *)data.data;
-		if (__rec_iput(t, nrec, &data, 0) != RET_SUCCESS)
-			return (RET_ERROR);
-		++sp;
-	}
-	t->bt_cmap = (caddr_t)sp;
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/rec_open.c b/lib/libc/db/recno/rec_open.c
deleted file mode 100644
index a431f6f..0000000
--- a/lib/libc/db/recno/rec_open.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_open.c	8.10 (Berkeley) 9/1/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_open.c,v 1.6 2002/03/22 21:52:02 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-#include "recno.h"
-
-DB *
-__rec_open(fname, flags, mode, openinfo, dflags)
-	const char *fname;
-	int flags, mode, dflags;
-	const RECNOINFO *openinfo;
-{
-	BTREE *t;
-	BTREEINFO btopeninfo;
-	DB *dbp;
-	PAGE *h;
-	struct stat sb;
-	int rfd, sverrno;
-
-	/* Open the user's file -- if this fails, we're done. */
-	if (fname != NULL && (rfd = _open(fname, flags, mode)) < 0)
-		return (NULL);
-
-	/* Create a btree in memory (backed by disk). */
-	dbp = NULL;
-	if (openinfo) {
-		if (openinfo->flags & ~(R_FIXEDLEN | R_NOKEY | R_SNAPSHOT))
-			goto einval;
-		btopeninfo.flags = 0;
-		btopeninfo.cachesize = openinfo->cachesize;
-		btopeninfo.maxkeypage = 0;
-		btopeninfo.minkeypage = 0;
-		btopeninfo.psize = openinfo->psize;
-		btopeninfo.compare = NULL;
-		btopeninfo.prefix = NULL;
-		btopeninfo.lorder = openinfo->lorder;
-		dbp = __bt_open(openinfo->bfname,
-		    O_RDWR, S_IRUSR | S_IWUSR, &btopeninfo, dflags);
-	} else
-		dbp = __bt_open(NULL, O_RDWR, S_IRUSR | S_IWUSR, NULL, dflags);
-	if (dbp == NULL)
-		goto err;
-
-	/*
-	 * Some fields in the tree structure are recno specific.  Fill them
-	 * in and make the btree structure look like a recno structure.  We
-	 * don't change the bt_ovflsize value, it's close enough and slightly
-	 * bigger.
-	 */
-	t = dbp->internal;
-	if (openinfo) {
-		if (openinfo->flags & R_FIXEDLEN) {
-			F_SET(t, R_FIXLEN);
-			t->bt_reclen = openinfo->reclen;
-			if (t->bt_reclen == 0)
-				goto einval;
-		}
-		t->bt_bval = openinfo->bval;
-	} else
-		t->bt_bval = '\n';
-
-	F_SET(t, R_RECNO);
-	if (fname == NULL)
-		F_SET(t, R_EOF | R_INMEM);
-	else
-		t->bt_rfd = rfd;
-
-	if (fname != NULL) {
-		/*
-		 * In 4.4BSD, stat(2) returns true for ISSOCK on pipes.
-		 * Unfortunately, that's not portable, so we use lseek
-		 * and check the errno values.
-		 */
-		errno = 0;
-		if (lseek(rfd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE) {
-			switch (flags & O_ACCMODE) {
-			case O_RDONLY:
-				F_SET(t, R_RDONLY);
-				break;
-			default:
-				goto einval;
-			}
-slow:			if ((t->bt_rfp = fdopen(rfd, "r")) == NULL)
-				goto err;
-			F_SET(t, R_CLOSEFP);
-			t->bt_irec =
-			    F_ISSET(t, R_FIXLEN) ? __rec_fpipe : __rec_vpipe;
-		} else {
-			switch (flags & O_ACCMODE) {
-			case O_RDONLY:
-				F_SET(t, R_RDONLY);
-				break;
-			case O_RDWR:
-				break;
-			default:
-				goto einval;
-			}
-
-			if (_fstat(rfd, &sb))
-				goto err;
-			/*
-			 * Kluge -- we'd like to test to see if the file is too
-			 * big to mmap.  Since, we don't know what size or type
-			 * off_t's or size_t's are, what the largest unsigned
-			 * integral type is, or what random insanity the local
-			 * C compiler will perpetrate, doing the comparison in
-			 * a portable way is flatly impossible.  Hope that mmap
-			 * fails if the file is too large.
-			 */
-			if (sb.st_size == 0)
-				F_SET(t, R_EOF);
-			else {
-#ifdef MMAP_NOT_AVAILABLE
-				/*
-				 * XXX
-				 * Mmap doesn't work correctly on many current
-				 * systems.  In particular, it can fail subtly,
-				 * with cache coherency problems.  Don't use it
-				 * for now.
-				 */
-				t->bt_msize = sb.st_size;
-				if ((t->bt_smap = mmap(NULL, t->bt_msize,
-				    PROT_READ, MAP_PRIVATE, rfd,
-				    (off_t)0)) == MAP_FAILED)
-					goto slow;
-				t->bt_cmap = t->bt_smap;
-				t->bt_emap = t->bt_smap + sb.st_size;
-				t->bt_irec = F_ISSET(t, R_FIXLEN) ?
-				    __rec_fmap : __rec_vmap;
-				F_SET(t, R_MEMMAPPED);
-#else
-				goto slow;
-#endif
-			}
-		}
-	}
-
-	/* Use the recno routines. */
-	dbp->close = __rec_close;
-	dbp->del = __rec_delete;
-	dbp->fd = __rec_fd;
-	dbp->get = __rec_get;
-	dbp->put = __rec_put;
-	dbp->seq = __rec_seq;
-	dbp->sync = __rec_sync;
-
-	/* If the root page was created, reset the flags. */
-	if ((h = mpool_get(t->bt_mp, P_ROOT, 0)) == NULL)
-		goto err;
-	if ((h->flags & P_TYPE) == P_BLEAF) {
-		F_CLR(h, P_TYPE);
-		F_SET(h, P_RLEAF);
-		mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-	} else
-		mpool_put(t->bt_mp, h, 0);
-
-	if (openinfo && openinfo->flags & R_SNAPSHOT &&
-	    !F_ISSET(t, R_EOF | R_INMEM) &&
-	    t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-                goto err;
-	return (dbp);
-
-einval:	errno = EINVAL;
-err:	sverrno = errno;
-	if (dbp != NULL)
-		(void)__bt_close(dbp);
-	if (fname != NULL)
-		(void)_close(rfd);
-	errno = sverrno;
-	return (NULL);
-}
-
-int
-__rec_fd(dbp)
-	const DB *dbp;
-{
-	BTREE *t;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* In-memory database can't have a file descriptor. */
-	if (F_ISSET(t, R_INMEM)) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (t->bt_rfd);
-}
diff --git a/lib/libc/db/recno/rec_put.c b/lib/libc/db/recno/rec_put.c
deleted file mode 100644
index 064aaa6..0000000
--- a/lib/libc/db/recno/rec_put.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_put.c	8.7 (Berkeley) 8/18/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_put.c,v 1.6 2002/03/22 21:52:02 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_PUT -- Add a recno item to the tree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key
- *	data:	data
- *	flag:	R_CURSOR, R_IAFTER, R_IBEFORE, R_NOOVERWRITE
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key is
- *	already in the tree and R_NOOVERWRITE specified.
- */
-int
-__rec_put(dbp, key, data, flags)
-	const DB *dbp;
-	DBT *key;
-	const DBT *data;
-	u_int flags;
-{
-	BTREE *t;
-	DBT fdata, tdata;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/*
-	 * If using fixed-length records, and the record is long, return
-	 * EINVAL.  If it's short, pad it out.  Use the record data return
-	 * memory, it's only short-term.
-	 */
-	if (F_ISSET(t, R_FIXLEN) && data->size != t->bt_reclen) {
-		if (data->size > t->bt_reclen)
-			goto einval;
-
-		if (t->bt_rdata.size < t->bt_reclen) {
-			t->bt_rdata.data = 
-			    reallocf(t->bt_rdata.data, t->bt_reclen);
-			if (t->bt_rdata.data == NULL)
-				return (RET_ERROR);
-			t->bt_rdata.size = t->bt_reclen;
-		}
-		memmove(t->bt_rdata.data, data->data, data->size);
-		memset((char *)t->bt_rdata.data + data->size,
-		    t->bt_bval, t->bt_reclen - data->size);
-		fdata.data = t->bt_rdata.data;
-		fdata.size = t->bt_reclen;
-	} else {
-		fdata.data = data->data;
-		fdata.size = data->size;
-	}
-
-	switch (flags) {
-	case R_CURSOR:
-		if (!F_ISSET(&t->bt_cursor, CURS_INIT))
-			goto einval;
-		nrec = t->bt_cursor.rcursor;
-		break;
-	case R_SETCURSOR:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		break;
-	case R_IAFTER:
-		if ((nrec = *(recno_t *)key->data) == 0) {
-			nrec = 1;
-			flags = R_IBEFORE;
-		}
-		break;
-	case 0:
-	case R_IBEFORE:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		break;
-	case R_NOOVERWRITE:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		if (nrec <= t->bt_nrecs)
-			return (RET_SPECIAL);
-		break;
-	default:
-einval:		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	/*
-	 * Make sure that records up to and including the put record are
-	 * already in the database.  If skipping records, create empty ones.
-	 */
-	if (nrec > t->bt_nrecs) {
-		if (!F_ISSET(t, R_EOF | R_INMEM) &&
-		    t->bt_irec(t, nrec) == RET_ERROR)
-			return (RET_ERROR);
-		if (nrec > t->bt_nrecs + 1) {
-			if (F_ISSET(t, R_FIXLEN)) {
-				if ((tdata.data =
-				    (void *)malloc(t->bt_reclen)) == NULL)
-					return (RET_ERROR);
-				tdata.size = t->bt_reclen;
-				memset(tdata.data, t->bt_bval, tdata.size);
-			} else {
-				tdata.data = NULL;
-				tdata.size = 0;
-			}
-			while (nrec > t->bt_nrecs + 1)
-				if (__rec_iput(t,
-				    t->bt_nrecs, &tdata, 0) != RET_SUCCESS)
-					return (RET_ERROR);
-			if (F_ISSET(t, R_FIXLEN))
-				free(tdata.data);
-		}
-	}
-
-	if ((status = __rec_iput(t, nrec - 1, &fdata, flags)) != RET_SUCCESS)
-		return (status);
-
-	switch (flags) {
-	case R_IAFTER:
-		nrec++;
-		break;
-	case R_SETCURSOR:
-		t->bt_cursor.rcursor = nrec;
-		break;
-	}
-	
-	F_SET(t, R_MODIFIED);
-	return (__rec_ret(t, NULL, nrec, key, NULL));
-}
-
-/*
- * __REC_IPUT -- Add a recno item to the tree.
- *
- * Parameters:
- *	t:	tree
- *	nrec:	record number
- *	data:	data
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_iput(t, nrec, data, flags)
-	BTREE *t;
-	recno_t nrec;
-	const DBT *data;
-	u_int flags;
-{
-	DBT tdata;
-	EPG *e;
-	PAGE *h;
-	indx_t index, nxtindex;
-	pgno_t pg;
-	uint32_t nbytes;
-	int dflags, status;
-	char *dest, db[NOVFLSIZE];
-
-	/*
-	 * If the data won't fit on a page, store it on indirect pages.
-	 *
-	 * XXX
-	 * If the insert fails later on, these pages aren't recovered.
-	 */
-	if (data->size > t->bt_ovflsize) {
-		if (__ovfl_put(t, data, &pg) == RET_ERROR)
-			return (RET_ERROR);
-		tdata.data = db;
-		tdata.size = NOVFLSIZE;
-		*(pgno_t *)db = pg;
-		*(uint32_t *)(db + sizeof(pgno_t)) = data->size;
-		dflags = P_BIGDATA;
-		data = &tdata;
-	} else
-		dflags = 0;
-
-	/* __rec_search pins the returned page. */
-	if ((e = __rec_search(t, nrec,
-	    nrec > t->bt_nrecs || flags == R_IAFTER || flags == R_IBEFORE ?
-	    SINSERT : SEARCH)) == NULL)
-		return (RET_ERROR);
-
-	h = e->page;
-	index = e->index;
-
-	/*
-	 * Add the specified key/data pair to the tree.  The R_IAFTER and
-	 * R_IBEFORE flags insert the key after/before the specified key.
-	 *
-	 * Pages are split as required.
-	 */
-	switch (flags) {
-	case R_IAFTER:
-		++index;
-		break;
-	case R_IBEFORE:
-		break;
-	default:
-		if (nrec < t->bt_nrecs &&
-		    __rec_dleaf(t, h, index) == RET_ERROR) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		break;
-	}
-
-	/*
-	 * If not enough room, split the page.  The split code will insert
-	 * the key and data and unpin the current page.  If inserting into
-	 * the offset array, shift the pointers up.
-	 */
-	nbytes = NRLEAFDBT(data->size);
-	if (h->upper - h->lower < nbytes + sizeof(indx_t)) {
-		status = __bt_split(t, h, NULL, data, dflags, nbytes, index);
-		if (status == RET_SUCCESS)
-			++t->bt_nrecs;
-		return (status);
-	}
-
-	if (index < (nxtindex = NEXTINDEX(h)))
-		memmove(h->linp + index + 1, h->linp + index,
-		    (nxtindex - index) * sizeof(indx_t));
-	h->lower += sizeof(indx_t);
-
-	h->linp[index] = h->upper -= nbytes;
-	dest = (char *)h + h->upper;
-	WR_RLEAF(dest, data, dflags);
-
-	++t->bt_nrecs;
-	F_SET(t, B_MODIFIED);
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/rec_search.c b/lib/libc/db/recno/rec_search.c
deleted file mode 100644
index 3353bfb..0000000
--- a/lib/libc/db/recno/rec_search.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_search.c	8.4 (Berkeley) 7/14/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_search.c,v 1.4 2002/03/21 18:47:38 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_SEARCH -- Search a btree for a key.
- *
- * Parameters:
- *	t:	tree to search
- *	recno:	key to find
- *	op: 	search operation
- *
- * Returns:
- *	EPG for matching record, if any, or the EPG for the location of the
- *	key, if it were inserted into the tree.
- *
- * Returns:
- *	The EPG for matching record, if any, or the EPG for the location
- *	of the key, if it were inserted into the tree, is entered into
- *	the bt_cur field of the tree.  A pointer to the field is returned.
- */
-EPG *
-__rec_search(t, recno, op)
-	BTREE *t;
-	recno_t recno;
-	enum SRCHOP op;
-{
-	indx_t index;
-	PAGE *h;
-	EPGNO *parent;
-	RINTERNAL *r;
-	pgno_t pg;
-	indx_t top;
-	recno_t total;
-	int sverrno;
-
-	BT_CLR(t);
-	for (pg = P_ROOT, total = 0;;) {
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			goto err;
-		if (h->flags & P_RLEAF) {
-			t->bt_cur.page = h;
-			t->bt_cur.index = recno - total;
-			return (&t->bt_cur);
-		}
-		for (index = 0, top = NEXTINDEX(h);;) {
-			r = GETRINTERNAL(h, index);
-			if (++index == top || total + r->nrecs > recno)
-				break;
-			total += r->nrecs;
-		}
-
-		BT_PUSH(t, pg, index - 1);
-		
-		pg = r->pgno;
-		switch (op) {
-		case SDELETE:
-			--GETRINTERNAL(h, (index - 1))->nrecs;
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		case SINSERT:
-			++GETRINTERNAL(h, (index - 1))->nrecs;
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		case SEARCH:
-			mpool_put(t->bt_mp, h, 0);
-			break;
-		}
-
-	}
-	/* Try and recover the tree. */
-err:	sverrno = errno;
-	if (op != SEARCH)
-		while  ((parent = BT_POP(t)) != NULL) {
-			if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-				break;
-			if (op == SINSERT)
-				--GETRINTERNAL(h, parent->index)->nrecs;
-			else
-				++GETRINTERNAL(h, parent->index)->nrecs;
-                        mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-                }
-	errno = sverrno;
-	return (NULL);
-}
diff --git a/lib/libc/db/recno/rec_seq.c b/lib/libc/db/recno/rec_seq.c
deleted file mode 100644
index 6ed3384..0000000
--- a/lib/libc/db/recno/rec_seq.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-/* XXX use __SCCSID */
-static char sccsid[] __unused = "@(#)rec_seq.c	8.3 (Berkeley) 7/14/94";
-#endif /* not lint */
-__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_seq.c,v 1.5 2003/02/16 17:29:09 nectar Exp $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_SEQ -- Recno sequential scan interface.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key for positioning and return value
- *	data:	data return value
- *	flags:	R_CURSOR, R_FIRST, R_LAST, R_NEXT, R_PREV.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-int
-__rec_seq(dbp, key, data, flags)
-	const DB *dbp;
-	DBT *key, *data;
-	u_int flags;
-{
-	BTREE *t;
-	EPG *e;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	switch(flags) {
-	case R_CURSOR:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		break;
-	case R_NEXT:
-		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
-			nrec = t->bt_cursor.rcursor + 1;
-			break;
-		}
-		/* FALLTHROUGH */
-	case R_FIRST:
-		nrec = 1;
-		break;
-	case R_PREV:
-		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
-			if ((nrec = t->bt_cursor.rcursor - 1) == 0)
-				return (RET_SPECIAL);
-			break;
-		}
-		/* FALLTHROUGH */
-	case R_LAST:
-		if (!F_ISSET(t, R_EOF | R_INMEM) &&
-		    t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-			return (RET_ERROR);
-		nrec = t->bt_nrecs;
-		break;
-	default:
-einval:		errno = EINVAL;
-		return (RET_ERROR);
-	}
-	
-	if (t->bt_nrecs == 0 || nrec > t->bt_nrecs) {
-		if (!F_ISSET(t, R_EOF | R_INMEM) &&
-		    (status = t->bt_irec(t, nrec)) != RET_SUCCESS)
-			return (status);
-		if (t->bt_nrecs == 0 || nrec > t->bt_nrecs)
-			return (RET_SPECIAL);
-	}
-
-	if ((e = __rec_search(t, nrec - 1, SEARCH)) == NULL)
-		return (RET_ERROR);
-
-	F_SET(&t->bt_cursor, CURS_INIT);
-	t->bt_cursor.rcursor = nrec;
-
-	status = __rec_ret(t, e, nrec, key, data);
-	if (F_ISSET(t, B_DB_LOCK))
-		mpool_put(t->bt_mp, e->page, 0);
-	else
-		t->bt_pinned = e->page;
-	return (status);
-}
diff --git a/lib/libc/db/recno/rec_utils.c b/lib/libc/db/recno/rec_utils.c
deleted file mode 100644
index 81fa1d6..0000000
--- a/lib/libc/db/recno/rec_utils.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/recno/rec_utils.c,v 1.2 2002/03/22 21:52:02 obrien Exp $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __rec_ret --
- *	Build return data.
- *
- * Parameters:
- *	t:	tree
- *	e:	key/data pair to be returned
- *   nrec:	record number
- *    key:	user's key structure
- *	data:	user's data structure
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__rec_ret(t, e, nrec, key, data)
-	BTREE *t;
-	EPG *e;
-	recno_t nrec;
-	DBT *key, *data;
-{
-	RLEAF *rl;
-	void *p;
-
-	if (key == NULL)
-		goto dataonly;
-
-	/* We have to copy the key, it's not on the page. */
-	if (sizeof(recno_t) > t->bt_rkey.size) {
-		p = (void *)(t->bt_rkey.data == NULL ?
-		    malloc(sizeof(recno_t)) :
-		    realloc(t->bt_rkey.data, sizeof(recno_t)));
-		if (p == NULL)
-			return (RET_ERROR);
-		t->bt_rkey.data = p;
-		t->bt_rkey.size = sizeof(recno_t);
-	}
-	memmove(t->bt_rkey.data, &nrec, sizeof(recno_t));
-	key->size = sizeof(recno_t);
-	key->data = t->bt_rkey.data;
-
-dataonly:
-	if (data == NULL)
-		return (RET_SUCCESS);
-
-	/*
-	 * We must copy big keys/data to make them contigous.  Otherwise,
-	 * leave the page pinned and don't copy unless the user specified
-	 * concurrent access.
-	 */
-	rl = GETRLEAF(e->page, e->index);
-	if (rl->flags & P_BIGDATA) {
-		if (__ovfl_get(t, rl->bytes,
-		    &data->size, &t->bt_rdata.data, &t->bt_rdata.size))
-			return (RET_ERROR);
-		data->data = t->bt_rdata.data;
-	} else if (F_ISSET(t, B_DB_LOCK)) {
-		/* Use +1 in case the first record retrieved is 0 length. */
-		if (rl->dsize + 1 > t->bt_rdata.size) {
-			p = (void *)(t->bt_rdata.data == NULL ?
-			    malloc(rl->dsize + 1) :
-			    realloc(t->bt_rdata.data, rl->dsize + 1));
-			if (p == NULL)
-				return (RET_ERROR);
-			t->bt_rdata.data = p;
-			t->bt_rdata.size = rl->dsize + 1;
-		}
-		memmove(t->bt_rdata.data, rl->bytes, rl->dsize);
-		data->size = rl->dsize;
-		data->data = t->bt_rdata.data;
-	} else {
-		data->size = rl->dsize;
-		data->data = rl->bytes;
-	}
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc/db/recno/recno.h b/lib/libc/db/recno/recno.h
deleted file mode 100644
index b0c0af7..0000000
--- a/lib/libc/db/recno/recno.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- *
- *	@(#)recno.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/lib/libc/db/recno/recno.h,v 1.2 2002/03/22 23:41:40 obrien Exp $
- */
-
-enum SRCHOP { SDELETE, SINSERT, SEARCH};	/* Rec_search operation. */
-
-#include "../btree/btree.h"
-#include "extern.h"
diff --git a/lib/libc/gdtoa/Makefile b/lib/libc/gdtoa/Makefile
deleted file mode 100644
index d135e56..0000000
--- a/lib/libc/gdtoa/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/ -I../../../contrib/gdtoa -I../i386
-
-#Objects
-OBJS = _hdtoa.o _ldtoa.o arithchk.o dmisc.o dtoa.o g_Qfmt.o g__fmt.o g_ddfmt.o g_dfmt.o g_ffmt.o g_xLfmt.o g_xfmt.o gdtoa.o gethex.o glue.o gmisc.o hd_init.o hexnan.o machdep_ldisx.o misc.o smisc.o strtoIQ.o strtoId.o strtoIdd.o strtoIf.o strtoIg.o strtoIx.o strtoIxL.o strtod.o strtodI.o strtodg.o strtof.o strtopQ.o strtopd.o strtopdd.o strtopf.o strtopx.o strtopxL.o strtorQ.o strtord.o strtordd.o strtorf.o strtorx.o strtorxL.o sum.o ulp.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/gdtoa/_hdtoa.c b/lib/libc/gdtoa/_hdtoa.c
deleted file mode 100644
index 77e99ac..0000000
--- a/lib/libc/gdtoa/_hdtoa.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*-
- * Copyright (c) 2004, 2005 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.3 2005/01/18 18:44:07 das Exp $");
-
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-#include "fpmath.h"
-#include "gdtoaimp.h"
-
-/* Strings values used by dtoa() */
-#define	INFSTR	"Infinity"
-#define	NANSTR	"NaN"
-
-#define	DBL_ADJ		(DBL_MAX_EXP - 2 + ((DBL_MANT_DIG - 1) % 4))
-#define	LDBL_ADJ	(LDBL_MAX_EXP - 2 + ((LDBL_MANT_DIG - 1) % 4))
-
-/*
- * Round up the given digit string.  If the digit string is fff...f,
- * this procedure sets it to 100...0 and returns 1 to indicate that
- * the exponent needs to be bumped.  Otherwise, 0 is returned.
- */
-static int
-roundup(char *s0, int ndigits)
-{
-	char *s;
-
-	for (s = s0 + ndigits - 1; *s == 0xf; s--) {
-		if (s == s0) {
-			*s = 1;
-			return (1);
-		}
-		++*s;
-	}
-	++*s;
-	return (0);
-}
-
-/*
- * Round the given digit string to ndigits digits according to the
- * current rounding mode.  Note that this could produce a string whose
- * value is not representable in the corresponding floating-point
- * type.  The exponent pointed to by decpt is adjusted if necessary.
- */
-static void
-dorounding(char *s0, int ndigits, int sign, int *decpt)
-{
-	int adjust = 0;	/* do we need to adjust the exponent? */
-
-	switch (FLT_ROUNDS) {
-	case 0:		/* toward zero */
-	default:	/* implementation-defined */
-		break;
-	case 1:		/* to nearest, halfway rounds to even */
-		if ((s0[ndigits] > 8) ||
-		    (s0[ndigits] == 8 && s0[ndigits - 1] & 1))
-			adjust = roundup(s0, ndigits);
-		break;
-	case 2:		/* toward +inf */
-		if (sign == 0)
-			adjust = roundup(s0, ndigits);
-		break;
-	case 3:		/* toward -inf */
-		if (sign != 0)
-			adjust = roundup(s0, ndigits);
-		break;
-	}
-
-	if (adjust)
-		*decpt += 4;
-}
-
-/*
- * This procedure converts a double-precision number in IEEE format
- * into a string of hexadecimal digits and an exponent of 2.  Its
- * behavior is bug-for-bug compatible with dtoa() in mode 2, with the
- * following exceptions:
- *
- * - An ndigits < 0 causes it to use as many digits as necessary to
- *   represent the number exactly.
- * - The additional xdigs argument should point to either the string
- *   "0123456789ABCDEF" or the string "0123456789abcdef", depending on
- *   which case is desired.
- * - This routine does not repeat dtoa's mistake of setting decpt
- *   to 9999 in the case of an infinity or NaN.  INT_MAX is used
- *   for this purpose instead.
- *
- * Note that the C99 standard does not specify what the leading digit
- * should be for non-zero numbers.  For instance, 0x1.3p3 is the same
- * as 0x2.6p2 is the same as 0x4.cp3.  This implementation chooses the
- * first digit so that subsequent digits are aligned on nibble
- * boundaries (before rounding).
- *
- * Inputs:	d, xdigs, ndigits
- * Outputs:	decpt, sign, rve
- */
-char *
-__hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-	static const int sigfigs = (DBL_MANT_DIG + 3) / 4;
-	union IEEEd2bits u;
-	char *s, *s0;
-	int bufsize;
-
-	u.d = d;
-	*sign = u.bits.sign;
-
-	switch (fpclassify(d)) {
-	case FP_NORMAL:
-		*decpt = u.bits.exp - DBL_ADJ;
-		break;
-	case FP_ZERO:
-		*decpt = 1;
-		return (nrv_alloc("0", rve, 1));
-	case FP_SUBNORMAL:
-		u.d *= 0x1p514;
-		*decpt = u.bits.exp - (514 + DBL_ADJ);
-		break;
-	case FP_INFINITE:
-		*decpt = INT_MAX;
-		return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1));
-	case FP_NAN:
-		*decpt = INT_MAX;
-		return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1));
-	default:
-		abort();
-	}
-
-	/* FP_NORMAL or FP_SUBNORMAL */
-
-	if (ndigits == 0)		/* dtoa() compatibility */
-		ndigits = 1;
-
-	/*
-	 * For simplicity, we generate all the digits even if the
-	 * caller has requested fewer.
-	 */
-	bufsize = (sigfigs > ndigits) ? sigfigs : ndigits;
-	s0 = rv_alloc(bufsize);
-
-	/*
-	 * We work from right to left, first adding any requested zero
-	 * padding, then the least significant portion of the
-	 * mantissa, followed by the most significant.  The buffer is
-	 * filled with the byte values 0x0 through 0xf, which are
-	 * converted to xdigs[0x0] through xdigs[0xf] after the
-	 * rounding phase.
-	 */
-	for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--)
-		*s = 0;
-	for (; s > s0 + sigfigs - (DBL_MANL_SIZE / 4) - 1 && s > s0; s--) {
-		*s = u.bits.manl & 0xf;
-		u.bits.manl >>= 4;
-	}
-	for (; s > s0; s--) {
-		*s = u.bits.manh & 0xf;
-		u.bits.manh >>= 4;
-	}
-
-	/*
-	 * At this point, we have snarfed all the bits in the
-	 * mantissa, with the possible exception of the highest-order
-	 * (partial) nibble, which is dealt with by the next
-	 * statement.  We also tack on the implicit normalization bit.
-	 */
-	*s = u.bits.manh | (1U << ((DBL_MANT_DIG - 1) % 4));
-
-	/* If ndigits < 0, we are expected to auto-size the precision. */
-	if (ndigits < 0) {
-		for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--)
-			;
-	}
-
-	if (sigfigs > ndigits && s0[ndigits] != 0)
-		dorounding(s0, ndigits, u.bits.sign, decpt);
-
-	s = s0 + ndigits;
-	if (rve != NULL)
-		*rve = s;
-	*s-- = '\0';
-	for (; s >= s0; s--)
-		*s = xdigs[(unsigned int)*s];
-
-	return (s0);
-}
-
-#if (LDBL_MANT_DIG > DBL_MANT_DIG)
-
-/*
- * This is the long double version of __hdtoa().
- */
-char *
-__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-	static const int sigfigs = (LDBL_MANT_DIG + 3) / 4;
-	union IEEEl2bits u;
-	char *s, *s0;
-	int bufsize;
-
-	u.e = e;
-	*sign = u.bits.sign;
-
-	switch (fpclassify(e)) {
-	case FP_NORMAL:
-		*decpt = u.bits.exp - LDBL_ADJ;
-		break;
-	case FP_ZERO:
-		*decpt = 1;
-		return (nrv_alloc("0", rve, 1));
-	case FP_SUBNORMAL:
-		u.e *= 0x1p514L;
-		*decpt = u.bits.exp - (514 + LDBL_ADJ);
-		break;
-	case FP_INFINITE:
-		*decpt = INT_MAX;
-		return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1));
-	case FP_NAN:
-		*decpt = INT_MAX;
-		return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1));
-	default:
-		abort();
-	}
-
-	/* FP_NORMAL or FP_SUBNORMAL */
-
-	if (ndigits == 0)		/* dtoa() compatibility */
-		ndigits = 1;
-
-	/*
-	 * For simplicity, we generate all the digits even if the
-	 * caller has requested fewer.
-	 */
-	bufsize = (sigfigs > ndigits) ? sigfigs : ndigits;
-	s0 = rv_alloc(bufsize);
-
-	/*
-	 * We work from right to left, first adding any requested zero
-	 * padding, then the least significant portion of the
-	 * mantissa, followed by the most significant.  The buffer is
-	 * filled with the byte values 0x0 through 0xf, which are
-	 * converted to xdigs[0x0] through xdigs[0xf] after the
-	 * rounding phase.
-	 */
-	for (s = s0 + bufsize - 1; s > s0 + sigfigs - 1; s--)
-		*s = 0;
-	for (; s > s0 + sigfigs - (LDBL_MANL_SIZE / 4) - 1 && s > s0; s--) {
-		*s = u.bits.manl & 0xf;
-		u.bits.manl >>= 4;
-	}
-	for (; s > s0; s--) {
-		*s = u.bits.manh & 0xf;
-		u.bits.manh >>= 4;
-	}
-
-	/*
-	 * At this point, we have snarfed all the bits in the
-	 * mantissa, with the possible exception of the highest-order
-	 * (partial) nibble, which is dealt with by the next
-	 * statement.  We also tack on the implicit normalization bit.
-	 */
-	*s = u.bits.manh | (1U << ((LDBL_MANT_DIG - 1) % 4));
-
-	/* If ndigits < 0, we are expected to auto-size the precision. */
-	if (ndigits < 0) {
-		for (ndigits = sigfigs; s0[ndigits - 1] == 0; ndigits--)
-			;
-	}
-
-	if (sigfigs > ndigits && s0[ndigits] != 0)
-		dorounding(s0, ndigits, u.bits.sign, decpt);
-
-	s = s0 + ndigits;
-	if (rve != NULL)
-		*rve = s;
-	*s-- = '\0';
-	for (; s >= s0; s--)
-		*s = xdigs[(unsigned int)*s];
-
-	return (s0);
-}
-
-#else	/* (LDBL_MANT_DIG == DBL_MANT_DIG) */
-
-char *
-__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-
-	return (__hdtoa((double)e, xdigs, ndigits, decpt, sign, rve));
-}
-
-#endif	/* (LDBL_MANT_DIG == DBL_MANT_DIG) */
diff --git a/lib/libc/gdtoa/_ldtoa.c b/lib/libc/gdtoa/_ldtoa.c
deleted file mode 100644
index ededc68..0000000
--- a/lib/libc/gdtoa/_ldtoa.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 2003 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_ldtoa.c,v 1.2 2004/01/18 07:53:49 das Exp $");
-
-#include <float.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdlib.h>
-#include "fpmath.h"
-#include "gdtoaimp.h"
-
-/*
- * ldtoa() is a wrapper for gdtoa() that makes it smell like dtoa(),
- * except that the floating point argument is passed by reference.
- * When dtoa() is passed a NaN or infinity, it sets expt to 9999.
- * However, a long double could have a valid exponent of 9999, so we
- * use INT_MAX in ldtoa() instead.
- */
-char *
-__ldtoa(long double *ld, int mode, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-	static FPI fpi = {
-		LDBL_MANT_DIG,			/* nbits */
-		LDBL_MIN_EXP - LDBL_MANT_DIG,	/* emin */
-		LDBL_MAX_EXP - LDBL_MANT_DIG,	/* emax */
-		FPI_Round_near,	       		/* rounding */
-#ifdef Sudden_Underflow	/* unused, but correct anyway */
-		1
-#else
-		0
-#endif
-	};
-	int be, kind;
-	char *ret;
-	union IEEEl2bits u;
-	uint32_t bits[(LDBL_MANT_DIG + 31) / 32];
-
-	u.e = *ld;
-	*sign = u.bits.sign;
-	be = u.bits.exp - (LDBL_MAX_EXP - 1) - (LDBL_MANT_DIG - 1);
-	LDBL_TO_ARRAY32(u, bits);
-
-	switch (fpclassify(u.e)) {
-	case FP_NORMAL:
-		kind = STRTOG_Normal;
-#ifdef	LDBL_IMPLICIT_NBIT
-		bits[LDBL_MANT_DIG / 32] |= 1 << ((LDBL_MANT_DIG - 1) % 32);
-#endif /* LDBL_IMPLICIT_NBIT */
-		break;
-	case FP_ZERO:
-		kind = STRTOG_Zero;
-		break;
-	case FP_SUBNORMAL:
-		kind = STRTOG_Denormal;
-#ifdef	LDBL_IMPLICIT_NBIT
-		be++;
-#endif
-		break;
-	case FP_INFINITE:
-		kind = STRTOG_Infinite;
-		break;
-	case FP_NAN:
-		kind = STRTOG_NaN;
-		break;
-	default:
-		abort();
-	}
-
-	ret = gdtoa(&fpi, be, (ULong *)bits, &kind, mode, ndigits, decpt, rve);
-	if (*decpt == -32768)
-		*decpt = INT_MAX;
-	return ret;
-}
diff --git a/lib/libc/gdtoa/arithchk.c b/lib/libc/gdtoa/arithchk.c
deleted file mode 100644
index 59eaad7..0000000
--- a/lib/libc/gdtoa/arithchk.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/****************************************************************
-Copyright (C) 1997, 1998 Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-****************************************************************/
-
-/* Try to deduce arith.h from arithmetic properties. */
-
-#include <stdio.h>
-
- static int dalign;
- typedef struct
-Akind {
-	char *name;
-	int   kind;
-	} Akind;
-
- static Akind
-IEEE_8087	= { "IEEE_8087", 1 },
-IEEE_MC68k	= { "IEEE_MC68k", 2 },
-IBM		= { "IBM", 3 },
-VAX		= { "VAX", 4 },
-CRAY		= { "CRAY", 5};
-
- static Akind *
-Lcheck()
-{
-	union {
-		double d;
-		long L[2];
-		} u;
-	struct {
-		double d;
-		long L;
-		} x[2];
-
-	if (sizeof(x) > 2*(sizeof(double) + sizeof(long)))
-		dalign = 1;
-	u.L[0] = u.L[1] = 0;
-	u.d = 1e13;
-	if (u.L[0] == 1117925532 && u.L[1] == -448790528)
-		return &IEEE_MC68k;
-	if (u.L[1] == 1117925532 && u.L[0] == -448790528)
-		return &IEEE_8087;
-	if (u.L[0] == -2065213935 && u.L[1] == 10752)
-		return &VAX;
-	if (u.L[0] == 1267827943 && u.L[1] == 704643072)
-		return &IBM;
-	return 0;
-	}
-
- static Akind *
-icheck()
-{
-	union {
-		double d;
-		int L[2];
-		} u;
-	struct {
-		double d;
-		int L;
-		} x[2];
-
-	if (sizeof(x) > 2*(sizeof(double) + sizeof(int)))
-		dalign = 1;
-	u.L[0] = u.L[1] = 0;
-	u.d = 1e13;
-	if (u.L[0] == 1117925532 && u.L[1] == -448790528)
-		return &IEEE_MC68k;
-	if (u.L[1] == 1117925532 && u.L[0] == -448790528)
-		return &IEEE_8087;
-	if (u.L[0] == -2065213935 && u.L[1] == 10752)
-		return &VAX;
-	if (u.L[0] == 1267827943 && u.L[1] == 704643072)
-		return &IBM;
-	return 0;
-	}
-
-char *emptyfmt = "";	/* avoid possible warning message with printf("") */
-
- static Akind *
-ccheck()
-{
-	union {
-		double d;
-		long L;
-		} u;
-	long Cray1;
-
-	/* Cray1 = 4617762693716115456 -- without overflow on non-Crays */
-	Cray1 = printf(emptyfmt) < 0 ? 0 : 4617762;
-	if (printf(emptyfmt, Cray1) >= 0)
-		Cray1 = 1000000*Cray1 + 693716;
-	if (printf(emptyfmt, Cray1) >= 0)
-		Cray1 = 1000000*Cray1 + 115456;
-	u.d = 1e13;
-	if (u.L == Cray1)
-		return &CRAY;
-	return 0;
-	}
-
- static int
-fzcheck()
-{
-	double a, b;
-	int i;
-
-	a = 1.;
-	b = .1;
-	for(i = 155;; b *= b, i >>= 1) {
-		if (i & 1) {
-			a *= b;
-			if (i == 1)
-				break;
-			}
-		}
-	b = a * a;
-	return b == 0.;
-	}
-
-main()
-{
-	Akind *a = 0;
-	int Ldef = 0;
-	FILE *f;
-
-#ifdef WRITE_ARITH_H	/* for Symantec's buggy "make" */
-	f = fopen("arith.h", "w");
-	if (!f) {
-		printf("Cannot open arith.h\n");
-		return 1;
-		}
-#else
-	f = stdout;
-#endif
-
-	if (sizeof(double) == 2*sizeof(long))
-		a = Lcheck();
-	else if (sizeof(double) == 2*sizeof(int)) {
-		Ldef = 1;
-		a = icheck();
-		}
-	else if (sizeof(double) == sizeof(long))
-		a = ccheck();
-	if (a) {
-		fprintf(f, "#define %s\n#define Arith_Kind_ASL %d\n",
-			a->name, a->kind);
-		if (Ldef)
-			fprintf(f, "#define Long int\n#define Intcast (int)(long)\n");
-		if (dalign)
-			fprintf(f, "#define Double_Align\n");
-		if (sizeof(char*) == 8)
-			fprintf(f, "#define X64_bit_pointers\n");
-#ifndef NO_LONG_LONG
-		if (sizeof(long long) < 8)
-#endif
-			fprintf(f, "#define NO_LONG_LONG\n");
-		if (a->kind <= 2 && fzcheck())
-			fprintf(f, "#define Sudden_Underflow\n");
-		return 0;
-		}
-	fprintf(f, "/* Unknown arithmetic */\n");
-	return 1;
-	}
diff --git a/lib/libc/gdtoa/dmisc.c b/lib/libc/gdtoa/dmisc.c
deleted file mode 100644
index 14b5d7e..0000000
--- a/lib/libc/gdtoa/dmisc.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#ifndef MULTIPLE_THREADS
- char *dtoa_result;
-#endif
-
- char *
-#ifdef KR_headers
-rv_alloc(i) int i;
-#else
-rv_alloc(int i)
-#endif
-{
-	int j, k, *r;
-
-	j = sizeof(ULong);
-	for(k = 0;
-		sizeof(Bigint) - sizeof(ULong) - sizeof(int) + j <= i;
-		j <<= 1)
-			k++;
-	r = (int*)Balloc(k);
-	*r = k;
-	return
-#ifndef MULTIPLE_THREADS
-	dtoa_result =
-#endif
-		(char *)(r+1);
-	}
-
- char *
-#ifdef KR_headers
-nrv_alloc(s, rve, n) char *s, **rve; int n;
-#else
-nrv_alloc(char *s, char **rve, int n)
-#endif
-{
-	char *rv, *t;
-
-	t = rv = rv_alloc(n);
-	while((*t = *s++) !=0)
-		t++;
-	if (rve)
-		*rve = t;
-	return rv;
-	}
-
-/* freedtoa(s) must be used to free values s returned by dtoa
- * when MULTIPLE_THREADS is #defined.  It should be used in all cases,
- * but for consistency with earlier versions of dtoa, it is optional
- * when MULTIPLE_THREADS is not defined.
- */
-
- void
-#ifdef KR_headers
-freedtoa(s) char *s;
-#else
-freedtoa(char *s)
-#endif
-{
-	Bigint *b = (Bigint *)((int *)s - 1);
-	b->maxwds = 1 << (b->k = *(int*)b);
-	Bfree(b);
-#ifndef MULTIPLE_THREADS
-	if (s == dtoa_result)
-		dtoa_result = 0;
-#endif
-	}
-
- int
-quorem
-#ifdef KR_headers
-	(b, S) Bigint *b, *S;
-#else
-	(Bigint *b, Bigint *S)
-#endif
-{
-	int n;
-	ULong *bx, *bxe, q, *sx, *sxe;
-#ifdef ULLong
-	ULLong borrow, carry, y, ys;
-#else
-	ULong borrow, carry, y, ys;
-#ifdef Pack_32
-	ULong si, z, zs;
-#endif
-#endif
-
-	n = S->wds;
-#ifdef DEBUG
-	/*debug*/ if (b->wds > n)
-	/*debug*/	Bug("oversize b in quorem");
-#endif
-	if (b->wds < n)
-		return 0;
-	sx = S->x;
-	sxe = sx + --n;
-	bx = b->x;
-	bxe = bx + n;
-	q = *bxe / (*sxe + 1);	/* ensure q <= true quotient */
-#ifdef DEBUG
-	/*debug*/ if (q > 9)
-	/*debug*/	Bug("oversized quotient in quorem");
-#endif
-	if (q) {
-		borrow = 0;
-		carry = 0;
-		do {
-#ifdef ULLong
-			ys = *sx++ * (ULLong)q + carry;
-			carry = ys >> 32;
-			y = *bx - (ys & 0xffffffffUL) - borrow;
-			borrow = y >> 32 & 1UL;
-			*bx++ = y & 0xffffffffUL;
-#else
-#ifdef Pack_32
-			si = *sx++;
-			ys = (si & 0xffff) * q + carry;
-			zs = (si >> 16) * q + (ys >> 16);
-			carry = zs >> 16;
-			y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			z = (*bx >> 16) - (zs & 0xffff) - borrow;
-			borrow = (z & 0x10000) >> 16;
-			Storeinc(bx, z, y);
-#else
-			ys = *sx++ * q + carry;
-			carry = ys >> 16;
-			y = *bx - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			*bx++ = y & 0xffff;
-#endif
-#endif
-			}
-			while(sx <= sxe);
-		if (!*bxe) {
-			bx = b->x;
-			while(--bxe > bx && !*bxe)
-				--n;
-			b->wds = n;
-			}
-		}
-	if (cmp(b, S) >= 0) {
-		q++;
-		borrow = 0;
-		carry = 0;
-		bx = b->x;
-		sx = S->x;
-		do {
-#ifdef ULLong
-			ys = *sx++ + carry;
-			carry = ys >> 32;
-			y = *bx - (ys & 0xffffffffUL) - borrow;
-			borrow = y >> 32 & 1UL;
-			*bx++ = y & 0xffffffffUL;
-#else
-#ifdef Pack_32
-			si = *sx++;
-			ys = (si & 0xffff) + carry;
-			zs = (si >> 16) + (ys >> 16);
-			carry = zs >> 16;
-			y = (*bx & 0xffff) - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			z = (*bx >> 16) - (zs & 0xffff) - borrow;
-			borrow = (z & 0x10000) >> 16;
-			Storeinc(bx, z, y);
-#else
-			ys = *sx++ + carry;
-			carry = ys >> 16;
-			y = *bx - (ys & 0xffff) - borrow;
-			borrow = (y & 0x10000) >> 16;
-			*bx++ = y & 0xffff;
-#endif
-#endif
-			}
-			while(sx <= sxe);
-		bx = b->x;
-		bxe = bx + n;
-		if (!*bxe) {
-			while(--bxe > bx && !*bxe)
-				--n;
-			b->wds = n;
-			}
-		}
-	return q;
-	}
diff --git a/lib/libc/gdtoa/dtoa.c b/lib/libc/gdtoa/dtoa.c
deleted file mode 100644
index 20e2405..0000000
--- a/lib/libc/gdtoa/dtoa.c
+++ /dev/null
@@ -1,759 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
- *
- * Inspired by "How to Print Floating-Point Numbers Accurately" by
- * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 92-101].
- *
- * Modifications:
- *	1. Rather than iterating, we use a simple numeric overestimate
- *	   to determine k = floor(log10(d)).  We scale relevant
- *	   quantities using O(log2(k)) rather than O(k) multiplications.
- *	2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
- *	   try to generate digits strictly left to right.  Instead, we
- *	   compute with fewer bits and propagate the carry if necessary
- *	   when rounding the final digit up.  This is often faster.
- *	3. Under the assumption that input will be rounded nearest,
- *	   mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
- *	   That is, we allow equality in stopping tests when the
- *	   round-nearest rule will give the same floating-point value
- *	   as would satisfaction of the stopping test with strict
- *	   inequality.
- *	4. We remove common factors of powers of 2 from relevant
- *	   quantities.
- *	5. When converting floating-point integers less than 1e16,
- *	   we use floating-point arithmetic rather than resorting
- *	   to multiple-precision integers.
- *	6. When asked to produce fewer than 15 digits, we first try
- *	   to get by with floating-point arithmetic; we resort to
- *	   multiple-precision integer arithmetic only if we cannot
- *	   guarantee that the floating-point calculation has given
- *	   the correctly rounded result.  For k requested digits and
- *	   "uniformly" distributed input, the probability is
- *	   something like 10^(k-15) that we must resort to the Long
- *	   calculation.
- */
-
-#ifdef Honor_FLT_ROUNDS
-#define Rounding rounding
-#undef Check_FLT_ROUNDS
-#define Check_FLT_ROUNDS
-#else
-#define Rounding Flt_Rounds
-#endif
-
- char *
-dtoa
-#ifdef KR_headers
-	(d, mode, ndigits, decpt, sign, rve)
-	double d; int mode, ndigits, *decpt, *sign; char **rve;
-#else
-	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
-#endif
-{
- /*	Arguments ndigits, decpt, sign are similar to those
-	of ecvt and fcvt; trailing zeros are suppressed from
-	the returned string.  If not null, *rve is set to point
-	to the end of the return value.  If d is +-Infinity or NaN,
-	then *decpt is set to 9999.
-
-	mode:
-		0 ==> shortest string that yields d when read in
-			and rounded to nearest.
-		1 ==> like 0, but with Steele & White stopping rule;
-			e.g. with IEEE P754 arithmetic , mode 0 gives
-			1e23 whereas mode 1 gives 9.999999999999999e22.
-		2 ==> max(1,ndigits) significant digits.  This gives a
-			return value similar to that of ecvt, except
-			that trailing zeros are suppressed.
-		3 ==> through ndigits past the decimal point.  This
-			gives a return value similar to that from fcvt,
-			except that trailing zeros are suppressed, and
-			ndigits can be negative.
-		4,5 ==> similar to 2 and 3, respectively, but (in
-			round-nearest mode) with the tests of mode 0 to
-			possibly return a shorter string that rounds to d.
-			With IEEE arithmetic and compilation with
-			-DHonor_FLT_ROUNDS, modes 4 and 5 behave the same
-			as modes 2 and 3 when FLT_ROUNDS != 1.
-		6-9 ==> Debugging modes similar to mode - 4:  don't try
-			fast floating-point estimate (if applicable).
-
-		Values of mode other than 0-9 are treated as mode 0.
-
-		Sufficient space is allocated to the return value
-		to hold the suppressed trailing zeros.
-	*/
-
-	int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
-		j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
-		spec_case, try_quick;
-	Long L;
-#ifndef Sudden_Underflow
-	int denorm;
-	ULong x;
-#endif
-	Bigint *b, *b1, *delta, *mlo, *mhi, *S;
-	double d2, ds, eps;
-	char *s, *s0;
-#ifdef Honor_FLT_ROUNDS
-	int rounding;
-#endif
-#ifdef SET_INEXACT
-	int inexact, oldinexact;
-#endif
-
-#ifndef MULTIPLE_THREADS
-	if (dtoa_result) {
-		freedtoa(dtoa_result);
-		dtoa_result = 0;
-		}
-#endif
-
-	if (word0(d) & Sign_bit) {
-		/* set sign for everything, including 0's and NaNs */
-		*sign = 1;
-		word0(d) &= ~Sign_bit;	/* clear sign bit */
-		}
-	else
-		*sign = 0;
-
-#if defined(IEEE_Arith) + defined(VAX)
-#ifdef IEEE_Arith
-	if ((word0(d) & Exp_mask) == Exp_mask)
-#else
-	if (word0(d)  == 0x8000)
-#endif
-		{
-		/* Infinity or NaN */
-		*decpt = 9999;
-#ifdef IEEE_Arith
-		if (!word1(d) && !(word0(d) & 0xfffff))
-			return nrv_alloc("Infinity", rve, 8);
-#endif
-		return nrv_alloc("NaN", rve, 3);
-		}
-#endif
-#ifdef IBM
-	dval(d) += 0; /* normalize */
-#endif
-	if (!dval(d)) {
-		*decpt = 1;
-		return nrv_alloc("0", rve, 1);
-		}
-
-#ifdef SET_INEXACT
-	try_quick = oldinexact = get_inexact();
-	inexact = 1;
-#endif
-#ifdef Honor_FLT_ROUNDS
-	if ((rounding = Flt_Rounds) >= 2) {
-		if (*sign)
-			rounding = rounding == 2 ? 0 : 2;
-		else
-			if (rounding != 2)
-				rounding = 0;
-		}
-#endif
-
-	b = d2b(dval(d), &be, &bbits);
-#ifdef Sudden_Underflow
-	i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
-#else
-	if (( i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1)) )!=0) {
-#endif
-		dval(d2) = dval(d);
-		word0(d2) &= Frac_mask1;
-		word0(d2) |= Exp_11;
-#ifdef IBM
-		if (( j = 11 - hi0bits(word0(d2) & Frac_mask) )!=0)
-			dval(d2) /= 1 << j;
-#endif
-
-		/* log(x)	~=~ log(1.5) + (x-1.5)/1.5
-		 * log10(x)	 =  log(x) / log(10)
-		 *		~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
-		 * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2)
-		 *
-		 * This suggests computing an approximation k to log10(d) by
-		 *
-		 * k = (i - Bias)*0.301029995663981
-		 *	+ ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
-		 *
-		 * We want k to be too large rather than too small.
-		 * The error in the first-order Taylor series approximation
-		 * is in our favor, so we just round up the constant enough
-		 * to compensate for any error in the multiplication of
-		 * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
-		 * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
-		 * adding 1e-13 to the constant term more than suffices.
-		 * Hence we adjust the constant term to 0.1760912590558.
-		 * (We could get a more accurate k by invoking log10,
-		 *  but this is probably not worthwhile.)
-		 */
-
-		i -= Bias;
-#ifdef IBM
-		i <<= 2;
-		i += j;
-#endif
-#ifndef Sudden_Underflow
-		denorm = 0;
-		}
-	else {
-		/* d is denormalized */
-
-		i = bbits + be + (Bias + (P-1) - 1);
-		x = i > 32  ? word0(d) << 64 - i | word1(d) >> i - 32
-			    : word1(d) << 32 - i;
-		dval(d2) = x;
-		word0(d2) -= 31*Exp_msk1; /* adjust exponent */
-		i -= (Bias + (P-1) - 1) + 1;
-		denorm = 1;
-		}
-#endif
-	ds = (dval(d2)-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
-	k = (int)ds;
-	if (ds < 0. && ds != k)
-		k--;	/* want k = floor(ds) */
-	k_check = 1;
-	if (k >= 0 && k <= Ten_pmax) {
-		if (dval(d) < tens[k])
-			k--;
-		k_check = 0;
-		}
-	j = bbits - i - 1;
-	if (j >= 0) {
-		b2 = 0;
-		s2 = j;
-		}
-	else {
-		b2 = -j;
-		s2 = 0;
-		}
-	if (k >= 0) {
-		b5 = 0;
-		s5 = k;
-		s2 += k;
-		}
-	else {
-		b2 -= k;
-		b5 = -k;
-		s5 = 0;
-		}
-	if (mode < 0 || mode > 9)
-		mode = 0;
-
-#ifndef SET_INEXACT
-#ifdef Check_FLT_ROUNDS
-	try_quick = Rounding == 1;
-#else
-	try_quick = 1;
-#endif
-#endif /*SET_INEXACT*/
-
-	if (mode > 5) {
-		mode -= 4;
-		try_quick = 0;
-		}
-	leftright = 1;
-	switch(mode) {
-		case 0:
-		case 1:
-			ilim = ilim1 = -1;
-			i = 18;
-			ndigits = 0;
-			break;
-		case 2:
-			leftright = 0;
-			/* no break */
-		case 4:
-			if (ndigits <= 0)
-				ndigits = 1;
-			ilim = ilim1 = i = ndigits;
-			break;
-		case 3:
-			leftright = 0;
-			/* no break */
-		case 5:
-			i = ndigits + k + 1;
-			ilim = i;
-			ilim1 = i - 1;
-			if (i <= 0)
-				i = 1;
-		}
-	s = s0 = rv_alloc(i);
-
-#ifdef Honor_FLT_ROUNDS
-	if (mode > 1 && rounding != 1)
-		leftright = 0;
-#endif
-
-	if (ilim >= 0 && ilim <= Quick_max && try_quick) {
-
-		/* Try to get by with floating-point arithmetic. */
-
-		i = 0;
-		dval(d2) = dval(d);
-		k0 = k;
-		ilim0 = ilim;
-		ieps = 2; /* conservative */
-		if (k > 0) {
-			ds = tens[k&0xf];
-			j = k >> 4;
-			if (j & Bletch) {
-				/* prevent overflows */
-				j &= Bletch - 1;
-				dval(d) /= bigtens[n_bigtens-1];
-				ieps++;
-				}
-			for(; j; j >>= 1, i++)
-				if (j & 1) {
-					ieps++;
-					ds *= bigtens[i];
-					}
-			dval(d) /= ds;
-			}
-		else if (( j1 = -k )!=0) {
-			dval(d) *= tens[j1 & 0xf];
-			for(j = j1 >> 4; j; j >>= 1, i++)
-				if (j & 1) {
-					ieps++;
-					dval(d) *= bigtens[i];
-					}
-			}
-		if (k_check && dval(d) < 1. && ilim > 0) {
-			if (ilim1 <= 0)
-				goto fast_failed;
-			ilim = ilim1;
-			k--;
-			dval(d) *= 10.;
-			ieps++;
-			}
-		dval(eps) = ieps*dval(d) + 7.;
-		word0(eps) -= (P-1)*Exp_msk1;
-		if (ilim == 0) {
-			S = mhi = 0;
-			dval(d) -= 5.;
-			if (dval(d) > dval(eps))
-				goto one_digit;
-			if (dval(d) < -dval(eps))
-				goto no_digits;
-			goto fast_failed;
-			}
-#ifndef No_leftright
-		if (leftright) {
-			/* Use Steele & White method of only
-			 * generating digits needed.
-			 */
-			dval(eps) = 0.5/tens[ilim-1] - dval(eps);
-			for(i = 0;;) {
-				L = dval(d);
-				dval(d) -= L;
-				*s++ = '0' + (int)L;
-				if (dval(d) < dval(eps))
-					goto ret1;
-				if (1. - dval(d) < dval(eps))
-					goto bump_up;
-				if (++i >= ilim)
-					break;
-				dval(eps) *= 10.;
-				dval(d) *= 10.;
-				}
-			}
-		else {
-#endif
-			/* Generate ilim digits, then fix them up. */
-			dval(eps) *= tens[ilim-1];
-			for(i = 1;; i++, dval(d) *= 10.) {
-				L = (Long)(dval(d));
-				if (!(dval(d) -= L))
-					ilim = i;
-				*s++ = '0' + (int)L;
-				if (i == ilim) {
-					if (dval(d) > 0.5 + dval(eps))
-						goto bump_up;
-					else if (dval(d) < 0.5 - dval(eps)) {
-						while(*--s == '0');
-						s++;
-						goto ret1;
-						}
-					break;
-					}
-				}
-#ifndef No_leftright
-			}
-#endif
- fast_failed:
-		s = s0;
-		dval(d) = dval(d2);
-		k = k0;
-		ilim = ilim0;
-		}
-
-	/* Do we have a "small" integer? */
-
-	if (be >= 0 && k <= Int_max) {
-		/* Yes. */
-		ds = tens[k];
-		if (ndigits < 0 && ilim <= 0) {
-			S = mhi = 0;
-			if (ilim < 0 || dval(d) <= 5*ds)
-				goto no_digits;
-			goto one_digit;
-			}
-		for(i = 1;; i++, dval(d) *= 10.) {
-			L = (Long)(dval(d) / ds);
-			dval(d) -= L*ds;
-#ifdef Check_FLT_ROUNDS
-			/* If FLT_ROUNDS == 2, L will usually be high by 1 */
-			if (dval(d) < 0) {
-				L--;
-				dval(d) += ds;
-				}
-#endif
-			*s++ = '0' + (int)L;
-			if (!dval(d)) {
-#ifdef SET_INEXACT
-				inexact = 0;
-#endif
-				break;
-				}
-			if (i == ilim) {
-#ifdef Honor_FLT_ROUNDS
-				if (mode > 1)
-				switch(rounding) {
-				  case 0: goto ret1;
-				  case 2: goto bump_up;
-				  }
-#endif
-				dval(d) += dval(d);
-				if (dval(d) > ds || dval(d) == ds && L & 1) {
- bump_up:
-					while(*--s == '9')
-						if (s == s0) {
-							k++;
-							*s = '0';
-							break;
-							}
-					++*s++;
-					}
-				break;
-				}
-			}
-		goto ret1;
-		}
-
-	m2 = b2;
-	m5 = b5;
-	mhi = mlo = 0;
-	if (leftright) {
-		i =
-#ifndef Sudden_Underflow
-			denorm ? be + (Bias + (P-1) - 1 + 1) :
-#endif
-#ifdef IBM
-			1 + 4*P - 3 - bbits + ((bbits + be - 1) & 3);
-#else
-			1 + P - bbits;
-#endif
-		b2 += i;
-		s2 += i;
-		mhi = i2b(1);
-		}
-	if (m2 > 0 && s2 > 0) {
-		i = m2 < s2 ? m2 : s2;
-		b2 -= i;
-		m2 -= i;
-		s2 -= i;
-		}
-	if (b5 > 0) {
-		if (leftright) {
-			if (m5 > 0) {
-				mhi = pow5mult(mhi, m5);
-				b1 = mult(mhi, b);
-				Bfree(b);
-				b = b1;
-				}
-			if (( j = b5 - m5 )!=0)
-				b = pow5mult(b, j);
-			}
-		else
-			b = pow5mult(b, b5);
-		}
-	S = i2b(1);
-	if (s5 > 0)
-		S = pow5mult(S, s5);
-
-	/* Check for special case that d is a normalized power of 2. */
-
-	spec_case = 0;
-	if ((mode < 2 || leftright)
-#ifdef Honor_FLT_ROUNDS
-			&& rounding == 1
-#endif
-				) {
-		if (!word1(d) && !(word0(d) & Bndry_mask)
-#ifndef Sudden_Underflow
-		 && word0(d) & (Exp_mask & ~Exp_msk1)
-#endif
-				) {
-			/* The special case */
-			b2 += Log2P;
-			s2 += Log2P;
-			spec_case = 1;
-			}
-		}
-
-	/* Arrange for convenient computation of quotients:
-	 * shift left if necessary so divisor has 4 leading 0 bits.
-	 *
-	 * Perhaps we should just compute leading 28 bits of S once
-	 * and for all and pass them and a shift to quorem, so it
-	 * can do shifts and ors to compute the numerator for q.
-	 */
-#ifdef Pack_32
-	if (( i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f )!=0)
-		i = 32 - i;
-#else
-	if (( i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0xf )!=0)
-		i = 16 - i;
-#endif
-	if (i > 4) {
-		i -= 4;
-		b2 += i;
-		m2 += i;
-		s2 += i;
-		}
-	else if (i < 4) {
-		i += 28;
-		b2 += i;
-		m2 += i;
-		s2 += i;
-		}
-	if (b2 > 0)
-		b = lshift(b, b2);
-	if (s2 > 0)
-		S = lshift(S, s2);
-	if (k_check) {
-		if (cmp(b,S) < 0) {
-			k--;
-			b = multadd(b, 10, 0);	/* we botched the k estimate */
-			if (leftright)
-				mhi = multadd(mhi, 10, 0);
-			ilim = ilim1;
-			}
-		}
-	if (ilim <= 0 && (mode == 3 || mode == 5)) {
-		if (ilim < 0 || cmp(b,S = multadd(S,5,0)) <= 0) {
-			/* no digits, fcvt style */
- no_digits:
-			k = -1 - ndigits;
-			goto ret;
-			}
- one_digit:
-		*s++ = '1';
-		k++;
-		goto ret;
-		}
-	if (leftright) {
-		if (m2 > 0)
-			mhi = lshift(mhi, m2);
-
-		/* Compute mlo -- check for special case
-		 * that d is a normalized power of 2.
-		 */
-
-		mlo = mhi;
-		if (spec_case) {
-			mhi = Balloc(mhi->k);
-			Bcopy(mhi, mlo);
-			mhi = lshift(mhi, Log2P);
-			}
-
-		for(i = 1;;i++) {
-			dig = quorem(b,S) + '0';
-			/* Do we yet have the shortest decimal string
-			 * that will round to d?
-			 */
-			j = cmp(b, mlo);
-			delta = diff(S, mhi);
-			j1 = delta->sign ? 1 : cmp(b, delta);
-			Bfree(delta);
-#ifndef ROUND_BIASED
-			if (j1 == 0 && mode != 1 && !(word1(d) & 1)
-#ifdef Honor_FLT_ROUNDS
-				&& rounding >= 1
-#endif
-								   ) {
-				if (dig == '9')
-					goto round_9_up;
-				if (j > 0)
-					dig++;
-#ifdef SET_INEXACT
-				else if (!b->x[0] && b->wds <= 1)
-					inexact = 0;
-#endif
-				*s++ = dig;
-				goto ret;
-				}
-#endif
-			if (j < 0 || j == 0 && mode != 1
-#ifndef ROUND_BIASED
-							&& !(word1(d) & 1)
-#endif
-					) {
-				if (!b->x[0] && b->wds <= 1) {
-#ifdef SET_INEXACT
-					inexact = 0;
-#endif
-					goto accept_dig;
-					}
-#ifdef Honor_FLT_ROUNDS
-				if (mode > 1)
-				 switch(rounding) {
-				  case 0: goto accept_dig;
-				  case 2: goto keep_dig;
-				  }
-#endif /*Honor_FLT_ROUNDS*/
-				if (j1 > 0) {
-					b = lshift(b, 1);
-					j1 = cmp(b, S);
-					if ((j1 > 0 || j1 == 0 && dig & 1)
-					&& dig++ == '9')
-						goto round_9_up;
-					}
- accept_dig:
-				*s++ = dig;
-				goto ret;
-				}
-			if (j1 > 0) {
-#ifdef Honor_FLT_ROUNDS
-				if (!rounding)
-					goto accept_dig;
-#endif
-				if (dig == '9') { /* possible if i == 1 */
- round_9_up:
-					*s++ = '9';
-					goto roundoff;
-					}
-				*s++ = dig + 1;
-				goto ret;
-				}
-#ifdef Honor_FLT_ROUNDS
- keep_dig:
-#endif
-			*s++ = dig;
-			if (i == ilim)
-				break;
-			b = multadd(b, 10, 0);
-			if (mlo == mhi)
-				mlo = mhi = multadd(mhi, 10, 0);
-			else {
-				mlo = multadd(mlo, 10, 0);
-				mhi = multadd(mhi, 10, 0);
-				}
-			}
-		}
-	else
-		for(i = 1;; i++) {
-			*s++ = dig = quorem(b,S) + '0';
-			if (!b->x[0] && b->wds <= 1) {
-#ifdef SET_INEXACT
-				inexact = 0;
-#endif
-				goto ret;
-				}
-			if (i >= ilim)
-				break;
-			b = multadd(b, 10, 0);
-			}
-
-	/* Round off last digit */
-
-#ifdef Honor_FLT_ROUNDS
-	switch(rounding) {
-	  case 0: goto trimzeros;
-	  case 2: goto roundoff;
-	  }
-#endif
-	b = lshift(b, 1);
-	j = cmp(b, S);
-	if (j > 0 || j == 0 && dig & 1) {
- roundoff:
-		while(*--s == '9')
-			if (s == s0) {
-				k++;
-				*s++ = '1';
-				goto ret;
-				}
-		++*s++;
-		}
-	else {
- trimzeros:
-		while(*--s == '0');
-		s++;
-		}
- ret:
-	Bfree(S);
-	if (mhi) {
-		if (mlo && mlo != mhi)
-			Bfree(mlo);
-		Bfree(mhi);
-		}
- ret1:
-#ifdef SET_INEXACT
-	if (inexact) {
-		if (!oldinexact) {
-			word0(d) = Exp_1 + (70 << Exp_shift);
-			word1(d) = 0;
-			dval(d) += 1.;
-			}
-		}
-	else if (!oldinexact)
-		clear_inexact();
-#endif
-	Bfree(b);
-	*s = 0;
-	*decpt = k + 1;
-	if (rve)
-		*rve = s;
-	return s0;
-	}
diff --git a/lib/libc/gdtoa/g_Qfmt.c b/lib/libc/gdtoa/g_Qfmt.c
deleted file mode 100644
index 896b9d4..0000000
--- a/lib/libc/gdtoa/g_Qfmt.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_MC68k or IEEE_8087 should be #defined */
-
-#ifdef IEEE_MC68k
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#endif
-#ifdef IEEE_8087
-#define _0 3
-#define _1 2
-#define _2 1
-#define _3 0
-#endif
-
- char*
-#ifdef KR_headers
-g_Qfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize;
-#else
-g_Qfmt(char *buf, void *V, int ndig, unsigned bufsize)
-#endif
-{
-	static FPI fpi = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[4], *L, sign;
-	int decpt, ex, i, mode;
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (ULong*)V;
-	sign = L[_0] & 0x80000000L;
-	bits[3] = L[_0] & 0xffff;
-	bits[2] = L[_1];
-	bits[1] = L[_2];
-	bits[0] = L[_3];
-	b = buf;
-	if ( (ex = (L[_0] & 0x7fff0000L) >> 16) !=0) {
-		if (ex == 0x7fff) {
-			/* Infinity or NaN */
-			if (bits[0] | bits[1] | bits[2] | bits[3])
-				b = strcpy(b, "NaN");
-			else {
-				b = buf;
-				if (sign)
-					*b++ = '-';
-				b = strcp(b, "Infinity");
-				}
-			return b;
-			}
-		i = STRTOG_Normal;
-		bits[3] |= 0x10000;
-		}
-	else if (bits[0] | bits[1] | bits[2] | bits[3]) {
-		i = STRTOG_Denormal;
-		ex = 1;
-		}
-	else {
-#ifndef IGNORE_ZERO_SIGN
-		if (sign)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	ex -= 0x3fff + 112;
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < 48)
-			return 0;
-		mode = 0;
-		}
-	s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	return g__fmt(buf, s, se, decpt, sign);
-	}
diff --git a/lib/libc/gdtoa/g__fmt.c b/lib/libc/gdtoa/g__fmt.c
deleted file mode 100644
index 6274681..0000000
--- a/lib/libc/gdtoa/g__fmt.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	dmg@acm.org
- */
-
-#include "gdtoaimp.h"
-
-#ifdef USE_LOCALE
-#include "locale.h"
-#endif
-
- char *
-#ifdef KR_headers
-g__fmt(b, s, se, decpt, sign) char *b; char *s; char *se; int decpt; ULong sign;
-#else
-g__fmt(char *b, char *s, char *se, int decpt, ULong sign)
-#endif
-{
-	int i, j, k;
-	char *s0 = s;
-#ifdef USE_LOCALE
-	char decimalpoint = *localeconv()->decimal_point;
-#else
-#define decimalpoint '.'
-#endif
-	if (sign)
-		*b++ = '-';
-	if (decpt <= -4 || decpt > se - s + 5) {
-		*b++ = *s++;
-		if (*s) {
-			*b++ = decimalpoint;
-			while((*b = *s++) !=0)
-				b++;
-			}
-		*b++ = 'e';
-		/* sprintf(b, "%+.2d", decpt - 1); */
-		if (--decpt < 0) {
-			*b++ = '-';
-			decpt = -decpt;
-			}
-		else
-			*b++ = '+';
-		for(j = 2, k = 10; 10*k <= decpt; j++, k *= 10){}
-		for(;;) {
-			i = decpt / k;
-			*b++ = i + '0';
-			if (--j <= 0)
-				break;
-			decpt -= i*k;
-			decpt *= 10;
-			}
-		*b = 0;
-		}
-	else if (decpt <= 0) {
-		*b++ = decimalpoint;
-		for(; decpt < 0; decpt++)
-			*b++ = '0';
-		while((*b = *s++) !=0)
-			b++;
-		}
-	else {
-		while((*b = *s++) !=0) {
-			b++;
-			if (--decpt == 0 && *s)
-				*b++ = decimalpoint;
-			}
-		for(; decpt > 0; decpt--)
-			*b++ = '0';
-		*b = 0;
-		}
-	freedtoa(s0);
-	return b;
- 	}
diff --git a/lib/libc/gdtoa/g_ddfmt.c b/lib/libc/gdtoa/g_ddfmt.c
deleted file mode 100644
index 7d214ba..0000000
--- a/lib/libc/gdtoa/g_ddfmt.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-#include <string.h>
-
- char *
-#ifdef KR_headers
-g_ddfmt(buf, dd, ndig, bufsize) char *buf; double *dd; int ndig; unsigned bufsize;
-#else
-g_ddfmt(char *buf, double *dd, int ndig, unsigned bufsize)
-#endif
-{
-	FPI fpi;
-	char *b, *s, *se;
-	ULong *L, bits0[4], *bits, *zx;
-	int bx, by, decpt, ex, ey, i, j, mode;
-	Bigint *x, *y, *z;
-	double ddx[2];
-
-	if (bufsize < 10 || bufsize < ndig + 8)
-		return 0;
-
-	L = (ULong*)dd;
-	if ((L[_0] & 0x7ff00000L) == 0x7ff00000L) {
-		/* Infinity or NaN */
-		if (L[_0] & 0xfffff || L[_1]) {
- nanret:
-			return strcp(buf, "NaN");
-			}
-		if ((L[2+_0] & 0x7ff00000) == 0x7ff00000) {
-			if (L[2+_0] & 0xfffff || L[2+_1])
-				goto nanret;
-			if ((L[_0] ^ L[2+_0]) & 0x80000000L)
-				goto nanret;	/* Infinity - Infinity */
-			}
- infret:
-		b = buf;
-		if (L[_0] & 0x80000000L)
-			*b++ = '-';
-		return strcp(b, "Infinity");
-		}
-	if ((L[2+_0] & 0x7ff00000) == 0x7ff00000) {
-		L += 2;
-		if (L[_0] & 0xfffff || L[_1])
-			goto nanret;
-		goto infret;
-		}
-	if (dd[0] + dd[1] == 0.) {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (L[_0] & L[2+_0] & 0x80000000L)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	if ((L[_0] & 0x7ff00000L) < (L[2+_0] & 0x7ff00000L)) {
-		ddx[1] = dd[0];
-		ddx[0] = dd[1];
-		dd = ddx;
-		L = (ULong*)dd;
-		}
-	z = d2b(dd[0], &ex, &bx);
-	if (dd[1] == 0.)
-		goto no_y;
-	x = z;
-	y = d2b(dd[1], &ey, &by);
-	if ( (i = ex - ey) !=0) {
-		if (i > 0) {
-			x = lshift(x, i);
-			ex = ey;
-			}
-		else
-			y = lshift(y, -i);
-		}
-	if ((L[_0] ^ L[2+_0]) & 0x80000000L) {
-		z = diff(x, y);
-		if (L[_0] & 0x80000000L)
-			z->sign = 1 - z->sign;
-		}
-	else {
-		z = sum(x, y);
-		if (L[_0] & 0x80000000L)
-			z->sign = 1;
-		}
-	Bfree(x);
-	Bfree(y);
- no_y:
-	bits = zx = z->x;
-	for(i = 0; !*zx; zx++)
-		i += 32;
-	i += lo0bits(zx);
-	if (i) {
-		rshift(z, i);
-		ex += i;
-		}
-	fpi.nbits = z->wds * 32 - hi0bits(z->x[j = z->wds-1]);
-	if (fpi.nbits < 106) {
-		fpi.nbits = 106;
-		if (j < 3) {
-			for(i = 0; i <= j; i++)
-				bits0[i] = bits[i];
-			while(i < 4)
-				bits0[i++] = 0;
-			bits = bits0;
-			}
-		}
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < (int)(fpi.nbits * .301029995664) + 10) {
-			Bfree(z);
-			return 0;
-			}
-		mode = 0;
-		}
-	fpi.emin = 1-1023-53+1;
-	fpi.emax = 2046-1023-106+1;
-	fpi.rounding = FPI_Round_near;
-	fpi.sudden_underflow = 0;
-	i = STRTOG_Normal;
-	s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	b = g__fmt(buf, s, se, decpt, z->sign);
-	Bfree(z);
-	return b;
-	}
diff --git a/lib/libc/gdtoa/g_dfmt.c b/lib/libc/gdtoa/g_dfmt.c
deleted file mode 100644
index 1ade834..0000000
--- a/lib/libc/gdtoa/g_dfmt.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- char*
-#ifdef KR_headers
-g_dfmt(buf, d, ndig, bufsize) char *buf; double *d; int ndig; unsigned bufsize;
-#else
-g_dfmt(char *buf, double *d, int ndig, unsigned bufsize)
-#endif
-{
-	static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[2], *L, sign;
-	int decpt, ex, i, mode;
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (ULong*)d;
-	sign = L[_0] & 0x80000000L;
-	if ((L[_0] & 0x7ff00000) == 0x7ff00000) {
-		/* Infinity or NaN */
-		if (L[_0] & 0xfffff || L[_1]) {
-			return strcp(buf, "NaN");
-			}
-		b = buf;
-		if (sign)
-			*b++ = '-';
-		return strcp(b, "Infinity");
-		}
-	if (L[_1] == 0 && (L[_0] ^ sign) == 0 /*d == 0.*/) {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (L[_0] & 0x80000000L)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	bits[0] = L[_1];
-	bits[1] = L[_0] & 0xfffff;
-	if ( (ex = (L[_0] >> 20) & 0x7ff) !=0)
-		bits[1] |= 0x100000;
-	else
-		ex = 1;
-	ex -= 0x3ff + 52;
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < 25)
-			return 0;
-		mode = 0;
-		}
-	i = STRTOG_Normal;
-	s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	return g__fmt(buf, s, se, decpt, sign);
-	}
diff --git a/lib/libc/gdtoa/g_ffmt.c b/lib/libc/gdtoa/g_ffmt.c
deleted file mode 100644
index 851394a..0000000
--- a/lib/libc/gdtoa/g_ffmt.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- char*
-#ifdef KR_headers
-g_ffmt(buf, f, ndig, bufsize) char *buf; float *f; int ndig; unsigned bufsize;
-#else
-g_ffmt(char *buf, float *f, int ndig, unsigned bufsize)
-#endif
-{
-	static FPI fpi = { 24, 1-127-24+1,  254-127-24+1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[1], *L, sign;
-	int decpt, ex, i, mode;
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (ULong*)f;
-	sign = L[0] & 0x80000000L;
-	if ((L[0] & 0x7f800000) == 0x7f800000) {
-		/* Infinity or NaN */
-		if (L[0] & 0x7fffff) {
-			return strcp(buf, "NaN");
-			}
-		b = buf;
-		if (sign)
-			*b++ = '-';
-		return strcp(b, "Infinity");
-		}
-	if (*f == 0.) {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (L[0] & 0x80000000L)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	bits[0] = L[0] & 0x7fffff;
-	if ( (ex = (L[0] >> 23) & 0xff) !=0)
-		bits[0] |= 0x800000;
-	else
-		ex = 1;
-	ex -= 0x7f + 23;
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < 16)
-			return 0;
-		mode = 0;
-		}
-	i = STRTOG_Normal;
-	s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	return g__fmt(buf, s, se, decpt, sign);
-	}
diff --git a/lib/libc/gdtoa/g_xLfmt.c b/lib/libc/gdtoa/g_xLfmt.c
deleted file mode 100644
index fc17643..0000000
--- a/lib/libc/gdtoa/g_xLfmt.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_MC68k or IEEE_8087 should be #defined */
-
-#ifdef IEEE_MC68k
-#define _0 0
-#define _1 1
-#define _2 2
-#endif
-#ifdef IEEE_8087
-#define _0 2
-#define _1 1
-#define _2 0
-#endif
-
- char*
-#ifdef KR_headers
-g_xLfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize;
-#else
-g_xLfmt(char *buf, void *V, int ndig, unsigned bufsize)
-#endif
-{
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[2], *L, sign;
-	int decpt, ex, i, mode;
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (ULong*)V;
-	sign = L[_0] & 0x80000000L;
-	bits[1] = L[_1];
-	bits[0] = L[_2];
-	if ( (ex = (L[_0] >> 16) & 0x7fff) !=0) {
-		if (ex == 0x7fff) {
-			/* Infinity or NaN */
-			if (bits[0] | bits[1])
-				b = strcp(buf, "NaN");
-			else {
-				b = buf;
-				if (sign)
-					*b++ = '-';
-				b = strcp(b, "Infinity");
-				}
-			return b;
-			}
-		i = STRTOG_Normal;
-		}
-	else if (bits[0] | bits[1]) {
-		i = STRTOG_Denormal;
-		}
-	else {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (sign)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	ex -= 0x3fff + 63;
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < 32)
-			return 0;
-		mode = 0;
-		}
-	s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	return g__fmt(buf, s, se, decpt, sign);
-	}
diff --git a/lib/libc/gdtoa/g_xfmt.c b/lib/libc/gdtoa/g_xfmt.c
deleted file mode 100644
index 1e2a381..0000000
--- a/lib/libc/gdtoa/g_xfmt.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_MC68k or IEEE_8087 should be #defined */
-
-#ifdef IEEE_MC68k
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#define _4 4
-#endif
-#ifdef IEEE_8087
-#define _0 4
-#define _1 3
-#define _2 2
-#define _3 1
-#define _4 0
-#endif
-
- char*
-#ifdef KR_headers
-g_xfmt(buf, V, ndig, bufsize) char *buf; char *V; int ndig; unsigned bufsize;
-#else
-g_xfmt(char *buf, void *V, int ndig, unsigned bufsize)
-#endif
-{
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 };
-	char *b, *s, *se;
-	ULong bits[2], sign;
-	UShort *L;
-	int decpt, ex, i, mode;
-
-	if (ndig < 0)
-		ndig = 0;
-	if (bufsize < ndig + 10)
-		return 0;
-
-	L = (UShort *)V;
-	sign = L[_0] & 0x8000;
-	bits[1] = (L[_1] << 16) | L[_2];
-	bits[0] = (L[_3] << 16) | L[_4];
-	if ( (ex = L[_0] & 0x7fff) !=0) {
-		if (ex == 0x7fff) {
-			/* Infinity or NaN */
-			if (bits[0] | bits[1])
-				b = strcp(buf, "NaN");
-			else {
-				b = buf;
-				if (sign)
-					*b++ = '-';
-				b = strcp(b, "Infinity");
-				}
-			return b;
-			}
-		i = STRTOG_Normal;
-		}
-	else if (bits[0] | bits[1]) {
-		i = STRTOG_Denormal;
-		}
-	else {
-		b = buf;
-#ifndef IGNORE_ZERO_SIGN
-		if (sign)
-			*b++ = '-';
-#endif
-		*b++ = '0';
-		*b = 0;
-		return b;
-		}
-	ex -= 0x3fff + 63;
-	mode = 2;
-	if (ndig <= 0) {
-		if (bufsize < 32)
-			return 0;
-		mode = 0;
-		}
-	s = gdtoa(&fpi, ex, bits, &i, mode, ndig, &decpt, &se);
-	return g__fmt(buf, s, se, decpt, sign);
-	}
diff --git a/lib/libc/gdtoa/gdtoa.c b/lib/libc/gdtoa/gdtoa.c
deleted file mode 100644
index 706c055..0000000
--- a/lib/libc/gdtoa/gdtoa.c
+++ /dev/null
@@ -1,764 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- static Bigint *
-#ifdef KR_headers
-bitstob(bits, nbits, bbits) ULong *bits; int nbits; int *bbits;
-#else
-bitstob(ULong *bits, int nbits, int *bbits)
-#endif
-{
-	int i, k;
-	Bigint *b;
-	ULong *be, *x, *x0;
-
-	i = ULbits;
-	k = 0;
-	while(i < nbits) {
-		i <<= 1;
-		k++;
-		}
-#ifndef Pack_32
-	if (!k)
-		k = 1;
-#endif
-	b = Balloc(k);
-	be = bits + ((nbits - 1) >> kshift);
-	x = x0 = b->x;
-	do {
-		*x++ = *bits & ALL_ON;
-#ifdef Pack_16
-		*x++ = (*bits >> 16) & ALL_ON;
-#endif
-		} while(++bits <= be);
-	i = x - x0;
-	while(!x0[--i])
-		if (!i) {
-			b->wds = 0;
-			*bbits = 0;
-			goto ret;
-			}
-	b->wds = i + 1;
-	*bbits = i*ULbits + 32 - hi0bits(b->x[i]);
- ret:
-	return b;
-	}
-
-/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
- *
- * Inspired by "How to Print Floating-Point Numbers Accurately" by
- * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 92-101].
- *
- * Modifications:
- *	1. Rather than iterating, we use a simple numeric overestimate
- *	   to determine k = floor(log10(d)).  We scale relevant
- *	   quantities using O(log2(k)) rather than O(k) multiplications.
- *	2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
- *	   try to generate digits strictly left to right.  Instead, we
- *	   compute with fewer bits and propagate the carry if necessary
- *	   when rounding the final digit up.  This is often faster.
- *	3. Under the assumption that input will be rounded nearest,
- *	   mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
- *	   That is, we allow equality in stopping tests when the
- *	   round-nearest rule will give the same floating-point value
- *	   as would satisfaction of the stopping test with strict
- *	   inequality.
- *	4. We remove common factors of powers of 2 from relevant
- *	   quantities.
- *	5. When converting floating-point integers less than 1e16,
- *	   we use floating-point arithmetic rather than resorting
- *	   to multiple-precision integers.
- *	6. When asked to produce fewer than 15 digits, we first try
- *	   to get by with floating-point arithmetic; we resort to
- *	   multiple-precision integer arithmetic only if we cannot
- *	   guarantee that the floating-point calculation has given
- *	   the correctly rounded result.  For k requested digits and
- *	   "uniformly" distributed input, the probability is
- *	   something like 10^(k-15) that we must resort to the Long
- *	   calculation.
- */
-
- char *
-gdtoa
-#ifdef KR_headers
-	(fpi, be, bits, kindp, mode, ndigits, decpt, rve)
-	FPI *fpi; int be; ULong *bits;
-	int *kindp, mode, ndigits, *decpt; char **rve;
-#else
-	(FPI *fpi, int be, ULong *bits, int *kindp, int mode, int ndigits, int *decpt, char **rve)
-#endif
-{
- /*	Arguments ndigits and decpt are similar to the second and third
-	arguments of ecvt and fcvt; trailing zeros are suppressed from
-	the returned string.  If not null, *rve is set to point
-	to the end of the return value.  If d is +-Infinity or NaN,
-	then *decpt is set to 9999.
-
-	mode:
-		0 ==> shortest string that yields d when read in
-			and rounded to nearest.
-		1 ==> like 0, but with Steele & White stopping rule;
-			e.g. with IEEE P754 arithmetic , mode 0 gives
-			1e23 whereas mode 1 gives 9.999999999999999e22.
-		2 ==> max(1,ndigits) significant digits.  This gives a
-			return value similar to that of ecvt, except
-			that trailing zeros are suppressed.
-		3 ==> through ndigits past the decimal point.  This
-			gives a return value similar to that from fcvt,
-			except that trailing zeros are suppressed, and
-			ndigits can be negative.
-		4-9 should give the same return values as 2-3, i.e.,
-			4 <= mode <= 9 ==> same return as mode
-			2 + (mode & 1).  These modes are mainly for
-			debugging; often they run slower but sometimes
-			faster than modes 2-3.
-		4,5,8,9 ==> left-to-right digit generation.
-		6-9 ==> don't try fast floating-point estimate
-			(if applicable).
-
-		Values of mode other than 0-9 are treated as mode 0.
-
-		Sufficient space is allocated to the return value
-		to hold the suppressed trailing zeros.
-	*/
-
-	int bbits, b2, b5, be0, dig, i, ieps, ilim, ilim0, ilim1, inex;
-	int j, j1, k, k0, k_check, kind, leftright, m2, m5, nbits;
-	int rdir, s2, s5, spec_case, try_quick;
-	Long L;
-	Bigint *b, *b1, *delta, *mlo, *mhi, *mhi1, *S;
-	double d, d2, ds, eps;
-	char *s, *s0;
-
-#ifndef MULTIPLE_THREADS
-	if (dtoa_result) {
-		freedtoa(dtoa_result);
-		dtoa_result = 0;
-		}
-#endif
-	inex = 0;
-	kind = *kindp &= ~STRTOG_Inexact;
-	switch(kind & STRTOG_Retmask) {
-	  case STRTOG_Zero:
-		goto ret_zero;
-	  case STRTOG_Normal:
-	  case STRTOG_Denormal:
-		break;
-	  case STRTOG_Infinite:
-		*decpt = -32768;
-		return nrv_alloc("Infinity", rve, 8);
-	  case STRTOG_NaN:
-		*decpt = -32768;
-		return nrv_alloc("NaN", rve, 3);
-	  default:
-		return 0;
-	  }
-	b = bitstob(bits, nbits = fpi->nbits, &bbits);
-	be0 = be;
-	if ( (i = trailz(b)) !=0) {
-		rshift(b, i);
-		be += i;
-		bbits -= i;
-		}
-	if (!b->wds) {
-		Bfree(b);
- ret_zero:
-		*decpt = 1;
-		return nrv_alloc("0", rve, 1);
-		}
-
-	dval(d) = b2d(b, &i);
-	i = be + bbits - 1;
-	word0(d) &= Frac_mask1;
-	word0(d) |= Exp_11;
-#ifdef IBM
-	if ( (j = 11 - hi0bits(word0(d) & Frac_mask)) !=0)
-		dval(d) /= 1 << j;
-#endif
-
-	/* log(x)	~=~ log(1.5) + (x-1.5)/1.5
-	 * log10(x)	 =  log(x) / log(10)
-	 *		~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
-	 * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2)
-	 *
-	 * This suggests computing an approximation k to log10(d) by
-	 *
-	 * k = (i - Bias)*0.301029995663981
-	 *	+ ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
-	 *
-	 * We want k to be too large rather than too small.
-	 * The error in the first-order Taylor series approximation
-	 * is in our favor, so we just round up the constant enough
-	 * to compensate for any error in the multiplication of
-	 * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
-	 * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
-	 * adding 1e-13 to the constant term more than suffices.
-	 * Hence we adjust the constant term to 0.1760912590558.
-	 * (We could get a more accurate k by invoking log10,
-	 *  but this is probably not worthwhile.)
-	 */
-#ifdef IBM
-	i <<= 2;
-	i += j;
-#endif
-	ds = (dval(d)-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
-
-	/* correct assumption about exponent range */
-	if ((j = i) < 0)
-		j = -j;
-	if ((j -= 1077) > 0)
-		ds += j * 7e-17;
-
-	k = (int)ds;
-	if (ds < 0. && ds != k)
-		k--;	/* want k = floor(ds) */
-	k_check = 1;
-#ifdef IBM
-	j = be + bbits - 1;
-	if ( (j1 = j & 3) !=0)
-		dval(d) *= 1 << j1;
-	word0(d) += j << Exp_shift - 2 & Exp_mask;
-#else
-	word0(d) += (be + bbits - 1) << Exp_shift;
-#endif
-	if (k >= 0 && k <= Ten_pmax) {
-		if (dval(d) < tens[k])
-			k--;
-		k_check = 0;
-		}
-	j = bbits - i - 1;
-	if (j >= 0) {
-		b2 = 0;
-		s2 = j;
-		}
-	else {
-		b2 = -j;
-		s2 = 0;
-		}
-	if (k >= 0) {
-		b5 = 0;
-		s5 = k;
-		s2 += k;
-		}
-	else {
-		b2 -= k;
-		b5 = -k;
-		s5 = 0;
-		}
-	if (mode < 0 || mode > 9)
-		mode = 0;
-	try_quick = 1;
-	if (mode > 5) {
-		mode -= 4;
-		try_quick = 0;
-		}
-	leftright = 1;
-	switch(mode) {
-		case 0:
-		case 1:
-			ilim = ilim1 = -1;
-			i = (int)(nbits * .30103) + 3;
-			ndigits = 0;
-			break;
-		case 2:
-			leftright = 0;
-			/* no break */
-		case 4:
-			if (ndigits <= 0)
-				ndigits = 1;
-			ilim = ilim1 = i = ndigits;
-			break;
-		case 3:
-			leftright = 0;
-			/* no break */
-		case 5:
-			i = ndigits + k + 1;
-			ilim = i;
-			ilim1 = i - 1;
-			if (i <= 0)
-				i = 1;
-		}
-	s = s0 = rv_alloc(i);
-
-	if ( (rdir = fpi->rounding - 1) !=0) {
-		if (rdir < 0)
-			rdir = 2;
-		if (kind & STRTOG_Neg)
-			rdir = 3 - rdir;
-		}
-
-	/* Now rdir = 0 ==> round near, 1 ==> round up, 2 ==> round down. */
-
-	if (ilim >= 0 && ilim <= Quick_max && try_quick && !rdir
-#ifndef IMPRECISE_INEXACT
-		&& k == 0
-#endif
-								) {
-
-		/* Try to get by with floating-point arithmetic. */
-
-		i = 0;
-		d2 = dval(d);
-#ifdef IBM
-		if ( (j = 11 - hi0bits(word0(d) & Frac_mask)) !=0)
-			dval(d) /= 1 << j;
-#endif
-		k0 = k;
-		ilim0 = ilim;
-		ieps = 2; /* conservative */
-		if (k > 0) {
-			ds = tens[k&0xf];
-			j = k >> 4;
-			if (j & Bletch) {
-				/* prevent overflows */
-				j &= Bletch - 1;
-				dval(d) /= bigtens[n_bigtens-1];
-				ieps++;
-				}
-			for(; j; j >>= 1, i++)
-				if (j & 1) {
-					ieps++;
-					ds *= bigtens[i];
-					}
-			}
-		else  {
-			ds = 1.;
-			if ( (j1 = -k) !=0) {
-				dval(d) *= tens[j1 & 0xf];
-				for(j = j1 >> 4; j; j >>= 1, i++)
-					if (j & 1) {
-						ieps++;
-						dval(d) *= bigtens[i];
-						}
-				}
-			}
-		if (k_check && dval(d) < 1. && ilim > 0) {
-			if (ilim1 <= 0)
-				goto fast_failed;
-			ilim = ilim1;
-			k--;
-			dval(d) *= 10.;
-			ieps++;
-			}
-		dval(eps) = ieps*dval(d) + 7.;
-		word0(eps) -= (P-1)*Exp_msk1;
-		if (ilim == 0) {
-			S = mhi = 0;
-			dval(d) -= 5.;
-			if (dval(d) > dval(eps))
-				goto one_digit;
-			if (dval(d) < -dval(eps))
-				goto no_digits;
-			goto fast_failed;
-			}
-#ifndef No_leftright
-		if (leftright) {
-			/* Use Steele & White method of only
-			 * generating digits needed.
-			 */
-			dval(eps) = ds*0.5/tens[ilim-1] - dval(eps);
-			for(i = 0;;) {
-				L = (Long)(dval(d)/ds);
-				dval(d) -= L*ds;
-				*s++ = '0' + (int)L;
-				if (dval(d) < dval(eps)) {
-					if (dval(d))
-						inex = STRTOG_Inexlo;
-					goto ret1;
-					}
-				if (ds - dval(d) < dval(eps))
-					goto bump_up;
-				if (++i >= ilim)
-					break;
-				dval(eps) *= 10.;
-				dval(d) *= 10.;
-				}
-			}
-		else {
-#endif
-			/* Generate ilim digits, then fix them up. */
-			dval(eps) *= tens[ilim-1];
-			for(i = 1;; i++, dval(d) *= 10.) {
-				if ( (L = (Long)(dval(d)/ds)) !=0)
-					dval(d) -= L*ds;
-				*s++ = '0' + (int)L;
-				if (i == ilim) {
-					ds *= 0.5;
-					if (dval(d) > ds + dval(eps))
-						goto bump_up;
-					else if (dval(d) < ds - dval(eps)) {
-						while(*--s == '0'){}
-						s++;
-						if (dval(d))
-							inex = STRTOG_Inexlo;
-						goto ret1;
-						}
-					break;
-					}
-				}
-#ifndef No_leftright
-			}
-#endif
- fast_failed:
-		s = s0;
-		dval(d) = d2;
-		k = k0;
-		ilim = ilim0;
-		}
-
-	/* Do we have a "small" integer? */
-
-	if (be >= 0 && k <= Int_max) {
-		/* Yes. */
-		ds = tens[k];
-		if (ndigits < 0 && ilim <= 0) {
-			S = mhi = 0;
-			if (ilim < 0 || dval(d) <= 5*ds)
-				goto no_digits;
-			goto one_digit;
-			}
-		for(i = 1;; i++, dval(d) *= 10.) {
-			L = dval(d) / ds;
-			dval(d) -= L*ds;
-#ifdef Check_FLT_ROUNDS
-			/* If FLT_ROUNDS == 2, L will usually be high by 1 */
-			if (dval(d) < 0) {
-				L--;
-				dval(d) += ds;
-				}
-#endif
-			*s++ = '0' + (int)L;
-			if (dval(d) == 0.)
-				break;
-			if (i == ilim) {
-				if (rdir) {
-					if (rdir == 1)
-						goto bump_up;
-					inex = STRTOG_Inexlo;
-					goto ret1;
-					}
-				dval(d) += dval(d);
-				if (dval(d) > ds || dval(d) == ds && L & 1) {
- bump_up:
-					inex = STRTOG_Inexhi;
-					while(*--s == '9')
-						if (s == s0) {
-							k++;
-							*s = '0';
-							break;
-							}
-					++*s++;
-					}
-				else
-					inex = STRTOG_Inexlo;
-				break;
-				}
-			}
-		goto ret1;
-		}
-
-	m2 = b2;
-	m5 = b5;
-	mhi = mlo = 0;
-	if (leftright) {
-		if (mode < 2) {
-			i = nbits - bbits;
-			if (be - i++ < fpi->emin)
-				/* denormal */
-				i = be - fpi->emin + 1;
-			}
-		else {
-			j = ilim - 1;
-			if (m5 >= j)
-				m5 -= j;
-			else {
-				s5 += j -= m5;
-				b5 += j;
-				m5 = 0;
-				}
-			if ((i = ilim) < 0) {
-				m2 -= i;
-				i = 0;
-				}
-			}
-		b2 += i;
-		s2 += i;
-		mhi = i2b(1);
-		}
-	if (m2 > 0 && s2 > 0) {
-		i = m2 < s2 ? m2 : s2;
-		b2 -= i;
-		m2 -= i;
-		s2 -= i;
-		}
-	if (b5 > 0) {
-		if (leftright) {
-			if (m5 > 0) {
-				mhi = pow5mult(mhi, m5);
-				b1 = mult(mhi, b);
-				Bfree(b);
-				b = b1;
-				}
-			if ( (j = b5 - m5) !=0)
-				b = pow5mult(b, j);
-			}
-		else
-			b = pow5mult(b, b5);
-		}
-	S = i2b(1);
-	if (s5 > 0)
-		S = pow5mult(S, s5);
-
-	/* Check for special case that d is a normalized power of 2. */
-
-	spec_case = 0;
-	if (mode < 2) {
-		if (bbits == 1 && be0 > fpi->emin + 1) {
-			/* The special case */
-			b2++;
-			s2++;
-			spec_case = 1;
-			}
-		}
-
-	/* Arrange for convenient computation of quotients:
-	 * shift left if necessary so divisor has 4 leading 0 bits.
-	 *
-	 * Perhaps we should just compute leading 28 bits of S once
-	 * and for all and pass them and a shift to quorem, so it
-	 * can do shifts and ors to compute the numerator for q.
-	 */
-#ifdef Pack_32
-	if ( (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f) !=0)
-		i = 32 - i;
-#else
-	if ( (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0xf) !=0)
-		i = 16 - i;
-#endif
-	if (i > 4) {
-		i -= 4;
-		b2 += i;
-		m2 += i;
-		s2 += i;
-		}
-	else if (i < 4) {
-		i += 28;
-		b2 += i;
-		m2 += i;
-		s2 += i;
-		}
-	if (b2 > 0)
-		b = lshift(b, b2);
-	if (s2 > 0)
-		S = lshift(S, s2);
-	if (k_check) {
-		if (cmp(b,S) < 0) {
-			k--;
-			b = multadd(b, 10, 0);	/* we botched the k estimate */
-			if (leftright)
-				mhi = multadd(mhi, 10, 0);
-			ilim = ilim1;
-			}
-		}
-	if (ilim <= 0 && mode > 2) {
-		if (ilim < 0 || cmp(b,S = multadd(S,5,0)) <= 0) {
-			/* no digits, fcvt style */
- no_digits:
-			k = -1 - ndigits;
-			inex = STRTOG_Inexlo;
-			goto ret;
-			}
- one_digit:
-		inex = STRTOG_Inexhi;
-		*s++ = '1';
-		k++;
-		goto ret;
-		}
-	if (leftright) {
-		if (m2 > 0)
-			mhi = lshift(mhi, m2);
-
-		/* Compute mlo -- check for special case
-		 * that d is a normalized power of 2.
-		 */
-
-		mlo = mhi;
-		if (spec_case) {
-			mhi = Balloc(mhi->k);
-			Bcopy(mhi, mlo);
-			mhi = lshift(mhi, 1);
-			}
-
-		for(i = 1;;i++) {
-			dig = quorem(b,S) + '0';
-			/* Do we yet have the shortest decimal string
-			 * that will round to d?
-			 */
-			j = cmp(b, mlo);
-			delta = diff(S, mhi);
-			j1 = delta->sign ? 1 : cmp(b, delta);
-			Bfree(delta);
-#ifndef ROUND_BIASED
-			if (j1 == 0 && !mode && !(bits[0] & 1) && !rdir) {
-				if (dig == '9')
-					goto round_9_up;
-				if (j <= 0) {
-					if (b->wds > 1 || b->x[0])
-						inex = STRTOG_Inexlo;
-					}
-				else {
-					dig++;
-					inex = STRTOG_Inexhi;
-					}
-				*s++ = dig;
-				goto ret;
-				}
-#endif
-			if (j < 0 || j == 0 && !mode
-#ifndef ROUND_BIASED
-							&& !(bits[0] & 1)
-#endif
-					) {
-				if (rdir && (b->wds > 1 || b->x[0])) {
-					if (rdir == 2) {
-						inex = STRTOG_Inexlo;
-						goto accept;
-						}
-					while (cmp(S,mhi) > 0) {
-						*s++ = dig;
-						mhi1 = multadd(mhi, 10, 0);
-						if (mlo == mhi)
-							mlo = mhi1;
-						mhi = mhi1;
-						b = multadd(b, 10, 0);
-						dig = quorem(b,S) + '0';
-						}
-					if (dig++ == '9')
-						goto round_9_up;
-					inex = STRTOG_Inexhi;
-					goto accept;
-					}
-				if (j1 > 0) {
-					b = lshift(b, 1);
-					j1 = cmp(b, S);
-					if ((j1 > 0 || j1 == 0 && dig & 1)
-					&& dig++ == '9')
-						goto round_9_up;
-					inex = STRTOG_Inexhi;
-					}
-				if (b->wds > 1 || b->x[0])
-					inex = STRTOG_Inexlo;
- accept:
-				*s++ = dig;
-				goto ret;
-				}
-			if (j1 > 0 && rdir != 2) {
-				if (dig == '9') { /* possible if i == 1 */
- round_9_up:
-					*s++ = '9';
-					inex = STRTOG_Inexhi;
-					goto roundoff;
-					}
-				inex = STRTOG_Inexhi;
-				*s++ = dig + 1;
-				goto ret;
-				}
-			*s++ = dig;
-			if (i == ilim)
-				break;
-			b = multadd(b, 10, 0);
-			if (mlo == mhi)
-				mlo = mhi = multadd(mhi, 10, 0);
-			else {
-				mlo = multadd(mlo, 10, 0);
-				mhi = multadd(mhi, 10, 0);
-				}
-			}
-		}
-	else
-		for(i = 1;; i++) {
-			*s++ = dig = quorem(b,S) + '0';
-			if (i >= ilim)
-				break;
-			b = multadd(b, 10, 0);
-			}
-
-	/* Round off last digit */
-
-	if (rdir) {
-		if (rdir == 2 || b->wds <= 1 && !b->x[0])
-			goto chopzeros;
-		goto roundoff;
-		}
-	b = lshift(b, 1);
-	j = cmp(b, S);
-	if (j > 0 || j == 0 && dig & 1) {
- roundoff:
-		inex = STRTOG_Inexhi;
-		while(*--s == '9')
-			if (s == s0) {
-				k++;
-				*s++ = '1';
-				goto ret;
-				}
-		++*s++;
-		}
-	else {
- chopzeros:
-		if (b->wds > 1 || b->x[0])
-			inex = STRTOG_Inexlo;
-		while(*--s == '0'){}
-		s++;
-		}
- ret:
-	Bfree(S);
-	if (mhi) {
-		if (mlo && mlo != mhi)
-			Bfree(mlo);
-		Bfree(mhi);
-		}
- ret1:
-	Bfree(b);
-	*s = 0;
-	*decpt = k + 1;
-	if (rve)
-		*rve = s;
-	*kindp |= inex;
-	return s0;
-	}
diff --git a/lib/libc/gdtoa/gethex.c b/lib/libc/gdtoa/gethex.c
deleted file mode 100644
index fadb5de..0000000
--- a/lib/libc/gdtoa/gethex.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	dmg@acm.org
- */
-
-#include "gdtoaimp.h"
-
-#ifdef USE_LOCALE
-#include "locale.h"
-#endif
-
- int
-#ifdef KR_headers
-gethex(sp, fpi, exp, bp, sign)
-	CONST char **sp; FPI *fpi; Long *exp; Bigint **bp; int sign;
-#else
-gethex( CONST char **sp, FPI *fpi, Long *exp, Bigint **bp, int sign)
-#endif
-{
-	Bigint *b;
-	CONST unsigned char *decpt, *s0, *s, *s1;
-	int esign, havedig, irv, k, n, nbits, up;
-	ULong L, lostbits, *x;
-	Long e, e1;
-#ifdef USE_LOCALE
-	unsigned char decimalpoint = *localeconv()->decimal_point;
-#else
-#define decimalpoint '.'
-#endif
-
-	if (!hexdig['0'])
-		hexdig_init_D2A();
-	havedig = 0;
-	s0 = *(CONST unsigned char **)sp + 2;
-	while(s0[havedig] == '0')
-		havedig++;
-	s0 += havedig;
-	s = s0;
-	decpt = 0;
-	if (!hexdig[*s]) {
-		if (*s == decimalpoint) {
-			decpt = ++s;
-			if (!hexdig[*s])
-				goto ret0;
-			}
-		else {
- ret0:
-			*sp = (char*)s;
-			return havedig ? STRTOG_Zero : STRTOG_NoNumber;
-			}
-		while(*s == '0')
-			s++;
-		havedig = 1;
-		if (!hexdig[*s])
-			goto ret0;
-		s0 = s;
-		}
-	while(hexdig[*s])
-		s++;
-	if (*s == decimalpoint && !decpt) {
-		decpt = ++s;
-		while(hexdig[*s])
-			s++;
-		}
-	e = 0;
-	if (decpt)
-		e = -(((Long)(s-decpt)) << 2);
-	s1 = s;
-	switch(*s) {
-	  case 'p':
-	  case 'P':
-		esign = 0;
-		switch(*++s) {
-		  case '-':
-			esign = 1;
-			/* no break */
-		  case '+':
-			s++;
-		  }
-		if ((n = hexdig[*s]) == 0 || n > 0x19) {
-			s = s1;
-			break;
-			}
-		e1 = n - 0x10;
-		while((n = hexdig[*++s]) !=0 && n <= 0x19)
-			e1 = 10*e1 + n - 0x10;
-		if (esign)
-			e1 = -e1;
-		e += e1;
-	  }
-	*sp = (char*)s;
-	n = s1 - s0 - 1;
-	for(k = 0; n > 7; n >>= 1)
-		k++;
-	b = Balloc(k);
-	x = b->x;
-	n = 0;
-	L = 0;
-	while(s1 > s0) {
-		if (*--s1 == decimalpoint)
-			continue;
-		if (n == 32) {
-			*x++ = L;
-			L = 0;
-			n = 0;
-			}
-		L |= (hexdig[*s1] & 0x0f) << n;
-		n += 4;
-		}
-	*x++ = L;
-	b->wds = n = x - b->x;
-	n = 32*n - hi0bits(L);
-	nbits = fpi->nbits;
-	lostbits = 0;
-	x = b->x;
-	if (n > nbits) {
-		n -= nbits;
-		if (any_on(b,n)) {
-			lostbits = 1;
-			k = n - 1;
-			if (x[k>>kshift] & 1 << (k & kmask)) {
-				lostbits = 2;
-				if (k > 1 && any_on(b,k-1))
-					lostbits = 3;
-				}
-			}
-		rshift(b, n);
-		e += n;
-		}
-	else if (n < nbits) {
-		n = nbits - n;
-		b = lshift(b, n);
-		e -= n;
-		x = b->x;
-		}
-	if (e > fpi->emax) {
- ovfl:
-		Bfree(b);
-		*bp = 0;
-		return STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi;
-		}
-	irv = STRTOG_Normal;
-	if (e < fpi->emin) {
-		irv = STRTOG_Denormal;
-		n = fpi->emin - e;
-		if (n >= nbits) {
-			switch (fpi->rounding) {
-			  case FPI_Round_near:
-				if (n == nbits && (n < 2 || any_on(b,n-1)))
-					goto one_bit;
-				break;
-			  case FPI_Round_up:
-				if (!sign)
-					goto one_bit;
-				break;
-			  case FPI_Round_down:
-				if (sign) {
- one_bit:
-					*exp = fpi->emin;
-					x[0] = b->wds = 1;
-					*bp = b;
-					return STRTOG_Denormal | STRTOG_Inexhi
-						| STRTOG_Underflow;
-					}
-			  }
-			Bfree(b);
-			*bp = 0;
-			return STRTOG_Zero | STRTOG_Inexlo | STRTOG_Underflow;
-			}
-		k = n - 1;
-		if (lostbits)
-			lostbits = 1;
-		else if (k > 0)
-			lostbits = any_on(b,k);
-		if (x[k>>kshift] & 1 << (k & kmask))
-			lostbits |= 2;
-		nbits -= n;
-		rshift(b,n);
-		e = fpi->emin;
-		}
-	if (lostbits) {
-		up = 0;
-		switch(fpi->rounding) {
-		  case FPI_Round_zero:
-			break;
-		  case FPI_Round_near:
-			if (lostbits & 2
-			 && (lostbits & 1) | x[0] & 1)
-				up = 1;
-			break;
-		  case FPI_Round_up:
-			up = 1 - sign;
-			break;
-		  case FPI_Round_down:
-			up = sign;
-		  }
-		if (up) {
-			k = b->wds;
-			b = increment(b);
-			x = b->x;
-			if (irv == STRTOG_Denormal) {
-				if (nbits == fpi->nbits - 1
-				 && x[nbits >> kshift] & 1 << (nbits & kmask))
-					irv =  STRTOG_Normal;
-				}
-			else if (b->wds > k
-			 || (n = nbits & kmask) !=0
-			     && hi0bits(x[k-1]) < 32-n) {
-				rshift(b,1);
-				if (++e > fpi->emax)
-					goto ovfl;
-				}
-			irv |= STRTOG_Inexhi;
-			}
-		else
-			irv |= STRTOG_Inexlo;
-		}
-	*bp = b;
-	*exp = e;
-	return irv;
-	}
diff --git a/lib/libc/gdtoa/glue.c b/lib/libc/gdtoa/glue.c
deleted file mode 100644
index 5178f59..0000000
--- a/lib/libc/gdtoa/glue.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Machine-independent glue to integrate David Gay's gdtoa
- * package into libc.
- *
- * $FreeBSD: src/lib/libc/gdtoa/glue.c,v 1.2 2003/06/21 08:20:14 das Exp $
- */
-
-#include <pthread.h>
-
-pthread_mutex_t __gdtoa_locks[] = {
-	PTHREAD_MUTEX_INITIALIZER,
-	PTHREAD_MUTEX_INITIALIZER
-};
diff --git a/lib/libc/gdtoa/gmisc.c b/lib/libc/gdtoa/gmisc.c
deleted file mode 100644
index 1607f4b..0000000
--- a/lib/libc/gdtoa/gmisc.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- void
-#ifdef KR_headers
-rshift(b, k) Bigint *b; int k;
-#else
-rshift(Bigint *b, int k)
-#endif
-{
-	ULong *x, *x1, *xe, y;
-	int n;
-
-	x = x1 = b->x;
-	n = k >> kshift;
-	if (n < b->wds) {
-		xe = x + b->wds;
-		x += n;
-		if (k &= kmask) {
-			n = ULbits - k;
-			y = *x++ >> k;
-			while(x < xe) {
-				*x1++ = (y | (*x << n)) & ALL_ON;
-				y = *x++ >> k;
-				}
-			if ((*x1 = y) !=0)
-				x1++;
-			}
-		else
-			while(x < xe)
-				*x1++ = *x++;
-		}
-	if ((b->wds = x1 - b->x) == 0)
-		b->x[0] = 0;
-	}
-
- int
-#ifdef KR_headers
-trailz(b) Bigint *b;
-#else
-trailz(Bigint *b)
-#endif
-{
-	ULong L, *x, *xe;
-	int n = 0;
-
-	x = b->x;
-	xe = x + b->wds;
-	for(n = 0; x < xe && !*x; x++)
-		n += ULbits;
-	if (x < xe) {
-		L = *x;
-		n += lo0bits(&L);
-		}
-	return n;
-	}
diff --git a/lib/libc/gdtoa/hd_init.c b/lib/libc/gdtoa/hd_init.c
deleted file mode 100644
index 73afca1..0000000
--- a/lib/libc/gdtoa/hd_init.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- unsigned char hexdig[256];
-
- static void
-#ifdef KR_headers
-htinit(h, s, inc) unsigned char *h; unsigned char *s; int inc;
-#else
-htinit(unsigned char *h, unsigned char *s, int inc)
-#endif
-{
-	int i, j;
-	for(i = 0; (j = s[i]) !=0; i++)
-		h[j] = i + inc;
-	}
-
- void
-hexdig_init_D2A(Void)
-{
-#define USC (unsigned char *)
-	htinit(hexdig, USC "0123456789", 0x10);
-	htinit(hexdig, USC "abcdef", 0x10 + 10);
-	htinit(hexdig, USC "ABCDEF", 0x10 + 10);
-	}
diff --git a/lib/libc/gdtoa/hexnan.c b/lib/libc/gdtoa/hexnan.c
deleted file mode 100644
index 7a7e03a..0000000
--- a/lib/libc/gdtoa/hexnan.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- static void
-#ifdef KR_headers
-L_shift(x, x1, i) ULong *x; ULong *x1; int i;
-#else
-L_shift(ULong *x, ULong *x1, int i)
-#endif
-{
-	int j;
-
-	i = 8 - i;
-	i <<= 2;
-	j = ULbits - i;
-	do {
-		*x |= x[1] << j;
-		x[1] >>= i;
-		} while(++x < x1);
-	}
-
- int
-#ifdef KR_headers
-hexnan(sp, fpi, x0)
-	CONST char **sp; FPI *fpi; ULong *x0;
-#else
-hexnan( CONST char **sp, FPI *fpi, ULong *x0)
-#endif
-{
-	ULong c, h, *x, *x1, *xe;
-	CONST char *s;
-	int havedig, hd0, i, nbits;
-
-	if (!hexdig['0'])
-		hexdig_init_D2A();
-	nbits = fpi->nbits;
-	x = x0 + (nbits >> kshift);
-	if (nbits & kmask)
-		x++;
-	*--x = 0;
-	x1 = xe = x;
-	havedig = hd0 = i = 0;
-	s = *sp;
-	while(c = *(CONST unsigned char*)++s) {
-		if (!(h = hexdig[c])) {
-			if (c <= ' ') {
-				if (hd0 < havedig) {
-					if (x < x1 && i < 8)
-						L_shift(x, x1, i);
-					if (x <= x0) {
-						i = 8;
-						continue;
-						}
-					hd0 = havedig;
-					*--x = 0;
-					x1 = x;
-					i = 0;
-					}
-				continue;
-				}
-			if (/*(*/ c == ')' && havedig) {
-				*sp = s + 1;
-				break;
-				}
-			return STRTOG_NaN;
-			}
-		havedig++;
-		if (++i > 8) {
-			if (x <= x0)
-				continue;
-			i = 1;
-			*--x = 0;
-			}
-		*x = (*x << 4) | h & 0xf;
-		}
-	if (!havedig)
-		return STRTOG_NaN;
-	if (x < x1 && i < 8)
-		L_shift(x, x1, i);
-	if (x > x0) {
-		x1 = x0;
-		do *x1++ = *x++;
-			while(x <= xe);
-		do *x1++ = 0;
-			while(x1 <= xe);
-		}
-	else {
-		/* truncate high-order word if necessary */
-		if ( (i = nbits & (ULbits-1)) !=0)
-			*xe &= ((ULong)0xffffffff) >> (ULbits - i);
-		}
-	for(x1 = xe;; --x1) {
-		if (*x1 != 0)
-			break;
-		if (x1 == x0) {
-			*x1 = 1;
-			break;
-			}
-		}
-	return STRTOG_NaNbits;
-	}
diff --git a/lib/libc/gdtoa/machdep_ldisx.c b/lib/libc/gdtoa/machdep_ldisx.c
deleted file mode 100644
index 0ceea1b..0000000
--- a/lib/libc/gdtoa/machdep_ldisx.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2003 David Schultz <das@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.
- *
- * 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.
- */
-
-/*
- * Machine-dependent glue to integrate David Gay's gdtoa
- * package into libc for architectures where a long double
- * is an IEEE extended precision number.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gdtoa/machdep_ldisx.c,v 1.2 2003/04/09 05:58:43 das Exp $");
-
-#include "gdtoaimp.h"
-
-long double
-strtold(const char * __restrict s, char ** __restrict sp)
-{
-	long double result;
-
-	strtopx(s, sp, &result);
-	return result;
-}
diff --git a/lib/libc/gdtoa/misc.c b/lib/libc/gdtoa/misc.c
deleted file mode 100644
index 5f5cbc2..0000000
--- a/lib/libc/gdtoa/misc.c
+++ /dev/null
@@ -1,862 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- static Bigint *freelist[Kmax+1];
-#ifndef Omit_Private_Memory
-#ifndef PRIVATE_MEM
-#define PRIVATE_MEM 2304
-#endif
-#define PRIVATE_mem ((PRIVATE_MEM+sizeof(double)-1)/sizeof(double))
-static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
-#endif
-
- Bigint *
-Balloc
-#ifdef KR_headers
-	(k) int k;
-#else
-	(int k)
-#endif
-{
-	int x;
-	Bigint *rv;
-#ifndef Omit_Private_Memory
-	unsigned int len;
-#endif
-
-	ACQUIRE_DTOA_LOCK(0);
-	if ( (rv = freelist[k]) !=0) {
-		freelist[k] = rv->next;
-		}
-	else {
-		x = 1 << k;
-#ifdef Omit_Private_Memory
-		rv = (Bigint *)MALLOC(sizeof(Bigint) + (x-1)*sizeof(ULong));
-#else
-		len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
-			/sizeof(double);
-		if (pmem_next - private_mem + len <= PRIVATE_mem) {
-			rv = (Bigint*)pmem_next;
-			pmem_next += len;
-			}
-		else
-			rv = (Bigint*)MALLOC(len*sizeof(double));
-#endif
-		rv->k = k;
-		rv->maxwds = x;
-		}
-	FREE_DTOA_LOCK(0);
-	rv->sign = rv->wds = 0;
-	return rv;
-	}
-
- void
-Bfree
-#ifdef KR_headers
-	(v) Bigint *v;
-#else
-	(Bigint *v)
-#endif
-{
-	if (v) {
-		ACQUIRE_DTOA_LOCK(0);
-		v->next = freelist[v->k];
-		freelist[v->k] = v;
-		FREE_DTOA_LOCK(0);
-		}
-	}
-
- int
-lo0bits
-#ifdef KR_headers
-	(y) ULong *y;
-#else
-	(ULong *y)
-#endif
-{
-	register int k;
-	register ULong x = *y;
-
-	if (x & 7) {
-		if (x & 1)
-			return 0;
-		if (x & 2) {
-			*y = x >> 1;
-			return 1;
-			}
-		*y = x >> 2;
-		return 2;
-		}
-	k = 0;
-	if (!(x & 0xffff)) {
-		k = 16;
-		x >>= 16;
-		}
-	if (!(x & 0xff)) {
-		k += 8;
-		x >>= 8;
-		}
-	if (!(x & 0xf)) {
-		k += 4;
-		x >>= 4;
-		}
-	if (!(x & 0x3)) {
-		k += 2;
-		x >>= 2;
-		}
-	if (!(x & 1)) {
-		k++;
-		x >>= 1;
-		if (!x & 1)
-			return 32;
-		}
-	*y = x;
-	return k;
-	}
-
- Bigint *
-multadd
-#ifdef KR_headers
-	(b, m, a) Bigint *b; int m, a;
-#else
-	(Bigint *b, int m, int a)	/* multiply by m and add a */
-#endif
-{
-	int i, wds;
-#ifdef ULLong
-	ULong *x;
-	ULLong carry, y;
-#else
-	ULong carry, *x, y;
-#ifdef Pack_32
-	ULong xi, z;
-#endif
-#endif
-	Bigint *b1;
-
-	wds = b->wds;
-	x = b->x;
-	i = 0;
-	carry = a;
-	do {
-#ifdef ULLong
-		y = *x * (ULLong)m + carry;
-		carry = y >> 32;
-		*x++ = y & 0xffffffffUL;
-#else
-#ifdef Pack_32
-		xi = *x;
-		y = (xi & 0xffff) * m + carry;
-		z = (xi >> 16) * m + (y >> 16);
-		carry = z >> 16;
-		*x++ = (z << 16) + (y & 0xffff);
-#else
-		y = *x * m + carry;
-		carry = y >> 16;
-		*x++ = y & 0xffff;
-#endif
-#endif
-		}
-		while(++i < wds);
-	if (carry) {
-		if (wds >= b->maxwds) {
-			b1 = Balloc(b->k+1);
-			Bcopy(b1, b);
-			Bfree(b);
-			b = b1;
-			}
-		b->x[wds++] = carry;
-		b->wds = wds;
-		}
-	return b;
-	}
-
- int
-hi0bits
-#ifdef KR_headers
-	(x) register ULong x;
-#else
-	(register ULong x)
-#endif
-{
-	register int k = 0;
-
-	if (!(x & 0xffff0000)) {
-		k = 16;
-		x <<= 16;
-		}
-	if (!(x & 0xff000000)) {
-		k += 8;
-		x <<= 8;
-		}
-	if (!(x & 0xf0000000)) {
-		k += 4;
-		x <<= 4;
-		}
-	if (!(x & 0xc0000000)) {
-		k += 2;
-		x <<= 2;
-		}
-	if (!(x & 0x80000000)) {
-		k++;
-		if (!(x & 0x40000000))
-			return 32;
-		}
-	return k;
-	}
-
- Bigint *
-i2b
-#ifdef KR_headers
-	(i) int i;
-#else
-	(int i)
-#endif
-{
-	Bigint *b;
-
-	b = Balloc(1);
-	b->x[0] = i;
-	b->wds = 1;
-	return b;
-	}
-
- Bigint *
-mult
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	Bigint *c;
-	int k, wa, wb, wc;
-	ULong *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
-	ULong y;
-#ifdef ULLong
-	ULLong carry, z;
-#else
-	ULong carry, z;
-#ifdef Pack_32
-	ULong z2;
-#endif
-#endif
-
-	if (a->wds < b->wds) {
-		c = a;
-		a = b;
-		b = c;
-		}
-	k = a->k;
-	wa = a->wds;
-	wb = b->wds;
-	wc = wa + wb;
-	if (wc > a->maxwds)
-		k++;
-	c = Balloc(k);
-	for(x = c->x, xa = x + wc; x < xa; x++)
-		*x = 0;
-	xa = a->x;
-	xae = xa + wa;
-	xb = b->x;
-	xbe = xb + wb;
-	xc0 = c->x;
-#ifdef ULLong
-	for(; xb < xbe; xc0++) {
-		if ( (y = *xb++) !=0) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			do {
-				z = *x++ * (ULLong)y + *xc + carry;
-				carry = z >> 32;
-				*xc++ = z & 0xffffffffUL;
-				}
-				while(x < xae);
-			*xc = carry;
-			}
-		}
-#else
-#ifdef Pack_32
-	for(; xb < xbe; xb++, xc0++) {
-		if ( (y = *xb & 0xffff) !=0) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			do {
-				z = (*x & 0xffff) * y + (*xc & 0xffff) + carry;
-				carry = z >> 16;
-				z2 = (*x++ >> 16) * y + (*xc >> 16) + carry;
-				carry = z2 >> 16;
-				Storeinc(xc, z2, z);
-				}
-				while(x < xae);
-			*xc = carry;
-			}
-		if ( (y = *xb >> 16) !=0) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			z2 = *xc;
-			do {
-				z = (*x & 0xffff) * y + (*xc >> 16) + carry;
-				carry = z >> 16;
-				Storeinc(xc, z, z2);
-				z2 = (*x++ >> 16) * y + (*xc & 0xffff) + carry;
-				carry = z2 >> 16;
-				}
-				while(x < xae);
-			*xc = z2;
-			}
-		}
-#else
-	for(; xb < xbe; xc0++) {
-		if ( (y = *xb++) !=0) {
-			x = xa;
-			xc = xc0;
-			carry = 0;
-			do {
-				z = *x++ * y + *xc + carry;
-				carry = z >> 16;
-				*xc++ = z & 0xffff;
-				}
-				while(x < xae);
-			*xc = carry;
-			}
-		}
-#endif
-#endif
-	for(xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ;
-	c->wds = wc;
-	return c;
-	}
-
- static Bigint *p5s;
-
- Bigint *
-pow5mult
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
-	(Bigint *b, int k)
-#endif
-{
-	Bigint *b1, *p5, *p51;
-	int i;
-	static int p05[3] = { 5, 25, 125 };
-
-	if ( (i = k & 3) !=0)
-		b = multadd(b, p05[i-1], 0);
-
-	if (!(k >>= 2))
-		return b;
-	if ((p5 = p5s) == 0) {
-		/* first time */
-#ifdef MULTIPLE_THREADS
-		ACQUIRE_DTOA_LOCK(1);
-		if (!(p5 = p5s)) {
-			p5 = p5s = i2b(625);
-			p5->next = 0;
-			}
-		FREE_DTOA_LOCK(1);
-#else
-		p5 = p5s = i2b(625);
-		p5->next = 0;
-#endif
-		}
-	for(;;) {
-		if (k & 1) {
-			b1 = mult(b, p5);
-			Bfree(b);
-			b = b1;
-			}
-		if (!(k >>= 1))
-			break;
-		if ((p51 = p5->next) == 0) {
-#ifdef MULTIPLE_THREADS
-			ACQUIRE_DTOA_LOCK(1);
-			if (!(p51 = p5->next)) {
-				p51 = p5->next = mult(p5,p5);
-				p51->next = 0;
-				}
-			FREE_DTOA_LOCK(1);
-#else
-			p51 = p5->next = mult(p5,p5);
-			p51->next = 0;
-#endif
-			}
-		p5 = p51;
-		}
-	return b;
-	}
-
- Bigint *
-lshift
-#ifdef KR_headers
-	(b, k) Bigint *b; int k;
-#else
-	(Bigint *b, int k)
-#endif
-{
-	int i, k1, n, n1;
-	Bigint *b1;
-	ULong *x, *x1, *xe, z;
-
-	n = k >> kshift;
-	k1 = b->k;
-	n1 = n + b->wds + 1;
-	for(i = b->maxwds; n1 > i; i <<= 1)
-		k1++;
-	b1 = Balloc(k1);
-	x1 = b1->x;
-	for(i = 0; i < n; i++)
-		*x1++ = 0;
-	x = b->x;
-	xe = x + b->wds;
-	if (k &= kmask) {
-#ifdef Pack_32
-		k1 = 32 - k;
-		z = 0;
-		do {
-			*x1++ = *x << k | z;
-			z = *x++ >> k1;
-			}
-			while(x < xe);
-		if ((*x1 = z) !=0)
-			++n1;
-#else
-		k1 = 16 - k;
-		z = 0;
-		do {
-			*x1++ = *x << k  & 0xffff | z;
-			z = *x++ >> k1;
-			}
-			while(x < xe);
-		if (*x1 = z)
-			++n1;
-#endif
-		}
-	else do
-		*x1++ = *x++;
-		while(x < xe);
-	b1->wds = n1 - 1;
-	Bfree(b);
-	return b1;
-	}
-
- int
-cmp
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	ULong *xa, *xa0, *xb, *xb0;
-	int i, j;
-
-	i = a->wds;
-	j = b->wds;
-#ifdef DEBUG
-	if (i > 1 && !a->x[i-1])
-		Bug("cmp called with a->x[a->wds-1] == 0");
-	if (j > 1 && !b->x[j-1])
-		Bug("cmp called with b->x[b->wds-1] == 0");
-#endif
-	if (i -= j)
-		return i;
-	xa0 = a->x;
-	xa = xa0 + j;
-	xb0 = b->x;
-	xb = xb0 + j;
-	for(;;) {
-		if (*--xa != *--xb)
-			return *xa < *xb ? -1 : 1;
-		if (xa <= xa0)
-			break;
-		}
-	return 0;
-	}
-
- Bigint *
-diff
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	Bigint *c;
-	int i, wa, wb;
-	ULong *xa, *xae, *xb, *xbe, *xc;
-#ifdef ULLong
-	ULLong borrow, y;
-#else
-	ULong borrow, y;
-#ifdef Pack_32
-	ULong z;
-#endif
-#endif
-
-	i = cmp(a,b);
-	if (!i) {
-		c = Balloc(0);
-		c->wds = 1;
-		c->x[0] = 0;
-		return c;
-		}
-	if (i < 0) {
-		c = a;
-		a = b;
-		b = c;
-		i = 1;
-		}
-	else
-		i = 0;
-	c = Balloc(a->k);
-	c->sign = i;
-	wa = a->wds;
-	xa = a->x;
-	xae = xa + wa;
-	wb = b->wds;
-	xb = b->x;
-	xbe = xb + wb;
-	xc = c->x;
-	borrow = 0;
-#ifdef ULLong
-	do {
-		y = (ULLong)*xa++ - *xb++ - borrow;
-		borrow = y >> 32 & 1UL;
-		*xc++ = y & 0xffffffffUL;
-		}
-		while(xb < xbe);
-	while(xa < xae) {
-		y = *xa++ - borrow;
-		borrow = y >> 32 & 1UL;
-		*xc++ = y & 0xffffffffUL;
-		}
-#else
-#ifdef Pack_32
-	do {
-		y = (*xa & 0xffff) - (*xb & 0xffff) - borrow;
-		borrow = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) - (*xb++ >> 16) - borrow;
-		borrow = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-		while(xb < xbe);
-	while(xa < xae) {
-		y = (*xa & 0xffff) - borrow;
-		borrow = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) - borrow;
-		borrow = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-#else
-	do {
-		y = *xa++ - *xb++ - borrow;
-		borrow = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-		while(xb < xbe);
-	while(xa < xae) {
-		y = *xa++ - borrow;
-		borrow = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-#endif
-#endif
-	while(!*--xc)
-		wa--;
-	c->wds = wa;
-	return c;
-	}
-
- double
-b2d
-#ifdef KR_headers
-	(a, e) Bigint *a; int *e;
-#else
-	(Bigint *a, int *e)
-#endif
-{
-	ULong *xa, *xa0, w, y, z;
-	int k;
-	double d;
-#ifdef VAX
-	ULong d0, d1;
-#else
-#define d0 word0(d)
-#define d1 word1(d)
-#endif
-
-	xa0 = a->x;
-	xa = xa0 + a->wds;
-	y = *--xa;
-#ifdef DEBUG
-	if (!y) Bug("zero y in b2d");
-#endif
-	k = hi0bits(y);
-	*e = 32 - k;
-#ifdef Pack_32
-	if (k < Ebits) {
-		d0 = Exp_1 | y >> Ebits - k;
-		w = xa > xa0 ? *--xa : 0;
-		d1 = y << (32-Ebits) + k | w >> Ebits - k;
-		goto ret_d;
-		}
-	z = xa > xa0 ? *--xa : 0;
-	if (k -= Ebits) {
-		d0 = Exp_1 | y << k | z >> 32 - k;
-		y = xa > xa0 ? *--xa : 0;
-		d1 = z << k | y >> 32 - k;
-		}
-	else {
-		d0 = Exp_1 | y;
-		d1 = z;
-		}
-#else
-	if (k < Ebits + 16) {
-		z = xa > xa0 ? *--xa : 0;
-		d0 = Exp_1 | y << k - Ebits | z >> Ebits + 16 - k;
-		w = xa > xa0 ? *--xa : 0;
-		y = xa > xa0 ? *--xa : 0;
-		d1 = z << k + 16 - Ebits | w << k - Ebits | y >> 16 + Ebits - k;
-		goto ret_d;
-		}
-	z = xa > xa0 ? *--xa : 0;
-	w = xa > xa0 ? *--xa : 0;
-	k -= Ebits + 16;
-	d0 = Exp_1 | y << k + 16 | z << k | w >> 16 - k;
-	y = xa > xa0 ? *--xa : 0;
-	d1 = w << k + 16 | y << k;
-#endif
- ret_d:
-#ifdef VAX
-	word0(d) = d0 >> 16 | d0 << 16;
-	word1(d) = d1 >> 16 | d1 << 16;
-#endif
-	return dval(d);
-	}
-#undef d0
-#undef d1
-
- Bigint *
-d2b
-#ifdef KR_headers
-	(d, e, bits) double d; int *e, *bits;
-#else
-	(double d, int *e, int *bits)
-#endif
-{
-	Bigint *b;
-	int de, i, k;
-	ULong *x, y, z;
-#ifdef VAX
-	ULong d0, d1;
-	d0 = word0(d) >> 16 | word0(d) << 16;
-	d1 = word1(d) >> 16 | word1(d) << 16;
-#else
-#define d0 word0(d)
-#define d1 word1(d)
-#endif
-
-#ifdef Pack_32
-	b = Balloc(1);
-#else
-	b = Balloc(2);
-#endif
-	x = b->x;
-
-	z = d0 & Frac_mask;
-	d0 &= 0x7fffffff;	/* clear sign bit, which we ignore */
-#ifdef Sudden_Underflow
-	de = (int)(d0 >> Exp_shift);
-#ifndef IBM
-	z |= Exp_msk11;
-#endif
-#else
-	if ( (de = (int)(d0 >> Exp_shift)) !=0)
-		z |= Exp_msk1;
-#endif
-#ifdef Pack_32
-	if ( (y = d1) !=0) {
-		if ( (k = lo0bits(&y)) !=0) {
-			x[0] = y | z << 32 - k;
-			z >>= k;
-			}
-		else
-			x[0] = y;
-		i = b->wds = (x[1] = z) !=0 ? 2 : 1;
-		}
-	else {
-#ifdef DEBUG
-		if (!z)
-			Bug("Zero passed to d2b");
-#endif
-		k = lo0bits(&z);
-		x[0] = z;
-		i = b->wds = 1;
-		k += 32;
-		}
-#else
-	if ( (y = d1) !=0) {
-		if ( (k = lo0bits(&y)) !=0)
-			if (k >= 16) {
-				x[0] = y | z << 32 - k & 0xffff;
-				x[1] = z >> k - 16 & 0xffff;
-				x[2] = z >> k;
-				i = 2;
-				}
-			else {
-				x[0] = y & 0xffff;
-				x[1] = y >> 16 | z << 16 - k & 0xffff;
-				x[2] = z >> k & 0xffff;
-				x[3] = z >> k+16;
-				i = 3;
-				}
-		else {
-			x[0] = y & 0xffff;
-			x[1] = y >> 16;
-			x[2] = z & 0xffff;
-			x[3] = z >> 16;
-			i = 3;
-			}
-		}
-	else {
-#ifdef DEBUG
-		if (!z)
-			Bug("Zero passed to d2b");
-#endif
-		k = lo0bits(&z);
-		if (k >= 16) {
-			x[0] = z;
-			i = 0;
-			}
-		else {
-			x[0] = z & 0xffff;
-			x[1] = z >> 16;
-			i = 1;
-			}
-		k += 32;
-		}
-	while(!x[i])
-		--i;
-	b->wds = i + 1;
-#endif
-#ifndef Sudden_Underflow
-	if (de) {
-#endif
-#ifdef IBM
-		*e = (de - Bias - (P-1) << 2) + k;
-		*bits = 4*P + 8 - k - hi0bits(word0(d) & Frac_mask);
-#else
-		*e = de - Bias - (P-1) + k;
-		*bits = P - k;
-#endif
-#ifndef Sudden_Underflow
-		}
-	else {
-		*e = de - Bias - (P-1) + 1 + k;
-#ifdef Pack_32
-		*bits = 32*i - hi0bits(x[i-1]);
-#else
-		*bits = (i+2)*16 - hi0bits(x[i]);
-#endif
-		}
-#endif
-	return b;
-	}
-#undef d0
-#undef d1
-
- CONST double
-#ifdef IEEE_Arith
-bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };
-CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 1e-256
-		};
-#else
-#ifdef IBM
-bigtens[] = { 1e16, 1e32, 1e64 };
-CONST double tinytens[] = { 1e-16, 1e-32, 1e-64 };
-#else
-bigtens[] = { 1e16, 1e32 };
-CONST double tinytens[] = { 1e-16, 1e-32 };
-#endif
-#endif
-
- CONST double
-tens[] = {
-		1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
-		1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
-		1e20, 1e21, 1e22
-#ifdef VAX
-		, 1e23, 1e24
-#endif
-		};
-
- char *
-#ifdef KR_headers
-strcp_D2A(a, b) char *a; char *b;
-#else
-strcp_D2A(char *a, CONST char *b)
-#endif
-{
-	while(*a = *b++)
-		a++;
-	return a;
-	}
-
-#ifdef NO_STRING_H
-
- Char *
-#ifdef KR_headers
-memcpy_D2A(a, b, len) Char *a; Char *b; size_t len;
-#else
-memcpy_D2A(void *a1, void *b1, size_t len)
-#endif
-{
-	register char *a = (char*)a1, *ae = a + len;
-	register char *b = (char*)b1, *a0 = a;
-	while(a < ae)
-		*a++ = *b++;
-	return a0;
-	}
-
-#endif /* NO_STRING_H */
diff --git a/lib/libc/gdtoa/smisc.c b/lib/libc/gdtoa/smisc.c
deleted file mode 100644
index e20e9da..0000000
--- a/lib/libc/gdtoa/smisc.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- Bigint *
-s2b
-#ifdef KR_headers
-	(s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
-#else
-	(CONST char *s, int nd0, int nd, ULong y9)
-#endif
-{
-	Bigint *b;
-	int i, k;
-	Long x, y;
-
-	x = (nd + 8) / 9;
-	for(k = 0, y = 1; x > y; y <<= 1, k++) ;
-#ifdef Pack_32
-	b = Balloc(k);
-	b->x[0] = y9;
-	b->wds = 1;
-#else
-	b = Balloc(k+1);
-	b->x[0] = y9 & 0xffff;
-	b->wds = (b->x[1] = y9 >> 16) ? 2 : 1;
-#endif
-
-	i = 9;
-	if (9 < nd0) {
-		s += 9;
-		do b = multadd(b, 10, *s++ - '0');
-			while(++i < nd0);
-		s++;
-		}
-	else
-		s += 10;
-	for(; i < nd; i++)
-		b = multadd(b, 10, *s++ - '0');
-	return b;
-	}
-
- double
-ratio
-#ifdef KR_headers
-	(a, b) Bigint *a, *b;
-#else
-	(Bigint *a, Bigint *b)
-#endif
-{
-	double da, db;
-	int k, ka, kb;
-
-	dval(da) = b2d(a, &ka);
-	dval(db) = b2d(b, &kb);
-	k = ka - kb + ULbits*(a->wds - b->wds);
-#ifdef IBM
-	if (k > 0) {
-		word0(da) += (k >> 2)*Exp_msk1;
-		if (k &= 3)
-			dval(da) *= 1 << k;
-		}
-	else {
-		k = -k;
-		word0(db) += (k >> 2)*Exp_msk1;
-		if (k &= 3)
-			dval(db) *= 1 << k;
-		}
-#else
-	if (k > 0)
-		word0(da) += k*Exp_msk1;
-	else {
-		k = -k;
-		word0(db) += k*Exp_msk1;
-		}
-#endif
-	return dval(da) / dval(db);
-	}
-
-#ifdef INFNAN_CHECK
-
- int
-match
-#ifdef KR_headers
-	(sp, t) char **sp, *t;
-#else
-	(CONST char **sp, char *t)
-#endif
-{
-	int c, d;
-	CONST char *s = *sp;
-
-	while( (d = *t++) !=0) {
-		if ((c = *++s) >= 'A' && c <= 'Z')
-			c += 'a' - 'A';
-		if (c != d)
-			return 0;
-		}
-	*sp = s + 1;
-	return 1;
-	}
-#endif /* INFNAN_CHECK */
-
- void
-#ifdef KR_headers
-copybits(c, n, b) ULong *c; int n; Bigint *b;
-#else
-copybits(ULong *c, int n, Bigint *b)
-#endif
-{
-	ULong *ce, *x, *xe;
-#ifdef Pack_16
-	int nw, nw1;
-#endif
-
-	ce = c + ((n-1) >> kshift) + 1;
-	x = b->x;
-#ifdef Pack_32
-	xe = x + b->wds;
-	while(x < xe)
-		*c++ = *x++;
-#else
-	nw = b->wds;
-	nw1 = nw & 1;
-	for(xe = x + (nw - nw1); x < xe; x += 2)
-		Storeinc(c, x[1], x[0]);
-	if (nw1)
-		*c++ = *x;
-#endif
-	while(c < ce)
-		*c++ = 0;
-	}
-
- ULong
-#ifdef KR_headers
-any_on(b, k) Bigint *b; int k;
-#else
-any_on(Bigint *b, int k)
-#endif
-{
-	int n, nwds;
-	ULong *x, *x0, x1, x2;
-
-	x = b->x;
-	nwds = b->wds;
-	n = k >> kshift;
-	if (n > nwds)
-		n = nwds;
-	else if (n < nwds && (k &= kmask)) {
-		x1 = x2 = x[n];
-		x1 >>= k;
-		x1 <<= k;
-		if (x1 != x2)
-			return 1;
-		}
-	x0 = x;
-	x += n;
-	while(x > x0)
-		if (*--x)
-			return 1;
-	return 0;
-	}
diff --git a/lib/libc/gdtoa/strtoIQ.c b/lib/libc/gdtoa/strtoIQ.c
deleted file mode 100644
index 0ce0420..0000000
--- a/lib/libc/gdtoa/strtoIQ.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIQ(s, sp, a, b) CONST char *s; char **sp; void *a; void *b;
-#else
-strtoIQ(CONST char *s, char **sp, void *a, void *b)
-#endif
-{
-	static FPI fpi = { 113, 1-16383-113+1, 32766-16383-113+1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-	ULong *L = (ULong *)a, *M = (ULong *)b;
-
-	B[0] = Balloc(2);
-	B[0]->wds = 4;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	ULtoQ(L, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtoQ(M, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		M[0] = L[0];
-		M[1] = L[1];
-		M[2] = L[2];
-		M[3] = L[3];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoId.c b/lib/libc/gdtoa/strtoId.c
deleted file mode 100644
index f986e04..0000000
--- a/lib/libc/gdtoa/strtoId.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoId(s, sp, f0, f1) CONST char *s; char **sp; double *f0, *f1;
-#else
-strtoId(CONST char *s, char **sp, double *f0, double *f1)
-#endif
-{
-	static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-
-	B[0] = Balloc(1);
-	B[0]->wds = 2;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	ULtod((ULong*)f0, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtod((ULong*)f1, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		((ULong*)f1)[0] = ((ULong*)f0)[0];
-		((ULong*)f1)[1] = ((ULong*)f0)[1];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoIdd.c b/lib/libc/gdtoa/strtoIdd.c
deleted file mode 100644
index 9622c18..0000000
--- a/lib/libc/gdtoa/strtoIdd.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIdd(s, sp, f0, f1) CONST char *s; char **sp; double *f0, *f1;
-#else
-strtoIdd(CONST char *s, char **sp, double *f0, double *f1)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi = { 106, 1-1023, 2046-1023-106+1, 1, 1 };
-#else
-	static FPI fpi = { 106, 1-1023-53+1, 2046-1023-106+1, 1, 0 };
-#endif
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-
-	B[0] = Balloc(2);
-	B[0]->wds = 4;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	ULtodd((ULong*)f0, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtodd((ULong*)f1, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		((ULong*)f1)[0] = ((ULong*)f0)[0];
-		((ULong*)f1)[1] = ((ULong*)f0)[1];
-		((ULong*)f1)[2] = ((ULong*)f0)[2];
-		((ULong*)f1)[3] = ((ULong*)f0)[3];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoIf.c b/lib/libc/gdtoa/strtoIf.c
deleted file mode 100644
index c439ff5..0000000
--- a/lib/libc/gdtoa/strtoIf.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIf(s, sp, f0, f1) CONST char *s; char **sp; float *f0, *f1;
-#else
-strtoIf(CONST char *s, char **sp, float *f0, float *f1)
-#endif
-{
-	static FPI fpi = { 24, 1-127-24+1,  254-127-24+1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-
-	B[0] = Balloc(0);
-	B[0]->wds = 1;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	ULtof((ULong*)f0, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtof((ULong*)f1, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else
-		*(ULong*)f1 = *(ULong*)f0;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoIg.c b/lib/libc/gdtoa/strtoIg.c
deleted file mode 100644
index a766813..0000000
--- a/lib/libc/gdtoa/strtoIg.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIg(s00, se, fpi, exp, B, rvp) CONST char *s00; char **se; FPI *fpi; Long *exp; Bigint **B; int *rvp;
-#else
-strtoIg(CONST char *s00, char **se, FPI *fpi, Long *exp, Bigint **B, int *rvp)
-#endif
-{
-	Bigint *b, *b1;
-	int i, nb, nw, nw1, rv, rv1, swap;
-	unsigned int nb1, nb11;
-	Long e1;
-
-	b = *B;
-	rv = strtodg(s00, se, fpi, exp, b->x);
-	if (!(rv & STRTOG_Inexact)) {
-		B[1] = 0;
-		return *rvp = rv;
-		}
-	e1 = exp[0];
-	rv1 = rv ^ STRTOG_Inexact;
-	b1 = Balloc(b->k);
-	Bcopy(b1, b);
-	nb = fpi->nbits;
-	nb1 = nb & 31;
-	nb11 = (nb1 - 1) & 31;
-	nw = b->wds;
-	nw1 = nw - 1;
-	if (rv & STRTOG_Inexlo) {
-		swap = 0;
-		b1 = increment(b1);
-		if (fpi->sudden_underflow
-		 && (rv & STRTOG_Retmask) == STRTOG_Zero) {
-			b1->x[0] = 0;
-			b1->x[nw1] = 1L << nb11;
-			rv1 += STRTOG_Normal - STRTOG_Zero;
-			rv1 &= ~STRTOG_Underflow;
-			goto swapcheck;
-			}
-		if (b1->wds > nw
-		 || nb1 && b1->x[nw1] & 1L << nb1) {
-			if (++e1 > fpi->emax)
-				rv1 = STRTOG_Infinite | STRTOG_Inexhi;
-			rshift(b1, 1);
-			}
-		else if ((rv & STRTOG_Retmask) == STRTOG_Denormal) {
-			if (b1->x[nw1] & 1L << nb11) {
-				rv1 += STRTOG_Normal - STRTOG_Denormal;
-				rv1 &= ~STRTOG_Underflow;
-				}
-			}
-		}
-	else {
-		swap = STRTOG_Neg;
-		if ((rv & STRTOG_Retmask) == STRTOG_Infinite) {
-			b1 = set_ones(b1, nb);
-			e1 = fpi->emax;
-			rv1 = STRTOG_Normal | STRTOG_Inexlo;
-			goto swapcheck;
-			}
-		decrement(b1);
-		if ((rv & STRTOG_Retmask) == STRTOG_Denormal) {
-			for(i = nw1; !b1->x[i]; --i)
-				if (!i) {
-					rv1 = STRTOG_Zero | STRTOG_Inexlo;
-					break;
-					}
-			goto swapcheck;
-			}
-		if (!(b1->x[nw1] & 1L << nb11)) {
-			if (e1 == fpi->emin) {
-				if (fpi->sudden_underflow)
-					rv1 += STRTOG_Zero - STRTOG_Normal;
-				else
-					rv1 += STRTOG_Denormal - STRTOG_Normal;
-				rv1 |= STRTOG_Underflow;
-				}
-			else {
-				b1 = lshift(b1, 1);
-				b1->x[0] |= 1;
-				--e1;
-				}
-			}
-		}
- swapcheck:
-	if (swap ^ (rv & STRTOG_Neg)) {
-		rvp[0] = rv1;
-		rvp[1] = rv;
-		B[0] = b1;
-		B[1] = b;
-		exp[1] = exp[0];
-		exp[0] = e1;
-		}
-	else {
-		rvp[0] = rv;
-		rvp[1] = rv1;
-		B[1] = b1;
-		exp[1] = e1;
-		}
-	return rv;
-	}
diff --git a/lib/libc/gdtoa/strtoIx.c b/lib/libc/gdtoa/strtoIx.c
deleted file mode 100644
index d699f04..0000000
--- a/lib/libc/gdtoa/strtoIx.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIx(s, sp, a, b) CONST char *s; char **sp; void *a; void *b;
-#else
-strtoIx(CONST char *s, char **sp, void *a, void *b)
-#endif
-{
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-	UShort *L = (UShort *)a, *M = (UShort *)b;
-
-	B[0] = Balloc(1);
-	B[0]->wds = 2;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	ULtox(L, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtox(M, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		M[0] = L[0];
-		M[1] = L[1];
-		M[2] = L[2];
-		M[3] = L[3];
-		M[4] = L[4];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtoIxL.c b/lib/libc/gdtoa/strtoIxL.c
deleted file mode 100644
index c579589..0000000
--- a/lib/libc/gdtoa/strtoIxL.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtoIxL(s, sp, a, b) CONST char *s; char **sp; void *a; void *b;
-#else
-strtoIxL(CONST char *s, char **sp, void *a, void *b)
-#endif
-{
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	Long exp[2];
-	Bigint *B[2];
-	int k, rv[2];
-	ULong *L = (ULong *)a, *M = (ULong *)b;
-
-	B[0] = Balloc(1);
-	B[0]->wds = 2;
-	k = strtoIg(s, sp, &fpi, exp, B, rv);
-	ULtoxL(L, B[0]->x, exp[0], rv[0]);
-	Bfree(B[0]);
-	if (B[1]) {
-		ULtoxL(M, B[1]->x, exp[1], rv[1]);
-		Bfree(B[1]);
-		}
-	else {
-		M[0] = L[0];
-		M[1] = L[1];
-		M[2] = L[2];
-		}
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtod.c b/lib/libc/gdtoa/strtod.c
deleted file mode 100644
index 4913d50..0000000
--- a/lib/libc/gdtoa/strtod.c
+++ /dev/null
@@ -1,966 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	dmg@acm.org
- */
-
-#include "gdtoaimp.h"
-
-#ifdef USE_LOCALE
-#include "locale.h"
-#endif
-
-#ifdef IEEE_Arith
-#ifndef NO_IEEE_Scale
-#define Avoid_Underflow
-#undef tinytens
-/* The factor of 2^53 in tinytens[4] helps us avoid setting the underflow */
-/* flag unnecessarily.  It leads to a song and dance at the end of strtod. */
-static CONST double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128,
-		9007199254740992.e-256
-		};
-#endif
-#endif
-
-#ifdef Honor_FLT_ROUNDS
-#define Rounding rounding
-#undef Check_FLT_ROUNDS
-#define Check_FLT_ROUNDS
-#else
-#define Rounding Flt_Rounds
-#endif
-
- double
-strtod
-#ifdef KR_headers
-	(s00, se) CONST char *s00; char **se;
-#else
-	(CONST char *s00, char **se)
-#endif
-{
-#ifdef Avoid_Underflow
-	int scale;
-#endif
-	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
-		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
-	CONST char *s, *s0, *s1;
-	double aadj, aadj1, adj, rv, rv0;
-	Long L;
-	ULong y, z;
-	Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
-#ifdef SET_INEXACT
-	int inexact, oldinexact;
-#endif
-#ifdef Honor_FLT_ROUNDS
-	int rounding;
-#endif
-
-	sign = nz0 = nz = 0;
-	dval(rv) = 0.;
-	for(s = s00;;s++) switch(*s) {
-		case '-':
-			sign = 1;
-			/* no break */
-		case '+':
-			if (*++s)
-				goto break2;
-			/* no break */
-		case 0:
-			goto ret0;
-		case '\t':
-		case '\n':
-		case '\v':
-		case '\f':
-		case '\r':
-		case ' ':
-			continue;
-		default:
-			goto break2;
-		}
- break2:
-	if (*s == '0') {
-#ifndef NO_HEX_FP
-		{
-		static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-		Long exp;
-		ULong bits[2];
-		switch(s[1]) {
-		  case 'x':
-		  case 'X':
-			switch((i = gethex(&s, &fpi, &exp, &bb, sign)) & STRTOG_Retmask) {
-			  case STRTOG_NoNumber:
-				s = s00;
-				sign = 0;
-			  case STRTOG_Zero:
-				break;
-			  default:
-				if (bb) {
-					copybits(bits, fpi.nbits, bb);
-					Bfree(bb);
-					}
-				ULtod(((U*)&rv)->L, bits, exp, i);
-			  }
-			goto ret;
-		  }
-		}
-#endif
-		nz0 = 1;
-		while(*++s == '0') ;
-		if (!*s)
-			goto ret;
-		}
-	s0 = s;
-	y = z = 0;
-	for(nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
-		if (nd < 9)
-			y = 10*y + c - '0';
-		else if (nd < 16)
-			z = 10*z + c - '0';
-	nd0 = nd;
-#ifdef USE_LOCALE
-	if (c == *localeconv()->decimal_point)
-#else
-	if (c == '.')
-#endif
-		{
-		c = *++s;
-		if (!nd) {
-			for(; c == '0'; c = *++s)
-				nz++;
-			if (c > '0' && c <= '9') {
-				s0 = s;
-				nf += nz;
-				nz = 0;
-				goto have_dig;
-				}
-			goto dig_done;
-			}
-		for(; c >= '0' && c <= '9'; c = *++s) {
- have_dig:
-			nz++;
-			if (c -= '0') {
-				nf += nz;
-				for(i = 1; i < nz; i++)
-					if (nd++ < 9)
-						y *= 10;
-					else if (nd <= DBL_DIG + 1)
-						z *= 10;
-				if (nd++ < 9)
-					y = 10*y + c;
-				else if (nd <= DBL_DIG + 1)
-					z = 10*z + c;
-				nz = 0;
-				}
-			}
-		}
- dig_done:
-	e = 0;
-	if (c == 'e' || c == 'E') {
-		if (!nd && !nz && !nz0) {
-			goto ret0;
-			}
-		s00 = s;
-		esign = 0;
-		switch(c = *++s) {
-			case '-':
-				esign = 1;
-			case '+':
-				c = *++s;
-			}
-		if (c >= '0' && c <= '9') {
-			while(c == '0')
-				c = *++s;
-			if (c > '0' && c <= '9') {
-				L = c - '0';
-				s1 = s;
-				while((c = *++s) >= '0' && c <= '9')
-					L = 10*L + c - '0';
-				if (s - s1 > 8 || L > 19999)
-					/* Avoid confusion from exponents
-					 * so large that e might overflow.
-					 */
-					e = 19999; /* safe for 16 bit ints */
-				else
-					e = (int)L;
-				if (esign)
-					e = -e;
-				}
-			else
-				e = 0;
-			}
-		else
-			s = s00;
-		}
-	if (!nd) {
-		if (!nz && !nz0) {
-#ifdef INFNAN_CHECK
-			/* Check for Nan and Infinity */
-			ULong bits[2];
-			static FPI fpinan =	/* only 52 explicit bits */
-				{ 52, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-			switch(c) {
-			  case 'i':
-			  case 'I':
-				if (match(&s,"nf")) {
-					--s;
-					if (!match(&s,"inity"))
-						++s;
-					word0(rv) = 0x7ff00000;
-					word1(rv) = 0;
-					goto ret;
-					}
-				break;
-			  case 'n':
-			  case 'N':
-				if (match(&s, "an")) {
-#ifndef No_Hex_NaN
-					if (*s == '(' /*)*/
-					 && hexnan(&s, &fpinan, bits)
-							== STRTOG_NaNbits) {
-						word0(rv) = 0x7ff00000 | bits[1];
-						word1(rv) = bits[0];
-						}
-					else {
-						word0(rv) = NAN_WORD0;
-						word1(rv) = NAN_WORD1;
-						}
-#endif
-					goto ret;
-					}
-			  }
-#endif /* INFNAN_CHECK */
- ret0:
-			s = s00;
-			sign = 0;
-			}
-		goto ret;
-		}
-	e1 = e -= nf;
-
-	/* Now we have nd0 digits, starting at s0, followed by a
-	 * decimal point, followed by nd-nd0 digits.  The number we're
-	 * after is the integer represented by those digits times
-	 * 10**e */
-
-	if (!nd0)
-		nd0 = nd;
-	k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
-	dval(rv) = y;
-	if (k > 9) {
-#ifdef SET_INEXACT
-		if (k > DBL_DIG)
-			oldinexact = get_inexact();
-#endif
-		dval(rv) = tens[k - 9] * dval(rv) + z;
-		}
-	bd0 = 0;
-	if (nd <= DBL_DIG
-#ifndef RND_PRODQUOT
-#ifndef Honor_FLT_ROUNDS
-		&& Flt_Rounds == 1
-#endif
-#endif
-			) {
-		if (!e)
-			goto ret;
-		if (e > 0) {
-			if (e <= Ten_pmax) {
-#ifdef VAX
-				goto vax_ovfl_check;
-#else
-#ifdef Honor_FLT_ROUNDS
-				/* round correctly FLT_ROUNDS = 2 or 3 */
-				if (sign) {
-					rv = -rv;
-					sign = 0;
-					}
-#endif
-				/* rv = */ rounded_product(dval(rv), tens[e]);
-				goto ret;
-#endif
-				}
-			i = DBL_DIG - nd;
-			if (e <= Ten_pmax + i) {
-				/* A fancier test would sometimes let us do
-				 * this for larger i values.
-				 */
-#ifdef Honor_FLT_ROUNDS
-				/* round correctly FLT_ROUNDS = 2 or 3 */
-				if (sign) {
-					rv = -rv;
-					sign = 0;
-					}
-#endif
-				e -= i;
-				dval(rv) *= tens[i];
-#ifdef VAX
-				/* VAX exponent range is so narrow we must
-				 * worry about overflow here...
-				 */
- vax_ovfl_check:
-				word0(rv) -= P*Exp_msk1;
-				/* rv = */ rounded_product(dval(rv), tens[e]);
-				if ((word0(rv) & Exp_mask)
-				 > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
-					goto ovfl;
-				word0(rv) += P*Exp_msk1;
-#else
-				/* rv = */ rounded_product(dval(rv), tens[e]);
-#endif
-				goto ret;
-				}
-			}
-#ifndef Inaccurate_Divide
-		else if (e >= -Ten_pmax) {
-#ifdef Honor_FLT_ROUNDS
-			/* round correctly FLT_ROUNDS = 2 or 3 */
-			if (sign) {
-				rv = -rv;
-				sign = 0;
-				}
-#endif
-			/* rv = */ rounded_quotient(dval(rv), tens[-e]);
-			goto ret;
-			}
-#endif
-		}
-	e1 += nd - k;
-
-#ifdef IEEE_Arith
-#ifdef SET_INEXACT
-	inexact = 1;
-	if (k <= DBL_DIG)
-		oldinexact = get_inexact();
-#endif
-#ifdef Avoid_Underflow
-	scale = 0;
-#endif
-#ifdef Honor_FLT_ROUNDS
-	if ((rounding = Flt_Rounds) >= 2) {
-		if (sign)
-			rounding = rounding == 2 ? 0 : 2;
-		else
-			if (rounding != 2)
-				rounding = 0;
-		}
-#endif
-#endif /*IEEE_Arith*/
-
-	/* Get starting approximation = rv * 10**e1 */
-
-	if (e1 > 0) {
-		if ( (i = e1 & 15) !=0)
-			dval(rv) *= tens[i];
-		if (e1 &= ~15) {
-			if (e1 > DBL_MAX_10_EXP) {
- ovfl:
-#ifndef NO_ERRNO
-				errno = ERANGE;
-#endif
-				/* Can't trust HUGE_VAL */
-#ifdef IEEE_Arith
-#ifdef Honor_FLT_ROUNDS
-				switch(rounding) {
-				  case 0: /* toward 0 */
-				  case 3: /* toward -infinity */
-					word0(rv) = Big0;
-					word1(rv) = Big1;
-					break;
-				  default:
-					word0(rv) = Exp_mask;
-					word1(rv) = 0;
-				  }
-#else /*Honor_FLT_ROUNDS*/
-				word0(rv) = Exp_mask;
-				word1(rv) = 0;
-#endif /*Honor_FLT_ROUNDS*/
-#ifdef SET_INEXACT
-				/* set overflow bit */
-				dval(rv0) = 1e300;
-				dval(rv0) *= dval(rv0);
-#endif
-#else /*IEEE_Arith*/
-				word0(rv) = Big0;
-				word1(rv) = Big1;
-#endif /*IEEE_Arith*/
-				if (bd0)
-					goto retfree;
-				goto ret;
-				}
-			e1 >>= 4;
-			for(j = 0; e1 > 1; j++, e1 >>= 1)
-				if (e1 & 1)
-					dval(rv) *= bigtens[j];
-		/* The last multiplication could overflow. */
-			word0(rv) -= P*Exp_msk1;
-			dval(rv) *= bigtens[j];
-			if ((z = word0(rv) & Exp_mask)
-			 > Exp_msk1*(DBL_MAX_EXP+Bias-P))
-				goto ovfl;
-			if (z > Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {
-				/* set to largest number */
-				/* (Can't trust DBL_MAX) */
-				word0(rv) = Big0;
-				word1(rv) = Big1;
-				}
-			else
-				word0(rv) += P*Exp_msk1;
-			}
-		}
-	else if (e1 < 0) {
-		e1 = -e1;
-		if ( (i = e1 & 15) !=0)
-			dval(rv) /= tens[i];
-		if (e1 >>= 4) {
-			if (e1 >= 1 << n_bigtens)
-				goto undfl;
-#ifdef Avoid_Underflow
-			if (e1 & Scale_Bit)
-				scale = 2*P;
-			for(j = 0; e1 > 0; j++, e1 >>= 1)
-				if (e1 & 1)
-					dval(rv) *= tinytens[j];
-			if (scale && (j = 2*P + 1 - ((word0(rv) & Exp_mask)
-						>> Exp_shift)) > 0) {
-				/* scaled rv is denormal; zap j low bits */
-				if (j >= 32) {
-					word1(rv) = 0;
-					if (j >= 53)
-					 word0(rv) = (P+2)*Exp_msk1;
-					else
-					 word0(rv) &= 0xffffffff << j-32;
-					}
-				else
-					word1(rv) &= 0xffffffff << j;
-				}
-#else
-			for(j = 0; e1 > 1; j++, e1 >>= 1)
-				if (e1 & 1)
-					dval(rv) *= tinytens[j];
-			/* The last multiplication could underflow. */
-			dval(rv0) = dval(rv);
-			dval(rv) *= tinytens[j];
-			if (!dval(rv)) {
-				dval(rv) = 2.*dval(rv0);
-				dval(rv) *= tinytens[j];
-#endif
-				if (!dval(rv)) {
- undfl:
-					dval(rv) = 0.;
-#ifndef NO_ERRNO
-					errno = ERANGE;
-#endif
-					if (bd0)
-						goto retfree;
-					goto ret;
-					}
-#ifndef Avoid_Underflow
-				word0(rv) = Tiny0;
-				word1(rv) = Tiny1;
-				/* The refinement below will clean
-				 * this approximation up.
-				 */
-				}
-#endif
-			}
-		}
-
-	/* Now the hard part -- adjusting rv to the correct value.*/
-
-	/* Put digits into bd: true value = bd * 10^e */
-
-	bd0 = s2b(s0, nd0, nd, y);
-
-	for(;;) {
-		bd = Balloc(bd0->k);
-		Bcopy(bd, bd0);
-		bb = d2b(dval(rv), &bbe, &bbbits);	/* rv = bb * 2^bbe */
-		bs = i2b(1);
-
-		if (e >= 0) {
-			bb2 = bb5 = 0;
-			bd2 = bd5 = e;
-			}
-		else {
-			bb2 = bb5 = -e;
-			bd2 = bd5 = 0;
-			}
-		if (bbe >= 0)
-			bb2 += bbe;
-		else
-			bd2 -= bbe;
-		bs2 = bb2;
-#ifdef Honor_FLT_ROUNDS
-		if (rounding != 1)
-			bs2++;
-#endif
-#ifdef Avoid_Underflow
-		j = bbe - scale;
-		i = j + bbbits - 1;	/* logb(rv) */
-		if (i < Emin)	/* denormal */
-			j += P - Emin;
-		else
-			j = P + 1 - bbbits;
-#else /*Avoid_Underflow*/
-#ifdef Sudden_Underflow
-#ifdef IBM
-		j = 1 + 4*P - 3 - bbbits + ((bbe + bbbits - 1) & 3);
-#else
-		j = P + 1 - bbbits;
-#endif
-#else /*Sudden_Underflow*/
-		j = bbe;
-		i = j + bbbits - 1;	/* logb(rv) */
-		if (i < Emin)	/* denormal */
-			j += P - Emin;
-		else
-			j = P + 1 - bbbits;
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-		bb2 += j;
-		bd2 += j;
-#ifdef Avoid_Underflow
-		bd2 += scale;
-#endif
-		i = bb2 < bd2 ? bb2 : bd2;
-		if (i > bs2)
-			i = bs2;
-		if (i > 0) {
-			bb2 -= i;
-			bd2 -= i;
-			bs2 -= i;
-			}
-		if (bb5 > 0) {
-			bs = pow5mult(bs, bb5);
-			bb1 = mult(bs, bb);
-			Bfree(bb);
-			bb = bb1;
-			}
-		if (bb2 > 0)
-			bb = lshift(bb, bb2);
-		if (bd5 > 0)
-			bd = pow5mult(bd, bd5);
-		if (bd2 > 0)
-			bd = lshift(bd, bd2);
-		if (bs2 > 0)
-			bs = lshift(bs, bs2);
-		delta = diff(bb, bd);
-		dsign = delta->sign;
-		delta->sign = 0;
-		i = cmp(delta, bs);
-#ifdef Honor_FLT_ROUNDS
-		if (rounding != 1) {
-			if (i < 0) {
-				/* Error is less than an ulp */
-				if (!delta->x[0] && delta->wds <= 1) {
-					/* exact */
-#ifdef SET_INEXACT
-					inexact = 0;
-#endif
-					break;
-					}
-				if (rounding) {
-					if (dsign) {
-						adj = 1.;
-						goto apply_adj;
-						}
-					}
-				else if (!dsign) {
-					adj = -1.;
-					if (!word1(rv)
-					 && !(word0(rv) & Frac_mask)) {
-						y = word0(rv) & Exp_mask;
-#ifdef Avoid_Underflow
-						if (!scale || y > 2*P*Exp_msk1)
-#else
-						if (y)
-#endif
-						  {
-						  delta = lshift(delta,Log2P);
-						  if (cmp(delta, bs) <= 0)
-							adj = -0.5;
-						  }
-						}
- apply_adj:
-#ifdef Avoid_Underflow
-					if (scale && (y = word0(rv) & Exp_mask)
-						<= 2*P*Exp_msk1)
-					  word0(adj) += (2*P+1)*Exp_msk1 - y;
-#else
-#ifdef Sudden_Underflow
-					if ((word0(rv) & Exp_mask) <=
-							P*Exp_msk1) {
-						word0(rv) += P*Exp_msk1;
-						dval(rv) += adj*ulp(dval(rv));
-						word0(rv) -= P*Exp_msk1;
-						}
-					else
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-					dval(rv) += adj*ulp(dval(rv));
-					}
-				break;
-				}
-			adj = ratio(delta, bs);
-			if (adj < 1.)
-				adj = 1.;
-			if (adj <= 0x7ffffffe) {
-				/* adj = rounding ? ceil(adj) : floor(adj); */
-				y = adj;
-				if (y != adj) {
-					if (!((rounding>>1) ^ dsign))
-						y++;
-					adj = y;
-					}
-				}
-#ifdef Avoid_Underflow
-			if (scale && (y = word0(rv) & Exp_mask) <= 2*P*Exp_msk1)
-				word0(adj) += (2*P+1)*Exp_msk1 - y;
-#else
-#ifdef Sudden_Underflow
-			if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
-				word0(rv) += P*Exp_msk1;
-				adj *= ulp(dval(rv));
-				if (dsign)
-					dval(rv) += adj;
-				else
-					dval(rv) -= adj;
-				word0(rv) -= P*Exp_msk1;
-				goto cont;
-				}
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-			adj *= ulp(dval(rv));
-			if (dsign)
-				dval(rv) += adj;
-			else
-				dval(rv) -= adj;
-			goto cont;
-			}
-#endif /*Honor_FLT_ROUNDS*/
-
-		if (i < 0) {
-			/* Error is less than half an ulp -- check for
-			 * special case of mantissa a power of two.
-			 */
-			if (dsign || word1(rv) || word0(rv) & Bndry_mask
-#ifdef IEEE_Arith
-#ifdef Avoid_Underflow
-			 || (word0(rv) & Exp_mask) <= (2*P+1)*Exp_msk1
-#else
-			 || (word0(rv) & Exp_mask) <= Exp_msk1
-#endif
-#endif
-				) {
-#ifdef SET_INEXACT
-				if (!delta->x[0] && delta->wds <= 1)
-					inexact = 0;
-#endif
-				break;
-				}
-			if (!delta->x[0] && delta->wds <= 1) {
-				/* exact result */
-#ifdef SET_INEXACT
-				inexact = 0;
-#endif
-				break;
-				}
-			delta = lshift(delta,Log2P);
-			if (cmp(delta, bs) > 0)
-				goto drop_down;
-			break;
-			}
-		if (i == 0) {
-			/* exactly half-way between */
-			if (dsign) {
-				if ((word0(rv) & Bndry_mask1) == Bndry_mask1
-				 &&  word1(rv) == (
-#ifdef Avoid_Underflow
-			(scale && (y = word0(rv) & Exp_mask) <= 2*P*Exp_msk1)
-		? (0xffffffff & (0xffffffff << (2*P+1-(y>>Exp_shift)))) :
-#endif
-						   0xffffffff)) {
-					/*boundary case -- increment exponent*/
-					word0(rv) = (word0(rv) & Exp_mask)
-						+ Exp_msk1
-#ifdef IBM
-						| Exp_msk1 >> 4
-#endif
-						;
-					word1(rv) = 0;
-#ifdef Avoid_Underflow
-					dsign = 0;
-#endif
-					break;
-					}
-				}
-			else if (!(word0(rv) & Bndry_mask) && !word1(rv)) {
- drop_down:
-				/* boundary case -- decrement exponent */
-#ifdef Sudden_Underflow /*{{*/
-				L = word0(rv) & Exp_mask;
-#ifdef IBM
-				if (L <  Exp_msk1)
-#else
-#ifdef Avoid_Underflow
-				if (L <= (scale ? (2*P+1)*Exp_msk1 : Exp_msk1))
-#else
-				if (L <= Exp_msk1)
-#endif /*Avoid_Underflow*/
-#endif /*IBM*/
-					goto undfl;
-				L -= Exp_msk1;
-#else /*Sudden_Underflow}{*/
-#ifdef Avoid_Underflow
-				if (scale) {
-					L = word0(rv) & Exp_mask;
-					if (L <= (2*P+1)*Exp_msk1) {
-						if (L > (P+2)*Exp_msk1)
-							/* round even ==> */
-							/* accept rv */
-							break;
-						/* rv = smallest denormal */
-						goto undfl;
-						}
-					}
-#endif /*Avoid_Underflow*/
-				L = (word0(rv) & Exp_mask) - Exp_msk1;
-#endif /*Sudden_Underflow}*/
-				word0(rv) = L | Bndry_mask1;
-				word1(rv) = 0xffffffff;
-#ifdef IBM
-				goto cont;
-#else
-				break;
-#endif
-				}
-#ifndef ROUND_BIASED
-			if (!(word1(rv) & LSB))
-				break;
-#endif
-			if (dsign)
-				dval(rv) += ulp(dval(rv));
-#ifndef ROUND_BIASED
-			else {
-				dval(rv) -= ulp(dval(rv));
-#ifndef Sudden_Underflow
-				if (!dval(rv))
-					goto undfl;
-#endif
-				}
-#ifdef Avoid_Underflow
-			dsign = 1 - dsign;
-#endif
-#endif
-			break;
-			}
-		if ((aadj = ratio(delta, bs)) <= 2.) {
-			if (dsign)
-				aadj = aadj1 = 1.;
-			else if (word1(rv) || word0(rv) & Bndry_mask) {
-#ifndef Sudden_Underflow
-				if (word1(rv) == Tiny1 && !word0(rv))
-					goto undfl;
-#endif
-				aadj = 1.;
-				aadj1 = -1.;
-				}
-			else {
-				/* special case -- power of FLT_RADIX to be */
-				/* rounded down... */
-
-				if (aadj < 2./FLT_RADIX)
-					aadj = 1./FLT_RADIX;
-				else
-					aadj *= 0.5;
-				aadj1 = -aadj;
-				}
-			}
-		else {
-			aadj *= 0.5;
-			aadj1 = dsign ? aadj : -aadj;
-#ifdef Check_FLT_ROUNDS
-			switch(Rounding) {
-				case 2: /* towards +infinity */
-					aadj1 -= 0.5;
-					break;
-				case 0: /* towards 0 */
-				case 3: /* towards -infinity */
-					aadj1 += 0.5;
-				}
-#else
-			if (Flt_Rounds == 0)
-				aadj1 += 0.5;
-#endif /*Check_FLT_ROUNDS*/
-			}
-		y = word0(rv) & Exp_mask;
-
-		/* Check for overflow */
-
-		if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {
-			dval(rv0) = dval(rv);
-			word0(rv) -= P*Exp_msk1;
-			adj = aadj1 * ulp(dval(rv));
-			dval(rv) += adj;
-			if ((word0(rv) & Exp_mask) >=
-					Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
-				if (word0(rv0) == Big0 && word1(rv0) == Big1)
-					goto ovfl;
-				word0(rv) = Big0;
-				word1(rv) = Big1;
-				goto cont;
-				}
-			else
-				word0(rv) += P*Exp_msk1;
-			}
-		else {
-#ifdef Avoid_Underflow
-			if (scale && y <= 2*P*Exp_msk1) {
-				if (aadj <= 0x7fffffff) {
-					if ((z = aadj) <= 0)
-						z = 1;
-					aadj = z;
-					aadj1 = dsign ? aadj : -aadj;
-					}
-				word0(aadj1) += (2*P+1)*Exp_msk1 - y;
-				}
-			adj = aadj1 * ulp(dval(rv));
-			dval(rv) += adj;
-#else
-#ifdef Sudden_Underflow
-			if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
-				dval(rv0) = dval(rv);
-				word0(rv) += P*Exp_msk1;
-				adj = aadj1 * ulp(dval(rv));
-				dval(rv) += adj;
-#ifdef IBM
-				if ((word0(rv) & Exp_mask) <  P*Exp_msk1)
-#else
-				if ((word0(rv) & Exp_mask) <= P*Exp_msk1)
-#endif
-					{
-					if (word0(rv0) == Tiny0
-					 && word1(rv0) == Tiny1)
-						goto undfl;
-					word0(rv) = Tiny0;
-					word1(rv) = Tiny1;
-					goto cont;
-					}
-				else
-					word0(rv) -= P*Exp_msk1;
-				}
-			else {
-				adj = aadj1 * ulp(dval(rv));
-				dval(rv) += adj;
-				}
-#else /*Sudden_Underflow*/
-			/* Compute adj so that the IEEE rounding rules will
-			 * correctly round rv + adj in some half-way cases.
-			 * If rv * ulp(rv) is denormalized (i.e.,
-			 * y <= (P-1)*Exp_msk1), we must adjust aadj to avoid
-			 * trouble from bits lost to denormalization;
-			 * example: 1.2e-307 .
-			 */
-			if (y <= (P-1)*Exp_msk1 && aadj > 1.) {
-				aadj1 = (double)(int)(aadj + 0.5);
-				if (!dsign)
-					aadj1 = -aadj1;
-				}
-			adj = aadj1 * ulp(dval(rv));
-			dval(rv) += adj;
-#endif /*Sudden_Underflow*/
-#endif /*Avoid_Underflow*/
-			}
-		z = word0(rv) & Exp_mask;
-#ifndef SET_INEXACT
-#ifdef Avoid_Underflow
-		if (!scale)
-#endif
-		if (y == z) {
-			/* Can we stop now? */
-			L = (Long)aadj;
-			aadj -= L;
-			/* The tolerances below are conservative. */
-			if (dsign || word1(rv) || word0(rv) & Bndry_mask) {
-				if (aadj < .4999999 || aadj > .5000001)
-					break;
-				}
-			else if (aadj < .4999999/FLT_RADIX)
-				break;
-			}
-#endif
- cont:
-		Bfree(bb);
-		Bfree(bd);
-		Bfree(bs);
-		Bfree(delta);
-		}
-#ifdef SET_INEXACT
-	if (inexact) {
-		if (!oldinexact) {
-			word0(rv0) = Exp_1 + (70 << Exp_shift);
-			word1(rv0) = 0;
-			dval(rv0) += 1.;
-			}
-		}
-	else if (!oldinexact)
-		clear_inexact();
-#endif
-#ifdef Avoid_Underflow
-	if (scale) {
-		word0(rv0) = Exp_1 - 2*P*Exp_msk1;
-		word1(rv0) = 0;
-		dval(rv) *= dval(rv0);
-#ifndef NO_ERRNO
-		/* try to avoid the bug of testing an 8087 register value */
-		if (word0(rv) == 0 && word1(rv) == 0)
-			errno = ERANGE;
-#endif
-		}
-#endif /* Avoid_Underflow */
-#ifdef SET_INEXACT
-	if (inexact && !(word0(rv) & Exp_mask)) {
-		/* set underflow bit */
-		dval(rv0) = 1e-300;
-		dval(rv0) *= dval(rv0);
-		}
-#endif
- retfree:
-	Bfree(bb);
-	Bfree(bd);
-	Bfree(bs);
-	Bfree(bd0);
-	Bfree(delta);
- ret:
-	if (se)
-		*se = (char *)s;
-	return sign ? -dval(rv) : dval(rv);
-	}
-
diff --git a/lib/libc/gdtoa/strtodI.c b/lib/libc/gdtoa/strtodI.c
deleted file mode 100644
index 163f363..0000000
--- a/lib/libc/gdtoa/strtodI.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- static double
-#ifdef KR_headers
-ulpdown(d) double *d;
-#else
-ulpdown(double *d)
-#endif
-{
-	double u;
-	ULong *L = (ULong*)d;
-
-	u = ulp(*d);
-	if (!(L[_1] | L[_0] & 0xfffff)
-	 && (L[_0] & 0x7ff00000) > 0x00100000)
-		u *= 0.5;
-	return u;
-	}
-
- int
-#ifdef KR_headers
-strtodI(s, sp, dd) CONST char *s; char **sp; double *dd;
-#else
-strtodI(CONST char *s, char **sp, double *dd)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 1 };
-#else
-	static FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, 0 };
-#endif
-	ULong bits[2], sign;
-	Long exp;
-	int j, k;
-	typedef union {
-		double d[2];
-		ULong L[4];
-		} U;
-	U *u;
-
-	k = strtodg(s, sp, &fpi, &exp, bits);
-	u = (U*)dd;
-	sign = k & STRTOG_Neg ? 0x80000000L : 0;
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-		u->d[0] = u->d[1] = 0.;
-		break;
-
-	  case STRTOG_Zero:
-		u->d[0] = u->d[1] = 0.;
-#ifdef Sudden_Underflow
-		if (k & STRTOG_Inexact) {
-			if (sign)
-				u->L[_0] = 0x80100000L;
-			else
-				u->L[2+_0] = 0x100000L;
-			}
-		break;
-#else
-		goto contain;
-#endif
-
-	  case STRTOG_Denormal:
-		u->L[_1] = bits[0];
-		u->L[_0] = bits[1];
-		goto contain;
-
-	  case STRTOG_Normal:
-		u->L[_1] = bits[0];
-		u->L[_0] = (bits[1] & ~0x100000) | ((exp + 0x3ff + 52) << 20);
-	  contain:
-		j = k & STRTOG_Inexact;
-		if (sign) {
-			u->L[_0] |= sign;
-			j = STRTOG_Inexact - j;
-			}
-		switch(j) {
-		  case STRTOG_Inexlo:
-#ifdef Sudden_Underflow
-			if ((u->L[_0] & 0x7ff00000) < 0x3500000) {
-				u->L[2+_0] = u->L[_0] + 0x3500000;
-				u->L[2+_1] = u->L[_1];
-				u->d[1] += ulp(u->d[1]);
-				u->L[2+_0] -= 0x3500000;
-				if (!(u->L[2+_0] & 0x7ff00000)) {
-					u->L[2+_0] = sign;
-					u->L[2+_1] = 0;
-					}
-				}
-			else
-#endif
-			u->d[1] = u->d[0] + ulp(u->d[0]);
-			break;
-		  case STRTOG_Inexhi:
-			u->d[1] = u->d[0];
-#ifdef Sudden_Underflow
-			if ((u->L[_0] & 0x7ff00000) < 0x3500000) {
-				u->L[_0] += 0x3500000;
-				u->d[0] -= ulpdown(u->d);
-				u->L[_0] -= 0x3500000;
-				if (!(u->L[_0] & 0x7ff00000)) {
-					u->L[_0] = sign;
-					u->L[_1] = 0;
-					}
-				}
-			else
-#endif
-			u->d[0] -= ulpdown(u->d);
-			break;
-		  default:
-			u->d[1] = u->d[0];
-		  }
-		break;
-
-	  case STRTOG_Infinite:
-		u->L[_0] = u->L[2+_0] = sign | 0x7ff00000;
-		u->L[_1] = u->L[2+_1] = 0;
-		if (k & STRTOG_Inexact) {
-			if (sign) {
-				u->L[2+_0] = 0xffefffffL;
-				u->L[2+_1] = 0xffffffffL;
-				}
-			else {
-				u->L[_0] = 0x7fefffffL;
-				u->L[_1] = 0xffffffffL;
-				}
-			}
-		break;
-
-	  case STRTOG_NaN:
-		u->L[_0] = u->L[2+_0] = 0x7fffffff | sign;
-		u->L[_1] = u->L[2+_1] = (ULong)-1;
-		break;
-
-	  case STRTOG_NaNbits:
-		u->L[_0] = u->L[2+_0] = 0x7ff00000 | sign | bits[1];
-		u->L[_1] = u->L[2+_1] = bits[0];
-	  }
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtodg.c b/lib/libc/gdtoa/strtodg.c
deleted file mode 100644
index bf30e33..0000000
--- a/lib/libc/gdtoa/strtodg.c
+++ /dev/null
@@ -1,1001 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998-2001 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	dmg@acm.org
- */
-
-#include "gdtoaimp.h"
-
-#ifdef USE_LOCALE
-#include "locale.h"
-#endif
-
- static CONST int
-fivesbits[] = {	 0,  3,  5,  7, 10, 12, 14, 17, 19, 21,
-		24, 26, 28, 31, 33, 35, 38, 40, 42, 45,
-		47, 49, 52
-#ifdef VAX
-		, 54, 56
-#endif
-		};
-
- Bigint *
-#ifdef KR_headers
-increment(b) Bigint *b;
-#else
-increment(Bigint *b)
-#endif
-{
-	ULong *x, *xe;
-	Bigint *b1;
-#ifdef Pack_16
-	ULong carry = 1, y;
-#endif
-
-	x = b->x;
-	xe = x + b->wds;
-#ifdef Pack_32
-	do {
-		if (*x < (ULong)0xffffffffL) {
-			++*x;
-			return b;
-			}
-		*x++ = 0;
-		} while(x < xe);
-#else
-	do {
-		y = *x + carry;
-		carry = y >> 16;
-		*x++ = y & 0xffff;
-		if (!carry)
-			return b;
-		} while(x < xe);
-	if (carry)
-#endif
-	{
-		if (b->wds >= b->maxwds) {
-			b1 = Balloc(b->k+1);
-			Bcopy(b1,b);
-			Bfree(b);
-			b = b1;
-			}
-		b->x[b->wds++] = 1;
-		}
-	return b;
-	}
-
- int
-#ifdef KR_headers
-decrement(b) Bigint *b;
-#else
-decrement(Bigint *b)
-#endif
-{
-	ULong *x, *xe;
-#ifdef Pack_16
-	ULong borrow = 1, y;
-#endif
-
-	x = b->x;
-	xe = x + b->wds;
-#ifdef Pack_32
-	do {
-		if (*x) {
-			--*x;
-			break;
-			}
-		*x++ = 0xffffffffL;
-		}
-		while(x < xe);
-#else
-	do {
-		y = *x - borrow;
-		borrow = (y & 0x10000) >> 16;
-		*x++ = y & 0xffff;
-		} while(borrow && x < xe);
-#endif
-	return STRTOG_Inexlo;
-	}
-
- static int
-#ifdef KR_headers
-all_on(b, n) Bigint *b; int n;
-#else
-all_on(Bigint *b, int n)
-#endif
-{
-	ULong *x, *xe;
-
-	x = b->x;
-	xe = x + (n >> kshift);
-	while(x < xe)
-		if ((*x++ & ALL_ON) != ALL_ON)
-			return 0;
-	if (n &= kmask)
-		return ((*x | (ALL_ON << n)) & ALL_ON) == ALL_ON;
-	return 1;
-	}
-
- Bigint *
-#ifdef KR_headers
-set_ones(b, n) Bigint *b; int n;
-#else
-set_ones(Bigint *b, int n)
-#endif
-{
-	int k;
-	ULong *x, *xe;
-
-	k = (n + ((1 << kshift) - 1)) >> kshift;
-	if (b->k < k) {
-		Bfree(b);
-		b = Balloc(k);
-		}
-	k = n >> kshift;
-	if (n &= kmask)
-		k++;
-	b->wds = k;
-	x = b->x;
-	xe = x + k;
-	while(x < xe)
-		*x++ = ALL_ON;
-	if (n)
-		x[-1] >>= ULbits - n;
-	return b;
-	}
-
- static int
-rvOK
-#ifdef KR_headers
- (d, fpi, exp, bits, exact, rd, irv)
- double d; FPI *fpi; Long *exp; ULong *bits; int exact, rd, *irv;
-#else
- (double d, FPI *fpi, Long *exp, ULong *bits, int exact, int rd, int *irv)
-#endif
-{
-	Bigint *b;
-	ULong carry, inex, lostbits;
-	int bdif, e, j, k, k1, nb, rv;
-
-	carry = rv = 0;
-	b = d2b(d, &e, &bdif);
-	bdif -= nb = fpi->nbits;
-	e += bdif;
-	if (bdif <= 0) {
-		if (exact)
-			goto trunc;
-		goto ret;
-		}
-	if (P == nb) {
-		if (
-#ifndef IMPRECISE_INEXACT
-			exact &&
-#endif
-			fpi->rounding ==
-#ifdef RND_PRODQUOT
-					FPI_Round_near
-#else
-					Flt_Rounds
-#endif
-			) goto trunc;
-		goto ret;
-		}
-	switch(rd) {
-	  case 1:
-		goto trunc;
-	  case 2:
-		break;
-	  default: /* round near */
-		k = bdif - 1;
-		if (k < 0)
-			goto trunc;
-		if (!k) {
-			if (!exact)
-				goto ret;
-			if (b->x[0] & 2)
-				break;
-			goto trunc;
-			}
-		if (b->x[k>>kshift] & ((ULong)1 << (k & kmask)))
-			break;
-		goto trunc;
-	  }
-	/* "break" cases: round up 1 bit, then truncate; bdif > 0 */
-	carry = 1;
- trunc:
-	inex = lostbits = 0;
-	if (bdif > 0) {
-		if ( (lostbits = any_on(b, bdif)) !=0)
-			inex = STRTOG_Inexlo;
-		rshift(b, bdif);
-		if (carry) {
-			inex = STRTOG_Inexhi;
-			b = increment(b);
-			if ( (j = nb & kmask) !=0)
-				j = 32 - j;
-			if (hi0bits(b->x[b->wds - 1]) != j) {
-				if (!lostbits)
-					lostbits = b->x[0] & 1;
-				rshift(b, 1);
-				e++;
-				}
-			}
-		}
-	else if (bdif < 0)
-		b = lshift(b, -bdif);
-	if (e < fpi->emin) {
-		k = fpi->emin - e;
-		e = fpi->emin;
-		if (k > nb || fpi->sudden_underflow) {
-			b->wds = inex = 0;
-			*irv = STRTOG_Underflow | STRTOG_Inexlo;
-			}
-		else {
-			k1 = k - 1;
-			if (k1 > 0 && !lostbits)
-				lostbits = any_on(b, k1);
-			if (!lostbits && !exact)
-				goto ret;
-			lostbits |=
-			  carry = b->x[k1>>kshift] & (1 << (k1 & kmask));
-			rshift(b, k);
-			*irv = STRTOG_Denormal;
-			if (carry) {
-				b = increment(b);
-				inex = STRTOG_Inexhi | STRTOG_Underflow;
-				}
-			else if (lostbits)
-				inex = STRTOG_Inexlo | STRTOG_Underflow;
-			}
-		}
-	else if (e > fpi->emax) {
-		e = fpi->emax + 1;
-		*irv = STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi;
-#ifndef NO_ERRNO
-		errno = ERANGE;
-#endif
-		b->wds = inex = 0;
-		}
-	*exp = e;
-	copybits(bits, nb, b);
-	*irv |= inex;
-	rv = 1;
- ret:
-	Bfree(b);
-	return rv;
-	}
-
- static int
-#ifdef KR_headers
-mantbits(d) double d;
-#else
-mantbits(double d)
-#endif
-{
-	ULong L;
-#ifdef VAX
-	L = word1(d) << 16 | word1(d) >> 16;
-	if (L)
-#else
-	if ( (L = word1(d)) !=0)
-#endif
-		return P - lo0bits(&L);
-#ifdef VAX
-	L = word0(d) << 16 | word0(d) >> 16 | Exp_msk11;
-#else
-	L = word0(d) | Exp_msk1;
-#endif
-	return P - 32 - lo0bits(&L);
-	}
-
- int
-strtodg
-#ifdef KR_headers
-	(s00, se, fpi, exp, bits)
-	CONST char *s00; char **se; FPI *fpi; Long *exp; ULong *bits;
-#else
-	(CONST char *s00, char **se, FPI *fpi, Long *exp, ULong *bits)
-#endif
-{
-	int abe, abits, asub;
-	int bb0, bb2, bb5, bbe, bd2, bd5, bbbits, bs2;
-	int c, denorm, dsign, e, e1, e2, emin, esign, finished, i, inex, irv;
-	int j, k, nbits, nd, nd0, nf, nz, nz0, rd, rvbits, rve, rve1, sign;
-	int sudden_underflow;
-	CONST char *s, *s0, *s1;
-	double adj, adj0, rv, tol;
-	Long L;
-	ULong y, z;
-	Bigint *ab, *bb, *bb1, *bd, *bd0, *bs, *delta, *rvb, *rvb0;
-
-	irv = STRTOG_Zero;
-	denorm = sign = nz0 = nz = 0;
-	dval(rv) = 0.;
-	rvb = 0;
-	nbits = fpi->nbits;
-	for(s = s00;;s++) switch(*s) {
-		case '-':
-			sign = 1;
-			/* no break */
-		case '+':
-			if (*++s)
-				goto break2;
-			/* no break */
-		case 0:
-			sign = 0;
-			irv = STRTOG_NoNumber;
-			s = s00;
-			goto ret;
-		case '\t':
-		case '\n':
-		case '\v':
-		case '\f':
-		case '\r':
-		case ' ':
-			continue;
-		default:
-			goto break2;
-		}
- break2:
-	if (*s == '0') {
-#ifndef NO_HEX_FP
-		switch(s[1]) {
-		  case 'x':
-		  case 'X':
-			irv = gethex(&s, fpi, exp, &rvb, sign);
-			if (irv == STRTOG_NoNumber) {
-				s = s00;
-				sign = 0;
-				}
-			goto ret;
-		  }
-#endif
-		nz0 = 1;
-		while(*++s == '0') ;
-		if (!*s)
-			goto ret;
-		}
-	sudden_underflow = fpi->sudden_underflow;
-	s0 = s;
-	y = z = 0;
-	for(nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
-		if (nd < 9)
-			y = 10*y + c - '0';
-		else if (nd < 16)
-			z = 10*z + c - '0';
-	nd0 = nd;
-#ifdef USE_LOCALE
-	if (c == *localeconv()->decimal_point)
-#else
-	if (c == '.')
-#endif
-		{
-		c = *++s;
-		if (!nd) {
-			for(; c == '0'; c = *++s)
-				nz++;
-			if (c > '0' && c <= '9') {
-				s0 = s;
-				nf += nz;
-				nz = 0;
-				goto have_dig;
-				}
-			goto dig_done;
-			}
-		for(; c >= '0' && c <= '9'; c = *++s) {
- have_dig:
-			nz++;
-			if (c -= '0') {
-				nf += nz;
-				for(i = 1; i < nz; i++)
-					if (nd++ < 9)
-						y *= 10;
-					else if (nd <= DBL_DIG + 1)
-						z *= 10;
-				if (nd++ < 9)
-					y = 10*y + c;
-				else if (nd <= DBL_DIG + 1)
-					z = 10*z + c;
-				nz = 0;
-				}
-			}
-		}
- dig_done:
-	e = 0;
-	if (c == 'e' || c == 'E') {
-		if (!nd && !nz && !nz0) {
-			irv = STRTOG_NoNumber;
-			s = s00;
-			goto ret;
-			}
-		s00 = s;
-		esign = 0;
-		switch(c = *++s) {
-			case '-':
-				esign = 1;
-			case '+':
-				c = *++s;
-			}
-		if (c >= '0' && c <= '9') {
-			while(c == '0')
-				c = *++s;
-			if (c > '0' && c <= '9') {
-				L = c - '0';
-				s1 = s;
-				while((c = *++s) >= '0' && c <= '9')
-					L = 10*L + c - '0';
-				if (s - s1 > 8 || L > 19999)
-					/* Avoid confusion from exponents
-					 * so large that e might overflow.
-					 */
-					e = 19999; /* safe for 16 bit ints */
-				else
-					e = (int)L;
-				if (esign)
-					e = -e;
-				}
-			else
-				e = 0;
-			}
-		else
-			s = s00;
-		}
-	if (!nd) {
-		if (!nz && !nz0) {
-#ifdef INFNAN_CHECK
-			/* Check for Nan and Infinity */
-			switch(c) {
-			  case 'i':
-			  case 'I':
-				if (match(&s,"nf")) {
-					--s;
-					if (!match(&s,"inity"))
-						++s;
-					irv = STRTOG_Infinite;
-					goto infnanexp;
-					}
-				break;
-			  case 'n':
-			  case 'N':
-				if (match(&s, "an")) {
-					irv = STRTOG_NaN;
-					*exp = fpi->emax + 1;
-#ifndef No_Hex_NaN
-					if (*s == '(') /*)*/
-						irv = hexnan(&s, fpi, bits);
-#endif
-					goto infnanexp;
-					}
-			  }
-#endif /* INFNAN_CHECK */
-			irv = STRTOG_NoNumber;
-			s = s00;
-			}
-		goto ret;
-		}
-
-	irv = STRTOG_Normal;
-	e1 = e -= nf;
-	rd = 0;
-	switch(fpi->rounding & 3) {
-	  case FPI_Round_up:
-		rd = 2 - sign;
-		break;
-	  case FPI_Round_zero:
-		rd = 1;
-		break;
-	  case FPI_Round_down:
-		rd = 1 + sign;
-	  }
-
-	/* Now we have nd0 digits, starting at s0, followed by a
-	 * decimal point, followed by nd-nd0 digits.  The number we're
-	 * after is the integer represented by those digits times
-	 * 10**e */
-
-	if (!nd0)
-		nd0 = nd;
-	k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
-	dval(rv) = y;
-	if (k > 9)
-		dval(rv) = tens[k - 9] * dval(rv) + z;
-	bd0 = 0;
-	if (nbits <= P && nd <= DBL_DIG) {
-		if (!e) {
-			if (rvOK(dval(rv), fpi, exp, bits, 1, rd, &irv))
-				goto ret;
-			}
-		else if (e > 0) {
-			if (e <= Ten_pmax) {
-#ifdef VAX
-				goto vax_ovfl_check;
-#else
-				i = fivesbits[e] + mantbits(dval(rv)) <= P;
-				/* rv = */ rounded_product(dval(rv), tens[e]);
-				if (rvOK(dval(rv), fpi, exp, bits, i, rd, &irv))
-					goto ret;
-				e1 -= e;
-				goto rv_notOK;
-#endif
-				}
-			i = DBL_DIG - nd;
-			if (e <= Ten_pmax + i) {
-				/* A fancier test would sometimes let us do
-				 * this for larger i values.
-				 */
-				e2 = e - i;
-				e1 -= i;
-				dval(rv) *= tens[i];
-#ifdef VAX
-				/* VAX exponent range is so narrow we must
-				 * worry about overflow here...
-				 */
- vax_ovfl_check:
-				dval(adj) = dval(rv);
-				word0(adj) -= P*Exp_msk1;
-				/* adj = */ rounded_product(dval(adj), tens[e2]);
-				if ((word0(adj) & Exp_mask)
-				 > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
-					goto rv_notOK;
-				word0(adj) += P*Exp_msk1;
-				dval(rv) = dval(adj);
-#else
-				/* rv = */ rounded_product(dval(rv), tens[e2]);
-#endif
-				if (rvOK(dval(rv), fpi, exp, bits, 0, rd, &irv))
-					goto ret;
-				e1 -= e2;
-				}
-			}
-#ifndef Inaccurate_Divide
-		else if (e >= -Ten_pmax) {
-			/* rv = */ rounded_quotient(dval(rv), tens[-e]);
-			if (rvOK(dval(rv), fpi, exp, bits, 0, rd, &irv))
-				goto ret;
-			e1 -= e;
-			}
-#endif
-		}
- rv_notOK:
-	e1 += nd - k;
-
-	/* Get starting approximation = rv * 10**e1 */
-
-	e2 = 0;
-	if (e1 > 0) {
-		if ( (i = e1 & 15) !=0)
-			dval(rv) *= tens[i];
-		if (e1 &= ~15) {
-			e1 >>= 4;
-			while(e1 >= (1 << n_bigtens-1)) {
-				e2 += ((word0(rv) & Exp_mask)
-					>> Exp_shift1) - Bias;
-				word0(rv) &= ~Exp_mask;
-				word0(rv) |= Bias << Exp_shift1;
-				dval(rv) *= bigtens[n_bigtens-1];
-				e1 -= 1 << n_bigtens-1;
-				}
-			e2 += ((word0(rv) & Exp_mask) >> Exp_shift1) - Bias;
-			word0(rv) &= ~Exp_mask;
-			word0(rv) |= Bias << Exp_shift1;
-			for(j = 0; e1 > 0; j++, e1 >>= 1)
-				if (e1 & 1)
-					dval(rv) *= bigtens[j];
-			}
-		}
-	else if (e1 < 0) {
-		e1 = -e1;
-		if ( (i = e1 & 15) !=0)
-			dval(rv) /= tens[i];
-		if (e1 &= ~15) {
-			e1 >>= 4;
-			while(e1 >= (1 << n_bigtens-1)) {
-				e2 += ((word0(rv) & Exp_mask)
-					>> Exp_shift1) - Bias;
-				word0(rv) &= ~Exp_mask;
-				word0(rv) |= Bias << Exp_shift1;
-				dval(rv) *= tinytens[n_bigtens-1];
-				e1 -= 1 << n_bigtens-1;
-				}
-			e2 += ((word0(rv) & Exp_mask) >> Exp_shift1) - Bias;
-			word0(rv) &= ~Exp_mask;
-			word0(rv) |= Bias << Exp_shift1;
-			for(j = 0; e1 > 0; j++, e1 >>= 1)
-				if (e1 & 1)
-					dval(rv) *= tinytens[j];
-			}
-		}
-
-	rvb = d2b(dval(rv), &rve, &rvbits);	/* rv = rvb * 2^rve */
-	rve += e2;
-	if ((j = rvbits - nbits) > 0) {
-		rshift(rvb, j);
-		rvbits = nbits;
-		rve += j;
-		}
-	bb0 = 0;	/* trailing zero bits in rvb */
-	e2 = rve + rvbits - nbits;
-	if (e2 > fpi->emax) {
-		rvb->wds = 0;
-		irv = STRTOG_Infinite | STRTOG_Overflow | STRTOG_Inexhi;
-#ifndef NO_ERRNO
-		errno = ERANGE;
-#endif
- infnanexp:
-		*exp = fpi->emax + 1;
-		goto ret;
-		}
-	rve1 = rve + rvbits - nbits;
-	if (e2 < (emin = fpi->emin)) {
-		denorm = 1;
-		j = rve - emin;
-		if (j > 0) {
-			rvb = lshift(rvb, j);
-			rvbits += j;
-			}
-		else if (j < 0) {
-			rvbits += j;
-			if (rvbits <= 0) {
-				if (rvbits < -1) {
- ufl:
-					rvb->wds = 0;
-					rvb->x[0] = 0;
-					*exp = emin;
-					irv = STRTOG_Underflow | STRTOG_Inexlo;
-					goto ret;
-					}
-				rvb->x[0] = rvb->wds = rvbits = 1;
-				}
-			else
-				rshift(rvb, -j);
-			}
-		rve = rve1 = emin;
-		if (sudden_underflow && e2 + 1 < emin)
-			goto ufl;
-		}
-
-	/* Now the hard part -- adjusting rv to the correct value.*/
-
-	/* Put digits into bd: true value = bd * 10^e */
-
-	bd0 = s2b(s0, nd0, nd, y);
-
-	for(;;) {
-		bd = Balloc(bd0->k);
-		Bcopy(bd, bd0);
-		bb = Balloc(rvb->k);
-		Bcopy(bb, rvb);
-		bbbits = rvbits - bb0;
-		bbe = rve + bb0;
-		bs = i2b(1);
-
-		if (e >= 0) {
-			bb2 = bb5 = 0;
-			bd2 = bd5 = e;
-			}
-		else {
-			bb2 = bb5 = -e;
-			bd2 = bd5 = 0;
-			}
-		if (bbe >= 0)
-			bb2 += bbe;
-		else
-			bd2 -= bbe;
-		bs2 = bb2;
-		j = nbits + 1 - bbbits;
-		i = bbe + bbbits - nbits;
-		if (i < emin)	/* denormal */
-			j += i - emin;
-		bb2 += j;
-		bd2 += j;
-		i = bb2 < bd2 ? bb2 : bd2;
-		if (i > bs2)
-			i = bs2;
-		if (i > 0) {
-			bb2 -= i;
-			bd2 -= i;
-			bs2 -= i;
-			}
-		if (bb5 > 0) {
-			bs = pow5mult(bs, bb5);
-			bb1 = mult(bs, bb);
-			Bfree(bb);
-			bb = bb1;
-			}
-		bb2 -= bb0;
-		if (bb2 > 0)
-			bb = lshift(bb, bb2);
-		else if (bb2 < 0)
-			rshift(bb, -bb2);
-		if (bd5 > 0)
-			bd = pow5mult(bd, bd5);
-		if (bd2 > 0)
-			bd = lshift(bd, bd2);
-		if (bs2 > 0)
-			bs = lshift(bs, bs2);
-		asub = 1;
-		inex = STRTOG_Inexhi;
-		delta = diff(bb, bd);
-		if (delta->wds <= 1 && !delta->x[0])
-			break;
-		dsign = delta->sign;
-		delta->sign = finished = 0;
-		L = 0;
-		i = cmp(delta, bs);
-		if (rd && i <= 0) {
-			irv = STRTOG_Normal;
-			if ( (finished = dsign ^ (rd&1)) !=0) {
-				if (dsign != 0) {
-					irv |= STRTOG_Inexhi;
-					goto adj1;
-					}
-				irv |= STRTOG_Inexlo;
-				if (rve1 == emin)
-					goto adj1;
-				for(i = 0, j = nbits; j >= ULbits;
-						i++, j -= ULbits) {
-					if (rvb->x[i] & ALL_ON)
-						goto adj1;
-					}
-				if (j > 1 && lo0bits(rvb->x + i) < j - 1)
-					goto adj1;
-				rve = rve1 - 1;
-				rvb = set_ones(rvb, rvbits = nbits);
-				break;
-				}
-			irv |= dsign ? STRTOG_Inexlo : STRTOG_Inexhi;
-			break;
-			}
-		if (i < 0) {
-			/* Error is less than half an ulp -- check for
-			 * special case of mantissa a power of two.
-			 */
-			irv = dsign
-				? STRTOG_Normal | STRTOG_Inexlo
-				: STRTOG_Normal | STRTOG_Inexhi;
-			if (dsign || bbbits > 1 || denorm || rve1 == emin)
-				break;
-			delta = lshift(delta,1);
-			if (cmp(delta, bs) > 0) {
-				irv = STRTOG_Normal | STRTOG_Inexlo;
-				goto drop_down;
-				}
-			break;
-			}
-		if (i == 0) {
-			/* exactly half-way between */
-			if (dsign) {
-				if (denorm && all_on(rvb, rvbits)) {
-					/*boundary case -- increment exponent*/
-					rvb->wds = 1;
-					rvb->x[0] = 1;
-					rve = emin + nbits - (rvbits = 1);
-					irv = STRTOG_Normal | STRTOG_Inexhi;
-					denorm = 0;
-					break;
-					}
-				irv = STRTOG_Normal | STRTOG_Inexlo;
-				}
-			else if (bbbits == 1) {
-				irv = STRTOG_Normal;
- drop_down:
-				/* boundary case -- decrement exponent */
-				if (rve1 == emin) {
-					irv = STRTOG_Normal | STRTOG_Inexhi;
-					if (rvb->wds == 1 && rvb->x[0] == 1)
-						sudden_underflow = 1;
-					break;
-					}
-				rve -= nbits;
-				rvb = set_ones(rvb, rvbits = nbits);
-				break;
-				}
-			else
-				irv = STRTOG_Normal | STRTOG_Inexhi;
-			if (bbbits < nbits && !denorm || !(rvb->x[0] & 1))
-				break;
-			if (dsign) {
-				rvb = increment(rvb);
-				if ( (j = rvbits >> kshift) !=0)
-					j = 32 - j;
-				if (hi0bits(rvb->x[(rvb->wds - 1) >> kshift])
-						!= j)
-					rvbits++;
-				irv = STRTOG_Normal | STRTOG_Inexhi;
-				}
-			else {
-				if (bbbits == 1)
-					goto undfl;
-				decrement(rvb);
-				irv = STRTOG_Normal | STRTOG_Inexlo;
-				}
-			break;
-			}
-		if ((dval(adj) = ratio(delta, bs)) <= 2.) {
- adj1:
-			inex = STRTOG_Inexlo;
-			if (dsign) {
-				asub = 0;
-				inex = STRTOG_Inexhi;
-				}
-			else if (denorm && bbbits <= 1) {
- undfl:
-				rvb->wds = 0;
-				rve = emin;
-				irv = STRTOG_Underflow | STRTOG_Inexlo;
-				break;
-				}
-			adj0 = dval(adj) = 1.;
-			}
-		else {
-			adj0 = dval(adj) *= 0.5;
-			if (dsign) {
-				asub = 0;
-				inex = STRTOG_Inexlo;
-				}
-			if (dval(adj) < 2147483647.) {
-				L = adj0;
-				adj0 -= L;
-				switch(rd) {
-				  case 0:
-					if (adj0 >= .5)
-						goto inc_L;
-					break;
-				  case 1:
-					if (asub && adj0 > 0.)
-						goto inc_L;
-					break;
-				  case 2:
-					if (!asub && adj0 > 0.) {
- inc_L:
-						L++;
-						inex = STRTOG_Inexact - inex;
-						}
-				  }
-				dval(adj) = L;
-				}
-			}
-		y = rve + rvbits;
-
-		/* adj *= ulp(dval(rv)); */
-		/* if (asub) rv -= adj; else rv += adj; */
-
-		if (!denorm && rvbits < nbits) {
-			rvb = lshift(rvb, j = nbits - rvbits);
-			rve -= j;
-			rvbits = nbits;
-			}
-		ab = d2b(dval(adj), &abe, &abits);
-		if (abe < 0)
-			rshift(ab, -abe);
-		else if (abe > 0)
-			ab = lshift(ab, abe);
-		rvb0 = rvb;
-		if (asub) {
-			/* rv -= adj; */
-			j = hi0bits(rvb->x[rvb->wds-1]);
-			rvb = diff(rvb, ab);
-			k = rvb0->wds - 1;
-			if (denorm)
-				/* do nothing */;
-			else if (rvb->wds <= k
-				|| hi0bits( rvb->x[k]) >
-				   hi0bits(rvb0->x[k])) {
-				/* unlikely; can only have lost 1 high bit */
-				if (rve1 == emin) {
-					--rvbits;
-					denorm = 1;
-					}
-				else {
-					rvb = lshift(rvb, 1);
-					--rve;
-					--rve1;
-					L = finished = 0;
-					}
-				}
-			}
-		else {
-			rvb = sum(rvb, ab);
-			k = rvb->wds - 1;
-			if (k >= rvb0->wds
-			 || hi0bits(rvb->x[k]) < hi0bits(rvb0->x[k])) {
-				if (denorm) {
-					if (++rvbits == nbits)
-						denorm = 0;
-					}
-				else {
-					rshift(rvb, 1);
-					rve++;
-					rve1++;
-					L = 0;
-					}
-				}
-			}
-		Bfree(ab);
-		Bfree(rvb0);
-		if (finished)
-			break;
-
-		z = rve + rvbits;
-		if (y == z && L) {
-			/* Can we stop now? */
-			tol = dval(adj) * 5e-16; /* > max rel error */
-			dval(adj) = adj0 - .5;
-			if (dval(adj) < -tol) {
-				if (adj0 > tol) {
-					irv |= inex;
-					break;
-					}
-				}
-			else if (dval(adj) > tol && adj0 < 1. - tol) {
-				irv |= inex;
-				break;
-				}
-			}
-		bb0 = denorm ? 0 : trailz(rvb);
-		Bfree(bb);
-		Bfree(bd);
-		Bfree(bs);
-		Bfree(delta);
-		}
-	if (!denorm && rvbits < nbits) {
-		j = nbits - rvbits;
-		rvb = lshift(rvb, j);
-		rve -= j;
-		}
-	*exp = rve;
-	Bfree(bb);
-	Bfree(bd);
-	Bfree(bs);
-	Bfree(bd0);
-	Bfree(delta);
- ret:
-	if (denorm) {
-		if (sudden_underflow) {
-			rvb->wds = 0;
-			irv = STRTOG_Underflow | STRTOG_Inexlo;
-			}
-		else  {
-			irv = (irv & ~STRTOG_Retmask) |
-				(rvb->wds > 0 ? STRTOG_Denormal : STRTOG_Zero);
-			if (irv & STRTOG_Inexact)
-				irv |= STRTOG_Underflow;
-			}
-		}
-	if (se)
-		*se = (char *)s;
-	if (sign)
-		irv |= STRTOG_Neg;
-	if (rvb) {
-		copybits(bits, nbits, rvb);
-		Bfree(rvb);
-		}
-	return irv;
-	}
diff --git a/lib/libc/gdtoa/strtof.c b/lib/libc/gdtoa/strtof.c
deleted file mode 100644
index bb283ae..0000000
--- a/lib/libc/gdtoa/strtof.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- float
-#ifdef KR_headers
-strtof(s, sp) CONST char *s; char **sp;
-#else
-strtof(CONST char *s, char **sp)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi = { 24, 1-127-24+1,  254-127-24+1, 1, 1 };
-#else
-	static FPI fpi = { 24, 1-127-24+1,  254-127-24+1, 1, 0 };
-#endif
-	ULong bits[1];
-	Long exp;
-	int k;
-	union { ULong L[1]; float f; } u;
-
-	k = strtodg(s, sp, &fpi, &exp, bits);
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		u.L[0] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		u.L[0] = bits[0] & 0x7fffff | exp + 0x7f + 23 << 23;
-		break;
-
-	  case STRTOG_Denormal:
-		u.L[0] = bits[0];
-		break;
-
-	  case STRTOG_Infinite:
-		u.L[0] = 0x7f800000;
-		break;
-
-	  case STRTOG_NaN:
-		u.L[0] = 0x7fffffff;
-	  }
-	if (k & STRTOG_Neg)
-		u.L[0] |= 0x80000000L;
-	return u.f;
-	}
diff --git a/lib/libc/gdtoa/strtopQ.c b/lib/libc/gdtoa/strtopQ.c
deleted file mode 100644
index 4bcc581..0000000
--- a/lib/libc/gdtoa/strtopQ.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_MC68k or IEEE_8087 should be #defined */
-
-#ifdef IEEE_MC68k
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#endif
-#ifdef IEEE_8087
-#define _0 3
-#define _1 2
-#define _2 1
-#define _3 0
-#endif
-
- int
-#ifdef KR_headers
-strtopQ(s, sp, V) CONST char *s; char **sp; void *V;
-#else
-strtopQ(CONST char *s, char **sp, void *V)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 1 };
-#else
-	static FPI fpi = { 113, 1-16383-113+1, 32766 - 16383 - 113 + 1, 1, 0 };
-#endif
-	ULong bits[4];
-	Long exp;
-	int k;
-	ULong *L = (ULong*)V;
-
-	k = strtodg(s, sp, &fpi, &exp, bits);
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[_3] = bits[0];
-		L[_2] = bits[1];
-		L[_1] = bits[2];
-		L[_0] = (bits[3] & ~0x10000) | ((exp + 0x3fff + 112) << 16);
-		break;
-
-	  case STRTOG_Denormal:
-		L[_3] = bits[0];
-		L[_2] = bits[1];
-		L[_1] = bits[2];
-		L[_0] = bits[3];
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff0000;
-		L[_1] = L[_2] = L[_3] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[_0] = 0x7fffffff;
-		L[_1] = L[_2] = L[_3] = (ULong)-1;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtopd.c b/lib/libc/gdtoa/strtopd.c
deleted file mode 100644
index 54e0838..0000000
--- a/lib/libc/gdtoa/strtopd.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtopd(s, sp, d) char *s; char **sp; double *d;
-#else
-strtopd(CONST char *s, char **sp, double *d)
-#endif
-{
-	static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-	ULong bits[2];
-	Long exp;
-	int k;
-
-	k = strtodg(s, sp, &fpi0, &exp, bits);
-	ULtod((ULong*)d, bits, exp, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtopdd.c b/lib/libc/gdtoa/strtopdd.c
deleted file mode 100644
index f71bced..0000000
--- a/lib/libc/gdtoa/strtopdd.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtopdd(s, sp, dd) CONST char *s; char **sp; double *dd;
-#else
-strtopdd(CONST char *s, char **sp, double *dd)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi = { 106, 1-1023, 2046-1023-106+1, 1, 1 };
-#else
-	static FPI fpi = { 106, 1-1023-53+1, 2046-1023-106+1, 1, 0 };
-#endif
-	ULong bits[4];
-	Long exp;
-	int i, j, rv;
-	typedef union {
-		double d[2];
-		ULong L[4];
-		} U;
-	U *u;
-
-	rv = strtodg(s, sp, &fpi, &exp, bits);
-	u = (U*)dd;
-	switch(rv & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		u->d[0] = u->d[1] = 0.;
-		break;
-
-	  case STRTOG_Normal:
-		u->L[_1] = (bits[1] >> 21 | bits[2] << 11) & 0xffffffffL;
-		u->L[_0] = bits[2] >> 21 | bits[3] << 11 & 0xfffff
-			  | exp + 0x3ff + 105 << 20;
-		exp += 0x3ff + 52;
-		if (bits[1] &= 0x1fffff) {
-			i = hi0bits(bits[1]) - 11;
-			if (i >= exp) {
-				i = exp - 1;
-				exp = 0;
-				}
-			else
-				exp -= i;
-			if (i > 0) {
-				bits[1] = bits[1] << i | bits[0] >> 32-i;
-				bits[0] = bits[0] << i & 0xffffffffL;
-				}
-			}
-		else if (bits[0]) {
-			i = hi0bits(bits[0]) + 21;
-			if (i >= exp) {
-				i = exp - 1;
-				exp = 0;
-				}
-			else
-				exp -= i;
-			if (i < 32) {
-				bits[1] = bits[0] >> 32 - i;
-				bits[0] = bits[0] << i & 0xffffffffL;
-				}
-			else {
-				bits[1] = bits[0] << i - 32;
-				bits[0] = 0;
-				}
-			}
-		else {
-			u->L[2] = u->L[3] = 0;
-			break;
-			}
-		u->L[2+_1] = bits[0];
-		u->L[2+_0] = bits[1] & 0xfffff | exp << 20;
-		break;
-
-	  case STRTOG_Denormal:
-		if (bits[3])
-			goto nearly_normal;
-		if (bits[2])
-			goto partly_normal;
-		if (bits[1] & 0xffe00000)
-			goto hardly_normal;
-		/* completely denormal */
-		u->L[2] = u->L[3] = 0;
-		u->L[_1] = bits[0];
-		u->L[_0] = bits[1];
-		break;
-
-	  nearly_normal:
-		i = hi0bits(bits[3]) - 11;	/* i >= 12 */
-		j = 32 - i;
-		u->L[_0] = (bits[3] << i | bits[2] >> j) & 0xfffff
-			| 65 - i << 20;
-		u->L[_1] = (bits[2] << i | bits[1] >> j) & 0xffffffffL;
-		u->L[2+_0] = bits[1] & (1L << j) - 1;
-		u->L[2+_1] = bits[0];
-		break;
-
-	  partly_normal:
-		i = hi0bits(bits[2]) - 11;
-		if (i < 0) {
-			j = -i;
-			i += 32;
-			u->L[_0] = bits[2] >> j & 0xfffff | (33 + j) << 20;
-			u->L[_1] = (bits[2] << i | bits[1] >> j) & 0xffffffffL;
-			u->L[2+_0] = bits[1] & (1L << j) - 1;
-			u->L[2+_1] = bits[0];
-			break;
-			}
-		if (i == 0) {
-			u->L[_0] = bits[2] & 0xfffff | 33 << 20;
-			u->L[_1] = bits[1];
-			u->L[2+_0] = 0;
-			u->L[2+_1] = bits[0];
-			break;
-			}
-		j = 32 - i;
-		u->L[_0] = (bits[2] << i | bits[1] >> j) & 0xfffff
-				| j + 1 << 20;
-		u->L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
-		u->L[2+_0] = 0;
-		u->L[2+_1] = bits[0] & (1L << j) - 1;
-		break;
-
-	  hardly_normal:
-		j = 11 - hi0bits(bits[1]);
-		i = 32 - j;
-		u->L[_0] = bits[1] >> j & 0xfffff | j + 1 << 20;
-		u->L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
-		u->L[2+_0] = 0;
-		u->L[2+_1] = bits[0] & (1L << j) - 1;
-		break;
-
-	  case STRTOG_Infinite:
-		u->L[_0] = u->L[2+_0] = 0x7ff00000;
-		u->L[_1] = u->L[2+_1] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		u->L[_0] = u->L[2+_0] = 0x7fffffff;
-		u->L[_1] = u->L[2+_1] = (ULong)-1;
-	  }
-	if (rv & STRTOG_Neg) {
-		u->L[  _0] |= 0x80000000L;
-		u->L[2+_0] |= 0x80000000L;
-		}
-	return rv;
-	}
diff --git a/lib/libc/gdtoa/strtopf.c b/lib/libc/gdtoa/strtopf.c
deleted file mode 100644
index c49fc96..0000000
--- a/lib/libc/gdtoa/strtopf.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- int
-#ifdef KR_headers
-strtopf(s, sp, f) CONST char *s; char **sp; float *f;
-#else
-strtopf(CONST char *s, char **sp, float *f)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi = { 24, 1-127-24+1,  254-127-24+1, 1, 1 };
-#else
-	static FPI fpi = { 24, 1-127-24+1,  254-127-24+1, 1, 0 };
-#endif
-	ULong bits[1], *L;
-	Long exp;
-	int k;
-
-	k = strtodg(s, sp, &fpi, &exp, bits);
-	L = (ULong*)f;
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[0] = bits[0] & 0x7fffff | exp + 0x7f + 23 << 23;
-		break;
-
-	  case STRTOG_Denormal:
-		L[0] = bits[0];
-		break;
-
-	  case STRTOG_Infinite:
-		L[0] = 0x7f800000;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = 0x7fffffff;
-	  }
-	if (k & STRTOG_Neg)
-		L[0] |= 0x80000000L;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtopx.c b/lib/libc/gdtoa/strtopx.c
deleted file mode 100644
index 190b80f..0000000
--- a/lib/libc/gdtoa/strtopx.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_MC68k or IEEE_8087 should be #defined */
-
-#ifdef IEEE_MC68k
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#define _4 4
-#endif
-#ifdef IEEE_8087
-#define _0 4
-#define _1 3
-#define _2 2
-#define _3 1
-#define _4 0
-#endif
-
- int
-#ifdef KR_headers
-strtopx(s, sp, V) CONST char *s; char **sp; void *V;
-#else
-strtopx(CONST char *s, char **sp, void *V)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 1 };
-#else
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 };
-#endif
-	ULong bits[2];
-	Long exp;
-	int k;
-	UShort *L = (UShort*)V;
-
-	k = strtodg(s, sp, &fpi, &exp, bits);
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = L[4] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_Denormal:
-	  case STRTOG_NaNbits:
-		L[_4] = (UShort)bits[0];
-		L[_3] = (UShort)(bits[0] >> 16);
-		L[_2] = (UShort)bits[1];
-		L[_1] = (UShort)(bits[1] >> 16);
-		L[_0] = exp + 0x3fff + 63;
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff;
-		L[_1] = L[_2] = L[_3] = L[_4] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[_0] = 0x7fff;
-		L[_1] = L[_2] = L[_3] = L[_4] = (UShort)-1;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x8000;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtopxL.c b/lib/libc/gdtoa/strtopxL.c
deleted file mode 100644
index 95fd3d5..0000000
--- a/lib/libc/gdtoa/strtopxL.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_MC68k or IEEE_8087 should be #defined */
-
-#ifdef IEEE_MC68k
-#define _0 0
-#define _1 1
-#define _2 2
-#endif
-#ifdef IEEE_8087
-#define _0 2
-#define _1 1
-#define _2 0
-#endif
-
- int
-#ifdef KR_headers
-strtopxL(s, sp, V) CONST char *s; char **sp; void *V;
-#else
-strtopxL(CONST char *s, char **sp, void *V)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 1 };
-#else
-	static FPI fpi = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, 0 };
-#endif
-	ULong bits[2];
-	Long exp;
-	int k;
-	ULong *L = (ULong*)V;
-
-	k = strtodg(s, sp, &fpi, &exp, bits);
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_Denormal:
-	  case STRTOG_NaNbits:
-		L[_2] = bits[0];
-		L[_1] = bits[1];
-		L[_0] = (exp + 0x3fff + 63) << 16;
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff << 16;
-		L[_1] = L[_2] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[_0] = 0x7fff << 16;
-		L[_1] = L[_2] = (ULong)-1;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtorQ.c b/lib/libc/gdtoa/strtorQ.c
deleted file mode 100644
index 63a7b6a..0000000
--- a/lib/libc/gdtoa/strtorQ.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_MC68k or IEEE_8087 should be #defined */
-
-#ifdef IEEE_MC68k
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#endif
-#ifdef IEEE_8087
-#define _0 3
-#define _1 2
-#define _2 1
-#define _3 0
-#endif
-
- void
-#ifdef KR_headers
-ULtoQ(L, bits, exp, k) ULong *L; ULong *bits; Long exp; int k;
-#else
-ULtoQ(ULong *L, ULong *bits, Long exp, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[_3] = bits[0];
-		L[_2] = bits[1];
-		L[_1] = bits[2];
-		L[_0] = (bits[3] & ~0x10000) | ((exp + 0x3fff + 112) << 16);
-		break;
-
-	  case STRTOG_Denormal:
-		L[_3] = bits[0];
-		L[_2] = bits[1];
-		L[_1] = bits[2];
-		L[_0] = bits[3];
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff0000;
-		L[_1] = L[_2] = L[_3] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[_0] = 0x7fffffff;
-		L[_1] = L[_2] = L[_3] = (ULong)-1;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	}
-
- int
-#ifdef KR_headers
-strtorQ(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L;
-#else
-strtorQ(CONST char *s, char **sp, int rounding, void *L)
-#endif
-{
-	static FPI fpi0 = { 113, 1-16383-113+1, 32766-16383-113+1, 1, SI };
-	FPI *fpi, fpi1;
-	ULong bits[4];
-	Long exp;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &exp, bits);
-	ULtoQ((ULong*)L, bits, exp, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtord.c b/lib/libc/gdtoa/strtord.c
deleted file mode 100644
index 12213f9..0000000
--- a/lib/libc/gdtoa/strtord.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- void
-#ifdef KR_headers
-ULtod(L, bits, exp, k) ULong *L; ULong *bits; Long exp; int k;
-#else
-ULtod(ULong *L, ULong *bits, Long exp, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = 0;
-		break;
-
-	  case STRTOG_Denormal:
-		L[_1] = bits[0];
-		L[_0] = bits[1];
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[_1] = bits[0];
-		L[_0] = (bits[1] & ~0x100000) | ((exp + 0x3ff + 52) << 20);
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7ff00000;
-		L[_1] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[_0] = 0x7fffffff;
-		L[_1] = (ULong)-1;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	}
-
- int
-#ifdef KR_headers
-strtord(s, sp, rounding, d) CONST char *s; char **sp; int rounding; double *d;
-#else
-strtord(CONST char *s, char **sp, int rounding, double *d)
-#endif
-{
-	static FPI fpi0 = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
-	FPI *fpi, fpi1;
-	ULong bits[2];
-	Long exp;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &exp, bits);
-	ULtod((ULong*)d, bits, exp, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtordd.c b/lib/libc/gdtoa/strtordd.c
deleted file mode 100644
index 626a4d3..0000000
--- a/lib/libc/gdtoa/strtordd.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- void
-#ifdef KR_headers
-ULtodd(L, bits, exp, k) ULong *L; ULong *bits; Long exp; int k;
-#else
-ULtodd(ULong *L, ULong *bits, Long exp, int k)
-#endif
-{
-	int i, j;
-
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = 0;
-		break;
-
-	  case STRTOG_Normal:
-		L[_1] = (bits[1] >> 21 | bits[2] << 11) & (ULong)0xffffffffL;
-		L[_0] = bits[2] >> 21 | bits[3] << 11 & 0xfffff
-			  | exp + 0x3ff + 105 << 20;
-		exp += 0x3ff + 52;
-		if (bits[1] &= 0x1fffff) {
-			i = hi0bits(bits[1]) - 11;
-			if (i >= exp) {
-				i = exp - 1;
-				exp = 0;
-				}
-			else
-				exp -= i;
-			if (i > 0) {
-				bits[1] = bits[1] << i | bits[0] >> 32-i;
-				bits[0] = bits[0] << i & (ULong)0xffffffffL;
-				}
-			}
-		else if (bits[0]) {
-			i = hi0bits(bits[0]) + 21;
-			if (i >= exp) {
-				i = exp - 1;
-				exp = 0;
-				}
-			else
-				exp -= i;
-			if (i < 32) {
-				bits[1] = bits[0] >> 32 - i;
-				bits[0] = bits[0] << i & (ULong)0xffffffffL;
-				}
-			else {
-				bits[1] = bits[0] << i - 32;
-				bits[0] = 0;
-				}
-			}
-		else {
-			L[2] = L[3] = 0;
-			break;
-			}
-		L[2+_1] = bits[0];
-		L[2+_0] = bits[1] & 0xfffff | exp << 20;
-		break;
-
-	  case STRTOG_Denormal:
-		if (bits[3])
-			goto nearly_normal;
-		if (bits[2])
-			goto partly_normal;
-		if (bits[1] & 0xffe00000)
-			goto hardly_normal;
-		/* completely denormal */
-		L[2] = L[3] = 0;
-		L[_1] = bits[0];
-		L[_0] = bits[1];
-		break;
-
-	  nearly_normal:
-		i = hi0bits(bits[3]) - 11;	/* i >= 12 */
-		j = 32 - i;
-		L[_0] = (bits[3] << i | bits[2] >> j) & 0xfffff
-			| 65 - i << 20;
-		L[_1] = (bits[2] << i | bits[1] >> j) & 0xffffffffL;
-		L[2+_0] = bits[1] & ((ULong)1L << j) - 1;
-		L[2+_1] = bits[0];
-		break;
-
-	  partly_normal:
-		i = hi0bits(bits[2]) - 11;
-		if (i < 0) {
-			j = -i;
-			i += 32;
-			L[_0] = bits[2] >> j & 0xfffff | (33 + j) << 20;
-			L[_1] = (bits[2] << i | bits[1] >> j) & 0xffffffffL;
-			L[2+_0] = bits[1] & ((ULong)1L << j) - 1;
-			L[2+_1] = bits[0];
-			break;
-			}
-		if (i == 0) {
-			L[_0] = bits[2] & 0xfffff | 33 << 20;
-			L[_1] = bits[1];
-			L[2+_0] = 0;
-			L[2+_1] = bits[0];
-			break;
-			}
-		j = 32 - i;
-		L[_0] = (bits[2] << i | bits[1] >> j) & 0xfffff
-				| j + 1 << 20;
-		L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
-		L[2+_0] = 0;
-		L[2+_1] = bits[0] & (1L << j) - 1;
-		break;
-
-	  hardly_normal:
-		j = 11 - hi0bits(bits[1]);
-		i = 32 - j;
-		L[_0] = bits[1] >> j & 0xfffff | j + 1 << 20;
-		L[_1] = (bits[1] << i | bits[0] >> j) & 0xffffffffL;
-		L[2+_0] = 0;
-		L[2+_1] = bits[0] & ((ULong)1L << j) - 1;
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = L[2+_0] = 0x7ff00000;
-		L[_1] = L[2+_1] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[_0] = L[2+_0] = 0x7fffffff;
-		L[_1] = L[2+_1] = (ULong)-1;
-		break;
-
-	  case STRTOG_NaNbits:
-		L[_1] = (bits[1] >> 21 | bits[2] << 11) & (ULong)0xffffffffL;
-		L[_0] = bits[2] >> 21 | bits[3] << 11
-			  | (ULong)0x7ff00000L;
-		L[2+_1] = bits[0];
-		L[2+_0] = bits[1] | (ULong)0x7ff00000L;
-	  }
-	if (k & STRTOG_Neg) {
-		L[_0] |= 0x80000000L;
-		L[2+_0] |= 0x80000000L;
-		}
-	}
-
- int
-#ifdef KR_headers
-strtordd(s, sp, rounding, dd) CONST char *s; char **sp; int rounding; double *dd;
-#else
-strtordd(CONST char *s, char **sp, int rounding, double *dd)
-#endif
-{
-#ifdef Sudden_Underflow
-	static FPI fpi0 = { 106, 1-1023, 2046-1023-106+1, 1, 1 };
-#else
-	static FPI fpi0 = { 106, 1-1023-53+1, 2046-1023-106+1, 1, 0 };
-#endif
-	FPI *fpi, fpi1;
-	ULong bits[4];
-	Long exp;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &exp, bits);
-	ULtodd((ULong*)dd, bits, exp, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtorf.c b/lib/libc/gdtoa/strtorf.c
deleted file mode 100644
index ecd1c0b..0000000
--- a/lib/libc/gdtoa/strtorf.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- void
-#ifdef KR_headers
-ULtof(L, bits, exp, k) ULong *L; ULong *bits; Long exp; int k;
-#else
-ULtof(ULong *L, ULong *bits, Long exp, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		*L = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_NaNbits:
-		L[0] = bits[0] & 0x7fffff | exp + 0x7f + 23 << 23;
-		break;
-
-	  case STRTOG_Denormal:
-		L[0] = bits[0];
-		break;
-
-	  case STRTOG_Infinite:
-		L[0] = 0x7f800000;
-		break;
-
-	  case STRTOG_NaN:
-		L[0] = 0x7fffffff;
-	  }
-	if (k & STRTOG_Neg)
-		L[0] |= 0x80000000L;
-	}
-
- int
-#ifdef KR_headers
-strtorf(s, sp, rounding, f) CONST char *s; char **sp; int rounding; float *f;
-#else
-strtorf(CONST char *s, char **sp, int rounding, float *f)
-#endif
-{
-	static FPI fpi0 = { 24, 1-127-24+1,  254-127-24+1, 1, SI };
-	FPI *fpi, fpi1;
-	ULong bits[1];
-	Long exp;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &exp, bits);
-	ULtof((ULong*)f, bits, exp, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtorx.c b/lib/libc/gdtoa/strtorx.c
deleted file mode 100644
index 0a81e95..0000000
--- a/lib/libc/gdtoa/strtorx.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_MC68k or IEEE_8087 should be #defined */
-
-#ifdef IEEE_MC68k
-#define _0 0
-#define _1 1
-#define _2 2
-#define _3 3
-#define _4 4
-#endif
-#ifdef IEEE_8087
-#define _0 4
-#define _1 3
-#define _2 2
-#define _3 1
-#define _4 0
-#endif
-
- void
-#ifdef KR_headers
-ULtox(L, bits, exp, k) UShort *L; ULong *bits; Long exp; int k;
-#else
-ULtox(UShort *L, ULong *bits, Long exp, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = L[3] = L[4] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_Denormal:
-	  case STRTOG_NaNbits:
-		L[_4] = (UShort)bits[0];
-		L[_3] = (UShort)(bits[0] >> 16);
-		L[_2] = (UShort)bits[1];
-		L[_1] = (UShort)(bits[1] >> 16);
-		L[_0] = exp + 0x3fff + 63;
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff;
-		L[_1] = L[_2] = L[_3] = L[_4] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[_0] = 0x7fff;
-		L[_1] = L[_2] = L[_3] = L[_4] = (UShort)-1;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x8000;
-	}
-
- int
-#ifdef KR_headers
-strtorx(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L;
-#else
-strtorx(CONST char *s, char **sp, int rounding, void *L)
-#endif
-{
-	static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	FPI *fpi, fpi1;
-	ULong bits[2];
-	Long exp;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &exp, bits);
-	ULtox((UShort*)L, bits, exp, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/strtorxL.c b/lib/libc/gdtoa/strtorxL.c
deleted file mode 100644
index 126cef8..0000000
--- a/lib/libc/gdtoa/strtorxL.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 2000 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
-#undef _0
-#undef _1
-
-/* one or the other of IEEE_MC68k or IEEE_8087 should be #defined */
-
-#ifdef IEEE_MC68k
-#define _0 0
-#define _1 1
-#define _2 2
-#endif
-#ifdef IEEE_8087
-#define _0 2
-#define _1 1
-#define _2 0
-#endif
-
- void
-#ifdef KR_headers
-ULtoxL(L, bits, exp, k) ULong *L; ULong *bits; Long exp; int k;
-#else
-ULtoxL(ULong *L, ULong *bits, Long exp, int k)
-#endif
-{
-	switch(k & STRTOG_Retmask) {
-	  case STRTOG_NoNumber:
-	  case STRTOG_Zero:
-		L[0] = L[1] = L[2] = 0;
-		break;
-
-	  case STRTOG_Normal:
-	  case STRTOG_Denormal:
-	  case STRTOG_NaNbits:
-		L[_0] = (exp + 0x3fff + 63) << 16;
-		L[_1] = bits[1];
-		L[_2] = bits[0];
-		break;
-
-	  case STRTOG_Infinite:
-		L[_0] = 0x7fff << 16;
-		L[_1] = L[_2] = 0;
-		break;
-
-	  case STRTOG_NaN:
-		L[_0] = 0x7fff << 16;
-		L[_1] = L[_2] = (ULong)-1;
-	  }
-	if (k & STRTOG_Neg)
-		L[_0] |= 0x80000000L;
-	}
-
- int
-#ifdef KR_headers
-strtorxL(s, sp, rounding, L) CONST char *s; char **sp; int rounding; void *L;
-#else
-strtorxL(CONST char *s, char **sp, int rounding, void *L)
-#endif
-{
-	static FPI fpi0 = { 64, 1-16383-64+1, 32766 - 16383 - 64 + 1, 1, SI };
-	FPI *fpi, fpi1;
-	ULong bits[2];
-	Long exp;
-	int k;
-
-	fpi = &fpi0;
-	if (rounding != FPI_Round_near) {
-		fpi1 = fpi0;
-		fpi1.rounding = rounding;
-		fpi = &fpi1;
-		}
-	k = strtodg(s, sp, fpi, &exp, bits);
-	ULtoxL((ULong*)L, bits, exp, k);
-	return k;
-	}
diff --git a/lib/libc/gdtoa/sum.c b/lib/libc/gdtoa/sum.c
deleted file mode 100644
index 1e1a4de..0000000
--- a/lib/libc/gdtoa/sum.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- Bigint *
-#ifdef KR_headers
-sum(a, b) Bigint *a; Bigint *b;
-#else
-sum(Bigint *a, Bigint *b)
-#endif
-{
-	Bigint *c;
-	ULong carry, *xc, *xa, *xb, *xe, y;
-#ifdef Pack_32
-	ULong z;
-#endif
-
-	if (a->wds < b->wds) {
-		c = b; b = a; a = c;
-		}
-	c = Balloc(a->k);
-	c->wds = a->wds;
-	carry = 0;
-	xa = a->x;
-	xb = b->x;
-	xc = c->x;
-	xe = xc + b->wds;
-#ifdef Pack_32
-	do {
-		y = (*xa & 0xffff) + (*xb & 0xffff) + carry;
-		carry = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) + (*xb++ >> 16) + carry;
-		carry = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-		while(xc < xe);
-	xe += a->wds - b->wds;
-	while(xc < xe) {
-		y = (*xa & 0xffff) + carry;
-		carry = (y & 0x10000) >> 16;
-		z = (*xa++ >> 16) + carry;
-		carry = (z & 0x10000) >> 16;
-		Storeinc(xc, z, y);
-		}
-#else
-	do {
-		y = *xa++ + *xb++ + carry;
-		carry = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-		while(xc < xe);
-	xe += a->wds - b->wds;
-	while(xc < xe) {
-		y = *xa++ + carry;
-		carry = (y & 0x10000) >> 16;
-		*xc++ = y & 0xffff;
-		}
-#endif
-	if (carry) {
-		if (c->wds == c->maxwds) {
-			b = Balloc(c->k + 1);
-			Bcopy(b, c);
-			Bfree(c);
-			c = b;
-			}
-		c->x[c->wds++] = 1;
-		}
-	return c;
-	}
diff --git a/lib/libc/gdtoa/ulp.c b/lib/libc/gdtoa/ulp.c
deleted file mode 100644
index 536994a..0000000
--- a/lib/libc/gdtoa/ulp.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************
-
-The author of this software is David M. Gay.
-
-Copyright (C) 1998, 1999 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-****************************************************************/
-
-/* Please send bug reports to
-	David M. Gay
-	Bell Laboratories, Room 2C-463
-	600 Mountain Avenue
-	Murray Hill, NJ 07974-0636
-	U.S.A.
-	dmg@bell-labs.com
- */
-
-#include "gdtoaimp.h"
-
- double
-ulp
-#ifdef KR_headers
-	(x) double x;
-#else
-	(double x)
-#endif
-{
-	Long L;
-	double a;
-
-	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
-#ifndef Sudden_Underflow
-	if (L > 0) {
-#endif
-#ifdef IBM
-		L |= Exp_msk1 >> 4;
-#endif
-		word0(a) = L;
-		word1(a) = 0;
-#ifndef Sudden_Underflow
-		}
-	else {
-		L = -L >> Exp_shift;
-		if (L < Exp_shift) {
-			word0(a) = 0x80000 >> L;
-			word1(a) = 0;
-			}
-		else {
-			word0(a) = 0;
-			L -= Exp_shift;
-			word1(a) = L >= 31 ? 1 : 1 << 31 - L;
-			}
-		}
-#endif
-	return a;
-	}
diff --git a/lib/libc/gen/Makefile b/lib/libc/gen/Makefile
deleted file mode 100644
index c1542b1..0000000
--- a/lib/libc/gen/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/ -I../i386
-
-#Objects ldexpo
-OBJS = __xuname.o _pthread_stubs.o _rand48.o _spinlock_stub.o _thread_init.o alarm.o arc4random.o assert.o basename.o check_utility_compat.o clock.o closedir.o confstr.o crypt.o ctermid.o daemon.o devname.o dirname.o disklabel.o dlfcn.o dlfunc.o drand48.o erand48.o err.o errlst.o errno.o exec.o fmtcheck.o fmtmsg.o fnmatch.o fpclassify.o frexp.o fstab.o ftok.o fts.o ftw.o getbootfile.o getbsize.o getcap.o getcwd.o getdomainname.o getgrent.o getgrouplist.o gethostname.o getloadavg.o getlogin.o getmntinfo.o getnetgrent.o getobjformat.o getosreldate.o getpagesize.o getpeereid.o getprogname.o getpwent.o getttyent.o getusershell.o getvfsbyname.o glob.o initgroups.o isatty.o isinf.o isnan.o jrand48.o lcong48.o lockf.o lrand48.o mrand48.o nftw.o nice.o nlist.o nrand48.o opendir.o pause.o pmadvise.o popen.o posixshm.o pselect.o psignal.o pw_scan.o pwcache.o raise.o readdir.o readpassphrase.o rewinddir.o scandir.o seed48.o seekdir.o sem.o semctl.o setdomainname.o sethostname.o setjmperr.o setmode.o setproctitle.o setprogname.o siginterrupt.o siglist.o signal.o sigsetops.o sleep.o srand48.o statvfs.o stringlist.o strtofflags.o swapcontext.o sysconf.o sysctl.o sysctlbyname.o sysctlnametomib.o syslog.o telldir.o termios.o time.o times.o timezone.o tls.o ttyname.o ttyslot.o ualarm.o ulimit.o uname.o unvis.o usleep.o utime.o valloc.o vis.o wait.o wait3.o waitpid.o wordexp.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/gen/__xuname.c b/lib/libc/gen/__xuname.c
deleted file mode 100644
index 359f8ea..0000000
--- a/lib/libc/gen/__xuname.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";*/
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/__xuname.c,v 1.9 2002/02/01 00:57:29 obrien Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
-#include <errno.h>
-
-int
-__xuname(int namesize, void *namebuf)
-{
-	int mib[2], rval;
-	size_t len;
-	char *p;
-	int oerrno;
-	struct xutsname {
-		char	sysname[namesize];	/* Name of this OS. */
-		char	nodename[namesize];	/* Name of this network node. */
-		char	release[namesize];	/* Release level. */
-		char	version[namesize];	/* Version level. */
-		char	machine[namesize];	/* Hardware type. */
-	} *name;
-
-	name = (struct xutsname *)namebuf;
-	rval = 0;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_OSTYPE;
-	len = sizeof(name->sysname);
-	oerrno = errno;
-	if (sysctl(mib, 2, &name->sysname, &len, NULL, 0) == -1) {
-		if(errno == ENOMEM)
-			errno = oerrno;
-		else
-			rval = -1;
-	}
-	name->sysname[sizeof(name->sysname) - 1] = '\0';
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTNAME;
-	len = sizeof(name->nodename);
-	oerrno = errno;
-	if (sysctl(mib, 2, &name->nodename, &len, NULL, 0) == -1) {
-		if(errno == ENOMEM)
-			errno = oerrno;
-		else
-			rval = -1;
-	}
-	name->nodename[sizeof(name->nodename) - 1] = '\0';
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_OSRELEASE;
-	len = sizeof(name->release);
-	oerrno = errno;
-	if (sysctl(mib, 2, &name->release, &len, NULL, 0) == -1) {
-		if(errno == ENOMEM)
-			errno = oerrno;
-		else
-			rval = -1;
-	}
-	name->release[sizeof(name->release) - 1] = '\0';
-
-	/* The version may have newlines in it, turn them into spaces. */
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_VERSION;
-	len = sizeof(name->version);
-	oerrno = errno;
-	if (sysctl(mib, 2, &name->version, &len, NULL, 0) == -1) {
-		if (errno == ENOMEM)
-			errno = oerrno;
-		else
-			rval = -1;
-	}
-	name->version[sizeof(name->version) - 1] = '\0';
-	for (p = name->version; len--; ++p) {
-		if (*p == '\n' || *p == '\t') {
-			if (len > 1)
-				*p = ' ';
-			else
-				*p = '\0';
-		}
-	}
-
-	mib[0] = CTL_HW;
-	mib[1] = HW_MACHINE;
-	len = sizeof(name->machine);
-	oerrno = errno;
-	if (sysctl(mib, 2, &name->machine, &len, NULL, 0) == -1) {
-		if (errno == ENOMEM)
-			errno = oerrno;
-		else
-			rval = -1;
-	}
-	name->machine[sizeof(name->machine) - 1] = '\0';
-	return (rval);
-}
diff --git a/lib/libc/gen/_pthread_stubs.c b/lib/libc/gen/_pthread_stubs.c
deleted file mode 100644
index f4178fa..0000000
--- a/lib/libc/gen/_pthread_stubs.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_pthread_stubs.c,v 1.11.8.1 2006/08/11 18:34:19 thomas Exp $");
-
-#include <signal.h>
-#include <pthread.h>
-
-#include "libc_private.h"
-
-/*
- * Weak symbols: All libc internal usage of these functions should
- * use the weak symbol versions (_pthread_XXX).  If libpthread is
- * linked, it will override these functions with (non-weak) routines.
- * The _pthread_XXX functions are provided solely for internal libc
- * usage to avoid unwanted cancellation points and to differentiate
- * between application locks and libc locks (threads holding the
- * latter can't be allowed to exit/terminate).
- */
-
-/* Define a null pthread structure just to satisfy _pthread_self. */
-struct pthread {
-};
-
-static struct pthread	main_thread;
-
-static int		stub_main(void);
-static void 		*stub_null(void);
-static struct pthread	*stub_self(void);
-static int		stub_zero(void);
-
-#define	PJT_DUAL_ENTRY(entry)	\
-	(pthread_func_t)entry, (pthread_func_t)entry
-
-pthread_func_entry_t __thr_jtable[PJT_MAX] = {
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_COND_BROADCAST */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_COND_DESTROY */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_COND_INIT */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_COND_SIGNAL */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_COND_WAIT */
-	{PJT_DUAL_ENTRY(stub_null)},	/* PJT_GETSPECIFIC */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_KEY_CREATE */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_KEY_DELETE */
-	{PJT_DUAL_ENTRY(stub_main)},	/* PJT_MAIN_NP */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_MUTEX_DESTROY */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_MUTEX_INIT */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_MUTEX_LOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_MUTEX_TRYLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_MUTEX_UNLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_MUTEXATTR_DESTROY */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_MUTEXATTR_INIT */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_MUTEXATTR_SETTYPE */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_ONCE */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_RWLOCK_DESTROY */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_RWLOCK_INIT */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_RWLOCK_RDLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_RWLOCK_TRYRDLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_RWLOCK_TRYWRLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_RWLOCK_UNLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_RWLOCK_WRLOCK */
-	{PJT_DUAL_ENTRY(stub_self)},	/* PJT_SELF */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_SETSPECIFIC */
-	{PJT_DUAL_ENTRY(stub_zero)}	/* PJT_SIGMASK */
-};
-
-/*
- * Weak aliases for exported (pthread_*) and internal (_pthread_*) routines.
- */
-#define	WEAK_REF(sym, alias)	__weak_reference(sym, alias)
-
-#define	FUNC_TYPE(name)		__CONCAT(name, _func_t)
-#define	FUNC_INT(name)		__CONCAT(name, _int)
-#define	FUNC_EXP(name)		__CONCAT(name, _exp)
-
-#define	STUB_FUNC(name, idx, ret)				\
-	static ret FUNC_EXP(name)(void) __used;			\
-	static ret FUNC_INT(name)(void) __used;			\
-	WEAK_REF(FUNC_EXP(name), name);				\
-	WEAK_REF(FUNC_INT(name), __CONCAT(_, name));		\
-	typedef ret (*FUNC_TYPE(name))(void);			\
-	static ret FUNC_EXP(name)(void)				\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][0];	\
-		return (func());				\
-	}							\
-	static ret FUNC_INT(name)(void)				\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][1];	\
-		return (func());				\
-	}
-
-#define	STUB_FUNC1(name, idx, ret, p0_type)			\
-	static ret FUNC_EXP(name)(p0_type) __used;		\
-	static ret FUNC_INT(name)(p0_type) __used;		\
-	WEAK_REF(FUNC_EXP(name), name);				\
-	WEAK_REF(FUNC_INT(name), __CONCAT(_, name));		\
-	typedef ret (*FUNC_TYPE(name))(p0_type);		\
-	static ret FUNC_EXP(name)(p0_type p0)			\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][0];	\
-		return (func(p0));				\
-	}							\
-	static ret FUNC_INT(name)(p0_type p0)			\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][1];	\
-		return (func(p0));				\
-	}
-
-#define	STUB_FUNC2(name, idx, ret, p0_type, p1_type)		\
-	static ret FUNC_EXP(name)(p0_type, p1_type) __used;	\
-	static ret FUNC_INT(name)(p0_type, p1_type) __used;	\
-	WEAK_REF(FUNC_EXP(name), name);				\
-	WEAK_REF(FUNC_INT(name), __CONCAT(_, name));		\
-	typedef ret (*FUNC_TYPE(name))(p0_type, p1_type);	\
-	static ret FUNC_EXP(name)(p0_type p0, p1_type p1)	\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][0];	\
-		return (func(p0, p1));				\
-	}							\
-	static ret FUNC_INT(name)(p0_type p0, p1_type p1)	\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][1];	\
-		return (func(p0, p1));				\
-	}
-
-#define	STUB_FUNC3(name, idx, ret, p0_type, p1_type, p2_type)	\
-	static ret FUNC_EXP(name)(p0_type, p1_type, p2_type) __used; \
-	static ret FUNC_INT(name)(p0_type, p1_type, p2_type) __used; \
-	WEAK_REF(FUNC_EXP(name), name);				\
-	WEAK_REF(FUNC_INT(name), __CONCAT(_, name));		\
-	typedef ret (*FUNC_TYPE(name))(p0_type, p1_type, p2_type); \
-	static ret FUNC_EXP(name)(p0_type p0, p1_type p1, p2_type p2) \
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][0];	\
-		return (func(p0, p1, p2));			\
-	}							\
-	static ret FUNC_INT(name)(p0_type p0, p1_type p1, p2_type p2) \
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][1];	\
-		return (func(p0, p1, p2));			\
-	}
-
-STUB_FUNC1(pthread_cond_broadcast, PJT_COND_BROADCAST, int, void *)
-STUB_FUNC1(pthread_cond_destroy, PJT_COND_DESTROY, int, void *)
-STUB_FUNC2(pthread_cond_init,	PJT_COND_INIT, int, void *, void *)
-STUB_FUNC1(pthread_cond_signal,	PJT_COND_SIGNAL, int, void *)
-STUB_FUNC2(pthread_cond_wait,	PJT_COND_WAIT, int, void *, void *)
-STUB_FUNC1(pthread_getspecific,	PJT_GETSPECIFIC, void *, pthread_key_t)
-STUB_FUNC2(pthread_key_create,	PJT_KEY_CREATE, int, void *, void *)
-STUB_FUNC1(pthread_key_delete,	PJT_KEY_DELETE, int, pthread_key_t)
-STUB_FUNC(pthread_main_np,	PJT_MAIN_NP, int)
-STUB_FUNC1(pthread_mutex_destroy, PJT_MUTEX_DESTROY, int, void *)
-STUB_FUNC2(pthread_mutex_init,	PJT_MUTEX_INIT, int, void *, void *)
-STUB_FUNC1(pthread_mutex_lock,	PJT_MUTEX_LOCK, int, void *)
-STUB_FUNC1(pthread_mutex_trylock, PJT_MUTEX_TRYLOCK, int, void *)
-STUB_FUNC1(pthread_mutex_unlock, PJT_MUTEX_UNLOCK, int, void *)
-STUB_FUNC1(pthread_mutexattr_destroy, PJT_MUTEXATTR_DESTROY, int, void *)
-STUB_FUNC1(pthread_mutexattr_init, PJT_MUTEXATTR_INIT, int, void *)
-STUB_FUNC1(pthread_mutexattr_settype, PJT_MUTEXATTR_SETTYPE, int, void *)
-STUB_FUNC2(pthread_once, 	PJT_ONCE, int, void *, void *)
-STUB_FUNC1(pthread_rwlock_destroy, PJT_RWLOCK_DESTROY, int, void *)
-STUB_FUNC2(pthread_rwlock_init,	PJT_RWLOCK_INIT, int, void *, void *)
-STUB_FUNC1(pthread_rwlock_rdlock, PJT_RWLOCK_RDLOCK, int, void *)
-STUB_FUNC1(pthread_rwlock_tryrdlock, PJT_RWLOCK_TRYRDLOCK, int, void *)
-STUB_FUNC1(pthread_rwlock_trywrlock, PJT_RWLOCK_TRYWRLOCK, int, void *)
-STUB_FUNC1(pthread_rwlock_unlock, PJT_RWLOCK_UNLOCK, int, void *)
-STUB_FUNC1(pthread_rwlock_wrlock, PJT_RWLOCK_WRLOCK, int, void *)
-STUB_FUNC(pthread_self,		PJT_SELF, pthread_t)
-STUB_FUNC2(pthread_setspecific, PJT_SETSPECIFIC, int, pthread_key_t, void *)
-STUB_FUNC3(pthread_sigmask, PJT_SIGMASK, int, int, void *, void *)
-
-static int
-stub_zero(void)
-{
-	return (0);
-}
-
-static void *
-stub_null(void)
-{
-	return (NULL);
-}
-
-static struct pthread *
-stub_self(void)
-{
-	return (&main_thread);
-}
-
-static int
-stub_main(void)
-{
-	return (-1);
-}
diff --git a/lib/libc/gen/_rand48.c b/lib/libc/gen/_rand48.c
deleted file mode 100644
index 4dbf0d7..0000000
--- a/lib/libc/gen/_rand48.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_rand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include "rand48.h"
-
-unsigned short _rand48_seed[3] = {
-	RAND48_SEED_0,
-	RAND48_SEED_1,
-	RAND48_SEED_2
-};
-unsigned short _rand48_mult[3] = {
-	RAND48_MULT_0,
-	RAND48_MULT_1,
-	RAND48_MULT_2
-};
-unsigned short _rand48_add = RAND48_ADD;
-
-void
-_dorand48(unsigned short xseed[3])
-{
-	unsigned long accu;
-	unsigned short temp[2];
-
-	accu = (unsigned long) _rand48_mult[0] * (unsigned long) xseed[0] +
-	 (unsigned long) _rand48_add;
-	temp[0] = (unsigned short) accu;	/* lower 16 bits */
-	accu >>= sizeof(unsigned short) * 8;
-	accu += (unsigned long) _rand48_mult[0] * (unsigned long) xseed[1] +
-	 (unsigned long) _rand48_mult[1] * (unsigned long) xseed[0];
-	temp[1] = (unsigned short) accu;	/* middle 16 bits */
-	accu >>= sizeof(unsigned short) * 8;
-	accu += _rand48_mult[0] * xseed[2] + _rand48_mult[1] * xseed[1] + _rand48_mult[2] * xseed[0];
-	xseed[0] = temp[0];
-	xseed[1] = temp[1];
-	xseed[2] = (unsigned short) accu;
-}
diff --git a/lib/libc/gen/_spinlock_stub.c b/lib/libc/gen/_spinlock_stub.c
deleted file mode 100644
index 78512b3..0000000
--- a/lib/libc/gen/_spinlock_stub.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_spinlock_stub.c,v 1.8 2003/03/26 04:02:24 jeff Exp $");
-
-#include <stdio.h>
-
-#include "spinlock.h"
-
-/*
- * Declare weak definitions in case the application is not linked
- * with libpthread.
- */
-__weak_reference(_atomic_lock_stub, _atomic_lock);
-__weak_reference(_spinlock_stub, _spinlock);
-__weak_reference(_spinlock_stub, _spinunlock);
-__weak_reference(_spinlock_debug_stub, _spinlock_debug);
-
-
-/*
- * This function is a stub for the _atomic_lock function in libpthread.
- */
-long
-_atomic_lock_stub(volatile long *lck)
-{
-	return (0L);
-}
-
-
-/*
- * This function is a stub for the spinlock function in libpthread.
- */
-void
-_spinlock_stub(spinlock_t *lck)
-{
-}
-
-/*
- * This function is a stub for the spinunlock function in libpthread.
- */
-void
-_spinunlock_stub(spinlock_t *lck)
-{
-}
-
-/*
- * This function is a stub for the debug spinlock function in libpthread.
- */
-void
-_spinlock_debug_stub(spinlock_t *lck, char *fname, int lineno)
-{
-}
diff --git a/lib/libc/gen/_thread_init.c b/lib/libc/gen/_thread_init.c
deleted file mode 100644
index afcd856..0000000
--- a/lib/libc/gen/_thread_init.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/_thread_init.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
-
-#include <sys/types.h>
-
-__weak_reference(_thread_init_stub, _thread_init);
-__weak_reference(_thread_autoinit_dummy_decl_stub, _thread_autoinit_dummy_decl);
-
-int	_thread_autoinit_dummy_decl_stub = 0;
-
-void
-_thread_init_stub(void)
-{
-	/* This is just a stub; there is nothing to do. */
-}
diff --git a/lib/libc/gen/alarm.c b/lib/libc/gen/alarm.c
deleted file mode 100644
index 58cce20..0000000
--- a/lib/libc/gen/alarm.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)alarm.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/alarm.c,v 1.2 2002/02/01 01:08:47 obrien Exp $");
-
-/*
- * Backwards compatible alarm.
- */
-#include <sys/time.h>
-#include <unistd.h>
-
-unsigned int
-alarm(secs)
-	unsigned int secs;
-{
-	struct itimerval it, oitv;
-	struct itimerval *itp = &it;
-
-	timerclear(&itp->it_interval);
-	itp->it_value.tv_sec = secs;
-	itp->it_value.tv_usec = 0;
-	if (setitimer(ITIMER_REAL, itp, &oitv) < 0)
-		return (-1);
-	if (oitv.it_value.tv_usec)
-		oitv.it_value.tv_sec++;
-	return (oitv.it_value.tv_sec);
-}
diff --git a/lib/libc/gen/arc4random.c b/lib/libc/gen/arc4random.c
deleted file mode 100644
index 9e79fba..0000000
--- a/lib/libc/gen/arc4random.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Arc4 random number generator for OpenBSD.
- * Copyright 1996 David Mazieres <dm@lcs.mit.edu>.
- *
- * Modification and redistribution in source and binary forms is
- * permitted provided that due credit is given to the author and the
- * OpenBSD project (for instance by leaving this copyright notice
- * intact).
- */
-
-/*
- * This code is derived from section 17.1 of Applied Cryptography,
- * second edition, which describes a stream cipher allegedly
- * compatible with RSA Labs "RC4" cipher (the actual description of
- * which is a trade secret).  The same algorithm is used as a stream
- * cipher called "arcfour" in Tatu Ylonen's ssh package.
- *
- * Here the stream cipher has been modified always to include the time
- * when initializing the state.  That makes it impossible to
- * regenerate the same random sequence twice, so this can't be used
- * for encryption, but will generate good random numbers.
- *
- * RC4 is a registered trademark of RSA Laboratories.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <pthread.h>
-
-#include "libc_private.h"
-#include "un-namespace.h"
-
-struct arc4_stream {
-	u_int8_t i;
-	u_int8_t j;
-	u_int8_t s[256];
-};
-
-static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-
-#define	RANDOMDEV	"/dev/urandom"
-#define	THREAD_LOCK()						\
-	do {							\
-		if (__isthreaded)				\
-			_pthread_mutex_lock(&arc4random_mtx);	\
-	} while (0)
-
-#define	THREAD_UNLOCK()						\
-	do {							\
-		if (__isthreaded)				\
-			_pthread_mutex_unlock(&arc4random_mtx);	\
-	} while (0)
-
-static struct arc4_stream rs;
-static int rs_initialized;
-static int rs_stired;
-
-static inline u_int8_t arc4_getbyte(struct arc4_stream *);
-static void arc4_stir(struct arc4_stream *);
-
-static inline void
-arc4_init(as)
-	struct arc4_stream *as;
-{
-	int     n;
-
-	for (n = 0; n < 256; n++)
-		as->s[n] = n;
-	as->i = 0;
-	as->j = 0;
-}
-
-static inline void
-arc4_addrandom(as, dat, datlen)
-	struct arc4_stream *as;
-	u_char *dat;
-	int     datlen;
-{
-	int     n;
-	u_int8_t si;
-
-	as->i--;
-	for (n = 0; n < 256; n++) {
-		as->i = (as->i + 1);
-		si = as->s[as->i];
-		as->j = (as->j + si + dat[n % datlen]);
-		as->s[as->i] = as->s[as->j];
-		as->s[as->j] = si;
-	}
-}
-
-static void
-arc4_stir(as)
-	struct arc4_stream *as;
-{
-	int     fd, n;
-	struct {
-		struct timeval tv;
-		pid_t pid;
-		u_int8_t rnd[128 - sizeof(struct timeval) - sizeof(pid_t)];
-	}       rdat;
-
-	gettimeofday(&rdat.tv, NULL);
-	rdat.pid = getpid();
-	fd = _open(RANDOMDEV, O_RDONLY, 0);
-	if (fd >= 0) {
-		(void) _read(fd, rdat.rnd, sizeof(rdat.rnd));
-		_close(fd);
-	} 
-	/* fd < 0?  Ah, what the heck. We'll just take whatever was on the
-	 * stack... */
-
-	arc4_addrandom(as, (void *) &rdat, sizeof(rdat));
-
-	/*
-	 * Throw away the first N bytes of output, as suggested in the
-	 * paper "Weaknesses in the Key Scheduling Algorithm of RC4"
-	 * by Fluher, Mantin, and Shamir.  N=1024 is based on
-	 * suggestions in the paper "(Not So) Random Shuffles of RC4"
-	 * by Ilya Mironov.
-	 */
-	for (n = 0; n < 1024; n++)
-		arc4_getbyte(as);
-}
-
-static inline u_int8_t
-arc4_getbyte(as)
-	struct arc4_stream *as;
-{
-	u_int8_t si, sj;
-
-	as->i = (as->i + 1);
-	si = as->s[as->i];
-	as->j = (as->j + si);
-	sj = as->s[as->j];
-	as->s[as->i] = sj;
-	as->s[as->j] = si;
-
-	return (as->s[(si + sj) & 0xff]);
-}
-
-static inline uint32_t
-arc4_getword(as)
-	struct arc4_stream *as;
-{
-	uint32_t val;
-
-	val = arc4_getbyte(as) << 24;
-	val |= arc4_getbyte(as) << 16;
-	val |= arc4_getbyte(as) << 8;
-	val |= arc4_getbyte(as);
-
-	return (val);
-}
-
-static void
-arc4_check_init(void)
-{
-	if (!rs_initialized) {
-		arc4_init(&rs);
-		rs_initialized = 1;
-	}
-}
-
-static void
-arc4_check_stir(void)
-{
-	if (!rs_stired) {
-		arc4_stir(&rs);
-		rs_stired = 1;
-	}
-}
-
-void
-arc4random_stir()
-{
-	THREAD_LOCK();
-	arc4_check_init();
-	arc4_stir(&rs);
-	THREAD_UNLOCK();
-}
-
-void
-arc4random_addrandom(dat, datlen)
-	u_char *dat;
-	int     datlen;
-{
-	THREAD_LOCK();
-	arc4_check_init();
-	arc4_check_stir();
-	arc4_addrandom(&rs, dat, datlen);
-	THREAD_UNLOCK();
-}
-
-uint32_t
-arc4random()
-{
-	uint32_t rnd;
-
-	THREAD_LOCK();
-	arc4_check_init();
-	arc4_check_stir();
-	rnd = arc4_getword(&rs);
-	THREAD_UNLOCK();
-
-	return (rnd);
-}
-
-#if 0
-/*-------- Test code for i386 --------*/
-#include <stdio.h>
-#include <machine/pctr.h>
-int
-main(int argc, char **argv)
-{
-	const int iter = 1000000;
-	int     i;
-	pctrval v;
-
-	v = rdtsc();
-	for (i = 0; i < iter; i++)
-		arc4random();
-	v = rdtsc() - v;
-	v /= iter;
-
-	printf("%qd cycles\n", v);
-}
-#endif
diff --git a/lib/libc/gen/assert.c b/lib/libc/gen/assert.c
deleted file mode 100644
index f14e39c..0000000
--- a/lib/libc/gen/assert.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)assert.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/assert.c,v 1.7 2002/02/01 00:57:29 obrien Exp $");
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void
-__assert(func, file, line, failedexpr)
-	const char *func, *file;
-	int line;
-	const char *failedexpr;
-{
-	if (func == NULL)
-		(void)fprintf(stderr,
-		     "Assertion failed: (%s), file %s, line %d.\n", failedexpr,
-		     file, line);
-	else
-		(void)fprintf(stderr,
-		     "Assertion failed: (%s), function %s, file %s, line %d.\n",
-		     failedexpr, func, file, line);
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc/gen/basename.c b/lib/libc/gen/basename.c
deleted file mode 100644
index c5da463..0000000
--- a/lib/libc/gen/basename.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#if 0
-#ifndef lint
-static char rcsid[] = "$OpenBSD: basename.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
-#endif /* not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
-
-#include <errno.h>
-#include <libgen.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-
-char *
-basename(path)
-	const char *path;
-{
-	static char *bname = NULL;
-	const char *endp, *startp;
-
- 	if (bname == NULL) {
-		bname = (char *)malloc(MAXPATHLEN);
-		if (bname == NULL)
-			return(NULL);
-	}
-
-	/* Empty or NULL string gets treated as "." */
-	if (path == NULL || *path == '\0') {
-		(void)strcpy(bname, ".");
-		return(bname);
-	}
-
-	/* Strip trailing slashes */
-	endp = path + strlen(path) - 1;
-	while (endp > path && *endp == '/')
-		endp--;
-
-	/* All slashes becomes "/" */
-	if (endp == path && *endp == '/') {
-		(void)strcpy(bname, "/");
-		return(bname);
-	}
-
-	/* Find the start of the base */
-	startp = endp;
-	while (startp > path && *(startp - 1) != '/')
-		startp--;
-
-	if (endp - startp + 2 > MAXPATHLEN) {
-		errno = ENAMETOOLONG;
-		return(NULL);
-	}
-	(void)strncpy(bname, startp, endp - startp + 1);
-	bname[endp - startp + 1] = '\0';
-	return(bname);
-}
diff --git a/lib/libc/gen/check_utility_compat.c b/lib/libc/gen/check_utility_compat.c
deleted file mode 100644
index 716f5b2..0000000
--- a/lib/libc/gen/check_utility_compat.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2002 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/check_utility_compat.c,v 1.3 2003/05/01 19:03:13 nectar Exp $");
-
-/*
- * I din't use "namespace.h" here because none of the relevant utilities
- * are threaded, so I'm not concerned about cancellation points or other
- * niceties.
- */
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifndef LINE_MAX
-#define	LINE_MAX _POSIX2_LINE_MAX
-#endif
-
-#define	_PATH_UTIL_COMPAT	"/etc/compat-FreeBSD-4-util"
-#define	_ENV_UTIL_COMPAT	"_COMPAT_FreeBSD_4"
-
-int
-check_utility_compat(const char *utility)
-{
-	char buf[LINE_MAX];
-	char *p, *bp;
-	int len;
-
-	if ((p = getenv(_ENV_UTIL_COMPAT)) != NULL) {
-		strlcpy(buf, p, sizeof buf);
-	} else {
-		if ((len = readlink(_PATH_UTIL_COMPAT, buf, sizeof buf)) < 0)
-			return 0;
-		if (len > sizeof buf)
-			len = sizeof buf;
-		buf[len] = '\0';
-	}
-	if (buf[0] == '\0')
-		return 1;
-
-	bp = buf;
-	while ((p = strsep(&bp, ",")) != NULL) {
-		if (strcmp(p, utility) == 0)
-			return 1;
-	}
-	return 0;
-}
diff --git a/lib/libc/gen/clock.c b/lib/libc/gen/clock.c
deleted file mode 100644
index ddfccbe..0000000
--- a/lib/libc/gen/clock.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)clock.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/clock.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-/*
- * Convert usec to clock ticks; could do (usec * CLOCKS_PER_SEC) / 1000000,
- * but this would overflow if we switch to nanosec.
- */
-#define	CONVTCK(r)	((r).tv_sec * CLOCKS_PER_SEC \
-			 + (r).tv_usec / (1000000 / CLOCKS_PER_SEC))
-
-clock_t
-clock()
-{
-	struct rusage ru;
-
-	if (getrusage(RUSAGE_SELF, &ru))
-		return ((clock_t) -1);
-	return((clock_t)((CONVTCK(ru.ru_utime) + CONVTCK(ru.ru_stime))));
-}
diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c
deleted file mode 100644
index 31dedc0..0000000
--- a/lib/libc/gen/closedir.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)closedir.c	8.1 (Berkeley) 6/10/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/closedir.c,v 1.10 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <dirent.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "telldir.h"
-
-/*
- * close a directory.
- */
-int
-closedir(dirp)
-	DIR *dirp;
-{
-	int fd;
-
-	if (__isthreaded)
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
-	_seekdir(dirp, dirp->dd_rewind);	/* free seekdir storage */
-	fd = dirp->dd_fd;
-	dirp->dd_fd = -1;
-	dirp->dd_loc = 0;
-	free((void *)dirp->dd_buf);
-	_reclaim_telldir(dirp);
-	if (__isthreaded) {
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
-		_pthread_mutex_destroy((pthread_mutex_t *)&dirp->dd_lock);
-	}
-	free((void *)dirp);
-	return(_close(fd));
-}
diff --git a/lib/libc/gen/confstr.c b/lib/libc/gen/confstr.c
deleted file mode 100644
index 7c4699c..0000000
--- a/lib/libc/gen/confstr.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*-
- * Copyright (c) 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)confstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/confstr.c,v 1.9 2003/05/01 19:03:13 nectar Exp $");
-
-#include <sys/param.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <string.h>
-#include <unistd.h>
-
-
-size_t
-confstr(int name, char *buf, size_t len)
-{
-	const char *p;
-	const char UPE[] = "unsupported programming environment";
-
-	switch (name) {
-	case _CS_PATH:
-		p = _PATH_STDPATH;
-		goto docopy;
-
-		/*
-		 * POSIX/SUS ``Programming Environments'' stuff
-		 *
-		 * We don't support more than one programming environment
-		 * on any platform (yet), so we just return the empty
-		 * string for the environment we are compiled for,
-		 * and the string "unsupported programming environment"
-		 * for anything else.  (The Standard says that if these
-		 * values are used on a system which does not support
-		 * this environment -- determined via sysconf() -- then
-		 * the value we return is unspecified.  So, we return
-		 * something which will cause obvious breakage.)
-		 */
-	case _CS_POSIX_V6_ILP32_OFF32_CFLAGS:
-	case _CS_POSIX_V6_ILP32_OFF32_LDFLAGS:
-	case _CS_POSIX_V6_ILP32_OFF32_LIBS:
-	case _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS:
-	case _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS:
-	case _CS_POSIX_V6_LPBIG_OFFBIG_LIBS:
-		/*
-		 * These two environments are never supported.
-		 */
-		p = UPE;
-		goto docopy;
-
-	case _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS:
-	case _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS:
-	case _CS_POSIX_V6_ILP32_OFFBIG_LIBS:
-		if (sizeof(long) * CHAR_BIT == 32 &&
-		    sizeof(off_t) > sizeof(long))
-			p = "";
-		else
-			p = UPE;
-		goto docopy;
-
-	case _CS_POSIX_V6_LP64_OFF64_CFLAGS:
-	case _CS_POSIX_V6_LP64_OFF64_LDFLAGS:
-	case _CS_POSIX_V6_LP64_OFF64_LIBS:
-		if (sizeof(long) * CHAR_BIT >= 64 &&
-		    sizeof(void *) * CHAR_BIT >= 64 &&
-		    sizeof(int) * CHAR_BIT >= 32 &&
-		    sizeof(off_t) >= sizeof(long))
-			p = "";
-		else
-			p = UPE;
-		goto docopy;
-
-	case _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS:
-		/* XXX - should have more complete coverage */
-		if (sizeof(long) * CHAR_BIT >= 64)
-			p = "_POSIX_V6_LP64_OFF64";
-		else
-			p = "_POSIX_V6_ILP32_OFFBIG";
-		goto docopy;
-
-docopy:
-		if (len != 0 && buf != NULL)
-			strlcpy(buf, p, len);
-		return (strlen(p) + 1);
-
-	default:
-		errno = EINVAL;
-		return (0);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/gen/crypt.c b/lib/libc/gen/crypt.c
deleted file mode 100644
index f846343..0000000
--- a/lib/libc/gen/crypt.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Tom Truscott.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-/* from static char sccsid[] = "@(#)crypt.c	5.11 (Berkeley) 6/25/91"; */
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/crypt.c,v 1.8 2002/10/18 16:24:20 markm Exp $");
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-/*
- * UNIX password, and DES, encryption.
- *
- * since this is non-exportable, this is just a dummy.  if you want real
- * encryption, make sure you've got libcrypt.a around.
- */
-
-__warn_references(des_setkey,
-	"WARNING!  des_setkey(3) not present in the system!");
-
-/* ARGSUSED */
-int
-des_setkey(const char *key __unused)
-{
-	fprintf(stderr, "WARNING!  des_setkey(3) not present in the system!\n");
-	return (0);
-}
-
-__warn_references(des_cipher,
-	"WARNING!  des_cipher(3) not present in the system!");
-
-/* ARGSUSED */
-int
-des_cipher(const char *in, char *out, long salt __unused, int num_iter __unused)
-{
-	fprintf(stderr, "WARNING!  des_cipher(3) not present in the system!\n");
-	bcopy(in, out, 8);
-	return (0);
-}
-
-__warn_references(setkey,
-	"WARNING!  setkey(3) not present in the system!");
-
-/* ARGSUSED */
-int
-setkey(const char *key __unused)
-{
-	fprintf(stderr, "WARNING!  setkey(3) not present in the system!\n");
-	return (0);
-}
-
-__warn_references(encrypt,
-	"WARNING!  encrypt(3) not present in the system!");
-
-/* ARGSUSED */
-int
-encrypt(char *block __unused, int flag __unused)
-{
-	fprintf(stderr, "WARNING!  encrypt(3) not present in the system!\n");
-	return (0);
-}
diff --git a/lib/libc/gen/ctermid.c b/lib/libc/gen/ctermid.c
deleted file mode 100644
index 6b2c682..0000000
--- a/lib/libc/gen/ctermid.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ctermid.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/ctermid.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
-
-#include <stdio.h>
-#include <paths.h>
-#include <string.h>
-
-char *
-ctermid(char *s)
-{
-	static char def[] = _PATH_TTY;
-
-	if (s) {
-		bcopy(def, s, sizeof(_PATH_TTY));
-		return(s);
-	}
-	return(def);
-}
-
-
-char *
-ctermid_r(char *s)
-{
-	return (s) ? ctermid(s) : NULL;
-}
diff --git a/lib/libc/gen/daemon.c b/lib/libc/gen/daemon.c
deleted file mode 100644
index 1b9b706..0000000
--- a/lib/libc/gen/daemon.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/daemon.c,v 1.6 2003/11/10 22:01:42 ghelmer Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <signal.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-int
-daemon(nochdir, noclose)
-	int nochdir, noclose;
-{
-	struct sigaction osa, sa;
-	int fd;
-	pid_t newgrp;
-	int oerrno;
-	int osa_ok;
-
-	/* A SIGHUP may be thrown when the parent exits below. */
-	sigemptyset(&sa.sa_mask);
-	sa.sa_handler = SIG_IGN;
-	sa.sa_flags = 0;
-	osa_ok = _sigaction(SIGHUP, &sa, &osa);
-
-	switch (fork()) {
-	case -1:
-		return (-1);
-	case 0:
-		break;
-	default:
-		_exit(0);
-	}
-
-	newgrp = setsid();
-	oerrno = errno;
-	if (osa_ok != -1)
-		_sigaction(SIGHUP, &osa, NULL);
-
-	if (newgrp == -1) {
-		errno = oerrno;
-		return (-1);
-	}
-
-	if (!nochdir)
-		(void)chdir("/");
-
-	if (!noclose && (fd = _open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
-		(void)_dup2(fd, STDIN_FILENO);
-		(void)_dup2(fd, STDOUT_FILENO);
-		(void)_dup2(fd, STDERR_FILENO);
-		if (fd > 2)
-			(void)_close(fd);
-	}
-	return (0);
-}
diff --git a/lib/libc/gen/devname.c b/lib/libc/gen/devname.c
deleted file mode 100644
index bf5af30..0000000
--- a/lib/libc/gen/devname.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)devname.c	8.2 (Berkeley) 4/29/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/devname.c,v 1.9 2003/06/20 09:52:27 phk Exp $");
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-
-char *
-devname_r(dev_t dev, mode_t type, char *buf, int len)
-{
-	int i;
-	size_t j;
-	char *r;
-
-	if ((type & S_IFMT) == S_IFCHR) {
-		j = len;
-		i = sysctlbyname("kern.devname", buf, &j, &dev, sizeof (dev));
-		if (i == 0)
-		    return (buf);
-	}
-
-	/* Finally just format it */
-	if (dev == NODEV)
-		r = "#NODEV";
-	else 
-		r = "#%c:%d:0x%x";
-	snprintf(buf, len, r,
-	    (type & S_IFMT) == S_IFCHR ? 'C' : 'B', major(dev), minor(dev));
-	return (buf);
-}
-
-char *
-devname(dev_t dev, mode_t type)
-{
-	static char buf[SPECNAMELEN + 1];
-
-	return(devname_r(dev, type, buf, sizeof(buf)));
-}
diff --git a/lib/libc/gen/dirname.c b/lib/libc/gen/dirname.c
deleted file mode 100644
index 8a4e1c9..0000000
--- a/lib/libc/gen/dirname.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#if 0
-#ifndef lint
-static char rcsid[] = "$OpenBSD: dirname.c,v 1.4 1999/05/30 17:10:30 espie Exp $";
-#endif /* not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
-
-#include <errno.h>
-#include <libgen.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-
-char *
-dirname(path)
-	const char *path;
-{
-	static char *bname = NULL;
-	const char *endp;
-
-	if (bname == NULL) {
-		bname = (char *)malloc(MAXPATHLEN);
-		if (bname == NULL)
-			return(NULL);
-	}
-
-	/* Empty or NULL string gets treated as "." */
-	if (path == NULL || *path == '\0') {
-		(void)strcpy(bname, ".");
-		return(bname);
-	}
-
-	/* Strip trailing slashes */
-	endp = path + strlen(path) - 1;
-	while (endp > path && *endp == '/')
-		endp--;
-
-	/* Find the start of the dir */
-	while (endp > path && *endp != '/')
-		endp--;
-
-	/* Either the dir is "/" or there are no slashes */
-	if (endp == path) {
-		(void)strcpy(bname, *endp == '/' ? "/" : ".");
-		return(bname);
-	} else {
-		do {
-			endp--;
-		} while (endp > path && *endp == '/');
-	}
-
-	if (endp - path + 2 > MAXPATHLEN) {
-		errno = ENAMETOOLONG;
-		return(NULL);
-	}
-	(void)strncpy(bname, path, endp - path + 1);
-	bname[endp - path + 1] = '\0';
-	return(bname);
-}
diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c
deleted file mode 100644
index e7e87cd..0000000
--- a/lib/libc/gen/disklabel.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 1983, 1987, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 5/3/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/disklabel.c,v 1.16 2002/08/16 15:33:20 bmilekic Exp $");
-
-#include <sys/param.h>
-#define DKTYPENAMES
-#define FSTYPENAMES
-#include <sys/disklabel.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-static int
-gettype(char *t, const char **names)
-{
-	const char **nm;
-
-	for (nm = names; *nm; nm++)
-		if (strcasecmp(t, *nm) == 0)
-			return (nm - names);
-	if (isdigit((unsigned char)*t))
-		return (atoi(t));
-	return (0);
-}
-
-struct disklabel *
-getdiskbyname(const char *name)
-{
-	static struct	disklabel disk;
-	struct	disklabel *dp = &disk;
-	struct partition *pp;
-	char	*buf;
-	char  	*db_array[2] = { _PATH_DISKTAB, 0 };
-	char	*cp, *cq;	/* can't be register */
-	char	p, max, psize[3], pbsize[3],
-		pfsize[3], poffset[3], ptype[3];
-	uint32_t *dx;
-
-	if (cgetent(&buf, db_array, (char *) name) < 0)
-		return NULL;
-
-	bzero((char *)&disk, sizeof(disk));
-	/*
-	 * typename
-	 */
-	cq = dp->d_typename;
-	cp = buf;
-	while (cq < dp->d_typename + sizeof(dp->d_typename) - 1 &&
-	    (*cq = *cp) && *cq != '|' && *cq != ':')
-		cq++, cp++;
-	*cq = '\0';
-
-	if (cgetstr(buf, "ty", &cq) > 0 && strcmp(cq, "removable") == 0)
-		dp->d_flags |= D_REMOVABLE;
-	else  if (cq && strcmp(cq, "simulated") == 0)
-		dp->d_flags |= D_RAMDISK;
-	if (cgetcap(buf, "sf", ':') != NULL)
-		dp->d_flags |= D_BADSECT;
-
-#define getnumdflt(field, dname, dflt) \
-        { long f; (field) = (cgetnum(buf, dname, &f) == -1) ? (dflt) : f; }
-
-	getnumdflt(dp->d_secsize, "se", DEV_BSIZE);
-	getnumdflt(dp->d_ntracks, "nt", 0);
-	getnumdflt(dp->d_nsectors, "ns", 0);
-	getnumdflt(dp->d_ncylinders, "nc", 0);
-
-	if (cgetstr(buf, "dt", &cq) > 0)
-		dp->d_type = gettype(cq, dktypenames);
-	else
-		getnumdflt(dp->d_type, "dt", 0);
-	getnumdflt(dp->d_secpercyl, "sc", dp->d_nsectors * dp->d_ntracks);
-	getnumdflt(dp->d_secperunit, "su", dp->d_secpercyl * dp->d_ncylinders);
-	getnumdflt(dp->d_rpm, "rm", 3600);
-	getnumdflt(dp->d_interleave, "il", 1);
-	getnumdflt(dp->d_trackskew, "sk", 0);
-	getnumdflt(dp->d_cylskew, "cs", 0);
-	getnumdflt(dp->d_headswitch, "hs", 0);
-	getnumdflt(dp->d_trkseek, "ts", 0);
-	getnumdflt(dp->d_bbsize, "bs", BBSIZE);
-	getnumdflt(dp->d_sbsize, "sb", 0);
-	strcpy(psize, "px");
-	strcpy(pbsize, "bx");
-	strcpy(pfsize, "fx");
-	strcpy(poffset, "ox");
-	strcpy(ptype, "tx");
-	max = 'a' - 1;
-	pp = &dp->d_partitions[0];
-	for (p = 'a'; p < 'a' + MAXPARTITIONS; p++, pp++) {
-		long l;
-		psize[1] = pbsize[1] = pfsize[1] = poffset[1] = ptype[1] = p;
-		if (cgetnum(buf, psize, &l) == -1)
-			pp->p_size = 0;
-		else {
-			pp->p_size = l;
-			cgetnum(buf, poffset, &l);
-			pp->p_offset = l;
-			getnumdflt(pp->p_fsize, pfsize, 0);
-			if (pp->p_fsize) {
-				long bsize;
-
-				if (cgetnum(buf, pbsize, &bsize) == 0)
-					pp->p_frag = bsize / pp->p_fsize;
-				else
-					pp->p_frag = 8;
-			}
-			getnumdflt(pp->p_fstype, ptype, 0);
-			if (pp->p_fstype == 0 && cgetstr(buf, ptype, &cq) > 0)
-				pp->p_fstype = gettype(cq, fstypenames);
-			max = p;
-		}
-	}
-	dp->d_npartitions = max + 1 - 'a';
-	(void)strcpy(psize, "dx");
-	dx = dp->d_drivedata;
-	for (p = '0'; p < '0' + NDDATA; p++, dx++) {
-		psize[1] = p;
-		getnumdflt(*dx, psize, 0);
-	}
-	dp->d_magic = DISKMAGIC;
-	dp->d_magic2 = DISKMAGIC;
-	free(buf);
-	return (dp);
-}
diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c
deleted file mode 100644
index 971b2dc..0000000
--- a/lib/libc/gen/dlfcn.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * Copyright (c) 1998 John D. Polstra
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.12 2004/03/05 08:10:17 markm Exp $");
-
-/*
- * Linkage to services provided by the dynamic linker.
- */
-#include <dlfcn.h>
-#include <stddef.h>
-
-static const char sorry[] = "Service unavailable";
-
-/*
- * For ELF, the dynamic linker directly resolves references to its
- * services to functions inside the dynamic linker itself.  These
- * weak-symbol stubs are necessary so that "ld" won't complain about
- * undefined symbols.  The stubs are executed only when the program is
- * linked statically, or when a given service isn't implemented in the
- * dynamic linker.  They must return an error if called, and they must
- * be weak symbols so that the dynamic linker can override them.
- */
-
-#pragma weak _rtld_error
-void
-_rtld_error(const char *fmt, ...)
-{
-}
-
-#pragma weak dladdr
-int
-dladdr(const void *addr, Dl_info *dlip)
-{
-	_rtld_error(sorry);
-	return 0;
-}
-
-#pragma weak dlclose
-int
-dlclose(void *handle)
-{
-	_rtld_error(sorry);
-	return -1;
-}
-
-#pragma weak dlerror
-const char *
-dlerror(void)
-{
-	return sorry;
-}
-
-#pragma weak dllockinit
-void
-dllockinit(void *context,
-	   void *(*lock_create)(void *context),
-	   void (*rlock_acquire)(void *lock),
-	   void (*wlock_acquire)(void *lock),
-	   void (*lock_release)(void *lock),
-	   void (*lock_destroy)(void *lock),
-	   void (*context_destroy)(void *context))
-{
-	if (context_destroy != NULL)
-		context_destroy(context);
-}
-
-#pragma weak dlopen
-void *
-dlopen(const char *name, int mode)
-{
-	_rtld_error(sorry);
-	return NULL;
-}
-
-#pragma weak dlsym
-void *
-dlsym(void * __restrict handle, const char * __restrict name)
-{
-	_rtld_error(sorry);
-	return NULL;
-}
-
-#pragma weak dlinfo
-int
-dlinfo(void * __restrict handle, int request, void * __restrict p)
-{
-	_rtld_error(sorry);
-	return 0;
-}
-
-#pragma weak _rtld_thread_init
-void
-_rtld_thread_init(void * li)
-{
-	_rtld_error(sorry);
-}
diff --git a/lib/libc/gen/dlfunc.c b/lib/libc/gen/dlfunc.c
deleted file mode 100644
index 933ea19..0000000
--- a/lib/libc/gen/dlfunc.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This source file is in the public domain.
- * Garrett A. Wollman, 2002-05-28.
- *
- * $FreeBSD: src/lib/libc/gen/dlfunc.c,v 1.3 2002/09/11 05:05:48 mike Exp $
- */
-
-#include <dlfcn.h>
-
-/*
- * Implement the dlfunc() interface, which behaves exactly the same as
- * dlsym() except that it returns a function pointer instead of a data
- * pointer.  This can be used by applications to avoid compiler warnings
- * about undefined behavior, and is intended as prior art for future
- * POSIX standardization.  This function requires that all pointer types
- * have the same representation, which is true on all platforms FreeBSD
- * runs on, but is not guaranteed by the C standard.
- */
-dlfunc_t
-dlfunc(void * __restrict handle, const char * __restrict symbol)
-{
-	union {
-		void *d;
-		dlfunc_t f;
-	} rv;
-
-	rv.d = dlsym(handle, symbol);
-	return (rv.f);
-}
-
diff --git a/lib/libc/gen/drand48.c b/lib/libc/gen/drand48.c
deleted file mode 100644
index 92aeb80..0000000
--- a/lib/libc/gen/drand48.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/drand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-
-double
-drand48(void)
-{
-	return erand48(_rand48_seed);
-}
diff --git a/lib/libc/gen/erand48.c b/lib/libc/gen/erand48.c
deleted file mode 100644
index 4b0c1df..0000000
--- a/lib/libc/gen/erand48.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/erand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include "rand48.h"
-
-double
-erand48(unsigned short xseed[3])
-{
-	_dorand48(xseed);
-	return ldexp((double) xseed[0], -48) +
-	       ldexp((double) xseed[1], -32) +
-	       ldexp((double) xseed[2], -16);
-}
diff --git a/lib/libc/gen/err.c b/lib/libc/gen/err.c
deleted file mode 100644
index aa0d306..0000000
--- a/lib/libc/gen/err.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*-
- * Copyright (c) 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/err.c,v 1.13 2002/03/29 22:43:41 markm Exp $");
-
-#include "namespace.h"
-#include <err.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-static FILE *err_file; /* file to use for error output */
-static void (*err_exit)(int);
-
-/*
- * This is declared to take a `void *' so that the caller is not required
- * to include <stdio.h> first.  However, it is really a `FILE *', and the
- * manual page documents it as such.
- */
-void
-err_set_file(void *fp)
-{
-	if (fp)
-		err_file = fp;
-	else
-		err_file = stderr;
-}
-
-void
-err_set_exit(void (*ef)(int))
-{
-	err_exit = ef;
-}
-
-__weak_reference(_err, err);
-
-void
-_err(int eval, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrc(eval, errno, fmt, ap);
-	va_end(ap);
-}
-
-void
-verr(eval, fmt, ap)
-	int eval;
-	const char *fmt;
-	va_list ap;
-{
-	verrc(eval, errno, fmt, ap);
-}
-
-void
-errc(int eval, int code, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrc(eval, code, fmt, ap);
-	va_end(ap);
-}
-
-void
-verrc(eval, code, fmt, ap)
-	int eval;
-	int code;
-	const char *fmt;
-	va_list ap;
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL) {
-		vfprintf(err_file, fmt, ap);
-		fprintf(err_file, ": ");
-	}
-	fprintf(err_file, "%s\n", strerror(code));
-	if (err_exit)
-		err_exit(eval);
-	exit(eval);
-}
-
-void
-errx(int eval, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrx(eval, fmt, ap);
-	va_end(ap);
-}
-
-void
-verrx(eval, fmt, ap)
-	int eval;
-	const char *fmt;
-	va_list ap;
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL)
-		vfprintf(err_file, fmt, ap);
-	fprintf(err_file, "\n");
-	if (err_exit)
-		err_exit(eval);
-	exit(eval);
-}
-
-__weak_reference(_warn, warn);
-
-void
-_warn(const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnc(errno, fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarn(fmt, ap)
-	const char *fmt;
-	va_list ap;
-{
-	vwarnc(errno, fmt, ap);
-}
-
-void
-warnc(int code, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnc(code, fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarnc(code, fmt, ap)
-	int code;
-	const char *fmt;
-	va_list ap;
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL) {
-		vfprintf(err_file, fmt, ap);
-		fprintf(err_file, ": ");
-	}
-	fprintf(err_file, "%s\n", strerror(code));
-}
-
-void
-warnx(const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnx(fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarnx(fmt, ap)
-	const char *fmt;
-	va_list ap;
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL)
-		vfprintf(err_file, fmt, ap);
-	fprintf(err_file, "\n");
-}
diff --git a/lib/libc/gen/errlst.c b/lib/libc/gen/errlst.c
deleted file mode 100644
index 28f99d8..0000000
--- a/lib/libc/gen/errlst.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright (c) 1982, 1985, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.8 2005/04/02 12:33:28 das Exp $");
-
-#include <stdio.h>
-
-const char *const sys_errlist[] = {
-	"Undefined error: 0",			/*  0 - ENOERROR */
-	"Operation not permitted",		/*  1 - EPERM */
-	"No such file or directory",		/*  2 - ENOENT */
-	"No such process",			/*  3 - ESRCH */
-	"Interrupted system call",		/*  4 - EINTR */
-	"Input/output error",			/*  5 - EIO */
-	"Device not configured",		/*  6 - ENXIO */
-	"Argument list too long",		/*  7 - E2BIG */
-	"Exec format error",			/*  8 - ENOEXEC */
-	"Bad file descriptor",			/*  9 - EBADF */
-	"No child processes",			/* 10 - ECHILD */
-	"Resource deadlock avoided",		/* 11 - EDEADLK */
-	"Cannot allocate memory",		/* 12 - ENOMEM */
-	"Permission denied",			/* 13 - EACCES */
-	"Bad address",				/* 14 - EFAULT */
-	"Block device required",		/* 15 - ENOTBLK */
-	"Device busy",				/* 16 - EBUSY */
-	"File exists",				/* 17 - EEXIST */
-	"Cross-device link",			/* 18 - EXDEV */
-	"Operation not supported by device",	/* 19 - ENODEV */
-	"Not a directory",			/* 20 - ENOTDIR */
-	"Is a directory",			/* 21 - EISDIR */
-	"Invalid argument",			/* 22 - EINVAL */
-	"Too many open files in system",	/* 23 - ENFILE */
-	"Too many open files",			/* 24 - EMFILE */
-	"Inappropriate ioctl for device",	/* 25 - ENOTTY */
-	"Text file busy",			/* 26 - ETXTBSY */
-	"File too large",			/* 27 - EFBIG */
-	"No space left on device",		/* 28 - ENOSPC */
-	"Illegal seek",				/* 29 - ESPIPE */
-	"Read-only file system",		/* 30 - EROFS */
-	"Too many links",			/* 31 - EMLINK */
-	"Broken pipe",				/* 32 - EPIPE */
-
-/* math software */
-	"Numerical argument out of domain",	/* 33 - EDOM */
-	"Result too large",			/* 34 - ERANGE */
-
-/* non-blocking and interrupt i/o */
-	"Resource temporarily unavailable",	/* 35 - EAGAIN */
-						/* 35 - EWOULDBLOCK */
-	"Operation now in progress",		/* 36 - EINPROGRESS */
-	"Operation already in progress",	/* 37 - EALREADY */
-
-/* ipc/network software -- argument errors */
-	"Socket operation on non-socket",	/* 38 - ENOTSOCK */
-	"Destination address required",		/* 39 - EDESTADDRREQ */
-	"Message too long",			/* 40 - EMSGSIZE */
-	"Protocol wrong type for socket",	/* 41 - EPROTOTYPE */
-	"Protocol not available",		/* 42 - ENOPROTOOPT */
-	"Protocol not supported",		/* 43 - EPROTONOSUPPORT */
-	"Socket type not supported",		/* 44 - ESOCKTNOSUPPORT */
-	"Operation not supported",		/* 45 - EOPNOTSUPP */
-	"Protocol family not supported",	/* 46 - EPFNOSUPPORT */
-						/* 47 - EAFNOSUPPORT */
-	"Address family not supported by protocol family",
-	"Address already in use",		/* 48 - EADDRINUSE */
-	"Can't assign requested address",	/* 49 - EADDRNOTAVAIL */
-
-/* ipc/network software -- operational errors */
-	"Network is down",			/* 50 - ENETDOWN */
-	"Network is unreachable",		/* 51 - ENETUNREACH */
-	"Network dropped connection on reset",	/* 52 - ENETRESET */
-	"Software caused connection abort",	/* 53 - ECONNABORTED */
-	"Connection reset by peer",		/* 54 - ECONNRESET */
-	"No buffer space available",		/* 55 - ENOBUFS */
-	"Socket is already connected",		/* 56 - EISCONN */
-	"Socket is not connected",		/* 57 - ENOTCONN */
-	"Can't send after socket shutdown",	/* 58 - ESHUTDOWN */
-	"Too many references: can't splice",	/* 59 - ETOOMANYREFS */
-	"Operation timed out",			/* 60 - ETIMEDOUT */
-	"Connection refused",			/* 61 - ECONNREFUSED */
-
-	"Too many levels of symbolic links",	/* 62 - ELOOP */
-	"File name too long",			/* 63 - ENAMETOOLONG */
-
-/* should be rearranged */
-	"Host is down",				/* 64 - EHOSTDOWN */
-	"No route to host",			/* 65 - EHOSTUNREACH */
-	"Directory not empty",			/* 66 - ENOTEMPTY */
-
-/* quotas & mush */
-	"Too many processes",			/* 67 - EPROCLIM */
-	"Too many users",			/* 68 - EUSERS */
-	"Disc quota exceeded",			/* 69 - EDQUOT */
-
-/* Network File System */
-	"Stale NFS file handle",		/* 70 - ESTALE */
-	"Too many levels of remote in path",	/* 71 - EREMOTE */
-	"RPC struct is bad",			/* 72 - EBADRPC */
-	"RPC version wrong",			/* 73 - ERPCMISMATCH */
-	"RPC prog. not avail",			/* 74 - EPROGUNAVAIL */
-	"Program version wrong",		/* 75 - EPROGMISMATCH */
-	"Bad procedure for program",		/* 76 - EPROCUNAVAIL */
-
-	"No locks available",			/* 77 - ENOLCK */
-	"Function not implemented",		/* 78 - ENOSYS */
-	"Inappropriate file type or format",	/* 79 - EFTYPE */
-	"Authentication error",			/* 80 - EAUTH */
-	"Need authenticator",			/* 81 - ENEEDAUTH */
-	"Identifier removed",			/* 82 - EIDRM */
-	"No message of desired type",		/* 83 - ENOMSG */
-	"Value too large to be stored in data type", /* 84 - EOVERFLOW */
-	"Operation canceled",			/* 85 - ECANCELED */
-	"Illegal byte sequence",		/* 86 - EILSEQ */
-	"Attribute not found",			/* 87 - ENOATTR */
-
-/* General */
-	"Programming error",			/* 88 - EDOOFUS */
-
-	"Bad message",				/* 89 - EBADMSG */
-	"Multihop attempted",			/* 90 - EMULTIHOP */
-	"Link has been severed",		/* 91 - ENOLINK */
-	"Protocol error",			/* 92 - EPROTO */
-};
-const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);
diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c
deleted file mode 100644
index 7d98857..0000000
--- a/lib/libc/gen/errno.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * Copyright (c) 2002 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errno.c,v 1.1 2002/10/09 08:04:24 peter Exp $");
-
-int errno;
diff --git a/lib/libc/gen/exec.c b/lib/libc/gen/exec.c
deleted file mode 100644
index 211eb78..0000000
--- a/lib/libc/gen/exec.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/exec.c,v 1.22 2003/07/01 12:30:03 bde Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <paths.h>
-
-#include <stdarg.h>
-#include "un-namespace.h"
-
-extern char **environ;
-
-int
-execl(const char *name, const char *arg, ...)
-{
-	va_list ap;
-	char **argv;
-	int n;
-
-	va_start(ap, arg);
-	n = 1;
-	while (va_arg(ap, char *) != NULL)
-		n++;
-	va_end(ap);
-	argv = alloca((n + 1) * sizeof(*argv));
-	if (argv == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	va_start(ap, arg);
-	n = 1;
-	argv[0] = (char *)arg;
-	while ((argv[n] = va_arg(ap, char *)) != NULL)
-		n++;
-	va_end(ap);
-	return (_execve(name, argv, environ));
-}
-
-int
-execle(const char *name, const char *arg, ...)
-{
-	va_list ap;
-	char **argv, **envp;
-	int n;
-
-	va_start(ap, arg);
-	n = 1;
-	while (va_arg(ap, char *) != NULL)
-		n++;
-	va_end(ap);
-	argv = alloca((n + 1) * sizeof(*argv));
-	if (argv == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	va_start(ap, arg);
-	n = 1;
-	argv[0] = (char *)arg;
-	while ((argv[n] = va_arg(ap, char *)) != NULL)
-		n++;
-	envp = va_arg(ap, char **);
-	va_end(ap);
-	return (_execve(name, argv, envp));
-}
-
-int
-execlp(const char *name, const char *arg, ...)
-{
-	va_list ap;
-	char **argv;
-	int n;
-
-	va_start(ap, arg);
-	n = 1;
-	while (va_arg(ap, char *) != NULL)
-		n++;
-	va_end(ap);
-	argv = alloca((n + 1) * sizeof(*argv));
-	if (argv == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	va_start(ap, arg);
-	n = 1;
-	argv[0] = (char *)arg;
-	while ((argv[n] = va_arg(ap, char *)) != NULL)
-		n++;
-	va_end(ap);
-	return (execvp(name, argv));
-}
-
-int
-execv(name, argv)
-	const char *name;
-	char * const *argv;
-{
-	(void)_execve(name, argv, environ);
-	return (-1);
-}
-
-int
-execvp(const char *name, char * const *argv)
-{
-	const char *path;
-
-	/* Get the path we're searching. */
-	if ((path = getenv("PATH")) == NULL)
-		path = _PATH_DEFPATH;
-
-	return (execvP(name, path, argv));
-}
-
-int
-execvP(name, path, argv)
-	const char *name;
-	const char *path;
-	char * const *argv;
-{
-	char **memp;
-	int cnt, lp, ln;
-	char *p;
-	int eacces, save_errno;
-	char *bp, *cur, buf[MAXPATHLEN];
-	struct stat sb;
-
-	eacces = 0;
-
-	/* If it's an absolute or relative path name, it's easy. */
-	if (index(name, '/')) {
-		bp = (char *)name;
-		cur = NULL;
-		goto retry;
-	}
-	bp = buf;
-
-	/* If it's an empty path name, fail in the usual POSIX way. */
-	if (*name == '\0') {
-		errno = ENOENT;
-		return (-1);
-	}
-
-	cur = alloca(strlen(path) + 1);
-	if (cur == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	strcpy(cur, path);
-	while ((p = strsep(&cur, ":")) != NULL) {
-		/*
-		 * It's a SHELL path -- double, leading and trailing colons
-		 * mean the current directory.
-		 */
-		if (*p == '\0') {
-			p = ".";
-			lp = 1;
-		} else
-			lp = strlen(p);
-		ln = strlen(name);
-
-		/*
-		 * If the path is too long complain.  This is a possible
-		 * security issue; given a way to make the path too long
-		 * the user may execute the wrong program.
-		 */
-		if (lp + ln + 2 > sizeof(buf)) {
-			(void)_write(STDERR_FILENO, "execvP: ", 8);
-			(void)_write(STDERR_FILENO, p, lp);
-			(void)_write(STDERR_FILENO, ": path too long\n",
-			    16);
-			continue;
-		}
-		bcopy(p, buf, lp);
-		buf[lp] = '/';
-		bcopy(name, buf + lp + 1, ln);
-		buf[lp + ln + 1] = '\0';
-
-retry:		(void)_execve(bp, argv, environ);
-		switch (errno) {
-		case E2BIG:
-			goto done;
-		case ELOOP:
-		case ENAMETOOLONG:
-		case ENOENT:
-			break;
-		case ENOEXEC:
-			for (cnt = 0; argv[cnt]; ++cnt)
-				;
-			memp = alloca((cnt + 2) * sizeof(char *));
-			if (memp == NULL) {
-				/* errno = ENOMEM; XXX override ENOEXEC? */
-				goto done;
-			}
-			memp[0] = "sh";
-			memp[1] = bp;
-			bcopy(argv + 1, memp + 2, cnt * sizeof(char *));
-			(void)_execve(_PATH_BSHELL, memp, environ);
-			goto done;
-		case ENOMEM:
-			goto done;
-		case ENOTDIR:
-			break;
-		case ETXTBSY:
-			/*
-			 * We used to retry here, but sh(1) doesn't.
-			 */
-			goto done;
-		default:
-			/*
-			 * EACCES may be for an inaccessible directory or
-			 * a non-executable file.  Call stat() to decide
-			 * which.  This also handles ambiguities for EFAULT
-			 * and EIO, and undocumented errors like ESTALE.
-			 * We hope that the race for a stat() is unimportant.
-			 */
-			save_errno = errno;
-			if (stat(bp, &sb) != 0)
-				break;
-			if (save_errno == EACCES) {
-				eacces = 1;
-				continue;
-			}
-			errno = save_errno;
-			goto done;
-		}
-	}
-	if (eacces)
-		errno = EACCES;
-	else
-		errno = ENOENT;
-done:
-	return (-1);
-}
diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c
deleted file mode 100644
index f6673aa..0000000
--- a/lib/libc/gen/fmtcheck.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code was contributed to The NetBSD Foundation by Allen Briggs.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*	$NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $	*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.8 2005/03/21 08:00:55 das Exp $");
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-__weak_reference(__fmtcheck, fmtcheck);
-
-enum __e_fmtcheck_types {
-	FMTCHECK_START,
-	FMTCHECK_SHORT,
-	FMTCHECK_INT,
-	FMTCHECK_LONG,
-	FMTCHECK_QUAD,
-	FMTCHECK_PTRDIFFT,
-	FMTCHECK_SIZET,
-	FMTCHECK_SHORTPOINTER,
-	FMTCHECK_INTPOINTER,
-	FMTCHECK_LONGPOINTER,
-	FMTCHECK_QUADPOINTER,
-	FMTCHECK_PTRDIFFTPOINTER,
-	FMTCHECK_SIZETPOINTER,
-#ifndef NO_FLOATING_POINT
-	FMTCHECK_DOUBLE,
-	FMTCHECK_LONGDOUBLE,
-#endif
-	FMTCHECK_STRING,
-	FMTCHECK_WIDTH,
-	FMTCHECK_PRECISION,
-	FMTCHECK_DONE,
-	FMTCHECK_UNKNOWN
-};
-typedef enum __e_fmtcheck_types EFT;
-
-#define RETURN(pf,f,r) do { \
-			*(pf) = (f); \
-			return r; \
-		       } /*NOTREACHED*/ /*CONSTCOND*/ while (0)
-
-static EFT
-get_next_format_from_precision(const char **pf)
-{
-	int		sh, lg, quad, longdouble, ptrdifft, sizet;
-	const char	*f;
-
-	sh = lg = quad = longdouble = ptrdifft = sizet = 0;
-
-	f = *pf;
-	switch (*f) {
-	case 'h':
-		f++;
-		sh = 1;
-		break;
-	case 'l':
-		f++;
-		if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
-		if (*f == 'l') {
-			f++;
-			quad = 1;
-		} else {
-			lg = 1;
-		}
-		break;
-	case 'q':
-		f++;
-		quad = 1;
-		break;
-	case 't':
-		f++;
-		ptrdifft = 1;
-		break;
-	case 'z':
-		f++;
-		sizet = 1;
-		break;
-	case 'L':
-		f++;
-		longdouble = 1;
-		break;
-	default:
-		break;
-	}
-	if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
-	if (strchr("diouxX", *f)) {
-		if (longdouble)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		if (lg)
-			RETURN(pf,f,FMTCHECK_LONG);
-		if (quad)
-			RETURN(pf,f,FMTCHECK_QUAD);
-		if (ptrdifft)
-			RETURN(pf,f,FMTCHECK_PTRDIFFT);
-		if (sizet)
-			RETURN(pf,f,FMTCHECK_SIZET);
-		RETURN(pf,f,FMTCHECK_INT);
-	}
-	if (*f == 'n') {
-		if (longdouble)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		if (sh)
-			RETURN(pf,f,FMTCHECK_SHORTPOINTER);
-		if (lg)
-			RETURN(pf,f,FMTCHECK_LONGPOINTER);
-		if (quad)
-			RETURN(pf,f,FMTCHECK_QUADPOINTER);
-		if (ptrdifft)
-			RETURN(pf,f,FMTCHECK_PTRDIFFTPOINTER);
-		if (sizet)
-			RETURN(pf,f,FMTCHECK_SIZETPOINTER);
-		RETURN(pf,f,FMTCHECK_INTPOINTER);
-	}
-	if (strchr("DOU", *f)) {
-		if (sh + lg + quad + longdouble + ptrdifft + sizet)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		RETURN(pf,f,FMTCHECK_LONG);
-	}
-#ifndef NO_FLOATING_POINT
-	if (strchr("aAeEfFgG", *f)) {
-		if (longdouble)
-			RETURN(pf,f,FMTCHECK_LONGDOUBLE);
-		if (sh + lg + quad + ptrdifft + sizet)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		RETURN(pf,f,FMTCHECK_DOUBLE);
-	}
-#endif
-	if (*f == 'c') {
-		if (sh + lg + quad + longdouble + ptrdifft + sizet)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		RETURN(pf,f,FMTCHECK_INT);
-	}
-	if (*f == 's') {
-		if (sh + lg + quad + longdouble + ptrdifft + sizet)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		RETURN(pf,f,FMTCHECK_STRING);
-	}
-	if (*f == 'p') {
-		if (sh + lg + quad + longdouble + ptrdifft + sizet)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		RETURN(pf,f,FMTCHECK_LONG);
-	}
-	RETURN(pf,f,FMTCHECK_UNKNOWN);
-	/*NOTREACHED*/
-}
-
-static EFT
-get_next_format_from_width(const char **pf)
-{
-	const char	*f;
-
-	f = *pf;
-	if (*f == '.') {
-		f++;
-		if (*f == '*') {
-			RETURN(pf,f,FMTCHECK_PRECISION);
-		}
-		/* eat any precision (empty is allowed) */
-		while (isdigit(*f)) f++;
-		if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
-	}
-	RETURN(pf,f,get_next_format_from_precision(pf));
-	/*NOTREACHED*/
-}
-
-static EFT
-get_next_format(const char **pf, EFT eft)
-{
-	int		infmt;
-	const char	*f;
-
-	if (eft == FMTCHECK_WIDTH) {
-		(*pf)++;
-		return get_next_format_from_width(pf);
-	} else if (eft == FMTCHECK_PRECISION) {
-		(*pf)++;
-		return get_next_format_from_precision(pf);
-	}
-
-	f = *pf;
-	infmt = 0;
-	while (!infmt) {
-		f = strchr(f, '%');
-		if (f == NULL)
-			RETURN(pf,f,FMTCHECK_DONE);
-		f++;
-		if (!*f)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		if (*f != '%')
-			infmt = 1;
-		else
-			f++;
-	}
-
-	/* Eat any of the flags */
-	while (*f && (strchr("#'0- +", *f)))
-		f++;
-
-	if (*f == '*') {
-		RETURN(pf,f,FMTCHECK_WIDTH);
-	}
-	/* eat any width */
-	while (isdigit(*f)) f++;
-	if (!*f) {
-		RETURN(pf,f,FMTCHECK_UNKNOWN);
-	}
-
-	RETURN(pf,f,get_next_format_from_width(pf));
-	/*NOTREACHED*/
-}
-
-__const char *
-__fmtcheck(const char *f1, const char *f2)
-{
-	const char	*f1p, *f2p;
-	EFT		f1t, f2t;
-
-	if (!f1) return f2;
-	
-	f1p = f1;
-	f1t = FMTCHECK_START;
-	f2p = f2;
-	f2t = FMTCHECK_START;
-	while ((f1t = get_next_format(&f1p, f1t)) != FMTCHECK_DONE) {
-		if (f1t == FMTCHECK_UNKNOWN)
-			return f2;
-		f2t = get_next_format(&f2p, f2t);
-		if (f1t != f2t)
-			return f2;
-	}
-	return f1;
-}
diff --git a/lib/libc/gen/fmtmsg.c b/lib/libc/gen/fmtmsg.c
deleted file mode 100644
index 4db35dc..0000000
--- a/lib/libc/gen/fmtmsg.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fmtmsg.c,v 1.5 2003/05/01 19:03:13 nectar Exp $");
-
-#include <fmtmsg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Default value for MSGVERB. */
-#define	DFLT_MSGVERB	"label:severity:text:action:tag"
-
-/* Maximum valid size for a MSGVERB. */
-#define	MAX_MSGVERB	sizeof(DFLT_MSGVERB)
-
-static char	*printfmt(char *, long, const char *, int, const char *,
-		    const char *, const char *);
-static char	*nextcomp(const char *);
-static const char
-		*sevinfo(int);
-static int	 validmsgverb(const char *);
-
-static const char *validlist[] = {
-	"label", "severity", "text", "action", "tag", NULL
-};
-
-int
-fmtmsg(long class, const char *label, int sev, const char *text,
-    const char *action, const char *tag)
-{
-	FILE *fp;
-	char *env, *msgverb, *output;
-
-	if (class & MM_PRINT) {
-		if ((env = getenv("MSGVERB")) != NULL && *env != '\0' &&
-		    strlen(env) <= strlen(DFLT_MSGVERB)) {
-			if ((msgverb = strdup(env)) == NULL)
-				return (MM_NOTOK);
-			else if (validmsgverb(msgverb) == 0) {
-				free(msgverb);
-				goto def;
-			}
-		} else {
-def:
-			if ((msgverb = strdup(DFLT_MSGVERB)) == NULL)
-				return (MM_NOTOK);
-		}
-		output = printfmt(msgverb, class, label, sev, text, action,
-		    tag);
-		if (output == NULL) {
-			free(msgverb);
-			return (MM_NOTOK);
-		}
-		if (*output != '\0')
-			fprintf(stderr, "%s", output);
-		free(msgverb);
-		free(output);
-	}
-	if (class & MM_CONSOLE) {
-		output = printfmt(DFLT_MSGVERB, class, label, sev, text,
-		    action, tag);
-		if (output == NULL)
-			return (MM_NOCON);
-		if (*output != '\0') {
-			if ((fp = fopen("/dev/console", "a")) == NULL) {
-				free(output);
-				return (MM_NOCON);
-			}
-			fprintf(fp, "%s", output);
-			fclose(fp);
-		}
-		free(output);
-	}
-	return (MM_OK);
-}
-
-#define INSERT_COLON							\
-	if (*output != '\0')						\
-		strlcat(output, ": ", size)
-#define INSERT_NEWLINE							\
-	if (*output != '\0')						\
-		strlcat(output, "\n", size)
-#define INSERT_SPACE							\
-	if (*output != '\0')						\
-		strlcat(output, " ", size)
-
-/*
- * Returns NULL on memory allocation failure, otherwise returns a pointer to
- * a newly malloc()'d output buffer.
- */
-static char *
-printfmt(char *msgverb, long class, const char *label, int sev,
-    const char *text, const char *act, const char *tag)
-{
-	size_t size;
-	char *comp, *output;
-	const char *sevname;
-
-	size = 32;
-	if (label != MM_NULLLBL)
-		size += strlen(label);
-	if ((sevname = sevinfo(sev)) != NULL)
-		size += strlen(sevname);
-	if (text != MM_NULLTXT)
-		size += strlen(text);
-	if (text != MM_NULLACT)
-		size += strlen(act);
-	if (tag != MM_NULLTAG)
-		size += strlen(tag);
-
-	if ((output = malloc(size)) == NULL)
-		return (NULL);
-	*output = '\0';
-	while ((comp = nextcomp(msgverb)) != NULL) {
-		if (strcmp(comp, "label") == 0 && label != MM_NULLLBL) {
-			INSERT_COLON;
-			strlcat(output, label, size);
-		} else if (strcmp(comp, "severity") == 0 && sevname != NULL) {
-			INSERT_COLON;
-			strlcat(output, sevinfo(sev), size);
-		} else if (strcmp(comp, "text") == 0 && text != MM_NULLTXT) {
-			INSERT_COLON;
-			strlcat(output, text, size);
-		} else if (strcmp(comp, "action") == 0 && act != MM_NULLACT) {
-			INSERT_NEWLINE;
-			strlcat(output, "TO FIX: ", size);
-			strlcat(output, act, size);
-		} else if (strcmp(comp, "tag") == 0 && tag != MM_NULLTAG) {
-			INSERT_SPACE;
-			strlcat(output, tag, size);
-		}
-	}
-	INSERT_NEWLINE;
-	return (output);
-}
-
-/*
- * Returns a component of a colon delimited string.  NULL is returned to
- * indicate that there are no remaining components.  This function must be
- * called until it returns NULL in order for the local state to be cleared.
- */
-static char *
-nextcomp(const char *msgverb)
-{
-	static char lmsgverb[MAX_MSGVERB], *state;
-	char *retval;
-	
-	if (*lmsgverb == '\0') {
-		strlcpy(lmsgverb, msgverb, sizeof(lmsgverb));
-		retval = strtok_r(lmsgverb, ":", &state);
-	} else {
-		retval = strtok_r(NULL, ":", &state);
-	}
-	if (retval == NULL)
-		*lmsgverb = '\0';
-	return (retval);
-}
-
-static const char *
-sevinfo(int sev)
-{
-
-	switch (sev) {
-	case MM_HALT:
-		return ("HALT");
-	case MM_ERROR:
-		return ("ERROR");
-	case MM_WARNING:
-		return ("WARNING");
-	case MM_INFO:
-		return ("INFO");
-	default:
-		return (NULL);
-	}
-}
-
-/*
- * Returns 1 if the msgverb list is valid, otherwise 0.
- */
-static int
-validmsgverb(const char *msgverb)
-{
-	char *msgcomp;
-	int i, equality;
-
-	equality = 0;
-	while ((msgcomp = nextcomp(msgverb)) != NULL) {
-		equality--;
-		for (i = 0; validlist[i] != NULL; i++) {
-			if (strcmp(msgcomp, validlist[i]) == 0)
-				equality++;
-		}
-	}
-	return (!equality);
-}
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c
deleted file mode 100644
index 814bf22..0000000
--- a/lib/libc/gen/fnmatch.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fnmatch.c,v 1.17 2005/04/08 21:24:23 stefanf Exp $");
-
-/*
- * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
- * Compares a filename or pathname to a pattern.
- */
-
-/*
- * Some notes on multibyte character support:
- * 1. Patterns with illegal byte sequences match nothing.
- * 2. Illegal byte sequences in the "string" argument are handled by treating
- *    them as single-byte characters with a value of the first byte of the
- *    sequence cast to wchar_t.
- * 3. Multibyte conversion state objects (mbstate_t) are passed around and
- *    used for most, but not all, conversions. Further work will be required
- *    to support state-dependent encodings.
- */
-
-#include <fnmatch.h>
-#include <limits.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "collate.h"
-
-#define	EOS	'\0'
-
-#define RANGE_MATCH     1
-#define RANGE_NOMATCH   0
-#define RANGE_ERROR     (-1)
-
-static int rangematch(const char *, wchar_t, int, char **, mbstate_t *);
-static int fnmatch1(const char *, const char *, int, mbstate_t, mbstate_t);
-
-int
-fnmatch(pattern, string, flags)
-	const char *pattern, *string;
-	int flags;
-{
-	static const mbstate_t initial;
-
-	return (fnmatch1(pattern, string, flags, initial, initial));
-}
-
-static int
-fnmatch1(pattern, string, flags, patmbs, strmbs)
-	const char *pattern, *string;
-	int flags;
-	mbstate_t patmbs, strmbs;
-{
-	const char *stringstart;
-	char *newp;
-	char c;
-	wchar_t pc, sc;
-	size_t pclen, sclen;
-
-	for (stringstart = string;;) {
-		pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, &patmbs);
-		if (pclen == (size_t)-1 || pclen == (size_t)-2)
-			return (FNM_NOMATCH);
-		pattern += pclen;
-		sclen = mbrtowc(&sc, string, MB_LEN_MAX, &strmbs);
-		if (sclen == (size_t)-1 || sclen == (size_t)-2) {
-			sc = (unsigned char)*string;
-			sclen = 1;
-			memset(&strmbs, 0, sizeof(strmbs));
-		}
-		switch (pc) {
-		case EOS:
-			if ((flags & FNM_LEADING_DIR) && sc == '/')
-				return (0);
-			return (sc == EOS ? 0 : FNM_NOMATCH);
-		case '?':
-			if (sc == EOS)
-				return (FNM_NOMATCH);
-			if (sc == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (sc == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-			string += sclen;
-			break;
-		case '*':
-			c = *pattern;
-			/* Collapse multiple stars. */
-			while (c == '*')
-				c = *++pattern;
-
-			if (sc == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			/* Optimize for pattern with * at end or before /. */
-			if (c == EOS)
-				if (flags & FNM_PATHNAME)
-					return ((flags & FNM_LEADING_DIR) ||
-					    strchr(string, '/') == NULL ?
-					    0 : FNM_NOMATCH);
-				else
-					return (0);
-			else if (c == '/' && flags & FNM_PATHNAME) {
-				if ((string = strchr(string, '/')) == NULL)
-					return (FNM_NOMATCH);
-				break;
-			}
-
-			/* General case, use recursion. */
-			while (sc != EOS) {
-				if (!fnmatch1(pattern, string,
-				    flags & ~FNM_PERIOD, patmbs, strmbs))
-					return (0);
-				sclen = mbrtowc(&sc, string, MB_LEN_MAX,
-				    &strmbs);
-				if (sclen == (size_t)-1 ||
-				    sclen == (size_t)-2) {
-					sc = (unsigned char)*string;
-					sclen = 1;
-					memset(&strmbs, 0, sizeof(strmbs));
-				}
-				if (sc == '/' && flags & FNM_PATHNAME)
-					break;
-				string += sclen;
-			}
-			return (FNM_NOMATCH);
-		case '[':
-			if (sc == EOS)
-				return (FNM_NOMATCH);
-			if (sc == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (sc == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			switch (rangematch(pattern, sc, flags, &newp,
-			    &patmbs)) {
-			case RANGE_ERROR:
-				goto norm;
-			case RANGE_MATCH:
-				pattern = newp;
-				break;
-			case RANGE_NOMATCH:
-				return (FNM_NOMATCH);
-			}
-			string += sclen;
-			break;
-		case '\\':
-			if (!(flags & FNM_NOESCAPE)) {
-				pclen = mbrtowc(&pc, pattern, MB_LEN_MAX,
-				    &patmbs);
-				if (pclen == (size_t)-1 || pclen == (size_t)-2)
-					return (FNM_NOMATCH);
-				if (pclen == 0)
-					pc = '\\';
-				pattern += pclen;
-			}
-			/* FALLTHROUGH */
-		default:
-		norm:
-			if (pc == sc)
-				;
-			else if ((flags & FNM_CASEFOLD) &&
-				 (towlower(pc) == towlower(sc)))
-				;
-			else
-				return (FNM_NOMATCH);
-			string += sclen;
-			break;
-		}
-	}
-	/* NOTREACHED */
-}
-
-static int
-rangematch(pattern, test, flags, newp, patmbs)
-	const char *pattern;
-	wchar_t test;
-	int flags;
-	char **newp;
-	mbstate_t *patmbs;
-{
-	int negate, ok;
-	wchar_t c, c2;
-	size_t pclen;
-	const char *origpat;
-
-	/*
-	 * A bracket expression starting with an unquoted circumflex
-	 * character produces unspecified results (IEEE 1003.2-1992,
-	 * 3.13.2).  This implementation treats it like '!', for
-	 * consistency with the regular expression syntax.
-	 * J.T. Conklin (conklin@ngai.kaleida.com)
-	 */
-	if ( (negate = (*pattern == '!' || *pattern == '^')) )
-		++pattern;
-
-	if (flags & FNM_CASEFOLD)
-		test = towlower(test);
-
-	/*
-	 * A right bracket shall lose its special meaning and represent
-	 * itself in a bracket expression if it occurs first in the list.
-	 * -- POSIX.2 2.8.3.2
-	 */
-	ok = 0;
-	origpat = pattern;
-	for (;;) {
-		if (*pattern == ']' && pattern > origpat) {
-			pattern++;
-			break;
-		} else if (*pattern == '\0') {
-			return (RANGE_ERROR);
-		} else if (*pattern == '/' && (flags & FNM_PATHNAME)) {
-			return (RANGE_NOMATCH);
-		} else if (*pattern == '\\' && !(flags & FNM_NOESCAPE))
-			pattern++;
-		pclen = mbrtowc(&c, pattern, MB_LEN_MAX, patmbs);
-		if (pclen == (size_t)-1 || pclen == (size_t)-2)
-			return (RANGE_NOMATCH);
-		pattern += pclen;
-
-		if (flags & FNM_CASEFOLD)
-			c = towlower(c);
-
-		if (*pattern == '-' && *(pattern + 1) != EOS &&
-		    *(pattern + 1) != ']') {
-			if (*++pattern == '\\' && !(flags & FNM_NOESCAPE))
-				if (*pattern != EOS)
-					pattern++;
-			pclen = mbrtowc(&c2, pattern, MB_LEN_MAX, patmbs);
-			if (pclen == (size_t)-1 || pclen == (size_t)-2)
-				return (RANGE_NOMATCH);
-			pattern += pclen;
-			if (c2 == EOS)
-				return (RANGE_ERROR);
-
-			if (flags & FNM_CASEFOLD)
-				c2 = towlower(c2);
-
-			if (__collate_load_error ?
-			    c <= test && test <= c2 :
-			       __collate_range_cmp(c, test) <= 0
-			    && __collate_range_cmp(test, c2) <= 0
-			   )
-				ok = 1;
-		} else if (c == test)
-			ok = 1;
-	}
-
-	*newp = (char *)pattern;
-	return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH);
-}
diff --git a/lib/libc/gen/fpclassify.c b/lib/libc/gen/fpclassify.c
deleted file mode 100644
index 1dafcfc..0000000
--- a/lib/libc/gen/fpclassify.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2002, 2003 David Schultz <das@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.
- *
- * 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/lib/libc/gen/fpclassify.c,v 1.2 2005/02/06 03:23:31 das Exp $
- */
-
-#include <sys/endian.h>
-
-#include <math.h>
-#include <stdint.h>
-
-#include "fpmath.h"
-
-int
-__fpclassifyf(float f)
-{
-	union IEEEf2bits u;
-
-	u.f = f;
-	if (u.bits.exp == 0) {
-		if (u.bits.man == 0)
-			return (FP_ZERO);
-		return (FP_SUBNORMAL);
-	}
-	if (u.bits.exp == 255) {
-		if (u.bits.man == 0)
-			return (FP_INFINITE);
-		return (FP_NAN);
-	}
-	return (FP_NORMAL);
-}
-
-int
-__fpclassifyd(double d)
-{
-	union IEEEd2bits u;
-
-	u.d = d;
-	if (u.bits.exp == 0) {
-		if ((u.bits.manl | u.bits.manh) == 0)
-			return (FP_ZERO);
-		return (FP_SUBNORMAL);
-	}
-	if (u.bits.exp == 2047) {
-		if ((u.bits.manl | u.bits.manh) == 0)
-			return (FP_INFINITE);
-		return (FP_NAN);
-	}
-	return (FP_NORMAL);
-}
-
-int
-__fpclassifyl(long double e)
-{
-	union IEEEl2bits u;
-
-	u.e = e;
-	if (u.bits.exp == 0) {
-		if ((u.bits.manl | u.bits.manh) == 0)
-			return (FP_ZERO);
-		return (FP_SUBNORMAL);
-	}
-	mask_nbit_l(u);		/* Mask normalization bit if applicable. */
-	if (u.bits.exp == 32767) {
-		if ((u.bits.manl | u.bits.manh) == 0)
-			return (FP_INFINITE);
-		return (FP_NAN);
-	}
-	return (FP_NORMAL);
-}
diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c
deleted file mode 100644
index 24e1069..0000000
--- a/lib/libc/gen/frexp.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2004 David Schultz <das@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.
- *
- * 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/lib/libc/gen/frexp.c,v 1.1 2004/07/18 21:23:39 das Exp $
- */
-
-#include <math.h>
-
-#include "fpmath.h"
-
-double
-frexp(double d, int *ex)
-{
-	union IEEEd2bits u;
-
-	u.d = d;
-	switch (u.bits.exp) {
-	case 0:		/* 0 or subnormal */
-		if ((u.bits.manl | u.bits.manh) == 0) {
-			*ex = 0;
-		} else {
-			u.d *= 0x1.0p514;
-			*ex = u.bits.exp - 1536;
-			u.bits.exp = 1022;
-		}
-		break;
-	case 2047:	/* infinity or NaN; value of *ex is unspecified */
-		break;
-	default:	/* normal */
-		*ex = u.bits.exp - 1022;
-		u.bits.exp = 1022;
-		break;
-	}
-	return (u.d);
-}
diff --git a/lib/libc/gen/fstab.c b/lib/libc/gen/fstab.c
deleted file mode 100644
index 33fc309..0000000
--- a/lib/libc/gen/fstab.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (c) 1980, 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fstab.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fstab.c,v 1.14 2003/04/07 12:55:00 mdodd Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fstab.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-static FILE *_fs_fp;
-static struct fstab _fs_fstab;
-static int LineNo = 0;
-static char *path_fstab;
-static char fstab_path[PATH_MAX];
-static int fsp_set = 0;
-
-static void error(int);
-static void fixfsfile(void);
-static int fstabscan(void);
-
-void
-setfstab(const char *file)
-{
-
-	if (file == NULL) {
-		path_fstab = _PATH_FSTAB;
-	} else {
-		strncpy(fstab_path, file, PATH_MAX);
-		fstab_path[PATH_MAX - 1] = '\0';
-		path_fstab = fstab_path;
-	}
-	fsp_set = 1;
-
-	return;
-}
-
-const char *
-getfstab (void)
-{
-
-	if (fsp_set)
-		return (path_fstab);
-	else
-		return (_PATH_FSTAB);
-}
-
-static void
-fixfsfile()
-{
-	static char buf[sizeof(_PATH_DEV) + MNAMELEN];
-	struct stat sb;
-	struct statfs sf;
-
-	if (strcmp(_fs_fstab.fs_file, "/") != 0)
-		return;
-	if (statfs("/", &sf) != 0)
-		return;
-	if (sf.f_mntfromname[0] == '/')
-		buf[0] = '\0';
-	else
-		strcpy(buf, _PATH_DEV);
-	strcat(buf, sf.f_mntfromname);
-	if (stat(buf, &sb) != 0 ||
-	    (!S_ISBLK(sb.st_mode) && !S_ISCHR(sb.st_mode)))
-		return;
-	_fs_fstab.fs_spec = buf;
-}
-
-static int
-fstabscan()
-{
-	char *cp, *p;
-#define	MAXLINELENGTH	1024
-	static char line[MAXLINELENGTH];
-	char subline[MAXLINELENGTH];
-	int typexx;
-
-	for (;;) {
-
-		if (!(p = fgets(line, sizeof(line), _fs_fp)))
-			return(0);
-/* OLD_STYLE_FSTAB */
-		++LineNo;
-		if (*line == '#' || *line == '\n')
-			continue;
-		if (!strpbrk(p, " \t")) {
-			_fs_fstab.fs_spec = strsep(&p, ":\n");
-			_fs_fstab.fs_file = strsep(&p, ":\n");
-			fixfsfile();
-			_fs_fstab.fs_type = strsep(&p, ":\n");
-			if (_fs_fstab.fs_type) {
-				if (!strcmp(_fs_fstab.fs_type, FSTAB_XX))
-					continue;
-				_fs_fstab.fs_mntops = _fs_fstab.fs_type;
-				_fs_fstab.fs_vfstype =
-				    strcmp(_fs_fstab.fs_type, FSTAB_SW) ?
-				    "ufs" : "swap";
-				if ((cp = strsep(&p, ":\n")) != NULL) {
-					_fs_fstab.fs_freq = atoi(cp);
-					if ((cp = strsep(&p, ":\n")) != NULL) {
-						_fs_fstab.fs_passno = atoi(cp);
-						return(1);
-					}
-				}
-			}
-			goto bad;
-		}
-/* OLD_STYLE_FSTAB */
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		_fs_fstab.fs_spec = cp;
-		if (!_fs_fstab.fs_spec || *_fs_fstab.fs_spec == '#')
-			continue;
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		_fs_fstab.fs_file = cp;
-		fixfsfile();
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		_fs_fstab.fs_vfstype = cp;
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		_fs_fstab.fs_mntops = cp;
-		if (_fs_fstab.fs_mntops == NULL)
-			goto bad;
-		_fs_fstab.fs_freq = 0;
-		_fs_fstab.fs_passno = 0;
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		if (cp != NULL) {
-			_fs_fstab.fs_freq = atoi(cp);
-			while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-				;
-			if (cp != NULL)
-				_fs_fstab.fs_passno = atoi(cp);
-		}
-		strcpy(subline, _fs_fstab.fs_mntops);
-		p = subline;
-		for (typexx = 0, cp = strsep(&p, ","); cp;
-		     cp = strsep(&p, ",")) {
-			if (strlen(cp) != 2)
-				continue;
-			if (!strcmp(cp, FSTAB_RW)) {
-				_fs_fstab.fs_type = FSTAB_RW;
-				break;
-			}
-			if (!strcmp(cp, FSTAB_RQ)) {
-				_fs_fstab.fs_type = FSTAB_RQ;
-				break;
-			}
-			if (!strcmp(cp, FSTAB_RO)) {
-				_fs_fstab.fs_type = FSTAB_RO;
-				break;
-			}
-			if (!strcmp(cp, FSTAB_SW)) {
-				_fs_fstab.fs_type = FSTAB_SW;
-				break;
-			}
-			if (!strcmp(cp, FSTAB_XX)) {
-				_fs_fstab.fs_type = FSTAB_XX;
-				typexx++;
-				break;
-			}
-		}
-		if (typexx)
-			continue;
-		if (cp != NULL)
-			return(1);
-
-bad:		/* no way to distinguish between EOF and syntax error */
-		error(EFTYPE);
-	}
-	/* NOTREACHED */
-}
-
-struct fstab *
-getfsent()
-{
-	if ((!_fs_fp && !setfsent()) || !fstabscan())
-		return((struct fstab *)NULL);
-	return(&_fs_fstab);
-}
-
-struct fstab *
-getfsspec(name)
-	const char *name;
-{
-	if (setfsent())
-		while (fstabscan())
-			if (!strcmp(_fs_fstab.fs_spec, name))
-				return(&_fs_fstab);
-	return((struct fstab *)NULL);
-}
-
-struct fstab *
-getfsfile(name)
-	const char *name;
-{
-	if (setfsent())
-		while (fstabscan())
-			if (!strcmp(_fs_fstab.fs_file, name))
-				return(&_fs_fstab);
-	return((struct fstab *)NULL);
-}
-
-int 
-setfsent()
-{
-	if (_fs_fp) {
-		rewind(_fs_fp);
-		LineNo = 0;
-		return(1);
-	}
-	if (fsp_set == 0) {
-		if (issetugid())
-			setfstab(NULL);
-		else
-			setfstab(getenv("PATH_FSTAB"));
-	}
-	if ((_fs_fp = fopen(path_fstab, "r")) != NULL) {
-		LineNo = 0;
-		return(1);
-	}
-	error(errno);
-	return(0);
-}
-
-void
-endfsent()
-{
-	if (_fs_fp) {
-		(void)fclose(_fs_fp);
-		_fs_fp = NULL;
-	}
-
-	fsp_set = 0;
-}
-
-static void
-error(err)
-	int err;
-{
-	char *p;
-	char num[30];
-
-	(void)_write(STDERR_FILENO, "fstab: ", 7);
-	(void)_write(STDERR_FILENO, path_fstab, strlen(path_fstab));
-	(void)_write(STDERR_FILENO, ":", 1);
-	sprintf(num, "%d: ", LineNo);
-	(void)_write(STDERR_FILENO, num, strlen(num));
-	p = strerror(err);
-	(void)_write(STDERR_FILENO, p, strlen(p));
-	(void)_write(STDERR_FILENO, "\n", 1);
-}
diff --git a/lib/libc/gen/ftok.c b/lib/libc/gen/ftok.c
deleted file mode 100644
index 6c7157a..0000000
--- a/lib/libc/gen/ftok.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/ftok.c,v 1.7 2004/06/01 06:53:07 tjr Exp $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ipc.h>
-
-key_t
-ftok(path, id)
-	const char *path;
-	int id;
-{
-	struct stat st;
-
-	if (stat(path, &st) < 0)
-		return (key_t)-1;
-
-	return (key_t) (id << 24 | (st.st_dev & 0xff) << 16 | (st.st_ino & 0xffff));
-}
diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
deleted file mode 100644
index 28bf177..0000000
--- a/lib/libc/gen/fts.c
+++ /dev/null
@@ -1,1226 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- *
- * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fts.c,v 1.27 2004/06/08 06:23:23 das Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <fts.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-static FTSENT	*fts_alloc(FTS *, char *, int);
-static FTSENT	*fts_build(FTS *, int);
-static void	 fts_lfree(FTSENT *);
-static void	 fts_load(FTS *, FTSENT *);
-static size_t	 fts_maxarglen(char * const *);
-static void	 fts_padjust(FTS *, FTSENT *);
-static int	 fts_palloc(FTS *, size_t);
-static FTSENT	*fts_sort(FTS *, FTSENT *, int);
-static u_short	 fts_stat(FTS *, FTSENT *, int);
-static int	 fts_safe_changedir(FTS *, FTSENT *, int, char *);
-static int	 fts_ufslinks(FTS *, const FTSENT *);
-
-#define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-
-#define	CLR(opt)	(sp->fts_options &= ~(opt))
-#define	ISSET(opt)	(sp->fts_options & (opt))
-#define	SET(opt)	(sp->fts_options |= (opt))
-
-#define	FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && fchdir(fd))
-
-/* fts_build flags */
-#define	BCHILD		1		/* fts_children */
-#define	BNAMES		2		/* fts_children, names only */
-#define	BREAD		3		/* fts_read */
-
-/*
- * Internal representation of an FTS, including extra implementation
- * details.  The FTS returned from fts_open points to this structure's
- * ftsp_fts member (and can be cast to an _fts_private as required)
- */
-struct _fts_private {
-	FTS		ftsp_fts;
-	struct statfs	ftsp_statfs;
-	dev_t		ftsp_dev;
-	int		ftsp_linksreliable;
-};
-
-/*
- * The "FTS_NOSTAT" option can avoid a lot of calls to stat(2) if it
- * knows that a directory could not possibly have subdirectories.  This
- * is decided by looking at the link count: a subdirectory would
- * increment its parent's link count by virtue of its own ".." entry.
- * This assumption only holds for UFS-like filesystems that implement
- * links and directories this way, so we must punt for others.
- */
-
-static const char *ufslike_filesystems[] = {
-	"ufs",
-	"nfs",
-	"nfs4",
-	"ext2fs",
-	0
-};
-
-FTS *
-fts_open(argv, options, compar)
-	char * const *argv;
-	int options;
-	int (*compar)(const FTSENT * const *, const FTSENT * const *);
-{
-	struct _fts_private *priv;
-	FTS *sp;
-	FTSENT *p, *root;
-	int nitems;
-	FTSENT *parent, *tmp;
-	int len;
-
-	/* Options check. */
-	if (options & ~FTS_OPTIONMASK) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Allocate/initialize the stream. */
-	if ((priv = malloc(sizeof(*priv))) == NULL)
-		return (NULL);
-	memset(priv, 0, sizeof(*priv));
-	sp = &priv->ftsp_fts;
-	sp->fts_compar = compar;
-	sp->fts_options = options;
-
-	/* Shush, GCC. */
-	tmp = NULL;
-
-	/* Logical walks turn on NOCHDIR; symbolic links are too hard. */
-	if (ISSET(FTS_LOGICAL))
-		SET(FTS_NOCHDIR);
-
-	/*
-	 * Start out with 1K of path space, and enough, in any case,
-	 * to hold the user's paths.
-	 */
-	if (fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN)))
-		goto mem1;
-
-	/* Allocate/initialize root's parent. */
-	if ((parent = fts_alloc(sp, "", 0)) == NULL)
-		goto mem2;
-	parent->fts_level = FTS_ROOTPARENTLEVEL;
-
-	/* Allocate/initialize root(s). */
-	for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
-		/* Don't allow zero-length paths. */
-		if ((len = strlen(*argv)) == 0) {
-			errno = ENOENT;
-			goto mem3;
-		}
-
-		p = fts_alloc(sp, *argv, len);
-		p->fts_level = FTS_ROOTLEVEL;
-		p->fts_parent = parent;
-		p->fts_accpath = p->fts_name;
-		p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW));
-
-		/* Command-line "." and ".." are real directories. */
-		if (p->fts_info == FTS_DOT)
-			p->fts_info = FTS_D;
-
-		/*
-		 * If comparison routine supplied, traverse in sorted
-		 * order; otherwise traverse in the order specified.
-		 */
-		if (compar) {
-			p->fts_link = root;
-			root = p;
-		} else {
-			p->fts_link = NULL;
-			if (root == NULL)
-				tmp = root = p;
-			else {
-				tmp->fts_link = p;
-				tmp = p;
-			}
-		}
-	}
-	if (compar && nitems > 1)
-		root = fts_sort(sp, root, nitems);
-
-	/*
-	 * Allocate a dummy pointer and make fts_read think that we've just
-	 * finished the node before the root(s); set p->fts_info to FTS_INIT
-	 * so that everything about the "current" node is ignored.
-	 */
-	if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL)
-		goto mem3;
-	sp->fts_cur->fts_link = root;
-	sp->fts_cur->fts_info = FTS_INIT;
-
-	/*
-	 * If using chdir(2), grab a file descriptor pointing to dot to ensure
-	 * that we can get back here; this could be avoided for some paths,
-	 * but almost certainly not worth the effort.  Slashes, symbolic links,
-	 * and ".." are all fairly nasty problems.  Note, if we can't get the
-	 * descriptor we run anyway, just more slowly.
-	 */
-	if (!ISSET(FTS_NOCHDIR) && (sp->fts_rfd = _open(".", O_RDONLY, 0)) < 0)
-		SET(FTS_NOCHDIR);
-
-	return (sp);
-
-mem3:	fts_lfree(root);
-	free(parent);
-mem2:	free(sp->fts_path);
-mem1:	free(sp);
-	return (NULL);
-}
-
-static void
-fts_load(sp, p)
-	FTS *sp;
-	FTSENT *p;
-{
-	int len;
-	char *cp;
-
-	/*
-	 * Load the stream structure for the next traversal.  Since we don't
-	 * actually enter the directory until after the preorder visit, set
-	 * the fts_accpath field specially so the chdir gets done to the right
-	 * place and the user can access the first node.  From fts_open it's
-	 * known that the path will fit.
-	 */
-	len = p->fts_pathlen = p->fts_namelen;
-	memmove(sp->fts_path, p->fts_name, len + 1);
-	if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
-		len = strlen(++cp);
-		memmove(p->fts_name, cp, len + 1);
-		p->fts_namelen = len;
-	}
-	p->fts_accpath = p->fts_path = sp->fts_path;
-	sp->fts_dev = p->fts_dev;
-}
-
-int
-fts_close(sp)
-	FTS *sp;
-{
-	FTSENT *freep, *p;
-	int saved_errno;
-
-	/*
-	 * This still works if we haven't read anything -- the dummy structure
-	 * points to the root list, so we step through to the end of the root
-	 * list which has a valid parent pointer.
-	 */
-	if (sp->fts_cur) {
-		for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) {
-			freep = p;
-			p = p->fts_link != NULL ? p->fts_link : p->fts_parent;
-			free(freep);
-		}
-		free(p);
-	}
-
-	/* Free up child linked list, sort array, path buffer. */
-	if (sp->fts_child)
-		fts_lfree(sp->fts_child);
-	if (sp->fts_array)
-		free(sp->fts_array);
-	free(sp->fts_path);
-
-	/* Return to original directory, save errno if necessary. */
-	if (!ISSET(FTS_NOCHDIR)) {
-		saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
-		(void)_close(sp->fts_rfd);
-
-		/* Set errno and return. */
-		if (saved_errno != 0) {
-			/* Free up the stream pointer. */
-			free(sp);
-			errno = saved_errno;
-			return (-1);
-		}
-	}
-
-	/* Free up the stream pointer. */
-	free(sp);
-	return (0);
-}
-
-/*
- * Special case of "/" at the end of the path so that slashes aren't
- * appended which would cause paths to be written as "....//foo".
- */
-#define	NAPPEND(p)							\
-	(p->fts_path[p->fts_pathlen - 1] == '/'				\
-	    ? p->fts_pathlen - 1 : p->fts_pathlen)
-
-FTSENT *
-fts_read(sp)
-	FTS *sp;
-{
-	FTSENT *p, *tmp;
-	int instr;
-	char *t;
-	int saved_errno;
-
-	/* If finished or unrecoverable error, return NULL. */
-	if (sp->fts_cur == NULL || ISSET(FTS_STOP))
-		return (NULL);
-
-	/* Set current node pointer. */
-	p = sp->fts_cur;
-
-	/* Save and zero out user instructions. */
-	instr = p->fts_instr;
-	p->fts_instr = FTS_NOINSTR;
-
-	/* Any type of file may be re-visited; re-stat and re-turn. */
-	if (instr == FTS_AGAIN) {
-		p->fts_info = fts_stat(sp, p, 0);
-		return (p);
-	}
-
-	/*
-	 * Following a symlink -- SLNONE test allows application to see
-	 * SLNONE and recover.  If indirecting through a symlink, have
-	 * keep a pointer to current location.  If unable to get that
-	 * pointer, follow fails.
-	 */
-	if (instr == FTS_FOLLOW &&
-	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
-		p->fts_info = fts_stat(sp, p, 1);
-		if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-			if ((p->fts_symfd = _open(".", O_RDONLY, 0)) < 0) {
-				p->fts_errno = errno;
-				p->fts_info = FTS_ERR;
-			} else
-				p->fts_flags |= FTS_SYMFOLLOW;
-		}
-		return (p);
-	}
-
-	/* Directory in pre-order. */
-	if (p->fts_info == FTS_D) {
-		/* If skipped or crossed mount point, do post-order visit. */
-		if (instr == FTS_SKIP ||
-		    (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
-			if (p->fts_flags & FTS_SYMFOLLOW)
-				(void)_close(p->fts_symfd);
-			if (sp->fts_child) {
-				fts_lfree(sp->fts_child);
-				sp->fts_child = NULL;
-			}
-			p->fts_info = FTS_DP;
-			return (p);
-		}
-
-		/* Rebuild if only read the names and now traversing. */
-		if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) {
-			CLR(FTS_NAMEONLY);
-			fts_lfree(sp->fts_child);
-			sp->fts_child = NULL;
-		}
-
-		/*
-		 * Cd to the subdirectory.
-		 *
-		 * If have already read and now fail to chdir, whack the list
-		 * to make the names come out right, and set the parent errno
-		 * so the application will eventually get an error condition.
-		 * Set the FTS_DONTCHDIR flag so that when we logically change
-		 * directories back to the parent we don't do a chdir.
-		 *
-		 * If haven't read do so.  If the read fails, fts_build sets
-		 * FTS_STOP or the fts_info field of the node.
-		 */
-		if (sp->fts_child != NULL) {
-			if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
-				p->fts_errno = errno;
-				p->fts_flags |= FTS_DONTCHDIR;
-				for (p = sp->fts_child; p != NULL;
-				    p = p->fts_link)
-					p->fts_accpath =
-					    p->fts_parent->fts_accpath;
-			}
-		} else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) {
-			if (ISSET(FTS_STOP))
-				return (NULL);
-			return (p);
-		}
-		p = sp->fts_child;
-		sp->fts_child = NULL;
-		goto name;
-	}
-
-	/* Move to the next node on this level. */
-next:	tmp = p;
-	if ((p = p->fts_link) != NULL) {
-		free(tmp);
-
-		/*
-		 * If reached the top, return to the original directory (or
-		 * the root of the tree), and load the paths for the next root.
-		 */
-		if (p->fts_level == FTS_ROOTLEVEL) {
-			if (FCHDIR(sp, sp->fts_rfd)) {
-				SET(FTS_STOP);
-				return (NULL);
-			}
-			fts_load(sp, p);
-			return (sp->fts_cur = p);
-		}
-
-		/*
-		 * User may have called fts_set on the node.  If skipped,
-		 * ignore.  If followed, get a file descriptor so we can
-		 * get back if necessary.
-		 */
-		if (p->fts_instr == FTS_SKIP)
-			goto next;
-		if (p->fts_instr == FTS_FOLLOW) {
-			p->fts_info = fts_stat(sp, p, 1);
-			if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-				if ((p->fts_symfd =
-				    _open(".", O_RDONLY, 0)) < 0) {
-					p->fts_errno = errno;
-					p->fts_info = FTS_ERR;
-				} else
-					p->fts_flags |= FTS_SYMFOLLOW;
-			}
-			p->fts_instr = FTS_NOINSTR;
-		}
-
-name:		t = sp->fts_path + NAPPEND(p->fts_parent);
-		*t++ = '/';
-		memmove(t, p->fts_name, p->fts_namelen + 1);
-		return (sp->fts_cur = p);
-	}
-
-	/* Move up to the parent node. */
-	p = tmp->fts_parent;
-	free(tmp);
-
-	if (p->fts_level == FTS_ROOTPARENTLEVEL) {
-		/*
-		 * Done; free everything up and set errno to 0 so the user
-		 * can distinguish between error and EOF.
-		 */
-		free(p);
-		errno = 0;
-		return (sp->fts_cur = NULL);
-	}
-
-	/* NUL terminate the pathname. */
-	sp->fts_path[p->fts_pathlen] = '\0';
-
-	/*
-	 * Return to the parent directory.  If at a root node or came through
-	 * a symlink, go back through the file descriptor.  Otherwise, cd up
-	 * one directory.
-	 */
-	if (p->fts_level == FTS_ROOTLEVEL) {
-		if (FCHDIR(sp, sp->fts_rfd)) {
-			SET(FTS_STOP);
-			return (NULL);
-		}
-	} else if (p->fts_flags & FTS_SYMFOLLOW) {
-		if (FCHDIR(sp, p->fts_symfd)) {
-			saved_errno = errno;
-			(void)_close(p->fts_symfd);
-			errno = saved_errno;
-			SET(FTS_STOP);
-			return (NULL);
-		}
-		(void)_close(p->fts_symfd);
-	} else if (!(p->fts_flags & FTS_DONTCHDIR) &&
-	    fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
-		SET(FTS_STOP);
-		return (NULL);
-	}
-	p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
-	return (sp->fts_cur = p);
-}
-
-/*
- * Fts_set takes the stream as an argument although it's not used in this
- * implementation; it would be necessary if anyone wanted to add global
- * semantics to fts using fts_set.  An error return is allowed for similar
- * reasons.
- */
-/* ARGSUSED */
-int
-fts_set(sp, p, instr)
-	FTS *sp;
-	FTSENT *p;
-	int instr;
-{
-	if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
-	    instr != FTS_NOINSTR && instr != FTS_SKIP) {
-		errno = EINVAL;
-		return (1);
-	}
-	p->fts_instr = instr;
-	return (0);
-}
-
-FTSENT *
-fts_children(sp, instr)
-	FTS *sp;
-	int instr;
-{
-	FTSENT *p;
-	int fd;
-
-	if (instr != 0 && instr != FTS_NAMEONLY) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Set current node pointer. */
-	p = sp->fts_cur;
-
-	/*
-	 * Errno set to 0 so user can distinguish empty directory from
-	 * an error.
-	 */
-	errno = 0;
-
-	/* Fatal errors stop here. */
-	if (ISSET(FTS_STOP))
-		return (NULL);
-
-	/* Return logical hierarchy of user's arguments. */
-	if (p->fts_info == FTS_INIT)
-		return (p->fts_link);
-
-	/*
-	 * If not a directory being visited in pre-order, stop here.  Could
-	 * allow FTS_DNR, assuming the user has fixed the problem, but the
-	 * same effect is available with FTS_AGAIN.
-	 */
-	if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */)
-		return (NULL);
-
-	/* Free up any previous child list. */
-	if (sp->fts_child != NULL)
-		fts_lfree(sp->fts_child);
-
-	if (instr == FTS_NAMEONLY) {
-		SET(FTS_NAMEONLY);
-		instr = BNAMES;
-	} else
-		instr = BCHILD;
-
-	/*
-	 * If using chdir on a relative path and called BEFORE fts_read does
-	 * its chdir to the root of a traversal, we can lose -- we need to
-	 * chdir into the subdirectory, and we don't know where the current
-	 * directory is, so we can't get back so that the upcoming chdir by
-	 * fts_read will work.
-	 */
-	if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
-	    ISSET(FTS_NOCHDIR))
-		return (sp->fts_child = fts_build(sp, instr));
-
-	if ((fd = _open(".", O_RDONLY, 0)) < 0)
-		return (NULL);
-	sp->fts_child = fts_build(sp, instr);
-	if (fchdir(fd))
-		return (NULL);
-	(void)_close(fd);
-	return (sp->fts_child);
-}
-
-#ifndef fts_get_clientptr
-#error "fts_get_clientptr not defined"
-#endif
-
-void *
-(fts_get_clientptr)(FTS *sp)
-{
-
-	return (fts_get_clientptr(sp));
-}
-
-#ifndef fts_get_stream
-#error "fts_get_stream not defined"
-#endif
-
-FTS *
-(fts_get_stream)(FTSENT *p)
-{
-	return (fts_get_stream(p));
-}
-
-void
-fts_set_clientptr(FTS *sp, void *clientptr)
-{
-
-	sp->fts_clientptr = clientptr;
-}
-
-/*
- * This is the tricky part -- do not casually change *anything* in here.  The
- * idea is to build the linked list of entries that are used by fts_children
- * and fts_read.  There are lots of special cases.
- *
- * The real slowdown in walking the tree is the stat calls.  If FTS_NOSTAT is
- * set and it's a physical walk (so that symbolic links can't be directories),
- * we can do things quickly.  First, if it's a 4.4BSD file system, the type
- * of the file is in the directory entry.  Otherwise, we assume that the number
- * of subdirectories in a node is equal to the number of links to the parent.
- * The former skips all stat calls.  The latter skips stat calls in any leaf
- * directories and for any files after the subdirectories in the directory have
- * been found, cutting the stat calls by about 2/3.
- */
-static FTSENT *
-fts_build(sp, type)
-	FTS *sp;
-	int type;
-{
-	struct dirent *dp;
-	FTSENT *p, *head;
-	int nitems;
-	FTSENT *cur, *tail;
-	DIR *dirp;
-	void *oldaddr;
-	size_t dnamlen;
-	int cderrno, descend, len, level, maxlen, nlinks, oflag, saved_errno,
-	    nostat, doadjust;
-	char *cp;
-
-	/* Set current node pointer. */
-	cur = sp->fts_cur;
-
-	/*
-	 * Open the directory for reading.  If this fails, we're done.
-	 * If being called from fts_read, set the fts_info field.
-	 */
-#ifdef FTS_WHITEOUT
-	if (ISSET(FTS_WHITEOUT))
-		oflag = DTF_NODUP | DTF_REWIND;
-	else
-		oflag = DTF_HIDEW | DTF_NODUP | DTF_REWIND;
-#else
-#define __opendir2(path, flag) opendir(path)
-#endif
-	if ((dirp = __opendir2(cur->fts_accpath, oflag)) == NULL) {
-		if (type == BREAD) {
-			cur->fts_info = FTS_DNR;
-			cur->fts_errno = errno;
-		}
-		return (NULL);
-	}
-
-	/*
-	 * Nlinks is the number of possible entries of type directory in the
-	 * directory if we're cheating on stat calls, 0 if we're not doing
-	 * any stat calls at all, -1 if we're doing stats on everything.
-	 */
-	if (type == BNAMES) {
-		nlinks = 0;
-		/* Be quiet about nostat, GCC. */
-		nostat = 0;
-	} else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
-		if (fts_ufslinks(sp, cur))
-			nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
-		else
-			nlinks = -1;
-		nostat = 1;
-	} else {
-		nlinks = -1;
-		nostat = 0;
-	}
-
-#ifdef notdef
-	(void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink);
-	(void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n",
-	    ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT));
-#endif
-	/*
-	 * If we're going to need to stat anything or we want to descend
-	 * and stay in the directory, chdir.  If this fails we keep going,
-	 * but set a flag so we don't chdir after the post-order visit.
-	 * We won't be able to stat anything, but we can still return the
-	 * names themselves.  Note, that since fts_read won't be able to
-	 * chdir into the directory, it will have to return different path
-	 * names than before, i.e. "a/b" instead of "b".  Since the node
-	 * has already been visited in pre-order, have to wait until the
-	 * post-order visit to return the error.  There is a special case
-	 * here, if there was nothing to stat then it's not an error to
-	 * not be able to stat.  This is all fairly nasty.  If a program
-	 * needed sorted entries or stat information, they had better be
-	 * checking FTS_NS on the returned nodes.
-	 */
-	cderrno = 0;
-	if (nlinks || type == BREAD) {
-		if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
-			if (nlinks && type == BREAD)
-				cur->fts_errno = errno;
-			cur->fts_flags |= FTS_DONTCHDIR;
-			descend = 0;
-			cderrno = errno;
-		} else
-			descend = 1;
-	} else
-		descend = 0;
-
-	/*
-	 * Figure out the max file name length that can be stored in the
-	 * current path -- the inner loop allocates more path as necessary.
-	 * We really wouldn't have to do the maxlen calculations here, we
-	 * could do them in fts_read before returning the path, but it's a
-	 * lot easier here since the length is part of the dirent structure.
-	 *
-	 * If not changing directories set a pointer so that can just append
-	 * each new name into the path.
-	 */
-	len = NAPPEND(cur);
-	if (ISSET(FTS_NOCHDIR)) {
-		cp = sp->fts_path + len;
-		*cp++ = '/';
-	} else {
-		/* GCC, you're too verbose. */
-		cp = NULL;
-	}
-	len++;
-	maxlen = sp->fts_pathlen - len;
-
-	level = cur->fts_level + 1;
-
-	/* Read the directory, attaching each entry to the `link' pointer. */
-	doadjust = 0;
-	for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) {
-		dnamlen = dp->d_namlen;
-		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
-			continue;
-
-		if ((p = fts_alloc(sp, dp->d_name, (int)dnamlen)) == NULL)
-			goto mem1;
-		if (dnamlen >= maxlen) {	/* include space for NUL */
-			oldaddr = sp->fts_path;
-			if (fts_palloc(sp, dnamlen + len + 1)) {
-				/*
-				 * No more memory for path or structures.  Save
-				 * errno, free up the current structure and the
-				 * structures already allocated.
-				 */
-mem1:				saved_errno = errno;
-				if (p)
-					free(p);
-				fts_lfree(head);
-				(void)closedir(dirp);
-				cur->fts_info = FTS_ERR;
-				SET(FTS_STOP);
-				errno = saved_errno;
-				return (NULL);
-			}
-			/* Did realloc() change the pointer? */
-			if (oldaddr != sp->fts_path) {
-				doadjust = 1;
-				if (ISSET(FTS_NOCHDIR))
-					cp = sp->fts_path + len;
-			}
-			maxlen = sp->fts_pathlen - len;
-		}
-
-		if (len + dnamlen >= USHRT_MAX) {
-			/*
-			 * In an FTSENT, fts_pathlen is a u_short so it is
-			 * possible to wraparound here.  If we do, free up
-			 * the current structure and the structures already
-			 * allocated, then error out with ENAMETOOLONG.
-			 */
-			free(p);
-			fts_lfree(head);
-			(void)closedir(dirp);
-			cur->fts_info = FTS_ERR;
-			SET(FTS_STOP);
-			errno = ENAMETOOLONG;
-			return (NULL);
-		}
-		p->fts_level = level;
-		p->fts_parent = sp->fts_cur;
-		p->fts_pathlen = len + dnamlen;
-
-#ifdef FTS_WHITEOUT
-		if (dp->d_type == DT_WHT)
-			p->fts_flags |= FTS_ISW;
-#endif
-
-		if (cderrno) {
-			if (nlinks) {
-				p->fts_info = FTS_NS;
-				p->fts_errno = cderrno;
-			} else
-				p->fts_info = FTS_NSOK;
-			p->fts_accpath = cur->fts_accpath;
-		} else if (nlinks == 0
-#ifdef DT_DIR
-		    || (nostat &&
-		    dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
-#endif
-		    ) {
-			p->fts_accpath =
-			    ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
-			p->fts_info = FTS_NSOK;
-		} else {
-			/* Build a file name for fts_stat to stat. */
-			if (ISSET(FTS_NOCHDIR)) {
-				p->fts_accpath = p->fts_path;
-				memmove(cp, p->fts_name, p->fts_namelen + 1);
-			} else
-				p->fts_accpath = p->fts_name;
-			/* Stat it. */
-			p->fts_info = fts_stat(sp, p, 0);
-
-			/* Decrement link count if applicable. */
-			if (nlinks > 0 && (p->fts_info == FTS_D ||
-			    p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
-				--nlinks;
-		}
-
-		/* We walk in directory order so "ls -f" doesn't get upset. */
-		p->fts_link = NULL;
-		if (head == NULL)
-			head = tail = p;
-		else {
-			tail->fts_link = p;
-			tail = p;
-		}
-		++nitems;
-	}
-	if (dirp)
-		(void)closedir(dirp);
-
-	/*
-	 * If realloc() changed the address of the path, adjust the
-	 * addresses for the rest of the tree and the dir list.
-	 */
-	if (doadjust)
-		fts_padjust(sp, head);
-
-	/*
-	 * If not changing directories, reset the path back to original
-	 * state.
-	 */
-	if (ISSET(FTS_NOCHDIR)) {
-		if (len == sp->fts_pathlen || nitems == 0)
-			--cp;
-		*cp = '\0';
-	}
-
-	/*
-	 * If descended after called from fts_children or after called from
-	 * fts_read and nothing found, get back.  At the root level we use
-	 * the saved fd; if one of fts_open()'s arguments is a relative path
-	 * to an empty directory, we wind up here with no other way back.  If
-	 * can't get back, we're done.
-	 */
-	if (descend && (type == BCHILD || !nitems) &&
-	    (cur->fts_level == FTS_ROOTLEVEL ?
-	    FCHDIR(sp, sp->fts_rfd) :
-	    fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
-		cur->fts_info = FTS_ERR;
-		SET(FTS_STOP);
-		return (NULL);
-	}
-
-	/* If didn't find anything, return NULL. */
-	if (!nitems) {
-		if (type == BREAD)
-			cur->fts_info = FTS_DP;
-		return (NULL);
-	}
-
-	/* Sort the entries. */
-	if (sp->fts_compar && nitems > 1)
-		head = fts_sort(sp, head, nitems);
-	return (head);
-}
-
-static u_short
-fts_stat(sp, p, follow)
-	FTS *sp;
-	FTSENT *p;
-	int follow;
-{
-	FTSENT *t;
-	dev_t dev;
-	ino_t ino;
-	struct stat *sbp, sb;
-	int saved_errno;
-
-	/* If user needs stat info, stat buffer already allocated. */
-	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
-
-#ifdef FTS_WHITEOUT
-	/* Check for whiteout. */
-	if (p->fts_flags & FTS_ISW) {
-		if (sbp != &sb) {
-			memset(sbp, '\0', sizeof(*sbp));
-			sbp->st_mode = S_IFWHT;
-		}
-		return (FTS_W);
-	}
-#endif
-
-	/*
-	 * If doing a logical walk, or application requested FTS_FOLLOW, do
-	 * a stat(2).  If that fails, check for a non-existent symlink.  If
-	 * fail, set the errno from the stat call.
-	 */
-	if (ISSET(FTS_LOGICAL) || follow) {
-		if (stat(p->fts_accpath, sbp)) {
-			saved_errno = errno;
-			if (!lstat(p->fts_accpath, sbp)) {
-				errno = 0;
-				return (FTS_SLNONE);
-			}
-			p->fts_errno = saved_errno;
-			goto err;
-		}
-	} else if (lstat(p->fts_accpath, sbp)) {
-		p->fts_errno = errno;
-err:		memset(sbp, 0, sizeof(struct stat));
-		return (FTS_NS);
-	}
-
-	if (S_ISDIR(sbp->st_mode)) {
-		/*
-		 * Set the device/inode.  Used to find cycles and check for
-		 * crossing mount points.  Also remember the link count, used
-		 * in fts_build to limit the number of stat calls.  It is
-		 * understood that these fields are only referenced if fts_info
-		 * is set to FTS_D.
-		 */
-		dev = p->fts_dev = sbp->st_dev;
-		ino = p->fts_ino = sbp->st_ino;
-		p->fts_nlink = sbp->st_nlink;
-
-		if (ISDOT(p->fts_name))
-			return (FTS_DOT);
-
-		/*
-		 * Cycle detection is done by brute force when the directory
-		 * is first encountered.  If the tree gets deep enough or the
-		 * number of symbolic links to directories is high enough,
-		 * something faster might be worthwhile.
-		 */
-		for (t = p->fts_parent;
-		    t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
-			if (ino == t->fts_ino && dev == t->fts_dev) {
-				p->fts_cycle = t;
-				return (FTS_DC);
-			}
-		return (FTS_D);
-	}
-	if (S_ISLNK(sbp->st_mode))
-		return (FTS_SL);
-	if (S_ISREG(sbp->st_mode))
-		return (FTS_F);
-	return (FTS_DEFAULT);
-}
-
-/*
- * The comparison function takes pointers to pointers to FTSENT structures.
- * Qsort wants a comparison function that takes pointers to void.
- * (Both with appropriate levels of const-poisoning, of course!)
- * Use a trampoline function to deal with the difference.
- */
-static int
-fts_compar(const void *a, const void *b)
-{
-	FTS *parent;
-
-	parent = (*(const FTSENT * const *)a)->fts_fts;
-	return (*parent->fts_compar)(a, b);
-}
-
-static FTSENT *
-fts_sort(sp, head, nitems)
-	FTS *sp;
-	FTSENT *head;
-	int nitems;
-{
-	FTSENT **ap, *p;
-
-	/*
-	 * Construct an array of pointers to the structures and call qsort(3).
-	 * Reassemble the array in the order returned by qsort.  If unable to
-	 * sort for memory reasons, return the directory entries in their
-	 * current order.  Allocate enough space for the current needs plus
-	 * 40 so don't realloc one entry at a time.
-	 */
-	if (nitems > sp->fts_nitems) {
-		sp->fts_nitems = nitems + 40;
-		if ((sp->fts_array = reallocf(sp->fts_array,
-		    sp->fts_nitems * sizeof(FTSENT *))) == NULL) {
-			sp->fts_nitems = 0;
-			return (head);
-		}
-	}
-	for (ap = sp->fts_array, p = head; p; p = p->fts_link)
-		*ap++ = p;
-	qsort(sp->fts_array, nitems, sizeof(FTSENT *), fts_compar);
-	for (head = *(ap = sp->fts_array); --nitems; ++ap)
-		ap[0]->fts_link = ap[1];
-	ap[0]->fts_link = NULL;
-	return (head);
-}
-
-static FTSENT *
-fts_alloc(sp, name, namelen)
-	FTS *sp;
-	char *name;
-	int namelen;
-{
-	FTSENT *p;
-	size_t len;
-
-	struct ftsent_withstat {
-		FTSENT	ent;
-		struct	stat statbuf;
-	};
-
-	/*
-	 * The file name is a variable length array and no stat structure is
-	 * necessary if the user has set the nostat bit.  Allocate the FTSENT
-	 * structure, the file name and the stat structure in one chunk, but
-	 * be careful that the stat structure is reasonably aligned.
-	 */
-	if (ISSET(FTS_NOSTAT))
-		len = sizeof(FTSENT) + namelen + 1;
-	else
-		len = sizeof(struct ftsent_withstat) + namelen + 1;
-
-	if ((p = malloc(len)) == NULL)
-		return (NULL);
-
-	if (ISSET(FTS_NOSTAT)) {
-		p->fts_name = (char *)(p + 1);
-		p->fts_statp = NULL;
-	} else {
-		p->fts_name = (char *)((struct ftsent_withstat *)p + 1);
-		p->fts_statp = &((struct ftsent_withstat *)p)->statbuf;
-	}
-
-	/* Copy the name and guarantee NUL termination. */
-	memcpy(p->fts_name, name, namelen);
-	p->fts_name[namelen] = '\0';
-	p->fts_namelen = namelen;
-	p->fts_path = sp->fts_path;
-	p->fts_errno = 0;
-	p->fts_flags = 0;
-	p->fts_instr = FTS_NOINSTR;
-	p->fts_number = 0;
-	p->fts_pointer = NULL;
-	p->fts_fts = sp;
-	return (p);
-}
-
-static void
-fts_lfree(head)
-	FTSENT *head;
-{
-	FTSENT *p;
-
-	/* Free a linked list of structures. */
-	while ((p = head)) {
-		head = head->fts_link;
-		free(p);
-	}
-}
-
-/*
- * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
- * Most systems will allow creation of paths much longer than MAXPATHLEN, even
- * though the kernel won't resolve them.  Add the size (not just what's needed)
- * plus 256 bytes so don't realloc the path 2 bytes at a time.
- */
-static int
-fts_palloc(sp, more)
-	FTS *sp;
-	size_t more;
-{
-
-	sp->fts_pathlen += more + 256;
-	/*
-	 * Check for possible wraparound.  In an FTS, fts_pathlen is
-	 * a signed int but in an FTSENT it is an unsigned short.
-	 * We limit fts_pathlen to USHRT_MAX to be safe in both cases.
-	 */
-	if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) {
-		if (sp->fts_path)
-			free(sp->fts_path);
-		sp->fts_path = NULL;
-		errno = ENAMETOOLONG;
-		return (1);
-	}
-	sp->fts_path = reallocf(sp->fts_path, sp->fts_pathlen);
-	return (sp->fts_path == NULL);
-}
-
-/*
- * When the path is realloc'd, have to fix all of the pointers in structures
- * already returned.
- */
-static void
-fts_padjust(sp, head)
-	FTS *sp;
-	FTSENT *head;
-{
-	FTSENT *p;
-	char *addr = sp->fts_path;
-
-#define	ADJUST(p) do {							\
-	if ((p)->fts_accpath != (p)->fts_name) {			\
-		(p)->fts_accpath =					\
-		    (char *)addr + ((p)->fts_accpath - (p)->fts_path);	\
-	}								\
-	(p)->fts_path = addr;						\
-} while (0)
-	/* Adjust the current set of children. */
-	for (p = sp->fts_child; p; p = p->fts_link)
-		ADJUST(p);
-
-	/* Adjust the rest of the tree, including the current level. */
-	for (p = head; p->fts_level >= FTS_ROOTLEVEL;) {
-		ADJUST(p);
-		p = p->fts_link ? p->fts_link : p->fts_parent;
-	}
-}
-
-static size_t
-fts_maxarglen(argv)
-	char * const *argv;
-{
-	size_t len, max;
-
-	for (max = 0; *argv; ++argv)
-		if ((len = strlen(*argv)) > max)
-			max = len;
-	return (max + 1);
-}
-
-/*
- * Change to dir specified by fd or p->fts_accpath without getting
- * tricked by someone changing the world out from underneath us.
- * Assumes p->fts_dev and p->fts_ino are filled in.
- */
-static int
-fts_safe_changedir(sp, p, fd, path)
-	FTS *sp;
-	FTSENT *p;
-	int fd;
-	char *path;
-{
-	int ret, oerrno, newfd;
-	struct stat sb;
-
-	newfd = fd;
-	if (ISSET(FTS_NOCHDIR))
-		return (0);
-	if (fd < 0 && (newfd = _open(path, O_RDONLY, 0)) < 0)
-		return (-1);
-	if (_fstat(newfd, &sb)) {
-		ret = -1;
-		goto bail;
-	}
-	if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) {
-		errno = ENOENT;		/* disinformation */
-		ret = -1;
-		goto bail;
-	}
-	ret = fchdir(newfd);
-bail:
-	oerrno = errno;
-	if (fd < 0)
-		(void)_close(newfd);
-	errno = oerrno;
-	return (ret);
-}
-
-/*
- * Check if the filesystem for "ent" has UFS-style links.
- */
-static int
-fts_ufslinks(FTS *sp, const FTSENT *ent)
-{
-	struct _fts_private *priv;
-	const char **cpp;
-
-	priv = (struct _fts_private *)sp;
-	/*
-	 * If this node's device is different from the previous, grab
-	 * the filesystem information, and decide on the reliability
-	 * of the link information from this filesystem for stat(2)
-	 * avoidance.
-	 */
-	if (priv->ftsp_dev != ent->fts_dev) {
-		if (statfs(ent->fts_path, &priv->ftsp_statfs) != -1) {
-			priv->ftsp_dev = ent->fts_dev;
-			priv->ftsp_linksreliable = 0;
-			for (cpp = ufslike_filesystems; *cpp; cpp++) {
-				if (strcmp(priv->ftsp_statfs.f_fstypename,
-				    *cpp) == 0) {
-					priv->ftsp_linksreliable = 1;
-					break;
-				}
-			}
-		} else {
-			priv->ftsp_linksreliable = 0;
-		}
-	}
-	return (priv->ftsp_linksreliable);
-}
diff --git a/lib/libc/gen/ftw.c b/lib/libc/gen/ftw.c
deleted file mode 100644
index 959c9cc..0000000
--- a/lib/libc/gen/ftw.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$OpenBSD: ftw.c,v 1.4 2004/07/07 16:05:23 millert Exp $	*/
-
-/*
- * Copyright (c) 2003, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: ftw.c,v 1.4 2004/07/07 16:05:23 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/ftw.c,v 1.4 2004/08/24 13:00:55 tjr Exp $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fts.h>
-#include <ftw.h>
-#include <limits.h>
-
-int
-ftw(const char *path, int (*fn)(const char *, const struct stat *, int),
-    int nfds)
-{
-	char * const paths[2] = { (char *)path, NULL };
-	FTSENT *cur;
-	FTS *ftsp;
-	int error = 0, fnflag, sverrno;
-
-	/* XXX - nfds is currently unused */
-	if (nfds < 1 || nfds > OPEN_MAX) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ftsp = fts_open(paths, FTS_LOGICAL | FTS_COMFOLLOW | FTS_NOCHDIR, NULL);
-	if (ftsp == NULL)
-		return (-1);
-	while ((cur = fts_read(ftsp)) != NULL) {
-		switch (cur->fts_info) {
-		case FTS_D:
-			fnflag = FTW_D;
-			break;
-		case FTS_DNR:
-			fnflag = FTW_DNR;
-			break;
-		case FTS_DP:
-			/* we only visit in preorder */
-			continue;
-		case FTS_F:
-		case FTS_DEFAULT:
-			fnflag = FTW_F;
-			break;
-		case FTS_NS:
-		case FTS_NSOK:
-		case FTS_SLNONE:
-			fnflag = FTW_NS;
-			break;
-		case FTS_SL:
-			fnflag = FTW_SL;
-			break;
-		case FTS_DC:
-			errno = ELOOP;
-			/* FALLTHROUGH */
-		default:
-			error = -1;
-			goto done;
-		}
-		error = fn(cur->fts_path, cur->fts_statp, fnflag);
-		if (error != 0)
-			break;
-	}
-done:
-	sverrno = errno;
-	if (fts_close(ftsp) != 0 && error == 0)
-		error = -1;
-	else
-		errno = sverrno;
-	return (error);
-}
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
deleted file mode 100644
index 9b2444d..0000000
--- a/lib/libc/gen/getbootfile.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getbootfile.c,v 1.8 2005/05/03 15:28:07 delphij Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <paths.h>
-
-const char *
-getbootfile(void)
-{
-	static char name[MAXPATHLEN];
-	size_t size = sizeof name;
-	int mib[2];
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_BOOTFILE;
-	if (sysctl(mib, 2, name, &size, NULL, 0) == -1)
-		return ("/boot/kernel/kernel");
-	return (name);
-}
diff --git a/lib/libc/gen/getbsize.c b/lib/libc/gen/getbsize.c
deleted file mode 100644
index b922f1c..0000000
--- a/lib/libc/gen/getbsize.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getbsize.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.7 2002/12/30 19:04:06 obrien Exp $");
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-getbsize(headerlenp, blocksizep)
-	int *headerlenp;
-	long *blocksizep;
-{
-	static char header[20];
-	long n, max, mul, blocksize;
-	char *ep, *p;
-	const char *form;
-
-#define	KB	(1024L)
-#define	MB	(1024L * 1024L)
-#define	GB	(1024L * 1024L * 1024L)
-#define	MAXB	GB		/* No tera, peta, nor exa. */
-	form = "";
-	if ((p = getenv("BLOCKSIZE")) != NULL && *p != '\0') {
-		if ((n = strtol(p, &ep, 10)) < 0)
-			goto underflow;
-		if (n == 0)
-			n = 1;
-		if (*ep && ep[1])
-			goto fmterr;
-		switch (*ep) {
-		case 'G': case 'g':
-			form = "G";
-			max = MAXB / GB;
-			mul = GB;
-			break;
-		case 'K': case 'k':
-			form = "K";
-			max = MAXB / KB;
-			mul = KB;
-			break;
-		case 'M': case 'm':
-			form = "M";
-			max = MAXB / MB;
-			mul = MB;
-			break;
-		case '\0':
-			max = MAXB;
-			mul = 1;
-			break;
-		default:
-fmterr:			warnx("%s: unknown blocksize", p);
-			n = 512;
-			mul = 1;
-			break;
-		}
-		if (n > max) {
-			warnx("maximum blocksize is %ldG", MAXB / GB);
-			n = max;
-		}
-		if ((blocksize = n * mul) < 512) {
-underflow:		warnx("minimum blocksize is 512");
-			form = "";
-			blocksize = n = 512;
-		}
-	} else
-		blocksize = n = 512;
-
-	(void)snprintf(header, sizeof(header), "%ld%s-blocks", n, form);
-	*headerlenp = strlen(header);
-	*blocksizep = blocksize;
-	return (header);
-}
diff --git a/lib/libc/gen/getcap.c b/lib/libc/gen/getcap.c
deleted file mode 100644
index 3cf07fa..0000000
--- a/lib/libc/gen/getcap.c
+++ /dev/null
@@ -1,1058 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Casey Leedom of Lawrence Livermore National Laboratory.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getcap.c	8.3 (Berkeley) 3/25/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getcap.c,v 1.19 2003/01/02 10:19:43 thomas Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-
-#define	BFRAG		1024
-#define	BSIZE		1024
-#define	ESC		('[' & 037)	/* ASCII ESC */
-#define	MAX_RECURSION	32		/* maximum getent recursion */
-#define	SFRAG		100		/* cgetstr mallocs in SFRAG chunks */
-
-#define RECOK	(char)0
-#define TCERR	(char)1
-#define	SHADOW	(char)2
-
-static size_t	 topreclen;	/* toprec length */
-static char	*toprec;	/* Additional record specified by cgetset() */
-static int	 gottoprec;	/* Flag indicating retrieval of toprecord */
-
-static int	cdbget(DB *, char **, const char *);
-static int 	getent(char **, u_int *, char **, int, const char *, int, char *);
-static int	nfcmp(char *, char *);
-
-/*
- * Cgetset() allows the addition of a user specified buffer to be added
- * to the database array, in effect "pushing" the buffer on top of the
- * virtual database. 0 is returned on success, -1 on failure.
- */
-int
-cgetset(const char *ent)
-{
-	if (ent == NULL) {
-		if (toprec)
-			free(toprec);
-                toprec = NULL;
-                topreclen = 0;
-                return (0);
-        }
-        topreclen = strlen(ent);
-        if ((toprec = malloc (topreclen + 1)) == NULL) {
-		errno = ENOMEM;
-                return (-1);
-	}
-	gottoprec = 0;
-        (void)strcpy(toprec, ent);
-        return (0);
-}
-
-/*
- * Cgetcap searches the capability record buf for the capability cap with
- * type `type'.  A pointer to the value of cap is returned on success, NULL
- * if the requested capability couldn't be found.
- *
- * Specifying a type of ':' means that nothing should follow cap (:cap:).
- * In this case a pointer to the terminating ':' or NUL will be returned if
- * cap is found.
- *
- * If (cap, '@') or (cap, terminator, '@') is found before (cap, terminator)
- * return NULL.
- */
-char *
-cgetcap(char *buf, const char *cap, int type)
-{
-	char *bp;
-	const char *cp;
-
-	bp = buf;
-	for (;;) {
-		/*
-		 * Skip past the current capability field - it's either the
-		 * name field if this is the first time through the loop, or
-		 * the remainder of a field whose name failed to match cap.
-		 */
-		for (;;)
-			if (*bp == '\0')
-				return (NULL);
-			else
-				if (*bp++ == ':')
-					break;
-
-		/*
-		 * Try to match (cap, type) in buf.
-		 */
-		for (cp = cap; *cp == *bp && *bp != '\0'; cp++, bp++)
-			continue;
-		if (*cp != '\0')
-			continue;
-		if (*bp == '@')
-			return (NULL);
-		if (type == ':') {
-			if (*bp != '\0' && *bp != ':')
-				continue;
-			return(bp);
-		}
-		if (*bp != type)
-			continue;
-		bp++;
-		return (*bp == '@' ? NULL : bp);
-	}
-	/* NOTREACHED */
-}
-
-/*
- * Cgetent extracts the capability record name from the NULL terminated file
- * array db_array and returns a pointer to a malloc'd copy of it in buf.
- * Buf must be retained through all subsequent calls to cgetcap, cgetnum,
- * cgetflag, and cgetstr, but may then be free'd.  0 is returned on success,
- * -1 if the requested record couldn't be found, -2 if a system error was
- * encountered (couldn't open/read a file, etc.), and -3 if a potential
- * reference loop is detected.
- */
-int
-cgetent(char **buf, char **db_array, const char *name)
-{
-	u_int dummy;
-
-	return (getent(buf, &dummy, db_array, -1, name, 0, NULL));
-}
-
-/*
- * Getent implements the functions of cgetent.  If fd is non-negative,
- * *db_array has already been opened and fd is the open file descriptor.  We
- * do this to save time and avoid using up file descriptors for tc=
- * recursions.
- *
- * Getent returns the same success/failure codes as cgetent.  On success, a
- * pointer to a malloc'ed capability record with all tc= capabilities fully
- * expanded and its length (not including trailing ASCII NUL) are left in
- * *cap and *len.
- *
- * Basic algorithm:
- *	+ Allocate memory incrementally as needed in chunks of size BFRAG
- *	  for capability buffer.
- *	+ Recurse for each tc=name and interpolate result.  Stop when all
- *	  names interpolated, a name can't be found, or depth exceeds
- *	  MAX_RECURSION.
- */
-static int
-getent(char **cap, u_int *len, char **db_array, int fd, const char *name,
-    int depth, char *nfield)
-{
-	DB *capdbp;
-	char *r_end, *rp, **db_p;
-	int myfd, eof, foundit, retval, clen;
-	char *record, *cbuf;
-	int tc_not_resolved;
-	char pbuf[_POSIX_PATH_MAX];
-
-	/*
-	 * Return with ``loop detected'' error if we've recursed more than
-	 * MAX_RECURSION times.
-	 */
-	if (depth > MAX_RECURSION)
-		return (-3);
-
-	/*
-	 * Check if we have a top record from cgetset().
-         */
-	if (depth == 0 && toprec != NULL && cgetmatch(toprec, name) == 0) {
-		if ((record = malloc (topreclen + BFRAG)) == NULL) {
-			errno = ENOMEM;
-			return (-2);
-		}
-		(void)strcpy(record, toprec);
-		myfd = 0;
-		db_p = db_array;
-		rp = record + topreclen + 1;
-		r_end = rp + BFRAG;
-		goto tc_exp;
-	}
-	/*
-	 * Allocate first chunk of memory.
-	 */
-	if ((record = malloc(BFRAG)) == NULL) {
-		errno = ENOMEM;
-		return (-2);
-	}
-	r_end = record + BFRAG;
-	foundit = 0;
-	/*
-	 * Loop through database array until finding the record.
-	 */
-
-	for (db_p = db_array; *db_p != NULL; db_p++) {
-		eof = 0;
-
-		/*
-		 * Open database if not already open.
-		 */
-
-		if (fd >= 0) {
-			(void)lseek(fd, (off_t)0, SEEK_SET);
-			myfd = 0;
-		} else {
-			(void)snprintf(pbuf, sizeof(pbuf), "%s.db", *db_p);
-			if ((capdbp = dbopen(pbuf, O_RDONLY, 0, DB_HASH, 0))
-			     != NULL) {
-				free(record);
-				retval = cdbget(capdbp, &record, name);
-				if (retval < 0) {
-					/* no record available */
-					(void)capdbp->close(capdbp);
-					return (retval);
-				}
-				/* save the data; close frees it */
-				clen = strlen(record);
-				cbuf = malloc(clen + 1);
-				memcpy(cbuf, record, clen + 1);
-				if (capdbp->close(capdbp) < 0) {
-					free(cbuf);
-					return (-2);
-				}
-				*len = clen;
-				*cap = cbuf;
-				return (retval);
-			} else {
-				fd = _open(*db_p, O_RDONLY, 0);
-				if (fd < 0)
-					continue;
-				myfd = 1;
-			}
-		}
-		/*
-		 * Find the requested capability record ...
-		 */
-		{
-		char buf[BUFSIZ];
-		char *b_end, *bp;
-		int c;
-
-		/*
-		 * Loop invariants:
-		 *	There is always room for one more character in record.
-		 *	R_end always points just past end of record.
-		 *	Rp always points just past last character in record.
-		 *	B_end always points just past last character in buf.
-		 *	Bp always points at next character in buf.
-		 */
-		b_end = buf;
-		bp = buf;
-		for (;;) {
-
-			/*
-			 * Read in a line implementing (\, newline)
-			 * line continuation.
-			 */
-			rp = record;
-			for (;;) {
-				if (bp >= b_end) {
-					int n;
-
-					n = _read(fd, buf, sizeof(buf));
-					if (n <= 0) {
-						if (myfd)
-							(void)_close(fd);
-						if (n < 0) {
-							free(record);
-							return (-2);
-						} else {
-							fd = -1;
-							eof = 1;
-							break;
-						}
-					}
-					b_end = buf+n;
-					bp = buf;
-				}
-
-				c = *bp++;
-				if (c == '\n') {
-					if (rp > record && *(rp-1) == '\\') {
-						rp--;
-						continue;
-					} else
-						break;
-				}
-				*rp++ = c;
-
-				/*
-				 * Enforce loop invariant: if no room
-				 * left in record buffer, try to get
-				 * some more.
-				 */
-				if (rp >= r_end) {
-					u_int pos;
-					size_t newsize;
-
-					pos = rp - record;
-					newsize = r_end - record + BFRAG;
-					record = reallocf(record, newsize);
-					if (record == NULL) {
-						errno = ENOMEM;
-						if (myfd)
-							(void)_close(fd);
-						return (-2);
-					}
-					r_end = record + newsize;
-					rp = record + pos;
-				}
-			}
-				/* loop invariant let's us do this */
-			*rp++ = '\0';
-
-			/*
-			 * If encountered eof check next file.
-			 */
-			if (eof)
-				break;
-
-			/*
-			 * Toss blank lines and comments.
-			 */
-			if (*record == '\0' || *record == '#')
-				continue;
-
-			/*
-			 * See if this is the record we want ...
-			 */
-			if (cgetmatch(record, name) == 0) {
-				if (nfield == NULL || !nfcmp(nfield, record)) {
-					foundit = 1;
-					break;	/* found it! */
-				}
-			}
-		}
-	}
-		if (foundit)
-			break;
-	}
-
-	if (!foundit) {
-		free(record);
-		return (-1);
-	}
-
-	/*
-	 * Got the capability record, but now we have to expand all tc=name
-	 * references in it ...
-	 */
-tc_exp:	{
-		char *newicap, *s;
-		int newilen;
-		u_int ilen;
-		int diff, iret, tclen;
-		char *icap, *scan, *tc, *tcstart, *tcend;
-
-		/*
-		 * Loop invariants:
-		 *	There is room for one more character in record.
-		 *	R_end points just past end of record.
-		 *	Rp points just past last character in record.
-		 *	Scan points at remainder of record that needs to be
-		 *	scanned for tc=name constructs.
-		 */
-		scan = record;
-		tc_not_resolved = 0;
-		for (;;) {
-			if ((tc = cgetcap(scan, "tc", '=')) == NULL)
-				break;
-
-			/*
-			 * Find end of tc=name and stomp on the trailing `:'
-			 * (if present) so we can use it to call ourselves.
-			 */
-			s = tc;
-			for (;;)
-				if (*s == '\0')
-					break;
-				else
-					if (*s++ == ':') {
-						*(s - 1) = '\0';
-						break;
-					}
-			tcstart = tc - 3;
-			tclen = s - tcstart;
-			tcend = s;
-
-			iret = getent(&icap, &ilen, db_p, fd, tc, depth+1,
-				      NULL);
-			newicap = icap;		/* Put into a register. */
-			newilen = ilen;
-			if (iret != 0) {
-				/* an error */
-				if (iret < -1) {
-					if (myfd)
-						(void)_close(fd);
-					free(record);
-					return (iret);
-				}
-				if (iret == 1)
-					tc_not_resolved = 1;
-				/* couldn't resolve tc */
-				if (iret == -1) {
-					*(s - 1) = ':';
-					scan = s - 1;
-					tc_not_resolved = 1;
-					continue;
-
-				}
-			}
-			/* not interested in name field of tc'ed record */
-			s = newicap;
-			for (;;)
-				if (*s == '\0')
-					break;
-				else
-					if (*s++ == ':')
-						break;
-			newilen -= s - newicap;
-			newicap = s;
-
-			/* make sure interpolated record is `:'-terminated */
-			s += newilen;
-			if (*(s-1) != ':') {
-				*s = ':';	/* overwrite NUL with : */
-				newilen++;
-			}
-
-			/*
-			 * Make sure there's enough room to insert the
-			 * new record.
-			 */
-			diff = newilen - tclen;
-			if (diff >= r_end - rp) {
-				u_int pos, tcpos, tcposend;
-				size_t newsize;
-
-				pos = rp - record;
-				newsize = r_end - record + diff + BFRAG;
-				tcpos = tcstart - record;
-				tcposend = tcend - record;
-				record = reallocf(record, newsize);
-				if (record == NULL) {
-					errno = ENOMEM;
-					if (myfd)
-						(void)_close(fd);
-					free(icap);
-					return (-2);
-				}
-				r_end = record + newsize;
-				rp = record + pos;
-				tcstart = record + tcpos;
-				tcend = record + tcposend;
-			}
-
-			/*
-			 * Insert tc'ed record into our record.
-			 */
-			s = tcstart + newilen;
-			bcopy(tcend, s, rp - tcend);
-			bcopy(newicap, tcstart, newilen);
-			rp += diff;
-			free(icap);
-
-			/*
-			 * Start scan on `:' so next cgetcap works properly
-			 * (cgetcap always skips first field).
-			 */
-			scan = s-1;
-		}
-
-	}
-	/*
-	 * Close file (if we opened it), give back any extra memory, and
-	 * return capability, length and success.
-	 */
-	if (myfd)
-		(void)_close(fd);
-	*len = rp - record - 1;	/* don't count NUL */
-	if (r_end > rp)
-		if ((record =
-		     reallocf(record, (size_t)(rp - record))) == NULL) {
-			errno = ENOMEM;
-			return (-2);
-		}
-
-	*cap = record;
-	if (tc_not_resolved)
-		return (1);
-	return (0);
-}
-
-static int
-cdbget(DB *capdbp, char **bp, const char *name)
-{
-	DBT key, data;
-	char *namebuf;
-
-	namebuf = strdup(name);
-	if (namebuf == NULL)
-		return (-2);
-	key.data = namebuf;
-	key.size = strlen(namebuf);
-
-	for (;;) {
-		/* Get the reference. */
-		switch(capdbp->get(capdbp, &key, &data, 0)) {
-		case -1:
-			free(namebuf);
-			return (-2);
-		case 1:
-			free(namebuf);
-			return (-1);
-		}
-
-		/* If not an index to another record, leave. */
-		if (((char *)data.data)[0] != SHADOW)
-			break;
-
-		key.data = (char *)data.data + 1;
-		key.size = data.size - 1;
-	}
-
-	*bp = (char *)data.data + 1;
-	free(namebuf);
-	return (((char *)(data.data))[0] == TCERR ? 1 : 0);
-}
-
-/*
- * Cgetmatch will return 0 if name is one of the names of the capability
- * record buf, -1 if not.
- */
-int
-cgetmatch(const char *buf, const char *name)
-{
-	const char *np, *bp;
-
-	if (name == NULL || *name == '\0')
-		return -1;
-
-	/*
-	 * Start search at beginning of record.
-	 */
-	bp = buf;
-	for (;;) {
-		/*
-		 * Try to match a record name.
-		 */
-		np = name;
-		for (;;)
-			if (*np == '\0')
-				if (*bp == '|' || *bp == ':' || *bp == '\0')
-					return (0);
-				else
-					break;
-			else
-				if (*bp++ != *np++)
-					break;
-
-		/*
-		 * Match failed, skip to next name in record.
-		 */
-		bp--;	/* a '|' or ':' may have stopped the match */
-		for (;;)
-			if (*bp == '\0' || *bp == ':')
-				return (-1);	/* match failed totally */
-			else
-				if (*bp++ == '|')
-					break;	/* found next name */
-	}
-}
-
-
-
-
-
-int
-cgetfirst(char **buf, char **db_array)
-{
-	(void)cgetclose();
-	return (cgetnext(buf, db_array));
-}
-
-static FILE *pfp;
-static int slash;
-static char **dbp;
-
-int
-cgetclose(void)
-{
-	if (pfp != NULL) {
-		(void)fclose(pfp);
-		pfp = NULL;
-	}
-	dbp = NULL;
-	gottoprec = 0;
-	slash = 0;
-	return(0);
-}
-
-/*
- * Cgetnext() gets either the first or next entry in the logical database
- * specified by db_array.  It returns 0 upon completion of the database, 1
- * upon returning an entry with more remaining, and -1 if an error occurs.
- */
-int
-cgetnext(char **bp, char **db_array)
-{
-	size_t len;
-	int done, hadreaderr, i, savederrno, status;
-	char *cp, *line, *rp, *np, buf[BSIZE], nbuf[BSIZE];
-	u_int dummy;
-
-	if (dbp == NULL)
-		dbp = db_array;
-
-	if (pfp == NULL && (pfp = fopen(*dbp, "r")) == NULL) {
-		(void)cgetclose();
-		return (-1);
-	}
-	for(;;) {
-		if (toprec && !gottoprec) {
-			gottoprec = 1;
-			line = toprec;
-		} else {
-			line = fgetln(pfp, &len);
-			if (line == NULL && pfp) {
-				hadreaderr = ferror(pfp);
-				if (hadreaderr)
-					savederrno = errno;
-				fclose(pfp);
-				pfp = NULL;
-				if (hadreaderr) {
-					cgetclose();
-					errno = savederrno;
-					return (-1);
-				} else {
-					if (*++dbp == NULL) {
-						(void)cgetclose();
-						return (0);
-					} else if ((pfp =
-					    fopen(*dbp, "r")) == NULL) {
-						(void)cgetclose();
-						return (-1);
-					} else
-						continue;
-				}
-			} else
-				line[len - 1] = '\0';
-			if (len == 1) {
-				slash = 0;
-				continue;
-			}
-			if (isspace((unsigned char)*line) ||
-			    *line == ':' || *line == '#' || slash) {
-				if (line[len - 2] == '\\')
-					slash = 1;
-				else
-					slash = 0;
-				continue;
-			}
-			if (line[len - 2] == '\\')
-				slash = 1;
-			else
-				slash = 0;
-		}
-
-
-		/*
-		 * Line points to a name line.
-		 */
-		i = 0;
-		done = 0;
-		np = nbuf;
-		for (;;) {
-			for (cp = line; *cp != '\0'; cp++) {
-				if (*cp == ':') {
-					*np++ = ':';
-					done = 1;
-					break;
-				}
-				if (*cp == '\\')
-					break;
-				*np++ = *cp;
-			}
-			if (done) {
-				*np = '\0';
-				break;
-			} else { /* name field extends beyond the line */
-				line = fgetln(pfp, &len);
-				if (line == NULL && pfp) {
-					/* Name extends beyond the EOF! */
-					hadreaderr = ferror(pfp);
-					if (hadreaderr)
-						savederrno = errno;
-					fclose(pfp);
-					pfp = NULL;
-					if (hadreaderr) {
-						cgetclose();
-						errno = savederrno;
-						return (-1);
-					} else {
-						cgetclose();
-						return (-1);
-					}
-				} else
-					line[len - 1] = '\0';
-			}
-		}
-		rp = buf;
-		for(cp = nbuf; *cp != '\0'; cp++)
-			if (*cp == '|' || *cp == ':')
-				break;
-			else
-				*rp++ = *cp;
-
-		*rp = '\0';
-		/*
-		 * XXX
-		 * Last argument of getent here should be nbuf if we want true
-		 * sequential access in the case of duplicates.
-		 * With NULL, getent will return the first entry found
-		 * rather than the duplicate entry record.  This is a
-		 * matter of semantics that should be resolved.
-		 */
-		status = getent(bp, &dummy, db_array, -1, buf, 0, NULL);
-		if (status == -2 || status == -3)
-			(void)cgetclose();
-
-		return (status + 1);
-	}
-	/* NOTREACHED */
-}
-
-/*
- * Cgetstr retrieves the value of the string capability cap from the
- * capability record pointed to by buf.  A pointer to a decoded, NUL
- * terminated, malloc'd copy of the string is returned in the char *
- * pointed to by str.  The length of the string not including the trailing
- * NUL is returned on success, -1 if the requested string capability
- * couldn't be found, -2 if a system error was encountered (storage
- * allocation failure).
- */
-int
-cgetstr(char *buf, const char *cap, char **str)
-{
-	u_int m_room;
-	char *bp, *mp;
-	int len;
-	char *mem;
-
-	/*
-	 * Find string capability cap
-	 */
-	bp = cgetcap(buf, cap, '=');
-	if (bp == NULL)
-		return (-1);
-
-	/*
-	 * Conversion / storage allocation loop ...  Allocate memory in
-	 * chunks SFRAG in size.
-	 */
-	if ((mem = malloc(SFRAG)) == NULL) {
-		errno = ENOMEM;
-		return (-2);	/* couldn't even allocate the first fragment */
-	}
-	m_room = SFRAG;
-	mp = mem;
-
-	while (*bp != ':' && *bp != '\0') {
-		/*
-		 * Loop invariants:
-		 *	There is always room for one more character in mem.
-		 *	Mp always points just past last character in mem.
-		 *	Bp always points at next character in buf.
-		 */
-		if (*bp == '^') {
-			bp++;
-			if (*bp == ':' || *bp == '\0')
-				break;	/* drop unfinished escape */
-			if (*bp == '?') {
-				*mp++ = '\177';
-				bp++;
-			} else
-				*mp++ = *bp++ & 037;
-		} else if (*bp == '\\') {
-			bp++;
-			if (*bp == ':' || *bp == '\0')
-				break;	/* drop unfinished escape */
-			if ('0' <= *bp && *bp <= '7') {
-				int n, i;
-
-				n = 0;
-				i = 3;	/* maximum of three octal digits */
-				do {
-					n = n * 8 + (*bp++ - '0');
-				} while (--i && '0' <= *bp && *bp <= '7');
-				*mp++ = n;
-			}
-			else switch (*bp++) {
-				case 'b': case 'B':
-					*mp++ = '\b';
-					break;
-				case 't': case 'T':
-					*mp++ = '\t';
-					break;
-				case 'n': case 'N':
-					*mp++ = '\n';
-					break;
-				case 'f': case 'F':
-					*mp++ = '\f';
-					break;
-				case 'r': case 'R':
-					*mp++ = '\r';
-					break;
-				case 'e': case 'E':
-					*mp++ = ESC;
-					break;
-				case 'c': case 'C':
-					*mp++ = ':';
-					break;
-				default:
-					/*
-					 * Catches '\', '^', and
-					 *  everything else.
-					 */
-					*mp++ = *(bp-1);
-					break;
-			}
-		} else
-			*mp++ = *bp++;
-		m_room--;
-
-		/*
-		 * Enforce loop invariant: if no room left in current
-		 * buffer, try to get some more.
-		 */
-		if (m_room == 0) {
-			size_t size = mp - mem;
-
-			if ((mem = reallocf(mem, size + SFRAG)) == NULL)
-				return (-2);
-			m_room = SFRAG;
-			mp = mem + size;
-		}
-	}
-	*mp++ = '\0';	/* loop invariant let's us do this */
-	m_room--;
-	len = mp - mem - 1;
-
-	/*
-	 * Give back any extra memory and return value and success.
-	 */
-	if (m_room != 0)
-		if ((mem = reallocf(mem, (size_t)(mp - mem))) == NULL)
-			return (-2);
-	*str = mem;
-	return (len);
-}
-
-/*
- * Cgetustr retrieves the value of the string capability cap from the
- * capability record pointed to by buf.  The difference between cgetustr()
- * and cgetstr() is that cgetustr does not decode escapes but rather treats
- * all characters literally.  A pointer to a  NUL terminated malloc'd
- * copy of the string is returned in the char pointed to by str.  The
- * length of the string not including the trailing NUL is returned on success,
- * -1 if the requested string capability couldn't be found, -2 if a system
- * error was encountered (storage allocation failure).
- */
-int
-cgetustr(char *buf, const char *cap, char **str)
-{
-	u_int m_room;
-	char *bp, *mp;
-	int len;
-	char *mem;
-
-	/*
-	 * Find string capability cap
-	 */
-	if ((bp = cgetcap(buf, cap, '=')) == NULL)
-		return (-1);
-
-	/*
-	 * Conversion / storage allocation loop ...  Allocate memory in
-	 * chunks SFRAG in size.
-	 */
-	if ((mem = malloc(SFRAG)) == NULL) {
-		errno = ENOMEM;
-		return (-2);	/* couldn't even allocate the first fragment */
-	}
-	m_room = SFRAG;
-	mp = mem;
-
-	while (*bp != ':' && *bp != '\0') {
-		/*
-		 * Loop invariants:
-		 *	There is always room for one more character in mem.
-		 *	Mp always points just past last character in mem.
-		 *	Bp always points at next character in buf.
-		 */
-		*mp++ = *bp++;
-		m_room--;
-
-		/*
-		 * Enforce loop invariant: if no room left in current
-		 * buffer, try to get some more.
-		 */
-		if (m_room == 0) {
-			size_t size = mp - mem;
-
-			if ((mem = reallocf(mem, size + SFRAG)) == NULL)
-				return (-2);
-			m_room = SFRAG;
-			mp = mem + size;
-		}
-	}
-	*mp++ = '\0';	/* loop invariant let's us do this */
-	m_room--;
-	len = mp - mem - 1;
-
-	/*
-	 * Give back any extra memory and return value and success.
-	 */
-	if (m_room != 0)
-		if ((mem = reallocf(mem, (size_t)(mp - mem))) == NULL)
-			return (-2);
-	*str = mem;
-	return (len);
-}
-
-/*
- * Cgetnum retrieves the value of the numeric capability cap from the
- * capability record pointed to by buf.  The numeric value is returned in
- * the long pointed to by num.  0 is returned on success, -1 if the requested
- * numeric capability couldn't be found.
- */
-int
-cgetnum(char *buf, const char *cap, long *num)
-{
-	long n;
-	int base, digit;
-	char *bp;
-
-	/*
-	 * Find numeric capability cap
-	 */
-	bp = cgetcap(buf, cap, '#');
-	if (bp == NULL)
-		return (-1);
-
-	/*
-	 * Look at value and determine numeric base:
-	 *	0x... or 0X...	hexadecimal,
-	 * else	0...		octal,
-	 * else			decimal.
-	 */
-	if (*bp == '0') {
-		bp++;
-		if (*bp == 'x' || *bp == 'X') {
-			bp++;
-			base = 16;
-		} else
-			base = 8;
-	} else
-		base = 10;
-
-	/*
-	 * Conversion loop ...
-	 */
-	n = 0;
-	for (;;) {
-		if ('0' <= *bp && *bp <= '9')
-			digit = *bp - '0';
-		else if ('a' <= *bp && *bp <= 'f')
-			digit = 10 + *bp - 'a';
-		else if ('A' <= *bp && *bp <= 'F')
-			digit = 10 + *bp - 'A';
-		else
-			break;
-
-		if (digit >= base)
-			break;
-
-		n = n * base + digit;
-		bp++;
-	}
-
-	/*
-	 * Return value and success.
-	 */
-	*num = n;
-	return (0);
-}
-
-
-/*
- * Compare name field of record.
- */
-static int
-nfcmp(char *nf, char *rec)
-{
-	char *cp, tmp;
-	int ret;
-
-	for (cp = rec; *cp != ':'; cp++)
-		;
-
-	tmp = *(cp + 1);
-	*(cp + 1) = '\0';
-	ret = strcmp(nf, rec);
-	*(cp + 1) = tmp;
-
-	return (ret);
-}
diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c
deleted file mode 100644
index 2e8c1b9..0000000
--- a/lib/libc/gen/getcwd.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Copyright (c) 1989, 1991, 1993, 1995
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getcwd.c	8.5 (Berkeley) 2/7/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.25.10.1 2005/10/04 14:33:09 ache Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#define	ISDOT(dp) \
-	(dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \
-	    (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
-
-extern int __getcwd(char *, size_t);
-
-char *
-getcwd(pt, size)
-	char *pt;
-	size_t size;
-{
-	struct dirent *dp;
-	DIR *dir = NULL;
-	dev_t dev;
-	ino_t ino;
-	int first;
-	char *bpt, *bup;
-	struct stat s;
-	dev_t root_dev;
-	ino_t root_ino;
-	size_t ptsize, upsize;
-	int save_errno;
-	char *ept, *eup, *up, c;
-
-	/*
-	 * If no buffer specified by the user, allocate one as necessary.
-	 * If a buffer is specified, the size has to be non-zero.  The path
-	 * is built from the end of the buffer backwards.
-	 */
-	if (pt) {
-		ptsize = 0;
-		if (!size) {
-			errno = EINVAL;
-			return (NULL);
-		}
-		if (size == 1) {
-			errno = ERANGE;
-			return (NULL);
-		}
-		ept = pt + size;
-	} else {
-		if ((pt = malloc(ptsize = PATH_MAX)) == NULL)
-			return (NULL);
-		ept = pt + ptsize;
-	}
-	if (__getcwd(pt, ept - pt) == 0) {
-		if (*pt != '/') {
-			bpt = pt;
-			ept = pt + strlen(pt) - 1;
-			while (bpt < ept) {
-				c = *bpt;
-				*bpt++ = *ept;
-				*ept-- = c;
-			}
-		}
-		return (pt);
-	}
-	bpt = ept - 1;
-	*bpt = '\0';
-
-	/*
-	 * Allocate 1024 bytes for the string of "../"'s.
-	 * Should always be enough.  If it's not, allocate
-	 * as necessary.  Special case the first stat, it's ".", not "..".
-	 */
-	if ((up = malloc(upsize = 1024)) == NULL)
-		goto err;
-	eup = up + upsize;
-	bup = up;
-	up[0] = '.';
-	up[1] = '\0';
-
-	/* Save root values, so know when to stop. */
-	if (stat("/", &s))
-		goto err;
-	root_dev = s.st_dev;
-	root_ino = s.st_ino;
-
-	errno = 0;			/* XXX readdir has no error return. */
-
-	for (first = 1;; first = 0) {
-		/* Stat the current level. */
-		if (lstat(up, &s))
-			goto err;
-
-		/* Save current node values. */
-		ino = s.st_ino;
-		dev = s.st_dev;
-
-		/* Check for reaching root. */
-		if (root_dev == dev && root_ino == ino) {
-			*--bpt = '/';
-			/*
-			 * It's unclear that it's a requirement to copy the
-			 * path to the beginning of the buffer, but it's always
-			 * been that way and stuff would probably break.
-			 */
-			bcopy(bpt, pt, ept - bpt);
-			free(up);
-			return (pt);
-		}
-
-		/*
-		 * Build pointer to the parent directory, allocating memory
-		 * as necessary.  Max length is 3 for "../", the largest
-		 * possible component name, plus a trailing NUL.
-		 */
-		while (bup + 3  + MAXNAMLEN + 1 >= eup) {
-			if ((up = reallocf(up, upsize *= 2)) == NULL)
-				goto err;
-			bup = up;
-			eup = up + upsize;
-		}
-		*bup++ = '.';
-		*bup++ = '.';
-		*bup = '\0';
-
-		/* Open and stat parent directory. */
-		if (!(dir = opendir(up)) || _fstat(dirfd(dir), &s))
-			goto err;
-
-		/* Add trailing slash for next directory. */
-		*bup++ = '/';
-		*bup = '\0';
-
-		/*
-		 * If it's a mount point, have to stat each element because
-		 * the inode number in the directory is for the entry in the
-		 * parent directory, not the inode number of the mounted file.
-		 */
-		save_errno = 0;
-		if (s.st_dev == dev) {
-			for (;;) {
-				if (!(dp = readdir(dir)))
-					goto notfound;
-				if (dp->d_fileno == ino)
-					break;
-			}
-		} else
-			for (;;) {
-				if (!(dp = readdir(dir)))
-					goto notfound;
-				if (ISDOT(dp))
-					continue;
-				bcopy(dp->d_name, bup, dp->d_namlen + 1);
-
-				/* Save the first error for later. */
-				if (lstat(up, &s)) {
-					if (!save_errno)
-						save_errno = errno;
-					errno = 0;
-					continue;
-				}
-				if (s.st_dev == dev && s.st_ino == ino)
-					break;
-			}
-
-		/*
-		 * Check for length of the current name, preceding slash,
-		 * leading slash.
-		 */
-		while (bpt - pt < dp->d_namlen + (first ? 1 : 2)) {
-			size_t len, off;
-
-			if (!ptsize) {
-				errno = ERANGE;
-				goto err;
-			}
-			off = bpt - pt;
-			len = ept - bpt;
-			if ((pt = reallocf(pt, ptsize *= 2)) == NULL)
-				goto err;
-			bpt = pt + off;
-			ept = pt + ptsize;
-			bcopy(bpt, ept - len, len);
-			bpt = ept - len;
-		}
-		if (!first)
-			*--bpt = '/';
-		bpt -= dp->d_namlen;
-		bcopy(dp->d_name, bpt, dp->d_namlen);
-		(void) closedir(dir);
-		dir = NULL;
-
-		/* Truncate any file name. */
-		*bup = '\0';
-	}
-
-notfound:
-	/*
-	 * If readdir set errno, use it, not any saved error; otherwise,
-	 * didn't find the current directory in its parent directory, set
-	 * errno to ENOENT.
-	 */
-	if (!errno)
-		errno = save_errno ? save_errno : ENOENT;
-	/* FALLTHROUGH */
-err:
-	save_errno = errno;
-
-	if (ptsize)
-		free(pt);
-	if (dir)
-		(void) closedir(dir);
-	free(up);
-
-	errno = save_errno;
-	return (NULL);
-}
diff --git a/lib/libc/gen/getdomainname.c b/lib/libc/gen/getdomainname.c
deleted file mode 100644
index 05441d7..0000000
--- a/lib/libc/gen/getdomainname.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getdomainname.c,v 1.7 2002/02/01 00:57:29 obrien Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <unistd.h>
-
-int
-getdomainname(name, namelen)
-	char *name;
-	int namelen;
-{
-	int mib[2];
-	size_t size;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_NISDOMAINNAME;
-	size = namelen;
-	if (sysctl(mib, 2, name, &size, NULL, 0) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc/gen/getgrent.c b/lib/libc/gen/getgrent.c
deleted file mode 100644
index 53e7c73..0000000
--- a/lib/libc/gen/getgrent.c
+++ /dev/null
@@ -1,1162 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- *
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getgrent.c,v 1.32.8.2 2006/07/28 16:17:49 maxim Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <ctype.h>
-#include <errno.h>
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-#include <grp.h>
-#include <nsswitch.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "nss_tls.h"
-
-
-enum constants {
-	GRP_STORAGE_INITIAL	= 1 << 10, /* 1 KByte */
-	GRP_STORAGE_MAX		= 1 << 20, /* 1 MByte */
-	SETGRENT		= 1,
-	ENDGRENT		= 2,
-	HESIOD_NAME_MAX		= 256,
-};
-
-static const ns_src defaultsrc[] = {
-	{ NSSRC_COMPAT, NS_SUCCESS },
-	{ NULL, 0 }
-};
-
-int	 __gr_match_entry(const char *, size_t, enum nss_lookup_type,
-	    const char *, gid_t);
-int	 __gr_parse_entry(char *, size_t, struct group *, char *, size_t,
-	    int *);
-
-static	int	 is_comment_line(const char *, size_t);
-
-union key {
-	const char	*name;
-	gid_t		 gid;
-};
-static	struct group *getgr(int (*)(union key, struct group *, char *, size_t,
-		    struct group **), union key);
-static	int	 wrap_getgrnam_r(union key, struct group *, char *, size_t,
-		    struct group **);
-static	int	 wrap_getgrgid_r(union key, struct group *, char *, size_t,
-		    struct group **);
-static	int	 wrap_getgrent_r(union key, struct group *, char *, size_t,
-		    struct group **);
-
-struct files_state {
-	FILE	*fp;
-	int	 stayopen;
-};
-static	void	 files_endstate(void *);
-NSS_TLS_HANDLING(files);
-static	int	 files_setgrent(void *, void *, va_list);
-static	int	 files_group(void *, void *, va_list);
-
-
-#ifdef HESIOD
-struct dns_state {
-	long	counter;
-};
-static	void	 dns_endstate(void *);
-NSS_TLS_HANDLING(dns);
-static	int	 dns_setgrent(void *, void *, va_list);
-static	int	 dns_group(void *, void *, va_list);
-#endif
-
-
-#ifdef YP
-struct nis_state {
-	char	 domain[MAXHOSTNAMELEN];
-	int	 done;
-	char	*key;
-	int	 keylen;
-};
-static	void	 nis_endstate(void *);
-NSS_TLS_HANDLING(nis);
-static	int	 nis_setgrent(void *, void *, va_list);
-static	int	 nis_group(void *, void *, va_list);
-#endif
-
-struct compat_state {
-	FILE	*fp;
-	int	 stayopen;
-	char	*name;
-	enum _compat {
-		COMPAT_MODE_OFF = 0,
-		COMPAT_MODE_ALL,
-		COMPAT_MODE_NAME
-	}	 compat;
-};
-static	void	 compat_endstate(void *);
-NSS_TLS_HANDLING(compat);
-static	int	 compat_setgrent(void *, void *, va_list);
-static	int	 compat_group(void *, void *, va_list);
-
-
-/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */
-int				
-setgrent(void)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setgrent, (void *)SETGRENT },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setgrent, (void *)SETGRENT },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setgrent, (void *)SETGRENT },
-#endif
-		{ NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT },
-		{ NULL, NULL, NULL }
-	};
-	(void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc, 0);
-	return (1);
-}
-
-
-int
-setgroupent(int stayopen)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setgrent, (void *)SETGRENT },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setgrent, (void *)SETGRENT },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setgrent, (void *)SETGRENT },
-#endif
-		{ NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT },
-		{ NULL, NULL, NULL }
-	};
-	(void)_nsdispatch(NULL, dtab, NSDB_GROUP, "setgrent", defaultsrc,
-	    stayopen);
-	return (1);
-}
-
-
-void
-endgrent(void)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setgrent, (void *)ENDGRENT },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setgrent, (void *)ENDGRENT },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setgrent, (void *)ENDGRENT },
-#endif
-		{ NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT },
-		{ NULL, NULL, NULL }
-	};
-	(void)_nsdispatch(NULL, dtab, NSDB_GROUP, "endgrent", defaultsrc);
-}
-
-
-int
-getgrent_r(struct group *grp, char *buffer, size_t bufsize,
-    struct group **result)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_group, (void *)nss_lt_all },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_group, (void *)nss_lt_all },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_group, (void *)nss_lt_all },
-#endif
-		{ NSSRC_COMPAT, compat_group, (void *)nss_lt_all },
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrent_r", defaultsrc,
-	    grp, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-int
-getgrnam_r(const char *name, struct group *grp, char *buffer, size_t bufsize,
-    struct group **result)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_group, (void *)nss_lt_name },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_group, (void *)nss_lt_name },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_group, (void *)nss_lt_name },
-#endif
-		{ NSSRC_COMPAT, compat_group, (void *)nss_lt_name },
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrnam_r", defaultsrc,
-	    name, grp, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-int
-getgrgid_r(gid_t gid, struct group *grp, char *buffer, size_t bufsize,
-    struct group **result)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_group, (void *)nss_lt_id },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_group, (void *)nss_lt_id },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_group, (void *)nss_lt_id },
-#endif
-		{ NSSRC_COMPAT, compat_group, (void *)nss_lt_id },
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrgid_r", defaultsrc,
-	    gid, grp, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-static struct group	 grp;
-static char		*grp_storage;
-static size_t		 grp_storage_size;
-
-static struct group *
-getgr(int (*fn)(union key, struct group *, char *, size_t, struct group **),
-    union key key)
-{
-	int		 rv;
-	struct group	*res;
-
-	if (grp_storage == NULL) {
-		grp_storage = malloc(GRP_STORAGE_INITIAL);
-		if (grp_storage == NULL)
-			return (NULL);
-		grp_storage_size = GRP_STORAGE_INITIAL;
-	}
-	do {
-		rv = fn(key, &grp, grp_storage, grp_storage_size, &res);
-		if (res == NULL && rv == ERANGE) {
-			free(grp_storage);
-			if ((grp_storage_size << 1) > GRP_STORAGE_MAX) {
-				grp_storage = NULL;
-				errno = ERANGE;
-				return (NULL);
-			}
-			grp_storage_size <<= 1;
-			grp_storage = malloc(grp_storage_size);
-			if (grp_storage == NULL)
-				return (NULL);
-		}
-	} while (res == NULL && rv == ERANGE);
-	if (rv != 0)
-		errno = rv;
-	return (res);
-}
-
-
-static int
-wrap_getgrnam_r(union key key, struct group *grp, char *buffer, size_t bufsize,
-    struct group **res)
-{
-	return (getgrnam_r(key.name, grp, buffer, bufsize, res));
-}
-
-
-static int
-wrap_getgrgid_r(union key key, struct group *grp, char *buffer, size_t bufsize,
-    struct group **res)
-{
-	return (getgrgid_r(key.gid, grp, buffer, bufsize, res));
-}
-
-
-static int
-wrap_getgrent_r(union key key __unused, struct group *grp, char *buffer,
-    size_t bufsize, struct group **res)
-{
-	return (getgrent_r(grp, buffer, bufsize, res));
-}
-
-
-struct group *
-getgrnam(const char *name)
-{
-	union key key;
-
-	key.name = name;
-	return (getgr(wrap_getgrnam_r, key));
-}
-
-
-struct group *
-getgrgid(gid_t gid)
-{
-	union key key;
-
-	key.gid = gid;
-	return (getgr(wrap_getgrgid_r, key));
-}
-
-
-struct group *
-getgrent(void)
-{
-	union key key;
-
-	key.gid = 0; /* not used */
-	return (getgr(wrap_getgrent_r, key));
-}
-
-
-static int
-is_comment_line(const char *s, size_t n)
-{
-	const char	*eom;
-
-	eom = &s[n];
-
-	for (; s < eom; s++)
-		if (*s == '#' || !isspace((unsigned char)*s))
-			break;
-	return (*s == '#' || s == eom);
-}
-
-
-/*
- * files backend
- */
-static void
-files_endstate(void *p)
-{
-
-	if (p == NULL)
-		return;
-	if (((struct files_state *)p)->fp != NULL)
-		fclose(((struct files_state *)p)->fp);
-	free(p);
-}
-
-
-static int
-files_setgrent(void *retval, void *mdata, va_list ap)
-{
-	struct files_state *st;
-	int		 rv, stayopen;
-
-	rv = files_getstate(&st);
-	if (rv != 0) 
-		return (NS_UNAVAIL);
-	switch ((enum constants)mdata) {
-	case SETGRENT:
-		stayopen = va_arg(ap, int);
-		if (st->fp != NULL)
-			rewind(st->fp);
-		else if (stayopen)
-			st->fp = fopen(_PATH_GROUP, "r");
-		break;
-	case ENDGRENT:
-		if (st->fp != NULL) {
-			fclose(st->fp);
-			st->fp = NULL;
-		}
-		break;
-	default:
-		break;
-	}
-	return (NS_UNAVAIL);
-}
-
-
-static int
-files_group(void *retval, void *mdata, va_list ap)
-{
-	struct files_state	*st;
-	enum nss_lookup_type	 how;
-	const char		*name, *line;
-	struct group		*grp;
-	gid_t			 gid;
-	char			*buffer;
-	size_t			 bufsize, linesize;
-	off_t			 pos;
-	int			 rv, stayopen, *errnop;
-
-	name = NULL;
-	gid = (gid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		return (NS_NOTFOUND);
-	}
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	*errnop = files_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (st->fp == NULL &&
-	    ((st->fp = fopen(_PATH_GROUP, "r")) == NULL)) {
-		*errnop = errno;
-		return (NS_UNAVAIL);
-	}
-	if (how == nss_lt_all)
-		stayopen = 1;
-	else {
-		rewind(st->fp);
-		stayopen = st->stayopen;
-	}
-	rv = NS_NOTFOUND;
-	pos = ftello(st->fp);
-	while ((line = fgetln(st->fp, &linesize)) != NULL) {
-		if (line[linesize-1] == '\n')
-			linesize--;
-		rv = __gr_match_entry(line, linesize, how, name, gid);
-		if (rv != NS_SUCCESS)
-			continue;
-		/* We need room at least for the line, a string NUL
-		 * terminator, alignment padding, and one (char *)
-		 * pointer for the member list terminator.
-		 */
-		if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-		memcpy(buffer, line, linesize);
-		buffer[linesize] = '\0';
-		rv = __gr_parse_entry(buffer, linesize, grp, 
-		    &buffer[linesize + 1], bufsize - linesize - 1, errnop);
-		if (rv & NS_TERMINATE)
-			break;
-		pos = ftello(st->fp);
-	}
-	if (!stayopen && st->fp != NULL) {
-		fclose(st->fp);
-		st->fp = NULL;
-	}
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct group **)retval = grp;
-	else if (*errnop == ERANGE)
-		fseeko(st->fp, pos, SEEK_SET);
-	return (rv);
-}
-
-
-#ifdef HESIOD
-/*
- * dns backend
- */
-static void
-dns_endstate(void *p)
-{
-
-	free(p);
-}
-
-
-static int
-dns_setgrent(void *retval, void *cb_data, va_list ap)
-{
-	struct dns_state	*st;
-	int			 rv;
-
-	rv = dns_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	st->counter = 0;
-	return (NS_UNAVAIL);
-}
-
-
-static int
-dns_group(void *retval, void *mdata, va_list ap)
-{
-	char			 buf[HESIOD_NAME_MAX];
-	struct dns_state	*st;
-	struct group		*grp;
-	const char		*name, *label;
-	void			*ctx;
-	char			*buffer, **hes;
-	size_t			 bufsize, adjsize, linesize;
-	gid_t			 gid;
-	enum nss_lookup_type	 how;
-	int			 rv, *errnop;
-
-	ctx = NULL;
-	hes = NULL;
-	name = NULL;
-	gid = (gid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
-	case nss_lt_all:
-		break;
-	}
-	grp     = va_arg(ap, struct group *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop  = va_arg(ap, int *);
-	*errnop = dns_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (hesiod_init(&ctx) != 0) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	do {
-		rv = NS_NOTFOUND;
-		switch (how) {
-		case nss_lt_name:
-			label = name;
-			break;
-		case nss_lt_id:
-			if (snprintf(buf, sizeof(buf), "%lu",
-			    (unsigned long)gid) >= sizeof(buf))
-				goto fin;
-			label = buf;
-			break;
-		case nss_lt_all:
-			if (st->counter < 0)
-				goto fin;
-			if (snprintf(buf, sizeof(buf), "group-%ld",
-			    st->counter++) >= sizeof(buf))
-				goto fin;
-			label = buf;
-			break;
-		}
-		hes = hesiod_resolve(ctx, label,
-		    how == nss_lt_id ? "gid" : "group");
-		if ((how == nss_lt_id && hes == NULL &&
-		    (hes = hesiod_resolve(ctx, buf, "group")) == NULL) ||
-		    hes == NULL) {
-			if (how == nss_lt_all)
-				st->counter = -1;
-			if (errno != ENOENT)
-				*errnop = errno;
-			goto fin;
-		}
-		rv = __gr_match_entry(hes[0], strlen(hes[0]), how, name, gid);
-		if (rv != NS_SUCCESS) {
-			hesiod_free_list(ctx, hes);
-			hes = NULL;
-			continue;
-		}
-		/* We need room at least for the line, a string NUL
-		 * terminator, alignment padding, and one (char *)
-		 * pointer for the member list terminator.
-		 */
-		adjsize = bufsize - _ALIGNBYTES - sizeof(char *);
-		linesize = strlcpy(buffer, hes[0], adjsize);
-		if (linesize >= adjsize) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			goto fin;
-		}
-		hesiod_free_list(ctx, hes);
-		hes = NULL;
-		rv = __gr_parse_entry(buffer, linesize, grp,
-		    &buffer[linesize + 1], bufsize - linesize - 1, errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (hes != NULL)
-		hesiod_free_list(ctx, hes);
-	if (ctx != NULL)
-		hesiod_end(ctx);
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct group **)retval = grp;
-	return (rv);
-}
-#endif /* HESIOD */
-
-
-#ifdef YP
-/*
- * nis backend
- */
-static void
-nis_endstate(void *p)
-{
-
-	if (p == NULL)
-		return;
-	free(((struct nis_state *)p)->key);
-	free(p);
-}
-
-
-static int
-nis_setgrent(void *retval, void *cb_data, va_list ap)
-{
-	struct nis_state	*st;
-	int			 rv;
-
-	rv = nis_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	st->done = 0;
-	free(st->key);
-	st->key = NULL;
-	return (NS_UNAVAIL);
-}
-
-
-static int
-nis_group(void *retval, void *mdata, va_list ap)
-{
-	char		 *map;
-	struct nis_state *st;
-	struct group	*grp;
-	const char	*name;
-	char		*buffer, *key, *result;
-	size_t		 bufsize;
-	gid_t		 gid;
-	enum nss_lookup_type how;
-	int		*errnop, keylen, resultlen, rv;
-	
-	name = NULL;
-	gid = (gid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		map = "group.byname";
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		map = "group.bygid";
-		break;
-	case nss_lt_all:
-		map = "group.byname";
-		break;
-	}
-	grp     = va_arg(ap, struct group *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop  = va_arg(ap, int *);
-	*errnop = nis_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (st->domain[0] == '\0') {
-		if (getdomainname(st->domain, sizeof(st->domain)) != 0) {
-			*errnop = errno;
-			return (NS_UNAVAIL);
-		}
-	}
-	result = NULL;
-	do {
-		rv = NS_NOTFOUND;
-		switch (how) {
-		case nss_lt_name:
-			if (strlcpy(buffer, name, bufsize) >= bufsize)
-				goto erange;
-			break;
-		case nss_lt_id:
-			if (snprintf(buffer, bufsize, "%lu",
-			    (unsigned long)gid) >= bufsize)
-				goto erange;
-			break;
-		case nss_lt_all:
-			if (st->done)
-				goto fin;
-			break;
-		}
-		result = NULL;
-		if (how == nss_lt_all) {
-			if (st->key == NULL)
-				rv = yp_first(st->domain, map, &st->key,
-				    &st->keylen, &result, &resultlen);
-			else {
-				key = st->key;
-				keylen = st->keylen;
-				st->key = NULL;
-				rv = yp_next(st->domain, map, key, keylen,
-				    &st->key, &st->keylen, &result,
-				    &resultlen);
-				free(key);
-			}
-			if (rv != 0) {
-				free(result);
-				free(st->key);
-				st->key = NULL;
-				if (rv == YPERR_NOMORE) {
-					st->done = 1;
-					rv = NS_NOTFOUND;
-				} else
-					rv = NS_UNAVAIL;
-				goto fin;
-			}
-		} else {
-			rv = yp_match(st->domain, map, buffer, strlen(buffer),
-			    &result, &resultlen);
-			if (rv == YPERR_KEY) {
-				rv = NS_NOTFOUND;
-				continue;
-			} else if (rv != 0) {
-				free(result);
-				rv = NS_UNAVAIL;
-				continue;
-			}
-		}
-		/* We need room at least for the line, a string NUL
-		 * terminator, alignment padding, and one (char *)
-		 * pointer for the member list terminator.
-		 */
-		if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *))
-			goto erange;
-		memcpy(buffer, result, resultlen);
-		buffer[resultlen] = '\0';
-		free(result);
-		rv = __gr_match_entry(buffer, resultlen, how, name, gid);
-		if (rv == NS_SUCCESS)
-			rv = __gr_parse_entry(buffer, resultlen, grp,
-			    &buffer[resultlen+1], bufsize - resultlen - 1,
-			    errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct group **)retval = grp;
-	return (rv);	
-erange:
-	*errnop = ERANGE;
-	return (NS_RETURN);
-}
-#endif /* YP */
-
-
-
-/*
- * compat backend
- */
-static void
-compat_endstate(void *p)
-{
-	struct compat_state *st;
-
-	if (p == NULL)
-		return;
-	st = (struct compat_state *)p;
-	free(st->name);
-	if (st->fp != NULL)
-		fclose(st->fp);
-	free(p);
-}
-
-
-static int
-compat_setgrent(void *retval, void *mdata, va_list ap)
-{
-	static const ns_src compatsrc[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab dtab[] = {
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setgrent, NULL },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setgrent, NULL },
-#endif
-		{ NULL, NULL, NULL }
-	};
-	struct compat_state *st;
-	int		 rv, stayopen;
-
-#define set_setent(x, y) do {	 				\
-	int i;							\
-								\
-	for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++)	\
-		x[i].mdata = (void *)y;				\
-} while (0)
-
-	rv = compat_getstate(&st);
-	if (rv != 0) 
-		return (NS_UNAVAIL);
-	switch ((enum constants)mdata) {
-	case SETGRENT:
-		stayopen = va_arg(ap, int);
-		if (st->fp != NULL)
-			rewind(st->fp);
-		else if (stayopen)
-			st->fp = fopen(_PATH_GROUP, "r");
-		set_setent(dtab, mdata);
-		(void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "setgrent",
-		    compatsrc, 0);
-		break;
-	case ENDGRENT:
-		if (st->fp != NULL) {
-			fclose(st->fp);
-			st->fp = NULL;
-		}
-		set_setent(dtab, mdata);
-		(void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "endgrent",
-		    compatsrc, 0);
-		break;
-	default:
-		break;
-	}
-	st->compat = COMPAT_MODE_OFF;
-	free(st->name);
-	st->name = NULL;
-	return (NS_UNAVAIL);
-#undef set_setent
-}
-
-
-static int
-compat_group(void *retval, void *mdata, va_list ap)
-{
-	static const ns_src compatsrc[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab dtab[] = {
-#ifdef YP
-		{ NSSRC_NIS, nis_group, NULL },
-#endif
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_group, NULL },
-#endif
-		{ NULL, NULL, NULL }
-	};
-	struct compat_state	*st;
-	enum nss_lookup_type	 how;
-	const char		*name, *line;
-	struct group		*grp;
-	gid_t			 gid;
-	char			*buffer, *p;
-	void			*discard;
-	size_t			 bufsize, linesize;
-	off_t			 pos;
-	int			 rv, stayopen, *errnop;
-
-#define set_lookup_type(x, y) do { 				\
-	int i;							\
-								\
-	for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++)	\
-		x[i].mdata = (void *)y;				\
-} while (0)
-
-	name = NULL;
-	gid = (gid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		return (NS_NOTFOUND);
-	}
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	*errnop = compat_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (st->fp == NULL &&
-	    ((st->fp = fopen(_PATH_GROUP, "r")) == NULL)) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	if (how == nss_lt_all)
-		stayopen = 1;
-	else {
-		rewind(st->fp);
-		stayopen = st->stayopen;
-	}
-docompat:
-	switch (st->compat) {
-	case COMPAT_MODE_ALL:
-		set_lookup_type(dtab, how);
-		switch (how) {
-		case nss_lt_all:
-			rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT,
-			    "getgrent_r", compatsrc, grp, buffer, bufsize,
-			    errnop);
-			break;
-		case nss_lt_id:
-			rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT,
-			    "getgrgid_r", compatsrc, gid, grp, buffer, bufsize,
-			    errnop);
-			break;
-		case nss_lt_name:
-			rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT,
-			    "getgrnam_r", compatsrc, name, grp, buffer,
-			    bufsize, errnop);
-			break;
-		}
-		if (rv & NS_TERMINATE)
-			goto fin;
-		st->compat = COMPAT_MODE_OFF;
-		break;
-	case COMPAT_MODE_NAME:
-		set_lookup_type(dtab, nss_lt_name);
-		rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT,
-		    "getgrnam_r", compatsrc, st->name, grp, buffer, bufsize,
-		    errnop);
-		switch (rv) {
-		case NS_SUCCESS:
-			switch (how) {
-			case nss_lt_name:
-				if (strcmp(name, grp->gr_name) != 0)
-					rv = NS_NOTFOUND;
-				break;
-			case nss_lt_id:
-				if (gid != grp->gr_gid)
-					rv = NS_NOTFOUND;
-				break;
-			default:
-				break;
-			}
-			break;
-		case NS_RETURN:
-			goto fin;
-		default:
-			break;
-		}
-		free(st->name);
-		st->name = NULL;
-		st->compat = COMPAT_MODE_OFF;
-		if (rv == NS_SUCCESS)
-			goto fin;
-		break;
-	default:
-		break;
-	}
-	rv = NS_NOTFOUND;
-	pos = ftello(st->fp);
-	while ((line = fgetln(st->fp, &linesize)) != NULL) {
-		if (line[linesize-1] == '\n')
-			linesize--;
-		if (linesize > 2 && line[0] == '+') {
-			p = memchr(&line[1], ':', linesize);
-			if (p == NULL || p == &line[1])
-				st->compat = COMPAT_MODE_ALL;
-			else {
-				st->name = malloc(p - line);
-				if (st->name == NULL) {
-					syslog(LOG_ERR,
-					 "getgrent memory allocation failure");
-					*errnop = ENOMEM;
-					rv = NS_UNAVAIL;
-					break;
-				}
-				memcpy(st->name, &line[1], p - line - 1);
-				st->name[p - line - 1] = '\0';
-				st->compat = COMPAT_MODE_NAME;
-			}
-			goto docompat;
-		} 
-		rv = __gr_match_entry(line, linesize, how, name, gid);
-		if (rv != NS_SUCCESS)
-			continue;
-		/* We need room at least for the line, a string NUL
-		 * terminator, alignment padding, and one (char *)
-		 * pointer for the member list terminator.
-		 */
-		if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-		memcpy(buffer, line, linesize);
-		buffer[linesize] = '\0';
-		rv = __gr_parse_entry(buffer, linesize, grp, 
-		    &buffer[linesize + 1], bufsize - linesize - 1, errnop);
-		if (rv & NS_TERMINATE)
-			break;
-		pos = ftello(st->fp);
-	}
-fin:
-	if (!stayopen && st->fp != NULL) {
-		fclose(st->fp);
-		st->fp = NULL;
-	}
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct group **)retval = grp;
-	else if (*errnop == ERANGE)
-		fseeko(st->fp, pos, SEEK_SET);
-	return (rv);
-#undef set_lookup_type
-}
-
-
-/*
- * common group line matching and parsing
- */
-int
-__gr_match_entry(const char *line, size_t linesize, enum nss_lookup_type how,
-    const char *name, gid_t gid)
-{
-	size_t		 namesize;
-	const char	*p, *eol;
-	char		*q;
-	unsigned long	 n;
-	int		 i, needed;
-
-	if (linesize == 0 || is_comment_line(line, linesize))
-		return (NS_NOTFOUND);
-	switch (how) {
-	case nss_lt_name:	needed = 1; break;
-	case nss_lt_id:		needed = 2; break;
-	default:		needed = 2; break;
-	}
-	eol = &line[linesize];
-	for (p = line, i = 0; i < needed && p < eol; p++)
-		if (*p == ':')
-			i++;
-	if (i < needed)
-		return (NS_NOTFOUND);
-	switch (how) {
-	case nss_lt_name:
-		namesize = strlen(name);
-		if (namesize + 1 == (size_t)(p - line) &&
-		    memcmp(line, name, namesize) == 0)
-			return (NS_SUCCESS);
-		break;
-	case nss_lt_id:
-		n = strtoul(p, &q, 10);
-		if (q < eol && *q == ':' && gid == (gid_t)n)
-			return (NS_SUCCESS);
-		break;
-	case nss_lt_all:
-		return (NS_SUCCESS);
-	default:
-		break;
-	}
-	return (NS_NOTFOUND);
-}
-
-
-int
-__gr_parse_entry(char *line, size_t linesize, struct group *grp, char *membuf,
-    size_t membufsize, int *errnop)
-{
-	char	       *s_gid, *s_mem, *p, **members;
-	unsigned long	n;
-	int		maxmembers;
-
-	memset(grp, 0, sizeof(*grp));
-	members = (char **)_ALIGN(membuf);
-	membufsize -= (char *)members - membuf;
-	maxmembers = membufsize / sizeof(*members);
-	if (maxmembers <= 0 ||
-	    (grp->gr_name = strsep(&line, ":")) == NULL ||
-	    grp->gr_name[0] == '\0' ||
-	    (grp->gr_passwd = strsep(&line, ":")) == NULL ||
-	    (s_gid = strsep(&line, ":")) == NULL ||
-	    s_gid[0] == '\0')
-		return (NS_NOTFOUND);
-	s_mem = line;
-	n = strtoul(s_gid, &s_gid, 10);
-	if (s_gid[0] != '\0')
-		return (NS_NOTFOUND);
-	grp->gr_gid = (gid_t)n;
-	grp->gr_mem = members;
-	while (maxmembers > 1 && s_mem != NULL) {
-		p = strsep(&s_mem, ",");
-		if (p != NULL && *p != '\0') {
-			*members++ = p;
-			maxmembers--;
-		}
-	}
-	*members = NULL;
-	if (s_mem == NULL)
-		return (NS_SUCCESS);
-	else {
-		*errnop = ERANGE;
-		return (NS_RETURN);
-	}
-}
diff --git a/lib/libc/gen/getgrouplist.c b/lib/libc/gen/getgrouplist.c
deleted file mode 100644
index 3fa62c5..0000000
--- a/lib/libc/gen/getgrouplist.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getgrouplist.c,v 1.14 2005/05/03 16:20:03 delphij Exp $");
-
-/*
- * get credential
- */
-#include <sys/types.h>
-
-#include <grp.h>
-#include <string.h>
-#include <unistd.h>
-
-int
-getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-{
-	const struct group *grp;
-	int i, maxgroups, ngroups, ret;
-
-	ret = 0;
-	ngroups = 0;
-	maxgroups = *grpcnt;
-	/*
-	 * When installing primary group, duplicate it;
-	 * the first element of groups is the effective gid
-	 * and will be overwritten when a setgid file is executed.
-	 */
-	groups[ngroups++] = agroup;
-	if (maxgroups > 1)
-		groups[ngroups++] = agroup;
-	/*
-	 * Scan the group file to find additional groups.
-	 */
-	setgrent();
-	while ((grp = getgrent()) != NULL) {
-		for (i = 0; i < ngroups; i++) {
-			if (grp->gr_gid == groups[i])
-				goto skip;
-		}
-		for (i = 0; grp->gr_mem[i]; i++) {
-			if (!strcmp(grp->gr_mem[i], uname)) {
-				if (ngroups >= maxgroups) {
-					ret = -1;
-					break;
-				}
-				groups[ngroups++] = grp->gr_gid;
-				break;
-			}
-		}
-skip:
-		;
-	}
-	endgrent();
-	*grpcnt = ngroups;
-	return (ret);
-}
diff --git a/lib/libc/gen/gethostname.c b/lib/libc/gen/gethostname.c
deleted file mode 100644
index 9071be2..0000000
--- a/lib/libc/gen/gethostname.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/gethostname.c,v 1.5 2003/08/19 23:01:46 wollman Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-
-int
-gethostname(name, namelen)
-	char *name;
-	size_t namelen;
-{
-	int mib[2];
-
-	/* Kluge to avoid ABI breakage. */
-	namelen = (int)namelen;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTNAME;
-	if (sysctl(mib, 2, name, &namelen, NULL, 0) == -1) {
-		if (errno == ENOMEM)
-			errno = ENAMETOOLONG;
-		return (-1);
-	}
-	return (0);
-}
diff --git a/lib/libc/gen/getloadavg.c b/lib/libc/gen/getloadavg.c
deleted file mode 100644
index c3450f1..0000000
--- a/lib/libc/gen/getloadavg.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getloadavg.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getloadavg.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/sysctl.h>
-#include <vm/vm_param.h>
-
-#include <stdlib.h>
-
-/*
- * getloadavg() -- Get system load averages.
- *
- * Put `nelem' samples into `loadavg' array.
- * Return number of samples retrieved, or -1 on error.
- */
-int
-getloadavg(loadavg, nelem)
-	double loadavg[];
-	int nelem;
-{
-	struct loadavg loadinfo;
-	int i, mib[2];
-	size_t size;
-
-	mib[0] = CTL_VM;
-	mib[1] = VM_LOADAVG;
-	size = sizeof(loadinfo);
-	if (sysctl(mib, 2, &loadinfo, &size, NULL, 0) < 0)
-		return (-1);
-
-	nelem = MIN(nelem, sizeof(loadinfo.ldavg) / sizeof(fixpt_t));
-	for (i = 0; i < nelem; i++)
-		loadavg[i] = (double) loadinfo.ldavg[i] / loadinfo.fscale;
-	return (nelem);
-}
diff --git a/lib/libc/gen/getlogin.c b/lib/libc/gen/getlogin.c
deleted file mode 100644
index 6e3208c..0000000
--- a/lib/libc/gen/getlogin.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getlogin.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getlogin.c,v 1.9 2003/10/29 10:45:01 tjr Exp $");
-
-#include <sys/param.h>
-#include <errno.h>
-#include <pwd.h>
-#include <utmp.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-#define	THREAD_LOCK()	if (__isthreaded) _pthread_mutex_lock(&logname_mutex)
-#define	THREAD_UNLOCK()	if (__isthreaded) _pthread_mutex_unlock(&logname_mutex)
-
-extern int		_getlogin(char *, int);
-
-int			_logname_valid;		/* known to setlogin() */
-static pthread_mutex_t	logname_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static char *
-getlogin_basic(int *status)
-{
-	static char logname[MAXLOGNAME];
-
-	if (_logname_valid == 0) {
-		if (_getlogin(logname, sizeof(logname)) < 0) {
-			*status = errno;
-			return (NULL);
-		}
-		_logname_valid = 1;
-	}
-	*status = 0;
-	return (*logname ? logname : NULL);
-}
-
-char *
-getlogin(void)
-{
-	char	*result;
-	int	status;
-
-	THREAD_LOCK();
-	result = getlogin_basic(&status);
-	THREAD_UNLOCK();
-	return (result);
-}
-
-int
-getlogin_r(char *logname, int namelen)
-{
-	char	*result;
-	int	len;
-	int	status;
-	
-	THREAD_LOCK();
-	result = getlogin_basic(&status);
-	if (status == 0) {
-		if ((len = strlen(result) + 1) > namelen)
-			status = ERANGE;
-		else
-			strncpy(logname, result, len);
-	}
-	THREAD_UNLOCK();
-	return (status);
-}
diff --git a/lib/libc/gen/getmntinfo.c b/lib/libc/gen/getmntinfo.c
deleted file mode 100644
index 383df1e..0000000
--- a/lib/libc/gen/getmntinfo.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getmntinfo.c,v 1.4 2002/02/01 00:57:29 obrien Exp $");
-
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-#include <stdlib.h>
-
-/*
- * Return information about mounted filesystems.
- */
-int
-getmntinfo(mntbufp, flags)
-	struct statfs **mntbufp;
-	int flags;
-{
-	static struct statfs *mntbuf;
-	static int mntsize;
-	static long bufsize;
-
-	if (mntsize <= 0 && (mntsize = getfsstat(0, 0, MNT_NOWAIT)) < 0)
-		return (0);
-	if (bufsize > 0 && (mntsize = getfsstat(mntbuf, bufsize, flags)) < 0)
-		return (0);
-	while (bufsize <= mntsize * sizeof(struct statfs)) {
-		if (mntbuf)
-			free(mntbuf);
-		bufsize = (mntsize + 1) * sizeof(struct statfs);
-		if ((mntbuf = (struct statfs *)malloc(bufsize)) == 0)
-			return (0);
-		if ((mntsize = getfsstat(mntbuf, bufsize, flags)) < 0)
-			return (0);
-	}
-	*mntbufp = mntbuf;
-	return (mntsize);
-}
diff --git a/lib/libc/gen/getnetgrent.c b/lib/libc/gen/getnetgrent.c
deleted file mode 100644
index de7d43b..0000000
--- a/lib/libc/gen/getnetgrent.c
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetgrent.c	8.2 (Berkeley) 4/27/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getnetgrent.c,v 1.33.2.1 2005/10/07 19:38:07 jon Exp $");
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef YP
-/*
- * Notes:
- * We want to be able to use NIS netgroups properly while retaining
- * the ability to use a local /etc/netgroup file. Unfortunately, you
- * can't really do both at the same time - at least, not efficiently.
- * NetBSD deals with this problem by creating a netgroup database
- * using Berkeley DB (just like the password database) that allows
- * for lookups using netgroup, netgroup.byuser or netgroup.byhost
- * searches. This is a neat idea, but I don't have time to implement
- * something like that now. (I think ultimately it would be nice
- * if we DB-fied the group and netgroup stuff all in one shot, but
- * for now I'm satisfied just to have something that works well
- * without requiring massive code changes.)
- * 
- * Therefore, to still permit the use of the local file and maintain
- * optimum NIS performance, we allow for the following conditions:
- *
- * - If /etc/netgroup does not exist and NIS is turned on, we use
- *   NIS netgroups only.
- *
- * - If /etc/netgroup exists but is empty, we use NIS netgroups
- *   only.
- *
- * - If /etc/netgroup exists and contains _only_ a '+', we use
- *   NIS netgroups only.
- *
- * - If /etc/netgroup exists, contains locally defined netgroups
- *   and a '+', we use a mixture of NIS and the local entries.
- *   This method should return the same NIS data as just using
- *   NIS alone, but it will be slower if the NIS netgroup database
- *   is large (innetgr() in particular will suffer since extra
- *   processing has to be done in order to determine memberships
- *   using just the raw netgroup data).
- *
- * - If /etc/netgroup exists and contains only locally defined
- *   netgroup entries, we use just those local entries and ignore
- *   NIS (this is the original, pre-NIS behavior).
- */
-
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/errno.h>
-static char *_netgr_yp_domain;
-int _use_only_yp;
-static int _netgr_yp_enabled;
-static int _yp_innetgr;
-#endif
-
-#ifndef _PATH_NETGROUP
-#define _PATH_NETGROUP "/etc/netgroup"
-#endif
-
-/*
- * Static Variables and functions used by setnetgrent(), getnetgrent() and
- * endnetgrent().
- * There are two linked lists:
- * - linelist is just used by setnetgrent() to parse the net group file via.
- *   parse_netgrp()
- * - netgrp is the list of entries for the current netgroup
- */
-struct linelist {
-	struct linelist	*l_next;	/* Chain ptr. */
-	int		l_parsed;	/* Flag for cycles */
-	char		*l_groupname;	/* Name of netgroup */
-	char		*l_line;	/* Netgroup entrie(s) to be parsed */
-};
-
-struct netgrp {
-	struct netgrp	*ng_next;	/* Chain ptr */
-	char		*ng_str[3];	/* Field pointers, see below */
-};
-#define NG_HOST		0	/* Host name */
-#define NG_USER		1	/* User name */
-#define NG_DOM		2	/* and Domain name */
-
-static struct linelist	*linehead = (struct linelist *)0;
-static struct netgrp	*nextgrp = (struct netgrp *)0;
-static struct {
-	struct netgrp	*gr;
-	char		*grname;
-} grouphead = {
-	(struct netgrp *)0,
-	(char *)0,
-};
-static FILE *netf = (FILE *)0;
-
-static int parse_netgrp(const char *);
-static struct linelist *read_for_group(const char *);
-void setnetgrent(const char *);
-void endnetgrent(void);
-int getnetgrent(char **, char **, char **);
-int innetgr(const char *, const char *, const char *, const char *);
-
-#define	LINSIZ	1024	/* Length of netgroup file line */
-
-/*
- * setnetgrent()
- * Parse the netgroup file looking for the netgroup and build the list
- * of netgrp structures. Let parse_netgrp() and read_for_group() do
- * most of the work.
- */
-void
-setnetgrent(const char *group)
-{
-#ifdef YP
-	struct stat _yp_statp;
-	char _yp_plus;
-#endif
-
-	/* Sanity check */
-
-	if (group == NULL || !strlen(group))
-		return;
-
-	if (grouphead.gr == (struct netgrp *)0 ||
-		strcmp(group, grouphead.grname)) {
-		endnetgrent();
-#ifdef YP
-		/* Presumed guilty until proven innocent. */
-		_use_only_yp = 0;
-		/*
-		 * If /etc/netgroup doesn't exist or is empty,
-		 * use NIS exclusively.
-		 */
-		if (((stat(_PATH_NETGROUP, &_yp_statp) < 0) &&
-			errno == ENOENT) || _yp_statp.st_size == 0)
-			_use_only_yp = _netgr_yp_enabled = 1;
-		if ((netf = fopen(_PATH_NETGROUP,"r")) != NULL ||_use_only_yp){
-		/*
-		 * Icky: grab the first character of the netgroup file
-		 * and turn on NIS if it's a '+'. rewind the stream
-		 * afterwards so we don't goof up read_for_group() later.
-		 */
-			if (netf) {
-				fscanf(netf, "%c", &_yp_plus);
-				rewind(netf);
-				if (_yp_plus == '+')
-					_use_only_yp = _netgr_yp_enabled = 1;
-			}
-		/*
-		 * If we were called specifically for an innetgr()
-		 * lookup and we're in NIS-only mode, short-circuit
-		 * parse_netgroup() and cut directly to the chase.
-		 */
-			if (_use_only_yp && _yp_innetgr) {
-				/* dohw! */
-				if (netf != NULL)
-					fclose(netf);
-				return;
-			}
-#else
-		if ((netf = fopen(_PATH_NETGROUP, "r"))) {
-#endif
-			if (parse_netgrp(group))
-				endnetgrent();
-			else {
-				grouphead.grname = (char *)
-					malloc(strlen(group) + 1);
-				strcpy(grouphead.grname, group);
-			}
-			if (netf)
-				fclose(netf);
-		}
-	}
-	nextgrp = grouphead.gr;
-}
-
-/*
- * Get the next netgroup off the list.
- */
-int
-getnetgrent(char **hostp, char **userp, char **domp)
-{
-#ifdef YP
-	_yp_innetgr = 0;
-#endif
-
-	if (nextgrp) {
-		*hostp = nextgrp->ng_str[NG_HOST];
-		*userp = nextgrp->ng_str[NG_USER];
-		*domp = nextgrp->ng_str[NG_DOM];
-		nextgrp = nextgrp->ng_next;
-		return (1);
-	}
-	return (0);
-}
-
-/*
- * endnetgrent() - cleanup
- */
-void
-endnetgrent(void)
-{
-	struct linelist *lp, *olp;
-	struct netgrp *gp, *ogp;
-
-	lp = linehead;
-	while (lp) {
-		olp = lp;
-		lp = lp->l_next;
-		free(olp->l_groupname);
-		free(olp->l_line);
-		free((char *)olp);
-	}
-	linehead = (struct linelist *)0;
-	if (grouphead.grname) {
-		free(grouphead.grname);
-		grouphead.grname = (char *)0;
-	}
-	gp = grouphead.gr;
-	while (gp) {
-		ogp = gp;
-		gp = gp->ng_next;
-		if (ogp->ng_str[NG_HOST])
-			free(ogp->ng_str[NG_HOST]);
-		if (ogp->ng_str[NG_USER])
-			free(ogp->ng_str[NG_USER]);
-		if (ogp->ng_str[NG_DOM])
-			free(ogp->ng_str[NG_DOM]);
-		free((char *)ogp);
-	}
-	grouphead.gr = (struct netgrp *)0;
-	nextgrp = (struct netgrp *)0;
-#ifdef YP
-	_netgr_yp_enabled = 0;
-#endif
-}
-
-#ifdef YP
-static int
-_listmatch(const char *list, const char *group, int len)
-{
-	const char *ptr = list;
-	const char *cptr;
-	int glen = strlen(group);
-
-	/* skip possible leading whitespace */
-	while(isspace((unsigned char)*ptr))
-		ptr++;
-
-	while (ptr < list + len) {
-		cptr = ptr;
-		while(*ptr != ','  && *ptr != '\0' && !isspace((unsigned char)*ptr))
-			ptr++;
-		if (strncmp(cptr, group, glen) == 0 && glen == (ptr - cptr))
-			return(1);
-		while(*ptr == ','  || isspace((unsigned char)*ptr))
-			ptr++;
-	}
-
-	return(0);
-}
-
-static int
-_revnetgr_lookup(char* lookupdom, char* map, const char* str,
-		 const char* dom, const char* group)
-{
-	int y, rv, rot;
-	char key[MAXHOSTNAMELEN];
-	char *result;
-	int resultlen;
-
-	for (rot = 0; ; rot++) {
-		switch (rot) {
-			case(0): snprintf(key, MAXHOSTNAMELEN, "%s.%s",
-					  str, dom?dom:lookupdom);
-				 break;
-			case(1): snprintf(key, MAXHOSTNAMELEN, "%s.*",
-					  str);
-				 break;
-			case(2): snprintf(key, MAXHOSTNAMELEN, "*.%s",
-					  dom?dom:lookupdom);
-				 break;
-			case(3): snprintf(key, MAXHOSTNAMELEN, "*.*");
-				 break;
-			default: return(0);
-		}
-		y = yp_match(lookupdom, map, key, strlen(key), &result,
-			     &resultlen);
-		if (y == 0) {
-			rv = _listmatch(result, group, resultlen);
-			free(result);
-			if (rv) return(1);
-		} else if (y != YPERR_KEY) {
-			/*
-			 * If we get an error other than 'no
-			 * such key in map' then something is
-			 * wrong and we should stop the search.
-			 */
-			return(-1);
-		}
-	}
-}
-#endif
-
-/*
- * Search for a match in a netgroup.
- */
-int
-innetgr(const char *group, const char *host, const char *user, const char *dom)
-{
-	char *hst, *usr, *dm;
-	/* Sanity check */
-	
-	if (group == NULL || !strlen(group))
-		return (0);
-
-#ifdef YP
-	_yp_innetgr = 1;
-#endif
-	setnetgrent(group);
-#ifdef YP
-	_yp_innetgr = 0;
-	/*
-	 * If we're in NIS-only mode, do the search using
-	 * NIS 'reverse netgroup' lookups.
-	 * 
-	 * What happens with 'reverse netgroup' lookups:
-	 * 
-	 * 1) try 'reverse netgroup' lookup
-	 *    1.a) if host is specified and user is null:
-	 *         look in netgroup.byhost
-	 *         (try host.domain, host.*, *.domain or *.*)
-	 *         if found, return yes
-	 *    1.b) if user is specified and host is null:
-	 *         look in netgroup.byuser
-	 *         (try host.domain, host.*, *.domain or *.*)
-	 *         if found, return yes
-	 *    1.c) if both host and user are specified,
-	 *         don't do 'reverse netgroup' lookup.  It won't work.
-	 *    1.d) if neither host ane user are specified (why?!?)
-	 *         don't do 'reverse netgroup' lookup either.
-	 * 2) if domain is specified and 'reverse lookup' is done:
-	 *    'reverse lookup' was authoritative.  bye bye.
-	 * 3) otherwise, too bad, try it the slow way.
-	 */
-	if (_use_only_yp && (host == NULL) != (user == NULL)) {
-		int ret;
-		if(yp_get_default_domain(&_netgr_yp_domain))
-			return(0);
-		ret = _revnetgr_lookup(_netgr_yp_domain, 
-				      host?"netgroup.byhost":"netgroup.byuser",
-				      host?host:user, dom, group);
-		if (ret == 1)
-			return(1);
-		else if (ret == 0 && dom != NULL)
-			return(0);
-	}
-
-	setnetgrent(group);
-#endif /* YP */
-
-	while (getnetgrent(&hst, &usr, &dm))
-		if ((host == NULL || hst == NULL || !strcmp(host, hst)) &&
-		    (user == NULL || usr == NULL || !strcmp(user, usr)) &&
-		    ( dom == NULL ||  dm == NULL || !strcmp(dom, dm))) {
-			endnetgrent();
-			return (1);
-		}
-	endnetgrent();
-	return (0);
-}
-
-/*
- * Parse the netgroup file setting up the linked lists.
- */
-static int
-parse_netgrp(const char *group)
-{
-	char *spos, *epos;
-	int len, strpos;
-#ifdef DEBUG
-	int fields;
-#endif
-	char *pos, *gpos;
-	struct netgrp *grp;
-	struct linelist *lp = linehead;
-
-	/*
-	 * First, see if the line has already been read in.
-	 */
-	while (lp) {
-		if (!strcmp(group, lp->l_groupname))
-			break;
-		lp = lp->l_next;
-	}
-	if (lp == (struct linelist *)0 &&
-	    (lp = read_for_group(group)) == (struct linelist *)0)
-		return (1);
-	if (lp->l_parsed) {
-#ifdef DEBUG
-		/*
-		 * This error message is largely superflous since the
-		 * code handles the error condition sucessfully, and
-		 * spewing it out from inside libc can actually hose
-		 * certain programs.
-		 */
-		fprintf(stderr, "Cycle in netgroup %s\n", lp->l_groupname);
-#endif
-		return (1);
-	} else
-		lp->l_parsed = 1;
-	pos = lp->l_line;
-	/* Watch for null pointer dereferences, dammit! */
-	while (pos != NULL && *pos != '\0') {
-		if (*pos == '(') {
-			grp = (struct netgrp *)malloc(sizeof (struct netgrp));
-			bzero((char *)grp, sizeof (struct netgrp));
-			grp->ng_next = grouphead.gr;
-			grouphead.gr = grp;
-			pos++;
-			gpos = strsep(&pos, ")");
-#ifdef DEBUG
-			fields = 0;
-#endif
-			for (strpos = 0; strpos < 3; strpos++) {
-				if ((spos = strsep(&gpos, ","))) {
-#ifdef DEBUG
-					fields++;
-#endif
-					while (*spos == ' ' || *spos == '\t')
-						spos++;
-					if ((epos = strpbrk(spos, " \t"))) {
-						*epos = '\0';
-						len = epos - spos;
-					} else
-						len = strlen(spos);
-					if (len > 0) {
-						grp->ng_str[strpos] =  (char *)
-							malloc(len + 1);
-						bcopy(spos, grp->ng_str[strpos],
-							len + 1);
-					}
-				} else {
-					/*
-					 * All other systems I've tested
-					 * return NULL for empty netgroup
-					 * fields. It's up to user programs
-					 * to handle the NULLs appropriately.
-					 */
-					grp->ng_str[strpos] = NULL;
-				}
-			}
-#ifdef DEBUG
-			/*
-			 * Note: on other platforms, malformed netgroup
-			 * entries are not normally flagged. While we
-			 * can catch bad entries and report them, we should
-			 * stay silent by default for compatibility's sake.
-			 */
-			if (fields < 3)
-					fprintf(stderr, "Bad entry (%s%s%s%s%s) in netgroup \"%s\"\n",
-						grp->ng_str[NG_HOST] == NULL ? "" : grp->ng_str[NG_HOST],
-						grp->ng_str[NG_USER] == NULL ? "" : ",",
-						grp->ng_str[NG_USER] == NULL ? "" : grp->ng_str[NG_USER],
-						grp->ng_str[NG_DOM] == NULL ? "" : ",",
-						grp->ng_str[NG_DOM] == NULL ? "" : grp->ng_str[NG_DOM],
-						lp->l_groupname);
-#endif
-		} else {
-			spos = strsep(&pos, ", \t");
-			if (parse_netgrp(spos))
-				continue;
-		}
-		if (pos == NULL)
-			break;
-		while (*pos == ' ' || *pos == ',' || *pos == '\t')
-			pos++;
-	}
-	return (0);
-}
-
-/*
- * Read the netgroup file and save lines until the line for the netgroup
- * is found. Return 1 if eof is encountered.
- */
-static struct linelist *
-read_for_group(const char *group)
-{
-	char *pos, *spos, *linep, *olinep;
-	int len, olen;
-	int cont;
-	struct linelist *lp;
-	char line[LINSIZ + 2];
-#ifdef YP
-	char *result;
-	int resultlen;
-
-	while (_netgr_yp_enabled || fgets(line, LINSIZ, netf) != NULL) {
-		if (_netgr_yp_enabled) {
-			if(!_netgr_yp_domain)
-				if(yp_get_default_domain(&_netgr_yp_domain))
-					continue;
-			if (yp_match(_netgr_yp_domain, "netgroup", group,
-					strlen(group), &result, &resultlen)) {
-				free(result);
-				if (_use_only_yp)
-					return ((struct linelist *)0);
-				else {
-					_netgr_yp_enabled = 0;
-					continue;
-				}
-			}
-			snprintf(line, LINSIZ, "%s %s", group, result);
-			free(result);
-		}
-#else
-	while (fgets(line, LINSIZ, netf) != NULL) {
-#endif
-		pos = (char *)&line;
-#ifdef YP
-		if (*pos == '+') {
-			_netgr_yp_enabled = 1;
-			continue;
-		}
-#endif
-		if (*pos == '#')
-			continue;
-		while (*pos == ' ' || *pos == '\t')
-			pos++;
-		spos = pos;
-		while (*pos != ' ' && *pos != '\t' && *pos != '\n' &&
-			*pos != '\0')
-			pos++;
-		len = pos - spos;
-		while (*pos == ' ' || *pos == '\t')
-			pos++;
-		if (*pos != '\n' && *pos != '\0') {
-			lp = (struct linelist *)malloc(sizeof (*lp));
-			lp->l_parsed = 0;
-			lp->l_groupname = (char *)malloc(len + 1);
-			bcopy(spos, lp->l_groupname, len);
-			*(lp->l_groupname + len) = '\0';
-			len = strlen(pos);
-			olen = 0;
-
-			/*
-			 * Loop around handling line continuations.
-			 */
-			do {
-				if (*(pos + len - 1) == '\n')
-					len--;
-				if (*(pos + len - 1) == '\\') {
-					len--;
-					cont = 1;
-				} else
-					cont = 0;
-				if (len > 0) {
-					linep = (char *)malloc(olen + len + 1);
-					if (olen > 0) {
-						bcopy(olinep, linep, olen);
-						free(olinep);
-					}
-					bcopy(pos, linep + olen, len);
-					olen += len;
-					*(linep + olen) = '\0';
-					olinep = linep;
-				}
-				if (cont) {
-					if (fgets(line, LINSIZ, netf)) {
-						pos = line;
-						len = strlen(pos);
-					} else
-						cont = 0;
-				}
-			} while (cont);
-			lp->l_line = linep;
-			lp->l_next = linehead;
-			linehead = lp;
-
-			/*
-			 * If this is the one we wanted, we are done.
-			 */
-			if (!strcmp(lp->l_groupname, group))
-				return (lp);
-		}
-	}
-#ifdef YP
-	/*
-	 * Yucky. The recursive nature of this whole mess might require
-	 * us to make more than one pass through the netgroup file.
-	 * This might be best left outside the #ifdef YP, but YP is
-	 * defined by default anyway, so I'll leave it like this
-	 * until I know better.
-	 */
-	rewind(netf);
-#endif
-	return ((struct linelist *)0);
-}
diff --git a/lib/libc/gen/getobjformat.c b/lib/libc/gen/getobjformat.c
deleted file mode 100644
index d1ac7df..0000000
--- a/lib/libc/gen/getobjformat.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 1998 John D. Polstra
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.7 2002/09/17 01:48:50 peter Exp $");
-
-#include <sys/param.h>
-#include <objformat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int
-getobjformat(char *buf, size_t bufsize, int *argcp, char **argv)
-{
-
-	if (bufsize < 4)
-		return -1;
-	strcpy(buf, "elf");
-	return 3;
-}
diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c
deleted file mode 100644
index 97cd9bf..0000000
--- a/lib/libc/gen/getosreldate.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getosreldate.c,v 1.6 2002/05/28 16:59:39 alfred Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-int
-getosreldate(void)
-{
-	int mib[2];
-	size_t size;
-	int value;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_OSRELDATE;
-	size = sizeof value;
-	if (sysctl(mib, 2, &value, &size, NULL, 0) == -1)
-		return (-1);
-	return (value);
-}
diff --git a/lib/libc/gen/getpagesize.c b/lib/libc/gen/getpagesize.c
deleted file mode 100644
index 3c8881e..0000000
--- a/lib/libc/gen/getpagesize.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getpagesize.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getpagesize.c,v 1.4 2002/02/01 00:57:29 obrien Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-/*
- * This is unlikely to change over the running time of any
- * program, so we cache the result to save some syscalls.
- *
- * NB: This function may be called from malloc(3) at initialization
- * NB: so must not result in a malloc(3) related call!
- */
-
-int
-getpagesize()
-{
-	int mib[2]; 
-	static int value;
-	size_t size;
-
-	if (!value) {
-		mib[0] = CTL_HW;
-		mib[1] = HW_PAGESIZE;
-		size = sizeof value;
-		if (sysctl(mib, 2, &value, &size, NULL, 0) == -1)
-			return (-1);
-	}
-	return (value);
-}
diff --git a/lib/libc/gen/getpeereid.c b/lib/libc/gen/getpeereid.c
deleted file mode 100644
index 5608c48..0000000
--- a/lib/libc/gen/getpeereid.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2001 Dima Dorfman.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getpeereid.c,v 1.6 2002/12/16 13:42:13 maxim Exp $");
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>
-#include <sys/un.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-int
-getpeereid(int s, uid_t *euid, gid_t *egid)
-{
-	struct xucred xuc;
-	socklen_t xuclen;
-	int error;
-
-	xuclen = sizeof(xuc);
-	error = getsockopt(s, 0, LOCAL_PEERCRED, &xuc, &xuclen);
-	if (error != 0)
-		return (error);
-	if (xuc.cr_version != XUCRED_VERSION)
-		return (EINVAL);
-	*euid = xuc.cr_uid;
-	*egid = xuc.cr_gid;
-	return (0);
-}
diff --git a/lib/libc/gen/getprogname.c b/lib/libc/gen/getprogname.c
deleted file mode 100644
index 456477b..0000000
--- a/lib/libc/gen/getprogname.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getprogname.c,v 1.4 2002/03/29 22:43:41 markm Exp $");
-
-#include "namespace.h"
-#include <stdlib.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-__weak_reference(_getprogname, getprogname);
-
-const char *_getprogname(void) {
-  return (__progname);
-  }
diff --git a/lib/libc/gen/getpwent.c b/lib/libc/gen/getpwent.c
deleted file mode 100644
index cba41da..0000000
--- a/lib/libc/gen/getpwent.c
+++ /dev/null
@@ -1,1732 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- *
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getpwent.c,v 1.89 2004/05/17 18:27:05 kientzle Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <arpa/inet.h>
-#include <errno.h>
-#include <fcntl.h>
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-#include <netdb.h>
-#include <nsswitch.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include <pwd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include <db.h>
-#include "libc_private.h"
-#include "pw_scan.h"
-#include "nss_tls.h"
-
-#ifndef CTASSERT
-#define CTASSERT(x)		_CTASSERT(x, __LINE__)
-#define _CTASSERT(x, y)		__CTASSERT(x, y)
-#define __CTASSERT(x, y)	typedef char __assert_ ## y [(x) ? 1 : -1]
-#endif
-
-/* Counter as stored in /etc/pwd.db */
-typedef	int		pwkeynum;
-
-CTASSERT(MAXLOGNAME > sizeof(uid_t));
-CTASSERT(MAXLOGNAME > sizeof(pwkeynum));
-
-enum constants {
-	PWD_STORAGE_INITIAL	= 1 << 10, /* 1 KByte */
-	PWD_STORAGE_MAX		= 1 << 20, /* 1 MByte */
-	SETPWENT		= 1,
-	ENDPWENT		= 2,
-	HESIOD_NAME_MAX		= 256
-};
-
-static const ns_src defaultsrc[] = {
-	{ NSSRC_COMPAT, NS_SUCCESS },
-	{ NULL, 0 }
-};
-
-int	__pw_match_entry(const char *, size_t, enum nss_lookup_type,
-	    const char *, uid_t);
-int	__pw_parse_entry(char *, size_t, struct passwd *, int, int *errnop);
-
-static	void	 pwd_init(struct passwd *);
-
-union key {
-	const char	*name;
-	uid_t		 uid;
-};
-
-static	struct passwd *getpw(int (*fn)(union key, struct passwd *, char *,
-		    size_t, struct passwd **), union key);
-static	int	 wrap_getpwnam_r(union key, struct passwd *, char *,
-		    size_t, struct passwd **);
-static	int	 wrap_getpwuid_r(union key, struct passwd *, char *, size_t,
-		    struct passwd **);
-static	int	 wrap_getpwent_r(union key, struct passwd *, char *, size_t,
-		    struct passwd **);
-
-static	int	 pwdb_match_entry_v3(char *, size_t, enum nss_lookup_type,
-		    const char *, uid_t);
-static	int	 pwdb_parse_entry_v3(char *, size_t, struct passwd *, int *);
-static	int	 pwdb_match_entry_v4(char *, size_t, enum nss_lookup_type,
-		    const char *, uid_t);
-static	int	 pwdb_parse_entry_v4(char *, size_t, struct passwd *, int *);
-
-
-struct {
-	int	(*match)(char *, size_t, enum nss_lookup_type, const char *,
-		    uid_t);
-	int	(*parse)(char *, size_t, struct passwd *, int *);
-} pwdb_versions[] = {
-	{ NULL, NULL },					/* version 0 */
-	{ NULL, NULL },					/* version 1 */
-	{ NULL, NULL },					/* version 2 */
-	{ pwdb_match_entry_v3, pwdb_parse_entry_v3 },	/* version 3 */
-	{ pwdb_match_entry_v4, pwdb_parse_entry_v4 },	/* version 4 */
-};
-
-
-struct files_state {
-	DB		*db;
-	pwkeynum	 keynum;
-	int		 stayopen;
-	int		 version;
-};
-static	void	files_endstate(void *);
-NSS_TLS_HANDLING(files);
-static	DB	*pwdbopen(int *);
-static	void	 files_endstate(void *);
-static	int	 files_setpwent(void *, void *, va_list);
-static	int	 files_passwd(void *, void *, va_list);
-
-
-#ifdef HESIOD
-struct dns_state {
-	long	counter;
-};
-static	void	dns_endstate(void *);
-NSS_TLS_HANDLING(dns);
-static	int	 dns_setpwent(void *, void *, va_list);
-static	int	 dns_passwd(void *, void *, va_list);
-#endif
-
-
-#ifdef YP
-struct nis_state {
-	char	 domain[MAXHOSTNAMELEN];
-	int	 done;
-	char	*key;
-	int	 keylen;
-};
-static	void	 nis_endstate(void *);
-NSS_TLS_HANDLING(nis);
-static	int	 nis_setpwent(void *, void *, va_list);
-static	int	 nis_passwd(void *, void *, va_list);
-static	int	 nis_map(char *, enum nss_lookup_type, char *, size_t, int *);
-static	int	 nis_adjunct(char *, const char *, char *, size_t);
-#endif
-
-
-struct compat_state {
-	DB		*db;
-	pwkeynum	 keynum;
-	int		 stayopen;
-	int		 version;
-	DB		*exclude;
-	struct passwd	 template;
-	char		*name;
-	enum _compat {
-		COMPAT_MODE_OFF = 0,
-		COMPAT_MODE_ALL,
-		COMPAT_MODE_NAME,
-		COMPAT_MODE_NETGROUP
-	}		 compat;
-};
-static	void	 compat_endstate(void *);
-NSS_TLS_HANDLING(compat);
-static	int	 compat_setpwent(void *, void *, va_list);
-static	int	 compat_passwd(void *, void *, va_list);
-static	void	 compat_clear_template(struct passwd *);
-static	int	 compat_set_template(struct passwd *, struct passwd *);
-static	int	 compat_use_template(struct passwd *, struct passwd *, char *,
-		    size_t);
-static	int	 compat_redispatch(struct compat_state *, enum nss_lookup_type,
-		    enum nss_lookup_type, const char *, const char *, uid_t,
-		    struct passwd *, char *, size_t, int *);
-void
-setpwent(void)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setpwent, (void *)SETPWENT },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setpwent, (void *)SETPWENT },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setpwent, (void *)SETPWENT },
-#endif
-		{ NSSRC_COMPAT, compat_setpwent, (void *)SETPWENT },
-		{ NULL, NULL, NULL }
-	};
-	(void)_nsdispatch(NULL, dtab, NSDB_PASSWD, "setpwent", defaultsrc, 0);
-}
-
-
-int
-setpassent(int stayopen)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setpwent, (void *)SETPWENT },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setpwent, (void *)SETPWENT },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setpwent, (void *)SETPWENT },
-#endif
-		{ NSSRC_COMPAT, compat_setpwent, (void *)SETPWENT },
-		{ NULL, NULL, NULL }
-	};
-	(void)_nsdispatch(NULL, dtab, NSDB_PASSWD, "setpwent", defaultsrc,
-	    stayopen);
-	return (1);
-}
-
-
-void
-endpwent(void)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setpwent, (void *)ENDPWENT },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setpwent, (void *)ENDPWENT },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setpwent, (void *)ENDPWENT },
-#endif
-		{ NSSRC_COMPAT, compat_setpwent, (void *)ENDPWENT },
-		{ NULL, NULL, NULL }
-	};
-	(void)_nsdispatch(NULL, dtab, NSDB_PASSWD, "endpwent", defaultsrc);
-}
-
-
-int
-getpwent_r(struct passwd *pwd, char *buffer, size_t bufsize,
-    struct passwd **result)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_passwd, (void *)nss_lt_all },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_passwd, (void *)nss_lt_all },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_passwd, (void *)nss_lt_all },
-#endif
-		{ NSSRC_COMPAT, compat_passwd, (void *)nss_lt_all },
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	pwd_init(pwd);
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_PASSWD, "getpwent_r", defaultsrc,
-	    pwd, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-int
-getpwnam_r(const char *name, struct passwd *pwd, char *buffer, size_t bufsize,
-    struct passwd **result)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_passwd, (void *)nss_lt_name },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_passwd, (void *)nss_lt_name },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_passwd, (void *)nss_lt_name },
-#endif
-		{ NSSRC_COMPAT, compat_passwd, (void *)nss_lt_name },
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	pwd_init(pwd);
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_PASSWD, "getpwnam_r", defaultsrc,
-	    name, pwd, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-int
-getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize,
-    struct passwd **result)
-{
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_passwd, (void *)nss_lt_id },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_passwd, (void *)nss_lt_id },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_passwd, (void *)nss_lt_id },
-#endif
-		{ NSSRC_COMPAT, compat_passwd, (void *)nss_lt_id },
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	pwd_init(pwd);
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_PASSWD, "getpwuid_r", defaultsrc,
-	    uid, pwd, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-static void
-pwd_init(struct passwd *pwd)
-{
-	static char nul[] = "";
-
-	memset(pwd, 0, sizeof(*pwd));
-	pwd->pw_uid = (uid_t)-1;  /* Considered least likely to lead to */
-	pwd->pw_gid = (gid_t)-1;  /* a security issue.                  */
-	pwd->pw_name = nul;
-	pwd->pw_passwd = nul;
-	pwd->pw_class = nul;
-	pwd->pw_gecos = nul;
-	pwd->pw_dir = nul;
-	pwd->pw_shell = nul;
-}
-
-
-static struct passwd	 pwd;
-static char		*pwd_storage;
-static size_t		 pwd_storage_size;
-
-
-static struct passwd *
-getpw(int (*fn)(union key, struct passwd *, char *, size_t, struct passwd **),
-    union key key)
-{
-	int		 rv;
-	struct passwd	*res;
-
-	if (pwd_storage == NULL) {
-		pwd_storage = malloc(PWD_STORAGE_INITIAL);
-		if (pwd_storage == NULL)
-			return (NULL);
-		pwd_storage_size = PWD_STORAGE_INITIAL;
-	}
-	do {
-		rv = fn(key, &pwd, pwd_storage, pwd_storage_size, &res);
-		if (res == NULL && rv == ERANGE) {
-			free(pwd_storage);
-			if ((pwd_storage_size << 1) > PWD_STORAGE_MAX) {
-				pwd_storage = NULL;
-				errno = ERANGE;
-				return (NULL);
-			}
-			pwd_storage_size <<= 1;
-			pwd_storage = malloc(pwd_storage_size);
-			if (pwd_storage == NULL)
-				return (NULL);
-		}
-	} while (res == NULL && rv == ERANGE);
-	if (rv != 0)
-		errno = rv;
-	return (res);
-}
-
-
-static int
-wrap_getpwnam_r(union key key, struct passwd *pwd, char *buffer,
-    size_t bufsize, struct passwd **res)
-{
-	return (getpwnam_r(key.name, pwd, buffer, bufsize, res));
-}
-
-
-static int
-wrap_getpwuid_r(union key key, struct passwd *pwd, char *buffer,
-    size_t bufsize, struct passwd **res)
-{
-	return (getpwuid_r(key.uid, pwd, buffer, bufsize, res));
-}
-
-
-static int
-wrap_getpwent_r(union key key __unused, struct passwd *pwd, char *buffer,
-    size_t bufsize, struct passwd **res)
-{
-	return (getpwent_r(pwd, buffer, bufsize, res));
-}
-
-
-struct passwd *
-getpwnam(const char *name)
-{
-	union key key;
-
-	key.name = name;
-	return (getpw(wrap_getpwnam_r, key));
-}
-
-
-struct passwd *
-getpwuid(uid_t uid)
-{
-	union key key;
-
-	key.uid = uid;
-	return (getpw(wrap_getpwuid_r, key));
-}
-
-
-struct passwd *
-getpwent(void)
-{
-	union key key;
-
-	key.uid = 0; /* not used */
-	return (getpw(wrap_getpwent_r, key));
-}
-
-
-/*
- * files backend
- */
-static DB *
-pwdbopen(int *version)
-{
-	DB	*res;
-	DBT	 key, entry;
-	int	 rv;
-
-	if (geteuid() != 0 ||
-	    (res = dbopen(_PATH_SMP_DB, O_RDONLY, 0, DB_HASH, NULL)) == NULL)
-		res = dbopen(_PATH_MP_DB, O_RDONLY, 0, DB_HASH, NULL);
-	if (res == NULL)
-		return (NULL);
-	key.data = _PWD_VERSION_KEY;
-	key.size = strlen(_PWD_VERSION_KEY);
-	rv = res->get(res, &key, &entry, 0);
-	if (rv == 0)
-		*version = *(unsigned char *)entry.data;
-	else
-		*version = 3;
-	if (*version < 3 ||
-	    *version >= sizeof(pwdb_versions)/sizeof(pwdb_versions[0])) {
-		syslog(LOG_CRIT, "Unsupported password database version %d",
-		    *version);
-		res->close(res);
-		res = NULL;
-	}
-	return (res);
-}
-
-
-static void
-files_endstate(void *p)
-{
-	DB	*db;
-
-	if (p == NULL)
-		return;
-	db = ((struct files_state *)p)->db;
-	if (db != NULL)
-		db->close(db);
-	free(p);
-}
-
-
-static int
-files_setpwent(void *retval, void *mdata, va_list ap)
-{
-	struct files_state	*st;
-	int			 rv, stayopen;
-
-	rv = files_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	switch ((enum constants)mdata) {
-	case SETPWENT:
-		stayopen = va_arg(ap, int);
-		st->keynum = 0;
-		if (stayopen)
-			st->db = pwdbopen(&st->version);
-		st->stayopen = stayopen;
-		break;
-	case ENDPWENT:
-		if (st->db != NULL) {
-			(void)st->db->close(st->db);
-			st->db = NULL;
-		}
-		break;
-	default:
-		break;
-	}
-	return (NS_UNAVAIL);
-}
-
-
-static int
-files_passwd(void *retval, void *mdata, va_list ap)
-{
-	char			 keybuf[MAXLOGNAME + 1];
-	DBT			 key, entry;
-	struct files_state	*st;
-	enum nss_lookup_type	 how;
-	const char		*name;
-	struct passwd		*pwd;
-	char			*buffer;
-	size_t			 bufsize, namesize;
-	uid_t			 uid;
-	uint32_t		 store;
-	int			 rv, stayopen, *errnop;
-
-	name = NULL;
-	uid = (uid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		keybuf[0] = _PW_KEYBYNAME;
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		keybuf[0] = _PW_KEYBYUID;
-		break;
-	case nss_lt_all:
-		keybuf[0] = _PW_KEYBYNUM;
-		break;
-	default:
-		rv = NS_NOTFOUND;
-		goto fin;
-	}
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	*errnop = files_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (how == nss_lt_all && st->keynum < 0) {
-		rv = NS_NOTFOUND;
-		goto fin;
-	}
-	if (st->db == NULL &&
-	    (st->db = pwdbopen(&st->version)) == NULL) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	if (how == nss_lt_all)
-		stayopen = 1;
-	else
-		stayopen = st->stayopen;
-	key.data = keybuf;
-	do {
-		switch (how) {
-		case nss_lt_name:
-			/* MAXLOGNAME includes NUL byte, but we do not
-			 * include the NUL byte in the key.
-			 */
-			namesize = strlcpy(&keybuf[1], name, sizeof(keybuf)-1);
-			if (namesize >= sizeof(keybuf)-1) {
-				*errnop = EINVAL;
-				rv = NS_NOTFOUND;
-				goto fin;
-			}
-			key.size = namesize + 1;
-			break;
-		case nss_lt_id:
-			if (st->version < _PWD_CURRENT_VERSION) {
-				memcpy(&keybuf[1], &uid, sizeof(uid));
-				key.size = sizeof(uid) + 1;
-			} else {
-				store = htonl(uid);
-				memcpy(&keybuf[1], &store, sizeof(store));
-				key.size = sizeof(store) + 1;
-			}
-			break;
-		case nss_lt_all:
-			st->keynum++;
-			if (st->version < _PWD_CURRENT_VERSION) {
-				memcpy(&keybuf[1], &st->keynum,
-				    sizeof(st->keynum));
-				key.size = sizeof(st->keynum) + 1;
-			} else {
-				store = htonl(st->keynum);
-				memcpy(&keybuf[1], &store, sizeof(store));
-				key.size = sizeof(store) + 1;
-			}
-			break;
-		}
-		keybuf[0] = _PW_VERSIONED(keybuf[0], st->version);
-		rv = st->db->get(st->db, &key, &entry, 0);
-		if (rv < 0 || rv > 1) { /* should never return > 1 */
-			*errnop = errno;
-			rv = NS_UNAVAIL;
-			goto fin;
-		} else if (rv == 1) {
-			if (how == nss_lt_all)
-				st->keynum = -1;
-			rv = NS_NOTFOUND;
-			goto fin;
-		}
-		rv = pwdb_versions[st->version].match(entry.data, entry.size,
-		    how, name, uid);
-		if (rv != NS_SUCCESS)
-			continue;
-		if (entry.size > bufsize) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-		memcpy(buffer, entry.data, entry.size);
-		rv = pwdb_versions[st->version].parse(buffer, entry.size, pwd,
-		    errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (!stayopen && st->db != NULL) {
-		(void)st->db->close(st->db);
-		st->db = NULL;
-	}
-	if (rv == NS_SUCCESS) {
-		pwd->pw_fields &= ~_PWF_SOURCE;
-		pwd->pw_fields |= _PWF_FILES;
-		if (retval != NULL)
-			*(struct passwd **)retval = pwd;
-	}
-	return (rv);
-}
-
-
-static int
-pwdb_match_entry_v3(char *entry, size_t entrysize, enum nss_lookup_type how,
-    const char *name, uid_t uid)
-{
-	const char	*p, *eom;
-	uid_t		 uid2;
-
-	eom = &entry[entrysize];
-	for (p = entry; p < eom; p++)
-		if (*p == '\0')
-			break;
-	if (*p != '\0')
-		return (NS_NOTFOUND);
-	if (how == nss_lt_all)
-		return (NS_SUCCESS);
-	if (how == nss_lt_name)
-		return (strcmp(name, entry) == 0 ? NS_SUCCESS : NS_NOTFOUND);
-	for (p++; p < eom; p++)
-		if (*p == '\0')
-			break;
-	if (*p != '\0' || (++p) + sizeof(uid) >= eom)
-		return (NS_NOTFOUND);
-	memcpy(&uid2, p, sizeof(uid2));
-	return (uid == uid2 ? NS_SUCCESS : NS_NOTFOUND);
-}
-
-
-static int
-pwdb_parse_entry_v3(char *buffer, size_t bufsize, struct passwd *pwd,
-    int *errnop)
-{
-	char		*p, *eom;
-	int32_t		 pw_change, pw_expire;
-
-	/* THIS CODE MUST MATCH THAT IN pwd_mkdb. */
-	p = buffer;
-	eom = &buffer[bufsize];
-#define STRING(field)	do {			\
-		(field) = p;			\
-		while (p < eom && *p != '\0')	\
-			p++;			\
-		if (p >= eom)			\
-			return (NS_NOTFOUND);	\
-		p++;				\
-	} while (0)
-#define SCALAR(field)	do {				\
-		if (p + sizeof(field) > eom)		\
-			return (NS_NOTFOUND);		\
-		memcpy(&(field), p, sizeof(field));	\
-		p += sizeof(field);			\
-	} while (0)
-	STRING(pwd->pw_name);
-	STRING(pwd->pw_passwd);
-	SCALAR(pwd->pw_uid);
-	SCALAR(pwd->pw_gid);
-	SCALAR(pw_change);
-	STRING(pwd->pw_class);
-	STRING(pwd->pw_gecos);
-	STRING(pwd->pw_dir);
-	STRING(pwd->pw_shell);
-	SCALAR(pw_expire);
-	SCALAR(pwd->pw_fields);
-#undef STRING
-#undef SCALAR
-	pwd->pw_change = pw_change;
-	pwd->pw_expire = pw_expire;
-	return (NS_SUCCESS);
-}
-
-
-static int
-pwdb_match_entry_v4(char *entry, size_t entrysize, enum nss_lookup_type how,
-    const char *name, uid_t uid)
-{
-	const char	*p, *eom;
-	uint32_t	 uid2;
-
-	eom = &entry[entrysize];
-	for (p = entry; p < eom; p++)
-		if (*p == '\0')
-			break;
-	if (*p != '\0')
-		return (NS_NOTFOUND);
-	if (how == nss_lt_all)
-		return (NS_SUCCESS);
-	if (how == nss_lt_name)
-		return (strcmp(name, entry) == 0 ? NS_SUCCESS : NS_NOTFOUND);
-	for (p++; p < eom; p++)
-		if (*p == '\0')
-			break;
-	if (*p != '\0' || (++p) + sizeof(uid) >= eom)
-		return (NS_NOTFOUND);
-	memcpy(&uid2, p, sizeof(uid2));
-	uid2 = ntohl(uid2);
-	return (uid == (uid_t)uid2 ? NS_SUCCESS : NS_NOTFOUND);
-}
-
-
-static int
-pwdb_parse_entry_v4(char *buffer, size_t bufsize, struct passwd *pwd,
-    int *errnop)
-{
-	char		*p, *eom;
-	uint32_t	 n;
-
-	/* THIS CODE MUST MATCH THAT IN pwd_mkdb. */
-	p = buffer;
-	eom = &buffer[bufsize];
-#define STRING(field)	do {			\
-		(field) = p;			\
-		while (p < eom && *p != '\0')	\
-			p++;			\
-		if (p >= eom)			\
-			return (NS_NOTFOUND);	\
-		p++;				\
-	} while (0)
-#define SCALAR(field)	do {				\
-		if (p + sizeof(n) > eom)		\
-			return (NS_NOTFOUND);		\
-		memcpy(&n, p, sizeof(n));		\
-		(field) = ntohl(n);			\
-		p += sizeof(n);				\
-	} while (0)
-	STRING(pwd->pw_name);
-	STRING(pwd->pw_passwd);
-	SCALAR(pwd->pw_uid);
-	SCALAR(pwd->pw_gid);
-	SCALAR(pwd->pw_change);
-	STRING(pwd->pw_class);
-	STRING(pwd->pw_gecos);
-	STRING(pwd->pw_dir);
-	STRING(pwd->pw_shell);
-	SCALAR(pwd->pw_expire);
-	SCALAR(pwd->pw_fields);
-#undef STRING
-#undef SCALAR
-	return (NS_SUCCESS);
-}
-
-
-#ifdef HESIOD
-/*
- * dns backend
- */
-static void
-dns_endstate(void *p)
-{
-	free(p);
-}
-
-
-static int
-dns_setpwent(void *retval, void *mdata, va_list ap)
-{
-	struct dns_state	*st;
-	int			 rv;
-
-	rv = dns_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	st->counter = 0;
-	return (NS_UNAVAIL);
-}
-
-
-static int
-dns_passwd(void *retval, void *mdata, va_list ap)
-{
-	char			 buf[HESIOD_NAME_MAX];
-	struct dns_state	*st;
-	struct passwd		*pwd;
-	const char		*name, *label;
-	void			*ctx;
-	char			*buffer, **hes;
-	size_t			 bufsize, linesize;
-	uid_t			 uid;
-	enum nss_lookup_type	 how;
-	int			 rv, *errnop;
-
-	ctx = NULL;
-	hes = NULL;
-	name = NULL;
-	uid = (uid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
-	case nss_lt_all:
-		break;
-	}
-	pwd     = va_arg(ap, struct passwd *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop  = va_arg(ap, int *);
-	*errnop = dns_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (hesiod_init(&ctx) != 0) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	do {
-		rv = NS_NOTFOUND;
-		switch (how) {
-		case nss_lt_name:
-			label = name;
-			break;
-		case nss_lt_id:
-			if (snprintf(buf, sizeof(buf), "%lu",
-			    (unsigned long)uid) >= sizeof(buf))
-				goto fin;
-			label = buf;
-			break;
-		case nss_lt_all:
-			if (st->counter < 0)
-				goto fin;
-			if (snprintf(buf, sizeof(buf), "passwd-%ld",
-			    st->counter++) >= sizeof(buf))
-				goto fin;
-			label = buf;
-			break;
-		}
-		hes = hesiod_resolve(ctx, label,
-		    how == nss_lt_id ? "uid" : "passwd");
-		if (hes == NULL) {
-			if (how == nss_lt_all)
-				st->counter = -1;
-			if (errno != ENOENT)
-				*errnop = errno;
-			goto fin;
-		}
-		rv = __pw_match_entry(hes[0], strlen(hes[0]), how, name, uid);
-		if (rv != NS_SUCCESS) {
-			hesiod_free_list(ctx, hes);
-			hes = NULL;
-			continue;
-		}
-		linesize = strlcpy(buffer, hes[0], bufsize);
-		if (linesize >= bufsize) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			continue;
-		}
-		hesiod_free_list(ctx, hes);
-		hes = NULL;
-		rv = __pw_parse_entry(buffer, bufsize, pwd, 0, errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (hes != NULL)
-		hesiod_free_list(ctx, hes);
-	if (ctx != NULL)
-		hesiod_end(ctx);
-	if (rv == NS_SUCCESS) {
-		pwd->pw_fields &= ~_PWF_SOURCE;
-		pwd->pw_fields |= _PWF_HESIOD;
-		if (retval != NULL)
-			*(struct passwd **)retval = pwd;
-	}
-	return (rv);
-}
-#endif /* HESIOD */
-
-
-#ifdef YP
-/*
- * nis backend
- */
-static void
-nis_endstate(void *p)
-{
-	free(((struct nis_state *)p)->key);
-	free(p);
-}
-
-/*
- * Test for the presence of special FreeBSD-specific master.passwd.by*
- * maps. We do this using yp_order(). If it fails, then either the server
- * doesn't have the map, or the YPPROC_ORDER procedure isn't supported by
- * the server (Sun NIS+ servers in YP compat mode behave this way). If
- * the master.passwd.by* maps don't exist, then let the lookup routine try
- * the regular passwd.by* maps instead. If the lookup routine fails, it
- * can return an error as needed.
- */
-static int
-nis_map(char *domain, enum nss_lookup_type how, char *buffer, size_t bufsize,
-    int *master)
-{
-	int	rv, order;
-
-	*master = 0;
-	if (geteuid() == 0) {
-		if (snprintf(buffer, bufsize, "master.passwd.by%s",
-		    (how == nss_lt_id) ? "uid" : "name") >= bufsize)
-			return (NS_UNAVAIL);
-		rv = yp_order(domain, buffer, &order);
-		if (rv == 0) {
-			*master = 1;
-			return (NS_SUCCESS);
-		}
-	}
-
-	if (snprintf(buffer, bufsize, "passwd.by%s",
-	    (how == nss_lt_id) ? "uid" : "name") >= bufsize)
-		return (NS_UNAVAIL);
-
-	return (NS_SUCCESS);
-}
-
-
-static int
-nis_adjunct(char *domain, const char *name, char *buffer, size_t bufsize)
-{
-	int	 rv;
-	char	*result, *p, *q, *eor;
-	int	 resultlen;
-
-	result = NULL;
-	rv = yp_match(domain, "passwd.adjunct.byname", name, strlen(name),
-	    &result, &resultlen);
-	if (rv != 0)
-		rv = 1;
-	else {
-		eor = &result[resultlen];
-		p = memchr(result, ':', eor - result);
-		if (p != NULL && ++p < eor &&
-		    (q = memchr(p, ':', eor - p)) != NULL) {
-			if (q - p >= bufsize)
-				rv = -1;
-			else {
-				memcpy(buffer, p, q - p);
-				buffer[q - p] ='\0';
-			}
-		} else
-			rv = 1;
-	}
-	free(result);
-	return (rv);
-}
-
-
-static int
-nis_setpwent(void *retval, void *mdata, va_list ap)
-{
-	struct nis_state	*st;
-	int			 rv;
-
-	rv = nis_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	st->done = 0;
-	free(st->key);
-	st->key = NULL;
-	return (NS_UNAVAIL);
-}
-
-
-static int
-nis_passwd(void *retval, void *mdata, va_list ap)
-{
-	char		 map[YPMAXMAP];
-	struct nis_state *st;
-	struct passwd	*pwd;
-	const char	*name;
-	char		*buffer, *key, *result;
-	size_t		 bufsize;
-	uid_t		 uid;
-	enum nss_lookup_type how;
-	int		*errnop, keylen, resultlen, rv, master;
-
-	name = NULL;
-	uid = (uid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
-	case nss_lt_all:
-		break;
-	}
-	pwd     = va_arg(ap, struct passwd *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop  = va_arg(ap, int *);
-	*errnop = nis_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (st->domain[0] == '\0') {
-		if (getdomainname(st->domain, sizeof(st->domain)) != 0) {
-			*errnop = errno;
-			return (NS_UNAVAIL);
-		}
-	}
-	rv = nis_map(st->domain, how, map, sizeof(map), &master);
-	if (rv != NS_SUCCESS)
-		return (rv);
-	result = NULL;
-	do {
-		rv = NS_NOTFOUND;
-		switch (how) {
-		case nss_lt_name:
-			if (strlcpy(buffer, name, bufsize) >= bufsize)
-				goto erange;
-			break;
-		case nss_lt_id:
-			if (snprintf(buffer, bufsize, "%lu",
-			    (unsigned long)uid) >= bufsize)
-				goto erange;
-			break;
-		case nss_lt_all:
-			if (st->done)
-				goto fin;
-			break;
-		}
-		result = NULL;
-		if (how == nss_lt_all) {
-			if (st->key == NULL)
-				rv = yp_first(st->domain, map, &st->key,
-				    &st->keylen, &result, &resultlen);
-			else {
-				key = st->key;
-				keylen = st->keylen;
-				st->key = NULL;
-				rv = yp_next(st->domain, map, key, keylen,
-				    &st->key, &st->keylen, &result,
-				    &resultlen);
-				free(key);
-			}
-			if (rv != 0) {
-				free(result);
-				free(st->key);
-				st->key = NULL;
-				if (rv == YPERR_NOMORE)
-					st->done = 1;
-				else
-					rv = NS_UNAVAIL;
-				goto fin;
-			}
-		} else {
-			rv = yp_match(st->domain, map, buffer, strlen(buffer),
-			    &result, &resultlen);
-			if (rv == YPERR_KEY) {
-				rv = NS_NOTFOUND;
-				continue;
-			} else if (rv != 0) {
-				free(result);
-				rv = NS_UNAVAIL;
-				continue;
-			}
-		}
-		if (resultlen >= bufsize)
-			goto erange;
-		memcpy(buffer, result, resultlen);
-		buffer[resultlen] = '\0';
-		free(result);
-		rv = __pw_match_entry(buffer, resultlen, how, name, uid);
-		if (rv == NS_SUCCESS)
-			rv = __pw_parse_entry(buffer, resultlen, pwd, master,
-			    errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (rv == NS_SUCCESS) {
-		if (strstr(pwd->pw_passwd, "##") != NULL) {
-			rv = nis_adjunct(st->domain, pwd->pw_name,
-			    &buffer[resultlen+1], bufsize-resultlen-1);
-			if (rv < 0)
-				goto erange;
-			else if (rv == 0)
-				pwd->pw_passwd = &buffer[resultlen+1];
-		}
-		pwd->pw_fields &= ~_PWF_SOURCE;
-		pwd->pw_fields |= _PWF_NIS;
-		if (retval != NULL)
-			*(struct passwd **)retval = pwd;
-		rv = NS_SUCCESS;
-	}
-	return (rv);
-erange:
-	*errnop = ERANGE;
-	return (NS_RETURN);
-}
-#endif /* YP */
-
-
-/*
- * compat backend
- */
-static void
-compat_clear_template(struct passwd *template)
-{
-
-	free(template->pw_passwd);
-	free(template->pw_gecos);
-	free(template->pw_dir);
-	free(template->pw_shell);
-	memset(template, 0, sizeof(*template));
-}
-
-
-static int
-compat_set_template(struct passwd *src, struct passwd *template)
-{
-
-	compat_clear_template(template);
-#ifdef PW_OVERRIDE_PASSWD
-	if ((src->pw_fields & _PWF_PASSWD) &&
-	    (template->pw_passwd = strdup(src->pw_passwd)) == NULL)
-		goto enomem;
-#endif
-	if (src->pw_fields & _PWF_UID)
-		template->pw_uid = src->pw_uid;
-	if (src->pw_fields & _PWF_GID)
-		template->pw_gid = src->pw_gid;
-	if ((src->pw_fields & _PWF_GECOS) &&
-	    (template->pw_gecos = strdup(src->pw_gecos)) == NULL)
-		goto enomem;
-	if ((src->pw_fields & _PWF_DIR) &&
-	    (template->pw_dir = strdup(src->pw_dir)) == NULL)
-		goto enomem;
-	if ((src->pw_fields & _PWF_SHELL) &&
-	    (template->pw_shell = strdup(src->pw_shell)) == NULL)
-		goto enomem;
-	template->pw_fields = src->pw_fields;
-	return (0);
-enomem:
-	syslog(LOG_ERR, "getpwent memory allocation failure");
-	return (-1);
-}
-
-
-static int
-compat_use_template(struct passwd *pwd, struct passwd *template, char *buffer,
-    size_t bufsize)
-{
-	struct passwd hold;
-	char	*copy, *p, *q, *eob;
-	size_t	 n;
-
-	/* We cannot know the layout of the password fields in `buffer',
-	 * so we have to copy everything.
-	 */
-	if (template->pw_fields == 0) /* nothing to fill-in */
-		return (0);
-	n = 0;
-	n += pwd->pw_name != NULL ? strlen(pwd->pw_name) + 1 : 0;
-	n += pwd->pw_passwd != NULL ? strlen(pwd->pw_passwd) + 1 : 0;
-	n += pwd->pw_class != NULL ? strlen(pwd->pw_class) + 1 : 0;
-	n += pwd->pw_gecos != NULL ? strlen(pwd->pw_gecos) + 1 : 0;
-	n += pwd->pw_dir != NULL ? strlen(pwd->pw_dir) + 1 : 0;
-	n += pwd->pw_shell != NULL ? strlen(pwd->pw_shell) + 1 : 0;
-	copy = malloc(n);
-	if (copy == NULL) {
-		syslog(LOG_ERR, "getpwent memory allocation failure");
-		return (ENOMEM);
-	}
-	p = copy;
-	eob = &copy[n];
-#define COPY(field) do {				\
-	if (pwd->field == NULL)				\
-		hold.field = NULL;			\
-	else {						\
-		hold.field = p;				\
-		p += strlcpy(p, pwd->field, eob-p) + 1;	\
-	}						\
-} while (0)
-	COPY(pw_name);
-	COPY(pw_passwd);
-	COPY(pw_class);
-	COPY(pw_gecos);
-	COPY(pw_dir);
-	COPY(pw_shell);
-#undef COPY
-	p = buffer;
-	eob = &buffer[bufsize];
-#define COPY(field, flag) do {						 \
-	q = (template->pw_fields & flag) ? template->field : hold.field; \
-	if (q == NULL)							 \
-		pwd->field = NULL;					 \
-	else {								 \
-		pwd->field = p;						 \
-		if ((n = strlcpy(p, q, eob-p)) >= eob-p) {		 \
-			free(copy);					 \
-			return (ERANGE);				 \
-		}							 \
-		p += n + 1;						 \
-	}								 \
-} while (0)
-	COPY(pw_name, 0);
-#ifdef PW_OVERRIDE_PASSWD
-	COPY(pw_passwd, _PWF_PASSWD);
-#else
-	COPY(pw_passwd, 0);
-#endif
-	COPY(pw_class, 0);
-	COPY(pw_gecos, _PWF_GECOS);
-	COPY(pw_dir, _PWF_DIR);
-	COPY(pw_shell, _PWF_SHELL);
-#undef COPY
-#define COPY(field, flag) do {			\
-	if (template->pw_fields & flag)		\
-		pwd->field = template->field;	\
-} while (0)
-	COPY(pw_uid, _PWF_UID);
-	COPY(pw_gid, _PWF_GID);
-#undef COPY
-	free(copy);
-	return (0);
-}
-
-
-static int
-compat_exclude(const char *name, DB **db)
-{
-	DBT	key, data;
-
-	if (*db == NULL &&
-	    (*db = dbopen(NULL, O_RDWR, 600, DB_HASH, 0)) == NULL)
-		return (errno);
-	key.size = strlen(name);
-	key.data = (char *)name;
-	data.size = 0;
-	data.data = NULL;
-
-	if ((*db)->put(*db, &key, &data, 0) == -1)
-		return (errno);
-	return (0);
-}
-
-
-static int
-compat_is_excluded(const char *name, DB *db)
-{
-	DBT	key, data;
-
-	if (db == NULL)
-		return (0);
-	key.size = strlen(name);
-	key.data = (char *)name;
-	return (db->get(db, &key, &data, 0) == 0);
-}
-
-
-static int
-compat_redispatch(struct compat_state *st, enum nss_lookup_type how,
-    enum nss_lookup_type lookup_how, const char *name, const char *lookup_name,
-    uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize, int *errnop)
-{
-	static const ns_src compatsrc[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab dtab[] = {
-#ifdef YP
-		{ NSSRC_NIS, nis_passwd, NULL },
-#endif
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_passwd, NULL },
-#endif
-		{ NULL, NULL, NULL }
-	};
-	void		*discard;
-	int		 rv, e, i;
-
-	for (i = 0; i < sizeof(dtab)/sizeof(dtab[0]) - 1; i++)
-		dtab[i].mdata = (void *)lookup_how;
-more:
-	pwd_init(pwd);
-	switch (lookup_how) {
-	case nss_lt_all:
-		rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT,
-		    "getpwent_r", compatsrc, pwd, buffer, bufsize,
-		    errnop);
-		break;
-	case nss_lt_id:
-		rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT,
-		    "getpwuid_r", compatsrc, uid, pwd, buffer,
-		    bufsize, errnop);
-		break;
-	case nss_lt_name:
-		rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT,
-		    "getpwnam_r", compatsrc, lookup_name, pwd, buffer,
-		    bufsize, errnop);
-		break;
-	default:
-		return (NS_UNAVAIL);
-	}
-	if (rv != NS_SUCCESS)
-		return (rv);
-	if (compat_is_excluded(pwd->pw_name, st->exclude)) {
-		if (how == nss_lt_all)
-			goto more;
-		return (NS_NOTFOUND);
-	}
-	e = compat_use_template(pwd, &st->template, buffer, bufsize);
-	if (e != 0) {
-		*errnop = e;
-		if (e == ERANGE)
-			return (NS_RETURN);
-		else
-			return (NS_UNAVAIL);
-	}
-	switch (how) {
-	case nss_lt_name:
-		if (strcmp(name, pwd->pw_name) != 0)
-			return (NS_NOTFOUND);
-		break;
-	case nss_lt_id:
-		if (uid != pwd->pw_uid)
-			return (NS_NOTFOUND);
-		break;
-	default:
-		break;
-	}
-	return (NS_SUCCESS);
-}
-
-
-static void
-compat_endstate(void *p)
-{
-	struct compat_state *st;
-
-	if (p == NULL)
-		return;
-	st = (struct compat_state *)p;
-	if (st->db != NULL)
-		st->db->close(st->db);
-	if (st->exclude != NULL)
-		st->exclude->close(st->exclude);
-	compat_clear_template(&st->template);
-	free(p);
-}
-
-
-static int
-compat_setpwent(void *retval, void *mdata, va_list ap)
-{
-	static const ns_src compatsrc[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab dtab[] = {
-#ifdef YP
-		{ NSSRC_NIS, nis_setpwent, NULL },
-#endif
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setpwent, NULL },
-#endif
-		{ NULL, NULL, NULL }
-	};
-	struct compat_state	*st;
-	int			 rv, stayopen;
-
-#define set_setent(x, y) do {	 				\
-	int i;							\
-								\
-	for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++)	\
-		x[i].mdata = (void *)y;				\
-} while (0)
-
-	rv = compat_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	switch ((enum constants)mdata) {
-	case SETPWENT:
-		stayopen = va_arg(ap, int);
-		st->keynum = 0;
-		if (stayopen)
-			st->db = pwdbopen(&st->version);
-		st->stayopen = stayopen;
-		set_setent(dtab, mdata);
-		(void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "setpwent",
-		    compatsrc, 0);
-		break;
-	case ENDPWENT:
-		if (st->db != NULL) {
-			(void)st->db->close(st->db);
-			st->db = NULL;
-		}
-		set_setent(dtab, mdata);
-		(void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "endpwent",
-		    compatsrc, 0);
-		break;
-	default:
-		break;
-	}
-	return (NS_UNAVAIL);
-#undef set_setent
-}
-
-
-static int
-compat_passwd(void *retval, void *mdata, va_list ap)
-{
-	char			 keybuf[MAXLOGNAME + 1];
-	DBT			 key, entry;
-	struct compat_state	*st;
-	enum nss_lookup_type	 how;
-	const char		*name;
-	struct passwd		*pwd;
-	char			*buffer, *pw_name;
-	char			*host, *user, *domain;
-	size_t			 bufsize;
-	uid_t			 uid;
-	uint32_t		 store;
-	int			 rv, from_compat, stayopen, *errnop;
-
-	from_compat = 0;
-	name = NULL;
-	uid = (uid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		rv = NS_NOTFOUND;
-		goto fin;
-	}
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	*errnop = compat_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (how == nss_lt_all && st->keynum < 0) {
-		rv = NS_NOTFOUND;
-		goto fin;
-	}
-	if (st->db == NULL &&
-	    (st->db = pwdbopen(&st->version)) == NULL) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	if (how == nss_lt_all) {
-		if (st->keynum < 0) {
-			rv = NS_NOTFOUND;
-			goto fin;
-		}
-		stayopen = 1;
-	} else {
-		st->keynum = 0;
-		stayopen = st->stayopen;
-	}
-docompat:
-	rv = NS_NOTFOUND;
-	switch (st->compat) {
-	case COMPAT_MODE_ALL:
-		rv = compat_redispatch(st, how, how, name, name, uid, pwd,
-		    buffer, bufsize, errnop);
-		if (rv != NS_SUCCESS)
-			st->compat = COMPAT_MODE_OFF;
-		break;
-	case COMPAT_MODE_NETGROUP:
-		/* XXX getnetgrent is not thread-safe. */
-		do {
-			rv = getnetgrent(&host, &user, &domain);
-			if (rv == 0) {
-				endnetgrent();
-				st->compat = COMPAT_MODE_OFF;
-				rv = NS_NOTFOUND;
-				continue;
-			} else if (user == NULL || user[0] == '\0')
-				continue;
-			rv = compat_redispatch(st, how, nss_lt_name, name,
-			    user, uid, pwd, buffer, bufsize, errnop);
-		} while (st->compat == COMPAT_MODE_NETGROUP &&
-		    !(rv & NS_TERMINATE));
-		break;
-	case COMPAT_MODE_NAME:
-		rv = compat_redispatch(st, how, nss_lt_name, name, st->name,
-		    uid, pwd, buffer, bufsize, errnop);
-		free(st->name);
-		st->name = NULL;
-		st->compat = COMPAT_MODE_OFF;
-		break;
-	default:
-		break;
-	}
-	if (rv & NS_TERMINATE) {
-		from_compat = 1;
-		goto fin;
-	}
-	key.data = keybuf;
-	rv = NS_NOTFOUND;
-	while (st->keynum >= 0) {
-		st->keynum++;
-		if (st->version < _PWD_CURRENT_VERSION) {
-			memcpy(&keybuf[1], &st->keynum, sizeof(st->keynum));
-			key.size = sizeof(st->keynum) + 1;
-		} else {
-			store = htonl(st->keynum);
-			memcpy(&keybuf[1], &store, sizeof(store));
-			key.size = sizeof(store) + 1;
-		}
-		keybuf[0] = _PW_VERSIONED(_PW_KEYBYNUM, st->version);
-		rv = st->db->get(st->db, &key, &entry, 0);
-		if (rv < 0 || rv > 1) { /* should never return > 1 */
-			*errnop = errno;
-			rv = NS_UNAVAIL;
-			goto fin;
-		} else if (rv == 1) {
-			st->keynum = -1;
-			rv = NS_NOTFOUND;
-			goto fin;
-		}
-		pw_name = (char *)entry.data;
-		switch (pw_name[0]) {
-		case '+':
-			switch (pw_name[1]) {
-			case '\0':
-				st->compat = COMPAT_MODE_ALL;
-				break;
-			case '@':
-				setnetgrent(&pw_name[2]);
-				st->compat = COMPAT_MODE_NETGROUP;
-				break;
-			default:
-				st->name = strdup(&pw_name[1]);
-				if (st->name == NULL) {
-					syslog(LOG_ERR,
-					 "getpwent memory allocation failure");
-					*errnop = ENOMEM;
-					rv = NS_UNAVAIL;
-					break;
-				}
-				st->compat = COMPAT_MODE_NAME;
-			}
-			if (entry.size > bufsize) {
-				*errnop = ERANGE;
-				rv = NS_RETURN;
-				goto fin;
-			}
-			memcpy(buffer, entry.data, entry.size);
-			rv = pwdb_versions[st->version].parse(buffer,
-			    entry.size, pwd, errnop);
-			if (rv != NS_SUCCESS)
-				;
-			else if (compat_set_template(pwd, &st->template) < 0) {
-				*errnop = ENOMEM;
-				rv = NS_UNAVAIL;
-				goto fin;
-			}
-			goto docompat;
-		case '-':
-			switch (pw_name[1]) {
-			case '\0':
-				/* XXX Maybe syslog warning */
-				continue;
-			case '@':
-				setnetgrent(&pw_name[2]);
-				while (getnetgrent(&host, &user, &domain) !=
-				    0) {
-					if (user != NULL && user[0] != '\0')
-						compat_exclude(user,
-						    &st->exclude);
-				}
-				endnetgrent();
-				continue;
-			default:
-				compat_exclude(&pw_name[1], &st->exclude);
-				continue;
-			}
-			break;
-		default:
-			break;
-		}
-		if (compat_is_excluded((char *)entry.data, st->exclude))
-			continue;
-		rv = pwdb_versions[st->version].match(entry.data, entry.size,
-		    how, name, uid);
-		if (rv == NS_RETURN)
-			break;
-		else if (rv != NS_SUCCESS)
-			continue;
-		if (entry.size > bufsize) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-		memcpy(buffer, entry.data, entry.size);
-		rv = pwdb_versions[st->version].parse(buffer, entry.size, pwd,
-		    errnop);
-		if (rv & NS_TERMINATE)
-			break;
-	}
-fin:
-	if (!stayopen && st->db != NULL) {
-		(void)st->db->close(st->db);
-		st->db = NULL;
-	}
-	if (rv == NS_SUCCESS) {
-		if (!from_compat) {
-			pwd->pw_fields &= ~_PWF_SOURCE;
-			pwd->pw_fields |= _PWF_FILES;
-		}
-		if (retval != NULL)
-			*(struct passwd **)retval = pwd;
-	}
-	return (rv);
-}
-
-
-/*
- * common passwd line matching and parsing
- */
-int
-__pw_match_entry(const char *entry, size_t entrysize, enum nss_lookup_type how,
-    const char *name, uid_t uid)
-{
-	const char	*p, *eom;
-	char		*q;
-	size_t		 len;
-	unsigned long	 m;
-
-	eom = entry + entrysize;
-	for (p = entry; p < eom; p++)
-		if (*p == ':')
-			break;
-	if (*p != ':')
-		return (NS_NOTFOUND);
-	if (how == nss_lt_all)
-		return (NS_SUCCESS);
-	if (how == nss_lt_name) {
-		len = strlen(name);
-		if (len == (p - entry) && memcmp(name, entry, len) == 0)
-			return (NS_SUCCESS);
-		else
-			return (NS_NOTFOUND);
-	}
-	for (p++; p < eom; p++)
-		if (*p == ':')
-			break;
-	if (*p != ':')
-		return (NS_NOTFOUND);
-	m = strtoul(++p, &q, 10);
-	if (q[0] != ':' || (uid_t)m != uid)
-		return (NS_NOTFOUND);
-	else
-		return (NS_SUCCESS);
-}
-
-
-/* XXX buffer must be NUL-terminated.  errnop is not set correctly. */
-int
-__pw_parse_entry(char *buffer, size_t bufsize __unused, struct passwd *pwd,
-    int master, int *errnop __unused)
-{
-
-	if (__pw_scan(buffer, pwd, master ? _PWSCAN_MASTER : 0) == 0)
-		return (NS_NOTFOUND);
-	else
-		return (NS_SUCCESS);
-}
diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c
deleted file mode 100644
index 12d92a4..0000000
--- a/lib/libc/gen/getttyent.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getttyent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.12.14.1 2005/07/25 20:19:39 mdodd Exp $");
-
-#include <ttyent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-static char zapchar;
-static FILE *tf;
-static size_t lbsize;
-static char *line;
-
-#define	MALLOCCHUNK	100
-
-static char *skip(char *);
-static char *value(char *);
-
-struct ttyent *
-getttynam(tty)
-	const char *tty;
-{
-	struct ttyent *t;
-
-	if (strncmp(tty, "/dev/", 5) == 0)
-		tty += 5;
-	setttyent();
-	while ( (t = getttyent()) )
-		if (!strcmp(tty, t->ty_name))
-			break;
-	endttyent();
-	return (t);
-}
-
-struct ttyent *
-getttyent()
-{
-	static struct ttyent tty;
-	char *p;
-	int c;
-	size_t i;
-
-	if (!tf && !setttyent())
-		return (NULL);
-	for (;;) {
-		if (!fgets(p = line, lbsize, tf))
-			return (NULL);
-		/* extend buffer if line was too big, and retry */
-		while (!index(p, '\n')) {
-			i = strlen(p);
-			lbsize += MALLOCCHUNK;
-			if ((p = realloc(line, lbsize)) == NULL) {
-				(void)endttyent();
-				return (NULL);
-			}
-			line = p;
-			if (!fgets(&line[i], lbsize - i, tf))
-				return (NULL);
-		}
-		while (isspace((unsigned char)*p))
-			++p;
-		if (*p && *p != '#')
-			break;
-	}
-
-#define scmp(e) !strncmp(p, e, sizeof(e) - 1) && isspace((unsigned char)p[sizeof(e) - 1])
-#define	vcmp(e)	!strncmp(p, e, sizeof(e) - 1) && p[sizeof(e) - 1] == '='
-
-	zapchar = 0;
-	tty.ty_name = p;
-	tty.ty_status = 0;
-	tty.ty_window = NULL;
-	tty.ty_group  = _TTYS_NOGROUP;
-
-	p = skip(p);
-	if (!*(tty.ty_getty = p))
-		tty.ty_getty = tty.ty_type = NULL;
-	else {
-		p = skip(p);
-		if (!*(tty.ty_type = p))
-			tty.ty_type = NULL;
-		else {
-			/* compatibility kludge: handle network/dialup specially */
-			if (scmp(_TTYS_DIALUP))
-				tty.ty_status |= TTY_DIALUP;
-			else if (scmp(_TTYS_NETWORK))
-				tty.ty_status |= TTY_NETWORK;
-			p = skip(p);
-		}
-	}
-
-	for (; *p; p = skip(p)) {
-		if (scmp(_TTYS_OFF))
-			tty.ty_status &= ~TTY_ON;
-		else if (scmp(_TTYS_ON))
-			tty.ty_status |= TTY_ON;
-		else if (scmp(_TTYS_SECURE))
-			tty.ty_status |= TTY_SECURE;
-		else if (scmp(_TTYS_INSECURE))
-			tty.ty_status &= ~TTY_SECURE;
-		else if (scmp(_TTYS_DIALUP))
-			tty.ty_status |= TTY_DIALUP;
-		else if (scmp(_TTYS_NETWORK))
-			tty.ty_status |= TTY_NETWORK;
-		else if (vcmp(_TTYS_WINDOW))
-			tty.ty_window = value(p);
-		else if (vcmp(_TTYS_GROUP))
-			tty.ty_group = value(p);
-		else
-			break;
-	}
-
-	if (zapchar == '#' || *p == '#')
-		while ((c = *++p) == ' ' || c == '\t')
-			;
-	tty.ty_comment = p;
-	if (*p == 0)
-		tty.ty_comment = 0;
-	if ( (p = index(p, '\n')) )
-		*p = '\0';
-	return (&tty);
-}
-
-#define	QUOTED	1
-
-/*
- * Skip over the current field, removing quotes, and return a pointer to
- * the next field.
- */
-static char *
-skip(p)
-	char *p;
-{
-	char *t;
-	int c, q;
-
-	for (q = 0, t = p; (c = *p) != '\0'; p++) {
-		if (c == '"') {
-			q ^= QUOTED;	/* obscure, but nice */
-			continue;
-		}
-		if (q == QUOTED && *p == '\\' && *(p+1) == '"')
-			p++;
-		*t++ = *p;
-		if (q == QUOTED)
-			continue;
-		if (c == '#') {
-			zapchar = c;
-			*p = 0;
-			break;
-		}
-		if (c == '\t' || c == ' ' || c == '\n') {
-			zapchar = c;
-			*p++ = 0;
-			while ((c = *p) == '\t' || c == ' ' || c == '\n')
-				p++;
-			break;
-		}
-	}
-	*--t = '\0';
-	return (p);
-}
-
-static char *
-value(p)
-	char *p;
-{
-
-	return ((p = index(p, '=')) ? ++p : NULL);
-}
-
-int
-setttyent()
-{
-
-	if (line == NULL) {
-		if ((line = malloc(MALLOCCHUNK)) == NULL)
-			return (0);
-		lbsize = MALLOCCHUNK;
-	}
-	if (tf) {
-		rewind(tf);
-		return (1);
-	} else if ( (tf = fopen(_PATH_TTYS, "r")) )
-		return (1);
-	return (0);
-}
-
-int
-endttyent()
-{
-	int rval;
-
-	/*
-         * NB: Don't free `line' because getttynam()
-	 * may still be referencing it
-	 */
-	if (tf) {
-		rval = (fclose(tf) != EOF);
-		tf = NULL;
-		return (rval);
-	}
-	return (1);
-}
-
-static int
-isttystat(tty, flag)
-	const char *tty;
-	int flag;
-{
-	struct ttyent *t;
-
-	return ((t = getttynam(tty)) == NULL) ? 0 : !!(t->ty_status & flag);
-}
-
-
-int
-isdialuptty(tty)
-	const char *tty;
-{
-
-	return isttystat(tty, TTY_DIALUP);
-}
-
-int isnettty(tty)
-	const char *tty;
-{
-
-	return isttystat(tty, TTY_NETWORK);
-}
diff --git a/lib/libc/gen/getusershell.c b/lib/libc/gen/getusershell.c
deleted file mode 100644
index b8fd9b4..0000000
--- a/lib/libc/gen/getusershell.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getusershell.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-/*	$NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $	*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getusershell.c,v 1.9 2003/04/24 20:16:21 nectar Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/file.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <nsswitch.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stringlist.h>
-#include <unistd.h>
-
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/ypclnt.h>
-#include <rpcsvc/yp_prot.h>
-#endif
-#include "un-namespace.h"
-
-/*
- * Local shells should NOT be added here.  They should be added in
- * /etc/shells.
- */
-
-static const char *const okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
-static const char *const *curshell;
-static StringList	 *sl;
-
-static const char *const *initshells(void);
-
-/*
- * Get a list of shells from "shells" nsswitch database
- */
-char *
-getusershell(void)
-{
-	char *ret;
-
-	if (curshell == NULL)
-		curshell = initshells();
-	/*LINTED*/
-	ret = (char *)*curshell;
-	if (ret != NULL)
-		curshell++;
-	return (ret);
-}
-
-void
-endusershell(void)
-{
-	if (sl) {
-		sl_free(sl, 1);
-		sl = NULL;
-	}
-	curshell = NULL;
-}
-
-void
-setusershell(void)
-{
-
-	curshell = initshells();
-}
-
-
-static int	_local_initshells(void *, void *, va_list);
-
-/*ARGSUSED*/
-static int
-_local_initshells(rv, cb_data, ap)
-	void	*rv;
-	void	*cb_data;
-	va_list	 ap;
-{
-	char	*sp, *cp;
-	FILE	*fp;
-	char	 line[MAXPATHLEN + 2];
-
-	if (sl)
-		sl_free(sl, 1);
-	sl = sl_init();
-
-	if ((fp = fopen(_PATH_SHELLS, "r")) == NULL)
-		return NS_UNAVAIL;
-
-	sp = cp = line;
-	while (fgets(cp, MAXPATHLEN + 1, fp) != NULL) {
-		while (*cp != '#' && *cp != '/' && *cp != '\0')
-			cp++;
-		if (*cp == '#' || *cp == '\0')
-			continue;
-		sp = cp;
-		while (!isspace(*cp) && *cp != '#' && *cp != '\0')
-			cp++;
-		*cp++ = '\0';
-		sl_add(sl, strdup(sp));
-	}
-	(void)fclose(fp);
-	return NS_SUCCESS;
-}
-
-#ifdef HESIOD
-static int	_dns_initshells(void *, void *, va_list);
-
-/*ARGSUSED*/
-static int
-_dns_initshells(rv, cb_data, ap)
-	void	*rv;
-	void	*cb_data;
-	va_list	 ap;
-{
-	char	  shellname[] = "shells-XXXXX";
-	int	  hsindex, hpi, r;
-	char	**hp;
-	void	 *context;
-
-	if (sl)
-		sl_free(sl, 1);
-	sl = sl_init();
-	r = NS_UNAVAIL;
-	if (hesiod_init(&context) == -1)
-		return (r);
-
-	for (hsindex = 0; ; hsindex++) {
-		snprintf(shellname, sizeof(shellname)-1, "shells-%d", hsindex);
-		hp = hesiod_resolve(context, shellname, "shells");
-		if (hp == NULL) {
-			if (errno == ENOENT) {
-				if (hsindex == 0)
-					r = NS_NOTFOUND;
-				else
-					r = NS_SUCCESS;
-			}
-			break;
-		} else {
-			for (hpi = 0; hp[hpi]; hpi++)
-				sl_add(sl, hp[hpi]);
-			free(hp);
-		}
-	}
-	hesiod_end(context);
-	return (r);
-}
-#endif /* HESIOD */
-
-#ifdef YP
-static int	_nis_initshells(void *, void *, va_list);
-
-/*ARGSUSED*/
-static int
-_nis_initshells(rv, cb_data, ap)
-	void	*rv;
-	void	*cb_data;
-	va_list	 ap;
-{
-	static char *ypdomain;
-	char	*key, *data;
-	char	*lastkey;
-	int	 keylen, datalen;
-	int	 r;
-
-	if (sl)
-		sl_free(sl, 1);
-	sl = sl_init();
-
-	if (ypdomain == NULL) {
-		switch (yp_get_default_domain(&ypdomain)) {
-		case 0:
-			break;
-		case YPERR_RESRC:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	}
-
-	/*
-	 * `key' and `data' point to strings dynamically allocated by
-	 * the yp_... functions.
-	 * `data' is directly put into the stringlist of shells.
-	 */
-	key = data = NULL;
-	if (yp_first(ypdomain, "shells", &key, &keylen, &data, &datalen))
-		return NS_UNAVAIL;
-	do {
-		data[datalen] = '\0';		/* clear trailing \n */
-		sl_add(sl, data);
-
-		lastkey = key;
-		r = yp_next(ypdomain, "shells", lastkey, keylen,
-		    &key, &keylen, &data, &datalen);
-		free(lastkey);
-	} while (r == 0);
-	
-	if (r == YPERR_NOMORE) {
-		/*
-		 * `data' and `key' ought to be NULL - do not try to free them.
-		 */
-		return NS_SUCCESS;
-	}
-
-	return NS_UNAVAIL;
-}
-#endif /* YP */
-
-static const char *const *
-initshells()
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_local_initshells, NULL)
-		NS_DNS_CB(_dns_initshells, NULL)
-		NS_NIS_CB(_nis_initshells, NULL)
-		{ 0 }
-	};
-	if (sl)
-		sl_free(sl, 1);
-	sl = sl_init();
-
-	if (_nsdispatch(NULL, dtab, NSDB_SHELLS, "initshells", __nsdefaultsrc)
-	    != NS_SUCCESS) {
-		if (sl)
-			sl_free(sl, 1);
-		sl = NULL;
-		return (okshells);
-	}
-	sl_add(sl, NULL);
-
-	return (const char *const *)(sl->sl_str);
-}
diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c
deleted file mode 100644
index be93b00..0000000
--- a/lib/libc/gen/getvfsbyname.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1995
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)kvm_getvfsbyname.c	8.1 (Berkeley) 4/3/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getvfsbyname.c,v 1.10 2003/10/29 10:45:01 tjr Exp $");
-
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/sysctl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Given a filesystem name, determine if it is resident in the kernel,
- * and if it is resident, return its xvfsconf structure.
- */
-int
-getvfsbyname(fsname, vfcp)
-	const char *fsname;
-	struct xvfsconf *vfcp;
-{
-	struct xvfsconf *xvfsp;
-	size_t buflen;
-	int cnt, i;
-
-	if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0)
-		return (-1);
-	xvfsp = malloc(buflen);
-	if (xvfsp == NULL)
-		return (-1);
-	if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) {
-		free(xvfsp);
-		return (-1);
-	}
-	cnt = buflen / sizeof(struct xvfsconf);
-	for (i = 0; i < cnt; i++) {
-		if (strcmp(fsname, xvfsp[i].vfc_name) == 0) {
-			memcpy(vfcp, xvfsp + i, sizeof(struct xvfsconf));
-			free(xvfsp);
-			return (0);
-		}
-	}
-	free(xvfsp);
-	errno = ENOENT;
-	return (-1);
-}
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
deleted file mode 100644
index e237262..0000000
--- a/lib/libc/gen/glob.c
+++ /dev/null
@@ -1,956 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.22.8.1 2005/10/04 14:31:10 ache Exp $");
-
-/*
- * glob(3) -- a superset of the one defined in POSIX 1003.2.
- *
- * The [!...] convention to negate a range is supported (SysV, Posix, ksh).
- *
- * Optional extra services, controlled by flags not defined by POSIX:
- *
- * GLOB_QUOTE:
- *	Escaping convention: \ inhibits any special meaning the following
- *	character might have (except \ at end of string is retained).
- * GLOB_MAGCHAR:
- *	Set in gl_flags if pattern contained a globbing character.
- * GLOB_NOMAGIC:
- *	Same as GLOB_NOCHECK, but it will only append pattern if it did
- *	not contain any magic characters.  [Used in csh style globbing]
- * GLOB_ALTDIRFUNC:
- *	Use alternately specified directory access functions.
- * GLOB_TILDE:
- *	expand ~user/foo to the /home/dir/of/user/foo
- * GLOB_BRACE:
- *	expand {1,2}{a,b} to 1a 1b 2a 2b
- * gl_matchc:
- *	Number of matches in the current invocation of glob.
- */
-
-/*
- * Some notes on multibyte character support:
- * 1. Patterns with illegal byte sequences match nothing - even if
- *    GLOB_NOCHECK is specified.
- * 2. Illegal byte sequences in filenames are handled by treating them as
- *    single-byte characters with a value of the first byte of the sequence
- *    cast to wchar_t.
- * 3. State-dependent encodings are not currently supported.
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <glob.h>
-#include <limits.h>
-#include <pwd.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <wchar.h>
-
-#include "collate.h"
-
-#define	DOLLAR		'$'
-#define	DOT		'.'
-#define	EOS		'\0'
-#define	LBRACKET	'['
-#define	NOT		'!'
-#define	QUESTION	'?'
-#define	QUOTE		'\\'
-#define	RANGE		'-'
-#define	RBRACKET	']'
-#define	SEP		'/'
-#define	STAR		'*'
-#define	TILDE		'~'
-#define	UNDERSCORE	'_'
-#define	LBRACE		'{'
-#define	RBRACE		'}'
-#define	SLASH		'/'
-#define	COMMA		','
-
-#ifndef DEBUG
-
-#define	M_QUOTE		0x8000000000ULL
-#define	M_PROTECT	0x4000000000ULL
-#define	M_MASK		0xffffffffffULL
-#define	M_CHAR		0x00ffffffffULL
-
-typedef uint_fast64_t Char;
-
-#else
-
-#define	M_QUOTE		0x80
-#define	M_PROTECT	0x40
-#define	M_MASK		0xff
-#define	M_CHAR		0x7f
-
-typedef char Char;
-
-#endif
-
-
-#define	CHAR(c)		((Char)((c)&M_CHAR))
-#define	META(c)		((Char)((c)|M_QUOTE))
-#define	M_ALL		META('*')
-#define	M_END		META(']')
-#define	M_NOT		META('!')
-#define	M_ONE		META('?')
-#define	M_RNG		META('-')
-#define	M_SET		META('[')
-#define	ismeta(c)	(((c)&M_QUOTE) != 0)
-
-
-static int	 compare(const void *, const void *);
-static int	 g_Ctoc(const Char *, char *, u_int);
-static int	 g_lstat(Char *, struct stat *, glob_t *);
-static DIR	*g_opendir(Char *, glob_t *);
-static Char	*g_strchr(Char *, wchar_t);
-#ifdef notdef
-static Char	*g_strcat(Char *, const Char *);
-#endif
-static int	 g_stat(Char *, struct stat *, glob_t *);
-static int	 glob0(const Char *, glob_t *, int *);
-static int	 glob1(Char *, glob_t *, int *);
-static int	 glob2(Char *, Char *, Char *, Char *, glob_t *, int *);
-static int	 glob3(Char *, Char *, Char *, Char *, Char *, glob_t *, int *);
-static int	 globextend(const Char *, glob_t *, int *);
-static const Char *	
-		 globtilde(const Char *, Char *, size_t, glob_t *);
-static int	 globexp1(const Char *, glob_t *, int *);
-static int	 globexp2(const Char *, const Char *, glob_t *, int *, int *);
-static int	 match(Char *, Char *, Char *);
-#ifdef DEBUG
-static void	 qprintf(const char *, Char *);
-#endif
-
-int
-glob(pattern, flags, errfunc, pglob)
-	const char *pattern;
-	int flags, (*errfunc)(const char *, int);
-	glob_t *pglob;
-{
-	const u_char *patnext;
-	int limit;
-	Char *bufnext, *bufend, patbuf[MAXPATHLEN], prot;
-	mbstate_t mbs;
-	wchar_t wc;
-	size_t clen;
-
-	patnext = (u_char *) pattern;
-	if (!(flags & GLOB_APPEND)) {
-		pglob->gl_pathc = 0;
-		pglob->gl_pathv = NULL;
-		if (!(flags & GLOB_DOOFFS))
-			pglob->gl_offs = 0;
-	}
-	if (flags & GLOB_LIMIT) {
-		limit = pglob->gl_matchc;
-		if (limit == 0)
-			limit = ARG_MAX;
-	} else
-		limit = 0;
-	pglob->gl_flags = flags & ~GLOB_MAGCHAR;
-	pglob->gl_errfunc = errfunc;
-	pglob->gl_matchc = 0;
-
-	bufnext = patbuf;
-	bufend = bufnext + MAXPATHLEN - 1;
-	if (flags & GLOB_NOESCAPE) {
-		memset(&mbs, 0, sizeof(mbs));
-		while (bufend - bufnext >= MB_CUR_MAX) {
-			clen = mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs);
-			if (clen == (size_t)-1 || clen == (size_t)-2)
-				return (GLOB_NOMATCH);
-			else if (clen == 0)
-				break;
-			*bufnext++ = wc;
-			patnext += clen;
-		}
-	} else {
-		/* Protect the quoted characters. */
-		memset(&mbs, 0, sizeof(mbs));
-		while (bufend - bufnext >= MB_CUR_MAX) {
-			if (*patnext == QUOTE) {
-				if (*++patnext == EOS) {
-					*bufnext++ = QUOTE | M_PROTECT;
-					continue;
-				}
-				prot = M_PROTECT;
-			} else
-				prot = 0;
-			clen = mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs);
-			if (clen == (size_t)-1 || clen == (size_t)-2)
-				return (GLOB_NOMATCH);
-			else if (clen == 0)
-				break;
-			*bufnext++ = wc | prot;
-			patnext += clen;
-		}
-	}
-	*bufnext = EOS;
-
-	if (flags & GLOB_BRACE)
-	    return globexp1(patbuf, pglob, &limit);
-	else
-	    return glob0(patbuf, pglob, &limit);
-}
-
-/*
- * Expand recursively a glob {} pattern. When there is no more expansion
- * invoke the standard globbing routine to glob the rest of the magic
- * characters
- */
-static int
-globexp1(pattern, pglob, limit)
-	const Char *pattern;
-	glob_t *pglob;
-	int *limit;
-{
-	const Char* ptr = pattern;
-	int rv;
-
-	/* Protect a single {}, for find(1), like csh */
-	if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS)
-		return glob0(pattern, pglob, limit);
-
-	while ((ptr = (const Char *) g_strchr((Char *) ptr, LBRACE)) != NULL)
-		if (!globexp2(ptr, pattern, pglob, &rv, limit))
-			return rv;
-
-	return glob0(pattern, pglob, limit);
-}
-
-
-/*
- * Recursive brace globbing helper. Tries to expand a single brace.
- * If it succeeds then it invokes globexp1 with the new pattern.
- * If it fails then it tries to glob the rest of the pattern and returns.
- */
-static int
-globexp2(ptr, pattern, pglob, rv, limit)
-	const Char *ptr, *pattern;
-	glob_t *pglob;
-	int *rv, *limit;
-{
-	int     i;
-	Char   *lm, *ls;
-	const Char *pe, *pm, *pm1, *pl;
-	Char    patbuf[MAXPATHLEN];
-
-	/* copy part up to the brace */
-	for (lm = patbuf, pm = pattern; pm != ptr; *lm++ = *pm++)
-		continue;
-	*lm = EOS;
-	ls = lm;
-
-	/* Find the balanced brace */
-	for (i = 0, pe = ++ptr; *pe; pe++)
-		if (*pe == LBRACKET) {
-			/* Ignore everything between [] */
-			for (pm = pe++; *pe != RBRACKET && *pe != EOS; pe++)
-				continue;
-			if (*pe == EOS) {
-				/*
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pe = pm;
-			}
-		}
-		else if (*pe == LBRACE)
-			i++;
-		else if (*pe == RBRACE) {
-			if (i == 0)
-				break;
-			i--;
-		}
-
-	/* Non matching braces; just glob the pattern */
-	if (i != 0 || *pe == EOS) {
-		*rv = glob0(patbuf, pglob, limit);
-		return 0;
-	}
-
-	for (i = 0, pl = pm = ptr; pm <= pe; pm++)
-		switch (*pm) {
-		case LBRACKET:
-			/* Ignore everything between [] */
-			for (pm1 = pm++; *pm != RBRACKET && *pm != EOS; pm++)
-				continue;
-			if (*pm == EOS) {
-				/*
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pm = pm1;
-			}
-			break;
-
-		case LBRACE:
-			i++;
-			break;
-
-		case RBRACE:
-			if (i) {
-			    i--;
-			    break;
-			}
-			/* FALLTHROUGH */
-		case COMMA:
-			if (i && *pm == COMMA)
-				break;
-			else {
-				/* Append the current string */
-				for (lm = ls; (pl < pm); *lm++ = *pl++)
-					continue;
-				/*
-				 * Append the rest of the pattern after the
-				 * closing brace
-				 */
-				for (pl = pe + 1; (*lm++ = *pl++) != EOS;)
-					continue;
-
-				/* Expand the current pattern */
-#ifdef DEBUG
-				qprintf("globexp2:", patbuf);
-#endif
-				*rv = globexp1(patbuf, pglob, limit);
-
-				/* move after the comma, to the next string */
-				pl = pm + 1;
-			}
-			break;
-
-		default:
-			break;
-		}
-	*rv = 0;
-	return 0;
-}
-
-
-
-/*
- * expand tilde from the passwd file.
- */
-static const Char *
-globtilde(pattern, patbuf, patbuf_len, pglob)
-	const Char *pattern;
-	Char *patbuf;
-	size_t patbuf_len;
-	glob_t *pglob;
-{
-	struct passwd *pwd;
-	char *h;
-	const Char *p;
-	Char *b, *eb;
-
-	if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE))
-		return pattern;
-
-	/* 
-	 * Copy up to the end of the string or / 
-	 */
-	eb = &patbuf[patbuf_len - 1];
-	for (p = pattern + 1, h = (char *) patbuf;
-	    h < (char *)eb && *p && *p != SLASH; *h++ = *p++)
-		continue;
-
-	*h = EOS;
-
-	if (((char *) patbuf)[0] == EOS) {
-		/*
-		 * handle a plain ~ or ~/ by expanding $HOME first (iff
-		 * we're not running setuid or setgid) and then trying
-		 * the password file
-		 */
-		if (issetugid() != 0 ||
-		    (h = getenv("HOME")) == NULL) {
-			if (((h = getlogin()) != NULL &&
-			     (pwd = getpwnam(h)) != NULL) ||
-			    (pwd = getpwuid(getuid())) != NULL)
-				h = pwd->pw_dir;
-			else
-				return pattern;
-		}
-	}
-	else {
-		/*
-		 * Expand a ~user
-		 */
-		if ((pwd = getpwnam((char*) patbuf)) == NULL)
-			return pattern;
-		else
-			h = pwd->pw_dir;
-	}
-
-	/* Copy the home directory */
-	for (b = patbuf; b < eb && *h; *b++ = *h++)
-		continue;
-
-	/* Append the rest of the pattern */
-	while (b < eb && (*b++ = *p++) != EOS)
-		continue;
-	*b = EOS;
-
-	return patbuf;
-}
-
-
-/*
- * The main glob() routine: compiles the pattern (optionally processing
- * quotes), calls glob1() to do the real pattern matching, and finally
- * sorts the list (unless unsorted operation is requested).  Returns 0
- * if things went well, nonzero if errors occurred.
- */
-static int
-glob0(pattern, pglob, limit)
-	const Char *pattern;
-	glob_t *pglob;
-	int *limit;
-{
-	const Char *qpatnext;
-	int c, err, oldpathc;
-	Char *bufnext, patbuf[MAXPATHLEN];
-
-	qpatnext = globtilde(pattern, patbuf, MAXPATHLEN, pglob);
-	oldpathc = pglob->gl_pathc;
-	bufnext = patbuf;
-
-	/* We don't need to check for buffer overflow any more. */
-	while ((c = *qpatnext++) != EOS) {
-		switch (c) {
-		case LBRACKET:
-			c = *qpatnext;
-			if (c == NOT)
-				++qpatnext;
-			if (*qpatnext == EOS ||
-			    g_strchr((Char *) qpatnext+1, RBRACKET) == NULL) {
-				*bufnext++ = LBRACKET;
-				if (c == NOT)
-					--qpatnext;
-				break;
-			}
-			*bufnext++ = M_SET;
-			if (c == NOT)
-				*bufnext++ = M_NOT;
-			c = *qpatnext++;
-			do {
-				*bufnext++ = CHAR(c);
-				if (*qpatnext == RANGE &&
-				    (c = qpatnext[1]) != RBRACKET) {
-					*bufnext++ = M_RNG;
-					*bufnext++ = CHAR(c);
-					qpatnext += 2;
-				}
-			} while ((c = *qpatnext++) != RBRACKET);
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_END;
-			break;
-		case QUESTION:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_ONE;
-			break;
-		case STAR:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			/* collapse adjacent stars to one,
-			 * to avoid exponential behavior
-			 */
-			if (bufnext == patbuf || bufnext[-1] != M_ALL)
-			    *bufnext++ = M_ALL;
-			break;
-		default:
-			*bufnext++ = CHAR(c);
-			break;
-		}
-	}
-	*bufnext = EOS;
-#ifdef DEBUG
-	qprintf("glob0:", patbuf);
-#endif
-
-	if ((err = glob1(patbuf, pglob, limit)) != 0)
-		return(err);
-
-	/*
-	 * If there was no match we are going to append the pattern
-	 * if GLOB_NOCHECK was specified or if GLOB_NOMAGIC was specified
-	 * and the pattern did not contain any magic characters
-	 * GLOB_NOMAGIC is there just for compatibility with csh.
-	 */
-	if (pglob->gl_pathc == oldpathc) {
-		if (((pglob->gl_flags & GLOB_NOCHECK) ||
-		    ((pglob->gl_flags & GLOB_NOMAGIC) &&
-			!(pglob->gl_flags & GLOB_MAGCHAR))))
-			return(globextend(pattern, pglob, limit));
-		else
-			return(GLOB_NOMATCH);
-	}
-	if (!(pglob->gl_flags & GLOB_NOSORT))
-		qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc,
-		    pglob->gl_pathc - oldpathc, sizeof(char *), compare);
-	return(0);
-}
-
-static int
-compare(p, q)
-	const void *p, *q;
-{
-	return(strcmp(*(char **)p, *(char **)q));
-}
-
-static int
-glob1(pattern, pglob, limit)
-	Char *pattern;
-	glob_t *pglob;
-	int *limit;
-{
-	Char pathbuf[MAXPATHLEN];
-
-	/* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */
-	if (*pattern == EOS)
-		return(0);
-	return(glob2(pathbuf, pathbuf, pathbuf + MAXPATHLEN - 1,
-	    pattern, pglob, limit));
-}
-
-/*
- * The functions glob2 and glob3 are mutually recursive; there is one level
- * of recursion for each segment in the pattern that contains one or more
- * meta characters.
- */
-static int
-glob2(pathbuf, pathend, pathend_last, pattern, pglob, limit)
-	Char *pathbuf, *pathend, *pathend_last, *pattern;
-	glob_t *pglob;
-	int *limit;
-{
-	struct stat sb;
-	Char *p, *q;
-	int anymeta;
-
-	/*
-	 * Loop over pattern segments until end of pattern or until
-	 * segment with meta character found.
-	 */
-	for (anymeta = 0;;) {
-		if (*pattern == EOS) {		/* End of pattern? */
-			*pathend = EOS;
-			if (g_lstat(pathbuf, &sb, pglob))
-				return(0);
-
-			if (((pglob->gl_flags & GLOB_MARK) &&
-			    pathend[-1] != SEP) && (S_ISDIR(sb.st_mode)
-			    || (S_ISLNK(sb.st_mode) &&
-			    (g_stat(pathbuf, &sb, pglob) == 0) &&
-			    S_ISDIR(sb.st_mode)))) {
-				if (pathend + 1 > pathend_last)
-					return (GLOB_ABORTED);
-				*pathend++ = SEP;
-				*pathend = EOS;
-			}
-			++pglob->gl_matchc;
-			return(globextend(pathbuf, pglob, limit));
-		}
-
-		/* Find end of next segment, copy tentatively to pathend. */
-		q = pathend;
-		p = pattern;
-		while (*p != EOS && *p != SEP) {
-			if (ismeta(*p))
-				anymeta = 1;
-			if (q + 1 > pathend_last)
-				return (GLOB_ABORTED);
-			*q++ = *p++;
-		}
-
-		if (!anymeta) {		/* No expansion, do next segment. */
-			pathend = q;
-			pattern = p;
-			while (*pattern == SEP) {
-				if (pathend + 1 > pathend_last)
-					return (GLOB_ABORTED);
-				*pathend++ = *pattern++;
-			}
-		} else			/* Need expansion, recurse. */
-			return(glob3(pathbuf, pathend, pathend_last, pattern, p,
-			    pglob, limit));
-	}
-	/* NOTREACHED */
-}
-
-static int
-glob3(pathbuf, pathend, pathend_last, pattern, restpattern, pglob, limit)
-	Char *pathbuf, *pathend, *pathend_last, *pattern, *restpattern;
-	glob_t *pglob;
-	int *limit;
-{
-	struct dirent *dp;
-	DIR *dirp;
-	int err;
-	char buf[MAXPATHLEN];
-
-	/*
-	 * The readdirfunc declaration can't be prototyped, because it is
-	 * assigned, below, to two functions which are prototyped in glob.h
-	 * and dirent.h as taking pointers to differently typed opaque
-	 * structures.
-	 */
-	struct dirent *(*readdirfunc)();
-
-	if (pathend > pathend_last)
-		return (GLOB_ABORTED);
-	*pathend = EOS;
-	errno = 0;
-
-	if ((dirp = g_opendir(pathbuf, pglob)) == NULL) {
-		/* TODO: don't call for ENOENT or ENOTDIR? */
-		if (pglob->gl_errfunc) {
-			if (g_Ctoc(pathbuf, buf, sizeof(buf)))
-				return (GLOB_ABORTED);
-			if (pglob->gl_errfunc(buf, errno) ||
-			    pglob->gl_flags & GLOB_ERR)
-				return (GLOB_ABORTED);
-		}
-		return(0);
-	}
-
-	err = 0;
-
-	/* Search directory for matching names. */
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		readdirfunc = pglob->gl_readdir;
-	else
-		readdirfunc = readdir;
-	while ((dp = (*readdirfunc)(dirp))) {
-		u_char *sc;
-		Char *dc;
-		wchar_t wc;
-		size_t clen;
-		mbstate_t mbs;
-
-		/* Initial DOT must be matched literally. */
-		if (dp->d_name[0] == DOT && *pattern != DOT)
-			continue;
-		memset(&mbs, 0, sizeof(mbs));
-		dc = pathend;
-		sc = (u_char *) dp->d_name;
-		while (dc < pathend_last) {
-			clen = mbrtowc(&wc, sc, MB_LEN_MAX, &mbs);
-			if (clen == (size_t)-1 || clen == (size_t)-2) {
-				wc = *sc;
-				clen = 1;
-				memset(&mbs, 0, sizeof(mbs));
-			}
-			if ((*dc++ = wc) == EOS)
-				break;
-			sc += clen;
-		}
-		if (!match(pathend, pattern, restpattern)) {
-			*pathend = EOS;
-			continue;
-		}
-		err = glob2(pathbuf, --dc, pathend_last, restpattern,
-		    pglob, limit);
-		if (err)
-			break;
-	}
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		(*pglob->gl_closedir)(dirp);
-	else
-		closedir(dirp);
-	return(err);
-}
-
-
-/*
- * Extend the gl_pathv member of a glob_t structure to accomodate a new item,
- * add the new item, and update gl_pathc.
- *
- * This assumes the BSD realloc, which only copies the block when its size
- * crosses a power-of-two boundary; for v7 realloc, this would cause quadratic
- * behavior.
- *
- * Return 0 if new item added, error code if memory couldn't be allocated.
- *
- * Invariant of the glob_t structure:
- *	Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and
- *	gl_pathv points to (gl_offs + gl_pathc + 1) items.
- */
-static int
-globextend(path, pglob, limit)
-	const Char *path;
-	glob_t *pglob;
-	int *limit;
-{
-	char **pathv;
-	int i;
-	u_int newsize, len;
-	char *copy;
-	const Char *p;
-
-	if (*limit && pglob->gl_pathc > *limit) {
-		errno = 0;
-		return (GLOB_NOSPACE);
-	}
-
-	newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
-	pathv = pglob->gl_pathv ?
-		    realloc((char *)pglob->gl_pathv, newsize) :
-		    malloc(newsize);
-	if (pathv == NULL) {
-		if (pglob->gl_pathv) {
-			free(pglob->gl_pathv);
-			pglob->gl_pathv = NULL;
-		}
-		return(GLOB_NOSPACE);
-	}
-
-	if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
-		/* first time around -- clear initial gl_offs items */
-		pathv += pglob->gl_offs;
-		for (i = pglob->gl_offs; --i >= 0; )
-			*--pathv = NULL;
-	}
-	pglob->gl_pathv = pathv;
-
-	for (p = path; *p++;)
-		continue;
-	len = MB_CUR_MAX * (size_t)(p - path);	/* XXX overallocation */
-	if ((copy = malloc(len)) != NULL) {
-		if (g_Ctoc(path, copy, len)) {
-			free(copy);
-			return (GLOB_NOSPACE);
-		}
-		pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
-	}
-	pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
-	return(copy == NULL ? GLOB_NOSPACE : 0);
-}
-
-/*
- * pattern matching function for filenames.  Each occurrence of the *
- * pattern causes a recursion level.
- */
-static int
-match(name, pat, patend)
-	Char *name, *pat, *patend;
-{
-	int ok, negate_range;
-	Char c, k;
-
-	while (pat < patend) {
-		c = *pat++;
-		switch (c & M_MASK) {
-		case M_ALL:
-			if (pat == patend)
-				return(1);
-			do
-			    if (match(name, pat, patend))
-				    return(1);
-			while (*name++ != EOS);
-			return(0);
-		case M_ONE:
-			if (*name++ == EOS)
-				return(0);
-			break;
-		case M_SET:
-			ok = 0;
-			if ((k = *name++) == EOS)
-				return(0);
-			if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS)
-				++pat;
-			while (((c = *pat++) & M_MASK) != M_END)
-				if ((*pat & M_MASK) == M_RNG) {
-					if (__collate_load_error ?
-					    CHAR(c) <= CHAR(k) && CHAR(k) <= CHAR(pat[1]) :
-					       __collate_range_cmp(CHAR(c), CHAR(k)) <= 0
-					    && __collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0
-					   )
-						ok = 1;
-					pat += 2;
-				} else if (c == k)
-					ok = 1;
-			if (ok == negate_range)
-				return(0);
-			break;
-		default:
-			if (*name++ != c)
-				return(0);
-			break;
-		}
-	}
-	return(*name == EOS);
-}
-
-/* Free allocated data belonging to a glob_t structure. */
-void
-globfree(pglob)
-	glob_t *pglob;
-{
-	int i;
-	char **pp;
-
-	if (pglob->gl_pathv != NULL) {
-		pp = pglob->gl_pathv + pglob->gl_offs;
-		for (i = pglob->gl_pathc; i--; ++pp)
-			if (*pp)
-				free(*pp);
-		free(pglob->gl_pathv);
-		pglob->gl_pathv = NULL;
-	}
-}
-
-static DIR *
-g_opendir(str, pglob)
-	Char *str;
-	glob_t *pglob;
-{
-	char buf[MAXPATHLEN];
-
-	if (!*str)
-		strcpy(buf, ".");
-	else {
-		if (g_Ctoc(str, buf, sizeof(buf)))
-			return (NULL);
-	}
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_opendir)(buf));
-
-	return(opendir(buf));
-}
-
-static int
-g_lstat(fn, sb, pglob)
-	Char *fn;
-	struct stat *sb;
-	glob_t *pglob;
-{
-	char buf[MAXPATHLEN];
-
-	if (g_Ctoc(fn, buf, sizeof(buf))) {
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_lstat)(buf, sb));
-	return(lstat(buf, sb));
-}
-
-static int
-g_stat(fn, sb, pglob)
-	Char *fn;
-	struct stat *sb;
-	glob_t *pglob;
-{
-	char buf[MAXPATHLEN];
-
-	if (g_Ctoc(fn, buf, sizeof(buf))) {
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_stat)(buf, sb));
-	return(stat(buf, sb));
-}
-
-static Char *
-g_strchr(str, ch)
-	Char *str;
-	wchar_t ch;
-{
-	do {
-		if (*str == ch)
-			return (str);
-	} while (*str++);
-	return (NULL);
-}
-
-static int
-g_Ctoc(str, buf, len)
-	const Char *str;
-	char *buf;
-	u_int len;
-{
-	mbstate_t mbs;
-	size_t clen;
-
-	memset(&mbs, 0, sizeof(mbs));
-	while (len >= MB_CUR_MAX) {
-		clen = wcrtomb(buf, *str, &mbs);
-		if (clen == (size_t)-1)
-			return (1);
-		if (*str == L'\0')
-			return (0);
-		str++;
-		buf += clen;
-		len -= clen;
-	}
-	return (1);
-}
-
-#ifdef DEBUG
-static void
-qprintf(str, s)
-	const char *str;
-	Char *s;
-{
-	Char *p;
-
-	(void)printf("%s:\n", str);
-	for (p = s; *p; p++)
-		(void)printf("%c", CHAR(*p));
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", *p & M_PROTECT ? '"' : ' ');
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", ismeta(*p) ? '_' : ' ');
-	(void)printf("\n");
-}
-#endif
diff --git a/lib/libc/gen/initgroups.c b/lib/libc/gen/initgroups.c
deleted file mode 100644
index 50c910a..0000000
--- a/lib/libc/gen/initgroups.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)initgroups.c	8.1 (Berkeley) 6/4/93";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/initgroups.c,v 1.8 2003/11/19 15:51:26 dds Exp $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include "namespace.h"
-#include <err.h>
-#include "un-namespace.h"
-#include <unistd.h>
-
-int
-initgroups(uname, agroup)
-	const char *uname;
-	gid_t agroup;
-{
-	int ngroups;
-	/*
-	 * Provide space for one group more than NGROUPS to allow
-	 * setgroups to fail and set errno.
-	 */
-	gid_t groups[NGROUPS + 1];
-
-	ngroups = NGROUPS + 1;
-	getgrouplist(uname, agroup, groups, &ngroups);
-	return (setgroups(ngroups, groups));
-}
diff --git a/lib/libc/gen/isatty.c b/lib/libc/gen/isatty.c
deleted file mode 100644
index d16a963..0000000
--- a/lib/libc/gen/isatty.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)isatty.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/isatty.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
-
-#include <termios.h>
-#include <unistd.h>
-
-int
-isatty(fd)
-	int fd;
-{
-	int retval;
-	struct termios t;
-
-	retval = (tcgetattr(fd, &t) != -1);
-	return(retval);
-}
diff --git a/lib/libc/gen/isinf.c b/lib/libc/gen/isinf.c
deleted file mode 100644
index 932675d..0000000
--- a/lib/libc/gen/isinf.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2004 David Schultz <das@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.
- *
- * 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/lib/libc/gen/isinf.c,v 1.2 2004/07/10 15:52:26 marcel Exp $
- */
-
-#include <math.h>
-
-#include "fpmath.h"
-
-/*
- * XXX These routines belong in libm, but they must remain in libc for
- *     binary compat until we can bump libm's major version number.
- */
-
-__weak_reference(__isinf, isinf);
-
-int
-__isinf(double d)
-{
-	union IEEEd2bits u;
-
-	u.d = d;
-	return (u.bits.exp == 2047 && u.bits.manl == 0 && u.bits.manh == 0);
-}
-
-int
-__isinff(float f)
-{
-	union IEEEf2bits u;
-
-	u.f = f;
-	return (u.bits.exp == 255 && u.bits.man == 0);
-}
-
-int
-__isinfl(long double e)
-{
-	union IEEEl2bits u;
-
-	u.e = e;
-	mask_nbit_l(u);
-#ifndef __alpha__
-	return (u.bits.exp == 32767 && u.bits.manl == 0 && u.bits.manh == 0);
-#else
-	return (u.bits.exp == 2047 && u.bits.manl == 0 && u.bits.manh == 0);
-#endif
-}
diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c
deleted file mode 100644
index fd9f029..0000000
--- a/lib/libc/gen/isnan.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2004 David Schultz <das@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.
- *
- * 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/lib/libc/gen/isnan.c,v 1.2 2004/09/24 06:33:22 das Exp $
- */
-
-#include <math.h>
-
-#include "fpmath.h"
-
-/*
- * XXX These routines belong in libm, but they must remain in libc for
- *     binary compat until we can bump libm's major version number.
- */
-
-__weak_reference(__isnan, isnan);
-__weak_reference(__isnanf, isnanf);
-
-int
-__isnan(double d)
-{
-	union IEEEd2bits u;
-
-	u.d = d;
-	return (u.bits.exp == 2047 && (u.bits.manl != 0 || u.bits.manh != 0));
-}
-
-int
-__isnanf(float f)
-{
-	union IEEEf2bits u;
-
-	u.f = f;
-	return (u.bits.exp == 255 && u.bits.man != 0);
-}
diff --git a/lib/libc/gen/jrand48.c b/lib/libc/gen/jrand48.c
deleted file mode 100644
index f47bf2a..0000000
--- a/lib/libc/gen/jrand48.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/jrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include "rand48.h"
-
-long
-jrand48(unsigned short xseed[3])
-{
-	_dorand48(xseed);
-	return ((long) xseed[2] << 16) + (long) xseed[1];
-}
diff --git a/lib/libc/gen/lcong48.c b/lib/libc/gen/lcong48.c
deleted file mode 100644
index 8b11e08..0000000
--- a/lib/libc/gen/lcong48.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/lcong48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-extern unsigned short _rand48_mult[3];
-extern unsigned short _rand48_add;
-
-void
-lcong48(unsigned short p[7])
-{
-	_rand48_seed[0] = p[0];
-	_rand48_seed[1] = p[1];
-	_rand48_seed[2] = p[2];
-	_rand48_mult[0] = p[3];
-	_rand48_mult[1] = p[4];
-	_rand48_mult[2] = p[5];
-	_rand48_add = p[6];
-}
diff --git a/lib/libc/gen/ldexp.c b/lib/libc/gen/ldexp.c
deleted file mode 100644
index ce9e999..0000000
--- a/lib/libc/gen/ldexp.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* @(#)s_scalbn.c 5.1 93/09/24 */
-/* @(#)fdlibm.h 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/ldexp.c,v 1.1 2005/01/22 06:03:40 das Exp $");
-
-#include <sys/types.h>
-#include <machine/endian.h>
-#include <math.h>
-
-/* Bit fiddling routines copied from msun/src/math_private.h,v 1.15 */
-
-#if BYTE_ORDER == BIG_ENDIAN
-
-typedef union
-{
-  double value;
-  struct
-  {
-    uint32_t msw;
-    uint32_t lsw;
-  } parts;
-} ieee_double_shape_type;
-
-#endif
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-
-typedef union
-{
-  double value;
-  struct
-  {
-    uint32_t lsw;
-    uint32_t msw;
-  } parts;
-} ieee_double_shape_type;
-
-#endif
-
-/* Get two 32 bit ints from a double.  */
-
-#define EXTRACT_WORDS(ix0,ix1,d)				\
-do {								\
-  ieee_double_shape_type ew_u;					\
-  ew_u.value = (d);						\
-  (ix0) = ew_u.parts.msw;					\
-  (ix1) = ew_u.parts.lsw;					\
-} while (0)
-
-/* Get the more significant 32 bit int from a double.  */
-
-#define GET_HIGH_WORD(i,d)					\
-do {								\
-  ieee_double_shape_type gh_u;					\
-  gh_u.value = (d);						\
-  (i) = gh_u.parts.msw;						\
-} while (0)
-
-/* Set the more significant 32 bits of a double from an int.  */
-
-#define SET_HIGH_WORD(d,v)					\
-do {								\
-  ieee_double_shape_type sh_u;					\
-  sh_u.value = (d);						\
-  sh_u.parts.msw = (v);						\
-  (d) = sh_u.value;						\
-} while (0)
-
-
-static const double
-two54   =  1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */
-twom54  =  5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */
-huge   = 1.0e+300,
-tiny   = 1.0e-300;
-
-static double
-_copysign(double x, double y)
-{
-	uint32_t hx,hy;
-	GET_HIGH_WORD(hx,x);
-	GET_HIGH_WORD(hy,y);
-	SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000));
-	return x;
-}
-
-double
-ldexp(double x, int n)
-{
-	int32_t k,hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-        k = (hx&0x7ff00000)>>20;		/* extract exponent */
-        if (k==0) {				/* 0 or subnormal x */
-            if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */
-	    x *= two54;
-	    GET_HIGH_WORD(hx,x);
-	    k = ((hx&0x7ff00000)>>20) - 54;
-            if (n< -50000) return tiny*x; 	/*underflow*/
-	    }
-        if (k==0x7ff) return x+x;		/* NaN or Inf */
-        k = k+n;
-        if (k >  0x7fe) return huge*_copysign(huge,x); /* overflow  */
-        if (k > 0) 				/* normal result */
-	    {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;}
-        if (k <= -54) {
-            if (n > 50000) 	/* in case integer overflow in n+k */
-		return huge*_copysign(huge,x);	/*overflow*/
-	    else return tiny*_copysign(tiny,x); 	/*underflow*/
-	}
-        k += 54;				/* subnormal result */
-	SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20));
-        return x*twom54;
-}
diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c
deleted file mode 100644
index 375b2ce..0000000
--- a/lib/libc/gen/lockf.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*	$NetBSD: lockf.c,v 1.1 1997/12/20 20:23:18 kleink Exp $	*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/lockf.c,v 1.8 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-int
-lockf(filedes, function, size)
-	int filedes;
-	int function;
-	off_t size;
-{
-	struct flock fl;
-	int cmd;
-
-	fl.l_start = 0;
-	fl.l_len = size;
-	fl.l_whence = SEEK_CUR;
-
-	switch (function) {
-	case F_ULOCK:
-		cmd = F_SETLK;
-		fl.l_type = F_UNLCK;
-		break;
-	case F_LOCK:
-		cmd = F_SETLKW;
-		fl.l_type = F_WRLCK;
-		break;
-	case F_TLOCK:
-		cmd = F_SETLK;
-		fl.l_type = F_WRLCK;
-		break;
-	case F_TEST:
-		fl.l_type = F_WRLCK;
-		if (_fcntl(filedes, F_GETLK, &fl) == -1)
-			return (-1);
-		if (fl.l_type == F_UNLCK || fl.l_pid == getpid())
-			return (0);
-		errno = EAGAIN;
-		return (-1);
-		/* NOTREACHED */
-	default:
-		errno = EINVAL;
-		return (-1);
-		/* NOTREACHED */
-	}
-
-	return (_fcntl(filedes, cmd, &fl));
-}
diff --git a/lib/libc/gen/lrand48.c b/lib/libc/gen/lrand48.c
deleted file mode 100644
index 948b923..0000000
--- a/lib/libc/gen/lrand48.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/lrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-
-long
-lrand48(void)
-{
-	_dorand48(_rand48_seed);
-	return ((long) _rand48_seed[2] << 15) + ((long) _rand48_seed[1] >> 1);
-}
diff --git a/lib/libc/gen/mrand48.c b/lib/libc/gen/mrand48.c
deleted file mode 100644
index f65ed77..0000000
--- a/lib/libc/gen/mrand48.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/mrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-
-long
-mrand48(void)
-{
-	_dorand48(_rand48_seed);
-	return ((long) _rand48_seed[2] << 16) + (long) _rand48_seed[1];
-}
diff --git a/lib/libc/gen/nftw.c b/lib/libc/gen/nftw.c
deleted file mode 100644
index 01b099a..0000000
--- a/lib/libc/gen/nftw.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*	$OpenBSD: nftw.c,v 1.4 2004/07/07 16:05:23 millert Exp $	*/
-
-/*
- * Copyright (c) 2003, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: nftw.c,v 1.4 2004/07/07 16:05:23 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/nftw.c,v 1.1 2004/08/24 13:00:55 tjr Exp $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fts.h>
-#include <ftw.h>
-#include <limits.h>
-
-int
-nftw(const char *path, int (*fn)(const char *, const struct stat *, int,
-     struct FTW *), int nfds, int ftwflags)
-{
-	char * const paths[2] = { (char *)path, NULL };
-	struct FTW ftw;
-	FTSENT *cur;
-	FTS *ftsp;
-	int error = 0, ftsflags, fnflag, postorder, sverrno;
-
-	/* XXX - nfds is currently unused */
-	if (nfds < 1 || nfds > OPEN_MAX) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ftsflags = FTS_COMFOLLOW;
-	if (!(ftwflags & FTW_CHDIR))
-		ftsflags |= FTS_NOCHDIR;
-	if (ftwflags & FTW_MOUNT)
-		ftsflags |= FTS_XDEV;
-	if (ftwflags & FTW_PHYS)
-		ftsflags |= FTS_PHYSICAL;
-	else
-		ftsflags |= FTS_LOGICAL;
-	postorder = (ftwflags & FTW_DEPTH) != 0;
-	ftsp = fts_open(paths, ftsflags, NULL);
-	if (ftsp == NULL)
-		return (-1);
-	while ((cur = fts_read(ftsp)) != NULL) {
-		switch (cur->fts_info) {
-		case FTS_D:
-			if (postorder)
-				continue;
-			fnflag = FTW_D;
-			break;
-		case FTS_DNR:
-			fnflag = FTW_DNR;
-			break;
-		case FTS_DP:
-			if (!postorder)
-				continue;
-			fnflag = FTW_DP;
-			break;
-		case FTS_F:
-		case FTS_DEFAULT:
-			fnflag = FTW_F;
-			break;
-		case FTS_NS:
-		case FTS_NSOK:
-			fnflag = FTW_NS;
-			break;
-		case FTS_SL:
-			fnflag = FTW_SL;
-			break;
-		case FTS_SLNONE:
-			fnflag = FTW_SLN;
-			break;
-		case FTS_DC:
-			errno = ELOOP;
-			/* FALLTHROUGH */
-		default:
-			error = -1;
-			goto done;
-		}
-		ftw.base = cur->fts_pathlen - cur->fts_namelen;
-		ftw.level = cur->fts_level;
-		error = fn(cur->fts_path, cur->fts_statp, fnflag, &ftw);
-		if (error != 0)
-			break;
-	}
-done:
-	sverrno = errno;
-	if (fts_close(ftsp) != 0 && error == 0)
-		error = -1;
-	else
-		errno = sverrno;
-	return (error);
-}
diff --git a/lib/libc/gen/nice.c b/lib/libc/gen/nice.c
deleted file mode 100644
index 453caa7..0000000
--- a/lib/libc/gen/nice.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)nice.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/nice.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <errno.h>
-#include <unistd.h>
-
-/*
- * Backwards compatible nice.
- */
-int
-nice(incr)
-	int incr;
-{
-	int prio;
-
-	errno = 0;
-	prio = getpriority(PRIO_PROCESS, 0);
-	if (prio == -1 && errno)
-		return (-1);
-	return (setpriority(PRIO_PROCESS, 0, prio + incr));
-}
diff --git a/lib/libc/gen/nlist.c b/lib/libc/gen/nlist.c
deleted file mode 100644
index 9acfb15..0000000
--- a/lib/libc/gen/nlist.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/nlist.c,v 1.18.12.1 2005/12/30 22:13:56 marcel Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <a.out.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#define _NLIST_DO_AOUT
-#define _NLIST_DO_ELF
-
-#ifdef _NLIST_DO_ELF
-#include <machine/elf.h>
-#include <elf-hints.h>
-#endif
-
-int __fdnlist(int, struct nlist *);
-int __aout_fdnlist(int, struct nlist *);
-int __elf_fdnlist(int, struct nlist *);
-
-int
-nlist(name, list)
-	const char *name;
-	struct nlist *list;
-{
-	int fd, n;
-
-	fd = _open(name, O_RDONLY, 0);
-	if (fd < 0)
-		return (-1);
-	n = __fdnlist(fd, list);
-	(void)_close(fd);
-	return (n);
-}
-
-static struct nlist_handlers {
-	int	(*fn)(int fd, struct nlist *list);
-} nlist_fn[] = {
-#ifdef _NLIST_DO_AOUT
-	{ __aout_fdnlist },
-#endif
-#ifdef _NLIST_DO_ELF
-	{ __elf_fdnlist },
-#endif
-};
-
-int
-__fdnlist(fd, list)
-	int fd;
-	struct nlist *list;
-{
-	int n = -1, i;
-
-	for (i = 0; i < sizeof(nlist_fn) / sizeof(nlist_fn[0]); i++) {
-		n = (nlist_fn[i].fn)(fd, list);
-		if (n != -1)
-			break;
-	}
-	return (n);
-}
-
-#define	ISLAST(p)	(p->n_un.n_name == 0 || p->n_un.n_name[0] == 0)
-
-#ifdef _NLIST_DO_AOUT
-int
-__aout_fdnlist(fd, list)
-	int fd;
-	struct nlist *list;
-{
-	struct nlist *p, *symtab;
-	caddr_t strtab, a_out_mmap;
-	off_t stroff, symoff;
-	u_long symsize;
-	int nent;
-	struct exec * exec;
-	struct stat st;
-
-	/* check that file is at least as large as struct exec! */
-	if ((_fstat(fd, &st) < 0) || (st.st_size < sizeof(struct exec)))
-		return (-1);
-
-	/* Check for files too large to mmap. */
-	if (st.st_size > SIZE_T_MAX) {
-		errno = EFBIG;
-		return (-1);
-	}
-
-	/*
-	 * Map the whole a.out file into our address space.
-	 * We then find the string table withing this area.
-	 * We do not just mmap the string table, as it probably
-	 * does not start at a page boundary - we save ourselves a
-	 * lot of nastiness by mmapping the whole file.
-	 *
-	 * This gives us an easy way to randomly access all the strings,
-	 * without making the memory allocation permanent as with
-	 * malloc/free (i.e., munmap will return it to the system).
-	 */
-	a_out_mmap = mmap(NULL, (size_t)st.st_size, PROT_READ, MAP_PRIVATE, fd, (off_t)0);
-	if (a_out_mmap == MAP_FAILED)
-		return (-1);
-
-	exec = (struct exec *)a_out_mmap;
-	if (N_BADMAG(*exec)) {
-		munmap(a_out_mmap, (size_t)st.st_size);
-		return (-1);
-	}
-
-	symoff = N_SYMOFF(*exec);
-	symsize = exec->a_syms;
-	stroff = symoff + symsize;
-
-	/* find the string table in our mmapped area */
-	strtab = a_out_mmap + stroff;
-	symtab = (struct nlist *)(a_out_mmap + symoff);
-
-	/*
-	 * clean out any left-over information for all valid entries.
-	 * Type and value defined to be 0 if not found; historical
-	 * versions cleared other and desc as well.  Also figure out
-	 * the largest string length so don't read any more of the
-	 * string table than we have to.
-	 *
-	 * XXX clearing anything other than n_type and n_value violates
-	 * the semantics given in the man page.
-	 */
-	nent = 0;
-	for (p = list; !ISLAST(p); ++p) {
-		p->n_type = 0;
-		p->n_other = 0;
-		p->n_desc = 0;
-		p->n_value = 0;
-		++nent;
-	}
-
-	while (symsize > 0) {
-		int soff;
-
-		symsize-= sizeof(struct nlist);
-		soff = symtab->n_un.n_strx;
-
-
-		if (soff != 0 && (symtab->n_type & N_STAB) == 0)
-			for (p = list; !ISLAST(p); p++)
-				if (!strcmp(&strtab[soff], p->n_un.n_name)) {
-					p->n_value = symtab->n_value;
-					p->n_type = symtab->n_type;
-					p->n_desc = symtab->n_desc;
-					p->n_other = symtab->n_other;
-					if (--nent <= 0)
-						break;
-				}
-		symtab++;
-	}
-	munmap(a_out_mmap, (size_t)st.st_size);
-	return (nent);
-}
-#endif
-
-#ifdef _NLIST_DO_ELF
-static void elf_sym_to_nlist(struct nlist *, Elf_Sym *, Elf_Shdr *, int);
-
-/*
- * __elf_is_okay__ - Determine if ehdr really
- * is ELF and valid for the target platform.
- *
- * WARNING:  This is NOT an ELF ABI function and
- * as such its use should be restricted.
- */
-int
-__elf_is_okay__(ehdr)
-	Elf_Ehdr *ehdr;
-{
-	int retval = 0;
-	/*
-	 * We need to check magic, class size, endianess,
-	 * and version before we look at the rest of the
-	 * Elf_Ehdr structure.  These few elements are
-	 * represented in a machine independant fashion.
-	 */
-	if (IS_ELF(*ehdr) &&
-	    ehdr->e_ident[EI_CLASS] == ELF_TARG_CLASS &&
-	    ehdr->e_ident[EI_DATA] == ELF_TARG_DATA &&
-	    ehdr->e_ident[EI_VERSION] == ELF_TARG_VER) {
-
-		/* Now check the machine dependant header */
-		if (ehdr->e_machine == ELF_TARG_MACH &&
-		    ehdr->e_version == ELF_TARG_VER)
-			retval = 1;
-	}
-	return retval;
-}
-
-int
-__elf_fdnlist(fd, list)
-	int fd;
-	struct nlist *list;
-{
-	struct nlist *p;
-	Elf_Off symoff = 0, symstroff = 0;
-	Elf_Size symsize = 0, symstrsize = 0;
-	Elf_Ssize cc, i;
-	int nent = -1;
-	int errsave;
-	Elf_Sym sbuf[1024];
-	Elf_Sym *s;
-	Elf_Ehdr ehdr;
-	char *strtab = NULL;
-	Elf_Shdr *shdr = NULL;
-	Elf_Size shdr_size;
-	void *base;
-	struct stat st;
-
-	/* Make sure obj is OK */
-	if (lseek(fd, (off_t)0, SEEK_SET) == -1 ||
-	    _read(fd, &ehdr, sizeof(Elf_Ehdr)) != sizeof(Elf_Ehdr) ||
-	    !__elf_is_okay__(&ehdr) ||
-	    _fstat(fd, &st) < 0)
-		return (-1);
-
-	/* calculate section header table size */
-	shdr_size = ehdr.e_shentsize * ehdr.e_shnum;
-
-	/* Make sure it's not too big to mmap */
-	if (shdr_size > SIZE_T_MAX) {
-		errno = EFBIG;
-		return (-1);
-	}
-
-	/* mmap section header table */
-	base = mmap(NULL, (size_t)shdr_size, PROT_READ, 0, fd,
-	    (off_t)ehdr.e_shoff);
-	if (base == MAP_FAILED)
-		return (-1);
-	shdr = (Elf_Shdr *)base;
-
-	/*
-	 * Find the symbol table entry and it's corresponding
-	 * string table entry.	Version 1.1 of the ABI states
-	 * that there is only one symbol table but that this
-	 * could change in the future.
-	 */
-	for (i = 0; i < ehdr.e_shnum; i++) {
-		if (shdr[i].sh_type == SHT_SYMTAB) {
-			symoff = shdr[i].sh_offset;
-			symsize = shdr[i].sh_size;
-			symstroff = shdr[shdr[i].sh_link].sh_offset;
-			symstrsize = shdr[shdr[i].sh_link].sh_size;
-			break;
-		}
-	}
-
-	/* Check for files too large to mmap. */
-	if (symstrsize > SIZE_T_MAX) {
-		errno = EFBIG;
-		goto done;
-	}
-	/*
-	 * Map string table into our address space.  This gives us
-	 * an easy way to randomly access all the strings, without
-	 * making the memory allocation permanent as with malloc/free
-	 * (i.e., munmap will return it to the system).
-	 */
-	base = mmap(NULL, (size_t)symstrsize, PROT_READ, 0, fd,
-	    (off_t)symstroff);
-	if (base == MAP_FAILED)
-		goto done;
-	strtab = (char *)base;
-
-	/*
-	 * clean out any left-over information for all valid entries.
-	 * Type and value defined to be 0 if not found; historical
-	 * versions cleared other and desc as well.  Also figure out
-	 * the largest string length so don't read any more of the
-	 * string table than we have to.
-	 *
-	 * XXX clearing anything other than n_type and n_value violates
-	 * the semantics given in the man page.
-	 */
-	nent = 0;
-	for (p = list; !ISLAST(p); ++p) {
-		p->n_type = 0;
-		p->n_other = 0;
-		p->n_desc = 0;
-		p->n_value = 0;
-		++nent;
-	}
-
-	/* Don't process any further if object is stripped. */
-	if (symoff == 0)
-		goto done;
-		
-	if (lseek(fd, (off_t) symoff, SEEK_SET) == -1) {
-		nent = -1;
-		goto done;
-	}
-
-	while (symsize > 0 && nent > 0) {
-		cc = MIN(symsize, sizeof(sbuf));
-		if (_read(fd, sbuf, cc) != cc)
-			break;
-		symsize -= cc;
-		for (s = sbuf; cc > 0 && nent > 0; ++s, cc -= sizeof(*s)) {
-			char *name;
-			struct nlist *p;
-
-			name = strtab + s->st_name;
-			if (name[0] == '\0')
-				continue;
-			for (p = list; !ISLAST(p); p++) {
-				if ((p->n_un.n_name[0] == '_' &&
-				    strcmp(name, p->n_un.n_name+1) == 0)
-				    || strcmp(name, p->n_un.n_name) == 0) {
-					elf_sym_to_nlist(p, s, shdr,
-					    ehdr.e_shnum);
-					if (--nent <= 0)
-						break;
-				}
-			}
-		}
-	}
-  done:
-	errsave = errno;
-	if (strtab != NULL)
-		munmap(strtab, symstrsize);
-	if (shdr != NULL)
-		munmap(shdr, shdr_size);
-	errno = errsave;
-	return (nent);
-}
-
-/*
- * Convert an Elf_Sym into an nlist structure.  This fills in only the
- * n_value and n_type members.
- */
-static void
-elf_sym_to_nlist(nl, s, shdr, shnum)
-	struct nlist *nl;
-	Elf_Sym *s;
-	Elf_Shdr *shdr;
-	int shnum;
-{
-	nl->n_value = s->st_value;
-
-	switch (s->st_shndx) {
-	case SHN_UNDEF:
-	case SHN_COMMON:
-		nl->n_type = N_UNDF;
-		break;
-	case SHN_ABS:
-		nl->n_type = ELF_ST_TYPE(s->st_info) == STT_FILE ?
-		    N_FN : N_ABS;
-		break;
-	default:
-		if (s->st_shndx >= shnum)
-			nl->n_type = N_UNDF;
-		else {
-			Elf_Shdr *sh = shdr + s->st_shndx;
-
-			nl->n_type = sh->sh_type == SHT_PROGBITS ?
-			    (sh->sh_flags & SHF_WRITE ? N_DATA : N_TEXT) :
-			    (sh->sh_type == SHT_NOBITS ? N_BSS : N_UNDF);
-		}
-		break;
-	}
-
-	if (ELF_ST_BIND(s->st_info) == STB_GLOBAL ||
-	    ELF_ST_BIND(s->st_info) == STB_WEAK)
-		nl->n_type |= N_EXT;
-}
-#endif /* _NLIST_DO_ELF */
diff --git a/lib/libc/gen/nrand48.c b/lib/libc/gen/nrand48.c
deleted file mode 100644
index 3a21c3f..0000000
--- a/lib/libc/gen/nrand48.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/nrand48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include "rand48.h"
-
-long
-nrand48(unsigned short xseed[3])
-{
-	_dorand48(xseed);
-	return ((long) xseed[2] << 15) + ((long) xseed[1] >> 1);
-}
diff --git a/lib/libc/gen/opendir.c b/lib/libc/gen/opendir.c
deleted file mode 100644
index 9148240..0000000
--- a/lib/libc/gen/opendir.c
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)opendir.c	8.8 (Berkeley) 5/1/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/opendir.c,v 1.22 2004/08/14 17:46:10 stefanf Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "telldir.h"
-/*
- * Open a directory.
- */
-DIR *
-opendir(name)
-	const char *name;
-{
-
-	return (__opendir2(name, DTF_HIDEW|DTF_NODUP));
-}
-
-DIR *
-__opendir2(name, flags)
-	const char *name;
-	int flags;
-{
-	DIR *dirp;
-	int fd;
-	int incr;
-	int saved_errno;
-	int unionstack;
-	struct stat statb;
-
-	/*
-	 * stat() before _open() because opening of special files may be
-	 * harmful.  _fstat() after open because the file may have changed.
-	 */
-	if (stat(name, &statb) != 0)
-		return (NULL);
-	if (!S_ISDIR(statb.st_mode)) {
-		errno = ENOTDIR;
-		return (NULL);
-	}
-	if ((fd = _open(name, O_RDONLY | O_NONBLOCK)) == -1)
-		return (NULL);
-	dirp = NULL;
-	if (_fstat(fd, &statb) != 0)
-		goto fail;
-	if (!S_ISDIR(statb.st_mode)) {
-		errno = ENOTDIR;
-		goto fail;
-	}
-	if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1 ||
-	    (dirp = malloc(sizeof(DIR) + sizeof(struct _telldir))) == NULL)
-		goto fail;
-
-	dirp->dd_td = (struct _telldir *)((char *)dirp + sizeof(DIR));
-	LIST_INIT(&dirp->dd_td->td_locq);
-	dirp->dd_td->td_loccnt = 0;
-
-	/*
-	 * Use the system page size if that is a multiple of DIRBLKSIZ.
-	 * Hopefully this can be a big win someday by allowing page
-	 * trades to user space to be done by _getdirentries().
-	 */
-	incr = getpagesize();
-	if ((incr % DIRBLKSIZ) != 0) 
-		incr = DIRBLKSIZ;
-
-	/*
-	 * Determine whether this directory is the top of a union stack.
-	 */
-	if (flags & DTF_NODUP) {
-		struct statfs sfb;
-
-		if (_fstatfs(fd, &sfb) < 0)
-			goto fail;
-		unionstack = !strcmp(sfb.f_fstypename, "unionfs")
-		    || (sfb.f_flags & MNT_UNION);
-	} else {
-		unionstack = 0;
-	}
-
-	if (unionstack) {
-		int len = 0;
-		int space = 0;
-		char *buf = 0;
-		char *ddptr = 0;
-		char *ddeptr;
-		int n;
-		struct dirent **dpv;
-
-		/*
-		 * The strategy here is to read all the directory
-		 * entries into a buffer, sort the buffer, and
-		 * remove duplicate entries by setting the inode
-		 * number to zero.
-		 */
-
-		do {
-			/*
-			 * Always make at least DIRBLKSIZ bytes
-			 * available to _getdirentries
-			 */
-			if (space < DIRBLKSIZ) {
-				space += incr;
-				len += incr;
-				buf = reallocf(buf, len);
-				if (buf == NULL)
-					goto fail;
-				ddptr = buf + (len - space);
-			}
-
-			n = _getdirentries(fd, ddptr, space, &dirp->dd_seek);
-			if (n > 0) {
-				ddptr += n;
-				space -= n;
-			}
-		} while (n > 0);
-
-		ddeptr = ddptr;
-		flags |= __DTF_READALL;
-
-		/*
-		 * Re-open the directory.
-		 * This has the effect of rewinding back to the
-		 * top of the union stack and is needed by
-		 * programs which plan to fchdir to a descriptor
-		 * which has also been read -- see fts.c.
-		 */
-		if (flags & DTF_REWIND) {
-			(void)_close(fd);
-			if ((fd = _open(name, O_RDONLY)) == -1) {
-				saved_errno = errno;
-				free(buf);
-				free(dirp);
-				errno = saved_errno;
-				return (NULL);
-			}
-		}
-
-		/*
-		 * There is now a buffer full of (possibly) duplicate
-		 * names.
-		 */
-		dirp->dd_buf = buf;
-
-		/*
-		 * Go round this loop twice...
-		 *
-		 * Scan through the buffer, counting entries.
-		 * On the second pass, save pointers to each one.
-		 * Then sort the pointers and remove duplicate names.
-		 */
-		for (dpv = 0;;) {
-			n = 0;
-			ddptr = buf;
-			while (ddptr < ddeptr) {
-				struct dirent *dp;
-
-				dp = (struct dirent *) ddptr;
-				if ((long)dp & 03L)
-					break;
-				if ((dp->d_reclen <= 0) ||
-				    (dp->d_reclen > (ddeptr + 1 - ddptr)))
-					break;
-				ddptr += dp->d_reclen;
-				if (dp->d_fileno) {
-					if (dpv)
-						dpv[n] = dp;
-					n++;
-				}
-			}
-
-			if (dpv) {
-				struct dirent *xp;
-
-				/*
-				 * This sort must be stable.
-				 */
-				mergesort(dpv, n, sizeof(*dpv), alphasort);
-
-				dpv[n] = NULL;
-				xp = NULL;
-
-				/*
-				 * Scan through the buffer in sort order,
-				 * zapping the inode number of any
-				 * duplicate names.
-				 */
-				for (n = 0; dpv[n]; n++) {
-					struct dirent *dp = dpv[n];
-
-					if ((xp == NULL) ||
-					    strcmp(dp->d_name, xp->d_name)) {
-						xp = dp;
-					} else {
-						dp->d_fileno = 0;
-					}
-					if (dp->d_type == DT_WHT &&
-					    (flags & DTF_HIDEW))
-						dp->d_fileno = 0;
-				}
-
-				free(dpv);
-				break;
-			} else {
-				dpv = malloc((n+1) * sizeof(struct dirent *));
-				if (dpv == NULL)
-					break;
-			}
-		}
-
-		dirp->dd_len = len;
-		dirp->dd_size = ddptr - dirp->dd_buf;
-	} else {
-		dirp->dd_len = incr;
-		dirp->dd_size = 0;
-		dirp->dd_buf = malloc(dirp->dd_len);
-		if (dirp->dd_buf == NULL)
-			goto fail;
-		dirp->dd_seek = 0;
-		flags &= ~DTF_REWIND;
-	}
-
-	dirp->dd_loc = 0;
-	dirp->dd_fd = fd;
-	dirp->dd_flags = flags;
-	dirp->dd_lock = NULL;
-
-	/*
-	 * Set up seek point for rewinddir.
-	 */
-	dirp->dd_rewind = telldir(dirp);
-
-	return (dirp);
-
-fail:
-	saved_errno = errno;
-	free(dirp);
-	(void)_close(fd);
-	errno = saved_errno;
-	return (NULL);
-}
diff --git a/lib/libc/gen/pause.c b/lib/libc/gen/pause.c
deleted file mode 100644
index 4f56289..0000000
--- a/lib/libc/gen/pause.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)pause.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/pause.c,v 1.6 2002/02/01 00:57:29 obrien Exp $");
-
-#include <signal.h>
-#include <unistd.h>
-
-/*
- * Backwards compatible pause.
- */
-int
-__pause()
-{
-	return sigpause(sigblock(0L));
-}
-__weak_reference(__pause, pause);
-__weak_reference(__pause, _pause);
diff --git a/lib/libc/gen/pmadvise.c b/lib/libc/gen/pmadvise.c
deleted file mode 100644
index 744c6e5..0000000
--- a/lib/libc/gen/pmadvise.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * The contents of this file are in the public domain.
- * Written by Garrett A. Wollman, 2000-10-07.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/pmadvise.c,v 1.3 2003/08/09 03:23:24 bms Exp $");
-
-#include <sys/mman.h>
-
-int
-posix_madvise(void *address, size_t size, int how)
-{
-	return madvise(address, size, how);
-}
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
deleted file mode 100644
index 0ed5657..0000000
--- a/lib/libc/gen/popen.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software written by Ken Arnold and
- * published in UNIX Review, Vol. 6, No. 8.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 5/3/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/popen.c,v 1.18 2003/01/04 00:15:15 tjr Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/wait.h>
-
-#include <signal.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <paths.h>
-#include <pthread.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-extern char **environ;
-
-static struct pid {
-	struct pid *next;
-	FILE *fp;
-	pid_t pid;
-} *pidlist;
-static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define	THREAD_LOCK()	if (__isthreaded) _pthread_mutex_lock(&pidlist_mutex)
-#define	THREAD_UNLOCK()	if (__isthreaded) _pthread_mutex_unlock(&pidlist_mutex)
-
-FILE *
-popen(command, type)
-	const char *command, *type;
-{
-	struct pid *cur;
-	FILE *iop;
-	int pdes[2], pid, twoway;
-	char *argv[4];
-	struct pid *p;
-
-	/*
-	 * Lite2 introduced two-way popen() pipes using _socketpair().
-	 * FreeBSD's pipe() is bidirectional, so we use that.
-	 */
-	if (strchr(type, '+')) {
-		twoway = 1;
-		type = "r+";
-	} else  {
-		twoway = 0;
-		if ((*type != 'r' && *type != 'w') || type[1])
-			return (NULL);
-	}
-	if (pipe(pdes) < 0)
-		return (NULL);
-
-	if ((cur = malloc(sizeof(struct pid))) == NULL) {
-		(void)_close(pdes[0]);
-		(void)_close(pdes[1]);
-		return (NULL);
-	}
-
-	argv[0] = "sh";
-	argv[1] = "-c";
-	argv[2] = (char *)command;
-	argv[3] = NULL;
-
-	THREAD_LOCK();
-	switch (pid = vfork()) {
-	case -1:			/* Error. */
-		THREAD_UNLOCK();
-		(void)_close(pdes[0]);
-		(void)_close(pdes[1]);
-		free(cur);
-		return (NULL);
-		/* NOTREACHED */
-	case 0:				/* Child. */
-		if (*type == 'r') {
-			/*
-			 * The _dup2() to STDIN_FILENO is repeated to avoid
-			 * writing to pdes[1], which might corrupt the
-			 * parent's copy.  This isn't good enough in
-			 * general, since the _exit() is no return, so
-			 * the compiler is free to corrupt all the local
-			 * variables.
-			 */
-			(void)_close(pdes[0]);
-			if (pdes[1] != STDOUT_FILENO) {
-				(void)_dup2(pdes[1], STDOUT_FILENO);
-				(void)_close(pdes[1]);
-				if (twoway)
-					(void)_dup2(STDOUT_FILENO, STDIN_FILENO);
-			} else if (twoway && (pdes[1] != STDIN_FILENO))
-				(void)_dup2(pdes[1], STDIN_FILENO);
-		} else {
-			if (pdes[0] != STDIN_FILENO) {
-				(void)_dup2(pdes[0], STDIN_FILENO);
-				(void)_close(pdes[0]);
-			}
-			(void)_close(pdes[1]);
-		}
-		for (p = pidlist; p; p = p->next) {
-			(void)_close(fileno(p->fp));
-		}
-		_execve(_PATH_BSHELL, argv, environ);
-		_exit(127);
-		/* NOTREACHED */
-	}
-	THREAD_UNLOCK();
-
-	/* Parent; assume fdopen can't fail. */
-	if (*type == 'r') {
-		iop = fdopen(pdes[0], type);
-		(void)_close(pdes[1]);
-	} else {
-		iop = fdopen(pdes[1], type);
-		(void)_close(pdes[0]);
-	}
-
-	/* Link into list of file descriptors. */
-	cur->fp = iop;
-	cur->pid = pid;
-	THREAD_LOCK();
-	cur->next = pidlist;
-	pidlist = cur;
-	THREAD_UNLOCK();
-
-	return (iop);
-}
-
-/*
- * pclose --
- *	Pclose returns -1 if stream is not associated with a `popened' command,
- *	if already `pclosed', or waitpid returns an error.
- */
-int
-pclose(iop)
-	FILE *iop;
-{
-	struct pid *cur, *last;
-	int pstat;
-	pid_t pid;
-
-	/*
-	 * Find the appropriate file pointer and remove it from the list.
-	 */
-	THREAD_LOCK();
-	for (last = NULL, cur = pidlist; cur; last = cur, cur = cur->next)
-		if (cur->fp == iop)
-			break;
-	if (cur == NULL) {
-		THREAD_UNLOCK();
-		return (-1);
-	}
-	if (last == NULL)
-		pidlist = cur->next;
-	else
-		last->next = cur->next;
-	THREAD_UNLOCK();
-
-	(void)fclose(iop);
-
-	do {
-		pid = _wait4(cur->pid, &pstat, 0, (struct rusage *)0);
-	} while (pid == -1 && errno == EINTR);
-
-	free(cur);
-
-	return (pid == -1 ? -1 : pstat);
-}
diff --git a/lib/libc/gen/posixshm.c b/lib/libc/gen/posixshm.c
deleted file mode 100644
index 0baa700..0000000
--- a/lib/libc/gen/posixshm.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2000 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/posixshm.c,v 1.4 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-int
-shm_open(const char *path, int flags, mode_t mode)
-{
-	int fd;
-	struct stat stab;
-
-	if ((flags & O_ACCMODE) == O_WRONLY)
-		return (EINVAL);
-
-	fd = _open(path, flags, mode);
-	if (fd != -1) {
-		if (_fstat(fd, &stab) != 0 || !S_ISREG(stab.st_mode)) {
-			_close(fd);
-			errno = EINVAL;
-			return (-1);
-		}
-
-		if (_fcntl(fd, F_SETFL, (int)FPOSIXSHM) != 0) {
-			_close(fd);
-			return (-1);
-		}
-	}
-	return (fd);
-}
-
-int
-shm_unlink(const char *path)
-{
-	return (unlink(path));
-}
diff --git a/lib/libc/gen/pselect.c b/lib/libc/gen/pselect.c
deleted file mode 100644
index 13b2553..0000000
--- a/lib/libc/gen/pselect.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2000 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/pselect.c,v 1.6 2002/10/12 16:13:37 mike Exp $");
-
-#include "namespace.h"
-#include <sys/select.h>
-#include <sys/time.h>
-
-#include <errno.h>
-#include <signal.h>
-#include "un-namespace.h"
-
-__weak_reference(__pselect, pselect);
-
-/*
- * Emulate the POSIX 1003.1g-2000 `pselect' interface.  This is the
- * same as the traditional BSD `select' function, except that it uses
- * a timespec rather than a timeval, doesn't modify the timeout argument,
- * and allows the user to specify a signal mask to apply during the select.
- */
-int
-__pselect(int count, fd_set * __restrict rfds, fd_set * __restrict wfds, 
-	fd_set * __restrict efds, const struct timespec * __restrict timo, 
-	const sigset_t * __restrict mask)
-{
-	sigset_t omask;
-	struct timeval tvtimo, *tvp;
-	int rv, sverrno;
-
-	if (timo) {
-		TIMESPEC_TO_TIMEVAL(&tvtimo, timo);
-		tvp = &tvtimo;
-	} else
-		tvp = 0;
-
-	if (mask != 0) {
-		rv = _sigprocmask(SIG_SETMASK, mask, &omask);
-		if (rv != 0)
-			return rv;
-	}
-
-	rv = _select(count, rfds, wfds, efds, tvp);
-	if (mask != 0) {
-		sverrno = errno;
-		_sigprocmask(SIG_SETMASK, &omask, (sigset_t *)0);
-		errno = sverrno;
-	}
-
-	return rv;
-}
diff --git a/lib/libc/gen/psignal.c b/lib/libc/gen/psignal.c
deleted file mode 100644
index 832e04b..0000000
--- a/lib/libc/gen/psignal.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)psignal.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/psignal.c,v 1.7 2002/02/01 01:08:48 obrien Exp $");
-
-/*
- * Print the name of the signal indicated
- * along with the supplied message.
- */
-#include "namespace.h"
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-void
-psignal(sig, s)
-	unsigned int sig;
-	const char *s;
-{
-	const char *c;
-
-	if (sig < NSIG)
-		c = sys_siglist[sig];
-	else
-		c = "Unknown signal";
-	if (s != NULL && *s != '\0') {
-		(void)_write(STDERR_FILENO, s, strlen(s));
-		(void)_write(STDERR_FILENO, ": ", 2);
-	}
-	(void)_write(STDERR_FILENO, c, strlen(c));
-	(void)_write(STDERR_FILENO, "\n", 1);
-}
diff --git a/lib/libc/gen/pw_scan.c b/lib/libc/gen/pw_scan.c
deleted file mode 100644
index a5057f9..0000000
--- a/lib/libc/gen/pw_scan.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)pw_scan.c	8.3 (Berkeley) 4/2/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/pw_scan.c,v 1.25 2004/01/18 21:33:25 charnier Exp $");
-
-/*
- * This module is used to "verify" password entries by chpass(1) and
- * pwd_mkdb(8).
- */
-
-#include <sys/param.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "pw_scan.h"
-
-/*
- * Some software assumes that IDs are short.  We should emit warnings
- * for id's which cannot be stored in a short, but we are more liberal
- * by default, warning for IDs greater than USHRT_MAX.
- *
- * If pw_big_ids_warning is -1 on entry to pw_scan(), it will be set based
- * on the existence of PW_SCAN_BIG_IDS in the environment.
- */
-static int	pw_big_ids_warning = -1;
-
-int
-__pw_scan(char *bp, struct passwd *pw, int flags)
-{
-	uid_t id;
-	int root;
-	char *ep, *p, *sh;
-
-	if (pw_big_ids_warning == -1)
-		pw_big_ids_warning = getenv("PW_SCAN_BIG_IDS") == NULL ? 1 : 0;
-
-	pw->pw_fields = 0;
-	if (!(pw->pw_name = strsep(&bp, ":")))		/* login */
-		goto fmt;
-	root = !strcmp(pw->pw_name, "root");
-	if (pw->pw_name[0] && (pw->pw_name[0] != '+' || pw->pw_name[1] == '\0'))
-		pw->pw_fields |= _PWF_NAME;
-
-	if (!(pw->pw_passwd = strsep(&bp, ":")))	/* passwd */
-		goto fmt;
-	if (pw->pw_passwd[0])
-		pw->pw_fields |= _PWF_PASSWD;
-
-	if (!(p = strsep(&bp, ":")))			/* uid */
-		goto fmt;
-	if (p[0])
-		pw->pw_fields |= _PWF_UID;
-	else {
-		if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') {
-			if (flags & _PWSCAN_WARN)
-				warnx("no uid for user %s", pw->pw_name);
-			return (0);
-		}
-	}
-	id = strtoul(p, &ep, 10);
-	if (errno == ERANGE) {
-		if (flags & _PWSCAN_WARN)
-			warnx("%s > max uid value (%lu)", p, ULONG_MAX);
-		return (0);
-	}
-	if (*ep != '\0') {
-		if (flags & _PWSCAN_WARN)
-			warnx("%s uid is incorrect", p);
-		return (0);
-	}
-	if (root && id) {
-		if (flags & _PWSCAN_WARN)
-			warnx("root uid should be 0");
-		return (0);
-	}
-	if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) {
-		warnx("%s > recommended max uid value (%u)", p, USHRT_MAX);
-		/*return (0);*/ /* THIS SHOULD NOT BE FATAL! */
-	}
-	pw->pw_uid = id;
-
-	if (!(p = strsep(&bp, ":")))			/* gid */
-		goto fmt;
-	if (p[0])
-		pw->pw_fields |= _PWF_GID;
-	else {
-		if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') {
-			if (flags & _PWSCAN_WARN)
-				warnx("no gid for user %s", pw->pw_name);
-			return (0);
-		}
-	}
-	id = strtoul(p, &ep, 10);
-	if (errno == ERANGE) {
-		if (flags & _PWSCAN_WARN)
-			warnx("%s > max gid value (%lu)", p, ULONG_MAX);
-		return (0);
-	}
-	if (*ep != '\0') {
-		if (flags & _PWSCAN_WARN)
-			warnx("%s gid is incorrect", p);
-		return (0);
-	}
-	if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) {
-		warnx("%s > recommended max gid value (%u)", p, USHRT_MAX);
-		/* return (0); This should not be fatal! */
-	}
-	pw->pw_gid = id;
-
-	if (flags & _PWSCAN_MASTER ) {
-		if (!(pw->pw_class = strsep(&bp, ":")))	/* class */
-			goto fmt;
-		if (pw->pw_class[0])
-			pw->pw_fields |= _PWF_CLASS;
-		
-		if (!(p = strsep(&bp, ":")))		/* change */
-			goto fmt;
-		if (p[0])
-			pw->pw_fields |= _PWF_CHANGE;
-		pw->pw_change = atol(p);
-		
-		if (!(p = strsep(&bp, ":")))		/* expire */
-			goto fmt;
-		if (p[0])
-			pw->pw_fields |= _PWF_EXPIRE;
-		pw->pw_expire = atol(p);
-	}
-	if (!(pw->pw_gecos = strsep(&bp, ":")))		/* gecos */
-		goto fmt;
-	if (pw->pw_gecos[0])
-		pw->pw_fields |= _PWF_GECOS;
-
-	if (!(pw->pw_dir = strsep(&bp, ":")))		/* directory */
-		goto fmt;
-	if (pw->pw_dir[0])
-		pw->pw_fields |= _PWF_DIR;
-
-	if (!(pw->pw_shell = strsep(&bp, ":")))		/* shell */
-		goto fmt;
-
-	p = pw->pw_shell;
-	if (root && *p) {				/* empty == /bin/sh */
-		for (setusershell();;) {
-			if (!(sh = getusershell())) {
-				if (flags & _PWSCAN_WARN)
-					warnx("warning, unknown root shell");
-				break;
-			}
-			if (!strcmp(p, sh))
-				break;
-		}
-		endusershell();
-	}
-	if (p[0])
-		pw->pw_fields |= _PWF_SHELL;
-
-	if ((p = strsep(&bp, ":"))) {			/* too many */
-fmt:		
-		if (flags & _PWSCAN_WARN)
-			warnx("corrupted entry");
-		return (0);
-	}
-	return (1);
-}
diff --git a/lib/libc/gen/pw_scan.h b/lib/libc/gen/pw_scan.h
deleted file mode 100644
index 28669f7..0000000
--- a/lib/libc/gen/pw_scan.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	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.
- *
- *	@(#)pw_scan.h	8.1 (Berkeley) 4/1/94
- * $FreeBSD: src/lib/libc/gen/pw_scan.h,v 1.6 2002/03/22 23:41:42 obrien Exp $
- */
-
-#define _PWSCAN_MASTER 0x01
-#define _PWSCAN_WARN   0x02
-
-extern int	__pw_scan(char *, struct passwd *, int);
diff --git a/lib/libc/gen/pwcache.c b/lib/libc/gen/pwcache.c
deleted file mode 100644
index 2d4b272..0000000
--- a/lib/libc/gen/pwcache.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)pwcache.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/pwcache.c,v 1.10 2002/03/22 02:35:47 imp Exp $");
-
-#include <sys/types.h>
-
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <string.h>
-#include <utmp.h>
-
-#define	NCACHE	64			/* power of 2 */
-#define	MASK	(NCACHE - 1)		/* bits to store with */
-
-const char *
-user_from_uid(uid_t uid, int nouser)
-{
-	static struct ncache {
-		uid_t	uid;
-		int	found;
-		char	name[UT_NAMESIZE + 1];
-	} c_uid[NCACHE];
-	static int pwopen;
-	struct passwd *pw;
-	struct ncache *cp;
-
-	cp = c_uid + (uid & MASK);
-	if (cp->uid != uid || !*cp->name) {
-		if (pwopen == 0) {
-			setpassent(1);
-			pwopen = 1;
-		}
-		pw = getpwuid(uid);
-		cp->uid = uid;
-		if (pw != NULL) {
-			cp->found = 1;
-			(void)strncpy(cp->name, pw->pw_name, UT_NAMESIZE);
-			cp->name[UT_NAMESIZE] = '\0';
-		} else {
-			cp->found = 0;
-			(void)snprintf(cp->name, UT_NAMESIZE, "%u", uid);
-			if (nouser)
-				return (NULL);
-		}
-	}
-	return ((nouser && !cp->found) ? NULL : cp->name);
-}
-
-const char *
-group_from_gid(gid_t gid, int nogroup)
-{
-	static struct ncache {
-		gid_t	gid;
-		int	found;
-		char	name[UT_NAMESIZE + 1];
-	} c_gid[NCACHE];
-	static int gropen;
-	struct group *gr;
-	struct ncache *cp;
-
-	cp = c_gid + (gid & MASK);
-	if (cp->gid != gid || !*cp->name) {
-		if (gropen == 0) {
-			setgroupent(1);
-			gropen = 1;
-		}
-		gr = getgrgid(gid);
-		cp->gid = gid;
-		if (gr != NULL) {
-			cp->found = 1;
-			(void)strncpy(cp->name, gr->gr_name, UT_NAMESIZE);
-			cp->name[UT_NAMESIZE] = '\0';
-		} else {
-			cp->found = 0;
-			(void)snprintf(cp->name, UT_NAMESIZE, "%u", gid);
-			if (nogroup)
-				return (NULL);
-		}
-	}
-	return ((nogroup && !cp->found) ? NULL : cp->name);
-}
diff --git a/lib/libc/gen/raise.c b/lib/libc/gen/raise.c
deleted file mode 100644
index 4a94cb9..0000000
--- a/lib/libc/gen/raise.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)raise.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/raise.c,v 1.4 2003/07/19 05:22:56 davidxu Exp $");
-
-#include <signal.h>
-#include <unistd.h>
-
-__weak_reference(__raise, raise);
-__weak_reference(__raise, _raise);
-
-int
-__raise(s)
-	int s;
-{
-	return(kill(getpid(), s));
-}
diff --git a/lib/libc/gen/rand48.h b/lib/libc/gen/rand48.h
deleted file mode 100644
index 0a3d83d..0000000
--- a/lib/libc/gen/rand48.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- *
- * $FreeBSD: src/lib/libc/gen/rand48.h,v 1.2 2002/02/01 01:32:19 obrien Exp $
- */
-
-#ifndef _RAND48_H_
-#define _RAND48_H_
-
-#include <math.h>
-#include <stdlib.h>
-
-void		_dorand48(unsigned short[3]);
-
-#define	RAND48_SEED_0	(0x330e)
-#define	RAND48_SEED_1	(0xabcd)
-#define	RAND48_SEED_2	(0x1234)
-#define	RAND48_MULT_0	(0xe66d)
-#define	RAND48_MULT_1	(0xdeec)
-#define	RAND48_MULT_2	(0x0005)
-#define	RAND48_ADD	(0x000b)
-
-#endif /* _RAND48_H_ */
diff --git a/lib/libc/gen/readdir.c b/lib/libc/gen/readdir.c
deleted file mode 100644
index fa0438c..0000000
--- a/lib/libc/gen/readdir.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.11 2002/02/26 21:39:32 alfred Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-/*
- * get next entry in a directory.
- */
-struct dirent *
-_readdir_unlocked(dirp)
-	DIR *dirp;
-{
-	struct dirent *dp;
-
-	for (;;) {
-		if (dirp->dd_loc >= dirp->dd_size) {
-			if (dirp->dd_flags & __DTF_READALL)
-				return (NULL);
-			dirp->dd_loc = 0;
-		}
-		if (dirp->dd_loc == 0 && !(dirp->dd_flags & __DTF_READALL)) {
-			dirp->dd_size = _getdirentries(dirp->dd_fd,
-			    dirp->dd_buf, dirp->dd_len, &dirp->dd_seek);
-			if (dirp->dd_size <= 0)
-				return (NULL);
-		}
-		dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
-		if ((long)dp & 03L)	/* bogus pointer check */
-			return (NULL);
-		if (dp->d_reclen <= 0 ||
-		    dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
-			return (NULL);
-		dirp->dd_loc += dp->d_reclen;
-		if (dp->d_ino == 0)
-			continue;
-		if (dp->d_type == DT_WHT && (dirp->dd_flags & DTF_HIDEW))
-			continue;
-		return (dp);
-	}
-}
-
-struct dirent *
-readdir(dirp)
-	DIR *dirp;
-{
-	struct dirent	*dp;
-
-	if (__isthreaded) {
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
-		dp = _readdir_unlocked(dirp);
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
-	}
-	else
-		dp = _readdir_unlocked(dirp);
-	return (dp);
-}
-
-int
-readdir_r(dirp, entry, result)
-	DIR *dirp;
-	struct dirent *entry;
-	struct dirent **result;
-{
-	struct dirent *dp;
-	int saved_errno;
-
-	saved_errno = errno;
-	errno = 0;
-	if (__isthreaded) {
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
-		if ((dp = _readdir_unlocked(dirp)) != NULL)
-			memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
-	}
-	else if ((dp = _readdir_unlocked(dirp)) != NULL)
-		memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
-
-	if (errno != 0) {
-		if (dp == NULL)
-			return (errno);
-	} else
-		errno = saved_errno;
-
-	if (dp != NULL)
-		*result = entry;
-	else
-		*result = NULL;
-
-	return (0);
-}
diff --git a/lib/libc/gen/readpassphrase.c b/lib/libc/gen/readpassphrase.c
deleted file mode 100644
index d100be4..0000000
--- a/lib/libc/gen/readpassphrase.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*	$OpenBSD: readpassphrase.c,v 1.12 2001/12/15 05:41:00 millert Exp $	*/
-
-/*
- * Copyright (c) 2000 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: readpassphrase.c,v 1.12 2001/12/15 05:41:00 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/readpassphrase.c,v 1.6 2002/03/09 03:16:41 green Exp $");
-
-#include "namespace.h"
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <pwd.h>
-#include <signal.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-#include <readpassphrase.h>
-#include "un-namespace.h"
-
-static volatile sig_atomic_t signo;
-
-static void handler(int);
-
-char *
-readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
-{
-	ssize_t nr;
-	int input, output, save_errno;
-	char ch, *p, *end;
-	struct termios term, oterm;
-	struct sigaction sa, saveint, savehup, savequit, saveterm;
-	struct sigaction savetstp, savettin, savettou;
-
-	/* I suppose we could alloc on demand in this case (XXX). */
-	if (bufsiz == 0) {
-		errno = EINVAL;
-		return(NULL);
-	}
-
-restart:
-	/*
-	 * Read and write to /dev/tty if available.  If not, read from
-	 * stdin and write to stderr unless a tty is required.
-	 */
-	if ((input = output = _open(_PATH_TTY, O_RDWR)) == -1) {
-		if (flags & RPP_REQUIRE_TTY) {
-			errno = ENOTTY;
-			return(NULL);
-		}
-		input = STDIN_FILENO;
-		output = STDERR_FILENO;
-	}
-
-	/*
-	 * Catch signals that would otherwise cause the user to end
-	 * up with echo turned off in the shell.  Don't worry about
-	 * things like SIGALRM and SIGPIPE for now.
-	 */
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;		/* don't restart system calls */
-	sa.sa_handler = handler;
-	(void)_sigaction(SIGINT, &sa, &saveint);
-	(void)_sigaction(SIGHUP, &sa, &savehup);
-	(void)_sigaction(SIGQUIT, &sa, &savequit);
-	(void)_sigaction(SIGTERM, &sa, &saveterm);
-	(void)_sigaction(SIGTSTP, &sa, &savetstp);
-	(void)_sigaction(SIGTTIN, &sa, &savettin);
-	(void)_sigaction(SIGTTOU, &sa, &savettou);
-
-	/* Turn off echo if possible. */
-	if (tcgetattr(input, &oterm) == 0) {
-		memcpy(&term, &oterm, sizeof(term));
-		if (!(flags & RPP_ECHO_ON))
-			term.c_lflag &= ~(ECHO | ECHONL);
-		if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
-			term.c_cc[VSTATUS] = _POSIX_VDISABLE;
-		(void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
-	} else {
-		memset(&term, 0, sizeof(term));
-		memset(&oterm, 0, sizeof(oterm));
-	}
-
-	(void)_write(output, prompt, strlen(prompt));
-	end = buf + bufsiz - 1;
-	for (p = buf; (nr = _read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r';) {
-		if (p < end) {
-			if ((flags & RPP_SEVENBIT))
-				ch &= 0x7f;
-			if (isalpha(ch)) {
-				if ((flags & RPP_FORCELOWER))
-					ch = tolower(ch);
-				if ((flags & RPP_FORCEUPPER))
-					ch = toupper(ch);
-			}
-			*p++ = ch;
-		}
-	}
-	*p = '\0';
-	save_errno = errno;
-	if (!(term.c_lflag & ECHO))
-		(void)_write(output, "\n", 1);
-
-	/* Restore old terminal settings and signals. */
-	if (memcmp(&term, &oterm, sizeof(term)) != 0)
-		(void)tcsetattr(input, TCSANOW|TCSASOFT, &oterm);
-	(void)_sigaction(SIGINT, &saveint, NULL);
-	(void)_sigaction(SIGHUP, &savehup, NULL);
-	(void)_sigaction(SIGQUIT, &savequit, NULL);
-	(void)_sigaction(SIGTERM, &saveterm, NULL);
-	(void)_sigaction(SIGTSTP, &savetstp, NULL);
-	(void)_sigaction(SIGTTIN, &savettin, NULL);
-	(void)_sigaction(SIGTTOU, &savettou, NULL);
-	if (input != STDIN_FILENO)
-		(void)_close(input);
-
-	/*
-	 * If we were interrupted by a signal, resend it to ourselves
-	 * now that we have restored the signal handlers.
-	 */
-	if (signo) {
-		kill(getpid(), signo); 
-		switch (signo) {
-		case SIGTSTP:
-		case SIGTTIN:
-		case SIGTTOU:
-			signo = 0;
-			goto restart;
-		}
-	}
-
-	errno = save_errno;
-	return(nr == -1 ? NULL : buf);
-}
-
-char *
-getpass(const char *prompt)
-{
-	static char buf[_PASSWORD_LEN + 1];
-
-	if (readpassphrase(prompt, buf, sizeof(buf), RPP_ECHO_OFF) == NULL)
-		buf[0] = '\0';
-	return(buf);
-}
-
-static void handler(int s)
-{
-
-	signo = s;
-}
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
deleted file mode 100644
index dae75cc..0000000
--- a/lib/libc/gen/rewinddir.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rewinddir.c	8.1 (Berkeley) 6/8/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/rewinddir.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
-
-#include <sys/types.h>
-#include <dirent.h>
-
-#include "telldir.h"
-
-void
-rewinddir(dirp)
-	DIR *dirp;
-{
-
-	_seekdir(dirp, dirp->dd_rewind);
-	dirp->dd_rewind = telldir(dirp);
-}
diff --git a/lib/libc/gen/scandir.c b/lib/libc/gen/scandir.c
deleted file mode 100644
index cf79bce..0000000
--- a/lib/libc/gen/scandir.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)scandir.c	8.3 (Berkeley) 1/2/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/scandir.c,v 1.7 2002/02/01 01:32:19 obrien Exp $");
-
-/*
- * Scan the directory dirname calling select to make a list of selected
- * directory entries then sort using qsort and compare routine dcomp.
- * Returns the number of entries and a pointer to a list of pointers to
- * struct dirent (through namelist). Returns -1 if there were any errors.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-/*
- * The DIRSIZ macro is the minimum record length which will hold the directory
- * entry.  This requires the amount of space in struct dirent without the
- * d_name field, plus enough space for the name and a terminating nul byte
- * (dp->d_namlen + 1), rounded up to a 4 byte boundary.
- */
-#undef DIRSIZ
-#define DIRSIZ(dp)							\
-	((sizeof(struct dirent) - sizeof(dp)->d_name) +			\
-	    (((dp)->d_namlen + 1 + 3) &~ 3))
-
-int
-scandir(dirname, namelist, select, dcomp)
-	const char *dirname;
-	struct dirent ***namelist;
-	int (*select)(struct dirent *);
-	int (*dcomp)(const void *, const void *);
-{
-	struct dirent *d, *p, **names = NULL;
-	size_t nitems = 0;
-	struct stat stb;
-	long arraysz;
-	DIR *dirp;
-
-	if ((dirp = opendir(dirname)) == NULL)
-		return(-1);
-	if (_fstat(dirp->dd_fd, &stb) < 0)
-		goto fail;
-
-	/*
-	 * estimate the array size by taking the size of the directory file
-	 * and dividing it by a multiple of the minimum size entry.
-	 */
-	arraysz = (stb.st_size / 24);
-	names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *));
-	if (names == NULL)
-		goto fail;
-
-	while ((d = readdir(dirp)) != NULL) {
-		if (select != NULL && !(*select)(d))
-			continue;	/* just selected names */
-		/*
-		 * Make a minimum size copy of the data
-		 */
-		p = (struct dirent *)malloc(DIRSIZ(d));
-		if (p == NULL)
-			goto fail;
-		p->d_fileno = d->d_fileno;
-		p->d_type = d->d_type;
-		p->d_reclen = d->d_reclen;
-		p->d_namlen = d->d_namlen;
-		bcopy(d->d_name, p->d_name, p->d_namlen + 1);
-		/*
-		 * Check to make sure the array has space left and
-		 * realloc the maximum size.
-		 */
-		if (nitems >= arraysz) {
-			const int inc = 10;	/* increase by this much */
-			struct dirent **names2;
-
-			names2 = (struct dirent **)realloc((char *)names,
-				(arraysz + inc) * sizeof(struct dirent *));
-			if (names2 == NULL) {
-				free(p);
-				goto fail;
-			}
-			names = names2;
-			arraysz += inc;
-		}
-		names[nitems++] = p;
-	}
-	closedir(dirp);
-	if (nitems && dcomp != NULL)
-		qsort(names, nitems, sizeof(struct dirent *), dcomp);
-	*namelist = names;
-	return(nitems);
-
-fail:
-	while (nitems > 0)
-		free(names[--nitems]);
-	free(names);
-	closedir(dirp);
-	return -1;
-}
-
-/*
- * Alphabetic order comparison routine for those who want it.
- */
-int
-alphasort(d1, d2)
-	const void *d1;
-	const void *d2;
-{
-	return(strcmp((*(struct dirent **)d1)->d_name,
-	    (*(struct dirent **)d2)->d_name));
-}
diff --git a/lib/libc/gen/seed48.c b/lib/libc/gen/seed48.c
deleted file mode 100644
index 94167a7..0000000
--- a/lib/libc/gen/seed48.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/seed48.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-extern unsigned short _rand48_mult[3];
-extern unsigned short _rand48_add;
-
-unsigned short *
-seed48(unsigned short xseed[3])
-{
-	static unsigned short sseed[3];
-
-	sseed[0] = _rand48_seed[0];
-	sseed[1] = _rand48_seed[1];
-	sseed[2] = _rand48_seed[2];
-	_rand48_seed[0] = xseed[0];
-	_rand48_seed[1] = xseed[1];
-	_rand48_seed[2] = xseed[2];
-	_rand48_mult[0] = RAND48_MULT_0;
-	_rand48_mult[1] = RAND48_MULT_1;
-	_rand48_mult[2] = RAND48_MULT_2;
-	_rand48_add = RAND48_ADD;
-	return sseed;
-}
diff --git a/lib/libc/gen/seekdir.c b/lib/libc/gen/seekdir.c
deleted file mode 100644
index 5385819..0000000
--- a/lib/libc/gen/seekdir.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)seekdir.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/seekdir.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <dirent.h>
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "telldir.h"
-
-/*
- * Seek to an entry in a directory.
- * _seekdir is in telldir.c so that it can share opaque data structures.
- */
-void
-seekdir(dirp, loc)
-	DIR *dirp;
-	long loc;
-{
-	if (__isthreaded)
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
-	_seekdir(dirp, loc);
-	if (__isthreaded)
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
-}
diff --git a/lib/libc/gen/sem.c b/lib/libc/gen/sem.c
deleted file mode 100644
index b7d3739..0000000
--- a/lib/libc/gen/sem.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc/gen/sem.c,v 1.13 2004/02/06 15:15:44 deischen Exp $
- */
-
-/*
- * Some notes about this implementation.
- *
- * This is mostly a simple implementation of POSIX semaphores that
- * does not need threading.  Any semaphore created is a kernel-based
- * semaphore regardless of the pshared attribute.  This is necessary
- * because libc's stub for pthread_cond_wait() doesn't really wait,
- * and it is not worth the effort impose this behavior on libc.
- *
- * All functions here are designed to be thread-safe so that a
- * threads library need not provide wrappers except to make
- * sem_wait() and sem_timedwait() cancellation points or to
- * provide a faster userland implementation for non-pshared
- * semaphores.
- *
- * Also, this implementation of semaphores cannot really support
- * real pshared semaphores.  The sem_t is an allocated object
- * and can't be seen by other processes when placed in shared
- * memory.  It should work across forks as long as the semaphore
- * is created before any forks.
- *
- * The function sem_init() should be overridden by a threads
- * library if it wants to provide a different userland version
- * of semaphores.  The functions sem_wait() and sem_timedwait()
- * need to be wrapped to provide cancellation points.  The function
- * sem_post() may need to be wrapped to be signal-safe.
- */
-#include "namespace.h"
-#include <sys/queue.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <time.h>
-#include <_semaphore.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-static sem_t sem_alloc(unsigned int value, semid_t semid, int system_sem);
-static void  sem_free(sem_t sem);
-
-static LIST_HEAD(, sem) named_sems = LIST_HEAD_INITIALIZER(&named_sems);
-static pthread_mutex_t named_sems_mtx = PTHREAD_MUTEX_INITIALIZER;
-
-__weak_reference(__sem_init, sem_init);
-__weak_reference(__sem_destroy, sem_destroy);
-__weak_reference(__sem_open, sem_open);
-__weak_reference(__sem_close, sem_close);
-__weak_reference(__sem_unlink, sem_unlink);
-__weak_reference(__sem_wait, sem_wait);
-__weak_reference(__sem_trywait, sem_trywait);
-__weak_reference(__sem_timedwait, sem_timedwait);
-__weak_reference(__sem_post, sem_post);
-__weak_reference(__sem_getvalue, sem_getvalue);
-
-
-static inline int
-sem_check_validity(sem_t *sem)
-{
-
-	if ((sem != NULL) && ((*sem)->magic == SEM_MAGIC))
-		return (0);
-	else {
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-static void
-sem_free(sem_t sem)
-{
-
-	_pthread_mutex_destroy(&sem->lock);
-	_pthread_cond_destroy(&sem->gtzero);
-	sem->magic = 0;
-	free(sem);
-}
-
-static sem_t
-sem_alloc(unsigned int value, semid_t semid, int system_sem)
-{
-	sem_t sem;
-
-	if (value > SEM_VALUE_MAX) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	sem = (sem_t)malloc(sizeof(struct sem));
-	if (sem == NULL) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-
-	sem->count = (uint32_t)value;
-	sem->nwaiters = 0;
-	sem->magic = SEM_MAGIC;
-	sem->semid = semid;
-	sem->syssem = system_sem;
-	sem->lock = PTHREAD_MUTEX_INITIALIZER;
-	sem->gtzero = PTHREAD_COND_INITIALIZER;
-	return (sem);
-}
-
-int
-__sem_init(sem_t *sem, int pshared, unsigned int value)
-{
-	semid_t semid;
-
-	/*
-	 * We always have to create the kernel semaphore if the
-	 * threads library isn't present since libc's version of
-	 * pthread_cond_wait() is just a stub that doesn't really
-	 * wait.
-	 */
-	if (ksem_init(&semid, value) != 0)
-		return (-1);
-
-	(*sem) = sem_alloc(value, semid, 1);
-	if ((*sem) == NULL) {
-		ksem_destroy(semid);
-		return (-1);
-	}
-	return (0);
-}
-
-int
-__sem_destroy(sem_t *sem)
-{
-	int retval;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	_pthread_mutex_lock(&(*sem)->lock);
-	/*
-	 * If this is a system semaphore let the kernel track it otherwise
-	 * make sure there are no waiters.
-	 */
-	if ((*sem)->syssem != 0)
-		retval = ksem_destroy((*sem)->semid);
-	else if ((*sem)->nwaiters > 0) {
-		errno = EBUSY;
-		retval = -1;
-	}
-	else {
-		retval = 0;
-		(*sem)->magic = 0;
-	}
-	_pthread_mutex_unlock(&(*sem)->lock);
-
-	if (retval == 0) {
-		_pthread_mutex_destroy(&(*sem)->lock);
-		_pthread_cond_destroy(&(*sem)->gtzero);
-		sem_free(*sem);
-	}
-	return (retval);
-}
-
-sem_t *
-__sem_open(const char *name, int oflag, ...)
-{
-	sem_t *sem;
-	sem_t s;
-	semid_t semid;
-	mode_t mode;
-	unsigned int value;
-
-	mode = 0;
-	value = 0;
-
-	if ((oflag & O_CREAT) != 0) {
-		va_list ap;
-
-		va_start(ap, oflag);
-		mode = va_arg(ap, int);
-		value = va_arg(ap, unsigned int);
-		va_end(ap);
-	}
-	/*
-	 * we can be lazy and let the kernel handle the "oflag",
-	 * we'll just merge duplicate IDs into our list.
-	 */
-	if (ksem_open(&semid, name, oflag, mode, value) == -1)
-		return (SEM_FAILED);
-	/*
-	 * search for a duplicate ID, we must return the same sem_t *
-	 * if we locate one.
-	 */
-	_pthread_mutex_lock(&named_sems_mtx);
-	LIST_FOREACH(s, &named_sems, entry) {
-		if (s->semid == semid) {
-			sem = s->backpointer;
-			_pthread_mutex_unlock(&named_sems_mtx);
-			return (sem);
-		}
-	}
-	sem = (sem_t *)malloc(sizeof(*sem));
-	if (sem == NULL)
-		goto err;
-	*sem = sem_alloc(value, semid, 1);
-	if ((*sem) == NULL)
-		goto err;
-	LIST_INSERT_HEAD(&named_sems, *sem, entry);
-	(*sem)->backpointer = sem;
-	_pthread_mutex_unlock(&named_sems_mtx);
-	return (sem);
-err:
-	_pthread_mutex_unlock(&named_sems_mtx);
-	ksem_close(semid);
-	if (sem != NULL) {
-		if (*sem != NULL)
-			sem_free(*sem);
-		else
-			errno = ENOSPC;
-		free(sem);
-	} else {
-		errno = ENOSPC;
-	}
-	return (SEM_FAILED);
-}
-
-int
-__sem_close(sem_t *sem)
-{
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if ((*sem)->syssem == 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	_pthread_mutex_lock(&named_sems_mtx);
-	if (ksem_close((*sem)->semid) != 0) {
-		_pthread_mutex_unlock(&named_sems_mtx);
-		return (-1);
-	}
-	LIST_REMOVE((*sem), entry);
-	_pthread_mutex_unlock(&named_sems_mtx);
-	sem_free(*sem);
-	*sem = NULL;
-	free(sem);
-	return (0);
-}
-
-int
-__sem_unlink(const char *name)
-{
-
-	return (ksem_unlink(name));
-}
-
-int
-__sem_wait(sem_t *sem)
-{
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	return (ksem_wait((*sem)->semid));
-}
-
-int
-__sem_trywait(sem_t *sem)
-{
-	int retval;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if ((*sem)->syssem != 0)
- 		retval = ksem_trywait((*sem)->semid);
-	else {
-		_pthread_mutex_lock(&(*sem)->lock);
-		if ((*sem)->count > 0) {
-			(*sem)->count--;
-			retval = 0;
-		} else {
-			errno = EAGAIN;
-			retval = -1;
-		}
-		_pthread_mutex_unlock(&(*sem)->lock);
-	}
-	return (retval);
-}
-
-int
-__sem_timedwait(sem_t * __restrict sem,
-    struct timespec * __restrict abs_timeout)
-{
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	return (ksem_timedwait((*sem)->semid, abs_timeout));
-}
-
-int
-__sem_post(sem_t *sem)
-{
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	return (ksem_post((*sem)->semid));
-}
-
-int
-__sem_getvalue(sem_t * __restrict sem, int * __restrict sval)
-{
-	int retval;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if ((*sem)->syssem != 0)
-		retval = ksem_getvalue((*sem)->semid, sval);
-	else {
-		_pthread_mutex_lock(&(*sem)->lock);
-		*sval = (int)(*sem)->count;
-		_pthread_mutex_unlock(&(*sem)->lock);
-
-		retval = 0;
-	}
-	return (retval);
-}
diff --git a/lib/libc/gen/semctl.c b/lib/libc/gen/semctl.c
deleted file mode 100644
index 4c0b249..0000000
--- a/lib/libc/gen/semctl.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2002 Doug Rabson
- * 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.
- *
- * 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.
- *
- */
-
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/semctl.c,v 1.9 2003/02/16 17:29:09 nectar Exp $");
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-extern int __semctl(int semid, int semnum, int cmd, union semun *arg);
-
-int semctl(int semid, int semnum, int cmd, ...)
-{
-	va_list ap;
-	union semun semun;
-	union semun *semun_ptr;
-
-	va_start(ap, cmd);
-	if (cmd == IPC_SET || cmd == IPC_STAT || cmd == GETALL
-	    || cmd == SETVAL || cmd == SETALL) {
-		semun = va_arg(ap, union semun);
-		semun_ptr = &semun;
-	} else {
-		semun_ptr = NULL;
-	}
-	va_end(ap);
-
-	return (__semctl(semid, semnum, cmd, semun_ptr));
-}
diff --git a/lib/libc/gen/setdomainname.c b/lib/libc/gen/setdomainname.c
deleted file mode 100644
index 571a73f..0000000
--- a/lib/libc/gen/setdomainname.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/setdomainname.c,v 1.7 2002/02/01 00:57:29 obrien Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <unistd.h>
-
-int
-setdomainname(const char *name, int namelen)
-{
-	int mib[2];
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_NISDOMAINNAME;
-	if (sysctl(mib, 2, NULL, NULL, (void *)name, namelen) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc/gen/sethostname.c b/lib/libc/gen/sethostname.c
deleted file mode 100644
index 3a15727..0000000
--- a/lib/libc/gen/sethostname.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sethostname.c,v 1.4 2002/05/28 16:59:39 alfred Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-int
-sethostname(const char *name, int namelen)
-{
-	int mib[2];
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTNAME;
-	if (sysctl(mib, 2, NULL, NULL, (void *)name, namelen) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc/gen/setjmperr.c b/lib/libc/gen/setjmperr.c
deleted file mode 100644
index d5d8d06..0000000
--- a/lib/libc/gen/setjmperr.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1980, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setjmperr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/setjmperr.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
-
-/*
- * This routine is called from longjmp() when an error occurs.
- * Programs that wish to exit gracefully from this error may
- * write their own versions.
- * If this routine returns, the program is aborted.
- */
-
-#include "namespace.h"
-#include <setjmp.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-void
-longjmperror()
-{
-#define	ERRMSG	"longjmp botch.\n"
-	(void)_write(STDERR_FILENO, ERRMSG, sizeof(ERRMSG) - 1);
-}
diff --git a/lib/libc/gen/setmode.c b/lib/libc/gen/setmode.c
deleted file mode 100644
index 0ffa82d..0000000
--- a/lib/libc/gen/setmode.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Dave Borman at Cray Research, Inc.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/setmode.c,v 1.10 2005/04/08 21:15:38 stefanf Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <signal.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef SETMODE_DEBUG
-#include <stdio.h>
-#endif
-#include "un-namespace.h"
-
-#define	SET_LEN	6		/* initial # of bitcmd struct to malloc */
-#define	SET_LEN_INCR 4		/* # of bitcmd structs to add as needed */
-
-typedef struct bitcmd {
-	char	cmd;
-	char	cmd2;
-	mode_t	bits;
-} BITCMD;
-
-#define	CMD2_CLR	0x01
-#define	CMD2_SET	0x02
-#define	CMD2_GBITS	0x04
-#define	CMD2_OBITS	0x08
-#define	CMD2_UBITS	0x10
-
-static BITCMD	*addcmd(BITCMD *, int, int, int, u_int);
-static void	 compress_mode(BITCMD *);
-#ifdef SETMODE_DEBUG
-static void	 dumpmode(BITCMD *);
-#endif
-
-/*
- * Given the old mode and an array of bitcmd structures, apply the operations
- * described in the bitcmd structures to the old mode, and return the new mode.
- * Note that there is no '=' command; a strict assignment is just a '-' (clear
- * bits) followed by a '+' (set bits).
- */
-mode_t
-getmode(const void *bbox, mode_t omode)
-{
-	const BITCMD *set;
-	mode_t clrval, newmode, value;
-
-	set = (const BITCMD *)bbox;
-	newmode = omode;
-	for (value = 0;; set++)
-		switch(set->cmd) {
-		/*
-		 * When copying the user, group or other bits around, we "know"
-		 * where the bits are in the mode so that we can do shifts to
-		 * copy them around.  If we don't use shifts, it gets real
-		 * grundgy with lots of single bit checks and bit sets.
-		 */
-		case 'u':
-			value = (newmode & S_IRWXU) >> 6;
-			goto common;
-
-		case 'g':
-			value = (newmode & S_IRWXG) >> 3;
-			goto common;
-
-		case 'o':
-			value = newmode & S_IRWXO;
-common:			if (set->cmd2 & CMD2_CLR) {
-				clrval =
-				    (set->cmd2 & CMD2_SET) ?  S_IRWXO : value;
-				if (set->cmd2 & CMD2_UBITS)
-					newmode &= ~((clrval<<6) & set->bits);
-				if (set->cmd2 & CMD2_GBITS)
-					newmode &= ~((clrval<<3) & set->bits);
-				if (set->cmd2 & CMD2_OBITS)
-					newmode &= ~(clrval & set->bits);
-			}
-			if (set->cmd2 & CMD2_SET) {
-				if (set->cmd2 & CMD2_UBITS)
-					newmode |= (value<<6) & set->bits;
-				if (set->cmd2 & CMD2_GBITS)
-					newmode |= (value<<3) & set->bits;
-				if (set->cmd2 & CMD2_OBITS)
-					newmode |= value & set->bits;
-			}
-			break;
-
-		case '+':
-			newmode |= set->bits;
-			break;
-
-		case '-':
-			newmode &= ~set->bits;
-			break;
-
-		case 'X':
-			if (omode & (S_IFDIR|S_IXUSR|S_IXGRP|S_IXOTH))
-				newmode |= set->bits;
-			break;
-
-		case '\0':
-		default:
-#ifdef SETMODE_DEBUG
-			(void)printf("getmode:%04o -> %04o\n", omode, newmode);
-#endif
-			return (newmode);
-		}
-}
-
-#define	ADDCMD(a, b, c, d)						\
-	if (set >= endset) {						\
-		BITCMD *newset;						\
-		setlen += SET_LEN_INCR;					\
-		newset = realloc(saveset, sizeof(BITCMD) * setlen);	\
-		if (!newset) {						\
-			if (saveset)					\
-				free(saveset);				\
-			saveset = NULL;					\
-			return (NULL);					\
-		}							\
-		set = newset + (set - saveset);				\
-		saveset = newset;					\
-		endset = newset + (setlen - 2);				\
-	}								\
-	set = addcmd(set, (a), (b), (c), (d))
-
-#define	STANDARD_BITS	(S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
-
-void *
-setmode(const char *p)
-{
-	int perm, who;
-	char op, *ep;
-	BITCMD *set, *saveset, *endset;
-	sigset_t sigset, sigoset;
-	mode_t mask;
-	int equalopdone=0, permXbits, setlen;
-	long perml;
-
-	if (!*p)
-		return (NULL);
-
-	/*
-	 * Get a copy of the mask for the permissions that are mask relative.
-	 * Flip the bits, we want what's not set.  Since it's possible that
-	 * the caller is opening files inside a signal handler, protect them
-	 * as best we can.
-	 */
-	sigfillset(&sigset);
-        (void)_sigprocmask(SIG_BLOCK, &sigset, &sigoset);
-	(void)umask(mask = umask(0));
-	mask = ~mask;
-        (void)_sigprocmask(SIG_SETMASK, &sigoset, NULL);
-
-	setlen = SET_LEN + 2;
-
-	if ((set = malloc((u_int)(sizeof(BITCMD) * setlen))) == NULL)
-		return (NULL);
-	saveset = set;
-	endset = set + (setlen - 2);
-
-	/*
-	 * If an absolute number, get it and return; disallow non-octal digits
-	 * or illegal bits.
-	 */
-	if (isdigit((unsigned char)*p)) {
-		perml = strtol(p, &ep, 8);
-		if (*ep || perml < 0 || perml & ~(STANDARD_BITS|S_ISTXT)) {
-			free(saveset);
-			return (NULL);
-		}
-		perm = (mode_t)perml;
-		ADDCMD('=', (STANDARD_BITS|S_ISTXT), perm, mask);
-		set->cmd = 0;
-		return (saveset);
-	}
-
-	/*
-	 * Build list of structures to set/clear/copy bits as described by
-	 * each clause of the symbolic mode.
-	 */
-	for (;;) {
-		/* First, find out which bits might be modified. */
-		for (who = 0;; ++p) {
-			switch (*p) {
-			case 'a':
-				who |= STANDARD_BITS;
-				break;
-			case 'u':
-				who |= S_ISUID|S_IRWXU;
-				break;
-			case 'g':
-				who |= S_ISGID|S_IRWXG;
-				break;
-			case 'o':
-				who |= S_IRWXO;
-				break;
-			default:
-				goto getop;
-			}
-		}
-
-getop:		if ((op = *p++) != '+' && op != '-' && op != '=') {
-			free(saveset);
-			return (NULL);
-		}
-		if (op == '=')
-			equalopdone = 0;
-
-		who &= ~S_ISTXT;
-		for (perm = 0, permXbits = 0;; ++p) {
-			switch (*p) {
-			case 'r':
-				perm |= S_IRUSR|S_IRGRP|S_IROTH;
-				break;
-			case 's':
-				/* If only "other" bits ignore set-id. */
-				if (!who || who & ~S_IRWXO)
-					perm |= S_ISUID|S_ISGID;
-				break;
-			case 't':
-				/* If only "other" bits ignore sticky. */
-				if (!who || who & ~S_IRWXO) {
-					who |= S_ISTXT;
-					perm |= S_ISTXT;
-				}
-				break;
-			case 'w':
-				perm |= S_IWUSR|S_IWGRP|S_IWOTH;
-				break;
-			case 'X':
-				permXbits = S_IXUSR|S_IXGRP|S_IXOTH;
-				break;
-			case 'x':
-				perm |= S_IXUSR|S_IXGRP|S_IXOTH;
-				break;
-			case 'u':
-			case 'g':
-			case 'o':
-				/*
-				 * When ever we hit 'u', 'g', or 'o', we have
-				 * to flush out any partial mode that we have,
-				 * and then do the copying of the mode bits.
-				 */
-				if (perm) {
-					ADDCMD(op, who, perm, mask);
-					perm = 0;
-				}
-				if (op == '=')
-					equalopdone = 1;
-				if (op == '+' && permXbits) {
-					ADDCMD('X', who, permXbits, mask);
-					permXbits = 0;
-				}
-				ADDCMD(*p, who, op, mask);
-				break;
-
-			default:
-				/*
-				 * Add any permissions that we haven't already
-				 * done.
-				 */
-				if (perm || (op == '=' && !equalopdone)) {
-					if (op == '=')
-						equalopdone = 1;
-					ADDCMD(op, who, perm, mask);
-					perm = 0;
-				}
-				if (permXbits) {
-					ADDCMD('X', who, permXbits, mask);
-					permXbits = 0;
-				}
-				goto apply;
-			}
-		}
-
-apply:		if (!*p)
-			break;
-		if (*p != ',')
-			goto getop;
-		++p;
-	}
-	set->cmd = 0;
-#ifdef SETMODE_DEBUG
-	(void)printf("Before compress_mode()\n");
-	dumpmode(saveset);
-#endif
-	compress_mode(saveset);
-#ifdef SETMODE_DEBUG
-	(void)printf("After compress_mode()\n");
-	dumpmode(saveset);
-#endif
-	return (saveset);
-}
-
-static BITCMD *
-addcmd(BITCMD *set, int op, int who, int oparg, u_int mask)
-{
-	switch (op) {
-	case '=':
-		set->cmd = '-';
-		set->bits = who ? who : STANDARD_BITS;
-		set++;
-
-		op = '+';
-		/* FALLTHROUGH */
-	case '+':
-	case '-':
-	case 'X':
-		set->cmd = op;
-		set->bits = (who ? who : mask) & oparg;
-		break;
-
-	case 'u':
-	case 'g':
-	case 'o':
-		set->cmd = op;
-		if (who) {
-			set->cmd2 = ((who & S_IRUSR) ? CMD2_UBITS : 0) |
-				    ((who & S_IRGRP) ? CMD2_GBITS : 0) |
-				    ((who & S_IROTH) ? CMD2_OBITS : 0);
-			set->bits = (mode_t)~0;
-		} else {
-			set->cmd2 = CMD2_UBITS | CMD2_GBITS | CMD2_OBITS;
-			set->bits = mask;
-		}
-
-		if (oparg == '+')
-			set->cmd2 |= CMD2_SET;
-		else if (oparg == '-')
-			set->cmd2 |= CMD2_CLR;
-		else if (oparg == '=')
-			set->cmd2 |= CMD2_SET|CMD2_CLR;
-		break;
-	}
-	return (set + 1);
-}
-
-#ifdef SETMODE_DEBUG
-static void
-dumpmode(BITCMD *set)
-{
-	for (; set->cmd; ++set)
-		(void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n",
-		    set->cmd, set->bits, set->cmd2 ? " cmd2:" : "",
-		    set->cmd2 & CMD2_CLR ? " CLR" : "",
-		    set->cmd2 & CMD2_SET ? " SET" : "",
-		    set->cmd2 & CMD2_UBITS ? " UBITS" : "",
-		    set->cmd2 & CMD2_GBITS ? " GBITS" : "",
-		    set->cmd2 & CMD2_OBITS ? " OBITS" : "");
-}
-#endif
-
-/*
- * Given an array of bitcmd structures, compress by compacting consecutive
- * '+', '-' and 'X' commands into at most 3 commands, one of each.  The 'u',
- * 'g' and 'o' commands continue to be separate.  They could probably be
- * compacted, but it's not worth the effort.
- */
-static void
-compress_mode(BITCMD *set)
-{
-	BITCMD *nset;
-	int setbits, clrbits, Xbits, op;
-
-	for (nset = set;;) {
-		/* Copy over any 'u', 'g' and 'o' commands. */
-		while ((op = nset->cmd) != '+' && op != '-' && op != 'X') {
-			*set++ = *nset++;
-			if (!op)
-				return;
-		}
-
-		for (setbits = clrbits = Xbits = 0;; nset++) {
-			if ((op = nset->cmd) == '-') {
-				clrbits |= nset->bits;
-				setbits &= ~nset->bits;
-				Xbits &= ~nset->bits;
-			} else if (op == '+') {
-				setbits |= nset->bits;
-				clrbits &= ~nset->bits;
-				Xbits &= ~nset->bits;
-			} else if (op == 'X')
-				Xbits |= nset->bits & ~setbits;
-			else
-				break;
-		}
-		if (clrbits) {
-			set->cmd = '-';
-			set->cmd2 = 0;
-			set->bits = clrbits;
-			set++;
-		}
-		if (setbits) {
-			set->cmd = '+';
-			set->cmd2 = 0;
-			set->bits = setbits;
-			set++;
-		}
-		if (Xbits) {
-			set->cmd = 'X';
-			set->cmd2 = 0;
-			set->bits = Xbits;
-			set++;
-		}
-	}
-}
diff --git a/lib/libc/gen/setproctitle.c b/lib/libc/gen/setproctitle.c
deleted file mode 100644
index 433bba2..0000000
--- a/lib/libc/gen/setproctitle.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 1995 Peter Wemm <peter@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, is permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice immediately at the beginning of the file, without modification,
- *    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. Absolutely no warranty of function or purpose is made by the author
- *    Peter Wemm.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/setproctitle.c,v 1.18 2003/07/01 09:45:35 alfred Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/sysctl.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-/*
- * Older FreeBSD 2.0, 2.1 and 2.2 had different ps_strings structures and
- * in different locations.
- * 1: old_ps_strings at the very top of the stack.
- * 2: old_ps_strings at SPARE_USRSPACE below the top of the stack.
- * 3: ps_strings at the very top of the stack.
- * This attempts to support a kernel built in the #2 and #3 era.
- */
-
-struct old_ps_strings {
-	char	*old_ps_argvstr;
-	int	old_ps_nargvstr;
-	char	*old_ps_envstr;
-	int	old_ps_nenvstr;
-};
-#define	OLD_PS_STRINGS ((struct old_ps_strings *) \
-	(USRSTACK - SPARE_USRSPACE - sizeof(struct old_ps_strings)))
-
-#include <stdarg.h>
-
-#define SPT_BUFSIZE 2048	/* from other parts of sendmail */
-
-void
-setproctitle(const char *fmt, ...)
-{
-	static struct ps_strings *ps_strings;
-	static char *buf = NULL;
-	static char *obuf = NULL;
-	static char **oargv, *kbuf;
-	static int oargc = -1;
-	static char *nargv[2] = { NULL, NULL };
-	char **nargvp;
-	int nargc;
-	int i;
-	va_list ap;
-	size_t len;
-	unsigned long ul_ps_strings;
-	int oid[4];
-
-	if (buf == NULL) {
-		buf = malloc(SPT_BUFSIZE);
-		if (buf == NULL) 
-			return;
-		nargv[0] = buf;
-	}
-
-	if (obuf == NULL ) {
-		obuf = malloc(SPT_BUFSIZE);
-		if (obuf == NULL)
-			return;
-		*obuf = '\0';
-	}
-
-	va_start(ap, fmt);
-
-	if (fmt) {
-		buf[SPT_BUFSIZE - 1] = '\0';
-
-		if (fmt[0] == '-') {
-			/* skip program name prefix */
-			fmt++;
-			len = 0;
-		} else {
-			/* print program name heading for grep */
-			(void)snprintf(buf, SPT_BUFSIZE, "%s: ", _getprogname());
-			len = strlen(buf);
-		}
-
-		/* print the argument string */
-		(void) vsnprintf(buf + len, SPT_BUFSIZE - len, fmt, ap);
-
-		nargvp = nargv;
-		nargc = 1;
-		kbuf = buf;
-	} else if (*obuf != '\0') {
-  		/* Idea from NetBSD - reset the title on fmt == NULL */
-		nargvp = oargv;
-		nargc = oargc;
-		kbuf = obuf;
-	} else
-		/* Nothing to restore */
-		return;
-
-	va_end(ap);
-
-	/* Set the title into the kernel cached command line */
-	oid[0] = CTL_KERN;
-	oid[1] = KERN_PROC;
-	oid[2] = KERN_PROC_ARGS;
-	oid[3] = getpid();
-	sysctl(oid, 4, 0, 0, kbuf, strlen(kbuf) + 1);
-
-	if (ps_strings == NULL) {
-		len = sizeof(ul_ps_strings);
-		if (sysctlbyname("kern.ps_strings", &ul_ps_strings, &len, NULL,
-		    0) == -1)
-			ul_ps_strings = PS_STRINGS;
-		ps_strings = (struct ps_strings *)ul_ps_strings;
-	}
-
-	/* PS_STRINGS points to zeroed memory on a style #2 kernel */
-	if (ps_strings->ps_argvstr) {
-		/* style #3 */
-		if (oargc == -1) {
-			/* Record our original args */
-			oargc = ps_strings->ps_nargvstr;
-			oargv = ps_strings->ps_argvstr;
-			for (i = len = 0; i < oargc; i++) {
-				/*
-				 * The program may have scribbled into its
-				 * argv array, e.g., to remove some arguments.
-				 * If that has happened, break out before
-				 * trying to call strlen on a NULL pointer.
-				 */
-				if (oargv[i] == NULL) {
-					oargc = i;
-					break;
-				}
-				snprintf(obuf + len, SPT_BUFSIZE - len, "%s%s",
-				    len ? " " : "", oargv[i]);
-				if (len)
-					len++;
-				len += strlen(oargv[i]);
-				if (len >= SPT_BUFSIZE)
-					break;
-			}
-		}
-		ps_strings->ps_nargvstr = nargc;
-		ps_strings->ps_argvstr = nargvp;
-	} else {
-		/* style #2 - we can only restore our first arg :-( */
-		if (*obuf == '\0')
-			strncpy(obuf, OLD_PS_STRINGS->old_ps_argvstr,
-			    SPT_BUFSIZE - 1);
-		OLD_PS_STRINGS->old_ps_nargvstr = 1;
-		OLD_PS_STRINGS->old_ps_argvstr = nargvp[0];
-	}
-}
diff --git a/lib/libc/gen/setprogname.c b/lib/libc/gen/setprogname.c
deleted file mode 100644
index 654bef4..0000000
--- a/lib/libc/gen/setprogname.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/setprogname.c,v 1.8 2002/03/29 22:43:41 markm Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "libc_private.h"
-
-void
-setprogname(const char *progname)
-{
-	const char *p;
-
-	p = strrchr(progname, '/');
-	if (p != NULL)
-		__progname = p + 1;
-	else
-		__progname = progname;
-}
diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c
deleted file mode 100644
index 8c719f8..0000000
--- a/lib/libc/gen/siginterrupt.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)siginterrupt.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/siginterrupt.c,v 1.4 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <signal.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-/*
- * Set signal state to prevent restart of system calls
- * after an instance of the indicated signal.
- */
-int
-siginterrupt(sig, flag)
-	int sig, flag;
-{
-	extern sigset_t _sigintr;
-	struct sigaction sa;
-	int ret;
-
-	if ((ret = _sigaction(sig, (struct sigaction *)0, &sa)) < 0)
-		return (ret);
-	if (flag) {
-		sigaddset(&_sigintr, sig);
-		sa.sa_flags &= ~SA_RESTART;
-	} else {
-		sigdelset(&_sigintr, sig);
-		sa.sa_flags |= SA_RESTART;
-	}
-	return (_sigaction(sig, &sa, (struct sigaction *)0));
-}
diff --git a/lib/libc/gen/siglist.c b/lib/libc/gen/siglist.c
deleted file mode 100644
index f269026..0000000
--- a/lib/libc/gen/siglist.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)siglist.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/siglist.c,v 1.4 2002/09/07 08:14:19 jmallett Exp $");
-
-#include <sys/cdefs.h>
-#include <signal.h>
-
-const char *const sys_signame[NSIG] = {
-	"Signal 0",
-	"hup",				/* SIGHUP */
-	"int",				/* SIGINT */
-	"quit",				/* SIGQUIT */
-	"ill",				/* SIGILL */
-	"trap",				/* SIGTRAP */
-	"abrt",				/* SIGABRT */
-	"emt",				/* SIGEMT */
-	"fpe",				/* SIGFPE */
-	"kill",				/* SIGKILL */
-	"bus",				/* SIGBUS */
-	"segv",				/* SIGSEGV */
-	"sys",				/* SIGSYS */
-	"pipe",				/* SIGPIPE */
-	"alrm",				/* SIGALRM */
-	"term",				/* SIGTERM */
-	"urg",				/* SIGURG */
-	"stop",				/* SIGSTOP */
-	"tstp",				/* SIGTSTP */
-	"cont",				/* SIGCONT */
-	"chld",				/* SIGCHLD */
-	"ttin",				/* SIGTTIN */
-	"ttou",				/* SIGTTOU */
-	"io",				/* SIGIO */
-	"xcpu",				/* SIGXCPU */
-	"xfsz",				/* SIGXFSZ */
-	"vtalrm",			/* SIGVTALRM */
-	"prof",				/* SIGPROF */
-	"winch",			/* SIGWINCH */
-	"info",				/* SIGINFO */
-	"usr1",				/* SIGUSR1 */
-	"usr2"				/* SIGUSR2 */
-};
-
-const char *const sys_siglist[NSIG] = {
-	"Signal 0",
-	"Hangup",			/* SIGHUP */
-	"Interrupt",			/* SIGINT */
-	"Quit",				/* SIGQUIT */
-	"Illegal instruction",		/* SIGILL */
-	"Trace/BPT trap",		/* SIGTRAP */
-	"Abort trap",			/* SIGABRT */
-	"EMT trap",			/* SIGEMT */
-	"Floating point exception",	/* SIGFPE */
-	"Killed",			/* SIGKILL */
-	"Bus error",			/* SIGBUS */
-	"Segmentation fault",		/* SIGSEGV */
-	"Bad system call",		/* SIGSYS */
-	"Broken pipe",			/* SIGPIPE */
-	"Alarm clock",			/* SIGALRM */
-	"Terminated",			/* SIGTERM */
-	"Urgent I/O condition",		/* SIGURG */
-	"Suspended (signal)",		/* SIGSTOP */
-	"Suspended",			/* SIGTSTP */
-	"Continued",			/* SIGCONT */
-	"Child exited",			/* SIGCHLD */
-	"Stopped (tty input)",		/* SIGTTIN */
-	"Stopped (tty output)",		/* SIGTTOU */
-	"I/O possible",			/* SIGIO */
-	"Cputime limit exceeded",	/* SIGXCPU */
-	"Filesize limit exceeded",	/* SIGXFSZ */
-	"Virtual timer expired",	/* SIGVTALRM */
-	"Profiling timer expired",	/* SIGPROF */
-	"Window size changes",		/* SIGWINCH */
-	"Information request",		/* SIGINFO */
-	"User defined signal 1",	/* SIGUSR1 */
-	"User defined signal 2"		/* SIGUSR2 */
-};
-const int sys_nsig = sizeof(sys_siglist) / sizeof(sys_siglist[0]);
diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c
deleted file mode 100644
index a958347..0000000
--- a/lib/libc/gen/signal.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)signal.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/signal.c,v 1.3 2002/02/01 00:57:29 obrien Exp $");
-
-/*
- * Almost backwards compatible signal.
- */
-#include "namespace.h"
-#include <signal.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-sigset_t _sigintr;		/* shared with siginterrupt */
-
-sig_t
-signal(s, a)
-	int s;
-	sig_t a;
-{
-	struct sigaction sa, osa;
-
-	sa.sa_handler = a;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	if (!sigismember(&_sigintr, s))
-		sa.sa_flags |= SA_RESTART;
-	if (_sigaction(s, &sa, &osa) < 0)
-		return (SIG_ERR);
-	return (osa.sa_handler);
-}
diff --git a/lib/libc/gen/sigsetops.c b/lib/libc/gen/sigsetops.c
deleted file mode 100644
index e345f26..0000000
--- a/lib/libc/gen/sigsetops.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- *
- *	@(#)sigsetops.c	8.1 (Berkeley) 6/4/93
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sigsetops.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sigsetops.c,v 1.8 2002/02/01 00:57:29 obrien Exp $");
-
-#include <errno.h>
-#include <signal.h>
-
-int
-sigaddset(set, signo)
-	sigset_t *set;
-	int signo;
-{
-
-	if (signo <= 0 || signo > _SIG_MAXSIG) {
-		errno = EINVAL;
-		return (-1);
-	}
-	set->__bits[_SIG_WORD(signo)] |= _SIG_BIT(signo);
-	return (0);
-}
-
-int
-sigdelset(set, signo)
-	sigset_t *set;
-	int signo;
-{
-
-	if (signo <= 0 || signo > _SIG_MAXSIG) {
-		errno = EINVAL;
-		return (-1);
-	}
-	set->__bits[_SIG_WORD(signo)] &= ~_SIG_BIT(signo);
-	return (0);
-}
-
-int
-sigemptyset(set)
-	sigset_t *set;
-{
-	int i;
-
-	for (i = 0; i < _SIG_WORDS; i++)
-		set->__bits[i] = 0;
-	return (0);
-}
-
-int
-sigfillset(set)
-	sigset_t *set;
-{
-	int i;
-
-	for (i = 0; i < _SIG_WORDS; i++)
-		set->__bits[i] = ~0U;
-	return (0);
-}
-
-int
-sigismember(set, signo)
-	const sigset_t *set;
-	int signo;
-{
-
-	if (signo <= 0 || signo > _SIG_MAXSIG) {
-		errno = EINVAL;
-		return (-1);
-	}
-	return ((set->__bits[_SIG_WORD(signo)] & _SIG_BIT(signo)) ? 1 : 0);
-}
diff --git a/lib/libc/gen/sleep.c b/lib/libc/gen/sleep.c
deleted file mode 100644
index bd48358..0000000
--- a/lib/libc/gen/sleep.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sleep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sleep.c,v 1.31 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <time.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-unsigned int
-__sleep(seconds)
-	unsigned int seconds;
-{
-	struct timespec time_to_sleep;
-	struct timespec time_remaining;
-
-	/*
-	 * Avoid overflow when `seconds' is huge.  This assumes that
-	 * the maximum value for a time_t is >= INT_MAX.
-	 */
-	if (seconds > INT_MAX)
-		return (seconds - INT_MAX + __sleep(INT_MAX));
-
-	time_to_sleep.tv_sec = seconds;
-	time_to_sleep.tv_nsec = 0;
-	if (_nanosleep(&time_to_sleep, &time_remaining) != -1)
-		return (0);
-	if (errno != EINTR)
-		return (seconds);		/* best guess */
-	return (time_remaining.tv_sec +
-		(time_remaining.tv_nsec != 0)); /* round up */
-}
-
-__weak_reference(__sleep, sleep);
-__weak_reference(__sleep, _sleep);
diff --git a/lib/libc/gen/srand48.c b/lib/libc/gen/srand48.c
deleted file mode 100644
index fd369a0..0000000
--- a/lib/libc/gen/srand48.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-extern unsigned short _rand48_mult[3];
-extern unsigned short _rand48_add;
-
-void
-srand48(long seed)
-{
-	_rand48_seed[0] = RAND48_SEED_0;
-	_rand48_seed[1] = (unsigned short) seed;
-	_rand48_seed[2] = (unsigned short) (seed >> 16);
-	_rand48_mult[0] = RAND48_MULT_0;
-	_rand48_mult[1] = RAND48_MULT_1;
-	_rand48_mult[2] = RAND48_MULT_2;
-	_rand48_add = RAND48_ADD;
-}
diff --git a/lib/libc/gen/statvfs.c b/lib/libc/gen/statvfs.c
deleted file mode 100644
index 303950b..0000000
--- a/lib/libc/gen/statvfs.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2002 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/statvfs.c,v 1.2 2002/09/06 11:23:40 tjr Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/statvfs.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-static int	sfs2svfs(const struct statfs *from, struct statvfs *to);
-
-int
-fstatvfs(int fd, struct statvfs *result)
-{
-	struct statfs sfs;
-	int rv;
-	long pcval;
-
-	rv = _fstatfs(fd, &sfs);
-	if (rv != 0)
-		return (rv);
-
-	rv = sfs2svfs(&sfs, result);
-	if (rv != 0)
-		return (rv);
-
-	/*
-	 * Whether pathconf's -1 return means error or unlimited does not
-	 * make any difference in this best-effort implementation.
-	 */
-	pcval = _fpathconf(fd, _PC_NAME_MAX);
-	if (pcval == -1)
-		result->f_namemax = ~0UL;
-	else
-		result->f_namemax = (unsigned long)pcval;
-	return (0);
-}
-
-int
-statvfs(const char * __restrict path, struct statvfs * __restrict result)
-{
-	struct statfs sfs;
-	int rv;
-	long pcval;
-
-	rv = statfs(path, &sfs);
-	if (rv != 0)
-		return (rv);
-
-	sfs2svfs(&sfs, result);
-
-	/*
-	 * Whether pathconf's -1 return means error or unlimited does not
-	 * make any difference in this best-effort implementation.
-	 */
-	pcval = pathconf(path, _PC_NAME_MAX);
-	if (pcval == -1)
-		result->f_namemax = ~0UL;
-	else
-		result->f_namemax = (unsigned long)pcval;
-	return (0);
-}
-
-static int
-sfs2svfs(const struct statfs *from, struct statvfs *to)
-{
-	static const struct statvfs zvfs;
-
-	*to = zvfs;
-
-	if (from->f_flags & MNT_RDONLY)
-		to->f_flag |= ST_RDONLY;
-	if (from->f_flags & MNT_NOSUID)
-		to->f_flag |= ST_NOSUID;
-
-	/* XXX should we clamp negative values? */
-#define COPY(field) \
-	do { \
-		to->field = from->field; \
-		if (from->field != to->field) { \
-			errno = EOVERFLOW; \
-			return (-1); \
-		} \
-	} while(0)
-
-	COPY(f_bavail);
-	COPY(f_bfree);
-	COPY(f_blocks);
-	COPY(f_ffree);
-	COPY(f_files);
-	to->f_bsize = from->f_iosize;
-	to->f_frsize = from->f_bsize;
-	to->f_favail = to->f_ffree;
-	return (0);
-}
-								 
-#ifdef MAIN
-#include <err.h>
-#include <stdint.h>
-#include <stdio.h>
-
-int
-main(int argc, char **argv)
-{
-	struct statvfs buf;
-
-	if (statvfs(argv[1], &buf) < 0)
-		err(1, "statvfs");
-
-#define SHOW(field) \
-	printf(#field ": %ju\n", (uintmax_t)buf.field)
-
-	SHOW(f_bavail);
-	SHOW(f_bfree);
-	SHOW(f_blocks);
-	SHOW(f_favail);
-	SHOW(f_ffree);
-	SHOW(f_files);
-	SHOW(f_bsize);
-	SHOW(f_frsize);
-	SHOW(f_namemax);
-	printf("f_flag: %lx\n", (unsigned long)buf.f_flag);
-
-	return 0;
-}
-
-#endif /* MAIN */
diff --git a/lib/libc/gen/stringlist.c b/lib/libc/gen/stringlist.c
deleted file mode 100644
index 1d977e4..0000000
--- a/lib/libc/gen/stringlist.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 1994 Christos Zoulas
- * 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 Christos Zoulas.
- * 4. 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 ``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 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/stringlist.c,v 1.7 2003/01/19 01:16:01 obrien Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include <err.h>
-#include <stdlib.h>
-#include <stringlist.h>
-#include "un-namespace.h"
-
-#define _SL_CHUNKSIZE	20
-
-/*
- * sl_init(): Initialize a string list
- */
-StringList *
-sl_init()
-{
-	StringList *sl;
-
-	sl = malloc(sizeof(StringList));
-	if (sl == NULL)
-		_err(1, "stringlist: %m");
-
-	sl->sl_cur = 0;
-	sl->sl_max = _SL_CHUNKSIZE;
-	sl->sl_str = malloc(sl->sl_max * sizeof(char *));
-	if (sl->sl_str == NULL)
-		_err(1, "stringlist: %m");
-	return sl;
-}
-
-
-/*
- * sl_add(): Add an item to the string list
- */
-int
-sl_add(sl, name)
-	StringList *sl;
-	char *name;
-{
-	if (sl->sl_cur == sl->sl_max - 1) {
-		sl->sl_max += _SL_CHUNKSIZE;
-		sl->sl_str = reallocf(sl->sl_str, sl->sl_max * sizeof(char *));
-		if (sl->sl_str == NULL)
-			return (-1);
-	}
-	sl->sl_str[sl->sl_cur++] = name;
-	return (0);
-}
-
-
-/*
- * sl_free(): Free a stringlist
- */
-void
-sl_free(sl, all)
-	StringList *sl;
-	int all;
-{
-	size_t i;
-
-	if (sl == NULL)
-		return;
-	if (sl->sl_str) {
-		if (all)
-			for (i = 0; i < sl->sl_cur; i++)
-				free(sl->sl_str[i]);
-		free(sl->sl_str);
-	}
-	free(sl);
-}
-
-
-/*
- * sl_find(): Find a name in the string list
- */
-char *
-sl_find(sl, name)
-	StringList *sl;
-	char *name;
-{
-	size_t i;
-
-	for (i = 0; i < sl->sl_cur; i++)
-		if (strcmp(sl->sl_str[i], name) == 0)
-			return sl->sl_str[i];
-
-	return NULL;
-}
diff --git a/lib/libc/gen/strtofflags.c b/lib/libc/gen/strtofflags.c
deleted file mode 100644
index 20a5c9f..0000000
--- a/lib/libc/gen/strtofflags.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * Copyright (c) 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.22 2002/04/16 11:03:22 joe Exp $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-static struct {
-	char *name;
-	u_long flag;
-	int invert;
-} mapping[] = {
-	/* shorter names per flag first, all prefixed by "no" */
-	{ "nosappnd",		SF_APPEND,	0 },
-	{ "nosappend",		SF_APPEND,	0 },
-	{ "noarch",		SF_ARCHIVED,	0 },
-	{ "noarchived",		SF_ARCHIVED,	0 },
-	{ "noschg",		SF_IMMUTABLE,	0 },
-	{ "noschange",		SF_IMMUTABLE,	0 },
-	{ "nosimmutable",	SF_IMMUTABLE,	0 },
-	{ "nosunlnk",		SF_NOUNLINK,	0 },
-	{ "nosunlink",		SF_NOUNLINK,	0 },
-#ifdef SF_SNAPSHOT
-	{ "nosnapshot",		SF_SNAPSHOT,	0 },
-#endif
-	{ "nouappnd",		UF_APPEND,	0 },
-	{ "nouappend",		UF_APPEND,	0 },
-	{ "nouchg",		UF_IMMUTABLE,	0 },
-	{ "nouchange",		UF_IMMUTABLE,	0 },
-	{ "nouimmutable",	UF_IMMUTABLE,	0 },
-	{ "nodump",		UF_NODUMP,	1 },
-	{ "noopaque",		UF_OPAQUE,	0 },
-	{ "nouunlnk",		UF_NOUNLINK,	0 },
-	{ "nouunlink",		UF_NOUNLINK,	0 }
-};
-#define longestflaglen	12
-#define nmappings	(sizeof(mapping) / sizeof(mapping[0]))
-
-/*
- * fflagstostr --
- *	Convert file flags to a comma-separated string.  If no flags
- *	are set, return the empty string.
- */
-char *
-fflagstostr(flags)
-	u_long flags;
-{
-	char *string;
-	char *sp, *dp;
-	u_long setflags;
-	int i;
-
-	if ((string = (char *)malloc(nmappings * (longestflaglen + 1))) == NULL)
-		return (NULL);
-
-	setflags = flags;
-	dp = string;
-	for (i = 0; i < nmappings; i++) {
-		if (setflags & mapping[i].flag) {
-			if (dp > string)
-				*dp++ = ',';
-			for (sp = mapping[i].invert ? mapping[i].name :
-			    mapping[i].name + 2; *sp; *dp++ = *sp++) ;
-			setflags &= ~mapping[i].flag;
-		}
-	}
-	*dp = '\0';
-	return (string);
-}
-
-/*
- * strtofflags --
- *	Take string of arguments and return file flags.  Return 0 on
- *	success, 1 on failure.  On failure, stringp is set to point
- *	to the offending token.
- */
-int
-strtofflags(stringp, setp, clrp)
-	char **stringp;
-	u_long *setp, *clrp;
-{
-	char *string, *p;
-	int i;
-
-	if (setp)
-		*setp = 0;
-	if (clrp)
-		*clrp = 0;
-	string = *stringp;
-	while ((p = strsep(&string, "\t ,")) != NULL) {
-		*stringp = p;
-		if (*p == '\0')
-			continue;
-		for (i = 0; i < nmappings; i++) {
-			if (strcmp(p, mapping[i].name + 2) == 0) {
-				if (mapping[i].invert) {
-					if (clrp)
-						*clrp |= mapping[i].flag;
-				} else {
-					if (setp)
-						*setp |= mapping[i].flag;
-				}
-				break;
-			} else if (strcmp(p, mapping[i].name) == 0) {
-				if (mapping[i].invert) {
-					if (setp)
-						*setp |= mapping[i].flag;
-				} else {
-					if (clrp)
-						*clrp |= mapping[i].flag;
-				}
-				break;
-			}
-		}
-		if (i == nmappings)
-			return 1;
-	}
-	return 0;
-}
diff --git a/lib/libc/gen/swapcontext.c b/lib/libc/gen/swapcontext.c
deleted file mode 100644
index 1725068..0000000
--- a/lib/libc/gen/swapcontext.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel M. Eischen <deischen@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. Neither the name of the author 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/swapcontext.c,v 1.5 2002/09/20 08:13:21 mini Exp $");
-
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/ucontext.h>
-
-#include <errno.h>
-#include <stddef.h>
-
-__weak_reference(__swapcontext, swapcontext);
-
-int
-__swapcontext(ucontext_t *oucp, const ucontext_t *ucp)
-{
-	int ret;
-
-	if ((oucp == NULL) || (ucp == NULL)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	oucp->uc_flags &= ~UCF_SWAPPED;
-	ret = getcontext(oucp);
-	if ((ret == 0) && !(oucp->uc_flags & UCF_SWAPPED)) {
-		oucp->uc_flags |= UCF_SWAPPED;
-		ret = setcontext(ucp);
-	}
-	return (ret);
-}
diff --git a/lib/libc/gen/sysconf.c b/lib/libc/gen/sysconf.c
deleted file mode 100644
index 309e163..0000000
--- a/lib/libc/gen/sysconf.c
+++ /dev/null
@@ -1,582 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Sean Eric Fagan of Cygnus Support.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sysconf.c,v 1.20 2002/11/17 08:54:29 dougb Exp $");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/sysctl.h>
-#include <sys/resource.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <pthread.h>		/* we just need the limits */
-#include <time.h>
-#include <unistd.h>
-
-#include "../stdlib/atexit.h"
-#include "../stdtime/tzfile.h"
-
-#define	_PATH_ZONEINFO	TZDIR	/* from tzfile.h */
-
-/*
- * sysconf --
- *	get configurable system variables.
- *
- * XXX
- * POSIX 1003.1 (ISO/IEC 9945-1, 4.8.1.3) states that the variable values
- * not change during the lifetime of the calling process.  This would seem
- * to require that any change to system limits kill all running processes.
- * A workaround might be to cache the values when they are first retrieved
- * and then simply return the cached value on subsequent calls.  This is
- * less useful than returning up-to-date values, however.
- */
-long
-sysconf(name)
-	int name;
-{
-	struct rlimit rl;
-	size_t len;
-	int mib[2], sverrno, value;
-	long defaultresult;
-	const char *path;
-
-	len = sizeof(value);
-	defaultresult = -1;
-
-	switch (name) {
-	case _SC_ARG_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_ARGMAX;
-		break;
-	case _SC_CHILD_MAX:
-		if (getrlimit(RLIMIT_NPROC, &rl) != 0)
-			return (-1);
-		if (rl.rlim_cur == RLIM_INFINITY)
-			return (-1);
-		if (rl.rlim_cur > LONG_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		return ((long)rl.rlim_cur);
-	case _SC_CLK_TCK:
-		return (CLK_TCK);
-	case _SC_NGROUPS_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_NGROUPS;
-		break;
-	case _SC_OPEN_MAX:
-	case _SC_STREAM_MAX:	/* assume fds run out before memory does */
-		if (getrlimit(RLIMIT_NOFILE, &rl) != 0)
-			return (-1);
-		if (rl.rlim_cur == RLIM_INFINITY)
-			return (-1);
-		if (rl.rlim_cur > LONG_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		return ((long)rl.rlim_cur);
-	case _SC_JOB_CONTROL:
-		return (_POSIX_JOB_CONTROL);
-	case _SC_SAVED_IDS:
-		/* XXX - must be 1 */
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_SAVED_IDS;
-		goto yesno;
-	case _SC_VERSION:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_POSIX1;
-		break;
-	case _SC_BC_BASE_MAX:
-		return (BC_BASE_MAX);
-	case _SC_BC_DIM_MAX:
-		return (BC_DIM_MAX);
-	case _SC_BC_SCALE_MAX:
-		return (BC_SCALE_MAX);
-	case _SC_BC_STRING_MAX:
-		return (BC_STRING_MAX);
-	case _SC_COLL_WEIGHTS_MAX:
-		return (COLL_WEIGHTS_MAX);
-	case _SC_EXPR_NEST_MAX:
-		return (EXPR_NEST_MAX);
-	case _SC_LINE_MAX:
-		return (LINE_MAX);
-	case _SC_RE_DUP_MAX:
-		return (RE_DUP_MAX);
-	case _SC_2_VERSION:
-		/*
-		 * This is something of a lie, but it would be silly at
-		 * this point to try to deduce this from the contents
-		 * of the filesystem.
-		 */
-		return (_POSIX2_VERSION);
-	case _SC_2_C_BIND:
-		return (_POSIX2_C_BIND);
-	case _SC_2_C_DEV:
-		return (_POSIX2_C_DEV);
-	case _SC_2_CHAR_TERM:
-		return (_POSIX2_CHAR_TERM);
-	case _SC_2_FORT_DEV:
-		return (_POSIX2_FORT_DEV);
-	case _SC_2_FORT_RUN:
-		return (_POSIX2_FORT_RUN);
-	case _SC_2_LOCALEDEF:
-		return (_POSIX2_LOCALEDEF);
-	case _SC_2_SW_DEV:
-		return (_POSIX2_SW_DEV);
-	case _SC_2_UPE:
-		return (_POSIX2_UPE);
-	case _SC_TZNAME_MAX:
-		path = _PATH_ZONEINFO;
-do_NAME_MAX:
-		sverrno = errno;
-		errno = 0;
-		value = pathconf(path, _PC_NAME_MAX);
-		if (value == -1 && errno != 0)
-			return (-1);
-		errno = sverrno;
-		return (value);
-
-	case _SC_ASYNCHRONOUS_IO:
-#if _POSIX_ASYNCHRONOUS_IO == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_ASYNCHRONOUS_IO;
-		break;
-#else
-		return (_POSIX_ASYNCHRONOUS_IO);
-#endif
-	case _SC_MAPPED_FILES:
-		return (_POSIX_MAPPED_FILES);
-	case _SC_MEMLOCK:
-		return (_POSIX_MEMLOCK);
-	case _SC_MEMLOCK_RANGE:
-		return (_POSIX_MEMLOCK_RANGE);
-	case _SC_MEMORY_PROTECTION:
-		return (_POSIX_MEMORY_PROTECTION);
-	case _SC_MESSAGE_PASSING:
-#if _POSIX_MESSAGE_PASSING == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_MESSAGE_PASSING;
-		goto yesno;
-#else
-		return (_POSIX_MESSAGE_PASSING);
-#endif
-	case _SC_PRIORITIZED_IO:
-#if _POSIX_PRIORITIZED_IO == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_PRIORITIZED_IO;
-		goto yesno;
-#else
-		return (_POSIX_PRIORITIZED_IO);
-#endif
-	case _SC_PRIORITY_SCHEDULING:
-#if _POSIX_PRIORITY_SCHEDULING == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_PRIORITY_SCHEDULING;
-		goto yesno;
-#else
-		return (_POSIX_PRIORITY_SCHEDULING);
-#endif
-	case _SC_REALTIME_SIGNALS:
-#if _POSIX_REALTIME_SIGNALS == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_REALTIME_SIGNALS;
-		goto yesno;
-#else
-		return (_POSIX_REALTIME_SIGNALS);
-#endif
-	case _SC_SEMAPHORES:
-#if _POSIX_SEMAPHORES == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SEMAPHORES;
-		goto yesno;
-#else
-		return (_POSIX_SEMAPHORES);
-#endif
-	case _SC_FSYNC:
-		return (_POSIX_FSYNC);
-
-	case _SC_SHARED_MEMORY_OBJECTS:
-		return (_POSIX_SHARED_MEMORY_OBJECTS);
-	case _SC_SYNCHRONIZED_IO:
-#if _POSIX_SYNCHRONIZED_IO == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SYNCHRONIZED_IO;
-		goto yesno;
-#else
-		return (_POSIX_SYNCHRONIZED_IO);
-#endif
-	case _SC_TIMERS:
-#if _POSIX_TIMERS == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_TIMERS;
-		goto yesno;
-#else
-		return (_POSIX_TIMERS);
-#endif
-	case _SC_AIO_LISTIO_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_AIO_LISTIO_MAX;
-		break;
-	case _SC_AIO_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_AIO_MAX;
-		break;
-	case _SC_AIO_PRIO_DELTA_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_AIO_PRIO_DELTA_MAX;
-		break;
-	case _SC_DELAYTIMER_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_DELAYTIMER_MAX;
-		goto yesno;
-	case _SC_MQ_OPEN_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_MQ_OPEN_MAX;
-		goto yesno;
-	case _SC_PAGESIZE:
-		defaultresult = getpagesize();
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_PAGESIZE;
-		goto yesno;
-	case _SC_RTSIG_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_RTSIG_MAX;
-		goto yesno;
-	case _SC_SEM_NSEMS_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SEM_NSEMS_MAX;
-		goto yesno;
-	case _SC_SEM_VALUE_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SEM_VALUE_MAX;
-		goto yesno;
-	case _SC_SIGQUEUE_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SIGQUEUE_MAX;
-		goto yesno;
-	case _SC_TIMER_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_TIMER_MAX;
-
-yesno:		if (sysctl(mib, 2, &value, &len, NULL, 0) == -1)
-			return (-1);
-		if (value == 0)
-			return (defaultresult);
-		return (value);
-
-	case _SC_2_PBS:
-	case _SC_2_PBS_ACCOUNTING:
-	case _SC_2_PBS_CHECKPOINT:
-	case _SC_2_PBS_LOCATE:
-	case _SC_2_PBS_MESSAGE:
-	case _SC_2_PBS_TRACK:
-#if _POSIX2_PBS == 0
-#error "don't know how to determine _SC_2_PBS"
-		/*
-		 * This probably requires digging through the filesystem
-		 * to see if the appropriate package has been installed.
-		 * Since we don't currently support this option at all,
-		 * it's not worth the effort to write the code now.
-		 * Figuring out which of the sub-options are supported
-		 * would be even more difficult, so it's probably easier
-		 * to always say ``no''.
-		 */
-#else
-		return (_POSIX2_PBS);
-#endif
-	case _SC_ADVISORY_INFO:
-#if _POSIX_ADVISORY_INFO == 0
-#error "_POSIX_ADVISORY_INFO"
-#else
-		return (_POSIX_ADVISORY_INFO);
-#endif
-	case _SC_BARRIERS:
-#if _POSIX_BARRIERS == 0
-#error "_POSIX_BARRIERS"
-#else
-		return (_POSIX_BARRIERS);
-#endif
-	case _SC_CLOCK_SELECTION:
-#if _POSIX_CLOCK_SELECTION == 0
-#error "_POSIX_CLOCK_SELECTION"
-#else
-		return (_POSIX_CLOCK_SELECTION);
-#endif
-	case _SC_CPUTIME:
-#if _POSIX_CPUTIME == 0
-#error "_POSIX_CPUTIME"
-#else
-		return (_POSIX_CPUTIME);
-#endif
-#ifdef notdef
-	case _SC_FILE_LOCKING:
-		/*
-		 * XXX - The standard doesn't tell us how to define
-		 * _POSIX_FILE_LOCKING, so we can't answer this one.
-		 */
-#endif
-#if _POSIX_THREAD_SAFE_FUNCTIONS > -1
-	case _SC_GETGR_R_SIZE_MAX:
-	case _SC_GETPW_R_SIZE_MAX:
-#error "somebody needs to implement this"
-#endif
-	case _SC_HOST_NAME_MAX:
-		return (MAXHOSTNAMELEN - 1); /* does not include \0 */
-	case _SC_LOGIN_NAME_MAX:
-		return (MAXLOGNAME);
-	case _SC_MONOTONIC_CLOCK:
-#if _POSIX_MONOTONIC_CLOCK == 0
-#error "_POSIX_MONOTONIC_CLOCK"
-#else
-		return (_POSIX_MONOTONIC_CLOCK);
-#endif
-#if _POSIX_MESSAGE_PASSING > -1
-	case _SC_MQ_PRIO_MAX:
-		return (MQ_PRIO_MAX);
-#endif
-	case _SC_READER_WRITER_LOCKS:
-		return (_POSIX_READER_WRITER_LOCKS);
-	case _SC_REGEXP:
-		return (_POSIX_REGEXP);
-	case _SC_SHELL:
-		return (_POSIX_SHELL);
-	case _SC_SPAWN:
-		return (_POSIX_SPAWN);
-	case _SC_SPIN_LOCKS:
-		return (_POSIX_SPIN_LOCKS);
-	case _SC_SPORADIC_SERVER:
-#if _POSIX_SPORADIC_SERVER == 0
-#error "_POSIX_SPORADIC_SERVER"
-#else
-		return (_POSIX_SPORADIC_SERVER);
-#endif
-	case _SC_THREAD_ATTR_STACKADDR:
-		return (_POSIX_THREAD_ATTR_STACKADDR);
-	case _SC_THREAD_ATTR_STACKSIZE:
-		return (_POSIX_THREAD_ATTR_STACKSIZE);
-	case _SC_THREAD_CPUTIME:
-		return (_POSIX_THREAD_CPUTIME);
-	case _SC_THREAD_DESTRUCTOR_ITERATIONS:
-		return (PTHREAD_DESTRUCTOR_ITERATIONS);
-	case _SC_THREAD_KEYS_MAX:
-		return (PTHREAD_KEYS_MAX);
-	case _SC_THREAD_PRIO_INHERIT:
-		return (_POSIX_THREAD_PRIO_INHERIT);
-	case _SC_THREAD_PRIO_PROTECT:
-		return (_POSIX_THREAD_PRIO_PROTECT);
-	case _SC_THREAD_PRIORITY_SCHEDULING:
-		return (_POSIX_THREAD_PRIORITY_SCHEDULING);
-	case _SC_THREAD_PROCESS_SHARED:
-		return (_POSIX_THREAD_PROCESS_SHARED);
-	case _SC_THREAD_SAFE_FUNCTIONS:
-		return (_POSIX_THREAD_SAFE_FUNCTIONS);
-	case _SC_THREAD_STACK_MIN:
-		return (PTHREAD_STACK_MIN);
-	case _SC_THREAD_THREADS_MAX:
-		return (PTHREAD_THREADS_MAX); /* XXX wrong type! */
-	case _SC_TIMEOUTS:
-		return (_POSIX_TIMEOUTS);
-	case _SC_THREADS:
-		return (_POSIX_THREADS);
-	case _SC_TRACE:
-#if _POSIX_TRACE == 0
-#error "_POSIX_TRACE"
-		/* While you're implementing this, also do the ones below. */
-#else
-		return (_POSIX_TRACE);
-#endif
-#if _POSIX_TRACE > -1
-	case _SC_TRACE_EVENT_FILTER:
-		return (_POSIX_TRACE_EVENT_FILTER);
-	case _SC_TRACE_INHERIT:
-		return (_POSIX_TRACE_INHERIT);
-	case _SC_TRACE_LOG:
-		return (_POSIX_TRACE_LOG);
-#endif
-	case _SC_TTY_NAME_MAX:
-		path = _PATH_DEV;
-		goto do_NAME_MAX;
-	case _SC_TYPED_MEMORY_OBJECTS:
-#if _POSIX_TYPED_MEMORY_OBJECTS == 0
-#error "_POSIX_TYPED_MEMORY_OBJECTS"
-#else
-		return (_POSIX_TYPED_MEMORY_OBJECTS);
-#endif
-	case _SC_V6_ILP32_OFF32:
-#if _V6_ILP32_OFF32 == 0
-		if (sizeof(int) * CHAR_BIT == 32 &&
-		    sizeof(int) == sizeof(long) &&
-		    sizeof(long) == sizeof(void *) &&
-		    sizeof(void *) == sizeof(off_t))
-			return 1;
-		else
-			return -1;
-#else
-		return (_V6_ILP32_OFF32);
-#endif
-	case _SC_V6_ILP32_OFFBIG:
-#if _V6_ILP32_OFFBIG == 0
-		if (sizeof(int) * CHAR_BIT == 32 &&
-		    sizeof(int) == sizeof(long) &&
-		    sizeof(long) == sizeof(void *) &&
-		    sizeof(off_t) * CHAR_BIT >= 64)
-			return 1;
-		else
-			return -1;
-#else
-		return (_V6_ILP32_OFFBIG);
-#endif
-	case _SC_V6_LP64_OFF64:
-#if _V6_LP64_OFF64 == 0
-		if (sizeof(int) * CHAR_BIT == 32 &&
-		    sizeof(long) * CHAR_BIT == 64 &&
-		    sizeof(long) == sizeof(void *) &&
-		    sizeof(void *) == sizeof(off_t))
-			return 1;
-		else
-			return -1;
-#else
-		return (_V6_LP64_OFF64);
-#endif
-	case _SC_V6_LPBIG_OFFBIG:
-#if _V6_LPBIG_OFFBIG == 0
-		if (sizeof(int) * CHAR_BIT >= 32 &&
-		    sizeof(long) * CHAR_BIT >= 64 &&
-		    sizeof(void *) * CHAR_BIT >= 64 &&
-		    sizeof(off_t) * CHAR_BIT >= 64)
-			return 1;
-		else
-			return -1;
-#else
-		return (_V6_LPBIG_OFFBIG);
-#endif
-	case _SC_ATEXIT_MAX:
-		return (ATEXIT_SIZE);
-	case _SC_IOV_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_IOV_MAX;
-		break;
-	case _SC_XOPEN_CRYPT:
-		return (_XOPEN_CRYPT);
-	case _SC_XOPEN_ENH_I18N:
-		return (_XOPEN_ENH_I18N);
-	case _SC_XOPEN_LEGACY:
-		return (_XOPEN_LEGACY);
-	case _SC_XOPEN_REALTIME:
-#if _XOPEN_REALTIME == 0
-		sverrno = errno;
-		value = sysconf(_SC_ASYNCHRONOUS_IO) > 0 &&
-			sysconf(_SC_MEMLOCK) > 0 &&
-			sysconf(_SC_MEMLOCK_RANGE) > 0 &&
-			sysconf(_SC_MESSAGE_PASSING) > 0 &&
-			sysconf(_SC_PRIORITY_SCHEDULING) > 0 &&
-			sysconf(_SC_REALTIME_SIGNALS) > 0 &&
-			sysconf(_SC_SEMAPHORES) > 0 &&
-			sysconf(_SC_SHARED_MEMORY_OBJECTS) > 0 &&
-			sysconf(_SC_SYNCHRONIZED_IO) > 0 &&
-			sysconf(_SC_TIMERS) > 0;
-		errno = sverrno;
-		if (value)
-			return (200112L);
-		else
-			return (-1);
-#else
-		return (_XOPEN_REALTIME);
-#endif
-	case _SC_XOPEN_REALTIME_THREADS:
-#if _XOPEN_REALTIME_THREADS == 0
-#error "_XOPEN_REALTIME_THREADS"
-#else
-		return (_XOPEN_REALTIME_THREADS);
-#endif
-	case _SC_XOPEN_SHM:
-		sverrno = errno;
-		if (sysctlbyname("kern.ipc.shmmin", &value, &len, NULL, 
-		    0) == -1) {
-			errno = sverrno;
-			return (-1);
-		}
-		errno = sverrno;
-		return (1);
-	case _SC_XOPEN_STREAMS:
-		return (_XOPEN_STREAMS);
-	case _SC_XOPEN_UNIX:
-		return (_XOPEN_UNIX);
-#ifdef _XOPEN_VERSION
-	case _SC_XOPEN_VERSION:
-		return (_XOPEN_VERSION);
-#endif
-#ifdef _XOPEN_XCU_VERSION
-	case _SC_XOPEN_XCU_VERSION:
-		return (_XOPEN_XCU_VERSION);
-#endif
-	case _SC_SYMLOOP_MAX:
-		return (MAXSYMLINKS);
-	case _SC_RAW_SOCKETS:
-		return (_POSIX_RAW_SOCKETS);
-	case _SC_IPV6:
-#if _POSIX_IPV6 == 0
-		sverrno = errno;
-		value = socket(PF_INET6, SOCK_DGRAM, 0);
-		errno = sverrno;
-		if (value >= 0) {
-			close(value);
-			return (200112L);
-		} else
-			return (0);
-#else
-		return (_POSIX_IPV6);
-#endif
-
-	case _SC_NPROCESSORS_CONF:
-	case _SC_NPROCESSORS_ONLN:
-		mib[0] = CTL_HW;
-		mib[1] = HW_NCPU;
-		break;
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	return (sysctl(mib, 2, &value, &len, NULL, 0) == -1 ? -1 : value);
-}
diff --git a/lib/libc/gen/sysctl.c b/lib/libc/gen/sysctl.c
deleted file mode 100644
index b6c89a0..0000000
--- a/lib/libc/gen/sysctl.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * Copyright (c) 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sysctl.c	8.2 (Berkeley) 1/4/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sysctl.c,v 1.5 2003/02/16 17:29:09 nectar Exp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
-extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
-    void *newp, size_t newlen);
-
-int
-sysctl(name, namelen, oldp, oldlenp, newp, newlen)
-	int *name;
-	u_int namelen;
-	void *oldp, *newp;
-	size_t *oldlenp, newlen;
-{
-	if (name[0] != CTL_USER)
-		return (__sysctl(name, namelen, oldp, oldlenp, newp, newlen));
-
-	if (newp != NULL) {
-		errno = EPERM;
-		return (-1);
-	}
-	if (namelen != 2) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	switch (name[1]) {
-	case USER_CS_PATH:
-		if (oldp && *oldlenp < sizeof(_PATH_STDPATH)) {
-			errno = ENOMEM;
-			return -1;
-		}
-		*oldlenp = sizeof(_PATH_STDPATH);
-		if (oldp != NULL)
-			memmove(oldp, _PATH_STDPATH, sizeof(_PATH_STDPATH));
-		return (0);
-	}
-
-	if (oldp && *oldlenp < sizeof(int)) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	*oldlenp = sizeof(int);
-	if (oldp == NULL)
-		return (0);
-
-	switch (name[1]) {
-	case USER_BC_BASE_MAX:
-		*(int *)oldp = BC_BASE_MAX;
-		return (0);
-	case USER_BC_DIM_MAX:
-		*(int *)oldp = BC_DIM_MAX;
-		return (0);
-	case USER_BC_SCALE_MAX:
-		*(int *)oldp = BC_SCALE_MAX;
-		return (0);
-	case USER_BC_STRING_MAX:
-		*(int *)oldp = BC_STRING_MAX;
-		return (0);
-	case USER_COLL_WEIGHTS_MAX:
-		*(int *)oldp = COLL_WEIGHTS_MAX;
-		return (0);
-	case USER_EXPR_NEST_MAX:
-		*(int *)oldp = EXPR_NEST_MAX;
-		return (0);
-	case USER_LINE_MAX:
-		*(int *)oldp = LINE_MAX;
-		return (0);
-	case USER_RE_DUP_MAX:
-		*(int *)oldp = RE_DUP_MAX;
-		return (0);
-	case USER_POSIX2_VERSION:
-		*(int *)oldp = _POSIX2_VERSION;
-		return (0);
-	case USER_POSIX2_C_BIND:
-#ifdef POSIX2_C_BIND
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_C_DEV:
-#ifdef	POSIX2_C_DEV
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_CHAR_TERM:
-#ifdef	POSIX2_CHAR_TERM
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_FORT_DEV:
-#ifdef	POSIX2_FORT_DEV
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_FORT_RUN:
-#ifdef	POSIX2_FORT_RUN
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_LOCALEDEF:
-#ifdef	POSIX2_LOCALEDEF
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_SW_DEV:
-#ifdef	POSIX2_SW_DEV
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_UPE:
-#ifdef	POSIX2_UPE
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_STREAM_MAX:
-		*(int *)oldp = FOPEN_MAX;
-		return (0);
-	case USER_TZNAME_MAX:
-		*(int *)oldp = NAME_MAX;
-		return (0);
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/gen/sysctlbyname.c b/lib/libc/gen/sysctlbyname.c
deleted file mode 100644
index e949a5c..0000000
--- a/lib/libc/gen/sysctlbyname.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlbyname.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <string.h>
-
-int
-sysctlbyname(const char *name, void *oldp, size_t *oldlenp, void *newp,
-	     size_t newlen)
-{
-	int name2oid_oid[2];
-	int real_oid[CTL_MAXNAME+2];
-	int error;
-	size_t oidlen;
-
-	name2oid_oid[0] = 0;	/* This is magic & undocumented! */
-	name2oid_oid[1] = 3;
-
-	oidlen = sizeof(real_oid);
-	error = sysctl(name2oid_oid, 2, real_oid, &oidlen, (void *)name,
-		       strlen(name));
-	if (error < 0) 
-		return error;
-	oidlen /= sizeof (int);
-	error = sysctl(real_oid, oidlen, oldp, oldlenp, newp, newlen);
-	return (error);
-}
-
diff --git a/lib/libc/gen/sysctlnametomib.c b/lib/libc/gen/sysctlnametomib.c
deleted file mode 100644
index 1a932ec..0000000
--- a/lib/libc/gen/sysctlnametomib.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2001 The FreeBSD Project. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``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 FREEBSD PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/sysctlnametomib.c,v 1.4 2003/01/04 00:11:11 tjr Exp $");
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <string.h>
-
-/*
- * This function uses a presently undocumented interface to the kernel
- * to walk the tree and get the type so it can print the value.
- * This interface is under work and consideration, and should probably
- * be killed with a big axe by the first person who can find the time.
- * (be aware though, that the proper interface isn't as obvious as it
- * may seem, there are various conflicting requirements.
- */
-int
-sysctlnametomib(const char *name, int *mibp, size_t *sizep)
-{
-	int oid[2];
-	int error;
-
-	oid[0] = 0;
-	oid[1] = 3;
-
-	*sizep *= sizeof (int);
-	error = sysctl(oid, 2, mibp, sizep, (void *)name, strlen(name));
-	*sizep /= sizeof (int);
-	return (error);
-}
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
deleted file mode 100644
index af907bb..0000000
--- a/lib/libc/gen/syslog.c
+++ /dev/null
@@ -1,439 +0,0 @@
-/*
- * Copyright (c) 1983, 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/syslog.c,v 1.35.2.2 2006/09/01 12:33:22 phk Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <netdb.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <stdarg.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-static int	LogFile = -1;		/* fd for log */
-static int	status;			/* connection status */
-static int	opened;			/* have done openlog() */
-static int	LogStat = 0;		/* status bits, set by openlog() */
-static const char *LogTag = NULL;	/* string to tag the entry with */
-static int	LogFacility = LOG_USER;	/* default facility code */
-static int	LogMask = 0xff;		/* mask of priorities to be logged */
-static pthread_mutex_t	syslog_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define	THREAD_LOCK()							\
-	do { 								\
-		if (__isthreaded) _pthread_mutex_lock(&syslog_mutex);	\
-	} while(0)
-#define	THREAD_UNLOCK()							\
-	do {								\
-		if (__isthreaded) _pthread_mutex_unlock(&syslog_mutex);	\
-	} while(0)
-
-static void	disconnectlog(void); /* disconnect from syslogd */
-static void	connectlog(void);	/* (re)connect to syslogd */
-static void	openlog_unlocked(const char *, int, int);
-
-enum {
-	NOCONN = 0,
-	CONNDEF,
-	CONNPRIV,
-};
-
-/*
- * Format of the magic cookie passed through the stdio hook
- */
-struct bufcookie {
-	char	*base;	/* start of buffer */
-	int	left;
-};
-
-/*
- * stdio write hook for writing to a static string buffer
- * XXX: Maybe one day, dynamically allocate it so that the line length
- *      is `unlimited'.
- */
-static int
-writehook(void *cookie, const char *buf, int len)
-{
-	struct bufcookie *h;	/* private `handle' */
-
-	h = (struct bufcookie *)cookie;
-	if (len > h->left) {
-		/* clip in case of wraparound */
-		len = h->left;
-	}
-	if (len > 0) {
-		(void)memcpy(h->base, buf, len); /* `write' it. */
-		h->base += len;
-		h->left -= len;
-	}
-	return len;
-}
-
-/*
- * syslog, vsyslog --
- *	print message on log file; output is intended for syslogd(8).
- */
-void
-syslog(int pri, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vsyslog(pri, fmt, ap);
-	va_end(ap);
-}
-
-void
-vsyslog(int pri, const char *fmt, va_list ap)
-{
-	int cnt;
-	char ch, *p;
-	time_t now;
-	int fd, saved_errno;
-	char *stdp, tbuf[2048], fmt_cpy[1024], timbuf[26], errstr[64];
-	FILE *fp, *fmt_fp;
-	struct bufcookie tbuf_cookie;
-	struct bufcookie fmt_cookie;
-
-#define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
-	/* Check for invalid bits. */
-	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
-		syslog(INTERNALLOG,
-		    "syslog: unknown facility/priority: %x", pri);
-		pri &= LOG_PRIMASK|LOG_FACMASK;
-	}
-
-	saved_errno = errno;
-
-	THREAD_LOCK();
-
-	/* Check priority against setlogmask values. */
-	if (!(LOG_MASK(LOG_PRI(pri)) & LogMask)) {
-		THREAD_UNLOCK();
-		return;
-	}
-
-	/* Set default facility if none specified. */
-	if ((pri & LOG_FACMASK) == 0)
-		pri |= LogFacility;
-
-	/* Create the primary stdio hook */
-	tbuf_cookie.base = tbuf;
-	tbuf_cookie.left = sizeof(tbuf);
-	fp = fwopen(&tbuf_cookie, writehook);
-	if (fp == NULL) {
-		THREAD_UNLOCK();
-		return;
-	}
-
-	/* Build the message. */
-	(void)time(&now);
-	(void)fprintf(fp, "<%d>", pri);
-	(void)fprintf(fp, "%.15s ", ctime_r(&now, timbuf) + 4);
-	if (LogStat & LOG_PERROR) {
-		/* Transfer to string buffer */
-		(void)fflush(fp);
-		stdp = tbuf + (sizeof(tbuf) - tbuf_cookie.left);
-	}
-	if (LogTag == NULL)
-		LogTag = _getprogname();
-	if (LogTag != NULL)
-		(void)fprintf(fp, "%s", LogTag);
-	if (LogStat & LOG_PID)
-		(void)fprintf(fp, "[%d]", getpid());
-	if (LogTag != NULL) {
-		(void)fprintf(fp, ": ");
-	}
-
-	/* Check to see if we can skip expanding the %m */
-	if (strstr(fmt, "%m")) {
-
-		/* Create the second stdio hook */
-		fmt_cookie.base = fmt_cpy;
-		fmt_cookie.left = sizeof(fmt_cpy) - 1;
-		fmt_fp = fwopen(&fmt_cookie, writehook);
-		if (fmt_fp == NULL) {
-			fclose(fp);
-			THREAD_UNLOCK();
-			return;
-		}
-
-		/*
-		 * Substitute error message for %m.  Be careful not to
-		 * molest an escaped percent "%%m".  We want to pass it
-		 * on untouched as the format is later parsed by vfprintf.
-		 */
-		for ( ; (ch = *fmt); ++fmt) {
-			if (ch == '%' && fmt[1] == 'm') {
-				++fmt;
-				strerror_r(saved_errno, errstr, sizeof(errstr));
-				fputs(errstr, fmt_fp);
-			} else if (ch == '%' && fmt[1] == '%') {
-				++fmt;
-				fputc(ch, fmt_fp);
-				fputc(ch, fmt_fp);
-			} else {
-				fputc(ch, fmt_fp);
-			}
-		}
-
-		/* Null terminate if room */
-		fputc(0, fmt_fp);
-		fclose(fmt_fp);
-
-		/* Guarantee null termination */
-		fmt_cpy[sizeof(fmt_cpy) - 1] = '\0';
-
-		fmt = fmt_cpy;
-	}
-
-	(void)vfprintf(fp, fmt, ap);
-	(void)fclose(fp);
-
-	cnt = sizeof(tbuf) - tbuf_cookie.left;
-
-	/* Remove a trailing newline */
-	if (tbuf[cnt - 1] == '\n')
-		cnt--;
-
-	/* Output to stderr if requested. */
-	if (LogStat & LOG_PERROR) {
-		struct iovec iov[2];
-		struct iovec *v = iov;
-
-		v->iov_base = stdp;
-		v->iov_len = cnt - (stdp - tbuf);
-		++v;
-		v->iov_base = "\n";
-		v->iov_len = 1;
-		(void)_writev(STDERR_FILENO, iov, 2);
-	}
-
-	/* Get connected, output the message to the local logger. */
-	if (!opened)
-		openlog_unlocked(LogTag, LogStat | LOG_NDELAY, 0);
-	connectlog();
-
-	/*
-	 * If the send() failed, there are two likely scenarios: 
-	 *  1) syslogd was restarted
-	 *  2) /var/run/log is out of socket buffer space, which
-	 *     in most cases means local DoS.
-	 * We attempt to reconnect to /var/run/log to take care of
-	 * case #1 and keep send()ing data to cover case #2
-	 * to give syslogd a chance to empty its socket buffer.
-	 *
-	 * If we are working with a priveleged socket, then take
-	 * only one attempt, because we don't want to freeze a
-	 * critical application like su(1) or sshd(8).
-	 *
-	 */
-
-	if (send(LogFile, tbuf, cnt, 0) < 0) {
-		if (errno != ENOBUFS) {
-			disconnectlog();
-			connectlog();
-		}
-		do {
-			_usleep(1);
-			if (send(LogFile, tbuf, cnt, 0) >= 0) {
-				THREAD_UNLOCK();
-				return;
-			}
-			if (status == CONNPRIV)
-				break;
-		} while (errno == ENOBUFS);
-	} else {
-		THREAD_UNLOCK();
-		return;
-	}
-
-	/*
-	 * Output the message to the console; try not to block
-	 * as a blocking console should not stop other processes.
-	 * Make sure the error reported is the one from the syslogd failure.
-	 */
-	if (LogStat & LOG_CONS &&
-	    (fd = _open(_PATH_CONSOLE, O_WRONLY|O_NONBLOCK, 0)) >= 0) {
-		struct iovec iov[2];
-		struct iovec *v = iov;
-
-		p = strchr(tbuf, '>') + 1;
-		v->iov_base = p;
-		v->iov_len = cnt - (p - tbuf);
-		++v;
-		v->iov_base = "\r\n";
-		v->iov_len = 2;
-		(void)_writev(fd, iov, 2);
-		(void)_close(fd);
-	}
-
-	THREAD_UNLOCK();
-}
-
-/* Should be called with mutex acquired */
-static void
-disconnectlog(void)
-{
-	/*
-	 * If the user closed the FD and opened another in the same slot,
-	 * that's their problem.  They should close it before calling on
-	 * system services.
-	 */
-	if (LogFile != -1) {
-		_close(LogFile);
-		LogFile = -1;
-	}
-	status = NOCONN;			/* retry connect */
-}
-
-/* Should be called with mutex acquired */
-static void
-connectlog(void)
-{
-	struct sockaddr_un SyslogAddr;	/* AF_UNIX address of local logger */
-
-	if (LogFile == -1) {
-		if ((LogFile = _socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
-			return;
-		(void)_fcntl(LogFile, F_SETFD, 1);
-	}
-	if (LogFile != -1 && status == NOCONN) {
-		SyslogAddr.sun_len = sizeof(SyslogAddr);
-		SyslogAddr.sun_family = AF_UNIX;
-
-		/*
-		 * First try priveleged socket. If no success,
-		 * then try default socket.
-		 */
-		(void)strncpy(SyslogAddr.sun_path, _PATH_LOG_PRIV,
-		    sizeof SyslogAddr.sun_path);
-		if (_connect(LogFile, (struct sockaddr *)&SyslogAddr,
-		    sizeof(SyslogAddr)) != -1)
-			status = CONNPRIV;
-
-		if (status == NOCONN) {
-			(void)strncpy(SyslogAddr.sun_path, _PATH_LOG,
-			    sizeof SyslogAddr.sun_path);
-			if (_connect(LogFile, (struct sockaddr *)&SyslogAddr,
-			    sizeof(SyslogAddr)) != -1)
-				status = CONNDEF;
-		}
-
-		if (status == NOCONN) {
-			/*
-			 * Try the old "/dev/log" path, for backward
-			 * compatibility.
-			 */
-			(void)strncpy(SyslogAddr.sun_path, _PATH_OLDLOG,
-			    sizeof SyslogAddr.sun_path);
-			if (_connect(LogFile, (struct sockaddr *)&SyslogAddr,
-			    sizeof(SyslogAddr)) != -1)
-				status = CONNDEF;
-		}
-
-		if (status == NOCONN) {
-			(void)_close(LogFile);
-			LogFile = -1;
-		}
-	}
-}
-
-static void
-openlog_unlocked(const char *ident, int logstat, int logfac)
-{
-	if (ident != NULL)
-		LogTag = ident;
-	LogStat = logstat;
-	if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0)
-		LogFacility = logfac;
-
-	if (LogStat & LOG_NDELAY)	/* open immediately */
-		connectlog();
-
-	opened = 1;	/* ident and facility has been set */
-}
-
-void
-openlog(const char *ident, int logstat, int logfac)
-{
-	THREAD_LOCK();
-	openlog_unlocked(ident, logstat, logfac);
-	THREAD_UNLOCK();
-}
-
-
-void
-closelog(void)
-{
-	THREAD_LOCK();
-	(void)_close(LogFile);
-	LogFile = -1;
-	LogTag = NULL;
-	status = NOCONN;
-	THREAD_UNLOCK();
-}
-
-/* setlogmask -- set the log mask level */
-int
-setlogmask(int pmask)
-{
-	int omask;
-
-	THREAD_LOCK();
-	omask = LogMask;
-	if (pmask != 0)
-		LogMask = pmask;
-	THREAD_UNLOCK();
-	return (omask);
-}
diff --git a/lib/libc/gen/telldir.c b/lib/libc/gen/telldir.c
deleted file mode 100644
index f321910..0000000
--- a/lib/libc/gen/telldir.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)telldir.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/telldir.c,v 1.8 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <dirent.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "telldir.h"
-
-/*
- * The option SINGLEUSE may be defined to say that a telldir
- * cookie may be used only once before it is freed. This option
- * is used to avoid having memory usage grow without bound.
- */
-#define SINGLEUSE
-
-/*
- * return a pointer into a directory
- */
-long
-telldir(dirp)
-	DIR *dirp;
-{
-	struct ddloc *lp;
-
-	if ((lp = (struct ddloc *)malloc(sizeof(struct ddloc))) == NULL)
-		return (-1);
-	if (__isthreaded)
-		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
-	lp->loc_index = dirp->dd_td->td_loccnt++;
-	lp->loc_seek = dirp->dd_seek;
-	lp->loc_loc = dirp->dd_loc;
-	LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe);
-	if (__isthreaded)
-		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
-	return (lp->loc_index);
-}
-
-/*
- * seek to an entry in a directory.
- * Only values returned by "telldir" should be passed to seekdir.
- */
-void
-_seekdir(dirp, loc)
-	DIR *dirp;
-	long loc;
-{
-	struct ddloc *lp;
-	struct dirent *dp;
-
-	LIST_FOREACH(lp, &dirp->dd_td->td_locq, loc_lqe) {
-		if (lp->loc_index == loc)
-			break;
-	}
-	if (lp == NULL)
-		return;
-	if (lp->loc_loc == dirp->dd_loc && lp->loc_seek == dirp->dd_seek)
-		goto found;
-	(void) lseek(dirp->dd_fd, (off_t)lp->loc_seek, SEEK_SET);
-	dirp->dd_seek = lp->loc_seek;
-	dirp->dd_loc = 0;
-	while (dirp->dd_loc < lp->loc_loc) {
-		dp = _readdir_unlocked(dirp);
-		if (dp == NULL)
-			break;
-	}
-found:
-#ifdef SINGLEUSE
-	LIST_REMOVE(lp, loc_lqe);
-	free((caddr_t)lp);
-#endif
-}
-
-/*
- * Reclaim memory for telldir cookies which weren't used.
- */
-void
-_reclaim_telldir(dirp)
-	DIR *dirp;
-{
-	struct ddloc *lp;
-	struct ddloc *templp;
-
-	lp = LIST_FIRST(&dirp->dd_td->td_locq);
-	while (lp != NULL) {
-		templp = lp;
-		lp = LIST_NEXT(lp, loc_lqe);
-		free(templp);
-	}
-	LIST_INIT(&dirp->dd_td->td_locq);
-}
diff --git a/lib/libc/gen/telldir.h b/lib/libc/gen/telldir.h
deleted file mode 100644
index 82cf9c1..0000000
--- a/lib/libc/gen/telldir.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2000
- * 	Daniel Eischen.  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. 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.
- *
- * $FreeBSD: src/lib/libc/gen/telldir.h,v 1.2 2001/01/24 12:59:24 deischen Exp $
- */
-
-#ifndef _TELLDIR_H_
-#define	_TELLDIR_H_
-
-#include <sys/queue.h>
-
-/*
- * One of these structures is malloced to describe the current directory
- * position each time telldir is called. It records the current magic
- * cookie returned by getdirentries and the offset within the buffer
- * associated with that return value.
- */
-struct ddloc {
-	LIST_ENTRY(ddloc) loc_lqe; /* entry in list */
-	long	loc_index;	/* key associated with structure */
-	long	loc_seek;	/* magic cookie returned by getdirentries */
-	long	loc_loc;	/* offset of entry in buffer */
-};
-
-/*
- * One of these structures is malloced for each DIR to record telldir
- * positions.
- */
-struct _telldir {
-	LIST_HEAD(, ddloc) td_locq; /* list of locations */
-	long	td_loccnt;	/* index of entry for sequential readdir's */
-};
-
-struct dirent	*_readdir_unlocked(DIR *);
-void 		_reclaim_telldir(DIR *);
-void 		_seekdir(DIR *, long);
-
-#endif
diff --git a/lib/libc/gen/termios.c b/lib/libc/gen/termios.c
deleted file mode 100644
index 65f8141..0000000
--- a/lib/libc/gen/termios.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/termios.c,v 1.13 2002/05/28 16:59:39 alfred Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include <errno.h>
-#include <termios.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-int
-tcgetattr(fd, t)
-	int fd;
-	struct termios *t;
-{
-
-	return (_ioctl(fd, TIOCGETA, t));
-}
-
-int
-tcsetattr(fd, opt, t)
-	int fd, opt;
-	const struct termios *t;
-{
-	struct termios localterm;
-
-	if (opt & TCSASOFT) {
-		localterm = *t;
-		localterm.c_cflag |= CIGNORE;
-		t = &localterm;
-	}
-	switch (opt & ~TCSASOFT) {
-	case TCSANOW:
-		return (_ioctl(fd, TIOCSETA, t));
-	case TCSADRAIN:
-		return (_ioctl(fd, TIOCSETAW, t));
-	case TCSAFLUSH:
-		return (_ioctl(fd, TIOCSETAF, t));
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-int
-tcsetpgrp(int fd, pid_t pgrp)
-{
-	int s;
-
-	s = pgrp;
-	return (_ioctl(fd, TIOCSPGRP, &s));
-}
-
-pid_t
-tcgetpgrp(fd)
-	int fd;
-{
-	int s;
-
-	if (_ioctl(fd, TIOCGPGRP, &s) < 0)
-		return ((pid_t)-1);
-
-	return ((pid_t)s);
-}
-
-speed_t
-cfgetospeed(t)
-	const struct termios *t;
-{
-
-	return (t->c_ospeed);
-}
-
-speed_t
-cfgetispeed(t)
-	const struct termios *t;
-{
-
-	return (t->c_ispeed);
-}
-
-int
-cfsetospeed(t, speed)
-	struct termios *t;
-	speed_t speed;
-{
-
-	t->c_ospeed = speed;
-	return (0);
-}
-
-int
-cfsetispeed(t, speed)
-	struct termios *t;
-	speed_t speed;
-{
-
-	t->c_ispeed = speed;
-	return (0);
-}
-
-int
-cfsetspeed(t, speed)
-	struct termios *t;
-	speed_t speed;
-{
-
-	t->c_ispeed = t->c_ospeed = speed;
-	return (0);
-}
-
-/*
- * Make a pre-existing termios structure into "raw" mode: character-at-a-time
- * mode with no characters interpreted, 8-bit data path.
- */
-void
-cfmakeraw(t)
-	struct termios *t;
-{
-
-	t->c_iflag &= ~(IMAXBEL|IXOFF|INPCK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON|IGNPAR);
-	t->c_iflag |= IGNBRK;
-	t->c_oflag &= ~OPOST;
-	t->c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN|NOFLSH|TOSTOP|PENDIN);
-	t->c_cflag &= ~(CSIZE|PARENB);
-	t->c_cflag |= CS8|CREAD;
-	t->c_cc[VMIN] = 1;
-	t->c_cc[VTIME] = 0;
-}
-
-int
-tcsendbreak(fd, len)
-	int fd, len;
-{
-	struct timeval sleepytime;
-
-	sleepytime.tv_sec = 0;
-	sleepytime.tv_usec = 400000;
-	if (_ioctl(fd, TIOCSBRK, 0) == -1)
-		return (-1);
-	(void)_select(0, 0, 0, 0, &sleepytime);
-	if (_ioctl(fd, TIOCCBRK, 0) == -1)
-		return (-1);
-	return (0);
-}
-
-int
-__tcdrain(fd)
-	int fd;
-{
-	return (_ioctl(fd, TIOCDRAIN, 0));
-}
-
-__weak_reference(__tcdrain, tcdrain);
-__weak_reference(__tcdrain, _tcdrain);
-
-int
-tcflush(fd, which)
-	int fd, which;
-{
-	int com;
-
-	switch (which) {
-	case TCIFLUSH:
-		com = FREAD;
-		break;
-	case TCOFLUSH:
-		com = FWRITE;
-		break;
-	case TCIOFLUSH:
-		com = FREAD | FWRITE;
-		break;
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	return (_ioctl(fd, TIOCFLUSH, &com));
-}
-
-int
-tcflow(fd, action)
-	int fd, action;
-{
-	struct termios term;
-	u_char c;
-
-	switch (action) {
-	case TCOOFF:
-		return (_ioctl(fd, TIOCSTOP, 0));
-	case TCOON:
-		return (_ioctl(fd, TIOCSTART, 0));
-	case TCION:
-	case TCIOFF:
-		if (tcgetattr(fd, &term) == -1)
-			return (-1);
-		c = term.c_cc[action == TCIOFF ? VSTOP : VSTART];
-		if (c != _POSIX_VDISABLE && _write(fd, &c, sizeof(c)) == -1)
-			return (-1);
-		return (0);
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/gen/time.c b/lib/libc/gen/time.c
deleted file mode 100644
index 5bf0ce0..0000000
--- a/lib/libc/gen/time.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/time.c,v 1.4 2003/07/19 02:53:46 wollman Exp $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-time_t
-time(t)
-	time_t *t;
-{
-	struct timeval tt;
-	time_t retval;
-
-	if (gettimeofday(&tt, (struct timezone *)0) < 0)
-		retval = -1;
-	else
-		retval = tt.tv_sec;
-	if (t != NULL)
-		*t = retval;
-	return (retval);
-}
diff --git a/lib/libc/gen/times.c b/lib/libc/gen/times.c
deleted file mode 100644
index 8c3700a..0000000
--- a/lib/libc/gen/times.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)times.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/times.c,v 1.3 2005/03/08 08:12:35 phk Exp $");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/resource.h>
-
-/*
- * Convert usec to clock ticks; could do (usec * CLK_TCK) / 1000000,
- * but this would overflow if we switch to nanosec.
- */
-#define	CONVTCK(r)	(r.tv_sec * CLK_TCK + r.tv_usec / (1000000 / CLK_TCK))
-
-clock_t
-times(tp)
-	struct tms *tp;
-{
-	struct rusage ru;
-	struct timespec t;
-	clock_t c;
-
-	if (getrusage(RUSAGE_SELF, &ru) < 0)
-		return ((clock_t)-1);
-	tp->tms_utime = CONVTCK(ru.ru_utime);
-	tp->tms_stime = CONVTCK(ru.ru_stime);
-	if (getrusage(RUSAGE_CHILDREN, &ru) < 0)
-		return ((clock_t)-1);
-	tp->tms_cutime = CONVTCK(ru.ru_utime);
-	tp->tms_cstime = CONVTCK(ru.ru_stime);
-	if (clock_gettime(CLOCK_MONOTONIC, &t))
-		return ((clock_t)-1);
-	c = t.tv_sec * CLK_TCK + t.tv_nsec / (1000000000 / CLK_TCK);
-	return (c);
-}
diff --git a/lib/libc/gen/timezone.c b/lib/libc/gen/timezone.c
deleted file mode 100644
index 8d8139a..0000000
--- a/lib/libc/gen/timezone.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)timezone.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/timezone.c,v 1.5 2002/02/01 01:08:48 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define TZ_MAX_CHARS 255
-
-char *_tztab();
-
-/*
- * timezone --
- *	The arguments are the number of minutes of time you are westward
- *	from Greenwich and whether DST is in effect.  It returns a string
- *	giving the name of the local timezone.  Should be replaced, in the
- *	application code, by a call to localtime.
- */
-
-static char	czone[TZ_MAX_CHARS];		/* space for zone name */
-
-char *
-timezone(zone, dst)
-	int	zone,
-		dst;
-{
-	char	*beg,
-			*end;
-
-	if ( (beg = getenv("TZNAME")) ) {	/* set in environment */
-		if ( (end = index(beg, ',')) ) {/* "PST,PDT" */
-			if (dst)
-				return(++end);
-			*end = '\0';
-			(void)strncpy(czone,beg,sizeof(czone) - 1);
-			czone[sizeof(czone) - 1] = '\0';
-			*end = ',';
-			return(czone);
-		}
-		return(beg);
-	}
-	return(_tztab(zone,dst));	/* default: table or created zone */
-}
-
-static struct zone {
-	int	offset;
-	char	*stdzone;
-	char	*dlzone;
-} zonetab[] = {
-	{-1*60,	"MET",	"MET DST"},	/* Middle European */
-	{-2*60,	"EET",	"EET DST"},	/* Eastern European */
-	{4*60,	"AST",	"ADT"},		/* Atlantic */
-	{5*60,	"EST",	"EDT"},		/* Eastern */
-	{6*60,	"CST",	"CDT"},		/* Central */
-	{7*60,	"MST",	"MDT"},		/* Mountain */
-	{8*60,	"PST",	"PDT"},		/* Pacific */
-#ifdef notdef
-	/* there's no way to distinguish this from WET */
-	{0,	"GMT",	0},		/* Greenwich */
-#endif
-	{0*60,	"WET",	"WET DST"},	/* Western European */
-	{-10*60,"EST",	"EST"},		/* Aust: Eastern */
-     {-10*60+30,"CST",	"CST"},		/* Aust: Central */
-	{-8*60,	"WST",	0},		/* Aust: Western */
-	{-1}
-};
-
-/*
- * _tztab --
- *	check static tables or create a new zone name; broken out so that
- *	we can make a guess as to what the zone is if the standard tables
- *	aren't in place in /etc.  DO NOT USE THIS ROUTINE OUTSIDE OF THE
- *	STANDARD LIBRARY.
- */
-char *
-_tztab(zone,dst)
-	int	zone;
-	int	dst;
-{
-	struct zone	*zp;
-	char	sign;
-
-	for (zp = zonetab; zp->offset != -1;++zp)	/* static tables */
-		if (zp->offset == zone) {
-			if (dst && zp->dlzone)
-				return(zp->dlzone);
-			if (!dst && zp->stdzone)
-				return(zp->stdzone);
-		}
-
-	if (zone < 0) {					/* create one */
-		zone = -zone;
-		sign = '+';
-	}
-	else
-		sign = '-';
-	(void)snprintf(czone, sizeof(czone),
-	    "GMT%c%d:%02d",sign,zone / 60,zone % 60);
-	return(czone);
-}
diff --git a/lib/libc/gen/tls.c b/lib/libc/gen/tls.c
deleted file mode 100644
index d4a0fd0..0000000
--- a/lib/libc/gen/tls.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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/lib/libc/gen/tls.c,v 1.8.2.1 2006/09/02 20:38:13 marcel Exp $
- */
-
-/*
- * Define stubs for TLS internals so that programs and libraries can
- * link. These functions will be replaced by functional versions at
- * runtime from ld-elf.so.1.
- */
-
-#include <sys/cdefs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <elf.h>
-#include <assert.h>
-
-#include "libc_private.h"
-
-__weak_reference(__libc_allocate_tls, _rtld_allocate_tls);
-__weak_reference(__libc_free_tls, _rtld_free_tls);
-
-#ifdef __i386__
-
-__weak_reference(___libc_tls_get_addr, ___tls_get_addr);
-__attribute__((__regparm__(1))) void * ___libc_tls_get_addr(void *);
-
-#endif
-
-void * __libc_tls_get_addr(void *);
-__weak_reference(__libc_tls_get_addr, __tls_get_addr);
-
-void *_rtld_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign);
-void _rtld_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
-void *__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign);
-void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
-
-#if defined(__ia64__) || defined(__alpha__) || defined(__powerpc__)
-#define TLS_VARIANT_I
-#endif
-#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \
-    defined(__arm__)
-#define TLS_VARIANT_II
-#endif
-
-#ifndef PIC
-
-#define round(size, align) \
-	(((size) + (align) - 1) & ~((align) - 1))
-
-static size_t tls_static_space;
-static size_t tls_init_size;
-static void *tls_init;
-#endif
-
-#ifdef __i386__
-
-/* GNU ABI */
-
-__attribute__((__regparm__(1)))
-void *
-___libc_tls_get_addr(void *ti __unused)
-{
-	return (0);
-}
-
-#endif
-
-void *
-__libc_tls_get_addr(void *ti __unused)
-{
-	return (0);
-}
-
-#ifndef PIC
-
-#ifdef TLS_VARIANT_I
-
-#define	TLS_TCB_SIZE	(2 * sizeof(void *))
-
-/*
- * Free Static TLS using the Variant I method.
- */
-void
-__libc_free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused)
-{
-	Elf_Addr *dtv;
-	Elf_Addr **tls;
-
-	tls = (Elf_Addr **)((Elf_Addr)tcb + tcbsize - TLS_TCB_SIZE);
-	dtv = tls[0];
-	free(dtv);
-	free(tcb);
-}
-
-/*
- * Allocate Static TLS using the Variant I method.
- */
-void *
-__libc_allocate_tls(void *oldtcb, size_t tcbsize, size_t tcbalign __unused)
-{
-	Elf_Addr *dtv;
-	Elf_Addr **tls;
-	char *tcb;
-
-	if (oldtcb != NULL && tcbsize == TLS_TCB_SIZE)
-		return (oldtcb);
-
-	tcb = malloc(tls_static_space + tcbsize);
-	tls = (Elf_Addr **)(tcb + tcbsize - TLS_TCB_SIZE);
-
-	if (oldtcb != NULL) {
-		memcpy(tls, oldtcb, tls_static_space + TLS_TCB_SIZE);
-		free(oldtcb);
-
-		/* Adjust the DTV. */
-		dtv = tls[0];
-		dtv[2] = (Elf_Addr)tls + TLS_TCB_SIZE;
-	} else {
-		dtv = malloc(3 * sizeof(Elf_Addr));
-		tls[0] = dtv;
-		dtv[0] = 1;
-		dtv[1] = 1;
-		dtv[2] = (Elf_Addr)tls + TLS_TCB_SIZE;
-
-		if (tls_init_size > 0)
-			memcpy((void*)dtv[2], tls_init, tls_init_size);
-		if (tls_static_space > tls_init_size)
-			memset((void*)(dtv[2] + tls_init_size), 0,
-			    tls_static_space - tls_init_size);
-	}
-
-	return(tcb); 
-}
-
-#endif
-
-#ifdef TLS_VARIANT_II
-
-#define	TLS_TCB_SIZE	(3 * sizeof(Elf_Addr))
-
-/*
- * Free Static TLS using the Variant II method.
- */
-void
-__libc_free_tls(void *tcb, size_t tcbsize __unused, size_t tcbalign)
-{
-	size_t size;
-	Elf_Addr* dtv;
-	Elf_Addr tlsstart, tlsend;
-
-	/*
-	 * Figure out the size of the initial TLS block so that we can
-	 * find stuff which ___tls_get_addr() allocated dynamically.
-	 */
-	size = round(tls_static_space, tcbalign);
-
-	dtv = ((Elf_Addr**)tcb)[1];
-	tlsend = (Elf_Addr) tcb;
-	tlsstart = tlsend - size;
-	free((void*) tlsstart);
-	free(dtv);
-}
-
-/*
- * Allocate Static TLS using the Variant II method.
- */
-void *
-__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign)
-{
-	size_t size;
-	char *tls;
-	Elf_Addr *dtv;
-	Elf_Addr segbase, oldsegbase;
-
-	size = round(tls_static_space, tcbalign);
-
-	assert(tcbsize >= 2*sizeof(Elf_Addr));
-	tls = malloc(size + tcbsize);
-	dtv = malloc(3 * sizeof(Elf_Addr));
-
-	segbase = (Elf_Addr)(tls + size);
-	((Elf_Addr*)segbase)[0] = segbase;
-	((Elf_Addr*)segbase)[1] = (Elf_Addr) dtv;
-
-	dtv[0] = 1;
-	dtv[1] = 1;
-	dtv[2] = segbase - tls_static_space;
-
-	if (oldtls) {
-		/*
-		 * Copy the static TLS block over whole.
-		 */
-		oldsegbase = (Elf_Addr) oldtls;
-		memcpy((void *)(segbase - tls_static_space),
-		    (const void *)(oldsegbase - tls_static_space),
-		    tls_static_space);
-
-		/*
-		 * We assume that this block was the one we created with
-		 * allocate_initial_tls().
-		 */
-		_rtld_free_tls(oldtls, 2*sizeof(Elf_Addr), sizeof(Elf_Addr));
-	} else {
-		memcpy((void *)(segbase - tls_static_space),
-		    tls_init, tls_init_size);
-		memset((void *)(segbase - tls_static_space + tls_init_size),
-		    0, tls_static_space - tls_init_size);
-	}
-
-	return (void*) segbase;
-}
-
-#endif /* TLS_VARIANT_II */
-
-#else
-
-void *
-__libc_allocate_tls(void *oldtls __unused, size_t tcbsize __unused,
-	size_t tcbalign __unused)
-{
-	return (0);
-}
-
-void
-__libc_free_tls(void *tcb __unused, size_t tcbsize __unused,
-	size_t tcbalign __unused)
-{
-}
-
-#endif /* PIC */
-
-extern char **environ;
-
-void
-_init_tls()
-{
-#ifndef PIC
-	Elf_Addr *sp;
-	Elf_Auxinfo *aux, *auxp;
-	Elf_Phdr *phdr;
-	size_t phent, phnum;
-	int i;
-	void *tls;
-
-	sp = (Elf_Addr *) environ;
-	while (*sp++ != 0)
-		;
-	aux = (Elf_Auxinfo *) sp;
-	phdr = 0;
-	phent = phnum = 0;
-	for (auxp = aux; auxp->a_type != AT_NULL; auxp++) {
-		switch (auxp->a_type) {
-		case AT_PHDR:
-			phdr = auxp->a_un.a_ptr;
-			break;
-
-		case AT_PHENT:
-			phent = auxp->a_un.a_val;
-			break;
-
-		case AT_PHNUM:
-			phnum = auxp->a_un.a_val;
-			break;
-		}
-	}
-	if (phdr == 0 || phent != sizeof(Elf_Phdr) || phnum == 0)
-		return;
-
-	for (i = 0; (unsigned) i < phnum; i++) {
-		if (phdr[i].p_type == PT_TLS) {
-			tls_static_space = round(phdr[i].p_memsz,
-			    phdr[i].p_align);
-			tls_init_size = phdr[i].p_filesz;
-			tls_init = (void*) phdr[i].p_vaddr;
-		}
-	}
-
-	tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, 1);
-
-	_set_tp(tls);
-#endif
-}
diff --git a/lib/libc/gen/ttyname.c b/lib/libc/gen/ttyname.c
deleted file mode 100644
index 4341ed4..0000000
--- a/lib/libc/gen/ttyname.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ttyname.c	8.2 (Berkeley) 1/27/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/ttyname.c,v 1.23 2005/05/20 15:39:20 ume Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/filio.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include "reentrant.h"
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-static char ttyname_buf[sizeof(_PATH_DEV) + MAXNAMLEN];
-
-static once_t		ttyname_init_once = ONCE_INITIALIZER;
-static thread_key_t	ttyname_key;
-static int		ttyname_keycreated = 0;
-
-int
-ttyname_r(int fd, char *buf, size_t len)
-{
-	struct stat	sb;
-	struct fiodgname_arg fgn;
-	size_t used;
-
-	*buf = '\0';
-
-	/* Must be a terminal. */
-	if (!isatty(fd))
-		return (ENOTTY);
-	/* Must be a character device. */
-	if (_fstat(fd, &sb) || !S_ISCHR(sb.st_mode))
-		return (ENOTTY);
-	/* Must have enough room */
-	if (len <= sizeof(_PATH_DEV))
-		return (ERANGE);
-
-	strcpy(buf, _PATH_DEV);
-	used = strlen(buf);
-	fgn.len = len - used;
-	fgn.buf = buf + used;
-	if (!_ioctl(fd, FIODGNAME, &fgn))
-		return (0);
-	used = strlen(buf);
-	devname_r(sb.st_rdev, S_IFCHR, buf + used, len - used);
-	return (0);
-}
-
-static void
-ttyname_keycreate(void)
-{
-	ttyname_keycreated = (thr_keycreate(&ttyname_key, free) == 0);
-}
-
-char *
-ttyname(int fd)
-{
-	char	*buf;
-
-	if (thr_main() != 0)
-		buf = ttyname_buf;
-	else {
-		if (thr_once(&ttyname_init_once, ttyname_keycreate) != 0 ||
-		    !ttyname_keycreated)
-			return (NULL);
-		if ((buf = thr_getspecific(ttyname_key)) == NULL) {
-			if ((buf = malloc(sizeof ttyname_buf)) == NULL)
-				return (NULL);
-			if (thr_setspecific(ttyname_key, buf) != 0) {
-				free(buf);
-				return (NULL);
-			}
-		}
-	}
-
-	if (ttyname_r(fd, buf, sizeof ttyname_buf) != 0)
-		return (NULL);
-	return (buf);
-}
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c
deleted file mode 100644
index 0d7359c..0000000
--- a/lib/libc/gen/ttyslot.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ttyslot.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/ttyslot.c,v 1.4 2002/02/01 01:08:48 obrien Exp $");
-
-#include <ttyent.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-int
-ttyslot()
-{
-	struct ttyent *ttyp;
-	int slot;
-	char *p;
-	int cnt;
-	char *name;
-
-	setttyent();
-	for (cnt = 0; cnt < 3; ++cnt)
-		if ( (name = ttyname(cnt)) ) {
-			if ( (p = rindex(name, '/')) )
-				++p;
-			else
-				p = name;
-			for (slot = 1; (ttyp = getttyent()); ++slot)
-				if (!strcmp(ttyp->ty_name, p)) {
-					endttyent();
-					return(slot);
-				}
-			break;
-		}
-	endttyent();
-	return(0);
-}
diff --git a/lib/libc/gen/ualarm.c b/lib/libc/gen/ualarm.c
deleted file mode 100644
index a9200ae..0000000
--- a/lib/libc/gen/ualarm.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ualarm.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/ualarm.c,v 1.4 2002/12/29 00:59:09 mike Exp $");
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#define	USPS	1000000		/* # of microseconds in a second */
-
-/*
- * Generate a SIGALRM signal in ``usecs'' microseconds.
- * If ``reload'' is non-zero, keep generating SIGALRM
- * every ``reload'' microseconds after the first signal.
- */
-useconds_t
-ualarm(usecs, reload)
-	useconds_t usecs;
-	useconds_t reload;
-{
-	struct itimerval new, old;
-
-	new.it_interval.tv_usec = reload % USPS;
-	new.it_interval.tv_sec = reload / USPS;
-
-	new.it_value.tv_usec = usecs % USPS;
-	new.it_value.tv_sec = usecs / USPS;
-
-	if (setitimer(ITIMER_REAL, &new, &old) == 0)
-		return (old.it_value.tv_sec * USPS + old.it_value.tv_usec);
-	/* else */
-		return (-1);
-}
diff --git a/lib/libc/gen/ulimit.c b/lib/libc/gen/ulimit.c
deleted file mode 100644
index d25ff47..0000000
--- a/lib/libc/gen/ulimit.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2002 Kyle Martin <mkm@ieee.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.
- *
- * 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/lib/libc/gen/ulimit.c,v 1.3 2003/01/04 01:11:49 tjr Exp $
- */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <ulimit.h>
-
-long
-ulimit(int cmd, ...)
-{
-	struct rlimit limit;
-	va_list ap;
-	long arg;
-
-	if (cmd == UL_GETFSIZE) {
-		if (getrlimit(RLIMIT_FSIZE, &limit) == -1)
-			return (-1);
-		limit.rlim_cur /= 512;
-		if (limit.rlim_cur > LONG_MAX)
-			return (LONG_MAX);
-		return ((long)limit.rlim_cur);
-	} else if (cmd == UL_SETFSIZE) {
-		va_start(ap, cmd);
-		arg = va_arg(ap, long);
-		va_end(ap);
-		limit.rlim_max = limit.rlim_cur = (rlim_t)arg * 512;
-
-		/* The setrlimit() function sets errno to EPERM if needed. */
-		if (setrlimit(RLIMIT_FSIZE, &limit) == -1)
-			return (-1);
-		if (arg * 512 > LONG_MAX)
-			return (LONG_MAX);
-		return (arg);
-	} else {
-		errno = EINVAL;
-		return (-1);
-	}
-}
diff --git a/lib/libc/gen/uname.c b/lib/libc/gen/uname.c
deleted file mode 100644
index 699e7b2..0000000
--- a/lib/libc/gen/uname.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/uname.c,v 1.9 2002/02/01 00:57:29 obrien Exp $");
-
-#define uname wrapped_uname
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
-#include <errno.h>
-#undef uname
-
-int
-uname(struct utsname *name)
-{
-	return __xuname(32, name);
-}
diff --git a/lib/libc/gen/unvis.c b/lib/libc/gen/unvis.c
deleted file mode 100644
index 35443d1..0000000
--- a/lib/libc/gen/unvis.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/unvis.c,v 1.9 2004/08/02 08:46:23 stefanf Exp $");
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <vis.h>
-
-/*
- * decode driven by state machine
- */
-#define	S_GROUND	0	/* haven't seen escape char */
-#define	S_START		1	/* start decoding special sequence */
-#define	S_META		2	/* metachar started (M) */
-#define	S_META1		3	/* metachar more, regular char (-) */
-#define	S_CTRL		4	/* control char started (^) */
-#define	S_OCTAL2	5	/* octal digit 2 */
-#define	S_OCTAL3	6	/* octal digit 3 */
-#define	S_HEX2		7	/* hex digit 2 */
-
-#define	S_HTTP		0x080	/* %HEXHEX escape */
-
-#define	isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-#define	ishex(c)	((((u_char)(c)) >= '0' && ((u_char)(c)) <= '9') || (((u_char)(c)) >= 'a' && ((u_char)(c)) <= 'f'))
-
-/*
- * unvis - decode characters previously encoded by vis
- */
-int
-unvis(char *cp, int c, int *astate, int flag)
-{
-
-	if (flag & UNVIS_END) {
-		if (*astate == S_OCTAL2 || *astate == S_OCTAL3) {
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		}
-		return (*astate == S_GROUND ? UNVIS_NOCHAR : UNVIS_SYNBAD);
-	}
-
-	switch (*astate & ~S_HTTP) {
-
-	case S_GROUND:
-		*cp = 0;
-		if (c == '\\') {
-			*astate = S_START;
-			return (0);
-		}
-		if (flag & VIS_HTTPSTYLE && c == '%') {
-			*astate = S_START | S_HTTP;
-			return (0);
-		}
-		*cp = c;
-		return (UNVIS_VALID);
-
-	case S_START:
-		if (*astate & S_HTTP) {
-		    if (ishex(tolower(c))) {
-			*cp = isdigit(c) ? (c - '0') : (tolower(c) - 'a');
-			*astate = S_HEX2;
-			return (0);
-		    }
-		}
-		switch(c) {
-		case '\\':
-			*cp = c;
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case '0': case '1': case '2': case '3':
-		case '4': case '5': case '6': case '7':
-			*cp = (c - '0');
-			*astate = S_OCTAL2;
-			return (0);
-		case 'M':
-			*cp = 0200;
-			*astate = S_META;
-			return (0);
-		case '^':
-			*astate = S_CTRL;
-			return (0);
-		case 'n':
-			*cp = '\n';
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case 'r':
-			*cp = '\r';
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case 'b':
-			*cp = '\b';
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case 'a':
-			*cp = '\007';
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case 'v':
-			*cp = '\v';
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case 't':
-			*cp = '\t';
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case 'f':
-			*cp = '\f';
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case 's':
-			*cp = ' ';
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case 'E':
-			*cp = '\033';
-			*astate = S_GROUND;
-			return (UNVIS_VALID);
-		case '\n':
-			/*
-			 * hidden newline
-			 */
-			*astate = S_GROUND;
-			return (UNVIS_NOCHAR);
-		case '$':
-			/*
-			 * hidden marker
-			 */
-			*astate = S_GROUND;
-			return (UNVIS_NOCHAR);
-		}
-		*astate = S_GROUND;
-		return (UNVIS_SYNBAD);
-
-	case S_META:
-		if (c == '-')
-			*astate = S_META1;
-		else if (c == '^')
-			*astate = S_CTRL;
-		else {
-			*astate = S_GROUND;
-			return (UNVIS_SYNBAD);
-		}
-		return (0);
-
-	case S_META1:
-		*astate = S_GROUND;
-		*cp |= c;
-		return (UNVIS_VALID);
-
-	case S_CTRL:
-		if (c == '?')
-			*cp |= 0177;
-		else
-			*cp |= c & 037;
-		*astate = S_GROUND;
-		return (UNVIS_VALID);
-
-	case S_OCTAL2:	/* second possible octal digit */
-		if (isoctal(c)) {
-			/*
-			 * yes - and maybe a third
-			 */
-			*cp = (*cp << 3) + (c - '0');
-			*astate = S_OCTAL3;
-			return (0);
-		}
-		/*
-		 * no - done with current sequence, push back passed char
-		 */
-		*astate = S_GROUND;
-		return (UNVIS_VALIDPUSH);
-
-	case S_OCTAL3:	/* third possible octal digit */
-		*astate = S_GROUND;
-		if (isoctal(c)) {
-			*cp = (*cp << 3) + (c - '0');
-			return (UNVIS_VALID);
-		}
-		/*
-		 * we were done, push back passed char
-		 */
-		return (UNVIS_VALIDPUSH);
-
-	case S_HEX2:	/* second mandatory hex digit */
-		if (ishex(tolower(c))) {
-			*cp = (isdigit(c) ? (*cp << 4) + (c - '0') : (*cp << 4) + (tolower(c) - 'a' + 10));
-		}
-		*astate = S_GROUND;
-		return (UNVIS_VALID);
-
-	default:
-		/*
-		 * decoder in unknown state - (probably uninitialized)
-		 */
-		*astate = S_GROUND;
-		return (UNVIS_SYNBAD);
-	}
-}
-
-/*
- * strunvis - decode src into dst
- *
- *	Number of chars decoded into dst is returned, -1 on error.
- *	Dst is null terminated.
- */
-
-int
-strunvis(char *dst, const char *src)
-{
-	char c;
-	char *start = dst;
-	int state = 0;
-
-	while ( (c = *src++) ) {
-	again:
-		switch (unvis(dst, c, &state, 0)) {
-		case UNVIS_VALID:
-			dst++;
-			break;
-		case UNVIS_VALIDPUSH:
-			dst++;
-			goto again;
-		case 0:
-		case UNVIS_NOCHAR:
-			break;
-		default:
-			return (-1);
-		}
-	}
-	if (unvis(dst, c, &state, UNVIS_END) == UNVIS_VALID)
-		dst++;
-	*dst = '\0';
-	return (dst - start);
-}
-
-int
-strunvisx(char *dst, const char *src, int flag)
-{
-	char c;
-	char *start = dst;
-	int state = 0;
-    
-	while ( (c = *src++) ) {
-	again:
-		switch (unvis(dst, c, &state, flag)) {
-		case UNVIS_VALID:
-			dst++;
-			break;
-		case UNVIS_VALIDPUSH:
-			dst++;
-			goto again;
-		case 0:
-		case UNVIS_NOCHAR:
-			break;
-		default:
-			return (-1);
-		}
-	}
-	if (unvis(dst, c, &state, UNVIS_END) == UNVIS_VALID)
-		dst++;
-	*dst = '\0';
-	return (dst - start);
-}
diff --git a/lib/libc/gen/usleep.c b/lib/libc/gen/usleep.c
deleted file mode 100644
index ba0820c..0000000
--- a/lib/libc/gen/usleep.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)usleep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.28.12.1 2005/10/08 17:56:53 delphij Exp $");
-
-#include "namespace.h"
-#include <time.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-int
-__usleep(useconds)
-	useconds_t useconds;
-{
-	struct timespec time_to_sleep;
-
-	time_to_sleep.tv_nsec = (useconds % 1000000) * 1000;
-	time_to_sleep.tv_sec = useconds / 1000000;
-	return (_nanosleep(&time_to_sleep, NULL));
-}
-
-__weak_reference(__usleep, usleep);
-__weak_reference(__usleep, _usleep);
diff --git a/lib/libc/gen/utime.c b/lib/libc/gen/utime.c
deleted file mode 100644
index cefa020..0000000
--- a/lib/libc/gen/utime.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)utime.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/utime.c,v 1.2 2002/03/22 21:52:05 obrien Exp $");
-
-#include <sys/time.h>
-
-#include <utime.h>
-
-int
-utime(path, times)
-	const char *path;
-	const struct utimbuf *times;
-{
-	struct timeval tv[2], *tvp;
-
-	if (times) {
-		tv[0].tv_sec = times->actime;
-		tv[1].tv_sec = times->modtime;
-		tv[0].tv_usec = tv[1].tv_usec = 0;
-		tvp = tv;
-	} else
-		tvp = NULL;
-	return (utimes(path, tvp));
-}
diff --git a/lib/libc/gen/valloc.c b/lib/libc/gen/valloc.c
deleted file mode 100644
index 206a7e8..0000000
--- a/lib/libc/gen/valloc.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1980, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)valloc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/valloc.c,v 1.3 2002/03/22 21:52:05 obrien Exp $");
-
-#include <stdlib.h>
-#include <unistd.h>
-
-void *
-valloc(i)
-	size_t i;
-{
-	long valsiz = getpagesize(), j;
-	void *cp = malloc(i + (valsiz-1));
-
-	j = ((long)cp + (valsiz-1)) &~ (valsiz-1);
-	return ((void *)j);
-}
diff --git a/lib/libc/gen/vis.c b/lib/libc/gen/vis.c
deleted file mode 100644
index 8b82877..0000000
--- a/lib/libc/gen/vis.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 7/19/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/vis.c,v 1.13 2003/10/30 12:41:50 phk Exp $");
-
-#include <sys/types.h>
-#include <limits.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <vis.h>
-
-#define	isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
-
-/*
- * vis - visually encode characters
- */
-char *
-vis(dst, c, flag, nextc)
-	char *dst;
-	int c, nextc;
-	int flag;
-{
-	c = (unsigned char)c;
-
-	if (flag & VIS_HTTPSTYLE) {
-		/* Described in RFC 1808 */
-		if (!(isalnum(c) /* alpha-numeric */
-		    /* safe */
-		    || c == '$' || c == '-' || c == '_' || c == '.' || c == '+'
-		    /* extra */
-		    || c == '!' || c == '*' || c == '\'' || c == '('
-		    || c == ')' || c == ',')) {
-			*dst++ = '%';
-			snprintf(dst, 4, (c < 16 ? "0%X" : "%X"), c);
-			dst += 2;
-			goto done;
-		}
-	}
-
-	if ((flag & VIS_GLOB) &&
-	    (c == '*' || c == '?' || c == '[' || c == '#'))
-		;
-	else if (isgraph(c) ||
-	   ((flag & VIS_SP) == 0 && c == ' ') ||
-	   ((flag & VIS_TAB) == 0 && c == '\t') ||
-	   ((flag & VIS_NL) == 0 && c == '\n') ||
-	   ((flag & VIS_SAFE) && (c == '\b' || c == '\007' || c == '\r'))) {
-		*dst++ = c;
-		if (c == '\\' && (flag & VIS_NOSLASH) == 0)
-			*dst++ = '\\';
-		*dst = '\0';
-		return (dst);
-	}
-
-	if (flag & VIS_CSTYLE) {
-		switch(c) {
-		case '\n':
-			*dst++ = '\\';
-			*dst++ = 'n';
-			goto done;
-		case '\r':
-			*dst++ = '\\';
-			*dst++ = 'r';
-			goto done;
-		case '\b':
-			*dst++ = '\\';
-			*dst++ = 'b';
-			goto done;
-		case '\a':
-			*dst++ = '\\';
-			*dst++ = 'a';
-			goto done;
-		case '\v':
-			*dst++ = '\\';
-			*dst++ = 'v';
-			goto done;
-		case '\t':
-			*dst++ = '\\';
-			*dst++ = 't';
-			goto done;
-		case '\f':
-			*dst++ = '\\';
-			*dst++ = 'f';
-			goto done;
-		case ' ':
-			*dst++ = '\\';
-			*dst++ = 's';
-			goto done;
-		case '\0':
-			*dst++ = '\\';
-			*dst++ = '0';
-			if (isoctal(nextc)) {
-				*dst++ = '0';
-				*dst++ = '0';
-			}
-			goto done;
-		}
-	}
-	if (((c & 0177) == ' ') || isgraph(c) || (flag & VIS_OCTAL)) {
-		*dst++ = '\\';
-		*dst++ = ((u_char)c >> 6 & 07) + '0';
-		*dst++ = ((u_char)c >> 3 & 07) + '0';
-		*dst++ = ((u_char)c & 07) + '0';
-		goto done;
-	}
-	if ((flag & VIS_NOSLASH) == 0)
-		*dst++ = '\\';
-	if (c & 0200) {
-		c &= 0177;
-		*dst++ = 'M';
-	}
-	if (iscntrl(c)) {
-		*dst++ = '^';
-		if (c == 0177)
-			*dst++ = '?';
-		else
-			*dst++ = c + '@';
-	} else {
-		*dst++ = '-';
-		*dst++ = c;
-	}
-done:
-	*dst = '\0';
-	return (dst);
-}
-
-/*
- * strvis, strvisx - visually encode characters from src into dst
- *
- *	Dst must be 4 times the size of src to account for possible
- *	expansion.  The length of dst, not including the trailing NUL,
- *	is returned.
- *
- *	Strvisx encodes exactly len bytes from src into dst.
- *	This is useful for encoding a block of data.
- */
-int
-strvis(dst, src, flag)
-	char *dst;
-	const char *src;
-	int flag;
-{
-	char c;
-	char *start;
-
-	for (start = dst; (c = *src); )
-		dst = vis(dst, c, flag, *++src);
-	*dst = '\0';
-	return (dst - start);
-}
-
-int
-strvisx(dst, src, len, flag)
-	char *dst;
-	const char *src;
-	size_t len;
-	int flag;
-{
-	int c;
-	char *start;
-
-	for (start = dst; len > 1; len--) {
-		c = *src;
-		dst = vis(dst, c, flag, *++src);
-	}
-	if (len)
-		dst = vis(dst, *src, flag, '\0');
-	*dst = '\0';
-
-	return (dst - start);
-}
diff --git a/lib/libc/gen/wait.c b/lib/libc/gen/wait.c
deleted file mode 100644
index 8cb80a4..0000000
--- a/lib/libc/gen/wait.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wait.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/wait.c,v 1.6 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include "un-namespace.h"
-
-pid_t
-__wait(int *istat)
-{
-	return (_wait4(WAIT_ANY, istat, 0, (struct rusage *)0));
-}
-
-__weak_reference(__wait, wait);
-__weak_reference(__wait, _wait);
diff --git a/lib/libc/gen/wait3.c b/lib/libc/gen/wait3.c
deleted file mode 100644
index a4b91a7..0000000
--- a/lib/libc/gen/wait3.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wait3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/wait3.c,v 1.3 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include "un-namespace.h"
-
-pid_t
-wait3(istat, options, rup)
-	int *istat;
-	int options;
-	struct rusage *rup;
-{
-	return (_wait4(WAIT_ANY, istat, options, rup));
-}
diff --git a/lib/libc/gen/waitpid.c b/lib/libc/gen/waitpid.c
deleted file mode 100644
index 273d1f3..0000000
--- a/lib/libc/gen/waitpid.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)waitpid.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/waitpid.c,v 1.6 2002/02/01 00:57:29 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include "un-namespace.h"
-
-pid_t
-__waitpid(pid_t pid, int *istat, int options)
-{
-	return (_wait4(pid, istat, options, (struct rusage *)0));
-}
-
-__weak_reference(__waitpid, waitpid);
-__weak_reference(__waitpid, _waitpid);
diff --git a/lib/libc/gen/wordexp.c b/lib/libc/gen/wordexp.c
deleted file mode 100644
index b09d397..0000000
--- a/lib/libc/gen/wordexp.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <wordexp.h>
-#include "un-namespace.h"
-
-__FBSDID("$FreeBSD: src/lib/libc/gen/wordexp.c,v 1.6 2004/06/30 13:55:08 tjr Exp $");
-
-static int	we_askshell(const char *, wordexp_t *, int);
-static int	we_check(const char *, int);
-
-/*
- * wordexp --
- *	Perform shell word expansion on `words' and place the resulting list
- *	of words in `we'. See wordexp(3).
- *
- *	Specified by IEEE Std. 1003.1-2001.
- */
-int
-wordexp(const char * __restrict words, wordexp_t * __restrict we, int flags)
-{
-	int error;
-
-	if (flags & WRDE_REUSE)
-		wordfree(we);
-	if ((flags & WRDE_APPEND) == 0) {
-		we->we_wordc = 0;
-		we->we_wordv = NULL;
-		we->we_strings = NULL;
-		we->we_nbytes = 0;
-	}
-	if ((error = we_check(words, flags)) != 0) {
-		wordfree(we);
-		return (error);
-	}
-	if ((error = we_askshell(words, we, flags)) != 0) {
-		wordfree(we);
-		return (error);
-	}
-	return (0);
-}
-
-/*
- * we_askshell --
- *	Use the `wordexp' /bin/sh builtin function to do most of the work
- *	in expanding the word string. This function is complicated by
- *	memory management.
- */
-static int
-we_askshell(const char *words, wordexp_t *we, int flags)
-{
-	int pdes[2];			/* Pipe to child */
-	char bbuf[9];			/* Buffer for byte count */
-	char wbuf[9];			/* Buffer for word count */
-	long nwords, nbytes;		/* Number of words, bytes from child */
-	long i;				/* Handy integer */
-	size_t sofs;			/* Offset into we->we_strings */
-	size_t vofs;			/* Offset into we->we_wordv */
-	pid_t pid;			/* Process ID of child */
-	int status;			/* Child exit status */
-	char *ifs;			/* IFS env. var. */
-	char *np, *p;			/* Handy pointers */
-	char *nstrings;			/* Temporary for realloc() */
-	char **nwv;			/* Temporary for realloc() */
-
-	if ((ifs = getenv("IFS")) == NULL)
-		ifs = " \t\n";
-
-	if (pipe(pdes) < 0)
-		return (WRDE_NOSPACE);	/* XXX */
-	if ((pid = fork()) < 0) {
-		_close(pdes[0]);
-		_close(pdes[1]);
-		return (WRDE_NOSPACE);	/* XXX */
-	}
-	else if (pid == 0) {
-		/*
-		 * We are the child; just get /bin/sh to run the wordexp
-		 * builtin on `words'.
-		 */
-		int devnull;
-		char *cmd;
-
-		_close(pdes[0]);
-		if (_dup2(pdes[1], STDOUT_FILENO) < 0)
-			_exit(1);
-		_close(pdes[1]);
-		if (asprintf(&cmd, "wordexp%c%s\n", *ifs, words) < 0)
-			_exit(1);
-		if ((flags & WRDE_SHOWERR) == 0) {
-			if ((devnull = _open(_PATH_DEVNULL, O_RDWR, 0666)) < 0)
-				_exit(1);
-			if (_dup2(devnull, STDERR_FILENO) < 0)
-				_exit(1);
-			_close(devnull);
-		}
-		execl(_PATH_BSHELL, "sh", flags & WRDE_UNDEF ? "-u" : "+u",
-		    "-c", cmd, (char *)NULL);
-		_exit(1);
-	}
-
-	/*
-	 * We are the parent; read the output of the shell wordexp function,
-	 * which is a 32-bit hexadecimal word count, a 32-bit hexadecimal
-	 * byte count (not including terminating null bytes), followed by
-	 * the expanded words separated by nulls.
-	 */
-	_close(pdes[1]);
-	if (_read(pdes[0], wbuf, 8) != 8 || _read(pdes[0], bbuf, 8) != 8) {
-		_close(pdes[0]);
-		_waitpid(pid, &status, 0);
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
-	}
-	wbuf[8] = bbuf[8] = '\0';
-	nwords = strtol(wbuf, NULL, 16);
-	nbytes = strtol(bbuf, NULL, 16) + nwords;
-
-	/*
-	 * Allocate or reallocate (when flags & WRDE_APPEND) the word vector
-	 * and string storage buffers for the expanded words we're about to
-	 * read from the child.
-	 */
-	sofs = we->we_nbytes;
-	vofs = we->we_wordc;
-	if ((flags & (WRDE_DOOFFS|WRDE_APPEND)) == (WRDE_DOOFFS|WRDE_APPEND))
-		vofs += we->we_offs;
-	we->we_wordc += nwords;
-	we->we_nbytes += nbytes;
-	if ((nwv = realloc(we->we_wordv, (we->we_wordc + 1 +
-	    (flags & WRDE_DOOFFS ?  we->we_offs : 0)) *
-	    sizeof(char *))) == NULL) {
-		_close(pdes[0]);
-		_waitpid(pid, &status, 0);
-		return (WRDE_NOSPACE);
-	}
-	we->we_wordv = nwv;
-	if ((nstrings = realloc(we->we_strings, we->we_nbytes)) == NULL) {
-		_close(pdes[0]);
-		_waitpid(pid, &status, 0);
-		return (WRDE_NOSPACE);
-	}
-	for (i = 0; i < vofs; i++)
-		if (we->we_wordv[i] != NULL)
-			we->we_wordv[i] += nstrings - we->we_strings;
-	we->we_strings = nstrings;
-
-	if (_read(pdes[0], we->we_strings + sofs, nbytes) != nbytes) {
-		_close(pdes[0]);
-		_waitpid(pid, &status, 0);
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
-	}
-
-	if (_waitpid(pid, &status, 0) < 0 || !WIFEXITED(status) ||
-	    WEXITSTATUS(status) != 0) {
-		_close(pdes[0]);
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
-	}
-	_close(pdes[0]);
-
-	/*
-	 * Break the null-terminated expanded word strings out into
-	 * the vector.
-	 */
-	if (vofs == 0 && flags & WRDE_DOOFFS)
-		while (vofs < we->we_offs)
-			we->we_wordv[vofs++] = NULL;
-	p = we->we_strings + sofs;
-	while (nwords-- != 0) {
-		we->we_wordv[vofs++] = p;
-		if ((np = memchr(p, '\0', nbytes)) == NULL)
-			return (WRDE_NOSPACE);	/* XXX */
-		nbytes -= np - p + 1;
-		p = np + 1;
-	}
-	we->we_wordv[vofs] = NULL;
-
-	return (0);
-}
-
-/*
- * we_check --
- *	Check that the string contains none of the following unquoted
- *	special characters: <newline> |&;<>(){}
- *	or command substitutions when WRDE_NOCMD is set in flags.
- */
-static int
-we_check(const char *words, int flags)
-{
-	char c;
-	int dquote, level, quote, squote;
-
-	quote = squote = dquote = 0;
-	while ((c = *words++) != '\0') {
-		switch (c) {
-		case '\\':
-			quote ^= 1;
-			continue;
-		case '\'':
-			if (quote + dquote == 0)
-				squote ^= 1;
-			break;
-		case '"':
-			if (quote + squote == 0)
-				dquote ^= 1;
-			break;
-		case '`':
-			if (quote + squote == 0 && flags & WRDE_NOCMD)
-				return (WRDE_CMDSUB);
-			while ((c = *words++) != '\0' && c != '`')
-				if (c == '\\' && (c = *words++) == '\0')
-					break;
-			if (c == '\0')
-				return (WRDE_SYNTAX);
-			break;
-		case '|': case '&': case ';': case '<': case '>':
-		case '{': case '}': case '(': case ')': case '\n':
-			if (quote + squote + dquote == 0)
-				return (WRDE_BADCHAR);
-			break;
-		case '$':
-			if ((c = *words++) == '\0')
-				break;
-			else if (quote + squote == 0 && c == '(') {
-				if (flags & WRDE_NOCMD && *words != '(')
-					return (WRDE_CMDSUB);
-				level = 1;
-				while ((c = *words++) != '\0') {
-					if (c == '\\') {
-						if ((c = *words++) == '\0')
-							break;
-					} else if (c == '(')
-						level++;
-					else if (c == ')' && --level == 0)
-						break;
-				}
-				if (c == '\0' || level != 0)
-					return (WRDE_SYNTAX);
-			} else if (quote + squote == 0 && c == '{') {
-				level = 1;
-				while ((c = *words++) != '\0') {
-					if (c == '\\') {
-						if ((c = *words++) == '\0')
-							break;
-					} else if (c == '{')
-						level++;
-					else if (c == '}' && --level == 0)
-						break;
-				}
-				if (c == '\0' || level != 0)
-					return (WRDE_SYNTAX);
-			} else
-				c = *--words;
-			break;
-		default:
-			break;
-		}
-		quote = 0;
-	}
-	if (quote + squote + dquote != 0)
-		return (WRDE_SYNTAX);
-
-	return (0);
-}
-
-/*
- * wordfree --
- *	Free the result of wordexp(). See wordexp(3).
- *
- *	Specified by IEEE Std. 1003.1-2001.
- */
-void
-wordfree(wordexp_t *we)
-{
-
-	if (we == NULL)
-		return;
-	free(we->we_wordv);
-	free(we->we_strings);
-	we->we_wordv = NULL;
-	we->we_strings = NULL;
-	we->we_nbytes = 0;
-	we->we_wordc = 0;
-}
diff --git a/lib/libc/gmon/Makefile b/lib/libc/gmon/Makefile
deleted file mode 100644
index 2e35617..0000000
--- a/lib/libc/gmon/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = gmon.o mcount.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/gmon/gmon.c b/lib/libc/gmon/gmon.c
deleted file mode 100644
index d18abbd..0000000
--- a/lib/libc/gmon/gmon.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*-
- * Copyright (c) 1983, 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gmon.c	8.1 (Berkeley) 6/4/93";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.20 2004/10/16 06:32:43 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/gmon.h>
-#include <sys/sysctl.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__)
-extern char *minbrk __asm (".minbrk");
-#else
-extern char *minbrk __asm ("minbrk");
-#endif
-
-struct gmonparam _gmonparam = { GMON_PROF_OFF };
-
-static int	s_scale;
-/* see profil(2) where this is describe (incorrectly) */
-#define		SCALE_1_TO_1	0x10000L
-
-#define ERR(s) _write(2, s, sizeof(s))
-
-void	moncontrol(int);
-static int hertz(void);
-
-void
-monstartup(lowpc, highpc)
-	u_long lowpc;
-	u_long highpc;
-{
-	int o;
-	char *cp;
-	struct gmonparam *p = &_gmonparam;
-
-	/*
-	 * round lowpc and highpc to multiples of the density we're using
-	 * so the rest of the scaling (here and in gprof) stays in ints.
-	 */
-	p->lowpc = ROUNDDOWN(lowpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->highpc = ROUNDUP(highpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->textsize = p->highpc - p->lowpc;
-	p->kcountsize = p->textsize / HISTFRACTION;
-	p->hashfraction = HASHFRACTION;
-	p->fromssize = p->textsize / HASHFRACTION;
-	p->tolimit = p->textsize * ARCDENSITY / 100;
-	if (p->tolimit < MINARCS)
-		p->tolimit = MINARCS;
-	else if (p->tolimit > MAXARCS)
-		p->tolimit = MAXARCS;
-	p->tossize = p->tolimit * sizeof(struct tostruct);
-
-	cp = sbrk(p->kcountsize + p->fromssize + p->tossize);
-	if (cp == (char *)-1) {
-		ERR("monstartup: out of memory\n");
-		return;
-	}
-#ifdef notdef
-	bzero(cp, p->kcountsize + p->fromssize + p->tossize);
-#endif
-	p->tos = (struct tostruct *)cp;
-	cp += p->tossize;
-	p->kcount = (u_short *)cp;
-	cp += p->kcountsize;
-	p->froms = (u_short *)cp;
-
-	minbrk = sbrk(0);
-	p->tos[0].link = 0;
-
-	o = p->highpc - p->lowpc;
-	if (p->kcountsize < o) {
-#ifndef hp300
-		s_scale = ((float)p->kcountsize / o ) * SCALE_1_TO_1;
-#else /* avoid floating point */
-		int quot = o / p->kcountsize;
-
-		if (quot >= 0x10000)
-			s_scale = 1;
-		else if (quot >= 0x100)
-			s_scale = 0x10000 / quot;
-		else if (o >= 0x800000)
-			s_scale = 0x1000000 / (o / (p->kcountsize >> 8));
-		else
-			s_scale = 0x1000000 / ((o << 8) / p->kcountsize);
-#endif
-	} else
-		s_scale = SCALE_1_TO_1;
-
-	moncontrol(1);
-}
-
-void
-_mcleanup()
-{
-	int fd;
-	int fromindex;
-	int endfrom;
-	u_long frompc;
-	int toindex;
-	struct rawarc rawarc;
-	struct gmonparam *p = &_gmonparam;
-	struct gmonhdr gmonhdr, *hdr;
-	struct clockinfo clockinfo;
-	char outname[128];
-	int mib[2];
-	size_t size;
-#ifdef DEBUG
-	int log, len;
-	char buf[200];
-#endif
-
-	if (p->state == GMON_PROF_ERROR)
-		ERR("_mcleanup: tos overflow\n");
-
-	size = sizeof(clockinfo);
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_CLOCKRATE;
-	if (sysctl(mib, 2, &clockinfo, &size, NULL, 0) < 0) {
-		/*
-		 * Best guess
-		 */
-		clockinfo.profhz = hertz();
-	} else if (clockinfo.profhz == 0) {
-		if (clockinfo.hz != 0)
-			clockinfo.profhz = clockinfo.hz;
-		else
-			clockinfo.profhz = hertz();
-	}
-
-	moncontrol(0);
-	snprintf(outname, sizeof(outname), "%s.gmon", _getprogname());
-	fd = _open(outname, O_CREAT|O_TRUNC|O_WRONLY, 0666);
-	if (fd < 0) {
-		_warn("_mcleanup: %s", outname);
-		return;
-	}
-#ifdef DEBUG
-	log = _open("gmon.log", O_CREAT|O_TRUNC|O_WRONLY, 0664);
-	if (log < 0) {
-		_warn("_mcleanup: gmon.log");
-		return;
-	}
-	len = sprintf(buf, "[mcleanup1] kcount 0x%p ssiz %lu\n",
-	    p->kcount, p->kcountsize);
-	_write(log, buf, len);
-#endif
-	hdr = (struct gmonhdr *)&gmonhdr;
-	bzero(hdr, sizeof(*hdr));
-	hdr->lpc = p->lowpc;
-	hdr->hpc = p->highpc;
-	hdr->ncnt = p->kcountsize + sizeof(gmonhdr);
-	hdr->version = GMONVERSION;
-	hdr->profrate = clockinfo.profhz;
-	_write(fd, (char *)hdr, sizeof *hdr);
-	_write(fd, p->kcount, p->kcountsize);
-	endfrom = p->fromssize / sizeof(*p->froms);
-	for (fromindex = 0; fromindex < endfrom; fromindex++) {
-		if (p->froms[fromindex] == 0)
-			continue;
-
-		frompc = p->lowpc;
-		frompc += fromindex * p->hashfraction * sizeof(*p->froms);
-		for (toindex = p->froms[fromindex]; toindex != 0;
-		     toindex = p->tos[toindex].link) {
-#ifdef DEBUG
-			len = sprintf(buf,
-			"[mcleanup2] frompc 0x%lx selfpc 0x%lx count %lu\n" ,
-				frompc, p->tos[toindex].selfpc,
-				p->tos[toindex].count);
-			_write(log, buf, len);
-#endif
-			rawarc.raw_frompc = frompc;
-			rawarc.raw_selfpc = p->tos[toindex].selfpc;
-			rawarc.raw_count = p->tos[toindex].count;
-			_write(fd, &rawarc, sizeof rawarc);
-		}
-	}
-	_close(fd);
-}
-
-/*
- * Control profiling
- *	profiling is what mcount checks to see if
- *	all the data structures are ready.
- */
-void
-moncontrol(mode)
-	int mode;
-{
-	struct gmonparam *p = &_gmonparam;
-
-	if (mode) {
-		/* start */
-		profil((char *)p->kcount, p->kcountsize, p->lowpc, s_scale);
-		p->state = GMON_PROF_ON;
-	} else {
-		/* stop */
-		profil((char *)0, 0, 0, 0);
-		p->state = GMON_PROF_OFF;
-	}
-}
-
-/*
- * discover the tick frequency of the machine
- * if something goes wrong, we return 0, an impossible hertz.
- */
-static int
-hertz()
-{
-	struct itimerval tim;
-
-	tim.it_interval.tv_sec = 0;
-	tim.it_interval.tv_usec = 1;
-	tim.it_value.tv_sec = 0;
-	tim.it_value.tv_usec = 0;
-	setitimer(ITIMER_REAL, &tim, 0);
-	setitimer(ITIMER_REAL, 0, &tim);
-	if (tim.it_interval.tv_usec < 2)
-		return(0);
-	return (1000000 / tim.it_interval.tv_usec);
-}
diff --git a/lib/libc/gmon/mcount.c b/lib/libc/gmon/mcount.c
deleted file mode 100644
index fd26a77..0000000
--- a/lib/libc/gmon/mcount.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*-
- * Copyright (c) 1983, 1992, 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.
- */
-
-#if !defined(_KERNEL) && defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gmon/mcount.c,v 1.21 2005/05/06 07:37:01 davidxu Exp $");
-
-#include <sys/param.h>
-#include <sys/gmon.h>
-#ifdef _KERNEL
-#include <sys/systm.h>
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-void	bintr(void);
-void	btrap(void);
-void	eintr(void);
-void	user(void);
-#endif
-#include <machine/atomic.h>
-
-/*
- * mcount is called on entry to each function compiled with the profiling
- * switch set.  _mcount(), which is declared in a machine-dependent way
- * with _MCOUNT_DECL, does the actual work and is either inlined into a
- * C routine or called by an assembly stub.  In any case, this magic is
- * taken care of by the MCOUNT definition in <machine/profile.h>.
- *
- * _mcount updates data structures that represent traversals of the
- * program's call graph edges.  frompc and selfpc are the return
- * address and function address that represents the given call graph edge.
- *
- * Note: the original BSD code used the same variable (frompcindex) for
- * both frompcindex and frompc.  Any reasonable, modern compiler will
- * perform this optimization.
- */
-/* _mcount; may be static, inline, etc */
-_MCOUNT_DECL(uintfptr_t frompc, uintfptr_t selfpc)
-{
-#ifdef GUPROF
-	u_int delta;
-#endif
-	fptrdiff_t frompci;
-	u_short *frompcindex;
-	struct tostruct *top, *prevtop;
-	struct gmonparam *p;
-	long toindex;
-#ifdef _KERNEL
-	MCOUNT_DECL(s)
-#endif
-
-	p = &_gmonparam;
-#ifndef GUPROF			/* XXX */
-	/*
-	 * check that we are profiling
-	 * and that we aren't recursively invoked.
-	 */
-	if (p->state != GMON_PROF_ON)
-		return;
-#endif
-#ifdef _KERNEL
-	MCOUNT_ENTER(s);
-#else
-	if (!atomic_cmpset_acq_int(&p->state, GMON_PROF_ON, GMON_PROF_BUSY))
-		return;
-#endif
-	frompci = frompc - p->lowpc;
-
-#ifdef _KERNEL
-	/*
-	 * When we are called from an exception handler, frompci may be
-	 * for a user address.  Convert such frompci's to the index of
-	 * user() to merge all user counts.
-	 */
-	if (frompci >= p->textsize) {
-		if (frompci + p->lowpc
-		    >= (uintfptr_t)(VM_MAXUSER_ADDRESS + UPAGES * PAGE_SIZE))
-			goto done;
-		frompci = (uintfptr_t)user - p->lowpc;
-		if (frompci >= p->textsize)
-		    goto done;
-	}
-#endif
-
-#ifdef GUPROF
-	if (p->state != GMON_PROF_HIRES)
-		goto skip_guprof_stuff;
-	/*
-	 * Look at the clock and add the count of clock cycles since the
-	 * clock was last looked at to a counter for frompc.  This
-	 * solidifies the count for the function containing frompc and
-	 * effectively starts another clock for the current function.
-	 * The count for the new clock will be solidified when another
-	 * function call is made or the function returns.
-	 *
-	 * We use the usual sampling counters since they can be located
-	 * efficiently.  4-byte counters are usually necessary.
-	 *
-	 * There are many complications for subtracting the profiling
-	 * overheads from the counts for normal functions and adding
-	 * them to the counts for mcount(), mexitcount() and cputime().
-	 * We attempt to handle fractional cycles, but the overheads
-	 * are usually underestimated because they are calibrated for
-	 * a simpler than usual setup.
-	 */
-	delta = cputime() - p->mcount_overhead;
-	p->cputime_overhead_resid += p->cputime_overhead_frac;
-	p->mcount_overhead_resid += p->mcount_overhead_frac;
-	if ((int)delta < 0)
-		*p->mcount_count += delta + p->mcount_overhead
-				    - p->cputime_overhead;
-	else if (delta != 0) {
-		if (p->cputime_overhead_resid >= CALIB_SCALE) {
-			p->cputime_overhead_resid -= CALIB_SCALE;
-			++*p->cputime_count;
-			--delta;
-		}
-		if (delta != 0) {
-			if (p->mcount_overhead_resid >= CALIB_SCALE) {
-				p->mcount_overhead_resid -= CALIB_SCALE;
-				++*p->mcount_count;
-				--delta;
-			}
-			KCOUNT(p, frompci) += delta;
-		}
-		*p->mcount_count += p->mcount_overhead_sub;
-	}
-	*p->cputime_count += p->cputime_overhead;
-skip_guprof_stuff:
-#endif /* GUPROF */
-
-#ifdef _KERNEL
-	/*
-	 * When we are called from an exception handler, frompc is faked
-	 * to be for where the exception occurred.  We've just solidified
-	 * the count for there.  Now convert frompci to the index of btrap()
-	 * for trap handlers and bintr() for interrupt handlers to make
-	 * exceptions appear in the call graph as calls from btrap() and
-	 * bintr() instead of calls from all over.
-	 */
-	if ((uintfptr_t)selfpc >= (uintfptr_t)btrap
-	    && (uintfptr_t)selfpc < (uintfptr_t)eintr) {
-		if ((uintfptr_t)selfpc >= (uintfptr_t)bintr)
-			frompci = (uintfptr_t)bintr - p->lowpc;
-		else
-			frompci = (uintfptr_t)btrap - p->lowpc;
-	}
-#endif
-
-	/*
-	 * check that frompc is a reasonable pc value.
-	 * for example:	signal catchers get called from the stack,
-	 *		not from text space.  too bad.
-	 */
-	if (frompci >= p->textsize)
-		goto done;
-
-	frompcindex = &p->froms[frompci / (p->hashfraction * sizeof(*p->froms))];
-	toindex = *frompcindex;
-	if (toindex == 0) {
-		/*
-		 *	first time traversing this arc
-		 */
-		toindex = ++p->tos[0].link;
-		if (toindex >= p->tolimit)
-			/* halt further profiling */
-			goto overflow;
-
-		*frompcindex = toindex;
-		top = &p->tos[toindex];
-		top->selfpc = selfpc;
-		top->count = 1;
-		top->link = 0;
-		goto done;
-	}
-	top = &p->tos[toindex];
-	if (top->selfpc == selfpc) {
-		/*
-		 * arc at front of chain; usual case.
-		 */
-		top->count++;
-		goto done;
-	}
-	/*
-	 * have to go looking down chain for it.
-	 * top points to what we are looking at,
-	 * prevtop points to previous top.
-	 * we know it is not at the head of the chain.
-	 */
-	for (; /* goto done */; ) {
-		if (top->link == 0) {
-			/*
-			 * top is end of the chain and none of the chain
-			 * had top->selfpc == selfpc.
-			 * so we allocate a new tostruct
-			 * and link it to the head of the chain.
-			 */
-			toindex = ++p->tos[0].link;
-			if (toindex >= p->tolimit)
-				goto overflow;
-
-			top = &p->tos[toindex];
-			top->selfpc = selfpc;
-			top->count = 1;
-			top->link = *frompcindex;
-			*frompcindex = toindex;
-			goto done;
-		}
-		/*
-		 * otherwise, check the next arc on the chain.
-		 */
-		prevtop = top;
-		top = &p->tos[top->link];
-		if (top->selfpc == selfpc) {
-			/*
-			 * there it is.
-			 * increment its count
-			 * move it to the head of the chain.
-			 */
-			top->count++;
-			toindex = prevtop->link;
-			prevtop->link = top->link;
-			top->link = *frompcindex;
-			*frompcindex = toindex;
-			goto done;
-		}
-
-	}
-done:
-#ifdef _KERNEL
-	MCOUNT_EXIT(s);
-#else
-	atomic_store_rel_int(&p->state, GMON_PROF_ON);
-#endif
-	return;
-overflow:
-	atomic_store_rel_int(&p->state, GMON_PROF_ERROR);
-#ifdef _KERNEL
-	MCOUNT_EXIT(s);
-#endif
-	return;
-}
-
-/*
- * Actual definition of mcount function.  Defined in <machine/profile.h>,
- * which is included by <sys/gmon.h>.
- */
-MCOUNT
-
-#ifdef GUPROF
-void
-mexitcount(selfpc)
-	uintfptr_t selfpc;
-{
-	struct gmonparam *p;
-	uintfptr_t selfpcdiff;
-
-	p = &_gmonparam;
-	selfpcdiff = selfpc - (uintfptr_t)p->lowpc;
-	if (selfpcdiff < p->textsize) {
-		u_int delta;
-
-		/*
-		 * Solidify the count for the current function.
-		 */
-		delta = cputime() - p->mexitcount_overhead;
-		p->cputime_overhead_resid += p->cputime_overhead_frac;
-		p->mexitcount_overhead_resid += p->mexitcount_overhead_frac;
-		if ((int)delta < 0)
-			*p->mexitcount_count += delta + p->mexitcount_overhead
-						- p->cputime_overhead;
-		else if (delta != 0) {
-			if (p->cputime_overhead_resid >= CALIB_SCALE) {
-				p->cputime_overhead_resid -= CALIB_SCALE;
-				++*p->cputime_count;
-				--delta;
-			}
-			if (delta != 0) {
-				if (p->mexitcount_overhead_resid
-				    >= CALIB_SCALE) {
-					p->mexitcount_overhead_resid
-					    -= CALIB_SCALE;
-					++*p->mexitcount_count;
-					--delta;
-				}
-				KCOUNT(p, selfpcdiff) += delta;
-			}
-			*p->mexitcount_count += p->mexitcount_overhead_sub;
-		}
-		*p->cputime_count += p->cputime_overhead;
-	}
-}
-#endif /* GUPROF */
diff --git a/lib/libc/i386/Makefile b/lib/libc/i386/Makefile
deleted file mode 100755
index 98810a2..0000000
--- a/lib/libc/i386/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-all: 
-	(cd gen;make)
-	(cd net;make)
-	(cd stdlib;make)
-	(cd string;make)
-	(cd sys;make)
-	(cd syscalls;make)
-
-# Clean up the junk
-clean:
-	(cd gen;make clean)
-	(cd net;make clean)
-	(cd stdlib;make clean)
-	(cd string;make clean)
-	(cd sys;make clean)
-	(cd syscalls;make clean)
-
diff --git a/lib/libc/i386/Makefile.incl b/lib/libc/i386/Makefile.incl
deleted file mode 100755
index eeb7ba5..0000000
--- a/lib/libc/i386/Makefile.incl
+++ /dev/null
@@ -1,2 +0,0 @@
-INCLUDES = -I../../include -I../../../../include.new
-CFLAGS += -DPORTMAP -D__DBINTERFACE_PRIVATE -nostdinc #-DPIC
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
deleted file mode 100644
index 50589f8..0000000
--- a/lib/libc/i386/SYS.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- *
- *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD: src/lib/libc/i386/SYS.h,v 1.24 2002/09/17 01:48:51 peter Exp $
- */
-
-#include <sys/syscall.h>
-#include <machine/asm.h>
-
-#define	SYSCALL(x)	2: PIC_PROLOGUE; jmp PIC_PLT(HIDENAME(cerror));	\
-			ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(x);					\
-			.set CNAME(x),CNAME(__CONCAT(__sys_,x));	\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL; jb 2b
-
-#define	RSYSCALL(x)	SYSCALL(x); ret
-
-#define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL; ret
-
-/* gas messes up offset -- although we don't currently need it, do for BCS */
-#define	LCALL(x,y)	.byte 0x9a ; .long y; .word x
-
-#define KERNCALL	int $0x81
diff --git a/lib/libc/i386/_fpmath.h b/lib/libc/i386/_fpmath.h
deleted file mode 100644
index 92719d9..0000000
--- a/lib/libc/i386/_fpmath.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 David Schultz <das@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.
- *
- * 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/lib/libc/i386/_fpmath.h,v 1.5 2005/03/07 04:55:22 das Exp $
- */
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-		unsigned int	manl	:32;
-		unsigned int	manh	:32;
-		unsigned int	exp	:15;
-		unsigned int	sign	:1;
-		unsigned int	junk	:16;
-	} bits;
-};
-
-#define	LDBL_NBIT	0x80000000
-#define	mask_nbit_l(u)	((u).bits.manh &= ~LDBL_NBIT)
-
-#define	LDBL_MANH_SIZE	32
-#define	LDBL_MANL_SIZE	32
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)(u).bits.manh;		\
-} while(0)
diff --git a/lib/libc/i386/arith.h b/lib/libc/i386/arith.h
deleted file mode 100644
index c55a4df..0000000
--- a/lib/libc/i386/arith.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD: src/lib/libc/i386/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-
-#define IEEE_8087
-#define Arith_Kind_ASL 1
diff --git a/lib/libc/i386/gen/Makefile b/lib/libc/i386/gen/Makefile
deleted file mode 100644
index 7b84a9b..0000000
--- a/lib/libc/i386/gen/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../
-
-#Objects
-OBJS = _ctx_start.o _set_tp.o _setjmp.o alloca.o fabs.o flt_rounds.o infinity.o ldexp.o makecontext.o modf.o rfork_thread.o setjmp.o signalcontext.o sigsetjmp.o
-#Output
-OUTPUT = libc.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
-
diff --git a/lib/libc/i386/gen/_ctx_start.S b/lib/libc/i386/gen/_ctx_start.S
deleted file mode 100644
index 39ec6d8..0000000
--- a/lib/libc/i386/gen/_ctx_start.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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. Neither the name of the author 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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_ctx_start.S,v 1.3.8.1 2006/07/05 12:43:13 kib Exp $");
-
-/*
- * _ctx_start((void *func)(int arg1, ..., argn),
- *            int arg1, ..., argn, ucontext_t *ucp)
- *
- * 0(%esp)		- func
- * 4(%esp)		- arg1
- * 8(%esp)		- arg2
- * ...
- * (4*n)(%esp)		- argn
- * (4*(n + 1))(%esp)	- ucp, %ebp setup to point here (base of stack)
- */
-ENTRY(_ctx_start)
-	popl	%eax		/* get start function */
-	call	*%eax		/* call start function */
-	PIC_PROLOGUE
-	movl	%esi, %esp	/*
-				 * setup stack for completion routine;
-				 * ucp is now at top of stack
-				 */
-	call	PIC_PLT(_ctx_done)	/* should never return */
-	call	PIC_PLT(abort)		/* fubar */
-	ret
diff --git a/lib/libc/i386/gen/_set_tp.c b/lib/libc/i386/gen/_set_tp.c
deleted file mode 100644
index 9a83fda..0000000
--- a/lib/libc/i386/gen/_set_tp.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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/lib/libc/i386/gen/_set_tp.c,v 1.6 2005/06/29 23:15:35 peter Exp $
- */
-
-#include <string.h>
-#include <stdint.h>
-#include <machine/sysarch.h>
-
-void
-_set_tp(void *tp)
-{
-
-	i386_set_gsbase(tp);
-}
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
deleted file mode 100644
index c2fa562..0000000
--- a/lib/libc/i386/gen/_setjmp.S
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/_setjmp.S,v 1.16 2002/03/23 02:05:17 obrien Exp $");
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	_setjmp(a)
- * by restoring registers from the environment 'a'.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	movl	4(%esp),%eax
-	movl	0(%esp),%edx
-	movl	%edx, 0(%eax)		/* rta */
-	movl	%ebx, 4(%eax)
-	movl	%esp, 8(%eax)
-	movl	%ebp,12(%eax)
-	movl	%esi,16(%eax)
-	movl	%edi,20(%eax)
-	fnstcw	24(%eax)
-	xorl	%eax,%eax
-	ret
-
-	.weak	CNAME(_longjmp)
-	.set	CNAME(_longjmp),CNAME(___longjmp)
-ENTRY(___longjmp)
-	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	fninit
-	fldcw	24(%edx)
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret
diff --git a/lib/libc/i386/gen/alloca.S b/lib/libc/i386/gen/alloca.S
deleted file mode 100644
index dbf6fb8..0000000
--- a/lib/libc/i386/gen/alloca.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if !defined(__GNUC__) && !defined(__INTEL_COMPILER)
-#error Please add alloca support for this compiler on FreeBSD.
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)alloca.s	5.2 (Berkeley) 5/14/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/alloca.S,v 1.12 2003/06/25 19:06:40 obrien Exp $");
-
-
-/* like alloc, but automatic automatic free in return */
-
-ENTRY(alloca)
-	popl	%edx		/*  pop return addr */
-	popl	%eax		/*  pop amount to allocate */
-	movl	%esp,%ecx
-	addl	$3,%eax		/*  round up to next word */
-	andl	$0xfffffffc,%eax
-	subl	%eax,%esp
-	movl	%esp,%eax	/* base of newly allocated space */
-	pushl	8(%ecx)		/* copy possible saved registers */
-	pushl	4(%ecx)
-	pushl	0(%ecx)
-	pushl	%eax		/* dummy to pop at callsite */
-	jmp	*%edx		/* "return" */
-#endif	/*!__GNUC__*/
diff --git a/lib/libc/i386/gen/fabs.S b/lib/libc/i386/gen/fabs.S
deleted file mode 100644
index 4350f18..0000000
--- a/lib/libc/i386/gen/fabs.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)fabs.s	5.2 (Berkeley) 12/17/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/fabs.S,v 1.9 2002/03/23 02:44:18 obrien Exp $");
-
-ENTRY(fabs)
-	fldl	4(%esp)
-	fabs
-	ret
diff --git a/lib/libc/i386/gen/flt_rounds.c b/lib/libc/i386/gen/flt_rounds.c
deleted file mode 100644
index 2856636..0000000
--- a/lib/libc/i386/gen/flt_rounds.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/flt_rounds.c,v 1.1 2004/07/19 08:17:24 das Exp $");
-
-#include <float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	3,	/* round to zero */
-	2,	/* round to negative infinity */
-	0	/* round to positive infinity */
-};
-
-int
-__flt_rounds(void)
-{
-	int x;
-
-	__asm("fnstcw %0" : "=m" (x));
-        return (map[(x >> 10) & 0x03]);
-}
diff --git a/lib/libc/i386/gen/infinity.c b/lib/libc/i386/gen/infinity.c
deleted file mode 100644
index dd54481..0000000
--- a/lib/libc/i386/gen/infinity.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * infinity.c
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/infinity.c,v 1.10 2003/02/08 20:37:52 mike Exp $");
-
-#include <math.h>
-
-/* bytes for +Infinity on a 387 */
-const union __infinity_un __infinity = { { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f } };
-
-/* bytes for NaN */
-const union __nan_un __nan = { { 0, 0, 0xc0, 0xff } };
diff --git a/lib/libc/i386/gen/ldexp.c b/lib/libc/i386/gen/ldexp.c
deleted file mode 100644
index 596c8dc..0000000
--- a/lib/libc/i386/gen/ldexp.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Sean Eric Fagan.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ldexp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/ldexp.c,v 1.11 2004/02/16 10:03:02 das Exp $");
-
-/*
- * ldexp(value, exp): return value * (2 ** exp).
- *
- * Written by Sean Eric Fagan (sef@kithrup.COM)
- * Sun Mar 11 20:27:09 PST 1990
- */
-
-/*
- * We do the conversion in C to let gcc optimize it away, if possible.
- */
-double
-ldexp (double value, int exp)
-{
-	double temp, texp, temp2;
-	texp = exp;
-#ifdef __GNUC__
-	__asm ("fscale "
-		: "=u" (temp2), "=t" (temp)
-		: "0" (texp), "1" (value));
-#else
-#error unknown asm
-#endif
-	return (temp);
-}
diff --git a/lib/libc/i386/gen/makecontext.c b/lib/libc/i386/gen/makecontext.c
deleted file mode 100644
index 27e7f73..0000000
--- a/lib/libc/i386/gen/makecontext.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel M. Eischen <deischen@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. Neither the name of the author 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/makecontext.c,v 1.5 2004/12/05 21:22:08 deischen Exp $");
-
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/ucontext.h>
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Prototypes */
-extern void _ctx_start(ucontext_t *, int argc, ...);
-
-
-__weak_reference(__makecontext, makecontext);
-
-void
-_ctx_done (ucontext_t *ucp)
-{
-	if (ucp->uc_link == NULL)
-		exit(0);
-	else {
-		/*
-		 * Since this context has finished, don't allow it
-		 * to be restarted without being reinitialized (via
-		 * setcontext or swapcontext).
-		 */
-		ucp->uc_mcontext.mc_len = 0;
-
-		/* Set context to next one in link */
-		/* XXX - what to do for error, abort? */
-		setcontext((const ucontext_t *)ucp->uc_link);
-		abort();	/* should never get here */
-	}
-}
-
-void
-__makecontext(ucontext_t *ucp, void (*start)(void), int argc, ...)
-{
-	va_list		ap;
-	char		*stack_top;
-	intptr_t	*argp;
-	int		i;
-
-	if (ucp == NULL)
-		return;
-	else if ((ucp->uc_stack.ss_sp == NULL) ||
-	    (ucp->uc_stack.ss_size < MINSIGSTKSZ)) {
-		/*
-		 * This should really return -1 with errno set to ENOMEM
-		 * or something, but the spec says that makecontext is
-		 * a void function.   At least make sure that the context
-		 * isn't valid so it can't be used without an error.
-		 */
-		ucp->uc_mcontext.mc_len = 0;
-	}
-	/* XXX - Do we want to sanity check argc? */
-	else if ((argc < 0) || (argc > NCARGS)) {
-		ucp->uc_mcontext.mc_len = 0;
-	}
-	/* Make sure the context is valid. */
-	else if (ucp->uc_mcontext.mc_len == sizeof(mcontext_t)) {
-		/*
-		 * Arrange the stack as follows:
-		 *
-		 *	_ctx_start()	- context start wrapper
-		 *	start()		- user start routine
-		 * 	arg1            - first argument, aligned(16)
-		 *	...
-		 *	argn
-		 *	ucp		- this context, %ebp points here
-		 *
-		 * When the context is started, control will return to
-		 * the context start wrapper which will pop the user
-		 * start routine from the top of the stack.  After that,
-		 * the top of the stack will be setup with all arguments
-		 * necessary for calling the start routine.  When the
-		 * start routine returns, the context wrapper then sets
-		 * the stack pointer to %ebp which was setup to point to
-		 * the base of the stack (and where ucp is stored).  It
-		 * will then call _ctx_done() to swap in the next context
-		 * (uc_link != 0) or exit the program (uc_link == 0).
-		 */
-		stack_top = (char *)(ucp->uc_stack.ss_sp +
-		    ucp->uc_stack.ss_size - sizeof(intptr_t));
-
-		/*
-		 * Adjust top of stack to allow for 3 pointers (return
-		 * address, _ctx_start, and ucp) and argc arguments.
-		 * We allow the arguments to be pointers also.  The first
-		 * argument to the user function must be properly aligned.
-		 */
-		stack_top = stack_top - (sizeof(intptr_t) * (1 + argc));
-		stack_top = (char *)((unsigned)stack_top & ~15);
-		stack_top = stack_top - (2 * sizeof(intptr_t));
-		argp = (intptr_t *)stack_top;
-
-		/*
-		 * Setup the top of the stack with the user start routine
-		 * followed by all of its aguments and the pointer to the
-		 * ucontext.  We need to leave a spare spot at the top of
-		 * the stack because setcontext will move eip to the top
-		 * of the stack before returning.
-		 */
-		*argp = (intptr_t)_ctx_start;  /* overwritten with same value */
-		argp++;
-		*argp = (intptr_t)start;
-		argp++;
-
-		/* Add all the arguments: */
-		va_start(ap, argc);
-		for (i = 0; i < argc; i++) {
-			*argp = va_arg(ap, intptr_t);
-			argp++;
-		}
-		va_end(ap);
-
-		/* The ucontext is placed at the bottom of the stack. */
-		*argp = (intptr_t)ucp;
-
-		/*
-		 * Set the machine context to point to the top of the
-		 * stack and the program counter to the context start
-		 * wrapper.  Note that setcontext() pushes the return
-		 * address onto the top of the stack, so allow for this
-		 * by adjusting the stack downward 1 slot.  Also set
-		 * %esi to point to the base of the stack where ucp
-		 * is stored.
-		 */
-		ucp->uc_mcontext.mc_esi = (int)argp;
-		ucp->uc_mcontext.mc_ebp = 0;
-		ucp->uc_mcontext.mc_esp = (int)stack_top + sizeof(caddr_t);
-		ucp->uc_mcontext.mc_eip = (int)_ctx_start;
-	}
-}
diff --git a/lib/libc/i386/gen/modf.S b/lib/libc/i386/gen/modf.S
deleted file mode 100644
index de7c96a..0000000
--- a/lib/libc/i386/gen/modf.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Sean Eric Fagan.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)modf.s	5.5 (Berkeley) 3/18/91"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/modf.S,v 1.9 2002/03/23 02:05:17 obrien Exp $");
-
-/*
- * modf(value, iptr): return fractional part of value, and stores the
- * integral part into iptr (a pointer to double).
- *
- * Written by Sean Eric Fagan (sef@kithrup.COM)
- * Sun Mar 11 20:27:30 PST 1990
- */
-
-/* With CHOP mode on, frndint behaves as TRUNC does.  Useful. */
-
-ENTRY(modf)
-	pushl %ebp
-	movl %esp,%ebp
-	subl $16,%esp
-	fnstcw -12(%ebp)
-	movw -12(%ebp),%dx
-	orw $3072,%dx
-	movw %dx,-16(%ebp)
-	fldcw -16(%ebp)
-	fldl 8(%ebp)
-	frndint
-	fstpl -8(%ebp)
-	fldcw -12(%ebp)
-	movl 16(%ebp),%eax
-	movl -8(%ebp),%edx
-	movl -4(%ebp),%ecx
-	movl %edx,(%eax)
-	movl %ecx,4(%eax)
-	fldl 8(%ebp)
-	fsubl -8(%ebp)
-	jmp L1
-L1:
-	leave
-	ret
diff --git a/lib/libc/i386/gen/rfork_thread.S b/lib/libc/i386/gen/rfork_thread.S
deleted file mode 100644
index 04ad549..0000000
--- a/lib/libc/i386/gen/rfork_thread.S
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $");
-
-/*
- * With thanks to John Dyson for the original version of this.
- */
-
-#include <SYS.h>
-
-/*
- *                8      12          16         20
- * rfork_thread(flags, stack_addr, start_fnc, start_arg);
- *
- * flags:		Flags to rfork system call.  See rfork(2).
- * stack_addr:		Top of stack for thread.
- * start_fnc:		Address of thread function to call in child.
- * start_arg:		Argument to pass to the thread function in child.
- */
-
-ENTRY(rfork_thread)
-	pushl	%ebp
-	movl	%esp, %ebp
-	pushl	%esi
-
-	/*
-	 * Push thread info onto the new thread's stack
-	 */
-	movl	12(%ebp), %esi	# get stack addr
-
-	subl	$4, %esi
-	movl	20(%ebp), %eax	# get start argument
-	movl	%eax, (%esi)
-
-	subl	$4, %esi
-	movl	16(%ebp), %eax	# get start thread address
-	movl	%eax, (%esi)
-
-	/*
-	 * Prepare and execute the thread creation syscall
-	 */
-	pushl	8(%ebp)
-	pushl	$0
-	movl	$SYS_rfork, %eax
-	KERNCALL
-	jb 	2f
-
-	/*
-	 * Check to see if we are in the parent or child
-	 */
-	cmpl	$0, %edx
-	jnz	1f
-	addl	$8, %esp
-	popl	%esi
-	movl	%ebp, %esp
-	popl	%ebp
-	ret
-	.p2align 2
-
-	/*
-	 * If we are in the child (new thread), then
-	 * set-up the call to the internal subroutine.  If it
-	 * returns, then call __exit.
-	 */
-1:
-	movl	%esi,%esp
-	popl	%eax 
-	call	*%eax
-	addl	$4, %esp
-
-	/*
-	 * Exit system call
-	 */
-	pushl	%eax
-	pushl	$0
-#ifdef SYS_exit
-	movl	$SYS_exit, %eax
-#else
-	movl	$SYS_sys_exit, %eax
-#endif
-	KERNCALL
-
-	/*
-	 * Branch here if the thread creation fails:
-	 */
-2:
-	addl	$8, %esp
-	popl	%esi
-	movl	%ebp, %esp
-	popl	%ebp
-	PIC_PROLOGUE
-	jmp	PIC_PLT(HIDENAME(cerror))
diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
deleted file mode 100644
index 89c2b56..0000000
--- a/lib/libc/i386/gen/setjmp.S
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/setjmp.S,v 1.22 2002/03/23 02:05:17 obrien Exp $");
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	setjmp(a)
- * by restoring registers from the environment 'a'.
- * The previous signal state is restored.
- */
-
-#include "SYS.h"
-
-ENTRY(setjmp)
-	movl	4(%esp),%ecx
-	PIC_PROLOGUE
-	leal	28(%ecx), %eax
-	pushl	%eax			/* (sigset_t*)oset */
-	pushl	$0			/* (sigset_t*)set  */
-	pushl	$1			/* SIG_BLOCK       */
-	call	PIC_PLT(CNAME(_sigprocmask))
-	addl	$12,%esp
-	PIC_EPILOGUE
-	movl	4(%esp),%ecx
-	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-	fnstcw	24(%ecx)
-	xorl	%eax,%eax
-	ret
-
-	.weak CNAME(longjmp)
-	.set CNAME(longjmp),CNAME(__longjmp)
-ENTRY(__longjmp)
-	movl	4(%esp),%edx
-	PIC_PROLOGUE
-	pushl	$0			/* (sigset_t*)oset */
-	leal	28(%edx), %eax
-	pushl	%eax			/* (sigset_t*)set  */
-	pushl	$3			/* SIG_SETMASK     */
-	call	PIC_PLT(CNAME(_sigprocmask))
-	addl	$12,%esp
-	PIC_EPILOGUE
-	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	fninit
-	fldcw	24(%edx)
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret
diff --git a/lib/libc/i386/gen/signalcontext.c b/lib/libc/i386/gen/signalcontext.c
deleted file mode 100644
index 6beb809..0000000
--- a/lib/libc/i386/gen/signalcontext.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2002 Jonathan Mini <mini@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/signalcontext.c,v 1.7 2004/07/02 23:20:05 davidxu Exp $");
-
-#include <sys/param.h>
-#include <sys/ucontext.h>
-#include <machine/psl.h>
-#include <machine/sigframe.h>
-#include <signal.h>
-#include <strings.h>
-
-__weak_reference(__signalcontext, signalcontext);
-
-extern void _ctx_start(ucontext_t *, int argc, ...);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	register_t *p;
-	struct sigframe *sfp;
-
-	/*-
-	 * Set up stack.
-	 * (n = sizeof(int))
-	 * 2n+sizeof(struct sigframe)	ucp
-	 * 2n				struct sigframe
-	 * 1n				&func
-	 * 0n				&_ctx_start
-	 */
-	p = (register_t *)(void *)(intptr_t)ucp->uc_mcontext.mc_esp;
-	*--p = (register_t)(intptr_t)ucp;
-	p = (register_t *)((u_register_t)p & ~0xF);  /* Align to 16 bytes. */
-	p = (register_t *)((u_register_t)p - sizeof(struct sigframe));
-	sfp = (struct sigframe *)p;
-	bzero(sfp, sizeof(struct sigframe));
-	sfp->sf_signum = sig;
-	sfp->sf_siginfo = (register_t)(intptr_t)&sfp->sf_si;
-	sfp->sf_ucontext = (register_t)(intptr_t)&sfp->sf_uc;
-	sfp->sf_ahu.sf_action = (__siginfohandler_t *)func;
-	bcopy(ucp, &sfp->sf_uc, sizeof(ucontext_t));
-	sfp->sf_si.si_signo = sig;
-	*--p = (register_t)(intptr_t)func;
-
-	/*
-	 * Set up ucontext_t.
-	 */
-	ucp->uc_mcontext.mc_esi = ucp->uc_mcontext.mc_esp - sizeof(int);
-	ucp->uc_mcontext.mc_esp = (register_t)(intptr_t)p;
-	ucp->uc_mcontext.mc_eip = (register_t)(intptr_t)_ctx_start;
-	ucp->uc_mcontext.mc_eflags &= ~PSL_T;
-	ucp->uc_link = &sfp->sf_uc;
-	sigdelset(&ucp->uc_sigmask, sig);
-	return (0);
-}
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
deleted file mode 100644
index c5ee63b..0000000
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- *
- *	@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	.asciz "$Id: sigsetjmp.S 89 2016-01-12 00:20:40Z reddawg $"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/gen/sigsetjmp.S,v 1.24 2002/03/23 02:05:19 obrien Exp $");
-
-#include "SYS.h"
-
-/*-
- * TODO:
- *	Rename sigsetjmp to __sigsetjmp and siglongjmp to __siglongjmp,
- *	remove the other *jmp functions and define everything in terms
- *	of the renamed functions.  This requires compiler support for
- *	the renamed functions (introduced in gcc-2.5.3; previous versions
- *	only supported *jmp with 0 or 1 leading underscores).
- *
- *	Restore _all_ the registers and the signal mask atomically.  Can
- *	use sigreturn() if sigreturn() works.
- */
-
-ENTRY(sigsetjmp)
-	movl	8(%esp),%eax
-	movl	4(%esp),%ecx
-	movl	%eax,44(%ecx)
-	testl	%eax,%eax
-	jz	2f
-	PIC_PROLOGUE
-	leal	28(%ecx), %eax
-	pushl	%eax			/* (sigset_t*)oset */
-	pushl	$0			/* (sigset_t*)set  */
-	pushl	$1			/* SIG_BLOCK       */
-	call	PIC_PLT(CNAME(_sigprocmask))
-	addl	$12,%esp
-	PIC_EPILOGUE
-	movl	4(%esp),%ecx
-2:	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-	fnstcw	24(%ecx)
-	xorl	%eax,%eax
-	ret
-
-	.weak CNAME(siglongjmp);
-	.set CNAME(siglongjmp),CNAME(__siglongjmp);
-ENTRY(__siglongjmp);
-	movl	4(%esp),%edx
-	cmpl	$0,44(%edx)
-	jz	2f
-	PIC_PROLOGUE
-	pushl	$0			/* (sigset_t*)oset */
-	leal	28(%edx), %eax
-	pushl	%eax			/* (sigset_t*)set  */
-	pushl	$3			/* SIG_SETMASK     */
-	call	PIC_PLT(CNAME(_sigprocmask))
-	addl	$12,%esp
-	PIC_EPILOGUE
-	movl	4(%esp),%edx
-2:	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	fninit
-	fldcw	24(%edx)
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret
diff --git a/lib/libc/i386/net/Makefile b/lib/libc/i386/net/Makefile
deleted file mode 100644
index 0c19920..0000000
--- a/lib/libc/i386/net/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../
-
-#Objects
-OBJS = htonl.o htons.o ntohl.o ntohs.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/i386/net/htonl.S b/lib/libc/i386/net/htonl.S
deleted file mode 100644
index ceeaa91..0000000
--- a/lib/libc/i386/net/htonl.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)htonl.s	5.3 (Berkeley) 12/17/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/net/htonl.S,v 1.11 2004/11/16 21:01:31 jhb Exp $");
-
-/* netorder = htonl(hostorder) */
-
-        .weak CNAME(htonl)
-        .set CNAME(htonl),CNAME(__htonl)
-ENTRY(__htonl)
-	movl	4(%esp),%eax
-	bswap	%eax
-	ret
diff --git a/lib/libc/i386/net/htons.S b/lib/libc/i386/net/htons.S
deleted file mode 100644
index 37b92a6..0000000
--- a/lib/libc/i386/net/htons.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)htons.s	5.2 (Berkeley) 12/17/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/net/htons.S,v 1.9 2002/03/23 02:06:08 obrien Exp $");
-
-/* netorder = htons(hostorder) */
-
-        .weak CNAME(htons)
-        .set CNAME(htons),CNAME(__htons)
-ENTRY(__htons)
-	movzwl	4(%esp),%eax
-	xchgb	%al,%ah
-	ret
diff --git a/lib/libc/i386/net/ntohl.S b/lib/libc/i386/net/ntohl.S
deleted file mode 100644
index dedcbbb..0000000
--- a/lib/libc/i386/net/ntohl.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)ntohl.s	5.2 (Berkeley) 12/17/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohl.S,v 1.11 2004/11/16 21:01:31 jhb Exp $");
-
-/* hostorder = ntohl(netorder) */
-
-        .weak CNAME(ntohl)
-        .set CNAME(ntohl),CNAME(__ntohl)
-ENTRY(__ntohl)
-	movl	4(%esp),%eax
-	bswap	%eax
-	ret
diff --git a/lib/libc/i386/net/ntohs.S b/lib/libc/i386/net/ntohs.S
deleted file mode 100644
index 676b3ea..0000000
--- a/lib/libc/i386/net/ntohs.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)ntohs.s	5.2 (Berkeley) 12/17/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/net/ntohs.S,v 1.9 2002/03/23 02:06:08 obrien Exp $");
-
-/* hostorder = ntohs(netorder) */
-
-#include <machine/asm.h>
-
-        .weak CNAME(ntohs)
-        .set CNAME(ntohs),CNAME(__ntohs)
-ENTRY(__ntohs)
-	movzwl	4(%esp),%eax
-	xchgb	%al,%ah
-	ret
diff --git a/lib/libc/i386/stdlib/Makefile b/lib/libc/i386/stdlib/Makefile
deleted file mode 100644
index 6036550..0000000
--- a/lib/libc/i386/stdlib/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../
-
-#Objects
-OBJS = abs.o div.o labs.o ldiv.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/i386/stdlib/abs.S b/lib/libc/i386/stdlib/abs.S
deleted file mode 100644
index 31d7531..0000000
--- a/lib/libc/i386/stdlib/abs.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
- 	.text
-	.asciz "@(#)abs.s	5.2 (Berkeley) 12/17/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/abs.S,v 1.9 2002/03/23 02:07:11 obrien Exp $");
-
-
-ENTRY(abs)
-	movl	4(%esp),%eax
-	testl	%eax,%eax
-	jns	1f
-	negl	%eax
-1:	ret
diff --git a/lib/libc/i386/stdlib/div.S b/lib/libc/i386/stdlib/div.S
deleted file mode 100644
index 383b31f..0000000
--- a/lib/libc/i386/stdlib/div.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/div.S,v 1.10 2002/12/22 06:41:09 kan Exp $");
-
-ENTRY(div)
-        movl    4(%esp),%eax
-        movl    8(%esp),%ecx
-        cdq
-        idiv    %ecx
-        movl    %eax,4(%esp)
-        movl    %edx,8(%esp)
-        ret
diff --git a/lib/libc/i386/stdlib/labs.S b/lib/libc/i386/stdlib/labs.S
deleted file mode 100644
index 3268520..0000000
--- a/lib/libc/i386/stdlib/labs.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	.asciz "@(#)abs.s	5.2 (Berkeley) 12/17/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/labs.S,v 1.9 2002/03/23 02:07:11 obrien Exp $");
-
-
-ENTRY(labs)
-	movl	4(%esp),%eax
-	testl	%eax,%eax
-	jns	1f
-	negl	%eax
-1:	ret
diff --git a/lib/libc/i386/stdlib/ldiv.S b/lib/libc/i386/stdlib/ldiv.S
deleted file mode 100644
index 91e132a..0000000
--- a/lib/libc/i386/stdlib/ldiv.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/stdlib/ldiv.S,v 1.10 2002/12/22 06:41:09 kan Exp $");
-
-ENTRY(ldiv)
-        movl    4(%esp),%eax
-        movl    8(%esp),%ecx
-        cdq
-        idiv    %ecx
-        movl    %eax,4(%esp)
-        movl    %edx,8(%esp)
-        ret
diff --git a/lib/libc/i386/string/Makefile b/lib/libc/i386/string/Makefile
deleted file mode 100644
index f9a2878..0000000
--- a/lib/libc/i386/string/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../
-
-#Objects 
-OBJS = bcmp.o bcopy.o bzero.o ffs.o index.o memchr.o memcmp.o memcpy.o memmove.o memset.o rindex.o strcat.o strchr.o strcmp.o strcpy.o strlen.o strncmp.o strrchr.o swab.o wcschr.o wcscmp.o wcslen.o wmemchr.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/i386/string/bcmp.S b/lib/libc/i386/string/bcmp.S
deleted file mode 100644
index 5a09d7b..0000000
--- a/lib/libc/i386/string/bcmp.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcmp.S,v 1.9 2005/04/21 23:07:20 alc Exp $");
-
-/*
- * bcmp (void *b1, void *b2, size_t len)
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(bcmp)
-	pushl	%edi
-	pushl	%esi
-	movl	12(%esp),%edi
-	movl	16(%esp),%esi
-	cld				/* set compare direction forward */
-
-	movl	20(%esp),%ecx		/* compare by words */
-	shrl	$2,%ecx
-	repe
-	cmpsl
-	jne	L1
-
-	movl	20(%esp),%ecx		/* compare remainder by bytes */
-	andl	$3,%ecx
-	repe
-	cmpsb
-L1:
-	setne	%al
-	movsbl	%al,%eax
-	popl	%esi
-	popl	%edi
-	ret
diff --git a/lib/libc/i386/string/bcopy.S b/lib/libc/i386/string/bcopy.S
deleted file mode 100644
index be2f9f4..0000000
--- a/lib/libc/i386/string/bcopy.S
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from locore.s.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/bcopy.S,v 1.10 2002/10/15 09:50:07 sobomax Exp $");
-
-#if 0
-	RCSID("$NetBSD: bcopy.S,v 1.6 1996/11/12 00:50:06 jtc Exp $")
-#endif
-
-	/*
-	 * (ov)bcopy (src,dst,cnt)
-	 *  ws@tools.de     (Wolfgang Solfrank, TooLs GmbH) +49-228-985800
-	 */
-
-#ifdef MEMCOPY
-ENTRY(memcpy)
-#else
-#ifdef MEMMOVE
-ENTRY(memmove)
-#else
-ENTRY(bcopy)
-#endif
-#endif
-	pushl	%esi
-	pushl	%edi
-#if defined(MEMCOPY) || defined(MEMMOVE)
-	movl	12(%esp),%edi
-	movl	16(%esp),%esi
-	movl	%edi,%eax
-#else
-	movl	12(%esp),%esi
-	movl	16(%esp),%edi
-#endif
-	movl	20(%esp),%ecx
-	movl	%edi,%edx
-	subl	%esi,%edx
-	cmpl	%ecx,%edx	/* overlapping? */
-	jb	1f
-	cld			/* nope, copy forwards. */
-	movl	%ecx,%edx
-	shrl	$2,%ecx		/* copy by words */
-	rep
-	movsl
-	movl	%edx,%ecx
-	andl	$3,%ecx		/* any bytes left? */
-	rep
-	movsb
-	popl	%edi
-	popl	%esi
-	ret
-1:
-	addl	%ecx,%edi	/* copy backwards. */
-	addl	%ecx,%esi
-	std
-	movl	%ecx,%edx
-	andl	$3,%ecx		/* any fractional bytes? */
-	decl	%edi
-	decl	%esi
-	rep
-	movsb
-	movl	%edx,%ecx	/* copy remainder by words */
-	shrl	$2,%ecx
-	subl	$3,%esi
-	subl	$3,%edi
-	rep
-	movsl
-	popl	%edi
-	popl	%esi
-	cld
-	ret
diff --git a/lib/libc/i386/string/bzero.S b/lib/libc/i386/string/bzero.S
deleted file mode 100644
index fb84201..0000000
--- a/lib/libc/i386/string/bzero.S
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/bzero.S,v 1.9 2002/06/02 20:05:36 schweikh Exp $");
-
-/*
- * bzero (void *b, size_t len)
- *	write len zero bytes to the string b.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(bzero)
-	pushl	%edi
-	pushl	%ebx
-	movl	12(%esp),%edi
-	movl	16(%esp),%ecx
-
-	cld				/* set fill direction forward */
-	xorl	%eax,%eax		/* set fill data to 0 */
-
-	/*
-	 * if the string is too short, it's really not worth the overhead
-	 * of aligning to word boundries, etc.  So we jump to a plain 
-	 * unaligned set.
-	 */
-	cmpl	$0x0f,%ecx
-	jle	L1
-
-	movl	%edi,%edx		/* compute misalignment */
-	negl	%edx
-	andl	$3,%edx
-	movl	%ecx,%ebx
-	subl	%edx,%ebx
-
-	movl	%edx,%ecx		/* zero until word aligned */
-	rep
-	stosb
-
-	movl	%ebx,%ecx		/* zero by words */
-	shrl	$2,%ecx
-	rep
-	stosl
-
-	movl	%ebx,%ecx
-	andl	$3,%ecx			/* zero remainder by bytes */
-L1:	rep
-	stosb
-
-	popl	%ebx
-	popl	%edi
-	ret
diff --git a/lib/libc/i386/string/ffs.S b/lib/libc/i386/string/ffs.S
deleted file mode 100644
index b64411d..0000000
--- a/lib/libc/i386/string/ffs.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/ffs.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
-
-/*
- * ffs(value)
- *	finds the first bit set in value and returns the index of 
- *	that bit.  Bits are numbered starting from 1, starting at the
- *	rightmost bit.  A return value of 0 means that the argument
- *	was zero.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(ffs)
-	bsfl	4(%esp),%eax
-	jz	L1	 		/* ZF is set if all bits are 0 */
-	incl	%eax			/* bits numbered from 1, not 0 */
-	ret
-
-	.align 2
-L1:	xorl	%eax,%eax		/* clear result */
-	ret
diff --git a/lib/libc/i386/string/index.S b/lib/libc/i386/string/index.S
deleted file mode 100644
index 4bdde08..0000000
--- a/lib/libc/i386/string/index.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/index.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
-
-/*
- * index(s, c)
- *	return a pointer to the first occurance of the character c in
- *	string s, or NULL if c does not occur in the string.
- *
- * %edx - pointer iterating through string
- * %eax - pointer to first occurance of 'c'
- * %cl  - character we're comparing against
- * %bl  - character at %edx
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(index)
-	pushl	%ebx
-	movl	8(%esp),%eax
-	movb	12(%esp),%cl
-	.align 2,0x90
-L1:
-	movb	(%eax),%bl
-	cmpb	%bl,%cl			/* found char??? */
-	je 	L2
-	incl	%eax
-	testb	%bl,%bl			/* null terminator??? */
-	jne	L1
-	xorl	%eax,%eax
-L2:
-	popl	%ebx
-	ret
diff --git a/lib/libc/i386/string/memchr.S b/lib/libc/i386/string/memchr.S
deleted file mode 100644
index 5f4951a..0000000
--- a/lib/libc/i386/string/memchr.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/memchr.S,v 1.12 2002/06/02 20:05:37 schweikh Exp $");
-
-/*
- * memchr (b, c, len)
- *	locates the first occurance of c in string b.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(memchr)
-	pushl	%edi
-	movl	8(%esp),%edi		/* string address */
-	movl	12(%esp),%eax		/* set character to search for */
-	movl	16(%esp),%ecx		/* set length of search */
-	testl	%esp,%esp		/* clear Z flag, for len == 0 */
-	cld				/* set search forward */
-	repne				/* search! */
-	scasb
-	jnz	L1			/* scan failed, return null */
-	leal	-1(%edi),%eax		/* adjust result of scan */
-	popl	%edi
-	ret
-	.align 2,0x90
-L1:	xorl	%eax,%eax
-	popl	%edi
-	ret
diff --git a/lib/libc/i386/string/memcmp.S b/lib/libc/i386/string/memcmp.S
deleted file mode 100644
index 27c479c..0000000
--- a/lib/libc/i386/string/memcmp.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/memcmp.S,v 1.8 2002/03/23 02:44:19 obrien Exp $");
-
-/*
- * memcmp (void *b1, void *b2, size_t len)
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(memcmp)
-	pushl	%edi
-	pushl	%esi
-	movl	12(%esp),%edi
-	movl	16(%esp),%esi
-	cld				/* set compare direction forward */
-
-	movl	20(%esp),%ecx		/* compare by words */
-	shrl	$2,%ecx
-	repe
-	cmpsl
-	jne	L5			/* do we match so far? */
-
-	movl	20(%esp),%ecx		/* compare remainder by bytes */
-	andl	$3,%ecx
-	repe
-	cmpsb
-	jne	L6			/* do we match? */
-
-	xorl	%eax,%eax		/* we match, return zero	*/
-	popl	%esi
-	popl	%edi
-	ret
-
-L5:	movl	$4,%ecx			/* We know that one of the next	*/
-	subl	%ecx,%edi		/* four pairs of bytes do not	*/
-	subl	%ecx,%esi		/* match.			*/
-	repe
-	cmpsb
-L6:	movzbl  -1(%edi),%eax		/* Perform unsigned comparison	*/
-        movzbl  -1(%esi),%edx
-        subl    %edx,%eax
-	popl	%esi
-	popl	%edi
-	ret
diff --git a/lib/libc/i386/string/memcpy.S b/lib/libc/i386/string/memcpy.S
deleted file mode 100644
index 5102bc7..0000000
--- a/lib/libc/i386/string/memcpy.S
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/memcpy.S,v 1.2 2002/03/23 02:44:19 obrien Exp $");
-
-#define MEMCOPY
-#include "bcopy.S"
diff --git a/lib/libc/i386/string/memmove.S b/lib/libc/i386/string/memmove.S
deleted file mode 100644
index 42b5263..0000000
--- a/lib/libc/i386/string/memmove.S
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/memmove.S,v 1.7 2002/03/23 02:44:19 obrien Exp $");
-
-#define MEMMOVE
-#include "bcopy.S"
diff --git a/lib/libc/i386/string/memset.S b/lib/libc/i386/string/memset.S
deleted file mode 100644
index 27eca36..0000000
--- a/lib/libc/i386/string/memset.S
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/memset.S,v 1.8 2002/03/23 02:44:19 obrien Exp $");
-
-/*
- * memset(void *b, int c, size_t len)
- *	write len bytes of value c (converted to an unsigned char) to 
- *	the string b.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(memset)
-	pushl	%edi
-	pushl	%ebx
-	movl	12(%esp),%edi
-	movzbl	16(%esp),%eax		/* unsigned char, zero extend */
-	movl	20(%esp),%ecx
-	pushl	%edi			/* push address of buffer */
-
-	cld				/* set fill direction forward */
-
-	/*
-	 * if the string is too short, it's really not worth the overhead
-	 * of aligning to word boundries, etc.  So we jump to a plain
-	 * unaligned set.
-	 */
-	cmpl	$0x0f,%ecx
-	jle	L1
-
-	movb	%al,%ah			/* copy char to all bytes in word */
-	movl	%eax,%edx
-	sall	$16,%eax
-	orl	%edx,%eax
-
-	movl	%edi,%edx		/* compute misalignment */
-	negl	%edx
-	andl	$3,%edx
-	movl	%ecx,%ebx
-	subl	%edx,%ebx
-
-	movl	%edx,%ecx		/* set until word aligned */
-	rep
-	stosb
-
-	movl	%ebx,%ecx
-	shrl	$2,%ecx			/* set by words */
-	rep
-	stosl
-
-	movl	%ebx,%ecx		/* set remainder by bytes */
-	andl	$3,%ecx
-L1:	rep
-	stosb
-
-	popl	%eax			/* pop address of buffer */
-	popl	%ebx
-	popl	%edi
-	ret
diff --git a/lib/libc/i386/string/rindex.S b/lib/libc/i386/string/rindex.S
deleted file mode 100644
index c76cf8f..0000000
--- a/lib/libc/i386/string/rindex.S
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/rindex.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
-
-/*
- * rindex(s, c)
- *	return a pointer to the last occurance of the character c in
- *	string s, or NULL if c does not occur in the string.
- *
- * %edx - pointer iterating through string
- * %eax - pointer to last occurance of 'c'
- * %cl  - character we're comparing against
- * %bl  - character at %edx
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
- 
-ENTRY(rindex)
-	pushl	%ebx
-	movl	8(%esp),%edx
-	movb	12(%esp),%cl
-	xorl	%eax,%eax		/* init pointer to null */
-	.align 2,0x90
-L1:
-	movb	(%edx),%bl
-	cmpb	%bl,%cl
-	jne	L2
-	movl	%edx,%eax
-L2:	
-	incl	%edx
-	testb	%bl,%bl			/* null terminator??? */
-	jne	L1
-	popl	%ebx
-	ret
diff --git a/lib/libc/i386/string/strcat.S b/lib/libc/i386/string/strcat.S
deleted file mode 100644
index a175d5b..0000000
--- a/lib/libc/i386/string/strcat.S
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcat.S,v 1.10 2002/06/02 20:05:37 schweikh Exp $");
-
-/*
- * strcat(s, append)
- *	append a copy of the null-terminated string "append" to the end
- *	of the null-terminated string s, then add a terminating `\0'.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-/*
- * I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- */
-
-ENTRY(strcat)
-	pushl	%edi			/* save edi */
-	movl	8(%esp),%edi		/* dst address */
-	movl	12(%esp),%edx		/* src address */
-	pushl	%edi			/* push destination address */
-
-	cld				/* set search forward */
-	xorl	%eax,%eax		/* set search for null terminator */
-	movl	$-1,%ecx		/* set search for lots of characters */
-	repne				/* search! */
-	scasb
-
-	leal	-1(%edi),%ecx		/* correct dst address */
-
-	.align 2,0x90
-L1:	movb	(%edx),%al		/* unroll loop, but not too much */
-	movb	%al,(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	1(%edx),%al
-	movb	%al,1(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	2(%edx),%al
-	movb	%al,2(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	3(%edx),%al
-	movb	%al,3(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	4(%edx),%al
-	movb	%al,4(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	5(%edx),%al
-	movb	%al,5(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	6(%edx),%al
-	movb	%al,6(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	7(%edx),%al
-	movb	%al,7(%ecx)
-	addl	$8,%edx
-	addl	$8,%ecx
-	testb	%al,%al
-	jne	L1
-L2:	popl	%eax			/* pop destination address */
-	popl	%edi			/* restore edi */
-	ret
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
deleted file mode 100644
index 87d4fda..0000000
--- a/lib/libc/i386/string/strchr.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/strchr.S,v 1.9 2002/06/02 20:05:37 schweikh Exp $");
-
-/*
- * strchr(s, c)
- *	return a pointer to the first occurance of the character c in
- *	string s, or NULL if c does not occur in the string.
- *
- * %edx - pointer iterating through string
- * %eax - pointer to first occurance of 'c'
- * %cl  - character we're comparing against
- * %bl  - character at %edx
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(strchr)
-	pushl	%ebx
-	movl	8(%esp),%eax
-	movb	12(%esp),%cl
-	.align 2,0x90
-L1:
-	movb	(%eax),%bl
-	cmpb	%bl,%cl			/* found char??? */
-	je 	L2
-	incl	%eax
-	testb	%bl,%bl			/* null terminator??? */
-	jne	L1
-	xorl	%eax,%eax
-L2:
-	popl	%ebx
-	ret
diff --git a/lib/libc/i386/string/strcmp.S b/lib/libc/i386/string/strcmp.S
deleted file mode 100644
index 6e98893..0000000
--- a/lib/libc/i386/string/strcmp.S
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcmp.S,v 1.10 2002/06/02 20:05:37 schweikh Exp $");
-
-/*
- * strcmp(s1, s2)
- *	return an integer greater than, equal to, or less than 0, 
- *	according as string s1 is greater than, equal to, or less
- *	than the string s2.  
- *
- * %eax - pointer to s1
- * %edx - pointer to s2
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-/*
- * I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- */
-
-ENTRY(strcmp)
-	movl	0x04(%esp),%eax	
-	movl	0x08(%esp),%edx	
-	jmp	L2			/* Jump into the loop! */
-
-	.align	2,0x90
-L1:	incl	%eax
-	incl	%edx			
-L2:	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	je	L1
-	.align 2, 0x90
-L3:     movzbl  (%eax),%eax             /* unsigned comparison */
-	movzbl  (%edx),%edx
-	subl	%edx,%eax
-	ret
diff --git a/lib/libc/i386/string/strcpy.S b/lib/libc/i386/string/strcpy.S
deleted file mode 100644
index 237175a..0000000
--- a/lib/libc/i386/string/strcpy.S
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/strcpy.S,v 1.10 2002/06/02 20:05:37 schweikh Exp $");
-
-/*
- * strcpy (dst, src)
- *	copy the string src to dst.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-/*
- * I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- */
-
-ENTRY(strcpy)
-	movl	4(%esp),%ecx		/* dst address */
-	movl	8(%esp),%edx		/* src address */
-	pushl	%ecx			/* push dst address */
-
-	.align 2,0x90
-L1:	movb	(%edx),%al		/* unroll loop, but not too much */
-	movb	%al,(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	1(%edx),%al
-	movb	%al,1(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	2(%edx),%al
-	movb	%al,2(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	3(%edx),%al
-	movb	%al,3(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	4(%edx),%al
-	movb	%al,4(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	5(%edx),%al
-	movb	%al,5(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	6(%edx),%al
-	movb	%al,6(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	7(%edx),%al
-	movb	%al,7(%ecx)
-	addl	$8,%edx
-	addl	$8,%ecx
-	testb	%al,%al
-	jne	L1
-L2:	popl	%eax			/* pop dst address */
-	ret
diff --git a/lib/libc/i386/string/strlen.S b/lib/libc/i386/string/strlen.S
deleted file mode 100644
index 3f4ee5b..0000000
--- a/lib/libc/i386/string/strlen.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/strlen.S,v 1.9 2002/06/02 20:05:38 schweikh Exp $");
-
-/*
- * strlen (s)
- *	compute the length of the string s.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(strlen)
-	pushl	%edi
-	movl	8(%esp),%edi		/* string address */
-	cld				/* set search forward */
-	xorl	%eax,%eax		/* set search for null terminator */
-	movl	$-1,%ecx		/* set search for lots of characters */
-	repne				/* search! */
-	scasb
-	notl	%ecx			/* get length by taking complement */
-	leal	-1(%ecx),%eax		/* and subtracting one */
-	popl	%edi
-	ret
diff --git a/lib/libc/i386/string/strncmp.S b/lib/libc/i386/string/strncmp.S
deleted file mode 100644
index b6c1648..0000000
--- a/lib/libc/i386/string/strncmp.S
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 1993,94 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/strncmp.S,v 1.9 2002/03/23 02:44:19 obrien Exp $");
-
-/*
- * strncmp(s1, s2, n)
- *	return an integer greater than, equal to, or less than 0,
- *	according as the first n characters of string s1 is greater
- *	than, equal to, or less than the string s2.
- *
- * %eax - pointer to s1
- * %ecx - pointer to s2
- * %edx - length
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-/*
- * I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- *
- * TODO: change all the jz's back to je for consistency.
- */
-
-ENTRY(strncmp)
-	pushl	%ebx
-	movl	8(%esp),%eax
-	movl	12(%esp),%ecx
-	movl	16(%esp),%edx
-	testl	%edx,%edx
-	jmp	L2			/* Jump into the loop! */
-
-	.align 2,0x90
-L1:	incl	%eax
-	incl	%ecx
-	decl	%edx
-L2:	jz	L4			/* strings are equal */
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-/*
- * XXX it might be best to move the next 4 instructions to the end of the
- * unrolled part of the loop.  The unrolled part would then be
- *	movb n(%eax),%bl; testb %bl, %bl; je L3; cmpb n(%ecx); jne L3
- * or maybe better
- *	movb n(%eax),%bl; cmpb n(%ecx); jne L3; testb %bl,%bl; je return_0
- * for n = 0, 1, ..., 8.  The end of the loop would be
- *	L1: addl $8,%eax; addl $8,%ecx; subl $8,%edx; cmpl $8,%edx; jae Lx
- * where residual counts of 0 to 7 are handled at Lx.  However, this would
- * be slower for short strings.  Cache effects are probably not so
- * important because we are only handling a byte at a time.
- */
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	je	L1
-
-	.align 2,0x90
-L3:	movzbl	(%eax),%eax		/* unsigned comparison */
-	movzbl	(%ecx),%ecx
-	subl	%ecx,%eax
-	popl	%ebx
-	ret
-	.align 2,0x90
-L4:	xorl	%eax,%eax
-	popl	%ebx
-	ret
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
deleted file mode 100644
index 9547d25..0000000
--- a/lib/libc/i386/string/strrchr.S
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/strrchr.S,v 1.9 2002/06/02 20:05:38 schweikh Exp $");
-
-/*
- * strrchr(s, c)
- *	return a pointer to the last occurance of the character c in
- *	string s, or NULL if c does not occur in the string.
- *
- * %edx - pointer iterating through string
- * %eax - pointer to last occurance of 'c'
- * %cl  - character we're comparing against
- * %bl  - character at %edx
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(strrchr)
-	pushl	%ebx
-	movl	8(%esp),%edx
-	movb	12(%esp),%cl
-	xorl	%eax,%eax		/* init pointer to null */
-	.align 2,0x90
-L1:
-	movb	(%edx),%bl
-	cmpb	%bl,%cl
-	jne	L2
-	movl	%edx,%eax
-L2:	
-	incl	%edx
-	testb	%bl,%bl			/* null terminator??? */
-	jne	L1
-	popl	%ebx
-	ret
diff --git a/lib/libc/i386/string/swab.S b/lib/libc/i386/string/swab.S
deleted file mode 100644
index 40a48a6..0000000
--- a/lib/libc/i386/string/swab.S
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 1993,94 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/swab.S,v 1.9 2003/01/01 18:48:42 schweikh Exp $");
-
-/*
- * void
- * swab (const void *src, void *dst, size_t len)
- *	copy len bytes from src to dst, swapping adjacent bytes
- *
- * On the i486, this code is negligibly faster than the code generated
- * by gcc at about half the size.  If my i386 databook is correct, it
- * should be considerably faster than the gcc code on an i386.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(swab)
-	pushl	%esi
-	pushl	%edi
-	movl	12(%esp),%esi
-	movl	16(%esp),%edi
-	movl	20(%esp),%ecx
-
-	cld				# set direction forward
-
-	shrl	$1,%ecx
-	testl	$7,%ecx			# copy first group of 1 to 7 words
-	jz	L2			# while swaping alternate bytes.
-	.align	2,0x90
-L1:	lodsw
-	rorw	$8,%ax
-	stosw
-	decl	%ecx
-	testl	$7,%ecx
-	jnz	L1
-
-L2:	shrl	$3,%ecx			# copy remainder 8 words at a time
-	jz	L4			# while swapping alternate bytes.
-	.align	2,0x90
-L3:	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	decl	%ecx
-	jnz	L3
-
-L4:	popl	%edi
-	popl	%esi
-	ret
diff --git a/lib/libc/i386/string/wcschr.S b/lib/libc/i386/string/wcschr.S
deleted file mode 100644
index 588a68b..0000000
--- a/lib/libc/i386/string/wcschr.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/wcschr.S,v 1.1 2003/04/05 04:17:05 tjr Exp $");
-
-/*
- * wchar_t *
- * wcschr(const wchar_t *s, wchar_t c) --
- *	Return pointer to first occurrence of the character `c' in the wide
- *	character string `s', or NULL if not found.
- */
-ENTRY(wcschr)
-	movl	4(%esp),%ecx		/* String */
-	movl	8(%esp),%eax		/* Character */
-	pushl	%ebx
-.p2align 4,0x90
-L1:	movl	(%ecx),%ebx
-	cmpl	%eax,%ebx
-	je	found0
-	testl	%ebx,%ebx
-	jz	no
-	movl	4(%ecx),%ebx
-	cmpl	%eax,%ebx
-	je	found1
-	testl	%ebx,%ebx
-	jz	no
-	movl	8(%ecx),%ebx
-	cmpl	%eax,%ebx
-	je	found2
-	testl	%ebx,%ebx
-	jz	no
-	movl	12(%ecx),%ebx
-	cmpl	%eax,%ebx
-	je	found3
-	testl	%ebx,%ebx
-	jz	no
-	leal	16(%ecx),%ecx
-	jmp	L1
-.p2align 2,0x90
-found3:	leal	4(%ecx),%ecx
-.p2align 2,0x90
-found2:	leal	4(%ecx),%ecx
-.p2align 2,0x90
-found1:	leal	4(%ecx),%ecx
-.p2align 2,0x90
-found0: popl	%ebx
-	movl	%ecx,%eax
-	ret
-.p2align 2,0x90
-no:	popl	%ebx
-	xorl	%eax,%eax
-	ret
diff --git a/lib/libc/i386/string/wcscmp.S b/lib/libc/i386/string/wcscmp.S
deleted file mode 100644
index c609544..0000000
--- a/lib/libc/i386/string/wcscmp.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/wcscmp.S,v 1.1 2003/03/10 10:54:36 tjr Exp $");
-
-/*
- * int
- * wcscmp(const wchar_t *s1, const wchar_t *s2) --
- *	Return an integer greater than, equal to, or less than 0, when
- *	the string s1 is greater than, equal to, or less than the string s2.
- */
-ENTRY(wcscmp)
-	pushl	%edi
-	pushl	%esi
-	movl	12(%esp),%edi		/* s1 */
-	movl	16(%esp),%esi		/* s2 */
-.p2align 4,0x90
-top:	movl	(%edi),%eax
-	cmpl	%eax,(%esi)
-	jne	no0
-	testl	%eax,%eax
-	jz	same
-	movl	4(%edi),%eax
-	cmpl	%eax,4(%esi)
-	jne	no4
-	testl	%eax,%eax
-	jz	same
-	movl	8(%edi),%eax
-	cmpl	%eax,8(%esi)
-	jne	no8
-	testl	%eax,%eax
-	jz	same
-	movl	12(%edi),%eax
-	cmpl	%eax,12(%esi)
-	jne	no12
-	leal	16(%edi),%edi
-	leal	16(%esi),%esi
-	testl	%eax,%eax
-	jnz	top
-.p2align 2,0x90
-same:	xorl	%eax,%eax
-	popl	%esi
-	popl	%edi
-	ret
-.p2align 2,0x90
-no12:	leal	4(%esi),%esi
-.p2align 2,0x90
-no8:	leal	4(%esi),%esi
-.p2align 2,0x90
-no4:	leal	4(%esi),%esi
-.p2align 2,0x90
-no0:	subl	(%esi),%eax
-	popl	%esi
-	popl	%edi
-	ret
diff --git a/lib/libc/i386/string/wcslen.S b/lib/libc/i386/string/wcslen.S
deleted file mode 100644
index bb9c380..0000000
--- a/lib/libc/i386/string/wcslen.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/wcslen.S,v 1.1 2003/03/14 11:01:12 tjr Exp $");
-
-/*
- * size_t
- * wcslen(const wchar_t *s) --
- *	Find the length of a wide character string.
- */
-ENTRY(wcslen)
-	movl	4(%esp),%ecx		/* String */
-	pushl	%ebx
-	xorl	%ebx,%ebx
-	xorl	%eax,%eax
-.p2align 4,0x90
-L1:	cmpl	%ebx,(%ecx)
-	jz	found0
-	cmpl	%ebx,4(%ecx)
-	jz	found1
-	cmpl	%ebx,8(%ecx)
-	jz	found2
-	cmpl	%ebx,12(%ecx)
-	jz	found3
-	cmpl	%ebx,16(%ecx)
-	jz	found4
-	cmpl	%ebx,20(%ecx)
-	jz	found5
-	cmpl	%ebx,24(%ecx)
-	jz	found6
-	cmpl	%ebx,28(%ecx)
-	jz	found7
-	leal	32(%ecx),%ecx
-	addl	$8,%eax
-	jmp	L1
-found7:	incl	%eax
-found6:	incl	%eax
-found5:	incl	%eax
-found4:	incl	%eax
-found3:	incl	%eax
-found2:	incl	%eax
-found1:	incl	%eax
-found0:	popl	%ebx
-	ret
diff --git a/lib/libc/i386/string/wmemchr.S b/lib/libc/i386/string/wmemchr.S
deleted file mode 100644
index 9e0b41a..0000000
--- a/lib/libc/i386/string/wmemchr.S
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/string/wmemchr.S,v 1.2 2003/03/12 06:46:16 tjr Exp $");
-
-/*
- * wchar_t *
- * wmemchr(const wchar_t *buf, wchar_t c, size_t n) --
- *	Search the wide character array `buf', which has length `n',
- *	the character `c', return a pointer to it if found, or NULL on
- *	failure.
- */
-ENTRY(wmemchr)
-	pushl	%edi
-	pushl	%ebx
-	movl	12(%esp),%edi		/* Buffer */
-	movl	16(%esp),%eax		/* Wide character */
-	movl	20(%esp),%ecx		/* Length of buffer */
-
-	/*
-	 * Search in chunks of 8 wide characters (32 bytes).
-	 */
-	movl	%ecx,%ebx
-	shrl	$3,%ecx
-	jz	small
-.p2align 4,0x90
-bigloop:cmpl	%eax,(%edi)
-	je	found
-	cmpl	%eax,4(%edi)
-	je	found4
-	cmpl	%eax,8(%edi)
-	je	found8
-	cmpl	%eax,12(%edi)
-	je	found12
-	cmpl	%eax,16(%edi)
-	je	found16
-	cmpl	%eax,20(%edi)
-	je	found20
-	cmpl	%eax,24(%edi)
-	je	found24
-	cmpl	%eax,28(%edi)
-	je	found28
-	leal	32(%edi),%edi
-	decl	%ecx
-	jnz	bigloop
-	jmp	small
-found:	movl	%edi,%eax
-	popl	%ebx
-	popl	%edi
-	ret
-found4:	leal	4(%edi),%edi
-	jmp	found
-found8:	leal	8(%edi),%edi
-	jmp	found
-found12:leal	12(%edi),%edi
-	jmp	found
-found16:leal	16(%edi),%edi
-	jmp	found
-found20:leal	20(%edi),%edi
-	jmp	found
-found24:leal	24(%edi),%edi
-	jmp	found
-found28:leal	28(%edi),%edi
-	jmp	found
-
-	/*
-	 * Search remaining part of string.
-	 */
-small:	movl	%ebx,%ecx
-	andl	$7,%ecx
-	jz	no
-.p2align 2,0x90
-smltop:	cmpl	%eax,(%edi)
-	je	found
-	leal	4(%edi),%edi
-	decl	%ecx
-	jnz	smltop
-no:	xorl	%eax,%eax
-	popl	%ebx
-	popl	%edi
-	ret
diff --git a/lib/libc/i386/sys/Makefile b/lib/libc/i386/sys/Makefile
deleted file mode 100644
index 7ec3776..0000000
--- a/lib/libc/i386/sys/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../
-
-#Objects
-OBJS = Ovfork.o brk.o cerror.o exect.o getcontext.o i386_clr_watch.o i386_get_fsbase.o i386_get_gsbase.o i386_get_ioperm.o i386_get_ldt.o i386_set_fsbase.o i386_set_gsbase.o i386_set_ioperm.o i386_set_ldt.o i386_set_watch.o i386_vm86.o pipe.o ptrace.o reboot.o sbrk.o setlogin.o sigreturn.o syscall.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
deleted file mode 100644
index a3ce2c9..0000000
--- a/lib/libc/i386/sys/Ovfork.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)Ovfork.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/Ovfork.S,v 1.19 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-
-	.weak	_vfork
-	.set	_vfork,__sys_vfork
-	.weak	vfork
-	.set	vfork,__sys_vfork
-ENTRY(__sys_vfork)
-	popl	%ecx		/* my rta into ecx */
-	mov	$SYS_vfork,%eax
-	KERNCALL
-	jb	1f
-	jmp	*%ecx
-1:
-	pushl	%ecx
-	PIC_PROLOGUE
-	jmp     PIC_PLT(HIDENAME(cerror))
diff --git a/lib/libc/i386/sys/brk.S b/lib/libc/i386/sys/brk.S
deleted file mode 100644
index 1bc5359..0000000
--- a/lib/libc/i386/sys/brk.S
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)brk.s	5.2 (Berkeley) 12/17/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/brk.S,v 1.10 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-
-	.globl	HIDENAME(curbrk)
-	.globl	HIDENAME(minbrk)
-ENTRY(_brk)
-	jmp	ok
-
-ENTRY(brk)
-#ifdef PIC
-	movl	4(%esp),%eax
-	PIC_PROLOGUE
-	movl	PIC_GOT(HIDENAME(curbrk)),%edx	# set up GOT addressing
-	movl	PIC_GOT(HIDENAME(minbrk)),%ecx	#
-	PIC_EPILOGUE
-	cmpl	%eax,(%ecx)
-	jbe	ok
-	movl	(%ecx),%eax
-	movl	%eax,4(%esp)
-ok:
-	mov	$SYS_break,%eax
-	KERNCALL
-	jb	err
-	movl	4(%esp),%eax
-	movl	%eax,(%edx)
-	movl	$0,%eax
-	ret
-err:
-	PIC_PROLOGUE
-	jmp	PIC_PLT(HIDENAME(cerror))
-
-#else
-
-	movl	4(%esp),%eax
-	cmpl	%eax,HIDENAME(minbrk)
-	jbe	ok
-	movl	HIDENAME(minbrk),%eax
-	movl	%eax,4(%esp)
-ok:
-	mov	$SYS_break,%eax
-	KERNCALL
-	jb	err
-	movl	4(%esp),%eax
-	movl	%eax,HIDENAME(curbrk)
-	movl	$0,%eax
-	ret
-err:
-	jmp	HIDENAME(cerror)
-#endif
diff --git a/lib/libc/i386/sys/cerror.S b/lib/libc/i386/sys/cerror.S
deleted file mode 100644
index 5d7248b..0000000
--- a/lib/libc/i386/sys/cerror.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)cerror.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.12 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-
-	.globl HIDENAME(cerror)
-
-	/*
-	 * The __error() function is thread aware. For non-threaded
-	 * programs and the initial threaded in threaded programs,
-	 * it returns a pointer to the global errno variable.
-	 */
-	.globl	CNAME(__error)
-	.type	CNAME(__error),@function
-HIDENAME(cerror):
-	pushl	%eax
-#ifdef PIC
-	/* The caller must execute the PIC prologue before jumping to cerror. */
-	call	PIC_PLT(CNAME(__error))
-	popl	%ecx
-	PIC_EPILOGUE
-#else
-	call	CNAME(__error)
-	popl	%ecx
-#endif
-	movl	%ecx,(%eax)
-	movl	$-1,%eax
-	movl	$-1,%edx
-	ret
-
diff --git a/lib/libc/i386/sys/exect.S b/lib/libc/i386/sys/exect.S
deleted file mode 100644
index a7a6888..0000000
--- a/lib/libc/i386/sys/exect.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)exect.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/exect.S,v 1.9 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-#include <machine/psl.h>
-
-ENTRY(exect)
-	mov	$SYS_execve,%eax
-	pushf
-	popl	%edx
-	orl	$ PSL_T,%edx
-	pushl	%edx
-	popf
-	KERNCALL
-	PIC_PROLOGUE
-	jmp	PIC_PLT(HIDENAME(cerror))	/* exect(file, argv, env); */
diff --git a/lib/libc/i386/sys/getcontext.S b/lib/libc/i386/sys/getcontext.S
deleted file mode 100644
index 97f6a01..0000000
--- a/lib/libc/i386/sys/getcontext.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2003 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/getcontext.S,v 1.1 2003/09/04 00:20:40 peter Exp $");
-
-#include <SYS.h>
-
-/*
- * This has to be magic to handle the multiple returns.
- * Otherwise, the setcontext() syscall will return here and we'll
- * pop off the return address and go to the *setcontext* call.
- */
-	.weak	_getcontext
-	.set	_getcontext,__sys_getcontext
-	.weak	getcontext
-	.set	getcontext,__sys_getcontext
-ENTRY(__sys_getcontext)
-	movl	(%esp),%ecx	/* save getcontext return address */
-	mov	$SYS_getcontext,%eax
-	KERNCALL
-	jb	1f
-	addl	$4,%esp		/* remove stale (setcontext) return address */
-	jmp	*%ecx		/* restore return address */
-1:
-	PIC_PROLOGUE
-	jmp	PIC_PLT(HIDENAME(cerror))
diff --git a/lib/libc/i386/sys/i386_clr_watch.c b/lib/libc/i386/sys/i386_clr_watch.c
deleted file mode 100644
index 1b0e935..0000000
--- a/lib/libc/i386/sys/i386_clr_watch.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2000  Brian S. Dean <bsd@bsdhome.com>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY BRIAN S. DEAN ``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 BRIAN S. DEAN 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_clr_watch.c,v 1.3 2002/10/21 03:47:22 sam Exp $");
-
-#include <machine/reg.h>
-#include <machine/sysarch.h>
-
-int
-i386_clr_watch(int watchnum, struct dbreg * d)
-{
-
-	if (watchnum < 0 || watchnum >= 4)
-		return -1;
-
-	DBREG_DRX(d,7) = DBREG_DRX(d,7) & ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
-        DBREG_DRX(d,watchnum) = 0;
-
-	return 0;
-}
diff --git a/lib/libc/i386/sys/i386_get_fsbase.c b/lib/libc/i386/sys/i386_get_fsbase.c
deleted file mode 100644
index bc040d7..0000000
--- a/lib/libc/i386/sys/i386_get_fsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2005 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_fsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
-
-#include <machine/sysarch.h>
-
-int
-i386_get_fsbase(void **addr)
-{
-
-	return (sysarch(I386_GET_FSBASE, addr));
-}
diff --git a/lib/libc/i386/sys/i386_get_gsbase.c b/lib/libc/i386/sys/i386_get_gsbase.c
deleted file mode 100644
index aca5738..0000000
--- a/lib/libc/i386/sys/i386_get_gsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2005 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_gsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
-
-#include <machine/sysarch.h>
-
-int
-i386_get_gsbase(void **addr)
-{
-
-	return (sysarch(I386_GET_GSBASE, addr));
-}
diff --git a/lib/libc/i386/sys/i386_get_ioperm.c b/lib/libc/i386/sys/i386_get_ioperm.c
deleted file mode 100644
index fb3f48b..0000000
--- a/lib/libc/i386/sys/i386_get_ioperm.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1998 Jonathan Lemon
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_ioperm.c,v 1.8 2004/01/09 16:52:09 nectar Exp $");
-
-#include <machine/sysarch.h>
-
-int
-i386_get_ioperm(unsigned int start, unsigned int *length, int *enable)
-{
-	struct i386_ioperm_args p;
-	int error;
-
-	p.start = start;
-	p.length = *length;
-	p.enable = *enable;
-
-	error = sysarch(I386_GET_IOPERM, &p);
-
-	*length = p.length;
-	*enable = p.enable;
-
-	return (error);
-}
diff --git a/lib/libc/i386/sys/i386_get_ldt.c b/lib/libc/i386/sys/i386_get_ldt.c
deleted file mode 100644
index 51ac9ef..0000000
--- a/lib/libc/i386/sys/i386_get_ldt.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (c) 1993 John Brezak
- *  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 `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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_get_ldt.c,v 1.11 2004/01/09 16:52:09 nectar Exp $");
-
-#include <sys/cdefs.h>
-#include <machine/segments.h>
-#include <machine/sysarch.h>
-
-int
-i386_get_ldt(int start, union descriptor *descs, int num)
-{
-	struct i386_ldt_args p;
-
-	p.start = start;
-	p.descs = descs;
-	p.num   = num;
-
-	return sysarch(I386_GET_LDT, &p);
-}
diff --git a/lib/libc/i386/sys/i386_set_fsbase.c b/lib/libc/i386/sys/i386_set_fsbase.c
deleted file mode 100644
index 733a658..0000000
--- a/lib/libc/i386/sys/i386_set_fsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2005 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_fsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
-
-#include <machine/sysarch.h>
-
-int
-i386_set_fsbase(void *addr)
-{
-
-	return (sysarch(I386_SET_FSBASE, &addr));
-}
diff --git a/lib/libc/i386/sys/i386_set_gsbase.c b/lib/libc/i386/sys/i386_set_gsbase.c
deleted file mode 100644
index 4013e96..0000000
--- a/lib/libc/i386/sys/i386_set_gsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2005 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_gsbase.c,v 1.1 2005/04/14 00:01:35 peter Exp $");
-
-#include <machine/sysarch.h>
-
-int
-i386_set_gsbase(void *addr)
-{
-
-	return (sysarch(I386_SET_GSBASE, &addr));
-}
diff --git a/lib/libc/i386/sys/i386_set_ioperm.c b/lib/libc/i386/sys/i386_set_ioperm.c
deleted file mode 100644
index cb3f776..0000000
--- a/lib/libc/i386/sys/i386_set_ioperm.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 1998 Jonathan Lemon
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_ioperm.c,v 1.8 2004/01/09 16:52:09 nectar Exp $");
-
-#include <machine/sysarch.h>
-
-int
-i386_set_ioperm(unsigned int start, unsigned int length, int enable)
-{
-	struct i386_ioperm_args p;
-
-	p.start = start;
-	p.length = length;
-	p.enable = enable;
-
-	return (sysarch(I386_SET_IOPERM, &p));
-}
diff --git a/lib/libc/i386/sys/i386_set_ldt.c b/lib/libc/i386/sys/i386_set_ldt.c
deleted file mode 100644
index df65f9f..0000000
--- a/lib/libc/i386/sys/i386_set_ldt.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (c) 1993 John Brezak
- *  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 `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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_ldt.c,v 1.11 2004/01/09 16:52:09 nectar Exp $");
-
-#include <sys/cdefs.h>
-#include <machine/segments.h>
-#include <machine/sysarch.h>
-
-int
-i386_set_ldt(int start, union descriptor *descs, int num)
-{
-	struct i386_ldt_args p;
-
-	p.start = start;
-	p.descs = descs;
-	p.num   = num;
-
-	return sysarch(I386_SET_LDT, &p);
-}
diff --git a/lib/libc/i386/sys/i386_set_watch.c b/lib/libc/i386/sys/i386_set_watch.c
deleted file mode 100644
index 325aff7..0000000
--- a/lib/libc/i386/sys/i386_set_watch.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2000  Brian S. Dean <bsd@bsdhome.com>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY BRIAN S. DEAN ``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 BRIAN S. DEAN 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_watch.c,v 1.3 2002/10/21 03:47:22 sam Exp $");
-
-#include <machine/reg.h>
-#include <machine/sysarch.h>
-
-int
-i386_set_watch(int watchnum, unsigned int watchaddr, int size,
-               int access, struct dbreg * d)
-{
-	int i;
-	unsigned int mask;
-
-	if (watchnum == -1) {
-		for (i = 0, mask = 0x3; i < 4; i++, mask <<= 2)
-			if ((DBREG_DRX(d,7) & mask) == 0)
-				break;
-		if (i < 4)
-			watchnum = i;
-		else
-			return -1;
-	}
-
-	switch (access) {
-	case DBREG_DR7_EXEC:
-		size = 1; /* size must be 1 for an execution breakpoint */
-		/* fall through */
-	case DBREG_DR7_WRONLY:
-	case DBREG_DR7_RDWR:
-		break;
-	default : return -1; break;
-	}
-
-	/*
-	 * we can watch a 1, 2, or 4 byte sized location
-	 */
-	switch (size) {
-	case 1  : mask = 0x00; break;
-	case 2  : mask = 0x01 << 2; break;
-	case 4  : mask = 0x03 << 2; break;
-	default : return -1; break;
-	}
-
-	mask |= access;
-
-	/* clear the bits we are about to affect */
-	DBREG_DRX(d,7) &= ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
-
-	/* set drN register to the address, N=watchnum */
-	DBREG_DRX(d,watchnum) = watchaddr;
-
-	/* enable the watchpoint */
-	DBREG_DRX(d,7) |= (0x2 << (watchnum*2)) | (mask << (watchnum*4+16));
-
-	return watchnum;
-}
diff --git a/lib/libc/i386/sys/i386_vm86.c b/lib/libc/i386/sys/i386_vm86.c
deleted file mode 100644
index 02b3446..0000000
--- a/lib/libc/i386/sys/i386_vm86.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 1998 Jonathan Lemon
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_vm86.c,v 1.7 2004/01/09 16:52:09 nectar Exp $");
-
-#include <machine/sysarch.h>
-
-int
-i386_vm86(int fcn, void *data)
-{
-	struct i386_vm86_args p;
-
-	p.sub_op = fcn;
-	p.sub_args = (char *)data;
-
-	return (sysarch(I386_VM86, &p));
-}
diff --git a/lib/libc/i386/sys/pipe.S b/lib/libc/i386/sys/pipe.S
deleted file mode 100644
index c6042ca..0000000
--- a/lib/libc/i386/sys/pipe.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)pipe.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/pipe.S,v 1.11 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-
-SYSCALL(pipe)
-	movl	4(%esp),%ecx
-	movl	%eax,(%ecx)
-	movl	%edx,4(%ecx)
-	movl	$0,%eax
-	ret
diff --git a/lib/libc/i386/sys/ptrace.S b/lib/libc/i386/sys/ptrace.S
deleted file mode 100644
index fb35a49..0000000
--- a/lib/libc/i386/sys/ptrace.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)ptrace.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/ptrace.S,v 1.9 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-	xorl	%eax,%eax
-#ifdef PIC
-        PIC_PROLOGUE
-        movl    PIC_GOT(CNAME(errno)),%edx
-        movl    %eax,(%edx)
-        PIC_EPILOGUE
-#else
-        movl    %eax,CNAME(errno)
-#endif
-	mov	$SYS_ptrace,%eax
-	KERNCALL
-	jb	err
-	ret
-err:
-	PIC_PROLOGUE
-	jmp	PIC_PLT(HIDENAME(cerror))
diff --git a/lib/libc/i386/sys/reboot.S b/lib/libc/i386/sys/reboot.S
deleted file mode 100644
index 11bb985..0000000
--- a/lib/libc/i386/sys/reboot.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)reboot.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/reboot.S,v 1.7 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-
-SYSCALL(reboot)
-	iret
diff --git a/lib/libc/i386/sys/sbrk.S b/lib/libc/i386/sys/sbrk.S
deleted file mode 100644
index 917e187..0000000
--- a/lib/libc/i386/sys/sbrk.S
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)sbrk.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sbrk.S,v 1.11 2002/08/08 17:28:07 kan Exp $");
-
-#include "SYS.h"
-
-	.globl	CNAME(_end)
-	.globl	HIDENAME(minbrk)
-	.globl	HIDENAME(curbrk)
-
-	.data
-HIDENAME(minbrk):	.long	CNAME(_end)
-HIDENAME(curbrk):	.long	CNAME(_end)
-	.text
-
-ENTRY(sbrk)
-#ifdef PIC
-	movl	4(%esp),%ecx
-	PIC_PROLOGUE
-	movl	PIC_GOT(HIDENAME(curbrk)),%edx
-	movl	(%edx),%eax
-	PIC_EPILOGUE
-	testl	%ecx,%ecx
-	jz	back
-	addl	%eax,4(%esp)
-	mov	$SYS_break,%eax
-	KERNCALL
-	jb	err
-	PIC_PROLOGUE
-	movl	PIC_GOT(HIDENAME(curbrk)),%edx
-	movl	(%edx),%eax
-	addl	%ecx,(%edx)
-	PIC_EPILOGUE
-back:
-	ret
-err:
-	PIC_PROLOGUE
-	jmp	PIC_PLT(HIDENAME(cerror))
-
-#else /* !PIC */
-
-	movl	4(%esp),%ecx
-	movl	HIDENAME(curbrk),%eax
-	testl	%ecx,%ecx
-	jz	back
-	addl	%eax,4(%esp)
-	mov	$SYS_break,%eax
-	KERNCALL
-	jb	err
-	movl	HIDENAME(curbrk),%eax
-	addl	%ecx,HIDENAME(curbrk)
-back:
-	ret
-err:
-	jmp	HIDENAME(cerror)
-#endif /* PIC */
diff --git a/lib/libc/i386/sys/setlogin.S b/lib/libc/i386/sys/setlogin.S
deleted file mode 100644
index 9dfd39e..0000000
--- a/lib/libc/i386/sys/setlogin.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)setlogin.s	5.2 (Berkeley) 4/12/91"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/setlogin.S,v 1.9 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-
-.globl	CNAME(_logname_valid)		/* in _getlogin() */
-
-SYSCALL(setlogin)
-#ifdef PIC
-	PIC_PROLOGUE
-	pushl	%eax
-	movl	PIC_GOT(CNAME(_logname_valid)),%eax
-	movl	$0,(%eax)
-	popl	%eax
-	PIC_EPILOGUE
-#else
-	movl	$0,CNAME(_logname_valid)
-#endif
-	ret				/* setlogin(name) */
diff --git a/lib/libc/i386/sys/sigreturn.S b/lib/libc/i386/sys/sigreturn.S
deleted file mode 100644
index ff705c9..0000000
--- a/lib/libc/i386/sys/sigreturn.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/sigreturn.S,v 1.12 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-
-/*
- * NOTE: If the profiling ENTRY() code ever changes any registers, they
- * must be saved.   On FreeBSD, this is not the case.
- */
-
-RSYSCALL(sigreturn)
diff --git a/lib/libc/i386/sys/syscall.S b/lib/libc/i386/sys/syscall.S
deleted file mode 100644
index 3035e55..0000000
--- a/lib/libc/i386/sys/syscall.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)syscall.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/syscall.S,v 1.8 2002/03/23 02:10:28 obrien Exp $");
-
-#include "SYS.h"
-
-ENTRY(syscall)
-	pop	%ecx	/* rta */
-	pop	%eax	/* syscall number */
-	push	%ecx
-	KERNCALL
-	push	%ecx	/* need to push a word to keep stack frame intact
-			   upon return; the word must be the return address. */
-	jb	1f
-	ret
-1:
-	PIC_PROLOGUE
-	jmp	PIC_PLT(HIDENAME(cerror))
diff --git a/lib/libc/i386/syscalls/Makefile b/lib/libc/i386/syscalls/Makefile
deleted file mode 100644
index c8abba3..0000000
--- a/lib/libc/i386/syscalls/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../
-
-#Objects
-OBJS = __acl_aclcheck_fd.o __acl_aclcheck_file.o __acl_aclcheck_link.o __acl_delete_fd.o __acl_delete_file.o __acl_delete_link.o __acl_get_fd.o __acl_get_file.o __acl_get_link.o __acl_set_fd.o __acl_set_file.o __acl_set_link.o __getcwd.o __mac_execve.o __mac_get_fd.o __mac_get_file.o __mac_get_link.o __mac_get_pid.o __mac_get_proc.o __mac_set_fd.o __mac_set_file.o __mac_set_link.o __mac_set_proc.o __semctl.o __setugid.o __syscall.o __sysctl.o _exit.o _getlogin.o _umtx_lock.o _umtx_op.o _umtx_unlock.o accept.o access.o acct.o adjtime.o aio_cancel.o aio_error.o aio_read.o aio_return.o aio_suspend.o aio_waitcomplete.o aio_write.o audit.o auditctl.o auditon.o bind.o chdir.o chflags.o chmod.o chown.o chroot.o clock_getres.o clock_gettime.o clock_settime.o close.o connect.o dup.o dup2.o eaccess.o execve.o extattr_delete_fd.o extattr_delete_file.o extattr_delete_link.o extattr_get_fd.o extattr_get_file.o extattr_get_link.o extattr_list_fd.o extattr_list_file.o extattr_list_link.o extattr_set_fd.o extattr_set_file.o extattr_set_link.o extattrctl.o fchdir.o fchflags.o fchmod.o fchown.o fcntl.o fhopen.o fhstat.o fhstatfs.o flock.o fork.o fpathconf.o fstat.o fstatfs.o fsync.o futimes.o getaudit.o getaudit_addr.o getauid.o getdents.o getdirentries.o getdtablesize.o getegid.o geteuid.o getfh.o getfsstat.o getgid.o getgroups.o getitimer.o getpeername.o getpgid.o getpgrp.o getpid.o getppid.o getpriority.o getresgid.o getresuid.o getrlimit.o getrusage.o getsid.o getsockname.o getsockopt.o gettimeofday.o getuid.o ioctl.o issetugid.o jail.o jail_attach.o kenv.o kevent.o kill.o kldfind.o kldfirstmod.o kldload.o kldnext.o kldstat.o kldsym.o kldunload.o kldunloadf.o kqueue.o kse_create.o kse_exit.o kse_release.o kse_switchin.o kse_thr_interrupt.o kse_wakeup.o ksem_close.o ksem_destroy.o ksem_getvalue.o ksem_init.o ksem_open.o ksem_post.o ksem_timedwait.o ksem_trywait.o ksem_unlink.o ksem_wait.o ktrace.o lchflags.o lchmod.o lchown.o lgetfh.o link.o lio_listio.o listen.o lstat.o lutimes.o mac_syscall.o madvise.o mincore.o minherit.o mkdir.o mkfifo.o mknod.o mlock.o mlockall.o modfind.o modfnext.o modnext.o modstat.o mount.o mprotect.o msgctl.o msgget.o msgrcv.o msgsnd.o msgsys.o msync.o munlock.o munlockall.o munmap.o nanosleep.o netbsd_lchown.o netbsd_msync.o nfsclnt.o nfssvc.o nfstat.o nlstat.o nmount.o nstat.o ntp_adjtime.o ntp_gettime.o open.o pathconf.o poll.o preadv.o profil.o pwritev.o quotactl.o read.o readlink.o readv.o recvfrom.o recvmsg.o rename.o revoke.o rfork.o rmdir.o rtprio.o sched_get_priority_max.o sched_get_priority_min.o sched_getparam.o sched_getscheduler.o sched_rr_get_interval.o sched_setparam.o sched_setscheduler.o sched_yield.o select.o semget.o semop.o semsys.o sendfile.o sendmsg.o sendto.o setaudit.o setaudit_addr.o setauid.o setcontext.o setegid.o seteuid.o setgid.o setgroups.o setitimer.o setpgid.o setpriority.o setregid.o setresgid.o setresuid.o setreuid.o setrlimit.o setsid.o setsockopt.o settimeofday.o setuid.o shmat.o shmctl.o shmdt.o shmget.o shmsys.o shutdown.o sigaction.o sigaltstack.o sigpending.o sigprocmask.o sigsuspend.o sigtimedwait.o sigwait.o sigwaitinfo.o socket.o socketpair.o stat.o statfs.o swapcontext.o swapoff.o swapon.o symlink.o sync.o sysarch.o thr_create.o thr_exit.o thr_kill.o thr_new.o thr_self.o thr_suspend.o thr_wake.o umask.o undelete.o unlink.o unmount.o utimes.o utrace.o uuidgen.o vadvise.o wait4.o write.o writev.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/i386/syscalls/__acl_aclcheck_fd.S b/lib/libc/i386/syscalls/__acl_aclcheck_fd.S
deleted file mode 100644
index c7c6a9b..0000000
--- a/lib/libc/i386/syscalls/__acl_aclcheck_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_aclcheck_fd)
diff --git a/lib/libc/i386/syscalls/__acl_aclcheck_file.S b/lib/libc/i386/syscalls/__acl_aclcheck_file.S
deleted file mode 100644
index b86751f..0000000
--- a/lib/libc/i386/syscalls/__acl_aclcheck_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_aclcheck_file)
diff --git a/lib/libc/i386/syscalls/__acl_aclcheck_link.S b/lib/libc/i386/syscalls/__acl_aclcheck_link.S
deleted file mode 100644
index 0682a61..0000000
--- a/lib/libc/i386/syscalls/__acl_aclcheck_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_aclcheck_link)
diff --git a/lib/libc/i386/syscalls/__acl_delete_fd.S b/lib/libc/i386/syscalls/__acl_delete_fd.S
deleted file mode 100644
index bb72292..0000000
--- a/lib/libc/i386/syscalls/__acl_delete_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_delete_fd)
diff --git a/lib/libc/i386/syscalls/__acl_delete_file.S b/lib/libc/i386/syscalls/__acl_delete_file.S
deleted file mode 100644
index e98118a..0000000
--- a/lib/libc/i386/syscalls/__acl_delete_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_delete_file)
diff --git a/lib/libc/i386/syscalls/__acl_delete_link.S b/lib/libc/i386/syscalls/__acl_delete_link.S
deleted file mode 100644
index c3d7ed6..0000000
--- a/lib/libc/i386/syscalls/__acl_delete_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_delete_link)
diff --git a/lib/libc/i386/syscalls/__acl_get_fd.S b/lib/libc/i386/syscalls/__acl_get_fd.S
deleted file mode 100644
index 63185d7..0000000
--- a/lib/libc/i386/syscalls/__acl_get_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_get_fd)
diff --git a/lib/libc/i386/syscalls/__acl_get_file.S b/lib/libc/i386/syscalls/__acl_get_file.S
deleted file mode 100644
index 97b1369..0000000
--- a/lib/libc/i386/syscalls/__acl_get_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_get_file)
diff --git a/lib/libc/i386/syscalls/__acl_get_link.S b/lib/libc/i386/syscalls/__acl_get_link.S
deleted file mode 100644
index f36ebba..0000000
--- a/lib/libc/i386/syscalls/__acl_get_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_get_link)
diff --git a/lib/libc/i386/syscalls/__acl_set_fd.S b/lib/libc/i386/syscalls/__acl_set_fd.S
deleted file mode 100644
index 248e9e5..0000000
--- a/lib/libc/i386/syscalls/__acl_set_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_set_fd)
diff --git a/lib/libc/i386/syscalls/__acl_set_file.S b/lib/libc/i386/syscalls/__acl_set_file.S
deleted file mode 100644
index d93d185..0000000
--- a/lib/libc/i386/syscalls/__acl_set_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_set_file)
diff --git a/lib/libc/i386/syscalls/__acl_set_link.S b/lib/libc/i386/syscalls/__acl_set_link.S
deleted file mode 100644
index 3b58db1..0000000
--- a/lib/libc/i386/syscalls/__acl_set_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__acl_set_link)
diff --git a/lib/libc/i386/syscalls/__getcwd.S b/lib/libc/i386/syscalls/__getcwd.S
deleted file mode 100644
index 77c06a6..0000000
--- a/lib/libc/i386/syscalls/__getcwd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__getcwd)
diff --git a/lib/libc/i386/syscalls/__mac_execve.S b/lib/libc/i386/syscalls/__mac_execve.S
deleted file mode 100644
index 0b63225..0000000
--- a/lib/libc/i386/syscalls/__mac_execve.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_execve)
diff --git a/lib/libc/i386/syscalls/__mac_get_fd.S b/lib/libc/i386/syscalls/__mac_get_fd.S
deleted file mode 100644
index 699471b..0000000
--- a/lib/libc/i386/syscalls/__mac_get_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_get_fd)
diff --git a/lib/libc/i386/syscalls/__mac_get_file.S b/lib/libc/i386/syscalls/__mac_get_file.S
deleted file mode 100644
index c0a5ef1..0000000
--- a/lib/libc/i386/syscalls/__mac_get_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_get_file)
diff --git a/lib/libc/i386/syscalls/__mac_get_link.S b/lib/libc/i386/syscalls/__mac_get_link.S
deleted file mode 100644
index 47447a3..0000000
--- a/lib/libc/i386/syscalls/__mac_get_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_get_link)
diff --git a/lib/libc/i386/syscalls/__mac_get_pid.S b/lib/libc/i386/syscalls/__mac_get_pid.S
deleted file mode 100644
index 0773f6f..0000000
--- a/lib/libc/i386/syscalls/__mac_get_pid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_get_pid)
diff --git a/lib/libc/i386/syscalls/__mac_get_proc.S b/lib/libc/i386/syscalls/__mac_get_proc.S
deleted file mode 100644
index f137643..0000000
--- a/lib/libc/i386/syscalls/__mac_get_proc.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_get_proc)
diff --git a/lib/libc/i386/syscalls/__mac_set_fd.S b/lib/libc/i386/syscalls/__mac_set_fd.S
deleted file mode 100644
index be55370..0000000
--- a/lib/libc/i386/syscalls/__mac_set_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_set_fd)
diff --git a/lib/libc/i386/syscalls/__mac_set_file.S b/lib/libc/i386/syscalls/__mac_set_file.S
deleted file mode 100644
index 37f6dc4..0000000
--- a/lib/libc/i386/syscalls/__mac_set_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_set_file)
diff --git a/lib/libc/i386/syscalls/__mac_set_link.S b/lib/libc/i386/syscalls/__mac_set_link.S
deleted file mode 100644
index e82b229..0000000
--- a/lib/libc/i386/syscalls/__mac_set_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_set_link)
diff --git a/lib/libc/i386/syscalls/__mac_set_proc.S b/lib/libc/i386/syscalls/__mac_set_proc.S
deleted file mode 100644
index 5720ff9..0000000
--- a/lib/libc/i386/syscalls/__mac_set_proc.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__mac_set_proc)
diff --git a/lib/libc/i386/syscalls/__semctl.S b/lib/libc/i386/syscalls/__semctl.S
deleted file mode 100644
index 585cb40..0000000
--- a/lib/libc/i386/syscalls/__semctl.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__semctl)
diff --git a/lib/libc/i386/syscalls/__setugid.S b/lib/libc/i386/syscalls/__setugid.S
deleted file mode 100644
index 6a21306..0000000
--- a/lib/libc/i386/syscalls/__setugid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__setugid)
diff --git a/lib/libc/i386/syscalls/__syscall.S b/lib/libc/i386/syscalls/__syscall.S
deleted file mode 100644
index 31b08ba..0000000
--- a/lib/libc/i386/syscalls/__syscall.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__syscall)
diff --git a/lib/libc/i386/syscalls/__sysctl.S b/lib/libc/i386/syscalls/__sysctl.S
deleted file mode 100644
index a44409c..0000000
--- a/lib/libc/i386/syscalls/__sysctl.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(__sysctl)
diff --git a/lib/libc/i386/syscalls/_exit.S b/lib/libc/i386/syscalls/_exit.S
deleted file mode 100644
index aaff187..0000000
--- a/lib/libc/i386/syscalls/_exit.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-PSEUDO(exit)
diff --git a/lib/libc/i386/syscalls/_getlogin.S b/lib/libc/i386/syscalls/_getlogin.S
deleted file mode 100644
index 9e260f9..0000000
--- a/lib/libc/i386/syscalls/_getlogin.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-PSEUDO(getlogin)
diff --git a/lib/libc/i386/syscalls/_umtx_lock.S b/lib/libc/i386/syscalls/_umtx_lock.S
deleted file mode 100644
index ce7f6b0..0000000
--- a/lib/libc/i386/syscalls/_umtx_lock.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(_umtx_lock)
diff --git a/lib/libc/i386/syscalls/_umtx_op.S b/lib/libc/i386/syscalls/_umtx_op.S
deleted file mode 100644
index 1a05bc4..0000000
--- a/lib/libc/i386/syscalls/_umtx_op.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(_umtx_op)
diff --git a/lib/libc/i386/syscalls/_umtx_unlock.S b/lib/libc/i386/syscalls/_umtx_unlock.S
deleted file mode 100644
index dcfb0d2..0000000
--- a/lib/libc/i386/syscalls/_umtx_unlock.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(_umtx_unlock)
diff --git a/lib/libc/i386/syscalls/accept.S b/lib/libc/i386/syscalls/accept.S
deleted file mode 100644
index d1248bc..0000000
--- a/lib/libc/i386/syscalls/accept.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(accept)
diff --git a/lib/libc/i386/syscalls/access.S b/lib/libc/i386/syscalls/access.S
deleted file mode 100644
index f7edd1e..0000000
--- a/lib/libc/i386/syscalls/access.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(access)
diff --git a/lib/libc/i386/syscalls/acct.S b/lib/libc/i386/syscalls/acct.S
deleted file mode 100644
index 56c8653..0000000
--- a/lib/libc/i386/syscalls/acct.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(acct)
diff --git a/lib/libc/i386/syscalls/adjtime.S b/lib/libc/i386/syscalls/adjtime.S
deleted file mode 100644
index b6d8c0f..0000000
--- a/lib/libc/i386/syscalls/adjtime.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(adjtime)
diff --git a/lib/libc/i386/syscalls/aio_cancel.S b/lib/libc/i386/syscalls/aio_cancel.S
deleted file mode 100644
index 48f8f09..0000000
--- a/lib/libc/i386/syscalls/aio_cancel.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(aio_cancel)
diff --git a/lib/libc/i386/syscalls/aio_error.S b/lib/libc/i386/syscalls/aio_error.S
deleted file mode 100644
index 9a6e5d2..0000000
--- a/lib/libc/i386/syscalls/aio_error.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(aio_error)
diff --git a/lib/libc/i386/syscalls/aio_read.S b/lib/libc/i386/syscalls/aio_read.S
deleted file mode 100644
index 46e0b32..0000000
--- a/lib/libc/i386/syscalls/aio_read.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(aio_read)
diff --git a/lib/libc/i386/syscalls/aio_return.S b/lib/libc/i386/syscalls/aio_return.S
deleted file mode 100644
index 2b28b2c..0000000
--- a/lib/libc/i386/syscalls/aio_return.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(aio_return)
diff --git a/lib/libc/i386/syscalls/aio_suspend.S b/lib/libc/i386/syscalls/aio_suspend.S
deleted file mode 100644
index 119bf4c..0000000
--- a/lib/libc/i386/syscalls/aio_suspend.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(aio_suspend)
diff --git a/lib/libc/i386/syscalls/aio_waitcomplete.S b/lib/libc/i386/syscalls/aio_waitcomplete.S
deleted file mode 100644
index b340a4c..0000000
--- a/lib/libc/i386/syscalls/aio_waitcomplete.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(aio_waitcomplete)
diff --git a/lib/libc/i386/syscalls/aio_write.S b/lib/libc/i386/syscalls/aio_write.S
deleted file mode 100644
index 13484bc..0000000
--- a/lib/libc/i386/syscalls/aio_write.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(aio_write)
diff --git a/lib/libc/i386/syscalls/audit.S b/lib/libc/i386/syscalls/audit.S
deleted file mode 100644
index da2c4bd..0000000
--- a/lib/libc/i386/syscalls/audit.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(audit)
diff --git a/lib/libc/i386/syscalls/auditctl.S b/lib/libc/i386/syscalls/auditctl.S
deleted file mode 100644
index ae0cf2f..0000000
--- a/lib/libc/i386/syscalls/auditctl.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(auditctl)
diff --git a/lib/libc/i386/syscalls/auditon.S b/lib/libc/i386/syscalls/auditon.S
deleted file mode 100644
index ba4f726..0000000
--- a/lib/libc/i386/syscalls/auditon.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(auditon)
diff --git a/lib/libc/i386/syscalls/bind.S b/lib/libc/i386/syscalls/bind.S
deleted file mode 100644
index c2602ad..0000000
--- a/lib/libc/i386/syscalls/bind.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(bind)
diff --git a/lib/libc/i386/syscalls/chdir.S b/lib/libc/i386/syscalls/chdir.S
deleted file mode 100644
index a654a24..0000000
--- a/lib/libc/i386/syscalls/chdir.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(chdir)
diff --git a/lib/libc/i386/syscalls/chflags.S b/lib/libc/i386/syscalls/chflags.S
deleted file mode 100644
index ca2a2f5..0000000
--- a/lib/libc/i386/syscalls/chflags.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(chflags)
diff --git a/lib/libc/i386/syscalls/chmod.S b/lib/libc/i386/syscalls/chmod.S
deleted file mode 100644
index 151628e..0000000
--- a/lib/libc/i386/syscalls/chmod.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(chmod)
diff --git a/lib/libc/i386/syscalls/chown.S b/lib/libc/i386/syscalls/chown.S
deleted file mode 100644
index 87b071b..0000000
--- a/lib/libc/i386/syscalls/chown.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(chown)
diff --git a/lib/libc/i386/syscalls/chroot.S b/lib/libc/i386/syscalls/chroot.S
deleted file mode 100644
index 09aabdf..0000000
--- a/lib/libc/i386/syscalls/chroot.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(chroot)
diff --git a/lib/libc/i386/syscalls/clock_getres.S b/lib/libc/i386/syscalls/clock_getres.S
deleted file mode 100644
index c329b93..0000000
--- a/lib/libc/i386/syscalls/clock_getres.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(clock_getres)
diff --git a/lib/libc/i386/syscalls/clock_gettime.S b/lib/libc/i386/syscalls/clock_gettime.S
deleted file mode 100644
index ba27b14..0000000
--- a/lib/libc/i386/syscalls/clock_gettime.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(clock_gettime)
diff --git a/lib/libc/i386/syscalls/clock_settime.S b/lib/libc/i386/syscalls/clock_settime.S
deleted file mode 100644
index f5a7fb7..0000000
--- a/lib/libc/i386/syscalls/clock_settime.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(clock_settime)
diff --git a/lib/libc/i386/syscalls/close.S b/lib/libc/i386/syscalls/close.S
deleted file mode 100644
index 70f8240..0000000
--- a/lib/libc/i386/syscalls/close.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(close)
diff --git a/lib/libc/i386/syscalls/connect.S b/lib/libc/i386/syscalls/connect.S
deleted file mode 100644
index 35ee704..0000000
--- a/lib/libc/i386/syscalls/connect.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(connect)
diff --git a/lib/libc/i386/syscalls/dup.S b/lib/libc/i386/syscalls/dup.S
deleted file mode 100644
index d30d954..0000000
--- a/lib/libc/i386/syscalls/dup.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(dup)
diff --git a/lib/libc/i386/syscalls/dup2.S b/lib/libc/i386/syscalls/dup2.S
deleted file mode 100644
index 64faa8a..0000000
--- a/lib/libc/i386/syscalls/dup2.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(dup2)
diff --git a/lib/libc/i386/syscalls/eaccess.S b/lib/libc/i386/syscalls/eaccess.S
deleted file mode 100644
index 92da4b5..0000000
--- a/lib/libc/i386/syscalls/eaccess.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(eaccess)
diff --git a/lib/libc/i386/syscalls/execve.S b/lib/libc/i386/syscalls/execve.S
deleted file mode 100644
index ef93f01..0000000
--- a/lib/libc/i386/syscalls/execve.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(execve)
diff --git a/lib/libc/i386/syscalls/extattr_delete_fd.S b/lib/libc/i386/syscalls/extattr_delete_fd.S
deleted file mode 100644
index 7c5857c..0000000
--- a/lib/libc/i386/syscalls/extattr_delete_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_delete_fd)
diff --git a/lib/libc/i386/syscalls/extattr_delete_file.S b/lib/libc/i386/syscalls/extattr_delete_file.S
deleted file mode 100644
index 6526d69..0000000
--- a/lib/libc/i386/syscalls/extattr_delete_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_delete_file)
diff --git a/lib/libc/i386/syscalls/extattr_delete_link.S b/lib/libc/i386/syscalls/extattr_delete_link.S
deleted file mode 100644
index cf93bde..0000000
--- a/lib/libc/i386/syscalls/extattr_delete_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_delete_link)
diff --git a/lib/libc/i386/syscalls/extattr_get_fd.S b/lib/libc/i386/syscalls/extattr_get_fd.S
deleted file mode 100644
index 5fe4202..0000000
--- a/lib/libc/i386/syscalls/extattr_get_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_get_fd)
diff --git a/lib/libc/i386/syscalls/extattr_get_file.S b/lib/libc/i386/syscalls/extattr_get_file.S
deleted file mode 100644
index 6014d2f..0000000
--- a/lib/libc/i386/syscalls/extattr_get_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_get_file)
diff --git a/lib/libc/i386/syscalls/extattr_get_link.S b/lib/libc/i386/syscalls/extattr_get_link.S
deleted file mode 100644
index 24b0e15..0000000
--- a/lib/libc/i386/syscalls/extattr_get_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_get_link)
diff --git a/lib/libc/i386/syscalls/extattr_list_fd.S b/lib/libc/i386/syscalls/extattr_list_fd.S
deleted file mode 100644
index 28e0eb2..0000000
--- a/lib/libc/i386/syscalls/extattr_list_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_list_fd)
diff --git a/lib/libc/i386/syscalls/extattr_list_file.S b/lib/libc/i386/syscalls/extattr_list_file.S
deleted file mode 100644
index 7d298bc..0000000
--- a/lib/libc/i386/syscalls/extattr_list_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_list_file)
diff --git a/lib/libc/i386/syscalls/extattr_list_link.S b/lib/libc/i386/syscalls/extattr_list_link.S
deleted file mode 100644
index e687f85..0000000
--- a/lib/libc/i386/syscalls/extattr_list_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_list_link)
diff --git a/lib/libc/i386/syscalls/extattr_set_fd.S b/lib/libc/i386/syscalls/extattr_set_fd.S
deleted file mode 100644
index 7fe77cb..0000000
--- a/lib/libc/i386/syscalls/extattr_set_fd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_set_fd)
diff --git a/lib/libc/i386/syscalls/extattr_set_file.S b/lib/libc/i386/syscalls/extattr_set_file.S
deleted file mode 100644
index ce26532..0000000
--- a/lib/libc/i386/syscalls/extattr_set_file.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_set_file)
diff --git a/lib/libc/i386/syscalls/extattr_set_link.S b/lib/libc/i386/syscalls/extattr_set_link.S
deleted file mode 100644
index c6d316e..0000000
--- a/lib/libc/i386/syscalls/extattr_set_link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattr_set_link)
diff --git a/lib/libc/i386/syscalls/extattrctl.S b/lib/libc/i386/syscalls/extattrctl.S
deleted file mode 100644
index add5285..0000000
--- a/lib/libc/i386/syscalls/extattrctl.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(extattrctl)
diff --git a/lib/libc/i386/syscalls/fchdir.S b/lib/libc/i386/syscalls/fchdir.S
deleted file mode 100644
index 73c19ca..0000000
--- a/lib/libc/i386/syscalls/fchdir.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fchdir)
diff --git a/lib/libc/i386/syscalls/fchflags.S b/lib/libc/i386/syscalls/fchflags.S
deleted file mode 100644
index a871f3a..0000000
--- a/lib/libc/i386/syscalls/fchflags.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fchflags)
diff --git a/lib/libc/i386/syscalls/fchmod.S b/lib/libc/i386/syscalls/fchmod.S
deleted file mode 100644
index 6b745f6..0000000
--- a/lib/libc/i386/syscalls/fchmod.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fchmod)
diff --git a/lib/libc/i386/syscalls/fchown.S b/lib/libc/i386/syscalls/fchown.S
deleted file mode 100644
index d2aa42f..0000000
--- a/lib/libc/i386/syscalls/fchown.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fchown)
diff --git a/lib/libc/i386/syscalls/fcntl.S b/lib/libc/i386/syscalls/fcntl.S
deleted file mode 100644
index f4b358f..0000000
--- a/lib/libc/i386/syscalls/fcntl.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fcntl)
diff --git a/lib/libc/i386/syscalls/fhopen.S b/lib/libc/i386/syscalls/fhopen.S
deleted file mode 100644
index 2a75704..0000000
--- a/lib/libc/i386/syscalls/fhopen.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fhopen)
diff --git a/lib/libc/i386/syscalls/fhstat.S b/lib/libc/i386/syscalls/fhstat.S
deleted file mode 100644
index 4a3b4fd..0000000
--- a/lib/libc/i386/syscalls/fhstat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fhstat)
diff --git a/lib/libc/i386/syscalls/fhstatfs.S b/lib/libc/i386/syscalls/fhstatfs.S
deleted file mode 100644
index 2b75ba7..0000000
--- a/lib/libc/i386/syscalls/fhstatfs.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fhstatfs)
diff --git a/lib/libc/i386/syscalls/flock.S b/lib/libc/i386/syscalls/flock.S
deleted file mode 100644
index a316d0c..0000000
--- a/lib/libc/i386/syscalls/flock.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(flock)
diff --git a/lib/libc/i386/syscalls/fork.S b/lib/libc/i386/syscalls/fork.S
deleted file mode 100644
index 377d3dc..0000000
--- a/lib/libc/i386/syscalls/fork.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fork)
diff --git a/lib/libc/i386/syscalls/fpathconf.S b/lib/libc/i386/syscalls/fpathconf.S
deleted file mode 100644
index 0c72b52..0000000
--- a/lib/libc/i386/syscalls/fpathconf.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fpathconf)
diff --git a/lib/libc/i386/syscalls/fstat.S b/lib/libc/i386/syscalls/fstat.S
deleted file mode 100644
index b50eb2e..0000000
--- a/lib/libc/i386/syscalls/fstat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fstat)
diff --git a/lib/libc/i386/syscalls/fstatfs.S b/lib/libc/i386/syscalls/fstatfs.S
deleted file mode 100644
index e6c93ed..0000000
--- a/lib/libc/i386/syscalls/fstatfs.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fstatfs)
diff --git a/lib/libc/i386/syscalls/fsync.S b/lib/libc/i386/syscalls/fsync.S
deleted file mode 100644
index 83a1245..0000000
--- a/lib/libc/i386/syscalls/fsync.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(fsync)
diff --git a/lib/libc/i386/syscalls/futimes.S b/lib/libc/i386/syscalls/futimes.S
deleted file mode 100644
index 685665b..0000000
--- a/lib/libc/i386/syscalls/futimes.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(futimes)
diff --git a/lib/libc/i386/syscalls/getaudit.S b/lib/libc/i386/syscalls/getaudit.S
deleted file mode 100644
index 026d8ea..0000000
--- a/lib/libc/i386/syscalls/getaudit.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getaudit)
diff --git a/lib/libc/i386/syscalls/getaudit_addr.S b/lib/libc/i386/syscalls/getaudit_addr.S
deleted file mode 100644
index ca02bbf..0000000
--- a/lib/libc/i386/syscalls/getaudit_addr.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getaudit_addr)
diff --git a/lib/libc/i386/syscalls/getauid.S b/lib/libc/i386/syscalls/getauid.S
deleted file mode 100644
index 4ed3986..0000000
--- a/lib/libc/i386/syscalls/getauid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getauid)
diff --git a/lib/libc/i386/syscalls/getdents.S b/lib/libc/i386/syscalls/getdents.S
deleted file mode 100644
index c59df9a..0000000
--- a/lib/libc/i386/syscalls/getdents.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getdents)
diff --git a/lib/libc/i386/syscalls/getdirentries.S b/lib/libc/i386/syscalls/getdirentries.S
deleted file mode 100644
index 8e35eef..0000000
--- a/lib/libc/i386/syscalls/getdirentries.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getdirentries)
diff --git a/lib/libc/i386/syscalls/getdtablesize.S b/lib/libc/i386/syscalls/getdtablesize.S
deleted file mode 100644
index 53dbb2f..0000000
--- a/lib/libc/i386/syscalls/getdtablesize.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getdtablesize)
diff --git a/lib/libc/i386/syscalls/getegid.S b/lib/libc/i386/syscalls/getegid.S
deleted file mode 100644
index b65aa4b..0000000
--- a/lib/libc/i386/syscalls/getegid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getegid)
diff --git a/lib/libc/i386/syscalls/geteuid.S b/lib/libc/i386/syscalls/geteuid.S
deleted file mode 100644
index e9b276e..0000000
--- a/lib/libc/i386/syscalls/geteuid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(geteuid)
diff --git a/lib/libc/i386/syscalls/getfh.S b/lib/libc/i386/syscalls/getfh.S
deleted file mode 100644
index 7560c6a..0000000
--- a/lib/libc/i386/syscalls/getfh.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getfh)
diff --git a/lib/libc/i386/syscalls/getfsstat.S b/lib/libc/i386/syscalls/getfsstat.S
deleted file mode 100644
index 0032a9b..0000000
--- a/lib/libc/i386/syscalls/getfsstat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getfsstat)
diff --git a/lib/libc/i386/syscalls/getgid.S b/lib/libc/i386/syscalls/getgid.S
deleted file mode 100644
index 77a8458..0000000
--- a/lib/libc/i386/syscalls/getgid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getgid)
diff --git a/lib/libc/i386/syscalls/getgroups.S b/lib/libc/i386/syscalls/getgroups.S
deleted file mode 100644
index 94ee224..0000000
--- a/lib/libc/i386/syscalls/getgroups.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getgroups)
diff --git a/lib/libc/i386/syscalls/getitimer.S b/lib/libc/i386/syscalls/getitimer.S
deleted file mode 100644
index 6dcc3cb..0000000
--- a/lib/libc/i386/syscalls/getitimer.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getitimer)
diff --git a/lib/libc/i386/syscalls/getpeername.S b/lib/libc/i386/syscalls/getpeername.S
deleted file mode 100644
index b8260e4..0000000
--- a/lib/libc/i386/syscalls/getpeername.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getpeername)
diff --git a/lib/libc/i386/syscalls/getpgid.S b/lib/libc/i386/syscalls/getpgid.S
deleted file mode 100644
index 8f0d7a4..0000000
--- a/lib/libc/i386/syscalls/getpgid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getpgid)
diff --git a/lib/libc/i386/syscalls/getpgrp.S b/lib/libc/i386/syscalls/getpgrp.S
deleted file mode 100644
index 99e916e..0000000
--- a/lib/libc/i386/syscalls/getpgrp.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getpgrp)
diff --git a/lib/libc/i386/syscalls/getpid.S b/lib/libc/i386/syscalls/getpid.S
deleted file mode 100644
index 3ceb237..0000000
--- a/lib/libc/i386/syscalls/getpid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getpid)
diff --git a/lib/libc/i386/syscalls/getppid.S b/lib/libc/i386/syscalls/getppid.S
deleted file mode 100644
index 391efca..0000000
--- a/lib/libc/i386/syscalls/getppid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getppid)
diff --git a/lib/libc/i386/syscalls/getpriority.S b/lib/libc/i386/syscalls/getpriority.S
deleted file mode 100644
index 722272e..0000000
--- a/lib/libc/i386/syscalls/getpriority.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getpriority)
diff --git a/lib/libc/i386/syscalls/getresgid.S b/lib/libc/i386/syscalls/getresgid.S
deleted file mode 100644
index a09525a..0000000
--- a/lib/libc/i386/syscalls/getresgid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getresgid)
diff --git a/lib/libc/i386/syscalls/getresuid.S b/lib/libc/i386/syscalls/getresuid.S
deleted file mode 100644
index b43cbf9..0000000
--- a/lib/libc/i386/syscalls/getresuid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getresuid)
diff --git a/lib/libc/i386/syscalls/getrlimit.S b/lib/libc/i386/syscalls/getrlimit.S
deleted file mode 100644
index b369dce..0000000
--- a/lib/libc/i386/syscalls/getrlimit.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getrlimit)
diff --git a/lib/libc/i386/syscalls/getrusage.S b/lib/libc/i386/syscalls/getrusage.S
deleted file mode 100644
index e2cb42d..0000000
--- a/lib/libc/i386/syscalls/getrusage.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getrusage)
diff --git a/lib/libc/i386/syscalls/getsid.S b/lib/libc/i386/syscalls/getsid.S
deleted file mode 100644
index 65f0214..0000000
--- a/lib/libc/i386/syscalls/getsid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getsid)
diff --git a/lib/libc/i386/syscalls/getsockname.S b/lib/libc/i386/syscalls/getsockname.S
deleted file mode 100644
index c39ff3b..0000000
--- a/lib/libc/i386/syscalls/getsockname.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getsockname)
diff --git a/lib/libc/i386/syscalls/getsockopt.S b/lib/libc/i386/syscalls/getsockopt.S
deleted file mode 100644
index d752057..0000000
--- a/lib/libc/i386/syscalls/getsockopt.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getsockopt)
diff --git a/lib/libc/i386/syscalls/gettimeofday.S b/lib/libc/i386/syscalls/gettimeofday.S
deleted file mode 100644
index 1fbfb52..0000000
--- a/lib/libc/i386/syscalls/gettimeofday.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(gettimeofday)
diff --git a/lib/libc/i386/syscalls/getuid.S b/lib/libc/i386/syscalls/getuid.S
deleted file mode 100644
index 7917e5b..0000000
--- a/lib/libc/i386/syscalls/getuid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(getuid)
diff --git a/lib/libc/i386/syscalls/ioctl.S b/lib/libc/i386/syscalls/ioctl.S
deleted file mode 100644
index a538e56..0000000
--- a/lib/libc/i386/syscalls/ioctl.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ioctl)
diff --git a/lib/libc/i386/syscalls/issetugid.S b/lib/libc/i386/syscalls/issetugid.S
deleted file mode 100644
index 45e5e62..0000000
--- a/lib/libc/i386/syscalls/issetugid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(issetugid)
diff --git a/lib/libc/i386/syscalls/jail.S b/lib/libc/i386/syscalls/jail.S
deleted file mode 100644
index f8f1557..0000000
--- a/lib/libc/i386/syscalls/jail.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(jail)
diff --git a/lib/libc/i386/syscalls/jail_attach.S b/lib/libc/i386/syscalls/jail_attach.S
deleted file mode 100644
index fb18318..0000000
--- a/lib/libc/i386/syscalls/jail_attach.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(jail_attach)
diff --git a/lib/libc/i386/syscalls/kenv.S b/lib/libc/i386/syscalls/kenv.S
deleted file mode 100644
index d65528b..0000000
--- a/lib/libc/i386/syscalls/kenv.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kenv)
diff --git a/lib/libc/i386/syscalls/kevent.S b/lib/libc/i386/syscalls/kevent.S
deleted file mode 100644
index ce12203..0000000
--- a/lib/libc/i386/syscalls/kevent.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kevent)
diff --git a/lib/libc/i386/syscalls/kill.S b/lib/libc/i386/syscalls/kill.S
deleted file mode 100644
index 5d72465..0000000
--- a/lib/libc/i386/syscalls/kill.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kill)
diff --git a/lib/libc/i386/syscalls/kldfind.S b/lib/libc/i386/syscalls/kldfind.S
deleted file mode 100644
index 69a70c9..0000000
--- a/lib/libc/i386/syscalls/kldfind.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kldfind)
diff --git a/lib/libc/i386/syscalls/kldfirstmod.S b/lib/libc/i386/syscalls/kldfirstmod.S
deleted file mode 100644
index 0969884..0000000
--- a/lib/libc/i386/syscalls/kldfirstmod.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kldfirstmod)
diff --git a/lib/libc/i386/syscalls/kldload.S b/lib/libc/i386/syscalls/kldload.S
deleted file mode 100644
index 9ea1fd4..0000000
--- a/lib/libc/i386/syscalls/kldload.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kldload)
diff --git a/lib/libc/i386/syscalls/kldnext.S b/lib/libc/i386/syscalls/kldnext.S
deleted file mode 100644
index 82bb04e..0000000
--- a/lib/libc/i386/syscalls/kldnext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kldnext)
diff --git a/lib/libc/i386/syscalls/kldstat.S b/lib/libc/i386/syscalls/kldstat.S
deleted file mode 100644
index b397167..0000000
--- a/lib/libc/i386/syscalls/kldstat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kldstat)
diff --git a/lib/libc/i386/syscalls/kldsym.S b/lib/libc/i386/syscalls/kldsym.S
deleted file mode 100644
index 9aaaa58..0000000
--- a/lib/libc/i386/syscalls/kldsym.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kldsym)
diff --git a/lib/libc/i386/syscalls/kldunload.S b/lib/libc/i386/syscalls/kldunload.S
deleted file mode 100644
index a5e25e5..0000000
--- a/lib/libc/i386/syscalls/kldunload.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kldunload)
diff --git a/lib/libc/i386/syscalls/kldunloadf.S b/lib/libc/i386/syscalls/kldunloadf.S
deleted file mode 100644
index 28b6114..0000000
--- a/lib/libc/i386/syscalls/kldunloadf.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kldunloadf)
diff --git a/lib/libc/i386/syscalls/kqueue.S b/lib/libc/i386/syscalls/kqueue.S
deleted file mode 100644
index fcb66ae..0000000
--- a/lib/libc/i386/syscalls/kqueue.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kqueue)
diff --git a/lib/libc/i386/syscalls/kse_create.S b/lib/libc/i386/syscalls/kse_create.S
deleted file mode 100644
index fbe66d0..0000000
--- a/lib/libc/i386/syscalls/kse_create.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kse_create)
diff --git a/lib/libc/i386/syscalls/kse_exit.S b/lib/libc/i386/syscalls/kse_exit.S
deleted file mode 100644
index e349bdb..0000000
--- a/lib/libc/i386/syscalls/kse_exit.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kse_exit)
diff --git a/lib/libc/i386/syscalls/kse_release.S b/lib/libc/i386/syscalls/kse_release.S
deleted file mode 100644
index 97d18cb..0000000
--- a/lib/libc/i386/syscalls/kse_release.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kse_release)
diff --git a/lib/libc/i386/syscalls/kse_switchin.S b/lib/libc/i386/syscalls/kse_switchin.S
deleted file mode 100644
index f0442ad..0000000
--- a/lib/libc/i386/syscalls/kse_switchin.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kse_switchin)
diff --git a/lib/libc/i386/syscalls/kse_thr_interrupt.S b/lib/libc/i386/syscalls/kse_thr_interrupt.S
deleted file mode 100644
index 1a5df00..0000000
--- a/lib/libc/i386/syscalls/kse_thr_interrupt.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kse_thr_interrupt)
diff --git a/lib/libc/i386/syscalls/kse_wakeup.S b/lib/libc/i386/syscalls/kse_wakeup.S
deleted file mode 100644
index 0350a0d..0000000
--- a/lib/libc/i386/syscalls/kse_wakeup.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(kse_wakeup)
diff --git a/lib/libc/i386/syscalls/ksem_close.S b/lib/libc/i386/syscalls/ksem_close.S
deleted file mode 100644
index 410085f..0000000
--- a/lib/libc/i386/syscalls/ksem_close.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_close)
diff --git a/lib/libc/i386/syscalls/ksem_destroy.S b/lib/libc/i386/syscalls/ksem_destroy.S
deleted file mode 100644
index b82aac6..0000000
--- a/lib/libc/i386/syscalls/ksem_destroy.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_destroy)
diff --git a/lib/libc/i386/syscalls/ksem_getvalue.S b/lib/libc/i386/syscalls/ksem_getvalue.S
deleted file mode 100644
index b855218..0000000
--- a/lib/libc/i386/syscalls/ksem_getvalue.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_getvalue)
diff --git a/lib/libc/i386/syscalls/ksem_init.S b/lib/libc/i386/syscalls/ksem_init.S
deleted file mode 100644
index dccf624..0000000
--- a/lib/libc/i386/syscalls/ksem_init.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_init)
diff --git a/lib/libc/i386/syscalls/ksem_open.S b/lib/libc/i386/syscalls/ksem_open.S
deleted file mode 100644
index 3e7feba..0000000
--- a/lib/libc/i386/syscalls/ksem_open.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_open)
diff --git a/lib/libc/i386/syscalls/ksem_post.S b/lib/libc/i386/syscalls/ksem_post.S
deleted file mode 100644
index 64993bd..0000000
--- a/lib/libc/i386/syscalls/ksem_post.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_post)
diff --git a/lib/libc/i386/syscalls/ksem_timedwait.S b/lib/libc/i386/syscalls/ksem_timedwait.S
deleted file mode 100644
index 3027534..0000000
--- a/lib/libc/i386/syscalls/ksem_timedwait.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_timedwait)
diff --git a/lib/libc/i386/syscalls/ksem_trywait.S b/lib/libc/i386/syscalls/ksem_trywait.S
deleted file mode 100644
index 9d4913f..0000000
--- a/lib/libc/i386/syscalls/ksem_trywait.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_trywait)
diff --git a/lib/libc/i386/syscalls/ksem_unlink.S b/lib/libc/i386/syscalls/ksem_unlink.S
deleted file mode 100644
index d6a5132..0000000
--- a/lib/libc/i386/syscalls/ksem_unlink.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_unlink)
diff --git a/lib/libc/i386/syscalls/ksem_wait.S b/lib/libc/i386/syscalls/ksem_wait.S
deleted file mode 100644
index 65e2141..0000000
--- a/lib/libc/i386/syscalls/ksem_wait.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ksem_wait)
diff --git a/lib/libc/i386/syscalls/ktrace.S b/lib/libc/i386/syscalls/ktrace.S
deleted file mode 100644
index 71da6dc..0000000
--- a/lib/libc/i386/syscalls/ktrace.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ktrace)
diff --git a/lib/libc/i386/syscalls/lchflags.S b/lib/libc/i386/syscalls/lchflags.S
deleted file mode 100644
index 96602c6..0000000
--- a/lib/libc/i386/syscalls/lchflags.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(lchflags)
diff --git a/lib/libc/i386/syscalls/lchmod.S b/lib/libc/i386/syscalls/lchmod.S
deleted file mode 100644
index f4c378c..0000000
--- a/lib/libc/i386/syscalls/lchmod.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(lchmod)
diff --git a/lib/libc/i386/syscalls/lchown.S b/lib/libc/i386/syscalls/lchown.S
deleted file mode 100644
index a73b5e9..0000000
--- a/lib/libc/i386/syscalls/lchown.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(lchown)
diff --git a/lib/libc/i386/syscalls/lgetfh.S b/lib/libc/i386/syscalls/lgetfh.S
deleted file mode 100644
index 5612b2b..0000000
--- a/lib/libc/i386/syscalls/lgetfh.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(lgetfh)
diff --git a/lib/libc/i386/syscalls/link.S b/lib/libc/i386/syscalls/link.S
deleted file mode 100644
index f47b152..0000000
--- a/lib/libc/i386/syscalls/link.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(link)
diff --git a/lib/libc/i386/syscalls/lio_listio.S b/lib/libc/i386/syscalls/lio_listio.S
deleted file mode 100644
index 40e81b8..0000000
--- a/lib/libc/i386/syscalls/lio_listio.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(lio_listio)
diff --git a/lib/libc/i386/syscalls/listen.S b/lib/libc/i386/syscalls/listen.S
deleted file mode 100644
index 236b637..0000000
--- a/lib/libc/i386/syscalls/listen.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(listen)
diff --git a/lib/libc/i386/syscalls/lstat.S b/lib/libc/i386/syscalls/lstat.S
deleted file mode 100644
index 686ff37..0000000
--- a/lib/libc/i386/syscalls/lstat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(lstat)
diff --git a/lib/libc/i386/syscalls/lutimes.S b/lib/libc/i386/syscalls/lutimes.S
deleted file mode 100644
index 13083a4..0000000
--- a/lib/libc/i386/syscalls/lutimes.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(lutimes)
diff --git a/lib/libc/i386/syscalls/mac_syscall.S b/lib/libc/i386/syscalls/mac_syscall.S
deleted file mode 100644
index 2f014c1..0000000
--- a/lib/libc/i386/syscalls/mac_syscall.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(mac_syscall)
diff --git a/lib/libc/i386/syscalls/madvise.S b/lib/libc/i386/syscalls/madvise.S
deleted file mode 100644
index 6ca3748..0000000
--- a/lib/libc/i386/syscalls/madvise.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(madvise)
diff --git a/lib/libc/i386/syscalls/mincore.S b/lib/libc/i386/syscalls/mincore.S
deleted file mode 100644
index 358b9b7..0000000
--- a/lib/libc/i386/syscalls/mincore.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(mincore)
diff --git a/lib/libc/i386/syscalls/minherit.S b/lib/libc/i386/syscalls/minherit.S
deleted file mode 100644
index fc57003..0000000
--- a/lib/libc/i386/syscalls/minherit.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(minherit)
diff --git a/lib/libc/i386/syscalls/mkdir.S b/lib/libc/i386/syscalls/mkdir.S
deleted file mode 100644
index e2ec24e..0000000
--- a/lib/libc/i386/syscalls/mkdir.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(mkdir)
diff --git a/lib/libc/i386/syscalls/mkfifo.S b/lib/libc/i386/syscalls/mkfifo.S
deleted file mode 100644
index 9ceccfd..0000000
--- a/lib/libc/i386/syscalls/mkfifo.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(mkfifo)
diff --git a/lib/libc/i386/syscalls/mknod.S b/lib/libc/i386/syscalls/mknod.S
deleted file mode 100644
index 684241d..0000000
--- a/lib/libc/i386/syscalls/mknod.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(mknod)
diff --git a/lib/libc/i386/syscalls/mlock.S b/lib/libc/i386/syscalls/mlock.S
deleted file mode 100644
index 345cb28..0000000
--- a/lib/libc/i386/syscalls/mlock.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(mlock)
diff --git a/lib/libc/i386/syscalls/mlockall.S b/lib/libc/i386/syscalls/mlockall.S
deleted file mode 100644
index 9df44c9..0000000
--- a/lib/libc/i386/syscalls/mlockall.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(mlockall)
diff --git a/lib/libc/i386/syscalls/modfind.S b/lib/libc/i386/syscalls/modfind.S
deleted file mode 100644
index 8f6e242..0000000
--- a/lib/libc/i386/syscalls/modfind.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(modfind)
diff --git a/lib/libc/i386/syscalls/modfnext.S b/lib/libc/i386/syscalls/modfnext.S
deleted file mode 100644
index 4e28d45..0000000
--- a/lib/libc/i386/syscalls/modfnext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(modfnext)
diff --git a/lib/libc/i386/syscalls/modnext.S b/lib/libc/i386/syscalls/modnext.S
deleted file mode 100644
index e092a40..0000000
--- a/lib/libc/i386/syscalls/modnext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(modnext)
diff --git a/lib/libc/i386/syscalls/modstat.S b/lib/libc/i386/syscalls/modstat.S
deleted file mode 100644
index 324a6aa..0000000
--- a/lib/libc/i386/syscalls/modstat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(modstat)
diff --git a/lib/libc/i386/syscalls/mount.S b/lib/libc/i386/syscalls/mount.S
deleted file mode 100644
index 1e7296d..0000000
--- a/lib/libc/i386/syscalls/mount.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(mount)
diff --git a/lib/libc/i386/syscalls/mprotect.S b/lib/libc/i386/syscalls/mprotect.S
deleted file mode 100644
index 3416d37..0000000
--- a/lib/libc/i386/syscalls/mprotect.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(mprotect)
diff --git a/lib/libc/i386/syscalls/msgctl.S b/lib/libc/i386/syscalls/msgctl.S
deleted file mode 100644
index 20d1fd0..0000000
--- a/lib/libc/i386/syscalls/msgctl.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(msgctl)
diff --git a/lib/libc/i386/syscalls/msgget.S b/lib/libc/i386/syscalls/msgget.S
deleted file mode 100644
index ca1bbea..0000000
--- a/lib/libc/i386/syscalls/msgget.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(msgget)
diff --git a/lib/libc/i386/syscalls/msgrcv.S b/lib/libc/i386/syscalls/msgrcv.S
deleted file mode 100644
index fbccd0a..0000000
--- a/lib/libc/i386/syscalls/msgrcv.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(msgrcv)
diff --git a/lib/libc/i386/syscalls/msgsnd.S b/lib/libc/i386/syscalls/msgsnd.S
deleted file mode 100644
index afcbef5..0000000
--- a/lib/libc/i386/syscalls/msgsnd.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(msgsnd)
diff --git a/lib/libc/i386/syscalls/msgsys.S b/lib/libc/i386/syscalls/msgsys.S
deleted file mode 100644
index 9d486b2..0000000
--- a/lib/libc/i386/syscalls/msgsys.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(msgsys)
diff --git a/lib/libc/i386/syscalls/msync.S b/lib/libc/i386/syscalls/msync.S
deleted file mode 100644
index 536e116..0000000
--- a/lib/libc/i386/syscalls/msync.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(msync)
diff --git a/lib/libc/i386/syscalls/munlock.S b/lib/libc/i386/syscalls/munlock.S
deleted file mode 100644
index 503d21d..0000000
--- a/lib/libc/i386/syscalls/munlock.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(munlock)
diff --git a/lib/libc/i386/syscalls/munlockall.S b/lib/libc/i386/syscalls/munlockall.S
deleted file mode 100644
index 7bac8e0..0000000
--- a/lib/libc/i386/syscalls/munlockall.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(munlockall)
diff --git a/lib/libc/i386/syscalls/munmap.S b/lib/libc/i386/syscalls/munmap.S
deleted file mode 100644
index a0fa128..0000000
--- a/lib/libc/i386/syscalls/munmap.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(munmap)
diff --git a/lib/libc/i386/syscalls/nanosleep.S b/lib/libc/i386/syscalls/nanosleep.S
deleted file mode 100644
index 88676fc..0000000
--- a/lib/libc/i386/syscalls/nanosleep.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(nanosleep)
diff --git a/lib/libc/i386/syscalls/netbsd_lchown.S b/lib/libc/i386/syscalls/netbsd_lchown.S
deleted file mode 100644
index e9ee40d..0000000
--- a/lib/libc/i386/syscalls/netbsd_lchown.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(netbsd_lchown)
diff --git a/lib/libc/i386/syscalls/netbsd_msync.S b/lib/libc/i386/syscalls/netbsd_msync.S
deleted file mode 100644
index b1b261e..0000000
--- a/lib/libc/i386/syscalls/netbsd_msync.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(netbsd_msync)
diff --git a/lib/libc/i386/syscalls/nfsclnt.S b/lib/libc/i386/syscalls/nfsclnt.S
deleted file mode 100644
index 60fed78..0000000
--- a/lib/libc/i386/syscalls/nfsclnt.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(nfsclnt)
diff --git a/lib/libc/i386/syscalls/nfssvc.S b/lib/libc/i386/syscalls/nfssvc.S
deleted file mode 100644
index 82f0c67..0000000
--- a/lib/libc/i386/syscalls/nfssvc.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(nfssvc)
diff --git a/lib/libc/i386/syscalls/nfstat.S b/lib/libc/i386/syscalls/nfstat.S
deleted file mode 100644
index 7840e81..0000000
--- a/lib/libc/i386/syscalls/nfstat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(nfstat)
diff --git a/lib/libc/i386/syscalls/nlstat.S b/lib/libc/i386/syscalls/nlstat.S
deleted file mode 100644
index af02f82..0000000
--- a/lib/libc/i386/syscalls/nlstat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(nlstat)
diff --git a/lib/libc/i386/syscalls/nmount.S b/lib/libc/i386/syscalls/nmount.S
deleted file mode 100644
index af017c7..0000000
--- a/lib/libc/i386/syscalls/nmount.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(nmount)
diff --git a/lib/libc/i386/syscalls/nstat.S b/lib/libc/i386/syscalls/nstat.S
deleted file mode 100644
index 31dc735..0000000
--- a/lib/libc/i386/syscalls/nstat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(nstat)
diff --git a/lib/libc/i386/syscalls/ntp_adjtime.S b/lib/libc/i386/syscalls/ntp_adjtime.S
deleted file mode 100644
index 0a06968..0000000
--- a/lib/libc/i386/syscalls/ntp_adjtime.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ntp_adjtime)
diff --git a/lib/libc/i386/syscalls/ntp_gettime.S b/lib/libc/i386/syscalls/ntp_gettime.S
deleted file mode 100644
index 7848961..0000000
--- a/lib/libc/i386/syscalls/ntp_gettime.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(ntp_gettime)
diff --git a/lib/libc/i386/syscalls/open.S b/lib/libc/i386/syscalls/open.S
deleted file mode 100644
index 492455b..0000000
--- a/lib/libc/i386/syscalls/open.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(open)
diff --git a/lib/libc/i386/syscalls/pathconf.S b/lib/libc/i386/syscalls/pathconf.S
deleted file mode 100644
index 346c2f3..0000000
--- a/lib/libc/i386/syscalls/pathconf.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(pathconf)
diff --git a/lib/libc/i386/syscalls/poll.S b/lib/libc/i386/syscalls/poll.S
deleted file mode 100644
index b16dabe..0000000
--- a/lib/libc/i386/syscalls/poll.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(poll)
diff --git a/lib/libc/i386/syscalls/preadv.S b/lib/libc/i386/syscalls/preadv.S
deleted file mode 100644
index 682a0d2..0000000
--- a/lib/libc/i386/syscalls/preadv.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(preadv)
diff --git a/lib/libc/i386/syscalls/profil.S b/lib/libc/i386/syscalls/profil.S
deleted file mode 100644
index c19dc91..0000000
--- a/lib/libc/i386/syscalls/profil.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(profil)
diff --git a/lib/libc/i386/syscalls/pwritev.S b/lib/libc/i386/syscalls/pwritev.S
deleted file mode 100644
index 976421e..0000000
--- a/lib/libc/i386/syscalls/pwritev.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(pwritev)
diff --git a/lib/libc/i386/syscalls/quotactl.S b/lib/libc/i386/syscalls/quotactl.S
deleted file mode 100644
index 9183a58..0000000
--- a/lib/libc/i386/syscalls/quotactl.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(quotactl)
diff --git a/lib/libc/i386/syscalls/read.S b/lib/libc/i386/syscalls/read.S
deleted file mode 100644
index 43e74f6..0000000
--- a/lib/libc/i386/syscalls/read.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(read)
diff --git a/lib/libc/i386/syscalls/readlink.S b/lib/libc/i386/syscalls/readlink.S
deleted file mode 100644
index fbed0e4..0000000
--- a/lib/libc/i386/syscalls/readlink.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(readlink)
diff --git a/lib/libc/i386/syscalls/readv.S b/lib/libc/i386/syscalls/readv.S
deleted file mode 100644
index 7cfa298..0000000
--- a/lib/libc/i386/syscalls/readv.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(readv)
diff --git a/lib/libc/i386/syscalls/recvfrom.S b/lib/libc/i386/syscalls/recvfrom.S
deleted file mode 100644
index ed9412e..0000000
--- a/lib/libc/i386/syscalls/recvfrom.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(recvfrom)
diff --git a/lib/libc/i386/syscalls/recvmsg.S b/lib/libc/i386/syscalls/recvmsg.S
deleted file mode 100644
index bbb1a23..0000000
--- a/lib/libc/i386/syscalls/recvmsg.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(recvmsg)
diff --git a/lib/libc/i386/syscalls/rename.S b/lib/libc/i386/syscalls/rename.S
deleted file mode 100644
index 5eb5da8..0000000
--- a/lib/libc/i386/syscalls/rename.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(rename)
diff --git a/lib/libc/i386/syscalls/revoke.S b/lib/libc/i386/syscalls/revoke.S
deleted file mode 100644
index 0e65363..0000000
--- a/lib/libc/i386/syscalls/revoke.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(revoke)
diff --git a/lib/libc/i386/syscalls/rfork.S b/lib/libc/i386/syscalls/rfork.S
deleted file mode 100644
index 478d399..0000000
--- a/lib/libc/i386/syscalls/rfork.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(rfork)
diff --git a/lib/libc/i386/syscalls/rmdir.S b/lib/libc/i386/syscalls/rmdir.S
deleted file mode 100644
index 3232880..0000000
--- a/lib/libc/i386/syscalls/rmdir.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(rmdir)
diff --git a/lib/libc/i386/syscalls/rtprio.S b/lib/libc/i386/syscalls/rtprio.S
deleted file mode 100644
index 43f0d3f..0000000
--- a/lib/libc/i386/syscalls/rtprio.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(rtprio)
diff --git a/lib/libc/i386/syscalls/sched_get_priority_max.S b/lib/libc/i386/syscalls/sched_get_priority_max.S
deleted file mode 100644
index 8bd78ff..0000000
--- a/lib/libc/i386/syscalls/sched_get_priority_max.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sched_get_priority_max)
diff --git a/lib/libc/i386/syscalls/sched_get_priority_min.S b/lib/libc/i386/syscalls/sched_get_priority_min.S
deleted file mode 100644
index d4629fd..0000000
--- a/lib/libc/i386/syscalls/sched_get_priority_min.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sched_get_priority_min)
diff --git a/lib/libc/i386/syscalls/sched_getparam.S b/lib/libc/i386/syscalls/sched_getparam.S
deleted file mode 100644
index 7c0c8f1..0000000
--- a/lib/libc/i386/syscalls/sched_getparam.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sched_getparam)
diff --git a/lib/libc/i386/syscalls/sched_getscheduler.S b/lib/libc/i386/syscalls/sched_getscheduler.S
deleted file mode 100644
index eac7abe..0000000
--- a/lib/libc/i386/syscalls/sched_getscheduler.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sched_getscheduler)
diff --git a/lib/libc/i386/syscalls/sched_rr_get_interval.S b/lib/libc/i386/syscalls/sched_rr_get_interval.S
deleted file mode 100644
index 3feb807..0000000
--- a/lib/libc/i386/syscalls/sched_rr_get_interval.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sched_rr_get_interval)
diff --git a/lib/libc/i386/syscalls/sched_setparam.S b/lib/libc/i386/syscalls/sched_setparam.S
deleted file mode 100644
index ad2764a..0000000
--- a/lib/libc/i386/syscalls/sched_setparam.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sched_setparam)
diff --git a/lib/libc/i386/syscalls/sched_setscheduler.S b/lib/libc/i386/syscalls/sched_setscheduler.S
deleted file mode 100644
index 16d8e9e..0000000
--- a/lib/libc/i386/syscalls/sched_setscheduler.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sched_setscheduler)
diff --git a/lib/libc/i386/syscalls/sched_yield.S b/lib/libc/i386/syscalls/sched_yield.S
deleted file mode 100644
index 7247493..0000000
--- a/lib/libc/i386/syscalls/sched_yield.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sched_yield)
diff --git a/lib/libc/i386/syscalls/select.S b/lib/libc/i386/syscalls/select.S
deleted file mode 100644
index 2f5e60d..0000000
--- a/lib/libc/i386/syscalls/select.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(select)
diff --git a/lib/libc/i386/syscalls/semget.S b/lib/libc/i386/syscalls/semget.S
deleted file mode 100644
index 3f13897..0000000
--- a/lib/libc/i386/syscalls/semget.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(semget)
diff --git a/lib/libc/i386/syscalls/semop.S b/lib/libc/i386/syscalls/semop.S
deleted file mode 100644
index c89ea11..0000000
--- a/lib/libc/i386/syscalls/semop.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(semop)
diff --git a/lib/libc/i386/syscalls/semsys.S b/lib/libc/i386/syscalls/semsys.S
deleted file mode 100644
index 59357cf..0000000
--- a/lib/libc/i386/syscalls/semsys.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(semsys)
diff --git a/lib/libc/i386/syscalls/sendfile.S b/lib/libc/i386/syscalls/sendfile.S
deleted file mode 100644
index b488ffb..0000000
--- a/lib/libc/i386/syscalls/sendfile.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sendfile)
diff --git a/lib/libc/i386/syscalls/sendmsg.S b/lib/libc/i386/syscalls/sendmsg.S
deleted file mode 100644
index 6113c75..0000000
--- a/lib/libc/i386/syscalls/sendmsg.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sendmsg)
diff --git a/lib/libc/i386/syscalls/sendto.S b/lib/libc/i386/syscalls/sendto.S
deleted file mode 100644
index 4fe8adf..0000000
--- a/lib/libc/i386/syscalls/sendto.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sendto)
diff --git a/lib/libc/i386/syscalls/setaudit.S b/lib/libc/i386/syscalls/setaudit.S
deleted file mode 100644
index 75d0aa6..0000000
--- a/lib/libc/i386/syscalls/setaudit.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setaudit)
diff --git a/lib/libc/i386/syscalls/setaudit_addr.S b/lib/libc/i386/syscalls/setaudit_addr.S
deleted file mode 100644
index 405ce98..0000000
--- a/lib/libc/i386/syscalls/setaudit_addr.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setaudit_addr)
diff --git a/lib/libc/i386/syscalls/setauid.S b/lib/libc/i386/syscalls/setauid.S
deleted file mode 100644
index c28de3a..0000000
--- a/lib/libc/i386/syscalls/setauid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setauid)
diff --git a/lib/libc/i386/syscalls/setcontext.S b/lib/libc/i386/syscalls/setcontext.S
deleted file mode 100644
index 2022220..0000000
--- a/lib/libc/i386/syscalls/setcontext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setcontext)
diff --git a/lib/libc/i386/syscalls/setegid.S b/lib/libc/i386/syscalls/setegid.S
deleted file mode 100644
index 530b1aa..0000000
--- a/lib/libc/i386/syscalls/setegid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setegid)
diff --git a/lib/libc/i386/syscalls/seteuid.S b/lib/libc/i386/syscalls/seteuid.S
deleted file mode 100644
index c8d84ac..0000000
--- a/lib/libc/i386/syscalls/seteuid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(seteuid)
diff --git a/lib/libc/i386/syscalls/setgid.S b/lib/libc/i386/syscalls/setgid.S
deleted file mode 100644
index e9ed7b7..0000000
--- a/lib/libc/i386/syscalls/setgid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setgid)
diff --git a/lib/libc/i386/syscalls/setgroups.S b/lib/libc/i386/syscalls/setgroups.S
deleted file mode 100644
index 3798ba8..0000000
--- a/lib/libc/i386/syscalls/setgroups.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setgroups)
diff --git a/lib/libc/i386/syscalls/setitimer.S b/lib/libc/i386/syscalls/setitimer.S
deleted file mode 100644
index a0b7d98..0000000
--- a/lib/libc/i386/syscalls/setitimer.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setitimer)
diff --git a/lib/libc/i386/syscalls/setpgid.S b/lib/libc/i386/syscalls/setpgid.S
deleted file mode 100644
index b41eba6..0000000
--- a/lib/libc/i386/syscalls/setpgid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setpgid)
diff --git a/lib/libc/i386/syscalls/setpriority.S b/lib/libc/i386/syscalls/setpriority.S
deleted file mode 100644
index eba15c8..0000000
--- a/lib/libc/i386/syscalls/setpriority.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setpriority)
diff --git a/lib/libc/i386/syscalls/setregid.S b/lib/libc/i386/syscalls/setregid.S
deleted file mode 100644
index 2cddae3..0000000
--- a/lib/libc/i386/syscalls/setregid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setregid)
diff --git a/lib/libc/i386/syscalls/setresgid.S b/lib/libc/i386/syscalls/setresgid.S
deleted file mode 100644
index 451425c..0000000
--- a/lib/libc/i386/syscalls/setresgid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setresgid)
diff --git a/lib/libc/i386/syscalls/setresuid.S b/lib/libc/i386/syscalls/setresuid.S
deleted file mode 100644
index cc1ce37..0000000
--- a/lib/libc/i386/syscalls/setresuid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setresuid)
diff --git a/lib/libc/i386/syscalls/setreuid.S b/lib/libc/i386/syscalls/setreuid.S
deleted file mode 100644
index cd771fc..0000000
--- a/lib/libc/i386/syscalls/setreuid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setreuid)
diff --git a/lib/libc/i386/syscalls/setrlimit.S b/lib/libc/i386/syscalls/setrlimit.S
deleted file mode 100644
index 3ee8676..0000000
--- a/lib/libc/i386/syscalls/setrlimit.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setrlimit)
diff --git a/lib/libc/i386/syscalls/setsid.S b/lib/libc/i386/syscalls/setsid.S
deleted file mode 100644
index fe21202..0000000
--- a/lib/libc/i386/syscalls/setsid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setsid)
diff --git a/lib/libc/i386/syscalls/setsockopt.S b/lib/libc/i386/syscalls/setsockopt.S
deleted file mode 100644
index 656b302..0000000
--- a/lib/libc/i386/syscalls/setsockopt.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setsockopt)
diff --git a/lib/libc/i386/syscalls/settimeofday.S b/lib/libc/i386/syscalls/settimeofday.S
deleted file mode 100644
index 6f298c2..0000000
--- a/lib/libc/i386/syscalls/settimeofday.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(settimeofday)
diff --git a/lib/libc/i386/syscalls/setuid.S b/lib/libc/i386/syscalls/setuid.S
deleted file mode 100644
index 71cf5a9..0000000
--- a/lib/libc/i386/syscalls/setuid.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(setuid)
diff --git a/lib/libc/i386/syscalls/shmat.S b/lib/libc/i386/syscalls/shmat.S
deleted file mode 100644
index 2b6383f..0000000
--- a/lib/libc/i386/syscalls/shmat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(shmat)
diff --git a/lib/libc/i386/syscalls/shmctl.S b/lib/libc/i386/syscalls/shmctl.S
deleted file mode 100644
index 8d15408..0000000
--- a/lib/libc/i386/syscalls/shmctl.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(shmctl)
diff --git a/lib/libc/i386/syscalls/shmdt.S b/lib/libc/i386/syscalls/shmdt.S
deleted file mode 100644
index 25473d5..0000000
--- a/lib/libc/i386/syscalls/shmdt.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(shmdt)
diff --git a/lib/libc/i386/syscalls/shmget.S b/lib/libc/i386/syscalls/shmget.S
deleted file mode 100644
index 14efc3a..0000000
--- a/lib/libc/i386/syscalls/shmget.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(shmget)
diff --git a/lib/libc/i386/syscalls/shmsys.S b/lib/libc/i386/syscalls/shmsys.S
deleted file mode 100644
index 0874914..0000000
--- a/lib/libc/i386/syscalls/shmsys.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(shmsys)
diff --git a/lib/libc/i386/syscalls/shutdown.S b/lib/libc/i386/syscalls/shutdown.S
deleted file mode 100644
index 2b92fae..0000000
--- a/lib/libc/i386/syscalls/shutdown.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(shutdown)
diff --git a/lib/libc/i386/syscalls/sigaction.S b/lib/libc/i386/syscalls/sigaction.S
deleted file mode 100644
index 7ce1841..0000000
--- a/lib/libc/i386/syscalls/sigaction.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sigaction)
diff --git a/lib/libc/i386/syscalls/sigaltstack.S b/lib/libc/i386/syscalls/sigaltstack.S
deleted file mode 100644
index b711230..0000000
--- a/lib/libc/i386/syscalls/sigaltstack.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sigaltstack)
diff --git a/lib/libc/i386/syscalls/sigpending.S b/lib/libc/i386/syscalls/sigpending.S
deleted file mode 100644
index e872beb..0000000
--- a/lib/libc/i386/syscalls/sigpending.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sigpending)
diff --git a/lib/libc/i386/syscalls/sigprocmask.S b/lib/libc/i386/syscalls/sigprocmask.S
deleted file mode 100644
index 2af68f9..0000000
--- a/lib/libc/i386/syscalls/sigprocmask.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sigprocmask)
diff --git a/lib/libc/i386/syscalls/sigsuspend.S b/lib/libc/i386/syscalls/sigsuspend.S
deleted file mode 100644
index 1198cb9..0000000
--- a/lib/libc/i386/syscalls/sigsuspend.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sigsuspend)
diff --git a/lib/libc/i386/syscalls/sigtimedwait.S b/lib/libc/i386/syscalls/sigtimedwait.S
deleted file mode 100644
index 1e99891..0000000
--- a/lib/libc/i386/syscalls/sigtimedwait.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sigtimedwait)
diff --git a/lib/libc/i386/syscalls/sigwait.S b/lib/libc/i386/syscalls/sigwait.S
deleted file mode 100644
index 4fe35d9..0000000
--- a/lib/libc/i386/syscalls/sigwait.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sigwait)
diff --git a/lib/libc/i386/syscalls/sigwaitinfo.S b/lib/libc/i386/syscalls/sigwaitinfo.S
deleted file mode 100644
index fd69b8b..0000000
--- a/lib/libc/i386/syscalls/sigwaitinfo.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sigwaitinfo)
diff --git a/lib/libc/i386/syscalls/socket.S b/lib/libc/i386/syscalls/socket.S
deleted file mode 100644
index 1444bb9..0000000
--- a/lib/libc/i386/syscalls/socket.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(socket)
diff --git a/lib/libc/i386/syscalls/socketpair.S b/lib/libc/i386/syscalls/socketpair.S
deleted file mode 100644
index 3c2bac1..0000000
--- a/lib/libc/i386/syscalls/socketpair.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(socketpair)
diff --git a/lib/libc/i386/syscalls/stat.S b/lib/libc/i386/syscalls/stat.S
deleted file mode 100644
index 319844f..0000000
--- a/lib/libc/i386/syscalls/stat.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(stat)
diff --git a/lib/libc/i386/syscalls/statfs.S b/lib/libc/i386/syscalls/statfs.S
deleted file mode 100644
index 1d75077..0000000
--- a/lib/libc/i386/syscalls/statfs.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(statfs)
diff --git a/lib/libc/i386/syscalls/swapcontext.S b/lib/libc/i386/syscalls/swapcontext.S
deleted file mode 100644
index dc3aa02..0000000
--- a/lib/libc/i386/syscalls/swapcontext.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(swapcontext)
diff --git a/lib/libc/i386/syscalls/swapoff.S b/lib/libc/i386/syscalls/swapoff.S
deleted file mode 100644
index beee1fe..0000000
--- a/lib/libc/i386/syscalls/swapoff.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(swapoff)
diff --git a/lib/libc/i386/syscalls/swapon.S b/lib/libc/i386/syscalls/swapon.S
deleted file mode 100644
index 07859da..0000000
--- a/lib/libc/i386/syscalls/swapon.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(swapon)
diff --git a/lib/libc/i386/syscalls/symlink.S b/lib/libc/i386/syscalls/symlink.S
deleted file mode 100644
index 792fa4b..0000000
--- a/lib/libc/i386/syscalls/symlink.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(symlink)
diff --git a/lib/libc/i386/syscalls/sync.S b/lib/libc/i386/syscalls/sync.S
deleted file mode 100644
index fb64a13..0000000
--- a/lib/libc/i386/syscalls/sync.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sync)
diff --git a/lib/libc/i386/syscalls/sysarch.S b/lib/libc/i386/syscalls/sysarch.S
deleted file mode 100644
index 9ffd321..0000000
--- a/lib/libc/i386/syscalls/sysarch.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(sysarch)
diff --git a/lib/libc/i386/syscalls/thr_create.S b/lib/libc/i386/syscalls/thr_create.S
deleted file mode 100644
index 3383958..0000000
--- a/lib/libc/i386/syscalls/thr_create.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(thr_create)
diff --git a/lib/libc/i386/syscalls/thr_exit.S b/lib/libc/i386/syscalls/thr_exit.S
deleted file mode 100644
index b6cf3f9..0000000
--- a/lib/libc/i386/syscalls/thr_exit.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(thr_exit)
diff --git a/lib/libc/i386/syscalls/thr_kill.S b/lib/libc/i386/syscalls/thr_kill.S
deleted file mode 100644
index 79fb078..0000000
--- a/lib/libc/i386/syscalls/thr_kill.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(thr_kill)
diff --git a/lib/libc/i386/syscalls/thr_new.S b/lib/libc/i386/syscalls/thr_new.S
deleted file mode 100644
index ec67103..0000000
--- a/lib/libc/i386/syscalls/thr_new.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(thr_new)
diff --git a/lib/libc/i386/syscalls/thr_self.S b/lib/libc/i386/syscalls/thr_self.S
deleted file mode 100644
index f6979ab..0000000
--- a/lib/libc/i386/syscalls/thr_self.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(thr_self)
diff --git a/lib/libc/i386/syscalls/thr_suspend.S b/lib/libc/i386/syscalls/thr_suspend.S
deleted file mode 100644
index c41953e..0000000
--- a/lib/libc/i386/syscalls/thr_suspend.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(thr_suspend)
diff --git a/lib/libc/i386/syscalls/thr_wake.S b/lib/libc/i386/syscalls/thr_wake.S
deleted file mode 100644
index 49563cf..0000000
--- a/lib/libc/i386/syscalls/thr_wake.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(thr_wake)
diff --git a/lib/libc/i386/syscalls/umask.S b/lib/libc/i386/syscalls/umask.S
deleted file mode 100644
index 28232c3..0000000
--- a/lib/libc/i386/syscalls/umask.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(umask)
diff --git a/lib/libc/i386/syscalls/undelete.S b/lib/libc/i386/syscalls/undelete.S
deleted file mode 100644
index ddd700c..0000000
--- a/lib/libc/i386/syscalls/undelete.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(undelete)
diff --git a/lib/libc/i386/syscalls/unlink.S b/lib/libc/i386/syscalls/unlink.S
deleted file mode 100644
index 3ae339f..0000000
--- a/lib/libc/i386/syscalls/unlink.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(unlink)
diff --git a/lib/libc/i386/syscalls/unmount.S b/lib/libc/i386/syscalls/unmount.S
deleted file mode 100644
index 16f92a6..0000000
--- a/lib/libc/i386/syscalls/unmount.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(unmount)
diff --git a/lib/libc/i386/syscalls/utimes.S b/lib/libc/i386/syscalls/utimes.S
deleted file mode 100644
index 516bd9d..0000000
--- a/lib/libc/i386/syscalls/utimes.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(utimes)
diff --git a/lib/libc/i386/syscalls/utrace.S b/lib/libc/i386/syscalls/utrace.S
deleted file mode 100644
index 04f63ab..0000000
--- a/lib/libc/i386/syscalls/utrace.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(utrace)
diff --git a/lib/libc/i386/syscalls/uuidgen.S b/lib/libc/i386/syscalls/uuidgen.S
deleted file mode 100644
index 76cac75..0000000
--- a/lib/libc/i386/syscalls/uuidgen.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(uuidgen)
diff --git a/lib/libc/i386/syscalls/vadvise.S b/lib/libc/i386/syscalls/vadvise.S
deleted file mode 100644
index 9c01914..0000000
--- a/lib/libc/i386/syscalls/vadvise.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(vadvise)
diff --git a/lib/libc/i386/syscalls/wait4.S b/lib/libc/i386/syscalls/wait4.S
deleted file mode 100644
index 8966372..0000000
--- a/lib/libc/i386/syscalls/wait4.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(wait4)
diff --git a/lib/libc/i386/syscalls/write.S b/lib/libc/i386/syscalls/write.S
deleted file mode 100644
index edc3e73..0000000
--- a/lib/libc/i386/syscalls/write.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(write)
diff --git a/lib/libc/i386/syscalls/writev.S b/lib/libc/i386/syscalls/writev.S
deleted file mode 100644
index 7c80c3a..0000000
--- a/lib/libc/i386/syscalls/writev.S
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "SYS.h"
-RSYSCALL(writev)
diff --git a/lib/libc/include/fpmath.h b/lib/libc/include/fpmath.h
deleted file mode 100644
index 88f0e38..0000000
--- a/lib/libc/include/fpmath.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2002 David Schultz <das@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.
- *
- * 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.
- *
- */
-
-#include <sys/endian.h>
-#include "_fpmath.h"
-
-union IEEEf2bits {
-	float	f;
-	struct {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-		unsigned int	man	:23;
-		unsigned int	exp	:8;
-		unsigned int	sign	:1;
-#else /* _BIG_ENDIAN */
-		unsigned int	sign	:1;
-		unsigned int	exp	:8;
-		unsigned int	man	:23;
-#endif
-	} bits;
-};
-
-#define	DBL_MANH_SIZE	20
-#define	DBL_MANL_SIZE	32
-
-union IEEEd2bits {
-	double	d;
-	struct {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-		unsigned int	manl	:32;
-		unsigned int	manh	:20;
-		unsigned int	exp	:11;
-		unsigned int	sign	:1;
-#else /* _BIG_ENDIAN */
-		unsigned int	sign	:1;
-		unsigned int	exp	:11;
-		unsigned int	manh	:20;
-		unsigned int	manl	:32;
-#endif
-	} bits;
-};
diff --git a/lib/libc/include/isc/eventlib.h b/lib/libc/include/isc/eventlib.h
deleted file mode 100644
index 49ba4b3..0000000
--- a/lib/libc/include/isc/eventlib.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* eventlib.h - exported interfaces for eventlib
- * vix 09sep95 [initial]
- *
- * $Id: eventlib.h 89 2016-01-12 00:20:40Z reddawg $
- * $FreeBSD: src/lib/libc/include/isc/eventlib.h,v 1.1.1.1.2.1 2006/07/17 10:09:55 ume Exp $
- */
-
-#ifndef _EVENTLIB_H
-#define _EVENTLIB_H
-
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/time.h>
-#include <stdio.h>
-
-#ifndef __P
-# define __EVENTLIB_P_DEFINED
-# ifdef __STDC__
-#  define __P(x) x
-# else
-#  define __P(x) ()
-# endif
-#endif
-
-/* In the absence of branded types... */
-typedef struct { void *opaque; } evConnID;
-typedef struct { void *opaque; } evFileID;
-typedef struct { void *opaque; } evStreamID;
-typedef struct { void *opaque; } evTimerID;
-typedef struct { void *opaque; } evWaitID;
-typedef struct { void *opaque; } evContext;
-typedef struct { void *opaque; } evEvent;
-
-#define	evInitID(id) ((id)->opaque = NULL)
-#define	evTestID(id) ((id).opaque != NULL)
-
-typedef void (*evConnFunc)__P((evContext, void *, int, const void *, int,
-			       const void *, int));
-typedef void (*evFileFunc)__P((evContext, void *, int, int));
-typedef	void (*evStreamFunc)__P((evContext, void *, int, int));
-typedef void (*evTimerFunc)__P((evContext, void *,
-				struct timespec, struct timespec));
-typedef	void (*evWaitFunc)__P((evContext, void *, const void *));
-
-typedef	struct { unsigned char mask[256/8]; } evByteMask;
-#define	EV_BYTEMASK_BYTE(b) ((b) / 8)
-#define	EV_BYTEMASK_MASK(b) (1 << ((b) % 8))
-#define	EV_BYTEMASK_SET(bm, b) \
-	((bm).mask[EV_BYTEMASK_BYTE(b)] |= EV_BYTEMASK_MASK(b))
-#define	EV_BYTEMASK_CLR(bm, b) \
-	((bm).mask[EV_BYTEMASK_BYTE(b)] &= ~EV_BYTEMASK_MASK(b))
-#define	EV_BYTEMASK_TST(bm, b) \
-	((bm).mask[EV_BYTEMASK_BYTE(b)] & EV_BYTEMASK_MASK(b))
-
-#define	EV_POLL		1
-#define	EV_WAIT		2
-#define	EV_NULL		4
-
-#define	EV_READ		1
-#define	EV_WRITE	2
-#define	EV_EXCEPT	4
-
-#define EV_WASNONBLOCKING 8	/* Internal library use. */
-
-/* eventlib.c */
-#define evCreate	__evCreate
-#define evSetDebug	__evSetDebug
-#define evDestroy	__evDestroy
-#define evGetNext	__evGetNext
-#define evDispatch	__evDispatch
-#define evDrop		__evDrop
-#define evMainLoop	__evMainLoop
-#define evHighestFD	__evHighestFD
-#define evGetOption	__evGetOption
-#define evSetOption	__evSetOption
-
-int  evCreate __P((evContext *));
-void evSetDebug __P((evContext, int, FILE *));
-int  evDestroy __P((evContext));
-int  evGetNext __P((evContext, evEvent *, int));
-int  evDispatch __P((evContext, evEvent));
-void evDrop __P((evContext, evEvent));
-int  evMainLoop __P((evContext));
-int  evHighestFD __P((evContext));
-int  evGetOption __P((evContext *, const char *, int *));
-int  evSetOption __P((evContext *, const char *, int));
-
-/* ev_connects.c */
-#define evListen	__evListen
-#define evConnect	__evConnect
-#define evCancelConn	__evCancelConn
-#define evHold		__evHold
-#define evUnhold	__evUnhold
-#define evTryAccept	__evTryAccept
-
-int evListen __P((evContext, int, int, evConnFunc, void *, evConnID *));
-int evConnect __P((evContext, int, const void *, int,
-		   evConnFunc, void *, evConnID *));
-int evCancelConn __P((evContext, evConnID));
-int evHold __P((evContext, evConnID));
-int evUnhold __P((evContext, evConnID));
-int evTryAccept __P((evContext, evConnID, int *));
-
-/* ev_files.c */
-#define evSelectFD	__evSelectFD
-#define evDeselectFD	__evDeselectFD
-
-int evSelectFD __P((evContext, int, int, evFileFunc, void *, evFileID *));
-int evDeselectFD __P((evContext, evFileID));
-
-/* ev_streams.c */
-#define evConsIovec	__evConsIovec
-#define evWrite		__evWrite
-#define evRead		__evRead
-#define evTimeRW	__evTimeRW
-#define evUntimeRW	__evUntimeRW
-#define	evCancelRW	__evCancelRW
-
-struct iovec evConsIovec __P((void *, size_t));
-int evWrite __P((evContext, int, const struct iovec *, int,
-		 evStreamFunc func, void *, evStreamID *));
-int evRead __P((evContext, int, const struct iovec *, int,
-		evStreamFunc func, void *, evStreamID *));
-int evTimeRW __P((evContext, evStreamID, evTimerID timer));
-int evUntimeRW __P((evContext, evStreamID));
-int evCancelRW __P((evContext, evStreamID));
-
-/* ev_timers.c */
-#define evConsTime	__evConsTime
-#define evAddTime	__evAddTime
-#define evSubTime	__evSubTime
-#define evCmpTime	__evCmpTime
-#define	evTimeSpec	__evTimeSpec
-#define	evTimeVal	__evTimeVal
-
-#define evNowTime		__evNowTime
-#define evUTCTime		__evUTCTime
-#define evLastEventTime		__evLastEventTime
-#define evSetTimer		__evSetTimer
-#define evClearTimer		__evClearTimer
-#define evConfigTimer		__evConfigTimer
-#define evResetTimer		__evResetTimer
-#define evSetIdleTimer		__evSetIdleTimer
-#define evClearIdleTimer	__evClearIdleTimer
-#define evResetIdleTimer	__evResetIdleTimer
-#define evTouchIdleTimer	__evTouchIdleTimer
-
-struct timespec evConsTime __P((time_t sec, long nsec));
-struct timespec evAddTime __P((struct timespec, struct timespec));
-struct timespec evSubTime __P((struct timespec, struct timespec));
-struct timespec evNowTime __P((void));
-struct timespec evUTCTime __P((void));
-struct timespec evLastEventTime __P((evContext));
-struct timespec evTimeSpec __P((struct timeval));
-struct timeval evTimeVal __P((struct timespec));
-int evCmpTime __P((struct timespec, struct timespec));
-int evSetTimer __P((evContext, evTimerFunc, void *, struct timespec,
-		    struct timespec, evTimerID *));
-int evClearTimer __P((evContext, evTimerID));
-int evConfigTimer __P((evContext, evTimerID, const char *param,
-		      int value));
-int evResetTimer __P((evContext, evTimerID, evTimerFunc, void *,
-		      struct timespec, struct timespec));
-int evSetIdleTimer __P((evContext, evTimerFunc, void *, struct timespec,
-			evTimerID *));
-int evClearIdleTimer __P((evContext, evTimerID));
-int evResetIdleTimer __P((evContext, evTimerID, evTimerFunc, void *,
-			  struct timespec));
-int evTouchIdleTimer __P((evContext, evTimerID));
-
-/* ev_waits.c */
-#define evWaitFor	__evWaitFor
-#define evDo		__evDo
-#define evUnwait	__evUnwait
-#define evDefer		__evDefer
-
-int evWaitFor __P((evContext, const void *, evWaitFunc, void *, evWaitID *));
-int evDo __P((evContext, const void *));
-int evUnwait __P((evContext, evWaitID));
-int evDefer __P((evContext, evWaitFunc, void *));
-
-#ifdef __EVENTLIB_P_DEFINED
-# undef __P
-#endif
-
-#endif /*_EVENTLIB_H*/
diff --git a/lib/libc/include/libc_private.h b/lib/libc/include/libc_private.h
deleted file mode 100644
index 6513a69..0000000
--- a/lib/libc/include/libc_private.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- *
- *
- * Private definitions for libc, libc_r and libpthread.
- *
- */
-
-#ifndef _LIBC_PRIVATE_H_
-#define _LIBC_PRIVATE_H_
-
-/*
- * This global flag is non-zero when a process has created one
- * or more threads. It is used to avoid calling locking functions
- * when they are not required.
- */
-extern int	__isthreaded;
-
-/*
- * File lock contention is difficult to diagnose without knowing
- * where locks were set. Allow a debug library to be built which
- * records the source file and line number of each lock call.
- */
-#ifdef	_FLOCK_DEBUG
-#define _FLOCKFILE(x)	_flockfile_debug(x, __FILE__, __LINE__)
-#else
-#define _FLOCKFILE(x)	_flockfile(x)
-#endif
-
-/*
- * Macros for locking and unlocking FILEs. These test if the
- * process is threaded to avoid locking when not required.
- */
-#define	FLOCKFILE(fp)		if (__isthreaded) _FLOCKFILE(fp)
-#define	FUNLOCKFILE(fp)		if (__isthreaded) _funlockfile(fp)
-
-/*
- * Indexes into the pthread jump table.
- *
- * Warning! If you change this type, you must also change the threads
- * libraries that reference it (libc_r, libpthread).
- */
-typedef enum {
-	PJT_COND_BROADCAST,
-	PJT_COND_DESTROY,
-	PJT_COND_INIT,
-	PJT_COND_SIGNAL,
-	PJT_COND_WAIT,
-	PJT_GETSPECIFIC,
-	PJT_KEY_CREATE,
-	PJT_KEY_DELETE,
-	PJT_MAIN_NP,
-	PJT_MUTEX_DESTROY,
-	PJT_MUTEX_INIT,
-	PJT_MUTEX_LOCK,
-	PJT_MUTEX_TRYLOCK,
-	PJT_MUTEX_UNLOCK,
-	PJT_MUTEXATTR_DESTROY,
-	PJT_MUTEXATTR_INIT,
-	PJT_MUTEXATTR_SETTYPE,
-	PJT_ONCE,
-	PJT_RWLOCK_DESTROY,
-	PJT_RWLOCK_INIT,
-	PJT_RWLOCK_RDLOCK,
-	PJT_RWLOCK_TRYRDLOCK,
-	PJT_RWLOCK_TRYWRLOCK,
-	PJT_RWLOCK_UNLOCK,
-	PJT_RWLOCK_WRLOCK,
-	PJT_SELF,
-	PJT_SETSPECIFIC,
-	PJT_SIGMASK,
-	PJT_MAX
-} pjt_index_t;
-
-typedef int (*pthread_func_t)(void);
-typedef pthread_func_t pthread_func_entry_t[2];
-
-extern pthread_func_entry_t __thr_jtable[];
-
-/*
- * yplib internal interfaces
- */
-#ifdef YP
-int _yp_check(char **);
-#endif
-
-/*
- * Initialise TLS for static programs
- */
-void _init_tls(void);
-
-/*
- * Set the TLS thread pointer
- */
-void _set_tp(void *tp);
-
-/*
- * This is a pointer in the C run-time startup code. It is used
- * by getprogname() and setprogname().
- */
-extern const char *__progname;
-
-/*
- * This is the lock to make malloc() thread-safe.  It is externalized
- * so that thread libraries can protect malloc across fork().
- */
-extern struct _spinlock *__malloc_lock;
-
-#endif /* _LIBC_PRIVATE_H_ */
diff --git a/lib/libc/include/namespace.h b/lib/libc/include/namespace.h
deleted file mode 100644
index 7ce00b0..0000000
--- a/lib/libc/include/namespace.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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.
- *
- * 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 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.
- *
- */
-
-#ifndef _NAMESPACE_H_
-#define _NAMESPACE_H_
-
-/*
- * Adjust names so that headers declare "hidden" names.
- *
- * README: When modifying this file don't forget to make the appropriate
- *         changes in un-namespace.h!!!
- */
-
-/*
- * ISO C (C90) section.  Most names in libc aren't in ISO C, so they
- * should be here.  Most aren't here...
- */
-#define		err				_err
-#define		warn				_warn
-#define		nsdispatch			_nsdispatch
-
-/*
- * Prototypes for syscalls/functions that need to be overridden
- * in libc_r/libpthread.
- */
-#define		accept				_accept
-#define		__acl_aclcheck_fd		___acl_aclcheck_fd
-#define		__acl_delete_fd			___acl_delete_fd
-#define		__acl_get_fd			___acl_get_fd
-#define		__acl_set_fd			___acl_set_fd
-#define		bind				_bind
-#define		__cap_get_fd			___cap_get_fd
-#define		__cap_set_fd			___cap_set_fd
-#define		close				_close
-#define		connect				_connect
-#define		dup				_dup
-#define		dup2				_dup2
-#define		execve				_execve
-#define		fcntl				_fcntl
-/*#define		flock				_flock */
-#define		flockfile			_flockfile
-#define		fpathconf			_fpathconf
-#define		fstat				_fstat
-#define		fstatfs				_fstatfs
-#define		fsync				_fsync
-#define		funlockfile			_funlockfile
-#define		getdirentries			_getdirentries
-#define		getlogin			_getlogin
-#define		getpeername			_getpeername
-#define		getprogname			_getprogname
-#define		getsockname			_getsockname
-#define		getsockopt			_getsockopt
-#define		ioctl				_ioctl
-/* #define		kevent				_kevent */
-#define		listen				_listen
-#define		nanosleep			_nanosleep
-#define		open				_open
-#define		poll				_poll
-#define		pthread_cond_broadcast		_pthread_cond_broadcast
-#define		pthread_cond_destroy		_pthread_cond_destroy
-#define		pthread_cond_init		_pthread_cond_init
-#define		pthread_cond_signal		_pthread_cond_signal
-#define		pthread_cond_timedwait		_pthread_cond_timedwait
-#define		pthread_cond_wait		_pthread_cond_wait
-#define		pthread_exit			_pthread_exit
-#define		pthread_getspecific		_pthread_getspecific
-#define		pthread_key_create		_pthread_key_create
-#define		pthread_key_delete		_pthread_key_delete
-#define		pthread_main_np			_pthread_main_np
-#define		pthread_mutex_destroy		_pthread_mutex_destroy
-#define		pthread_mutex_init		_pthread_mutex_init
-#define		pthread_mutex_lock		_pthread_mutex_lock
-#define		pthread_mutex_trylock		_pthread_mutex_trylock
-#define		pthread_mutex_unlock		_pthread_mutex_unlock
-#define		pthread_mutexattr_destroy	_pthread_mutexattr_destroy
-#define		pthread_mutexattr_init		_pthread_mutexattr_init
-#define		pthread_mutexattr_settype	_pthread_mutexattr_settype
-#define		pthread_once			_pthread_once
-#define		pthread_rwlock_destroy		_pthread_rwlock_destroy
-#define		pthread_rwlock_init		_pthread_rwlock_init
-#define		pthread_rwlock_rdlock		_pthread_rwlock_rdlock
-#define		pthread_rwlock_wrlock		_pthread_rwlock_wrlock
-#define		pthread_rwlock_tryrdlock	_pthread_rwlock_tryrdlock
-#define		pthread_rwlock_trywrlock	_pthread_rwlock_trywrlock
-#define		pthread_rwlock_unlock		_pthread_rwlock_unlock
-#define		pthread_self			_pthread_self
-#define		pthread_setspecific		_pthread_setspecific
-#define		pthread_sigmask			_pthread_sigmask
-#define		read				_read
-#define		readv				_readv
-#define		recvfrom			_recvfrom
-#define		recvmsg				_recvmsg
-#define		select				_select
-#define		sendmsg				_sendmsg
-#define		sendto				_sendto
-#define		setsockopt			_setsockopt
-/*#define		sigaction			_sigaction*/
-#define		sigprocmask			_sigprocmask
-#define		sigsuspend			_sigsuspend
-#define		socket				_socket
-#define		socketpair			_socketpair
-#define		usleep				_usleep
-#define		wait4				_wait4
-#define		waitpid				_waitpid
-#define		write				_write
-#define		writev				_writev
-
-
-/*
- * Other hidden syscalls/functions that libc_r needs to override
- * but are not used internally by libc.
- *
- * XXX - When modifying libc to use one of the following, remove
- * the prototype from below and place it in the list above.
- */
-#if 0
-#define		creat				_creat
-#define		fchflags			_fchflags
-#define		fchmod				_fchmod
-#define		ftrylockfile			_ftrylockfile
-#define		msync				_msync
-#define		nfssvc				_nfssvc
-#define		pause				_pause
-#define		pthread_rwlockattr_init		_pthread_rwlockattr_init
-#define		pthread_rwlockattr_destroy	_pthread_rwlockattr_destroy
-#define		sched_yield			_sched_yield
-#define		sendfile			_sendfile
-#define		shutdown			_shutdown
-#define		sigaltstack			_sigaltstack
-#define		sigpending			_sigpending
-#define		sigreturn			_sigreturn
-#define		sigsetmask			_sigsetmask
-#define		sleep				_sleep
-#define		system				_system
-#define		tcdrain				_tcdrain
-#define		wait				_wait
-#endif
-
-#endif /* _NAMESPACE_H_ */
diff --git a/lib/libc/include/nss_tls.h b/lib/libc/include/nss_tls.h
deleted file mode 100644
index 58ea2e1..0000000
--- a/lib/libc/include/nss_tls.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- *
- *
- * Macros which generate thread local storage handling code in NSS modules.
- */
-#ifndef _NSS_TLS_H_
-#define _NSS_TLS_H_
-
-#define NSS_TLS_HANDLING(name)					\
-static pthread_key_t name##_state_key;				\
-static	void	 name##_keyinit(void);				\
-static	int	 name##_getstate(struct name##_state **);	\
-\
-static void								\
-name##_keyinit(void)							\
-{									\
-	(void)_pthread_key_create(&name##_state_key, name##_endstate);	\
-}									\
-\
-static int							\
-name##_getstate(struct name##_state **p)			\
-{								\
-	static struct name##_state st;				\
-	static pthread_once_t	keyinit = PTHREAD_ONCE_INIT;	\
-	int			rv;				\
-								\
-	if (!__isthreaded || _pthread_main_np() != 0) {		\
-		*p = &st;					\
-		return (0);					\
-	}							\
-	rv = _pthread_once(&keyinit, name##_keyinit);		\
-	if (rv != 0)						\
-		return (rv);					\
-	*p = _pthread_getspecific(name##_state_key);		\
-	if (*p != NULL)						\
-		return (0);					\
-	*p = calloc(1, sizeof(**p));				\
-	if (*p == NULL)						\
-		return (ENOMEM);				\
-	rv = _pthread_setspecific(name##_state_key, *p);	\
-	if (rv != 0) {						\
-		free(*p);					\
-		*p = NULL;					\
-	}							\
-	return (rv);						\
-}								\
-/* allow the macro invocation to end with a semicolon */	\
-struct _clashproof_bmVjdGFy
-
-#endif /* _NSS_TLS_H_ */
diff --git a/lib/libc/include/port_after.h b/lib/libc/include/port_after.h
deleted file mode 100644
index cf951c0..0000000
--- a/lib/libc/include/port_after.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _PORT_AFTER_H_
-#define _PORT_AFTER_H_
-
-#define HAVE_SA_LEN		1
-#define HAS_INET6_STRUCTS	1
-#define HAVE_SIN6_SCOPE_ID	1
-#define HAVE_TIME_R		1
-
-#endif /* _PORT_AFTER_H_ */
diff --git a/lib/libc/include/port_before.h b/lib/libc/include/port_before.h
deleted file mode 100644
index f5f70f0..0000000
--- a/lib/libc/include/port_before.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef _PORT_BEFORE_H_
-#define _PORT_BEFORE_H_
-
-#define _LIBC		1
-#define DO_PTHREADS	1
-#define USE_KQUEUE	1
-
-#define ISC_SOCKLEN_T	socklen_t
-#define ISC_FORMAT_PRINTF(fmt, args) \
-	__attribute__((__format__(__printf__, fmt, args)))
-#define DE_CONST(konst, var) \
-        do { \
-                union { const void *k; void *v; } _u; \
-                _u.k = konst; \
-                var = _u.v; \
-        } while (0)
-
-#define UNUSED(x) (x) = (x)
-
-#endif /* _PORT_BEFORE_H_ */
diff --git a/lib/libc/include/reentrant.h b/lib/libc/include/reentrant.h
deleted file mode 100644
index d3a27c8..0000000
--- a/lib/libc/include/reentrant.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*-
- * Copyright (c) 1997,98 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- */
-
-/*
- * Requirements:
- * 
- * 1. The thread safe mechanism should be lightweight so the library can
- *    be used by non-threaded applications without unreasonable overhead.
- * 
- * 2. There should be no dependency on a thread engine for non-threaded
- *    applications.
- * 
- * 3. There should be no dependency on any particular thread engine.
- * 
- * 4. The library should be able to be compiled without support for thread
- *    safety.
- * 
- * 
- * Rationale:
- * 
- * One approach for thread safety is to provide discrete versions of the
- * library: one thread safe, the other not.  The disadvantage of this is
- * that libc is rather large, and two copies of a library which are 99%+
- * identical is not an efficent use of resources.
- * 
- * Another approach is to provide a single thread safe library.  However,
- * it should not add significant run time or code size overhead to non-
- * threaded applications.
- * 
- * Since the NetBSD C library is used in other projects, it should be
- * easy to replace the mutual exclusion primitives with ones provided by
- * another system.  Similarly, it should also be easy to remove all
- * support for thread safety completely if the target environment does
- * not support threads.
- * 
- * 
- * Implementation Details:
- * 
- * The mutex primitives used by the library (mutex_t, mutex_lock, etc.)
- * are macros which expand to the cooresponding primitives provided by
- * the thread engine or to nothing.  The latter is used so that code is
- * not unreasonably cluttered with #ifdefs when all thread safe support
- * is removed.
- * 
- * The mutex macros can be directly mapped to the mutex primitives from
- * pthreads, however it should be reasonably easy to wrap another mutex
- * implementation so it presents a similar interface.
- * 
- * Stub implementations of the mutex functions are provided with *weak*
- * linkage.  These functions simply return success.  When linked with a
- * thread library (i.e. -lpthread), the functions will override the
- * stubs.
- */
-
-#include <pthread.h>
-#include <pthread_np.h>
-#include "libc_private.h"
-
-#define mutex_t			pthread_mutex_t
-#define cond_t			pthread_cond_t
-#define rwlock_t		pthread_rwlock_t
-#define once_t			pthread_once_t
-
-#define thread_key_t		pthread_key_t
-#define MUTEX_INITIALIZER	PTHREAD_MUTEX_INITIALIZER
-#define RWLOCK_INITIALIZER	PTHREAD_RWLOCK_INITIALIZER
-#define ONCE_INITIALIZER	PTHREAD_ONCE_INIT
-
-#define mutex_init(m, a)	_pthread_mutex_init(m, a)
-#define mutex_lock(m)		if (__isthreaded) \
-				_pthread_mutex_lock(m)
-#define mutex_unlock(m)		if (__isthreaded) \
-				_pthread_mutex_unlock(m)
-#define mutex_trylock(m)	(__isthreaded ? 0 : _pthread_mutex_trylock(m))
-
-#define cond_init(c, a, p)	_pthread_cond_init(c, a)
-#define cond_signal(m)		if (__isthreaded) \
-				_pthread_cond_signal(m)
-#define cond_broadcast(m)	if (__isthreaded) \
-				_pthread_cond_broadcast(m)
-#define cond_wait(c, m)		if (__isthreaded) \
-				_pthread_cond_wait(c, m)
-
-#define rwlock_init(l, a)	_pthread_rwlock_init(l, a)
-#define rwlock_rdlock(l)	if (__isthreaded) \
-				_pthread_rwlock_rdlock(l)
-#define rwlock_wrlock(l)	if (__isthreaded) \
-				_pthread_rwlock_wrlock(l)
-#define rwlock_unlock(l)	if (__isthreaded) \
-				_pthread_rwlock_unlock(l)
-
-#define thr_keycreate(k, d)	_pthread_key_create(k, d)
-#define thr_setspecific(k, p)	_pthread_setspecific(k, p)
-#define thr_getspecific(k)	_pthread_getspecific(k)
-#define thr_sigsetmask(f, n, o)	_pthread_sigmask(f, n, o)
-
-#define thr_once(o, i)		_pthread_once(o, i)
-#define thr_self()		_pthread_self()
-#define thr_exit(x)		_pthread_exit(x)
-#define thr_main()		_pthread_main_np()
diff --git a/lib/libc/include/resolv_mt.h b/lib/libc/include/resolv_mt.h
deleted file mode 100644
index 27963a1..0000000
--- a/lib/libc/include/resolv_mt.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _RESOLV_MT_H
-#define _RESOLV_MT_H
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-/* Access functions for the libresolv private interface */
-
-int	__res_enable_mt(void);
-int	__res_disable_mt(void);
-
-/* Per-thread context */
-
-typedef struct {
-int	no_hosts_fallback_private;
-int	retry_save;
-int	retry_private;
-char	inet_nsap_ntoa_tmpbuf[255*3];
-char	sym_ntos_unname[20];
-char	sym_ntop_unname[20];
-char	p_option_nbuf[40];
-char	p_time_nbuf[40];
-char	precsize_ntoa_retbuf[sizeof "90000000.00"];
-char	loc_ntoa_tmpbuf[sizeof
-"1000 60 60.000 N 1000 60 60.000 W -12345678.00m 90000000.00m 90000000.00m 90000000.00m"];
-char	p_secstodate_output[15];
-} mtctxres_t;
-
-/* Thread-specific data (TSD) */
-
-mtctxres_t	*___mtctxres(void);
-#define mtctxres	(___mtctxres())
-
-/* Various static data that should be TSD */
-
-#define sym_ntos_unname		(mtctxres->sym_ntos_unname)
-#define sym_ntop_unname		(mtctxres->sym_ntop_unname)
-#define inet_nsap_ntoa_tmpbuf	(mtctxres->inet_nsap_ntoa_tmpbuf)
-#define p_option_nbuf		(mtctxres->p_option_nbuf)
-#define p_time_nbuf		(mtctxres->p_time_nbuf)
-#define precsize_ntoa_retbuf	(mtctxres->precsize_ntoa_retbuf)
-#define loc_ntoa_tmpbuf		(mtctxres->loc_ntoa_tmpbuf)
-#define p_secstodate_output	(mtctxres->p_secstodate_output)
-
-#endif /* _RESOLV_MT_H */
diff --git a/lib/libc/include/spinlock.h b/lib/libc/include/spinlock.h
deleted file mode 100644
index f537360..0000000
--- a/lib/libc/include/spinlock.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- *
- *
- * Lock definitions used in both libc and libpthread.
- *
- */
-
-#ifndef _SPINLOCK_H_
-#define _SPINLOCK_H_
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/*
- * Lock structure with room for debugging information.
- */
-struct _spinlock {
-	volatile long	access_lock;
-	volatile long	lock_owner;
-	volatile char	*fname;
-	volatile int	lineno;
-};
-typedef struct _spinlock spinlock_t;
-
-#define	_SPINLOCK_INITIALIZER	{ 0, 0, 0, 0 }
-
-#define _SPINUNLOCK(_lck)	_spinunlock(_lck);
-#ifdef	_LOCK_DEBUG
-#define	_SPINLOCK(_lck)		_spinlock_debug(_lck, __FILE__, __LINE__)
-#else
-#define	_SPINLOCK(_lck)		_spinlock(_lck)
-#endif
-
-/*
- * Thread function prototype definitions:
- */
-__BEGIN_DECLS
-long	_atomic_lock(volatile long *);
-void	_spinlock(spinlock_t *);
-void	_spinunlock(spinlock_t *);
-void	_spinlock_debug(spinlock_t *, char *, int);
-__END_DECLS
-
-#endif /* _SPINLOCK_H_ */
diff --git a/lib/libc/include/un-namespace.h b/lib/libc/include/un-namespace.h
deleted file mode 100644
index 8c1fca1..0000000
--- a/lib/libc/include/un-namespace.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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.
- *
- * 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 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.
- *
- */
-
-#ifndef _UN_NAMESPACE_H_
-#define _UN_NAMESPACE_H_
-
-#undef		accept
-#undef		__acl_aclcheck_fd
-#undef		__acl_delete_fd
-#undef		__acl_get_fd
-#undef		__acl_set_fd
-#undef		bind
-#undef		__cap_get_fd
-#undef		__cap_set_fd
-#undef		close
-#undef		connect
-#undef		dup
-#undef		dup2
-#undef		execve
-#undef		fcntl
-#undef		flock
-#undef		flockfile
-#undef		fpathconf
-#undef		fstat
-#undef		fstatfs
-#undef		fsync
-#undef		funlockfile
-#undef		getdirentries
-#undef		getlogin
-#undef		getpeername
-#undef		getprogname
-#undef		getsockname
-#undef		getsockopt
-#undef		ioctl
-#undef		kevent
-#undef		listen
-#undef		nanosleep
-#undef		open
-#undef		poll
-#undef		pthread_cond_broadcast
-#undef		pthread_cond_destroy
-#undef		pthread_cond_init
-#undef		pthread_cond_signal
-#undef		pthread_cond_timedwait
-#undef		pthread_cond_wait
-#undef		pthread_exit
-#undef		pthread_getspecific
-#undef		pthread_key_create
-#undef		pthread_key_delete
-#undef		pthread_main_np
-#undef		pthread_mutex_destroy
-#undef		pthread_mutex_init
-#undef		pthread_mutex_lock
-#undef		pthread_mutex_trylock
-#undef		pthread_mutex_unlock
-#undef		pthread_mutexattr_init
-#undef		pthread_mutexattr_destroy
-#undef		pthread_mutexattr_settype
-#undef		pthread_once
-#undef		pthread_rwlock_destroy
-#undef		pthread_rwlock_init
-#undef		pthread_rwlock_rdlock
-#undef		pthread_rwlock_wrlock
-#undef		pthread_rwlock_tryrdlock
-#undef		pthread_rwlock_trywrlock
-#undef		pthread_rwlock_unlock
-#undef		pthread_self
-#undef		pthread_setspecific
-#undef		pthread_sigmask
-#undef		read
-#undef		readv
-#undef		recvfrom
-#undef		recvmsg
-#undef		select
-#undef		sendmsg
-#undef		sendto
-#undef		setsockopt
-#undef		sigaction
-#undef		sigprocmask
-#undef		sigsuspend
-#undef		socket
-#undef		socketpair
-#undef		usleep
-#undef		wait4
-#undef		waitpid
-#undef		write
-#undef		writev
-
-#if 0
-#undef		creat
-#undef		fchflags
-#undef		fchmod
-#undef		ftrylockfile
-#undef		msync
-#undef		nfssvc
-#undef		pause
-#undef		pthread_rwlockattr_init
-#undef		pthread_rwlockattr_destroy
-#undef		sched_yield
-#undef		sendfile
-#undef		shutdown
-#undef		sigaltstack
-#undef		sigpending
-#undef		sigreturn
-#undef		sigsetmask
-#undef		sleep
-#undef		system
-#undef		tcdrain
-#undef		wait
-#endif	/* 0 */
-
-#ifdef _SIGNAL_H_
-int     	_sigaction(int, const struct sigaction *, struct sigaction *);
-#endif
-
-#ifdef _SYS_EVENT_H_
-int		_kevent(int, const struct kevent *, int, struct kevent *,
-		    int, const struct timespec *);
-#endif
-
-#ifdef _SYS_FCNTL_H_
-int		_flock(int, int);
-#endif
-
-#undef		err
-#undef		warn
-#undef		nsdispatch
-
-#endif	/* _UN_NAMESPACE_H_ */
diff --git a/lib/libc/inet/Makefile b/lib/libc/inet/Makefile
deleted file mode 100644
index e6be2e2..0000000
--- a/lib/libc/inet/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = inet_addr.o inet_cidr_ntop.o inet_cidr_pton.o inet_lnaof.o inet_makeaddr.o inet_net_ntop.o inet_net_pton.o inet_neta.o inet_netof.o inet_network.o inet_ntoa.o inet_ntop.o inet_pton.o nsap_addr.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/inet/inet_addr.c b/lib/libc/inet/inet_addr.c
deleted file mode 100644
index c00032d..0000000
--- a/lib/libc/inet/inet_addr.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 1983, 1990, 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static const char rcsid[] = "$Id: inet_addr.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_addr.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
-
-#include "port_after.h"
-
-/*
- * Ascii internet address interpretation routine.
- * The value returned is in network order.
- */
-in_addr_t		/* XXX should be struct in_addr :( */
-inet_addr(const char *cp) {
-	struct in_addr val;
-
-	if (inet_aton(cp, &val))
-		return (val.s_addr);
-	return (INADDR_NONE);
-}
-
-/* 
- * Check whether "cp" is a valid ascii representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
- */
-int
-inet_aton(const char *cp, struct in_addr *addr) {
-	u_long val;
-	int base, n;
-	char c;
-	u_int8_t parts[4];
-	u_int8_t *pp = parts;
-	int digit;
-
-	c = *cp;
-	for (;;) {
-		/*
-		 * Collect number up to ``.''.
-		 * Values are specified as for C:
-		 * 0x=hex, 0=octal, isdigit=decimal.
-		 */
-		if (!isdigit((unsigned char)c))
-			return (0);
-		val = 0; base = 10; digit = 0;
-		if (c == '0') {
-			c = *++cp;
-			if (c == 'x' || c == 'X')
-				base = 16, c = *++cp;
-			else {
-				base = 8;
-				digit = 1 ;
-			}
-		}
-		for (;;) {
-			if (isascii(c) && isdigit((unsigned char)c)) {
-				if (base == 8 && (c == '8' || c == '9'))
-					return (0);
-				val = (val * base) + (c - '0');
-				c = *++cp;
-				digit = 1;
-			} else if (base == 16 && isascii(c) && 
-				   isxdigit((unsigned char)c)) {
-				val = (val << 4) |
-					(c + 10 - (islower((unsigned char)c) ? 'a' : 'A'));
-				c = *++cp;
-				digit = 1;
-			} else
-				break;
-		}
-		if (c == '.') {
-			/*
-			 * Internet format:
-			 *	a.b.c.d
-			 *	a.b.c	(with c treated as 16 bits)
-			 *	a.b	(with b treated as 24 bits)
-			 */
-			if (pp >= parts + 3 || val > 0xffU)
-				return (0);
-			*pp++ = val;
-			c = *++cp;
-		} else
-			break;
-	}
-	/*
-	 * Check for trailing characters.
-	 */
-	if (c != '\0' && (!isascii(c) || !isspace((unsigned char)c)))
-		return (0);
-	/*
-	 * Did we get a valid digit?
-	 */
-	if (!digit)
-		return (0);
-	/*
-	 * Concoct the address according to
-	 * the number of parts specified.
-	 */
-	n = pp - parts + 1;
-	switch (n) {
-	case 1:				/* a -- 32 bits */
-		break;
-
-	case 2:				/* a.b -- 8.24 bits */
-		if (val > 0xffffffU)
-			return (0);
-		val |= parts[0] << 24;
-		break;
-
-	case 3:				/* a.b.c -- 8.8.16 bits */
-		if (val > 0xffffU)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16);
-		break;
-
-	case 4:				/* a.b.c.d -- 8.8.8.8 bits */
-		if (val > 0xffU)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-		break;
-	}
-	if (addr != NULL)
-		addr->s_addr = htonl(val);
-	return (1);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_addr
-__weak_reference(__inet_addr, inet_addr);
-#undef inet_aton
-__weak_reference(__inet_aton, inet_aton);
diff --git a/lib/libc/inet/inet_cidr_ntop.c b/lib/libc/inet/inet_cidr_ntop.c
deleted file mode 100644
index 7b4f065..0000000
--- a/lib/libc/inet/inet_cidr_ntop.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1998,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_ntop.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_cidr_ntop.c,v 1.1.1.1.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static char *	inet_cidr_ntop_ipv4 __P((const u_char *src, int bits,
-					 char *dst, size_t size));
-static char *	inet_cidr_ntop_ipv6 __P((const u_char *src, int bits,
-					 char *dst, size_t size));
-
-/*
- * char *
- * inet_cidr_ntop(af, src, bits, dst, size)
- *	convert network address from network to presentation format.
- *	"src"'s size is determined from its "af".
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	192.5.5.1/28 has a nonzero host part, which means it isn't a network
- *	as called for by inet_net_ntop() but it can be a host address with
- *	an included netmask.
- * author:
- *	Paul Vixie (ISC), October 1998
- */
-char *
-inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size) {
-	switch (af) {
-	case AF_INET:
-		return (inet_cidr_ntop_ipv4(src, bits, dst, size));
-	case AF_INET6:
-		return (inet_cidr_ntop_ipv6(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-static int
-decoct(const u_char *src, int bytes, char *dst, size_t size) {
-	char *odst = dst;
-	char *t;
-	int b;
-
-	for (b = 1; b <= bytes; b++) {
-		if (size < sizeof "255.")
-			return (0);
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b != bytes) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-	return (dst - odst);
-}
-
-/*
- * static char *
- * inet_cidr_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network address from network to presentation format.
- *	"src"'s size is determined from its "af".
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), October 1998
- */
-static char *
-inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size) {
-	char *odst = dst;
-	size_t len = 4;
-	size_t b;
-	size_t bytes;
-
-	if ((bits < -1) || (bits > 32)) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Find number of significant bytes in address. */
-	if (bits == -1)
-		len = 4;
-	else
-		for (len = 1, b = 1 ; b < 4U; b++)
-			if (*(src + b))
-				len = b + 1;
-
-	/* Format whole octets plus nonzero trailing octets. */
-	bytes = (((bits <= 0) ? 1 : bits) + 7) / 8;
-	if (len > bytes)
-		bytes = len;
-	b = decoct(src, bytes, dst, size);
-	if (b == 0U)
-		goto emsgsize;
-	dst += b;
-	size -= b;
-
-	if (bits != -1) {
-		/* Format CIDR /width. */
-		if (size < sizeof "/32")
-			goto emsgsize;
-		dst += SPRINTF((dst, "/%u", bits));
-	}
-
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
- 
-static char *
-inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) {
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255/128"];
-	char *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	if ((bits < -1) || (bits > 128)) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	best.len = 0;
-	cur.base = -1;
-	cur.len = 0;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 && (best.len == 6 ||
-		    (best.len == 7 && words[7] != 0x0001) ||
-		    (best.len == 5 && words[5] == 0xffff))) {
-			int n;
-
-			if (src[15] || bits == -1 || bits > 120)
-				n = 4;
-			else if (src[14] || bits > 112)
-				n = 3;
-			else
-				n = 2;
-			n = decoct(src+12, n, tp, sizeof tmp - (tp - tmp));
-			if (n == 0) {
-				errno = EMSGSIZE;
-				return (NULL);
-			}
-			tp += strlen(tp);
-			break;
-		}
-		tp += SPRINTF((tp, "%x", words[i]));
-	}
-
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) == 
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp = '\0';
-
-	if (bits != -1)
-		tp += SPRINTF((tp, "/%u", bits));
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((size_t)(tp - tmp) > size) {
-		errno = EMSGSIZE;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
diff --git a/lib/libc/inet/inet_cidr_pton.c b/lib/libc/inet/inet_cidr_pton.c
deleted file mode 100644
index 5192bee..0000000
--- a/lib/libc/inet/inet_cidr_pton.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1998,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_pton.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_cidr_pton.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static int	inet_cidr_pton_ipv4 __P((const char *src, u_char *dst,
-					 int *bits, int ipv6));
-static int	inet_cidr_pton_ipv6 __P((const char *src, u_char *dst,
-					 int *bits));
-
-static int	getbits(const char *, int ipv6);
-
-/*
- * int
- * inet_cidr_pton(af, src, dst, *bits)
- *	convert network address from presentation to network format.
- *	accepts inet_pton()'s input for this "af" plus trailing "/CIDR".
- *	"dst" is assumed large enough for its "af".  "bits" is set to the
- *	/CIDR prefix length, which can have defaults (like /32 for IPv4).
- * return:
- *	-1 if an error occurred (inspect errno; ENOENT means bad format).
- *	0 if successful conversion occurred.
- * note:
- *	192.5.5.1/28 has a nonzero host part, which means it isn't a network
- *	as called for by inet_net_pton() but it can be a host address with
- *	an included netmask.
- * author:
- *	Paul Vixie (ISC), October 1998
- */
-int
-inet_cidr_pton(int af, const char *src, void *dst, int *bits) {
-	switch (af) {
-	case AF_INET:
-		return (inet_cidr_pton_ipv4(src, dst, bits, 0));
-	case AF_INET6:
-		return (inet_cidr_pton_ipv6(src, dst, bits));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
-
-static const char digits[] = "0123456789";
-
-static int
-inet_cidr_pton_ipv4(const char *src, u_char *dst, int *pbits, int ipv6) {
-	const u_char *odst = dst;
-	int n, ch, tmp, bits;
-	size_t size = 4;
-
-	/* Get the mantissa. */
-	while (ch = *src++, (isascii(ch) && isdigit(ch))) {
-		tmp = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			assert(n >= 0 && n <= 9);
-			tmp *= 10;
-			tmp += n;
-			if (tmp > 255)
-				goto enoent;
-		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
-		if (size-- == 0U)
-			goto emsgsize;
-		*dst++ = (u_char) tmp;
-		if (ch == '\0' || ch == '/')
-			break;
-		if (ch != '.')
-			goto enoent;
-	}
-
-	/* Get the prefix length if any. */
-	bits = -1;
-	if (ch == '/' && dst > odst) {
-		bits = getbits(src, ipv6);
-		if (bits == -2)
-			goto enoent;
-	} else if (ch != '\0')
-		goto enoent;
-
-	/* Prefix length can default to /32 only if all four octets spec'd. */
-	if (bits == -1) {
-		if (dst - odst == 4)
-			bits = ipv6 ? 128 : 32;
-		else
-			goto enoent;
-	}
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-
-	/* If prefix length overspecifies mantissa, life is bad. */
-	if (((bits - (ipv6 ? 96 : 0)) / 8) > (dst - odst))
-		goto enoent;
-
-	/* Extend address to four octets. */
-	while (size-- > 0U)
-		*dst++ = 0;
-
-	*pbits = bits;
-	return (0);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-static int
-inet_cidr_pton_ipv6(const char *src, u_char *dst, int *pbits) {
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-	int bits;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	bits = -1;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (val > 0xffff)
-				return (0);
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			} else if (*src == '\0') {
-				return (0);
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_cidr_pton_ipv4(curtok, tp, &bits, 1) == 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		if (ch == '/') {
-			bits = getbits(src, 1);
-			if (bits == -2)
-				goto enoent;
-			break;
-		}
-		goto enoent;
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			goto emsgsize;
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		if (tp == endp)
-			goto enoent;
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-
-	*pbits = bits;
-	return (0);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-static int
-getbits(const char *src, int ipv6) {
-	int bits = 0;
-	char *cp, ch;
-	
-	if (*src == '\0')			/* syntax */
-		return (-2);
-	do {
-		ch = *src++;
-		cp = strchr(digits, ch);
-		if (cp == NULL)			/* syntax */
-			return (-2);
-		bits *= 10;
-		bits += cp - digits;
-		if (bits == 0 && *src != '\0')	/* no leading zeros */
-			return (-2);
-		if (bits > (ipv6 ? 128 : 32))	/* range error */
-			return (-2);
-	} while (*src != '\0');
-
-	return (bits);
-}
diff --git a/lib/libc/inet/inet_lnaof.c b/lib/libc/inet/inet_lnaof.c
deleted file mode 100644
index 692e4ed..0000000
--- a/lib/libc/inet/inet_lnaof.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_lnaof.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "port_after.h"
-
-/*
- * Return the local network address portion of an
- * internet address; handles class a/b/c network
- * number formats.
- */
-in_addr_t
-inet_lnaof(in)
-	struct in_addr in;
-{
-	in_addr_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return ((i)&IN_CLASSA_HOST);
-	else if (IN_CLASSB(i))
-		return ((i)&IN_CLASSB_HOST);
-	else
-		return ((i)&IN_CLASSC_HOST);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_lnaof
-__weak_reference(__inet_lnaof, inet_lnaof);
diff --git a/lib/libc/inet/inet_makeaddr.c b/lib/libc/inet/inet_makeaddr.c
deleted file mode 100644
index 3ea0400..0000000
--- a/lib/libc/inet/inet_makeaddr.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_makeaddr.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "port_after.h"
-
-/*
- * Formulate an Internet address from network + host.  Used in
- * building addresses stored in the ifnet structure.
- */
-struct in_addr
-inet_makeaddr(net, host)
-	in_addr_t net, host;
-{
-	struct in_addr a;
-
-	if (net < 128U)
-		a.s_addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
-	else if (net < 65536U)
-		a.s_addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
-	else if (net < 16777216L)
-		a.s_addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
-	else
-		a.s_addr = net | host;
-	a.s_addr = htonl(a.s_addr);
-	return (a);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_makeaddr
-__weak_reference(__inet_makeaddr, inet_makeaddr);
diff --git a/lib/libc/inet/inet_net_ntop.c b/lib/libc/inet/inet_net_ntop.c
deleted file mode 100644
index 1476e42..0000000
--- a/lib/libc/inet/inet_net_ntop.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_ntop.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static char *	inet_net_ntop_ipv4(const u_char *src, int bits, char *dst,
-		    size_t size);
-static char *	inet_net_ntop_ipv6(const u_char *src, int bits, char *dst,
-		    size_t size);
-
-/*
- * char *
- * inet_net_ntop(af, src, bits, dst, size)
- *	convert network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_net_ntop(af, src, bits, dst, size)
-	int af;
-	const void *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_ntop_ipv4(src, bits, dst, size));
-	case AF_INET6:
-		return (inet_net_ntop_ipv6(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-/*
- * static char *
- * inet_net_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-static char *
-inet_net_ntop_ipv4(src, bits, dst, size)
-	const u_char *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *t;
-	u_int m;
-	int b;
-
-	if (bits < 0 || bits > 32) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (bits == 0) {
-		if (size < sizeof "0")
-			goto emsgsize;
-		*dst++ = '0';
-		size--;
-		*dst = '\0';
-	}
-
-	/* Format whole octets. */
-	for (b = bits / 8; b > 0; b--) {
-		if (size <= sizeof "255.")
-			goto emsgsize;
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b > 1) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format partial octet. */
-	b = bits % 8;
-	if (b > 0) {
-		if (size <= sizeof ".255")
-			goto emsgsize;
-		t = dst;
-		if (dst != odst)
-			*dst++ = '.';
-		m = ((1 << b) - 1) << (8 - b);
-		dst += SPRINTF((dst, "%u", *src & m));
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format CIDR /width. */
-	if (size <= sizeof "/32")
-		goto emsgsize;
-	dst += SPRINTF((dst, "/%u", bits));
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
-
-/*
- * static char *
- * inet_net_ntop_ipv6(src, bits, fakebits, dst, size)
- *	convert IPv6 network number from network to presentation format.
- *	generates CIDR style result always. Picks the shortest representation
- *	unless the IP is really IPv4.
- *	always prints specified number of bits (bits).
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Vadim Kogan (UCB), June 2001
- *  Original version (IPv4) by Paul Vixie (ISC), July 1996
- */
-
-static char *
-inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) {
-	u_int	m;
-	int	b;
-	int	p;
-	int	zero_s, zero_l, tmp_zero_s, tmp_zero_l;
-	int	i;
-	int	is_ipv4 = 0;
-	unsigned char inbuf[16];
-	char outbuf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128")];
-	char	*cp;
-	int	words;
-	u_char	*s;
-
-	if (bits < 0 || bits > 128) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	cp = outbuf;
-
-	if (bits == 0) {
-		*cp++ = ':';
-		*cp++ = ':';
-		*cp = '\0';
-	} else {
-		/* Copy src to private buffer.  Zero host part. */
-		p = (bits + 7) / 8;
-		memcpy(inbuf, src, p);
-		memset(inbuf + p, 0, 16 - p);
-		b = bits % 8;
-		if (b != 0) {
-			m = ~0 << (8 - b);
-			inbuf[p-1] &= m;
-		}
-
-		s = inbuf;
-
-		/* how many words need to be displayed in output */
-		words = (bits + 15) / 16;
-		if (words == 1)
-			words = 2;
-
-		/* Find the longest substring of zero's */
-		zero_s = zero_l = tmp_zero_s = tmp_zero_l = 0;
-		for (i = 0; i < (words * 2); i += 2) {
-			if ((s[i] | s[i+1]) == 0) {
-				if (tmp_zero_l == 0)
-					tmp_zero_s = i / 2;
-				tmp_zero_l++;
-			} else {
-				if (tmp_zero_l && zero_l < tmp_zero_l) {
-					zero_s = tmp_zero_s;
-					zero_l = tmp_zero_l;
-					tmp_zero_l = 0;
-				}
-			}
-		}
-
-		if (tmp_zero_l && zero_l < tmp_zero_l) {
-			zero_s = tmp_zero_s;
-			zero_l = tmp_zero_l;
-		}
-
-		if (zero_l != words && zero_s == 0 && ((zero_l == 6) ||
-		    ((zero_l == 5 && s[10] == 0xff && s[11] == 0xff) ||
-		    ((zero_l == 7 && s[14] != 0 && s[15] != 1)))))
-			is_ipv4 = 1;
-
-		/* Format whole words. */
-		for (p = 0; p < words; p++) {
-			if (zero_l != 0 && p >= zero_s && p < zero_s + zero_l) {
-				/* Time to skip some zeros */
-				if (p == zero_s)
-					*cp++ = ':';
-				if (p == words - 1)
-					*cp++ = ':';
-				s++;
-				s++;
-				continue;
-			}
-
-			if (is_ipv4 && p > 5 ) {
-				*cp++ = (p == 6) ? ':' : '.';
-				cp += SPRINTF((cp, "%u", *s++));
-				/* we can potentially drop the last octet */
-				if (p != 7 || bits > 120) {
-					*cp++ = '.';
-					cp += SPRINTF((cp, "%u", *s++));
-				}
-			} else {
-				if (cp != outbuf)
-					*cp++ = ':';
-				cp += SPRINTF((cp, "%x", *s * 256 + s[1]));
-				s += 2;
-			}
-		}
-	}
-	/* Format CIDR /width. */
-	SPRINTF((cp, "/%u", bits));
-	if (strlen(outbuf) + 1 > size)
-		goto emsgsize;
-	strcpy(dst, outbuf);
-
-	return (dst);
-
-emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_net_ntop
-__weak_reference(__inet_net_ntop, inet_net_ntop);
diff --git a/lib/libc/inet/inet_net_pton.c b/lib/libc/inet/inet_net_pton.c
deleted file mode 100644
index a7f8a39..0000000
--- a/lib/libc/inet/inet_net_pton.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_net_pton.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/*
- * static int
- * inet_net_pton_ipv4(src, dst, size)
- *	convert IPv4 network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not an IPv4 network specification.
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-static int
-inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) {
-	static const char xdigits[] = "0123456789abcdef";
-	static const char digits[] = "0123456789";
-	int n, ch, tmp = 0, dirty, bits;
-	const u_char *odst = dst;
-
-	ch = *src++;
-	if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-	    && isascii((unsigned char)(src[1]))
-	    && isxdigit((unsigned char)(src[1]))) {
-		/* Hexadecimal: Eat nybble string. */
-		if (size <= 0U)
-			goto emsgsize;
-		dirty = 0;
-		src++;	/* skip x or X. */
-		while ((ch = *src++) != '\0' && isascii(ch) && isxdigit(ch)) {
-			if (isupper(ch))
-				ch = tolower(ch);
-			n = strchr(xdigits, ch) - xdigits;
-			assert(n >= 0 && n <= 15);
-			if (dirty == 0)
-				tmp = n;
-			else
-				tmp = (tmp << 4) | n;
-			if (++dirty == 2) {
-				if (size-- <= 0U)
-					goto emsgsize;
-				*dst++ = (u_char) tmp;
-				dirty = 0;
-			}
-		}
-		if (dirty) {  /* Odd trailing nybble? */
-			if (size-- <= 0U)
-				goto emsgsize;
-			*dst++ = (u_char) (tmp << 4);
-		}
-	} else if (isascii(ch) && isdigit(ch)) {
-		/* Decimal: eat dotted digit string. */
-		for (;;) {
-			tmp = 0;
-			do {
-				n = strchr(digits, ch) - digits;
-				assert(n >= 0 && n <= 9);
-				tmp *= 10;
-				tmp += n;
-				if (tmp > 255)
-					goto enoent;
-			} while ((ch = *src++) != '\0' &&
-				 isascii(ch) && isdigit(ch));
-			if (size-- <= 0U)
-				goto emsgsize;
-			*dst++ = (u_char) tmp;
-			if (ch == '\0' || ch == '/')
-				break;
-			if (ch != '.')
-				goto enoent;
-			ch = *src++;
-			if (!isascii(ch) || !isdigit(ch))
-				goto enoent;
-		}
-	} else
-		goto enoent;
-
-	bits = -1;
-	if (ch == '/' && isascii((unsigned char)(src[0])) &&
-	    isdigit((unsigned char)(src[0])) && dst > odst) {
-		/* CIDR width specifier.  Nothing can follow it. */
-		ch = *src++;	/* Skip over the /. */
-		bits = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			assert(n >= 0 && n <= 9);
-			bits *= 10;
-			bits += n;
-		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
-		if (ch != '\0')
-			goto enoent;
-		if (bits > 32)
-			goto emsgsize;
-	}
-
-	/* Firey death and destruction unless we prefetched EOS. */
-	if (ch != '\0')
-		goto enoent;
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-	/* If no CIDR spec was given, infer width from net class. */
-	if (bits == -1) {
-		if (*odst >= 240)	/* Class E */
-			bits = 32;
-		else if (*odst >= 224)	/* Class D */
-			bits = 8;
-		else if (*odst >= 192)	/* Class C */
-			bits = 24;
-		else if (*odst >= 128)	/* Class B */
-			bits = 16;
-		else			/* Class A */
-			bits = 8;
-		/* If imputed mask is narrower than specified octets, widen. */
-		if (bits < ((dst - odst) * 8))
-			bits = (dst - odst) * 8;
-		/*
-		 * If there are no additional bits specified for a class D
-		 * address adjust bits to 4.
-		 */
-		if (bits == 8 && *odst == 224)
-			bits = 4;
-	}
-	/* Extend network to cover the actual mask. */
-	while (bits > ((dst - odst) * 8)) {
-		if (size-- <= 0U)
-			goto emsgsize;
-		*dst++ = '\0';
-	}
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-static int
-getbits(const char *src, int *bitsp) {
-	static const char digits[] = "0123456789";
-	int n;
-	int val;
-	char ch;
-
-	val = 0;
-	n = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		pch = strchr(digits, ch);
-		if (pch != NULL) {
-			if (n++ != 0 && val == 0)	/* no leading zeros */
-				return (0);
-			val *= 10;
-			val += (pch - digits);
-			if (val > 128)			/* range */
-				return (0);
-			continue;
-		}
-		return (0);
-	}
-	if (n == 0)
-		return (0);
-	*bitsp = val;
-	return (1);
-}
-
-static int
-getv4(const char *src, u_char *dst, int *bitsp) {
-	static const char digits[] = "0123456789";
-	u_char *odst = dst;
-	int n;
-	u_int val;
-	char ch;
-
-	val = 0;
-	n = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		pch = strchr(digits, ch);
-		if (pch != NULL) {
-			if (n++ != 0 && val == 0)	/* no leading zeros */
-				return (0);
-			val *= 10;
-			val += (pch - digits);
-			if (val > 255)			/* range */
-				return (0);
-			continue;
-		}
-		if (ch == '.' || ch == '/') {
-			if (dst - odst > 3)		/* too many octets? */
-				return (0);
-			*dst++ = val;
-			if (ch == '/')
-				return (getbits(src, bitsp));
-			val = 0;
-			n = 0;
-			continue;
-		}
-		return (0);
-	}
-	if (n == 0)
-		return (0);
-	if (dst - odst > 3)		/* too many octets? */
-		return (0);
-	*dst++ = val;
-	return (1);
-}
-
-static int
-inet_net_pton_ipv6(const char *src, u_char *dst, size_t size) {
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-	int digits;
-	int bits;
-	size_t bytes;
-	int words;
-	int ipv4;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			goto enoent;
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	digits = 0;
-	bits = -1;
-	ipv4 = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (++digits > 4)
-				goto enoent;
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					goto enoent;
-				colonp = tp;
-				continue;
-			} else if (*src == '\0')
-				goto enoent;
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			digits = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		     getv4(curtok, tp, &bits) > 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			ipv4 = 1;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		if (ch == '/' && getbits(src, &bits) > 0)
-			break;
-		goto enoent;
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			goto enoent;
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (bits == -1)
-		bits = 128;
-
-	words = (bits + 15) / 16;
-	if (words < 2)
-		words = 2;
-	if (ipv4)
-		words = 8;
-	endp =  tmp + 2 * words;
-
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		if (tp == endp)
-			goto enoent;
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		goto enoent;
-
-	bytes = (bits + 7) / 8;
-	if (bytes > size)
-		goto emsgsize;
-	memcpy(dst, tmp, bytes);
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-/*
- * int
- * inet_net_pton(af, src, dst, size)
- *	convert network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not a valid network specification.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-int
-inet_net_pton(int af, const char *src, void *dst, size_t size) {
-	switch (af) {
-	case AF_INET:
-		return (inet_net_pton_ipv4(src, dst, size));
-	case AF_INET6:
-		return (inet_net_pton_ipv6(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_net_pton
-__weak_reference(__inet_net_pton, inet_net_pton);
diff --git a/lib/libc/inet/inet_neta.c b/lib/libc/inet/inet_neta.c
deleted file mode 100644
index 728958c..0000000
--- a/lib/libc/inet/inet_neta.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_neta.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_neta.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/*
- * char *
- * inet_neta(src, dst, size)
- *	format an in_addr_t network number into presentation format.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	format of ``src'' is as for inet_network().
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_neta(src, dst, size)
-	in_addr_t src;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *tp;
-
-	while (src & 0xffffffff) {
-		u_char b = (src & 0xff000000) >> 24;
-
-		src <<= 8;
-		if (b) {
-			if (size < sizeof "255.")
-				goto emsgsize;
-			tp = dst;
-			dst += SPRINTF((dst, "%u", b));
-			if (src != 0L) {
-				*dst++ = '.';
-				*dst = '\0';
-			}
-			size -= (size_t)(dst - tp);
-		}
-	}
-	if (dst == odst) {
-		if (size < sizeof "0.0.0.0")
-			goto emsgsize;
-		strcpy(dst, "0.0.0.0");
-	}
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_neta
-__weak_reference(__inet_neta, inet_neta);
diff --git a/lib/libc/inet/inet_netof.c b/lib/libc/inet/inet_netof.c
deleted file mode 100644
index d577ee4..0000000
--- a/lib/libc/inet/inet_netof.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_netof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_netof.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "port_after.h"
-
-/*
- * Return the network number from an internet
- * address; handles class a/b/c network #'s.
- */
-in_addr_t
-inet_netof(in)
-	struct in_addr in;
-{
-	in_addr_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
-	else if (IN_CLASSB(i))
-		return (((i)&IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
-	else
-		return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_netof
-__weak_reference(__inet_netof, inet_netof);
diff --git a/lib/libc/inet/inet_network.c b/lib/libc/inet/inet_network.c
deleted file mode 100644
index 8586441..0000000
--- a/lib/libc/inet/inet_network.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_network.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-#include "port_after.h"
-
-/*
- * Internet network address interpretation routine.
- * The library routines call this routine to interpret
- * network numbers.
- */
-in_addr_t
-inet_network(cp)
-	const char *cp;
-{
-	in_addr_t val, base, n;
-	char c;
-	in_addr_t parts[4], *pp = parts;
-	int i, digit;
-
-again:
-	val = 0; base = 10; digit = 0;
-	if (*cp == '0')
-		digit = 1, base = 8, cp++;
-	if (*cp == 'x' || *cp == 'X')
-		base = 16, cp++;
-	while ((c = *cp) != 0) {
-		if (isdigit((unsigned char)c)) {
-			if (base == 8U && (c == '8' || c == '9'))
-				return (INADDR_NONE);
-			val = (val * base) + (c - '0');
-			cp++;
-			digit = 1;
-			continue;
-		}
-		if (base == 16U && isxdigit((unsigned char)c)) {
-			val = (val << 4) +
-			      (c + 10 - (islower((unsigned char)c) ? 'a' : 'A'));
-			cp++;
-			digit = 1;
-			continue;
-		}
-		break;
-	}
-	if (!digit)
-		return (INADDR_NONE);
-	if (*cp == '.') {
-		if (pp >= parts + 4 || val > 0xffU)
-			return (INADDR_NONE);
-		*pp++ = val, cp++;
-		goto again;
-	}
-	if (*cp && !isspace(*cp&0xff))
-		return (INADDR_NONE);
-	*pp++ = val;
-	n = pp - parts;
-	if (n > 4U)
-		return (INADDR_NONE);
-	for (val = 0, i = 0; i < n; i++) {
-		val <<= 8;
-		val |= parts[i] & 0xff;
-	}
-	return (val);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_network
-__weak_reference(__inet_network, inet_network);
diff --git a/lib/libc/inet/inet_ntoa.c b/lib/libc/inet/inet_ntoa.c
deleted file mode 100644
index 8aaa81f..0000000
--- a/lib/libc/inet/inet_ntoa.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: inet_ntoa.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_ntoa.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include "port_after.h"
-
-/*
- * Convert network-format internet address
- * to base 256 d.d.d.d representation.
- */
-/*const*/ char *
-inet_ntoa(struct in_addr in) {
-	static char ret[18];
-
-	strcpy(ret, "[inet_ntoa error]");
-	(void) inet_ntop(AF_INET, &in, ret, sizeof ret);
-	return (ret);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_ntoa
-__weak_reference(__inet_ntoa, inet_ntoa);
diff --git a/lib/libc/inet/inet_ntop.c b/lib/libc/inet/inet_ntop.c
deleted file mode 100644
index ec5ea4e..0000000
--- a/lib/libc/inet/inet_ntop.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_ntop.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_ntop.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "port_after.h"
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
-static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
- *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
- */
-const char *
-inet_ntop(int af, const void * __restrict src, char * __restrict dst,
-    socklen_t size)
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_ntop4(src, dst, size));
-	case AF_INET6:
-		return (inet_ntop6(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(const u_char *src, char *dst, socklen_t size)
-{
-	static const char fmt[] = "%u.%u.%u.%u";
-	char tmp[sizeof "255.255.255.255"];
-	int l;
-
-	l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]);
-	if (l <= 0 || (socklen_t) l >= size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strlcpy(dst, tmp, size);
-	return (dst);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(const u_char *src, char *dst, socklen_t size)
-{
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	best.len = 0;
-	cur.base = -1;
-	cur.len = 0;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 && (best.len == 6 ||
-		    (best.len == 7 && words[7] != 0x0001) ||
-		    (best.len == 5 && words[5] == 0xffff))) {
-			if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
-				return (NULL);
-			tp += strlen(tp);
-			break;
-		}
-		tp += sprintf(tp, "%x", words[i]);
-	}
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) == 
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp++ = '\0';
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((socklen_t)(tp - tmp) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_ntop
-__weak_reference(__inet_ntop, inet_ntop);
diff --git a/lib/libc/inet/inet_pton.c b/lib/libc/inet/inet_pton.c
deleted file mode 100644
index b5a7b1f..0000000
--- a/lib/libc/inet/inet_pton.c
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_pton.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/inet_pton.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <string.h>
-#include <errno.h>
-#include "port_after.h"
-
-/*
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int	inet_pton4(const char *src, u_char *dst);
-static int	inet_pton6(const char *src, u_char *dst);
-
-/* int
- * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
- *	to network format (which is usually some kind of binary format).
- * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *	Paul Vixie, 1996.
- */
-int
-inet_pton(int af, const char * __restrict src, void * __restrict dst)
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_pton4(src, dst));
-	case AF_INET6:
-		return (inet_pton6(src, dst));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst)
- *	like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *	1 if `src' is a valid dotted quad, else 0.
- * notice:
- *	does not touch `dst' unless it's returning 1.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton4(const char *src, u_char *dst)
-{
-	static const char digits[] = "0123456789";
-	int saw_digit, octets, ch;
-	u_char tmp[NS_INADDRSZ], *tp;
-
-	saw_digit = 0;
-	octets = 0;
-	*(tp = tmp) = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr(digits, ch)) != NULL) {
-			u_int new = *tp * 10 + (pch - digits);
-
-			if (saw_digit && *tp == 0)
-				return (0);
-			if (new > 255)
-				return (0);
-			*tp = new;
-			if (!saw_digit) {
-				if (++octets > 4)
-					return (0);
-				saw_digit = 1;
-			}
-		} else if (ch == '.' && saw_digit) {
-			if (octets == 4)
-				return (0);
-			*++tp = 0;
-			saw_digit = 0;
-		} else
-			return (0);
-	}
-	if (octets < 4)
-		return (0);
-	memcpy(dst, tmp, NS_INADDRSZ);
-	return (1);
-}
-
-/* int
- * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
- * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
- * credit:
- *	inspired by Mark Andrews.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton6(const char *src, u_char *dst)
-{
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, seen_xdigits;
-	u_int val;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	seen_xdigits = 0;
-	val = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (++seen_xdigits > 4)
-				return (0);
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!seen_xdigits) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			} else if (*src == '\0') {
-				return (0);
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			seen_xdigits = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_pton4(curtok, tp) > 0) {
-			tp += NS_INADDRSZ;
-			seen_xdigits = 0;
-			break;	/* '\0' was seen by inet_pton4(). */
-		}
-		return (0);
-	}
-	if (seen_xdigits) {
-		if (tp + NS_INT16SZ > endp)
-			return (0);
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		if (tp == endp)
-			return (0);
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		return (0);
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-	return (1);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_pton
-__weak_reference(__inet_pton, inet_pton);
diff --git a/lib/libc/inet/nsap_addr.c b/lib/libc/inet/nsap_addr.c
deleted file mode 100644
index e642477..0000000
--- a/lib/libc/inet/nsap_addr.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: nsap_addr.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/inet/nsap_addr.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <resolv_mt.h>
-
-#include "port_after.h"
-
-static char
-xtob(int c) {
-	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
-}
-
-u_int
-inet_nsap_addr(const char *ascii, u_char *binary, int maxlen) {
-	u_char c, nib;
-	u_int len = 0;
-
-	if (ascii[0] != '0' || (ascii[1] != 'x' && ascii[1] != 'X'))
-		return (0);
-	ascii += 2;
-
-	while ((c = *ascii++) != '\0' && len < (u_int)maxlen) {
-		if (c == '.' || c == '+' || c == '/')
-			continue;
-		if (!isascii(c))
-			return (0);
-		if (islower(c))
-			c = toupper(c);
-		if (isxdigit(c)) {
-			nib = xtob(c);
-			c = *ascii++;
-			if (c != '\0') {
-				c = toupper(c);
-				if (isxdigit(c)) {
-					*binary++ = (nib << 4) | xtob(c);
-					len++;
-				} else
-					return (0);
-			}
-			else
-				return (0);
-		}
-		else
-			return (0);
-	}
-	return (len);
-}
-
-char *
-inet_nsap_ntoa(int binlen, const u_char *binary, char *ascii) {
-	int nib;
-	int i;
-	char *tmpbuf = inet_nsap_ntoa_tmpbuf;
-	char *start;
-
-	if (ascii)
-		start = ascii;
-	else {
-		ascii = tmpbuf;
-		start = tmpbuf;
-	}
-
-	*ascii++ = '0';
-	*ascii++ = 'x';
-
-	if (binlen > 255)
-		binlen = 255;
-
-	for (i = 0; i < binlen; i++) {
-		nib = *binary >> 4;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		nib = *binary++ & 0x0f;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		if (((i % 2) == 0 && (i + 1) < binlen))
-			*ascii++ = '.';
-	}
-	*ascii = '\0';
-	return (start);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_nsap_addr
-__weak_reference(__inet_nsap_addr, inet_nsap_addr);
-#undef inet_nsap_ntoa
-__weak_reference(__inet_nsap_ntoa, inet_nsap_ntoa);
diff --git a/lib/libc/isc/Makefile b/lib/libc/isc/Makefile
deleted file mode 100644
index 3866201..0000000
--- a/lib/libc/isc/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = ev_streams.o ev_timers.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/isc/ev_streams.c b/lib/libc/isc/ev_streams.c
deleted file mode 100644
index b390a1a..0000000
--- a/lib/libc/isc/ev_streams.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* ev_streams.c - implement asynch stream file IO for the eventlib
- * vix 04mar96 [initial]
- */
-
-#if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_streams.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/isc/ev_streams.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-#ifndef _LIBC
-#include "fd_setsize.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/uio.h>
-
-#include <errno.h>
-
-#include <isc/eventlib.h>
-#ifndef _LIBC
-#include <isc/assertions.h>
-#endif
-#include "eventlib_p.h"
-
-#include "port_after.h"
-
-#ifndef _LIBC
-static int	copyvec(evStream *str, const struct iovec *iov, int iocnt);
-static void	consume(evStream *str, size_t bytes);
-static void	done(evContext opaqueCtx, evStream *str);
-static void	writable(evContext opaqueCtx, void *uap, int fd, int evmask);
-static void	readable(evContext opaqueCtx, void *uap, int fd, int evmask);
-#endif
-
-struct iovec
-evConsIovec(void *buf, size_t cnt) {
-	struct iovec ret;
-
-	memset(&ret, 0xf5, sizeof ret);
-	ret.iov_base = buf;
-	ret.iov_len = cnt;
-	return (ret);
-}
-
-#ifndef _LIBC
-int
-evWrite(evContext opaqueCtx, int fd, const struct iovec *iov, int iocnt,
-	evStreamFunc func, void *uap, evStreamID *id)
-{
-	evContext_p *ctx = opaqueCtx.opaque;
-	evStream *new;
-	int save;
-
-	OKNEW(new);
-	new->func = func;
-	new->uap = uap;
-	new->fd = fd;
-	new->flags = 0;
-	if (evSelectFD(opaqueCtx, fd, EV_WRITE, writable, new, &new->file) < 0)
-		goto free;
-	if (copyvec(new, iov, iocnt) < 0)
-		goto free;
-	new->prevDone = NULL;
-	new->nextDone = NULL;
-	if (ctx->streams != NULL)
-		ctx->streams->prev = new;
-	new->prev = NULL;
-	new->next = ctx->streams;
-	ctx->streams = new;
-	if (id != NULL)
-		id->opaque = new;
-	return (0);
- free:
-	save = errno;
-	FREE(new);
-	errno = save;
-	return (-1);
-}
-
-int
-evRead(evContext opaqueCtx, int fd, const struct iovec *iov, int iocnt,
-       evStreamFunc func, void *uap, evStreamID *id)
-{
-	evContext_p *ctx = opaqueCtx.opaque;
-	evStream *new;
-	int save;
-
-	OKNEW(new);
-	new->func = func;
-	new->uap = uap;
-	new->fd = fd;
-	new->flags = 0;
-	if (evSelectFD(opaqueCtx, fd, EV_READ, readable, new, &new->file) < 0)
-		goto free;
-	if (copyvec(new, iov, iocnt) < 0)
-		goto free;
-	new->prevDone = NULL;
-	new->nextDone = NULL;
-	if (ctx->streams != NULL)
-		ctx->streams->prev = new;
-	new->prev = NULL;
-	new->next = ctx->streams;
-	ctx->streams = new;
-	if (id)
-		id->opaque = new;
-	return (0);
- free:
-	save = errno;
-	FREE(new);
-	errno = save;
-	return (-1);
-}
-
-int
-evTimeRW(evContext opaqueCtx, evStreamID id, evTimerID timer) /*ARGSUSED*/ {
-	evStream *str = id.opaque;
-
-	UNUSED(opaqueCtx);
-
-	str->timer = timer;
-	str->flags |= EV_STR_TIMEROK;
-	return (0);
-}
-
-int
-evUntimeRW(evContext opaqueCtx, evStreamID id) /*ARGSUSED*/ {
-	evStream *str = id.opaque;
-
-	UNUSED(opaqueCtx);
-
-	str->flags &= ~EV_STR_TIMEROK;
-	return (0);
-}
-
-int
-evCancelRW(evContext opaqueCtx, evStreamID id) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evStream *old = id.opaque;
-
-	/*
-	 * The streams list is doubly threaded.  First, there's ctx->streams
-	 * that's used by evDestroy() to find and cancel all streams.  Second,
-	 * there's ctx->strDone (head) and ctx->strLast (tail) which thread
-	 * through the potentially smaller number of "IO completed" streams,
-	 * used in evGetNext() to avoid scanning the entire list.
-	 */
-
-	/* Unlink from ctx->streams. */
-	if (old->prev != NULL)
-		old->prev->next = old->next;
-	else
-		ctx->streams = old->next;
-	if (old->next != NULL)
-		old->next->prev = old->prev;
-
-	/*
-	 * If 'old' is on the ctx->strDone list, remove it.  Update
-	 * ctx->strLast if necessary.
-	 */
-	if (old->prevDone == NULL && old->nextDone == NULL) {
-		/*
-		 * Either 'old' is the only item on the done list, or it's
-		 * not on the done list.  If the former, then we unlink it
-		 * from the list.  If the latter, we leave the list alone.
-		 */
-		if (ctx->strDone == old) {
-			ctx->strDone = NULL;
-			ctx->strLast = NULL;
-		}
-	} else {
-		if (old->prevDone != NULL)
-			old->prevDone->nextDone = old->nextDone;
-		else
-			ctx->strDone = old->nextDone;
-		if (old->nextDone != NULL)
-			old->nextDone->prevDone = old->prevDone;
-		else
-			ctx->strLast = old->prevDone;
-	}
-
-	/* Deallocate the stream. */
-	if (old->file.opaque)
-		evDeselectFD(opaqueCtx, old->file);
-	memput(old->iovOrig, sizeof (struct iovec) * old->iovOrigCount);
-	FREE(old);
-	return (0);
-}
-
-/* Copy a scatter/gather vector and initialize a stream handler's IO. */
-static int
-copyvec(evStream *str, const struct iovec *iov, int iocnt) {
-	int i;
-
-	str->iovOrig = (struct iovec *)memget(sizeof(struct iovec) * iocnt);
-	if (str->iovOrig == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	str->ioTotal = 0;
-	for (i = 0; i < iocnt; i++) {
-		str->iovOrig[i] = iov[i];
-		str->ioTotal += iov[i].iov_len;
-	}
-	str->iovOrigCount = iocnt;
-	str->iovCur = str->iovOrig;
-	str->iovCurCount = str->iovOrigCount;
-	str->ioDone = 0;
-	return (0);
-}
-
-/* Pull off or truncate lead iovec(s). */
-static void
-consume(evStream *str, size_t bytes) {
-	while (bytes > 0U) {
-		if (bytes < (size_t)str->iovCur->iov_len) {
-			str->iovCur->iov_len -= bytes;
-			str->iovCur->iov_base = (void *)
-				((u_char *)str->iovCur->iov_base + bytes);
-			str->ioDone += bytes;
-			bytes = 0;
-		} else {
-			bytes -= str->iovCur->iov_len;
-			str->ioDone += str->iovCur->iov_len;
-			str->iovCur++;
-			str->iovCurCount--;
-		}
-	}
-}
-
-/* Add a stream to Done list and deselect the FD. */
-static void
-done(evContext opaqueCtx, evStream *str) {
-	evContext_p *ctx = opaqueCtx.opaque;
-
-	if (ctx->strLast != NULL) {
-		str->prevDone = ctx->strLast;
-		ctx->strLast->nextDone = str;
-		ctx->strLast = str;
-	} else {
-		INSIST(ctx->strDone == NULL);
-		ctx->strDone = ctx->strLast = str;
-	}
-	evDeselectFD(opaqueCtx, str->file);
-	str->file.opaque = NULL;
-	/* evDrop() will call evCancelRW() on us. */
-}
-
-/* Dribble out some bytes on the stream.  (Called by evDispatch().) */
-static void
-writable(evContext opaqueCtx, void *uap, int fd, int evmask) {
-	evStream *str = uap;
-	int bytes;
-
-	UNUSED(evmask);
-
-	bytes = writev(fd, str->iovCur, str->iovCurCount);
-	if (bytes > 0) {
-		if ((str->flags & EV_STR_TIMEROK) != 0)
-			evTouchIdleTimer(opaqueCtx, str->timer);
-		consume(str, bytes);
-	} else {
-		if (bytes < 0 && errno != EINTR) {
-			str->ioDone = -1;
-			str->ioErrno = errno;
-		}
-	}
-	if (str->ioDone == -1 || str->ioDone == str->ioTotal)
-		done(opaqueCtx, str);
-}
-
-/* Scoop up some bytes from the stream.  (Called by evDispatch().) */
-static void
-readable(evContext opaqueCtx, void *uap, int fd, int evmask) {
-	evStream *str = uap;
-	int bytes;
-
-	UNUSED(evmask);
-
-	bytes = readv(fd, str->iovCur, str->iovCurCount);
-	if (bytes > 0) {
-		if ((str->flags & EV_STR_TIMEROK) != 0)
-			evTouchIdleTimer(opaqueCtx, str->timer);
-		consume(str, bytes);
-	} else {
-		if (bytes == 0)
-			str->ioDone = 0;
-		else {
-			if (errno != EINTR) {
-				str->ioDone = -1;
-				str->ioErrno = errno;
-			}
-		}
-	}
-	if (str->ioDone <= 0 || str->ioDone == str->ioTotal)
-		done(opaqueCtx, str);
-}
-#endif
diff --git a/lib/libc/isc/ev_timers.c b/lib/libc/isc/ev_timers.c
deleted file mode 100644
index c514068..0000000
--- a/lib/libc/isc/ev_timers.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* ev_timers.c - implement timers for the eventlib
- * vix 09sep95 [initial]
- */
-
-#if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_timers.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/isc/ev_timers.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-/* Import. */
-
-#include "port_before.h"
-#ifndef _LIBC
-#include "fd_setsize.h"
-#endif
-
-#include <errno.h>
-
-#ifndef _LIBC
-#include <isc/assertions.h>
-#endif
-#include <isc/eventlib.h>
-#include "eventlib_p.h"
-
-#include "port_after.h"
-
-/* Constants. */
-
-#define	MILLION 1000000
-#define BILLION 1000000000
-
-/* Forward. */
-
-#ifdef _LIBC
-static int	__evOptMonoTime;
-#else
-static int due_sooner(void *, void *);
-static void set_index(void *, int);
-static void free_timer(void *, void *);
-static void print_timer(void *, void *);
-static void idle_timeout(evContext, void *, struct timespec, struct timespec);
-
-/* Private type. */
-
-typedef struct {
-	evTimerFunc	func;
-	void *		uap;
-	struct timespec	lastTouched;
-	struct timespec	max_idle;
-	evTimer *	timer;
-} idle_timer;
-#endif
-
-/* Public. */
-
-struct timespec
-evConsTime(time_t sec, long nsec) {
-	struct timespec x;
-
-	x.tv_sec = sec;
-	x.tv_nsec = nsec;
-	return (x);
-}
-
-struct timespec
-evAddTime(struct timespec addend1, struct timespec addend2) {
-	struct timespec x;
-
-	x.tv_sec = addend1.tv_sec + addend2.tv_sec;
-	x.tv_nsec = addend1.tv_nsec + addend2.tv_nsec;
-	if (x.tv_nsec >= BILLION) {
-		x.tv_sec++;
-		x.tv_nsec -= BILLION;
-	}
-	return (x);
-}
-
-struct timespec
-evSubTime(struct timespec minuend, struct timespec subtrahend) {
-	struct timespec x;
-
-	x.tv_sec = minuend.tv_sec - subtrahend.tv_sec;
-	if (minuend.tv_nsec >= subtrahend.tv_nsec)
-		x.tv_nsec = minuend.tv_nsec - subtrahend.tv_nsec;
-	else {
-		x.tv_nsec = BILLION - subtrahend.tv_nsec + minuend.tv_nsec;
-		x.tv_sec--;
-	}
-	return (x);
-}
-
-int
-evCmpTime(struct timespec a, struct timespec b) {
-	long x = a.tv_sec - b.tv_sec;
-
-	if (x == 0L)
-		x = a.tv_nsec - b.tv_nsec;
-	return (x < 0L ? (-1) : x > 0L ? (1) : (0));
-}
-
-struct timespec
-evNowTime() {
-	struct timeval now;
-#ifdef CLOCK_REALTIME
-	struct timespec tsnow;
-	int m = CLOCK_REALTIME;
-
-#ifdef CLOCK_MONOTONIC
-	if (__evOptMonoTime)
-		m = CLOCK_MONOTONIC;
-#endif
-	if (clock_gettime(m, &tsnow) == 0)
-		return (tsnow);
-#endif
-	if (gettimeofday(&now, NULL) < 0)
-		return (evConsTime(0, 0));
-	return (evTimeSpec(now));
-}
-
-struct timespec
-evUTCTime() {
-	struct timeval now;
-#ifdef CLOCK_REALTIME
-	struct timespec tsnow;
-	if (clock_gettime(CLOCK_REALTIME, &tsnow) == 0)
-		return (tsnow);
-#endif
-	if (gettimeofday(&now, NULL) < 0)
-		return (evConsTime(0, 0));
-	return (evTimeSpec(now));
-}
-
-#ifndef _LIBC
-struct timespec
-evLastEventTime(evContext opaqueCtx) {
-	evContext_p *ctx = opaqueCtx.opaque;
-
-	return (ctx->lastEventTime);
-}
-#endif
-
-struct timespec
-evTimeSpec(struct timeval tv) {
-	struct timespec ts;
-
-	ts.tv_sec = tv.tv_sec;
-	ts.tv_nsec = tv.tv_usec * 1000;
-	return (ts);
-}
-
-#if !defined(USE_KQUEUE) || !defined(_LIBC)
-struct timeval
-evTimeVal(struct timespec ts) {
-	struct timeval tv;
-
-	tv.tv_sec = ts.tv_sec;
-	tv.tv_usec = ts.tv_nsec / 1000;
-	return (tv);
-}
-#endif
-
-#ifndef _LIBC
-int
-evSetTimer(evContext opaqueCtx,
-	   evTimerFunc func,
-	   void *uap,
-	   struct timespec due,
-	   struct timespec inter,
-	   evTimerID *opaqueID
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *id;
-
-	evPrintf(ctx, 1,
-"evSetTimer(ctx %p, func %p, uap %p, due %ld.%09ld, inter %ld.%09ld)\n",
-		 ctx, func, uap,
-		 (long)due.tv_sec, due.tv_nsec,
-		 (long)inter.tv_sec, inter.tv_nsec);
-
-#ifdef __hpux
-	/*
-	 * tv_sec and tv_nsec are unsigned.
-	 */
-	if (due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#else
-	if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#endif
-
-	/* due={0,0} is a magic cookie meaning "now." */
-	if (due.tv_sec == (time_t)0 && due.tv_nsec == 0L)
-		due = evNowTime();
-
-	/* Allocate and fill. */
-	OKNEW(id);
-	id->func = func;
-	id->uap = uap;
-	id->due = due;
-	id->inter = inter;
-
-	if (heap_insert(ctx->timers, id) < 0)
-		return (-1);
-
-	/* Remember the ID if the caller provided us a place for it. */
-	if (opaqueID)
-		opaqueID->opaque = id;
-
-	if (ctx->debug > 7) {
-		evPrintf(ctx, 7, "timers after evSetTimer:\n");
-		(void) heap_for_each(ctx->timers, print_timer, (void *)ctx);
-	}
-
-	return (0);
-}
-
-int
-evClearTimer(evContext opaqueCtx, evTimerID id) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *del = id.opaque;
-
-	if (ctx->cur != NULL &&
-	    ctx->cur->type == Timer &&
-	    ctx->cur->u.timer.this == del) {
-		evPrintf(ctx, 8, "deferring delete of timer (executing)\n");
-		/*
-		 * Setting the interval to zero ensures that evDrop() will
-		 * clean up the timer.
-		 */
-		del->inter = evConsTime(0, 0);
-		return (0);
-	}
-
-	if (heap_element(ctx->timers, del->index) != del)
-		EV_ERR(ENOENT);
-
-	if (heap_delete(ctx->timers, del->index) < 0)
-		return (-1);
-	FREE(del);
-
-	if (ctx->debug > 7) {
-		evPrintf(ctx, 7, "timers after evClearTimer:\n");
-		(void) heap_for_each(ctx->timers, print_timer, (void *)ctx);
-	}
-
-	return (0);
-}
-
-int
-evConfigTimer(evContext opaqueCtx,
-	     evTimerID id,
-	     const char *param,
-	     int value
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *timer = id.opaque;
-	int result=0;
-
-	UNUSED(value);
-
-	if (heap_element(ctx->timers, timer->index) != timer)
-		EV_ERR(ENOENT);
-
-	if (strcmp(param, "rate") == 0)
-		timer->mode |= EV_TMR_RATE;
-	else if (strcmp(param, "interval") == 0)
-		timer->mode &= ~EV_TMR_RATE;
-	else
-		EV_ERR(EINVAL);
-
-	return (result);
-}
-
-int
-evResetTimer(evContext opaqueCtx,
-	     evTimerID id,
-	     evTimerFunc func,
-	     void *uap,
-	     struct timespec due,
-	     struct timespec inter
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *timer = id.opaque;
-	struct timespec old_due;
-	int result=0;
-
-	if (heap_element(ctx->timers, timer->index) != timer)
-		EV_ERR(ENOENT);
-
-#ifdef __hpux
-	/*
-	 * tv_sec and tv_nsec are unsigned.
-	 */
-	if (due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#else
-	if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#endif
-
-	old_due = timer->due;
-
-	timer->func = func;
-	timer->uap = uap;
-	timer->due = due;
-	timer->inter = inter;
-
-	switch (evCmpTime(due, old_due)) {
-	case -1:
-		result = heap_increased(ctx->timers, timer->index);
-		break;
-	case 0:
-		result = 0;
-		break;
-	case 1:
-		result = heap_decreased(ctx->timers, timer->index);
-		break;
-	}
-
-	if (ctx->debug > 7) {
-		evPrintf(ctx, 7, "timers after evResetTimer:\n");
-		(void) heap_for_each(ctx->timers, print_timer, (void *)ctx);
-	}
-
-	return (result);
-}
-
-int
-evSetIdleTimer(evContext opaqueCtx,
-		evTimerFunc func,
-		void *uap,
-		struct timespec max_idle,
-		evTimerID *opaqueID
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	idle_timer *tt;
-
-	/* Allocate and fill. */
-	OKNEW(tt);
-	tt->func = func;
-	tt->uap = uap;
-	tt->lastTouched = ctx->lastEventTime;
-	tt->max_idle = max_idle;
-
-	if (evSetTimer(opaqueCtx, idle_timeout, tt,
-		       evAddTime(ctx->lastEventTime, max_idle),
-		       max_idle, opaqueID) < 0) {
-		FREE(tt);
-		return (-1);
-	}
-
-	tt->timer = opaqueID->opaque;
-
-	return (0);
-}
-
-int
-evClearIdleTimer(evContext opaqueCtx, evTimerID id) {
-	evTimer *del = id.opaque;
-	idle_timer *tt = del->uap;
-
-	FREE(tt);
-	return (evClearTimer(opaqueCtx, id));
-}
-
-int
-evResetIdleTimer(evContext opaqueCtx,
-		 evTimerID opaqueID,
-		 evTimerFunc func,
-		 void *uap,
-		 struct timespec max_idle
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *timer = opaqueID.opaque;
-	idle_timer *tt = timer->uap;
-
-	tt->func = func;
-	tt->uap = uap;
-	tt->lastTouched = ctx->lastEventTime;
-	tt->max_idle = max_idle;
-
-	return (evResetTimer(opaqueCtx, opaqueID, idle_timeout, tt,
-			     evAddTime(ctx->lastEventTime, max_idle),
-			     max_idle));
-}
-
-int
-evTouchIdleTimer(evContext opaqueCtx, evTimerID id) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *t = id.opaque;
-	idle_timer *tt = t->uap;
-
-	tt->lastTouched = ctx->lastEventTime;
-
-	return (0);
-}
-
-/* Public to the rest of eventlib. */
-
-heap_context
-evCreateTimers(const evContext_p *ctx) {
-
-	UNUSED(ctx);
-
-	return (heap_new(due_sooner, set_index, 2048));
-}
-
-void
-evDestroyTimers(const evContext_p *ctx) {
-	(void) heap_for_each(ctx->timers, free_timer, NULL);
-	(void) heap_free(ctx->timers);
-}
-
-/* Private. */
-
-static int
-due_sooner(void *a, void *b) {
-	evTimer *a_timer, *b_timer;
-
-	a_timer = a;
-	b_timer = b;
-	return (evCmpTime(a_timer->due, b_timer->due) < 0);
-}
-
-static void
-set_index(void *what, int index) {
-	evTimer *timer;
-
-	timer = what;
-	timer->index = index;
-}
-
-static void
-free_timer(void *what, void *uap) {
-	evTimer *t = what;
-
-	UNUSED(uap);
-
-	FREE(t);
-}
-
-static void
-print_timer(void *what, void *uap) {
-	evTimer *cur = what;
-	evContext_p *ctx = uap;
-
-	cur = what;
-	evPrintf(ctx, 7,
-	    "  func %p, uap %p, due %ld.%09ld, inter %ld.%09ld\n",
-		 cur->func, cur->uap,
-		 (long)cur->due.tv_sec, cur->due.tv_nsec,
-		 (long)cur->inter.tv_sec, cur->inter.tv_nsec);
-}
-
-static void
-idle_timeout(evContext opaqueCtx,
-	     void *uap,
-	     struct timespec due,
-	     struct timespec inter
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	idle_timer *this = uap;
-	struct timespec idle;
-
-	UNUSED(due);
-	UNUSED(inter);
-	
-	idle = evSubTime(ctx->lastEventTime, this->lastTouched);
-	if (evCmpTime(idle, this->max_idle) >= 0) {
-		(this->func)(opaqueCtx, this->uap, this->timer->due,
-			     this->max_idle);
-		/*
-		 * Setting the interval to zero will cause the timer to
-		 * be cleaned up in evDrop().
-		 */
-		this->timer->inter = evConsTime(0, 0);
-		FREE(this);
-	} else {
-		/* evDrop() will reschedule the timer. */
-		this->timer->inter = evSubTime(this->max_idle, idle);
-	}
-}
-#endif
diff --git a/lib/libc/isc/eventlib_p.h b/lib/libc/isc/eventlib_p.h
deleted file mode 100644
index 5c24f10..0000000
--- a/lib/libc/isc/eventlib_p.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Copyright (c) 2005 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* eventlib_p.h - private interfaces for eventlib
- * vix 09sep95 [initial]
- *
- * $Id: eventlib_p.h 89 2016-01-12 00:20:40Z reddawg $
- * $FreeBSD: src/lib/libc/isc/eventlib_p.h,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $
- */
-
-#ifndef _EVENTLIB_P_H
-#define _EVENTLIB_P_H
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/un.h>
-
-#define EVENTLIB_DEBUG 1
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef _LIBC
-#include <isc/list.h>
-#include <isc/heap.h>
-#include <isc/memcluster.h>
-#endif
-
-#define	EV_MASK_ALL	(EV_READ | EV_WRITE | EV_EXCEPT)
-#define EV_ERR(e)		return (errno = (e), -1)
-#define OK(x)		if ((x) < 0) EV_ERR(errno); else (void)NULL
-
-#define	NEW(p)		if (((p) = memget(sizeof *(p))) != NULL) \
-				FILL(p); \
-			else \
-				(void)NULL;
-#define OKNEW(p)	if (!((p) = memget(sizeof *(p)))) { \
-				errno = ENOMEM; \
-				return (-1); \
-			} else \
-				FILL(p)
-#define FREE(p)		memput((p), sizeof *(p))
-
-#if EVENTLIB_DEBUG
-#define FILL(p)		memset((p), 0xF5, sizeof *(p))
-#else
-#define FILL(p)
-#endif
-
-#ifdef USE_POLL
-#ifdef HAVE_STROPTS_H
-#include <stropts.h>
-#endif
-#include <poll.h>
-#endif /* USE_POLL */
-
-typedef struct evConn {
-	evConnFunc	func;
-	void *		uap;
-	int		fd;
-	int		flags;
-#define EV_CONN_LISTEN		0x0001		/* Connection is a listener. */
-#define EV_CONN_SELECTED	0x0002		/* evSelectFD(conn->file). */
-#define EV_CONN_BLOCK		0x0004		/* Listener fd was blocking. */
-	evFileID	file;
-	struct evConn *	prev;
-	struct evConn *	next;
-} evConn;
-
-#ifndef _LIBC
-typedef struct evAccept {
-	int		fd;
-	union {
-		struct sockaddr		sa;
-		struct sockaddr_in	in;
-#ifndef NO_SOCKADDR_UN
-		struct sockaddr_un	un;
-#endif
-	}		la;
-	ISC_SOCKLEN_T	lalen;
-	union {
-		struct sockaddr		sa;
-		struct sockaddr_in	in;
-#ifndef NO_SOCKADDR_UN
-		struct sockaddr_un	un;
-#endif
-	}		ra;
-	ISC_SOCKLEN_T	ralen;
-	int		ioErrno;
-	evConn *	conn;
-	LINK(struct evAccept) link;
-} evAccept;
-
-typedef struct evFile {
-	evFileFunc	func;
-	void *		uap;
-	int		fd;
-	int		eventmask;
-	int		preemptive;
-	struct evFile *	prev;
-	struct evFile *	next;
-	struct evFile *	fdprev;
-	struct evFile *	fdnext;
-} evFile;
-
-typedef struct evStream {
-	evStreamFunc	func;
-	void *		uap;
-	evFileID	file;
-	evTimerID	timer;
-	int		flags;
-#define EV_STR_TIMEROK	0x0001	/* IFF timer valid. */
-	int		fd;
-	struct iovec *	iovOrig;
-	int		iovOrigCount;
-	struct iovec *	iovCur;
-	int		iovCurCount;
-	int		ioTotal;
-	int		ioDone;
-	int		ioErrno;
-	struct evStream	*prevDone, *nextDone;
-	struct evStream	*prev, *next;
-} evStream;
-
-typedef struct evTimer {
-	evTimerFunc	func;
-	void *		uap;
-	struct timespec	due, inter;
-	int		index;
-	int		mode;
-#define EV_TMR_RATE	1
-} evTimer;
-
-typedef struct evWait {
-	evWaitFunc	func;
-	void *		uap;
-	const void *	tag;
-	struct evWait *	next;
-} evWait;
-
-typedef struct evWaitList {
-	evWait *		first;
-	evWait *		last;
-	struct evWaitList *	prev;
-	struct evWaitList *	next;
-} evWaitList;
-
-typedef struct evEvent_p {
-	enum {  Accept, File, Stream, Timer, Wait, Free, Null  } type;
-	union {
-		struct {  evAccept *this;  }			accept;
-		struct {  evFile *this; int eventmask;  }	file;
-		struct {  evStream *this;  }			stream;
-		struct {  evTimer *this;  }			timer;
-		struct {  evWait *this;  }			wait;
-		struct {  struct evEvent_p *next;  }		free;
-		struct {  const void *placeholder;  }		null;
-	} u;
-} evEvent_p;
-#endif
-
-#ifdef USE_POLL
-typedef struct { 
-	void		*ctx;	/* pointer to the evContext_p   */ 
-	uint32_t	type;	/* READ, WRITE, EXCEPT, nonblk  */ 
-	uint32_t	result;	/* 1 => revents, 0 => events    */ 
-} __evEmulMask; 
-
-#define emulMaskInit(ctx, field, ev, lastnext) \
-	ctx->field.ctx = ctx; \
-	ctx->field.type = ev; \
-	ctx->field.result = lastnext; 
-  
-extern short	*__fd_eventfield(int fd, __evEmulMask *maskp); 
-extern short	__poll_event(__evEmulMask *maskp); 
-extern void		__fd_clr(int fd, __evEmulMask *maskp); 
-extern void		__fd_set(int fd, __evEmulMask *maskp); 
-
-#undef  FD_ZERO 
-#define FD_ZERO(maskp) 
-  
-#undef  FD_SET 
-#define FD_SET(fd, maskp) \
-	__fd_set(fd, maskp) 
-
-#undef  FD_CLR 
-#define FD_CLR(fd, maskp) \
-	__fd_clr(fd, maskp) 
-
-#undef  FD_ISSET 
-#define FD_ISSET(fd, maskp) \
-	((*__fd_eventfield(fd, maskp) & __poll_event(maskp)) != 0) 
-
-#endif /* USE_POLL */
-
-#ifndef _LIBC
-typedef struct {
-	/* Global. */
-	const evEvent_p	*cur;
-	/* Debugging. */
-	int		debug;
-	FILE		*output;
-	/* Connections. */
-	evConn		*conns;
-	LIST(evAccept)	accepts;
-	/* Files. */
-	evFile		*files, *fdNext;
-#ifndef USE_POLL
-	fd_set		rdLast, rdNext;
-	fd_set		wrLast, wrNext;
-	fd_set		exLast, exNext;
-	fd_set		nonblockBefore;
-	int		fdMax, fdCount, highestFD;
-	evFile		*fdTable[FD_SETSIZE];
-#else
-	struct pollfd	*pollfds;	/* Allocated as needed  */ 
-	evFile		**fdTable;	/* Ditto                */ 
-	int		maxnfds;	/* # elements in above  */ 
-	int		firstfd;	/* First active fd      */ 
-	int		fdMax;		/* Last active fd       */ 
-	int		fdCount;	/* # fd:s with I/O      */ 
-	int		highestFD;	/* max fd allowed by OS */ 
-	__evEmulMask	rdLast, rdNext; 
-	__evEmulMask	wrLast, wrNext; 
-	__evEmulMask	exLast, exNext; 
-	__evEmulMask	nonblockBefore; 
-#endif /* USE_POLL */
-#ifdef EVENTLIB_TIME_CHECKS
-	struct timespec	lastSelectTime;
-	int		lastFdCount;
-#endif
-	/* Streams. */
-	evStream	*streams;
-	evStream	*strDone, *strLast;
-	/* Timers. */
-	struct timespec	lastEventTime;
-	heap_context	timers;
-	/* Waits. */
-	evWaitList	*waitLists;
-	evWaitList	waitDone;
-} evContext_p;
-
-/* eventlib.c */
-#define evPrintf __evPrintf
-void evPrintf(const evContext_p *ctx, int level, const char *fmt, ...)
-     ISC_FORMAT_PRINTF(3, 4);
-
-#ifdef USE_POLL
-extern int evPollfdRealloc(evContext_p *ctx, int pollfd_chunk_size, int fd);
-#endif /* USE_POLL */
-
-/* ev_timers.c */
-#define evCreateTimers __evCreateTimers
-heap_context evCreateTimers(const evContext_p *);
-#define evDestroyTimers __evDestroyTimers
-void evDestroyTimers(const evContext_p *);
-
-/* ev_waits.c */
-#define evFreeWait __evFreeWait
-evWait *evFreeWait(evContext_p *ctx, evWait *old);
-#endif
-
-/* Global options */
-extern int	__evOptMonoTime;
-
-#endif /*_EVENTLIB_P_H*/
diff --git a/lib/libc/locale/Makefile b/lib/libc/locale/Makefile
deleted file mode 100644
index 89f58b9..0000000
--- a/lib/libc/locale/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = big5.o btowc.o collate.o collcmp.o euc.o fix_grouping.o gb18030.o gb2312.o gbk.o isctype.o iswctype.o ldpart.o lmessages.o lmonetary.o lnumeric.o localeconv.o mblen.o mbrlen.o mbrtowc.o mbsinit.o mbsnrtowcs.o mbsrtowcs.o mbstowcs.o mbtowc.o mskanji.o nextwctype.o nl_langinfo.o nomacros.o none.o rpmatch.o rune.o runetype.o setlocale.o setrunelocale.o table.o tolower.o toupper.o utf8.o wcrtomb.o wcsftime.o wcsnrtombs.o wcsrtombs.o wcstod.o wcstof.o wcstoimax.o wcstol.o wcstold.o wcstoll.o wcstombs.o wcstoul.o wcstoull.o wcstoumax.o wctob.o wctomb.o wctrans.o wctype.o wcwidth.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/locale/big5.c b/lib/libc/locale/big5.c
deleted file mode 100644
index 7837591..0000000
--- a/lib/libc/locale/big5.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)big5.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.17 2005/02/27 15:11:09 phantom Exp $");
-
-#include <sys/types.h>
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_BIG5_mbsinit(const mbstate_t *);
-static size_t	_BIG5_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	wchar_t	ch;
-} _BIG5State;
-
-int
-_BIG5_init(_RuneLocale *rl)
-{
-
-	__mbrtowc = _BIG5_mbrtowc;
-	__wcrtomb = _BIG5_wcrtomb;
-	__mbsinit = _BIG5_mbsinit;
-	_CurrentRuneLocale = rl;
-	__mb_cur_max = 2;
-	return (0);
-}
-
-static int
-_BIG5_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _BIG5State *)ps)->ch == 0);
-}
-
-static __inline int
-_big5_check(u_int c)
-{
-
-	c &= 0xff;
-	return ((c >= 0xa1 && c <= 0xfe) ? 2 : 1);
-}
-
-static size_t
-_BIG5_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_BIG5State *bs;
-	wchar_t wc;
-	size_t len;
-
-	bs = (_BIG5State *)ps;
-
-	if ((bs->ch & ~0xFF) != 0) {
-		/* Bad conversion state. */
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	if (bs->ch != 0) {
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (bs->ch << 8) | (*s & 0xFF);
-		if (pwc != NULL)
-			*pwc = wc;
-		bs->ch = 0;
-		return (1);
-	}
-
-	len = (size_t)_big5_check(*s);
-	wc = *s++ & 0xff;
-	if (len == 2) {
-		if (n < 2) {
-			/* Incomplete multibyte sequence */
-			bs->ch = wc;
-			return ((size_t)-2);
-		}
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (wc << 8) | (*s++ & 0xff);
-		if (pwc != NULL)
-			*pwc = wc;
-                return (2);
-	} else {
-		if (pwc != NULL)
-			*pwc = wc;
-		return (wc == L'\0' ? 0 : 1);
-	}
-}
-
-static size_t
-_BIG5_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_BIG5State *bs;
-
-	bs = (_BIG5State *)ps;
-
-	if (bs->ch != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc & 0x8000) {
-		*s++ = (wc >> 8) & 0xff;
-		*s = wc & 0xff;
-		return (2);
-	}
-	*s = wc & 0xff;
-	return (1);
-}
diff --git a/lib/libc/locale/btowc.c b/lib/libc/locale/btowc.c
deleted file mode 100644
index 44b501e..0000000
--- a/lib/libc/locale/btowc.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/btowc.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
-
-#include <stdio.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-wint_t
-btowc(int c)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs = initial;
-	char cc;
-	wchar_t wc;
-
-	if (c == EOF)
-		return (WEOF);
-	/*
-	 * We expect mbrtowc() to return 0 or 1, hence the check for n > 1
-	 * which detects error return values as well as "impossible" byte
-	 * counts.
-	 */
-	cc = (char)c;
-	if (__mbrtowc(&wc, &cc, 1, &mbs) > 1)
-		return (WEOF);
-	return (wc);
-}
diff --git a/lib/libc/locale/collate.c b/lib/libc/locale/collate.c
deleted file mode 100644
index 184fac6..0000000
--- a/lib/libc/locale/collate.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/collate.c,v 1.35 2005/02/27 20:31:13 ru Exp $");
-
-#include "namespace.h"
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sysexits.h>
-#include "un-namespace.h"
-
-#include "collate.h"
-#include "setlocale.h"
-#include "ldpart.h"
-
-#include "libc_private.h"
-
-int __collate_load_error = 1;
-int __collate_substitute_nontrivial;
-
-u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
-struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
-struct __collate_st_chain_pri *__collate_chain_pri_table;
-
-void __collate_err(int ex, const char *f) __dead2;
-
-int
-__collate_load_tables(const char *encoding)
-{
-	FILE *fp;
-	int i, saverr, chains;
-	uint32_t u32;
-	char strbuf[STR_LEN], buf[PATH_MAX];
-	void *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table;
-	static char collate_encoding[ENCODING_LEN + 1];
-
-	/* 'encoding' must be already checked. */
-	if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) {
-		__collate_load_error = 1;
-		return (_LDP_CACHE);
-	}
-
-	/*
-	 * If the locale name is the same as our cache, use the cache.
-	 */
-	if (strcmp(encoding, collate_encoding) == 0) {
-		__collate_load_error = 0;
-		return (_LDP_CACHE);
-	}
-
-	/*
-	 * Slurp the locale file into the cache.
-	 */
-
-	/* 'PathLocale' must be already set & checked. */
-	/* Range checking not needed, encoding has fixed size */
-	(void)strcpy(buf, _PathLocale);
-	(void)strcat(buf, "/");
-	(void)strcat(buf, encoding);
-	(void)strcat(buf, "/LC_COLLATE");
-	if ((fp = fopen(buf, "r")) == NULL)
-		return (_LDP_ERROR);
-
-	if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) {
-		saverr = errno;
-		(void)fclose(fp);
-		errno = saverr;
-		return (_LDP_ERROR);
-	}
-	chains = -1;
-	if (strcmp(strbuf, COLLATE_VERSION) == 0)
-		chains = 0;
-	else if (strcmp(strbuf, COLLATE_VERSION1_2) == 0)
-		chains = 1;
-	if (chains < 0) {
-		(void)fclose(fp);
-		errno = EFTYPE;
-		return (_LDP_ERROR);
-	}
-	if (chains) {
-		if (fread(&u32, sizeof(u32), 1, fp) != 1) {
-			saverr = errno;
-			(void)fclose(fp);
-			errno = saverr;
-			return (_LDP_ERROR);
-		}
-		if ((chains = (int)ntohl(u32)) < 1) {
-			(void)fclose(fp);
-			errno = EFTYPE;
-			return (_LDP_ERROR);
-		}
-	} else
-		chains = TABLE_SIZE;
-
-	if ((TMP_substitute_table =
-	     malloc(sizeof(__collate_substitute_table))) == NULL) {
-		saverr = errno;
-		(void)fclose(fp);
-		errno = saverr;
-		return (_LDP_ERROR);
-	}
-	if ((TMP_char_pri_table =
-	     malloc(sizeof(__collate_char_pri_table))) == NULL) {
-		saverr = errno;
-		free(TMP_substitute_table);
-		(void)fclose(fp);
-		errno = saverr;
-		return (_LDP_ERROR);
-	}
-	if ((TMP_chain_pri_table =
-	     malloc(sizeof(*__collate_chain_pri_table) * chains)) == NULL) {
-		saverr = errno;
-		free(TMP_substitute_table);
-		free(TMP_char_pri_table);
-		(void)fclose(fp);
-		errno = saverr;
-		return (_LDP_ERROR);
-	}
-
-#define FREAD(a, b, c, d) \
-{ \
-	if (fread(a, b, c, d) != c) { \
-		saverr = errno; \
-		free(TMP_substitute_table); \
-		free(TMP_char_pri_table); \
-		free(TMP_chain_pri_table); \
-		(void)fclose(d); \
-		errno = saverr; \
-		return (_LDP_ERROR); \
-	} \
-}
-
-	FREAD(TMP_substitute_table, sizeof(__collate_substitute_table), 1, fp);
-	FREAD(TMP_char_pri_table, sizeof(__collate_char_pri_table), 1, fp);
-	FREAD(TMP_chain_pri_table,
-	      sizeof(*__collate_chain_pri_table), chains, fp);
-	(void)fclose(fp);
-
-	(void)strcpy(collate_encoding, encoding);
-	if (__collate_substitute_table_ptr != NULL)
-		free(__collate_substitute_table_ptr);
-	__collate_substitute_table_ptr = TMP_substitute_table;
-	if (__collate_char_pri_table_ptr != NULL)
-		free(__collate_char_pri_table_ptr);
-	__collate_char_pri_table_ptr = TMP_char_pri_table;
-	for (i = 0; i < UCHAR_MAX + 1; i++) {
-		__collate_char_pri_table[i].prim =
-		    ntohl(__collate_char_pri_table[i].prim);
-		__collate_char_pri_table[i].sec =
-		    ntohl(__collate_char_pri_table[i].sec);
-	}
-	if (__collate_chain_pri_table != NULL)
-		free(__collate_chain_pri_table);
-	__collate_chain_pri_table = TMP_chain_pri_table;
-	for (i = 0; i < chains; i++) {
-		__collate_chain_pri_table[i].prim =
-		    ntohl(__collate_chain_pri_table[i].prim);
-		__collate_chain_pri_table[i].sec =
-		    ntohl(__collate_chain_pri_table[i].sec);
-	}
-	__collate_substitute_nontrivial = 0;
-	for (i = 0; i < UCHAR_MAX + 1; i++) {
-		if (__collate_substitute_table[i][0] != i ||
-		    __collate_substitute_table[i][1] != 0) {
-			__collate_substitute_nontrivial = 1;
-			break;
-		}
-	}
-	__collate_load_error = 0;
-
-	return (_LDP_LOADED);
-}
-
-u_char *
-__collate_substitute(const u_char *s)
-{
-	int dest_len, len, nlen;
-	int delta = strlen(s);
-	u_char *dest_str = NULL;
-
-	if (s == NULL || *s == '\0')
-		return (__collate_strdup(""));
-	delta += delta / 8;
-	dest_str = malloc(dest_len = delta);
-	if (dest_str == NULL)
-		__collate_err(EX_OSERR, __func__);
-	len = 0;
-	while (*s) {
-		nlen = len + strlen(__collate_substitute_table[*s]);
-		if (dest_len <= nlen) {
-			dest_str = reallocf(dest_str, dest_len = nlen + delta);
-			if (dest_str == NULL)
-				__collate_err(EX_OSERR, __func__);
-		}
-		(void)strcpy(dest_str + len, __collate_substitute_table[*s++]);
-		len = nlen;
-	}
-	return (dest_str);
-}
-
-void
-__collate_lookup(const u_char *t, int *len, int *prim, int *sec)
-{
-	struct __collate_st_chain_pri *p2;
-
-	*len = 1;
-	*prim = *sec = 0;
-	for (p2 = __collate_chain_pri_table; p2->str[0] != '\0'; p2++) {
-		if (*t == p2->str[0] &&
-		    strncmp(t, p2->str, strlen(p2->str)) == 0) {
-			*len = strlen(p2->str);
-			*prim = p2->prim;
-			*sec = p2->sec;
-			return;
-		}
-	}
-	*prim = __collate_char_pri_table[*t].prim;
-	*sec = __collate_char_pri_table[*t].sec;
-}
-
-u_char *
-__collate_strdup(u_char *s)
-{
-	u_char *t = strdup(s);
-
-	if (t == NULL)
-		__collate_err(EX_OSERR, __func__);
-	return (t);
-}
-
-void
-__collate_err(int ex, const char *f)
-{
-	const char *s;
-	int serrno = errno;
-
-	s = _getprogname();
-	_write(STDERR_FILENO, s, strlen(s));
-	_write(STDERR_FILENO, ": ", 2);
-	s = f;
-	_write(STDERR_FILENO, s, strlen(s));
-	_write(STDERR_FILENO, ": ", 2);
-	s = strerror(serrno);
-	_write(STDERR_FILENO, s, strlen(s));
-	_write(STDERR_FILENO, "\n", 1);
-	exit(ex);
-}
-
-#ifdef COLLATE_DEBUG
-void
-__collate_print_tables()
-{
-	int i;
-	struct __collate_st_chain_pri *p2;
-
-	printf("Substitute table:\n");
-	for (i = 0; i < UCHAR_MAX + 1; i++)
-	    if (i != *__collate_substitute_table[i])
-		printf("\t'%c' --> \"%s\"\n", i,
-		       __collate_substitute_table[i]);
-	printf("Chain priority table:\n");
-	for (p2 = __collate_chain_pri_table; p2->str[0] != '\0'; p2++)
-		printf("\t\"%s\" : %d %d\n", p2->str, p2->prim, p2->sec);
-	printf("Char priority table:\n");
-	for (i = 0; i < UCHAR_MAX + 1; i++)
-		printf("\t'%c' : %d %d\n", i, __collate_char_pri_table[i].prim,
-		       __collate_char_pri_table[i].sec);
-}
-#endif
diff --git a/lib/libc/locale/collate.h b/lib/libc/locale/collate.h
deleted file mode 100644
index a8d2176..0000000
--- a/lib/libc/locale/collate.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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/lib/libc/locale/collate.h,v 1.15 2005/02/27 20:31:13 ru Exp $
- */
-
-#ifndef _COLLATE_H_
-#define	_COLLATE_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <limits.h>
-
-#define STR_LEN 10
-#define TABLE_SIZE 100
-#define COLLATE_VERSION    "1.0\n"
-#define COLLATE_VERSION1_2 "1.2\n"
-
-struct __collate_st_char_pri {
-	int prim, sec;
-};
-struct __collate_st_chain_pri {
-	u_char str[STR_LEN];
-	int prim, sec;
-};
-
-extern int __collate_load_error;
-extern int __collate_substitute_nontrivial;
-#define __collate_substitute_table (*__collate_substitute_table_ptr)
-extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
-#define __collate_char_pri_table (*__collate_char_pri_table_ptr)
-extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
-extern struct __collate_st_chain_pri *__collate_chain_pri_table;
-
-__BEGIN_DECLS
-u_char	*__collate_strdup(u_char *);
-u_char	*__collate_substitute(const u_char *);
-int	__collate_load_tables(const char *);
-void	__collate_lookup(const u_char *, int *, int *, int *);
-int	__collate_range_cmp(int, int);
-#ifdef COLLATE_DEBUG
-void	__collate_print_tables(void);
-#endif
-__END_DECLS
-
-#endif /* !_COLLATE_H_ */
diff --git a/lib/libc/locale/collcmp.c b/lib/libc/locale/collcmp.c
deleted file mode 100644
index dde67a4..0000000
--- a/lib/libc/locale/collcmp.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/collcmp.c,v 1.18 2005/02/27 14:54:23 phantom Exp $");
-
-#include <string.h>
-#include "collate.h"
-
-/*
- * Compare two characters using collate
- */
-
-int __collate_range_cmp(int c1, int c2)
-{
-	static char s1[2], s2[2];
-
-	s1[0] = c1;
-	s2[0] = c2;
-	return (strcoll(s1, s2));
-}
diff --git a/lib/libc/locale/euc.c b/lib/libc/locale/euc.c
deleted file mode 100644
index 32f8fb8..0000000
--- a/lib/libc/locale/euc.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)euc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.21 2005/02/27 15:11:09 phantom Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_EUC_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_EUC_mbsinit(const mbstate_t *);
-static size_t	_EUC_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	int	count[4];
-	wchar_t	bits[4];
-	wchar_t	mask;
-} _EucInfo;
-
-typedef struct {
-	wchar_t	ch;
-	int	set;
-	int	want;
-} _EucState;
-
-int
-_EUC_init(_RuneLocale *rl)
-{
-	_EucInfo *ei;
-	int x, new__mb_cur_max;
-	char *v, *e;
-
-	if (rl->__variable == NULL)
-		return (EFTYPE);
-
-	v = (char *)rl->__variable;
-
-	while (*v == ' ' || *v == '\t')
-		++v;
-
-	if ((ei = malloc(sizeof(_EucInfo))) == NULL)
-		return (errno == 0 ? ENOMEM : errno);
-
-	new__mb_cur_max = 0;
-	for (x = 0; x < 4; ++x) {
-		ei->count[x] = (int)strtol(v, &e, 0);
-		if (v == e || !(v = e)) {
-			free(ei);
-			return (EFTYPE);
-		}
-		if (new__mb_cur_max < ei->count[x])
-			new__mb_cur_max = ei->count[x];
-		while (*v == ' ' || *v == '\t')
-			++v;
-		ei->bits[x] = (int)strtol(v, &e, 0);
-		if (v == e || !(v = e)) {
-			free(ei);
-			return (EFTYPE);
-		}
-		while (*v == ' ' || *v == '\t')
-			++v;
-	}
-	ei->mask = (int)strtol(v, &e, 0);
-	if (v == e || !(v = e)) {
-		free(ei);
-		return (EFTYPE);
-	}
-	rl->__variable = ei;
-	rl->__variable_len = sizeof(_EucInfo);
-	_CurrentRuneLocale = rl;
-	__mb_cur_max = new__mb_cur_max;
-	__mbrtowc = _EUC_mbrtowc;
-	__wcrtomb = _EUC_wcrtomb;
-	__mbsinit = _EUC_mbsinit;
-	return (0);
-}
-
-static int
-_EUC_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _EucState *)ps)->want == 0);
-}
-
-#define	CEI	((_EucInfo *)(_CurrentRuneLocale->__variable))
-
-#define	_SS2	0x008e
-#define	_SS3	0x008f
-
-#define	GR_BITS	0x80808080 /* XXX: to be fixed */
-
-static __inline int
-_euc_set(u_int c)
-{
-
-	c &= 0xff;
-	return ((c & 0x80) ? c == _SS3 ? 3 : c == _SS2 ? 2 : 1 : 0);
-}
-
-static size_t
-_EUC_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_EucState *es;
-	int i, set, want;
-	wchar_t wc;
-	const char *os;
-
-	es = (_EucState *)ps;
-
-	if (es->want < 0 || es->want > MB_CUR_MAX || es->set < 0 ||
-	    es->set > 3) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	os = s;
-
-	if (es->want == 0) {
-		want = CEI->count[set = _euc_set(*s)];
-		if (set == 2 || set == 3) {
-			--want;
-			if (--n == 0) {
-				/* Incomplete multibyte sequence */
-				es->set = set;
-				es->want = want;
-				es->ch = 0;
-				return ((size_t)-2);
-			}
-			++s;
-			if (*s == '\0') {
-				errno = EILSEQ;
-				return ((size_t)-1);
-			}
-		}
-		wc = (unsigned char)*s++;
-	} else {
-		set = es->set;
-		want = es->want;
-		wc = es->ch;
-	}
-	for (i = (es->want == 0) ? 1 : 0; i < MIN(want, n); i++) {
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (wc << 8) | (unsigned char)*s++;
-	}
-	if (i < want) {
-		/* Incomplete multibyte sequence */
-		es->set = set;
-		es->want = want - i;
-		es->ch = wc;
-		return ((size_t)-2);
-	}
-	wc = (wc & ~CEI->mask) | CEI->bits[set];
-	if (pwc != NULL)
-		*pwc = wc;
-	es->want = 0;
-	return (wc == L'\0' ? 0 : s - os);
-}
-
-static size_t
-_EUC_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_EucState *es;
-	wchar_t m, nm;
-	int i, len;
-
-	es = (_EucState *)ps;
-
-	if (es->want != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-
-	m = wc & CEI->mask;
-	nm = wc & ~m;
-
-	if (m == CEI->bits[1]) {
-CodeSet1:
-		/* Codeset 1: The first byte must have 0x80 in it. */
-		i = len = CEI->count[1];
-		while (i-- > 0)
-			*s++ = (nm >> (i << 3)) | 0x80;
-	} else {
-		if (m == CEI->bits[0])
-			i = len = CEI->count[0];
-		else if (m == CEI->bits[2]) {
-			i = len = CEI->count[2];
-			*s++ = _SS2;
-			--i;
-			/* SS2 designates G2 into GR */
-			nm |= GR_BITS;
-		} else if (m == CEI->bits[3]) {
-			i = len = CEI->count[3];
-			*s++ = _SS3;
-			--i;
-			/* SS3 designates G3 into GR */
-			nm |= GR_BITS;
-		} else
-			goto CodeSet1;	/* Bletch */
-		while (i-- > 0)
-			*s++ = (nm >> (i << 3)) & 0xff;
-	}
-	return (len);
-}
diff --git a/lib/libc/locale/fix_grouping.c b/lib/libc/locale/fix_grouping.c
deleted file mode 100644
index ab08f3f..0000000
--- a/lib/libc/locale/fix_grouping.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2001 Alexey Zelkin <phantom@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.8 2003/06/26 10:46:16 phantom Exp $");
-
-#include <ctype.h>
-#include <limits.h>
-#include <stddef.h>
-
-static const char nogrouping[] = { CHAR_MAX, '\0' };
-
-/*
- * Internal helper used to convert grouping sequences from string
- * representation into POSIX specified form, i.e.
- *
- * "3;3;-1" -> "\003\003\177\000"
- */
-
-const char *
-__fix_locale_grouping_str(const char *str)
-{
-	char *src, *dst;
-	char n;
-
-	if (str == NULL || *str == '\0') {
-		return nogrouping;
-	}
-
-	for (src = (char*)str, dst = (char*)str; *src != '\0'; src++) {
-
-		/* input string examples: "3;3", "3;2;-1" */
-		if (*src == ';')
-			continue;
-	
-		if (*src == '-' && *(src+1) == '1') {
-			*dst++ = CHAR_MAX;
-			src++;
-			continue;
-		}
-
-		if (!isdigit((unsigned char)*src)) {
-			/* broken grouping string */
-			return nogrouping;
-		}
-
-		/* assume all numbers <= 99 */
-		n = *src - '0';
-		if (isdigit((unsigned char)*(src+1))) {
-			src++;
-			n *= 10;
-			n += *src - '0';
-		}
-
-		*dst = n;
-		/* NOTE: assume all input started with "0" as 'no grouping' */
-		if (*dst == '\0')
-			return (dst == (char*)str) ? nogrouping : str;
-		dst++;
-	}
-	*dst = '\0';
-	return str;
-}
diff --git a/lib/libc/locale/gb18030.c b/lib/libc/locale/gb18030.c
deleted file mode 100644
index b5c5240..0000000
--- a/lib/libc/locale/gb18030.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-/*
- * PRC National Standard GB 18030-2000 encoding of Chinese text.
- *
- * See gb18030(5) for details.
- */
-
-#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.7 2005/02/27 15:11:09 phantom Exp $");
-
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_GB18030_mbsinit(const mbstate_t *);
-static size_t	_GB18030_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	int	count;
-	u_char	bytes[4];
-} _GB18030State;
-
-int
-_GB18030_init(_RuneLocale *rl)
-{
-
-	__mbrtowc = _GB18030_mbrtowc;
-	__wcrtomb = _GB18030_wcrtomb;
-	__mbsinit = _GB18030_mbsinit;
-	_CurrentRuneLocale = rl;
-	__mb_cur_max = 4;
-
-	return (0);
-}
-
-static int
-_GB18030_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _GB18030State *)ps)->count == 0);
-}
-
-static size_t
-_GB18030_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
-    size_t n, mbstate_t * __restrict ps)
-{
-	_GB18030State *gs;
-	wchar_t wch;
-	int ch, len, ocount;
-	size_t ncopy;
-
-	gs = (_GB18030State *)ps;
-
-	if (gs->count < 0 || gs->count > sizeof(gs->bytes)) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	ncopy = MIN(MIN(n, MB_CUR_MAX), sizeof(gs->bytes) - gs->count);
-	memcpy(gs->bytes + gs->count, s, ncopy);
-	ocount = gs->count;
-	gs->count += ncopy;
-	s = (char *)gs->bytes;
-	n = gs->count;
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	/*
-	 * Single byte:		[00-7f]
-	 * Two byte:		[81-fe][40-7e,80-fe]
-	 * Four byte:		[81-fe][30-39][81-fe][30-39]
-	 */
-	ch = (unsigned char)*s++;
-	if (ch <= 0x7f) {
-		len = 1;
-		wch = ch;
-	} else if (ch >= 0x81 && ch <= 0xfe) {
-		wch = ch;
-		if (n < 2)
-			return ((size_t)-2);
-		ch = (unsigned char)*s++;
-		if ((ch >= 0x40 && ch <= 0x7e) || (ch >= 0x80 && ch <= 0xfe)) {
-			wch = (wch << 8) | ch;
-			len = 2;
-		} else if (ch >= 0x30 && ch <= 0x39) {
-			/*
-			 * Strip high bit off the wide character we will
-			 * eventually output so that it is positive when
-			 * cast to wint_t on 32-bit twos-complement machines.
-			 */
-			wch = ((wch & 0x7f) << 8) | ch;
-			if (n < 3)
-				return ((size_t)-2);
-			ch = (unsigned char)*s++;
-			if (ch < 0x81 || ch > 0xfe)
-				goto ilseq;
-			wch = (wch << 8) | ch;
-			if (n < 4)
-				return ((size_t)-2);
-			ch = (unsigned char)*s++;
-			if (ch < 0x30 || ch > 0x39)
-				goto ilseq;
-			wch = (wch << 8) | ch;
-			len = 4;
-		} else
-			goto ilseq;
-	} else
-		goto ilseq;
-
-	if (pwc != NULL)
-		*pwc = wch;
-	gs->count = 0;
-	return (wch == L'\0' ? 0 : len - ocount);
-ilseq:
-	errno = EILSEQ;
-	return ((size_t)-1);
-}
-
-static size_t
-_GB18030_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_GB18030State *gs;
-	size_t len;
-	int c;
-
-	gs = (_GB18030State *)ps;
-
-	if (gs->count != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if ((wc & ~0x7fffffff) != 0)
-		goto ilseq;
-	if (wc & 0x7f000000) {
-		/* Replace high bit that mbrtowc() removed. */
-		wc |= 0x80000000;
-		c = (wc >> 24) & 0xff;
-		if (c < 0x81 || c > 0xfe)
-			goto ilseq;
-		*s++ = c;
-		c = (wc >> 16) & 0xff;
-		if (c < 0x30 || c > 0x39)
-			goto ilseq;
-		*s++ = c;
-		c = (wc >> 8) & 0xff;
-		if (c < 0x81 || c > 0xfe)
-			goto ilseq;
-		*s++ = c;
-		c = wc & 0xff;
-		if (c < 0x30 || c > 0x39)
-			goto ilseq;
-		*s++ = c;
-		len = 4;
-	} else if (wc & 0x00ff0000)
-		goto ilseq;
-	else if (wc & 0x0000ff00) {
-		c = (wc >> 8) & 0xff;
-		if (c < 0x81 || c > 0xfe)
-			goto ilseq;
-		*s++ = c;
-		c = wc & 0xff;
-		if (c < 0x40 || c == 0x7f || c == 0xff)
-			goto ilseq;
-		*s++ = c;
-		len = 2;
-	} else if (wc <= 0x7f) {
-		*s++ = wc;
-		len = 1;
-	} else
-		goto ilseq;
-
-	return (len);
-ilseq:
-	errno = EILSEQ;
-	return ((size_t)-1);
-}
diff --git a/lib/libc/locale/gb2312.c b/lib/libc/locale/gb2312.c
deleted file mode 100644
index 0f89ddb..0000000
--- a/lib/libc/locale/gb2312.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * Copyright (c) 2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 2003 David Xu <davidxu@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.
- *
- * 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.
- */
-
-#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.9 2005/02/27 15:11:09 phantom Exp $");
-
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_GB2312_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_GB2312_mbsinit(const mbstate_t *);
-static size_t	_GB2312_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	int	count;
-	u_char	bytes[2];
-} _GB2312State;
-
-int
-_GB2312_init(_RuneLocale *rl)
-{
-
-	_CurrentRuneLocale = rl;
-	__mbrtowc = _GB2312_mbrtowc;
-	__wcrtomb = _GB2312_wcrtomb;
-	__mbsinit = _GB2312_mbsinit;
-	__mb_cur_max = 2;
-	return (0);
-}
-
-static int
-_GB2312_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _GB2312State *)ps)->count == 0);
-}
-
-static __inline int
-_GB2312_check(const char *str, size_t n)
-{
-	const u_char *s = (const u_char *)str;
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return (-2);
-	if (s[0] >= 0xa1 && s[0] <= 0xfe) {
-		if (n < 2)
-			/* Incomplete multibyte sequence */
-			return (-2);
-		if (s[1] < 0xa1 || s[1] > 0xfe)
-			/* Invalid multibyte sequence */
-			return (-1);
-		return (2);
-	} else if (s[0] & 0x80) {
-		/* Invalid multibyte sequence */
-		return (-1);
-	} 
-	return (1);
-}
-
-static size_t
-_GB2312_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_GB2312State *gs;
-	wchar_t wc;
-	int i, len, ocount;
-	size_t ncopy;
-
-	gs = (_GB2312State *)ps;
-
-	if (gs->count < 0 || gs->count > sizeof(gs->bytes)) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	ncopy = MIN(MIN(n, MB_CUR_MAX), sizeof(gs->bytes) - gs->count);
-	memcpy(gs->bytes + gs->count, s, ncopy);
-	ocount = gs->count;
-	gs->count += ncopy;
-	s = (char *)gs->bytes;
-	n = gs->count;
-
-	if ((len = _GB2312_check(s, n)) < 0)
-		return ((size_t)len);
-	wc = 0;
-	i = len;
-	while (i-- > 0)
-		wc = (wc << 8) | (unsigned char)*s++;
-	if (pwc != NULL)
-		*pwc = wc;
-	gs->count = 0;
-	return (wc == L'\0' ? 0 : len - ocount);
-}
-
-static size_t
-_GB2312_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_GB2312State *gs;
-
-	gs = (_GB2312State *)ps;
-
-	if (gs->count != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc & 0x8000) {
-		*s++ = (wc >> 8) & 0xff;
-		*s = wc & 0xff;
-		return (2);
-	}
-	*s = wc & 0xff;
-	return (1);
-}
diff --git a/lib/libc/locale/gbk.c b/lib/libc/locale/gbk.c
deleted file mode 100644
index 33f5e48..0000000
--- a/lib/libc/locale/gbk.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.12 2005/02/27 15:11:09 phantom Exp $");
-
-#include <sys/types.h>
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_GBK_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_GBK_mbsinit(const mbstate_t *);
-static size_t	_GBK_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	wchar_t	ch;
-} _GBKState;
-
-int
-_GBK_init(_RuneLocale *rl)
-{
-
-	__mbrtowc = _GBK_mbrtowc;
-	__wcrtomb = _GBK_wcrtomb;
-	__mbsinit = _GBK_mbsinit;
-	_CurrentRuneLocale = rl;
-	__mb_cur_max = 2;
-	return (0);
-}
-
-static int
-_GBK_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _GBKState *)ps)->ch == 0);
-}
-
-static __inline int
-_gbk_check(u_int c)
-{
-
-	c &= 0xff;
-	return ((c >= 0x81 && c <= 0xfe) ? 2 : 1);
-}
-
-static size_t
-_GBK_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_GBKState *gs;
-	wchar_t wc;
-	size_t len;
-
-	gs = (_GBKState *)ps;
-
-	if ((gs->ch & ~0xFF) != 0) {
-		/* Bad conversion state. */
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	if (gs->ch != 0) {
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (gs->ch << 8) | (*s & 0xFF);
-		if (pwc != NULL)
-			*pwc = wc;
-		gs->ch = 0;
-		return (1);
-	}
-
-	len = (size_t)_gbk_check(*s);
-	wc = *s++ & 0xff;
-	if (len == 2) {
-		if (n < 2) {
-			/* Incomplete multibyte sequence */
-			gs->ch = wc;
-			return ((size_t)-2);
-		}
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (wc << 8) | (*s++ & 0xff);
-		if (pwc != NULL)
-			*pwc = wc;
-                return (2);
-	} else {
-		if (pwc != NULL)
-			*pwc = wc;
-		return (wc == L'\0' ? 0 : 1);
-	}
-}
-
-static size_t
-_GBK_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_GBKState *gs;
-
-	gs = (_GBKState *)ps;
-
-	if (gs->ch != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc & 0x8000) {
-		*s++ = (wc >> 8) & 0xff;
-		*s = wc & 0xff;
-		return (2);
-	}
-	*s = wc & 0xff;
-	return (1);
-}
diff --git a/lib/libc/locale/isctype.c b/lib/libc/locale/isctype.c
deleted file mode 100644
index d718b77..0000000
--- a/lib/libc/locale/isctype.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)isctype.c	8.3 (Berkeley) 2/24/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.9 2002/08/17 20:03:44 ache Exp $");
-
-#include <ctype.h>
-
-#undef digittoint
-int
-digittoint(c)
-	int c;
-{
-	return (__maskrune(c, 0xFF));
-}
-
-#undef isalnum
-int
-isalnum(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_A|_CTYPE_D));
-}
-
-#undef isalpha
-int
-isalpha(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_A));
-}
-
-#undef isascii
-int
-isascii(c)
-	int c;
-{
-	return ((c & ~0x7F) == 0);
-}
-
-#undef isblank
-int
-isblank(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_B));
-}
-
-#undef iscntrl
-int
-iscntrl(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_C));
-}
-
-#undef isdigit
-int
-isdigit(c)
-	int c;
-{
-	return (__isctype(c, _CTYPE_D));
-}
-
-#undef isgraph
-int
-isgraph(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_G));
-}
-
-#undef ishexnumber 
-int
-ishexnumber(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_X));
-}
-
-#undef isideogram
-int
-isideogram(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_I));
-}
-
-#undef islower
-int
-islower(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_L));
-}
-
-#undef isnumber
-int
-isnumber(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_D));
-}
-
-#undef isphonogram	
-int
-isphonogram(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_Q));
-}
-
-#undef isprint
-int
-isprint(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_R));
-}
-
-#undef ispunct
-int
-ispunct(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_P));
-}
-
-#undef isrune
-int
-isrune(c)
-	int c;
-{
-	return (__istype(c, 0xFFFFFF00L));
-}
-
-#undef isspace
-int
-isspace(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_S));
-}
-
-#undef isspecial
-int
-isspecial(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_T));
-}
-
-#undef isupper
-int
-isupper(c)
-	int c;
-{
-	return (__istype(c, _CTYPE_U));
-}
-
-#undef isxdigit
-int
-isxdigit(c)
-	int c;
-{
-	return (__isctype(c, _CTYPE_X));
-}
-
-#undef toascii
-int
-toascii(c)
-	int c;
-{
-	return (c & 0x7F);
-}
-
-#undef tolower
-int
-tolower(c)
-	int c;
-{
-        return (__tolower(c));
-}
-
-#undef toupper
-int
-toupper(c)
-	int c;
-{
-        return (__toupper(c));
-}
-
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
deleted file mode 100644
index 37e2656..0000000
--- a/lib/libc/locale/iswctype.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.6 2002/08/17 20:30:34 ache Exp $");
-
-#include <wctype.h>
-
-#undef iswalnum
-int
-iswalnum(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_A|_CTYPE_D));
-}
-
-#undef iswalpha
-int
-iswalpha(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_A));
-}
-
-#undef iswascii
-int
-iswascii(wc)
-	wint_t wc;
-{
-	return ((wc & ~0x7F) == 0);
-}
-
-#undef iswblank
-int
-iswblank(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_B));
-}
-
-#undef iswcntrl
-int
-iswcntrl(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_C));
-}
-
-#undef iswdigit
-int
-iswdigit(wc)
-	wint_t wc;
-{
-	return (__isctype(wc, _CTYPE_D));
-}
-
-#undef iswgraph
-int
-iswgraph(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_G));
-}
-
-#undef iswhexnumber 
-int
-iswhexnumber(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_X));
-}
-
-#undef iswideogram
-int
-iswideogram(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_I));
-}
-
-#undef iswlower
-int
-iswlower(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_L));
-}
-
-#undef iswnumber
-int
-iswnumber(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_D));
-}
-
-#undef iswphonogram	
-int
-iswphonogram(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_Q));
-}
-
-#undef iswprint
-int
-iswprint(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_R));
-}
-
-#undef iswpunct
-int
-iswpunct(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_P));
-}
-
-#undef iswrune
-int
-iswrune(wc)
-	wint_t wc;
-{
-	return (__istype(wc, 0xFFFFFF00L));
-}
-
-#undef iswspace
-int
-iswspace(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_S));
-}
-
-#undef iswspecial
-int
-iswspecial(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_T));
-}
-
-#undef iswupper
-int
-iswupper(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_U));
-}
-
-#undef iswxdigit
-int
-iswxdigit(wc)
-	wint_t wc;
-{
-	return (__isctype(wc, _CTYPE_X));
-}
-
-#undef towlower
-wint_t
-towlower(wc)
-	wint_t wc;
-{
-        return (__tolower(wc));
-}
-
-#undef towupper
-wint_t
-towupper(wc)
-	wint_t wc;
-{
-        return (__toupper(wc));
-}
-
diff --git a/lib/libc/locale/ldpart.c b/lib/libc/locale/ldpart.c
deleted file mode 100644
index 932165f..0000000
--- a/lib/libc/locale/ldpart.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/ldpart.c,v 1.15 2004/04/25 19:56:50 ache Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "ldpart.h"
-#include "setlocale.h"
-
-static int split_lines(char *, const char *);
-
-int
-__part_load_locale(const char *name,
-		int *using_locale,
-		char **locale_buf,
-		const char *category_filename,
-		int locale_buf_size_max,
-		int locale_buf_size_min,
-		const char **dst_localebuf)
-{
-	int		saverr, fd, i, num_lines;
-	char		*lbuf, *p;
-	const char	*plim;
-	char		filename[PATH_MAX];
-	struct stat	st;
-	size_t		namesize, bufsize;
-
-	/* 'name' must be already checked. */
-	if (strcmp(name, "C") == 0 || strcmp(name, "POSIX") == 0) {
-		*using_locale = 0;
-		return (_LDP_CACHE);
-	}
-
-	/*
-	 * If the locale name is the same as our cache, use the cache.
-	 */
-	if (*locale_buf != NULL && strcmp(name, *locale_buf) == 0) {
-		*using_locale = 1;
-		return (_LDP_CACHE);
-	}
-
-	/*
-	 * Slurp the locale file into the cache.
-	 */
-	namesize = strlen(name) + 1;
-
-	/* 'PathLocale' must be already set & checked. */
-
-	/* Range checking not needed, 'name' size is limited */
-	strcpy(filename, _PathLocale);
-	strcat(filename, "/");
-	strcat(filename, name);
-	strcat(filename, "/");
-	strcat(filename, category_filename);
-	if ((fd = _open(filename, O_RDONLY)) < 0)
-		return (_LDP_ERROR);
-	if (_fstat(fd, &st) != 0)
-		goto bad_locale;
-	if (st.st_size <= 0) {
-		errno = EFTYPE;
-		goto bad_locale;
-	}
-	bufsize = namesize + st.st_size;
-	if ((lbuf = malloc(bufsize)) == NULL) {
-		errno = ENOMEM;
-		goto bad_locale;
-	}
-	(void)strcpy(lbuf, name);
-	p = lbuf + namesize;
-	plim = p + st.st_size;
-	if (_read(fd, p, (size_t) st.st_size) != st.st_size)
-		goto bad_lbuf;
-	/*
-	 * Parse the locale file into localebuf.
-	 */
-	if (plim[-1] != '\n') {
-		errno = EFTYPE;
-		goto bad_lbuf;
-	}
-	num_lines = split_lines(p, plim);
-	if (num_lines >= locale_buf_size_max)
-		num_lines = locale_buf_size_max;
-	else if (num_lines >= locale_buf_size_min)
-		num_lines = locale_buf_size_min;
-	else {
-		errno = EFTYPE;
-		goto bad_lbuf;
-	}
-	(void)_close(fd);
-	/*
-	 * Record the successful parse in the cache.
-	 */
-	if (*locale_buf != NULL)
-		free(*locale_buf);
-	*locale_buf = lbuf;
-	for (p = *locale_buf, i = 0; i < num_lines; i++)
-		dst_localebuf[i] = (p += strlen(p) + 1);
-	for (i = num_lines; i < locale_buf_size_max; i++)
-		dst_localebuf[i] = NULL;
-	*using_locale = 1;
-
-	return (_LDP_LOADED);
-
-bad_lbuf:
-	saverr = errno;
-	free(lbuf);
-	errno = saverr;
-bad_locale:
-	saverr = errno;
-	(void)_close(fd);
-	errno = saverr;
-
-	return (_LDP_ERROR);
-}
-
-static int
-split_lines(char *p, const char *plim)
-{
-	int i;
-
-	i = 0;
-	while (p < plim) {
-		if (*p == '\n') {
-			*p = '\0';
-			i++;
-		}
-		p++;
-	}
-	return (i);
-}
-
diff --git a/lib/libc/locale/ldpart.h b/lib/libc/locale/ldpart.h
deleted file mode 100644
index 02e0c95..0000000
--- a/lib/libc/locale/ldpart.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@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.
- *
- * 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/lib/libc/locale/ldpart.h,v 1.6 2003/06/13 00:14:07 jkh Exp $
- */
-
-#ifndef _LDPART_H_
-#define	_LDPART_H_
-
-#define _LDP_LOADED 0
-#define _LDP_ERROR  (-1)
-#define _LDP_CACHE  1
-
-int	__part_load_locale(const char *, int*, char **, const char *,
-		    int, int, const char **);
-
-#endif /* !_LDPART_H_ */
diff --git a/lib/libc/locale/lmessages.c b/lib/libc/locale/lmessages.c
deleted file mode 100644
index 488b572..0000000
--- a/lib/libc/locale/lmessages.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2001 Alexey Zelkin <phantom@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/lmessages.c,v 1.14 2003/06/26 10:46:16 phantom Exp $");
-
-#include <stddef.h>
-
-#include "ldpart.h"
-#include "lmessages.h"
-
-#define LCMESSAGES_SIZE_FULL (sizeof(struct lc_messages_T) / sizeof(char *))
-#define LCMESSAGES_SIZE_MIN \
-		(offsetof(struct lc_messages_T, yesstr) / sizeof(char *))
-
-static char empty[] = "";
-
-static const struct lc_messages_T _C_messages_locale = {
-	"^[yY]" ,	/* yesexpr */
-	"^[nN]" ,	/* noexpr */
-	"yes" , 	/* yesstr */
-	"no"		/* nostr */
-};
-
-static struct lc_messages_T _messages_locale;
-static int	_messages_using_locale;
-static char	*_messages_locale_buf;
-
-int
-__messages_load_locale(const char *name)
-{
-	int ret;
-
-	ret = __part_load_locale(name, &_messages_using_locale,
-		  &_messages_locale_buf, "LC_MESSAGES",
-		  LCMESSAGES_SIZE_FULL, LCMESSAGES_SIZE_MIN,
-		  (const char **)&_messages_locale);
-	if (ret == _LDP_LOADED) {
-		if (_messages_locale.yesstr == NULL)
-			_messages_locale.yesstr = empty;
-		if (_messages_locale.nostr == NULL)
-			_messages_locale.nostr = empty;
-	}
-	return (ret);
-}
-
-struct lc_messages_T *
-__get_current_messages_locale(void)
-{
-	return (_messages_using_locale
-		? &_messages_locale
-		: (struct lc_messages_T *)&_C_messages_locale);
-}
-
-#ifdef LOCALE_DEBUG
-void
-msgdebug() {
-printf(	"yesexpr = %s\n"
-	"noexpr = %s\n"
-	"yesstr = %s\n"
-	"nostr = %s\n",
-	_messages_locale.yesexpr,
-	_messages_locale.noexpr,
-	_messages_locale.yesstr,
-	_messages_locale.nostr
-);
-}
-#endif /* LOCALE_DEBUG */
diff --git a/lib/libc/locale/lmessages.h b/lib/libc/locale/lmessages.h
deleted file mode 100644
index ee690ae..0000000
--- a/lib/libc/locale/lmessages.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@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.
- *
- * 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/lib/libc/locale/lmessages.h,v 1.3 2001/12/20 18:28:52 phantom Exp $
- */
-
-#ifndef _LMESSAGES_H_
-#define	_LMESSAGES_H_
-
-struct	lc_messages_T {
-	const char	*yesexpr;
-	const char	*noexpr;
-	const char	*yesstr;
-	const char	*nostr;
-};
-
-struct lc_messages_T *__get_current_messages_locale(void);
-int	__messages_load_locale(const char *);
-
-#endif /* !_LMESSAGES_H_ */
diff --git a/lib/libc/locale/lmonetary.c b/lib/libc/locale/lmonetary.c
deleted file mode 100644
index e3e7095..0000000
--- a/lib/libc/locale/lmonetary.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/lmonetary.c,v 1.19 2003/06/26 10:46:16 phantom Exp $");
-
-#include <limits.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "ldpart.h"
-#include "lmonetary.h"
-
-extern int __mlocale_changed;
-extern const char * __fix_locale_grouping_str(const char *);
-
-#define LCMONETARY_SIZE_FULL (sizeof(struct lc_monetary_T) / sizeof(char *))
-#define LCMONETARY_SIZE_MIN \
-		(offsetof(struct lc_monetary_T, int_p_cs_precedes) / \
-		    sizeof(char *))
-
-static char	empty[] = "";
-static char	numempty[] = { CHAR_MAX, '\0'};
-
-static const struct lc_monetary_T _C_monetary_locale = {
-	empty,		/* int_curr_symbol */
-	empty,		/* currency_symbol */
-	empty,		/* mon_decimal_point */
-	empty,		/* mon_thousands_sep */
-	numempty,	/* mon_grouping */
-	empty,		/* positive_sign */
-	empty,		/* negative_sign */
-	numempty,	/* int_frac_digits */
-	numempty,	/* frac_digits */
-	numempty,	/* p_cs_precedes */
-	numempty,	/* p_sep_by_space */
-	numempty,	/* n_cs_precedes */
-	numempty,	/* n_sep_by_space */
-	numempty,	/* p_sign_posn */
-	numempty,	/* n_sign_posn */
-	numempty,	/* int_p_cs_precedes */
-	numempty,	/* int_n_cs_precedes */
-	numempty,	/* int_p_sep_by_space */
-	numempty,	/* int_n_sep_by_space */
-	numempty,	/* int_p_sign_posn */
-	numempty	/* int_n_sign_posn */
-};
-
-static struct lc_monetary_T _monetary_locale;
-static int	_monetary_using_locale;
-static char	*_monetary_locale_buf;
-
-static char
-cnv(const char *str)
-{
-	int i = strtol(str, NULL, 10);
-
-	if (i == -1)
-		i = CHAR_MAX;
-	return ((char)i);
-}
-
-int
-__monetary_load_locale(const char *name)
-{
-	int ret;
-
-	ret = __part_load_locale(name, &_monetary_using_locale,
-		&_monetary_locale_buf, "LC_MONETARY",
-		LCMONETARY_SIZE_FULL, LCMONETARY_SIZE_MIN,
-		(const char **)&_monetary_locale);
-	if (ret != _LDP_ERROR)
-		__mlocale_changed = 1;
-	if (ret == _LDP_LOADED) {
-		_monetary_locale.mon_grouping =
-		     __fix_locale_grouping_str(_monetary_locale.mon_grouping);
-
-#define M_ASSIGN_CHAR(NAME) (((char *)_monetary_locale.NAME)[0] = \
-			     cnv(_monetary_locale.NAME))
-
-		M_ASSIGN_CHAR(int_frac_digits);
-		M_ASSIGN_CHAR(frac_digits);
-		M_ASSIGN_CHAR(p_cs_precedes);
-		M_ASSIGN_CHAR(p_sep_by_space);
-		M_ASSIGN_CHAR(n_cs_precedes);
-		M_ASSIGN_CHAR(n_sep_by_space);
-		M_ASSIGN_CHAR(p_sign_posn);
-		M_ASSIGN_CHAR(n_sign_posn);
-
-		/*
-		 * The six additional C99 international monetary formatting
-		 * parameters default to the national parameters when
-		 * reading FreeBSD LC_MONETARY data files.
-		 */
-#define	M_ASSIGN_ICHAR(NAME)						\
-		do {							\
-			if (_monetary_locale.int_##NAME == NULL)	\
-				_monetary_locale.int_##NAME =		\
-				    _monetary_locale.NAME;		\
-			else						\
-				M_ASSIGN_CHAR(int_##NAME);		\
-		} while (0)
-
-		M_ASSIGN_ICHAR(p_cs_precedes);
-		M_ASSIGN_ICHAR(n_cs_precedes);
-		M_ASSIGN_ICHAR(p_sep_by_space);
-		M_ASSIGN_ICHAR(n_sep_by_space);
-		M_ASSIGN_ICHAR(p_sign_posn);
-		M_ASSIGN_ICHAR(n_sign_posn);
-	}
-	return (ret);
-}
-
-struct lc_monetary_T *
-__get_current_monetary_locale(void)
-{
-	return (_monetary_using_locale
-		? &_monetary_locale
-		: (struct lc_monetary_T *)&_C_monetary_locale);
-}
-
-#ifdef LOCALE_DEBUG
-void
-monetdebug() {
-printf(	"int_curr_symbol = %s\n"
-	"currency_symbol = %s\n"
-	"mon_decimal_point = %s\n"
-	"mon_thousands_sep = %s\n"
-	"mon_grouping = %s\n"
-	"positive_sign = %s\n"
-	"negative_sign = %s\n"
-	"int_frac_digits = %d\n"
-	"frac_digits = %d\n"
-	"p_cs_precedes = %d\n"
-	"p_sep_by_space = %d\n"
-	"n_cs_precedes = %d\n"
-	"n_sep_by_space = %d\n"
-	"p_sign_posn = %d\n"
-	"n_sign_posn = %d\n",
-	"int_p_cs_precedes = %d\n"
-	"int_p_sep_by_space = %d\n"
-	"int_n_cs_precedes = %d\n"
-	"int_n_sep_by_space = %d\n"
-	"int_p_sign_posn = %d\n"
-	"int_n_sign_posn = %d\n",
-	_monetary_locale.int_curr_symbol,
-	_monetary_locale.currency_symbol,
-	_monetary_locale.mon_decimal_point,
-	_monetary_locale.mon_thousands_sep,
-	_monetary_locale.mon_grouping,
-	_monetary_locale.positive_sign,
-	_monetary_locale.negative_sign,
-	_monetary_locale.int_frac_digits[0],
-	_monetary_locale.frac_digits[0],
-	_monetary_locale.p_cs_precedes[0],
-	_monetary_locale.p_sep_by_space[0],
-	_monetary_locale.n_cs_precedes[0],
-	_monetary_locale.n_sep_by_space[0],
-	_monetary_locale.p_sign_posn[0],
-	_monetary_locale.n_sign_posn[0],
-	_monetary_locale.int_p_cs_precedes[0],
-	_monetary_locale.int_p_sep_by_space[0],
-	_monetary_locale.int_n_cs_precedes[0],
-	_monetary_locale.int_n_sep_by_space[0],
-	_monetary_locale.int_p_sign_posn[0],
-	_monetary_locale.int_n_sign_posn[0]
-);
-}
-#endif /* LOCALE_DEBUG */
diff --git a/lib/libc/locale/lmonetary.h b/lib/libc/locale/lmonetary.h
deleted file mode 100644
index e278ea5..0000000
--- a/lib/libc/locale/lmonetary.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@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.
- *
- * 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/lib/libc/locale/lmonetary.h,v 1.4 2002/10/09 09:19:28 tjr Exp $
- */
-
-#ifndef _LMONETARY_H_
-#define	_LMONETARY_H_
-
-struct lc_monetary_T {
-	const char	*int_curr_symbol;
-	const char	*currency_symbol;
-	const char	*mon_decimal_point;
-	const char	*mon_thousands_sep;
-	const char	*mon_grouping;
-	const char	*positive_sign;
-	const char	*negative_sign;
-	const char	*int_frac_digits;
-	const char	*frac_digits;
-	const char	*p_cs_precedes;
-	const char	*p_sep_by_space;
-	const char	*n_cs_precedes;
-	const char	*n_sep_by_space;
-	const char	*p_sign_posn;
-	const char	*n_sign_posn;
-	const char	*int_p_cs_precedes;
-	const char	*int_n_cs_precedes;
-	const char	*int_p_sep_by_space;
-	const char	*int_n_sep_by_space;
-	const char	*int_p_sign_posn;
-	const char	*int_n_sign_posn;
-};
-
-struct lc_monetary_T *__get_current_monetary_locale(void);
-int	__monetary_load_locale(const char *);
-
-#endif /* !_LMONETARY_H_ */
diff --git a/lib/libc/locale/lnumeric.c b/lib/libc/locale/lnumeric.c
deleted file mode 100644
index ff9c948..0000000
--- a/lib/libc/locale/lnumeric.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/lnumeric.c,v 1.16 2003/06/26 10:46:16 phantom Exp $");
-
-#include <limits.h>
-
-#include "ldpart.h"
-#include "lnumeric.h"
-
-extern int __nlocale_changed;
-extern const char *__fix_locale_grouping_str(const char *);
-
-#define LCNUMERIC_SIZE (sizeof(struct lc_numeric_T) / sizeof(char *))
-
-static char	numempty[] = { CHAR_MAX, '\0' };
-
-static const struct lc_numeric_T _C_numeric_locale = {
-	".",     	/* decimal_point */
-	"",     	/* thousands_sep */
-	numempty	/* grouping */
-};
-
-static struct lc_numeric_T _numeric_locale;
-static int	_numeric_using_locale;
-static char	*_numeric_locale_buf;
-
-int
-__numeric_load_locale(const char *name)
-{
-	int ret;
-
-	ret = __part_load_locale(name, &_numeric_using_locale,
-		&_numeric_locale_buf, "LC_NUMERIC",
-		LCNUMERIC_SIZE, LCNUMERIC_SIZE,
-		(const char **)&_numeric_locale);
-	if (ret != _LDP_ERROR)
-		__nlocale_changed = 1;
-	if (ret == _LDP_LOADED) {
-		/* Can't be empty according to C99 */
-		if (*_numeric_locale.decimal_point == '\0')
-			_numeric_locale.decimal_point =
-			    _C_numeric_locale.decimal_point;
-		_numeric_locale.grouping =
-		    __fix_locale_grouping_str(_numeric_locale.grouping);
-	}
-	return (ret);
-}
-
-struct lc_numeric_T *
-__get_current_numeric_locale(void)
-{
-	return (_numeric_using_locale
-		? &_numeric_locale
-		: (struct lc_numeric_T *)&_C_numeric_locale);
-}
-
-#ifdef LOCALE_DEBUG
-void
-numericdebug(void) {
-printf(	"decimal_point = %s\n"
-	"thousands_sep = %s\n"
-	"grouping = %s\n",
-	_numeric_locale.decimal_point,
-	_numeric_locale.thousands_sep,
-	_numeric_locale.grouping
-);
-}
-#endif /* LOCALE_DEBUG */
diff --git a/lib/libc/locale/lnumeric.h b/lib/libc/locale/lnumeric.h
deleted file mode 100644
index 9678c1f..0000000
--- a/lib/libc/locale/lnumeric.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@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.
- *
- * 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/lib/libc/locale/lnumeric.h,v 1.3 2001/12/20 18:28:52 phantom Exp $
- */
-
-#ifndef _LNUMERIC_H_
-#define	_LNUMERIC_H_
-
-struct lc_numeric_T {
-	const char	*decimal_point;
-	const char	*thousands_sep;
-	const char	*grouping;
-};
-
-struct lc_numeric_T *__get_current_numeric_locale(void);
-int	__numeric_load_locale(const char *);
-
-#endif /* !_LNUMERIC_H_ */
diff --git a/lib/libc/locale/localeconv.c b/lib/libc/locale/localeconv.c
deleted file mode 100644
index 1420aa8..0000000
--- a/lib/libc/locale/localeconv.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * Copyright (c) 1991, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)localeconv.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/localeconv.c,v 1.13 2003/06/26 10:46:16 phantom Exp $");
-
-#include <locale.h>
-
-#include "lmonetary.h"
-#include "lnumeric.h"
-
-/* 
- * The localeconv() function constructs a struct lconv from the current
- * monetary and numeric locales.
- *
- * Because localeconv() may be called many times (especially by library
- * routines like printf() & strtod()), the approprate members of the 
- * lconv structure are computed only when the monetary or numeric 
- * locale has been changed.
- */
-int __mlocale_changed = 1;
-int __nlocale_changed = 1;
-
-/*
- * Return the current locale conversion.
- */
-struct lconv *
-localeconv()
-{
-    static struct lconv ret;
-
-    if (__mlocale_changed) {
-	/* LC_MONETARY part */
-        struct lc_monetary_T * mptr; 
-
-#define M_ASSIGN_STR(NAME) (ret.NAME = (char*)mptr->NAME)
-#define M_ASSIGN_CHAR(NAME) (ret.NAME = mptr->NAME[0])
-
-	mptr = __get_current_monetary_locale();
-	M_ASSIGN_STR(int_curr_symbol);
-	M_ASSIGN_STR(currency_symbol);
-	M_ASSIGN_STR(mon_decimal_point);
-	M_ASSIGN_STR(mon_thousands_sep);
-	M_ASSIGN_STR(mon_grouping);
-	M_ASSIGN_STR(positive_sign);
-	M_ASSIGN_STR(negative_sign);
-	M_ASSIGN_CHAR(int_frac_digits);
-	M_ASSIGN_CHAR(frac_digits);
-	M_ASSIGN_CHAR(p_cs_precedes);
-	M_ASSIGN_CHAR(p_sep_by_space);
-	M_ASSIGN_CHAR(n_cs_precedes);
-	M_ASSIGN_CHAR(n_sep_by_space);
-	M_ASSIGN_CHAR(p_sign_posn);
-	M_ASSIGN_CHAR(n_sign_posn);
-	M_ASSIGN_CHAR(int_p_cs_precedes);
-	M_ASSIGN_CHAR(int_n_cs_precedes);
-	M_ASSIGN_CHAR(int_p_sep_by_space);
-	M_ASSIGN_CHAR(int_n_sep_by_space);
-	M_ASSIGN_CHAR(int_p_sign_posn);
-	M_ASSIGN_CHAR(int_n_sign_posn);
-	__mlocale_changed = 0;
-    }
-
-    if (__nlocale_changed) {
-	/* LC_NUMERIC part */
-        struct lc_numeric_T * nptr; 
-
-#define N_ASSIGN_STR(NAME) (ret.NAME = (char*)nptr->NAME)
-
-	nptr = __get_current_numeric_locale();
-	N_ASSIGN_STR(decimal_point);
-	N_ASSIGN_STR(thousands_sep);
-	N_ASSIGN_STR(grouping);
-	__nlocale_changed = 0;
-    }
-
-    return (&ret);
-}
diff --git a/lib/libc/locale/mblen.c b/lib/libc/locale/mblen.c
deleted file mode 100644
index 2891e90..0000000
--- a/lib/libc/locale/mblen.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.9 2004/07/29 06:18:40 tjr Exp $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-mblen(const char *s, size_t n)
-{
-	static const mbstate_t initial;
-	static mbstate_t mbs;
-	size_t rval;
-
-	if (s == NULL) {
-		/* No support for state dependent encodings. */
-		mbs = initial;
-		return (0);
-	}
-	rval = __mbrtowc(NULL, s, n, &mbs);
-	if (rval == (size_t)-1 || rval == (size_t)-2)
-		return (-1);
-	return ((int)rval);
-}
diff --git a/lib/libc/locale/mblocal.h b/lib/libc/locale/mblocal.h
deleted file mode 100644
index 63c5b16..0000000
--- a/lib/libc/locale/mblocal.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2004 Tim J. Robbins.
- * 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.
- *
- * 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/lib/libc/locale/mblocal.h,v 1.5 2005/02/27 15:11:09 phantom Exp $
- */
-
-#ifndef _MBLOCAL_H_
-#define	_MBLOCAL_H_
-
-/*
- * Rune initialization function prototypes.
- */
-int	_none_init(_RuneLocale *);
-int	_UTF8_init(_RuneLocale *);
-int	_EUC_init(_RuneLocale *);
-int	_GB18030_init(_RuneLocale *);
-int	_GB2312_init(_RuneLocale *);
-int	_GBK_init(_RuneLocale *);
-int	_BIG5_init(_RuneLocale *);
-int	_MSKanji_init(_RuneLocale *);
-
-/*
- * Conversion function pointers for current encoding.
- */
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
-    size_t, mbstate_t * __restrict);
-extern int (*__mbsinit)(const mbstate_t *);
-extern size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
-extern size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
-
-extern size_t __mbsnrtowcs_std(wchar_t * __restrict, const char ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
-extern size_t __wcsnrtombs_std(char * __restrict, const wchar_t ** __restrict,
-    size_t, size_t, mbstate_t * __restrict);
-
-#endif	/* _MBLOCAL_H_ */
diff --git a/lib/libc/locale/mbrlen.c b/lib/libc/locale/mbrlen.c
deleted file mode 100644
index 33f7ea0..0000000
--- a/lib/libc/locale/mbrlen.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbrlen.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
-
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbrlen(const char * __restrict s, size_t n, mbstate_t * __restrict ps)
-{
-	static mbstate_t mbs;
-
-	if (ps == NULL)
-		ps = &mbs;
-	return (__mbrtowc(NULL, s, n, ps));
-}
diff --git a/lib/libc/locale/mbrtowc.c b/lib/libc/locale/mbrtowc.c
deleted file mode 100644
index 9b19d10..0000000
--- a/lib/libc/locale/mbrtowc.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.7 2004/05/12 14:09:04 tjr Exp $");
-
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
-    size_t n, mbstate_t * __restrict ps)
-{
-	static mbstate_t mbs;
-
-	if (ps == NULL)
-		ps = &mbs;
-	return (__mbrtowc(pwc, s, n, ps));
-}
diff --git a/lib/libc/locale/mbsinit.c b/lib/libc/locale/mbsinit.c
deleted file mode 100644
index cddb567..0000000
--- a/lib/libc/locale/mbsinit.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbsinit.c,v 1.3 2004/05/12 14:09:04 tjr Exp $");
-
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-mbsinit(const mbstate_t *ps)
-{
-
-	return (__mbsinit(ps));
-}
diff --git a/lib/libc/locale/mbsnrtowcs.c b/lib/libc/locale/mbsnrtowcs.c
deleted file mode 100644
index 3e65b15..0000000
--- a/lib/libc/locale/mbsnrtowcs.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbsnrtowcs.c,v 1.1 2004/07/21 10:54:57 tjr Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps)
-{
-	static mbstate_t mbs;
-
-	if (ps == NULL)
-		ps = &mbs;
-	return (__mbsnrtowcs(dst, src, nms, len, ps));
-}
-
-size_t
-__mbsnrtowcs_std(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps)
-{
-	const char *s;
-	size_t nchr;
-	wchar_t wc;
-	size_t nb;
-
-	s = *src;
-	nchr = 0;
-
-	if (dst == NULL) {
-		for (;;) {
-			if ((nb = __mbrtowc(&wc, s, nms, ps)) == (size_t)-1)
-				/* Invalid sequence - mbrtowc() sets errno. */
-				return ((size_t)-1);
-			else if (nb == 0 || nb == (size_t)-2)
-				return (nchr);
-			s += nb;
-			nms -= nb;
-			nchr++;
-		}
-		/*NOTREACHED*/
-	}
-
-	while (len-- > 0) {
-		if ((nb = __mbrtowc(dst, s, nms, ps)) == (size_t)-1) {
-			*src = s;
-			return ((size_t)-1);
-		} else if (nb == (size_t)-2) {
-			*src = s + nms;
-			return (nchr);
-		} else if (nb == 0) {
-			*src = NULL;
-			return (nchr);
-		}
-		s += nb;
-		nms -= nb;
-		nchr++;
-		dst++;
-	}
-	*src = s;
-	return (nchr);
-}
diff --git a/lib/libc/locale/mbsrtowcs.c b/lib/libc/locale/mbsrtowcs.c
deleted file mode 100644
index 12feaab..0000000
--- a/lib/libc/locale/mbsrtowcs.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbsrtowcs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbsrtowcs(wchar_t * __restrict dst, const char ** __restrict src, size_t len,
-    mbstate_t * __restrict ps)
-{
-	static mbstate_t mbs;
-
-	if (ps == NULL)
-		ps = &mbs;
-	return (__mbsnrtowcs(dst, src, SIZE_T_MAX, len, ps));
-}
diff --git a/lib/libc/locale/mbstowcs.c b/lib/libc/locale/mbstowcs.c
deleted file mode 100644
index ab2e849..0000000
--- a/lib/libc/locale/mbstowcs.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbstowcs.c,v 1.11 2004/07/21 10:54:57 tjr Exp $");
-
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-
-	mbs = initial;
-	return (__mbsnrtowcs(pwcs, &s, SIZE_T_MAX, n, &mbs));
-}
diff --git a/lib/libc/locale/mbtowc.c b/lib/libc/locale/mbtowc.c
deleted file mode 100644
index 5e3a368..0000000
--- a/lib/libc/locale/mbtowc.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.11 2004/07/29 06:18:40 tjr Exp $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-mbtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n)
-{
-	static const mbstate_t initial;
-	static mbstate_t mbs;
-	size_t rval;
-
-	if (s == NULL) {
-		/* No support for state dependent encodings. */
-		mbs = initial;
-		return (0);
-	}
-	rval = __mbrtowc(pwc, s, n, &mbs);
-	if (rval == (size_t)-1 || rval == (size_t)-2)
-		return (-1);
-	return ((int)rval);
-}
diff --git a/lib/libc/locale/mskanji.c b/lib/libc/locale/mskanji.c
deleted file mode 100644
index 9735d3a..0000000
--- a/lib/libc/locale/mskanji.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- *
- *    ja_JP.SJIS locale table for BSD4.4/rune
- *    version 1.0
- *    (C) Sin'ichiro MIYATANI / Phase One, Inc
- *    May 12, 1995
- *
- * 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 Phase One, Inc.
- * 4. The name of Phase One, Inc. 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.  
- */  
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mskanji.c	1.0 (Phase One) 5/5/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.17 2005/02/27 15:11:09 phantom Exp $");
-
-#include <sys/types.h>
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_MSKanji_mbsinit(const mbstate_t *);
-static size_t	_MSKanji_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	wchar_t	ch;
-} _MSKanjiState;
-
-int
-_MSKanji_init(_RuneLocale *rl)
-{
-
-	__mbrtowc = _MSKanji_mbrtowc;
-	__wcrtomb = _MSKanji_wcrtomb;
-	__mbsinit = _MSKanji_mbsinit;
-	_CurrentRuneLocale = rl;
-	__mb_cur_max = 2;
-	return (0);
-}
-
-static int
-_MSKanji_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _MSKanjiState *)ps)->ch == 0);
-}
-
-static size_t
-_MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_MSKanjiState *ms;
-	wchar_t wc;
-
-	ms = (_MSKanjiState *)ps;
-
-	if ((ms->ch & ~0xFF) != 0) {
-		/* Bad conversion state. */
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	if (ms->ch != 0) {
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (ms->ch << 8) | (*s & 0xFF);
-		if (pwc != NULL)
-			*pwc = wc;
-		ms->ch = 0;
-		return (1);
-	}
-	wc = *s++ & 0xff;
-	if ((wc > 0x80 && wc < 0xa0) || (wc >= 0xe0 && wc < 0xfd)) {
-		if (n < 2) {
-			/* Incomplete multibyte sequence */
-			ms->ch = wc;
-			return ((size_t)-2);
-		}
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (wc << 8) | (*s++ & 0xff);
-		if (pwc != NULL)
-			*pwc = wc;
-		return (2);
-	} else {
-		if (pwc != NULL)
-			*pwc = wc;
-		return (wc == L'\0' ? 0 : 1);
-	}
-}
-
-static size_t
-_MSKanji_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_MSKanjiState *ms;
-	int len, i;
-
-	ms = (_MSKanjiState *)ps;
-
-	if (ms->ch != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	len = (wc > 0x100) ? 2 : 1;
-	for (i = len; i-- > 0; )
-		*s++ = wc >> (i << 3);
-	return (len);
-}
diff --git a/lib/libc/locale/nextwctype.c b/lib/libc/locale/nextwctype.c
deleted file mode 100644
index 89c63df..0000000
--- a/lib/libc/locale/nextwctype.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/nextwctype.c,v 1.1 2004/07/08 06:43:37 tjr Exp $");
-
-#include <runetype.h>
-#include <wchar.h>
-#include <wctype.h>
-
-wint_t
-nextwctype(wint_t wc, wctype_t wct)
-{
-	size_t lim;
-	_RuneRange *rr = &_CurrentRuneLocale->__runetype_ext;
-	_RuneEntry *base, *re;
-	int noinc;
-
-	noinc = 0;
-	if (wc < _CACHED_RUNES) {
-		wc++;
-		while (wc < _CACHED_RUNES) {
-			if (_CurrentRuneLocale->__runetype[wc] & wct)
-				return (wc);
-			wc++;
-		}
-		wc--;
-	}
-	if (rr->__ranges != NULL && wc < rr->__ranges[0].__min) {
-		wc = rr->__ranges[0].__min;
-		noinc = 1;
-	}
-
-	/* Binary search -- see bsearch.c for explanation. */
-	base = rr->__ranges;
-	for (lim = rr->__nranges; lim != 0; lim >>= 1) {
-		re = base + (lim >> 1);
-		if (re->__min <= wc && wc <= re->__max)
-			goto found;
-		else if (wc > re->__max) {
-			base = re + 1;
-			lim--;
-		}
-	}
-	return (-1);
-found:
-	if (!noinc)
-		wc++;
-	if (re->__min <= wc && wc <= re->__max) {
-		if (re->__types != NULL) {
-			for (; wc <= re->__max; wc++)
-				if (re->__types[wc - re->__min] & wct)
-					return (wc);
-		} else if (re->__map & wct)
-			return (wc);
-	}
-	while (++re < rr->__ranges + rr->__nranges) {
-		wc = re->__min;
-		if (re->__types != NULL) {
-			for (; wc <= re->__max; wc++)
-				if (re->__types[wc - re->__min] & wct)
-					return (wc);
-		} else if (re->__map & wct)
-			return (wc);
-	}
-	return (-1);
-}
diff --git a/lib/libc/locale/nl_langinfo.c b/lib/libc/locale/nl_langinfo.c
deleted file mode 100644
index 22d27a3..0000000
--- a/lib/libc/locale/nl_langinfo.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*-
- * Copyright (c) 2001, 2003 Alexey Zelkin <phantom@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/nl_langinfo.c,v 1.17 2003/06/26 10:46:16 phantom Exp $");
-
-#include <langinfo.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lnumeric.h"
-#include "lmessages.h"
-#include "lmonetary.h"
-#include "../stdtime/timelocal.h"
-
-#define _REL(BASE) ((int)item-BASE)
-
-char *
-nl_langinfo(nl_item item)
-{
-   char *ret, *s, *cs;
-   static char *csym = NULL;
-
-   switch (item) {
-	case CODESET:
-		ret = "";
-		if ((s = setlocale(LC_CTYPE, NULL)) != NULL) {
-			if ((cs = strchr(s, '.')) != NULL)
-				ret = cs + 1;
-			else if (strcmp(s, "C") == 0 ||
-				 strcmp(s, "POSIX") == 0)
-				ret = "US-ASCII";
-		}
-		break;
-	case D_T_FMT:
-		ret = (char *) __get_current_time_locale()->c_fmt;
-		break;
-	case D_FMT:
-		ret = (char *) __get_current_time_locale()->x_fmt;
-		break;
-	case T_FMT:
-		ret = (char *) __get_current_time_locale()->X_fmt;
-		break;
-	case T_FMT_AMPM:
-		ret = (char *) __get_current_time_locale()->ampm_fmt;
-		break;
-	case AM_STR:
-		ret = (char *) __get_current_time_locale()->am;
-		break;
-	case PM_STR:
-		ret = (char *) __get_current_time_locale()->pm;
-		break;
-	case DAY_1: case DAY_2: case DAY_3:
-	case DAY_4: case DAY_5: case DAY_6: case DAY_7:
-		ret = (char*) __get_current_time_locale()->weekday[_REL(DAY_1)];
-		break;
-	case ABDAY_1: case ABDAY_2: case ABDAY_3:
-	case ABDAY_4: case ABDAY_5: case ABDAY_6: case ABDAY_7:
-		ret = (char*) __get_current_time_locale()->wday[_REL(ABDAY_1)];
-		break;
-	case MON_1: case MON_2: case MON_3: case MON_4:
-	case MON_5: case MON_6: case MON_7: case MON_8:
-	case MON_9: case MON_10: case MON_11: case MON_12:
-		ret = (char*) __get_current_time_locale()->month[_REL(MON_1)];
-		break;
-	case ABMON_1: case ABMON_2: case ABMON_3: case ABMON_4:
-	case ABMON_5: case ABMON_6: case ABMON_7: case ABMON_8:
-	case ABMON_9: case ABMON_10: case ABMON_11: case ABMON_12:
-		ret = (char*) __get_current_time_locale()->mon[_REL(ABMON_1)];
-		break;
-	case ERA:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ERA_D_FMT:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ERA_D_T_FMT:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ERA_T_FMT:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ALT_DIGITS:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case RADIXCHAR:
-		ret = (char*) __get_current_numeric_locale()->decimal_point;
-		break;
-	case THOUSEP:
-		ret = (char*) __get_current_numeric_locale()->thousands_sep;
-		break;
-	case YESEXPR:
-		ret = (char*) __get_current_messages_locale()->yesexpr;
-		break;
-	case NOEXPR:
-		ret = (char*) __get_current_messages_locale()->noexpr;
-		break;
-	/*
-	 * YESSTR and NOSTR items marked with LEGACY are available, but not
-	 * recomended by SUSv2 to be used in portable applications since
-	 * they're subject to remove in future specification editions.
-	 */
-	case YESSTR:            /* LEGACY  */
-		ret = (char*) __get_current_messages_locale()->yesstr;
-		break;
-	case NOSTR:             /* LEGACY  */
-		ret = (char*) __get_current_messages_locale()->nostr;
-		break;
-	/*
-	 * SUSv2 special formatted currency string 
-	 */
-	case CRNCYSTR:
-		ret = "";
-		cs = (char*) __get_current_monetary_locale()->currency_symbol;
-		if (*cs != '\0') {
-			char pos = localeconv()->p_cs_precedes;
-
-			if (pos == localeconv()->n_cs_precedes) {
-				char psn = '\0';
-
-				if (pos == CHAR_MAX) {
-					if (strcmp(cs, __get_current_monetary_locale()->mon_decimal_point) == 0)
-						psn = '.';
-				} else
-					psn = pos ? '-' : '+';
-				if (psn != '\0') {
-					int clen = strlen(cs);
-
-					if ((csym = reallocf(csym, clen + 2)) != NULL) {
-						*csym = psn;
-						strcpy(csym + 1, cs);
-						ret = csym;
-					}
-				}
-			}
-		}
-		break;
-	case D_MD_ORDER:        /* FreeBSD local extension */
-		ret = (char *) __get_current_time_locale()->md_order;
-		break;
-	default:
-		ret = "";
-   }
-   return (ret);
-}
diff --git a/lib/libc/locale/nomacros.c b/lib/libc/locale/nomacros.c
deleted file mode 100644
index eea37d0..0000000
--- a/lib/libc/locale/nomacros.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/nomacros.c,v 1.5 2002/03/22 21:52:18 obrien Exp $");
-
-/*
- * Tell <ctype.h> to generate extern versions of all its inline
- * functions.  The extern versions get called if the system doesn't
- * support inlines or the user defines _DONT_USE_CTYPE_INLINE_
- * before including <ctype.h>.
- */
-#define _EXTERNALIZE_CTYPE_INLINES_
-
-#include <ctype.h>
diff --git a/lib/libc/locale/none.c b/lib/libc/locale/none.c
deleted file mode 100644
index 6381019..0000000
--- a/lib/libc/locale/none.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)none.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.13 2005/02/27 15:11:09 phantom Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <runetype.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_none_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_none_mbsinit(const mbstate_t *);
-static size_t	_none_mbsnrtowcs(wchar_t * __restrict dst,
-		    const char ** __restrict src, size_t nms, size_t len,
-		    mbstate_t * __restrict ps __unused);
-static size_t	_none_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-static size_t	_none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-		    size_t, size_t, mbstate_t * __restrict);
-
-int
-_none_init(_RuneLocale *rl)
-{
-
-	__mbrtowc = _none_mbrtowc;
-	__mbsinit = _none_mbsinit;
-	__mbsnrtowcs = _none_mbsnrtowcs;
-	__wcrtomb = _none_wcrtomb;
-	__wcsnrtombs = _none_wcsnrtombs;
-	_CurrentRuneLocale = rl;
-	__mb_cur_max = 1;
-	return(0);
-}
-
-static int
-_none_mbsinit(const mbstate_t *ps __unused)
-{
-
-	/*
-	 * Encoding is not state dependent - we are always in the
-	 * initial state.
-	 */
-	return (1);
-}
-
-static size_t
-_none_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps __unused)
-{
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (0);
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-	if (pwc != NULL)
-		*pwc = (unsigned char)*s;
-	return (*s == '\0' ? 0 : 1);
-}
-
-static size_t
-_none_wcrtomb(char * __restrict s, wchar_t wc,
-    mbstate_t * __restrict ps __unused)
-{
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc < 0 || wc > UCHAR_MAX) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	*s = (unsigned char)wc;
-	return (1);
-}
-
-static size_t
-_none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps __unused)
-{
-	const char *s;
-	size_t nchr;
-
-	if (dst == NULL) {
-		s = memchr(*src, '\0', nms);
-		return (s != NULL ? s - *src : nms);
-	}
-
-	s = *src;
-	nchr = 0;
-	while (len-- > 0 && nms-- > 0) {
-		if ((*dst++ = (unsigned char)*s++) == L'\0') {
-			*src = NULL;
-			return (nchr);
-		}
-		nchr++;
-	}
-	*src = s;
-	return (nchr);
-}
-
-static size_t
-_none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
-    size_t nwc, size_t len, mbstate_t * __restrict ps __unused)
-{
-	const wchar_t *s;
-	size_t nchr;
-
-	if (dst == NULL) {
-		for (s = *src; nwc > 0 && *s != L'\0'; s++, nwc--) {
-			if (*s < 0 || *s > UCHAR_MAX) {
-				errno = EILSEQ;
-				return ((size_t)-1);
-			}
-		}
-		return (s - *src);
-	}
-
-	s = *src;
-	nchr = 0;
-	while (len-- > 0 && nwc-- > 0) {
-		if (*s < 0 || *s > UCHAR_MAX) {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		if ((*dst++ = *s++) == '\0') {
-			*src = NULL;
-			return (nchr);
-		}
-		nchr++;
-	}
-	*src = s;
-	return (nchr);
-}
-
-/* setup defaults */
-
-int __mb_cur_max = 1;
-size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t,
-    mbstate_t * __restrict) = _none_mbrtowc;
-int (*__mbsinit)(const mbstate_t *) = _none_mbsinit;
-size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict,
-    size_t, size_t, mbstate_t * __restrict) = _none_mbsnrtowcs;
-size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict) =
-    _none_wcrtomb;
-size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
-    size_t, size_t, mbstate_t * __restrict) = _none_wcsnrtombs;
-
diff --git a/lib/libc/locale/rpmatch.c b/lib/libc/locale/rpmatch.c
deleted file mode 100644
index 370f23d..0000000
--- a/lib/libc/locale/rpmatch.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2004-2005 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/rpmatch.c,v 1.1 2005/01/09 03:55:13 tjr Exp $");
-
-#include <langinfo.h>
-#include <regex.h>
-#include <stdlib.h>
-
-int
-rpmatch(const char *response)
-{
-	regex_t yes, no;
-	int ret;
-
-	if (regcomp(&yes, nl_langinfo(YESEXPR), REG_EXTENDED|REG_NOSUB) != 0)
-		return (-1);
-	if (regcomp(&no, nl_langinfo(NOEXPR), REG_EXTENDED|REG_NOSUB) != 0) {
-		regfree(&yes);
-		return (-1);
-	}
-	if (regexec(&yes, response, 0, NULL, 0) == 0)
-		ret = 1;
-	else if (regexec(&no, response, 0, NULL, 0) == 0)
-		ret = 0;
-	else
-		ret = -1;
-	regfree(&yes);
-	regfree(&no);
-	return (ret);
-}
diff --git a/lib/libc/locale/rune.c b/lib/libc/locale/rune.c
deleted file mode 100644
index bcb70f9..0000000
--- a/lib/libc/locale/rune.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rune.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/rune.c,v 1.14 2005/05/16 09:32:41 ru Exp $");
-
-#include "namespace.h"
-#include <arpa/inet.h>
-#include <errno.h>
-#include <runetype.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "un-namespace.h"
-
-#include "runefile.h"
-
-_RuneLocale *_Read_RuneMagi(FILE *);
-
-_RuneLocale *
-_Read_RuneMagi(FILE *fp)
-{
-	char *fdata, *data;
-	void *lastp;
-	_FileRuneLocale *frl;
-	_RuneLocale *rl;
-	_FileRuneEntry *frr;
-	_RuneEntry *rr;
-	struct stat sb;
-	int x, saverr;
-	void *variable;
-	_FileRuneEntry *runetype_ext_ranges;
-	_FileRuneEntry *maplower_ext_ranges;
-	_FileRuneEntry *mapupper_ext_ranges;
-	int runetype_ext_len = 0;
-
-	if (_fstat(fileno(fp), &sb) < 0)
-		return (NULL);
-
-	if ((size_t)sb.st_size < sizeof(_FileRuneLocale)) {
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	if ((fdata = malloc(sb.st_size)) == NULL)
-		return (NULL);
-
-	errno = 0;
-	rewind(fp); /* Someone might have read the magic number once already */
-	if (errno) {
-		saverr = errno;
-		free(fdata);
-		errno = saverr;
-		return (NULL);
-	}
-
-	if (fread(fdata, sb.st_size, 1, fp) != 1) {
-		saverr = errno;
-		free(fdata);
-		errno = saverr;
-		return (NULL);
-	}
-
-	frl = (_FileRuneLocale *)fdata;
-	lastp = fdata + sb.st_size;
-
-	variable = frl + 1;
-
-	if (memcmp(frl->magic, _FILE_RUNE_MAGIC_1, sizeof(frl->magic))) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	frl->variable_len = ntohl(frl->variable_len);
-	frl->runetype_ext_nranges = ntohl(frl->runetype_ext_nranges);
-	frl->maplower_ext_nranges = ntohl(frl->maplower_ext_nranges);
-	frl->mapupper_ext_nranges = ntohl(frl->mapupper_ext_nranges);
-
-	for (x = 0; x < _CACHED_RUNES; ++x) {
-		frl->runetype[x] = ntohl(frl->runetype[x]);
-		frl->maplower[x] = ntohl(frl->maplower[x]);
-		frl->mapupper[x] = ntohl(frl->mapupper[x]);
-	}
-
-	runetype_ext_ranges = (_FileRuneEntry *)variable;
-	variable = runetype_ext_ranges + frl->runetype_ext_nranges;
-	if (variable > lastp) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	maplower_ext_ranges = (_FileRuneEntry *)variable;
-	variable = maplower_ext_ranges + frl->maplower_ext_nranges;
-	if (variable > lastp) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	mapupper_ext_ranges = (_FileRuneEntry *)variable;
-	variable = mapupper_ext_ranges + frl->mapupper_ext_nranges;
-	if (variable > lastp) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	frr = runetype_ext_ranges;
-	for (x = 0; x < frl->runetype_ext_nranges; ++x) {
-		uint32_t *types;
-
-		frr[x].min = ntohl(frr[x].min);
-		frr[x].max = ntohl(frr[x].max);
-		frr[x].map = ntohl(frr[x].map);
-		if (frr[x].map == 0) {
-			int len = frr[x].max - frr[x].min + 1;
-			types = variable;
-			variable = types + len;
-			runetype_ext_len += len;
-			if (variable > lastp) {
-				free(fdata);
-				errno = EFTYPE;
-				return (NULL);
-			}
-			while (len-- > 0)
-				types[len] = ntohl(types[len]);
-		}
-	}
-
-	frr = maplower_ext_ranges;
-	for (x = 0; x < frl->maplower_ext_nranges; ++x) {
-		frr[x].min = ntohl(frr[x].min);
-		frr[x].max = ntohl(frr[x].max);
-		frr[x].map = ntohl(frr[x].map);
-	}
-
-	frr = mapupper_ext_ranges;
-	for (x = 0; x < frl->mapupper_ext_nranges; ++x) {
-		frr[x].min = ntohl(frr[x].min);
-		frr[x].max = ntohl(frr[x].max);
-		frr[x].map = ntohl(frr[x].map);
-	}
-	if ((char *)variable + frl->variable_len > (char *)lastp) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	/*
-	 * Convert from disk format to host format.
-	 */
-	data = malloc(sizeof(_RuneLocale) +
-	    (frl->runetype_ext_nranges + frl->maplower_ext_nranges +
-	    frl->mapupper_ext_nranges) * sizeof(_RuneEntry) +
-	    runetype_ext_len * sizeof(*rr->__types) +
-	    frl->variable_len);
-	if (data == NULL) {
-		saverr = errno;
-		free(fdata);
-		errno = saverr;
-		return (NULL);
-	}
-
-	rl = (_RuneLocale *)data;
-	rl->__variable = rl + 1;
-
-	memcpy(rl->__magic, _RUNE_MAGIC_1, sizeof(rl->__magic));
-	memcpy(rl->__encoding, frl->encoding, sizeof(rl->__encoding));
-	rl->__invalid_rune = 0;
-
-	rl->__variable_len = frl->variable_len;
-	rl->__runetype_ext.__nranges = frl->runetype_ext_nranges;
-	rl->__maplower_ext.__nranges = frl->maplower_ext_nranges;
-	rl->__mapupper_ext.__nranges = frl->mapupper_ext_nranges;
-
-	for (x = 0; x < _CACHED_RUNES; ++x) {
-		rl->__runetype[x] = frl->runetype[x];
-		rl->__maplower[x] = frl->maplower[x];
-		rl->__mapupper[x] = frl->mapupper[x];
-	}
-
-	rl->__runetype_ext.__ranges = (_RuneEntry *)rl->__variable;
-	rl->__variable = rl->__runetype_ext.__ranges +
-	    rl->__runetype_ext.__nranges;
-
-	rl->__maplower_ext.__ranges = (_RuneEntry *)rl->__variable;
-	rl->__variable = rl->__maplower_ext.__ranges +
-	    rl->__maplower_ext.__nranges;
-
-	rl->__mapupper_ext.__ranges = (_RuneEntry *)rl->__variable;
-	rl->__variable = rl->__mapupper_ext.__ranges +
-	    rl->__mapupper_ext.__nranges;
-
-	variable = mapupper_ext_ranges + frl->mapupper_ext_nranges;
-	frr = runetype_ext_ranges;
-	rr = rl->__runetype_ext.__ranges;
-	for (x = 0; x < rl->__runetype_ext.__nranges; ++x) {
-		uint32_t *types;
-
-		rr[x].__min = frr[x].min;
-		rr[x].__max = frr[x].max;
-		rr[x].__map = frr[x].map;
-		if (rr[x].__map == 0) {
-			int len = rr[x].__max - rr[x].__min + 1;
-			types = variable;
-			variable = types + len;
-			rr[x].__types = rl->__variable;
-			rl->__variable = rr[x].__types + len;
-			while (len-- > 0)
-				rr[x].__types[len] = types[len];
-		} else
-			rr[x].__types = NULL;
-	}
-
-	frr = maplower_ext_ranges;
-	rr = rl->__maplower_ext.__ranges;
-	for (x = 0; x < rl->__maplower_ext.__nranges; ++x) {
-		rr[x].__min = frr[x].min;
-		rr[x].__max = frr[x].max;
-		rr[x].__map = frr[x].map;
-	}
-
-	frr = mapupper_ext_ranges;
-	rr = rl->__mapupper_ext.__ranges;
-	for (x = 0; x < rl->__mapupper_ext.__nranges; ++x) {
-		rr[x].__min = frr[x].min;
-		rr[x].__max = frr[x].max;
-		rr[x].__map = frr[x].map;
-	}
-
-	memcpy(rl->__variable, variable, rl->__variable_len);
-	free(fdata);
-
-	/*
-	 * Go out and zero pointers that should be zero.
-	 */
-	if (!rl->__variable_len)
-		rl->__variable = NULL;
-
-	if (!rl->__runetype_ext.__nranges)
-		rl->__runetype_ext.__ranges = NULL;
-
-	if (!rl->__maplower_ext.__nranges)
-		rl->__maplower_ext.__ranges = NULL;
-
-	if (!rl->__mapupper_ext.__nranges)
-		rl->__mapupper_ext.__ranges = NULL;
-
-	return (rl);
-}
diff --git a/lib/libc/locale/runefile.h b/lib/libc/locale/runefile.h
deleted file mode 100644
index cacc66f..0000000
--- a/lib/libc/locale/runefile.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2005 Ruslan Ermilov
- * 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.
- *
- * 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/lib/libc/locale/runefile.h,v 1.1 2005/05/16 09:32:41 ru Exp $
- */
-
-#ifndef _RUNEFILE_H_
-#define	_RUNEFILE_H_
-
-#include <sys/types.h>
-
-#ifndef _CACHED_RUNES
-#define	_CACHED_RUNES	(1 << 8)
-#endif
-
-typedef struct {
-	int32_t		min;
-	int32_t		max;
-	int32_t		map;
-} _FileRuneEntry;
-
-typedef struct {
-	char		magic[8];
-	char		encoding[32];
-
-	uint32_t	runetype[_CACHED_RUNES];
-	int32_t		maplower[_CACHED_RUNES];
-	int32_t		mapupper[_CACHED_RUNES];
-
-	int32_t		runetype_ext_nranges;
-	int32_t		maplower_ext_nranges;
-	int32_t		mapupper_ext_nranges;
-
-	int32_t		variable_len;
-} _FileRuneLocale;
-
-#define	_FILE_RUNE_MAGIC_1	"RuneMag1"
-
-#endif	/* !_RUNEFILE_H_ */
diff --git a/lib/libc/locale/runetype.c b/lib/libc/locale/runetype.c
deleted file mode 100644
index d62ed9b..0000000
--- a/lib/libc/locale/runetype.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/runetype.c,v 1.12 2005/02/27 14:54:23 phantom Exp $");
-
-#include <stdio.h>
-#include <runetype.h>
-
-unsigned long
-___runetype(__ct_rune_t c)
-{
-	size_t lim;
-	_RuneRange *rr = &_CurrentRuneLocale->__runetype_ext;
-	_RuneEntry *base, *re;
-
-	if (c < 0 || c == EOF)
-		return(0L);
-
-	/* Binary search -- see bsearch.c for explanation. */
-	base = rr->__ranges;
-	for (lim = rr->__nranges; lim != 0; lim >>= 1) {
-		re = base + (lim >> 1);
-		if (re->__min <= c && c <= re->__max) {
-			if (re->__types)
-			    return(re->__types[c - re->__min]);
-			else
-			    return(re->__map);
-		} else if (c > re->__max) {
-			base = re + 1;
-			lim--;
-		}
-	}
-
-	return(0L);
-}
diff --git a/lib/libc/locale/setlocale.c b/lib/libc/locale/setlocale.c
deleted file mode 100644
index e42f53a..0000000
--- a/lib/libc/locale/setlocale.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 1996 - 2002 FreeBSD Project
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setlocale.c	8.1 (Berkeley) 7/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.50 2004/01/31 19:15:32 ache Exp $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <paths.h>	/* for _PATH_LOCALE */
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "collate.h"
-#include "lmonetary.h"	/* for __monetary_load_locale() */
-#include "lnumeric.h"	/* for __numeric_load_locale() */
-#include "lmessages.h"	/* for __messages_load_locale() */
-#include "setlocale.h"
-#include "ldpart.h"
-#include "../stdtime/timelocal.h" /* for __time_load_locale() */
-
-/*
- * Category names for getenv()
- */
-static char *categories[_LC_LAST] = {
-    "LC_ALL",
-    "LC_COLLATE",
-    "LC_CTYPE",
-    "LC_MONETARY",
-    "LC_NUMERIC",
-    "LC_TIME",
-    "LC_MESSAGES",
-};
-
-/*
- * Current locales for each category
- */
-static char current_categories[_LC_LAST][ENCODING_LEN + 1] = {
-    "C",
-    "C",
-    "C",
-    "C",
-    "C",
-    "C",
-    "C",
-};
-
-/*
- * Path to locale storage directory
- */
-char	*_PathLocale;
-
-/*
- * The locales we are going to try and load
- */
-static char new_categories[_LC_LAST][ENCODING_LEN + 1];
-static char saved_categories[_LC_LAST][ENCODING_LEN + 1];
-
-static char current_locale_string[_LC_LAST * (ENCODING_LEN + 1/*"/"*/ + 1)];
-
-static char	*currentlocale(void);
-static char	*loadlocale(int);
-static const char *__get_locale_env(int);
-
-char *
-setlocale(category, locale)
-	int category;
-	const char *locale;
-{
-	int i, j, len, saverr;
-        const char *env, *r;
-
-	if (category < LC_ALL || category >= _LC_LAST) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (locale == NULL)
-		return (category != LC_ALL ?
-		    current_categories[category] : currentlocale());
-
-	/*
-	 * Default to the current locale for everything.
-	 */
-	for (i = 1; i < _LC_LAST; ++i)
-		(void)strcpy(new_categories[i], current_categories[i]);
-
-	/*
-	 * Now go fill up new_categories from the locale argument
-	 */
-	if (!*locale) {
-		if (category == LC_ALL) {
-			for (i = 1; i < _LC_LAST; ++i) {
-				env = __get_locale_env(i);
-				if (strlen(env) > ENCODING_LEN) {
-					errno = EINVAL;
-					return (NULL);
-				}
-				(void)strcpy(new_categories[i], env);
-			}
-		} else {
-			env = __get_locale_env(category);
-			if (strlen(env) > ENCODING_LEN) {
-				errno = EINVAL;
-				return (NULL);
-			}
-			(void)strcpy(new_categories[category], env);
-		}
-	} else if (category != LC_ALL) {
-		if (strlen(locale) > ENCODING_LEN) {
-			errno = EINVAL;
-			return (NULL);
-		}
-		(void)strcpy(new_categories[category], locale);
-	} else {
-		if ((r = strchr(locale, '/')) == NULL) {
-			if (strlen(locale) > ENCODING_LEN) {
-				errno = EINVAL;
-				return (NULL);
-			}
-			for (i = 1; i < _LC_LAST; ++i)
-				(void)strcpy(new_categories[i], locale);
-		} else {
-			for (i = 1; r[1] == '/'; ++r)
-				;
-			if (!r[1]) {
-				errno = EINVAL;
-				return (NULL);	/* Hmm, just slashes... */
-			}
-			do {
-				if (i == _LC_LAST)
-					break;  /* Too many slashes... */
-				if ((len = r - locale) > ENCODING_LEN) {
-					errno = EINVAL;
-					return (NULL);
-				}
-				(void)strlcpy(new_categories[i], locale,
-					      len + 1);
-				i++;
-				while (*r == '/')
-					r++;
-				locale = r;
-				while (*r && *r != '/')
-					r++;
-			} while (*locale);
-			while (i < _LC_LAST) {
-				(void)strcpy(new_categories[i],
-					     new_categories[i-1]);
-				i++;
-			}
-		}
-	}
-
-	if (category != LC_ALL)
-		return (loadlocale(category));
-
-	for (i = 1; i < _LC_LAST; ++i) {
-		(void)strcpy(saved_categories[i], current_categories[i]);
-		if (loadlocale(i) == NULL) {
-			saverr = errno;
-			for (j = 1; j < i; j++) {
-				(void)strcpy(new_categories[j],
-					     saved_categories[j]);
-				if (loadlocale(j) == NULL) {
-					(void)strcpy(new_categories[j], "C");
-					(void)loadlocale(j);
-				}
-			}
-			errno = saverr;
-			return (NULL);
-		}
-	}
-	return (currentlocale());
-}
-
-static char *
-currentlocale()
-{
-	int i;
-
-	(void)strcpy(current_locale_string, current_categories[1]);
-
-	for (i = 2; i < _LC_LAST; ++i)
-		if (strcmp(current_categories[1], current_categories[i])) {
-			for (i = 2; i < _LC_LAST; ++i) {
-				(void)strcat(current_locale_string, "/");
-				(void)strcat(current_locale_string,
-					     current_categories[i]);
-			}
-			break;
-		}
-	return (current_locale_string);
-}
-
-static char *
-loadlocale(category)
-	int category;
-{
-	char *new = new_categories[category];
-	char *old = current_categories[category];
-	int (*func)(const char *);
-	int saved_errno;
-
-	if ((new[0] == '.' &&
-	     (new[1] == '\0' || (new[1] == '.' && new[2] == '\0'))) ||
-	    strchr(new, '/') != NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	saved_errno = errno;
-	errno = __detect_path_locale();
-	if (errno != 0)
-		return (NULL);
-	errno = saved_errno;
-
-	switch (category) {
-	case LC_CTYPE:
-		func = __wrap_setrunelocale;
-		break;
-	case LC_COLLATE:
-		func = __collate_load_tables;
-		break;
-	case LC_TIME:
-		func = __time_load_locale;
-		break;
-	case LC_NUMERIC:
-		func = __numeric_load_locale;
-		break;
-	case LC_MONETARY:
-		func = __monetary_load_locale;
-		break;
-	case LC_MESSAGES:
-		func = __messages_load_locale;
-		break;
-	default:
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (strcmp(new, old) == 0)
-		return (old);
-
-	if (func(new) != _LDP_ERROR) {
-		(void)strcpy(old, new);
-		return (old);
-	}
-
-	return (NULL);
-}
-
-static const char *
-__get_locale_env(category)
-        int category;
-{
-        const char *env;
-
-        /* 1. check LC_ALL. */
-        env = getenv(categories[0]);
-
-        /* 2. check LC_* */
-	if (env == NULL || !*env)
-                env = getenv(categories[category]);
-
-        /* 3. check LANG */
-	if (env == NULL || !*env)
-                env = getenv("LANG");
-
-        /* 4. if none is set, fall to "C" */
-	if (env == NULL || !*env)
-                env = "C";
-
-	return (env);
-}
-
-/*
- * Detect locale storage location and store its value to _PathLocale variable
- */
-int
-__detect_path_locale(void)
-{
-	if (_PathLocale == NULL) {
-		char *p = getenv("PATH_LOCALE");
-
-		if (p != NULL && !issetugid()) {
-			if (strlen(p) + 1/*"/"*/ + ENCODING_LEN +
-			    1/*"/"*/ + CATEGORY_LEN >= PATH_MAX)
-				return (ENAMETOOLONG);
-			_PathLocale = strdup(p);
-			if (_PathLocale == NULL)
-				return (errno == 0 ? ENOMEM : errno);
-		} else
-			_PathLocale = _PATH_LOCALE;
-	}
-	return (0);
-}
-
diff --git a/lib/libc/locale/setlocale.h b/lib/libc/locale/setlocale.h
deleted file mode 100644
index 82462ee..0000000
--- a/lib/libc/locale/setlocale.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (C) 1997 by Andrey A. Chernov, Moscow, Russia.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- *
- * $FreeBSD: src/lib/libc/locale/setlocale.h,v 1.6 2003/07/06 02:03:37 ache Exp $
- */
-
-#ifndef _SETLOCALE_H_
-#define	_SETLOCALE_H_
-
-#define ENCODING_LEN 31
-#define CATEGORY_LEN 11
-
-extern char *_PathLocale;
-
-int	__detect_path_locale(void);
-int	__wrap_setrunelocale(const char *);
-
-#endif /* !_SETLOCALE_H_ */
diff --git a/lib/libc/locale/setrunelocale.c b/lib/libc/locale/setrunelocale.c
deleted file mode 100644
index fd71947..0000000
--- a/lib/libc/locale/setrunelocale.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/setrunelocale.c,v 1.45 2005/02/27 15:11:09 phantom Exp $");
-
-#include <runetype.h>
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <wchar.h>
-#include "ldpart.h"
-#include "mblocal.h"
-#include "setlocale.h"
-
-extern _RuneLocale	*_Read_RuneMagi(FILE *);
-
-static int		__setrunelocale(const char *);
-
-static int
-__setrunelocale(const char *encoding)
-{
-	FILE *fp;
-	char name[PATH_MAX];
-	_RuneLocale *rl;
-	int saverr, ret;
-	static char ctype_encoding[ENCODING_LEN + 1];
-	static _RuneLocale *CachedRuneLocale;
-	static int Cached__mb_cur_max;
-	static size_t (*Cached__mbrtowc)(wchar_t * __restrict,
-	    const char * __restrict, size_t, mbstate_t * __restrict);
-	static size_t (*Cached__wcrtomb)(char * __restrict, wchar_t,
-	    mbstate_t * __restrict);
-	static int (*Cached__mbsinit)(const mbstate_t *);
-	static size_t (*Cached__mbsnrtowcs)(wchar_t * __restrict,
-	    const char ** __restrict, size_t, size_t, mbstate_t * __restrict);
-	static size_t (*Cached__wcsnrtombs)(char * __restrict,
-	    const wchar_t ** __restrict, size_t, size_t,
-	    mbstate_t * __restrict);
-
-	/*
-	 * The "C" and "POSIX" locale are always here.
-	 */
-	if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) {
-		_none_init(&_DefaultRuneLocale);
-		return (0);
-	}
-
-	/*
-	 * If the locale name is the same as our cache, use the cache.
-	 */
-	if (CachedRuneLocale != NULL &&
-	    strcmp(encoding, ctype_encoding) == 0) {
-		_CurrentRuneLocale = CachedRuneLocale;
-		__mb_cur_max = Cached__mb_cur_max;
-		__mbrtowc = Cached__mbrtowc;
-		__mbsinit = Cached__mbsinit;
-		__mbsnrtowcs = Cached__mbsnrtowcs;
-		__wcrtomb = Cached__wcrtomb;
-		__wcsnrtombs = Cached__wcsnrtombs;
-		return (0);
-	}
-
-	/*
-	 * Slurp the locale file into the cache.
-	 */
-
-	/* Range checking not needed, encoding length already checked before */
-	(void) strcpy(name, _PathLocale);
-	(void) strcat(name, "/");
-	(void) strcat(name, encoding);
-	(void) strcat(name, "/LC_CTYPE");
-
-	if ((fp = fopen(name, "r")) == NULL)
-		return (errno == 0 ? ENOENT : errno);
-
-	if ((rl = _Read_RuneMagi(fp)) == NULL) {
-		saverr = (errno == 0 ? EFTYPE : errno);
-		(void)fclose(fp);
-		return (saverr);
-	}
-	(void)fclose(fp);
-
-	__mbrtowc = NULL;
-	__mbsinit = NULL;
-	__mbsnrtowcs = __mbsnrtowcs_std;
-	__wcrtomb = NULL;
-	__wcsnrtombs = __wcsnrtombs_std;
-	rl->__sputrune = NULL;
-	rl->__sgetrune = NULL;
-	if (strcmp(rl->__encoding, "NONE") == 0)
-		ret = _none_init(rl);
-	else if (strcmp(rl->__encoding, "UTF-8") == 0)
-		ret = _UTF8_init(rl);
-	else if (strcmp(rl->__encoding, "EUC") == 0)
-		ret = _EUC_init(rl);
- 	else if (strcmp(rl->__encoding, "GB18030") == 0)
- 		ret = _GB18030_init(rl);
-	else if (strcmp(rl->__encoding, "GB2312") == 0)
-		ret = _GB2312_init(rl);
-	else if (strcmp(rl->__encoding, "GBK") == 0)
-		ret = _GBK_init(rl);
-	else if (strcmp(rl->__encoding, "BIG5") == 0)
-		ret = _BIG5_init(rl);
-	else if (strcmp(rl->__encoding, "MSKanji") == 0)
-		ret = _MSKanji_init(rl);
-	else
-		ret = EFTYPE;
-	if (ret == 0) {
-		if (CachedRuneLocale != NULL) {
-			/* See euc.c */
-			if (strcmp(CachedRuneLocale->__encoding, "EUC") == 0)
-				free(CachedRuneLocale->__variable);
-			free(CachedRuneLocale);
-		}
-		CachedRuneLocale = _CurrentRuneLocale;
-		Cached__mb_cur_max = __mb_cur_max;
-		Cached__mbrtowc = __mbrtowc;
-		Cached__mbsinit = __mbsinit;
-		Cached__mbsnrtowcs = __mbsnrtowcs;
-		Cached__wcrtomb = __wcrtomb;
-		Cached__wcsnrtombs = __wcsnrtombs;
-		(void)strcpy(ctype_encoding, encoding);
-	} else
-		free(rl);
-
-	return (ret);
-}
-
-int
-__wrap_setrunelocale(const char *locale)
-{
-	int ret = __setrunelocale(locale);
-
-	if (ret != 0) {
-		errno = ret;
-		return (_LDP_ERROR);
-	}
-	return (_LDP_LOADED);
-}
-
diff --git a/lib/libc/locale/table.c b/lib/libc/locale/table.c
deleted file mode 100644
index b393d30..0000000
--- a/lib/libc/locale/table.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/27/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.27 2005/02/27 15:11:09 phantom Exp $");
-
-#include <ctype.h>
-#include <runetype.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-_RuneLocale _DefaultRuneLocale = {
-    _RUNE_MAGIC_1,
-    "NONE",
-    NULL,
-    NULL,
-    0xFFFD,
-
-    {	/*00*/	_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*08*/	_CTYPE_C,
-		_CTYPE_C|_CTYPE_S|_CTYPE_B,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*10*/	_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*18*/	_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*20*/	_CTYPE_S|_CTYPE_B|_CTYPE_R,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*28*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*30*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|0,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|1,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|2,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|3,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|4,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|5,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|6,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|7,
-	/*38*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|8,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|9,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*40*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*48*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*50*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*58*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*60*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*68*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*70*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*78*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_C,
-    },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-    },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-    },
-};
-
-_RuneLocale *_CurrentRuneLocale = &_DefaultRuneLocale;
-
diff --git a/lib/libc/locale/tolower.c b/lib/libc/locale/tolower.c
deleted file mode 100644
index 24694e7..0000000
--- a/lib/libc/locale/tolower.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/tolower.c,v 1.11 2004/07/29 06:16:19 tjr Exp $");
-
-#include <stdio.h>
-#include <runetype.h>
-
-__ct_rune_t
-___tolower(c)
-	__ct_rune_t c;
-{
-	size_t lim;
-	_RuneRange *rr = &_CurrentRuneLocale->__maplower_ext;
-	_RuneEntry *base, *re;
-
-	if (c < 0 || c == EOF)
-		return(c);
-
-	/* Binary search -- see bsearch.c for explanation. */
-	base = rr->__ranges;
-	for (lim = rr->__nranges; lim != 0; lim >>= 1) {
-		re = base + (lim >> 1);
-		if (re->__min <= c && c <= re->__max)
-			return (re->__map + c - re->__min);
-		else if (c > re->__max) {
-			base = re + 1;
-			lim--;
-		}
-	}
-
-	return(c);
-}
diff --git a/lib/libc/locale/toupper.c b/lib/libc/locale/toupper.c
deleted file mode 100644
index bb7f36a..0000000
--- a/lib/libc/locale/toupper.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/toupper.c,v 1.11 2004/07/29 06:16:19 tjr Exp $");
-
-#include <stdio.h>
-#include <runetype.h>
-
-__ct_rune_t
-___toupper(c)
-	__ct_rune_t c;
-{
-	size_t lim;
-	_RuneRange *rr = &_CurrentRuneLocale->__mapupper_ext;
-	_RuneEntry *base, *re;
-
-	if (c < 0 || c == EOF)
-		return(c);
-
-	/* Binary search -- see bsearch.c for explanation. */
-	base = rr->__ranges;
-	for (lim = rr->__nranges; lim != 0; lim >>= 1) {
-		re = base + (lim >> 1);
-		if (re->__min <= c && c <= re->__max)
-			return (re->__map + c - re->__min);
-		else if (c > re->__max) {
-			base = re + 1;
-			lim--;
-		}
-	}
-
-	return(c);
-}
diff --git a/lib/libc/locale/utf8.c b/lib/libc/locale/utf8.c
deleted file mode 100644
index 08b8c2d..0000000
--- a/lib/libc/locale/utf8.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/utf8.c,v 1.13.2.1 2006/05/17 13:26:01 trhodes Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_UTF8_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_UTF8_mbsinit(const mbstate_t *);
-static size_t	_UTF8_mbsnrtowcs(wchar_t * __restrict,
-		    const char ** __restrict, size_t, size_t,
-		    mbstate_t * __restrict);
-static size_t	_UTF8_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-static size_t	_UTF8_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-		    size_t, size_t, mbstate_t * __restrict);
-
-typedef struct {
-	wchar_t	ch;
-	int	want;
-	wchar_t	lbound;
-} _UTF8State;
-
-int
-_UTF8_init(_RuneLocale *rl)
-{
-
-	__mbrtowc = _UTF8_mbrtowc;
-	__wcrtomb = _UTF8_wcrtomb;
-	__mbsinit = _UTF8_mbsinit;
-	__mbsnrtowcs = _UTF8_mbsnrtowcs;
-	__wcsnrtombs = _UTF8_wcsnrtombs;
-	_CurrentRuneLocale = rl;
-	__mb_cur_max = 6;
-
-	return (0);
-}
-
-static int
-_UTF8_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _UTF8State *)ps)->want == 0);
-}
-
-static size_t
-_UTF8_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_UTF8State *us;
-	int ch, i, mask, want;
-	wchar_t lbound, wch;
-
-	us = (_UTF8State *)ps;
-
-	if (us->want < 0 || us->want > 6) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	if (us->want == 0 && ((ch = (unsigned char)*s) & ~0x7f) == 0) {
-		/* Fast path for plain ASCII characters. */
-		if (pwc != NULL)
-			*pwc = ch;
-		return (ch != '\0' ? 1 : 0);
-	}
-
-	if (us->want == 0) {
-		/*
-		 * Determine the number of octets that make up this character
-		 * from the first octet, and a mask that extracts the
-		 * interesting bits of the first octet. We already know
-		 * the character is at least two bytes long.
-		 *
-		 * We also specify a lower bound for the character code to
-		 * detect redundant, non-"shortest form" encodings. For
-		 * example, the sequence C0 80 is _not_ a legal representation
-		 * of the null character. This enforces a 1-to-1 mapping
-		 * between character codes and their multibyte representations.
-		 */
-		ch = (unsigned char)*s;
-		if ((ch & 0x80) == 0) {
-			mask = 0x7f;
-			want = 1;
-			lbound = 0;
-		} else if ((ch & 0xe0) == 0xc0) {
-			mask = 0x1f;
-			want = 2;
-			lbound = 0x80;
-		} else if ((ch & 0xf0) == 0xe0) {
-			mask = 0x0f;
-			want = 3;
-			lbound = 0x800;
-		} else if ((ch & 0xf8) == 0xf0) {
-			mask = 0x07;
-			want = 4;
-			lbound = 0x10000;
-		} else if ((ch & 0xfc) == 0xf8) {
-			mask = 0x03;
-			want = 5;
-			lbound = 0x200000;
-		} else if ((ch & 0xfe) == 0xfc) {
-			mask = 0x01;
-			want = 6;
-			lbound = 0x4000000;
-		} else {
-			/*
-			 * Malformed input; input is not UTF-8.
-			 */
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-	} else {
-		want = us->want;
-		lbound = us->lbound;
-	}
-
-	/*
-	 * Decode the octet sequence representing the character in chunks
-	 * of 6 bits, most significant first.
-	 */
-	if (us->want == 0)
-		wch = (unsigned char)*s++ & mask;
-	else
-		wch = us->ch;
-	for (i = (us->want == 0) ? 1 : 0; i < MIN(want, n); i++) {
-		if ((*s & 0xc0) != 0x80) {
-			/*
-			 * Malformed input; bad characters in the middle
-			 * of a character.
-			 */
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wch <<= 6;
-		wch |= *s++ & 0x3f;
-	}
-	if (i < want) {
-		/* Incomplete multibyte sequence. */
-		us->want = want - i;
-		us->lbound = lbound;
-		us->ch = wch;
-		return ((size_t)-2);
-	}
-	if (wch < lbound) {
-		/*
-		 * Malformed input; redundant encoding.
-		 */
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	if (pwc != NULL)
-		*pwc = wch;
-	us->want = 0;
-	return (wch == L'\0' ? 0 : want);
-}
-
-static size_t
-_UTF8_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps)
-{
-	_UTF8State *us;
-	const char *s;
-	size_t nchr;
-	wchar_t wc;
-	size_t nb;
-
-	us = (_UTF8State *)ps;
-
-	s = *src;
-	nchr = 0;
-
-	if (dst == NULL) {
-		/*
-		 * The fast path in the loop below is not safe if an ASCII
-		 * character appears as anything but the first byte of a
-		 * multibyte sequence. Check now to avoid doing it in the loop.
-		 */
-		if (nms > 0 && us->want > 0 && (signed char)*s > 0) {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		for (;;) {
-			if (nms > 0 && (signed char)*s > 0)
-				/*
-				 * Fast path for plain ASCII characters
-				 * excluding NUL.
-				 */
-				nb = 1;
-			else if ((nb = _UTF8_mbrtowc(&wc, s, nms, ps)) ==
-			    (size_t)-1)
-				/* Invalid sequence - mbrtowc() sets errno. */
-				return ((size_t)-1);
-			else if (nb == 0 || nb == (size_t)-2)
-				return (nchr);
-			s += nb;
-			nms -= nb;
-			nchr++;
-		}
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * The fast path in the loop below is not safe if an ASCII
-	 * character appears as anything but the first byte of a
-	 * multibyte sequence. Check now to avoid doing it in the loop.
-	 */
-	if (nms > 0 && len > 0 && us->want > 0 && (signed char)*s > 0) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	while (len-- > 0) {
-		if (nms > 0 && (signed char)*s > 0) {
-			/*
-			 * Fast path for plain ASCII characters
-			 * excluding NUL.
-			 */
-			*dst = (wchar_t)*s;
-			nb = 1;
-		} else if ((nb = _UTF8_mbrtowc(dst, s, nms, ps)) ==
-		    (size_t)-1) {
-			*src = s;
-			return ((size_t)-1);
-		} else if (nb == (size_t)-2) {
-			*src = s + nms;
-			return (nchr);
-		} else if (nb == 0) {
-			*src = NULL;
-			return (nchr);
-		}
-		s += nb;
-		nms -= nb;
-		nchr++;
-		dst++;
-	}
-	*src = s;
-	return (nchr);
-}
-
-static size_t
-_UTF8_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_UTF8State *us;
-	unsigned char lead;
-	int i, len;
-
-	us = (_UTF8State *)ps;
-
-	if (us->want != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-
-	if ((wc & ~0x7f) == 0) {
-		/* Fast path for plain ASCII characters. */
-		*s = (char)wc;
-		return (1);
-	}
-
-	/*
-	 * Determine the number of octets needed to represent this character.
-	 * We always output the shortest sequence possible. Also specify the
-	 * first few bits of the first octet, which contains the information
-	 * about the sequence length.
-	 */
-	if ((wc & ~0x7f) == 0) {
-		lead = 0;
-		len = 1;
-	} else if ((wc & ~0x7ff) == 0) {
-		lead = 0xc0;
-		len = 2;
-	} else if ((wc & ~0xffff) == 0) {
-		lead = 0xe0;
-		len = 3;
-	} else if ((wc & ~0x1fffff) == 0) {
-		lead = 0xf0;
-		len = 4;
-	} else if ((wc & ~0x3ffffff) == 0) {
-		lead = 0xf8;
-		len = 5;
-	} else if ((wc & ~0x7fffffff) == 0) {
-		lead = 0xfc;
-		len = 6;
-	} else {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-
-	/*
-	 * Output the octets representing the character in chunks
-	 * of 6 bits, least significant last. The first octet is
-	 * a special case because it contains the sequence length
-	 * information.
-	 */
-	for (i = len - 1; i > 0; i--) {
-		s[i] = (wc & 0x3f) | 0x80;
-		wc >>= 6;
-	}
-	*s = (wc & 0xff) | lead;
-
-	return (len);
-}
-
-static size_t
-_UTF8_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
-    size_t nwc, size_t len, mbstate_t * __restrict ps)
-{
-	_UTF8State *us;
-	char buf[MB_LEN_MAX];
-	const wchar_t *s;
-	size_t nbytes;
-	size_t nb;
-
-	us = (_UTF8State *)ps;
-
-	if (us->want != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	s = *src;
-	nbytes = 0;
-
-	if (dst == NULL) {
-		while (nwc-- > 0) {
-			if (0 <= *s && *s < 0x80)
-				/* Fast path for plain ASCII characters. */
-				nb = 1;
-			else if ((nb = _UTF8_wcrtomb(buf, *s, ps)) ==
-			    (size_t)-1)
-				/* Invalid character - wcrtomb() sets errno. */
-				return ((size_t)-1);
-			if (*s == L'\0')
-				return (nbytes + nb - 1);
-			s++;
-			nbytes += nb;
-		}
-		return (nbytes);
-	}
-
-	while (len > 0 && nwc-- > 0) {
-		if (0 <= *s && *s < 0x80) {
-			/* Fast path for plain ASCII characters. */
-			nb = 1;
-			*dst = *s;
-		} else if (len > (size_t)MB_CUR_MAX) {
-			/* Enough space to translate in-place. */
-			if ((nb = _UTF8_wcrtomb(dst, *s, ps)) == (size_t)-1) {
-				*src = s;
-				return ((size_t)-1);
-			}
-		} else {
-			/*
-			 * May not be enough space; use temp. buffer.
-			 */
-			if ((nb = _UTF8_wcrtomb(buf, *s, ps)) == (size_t)-1) {
-				*src = s;
-				return ((size_t)-1);
-			}
-			if (nb > (int)len)
-				/* MB sequence for character won't fit. */
-				break;
-			memcpy(dst, buf, nb);
-		}
-		if (*s == L'\0') {
-			*src = NULL;
-			return (nbytes + nb - 1);
-		}
-		s++;
-		dst += nb;
-		len -= nb;
-		nbytes += nb;
-	}
-	*src = s;
-	return (nbytes);
-}
diff --git a/lib/libc/locale/wcrtomb.c b/lib/libc/locale/wcrtomb.c
deleted file mode 100644
index 4d7b115..0000000
--- a/lib/libc/locale/wcrtomb.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.8 2004/05/12 14:09:04 tjr Exp $");
-
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	static mbstate_t mbs;
-
-	if (ps == NULL)
-		ps = &mbs;
-	return (__wcrtomb(s, wc, ps));
-}
diff --git a/lib/libc/locale/wcsftime.c b/lib/libc/locale/wcsftime.c
deleted file mode 100644
index 2598043..0000000
--- a/lib/libc/locale/wcsftime.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcsftime.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <time.h>
-#include <wchar.h>
-
-/*
- * Convert date and time to a wide-character string.
- *
- * This is the wide-character counterpart of strftime(). So that we do not
- * have to duplicate the code of strftime(), we convert the format string to
- * multibyte, call strftime(), then convert the result back into wide
- * characters.
- *
- * This technique loses in the presence of stateful multibyte encoding if any
- * of the conversions in the format string change conversion state. When
- * stateful encoding is implemented, we will need to reset the state between
- * format specifications in the format string.
- */
-size_t
-wcsftime(wchar_t * __restrict wcs, size_t maxsize,
-    const wchar_t * __restrict format, const struct tm * __restrict timeptr)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char *dst, *dstp, *sformat;
-	size_t n, sflen;
-	int sverrno;
-
-	sformat = dst = NULL;
-
-	/*
-	 * Convert the supplied format string to a multibyte representation
-	 * for strftime(), which only handles single-byte characters.
-	 */
-	mbs = initial;
-	sflen = wcsrtombs(NULL, &format, 0, &mbs);
-	if (sflen == (size_t)-1)
-		goto error;
-	if ((sformat = malloc(sflen + 1)) == NULL)
-		goto error;
-	mbs = initial;
-	wcsrtombs(sformat, &format, sflen + 1, &mbs);
-
-	/*
-	 * Allocate memory for longest multibyte sequence that will fit
-	 * into the caller's buffer and call strftime() to fill it.
-	 * Then, copy and convert the result back into wide characters in
-	 * the caller's buffer.
-	 */
-	if (SIZE_T_MAX / MB_CUR_MAX <= maxsize) {
-		/* maxsize is prepostorously large - avoid int. overflow. */
-		errno = EINVAL;
-		goto error;
-	}
-	if ((dst = malloc(maxsize * MB_CUR_MAX)) == NULL)
-		goto error;
-	if (strftime(dst, maxsize, sformat, timeptr) == 0)
-		goto error;
-	dstp = dst;
-	mbs = initial;
-	n = mbsrtowcs(wcs, (const char **)&dstp, maxsize, &mbs);
-	if (n == (size_t)-2 || n == (size_t)-1 || dstp != NULL)
-		goto error;
-
-	free(sformat);
-	free(dst);
-	return (n);
-
-error:
-	sverrno = errno;
-	free(sformat);
-	free(dst);
-	errno = sverrno;
-	return (0);
-}
diff --git a/lib/libc/locale/wcsnrtombs.c b/lib/libc/locale/wcsnrtombs.c
deleted file mode 100644
index 89cd9b7..0000000
--- a/lib/libc/locale/wcsnrtombs.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcsnrtombs.c,v 1.3 2005/02/12 08:45:12 stefanf Exp $");
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src, size_t nwc,
-    size_t len, mbstate_t * __restrict ps)
-{
-	static mbstate_t mbs;
-
-	if (ps == NULL)
-		ps = &mbs;
-	return (__wcsnrtombs(dst, src, nwc, len, ps));
-}
-
-size_t
-__wcsnrtombs_std(char * __restrict dst, const wchar_t ** __restrict src,
-    size_t nwc, size_t len, mbstate_t * __restrict ps)
-{
-	mbstate_t mbsbak;
-	char buf[MB_LEN_MAX];
-	const wchar_t *s;
-	size_t nbytes;
-	size_t nb;
-
-	s = *src;
-	nbytes = 0;
-
-	if (dst == NULL) {
-		while (nwc-- > 0) {
-			if ((nb = __wcrtomb(buf, *s, ps)) == (size_t)-1)
-				/* Invalid character - wcrtomb() sets errno. */
-				return ((size_t)-1);
-			else if (*s == L'\0')
-				return (nbytes + nb - 1);
-			s++;
-			nbytes += nb;
-		}
-		return (nbytes);
-	}
-
-	while (len > 0 && nwc-- > 0) {
-		if (len > (size_t)MB_CUR_MAX) {
-			/* Enough space to translate in-place. */
-			if ((nb = __wcrtomb(dst, *s, ps)) == (size_t)-1) {
-				*src = s;
-				return ((size_t)-1);
-			}
-		} else {
-			/*
-			 * May not be enough space; use temp. buffer.
-			 *
-			 * We need to save a copy of the conversion state
-			 * here so we can restore it if the multibyte
-			 * character is too long for the buffer.
-			 */
-			mbsbak = *ps;
-			if ((nb = __wcrtomb(buf, *s, ps)) == (size_t)-1) {
-				*src = s;
-				return ((size_t)-1);
-			}
-			if (nb > (int)len) {
-				/* MB sequence for character won't fit. */
-				*ps = mbsbak;
-				break;
-			}
-			memcpy(dst, buf, nb);
-		}
-		if (*s == L'\0') {
-			*src = NULL;
-			return (nbytes + nb - 1);
-		}
-		s++;
-		dst += nb;
-		len -= nb;
-		nbytes += nb;
-	}
-	*src = s;
-	return (nbytes);
-}
diff --git a/lib/libc/locale/wcsrtombs.c b/lib/libc/locale/wcsrtombs.c
deleted file mode 100644
index 61e5432..0000000
--- a/lib/libc/locale/wcsrtombs.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcsrtombs.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-wcsrtombs(char * __restrict dst, const wchar_t ** __restrict src, size_t len,
-    mbstate_t * __restrict ps)
-{
-	static mbstate_t mbs;
-
-	if (ps == NULL)
-		ps = &mbs;
-	return (__wcsnrtombs(dst, src, SIZE_T_MAX, len, ps));
-}
diff --git a/lib/libc/locale/wcstod.c b/lib/libc/locale/wcstod.c
deleted file mode 100644
index da90f16..0000000
--- a/lib/libc/locale/wcstod.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstod.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * Convert a string to a double-precision number.
- *
- * This is the wide-character counterpart of strtod(). So that we do not
- * have to duplicate the code of strtod() here, we convert the supplied
- * wide character string to multibyte and call strtod() on the result.
- * This assumes that the multibyte encoding is compatible with ASCII
- * for at least the digits, radix character and letters.
- */
-double
-wcstod(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	double val;
-	char *buf, *end;
-	const wchar_t *wcp;
-	size_t len;
-
-	while (iswspace(*nptr))
-		nptr++;
-
-	/*
-	 * Convert the supplied numeric wide char. string to multibyte.
-	 *
-	 * We could attempt to find the end of the numeric portion of the
-	 * wide char. string to avoid converting unneeded characters but
-	 * choose not to bother; optimising the uncommon case where
-	 * the input string contains a lot of text after the number
-	 * duplicates a lot of strtod()'s functionality and slows down the
-	 * most common cases.
-	 */
-	wcp = nptr;
-	mbs = initial;
-	if ((len = wcsrtombs(NULL, &wcp, 0, &mbs)) == (size_t)-1) {
-		if (endptr != NULL)
-			*endptr = (wchar_t *)nptr;
-		return (0.0);
-	}
-	if ((buf = malloc(len + 1)) == NULL)
-		return (0.0);
-	mbs = initial;
-	wcsrtombs(buf, &wcp, len + 1, &mbs);
-
-	/* Let strtod() do most of the work for us. */
-	val = strtod(buf, &end);
-
-	/*
-	 * We only know where the number ended in the _multibyte_
-	 * representation of the string. If the caller wants to know
-	 * where it ended, count multibyte characters to find the
-	 * corresponding position in the wide char string.
-	 */
-	if (endptr != NULL)
-		/* XXX Assume each wide char is one byte. */
-		*endptr = (wchar_t *)nptr + (end - buf);
-
-	free(buf);
-
-	return (val);
-}
diff --git a/lib/libc/locale/wcstof.c b/lib/libc/locale/wcstof.c
deleted file mode 100644
index a68b382..0000000
--- a/lib/libc/locale/wcstof.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstof.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * See wcstod() for comments as to the logic used.
- */
-float
-wcstof(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	float val;
-	char *buf, *end;
-	const wchar_t *wcp;
-	size_t len;
-
-	while (iswspace(*nptr))
-		nptr++;
-
-	wcp = nptr;
-	mbs = initial;
-	if ((len = wcsrtombs(NULL, &wcp, 0, &mbs)) == (size_t)-1) {
-		if (endptr != NULL)
-			*endptr = (wchar_t *)nptr;
-		return (0.0);
-	}
-	if ((buf = malloc(len + 1)) == NULL)
-		return (0.0);
-	mbs = initial;
-	wcsrtombs(buf, &wcp, len + 1, &mbs);
-
-	val = strtof(buf, &end);
-
-	if (endptr != NULL)
-		*endptr = (wchar_t *)nptr + (end - buf);
-
-	free(buf);
-
-	return (val);
-}
diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c
deleted file mode 100644
index 09e7817..0000000
--- a/lib/libc/locale/wcstoimax.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "from @(#)strtol.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoimax.c,v 1.2 2003/01/01 18:48:43 schweikh Exp $");
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * Convert a wide character string to an intmax_t integer.
- */
-intmax_t
-wcstoimax(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-    int base)
-{
-	const wchar_t *s;
-	uintmax_t acc;
-	wchar_t c;
-	uintmax_t cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * See strtoimax for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace(c));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = neg ? (uintmax_t)-(INTMAX_MIN + INTMAX_MAX) + INTMAX_MAX
-	    : INTMAX_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit(c))
-			c = digittoint(c);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? INTMAX_MIN : INTMAX_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c
deleted file mode 100644
index ae51c2e..0000000
--- a/lib/libc/locale/wcstol.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstol.c,v 1.1 2002/09/08 13:27:26 tjr Exp $");
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * Convert a string to a long integer.
- */
-long
-wcstol(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
-{
-	const wchar_t *s;
-	unsigned long acc;
-	wchar_t c;
-	unsigned long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * See strtol for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace(c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = neg ? (unsigned long)-(LONG_MIN + LONG_MAX) + LONG_MAX
-	    : LONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit(c))
-			c = digittoint(c);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LONG_MIN : LONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/locale/wcstold.c b/lib/libc/locale/wcstold.c
deleted file mode 100644
index c50ffbd..0000000
--- a/lib/libc/locale/wcstold.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstold.c,v 1.4 2004/04/07 09:47:56 tjr Exp $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * See wcstod() for comments as to the logic used.
- */
-long double
-wcstold(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	long double val;
-	char *buf, *end;
-	const wchar_t *wcp;
-	size_t len;
-
-	while (iswspace(*nptr))
-		nptr++;
-
-	wcp = nptr;
-	mbs = initial;
-	if ((len = wcsrtombs(NULL, &wcp, 0, &mbs)) == (size_t)-1) {
-		if (endptr != NULL)
-			*endptr = (wchar_t *)nptr;
-		return (0.0);
-	}
-	if ((buf = malloc(len + 1)) == NULL)
-		return (0.0);
-	mbs = initial;
-	wcsrtombs(buf, &wcp, len + 1, &mbs);
-
-	val = strtold(buf, &end);
-
-	if (endptr != NULL)
-		*endptr = (wchar_t *)nptr + (end - buf);
-
-	free(buf);
-
-	return (val);
-}
diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c
deleted file mode 100644
index a48056c..0000000
--- a/lib/libc/locale/wcstoll.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.19 2002/09/06 11:23:59 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoll.c,v 1.1 2002/09/22 08:06:45 tjr Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * Convert a wide character string to a long long integer.
- */
-long long
-wcstoll(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
-{
-	const wchar_t *s;
-	unsigned long long acc;
-	wchar_t c;
-	unsigned long long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * See strtoll for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace(c));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = neg ? (unsigned long long)-(LLONG_MIN + LLONG_MAX) + LLONG_MAX
-	    : LLONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit(c))
-			c = digittoint(c);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LLONG_MIN : LLONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/locale/wcstombs.c b/lib/libc/locale/wcstombs.c
deleted file mode 100644
index b798c9e..0000000
--- a/lib/libc/locale/wcstombs.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstombs.c,v 1.10 2004/07/21 10:54:57 tjr Exp $");
-
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-
-	mbs = initial;
-	return (__wcsnrtombs(s, &pwcs, SIZE_T_MAX, n, &mbs));
-}
diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c
deleted file mode 100644
index f3b8b49..0000000
--- a/lib/libc/locale/wcstoul.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1990, 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoul.c,v 1.1 2002/09/08 13:27:26 tjr Exp $");
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * Convert a wide character string to an unsigned long integer.
- */
-unsigned long
-wcstoul(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
-{
-	const wchar_t *s;
-	unsigned long acc;
-	wchar_t c;
-	unsigned long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * See strtol for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace(c));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = ULONG_MAX / base;
-	cutlim = ULONG_MAX % base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit(c))
-			c = digittoint(c);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = ULONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c
deleted file mode 100644
index fd9558b..0000000
--- a/lib/libc/locale/wcstoull.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.18 2002/09/06 11:23:59 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoull.c,v 1.1 2002/09/22 08:06:45 tjr Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * Convert a wide character string to an unsigned long long integer.
- */
-unsigned long long
-wcstoull(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-    int base)
-{
-	const wchar_t *s;
-	unsigned long long acc;
-	wchar_t c;
-	unsigned long long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * See strtoull for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace(c));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = ULLONG_MAX / base;
-	cutlim = ULLONG_MAX % base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit(c))
-			c = digittoint(c);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = ULLONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c
deleted file mode 100644
index 01e25d5..0000000
--- a/lib/libc/locale/wcstoumax.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "from @(#)strtoul.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcstoumax.c,v 1.1 2002/09/22 08:06:45 tjr Exp $");
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-
-/*
- * Convert a wide character string to a uintmax_t integer.
- */
-uintmax_t
-wcstoumax(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-    int base)
-{
-	const wchar_t *s;
-	uintmax_t acc;
-	wchar_t c;
-	uintmax_t cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * See strtoimax for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace(c));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = UINTMAX_MAX / base;
-	cutlim = UINTMAX_MAX % base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit(c))
-			c = digittoint(c);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = UINTMAX_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/locale/wctob.c b/lib/libc/locale/wctob.c
deleted file mode 100644
index a8f0056..0000000
--- a/lib/libc/locale/wctob.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wctob.c,v 1.4 2004/05/12 14:26:54 tjr Exp $");
-
-#include <limits.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-wctob(wint_t c)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs = initial;
-	char buf[MB_LEN_MAX];
-
-	if (c == WEOF || __wcrtomb(buf, c, &mbs) != 1)
-		return (EOF);
-	return ((unsigned char)*buf);
-}
diff --git a/lib/libc/locale/wctomb.c b/lib/libc/locale/wctomb.c
deleted file mode 100644
index 701b3ca..0000000
--- a/lib/libc/locale/wctomb.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wctomb.c,v 1.8 2004/07/29 06:18:40 tjr Exp $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-wctomb(char *s, wchar_t wchar)
-{
-	static const mbstate_t initial;
-	static mbstate_t mbs;
-	size_t rval;
-
-	if (s == NULL) {
-		/* No support for state dependent encodings. */
-		mbs = initial;
-		return (0);
-	}
-	if ((rval = __wcrtomb(s, wchar, &mbs)) == (size_t)-1)
-		return (-1);
-	return ((int)rval);
-}
diff --git a/lib/libc/locale/wctrans.c b/lib/libc/locale/wctrans.c
deleted file mode 100644
index a86e5c7..0000000
--- a/lib/libc/locale/wctrans.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wctrans.c,v 1.3 2003/11/01 08:20:58 tjr Exp $");
-
-#include <errno.h>
-#include <string.h>
-#include <wctype.h>
-
-enum {
-	_WCT_ERROR	= 0,
-	_WCT_TOLOWER	= 1,
-	_WCT_TOUPPER	= 2
-};
-
-wint_t
-towctrans(wint_t wc, wctrans_t desc)
-{
-
-	switch (desc) {
-	case _WCT_TOLOWER:
-		wc = towlower(wc);
-		break;
-	case _WCT_TOUPPER:
-		wc = towupper(wc);
-		break;
-	case _WCT_ERROR:
-	default:
-		errno = EINVAL;
-		break;
-	}
-
-	return (wc);
-}
-
-wctrans_t
-wctrans(const char *charclass)
-{
-	struct {
-		const char	*name;
-		wctrans_t	 trans;
-	} ccls[] = {
-		{ "tolower",	_WCT_TOLOWER },
-		{ "toupper",	_WCT_TOUPPER },
-		{ NULL,		_WCT_ERROR },		/* Default */
-	};
-	int i;
-
-	i = 0;
-	while (ccls[i].name != NULL && strcmp(ccls[i].name, charclass) != 0)
-		i++;
-
-	if (ccls[i].trans == _WCT_ERROR)
-		errno = EINVAL;
-	return (ccls[i].trans);
-}
diff --git a/lib/libc/locale/wctype.c b/lib/libc/locale/wctype.c
deleted file mode 100644
index a0e21bc..0000000
--- a/lib/libc/locale/wctype.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wctype.c,v 1.3 2004/03/27 08:59:21 tjr Exp $");
-
-#include <ctype.h>
-#include <string.h>
-#include <wctype.h>
-
-#undef iswctype
-int
-iswctype(wint_t wc, wctype_t charclass)
-{
-
-	return (__istype(wc, charclass));
-}
-
-wctype_t
-wctype(const char *property)
-{
-	struct {
-		const char	*name;
-		wctype_t	 mask;
-	} props[] = {
-		{ "alnum",	_CTYPE_A|_CTYPE_D },
-		{ "alpha",	_CTYPE_A },
-		{ "blank",	_CTYPE_B },
-		{ "cntrl",	_CTYPE_C },
-		{ "digit",	_CTYPE_D },
-		{ "graph",	_CTYPE_G },
-		{ "lower",	_CTYPE_L },
-		{ "print",	_CTYPE_R },
-		{ "punct",	_CTYPE_P },
-		{ "space",	_CTYPE_S },
-		{ "upper",	_CTYPE_U },
-		{ "xdigit",	_CTYPE_X },
-		{ "ideogram",	_CTYPE_I },	/* BSD extension */
-		{ "special",	_CTYPE_T },	/* BSD extension */
-		{ "phonogram",	_CTYPE_Q },	/* BSD extension */
-		{ "rune",	0xFFFFFF00L },	/* BSD extension */
-		{ NULL,		0UL },		/* Default */
-	};
-	int i;
-
-	i = 0;
-	while (props[i].name != NULL && strcmp(props[i].name, property) != 0)
-		i++;
-
-	return (props[i].mask);
-}
diff --git a/lib/libc/locale/wcwidth.c b/lib/libc/locale/wcwidth.c
deleted file mode 100644
index 288a60d..0000000
--- a/lib/libc/locale/wcwidth.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcwidth.c,v 1.7 2004/08/12 12:19:11 tjr Exp $");
-
-#include <wchar.h>
-
-#undef wcwidth
-
-int
-wcwidth(wchar_t wc)
-{
-
-	return (__wcwidth(wc));
-}
diff --git a/lib/libc/nameser/Makefile b/lib/libc/nameser/Makefile
deleted file mode 100644
index d05c7bd..0000000
--- a/lib/libc/nameser/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = ns_name.o ns_netint.o ns_parse.o ns_print.o ns_samedomain.o ns_ttl.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/nameser/ns_name.c b/lib/libc/nameser/ns_name.c
deleted file mode 100644
index df9de8a..0000000
--- a/lib/libc/nameser/ns_name.c
+++ /dev/null
@@ -1,965 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_name.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_name.c,v 1.1.1.1.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <limits.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-#define NS_TYPE_ELT			0x40 /* EDNS0 extended label type */
-#define DNS_LABELTYPE_BITSTRING		0x41
-
-/* Data. */
-
-static const char	digits[] = "0123456789";
-
-static const char digitvalue[256] = {
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,	/*16*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*32*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*48*/
-	 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1, /*64*/
-	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*80*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*96*/
-	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*112*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*128*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*256*/
-};
-
-/* Forward. */
-
-static int		special(int);
-static int		printable(int);
-static int		dn_find(const u_char *, const u_char *,
-				const u_char * const *,
-				const u_char * const *);
-static int		encode_bitsring(const char **, const char *,
-					unsigned char **, unsigned char **,
-					unsigned const char *);
-static int		labellen(const u_char *);
-static int		decode_bitstring(const unsigned char **,
-					 char *, const char *);
-
-/* Public. */
-
-/*
- * ns_name_ntop(src, dst, dstsiz)
- *	Convert an encoded domain name to printable ascii as per RFC1035.
- * return:
- *	Number of bytes written to buffer, or -1 (with errno set)
- * notes:
- *	The root is returned as "."
- *	All other domains are returned in non absolute form
- */
-int
-ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
-{
-	const u_char *cp;
-	char *dn, *eom;
-	u_char c;
-	u_int n;
-	int l;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn != dst) {
-			if (dn >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*dn++ = '.';
-		}
-		if ((l = labellen(cp - 1)) < 0) {
-			errno = EMSGSIZE; /* XXX */
-			return(-1);
-		}
-		if (dn + l >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if ((n & NS_CMPRSFLGS) == NS_TYPE_ELT) {
-			int m;
-
-			if (n != DNS_LABELTYPE_BITSTRING) {
-				/* XXX: labellen should reject this case */
-				errno = EINVAL;
-				return(-1);
-			}
-			if ((m = decode_bitstring(&cp, dn, eom)) < 0)
-			{
-				errno = EMSGSIZE;
-				return(-1);
-			}
-			dn += m; 
-			continue;
-		}
-		for ((void)NULL; l > 0; l--) {
-			c = *cp++;
-			if (special(c)) {
-				if (dn + 1 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = (char)c;
-			} else if (!printable(c)) {
-				if (dn + 3 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = digits[c / 100];
-				*dn++ = digits[(c % 100) / 10];
-				*dn++ = digits[c % 10];
-			} else {
-				if (dn >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = (char)c;
-			}
-		}
-	}
-	if (dn == dst) {
-		if (dn >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = '.';
-	}
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*dn++ = '\0';
-	return (dn - dst);
-}
-
-/*
- * ns_name_pton(src, dst, dstsiz)
- *	Convert a ascii string into an encoded domain name as per RFC1035.
- * return:
- *	-1 if it fails
- *	1 if string was fully qualified
- *	0 is string was not fully qualified
- * notes:
- *	Enforces label and domain length limits.
- */
-
-int
-ns_name_pton(const char *src, u_char *dst, size_t dstsiz)
-{
-	u_char *label, *bp, *eom;
-	int c, n, escaped, e = 0;
-	char *cp;
-
-	escaped = 0;
-	bp = dst;
-	eom = dst + dstsiz;
-	label = bp++;
-
-	while ((c = *src++) != 0) {
-		if (escaped) {
-			if (c == '[') { /* start a bit string label */
-				if ((cp = strchr(src, ']')) == NULL) {
-					errno = EINVAL; /* ??? */
-					return(-1);
-				}
-				if ((e = encode_bitsring(&src, cp + 2,
-							 &label, &bp, eom))
-				    != 0) {
-					errno = e;
-					return(-1);
-				}
-				escaped = 0;
-				label = bp++;
-				if ((c = *src++) == 0)
-					goto done;
-				else if (c != '.') {
-					errno = EINVAL;
-					return(-1);
-				}
-				continue;
-			}
-			else if ((cp = strchr(digits, c)) != NULL) {
-				n = (cp - digits) * 100;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits) * 10;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits);
-				if (n > 255) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				c = n;
-			}
-			escaped = 0;
-		} else if (c == '\\') {
-			escaped = 1;
-			continue;
-		} else if (c == '.') {
-			c = (bp - label - 1);
-			if ((c & NS_CMPRSFLGS) != 0) {	/* Label too big. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (label >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*label = c;
-			/* Fully qualified ? */
-			if (*src == '\0') {
-				if (c != 0) {
-					if (bp >= eom) {
-						errno = EMSGSIZE;
-						return (-1);
-					}
-					*bp++ = '\0';
-				}
-				if ((bp - dst) > MAXCDNAME) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				return (1);
-			}
-			if (c == 0 || *src == '.') {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			label = bp++;
-			continue;
-		}
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = (u_char)c;
-	}
-	c = (bp - label - 1);
-	if ((c & NS_CMPRSFLGS) != 0) {		/* Label too big. */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-  done:
-	if (label >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*label = c;
-	if (c != 0) {
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = 0;
-	}
-	if ((bp - dst) > MAXCDNAME) {	/* src too big */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * ns_name_ntol(src, dst, dstsiz)
- *	Convert a network strings labels into all lowercase.
- * return:
- *	Number of bytes written to buffer, or -1 (with errno set)
- * notes:
- *	Enforces label and domain length limits.
- */
-
-int
-ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz)
-{
-	const u_char *cp;
-	u_char *dn, *eom;
-	u_char c;
-	u_int n;
-	int l;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = n;
-		if ((l = labellen(cp - 1)) < 0) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn + l >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		for ((void)NULL; l > 0; l--) {
-			c = *cp++;
-			if (isupper(c))
-				*dn++ = tolower(c);
-			else
-				*dn++ = c;
-		}
-	}
-	*dn++ = '\0';
-	return (dn - dst);
-}
-
-/*
- * ns_name_unpack(msg, eom, src, dst, dstsiz)
- *	Unpack a domain name from a message, source may be compressed.
- * return:
- *	-1 if it fails, or consumed octets if it succeeds.
- */
-int
-ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
-	       u_char *dst, size_t dstsiz)
-{
-	const u_char *srcp, *dstlim;
-	u_char *dstp;
-	int n, len, checked, l;
-
-	len = -1;
-	checked = 0;
-	dstp = dst;
-	srcp = src;
-	dstlim = dst + dstsiz;
-	if (srcp < msg || srcp >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	/* Fetch next label in domain name. */
-	while ((n = *srcp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:
-		case NS_TYPE_ELT:
-			/* Limit checks. */
-			if ((l = labellen(srcp - 1)) < 0) {
-				errno = EMSGSIZE;
-				return(-1);
-			}
-			if (dstp + l + 1 >= dstlim || srcp + l >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += l + 1;
-			*dstp++ = n;
-			memcpy(dstp, srcp, l);
-			dstp += l;
-			srcp += l;
-			break;
-
-		case NS_CMPRSFLGS:
-			if (srcp >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (len < 0)
-				len = srcp - src + 1;
-			srcp = msg + (((n & 0x3f) << 8) | (*srcp & 0xff));
-			if (srcp < msg || srcp >= eom) {  /* Out of range. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += 2;
-			/*
-			 * Check for loops in the compressed name;
-			 * if we've looked at the whole message,
-			 * there must be a loop.
-			 */
-			if (checked >= eom - msg) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			break;
-
-		default:
-			errno = EMSGSIZE;
-			return (-1);			/* flag error */
-		}
-	}
-	*dstp = '\0';
-	if (len < 0)
-		len = srcp - src;
-	return (len);
-}
-
-/*
- * ns_name_pack(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Pack domain name 'domain' into 'comp_dn'.
- * return:
- *	Size of the compressed name, or -1.
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message. The array
- *	ends with NULL.
- *	'lastdnptr' is a pointer to the end of the array pointed to
- *	by 'dnptrs'.
- * Side effects:
- *	The list of pointers in dnptrs is updated for labels inserted into
- *	the message as we compress the name.  If 'dnptr' is NULL, we don't
- *	try to compress names. If 'lastdnptr' is NULL, we don't update the
- *	list.
- */
-int
-ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
-	     const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char *dstp;
-	const u_char **cpp, **lpp, *eob, *msg;
-	const u_char *srcp;
-	int n, l, first = 1;
-
-	srcp = src;
-	dstp = dst;
-	eob = dstp + dstsiz;
-	lpp = cpp = NULL;
-	if (dnptrs != NULL) {
-		if ((msg = *dnptrs++) != NULL) {
-			for (cpp = dnptrs; *cpp != NULL; cpp++)
-				(void)NULL;
-			lpp = cpp;	/* end of list to search */
-		}
-	} else
-		msg = NULL;
-
-	/* make sure the domain we are about to add is legal */
-	l = 0;
-	do {
-		int l0;
-
-		n = *srcp;
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if ((l0 = labellen(srcp)) < 0) {
-			errno = EINVAL;
-			return(-1);
-		}
-		l += l0 + 1;
-		if (l > MAXCDNAME) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		srcp += l0 + 1;
-	} while (n != 0);
-
-	/* from here on we need to reset compression pointer array on error */
-	srcp = src;
-	do {
-		/* Look to see if we can use pointers. */
-		n = *srcp;
-		if (n != 0 && msg != NULL) {
-			l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
-				    (const u_char * const *)lpp);
-			if (l >= 0) {
-				if (dstp + 1 >= eob) {
-					goto cleanup;
-				}
-				*dstp++ = (l >> 8) | NS_CMPRSFLGS;
-				*dstp++ = l % 256;
-				return (dstp - dst);
-			}
-			/* Not found, save it. */
-			if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
-			    (dstp - msg) < 0x4000 && first) {
-				*cpp++ = dstp;
-				*cpp = NULL;
-				first = 0;
-			}
-		}
-		/* copy label to buffer */
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			/* Should not happen. */
-			goto cleanup;
-		}
-		n = labellen(srcp);
-		if (dstp + 1 + n >= eob) {
-			goto cleanup;
-		}
-		memcpy(dstp, srcp, n + 1);
-		srcp += n + 1;
-		dstp += n + 1;
-	} while (n != 0);
-
-	if (dstp > eob) {
-cleanup:
-		if (msg != NULL)
-			*lpp = NULL;
-		errno = EMSGSIZE;
-		return (-1);
-	} 
-	return (dstp - dst);
-}
-
-/*
- * ns_name_uncompress(msg, eom, src, dst, dstsiz)
- *	Expand compressed domain name to presentation format.
- * return:
- *	Number of bytes read out of `src', or -1 (with errno set).
- * note:
- *	Root domain returns as "." not "".
- */
-int
-ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
-		   char *dst, size_t dstsiz)
-{
-	u_char tmp[NS_MAXCDNAME];
-	int n;
-	
-	if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
-		return (-1);
-	if (ns_name_ntop(tmp, dst, dstsiz) == -1)
-		return (-1);
-	return (n);
-}
-
-/*
- * ns_name_compress(src, dst, dstsiz, dnptrs, lastdnptr)
- *	Compress a domain name into wire format, using compression pointers.
- * return:
- *	Number of bytes consumed in `dst' or -1 (with errno set).
- * notes:
- *	'dnptrs' is an array of pointers to previous compressed names.
- *	dnptrs[0] is a pointer to the beginning of the message.
- *	The list ends with NULL.  'lastdnptr' is a pointer to the end of the
- *	array pointed to by 'dnptrs'. Side effect is to update the list of
- *	pointers for labels inserted into the message as we compress the name.
- *	If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
- *	is NULL, we don't update the list.
- */
-int
-ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
-		 const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char tmp[NS_MAXCDNAME];
-
-	if (ns_name_pton(src, tmp, sizeof tmp) == -1)
-		return (-1);
-	return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
-}
-
-/*
- * Reset dnptrs so that there are no active references to pointers at or
- * after src.
- */
-void
-ns_name_rollback(const u_char *src, const u_char **dnptrs,
-		 const u_char **lastdnptr)
-{
-	while (dnptrs < lastdnptr && *dnptrs != NULL) {
-		if (*dnptrs >= src) {
-			*dnptrs = NULL;
-			break;
-		}
-		dnptrs++;
-	}
-}
-
-/*
- * ns_name_skip(ptrptr, eom)
- *	Advance *ptrptr to skip over the compressed name it points at.
- * return:
- *	0 on success, -1 (with errno set) on failure.
- */
-int
-ns_name_skip(const u_char **ptrptr, const u_char *eom)
-{
-	const u_char *cp;
-	u_int n;
-	int l;
-
-	cp = *ptrptr;
-	while (cp < eom && (n = *cp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:			/* normal case, n == len */
-			cp += n;
-			continue;
-		case NS_TYPE_ELT: /* EDNS0 extended label */
-			if ((l = labellen(cp - 1)) < 0) {
-				errno = EMSGSIZE; /* XXX */
-				return(-1);
-			}
-			cp += l;
-			continue;
-		case NS_CMPRSFLGS:	/* indirection */
-			cp++;
-			break;
-		default:		/* illegal type */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		break;
-	}
-	if (cp > eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*ptrptr = cp;
-	return (0);
-}
-
-/* Private. */
-
-/*
- * special(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this characted special ("in need of quoting") ?
- * return:
- *	boolean.
- */
-static int
-special(int ch) {
-	switch (ch) {
-	case 0x22: /* '"' */
-	case 0x2E: /* '.' */
-	case 0x3B: /* ';' */
-	case 0x5C: /* '\\' */
-	case 0x28: /* '(' */
-	case 0x29: /* ')' */
-	/* Special modifiers in zone files. */
-	case 0x40: /* '@' */
-	case 0x24: /* '$' */
-		return (1);
-	default:
-		return (0);
-	}
-}
-
-/*
- * printable(ch)
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this character visible and not a space when printed ?
- * return:
- *	boolean.
- */
-static int
-printable(int ch) {
-	return (ch > 0x20 && ch < 0x7f);
-}
-
-/*
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	convert this character to lower case if it's upper case.
- */
-static int
-mklower(int ch) {
-	if (ch >= 0x41 && ch <= 0x5A)
-		return (ch + 0x20);
-	return (ch);
-}
-
-/*
- * dn_find(domain, msg, dnptrs, lastdnptr)
- *	Search for the counted-label name in an array of compressed names.
- * return:
- *	offset from msg if found, or -1.
- * notes:
- *	dnptrs is the pointer to the first name on the list,
- *	not the pointer to the start of the message.
- */
-static int
-dn_find(const u_char *domain, const u_char *msg,
-	const u_char * const *dnptrs,
-	const u_char * const *lastdnptr)
-{
-	const u_char *dn, *cp, *sp;
-	const u_char * const *cpp;
-	u_int n;
-
-	for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-		sp = *cpp;
-		/*
-		 * terminate search on:
-		 * root label
-		 * compression pointer
-		 * unusable offset
-		 */
-		while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 &&
-		       (sp - msg) < 0x4000) {
-			dn = domain;
-			cp = sp;
-			while ((n = *cp++) != 0) {
-				/*
-				 * check for indirection
-				 */
-				switch (n & NS_CMPRSFLGS) {
-				case 0:		/* normal case, n == len */
-					n = labellen(cp - 1); /* XXX */
-
-					if (n != *dn++)
-						goto next;
-
-					for ((void)NULL; n > 0; n--)
-						if (mklower(*dn++) !=
-						    mklower(*cp++))
-							goto next;
-					/* Is next root for both ? */
-					if (*dn == '\0' && *cp == '\0')
-						return (sp - msg);
-					if (*dn)
-						continue;
-					goto next;
-				case NS_CMPRSFLGS:	/* indirection */
-					cp = msg + (((n & 0x3f) << 8) | *cp);
-					break;
-
-				default:	/* illegal type */
-					errno = EMSGSIZE;
-					return (-1);
-				}
-			}
- next: ;
-			sp += *sp + 1;
-		}
-	}
-	errno = ENOENT;
-	return (-1);
-}
-
-static int
-decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
-{
-	const unsigned char *cp = *cpp;
-	char *beg = dn, tc;
-	int b, blen, plen, i;
-
-	if ((blen = (*cp & 0xff)) == 0)
-		blen = 256;
-	plen = (blen + 3) / 4;
-	plen += sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1);
-	if (dn + plen >= eom)
-		return(-1);
-
-	cp++;
-	i = SPRINTF((dn, "\\[x"));
-	if (i < 0)
-		return (-1);
-	dn += i;
-	for (b = blen; b > 7; b -= 8, cp++) {
-		i = SPRINTF((dn, "%02x", *cp & 0xff));
-		if (i < 0)
-			return (-1);
-		dn += i;
-	}
-	if (b > 4) {
-		tc = *cp++;
-		i = SPRINTF((dn, "%02x", tc & (0xff << (8 - b))));
-		if (i < 0)
-			return (-1);
-		dn += i;
-	} else if (b > 0) {
-		tc = *cp++;
-		i = SPRINTF((dn, "%1x",
-			       ((tc >> 4) & 0x0f) & (0x0f << (4 - b)))); 
-		if (i < 0)
-			return (-1);
-		dn += i;
-	}
-	i = SPRINTF((dn, "/%d]", blen));
-	if (i < 0)
-		return (-1);
-	dn += i;
-
-	*cpp = cp;
-	return(dn - beg);
-}
-
-static int
-encode_bitsring(const char **bp, const char *end, unsigned char **labelp,
-	        unsigned char ** dst, unsigned const char *eom)
-{
-	int afterslash = 0;
-	const char *cp = *bp;
-	unsigned char *tp;
-	char c;
-	const char *beg_blen;
-	char *end_blen = NULL;
-	int value = 0, count = 0, tbcount = 0, blen = 0;
-
-	beg_blen = end_blen = NULL;
-
-	/* a bitstring must contain at least 2 characters */
-	if (end - cp < 2)
-		return(EINVAL);
-
-	/* XXX: currently, only hex strings are supported */
-	if (*cp++ != 'x')
-		return(EINVAL);
-	if (!isxdigit((*cp) & 0xff)) /* reject '\[x/BLEN]' */
-		return(EINVAL);
-
-	for (tp = *dst + 1; cp < end && tp < eom; cp++) {
-		switch((c = *cp)) {
-		case ']':	/* end of the bitstring */
-			if (afterslash) {
-				if (beg_blen == NULL)
-					return(EINVAL);
-				blen = (int)strtol(beg_blen, &end_blen, 10);
-				if (*end_blen != ']')
-					return(EINVAL);
-			}
-			if (count)
-				*tp++ = ((value << 4) & 0xff);
-			cp++;	/* skip ']' */
-			goto done;
-		case '/':
-			afterslash = 1;
-			break;
-		default:
-			if (afterslash) {
-				if (!isdigit(c&0xff))
-					return(EINVAL);
-				if (beg_blen == NULL) {
-					
-					if (c == '0') {
-						/* blen never begings with 0 */
-						return(EINVAL);
-					}
-					beg_blen = cp;
-				}
-			} else {
-				if (!isxdigit(c&0xff))
-					return(EINVAL);
-				value <<= 4;
-				value += digitvalue[(int)c];
-				count += 4;
-				tbcount += 4;
-				if (tbcount > 256)
-					return(EINVAL);
-				if (count == 8) {
-					*tp++ = value;
-					count = 0;
-				}
-			}
-			break;
-		}
-	}
-  done:
-	if (cp >= end || tp >= eom)
-		return(EMSGSIZE);
-
-	/*
-	 * bit length validation:
-	 * If a <length> is present, the number of digits in the <bit-data>
-	 * MUST be just sufficient to contain the number of bits specified
-	 * by the <length>. If there are insignificant bits in a final
-	 * hexadecimal or octal digit, they MUST be zero.
-	 * RFC 2673, Section 3.2.
-	 */
-	if (blen > 0) {
-		int traillen;
-
-		if (((blen + 3) & ~3) != tbcount)
-			return(EINVAL);
-		traillen = tbcount - blen; /* between 0 and 3 */
-		if (((value << (8 - traillen)) & 0xff) != 0)
-			return(EINVAL);
-	}
-	else
-		blen = tbcount;
-	if (blen == 256)
-		blen = 0;
-
-	/* encode the type and the significant bit fields */
-	**labelp = DNS_LABELTYPE_BITSTRING;
-	**dst = blen;
-
-	*bp = cp;
-	*dst = tp;
-
-	return(0);
-}
-
-static int
-labellen(const u_char *lp)
-{
-	int bitlen;
-	u_char l = *lp;
-
-	if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-		/* should be avoided by the caller */
-		return(-1);
-	}
-
-	if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) {
-		if (l == DNS_LABELTYPE_BITSTRING) {
-			if ((bitlen = *(lp + 1)) == 0)
-				bitlen = 256;
-			return((bitlen + 7 ) / 8 + 1);
-		}
-		return(-1);	/* unknwon ELT */
-	}
-	return(l);
-}
diff --git a/lib/libc/nameser/ns_netint.c b/lib/libc/nameser/ns_netint.c
deleted file mode 100644
index 90aede9..0000000
--- a/lib/libc/nameser/ns_netint.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_netint.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_netint.c,v 1.1.1.1.2.1 2006/07/17 10:09:56 ume Exp $");
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <arpa/nameser.h>
-
-#include "port_after.h"
-
-/* Public. */
-
-u_int
-ns_get16(const u_char *src) {
-	u_int dst;
-
-	NS_GET16(dst, src);
-	return (dst);
-}
-
-u_long
-ns_get32(const u_char *src) {
-	u_long dst;
-
-	NS_GET32(dst, src);
-	return (dst);
-}
-
-void
-ns_put16(u_int src, u_char *dst) {
-	NS_PUT16(src, dst);
-}
-
-void
-ns_put32(u_long src, u_char *dst) {
-	NS_PUT32(src, dst);
-}
diff --git a/lib/libc/nameser/ns_parse.c b/lib/libc/nameser/ns_parse.c
deleted file mode 100644
index 3056fcc..0000000
--- a/lib/libc/nameser/ns_parse.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_parse.c,v 1.1.1.1.2.1 2006/07/17 10:09:56 ume Exp $");
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-#include "port_after.h"
-
-/* Forward. */
-
-static void	setsection(ns_msg *msg, ns_sect sect);
-
-/* Macros. */
-
-#ifndef SOLARIS2
-#define RETERR(err) do { errno = (err); return (-1); } while (0)
-#else
-#define RETERR(err) \
-	do { errno = (err); if (errno == errno) return (-1); } while (0)
-#endif
-
-/* Public. */
-
-/* These need to be in the same order as the nres.h:ns_flag enum. */
-struct _ns_flagdata _ns_flagdata[16] = {
-	{ 0x8000, 15 },		/* qr. */
-	{ 0x7800, 11 },		/* opcode. */
-	{ 0x0400, 10 },		/* aa. */
-	{ 0x0200, 9 },		/* tc. */
-	{ 0x0100, 8 },		/* rd. */
-	{ 0x0080, 7 },		/* ra. */
-	{ 0x0040, 6 },		/* z. */
-	{ 0x0020, 5 },		/* ad. */
-	{ 0x0010, 4 },		/* cd. */
-	{ 0x000f, 0 },		/* rcode. */
-	{ 0x0000, 0 },		/* expansion (1/6). */
-	{ 0x0000, 0 },		/* expansion (2/6). */
-	{ 0x0000, 0 },		/* expansion (3/6). */
-	{ 0x0000, 0 },		/* expansion (4/6). */
-	{ 0x0000, 0 },		/* expansion (5/6). */
-	{ 0x0000, 0 },		/* expansion (6/6). */
-};
-
-int ns_msg_getflag(ns_msg handle, int flag) {
-	return(((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift);
-}
-
-int
-ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) {
-	const u_char *optr = ptr;
-
-	for ((void)NULL; count > 0; count--) {
-		int b, rdlength;
-
-		b = dn_skipname(ptr, eom);
-		if (b < 0)
-			RETERR(EMSGSIZE);
-		ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/;
-		if (section != ns_s_qd) {
-			if (ptr + NS_INT32SZ + NS_INT16SZ > eom)
-				RETERR(EMSGSIZE);
-			ptr += NS_INT32SZ/*TTL*/;
-			NS_GET16(rdlength, ptr);
-			ptr += rdlength/*RData*/;
-		}
-	}
-	if (ptr > eom)
-		RETERR(EMSGSIZE);
-	return (ptr - optr);
-}
-
-int
-ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
-	const u_char *eom = msg + msglen;
-	int i;
-
-	memset(handle, 0x5e, sizeof *handle);
-	handle->_msg = msg;
-	handle->_eom = eom;
-	if (msg + NS_INT16SZ > eom)
-		RETERR(EMSGSIZE);
-	NS_GET16(handle->_id, msg);
-	if (msg + NS_INT16SZ > eom)
-		RETERR(EMSGSIZE);
-	NS_GET16(handle->_flags, msg);
-	for (i = 0; i < ns_s_max; i++) {
-		if (msg + NS_INT16SZ > eom)
-			RETERR(EMSGSIZE);
-		NS_GET16(handle->_counts[i], msg);
-	}
-	for (i = 0; i < ns_s_max; i++)
-		if (handle->_counts[i] == 0)
-			handle->_sections[i] = NULL;
-		else {
-			int b = ns_skiprr(msg, eom, (ns_sect)i,
-					  handle->_counts[i]);
-
-			if (b < 0)
-				return (-1);
-			handle->_sections[i] = msg;
-			msg += b;
-		}
-	if (msg != eom)
-		RETERR(EMSGSIZE);
-	setsection(handle, ns_s_max);
-	return (0);
-}
-
-int
-ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
-	int b;
-	int tmp;
-
-	/* Make section right. */
-	tmp = section;
-	if (tmp < 0 || section >= ns_s_max)
-		RETERR(ENODEV);
-	if (section != handle->_sect)
-		setsection(handle, section);
-
-	/* Make rrnum right. */
-	if (rrnum == -1)
-		rrnum = handle->_rrnum;
-	if (rrnum < 0 || rrnum >= handle->_counts[(int)section])
-		RETERR(ENODEV);
-	if (rrnum < handle->_rrnum)
-		setsection(handle, section);
-	if (rrnum > handle->_rrnum) {
-		b = ns_skiprr(handle->_msg_ptr, handle->_eom, section,
-			      rrnum - handle->_rrnum);
-
-		if (b < 0)
-			return (-1);
-		handle->_msg_ptr += b;
-		handle->_rrnum = rrnum;
-	}
-
-	/* Do the parse. */
-	b = dn_expand(handle->_msg, handle->_eom,
-		      handle->_msg_ptr, rr->name, NS_MAXDNAME);
-	if (b < 0)
-		return (-1);
-	handle->_msg_ptr += b;
-	if (handle->_msg_ptr + NS_INT16SZ + NS_INT16SZ > handle->_eom)
-		RETERR(EMSGSIZE);
-	NS_GET16(rr->type, handle->_msg_ptr);
-	NS_GET16(rr->rr_class, handle->_msg_ptr);
-	if (section == ns_s_qd) {
-		rr->ttl = 0;
-		rr->rdlength = 0;
-		rr->rdata = NULL;
-	} else {
-		if (handle->_msg_ptr + NS_INT32SZ + NS_INT16SZ > handle->_eom)
-			RETERR(EMSGSIZE);
-		NS_GET32(rr->ttl, handle->_msg_ptr);
-		NS_GET16(rr->rdlength, handle->_msg_ptr);
-		if (handle->_msg_ptr + rr->rdlength > handle->_eom)
-			RETERR(EMSGSIZE);
-		rr->rdata = handle->_msg_ptr;
-		handle->_msg_ptr += rr->rdlength;
-	}
-	if (++handle->_rrnum > handle->_counts[(int)section])
-		setsection(handle, (ns_sect)((int)section + 1));
-
-	/* All done. */
-	return (0);
-}
-
-/* Private. */
-
-static void
-setsection(ns_msg *msg, ns_sect sect) {
-	msg->_sect = sect;
-	if (sect == ns_s_max) {
-		msg->_rrnum = -1;
-		msg->_msg_ptr = NULL;
-	} else {
-		msg->_rrnum = 0;
-		msg->_msg_ptr = msg->_sections[(int)sect];
-	}
-}
diff --git a/lib/libc/nameser/ns_print.c b/lib/libc/nameser/ns_print.c
deleted file mode 100644
index a57579c..0000000
--- a/lib/libc/nameser/ns_print.c
+++ /dev/null
@@ -1,909 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_print.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_print.c,v 1.2.2.1 2006/07/17 10:09:56 ume Exp $");
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#ifdef _LIBC
-#include <assert.h>
-#define INSIST(cond)	assert(cond)
-#else
-#include <isc/assertions.h>
-#include <isc/dst.h>
-#endif
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/* Forward. */
-
-static size_t	prune_origin(const char *name, const char *origin);
-static int	charstr(const u_char *rdata, const u_char *edata,
-			char **buf, size_t *buflen);
-static int	addname(const u_char *msg, size_t msglen,
-			const u_char **p, const char *origin,
-			char **buf, size_t *buflen);
-static void	addlen(size_t len, char **buf, size_t *buflen);
-static int	addstr(const char *src, size_t len,
-		       char **buf, size_t *buflen);
-static int	addtab(size_t len, size_t target, int spaced,
-		       char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define	T(x) \
-	do { \
-		if ((x) < 0) \
-			return (-1); \
-	} while (0)
-
-/* Public. */
-
-/*
- * int
- * ns_sprintrr(handle, rr, name_ctx, origin, buf, buflen)
- *	Convert an RR to presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrr(const ns_msg *handle, const ns_rr *rr,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	int n;
-
-	n = ns_sprintrrf(ns_msg_base(*handle), ns_msg_size(*handle),
-			 ns_rr_name(*rr), ns_rr_class(*rr), ns_rr_type(*rr),
-			 ns_rr_ttl(*rr), ns_rr_rdata(*rr), ns_rr_rdlen(*rr),
-			 name_ctx, origin, buf, buflen);
-	return (n);
-}
-
-/*
- * int
- * ns_sprintrrf(msg, msglen, name, class, type, ttl, rdata, rdlen,
- *	       name_ctx, origin, buf, buflen)
- *	Convert the fields of an RR into presentation format.
- * return:
- *	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrrf(const u_char *msg, size_t msglen,
-	    const char *name, ns_class class, ns_type type,
-	    u_long ttl, const u_char *rdata, size_t rdlen,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	const char *obuf = buf;
-	const u_char *edata = rdata + rdlen;
-	int spaced = 0;
-
-	const char *comment;
-	char tmp[100];
-	int len, x;
-
-	/*
-	 * Owner.
-	 */
-	if (name_ctx != NULL && ns_samename(name_ctx, name) == 1) {
-		T(addstr("\t\t\t", 3, &buf, &buflen));
-	} else {
-		len = prune_origin(name, origin);
-		if (*name == '\0') {
-			goto root;
-		} else if (len == 0) {
-			T(addstr("@\t\t\t", 4, &buf, &buflen));
-		} else {
-			T(addstr(name, len, &buf, &buflen));
-			/* Origin not used or not root, and no trailing dot? */
-			if (((origin == NULL || origin[0] == '\0') ||
-			    (origin[0] != '.' && origin[1] != '\0' &&
-			    name[len] == '\0')) && name[len - 1] != '.') {
- root:
-				T(addstr(".", 1, &buf, &buflen));
-				len++;
-			}
-			T(spaced = addtab(len, 24, spaced, &buf, &buflen));
-		}
-	}
-
-	/*
-	 * TTL, Class, Type.
-	 */
-	T(x = ns_format_ttl(ttl, buf, buflen));
-	addlen(x, &buf, &buflen);
-	len = SPRINTF((tmp, " %s %s", p_class(class), p_type(type)));
-	T(addstr(tmp, len, &buf, &buflen));
-	T(spaced = addtab(x + len, 16, spaced, &buf, &buflen));
-
-	/*
-	 * RData.
-	 */
-	switch (type) {
-	case ns_t_a:
-		if (rdlen != (size_t)NS_INADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_cname:
-	case ns_t_mb:
-	case ns_t_mg:
-	case ns_t_mr:
-	case ns_t_ns:
-	case ns_t_ptr:
-	case ns_t_dname:
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-
-	case ns_t_hinfo:
-	case ns_t_isdn:
-		/* First word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		    
-		/* Second word, optional in ISDN records. */
-		if (type == ns_t_isdn && rdata == edata)
-			break;
-		    
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_soa: {
-		u_long t;
-
-		/* Server name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Administrator name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" (\n", 3, &buf, &buflen));
-		spaced = 0;
-
-		if ((edata - rdata) != 5*NS_INT32SZ)
-			goto formerr;
-
-		/* Serial number. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		len = SPRINTF((tmp, "%lu", t));
-		T(addstr(tmp, len, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; serial\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Refresh interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; refresh\n", 10, &buf, &buflen));
-		spaced = 0;
-
-		/* Retry interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; retry\n", 8, &buf, &buflen));
-		spaced = 0;
-
-		/* Expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; expiry\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Minimum TTL. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(addstr(" )", 2, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; minimum\n", 10, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_mx:
-	case ns_t_afsdb:
-	case ns_t_rt: {
-		u_int t;
-
-		if (rdlen < (size_t)NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Target. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_px: {
-		u_int t;
-
-		if (rdlen < (size_t)NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_x25:
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_txt:
-		while (rdata < edata) {
-			T(len = charstr(rdata, edata, &buf, &buflen));
-			if (len == 0)
-				goto formerr;
-			rdata += len;
-			if (rdata < edata)
-				T(addstr(" ", 1, &buf, &buflen));
-		}
-		break;
-
-	case ns_t_nsap: {
-		char t[2+255*3];
-
-		(void) inet_nsap_ntoa(rdlen, rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_aaaa:
-		if (rdlen != (size_t)NS_IN6ADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET6, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_loc: {
-		char t[255];
-
-		/* XXX protocol format checking? */
-		(void) loc_ntoa(rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_naptr: {
-		u_int order, preference;
-		char t[50];
-
-		if (rdlen < 2U*NS_INT16SZ)
-			goto formerr;
-
-		/* Order, Precedence. */
-		order = ns_get16(rdata);	rdata += NS_INT16SZ;
-		preference = ns_get16(rdata);	rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u ", order, preference));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Flags. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Service. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Regexp. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len < 0)
-			return (-1);
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_srv: {
-		u_int priority, weight, port;
-		char t[50];
-
-		if (rdlen < 3U*NS_INT16SZ)
-			goto formerr;
-
-		/* Priority, Weight, Port. */
-		priority = ns_get16(rdata);  rdata += NS_INT16SZ;
-		weight   = ns_get16(rdata);  rdata += NS_INT16SZ;
-		port     = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u %u ", priority, weight, port));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_minfo:
-	case ns_t_rp:
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-
-	case ns_t_wks: {
-		int n, lcnt;
-
-		if (rdlen < 1U + NS_INT32SZ)
-			goto formerr;
-
-		/* Address. */
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		rdata += NS_INADDRSZ;
-
-		/* Protocol. */
-		len = SPRINTF((tmp, " %u ( ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata += NS_INT8SZ;
-
-		/* Bit map. */
-		n = 0;
-		lcnt = 0;
-		while (rdata < edata) {
-			u_int c = *rdata++;
-			do {
-				if (c & 0200) {
-					if (lcnt == 0) {
-						T(addstr("\n\t\t\t\t", 5,
-							 &buf, &buflen));
-						lcnt = 10;
-						spaced = 0;
-					}
-					len = SPRINTF((tmp, "%d ", n));
-					T(addstr(tmp, len, &buf, &buflen));
-					lcnt--;
-				}
-				c <<= 1;
-			} while (++n & 07);
-		}
-		T(addstr(")", 1, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_key: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int keyflags, protocol, algorithm, key_id;
-		const char *leader;
-		int n;
-
-		if (rdlen < 0U + NS_INT16SZ + NS_INT8SZ + NS_INT8SZ)
-			goto formerr;
-
-		/* Key flags, Protocol, Algorithm. */
-#ifndef _LIBC
-		key_id = dst_s_dns_key_id(rdata, edata-rdata);
-#else
-		key_id = 0;
-#endif
-		keyflags = ns_get16(rdata);  rdata += NS_INT16SZ;
-		protocol = *rdata++;
-		algorithm = *rdata++;
-		len = SPRINTF((tmp, "0x%04x %u %u",
-			       keyflags, protocol, algorithm));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Public key data. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len < 0)
-			goto formerr;
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-		n = SPRINTF((tmp, " ; key_tag= %u", key_id));
-		T(addstr(tmp, n, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_sig: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int type, algorithm, labels, footprint;
-		const char *leader;
-		u_long t;
-		int n;
-
-		if (rdlen < 22U)
-			goto formerr;
-
-		/* Type covered, Algorithm, Label count, Original TTL. */
-	        type = ns_get16(rdata);  rdata += NS_INT16SZ;
-		algorithm = *rdata++;
-		labels = *rdata++;
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s %d %d %lu ",
-			       p_type(type), algorithm, labels, t));
-		T(addstr(tmp, len, &buf, &buflen));
-		if (labels > (u_int)dn_count_labels(name))
-			goto formerr;
-
-		/* Signature expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Time signed. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signature Footprint. */
-		footprint = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", footprint));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signer's name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Signature. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		if (len < 0)
-			goto formerr;
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_nxt: {
-		int n, c;
-
-		/* Next domain name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Type bit map. */
-		n = edata - rdata;
-		for (c = 0; c < n*8; c++)
-			if (NS_NXT_BIT_ISSET(c, rdata)) {
-				len = SPRINTF((tmp, " %s", p_type(c)));
-				T(addstr(tmp, len, &buf, &buflen));
-			}
-		break;
-	    }
-
-	case ns_t_cert: {
-		u_int c_type, key_tag, alg;
-		int n;
-		unsigned int siz;
-		char base64_cert[8192], tmp[40];
-		const char *leader;
-
-		c_type  = ns_get16(rdata); rdata += NS_INT16SZ;
-		key_tag = ns_get16(rdata); rdata += NS_INT16SZ;
-		alg = (u_int) *rdata++;
-
-		len = SPRINTF((tmp, "%d %d %d ", c_type, key_tag, alg));
-		T(addstr(tmp, len, &buf, &buflen));
-		siz = (edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */
-		if (siz > sizeof(base64_cert) * 3/4) {
-			const char *str = "record too long to print";
-			T(addstr(str, strlen(str), &buf, &buflen));
-		}
-		else {
-			len = b64_ntop(rdata, edata-rdata, base64_cert, siz);
-
-			if (len < 0)
-				goto formerr;
-			else if (len > 15) {
-				T(addstr(" (", 2, &buf, &buflen));
-				leader = "\n\t\t";
-				spaced = 0;
-			}
-			else
-				leader = " ";
-	
-			for (n = 0; n < len; n += 48) {
-				T(addstr(leader, strlen(leader),
-					 &buf, &buflen));
-				T(addstr(base64_cert + n, MIN(len - n, 48),
-					 &buf, &buflen));
-			}
-			if (len > 15)
-				T(addstr(" )", 2, &buf, &buflen));
-		}
-		break;
-	    }
-
-	case ns_t_tkey: {
-		/* KJD - need to complete this */
-		u_long t;
-		int mode, err, keysize;
-
-		/* Algorithm name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Inception. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Experation. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Mode , Error, Key Size. */
-		/* Priority, Weight, Port. */
-		mode = ns_get16(rdata);  rdata += NS_INT16SZ;
-		err  = ns_get16(rdata);  rdata += NS_INT16SZ;
-		keysize  = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u %u %u ", mode, err, keysize));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* XXX need to dump key, print otherdata length & other data */
-		break;
-	    }
-
-	case ns_t_tsig: {
-		/* BEW - need to complete this */
-		int n;
-
-		T(len = addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-		rdata += 8; /* time */
-		n = ns_get16(rdata); rdata += INT16SZ;
-		rdata += n; /* sig */
-		n = ns_get16(rdata); rdata += INT16SZ; /* original id */
-		sprintf(buf, "%d", ns_get16(rdata));
-		rdata += INT16SZ;
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-	    }
-
-	case ns_t_a6: {
-		struct in6_addr a;
-		int pbyte, pbit;
-
-		/* prefix length */
-		if (rdlen == 0U) goto formerr;
-		len = SPRINTF((tmp, "%d ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		pbit = *rdata;
-		if (pbit > 128) goto formerr;
-		pbyte = (pbit & ~7) / 8;
-		rdata++;
-
-		/* address suffix: provided only when prefix len != 128 */
-		if (pbit < 128) {
-			if (rdata + pbyte >= edata) goto formerr;
-			memset(&a, 0, sizeof(a));
-			memcpy(&a.s6_addr[pbyte], rdata, sizeof(a) - pbyte);
-			(void) inet_ntop(AF_INET6, &a, buf, buflen);
-			addlen(strlen(buf), &buf, &buflen);
-			rdata += sizeof(a) - pbyte;
-		}
-
-		/* prefix name: provided only when prefix len > 0 */
-		if (pbit == 0)
-			break;
-		if (rdata >= edata) goto formerr;
-		T(addstr(" ", 1, &buf, &buflen));
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		
-		break;
-	    }
-
-	case ns_t_opt: {
-		len = SPRINTF((tmp, "%u bytes", class));
-		T(addstr(tmp, len, &buf, &buflen));
-		break;
-	    }
-
-	default:
-		comment = "unknown RR type";
-		goto hexify;
-	}
-	return (buf - obuf);
- formerr:
-	comment = "RR format error";
- hexify: {
-	int n, m;
-	char *p;
-
-	len = SPRINTF((tmp, "\\# %u%s\t; %s", (unsigned)(edata - rdata),
-		       rdlen != 0U ? " (" : "", comment));
-	T(addstr(tmp, len, &buf, &buflen));
-	while (rdata < edata) {
-		p = tmp;
-		p += SPRINTF((p, "\n\t"));
-		spaced = 0;
-		n = MIN(16, edata - rdata);
-		for (m = 0; m < n; m++)
-			p += SPRINTF((p, "%02x ", rdata[m]));
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		if (n < 16) {
-			T(addstr(")", 1, &buf, &buflen));
-			T(addtab(p - tmp + 1, 48, spaced, &buf, &buflen));
-		}
-		p = tmp;
-		p += SPRINTF((p, "; "));
-		for (m = 0; m < n; m++)
-			*p++ = (isascii(rdata[m]) && isprint(rdata[m]))
-				? rdata[m]
-				: '.';
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		rdata += n;
-	}
-	return (buf - obuf);
-    }
-}
-
-/* Private. */
-
-/*
- * size_t
- * prune_origin(name, origin)
- *	Find out if the name is at or under the current origin.
- * return:
- *	Number of characters in name before start of origin,
- *	or length of name if origin does not match.
- * notes:
- *	This function should share code with samedomain().
- */
-static size_t
-prune_origin(const char *name, const char *origin) {
-	const char *oname = name;
-
-	while (*name != '\0') {
-		if (origin != NULL && ns_samename(name, origin) == 1)
-			return (name - oname - (name > oname));
-		while (*name != '\0') {
-			if (*name == '\\') {
-				name++;
-				/* XXX need to handle \nnn form. */
-				if (*name == '\0')
-					break;
-			} else if (*name == '.') {
-				name++;
-				break;
-			}
-			name++;
-		}
-	}
-	return (name - oname);
-}
-
-/*
- * int
- * charstr(rdata, edata, buf, buflen)
- *	Format a <character-string> into the presentation buffer.
- * return:
- *	Number of rdata octets consumed
- *	0 for protocol format error
- *	-1 for output buffer error
- * side effects:
- *	buffer is advanced on success.
- */
-static int
-charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) {
-	const u_char *odata = rdata;
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	if (rdata < edata) {
-		int n = *rdata;
-
-		if (rdata + 1 + n <= edata) {
-			rdata++;
-			while (n-- > 0) {
-				if (strchr("\n\"\\", *rdata) != NULL)
-					if (addstr("\\", 1, buf, buflen) < 0)
-						goto enospc;
-				if (addstr((const char *)rdata, 1,
-					   buf, buflen) < 0)
-					goto enospc;
-				rdata++;
-			}
-		}
-	}
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	return (rdata - odata);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static int
-addname(const u_char *msg, size_t msglen,
-	const u_char **pp, const char *origin,
-	char **buf, size_t *buflen)
-{
-	size_t newlen, save_buflen = *buflen;
-	char *save_buf = *buf;
-	int n;
-
-	n = dn_expand(msg, msg + msglen, *pp, *buf, *buflen);
-	if (n < 0)
-		goto enospc;	/* Guess. */
-	newlen = prune_origin(*buf, origin);
-	if (**buf == '\0') {
-		goto root;
-	} else if (newlen == 0U) {
-		/* Use "@" instead of name. */
-		if (newlen + 2 > *buflen)
-			goto enospc;        /* No room for "@\0". */
-		(*buf)[newlen++] = '@';
-		(*buf)[newlen] = '\0';
-	} else {
-		if (((origin == NULL || origin[0] == '\0') ||
-		    (origin[0] != '.' && origin[1] != '\0' &&
-		    (*buf)[newlen] == '\0')) && (*buf)[newlen - 1] != '.') {
-			/* No trailing dot. */
- root:
-			if (newlen + 2 > *buflen)
-				goto enospc;	/* No room for ".\0". */
-			(*buf)[newlen++] = '.';
-			(*buf)[newlen] = '\0';
-		}
-	}
-	*pp += n;
-	addlen(newlen, buf, buflen);
-	**buf = '\0';
-	return (newlen);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static void
-addlen(size_t len, char **buf, size_t *buflen) {
-	INSIST(len <= *buflen);
-	*buf += len;
-	*buflen -= len;
-}
-
-static int
-addstr(const char *src, size_t len, char **buf, size_t *buflen) {
-	if (len >= *buflen) {
-		errno = ENOSPC;
-		return (-1);
-	}
-	memcpy(*buf, src, len);
-	addlen(len, buf, buflen);
-	**buf = '\0';
-	return (0);
-}
-
-static int
-addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) {
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-	int t;
-
-	if (spaced || len >= target - 1) {
-		T(addstr("  ", 2, buf, buflen));
-		spaced = 1;
-	} else {
-		for (t = (target - len - 1) / 8; t >= 0; t--)
-			if (addstr("\t", 1, buf, buflen) < 0) {
-				*buflen = save_buflen;
-				*buf = save_buf;
-				return (-1);
-			}
-		spaced = 0;
-	}
-	return (spaced);
-}
diff --git a/lib/libc/nameser/ns_samedomain.c b/lib/libc/nameser/ns_samedomain.c
deleted file mode 100644
index 438047c..0000000
--- a/lib/libc/nameser/ns_samedomain.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_samedomain.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_samedomain.c,v 1.3.2.1 2006/07/17 10:09:56 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <string.h>
-
-#include "port_after.h"
-
-#ifndef _LIBC
-/*
- * int
- * ns_samedomain(a, b)
- *	Check whether a name belongs to a domain.
- * Inputs:
- *	a - the domain whose ancestory is being verified
- *	b - the potential ancestor we're checking against
- * Return:
- *	boolean - is a at or below b?
- * Notes:
- *	Trailing dots are first removed from name and domain.
- *	Always compare complete subdomains, not only whether the
- *	domain name is the trailing string of the given name.
- *
- *	"host.foobar.top" lies in "foobar.top" and in "top" and in ""
- *	but NOT in "bar.top"
- */
-
-int
-ns_samedomain(const char *a, const char *b) {
-	size_t la, lb;
-	int diff, i, escaped;
-	const char *cp;
-
-	la = strlen(a);
-	lb = strlen(b);
-
-	/* Ignore a trailing label separator (i.e. an unescaped dot) in 'a'. */
-	if (la != 0U && a[la - 1] == '.') {
-		escaped = 0;
-		/* Note this loop doesn't get executed if la==1. */
-		for (i = la - 2; i >= 0; i--)
-			if (a[i] == '\\') {
-				if (escaped)
-					escaped = 0;
-				else
-					escaped = 1;
-			} else
-				break;
-		if (!escaped)
-			la--;
-	}
-
-	/* Ignore a trailing label separator (i.e. an unescaped dot) in 'b'. */
-	if (lb != 0U && b[lb - 1] == '.') {
-		escaped = 0;
-		/* note this loop doesn't get executed if lb==1 */
-		for (i = lb - 2; i >= 0; i--)
-			if (b[i] == '\\') {
-				if (escaped)
-					escaped = 0;
-				else
-					escaped = 1;
-			} else
-				break;
-		if (!escaped)
-			lb--;
-	}
-
-	/* lb == 0 means 'b' is the root domain, so 'a' must be in 'b'. */
-	if (lb == 0U)
-		return (1);
-
-	/* 'b' longer than 'a' means 'a' can't be in 'b'. */
-	if (lb > la)
-		return (0);
-
-	/* 'a' and 'b' being equal at this point indicates sameness. */
-	if (lb == la)
-		return (strncasecmp(a, b, lb) == 0);
-
-	/* Ok, we know la > lb. */
-
-	diff = la - lb;
-
-	/*
-	 * If 'a' is only 1 character longer than 'b', then it can't be
-	 * a subdomain of 'b' (because of the need for the '.' label
-	 * separator).
-	 */
-	if (diff < 2)
-		return (0);
-
-	/*
-	 * If the character before the last 'lb' characters of 'b'
-	 * isn't '.', then it can't be a match (this lets us avoid
-	 * having "foobar.com" match "bar.com").
-	 */
-	if (a[diff - 1] != '.')
-		return (0);
-
-	/*
-	 * We're not sure about that '.', however.  It could be escaped
-         * and thus not a really a label separator.
-	 */
-	escaped = 0;
-	for (i = diff - 2; i >= 0; i--)
-		if (a[i] == '\\') {
-			if (escaped)
-				escaped = 0;
-			else
-				escaped = 1;
-		} else
-			break;
-	if (escaped)
-		return (0);
-	  
-	/* Now compare aligned trailing substring. */
-	cp = a + diff;
-	return (strncasecmp(cp, b, lb) == 0);
-}
-
-/*
- * int
- * ns_subdomain(a, b)
- *	is "a" a subdomain of "b"?
- */
-int
-ns_subdomain(const char *a, const char *b) {
-	return (ns_samename(a, b) != 1 && ns_samedomain(a, b));
-}
-#endif
-
-/*
- * int
- * ns_makecanon(src, dst, dstsize)
- *	make a canonical copy of domain name "src"
- * notes:
- *	foo -> foo.
- *	foo. -> foo.
- *	foo.. -> foo.
- *	foo\. -> foo\..
- *	foo\\. -> foo\\.
- */
-
-int
-ns_makecanon(const char *src, char *dst, size_t dstsize) {
-	size_t n = strlen(src);
-
-	if (n + sizeof "." > dstsize) {			/* Note: sizeof == 2 */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	strcpy(dst, src);
-	while (n >= 1U && dst[n - 1] == '.')		/* Ends in "." */
-		if (n >= 2U && dst[n - 2] == '\\' &&	/* Ends in "\." */
-		    (n < 3U || dst[n - 3] != '\\'))	/* But not "\\." */
-			break;
-		else
-			dst[--n] = '\0';
-	dst[n++] = '.';
-	dst[n] = '\0';
-	return (0);
-}
-
-/*
- * int
- * ns_samename(a, b)
- *	determine whether domain name "a" is the same as domain name "b"
- * return:
- *	-1 on error
- *	0 if names differ
- *	1 if names are the same
- */
-
-int
-ns_samename(const char *a, const char *b) {
-	char ta[NS_MAXDNAME], tb[NS_MAXDNAME];
-
-	if (ns_makecanon(a, ta, sizeof ta) < 0 ||
-	    ns_makecanon(b, tb, sizeof tb) < 0)
-		return (-1);
-	if (strcasecmp(ta, tb) == 0)
-		return (1);
-	else
-		return (0);
-}
diff --git a/lib/libc/nameser/ns_ttl.c b/lib/libc/nameser/ns_ttl.c
deleted file mode 100644
index 7482a61..0000000
--- a/lib/libc/nameser/ns_ttl.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_ttl.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/nameser/ns_ttl.c,v 1.1.1.1.2.1 2006/07/17 10:09:56 ume Exp $");
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/* Forward. */
-
-static int	fmt1(int t, char s, char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define T(x) if ((x) < 0) return (-1); else (void)NULL
-
-/* Public. */
-
-int
-ns_format_ttl(u_long src, char *dst, size_t dstlen) {
-	char *odst = dst;
-	int secs, mins, hours, days, weeks, x;
-	char *p;
-
-	secs = src % 60;   src /= 60;
-	mins = src % 60;   src /= 60;
-	hours = src % 24;  src /= 24;
-	days = src % 7;    src /= 7;
-	weeks = src;       src = 0;
-
-	x = 0;
-	if (weeks) {
-		T(fmt1(weeks, 'W', &dst, &dstlen));
-		x++;
-	}
-	if (days) {
-		T(fmt1(days, 'D', &dst, &dstlen));
-		x++;
-	}
-	if (hours) {
-		T(fmt1(hours, 'H', &dst, &dstlen));
-		x++;
-	}
-	if (mins) {
-		T(fmt1(mins, 'M', &dst, &dstlen));
-		x++;
-	}
-	if (secs || !(weeks || days || hours || mins)) {
-		T(fmt1(secs, 'S', &dst, &dstlen));
-		x++;
-	}
-
-	if (x > 1) {
-		int ch;
-
-		for (p = odst; (ch = *p) != '\0'; p++)
-			if (isascii(ch) && isupper(ch))
-				*p = tolower(ch);
-	}
-
-	return (dst - odst);
-}
-
-int
-ns_parse_ttl(const char *src, u_long *dst) {
-	u_long ttl, tmp;
-	int ch, digits, dirty;
-
-	ttl = 0;
-	tmp = 0;
-	digits = 0;
-	dirty = 0;
-	while ((ch = *src++) != '\0') {
-		if (!isascii(ch) || !isprint(ch))
-			goto einval;
-		if (isdigit(ch)) {
-			tmp *= 10;
-			tmp += (ch - '0');
-			digits++;
-			continue;
-		}
-		if (digits == 0)
-			goto einval;
-		if (islower(ch))
-			ch = toupper(ch);
-		switch (ch) {
-		case 'W':  tmp *= 7;
-		case 'D':  tmp *= 24;
-		case 'H':  tmp *= 60;
-		case 'M':  tmp *= 60;
-		case 'S':  break;
-		default:   goto einval;
-		}
-		ttl += tmp;
-		tmp = 0;
-		digits = 0;
-		dirty = 1;
-	}
-	if (digits > 0) {
-		if (dirty)
-			goto einval;
-		else
-			ttl += tmp;
-	} else if (!dirty)
-		goto einval;
-	*dst = ttl;
-	return (0);
-
- einval:
-	errno = EINVAL;
-	return (-1);
-}
-
-/* Private. */
-
-static int
-fmt1(int t, char s, char **buf, size_t *buflen) {
-	char tmp[50];
-	size_t len;
-
-	len = SPRINTF((tmp, "%d%c", t, s));
-	if (len + 1 > *buflen)
-		return (-1);
-	strcpy(*buf, tmp);
-	*buf += len;
-	*buflen -= len;
-	return (0);
-}
diff --git a/lib/libc/net/Makefile b/lib/libc/net/Makefile
deleted file mode 100644
index 4387190..0000000
--- a/lib/libc/net/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/ -I../resolv
-
-#Objects
-OBJS = addr2ascii.o ascii2addr.o base64.o ether_addr.o eui64.o gai_strerror.o getaddrinfo.o gethostbydns.o gethostbyht.o gethostbynis.o gethostnamadr.o getifaddrs.o getifmaddrs.o getnameinfo.o getnetbydns.o getnetbyht.o getnetbynis.o getnetnamadr.o getproto.o getprotoent.o getprotoname.o getservbyname.o getservbyport.o getservent.o hesiod.o if_indextoname.o if_nameindex.o if_nametoindex.o ip6opt.o linkaddr.o map_v4v6.o name6.o nsdispatch.o nslexer.o nsparser.o nss_compat.o rcmd.o rcmdsh.o recv.o res_mkupdate.o res_update.o rthdr.o send.o sockatmark.o vars.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/net/addr2ascii.c b/lib/libc/net/addr2ascii.c
deleted file mode 100644
index 20c53ef..0000000
--- a/lib/libc/net/addr2ascii.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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.
- *
- *	$ANA: addr2ascii.c,v 1.1 1996/06/13 18:41:46 wollman Exp $
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-/*-
- * Convert a network address from binary to printable numeric format.
- * This API is copied from INRIA's IPv6 implementation, but it is a
- * bit bogus in two ways:
- *
- *	1) There is no value in passing both an address family and
- *	   an address length; either one should imply the other,
- *	   or we should be passing sockaddrs instead.
- *	2) There should by contrast be /added/ a length for the buffer
- *	   that we pass in, so that programmers are spared the need to
- *	   manually calculate (read: ``guess'') the maximum length.
- *
- * Flash: the API is also the same in the NRL implementation, and seems to
- * be some sort of standard, so we appear to be stuck with both the bad
- * naming and the poor choice of arguments.
- */
-char *
-addr2ascii(af, addrp, len, buf)
-	int af;
-	const void *addrp;
-	int len;		/* should be size_t XXX */
-	char *buf;		/* XXX should pass length of buffer */
-{
-	static char staticbuf[64]; /* 64 for AF_LINK > 16 for AF_INET */
-
-	if (!buf)
-		buf = staticbuf;
-
-	switch(af) {
-	case AF_INET:
-		if (len != sizeof(struct in_addr)) {
-			errno = ENAMETOOLONG;
-			return 0;
-		}
-		strcpy(buf, inet_ntoa(*(const struct in_addr *)addrp));
-		break;
-
-	case AF_LINK:
-		if (len != sizeof(struct sockaddr_dl)) {
-			errno = ENAMETOOLONG;
-			return 0;
-		}
-		strcpy(buf, link_ntoa((const struct sockaddr_dl *)addrp));
-		break;
-			
-	default:
-		errno = EPROTONOSUPPORT;
-		return 0;
-	}
-	return buf;
-}
diff --git a/lib/libc/net/ascii2addr.c b/lib/libc/net/ascii2addr.c
deleted file mode 100644
index 6110283..0000000
--- a/lib/libc/net/ascii2addr.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 1996 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- * 
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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.
- *
- *	$ANA: ascii2addr.c,v 1.2 1996/06/13 18:46:02 wollman Exp $
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <errno.h>
-#include <string.h>
-
-#include <net/if_dl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int
-ascii2addr(af, ascii, result)
-	int af;
-	const char *ascii;
-	void *result;
-{
-	struct in_addr *ina;
-	char strbuf[4*sizeof("123")]; /* long enough for V4 only */
-
-	switch(af) {
-	case AF_INET:
-		ina = result;
-		strbuf[0] = '\0';
-		strncat(strbuf, ascii, (sizeof strbuf)-1);
-		if (inet_aton(strbuf, ina))
-			return sizeof(struct in_addr);
-		errno = EINVAL;
-		break;
-
-	case AF_LINK:
-		link_addr(ascii, result);
-		/* oops... no way to detect failure */
-		return sizeof(struct sockaddr_dl);
-
-	default:
-		errno = EPROTONOSUPPORT;
-		break;
-	}
-
-	return -1;
-}
diff --git a/lib/libc/net/base64.c b/lib/libc/net/base64.c
deleted file mode 100644
index 2de4726..0000000
--- a/lib/libc/net/base64.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define Assert(Cond) if (!(Cond)) abort()
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-         -------------------------------------------------                       
-   following cases can arise:
-   
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-int
-b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) {
-	size_t datalength = 0;
-	u_char input[3];
-	u_char output[4];
-	size_t i;
-
-	while (2 < srclength) {
-		input[0] = *src++;
-		input[1] = *src++;
-		input[2] = *src++;
-		srclength -= 3;
-
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		output[3] = input[2] & 0x3f;
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-		Assert(output[3] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		target[datalength++] = Base64[output[2]];
-		target[datalength++] = Base64[output[3]];
-	}
-    
-	/* Now we worry about padding. */
-	if (0 != srclength) {
-		/* Get what's left. */
-		input[0] = input[1] = input[2] = '\0';
-		for (i = 0; i < srclength; i++)
-			input[i] = *src++;
-	
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		if (srclength == 1)
-			target[datalength++] = Pad64;
-		else
-			target[datalength++] = Base64[output[2]];
-		target[datalength++] = Pad64;
-	}
-	if (datalength >= targsize)
-		return (-1);
-	target[datalength] = '\0';	/* Returned value doesn't count \0. */
-	return (datalength);
-}
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-int
-b64_pton(src, target, targsize)
-	char const *src;
-	u_char *target;
-	size_t targsize;
-{
-	int tarindex, state, ch;
-	char *pos;
-
-	state = 0;
-	tarindex = 0;
-
-	while ((ch = *src++) != '\0') {
-		if (isspace((unsigned char)ch))        /* Skip whitespace anywhere. */
-			continue;
-
-		if (ch == Pad64)
-			break;
-
-		pos = strchr(Base64, ch);
-		if (pos == 0) 		/* A non-base64 character. */
-			return (-1);
-
-		switch (state) {
-		case 0:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] = (pos - Base64) << 2;
-			}
-			state = 1;
-			break;
-		case 1:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 4;
-				target[tarindex+1]  = ((pos - Base64) & 0x0f)
-							<< 4 ;
-			}
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if (target) {
-				if ((size_t)tarindex + 1 >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 2;
-				target[tarindex+1]  = ((pos - Base64) & 0x03)
-							<< 6;
-			}
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] |= (pos - Base64);
-			}
-			tarindex++;
-			state = 0;
-			break;
-		default:
-			abort();
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace((unsigned char)ch))
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace((unsigned char)ch))
-					return (-1);
-
-			/*
-			 * Now make sure for cases 2 and 3 that the "extra"
-			 * bits that slopped past the last full byte were
-			 * zeros.  If we don't check them, they become a
-			 * subliminal channel.
-			 */
-			if (target && target[tarindex] != 0)
-				return (-1);
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return (-1);
-	}
-
-	return (tarindex);
-}
diff --git a/lib/libc/net/ether_addr.c b/lib/libc/net/ether_addr.c
deleted file mode 100644
index 76e21b0..0000000
--- a/lib/libc/net/ether_addr.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 1995
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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.
- *
- * ethernet address conversion and lookup routines
- *
- * Written by Bill Paul <wpaul@ctr.columbia.edu>
- * Center for Telecommunications Research
- * Columbia University, New York City
- */
-
-#include <sys/cdefs.h>
-
-#include <stdio.h>
-#include <paths.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/ethernet.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifndef _PATH_ETHERS
-#define _PATH_ETHERS "/etc/ethers"
-#endif
-
-/*
- * Parse a string of text containing an ethernet address and hostname
- * and separate it into its component parts.
- */
-int
-ether_line(l, e, hostname)
-	const char *l;
-	struct ether_addr *e;
-	char *hostname;
-{
-        int i, o[6];
-
-        i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2],
-                                              &o[3], &o[4], &o[5],
-					      hostname);
-	if (i != 7)
-                return (i);
-
-        for (i=0; i<6; i++)
-                e->octet[i] = o[i];
-        return (0);
-}
-
-/*
- * Convert an ASCII representation of an ethernet address to
- * binary form.
- */
-struct
-ether_addr *ether_aton(a)
-	const char *a;
-{
-        int i;
-	static struct ether_addr o;
-	unsigned int o0, o1, o2, o3, o4, o5;
-
-        i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
-
-        if (i != 6)
-                return (NULL);
-
-        o.octet[0]=o0;
-	o.octet[1]=o1;
-	o.octet[2]=o2;
-	o.octet[3]=o3;
-	o.octet[4]=o4;
-	o.octet[5]=o5;
-
-        return ((struct ether_addr *)&o);
-}
-
-/*
- * Convert a binary representation of an ethernet address to
- * an ASCII string.
- */
-char
-*ether_ntoa(n)
-	const struct ether_addr *n;
-{
-        int i;
-	static char a[18];
-
-        i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x",
-	    n->octet[0], n->octet[1], n->octet[2],
-	    n->octet[3], n->octet[4], n->octet[5]);
-        if (i < 17)
-                return (NULL);
-        return ((char *)&a);
-}
-
-/*
- * Map an ethernet address to a hostname. Use either /etc/ethers or
- * NIS/YP.
- */
-int
-ether_ntohost(hostname, e)
-	char *hostname;
-	const struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *ether_a;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			ether_a = ether_ntoa(e);
-			if (yp_match(yp_domain, "ethers.byaddr", ether_a,
-				strlen(ether_a), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!bcmp((char *)&local_ether.octet[0],
-				(char *)&e->octet[0], 6)) {
-			/* We have a match */
-				strcpy(hostname, local_host);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
-
-/*
- * Map a hostname to an ethernet address using /etc/ethers or
- * NIS/YP.
- */
-int
-ether_hostton(hostname, e)
-	const char *hostname;
-	struct ether_addr *e;
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_ETHERS, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			if (yp_match(yp_domain, "ethers.byname", hostname,
-				strlen(hostname), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!strcmp(hostname, local_host)) {
-				/* We have a match */
-				bcopy((char *)&local_ether.octet[0],
-					(char *)&e->octet[0], 6);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
diff --git a/lib/libc/net/eui64.c b/lib/libc/net/eui64.c
deleted file mode 100644
index 3c1e344..0000000
--- a/lib/libc/net/eui64.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright 2004 The Aerospace Corporation.  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 Aerospace Corporation may not be used to endorse or
- *     promote products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "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 AEROSPACE CORPORATION 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.
- *
- * Copyright (c) 1995
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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.
- *
- * EUI-64 conversion and lookup routines
- *
- *
- * Converted from ether_addr.c rev
- * FreeBSD: src/lib/libc/net/eui64.c,v 1.15 2002/04/08 07:51:10 ru Exp
- * by Brooks Davis
- *
- * Written by Bill Paul <wpaul@ctr.columbia.edu>
- * Center for Telecommunications Research
- * Columbia University, New York City
- */
-
-#include <sys/cdefs.h>
-
-#include <stdio.h>
-#include <paths.h>
-#include <sys/types.h>
-#include <sys/eui64.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifndef _PATH_EUI64
-#define _PATH_EUI64 "/etc/eui64"
-#endif
-
-static int eui64_line(const char *l, struct eui64 *e, char *hostname,
-    size_t len);
-
-/*
- * Parse a string of text containing an EUI-64 and hostname
- * and separate it into its component parts.
- */
-static int
-eui64_line(const char *l, struct eui64 *e, char *hostname, size_t len)
-{
-	char *line, *linehead, *cur;
-
-	linehead = strdup(l);
-	if (linehead == NULL)
-		return (-1);
-	line = linehead;
-
-	/* Find and parse the EUI64 */
-	while ((cur = strsep(&line, " \t\r\n")) != NULL) {
-		if (*cur != '\0') {
-			if (eui64_aton(cur, e) == 0)
-				break;
-			else
-				goto bad;
-		}
-	}
-
-	/* Find the hostname */
-	while ((cur = strsep(&line, " \t\r\n")) != NULL) {
-		if (*cur != '\0') {
-			if (strlcpy(hostname, cur, len) <= len)
-				break;
-			else
-				goto bad;
-		}
-	}
-
-	/* Make sure what remains is either whitespace or a comment */
-	while ((cur = strsep(&line, " \t\r\n")) != NULL) {
-		if (*cur == '#')
-			break;
-		if (*cur != '\0')
-			goto bad;
-	}
-
-	return (0);
-
-bad:
-	free(linehead);
-	return (-1);
-}
-
-/*
- * Convert an ASCII representation of an EUI-64 to binary form.
- */
-int
-eui64_aton(const char *a, struct eui64 *e)
-{
-	int i;
-	unsigned int o0, o1, o2, o3, o4, o5, o6, o7;
-
-	/* canonical form */
-	i = sscanf(a, "%x-%x-%x-%x-%x-%x-%x-%x",
-	    &o0, &o1, &o2, &o3, &o4, &o5, &o6, &o7);
-	if (i == EUI64_LEN)
-		goto good;
-	/* ethernet form */
-	i = sscanf(a, "%x:%x:%x:%x:%x:%x:%x:%x",
-	    &o0, &o1, &o2, &o3, &o4, &o5, &o6, &o7);
-	if (i == EUI64_LEN)
-		goto good;
-	/* classic fwcontrol/dconschat form */
-	i = sscanf(a, "0x%2x%2x%2x%2x%2x%2x%2x%2x",
-	    &o0, &o1, &o2, &o3, &o4, &o5, &o6, &o7);
-	if (i == EUI64_LEN)
-		goto good;
-	/* MAC format (-) */
-	i = sscanf(a, "%x-%x-%x-%x-%x-%x",
-	    &o0, &o1, &o2, &o5, &o6, &o7);
-	if (i == 6) {
-		o3 = 0xff;
-		o4 = 0xfe;
-		goto good;
-	}
-	/* MAC format (:) */
-	i = sscanf(a, "%x:%x:%x:%x:%x:%x",
-	    &o0, &o1, &o2, &o5, &o6, &o7);
-	if (i == 6) {
-		o3 = 0xff;
-		o4 = 0xfe;
-		goto good;
-	}
-
-	return (-1);
-
-good:
-        e->octet[0]=o0;
-	e->octet[1]=o1;
-	e->octet[2]=o2;
-	e->octet[3]=o3;
-	e->octet[4]=o4;
-	e->octet[5]=o5;
-	e->octet[6]=o6;
-	e->octet[7]=o7;
-
-        return (0);
-}
-
-/*
- * Convert a binary representation of an EUI-64 to an ASCII string.
- */
-int
-eui64_ntoa(const struct eui64 *id, char *a, size_t len)
-{
-        int i;
-
-        i = snprintf(a, len, "%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x",
-	    id->octet[0], id->octet[1], id->octet[2], id->octet[3],
-	    id->octet[4], id->octet[5], id->octet[6], id->octet[7]);
-        if (i < 23 || i >= len)
-                return (-1);
-        return (0);
-}
-
-/*
- * Map an EUI-64 to a hostname. Use either /etc/eui64 or NIS/YP.
- */
-int
-eui64_ntohost(char *hostname, size_t len, const struct eui64 *id)
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct eui64 local_eui64;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char eui64_a[24];
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_EUI64, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			eui64_ntoa(id, eui64_a, sizeof(eui64_a));
-			if (yp_match(yp_domain, "eui64.byid", eui64_a,
-				strlen(eui64_a), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (eui64_line(buf, &local_eui64, local_host,
-		    sizeof(local_host)) == 0) {
-			if (bcmp(&local_eui64.octet[0],
-				&id->octet[0], EUI64_LEN) == 0) {
-			/* We have a match */
-				strcpy(hostname, local_host);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
-
-/*
- * Map a hostname to an EUI-64 using /etc/eui64 or NIS/YP.
- */
-int
-eui64_hostton(const char *hostname, struct eui64 *id)
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct eui64 local_eui64;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_EUI64, "r")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			if (yp_match(yp_domain, "eui64.byname", hostname,
-				strlen(hostname), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (eui64_line(buf, &local_eui64, local_host,
-		    sizeof(local_host)) == 0) {
-			if (strcmp(hostname, local_host) == 0) {
-				/* We have a match */
-				bcopy(&local_eui64, id, sizeof(struct eui64));
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
diff --git a/lib/libc/net/gai_strerror.c b/lib/libc/net/gai_strerror.c
deleted file mode 100644
index 81e01a3..0000000
--- a/lib/libc/net/gai_strerror.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <netdb.h>
-
-/* Entries EAI_ADDRFAMILY (1) and EAI_NODATA (7) are obsoleted, but left */
-/* for backward compatibility with userland code prior to 2553bis-02 */
-static const char *ai_errlist[] = {
-	"Success",					/* 0 */
-	"Address family for hostname not supported",	/* 1 */
-	"Temporary failure in name resolution",		/* EAI_AGAIN */
-	"Invalid value for ai_flags",			/* EAI_BADFLAGS */
-	"Non-recoverable failure in name resolution",	/* EAI_FAIL */
-	"ai_family not supported",			/* EAI_FAMILY */
-	"Memory allocation failure", 			/* EAI_MEMORY */
-	"No address associated with hostname",		/* 7 */
-	"hostname nor servname provided, or not known",	/* EAI_NONAME */
-	"servname not supported for ai_socktype",	/* EAI_SERVICE */
-	"ai_socktype not supported", 			/* EAI_SOCKTYPE */
-	"System error returned in errno", 		/* EAI_SYSTEM */
-	"Invalid value for hints",			/* EAI_BADHINTS */
-	"Resolved protocol is unknown"			/* EAI_PROTOCOL */
-};
-
-const char *
-gai_strerror(int ecode)
-{
-	if (ecode >= 0 && ecode < EAI_MAX)
-		return ai_errlist[ecode];
-	return "Unknown error";
-}
diff --git a/lib/libc/net/getaddrinfo.c b/lib/libc/net/getaddrinfo.c
deleted file mode 100644
index 26e59ca..0000000
--- a/lib/libc/net/getaddrinfo.c
+++ /dev/null
@@ -1,2546 +0,0 @@
-/*	$KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * "#ifdef FAITH" part is local hack for supporting IPv4-v6 translator.
- *
- * Issues to be discussed:
- * - Return values.  There are nonstandard return values defined and used
- *   in the source code.  This is because RFC2553 is silent about which error
- *   code must be returned for which situation.
- * - freeaddrinfo(NULL).  RFC2553 is silent about it.  XNET 5.2 says it is
- *   invalid.  current code - SEGV on freeaddrinfo(NULL)
- *
- * Note:
- * - The code filters out AFs that are not supported by the kernel,
- *   when globbing NULL hostname (to loopback, or wildcard).  Is it the right
- *   thing to do?  What is the relationship with post-RFC2553 AI_ADDRCONFIG
- *   in ai_flags?
- * - (post-2553) semantics of AI_ADDRCONFIG itself is too vague.
- *   (1) what should we do against numeric hostname (2) what should we do
- *   against NULL hostname (3) what is AI_ADDRCONFIG itself.  AF not ready?
- *   non-loopback address configured?  global address configured?
- *
- * OS specific notes for freebsd4:
- * - FreeBSD supported $GAI.  The code does not.
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <sys/queue.h>
-#ifdef INET6
-#include <net/if_var.h>
-#include <sys/sysctl.h>
-#include <sys/ioctl.h>
-#include <netinet6/in6_var.h>	/* XXX */
-#endif
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include "res_config.h"
-
-#ifdef DEBUG
-#include <syslog.h>
-#endif
-
-#include <stdarg.h>
-#include <nsswitch.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#if defined(__KAME__) && defined(INET6)
-# define FAITH
-#endif
-
-#define SUCCESS 0
-#define ANY 0
-#define YES 1
-#define NO  0
-
-static const char in_addrany[] = { 0, 0, 0, 0 };
-static const char in_loopback[] = { 127, 0, 0, 1 };
-#ifdef INET6
-static const char in6_addrany[] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-static const char in6_loopback[] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-};
-#endif
-
-struct policyqueue {
-	TAILQ_ENTRY(policyqueue) pc_entry;
-#ifdef INET6
-	struct in6_addrpolicy pc_policy;
-#endif
-};
-TAILQ_HEAD(policyhead, policyqueue);
-
-static const struct afd {
-	int a_af;
-	int a_addrlen;
-	socklen_t a_socklen;
-	int a_off;
-	const char *a_addrany;
-	const char *a_loopback;
-	int a_scoped;
-} afdl [] = {
-#ifdef INET6
-#define	N_INET6 0
-	{PF_INET6, sizeof(struct in6_addr),
-	 sizeof(struct sockaddr_in6),
-	 offsetof(struct sockaddr_in6, sin6_addr),
-	 in6_addrany, in6_loopback, 1},
-#define	N_INET 1
-#else
-#define	N_INET 0
-#endif
-	{PF_INET, sizeof(struct in_addr),
-	 sizeof(struct sockaddr_in),
-	 offsetof(struct sockaddr_in, sin_addr),
-	 in_addrany, in_loopback, 0},
-	{0, 0, 0, 0, NULL, NULL, 0},
-};
-
-struct explore {
-	int e_af;
-	int e_socktype;
-	int e_protocol;
-	const char *e_protostr;
-	int e_wild;
-#define WILD_AF(ex)		((ex)->e_wild & 0x01)
-#define WILD_SOCKTYPE(ex)	((ex)->e_wild & 0x02)
-#define WILD_PROTOCOL(ex)	((ex)->e_wild & 0x04)
-};
-
-static const struct explore explore[] = {
-#if 0
-	{ PF_LOCAL, 0, ANY, ANY, NULL, 0x01 },
-#endif
-#ifdef INET6
-	{ PF_INET6, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
-	{ PF_INET6, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
-	{ PF_INET6, SOCK_RAW, ANY, NULL, 0x05 },
-#endif
-	{ PF_INET, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
-	{ PF_INET, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
-	{ PF_INET, SOCK_RAW, ANY, NULL, 0x05 },
-	{ PF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, "udp", 0x07 },
-	{ PF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, "tcp", 0x07 },
-	{ PF_UNSPEC, SOCK_RAW, ANY, NULL, 0x05 },
-	{ -1, 0, 0, NULL, 0 },
-};
-
-#ifdef INET6
-#define PTON_MAX	16
-#else
-#define PTON_MAX	4
-#endif
-
-#define AIO_SRCFLAG_DEPRECATED	0x1
-
-struct ai_order {
-	union {
-		struct sockaddr_storage aiou_ss;
-		struct sockaddr aiou_sa;
-	} aio_src_un;
-#define aio_srcsa aio_src_un.aiou_sa
-	uint32_t aio_srcflag;
-	int aio_srcscope;
-	int aio_dstscope;
-	struct policyqueue *aio_srcpolicy;
-	struct policyqueue *aio_dstpolicy;
-	struct addrinfo *aio_ai;
-	int aio_matchlen;
-};
-
-static const ns_src default_dns_files[] = {
-	{ NSSRC_FILES, 	NS_SUCCESS },
-	{ NSSRC_DNS, 	NS_SUCCESS },
-	{ 0 }
-};
-
-struct res_target {
-	struct res_target *next;
-	const char *name;	/* domain name */
-	int qclass, qtype;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer buffer */
-	int n;			/* result length */
-};
-
-#define MAXPACKET	(64*1024)
-
-typedef union {
-	HEADER hdr;
-	u_char buf[MAXPACKET];
-} querybuf;
-
-static int str2number(const char *, int *);
-static int explore_null(const struct addrinfo *,
-	const char *, struct addrinfo **);
-static int explore_numeric(const struct addrinfo *, const char *,
-	const char *, struct addrinfo **, const char *);
-static int explore_numeric_scope(const struct addrinfo *, const char *,
-	const char *, struct addrinfo **);
-static int get_canonname(const struct addrinfo *,
-	struct addrinfo *, const char *);
-static struct addrinfo *get_ai(const struct addrinfo *,
-	const struct afd *, const char *);
-static int get_portmatch(const struct addrinfo *, const char *);
-static int get_port(struct addrinfo *, const char *, int);
-static const struct afd *find_afd(int);
-static int addrconfig(struct addrinfo *);
-static void set_source(struct ai_order *, struct policyhead *);
-static int comp_dst(const void *, const void *);
-#ifdef INET6
-static int ip6_str2scopeid(char *, struct sockaddr_in6 *, uint32_t *);
-#endif
-static int gai_addr2scopetype(struct sockaddr *);
-
-static int explore_fqdn(const struct addrinfo *, const char *,
-	const char *, struct addrinfo **);
-
-static int reorder(struct addrinfo *);
-static int get_addrselectpolicy(struct policyhead *);
-static void free_addrselectpolicy(struct policyhead *);
-static struct policyqueue *match_addrselectpolicy(struct sockaddr *,
-	struct policyhead *);
-static int matchlen(struct sockaddr *, struct sockaddr *);
-
-static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
-	const struct addrinfo *, res_state);
-#if defined(RESOLVSORT)
-static int addr4sort(struct addrinfo *, res_state);
-#endif
-static int _dns_getaddrinfo(void *, void *, va_list);
-static void _sethtent(FILE **);
-static void _endhtent(FILE **);
-static struct addrinfo *_gethtent(FILE **, const char *,
-	const struct addrinfo *);
-static int _files_getaddrinfo(void *, void *, va_list);
-#ifdef YP
-static struct addrinfo *_yphostent(char *, const struct addrinfo *);
-static int _yp_getaddrinfo(void *, void *, va_list);
-#endif
-
-static int res_queryN(const char *, struct res_target *, res_state);
-static int res_searchN(const char *, struct res_target *, res_state);
-static int res_querydomainN(const char *, const char *,
-	struct res_target *, res_state);
-
-/* XXX macros that make external reference is BAD. */
-
-#define GET_AI(ai, afd, addr) \
-do { \
-	/* external reference: pai, error, and label free */ \
-	(ai) = get_ai(pai, (afd), (addr)); \
-	if ((ai) == NULL) { \
-		error = EAI_MEMORY; \
-		goto free; \
-	} \
-} while (/*CONSTCOND*/0)
-
-#define GET_PORT(ai, serv) \
-do { \
-	/* external reference: error and label free */ \
-	error = get_port((ai), (serv), 0); \
-	if (error != 0) \
-		goto free; \
-} while (/*CONSTCOND*/0)
-
-#define GET_CANONNAME(ai, str) \
-do { \
-	/* external reference: pai, error and label free */ \
-	error = get_canonname(pai, (ai), (str)); \
-	if (error != 0) \
-		goto free; \
-} while (/*CONSTCOND*/0)
-
-#define ERR(err) \
-do { \
-	/* external reference: error, and label bad */ \
-	error = (err); \
-	goto bad; \
-	/*NOTREACHED*/ \
-} while (/*CONSTCOND*/0)
-
-#define MATCH_FAMILY(x, y, w) \
-	((x) == (y) || (/*CONSTCOND*/(w) && ((x) == PF_UNSPEC || (y) == PF_UNSPEC)))
-#define MATCH(x, y, w) \
-	((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY)))
-
-void
-freeaddrinfo(struct addrinfo *ai)
-{
-	struct addrinfo *next;
-
-	do {
-		next = ai->ai_next;
-		if (ai->ai_canonname)
-			free(ai->ai_canonname);
-		/* no need to free(ai->ai_addr) */
-		free(ai);
-		ai = next;
-	} while (ai);
-}
-
-static int
-str2number(const char *p, int *portp)
-{
-	char *ep;
-	unsigned long v;
-
-	if (*p == '\0')
-		return -1;
-	ep = NULL;
-	errno = 0;
-	v = strtoul(p, &ep, 10);
-	if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX) {
-		*portp = v;
-		return 0;
-	} else
-		return -1;
-}
-
-int
-getaddrinfo(const char *hostname, const char *servname,
-    const struct addrinfo *hints, struct addrinfo **res)
-{
-	struct addrinfo sentinel;
-	struct addrinfo *cur;
-	int error = 0;
-	struct addrinfo ai;
-	struct addrinfo ai0;
-	struct addrinfo *pai;
-	const struct explore *ex;
-	int numeric = 0;
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-	pai = &ai;
-	pai->ai_flags = 0;
-	pai->ai_family = PF_UNSPEC;
-	pai->ai_socktype = ANY;
-	pai->ai_protocol = ANY;
-	pai->ai_addrlen = 0;
-	pai->ai_canonname = NULL;
-	pai->ai_addr = NULL;
-	pai->ai_next = NULL;
-
-	if (hostname == NULL && servname == NULL)
-		return EAI_NONAME;
-	if (hints) {
-		/* error check for hints */
-		if (hints->ai_addrlen || hints->ai_canonname ||
-		    hints->ai_addr || hints->ai_next)
-			ERR(EAI_BADHINTS); /* xxx */
-		if (hints->ai_flags & ~AI_MASK)
-			ERR(EAI_BADFLAGS);
-		switch (hints->ai_family) {
-		case PF_UNSPEC:
-		case PF_INET:
-#ifdef INET6
-		case PF_INET6:
-#endif
-			break;
-		default:
-			ERR(EAI_FAMILY);
-		}
-		memcpy(pai, hints, sizeof(*pai));
-
-		/*
-		 * if both socktype/protocol are specified, check if they
-		 * are meaningful combination.
-		 */
-		if (pai->ai_socktype != ANY && pai->ai_protocol != ANY) {
-			for (ex = explore; ex->e_af >= 0; ex++) {
-				if (pai->ai_family != ex->e_af)
-					continue;
-				if (ex->e_socktype == ANY)
-					continue;
-				if (ex->e_protocol == ANY)
-					continue;
-				if (pai->ai_socktype == ex->e_socktype &&
-				    pai->ai_protocol != ex->e_protocol) {
-					ERR(EAI_BADHINTS);
-				}
-			}
-		}
-	}
-
-	/*
-	 * post-2553: AI_ALL and AI_V4MAPPED are effective only against
-	 * AF_INET6 query.  They need to be ignored if specified in other
-	 * occassions.
-	 */
-	switch (pai->ai_flags & (AI_ALL | AI_V4MAPPED)) {
-	case AI_V4MAPPED:
-	case AI_ALL | AI_V4MAPPED:
-		if (pai->ai_family != AF_INET6)
-			pai->ai_flags &= ~(AI_ALL | AI_V4MAPPED);
-		break;
-	case AI_ALL:
-#if 1
-		/* illegal */
-		ERR(EAI_BADFLAGS);
-#else
-		pai->ai_flags &= ~(AI_ALL | AI_V4MAPPED);
-#endif
-		break;
-	}
-
-	/*
-	 * check for special cases.  (1) numeric servname is disallowed if
-	 * socktype/protocol are left unspecified. (2) servname is disallowed
-	 * for raw and other inet{,6} sockets.
-	 */
-	if (MATCH_FAMILY(pai->ai_family, PF_INET, 1)
-#ifdef PF_INET6
-	    || MATCH_FAMILY(pai->ai_family, PF_INET6, 1)
-#endif
-	    ) {
-		ai0 = *pai;	/* backup *pai */
-
-		if (pai->ai_family == PF_UNSPEC) {
-#ifdef PF_INET6
-			pai->ai_family = PF_INET6;
-#else
-			pai->ai_family = PF_INET;
-#endif
-		}
-		error = get_portmatch(pai, servname);
-		if (error)
-			ERR(error);
-
-		*pai = ai0;
-	}
-
-	ai0 = *pai;
-
-	/* NULL hostname, or numeric hostname */
-	for (ex = explore; ex->e_af >= 0; ex++) {
-		*pai = ai0;
-
-		/* PF_UNSPEC entries are prepared for DNS queries only */
-		if (ex->e_af == PF_UNSPEC)
-			continue;
-
-		if (!MATCH_FAMILY(pai->ai_family, ex->e_af, WILD_AF(ex)))
-			continue;
-		if (!MATCH(pai->ai_socktype, ex->e_socktype, WILD_SOCKTYPE(ex)))
-			continue;
-		if (!MATCH(pai->ai_protocol, ex->e_protocol, WILD_PROTOCOL(ex)))
-			continue;
-
-		if (pai->ai_family == PF_UNSPEC)
-			pai->ai_family = ex->e_af;
-		if (pai->ai_socktype == ANY && ex->e_socktype != ANY)
-			pai->ai_socktype = ex->e_socktype;
-		if (pai->ai_protocol == ANY && ex->e_protocol != ANY)
-			pai->ai_protocol = ex->e_protocol;
-
-		if (hostname == NULL)
-			error = explore_null(pai, servname, &cur->ai_next);
-		else
-			error = explore_numeric_scope(pai, hostname, servname,
-			    &cur->ai_next);
-
-		if (error)
-			goto free;
-
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	/*
-	 * XXX
-	 * If numreic representation of AF1 can be interpreted as FQDN
-	 * representation of AF2, we need to think again about the code below.
-	 */
-	if (sentinel.ai_next) {
-		numeric = 1;
-		goto good;
-	}
-
-	if (hostname == NULL)
-		ERR(EAI_NONAME);	/* used to be EAI_NODATA */
-	if (pai->ai_flags & AI_NUMERICHOST)
-		ERR(EAI_NONAME);
-
-	if ((pai->ai_flags & AI_ADDRCONFIG) != 0 && !addrconfig(&ai0))
-		ERR(EAI_FAIL);
-
-	/*
-	 * hostname as alphabetical name.
-	 * we would like to prefer AF_INET6 than AF_INET, so we'll make a
-	 * outer loop by AFs.
-	 */
-	for (ex = explore; ex->e_af >= 0; ex++) {
-		*pai = ai0;
-
-		/* require exact match for family field */
-		if (pai->ai_family != ex->e_af)
-			continue;
-
-		if (!MATCH(pai->ai_socktype, ex->e_socktype,
-				WILD_SOCKTYPE(ex))) {
-			continue;
-		}
-		if (!MATCH(pai->ai_protocol, ex->e_protocol,
-				WILD_PROTOCOL(ex))) {
-			continue;
-		}
-
-		if (pai->ai_socktype == ANY && ex->e_socktype != ANY)
-			pai->ai_socktype = ex->e_socktype;
-		if (pai->ai_protocol == ANY && ex->e_protocol != ANY)
-			pai->ai_protocol = ex->e_protocol;
-
-		error = explore_fqdn(pai, hostname, servname,
-			&cur->ai_next);
-
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	/* XXX inhibit errors if we have the result */
-	if (sentinel.ai_next)
-		error = 0;
-
-good:
-	/*
-	 * ensure we return either:
-	 * - error == 0, non-NULL *res
-	 * - error != 0, NULL *res
-	 */
-	if (error == 0) {
-		if (sentinel.ai_next) {
-			/*
-			 * If the returned entry is for an active connection,
-			 * and the given name is not numeric, reorder the
-			 * list, so that the application would try the list
-			 * in the most efficient order.
-			 */
-			if (hints == NULL || !(hints->ai_flags & AI_PASSIVE)) {
-				if (!numeric)
-					(void)reorder(&sentinel);
-			}
-			*res = sentinel.ai_next;
-			return SUCCESS;
-		} else
-			error = EAI_FAIL;
-	}
-free:
-bad:
-	if (sentinel.ai_next)
-		freeaddrinfo(sentinel.ai_next);
-	*res = NULL;
-	return error;
-}
-
-static int
-reorder(struct addrinfo *sentinel)
-{
-	struct addrinfo *ai, **aip;
-	struct ai_order *aio;
-	int i, n;
-	struct policyhead policyhead;
-
-	/* count the number of addrinfo elements for sorting. */
-	for (n = 0, ai = sentinel->ai_next; ai != NULL; ai = ai->ai_next, n++)
-		;
-
-	/*
-	 * If the number is small enough, we can skip the reordering process.
-	 */
-	if (n <= 1)
-		return(n);
-
-	/* allocate a temporary array for sort and initialization of it. */
-	if ((aio = malloc(sizeof(*aio) * n)) == NULL)
-		return(n);	/* give up reordering */
-	memset(aio, 0, sizeof(*aio) * n);
-
-	/* retrieve address selection policy from the kernel */
-	TAILQ_INIT(&policyhead);
-	if (!get_addrselectpolicy(&policyhead)) {
-		/* no policy is installed into kernel, we don't sort. */
-		free(aio);
-		return (n);
-	}
-
-	for (i = 0, ai = sentinel->ai_next; i < n; ai = ai->ai_next, i++) {
-		aio[i].aio_ai = ai;
-		aio[i].aio_dstscope = gai_addr2scopetype(ai->ai_addr);
-		aio[i].aio_dstpolicy = match_addrselectpolicy(ai->ai_addr,
-							      &policyhead);
-		set_source(&aio[i], &policyhead);
-	}
-
-	/* perform sorting. */
-	qsort(aio, n, sizeof(*aio), comp_dst);
-
-	/* reorder the addrinfo chain. */
-	for (i = 0, aip = &sentinel->ai_next; i < n; i++) {
-		*aip = aio[i].aio_ai;
-		aip = &aio[i].aio_ai->ai_next;
-	}
-	*aip = NULL;
-
-	/* cleanup and return */
-	free(aio);
-	free_addrselectpolicy(&policyhead);
-	return(n);
-}
-
-static int
-get_addrselectpolicy(struct policyhead *head)
-{
-#ifdef INET6
-	int mib[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_ADDRCTLPOLICY };
-	size_t l;
-	char *buf;
-	struct in6_addrpolicy *pol, *ep;
-
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0)
-		return (0);
-	if ((buf = malloc(l)) == NULL)
-		return (0);
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
-		free(buf);
-		return (0);
-	}
-
-	ep = (struct in6_addrpolicy *)(buf + l);
-	for (pol = (struct in6_addrpolicy *)buf; pol + 1 <= ep; pol++) {
-		struct policyqueue *new;
-
-		if ((new = malloc(sizeof(*new))) == NULL) {
-			free_addrselectpolicy(head); /* make the list empty */
-			break;
-		}
-		new->pc_policy = *pol;
-		TAILQ_INSERT_TAIL(head, new, pc_entry);
-	}
-
-	free(buf);
-	return (1);
-#else
-	return (0);
-#endif
-}
-
-static void
-free_addrselectpolicy(struct policyhead *head)
-{
-	struct policyqueue *ent, *nent;
-
-	for (ent = TAILQ_FIRST(head); ent; ent = nent) {
-		nent = TAILQ_NEXT(ent, pc_entry);
-		TAILQ_REMOVE(head, ent, pc_entry);
-		free(ent);
-	}
-}
-
-static struct policyqueue *
-match_addrselectpolicy(struct sockaddr *addr, struct policyhead *head)
-{
-#ifdef INET6
-	struct policyqueue *ent, *bestent = NULL;
-	struct in6_addrpolicy *pol;
-	int matchlen, bestmatchlen = -1;
-	u_char *mp, *ep, *k, *p, m;
-	struct sockaddr_in6 key;
-
-	switch(addr->sa_family) {
-	case AF_INET6:
-		key = *(struct sockaddr_in6 *)addr;
-		break;
-	case AF_INET:
-		/* convert the address into IPv4-mapped IPv6 address. */
-		memset(&key, 0, sizeof(key));
-		key.sin6_family = AF_INET6;
-		key.sin6_len = sizeof(key);
-		key.sin6_addr.s6_addr[10] = 0xff;
-		key.sin6_addr.s6_addr[11] = 0xff;
-		memcpy(&key.sin6_addr.s6_addr[12],
-		       &((struct sockaddr_in *)addr)->sin_addr, 4);
-		break;
-	default:
-		return(NULL);
-	}
-
-	for (ent = TAILQ_FIRST(head); ent; ent = TAILQ_NEXT(ent, pc_entry)) {
-		pol = &ent->pc_policy;
-		matchlen = 0;
-
-		mp = (u_char *)&pol->addrmask.sin6_addr;
-		ep = mp + 16;	/* XXX: scope field? */
-		k = (u_char *)&key.sin6_addr;
-		p = (u_char *)&pol->addr.sin6_addr;
-		for (; mp < ep && *mp; mp++, k++, p++) {
-			m = *mp;
-			if ((*k & m) != *p)
-				goto next; /* not match */
-			if (m == 0xff) /* short cut for a typical case */
-				matchlen += 8;
-			else {
-				while (m >= 0x80) {
-					matchlen++;
-					m <<= 1;
-				}
-			}
-		}
-
-		/* matched.  check if this is better than the current best. */
-		if (matchlen > bestmatchlen) {
-			bestent = ent;
-			bestmatchlen = matchlen;
-		}
-
-	  next:
-		continue;
-	}
-
-	return(bestent);
-#else
-	return(NULL);
-#endif
-
-}
-
-static void
-set_source(struct ai_order *aio, struct policyhead *ph)
-{
-	struct addrinfo ai = *aio->aio_ai;
-	struct sockaddr_storage ss;
-	socklen_t srclen;
-	int s;
-
-	/* set unspec ("no source is available"), just in case */
-	aio->aio_srcsa.sa_family = AF_UNSPEC;
-	aio->aio_srcscope = -1;
-
-	switch(ai.ai_family) {
-	case AF_INET:
-#ifdef INET6
-	case AF_INET6:
-#endif
-		break;
-	default:		/* ignore unsupported AFs explicitly */
-		return;
-	}
-
-	/* XXX: make a dummy addrinfo to call connect() */
-	ai.ai_socktype = SOCK_DGRAM;
-	ai.ai_protocol = IPPROTO_UDP; /* is UDP too specific? */
-	ai.ai_next = NULL;
-	memset(&ss, 0, sizeof(ss));
-	memcpy(&ss, ai.ai_addr, ai.ai_addrlen);
-	ai.ai_addr = (struct sockaddr *)&ss;
-	get_port(&ai, "1", 0);
-
-	/* open a socket to get the source address for the given dst */
-	if ((s = _socket(ai.ai_family, ai.ai_socktype, ai.ai_protocol)) < 0)
-		return;		/* give up */
-	if (_connect(s, ai.ai_addr, ai.ai_addrlen) < 0)
-		goto cleanup;
-	srclen = ai.ai_addrlen;
-	if (_getsockname(s, &aio->aio_srcsa, &srclen) < 0) {
-		aio->aio_srcsa.sa_family = AF_UNSPEC;
-		goto cleanup;
-	}
-	aio->aio_srcscope = gai_addr2scopetype(&aio->aio_srcsa);
-	aio->aio_srcpolicy = match_addrselectpolicy(&aio->aio_srcsa, ph);
-	aio->aio_matchlen = matchlen(&aio->aio_srcsa, aio->aio_ai->ai_addr);
-#ifdef INET6
-	if (ai.ai_family == AF_INET6) {
-		struct in6_ifreq ifr6;
-		uint32_t flags6;
-
-		/* XXX: interface name should not be hardcoded */
-		strncpy(ifr6.ifr_name, "lo0", sizeof(ifr6.ifr_name));
-		memset(&ifr6, 0, sizeof(ifr6));
-		memcpy(&ifr6.ifr_addr, ai.ai_addr, ai.ai_addrlen);
-		if (_ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) == 0) {
-			flags6 = ifr6.ifr_ifru.ifru_flags6;
-			if ((flags6 & IN6_IFF_DEPRECATED))
-				aio->aio_srcflag |= AIO_SRCFLAG_DEPRECATED;
-		}
-	}
-#endif
-
-  cleanup:
-	_close(s);
-	return;
-}
-
-static int
-matchlen(struct sockaddr *src, struct sockaddr *dst)
-{
-	int match = 0;
-	u_char *s, *d;
-	u_char *lim, r;
-	int addrlen;
-
-	switch (src->sa_family) {
-#ifdef INET6
-	case AF_INET6:
-		s = (u_char *)&((struct sockaddr_in6 *)src)->sin6_addr;
-		d = (u_char *)&((struct sockaddr_in6 *)dst)->sin6_addr;
-		addrlen = sizeof(struct in6_addr);
-		lim = s + addrlen;
-		break;
-#endif
-	case AF_INET:
-		s = (u_char *)&((struct sockaddr_in *)src)->sin_addr;
-		d = (u_char *)&((struct sockaddr_in *)dst)->sin_addr;
-		addrlen = sizeof(struct in_addr);
-		lim = s + addrlen;
-		break;
-	default:
-		return(0);
-	}
-
-	while (s < lim)
-		if ((r = (*d++ ^ *s++)) != 0) {
-			while (r < addrlen * 8) {
-				match++;
-				r <<= 1;
-			}
-			break;
-		} else
-			match += 8;
-	return(match);
-}
-
-static int
-comp_dst(const void *arg1, const void *arg2)
-{
-	const struct ai_order *dst1 = arg1, *dst2 = arg2;
-
-	/*
-	 * Rule 1: Avoid unusable destinations.
-	 * XXX: we currently do not consider if an appropriate route exists.
-	 */
-	if (dst1->aio_srcsa.sa_family != AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family == AF_UNSPEC) {
-		return(-1);
-	}
-	if (dst1->aio_srcsa.sa_family == AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family != AF_UNSPEC) {
-		return(1);
-	}
-
-	/* Rule 2: Prefer matching scope. */
-	if (dst1->aio_dstscope == dst1->aio_srcscope &&
-	    dst2->aio_dstscope != dst2->aio_srcscope) {
-		return(-1);
-	}
-	if (dst1->aio_dstscope != dst1->aio_srcscope &&
-	    dst2->aio_dstscope == dst2->aio_srcscope) {
-		return(1);
-	}
-
-	/* Rule 3: Avoid deprecated addresses. */
-	if (dst1->aio_srcsa.sa_family != AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family != AF_UNSPEC) {
-		if (!(dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) &&
-		    (dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) {
-			return(-1);
-		}
-		if ((dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) &&
-		    !(dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) {
-			return(1);
-		}
-	}
-
-	/* Rule 4: Prefer home addresses. */
-	/* XXX: not implemented yet */
-
-	/* Rule 5: Prefer matching label. */
-#ifdef INET6
-	if (dst1->aio_srcpolicy && dst1->aio_dstpolicy &&
-	    dst1->aio_srcpolicy->pc_policy.label ==
-	    dst1->aio_dstpolicy->pc_policy.label &&
-	    (dst2->aio_srcpolicy == NULL || dst2->aio_dstpolicy == NULL ||
-	     dst2->aio_srcpolicy->pc_policy.label !=
-	     dst2->aio_dstpolicy->pc_policy.label)) {
-		return(-1);
-	}
-	if (dst2->aio_srcpolicy && dst2->aio_dstpolicy &&
-	    dst2->aio_srcpolicy->pc_policy.label ==
-	    dst2->aio_dstpolicy->pc_policy.label &&
-	    (dst1->aio_srcpolicy == NULL || dst1->aio_dstpolicy == NULL ||
-	     dst1->aio_srcpolicy->pc_policy.label !=
-	     dst1->aio_dstpolicy->pc_policy.label)) {
-		return(1);
-	}
-#endif
-
-	/* Rule 6: Prefer higher precedence. */
-#ifdef INET6
-	if (dst1->aio_dstpolicy &&
-	    (dst2->aio_dstpolicy == NULL ||
-	     dst1->aio_dstpolicy->pc_policy.preced >
-	     dst2->aio_dstpolicy->pc_policy.preced)) {
-		return(-1);
-	}
-	if (dst2->aio_dstpolicy &&
-	    (dst1->aio_dstpolicy == NULL ||
-	     dst2->aio_dstpolicy->pc_policy.preced >
-	     dst1->aio_dstpolicy->pc_policy.preced)) {
-		return(1);
-	}
-#endif
-
-	/* Rule 7: Prefer native transport. */
-	/* XXX: not implemented yet */
-
-	/* Rule 8: Prefer smaller scope. */
-	if (dst1->aio_dstscope >= 0 &&
-	    dst1->aio_dstscope < dst2->aio_dstscope) {
-		return(-1);
-	}
-	if (dst2->aio_dstscope >= 0 &&
-	    dst2->aio_dstscope < dst1->aio_dstscope) {
-		return(1);
-	}
-
-	/*
-	 * Rule 9: Use longest matching prefix.
-	 * We compare the match length in a same AF only.
-	 */
-	if (dst1->aio_ai->ai_addr->sa_family ==
-	    dst2->aio_ai->ai_addr->sa_family) {
-		if (dst1->aio_matchlen > dst2->aio_matchlen) {
-			return(-1);
-		}
-		if (dst1->aio_matchlen < dst2->aio_matchlen) {
-			return(1);
-		}
-	}
-
-	/* Rule 10: Otherwise, leave the order unchanged. */
-	return(-1);
-}
-
-/*
- * Copy from scope.c.
- * XXX: we should standardize the functions and link them as standard
- * library.
- */
-static int
-gai_addr2scopetype(struct sockaddr *sa)
-{
-#ifdef INET6
-	struct sockaddr_in6 *sa6;
-#endif
-	struct sockaddr_in *sa4;
-
-	switch(sa->sa_family) {
-#ifdef INET6
-	case AF_INET6:
-		sa6 = (struct sockaddr_in6 *)sa;
-		if (IN6_IS_ADDR_MULTICAST(&sa6->sin6_addr)) {
-			/* just use the scope field of the multicast address */
-			return(sa6->sin6_addr.s6_addr[2] & 0x0f);
-		}
-		/*
-		 * Unicast addresses: map scope type to corresponding scope
-		 * value defined for multcast addresses.
-		 * XXX: hardcoded scope type values are bad...
-		 */
-		if (IN6_IS_ADDR_LOOPBACK(&sa6->sin6_addr))
-			return(1); /* node local scope */
-		if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr))
-			return(2); /* link-local scope */
-		if (IN6_IS_ADDR_SITELOCAL(&sa6->sin6_addr))
-			return(5); /* site-local scope */
-		return(14);	/* global scope */
-		break;
-#endif
-	case AF_INET:
-		/*
-		 * IPv4 pseudo scoping according to RFC 3484.
-		 */
-		sa4 = (struct sockaddr_in *)sa;
-		/* IPv4 autoconfiguration addresses have link-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 169 &&
-		    ((u_char *)&sa4->sin_addr)[1] == 254)
-			return(2);
-		/* Private addresses have site-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 10 ||
-		    (((u_char *)&sa4->sin_addr)[0] == 172 &&
-		     (((u_char *)&sa4->sin_addr)[1] & 0xf0) == 16) ||
-		    (((u_char *)&sa4->sin_addr)[0] == 192 &&
-		     ((u_char *)&sa4->sin_addr)[1] == 168))
-			return(14);	/* XXX: It should be 5 unless NAT */
-		/* Loopback addresses have link-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 127)
-			return(2);
-		return(14);
-		break;
-	default:
-		errno = EAFNOSUPPORT; /* is this a good error? */
-		return(-1);
-	}
-}
-
-/*
- * hostname == NULL.
- * passive socket -> anyaddr (0.0.0.0 or ::)
- * non-passive socket -> localhost (127.0.0.1 or ::1)
- */
-static int
-explore_null(const struct addrinfo *pai, const char *servname,
-    struct addrinfo **res)
-{
-	int s;
-	const struct afd *afd;
-	struct addrinfo *ai;
-	int error;
-
-	*res = NULL;
-	ai = NULL;
-
-	/*
-	 * filter out AFs that are not supported by the kernel
-	 * XXX errno?
-	 */
-	s = _socket(pai->ai_family, SOCK_DGRAM, 0);
-	if (s < 0) {
-		if (errno != EMFILE)
-			return 0;
-	} else
-		_close(s);
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname) != 0)
-		return 0;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	if (pai->ai_flags & AI_PASSIVE) {
-		GET_AI(ai, afd, afd->a_addrany);
-		GET_PORT(ai, servname);
-	} else {
-		GET_AI(ai, afd, afd->a_loopback);
-		GET_PORT(ai, servname);
-	}
-
-	*res = ai;
-	return 0;
-
-free:
-	if (ai != NULL)
-		freeaddrinfo(ai);
-	return error;
-}
-
-/*
- * numeric hostname
- */
-static int
-explore_numeric(const struct addrinfo *pai, const char *hostname,
-    const char *servname, struct addrinfo **res, const char *canonname)
-{
-	const struct afd *afd;
-	struct addrinfo *ai;
-	int error;
-	char pton[PTON_MAX];
-
-	*res = NULL;
-	ai = NULL;
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname) != 0)
-		return 0;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	switch (afd->a_af) {
-	case AF_INET:
-		/*
-		 * RFC3493 requires getaddrinfo() to accept AF_INET formats
-		 * that are accepted by inet_addr() and its family.  The
-		 * accepted forms includes the "classful" one, which inet_pton
-		 * does not accept.  So we need to separate the case for
-		 * AF_INET.
-		 */
-		if (inet_aton(hostname, (struct in_addr *)pton) != 1)
-			return 0;
-		break;
-	default:
-		if (inet_pton(afd->a_af, hostname, pton) != 1)
-			return 0;
-		break;
-	}
-
-	if (pai->ai_family == afd->a_af) {
-		GET_AI(ai, afd, pton);
-		GET_PORT(ai, servname);
-		if ((pai->ai_flags & AI_CANONNAME)) {
-			/*
-			 * Set the numeric address itself as the canonical
-			 * name, based on a clarification in RFC3493.
-			 */
-			GET_CANONNAME(ai, canonname);
-		}
-	} else {
-		/*
-		 * XXX: This should not happen since we already matched the AF
-		 * by find_afd.
-		 */
-		ERR(EAI_FAMILY);
-	}
-
-	*res = ai;
-	return 0;
-
-free:
-bad:
-	if (ai != NULL)
-		freeaddrinfo(ai);
-	return error;
-}
-
-/*
- * numeric hostname with scope
- */
-static int
-explore_numeric_scope(const struct addrinfo *pai, const char *hostname,
-    const char *servname, struct addrinfo **res)
-{
-#if !defined(SCOPE_DELIMITER) || !defined(INET6)
-	return explore_numeric(pai, hostname, servname, res, hostname);
-#else
-	const struct afd *afd;
-	struct addrinfo *cur;
-	int error;
-	char *cp, *hostname2 = NULL, *scope, *addr;
-	struct sockaddr_in6 *sin6;
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname) != 0)
-		return 0;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	if (!afd->a_scoped)
-		return explore_numeric(pai, hostname, servname, res, hostname);
-
-	cp = strchr(hostname, SCOPE_DELIMITER);
-	if (cp == NULL)
-		return explore_numeric(pai, hostname, servname, res, hostname);
-
-	/*
-	 * Handle special case of <scoped_address><delimiter><scope id>
-	 */
-	hostname2 = strdup(hostname);
-	if (hostname2 == NULL)
-		return EAI_MEMORY;
-	/* terminate at the delimiter */
-	hostname2[cp - hostname] = '\0';
-	addr = hostname2;
-	scope = cp + 1;
-
-	error = explore_numeric(pai, addr, servname, res, hostname);
-	if (error == 0) {
-		uint32_t scopeid;
-
-		for (cur = *res; cur; cur = cur->ai_next) {
-			if (cur->ai_family != AF_INET6)
-				continue;
-			sin6 = (struct sockaddr_in6 *)(void *)cur->ai_addr;
-			if (ip6_str2scopeid(scope, sin6, &scopeid) == -1) {
-				free(hostname2);
-				return(EAI_NONAME); /* XXX: is return OK? */
-			}
-			sin6->sin6_scope_id = scopeid;
-		}
-	}
-
-	free(hostname2);
-
-	return error;
-#endif
-}
-
-static int
-get_canonname(const struct addrinfo *pai, struct addrinfo *ai, const char *str)
-{
-	if ((pai->ai_flags & AI_CANONNAME) != 0) {
-		ai->ai_canonname = strdup(str);
-		if (ai->ai_canonname == NULL)
-			return EAI_MEMORY;
-	}
-	return 0;
-}
-
-static struct addrinfo *
-get_ai(const struct addrinfo *pai, const struct afd *afd, const char *addr)
-{
-	char *p;
-	struct addrinfo *ai;
-#ifdef FAITH
-	struct in6_addr faith_prefix;
-	char *fp_str;
-	int translate = 0;
-#endif
-
-#ifdef FAITH
-	/*
-	 * Transfrom an IPv4 addr into a special IPv6 addr format for
-	 * IPv6->IPv4 translation gateway. (only TCP is supported now)
-	 *
-	 * +-----------------------------------+------------+
-	 * | faith prefix part (12 bytes)      | embedded   |
-	 * |                                   | IPv4 addr part (4 bytes)
-	 * +-----------------------------------+------------+
-	 *
-	 * faith prefix part is specified as ascii IPv6 addr format
-	 * in environmental variable GAI.
-	 * For FAITH to work correctly, routing to faith prefix must be
-	 * setup toward a machine where a FAITH daemon operates.
-	 * Also, the machine must enable some mechanizm
-	 * (e.g. faith interface hack) to divert those packet with
-	 * faith prefixed destination addr to user-land FAITH daemon.
-	 */
-	fp_str = getenv("GAI");
-	if (fp_str && inet_pton(AF_INET6, fp_str, &faith_prefix) == 1 &&
-	    afd->a_af == AF_INET && pai->ai_socktype == SOCK_STREAM) {
-		uint32_t v4a;
-		u_int8_t v4a_top;
-
-		memcpy(&v4a, addr, sizeof v4a);
-		v4a_top = v4a >> IN_CLASSA_NSHIFT;
-		if (!IN_MULTICAST(v4a) && !IN_EXPERIMENTAL(v4a) &&
-		    v4a_top != 0 && v4a != IN_LOOPBACKNET) {
-			afd = &afdl[N_INET6];
-			memcpy(&faith_prefix.s6_addr[12], addr,
-			       sizeof(struct in_addr));
-			translate = 1;
-		}
-	}
-#endif
-
-	ai = (struct addrinfo *)malloc(sizeof(struct addrinfo)
-		+ (afd->a_socklen));
-	if (ai == NULL)
-		return NULL;
-
-	memcpy(ai, pai, sizeof(struct addrinfo));
-	ai->ai_addr = (struct sockaddr *)(void *)(ai + 1);
-	memset(ai->ai_addr, 0, (size_t)afd->a_socklen);
-	ai->ai_addr->sa_len = afd->a_socklen;
-	ai->ai_addrlen = afd->a_socklen;
-	ai->ai_addr->sa_family = ai->ai_family = afd->a_af;
-	p = (char *)(void *)(ai->ai_addr);
-#ifdef FAITH
-	if (translate == 1)
-		memcpy(p + afd->a_off, &faith_prefix, (size_t)afd->a_addrlen);
-	else
-#endif
-	memcpy(p + afd->a_off, addr, (size_t)afd->a_addrlen);
-	return ai;
-}
-
-static int
-get_portmatch(const struct addrinfo *ai, const char *servname)
-{
-
-	/* get_port does not touch first argument when matchonly == 1. */
-	/* LINTED const cast */
-	return get_port((struct addrinfo *)ai, servname, 1);
-}
-
-static int
-get_port(struct addrinfo *ai, const char *servname, int matchonly)
-{
-	const char *proto;
-	struct servent *sp;
-	int port, error;
-	int allownumeric;
-
-	if (servname == NULL)
-		return 0;
-	switch (ai->ai_family) {
-	case AF_INET:
-#ifdef AF_INET6
-	case AF_INET6:
-#endif
-		break;
-	default:
-		return 0;
-	}
-
-	switch (ai->ai_socktype) {
-	case SOCK_RAW:
-		return EAI_SERVICE;
-	case SOCK_DGRAM:
-	case SOCK_STREAM:
-		allownumeric = 1;
-		break;
-	case ANY:
-		allownumeric = 0;
-		break;
-	default:
-		return EAI_SOCKTYPE;
-	}
-
-	error = str2number(servname, &port);
-	if (error == 0) {
-		if (!allownumeric)
-			return EAI_SERVICE;
-		if (port < 0 || port > 65535)
-			return EAI_SERVICE;
-		port = htons(port);
-	} else {
-		if (ai->ai_flags & AI_NUMERICSERV)
-			return EAI_NONAME;
-		switch (ai->ai_socktype) {
-		case SOCK_DGRAM:
-			proto = "udp";
-			break;
-		case SOCK_STREAM:
-			proto = "tcp";
-			break;
-		default:
-			proto = NULL;
-			break;
-		}
-
-		if ((sp = getservbyname(servname, proto)) == NULL)
-			return EAI_SERVICE;
-		port = sp->s_port;
-	}
-
-	if (!matchonly) {
-		switch (ai->ai_family) {
-		case AF_INET:
-			((struct sockaddr_in *)(void *)
-			    ai->ai_addr)->sin_port = port;
-			break;
-#ifdef INET6
-		case AF_INET6:
-			((struct sockaddr_in6 *)(void *)
-			    ai->ai_addr)->sin6_port = port;
-			break;
-#endif
-		}
-	}
-
-	return 0;
-}
-
-static const struct afd *
-find_afd(int af)
-{
-	const struct afd *afd;
-
-	if (af == PF_UNSPEC)
-		return NULL;
-	for (afd = afdl; afd->a_af; afd++) {
-		if (afd->a_af == af)
-			return afd;
-	}
-	return NULL;
-}
-
-/*
- * post-2553: AI_ADDRCONFIG check.  if we use getipnodeby* as backend, backend
- * will take care of it.
- * the semantics of AI_ADDRCONFIG is not defined well.  we are not sure
- * if the code is right or not.
- *
- * XXX PF_UNSPEC -> PF_INET6 + PF_INET mapping needs to be in sync with
- * _dns_getaddrinfo.
- */
-static int
-addrconfig(struct addrinfo *pai)
-{
-	int s, af;
-
-	/*
-	 * TODO:
-	 * Note that implementation dependent test for address
-	 * configuration should be done everytime called
-	 * (or apropriate interval),
-	 * because addresses will be dynamically assigned or deleted.
-	 */
-	af = pai->ai_family;
-	if (af == AF_UNSPEC) {
-		if ((s = _socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
-			af = AF_INET;
-		else {
-			_close(s);
-			if ((s = _socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-				af = AF_INET6;
-			else
-				_close(s);
-		}
-	}
-	if (af != AF_UNSPEC) {
-		if ((s = _socket(af, SOCK_DGRAM, 0)) < 0)
-			return 0;
-		_close(s);
-	}
-	pai->ai_family = af;
-	return 1;
-}
-
-#ifdef INET6
-/* convert a string to a scope identifier. XXX: IPv6 specific */
-static int
-ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, uint32_t *scopeid)
-{
-	u_long lscopeid;
-	struct in6_addr *a6;
-	char *ep;
-
-	a6 = &sin6->sin6_addr;
-
-	/* empty scopeid portion is invalid */
-	if (*scope == '\0')
-		return -1;
-
-	if (IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6)) {
-		/*
-		 * We currently assume a one-to-one mapping between links
-		 * and interfaces, so we simply use interface indices for
-		 * like-local scopes.
-		 */
-		*scopeid = if_nametoindex(scope);
-		if (*scopeid == 0)
-			goto trynumeric;
-		return 0;
-	}
-
-	/* still unclear about literal, allow numeric only - placeholder */
-	if (IN6_IS_ADDR_SITELOCAL(a6) || IN6_IS_ADDR_MC_SITELOCAL(a6))
-		goto trynumeric;
-	if (IN6_IS_ADDR_MC_ORGLOCAL(a6))
-		goto trynumeric;
-	else
-		goto trynumeric;	/* global */
-
-	/* try to convert to a numeric id as a last resort */
-  trynumeric:
-	errno = 0;
-	lscopeid = strtoul(scope, &ep, 10);
-	*scopeid = (uint32_t)(lscopeid & 0xffffffffUL);
-	if (errno == 0 && ep && *ep == '\0' && *scopeid == lscopeid)
-		return 0;
-	else
-		return -1;
-}
-#endif
-
-/*
- * FQDN hostname, DNS lookup
- */
-static int
-explore_fqdn(const struct addrinfo *pai, const char *hostname,
-    const char *servname, struct addrinfo **res)
-{
-	struct addrinfo *result;
-	struct addrinfo *cur;
-	int error = 0;
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getaddrinfo, NULL)
-		{ NSSRC_DNS, _dns_getaddrinfo, NULL },	/* force -DHESIOD */
-		NS_NIS_CB(_yp_getaddrinfo, NULL)
-		{ 0 }
-	};
-
-	result = NULL;
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname) != 0)
-		return 0;
-
-	switch (_nsdispatch(&result, dtab, NSDB_HOSTS, "getaddrinfo",
-			default_dns_files, hostname, pai)) {
-	case NS_TRYAGAIN:
-		error = EAI_AGAIN;
-		goto free;
-	case NS_UNAVAIL:
-		error = EAI_FAIL;
-		goto free;
-	case NS_NOTFOUND:
-		error = EAI_NONAME;
-		goto free;
-	case NS_SUCCESS:
-		error = 0;
-		for (cur = result; cur; cur = cur->ai_next) {
-			GET_PORT(cur, servname);
-			/* canonname should be filled already */
-		}
-		break;
-	}
-
-	*res = result;
-
-	return 0;
-
-free:
-	if (result)
-		freeaddrinfo(result);
-	return error;
-}
-
-#ifdef DEBUG
-static const char AskedForGot[] =
-	"gethostby*.getanswer: asked for \"%s\", got \"%s\"";
-#endif
-
-static struct addrinfo *
-getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-    const struct addrinfo *pai, res_state res)
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo ai;
-	const struct afd *afd;
-	char *canonname;
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	const u_char *eom;
-	char *bp, *ep;
-	int type, class, ancount, qdcount;
-	int haveanswer, had_error;
-	char tbuf[MAXDNAME];
-	int (*name_ok)(const char *);
-	char hostbuf[8*1024];
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	canonname = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-	case T_ANY:	/*use T_ANY only for T_A/T_AAAA lookup*/
-		name_ok = res_hnok;
-		break;
-	default:
-		return (NULL);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	ep = hostbuf + sizeof hostbuf;
-	cp = answer->buf + HFIXEDSZ;
-	if (qdcount != 1) {
-		RES_SET_H_ERRNO(res, NO_RECOVERY);
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		RES_SET_H_ERRNO(res, NO_RECOVERY);
-		return (NULL);
-	}
-	cp += n + QFIXEDSZ;
-	if (qtype == T_A || qtype == T_AAAA || qtype == T_ANY) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			return (NULL);
-		}
-		canonname = bp;
-		bp += n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = canonname;
-	}
-	haveanswer = 0;
-	had_error = 0;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ + INT32SZ;	/* class, TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA || qtype == T_ANY) &&
-		    type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strlcpy(bp, tbuf, ep - bp);
-			canonname = bp;
-			bp += n;
-			continue;
-		}
-		if (qtype == T_ANY) {
-			if (!(type == T_A || type == T_AAAA)) {
-				cp += n;
-				continue;
-			}
-		} else if (type != qtype) {
-#ifdef DEBUG
-			if (type != T_KEY && type != T_SIG)
-				syslog(LOG_NOTICE|LOG_AUTH,
-	       "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
-				       qname, p_class(C_IN), p_type(qtype),
-				       p_type(type));
-#endif
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(canonname, bp) != 0) {
-#ifdef DEBUG
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, canonname, bp);
-#endif
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (type == T_A && n != INADDRSZ) {
-				cp += n;
-				continue;
-			}
-			if (type == T_AAAA && n != IN6ADDRSZ) {
-				cp += n;
-				continue;
-			}
-#ifdef FILTER_V4MAPPED
-			if (type == T_AAAA) {
-				struct in6_addr in6;
-				memcpy(&in6, cp, sizeof(in6));
-				if (IN6_IS_ADDR_V4MAPPED(&in6)) {
-					cp += n;
-					continue;
-				}
-			}
-#endif
-			if (!haveanswer) {
-				int nn;
-
-				canonname = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-			}
-
-			/* don't overwrite pai */
-			ai = *pai;
-			ai.ai_family = (type == T_A) ? AF_INET : AF_INET6;
-			afd = find_afd(ai.ai_family);
-			if (afd == NULL) {
-				cp += n;
-				continue;
-			}
-			cur->ai_next = get_ai(&ai, afd, (const char *)cp);
-			if (cur->ai_next == NULL)
-				had_error++;
-			while (cur && cur->ai_next)
-				cur = cur->ai_next;
-			cp += n;
-			break;
-		default:
-			abort();
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-#if defined(RESOLVSORT)
-		/*
-		 * We support only IPv4 address for backward
-		 * compatibility against gethostbyname(3).
-		 */
-		if (res->nsort && qtype == T_A) {
-			if (addr4sort(&sentinel, res) < 0) {
-				freeaddrinfo(sentinel.ai_next);
-				RES_SET_H_ERRNO(res, NO_RECOVERY);
-				return NULL;
-			}
-		}
-#endif /*RESOLVSORT*/
-		if (!canonname)
-			(void)get_canonname(pai, sentinel.ai_next, qname);
-		else
-			(void)get_canonname(pai, sentinel.ai_next, canonname);
-		RES_SET_H_ERRNO(res, NETDB_SUCCESS);
-		return sentinel.ai_next;
-	}
-
-	RES_SET_H_ERRNO(res, NO_RECOVERY);
-	return NULL;
-}
-
-#ifdef RESOLVSORT
-struct addr_ptr {
-	struct addrinfo *ai;
-	int aval;
-};
-
-static int
-addr4sort(struct addrinfo *sentinel, res_state res)
-{
-	struct addrinfo *ai;
-	struct addr_ptr *addrs, addr;
-	struct sockaddr_in *sin;
-	int naddrs, i, j;
-	int needsort = 0;
-
-	if (!sentinel)
-		return -1;
-	naddrs = 0;
-	for (ai = sentinel->ai_next; ai; ai = ai->ai_next)
-		naddrs++;
-	if (naddrs < 2)
-		return 0;		/* We don't need sorting. */
-	if ((addrs = malloc(sizeof(struct addr_ptr) * naddrs)) == NULL)
-		return -1;
-	i = 0;
-	for (ai = sentinel->ai_next; ai; ai = ai->ai_next) {
-		sin = (struct sockaddr_in *)ai->ai_addr;
-		for (j = 0; (unsigned)j < res->nsort; j++) {
-			if (res->sort_list[j].addr.s_addr ==
-			    (sin->sin_addr.s_addr & res->sort_list[j].mask))
-				break;
-		}
-		addrs[i].ai = ai;
-		addrs[i].aval = j;
-		if (needsort == 0 && i > 0 && j < addrs[i - 1].aval)
-			needsort = i;
-		i++;
-	}
-	if (!needsort) {
-		free(addrs);
-		return 0;
-	}
-
-	while (needsort < naddrs) {
-		for (j = needsort - 1; j >= 0; j--) {
-			if (addrs[j].aval > addrs[j+1].aval) {
-				addr = addrs[j];
-				addrs[j] = addrs[j + 1];
-				addrs[j + 1] = addr;
-			} else
-				break;
-		}
-		needsort++;
-	}
-
-	ai = sentinel;
-	for (i = 0; i < naddrs; ++i) {
-		ai->ai_next = addrs[i].ai;
-		ai = ai->ai_next;
-	}
-	ai->ai_next = NULL;
-	free(addrs);
-	return 0;
-}
-#endif /*RESOLVSORT*/
-
-/*ARGSUSED*/
-static int
-_dns_getaddrinfo(void *rv, void *cb_data, va_list ap)
-{
-	struct addrinfo *ai;
-	querybuf *buf, *buf2;
-	const char *hostname;
-	const struct addrinfo *pai;
-	struct addrinfo sentinel, *cur;
-	struct res_target q, q2;
-	res_state res;
-
-	hostname = va_arg(ap, char *);
-	pai = va_arg(ap, const struct addrinfo *);
-
-	memset(&q, 0, sizeof(q2));
-	memset(&q2, 0, sizeof(q2));
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	buf = malloc(sizeof(*buf));
-	if (!buf) {
-		RES_SET_H_ERRNO(res, NETDB_INTERNAL);
-		return NS_NOTFOUND;
-	}
-	buf2 = malloc(sizeof(*buf2));
-	if (!buf2) {
-		free(buf);
-		RES_SET_H_ERRNO(res, NETDB_INTERNAL);
-		return NS_NOTFOUND;
-	}
-
-	switch (pai->ai_family) {
-	case AF_UNSPEC:
-		q.name = hostname;
-		q.qclass = C_IN;
-		q.qtype = T_A;
-		q.answer = buf->buf;
-		q.anslen = sizeof(buf->buf);
-		q.next = &q2;
-		q2.name = hostname;
-		q2.qclass = C_IN;
-		q2.qtype = T_AAAA;
-		q2.answer = buf2->buf;
-		q2.anslen = sizeof(buf2->buf);
-		break;
-	case AF_INET:
-		q.name = hostname;
-		q.qclass = C_IN;
-		q.qtype = T_A;
-		q.answer = buf->buf;
-		q.anslen = sizeof(buf->buf);
-		break;
-	case AF_INET6:
-		q.name = hostname;
-		q.qclass = C_IN;
-		q.qtype = T_AAAA;
-		q.answer = buf->buf;
-		q.anslen = sizeof(buf->buf);
-		break;
-	default:
-		free(buf);
-		free(buf2);
-		return NS_UNAVAIL;
-	}
-
-	res = __res_state();
-	if ((res->options & RES_INIT) == 0 && res_ninit(res) == -1) {
-		RES_SET_H_ERRNO(res, NETDB_INTERNAL);
-		free(buf);
-		free(buf2);
-		return NS_NOTFOUND;
-	}
-
-	if (res_searchN(hostname, &q, res) < 0) {
-		free(buf);
-		free(buf2);
-		return NS_NOTFOUND;
-	}
-	/* prefer IPv6 */
-	if (q.next) {
-		ai = getanswer(buf2, q2.n, q2.name, q2.qtype, pai, res);
-		if (ai) {
-			cur->ai_next = ai;
-			while (cur && cur->ai_next)
-				cur = cur->ai_next;
-		}
-	}
-	ai = getanswer(buf, q.n, q.name, q.qtype, pai, res);
-	if (ai)
-		cur->ai_next = ai;
-	free(buf);
-	free(buf2);
-	if (sentinel.ai_next == NULL)
-		switch (res->res_h_errno) {
-		case HOST_NOT_FOUND:
-			return NS_NOTFOUND;
-		case TRY_AGAIN:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	return NS_SUCCESS;
-}
-
-static void
-_sethtent(FILE **hostf)
-{
-	if (!*hostf)
-		*hostf = fopen(_PATH_HOSTS, "r");
-	else
-		rewind(*hostf);
-}
-
-static void
-_endhtent(FILE **hostf)
-{
-	if (*hostf) {
-		(void) fclose(*hostf);
-		*hostf = NULL;
-	}
-}
-
-static struct addrinfo *
-_gethtent(FILE **hostf, const char *name, const struct addrinfo *pai)
-{
-	char *p;
-	char *cp, *tname, *cname;
-	struct addrinfo hints, *res0, *res;
-	int error;
-	const char *addr;
-	char hostbuf[8*1024];
-
-	if (!*hostf && !(*hostf = fopen(_PATH_HOSTS, "r")))
-		return (NULL);
-again:
-	if (!(p = fgets(hostbuf, sizeof hostbuf, *hostf)))
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-	addr = p;
-	cname = NULL;
-	/* if this is not something we're looking for, skip it. */
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		tname = cp;
-		if (cname == NULL)
-			cname = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-		if (strcasecmp(name, tname) == 0)
-			goto found;
-	}
-	goto again;
-
-found:
-	/* we should not glob socktype/protocol here */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = pai->ai_family;
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_protocol = 0;
-	hints.ai_flags = AI_NUMERICHOST;
-	error = getaddrinfo(addr, "0", &hints, &res0);
-	if (error)
-		goto again;
-#ifdef FILTER_V4MAPPED
-	/* XXX should check all items in the chain */
-	if (res0->ai_family == AF_INET6 &&
-	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)res0->ai_addr)->sin6_addr)) {
-		freeaddrinfo(res0);
-		goto again;
-	}
-#endif
-	for (res = res0; res; res = res->ai_next) {
-		/* cover it up */
-		res->ai_flags = pai->ai_flags;
-		res->ai_socktype = pai->ai_socktype;
-		res->ai_protocol = pai->ai_protocol;
-
-		if (pai->ai_flags & AI_CANONNAME) {
-			if (get_canonname(pai, res, cname) != 0) {
-				freeaddrinfo(res0);
-				goto again;
-			}
-		}
-	}
-	return res0;
-}
-
-/*ARGSUSED*/
-static int
-_files_getaddrinfo(void *rv, void *cb_data, va_list ap)
-{
-	const char *name;
-	const struct addrinfo *pai;
-	struct addrinfo sentinel, *cur;
-	struct addrinfo *p;
-	FILE *hostf = NULL;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, struct addrinfo *);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	_sethtent(&hostf);
-	while ((p = _gethtent(&hostf, name, pai)) != NULL) {
-		cur->ai_next = p;
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-	_endhtent(&hostf);
-
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	if (sentinel.ai_next == NULL)
-		return NS_NOTFOUND;
-	return NS_SUCCESS;
-}
-
-#ifdef YP
-/*ARGSUSED*/
-static struct addrinfo *
-_yphostent(char *line, const struct addrinfo *pai)
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo hints, *res, *res0;
-	int error;
-	char *p = line;
-	const char *addr, *canonname;
-	char *nextline;
-	char *cp;
-
-	addr = canonname = NULL;
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-nextline:
-	/* terminate line */
-	cp = strchr(p, '\n');
-	if (cp) {
-		*cp++ = '\0';
-		nextline = cp;
-	} else
-		nextline = NULL;
-
-	cp = strpbrk(p, " \t");
-	if (cp == NULL) {
-		if (canonname == NULL)
-			return (NULL);
-		else
-			goto done;
-	}
-	*cp++ = '\0';
-
-	addr = p;
-
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (!canonname)
-			canonname = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-	}
-
-	hints = *pai;
-	hints.ai_flags = AI_NUMERICHOST;
-	error = getaddrinfo(addr, NULL, &hints, &res0);
-	if (error == 0) {
-		for (res = res0; res; res = res->ai_next) {
-			/* cover it up */
-			res->ai_flags = pai->ai_flags;
-
-			if (pai->ai_flags & AI_CANONNAME)
-				(void)get_canonname(pai, res, canonname);
-		}
-	} else
-		res0 = NULL;
-	if (res0) {
-		cur->ai_next = res0;
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	if (nextline) {
-		p = nextline;
-		goto nextline;
-	}
-
-done:
-	return sentinel.ai_next;
-}
-
-/*ARGSUSED*/
-static int
-_yp_getaddrinfo(void *rv, void *cb_data, va_list ap)
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo *ai = NULL;
-	char *ypbuf;
-	int ypbuflen, r;
-	const char *name;
-	const struct addrinfo *pai;
-	char *ypdomain;
-
-	if (_yp_check(&ypdomain) == 0)
-		return NS_UNAVAIL;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, const struct addrinfo *);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	/* hosts.byname is only for IPv4 (Solaris8) */
-	if (pai->ai_family == PF_UNSPEC || pai->ai_family == PF_INET) {
-		r = yp_match(ypdomain, "hosts.byname", name,
-			(int)strlen(name), &ypbuf, &ypbuflen);
-		if (r == 0) {
-			struct addrinfo ai4;
-
-			ai4 = *pai;
-			ai4.ai_family = AF_INET;
-			ai = _yphostent(ypbuf, &ai4);
-			if (ai) {
-				cur->ai_next = ai;
-				while (cur && cur->ai_next)
-					cur = cur->ai_next;
-			}
-			free(ypbuf);
-		}
-	}
-
-	/* ipnodes.byname can hold both IPv4/v6 */
-	r = yp_match(ypdomain, "ipnodes.byname", name,
-		(int)strlen(name), &ypbuf, &ypbuflen);
-	if (r == 0) {
-		ai = _yphostent(ypbuf, pai);
-		if (ai)
-			cur->ai_next = ai;
-		free(ypbuf);
-	}
-
-	if (sentinel.ai_next == NULL) {
-		RES_SET_H_ERRNO(__res_state(), HOST_NOT_FOUND);
-		return NS_NOTFOUND;
-	}
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	return NS_SUCCESS;
-}
-#endif
-
-/* resolver logic */
-
-/*
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in h_errno.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-static int
-res_queryN(const char *name, struct res_target *target, res_state res)
-{
-	u_char *buf;
-	HEADER *hp;
-	int n;
-	u_int oflags;
-	struct res_target *t;
-	int rcode;
-	int ancount;
-
-	rcode = NOERROR;
-	ancount = 0;
-
-	buf = malloc(MAXPACKET);
-	if (!buf) {
-		RES_SET_H_ERRNO(res, NETDB_INTERNAL);
-		return -1;
-	}
-
-	for (t = target; t; t = t->next) {
-		int class, type;
-		u_char *answer;
-		int anslen;
-
-		hp = (HEADER *)(void *)t->answer;
-
-		/* make it easier... */
-		class = t->qclass;
-		type = t->qtype;
-		answer = t->answer;
-		anslen = t->anslen;
-
-		oflags = res->_flags;
-
-again:
-		hp->rcode = NOERROR;	/* default */
-
-#ifdef DEBUG
-		if (res->options & RES_DEBUG)
-			printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-		n = res_nmkquery(res, QUERY, name, class, type, NULL, 0, NULL,
-		    buf, MAXPACKET);
-		if (n > 0 && (res->_flags & RES_F_EDNS0ERR) == 0 &&
-		    (res->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U)
-			n = res_nopt(res, n, buf, MAXPACKET, anslen);
-		if (n <= 0) {
-#ifdef DEBUG
-			if (res->options & RES_DEBUG)
-				printf(";; res_query: mkquery failed\n");
-#endif
-			free(buf);
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			return (n);
-		}
-		n = res_nsend(res, buf, n, answer, anslen);
-		if (n < 0) {
-			/*
-			 * if the query choked with EDNS0, retry
-			 * without EDNS0
-			 */
-			if ((res->options & (RES_USE_EDNS0|RES_USE_DNSSEC))
-			    != 0U &&
-			    ((oflags ^ res->_flags) & RES_F_EDNS0ERR) != 0) {
-				res->_flags |= RES_F_EDNS0ERR;
-				if (res->options & RES_DEBUG)
-					printf(";; res_nquery: retry without EDNS0\n");
-				goto again;
-			}
-			rcode = hp->rcode;	/* record most recent error */
-#ifdef DEBUG
-			if (res->options & RES_DEBUG)
-				printf(";; res_query: send error\n");
-#endif
-			continue;
-		}
-
-		if (n > anslen)
-			hp->rcode = FORMERR; /* XXX not very informative */
-		if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-			rcode = hp->rcode;	/* record most recent error */
-#ifdef DEBUG
-			if (res->options & RES_DEBUG)
-				printf(";; rcode = %u, ancount=%u\n", hp->rcode,
-				    ntohs(hp->ancount));
-#endif
-			continue;
-		}
-
-		ancount += ntohs(hp->ancount);
-
-		t->n = n;
-	}
-
-	free(buf);
-
-	if (ancount == 0) {
-		switch (rcode) {
-		case NXDOMAIN:
-			RES_SET_H_ERRNO(res, HOST_NOT_FOUND);
-			break;
-		case SERVFAIL:
-			RES_SET_H_ERRNO(res, TRY_AGAIN);
-			break;
-		case NOERROR:
-			RES_SET_H_ERRNO(res, NO_DATA);
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			break;
-		}
-		return (-1);
-	}
-	return (ancount);
-}
-
-/*
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in h_errno.
- */
-static int
-res_searchN(const char *name, struct res_target *target, res_state res)
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *)(void *)target->answer;	/*XXX*/
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, root_on_list = 0;
-	int tried_as_is = 0;
-	int searched = 0;
-	char abuf[MAXDNAME];
-
-	errno = 0;
-	RES_SET_H_ERRNO(res, HOST_NOT_FOUND); /* default, if we never query */
-	dots = 0;
-	for (cp = name; *cp; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias
-	 */
-	if (!dots &&
-	    (cp = res_hostalias(res, name, abuf, sizeof(abuf))) != NULL)
-		return (res_queryN(cp, target, res));
-
-	/*
-	 * If there are enough dots in the name, let's just give it a
-	 * try 'as is'. The threshold can be set with the "ndots" option.
-	 * Also, query 'as is', if there is a trailing dot in the name.
-	 */
-	saved_herrno = -1;
-	if (dots >= res->ndots || trailing_dot) {
-		ret = res_querydomainN(name, NULL, target, res);
-		if (ret > 0 || trailing_dot)
-			return (ret);
-		if (errno == ECONNREFUSED) {
-			RES_SET_H_ERRNO(res, TRY_AGAIN);
-			return (-1);
-		}
-		switch (res->res_h_errno) {
-		case NO_DATA:
-		case HOST_NOT_FOUND:
-			break;
-		case TRY_AGAIN:
-			if (hp->rcode == SERVFAIL)
-				break;
-			/* FALLTHROUGH */
-		default:
-			return (-1);
-		}
-		saved_herrno = res->res_h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (res->options & RES_DEFNAMES)) ||
-	    (dots && !trailing_dot && (res->options & RES_DNSRCH))) {
-		int done = 0;
-
-		for (domain = (const char * const *)res->dnsrch;
-		   *domain && !done;
-		   domain++) {
-			searched = 1;
-
-			if (domain[0][0] == '\0' ||
-			    (domain[0][0] == '.' && domain[0][1] == '\0'))
-				root_on_list++;
-
-			if (root_on_list && tried_as_is)
-				continue;
-
-			ret = res_querydomainN(name, *domain, target, res);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				RES_SET_H_ERRNO(res, TRY_AGAIN);
-				return (-1);
-			}
-
-			switch (res->res_h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				got_servfail++;
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-			/*
-			 * if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if (!(res->options & RES_DNSRCH))
-			        done++;
-		}
-	}
-
-	switch (res->res_h_errno) {
-	case NO_DATA:
-	case HOST_NOT_FOUND:
-		break;
-	case TRY_AGAIN:
-		if (hp->rcode == SERVFAIL)
-			break;
-		/* FALLTHROUGH */
-	default:
-		goto giveup;
-	}
-
-	/*
-	 * If the query has not already been tried as is then try it
-	 * unless RES_NOTLDQUERY is set and there were no dots.
-	 */
-	if ((dots || !searched || !(res->options & RES_NOTLDQUERY)) &&
-	    !(tried_as_is || root_on_list)) {
-		ret = res_querydomainN(name, NULL, target, res);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/*
-	 * if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's h_errno
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless h_errno, that being the one from
-	 * the last DNSRCH we did.
-	 */
-giveup:
-	if (saved_herrno != -1)
-		RES_SET_H_ERRNO(res, saved_herrno);
-	else if (got_nodata)
-		RES_SET_H_ERRNO(res, NO_DATA);
-	else if (got_servfail)
-		RES_SET_H_ERRNO(res, TRY_AGAIN);
-	return (-1);
-}
-
-/*
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-static int
-res_querydomainN(const char *name, const char *domain,
-    struct res_target *target, res_state res)
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	size_t n, d;
-
-#ifdef DEBUG
-	if (res->options & RES_DEBUG)
-		printf(";; res_querydomain(%s, %s)\n",
-			name, domain?domain:"<Nil>");
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			return (-1);
-		}
-		if (n > 0 && name[--n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			return (-1);
-		}
-		snprintf(nbuf, sizeof(nbuf), "%s.%s", name, domain);
-	}
-	return (res_queryN(longname, target, res));
-}
diff --git a/lib/libc/net/gethostbydns.c b/lib/libc/net/gethostbydns.c
deleted file mode 100644
index 5c3d578..0000000
--- a/lib/libc/net/gethostbydns.c
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <syslog.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-
-#include "netdb_private.h"
-#include "res_config.h"
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-static const char AskedForGot[] =
-		"gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";
-
-#ifdef RESOLVSORT
-static void addrsort(char **, int, res_state);
-#endif
-
-#ifdef DEBUG
-static void dprintf(char *, int, res_state) __printflike(1, 0);
-#endif
-
-#define MAXPACKET	(64*1024)
-
-typedef union {
-    HEADER hdr;
-    u_char buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-    int32_t al;
-    char ac;
-} align;
-
-int _dns_ttl_;
-
-#ifdef DEBUG
-static void
-dprintf(msg, num, res)
-	char *msg;
-	int num;
-	res_state res;
-{
-	if (res->options & RES_DEBUG) {
-		int save = errno;
-
-		printf(msg, num);
-		errno = save;
-	}
-}
-#else
-# define dprintf(msg, num, res) /*nada*/
-#endif
-
-#define BOUNDED_INCR(x) \
-	do { \
-		cp += x; \
-		if (cp > eom) { \
-			RES_SET_H_ERRNO(statp, NO_RECOVERY); \
-			return (-1); \
-		} \
-	} while (0)
-
-#define BOUNDS_CHECK(ptr, count) \
-	do { \
-		if ((ptr) + (count) > eom) { \
-			RES_SET_H_ERRNO(statp, NO_RECOVERY); \
-			return (-1); \
-		} \
-	} while (0)
-
-static int
-gethostanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-    struct hostent *he, struct hostent_data *hed, res_state statp)
-{
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	const u_char *eom, *erdata;
-	char *bp, *ep, **ap, **hap;
-	int type, class, ancount, qdcount;
-	int haveanswer, had_error;
-	int toobig = 0;
-	char tbuf[MAXDNAME];
-	const char *tname;
-	int (*name_ok)(const char *);
-
-	tname = qname;
-	he->h_name = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-		name_ok = res_hnok;
-		break;
-	case T_PTR:
-		name_ok = res_dnok;
-		break;
-	default:
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hed->hostbuf;
-	ep = hed->hostbuf + sizeof hed->hostbuf;
-	cp = answer->buf;
-	BOUNDED_INCR(HFIXEDSZ);
-	if (qdcount != 1) {
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);
-	}
-	BOUNDED_INCR(n + QFIXEDSZ);
-	if (qtype == T_A || qtype == T_AAAA) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-		}
-		he->h_name = bp;
-		bp += n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = he->h_name;
-	}
-	ap = hed->host_aliases;
-	*ap = NULL;
-	he->h_aliases = hed->host_aliases;
-	hap = hed->h_addr_ptrs;
-	*hap = NULL;
-	he->h_addr_list = hed->h_addr_ptrs;
-	haveanswer = 0;
-	had_error = 0;
-	_dns_ttl_ = -1;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ;			/* class */
-		if (qtype == T_A  && type == T_A)
-			_dns_ttl_ = _getlong(cp);
-		cp += INT32SZ;			/* TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		BOUNDS_CHECK(cp, n);
-		erdata = cp + n;
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
-			if (ap >= &hed->host_aliases[_MAXALIASES-1])
-				continue;
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				RES_SET_H_ERRNO(statp, NO_RECOVERY);
-				return (-1);
-			}
-			/* Store alias. */
-			*ap++ = bp;
-			n = strlen(bp) + 1;	/* for the \0 */
-			if (n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			bp += n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			he->h_name = bp;
-			bp += n;
-			continue;
-		}
-		if (qtype == T_PTR && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if (n < 0 || !res_dnok(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				RES_SET_H_ERRNO(statp, NO_RECOVERY);
-				return (-1);
-			}
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			tname = bp;
-			bp += n;
-			continue;
-		}
-		if (type != qtype) {
-			if (type != T_SIG)
-				syslog(LOG_NOTICE|LOG_AUTH,
-	"gethostby*.gethostanswer: asked for \"%s %s %s\", got type \"%s\"",
-				       qname, p_class(C_IN), p_type(qtype),
-				       p_type(type));
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_PTR:
-			if (strcasecmp(tname, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, qname, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-			if ((n < 0) || !res_hnok(bp)) {
-				had_error++;
-				break;
-			}
-#if MULTI_PTRS_ARE_ALIASES
-			cp += n;
-			if (cp != erdata) {
-				RES_SET_H_ERRNO(statp, NO_RECOVERY);
-				return (-1);
-			}
-			if (!haveanswer)
-				he->h_name = bp;
-			else if (ap < &hed->host_aliases[_MAXALIASES-1])
-				*ap++ = bp;
-			else
-				n = -1;
-			if (n != -1) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-			}
-			break;
-#else
-			he->h_name = bp;
-			if (statp->options & RES_USE_INET6) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				_map_v4v6_hostent(he, &bp, ep);
-			}
-			RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-			return (0);
-#endif
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(he->h_name, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, he->h_name, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (n != he->h_length) {
-				cp += n;
-				continue;
-			}
-			if (!haveanswer) {
-				int nn;
-
-				he->h_name = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-			}
-
-			bp += sizeof(align) - ((u_long)bp % sizeof(align));
-
-			if (bp + n >= ep) {
-				dprintf("size (%d) too big\n", n, statp);
-				had_error++;
-				continue;
-			}
-			if (hap >= &hed->h_addr_ptrs[_MAXADDRS-1]) {
-				if (!toobig++)
-					dprintf("Too many addresses (%d)\n",
-						_MAXADDRS, statp);
-				cp += n;
-				continue;
-			}
-			memcpy(*hap++ = bp, cp, n);
-			bp += n;
-			cp += n;
-			if (cp != erdata) {
-				RES_SET_H_ERRNO(statp, NO_RECOVERY);
-				return (-1);
-			}
-			break;
-		default:
-			dprintf("Impossible condition (type=%d)\n", type,
-			    statp);
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-			/* BIND has abort() here, too risky on bad data */
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		*hap = NULL;
-# if defined(RESOLVSORT)
-		/*
-		 * Note: we sort even if host can take only one address
-		 * in its return structures - should give it the "best"
-		 * address in that case, not some random one
-		 */
-		if (statp->nsort && haveanswer > 1 && qtype == T_A)
-			addrsort(hed->h_addr_ptrs, haveanswer, statp);
-# endif /*RESOLVSORT*/
-		if (!he->h_name) {
-			n = strlen(qname) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN)
-				goto no_recovery;
-			strcpy(bp, qname);
-			he->h_name = bp;
-			bp += n;
-		}
-		if (statp->options & RES_USE_INET6)
-			_map_v4v6_hostent(he, &bp, ep);
-		RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-		return (0);
-	}
- no_recovery:
-	RES_SET_H_ERRNO(statp, NO_RECOVERY);
-	return (-1);
-}
-
-/* XXX: for async DNS resolver in ypserv */
-struct hostent *
-__dns_getanswer(const char *answer, int anslen, const char *qname, int qtype)
-{
-	struct hostent *he;
-	struct hostent_data *hed;
-	int error;
-	res_state statp;
-
-	statp = __res_state();
-	if ((he = __hostent_init()) == NULL ||
-	    (hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (NULL);
-	}
-	switch (qtype) {
-	case T_AAAA:
-		he->h_addrtype = AF_INET6;
-		he->h_length = NS_IN6ADDRSZ;
-		break;
-	case T_A:
-	default:
-		he->h_addrtype = AF_INET;
-		he->h_length = NS_INADDRSZ;
-		break;
-	}
-
-	error = gethostanswer((const querybuf *)answer, anslen, qname, qtype,
-	    he, hed, statp);
-	return (error == 0) ? he : NULL;
-}
-
-int
-_dns_gethostbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	querybuf *buf;
-	int n, type, error;
-	res_state statp;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	he.h_addrtype = af;
-	switch (af) {
-	case AF_INET:
-		he.h_length = NS_INADDRSZ;
-		type = T_A;
-		break;
-	case AF_INET6:
-		he.h_length = NS_IN6ADDRSZ;
-		type = T_AAAA;
-		break;
-	default:
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		errno = EAFNOSUPPORT;
-		return (NS_UNAVAIL);
-	}
-
-	if ((buf = malloc(sizeof(*buf))) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	n = res_nsearch(statp, name, C_IN, type, buf->buf, sizeof(buf->buf));
-	if (n < 0) {
-		free(buf);
-		dprintf("res_nsearch failed (%d)\n", n, statp);
-		*h_errnop = statp->res_h_errno;
-		return (0);
-	} else if (n > sizeof(buf->buf)) {
-		free(buf);
-		dprintf("static buffer is too small (%d)\n", n, statp);
-		*h_errnop = statp->res_h_errno;
-		return (0);
-	}
-	error = gethostanswer(buf, n, name, type, &he, hed, statp);
-	free(buf);
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-}
-
-int
-_dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	socklen_t len;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	const u_char *uaddr;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	int n;
-	querybuf *buf;
-	char qbuf[MAXDNAME+1], *qp;
-	res_state statp;
-#ifdef SUNSECURITY
-	struct hostdata rhd;
-	struct hostent *rhe;
-	char **haddr;
-	u_long old_options;
-	char hname2[MAXDNAME+1], numaddr[46];
-	int ret_h_error;
-#endif /*SUNSECURITY*/
-
-	addr = va_arg(ap, const void *);
-	len = va_arg(ap, socklen_t);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-	uaddr = (const u_char *)addr;
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	switch (af) {
-	case AF_INET:
-		(void) sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
-			       (uaddr[3] & 0xff),
-			       (uaddr[2] & 0xff),
-			       (uaddr[1] & 0xff),
-			       (uaddr[0] & 0xff));
-		break;
-	case AF_INET6:
-		qp = qbuf;
-		for (n = NS_IN6ADDRSZ - 1; n >= 0; n--) {
-			qp += SPRINTF((qp, "%x.%x.",
-				       uaddr[n] & 0xf,
-				       (uaddr[n] >> 4) & 0xf));
-		}
-		strlcat(qbuf, "ip6.arpa", sizeof(qbuf));
-		break;
-	default:
-		abort();
-	}
-	if ((buf = malloc(sizeof(*buf))) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return NS_NOTFOUND;
-	}
-	n = res_nquery(statp, qbuf, C_IN, T_PTR, (u_char *)buf->buf,
-	    sizeof buf->buf);
-	if (n < 0) {
-		free(buf);
-		dprintf("res_nquery failed (%d)\n", n, statp);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	if (n > sizeof buf->buf) {
-		free(buf);
-		dprintf("static buffer is too small (%d)\n", n, statp);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	if (gethostanswer(buf, n, qbuf, T_PTR, &he, hed, statp) != 0) {
-		free(buf);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);	/* h_errno was set by gethostanswer() */
-	}
-	free(buf);
-#ifdef SUNSECURITY
-	if (af == AF_INET) {
-	    /*
-	     * turn off search as the name should be absolute,
-	     * 'localhost' should be matched by defnames
-	     */
-	    strncpy(hname2, he.h_name, MAXDNAME);
-	    hname2[MAXDNAME] = '\0';
-	    old_options = statp->options;
-	    statp->options &= ~RES_DNSRCH;
-	    statp->options |= RES_DEFNAMES;
-	    memset(&rhd, 0, sizeof rhd);
-	    rhe = gethostbyname_r(hname2, &rhd.host, &rhd.data,
-	        sizeof(rhd.data), &ret_h_error);
-	    if (rhe == NULL) {
-		if (inet_ntop(af, addr, numaddr, sizeof(numaddr)) == NULL)
-		    strlcpy(numaddr, "UNKNOWN", sizeof(numaddr));
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: No A record for %s (verifying [%s])",
-		       hname2, numaddr);
-		statp->options = old_options;
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	    }
-	    statp->options = old_options;
-	    for (haddr = rhe->h_addr_list; *haddr; haddr++)
-		if (!memcmp(*haddr, addr, NS_INADDRSZ))
-			break;
-	    if (!*haddr) {
-		if (inet_ntop(af, addr, numaddr, sizeof(numaddr)) == NULL)
-		    strlcpy(numaddr, "UNKNOWN", sizeof(numaddr));
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: A record of %s != PTR record [%s]",
-		       hname2, numaddr);
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	    }
-	}
-#endif /*SUNSECURITY*/
-	he.h_addrtype = af;
-	he.h_length = len;
-	memcpy(hed->host_addr, uaddr, len);
-	hed->h_addr_ptrs[0] = (char *)hed->host_addr;
-	hed->h_addr_ptrs[1] = NULL;
-	if (af == AF_INET && (statp->options & RES_USE_INET6)) {
-		_map_v4v6_address((char*)hed->host_addr, (char*)hed->host_addr);
-		he.h_addrtype = AF_INET6;
-		he.h_length = NS_IN6ADDRSZ;
-	}
-	RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-}
-
-#ifdef RESOLVSORT
-static void
-addrsort(char **ap, int num, res_state res)
-{
-	int i, j;
-	char **p;
-	short aval[_MAXADDRS];
-	int needsort = 0;
-
-	p = ap;
-	for (i = 0; i < num; i++, p++) {
-	    for (j = 0 ; (unsigned)j < res->nsort; j++)
-		if (res->sort_list[j].addr.s_addr == 
-		    (((struct in_addr *)(*p))->s_addr & res->sort_list[j].mask))
-			break;
-	    aval[i] = j;
-	    if (needsort == 0 && i > 0 && j < aval[i-1])
-		needsort = i;
-	}
-	if (!needsort)
-	    return;
-
-	while (needsort < num) {
-	    for (j = needsort - 1; j >= 0; j--) {
-		if (aval[j] > aval[j+1]) {
-		    char *hp;
-
-		    i = aval[j];
-		    aval[j] = aval[j+1];
-		    aval[j+1] = i;
-
-		    hp = ap[j];
-		    ap[j] = ap[j+1];
-		    ap[j+1] = hp;
-
-		} else
-		    break;
-	    }
-	    needsort++;
-	}
-}
-#endif
-
-void
-_sethostdnsent(int stayopen)
-{
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1)
-		return;
-	if (stayopen)
-		statp->options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endhostdnsent()
-{
-	res_state statp;
-
-	statp = __res_state();
-	statp->options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_nclose(statp);
-}
diff --git a/lib/libc/net/gethostbyht.c b/lib/libc/net/gethostbyht.c
deleted file mode 100644
index b3ea443..0000000
--- a/lib/libc/net/gethostbyht.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <arpa/nameser.h>	/* XXX */
-#include <resolv.h>		/* XXX */
-#include "netdb_private.h"
-
-void
-_sethosthtent(int f, struct hostent_data *hed)
-{
-	if (!hed->hostf)
-		hed->hostf = fopen(_PATH_HOSTS, "r");
-	else
-		rewind(hed->hostf);
-	hed->stayopen = f;
-}
-
-void
-_endhosthtent(struct hostent_data *hed)
-{
-	if (hed->hostf && !hed->stayopen) {
-		(void) fclose(hed->hostf);
-		hed->hostf = NULL;
-	}
-}
-
-static int
-gethostent_p(struct hostent *he, struct hostent_data *hed, int mapped,
-    res_state statp)
-{
-	char *p, *bp, *ep;
-	char *cp, **q;
-	int af, len;
-	char hostbuf[BUFSIZ + 1];
-
-	if (!hed->hostf && !(hed->hostf = fopen(_PATH_HOSTS, "r"))) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
- again:
-	if (!(p = fgets(hostbuf, sizeof hostbuf, hed->hostf))) {
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		return (-1);
-	}
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-	if (inet_pton(AF_INET6, p, hed->host_addr) > 0) {
-		af = AF_INET6;
-		len = IN6ADDRSZ;
-	} else if (inet_pton(AF_INET, p, hed->host_addr) > 0) {
-		if (mapped) {
-			_map_v4v6_address((char *)hed->host_addr,
-			    (char *)hed->host_addr);
-			af = AF_INET6;
-			len = IN6ADDRSZ;
-		} else {
-			af = AF_INET;
-			len = INADDRSZ;
-		}
-	} else {
-		goto again;
-	}
-	hed->h_addr_ptrs[0] = (char *)hed->host_addr;
-	hed->h_addr_ptrs[1] = NULL;
-	he->h_addr_list = hed->h_addr_ptrs;
-	he->h_length = len;
-	he->h_addrtype = af;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	bp = hed->hostbuf;
-	ep = hed->hostbuf + sizeof hed->hostbuf;
-	he->h_name = bp;
-	q = he->h_aliases = hed->host_aliases;
-	if ((p = strpbrk(cp, " \t")) != NULL)
-		*p++ = '\0';
-	len = strlen(cp) + 1;
-	if (ep - bp < len) {
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);
-	}
-	strlcpy(bp, cp, ep - bp);
-	bp += len;
-	cp = p;
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q >= &hed->host_aliases[_MAXALIASES - 1])
-			break;
-		if ((p = strpbrk(cp, " \t")) != NULL)
-			*p++ = '\0';
-		len = strlen(cp) + 1;
-		if (ep - bp < len)
-			break;
-		strlcpy(bp, cp, ep - bp);
-		*q++ = bp;
-		bp += len;
-		cp = p;
-	}
-	*q = NULL;
-	RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-	return (0);
-}
-
-int
-gethostent_r(struct hostent *hptr, char *buffer, size_t buflen,
-    struct hostent **result, int *h_errnop)
-{
-	struct hostent_data *hed;
-	struct hostent he;
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-	if (gethostent_p(&he, hed, statp->options & RES_USE_INET6, statp) != 0)
-		return (-1);
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0)
-		return (-1);
-	*result = hptr;
-	return (0);
-}
-
-struct hostent *
-gethostent(void)
-{
-	struct hostdata *hd;
-	struct hostent *rval;
-	int ret_h_errno;
-
-	if ((hd = __hostdata_init()) == NULL)
-		return (NULL);
-	if (gethostent_r(&hd->host, hd->data, sizeof(hd->data), &rval,
-	    &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-int
-_ht_gethostbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	char **cp;
-	res_state statp;
-	int error;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	_sethosthtent(0, hed);
-	while ((error = gethostent_p(&he, hed, 0, statp)) == 0) {
-		if (he.h_addrtype != af)
-			continue;
-		if (he.h_addrtype == AF_INET &&
-		    statp->options & RES_USE_INET6) {
-			_map_v4v6_address(he.h_addr, he.h_addr);
-			he.h_length = IN6ADDRSZ;
-			he.h_addrtype = AF_INET6;
-		}
-		if (strcasecmp(he.h_name, name) == 0)
-			break;
-		for (cp = he.h_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	_endhosthtent(hed);
-
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-}
-
-int
-_ht_gethostbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	socklen_t len;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	res_state statp;
-	int error;
-
-	addr = va_arg(ap, const void *);
-	len = va_arg(ap, socklen_t);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	_sethosthtent(0, hed);
-	while ((error = gethostent_p(&he, hed, 0, statp)) == 0)
-		if (he.h_addrtype == af && !bcmp(he.h_addr, addr, len)) {
-			if (he.h_addrtype == AF_INET &&
-			    statp->options & RES_USE_INET6) {
-				_map_v4v6_address(he.h_addr, he.h_addr);
-				he.h_length = IN6ADDRSZ;
-				he.h_addrtype = AF_INET6;
-			}
-			break;
-		}
-	_endhosthtent(hed);
-
-	if (error != 0)
-		return (NS_NOTFOUND);
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-}
diff --git a/lib/libc/net/gethostbynis.c b/lib/libc/net/gethostbynis.c
deleted file mode 100644
index 4f1cf42..0000000
--- a/lib/libc/net/gethostbynis.c
+++ /dev/null
@@ -1,347 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <resolv.h>		/* XXX */
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include "netdb_private.h"
-
-#ifdef YP
-static int
-_gethostbynis(const char *name, char *map, int af, struct hostent *he,
-    struct hostent_data *hed)
-{
-	char *p, *bp, *ep;
-	char *cp, **q;
-	char *result;
-	int resultlen, size, addrok = 0;
-	char ypbuf[YPMAXRECORD + 2];
-	res_state statp;
-
-	statp = __res_state();
-	switch(af) {
-	case AF_INET:
-		size = NS_INADDRSZ;
-		break;
-	case AF_INET6:
-		size = NS_IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	if (hed->yp_domain == (char *)NULL)
-		if (yp_get_default_domain (&hed->yp_domain)) {
-			RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-			return (-1);
-		}
-
-	if (yp_match(hed->yp_domain, map, name, strlen(name), &result,
-	    &resultlen)) {
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		return (-1);
-	}
-
-	/* avoid potential memory leak */
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	he->h_addr_list = hed->h_addr_ptrs;
-	he->h_addr = (char *)hed->host_addr;
-	switch (af) {
-	case AF_INET:
-		addrok = inet_aton(result, (struct in_addr *)hed->host_addr);
-		if (addrok != 1)
-			break;
-		if (statp->options & RES_USE_INET6) {
-			_map_v4v6_address((char *)hed->host_addr,
-			    (char *)hed->host_addr);
-			af = AF_INET6;
-			size = NS_IN6ADDRSZ;
-		}
-		break;
-	case AF_INET6:
-		addrok = inet_pton(af, result, hed->host_addr);
-		break;
-	}
-	if (addrok != 1) {
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		return (-1);
-	}
-	he->h_addr_list[1] = NULL;
-	he->h_length = size;
-	he->h_addrtype = af;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	bp = hed->hostbuf;
-	ep = hed->hostbuf + sizeof hed->hostbuf;
-	he->h_name = bp;
-	q = he->h_aliases = hed->host_aliases;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	size = strlen(cp) + 1;
-	if (ep - bp < size) {
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);
-	}
-	strlcpy(bp, cp, ep - bp);
-	bp += size;
-	cp = p;
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q >= &hed->host_aliases[_MAXALIASES - 1])
-			break;
-		p = strpbrk(cp, " \t");
-		if (p != NULL)
-			*p++ = '\0';
-		size = strlen(cp) + 1;
-		if (ep - bp < size)
-			break;
-		strlcpy(bp, cp, ep - bp);
-		*q++ = bp;
-		bp += size;
-		cp = p;
-	}
-	*q = NULL;
-	return (0);
-}
-
-static int
-_gethostbynisname_r(const char *name, int af, struct hostent *he,
-    struct hostent_data *hed)
-{
-	char *map;
-
-	switch (af) {
-	case AF_INET:
-		map = "hosts.byname";
-		break;
-	default:
-		map = "ipnodes.byname";
-		break;
-	}
-	return (_gethostbynis(name, map, af, he, hed));
-}
-
-static int
-_gethostbynisaddr_r(const void *addr, socklen_t len, int af,
-    struct hostent *he, struct hostent_data *hed)
-{
-	char *map;
-	char numaddr[46];
-
-	switch (af) {
-	case AF_INET:
-		map = "hosts.byaddr";
-		break;
-	default:
-		map = "ipnodes.byaddr";
-		break;
-	}
-	if (inet_ntop(af, addr, numaddr, sizeof(numaddr)) == NULL)
-		return (-1);
-	return (_gethostbynis(numaddr, map, af, he, hed));
-}
-#endif /* YP */
-
-/* XXX _gethostbynisname/_gethostbynisaddr only used by getipnodeby*() */
-struct hostent *
-_gethostbynisname(const char *name, int af)
-{
-#ifdef YP
-	struct hostent *he;
-	struct hostent_data *hed;
-	u_long oresopt;
-	int error;
-	res_state statp;
-
-	statp = __res_state();
-	if ((he = __hostent_init()) == NULL ||
-	    (hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (NULL);
-	}
-
-	oresopt = statp->options;
-	statp->options &= ~RES_USE_INET6;
-	error = _gethostbynisname_r(name, af, he, hed);
-	statp->options = oresopt;
-	return (error == 0) ? he : NULL;
-#else
-	return (NULL);
-#endif
-}
-
-struct hostent *
-_gethostbynisaddr(const void *addr, socklen_t len, int af)
-{
-#ifdef YP
-	struct hostent *he;
-	struct hostent_data *hed;
-	u_long oresopt;
-	int error;
-	res_state statp;
-
-	statp = __res_state();
-	if ((he = __hostent_init()) == NULL ||
-	    (hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (NULL);
-	}
-
-	oresopt = statp->options;
-	statp->options &= ~RES_USE_INET6;
-	error = _gethostbynisaddr_r(addr, len, af, he, hed);
-	statp->options = oresopt;
-	return (error == 0) ? he : NULL;
-#else
-	return (NULL);
-#endif
-}
-
-int
-_nis_gethostbyname(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	const char *name;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	res_state statp;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	if (_gethostbynisname_r(name, af, &he, hed) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-#else
-	*((struct hostent **)rval) = NULL;
-	return (NS_UNAVAIL);
-#endif
-}
-
-int
-_nis_gethostbyaddr(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	const void *addr;
-	socklen_t len;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	res_state statp;
-
-	addr = va_arg(ap, const void *);
-	len = va_arg(ap, socklen_t);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	if (_gethostbynisaddr_r(addr, len, af, &he, hed) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-#else
-	*((struct hostent **)rval) = NULL;
-	return (NS_UNAVAIL);
-#endif
-}
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
deleted file mode 100644
index 1311802..0000000
--- a/lib/libc/net/gethostnamadr.c
+++ /dev/null
@@ -1,420 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <arpa/nameser.h>		/* XXX hack for _res */
-#include <resolv.h>			/* XXX hack for _res */
-#include "un-namespace.h"
-#include "netdb_private.h"
-
-extern int _ht_gethostbyname(void *, void *, va_list);
-extern int _dns_gethostbyname(void *, void *, va_list);
-extern int _nis_gethostbyname(void *, void *, va_list);
-extern int _ht_gethostbyaddr(void *, void *, va_list);
-extern int _dns_gethostbyaddr(void *, void *, va_list);
-extern int _nis_gethostbyaddr(void *, void *, va_list);
-
-static int gethostbyname_internal(const char *, int, struct hostent *, char *,
-    size_t, struct hostent **, int *, res_state);
-
-/* Host lookup order if nsswitch.conf is broken or nonexistant */
-static const ns_src default_src[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NSSRC_DNS, NS_SUCCESS },
-	{ 0 }
-};
-
-NETDB_THREAD_ALLOC(hostent)
-NETDB_THREAD_ALLOC(hostent_data)
-NETDB_THREAD_ALLOC(hostdata)
-
-static void
-hostent_free(void *ptr)
-{
-	free(ptr);
-}
-
-static void
-hostent_data_free(void *ptr)
-{
-	struct hostent_data *hed = ptr;
-
-	if (hed == NULL)
-		return;
-	hed->stayopen = 0;
-	_endhosthtent(hed);
-	free(hed);
-}
-
-static void
-hostdata_free(void *ptr)
-{
-	free(ptr);
-}
-
-int
-__copy_hostent(struct hostent *he, struct hostent *hptr, char *buf,
-    size_t buflen)
-{
-	char *cp;
-	char **ptr;
-	int i, n;
-	int nptr, len;
-
-	/* Find out the amount of space required to store the answer. */
-	nptr = 2; /* NULL ptrs */
-	len = (char *)ALIGN(buf) - buf;
-	for (i = 0; he->h_addr_list[i]; i++, nptr++) {
-		len += he->h_length;
-	}
-	for (i = 0; he->h_aliases[i]; i++, nptr++) {
-		len += strlen(he->h_aliases[i]) + 1;
-	}
-	len += strlen(he->h_name) + 1;
-	len += nptr * sizeof(char*);
-
-	if (len > buflen) {
-		errno = ERANGE;
-		return (-1);
-	}
-
-	/* copy address size and type */
-	hptr->h_addrtype = he->h_addrtype;
-	n = hptr->h_length = he->h_length;
-
-	ptr = (char **)ALIGN(buf);
-	cp = (char *)ALIGN(buf) + nptr * sizeof(char *);
-
-	/* copy address list */
-	hptr->h_addr_list = ptr;
-	for (i = 0; he->h_addr_list[i]; i++ , ptr++) {
-		memcpy(cp, he->h_addr_list[i], n);
-		hptr->h_addr_list[i] = cp;
-		cp += n;
-	}
-	hptr->h_addr_list[i] = NULL;
-	ptr++;
-
-	/* copy official name */
-	n = strlen(he->h_name) + 1;
-	strcpy(cp, he->h_name);
-	hptr->h_name = cp;
-	cp += n;
-
-	/* copy aliases */
-	hptr->h_aliases = ptr;
-	for (i = 0 ; he->h_aliases[i]; i++) {
-		n = strlen(he->h_aliases[i]) + 1;
-		strcpy(cp, he->h_aliases[i]);
-		hptr->h_aliases[i] = cp;
-		cp += n;
-	}
-	hptr->h_aliases[i] = NULL;
-
-	return (0);
-}
-
-static int
-fakeaddr(const char *name, int af, struct hostent *hp, char *buf,
-size_t buflen, res_state statp)
-{
-	struct hostent_data *hed;
-	struct hostent he;
-
-	if ((hed = __hostent_data_init()) == NULL) {
-		errno = ENOMEM;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	if ((af != AF_INET ||
-	    inet_aton(name, (struct in_addr *)hed->host_addr) != 1) &&
-	    inet_pton(af, name, hed->host_addr) != 1) {
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		return (-1);
-	}
-	strncpy(hed->hostbuf, name, MAXDNAME);
-	hed->hostbuf[MAXDNAME] = '\0';
-	if (af == AF_INET && (statp->options & RES_USE_INET6) != 0U) {
-		_map_v4v6_address((char *)hed->host_addr,
-		    (char *)hed->host_addr);
-		af = AF_INET6;
-	}
-	he.h_addrtype = af;
-	switch(af) {
-	case AF_INET:
-		he.h_length = NS_INADDRSZ;
-		break;
-	case AF_INET6:
-		he.h_length = NS_IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-	he.h_name = hed->hostbuf;
-	he.h_aliases = hed->host_aliases;
-	hed->host_aliases[0] = NULL;
-	hed->h_addr_ptrs[0] = (char *)hed->host_addr;
-	hed->h_addr_ptrs[1] = NULL;
-	he.h_addr_list = hed->h_addr_ptrs;
-	RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-	return (__copy_hostent(&he, hp, buf, buflen));
-}
-
-int
-gethostbyname_r(const char *name, struct hostent *he, char *buffer,
-    size_t buflen, struct hostent **result, int *h_errnop)
-{
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-	if (statp->options & RES_USE_INET6) {
-		if (fakeaddr(name, AF_INET, he, buffer, buflen, statp) == 0) {
-			*result = he;
-			return (0);
-		}
-		if (gethostbyname_internal(name, AF_INET6, he, buffer, buflen,
-		    result, h_errnop, statp) == 0)
-			return (0);
-	}
-	return (gethostbyname_internal(name, AF_INET, he, buffer, buflen,
-	    result, h_errnop, statp));
-}
-
-int
-gethostbyname2_r(const char *name, int af, struct hostent *he, char *buffer,
-    size_t buflen, struct hostent **result, int *h_errnop)
-{
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-	return (gethostbyname_internal(name, af, he, buffer, buflen, result,
-	    h_errnop, statp));
-}
-
-int
-gethostbyname_internal(const char *name, int af, struct hostent *hp, char *buf,
-    size_t buflen, struct hostent **result, int *h_errnop, res_state statp)
-{
-	const char *cp;
-	int rval, ret_errno;
-	char abuf[MAXDNAME];
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_gethostbyname, NULL)
-		{ NSSRC_DNS, _dns_gethostbyname, NULL },
-		NS_NIS_CB(_nis_gethostbyname, NULL) /* force -DHESIOD */
-		{ 0 }
-	};
-
-	switch (af) {
-	case AF_INET:
-	case AF_INET6:
-		break;
-	default:
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias.
-	 * this is also done in res_query() since we are not the only
-	 * function that looks up host names.
-	 */
-	if (!strchr(name, '.') &&
-	    (cp = res_hostalias(statp, name, abuf, sizeof abuf)))
-		name = cp;
-
-	if (fakeaddr(name, af, hp, buf, buflen, statp) == 0) {
-		*result = hp;
-		return (0);
-	}
-
-	rval = _nsdispatch((void *)result, dtab, NSDB_HOSTS,
-	    "gethostbyname2_r", default_src, name, af, hp, buf, buflen,
-	    &ret_errno, h_errnop);
-
-	return ((rval == NS_SUCCESS) ? 0 : -1);
-}
-
-int
-gethostbyaddr_r(const void *addr, socklen_t len, int af, struct hostent *hp,
-    char *buf, size_t buflen, struct hostent **result, int *h_errnop)
-{
-	const u_char *uaddr = (const u_char *)addr;
-	const struct in6_addr *addr6;
-	socklen_t size;
-	int rval, ret_errno;
-	res_state statp;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_gethostbyaddr, NULL)
-		{ NSSRC_DNS, _dns_gethostbyaddr, NULL },
-		NS_NIS_CB(_nis_gethostbyaddr, NULL) /* force -DHESIOD */
-		{ 0 }
-	};
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-
-	if (af == AF_INET6 && len == NS_IN6ADDRSZ) {
-		addr6 = (const struct in6_addr *)addr;
-		if (IN6_IS_ADDR_LINKLOCAL(addr6)) {
-			RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-			*h_errnop = statp->res_h_errno;
-			return (-1);
-		}
-		if (IN6_IS_ADDR_V4MAPPED(addr6) ||
-		    IN6_IS_ADDR_V4COMPAT(addr6)) {
-			/* Unmap. */
-			uaddr += NS_IN6ADDRSZ - NS_INADDRSZ;
-			af = AF_INET;
-			len = NS_INADDRSZ;
-		}
-	}
-	switch (af) {
-	case AF_INET:
-		size = NS_INADDRSZ;
-		break;
-	case AF_INET6:
-		size = NS_IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-	if (size != len) {
-		errno = EINVAL;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-
-	rval = _nsdispatch((void *)result, dtab, NSDB_HOSTS,
-	    "gethostbyaddr_r", default_src, uaddr, len, af, hp, buf, buflen,
-	    &ret_errno, h_errnop);
-
-	return ((rval == NS_SUCCESS) ? 0 : -1);
-}
-
-struct hostent *
-gethostbyname(const char *name)
-{
-	struct hostdata *hd;
-	struct hostent *rval;
-	int ret_h_errno;
-
-	if ((hd = __hostdata_init()) == NULL)
-		return (NULL);
-	if (gethostbyname_r(name, &hd->host, hd->data, sizeof(hd->data), &rval,
-	    &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-struct hostent *
-gethostbyname2(const char *name, int af)
-{
-	struct hostdata *hd;
-	struct hostent *rval;
-	int ret_h_errno;
-
-	if ((hd = __hostdata_init()) == NULL)
-		return (NULL);
-	if (gethostbyname2_r(name, af, &hd->host, hd->data, sizeof(hd->data),
-	    &rval, &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-struct hostent *
-gethostbyaddr(const void *addr, int len, int af)
-{
-	struct hostdata *hd;
-	struct hostent *rval;
-	int ret_h_errno;
-
-	if ((hd = __hostdata_init()) == NULL)
-		return (NULL);
-	if (gethostbyaddr_r(addr, (socklen_t)len, af, &hd->host, hd->data,
-	    sizeof(hd->data), &rval, &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-void
-sethostent(int stayopen)
-{
-	struct hostent_data *hed;
-
-	if ((hed = __hostent_data_init()) == NULL)
-		return;
-	_sethosthtent(stayopen, hed);
-	_sethostdnsent(stayopen);
-}
-
-void
-endhostent(void)
-{
-	struct hostent_data *hed;
-
-	if ((hed = __hostent_data_init()) == NULL)
-		return;
-	_endhosthtent(hed);
-	_endhostdnsent();
-}
diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c
deleted file mode 100644
index eb78c4f..0000000
--- a/lib/libc/net/getifaddrs.c
+++ /dev/null
@@ -1,417 +0,0 @@
-/*	$KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $	*/
-
-/*
- * Copyright (c) 1995, 1999
- *	Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *	BSDI getifaddrs.c,v 2.12 2000/02/23 14:51:59 dab Exp
- */
-/*
- * NOTE: SIOCGIFCONF case is not LP64 friendly.  it also does not perform
- * try-and-error for region size.
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#ifdef	NET_RT_IFLIST
-#include <sys/param.h>
-#include <net/route.h>
-#include <sys/sysctl.h>
-#include <net/if_dl.h>
-#endif
-
-#include <errno.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#if !defined(AF_LINK)
-#define	SA_LEN(sa)	sizeof(struct sockaddr)
-#endif
-
-#if !defined(SA_LEN)
-#define	SA_LEN(sa)	(sa)->sa_len
-#endif
-
-#define	SALIGN	(sizeof(long) - 1)
-#define	SA_RLEN(sa)	((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : (SALIGN + 1))
-
-#ifndef	ALIGNBYTES
-/*
- * On systems with a routing socket, ALIGNBYTES should match the value
- * that the kernel uses when building the messages.
- */
-#define	ALIGNBYTES	XXX
-#endif
-#ifndef	ALIGN
-#define	ALIGN(p)	(((u_long)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#endif
-
-#if	_BSDI_VERSION >= 199701
-#define	HAVE_IFM_DATA
-#endif
-
-#if	_BSDI_VERSION >= 199802
-/* ifam_data is very specific to recent versions of bsdi */
-#define	HAVE_IFAM_DATA
-#endif
-
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
-#define	HAVE_IFM_DATA
-#endif
-
-#define MAX_SYSCTL_TRY 5
-
-int
-getifaddrs(struct ifaddrs **pif)
-{
-	int icnt = 1;
-	int dcnt = 0;
-	int ncnt = 0;
-#ifdef	NET_RT_IFLIST
-	int ntry = 0;
-	int mib[6];
-	size_t needed;
-	char *buf;
-	char *next;
-	struct ifaddrs *cif = 0;
-	char *p, *p0;
-	struct rt_msghdr *rtm;
-	struct if_msghdr *ifm;
-	struct ifa_msghdr *ifam;
-	struct sockaddr_dl *dl;
-	struct sockaddr *sa;
-	struct ifaddrs *ifa, *ift;
-	u_short idx = 0;
-#else	/* NET_RT_IFLIST */
-	char buf[1024];
-	int m, sock;
-	struct ifconf ifc;
-	struct ifreq *ifr;
-	struct ifreq *lifr;
-#endif	/* NET_RT_IFLIST */
-	int i;
-	size_t len, alen;
-	char *data;
-	char *names;
-
-#ifdef	NET_RT_IFLIST
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;             /* protocol */
-	mib[3] = 0;             /* wildcard address family */
-	mib[4] = NET_RT_IFLIST;
-	mib[5] = 0;             /* no flags */
-	do {
-		/*
-		 * We'll try to get addresses several times in case that
-		 * the number of addresses is unexpectedly increased during
-		 * the two sysctl calls.  This should rarely happen, but we'll
-		 * try to do our best for applications that assume success of
-		 * this library (which should usually be the case).
-		 * Portability note: since FreeBSD does not add margin of
-		 * memory at the first sysctl, the possibility of failure on
-		 * the second sysctl call is a bit higher.
-		 */
-
-		if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-			return (-1);
-		if ((buf = malloc(needed)) == NULL)
-			return (-1);
-		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-			if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
-				free(buf);
-				return (-1);
-			}
-			free(buf);
-			buf = NULL;
-		} 
-	} while (buf == NULL);
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_IFINFO:
-			ifm = (struct if_msghdr *)(void *)rtm;
-			if (ifm->ifm_addrs & RTA_IFP) {
-				idx = ifm->ifm_index;
-				++icnt;
-				dl = (struct sockaddr_dl *)(void *)(ifm + 1);
-				dcnt += SA_RLEN((struct sockaddr *)(void*)dl) +
-				    ALIGNBYTES;
-#ifdef	HAVE_IFM_DATA
-				dcnt += sizeof(ifm->ifm_data);
-#endif	/* HAVE_IFM_DATA */
-				ncnt += dl->sdl_nlen + 1;
-			} else
-				idx = 0;
-			break;
-
-		case RTM_NEWADDR:
-			ifam = (struct ifa_msghdr *)(void *)rtm;
-			if (idx && ifam->ifam_index != idx)
-				abort();	/* this cannot happen */
-
-#define	RTA_MASKS	(RTA_NETMASK | RTA_IFA | RTA_BRD)
-			if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-				break;
-			p = (char *)(void *)(ifam + 1);
-			++icnt;
-#ifdef	HAVE_IFAM_DATA
-			dcnt += sizeof(ifam->ifam_data) + ALIGNBYTES;
-#endif	/* HAVE_IFAM_DATA */
-			/* Scan to look for length of address */
-			alen = 0;
-			for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_IFA) {
-					alen = len;
-					break;
-				}
-				p += len;
-			}
-			for (p = p0, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_NETMASK && SA_LEN(sa) == 0)
-					dcnt += alen;
-				else
-					dcnt += len;
-				p += len;
-			}
-			break;
-		}
-	}
-#else	/* NET_RT_IFLIST */
-	ifc.ifc_buf = buf;
-	ifc.ifc_len = sizeof(buf);
-
-	if ((sock = _socket(AF_INET, SOCK_STREAM, 0)) < 0)
-		return (-1);
-	i =  _ioctl(sock, SIOCGIFCONF, (char *)&ifc);
-	_close(sock);
-	if (i < 0)
-		return (-1);
-
-	ifr = ifc.ifc_req;
-	lifr = (struct ifreq *)&ifc.ifc_buf[ifc.ifc_len];
-
-	while (ifr < lifr) {
-		struct sockaddr *sa;
-
-		sa = &ifr->ifr_addr;
-		++icnt;
-		dcnt += SA_RLEN(sa);
-		ncnt += sizeof(ifr->ifr_name) + 1;
-		
-		if (SA_LEN(sa) < sizeof(*sa))
-			ifr = (struct ifreq *)(((char *)sa) + sizeof(*sa));
-		else
-			ifr = (struct ifreq *)(((char *)sa) + SA_LEN(sa));
-	}
-#endif	/* NET_RT_IFLIST */
-
-	if (icnt + dcnt + ncnt == 1) {
-		*pif = NULL;
-		free(buf);
-		return (0);
-	}
-	data = malloc(sizeof(struct ifaddrs) * icnt + dcnt + ncnt);
-	if (data == NULL) {
-		free(buf);
-		return(-1);
-	}
-
-	ifa = (struct ifaddrs *)(void *)data;
-	data += sizeof(struct ifaddrs) * icnt;
-	names = data + dcnt;
-
-	memset(ifa, 0, sizeof(struct ifaddrs) * icnt);
-	ift = ifa;
-
-#ifdef	NET_RT_IFLIST
-	idx = 0;
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_IFINFO:
-			ifm = (struct if_msghdr *)(void *)rtm;
-			if (ifm->ifm_addrs & RTA_IFP) {
-				idx = ifm->ifm_index;
-				dl = (struct sockaddr_dl *)(void *)(ifm + 1);
-
-				cif = ift;
-				ift->ifa_name = names;
-				ift->ifa_flags = (int)ifm->ifm_flags;
-				memcpy(names, dl->sdl_data,
-				    (size_t)dl->sdl_nlen);
-				names[dl->sdl_nlen] = 0;
-				names += dl->sdl_nlen + 1;
-
-				ift->ifa_addr = (struct sockaddr *)(void *)data;
-				memcpy(data, dl,
-				    (size_t)SA_LEN((struct sockaddr *)
-				    (void *)dl));
-				data += SA_RLEN((struct sockaddr *)(void *)dl);
-
-#ifdef	HAVE_IFM_DATA
-				/* ifm_data needs to be aligned */
-				ift->ifa_data = data = (void *)ALIGN(data);
-				memcpy(data, &ifm->ifm_data, sizeof(ifm->ifm_data));
- 				data += sizeof(ifm->ifm_data);
-#else	/* HAVE_IFM_DATA */
-				ift->ifa_data = NULL;
-#endif	/* HAVE_IFM_DATA */
-
-				ift = (ift->ifa_next = ift + 1);
-			} else
-				idx = 0;
-			break;
-
-		case RTM_NEWADDR:
-			ifam = (struct ifa_msghdr *)(void *)rtm;
-			if (idx && ifam->ifam_index != idx)
-				abort();	/* this cannot happen */
-
-			if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-				break;
-			ift->ifa_name = cif->ifa_name;
-			ift->ifa_flags = cif->ifa_flags;
-			ift->ifa_data = NULL;
-			p = (char *)(void *)(ifam + 1);
-			/* Scan to look for length of address */
-			alen = 0;
-			for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_IFA) {
-					alen = len;
-					break;
-				}
-				p += len;
-			}
-			for (p = p0, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				switch (i) {
-				case RTAX_IFA:
-					ift->ifa_addr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_NETMASK:
-					ift->ifa_netmask =
-					    (struct sockaddr *)(void *)data;
-					if (SA_LEN(sa) == 0) {
-						memset(data, 0, alen);
-						data += alen;
-						break;
-					}
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_BRD:
-					ift->ifa_broadaddr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-				}
-				p += len;
-			}
-
-#ifdef	HAVE_IFAM_DATA
-			/* ifam_data needs to be aligned */
-			ift->ifa_data = data = (void *)ALIGN(data);
-			memcpy(data, &ifam->ifam_data, sizeof(ifam->ifam_data));
-			data += sizeof(ifam->ifam_data);
-#endif	/* HAVE_IFAM_DATA */
-
-			ift = (ift->ifa_next = ift + 1);
-			break;
-		}
-	}
-
-	free(buf);
-#else	/* NET_RT_IFLIST */
-	ifr = ifc.ifc_req;
-	lifr = (struct ifreq *)&ifc.ifc_buf[ifc.ifc_len];
-
-	while (ifr < lifr) {
-		struct sockaddr *sa;
-
-		ift->ifa_name = names;
-		names[sizeof(ifr->ifr_name)] = 0;
-		strncpy(names, ifr->ifr_name, sizeof(ifr->ifr_name));
-		while (*names++)
-			;
-
-		ift->ifa_addr = (struct sockaddr *)data;
-		sa = &ifr->ifr_addr;
-		memcpy(data, sa, SA_LEN(sa));
-		data += SA_RLEN(sa);
-		
-		ifr = (struct ifreq *)(((char *)sa) + SA_LEN(sa));
-		ift = (ift->ifa_next = ift + 1);
-	}
-#endif	/* NET_RT_IFLIST */
-	if (--ift >= ifa) {
-		ift->ifa_next = NULL;
-		*pif = ifa;
-	} else {
-		*pif = NULL;
-		free(ifa);
-	}
-	return (0);
-}
-
-void
-freeifaddrs(struct ifaddrs *ifp)
-{
-
-	free(ifp);
-}
diff --git a/lib/libc/net/getifmaddrs.c b/lib/libc/net/getifmaddrs.c
deleted file mode 100644
index d28cc55..0000000
--- a/lib/libc/net/getifmaddrs.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2003 Bruce M. Simpson.
- * 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 Bruce M. Simpson.
- * 4. Neither the name of Bruce M. Simpson nor the names of other
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY BRUCE M. SIMPSON AND AFFILIATES
- * ``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 BRUCE M. SIMPSON 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.
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <errno.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#define	SALIGN	(sizeof(long) - 1)
-#define	SA_RLEN(sa)	((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : \
-			    (SALIGN + 1))
-#define	MAX_SYSCTL_TRY	5
-#define	RTA_MASKS	(RTA_GATEWAY | RTA_IFP | RTA_IFA)
-
-int
-getifmaddrs(struct ifmaddrs **pif)
-{
-	int icnt = 1;
-	int dcnt = 0;
-	int ntry = 0;
-	size_t len;
-	size_t needed;
-	int mib[6];
-	int i;
-	char *buf;
-	char *data;
-	char *next;
-	char *p;
-	struct ifma_msghdr *ifmam;
-	struct ifmaddrs *ifa, *ift;
-	struct rt_msghdr *rtm;
-	struct sockaddr *sa;
-
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;             /* protocol */
-	mib[3] = 0;             /* wildcard address family */
-	mib[4] = NET_RT_IFMALIST;
-	mib[5] = 0;             /* no flags */
-	do {
-		if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-			return (-1);
-		if ((buf = malloc(needed)) == NULL)
-			return (-1);
-		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-			if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
-				free(buf);
-				return (-1);
-			}
-			free(buf);
-			buf = NULL;
-		} 
-	} while (buf == NULL);
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_NEWMADDR:
-			ifmam = (struct ifma_msghdr *)(void *)rtm;
-			if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
-				break;
-			icnt++;
-			p = (char *)(ifmam + 1);
-			for (i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifmam->ifmam_addrs &
-				    (1 << i)) == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				dcnt += len;
-				p += len;
-			}
-			break;
-		}
-	}
-
-	data = malloc(sizeof(struct ifmaddrs) * icnt + dcnt);
-	if (data == NULL) {
-		free(buf);
-		return (-1);
-	}
-
-	ifa = (struct ifmaddrs *)(void *)data;
-	data += sizeof(struct ifmaddrs) * icnt;
-
-	memset(ifa, 0, sizeof(struct ifmaddrs) * icnt);
-	ift = ifa;
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-
-		switch (rtm->rtm_type) {
-		case RTM_NEWMADDR:
-			ifmam = (struct ifma_msghdr *)(void *)rtm;
-			if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
-				break;
-
-			p = (char *)(ifmam + 1);
-			for (i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifmam->ifmam_addrs &
-				    (1 << i)) == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				switch (i) {
-				case RTAX_GATEWAY:
-					ift->ifma_lladdr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_IFP:
-					ift->ifma_name =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_IFA:
-					ift->ifma_addr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				default:
-					data += len;
-					break;
-				}
-				p += len;
-			}
-			ift->ifma_next = ift + 1;
-			ift = ift->ifma_next;
-			break;
-		}
-	}
-
-	free(buf);
-
-	if (ift > ifa) {
-		ift--;
-		ift->ifma_next = NULL;
-		*pif = ifa;
-	} else {
-		*pif = NULL;
-		free(ifa);
-	}
-	return (0);
-}
-
-void
-freeifmaddrs(struct ifmaddrs *ifmp)
-{
-
-	free(ifmp);
-}
diff --git a/lib/libc/net/getnameinfo.c b/lib/libc/net/getnameinfo.c
deleted file mode 100644
index 8e25489..0000000
--- a/lib/libc/net/getnameinfo.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/*	$KAME: getnameinfo.c,v 1.61 2002/06/27 09:25:47 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * Issues to be discussed:
- * - Thread safe-ness must be checked
- * - RFC2553 says that we should raise error on short buffer.  X/Open says
- *   we need to truncate the result.  We obey RFC2553 (and X/Open should be
- *   modified).  ipngwg rough consensus seems to follow RFC2553.
- * - What is "local" in NI_FQDN?
- * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other.
- * - (KAME extension) always attach textual scopeid (fe80::1%lo0), if
- *   sin6_scope_id is filled - standardization status?
- *   XXX breaks backward compat for code that expects no scopeid.
- *   beware on merge.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <stddef.h>
-#include <errno.h>
-
-static const struct afd {
-	int a_af;
-	size_t a_addrlen;
-	socklen_t a_socklen;
-	int a_off;
-} afdl [] = {
-#ifdef INET6
-	{PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
-		offsetof(struct sockaddr_in6, sin6_addr)},
-#endif
-	{PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in),
-		offsetof(struct sockaddr_in, sin_addr)},
-	{0, 0, 0},
-};
-
-struct sockinet {
-	u_char	si_len;
-	u_char	si_family;
-	u_short	si_port;
-};
-
-#ifdef INET6
-static int ip6_parsenumeric(const struct sockaddr *, const char *, char *,
-    size_t, int);
-static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
-#endif
-
-int
-getnameinfo(const struct sockaddr *sa, socklen_t salen,
-    char *host, size_t hostlen, char *serv, size_t servlen,
-    int flags)
-{
-	const struct afd *afd;
-	struct servent *sp;
-	struct hostent *hp;
-	u_short port;
-	int family, i;
-	const char *addr;
-	uint32_t v4a;
-	int h_error;
-	char numserv[512];
-	char numaddr[512];
-
-	if (sa == NULL)
-		return EAI_FAIL;
-
-	family = sa->sa_family;
-	for (i = 0; afdl[i].a_af; i++)
-		if (afdl[i].a_af == family) {
-			afd = &afdl[i];
-			goto found;
-		}
-	return EAI_FAMILY;
-
- found:
-	if (salen != afd->a_socklen)
-		return EAI_FAIL;
-
-	/* network byte order */
-	port = ((const struct sockinet *)sa)->si_port;
-	addr = (const char *)sa + afd->a_off;
-
-	if (serv == NULL || servlen == 0) {
-		/*
-		 * do nothing in this case.
-		 * in case you are wondering if "&&" is more correct than
-		 * "||" here: rfc2553bis-03 says that serv == NULL OR
-		 * servlen == 0 means that the caller does not want the result.
-		 */
-	} else {
-		if (flags & NI_NUMERICSERV)
-			sp = NULL;
-		else {
-			sp = getservbyport(port,
-				(flags & NI_DGRAM) ? "udp" : "tcp");
-		}
-		if (sp) {
-			if (strlen(sp->s_name) + 1 > servlen)
-				return EAI_MEMORY;
-			strlcpy(serv, sp->s_name, servlen);
-		} else {
-			snprintf(numserv, sizeof(numserv), "%u", ntohs(port));
-			if (strlen(numserv) + 1 > servlen)
-				return EAI_MEMORY;
-			strlcpy(serv, numserv, servlen);
-		}
-	}
-
-	switch (sa->sa_family) {
-	case AF_INET:
-		v4a = (uint32_t)
-		    ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr);
-		if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
-			flags |= NI_NUMERICHOST;
-		v4a >>= IN_CLASSA_NSHIFT;
-		if (v4a == 0)
-			flags |= NI_NUMERICHOST;
-		break;
-#ifdef INET6
-	case AF_INET6:
-	    {
-		const struct sockaddr_in6 *sin6;
-		sin6 = (const struct sockaddr_in6 *)sa;
-		switch (sin6->sin6_addr.s6_addr[0]) {
-		case 0x00:
-			if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
-				;
-			else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
-				;
-			else
-				flags |= NI_NUMERICHOST;
-			break;
-		default:
-			if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
-				flags |= NI_NUMERICHOST;
-			}
-			else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
-				flags |= NI_NUMERICHOST;
-			break;
-		}
-	    }
-		break;
-#endif
-	}
-	if (host == NULL || hostlen == 0) {
-		/*
-		 * do nothing in this case.
-		 * in case you are wondering if "&&" is more correct than
-		 * "||" here: rfc2553bis-03 says that host == NULL or
-		 * hostlen == 0 means that the caller does not want the result.
-		 */
-	} else if (flags & NI_NUMERICHOST) {
-		size_t numaddrlen;
-
-		/* NUMERICHOST and NAMEREQD conflicts with each other */
-		if (flags & NI_NAMEREQD)
-			return EAI_NONAME;
-
-		switch(afd->a_af) {
-#ifdef INET6
-		case AF_INET6:
-		{
-			int error;
-
-			if ((error = ip6_parsenumeric(sa, addr, host,
-						      hostlen, flags)) != 0)
-				return(error);
-			break;
-		}
-#endif
-		default:
-			if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
-			    == NULL)
-				return EAI_SYSTEM;
-			numaddrlen = strlen(numaddr);
-			if (numaddrlen + 1 > hostlen) /* don't forget terminator */
-				return EAI_MEMORY;
-			strlcpy(host, numaddr, hostlen);
-			break;
-		}
-	} else {
-		hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error);
-
-		if (hp) {
-#if 0
-			/*
-			 * commented out, since "for local host" is not
-			 * implemented here - see RFC2553 p30
-			 */
-			if (flags & NI_NOFQDN) {
-				char *p;
-				p = strchr(hp->h_name, '.');
-				if (p)
-					*p = '\0';
-			}
-#endif
-			if (strlen(hp->h_name) + 1 > hostlen) {
-				freehostent(hp);
-				return EAI_MEMORY;
-			}
-			strlcpy(host, hp->h_name, hostlen);
-			freehostent(hp);
-		} else {
-			if (flags & NI_NAMEREQD)
-				return EAI_NONAME;
-			switch(afd->a_af) {
-#ifdef INET6
-			case AF_INET6:
-			{
-				int error;
-
-				if ((error = ip6_parsenumeric(sa, addr, host,
-							      hostlen,
-							      flags)) != 0)
-					return(error);
-				break;
-			}
-#endif
-			default:
-				if (inet_ntop(afd->a_af, addr, host,
-				    hostlen) == NULL)
-					return EAI_SYSTEM;
-				break;
-			}
-		}
-	}
-	return(0);
-}
-
-#ifdef INET6
-static int
-ip6_parsenumeric(const struct sockaddr *sa, const char *addr,
-    char *host, size_t hostlen, int flags)
-{
-	size_t numaddrlen;
-	char numaddr[512];
-
-	if (inet_ntop(AF_INET6, addr, numaddr, sizeof(numaddr)) == NULL)
-		return EAI_SYSTEM;
-
-	numaddrlen = strlen(numaddr);
-	if (numaddrlen + 1 > hostlen) /* don't forget terminator */
-		return EAI_MEMORY;
-	strlcpy(host, numaddr, hostlen);
-
-	if (((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
-		char zonebuf[MAXHOSTNAMELEN];
-		int zonelen;
-
-		zonelen = ip6_sa2str(
-		    (const struct sockaddr_in6 *)(const void *)sa,
-		    zonebuf, sizeof(zonebuf), flags);
-		if (zonelen < 0)
-			return EAI_MEMORY;
-		if (zonelen + 1 + numaddrlen + 1 > hostlen)
-			return EAI_MEMORY;
-
-		/* construct <numeric-addr><delim><zoneid> */
-		memcpy(host + numaddrlen + 1, zonebuf,
-		    (size_t)zonelen);
-		host[numaddrlen] = SCOPE_DELIMITER;
-		host[numaddrlen + 1 + zonelen] = '\0';
-	}
-
-	return 0;
-}
-
-/* ARGSUSED */
-static int
-ip6_sa2str(const struct sockaddr_in6 *sa6, char *buf, size_t bufsiz, int flags)
-{
-	unsigned int ifindex;
-	const struct in6_addr *a6;
-	int n;
-
-	ifindex = (unsigned int)sa6->sin6_scope_id;
-	a6 = &sa6->sin6_addr;
-
-#ifdef NI_NUMERICSCOPE
-	if ((flags & NI_NUMERICSCOPE) != 0) {
-		n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
-		if (n < 0 || n >= bufsiz)
-			return -1;
-		else
-			return n;
-	}
-#endif
-
-	/* if_indextoname() does not take buffer size.  not a good api... */
-	if ((IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6) ||
-	     IN6_IS_ADDR_MC_NODELOCAL(a6)) && bufsiz >= IF_NAMESIZE) {
-		char *p = if_indextoname(ifindex, buf);
-		if (p) {
-			return(strlen(p));
-		}
-	}
-
-	/* last resort */
-	n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
-	if (n < 0 || (size_t)n >= bufsiz)
-		return -1;
-	else
-		return n;
-}
-#endif /* INET6 */
diff --git a/lib/libc/net/getnetbydns.c b/lib/libc/net/getnetbydns.c
deleted file mode 100644
index b7632db..0000000
--- a/lib/libc/net/getnetbydns.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-
-#include "netdb_private.h"
-#include "res_config.h"
-
-#define BYADDR 0
-#define BYNAME 1
-
-#define MAXPACKET	(64*1024)
-
-typedef union {
-	HEADER	hdr;
-	u_char	buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-	long	al;
-	char	ac;
-} align;
-
-/*
- * Reverse the order of first four dotted entries of in.
- * Out must contain space for at least strlen(in) characters.
- * The result does not include any leading 0s of in.
- */
-static void
-ipreverse(char *in, char *out)
-{
-	char *pos[4];
-	int len[4];
-	char *p, *start;
-	int i = 0;
-	int leading = 1;
-
-	/* Fill-in element positions and lengths: pos[], len[]. */
-	start = p = in;
-	for (;;) {
-		if (*p == '.' || *p == '\0') {
-			/* Leading 0? */
-			if (leading && p - start == 1 && *start == '0')
-				len[i] = 0;
-			else {
-				len[i] = p - start;
-				leading = 0;
-			}
-			pos[i] = start;
-			start = p + 1;
-			i++;
-		}
-		if (i == 4)
-			break;
-		if (*p == 0) {
-			for (; i < 4; i++) {
-				pos[i] = p;
-				len[i] = 0;
-			}
-			break;
-		}
-		p++;
-	}
-
-	/* Copy the entries in reverse order */
-	p = out;
-	leading = 1;
-	for (i = 3; i >= 0; i--) {
-		memcpy(p, pos[i], len[i]);
-		if (len[i])
-			leading = 0;
-		p += len[i];
-		/* Need a . separator? */
-		if (!leading && i > 0 && len[i - 1])
-			*p++ = '.';
-	}
-	*p = '\0';
-}
-
-static int
-getnetanswer(querybuf *answer, int anslen, int net_i, struct netent *ne,
-    struct netent_data *ned, res_state statp)
-{
-
-	HEADER *hp;
-	u_char *cp;
-	int n;
-	u_char *eom;
-	int type, class, ancount, qdcount, haveanswer;
-	char aux[MAXHOSTNAMELEN];
-	char ans[MAXHOSTNAMELEN];
-	char *in, *bp, *ep, **ap;
-
-	/*
-	 * find first satisfactory answer
-	 *
-	 *      answer --> +------------+  ( MESSAGE )
-	 *		   |   Header   |
-	 *		   +------------+
-	 *		   |  Question  | the question for the name server
-	 *		   +------------+
-	 *		   |   Answer   | RRs answering the question
-	 *		   +------------+
-	 *		   | Authority  | RRs pointing toward an authority
-	 *		   | Additional | RRs holding additional information
-	 *		   +------------+
-	 */
-	eom = answer->buf + anslen;
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount); /* #/records in the answer section */
-	qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
-	bp = ned->netbuf;
-	ep = ned->netbuf + sizeof(ned->netbuf);
-	cp = answer->buf + HFIXEDSZ;
-	if (!qdcount) {
-		if (hp->aa)
-			RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		else
-			RES_SET_H_ERRNO(statp, TRY_AGAIN);
-		return (-1);
-	}
-	while (qdcount-- > 0)
-		cp += __dn_skipname(cp, eom) + QFIXEDSZ;
-	ap = ned->net_aliases;
-	*ap = NULL;
-	ne->n_aliases = ned->net_aliases;
-	haveanswer = 0;
-	while (--ancount >= 0 && cp < eom) {
-		n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-		if ((n < 0) || !res_dnok(bp))
-			break;
-		cp += n;
-		ans[0] = '\0';
-		(void)strncpy(&ans[0], bp, sizeof(ans) - 1);
-		ans[sizeof(ans) - 1] = '\0';
-		GETSHORT(type, cp);
-		GETSHORT(class, cp);
-		cp += INT32SZ;		/* TTL */
-		GETSHORT(n, cp);
-		if (class == C_IN && type == T_PTR) {
-			n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-			if ((n < 0) || !res_hnok(bp)) {
-				cp += n;
-				return (-1);
-			}
-			cp += n;
-			*ap++ = bp;
-			n = strlen(bp) + 1;
-			bp += n;
-			ne->n_addrtype = (class == C_IN) ? AF_INET : AF_UNSPEC;
-			haveanswer++;
-		}
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		switch (net_i) {
-		case BYADDR:
-			ne->n_name = *ne->n_aliases;
-			ne->n_net = 0L;
-			break;
-		case BYNAME:
-			in = *ne->n_aliases;
-			n = strlen(ans) + 1;
-			if (ep - bp < n) {
-				RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-				errno = ENOBUFS;
-				return (-1);
-			}
-			strlcpy(bp, ans, ep - bp);
-			ne->n_name = bp;
-			if (strlen(in) + 1 > sizeof(aux)) {
-				RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-				errno = ENOBUFS;
-				return (-1);
-			}
-			ipreverse(in, aux);
-			ne->n_net = inet_network(aux);
-			break;
-		}
-		ne->n_aliases++;
-		return (0);
-	}
-	RES_SET_H_ERRNO(statp, TRY_AGAIN);
-	return (-1);
-}
-
-int
-_dns_getnetbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	uint32_t net;
-	int net_type;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	unsigned int netbr[4];
-	int nn, anslen, error;
-	querybuf *buf;
-	char qbuf[MAXDNAME];
-	uint32_t net2;
-	res_state statp;
-
-	net = va_arg(ap, uint32_t);
-	net_type = va_arg(ap, int);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	*((struct netent **)rval) = NULL;
-
-	if (net_type != AF_INET) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	for (nn = 4, net2 = net; net2; net2 >>= 8)
-		netbr[--nn] = net2 & 0xff;
-	switch (nn) {
-	case 3: 	/* Class A */
-		sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
-		break;
-	case 2: 	/* Class B */
-		sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
-		break;
-	case 1: 	/* Class C */
-		sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1]);
-		break;
-	case 0: 	/* Class D - E */
-		sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1], netbr[0]);
-		break;
-	}
-	if ((buf = malloc(sizeof(*buf))) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	anslen = res_nquery(statp, qbuf, C_IN, T_PTR, (u_char *)buf,
-	    sizeof(*buf));
-	if (anslen < 0) {
-		free(buf);
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf("res_nsearch failed\n");
-#endif
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	} else if (anslen > sizeof(*buf)) {
-		free(buf);
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf("res_nsearch static buffer too small\n");
-#endif
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	error = getnetanswer(buf, anslen, BYADDR, &ne, ned, statp);
-	free(buf);
-	if (error == 0) {
-		/* Strip trailing zeros */
-		while ((net & 0xff) == 0 && net != 0)
-			net >>= 8;
-		ne.n_net = net;
-		if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-			*h_errnop = statp->res_h_errno;
-			return (NS_NOTFOUND);
-		}
-		*((struct netent **)rval) = nptr;
-		return (NS_SUCCESS);
-	}
-	*h_errnop = statp->res_h_errno;
-	return (NS_NOTFOUND);
-}
-
-int
-_dns_getnetbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *net;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	int anslen, error;
-	querybuf *buf;
-	char qbuf[MAXDNAME];
-	res_state statp;
-
-	net = va_arg(ap, const char *);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	if ((buf = malloc(sizeof(*buf))) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	*((struct netent **)rval) = NULL;
-
-	strncpy(qbuf, net, sizeof(qbuf) - 1);
-	qbuf[sizeof(qbuf) - 1] = '\0';
-	anslen = res_nsearch(statp, qbuf, C_IN, T_PTR, (u_char *)buf,
-	    sizeof(*buf));
-	if (anslen < 0) {
-		free(buf);
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf("res_nsearch failed\n");
-#endif
-		return (NS_UNAVAIL);
-	} else if (anslen > sizeof(*buf)) {
-		free(buf);
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf("res_search static buffer too small\n");
-#endif
-		return (NS_UNAVAIL);
-	}
-	error = getnetanswer(buf, anslen, BYNAME, &ne, ned, statp);
-	free(buf);
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-}
-
-void
-_setnetdnsent(int stayopen)
-{
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1)
-		return;
-	if (stayopen)
-		statp->options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endnetdnsent()
-{
-	res_state statp;
-
-	statp = __res_state();
-	statp->options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_nclose(statp);
-}
diff --git a/lib/libc/net/getnetbyht.c b/lib/libc/net/getnetbyht.c
deleted file mode 100644
index f99877c..0000000
--- a/lib/libc/net/getnetbyht.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * from getnetent.c	1.1 (Coimbra) 93/06/02
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include "netdb_private.h"
-
-void
-_setnethtent(int f, struct netent_data *ned)
-{
-
-	if (ned->netf == NULL)
-		ned->netf = fopen(_PATH_NETWORKS, "r");
-	else
-		rewind(ned->netf);
-	ned->stayopen |= f;
-}
-
-void
-_endnethtent(struct netent_data *ned)
-{
-
-	if (ned->netf) {
-		fclose(ned->netf);
-		ned->netf = NULL;
-	}
-	ned->stayopen = 0;
-}
-
-static int
-getnetent_p(struct netent *ne, struct netent_data *ned)
-{
-	char *p, *bp, *ep;
-	char *cp, **q;
-	int len;
-	char line[BUFSIZ + 1];
-
-	if (ned->netf == NULL &&
-	    (ned->netf = fopen(_PATH_NETWORKS, "r")) == NULL)
-		return (-1);
-again:
-	p = fgets(line, sizeof line, ned->netf);
-	if (p == NULL)
-		return (-1);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	bp = ned->netbuf;
-	ep = ned->netbuf + sizeof ned->netbuf;
-	ne->n_name = bp;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	len = strlen(p) + 1;
-	if (ep - bp < len) {
-		RES_SET_H_ERRNO(__res_state(), NO_RECOVERY);
-		return (-1);
-	}
-	strlcpy(bp, p, ep - bp);
-	bp += len;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	ne->n_net = inet_network(cp);
-	ne->n_addrtype = AF_INET;
-	q = ne->n_aliases = ned->net_aliases;
-	if (p != NULL) {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q >= &ned->net_aliases[_MAXALIASES - 1])
-				break;
-			p = strpbrk(cp, " \t");
-			if (p != NULL)
-				*p++ = '\0';
-			len = strlen(cp) + 1;
-			if (ep - bp < len)
-				break;
-			strlcpy(bp, cp, ep - bp);
-			*q++ = bp;
-			bp += len;
-			cp = p;
-		}
-	}
-	*q = NULL;
-	return (0);
-}
-
-int
-getnetent_r(struct netent *nptr, char *buffer, size_t buflen,
-    struct netent **result, int *h_errnop)
-{
-	struct netent_data *ned;
-	struct netent ne;
-	res_state statp;
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-	if (getnetent_p(&ne, ned) != 0)
-		return (-1);
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0)
-		return (-1);
-	*result = nptr;
-	return (0);
-}
-
-struct netent *
-getnetent(void)
-{
-	struct netdata *nd;
-	struct netent *rval;
-	int ret_h_errno;
-
-	if ((nd = __netdata_init()) == NULL)
-		return (NULL);
-	if (getnetent_r(&nd->net, nd->data, sizeof(nd->data), &rval,
-	    &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-int
-_ht_getnetbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	char **cp;
-	res_state statp;
-	int error;
-
-	name = va_arg(ap, const char *);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	_setnethtent(ned->stayopen, ned);
-	while ((error = getnetent_p(&ne, ned)) == 0) {
-		if (strcasecmp(ne.n_name, name) == 0)
-			break;
-		for (cp = ne.n_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!ned->stayopen)
-		_endnethtent(ned);
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-}
-
-int
-_ht_getnetbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	uint32_t net;
-	int type;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	res_state statp;
-	int error;
-
-	net = va_arg(ap, uint32_t);
-	type = va_arg(ap, int);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	_setnethtent(ned->stayopen, ned);
-	while ((error = getnetent_p(&ne, ned)) == 0)
-		if (ne.n_addrtype == type && ne.n_net == net)
-			break;
-	if (!ned->stayopen)
-		_endnethtent(ned);
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-}
diff --git a/lib/libc/net/getnetbynis.c b/lib/libc/net/getnetbynis.c
deleted file mode 100644
index 3475beb..0000000
--- a/lib/libc/net/getnetbynis.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <arpa/nameser.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include "netdb_private.h"
-
-#ifdef YP
-static int
-_getnetbynis(const char *name, char *map, int af, struct netent *ne,
-    struct netent_data *ned)
-{
-	char *p, *bp, *ep;
-	char *cp, **q;
-	char *result;
-	int resultlen, len;
-	char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		break;
-	default:
-	case AF_INET6:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-
-	if (ned->yp_domain == (char *)NULL)
-		if (yp_get_default_domain (&ned->yp_domain))
-			return (-1);
-
-	if (yp_match(ned->yp_domain, map, name, strlen(name), &result,
-	    &resultlen))
-		return (-1);
-
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = index(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	bp = ned->netbuf;
-	ep = ned->netbuf + sizeof ned->netbuf;
-	len = strlen(result) + 1;
-	if (ep - bp < len) {
-		RES_SET_H_ERRNO(__res_state(), NO_RECOVERY);
-		return (-1);
-	}
-	strlcpy(bp, result, ep - bp);
-	ne->n_name = bp;
-	bp += len;
-
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-
-	ne->n_net = inet_network(cp);
-	ne->n_addrtype = AF_INET;
-
-	q = ne->n_aliases = ned->net_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q > &ned->net_aliases[_MAXALIASES - 1])
-			break;
-		p = strpbrk(cp, " \t");
-		if (p != NULL)
-			*p++ = '\0';
-		len = strlen(cp) + 1;
-		if (ep - bp < len)
-			break;
-		strlcpy(bp, cp, ep - bp);
-		*q++ = bp;
-		bp += len;
-		cp = p;
-	}
-	*q = NULL;
-	return (0);
-}
-#endif /* YP */
-
-int
-_nis_getnetbyname(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	const char *name;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	res_state statp;
-
-	name = va_arg(ap, const char *);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	if (_getnetbynis(name, "networks.byname", AF_INET, &ne, ned) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-#else
-	return (NS_UNAVAIL);
-#endif
-
-}
-
-int
-_nis_getnetbyaddr(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	uint32_t addr;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	char *str, *cp;
-	uint32_t net2;
-	int nn;
-	unsigned int netbr[4];
-	char buf[MAXDNAME];
-	res_state statp;
-
-	addr = va_arg(ap, uint32_t);
-	af = va_arg(ap, int);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	if (af != AF_INET) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		errno = EAFNOSUPPORT;
-		return (NS_UNAVAIL);
-	}
-
-        for (nn = 4, net2 = addr; net2; net2 >>= 8) {
-                netbr[--nn] = net2 & 0xff;
-	}
-
-	switch (nn) {
-	case 3:		/* Class A */
-		sprintf(buf, "%u", netbr[3]);
-		break;
-        case 2:		/* Class B */
-		sprintf(buf, "%u.%u", netbr[2], netbr[3]);
-		break;
-        case 1:		/* Class C */
-		sprintf(buf, "%u.%u.%u", netbr[1], netbr[2], netbr[3]);
-                break;
-        case 0:		/* Class D - E */
-		sprintf(buf, "%u.%u.%u.%u", netbr[0], netbr[1],
-			netbr[2], netbr[3]);
-		break;
-	}
-
-	str = (char *)&buf;
-	cp = str + (strlen(str) - 2);
-
-	while(!strcmp(cp, ".0")) {
-		*cp = '\0';
-		cp = str + (strlen(str) - 2);
-	}
-
-	if (_getnetbynis(str, "networks.byaddr", af, &ne, ned) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-#else
-	return (NS_UNAVAIL);
-#endif /* YP */
-}
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
deleted file mode 100644
index 32c6ce3..0000000
--- a/lib/libc/net/getnetnamadr.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include "un-namespace.h"
-#include "netdb_private.h"
-
-extern int _ht_getnetbyname(void *, void *, va_list);
-extern int _dns_getnetbyname(void *, void *, va_list);
-extern int _nis_getnetbyname(void *, void *, va_list);
-extern int _ht_getnetbyaddr(void *, void *, va_list);
-extern int _dns_getnetbyaddr(void *, void *, va_list);
-extern int _nis_getnetbyaddr(void *, void *, va_list);
-
-/* Network lookup order if nsswitch.conf is broken or nonexistant */
-static const ns_src default_src[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NSSRC_DNS, NS_SUCCESS },
-	{ 0 }
-};
-
-NETDB_THREAD_ALLOC(netent_data)
-NETDB_THREAD_ALLOC(netdata)
-
-static void
-netent_data_free(void *ptr)
-{
-	struct netent_data *ned = ptr;
-
-	if (ned == NULL)
-		return;
-	ned->stayopen = 0;
-	_endnethtent(ned);
-	free(ned);
-}
-
-static void
-netdata_free(void *ptr)
-{
-	free(ptr);
-}
-
-int
-__copy_netent(struct netent *ne, struct netent *nptr, char *buf, size_t buflen)
-{
-	char *cp;
-	int i, n;
-	int numptr, len;
-
-	/* Find out the amount of space required to store the answer. */
-	numptr = 1; /* NULL ptr */
-	len = (char *)ALIGN(buf) - buf;
-	for (i = 0; ne->n_aliases[i]; i++, numptr++) {
-		len += strlen(ne->n_aliases[i]) + 1;
-	}
-	len += strlen(ne->n_name) + 1;
-	len += numptr * sizeof(char*);
-
-	if (len > (int)buflen) {
-		errno = ERANGE;
-		return (-1);
-	}
-
-	/* copy net value and type */
-	nptr->n_addrtype = ne->n_addrtype;
-	nptr->n_net = ne->n_net;
-
-	cp = (char *)ALIGN(buf) + numptr * sizeof(char *);
-
-	/* copy official name */
-	n = strlen(ne->n_name) + 1;
-	strcpy(cp, ne->n_name);
-	nptr->n_name = cp;
-	cp += n;
-
-	/* copy aliases */
-	nptr->n_aliases = (char **)ALIGN(buf);
-	for (i = 0 ; ne->n_aliases[i]; i++) {
-		n = strlen(ne->n_aliases[i]) + 1;
-		strcpy(cp, ne->n_aliases[i]);
-		nptr->n_aliases[i] = cp;
-		cp += n;
-	}
-	nptr->n_aliases[i] = NULL;
-
-	return (0);
-}
-
-int
-getnetbyname_r(const char *name, struct netent *ne, char *buffer,
-    size_t buflen, struct netent **result, int *h_errorp)
-{
-	int rval, ret_errno;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_getnetbyname, NULL)
-		{ NSSRC_DNS, _dns_getnetbyname, NULL },
-		NS_NIS_CB(_nis_getnetbyname, NULL) /* force -DHESIOD */
-		{ 0 }
-	};
-
-	rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS,
-	    "getnetbyname_r", default_src, name, ne, buffer, buflen,
-	    &ret_errno, h_errorp);
-
-	return ((rval == NS_SUCCESS) ? 0 : -1);
-}
-
-int
-getnetbyaddr_r(uint32_t addr, int af, struct netent *ne, char *buffer,
-    size_t buflen, struct netent **result, int *h_errorp)
-{
-	int rval, ret_errno;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_getnetbyaddr, NULL)
-		{ NSSRC_DNS, _dns_getnetbyaddr, NULL },
-		NS_NIS_CB(_nis_getnetbyaddr, NULL) /* force -DHESIOD */
-		{ 0 }
-	};
-
-	rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS,
-	    "getnetbyaddr_r", default_src, addr, af, ne, buffer, buflen,
-	    &ret_errno, h_errorp);
-
-	return ((rval == NS_SUCCESS) ? 0 : -1);
-}
-
-struct netent *
-getnetbyname(const char *name)
-{
-	struct netdata *nd;
-	struct netent *rval;
-	int ret_h_errno;
-
-	if ((nd = __netdata_init()) == NULL)
-		return (NULL);
-	if (getnetbyname_r(name, &nd->net, nd->data, sizeof(nd->data), &rval,
-	    &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-struct netent *
-getnetbyaddr(uint32_t addr, int af)
-{
-	struct netdata *nd;
-	struct netent *rval;
-	int ret_h_errno;
-
-	if ((nd = __netdata_init()) == NULL)
-		return (NULL);
-	if (getnetbyaddr_r(addr, af, &nd->net, nd->data, sizeof(nd->data),
-	    &rval, &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-void
-setnetent(int stayopen)
-{
-	struct netent_data *ned;
-
-	if ((ned = __netent_data_init()) == NULL)
-		return;
-	_setnethtent(stayopen, ned);
-	_setnetdnsent(stayopen);
-}
-
-void
-endnetent(void)
-{
-	struct netent_data *ned;
-
-	if ((ned = __netent_data_init()) == NULL)
-		return;
-	_endnethtent(ned);
-	_endnetdnsent();
-}
diff --git a/lib/libc/net/getproto.c b/lib/libc/net/getproto.c
deleted file mode 100644
index 7264d85..0000000
--- a/lib/libc/net/getproto.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <netdb.h>
-#include "netdb_private.h"
-
-int
-getprotobynumber_r(int proto, struct protoent *pptr, char *buffer,
-    size_t buflen, struct protoent **result)
-{
-	struct protoent pe;
-	struct protoent_data *ped;
-	int error;
-
-	if ((ped = __protoent_data_init()) == NULL)
-		return (-1);
-	__setprotoent_p(ped->stayopen, ped);
-	while ((error = __getprotoent_p(&pe, ped)) == 0)
-		if (pe.p_proto == proto)
-			break;
-	if (!ped->stayopen)
-		__endprotoent_p(ped);
-	if (error != 0)
-		return (-1);
-	if (__copy_protoent(&pe, pptr, buffer, buflen) != 0)
-		return (-1);
-	*result = pptr;
-	return (0);
-}
-
-struct protoent *
-getprotobynumber(int proto)
-{
-	struct protodata *pd;
-	struct protoent *rval;
-
-	if ((pd = __protodata_init()) == NULL)
-		return (NULL);
-	if (getprotobynumber_r(proto, &pd->proto, pd->data, sizeof(pd->data),
-	    &rval) != 0)
-		return (NULL);
-	return (rval);
-}
diff --git a/lib/libc/net/getprotoent.c b/lib/libc/net/getprotoent.c
deleted file mode 100644
index 45f588e..0000000
--- a/lib/libc/net/getprotoent.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "namespace.h"
-#include "reentrant.h"
-#include "un-namespace.h"
-#include "netdb_private.h"
-
-NETDB_THREAD_ALLOC(protoent_data)
-NETDB_THREAD_ALLOC(protodata)
-
-static void
-protoent_data_clear(struct protoent_data *ped)
-{
-	if (ped->fp) {
-		fclose(ped->fp);
-		ped->fp = NULL;
-	}
-}
-
-static void
-protoent_data_free(void *ptr)
-{
-	struct protoent_data *ped = ptr;
-
-	protoent_data_clear(ped);
-	free(ped);
-}
-
-static void
-protodata_free(void *ptr)
-{
-	free(ptr);
-}
-
-int
-__copy_protoent(struct protoent *pe, struct protoent *pptr, char *buf,
-    size_t buflen)
-{
-	char *cp;
-	int i, n;
-	int numptr, len;
-
-	/* Find out the amount of space required to store the answer. */
-	numptr = 1; /* NULL ptr */
-	len = (char *)ALIGN(buf) - buf;
-	for (i = 0; pe->p_aliases[i]; i++, numptr++) {
-		len += strlen(pe->p_aliases[i]) + 1;
-	}
-	len += strlen(pe->p_name) + 1;
-	len += numptr * sizeof(char*);
-
-	if (len > (int)buflen) {
-		errno = ERANGE;
-		return (-1);
-	}
-
-	/* copy protocol value*/
-	pptr->p_proto = pe->p_proto;
-
-	cp = (char *)ALIGN(buf) + numptr * sizeof(char *);
-
-	/* copy official name */
-	n = strlen(pe->p_name) + 1;
-	strcpy(cp, pe->p_name);
-	pptr->p_name = cp;
-	cp += n;
-
-	/* copy aliases */
-	pptr->p_aliases = (char **)ALIGN(buf);
-	for (i = 0 ; pe->p_aliases[i]; i++) {
-		n = strlen(pe->p_aliases[i]) + 1;
-		strcpy(cp, pe->p_aliases[i]);
-		pptr->p_aliases[i] = cp;
-		cp += n;
-	}
-	pptr->p_aliases[i] = NULL;
-
-	return (0);
-}
-
-void
-__setprotoent_p(int f, struct protoent_data *ped)
-{
-	if (ped->fp == NULL)
-		ped->fp = fopen(_PATH_PROTOCOLS, "r");
-	else
-		rewind(ped->fp);
-	ped->stayopen |= f;
-}
-
-void
-__endprotoent_p(struct protoent_data *ped)
-{
-	if (ped->fp) {
-		fclose(ped->fp);
-		ped->fp = NULL;
-	}
-	ped->stayopen = 0;
-}
-
-int
-__getprotoent_p(struct protoent *pe, struct protoent_data *ped)
-{
-	char *p;
-	char *cp, **q, *endp;
-	long l;
-
-	if (ped->fp == NULL && (ped->fp = fopen(_PATH_PROTOCOLS, "r")) == NULL)
-		return (-1);
-again:
-	if ((p = fgets(ped->line, sizeof ped->line, ped->fp)) == NULL)
-		return (-1);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	pe->p_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	l = strtol(cp, &endp, 10);
-	if (endp == cp || *endp != '\0' || l < 0 || l > USHRT_MAX)
-		goto again;
-	pe->p_proto = l;
-	q = pe->p_aliases = ped->aliases;
-	if (p != NULL) {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q < &ped->aliases[_MAXALIASES - 1])
-				*q++ = cp;
-			cp = strpbrk(cp, " \t");
-			if (cp != NULL)
-				*cp++ = '\0';
-		}
-	}
-	*q = NULL;
-	return (0);
-}
-
-int
-getprotoent_r(struct protoent *pptr, char *buffer, size_t buflen,
-    struct protoent **result)
-{
-	struct protoent pe;
-	struct protoent_data *ped;
-
-	if ((ped = __protoent_data_init()) == NULL)
-		return (-1);
-
-	if (__getprotoent_p(&pe, ped) != 0)
-		return (-1);
-	if (__copy_protoent(&pe, pptr, buffer, buflen) != 0)
-		return (-1);
-	*result = pptr;
-	return (0);
-}
-
-void
-setprotoent(int f)
-{
-	struct protoent_data *ped;
-
-	if ((ped = __protoent_data_init()) == NULL)
-		return;
-	__setprotoent_p(f, ped);
-}
-
-void
-endprotoent(void)
-{
-	struct protoent_data *ped;
-
-	if ((ped = __protoent_data_init()) == NULL)
-		return;
-	__endprotoent_p(ped);
-}
-
-struct protoent *
-getprotoent(void)
-{
-	struct protodata *pd;
-	struct protoent *rval;
-
-	if ((pd = __protodata_init()) == NULL)
-		return (NULL);
-	if (getprotoent_r(&pd->proto, pd->data, sizeof(pd->data), &rval) != 0)
-		return (NULL);
-	return (rval);
-}
diff --git a/lib/libc/net/getprotoname.c b/lib/libc/net/getprotoname.c
deleted file mode 100644
index 431b924..0000000
--- a/lib/libc/net/getprotoname.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <netdb.h>
-#include <string.h>
-#include "netdb_private.h"
-
-int
-getprotobyname_r(const char *name, struct protoent *pptr, char *buffer,
-    size_t buflen, struct protoent **result)
-{
-	struct protoent pe;
-	struct protoent_data *ped;
-	char **cp;
-	int error;
-
-	if ((ped = __protoent_data_init()) == NULL)
-		return (-1);
-
-	__setprotoent_p(ped->stayopen, ped);
-	while ((error = __getprotoent_p(&pe, ped)) == 0) {
-		if (strcmp(pe.p_name, name) == 0)
-			break;
-		for (cp = pe.p_aliases; *cp != 0; cp++)
-			if (strcmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!ped->stayopen)
-		__endprotoent_p(ped);
-	if (error != 0)
-		return (-1);
-	if (__copy_protoent(&pe, pptr, buffer, buflen) != 0)
-		return (-1);
-	*result = pptr;
-	return (0);
-}
-
-struct protoent *
-getprotobyname(const char *name)
-{
-	struct protodata *pd;
-	struct protoent *rval;
-
-	if ((pd = __protodata_init()) == NULL)
-		return (NULL);
-	if (getprotobyname_r(name, &pd->proto, pd->data, sizeof(pd->data),
-	    &rval) != 0)
-		return (NULL);
-	return (rval);
-}
diff --git a/lib/libc/net/getservbyname.c b/lib/libc/net/getservbyname.c
deleted file mode 100644
index 243465d..0000000
--- a/lib/libc/net/getservbyname.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <netdb.h>
-#include <string.h>
-#include "netdb_private.h"
-
-int
-getservbyname_r(const char *name, const char *proto, struct servent *sptr,
-    char *buffer, size_t buflen, struct servent **result)
-{
-	struct servent se;
-	struct servent_data *sed;
-	char **cp;
-	int error;
-
-	if ((sed = __servent_data_init()) == NULL)
-		return (-1);
-
-#ifdef YP
-	sed->yp_name = (char *)name;
-	sed->yp_proto = (char *)proto;
-#endif
-
-	__setservent_p(sed->stayopen, sed);
-	while ((error = __getservent_p(&se, sed)) == 0) {
-		if (strcmp(name, se.s_name) == 0)
-			goto gotname;
-		for (cp = se.s_aliases; *cp; cp++)
-			if (strcmp(name, *cp) == 0)
-				goto gotname;
-		continue;
-gotname:
-		if (proto == 0 || strcmp(se.s_proto, proto) == 0)
-			break;
-	}
-	if (!sed->stayopen)
-		__endservent_p(sed);
-
-#ifdef YP
-	sed->yp_name = NULL;
-	sed->yp_proto = NULL;
-#endif
-
-	if (error != 0)
-		return (-1);
-	if (__copy_servent(&se, sptr, buffer, buflen) != 0)
-		return (-1);
-	*result = sptr;
-	return (0);
-}
-
-struct servent *
-getservbyname(const char *name, const char *proto)
-{
-	struct servdata *sd;
-	struct servent *rval;
-
-	if ((sd = __servdata_init()) == NULL)
-		return (NULL);
-	if (getservbyname_r(name, proto, &sd->serv, sd->data, sizeof(sd->data),
-	    &rval) != 0)
-		return (NULL);
-	return (rval);
-}
diff --git a/lib/libc/net/getservbyport.c b/lib/libc/net/getservbyport.c
deleted file mode 100644
index f3dbec4..0000000
--- a/lib/libc/net/getservbyport.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservbyport.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <netdb.h>
-#include <string.h>
-#include "netdb_private.h"
-
-int
-getservbyport_r(int port, const char *proto, struct servent *sptr,
-    char *buffer, size_t buflen, struct servent **result)
-{
-	struct servent se;
-	struct servent_data *sed;
-	int error;
-
-	if ((sed = __servent_data_init()) == NULL)
-		return (-1);
-
-#ifdef YP
-	sed->yp_port = port;
-	sed->yp_proto = (char *)proto;
-#endif
-
-	__setservent_p(sed->stayopen, sed);
-	while ((error = __getservent_p(&se, sed)) == 0) {
-		if (se.s_port != port)
-			continue;
-		if (proto == 0 || strcmp(se.s_proto, proto) == 0)
-			break;
-	}
-	if (!sed->stayopen)
-		__endservent_p(sed);
-
-#ifdef YP
-	sed->yp_port = 0;
-	sed->yp_proto = NULL;
-#endif
-
-	if (error != 0)
-		return (-1);
-	if (__copy_servent(&se, sptr, buffer, buflen) != 0)
-		return (-1);
-	*result = sptr;
-	return (0);
-}
-
-struct servent *
-getservbyport(int port, const char *proto)
-{
-	struct servdata *sd;
-	struct servent *rval;
-
-	if ((sd = __servdata_init()) == NULL)
-		return (NULL);
-	if (getservbyport_r(port, proto, &sd->serv, sd->data,
-	    sizeof(sd->data), &rval) != 0)
-		return (NULL);
-	return (rval);
-}
diff --git a/lib/libc/net/getservent.c b/lib/libc/net/getservent.c
deleted file mode 100644
index ac712b5..0000000
--- a/lib/libc/net/getservent.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include "namespace.h"
-#include "reentrant.h"
-#include "un-namespace.h"
-#include "netdb_private.h"
-
-NETDB_THREAD_ALLOC(servent_data)
-NETDB_THREAD_ALLOC(servdata)
-
-static void
-servent_data_clear(struct servent_data *sed)
-{
-	if (sed->fp) {
-		fclose(sed->fp);
-		sed->fp = NULL;
-	}
-#ifdef YP
-	free(sed->yp_key);
-	sed->yp_key = NULL;
-#endif
-}
-
-static void
-servent_data_free(void *ptr)
-{
-	struct servent_data *sed = ptr;
-
-	servent_data_clear(sed);
-	free(sed);
-}
-
-static void
-servdata_free(void *ptr)
-{
-	free(ptr);
-}
-
-int
-__copy_servent(struct servent *se, struct servent *sptr, char *buf,
-    size_t buflen)
-{
-	char *cp;
-	int i, n;
-	int numptr, len;
-
-	/* Find out the amount of space required to store the answer. */
-	numptr = 1; /* NULL ptr */
-	len = (char *)ALIGN(buf) - buf;
-	for (i = 0; se->s_aliases[i]; i++, numptr++) {
-		len += strlen(se->s_aliases[i]) + 1;
-	}
-	len += strlen(se->s_name) + 1;
-	len += strlen(se->s_proto) + 1;
-	len += numptr * sizeof(char*);
-
-	if (len > (int)buflen) {
-		errno = ERANGE;
-		return (-1);
-	}
-
-	/* copy port value */
-	sptr->s_port = se->s_port;
-
-	cp = (char *)ALIGN(buf) + numptr * sizeof(char *);
-
-	/* copy official name */
-	n = strlen(se->s_name) + 1;
-	strcpy(cp, se->s_name);
-	sptr->s_name = cp;
-	cp += n;
-
-	/* copy aliases */
-	sptr->s_aliases = (char **)ALIGN(buf);
-	for (i = 0 ; se->s_aliases[i]; i++) {
-		n = strlen(se->s_aliases[i]) + 1;
-		strcpy(cp, se->s_aliases[i]);
-		sptr->s_aliases[i] = cp;
-		cp += n;
-	}
-	sptr->s_aliases[i] = NULL;
-
-	/* copy proto */
-	n = strlen(se->s_proto) + 1;
-	strcpy(cp, se->s_proto);
-	sptr->s_proto = cp;
-	cp += n;
-
-	return (0);
-}
-
-#ifdef YP
-static int
-_getservbyport_yp(struct servent_data *sed)
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-	int rv;
-
-	snprintf(buf, sizeof(buf), "%d/%s", ntohs(sed->yp_port),
-	    sed->yp_proto);
-
-	sed->yp_port = 0;
-	sed->yp_proto = NULL;
-
-	if (!sed->yp_domain) {
-		if (yp_get_default_domain(&sed->yp_domain))
-			return (0);
-	}
-
-	/*
-	 * We have to be a little flexible here. Ideally you're supposed
-	 * to have both a services.byname and a services.byport map, but
-	 * some systems have only services.byname. FreeBSD cheats a little
-	 * by putting the services.byport information in the same map as
-	 * services.byname so that either case will work. We allow for both
-	 * possibilities here: if there is no services.byport map, we try
-	 * services.byname instead.
-	 */
-	if ((rv = yp_match(sed->yp_domain, "services.byport", buf, strlen(buf),
-						&result, &resultlen))) {
-		if (rv == YPERR_MAP) {
-			if (yp_match(sed->yp_domain, "services.byname", buf,
-					strlen(buf), &result, &resultlen))
-			return(0);
-		} else
-			return(0);
-	}
-
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(sed->line, sizeof sed->line, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservbyname_yp(struct servent_data *sed)
-{
-	char *result;
-	int resultlen;
-	char buf[YPMAXRECORD + 2];
-
-	if(!sed->yp_domain) {
-		if(yp_get_default_domain(&sed->yp_domain))
-			return (0);
-	}
-
-	snprintf(buf, sizeof(buf), "%s/%s", sed->yp_name, sed->yp_proto);
-
-	sed->yp_name = 0;
-	sed->yp_proto = NULL;
-
-	if (yp_match(sed->yp_domain, "services.byname", buf, strlen(buf),
-	    &result, &resultlen)) {
-		return(0);
-	}
-
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(sed->line, sizeof sed->line, "%.*s\n", resultlen, result);
-
-	free(result);
-	return(1);
-}
-
-static int
-_getservent_yp(struct servent_data *sed)
-{
-	char *lastkey, *result;
-	int resultlen;
-	int rv;
-
-	if (!sed->yp_domain) {
-		if (yp_get_default_domain(&sed->yp_domain))
-			return (0);
-	}
-
-	if (!sed->yp_stepping) {
-		free(sed->yp_key);
-		rv = yp_first(sed->yp_domain, "services.byname", &sed->yp_key,
-		    &sed->yp_keylen, &result, &resultlen);
-		if (rv) {
-			sed->yp_stepping = 0;
-			return(0);
-		}
-		sed->yp_stepping = 1;
-	} else {
-		lastkey = sed->yp_key;
-		rv = yp_next(sed->yp_domain, "services.byname", sed->yp_key,
-		    sed->yp_keylen, &sed->yp_key, &sed->yp_keylen, &result,
-		    &resultlen);
-		free(lastkey);
-		if (rv) {
-			sed->yp_stepping = 0;
-			return (0);
-		}
-	}
-
-	/* getservent() expects lines terminated with \n -- make it happy */
-	snprintf(sed->line, sizeof sed->line, "%.*s\n", resultlen, result);
-
-	free(result);
-
-	return(1);
-}
-#endif
-
-void
-__setservent_p(int f, struct servent_data *sed)
-{
-	if (sed->fp == NULL)
-		sed->fp = fopen(_PATH_SERVICES, "r");
-	else
-		rewind(sed->fp);
-	sed->stayopen |= f;
-}
-
-void
-__endservent_p(struct servent_data *sed)
-{
-	servent_data_clear(sed);
-	sed->stayopen = 0;
-#ifdef YP
-	sed->yp_stepping = 0;
-	sed->yp_domain = NULL;
-#endif
-}
-
-int
-__getservent_p(struct servent *se, struct servent_data *sed)
-{
-	char *p;
-	char *cp, **q, *endp;
-	long l;
-
-#ifdef YP
-	if (sed->yp_stepping && _getservent_yp(sed)) {
-		p = sed->line;
-		goto unpack;
-	}
-tryagain:
-#endif
-	if (sed->fp == NULL && (sed->fp = fopen(_PATH_SERVICES, "r")) == NULL)
-		return (-1);
-again:
-	if ((p = fgets(sed->line, sizeof sed->line, sed->fp)) == NULL)
-		return (-1);
-#ifdef YP
-	if (*p == '+' && _yp_check(NULL)) {
-		if (sed->yp_name != NULL) {
-			if (!_getservbyname_yp(sed))
-				goto tryagain;
-		}
-		else if (sed->yp_port != 0) {
-			if (!_getservbyport_yp(sed))
-				goto tryagain;
-		}
-		else if (!_getservent_yp(sed))
-			goto tryagain;
-	}
-unpack:
-#endif
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	se->s_name = p;
-	p = strpbrk(p, " \t");
-	if (p == NULL)
-		goto again;
-	*p++ = '\0';
-	while (*p == ' ' || *p == '\t')
-		p++;
-	cp = strpbrk(p, ",/");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	l = strtol(p, &endp, 10);
-	if (endp == p || *endp != '\0' || l < 0 || l > USHRT_MAX)
-		goto again;
-	se->s_port = htons((in_port_t)l);
-	se->s_proto = cp;
-	q = se->s_aliases = sed->aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &sed->aliases[_MAXALIASES - 1])
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (0);
-}
-
-int
-getservent_r(struct servent *sptr, char *buffer, size_t buflen,
-    struct servent **result)
-{
-	struct servent se;
-	struct servent_data *sed;
-
-	if ((sed = __servent_data_init()) == NULL)
-		return (-1);
-
-	if (__getservent_p(&se, sed) != 0)
-		return (-1);
-	if (__copy_servent(&se, sptr, buffer, buflen) != 0)
-		return (-1);
-	*result = sptr;
-	return (0);
-}
-
-void
-setservent(int f)
-{
-	struct servent_data *sed;
-
-	if ((sed = __servent_data_init()) == NULL)
-		return;
-	__setservent_p(f, sed);
-}
-
-void
-endservent(void)
-{
-	struct servent_data *sed;
-
-	if ((sed = __servent_data_init()) == NULL)
-		return;
-	__endservent_p(sed);
-}
-
-struct servent *
-getservent(void)
-{
-	struct servdata *sd;
-	struct servent *rval;
-
-	if ((sd = __servdata_init()) == NULL)
-		return (NULL);
-	if (getservent_r(&sd->serv, sd->data, sizeof(sd->data), &rval) != 0)
-		return (NULL);
-	return (rval);
-}
diff --git a/lib/libc/net/hesiod.c b/lib/libc/net/hesiod.c
deleted file mode 100644
index fe2cb68..0000000
--- a/lib/libc/net/hesiod.c
+++ /dev/null
@@ -1,582 +0,0 @@
-/*	$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $	*/
-
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/* Copyright 1996 by the Massachusetts Institute of Technology.
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-/* This file is part of the hesiod library.  It implements the core
- * portion of the hesiod resolver.
- *
- * This file is loosely based on an interim version of hesiod.c from
- * the BIND IRS library, which was in turn based on an earlier version
- * of this file.  Extensive changes have been made on each step of the
- * path.
- *
- * This implementation is not truly thread-safe at the moment because
- * it uses res_send() and accesses _res.
- */
-
-#include <sys/cdefs.h>
-
-#if 0
-static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $";
-#endif
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <hesiod.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-struct hesiod_p {
-	char	*lhs;			/* normally ".ns" */
-	char	*rhs;			/* AKA the default hesiod domain */
-	int	 classes[2];		/* The class search order. */
-};
-
-#define	MAX_HESRESP	1024
-
-static int	  read_config_file(struct hesiod_p *, const char *);
-static char	**get_txt_records(int, const char *);
-static int	  init_context(void);
-static void	  translate_errors(void);
-
-
-/*
- * hesiod_init --
- *	initialize a hesiod_p.
- */
-int 
-hesiod_init(context)
-	void	**context;
-{
-	struct hesiod_p	*ctx;
-	const char	*p, *configname;
-
-	ctx = malloc(sizeof(struct hesiod_p));
-	if (ctx) {
-		*context = ctx;
-		if (!issetugid())
-			configname = getenv("HESIOD_CONFIG");
-		else
-			configname = NULL;
-		if (!configname)
-			configname = _PATH_HESIOD_CONF;
-		if (read_config_file(ctx, configname) >= 0) {
-			/*
-			 * The default rhs can be overridden by an
-			 * environment variable.
-			 */
-			if (!issetugid())
-				p = getenv("HES_DOMAIN");
-			else
-				p = NULL;
-			if (p) {
-				if (ctx->rhs)
-					free(ctx->rhs);
-				ctx->rhs = malloc(strlen(p) + 2);
-				if (ctx->rhs) {
-					*ctx->rhs = '.';
-					strcpy(ctx->rhs + 1,
-					    (*p == '.') ? p + 1 : p);
-					return 0;
-				} else
-					errno = ENOMEM;
-			} else
-				return 0;
-		}
-	} else
-		errno = ENOMEM;
-
-	if (ctx->lhs)
-		free(ctx->lhs);
-	if (ctx->rhs)
-		free(ctx->rhs);
-	if (ctx)
-		free(ctx);
-	return -1;
-}
-
-/*
- * hesiod_end --
- *	Deallocates the hesiod_p.
- */
-void 
-hesiod_end(context)
-	void	*context;
-{
-	struct hesiod_p *ctx = (struct hesiod_p *) context;
-
-	free(ctx->rhs);
-	if (ctx->lhs)
-		free(ctx->lhs);
-	free(ctx);
-}
-
-/*
- * hesiod_to_bind --
- * 	takes a hesiod (name, type) and returns a DNS
- *	name which is to be resolved.
- */
-char *
-hesiod_to_bind(void *context, const char *name, const char *type)
-{
-	struct hesiod_p *ctx = (struct hesiod_p *) context;
-	char		 bindname[MAXDNAME], *p, *ret, **rhs_list = NULL;
-	const char	*rhs;
-	int		 len;
-
-	if (strlcpy(bindname, name, sizeof(bindname)) >= sizeof(bindname)) {
-		errno = EMSGSIZE;
-		return NULL;
-	}
-
-		/*
-		 * Find the right right hand side to use, possibly
-		 * truncating bindname.
-		 */
-	p = strchr(bindname, '@');
-	if (p) {
-		*p++ = 0;
-		if (strchr(p, '.'))
-			rhs = name + (p - bindname);
-		else {
-			rhs_list = hesiod_resolve(context, p, "rhs-extension");
-			if (rhs_list)
-				rhs = *rhs_list;
-			else {
-				errno = ENOENT;
-				return NULL;
-			}
-		}
-	} else
-		rhs = ctx->rhs;
-
-		/* See if we have enough room. */
-	len = strlen(bindname) + 1 + strlen(type);
-	if (ctx->lhs)
-		len += strlen(ctx->lhs) + ((ctx->lhs[0] != '.') ? 1 : 0);
-	len += strlen(rhs) + ((rhs[0] != '.') ? 1 : 0);
-	if (len > sizeof(bindname) - 1) {
-		if (rhs_list)
-			hesiod_free_list(context, rhs_list);
-		errno = EMSGSIZE;
-		return NULL;
-	}
-		/* Put together the rest of the domain. */
-	strcat(bindname, ".");
-	strcat(bindname, type);
-		/* Only append lhs if it isn't empty. */
-	if (ctx->lhs && ctx->lhs[0] != '\0' ) {
-		if (ctx->lhs[0] != '.')
-			strcat(bindname, ".");
-		strcat(bindname, ctx->lhs);
-	}
-	if (rhs[0] != '.')
-		strcat(bindname, ".");
-	strcat(bindname, rhs);
-
-		/* rhs_list is no longer needed, since we're done with rhs. */
-	if (rhs_list)
-		hesiod_free_list(context, rhs_list);
-
-		/* Make a copy of the result and return it to the caller. */
-	ret = strdup(bindname);
-	if (!ret)
-		errno = ENOMEM;
-	return ret;
-}
-
-/*
- * hesiod_resolve --
- *	Given a hesiod name and type, return an array of strings returned
- *	by the resolver.
- */
-char **
-hesiod_resolve(context, name, type)
-	void		*context;
-	const char	*name;
-	const char	*type;
-{
-	struct hesiod_p	*ctx = (struct hesiod_p *) context;
-	char		*bindname, **retvec;
-
-	bindname = hesiod_to_bind(context, name, type);
-	if (!bindname)
-		return NULL;
-
-	retvec = get_txt_records(ctx->classes[0], bindname);
-	if (retvec == NULL && errno == ENOENT && ctx->classes[1])
-		retvec = get_txt_records(ctx->classes[1], bindname);
-
-	free(bindname);
-	return retvec;
-}
-
-/*ARGSUSED*/
-void 
-hesiod_free_list(context, list)
-	void	 *context;
-	char	**list;
-{
-	char  **p;
-
-	if (list == NULL)
-		return;
-	for (p = list; *p; p++)
-		free(*p);
-	free(list);
-}
-
-
-/* read_config_file --
- *	Parse the /etc/hesiod.conf file.  Returns 0 on success,
- *	-1 on failure.  On failure, it might leave values in ctx->lhs
- *	or ctx->rhs which need to be freed by the caller.
- */
-static int 
-read_config_file(ctx, filename)
-	struct hesiod_p	*ctx;
-	const char	*filename;
-{
-	char	*key, *data, *p, **which;
-	char	 buf[MAXDNAME + 7];
-	int	 n;
-	FILE	*fp;
-
-		/* Set default query classes. */
-	ctx->classes[0] = C_IN;
-	ctx->classes[1] = C_HS;
-
-		/* Try to open the configuration file. */
-	fp = fopen(filename, "r");
-	if (!fp) {
-		/* Use compiled in default domain names. */
-		ctx->lhs = strdup(DEF_LHS);
-		ctx->rhs = strdup(DEF_RHS);
-		if (ctx->lhs && ctx->rhs)
-			return 0;
-		else {
-			errno = ENOMEM;
-			return -1;
-		}
-	}
-	ctx->lhs = NULL;
-	ctx->rhs = NULL;
-	while (fgets(buf, sizeof(buf), fp) != NULL) {
-		p = buf;
-		if (*p == '#' || *p == '\n' || *p == '\r')
-			continue;
-		while (*p == ' ' || *p == '\t')
-			p++;
-		key = p;
-		while (*p != ' ' && *p != '\t' && *p != '=')
-			p++;
-		*p++ = 0;
-
-		while (isspace(*p) || *p == '=')
-			p++;
-		data = p;
-		while (!isspace(*p))
-			p++;
-		*p = 0;
-
-		if (strcasecmp(key, "lhs") == 0 ||
-		    strcasecmp(key, "rhs") == 0) {
-			which = (strcasecmp(key, "lhs") == 0)
-			    ? &ctx->lhs : &ctx->rhs;
-			*which = strdup(data);
-			if (!*which) {
-				errno = ENOMEM;
-				return -1;
-			}
-		} else {
-			if (strcasecmp(key, "classes") == 0) {
-				n = 0;
-				while (*data && n < 2) {
-					p = data;
-					while (*p && *p != ',')
-						p++;
-					if (*p)
-						*p++ = 0;
-					if (strcasecmp(data, "IN") == 0)
-						ctx->classes[n++] = C_IN;
-					else
-						if (strcasecmp(data, "HS") == 0)
-							ctx->classes[n++] =
-							    C_HS;
-					data = p;
-				}
-				while (n < 2)
-					ctx->classes[n++] = 0;
-			}
-		}
-	}
-	fclose(fp);
-
-	if (!ctx->rhs || ctx->classes[0] == 0 ||
-	    ctx->classes[0] == ctx->classes[1]) {
-		errno = ENOEXEC;
-		return -1;
-	}
-	return 0;
-}
-
-/*
- * get_txt_records --
- *	Given a DNS class and a DNS name, do a lookup for TXT records, and
- *	return a list of them.
- */
-static char **
-get_txt_records(qclass, name)
-	int		 qclass;
-	const char	*name;
-{
-	HEADER		*hp;
-	unsigned char	 qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor;
-	char		*dst, **list;
-	int		 ancount, qdcount, i, j, n, skip, type, class, len;
-
-		/* Make sure the resolver is initialized. */
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return NULL;
-
-		/* Construct the query. */
-	n = res_mkquery(QUERY, name, qclass, T_TXT, NULL, 0,
-	    NULL, qbuf, PACKETSZ);
-	if (n < 0)
-		return NULL;
-
-		/* Send the query. */
-	n = res_send(qbuf, n, abuf, MAX_HESRESP);
-	if (n < 0 || n > MAX_HESRESP) {
-		errno = ECONNREFUSED; /* XXX */
-		return NULL;
-	}
-		/* Parse the header of the result. */
-	hp = (HEADER *) (void *) abuf;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	p = abuf + sizeof(HEADER);
-	eom = abuf + n;
-
-		/*
-		 * Skip questions, trying to get to the answer section
-		 * which follows.
-		 */
-	for (i = 0; i < qdcount; i++) {
-		skip = dn_skipname(p, eom);
-		if (skip < 0 || p + skip + QFIXEDSZ > eom) {
-			errno = EMSGSIZE;
-			return NULL;
-		}
-		p += skip + QFIXEDSZ;
-	}
-
-		/* Allocate space for the text record answers. */
-	list = malloc((ancount + 1) * sizeof(char *));
-	if (!list) {
-		errno = ENOMEM;
-		return NULL;
-	}
-		/* Parse the answers. */
-	j = 0;
-	for (i = 0; i < ancount; i++) {
-		/* Parse the header of this answer. */
-		skip = dn_skipname(p, eom);
-		if (skip < 0 || p + skip + 10 > eom)
-			break;
-		type = p[skip + 0] << 8 | p[skip + 1];
-		class = p[skip + 2] << 8 | p[skip + 3];
-		len = p[skip + 8] << 8 | p[skip + 9];
-		p += skip + 10;
-		if (p + len > eom) {
-			errno = EMSGSIZE;
-			break;
-		}
-		/* Skip entries of the wrong class and type. */
-		if (class != qclass || type != T_TXT) {
-			p += len;
-			continue;
-		}
-		/* Allocate space for this answer. */
-		list[j] = malloc((size_t)len);
-		if (!list[j]) {
-			errno = ENOMEM;
-			break;
-		}
-		dst = list[j++];
-
-		/* Copy answer data into the allocated area. */
-		eor = p + len;
-		while (p < eor) {
-			n = (unsigned char) *p++;
-			if (p + n > eor) {
-				errno = EMSGSIZE;
-				break;
-			}
-			memcpy(dst, p, (size_t)n);
-			p += n;
-			dst += n;
-		}
-		if (p < eor) {
-			errno = EMSGSIZE;
-			break;
-		}
-		*dst = 0;
-	}
-
-		/*
-		 * If we didn't terminate the loop normally, something
-		 * went wrong.
-		 */
-	if (i < ancount) {
-		for (i = 0; i < j; i++)
-			free(list[i]);
-		free(list);
-		return NULL;
-	}
-	if (j == 0) {
-		errno = ENOENT;
-		free(list);
-		return NULL;
-	}
-	list[j] = NULL;
-	return list;
-}
-
-		/*
-		 *	COMPATIBILITY FUNCTIONS
-		 */
-
-static int	  inited = 0;
-static void	 *context;
-static int	  errval = HES_ER_UNINIT;
-
-int
-hes_init()
-{
-	init_context();
-	return errval;
-}
-
-char *
-hes_to_bind(name, type)
-	const char	*name;
-	const char	*type;
-{
-	static	char	*bindname;
-	if (init_context() < 0)
-		return NULL;
-	if (bindname)
-		free(bindname);
-	bindname = hesiod_to_bind(context, name, type);
-	if (!bindname)
-		translate_errors();
-	return bindname;
-}
-
-char **
-hes_resolve(name, type)
-	const char	*name;
-	const char	*type;
-{
-	static char	**list;
-
-	if (init_context() < 0)
-		return NULL;
-
-	/*
-	 * In the old Hesiod interface, the caller was responsible for
-	 * freeing the returned strings but not the vector of strings itself.
-	 */
-	if (list)
-		free(list);
-
-	list = hesiod_resolve(context, name, type);
-	if (!list)
-		translate_errors();
-	return list;
-}
-
-int
-hes_error()
-{
-	return errval;
-}
-
-void
-hes_free(hp)
-	char **hp;
-{
-	hesiod_free_list(context, hp);
-}
-
-static int
-init_context()
-{
-	if (!inited) {
-		inited = 1;
-		if (hesiod_init(&context) < 0) {
-			errval = HES_ER_CONFIG;
-			return -1;
-		}
-		errval = HES_ER_OK;
-	}
-	return 0;
-}
-
-static void
-translate_errors()
-{
-	switch (errno) {
-	case ENOENT:
-		errval = HES_ER_NOTFOUND;
-		break;
-	case ECONNREFUSED:
-	case EMSGSIZE:
-		errval = HES_ER_NET;
-		break;
-	case ENOMEM:
-	default:
-		/* Not a good match, but the best we can do. */
-		errval = HES_ER_CONFIG;
-		break;
-	}
-}
diff --git a/lib/libc/net/if_indextoname.c b/lib/libc/net/if_indextoname.c
deleted file mode 100644
index bc3cf2a..0000000
--- a/lib/libc/net/if_indextoname.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	$KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2000
- *	Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *	BSDI Id: if_indextoname.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * From RFC 2533:
- *
- * The second function maps an interface index into its corresponding
- * name.
- *
- *    #include <net/if.h>
- *
- *    char  *if_indextoname(unsigned int ifindex, char *ifname);
- *
- * The ifname argument must point to a buffer of at least IF_NAMESIZE
- * bytes into which the interface name corresponding to the specified
- * index is returned.  (IF_NAMESIZE is also defined in <net/if.h> and
- * its value includes a terminating null byte at the end of the
- * interface name.) This pointer is also the return value of the
- * function.  If there is no interface corresponding to the specified
- * index, NULL is returned, and errno is set to ENXIO, if there was a
- * system error (such as running out of memory), if_indextoname returns
- * NULL and errno would be set to the proper value (e.g., ENOMEM).
- */
-
-char *
-if_indextoname(unsigned int ifindex, char *ifname)
-{
-	struct ifaddrs *ifaddrs, *ifa;
-	int error = 0;
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return(NULL);	/* getifaddrs properly set errno */
-
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK &&
-		    ifindex == ((struct sockaddr_dl*)ifa->ifa_addr)->sdl_index)
-			break;
-	}
-
-	if (ifa == NULL) {
-		error = ENXIO;
-		ifname = NULL;
-	}
-	else
-		strncpy(ifname, ifa->ifa_name, IFNAMSIZ);
-
-	freeifaddrs(ifaddrs);
-
-	errno = error;
-	return(ifname);
-}
diff --git a/lib/libc/net/if_nameindex.c b/lib/libc/net/if_nameindex.c
deleted file mode 100644
index 2d97751..0000000
--- a/lib/libc/net/if_nameindex.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*	$KAME: if_nameindex.c,v 1.8 2000/11/24 08:20:01 itojun Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2000
- *	Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *	BSDI Id: if_nameindex.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * From RFC 2553:
- *
- * 4.3 Return All Interface Names and Indexes
- *
- *    The if_nameindex structure holds the information about a single
- *    interface and is defined as a result of including the <net/if.h>
- *    header.
- *
- *       struct if_nameindex {
- *         unsigned int   if_index;
- *         char          *if_name;
- *       };
- *
- *    The final function returns an array of if_nameindex structures, one
- *    structure per interface.
- *
- *       struct if_nameindex  *if_nameindex(void);
- *
- *    The end of the array of structures is indicated by a structure with
- *    an if_index of 0 and an if_name of NULL.  The function returns a NULL
- *    pointer upon an error, and would set errno to the appropriate value.
- *
- *    The memory used for this array of structures along with the interface
- *    names pointed to by the if_name members is obtained dynamically.
- *    This memory is freed by the next function.
- *
- * 4.4.  Free Memory
- *
- *    The following function frees the dynamic memory that was allocated by
- *    if_nameindex().
- *
- *        #include <net/if.h>
- *
- *        void  if_freenameindex(struct if_nameindex *ptr);
- *
- *    The argument to this function must be a pointer that was returned by
- *    if_nameindex().
- */
-
-struct if_nameindex *
-if_nameindex(void)
-{
-	struct ifaddrs *ifaddrs, *ifa;
-	unsigned int ni;
-	int nbytes;
-	struct if_nameindex *ifni, *ifni2;
-	char *cp;
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return(NULL);
-
-	/*
-	 * First, find out how many interfaces there are, and how
-	 * much space we need for the string names.
-	 */
-	ni = 0;
-	nbytes = 0;
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK) {
-			nbytes += strlen(ifa->ifa_name) + 1;
-			ni++;
-		}
-	}
-
-	/*
-	 * Next, allocate a chunk of memory, use the first part
-	 * for the array of structures, and the last part for
-	 * the strings.
-	 */
-	cp = malloc((ni + 1) * sizeof(struct if_nameindex) + nbytes);
-	ifni = (struct if_nameindex *)cp;
-	if (ifni == NULL)
-		goto out;
-	cp += (ni + 1) * sizeof(struct if_nameindex);
-
-	/*
-	 * Now just loop through the list of interfaces again,
-	 * filling in the if_nameindex array and making copies
-	 * of all the strings.
-	 */
-	ifni2 = ifni;
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK) {
-			ifni2->if_index =
-			    ((struct sockaddr_dl*)ifa->ifa_addr)->sdl_index;
-			ifni2->if_name = cp;
-			strcpy(cp, ifa->ifa_name);
-			ifni2++;
-			cp += strlen(cp) + 1;
-		}
-	}
-	/*
-	 * Finally, don't forget to terminate the array.
-	 */
-	ifni2->if_index = 0;
-	ifni2->if_name = NULL;
-out:
-	freeifaddrs(ifaddrs);
-	return(ifni);
-}
-
-void
-if_freenameindex(struct if_nameindex *ptr)
-{
-	free(ptr);
-}
diff --git a/lib/libc/net/if_nametoindex.c b/lib/libc/net/if_nametoindex.c
deleted file mode 100644
index 3d8d346..0000000
--- a/lib/libc/net/if_nametoindex.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*	$KAME: if_nametoindex.c,v 1.6 2000/11/24 08:18:54 itojun Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2000
- *	Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *	BSDI Id: if_nametoindex.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-/*
- * From RFC 2553:
- *
- * 4.1 Name-to-Index
- *
- *
- *    The first function maps an interface name into its corresponding
- *    index.
- *
- *       #include <net/if.h>
- *
- *       unsigned int  if_nametoindex(const char *ifname);
- *
- *    If the specified interface name does not exist, the return value is
- *    0, and errno is set to ENXIO.  If there was a system error (such as
- *    running out of memory), the return value is 0 and errno is set to the
- *    proper value (e.g., ENOMEM).
- */
-
-unsigned int
-if_nametoindex(const char *ifname)
-{
-	int s;
-	struct ifreq ifr;
-	struct ifaddrs *ifaddrs, *ifa;
-	unsigned int ni;
-
-	s = _socket(AF_INET, SOCK_DGRAM, 0);
-	if (s != -1) {
-		strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-		if (_ioctl(s, SIOCGIFINDEX, &ifr) != -1) {
-			_close(s);
-			return (ifr.ifr_index);
-		}
-		_close(s);
-	}
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return(0);
-
-	ni = 0;
-
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK &&
-		    strcmp(ifa->ifa_name, ifname) == 0) {
-			ni = ((struct sockaddr_dl*)ifa->ifa_addr)->sdl_index;
-			break;
-		}
-	}
-
-	freeifaddrs(ifaddrs);
-	if (!ni)
-		errno = ENXIO;
-	return(ni);
-}
diff --git a/lib/libc/net/ip6opt.c b/lib/libc/net/ip6opt.c
deleted file mode 100644
index f7296a9..0000000
--- a/lib/libc/net/ip6opt.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/*	$KAME: ip6opt.c,v 1.13 2003/06/06 10:08:20 suz Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <string.h>
-#include <stdio.h>
-
-static int ip6optlen(u_int8_t *opt, u_int8_t *lim);
-static void inet6_insert_padopt(u_char *p, int len);
-
-/*
- * This function returns the number of bytes required to hold an option
- * when it is stored as ancillary data, including the cmsghdr structure
- * at the beginning, and any padding at the end (to make its size a
- * multiple of 8 bytes).  The argument is the size of the structure
- * defining the option, which must include any pad bytes at the
- * beginning (the value y in the alignment term "xn + y"), the type
- * byte, the length byte, and the option data.
- */
-int
-inet6_option_space(nbytes)
-	int nbytes;
-{
-	nbytes += 2;	/* we need space for nxt-hdr and length fields */
-	return(CMSG_SPACE((nbytes + 7) & ~7));
-}
-
-/*
- * This function is called once per ancillary data object that will
- * contain either Hop-by-Hop or Destination options.  It returns 0 on
- * success or -1 on an error.
- */
-int
-inet6_option_init(bp, cmsgp, type)
-	void *bp;
-	struct cmsghdr **cmsgp;
-	int type;
-{
-	struct cmsghdr *ch = (struct cmsghdr *)bp;
-
-	/* argument validation */
-	if (type != IPV6_HOPOPTS && type != IPV6_DSTOPTS)
-		return(-1);
-	
-	ch->cmsg_level = IPPROTO_IPV6;
-	ch->cmsg_type = type;
-	ch->cmsg_len = CMSG_LEN(0);
-
-	*cmsgp = ch;
-	return(0);
-}
-
-/*
- * This function appends a Hop-by-Hop option or a Destination option
- * into an ancillary data object that has been initialized by
- * inet6_option_init().  This function returns 0 if it succeeds or -1 on
- * an error.
- * multx is the value x in the alignment term "xn + y" described
- * earlier.  It must have a value of 1, 2, 4, or 8.
- * plusy is the value y in the alignment term "xn + y" described
- * earlier.  It must have a value between 0 and 7, inclusive.
- */
-int
-inet6_option_append(cmsg, typep, multx, plusy)
-	struct cmsghdr *cmsg;
-	const u_int8_t *typep;
-	int multx;
-	int plusy;
-{
-	int padlen, optlen, off;
-	u_char *bp = (u_char *)cmsg + cmsg->cmsg_len;
-	struct ip6_ext *eh = (struct ip6_ext *)CMSG_DATA(cmsg);
-
-	/* argument validation */
-	if (multx != 1 && multx != 2 && multx != 4 && multx != 8)
-		return(-1);
-	if (plusy < 0 || plusy > 7)
-		return(-1);
-
-	/*
-	 * If this is the first option, allocate space for the
-	 * first 2 bytes(for next header and length fields) of
-	 * the option header.
-	 */
-	if (bp == (u_char *)eh) {
-		bp += 2;
-		cmsg->cmsg_len += 2;
-	}
-
-	/* calculate pad length before the option. */
-	off = bp - (u_char *)eh;
-	padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
-		(off % multx);
-	padlen += plusy;
-	padlen %= multx;	/* keep the pad as short as possible */
-	/* insert padding */
-	inet6_insert_padopt(bp, padlen);
-	cmsg->cmsg_len += padlen;
-	bp += padlen;
-
-	/* copy the option */
-	if (typep[0] == IP6OPT_PAD1)
-		optlen = 1;
-	else
-		optlen = typep[1] + 2;
-	memcpy(bp, typep, optlen);
-	bp += optlen;
-	cmsg->cmsg_len += optlen;
-
-	/* calculate pad length after the option and insert the padding */
-	off = bp - (u_char *)eh;
-	padlen = ((off + 7) & ~7) - off;
-	inet6_insert_padopt(bp, padlen);
-	bp += padlen;
-	cmsg->cmsg_len += padlen;
-
-	/* update the length field of the ip6 option header */
-	eh->ip6e_len = ((bp - (u_char *)eh) >> 3) - 1;
-
-	return(0);
-}
-
-/*
- * This function appends a Hop-by-Hop option or a Destination option
- * into an ancillary data object that has been initialized by
- * inet6_option_init().  This function returns a pointer to the 8-bit
- * option type field that starts the option on success, or NULL on an
- * error.
- * The difference between this function and inet6_option_append() is
- * that the latter copies the contents of a previously built option into
- * the ancillary data object while the current function returns a
- * pointer to the space in the data object where the option's TLV must
- * then be built by the caller.
- * 
- */
-u_int8_t *
-inet6_option_alloc(cmsg, datalen, multx, plusy)
-	struct cmsghdr *cmsg;
-	int datalen;
-	int multx;
-	int plusy;
-{
-	int padlen, off;
-	u_int8_t *bp = (u_char *)cmsg + cmsg->cmsg_len;
-	u_int8_t *retval;
-	struct ip6_ext *eh = (struct ip6_ext *)CMSG_DATA(cmsg);
-
-	/* argument validation */
-	if (multx != 1 && multx != 2 && multx != 4 && multx != 8)
-		return(NULL);
-	if (plusy < 0 || plusy > 7)
-		return(NULL);
-
-	/*
-	 * If this is the first option, allocate space for the
-	 * first 2 bytes(for next header and length fields) of
-	 * the option header.
-	 */
-	if (bp == (u_char *)eh) {
-		bp += 2;
-		cmsg->cmsg_len += 2;
-	}
-
-	/* calculate pad length before the option. */
-	off = bp - (u_char *)eh;
-	padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
-		(off % multx);
-	padlen += plusy;
-	padlen %= multx;	/* keep the pad as short as possible */
-	/* insert padding */
-	inet6_insert_padopt(bp, padlen);
-	cmsg->cmsg_len += padlen;
-	bp += padlen;
-
-	/* keep space to store specified length of data */
-	retval = bp;
-	bp += datalen;
-	cmsg->cmsg_len += datalen;
-
-	/* calculate pad length after the option and insert the padding */
-	off = bp - (u_char *)eh;
-	padlen = ((off + 7) & ~7) - off;
-	inet6_insert_padopt(bp, padlen);
-	bp += padlen;
-	cmsg->cmsg_len += padlen;
-
-	/* update the length field of the ip6 option header */
-	eh->ip6e_len = ((bp - (u_char *)eh) >> 3) - 1;
-
-	return(retval);
-}
-
-/*
- * This function processes the next Hop-by-Hop option or Destination
- * option in an ancillary data object.  If another option remains to be
- * processed, the return value of the function is 0 and *tptrp points to
- * the 8-bit option type field (which is followed by the 8-bit option
- * data length, followed by the option data).  If no more options remain
- * to be processed, the return value is -1 and *tptrp is NULL.  If an
- * error occurs, the return value is -1 and *tptrp is not NULL.
- * (RFC 2292, 6.3.5)
- */
-int
-inet6_option_next(cmsg, tptrp)
-	const struct cmsghdr *cmsg;
-	u_int8_t **tptrp;
-{
-	struct ip6_ext *ip6e;
-	int hdrlen, optlen;
-	u_int8_t *lim;
-
-	if (cmsg->cmsg_level != IPPROTO_IPV6 ||
-	    (cmsg->cmsg_type != IPV6_HOPOPTS &&
-	     cmsg->cmsg_type != IPV6_DSTOPTS))
-		return(-1);
-
-	/* message length validation */
-	if (cmsg->cmsg_len < CMSG_SPACE(sizeof(struct ip6_ext)))
-		return(-1);
-	ip6e = (struct ip6_ext *)CMSG_DATA(cmsg);
-	hdrlen = (ip6e->ip6e_len + 1) << 3;
-	if (cmsg->cmsg_len < CMSG_SPACE(hdrlen))
-		return(-1);
-
-	/*
-	 * If the caller does not specify the starting point,
-	 * simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	lim = (u_int8_t *)ip6e + hdrlen;
-	if (*tptrp == NULL)
-		*tptrp = (u_int8_t *)(ip6e + 1);
-	else {
-		if ((optlen = ip6optlen(*tptrp, lim)) == 0)
-			return(-1);
-
-		*tptrp = *tptrp + optlen;
-	}
-	if (*tptrp >= lim) {	/* there is no option */
-		*tptrp = NULL;
-		return(-1);
-	}
-	/*
-	 * Finally, checks if the next option is safely stored in the
-	 * cmsg data.
-	 */
-	if (ip6optlen(*tptrp, lim) == 0)
-		return(-1);
-	else
-		return(0);
-}
-
-/*
- * This function is similar to the inet6_option_next() function,
- * except this function lets the caller specify the option type to be
- * searched for, instead of always returning the next option in the
- * ancillary data object.
- * Note: RFC 2292 says the type of tptrp is u_int8_t *, but we think
- *       it's a typo. The variable should be type of u_int8_t **.
- */
-int
-inet6_option_find(cmsg, tptrp, type)
-	const struct cmsghdr *cmsg;
-	u_int8_t **tptrp;
-	int type;
-{
-	struct ip6_ext *ip6e;
-	int hdrlen, optlen;
-	u_int8_t *optp, *lim;
-
-	if (cmsg->cmsg_level != IPPROTO_IPV6 ||
-	    (cmsg->cmsg_type != IPV6_HOPOPTS &&
-	     cmsg->cmsg_type != IPV6_DSTOPTS))
-		return(-1);
-
-	/* message length validation */
-	if (cmsg->cmsg_len < CMSG_SPACE(sizeof(struct ip6_ext)))
-		return(-1);
-	ip6e = (struct ip6_ext *)CMSG_DATA(cmsg);
-	hdrlen = (ip6e->ip6e_len + 1) << 3;
-	if (cmsg->cmsg_len < CMSG_SPACE(hdrlen))
-		return(-1);	
-
-	/*
-	 * If the caller does not specify the starting point,
-	 * search from the beginning of the option list.
-	 * Otherwise, search from *the next option* of the specified point.
-	 */
-	lim = (u_int8_t *)ip6e + hdrlen;
-	if (*tptrp == NULL)
-		*tptrp = (u_int8_t *)(ip6e + 1);
-	else {
-		if ((optlen = ip6optlen(*tptrp, lim)) == 0)
-			return(-1);
-
-		*tptrp = *tptrp + optlen;
-	}
-	for (optp = *tptrp; optp < lim; optp += optlen) {
-		if (*optp == type) {
-			*tptrp = optp;
-			return(0);
-		}
-		if ((optlen = ip6optlen(optp, lim)) == 0)
-			return(-1);
-	}
-
-	/* search failed */
-	*tptrp = NULL;
-	return(-1);
-}
-
-/*
- * Calculate the length of a given IPv6 option. Also checks
- * if the option is safely stored in user's buffer according to the
- * calculated length and the limitation of the buffer.
- */
-static int
-ip6optlen(opt, lim)
-	u_int8_t *opt, *lim;
-{
-	int optlen;
-
-	if (*opt == IP6OPT_PAD1)
-		optlen = 1;
-	else {
-		/* is there enough space to store type and len? */
-		if (opt + 2 > lim)
-			return(0);
-		optlen = *(opt + 1) + 2;
-	}
-	if (opt + optlen <= lim)
-		return(optlen);
-
-	return(0);
-}
-
-static void
-inet6_insert_padopt(u_char *p, int len)
-{
-	switch(len) {
-	 case 0:
-		 return;
-	 case 1:
-		 p[0] = IP6OPT_PAD1;
-		 return;
-	 default:
-		 p[0] = IP6OPT_PADN;
-		 p[1] = len - 2; 
-		 memset(&p[2], 0, len - 2);
-		 return;
-	}
-}
-
-/*
- * The following functions are defined in RFC3542, which is a successor
- * of RFC2292.
- */
-
-int
-inet6_opt_init(void *extbuf, socklen_t extlen)
-{
-	struct ip6_ext *ext = (struct ip6_ext *)extbuf;
-
-	if (extlen < 0 || (extlen % 8))
-		return(-1);
-
-	if (ext) {
-		if (extlen == 0)
-			return(-1);
-		ext->ip6e_len = (extlen >> 3) - 1;
-	}
-
-	return(2);		/* sizeof the next and the length fields */
-}
-
-int
-inet6_opt_append(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
-		 socklen_t len, u_int8_t align, void **databufp)
-{
-	int currentlen = offset, padlen = 0;
-
-	/*
-	 * The option type must have a value from 2 to 255, inclusive.
-	 * (0 and 1 are reserved for the Pad1 and PadN options, respectively.)
-	 */
-	if (type < 2)
-		return(-1);
-
-	/*
-	 * The option data length must have a value between 0 and 255,
-	 * inclusive, and is the length of the option data that follows.
-	 */
-	if (len < 0 || len > 255)
-		return(-1);
-
-	/*
-	 * The align parameter must have a value of 1, 2, 4, or 8.
-	 * The align value can not exceed the value of len.
-	 */
-	if (align != 1 && align != 2 && align != 4 && align != 8)
-		return(-1);
-	if (align > len)
-		return(-1);
-
-	/* Calculate the padding length. */
-	currentlen += 2 + len;	/* 2 means "type + len" */
-	if (currentlen % align)
-		padlen = align - (currentlen % align);
-
-	/* The option must fit in the extension header buffer. */
-	currentlen += padlen;
-	if (extlen &&		/* XXX: right? */
-	    currentlen > extlen)
-		return(-1);
-
-	if (extbuf) {
-		u_int8_t *optp = (u_int8_t *)extbuf + offset;
-
-		if (padlen == 1) {
-			/* insert a Pad1 option */
-			*optp = IP6OPT_PAD1;
-			optp++;
-		}
-		else if (padlen > 0) {
-			/* insert a PadN option for alignment */
-			*optp++ = IP6OPT_PADN;
-			*optp++ = padlen - 2;
-			memset(optp, 0, padlen - 2);
-			optp += (padlen - 2);
-		}
-
-		*optp++ = type;
-		*optp++ = len;
-
-		*databufp = optp;
-	}
-
-	return(currentlen);
-}
-
-int
-inet6_opt_finish(void *extbuf, socklen_t extlen, int offset)
-{
-	int updatelen = offset > 0 ? (1 + ((offset - 1) | 7)) : 0;;
-
-	if (extbuf) {
-		u_int8_t *padp;
-		int padlen = updatelen - offset;
-
-		if (updatelen > extlen)
-			return(-1);
-
-		padp = (u_int8_t *)extbuf + offset;
-		if (padlen == 1)
-			*padp = IP6OPT_PAD1;
-		else if (padlen > 0) {
-			*padp++ = IP6OPT_PADN;
-			*padp++ = (padlen - 2);
-			memset(padp, 0, padlen - 2);
-		}
-	}
-
-	return(updatelen);
-}
-
-int
-inet6_opt_set_val(void *databuf, int offset, void *val, socklen_t vallen)
-{
-
-	memcpy((u_int8_t *)databuf + offset, val, vallen);
-	return(offset + vallen);
-}
-
-int
-inet6_opt_next(void *extbuf, socklen_t extlen, int offset, u_int8_t *typep,
-	       socklen_t *lenp, void **databufp)
-{
-	u_int8_t *optp, *lim;
-	int optlen;
-
-	/* Validate extlen. XXX: is the variable really necessary?? */
-	if (extlen == 0 || (extlen % 8))
-		return(-1);
-	lim = (u_int8_t *)extbuf + extlen;
-
-	/*
-	 * If this is the first time this function called for this options
-	 * header, simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	if (offset == 0) {
-		optp = (u_int8_t *)((struct ip6_hbh *)extbuf + 1);
-	}
-	else
-		optp = (u_int8_t *)extbuf + offset;
-
-	/* Find the next option skipping any padding options. */
-	while(optp < lim) {
-		switch(*optp) {
-		case IP6OPT_PAD1:
-			optp++;
-			break;
-		case IP6OPT_PADN:
-			if ((optlen = ip6optlen(optp, lim)) == 0)
-				goto optend;
-			optp += optlen;
-			break;
-		default:	/* found */
-			if ((optlen = ip6optlen(optp, lim)) == 0)
-				goto optend;
-			*typep = *optp;
-			*lenp = optlen - 2;
-			*databufp = optp + 2;
-			return(optp + optlen - (u_int8_t *)extbuf);
-		}
-	}
-
-  optend:
-	*databufp = NULL; /* for safety */
-	return(-1);
-}
-
-int
-inet6_opt_find(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
-	       socklen_t *lenp, void **databufp)
-{
-	u_int8_t *optp, *lim;
-	int optlen;
-
-	/* Validate extlen. XXX: is the variable really necessary?? */
-	if (extlen == 0 || (extlen % 8))
-		return(-1);
-	lim = (u_int8_t *)extbuf + extlen;
-
-	/*
-	 * If this is the first time this function called for this options
-	 * header, simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	if (offset == 0) {
-		optp = (u_int8_t *)((struct ip6_hbh *)extbuf + 1);
-	}
-	else
-		optp = (u_int8_t *)extbuf + offset;
-
-	/* Find the specified option */
-	while(optp < lim) {
-		if ((optlen = ip6optlen(optp, lim)) == 0)
-			goto optend;
-
-		if (*optp == type) { /* found */
-			*lenp = optlen - 2;
-			*databufp = optp + 2;
-			return(optp + optlen - (u_int8_t *)extbuf);
-		}
-
-		optp += optlen;
-	}
-
-  optend:
-	*databufp = NULL; /* for safety */
-	return(-1);
-}
-
-int
-inet6_opt_get_val(void *databuf, int offset, void *val, socklen_t vallen)
-{
-
-	/* we can't assume alignment here */
-	memcpy(val, (u_int8_t *)databuf + offset, vallen);
-
-	return(offset + vallen);
-}
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
deleted file mode 100644
index cd38c1f..0000000
--- a/lib/libc/net/linkaddr.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <string.h>
-
-/* States*/
-#define NAMING	0
-#define GOTONE	1
-#define GOTTWO	2
-#define RESET	3
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-#define LETTER	(4*3)
-
-void
-link_addr(addr, sdl)
-	const char *addr;
-	struct sockaddr_dl *sdl;
-{
-	char *cp = sdl->sdl_data;
-	char *cplim = sdl->sdl_len + (char *)sdl;
-	int byte = 0, state = NAMING, new;
-
-	bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
-	sdl->sdl_family = AF_LINK;
-	do {
-		state &= ~LETTER;
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0) {
-			state |= END;
-		} else if (state == NAMING &&
-			   (((*addr >= 'A') && (*addr <= 'Z')) ||
-			   ((*addr >= 'a') && (*addr <= 'z'))))
-			state |= LETTER;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case NAMING | DIGIT:
-		case NAMING | LETTER:
-			*cp++ = addr[-1];
-			continue;
-		case NAMING | DELIM:
-			state = RESET;
-			sdl->sdl_nlen = cp - sdl->sdl_data;
-			continue;
-		case GOTTWO | DIGIT:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | DIGIT:
-			state = GOTONE;
-			byte = new;
-			continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO;
-			byte = new + (byte << 4);
-			continue;
-		default: /* | DELIM */
-			state = RESET;
-			*cp++ = byte;
-			byte = 0;
-			continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	sdl->sdl_alen = cp - LLADDR(sdl);
-	new = cp - (char *)sdl;
-	if (new > sizeof(*sdl))
-		sdl->sdl_len = new;
-	return;
-}
-
-static char hexlist[] = "0123456789abcdef";
-
-char *
-link_ntoa(sdl)
-	const struct sockaddr_dl *sdl;
-{
-	static char obuf[64];
-	char *out = obuf;
-	int i;
-	u_char *in = (u_char *)LLADDR(sdl);
-	u_char *inlim = in + sdl->sdl_alen;
-	int firsttime = 1;
-
-	if (sdl->sdl_nlen) {
-		bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
-		out += sdl->sdl_nlen;
-		if (sdl->sdl_alen)
-			*out++ = ':';
-	}
-	while (in < inlim) {
-		if (firsttime)
-			firsttime = 0;
-		else
-			*out++ = '.';
-		i = *in++;
-		if (i > 0xf) {
-			out[1] = hexlist[i & 0xf];
-			i >>= 4;
-			out[0] = hexlist[i];
-			out += 2;
-		} else
-			*out++ = hexlist[i];
-	}
-	*out = 0;
-	return (obuf);
-}
diff --git a/lib/libc/net/map_v4v6.c b/lib/libc/net/map_v4v6.c
deleted file mode 100644
index b095dae..0000000
--- a/lib/libc/net/map_v4v6.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <syslog.h>
-
-typedef union {
-	int32_t al;
-	char ac;
-} align;
-
-void
-_map_v4v6_address(const char *src, char *dst)
-{
-	u_char *p = (u_char *)dst;
-	char tmp[NS_INADDRSZ];
-	int i;
-
-	/* Stash a temporary copy so our caller can update in place. */
-	memcpy(tmp, src, NS_INADDRSZ);
-	/* Mark this ipv6 addr as a mapped ipv4. */
-	for (i = 0; i < 10; i++)
-		*p++ = 0x00;
-	*p++ = 0xff;
-	*p++ = 0xff;
-	/* Retrieve the saved copy and we're done. */
-	memcpy((void*)p, tmp, NS_INADDRSZ);
-}
-
-void
-_map_v4v6_hostent(struct hostent *hp, char **bpp, char *ep) {
-	char **ap;
-
-	if (hp->h_addrtype != AF_INET || hp->h_length != INADDRSZ)
-		return;
-	hp->h_addrtype = AF_INET6;
-	hp->h_length = IN6ADDRSZ;
-	for (ap = hp->h_addr_list; *ap; ap++) {
-		int i = (u_long)*bpp % sizeof(align);
-
-		if (i != 0)
-			i = sizeof(align) - i;
-
-		if ((ep - *bpp) < (i + IN6ADDRSZ)) {
-			/* Out of memory.  Truncate address list here. */
-			*ap = NULL;
-			return;
-		}
-		*bpp += i;
-		_map_v4v6_address(*ap, *bpp);
-		*ap = *bpp;
-		*bpp += IN6ADDRSZ;
-	}
-}
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c
deleted file mode 100644
index f40a30b..0000000
--- a/lib/libc/net/name6.c
+++ /dev/null
@@ -1,2166 +0,0 @@
-/*	$KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- *	Atsushi Onoe <onoe@sm.sony.co.jp>
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/queue.h>
-#include <netinet/in.h>
-#ifdef INET6
-#include <net/if.h>
-#include <net/if_var.h>
-#include <sys/sysctl.h>
-#include <sys/ioctl.h>
-#include <netinet6/in6_var.h>	/* XXX */
-#endif
-
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "netdb_private.h"
-#include "res_config.h"
-#include "res_private.h"
-
-#ifndef _PATH_HOSTS
-#define	_PATH_HOSTS	"/etc/hosts"
-#endif
-
-#ifndef MAXALIASES
-#define	MAXALIASES	10
-#endif
-#ifndef	MAXADDRS
-#define	MAXADDRS	20
-#endif
-#ifndef MAXDNAME
-#define	MAXDNAME	1025
-#endif
-
-#ifdef INET6
-#define	ADDRLEN(af)	((af) == AF_INET6 ? sizeof(struct in6_addr) : \
-					    sizeof(struct in_addr))
-#else
-#define	ADDRLEN(af)	sizeof(struct in_addr)
-#endif
-
-#define	MAPADDR(ab, ina) \
-do {									\
-	memcpy(&(ab)->map_inaddr, ina, sizeof(struct in_addr));		\
-	memset((ab)->map_zero, 0, sizeof((ab)->map_zero));		\
-	memset((ab)->map_one, 0xff, sizeof((ab)->map_one));		\
-} while (0)
-#define	MAPADDRENABLED(flags) \
-	(((flags) & AI_V4MAPPED) || \
-	 (((flags) & AI_V4MAPPED_CFG) && _mapped_addr_enabled()))
-
-union inx_addr {
-	struct in_addr	in_addr;
-#ifdef INET6
-	struct in6_addr	in6_addr;
-#endif
-	struct {
-		u_char	mau_zero[10];
-		u_char	mau_one[2];
-		struct in_addr mau_inaddr;
-	}		map_addr_un;
-#define	map_zero	map_addr_un.mau_zero
-#define	map_one		map_addr_un.mau_one
-#define	map_inaddr	map_addr_un.mau_inaddr
-};
-
-struct policyqueue {
-	TAILQ_ENTRY(policyqueue) pc_entry;
-#ifdef INET6
-	struct in6_addrpolicy pc_policy;
-#endif
-};
-TAILQ_HEAD(policyhead, policyqueue);
-
-#define AIO_SRCFLAG_DEPRECATED	0x1
-
-struct hp_order {
-	union {
-		struct sockaddr_storage aiou_ss;
-		struct sockaddr aiou_sa;
-	} aio_src_un;
-#define aio_srcsa aio_src_un.aiou_sa
-	uint32_t aio_srcflag;
-	int aio_srcscope;
-	int aio_dstscope;
-	struct policyqueue *aio_srcpolicy;
-	struct policyqueue *aio_dstpolicy;
-	union {
-		struct sockaddr_storage aiou_ss;
-		struct sockaddr aiou_sa;
-	} aio_un;
-#define aio_sa aio_un.aiou_sa
-	int aio_matchlen;
-	char *aio_h_addr;
-};
-
-static struct	 hostent *_hpcopy(struct hostent *, int *);
-static struct	 hostent *_hpaddr(int, const char *, void *, int *);
-static struct	 hostent *_hpmerge(struct hostent *, struct hostent *, int *);
-#ifdef INET6
-static struct	 hostent *_hpmapv6(struct hostent *, int *);
-#endif
-static struct	 hostent *_hpsort(struct hostent *, res_state);
-static struct	 hostent *_ghbyname(const char *, int, int, int *);
-static char	*_hgetword(char **);
-static int	 _mapped_addr_enabled(void);
-
-static struct	 hostent *_hpreorder(struct hostent *);
-static int	 get_addrselectpolicy(struct policyhead *);
-static void	 free_addrselectpolicy(struct policyhead *);
-static struct	 policyqueue *match_addrselectpolicy(struct sockaddr *,
-	struct policyhead *);
-static void	 set_source(struct hp_order *, struct policyhead *);
-static int	 matchlen(struct sockaddr *, struct sockaddr *);
-static int	 comp_dst(const void *, const void *);
-static int	 gai_addr2scopetype(struct sockaddr *);
-
-static FILE	*_files_open(int *);
-static int	 _files_ghbyname(void *, void *, va_list);
-static int	 _files_ghbyaddr(void *, void *, va_list);
-#ifdef YP
-static int	 _nis_ghbyname(void *, void *, va_list);
-static int	 _nis_ghbyaddr(void *, void *, va_list);
-#endif
-static int	 _dns_ghbyname(void *, void *, va_list);
-static int	 _dns_ghbyaddr(void *, void *, va_list);
-static void	 _dns_shent(int) __unused;
-static void	 _dns_ehent(void) __unused;
-#ifdef ICMPNL
-static int	 _icmp_ghbyaddr(void *, void *, va_list);
-#endif /* ICMPNL */
-
-/* Host lookup order if nsswitch.conf is broken or nonexistant */
-static const ns_src default_src[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NSSRC_DNS, NS_SUCCESS },
-#ifdef ICMPNL
-#define NSSRC_ICMP "icmp"
-	{ NSSRC_ICMP, NS_SUCCESS },
-#endif
-	{ 0 }
-};
-
-/*
- * Check if kernel supports mapped address.
- *	implementation dependent
- */
-#ifdef __KAME__
-#include <sys/sysctl.h>
-#endif /* __KAME__ */
-
-static int
-_mapped_addr_enabled(void)
-{
-	/* implementation dependent check */
-#if defined(__KAME__) && defined(IPV6CTL_MAPPED_ADDR)
-	int mib[4];
-	size_t len;
-	int val;
-
-	mib[0] = CTL_NET;
-	mib[1] = PF_INET6;
-	mib[2] = IPPROTO_IPV6;
-	mib[3] = IPV6CTL_MAPPED_ADDR;
-	len = sizeof(val);
-	if (sysctl(mib, 4, &val, &len, 0, 0) == 0 && val != 0)
-		return 1;
-#endif /* __KAME__ && IPV6CTL_MAPPED_ADDR */
-	return 0;
-}
-
-/*
- * Functions defined in RFC2553
- *	getipnodebyname, getipnodebyaddr, freehostent
- */
-
-static struct hostent *
-_ghbyname(const char *name, int af, int flags, int *errp)
-{
-	struct hostent *hp;
-	int rval;
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_ghbyname, NULL)
-		{ NSSRC_DNS, _dns_ghbyname, NULL },
-		NS_NIS_CB(_nis_ghbyname, NULL)
-		{ 0 }
-	};
-
-	if (flags & AI_ADDRCONFIG) {
-		int s;
-
-		if ((s = _socket(af, SOCK_DGRAM, 0)) < 0)
-			return NULL;
-		/*
-		 * TODO:
-		 * Note that implementation dependent test for address
-		 * configuration should be done everytime called
-		 * (or apropriate interval),
-		 * because addresses will be dynamically assigned or deleted.
-		 */
-		_close(s);
-	}
-
-	rval = _nsdispatch(&hp, dtab, NSDB_HOSTS, "ghbyname", default_src,
-			  name, af, errp);
-	return (rval == NS_SUCCESS) ? hp : NULL;
-}
-
-struct hostent *
-getipnodebyname(const char *name, int af, int flags, int *errp)
-{
-	struct hostent *hp;
-	union inx_addr addrbuf;
-	res_state statp;
-
-	switch (af) {
-	case AF_INET:
-#ifdef INET6
-	case AF_INET6:
-#endif
-		break;
-	default:
-		*errp = NO_RECOVERY;
-		return NULL;
-	}
-
-#ifdef INET6
-	/* special case for literal address */
-	if (inet_pton(AF_INET6, name, &addrbuf) == 1) {
-		if (af != AF_INET6) {
-			*errp = HOST_NOT_FOUND;
-			return NULL;
-		}
-		return _hpaddr(af, name, &addrbuf, errp);
-	}
-#endif
-	if (inet_aton(name, (struct in_addr *)&addrbuf) == 1) {
-		if (af != AF_INET) {
-			if (MAPADDRENABLED(flags)) {
-				MAPADDR(&addrbuf, &addrbuf.in_addr);
-			} else {
-				*errp = HOST_NOT_FOUND;
-				return NULL;
-			}
-		}
-		return _hpaddr(af, name, &addrbuf, errp);
-	}
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0) {
-		if (res_ninit(statp) < 0) {
-			*errp = NETDB_INTERNAL;
-			return NULL;
-		}
-	}
-
-	*errp = HOST_NOT_FOUND;
-	hp = _ghbyname(name, af, flags, errp);
-
-#ifdef INET6
-	if (af == AF_INET6 && ((flags & AI_ALL) || hp == NULL) &&
-	    MAPADDRENABLED(flags)) {
-		struct hostent *hp2 = _ghbyname(name, AF_INET, flags, errp);
-		if (hp == NULL)
-			hp = _hpmapv6(hp2, errp);
-		else {
-			if (hp2 && strcmp(hp->h_name, hp2->h_name) != 0) {
-				freehostent(hp2);
-				hp2 = NULL;
-			}
-			hp = _hpmerge(hp, hp2, errp);
-		}
-	}
-#endif
-	return _hpreorder(_hpsort(hp, statp));
-}
-
-struct hostent *
-getipnodebyaddr(const void *src, size_t len, int af, int *errp)
-{
-	struct hostent *hp;
-	int rval;
-#ifdef INET6
-	struct in6_addr addrbuf;
-#else
-	struct in_addr addrbuf;
-#endif
-
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_ghbyaddr, NULL)
-		{ NSSRC_DNS, _dns_ghbyaddr, NULL },
-		NS_NIS_CB(_nis_ghbyaddr, NULL)
-#ifdef ICMPNL
-		{ NSSRC_ICMP, _icmp_ghbyaddr, NULL },
-#endif
-		{ 0 }
-	};
-
-	*errp = HOST_NOT_FOUND;
-
-	switch (af) {
-	case AF_INET:
-		if (len != sizeof(struct in_addr)) {
-			*errp = NO_RECOVERY;
-			return NULL;
-		}
-		if ((long)src & ~(sizeof(struct in_addr) - 1)) {
-			memcpy(&addrbuf, src, len);
-			src = &addrbuf;
-		}
-		if (((struct in_addr *)src)->s_addr == 0)
-			return NULL;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		if (len != sizeof(struct in6_addr)) {
-			*errp = NO_RECOVERY;
-			return NULL;
-		}
-		if ((long)src & ~(sizeof(struct in6_addr) / 2 - 1)) {	/*XXX*/
-			memcpy(&addrbuf, src, len);
-			src = &addrbuf;
-		}
-		if (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *)src))
-			return NULL;
-		if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)src)
-		||  IN6_IS_ADDR_V4COMPAT((struct in6_addr *)src)) {
-			src = (char *)src +
-			    (sizeof(struct in6_addr) - sizeof(struct in_addr));
-			af = AF_INET;
-			len = sizeof(struct in_addr);
-		}
-		break;
-#endif
-	default:
-		*errp = NO_RECOVERY;
-		return NULL;
-	}
-
-	rval = _nsdispatch(&hp, dtab, NSDB_HOSTS, "ghbyaddr", default_src,
-			  src, len, af, errp);
-	return (rval == NS_SUCCESS) ? hp : NULL;
-}
-
-void
-freehostent(struct hostent *ptr)
-{
-	free(ptr);
-}
-
-/*
- * Private utility functions
- */
-
-/*
- * _hpcopy: allocate and copy hostent structure
- */
-static struct hostent *
-_hpcopy(struct hostent *hp, int *errp)
-{
-	struct hostent *nhp;
-	char *cp, **pp;
-	int size, addrsize;
-	int nalias = 0, naddr = 0;
-	int al_off;
-	int i;
-
-	if (hp == NULL)
-		return hp;
-
-	/* count size to be allocated */
-	size = sizeof(struct hostent);
-	if (hp->h_name != NULL)
-		size += strlen(hp->h_name) + 1;
-	if ((pp = hp->h_aliases) != NULL) {
-		for (i = 0; *pp != NULL; i++, pp++) {
-			if (**pp != '\0') {
-				size += strlen(*pp) + 1;
-				nalias++;
-			}
-		}
-	}
-	/* adjust alignment */
-	size = ALIGN(size);
-	al_off = size;
-	size += sizeof(char *) * (nalias + 1);
-	addrsize = ALIGN(hp->h_length);
-	if ((pp = hp->h_addr_list) != NULL) {
-		while (*pp++ != NULL)
-			naddr++;
-	}
-	size += addrsize * naddr;
-	size += sizeof(char *) * (naddr + 1);
-
-	/* copy */
-	if ((nhp = (struct hostent *)malloc(size)) == NULL) {
-		*errp = TRY_AGAIN;
-		return NULL;
-	}
-	cp = (char *)&nhp[1];
-	if (hp->h_name != NULL) {
-		nhp->h_name = cp;
-		strcpy(cp, hp->h_name);
-		cp += strlen(cp) + 1;
-	} else
-		nhp->h_name = NULL;
-	nhp->h_aliases = (char **)((char *)nhp + al_off);
-	if ((pp = hp->h_aliases) != NULL) {
-		for (i = 0; *pp != NULL; pp++) {
-			if (**pp != '\0') {
-				nhp->h_aliases[i++] = cp;
-				strcpy(cp, *pp);
-				cp += strlen(cp) + 1;
-			}
-		}
-	}
-	nhp->h_aliases[nalias] = NULL;
-	cp = (char *)&nhp->h_aliases[nalias + 1];
-	nhp->h_addrtype = hp->h_addrtype;
-	nhp->h_length = hp->h_length;
-	nhp->h_addr_list = (char **)cp;
-	if ((pp = hp->h_addr_list) != NULL) {
-		cp = (char *)&nhp->h_addr_list[naddr + 1];
-		for (i = 0; *pp != NULL; pp++) {
-			nhp->h_addr_list[i++] = cp;
-			memcpy(cp, *pp, hp->h_length);
-			cp += addrsize;
-		}
-	}
-	nhp->h_addr_list[naddr] = NULL;
-	return nhp;
-}
-
-/*
- * _hpaddr: construct hostent structure with one address
- */
-static struct hostent *
-_hpaddr(int af, const char *name, void *addr, int *errp)
-{
-	struct hostent *hp, hpbuf;
-	char *addrs[2];
-
-	hp = &hpbuf;
-	hp->h_name = (char *)name;
-	hp->h_aliases = NULL;
-	hp->h_addrtype = af;
-	hp->h_length = ADDRLEN(af);
-	hp->h_addr_list = addrs;
-	addrs[0] = (char *)addr;
-	addrs[1] = NULL;
-	return _hpcopy(hp, errp);
-}
-
-/*
- * _hpmerge: merge 2 hostent structure, arguments will be freed
- */
-static struct hostent *
-_hpmerge(struct hostent *hp1, struct hostent *hp2, int *errp)
-{
-	int i, j;
-	int naddr, nalias;
-	char **pp;
-	struct hostent *hp, hpbuf;
-	char *aliases[MAXALIASES + 1], *addrs[MAXADDRS + 1];
-	union inx_addr addrbuf[MAXADDRS];
-
-	if (hp1 == NULL)
-		return hp2;
-	if (hp2 == NULL)
-		return hp1;
-
-#define	HP(i)	(i == 1 ? hp1 : hp2)
-	hp = &hpbuf;
-	hp->h_name = (hp1->h_name != NULL ? hp1->h_name : hp2->h_name);
-	hp->h_aliases = aliases;
-	nalias = 0;
-	for (i = 1; i <= 2; i++) {
-		if ((pp = HP(i)->h_aliases) == NULL)
-			continue;
-		for (; nalias < MAXALIASES && *pp != NULL; pp++) {
-			/* check duplicates */
-			for (j = 0; j < nalias; j++)
-				if (strcasecmp(*pp, aliases[j]) == 0)
-					break;
-			if (j == nalias)
-				aliases[nalias++] = *pp;
-		}
-	}
-	aliases[nalias] = NULL;
-#ifdef INET6
-	if (hp1->h_length != hp2->h_length) {
-		hp->h_addrtype = AF_INET6;
-		hp->h_length = sizeof(struct in6_addr);
-	} else {
-#endif
-		hp->h_addrtype = hp1->h_addrtype;
-		hp->h_length = hp1->h_length;
-#ifdef INET6
-	}
-#endif
-	hp->h_addr_list = addrs;
-	naddr = 0;
-	for (i = 1; i <= 2; i++) {
-		if ((pp = HP(i)->h_addr_list) == NULL)
-			continue;
-		if (HP(i)->h_length == hp->h_length) {
-			while (naddr < MAXADDRS && *pp != NULL)
-				addrs[naddr++] = *pp++;
-		} else {
-			/* copy IPv4 addr as mapped IPv6 addr */
-			while (naddr < MAXADDRS && *pp != NULL) {
-				MAPADDR(&addrbuf[naddr], *pp++);
-				addrs[naddr] = (char *)&addrbuf[naddr];
-				naddr++;
-			}
-		}
-	}
-	addrs[naddr] = NULL;
-	hp = _hpcopy(hp, errp);
-	freehostent(hp1);
-	freehostent(hp2);
-	return hp;
-}
-
-/*
- * _hpmapv6: convert IPv4 hostent into IPv4-mapped IPv6 addresses
- */
-#ifdef INET6
-static struct hostent *
-_hpmapv6(struct hostent *hp, int *errp)
-{
-	struct hostent *hp6;
-
-	if (hp == NULL)
-		return NULL;
-	if (hp->h_addrtype == AF_INET6)
-		return hp;
-
-	/* make dummy hostent to convert IPv6 address */
-	if ((hp6 = (struct hostent *)malloc(sizeof(struct hostent))) == NULL) {
-		*errp = TRY_AGAIN;
-		return NULL;
-	}
-	hp6->h_name = NULL;
-	hp6->h_aliases = NULL;
-	hp6->h_addrtype = AF_INET6;
-	hp6->h_length = sizeof(struct in6_addr);
-	hp6->h_addr_list = NULL;
-	return _hpmerge(hp6, hp, errp);
-}
-#endif
-
-/*
- * _hpsort: sort address by sortlist
- */
-static struct hostent *
-_hpsort(struct hostent *hp, res_state statp)
-{
-	int i, j, n;
-	u_char *ap, *sp, *mp, **pp;
-	char t;
-	char order[MAXADDRS];
-	int nsort = statp->nsort;
-
-	if (hp == NULL || hp->h_addr_list[1] == NULL || nsort == 0)
-		return hp;
-	for (i = 0; (ap = (u_char *)hp->h_addr_list[i]); i++) {
-		for (j = 0; j < nsort; j++) {
-#ifdef INET6
-			if (statp->_u._ext.ext->sort_list[j].af !=
-			    hp->h_addrtype)
-				continue;
-			sp = (u_char *)&statp->_u._ext.ext->sort_list[j].addr;
-			mp = (u_char *)&statp->_u._ext.ext->sort_list[j].mask;
-#else
-			sp = (u_char *)&statp->sort_list[j].addr;
-			mp = (u_char *)&statp->sort_list[j].mask;
-#endif
-			for (n = 0; n < hp->h_length; n++) {
-				if ((ap[n] & mp[n]) != sp[n])
-					break;
-			}
-			if (n == hp->h_length)
-				break;
-		}
-		order[i] = j;
-	}
-	n = i;
-	pp = (u_char **)hp->h_addr_list;
-	for (i = 0; i < n - 1; i++) {
-		for (j = i + 1; j < n; j++) {
-			if (order[i] > order[j]) {
-				ap = pp[i];
-				pp[i] = pp[j];
-				pp[j] = ap;
-				t = order[i];
-				order[i] = order[j];
-				order[j] = t;
-			}
-		}
-	}
-	return hp;
-}
-
-static char *
-_hgetword(char **pp)
-{
-	char c, *p, *ret;
-	const char *sp;
-	static const char sep[] = "# \t\n";
-
-	ret = NULL;
-	for (p = *pp; (c = *p) != '\0'; p++) {
-		for (sp = sep; *sp != '\0'; sp++) {
-			if (c == *sp)
-				break;
-		}
-		if (c == '#')
-			p[1] = '\0';	/* ignore rest of line */
-		if (ret == NULL) {
-			if (*sp == '\0')
-				ret = p;
-		} else {
-			if (*sp != '\0') {
-				*p++ = '\0';
-				break;
-			}
-		}
-	}
-	*pp = p;
-	if (ret == NULL || *ret == '\0')
-		return NULL;
-	return ret;
-}
-
-/*
- * _hpreorder: sort address by default address selection
- */
-static struct hostent *
-_hpreorder(struct hostent *hp)
-{
-	struct hp_order *aio;
-	int i, n;
-	char *ap;
-	struct sockaddr *sa;
-	struct policyhead policyhead;
-
-	if (hp == NULL)
-		return hp;
-
-	switch (hp->h_addrtype) {
-	case AF_INET:
-#ifdef INET6
-	case AF_INET6:
-#endif
-		break;
-	default:
-		free_addrselectpolicy(&policyhead);
-		return hp;
-	}
-
-	/* count the number of addrinfo elements for sorting. */
-	for (n = 0; hp->h_addr_list[n] != NULL; n++)
-		;
-
-	/*
-	 * If the number is small enough, we can skip the reordering process.
-	 */
-	if (n <= 1)
-		return hp;
-
-	/* allocate a temporary array for sort and initialization of it. */
-	if ((aio = malloc(sizeof(*aio) * n)) == NULL)
-		return hp;	/* give up reordering */
-	memset(aio, 0, sizeof(*aio) * n);
-
-	/* retrieve address selection policy from the kernel */
-	TAILQ_INIT(&policyhead);
-	if (!get_addrselectpolicy(&policyhead)) {
-		/* no policy is installed into kernel, we don't sort. */
-		free(aio);
-		return hp;
-	}
-
-	for (i = 0; i < n; i++) {
-		ap = hp->h_addr_list[i];
-		aio[i].aio_h_addr = ap;
-		sa = &aio[i].aio_sa;
-		switch (hp->h_addrtype) {
-		case AF_INET:
-			sa->sa_family = AF_INET;
-			sa->sa_len = sizeof(struct sockaddr_in);
-			memcpy(&((struct sockaddr_in *)sa)->sin_addr, ap,
-			    sizeof(struct in_addr));
-			break;
-#ifdef INET6
-		case AF_INET6:
-			if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ap)) {
-				sa->sa_family = AF_INET;
-				sa->sa_len = sizeof(struct sockaddr_in);
-				memcpy(&((struct sockaddr_in *)sa)->sin_addr,
-				    &ap[12], sizeof(struct in_addr));
-			} else {
-				sa->sa_family = AF_INET6;
-				sa->sa_len = sizeof(struct sockaddr_in6);
-				memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr,
-				    ap, sizeof(struct in6_addr));
-			}
-			break;
-#endif
-		}
-		aio[i].aio_dstscope = gai_addr2scopetype(sa);
-		aio[i].aio_dstpolicy = match_addrselectpolicy(sa, &policyhead);
-		set_source(&aio[i], &policyhead);
-	}
-
-	/* perform sorting. */
-	qsort(aio, n, sizeof(*aio), comp_dst);
-
-	/* reorder the h_addr_list. */
-	for (i = 0; i < n; i++)
-		hp->h_addr_list[i] = aio[i].aio_h_addr;
-
-	/* cleanup and return */
-	free(aio);
-	free_addrselectpolicy(&policyhead);
-	return hp;
-}
-
-static int
-get_addrselectpolicy(struct policyhead *head)
-{
-#ifdef INET6
-	int mib[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_ADDRCTLPOLICY };
-	size_t l;
-	char *buf;
-	struct in6_addrpolicy *pol, *ep;
-
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0)
-		return (0);
-	if ((buf = malloc(l)) == NULL)
-		return (0);
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
-		free(buf);
-		return (0);
-	}
-
-	ep = (struct in6_addrpolicy *)(buf + l);
-	for (pol = (struct in6_addrpolicy *)buf; pol + 1 <= ep; pol++) {
-		struct policyqueue *new;
-
-		if ((new = malloc(sizeof(*new))) == NULL) {
-			free_addrselectpolicy(head); /* make the list empty */
-			break;
-		}
-		new->pc_policy = *pol;
-		TAILQ_INSERT_TAIL(head, new, pc_entry);
-	}
-
-	free(buf);
-	return (1);
-#else
-	return (0);
-#endif
-}
-
-static void
-free_addrselectpolicy(struct policyhead *head)
-{
-	struct policyqueue *ent, *nent;
-
-	for (ent = TAILQ_FIRST(head); ent; ent = nent) {
-		nent = TAILQ_NEXT(ent, pc_entry);
-		TAILQ_REMOVE(head, ent, pc_entry);
-		free(ent);
-	}
-}
-
-static struct policyqueue *
-match_addrselectpolicy(struct sockaddr *addr, struct policyhead *head)
-{
-#ifdef INET6
-	struct policyqueue *ent, *bestent = NULL;
-	struct in6_addrpolicy *pol;
-	int matchlen, bestmatchlen = -1;
-	u_char *mp, *ep, *k, *p, m;
-	struct sockaddr_in6 key;
-
-	switch(addr->sa_family) {
-	case AF_INET6:
-		key = *(struct sockaddr_in6 *)addr;
-		break;
-	case AF_INET:
-		/* convert the address into IPv4-mapped IPv6 address. */
-		memset(&key, 0, sizeof(key));
-		key.sin6_family = AF_INET6;
-		key.sin6_len = sizeof(key);
-		key.sin6_addr.s6_addr[10] = 0xff;
-		key.sin6_addr.s6_addr[11] = 0xff;
-		memcpy(&key.sin6_addr.s6_addr[12],
-		       &((struct sockaddr_in *)addr)->sin_addr, 4);
-		break;
-	default:
-		return(NULL);
-	}
-
-	for (ent = TAILQ_FIRST(head); ent; ent = TAILQ_NEXT(ent, pc_entry)) {
-		pol = &ent->pc_policy;
-		matchlen = 0;
-
-		mp = (u_char *)&pol->addrmask.sin6_addr;
-		ep = mp + 16;	/* XXX: scope field? */
-		k = (u_char *)&key.sin6_addr;
-		p = (u_char *)&pol->addr.sin6_addr;
-		for (; mp < ep && *mp; mp++, k++, p++) {
-			m = *mp;
-			if ((*k & m) != *p)
-				goto next; /* not match */
-			if (m == 0xff) /* short cut for a typical case */
-				matchlen += 8;
-			else {
-				while (m >= 0x80) {
-					matchlen++;
-					m <<= 1;
-				}
-			}
-		}
-
-		/* matched.  check if this is better than the current best. */
-		if (matchlen > bestmatchlen) {
-			bestent = ent;
-			bestmatchlen = matchlen;
-		}
-
-	  next:
-		continue;
-	}
-
-	return(bestent);
-#else
-	return(NULL);
-#endif
-
-}
-
-static void
-set_source(struct hp_order *aio, struct policyhead *ph)
-{
-	struct sockaddr_storage ss = aio->aio_un.aiou_ss;
-	socklen_t srclen;
-	int s;
-
-	/* set unspec ("no source is available"), just in case */
-	aio->aio_srcsa.sa_family = AF_UNSPEC;
-	aio->aio_srcscope = -1;
-
-	switch(ss.ss_family) {
-	case AF_INET:
-		((struct sockaddr_in *)&ss)->sin_port = htons(1);
-		break;
-#ifdef INET6
-	case AF_INET6:
-		((struct sockaddr_in6 *)&ss)->sin6_port = htons(1);
-		break;
-#endif
-	default:		/* ignore unsupported AFs explicitly */
-		return;
-	}
-
-	/* open a socket to get the source address for the given dst */
-	if ((s = _socket(ss.ss_family, SOCK_DGRAM, IPPROTO_UDP)) < 0)
-		return;		/* give up */
-	if (_connect(s, (struct sockaddr *)&ss, ss.ss_len) < 0)
-		goto cleanup;
-	srclen = ss.ss_len;
-	if (_getsockname(s, &aio->aio_srcsa, &srclen) < 0) {
-		aio->aio_srcsa.sa_family = AF_UNSPEC;
-		goto cleanup;
-	}
-	aio->aio_srcscope = gai_addr2scopetype(&aio->aio_srcsa);
-	aio->aio_srcpolicy = match_addrselectpolicy(&aio->aio_srcsa, ph);
-	aio->aio_matchlen = matchlen(&aio->aio_srcsa, (struct sockaddr *)&ss);
-#ifdef INET6
-	if (ss.ss_family == AF_INET6) {
-		struct in6_ifreq ifr6;
-		uint32_t flags6;
-
-		/* XXX: interface name should not be hardcoded */
-		strncpy(ifr6.ifr_name, "lo0", sizeof(ifr6.ifr_name));
-		memset(&ifr6, 0, sizeof(ifr6));
-		memcpy(&ifr6.ifr_addr, &ss, ss.ss_len);
-		if (_ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) == 0) {
-			flags6 = ifr6.ifr_ifru.ifru_flags6;
-			if ((flags6 & IN6_IFF_DEPRECATED))
-				aio->aio_srcflag |= AIO_SRCFLAG_DEPRECATED;
-		}
-	}
-#endif
-
-  cleanup:
-	_close(s);
-	return;
-}
-
-static int
-matchlen(struct sockaddr *src, struct sockaddr *dst)
-{
-	int match = 0;
-	u_char *s, *d;
-	u_char *lim, r;
-	int addrlen;
-
-	switch (src->sa_family) {
-#ifdef INET6
-	case AF_INET6:
-		s = (u_char *)&((struct sockaddr_in6 *)src)->sin6_addr;
-		d = (u_char *)&((struct sockaddr_in6 *)dst)->sin6_addr;
-		addrlen = sizeof(struct in6_addr);
-		lim = s + addrlen;
-		break;
-#endif
-	case AF_INET:
-		s = (u_char *)&((struct sockaddr_in *)src)->sin_addr;
-		d = (u_char *)&((struct sockaddr_in *)dst)->sin_addr;
-		addrlen = sizeof(struct in_addr);
-		lim = s + addrlen;
-		break;
-	default:
-		return(0);
-	}
-
-	while (s < lim)
-		if ((r = (*d++ ^ *s++)) != 0) {
-			while (r < addrlen * 8) {
-				match++;
-				r <<= 1;
-			}
-			break;
-		} else
-			match += 8;
-	return(match);
-}
-
-static int
-comp_dst(const void *arg1, const void *arg2)
-{
-	const struct hp_order *dst1 = arg1, *dst2 = arg2;
-
-	/*
-	 * Rule 1: Avoid unusable destinations.
-	 * XXX: we currently do not consider if an appropriate route exists.
-	 */
-	if (dst1->aio_srcsa.sa_family != AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family == AF_UNSPEC) {
-		return(-1);
-	}
-	if (dst1->aio_srcsa.sa_family == AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family != AF_UNSPEC) {
-		return(1);
-	}
-
-	/* Rule 2: Prefer matching scope. */
-	if (dst1->aio_dstscope == dst1->aio_srcscope &&
-	    dst2->aio_dstscope != dst2->aio_srcscope) {
-		return(-1);
-	}
-	if (dst1->aio_dstscope != dst1->aio_srcscope &&
-	    dst2->aio_dstscope == dst2->aio_srcscope) {
-		return(1);
-	}
-
-	/* Rule 3: Avoid deprecated addresses. */
-	if (dst1->aio_srcsa.sa_family != AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family != AF_UNSPEC) {
-		if (!(dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) &&
-		    (dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) {
-			return(-1);
-		}
-		if ((dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) &&
-		    !(dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) {
-			return(1);
-		}
-	}
-
-	/* Rule 4: Prefer home addresses. */
-	/* XXX: not implemented yet */
-
-	/* Rule 5: Prefer matching label. */
-#ifdef INET6
-	if (dst1->aio_srcpolicy && dst1->aio_dstpolicy &&
-	    dst1->aio_srcpolicy->pc_policy.label ==
-	    dst1->aio_dstpolicy->pc_policy.label &&
-	    (dst2->aio_srcpolicy == NULL || dst2->aio_dstpolicy == NULL ||
-	     dst2->aio_srcpolicy->pc_policy.label !=
-	     dst2->aio_dstpolicy->pc_policy.label)) {
-		return(-1);
-	}
-	if (dst2->aio_srcpolicy && dst2->aio_dstpolicy &&
-	    dst2->aio_srcpolicy->pc_policy.label ==
-	    dst2->aio_dstpolicy->pc_policy.label &&
-	    (dst1->aio_srcpolicy == NULL || dst1->aio_dstpolicy == NULL ||
-	     dst1->aio_srcpolicy->pc_policy.label !=
-	     dst1->aio_dstpolicy->pc_policy.label)) {
-		return(1);
-	}
-#endif
-
-	/* Rule 6: Prefer higher precedence. */
-#ifdef INET6
-	if (dst1->aio_dstpolicy &&
-	    (dst2->aio_dstpolicy == NULL ||
-	     dst1->aio_dstpolicy->pc_policy.preced >
-	     dst2->aio_dstpolicy->pc_policy.preced)) {
-		return(-1);
-	}
-	if (dst2->aio_dstpolicy &&
-	    (dst1->aio_dstpolicy == NULL ||
-	     dst2->aio_dstpolicy->pc_policy.preced >
-	     dst1->aio_dstpolicy->pc_policy.preced)) {
-		return(1);
-	}
-#endif
-
-	/* Rule 7: Prefer native transport. */
-	/* XXX: not implemented yet */
-
-	/* Rule 8: Prefer smaller scope. */
-	if (dst1->aio_dstscope >= 0 &&
-	    dst1->aio_dstscope < dst2->aio_dstscope) {
-		return(-1);
-	}
-	if (dst2->aio_dstscope >= 0 &&
-	    dst2->aio_dstscope < dst1->aio_dstscope) {
-		return(1);
-	}
-
-	/*
-	 * Rule 9: Use longest matching prefix.
-	 * We compare the match length in a same AF only.
-	 */
-	if (dst1->aio_sa.sa_family == dst2->aio_sa.sa_family) {
-		if (dst1->aio_matchlen > dst2->aio_matchlen) {
-			return(-1);
-		}
-		if (dst1->aio_matchlen < dst2->aio_matchlen) {
-			return(1);
-		}
-	}
-
-	/* Rule 10: Otherwise, leave the order unchanged. */
-	return(-1);
-}
-
-/*
- * Copy from scope.c.
- * XXX: we should standardize the functions and link them as standard
- * library.
- */
-static int
-gai_addr2scopetype(struct sockaddr *sa)
-{
-#ifdef INET6
-	struct sockaddr_in6 *sa6;
-#endif
-	struct sockaddr_in *sa4;
-
-	switch(sa->sa_family) {
-#ifdef INET6
-	case AF_INET6:
-		sa6 = (struct sockaddr_in6 *)sa;
-		if (IN6_IS_ADDR_MULTICAST(&sa6->sin6_addr)) {
-			/* just use the scope field of the multicast address */
-			return(sa6->sin6_addr.s6_addr[2] & 0x0f);
-		}
-		/*
-		 * Unicast addresses: map scope type to corresponding scope
-		 * value defined for multcast addresses.
-		 * XXX: hardcoded scope type values are bad...
-		 */
-		if (IN6_IS_ADDR_LOOPBACK(&sa6->sin6_addr))
-			return(1); /* node local scope */
-		if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr))
-			return(2); /* link-local scope */
-		if (IN6_IS_ADDR_SITELOCAL(&sa6->sin6_addr))
-			return(5); /* site-local scope */
-		return(14);	/* global scope */
-		break;
-#endif
-	case AF_INET:
-		/*
-		 * IPv4 pseudo scoping according to RFC 3484.
-		 */
-		sa4 = (struct sockaddr_in *)sa;
-		/* IPv4 autoconfiguration addresses have link-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 169 &&
-		    ((u_char *)&sa4->sin_addr)[1] == 254)
-			return(2);
-		/* Private addresses have site-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 10 ||
-		    (((u_char *)&sa4->sin_addr)[0] == 172 &&
-		     (((u_char *)&sa4->sin_addr)[1] & 0xf0) == 16) ||
-		    (((u_char *)&sa4->sin_addr)[0] == 192 &&
-		     ((u_char *)&sa4->sin_addr)[1] == 168))
-			return(14);	/* XXX: It should be 5 unless NAT */
-		/* Loopback addresses have link-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 127)
-			return(2);
-		return(14);
-		break;
-	default:
-		errno = EAFNOSUPPORT; /* is this a good error? */
-		return(-1);
-	}
-}
-
-/*
- * FILES (/etc/hosts)
- */
-
-static FILE *
-_files_open(int *errp)
-{
-	FILE *fp;
-	fp = fopen(_PATH_HOSTS, "r");
-	if (fp == NULL)
-		*errp = NO_RECOVERY;
-	return fp;
-}
-
-static int
-_files_ghbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	int *errp;
-	int match, nalias;
-	char *p, *line, *addrstr, *cname;
-	FILE *fp;
-	struct hostent *rethp, *hp, hpbuf;
-	char *aliases[MAXALIASES + 1], *addrs[2];
-	union inx_addr addrbuf;
-	char buf[BUFSIZ];
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-	*(struct hostent **)rval = NULL;
-
-	if ((fp = _files_open(errp)) == NULL)
-		return NS_UNAVAIL;
-	rethp = hp = NULL;
-
-	while (fgets(buf, sizeof(buf), fp)) {
-		line = buf;
-		if ((addrstr = _hgetword(&line)) == NULL
-		||  (cname = _hgetword(&line)) == NULL)
-			continue;
-		match = (strcasecmp(cname, name) == 0);
-		nalias = 0;
-		while ((p = _hgetword(&line)) != NULL) {
-			if (!match)
-				match = (strcasecmp(p, name) == 0);
-			if (nalias < MAXALIASES)
-				aliases[nalias++] = p;
-		}
-		if (!match)
-			continue;
-		switch (af) {
-		case AF_INET:
-			if (inet_aton(addrstr, (struct in_addr *)&addrbuf)
-			    != 1) {
-				*errp = NO_DATA;	/* name found */
-				continue;
-			}
-			break;
-#ifdef INET6
-		case AF_INET6:
-			if (inet_pton(af, addrstr, &addrbuf) != 1) {
-				*errp = NO_DATA;	/* name found */
-				continue;
-			}
-			break;
-#endif
-		}
-		hp = &hpbuf;
-		hp->h_name = cname;
-		hp->h_aliases = aliases;
-		aliases[nalias] = NULL;
-		hp->h_addrtype = af;
-		hp->h_length = ADDRLEN(af);
-		hp->h_addr_list = addrs;
-		addrs[0] = (char *)&addrbuf;
-		addrs[1] = NULL;
-		hp = _hpcopy(hp, errp);
-		rethp = _hpmerge(rethp, hp, errp);
-	}
-	fclose(fp);
-	*(struct hostent **)rval = rethp;
-	return (rethp != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-static int
-_files_ghbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	int addrlen;
-	int af;
-	int *errp;
-	int nalias;
-	char *p, *line;
-	FILE *fp;
-	struct hostent *hp, hpbuf;
-	char *aliases[MAXALIASES + 1], *addrs[2];
-	union inx_addr addrbuf;
-	char buf[BUFSIZ];
-
-	addr = va_arg(ap, const void *);
-	addrlen = va_arg(ap, int);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-	*(struct hostent**)rval = NULL;
-
-	if ((fp = _files_open(errp)) == NULL)
-		return NS_UNAVAIL;
-	hp = NULL;
-	while (fgets(buf, sizeof(buf), fp)) {
-		line = buf;
-		if ((p = _hgetword(&line)) == NULL
-		||  (af == AF_INET
-		     ? inet_aton(p, (struct in_addr *)&addrbuf)
-		     : inet_pton(af, p, &addrbuf)) != 1
-		||  memcmp(addr, &addrbuf, addrlen) != 0
-		||  (p = _hgetword(&line)) == NULL)
-			continue;
-		hp = &hpbuf;
-		hp->h_name = p;
-		hp->h_aliases = aliases;
-		nalias = 0;
-		while ((p = _hgetword(&line)) != NULL) {
-			if (nalias < MAXALIASES)
-				aliases[nalias++] = p;
-		}
-		aliases[nalias] = NULL;
-		hp->h_addrtype = af;
-		hp->h_length = addrlen;
-		hp->h_addr_list = addrs;
-		addrs[0] = (char *)&addrbuf;
-		addrs[1] = NULL;
-		hp = _hpcopy(hp, errp);
-		break;
-	}
-	fclose(fp);
-	*(struct hostent **)rval = hp;
-	return (hp != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-#ifdef YP
-/*
- * NIS
- *
- * XXX actually a hack.
- */
-static int
-_nis_ghbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	int *errp;
-	struct hostent *hp = NULL;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-	hp = _gethostbynisname(name, af);
-	if (hp != NULL)
-		hp = _hpcopy(hp, errp);
-
-	*(struct hostent **)rval = hp;
-	return (hp != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-
-static int
-_nis_ghbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	int addrlen;
-	int af;
-	int *errp;
-	struct hostent *hp = NULL;
-
-	addr = va_arg(ap, const void *);
-	addrlen = va_arg(ap, int);
-	af = va_arg(ap, int);
-
-	hp = _gethostbynisaddr(addr, addrlen, af);
-	if (hp != NULL)
-		hp = _hpcopy(hp, errp);
-	*(struct hostent **)rval = hp;
-	return (hp != NULL) ? NS_SUCCESS : NS_NOTFOUND;
-}
-#endif
-
-#define	MAXPACKET	(64*1024)
-
-typedef union {
-	HEADER hdr;
-	u_char buf[MAXPACKET];
-} querybuf;
-
-static struct hostent *getanswer(const querybuf *, int, const char *, int,
-	    struct hostent *, int *);
-
-/*
- * we don't need to take care about sorting, nor IPv4 mapped address here.
- */
-static struct hostent *
-getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-    struct hostent *template, int *errp)
-{
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	const u_char *eom, *erdata;
-	char *bp, *ep, **ap, **hap;
-	int type, class, ancount, qdcount;
-	int haveanswer, had_error;
-	char tbuf[MAXDNAME];
-	const char *tname;
-	int (*name_ok)(const char *);
-	static char *h_addr_ptrs[MAXADDRS + 1];
-	static char *host_aliases[MAXALIASES];
-	static char hostbuf[8*1024];
-
-#define BOUNDED_INCR(x) \
-	do { \
-		cp += x; \
-		if (cp > eom) { \
-			*errp = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-#define BOUNDS_CHECK(ptr, count) \
-	do { \
-		if ((ptr) + (count) > eom) { \
-			*errp = NO_RECOVERY; \
-			return (NULL); \
-		} \
-	} while (0)
-
-/* XXX do {} while (0) cannot be put here */
-#define DNS_ASSERT(x) \
-	{				\
-		if (!(x)) {		\
-			cp += n;	\
-			continue;	\
-		}			\
-	}
-
-/* XXX do {} while (0) cannot be put here */
-#define DNS_FATAL(x) \
-	{				\
-		if (!(x)) {		\
-			had_error++;	\
-			continue;	\
-		}			\
-	}
-
-	tname = qname;
-	template->h_name = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-		name_ok = res_hnok;
-		break;
-	case T_PTR:
-		name_ok = res_dnok;
-		break;
-	default:
-		return (NULL);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	ep = hostbuf + sizeof hostbuf;
-	cp = answer->buf;
-	BOUNDED_INCR(HFIXEDSZ);
-	if (qdcount != 1) {
-		*errp = NO_RECOVERY;
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		*errp = NO_RECOVERY;
-		return (NULL);
-	}
-	BOUNDED_INCR(n + QFIXEDSZ);
-	if (qtype == T_A || qtype == T_AAAA) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			*errp = NO_RECOVERY;
-			return (NULL);
-		}
-		template->h_name = bp;
-		bp += n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = template->h_name;
-	}
-	ap = host_aliases;
-	*ap = NULL;
-	template->h_aliases = host_aliases;
-	hap = h_addr_ptrs;
-	*hap = NULL;
-	template->h_addr_list = h_addr_ptrs;
-	haveanswer = 0;
-	had_error = 0;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-		DNS_FATAL(n >= 0);
-		DNS_FATAL((*name_ok)(bp));
-		cp += n;			/* name */
-		BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ + INT32SZ;	/* class, TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		BOUNDS_CHECK(cp, n);
-		erdata = cp + n;
-		DNS_ASSERT(class == C_IN);
-		if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
-			if (ap >= &host_aliases[MAXALIASES-1])
-				continue;
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			DNS_FATAL(n >= 0);
-			DNS_FATAL((*name_ok)(tbuf));
-			cp += n;
-			if (cp != erdata) {
-				*errp = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Store alias. */
-			*ap++ = bp;
-			n = strlen(bp) + 1;	/* for the \0 */
-			DNS_FATAL(n < MAXHOSTNAMELEN);
-			bp += n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			DNS_FATAL(n <= ep - bp);
-			DNS_FATAL(n < MAXHOSTNAMELEN);
-			strcpy(bp, tbuf);
-			template->h_name = bp;
-			bp += n;
-			continue;
-		}
-		if (qtype == T_PTR && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if (n < 0 || !res_dnok(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				*errp = NO_RECOVERY;
-				return (NULL);
-			}
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			tname = bp;
-			bp += n;
-			continue;
-		}
-		DNS_ASSERT(type == qtype);
-		switch (type) {
-		case T_PTR:
-			DNS_ASSERT(strcasecmp(tname, bp) == 0);
-			n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-			DNS_FATAL(n >= 0);
-			DNS_FATAL(res_hnok(bp));
-#if MULTI_PTRS_ARE_ALIASES
-			cp += n;
-			if (cp != erdata) {
-				*errp = NO_RECOVERY;
-				return (NULL);
-			}
-			if (!haveanswer)
-				template->h_name = bp;
-			else if (ap < &host_aliases[MAXALIASES-1])
-				*ap++ = bp;
-			else
-				n = -1;
-			if (n != -1) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-			}
-			break;
-#else
-			template->h_name = bp;
-			*errp = NETDB_SUCCESS;
-			return (template);
-#endif
-		case T_A:
-		case T_AAAA:
-			DNS_ASSERT(strcasecmp(template->h_name, bp) == 0);
-			DNS_ASSERT(n == template->h_length);
-			if (!haveanswer) {
-				int nn;
-
-				template->h_name = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-			}
-			bp = (char *)ALIGN(bp);
-
-			DNS_FATAL(bp + n < ep);
-			DNS_ASSERT(hap < &h_addr_ptrs[MAXADDRS-1]);
-#ifdef FILTER_V4MAPPED
-			if (type == T_AAAA) {
-				struct in6_addr in6;
-				memcpy(&in6, cp, sizeof(in6));
-				DNS_ASSERT(IN6_IS_ADDR_V4MAPPED(&in6) == 0);
-			}
-#endif
-			bcopy(cp, *hap++ = bp, n);
-			bp += n;
-			cp += n;
-			if (cp != erdata) {
-				*errp = NO_RECOVERY;
-				return (NULL);
-			}
-			break;
-		default:
-			abort();
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		*hap = NULL;
-		if (!template->h_name) {
-			n = strlen(qname) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN)
-				goto no_recovery;
-			strcpy(bp, qname);
-			template->h_name = bp;
-			bp += n;
-		}
-		*errp = NETDB_SUCCESS;
-		return (template);
-	}
- no_recovery:
-	*errp = NO_RECOVERY;
-	return (NULL);
-
-#undef BOUNDED_INCR
-#undef BOUNDS_CHECK
-#undef DNS_ASSERT
-#undef DNS_FATAL
-}
-
-static int
-_dns_ghbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	int *errp;
-	int n;
-	struct hostent *hp;
-	int qtype;
-	struct hostent hbuf;
-	querybuf *buf;
-	res_state statp;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-	statp = __res_state();
-
-	memset(&hbuf, 0, sizeof(hbuf));
-	hbuf.h_addrtype = af;
-	hbuf.h_length = ADDRLEN(af);
-
-	switch (af) {
-#ifdef INET6
-	case AF_INET6:
-		qtype = T_AAAA;
-		break;
-#endif
-	case AF_INET:
-		qtype = T_A;
-		break;
-	default:
-		*errp = NO_RECOVERY;
-		return NS_NOTFOUND;
-	}
-	buf = malloc(sizeof(*buf));
-	if (buf == NULL) {
-		*errp = NETDB_INTERNAL;
-		return NS_UNAVAIL;
-	}
-	n = res_nsearch(statp, name, C_IN, qtype, buf->buf, sizeof(buf->buf));
-	if (n < 0) {
-		free(buf);
-		*errp = statp->res_h_errno;
-		return NS_UNAVAIL;
-	}
-	hp = getanswer(buf, n, name, qtype, &hbuf, errp);
-	free(buf);
-	if (!hp) {
-		*errp = NO_RECOVERY;
-		return NS_NOTFOUND;
-	}
-	*(struct hostent **)rval = _hpcopy(&hbuf, errp);
-	if (*(struct hostent **)rval != NULL)
-		return NS_SUCCESS;
-	else if (*errp == TRY_AGAIN)
-		return NS_TRYAGAIN;
-	else
-		return NS_NOTFOUND;
-}
-
-static int
-_dns_ghbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	int addrlen;
-	int af;
-	int *errp;
-	int n;
-	int err;
-	struct hostent *hp;
-	u_char c, *cp;
-	char *bp;
-	struct hostent hbuf;
-#ifdef INET6
-	static const char hex[] = "0123456789abcdef";
-#endif
-	querybuf *buf;
-	char qbuf[MAXDNAME+1];
-	char *hlist[2];
-	char *tld6[] = { "ip6.arpa", NULL };
-	char *tld4[] = { "in-addr.arpa", NULL };
-	char **tld;
-	res_state statp;
-
-	addr = va_arg(ap, const void *);
-	addrlen = va_arg(ap, int);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-	*(struct hostent **)rval = NULL;
-
-#ifdef INET6
-	/* XXX */
-	if (af == AF_INET6 && IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr))
-		return NS_NOTFOUND;
-#endif
-
-	switch (af) {
-#ifdef INET6
-	case AF_INET6:
-		tld = tld6;
-		break;
-#endif
-	case AF_INET:
-		tld = tld4;
-		break;
-	default:
-		return NS_NOTFOUND;
-	}
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0) {
-		if (res_ninit(statp) < 0) {
-			*errp = NETDB_INTERNAL;
-			return NS_UNAVAIL;
-		}
-	}
-	memset(&hbuf, 0, sizeof(hbuf));
-	hbuf.h_name = NULL;
-	hbuf.h_addrtype = af;
-	hbuf.h_length = addrlen;
-
-	buf = malloc(sizeof(*buf));
-	if (buf == NULL) {
-		*errp = NETDB_INTERNAL;
-		return NS_UNAVAIL;
-	}
-	err = NS_SUCCESS;
-	for (/* nothing */; *tld; tld++) {
-		/*
-		 * XXX assumes that MAXDNAME is big enough - error checks
-		 * has been made by callers
-		 */
-		n = 0;
-		bp = qbuf;
-		cp = (u_char *)addr+addrlen-1;
-		switch (af) {
-#ifdef INET6
-		case AF_INET6:
-			for (; n < addrlen; n++, cp--) {
-				c = *cp;
-				*bp++ = hex[c & 0xf];
-				*bp++ = '.';
-				*bp++ = hex[c >> 4];
-				*bp++ = '.';
-			}
-			strcpy(bp, *tld);
-			break;
-#endif
-		case AF_INET:
-			for (; n < addrlen; n++, cp--) {
-				c = *cp;
-				if (c >= 100)
-					*bp++ = '0' + c / 100;
-				if (c >= 10)
-					*bp++ = '0' + (c % 100) / 10;
-				*bp++ = '0' + c % 10;
-				*bp++ = '.';
-			}
-			strcpy(bp, *tld);
-			break;
-		}
-
-		n = res_nquery(statp, qbuf, C_IN, T_PTR, buf->buf,
-		    sizeof buf->buf);
-		if (n < 0) {
-			*errp = statp->res_h_errno;
-			err = NS_UNAVAIL;
-			continue;
-		} else if (n > sizeof(buf->buf)) {
-#if 0
-			errno = ERANGE; /* XXX is it OK to set errno here? */
-#endif
-			*errp = NETDB_INTERNAL;
-			err = NS_UNAVAIL;
-			continue;
-		}
-		hp = getanswer(buf, n, qbuf, T_PTR, &hbuf, errp);
-		if (!hp) {
-			err = NS_NOTFOUND;
-			continue;
-		}
-		free(buf);
-		hbuf.h_addrtype = af;
-		hbuf.h_length = addrlen;
-		hbuf.h_addr_list = hlist;
-		hlist[0] = (char *)addr;
-		hlist[1] = NULL;
-		*(struct hostent **)rval = _hpcopy(&hbuf, errp);
-		return NS_SUCCESS;
-	}
-	free(buf);
-	return err;
-}
-
-static void
-_dns_shent(int stayopen)
-{
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0) {
-		if (res_ninit(statp) < 0)
-			return;
-	}
-	if (stayopen)
-		statp->options |= RES_STAYOPEN | RES_USEVC;
-}
-
-static void
-_dns_ehent(void)
-{
-	res_state statp;
-
-	statp = __res_state();
-	statp->options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_nclose(statp);
-}
-
-#ifdef ICMPNL
-
-/*
- * experimental:
- *	draft-ietf-ipngwg-icmp-namelookups-09.txt
- *	ifindex is assumed to be encoded in addr.
- */
-#include <sys/uio.h>
-#include <netinet/ip6.h>
-#include <netinet/icmp6.h>
-#include <ctype.h>
-
-#ifndef NI_QTYPE_NODENAME
-#define NI_QTYPE_NODENAME	NI_QTYPE_DNSNAME
-#endif
-
-static char *
-dnsdecode(sp, ep, base, buf, bufsiz)
-	const u_char **sp;
-	const u_char *ep;
-	const u_char *base;	/*base for compressed name*/
-	u_char *buf;
-	size_t bufsiz;
-{
-	int i;
-	const u_char *cp;
-	char cresult[MAXDNAME + 1];
-	const u_char *comp;
-	int l;
-
-	cp = *sp;
-	*buf = '\0';
-
-	if (cp >= ep)
-		return NULL;
-	while (cp < ep) {
-		i = *cp;
-		if (i == 0 || cp != *sp) {
-			if (strlcat(buf, ".", bufsiz) >= bufsiz)
-				return NULL;	/* result overrun */
-		}
-		if (i == 0)
-			break;
-		cp++;
-
-		if ((i & 0xc0) == 0xc0 && cp - base > (i & 0x3f)) {
-			/* DNS compression */
-			if (!base)
-				return NULL;
-
-			comp = base + (i & 0x3f);
-			if (dnsdecode(&comp, cp, base, cresult,
-			    sizeof(cresult)) == NULL)
-				return NULL;
-			if (strlcat(buf, cresult, bufsiz) >= bufsiz)
-				return NULL;	/* result overrun */
-			break;
-		} else if ((i & 0x3f) == i) {
-			if (i > ep - cp)
-				return NULL;	/* source overrun */
-			while (i-- > 0 && cp < ep) {
-				l = snprintf(cresult, sizeof(cresult),
-				    isprint(*cp) ? "%c" : "\\%03o", *cp & 0xff);
-				if (l >= sizeof(cresult) || l < 0)
-					return NULL;
-				if (strlcat(buf, cresult, bufsiz) >= bufsiz)
-					return NULL;	/* result overrun */
-				cp++;
-			}
-		} else
-			return NULL;	/* invalid label */
-	}
-	if (i != 0)
-		return NULL;	/* not terminated */
-	cp++;
-	*sp = cp;
-	return buf;
-}
-
-static char *
-_icmp_nodeinfo_query(const struct in6_addr *addr, int ifindex, char *dnsname)
-{
-	int s;
-	struct icmp6_filter filter;
-	struct msghdr msg;
-	struct cmsghdr *cmsg;
-	struct in6_pktinfo *pkt;
-	char cbuf[256], buf[1024], *cp, *end;
-	int cc;
-	struct icmp6_nodeinfo niq, *nir;
-	struct sockaddr_in6 sin6;
-	struct iovec iov;
-	fd_set s_fds, fds;
-	struct timeval tout;
-	int len;
-	static int pid;
-	uint32_t r1, r2;
-
-	if (pid == 0)
-		pid = getpid();
-
-	ICMP6_FILTER_SETBLOCKALL(&filter);
-	ICMP6_FILTER_SETPASS(ICMP6_NI_REPLY, &filter);
-
-	FD_ZERO(&s_fds);
-	tout.tv_sec = 0;
-	tout.tv_usec = 500000;	/* 500ms */
-
-	memset(&niq, 0, sizeof(niq));
-	niq.ni_type = ICMP6_NI_QUERY;
-	niq.ni_code = ICMP6_NI_SUBJ_IPV6;
-	niq.ni_qtype = htons(NI_QTYPE_NODENAME);
-	niq.ni_flags = 0;
-	r1 = arc4random();
-	r2 = arc4random();
-	memcpy(&niq.icmp6_ni_nonce[0], &r1, sizeof(r1));
-	memcpy(&niq.icmp6_ni_nonce[4], &r2, sizeof(r2));
-
-	memset(&sin6, 0, sizeof(sin6));
-	sin6.sin6_family = AF_INET6;
-	sin6.sin6_addr = *addr;
-
-	memset(&msg, 0, sizeof(msg));
-	msg.msg_name = (caddr_t)&sin6;
-	msg.msg_namelen = sizeof(sin6);
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = NULL;
-	msg.msg_controllen = 0;
-	iov.iov_base = (caddr_t)&niq;
-	iov.iov_len = sizeof(struct icmp6_nodeinfo);
-
-	if (ifindex) {
-		msg.msg_control = cbuf;
-		msg.msg_controllen = sizeof(cbuf);
-		cmsg = CMSG_FIRSTHDR(&msg);
-		cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
-		cmsg->cmsg_level = IPPROTO_IPV6;
-		cmsg->cmsg_type = IPV6_PKTINFO;
-		pkt = (struct in6_pktinfo *)&cmsg[1];
-		memset(&pkt->ipi6_addr, 0, sizeof(struct in6_addr));
-		pkt->ipi6_ifindex = ifindex;
-		cmsg = CMSG_NXTHDR(&msg, cmsg);
-		msg.msg_controllen = (char *)cmsg - cbuf;
-	}
-
-	/* XXX: we need root privilege here */
-	if ((s = _socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0)
-		return NULL;
-	(void)_setsockopt(s, IPPROTO_ICMPV6, ICMP6_FILTER,
-			 (char *)&filter, sizeof(filter));
-	cc = _sendmsg(s, &msg, 0);
-	if (cc < 0) {
-		_close(s);
-		return (NULL);
-	}
-	FD_SET(s, &s_fds);
-	for (;;) {
-		fds = s_fds;
-		if (_select(s + 1, &fds, NULL, NULL, &tout) <= 0) {
-			_close(s);
-			return (NULL);
-		}
-		len = sizeof(sin6);
-		cc = _recvfrom(s, buf, sizeof(buf), 0,
-			      (struct sockaddr *)&sin6, &len);
-		if (cc <= 0) {
-			_close(s);
-			return (NULL);
-		}
-		if (cc < sizeof(struct icmp6_hdr))
-			continue;
-		nir = (struct icmp6_nodeinfo *)buf;
-		if (nir->ni_type != ICMP6_NI_REPLY)
-			continue;
-		if (nir->ni_qtype != htons(NI_QTYPE_NODENAME))
-			continue;
-		if (memcmp(nir->icmp6_ni_nonce, niq.icmp6_ni_nonce,
-		    sizeof(nir->icmp6_ni_nonce)) != 0) {
-			continue;
-		}
-		if (nir->ni_code != htons(ICMP6_NI_SUCCESS))
-			continue; /* or should we fail? */
-
-		/* this is an expected reply. */
-		break;
-	}
-	_close(s);
-
-	memset(dnsname, 0, MAXDNAME + 1);
-	cp = (char *)(nir + 1);
-	end = ((char *)nir) + cc;
-	if (end - cp < sizeof(int32_t))	/* for TTL.  we don't use it. */
-		return (NULL);
-	cp += sizeof(int32_t);
-	if (*cp == end - cp - 1) { /* an old version */
-		int nlen;
-
-		cp++;	/* skip length */
-		nlen = end - cp;
-		if (nlen > MAXDNAME)
-			return (NULL); /* XXX: use it anyway? */
-		memcpy(dnsname, cp, nlen);
-	} else {
-		/* XXX: should we use a generic function? */
-		if (dnsdecode((const u_char **)(void *)&cp, end,
-		    (const u_char *)(nir + 1), dnsname, MAXDNAME + 1)
-		    == NULL) {
-			return (NULL); /* bogus name */
-		}
-		/* Name-lookup special handling for truncated name. */
-		if (cp + 1 <= end && !*cp && strlen(dnsname) > 0)
-			dnsname[strlen(dnsname) - 1] = '\0';
-
-		/* There may be other names, but we ignore them. */
-	}
-
-	return (dnsname);
-}
-
-static int
-_icmp_ghbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	int addrlen;
-	int af;
-	int *errp;
-	char *hname;
-	int ifindex = 0;
-	struct in6_addr addr6;
-	char dnsname[MAXDNAME + 1];
-
-	addr = va_arg(ap, const void *);
-	addrlen = va_arg(ap, int);
-	af = va_arg(ap, int);
-	errp = va_arg(ap, int *);
-
-	*(struct hostent **)rval = NULL;
-
-	if (af != AF_INET6 || addrlen != sizeof(addr6)) {
-		/*
-		 * Note: rfc1788 defines Who Are You for IPv4,
-		 * but no one implements it.
-		 */
-		return (NS_NOTFOUND);
-	}
-
-	memcpy(&addr6, addr, addrlen);
-	if (IN6_IS_ADDR_LINKLOCAL(&addr6)) {
-		ifindex = (addr6.s6_addr[2] << 8) | addr6.s6_addr[3];
-		addr6.s6_addr[2] = addr6.s6_addr[3] = 0;
-	}
-
-	if ((hname = _icmp_nodeinfo_query(&addr6, ifindex, dnsname)) == NULL)
-		return (NS_NOTFOUND);
-	*(struct hostent **)rval =_hpaddr(af, hname, &addr6, errp);
-	return (NS_SUCCESS);
-}
-#endif /* ICMPNL */
diff --git a/lib/libc/net/netdb_private.h b/lib/libc/net/netdb_private.h
deleted file mode 100644
index 3cf9257..0000000
--- a/lib/libc/net/netdb_private.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * Copyright (C) 2005 The FreeBSD Project.  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.
- *
- * 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 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.
- *
- * $FreeBSD: src/lib/libc/net/netdb_private.h,v 1.9.4.1 2006/07/17 10:09:57 ume Exp $
- */
-
-#ifndef _NETDB_PRIVATE_H_
-#define _NETDB_PRIVATE_H_
-
-#include <stdio.h>				/* XXX: for FILE */
-
-#define	NETDB_THREAD_ALLOC(name)					\
-static struct name name;						\
-static thread_key_t name##_key;						\
-static once_t name##_init_once = ONCE_INITIALIZER;			\
-static int name##_thr_keycreated = 0;					\
-\
-static void name##_free(void *);					\
-\
-static void								\
-name##_keycreate(void)							\
-{									\
-	name##_thr_keycreated =						\
-	    (thr_keycreate(&name##_key, name##_free) == 0);		\
-}									\
-\
-struct name *								\
-__##name##_init(void)							\
-{									\
-	struct name *he;						\
-									\
-	if (thr_main() != 0)						\
-		return (&name);						\
-	if (thr_once(&name##_init_once, name##_keycreate) != 0 ||	\
-	    !name##_thr_keycreated)					\
-		return (NULL);						\
-	if ((he = thr_getspecific(name##_key)) != NULL)			\
-		return (he);						\
-	if ((he = calloc(1, sizeof(*he))) == NULL)			\
-		return (NULL);						\
-	if (thr_setspecific(name##_key, he) == 0)			\
-		return (he);						\
-	free(he);							\
-	return (NULL);							\
-}
-
-#define	_MAXALIASES	35
-#define	_MAXLINELEN	1024
-#define	_MAXADDRS	35
-#define	_HOSTBUFSIZE	(8 * 1024)
-#define	_NETBUFSIZE	1025
-
-struct hostent_data {
-	uint32_t host_addr[4];			/* IPv4 or IPv6 */
-	char *h_addr_ptrs[_MAXADDRS + 1];
-	char *host_aliases[_MAXALIASES];
-	char hostbuf[_HOSTBUFSIZE];
-	FILE *hostf;
-	int stayopen;
-#ifdef YP
-	char *yp_domain;
-#endif
-};
-
-struct netent_data {
-	char *net_aliases[_MAXALIASES];
-	char netbuf[_NETBUFSIZE];
-	FILE *netf;
-	int stayopen;
-#ifdef YP
-	char *yp_domain;
-#endif
-};
-
-struct protoent_data {
-	FILE *fp;
-	char *aliases[_MAXALIASES];
-	int stayopen;
-	char line[_MAXLINELEN + 1];
-};
-
-struct servent_data {
-	FILE *fp;
-	char *aliases[_MAXALIASES];
-	int stayopen;
-	char line[_MAXLINELEN + 1];
-#ifdef YP
-	int yp_stepping;
-	char *yp_name;
-	char *yp_proto;
-	int yp_port;
-	char *yp_domain;
-	char *yp_key;
-	int yp_keylen;
-#endif
-};
-
-struct hostdata {
-	struct hostent host;
-	char data[sizeof(struct hostent_data)];
-};
-
-struct netdata {
-	struct netent net;
-	char data[sizeof(struct netent_data)];
-};
-
-struct protodata {
-	struct protoent proto;
-	char data[sizeof(struct protoent_data)];
-};
-
-struct servdata {
-	struct servent serv;
-	char data[sizeof(struct servent_data)];
-};
-
-struct hostdata *__hostdata_init(void);
-struct hostent *__hostent_init(void);
-struct hostent_data *__hostent_data_init(void);
-struct netdata *__netdata_init(void);
-struct netent_data *__netent_data_init(void);
-struct protodata *__protodata_init(void);
-struct protoent_data *__protoent_data_init(void);
-struct servdata *__servdata_init(void);
-struct servent_data *__servent_data_init(void);
-int __copy_hostent(struct hostent *, struct hostent *, char *, size_t);
-int __copy_netent(struct netent *, struct netent *, char *, size_t);
-int __copy_protoent(struct protoent *, struct protoent *, char *, size_t);
-int __copy_servent(struct servent *, struct servent *, char *, size_t);
-
-void __endprotoent_p(struct protoent_data *);
-void __endservent_p(struct servent_data *);
-int __getprotoent_p(struct protoent *, struct protoent_data *);
-int __getservent_p(struct servent *, struct servent_data *);
-void __setprotoent_p(int, struct protoent_data *);
-void __setservent_p(int, struct servent_data *);
-void _endhostdnsent(void);
-void _endhosthtent(struct hostent_data *);
-void _endnetdnsent(void);
-void _endnethtent(struct netent_data *);
-struct hostent *_gethostbynisaddr(const void *, socklen_t, int);
-struct hostent *_gethostbynisname(const char *, int);
-void _map_v4v6_address(const char *, char *);
-void _map_v4v6_hostent(struct hostent *, char **, char *);
-void _sethostdnsent(int);
-void _sethosthtent(int, struct hostent_data *);
-void _setnetdnsent(int);
-void _setnethtent(int, struct netent_data *);
-
-#endif /* _NETDB_PRIVATE_H_ */
diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c
deleted file mode 100644
index aeb1b9d..0000000
--- a/lib/libc/net/nsdispatch.c
+++ /dev/null
@@ -1,627 +0,0 @@
-/*	$NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * Portions of this software were developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- *
- */
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-enum _nss_constants {
-	/* Number of elements allocated when we grow a vector */
-	ELEMSPERCHUNK =	8
-};
-
-/*
- * Global NSS data structures are mostly read-only, but we update
- * them when we read or re-read the nsswitch.conf.
- */
-static	pthread_rwlock_t	nss_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-/*
- * Runtime determination of whether we are dynamically linked or not.
- */
-extern	int		_DYNAMIC __attribute__ ((weak));
-#define	is_dynamic()	(&_DYNAMIC != NULL)
-
-/*
- * default sourcelist: `files'
- */
-const ns_src __nsdefaultsrc[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ 0 },
-};
-
-/* Database, source mappings. */
-static	unsigned int		 _nsmapsize;
-static	ns_dbt			*_nsmap = NULL;
-
-/* NSS modules. */
-static	unsigned int		 _nsmodsize;
-static	ns_mod			*_nsmod;
-
-/* Placeholder for builtin modules' dlopen `handle'. */
-static	int			 __nss_builtin_handle;
-static	void			*nss_builtin_handle = &__nss_builtin_handle;
-
-/*
- * Attempt to spew relatively uniform messages to syslog.
- */
-#define nss_log(level, fmt, ...) \
-	syslog((level), "NSSWITCH(%s): " fmt, __func__, __VA_ARGS__)
-#define nss_log_simple(level, s) \
-	syslog((level), "NSSWITCH(%s): " s, __func__)
-
-/*
- * Dynamically growable arrays are used for lists of databases, sources,
- * and modules.  The following `vector' interface is used to isolate the
- * common operations.
- */
-typedef	int	(*vector_comparison)(const void *, const void *);
-typedef	void	(*vector_free_elem)(void *);
-static	void	  vector_sort(void *, unsigned int, size_t,
-		    vector_comparison);
-static	void	  vector_free(void *, unsigned int *, size_t,
-		    vector_free_elem);
-static	void	 *vector_ref(unsigned int, void *, unsigned int, size_t);
-static	void	 *vector_search(const void *, void *, unsigned int, size_t,
-		    vector_comparison);
-static	void	 *vector_append(const void *, void *, unsigned int *, size_t);
-
-
-/*
- * Internal interfaces.
- */
-static	int	 string_compare(const void *, const void *);
-static	int	 mtab_compare(const void *, const void *);
-static	int	 nss_configure(void);
-static	void	 ns_dbt_free(ns_dbt *);
-static	void	 ns_mod_free(ns_mod *);
-static	void	 ns_src_free(ns_src **, int);
-static	void	 nss_load_builtin_modules(void);
-static	void	 nss_load_module(const char *, nss_module_register_fn);
-static	void	 nss_atexit(void);
-/* nsparser */
-extern	FILE	*_nsyyin;
-
-
-/*
- * The vector operations
- */
-static void
-vector_sort(void *vec, unsigned int count, size_t esize,
-    vector_comparison comparison)
-{
-	qsort(vec, count, esize, comparison);
-}
-
-
-static void *
-vector_search(const void *key, void *vec, unsigned int count, size_t esize,
-    vector_comparison comparison)
-{
-	return (bsearch(key, vec, count, esize, comparison));
-}
-
-
-static void *
-vector_append(const void *elem, void *vec, unsigned int *count, size_t esize)
-{
-	void	*p;
-
-	if ((*count % ELEMSPERCHUNK) == 0) {
-		p = realloc(vec, (*count + ELEMSPERCHUNK) * esize);
-		if (p == NULL) {
-			nss_log_simple(LOG_ERR, "memory allocation failure");
-			return (vec);
-		}
-		vec = p;
-	}
-	memmove((void *)(((uintptr_t)vec) + (*count * esize)), elem, esize);
-	(*count)++;
-	return (vec);
-}
-
-
-static void *
-vector_ref(unsigned int i, void *vec, unsigned int count, size_t esize)
-{
-	if (i < count)
-		return (void *)((uintptr_t)vec + (i * esize));
-	else
-		return (NULL);
-}
-
-
-#define VECTOR_FREE(v, c, s, f) \
-	do { vector_free(v, c, s, f); v = NULL; } while (0)
-static void
-vector_free(void *vec, unsigned int *count, size_t esize,
-    vector_free_elem free_elem)
-{
-	unsigned int	 i;
-	void		*elem;
-
-	for (i = 0; i < *count; i++) {
-		elem = vector_ref(i, vec, *count, esize);
-		if (elem != NULL)
-			free_elem(elem);
-	}
-	free(vec);
-	*count = 0;
-}
-
-
-
-/*
- * Comparison functions for vector_search.
- */
-static int
-string_compare(const void *a, const void *b)
-{
-      return (strcasecmp(*(const char * const *)a, *(const char * const *)b));
-}
-
-
-static int
-mtab_compare(const void *a, const void *b)
-{
-      int     cmp;
-
-      cmp = strcmp(((const ns_mtab *)a)->name, ((const ns_mtab *)b)->name);
-      if (cmp != 0)
-	      return (cmp);
-      else
-	      return (strcmp(((const ns_mtab *)a)->database,
-		  ((const ns_mtab *)b)->database));
-}
-
-
-
-/*
- * NSS nsmap management.
- */
-void
-_nsdbtaddsrc(ns_dbt *dbt, const ns_src *src)
-{
-	const ns_mod	*modp;
-
-	dbt->srclist = vector_append(src, dbt->srclist, &dbt->srclistsize,
-	    sizeof(*src));
-	modp = vector_search(&src->name, _nsmod, _nsmodsize, sizeof(*_nsmod),
-	    string_compare);
-	if (modp == NULL)
-		nss_load_module(src->name, NULL);
-}
-
-
-#ifdef _NSS_DEBUG
-void
-_nsdbtdump(const ns_dbt *dbt)
-{
-	int i;
-
-	printf("%s (%d source%s):", dbt->name, dbt->srclistsize,
-	    dbt->srclistsize == 1 ? "" : "s");
-	for (i = 0; i < (int)dbt->srclistsize; i++) {
-		printf(" %s", dbt->srclist[i].name);
-		if (!(dbt->srclist[i].flags &
-		    (NS_UNAVAIL|NS_NOTFOUND|NS_TRYAGAIN)) &&
-		    (dbt->srclist[i].flags & NS_SUCCESS))
-			continue;
-		printf(" [");
-		if (!(dbt->srclist[i].flags & NS_SUCCESS))
-			printf(" SUCCESS=continue");
-		if (dbt->srclist[i].flags & NS_UNAVAIL)
-			printf(" UNAVAIL=return");
-		if (dbt->srclist[i].flags & NS_NOTFOUND)
-			printf(" NOTFOUND=return");
-		if (dbt->srclist[i].flags & NS_TRYAGAIN)
-			printf(" TRYAGAIN=return");
-		printf(" ]");
-	}
-	printf("\n");
-}
-#endif
-
-
-/*
- * The first time nsdispatch is called (during a process's lifetime,
- * or after nsswitch.conf has been updated), nss_configure will
- * prepare global data needed by NSS.
- */
-static int
-nss_configure(void)
-{
-	static pthread_mutex_t conf_lock = PTHREAD_MUTEX_INITIALIZER;
-	static time_t	 confmod;
-	struct stat	 statbuf;
-	int		 result, isthreaded;
-	const char	*path;
-
-	result = 0;
-	isthreaded = __isthreaded;
-#if defined(_NSS_DEBUG) && defined(_NSS_SHOOT_FOOT)
-	/* NOTE WELL:  THIS IS A SECURITY HOLE. This must only be built
-	 * for debugging purposes and MUST NEVER be used in production.
-	 */
-	path = getenv("NSSWITCH_CONF");
-	if (path == NULL)
-#endif
-	path = _PATH_NS_CONF;
-	if (stat(path, &statbuf) != 0)
-		return (0);
-	if (statbuf.st_mtime <= confmod)
-		return (0);
-	if (isthreaded) {
-	    result = _pthread_mutex_trylock(&conf_lock);
-	    if (result != 0)
-		    return (0);
-	    (void)_pthread_rwlock_unlock(&nss_lock);
-	    result = _pthread_rwlock_wrlock(&nss_lock);
-	    if (result != 0)
-		    goto fin2;
-	}
-	_nsyyin = fopen(path, "r");
-	if (_nsyyin == NULL)
-		goto fin;
-	VECTOR_FREE(_nsmap, &_nsmapsize, sizeof(*_nsmap),
-	    (vector_free_elem)ns_dbt_free);
-	VECTOR_FREE(_nsmod, &_nsmodsize, sizeof(*_nsmod),
-	    (vector_free_elem)ns_mod_free);
-	nss_load_builtin_modules();
-	_nsyyparse();
-	(void)fclose(_nsyyin);
-	vector_sort(_nsmap, _nsmapsize, sizeof(*_nsmap), string_compare);
-	if (confmod == 0)
-		(void)atexit(nss_atexit);
-	confmod = statbuf.st_mtime;
-fin:
-	if (isthreaded) {
-	    (void)_pthread_rwlock_unlock(&nss_lock);
-	    if (result == 0)
-		    result = _pthread_rwlock_rdlock(&nss_lock);
-	}
-fin2:
-	if (isthreaded)
-		(void)_pthread_mutex_unlock(&conf_lock);
-	return (result);
-}
-
-
-void
-_nsdbtput(const ns_dbt *dbt)
-{
-	unsigned int	 i;
-	ns_dbt		*p;
-
-	for (i = 0; i < _nsmapsize; i++) {
-		p = vector_ref(i, _nsmap, _nsmapsize, sizeof(*_nsmap));
-		if (string_compare(&dbt->name, &p->name) == 0) {
-			/* overwrite existing entry */
-			if (p->srclist != NULL)
-				ns_src_free(&p->srclist, p->srclistsize);
-			memmove(p, dbt, sizeof(*dbt));
-			return;
-		}
-	}
-	_nsmap = vector_append(dbt, _nsmap, &_nsmapsize, sizeof(*_nsmap));
-}
-
-
-static void
-ns_dbt_free(ns_dbt *dbt)
-{
-	ns_src_free(&dbt->srclist, dbt->srclistsize);
-}
-
-
-static void
-ns_src_free(ns_src **src, int srclistsize)
-{
-	int	i;
-
-	for (i = 0; i < srclistsize; i++)
-		if ((*src)[i].name != NULL)
-			/* This one was allocated by nslexer. You'll just
-			 * have to trust me.
-			 */
-			free((void *)((*src)[i].name));
-	free(*src);
-	*src = NULL;
-}
-
-
-
-/*
- * NSS module management.
- */
-/* The built-in NSS modules are all loaded at once. */
-#define NSS_BACKEND(name, reg) \
-ns_mtab	*reg(unsigned int *, nss_module_unregister_fn *);
-#include "nss_backends.h"
-#undef NSS_BACKEND
-
-static void
-nss_load_builtin_modules(void)
-{
-#define NSS_BACKEND(name, reg) nss_load_module(#name, reg);
-#include "nss_backends.h"
-#undef NSS_BACKEND
-}
-
-
-/* Load a built-in or dynamically linked module.  If the `reg_fn'
- * argument is non-NULL, assume a built-in module and use reg_fn to
- * register it.  Otherwise, search for a dynamic NSS module.
- */
-static void
-nss_load_module(const char *source, nss_module_register_fn reg_fn)
-{
-	char		 buf[PATH_MAX];
-	ns_mod		 mod;
-	nss_module_register_fn fn;
-
-	memset(&mod, 0, sizeof(mod));
-	mod.name = strdup(source);
-	if (mod.name == NULL) {
-		nss_log_simple(LOG_ERR, "memory allocation failure");
-		return;
-	}
-	if (reg_fn != NULL) {
-		/* The placeholder is required, as a NULL handle
-		 * represents an invalid module.
-		 */
-		mod.handle = nss_builtin_handle;
-		fn = reg_fn;
-	} else if (!is_dynamic())
-		goto fin;
-	else {
-		if (snprintf(buf, sizeof(buf), "nss_%s.so.%d", mod.name,
-		    NSS_MODULE_INTERFACE_VERSION) >= (int)sizeof(buf))
-			goto fin;
-		mod.handle = dlopen(buf, RTLD_LOCAL|RTLD_LAZY);
-		if (mod.handle == NULL) {
-#ifdef _NSS_DEBUG
-			/* This gets pretty annoying since the built-in
-			 * sources aren't modules yet.
-			 */
-			nss_log(LOG_DEBUG, "%s, %s", mod.name, dlerror());
-#endif
-			goto fin;
-		}
-		fn = (nss_module_register_fn)dlfunc(mod.handle,
-		    "nss_module_register");
-		if (fn == NULL) {
-			(void)dlclose(mod.handle);
-			mod.handle = NULL;
-			nss_log(LOG_ERR, "%s, %s", mod.name, dlerror());
-			goto fin;
-		}
-	}
-	mod.mtab = fn(mod.name, &mod.mtabsize, &mod.unregister);
-	if (mod.mtab == NULL || mod.mtabsize == 0) {
-		if (mod.handle != nss_builtin_handle)
-			(void)dlclose(mod.handle);
-		mod.handle = NULL;
-		nss_log(LOG_ERR, "%s, registration failed", mod.name);
-		goto fin;
-	}
-	if (mod.mtabsize > 1)
-		qsort(mod.mtab, mod.mtabsize, sizeof(mod.mtab[0]),
-		    mtab_compare);
-fin:
-	_nsmod = vector_append(&mod, _nsmod, &_nsmodsize, sizeof(*_nsmod));
-	vector_sort(_nsmod, _nsmodsize, sizeof(*_nsmod), string_compare);
-}
-
-
-
-static void
-ns_mod_free(ns_mod *mod)
-{
-
-	free(mod->name);
-	if (mod->handle == NULL)
-		return;
-	if (mod->unregister != NULL)
-		mod->unregister(mod->mtab, mod->mtabsize);
-	if (mod->handle != nss_builtin_handle)
-		(void)dlclose(mod->handle);
-}
-
-
-
-/*
- * Cleanup
- */
-static void
-nss_atexit(void)
-{
-	int isthreaded;
-
-	isthreaded = __isthreaded;
-	if (isthreaded)
-		(void)_pthread_rwlock_wrlock(&nss_lock);
-	VECTOR_FREE(_nsmap, &_nsmapsize, sizeof(*_nsmap),
-	    (vector_free_elem)ns_dbt_free);
-	VECTOR_FREE(_nsmod, &_nsmodsize, sizeof(*_nsmod),
-	    (vector_free_elem)ns_mod_free);
-	if (isthreaded)
-		(void)_pthread_rwlock_unlock(&nss_lock);
-}
-
-
-
-/*
- * Finally, the actual implementation.
- */
-static nss_method
-nss_method_lookup(const char *source, const char *database,
-    const char *method, const ns_dtab disp_tab[], void **mdata)
-{
-	ns_mod	*mod;
-	ns_mtab	*match, key;
-	int	 i;
-
-	if (disp_tab != NULL)
-		for (i = 0; disp_tab[i].src != NULL; i++)
-			if (strcasecmp(source, disp_tab[i].src) == 0) {
-				*mdata = disp_tab[i].mdata;
-				return (disp_tab[i].method);
-			}
-	mod = vector_search(&source, _nsmod, _nsmodsize, sizeof(*_nsmod),
-	    string_compare);
-	if (mod != NULL && mod->handle != NULL) {
-		key.database = database;
-		key.name = method;
-		match = bsearch(&key, mod->mtab, mod->mtabsize,
-		    sizeof(mod->mtab[0]), mtab_compare);
-		if (match != NULL) {
-			*mdata = match->mdata;
-			return (match->method);
-		}
-	}
-	if (is_dynamic())
-		nss_log(LOG_DEBUG, "%s, %s, %s, not found", source, database,
-		    method);
-	*mdata = NULL;
-	return (NULL);
-}
-
-
-__weak_reference(_nsdispatch, nsdispatch);
-
-int
-_nsdispatch(void *retval, const ns_dtab disp_tab[], const char *database,
-	    const char *method_name, const ns_src defaults[], ...)
-{
-	va_list		 ap;
-	const ns_dbt	*dbt;
-	const ns_src	*srclist;
-	nss_method	 method;
-	void		*mdata;
-	int		 isthreaded, serrno, i, result, srclistsize;
-
-	isthreaded = __isthreaded;
-	serrno = errno;
-	if (isthreaded) {
-		result = _pthread_rwlock_rdlock(&nss_lock);
-		if (result != 0) {
-			result = NS_UNAVAIL;
-			goto fin;
-		}
-	}
-	result = nss_configure();
-	if (result != 0) {
-		result = NS_UNAVAIL;
-		goto fin;
-	}
-	dbt = vector_search(&database, _nsmap, _nsmapsize, sizeof(*_nsmap),
-	    string_compare);
-	if (dbt != NULL) {
-		srclist = dbt->srclist;
-		srclistsize = dbt->srclistsize;
-	} else {
-		srclist = defaults;
-		srclistsize = 0;
-		while (srclist[srclistsize].name != NULL)
-			srclistsize++;
-	}
-	for (i = 0; i < srclistsize; i++) {
-		result = NS_NOTFOUND;
-		method = nss_method_lookup(srclist[i].name, database,
-		    method_name, disp_tab, &mdata);
-		if (method != NULL) {
-			va_start(ap, defaults);
-			result = method(retval, mdata, ap);
-			va_end(ap);
-			if (result & (srclist[i].flags))
-				break;
-		}
-	}
-	if (isthreaded)
-		(void)_pthread_rwlock_unlock(&nss_lock);
-fin:
-	errno = serrno;
-	return (result);
-}
diff --git a/lib/libc/net/nslexer.c b/lib/libc/net/nslexer.c
deleted file mode 100644
index 805a1a8..0000000
--- a/lib/libc/net/nslexer.c
+++ /dev/null
@@ -1,1730 +0,0 @@
-#define yy_create_buffer _nsyy_create_buffer
-#define yy_delete_buffer _nsyy_delete_buffer
-#define yy_scan_buffer _nsyy_scan_buffer
-#define yy_scan_string _nsyy_scan_string
-#define yy_scan_bytes _nsyy_scan_bytes
-#define yy_flex_debug _nsyy_flex_debug
-#define yy_init_buffer _nsyy_init_buffer
-#define yy_flush_buffer _nsyy_flush_buffer
-#define yy_load_buffer_state _nsyy_load_buffer_state
-#define yy_switch_to_buffer _nsyy_switch_to_buffer
-#define yyin _nsyyin
-#define yyleng _nsyyleng
-#define yylex _nsyylex
-#define yyout _nsyyout
-#define yyrestart _nsyyrestart
-#define yytext _nsyytext
-#define yylineno _nsyylineno
-#define yywrap _nsyywrap
-
-#line 21 "/dev/stdout"
-/* A lexical scanner generated by flex */
-
-/* Scanner skeleton version:
- * $Header: /cvs/ubix2/src/lib/libc/net/nslexer.c,v 1.1 2006/10/27 00:58:52 reddawg Exp $
- * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.8 2004/01/06 19:03:44 nectar Exp $
- */
-
-#if defined(__FreeBSD__)
-#include <sys/cdefs.h>
-#else
-#define __unused
-#endif
-
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-
-#include <stdio.h>
-
-
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
-#endif
-
-
-#ifdef __cplusplus
-
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-#if __STDC__
-
-#define YY_USE_PROTOS
-#define YY_USE_CONST
-
-#endif	/* __STDC__ */
-#endif	/* ! __cplusplus */
-
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN yy_start = 1 + 2 *
-
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START ((yy_start - 1) / 2)
-#define YYSTATE YY_START
-
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
-
-#define YY_END_OF_BUFFER_CHAR 0
-
-/* Size of default input buffer. */
-#define YY_BUF_SIZE 1024
-
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-
-extern int yyleng;
-extern FILE *yyin, *yyout;
-
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
-		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-		} \
-	while ( 0 )
-
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-typedef unsigned int yy_size_t;
-
-
-struct yy_buffer_state
-	{
-	FILE *yy_input_file;
-
-	char *yy_ch_buf;		/* input buffer */
-	char *yy_buf_pos;		/* current position in input buffer */
-
-	/* Size of input buffer in bytes, not including room for EOB
-	 * characters.
-	 */
-	yy_size_t yy_buf_size;
-
-	/* Number of characters read into yy_ch_buf, not including EOB
-	 * characters.
-	 */
-	int yy_n_chars;
-
-	/* Whether we "own" the buffer - i.e., we know we created it,
-	 * and can realloc() it to grow it, and should free() it to
-	 * delete it.
-	 */
-	int yy_is_our_buffer;
-
-	/* Whether this is an "interactive" input source; if so, and
-	 * if we're using stdio for input, then we want to use getc()
-	 * instead of fread(), to make sure we stop fetching input after
-	 * each newline.
-	 */
-	int yy_is_interactive;
-
-	/* Whether we're considered to be at the beginning of a line.
-	 * If so, '^' rules will be active on the next match, otherwise
-	 * not.
-	 */
-	int yy_at_bol;
-
-	/* Whether to try to fill the input buffer when we reach the
-	 * end of it.
-	 */
-	int yy_fill_buffer;
-
-	int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-	/* When an EOF's been seen but there's still some text to process
-	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-	 * shouldn't try reading from the input source any more.  We might
-	 * still have a bunch of tokens to match, though, because of
-	 * possible backing-up.
-	 *
-	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
-	 */
-#define YY_BUFFER_EOF_PENDING 2
-	};
-
-static YY_BUFFER_STATE yy_current_buffer = 0;
-
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- */
-#define YY_CURRENT_BUFFER yy_current_buffer
-
-
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
-
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
-static int yy_start = 0;	/* start state number */
-
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-
-void yyrestart YY_PROTO(( FILE *input_file ));
-
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
-
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
-
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __unused;
-static void yy_flex_free YY_PROTO(( void * ));
-
-#define yy_new_buffer yy_create_buffer
-
-#define yy_set_interactive(is_interactive) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
-	}
-
-#define yy_set_bol(at_bol) \
-	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
-	}
-
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
-
-#define YY_USES_REJECT
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#define yytext_ptr yytext
-
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
-
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
-	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
-
-#define YY_NUM_RULES 13
-#define YY_END_OF_BUFFER 14
-static yyconst short int yy_acclist[83] =
-    {   0,
-       14,   12,   13,    1,   12,   13,    4,   13,    2,   12,
-       13,   11,   12,   13,   11,   12,   13,   11,   12,   13,
-       11,   12,   13,   11,   12,   13,   11,   12,   13,   11,
-       12,   13,   12,   13,    1,    2,   11,   11,   11,   11,
-       11,   11,   11,    3,   11,   11,   11,   11,   11,   11,
-       11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
-       11,   11,   11,   11,    9,   11,   11,   11,   11,   11,
-       11,    5,   11,   11,    6,   11,   10,   11,    7,   11,
-        8,   11
-    } ;
-
-static yyconst short int yy_accept[60] =
-    {   0,
-        1,    1,    1,    2,    4,    7,    9,   12,   15,   18,
-       21,   24,   27,   30,   33,   35,   36,   37,   38,   39,
-       40,   41,   42,   43,   44,   45,   46,   47,   48,   49,
-       50,   51,   52,   53,   54,   55,   56,   57,   58,   59,
-       60,   61,   62,   63,   64,   65,   67,   68,   69,   70,
-       71,   72,   74,   75,   77,   79,   81,   83,   83
-    } ;
-
-static yyconst int yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    1,    4,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    1,    1,    1,
-        1,    1,    1,    1,    6,    7,    8,    9,   10,   11,
-       12,    7,   13,    7,    7,   14,    7,   15,   16,    7,
-        7,   17,   18,   19,   20,   21,    7,    7,   22,    7,
-        1,   23,    1,    1,    5,    1,    6,    7,    8,    9,
-
-       10,   11,   12,    7,   13,    7,    7,   14,    7,   15,
-       16,    7,    7,   17,   18,   19,   20,   21,    7,    7,
-       22,    7,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-
-static yyconst int yy_meta[24] =
-    {   0,
-        1,    1,    2,    1,    3,    3,    3,    3,    3,    3,
-        3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-        3,    3,    1
-    } ;
-
-static yyconst short int yy_base[61] =
-    {   0,
-        0,    0,   68,   69,   65,   69,    0,    0,   50,   49,
-       54,   43,   45,   46,   57,   57,    0,    0,   43,   38,
-       37,   47,   32,   47,   69,   33,   40,   30,   41,   42,
-       26,   33,   29,   27,   33,   30,   35,   25,   19,   23,
-       19,   30,   22,   14,   18,    0,   14,   18,   16,   19,
-       19,    0,   12,    0,    0,    0,    0,   69,   23,   22
-    } ;
-
-static yyconst short int yy_def[61] =
-    {   0,
-       58,    1,   58,   58,   58,   58,   59,   60,   60,   60,
-       60,   60,   60,   60,   58,   58,   59,   60,   60,   60,
-       60,   60,   60,   60,   58,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,   60,   60,   60,
-       60,   60,   60,   60,   60,   60,   60,    0,   58,   58
-    } ;
-
-static yyconst short int yy_nxt[93] =
-    {   0,
-        4,    5,    6,    7,    4,    8,    8,    9,    8,    8,
-        8,    8,    8,    8,   10,    8,   11,   12,   13,   14,
-        8,    8,   15,   17,   18,   17,   57,   56,   55,   54,
-       53,   52,   51,   50,   49,   48,   47,   46,   45,   44,
-       43,   42,   41,   40,   39,   38,   37,   36,   35,   34,
-       33,   32,   31,   30,   29,   28,   27,   26,   16,   25,
-       24,   23,   22,   21,   20,   19,   16,   58,    3,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58
-
-    } ;
-
-static yyconst short int yy_chk[93] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,   59,   60,   59,   53,   51,   50,   49,
-       48,   47,   45,   44,   43,   42,   41,   40,   39,   38,
-       37,   36,   35,   34,   33,   32,   31,   30,   29,   28,
-       27,   26,   24,   23,   22,   21,   20,   19,   16,   15,
-       14,   13,   12,   11,   10,    9,    5,    3,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58,   58,   58,   58,   58,   58,   58,   58,   58,
-       58,   58
-
-    } ;
-
-static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ \
-yy_cp = yy_full_match; /* restore poss. backed-over text */ \
-++yy_lp; \
-goto find_rule; \
-}
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "/usr/src/lib/libc/net/nslexer.l"
-#define INITIAL 0
-#line 2 "/usr/src/lib/libc/net/nslexer.l"
-/*	$NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = 
-  "$FreeBSD: src/lib/libc/net/nslexer.l,v 1.5 2003/04/17 14:14:22 nectar Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ctype.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <string.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-#include "nsparser.h"
-
-#define YY_NO_UNPUT
-
-#line 504 "/dev/stdout"
-
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
-#else
-extern int yywrap YY_PROTO(( void ));
-#endif
-#endif
-
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
-#ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
-#endif
-
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
-#endif
-
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
-
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
-#endif
-
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-
-/* Copy whatever the last rule matched to the standard output. */
-
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
-#endif
-
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
-		{ \
-		int c = '*', n; \
-		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-			buf[n] = (char) c; \
-		if ( c == '\n' ) \
-			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
-			YY_FATAL_ERROR( "input in flex scanner failed" ); \
-		result = n; \
-		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
-#endif
-
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
-
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-
-#define YY_RULE_SETUP \
-	YY_USER_ACTION
-
-YY_DECL
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
-
-#line 66 "/usr/src/lib/libc/net/nslexer.l"
-
-
-#line 658 "/dev/stdout"
-
-	if ( yy_init )
-		{
-		yy_init = 0;
-
-#ifdef YY_USER_INIT
-		YY_USER_INIT;
-#endif
-
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
-
-		if ( ! yyin )
-			yyin = stdin;
-
-		if ( ! yyout )
-			yyout = stdout;
-
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
-
-		yy_load_buffer_state();
-		}
-
-	while ( 1 )		/* loops until end-of-file is reached */
-		{
-		yy_cp = yy_c_buf_p;
-
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
-
-		/* yy_bp points to the position in yy_ch_buf of the start of
-		 * the current run.
-		 */
-		yy_bp = yy_cp;
-
-		yy_current_state = yy_start;
-		yy_state_ptr = yy_state_buf;
-		*yy_state_ptr++ = yy_current_state;
-yy_match:
-		do
-			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-				{
-				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 59 )
-					yy_c = yy_meta[(unsigned int) yy_c];
-				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*yy_state_ptr++ = yy_current_state;
-			++yy_cp;
-			}
-		while ( yy_base[yy_current_state] != 69 );
-
-yy_find_action:
-		yy_current_state = *--yy_state_ptr;
-		yy_lp = yy_accept[yy_current_state];
-goto find_rule; /* avoid `defined but not used' warning */
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( yy_lp && yy_lp < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[yy_lp];
-					{
-					yy_full_match = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--yy_state_ptr;
-			yy_lp = yy_accept[yy_current_state];
-			}
-
-		YY_DO_BEFORE_ACTION;
-
-		if ( yy_act != YY_END_OF_BUFFER )
-			{
-			int yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytext[yyl] == '\n' )
-					++yylineno;
-			}
-
-do_action:	/* This label is used only to access EOF actions. */
-
-
-		switch ( yy_act )
-	{ /* beginning of action switch */
-case 1:
-YY_RULE_SETUP
-#line 68 "/usr/src/lib/libc/net/nslexer.l"
-;			/* skip whitespace */
-	YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 70 "/usr/src/lib/libc/net/nslexer.l"
-;			/* skip comments */
-	YY_BREAK
-case 3:
-YY_RULE_SETUP
-#line 72 "/usr/src/lib/libc/net/nslexer.l"
-;			/* allow continuation */
-	YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 74 "/usr/src/lib/libc/net/nslexer.l"
-return NL;
-	YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 76 "/usr/src/lib/libc/net/nslexer.l"
-return SUCCESS;
-	YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 77 "/usr/src/lib/libc/net/nslexer.l"
-return UNAVAIL;
-	YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 78 "/usr/src/lib/libc/net/nslexer.l"
-return NOTFOUND;
-	YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 79 "/usr/src/lib/libc/net/nslexer.l"
-return TRYAGAIN;
-	YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 81 "/usr/src/lib/libc/net/nslexer.l"
-return RETURN;
-	YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 82 "/usr/src/lib/libc/net/nslexer.l"
-return CONTINUE;
-	YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 84 "/usr/src/lib/libc/net/nslexer.l"
-{
-			char *p;
-			int i;
-
-			if ((p = strdup(yytext)) == NULL) {
-				syslog(LOG_ERR,
-			       "NSSWITCH(nslexer): memory allocation failure");
-				return ERRORTOKEN;
-			}
-			for (i = 0; i < strlen(p); i++) {
-				if (isupper((unsigned char)p[i]))
-					p[i] = tolower((unsigned char)p[i]);
-			}
-			_nsyylval.str = p;
-			return STRING;
-		}
-	YY_BREAK
-case 12:
-YY_RULE_SETUP
-#line 101 "/usr/src/lib/libc/net/nslexer.l"
-return yytext[0];
-	YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 103 "/usr/src/lib/libc/net/nslexer.l"
-ECHO;
-	YY_BREAK
-#line 830 "/dev/stdout"
-			case YY_STATE_EOF(INITIAL):
-				yyterminate();
-
-	case YY_END_OF_BUFFER:
-		{
-		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
-
-		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
-		YY_RESTORE_YY_MORE_OFFSET
-
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
-			{
-			/* We're scanning a new file or input source.  It's
-			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
-			 * globals.  Here is the right place to do so, because
-			 * this is the first action (other than possibly a
-			 * back-up) that will match for the new input source.
-			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
-			}
-
-		/* Note that here we test for yy_c_buf_p "<=" to the position
-		 * of the first EOB in the buffer, since yy_c_buf_p will
-		 * already have been incremented past the NUL character
-		 * (since all states make transitions on EOB to the
-		 * end-of-buffer state).  Contrast this with the test
-		 * in input().
-		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			{ /* This was really a NUL. */
-			yy_state_type yy_next_state;
-
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
-
-			yy_current_state = yy_get_previous_state();
-
-			/* Okay, we're now positioned to make the NUL
-			 * transition.  We couldn't have
-			 * yy_get_previous_state() go ahead and do it
-			 * for us because it doesn't know how to deal
-			 * with the possibility of jamming (and we don't
-			 * want to build jamming into it because then it
-			 * will run more slowly).
-			 */
-
-			yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
-
-			if ( yy_next_state )
-				{
-				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
-				yy_current_state = yy_next_state;
-				goto yy_match;
-				}
-
-			else
-				{
-				yy_cp = yy_c_buf_p;
-				goto yy_find_action;
-				}
-			}
-
-		else switch ( yy_get_next_buffer() )
-			{
-			case EOB_ACT_END_OF_FILE:
-				{
-				yy_did_buffer_switch_on_eof = 0;
-
-				if ( yywrap() )
-					{
-					/* Note: because we've taken care in
-					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
-					 * yy_c_buf_p so that if some total
-					 * hoser (like flex itself) wants to
-					 * call the scanner after we return the
-					 * YY_NULL, it'll still work - another
-					 * YY_NULL will get returned.
-					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
-
-					yy_act = YY_STATE_EOF(YY_START);
-					goto do_action;
-					}
-
-				else
-					{
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-					}
-				break;
-				}
-
-			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_match;
-
-			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
-
-				yy_current_state = yy_get_previous_state();
-
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
-				goto yy_find_action;
-			}
-		break;
-		}
-
-	default:
-		YY_FATAL_ERROR(
-			"fatal flex scanner internal error--no action found" );
-	} /* end of action switch */
-		} /* end of scanning one token */
-	} /* end of yylex */
-
-
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *	EOB_ACT_LAST_MATCH -
- *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *	EOB_ACT_END_OF_FILE - end of file
- */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
-	register int number_to_move, i;
-	int ret_val;
-
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
-		YY_FATAL_ERROR(
-		"fatal flex scanner internal error--end of buffer missed" );
-
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
-		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
-			{
-			/* We matched a single character, the EOB, so
-			 * treat this as a final EOF.
-			 */
-			return EOB_ACT_END_OF_FILE;
-			}
-
-		else
-			{
-			/* We matched some text prior to the EOB, first
-			 * process it.
-			 */
-			return EOB_ACT_LAST_MATCH;
-			}
-		}
-
-	/* Try to read more data. */
-
-	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
-
-	for ( i = 0; i < number_to_move; ++i )
-		*(dest++) = *(source++);
-
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-		/* don't do the read, it's not guaranteed to return an EOF,
-		 * just force an EOF
-		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
-
-	else
-		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
-
-		while ( num_to_read <= 0 )
-			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
-
-			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
-
-			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
-
-			if ( b->yy_is_our_buffer )
-				{
-				int new_size = b->yy_buf_size * 2;
-
-				if ( new_size <= 0 )
-					b->yy_buf_size += b->yy_buf_size / 8;
-				else
-					b->yy_buf_size *= 2;
-
-				b->yy_ch_buf = (char *)
-					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
-				}
-			else
-				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
-
-			if ( ! b->yy_ch_buf )
-				YY_FATAL_ERROR(
-				"fatal error - scanner input buffer overflow" );
-
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-			num_to_read = yy_current_buffer->yy_buf_size -
-						number_to_move - 1;
-#endif
-			}
-
-		if ( num_to_read > YY_READ_BUF_SIZE )
-			num_to_read = YY_READ_BUF_SIZE;
-
-		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
-
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	if ( yy_n_chars == 0 )
-		{
-		if ( number_to_move == YY_MORE_ADJ )
-			{
-			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
-			}
-
-		else
-			{
-			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
-				YY_BUFFER_EOF_PENDING;
-			}
-		}
-
-	else
-		ret_val = EOB_ACT_CONTINUE_SCAN;
-
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
-
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
-
-	return ret_val;
-	}
-
-
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-
-static yy_state_type yy_get_previous_state()
-	{
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
-
-	yy_current_state = yy_start;
-	yy_state_ptr = yy_state_buf;
-	*yy_state_ptr++ = yy_current_state;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
-		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-			{
-			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 59 )
-				yy_c = yy_meta[(unsigned int) yy_c];
-			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*yy_state_ptr++ = yy_current_state;
-		}
-
-	return yy_current_state;
-	}
-
-
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *	next_state = yy_try_NUL_trans( current_state );
- */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
-	register int yy_is_jam;
-
-	register YY_CHAR yy_c = 1;
-	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-		{
-		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 59 )
-			yy_c = yy_meta[(unsigned int) yy_c];
-		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 58);
-	if ( ! yy_is_jam )
-		*yy_state_ptr++ = yy_current_state;
-
-	return yy_is_jam ? 0 : yy_current_state;
-	}
-
-
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
-
-	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
-
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-		{ /* need to shift things up to make room */
-		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
-		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
-
-		while ( source > yy_current_buffer->yy_ch_buf )
-			*--dest = *--source;
-
-		yy_cp += (int) (dest - source);
-		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
-
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
-			YY_FATAL_ERROR( "flex scanner push-back overflow" );
-		}
-
-	*--yy_cp = (char) c;
-
-	if ( c == '\n' )
-		--yylineno;
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
-#ifdef __cplusplus
-static int yyinput()
-#else
-static int input()
-#endif
-	{
-	int c;
-
-	*yy_c_buf_p = yy_hold_char;
-
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
-		{
-		/* yy_c_buf_p now points to the character we want to return.
-		 * If this occurs *before* the EOB characters, then it's a
-		 * valid NUL; if not, then we've hit the end of the buffer.
-		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
-			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
-
-		else
-			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
-
-			switch ( yy_get_next_buffer() )
-				{
-				case EOB_ACT_LAST_MATCH:
-					/* This happens because yy_g_n_b()
-					 * sees that we've accumulated a
-					 * token and flags that we need to
-					 * try matching the token before
-					 * proceeding.  But for input(),
-					 * there's no matching to consider.
-					 * So convert the EOB_ACT_LAST_MATCH
-					 * to EOB_ACT_END_OF_FILE.
-					 */
-
-					/* Reset buffer status. */
-					yyrestart( yyin );
-
-					/* fall through */
-
-				case EOB_ACT_END_OF_FILE:
-					{
-					if ( yywrap() )
-						return EOF;
-
-					if ( ! yy_did_buffer_switch_on_eof )
-						YY_NEW_FILE;
-#ifdef __cplusplus
-					return yyinput();
-#else
-					return input();
-#endif
-					}
-
-				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
-					break;
-				}
-			}
-		}
-
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
-	if ( c == '\n' )
-		++yylineno;
-
-	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
-
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
-		return;
-
-	if ( yy_current_buffer )
-		{
-		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
-		}
-
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
-
-	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
-	 * to go ahead and always set it.
-	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
-
-
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_buf_size = size;
-
-	/* yy_ch_buf has to be 2 characters longer than the size given because
-	 * we need to put in 2 end-of-buffer characters.
-	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
-	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-
-	b->yy_is_our_buffer = 1;
-
-	yy_init_buffer( b, file );
-
-	return b;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
-	if ( ! b )
-		return;
-
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
-
-	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
-
-
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-	{
-	yy_flush_buffer( b );
-
-	b->yy_input_file = file;
-	b->yy_fill_buffer = 1;
-
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-
-	{
-	if ( ! b )
-		return;
-
-	b->yy_n_chars = 0;
-
-	/* We always need two end-of-buffer characters.  The first causes
-	 * a transition to the end-of-buffer state.  The second causes
-	 * a jam in that state.
-	 */
-	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-
-	b->yy_buf_pos = &b->yy_ch_buf[0];
-
-	b->yy_at_bol = 1;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
-	}
-
-
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
-
-	if ( size < 2 ||
-	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
-	     base[size-1] != YY_END_OF_BUFFER_CHAR )
-		/* They forgot to leave room for the EOB's. */
-		return 0;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
-	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
-	b->yy_buf_pos = b->yy_ch_buf = base;
-	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
-	b->yy_n_chars = b->yy_buf_size;
-	b->yy_is_interactive = 0;
-	b->yy_at_bol = 1;
-	b->yy_fill_buffer = 0;
-	b->yy_buffer_status = YY_BUFFER_NEW;
-
-	yy_switch_to_buffer( b );
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
-	YY_BUFFER_STATE b;
-	char *buf;
-	yy_size_t n;
-	int i;
-
-	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
-	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
-
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
-
-	b = yy_scan_buffer( buf, n );
-	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-
-	/* It's okay to grow etc. this buffer, and we should throw it
-	 * away when we're done.
-	 */
-	b->yy_is_our_buffer = 1;
-
-	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
-
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
-
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
-
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
-
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
-
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
-
-	BEGIN(new_state);
-	}
-#endif
-
-
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
-
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
-
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
-
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
-
-
-
-/* Redefine yyless() so it works in section 3 code. */
-
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
-
-
-/* Internal utility routines. */
-
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
-	register int i;
-	for ( i = 0; i < n; ++i )
-		s1[i] = s2[i];
-	}
-#endif
-
-#ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
-	register int n;
-	for ( n = 0; s[n]; ++n )
-		;
-
-	return n;
-	}
-#endif
-
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
-	return (void *) malloc( size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
-	/* The cast to (char *) in the following accommodates both
-	 * implementations that use char* generic pointers, and those
-	 * that use void* generic pointers.  It works with the latter
-	 * because both ANSI C and C++ allow castless assignment from
-	 * any pointer type to void*, and deal with argument conversions
-	 * as though doing an assignment.
-	 */
-	return (void *) realloc( (char *) ptr, size );
-	}
-
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
-
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
-#line 103 "/usr/src/lib/libc/net/nslexer.l"
-
-
-#undef _nsyywrap
-int
-_nsyywrap()
-{
-	return 1;
-} /* _nsyywrap */
-
-void
-_nsyyerror(msg)
-	const char *msg;
-{
-
-	 syslog(LOG_ERR, "NSSWITCH(nslexer): %s line %d: %s at '%s'",
-	     _PATH_NS_CONF, yylineno, msg, yytext);
-} /* _nsyyerror */
diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l
deleted file mode 100644
index f87d66b..0000000
--- a/lib/libc/net/nslexer.l
+++ /dev/null
@@ -1,119 +0,0 @@
-%{
-/*	$NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = 
-  "$FreeBSD: src/lib/libc/net/nslexer.l,v 1.5 2003/04/17 14:14:22 nectar Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ctype.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <string.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-#include "nsparser.h"
-
-#define YY_NO_UNPUT
-
-%}
-
-%option yylineno
-
-BLANK		[ \t]
-CR		\n
-STRING		[a-zA-Z][a-zA-Z0-9_]*
-
-%%
-
-{BLANK}+	;			/* skip whitespace */
-
-#.*		;			/* skip comments */
-
-\\{CR}		;			/* allow continuation */
-
-{CR}		return NL;
-
-[sS][uU][cC][cC][eE][sS][sS]		return SUCCESS;
-[uU][nN][aA][vV][aA][iI][lL]		return UNAVAIL;
-[nN][oO][tT][fF][oO][uU][nN][dD]	return NOTFOUND;
-[tT][rR][yY][aA][gG][aA][iI][nN]	return TRYAGAIN;
-
-[rR][eE][tT][uU][rR][nN]		return RETURN;
-[cC][oO][nN][tT][iI][nN][uU][eE]	return CONTINUE;
-
-{STRING}	{
-			char *p;
-			int i;
-
-			if ((p = strdup(yytext)) == NULL) {
-				syslog(LOG_ERR,
-			       "NSSWITCH(nslexer): memory allocation failure");
-				return ERRORTOKEN;
-			}
-			for (i = 0; i < strlen(p); i++) {
-				if (isupper((unsigned char)p[i]))
-					p[i] = tolower((unsigned char)p[i]);
-			}
-			_nsyylval.str = p;
-			return STRING;
-		}
-
-.		return yytext[0];
-
-%%
-
-#undef _nsyywrap
-int
-_nsyywrap()
-{
-	return 1;
-} /* _nsyywrap */
-
-void
-_nsyyerror(msg)
-	const char *msg;
-{
-
-	 syslog(LOG_ERR, "NSSWITCH(nslexer): %s line %d: %s at '%s'",
-	     _PATH_NS_CONF, yylineno, msg, yytext);
-} /* _nsyyerror */
diff --git a/lib/libc/net/nsparser.c b/lib/libc/net/nsparser.c
deleted file mode 100644
index 59cc01e..0000000
--- a/lib/libc/net/nsparser.c
+++ /dev/null
@@ -1,613 +0,0 @@
-#include <stdlib.h>
-#ifndef lint
-#ifdef __unused
-__unused
-#endif
-static char const 
-yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.37 2003/02/12 18:03:55 davidc Exp $";
-#endif
-#define YYBYACC 1
-#define YYMAJOR 1
-#define YYMINOR 9
-#define YYLEX yylex()
-#define YYEMPTY -1
-#define yyclearin (yychar=(YYEMPTY))
-#define yyerrok (yyerrflag=0)
-#define YYRECOVERING() (yyerrflag!=0)
-#if defined(__cplusplus) || __STDC__
-static int yygrowstack(void);
-#else
-static int yygrowstack();
-#endif
-#define yyparse _nsyyparse
-#define yylex _nsyylex
-#define yyerror _nsyyerror
-#define yychar _nsyychar
-#define yyval _nsyyval
-#define yylval _nsyylval
-#define yydebug _nsyydebug
-#define yynerrs _nsyynerrs
-#define yyerrflag _nsyyerrflag
-#define yyss _nsyyss
-#define yyssp _nsyyssp
-#define yyvs _nsyyvs
-#define yyvsp _nsyyvsp
-#define yylhs _nsyylhs
-#define yylen _nsyylen
-#define yydefred _nsyydefred
-#define yydgoto _nsyydgoto
-#define yysindex _nsyysindex
-#define yyrindex _nsyyrindex
-#define yygindex _nsyygindex
-#define yytable _nsyytable
-#define yycheck _nsyycheck
-#define yyname _nsyyname
-#define yyrule _nsyyrule
-#define yysslim _nsyysslim
-#define yystacksize _nsyystacksize
-#define YYPREFIX "_nsyy"
-#line 2 "/usr/src/lib/libc/net/nsparser.y"
-/*	$NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-static	void	_nsaddsrctomap(const char *);
-
-static	ns_dbt		curdbt;
-static	ns_src		cursrc;
-#line 57 "/usr/src/lib/libc/net/nsparser.y"
-typedef union {
-	char *str;
-	int   mapval;
-} YYSTYPE;
-#line 109 "y.tab.c"
-#define YYERRCODE 256
-#define NL 257
-#define SUCCESS 258
-#define UNAVAIL 259
-#define NOTFOUND 260
-#define TRYAGAIN 261
-#define RETURN 262
-#define CONTINUE 263
-#define ERRORTOKEN 264
-#define STRING 265
-const short _nsyylhs[] = {                                        -1,
-    0,    0,    3,    3,    4,    4,    4,    4,    5,    6,
-    6,    7,    9,    7,    8,    8,   10,    1,    1,    1,
-    1,    2,    2,
-};
-const short _nsyylen[] = {                                         2,
-    0,    1,    1,    2,    1,    3,    4,    2,    1,    1,
-    2,    1,    0,    5,    1,    2,    3,    1,    1,    1,
-    1,    1,    1,
-};
-const short _nsyydefred[] = {                                      0,
-    0,    5,    9,    0,    0,    3,    0,    8,    4,    0,
-    6,    0,    0,   10,   13,    7,   11,    0,   18,   19,
-   20,   21,    0,    0,   15,    0,   14,   16,   22,   23,
-   17,
-};
-const short _nsyydgoto[] = {                                       4,
-   23,   31,    5,    6,    7,   13,   14,   24,   18,   25,
-};
-const short _nsyysindex[] = {                                   -255,
- -249,    0,    0,    0, -255,    0,  -49,    0,    0, -254,
-    0,  -73, -253,    0,    0,    0,    0, -244,    0,    0,
-    0,    0,  -42,  -93,    0, -256,    0,    0,    0,    0,
-    0,
-};
-const short _nsyyrindex[] = {                                     20,
-    0,    0,    0,    0,   21,    0,    0,    0,    0,    0,
-    0, -252,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,
-};
-const short _nsyygindex[] = {                                      0,
-    0,    0,    0,   17,    0,    0,   10,    0,    0,    1,
-};
-#define YYTABLESIZE 168
-const short _nsyytable[] = {                                      27,
-    1,    2,   11,   16,   12,   29,   30,    8,   10,    3,
-   12,   12,   12,   19,   20,   21,   22,   15,   26,    1,
-    2,    9,   17,    0,   28,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,   19,   20,   21,   22,
-};
-const short _nsyycheck[] = {                                      93,
-  256,  257,  257,  257,  257,  262,  263,  257,   58,  265,
-  265,  265,  265,  258,  259,  260,  261,   91,   61,    0,
-    0,    5,   13,   -1,   24,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  258,  259,  260,  261,
-};
-#define YYFINAL 4
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-#define YYMAXTOKEN 265
-#if YYDEBUG
-const char * const _nsyyname[] = {
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"':'",0,0,"'='",0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"'['",0,"']'",0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"NL","SUCCESS",
-"UNAVAIL","NOTFOUND","TRYAGAIN","RETURN","CONTINUE","ERRORTOKEN","STRING",
-};
-const char * const _nsyyrule[] = {
-"$accept : File",
-"File :",
-"File : Lines",
-"Lines : Entry",
-"Lines : Lines Entry",
-"Entry : NL",
-"Entry : Database ':' NL",
-"Entry : Database ':' Srclist NL",
-"Entry : error NL",
-"Database : STRING",
-"Srclist : Item",
-"Srclist : Srclist Item",
-"Item : STRING",
-"$$1 :",
-"Item : STRING '[' $$1 Criteria ']'",
-"Criteria : Criterion",
-"Criteria : Criteria Criterion",
-"Criterion : Status '=' Action",
-"Status : SUCCESS",
-"Status : UNAVAIL",
-"Status : NOTFOUND",
-"Status : TRYAGAIN",
-"Action : RETURN",
-"Action : CONTINUE",
-};
-#endif
-#if YYDEBUG
-#include <stdio.h>
-#endif
-#ifdef YYSTACKSIZE
-#undef YYMAXDEPTH
-#define YYMAXDEPTH YYSTACKSIZE
-#else
-#ifdef YYMAXDEPTH
-#define YYSTACKSIZE YYMAXDEPTH
-#else
-#define YYSTACKSIZE 10000
-#define YYMAXDEPTH 10000
-#endif
-#endif
-#define YYINITSTACKSIZE 200
-int yydebug;
-int yynerrs;
-int yyerrflag;
-int yychar;
-short *yyssp;
-YYSTYPE *yyvsp;
-YYSTYPE yyval;
-YYSTYPE yylval;
-short *yyss;
-short *yysslim;
-YYSTYPE *yyvs;
-int yystacksize;
-#line 149 "/usr/src/lib/libc/net/nsparser.y"
-
-static void
-_nsaddsrctomap(elem)
-	const char *elem;
-{
-	int		i, lineno;
-	extern int	_nsyylineno;
-	extern char *	_nsyytext;
-
-	lineno = _nsyylineno - (*_nsyytext == '\n' ? 1 : 0);
-	if (curdbt.srclistsize > 0) {
-		if ((strcasecmp(elem, NSSRC_COMPAT) == 0) ||
-		    (strcasecmp(curdbt.srclist[0].name, NSSRC_COMPAT) == 0)) {
-			syslog(LOG_ERR,
-	    "NSSWITCH(nsparser): %s line %d: 'compat' used with other sources",
-			    _PATH_NS_CONF, lineno);
-			return;
-		}
-	}
-	for (i = 0; i < curdbt.srclistsize; i++) {
-		if (strcasecmp(curdbt.srclist[i].name, elem) == 0) {
-			syslog(LOG_ERR,
-		       "NSSWITCH(nsparser): %s line %d: duplicate source '%s'",
-			    _PATH_NS_CONF, lineno, elem);
-			return;
-		}
-	}
-	cursrc.name = elem;
-	_nsdbtaddsrc(&curdbt, &cursrc);
-}
-#line 294 "y.tab.c"
-/* allocate initial stack or double stack size, up to YYMAXDEPTH */
-static int yygrowstack()
-{
-    int newsize, i;
-    short *newss;
-    YYSTYPE *newvs;
-
-    if ((newsize = yystacksize) == 0)
-        newsize = YYINITSTACKSIZE;
-    else if (newsize >= YYMAXDEPTH)
-        return -1;
-    else if ((newsize *= 2) > YYMAXDEPTH)
-        newsize = YYMAXDEPTH;
-    i = yyssp - yyss;
-    newss = yyss ? (short *)realloc(yyss, newsize * sizeof *newss) :
-      (short *)malloc(newsize * sizeof *newss);
-    if (newss == NULL)
-        return -1;
-    yyss = newss;
-    yyssp = newss + i;
-    newvs = yyvs ? (YYSTYPE *)realloc(yyvs, newsize * sizeof *newvs) :
-      (YYSTYPE *)malloc(newsize * sizeof *newvs);
-    if (newvs == NULL)
-        return -1;
-    yyvs = newvs;
-    yyvsp = newvs + i;
-    yystacksize = newsize;
-    yysslim = yyss + newsize - 1;
-    return 0;
-}
-
-#define YYABORT goto yyabort
-#define YYREJECT goto yyabort
-#define YYACCEPT goto yyaccept
-#define YYERROR goto yyerrlab
-
-#ifndef YYPARSE_PARAM
-#if defined(__cplusplus) || __STDC__
-#define YYPARSE_PARAM_ARG void
-#define YYPARSE_PARAM_DECL
-#else	/* ! ANSI-C/C++ */
-#define YYPARSE_PARAM_ARG
-#define YYPARSE_PARAM_DECL
-#endif	/* ANSI-C/C++ */
-#else	/* YYPARSE_PARAM */
-#ifndef YYPARSE_PARAM_TYPE
-#define YYPARSE_PARAM_TYPE void *
-#endif
-#if defined(__cplusplus) || __STDC__
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM_TYPE YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL
-#else	/* ! ANSI-C/C++ */
-#define YYPARSE_PARAM_ARG YYPARSE_PARAM
-#define YYPARSE_PARAM_DECL YYPARSE_PARAM_TYPE YYPARSE_PARAM;
-#endif	/* ANSI-C/C++ */
-#endif	/* ! YYPARSE_PARAM */
-
-int
-yyparse (YYPARSE_PARAM_ARG)
-    YYPARSE_PARAM_DECL
-{
-    int yym, yyn, yystate;
-#if YYDEBUG
-    const char *yys;
-
-    if ((yys = getenv("YYDEBUG")))
-    {
-        yyn = *yys;
-        if (yyn >= '0' && yyn <= '9')
-            yydebug = yyn - '0';
-    }
-#endif
-
-    yynerrs = 0;
-    yyerrflag = 0;
-    yychar = (-1);
-
-    if (yyss == NULL && yygrowstack()) goto yyoverflow;
-    yyssp = yyss;
-    yyvsp = yyvs;
-    *yyssp = yystate = 0;
-
-yyloop:
-    if ((yyn = yydefred[yystate])) goto yyreduce;
-    if (yychar < 0)
-    {
-        if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, reading %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-    }
-    if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: state %d, shifting to state %d\n",
-                    YYPREFIX, yystate, yytable[yyn]);
-#endif
-        if (yyssp >= yysslim && yygrowstack())
-        {
-            goto yyoverflow;
-        }
-        *++yyssp = yystate = yytable[yyn];
-        *++yyvsp = yylval;
-        yychar = (-1);
-        if (yyerrflag > 0)  --yyerrflag;
-        goto yyloop;
-    }
-    if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yychar)
-    {
-        yyn = yytable[yyn];
-        goto yyreduce;
-    }
-    if (yyerrflag) goto yyinrecovery;
-#if defined(lint) || defined(__GNUC__)
-    goto yynewerror;
-#endif
-yynewerror:
-    yyerror("syntax error");
-#if defined(lint) || defined(__GNUC__)
-    goto yyerrlab;
-#endif
-yyerrlab:
-    ++yynerrs;
-yyinrecovery:
-    if (yyerrflag < 3)
-    {
-        yyerrflag = 3;
-        for (;;)
-        {
-            if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 &&
-                    yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE)
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: state %d, error recovery shifting\
- to state %d\n", YYPREFIX, *yyssp, yytable[yyn]);
-#endif
-                if (yyssp >= yysslim && yygrowstack())
-                {
-                    goto yyoverflow;
-                }
-                *++yyssp = yystate = yytable[yyn];
-                *++yyvsp = yylval;
-                goto yyloop;
-            }
-            else
-            {
-#if YYDEBUG
-                if (yydebug)
-                    printf("%sdebug: error recovery discarding state %d\n",
-                            YYPREFIX, *yyssp);
-#endif
-                if (yyssp <= yyss) goto yyabort;
-                --yyssp;
-                --yyvsp;
-            }
-        }
-    }
-    else
-    {
-        if (yychar == 0) goto yyabort;
-#if YYDEBUG
-        if (yydebug)
-        {
-            yys = 0;
-            if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-            if (!yys) yys = "illegal-symbol";
-            printf("%sdebug: state %d, error recovery discards token %d (%s)\n",
-                    YYPREFIX, yystate, yychar, yys);
-        }
-#endif
-        yychar = (-1);
-        goto yyloop;
-    }
-yyreduce:
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: state %d, reducing by rule %d (%s)\n",
-                YYPREFIX, yystate, yyn, yyrule[yyn]);
-#endif
-    yym = yylen[yyn];
-    yyval = yyvsp[1-yym];
-    switch (yyn)
-    {
-case 7:
-#line 86 "/usr/src/lib/libc/net/nsparser.y"
-{
-			_nsdbtput(&curdbt);
-		}
-break;
-case 8:
-#line 90 "/usr/src/lib/libc/net/nsparser.y"
-{
-			yyerrok;
-		}
-break;
-case 9:
-#line 97 "/usr/src/lib/libc/net/nsparser.y"
-{
-			curdbt.name = yylval.str;
-			curdbt.srclist = NULL;
-			curdbt.srclistsize = 0;
-		}
-break;
-case 12:
-#line 111 "/usr/src/lib/libc/net/nsparser.y"
-{
-			cursrc.flags = NS_TERMINATE;
-			_nsaddsrctomap(yyvsp[0].str);
-		}
-break;
-case 13:
-#line 115 "/usr/src/lib/libc/net/nsparser.y"
-{ cursrc.flags = NS_SUCCESS; }
-break;
-case 14:
-#line 116 "/usr/src/lib/libc/net/nsparser.y"
-{
-			_nsaddsrctomap(yyvsp[-4].str);
-		}
-break;
-case 17:
-#line 128 "/usr/src/lib/libc/net/nsparser.y"
-{
-			if (yyvsp[0].mapval)	     /* if action == RETURN set RETURN bit */
-				cursrc.flags |= yyvsp[-2].mapval;  
-			else	     /* else unset it */
-				cursrc.flags &= ~yyvsp[-2].mapval;
-		}
-break;
-case 18:
-#line 137 "/usr/src/lib/libc/net/nsparser.y"
-{ yyval.mapval = NS_SUCCESS; }
-break;
-case 19:
-#line 138 "/usr/src/lib/libc/net/nsparser.y"
-{ yyval.mapval = NS_UNAVAIL; }
-break;
-case 20:
-#line 139 "/usr/src/lib/libc/net/nsparser.y"
-{ yyval.mapval = NS_NOTFOUND; }
-break;
-case 21:
-#line 140 "/usr/src/lib/libc/net/nsparser.y"
-{ yyval.mapval = NS_TRYAGAIN; }
-break;
-case 22:
-#line 144 "/usr/src/lib/libc/net/nsparser.y"
-{ yyval.mapval = NS_ACTION_RETURN; }
-break;
-case 23:
-#line 145 "/usr/src/lib/libc/net/nsparser.y"
-{ yyval.mapval = NS_ACTION_CONTINUE; }
-break;
-#line 559 "y.tab.c"
-    }
-    yyssp -= yym;
-    yystate = *yyssp;
-    yyvsp -= yym;
-    yym = yylhs[yyn];
-    if (yystate == 0 && yym == 0)
-    {
-#if YYDEBUG
-        if (yydebug)
-            printf("%sdebug: after reduction, shifting from state 0 to\
- state %d\n", YYPREFIX, YYFINAL);
-#endif
-        yystate = YYFINAL;
-        *++yyssp = YYFINAL;
-        *++yyvsp = yyval;
-        if (yychar < 0)
-        {
-            if ((yychar = yylex()) < 0) yychar = 0;
-#if YYDEBUG
-            if (yydebug)
-            {
-                yys = 0;
-                if (yychar <= YYMAXTOKEN) yys = yyname[yychar];
-                if (!yys) yys = "illegal-symbol";
-                printf("%sdebug: state %d, reading %d (%s)\n",
-                        YYPREFIX, YYFINAL, yychar, yys);
-            }
-#endif
-        }
-        if (yychar == 0) goto yyaccept;
-        goto yyloop;
-    }
-    if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 &&
-            yyn <= YYTABLESIZE && yycheck[yyn] == yystate)
-        yystate = yytable[yyn];
-    else
-        yystate = yydgoto[yym];
-#if YYDEBUG
-    if (yydebug)
-        printf("%sdebug: after reduction, shifting from state %d \
-to state %d\n", YYPREFIX, *yyssp, yystate);
-#endif
-    if (yyssp >= yysslim && yygrowstack())
-    {
-        goto yyoverflow;
-    }
-    *++yyssp = yystate;
-    *++yyvsp = yyval;
-    goto yyloop;
-yyoverflow:
-    yyerror("yacc stack overflow");
-yyabort:
-    return (1);
-yyaccept:
-    return (0);
-}
diff --git a/lib/libc/net/nsparser.h b/lib/libc/net/nsparser.h
deleted file mode 100644
index 3433ae3..0000000
--- a/lib/libc/net/nsparser.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef YYERRCODE
-#define YYERRCODE 256
-#endif
-
-#define NL 257
-#define SUCCESS 258
-#define UNAVAIL 259
-#define NOTFOUND 260
-#define TRYAGAIN 261
-#define RETURN 262
-#define CONTINUE 263
-#define ERRORTOKEN 264
-#define STRING 265
-typedef union {
-	char *str;
-	int   mapval;
-} YYSTYPE;
-extern YYSTYPE _nsyylval;
diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y
deleted file mode 100644
index a013a72..0000000
--- a/lib/libc/net/nsparser.y
+++ /dev/null
@@ -1,178 +0,0 @@
-%{
-/*	$NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/nsparser.y,v 1.4 2003/04/17 14:14:22 nectar Exp $");
-
-#include "namespace.h"
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-static	void	_nsaddsrctomap(const char *);
-
-static	ns_dbt		curdbt;
-static	ns_src		cursrc;
-%}
-
-%union {
-	char *str;
-	int   mapval;
-}
-
-%token	NL
-%token	SUCCESS UNAVAIL NOTFOUND TRYAGAIN
-%token	RETURN CONTINUE
-%token  ERRORTOKEN
-%token	<str> STRING
-
-%type	<mapval> Status Action
-
-%%
-
-File
-	:	/* empty */
-	| Lines
-	;
-
-Lines
-	: Entry
-	| Lines Entry
-	;
-
-Entry
-	: NL
-	| Database ':' NL
-	| Database ':' Srclist NL
-		{
-			_nsdbtput(&curdbt);
-		}
-	| error NL
-		{
-			yyerrok;
-		}
-	;
-
-Database
-	: STRING
-		{
-			curdbt.name = yylval.str;
-			curdbt.srclist = NULL;
-			curdbt.srclistsize = 0;
-		}
-	;
-
-Srclist
-	: Item
-	| Srclist Item
-	;
-
-Item
-	: STRING
-		{
-			cursrc.flags = NS_TERMINATE;
-			_nsaddsrctomap($1);
-		}
-	| STRING '[' { cursrc.flags = NS_SUCCESS; } Criteria ']'
-		{
-			_nsaddsrctomap($1);
-		}
-	;
-
-Criteria
-	: Criterion
-	| Criteria Criterion
-	;
-
-Criterion
-	: Status '=' Action
-		{
-			if ($3)	     /* if action == RETURN set RETURN bit */
-				cursrc.flags |= $1;  
-			else	     /* else unset it */
-				cursrc.flags &= ~$1;
-		}
-	;
-
-Status
-	: SUCCESS	{ $$ = NS_SUCCESS; }
-	| UNAVAIL	{ $$ = NS_UNAVAIL; }
-	| NOTFOUND	{ $$ = NS_NOTFOUND; }
-	| TRYAGAIN	{ $$ = NS_TRYAGAIN; }
-	;
-
-Action
-	: RETURN	{ $$ = NS_ACTION_RETURN; }
-	| CONTINUE	{ $$ = NS_ACTION_CONTINUE; }
-	;
-
-%%
-
-static void
-_nsaddsrctomap(elem)
-	const char *elem;
-{
-	int		i, lineno;
-	extern int	_nsyylineno;
-	extern char *	_nsyytext;
-
-	lineno = _nsyylineno - (*_nsyytext == '\n' ? 1 : 0);
-	if (curdbt.srclistsize > 0) {
-		if ((strcasecmp(elem, NSSRC_COMPAT) == 0) ||
-		    (strcasecmp(curdbt.srclist[0].name, NSSRC_COMPAT) == 0)) {
-			syslog(LOG_ERR,
-	    "NSSWITCH(nsparser): %s line %d: 'compat' used with other sources",
-			    _PATH_NS_CONF, lineno);
-			return;
-		}
-	}
-	for (i = 0; i < curdbt.srclistsize; i++) {
-		if (strcasecmp(curdbt.srclist[i].name, elem) == 0) {
-			syslog(LOG_ERR,
-		       "NSSWITCH(nsparser): %s line %d: duplicate source '%s'",
-			    _PATH_NS_CONF, lineno, elem);
-			return;
-		}
-	}
-	cursrc.name = elem;
-	_nsdbtaddsrc(&curdbt, &cursrc);
-}
diff --git a/lib/libc/net/nss_backends.h b/lib/libc/net/nss_backends.h
deleted file mode 100644
index e39a25a..0000000
--- a/lib/libc/net/nss_backends.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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/lib/libc/net/nss_backends.h,v 1.1 2003/04/17 14:14:22 nectar Exp $
- */
-/*
- * Eventually, the implementations of existing built-in NSS functions
- * may be moved into NSS modules and live here.
- */
-#if 0
-NSS_BACKEND(	files,	_files_nss_module_register	)
-NSS_BACKEND(	dns,	_dns_nss_module_register	)
-NSS_BACKEND(	nis,	_nis_nss_module_register	)
-NSS_BACKEND(	compat,	_compat_nss_module_register	)
-#endif
diff --git a/lib/libc/net/nss_compat.c b/lib/libc/net/nss_compat.c
deleted file mode 100644
index 16e50c8..0000000
--- a/lib/libc/net/nss_compat.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- *
- * Compatibility shims for the GNU C Library-style nsswitch interface.
- */
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <errno.h>
-#include <nss.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-
-struct group;
-struct passwd;
-
-static int	terminator;
-
-#define DECLARE_TERMINATOR(x)					\
-static pthread_key_t	 _term_key_##x;				\
-static void							\
-_term_create_##x(void)						\
-{								\
-	(void)_pthread_key_create(&_term_key_##x, NULL);	\
-}								\
-static void		*_term_main_##x;			\
-static pthread_once_t	 _term_once_##x = PTHREAD_ONCE_INIT
-
-#define SET_TERMINATOR(x, y)						\
-do {									\
-	if (!__isthreaded || _pthread_main_np())			\
-		_term_main_##x = (y);					\
-	else {								\
-		(void)_pthread_once(&_term_once_##x, _term_create_##x);	\
-		(void)_pthread_setspecific(_term_key_##x, y);		\
-	}								\
-} while (0)
-
-#define CHECK_TERMINATOR(x)					\
-(!__isthreaded || _pthread_main_np() ?				\
-    (_term_main_##x) :						\
-    ((void)_pthread_once(&_term_once_##x, _term_create_##x),	\
-    _pthread_getspecific(_term_key_##x)))
-
-
-
-DECLARE_TERMINATOR(group);
-
-
-int
-__nss_compat_getgrnam_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(const char *, struct group *, char *, size_t, int *);
-	const char	*name;
-	struct group	*grp;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-
-	fn = mdata;
-	name = va_arg(ap, const char *);
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(name, grp, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct group **)retval = grp;
-	return (status);
-}
-
-
-int
-__nss_compat_getgrgid_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(gid_t, struct group *, char *, size_t, int *);
-	gid_t		 gid;
-	struct group	*grp;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-	
-	fn = mdata;
-	gid = va_arg(ap, gid_t);
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(gid, grp, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct group **)retval = grp;
-	return (status);
-}
-
-
-int
-__nss_compat_getgrent_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(struct group *, char *, size_t, int *);
-	struct group	*grp;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-
-	if (CHECK_TERMINATOR(group))
-		return (NS_NOTFOUND);
-	fn = mdata;
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(grp, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct group **)retval = grp;
-	else if (status != NS_RETURN)
-		SET_TERMINATOR(group, &terminator);
-	return (status);
-}
-
-
-int
-__nss_compat_setgrent(void *retval, void *mdata, va_list ap)
-{
-
-	SET_TERMINATOR(group, NULL);
-	((int (*)(void))mdata)();
-	return (NS_UNAVAIL);
-}
-
-
-int
-__nss_compat_endgrent(void *retval, void *mdata, va_list ap)
-{
-
-	SET_TERMINATOR(group, NULL);
-	((int (*)(void))mdata)();
-	return (NS_UNAVAIL);
-}
-
-
-
-DECLARE_TERMINATOR(passwd);
-
-
-int
-__nss_compat_getpwnam_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(const char *, struct passwd *, char *, size_t, int *);
-	const char	*name;
-	struct passwd	*pwd;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-
-	fn = mdata;
-	name = va_arg(ap, const char *);
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(name, pwd, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct passwd **)retval = pwd;
-	return (status);
-}
-
-
-int
-__nss_compat_getpwuid_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(uid_t, struct passwd *, char *, size_t, int *);
-	uid_t		 uid;
-	struct passwd	*pwd;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-	
-	fn = mdata;
-	uid = va_arg(ap, uid_t);
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(uid, pwd, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct passwd **)retval = pwd;
-	return (status);
-}
-
-
-int
-__nss_compat_getpwent_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(struct passwd *, char *, size_t, int *);
-	struct passwd	*pwd;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-
-	if (CHECK_TERMINATOR(passwd))
-		return (NS_NOTFOUND);
-	fn = mdata;
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(pwd, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct passwd **)retval = pwd;
-	else if (status != NS_RETURN)
-		SET_TERMINATOR(passwd, &terminator);
-	return (status);
-}
-
-
-int
-__nss_compat_setpwent(void *retval, void *mdata, va_list ap)
-{
-
-	SET_TERMINATOR(passwd, NULL);
-	((int (*)(void))mdata)();
-	return (NS_UNAVAIL);
-}
-
-
-int
-__nss_compat_endpwent(void *retval, void *mdata, va_list ap)
-{
-
-	SET_TERMINATOR(passwd, NULL);
-	((int (*)(void))mdata)();
-	return (NS_UNAVAIL);
-}
diff --git a/lib/libc/net/rcmd.c b/lib/libc/net/rcmd.c
deleted file mode 100644
index bacbc31..0000000
--- a/lib/libc/net/rcmd.c
+++ /dev/null
@@ -1,764 +0,0 @@
-/*
- * Copyright (c) 1983, 1993, 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <signal.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <rpc/rpc.h>
-#ifdef YP
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <arpa/nameser.h>
-#include "un-namespace.h"
-
-extern int innetgr( const char *, const char *, const char *, const char * );
-
-#define max(a, b)	((a > b) ? a : b)
-
-int __ivaliduser(FILE *, uint32_t, const char *, const char *);
-int __ivaliduser_af(FILE *,const void *, const char *, const char *, int, int);
-int __ivaliduser_sa(FILE *, const struct sockaddr *, socklen_t, const char *,
-    const char *);
-static int __icheckhost(const struct sockaddr *, socklen_t, const char *);
-
-char paddr[NI_MAXHOST];
-
-int
-rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-{
-	return rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
-}
-
-int
-rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-	int af;
-{
-	struct addrinfo hints, *res, *ai;
-	struct sockaddr_storage from;
-	fd_set reads;
-	sigset_t oldmask, newmask;
-	pid_t pid;
-	int s, aport, lport, timo, error;
-	char c, *p;
-	int refused, nres;
-	char num[8];
-	static char canonnamebuf[MAXDNAME];	/* is it proper here? */
-
-	/* call rcmdsh() with specified remote shell if appropriate. */
-	if (!issetugid() && (p = getenv("RSH"))) {
-		struct servent *sp = getservbyname("shell", "tcp");
-
-		if (sp && sp->s_port == rport)
-			return (rcmdsh(ahost, rport, locuser, remuser,
-			    cmd, p));
-	}
-
-	/* use rsh(1) if non-root and remote port is shell. */
-	if (geteuid()) {
-		struct servent *sp = getservbyname("shell", "tcp");
-
-		if (sp && sp->s_port == rport)
-			return (rcmdsh(ahost, rport, locuser, remuser,
-			    cmd, NULL));
-	}
-
-	pid = getpid();
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_flags = AI_CANONNAME;
-	hints.ai_family = af;
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_protocol = 0;
-	(void)snprintf(num, sizeof(num), "%d", ntohs(rport));
-	error = getaddrinfo(*ahost, num, &hints, &res);
-	if (error) {
-		fprintf(stderr, "rcmd: getaddrinfo: %s\n",
-			gai_strerror(error));
-		if (error == EAI_SYSTEM)
-			fprintf(stderr, "rcmd: getaddrinfo: %s\n",
-				strerror(errno));
-		return (-1);
-	}
-
-	if (res->ai_canonname
-	 && strlen(res->ai_canonname) + 1 < sizeof(canonnamebuf)) {
-		strncpy(canonnamebuf, res->ai_canonname, sizeof(canonnamebuf));
-		*ahost = canonnamebuf;
-	}
-	nres = 0;
-	for (ai = res; ai; ai = ai->ai_next)
-		nres++;
-	ai = res;
-	refused = 0;
-	sigemptyset(&newmask);
-	sigaddset(&newmask, SIGURG);
-	_sigprocmask(SIG_BLOCK, (const sigset_t *)&newmask, &oldmask);
-	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
-		s = rresvport_af(&lport, ai->ai_family);
-		if (s < 0) {
-			if (errno != EAGAIN && ai->ai_next) {
-				ai = ai->ai_next;
-				continue;
-			}
-			if (errno == EAGAIN)
-				(void)fprintf(stderr,
-				    "rcmd: socket: All ports in use\n");
-			else
-				(void)fprintf(stderr, "rcmd: socket: %s\n",
-				    strerror(errno));
-			freeaddrinfo(res);
-			_sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask,
-			    NULL);
-			return (-1);
-		}
-		_fcntl(s, F_SETOWN, pid);
-		if (_connect(s, ai->ai_addr, ai->ai_addrlen) >= 0)
-			break;
-		(void)_close(s);
-		if (errno == EADDRINUSE) {
-			lport--;
-			continue;
-		}
-		if (errno == ECONNREFUSED)
-			refused = 1;
-		if (ai->ai_next == NULL && (!refused || timo > 16)) {
-			(void)fprintf(stderr, "%s: %s\n",
-				      *ahost, strerror(errno));
-			freeaddrinfo(res);
-			_sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask,
-			    NULL);
-			return (-1);
-		}
-		if (nres > 1) {
-			int oerrno = errno;
-
-			getnameinfo(ai->ai_addr, ai->ai_addrlen, paddr,
-			    sizeof(paddr), NULL, 0, NI_NUMERICHOST);
-			(void)fprintf(stderr, "connect to address %s: ",
-				      paddr);
-			errno = oerrno;
-			perror(0);
-		}
-		if ((ai = ai->ai_next) == NULL) {
-			/* refused && timo <= 16 */
-			struct timespec time_to_sleep, time_remaining;
-
-			time_to_sleep.tv_sec = timo;
-			time_to_sleep.tv_nsec = 0;
-			(void)_nanosleep(&time_to_sleep, &time_remaining);
-			timo *= 2;
-			ai = res;
-			refused = 0;
-		}
-		if (nres > 1) {
-			getnameinfo(ai->ai_addr, ai->ai_addrlen, paddr,
-			    sizeof(paddr), NULL, 0, NI_NUMERICHOST);
-			fprintf(stderr, "Trying %s...\n", paddr);
-		}
-	}
-	lport--;
-	if (fd2p == 0) {
-		_write(s, "", 1);
-		lport = 0;
-	} else {
-		int s2 = rresvport_af(&lport, ai->ai_family), s3;
-		socklen_t len = ai->ai_addrlen;
-		int nfds;
-
-		if (s2 < 0)
-			goto bad;
-		_listen(s2, 1);
-		(void)snprintf(num, sizeof(num), "%d", lport);
-		if (_write(s, num, strlen(num)+1) != strlen(num)+1) {
-			(void)fprintf(stderr,
-			    "rcmd: write (setting up stderr): %s\n",
-			    strerror(errno));
-			(void)_close(s2);
-			goto bad;
-		}
-		nfds = max(s, s2)+1;
-		if(nfds > FD_SETSIZE) {
-			fprintf(stderr, "rcmd: too many files\n");
-			(void)_close(s2);
-			goto bad;
-		}
-again:
-		FD_ZERO(&reads);
-		FD_SET(s, &reads);
-		FD_SET(s2, &reads);
-		errno = 0;
-		if (_select(nfds, &reads, 0, 0, 0) < 1 || !FD_ISSET(s2, &reads)){
-			if (errno != 0)
-				(void)fprintf(stderr,
-				    "rcmd: select (setting up stderr): %s\n",
-				    strerror(errno));
-			else
-				(void)fprintf(stderr,
-				"select: protocol failure in circuit setup\n");
-			(void)_close(s2);
-			goto bad;
-		}
-		s3 = _accept(s2, (struct sockaddr *)&from, &len);
-		switch (from.ss_family) {
-		case AF_INET:
-			aport = ntohs(((struct sockaddr_in *)&from)->sin_port);
-			break;
-#ifdef INET6
-		case AF_INET6:
-			aport = ntohs(((struct sockaddr_in6 *)&from)->sin6_port);
-			break;
-#endif
-		default:
-			aport = 0;	/* error */
-			break;
-		}
-		/*
-		 * XXX careful for ftp bounce attacks. If discovered, shut them
-		 * down and check for the real auxiliary channel to connect.
-		 */
-		if (aport == 20) {
-			_close(s3);
-			goto again;
-		}
-		(void)_close(s2);
-		if (s3 < 0) {
-			(void)fprintf(stderr,
-			    "rcmd: accept: %s\n", strerror(errno));
-			lport = 0;
-			goto bad;
-		}
-		*fd2p = s3;
-		if (aport >= IPPORT_RESERVED || aport < IPPORT_RESERVED / 2) {
-			(void)fprintf(stderr,
-			    "socket: protocol failure in circuit setup.\n");
-			goto bad2;
-		}
-	}
-	(void)_write(s, locuser, strlen(locuser)+1);
-	(void)_write(s, remuser, strlen(remuser)+1);
-	(void)_write(s, cmd, strlen(cmd)+1);
-	if (_read(s, &c, 1) != 1) {
-		(void)fprintf(stderr,
-		    "rcmd: %s: %s\n", *ahost, strerror(errno));
-		goto bad2;
-	}
-	if (c != 0) {
-		while (_read(s, &c, 1) == 1) {
-			(void)_write(STDERR_FILENO, &c, 1);
-			if (c == '\n')
-				break;
-		}
-		goto bad2;
-	}
-	_sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask, NULL);
-	freeaddrinfo(res);
-	return (s);
-bad2:
-	if (lport)
-		(void)_close(*fd2p);
-bad:
-	(void)_close(s);
-	_sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask, NULL);
-	freeaddrinfo(res);
-	return (-1);
-}
-
-int
-rresvport(port)
-	int *port;
-{
-	return rresvport_af(port, AF_INET);
-}
-
-int
-rresvport_af(alport, family)
-	int *alport, family;
-{
-	int s;
-	struct sockaddr_storage ss;
-	u_short *sport;
-
-	memset(&ss, 0, sizeof(ss));
-	ss.ss_family = family;
-	switch (family) {
-	case AF_INET:
-		((struct sockaddr *)&ss)->sa_len = sizeof(struct sockaddr_in);
-		sport = &((struct sockaddr_in *)&ss)->sin_port;
-		((struct sockaddr_in *)&ss)->sin_addr.s_addr = INADDR_ANY;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		((struct sockaddr *)&ss)->sa_len = sizeof(struct sockaddr_in6);
-		sport = &((struct sockaddr_in6 *)&ss)->sin6_port;
-		((struct sockaddr_in6 *)&ss)->sin6_addr = in6addr_any;
-		break;
-#endif
-	default:
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
-
-	s = _socket(ss.ss_family, SOCK_STREAM, 0);
-	if (s < 0)
-		return (-1);
-#if 0 /* compat_exact_traditional_rresvport_semantics */
-	sin.sin_port = htons((u_short)*alport);
-	if (_bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-		return (s);
-	if (errno != EADDRINUSE) {
-		(void)_close(s);
-		return (-1);
-	}
-#endif
-	*sport = 0;
-	if (bindresvport_sa(s, (struct sockaddr *)&ss) == -1) {
-		(void)_close(s);
-		return (-1);
-	}
-	*alport = (int)ntohs(*sport);
-	return (s);
-}
-
-int	__check_rhosts_file = 1;
-char	*__rcmd_errstr;
-
-int
-ruserok(rhost, superuser, ruser, luser)
-	const char *rhost, *ruser, *luser;
-	int superuser;
-{
-	struct addrinfo hints, *res, *r;
-	int error;
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = PF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	error = getaddrinfo(rhost, "0", &hints, &res);
-	if (error)
-		return (-1);
-
-	for (r = res; r; r = r->ai_next) {
-		if (iruserok_sa(r->ai_addr, r->ai_addrlen, superuser, ruser,
-		    luser) == 0) {
-			freeaddrinfo(res);
-			return (0);
-		}
-	}
-	freeaddrinfo(res);
-	return (-1);
-}
-
-/*
- * New .rhosts strategy: We are passed an ip address. We spin through
- * hosts.equiv and .rhosts looking for a match. When the .rhosts only
- * has ip addresses, we don't have to trust a nameserver.  When it
- * contains hostnames, we spin through the list of addresses the nameserver
- * gives us and look for a match.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok(raddr, superuser, ruser, luser)
-	unsigned long raddr;
-	int superuser;
-	const char *ruser, *luser;
-{
-	struct sockaddr_in sin;
-
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin.sin_len = sizeof(struct sockaddr_in);
-	memcpy(&sin.sin_addr, &raddr, sizeof(sin.sin_addr));
-	return iruserok_sa((struct sockaddr *)&sin, sin.sin_len, superuser,
-		ruser, luser);
-}
-
-/*
- * AF independent extension of iruserok.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok_sa(ra, rlen, superuser, ruser, luser)
-	const void *ra;
-	int rlen;
-	int superuser;
-	const char *ruser, *luser;
-{
-	char *cp;
-	struct stat sbuf;
-	struct passwd *pwd;
-	FILE *hostf;
-	uid_t uid;
-	int first;
-	char pbuf[MAXPATHLEN];
-	const struct sockaddr *raddr;
-	struct sockaddr_storage ss;
-
-	/* avoid alignment issue */
-	if (rlen > sizeof(ss)) 
-		return(-1);
-	memcpy(&ss, ra, rlen);
-	raddr = (struct sockaddr *)&ss;
-
-	first = 1;
-	hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "r");
-again:
-	if (hostf) {
-		if (__ivaliduser_sa(hostf, raddr, rlen, luser, ruser) == 0) {
-			(void)fclose(hostf);
-			return (0);
-		}
-		(void)fclose(hostf);
-	}
-	if (first == 1 && (__check_rhosts_file || superuser)) {
-		first = 0;
-		if ((pwd = getpwnam(luser)) == NULL)
-			return (-1);
-		(void)strcpy(pbuf, pwd->pw_dir);
-		(void)strcat(pbuf, "/.rhosts");
-
-		/*
-		 * Change effective uid while opening .rhosts.  If root and
-		 * reading an NFS mounted file system, can't read files that
-		 * are protected read/write owner only.
-		 */
-		uid = geteuid();
-		(void)seteuid(pwd->pw_uid);
-		hostf = fopen(pbuf, "r");
-		(void)seteuid(uid);
-
-		if (hostf == NULL)
-			return (-1);
-		/*
-		 * If not a regular file, or is owned by someone other than
-		 * user or root or if writeable by anyone but the owner, quit.
-		 */
-		cp = NULL;
-		if (lstat(pbuf, &sbuf) < 0)
-			cp = ".rhosts lstat failed";
-		else if (!S_ISREG(sbuf.st_mode))
-			cp = ".rhosts not regular file";
-		else if (_fstat(fileno(hostf), &sbuf) < 0)
-			cp = ".rhosts fstat failed";
-		else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-			cp = "bad .rhosts owner";
-		else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-			cp = ".rhosts writeable by other than owner";
-		/* If there were any problems, quit. */
-		if (cp) {
-			__rcmd_errstr = cp;
-			(void)fclose(hostf);
-			return (-1);
-		}
-		goto again;
-	}
-	return (-1);
-}
-
-/*
- * XXX
- * Don't make static, used by lpd(8).
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-__ivaliduser(hostf, raddr, luser, ruser)
-	FILE *hostf;
-	uint32_t raddr;
-	const char *luser, *ruser;
-{
-	struct sockaddr_in sin;
-
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin.sin_len = sizeof(struct sockaddr_in);
-	memcpy(&sin.sin_addr, &raddr, sizeof(sin.sin_addr));
-	return __ivaliduser_sa(hostf, (struct sockaddr *)&sin, sin.sin_len,
-		luser, ruser);
-}
-
-/*
- * Returns 0 if ok, -1 if not ok.
- *
- * XXX obsolete API.
- */
-int
-__ivaliduser_af(hostf, raddr, luser, ruser, af, len)
-	FILE *hostf;
-	const void *raddr;
-	const char *luser, *ruser;
-	int af, len;
-{
-	struct sockaddr *sa = NULL;
-	struct sockaddr_in *sin = NULL;
-#ifdef INET6
-	struct sockaddr_in6 *sin6 = NULL;
-#endif
-	struct sockaddr_storage ss;
-
-	memset(&ss, 0, sizeof(ss));
-	switch (af) {
-	case AF_INET:
-		if (len != sizeof(sin->sin_addr))
-			return -1;
-		sin = (struct sockaddr_in *)&ss;
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(struct sockaddr_in);
-		memcpy(&sin->sin_addr, raddr, sizeof(sin->sin_addr));
-		break;
-#ifdef INET6
-	case AF_INET6:
-		if (len != sizeof(sin6->sin6_addr))
-			return -1;
-		/* you will lose scope info */
-		sin6 = (struct sockaddr_in6 *)&ss;
-		sin6->sin6_family = AF_INET6;
-		sin6->sin6_len = sizeof(struct sockaddr_in6);
-		memcpy(&sin6->sin6_addr, raddr, sizeof(sin6->sin6_addr));
-		break;
-#endif
-	default:
-		return -1;
-	}
-
-	sa = (struct sockaddr *)&ss;
-	return __ivaliduser_sa(hostf, sa, sa->sa_len, luser, ruser);
-}
-
-int
-__ivaliduser_sa(hostf, raddr, salen, luser, ruser)
-	FILE *hostf;
-	const struct sockaddr *raddr;
-	socklen_t salen;
-	const char *luser, *ruser;
-{
-	char *user, *p;
-	int ch;
-	char buf[MAXHOSTNAMELEN + 128];		/* host + login */
-	char hname[MAXHOSTNAMELEN];
-	/* Presumed guilty until proven innocent. */
-	int userok = 0, hostok = 0;
-#ifdef YP
-	char *ypdomain;
-
-	if (yp_get_default_domain(&ypdomain))
-		ypdomain = NULL;
-#else
-#define	ypdomain NULL
-#endif
-	/* We need to get the damn hostname back for netgroup matching. */
-	if (getnameinfo(raddr, salen, hname, sizeof(hname), NULL, 0,
-			NI_NAMEREQD) != 0)
-		hname[0] = '\0';
-
-	while (fgets(buf, sizeof(buf), hostf)) {
-		p = buf;
-		/* Skip lines that are too long. */
-		if (strchr(p, '\n') == NULL) {
-			while ((ch = getc(hostf)) != '\n' && ch != EOF);
-			continue;
-		}
-		if (*p == '\n' || *p == '#') {
-			/* comment... */
-			continue;
-		}
-		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
-			*p = isupper((unsigned char)*p) ? tolower((unsigned char)*p) : *p;
-			p++;
-		}
-		if (*p == ' ' || *p == '\t') {
-			*p++ = '\0';
-			while (*p == ' ' || *p == '\t')
-				p++;
-			user = p;
-			while (*p != '\n' && *p != ' ' &&
-			    *p != '\t' && *p != '\0')
-				p++;
-		} else
-			user = p;
-		*p = '\0';
-		/*
-		 * Do +/- and +@/-@ checking. This looks really nasty,
-		 * but it matches SunOS's behavior so far as I can tell.
-		 */
-		switch(buf[0]) {
-		case '+':
-			if (!buf[1]) {     /* '+' matches all hosts */
-				hostok = 1;
-				break;
-			}
-			if (buf[1] == '@')  /* match a host by netgroup */
-				hostok = hname[0] != '\0' &&
-				    innetgr(&buf[2], hname, NULL, ypdomain);
-			else		/* match a host by addr */
-				hostok = __icheckhost(raddr, salen,
-						      (char *)&buf[1]);
-			break;
-		case '-':     /* reject '-' hosts and all their users */
-			if (buf[1] == '@') {
-				if (hname[0] == '\0' ||
-				    innetgr(&buf[2], hname, NULL, ypdomain))
-					return(-1);
-			} else {
-				if (__icheckhost(raddr, salen,
-						 (char *)&buf[1]))
-					return(-1);
-			}
-			break;
-		default:  /* if no '+' or '-', do a simple match */
-			hostok = __icheckhost(raddr, salen, buf);
-			break;
-		}
-		switch(*user) {
-		case '+':
-			if (!*(user+1)) {      /* '+' matches all users */
-				userok = 1;
-				break;
-			}
-			if (*(user+1) == '@')  /* match a user by netgroup */
-				userok = innetgr(user+2, NULL, ruser, ypdomain);
-			else	   /* match a user by direct specification */
-				userok = !(strcmp(ruser, user+1));
-			break;
-		case '-': 		/* if we matched a hostname, */
-			if (hostok) {   /* check for user field rejections */
-				if (!*(user+1))
-					return(-1);
-				if (*(user+1) == '@') {
-					if (innetgr(user+2, NULL,
-							ruser, ypdomain))
-						return(-1);
-				} else {
-					if (!strcmp(ruser, user+1))
-						return(-1);
-				}
-			}
-			break;
-		default:	/* no rejections: try to match the user */
-			if (hostok)
-				userok = !(strcmp(ruser,*user ? user : luser));
-			break;
-		}
-		if (hostok && userok)
-			return(0);
-	}
-	return (-1);
-}
-
-/*
- * Returns "true" if match, 0 if no match.
- */
-static int
-__icheckhost(raddr, salen, lhost)
-	const struct sockaddr *raddr;
-	socklen_t salen;
-        const char *lhost;
-{
-	struct sockaddr_in sin;
-	struct sockaddr_in6 *sin6;
-	struct addrinfo hints, *res, *r;
-	int error;
-	char h1[NI_MAXHOST], h2[NI_MAXHOST];
-
-	if (raddr->sa_family == AF_INET6) {
-		sin6 = (struct sockaddr_in6 *)raddr;
-		if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
-			memset(&sin, 0, sizeof(sin));
-			sin.sin_family = AF_INET;
-			sin.sin_len = sizeof(struct sockaddr_in);
-			memcpy(&sin.sin_addr, &sin6->sin6_addr.s6_addr[12],
-			       sizeof(sin.sin_addr));
-			raddr = (struct sockaddr *)&sin;
-			salen = sin.sin_len;
-		}
-	}
-
-	h1[0] = '\0';
-	if (getnameinfo(raddr, salen, h1, sizeof(h1), NULL, 0,
-			NI_NUMERICHOST) != 0)
-		return (0);
-
-	/* Resolve laddr into sockaddr */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = raddr->sa_family;
-	hints.ai_socktype = SOCK_DGRAM;	/*XXX dummy*/
-	res = NULL;
-	error = getaddrinfo(lhost, "0", &hints, &res);
-	if (error)
-		return (0);
-
-	for (r = res; r ; r = r->ai_next) {
-		h2[0] = '\0';
-		if (getnameinfo(r->ai_addr, r->ai_addrlen, h2, sizeof(h2),
-				NULL, 0, NI_NUMERICHOST) != 0)
-			continue;
-		if (strcmp(h1, h2) == 0) {
-			freeaddrinfo(res);
-			return (1);
-		}
-	}
-
-	/* No match. */
-	freeaddrinfo(res);
-	return (0);
-}
diff --git a/lib/libc/net/rcmdsh.c b/lib/libc/net/rcmdsh.c
deleted file mode 100644
index 3ea0174..0000000
--- a/lib/libc/net/rcmdsh.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*	$OpenBSD: rcmdsh.c,v 1.5 1998/04/25 16:23:58 millert Exp $	*/
-
-/*
- * Copyright (c) 2001, MagniComp
- * 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. Neither the name of the MagniComp 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 COPYRIGHT HOLDERS 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.
- */
-
-/*
- * This is an rcmd() replacement originally by
- * Chris Siebenmann <cks@utcc.utoronto.ca>.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <paths.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifndef _PATH_RSH
-#define	_PATH_RSH	"/usr/bin/rsh"
-#endif
-
-/*
- * This is a replacement rcmd() function that uses the rsh(1)
- * program in place of a direct rcmd(3) function call so as to
- * avoid having to be root.  Note that rport is ignored.
- */
-int
-rcmdsh(ahost, rport, locuser, remuser, cmd, rshprog)
-	char **ahost;
-	int rport;
-	const char *locuser, *remuser, *cmd, *rshprog;
-{
-	struct addrinfo hints, *res;
-	int cpid, sp[2], error;
-	char *p;
-	struct passwd *pw;
-	char num[8];
-	static char hbuf[NI_MAXHOST];
-
-	/* What rsh/shell to use. */
-	if (rshprog == NULL)
-		rshprog = _PATH_RSH;
-
-	/* locuser must exist on this host. */
-	if ((pw = getpwnam(locuser)) == NULL) {
-		(void)fprintf(stderr, "rcmdsh: unknown user: %s\n", locuser);
-		return (-1);
-	}
-
-	/* Validate remote hostname. */
-	if (strcmp(*ahost, "localhost") != 0) {
-		memset(&hints, 0, sizeof(hints));
-		hints.ai_flags = AI_CANONNAME;
-		hints.ai_family = PF_UNSPEC;
-		hints.ai_socktype = SOCK_STREAM;
-		(void)snprintf(num, sizeof(num), "%u",
-		    (unsigned int)ntohs(rport));
-		error = getaddrinfo(*ahost, num, &hints, &res);
-		if (error) {
-			fprintf(stderr, "rcmdsh: getaddrinfo: %s\n",
-				gai_strerror(error));
-			return (-1);
-		}
-		if (res->ai_canonname) {
-			strncpy(hbuf, res->ai_canonname, sizeof(hbuf) - 1);
-			hbuf[sizeof(hbuf) - 1] = '\0';
-			*ahost = hbuf;
-		}
-		freeaddrinfo(res);
-	}
-
-	/* Get a socketpair we'll use for stdin and stdout. */
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1) {
-		perror("rcmdsh: socketpair");
-		return (-1);
-	}
-
-	cpid = fork();
-	if (cpid == -1) {
-		perror("rcmdsh: fork failed");
-		return (-1);
-	} else if (cpid == 0) {
-		/*
-		 * Child.  We use sp[1] to be stdin/stdout, and close sp[0].
-		 */
-		(void)close(sp[0]);
-		if (dup2(sp[1], 0) == -1 || dup2(0, 1) == -1) {
-			perror("rcmdsh: dup2 failed");
-			_exit(255);
-		}
-		/* Fork again to lose parent. */
-		cpid = fork();
-		if (cpid == -1) {
-			perror("rcmdsh: fork to lose parent failed");
-			_exit(255);
-		}
-		if (cpid > 0)
-			_exit(0);
-
-		/* In grandchild here.  Become local user for rshprog. */
-		if (setuid(pw->pw_uid) == -1) {
-			(void)fprintf(stderr, "rcmdsh: setuid(%u): %s\n",
-			    pw->pw_uid, strerror(errno));
-			_exit(255);
-		}
-
-		/*
-		 * If remote host is "localhost" and local and remote users
-		 * are the same, avoid running remote shell for efficiency.
-		 */
-		if (strcmp(*ahost, "localhost") == 0 &&
-		    strcmp(locuser, remuser) == 0) {
-			if (pw->pw_shell[0] == '\0')
-				rshprog = _PATH_BSHELL;
-			else
-				rshprog = pw->pw_shell;
-			p = strrchr(rshprog, '/');
-			execlp(rshprog, p ? p + 1 : rshprog, "-c", cmd,
-			    (char *)NULL);
-		} else {
-			p = strrchr(rshprog, '/');
-			execlp(rshprog, p ? p + 1 : rshprog, *ahost, "-l",
-			    remuser, cmd, (char *)NULL);
-		}
-		(void)fprintf(stderr, "rcmdsh: execlp %s failed: %s\n",
-		    rshprog, strerror(errno));
-		_exit(255);
-	} else {
-		/* Parent. close sp[1], return sp[0]. */
-		(void)close(sp[1]);
-		/* Reap child. */
-		(void)wait(NULL);
-		return (sp[0]);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/net/recv.c b/lib/libc/net/recv.c
deleted file mode 100644
index 30aa59a..0000000
--- a/lib/libc/net/recv.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-#include "un-namespace.h"
-
-ssize_t
-recv(s, buf, len, flags)
-	int s, flags;
-	size_t len;
-	void *buf;
-{
-	return (_recvfrom(s, buf, len, flags, NULL, 0));
-}
diff --git a/lib/libc/net/res_config.h b/lib/libc/net/res_config.h
deleted file mode 100644
index 30d8b5b..0000000
--- a/lib/libc/net/res_config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $FreeBSD: src/lib/libc/net/res_config.h,v 1.8.14.1 2006/07/17 10:09:57 ume Exp $ */
-
-#define	DEBUG	1	/* enable debugging code (needed for dig) */
-#define	RESOLVSORT	/* allow sorting of addresses in gethostbyname */
-#undef	SUNSECURITY	/* verify gethostbyaddr() calls - WE DONT NEED IT  */
-#define MULTI_PTRS_ARE_ALIASES 1 /* fold multiple PTR records into aliases */
diff --git a/lib/libc/net/res_mkupdate.c b/lib/libc/net/res_mkupdate.c
deleted file mode 100644
index 64f0bd4..0000000
--- a/lib/libc/net/res_mkupdate.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <res_update.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include "res_config.h"
-
-static int getnum_str(u_char **, u_char *);
-static int getword_str(char *, int, u_char **, u_char *);
-
-#define ShrinkBuffer(x)  if ((buflen -= x) < 0) return (-2);
-
-/*
- * Form update packets.
- * Returns the size of the resulting packet if no error
- * On error,
- *	returns -1 if error in reading a word/number in rdata
- *		   portion for update packets
- *		-2 if length of buffer passed is insufficient
- *		-3 if zone section is not the first section in
- *		   the linked list, or section order has a problem
- *		-4 on a number overflow
- *		-5 unknown operation or no records
- */
-int
-res_nmkupdate(res_state statp, ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	ns_updrec *rrecp_start = rrecp_in;
-	HEADER *hp;
-	u_char *cp, *sp2, *startp, *endp;
-	int n, i, soanum, multiline;
-	ns_updrec *rrecp;
-	struct in_addr ina;
-        char buf2[MAXDNAME];
-	int section, numrrs = 0, counts[ns_s_max];
-	u_int16_t rtype, rclass;
-	uint32_t n1, rttl;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++statp->id);
-	hp->opcode = ns_o_update;
-	hp->rcode = NOERROR;
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-
-	if (rrecp_start == NULL)
-		return (-5);
-	else if (rrecp_start->r_section != S_ZONE)
-		return (-3);
-
-	memset(counts, 0, sizeof counts);
-	for (rrecp = rrecp_start; rrecp; rrecp = rrecp->r_grpnext) {
-		numrrs++;
-                section = rrecp->r_section;
-		if (section < 0 || section >= ns_s_max)
-			return (-1);
-		counts[section]++;
-		for (i = section + 1; i < ns_s_max; i++)
-			if (counts[i])
-				return (-3);
-		rtype = rrecp->r_type;
-		rclass = rrecp->r_class;
-		rttl = rrecp->r_ttl;
-		/* overload class and type */
-		if (section == S_PREREQ) {
-			rttl = 0;
-			switch (rrecp->r_opcode) {
-			case YXDOMAIN:
-				rclass = C_ANY;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXDOMAIN:
-				rclass = C_NONE;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXRRSET:
-				rclass = C_NONE;
-				rrecp->r_size = 0;
-				break;
-			case YXRRSET:
-				if (rrecp->r_size == 0)
-					rclass = C_ANY;
-				break;
-			default:
-				fprintf(stderr,
-					"res_nmkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		} else if (section == S_UPDATE) {
-			switch (rrecp->r_opcode) {
-			case DELETE:
-				rclass = rrecp->r_size == 0 ? C_ANY : C_NONE;
-				break;
-			case ADD:
-				break;
-			default:
-				fprintf(stderr,
-					"res_nmkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		}
-
-		/*
-		 * XXX	appending default domain to owner name is omitted,
-		 *	fqdn must be provided
-		 */
-		if ((n = dn_comp(rrecp->r_dname, cp, buflen, dnptrs,
-				 lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		ShrinkBuffer(n + 2*INT16SZ);
-		PUTSHORT(rtype, cp);
-		PUTSHORT(rclass, cp);
-		if (section == S_ZONE) {
-			if (numrrs != 1 || rrecp->r_type != T_SOA)
-				return (-3);
-			continue;
-		}
-		ShrinkBuffer(INT32SZ + INT16SZ);
-		PUTLONG(rttl, cp);
-		sp2 = cp;  /* save pointer to length byte */
-		cp += INT16SZ;
-		if (rrecp->r_size == 0) {
-			if (section == S_UPDATE && rclass != C_ANY)
-				return (-1);
-			else {
-				PUTSHORT(0, sp2);
-				continue;
-			}
-		}
-		startp = rrecp->r_data;
-		endp = startp + rrecp->r_size - 1;
-		/* XXX this should be done centrally. */
-		switch (rrecp->r_type) {
-		case T_A:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			if (!inet_aton(buf2, &ina))
-				return (-1);
-			n1 = ntohl(ina.s_addr);
-			ShrinkBuffer(INT32SZ);
-			PUTLONG(n1, cp);
-			break;
-		case T_CNAME:
-		case T_MB:
-		case T_MG:
-		case T_MR:
-		case T_NS:
-		case T_PTR:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_MINFO:
-		case T_SOA:
-		case T_RP:
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-				return (-1);
-				n = dn_comp(buf2, cp, buflen,
-					    dnptrs, lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			if (rrecp->r_type == T_SOA) {
-				ShrinkBuffer(5 * INT32SZ);
-				while (isspace(*startp) || !*startp)
-					startp++;
-				if (*startp == '(') {
-					multiline = 1;
-					startp++;
-				} else
-					multiline = 0;
-				/* serial, refresh, retry, expire, minimum */
-				for (i = 0; i < 5; i++) {
-					soanum = getnum_str(&startp, endp);
-					if (soanum < 0)
-						return (-1);
-					PUTLONG(soanum, cp);
-				}
-				if (multiline) {
-					while (isspace(*startp) || !*startp)
-						startp++;
-					if (*startp != ')')
-						return (-1);
-				}
-			}
-			break;
-		case T_MX:
-		case T_AFSDB:
-		case T_RT:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_PX:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-					return (-1);
-				n = dn_comp(buf2, cp, buflen, dnptrs,
-					    lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			break;
-		case T_WKS:
-		case T_HINFO:
-		case T_TXT:
-		case T_X25:
-		case T_ISDN:
-		case T_NSAP:
-		case T_LOC:
-			/* XXX - more fine tuning needed here */
-			ShrinkBuffer(rrecp->r_size);
-			memcpy(cp, rrecp->r_data, rrecp->r_size);
-			cp += rrecp->r_size;
-			break;
-		default:
-			return (-1);
-		} /*switch*/
-		n = (u_int16_t)((cp - sp2) - INT16SZ);
-		PUTSHORT(n, sp2);
-	} /*for*/
-		
-	hp->qdcount = htons(counts[0]);
-	hp->ancount = htons(counts[1]);
-	hp->nscount = htons(counts[2]);
-	hp->arcount = htons(counts[3]);
-	return (cp - buf);
-}
-
-/*
- * Get a whitespace delimited word from a string (not file)
- * into buf. modify the start pointer to point after the
- * word in the string.
- */
-static int
-getword_str(char *buf, int size, u_char **startpp, u_char *endp) {
-        char *cp;
-        int c;
- 
-        for (cp = buf; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (cp != buf) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                (*startpp)++;
-                if (cp >= buf+size-1)
-                        break;
-                *cp++ = (u_char)c;
-        }
-        *cp = '\0';
-        return (cp != buf);
-}
-
-/*
- * Get a whitespace delimited number from a string (not file) into buf
- * update the start pointer to point after the number in the string.
- */
-static int
-getnum_str(u_char **startpp, u_char *endp) {
-        int c, n;
-        int seendigit = 0;
-        int m = 0;
-
-        for (n = 0; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (seendigit) /* trailing whitespace */
-                                break;
-                        else { /* leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                if (c == ';') {
-                        while ((*startpp <= endp) &&
-			       ((c = **startpp) != '\n'))
-					(*startpp)++;
-                        if (seendigit)
-                                break;
-                        continue;
-                }
-                if (!isdigit(c)) {
-                        if (c == ')' && seendigit) {
-                                (*startpp)--;
-                                break;
-                        }
-			return (-1);
-                }        
-                (*startpp)++;
-                n = n * 10 + (c - '0');
-                seendigit = 1;
-        }
-        return (n + m);
-}
-
-/*
- * Allocate a resource record buffer & save rr info.
- */
-ns_updrec *
-res_mkupdrec(int section, const char *dname,
-	     u_int class, u_int type, u_long ttl) {
-	ns_updrec *rrecp = (ns_updrec *)calloc(1, sizeof(ns_updrec));
-
-	if (!rrecp || !(rrecp->r_dname = strdup(dname)))
-		return (NULL);
- 	rrecp->r_class = class;
-	rrecp->r_type = type;
-	rrecp->r_ttl = ttl;
-	rrecp->r_section = section;
-	return (rrecp);
-}
-
-/*
- * Free a resource record buffer created by res_mkupdrec.
- */
-void
-res_freeupdrec(ns_updrec *rrecp) {
-	/* Note: freeing r_dp is the caller's responsibility. */
-	if (rrecp->r_dname != NULL)
-		free(rrecp->r_dname);
-	free(rrecp);
-}
diff --git a/lib/libc/net/res_update.c b/lib/libc/net/res_update.c
deleted file mode 100644
index c246600..0000000
--- a/lib/libc/net/res_update.c
+++ /dev/null
@@ -1,521 +0,0 @@
-/*
- * Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * <viraj_bais@ccm.fm.intel.com>
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <res_update.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Separate a linked list of records into groups so that all records
- * in a group will belong to a single zone on the nameserver.
- * Create a dynamic update packet for each zone and send it to the
- * nameservers for that zone, and await answer.
- * Abort if error occurs in updating any zone.
- * Return the number of zones updated on success, < 0 on error.
- *
- * On error, caller must deal with the unsynchronized zones
- * eg. an A record might have been successfully added to the forward
- * zone but the corresponding PTR record would be missing if error
- * was encountered while updating the reverse zone.
- */
-
-#define NSMAX 16
-
-struct ns1 {
-	char nsname[MAXDNAME];
-	struct in_addr nsaddr1;
-};
-
-struct zonegrp {
-	char 		z_origin[MAXDNAME];
-	int16_t		z_class;
-	char		z_soardata[MAXDNAME + 5 * INT32SZ];
-	struct ns1 	z_ns[NSMAX];
-	int		z_nscount;
-	ns_updrec *	z_rr;
-	struct zonegrp *z_next;
-};
-
-
-int
-res_nupdate(res_state statp, ns_updrec *rrecp_in, ns_tsig_key *key) {
-	ns_updrec *rrecp, *tmprrecp;
-	u_char buf[PACKETSZ], answer[PACKETSZ], packet[2*PACKETSZ];
-	char name[MAXDNAME], zname[MAXDNAME], primary[MAXDNAME],
-	     mailaddr[MAXDNAME];
-	u_char soardata[2*MAXCDNAME+5*INT32SZ];
-	char *dname, *svdname, *cp1, *target;
-	u_char *cp, *eom;
-	HEADER *hp = (HEADER *) answer;
-	struct zonegrp *zptr = NULL, *tmpzptr, *prevzptr, *zgrp_start = NULL;
-	int i, j, k = 0, n, ancount, nscount, arcount, rcode, rdatasize,
-	    newgroup, done, myzone, seen_before, numzones = 0;
-	u_int16_t dlen, class, qclass, type, qtype;
-	uint32_t ttl;
-
-	if (key != NULL) {
-		/* TSIG is not supported. */
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);
-	}
-
-	for (rrecp = rrecp_in; rrecp; rrecp = rrecp->r_next) {
-		dname = rrecp->r_dname;
-		n = strlen(dname);
-		if (dname[n-1] == '.')
-			dname[n-1] = '\0';
-		qtype = T_SOA;
-		qclass = rrecp->r_class;
-		done = 0;
-		seen_before = 0;
-
-		while (!done && dname) {
-		    if (qtype == T_SOA) {
-			for (tmpzptr = zgrp_start;
-			     tmpzptr && !seen_before;
-			     tmpzptr = tmpzptr->z_next) {
-				if (strcasecmp(dname,
-					       tmpzptr->z_origin) == 0 &&
-				    tmpzptr->z_class == qclass)
-					seen_before++;
-				for (tmprrecp = tmpzptr->z_rr;
-				     tmprrecp && !seen_before;
-				     tmprrecp = tmprrecp->r_grpnext)
-				if (strcasecmp(dname, tmprrecp->r_dname) == 0
-				    && tmprrecp->r_class == qclass) {
-					seen_before++;
-					break;
-				}
-				if (seen_before) {
-					/*
-					 * Append to the end of
-					 * current group.
-					 */
-					for (tmprrecp = tmpzptr->z_rr;
-					     tmprrecp->r_grpnext;
-					     tmprrecp = tmprrecp->r_grpnext)
-						(void)NULL;
-					tmprrecp->r_grpnext = rrecp;
-					rrecp->r_grpnext = NULL;
-					done = 1;
-					break;
-				}
-			}
-		} else if (qtype == T_A) {
-		    for (tmpzptr = zgrp_start;
-			 tmpzptr && !done;
-			 tmpzptr = tmpzptr->z_next)
-			    for (i = 0; i < tmpzptr->z_nscount; i++)
-				if (tmpzptr->z_class == qclass &&
-				    strcasecmp(tmpzptr->z_ns[i].nsname,
-					       dname) == 0 &&
-				    tmpzptr->z_ns[i].nsaddr1.s_addr != 0) {
-					zptr->z_ns[k].nsaddr1.s_addr =
-					 tmpzptr->z_ns[i].nsaddr1.s_addr;
-					done = 1;
-					break;
-				}
-		}
-		if (done)
-		    break;
-		n = res_nmkquery(statp, QUERY, dname, qclass, qtype, NULL,
-				0, NULL, buf, sizeof buf);
-		if (n <= 0) {
-		    fprintf(stderr, "res_nupdate: mkquery failed\n");
-		    return (n);
-		}
-		n = res_nsend(statp, buf, n, answer, sizeof answer);
-		if (n < 0) {
-		    fprintf(stderr, "res_nupdate: send error for %s\n",
-			    rrecp->r_dname);
-		    return (n);
-		} else if (n > sizeof(answer)) {
-		    fprintf(stderr, "res_nupdate: buffer too small\n");
-		    return (-1);
-		}
-		if (n < HFIXEDSZ)
-			return (-1);
-		ancount = ntohs(hp->ancount);
-		nscount = ntohs(hp->nscount);
-		arcount = ntohs(hp->arcount);
-		rcode = hp->rcode;
-		cp = answer + HFIXEDSZ;
-		eom = answer + n;
-		/* skip the question section */
-		n = dn_skipname(cp, eom);
-		if (n < 0 || cp + n + 2 * INT16SZ > eom)
-			return (-1);
-		cp += n + 2 * INT16SZ;
-
-		if (qtype == T_SOA) {
-		    if (ancount == 0 && nscount == 0 && arcount == 0) {
-			/*
-			 * if (rcode == NOERROR) then the dname exists but
-			 * has no soa record associated with it.
-			 * if (rcode == NXDOMAIN) then the dname does not
-			 * exist and the server is replying out of NCACHE.
-			 * in either case, proceed with the next try
-			 */
-			dname = strchr(dname, '.');
-			if (dname != NULL)
-				dname++;
-			continue;
-		    } else if ((rcode == NOERROR || rcode == NXDOMAIN) &&
-			       ancount == 0 &&
-			       nscount == 1 && arcount == 0) {
-			/*
-			 * name/data does not exist, soa record supplied in the
-			 * authority section
-			 */
-			/* authority section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-					sizeof zname)) < 0)
-			    return (n);
-			cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type != T_SOA || class != qclass) {
-			    fprintf(stderr, "unknown answer\n");
-			    return (-1);
-			}
-			myzone = 0;
-			svdname = dname;
-			while (dname)
-			    if (strcasecmp(dname, zname) == 0) {
-				myzone = 1;
-				break;
-			    } else if ((dname = strchr(dname, '.')) != NULL)
-				dname++;
-			if (!myzone) {
-			    dname = strchr(svdname, '.');
-			    if (dname != NULL)
-				dname++;
-			    continue;
-			}
-			nscount = 0;
-			/* fallthrough */
-		    } else if (rcode == NOERROR && ancount == 1) {
-			/*
-			 * found the zone name
-			 * new servers will supply NS records for the zone
-			 * in authority section and A records for those 
-			 * nameservers in the additional section
-			 * older servers have to be explicitly queried for
-			 * NS records for the zone
-			 */
-			/* answer section must contain the soa record */
-			if ((n = dn_expand(answer, eom, cp, zname,
-			 	       	   sizeof zname)) < 0)
-				return (n);
-			else
-				cp += n;
-			if (cp + 2 * INT16SZ > eom)
-				return (-1);
-			GETSHORT(type, cp);
-			GETSHORT(class, cp);
-			if (type == T_CNAME) {
-				dname = strchr(dname, '.');
-				if (dname != NULL)
-					dname++;
-				continue;
-			}
-			if (strcasecmp(dname, zname) != 0 ||
-			    type != T_SOA ||
-			    class != rrecp->r_class) {
-				fprintf(stderr, "unknown answer\n");
-				return (-1);
-			}
-			/* FALLTHROUGH */
-		    } else {
-			fprintf(stderr,
-		"unknown response: ans=%d, auth=%d, add=%d, rcode=%d\n",
-				ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		    if (cp + INT32SZ + INT16SZ > eom)
-			    return (-1);
-		    /* continue processing the soa record */
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    newgroup = 1;
-		    zptr = zgrp_start;
-		    prevzptr = NULL;
-		    while (zptr) {
-			if (strcasecmp(zname, zptr->z_origin) == 0 &&
-			    type == T_SOA && class == qclass) {
-				newgroup = 0;
-				break;
-			}
-			prevzptr = zptr;
-			zptr = zptr->z_next;
-		    }
-		    if (!newgroup) {
-			for (tmprrecp = zptr->z_rr;
-			     tmprrecp->r_grpnext;
-			     tmprrecp = tmprrecp->r_grpnext)
-				    ;
-			tmprrecp->r_grpnext = rrecp;
-			rrecp->r_grpnext = NULL;
-			done = 1;
-			cp += dlen;
-			break;
-		    } else {
-			if ((n = dn_expand(answer, eom, cp, primary,
-				       	   sizeof primary)) < 0)
-			    return (n);
-			cp += n;
-			/* 
-			 * We don't have to bounds check here because the
-			 * next use of 'cp' is in dn_expand().
-			 */
-			cp1 = (char *)soardata;
-			strcpy(cp1, primary);
-			cp1 += strlen(cp1) + 1;
-			if ((n = dn_expand(answer, eom, cp, mailaddr,
-				       	   sizeof mailaddr)) < 0)
-			    return (n);
-			cp += n;
-			strcpy(cp1, mailaddr);
-			cp1 += strlen(cp1) + 1;
-			if (cp + 5*INT32SZ > eom)
-				return (-1);
-			memcpy(cp1, cp, 5*INT32SZ);
-			cp += 5*INT32SZ;
-			cp1 += 5*INT32SZ;
-			rdatasize = (u_char *)cp1 - soardata;
-			zptr = calloc(1, sizeof(struct zonegrp));
-			if (zptr == NULL)
-                	    return (-1);
-			if (zgrp_start == NULL)
-			    zgrp_start = zptr;
-			else
-			    prevzptr->z_next = zptr;
-			zptr->z_rr = rrecp;
-			rrecp->r_grpnext = NULL;
-			strcpy(zptr->z_origin, zname);
-			zptr->z_class = class;
-			memcpy(zptr->z_soardata, soardata, rdatasize);
-			/* fallthrough to process NS and A records */
-		    }
-		} else if (qtype == T_NS) {
-		    if (rcode == NOERROR && ancount > 0) {
-			strcpy(zname, dname);
-			for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-			    if (strcasecmp(zname, zptr->z_origin) == 0)
-				break;
-			}
-			if (zptr == NULL)
-			    /* should not happen */
-			    return (-1);
-			if (nscount > 0) {
-			    /*
-			     * answer and authority sections contain
-			     * the same information, skip answer section
-			     */
-			    for (j = 0; j < ancount; j++) {
-				n = dn_skipname(cp, eom);
-				if (n < 0)
-					return (-1);
-				n += 2*INT16SZ + INT32SZ;
-				if (cp + n + INT16SZ > eom)
-					return (-1);
-				cp += n;
-				GETSHORT(dlen, cp);
-				cp += dlen;
-			    }
-			} else
-			    nscount = ancount;
-			/* fallthrough to process NS and A records */
-		    } else {
-			fprintf(stderr, "cannot determine nameservers for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		} else if (qtype == T_A) {
-		    if (rcode == NOERROR && ancount > 0) {
-			arcount = ancount;
-			ancount = nscount = 0;
-			/* fallthrough to process A records */
-		    } else {
-			fprintf(stderr, "cannot determine address for %s:\
-ans=%d, auth=%d, add=%d, rcode=%d\n",
-				dname, ancount, nscount, arcount, hp->rcode);
-			return (-1);
-		    }
-		}
-		/* process NS records for the zone */
-		j = 0;
-		for (i = 0; i < nscount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			    return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			return (-1);
-		    if (strcasecmp(name, zname) == 0 &&
-			type == T_NS && class == qclass) {
-				if ((n = dn_expand(answer, eom, cp,
-						   name, sizeof name)) < 0)
-					return (n);
-			    target = zptr->z_ns[j++].nsname;
-			    strcpy(target, name);
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0)
-		    zptr->z_nscount = j;
-		/* get addresses for the nameservers */
-		for (i = 0; i < arcount; i++) {
-		    if ((n = dn_expand(answer, eom, cp, name,
-					sizeof name)) < 0)
-			return (n);
-		    cp += n;
-		    if (cp + 3 * INT16SZ + INT32SZ > eom)
-			return (-1);
-		    GETSHORT(type, cp);
-		    GETSHORT(class, cp);
-		    GETLONG(ttl, cp);
-		    GETSHORT(dlen, cp);
-		    if (cp + dlen > eom)
-			    return (-1);
-		    if (type == T_A && dlen == INT32SZ && class == qclass) {
-			for (j = 0; j < zptr->z_nscount; j++)
-			    if (strcasecmp(name, zptr->z_ns[j].nsname) == 0) {
-				memcpy(&zptr->z_ns[j].nsaddr1.s_addr, cp,
-				       INT32SZ);
-				break;
-			    }
-		    }
-		    cp += dlen;
-		}
-		if (zptr->z_nscount == 0) {
-		    dname = zname;
-		    qtype = T_NS;
-		    continue;
-		}
-		done = 1;
-		for (k = 0; k < zptr->z_nscount; k++)
-		    if (zptr->z_ns[k].nsaddr1.s_addr == 0) {
-			done = 0;
-			dname = zptr->z_ns[k].nsname;
-			qtype = T_A;
-		    }
-
- 	    } /* while */
-	}
-
-	statp->options |= RES_DEBUG;
-	for (zptr = zgrp_start; zptr; zptr = zptr->z_next) {
-
-		/* append zone section */
-		rrecp = res_mkupdrec(ns_s_zn, zptr->z_origin,
-				     zptr->z_class, ns_t_soa, 0);
-		if (rrecp == NULL) {
-			fprintf(stderr, "saverrec error\n");
-			fflush(stderr);
-			return (-1);
-		}
-		rrecp->r_grpnext = zptr->z_rr;
-		zptr->z_rr = rrecp;
-
-		n = res_nmkupdate(statp, zptr->z_rr, packet, sizeof packet);
-		if (n < 0) {
-			fprintf(stderr, "res_nmkupdate error\n");
-			fflush(stderr);
-			return (-1);
-		} else
-			fprintf(stdout, "res_nmkupdate: packet size = %d\n", n);
-
-		/*
-		 * Override the list of NS records from res_ninit() with
-		 * the authoritative nameservers for the zone being updated.
-		 * Sort primary to be the first in the list of nameservers.
-		 */
-		for (i = 0; i < zptr->z_nscount; i++) {
-			if (strcasecmp(zptr->z_ns[i].nsname,
-				       zptr->z_soardata) == 0) {
-				struct in_addr tmpaddr;
-
-				if (i != 0) {
-					strcpy(zptr->z_ns[i].nsname,
-					       zptr->z_ns[0].nsname);
-					strcpy(zptr->z_ns[0].nsname,
-					       zptr->z_soardata);
-					tmpaddr = zptr->z_ns[i].nsaddr1;
-					zptr->z_ns[i].nsaddr1 =
-						zptr->z_ns[0].nsaddr1;
-					zptr->z_ns[0].nsaddr1 = tmpaddr;
-				}
-				break;
-			}
-		}
-		for (i = 0; i < MAXNS; i++) {
-			statp->nsaddr_list[i].sin_addr = zptr->z_ns[i].nsaddr1;
-			statp->nsaddr_list[i].sin_family = AF_INET;
-			statp->nsaddr_list[i].sin_port = htons(NAMESERVER_PORT);
-		}
-		statp->nscount = (zptr->z_nscount < MAXNS) ?
-					zptr->z_nscount : MAXNS;
-		n = res_nsend(statp, packet, n, answer, sizeof(answer));
-		if (n < 0) {
-			fprintf(stderr, "res_nsend: send error, n=%d\n", n);
-			break;
-		} else if (n > sizeof(answer)) {
-			fprintf(stderr, "res_nsend: buffer too small\n");
-			break;
-		}
-			numzones++;
-	}
-
-	/* free malloc'ed memory */
-	while(zgrp_start) {
-		zptr = zgrp_start;
-		zgrp_start = zgrp_start->z_next;
-		res_freeupdrec(zptr->z_rr);  /* Zone section we allocated. */
-		free((char *)zptr);
-	}
-
-	return (numzones);
-}
diff --git a/lib/libc/net/rthdr.c b/lib/libc/net/rthdr.c
deleted file mode 100644
index dc6ca30..0000000
--- a/lib/libc/net/rthdr.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/*	$KAME: rthdr.c,v 1.19 2003/06/06 10:48:51 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * RFC2292 API
- */
-
-size_t
-inet6_rthdr_space(type, seg)
-	int type, seg;
-{
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-		if (seg < 1 || seg > 23)
-			return (0);
-#ifdef COMPAT_RFC2292
-		return (CMSG_SPACE(sizeof(struct in6_addr) * (seg - 1) +
-		    sizeof(struct ip6_rthdr0)));
-#else
-		return (CMSG_SPACE(sizeof(struct in6_addr) * seg +
-		    sizeof(struct ip6_rthdr0)));
-#endif 
-	default:
-		return (0);
-	}
-}
-
-struct cmsghdr *
-inet6_rthdr_init(bp, type)
-	void *bp;
-	int type;
-{
-	struct cmsghdr *ch = (struct cmsghdr *)bp;
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(ch);
-
-	ch->cmsg_level = IPPROTO_IPV6;
-	ch->cmsg_type = IPV6_RTHDR;
-
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-#ifdef COMPAT_RFC2292
-		ch->cmsg_len = CMSG_LEN(sizeof(struct ip6_rthdr0) -
-		    sizeof(struct in6_addr));
-#else
-		ch->cmsg_len = CMSG_LEN(sizeof(struct ip6_rthdr0));
-#endif 
-
-		bzero(rthdr, sizeof(struct ip6_rthdr0));
-		rthdr->ip6r_type = IPV6_RTHDR_TYPE_0;
-		return (ch);
-	default:
-		return (NULL);
-	}
-}
-
-/* ARGSUSED */
-int
-inet6_rthdr_add(cmsg, addr, flags)
-	struct cmsghdr *cmsg;
-	const struct in6_addr *addr;
-	u_int flags;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-		if (flags != IPV6_RTHDR_LOOSE && flags != IPV6_RTHDR_STRICT)
-			return (-1);
-		if (rt0->ip6r0_segleft == 23)
-			return (-1);
-
-#ifdef COMPAT_RFC1883		/* XXX */
-		if (flags == IPV6_RTHDR_STRICT) {
-			int c, b;
-			c = rt0->ip6r0_segleft / 8;
-			b = rt0->ip6r0_segleft % 8;
-			rt0->ip6r0_slmap[c] |= (1 << (7 - b));
-		}
-#else
-		if (flags != IPV6_RTHDR_LOOSE)
-			return (-1);
-#endif 
-		rt0->ip6r0_segleft++;
-		bcopy(addr, (caddr_t)rt0 + ((rt0->ip6r0_len + 1) << 3),
-		    sizeof(struct in6_addr));
-		rt0->ip6r0_len += sizeof(struct in6_addr) >> 3;
-		cmsg->cmsg_len = CMSG_LEN((rt0->ip6r0_len + 1) << 3);
-		break;
-	}
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-/* ARGSUSED */
-int
-inet6_rthdr_lasthop(cmsg, flags)
-	struct cmsghdr *cmsg;
-	unsigned int flags;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-#ifdef COMPAT_RFC1883		/* XXX */
-		if (flags != IPV6_RTHDR_LOOSE && flags != IPV6_RTHDR_STRICT)
-			return (-1);
-#endif /* COMPAT_RFC1883 */
-		if (rt0->ip6r0_segleft > 23)
-			return (-1);
-#ifdef COMPAT_RFC1883		/* XXX */
-		if (flags == IPV6_RTHDR_STRICT) {
-			int c, b;
-			c = rt0->ip6r0_segleft / 8;
-			b = rt0->ip6r0_segleft % 8;
-			rt0->ip6r0_slmap[c] |= (1 << (7 - b));
-		}
-#else
-		if (flags != IPV6_RTHDR_LOOSE)
-			return (-1);
-#endif /* COMPAT_RFC1883 */
-		break;
-	}
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-#if 0
-int
-inet6_rthdr_reverse(in, out)
-	const struct cmsghdr *in;
-	struct cmsghdr *out;
-{
-
-	return (-1);
-}
-#endif
-
-int
-inet6_rthdr_segments(cmsg)
-	const struct cmsghdr *cmsg;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-
-		if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-			return (-1);
-
-		return (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-	}
-
-	default:
-		return (-1);
-	}
-}
-
-struct in6_addr *
-inet6_rthdr_getaddr(cmsg, idx)
-	struct cmsghdr *cmsg;
-	int idx;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-		int naddr;
-
-		if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-			return NULL;
-		naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-		if (idx <= 0 || naddr < idx)
-			return NULL;
-#ifdef COMPAT_RFC2292
-		return (((struct in6_addr *)(rt0 + 1)) + idx - 1);
-#else
-		return (((struct in6_addr *)(rt0 + 1)) + idx);
-#endif
-	}
-
-	default:
-		return NULL;
-	}
-}
-
-int
-inet6_rthdr_getflags(cmsg, idx)
-	const struct cmsghdr *cmsg;
-	int idx;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-		int naddr;
-
-		if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-			return (-1);
-		naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-		if (idx < 0 || naddr < idx)
-			return (-1);
-#ifdef COMPAT_RFC1883		/* XXX */
-		if (rt0->ip6r0_slmap[idx / 8] & (0x80 >> (idx % 8)))
-			return IPV6_RTHDR_STRICT;
-		else
-			return IPV6_RTHDR_LOOSE;
-#else
-		return IPV6_RTHDR_LOOSE;
-#endif /* COMPAT_RFC1883 */
-	}
-
-	default:
-		return (-1);
-	}
-}
-
-/*
- * RFC3542 API
- */
-
-socklen_t
-inet6_rth_space(int type, int segments)
-{
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-		return (((segments * 2) + 1) << 3);
-	default:
-		return (0);	/* type not suppported */
-	}
-}
-
-void *
-inet6_rth_init(void *bp, socklen_t bp_len, int type, int segments)
-{
-	struct ip6_rthdr *rth = (struct ip6_rthdr *)bp;
-	struct ip6_rthdr0 *rth0;
-
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-		/* length validation */
-		if (bp_len < inet6_rth_space(IPV6_RTHDR_TYPE_0, segments))
-			return (NULL);
-
-		memset(bp, 0, bp_len);
-		rth0 = (struct ip6_rthdr0 *)rth;
-		rth0->ip6r0_len = segments * 2;
-		rth0->ip6r0_type = IPV6_RTHDR_TYPE_0;
-		rth0->ip6r0_segleft = 0;
-		rth0->ip6r0_reserved = 0;
-		break;
-	default:
-		return (NULL);	/* type not supported */
-	}
-
-	return (bp);
-}
-
-int
-inet6_rth_add(void *bp, const struct in6_addr *addr)
-{
-	struct ip6_rthdr *rth = (struct ip6_rthdr *)bp;
-	struct ip6_rthdr0 *rth0;
-	struct in6_addr *nextaddr;
-
-	switch (rth->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		rth0 = (struct ip6_rthdr0 *)rth;
-		nextaddr = (struct in6_addr *)(rth0 + 1) + rth0->ip6r0_segleft;
-		*nextaddr = *addr;
-		rth0->ip6r0_segleft++;
-		break;
-	default:
-		return (-1);	/* type not supported */
-	}
-
-	return (0);
-}
-
-int
-inet6_rth_reverse(const void *in, void *out)
-{
-	struct ip6_rthdr *rth_in = (struct ip6_rthdr *)in;
-	struct ip6_rthdr0 *rth0_in, *rth0_out;
-	int i, segments;
-
-	switch (rth_in->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		rth0_in = (struct ip6_rthdr0 *)in;
-		rth0_out = (struct ip6_rthdr0 *)out;
-
-		/* parameter validation XXX too paranoid? */
-		if (rth0_in->ip6r0_len % 2)
-			return (-1);
-		segments = rth0_in->ip6r0_len / 2;
-
-		/* we can't use memcpy here, since in and out may overlap */
-		memmove((void *)rth0_out, (void *)rth0_in,
-			((rth0_in->ip6r0_len) + 1) << 3);
-		rth0_out->ip6r0_segleft = segments;
-
-		/* reverse the addresses */
-		for (i = 0; i < segments / 2; i++) {
-			struct in6_addr addr_tmp, *addr1, *addr2;
-
-			addr1 = (struct in6_addr *)(rth0_out + 1) + i;
-			addr2 = (struct in6_addr *)(rth0_out + 1) +
-				(segments - i - 1);
-			addr_tmp = *addr1;
-			*addr1 = *addr2;
-			*addr2 = addr_tmp;
-		}
-
-		break;
-	default:
-		return (-1);	/* type not supported */
-	}
-
-	return (0);
-}
-
-int
-inet6_rth_segments(const void *bp)
-{
-	struct ip6_rthdr *rh = (struct ip6_rthdr *)bp;
-	struct ip6_rthdr0 *rh0;
-	int addrs;
-
-	switch (rh->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		rh0 = (struct ip6_rthdr0 *)bp;
-
-		/*
-		 * Validation for a type-0 routing header.
-		 * Is this too strict?
-		 */
-		if ((rh0->ip6r0_len % 2) != 0 ||
-		    (addrs = (rh0->ip6r0_len >> 1)) < rh0->ip6r0_segleft)
-			return (-1);
-
-		return (addrs);
-	default:
-		return (-1);	/* unknown type */
-	}
-}
-
-struct in6_addr *
-inet6_rth_getaddr(const void *bp, int idx)
-{
-	struct ip6_rthdr *rh = (struct ip6_rthdr *)bp;
-	struct ip6_rthdr0 *rh0;
-	int addrs;
-
-	switch (rh->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		 rh0 = (struct ip6_rthdr0 *)bp;
-
-		/*
-		 * Validation for a type-0 routing header.
-		 * Is this too strict?
-		 */
-		if ((rh0->ip6r0_len % 2) != 0 ||
-		    (addrs = (rh0->ip6r0_len >> 1)) < rh0->ip6r0_segleft)
-			return (NULL);
-
-		if (idx < 0 || addrs <= idx)
-			return (NULL);
-
-		return (((struct in6_addr *)(rh0 + 1)) + idx);
-	default:
-		return (NULL);	/* unknown type */
-		break;
-	}
-}
diff --git a/lib/libc/net/send.c b/lib/libc/net/send.c
deleted file mode 100644
index aea0620..0000000
--- a/lib/libc/net/send.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-#include "un-namespace.h"
-
-ssize_t
-send(s, msg, len, flags)
-	int s, flags;
-	size_t len;
-	const void *msg;
-{
-	return (_sendto(s, msg, len, flags, NULL, 0));
-}
diff --git a/lib/libc/net/sockatmark.c b/lib/libc/net/sockatmark.c
deleted file mode 100644
index 497ce7f..0000000
--- a/lib/libc/net/sockatmark.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2002 William C. Fenner.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- *
- * $FreeBSD: src/lib/libc/net/sockatmark.c,v 1.1 2002/12/13 22:22:55 fenner Exp $
- */
-#include <sys/ioctl.h>
-
-int sockatmark(int s)
-{
-	int atmark;
-
-	if (ioctl(s, SIOCATMARK, &atmark) == -1)
-		return -1;
-	return atmark;
-}
diff --git a/lib/libc/net/vars.c b/lib/libc/net/vars.c
deleted file mode 100644
index 756bf4d..0000000
--- a/lib/libc/net/vars.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$KAME: vars.c,v 1.2 2001/08/20 02:32:41 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <netinet/in.h>
-
-/*
- * Definitions of some costant IPv6 addresses.
- */
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
-const struct in6_addr in6addr_nodelocal_allnodes = IN6ADDR_NODELOCAL_ALLNODES_INIT;
-const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
-
diff --git a/lib/libc/nls/C.msg b/lib/libc/nls/C.msg
deleted file mode 100644
index 4d8699e..0000000
--- a/lib/libc/nls/C.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: src/lib/libc/nls/C.msg,v 1.1 2005/02/27 17:59:39 phantom Exp $
-$
-$ Message catalog for C locale (template)
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operation not permitted
-$ ENOENT
-2 No such file or directory
-$ ESRCH
-3 No such process
-$ EINTR
-4 Interrupted system call
-$ EIO
-5 Input/output error
-$ ENXIO
-6 Device not configured
-$ E2BIG
-7 Argument list too long
-$ ENOEXEC
-8 Exec format error
-$ EBADF
-9 Bad file descriptor
-$ ECHILD
-10 No child processes
-$ EDEADLK
-11 Resource deadlock avoided
-$ ENOMEM
-12 Cannot allocate memory
-$ EACCES
-13 Permission denied
-$ EFAULT
-14 Bad address
-$ ENOTBLK
-15 Block device required
-$ EBUSY
-16 Device busy
-$ EEXIST
-17 File exists
-$ EXDEV
-18 Cross-device link
-$ ENODEV
-19 Operation not supported by device
-$ ENOTDIR
-20 Not a directory
-$ EISDIR
-21 Is a directory
-$ EINVAL
-22 Invalid argument
-$ ENFILE
-23 Too many open files in system
-$ EMFILE
-24 Too many open files
-$ ENOTTY
-25 Inappropriate ioctl for device
-$ ETXTBSY
-26 Text file busy
-$ EFBIG
-27 File too large
-$ ENOSPC
-28 No space left on device
-$ ESPIPE
-29 Illegal seek
-$ EROFS
-30 Read-only file system
-$ EMLINK
-31 Too many links
-$ EPIPE
-32 Broken pipe
-$ EDOM
-33 Numerical argument out of domain
-$ ERANGE
-34 Result too large
-$ EAGAIN, EWOULDBLOCK
-35 Resource temporarily unavailable
-$ EINPROGRESS
-36 Operation now in progress
-$ EALREADY
-37 Operation already in progress
-$ ENOTSOCK
-38 Socket operation on non-socket
-$ EDESTADDRREQ
-39 Destination address required
-$ EMSGSIZE
-40 Message too long
-$ EPROTOTYPE
-41 Protocol wrong type for socket
-$ ENOPROTOOPT
-42 Protocol not available
-$ EPROTONOSUPPORT
-43 Protocol not supported
-$ ESOCKTNOSUPPORT
-44 Socket type not supported
-$ EOPNOTSUPP
-45 Operation not supported
-$ EPFNOSUPPORT
-46 Protocol family not supported
-$ EAFNOSUPPORT
-47 Address family not supported by protocol family
-$ EADDRINUSE
-48 Address already in use
-$ EADDRNOTAVAIL
-49 Can't assign requested address
-$ ENETDOWN
-50 Network is down
-$ ENETUNREACH
-51 Network is unreachable
-$ ENETRESET
-52 Network dropped connection on reset
-$ ECONNABORTED
-53 Software caused connection abort
-$ ECONNRESET
-54 Connection reset by peer
-$ ENOBUFS
-55 No buffer space available
-$ EISCONN
-56 Socket is already connected
-$ ENOTCONN
-57 Socket is not connected
-$ ESHUTDOWN
-58 Can't send after socket shutdown
-$ ETOOMANYREFS
-59 Too many references: can't splice
-$ ETIMEDOUT
-60 Operation timed out
-$ ECONNREFUSED
-61 Connection refused
-$ ELOOP
-62 Too many levels of symbolic links
-$ ENAMETOOLONG
-63 File name too long
-$ EHOSTDOWN
-64 Host is down
-$ EHOSTUNREACH
-65 No route to host
-$ ENOTEMPTY
-66 Directory not empty
-$ EPROCLIM
-67 Too many processes
-$ EUSERS
-68 Too many users
-$ EDQUOT
-69 Disc quota exceeded
-$ ESTALE
-70 Stale NFS file handle
-$ EREMOTE
-71 Too many levels of remote in path
-$ EBADRPC
-72 RPC struct is bad
-$ ERPCMISMATCH
-73 RPC version wrong
-$ EPROGUNAVAIL
-74 RPC prog. not avail
-$ EPROGMISMATCH
-75 Program version wrong
-$ EPROCUNAVAIL
-76 Bad procedure for program
-$ ENOLCK
-77 No locks available
-$ ENOSYS
-78 Function not implemented
-$ EFTYPE
-79 Inappropriate file type or format
-$ EAUTH
-80 Authentication error
-$ ENEEDAUTH
-81 Need authenticator
-$ EIDRM
-82 Identifier removed
-$ ENOMSG
-83 No message of desired type
-$ EOVERFLOW
-84 Value too large to be stored in data type
-$ ECANCELED
-85 Operation canceled
-$ EILSEQ
-86 Illegal byte sequence
-$ ENOATTR
-87 Attribute not found
-$ EDOOFUS
-88 Programming error
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Hangup
-$ SIGINT
-2 Interrupt
-$ SIGQUIT
-3 Quit
-$ SIGILL
-4 Illegal instruction
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Floating point exception
-$ SIGKILL
-9 Killed
-$ SIGBUS
-10 Bus error
-$ SIGSEGV
-11 Segmentation fault
-$ SIGSYS
-12 Bad system call
-$ SIGPIPE
-13 Broken pipe
-$ SIGALRM
-14 Alarm clock
-$ SIGTERM
-15 Terminated
-$ SIGURG
-16 Urgent I/O condition
-$ SIGSTOP
-17 Suspended (signal)
-$ SIGTSTP
-18 Suspended
-$ SIGCONT
-19 Continued
-$ SIGCHLD
-20 Child exited
-$ SIGTTIN
-21 Stopped (tty input)
-$ SIGTTOU
-22 Stopped (tty output)
-$ SIGIO
-23 I/O possible
-$ SIGXCPU
-24 Cputime limit exceeded
-$ SIGXFSZ
-25 Filesize limit exceeded
-$ SIGVTALRM
-26 Virtual timer expired
-$ SIGPROF
-27 Profiling timer expired
-$ SIGWINCH
-28 Window size changes
-$ SIGINFO
-29 Information request
-$ SIGUSR1
-30 User defined signal 1
-$ SIGUSR2
-31 User defined signal 2
diff --git a/lib/libc/nls/Makefile b/lib/libc/nls/Makefile
deleted file mode 100644
index 62c1f63..0000000
--- a/lib/libc/nls/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = msgcat.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/nls/ko_KR.UTF-8.msg b/lib/libc/nls/ko_KR.UTF-8.msg
deleted file mode 100644
index bb90eaf..0000000
--- a/lib/libc/nls/ko_KR.UTF-8.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: src/lib/libc/nls/ko_KR.UTF-8.msg,v 1.1.2.1 2006/09/11 18:22:57 jkim Exp $
-$
-$ Message catalog for ko_KR.UTF-8 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 명령이 허용되지 않습니다
-$ ENOENT
-2 파일 또는 디렉터리가 없습니다
-$ ESRCH
-3 존재하지 않는 프로세스입니다
-$ EINTR
-4 시스템 호출이 중단되었습니다
-$ EIO
-5 입출력 에러입니다
-$ ENXIO
-6 장치가 설정되지 않았습니다
-$ E2BIG
-7 인자가 너무 깁니다
-$ ENOEXEC
-8 실행 파일 형식이 잘못되었습니다
-$ EBADF
-9 잘못된 파일 디스크립터입니다
-$ ECHILD
-10 자식 프로세스가 없습니다
-$ EDEADLK
-11 자원 데드락을 중단하였습니다
-$ ENOMEM
-12 메모리를 할당할 수 없습니다
-$ EACCES
-13 권한이 없습니다
-$ EFAULT
-14 잘못된 주소가 지정되었습니다
-$ ENOTBLK
-15 블럭 장치여야 합니다
-$ EBUSY
-16 장치가 사용 중입니다
-$ EEXIST
-17 파일이 이미 존재합니다
-$ EXDEV
-18 다른 장치 간의 연결입니다
-$ ENODEV
-19 그 장치가 지원하지 않는 명령입니다
-$ ENOTDIR
-20 디렉터리가 아닙니다
-$ EISDIR
-21 디렉터리입니다
-$ EINVAL
-22 인자가 잘못되었습니다
-$ ENFILE
-23 시스템에 파일이 너무 많이 열려있습니다
-$ EMFILE
-24 파일이 너무 많이 열려있습니다
-$ ENOTTY
-25 장치가 지원하지 않는 ioctl입니다
-$ ETXTBSY
-26 Text 파일이 사용 중입니다
-$ EFBIG
-27 파일이 너무 큽니다
-$ ENOSPC
-28 장치에 여유 공간이 남아있지 않습니다
-$ ESPIPE
-29 잘못된 탐색입니다
-$ EROFS
-30 읽기 전용 파일 시스템입니다
-$ EMLINK
-31 연결이 너무 많습니다
-$ EPIPE
-32 파이프가 끊어졌습니다
-$ EDOM
-33 수치 인자가 영역을 벗어났습니다
-$ ERANGE
-34 결과가 너무 큽니다
-$ EAGAIN, EWOULDBLOCK
-35 자원을 잠시 사용할 수 없습니다
-$ EINPROGRESS
-36 작업이 진행 중입니다
-$ EALREADY
-37 작업이 이미 진행 중입니다
-$ ENOTSOCK
-38 소켓이 아닌 객체에 대한 소켓 작업입니다
-$ EDESTADDRREQ
-39 목적지 주소가 필요합니다
-$ EMSGSIZE
-40 메시지가 너무 깁니다
-$ EPROTOTYPE
-41 소켓에 사용할 수 없는 프로토콜 유형입니다
-$ ENOPROTOOPT
-42 프로토콜을 사용할 수 없습니다
-$ EPROTONOSUPPORT
-43 지원하지 않는 프로토콜입니다
-$ ESOCKTNOSUPPORT
-44 지원하지 않는 종류의 소켓입니다
-$ EOPNOTSUPP
-45 지원되지 않는 명령입니다
-$ EPFNOSUPPORT
-46 지원되지 않는 프로토콜군입니다
-$ EAFNOSUPPORT
-47 프로토콜군에서 지원되지 않는 주소군입니다
-$ EADDRINUSE
-48 이미 사용 중인 주소입니다
-$ EADDRNOTAVAIL
-49 요청한 주소를 할당할 수 없습니다
-$ ENETDOWN
-50 네트워크가 단절되었습니다
-$ ENETUNREACH
-51 네트워크에 도달할 수 없습니다
-$ ENETRESET
-52 네트워크가 재설정되어 접속이 끊어졌습니다
-$ ECONNABORTED
-53 소프트웨어적인 이유로 연결이 끊어졌습니다
-$ ECONNRESET
-54 상대방이 연결을 끊었습니다
-$ ENOBUFS
-55 버퍼 공간이 모자랍니다
-$ EISCONN
-56 소켓이 이미 연결되있습니다
-$ ENOTCONN
-57 소켓이 연결되어 있지 않습니다
-$ ESHUTDOWN
-58 소켓이 이미 중단되어, 더 이상 전송할 수 없습니다
-$ ETOOMANYREFS
-59 참조수가 너무 많아 나눌 수 없습니다
-$ ETIMEDOUT
-60 시간이 너무 많이 지나 작업이 중단되었습니다
-$ ECONNREFUSED
-61 접속이 거부되었습니다
-$ ELOOP
-62 심볼릭 연결이 너무 많이 거쳐서 연결되었습니다
-$ ENAMETOOLONG
-63 파일 이름이 너무 깁니다
-$ EHOSTDOWN
-64 호스트가 죽었습니다
-$ EHOSTUNREACH
-65 호스트로 갈 경로가 없습니다
-$ ENOTEMPTY
-66 디렉터리가 비어있지 않습니다
-$ EPROCLIM
-67 프로세스가 너무 많습니다
-$ EUSERS
-68 사용자가 너무 많습니다
-$ EDQUOT
-69 디스크 할당량을 초과했습니다
-$ ESTALE
-70 끊어진 NFS 연결입니다
-$ EREMOTE
-71 너무 많은 경로로 원격에 접근하였습니다
-$ EBADRPC
-72 RPC 구조체가 잘못되었습니다
-$ ERPCMISMATCH
-73 RPC 버전이 맞지 않습니다
-$ EPROGUNAVAIL
-74 RPC 프로그램이 없습니다
-$ EPROGMISMATCH
-75 프로그램 버전이 맞지 않습니다
-$ EPROCUNAVAIL
-76 프로그램에 원격 프로시저가 없습니다
-$ ENOLCK
-77 잠금이 불가능합니다
-$ ENOSYS
-78 구현되지 않은 기능입니다
-$ EFTYPE
-79 잘못된 파일 종류이거나 형식이 잘못됐습니다
-$ EAUTH
-80 인증이 실패했습니다
-$ ENEEDAUTH
-81 인증 서버가 지정되지 않았습니다
-$ EIDRM
-82 식별자가 제거되었습니다
-$ ENOMSG
-83 요청된 형식의 메시지는 없습니다
-$ EOVERFLOW
-84 데이터 형식에 저장하기에 너무 큰 값입니다
-$ ECANCELED
-85 작업이 취소되었습니다
-$ EILSEQ
-86 바이트 배열이 잘못되었습니다
-$ ENOATTR
-87 속성을 찾을 수 없습니다
-$ EDOOFUS
-88 프로그램상 오류입니다
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 끊김
-$ SIGINT
-2 중단
-$ SIGQUIT
-3 종료
-$ SIGILL
-4 잘못된 명령
-$ SIGTRAP
-5 Trace/BPT 트랩
-$ SIGABRT
-6 Abort 트랩
-$ SIGEMT
-7 EMT 트랩
-$ SIGFPE
-8 부동소수점 연산 예외
-$ SIGKILL
-9 강제종료
-$ SIGBUS
-10 버스 오류
-$ SIGSEGV
-11 세그먼테이션 오류
-$ SIGSYS
-12 잘못된 시스템 호출
-$ SIGPIPE
-13 파이프가 끊김
-$ SIGALRM
-14 시간 경보
-$ SIGTERM
-15 종료됨
-$ SIGURG
-16 긴급 I/O 조건
-$ SIGSTOP
-17 일시정지 (시그널)
-$ SIGTSTP
-18 일시정지
-$ SIGCONT
-19 계속
-$ SIGCHLD
-20 자식 프로세스 종료
-$ SIGTTIN
-21 정지 (터미널 입력)
-$ SIGTTOU
-22 정지 (터미널 출력)
-$ SIGIO
-23 I/O possible
-$ SIGXCPU
-24 CPU 사용 시간 초과
-$ SIGXFSZ
-25 파일 용량 제한 초과
-$ SIGVTALRM
-26 가상 타이머 만료
-$ SIGPROF
-27 프로파일링 타이머 만료
-$ SIGWINCH
-28 창 크기 변경
-$ SIGINFO
-29 정보 요청
-$ SIGUSR1
-30 사용자 정의 시그널 1
-$ SIGUSR2
-31 사용자 정의 시그널 2
diff --git a/lib/libc/nls/ko_KR.eucKR.msg b/lib/libc/nls/ko_KR.eucKR.msg
deleted file mode 100644
index 4412e6a..0000000
--- a/lib/libc/nls/ko_KR.eucKR.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: src/lib/libc/nls/ko_KR.eucKR.msg,v 1.1.2.1 2006/09/11 18:22:57 jkim Exp $
-$
-$ Message catalog for ko_KR.eucKR locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 ����� ������ �ʽ��ϴ�
-$ ENOENT
-2 ���� �Ǵ� ���͸��� �����ϴ�
-$ ESRCH
-3 �������� �ʴ� ���μ����Դϴ�
-$ EINTR
-4 �ý��� ȣ���� �ߴܵǾ����ϴ�
-$ EIO
-5 ����� �����Դϴ�
-$ ENXIO
-6 ��ġ�� �������� �ʾҽ��ϴ�
-$ E2BIG
-7 ���ڰ� �ʹ� ��ϴ�
-$ ENOEXEC
-8 ���� ���� ������ �߸��Ǿ����ϴ�
-$ EBADF
-9 �߸��� ���� ��ũ�����Դϴ�
-$ ECHILD
-10 �ڽ� ���μ����� �����ϴ�
-$ EDEADLK
-11 �ڿ� ������� �ߴ��Ͽ����ϴ�
-$ ENOMEM
-12 �޸𸮸� �Ҵ��� �� �����ϴ�
-$ EACCES
-13 ������ �����ϴ�
-$ EFAULT
-14 �߸��� �ּҰ� �����Ǿ����ϴ�
-$ ENOTBLK
-15 �� ��ġ���� �մϴ�
-$ EBUSY
-16 ��ġ�� ��� ���Դϴ�
-$ EEXIST
-17 ������ �̹� �����մϴ�
-$ EXDEV
-18 �ٸ� ��ġ ���� �����Դϴ�
-$ ENODEV
-19 �� ��ġ�� �������� �ʴ� ����Դϴ�
-$ ENOTDIR
-20 ���͸��� �ƴմϴ�
-$ EISDIR
-21 ���͸��Դϴ�
-$ EINVAL
-22 ���ڰ� �߸��Ǿ����ϴ�
-$ ENFILE
-23 �ý��ۿ� ������ �ʹ� ���� �����ֽ��ϴ�
-$ EMFILE
-24 ������ �ʹ� ���� �����ֽ��ϴ�
-$ ENOTTY
-25 ��ġ�� �������� �ʴ� ioctl�Դϴ�
-$ ETXTBSY
-26 Text ������ ��� ���Դϴ�
-$ EFBIG
-27 ������ �ʹ� Ů�ϴ�
-$ ENOSPC
-28 ��ġ�� ���� ������ �������� �ʽ��ϴ�
-$ ESPIPE
-29 �߸��� Ž���Դϴ�
-$ EROFS
-30 �б� ���� ���� �ý����Դϴ�
-$ EMLINK
-31 ������ �ʹ� �����ϴ�
-$ EPIPE
-32 �������� ���������ϴ�
-$ EDOM
-33 ��ġ ���ڰ� ������ ������ϴ�
-$ ERANGE
-34 ����� �ʹ� Ů�ϴ�
-$ EAGAIN, EWOULDBLOCK
-35 �ڿ��� ��� ����� �� �����ϴ�
-$ EINPROGRESS
-36 �۾��� ���� ���Դϴ�
-$ EALREADY
-37 �۾��� �̹� ���� ���Դϴ�
-$ ENOTSOCK
-38 ������ �ƴ� ��ü�� ���� ���� �۾��Դϴ�
-$ EDESTADDRREQ
-39 ������ �ּҰ� �ʿ��մϴ�
-$ EMSGSIZE
-40 �޽����� �ʹ� ��ϴ�
-$ EPROTOTYPE
-41 ���Ͽ� ����� �� ���� �������� �����Դϴ�
-$ ENOPROTOOPT
-42 ���������� ����� �� �����ϴ�
-$ EPROTONOSUPPORT
-43 �������� �ʴ� ���������Դϴ�
-$ ESOCKTNOSUPPORT
-44 �������� �ʴ� ������ �����Դϴ�
-$ EOPNOTSUPP
-45 �������� �ʴ� ����Դϴ�
-$ EPFNOSUPPORT
-46 �������� �ʴ� �������ݱ��Դϴ�
-$ EAFNOSUPPORT
-47 �������ݱ����� �������� �ʴ� �ּұ��Դϴ�
-$ EADDRINUSE
-48 �̹� ��� ���� �ּ��Դϴ�
-$ EADDRNOTAVAIL
-49 ��û�� �ּҸ� �Ҵ��� �� �����ϴ�
-$ ENETDOWN
-50 ��Ʈ��ũ�� �����Ǿ����ϴ�
-$ ENETUNREACH
-51 ��Ʈ��ũ�� ������ �� �����ϴ�
-$ ENETRESET
-52 ��Ʈ��ũ�� �缳���Ǿ� ������ ���������ϴ�
-$ ECONNABORTED
-53 ����Ʈ�������� ������ ������ ���������ϴ�
-$ ECONNRESET
-54 ������ ������ �������ϴ�
-$ ENOBUFS
-55 ���� ������ ���ڶ��ϴ�
-$ EISCONN
-56 ������ �̹� ������ֽ��ϴ�
-$ ENOTCONN
-57 ������ ����Ǿ� ���� �ʽ��ϴ�
-$ ESHUTDOWN
-58 ������ �̹� �ߴܵǾ�, �� �̻� ������ �� �����ϴ�
-$ ETOOMANYREFS
-59 �������� �ʹ� ���� ���� �� �����ϴ�
-$ ETIMEDOUT
-60 �ð��� �ʹ� ���� ���� �۾��� �ߴܵǾ����ϴ�
-$ ECONNREFUSED
-61 ������ �źεǾ����ϴ�
-$ ELOOP
-62 �ɺ��� ������ �ʹ� ���� ���ļ� ����Ǿ����ϴ�
-$ ENAMETOOLONG
-63 ���� �̸��� �ʹ� ��ϴ�
-$ EHOSTDOWN
-64 ȣ��Ʈ�� �׾����ϴ�
-$ EHOSTUNREACH
-65 ȣ��Ʈ�� �� ��ΰ� �����ϴ�
-$ ENOTEMPTY
-66 ���͸��� ������� �ʽ��ϴ�
-$ EPROCLIM
-67 ���μ����� �ʹ� �����ϴ�
-$ EUSERS
-68 ����ڰ� �ʹ� �����ϴ�
-$ EDQUOT
-69 ��ũ �Ҵ緮�� �ʰ��߽��ϴ�
-$ ESTALE
-70 ������ NFS �����Դϴ�
-$ EREMOTE
-71 �ʹ� ���� ��η� ���ݿ� �����Ͽ����ϴ�
-$ EBADRPC
-72 RPC ����ü�� �߸��Ǿ����ϴ�
-$ ERPCMISMATCH
-73 RPC ������ ���� �ʽ��ϴ�
-$ EPROGUNAVAIL
-74 RPC ���α׷��� �����ϴ�
-$ EPROGMISMATCH
-75 ���α׷� ������ ���� �ʽ��ϴ�
-$ EPROCUNAVAIL
-76 ���α׷��� ���� ���ν����� �����ϴ�
-$ ENOLCK
-77 ����� �Ұ����մϴ�
-$ ENOSYS
-78 �������� ���� ����Դϴ�
-$ EFTYPE
-79 �߸��� ���� �����̰ų� ������ �߸��ƽ��ϴ�
-$ EAUTH
-80 ������ �����߽��ϴ�
-$ ENEEDAUTH
-81 ���� ������ �������� �ʾҽ��ϴ�
-$ EIDRM
-82 �ĺ��ڰ� ���ŵǾ����ϴ�
-$ ENOMSG
-83 ��û�� ������ �޽����� �����ϴ�
-$ EOVERFLOW
-84 ������ ���Ŀ� �����ϱ⿡ �ʹ� ū ���Դϴ�
-$ ECANCELED
-85 �۾��� ��ҵǾ����ϴ�
-$ EILSEQ
-86 ����Ʈ �迭�� �߸��Ǿ����ϴ�
-$ ENOATTR
-87 �Ӽ��� ã�� �� �����ϴ�
-$ EDOOFUS
-88 ���α׷��� �����Դϴ�
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 ����
-$ SIGINT
-2 �ߴ�
-$ SIGQUIT
-3 ����
-$ SIGILL
-4 �߸��� ���
-$ SIGTRAP
-5 Trace/BPT Ʈ��
-$ SIGABRT
-6 Abort Ʈ��
-$ SIGEMT
-7 EMT Ʈ��
-$ SIGFPE
-8 �ε��Ҽ��� ���� ����
-$ SIGKILL
-9 ��������
-$ SIGBUS
-10 ���� ����
-$ SIGSEGV
-11 ���׸����̼� ����
-$ SIGSYS
-12 �߸��� �ý��� ȣ��
-$ SIGPIPE
-13 �������� ����
-$ SIGALRM
-14 �ð� �溸
-$ SIGTERM
-15 �����
-$ SIGURG
-16 ��� I/O ����
-$ SIGSTOP
-17 �Ͻ����� (�ñ׳�)
-$ SIGTSTP
-18 �Ͻ�����
-$ SIGCONT
-19 ���
-$ SIGCHLD
-20 �ڽ� ���μ��� ����
-$ SIGTTIN
-21 ���� (�͹̳� �Է�)
-$ SIGTTOU
-22 ���� (�͹̳� ���)
-$ SIGIO
-23 I/O possible
-$ SIGXCPU
-24 CPU ��� �ð� �ʰ�
-$ SIGXFSZ
-25 ���� �뷮 ���� �ʰ�
-$ SIGVTALRM
-26 ���� Ÿ�̸� ����
-$ SIGPROF
-27 �������ϸ� Ÿ�̸� ����
-$ SIGWINCH
-28 â ũ�� ����
-$ SIGINFO
-29 ���� ��û
-$ SIGUSR1
-30 ����� ���� �ñ׳� 1
-$ SIGUSR2
-31 ����� ���� �ñ׳� 2
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
deleted file mode 100644
index c3c0dde..0000000
--- a/lib/libc/nls/msgcat.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/***********************************************************
-Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that Alfalfa's name not be used in
-advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.
-
-ALPHALPHA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-ALPHALPHA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-If you make any modifications, bugfixes or other changes to this software
-we'd appreciate it if you could send a copy to us so we can keep things
-up-to-date.  Many thanks.
-				Kee Hinckley
-				Alfalfa Software, Inc.
-				267 Allston St., #3
-				Cambridge, MA 02139  USA
-				nazgul@alfalfa.com
-
-******************************************************************/
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/nls/msgcat.c,v 1.50 2005/02/27 16:26:49 phantom Exp $");
-
-#define _NLS_PRIVATE
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include <arpa/inet.h>		/* for ntohl() */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <locale.h>
-#include <nl_types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "../locale/setlocale.h"        /* for ENCODING_LEN */
-
-#define _DEFAULT_NLS_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L:/usr/local/share/nls/%L/%N.cat:/usr/local/share/nls/%N/%L"
-
-#define	NLERR		((nl_catd) -1)
-#define NLRETERR(errc)  { errno = errc; return (NLERR); }
-
-static nl_catd load_msgcat(const char *);
-
-nl_catd
-catopen(const char *name, int type)
-{
-	int             spcleft, saverr;
-	char            path[PATH_MAX];
-	char            *nlspath, *lang, *base, *cptr, *pathP, *tmpptr;
-	char            *cptr1, *plang, *pter, *pcode;
-	struct stat     sbuf;
-
-	if (name == NULL || *name == '\0')
-		NLRETERR(EINVAL);
-
-	/* is it absolute path ? if yes, load immediately */
-	if (strchr(name, '/') != NULL)
-		return (load_msgcat(name));
-
-	if (type == NL_CAT_LOCALE)
-		lang = setlocale(LC_MESSAGES, NULL);
-	else
-		lang = getenv("LANG");
-
-	if (lang == NULL || *lang == '\0' || strlen(lang) > ENCODING_LEN ||
-	    (lang[0] == '.' &&
-	     (lang[1] == '\0' || (lang[1] == '.' && lang[2] == '\0'))) ||
-	    strchr(lang, '/') != NULL)
-		lang = "C";
-
-	if ((plang = cptr1 = strdup(lang)) == NULL)
-		return (NLERR);
-	if ((cptr = strchr(cptr1, '@')) != NULL)
-		*cptr = '\0';
-	pter = pcode = "";
-	if ((cptr = strchr(cptr1, '_')) != NULL) {
-		*cptr++ = '\0';
-		pter = cptr1 = cptr;
-	}
-	if ((cptr = strchr(cptr1, '.')) != NULL) {
-		*cptr++ = '\0';
-		pcode = cptr;
-	}
-
-	if ((nlspath = getenv("NLSPATH")) == NULL || issetugid())
-		nlspath = _DEFAULT_NLS_PATH;
-
-	if ((base = cptr = strdup(nlspath)) == NULL) {
-		saverr = errno;
-		free(plang);
-		errno = saverr;
-		return (NLERR);
-	}
-
-	while ((nlspath = strsep(&cptr, ":")) != NULL) {
-		pathP = path;
-		if (*nlspath) {
-			for (; *nlspath; ++nlspath) {
-				if (*nlspath == '%') {
-					switch (*(nlspath + 1)) {
-					case 'l':
-						tmpptr = plang;
-						break;
-					case 't':
-						tmpptr = pter;
-						break;
-					case 'c':
-						tmpptr = pcode;
-						break;
-					case 'L':
-						tmpptr = lang;
-						break;
-					case 'N':
-						tmpptr = (char *)name;
-						break;
-					case '%':
-						++nlspath;
-						/* fallthrough */
-					default:
-						if (pathP - path >=
-						    sizeof(path) - 1)
-							goto too_long;
-						*(pathP++) = *nlspath;
-						continue;
-					}
-					++nlspath;
-			put_tmpptr:
-					spcleft = sizeof(path) -
-						  (pathP - path) - 1;
-					if (strlcpy(pathP, tmpptr, spcleft) >=
-					    spcleft) {
-			too_long:
-						free(plang);
-						free(base);
-						NLRETERR(ENAMETOOLONG);
-					}
-					pathP += strlen(tmpptr);
-				} else {
-					if (pathP - path >= sizeof(path) - 1)
-						goto too_long;
-					*(pathP++) = *nlspath;
-				}
-			}
-			*pathP = '\0';
-			if (stat(path, &sbuf) == 0) {
-				free(plang);
-				free(base);
-				return (load_msgcat(path));
-			}
-		} else {
-			tmpptr = (char *)name;
-			--nlspath;
-			goto put_tmpptr;
-		}
-	}
-	free(plang);
-	free(base);
-	NLRETERR(ENOENT);
-}
-
-char *
-catgets(nl_catd catd, int set_id, int msg_id, const char *s)
-{
-	struct _nls_cat_hdr *cat_hdr;
-	struct _nls_set_hdr *set_hdr;
-	struct _nls_msg_hdr *msg_hdr;
-	int l, u, i, r;
-
-	if (catd == NULL || catd == NLERR) {
-		errno = EBADF;
-		/* LINTED interface problem */
-		return (char *) s;
-}
-
-	cat_hdr = (struct _nls_cat_hdr *)catd->__data; 
-	set_hdr = (struct _nls_set_hdr *)(void *)((char *)catd->__data
-			+ sizeof(struct _nls_cat_hdr));
-
-	/* binary search, see knuth algorithm b */
-	l = 0;
-	u = ntohl((uint32_t)cat_hdr->__nsets) - 1;
-	while (l <= u) {
-		i = (l + u) / 2;
-		r = set_id - ntohl((uint32_t)set_hdr[i].__setno);
-
-		if (r == 0) {
-			msg_hdr = (struct _nls_msg_hdr *)
-			    (void *)((char *)catd->__data +
-			    sizeof(struct _nls_cat_hdr) +
-			    ntohl((uint32_t)cat_hdr->__msg_hdr_offset));
-
-			l = ntohl((uint32_t)set_hdr[i].__index);
-			u = l + ntohl((uint32_t)set_hdr[i].__nmsgs) - 1;
-			while (l <= u) {
-				i = (l + u) / 2;
-				r = msg_id -
-				    ntohl((uint32_t)msg_hdr[i].__msgno);
-				if (r == 0) {
-					return ((char *) catd->__data +
-					    sizeof(struct _nls_cat_hdr) +
-					    ntohl((uint32_t)
-					    cat_hdr->__msg_txt_offset) +
-					    ntohl((uint32_t)
-					    msg_hdr[i].__offset));
-				} else if (r < 0) {
-					u = i - 1;
-				} else {
-					l = i + 1;
-				}
-}
-
-			/* not found */
-			goto notfound;
-
-		} else if (r < 0) {
-			u = i - 1;
-		} else {
-			l = i + 1;
-		}
-}
-
-notfound:
-	/* not found */
-	errno = ENOMSG;
-	/* LINTED interface problem */
-	return (char *) s;
-}
-
-int
-catclose(nl_catd catd)
-{
-	if (catd == NULL || catd == NLERR) {
-		errno = EBADF;
-		return (-1);
-	}
-
-	munmap(catd->__data, (size_t)catd->__size);
-	free(catd);
-	return (0);
-}
-
-/*
- * Internal support functions
- */
-
-static nl_catd
-load_msgcat(const char *path)
-{
-	struct stat st;
-	nl_catd catd;
-	void *data;
-	int fd;
-
-	/* XXX: path != NULL? */
-
-	if ((fd = _open(path, O_RDONLY)) == -1)
-		return (NLERR);
-
-	if (_fstat(fd, &st) != 0) {
-		_close(fd);
-		return (NLERR);
-	}
-
-	data = mmap(0, (size_t)st.st_size, PROT_READ, MAP_FILE|MAP_SHARED, fd,
-	    (off_t)0);
-	_close(fd);
-
-	if (data == MAP_FAILED)
-		return (NLERR);
-
-	if (ntohl((uint32_t)((struct _nls_cat_hdr *)data)->__magic) !=
-	    _NLS_MAGIC) {
-		munmap(data, (size_t)st.st_size);
-		NLRETERR(EINVAL);
-	}
-
-	if ((catd = malloc(sizeof (*catd))) == NULL) {
-		munmap(data, (size_t)st.st_size);
-		return (NLERR);
-	}
-
-	catd->__data = data;
-	catd->__size = (int)st.st_size;
-	return (catd);
-}
-
diff --git a/lib/libc/nls/pl_PL.ISO8859-2.msg b/lib/libc/nls/pl_PL.ISO8859-2.msg
deleted file mode 100644
index 43e944f..0000000
--- a/lib/libc/nls/pl_PL.ISO8859-2.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: src/lib/libc/nls/pl_PL.ISO8859-2.msg,v 1.1 2005/03/01 14:38:30 pjd Exp $
-$
-$ Message catalog for pl_PL.ISO8859-2 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operacja niedozwolona
-$ ENOENT
-2 Nie ma takiego pliku/katalogu
-$ ESRCH
-3 Nie ma takiego procesu
-$ EINTR
-4 Wywo�anie systemowe przerwane
-$ EIO
-5 B��d wej�cia/wyj�cia
-$ ENXIO
-6 Nieskonfigurowane urz�dzenie
-$ E2BIG
-7 Zbyt d�uga lista argument�w
-$ ENOEXEC
-8 B��dny format pliku wykonywalnego
-$ EBADF
-9 Z�y deskryptor pliku
-$ ECHILD
-10 Brak proces�w potomnych
-$ EDEADLK
-11 Unikni�to zakleszczenia zasob�w
-$ ENOMEM
-12 Brak pami�ci do przydzia�u
-$ EACCES
-13 Brak dost�pu
-$ EFAULT
-14 Z�y adres
-$ ENOTBLK
-15 Wymagane urz�dzenie blokowe
-$ EBUSY
-16 Urz�dzenie zaj�te
-$ EEXIST
-17 Plik istnieje
-$ EXDEV
-18 Dowi�zanie miedzy urz�dzeniami
-$ ENODEV
-19 Operacja nieobs�ugiwana przez urz�dzenie
-$ ENOTDIR
-20 To nie jest katalog
-$ EISDIR
-21 To jest katalog
-$ EINVAL
-22 B��dny argument
-$ ENFILE
-23 Zbyt wiele otwartych plik�w w systemie
-$ EMFILE
-24 Zbyt wiele otwartych plik�w
-$ ENOTTY
-25 Niew�a�ciwy dost�p do urz�dzenia
-$ ETXTBSY
-26 Plik wykonywalny jest zaj�ty
-$ EFBIG
-27 Zbyt du�y plik
-$ ENOSPC
-28 Brak miejsca na urz�dzeniu
-$ ESPIPE
-29 B��dne przesuni�cie
-$ EROFS
-30 System plik�w tylko do odczytu
-$ EMLINK
-31 Zbyt wiele dowi�za�
-$ EPIPE
-32 Potok przerwany
-$ EDOM
-33 Argument liczbowy z poza zakresu
-$ ERANGE
-34 Wynik z poza zakresu
-$ EAGAIN, EWOULDBLOCK
-35 Zasoby chwilowo niedost�pne
-$ EINPROGRESS
-36 Operacja jest w�a�nie wykonywana
-$ EALREADY
-37 Operacja jest ju� wykonywana
-$ ENOTSOCK
-38 Operacja na obiekcie, kt�ry nie jest gniazdem
-$ EDESTADDRREQ
-39 Wymagany adres przeznaczenia
-$ EMSGSIZE
-40 Wiadomo�� zbyt d�uga
-$ EPROTOTYPE
-41 Typ protoko�u nie pasuje do gniazda
-$ ENOPROTOOPT
-42 Protok� nie jest dost�pny
-$ EPROTONOSUPPORT
-43 Nieobs�ugiwany protok�
-$ ESOCKTNOSUPPORT
-44 Nieobs�ugiwany typ gniazda
-$ EOPNOTSUPP
-45 Nieobs�ugiwana operacja
-$ EPFNOSUPPORT
-46 Nieobs�ugiwana rodzina protoko��w
-$ EAFNOSUPPORT
-47 Rodzina adres�w nie jest obs�ugiwana przez rodzin� protoko��w
-$ EADDRINUSE
-48 Adres jest ju� w u�yciu
-$ EADDRNOTAVAIL
-49 Adres nie mo�e by� przydzielony
-$ ENETDOWN
-50 Sie� nie dzia�a
-$ ENETUNREACH
-51 Sie� jest niedost�pna
-$ ENETRESET
-52 Sie� przerwa�a po��czenie po resecie
-$ ECONNABORTED
-53 Oprogramowanie spowodowa�o przerwanie po��czenia
-$ ECONNRESET
-54 Po��czenie zerwane przez drug� stron�
-$ ENOBUFS
-55 Brak miejsca w buforze
-$ EISCONN
-56 Gniazdo jest ju� po��czone
-$ ENOTCONN
-57 Gniazdo nie jest po��czone
-$ ESHUTDOWN
-58 Nie mo�na wysy�a� po zamkni�ciu gniazda
-$ ETOOMANYREFS
-59 Za du�o powi�za�: dowi�zanie niemo�liwe
-$ ETIMEDOUT
-60 Limit czasu operacji przekroczony
-$ ECONNREFUSED
-61 Po��czenie odrzucone
-$ ELOOP
-62 Zbyt wiele wzajemnych dowi�za� symbolicznych
-$ ENAMETOOLONG
-63 Zbyt d�uga nazwa pliku
-$ EHOSTDOWN
-64 Host jest wy��czony
-$ EHOSTUNREACH
-65 Brak drogi do hosta
-$ ENOTEMPTY
-66 Katalog nie jest pusty
-$ EPROCLIM
-67 Zbyt wiele proces�w
-$ EUSERS
-68 Zbyt wielu u�ytkownik�w
-$ EDQUOT
-69 Przekroczono limit miejsca na dysku
-$ ESTALE
-70 Uchwyt pliku NFS jest nieaktualny
-$ EREMOTE
-71 Zbyt wiele poziom�w zagnie�d�enia w �cie�ce
-$ EBADRPC
-72 RPC b��dna struktura
-$ ERPCMISMATCH
-73 RPC niekompatybilna wersja
-$ EPROGUNAVAIL
-74 RPC program niedost�pny
-$ EPROGMISMATCH
-75 Nieobs�ugiwana wersja programu
-$ EPROCUNAVAIL
-76 Nieobs�ugiwana procedura
-$ ENOLCK
-77 Wyczerpany limit blokad
-$ ENOSYS
-78 Nieobs�ugiwana funkcja
-$ EFTYPE
-79 Niew�a�ciwy typ lub format pliku
-$ EAUTH
-80 B��d uwierzytelnienia
-$ ENEEDAUTH
-81 Wymagane uwierzytelnienie
-$ EIDRM
-82 Identyfikator zosta� usuni�ty
-$ ENOMSG
-83 Brak komunikatu po��danego typu
-$ EOVERFLOW
-84 Warto�� zbyt du�a dla zdefiniowanego typu danych
-$ ECANCELED
-85 Operacja anulowana
-$ EILSEQ
-86 B��dna sekwencja bajt�w
-$ ENOATTR
-87 Nie znaleziono atrybutu
-$ EDOOFUS
-88 Wewn�trzny b��d programu
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Roz��czenie
-$ SIGINT
-2 Przerwanie
-$ SIGQUIT
-3 Wyj�cie
-$ SIGILL
-4 Nieznana instrukcja
-$ SIGTRAP
-5 Pu�apka debuggera/BPT
-$ SIGABRT
-6 Przerwana pu�apka
-$ SIGEMT
-7 Pu�apka EMT
-$ SIGFPE
-8 B��d w obliczeniach zmiennoprzecinkowych
-$ SIGKILL
-9 Unicestwiony
-$ SIGBUS
-10 B��d szyny
-$ SIGSEGV
-11 Naruszenie ochrony pami�ci
-$ SIGSYS
-12 B��dne wywo�anie systemowe
-$ SIGPIPE
-13 Przerwany potok
-$ SIGALRM
-14 Budzik
-$ SIGTERM
-15 Zako�czony
-$ SIGURG
-16 Nag�y wypadek I/O
-$ SIGSTOP
-17 Zatrzymany (sygna�)
-$ SIGTSTP
-18 Zatrzymany
-$ SIGCONT
-19 Kontynuacja
-$ SIGCHLD
-20 Proces potomny zako�czy� prac�
-$ SIGTTIN
-21 Zatrzymany (wej�cie z tty)
-$ SIGTTOU
-22 Zatrzymany (wyj�cie z tty)
-$ SIGIO
-23 Wej/Wyj dozwolone
-$ SIGXCPU
-24 Przekroczony limit czasu procesora
-$ SIGXFSZ
-25 Przekroczony limit wielko�ci pliku
-$ SIGVTALRM
-26 Alarm stopera wirtualnego
-$ SIGPROF
-27 Alarm stopera profiluj�cego
-$ SIGWINCH
-28 Zmiana rozmiaru okna
-$ SIGINFO
-29 ��danie informacji
-$ SIGUSR1
-30 Sygna� u�ytkownika 1
-$ SIGUSR2
-31 Sygna� u�ytkownika 2
diff --git a/lib/libc/nls/ru_RU.KOI8-R.msg b/lib/libc/nls/ru_RU.KOI8-R.msg
deleted file mode 100644
index 8400fca..0000000
--- a/lib/libc/nls/ru_RU.KOI8-R.msg
+++ /dev/null
@@ -1,256 +0,0 @@
-$ $FreeBSD: src/lib/libc/nls/ru_RU.KOI8-R.msg,v 1.1 2005/02/27 18:09:09 phantom Exp $
-$
-$ Message catalog for ru_RU.KOI8-R locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 �������� �� ���������
-$ ENOENT
-2 ��� ������ ����� ��� ��������
-$ ESRCH
-3 ��� ������ ��������
-$ EINTR
-4 ���������� ��������� �����
-$ EIO
-5 ������ �����/������
-$ ENXIO
-6 ���������� �� ����������������
-$ E2BIG
-7 ������� ������� ������ ����������
-$ ENOEXEC
-8 ������ ������� ������������ �����
-$ EBADF
-9 ������������ ���������� �����
-$ ECHILD
-10 ��� ����������� ���������
-$ EDEADLK
-11 ������������� �������� ���������� ��� ������� � �������
-$ ENOMEM
-12 ���������� �������� ������
-$ EACCES
-13 ������������ ����������
-$ EFAULT
-14 ������������ �����
-$ ENOTBLK
-15 ���������� ������� ������� ����������
-$ EBUSY
-16 ���������� ������
-$ EEXIST
-17 ���� ����������
-$ EXDEV
-18 ������ �� ������ ����������
-$ ENODEV
-19 �������� �� �������������� �����������
-$ ENOTDIR
-20 ��������� ���� �� �������� ���������
-$ EISDIR
-21 ��������� ���� �������� ���������
-$ EINVAL
-22 ������������ ��������
-$ ENFILE
-23 ������� ����� �������� ������ � �������
-$ EMFILE
-24 ������� ����� �������� ������
-$ ENOTTY
-25 ����� ioctl �� �������������� �����������
-$ ETXTBSY
-26 ��������� ���� �����
-$ EFBIG
-27 ������� ������� ����
-$ ENOSPC
-28 �� ���������� �� �������� �����
-$ ESPIPE
-29 ������������ ��������
-$ EROFS
-30 �������� ������� ������ ��� ������
-$ EMLINK
-31 ������� ����� ������
-$ EPIPE
-$ XXX???
-32 ����� ��������
-$ EDOM
-33 ������������ �������� ��������� ���������
-$ ERANGE
-34 ������� ������� ���������
-$ EAGAIN, EWOULDBLOCK
-35 ������ �������� ����������
-$ EINPROGRESS
-36 �������� � �������� ����������
-$ EALREADY
-$ XXX???
-37 �������� ��� �����������
-$ ENOTSOCK
-38 �������� � ������� ��������� �� � ������
-$ EDESTADDRREQ
-39 ��������� ������� �����
-$ EMSGSIZE
-40 ������� ������� ���������
-$ EPROTOTYPE
-41 �������� ��� ��������� ��� ������
-$ ENOPROTOOPT
-42 �������� ����������
-$ EPROTONOSUPPORT
-43 �������� �� ��������������
-$ ESOCKTNOSUPPORT
-44 ���� ��� ������ �� ��������������
-$ EOPNOTSUPP
-45 �������� �� ��������������
-$ EPFNOSUPPORT
-46 ��������� ���������� �� ��������������
-$ EAFNOSUPPORT
-47 ��������� ������� �� �������������� ���������� ����������
-$ EADDRINUSE
-48 ����� ��� ������������
-$ EADDRNOTAVAIL
-49 �� ���� ��������� ��������� �����
-$ ENETDOWN
-50 ���� �� ��������
-$ ENETUNREACH
-51 ���� �����������
-$ ENETRESET
-52 ���� ������� ����������� ��� ������
-$ ECONNABORTED
-53 ��������� ������� ��������� ����������� �����������
-$ ECONNRESET
-54 ����������� �������� ��������������� �������
-$ ENOBUFS
-55 �� �������� ����� ��� �����
-$ EISCONN
-56 ����� ��� ���������
-$ ENOTCONN
-57 ����� �� ���������
-$ ESHUTDOWN
-58 �� ���� ������� ����� �������� ������
-$ ETOOMANYREFS
-59 ������� ����� ������: �� ���� ���������
-$ ETIMEDOUT
-60 �������� ��������� ����� �������
-$ ECONNREFUSED
-61 ����������� ����������
-$ ELOOP
-62 ������� ����� ������� ���������� ������
-$ ENAMETOOLONG
-63 ������� ������� ��� �����
-$ EHOSTDOWN
-64 ���� �� ��������
-$ EHOSTUNREACH
-65 ��� �������� � �����
-$ ENOTEMPTY
-66 ������� �� ����
-$ EPROCLIM
-67 ������� ����� ���������
-$ EUSERS
-68 ������� ����� �������������
-$ EDQUOT
-69 ����������� �������� �����
-$ ESTALE
-70 ���������� ��������� ����� NFS
-$ EREMOTE
-71 ������� ����� ������������� ��������� � ����
-$ EBADRPC
-72 ������������ ��������� RPC
-$ ERPCMISMATCH
-73 �������� ������ RPC
-$ EPROGUNAVAIL
-74 ��������� RPC ����������
-$ EPROGMISMATCH
-75 �������� ������ ���������
-$ EPROCUNAVAIL
-76 ������������ ��������� ��� ���������
-$ ENOLCK
-77 ���������� ����������
-$ ENOSYS
-78 ������� �� �����������
-$ EFTYPE
-79 ������������ ��� ��� ������ �����
-$ EAUTH
-80 ������ ��������������
-$ ENEEDAUTH
-81 ���������� �������������
-$ EIDRM
-82 ������������� ������
-$ ENOMSG
-83 ��� ��������� ���������� ����
-$ EOVERFLOW
-84 ������� ������� �������� ��� �������� � ��������� ���� ������
-$ ECANCELED
-85 �������� ��������
-$ EILSEQ
-86 ������������ ������������������ ������
-$ ENOATTR
-87 �������� �� ������
-$ EDOOFUS
-88 ������ ���������������
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-$ XXX: ����������?
-1 ������ �����
-$ SIGINT
-2 ���������� �� �������
-$ SIGQUIT
-3 �����
-$ SIGILL
-4 ������������ ����������
-$ SIGTRAP
-5 ������� �����������/����� ��������
-$ SIGABRT
-$ XXX: ��������� ����������
-6 ������� ���������� �����������
-$ SIGEMT
-7 ������� EMT
-$ SIGFPE
-$ XXX: ������ �������� � ��������� ������?
-8 ������ ��� ������ � ������������ ������
-$ SIGKILL
-$ XXX: ����
-9 ������������� ���������
-$ SIGBUS
-$ XXX: ������ ��������� �� ����
-10 ������ ����
-$ SIGSEGV
-11 ������ �����������
-$ SIGSYS
-12 ������������ ��������� �����
-$ SIGPIPE
-13 ����� ��������
-$ SIGALRM
-14 �������� ������
-$ SIGTERM
-15 ��������
-$ SIGURG
-16 ��������� ������� ����-�����
-$ SIGSTOP
-17 ������������ (������)
-$ SIGTSTP
-18 ������������
-$ SIGCONT
-19 ����������� ������
-$ SIGCHLD
-20 ��������� ������ ������������ ��������
-$ SIGTTIN
-21 ���������� (���� � ���������)
-$ SIGTTOU
-22 ���������� (����� �� ��������)
-$ SIGIO
-23 ����-����� ��������
-$ SIGXCPU
-24 ��������� ����������� ������������� �������
-$ SIGXFSZ
-25 �������� ������������ ������ �����
-$ SIGVTALRM
-26 ����� ����������� ������
-$ SIGPROF
-27 ����� ������ ��������������
-$ SIGWINCH
-28 ��������� ������� ����
-$ SIGINFO
-29 ������ ����������
-$ SIGUSR1
-30 ���������������� ������ 1
-$ SIGUSR2
-31 ���������������� ������ 2
diff --git a/lib/libc/posix1e/Makefile b/lib/libc/posix1e/Makefile
deleted file mode 100644
index 0b709d8..0000000
--- a/lib/libc/posix1e/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = acl_calc_mask.o acl_copy.o acl_delete.o acl_delete_entry.o acl_entry.o acl_free.o acl_from_text.o acl_get.o acl_init.o acl_perm.o acl_set.o acl_size.o acl_support.o acl_to_text.o acl_valid.o extattr.o mac.o mac_exec.o mac_get.o mac_set.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/posix1e/Makefile.incl b/lib/libc/posix1e/Makefile.incl
deleted file mode 100644
index b09921e..0000000
--- a/lib/libc/posix1e/Makefile.incl
+++ /dev/null
@@ -1,124 +0,0 @@
-Makefile.incl 209147 2010-06-14 02:26:13Z kientzle $
-
-.PATH: ${.CURDIR}/posix1e
-
-CFLAGS+=-D_ACL_PRIVATE
-
-# Copy kern/subr_acl_nfs4.c to the libc object directory.
-subr_acl_nfs4.c: ${.CURDIR}/../../sys/kern/subr_acl_nfs4.c
-	cat ${.ALLSRC} > ${.TARGET}
-
-SRCS+=	acl_branding.c			\
-	acl_calc_mask.c			\
-	acl_copy.c			\
-	acl_compat.c			\
-	acl_delete.c			\
-	acl_delete_entry.c		\
-	acl_entry.c			\
-	acl_flag.c			\
-	acl_free.c			\
-	acl_from_text.c			\
-	acl_from_text_nfs4.c		\
-	acl_get.c			\
-	acl_id_to_name.c		\
-	acl_init.c			\
-	acl_perm.c			\
-	acl_set.c			\
-	acl_strip.c			\
-	acl_support.c			\
-	acl_support_nfs4.c		\
-	acl_to_text.c			\
-	acl_to_text_nfs4.c		\
-	acl_valid.c			\
-	extattr.c			\
-	mac.c				\
-	mac_exec.c			\
-	mac_get.c			\
-	mac_set.c			\
-	subr_acl_nfs4.c
-
-SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map
-
-MAN+=	acl.3				\
-	acl_add_flag_np.3		\
-	acl_add_perm.3			\
-	acl_calc_mask.3			\
-	acl_clear_flags_np.3		\
-	acl_clear_perms.3		\
-	acl_copy_entry.3		\
-	acl_create_entry.3		\
-	acl_delete.3			\
-	acl_delete_entry.3		\
-	acl_delete_flag_np.3		\
-	acl_delete_perm.3		\
-	acl_dup.3			\
-	acl_free.3			\
-	acl_from_text.3			\
-	acl_get.3			\
-	acl_get_brand_np.3		\
-	acl_get_entry.3			\
-	acl_get_entry_type_np.3		\
-	acl_get_flagset_np.3		\
-	acl_get_flag_np.3		\
-	acl_get_permset.3		\
-	acl_get_perm_np.3		\
-	acl_get_qualifier.3		\
-	acl_get_tag_type.3		\
-	acl_init.3			\
-	acl_is_trivial_np.3		\
-	acl_set.3			\
-	acl_set_entry_type_np.3		\
-	acl_set_flagset_np.3		\
-	acl_set_permset.3		\
-	acl_set_qualifier.3		\
-	acl_set_tag_type.3		\
-	acl_strip_np.3			\
-	acl_to_text.3			\
-	acl_valid.3			\
-	extattr.3			\
-	mac.3				\
-	mac.conf.5			\
-	mac_free.3			\
-	mac_is_present.3		\
-	mac_get.3			\
-	mac_prepare.3			\
-	mac_set.3			\
-	mac_text.3			\
-	posix1e.3
-
-MLINKS+=acl_create_entry.3 acl_create_entry_np.3\
-	acl_delete.3 acl_delete_def_file.3	\
-	acl_delete.3 acl_delete_file_np.3	\
-	acl_delete.3 acl_delete_fd_np.3		\
-	acl_delete_entry.3 acl_delete_entry_np.3\
-	acl_get.3 acl_get_file.3		\
-	acl_get.3 acl_get_fd.3			\
-	acl_get.3 acl_get_fd_np.3		\
-	acl_get.3 acl_get_link_np.3		\
-	acl_set.3 acl_set_file.3		\
-	acl_set.3 acl_set_fd.3			\
-	acl_set.3 acl_set_fd_np.3		\
-	acl_set.3 acl_set_link_np.3		\
-	acl_to_text.3 acl_to_text_np.3		\
-	acl_valid.3 acl_valid_file_np.3		\
-	acl_valid.3 acl_valid_fd_np.3		\
-	extattr.3 extattr_namespace_to_string.3	\
-	extattr.3 extattr_string_to_namespace.3 \
-	mac_get.3 mac_get_fd.3			\
-	mac_get.3 mac_get_file.3		\
-	mac_get.3 mac_get_link.3		\
-	mac_get.3 mac_get_peer.3		\
-	mac_get.3 mac_get_pid.3			\
-	mac_get.3 mac_get_proc.3		\
-	mac_prepare.3 mac_prepare_file_label.3	\
-	mac_prepare.3 mac_prepare_ifnet_label.3	\
-	mac_prepare.3 mac_prepare_process_label.3	\
-	mac_prepare.3 mac_prepare_type.3	\
-	mac_set.3 mac_set_fd.3			\
-	mac_set.3 mac_set_file.3		\
-	mac_set.3 mac_set_link.3		\
-	mac_set.3 mac_set_proc.3		\
-	mac_text.3 mac_from_text.3		\
-	mac_text.3 mac_to_text.3
-
-CLEANFILES+=	subr_acl_nfs4.c
diff --git a/lib/libc/posix1e/Symbol.map b/lib/libc/posix1e/Symbol.map
deleted file mode 100644
index 854e350..0000000
--- a/lib/libc/posix1e/Symbol.map
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/posix1e/Symbol.map 194955 2009-06-25 12:46:59Z trasz $
- */
-
-FBSD_1.0 {
-	acl_calc_mask;
-	acl_copy_entry;
-	acl_copy_ext;
-	acl_copy_int;
-	acl_delete_def_file;
-	acl_delete_def_link_np;
-	acl_delete_file_np;
-	acl_delete_link_np;
-	acl_delete_fd_np;
-	acl_delete_entry;
-	acl_create_entry;
-	acl_get_entry;
-	acl_free;
-	acl_from_text;
-	acl_get_file;
-	acl_get_link_np;
-	acl_get_fd;
-	acl_get_fd_np;
-	acl_get_permset;
-	acl_get_qualifier;
-	acl_get_tag_type;
-	acl_init;
-	acl_dup;
-	acl_clear_perms;
-	acl_set_file;
-	acl_set_link_np;
-	acl_set_fd;
-	acl_set_fd_np;
-	acl_set_permset;
-	acl_set_qualifier;
-	acl_set_tag_type;
-	acl_to_text;
-	acl_valid;
-	acl_valid_file_np;
-	acl_valid_link_np;
-	acl_valid_fd_np;
-	extattr_namespace_to_string;
-	extattr_string_to_namespace;
-	mac_reload;
-	mac_free;
-	mac_from_text;
-	mac_to_text;
-	mac_prepare;
-	mac_prepare_type;
-	mac_prepare_ifnet_label;
-	mac_prepare_file_label;
-	mac_prepare_packet_label;
-	mac_prepare_process_label;
-	mac_is_present;
-	mac_execve;
-	mac_get_fd;
-	mac_get_file;
-	mac_get_link;
-	mac_get_peer;
-	mac_get_pid;
-	mac_get_proc;
-	mac_set_fd;
-	mac_set_file;
-	mac_set_link;
-	mac_set_proc;
-};
-
-FBSD_1.1 {
-	acl_add_flag_np;
-	acl_add_perm;
-	acl_clear_flags_np;
-	acl_create_entry_np;
-	acl_delete_entry_np;
-	acl_delete_flag_np;
-	acl_delete_perm;
-	acl_get_brand_np;
-	acl_get_entry_type_np;
-	acl_get_flag_np;
-	acl_get_flagset_np;
-	acl_get_perm_np;
-	acl_is_trivial_np;
-	acl_set_entry_type_np;
-	acl_set_flagset_np;
-	acl_strip_np;
-	acl_to_text_np;
-};
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
deleted file mode 100644
index 4490d10..0000000
--- a/lib/libc/posix1e/acl.3
+++ /dev/null
@@ -1,307 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl.3 275254 2014-11-29 15:51:48Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL 3
-.Os
-.Sh NAME
-.Nm acl
-.Nd introduction to the POSIX.1e/NFSv4 ACL security API
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Sh DESCRIPTION
-.Fx
-permits file systems to export Access Control Lists via the VFS, and
-provides a library for userland access to and manipulation of these ACLs.
-.Fx
-supports POSIX.1e and NFSv4 ACLs, but
-not all file systems provide support for ACLs, and some may require that
-ACL support be explicitly enabled by the administrator.
-The library calls include routines to allocate, duplicate, retrieve, set,
-and validate ACLs associated with file objects.
-As well as the POSIX.1e routines, there are a number of non-portable
-extensions defined that allow for ACL semantics alternative to
-POSIX.1e, such as NFSv4.
-Where routines are non-standard, they are suffixed with _np to indicate that
-they are not portable.
-.Pp
-POSIX.1e describes a set of ACL manipulation routines to manage the
-contents of ACLs, as well as their relationships with files; almost
-all of these support routines are implemented in
-.Fx .
-.Pp
-Available functions, sorted by behavior, include:
-.Bl -tag -width indent
-.It Fn acl_add_flag_np
-This function is described in
-.Xr acl_add_flag_np 3 ,
-and may be used to add flags to a flagset.
-.It Fn acl_add_perm
-This function is described in
-.Xr acl_add_perm 3 ,
-and may be used to add permissions to a permission set.
-.It Fn acl_calc_mask
-This function is described in
-.Xr acl_calc_mask 3 ,
-and may be used to calculate and set the permissions associated with
-the
-.Dv ACL_MASK
-entry.
-.It Fn acl_clear_flags_np
-This function is described in
-.Xr acl_clear_flags_np 3 ,
-and may be used to clear all flags from a flagset.
-.It Fn acl_clear_perms
-This function is described in
-.Xr acl_clear_perms 3 ,
-and may be used to clear all permissions from a permission set.
-.It Fn acl_copy_entry
-This function is described in
-.Xr acl_copy_entry 3 ,
-and may be used to copy the contents of an ACL entry.
-.It Xo
-.Fn acl_create_entry ,
-.Fn acl_create_entry_np
-.Xc
-These functions are described in
-.Xr acl_create_entry 3 ,
-and may be used to create an empty entry in an ACL.
-.It Xo
-.Fn acl_delete_def_file ,
-.Fn acl_delete_def_link_np ,
-.Fn acl_delete_fd_np ,
-.Fn acl_delete_file_np ,
-.Fn acl_delete_link_np
-.Xc
-These functions are described in
-.Xr acl_delete 3 ,
-and may be used to delete ACLs from file system objects.
-.It Xo
-.Fn acl_delete_entry ,
-.Fn acl_delete_entry_np ,
-.Xc
-This functions are described in
-.Xr acl_delete_entry 3 ,
-and may be used to delete an entry from an ACL.
-.It Fn acl_delete_flag_np
-This function is described in
-.Xr acl_delete_flag_np 3 ,
-and may be used to delete flags from a flagset.
-.It Fn acl_delete_perm
-This function is described in
-.Xr acl_delete_perm 3 ,
-and may be used to delete permissions from a permset.
-.It Fn acl_dup
-This function is described in
-.Xr acl_dup 3 ,
-and may be used to duplicate an ACL structure.
-.It Fn acl_free
-This function is described in
-.Xr acl_free 3 ,
-and may be used to free userland working ACL storage.
-.It Fn acl_from_text
-This function is described in
-.Xr acl_from_text 3 ,
-and may be used to convert a text-form ACL into working ACL state, if
-the ACL has POSIX.1e or NFSv4 semantics.
-.It Fn acl_get_brand_np
-This function is described in
-.Xr acl_get_brand_np 3
-and may be used to determine whether the ACL has POSIX.1e or NFSv4 semantics.
-.It Fn acl_get_entry
-This function is described in
-.Xr acl_get_entry 3 ,
-and may be used to retrieve a designated ACL entry from an ACL.
-.It Xo
-.Fn acl_get_fd ,
-.Fn acl_get_fd_np ,
-.Fn acl_get_file ,
-.Fn acl_get_link_np
-.Xc
-These functions are described in
-.Xr acl_get 3 ,
-and may be used to retrieve ACLs from file system objects.
-.It Fn acl_get_entry_type_np
-This function is described in
-.Xr acl_get_entry_type_np 3 ,
-and may be used to retrieve an ACL type from an ACL entry.
-.It Fn acl_get_flagset_np
-This function is described in
-.Xr acl_get_flagset_np 3 ,
-and may be used to retrieve a flagset from an ACL entry.
-.It Fn acl_get_permset
-This function is described in
-.Xr acl_get_permset 3 ,
-and may be used to retrieve a permset from an ACL entry.
-.It Fn acl_get_qualifier
-This function is described in
-.Xr acl_get_qualifier 3 ,
-and may be used to retrieve the qualifier from an ACL entry.
-.It Fn acl_get_tag_type
-This function is described in
-.Xr acl_get_tag_type 3 ,
-and may be used to retrieve the tag type from an ACL entry.
-.It Fn acl_init
-This function is described in
-.Xr acl_init 3 ,
-and may be used to allocate a fresh (empty) ACL structure.
-.It Fn acl_is_trivial_np
-This function is described in
-.Xr acl_is_trivial_np 3 ,
-and may be used to find out whether ACL is trivial.
-.It Xo
-.Fn acl_set_fd ,
-.Fn acl_set_fd_np ,
-.Fn acl_set_file ,
-.Fn acl_set_link_np
-.Xc
-These functions are described in
-.Xr acl_set 3 ,
-and may be used to assign an ACL to a file system object.
-.It Fn acl_set_entry_type_np
-This function is described in
-.Xr acl_set_entry_type_np 3 ,
-and may be used to set the ACL type of an ACL entry.
-.It Fn acl_set_flagset_np
-This function is described in
-.Xr acl_set_flagset_np 3 ,
-and may be used to set the flags of an ACL entry from a flagset.
-.It Fn acl_set_permset
-This function is described in
-.Xr acl_set_permset 3 ,
-and may be used to set the permissions of an ACL entry from a permset.
-.It Fn acl_set_qualifier
-This function is described in
-.Xr acl_set_qualifier 3 ,
-and may be used to set the qualifier of an ACL.
-.It Fn acl_set_tag_type
-This function is described in
-.Xr acl_set_tag_type 3 ,
-and may be used to set the tag type of an ACL.
-.It Fn acl_strip_np
-This function is described in
-.Xr acl-strip_np 3 ,
-and may be used to remove extended entries from an ACL.
-.It Xo
-.Fn acl_to_text ,
-.Fn acl_to_text_np
-.Xc
-These functions are described in
-.Xr acl_to_text 3 ,
-and may be used to generate a text-form of a POSIX.1e or NFSv4 semantics ACL.
-.It Xo
-.Fn acl_valid ,
-.Fn acl_valid_fd_np ,
-.Fn acl_valid_file_np ,
-.Fn acl_valid_link_np
-.Xc
-These functions are described in
-.Xr acl_valid 3 ,
-and may be used to validate an ACL as correct POSIX.1e-semantics, or
-as appropriate for a particular file system object regardless of semantics.
-.El
-.Pp
-Documentation of the internal kernel interfaces backing these calls may
-be found in
-.Xr acl 9 .
-The syscalls between the internal interfaces and the public library
-routines may change over time, and as such are not documented.
-They are not intended to be called directly without going through the
-library.
-.Sh SEE ALSO
-.Xr getfacl 1 ,
-.Xr setfacl 1 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_calc_mask 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_copy_entry 3 ,
-.Xr acl_create_entry 3 ,
-.Xr acl_delete_entry 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_dup 3 ,
-.Xr acl_free 3 ,
-.Xr acl_from_text 3 ,
-.Xr acl_get 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_get_entry_type_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_get_qualifier 3 ,
-.Xr acl_get_tag_type 3 ,
-.Xr acl_init 3 ,
-.Xr acl_is_trivial_np 3 ,
-.Xr acl_set 3 ,
-.Xr acl_set_entry_type_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr acl_set_permset 3 ,
-.Xr acl_set_qualifier 3 ,
-.Xr acl_set_tag_type 3 ,
-.Xr acl_strip_np 3 ,
-.Xr acl_to_text 3 ,
-.Xr acl_valid 3 ,
-.Xr posix1e 3 ,
-.Xr acl 9
-.Sh STANDARDS
-POSIX.1e assigns security labels to all objects, extending the security
-functionality described in POSIX.1.
-These additional labels provide fine-grained discretionary access control,
-fine-grained capabilities, and labels necessary for mandatory access
-control.
-POSIX.2c describes a set of userland utilities for manipulating these
-labels.
-.Pp
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft continues on the cross-platform POSIX.1e
-implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ;
-.Fx 5.0
-was the first version to include a complete ACL implementation based
-on extended attributes for the UFS and UFS2 file systems.
-NFSv4 ACL support was introduced in
-.Fx 8.0 .
-.Pp
-The
-.Xr getfacl 1
-and
-.Xr setfacl 1
-utilities describe the user tools that permit direct manipulation of complete
-file ACLs.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc/posix1e/acl_add_flag_np.3 b/lib/libc/posix1e/acl_add_flag_np.3
deleted file mode 100644
index 5c6d85b..0000000
--- a/lib/libc/posix1e/acl_add_flag_np.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_add_flag_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_ADD_FLAG_NP 3
-.Os
-.Sh NAME
-.Nm acl_add_flag_np
-.Nd add flags to a flagset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_add_flag_np "acl_flagset_t flagset_d" "acl_flag_t flag"
-.Sh DESCRIPTION
-The
-.Fn acl_add_flag_np
-function
-is a non-portable call that adds the NFSv4 ACL flags contained in
-.Fa flags
-to the flagset
-.Fa flagset_d .
-.Pp
-Note: it is not considered an error to attempt to add flags
-that already exist in the flagset.
-.Pp
-Valid values are:
-.Bl -column -offset 3n "ACL_ENTRY_NO_PROPAGATE_INHERIT"
-.It ACL_ENTRY_FILE_INHERIT Ta "Will be inherited by files."
-.It ACL_ENTRY_DIRECTORY_INHERIT Ta "Will be inherited by directories."
-.It ACL_ENTRY_NO_PROPAGATE_INHERIT Ta "Will not propagate."
-.It ACL_ENTRY_INHERIT_ONLY Ta "Inherit-only."
-.El
-.Sh RETURN VALUES
-.Rv -std acl_add_flag_np
-.Sh ERRORS
-The
-.Fn acl_add_flag_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa flagset_d
-is not a valid descriptor for a flagset within an ACL entry.
-Argument
-.Fa flag
-does not contain a valid
-.Vt acl_flag_t
-value.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_add_flag_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_add_flag_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_add_perm.3 b/lib/libc/posix1e/acl_add_perm.3
deleted file mode 100644
index 905c9e7..0000000
--- a/lib/libc/posix1e/acl_add_perm.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_add_perm.3 233665 2012-03-29 16:02:40Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_ADD_PERM 3
-.Os
-.Sh NAME
-.Nm acl_add_perm
-.Nd add permissions to a permission set
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_add_perm "acl_permset_t permset_d" "acl_perm_t perm"
-.Sh DESCRIPTION
-The
-.Fn acl_add_perm
-function
-is a POSIX.1e call that adds the permission contained in
-.Fa perm
-to the permission set
-.Fa permset_d .
-.Pp
-Note: it is not considered an error to attempt to add permissions
-that already exist in the permission set.
-.Pp
-For POSIX.1e ACLs, valid values are:
-.Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS"
-.It ACL_EXECUTE	Execute permission
-.It ACL_WRITE	Write permission
-.It ACL_READ	Read permission
-.El
-.Pp
-For NFSv4 ACLs, valid values are:
-.Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS"
-.It ACL_READ_DATA Ta "Read permission"
-.It ACL_LIST_DIRECTORY Ta "Same as ACL_READ_DATA"
-.It ACL_WRITE_DATA Ta "Write permission, or permission to create files"
-.It ACL_ADD_FILE Ta "Same as ACL_READ_DATA"
-.It ACL_APPEND_DATA Ta "Permission to create directories.  Ignored for files"
-.It ACL_ADD_SUBDIRECTORY Ta "Same as ACL_APPEND_DATA"
-.It ACL_READ_NAMED_ATTRS Ta "Ignored"
-.It ACL_WRITE_NAMED_ATTRS Ta "Ignored"
-.It ACL_EXECUTE Ta "Execute permission"
-.It ACL_DELETE_CHILD Ta "Permission to delete files and subdirectories"
-.It ACL_READ_ATTRIBUTES Ta "Permission to read basic attributes"
-.It ACL_WRITE_ATTRIBUTES Ta "Permission to change basic attributes"
-.It ACL_DELETE Ta "Permission to delete the object this ACL is placed on"
-.It ACL_READ_ACL Ta "Permission to read ACL"
-.It ACL_WRITE_ACL Ta "Permission to change the ACL and file mode"
-.It ACL_SYNCHRONIZE Ta "Ignored"
-.El
-.Pp
-Calling
-.Fn acl_add_perm
-with
-.Fa perm
-equal to ACL_WRITE or ACL_READ brands the ACL as POSIX.
-Calling it with ACL_READ_DATA, ACL_LIST_DIRECTORY, ACL_WRITE_DATA,
-ACL_ADD_FILE, ACL_APPEND_DATA, ACL_ADD_SUBDIRECTORY, ACL_READ_NAMED_ATTRS,
-ACL_WRITE_NAMED_ATTRS, ACL_DELETE_CHILD, ACL_READ_ATTRIBUTES,
-ACL_WRITE_ATTRIBUTES, ACL_DELETE, ACL_READ_ACL, ACL_WRITE_ACL
-or ACL_SYNCHRONIZE brands the ACL as NFSv4.
-.Sh RETURN VALUES
-.Rv -std acl_add_perm
-.Sh ERRORS
-The
-.Fn acl_add_perm
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa permset_d
-is not a valid descriptor for a permission set within an ACL entry.
-Argument
-.Fa perm
-does not contain a valid
-.Vt acl_perm_t
-value.
-ACL is already branded differently.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_add_perm
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_add_perm
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_branding.c b/lib/libc/posix1e/acl_branding.c
deleted file mode 100644
index f44a55d..0000000
--- a/lib/libc/posix1e/acl_branding.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_branding.c 208034 2010-05-13 16:44:27Z trasz $");
-
-#include <assert.h>
-#include <errno.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-/*
- * An ugly detail of the implementation - fortunately not visible
- * to the API users - is the "branding": libc needs to keep track
- * of what "brand" ACL is: NFSv4, POSIX.1e or unknown.  It happens
- * automatically - for example, during acl_get_file(3) ACL gets
- * branded according to the "type" argument; during acl_set_permset
- * ACL, if its brand is unknown it gets branded as NFSv4 if any of the
- * NFSv4 permissions that are not valid for POSIX.1e ACL are set etc.
- * Branding information is used for printing out the ACL (acl_to_text(3)),
- * veryfying acl_set_whatever arguments (checking against setting
- * bits that are valid only for NFSv4 in ACL branded as POSIX.1e) etc.
- */
-
-static acl_t
-entry2acl(acl_entry_t entry)
-{
-	acl_t aclp;
-
-	aclp = (acl_t)(((long)entry >> _ACL_T_ALIGNMENT_BITS) << _ACL_T_ALIGNMENT_BITS);
-
-	return (aclp);
-}
-
-/*
- * Return brand of an ACL.
- */
-int
-_acl_brand(const acl_t acl)
-{
-
-	return (acl->ats_brand);
-}
-
-int
-_entry_brand(const acl_entry_t entry)
-{
-
-	return (_acl_brand(entry2acl(entry)));
-}
-
-/*
- * Return 1, iff branding ACL as "brand" is ok.
- */
-int
-_acl_brand_may_be(const acl_t acl, int brand)
-{
-
-	if (_acl_brand(acl) == ACL_BRAND_UNKNOWN)
-		return (1);
-
-	if (_acl_brand(acl) == brand)
-		return (1);
-
-	return (0);
-}
-
-int
-_entry_brand_may_be(const acl_entry_t entry, int brand)
-{
-
-	return (_acl_brand_may_be(entry2acl(entry), brand));
-}
-
-/*
- * Brand ACL as "brand".
- */
-void
-_acl_brand_as(acl_t acl, int brand)
-{
-
-	assert(_acl_brand_may_be(acl, brand));
-
-	acl->ats_brand = brand;
-}
-
-void
-_entry_brand_as(const acl_entry_t entry, int brand)
-{
-
-	_acl_brand_as(entry2acl(entry), brand);
-}
-
-int
-_acl_type_not_valid_for_acl(const acl_t acl, acl_type_t type)
-{
-
-	switch (_acl_brand(acl)) {
-	case ACL_BRAND_NFS4:
-		if (type == ACL_TYPE_NFS4)
-			return (0);
-		break;
-
-	case ACL_BRAND_POSIX:
-		if (type == ACL_TYPE_ACCESS || type == ACL_TYPE_DEFAULT)
-			return (0);
-		break;
-
-	case ACL_BRAND_UNKNOWN:
-		return (0);
-	}
-
-	return (-1);
-}
-
-void
-_acl_brand_from_type(acl_t acl, acl_type_t type)
-{
-
-	switch (type) {
-	case ACL_TYPE_NFS4:
-		_acl_brand_as(acl, ACL_BRAND_NFS4);
-		break;
-	case ACL_TYPE_ACCESS:
-	case ACL_TYPE_DEFAULT:
-		_acl_brand_as(acl, ACL_BRAND_POSIX);
-		break;
-	default:
-		/* XXX: What to do here? */
-		break;
-	}
-}
-
-int
-acl_get_brand_np(acl_t acl, int *brand_p)
-{
-
-	if (acl == NULL || brand_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	*brand_p = _acl_brand(acl);
-
-	return (0);
-}
diff --git a/lib/libc/posix1e/acl_calc_mask.3 b/lib/libc/posix1e/acl_calc_mask.3
deleted file mode 100644
index dba9334..0000000
--- a/lib/libc/posix1e/acl_calc_mask.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_calc_mask.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_CALC_MASK 3
-.Os
-.Sh NAME
-.Nm acl_calc_mask
-.Nd calculate and set ACL mask permissions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_calc_mask "acl_t *acl_p"
-.Sh DESCRIPTION
-The
-.Fn acl_calc_mask
-function
-is a POSIX.1e call that calculates and set the permissions
-associated with the
-.Dv ACL_MASK
-ACL entry of the ACL referred to by
-.Fa acl_p .
-.Pp
-The value of new permissions are the union of the permissions
-granted by the
-.Dv ACL_GROUP , ACL_GROUP_OBJ , ACL_USER
-tag types which
-match processes in the file group class contained in the ACL
-referred to by
-.Fa acl_p .
-.Pp
-If the ACL referred to by
-.Fa acl_p
-already contains an
-.Dv ACL_MASK
-entry, its permissions shall be
-overwritten; if it does not contain an
-.Dv ACL_MASK
-entry, one shall
-be added.
-.Sh RETURN VALUES
-.Rv -std acl_calc_mask
-.Sh ERRORS
-The
-.Fn acl_calc_mask
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl_p
-does not point to a pointer to a valid ACL.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_entry 3 ,
-.Xr acl_valid 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_calc_mask
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_calc_mask
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c
deleted file mode 100644
index f8a1c44..0000000
--- a/lib/libc/posix1e/acl_calc_mask.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <stdio.h>
-
-#include "acl_support.h"
-
-/*
- * acl_calc_mask() (23.4.2): calculate and set the permissions
- * associated with the ACL_MASK ACL entry.  If the ACL already
- * contains an ACL_MASK entry, its permissions shall be
- * overwritten; if not, one shall be added.
- */
-int
-acl_calc_mask(acl_t *acl_p)
-{
-	struct acl	*acl_int, *acl_int_new;
-	acl_t		acl_new;
-	int		i, mask_mode, mask_num;
-
-	/*
-	 * (23.4.2.4) requires acl_p to point to a pointer to a valid ACL.
-	 * Since one of the primary reasons to use this function would be
-	 * to calculate the appropriate mask to obtain a valid ACL, we only
-	 * perform sanity checks here and validate the ACL prior to
-	 * returning.
-	 */
-	if (acl_p == NULL || *acl_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (!_acl_brand_may_be(*acl_p, ACL_BRAND_POSIX)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	_acl_brand_as(*acl_p, ACL_BRAND_POSIX);
-
-	acl_int = &(*acl_p)->ats_acl;
-	if ((acl_int->acl_cnt < 3) || (acl_int->acl_cnt > ACL_MAX_ENTRIES)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_new = acl_dup(*acl_p);
-	if (acl_new == NULL)
-		return (-1);
-	acl_int_new = &acl_new->ats_acl;
-
-	mask_mode = 0;
-	mask_num = -1;
-
-	/* gather permissions and find a mask entry */
-	for (i = 0; i < acl_int_new->acl_cnt; i++) {
-		switch(acl_int_new->acl_entry[i].ae_tag) {
-		case ACL_USER:
-		case ACL_GROUP:
-		case ACL_GROUP_OBJ:
-			mask_mode |=
-			    acl_int_new->acl_entry[i].ae_perm & ACL_PERM_BITS;
-			break;
-		case ACL_MASK:
-			mask_num = i;
-			break;
-		}
-	}
-
-	/* if a mask entry already exists, overwrite the perms */
-	if (mask_num != -1)
-		acl_int_new->acl_entry[mask_num].ae_perm = mask_mode;
-	else {
-		/* if no mask exists, check acl_cnt... */
-		if (acl_int_new->acl_cnt == ACL_MAX_ENTRIES) {
-			errno = ENOMEM;
-			return (-1);
-		}
-		/* ...and add the mask entry */
-		acl_int_new->acl_entry[acl_int_new->acl_cnt].ae_tag = ACL_MASK;
-		acl_int_new->acl_entry[acl_int_new->acl_cnt].ae_id =
-		    ACL_UNDEFINED_ID;
-		acl_int_new->acl_entry[acl_int_new->acl_cnt].ae_perm =
-		    mask_mode;
-		acl_int_new->acl_cnt++;
-	}
-
-	if (acl_valid(acl_new) == -1) {
-		errno = EINVAL;
-		acl_free(acl_new);
-		return (-1);
-	}
-
-	**acl_p = *acl_new;
-	acl_free(acl_new);
-
-	return (0);
-}
diff --git a/lib/libc/posix1e/acl_clear_flags_np.3 b/lib/libc/posix1e/acl_clear_flags_np.3
deleted file mode 100644
index f25a6ae..0000000
--- a/lib/libc/posix1e/acl_clear_flags_np.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_clear_flags_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_CLEAR_FLAGS_NP 3
-.Os
-.Sh NAME
-.Nm acl_clear_flags_np
-.Nd clear flags from a flagset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_clear_flags_np "acl_flagset_t flagset_d"
-.Sh DESCRIPTION
-The
-.Fn acl_clear_flags_np
-function
-is a non-portable call that clears all NFSv4 ACL flags from flagset
-.Fa flagset_d .
-.Sh RETURN VALUES
-.Rv -std acl_clear_flags_np
-.Sh ERRORS
-The
-.Fn acl_clear_flags_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa flagset_d
-is not a valid descriptor for a flagset.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_clear_flags_np
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_clear_flags_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_clear_perms.3 b/lib/libc/posix1e/acl_clear_perms.3
deleted file mode 100644
index e72806c..0000000
--- a/lib/libc/posix1e/acl_clear_perms.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_clear_perms.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_CLEAR_PERMS 3
-.Os
-.Sh NAME
-.Nm acl_clear_perms
-.Nd clear permissions from a permission set
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_clear_perms "acl_permset_t permset_d"
-.Sh DESCRIPTION
-The
-.Fn acl_clear_perms
-function
-is a POSIX.1e call that clears all permissions from permissions set
-.Fa permset_d .
-.Sh RETURN VALUES
-.Rv -std acl_clear_perms
-.Sh ERRORS
-The
-.Fn acl_clear_perms
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa permset_d
-is not a valid descriptor for a permission set.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_clear_perms
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_clear_perms
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_compat.c b/lib/libc/posix1e/acl_compat.c
deleted file mode 100644
index 65b88d4..0000000
--- a/lib/libc/posix1e/acl_compat.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2008 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_compat.c 192804 2009-05-26 11:42:06Z trasz $");
-
-#include <sys/acl.h>
-
-/*
- * Compatibility wrappers for applications compiled against libc from before
- * NFSv4 ACLs were added.
- */
-int
-__oldacl_get_perm_np(acl_permset_t permset_d, oldacl_perm_t perm)
-{
-
-	return (acl_get_perm_np(permset_d, perm));
-}
-
-int
-__oldacl_add_perm(acl_permset_t permset_d, oldacl_perm_t perm)
-{
-
-	return (acl_add_perm(permset_d, perm));
-}
-
-int
-__oldacl_delete_perm(acl_permset_t permset_d, oldacl_perm_t perm)
-{
-
-	return (acl_delete_perm(permset_d, perm));
-}
-
-__sym_compat(acl_get_perm_np, __oldacl_get_perm_np, FBSD_1.0);
-__sym_compat(acl_add_perm, __oldacl_add_perm, FBSD_1.0);
-__sym_compat(acl_delete_perm, __oldacl_delete_perm, FBSD_1.0);
diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c
deleted file mode 100644
index b82c951..0000000
--- a/lib/libc/posix1e/acl_copy.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_copy.c 194955 2009-06-25 12:46:59Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <string.h>
-
-#include "acl_support.h"
-
-/*
- * acl_copy_entry() (23.4.4): copy the contents of ACL entry src_d to
- * ACL entry dest_d
- */
-int
-acl_copy_entry(acl_entry_t dest_d, acl_entry_t src_d)
-{
-
-	if (src_d == NULL || dest_d == NULL || src_d == dest_d) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/*
-	 * Can we brand the new entry the same as the source entry?
-	 */
-	if (!_entry_brand_may_be(dest_d, _entry_brand(src_d))) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	_entry_brand_as(dest_d, _entry_brand(src_d));
-
-	dest_d->ae_tag = src_d->ae_tag;
-	dest_d->ae_id = src_d->ae_id;
-	dest_d->ae_perm = src_d->ae_perm;
-	dest_d->ae_entry_type = src_d->ae_entry_type;
-	dest_d->ae_flags = src_d->ae_flags;
-
-	return (0);
-}
-
-ssize_t
-acl_copy_ext(void *buf_p, acl_t acl, ssize_t size)
-{
-
-	errno = ENOSYS;
-	return (-1);
-}
-
-acl_t
-acl_copy_int(const void *buf_p)
-{
-
-	errno = ENOSYS;
-	return (NULL);
-}
diff --git a/lib/libc/posix1e/acl_copy_entry.3 b/lib/libc/posix1e/acl_copy_entry.3
deleted file mode 100644
index 200b733..0000000
--- a/lib/libc/posix1e/acl_copy_entry.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_copy_entry.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_COPY_ENTRY 3
-.Os
-.Sh NAME
-.Nm acl_copy_entry
-.Nd copy an ACL entry to another ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_copy_entry "acl_entry_t dest_d" "acl_entry_t src_d"
-.Sh DESCRIPTION
-The
-.Fn acl_copy_entry
-function
-is a POSIX.1e call that copies the contents of ACL entry
-.Fa src_d
-to ACL entry
-.Fa dest_d .
-.Sh RETURN VALUES
-.Rv -std acl_copy_entry
-.Sh ERRORS
-The
-.Fn acl_copy_entry
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa src_d
-or
-.Fa dest_d
-is not a valid descriptor for an ACL entry, or
-arguments
-.Fa src_d
-and
-.Fa dest_d
-reference the same ACL entry.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_entry 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_copy_entry
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_copy_entry
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_create_entry.3 b/lib/libc/posix1e/acl_create_entry.3
deleted file mode 100644
index dcad1a1..0000000
--- a/lib/libc/posix1e/acl_create_entry.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_create_entry.3 233648 2012-03-29 05:02:12Z eadler $
-.\"
-.Dd June 25, 2009
-.Dt ACL_CREATE_ENTRY 3
-.Os
-.Sh NAME
-.Nm acl_create_entry
-.Nm acl_create_entry_np
-.Nd create a new ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_create_entry "acl_t *acl_p" "acl_entry_t *entry_p"
-.Ft int
-.Fn acl_create_entry_np "acl_t *acl_p" "acl_entry_t *entry_p" "int index"
-.Sh DESCRIPTION
-The
-.Fn acl_create_entry
-function
-is a POSIX.1e call that creates a new ACL entry in the ACL
-pointed to by
-.Fa acl_p .
-The
-.Fn acl_create_entry_np
-function is a non-portable version that creates the ACL entry
-at position
-.Fa index .
-Positions are numbered starting from zero, i.e. calling
-.Fn acl_create_entry_np
-with
-.Fa index
-argument equal to zero will prepend the entry to the ACL.
-.Sh RETURN VALUES
-.Rv -std acl_create_entry
-.Sh ERRORS
-The
-.Fn acl_create_entry
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl_p
-does not point to a pointer to a valid ACL.
-Argument
-.Fa index
-is out of bounds.
-.It Bq Er ENOMEM
-The ACL working storage requires more memory than is
-allowed by the hardware or system-imposed memory
-management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_delete_entry 3 ,
-.Xr acl_get_entry 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_create_entry
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_create_entry
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_delete.3 b/lib/libc/posix1e/acl_delete.3
deleted file mode 100644
index 535f577..0000000
--- a/lib/libc/posix1e/acl_delete.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_delete.3 131635 2004-07-05 17:12:53Z ru $
-.\"
-.Dd December 29, 2002
-.Dt ACL_DELETE 3
-.Os
-.Sh NAME
-.Nm acl_delete_def_file ,
-.Nm acl_delete_def_link_np ,
-.Nm acl_delete_fd_np ,
-.Nm acl_delete_file_np ,
-.Nm acl_delete_link_np
-.Nd delete an ACL from a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_delete_def_file "const char *path_p"
-.Ft int
-.Fn acl_delete_def_link_np "const char *path_p"
-.Ft int
-.Fn acl_delete_fd_np "int filedes" "acl_type_t type"
-.Ft int
-.Fn acl_delete_file_np "const char *path_p" "acl_type_t type"
-.Ft int
-.Fn acl_delete_link_np "const char *path_p" "acl_type_t type"
-.Sh DESCRIPTION
-The
-.Fn acl_delete_def_file ,
-.Fn acl_delete_def_link_np ,
-.Fn acl_delete_fd_np ,
-.Fn acl_delete_file_np ,
-and
-.Fn acl_delete_link_np
-each allow the deletion of an ACL from a file.
-The
-.Fn acl_delete_def_file
-function
-is a POSIX.1e call that deletes the default ACL from a file (normally a
-directory) by name; the remainder of the calls are non-portable extensions
-that permit the deletion of arbitrary ACL types from a file/directory
-either by path name or file descriptor.
-The
-.Fn _file
-variations follow a symlink if it occurs in the last segment of the
-path name; the
-.Fn _link
-variations operate on the symlink itself.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-If any of the following conditions occur, these functions shall return -1
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or the
-object exists and the process does not have appropriate access rights.
-.It Bq Er EBADF
-The
-.Va fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-The ACL type passed is invalid for this file object.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an
-entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named object does not exist, or the
-.Va path_p
-argument points to an empty string.
-.It Bq Er ENOMEM
-Insufficient memory available to fulfill request.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.Pp
-Argument
-.Va path_p
-must be a directory, and is not.
-.It Bq Er EOPNOTSUPP
-The file system does not support ACL deletion.
-.It Bq Er EPERM
-The process does not have appropriate privilege to perform the operation
-to delete an ACL.
-.It Bq Er EROFS
-The file system is read-only.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get 3 ,
-.Xr acl_set 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
deleted file mode 100644
index 0ebc158..0000000
--- a/lib/libc/posix1e/acl_delete.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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.
- */
-/*
- * acl_delete_def_file -- remove a default acl from a file
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_delete.c 192586 2009-05-22 15:56:43Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-
-#include "acl_support.h"
-
-int
-acl_delete_def_file(const char *path_p)
-{
-
-	return (__acl_delete_file(path_p, ACL_TYPE_DEFAULT));
-}
-
-int
-acl_delete_def_link_np(const char *path_p)
-{
-
-	return (__acl_delete_link(path_p, ACL_TYPE_DEFAULT));
-}
-
-int
-acl_delete_file_np(const char *path_p, acl_type_t type)
-{
-
-	type = _acl_type_unold(type);
-	return (__acl_delete_file(path_p, type));
-}
-
-int
-acl_delete_link_np(const char *path_p, acl_type_t type)
-{
-
-	type = _acl_type_unold(type);
-	return (__acl_delete_link(path_p, type));
-}
-
-int
-acl_delete_fd_np(int filedes, acl_type_t type)
-{
-
-	type = _acl_type_unold(type);
-	return (___acl_delete_fd(filedes, type));
-}
diff --git a/lib/libc/posix1e/acl_delete_entry.3 b/lib/libc/posix1e/acl_delete_entry.3
deleted file mode 100644
index 1fd3cf8..0000000
--- a/lib/libc/posix1e/acl_delete_entry.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_delete_entry.3 235286 2012-05-11 20:06:46Z gjb $
-.\"
-.Dd June 25, 2009
-.Dt ACL_DELETE_ENTRY 3
-.Os
-.Sh NAME
-.Nm acl_delete_entry ,
-.Nm acl_delete_entry_np
-.Nd delete an ACL entry from an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_delete_entry "acl_t acl" "acl_entry_t entry_d"
-.Ft int
-.Fn acl_delete_entry_np "acl_t acl" "int index"
-.Sh DESCRIPTION
-The
-.Fn acl_delete_entry
-function
-is a POSIX.1e call that removes the ACL entry
-.Fa entry_d
-from ACL
-.Fa acl .
-The
-.Fn acl_delete_entry_np
-function is a non-portable version that removes the ACL entry
-at position
-.Fa index
-from ACL
-.Fa acl .
-Positions are numbered starting from zero, i.e. calling
-.Fn acl_delete_entry_np
-with
-.Fa index
-argument equal to zero will remove the first ACL entry.
-.Sh RETURN VALUES
-.Rv -std acl_delete_entry
-.Sh ERRORS
-The
-.Fn acl_delete_entry
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl
-does not point to a valid ACL.
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry in
-.Fa acl .
-Argument
-.Fa index
-is out of bounds.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_copy_entry 3 ,
-.Xr acl_get_entry 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_delete_entry
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_delete_entry
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c
deleted file mode 100644
index 9f89acb..0000000
--- a/lib/libc/posix1e/acl_delete_entry.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_delete_entry.c 200992 2009-12-25 18:05:06Z markus $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "acl_support.h"
-
-static int
-_entry_matches(const acl_entry_t a, const acl_entry_t b)
-{
-	/*
-	 * There is a semantical difference here between NFSv4 and POSIX
-	 * draft ACLs.  In POSIX, there may be only one entry for the particular
-	 * user or group.  In NFSv4 ACL, there may be any number of them.  We're
-	 * trying to be more specific here in that case.
-	 */
-	switch (_entry_brand(a)) {
-	case ACL_BRAND_NFS4:
-		if (a->ae_tag != b->ae_tag || a->ae_entry_type != b->ae_entry_type)
-			return (0);
-
-		/* If ae_ids matter, compare them as well. */
-		if (a->ae_tag == ACL_USER || a->ae_tag == ACL_GROUP) {
-			if (a->ae_id != b->ae_id)
-				return (0);
-		}
-
-		return (1);
-
-	default:
-		if ((a->ae_tag == b->ae_tag) && (a->ae_id == b->ae_id))
-			return (1);
-	}
-
-	return (0);
-}
-
-/*
- * acl_delete_entry() (23.4.9): remove the ACL entry indicated by entry_d
- * from acl.
- */
-int
-acl_delete_entry(acl_t acl, acl_entry_t entry_d)
-{
-	struct acl *acl_int;
-	struct acl_entry entry_int;
-	int i, j, found = 0;
-
-	if (acl == NULL || entry_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_int = &acl->ats_acl;
-
-	if (_entry_brand(entry_d) != _acl_brand(acl)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if ((acl->ats_acl.acl_cnt < 1) ||
-	    (acl->ats_acl.acl_cnt > ACL_MAX_ENTRIES)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/* Use a local copy to prevent deletion of more than this entry */
-	entry_int = *entry_d;
-
-	for (i = 0; i < acl->ats_acl.acl_cnt;) {
-		if (_entry_matches(&(acl->ats_acl.acl_entry[i]), &entry_int)) {
-			/* ...shift the remaining entries... */
-			for (j = i; j < acl->ats_acl.acl_cnt - 1; ++j)
-				acl->ats_acl.acl_entry[j] =
-				    acl->ats_acl.acl_entry[j+1];
-			/* ...drop the count and zero the unused entry... */
-			acl->ats_acl.acl_cnt--;
-			bzero(&acl->ats_acl.acl_entry[j],
-			    sizeof(struct acl_entry));
-			acl->ats_cur_entry = 0;
-			
-			/* Continue with the loop to remove all maching entries. */
-			found = 1;
-		} else
-			i++;
-	}
-
-	if (found)
-		return (0);
-
-	errno = EINVAL;
-	return (-1);
-}
-
-int
-acl_delete_entry_np(acl_t acl, int offset)
-{
-	struct acl *acl_int;
-	int i;
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_int = &acl->ats_acl;
-
-	if (offset < 0 || offset >= acl_int->acl_cnt) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if ((acl->ats_acl.acl_cnt < 1) ||
-	    (acl->ats_acl.acl_cnt > ACL_MAX_ENTRIES)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/* ...shift the remaining entries... */
-	for (i = offset; i < acl->ats_acl.acl_cnt - 1; ++i)
-		acl->ats_acl.acl_entry[i] =
-		    acl->ats_acl.acl_entry[i+1];
-	/* ...drop the count and zero the unused entry... */
-	acl->ats_acl.acl_cnt--;
-	bzero(&acl->ats_acl.acl_entry[i],
-	    sizeof(struct acl_entry));
-	acl->ats_cur_entry = 0;
-
-	return (0);
-}
diff --git a/lib/libc/posix1e/acl_delete_flag_np.3 b/lib/libc/posix1e/acl_delete_flag_np.3
deleted file mode 100644
index 7656c69..0000000
--- a/lib/libc/posix1e/acl_delete_flag_np.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_delete_flag_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_DELETE_FLAG_NP 3
-.Os
-.Sh NAME
-.Nm acl_delete_flag_np
-.Nd delete flags from a flagset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_delete_flag_np "acl_flagset_t flagset_d" "acl_flag_t flag"
-.Sh DESCRIPTION
-The
-.Fn acl_delete_flag_np
-function
-is a non-portable call that removes specific NFSv4 ACL flags from flagset
-.Fa flags .
-.Sh RETURN VALUES
-.Rv -std acl_delete_flag_np
-.Sh ERRORS
-The
-.Fn acl_delete_flag_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa flagset_d
-is not a valid descriptor for a flagset.
-Argument
-.Fa flag
-does not contain a valid
-.Vt acl_flag_t
-value.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_clear_flag_nps 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_delete_flag_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_delete_flag_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_delete_perm.3 b/lib/libc/posix1e/acl_delete_perm.3
deleted file mode 100644
index 8ca839e..0000000
--- a/lib/libc/posix1e/acl_delete_perm.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_delete_perm.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_DELETE_PERM 3
-.Os
-.Sh NAME
-.Nm acl_delete_perm
-.Nd delete permissions from a permission set
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_delete_perm "acl_permset_t permset_d" "acl_perm_t perm"
-.Sh DESCRIPTION
-The
-.Fn acl_delete_perm
-function
-is a POSIX.1e call that removes specific permissions from permissions set
-.Fa perm .
-.Sh RETURN VALUES
-.Rv -std acl_delete_perm
-.Sh ERRORS
-The
-.Fn acl_delete_perm
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa permset_d
-is not a valid descriptor for a permission set.
-Argument
-.Fa perm
-does not contain a valid
-.Vt acl_perm_t
-value.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_delete_perm
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_delete_perm
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_dup.3 b/lib/libc/posix1e/acl_dup.3
deleted file mode 100644
index 69b841c..0000000
--- a/lib/libc/posix1e/acl_dup.3
+++ /dev/null
@@ -1,110 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_dup.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd January 28, 2000
-.Dt ACL_DUP 3
-.Os
-.Sh NAME
-.Nm acl_dup
-.Nd duplicate an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_dup "acl_t acl"
-.Sh DESCRIPTION
-The
-.Fn acl_dup
-function returns a pointer to a copy of the ACL pointed to by the argument
-.Va acl .
-.Pp
-This function may cause memory to be allocated.
-The caller should free any
-releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void*)acl_t
-as an argument.
-.Pp
-Any existing ACL pointers that refer to the ACL referred to by
-.Va acl
-shall continue to refer to the ACL.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, this function shall return a pointer to the
-duplicate ACL.
-Otherwise, a value of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_init
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL.
-.It Bq Er ENOMEM
-The
-.Va acl_t
-to be returned requires more memory than is allowed by the hardware or
-system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr acl_get 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c
deleted file mode 100644
index 0e92e32..0000000
--- a/lib/libc/posix1e/acl_entry.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_entry.c 208783 2010-06-03 14:16:58Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <stdlib.h>
-
-/*
- * acl_create_entry() (23.4.7): create a new ACL entry in the ACL pointed
- * to by acl_p.
- */
-int
-acl_create_entry(acl_t *acl_p, acl_entry_t *entry_p)
-{
-	struct acl *acl_int;
-
-	if (acl_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_int = &(*acl_p)->ats_acl;
-
-	/*
-	 * +1, because we are checking if there is space left for one more
-	 * entry.
-	 */
-	if (acl_int->acl_cnt + 1 >= ACL_MAX_ENTRIES) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*entry_p = &acl_int->acl_entry[acl_int->acl_cnt++];
-
-	(**entry_p).ae_tag  = ACL_UNDEFINED_TAG;
-	(**entry_p).ae_id   = ACL_UNDEFINED_ID;
-	(**entry_p).ae_perm = ACL_PERM_NONE;
-	(**entry_p).ae_entry_type = 0;
-	(**entry_p).ae_flags = 0;
-
-	(*acl_p)->ats_cur_entry = 0;
-
-	return (0);
-}
-
-int
-acl_create_entry_np(acl_t *acl_p, acl_entry_t *entry_p, int offset)
-{
-	int i;
-	struct acl *acl_int;
-
-	if (acl_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_int = &(*acl_p)->ats_acl;
-
-	if (acl_int->acl_cnt + 1 >= ACL_MAX_ENTRIES) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (offset < 0 || offset >= acl_int->acl_cnt) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/* Make room for the new entry. */
-	for (i = acl_int->acl_cnt; i > offset; i--)
-		acl_int->acl_entry[i] = acl_int->acl_entry[i - 1];
-
-	acl_int->acl_cnt++;
-
-	*entry_p = &acl_int->acl_entry[offset];
-
-	(**entry_p).ae_tag  = ACL_UNDEFINED_TAG;
-	(**entry_p).ae_id   = ACL_UNDEFINED_ID;
-	(**entry_p).ae_perm = ACL_PERM_NONE;
-	(**entry_p).ae_entry_type = 0;
-	(**entry_p).ae_flags= 0;
-
-	(*acl_p)->ats_cur_entry = 0;
-
-	return (0);
-}
-
-/*
- * acl_get_entry() (23.4.14): returns an ACL entry from an ACL
- * indicated by entry_id.
- */
-int
-acl_get_entry(acl_t acl, int entry_id, acl_entry_t *entry_p)
-{
-	struct acl *acl_int;
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	acl_int = &acl->ats_acl;
-
-	switch(entry_id) {
-	case ACL_FIRST_ENTRY:
-		acl->ats_cur_entry = 0;
-		/* PASSTHROUGH */
-	case ACL_NEXT_ENTRY:
-		if (acl->ats_cur_entry >= acl->ats_acl.acl_cnt)
-			return 0;
-		*entry_p = &acl_int->acl_entry[acl->ats_cur_entry++];
-		return (1);
-	}
-
-	errno = EINVAL;
-	return (-1);
-}
diff --git a/lib/libc/posix1e/acl_flag.c b/lib/libc/posix1e/acl_flag.c
deleted file mode 100644
index 6e136a5..0000000
--- a/lib/libc/posix1e/acl_flag.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_flag.c 194957 2009-06-25 13:08:02Z trasz $");
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-static int
-_flag_is_invalid(acl_flag_t flag)
-{
-
-	if ((flag & ACL_FLAGS_BITS) == flag)
-		return (0);
-
-	errno = EINVAL;
-
-	return (1);
-}
-
-int
-acl_add_flag_np(acl_flagset_t flagset_d, acl_flag_t flag)
-{
-
-	if (flagset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_flag_is_invalid(flag))
-		return (-1);
-
-	*flagset_d |= flag;
-
-	return (0);
-}
-
-int
-acl_clear_flags_np(acl_flagset_t flagset_d)
-{
-
-	if (flagset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*flagset_d |= 0;
-
-	return (0);
-}
-
-int
-acl_delete_flag_np(acl_flagset_t flagset_d, acl_flag_t flag)
-{
-
-	if (flagset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_flag_is_invalid(flag))
-		return (-1);
-
-	*flagset_d &= ~flag;
-
-	return (0);
-}
-
-int
-acl_get_flag_np(acl_flagset_t flagset_d, acl_flag_t flag)
-{
-
-	if (flagset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_flag_is_invalid(flag))
-		return (-1);
-
-	if (*flagset_d & flag)
-		return (1);
-
-	return (0);
-}
-
-int
-acl_get_flagset_np(acl_entry_t entry_d, acl_flagset_t *flagset_p)
-{
-
-	if (entry_d == NULL || flagset_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*flagset_p = &entry_d->ae_flags;
-
-	return (0);
-}
-
-int
-acl_set_flagset_np(acl_entry_t entry_d, acl_flagset_t flagset_d)
-{
-
-	if (entry_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	_entry_brand_as(entry_d, ACL_BRAND_NFS4);
-
-	if (_flag_is_invalid(*flagset_d))
-		return (-1);
-
-	entry_d->ae_flags = *flagset_d;
-
-	return (0);
-}
diff --git a/lib/libc/posix1e/acl_free.3 b/lib/libc/posix1e/acl_free.3
deleted file mode 100644
index 53d0364..0000000
--- a/lib/libc/posix1e/acl_free.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_free.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd January 28, 2000
-.Dt ACL_FREE 3
-.Os
-.Sh NAME
-.Nm acl_free
-.Nd free ACL working state
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_free "void *obj_p"
-.Sh DESCRIPTION
-The
-.Fn acl_free
-call allows the freeing of ACL working space, such as is allocated by
-.Xr acl_dup 3 ,
-or
-.Xr acl_from_text 3 .
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-.Rv -std acl_free
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_free
-function shall return -1 and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Va obj_p
-argument is invalid.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_dup 3 ,
-.Xr acl_from_text 3 ,
-.Xr acl_get 3 ,
-.Xr acl_init 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c
deleted file mode 100644
index 7dae1d1..0000000
--- a/lib/libc/posix1e/acl_free.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * acl_free -- free ACL objects from user memory
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_free.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-#include <stdlib.h>
-
-/*
- * acl_free() (23.4.12): free any releasable memory allocated to the
- * ACL data object identified by obj_p.
- */
-int
-acl_free(void *obj_p)
-{
-
-	if (obj_p) {
-		free(obj_p);
-		obj_p = NULL;
-	}
-
-	return (0);
-}
diff --git a/lib/libc/posix1e/acl_from_text.3 b/lib/libc/posix1e/acl_from_text.3
deleted file mode 100644
index dd304e0..0000000
--- a/lib/libc/posix1e/acl_from_text.3
+++ /dev/null
@@ -1,130 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_from_text.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd January 28, 2000
-.Dt ACL_FROM_TEXT 3
-.Os
-.Sh NAME
-.Nm acl_from_text
-.Nd create an ACL from text
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_from_text "const char *buf_p"
-.Sh DESCRIPTION
-The
-.Fn acl_from_text
-function converts the text form of an ACL referred to by
-.Va buf_p
-into the internal working structure for ACLs, appropriate for applying to
-files or manipulating.
-.Pp
-This function may cause memory to be allocated.
-The caller should free any
-releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void *)acl_t
-as an argument.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, the function shall return a pointer to the
-internal representation of the ACL in working storage.
-Otherwise, a value
-of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_from_text
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Va buf_p
-cannot be translated into an ACL.
-.It Bq Er ENOMEM
-The ACL working storage requires more memory than is allowed by the
-hardware or system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr acl_get 3 ,
-.Xr acl_to_text 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
-.Sh BUGS
-The
-.Fn acl_from_text
-and
-.Fn acl_to_text
-functions
-rely on the
-.Xr getpwent 3
-library calls to manage username and uid mapping, as well as the
-.Xr getgrent 3
-library calls to manage groupname and gid mapping.
-These calls are not
-thread safe, and so transitively, neither are
-.Fn acl_from_text
-and
-.Fn acl_to_text .
-These functions may also interfere with stateful
-calls associated with the
-.Fn getpwent
-and
-.Fn getgrent
-calls.
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
deleted file mode 100644
index 30dcded..0000000
--- a/lib/libc/posix1e/acl_from_text.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * acl_from_text: Convert a text-form ACL from a string to an acl_t.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_from_text.c 209736 2010-07-06 17:20:08Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "acl_support.h"
-
-static acl_tag_t acl_string_to_tag(char *tag, char *qualifier);
-
-int _nfs4_acl_entry_from_text(acl_t aclp, char *entry);
-int _text_could_be_nfs4_acl(const char *entry);
-
-static acl_tag_t
-acl_string_to_tag(char *tag, char *qualifier)
-{
-
-	if (*qualifier == '\0') {
-		if ((!strcmp(tag, "user")) || (!strcmp(tag, "u"))) {
-			return (ACL_USER_OBJ);
-		} else
-		if ((!strcmp(tag, "group")) || (!strcmp(tag, "g"))) {
-			return (ACL_GROUP_OBJ);
-		} else
-		if ((!strcmp(tag, "mask")) || (!strcmp(tag, "m"))) {
-			return (ACL_MASK);
-		} else
-		if ((!strcmp(tag, "other")) || (!strcmp(tag, "o"))) {
-			return (ACL_OTHER);
-		} else
-			return(-1);
-	} else {
-		if ((!strcmp(tag, "user")) || (!strcmp(tag, "u"))) {
-			return(ACL_USER);
-		} else
-		if ((!strcmp(tag, "group")) || (!strcmp(tag, "g"))) {
-			return(ACL_GROUP);
-		} else
-			return(-1);
-	}
-}
-
-static int
-_posix1e_acl_entry_from_text(acl_t aclp, char *entry)
-{
-	acl_tag_t	 t;
-	acl_perm_t	 p;
-	char		*tag, *qualifier, *permission;
-	uid_t		 id;
-	int		 error;
-
-	assert(_acl_brand(aclp) == ACL_BRAND_POSIX);
-
-	/* Split into three ':' delimited fields. */
-	tag = strsep(&entry, ":");
-	if (tag == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	tag = string_skip_whitespace(tag);
-	if ((*tag == '\0') && (!entry)) {
-		/*
-		 * Is an entirely comment line, skip to next
-		 * comma.
-		 */
-		return (0);
-	}
-	string_trim_trailing_whitespace(tag);
-
-	qualifier = strsep(&entry, ":");
-	if (qualifier == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	qualifier = string_skip_whitespace(qualifier);
-	string_trim_trailing_whitespace(qualifier);
-
-	permission = strsep(&entry, ":");
-	if (permission == NULL || entry) {
-		errno = EINVAL;
-		return (-1);
-	}
-	permission = string_skip_whitespace(permission);
-	string_trim_trailing_whitespace(permission);
-
-	t = acl_string_to_tag(tag, qualifier);
-	if (t == -1) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	error = _posix1e_acl_string_to_perm(permission, &p);
-	if (error == -1) {
-		errno = EINVAL;
-		return (-1);
-	}		
-
-	switch(t) {
-		case ACL_USER_OBJ:
-		case ACL_GROUP_OBJ:
-		case ACL_MASK:
-		case ACL_OTHER:
-			if (*qualifier != '\0') {
-				errno = EINVAL;
-				return (-1);
-			}
-			id = 0;
-			break;
-
-		case ACL_USER:
-		case ACL_GROUP:
-			error = _acl_name_to_id(t, qualifier, &id);
-			if (error == -1)
-				return (-1);
-			break;
-
-		default:
-			errno = EINVAL;
-			return (-1);
-	}
-
-	error = _posix1e_acl_add_entry(aclp, t, id, p);
-	if (error == -1)
-		return (-1);
-
-	return (0);
-}
-
-static int
-_text_is_nfs4_entry(const char *entry)
-{
-	int count = 0;
-
-	assert(strlen(entry) > 0);
-
-	while (*entry != '\0') {
-		if (*entry == ':' || *entry == '@')
-			count++;
-		entry++;
-	}
-
-	if (count <= 2)
-		return (0);
-
-	return (1);
-}
-
-/*
- * acl_from_text -- Convert a string into an ACL.
- * Postpone most validity checking until the end and call acl_valid() to do
- * that.
- */
-acl_t
-acl_from_text(const char *buf_p)
-{
-	acl_t		 acl;
-	char		*mybuf_p, *line, *cur, *notcomment, *comment, *entry;
-	int		 error;
-
-	/* Local copy we can mess up. */
-	mybuf_p = strdup(buf_p);
-	if (mybuf_p == NULL)
-		return(NULL);
-
-	acl = acl_init(3); /* XXX: WTF, 3? */
-	if (acl == NULL) {
-		free(mybuf_p);
-		return(NULL);
-	}
-
-	/* Outer loop: delimit at \n boundaries. */
-	cur = mybuf_p;
-	while ((line = strsep(&cur, "\n"))) {
-		/* Now split the line on the first # to strip out comments. */
-		comment = line;
-		notcomment = strsep(&comment, "#");
-
-		/* Inner loop: delimit at ',' boundaries. */
-		while ((entry = strsep(&notcomment, ","))) {
-
-			/* Skip empty lines. */
-			if (strlen(string_skip_whitespace(entry)) == 0)
-				continue;
-
-			if (_acl_brand(acl) == ACL_BRAND_UNKNOWN) {
-				if (_text_is_nfs4_entry(entry))
-					_acl_brand_as(acl, ACL_BRAND_NFS4);
-				else
-					_acl_brand_as(acl, ACL_BRAND_POSIX);
-			}
-
-			switch (_acl_brand(acl)) {
-			case ACL_BRAND_NFS4:
-				error = _nfs4_acl_entry_from_text(acl, entry);
-				break;
-
-			case ACL_BRAND_POSIX:
-				error = _posix1e_acl_entry_from_text(acl, entry);
-				break;
-
-			default:
-				error = EINVAL;
-				break;
-			}
-
-			if (error)
-				goto error_label;
-		}
-	}
-
-#if 0
-	/* XXX Should we only return ACLs valid according to acl_valid? */
-	/* Verify validity of the ACL we read in. */
-	if (acl_valid(acl) == -1) {
-		errno = EINVAL;
-		goto error_label;
-	}
-#endif
-
-	free(mybuf_p);
-	return(acl);
-
-error_label:
-	acl_free(acl);
-	free(mybuf_p);
-	return(NULL);
-}
-
-/*
- * Given a username/groupname from a text form of an ACL, return the uid/gid
- * XXX NOT THREAD SAFE, RELIES ON GETPWNAM, GETGRNAM
- * XXX USES *PW* AND *GR* WHICH ARE STATEFUL AND THEREFORE THIS ROUTINE
- * MAY HAVE SIDE-EFFECTS
- */
-int
-_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id)
-{
-	struct group	*g;
-	struct passwd	*p;
-	unsigned long	l;
-	char 		*endp;
-
-	switch(tag) {
-	case ACL_USER:
-		p = getpwnam(name);
-		if (p == NULL) {
-			l = strtoul(name, &endp, 0);
-			if (*endp != '\0' || l != (unsigned long)(uid_t)l) {
-				errno = EINVAL;
-				return (-1);
-			}
-			*id = (uid_t)l;
-			return (0);
-		}
-		*id = p->pw_uid;
-		return (0);
-
-	case ACL_GROUP:
-		g = getgrnam(name);
-		if (g == NULL) {
-			l = strtoul(name, &endp, 0);
-			if (*endp != '\0' || l != (unsigned long)(gid_t)l) {
-				errno = EINVAL;
-				return (-1);
-			}
-			*id = (gid_t)l;
-			return (0);
-		}
-		*id = g->gr_gid;
-		return (0);
-
-	default:
-		return (EINVAL);
-	}
-}
diff --git a/lib/libc/posix1e/acl_from_text_nfs4.c b/lib/libc/posix1e/acl_from_text_nfs4.c
deleted file mode 100644
index c80fb93..0000000
--- a/lib/libc/posix1e/acl_from_text_nfs4.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_from_text_nfs4.c 209736 2010-07-06 17:20:08Z trasz $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
-#include <string.h>
-#include <pwd.h>
-#include <grp.h>
-#include <ctype.h>
-#include <err.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-#define MAX_ENTRY_LENGTH 512
-
-/*
- * Parse the tag field of ACL entry passed as "str".  If qualifier
- * needs to follow, then the variable referenced by "need_qualifier"
- * is set to 1, otherwise it's set to 0.
- */
-static int
-parse_tag(const char *str, acl_entry_t entry, int *need_qualifier)
-{
-
-	assert(need_qualifier != NULL);
-	*need_qualifier = 0;
-
-	if (strcmp(str, "owner@") == 0)
-		return (acl_set_tag_type(entry, ACL_USER_OBJ));
-	if (strcmp(str, "group@") == 0)
-		return (acl_set_tag_type(entry, ACL_GROUP_OBJ));
-	if (strcmp(str, "everyone@") == 0)
-		return (acl_set_tag_type(entry, ACL_EVERYONE));
-
-	*need_qualifier = 1;
-
-	if (strcmp(str, "user") == 0 || strcmp(str, "u") == 0)
-		return (acl_set_tag_type(entry, ACL_USER));
-	if (strcmp(str, "group") == 0 || strcmp(str, "g") == 0)
-		return (acl_set_tag_type(entry, ACL_GROUP));
-
-	warnx("malformed ACL: invalid \"tag\" field");
-
-	return (-1);
-}
-
-/*
- * Parse the qualifier field of ACL entry passed as "str".
- * If user or group name cannot be resolved, then the variable
- * referenced by "need_qualifier" is set to 1; it will be checked
- * later to figure out whether the appended_id is required.
- */
-static int
-parse_qualifier(char *str, acl_entry_t entry, int *need_qualifier)
-{
-	int qualifier_length, error;
-	uid_t id;
-	acl_tag_t tag;
-
-	assert(need_qualifier != NULL);
-	*need_qualifier = 0;
-
-	qualifier_length = strlen(str);
-
-	if (qualifier_length == 0) {
-		warnx("malformed ACL: empty \"qualifier\" field");
-		return (-1);
-	}
-
-	error = acl_get_tag_type(entry, &tag);
-	if (error)
-		return (error);
-
-	error = _acl_name_to_id(tag, str, &id);
-	if (error) {
-		*need_qualifier = 1;
-		return (0);
-	}
-
-	return (acl_set_qualifier(entry, &id));
-}
-
-static int
-parse_access_mask(char *str, acl_entry_t entry)
-{
-	int error;
-	acl_perm_t perm;
-
-	error = _nfs4_parse_access_mask(str, &perm);
-	if (error)
-		return (error);
-
-	error = acl_set_permset(entry, &perm);
-
-	return (error);
-}
-
-static int
-parse_flags(char *str, acl_entry_t entry)
-{
-	int error;
-	acl_flag_t flags;
-
-	error = _nfs4_parse_flags(str, &flags);
-	if (error)
-		return (error);
-
-	error = acl_set_flagset_np(entry, &flags);
-
-	return (error);
-}
-
-static int
-parse_entry_type(const char *str, acl_entry_t entry)
-{
-
-	if (strcmp(str, "allow") == 0)
-		return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_ALLOW));
-	if (strcmp(str, "deny") == 0)
-		return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_DENY));
-	if (strcmp(str, "audit") == 0)
-		return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_AUDIT));
-	if (strcmp(str, "alarm") == 0)
-		return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_ALARM));
-
-	warnx("malformed ACL: invalid \"type\" field");
-
-	return (-1);
-}
-
-static int
-parse_appended_id(char *str, acl_entry_t entry)
-{
-	int qualifier_length;
-	char *end;
-	id_t id;
-
-	qualifier_length = strlen(str);
-	if (qualifier_length == 0) {
-		warnx("malformed ACL: \"appended id\" field present, "
-	           "but empty");
-		return (-1);
-	}
-
-	id = strtod(str, &end);
-	if (end - str != qualifier_length) {
-		warnx("malformed ACL: appended id is not a number");
-		return (-1);
-	}
-
-	return (acl_set_qualifier(entry, &id));
-}
-
-static int
-number_of_colons(const char *str)
-{
-	int count = 0;
-
-	while (*str != '\0') {
-		if (*str == ':')
-			count++;
-
-		str++;
-	}
-
-	return (count);
-}
-
-int
-_nfs4_acl_entry_from_text(acl_t aclp, char *str)
-{
-	int error, need_qualifier;
-	acl_entry_t entry;
-	char *field, *qualifier_field;
-
-	error = acl_create_entry(&aclp, &entry);
-	if (error)
-		return (error);
-
-	assert(_entry_brand(entry) == ACL_BRAND_NFS4);
-
-	if (str == NULL)
-		goto truncated_entry;
-	field = strsep(&str, ":");
-
-	field = string_skip_whitespace(field);
-	if ((*field == '\0') && (!str)) {
-		/*
-		 * Is an entirely comment line, skip to next
-		 * comma.
-		 */
-		return (0);
-	}
-
-	error = parse_tag(field, entry, &need_qualifier);
-	if (error)
-		goto malformed_field;
-
-	if (need_qualifier) {
-		if (str == NULL)
-			goto truncated_entry;
-		qualifier_field = field = strsep(&str, ":");
-		error = parse_qualifier(field, entry, &need_qualifier);
-		if (error)
-			goto malformed_field;
-	}
-
-	if (str == NULL)
-		goto truncated_entry;
-	field = strsep(&str, ":");
-	error = parse_access_mask(field, entry);
-	if (error)
-		goto malformed_field;
-
-	if (str == NULL)
-		goto truncated_entry;
-	/* Do we have "flags" field? */
-	if (number_of_colons(str) > 0) {
-		field = strsep(&str, ":");
-		error = parse_flags(field, entry);
-		if (error)
-			goto malformed_field;
-	}
-
-	if (str == NULL)
-		goto truncated_entry;
-	field = strsep(&str, ":");
-	error = parse_entry_type(field, entry);
-	if (error)
-		goto malformed_field;
-
-	if (need_qualifier) {
-		if (str == NULL) {
-			warnx("malformed ACL: unknown user or group name "
-			    "\"%s\"", qualifier_field);
-			goto truncated_entry;
-		}
-
-		error = parse_appended_id(str, entry);
-		if (error)
-			goto malformed_field;
-	}
-
-	return (0);
-
-truncated_entry:
-malformed_field:
-	acl_delete_entry(aclp, entry);
-	errno = EINVAL;
-	return (-1);
-}
diff --git a/lib/libc/posix1e/acl_get.3 b/lib/libc/posix1e/acl_get.3
deleted file mode 100644
index bd1ca84..0000000
--- a/lib/libc/posix1e/acl_get.3
+++ /dev/null
@@ -1,168 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get.3 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd June 25, 2009
-.Dt ACL_GET 3
-.Os
-.Sh NAME
-.Nm acl_get_fd ,
-.Nm acl_get_fd_np ,
-.Nm acl_get_file ,
-.Nm acl_get_link_np
-.Nd get an ACL for a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_get_fd "int fd"
-.Ft acl_t
-.Fn acl_get_fd_np "int fd" "acl_type_t type"
-.Ft acl_t
-.Fn acl_get_file "const char *path_p" "acl_type_t type"
-.Ft acl_t
-.Fn acl_get_link_np "const char *path_p" "acl_type_t type"
-.Sh DESCRIPTION
-The
-.Fn acl_get_fd ,
-.Fn acl_get_file ,
-.Fn acl_get_link_np ,
-and
-.Fn acl_get_fd_np
-each allow the retrieval of an ACL from a file.
-The
-.Fn acl_get_fd
-is a POSIX.1e call that allows the retrieval of an ACL of type
-ACL_TYPE_ACCESS
-from a file descriptor.
-The
-.Fn acl_get_fd_np
-function
-is a non-portable form of
-.Fn acl_get_fd
-that allows the retrieval of any type of ACL from a file descriptor.
-The
-.Fn acl_get_file
-function is a POSIX.1e call that allows the retrieval of a
-specified type of ACL from a file by name;
-.Fn acl_get_link_np
-is a non-portable variation on
-.Fn acl_get_file
-which does not follow a symlink if the target of the call is a
-symlink.
-.Pp
-These functions may cause memory to be allocated.
-The caller should free
-any releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void *)acl_t
-as an argument.
-.Pp
-The ACL in the working storage is an independent copy of the ACL associated
-with the object referred to by
-.Va fd .
-The ACL in the working storage shall not participate in any access control
-decisions.
-.Pp
-Valid values for the
-.Va type
-argument are:
-.Bl -column -offset 3n "ACL_TYPE_DEFAULT"
-.It ACL_TYPE_ACCESS	POSIX.1e access ACL
-.It ACL_TYPE_DEFAULT	POSIX.1e default ACL
-.It ACL_TYPE_NFS4	NFSv4 ACL
-.El
-.Pp
-The ACL returned will be branded accordingly.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, the function shall return a pointer to the ACL
-that was retrieved.
-Otherwise, a value of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_get_fd
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or the
-object exists and the process does not have appropriate access rights.
-.It Bq Er EBADF
-The
-.Va fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-The ACL type passed is invalid for this file object.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an
-entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named object does not exist, or the
-.Va path_p
-argument points to an empty string.
-.It Bq Er ENOMEM
-Insufficient memory available to fulfill request.
-.It Bq Er EOPNOTSUPP
-The file system does not support ACL retrieval.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr acl_get 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_set 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
deleted file mode 100644
index fc712e2..0000000
--- a/lib/libc/posix1e/acl_get.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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.
- */
-/*
- * acl_get_fd - syscall wrapper for retrieving access ACL by fd
- * acl_get_fd_np - syscall wrapper for retrieving ACL by fd (non-POSIX)
- * acl_get_file - syscall wrapper for retrieving ACL by filename
- * acl_get_link_np - syscall wrapper for retrieving ACL by filename (NOFOLLOW)
- *                   (non-POSIX)
- * acl_get_perm_np() checks if a permission is in the specified
- *                   permset (non-POSIX)
- * acl_get_permset() returns the permission set in the ACL entry
- * acl_get_qualifier() retrieves the qualifier of the tag from the ACL entry
- * acl_get_tag_type() returns the tag type for the ACL entry entry_d
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_get.c 208437 2010-05-23 08:12:36Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "acl_support.h"
-
-acl_t
-acl_get_file(const char *path_p, acl_type_t type)
-{
-	acl_t	aclp;
-	int	error;
-
-	aclp = acl_init(ACL_MAX_ENTRIES);
-	if (aclp == NULL)
-		return (NULL);
-
-	type = _acl_type_unold(type);
-	error = __acl_get_file(path_p, type, &aclp->ats_acl);
-	if (error) {
-		acl_free(aclp);
-		return (NULL);
-	}
-
-	aclp->ats_acl.acl_maxcnt = ACL_MAX_ENTRIES;
-	_acl_brand_from_type(aclp, type);
-
-	return (aclp);
-}
-
-acl_t
-acl_get_link_np(const char *path_p, acl_type_t type)
-{
-	acl_t	aclp;
-	int	error;
-
-	aclp = acl_init(ACL_MAX_ENTRIES);
-	if (aclp == NULL)
-		return (NULL);
-
-	type = _acl_type_unold(type);
-	error = __acl_get_link(path_p, type, &aclp->ats_acl);
-	if (error) {
-		acl_free(aclp);
-		return (NULL);
-	}
-
-	aclp->ats_acl.acl_maxcnt = ACL_MAX_ENTRIES;
-	_acl_brand_from_type(aclp, type);
-
-	return (aclp);
-}
-
-acl_t
-acl_get_fd(int fd)
-{
-	if (fpathconf(fd, _PC_ACL_NFS4) == 1)
-		return (acl_get_fd_np(fd, ACL_TYPE_NFS4));
-
-	return (acl_get_fd_np(fd, ACL_TYPE_ACCESS));
-}
-
-acl_t
-acl_get_fd_np(int fd, acl_type_t type)
-{
-	acl_t	aclp;
-	int	error;
-
-	aclp = acl_init(ACL_MAX_ENTRIES);
-	if (aclp == NULL)
-		return (NULL);
-
-	type = _acl_type_unold(type);
-	error = ___acl_get_fd(fd, type, &aclp->ats_acl);
-	if (error) {
-		acl_free(aclp);
-		return (NULL);
-	}
-
-	aclp->ats_acl.acl_maxcnt = ACL_MAX_ENTRIES;
-	_acl_brand_from_type(aclp, type);
-
-	return (aclp);
-}
-
-/*
- * acl_get_permset() (23.4.17): return via permset_p a descriptor to
- * the permission set in the ACL entry entry_d.
- */
-int
-acl_get_permset(acl_entry_t entry_d, acl_permset_t *permset_p)
-{
-
-	if (entry_d == NULL || permset_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*permset_p = &entry_d->ae_perm;
-
-	return (0);
-}
-
-/*
- * acl_get_qualifier() (23.4.18): retrieve the qualifier of the tag
- * for the ACL entry entry_d.
- */
-void *
-acl_get_qualifier(acl_entry_t entry_d)
-{
-	uid_t *retval;
-
-	if (entry_d == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	switch(entry_d->ae_tag) {
-	case ACL_USER:
-	case ACL_GROUP:
-		retval = malloc(sizeof(uid_t));
-		if (retval == NULL)
-			return (NULL);
-		*retval = entry_d->ae_id;
-		return (retval);
-	}
-
-	errno = EINVAL;
-	return (NULL);
-}
-
-/*
- * acl_get_tag_type() (23.4.19): return the tag type for the ACL
- * entry entry_p.
- */
-int
-acl_get_tag_type(acl_entry_t entry_d, acl_tag_t *tag_type_p)
-{
-
-	if (entry_d == NULL || tag_type_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*tag_type_p = entry_d->ae_tag;
-
-	return (0);
-}
-
-int
-acl_get_entry_type_np(acl_entry_t entry_d, acl_entry_type_t *entry_type_p)
-{
-
-	if (entry_d == NULL || entry_type_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*entry_type_p = entry_d->ae_entry_type;
-
-	return (0);
-}
diff --git a/lib/libc/posix1e/acl_get_brand_np.3 b/lib/libc/posix1e/acl_get_brand_np.3
deleted file mode 100644
index 78b9b4b..0000000
--- a/lib/libc/posix1e/acl_get_brand_np.3
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get_brand_np.3 204725 2010-03-04 19:38:24Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_GET_BRAND_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_brand_np
-.Nd retrieve the ACL brand from an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_brand_np "acl_t acl" "int *brand_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_brand_np
-function
-is a non-portable call that returns the ACL brand for the ACL
-.Fa acl .
-Upon successful completion, the location referred to by the argument
-.Fa brand_p
-will be set to the ACL brand of the ACL
-.Fa acl .
-.Pp
-Branding is an internal mechanism intended to prevent mixing POSIX.1e
-and NFSv4 entries by mistake.
-It's also used by the libc to determine how to print out the ACL.
-The first call to function that is specific for one particular brand - POSIX.1e
-or NFSv4 - "brands" the ACL.
-After that, calling function specific to another brand will result in error.
-.Sh RETURN VALUES
-.Rv -std acl_get_brand_np
-.Sh ERRORS
-The
-.Fn acl_get_brand_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl
-does not point to a valid ACL.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_brand_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_brand_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_entry.3 b/lib/libc/posix1e/acl_get_entry.3
deleted file mode 100644
index 67d6c14..0000000
--- a/lib/libc/posix1e/acl_get_entry.3
+++ /dev/null
@@ -1,145 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_entry.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd April 13, 2001
-.Dt ACL_GET_ENTRY 3
-.Os
-.Sh NAME
-.Nm acl_get_entry
-.Nd retrieve an ACL entry from an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_entry "acl_t acl" "int entry_id" "acl_entry_t *entry_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_entry
-function
-is a POSIX.1e call that retrieves a descriptor for an ACL entry
-specified by the argument
-.Fa entry_d
-within the ACL indicated by the argument
-.Fa acl .
-.Pp
-If the value of
-.Fa entry_id
-is
-.Dv ACL_FIRST_ENTRY ,
-then the function will return in
-.Fa entry_p
-a descriptor for the first ACL entry within
-.Fa acl .
-If a call is made to
-.Fn acl_get_entry
-with
-.Fa entry_id
-set to
-.Dv ACL_NEXT_ENTRY
-when there has not been either an initial successful call to
-.Fn acl_get_entry ,
-or a previous successful call to
-.Fn acl_create_entry ,
-.Fn acl_delete_entry ,
-.Fn acl_dup ,
-.Fn acl_from_text ,
-.Fn acl_get_fd ,
-.Fn acl_get_file ,
-.Fn acl_set_fd ,
-.Fn acl_set_file ,
-or
-.Fn acl_valid ,
-then the result is unspecified.
-.Sh RETURN VALUES
-If the
-.Fn acl_get_entry
-function successfully obtains an ACL entry, a value of 1 is returned.
-If the ACL has no ACL entries, the
-.Fn acl_get_entry
-returns a value of 0.
-If the value of
-.Fa entry_id
-is
-.Dv ACL_NEXT_ENTRY
-and the last ACL entry in the ACL has already been returned by a
-previous call to
-.Fn acl_get_entry ,
-a value of 0 will be returned until a successful call with
-.Fa entry_id
-of
-.Dv ACL_FIRST_ENTRY
-is made.
-Otherwise, a value of -1 will be returned and
-the global variable
-.Va errno
-will be set to indicate the error.
-.Sh ERRORS
-The
-.Fn acl_get_entry
-fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl
-does not point to a valid ACL.
-Argument
-.Fa entry_id
-is neither
-.Dv ACL_FIRST_ENTRY
-nor
-.Dv ACL_NEXT_ENTRY .
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_calc_mask 3 ,
-.Xr acl_create_entry 3 ,
-.Xr acl_delete_entry 3 ,
-.Xr acl_dup 3 ,
-.Xr acl_from_text 3 ,
-.Xr acl_get_fd 3 ,
-.Xr acl_get_file 3 ,
-.Xr acl_init 3 ,
-.Xr acl_set_fd 3 ,
-.Xr acl_set_file 3 ,
-.Xr acl_valid 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_entry
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_entry
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_entry_type_np.3 b/lib/libc/posix1e/acl_get_entry_type_np.3
deleted file mode 100644
index 95e5345..0000000
--- a/lib/libc/posix1e/acl_get_entry_type_np.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get_entry_type_np.3 204725 2010-03-04 19:38:24Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_GET_ENTRY_TYPE_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_entry_type_np
-.Nd retrieve the ACL type from an NFSv4 ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_entry_type_np "acl_entry_t entry_d" "acl_entry_type_t *entry_type_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_entry_type_np
-function
-is a non-portable call that returns the ACL type for the NFSv4 ACL entry
-.Fa entry_d .
-Upon successful completion, the location referred to by the argument
-.Fa entry_type_p
-will be set to the ACL type of the ACL entry
-.Fa entry_d .
-.Sh RETURN VALUES
-.Rv -std acl_get_entry_type_np
-.Sh ERRORS
-The
-.Fn acl_get_entry_type_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an NFSv4 ACL entry;
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_set_entry_type_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_entry_type_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_entry_type_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_flag_np.3 b/lib/libc/posix1e/acl_get_flag_np.3
deleted file mode 100644
index 9a06aed..0000000
--- a/lib/libc/posix1e/acl_get_flag_np.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get_flag_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_GET_FLAG_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_flag_np
-.Nd check if a flag is set in a flagset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_flag_np "acl_flagset_t flagset_d" "acl_flag_t flag"
-.Sh DESCRIPTION
-The
-.Fn acl_get_flag_np
-function
-is a non-portable function that checks if a NFSv4 ACL flag is set in
-a flagset.
-.Sh RETURN VALUES
-If the flag in
-.Fa flag
-is set in the flagset
-.Fa flagset_d ,
-a value of
-1
-is returned, otherwise a value of
-0
-is returned.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_get_flag_np
-function will return a value of
-\-1
-and set global variable
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa flag
-does not contain a valid ACL flag or argument
-.Fa flagset_d
-is not a valid ACL flagset.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_flag_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_flag_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_flagset_np.3 b/lib/libc/posix1e/acl_get_flagset_np.3
deleted file mode 100644
index a25b738..0000000
--- a/lib/libc/posix1e/acl_get_flagset_np.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get_flagset_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_GET_FLAGSET_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_flagset_np
-.Nd retrieve flagset from an NFSv4 ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_flagset_np "acl_entry_t entry_d" "acl_flagset_t *flagset_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_flagset_np
-function
-is a non-portable call that returns via
-.Fa flagset_np_p
-a descriptor to the flagset in the NFSv4 ACL entry
-.Fa entry_d .
-Subsequent operations using the returned flagset operate
-on the flagset within the ACL entry.
-.Sh RETURN VALUES
-.Rv -std acl_get_flagset_np
-.Sh ERRORS
-The
-.Fn acl_get_flagset_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_flagset_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_flagset_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_get_perm_np.3 b/lib/libc/posix1e/acl_get_perm_np.3
deleted file mode 100644
index 1fb007e..0000000
--- a/lib/libc/posix1e/acl_get_perm_np.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_perm_np.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd April 10, 2001
-.Dt ACL_GET_PERM_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_perm_np
-.Nd "check if a permission is set in a permission set"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_perm_np "acl_permset_t permset_d" "acl_perm_t perm"
-.Sh DESCRIPTION
-The
-.Fn acl_get_perm_np
-function
-is a non-portable function that checks if a permission is set in
-a permission set.
-.Sh RETURN VALUES
-If the permission in
-.Fa perm
-is set in the permission set
-.Fa permset_d ,
-a value of
-1
-is returned, otherwise a value of
-0
-is returned.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_get_perm_np
-function will return a value of
-\-1
-and set global variable
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa perm
-does not contain a valid ACL permission or argument
-.Fa permset_d
-is not a valid ACL permset.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_perm_np
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_perm_np
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_permset.3 b/lib/libc/posix1e/acl_get_permset.3
deleted file mode 100644
index 0c84964..0000000
--- a/lib/libc/posix1e/acl_get_permset.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_permset.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_GET_PERMSET 3
-.Os
-.Sh NAME
-.Nm acl_get_permset
-.Nd retrieve permission set from an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_permset "acl_entry_t entry_d" "acl_permset_t *permset_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_permset
-function
-is a POSIX.1e call that returns via
-.Fa permset_p
-a descriptor to the permission set in the ACL entry
-.Fa entry_d .
-Subsequent operations using the returned permission set operate
-on the permission set within the ACL entry.
-.Sh RETURN VALUES
-.Rv -std acl_get_permset
-.Sh ERRORS
-The
-.Fn acl_get_permset
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_permset
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_permset
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_qualifier.3 b/lib/libc/posix1e/acl_get_qualifier.3
deleted file mode 100644
index 68b1494..0000000
--- a/lib/libc/posix1e/acl_get_qualifier.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_qualifier.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 13, 2001
-.Dt ACL_GET_QUALIFIER 3
-.Os
-.Sh NAME
-.Nm acl_get_qualifier
-.Nd retrieve the qualifier from an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft void *
-.Fn acl_get_qualifier "acl_entry_t entry_d"
-.Sh DESCRIPTION
-The
-.Fn acl_get_qualifier
-function
-is a POSIX.1e call that retrieves the qualifier of the tag for
-the ACL entry indicated by the argument
-.Fa entry_d
-into working storage and returns a pointer to that storage.
-.Pp
-If the value of the tag type in the ACL entry referred to by
-.Fa entry_d
-is
-.Dv ACL_USER ,
-then the value returned by
-.Fn acl_get_qualifier
-will be a pointer to type
-.Vt uid_t .
-.Pp
-If the value of the tag type in
-the ACL entry referred to by
-.Fa entry_d
-is
-.Dv ACL_GROUP ,
-then the value returned by
-.Fn acl_get_qualifier
-will be a pointer to type
-.Vt gid_t .
-.Pp
-If the value of the tag type in the ACL entry referred to by
-.Fa entry_d
-is
-.Dv ACL_UNDEFINED_TAG , ACL_USER_OBJ , ACL_GROUP_OBJ ,
-.Dv ACL_OTHER , ACL_MASK ,
-or an implementation-defined value for which a qualifier
-is not supported, then
-.Fn acl_get_qualifier
-will return a value of
-.Vt ( void * ) Ns Dv NULL
-and the function will fail.
-.Pp
-This function may cause memory to be allocated.
-The caller should
-free any releasable memory, when the new qualifier is no longer
-required, by calling
-.Fn acl_free
-with
-.Vt void *
-as the argument.
-.Sh RETURN VALUES
-The
-.Fn acl_get_qualifier
-function returns a pointer to the allocated storage if successful;
-otherwise a
-.Dv NULL
-pointer is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn acl_get_qualifier
-fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-does not point to a valid descriptor for an ACL entry.
-The
-value of the tag type in the ACL entry referenced by argument
-.Fa entry_d
-is not
-.Dv ACL_USER
-or
-.Dv ACL_GROUP .
-.It Bq Er ENOMEM
-The value to be returned requires more memory than is allowed
-by the hardware or system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_create_entry 3 ,
-.Xr acl_free 3 ,
-.Xr acl_get_entry 3 ,
-.Xr acl_get_tag_type 3 ,
-.Xr acl_set_qualifier 3 ,
-.Xr acl_set_tag_type 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_qualifier
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_qualifier
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_get_tag_type.3 b/lib/libc/posix1e/acl_get_tag_type.3
deleted file mode 100644
index 37cf258..0000000
--- a/lib/libc/posix1e/acl_get_tag_type.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_tag_type.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_GET_TAG_TYPE 3
-.Os
-.Sh NAME
-.Nm acl_get_tag_type
-.Nd retrieve the tag type from an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_tag_type "acl_entry_t entry_d" "acl_tag_t *tag_type_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_tag_type
-function
-is a POSIX.1e call that returns the tag type for the ACL entry
-.Fa entry_d .
-Upon successful completion, the location referred to by the argument
-.Fa tag_type_p
-will be set to the tag type of the ACL entry
-.Fa entry_d .
-.Sh RETURN VALUES
-.Rv -std acl_get_tag_type
-.Sh ERRORS
-The
-.Fn acl_get_tag_type
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry;
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_create_entry 3 ,
-.Xr acl_get_entry 3 ,
-.Xr acl_get_qualifier 3 ,
-.Xr acl_init 3 ,
-.Xr acl_set_qualifier 3 ,
-.Xr acl_set_tag_type 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_tag_type
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_tag_type
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_id_to_name.c b/lib/libc/posix1e/acl_id_to_name.c
deleted file mode 100644
index 783b8a4..0000000
--- a/lib/libc/posix1e/acl_id_to_name.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 1999-2001, 2008 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * Support functionality for the POSIX.1e ACL interface
- * These calls are intended only to be called within the library.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_id_to_name.c 209147 2010-06-14 02:26:13Z kientzle $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <errno.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "acl_support.h"
-
-/*
- * Given a uid/gid, return a username/groupname for the text form of an ACL.
- * Note that we truncate user and group names, rather than error out, as
- * this is consistent with other tools manipulating user and group names.
- * XXX NOT THREAD SAFE, RELIES ON GETPWUID, GETGRGID
- * XXX USES *PW* AND *GR* WHICH ARE STATEFUL AND THEREFORE THIS ROUTINE
- * MAY HAVE SIDE-EFFECTS
- */
-int
-_posix1e_acl_id_to_name(acl_tag_t tag, uid_t id, ssize_t buf_len, char *buf,
-    int flags)
-{
-	struct group	*g;
-	struct passwd	*p;
-	int	i;
-
-	switch(tag) {
-	case ACL_USER:
-		if (flags & ACL_TEXT_NUMERIC_IDS)
-			p = NULL;
-		else
-			p = getpwuid(id);
-		if (!p)
-			i = snprintf(buf, buf_len, "%d", id);
-		else
-			i = snprintf(buf, buf_len, "%s", p->pw_name);
-
-		if (i < 0) {
-			errno = ENOMEM;
-			return (-1);
-		}
-		return (0);
-
-	case ACL_GROUP:
-		if (flags & ACL_TEXT_NUMERIC_IDS)
-			g = NULL;
-		else
-			g = getgrgid(id);
-		if (g == NULL)
-			i = snprintf(buf, buf_len, "%d", id);
-		else
-			i = snprintf(buf, buf_len, "%s", g->gr_name);
-
-		if (i < 0) {
-			errno = ENOMEM;
-			return (-1);
-		}
-		return (0);
-
-	default:
-		return (EINVAL);
-	}
-}
diff --git a/lib/libc/posix1e/acl_init.3 b/lib/libc/posix1e/acl_init.3
deleted file mode 100644
index e298454..0000000
--- a/lib/libc/posix1e/acl_init.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_init.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd January 28, 2000
-.Dt ACL_INIT 3
-.Os
-.Sh NAME
-.Nm acl_init
-.Nd initialize ACL working storage
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_init "int count"
-.Sh DESCRIPTION
-The
-.Fn acl_init
-function allocates and initializes the working storage for an ACL of at
-least
-.Va count
-ACL entries.
-A pointer to the working storage is returned.
-The working
-storage allocated to contain the ACL is freed by a call to
-.Xr acl_free 3 .
-When the area is first allocated, it shall contain an ACL that contains
-no ACL entries.
-.Pp
-This function may cause memory to be allocated.
-The caller should free any
-releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void*)acl_t
-as an argument.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, this function shall return a pointer to the
-working storage.
-Otherwise, a value of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_init
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of count is less than zero.
-.It Bq Er ENOMEM
-The
-.Va acl_t
-to be returned requires more memory than is allowed by the hardware or
-system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
deleted file mode 100644
index bc512d8..0000000
--- a/lib/libc/posix1e/acl_init.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * acl_init -- return a fresh acl structure
- * acl_dup -- duplicate an acl and return the new copy
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_init.c 194955 2009-06-25 12:46:59Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "acl_support.h"
-
-#ifndef CTASSERT
-#define CTASSERT(x)		_CTASSERT(x, __LINE__)
-#define _CTASSERT(x, y)		__CTASSERT(x, y)
-#define __CTASSERT(x, y)	typedef char __assert_ ## y [(x) ? 1 : -1]
-#endif
-
-CTASSERT(1 << _ACL_T_ALIGNMENT_BITS > sizeof(struct acl_t_struct));
-
-acl_t
-acl_init(int count)
-{
-	int error;
-	acl_t acl;
-
-	if (count > ACL_MAX_ENTRIES) {
-		errno = ENOMEM;
-		return (NULL);
-	}
-	if (count < 0) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	error = posix_memalign((void *)&acl, 1 << _ACL_T_ALIGNMENT_BITS,
-	    sizeof(struct acl_t_struct));
-	if (error)
-		return (NULL);
-
-	bzero(acl, sizeof(struct acl_t_struct));
-	acl->ats_brand = ACL_BRAND_UNKNOWN;
-	acl->ats_acl.acl_maxcnt = ACL_MAX_ENTRIES;
-
-	return (acl);
-}
-
-acl_t
-acl_dup(acl_t acl)
-{
-	acl_t	acl_new;
-
-	acl_new = acl_init(ACL_MAX_ENTRIES);
-	if (acl_new != NULL) {
-		*acl_new = *acl;
-		acl->ats_cur_entry = 0;
-		acl_new->ats_cur_entry = 0;
-	}
-
-	return (acl_new);
-}
diff --git a/lib/libc/posix1e/acl_is_trivial_np.3 b/lib/libc/posix1e/acl_is_trivial_np.3
deleted file mode 100644
index 11d4299..0000000
--- a/lib/libc/posix1e/acl_is_trivial_np.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_is_trivial_np.3 258877 2013-12-03 18:28:18Z trasz $
-.\"
-.Dd November 12, 2013
-.Dt ACL_STRIP_NP 3
-.Os
-.Sh NAME
-.Nm acl_is_trivial_np
-.Nd determine whether ACL is trivial
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_is_trivial_np "const acl_t aclp" "int *trivialp"
-.Sh DESCRIPTION
-The
-.Fn acl_is_trivial
-function determines whether the ACL pointed to by the argument
-.Va acl
-is trivial.
-Upon successful completion, the location referred to by the argument
-.Fa trivialp
-will be set to 1, if the ACL
-.Fa aclp
-points to is trivial, or 0 if it's not.
-.Pp
-ACL is trivial if it can be fully expressed as a file mode without losing
-any access rules.
-For POSIX.1e ACLs, ACL is trivial if it has the three required entries,
-one for owner, one for owning group, and one for other.
-For NFSv4 ACLs, ACL is trivial if it is identical to the ACL generated by
-.Fn acl_strip_np 3 .
-Files that have non-trivial ACL have a plus sign appended after mode bits
-in "ls -l" output.
-.Sh RETURN VALUES
-.Rv -std acl_get_tag_type
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_is_trivial_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c
deleted file mode 100644
index ae60081..0000000
--- a/lib/libc/posix1e/acl_perm.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_perm.c 208437 2010-05-23 08:12:36Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <string.h>
-
-static int
-_perm_is_invalid(acl_perm_t perm)
-{
-
-	/* Check if more than a single bit is set. */
-	if ((perm & -perm) == perm &&
-	    (perm & (ACL_POSIX1E_BITS | ACL_NFS4_PERM_BITS)) == perm)
-		return (0);
-
-	errno = EINVAL;
-
-	return (1);
-}
-
-/*
- * acl_add_perm() (23.4.1): add the permission contained in perm to the
- * permission set permset_d
- */
-int
-acl_add_perm(acl_permset_t permset_d, acl_perm_t perm)
-{
-
-	if (permset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_perm_is_invalid(perm))
-		return (-1);
-
-	*permset_d |= perm;
-
-	return (0);
-}
-
-/*
- * acl_clear_perms() (23.4.3): clear all permisions from the permission
- * set permset_d
- */
-int
-acl_clear_perms(acl_permset_t permset_d)
-{
-
-	if (permset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*permset_d = ACL_PERM_NONE;
-
-	return (0);
-}
-
-/*
- * acl_delete_perm() (23.4.10): remove the permission in perm from the
- * permission set permset_d
- */
-int
-acl_delete_perm(acl_permset_t permset_d, acl_perm_t perm)
-{
-
-	if (permset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_perm_is_invalid(perm))
-		return (-1);
-
-	*permset_d &= ~perm;
-
-	return (0);
-}
-
-int
-acl_get_perm_np(acl_permset_t permset_d, acl_perm_t perm)
-{
-
-	if (permset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_perm_is_invalid(perm))
-		return (-1);
-
-	if (*permset_d & perm)
-		return (1);
-
-	return (0);
-}
diff --git a/lib/libc/posix1e/acl_set.3 b/lib/libc/posix1e/acl_set.3
deleted file mode 100644
index 7a1e45d..0000000
--- a/lib/libc/posix1e/acl_set.3
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_set.3 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd June 25, 2009
-.Dt ACL_SET 3
-.Os
-.Sh NAME
-.Nm acl_set_fd ,
-.Nm acl_set_fd_np ,
-.Nm acl_set_file ,
-.Nm acl_set_link_np
-.Nd set an ACL for a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_fd "int fd" "acl_t acl"
-.Ft int
-.Fn acl_set_fd_np "int fd" "acl_t acl" "acl_type_t type"
-.Ft int
-.Fn acl_set_file "const char *path_p" "acl_type_t type" "acl_t acl"
-.Ft int
-.Fn acl_set_link_np "const char *path_p" "acl_type_t type" "acl_t acl"
-.Sh DESCRIPTION
-The
-.Fn acl_set_fd ,
-.Fn acl_set_fd_np ,
-.Fn acl_set_file ,
-and
-.Fn acl_set_link_np
-each associate an ACL with an object referred to by
-.Va fd
-or
-.Va path_p .
-The
-.Fn acl_set_fd_np
-and
-.Fn acl_set_link_np
-functions are not POSIX.1e calls.
-The
-.Fn acl_set_fd
-function allows only the setting of ACLs of type ACL_TYPE_ACCESS
-where as
-.Fn acl_set_fd_np
-allows the setting of ACLs of any type.
-The
-.Fn acl_set_link_np
-function acts on a symlink rather than its target, if the target of the
-path is a symlink.
-.Pp
-Valid values for the
-.Va type
-argument are:
-.Bl -column -offset 3n "ACL_TYPE_DEFAULT"
-.It ACL_TYPE_ACCESS	POSIX.1e access ACL
-.It ACL_TYPE_DEFAULT	POSIX.1e default ACL
-.It ACL_TYPE_NFS4	NFSv4 ACL
-.El
-.Pp
-Trying to set ACL_TYPE_NFS4 with
-.Va acl
-branded as POSIX.1e, or ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT with ACL
-branded as NFSv4, will result in error.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-If any of the following conditions occur, these functions shall return
--1 and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or the
-object exists and the process does not have appropriate access rights.
-.It Bq Er EBADF
-The
-.Va fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL for this object, or the ACL type
-specified in
-.Va type
-is invalid for this object, or there is branding mismatch.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an
-entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named object does not exist, or the
-.Va path_p
-argument points to an empty string.
-.It Bq Er ENOMEM
-Insufficient memory available to fulfill request.
-.It Bq Er ENOSPC
-The directory or file system that would contain the new ACL cannot be
-extended, or the file system is out of file allocation resources.
-.It Bq Er EOPNOTSUPP
-The file system does not support ACL retrieval.
-.It Bq Er EROFS
-This function requires modification of a file system which is currently
-read-only.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_delete 3 ,
-.Xr acl_get 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_valid 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
deleted file mode 100644
index 00f959b..0000000
--- a/lib/libc/posix1e/acl_set.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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.
- */
-/*
- * acl_set_file -- set a file/directory ACL by name
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_set.c 208785 2010-06-03 14:29:17Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "acl_support.h"
-
-/*
- * For POSIX.1e-semantic ACLs, do a presort so the kernel doesn't have to
- * (the POSIX.1e semantic code will reject unsorted ACL submission).  If it's
- * not a semantic that the library knows about, just submit it flat and
- * assume the caller knows what they're up to.
- */
-int
-acl_set_file(const char *path_p, acl_type_t type, acl_t acl)
-{
-
-	if (acl == NULL || path_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_acl_type_not_valid_for_acl(acl, type)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	acl->ats_cur_entry = 0;
-
-	return (__acl_set_file(path_p, type, &acl->ats_acl));
-}
-
-int
-acl_set_link_np(const char *path_p, acl_type_t type, acl_t acl)
-{
-
-	if (acl == NULL || path_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_acl_type_not_valid_for_acl(acl, type)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	acl->ats_cur_entry = 0;
-
-	return (__acl_set_link(path_p, type, &acl->ats_acl));
-}
-
-int
-acl_set_fd(int fd, acl_t acl)
-{
-
-	if (fpathconf(fd, _PC_ACL_NFS4) == 1)
-		return (acl_set_fd_np(fd, acl, ACL_TYPE_NFS4));
-
-	return (acl_set_fd_np(fd, acl, ACL_TYPE_ACCESS));
-}
-
-int
-acl_set_fd_np(int fd, acl_t acl, acl_type_t type)
-{
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_acl_type_not_valid_for_acl(acl, type)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	acl->ats_cur_entry = 0;
-
-	return (___acl_set_fd(fd, type, &acl->ats_acl));
-}
-
-/*
- * acl_set_permset() (23.4.23): sets the permissions of ACL entry entry_d
- * with the permissions in permset_d
- */
-int
-acl_set_permset(acl_entry_t entry_d, acl_permset_t permset_d)
-{
-
-	if (!entry_d) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if ((*permset_d & ACL_POSIX1E_BITS) != *permset_d) {
-		if ((*permset_d & ACL_NFS4_PERM_BITS) != *permset_d) {
-			errno = EINVAL;
-			return (-1);
-		}
-		if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-			errno = EINVAL;
-			return (-1);
-		}
-		_entry_brand_as(entry_d, ACL_BRAND_NFS4);
-	}
-
-	entry_d->ae_perm = *permset_d;
-
-	return (0);
-}
-
-/*
- * acl_set_qualifier() sets the qualifier (ae_id) of the tag for
- * ACL entry entry_d to the value referred to by tag_qualifier_p
- */
-int
-acl_set_qualifier(acl_entry_t entry_d, const void *tag_qualifier_p)
-{
-
-	if (!entry_d || !tag_qualifier_p) {
-		errno = EINVAL;
-		return (-1);
-	}
-	switch(entry_d->ae_tag) {
-	case ACL_USER:
-	case ACL_GROUP:
-		entry_d->ae_id = *(uid_t *)tag_qualifier_p;
-		break;
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-
-	return (0);
-}
-
-/*
- * acl_set_tag_type() sets the tag type for ACL entry entry_d to the
- * value of tag_type
- */
-int
-acl_set_tag_type(acl_entry_t entry_d, acl_tag_t tag_type)
-{
-
-	if (entry_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	switch(tag_type) {
-	case ACL_OTHER:
-	case ACL_MASK:
-		if (!_entry_brand_may_be(entry_d, ACL_BRAND_POSIX)) {
-			errno = EINVAL;
-			return (-1);
-		}
-		_entry_brand_as(entry_d, ACL_BRAND_POSIX);
-		break;
-	case ACL_EVERYONE:
-		if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-			errno = EINVAL;
-			return (-1);
-		}
-		_entry_brand_as(entry_d, ACL_BRAND_NFS4);
-		break;
-	}
-
-	switch(tag_type) {
-	case ACL_USER_OBJ:
-	case ACL_USER:
-	case ACL_GROUP_OBJ:
-	case ACL_GROUP:
-	case ACL_MASK:
-	case ACL_OTHER:
-	case ACL_EVERYONE:
-		entry_d->ae_tag = tag_type;
-		return (0);
-	}
-
-	errno = EINVAL;
-	return (-1);
-}
-
-int
-acl_set_entry_type_np(acl_entry_t entry_d, acl_entry_type_t entry_type)
-{
-
-	if (entry_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	_entry_brand_as(entry_d, ACL_BRAND_NFS4);
-
-	switch (entry_type) {
-	case ACL_ENTRY_TYPE_ALLOW:
-	case ACL_ENTRY_TYPE_DENY:
-	case ACL_ENTRY_TYPE_AUDIT:
-	case ACL_ENTRY_TYPE_ALARM:
-		entry_d->ae_entry_type = entry_type;
-		return (0);
-	}
-
-	errno = EINVAL;
-	return (-1);
-}
diff --git a/lib/libc/posix1e/acl_set_entry_type_np.3 b/lib/libc/posix1e/acl_set_entry_type_np.3
deleted file mode 100644
index 9adbdf9..0000000
--- a/lib/libc/posix1e/acl_set_entry_type_np.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_set_entry_type_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_SET_ENTRY_TYPE_NP 3
-.Os
-.Sh NAME
-.Nm acl_set_entry_type_np
-.Nd set NFSv4 ACL entry type
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_entry_type_np "acl_entry_t entry_d" "acl_entry_type_t entry_type"
-.Sh DESCRIPTION
-The
-.Fn acl_set_entry_type_np
-function
-is a non-portable call that sets the type of the NFSv4 ACL entry
-.Fa entry_d
-to the value referred to by
-.Fa entry_type .
-.Pp
-Valid values are:
-.Bl -column -offset 3n "ACL_ENTRY_TYPE_ALLOW"
-.It ACL_ENTRY_TYPE_ALLOW Ta "allow" type entry
-.It ACL_ENTRY_TYPE_DENY Ta "deny" type entry
-.El
-.Pp
-This call brands the ACL as NFSv4.
-.Sh RETURN VALUES
-.Rv -std acl_set_entry_type_np
-.Sh ERRORS
-The
-.Fn acl_set_entry_type_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-The value pointed to by
-.Fa entry_type
-is not valid.
-ACL is already branded as POSIX.1e.
-.It Bq Er ENOMEM
-The value to be returned requires more memory than is allowed
-by the hardware or system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_get_entry_type_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_entry_type_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_entry_type_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_set_flagset_np.3 b/lib/libc/posix1e/acl_set_flagset_np.3
deleted file mode 100644
index 4bc257a..0000000
--- a/lib/libc/posix1e/acl_set_flagset_np.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_set_flagset_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_SET_FLAGSET_NP 3
-.Os
-.Sh NAME
-.Nm acl_set_flagset_np
-.Nd set the flags of an NFSv4 ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_flagset_np "acl_entry_t entry_d" "acl_flagset_t flagset_d"
-.Sh DESCRIPTION
-The
-.Fn acl_set_flagset_np
-function
-is a non-portable call that sets the flags of NFSv4 ACL entry
-.Fa entry_d
-with the flags contained in
-.Fa flagset_d .
-.Pp
-This call brands the ACL as NFSv4.
-.Sh RETURN VALUES
-.Rv -std acl_set_flagset_np
-.Sh ERRORS
-The
-.Fn acl_set_flagset_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-ACL is already branded as POSIX.1e.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_set_flagset_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_set_flagset_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_set_permset.3 b/lib/libc/posix1e/acl_set_permset.3
deleted file mode 100644
index f8aa51b..0000000
--- a/lib/libc/posix1e/acl_set_permset.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_set_permset.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_SET_PERMSET 3
-.Os
-.Sh NAME
-.Nm acl_set_permset
-.Nd set the permissions of an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_permset "acl_entry_t entry_d" "acl_permset_t permset_d"
-.Sh DESCRIPTION
-The
-.Fn acl_set_permset
-function
-is a POSIX.1e call that sets the permissions of ACL entry
-.Fa entry_d
-with the permissions contained in
-.Fa permset_d .
-.Sh RETURN VALUES
-.Rv -std acl_set_permset
-.Sh ERRORS
-The
-.Fn acl_set_permset
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_get_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_set_permset
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_set_permset
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_set_qualifier.3 b/lib/libc/posix1e/acl_set_qualifier.3
deleted file mode 100644
index 1556df5..0000000
--- a/lib/libc/posix1e/acl_set_qualifier.3
+++ /dev/null
@@ -1,91 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_set_qualifier.3 191520 2009-04-26 10:12:20Z trasz $
-.\"
-.Dd March 10, 2001
-.Dt ACL_SET_QUALIFIER 3
-.Os
-.Sh NAME
-.Nm acl_set_qualifier
-.Nd set ACL tag qualifier
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_qualifier "acl_entry_t entry_d" "const void *tag_qualifier_p"
-.Sh DESCRIPTION
-The
-.Fn acl_set_qualifier
-function
-is a POSIX.1e call that sets the qualifier of the tag for the ACL entry
-.Fa entry_d
-to the value referred to by
-.Fa tag_qualifier_p .
-.Sh RETURN VALUES
-.Rv -std acl_set_qualifier
-.Sh ERRORS
-The
-.Fn acl_set_qualifier
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-The tag type of the
-ACL entry
-.Fa entry_d
-is not
-.Dv ACL_USER
-or
-.Dv ACL_GROUP .
-The value pointed to by
-.Fa tag_qualifier_p
-is not valid.
-.It Bq Er ENOMEM
-The value to be returned requires more memory than is allowed
-by the hardware or system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_qualifier 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_qualifier
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_qualifier
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_set_tag_type.3 b/lib/libc/posix1e/acl_set_tag_type.3
deleted file mode 100644
index 127d3fb..0000000
--- a/lib/libc/posix1e/acl_set_tag_type.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_set_tag_type.3 233665 2012-03-29 16:02:40Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_SET_TAG_TYPE 3
-.Os
-.Sh NAME
-.Nm acl_set_tag_type
-.Nd set the tag type of an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_tag_type "acl_entry_t entry_d" "acl_tag_t tag_type"
-.Sh DESCRIPTION
-The
-.Fn acl_set_tag_type
-function
-is a POSIX.1e call that sets the ACL tag type of ACL entry
-.Fa entry_d
-to the value of
-.Fa tag_type .
-.Pp
-Valid values are:
-.Bl -column -offset 3n "ACL_OTHER_OBJ"
-.It ACL_USER_OBJ Ta "Permissions apply to file owner"
-.It ACL_USER Ta "Permissions apply to additional user specified by qualifier"
-.It ACL_GROUP_OBJ Ta "Permissions apply to file group"
-.It ACL_GROUP Ta "Permissions apply to additional group specified by qualifier"
-.It ACL_MASK Ta "Permissions specify mask"
-.It ACL_OTHER Ta Permissions apply to "other"
-.It ACL_OTHER_OBJ Ta "Same as ACL_OTHER"
-.It ACL_EVERYONE Ta Permissions apply to "everyone@"
-.El
-.Pp
-Calling
-.Fn acl_set_tag_type
-with
-.Fa tag_type
-equal to ACL_MASK, ACL_OTHER or ACL_OTHER_OBJ brands the ACL as POSIX.1e.
-Calling it with ACL_EVERYONE brands the ACL as NFSv4.
-.Sh RETURN VALUES
-.Rv -std acl_set_tag_type
-.Sh ERRORS
-The
-.Fn acl_set_tag_type
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-Argument
-.Fa tag_type
-is not a valid ACL tag type.
-ACL is already branded differently.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_get_tag_type 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_set_tag_type
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_set_tag_type
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc/posix1e/acl_size.c b/lib/libc/posix1e/acl_size.c
deleted file mode 100644
index a7a4e3c..0000000
--- a/lib/libc/posix1e/acl_size.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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 THE VOICES IN HIS HEAD 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_size.c,v 1.4 2002/03/22 21:52:38 obrien Exp $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-
-ssize_t
-acl_size(acl_t acl)
-{
-
-	errno = ENOSYS;
-	return (-1);
-}
diff --git a/lib/libc/posix1e/acl_strip.c b/lib/libc/posix1e/acl_strip.c
deleted file mode 100644
index 096b643..0000000
--- a/lib/libc/posix1e/acl_strip.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*-
- * Copyright (c) 2001 Chris D. Faulhaber
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_strip.c 219878 2011-03-22 17:44:07Z trasz $");
-
-#include <errno.h>
-#include <stdio.h>
-#include <assert.h>
-#include <sys/acl.h>
-#include <sys/stat.h>
-
-#include "acl_support.h"
-
-/*
- * These routines from sys/kern/subr_acl_nfs4.c are used by both kernel
- * and libc.
- */
-void	acl_nfs4_sync_mode_from_acl(mode_t *_mode, const struct acl *aclp);
-void	acl_nfs4_trivial_from_mode_libc(struct acl *aclp, int file_owner_id,
-	    int canonical_six);
-
-static acl_t
-_nfs4_acl_strip_np(const acl_t aclp, int canonical_six)
-{
-	acl_t newacl;
-	mode_t mode = 0;
-
-	newacl = acl_init(ACL_MAX_ENTRIES);
-	if (newacl == NULL) {
-		errno = ENOMEM;
-		return (NULL);
-	}
-
-	_acl_brand_as(newacl, ACL_BRAND_NFS4);
-
-	acl_nfs4_sync_mode_from_acl(&mode, &(aclp->ats_acl));
-	acl_nfs4_trivial_from_mode_libc(&(newacl->ats_acl), mode, canonical_six);
-
-	return (newacl);
-}
-
-static acl_t
-_posix1e_acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	acl_t acl_new, acl_old;
-	acl_entry_t entry, entry_new;
-	acl_permset_t perm;
-	acl_tag_t tag;
-	int entry_id, have_mask_entry;
-
-	assert(_acl_brand(aclp) == ACL_BRAND_POSIX);
-
-	acl_old = acl_dup(aclp);
-	if (acl_old == NULL)
-		return (NULL);
-
-	assert(_acl_brand(acl_old) == ACL_BRAND_POSIX);
-
-	have_mask_entry = 0;
-	acl_new = acl_init(ACL_MAX_ENTRIES);
-	if (acl_new == NULL)
-		return (NULL);
-	tag = ACL_UNDEFINED_TAG;
-
-	/* only save the default user/group/other entries */
-	entry_id = ACL_FIRST_ENTRY;
-	while (acl_get_entry(acl_old, entry_id, &entry) == 1) {
-		entry_id = ACL_NEXT_ENTRY;
-
-		assert(_entry_brand(entry) == ACL_BRAND_POSIX);
-
-		if (acl_get_tag_type(entry, &tag) == -1)
-			return (NULL);
-
-		switch(tag) {
-		case ACL_USER_OBJ:
-		case ACL_GROUP_OBJ:
-		case ACL_OTHER:
-			if (acl_get_tag_type(entry, &tag) == -1)
-				return (NULL);
-			if (acl_get_permset(entry, &perm) == -1)
-				return (NULL);
-			if (acl_create_entry(&acl_new, &entry_new) == -1)
-				return (NULL);
-			if (acl_set_tag_type(entry_new, tag) == -1)
-				return (NULL);
-			if (acl_set_permset(entry_new, perm) == -1)
-				return (NULL);
-			if (acl_copy_entry(entry_new, entry) == -1)
-				return (NULL);
-			assert(_entry_brand(entry_new) == ACL_BRAND_POSIX);
-			break;
-		case ACL_MASK:
-			have_mask_entry = 1;
-			break;
-		default:
-			break;
-		}
-	}
-
-	assert(_acl_brand(acl_new) == ACL_BRAND_POSIX);
-
-	if (have_mask_entry && recalculate_mask) {
-		if (acl_calc_mask(&acl_new) == -1)
-			return (NULL);
-	}
-
-	return (acl_new);
-}
-
-acl_t
-acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	switch (_acl_brand(aclp)) {
-	case ACL_BRAND_NFS4:
-		return (_nfs4_acl_strip_np(aclp, 0));
-
-	case ACL_BRAND_POSIX:
-		return (_posix1e_acl_strip_np(aclp, recalculate_mask));
-
-	default:
-		errno = EINVAL;
-		return (NULL);
-	}
-}
-
-/*
- * Return 1, if ACL is trivial, 0 otherwise.
- *
- * ACL is trivial, iff its meaning could be fully expressed using just file
- * mode.  In other words, ACL is trivial iff it doesn't have "+" to the right
- * of the mode bits in "ls -l" output ;-)
- */
-int
-acl_is_trivial_np(const acl_t aclp, int *trivialp)
-{
-	acl_t tmpacl;
-	int differs;
-
-	if (aclp == NULL || trivialp == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	switch (_acl_brand(aclp)) {
-	case ACL_BRAND_POSIX:
-		if (aclp->ats_acl.acl_cnt == 3)
-			*trivialp = 1;
-		else
-			*trivialp = 0;
-
-		return (0);
-
-	case ACL_BRAND_NFS4:
-		/*
-		 * If the ACL has more than canonical six entries,
-		 * it's non trivial by definition.
-		 */
-		if (aclp->ats_acl.acl_cnt > 6) {
-			*trivialp = 0;
-			return (0);
-		}
-			
-		/*
-		 * Calculate trivial ACL - using acl_strip_np(3) - and compare
-		 * with the original.
-		 */
-		tmpacl = _nfs4_acl_strip_np(aclp, 0);
-		if (tmpacl == NULL)
-			return (-1);
-
-		differs = _acl_differs(aclp, tmpacl);
-		acl_free(tmpacl);
-
-		if (differs == 0) {
-			*trivialp = 1;
-			return (0);
-		}
-
-		/*
-		 * Try again with an old-style, "canonical six" trivial ACL.
-		 */
-		tmpacl = _nfs4_acl_strip_np(aclp, 1);
-		if (tmpacl == NULL)
-			return (-1);
-
-		differs = _acl_differs(aclp, tmpacl);
-		acl_free(tmpacl);
-
-		if (differs)
-			*trivialp = 0;
-		else
-			*trivialp = 1;
-
-		return (0);
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
diff --git a/lib/libc/posix1e/acl_strip_np.3 b/lib/libc/posix1e/acl_strip_np.3
deleted file mode 100644
index 77c108e..0000000
--- a/lib/libc/posix1e/acl_strip_np.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_strip_np.3 210772 2010-08-02 16:01:45Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_STRIP_NP 3
-.Os
-.Sh NAME
-.Nm acl_strip_np
-.Nd strip extended entries from an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_strip_np "const acl_t acl" "int recalculate_mask"
-.Sh DESCRIPTION
-The
-.Fn acl_strip_np
-function returns a pointer to a trivial ACL computed from the ACL pointed
-to by the argument
-.Va acl .
-.Pp
-This function may cause memory to be allocated.
-The caller should free any
-releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void*)acl_t
-as an argument.
-.Pp
-Any existing ACL pointers that refer to the ACL referred to by
-.Va acl
-shall continue to refer to the ACL.
-.Sh RETURN VALUES
-Upon successful completion, this function shall return a pointer to the
-newly allocated ACL.
-Otherwise, a value of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_init
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL.
-.It Bq Er ENOMEM
-The
-.Va acl_t
-to be returned requires more memory than is allowed by the hardware or
-system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_is_trivial_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_strip_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
deleted file mode 100644
index b7dc1f7..0000000
--- a/lib/libc/posix1e/acl_support.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*-
- * Copyright (c) 1999-2001, 2008 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * Support functionality for the POSIX.1e ACL interface
- * These calls are intended only to be called within the library.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_support.c 209147 2010-06-14 02:26:13Z kientzle $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <errno.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "acl_support.h"
-
-#define ACL_STRING_PERM_WRITE   'w'
-#define ACL_STRING_PERM_READ    'r'
-#define ACL_STRING_PERM_EXEC    'x'
-#define ACL_STRING_PERM_NONE    '-'
-
-/*
- * Return 0, if both ACLs are identical.
- */
-int
-_acl_differs(const acl_t a, const acl_t b)
-{
-	int i;
-	struct acl_entry *entrya, *entryb;
-
-	assert(_acl_brand(a) == _acl_brand(b));
-	assert(_acl_brand(a) != ACL_BRAND_UNKNOWN);
-	assert(_acl_brand(b) != ACL_BRAND_UNKNOWN);
-
-	if (a->ats_acl.acl_cnt != b->ats_acl.acl_cnt)
-		return (1);
-
-	for (i = 0; i < b->ats_acl.acl_cnt; i++) {
-		entrya = &(a->ats_acl.acl_entry[i]);
-		entryb = &(b->ats_acl.acl_entry[i]);
-
-		if (entrya->ae_tag != entryb->ae_tag ||
-		    entrya->ae_id != entryb->ae_id ||
-		    entrya->ae_perm != entryb->ae_perm ||
-		    entrya->ae_entry_type != entryb->ae_entry_type ||
-		    entrya->ae_flags != entryb->ae_flags)
-			return (1);
-	}
-
-	return (0);
-}
-
-/*
- * _posix1e_acl_entry_compare -- compare two acl_entry structures to
- * determine the order they should appear in.  Used by _posix1e_acl_sort to
- * sort ACL entries into the kernel-desired order -- i.e., the order useful
- * for evaluation and O(n) validity checking.  Beter to have an O(nlogn) sort
- * in userland and an O(n) in kernel than to have both in kernel.
- */
-typedef int (*compare)(const void *, const void *);
-static int
-_posix1e_acl_entry_compare(struct acl_entry *a, struct acl_entry *b)
-{
-
-	assert(_entry_brand(a) == ACL_BRAND_POSIX);
-	assert(_entry_brand(b) == ACL_BRAND_POSIX);
-
-	/*
-	 * First, sort between tags -- conveniently defined in the correct
-	 * order for verification.
-	 */
-	if (a->ae_tag < b->ae_tag)
-		return (-1);
-	if (a->ae_tag > b->ae_tag)
-		return (1);
-
-	/*
-	 * Next compare uids/gids on appropriate types.
-	 */
-
-	if (a->ae_tag == ACL_USER || a->ae_tag == ACL_GROUP) {
-		if (a->ae_id < b->ae_id)
-			return (-1);
-		if (a->ae_id > b->ae_id)
-			return (1);
-
-		/* shouldn't be equal, fall through to the invalid case */
-	}
-
-	/*
-	 * Don't know how to sort multiple entries of the rest--either it's
-	 * a bad entry, or there shouldn't be more than one.  Ignore and the
-	 * validity checker can get it later.
-	 */
-	return (0);
-}
-
-/*
- * _posix1e_acl_sort -- sort ACL entries in POSIX.1e-formatted ACLs.
- */
-void
-_posix1e_acl_sort(acl_t acl)
-{
-	struct acl *acl_int;
-
-	acl_int = &acl->ats_acl;
-
-	qsort(&acl_int->acl_entry[0], acl_int->acl_cnt,
-	    sizeof(struct acl_entry), (compare) _posix1e_acl_entry_compare);
-}
-
-/*
- * acl_posix1e -- in what situations should we acl_sort before submission?
- * We apply posix1e ACL semantics for any ACL of type ACL_TYPE_ACCESS or
- * ACL_TYPE_DEFAULT
- */
-int
-_posix1e_acl(acl_t acl, acl_type_t type)
-{
-
-	if (_acl_brand(acl) != ACL_BRAND_POSIX)
-		return (0);
-
-	return ((type == ACL_TYPE_ACCESS) || (type == ACL_TYPE_DEFAULT));
-}
-
-/*
- * _posix1e_acl_check -- given an ACL, check its validity.  This is mirrored
- * from code in sys/kern/kern_acl.c, and if changes are made in one, they
- * should be made in the other also.  This copy of acl_check is made
- * available * in userland for the benefit of processes wanting to check ACLs
- * for validity before submitting them to the kernel, or for performing
- * in userland file system checking.  Needless to say, the kernel makes
- * the real checks on calls to get/setacl.
- *
- * See the comments in kernel for explanation -- just briefly, it assumes
- * an already sorted ACL, and checks based on that assumption.  The
- * POSIX.1e interface, acl_valid(), will perform the sort before calling
- * this.  Returns 0 on success, EINVAL on failure.
- */
-int
-_posix1e_acl_check(acl_t acl)
-{
-	struct acl *acl_int;
-	struct acl_entry	*entry; 	/* current entry */
-	uid_t	highest_uid=0, highest_gid=0;
-	int	stage = ACL_USER_OBJ;
-	int	i = 0;
-	int	count_user_obj=0, count_user=0, count_group_obj=0,
-		count_group=0, count_mask=0, count_other=0;
-
-	acl_int = &acl->ats_acl;
-
-	/* printf("_posix1e_acl_check: checking acl with %d entries\n",
-	    acl->acl_cnt); */
-	while (i < acl_int->acl_cnt) {
-		entry = &acl_int->acl_entry[i];
-
-		if ((entry->ae_perm | ACL_PERM_BITS) != ACL_PERM_BITS)
-			return (EINVAL);
-
-		switch(entry->ae_tag) {
-		case ACL_USER_OBJ:
-			/* printf("_posix1e_acl_check: %d: ACL_USER_OBJ\n",
-			    i); */
-			if (stage > ACL_USER_OBJ)
-				return (EINVAL);
-			stage = ACL_USER;
-			count_user_obj++;
-			break;
-
-		case ACL_USER:
-			/* printf("_posix1e_acl_check: %d: ACL_USER\n", i); */
-			if (stage > ACL_USER)
-				return (EINVAL);
-			stage = ACL_USER;
-			if (count_user && (entry->ae_id <= highest_uid))
-				return (EINVAL);
-			highest_uid = entry->ae_id;
-			count_user++;
-			break;
-
-		case ACL_GROUP_OBJ:
-			/* printf("_posix1e_acl_check: %d: ACL_GROUP_OBJ\n",
-			    i); */
-			if (stage > ACL_GROUP_OBJ)
-				return (EINVAL);
-			stage = ACL_GROUP;
-			count_group_obj++;
-			break;
-
-		case ACL_GROUP:
-			/* printf("_posix1e_acl_check: %d: ACL_GROUP\n", i); */
-			if (stage > ACL_GROUP)
-				return (EINVAL);
-			stage = ACL_GROUP;
-			if (count_group && (entry->ae_id <= highest_gid))
-				return (EINVAL);
-			highest_gid = entry->ae_id;
-			count_group++;
-			break;
-
-		case ACL_MASK:
-			/* printf("_posix1e_acl_check: %d: ACL_MASK\n", i); */
-			if (stage > ACL_MASK)
-				return (EINVAL);
-			stage = ACL_MASK;
-			count_mask++;
-			break;
-
-		case ACL_OTHER:
-			/* printf("_posix1e_acl_check: %d: ACL_OTHER\n", i); */
-			if (stage > ACL_OTHER)
-				return (EINVAL);
-			stage = ACL_OTHER;
-			count_other++;
-			break;
-
-		default:
-			/* printf("_posix1e_acl_check: %d: INVALID\n", i); */
-			return (EINVAL);
-		}
-		i++;
-	}
-
-	if (count_user_obj != 1)
-		return (EINVAL);
-
-	if (count_group_obj != 1)
-		return (EINVAL);
-
-	if (count_mask != 0 && count_mask != 1)
-		return (EINVAL);
-
-	if (count_other != 1)
-		return (EINVAL);
-
-	return (0);
-}
-
-/*
- * Given a right-shifted permission (i.e., direct ACL_PERM_* mask), fill
- * in a string describing the permissions.
- */
-int
-_posix1e_acl_perm_to_string(acl_perm_t perm, ssize_t buf_len, char *buf)
-{
-
-	if (buf_len < _POSIX1E_ACL_STRING_PERM_MAXSIZE + 1) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	if ((perm | ACL_PERM_BITS) != ACL_PERM_BITS) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	buf[3] = 0;	/* null terminate */
-
-	if (perm & ACL_READ)
-		buf[0] = ACL_STRING_PERM_READ;
-	else
-		buf[0] = ACL_STRING_PERM_NONE;
-
-	if (perm & ACL_WRITE)
-		buf[1] = ACL_STRING_PERM_WRITE;
-	else
-		buf[1] = ACL_STRING_PERM_NONE;
-
-	if (perm & ACL_EXECUTE)
-		buf[2] = ACL_STRING_PERM_EXEC;
-	else
-		buf[2] = ACL_STRING_PERM_NONE;
-
-	return (0);
-}
-
-/*
- * given a string, return a permission describing it
- */
-int
-_posix1e_acl_string_to_perm(char *string, acl_perm_t *perm)
-{
-	acl_perm_t	myperm = ACL_PERM_NONE;
-	char	*ch;
-
-	ch = string;
-	while (*ch) {
-		switch(*ch) {
-		case ACL_STRING_PERM_READ:
-			myperm |= ACL_READ;
-			break;
-		case ACL_STRING_PERM_WRITE:
-			myperm |= ACL_WRITE;
-			break;
-		case ACL_STRING_PERM_EXEC:
-			myperm |= ACL_EXECUTE;
-			break;
-		case ACL_STRING_PERM_NONE:
-			break;
-		default:
-			return (EINVAL);
-		}
-		ch++;
-	}
-
-	*perm = myperm;
-	return (0);
-}
-
-/*
- * Add an ACL entry without doing much checking, et al
- */
-int
-_posix1e_acl_add_entry(acl_t acl, acl_tag_t tag, uid_t id, acl_perm_t perm)
-{
-	struct acl		*acl_int;
-	struct acl_entry	*e;
-
-	acl_int = &acl->ats_acl;
-
-	if (acl_int->acl_cnt >= ACL_MAX_ENTRIES) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	e = &(acl_int->acl_entry[acl_int->acl_cnt]);
-	e->ae_perm = perm;
-	e->ae_tag = tag;
-	e->ae_id = id;
-	acl_int->acl_cnt++;
-
-	return (0);
-}
-
-/*
- * Convert "old" type - ACL_TYPE_{ACCESS,DEFAULT}_OLD - into its "new"
- * counterpart.  It's neccessary for the old (pre-NFSv4 ACLs) binaries
- * to work with new libc and kernel.  Fixing 'type' for old binaries with
- * old libc and new kernel is being done by kern/vfs_acl.c:type_unold().
- */
-int
-_acl_type_unold(acl_type_t type)
-{
-
-	switch (type) {
-	case ACL_TYPE_ACCESS_OLD:
-		return (ACL_TYPE_ACCESS);
-	case ACL_TYPE_DEFAULT_OLD:
-		return (ACL_TYPE_DEFAULT);
-	default:
-		return (type);
-	}
-}
-
-char *
-string_skip_whitespace(char *string)
-{
-
-	while (*string && ((*string == ' ') || (*string == '\t')))
-		string++;
-
-	return (string);
-}
-
-void
-string_trim_trailing_whitespace(char *string)
-{
-	char	*end;
-
-	if (*string == '\0')
-		return;
-
-	end = string + strlen(string) - 1;
-
-	while (end != string) {
-		if ((*end == ' ') || (*end == '\t')) {
-			*end = '\0';
-			end--;
-		} else {
-			return;
-		}
-	}
-
-	return;
-}
diff --git a/lib/libc/posix1e/acl_support.h b/lib/libc/posix1e/acl_support.h
deleted file mode 100644
index d337c0f..0000000
--- a/lib/libc/posix1e/acl_support.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
- * 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.
- *
- * 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: releng/10.2/lib/libc/posix1e/acl_support.h 209736 2010-07-06 17:20:08Z trasz $
- */
-/*
- * Support functionality for the POSIX.1e ACL interface
- * These calls are intended only to be called within the library.
- */
-#ifndef _ACL_SUPPORT_H
-#define _ACL_SUPPORT_H
-
-#define _POSIX1E_ACL_STRING_PERM_MAXSIZE 3       /* read, write, exec */
-#define _ACL_T_ALIGNMENT_BITS		13
-
-int	_acl_type_unold(acl_type_t type);
-int	_acl_differs(const acl_t a, const acl_t b);
-int	_acl_type_not_valid_for_acl(const acl_t acl, acl_type_t type);
-void	_acl_brand_from_type(acl_t acl, acl_type_t type);
-int	_acl_brand(const acl_t acl);
-int	_entry_brand(const acl_entry_t entry);
-int	_acl_brand_may_be(const acl_t acl, int brand);
-int	_entry_brand_may_be(const acl_entry_t entry, int brand);
-void	_acl_brand_as(acl_t acl, int brand);
-void	_entry_brand_as(const acl_entry_t entry, int brand);
-int	_nfs4_format_flags(char *str, size_t size, acl_flag_t var, int verbose);
-int	_nfs4_format_access_mask(char *str, size_t size, acl_perm_t var, int verbose);
-int	_nfs4_parse_flags(const char *str, acl_flag_t *var);
-int	_nfs4_parse_access_mask(const char *str, acl_perm_t *var);
-int	_posix1e_acl_check(acl_t acl);
-void	_posix1e_acl_sort(acl_t acl);
-int	_posix1e_acl(acl_t acl, acl_type_t type);
-int	_posix1e_acl_id_to_name(acl_tag_t tag, uid_t id, ssize_t buf_len,
-	    char *buf, int flags);
-int	_posix1e_acl_perm_to_string(acl_perm_t perm, ssize_t buf_len,
-	    char *buf);
-int	_posix1e_acl_string_to_perm(char *string, acl_perm_t *perm);
-int	_posix1e_acl_add_entry(acl_t acl, acl_tag_t tag, uid_t id,
-	    acl_perm_t perm);
-char	*string_skip_whitespace(char *string);
-void	string_trim_trailing_whitespace(char *string);
-int	_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id);
-
-#endif
diff --git a/lib/libc/posix1e/acl_support_nfs4.c b/lib/libc/posix1e/acl_support_nfs4.c
deleted file mode 100644
index f3c7e05..0000000
--- a/lib/libc/posix1e/acl_support_nfs4.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_support_nfs4.c 220465 2011-04-09 07:42:25Z trasz $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <err.h>
-#include <sys/acl.h>
-#include "acl_support.h"
-
-struct flagnames_struct {
-	uint32_t	flag;
-	const char	*name;
-	char		letter;
-};
-
-struct flagnames_struct a_flags[] =
-    {{ ACL_ENTRY_FILE_INHERIT, "file_inherit", 'f'},
-     { ACL_ENTRY_DIRECTORY_INHERIT, "dir_inherit", 'd'},
-     { ACL_ENTRY_INHERIT_ONLY, "inherit_only", 'i'},
-     { ACL_ENTRY_NO_PROPAGATE_INHERIT, "no_propagate", 'n'},
-     { ACL_ENTRY_SUCCESSFUL_ACCESS, "successfull_access", 'S'},
-     { ACL_ENTRY_FAILED_ACCESS, "failed_access", 'F'},
-     /*
-      * There is no ACE_IDENTIFIER_GROUP here - SunOS does not show it
-      * in the "flags" field.  There is no ACE_OWNER, ACE_GROUP or
-      * ACE_EVERYONE either, for obvious reasons.
-      */
-     { 0, 0, 0}};
-
-struct flagnames_struct a_access_masks[] =
-    {{ ACL_READ_DATA, "read_data", 'r'},
-     { ACL_WRITE_DATA, "write_data", 'w'},
-     { ACL_EXECUTE, "execute", 'x'},
-     { ACL_APPEND_DATA, "append_data", 'p'},
-     { ACL_DELETE_CHILD, "delete_child", 'D'},
-     { ACL_DELETE, "delete", 'd'},
-     { ACL_READ_ATTRIBUTES, "read_attributes", 'a'},
-     { ACL_WRITE_ATTRIBUTES, "write_attributes", 'A'},
-     { ACL_READ_NAMED_ATTRS, "read_xattr", 'R'},
-     { ACL_WRITE_NAMED_ATTRS, "write_xattr", 'W'},
-     { ACL_READ_ACL, "read_acl", 'c'},
-     { ACL_WRITE_ACL, "write_acl", 'C'},
-     { ACL_WRITE_OWNER, "write_owner", 'o'},
-     { ACL_SYNCHRONIZE, "synchronize", 's'},
-     { ACL_FULL_SET, "full_set", '\0'},
-     { ACL_MODIFY_SET, "modify_set", '\0'},
-     { ACL_READ_SET, "read_set", '\0'},
-     { ACL_WRITE_SET, "write_set", '\0'},
-     { 0, 0, 0}};
-
-static const char *
-format_flag(uint32_t *var, const struct flagnames_struct *flags)
-{
-
-	for (; flags->name != 0; flags++) {
-		if ((flags->flag & *var) == 0)
-			continue;
-
-		*var &= ~flags->flag;
-		return (flags->name);
-	}
-
-	return (NULL);
-}
-
-static int
-format_flags_verbose(char *str, size_t size, uint32_t var,
-    const struct flagnames_struct *flags)
-{
-	size_t off = 0;
-	const char *tmp;
-
-	while ((tmp = format_flag(&var, flags)) != NULL) {
-		off += snprintf(str + off, size - off, "%s/", tmp);
-		assert (off < size);
-	}
-
-	/* If there were any flags added... */
-	if (off > 0) {
-		off--;
-		/* ... then remove the last slash. */
-		assert(str[off] == '/');
-	} 
-
-	str[off] = '\0';
-
-	return (0);
-}
-
-static int
-format_flags_compact(char *str, size_t size, uint32_t var,
-    const struct flagnames_struct *flags)
-{
-	size_t i;
-
-	for (i = 0; flags[i].letter != '\0'; i++) {
-		assert(i < size);
-		if ((flags[i].flag & var) == 0)
-			str[i] = '-';
-		else
-			str[i] = flags[i].letter;
-	}
-
-	str[i] = '\0';
-
-	return (0);
-}
-
-static int
-parse_flags_verbose(const char *strp, uint32_t *var,
-    const struct flagnames_struct *flags, const char *flags_name,
-    int *try_compact)
-{
-	int i, found, ever_found = 0;
-	char *str, *flag;
-
-	str = strdup(strp);
-	*try_compact = 0;
-	*var = 0;
-
-	while (str != NULL) {
-		flag = strsep(&str, "/:");
-
-		found = 0;
-		for (i = 0; flags[i].name != NULL; i++) {
-			if (strcmp(flags[i].name, flag) == 0) {
-				*var |= flags[i].flag;
-				found = 1;
-				ever_found = 1;
-			}
-		}
-
-		if (!found) {
-			if (ever_found)
-				warnx("malformed ACL: \"%s\" field contains "
-				    "invalid flag \"%s\"", flags_name, flag);
-			else
-				*try_compact = 1;
-			free(str);
-			return (-1);
-		}
-	}
-
-	free(str);
-	return (0);
-}
-
-static int
-parse_flags_compact(const char *str, uint32_t *var,
-    const struct flagnames_struct *flags, const char *flags_name)
-{
-	int i, j, found;
-
-	*var = 0;
-
-	for (i = 0;; i++) {
-		if (str[i] == '\0')
-			return (0);
-
-		/* Ignore minus signs. */
-		if (str[i] == '-')
-			continue;
-
-		found = 0;
-
-		for (j = 0; flags[j].name != NULL; j++) {
-			if (flags[j].letter == str[i]) {
-				*var |= flags[j].flag;
-				found = 1;
-				break;
-			}
-		}
-
-		if (!found) {
-			warnx("malformed ACL: \"%s\" field contains "
-			    "invalid flag \"%c\"", flags_name, str[i]);
-			return (-1);
-		}
-	}
-}
-
-int
-_nfs4_format_flags(char *str, size_t size, acl_flag_t var, int verbose)
-{
-
-	if (verbose)
-		return (format_flags_verbose(str, size, var, a_flags));
-
-	return (format_flags_compact(str, size, var, a_flags));
-}
-
-int
-_nfs4_format_access_mask(char *str, size_t size, acl_perm_t var, int verbose)
-{
-
-	if (verbose)
-		return (format_flags_verbose(str, size, var, a_access_masks));
-
-	return (format_flags_compact(str, size, var, a_access_masks));
-}
-
-int
-_nfs4_parse_flags(const char *str, acl_flag_t *flags)
-{
-	int error, try_compact;
-	int tmpflags;
-
-	error = parse_flags_verbose(str, &tmpflags, a_flags, "flags", &try_compact);
-	if (error && try_compact)
-		error = parse_flags_compact(str, &tmpflags, a_flags, "flags");
-
-	*flags = tmpflags;
-
-	return (error);
-}
-
-int
-_nfs4_parse_access_mask(const char *str, acl_perm_t *perms)
-{
-	int error, try_compact;
-	int tmpperms;
-
-	error = parse_flags_verbose(str, &tmpperms, a_access_masks,
-	    "access permissions", &try_compact);
-	if (error && try_compact)
-		error = parse_flags_compact(str, &tmpperms,
-		    a_access_masks, "access permissions");
-
-	*perms = tmpperms;
-
-	return (error);
-}
diff --git a/lib/libc/posix1e/acl_to_text.3 b/lib/libc/posix1e/acl_to_text.3
deleted file mode 100644
index f3ec3b6..0000000
--- a/lib/libc/posix1e/acl_to_text.3
+++ /dev/null
@@ -1,158 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_to_text.3 233665 2012-03-29 16:02:40Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_TO_TEXT 3
-.Os
-.Sh NAME
-.Nm acl_to_text ,
-.Nm acl_to_text_np
-.Nd convert an ACL to text
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft char *
-.Fn acl_to_text "acl_t acl" "ssize_t *len_p"
-.Ft char *
-.Fn acl_to_text_np "acl_t acl" "ssize_t *len_p" "int flags"
-.Sh DESCRIPTION
-The
-.Fn acl_to_text
-and
-.Fn acl_to_text_np
-functions translate the ACL pointed to by argument
-.Va acl
-into a NULL terminated character string.
-If the pointer
-.Va len_p
-is not NULL, then the function shall return the length of the string (not
-including the NULL terminator) in the location pointed to by
-.Va len_p .
-If the ACL is POSIX.1e, the format of the text string returned by
-.Fn acl_to_text
-shall be the POSIX.1e long ACL form.  If the ACL is NFSv4, the format
-of the text string shall be the compact form, unless the
-.Va ACL_TEXT_VERBOSE
-flag is given.
-.Pp
-The flags specified are formed by
-.Em or Ns 'ing
-the following values
-.Bl -column -offset 3n "ACL_TEXT_NUMERIC_IDS"
-.It ACL_TEXT_VERBOSE Ta "Format ACL using verbose form"
-.It ACL_TEXT_NUMERIC_IDS Ta "Do not resolve IDs into user or group names"
-.It ACL_TEXT_APPEND_ID Ta "In addition to user and group names, append numeric IDs"
-.El
-.Pp
-This function allocates any memory necessary to contain the string and
-returns a pointer to the string.
-The caller should free any releasable
-memory, when the new string is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void*)char
-as an argument.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, the function shall return a pointer to the
-long text form of an ACL.
-Otherwise, a value of
-.Va (char*)NULL
-shall be returned and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_to_text
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL.
-.Pp
-The ACL denoted by
-.Va acl
-contains one or more improperly formed ACL entries, or for some other
-reason cannot be translated into a text form of an ACL.
-.It Bq Er ENOMEM
-The character string to be returned requires more memory than is allowed
-by the hardware or software-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr acl_from_text 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
-.Sh BUGS
-The
-.Fn acl_from_text
-and
-.Fn acl_to_text
-functions
-rely on the
-.Xr getpwent 3
-library calls to manage username and uid mapping, as well as the
-.Xr getgrent 3
-library calls to manage groupname and gid mapping.
-These calls are not
-thread safe, and so transitively, neither are
-.Fn acl_from_text
-and
-.Fn acl_to_text .
-These functions may also interfere with stateful
-calls associated with the
-.Fn getpwent
-and
-.Fn getgrent
-calls.
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
deleted file mode 100644
index 825600e..0000000
--- a/lib/libc/posix1e/acl_to_text.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * acl_to_text - return a text string with a text representation of the acl
- * in it.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_to_text.c 200142 2009-12-05 19:04:21Z ed $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "acl_support.h"
-
-/*
- * acl_to_text - generate a text form of an acl
- * spec says nothing about output ordering, so leave in acl order
- *
- * This function will not produce nice results if it is called with
- * a non-POSIX.1e semantics ACL.
- */
-
-char *_nfs4_acl_to_text_np(const acl_t acl, ssize_t *len_p, int flags);
-
-static char *
-_posix1e_acl_to_text(acl_t acl, ssize_t *len_p, int flags)
-{
-	struct acl	*acl_int;
-	char		*buf, *tmpbuf;
-	char		 name_buf[MAXLOGNAME];
-	char		 perm_buf[_POSIX1E_ACL_STRING_PERM_MAXSIZE+1],
-			 effective_perm_buf[_POSIX1E_ACL_STRING_PERM_MAXSIZE+1];
-	int		 i, error, len;
-	uid_t		 ae_id;
-	acl_tag_t	 ae_tag;
-	acl_perm_t	 ae_perm, effective_perm, mask_perm;
-
-	buf = strdup("");
-	if (buf == NULL)
-		return(NULL);
-
-	acl_int = &acl->ats_acl;
-
-	mask_perm = ACL_PERM_BITS;	/* effective is regular if no mask */
-	for (i = 0; i < acl_int->acl_cnt; i++)
-		if (acl_int->acl_entry[i].ae_tag == ACL_MASK) 
-			mask_perm = acl_int->acl_entry[i].ae_perm;
-
-	for (i = 0; i < acl_int->acl_cnt; i++) {
-		ae_tag = acl_int->acl_entry[i].ae_tag;
-		ae_id = acl_int->acl_entry[i].ae_id;
-		ae_perm = acl_int->acl_entry[i].ae_perm;
-
-		switch(ae_tag) {
-		case ACL_USER_OBJ:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-			len = asprintf(&tmpbuf, "%suser::%s\n", buf,
-			    perm_buf);
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_USER:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			error = _posix1e_acl_id_to_name(ae_tag, ae_id,
-			    MAXLOGNAME, name_buf, flags);
-			if (error)
-				goto error_label;
-
-			effective_perm = ae_perm & mask_perm;
-			if (effective_perm != ae_perm) {
-				error = _posix1e_acl_perm_to_string(
-				    effective_perm,
-				    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1,
-				    effective_perm_buf);
-				if (error)
-					goto error_label;
-				len = asprintf(&tmpbuf, "%suser:%s:%s\t\t# "
-				    "effective: %s\n",
-				    buf, name_buf, perm_buf,
-				    effective_perm_buf);
-			} else {
-				len = asprintf(&tmpbuf, "%suser:%s:%s\n", buf,
-				    name_buf, perm_buf);
-			}
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_GROUP_OBJ:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			effective_perm = ae_perm & mask_perm;
-			if (effective_perm != ae_perm) {
-				error = _posix1e_acl_perm_to_string(
-				    effective_perm,
-				    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1,
-				    effective_perm_buf);
-				if (error)
-					goto error_label;
-				len = asprintf(&tmpbuf, "%sgroup::%s\t\t# "
-				    "effective: %s\n",
-				    buf, perm_buf, effective_perm_buf);
-			} else {
-				len = asprintf(&tmpbuf, "%sgroup::%s\n", buf,
-				    perm_buf);
-			}
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_GROUP:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			error = _posix1e_acl_id_to_name(ae_tag, ae_id,
-			    MAXLOGNAME, name_buf, flags);
-			if (error)
-				goto error_label;
-
-			effective_perm = ae_perm & mask_perm;
-			if (effective_perm != ae_perm) {
-				error = _posix1e_acl_perm_to_string(
-				    effective_perm,
-				    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1,
-				    effective_perm_buf);
-				if (error)
-					goto error_label;
-				len = asprintf(&tmpbuf, "%sgroup:%s:%s\t\t# "
-				    "effective: %s\n",
-				    buf, name_buf, perm_buf,
-				    effective_perm_buf);
-			} else {
-				len = asprintf(&tmpbuf, "%sgroup:%s:%s\n", buf,
-				    name_buf, perm_buf);
-			}
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_MASK:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			len = asprintf(&tmpbuf, "%smask::%s\n", buf,
-			    perm_buf);
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_OTHER:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			len = asprintf(&tmpbuf, "%sother::%s\n", buf,
-			    perm_buf);
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		default:
-			errno = EINVAL;
-			goto error_label;
-		}
-	}
-
-	if (len_p) {
-		*len_p = strlen(buf);
-	}
-	return (buf);
-
-error_label:
-	/* jump to here sets errno already, we just clean up */
-	if (buf) free(buf);
-	return (NULL);
-}
-
-char *
-acl_to_text_np(acl_t acl, ssize_t *len_p, int flags)
-{
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return(NULL);
-	}
-
-	switch (_acl_brand(acl)) {
-	case ACL_BRAND_POSIX:
-		return (_posix1e_acl_to_text(acl, len_p, flags));
-	case ACL_BRAND_NFS4:
-		return (_nfs4_acl_to_text_np(acl, len_p, flags));
-	default:
-		errno = EINVAL;
-		return (NULL);
-	}
-}
-
-char *
-acl_to_text(acl_t acl, ssize_t *len_p)
-{
-
-	return (acl_to_text_np(acl, len_p, 0));
-}
diff --git a/lib/libc/posix1e/acl_to_text_nfs4.c b/lib/libc/posix1e/acl_to_text_nfs4.c
deleted file mode 100644
index 49d983a..0000000
--- a/lib/libc/posix1e/acl_to_text_nfs4.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_to_text_nfs4.c 208811 2010-06-05 07:40:32Z trasz $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
-#include <string.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-#define MAX_ENTRY_LENGTH 512
-
-static int
-format_who(char *str, size_t size, const acl_entry_t entry, int numeric)
-{
-	int error;
-	acl_tag_t tag;
-	struct passwd *pwd;
-	struct group *grp;
-	uid_t *id;
-
-	error = acl_get_tag_type(entry, &tag);
-	if (error)
-		return (error);
-
-	switch (tag) {
-	case ACL_USER_OBJ:
-		snprintf(str, size, "owner@");
-		break;
-
-	case ACL_USER:
-		id = (uid_t *)acl_get_qualifier(entry);
-		if (id == NULL)
-			return (-1);
-		/* XXX: Thread-unsafe. */
-		if (!numeric)
-			pwd = getpwuid(*id);
-		else
-			pwd = NULL;
-		if (pwd == NULL)
-			snprintf(str, size, "user:%d", (unsigned int)*id);
-		else
-			snprintf(str, size, "user:%s", pwd->pw_name);
-		break;
-
-	case ACL_GROUP_OBJ:
-		snprintf(str, size, "group@");
-		break;
-
-	case ACL_GROUP:
-		id = (uid_t *)acl_get_qualifier(entry);
-		if (id == NULL)
-			return (-1);
-		/* XXX: Thread-unsafe. */
-		if (!numeric)
-			grp = getgrgid(*id);
-		else
-			grp = NULL;
-		if (grp == NULL)
-			snprintf(str, size, "group:%d", (unsigned int)*id);
-		else
-			snprintf(str, size, "group:%s", grp->gr_name);
-		break;
-
-	case ACL_EVERYONE:
-		snprintf(str, size, "everyone@");
-		break;
-
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-static int
-format_entry_type(char *str, size_t size, const acl_entry_t entry)
-{
-	int error;
-	acl_entry_type_t entry_type;
-
-	error = acl_get_entry_type_np(entry, &entry_type);
-	if (error)
-		return (error);
-
-	switch (entry_type) {
-	case ACL_ENTRY_TYPE_ALLOW:
-		snprintf(str, size, "allow");
-		break;
-	case ACL_ENTRY_TYPE_DENY:
-		snprintf(str, size, "deny");
-		break;
-	case ACL_ENTRY_TYPE_AUDIT:
-		snprintf(str, size, "audit");
-		break;
-	case ACL_ENTRY_TYPE_ALARM:
-		snprintf(str, size, "alarm");
-		break;
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-static int
-format_additional_id(char *str, size_t size, const acl_entry_t entry)
-{
-	int error;
-	acl_tag_t tag;
-	uid_t *id;
-
-	error = acl_get_tag_type(entry, &tag);
-	if (error)
-		return (error);
-
-	switch (tag) {
-	case ACL_USER_OBJ:
-	case ACL_GROUP_OBJ:
-	case ACL_EVERYONE:
-		str[0] = '\0';
-		break;
-
-	default:
-		id = (uid_t *)acl_get_qualifier(entry);
-		if (id == NULL)
-			return (-1);
-		snprintf(str, size, ":%d", (unsigned int)*id);
-	}
-
-	return (0);
-}
-
-static int
-format_entry(char *str, size_t size, const acl_entry_t entry, int flags)
-{
-	size_t off = 0, min_who_field_length = 18;
-	acl_permset_t permset;
-	acl_flagset_t flagset;
-	int error, len;
-	char buf[MAX_ENTRY_LENGTH + 1];
-
-	assert(_entry_brand(entry) == ACL_BRAND_NFS4);
-
-	error = acl_get_flagset_np(entry, &flagset);
-	if (error)
-		return (error);
-
-	error = acl_get_permset(entry, &permset);
-	if (error)
-		return (error);
-
-	error = format_who(buf, sizeof(buf), entry,
-	    flags & ACL_TEXT_NUMERIC_IDS);
-	if (error)
-		return (error);
-	len = strlen(buf);
-	if (len < min_who_field_length)
-		len = min_who_field_length;
-	off += snprintf(str + off, size - off, "%*s:", len, buf);
-
-	error = _nfs4_format_access_mask(buf, sizeof(buf), *permset,
-	    flags & ACL_TEXT_VERBOSE);
-	if (error)
-		return (error);
-	off += snprintf(str + off, size - off, "%s:", buf);
-
-	error = _nfs4_format_flags(buf, sizeof(buf), *flagset,
-	    flags & ACL_TEXT_VERBOSE);
-	if (error)
-		return (error);
-	off += snprintf(str + off, size - off, "%s:", buf);
-
-	error = format_entry_type(buf, sizeof(buf), entry);
-	if (error)
-		return (error);
-	off += snprintf(str + off, size - off, "%s", buf);
-
-	if (flags & ACL_TEXT_APPEND_ID) {
-		error = format_additional_id(buf, sizeof(buf), entry);
-		if (error)
-			return (error);
-		off += snprintf(str + off, size - off, "%s", buf);
-	}
-
-	off += snprintf(str + off, size - off, "\n");
-
-	/* Make sure we didn't truncate anything. */
-	assert (off < size);
-
-	return (0);
-}
-
-char *
-_nfs4_acl_to_text_np(const acl_t aclp, ssize_t *len_p, int flags)
-{
-	int error, off = 0, size, entry_id = ACL_FIRST_ENTRY;
-	char *str;
-	acl_entry_t entry;
-
-	if (aclp->ats_acl.acl_cnt == 0)
-		return strdup("");
-
-	size = aclp->ats_acl.acl_cnt * MAX_ENTRY_LENGTH;
-	str = malloc(size);
-	if (str == NULL)
-		return (NULL);
-
-	while (acl_get_entry(aclp, entry_id, &entry) == 1) {
-		entry_id = ACL_NEXT_ENTRY;
-
-		assert(off < size);
-
-		error = format_entry(str + off, size - off, entry, flags);
-		if (error) {
-			free(str);
-			errno = EINVAL;
-			return (NULL);
-		}
-
-		off = strlen(str);
-	}
-
-	assert(off < size);
-	str[off] = '\0';
-
-	if (len_p != NULL)
-		*len_p = off;
-
-	return (str);
-}
diff --git a/lib/libc/posix1e/acl_valid.3 b/lib/libc/posix1e/acl_valid.3
deleted file mode 100644
index c524df0..0000000
--- a/lib/libc/posix1e/acl_valid.3
+++ /dev/null
@@ -1,170 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_valid.3 140288 2005-01-15 12:21:03Z ru $
-.\"
-.Dd December 29, 2002
-.Dt ACL_VALID 3
-.Os
-.Sh NAME
-.Nm acl_valid ,
-.Nm acl_valid_fd_np ,
-.Nm acl_valid_file_np ,
-.Nm acl_valid_link_np
-.Nd validate an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_valid "acl_t acl"
-.Ft int
-.Fn acl_valid_fd_np "int fd" "acl_type_t type" "acl_t acl"
-.Ft int
-.Fn acl_valid_file_np "const char *path_p" "acl_type_t type" "acl_t acl"
-.Ft int
-.Fn acl_valid_link_np "const char *path_p" "acl_type_t type" "acl_t acl"
-.Sh DESCRIPTION
-These functions check that the ACL referred to by the argument
-.Va acl
-is valid.
-The POSIX.1e routine,
-.Fn acl_valid ,
-checks this validity only with POSIX.1e ACL semantics, and irrespective
-of the context in which the ACL is to be used.
-The non-portable forms,
-.Fn acl_valid_fd_np ,
-.Fn acl_valid_file_np ,
-and
-.Fn acl_valid_link_np
-allow an ACL to be checked in the context of a specific acl type,
-.Va type ,
-and file system object.
-In environments where additional ACL types are
-supported than just POSIX.1e, this makes more sense.
-Whereas
-.Fn acl_valid_file_np
-will follow the symlink if the specified path is to a symlink,
-.Fn acl_valid_link_np
-will not.
-.Pp
-For POSIX.1e semantics, the checks include:
-.Bl -bullet
-.It
-The three required entries
-.Dv ( ACL_USER_OBJ , ACL_GROUP_OBJ ,
-and
-.Dv ACL_OTHER )
-shall exist exactly once in the ACL.
-If the ACL contains any
-.Dv ACL_USER , ACL_GROUP ,
-or any other
-implementation-defined entries in the file group class
-then one
-.Dv ACL_MASK
-entry shall also be required.
-The ACL shall contain at most one
-.Dv ACL_MASK
-entry.
-.It
-The qualifier field shall be unique among all entries of
-the same POSIX.1e ACL facility defined tag type.
-The
-tag type field shall contain valid values including any
-implementation-defined values.
-Validation of the values
-of the qualifier field is implementation-defined.
-.El
-.Pp
-The POSIX.1e
-.Fn acl_valid
-function may reorder the ACL for the purposes of verification; the
-non-portable validation functions will not.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-If any of the following conditions occur, these functions shall return
--1 and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or the
-object exists and the process does not have appropriate access rights.
-.It Bq Er EBADF
-The
-.Va fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL.
-.Pp
-One or more of the required ACL entries is not present in
-.Va acl .
-.Pp
-The ACL contains entries that are not unique.
-.Pp
-The file system rejects the ACL based on fs-specific semantics issues.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an
-entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named object does not exist, or the
-.Va path_p
-argument points to an empty string.
-.It Bq Er ENOMEM
-Insufficient memory available to fulfill request.
-.It Bq Er EOPNOTSUPP
-The file system does not support ACL retrieval.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get 3 ,
-.Xr acl_init 3 ,
-.Xr acl_set 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
deleted file mode 100644
index 070a3ae..0000000
--- a/lib/libc/posix1e/acl_valid.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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.
- */
-/*
- * acl_valid -- POSIX.1e ACL check routine
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_valid.c 208785 2010-06-03 14:29:17Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-#include <stdlib.h>
-
-#include "acl_support.h"
-
-/*
- * acl_valid: accepts an ACL, returns 0 on valid ACL, -1 for invalid,
- * and errno set to EINVAL.
- *
- * Implemented by calling the acl_check routine in acl_support, which
- * requires ordering.  We call acl_support's _posix1e_acl_sort to make this
- * true.  POSIX.1e allows acl_valid() to reorder the ACL as it sees fit.
- *
- * This call is deprecated, as it doesn't ask whether the ACL is valid
- * for a particular target.  However, this call is standardized, unlike
- * the other two forms.
- */ 
-int
-acl_valid(acl_t acl)
-{
-	int	error;
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (!_acl_brand_may_be(acl, ACL_BRAND_POSIX)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	_posix1e_acl_sort(acl);
-	error = _posix1e_acl_check(acl);
-	if (error) {
-		errno = error;
-		return (-1);
-	} else {
-		return (0);
-	}
-}
-
-int
-acl_valid_file_np(const char *pathp, acl_type_t type, acl_t acl)
-{
-
-	if (pathp == NULL || acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	return (__acl_aclcheck_file(pathp, type, &acl->ats_acl));
-}
-
-int
-acl_valid_link_np(const char *pathp, acl_type_t type, acl_t acl)
-{
-
-	if (pathp == NULL || acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	return (__acl_aclcheck_link(pathp, type, &acl->ats_acl));
-}
-
-int
-acl_valid_fd_np(int fd, acl_type_t type, acl_t acl)
-{
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	acl->ats_cur_entry = 0;
-
-	return (___acl_aclcheck_fd(fd, type, &acl->ats_acl));
-}
diff --git a/lib/libc/posix1e/extattr.3 b/lib/libc/posix1e/extattr.3
deleted file mode 100644
index 4be28d7..0000000
--- a/lib/libc/posix1e/extattr.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\"
-.\" Copyright (c) 2001 Dima Dorfman <dd@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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/extattr.3 107788 2002-12-12 17:26:04Z ru $
-.\"
-.Dd June 24, 2001
-.Dt EXTATTR 3
-.Os
-.Sh NAME
-.Nm extattr_namespace_to_string ,
-.Nm extattr_string_to_namespace
-.Nd convert an extended attribute namespace identifier to a string and
-vice versa
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In sys/extattr.h
-.In libutil.h
-.Ft int
-.Fn extattr_namespace_to_string "int attrnamespace" "char **string"
-.Ft int
-.Fn extattr_string_to_namespace "const char *string" "int *attrnamespace"
-.Sh DESCRIPTION
-The
-.Fn extattr_namespace_to_string
-function converts a VFS extended attribute identifier to a human-readable
-string;
-the
-.Fn extattr_string_to_namespace
-function undoes the aforementioned operation,
-and converts a human-readable string representing a namespace to a
-namespace identifier.
-Although a file system may implement arbitrary namespaces,
-these functions only support the
-.Dv EXTATTR_NAMESPACE_USER
-.Pq Dq user
-and
-.Dv EXTATTR_NAMESPACE_SYSTEM
-.Pq Dq system
-namespaces,
-which are defined in
-.Xr extattr 9 .
-.Pp
-These functions are meant to be used in error reporting and other
-interactive tasks.
-For example,
-instead of printing the integer identifying an extended attribute in
-an error message,
-a program might use
-.Fn extattr_namespace_to_string
-to obtain a human-readable representation.
-Likewise,
-instead of requiring a user to enter the integer representing a namespace,
-an interactive program might ask for a name and use
-.Fn extattr_string_to_namespace
-to get the desired identifier.
-.Sh RETURN VALUES
-If any of the calls are unsuccessful, the value \-1 is returned
-and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The requested namespace could not be identified.
-.El
-.Sh SEE ALSO
-.Xr extattr 2 ,
-.Xr getextattr 8 ,
-.Xr setextattr 8 ,
-.Xr extattr 9
-.Sh HISTORY
-Extended attribute support was developed as part of the
-.Tn TrustedBSD
-Project, and introduced in
-.Fx 5.0 .
-It was developed to support security extensions requiring additional labels
-to be associated with each file or directory.
diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c
deleted file mode 100644
index 90801fc..0000000
--- a/lib/libc/posix1e/extattr.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2001 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * TrustedBSD: Utility functions for extended attributes.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/extattr.c 150065 2005-09-12 19:52:42Z stefanf $");
-
-#include <sys/types.h>
-#include <sys/extattr.h>
-
-#include <errno.h>
-#include <libutil.h>
-#include <string.h>
-
-int
-extattr_namespace_to_string(int attrnamespace, char **string)
-{
-
-	switch(attrnamespace) {
-	case EXTATTR_NAMESPACE_USER:
-		if (string != NULL)
-			*string = strdup(EXTATTR_NAMESPACE_USER_STRING);
-		return (0);
-
-	case EXTATTR_NAMESPACE_SYSTEM:
-		if (string != NULL)
-			*string = strdup(EXTATTR_NAMESPACE_SYSTEM_STRING);
-		return (0);
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-int
-extattr_string_to_namespace(const char *string, int *attrnamespace)
-{
-
-	if (!strcmp(string, EXTATTR_NAMESPACE_USER_STRING)) {
-		if (attrnamespace != NULL)
-			*attrnamespace = EXTATTR_NAMESPACE_USER;
-		return (0);
-	} else if (!strcmp(string, EXTATTR_NAMESPACE_SYSTEM_STRING)) {
-		if (attrnamespace != NULL)
-			*attrnamespace = EXTATTR_NAMESPACE_SYSTEM;
-		return (0);
-	} else {
-		errno = EINVAL;
-		return (-1);
-	}
-}
diff --git a/lib/libc/posix1e/mac.3 b/lib/libc/posix1e/mac.3
deleted file mode 100644
index 2d77759..0000000
--- a/lib/libc/posix1e/mac.3
+++ /dev/null
@@ -1,176 +0,0 @@
-.\" Copyright (c) 2001, 2003 Networks Associates Technology, Inc.
-.\" Copyright (c) 2009 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and Network Associates
-.\" Laboratories, the Security Research Division of Network Associates,
-.\" Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part
-.\" of the DARPA CHATS research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac.3 210772 2010-08-02 16:01:45Z joel $
-.\"
-.Dd August 7, 2009
-.Dt MAC 3
-.Os
-.Sh NAME
-.Nm mac
-.Nd introduction to the MAC security API
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Pp
-In the kernel configuration file:
-.Cd "options MAC"
-.Sh DESCRIPTION
-Mandatory Access Control labels describe confidentiality, integrity, and
-other security attributes of operating system objects, overriding
-discretionary access control.
-Not all system objects support MAC labeling, and MAC policies must be
-explicitly enabled by the administrator.
-This API, based on POSIX.1e, includes routines to retrieve, manipulate, set,
-and convert to and from text the MAC labels on files and processes.
-.Pp
-MAC labels consist of a set of (name, value) tuples, representing security
-attributes from MAC policies.
-For example, this label contains security labels defined by two policies,
-.Xr mac_biba 4
-and
-.Xr mac_mls 4 :
-.Bd -literal -offset indent
-biba/low,mls/low
-.Ed
-.Pp
-Further syntax and semantics of MAC labels may be found in
-.Xr maclabel 7 .
-.Pp
-Applications operate on labels stored in
-.Vt mac_t ,
-but can convert between this internal format and a text format for the
-purposes of presentation to uses or external storage.
-When querying a label on an object, a
-.Vt mac_t
-must first be prepared using the interfaces described in
-.Xr mac_prepare 3 ,
-allowing the application to declare which policies it wishes to interrogate.
-The application writer can also rely on default label names declared in
-.Xr mac.conf 5 .
-.Pp
-When finished with a
-.Vt mac_t ,
-the application must call
-.Xr mac_free 3
-to release its storage.
-.Pp
-The following functions are defined:
-.Bl -tag -width indent
-.It Fn mac_is_present
-This function, described in
-.Xr mac_is_present 3 ,
-allows applications to test whether MAC is configured, as well as whether
-specific policies are configured.
-.It Fn mac_get_fd , Fn mac_get_file , Fn mac_get_link , Fn mac_get_peer
-These functions, described in
-.Xr mac_get 3 ,
-retrieve the MAC labels associated with file descriptors, files, and socket
-peers.
-.It Fn mac_get_pid , Fn mac_get_proc
-These functions, described in
-.Xr mac_get 3 ,
-retrieve the MAC labels associated with processes.
-.It Fn mac_set_fd , Fn mac_set_file , Fn mac_set_link
-These functions, described in
-.Xr mac_set 3 ,
-set the MAC labels associated with file descriptors and files.
-.It Fn mac_set_proc
-This function, described in
-.Xr mac_set 3 ,
-sets the MAC label associated with the current process.
-.It Fn mac_free
-This function, described in
-.Xr mac_free 3 ,
-frees working MAC label storage.
-.It Fn mac_from_text
-This function, described in
-.Xr mac_text 3 ,
-converts a text-form MAC label into working MAC label storage,
-.Vt mac_t .
-.It Fn mac_prepare , Fn mac_prepare_file_label , Fn mac_prepare_ifnet_label , Fn mac_prepare_process_label , Fn mac_prepare_type
-These functions,  described in
-.Xr mac_prepare 3 ,
-allocate working storage for MAC label operations.
-.Xr mac_prepare 3
-prepares a label based on caller-specified label names; the other calls
-rely on the default configuration specified in
-.Xr mac.conf 5 .
-.It Fn mac_to_text
-This function is described in
-.Xr mac_text 3 ,
-and may be used to convert a
-.Vt mac_t
-into a text-form MAC label.
-.El
-.Sh FILES
-.Bl -tag -width ".Pa /etc/mac.conf" -compact
-.It Pa /etc/mac.conf
-MAC library configuration file, documented in
-.Xr mac.conf 5 .
-Provides default behavior for applications aware of MAC labels on
-system objects, but without policy-specific knowledge.
-.El
-.Sh SEE ALSO
-.Xr mac_free 3 ,
-.Xr mac_get 3 ,
-.Xr mac_is_present 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr mac_text 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr mac.conf 5 ,
-.Xr mac 9
-.Sh STANDARDS
-These APIs are loosely based on the APIs described in POSIX.1e, as described
-in IEEE POSIX.1e draft 17.
-However, the resemblance of these APIs to the POSIX APIs is loose, as the
-POSIX APIs were unable to express some notions required for flexible and
-extensible access control.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
-.Sh BUGS
-The
-.Tn TrustedBSD
-MAC Framework and associated policies, interfaces, and
-applications are considered to be an experimental feature in
-.Fx .
-Sites considering production deployment should keep the experimental
-status of these services in mind during any deployment process.
-See also
-.Xr mac 9
-for related considerations regarding the kernel framework.
diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c
deleted file mode 100644
index 10bae79..0000000
--- a/lib/libc/posix1e/mac.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/mac.c 254700 2013-08-23 13:59:47Z jilles $");
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/sysctl.h>
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <sys/mac.h>
-
-static int	internal_initialized;
-
-/*
- * Maintain a list of default label preparations for various object
- * types.  Each name will appear only once in the list.
- *
- * XXXMAC: Not thread-safe.
- */
-static LIST_HEAD(, label_default) label_default_head;
-struct label_default {
-	char				*ld_name;
-	char				*ld_labels;
-	LIST_ENTRY(label_default)	 ld_entries;
-};
-
-static void
-mac_destroy_labels(void)
-{
-	struct label_default *ld;
-
-	while ((ld = LIST_FIRST(&label_default_head))) {
-		free(ld->ld_name);
-		free(ld->ld_labels);
-		LIST_REMOVE(ld, ld_entries);
-		free(ld);
-	}
-}
-
-static void
-mac_destroy_internal(void)
-{
-
-	mac_destroy_labels();
-
-	internal_initialized = 0;
-}
-
-static int
-mac_add_type(const char *name, const char *labels)
-{
-	struct label_default *ld, *ld_new;
-	char *name_dup, *labels_dup;
-
-	/*
-	 * Speculatively allocate all the memory now to avoid allocating
-	 * later when we will someday hold a mutex.
-	 */
-	name_dup = strdup(name);
-	if (name_dup == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	labels_dup = strdup(labels);
-	if (labels_dup == NULL) {
-		free(name_dup);
-		errno = ENOMEM;
-		return (-1);
-	}
-	ld_new = malloc(sizeof(*ld));
-	if (ld_new == NULL) {
-		free(name_dup);
-		free(labels_dup);
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	/*
-	 * If the type is already present, replace the current entry
-	 * rather than add a new instance.
-	 */
-	for (ld = LIST_FIRST(&label_default_head); ld != NULL;
-	    ld = LIST_NEXT(ld, ld_entries)) {
-		if (strcmp(name, ld->ld_name) == 0)
-			break;
-	}
-
-	if (ld != NULL) {
-		free(ld->ld_labels);
-		ld->ld_labels = labels_dup;
-		labels_dup = NULL;
-	} else {
-		ld = ld_new;
-		ld->ld_name = name_dup;
-		ld->ld_labels = labels_dup;
-
-		ld_new = NULL;
-		name_dup = NULL;
-		labels_dup = NULL;
-
-		LIST_INSERT_HEAD(&label_default_head, ld, ld_entries);
-	}
-
-	if (name_dup != NULL)
-		free(name_dup);
-	if (labels_dup != NULL)
-		free(labels_dup);
-	if (ld_new != NULL)
-		free(ld_new);
-
-	return (0);
-}
-
-static char *
-next_token(char **string)
-{
-	char *token;
-
-	token = strsep(string, " \t");
-	while (token != NULL && *token == '\0')
-		token = strsep(string, " \t");
-
-	return (token);
-}
-
-static int
-mac_init_internal(int ignore_errors)
-{
-	const char *filename;
-	char line[LINE_MAX];
-	FILE *file;
-	int error;
-
-	error = 0;
-
-	LIST_INIT(&label_default_head);
-
-	if (!issetugid() && getenv("MAC_CONFFILE") != NULL)
-		filename = getenv("MAC_CONFFILE");
-	else
-		filename = MAC_CONFFILE;
-	file = fopen(filename, "re");
-	if (file == NULL)
-		return (0);
-
-	while (fgets(line, LINE_MAX, file)) {
-		char *comment, *parse, *statement;
-
-		if (line[strlen(line)-1] == '\n')
-			line[strlen(line)-1] = '\0';
-		else {
-			if (ignore_errors)
-				continue;
-			fclose(file);
-			error = EINVAL;
-			goto just_return;
-		}
-
-		/* Remove any comment. */
-		comment = line;
-		parse = strsep(&comment, "#");
-
-		/* Blank lines OK. */
-		statement = next_token(&parse);
-		if (statement == NULL)
-			continue;
-
-		if (strcmp(statement, "default_labels") == 0) {
-			char *name, *labels;
-
-			name = next_token(&parse);
-			labels = next_token(&parse);
-			if (name == NULL || labels == NULL ||
-			    next_token(&parse) != NULL) {
-				if (ignore_errors)
-					continue;
-				error = EINVAL;
-				fclose(file);
-				goto just_return;
-			}
-
-			if (mac_add_type(name, labels) == -1) {
-				if (ignore_errors)
-					continue;
-				fclose(file);
-				goto just_return;
-			}
-		} else if (strcmp(statement, "default_ifnet_labels") == 0 ||
-		    strcmp(statement, "default_file_labels") == 0 ||
-		    strcmp(statement, "default_process_labels") == 0) {
-			char *labels, *type;
-
-			if (strcmp(statement, "default_ifnet_labels") == 0)
-				type = "ifnet";
-			else if (strcmp(statement, "default_file_labels") == 0)
-				type = "file";
-			else if (strcmp(statement, "default_process_labels") ==
-			    0)
-				type = "process";
-
-			labels = next_token(&parse);
-			if (labels == NULL || next_token(&parse) != NULL) {
-				if (ignore_errors)
-					continue;
-				error = EINVAL;
-				fclose(file);
-				goto just_return;
-			}
-
-			if (mac_add_type(type, labels) == -1) {
-				if (ignore_errors)
-					continue;
-				fclose(file);
-				goto just_return;
-			}
-		} else {
-			if (ignore_errors)
-				continue;
-			fclose(file);
-			error = EINVAL;
-			goto just_return;
-		}
-	}
-
-	fclose(file);
-
-	internal_initialized = 1;
-
-just_return:
-	if (error != 0)
-		mac_destroy_internal();
-	return (error);
-}
-
-static int
-mac_maybe_init_internal(void)
-{
-
-	if (!internal_initialized)
-		return (mac_init_internal(1));
-	else
-		return (0);
-}
-
-int
-mac_reload(void)
-{
-
-	if (internal_initialized)
-		mac_destroy_internal();
-	return (mac_init_internal(0));
-}
-
-int
-mac_free(struct mac *mac)
-{
-
-	if (mac->m_string != NULL)
-		free(mac->m_string);
-	free(mac);
-
-	return (0);
-}
-
-int
-mac_from_text(struct mac **mac, const char *text)
-{
-
-	*mac = (struct mac *) malloc(sizeof(**mac));
-	if (*mac == NULL)
-		return (ENOMEM);
-
-	(*mac)->m_string = strdup(text);
-	if ((*mac)->m_string == NULL) {
-		free(*mac);
-		*mac = NULL;
-		return (ENOMEM);
-	}
-
-	(*mac)->m_buflen = strlen((*mac)->m_string)+1;
-
-	return (0);
-}
-
-int
-mac_to_text(struct mac *mac, char **text)
-{
-
-	*text = strdup(mac->m_string);
-	if (*text == NULL)
-		return (ENOMEM);
-	return (0);
-}
-
-int
-mac_prepare(struct mac **mac, const char *elements)
-{
-
-	if (strlen(elements) >= MAC_MAX_LABEL_BUF_LEN)
-		return (EINVAL);
-
-	*mac = (struct mac *) malloc(sizeof(**mac));
-	if (*mac == NULL)
-		return (ENOMEM);
-
-	(*mac)->m_string = malloc(MAC_MAX_LABEL_BUF_LEN);
-	if ((*mac)->m_string == NULL) {
-		free(*mac);
-		*mac = NULL;
-		return (ENOMEM);
-	}
-
-	strcpy((*mac)->m_string, elements);
-	(*mac)->m_buflen = MAC_MAX_LABEL_BUF_LEN;
-
-	return (0);
-}
-
-int
-mac_prepare_type(struct mac **mac, const char *name)
-{
-	struct label_default *ld;
-	int error;
-
-	error = mac_maybe_init_internal();
-	if (error != 0)
-		return (error);
-
-	for (ld = LIST_FIRST(&label_default_head); ld != NULL;
-	    ld = LIST_NEXT(ld, ld_entries)) {
-		if (strcmp(name, ld->ld_name) == 0)
-			return (mac_prepare(mac, ld->ld_labels));
-	}
-
-	errno = ENOENT;
-	return (-1);		/* XXXMAC: ENOLABEL */
-}
-
-int
-mac_prepare_ifnet_label(struct mac **mac)
-{
-
-	return (mac_prepare_type(mac, "ifnet"));
-}
-
-int
-mac_prepare_file_label(struct mac **mac)
-{
-
-	return (mac_prepare_type(mac, "file"));
-}
-
-int
-mac_prepare_packet_label(struct mac **mac)
-{
-
-	return (mac_prepare_type(mac, "packet"));
-}
-
-int
-mac_prepare_process_label(struct mac **mac)
-{
-
-	return (mac_prepare_type(mac, "process"));
-}
-
-/*
- * Simply test whether the TrustedBSD/MAC MIB tree is present; if so,
- * return 1 to indicate that the system has MAC enabled overall or for
- * a given policy.
- */
-int
-mac_is_present(const char *policyname)
-{
-	int mib[5];
-	size_t siz;
-	char *mibname;
-	int error;
-
-	if (policyname != NULL) {
-		if (policyname[strcspn(policyname, ".=")] != '\0') {
-			errno = EINVAL;
-			return (-1);
-		}
-		mibname = malloc(sizeof("security.mac.") - 1 +
-		    strlen(policyname) + sizeof(".enabled"));
-		if (mibname == NULL)
-			return (-1);
-		strcpy(mibname, "security.mac.");
-		strcat(mibname, policyname);
-		strcat(mibname, ".enabled");
-		siz = 5;
-		error = sysctlnametomib(mibname, mib, &siz);
-		free(mibname);
-	} else {
-		siz = 3;
-		error = sysctlnametomib("security.mac", mib, &siz);
-	}
-	if (error == -1) {
-		switch (errno) {
-		case ENOTDIR:
-		case ENOENT:
-			return (0);
-		default:
-			return (error);
-		}
-	}
-	return (1);
-}
diff --git a/lib/libc/posix1e/mac.conf.5 b/lib/libc/posix1e/mac.conf.5
deleted file mode 100644
index 0badcda..0000000
--- a/lib/libc/posix1e/mac.conf.5
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Copyright (c) 2003 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project in part by Network
-.\" Associates Laboratories, the Security Research Division of Network
-.\" Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
-.\" as part of the DARPA CHATS research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac.conf.5 140505 2005-01-20 09:17:07Z ru $
-.\"
-.Dd April 19, 2003
-.Dt MAC.CONF 5
-.Os
-.Sh NAME
-.Nm mac.conf
-.Nd format of the MAC library configuration file
-.Sh DESCRIPTION
-The
-.Nm
-file configures the default label elements to be used by policy-agnostic
-applications that operate on MAC labels.
-A file contains a series of default label sets specified by object class,
-in addition to blank lines and comments preceded by a
-.Ql #
-symbol.
-.Pp
-Currently, the implementation supports two syntax styles for label
-element declaration.
-The old (deprecated) syntax consists of a
-single line with two fields separated by white space: the object
-class name, and a list of label elements as used by the
-.Xr mac_prepare 3
-library calls prior to an application invocation of a function from
-.Xr mac_get 3 .
-.Pp
-The newer more preferred syntax consists of three fields separated by
-white space: the label group, object class name and a list of
-label elements.
-.Pp
-Label element names may optionally begin with a
-.Ql \&?
-symbol to indicate that a failure to retrieve the label element for
-an object should be silently ignored, and improves usability if the
-set of MAC policies may change over time.
-.Sh FILES
-.Bl -tag -width ".Pa /etc/mac.conf" -compact
-.It Pa /etc/mac.conf
-MAC library configuration file.
-.El
-.Sh EXAMPLES
-The following example configures user applications to operate with
-four MAC policies:
-.Xr mac_biba 4 ,
-.Xr mac_mls 4 ,
-SEBSD,
-and
-.Xr mac_partition 4 .
-.Bd -literal -offset indent
-#
-# Default label set to be used by simple MAC applications
-
-default_labels file ?biba,?lomac,?mls,?sebsd
-default_labels ifnet ?biba,?lomac,?mls,?sebsd
-default_labels process ?biba,?lomac,?mls,?partition,?sebsd
-default_labels socket ?biba,?lomac,?mls
-
-#
-# Deprecated (old) syntax
-
-default_file_labels ?biba,?mls,?sebsd
-default_ifnet_labels ?biba,?mls,?sebsd
-default_process_labels ?biba,?mls,partition,?sebsd
-.Ed
-.Pp
-In this example, userland applications will attempt to retrieve Biba,
-MLS, and SEBSD labels for all object classes; for processes, they will
-additionally attempt to retrieve a Partition identifier.
-In all cases except the Partition identifier, failure to retrieve a
-label due to the respective policy not being present will be ignored.
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_get 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
-.Sh BUGS
-The
-.Tn TrustedBSD
-MAC Framework and associated policies, interfaces, and
-applications are considered to be an experimental feature in
-.Fx .
-Sites considering production deployment should keep the experimental
-status of these services in mind during any deployment process.
-See also
-.Xr mac 9
-for related considerations regarding the kernel framework.
diff --git a/lib/libc/posix1e/mac_exec.c b/lib/libc/posix1e/mac_exec.c
deleted file mode 100644
index cd2ad17..0000000
--- a/lib/libc/posix1e/mac_exec.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/mac_exec.c 176901 2008-03-07 15:25:56Z rwatson $");
-
-#include <sys/types.h>
-#include <sys/mac.h>
-
-extern int __mac_execve(char *fname, char **argv, char **envv,
-    struct mac *mac_p);
-
-int
-mac_execve(char *fname, char **argv, char **envv, struct mac *label)
-{
-
-	return (__mac_execve(fname, argv, envv, label));
-}
diff --git a/lib/libc/posix1e/mac_free.3 b/lib/libc/posix1e/mac_free.3
deleted file mode 100644
index fed6447..0000000
--- a/lib/libc/posix1e/mac_free.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" Copyright (c) 2001, 2002 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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 AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_free.3 196123 2009-08-12 10:46:48Z rwatson $
-.\"
-.Dd December 21, 2001
-.Dt MAC_FREE 3
-.Os
-.Sh NAME
-.Nm mac_free
-.Nd free MAC label
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_free "mac_t label"
-.Sh DESCRIPTION
-The
-.Fn mac_free
-function frees the storage allocated to contain a
-.Vt mac_t .
-.Sh RETURN VALUES
-The
-.Fn mac_free
-function always returns 0.
-WARNING: see the notes in the
-.Sx BUGS
-section regarding the use of this
-function.
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_get 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr mac_text 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
-.Sh BUGS
-POSIX.1e specifies that
-.Fn mac_free
-will be used to free text strings created using
-.Xr mac_to_text 3 .
-Because
-.Vt mac_t
-is a complex structure in the
-.Tn TrustedBSD
-implementation,
-.Fn mac_free
-is specific to
-.Vt mac_3 ,
-and must not be used to free the character strings returned from
-.Fn mac_to_text .
-Doing so may result in undefined behavior.
diff --git a/lib/libc/posix1e/mac_get.3 b/lib/libc/posix1e/mac_get.3
deleted file mode 100644
index 13b247b..0000000
--- a/lib/libc/posix1e/mac_get.3
+++ /dev/null
@@ -1,152 +0,0 @@
-.\" Copyright (c) 2001, 2004 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_get.3 196123 2009-08-12 10:46:48Z rwatson $
-.\"
-.Dd December 21, 2001
-.Dt MAC_GET 3
-.Os
-.Sh NAME
-.Nm mac_get_file ,
-.Nm mac_get_link ,
-.Nm mac_get_fd ,
-.Nm mac_get_peer ,
-.Nm mac_get_pid ,
-.Nm mac_get_proc
-.Nd get the label of a file, socket, socket peer or process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_get_file "const char *path" "mac_t label"
-.Ft int
-.Fn mac_get_link "const char *path" "mac_t label"
-.Ft int
-.Fn mac_get_fd "int fd" "mac_t label"
-.Ft int
-.Fn mac_get_peer "int fd" "mac_t label"
-.Ft int
-.Fn mac_get_pid "pid_t pid" "mac_t label"
-.Ft int
-.Fn mac_get_proc "mac_t label"
-.Sh DESCRIPTION
-The
-.Fn mac_get_file
-system call returns the label associated with a file specified by
-pathname.
-The
-.Fn mac_get_link
-function is the same as
-.Fn mac_get_file ,
-except that it does not follow symlinks.
-.Pp
-The
-.Fn mac_get_fd
-system call returns the label associated with an object referenced by
-the specified file descriptor.
-Note that in the case of a file system socket, the label returned will
-be the socket label, which may be different from the label of the
-on-disk node acting as a rendezvous for the socket.
-The
-.Fn mac_get_peer
-system call returns the label associated with the remote endpoint of
-a socket; the exact semantics of this call will depend on the protocol
-domain, communications type, and endpoint; typically this label will
-be cached when a connection-oriented protocol instance is first set up,
-and is undefined for datagram protocols.
-.Pp
-The
-.Fn mac_get_pid
-and
-.Fn mac_get_proc
-system calls return the process label associated with an arbitrary
-process ID, or the current process.
-.Pp
-Label storage for use with these calls must first be allocated and
-prepared using the
-.Xr mac_prepare 3
-functions.
-When an application is done using a label, the memory may be returned
-using
-.Xr mac_free 3 .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EACCES
-A component of
-.Fa path
-is not searchable,
-or MAC read access to the file
-is denied.
-.It Bq Er EINVAL
-The requested label operation is not valid for the object referenced by
-.Fa fd .
-.It Bq Er ENAMETOOLONG
-The pathname pointed to by
-.Fa path
-exceeds
-.Dv PATH_MAX ,
-or a component of the pathname exceeds
-.Dv NAME_MAX .
-.It Bq Er ENOENT
-A component of
-.Fa path
-does not exist.
-.It Bq Er ENOMEM
-Insufficient memory is available
-to allocate a new MAC label structure.
-.It Bq Er ENOTDIR
-A component of
-.Fa path
-is not a directory.
-.El
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_free 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr mac_text 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
diff --git a/lib/libc/posix1e/mac_get.c b/lib/libc/posix1e/mac_get.c
deleted file mode 100644
index 20fa55f..0000000
--- a/lib/libc/posix1e/mac_get.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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 names of the authors 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/mac_get.c 176901 2008-03-07 15:25:56Z rwatson $");
-
-#include <sys/types.h>
-#include <sys/mac.h>
-#include <sys/socket.h>
-
-extern int __mac_get_fd(int fd, struct mac *mac_p);
-extern int __mac_get_file(const char *path_p, struct mac *mac_p);
-extern int __mac_get_link(const char *path_p, struct mac *mac_p);
-extern int __mac_get_pid(pid_t pid, struct mac *mac_p);
-extern int __mac_get_proc(struct mac *mac_p);
-
-int
-mac_get_fd(int fd, struct mac *label)
-{
-
-	return (__mac_get_fd(fd, label));
-}
-
-int
-mac_get_file(const char *path, struct mac *label)
-{
-
-	return (__mac_get_file(path, label));
-}
-
-int
-mac_get_link(const char *path, struct mac *label)
-{
-
-	return (__mac_get_link(path, label));
-}
-
-int
-mac_get_peer(int fd, struct mac *label)
-{
-	socklen_t len;
-
-	len = sizeof(*label);
-	return (getsockopt(fd, SOL_SOCKET, SO_PEERLABEL, label, &len));
-}
-
-int
-mac_get_pid(pid_t pid, struct mac *label)
-{
-
-	return (__mac_get_pid(pid, label));
-}
-
-int
-mac_get_proc(struct mac *label)
-{
-
-	return (__mac_get_proc(label));
-}
diff --git a/lib/libc/posix1e/mac_is_present.3 b/lib/libc/posix1e/mac_is_present.3
deleted file mode 100644
index 1f6d6a1..0000000
--- a/lib/libc/posix1e/mac_is_present.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 2002 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_is_present.3 162841 2006-09-30 10:34:13Z ru $
-.\"
-.Dd July 7, 2006
-.Dt MAC_IS_PRESENT 3
-.Os
-.Sh NAME
-.Nm mac_is_present
-.Nd report whether the running system has MAC support
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_is_present "const char *policyname"
-.Sh DESCRIPTION
-The
-.Fn mac_is_present
-function determines whether the currently-running kernel supports MAC for
-a given policy or not.
-If
-.Fa policyname
-is
-.Pf non- Dv NULL ,
-the presence of the named policy
-(e.g.\&
-.Dq Li biba ,
-.Dq Li mls ,
-.Dq Li te )
-is checked, otherwise the presence of any MAC policies at all is checked.
-.Sh RETURN VALUES
-If the system supports the given MAC policy, the value 1 is returned.
-If the specified MAC policy is not supported, the value 0 is returned.
-If an error occurs, the value \-1 is returned.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of
-.Fa policyname
-is not valid.
-.It Bq Er ENOMEM
-Insufficient memory was available to allocate internal storage.
-.El
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_free 3 ,
-.Xr mac_get 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr mac_text 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
diff --git a/lib/libc/posix1e/mac_prepare.3 b/lib/libc/posix1e/mac_prepare.3
deleted file mode 100644
index 3e2c3ee..0000000
--- a/lib/libc/posix1e/mac_prepare.3
+++ /dev/null
@@ -1,126 +0,0 @@
-.\" Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and Network Associates Labs,
-.\" the Security Research Division of Network Associates, Inc. under
-.\" DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-.\" DARPA CHATS research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_prepare.3 235400 2012-05-13 14:16:04Z joel $
-.\"
-.Dd August 22, 2003
-.Dt MAC_PREPARE 3
-.Os
-.Sh NAME
-.Nm mac_prepare , mac_prepare_type , mac_prepare_file_label ,
-.Nm mac_prepare_ifnet_label , mac_prepare_process_label
-.Nd allocate appropriate storage for
-.Vt mac_t
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_prepare "mac_t *mac" "const char *elements"
-.Ft int
-.Fn mac_prepare_type "mac_t *mac" "const char *name"
-.Ft int
-.Fn mac_prepare_file_label "mac_t *mac"
-.Ft int
-.Fn mac_prepare_ifnet_label "mac_t *mac"
-.Ft int
-.Fn mac_prepare_process_label "mac_t *mac"
-.Sh DESCRIPTION
-The
-.Nm
-family of functions allocates the appropriate amount of storage and initializes
-.Fa *mac
-for use by
-.Xr mac_get 3 .
-When the resulting label is passed into the
-.Xr mac_get 3
-functions, the kernel will attempt to fill in the label elements specified
-when the label was prepared.
-Elements are specified in a nul-terminated string, using commas to
-delimit fields.
-Element names may be prefixed with the
-.Ql \&?
-character to indicate that a failure by the kernel to retrieve that
-element should not be considered fatal.
-.Pp
-The
-.Fn mac_prepare
-function accepts a list of policy names as a parameter, and allocates the
-storage to fit those label elements accordingly.
-The remaining functions in the family make use of system defaults defined
-in
-.Xr mac.conf 5
-instead of an explicit
-.Va elements
-argument, deriving the default from the specified object type.
-.Pp
-.Fn mac_prepare_type
-allocates the storage to fit an object label of the type specified by
-the
-.Va name
-argument.
-The
-.Fn mac_prepare_file_label ,
-.Fn mac_prepare_ifnet_label ,
-and
-.Fn mac_prepare_process_label
-functions are equivalent to invocations of
-.Fn mac_prepare_type
-with arguments of
-.Qq file ,
-.Qq ifnet ,
-and
-.Qq process
-respectively.
-.Sh RETURN VALUES
-.Rv -std
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_free 3 ,
-.Xr mac_get 3 ,
-.Xr mac_is_present 3 ,
-.Xr mac_set 3 ,
-.Xr mac 4 ,
-.Xr mac.conf 5 ,
-.Xr maclabel 7
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
-Support for generic object types first appeared in
-.Fx 5.2 .
diff --git a/lib/libc/posix1e/mac_set.3 b/lib/libc/posix1e/mac_set.3
deleted file mode 100644
index aaf0454..0000000
--- a/lib/libc/posix1e/mac_set.3
+++ /dev/null
@@ -1,149 +0,0 @@
-.\" Copyright (c) 2001 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_set.3 196123 2009-08-12 10:46:48Z rwatson $
-.\"
-.Dd January 14, 2003
-.Dt MAC_SET 3
-.Os
-.Sh NAME
-.Nm mac_set_file ,
-.Nm mac_set_fd ,
-.Nm mac_set_proc
-.Nd set the MAC label for a file or process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_set_file "const char *path" "mac_t label"
-.Ft int
-.Fn mac_set_link "const char *path" "mac_t label"
-.Ft int
-.Fn mac_set_fd "int fd" "mac_t label"
-.Ft int
-.Fn mac_set_proc "mac_t label"
-.Sh DESCRIPTION
-The
-.Fn mac_set_file
-and
-.Fn mac_set_fd
-functions associate a MAC label
-specified by
-.Fa label
-to the file referenced to by
-.Fa path_p ,
-or to the file descriptor
-.Fa fd ,
-respectively.
-Note that when a file descriptor references a socket, label operations
-on the file descriptor act on the socket, not on the file that may
-have been used as a rendezvous when binding the socket.
-The
-.Fn mac_set_link
-function is the same as
-.Fn mac_set_file ,
-except that it does not follow symlinks.
-.Pp
-The
-.Fn mac_set_proc
-function associates the MAC label
-specified by
-.Fa label
-to the calling process.
-.Pp
-A process is allowed to set a label for a file
-only if it has MAC write access to the file,
-and its effective user ID is equal to
-the owner of the file,
-or has appropriate privileges.
-.Sh RETURN VALUES
-.Rv -std mac_set_fd mac_set_file mac_set_link mac_set_proc
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EACCES
-MAC write access to the file is denied.
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid file descriptor.
-.It Bq Er EINVAL
-The
-.Fa label
-argument
-is not a valid MAC label, or the object referenced by
-.Fa fd
-is not appropriate for label operations.
-.It Bq Er EOPNOTSUPP
-Setting MAC labels is not supported
-by the file referenced by
-.Fa fd .
-.It Bq Er EPERM
-The calling process had insufficient privilege
-to change the MAC label.
-.It Bq Er EROFS
-File system for the object being modified
-is read only.
-.It Bq Er ENAMETOOLONG
-.\" XXX POSIX_NO_TRUNC?
-The length of the pathname in
-.Fa path_p
-exceeds
-.Dv PATH_MAX ,
-or a component of the pathname
-is longer than
-.Dv NAME_MAX .
-.It Bq Er ENOENT
-The file referenced by
-.Fa path_p
-does not exist.
-.It Bq Er ENOTDIR
-A component of the pathname
-referenced by
-.Fa path_p
-is not a directory.
-.El
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_free 3 ,
-.Xr mac_get 3 ,
-.Xr mac_is_present 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_text 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
diff --git a/lib/libc/posix1e/mac_set.c b/lib/libc/posix1e/mac_set.c
deleted file mode 100644
index 0aaf8b1..0000000
--- a/lib/libc/posix1e/mac_set.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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 names of the authors 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/mac_set.c 176901 2008-03-07 15:25:56Z rwatson $");
-
-#include <sys/types.h>
-#include <sys/mac.h>
-
-extern	int	__mac_set_fd(int fd, struct mac *mac_p);
-extern	int	__mac_set_file(const char *path_p, struct mac *mac_p);
-extern	int	__mac_set_link(const char *path_p, struct mac *mac_p);
-extern	int	__mac_set_proc(struct mac *mac_p);
-
-int
-mac_set_fd(int fd, struct mac *label)
-{
-
-	return (__mac_set_fd(fd, label));
-}
-
-int
-mac_set_file(const char *path, struct mac *label)
-{
-
-	return (__mac_set_file(path, label));
-}
-
-int
-mac_set_link(const char *path, struct mac *label)
-{
-
-	return (__mac_set_link(path, label));
-}
-
-int
-mac_set_proc(struct mac *label)
-{
-
-	return (__mac_set_proc(label));
-}
diff --git a/lib/libc/posix1e/mac_text.3 b/lib/libc/posix1e/mac_text.3
deleted file mode 100644
index 64805eb..0000000
--- a/lib/libc/posix1e/mac_text.3
+++ /dev/null
@@ -1,117 +0,0 @@
-.\" Copyright (c) 2001 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_text.3 196123 2009-08-12 10:46:48Z rwatson $
-.\"
-.Dd December 21, 2001
-.Dt MAC_TEXT 3
-.Os
-.Sh NAME
-.Nm mac_from_text ,
-.Nm mac_to_text
-.Nd convert MAC label to/from text representation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_from_text "mac_t *mac" "const char *text"
-.Ft int
-.Fn mac_to_text "mac_t label" "char **text"
-.Sh DESCRIPTION
-The
-.Fn mac_from_text
-function converts the text representation of a label
-into the internal policy label format
-.Pq Vt mac_t
-and places it in
-.Fa *mac ,
-which must later be freed with
-.Xr free 3 .
-.Pp
-The
-.Fn mac_to_text
-function allocates storage for
-.Fa *text ,
-which will be set to the text representation of
-.Fa label .
-.Pp
-Refer to
-.Xr maclabel 7
-for the MAC label format.
-.Sh RETURN VALUES
-.Rv -std mac_from_text mac_to_text
-.Sh COMPATIBILITY
-POSIX.1e does not define
-a format for text representations
-of MAC labels.
-.Pp
-POSIX.1e requires that text strings allocated using
-.Fn mac_to_text
-be freed using
-.Xr mac_free 3 ;
-in the
-.Fx
-implementation, they must be freed using
-.Xr free 3 ,
-as
-.Xr mac_free 3
-is used only to free memory used for type
-.Vt mac_t .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory was available
-to allocate internal storage.
-.El
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr mac 3 ,
-.Xr mac_get 3 ,
-.Xr mac_is_present 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr maclabel 7
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
deleted file mode 100644
index c28f00c..0000000
--- a/lib/libc/posix1e/posix1e.3
+++ /dev/null
@@ -1,118 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2009 Robert N. M. Watson
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/posix1e.3 264818 2014-04-23 12:11:14Z brueffer $
-.\"
-.Dd April 15, 2014
-.Dt POSIX1E 3
-.Os
-.Sh NAME
-.Nm posix1e
-.Nd introduction to the POSIX.1e security API
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.In sys/mac.h
-.Sh DESCRIPTION
-POSIX.1e describes five security extensions to the POSIX.1 API: Access
-Control Lists (ACLs), Auditing, Capabilities, Mandatory Access Control, and
-Information Flow Labels.
-While IEEE POSIX.1e D17 specification has not been standardized, several of
-its interfaces are widely used.
-.Pp
-.Fx
-implements POSIX.1e interface for access control lists, described in
-.Xr acl 3 ,
-and supports ACLs on the
-.Xr ffs 7
-file system; ACLs must be administratively enabled using
-.Xr tunefs 8 .
-.Pp
-.Fx
-implements a POSIX.1e-like mandatory access control interface, described in
-.Xr mac 3 ,
-although with a number of extensions and important semantic differences.
-.Pp
-.Fx
-does not implement the POSIX.1e audit, privilege (capability), or information
-flow label APIs.
-However,
-.Fx
-does implement the
-.Xr libbsm
-audit API.
-It also provides
-.Xr capsicum 4 ,
-a lightweight OS capability and sandbox framework implementing a
-hybrid capability system model.
-.Sh ENVIRONMENT
-POSIX.1e assigns security attributes to all objects, extending the security
-functionality described in POSIX.1.
-These additional attributes store fine-grained discretionary access control
-information and mandatory access control labels; for files, they are stored
-in extended attributes, described in
-.Xr extattr 3 .
-.Pp
-POSIX.2c describes
-a set of userland utilities for manipulating these attributes, including
-.Xr getfacl 1
-and
-.Xr setfacl 1
-for access control lists, and
-.Xr getfmac 8
-and
-.Xr setfmac 8
-for mandatory access control labels.
-.Sh SEE ALSO
-.Xr getfacl 1 ,
-.Xr setfacl 1 ,
-.Xr extattr 2 ,
-.Xr acl 3 ,
-.Xr extattr 3 ,
-.Xr libcapsicum 3 ,
-.Xr libbsm 3 ,
-.Xr mac 3 ,
-.Xr capsicum 4 ,
-.Xr ffs 7 ,
-.Xr getfmac 8 ,
-.Xr setfmac 8 ,
-.Xr tunefs 8 ,
-.Xr acl 9 ,
-.Xr extattr 9 ,
-.Xr mac 9
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ;
-most features were available as of
-.Fx 5.0 .
-.Sh AUTHORS
-.An Robert N M Watson
-.An Chris D. Faulhaber
-.An Thomas Moestl
-.An Ilmar S Habibulin
diff --git a/lib/libc/quad/Makefile b/lib/libc/quad/Makefile
deleted file mode 100644
index c8c97c2..0000000
--- a/lib/libc/quad/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Objects
-#OBJS = anddi3.o adddi3.o qdivrem.o umoddi3.o udivdi3.o divdi3.o
-OBJS = adddi3.o anddi3.o ashldi3.o ashrdi3.o cmpdi2.o divdi3.o fixdfdi.o fixsfdi.o fixunsdfdi.o fixunssfdi.o floatdidf.o floatdisf.o floatunsdidf.o iordi3.o lshldi3.o lshrdi3.o moddi3.o muldi3.o negdi2.o notdi2.o qdivrem.o subdi3.o ucmpdi2.o udivdi3.o umoddi3.o xordi3.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/quad/adddi3.c b/lib/libc/quad/adddi3.c
deleted file mode 100644
index d97059e..0000000
--- a/lib/libc/quad/adddi3.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)adddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/adddi3.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Add two quads.  This is trivial since a one-bit carry from a single
- * u_long addition x+y occurs if and only if the sum x+y is less than
- * either x or y (the choice to compare with x or y is arbitrary).
- */
-quad_t
-__adddi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb, sum;
-
-	aa.q = a;
-	bb.q = b;
-	sum.ul[L] = aa.ul[L] + bb.ul[L];
-	sum.ul[H] = aa.ul[H] + bb.ul[H] + (sum.ul[L] < bb.ul[L]);
-	return (sum.q);
-}
diff --git a/lib/libc/quad/anddi3.c b/lib/libc/quad/anddi3.c
deleted file mode 100644
index 7d58cf1..0000000
--- a/lib/libc/quad/anddi3.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)anddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/anddi3.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Return a & b, in quad.
- */
-quad_t
-__anddi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.q = a;
-	bb.q = b;
-	aa.ul[0] &= bb.ul[0];
-	aa.ul[1] &= bb.ul[1];
-	return (aa.q);
-}
diff --git a/lib/libc/quad/ashldi3.c b/lib/libc/quad/ashldi3.c
deleted file mode 100644
index 6e9d493..0000000
--- a/lib/libc/quad/ashldi3.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ashldi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/ashldi3.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Shift a (signed) quad value left (arithmetic shift left).
- * This is the same as logical shift left!
- */
-quad_t
-__ashldi3(a, shift)
-	quad_t a;
-	qshift_t shift;
-{
-	union uu aa;
-
-	aa.q = a;
-	if (shift >= LONG_BITS) {
-		aa.ul[H] = shift >= QUAD_BITS ? 0 :
-		    aa.ul[L] << (shift - LONG_BITS);
-		aa.ul[L] = 0;
-	} else if (shift > 0) {
-		aa.ul[H] = (aa.ul[H] << shift) |
-		    (aa.ul[L] >> (LONG_BITS - shift));
-		aa.ul[L] <<= shift;
-	}
-	return (aa.q);
-}
diff --git a/lib/libc/quad/ashrdi3.c b/lib/libc/quad/ashrdi3.c
deleted file mode 100644
index 0d57b20..0000000
--- a/lib/libc/quad/ashrdi3.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ashrdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/ashrdi3.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Shift a (signed) quad value right (arithmetic shift right).
- */
-quad_t
-__ashrdi3(a, shift)
-	quad_t a;
-	qshift_t shift;
-{
-	union uu aa;
-
-	aa.q = a;
-	if (shift >= LONG_BITS) {
-		long s;
-
-		/*
-		 * Smear bits rightward using the machine's right-shift
-		 * method, whether that is sign extension or zero fill,
-		 * to get the `sign word' s.  Note that shifting by
-		 * LONG_BITS is undefined, so we shift (LONG_BITS-1),
-		 * then 1 more, to get our answer.
-		 */
-		s = (aa.sl[H] >> (LONG_BITS - 1)) >> 1;
-		aa.ul[L] = shift >= QUAD_BITS ? s :
-		    aa.sl[H] >> (shift - LONG_BITS);
-		aa.ul[H] = s;
-	} else if (shift > 0) {
-		aa.ul[L] = (aa.ul[L] >> shift) |
-		    (aa.ul[H] << (LONG_BITS - shift));
-		aa.sl[H] >>= shift;
-	}
-	return (aa.q);
-}
diff --git a/lib/libc/quad/cmpdi2.c b/lib/libc/quad/cmpdi2.c
deleted file mode 100644
index 495a8ee..0000000
--- a/lib/libc/quad/cmpdi2.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)cmpdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/cmpdi2.c,v 1.2 2002/03/22 21:52:42 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Return 0, 1, or 2 as a <, =, > b respectively.
- * Both a and b are considered signed---which means only the high word is
- * signed.
- */
-int
-__cmpdi2(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.q = a;
-	bb.q = b;
-	return (aa.sl[H] < bb.sl[H] ? 0 : aa.sl[H] > bb.sl[H] ? 2 :
-	    aa.ul[L] < bb.ul[L] ? 0 : aa.ul[L] > bb.ul[L] ? 2 : 1);
-}
diff --git a/lib/libc/quad/divdi3.c b/lib/libc/quad/divdi3.c
deleted file mode 100644
index a8290d8..0000000
--- a/lib/libc/quad/divdi3.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)divdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/divdi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Divide two signed quads.
- * ??? if -1/2 should produce -1 on this machine, this code is wrong
- */
-quad_t
-__divdi3(a, b)
-	quad_t a, b;
-{
-	u_quad_t ua, ub, uq;
-	int neg;
-
-	if (a < 0)
-		ua = -(u_quad_t)a, neg = 1;
-	else
-		ua = a, neg = 0;
-	if (b < 0)
-		ub = -(u_quad_t)b, neg ^= 1;
-	else
-		ub = b;
-	uq = __qdivrem(ua, ub, (u_quad_t *)0);
-	return (neg ? -uq : uq);
-}
diff --git a/lib/libc/quad/fixdfdi.c b/lib/libc/quad/fixdfdi.c
deleted file mode 100644
index 10c2d51..0000000
--- a/lib/libc/quad/fixdfdi.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fixdfdi.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/fixdfdi.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Convert double to (signed) quad.
- * We clamp anything that is out of range.
- */
-quad_t
-__fixdfdi(x)
-	double x;
-{
-	if (x < 0)
-		if (x <= QUAD_MIN)
-			return (QUAD_MIN);
-		else
-			return ((quad_t)-(u_quad_t)-x);
-	else
-		if (x >= QUAD_MAX)
-			return (QUAD_MAX);
-		else
-			return ((quad_t)(u_quad_t)x);
-}
diff --git a/lib/libc/quad/fixsfdi.c b/lib/libc/quad/fixsfdi.c
deleted file mode 100644
index 647a4a1..0000000
--- a/lib/libc/quad/fixsfdi.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fixsfdi.c	5.1 (Berkeley) 7/7/92";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/fixsfdi.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Convert float to (signed) quad.
- * We clamp anything that is out of range.
- *
- * N.B.: must use new ANSI syntax (sorry).
- */
-long long
-__fixsfdi(float x)
-{
-	if (x < 0)
-		if (x <= QUAD_MIN)
-			return (QUAD_MIN);
-		else
-			return ((quad_t)-(u_quad_t)-x);
-	else
-		if (x >= QUAD_MAX)
-			return (QUAD_MAX);
-		else
-			return ((quad_t)(u_quad_t)x);
-}
diff --git a/lib/libc/quad/fixunsdfdi.c b/lib/libc/quad/fixunsdfdi.c
deleted file mode 100644
index 694cd62..0000000
--- a/lib/libc/quad/fixunsdfdi.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fixunsdfdi.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/fixunsdfdi.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-#define	ONE_FOURTH	(1 << (LONG_BITS - 2))
-#define	ONE_HALF	(ONE_FOURTH * 2.0)
-#define	ONE		(ONE_FOURTH * 4.0)
-
-/*
- * Convert double to (unsigned) quad.
- * Not sure what to do with negative numbers---for now, anything out
- * of range becomes UQUAD_MAX.
- */
-u_quad_t
-__fixunsdfdi(x)
-	double x;
-{
-	double toppart;
-	union uu t;
-
-	if (x < 0)
-		return (UQUAD_MAX);	/* ??? should be 0?  ERANGE??? */
-#ifdef notdef				/* this falls afoul of a GCC bug */
-	if (x >= UQUAD_MAX)
-		return (UQUAD_MAX);
-#else					/* so we wire in 2^64-1 instead */
-	if (x >= 18446744073709551615.0)
-		return (UQUAD_MAX);
-#endif
-	/*
-	 * Get the upper part of the result.  Note that the divide
-	 * may round up; we want to avoid this if possible, so we
-	 * subtract `1/2' first.
-	 */
-	toppart = (x - ONE_HALF) / ONE;
-	/*
-	 * Now build a u_quad_t out of the top part.  The difference
-	 * between x and this is the bottom part (this may introduce
-	 * a few fuzzy bits, but what the heck).  With any luck this
-	 * difference will be nonnegative: x should wind up in the
-	 * range [0..ULONG_MAX].  For paranoia, we assume [LONG_MIN..
-	 * 2*ULONG_MAX] instead.
-	 */
-	t.ul[H] = (unsigned long)toppart;
-	t.ul[L] = 0;
-	x -= (double)t.uq;
-	if (x < 0) {
-		t.ul[H]--;
-		x += ULONG_MAX;
-	}
-	if (x > ULONG_MAX) {
-		t.ul[H]++;
-		x -= ULONG_MAX;
-	}
-	t.ul[L] = (u_long)x;
-	return (t.uq);
-}
diff --git a/lib/libc/quad/fixunssfdi.c b/lib/libc/quad/fixunssfdi.c
deleted file mode 100644
index 1263fee..0000000
--- a/lib/libc/quad/fixunssfdi.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fixunssfdi.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/fixunssfdi.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-#define	ONE_FOURTH	(1 << (LONG_BITS - 2))
-#define	ONE_HALF	(ONE_FOURTH * 2.0)
-#define	ONE		(ONE_FOURTH * 4.0)
-
-/*
- * Convert float to (unsigned) quad.  We do most of our work in double,
- * out of sheer paranoia.
- *
- * Not sure what to do with negative numbers---for now, anything out
- * of range becomes UQUAD_MAX.
- *
- * N.B.: must use new ANSI syntax (sorry).
- */
-u_quad_t
-__fixunssfdi(float f)
-{
-	double x, toppart;
-	union uu t;
-
-	if (f < 0)
-		return (UQUAD_MAX);	/* ??? should be 0?  ERANGE??? */
-#ifdef notdef				/* this falls afoul of a GCC bug */
-	if (f >= UQUAD_MAX)
-		return (UQUAD_MAX);
-#else					/* so we wire in 2^64-1 instead */
-	if (f >= 18446744073709551615.0)
-		return (UQUAD_MAX);
-#endif
-	x = f;
-	/*
-	 * Get the upper part of the result.  Note that the divide
-	 * may round up; we want to avoid this if possible, so we
-	 * subtract `1/2' first.
-	 */
-	toppart = (x - ONE_HALF) / ONE;
-	/*
-	 * Now build a u_quad_t out of the top part.  The difference
-	 * between x and this is the bottom part (this may introduce
-	 * a few fuzzy bits, but what the heck).  With any luck this
-	 * difference will be nonnegative: x should wind up in the
-	 * range [0..ULONG_MAX].  For paranoia, we assume [LONG_MIN..
-	 * 2*ULONG_MAX] instead.
-	 */
-	t.ul[H] = (unsigned long)toppart;
-	t.ul[L] = 0;
-	x -= (double)t.uq;
-	if (x < 0) {
-		t.ul[H]--;
-		x += ULONG_MAX;
-	}
-	if (x > ULONG_MAX) {
-		t.ul[H]++;
-		x -= ULONG_MAX;
-	}
-	t.ul[L] = (u_long)x;
-	return (t.uq);
-}
diff --git a/lib/libc/quad/floatdidf.c b/lib/libc/quad/floatdidf.c
deleted file mode 100644
index ba0b6a7..0000000
--- a/lib/libc/quad/floatdidf.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)floatdidf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/floatdidf.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Convert (signed) quad to double.
- */
-double
-__floatdidf(x)
-	quad_t x;
-{
-	double d;
-	union uu u;
-	int neg;
-
-	/*
-	 * Get an unsigned number first, by negating if necessary.
-	 */
-	if (x < 0)
-		u.q = -x, neg = 1;
-	else
-		u.q = x, neg = 0;
-
-	/*
-	 * Now u.ul[H] has the factor of 2^32 (or whatever) and u.ul[L]
-	 * has the units.  Ideally we could just set d, add LONG_BITS to
-	 * its exponent, and then add the units, but this is portable
-	 * code and does not know how to get at an exponent.  Machine-
-	 * specific code may be able to do this more efficiently.
-	 */
-	d = (double)u.ul[H] * ((1 << (LONG_BITS - 2)) * 4.0);
-	d += u.ul[L];
-
-	return (neg ? -d : d);
-}
diff --git a/lib/libc/quad/floatdisf.c b/lib/libc/quad/floatdisf.c
deleted file mode 100644
index bac96c2..0000000
--- a/lib/libc/quad/floatdisf.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)floatdisf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/floatdisf.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Convert (signed) quad to float.
- */
-float
-__floatdisf(x)
-	quad_t x;
-{
-	float f;
-	union uu u;
-	int neg;
-
-	/*
-	 * Get an unsigned number first, by negating if necessary.
-	 */
-	if (x < 0)
-		u.q = -x, neg = 1;
-	else
-		u.q = x, neg = 0;
-
-	/*
-	 * Now u.ul[H] has the factor of 2^32 (or whatever) and u.ul[L]
-	 * has the units.  Ideally we could just set f, add LONG_BITS to
-	 * its exponent, and then add the units, but this is portable
-	 * code and does not know how to get at an exponent.  Machine-
-	 * specific code may be able to do this more efficiently.
-	 *
-	 * Using double here may be excessive paranoia.
-	 */
-	f = (double)u.ul[H] * ((1 << (LONG_BITS - 2)) * 4.0);
-	f += u.ul[L];
-
-	return (neg ? -f : f);
-}
diff --git a/lib/libc/quad/floatunsdidf.c b/lib/libc/quad/floatunsdidf.c
deleted file mode 100644
index 66bf63b..0000000
--- a/lib/libc/quad/floatunsdidf.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)floatunsdidf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/floatunsdidf.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Convert (unsigned) quad to double.
- * This is exactly like floatdidf.c except that negatives never occur.
- */
-double
-__floatunsdidf(x)
-	u_quad_t x;
-{
-	double d;
-	union uu u;
-
-	u.uq = x;
-	d = (double)u.ul[H] * ((1 << (LONG_BITS - 2)) * 4.0);
-	d += u.ul[L];
-	return (d);
-}
diff --git a/lib/libc/quad/iordi3.c b/lib/libc/quad/iordi3.c
deleted file mode 100644
index be16676..0000000
--- a/lib/libc/quad/iordi3.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)iordi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/iordi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Return a | b, in quad.
- */
-quad_t
-__iordi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.q = a;
-	bb.q = b;
-	aa.ul[0] |= bb.ul[0];
-	aa.ul[1] |= bb.ul[1];
-	return (aa.q);
-}
diff --git a/lib/libc/quad/lshldi3.c b/lib/libc/quad/lshldi3.c
deleted file mode 100644
index 261f4b0..0000000
--- a/lib/libc/quad/lshldi3.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lshldi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/lshldi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Shift an (unsigned) quad value left (logical shift left).
- * This is the same as arithmetic shift left!
- */
-quad_t
-__lshldi3(a, shift)
-	quad_t a;
-	qshift_t shift;
-{
-	union uu aa;
-
-	aa.q = a;
-	if (shift >= LONG_BITS) {
-		aa.ul[H] = shift >= QUAD_BITS ? 0 :
-		    aa.ul[L] << (shift - LONG_BITS);
-		aa.ul[L] = 0;
-	} else if (shift > 0) {
-		aa.ul[H] = (aa.ul[H] << shift) |
-		    (aa.ul[L] >> (LONG_BITS - shift));
-		aa.ul[L] <<= shift;
-	}
-	return (aa.q);
-}
diff --git a/lib/libc/quad/lshrdi3.c b/lib/libc/quad/lshrdi3.c
deleted file mode 100644
index 9f35ed6..0000000
--- a/lib/libc/quad/lshrdi3.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lshrdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/lshrdi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Shift an (unsigned) quad value right (logical shift right).
- */
-quad_t
-__lshrdi3(a, shift)
-	quad_t a;
-	qshift_t shift;
-{
-	union uu aa;
-
-	aa.q = a;
-	if (shift >= LONG_BITS) {
-		aa.ul[L] = shift >= QUAD_BITS ? 0 :
-		    aa.ul[H] >> (shift - LONG_BITS);
-		aa.ul[H] = 0;
-	} else if (shift > 0) {
-		aa.ul[L] = (aa.ul[L] >> shift) |
-		    (aa.ul[H] << (LONG_BITS - shift));
-		aa.ul[H] >>= shift;
-	}
-	return (aa.q);
-}
diff --git a/lib/libc/quad/moddi3.c b/lib/libc/quad/moddi3.c
deleted file mode 100644
index 7a51dd3..0000000
--- a/lib/libc/quad/moddi3.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)moddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/moddi3.c,v 1.3 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Return remainder after dividing two signed quads.
- *
- * XXX
- * If -1/2 should produce -1 on this machine, this code is wrong.
- */
-quad_t
-__moddi3(a, b)
-	quad_t a, b;
-{
-	u_quad_t ua, ub, ur;
-	int neg;
-
-	if (a < 0)
-		ua = -(u_quad_t)a, neg = 1;
-	else
-		ua = a, neg = 0;
-	if (b < 0)
-		ub = -(u_quad_t)b;
-	else
-		ub = b;
-	(void)__qdivrem(ua, ub, &ur);
-	return (neg ? -ur : ur);
-}
diff --git a/lib/libc/quad/muldi3.c b/lib/libc/quad/muldi3.c
deleted file mode 100644
index cc0c887..0000000
--- a/lib/libc/quad/muldi3.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)muldi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/muldi3.c,v 1.3 2002/03/21 18:40:57 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Multiply two quads.
- *
- * Our algorithm is based on the following.  Split incoming quad values
- * u and v (where u,v >= 0) into
- *
- *	u = 2^n u1  *  u0	(n = number of bits in `u_long', usu. 32)
- *
- * and
- *
- *	v = 2^n v1  *  v0
- *
- * Then
- *
- *	uv = 2^2n u1 v1  +  2^n u1 v0  +  2^n v1 u0  +  u0 v0
- *	   = 2^2n u1 v1  +     2^n (u1 v0 + v1 u0)   +  u0 v0
- *
- * Now add 2^n u1 v1 to the first term and subtract it from the middle,
- * and add 2^n u0 v0 to the last term and subtract it from the middle.
- * This gives:
- *
- *	uv = (2^2n + 2^n) (u1 v1)  +
- *	         (2^n)    (u1 v0 - u1 v1 + u0 v1 - u0 v0)  +
- *	       (2^n + 1)  (u0 v0)
- *
- * Factoring the middle a bit gives us:
- *
- *	uv = (2^2n + 2^n) (u1 v1)  +			[u1v1 = high]
- *		 (2^n)    (u1 - u0) (v0 - v1)  +	[(u1-u0)... = mid]
- *	       (2^n + 1)  (u0 v0)			[u0v0 = low]
- *
- * The terms (u1 v1), (u1 - u0) (v0 - v1), and (u0 v0) can all be done
- * in just half the precision of the original.  (Note that either or both
- * of (u1 - u0) or (v0 - v1) may be negative.)
- *
- * This algorithm is from Knuth vol. 2 (2nd ed), section 4.3.3, p. 278.
- *
- * Since C does not give us a `long * long = quad' operator, we split
- * our input quads into two longs, then split the two longs into two
- * shorts.  We can then calculate `short * short = long' in native
- * arithmetic.
- *
- * Our product should, strictly speaking, be a `long quad', with 128
- * bits, but we are going to discard the upper 64.  In other words,
- * we are not interested in uv, but rather in (uv mod 2^2n).  This
- * makes some of the terms above vanish, and we get:
- *
- *	(2^n)(high) + (2^n)(mid) + (2^n + 1)(low)
- *
- * or
- *
- *	(2^n)(high + mid + low) + low
- *
- * Furthermore, `high' and `mid' can be computed mod 2^n, as any factor
- * of 2^n in either one will also vanish.  Only `low' need be computed
- * mod 2^2n, and only because of the final term above.
- */
-static quad_t __lmulq(u_long, u_long);
-
-quad_t
-__muldi3(a, b)
-	quad_t a, b;
-{
-	union uu u, v, low, prod;
-	u_long high, mid, udiff, vdiff;
-	int negall, negmid;
-#define	u1	u.ul[H]
-#define	u0	u.ul[L]
-#define	v1	v.ul[H]
-#define	v0	v.ul[L]
-
-	/*
-	 * Get u and v such that u, v >= 0.  When this is finished,
-	 * u1, u0, v1, and v0 will be directly accessible through the
-	 * longword fields.
-	 */
-	if (a >= 0)
-		u.q = a, negall = 0;
-	else
-		u.q = -a, negall = 1;
-	if (b >= 0)
-		v.q = b;
-	else
-		v.q = -b, negall ^= 1;
-
-	if (u1 == 0 && v1 == 0) {
-		/*
-		 * An (I hope) important optimization occurs when u1 and v1
-		 * are both 0.  This should be common since most numbers
-		 * are small.  Here the product is just u0*v0.
-		 */
-		prod.q = __lmulq(u0, v0);
-	} else {
-		/*
-		 * Compute the three intermediate products, remembering
-		 * whether the middle term is negative.  We can discard
-		 * any upper bits in high and mid, so we can use native
-		 * u_long * u_long => u_long arithmetic.
-		 */
-		low.q = __lmulq(u0, v0);
-
-		if (u1 >= u0)
-			negmid = 0, udiff = u1 - u0;
-		else
-			negmid = 1, udiff = u0 - u1;
-		if (v0 >= v1)
-			vdiff = v0 - v1;
-		else
-			vdiff = v1 - v0, negmid ^= 1;
-		mid = udiff * vdiff;
-
-		high = u1 * v1;
-
-		/*
-		 * Assemble the final product.
-		 */
-		prod.ul[H] = high + (negmid ? -mid : mid) + low.ul[L] +
-		    low.ul[H];
-		prod.ul[L] = low.ul[L];
-	}
-	return (negall ? -prod.q : prod.q);
-#undef u1
-#undef u0
-#undef v1
-#undef v0
-}
-
-/*
- * Multiply two 2N-bit longs to produce a 4N-bit quad, where N is half
- * the number of bits in a long (whatever that is---the code below
- * does not care as long as quad.h does its part of the bargain---but
- * typically N==16).
- *
- * We use the same algorithm from Knuth, but this time the modulo refinement
- * does not apply.  On the other hand, since N is half the size of a long,
- * we can get away with native multiplication---none of our input terms
- * exceeds (ULONG_MAX >> 1).
- *
- * Note that, for u_long l, the quad-precision result
- *
- *	l << N
- *
- * splits into high and low longs as HHALF(l) and LHUP(l) respectively.
- */
-static quad_t
-__lmulq(u_long u, u_long v)
-{
-	u_long u1, u0, v1, v0, udiff, vdiff, high, mid, low;
-	u_long prodh, prodl, was;
-	union uu prod;
-	int neg;
-
-	u1 = HHALF(u);
-	u0 = LHALF(u);
-	v1 = HHALF(v);
-	v0 = LHALF(v);
-
-	low = u0 * v0;
-
-	/* This is the same small-number optimization as before. */
-	if (u1 == 0 && v1 == 0)
-		return (low);
-
-	if (u1 >= u0)
-		udiff = u1 - u0, neg = 0;
-	else
-		udiff = u0 - u1, neg = 1;
-	if (v0 >= v1)
-		vdiff = v0 - v1;
-	else
-		vdiff = v1 - v0, neg ^= 1;
-	mid = udiff * vdiff;
-
-	high = u1 * v1;
-
-	/* prod = (high << 2N) + (high << N); */
-	prodh = high + HHALF(high);
-	prodl = LHUP(high);
-
-	/* if (neg) prod -= mid << N; else prod += mid << N; */
-	if (neg) {
-		was = prodl;
-		prodl -= LHUP(mid);
-		prodh -= HHALF(mid) + (prodl > was);
-	} else {
-		was = prodl;
-		prodl += LHUP(mid);
-		prodh += HHALF(mid) + (prodl < was);
-	}
-
-	/* prod += low << N */
-	was = prodl;
-	prodl += LHUP(low);
-	prodh += HHALF(low) + (prodl < was);
-	/* ... + low; */
-	if ((prodl += low) < low)
-		prodh++;
-
-	/* return 4N-bit product */
-	prod.ul[H] = prodh;
-	prod.ul[L] = prodl;
-	return (prod.q);
-}
diff --git a/lib/libc/quad/negdi2.c b/lib/libc/quad/negdi2.c
deleted file mode 100644
index f1de706..0000000
--- a/lib/libc/quad/negdi2.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)negdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/negdi2.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Return -a (or, equivalently, 0 - a), in quad.  See subdi3.c.
- */
-quad_t
-__negdi2(a)
-	quad_t a;
-{
-	union uu aa, res;
-
-	aa.q = a;
-	res.ul[L] = -aa.ul[L];
-	res.ul[H] = -aa.ul[H] - (res.ul[L] > 0);
-	return (res.q);
-}
diff --git a/lib/libc/quad/notdi2.c b/lib/libc/quad/notdi2.c
deleted file mode 100644
index 354abe5..0000000
--- a/lib/libc/quad/notdi2.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)notdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/notdi2.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Return ~a.  For some reason gcc calls this `one's complement' rather
- * than `not'.
- */
-quad_t
-__one_cmpldi2(a)
-	quad_t a;
-{
-	union uu aa;
-
-	aa.q = a;
-	aa.ul[0] = ~aa.ul[0];
-	aa.ul[1] = ~aa.ul[1];
-	return (aa.q);
-}
diff --git a/lib/libc/quad/qdivrem.c b/lib/libc/quad/qdivrem.c
deleted file mode 100644
index b57077a..0000000
--- a/lib/libc/quad/qdivrem.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)qdivrem.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/qdivrem.c,v 1.3 2002/03/21 18:40:57 obrien Exp $");
-
-/*
- * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
- * section 4.3.1, pp. 257--259.
- */
-
-#include "quad.h"
-
-#define	B	(1 << HALF_BITS)	/* digit base */
-
-/* Combine two `digits' to make a single two-digit number. */
-#define	COMBINE(a, b) (((u_long)(a) << HALF_BITS) | (b))
-
-/* select a type for digits in base B: use unsigned short if they fit */
-#if ULONG_MAX == 0xffffffff && USHRT_MAX >= 0xffff
-typedef unsigned short digit;
-#else
-typedef u_long digit;
-#endif
-
-/*
- * Shift p[0]..p[len] left `sh' bits, ignoring any bits that
- * `fall out' the left (there never will be any such anyway).
- * We may assume len >= 0.  NOTE THAT THIS WRITES len+1 DIGITS.
- */
-static void
-shl(digit *p, int len, int sh)
-{
-	int i;
-
-	for (i = 0; i < len; i++)
-		p[i] = LHALF(p[i] << sh) | (p[i + 1] >> (HALF_BITS - sh));
-	p[i] = LHALF(p[i] << sh);
-}
-
-/*
- * __qdivrem(u, v, rem) returns u/v and, optionally, sets *rem to u%v.
- *
- * We do this in base 2-sup-HALF_BITS, so that all intermediate products
- * fit within u_long.  As a consequence, the maximum length dividend and
- * divisor are 4 `digits' in this base (they are shorter if they have
- * leading zeros).
- */
-u_quad_t
-__qdivrem(uq, vq, arq)
-	u_quad_t uq, vq, *arq;
-{
-	union uu tmp;
-	digit *u, *v, *q;
-	digit v1, v2;
-	u_long qhat, rhat, t;
-	int m, n, d, j, i;
-	digit uspace[5], vspace[5], qspace[5];
-
-	/*
-	 * Take care of special cases: divide by zero, and u < v.
-	 */
-	if (vq == 0) {
-		/* divide by zero. */
-		static volatile const unsigned int zero = 0;
-
-		tmp.ul[H] = tmp.ul[L] = 1 / zero;
-		if (arq)
-			*arq = uq;
-		return (tmp.q);
-	}
-	if (uq < vq) {
-		if (arq)
-			*arq = uq;
-		return (0);
-	}
-	u = &uspace[0];
-	v = &vspace[0];
-	q = &qspace[0];
-
-	/*
-	 * Break dividend and divisor into digits in base B, then
-	 * count leading zeros to determine m and n.  When done, we
-	 * will have:
-	 *	u = (u[1]u[2]...u[m+n]) sub B
-	 *	v = (v[1]v[2]...v[n]) sub B
-	 *	v[1] != 0
-	 *	1 < n <= 4 (if n = 1, we use a different division algorithm)
-	 *	m >= 0 (otherwise u < v, which we already checked)
-	 *	m + n = 4
-	 * and thus
-	 *	m = 4 - n <= 2
-	 */
-	tmp.uq = uq;
-	u[0] = 0;
-	u[1] = HHALF(tmp.ul[H]);
-	u[2] = LHALF(tmp.ul[H]);
-	u[3] = HHALF(tmp.ul[L]);
-	u[4] = LHALF(tmp.ul[L]);
-	tmp.uq = vq;
-	v[1] = HHALF(tmp.ul[H]);
-	v[2] = LHALF(tmp.ul[H]);
-	v[3] = HHALF(tmp.ul[L]);
-	v[4] = LHALF(tmp.ul[L]);
-	for (n = 4; v[1] == 0; v++) {
-		if (--n == 1) {
-			u_long rbj;	/* r*B+u[j] (not root boy jim) */
-			digit q1, q2, q3, q4;
-
-			/*
-			 * Change of plan, per exercise 16.
-			 *	r = 0;
-			 *	for j = 1..4:
-			 *		q[j] = floor((r*B + u[j]) / v),
-			 *		r = (r*B + u[j]) % v;
-			 * We unroll this completely here.
-			 */
-			t = v[2];	/* nonzero, by definition */
-			q1 = u[1] / t;
-			rbj = COMBINE(u[1] % t, u[2]);
-			q2 = rbj / t;
-			rbj = COMBINE(rbj % t, u[3]);
-			q3 = rbj / t;
-			rbj = COMBINE(rbj % t, u[4]);
-			q4 = rbj / t;
-			if (arq)
-				*arq = rbj % t;
-			tmp.ul[H] = COMBINE(q1, q2);
-			tmp.ul[L] = COMBINE(q3, q4);
-			return (tmp.q);
-		}
-	}
-
-	/*
-	 * By adjusting q once we determine m, we can guarantee that
-	 * there is a complete four-digit quotient at &qspace[1] when
-	 * we finally stop.
-	 */
-	for (m = 4 - n; u[1] == 0; u++)
-		m--;
-	for (i = 4 - m; --i >= 0;)
-		q[i] = 0;
-	q += 4 - m;
-
-	/*
-	 * Here we run Program D, translated from MIX to C and acquiring
-	 * a few minor changes.
-	 *
-	 * D1: choose multiplier 1 << d to ensure v[1] >= B/2.
-	 */
-	d = 0;
-	for (t = v[1]; t < B / 2; t <<= 1)
-		d++;
-	if (d > 0) {
-		shl(&u[0], m + n, d);		/* u <<= d */
-		shl(&v[1], n - 1, d);		/* v <<= d */
-	}
-	/*
-	 * D2: j = 0.
-	 */
-	j = 0;
-	v1 = v[1];	/* for D3 -- note that v[1..n] are constant */
-	v2 = v[2];	/* for D3 */
-	do {
-		digit uj0, uj1, uj2;
-
-		/*
-		 * D3: Calculate qhat (\^q, in TeX notation).
-		 * Let qhat = min((u[j]*B + u[j+1])/v[1], B-1), and
-		 * let rhat = (u[j]*B + u[j+1]) mod v[1].
-		 * While rhat < B and v[2]*qhat > rhat*B+u[j+2],
-		 * decrement qhat and increase rhat correspondingly.
-		 * Note that if rhat >= B, v[2]*qhat < rhat*B.
-		 */
-		uj0 = u[j + 0];	/* for D3 only -- note that u[j+...] change */
-		uj1 = u[j + 1];	/* for D3 only */
-		uj2 = u[j + 2];	/* for D3 only */
-		if (uj0 == v1) {
-			qhat = B;
-			rhat = uj1;
-			goto qhat_too_big;
-		} else {
-			u_long n = COMBINE(uj0, uj1);
-			qhat = n / v1;
-			rhat = n % v1;
-		}
-		while (v2 * qhat > COMBINE(rhat, uj2)) {
-	qhat_too_big:
-			qhat--;
-			if ((rhat += v1) >= B)
-				break;
-		}
-		/*
-		 * D4: Multiply and subtract.
-		 * The variable `t' holds any borrows across the loop.
-		 * We split this up so that we do not require v[0] = 0,
-		 * and to eliminate a final special case.
-		 */
-		for (t = 0, i = n; i > 0; i--) {
-			t = u[i + j] - v[i] * qhat - t;
-			u[i + j] = LHALF(t);
-			t = (B - HHALF(t)) & (B - 1);
-		}
-		t = u[j] - t;
-		u[j] = LHALF(t);
-		/*
-		 * D5: test remainder.
-		 * There is a borrow if and only if HHALF(t) is nonzero;
-		 * in that (rare) case, qhat was too large (by exactly 1).
-		 * Fix it by adding v[1..n] to u[j..j+n].
-		 */
-		if (HHALF(t)) {
-			qhat--;
-			for (t = 0, i = n; i > 0; i--) { /* D6: add back. */
-				t += u[i + j] + v[i];
-				u[i + j] = LHALF(t);
-				t = HHALF(t);
-			}
-			u[j] = LHALF(u[j] + t);
-		}
-		q[j] = qhat;
-	} while (++j <= m);		/* D7: loop on j. */
-
-	/*
-	 * If caller wants the remainder, we have to calculate it as
-	 * u[m..m+n] >> d (this is at most n digits and thus fits in
-	 * u[m+1..m+n], but we may need more source digits).
-	 */
-	if (arq) {
-		if (d) {
-			for (i = m + n; i > m; --i)
-				u[i] = (u[i] >> d) |
-				    LHALF(u[i - 1] << (HALF_BITS - d));
-			u[i] = 0;
-		}
-		tmp.ul[H] = COMBINE(uspace[1], uspace[2]);
-		tmp.ul[L] = COMBINE(uspace[3], uspace[4]);
-		*arq = tmp.q;
-	}
-
-	tmp.ul[H] = COMBINE(qspace[1], qspace[2]);
-	tmp.ul[L] = COMBINE(qspace[3], qspace[4]);
-	return (tmp.q);
-}
diff --git a/lib/libc/quad/quad.h b/lib/libc/quad/quad.h
deleted file mode 100644
index 60a2ffb..0000000
--- a/lib/libc/quad/quad.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- *
- *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/lib/libc/quad/quad.h,v 1.6 2002/03/21 22:47:55 obrien Exp $
- */
-
-/*
- * Quad arithmetic.
- *
- * This library makes the following assumptions:
- *
- *  - The type long long (aka quad_t) exists.
- *
- *  - A quad variable is exactly twice as long as `long'.
- *
- *  - The machine's arithmetic is two's complement.
- *
- * This library can provide 128-bit arithmetic on a machine with 128-bit
- * quads and 64-bit longs, for instance, or 96-bit arithmetic on machines
- * with 48-bit longs.
- */
-
-#include <sys/types.h>
-#include <limits.h>
-
-/*
- * Depending on the desired operation, we view a `long long' (aka quad_t) in
- * one or more of the following formats.
- */
-union uu {
-	quad_t	q;		/* as a (signed) quad */
-	quad_t	uq;		/* as an unsigned quad */
-	long	sl[2];		/* as two signed longs */
-	u_long	ul[2];		/* as two unsigned longs */
-};
-
-/*
- * Define high and low longwords.
- */
-#define	H		_QUAD_HIGHWORD
-#define	L		_QUAD_LOWWORD
-
-/*
- * Total number of bits in a quad_t and in the pieces that make it up.
- * These are used for shifting, and also below for halfword extraction
- * and assembly.
- */
-#define	QUAD_BITS	(sizeof(quad_t) * CHAR_BIT)
-#define	LONG_BITS	(sizeof(long) * CHAR_BIT)
-#define	HALF_BITS	(sizeof(long) * CHAR_BIT / 2)
-
-/*
- * Extract high and low shortwords from longword, and move low shortword of
- * longword to upper half of long, i.e., produce the upper longword of
- * ((quad_t)(x) << (number_of_bits_in_long/2)).  (`x' must actually be u_long.)
- *
- * These are used in the multiply code, to split a longword into upper
- * and lower halves, and to reassemble a product as a quad_t, shifted left
- * (sizeof(long)*CHAR_BIT/2).
- */
-#define	HHALF(x)	((x) >> HALF_BITS)
-#define	LHALF(x)	((x) & ((1 << HALF_BITS) - 1))
-#define	LHUP(x)		((x) << HALF_BITS)
-
-quad_t		__divdi3(quad_t a, quad_t b);
-quad_t		__moddi3(quad_t a, quad_t b);
-u_quad_t	__qdivrem(u_quad_t u, u_quad_t v, u_quad_t *rem);
-u_quad_t	__udivdi3(u_quad_t a, u_quad_t b);
-u_quad_t	__umoddi3(u_quad_t a, u_quad_t b);
-
-/*
- * XXX
- * Compensate for gcc 1 vs gcc 2.  Gcc 1 defines ?sh?di3's second argument
- * as u_quad_t, while gcc 2 correctly uses int.  Unfortunately, we still use
- * both compilers.
- */
-#if __GNUC__ >= 2
-typedef unsigned int	qshift_t;
-#else
-typedef u_quad_t	qshift_t;
-#endif
diff --git a/lib/libc/quad/subdi3.c b/lib/libc/quad/subdi3.c
deleted file mode 100644
index 64adfda..0000000
--- a/lib/libc/quad/subdi3.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)subdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/subdi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Subtract two quad values.  This is trivial since a one-bit carry
- * from a single u_long difference x-y occurs if and only if (x-y) > x.
- */
-quad_t
-__subdi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb, diff;
-
-	aa.q = a;
-	bb.q = b;
-	diff.ul[L] = aa.ul[L] - bb.ul[L];
-	diff.ul[H] = aa.ul[H] - bb.ul[H] - (diff.ul[L] > aa.ul[L]);
-	return (diff.q);
-}
diff --git a/lib/libc/quad/ucmpdi2.c b/lib/libc/quad/ucmpdi2.c
deleted file mode 100644
index d5958ba..0000000
--- a/lib/libc/quad/ucmpdi2.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ucmpdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/ucmpdi2.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Return 0, 1, or 2 as a <, =, > b respectively.
- * Neither a nor b are considered signed.
- */
-int
-__ucmpdi2(a, b)
-	u_quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.uq = a;
-	bb.uq = b;
-	return (aa.ul[H] < bb.ul[H] ? 0 : aa.ul[H] > bb.ul[H] ? 2 :
-	    aa.ul[L] < bb.ul[L] ? 0 : aa.ul[L] > bb.ul[L] ? 2 : 1);
-}
diff --git a/lib/libc/quad/udivdi3.c b/lib/libc/quad/udivdi3.c
deleted file mode 100644
index f7ce83a..0000000
--- a/lib/libc/quad/udivdi3.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)udivdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/udivdi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Divide two unsigned quads.
- */
-u_quad_t
-__udivdi3(a, b)
-	u_quad_t a, b;
-{
-
-	return (__qdivrem(a, b, (u_quad_t *)0));
-}
diff --git a/lib/libc/quad/umoddi3.c b/lib/libc/quad/umoddi3.c
deleted file mode 100644
index 12703c7..0000000
--- a/lib/libc/quad/umoddi3.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)umoddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/umoddi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Return remainder after dividing two unsigned quads.
- */
-u_quad_t
-__umoddi3(a, b)
-	u_quad_t a, b;
-{
-	u_quad_t r;
-
-	(void)__qdivrem(a, b, &r);
-	return (r);
-}
diff --git a/lib/libc/quad/xordi3.c b/lib/libc/quad/xordi3.c
deleted file mode 100644
index 73594de..0000000
--- a/lib/libc/quad/xordi3.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)xordi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/quad/xordi3.c,v 1.2 2002/03/22 21:52:43 obrien Exp $");
-
-#include "quad.h"
-
-/*
- * Return a ^ b, in quad.
- */
-quad_t
-__xordi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.q = a;
-	bb.q = b;
-	aa.ul[0] ^= bb.ul[0];
-	aa.ul[1] ^= bb.ul[1];
-	return (aa.q);
-}
diff --git a/lib/libc/regex/COPYRIGHT b/lib/libc/regex/COPYRIGHT
deleted file mode 100644
index 574f6bc..0000000
--- a/lib/libc/regex/COPYRIGHT
+++ /dev/null
@@ -1,56 +0,0 @@
-Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
-This software is not subject to any license of the American Telephone
-and Telegraph Company or of the Regents of the University of California.
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it, subject
-to the following restrictions:
-
-1. The author is not responsible for the consequences of use of this
-   software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Since few users ever read sources,
-   credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.  Since few users
-   ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-/*-
- * Copyright (c) 1994
- *	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.
- *
- *	@(#)COPYRIGHT	8.1 (Berkeley) 3/16/94
- */
diff --git a/lib/libc/regex/Makefile b/lib/libc/regex/Makefile
deleted file mode 100644
index a9b742b..0000000
--- a/lib/libc/regex/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = regcomp.o regerror.o regexec.o regfree.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/regex/cname.h b/lib/libc/regex/cname.h
deleted file mode 100644
index 4f0d583..0000000
--- a/lib/libc/regex/cname.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- *
- *	@(#)cname.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD: src/lib/libc/regex/cname.h,v 1.3 2002/03/22 23:41:56 obrien Exp $
- */
-
-/* character-name table */
-static struct cname {
-	char *name;
-	char code;
-} cnames[] = {
-	{"NUL",			'\0'},
-	{"SOH",			'\001'},
-	{"STX",			'\002'},
-	{"ETX",			'\003'},
-	{"EOT",			'\004'},
-	{"ENQ",			'\005'},
-	{"ACK",			'\006'},
-	{"BEL",			'\007'},
-	{"alert",		'\007'},
-	{"BS",			'\010'},
-	{"backspace",		'\b'},
-	{"HT",			'\011'},
-	{"tab",			'\t'},
-	{"LF",			'\012'},
-	{"newline",		'\n'},
-	{"VT",			'\013'},
-	{"vertical-tab",	'\v'},
-	{"FF",			'\014'},
-	{"form-feed",		'\f'},
-	{"CR",			'\015'},
-	{"carriage-return",	'\r'},
-	{"SO",			'\016'},
-	{"SI",			'\017'},
-	{"DLE",			'\020'},
-	{"DC1",			'\021'},
-	{"DC2",			'\022'},
-	{"DC3",			'\023'},
-	{"DC4",			'\024'},
-	{"NAK",			'\025'},
-	{"SYN",			'\026'},
-	{"ETB",			'\027'},
-	{"CAN",			'\030'},
-	{"EM",			'\031'},
-	{"SUB",			'\032'},
-	{"ESC",			'\033'},
-	{"IS4",			'\034'},
-	{"FS",			'\034'},
-	{"IS3",			'\035'},
-	{"GS",			'\035'},
-	{"IS2",			'\036'},
-	{"RS",			'\036'},
-	{"IS1",			'\037'},
-	{"US",			'\037'},
-	{"space",		' '},
-	{"exclamation-mark",	'!'},
-	{"quotation-mark",	'"'},
-	{"number-sign",		'#'},
-	{"dollar-sign",		'$'},
-	{"percent-sign",	'%'},
-	{"ampersand",		'&'},
-	{"apostrophe",		'\''},
-	{"left-parenthesis",	'('},
-	{"right-parenthesis",	')'},
-	{"asterisk",		'*'},
-	{"plus-sign",		'+'},
-	{"comma",		','},
-	{"hyphen",		'-'},
-	{"hyphen-minus",	'-'},
-	{"period",		'.'},
-	{"full-stop",		'.'},
-	{"slash",		'/'},
-	{"solidus",		'/'},
-	{"zero",		'0'},
-	{"one",			'1'},
-	{"two",			'2'},
-	{"three",		'3'},
-	{"four",		'4'},
-	{"five",		'5'},
-	{"six",			'6'},
-	{"seven",      		'7'},
-	{"eight",		'8'},
-	{"nine",		'9'},
-	{"colon",		':'},
-	{"semicolon",		';'},
-	{"less-than-sign",	'<'},
-	{"equals-sign",		'='},
-	{"greater-than-sign",	'>'},
-	{"question-mark",	'?'},
-	{"commercial-at",	'@'},
-	{"left-square-bracket",	'['},
-	{"backslash",		'\\'},
-	{"reverse-solidus",	'\\'},
-	{"right-square-bracket",']'},
-	{"circumflex",		'^'},
-	{"circumflex-accent",	'^'},
-	{"underscore",		'_'},
-	{"low-line",		'_'},
-	{"grave-accent",	'`'},
-	{"left-brace",		'{'},
-	{"left-curly-bracket",	'{'},
-	{"vertical-line",	'|'},
-	{"right-brace",		'}'},
-	{"right-curly-bracket",	'}'},
-	{"tilde",		'~'},
-	{"DEL",	'\177'},
-	{NULL,	0}
-};
diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
deleted file mode 100644
index cb48cfc..0000000
--- a/lib/libc/regex/engine.c
+++ /dev/null
@@ -1,1196 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- *
- *	@(#)engine.c	8.5 (Berkeley) 3/20/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/engine.c,v 1.16 2004/12/30 14:27:57 dds Exp $");
-
-/*
- * The matching engine and friends.  This file is #included by regexec.c
- * after suitable #defines of a variety of macros used herein, so that
- * different state representations can be used without duplicating masses
- * of code.
- */
-
-#ifdef SNAMES
-#define	matcher	smatcher
-#define	fast	sfast
-#define	slow	sslow
-#define	dissect	sdissect
-#define	backref	sbackref
-#define	step	sstep
-#define	print	sprint
-#define	at	sat
-#define	match	smat
-#endif
-#ifdef LNAMES
-#define	matcher	lmatcher
-#define	fast	lfast
-#define	slow	lslow
-#define	dissect	ldissect
-#define	backref	lbackref
-#define	step	lstep
-#define	print	lprint
-#define	at	lat
-#define	match	lmat
-#endif
-#ifdef MNAMES
-#define	matcher	mmatcher
-#define	fast	mfast
-#define	slow	mslow
-#define	dissect	mdissect
-#define	backref	mbackref
-#define	step	mstep
-#define	print	mprint
-#define	at	mat
-#define	match	mmat
-#endif
-
-/* another structure passed up and down to avoid zillions of parameters */
-struct match {
-	struct re_guts *g;
-	int eflags;
-	regmatch_t *pmatch;	/* [nsub+1] (0 element unused) */
-	char *offp;		/* offsets work from here */
-	char *beginp;		/* start of string -- virtual NUL precedes */
-	char *endp;		/* end of string -- virtual NUL here */
-	char *coldp;		/* can be no match starting before here */
-	char **lastpos;		/* [nplus+1] */
-	STATEVARS;
-	states st;		/* current states */
-	states fresh;		/* states for a fresh start */
-	states tmp;		/* temporary */
-	states empty;		/* empty set of states */
-	mbstate_t mbs;		/* multibyte conversion state */
-};
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === engine.c === */
-static int matcher(struct re_guts *g, char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
-static char *dissect(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
-static char *backref(struct match *m, char *start, char *stop, sopno startst, sopno stopst, sopno lev);
-static char *fast(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
-static char *slow(struct match *m, char *start, char *stop, sopno startst, sopno stopst);
-static states step(struct re_guts *g, sopno start, sopno stop, states bef, wint_t ch, states aft);
-#define	BOL	(OUT-1)
-#define	EOL	(BOL-1)
-#define	BOLEOL	(BOL-2)
-#define	NOTHING	(BOL-3)
-#define	BOW	(BOL-4)
-#define	EOW	(BOL-5)
-#define	BADCHAR	(BOL-6)
-#define	NONCHAR(c)	((c) <= OUT)
-#ifdef REDEBUG
-static void print(struct match *m, char *caption, states st, int ch, FILE *d);
-#endif
-#ifdef REDEBUG
-static void at(struct match *m, char *title, char *start, char *stop, sopno startst, sopno stopst);
-#endif
-#ifdef REDEBUG
-static char *pchar(int ch);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-
-#ifdef REDEBUG
-#define	SP(t, s, c)	print(m, t, s, c, stdout)
-#define	AT(t, p1, p2, s1, s2)	at(m, t, p1, p2, s1, s2)
-#define	NOTE(str)	{ if (m->eflags&REG_TRACE) printf("=%s\n", (str)); }
-#else
-#define	SP(t, s, c)	/* nothing */
-#define	AT(t, p1, p2, s1, s2)	/* nothing */
-#define	NOTE(s)	/* nothing */
-#endif
-
-/*
- - matcher - the actual matching engine
- == static int matcher(struct re_guts *g, char *string, \
- ==	size_t nmatch, regmatch_t pmatch[], int eflags);
- */
-static int			/* 0 success, REG_NOMATCH failure */
-matcher(g, string, nmatch, pmatch, eflags)
-struct re_guts *g;
-char *string;
-size_t nmatch;
-regmatch_t pmatch[];
-int eflags;
-{
-	char *endp;
-	int i;
-	struct match mv;
-	struct match *m = &mv;
-	char *dp;
-	const sopno gf = g->firststate+1;	/* +1 for OEND */
-	const sopno gl = g->laststate;
-	char *start;
-	char *stop;
-	/* Boyer-Moore algorithms variables */
-	char *pp;
-	int cj, mj;
-	char *mustfirst;
-	char *mustlast;
-	int *matchjump;
-	int *charjump;
-
-	/* simplify the situation where possible */
-	if (g->cflags&REG_NOSUB)
-		nmatch = 0;
-	if (eflags&REG_STARTEND) {
-		start = string + pmatch[0].rm_so;
-		stop = string + pmatch[0].rm_eo;
-	} else {
-		start = string;
-		stop = start + strlen(start);
-	}
-	if (stop < start)
-		return(REG_INVARG);
-
-	/* prescreening; this does wonders for this rather slow code */
-	if (g->must != NULL) {
-		if (g->charjump != NULL && g->matchjump != NULL) {
-			mustfirst = g->must;
-			mustlast = g->must + g->mlen - 1;
-			charjump = g->charjump;
-			matchjump = g->matchjump;
-			pp = mustlast;
-			for (dp = start+g->mlen-1; dp < stop;) {
-				/* Fast skip non-matches */
-				while (dp < stop && charjump[(int)*dp])
-					dp += charjump[(int)*dp];
-
-				if (dp >= stop)
-					break;
-
-				/* Greedy matcher */
-				/* We depend on not being used for
-				 * for strings of length 1
-				 */
-				while (*--dp == *--pp && pp != mustfirst);
-
-				if (*dp == *pp)
-					break;
-
-				/* Jump to next possible match */
-				mj = matchjump[pp - mustfirst];
-				cj = charjump[(int)*dp];
-				dp += (cj < mj ? mj : cj);
-				pp = mustlast;
-			}
-			if (pp != mustfirst)
-				return(REG_NOMATCH);
-		} else {
-			for (dp = start; dp < stop; dp++)
-				if (*dp == g->must[0] &&
-				    stop - dp >= g->mlen &&
-				    memcmp(dp, g->must, (size_t)g->mlen) == 0)
-					break;
-			if (dp == stop)		/* we didn't find g->must */
-				return(REG_NOMATCH);
-		}
-	}
-
-	/* match struct setup */
-	m->g = g;
-	m->eflags = eflags;
-	m->pmatch = NULL;
-	m->lastpos = NULL;
-	m->offp = string;
-	m->beginp = start;
-	m->endp = stop;
-	STATESETUP(m, 4);
-	SETUP(m->st);
-	SETUP(m->fresh);
-	SETUP(m->tmp);
-	SETUP(m->empty);
-	CLEAR(m->empty);
-	ZAPSTATE(&m->mbs);
-
-	/* Adjust start according to moffset, to speed things up */
-	if (g->moffset > -1)
-		start = ((dp - g->moffset) < start) ? start : dp - g->moffset;
-
-	/* this loop does only one repetition except for backrefs */
-	for (;;) {
-		endp = fast(m, start, stop, gf, gl);
-		if (endp == NULL) {		/* a miss */
-			if (m->pmatch != NULL)
-				free((char *)m->pmatch);
-			if (m->lastpos != NULL)
-				free((char *)m->lastpos);
-			STATETEARDOWN(m);
-			return(REG_NOMATCH);
-		}
-		if (nmatch == 0 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* where? */
-		assert(m->coldp != NULL);
-		for (;;) {
-			NOTE("finding start");
-			endp = slow(m, m->coldp, stop, gf, gl);
-			if (endp != NULL)
-				break;
-			assert(m->coldp < m->endp);
-			m->coldp += XMBRTOWC(NULL, m->coldp,
-			    m->endp - m->coldp, &m->mbs, 0);
-		}
-		if (nmatch == 1 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* oh my, he wants the subexpressions... */
-		if (m->pmatch == NULL)
-			m->pmatch = (regmatch_t *)malloc((m->g->nsub + 1) *
-							sizeof(regmatch_t));
-		if (m->pmatch == NULL) {
-			STATETEARDOWN(m);
-			return(REG_ESPACE);
-		}
-		for (i = 1; i <= m->g->nsub; i++)
-			m->pmatch[i].rm_so = m->pmatch[i].rm_eo = -1;
-		if (!g->backrefs && !(m->eflags&REG_BACKR)) {
-			NOTE("dissecting");
-			dp = dissect(m, m->coldp, endp, gf, gl);
-		} else {
-			if (g->nplus > 0 && m->lastpos == NULL)
-				m->lastpos = (char **)malloc((g->nplus+1) *
-							sizeof(char *));
-			if (g->nplus > 0 && m->lastpos == NULL) {
-				free(m->pmatch);
-				STATETEARDOWN(m);
-				return(REG_ESPACE);
-			}
-			NOTE("backref dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
-		}
-		if (dp != NULL)
-			break;
-
-		/* uh-oh... we couldn't find a subexpression-level match */
-		assert(g->backrefs);	/* must be back references doing it */
-		assert(g->nplus == 0 || m->lastpos != NULL);
-		for (;;) {
-			if (dp != NULL || endp <= m->coldp)
-				break;		/* defeat */
-			NOTE("backoff");
-			endp = slow(m, m->coldp, endp-1, gf, gl);
-			if (endp == NULL)
-				break;		/* defeat */
-			/* try it on a shorter possibility */
-#ifndef NDEBUG
-			for (i = 1; i <= m->g->nsub; i++) {
-				assert(m->pmatch[i].rm_so == -1);
-				assert(m->pmatch[i].rm_eo == -1);
-			}
-#endif
-			NOTE("backoff dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0);
-		}
-		assert(dp == NULL || dp == endp);
-		if (dp != NULL)		/* found a shorter one */
-			break;
-
-		/* despite initial appearances, there is no match here */
-		NOTE("false alarm");
-		/* recycle starting later */
-		start = m->coldp + XMBRTOWC(NULL, m->coldp,
-		    stop - m->coldp, &m->mbs, 0);
-		assert(start <= stop);
-	}
-
-	/* fill in the details if requested */
-	if (nmatch > 0) {
-		pmatch[0].rm_so = m->coldp - m->offp;
-		pmatch[0].rm_eo = endp - m->offp;
-	}
-	if (nmatch > 1) {
-		assert(m->pmatch != NULL);
-		for (i = 1; i < nmatch; i++)
-			if (i <= m->g->nsub)
-				pmatch[i] = m->pmatch[i];
-			else {
-				pmatch[i].rm_so = -1;
-				pmatch[i].rm_eo = -1;
-			}
-	}
-
-	if (m->pmatch != NULL)
-		free((char *)m->pmatch);
-	if (m->lastpos != NULL)
-		free((char *)m->lastpos);
-	STATETEARDOWN(m);
-	return(0);
-}
-
-/*
- - dissect - figure out what matched what, no back references
- == static char *dissect(struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst);
- */
-static char *			/* == stop (success) always */
-dissect(m, start, stop, startst, stopst)
-struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	int i;
-	sopno ss;		/* start sop of current subRE */
-	sopno es;		/* end sop of current subRE */
-	char *sp;		/* start of string matched by it */
-	char *stp;		/* string matched by it cannot pass here */
-	char *rest;		/* start of rest of string */
-	char *tail;		/* string unmatched by rest of RE */
-	sopno ssub;		/* start sop of subsubRE */
-	sopno esub;		/* end sop of subsubRE */
-	char *ssp;		/* start of string matched by subsubRE */
-	char *sep;		/* end of string matched by subsubRE */
-	char *oldssp;		/* previous ssp */
-	char *dp;
-
-	AT("diss", start, stop, startst, stopst);
-	sp = start;
-	for (ss = startst; ss < stopst; ss = es) {
-		/* identify end of subRE */
-		es = ss;
-		switch (OP(m->g->strip[es])) {
-		case OPLUS_:
-		case OQUEST_:
-			es += OPND(m->g->strip[es]);
-			break;
-		case OCH_:
-			while (OP(m->g->strip[es]) != O_CH)
-				es += OPND(m->g->strip[es]);
-			break;
-		}
-		es++;
-
-		/* figure out what it matched */
-		switch (OP(m->g->strip[ss])) {
-		case OEND:
-			assert(nope);
-			break;
-		case OCHAR:
-			sp += XMBRTOWC(NULL, sp, stop - start, &m->mbs, 0);
-			break;
-		case OBOL:
-		case OEOL:
-		case OBOW:
-		case OEOW:
-			break;
-		case OANY:
-		case OANYOF:
-			sp += XMBRTOWC(NULL, sp, stop - start, &m->mbs, 0);
-			break;
-		case OBACK_:
-		case O_BACK:
-			assert(nope);
-			break;
-		/* cases where length of match is hard to find */
-		case OQUEST_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			/* did innards match? */
-			if (slow(m, sp, rest, ssub, esub) != NULL) {
-				dp = dissect(m, sp, rest, ssub, esub);
-				assert(dp == rest);
-			} else		/* no */
-				assert(sp == rest);
-			sp = rest;
-			break;
-		case OPLUS_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			ssp = sp;
-			oldssp = ssp;
-			for (;;) {	/* find last match of innards */
-				sep = slow(m, ssp, rest, ssub, esub);
-				if (sep == NULL || sep == ssp)
-					break;	/* failed or matched null */
-				oldssp = ssp;	/* on to next try */
-				ssp = sep;
-			}
-			if (sep == NULL) {
-				/* last successful match */
-				sep = ssp;
-				ssp = oldssp;
-			}
-			assert(sep == rest);	/* must exhaust substring */
-			assert(slow(m, ssp, sep, ssub, esub) == rest);
-			dp = dissect(m, ssp, sep, ssub, esub);
-			assert(dp == sep);
-			sp = rest;
-			break;
-		case OCH_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = ss + OPND(m->g->strip[ss]) - 1;
-			assert(OP(m->g->strip[esub]) == OOR1);
-			for (;;) {	/* find first matching branch */
-				if (slow(m, sp, rest, ssub, esub) == rest)
-					break;	/* it matched all of it */
-				/* that one missed, try next one */
-				assert(OP(m->g->strip[esub]) == OOR1);
-				esub++;
-				assert(OP(m->g->strip[esub]) == OOR2);
-				ssub = esub + 1;
-				esub += OPND(m->g->strip[esub]);
-				if (OP(m->g->strip[esub]) == OOR2)
-					esub--;
-				else
-					assert(OP(m->g->strip[esub]) == O_CH);
-			}
-			dp = dissect(m, sp, rest, ssub, esub);
-			assert(dp == rest);
-			sp = rest;
-			break;
-		case O_PLUS:
-		case O_QUEST:
-		case OOR1:
-		case OOR2:
-		case O_CH:
-			assert(nope);
-			break;
-		case OLPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_so = sp - m->offp;
-			break;
-		case ORPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_eo = sp - m->offp;
-			break;
-		default:		/* uh oh */
-			assert(nope);
-			break;
-		}
-	}
-
-	assert(sp == stop);
-	return(sp);
-}
-
-/*
- - backref - figure out what matched what, figuring in back references
- == static char *backref(struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst, sopno lev);
- */
-static char *			/* == stop (success) or NULL (failure) */
-backref(m, start, stop, startst, stopst, lev)
-struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-sopno lev;			/* PLUS nesting level */
-{
-	int i;
-	sopno ss;		/* start sop of current subRE */
-	char *sp;		/* start of string matched by it */
-	sopno ssub;		/* start sop of subsubRE */
-	sopno esub;		/* end sop of subsubRE */
-	char *ssp;		/* start of string matched by subsubRE */
-	char *dp;
-	size_t len;
-	int hard;
-	sop s;
-	regoff_t offsave;
-	cset *cs;
-	wint_t wc;
-
-	AT("back", start, stop, startst, stopst);
-	sp = start;
-
-	/* get as far as we can with easy stuff */
-	hard = 0;
-	for (ss = startst; !hard && ss < stopst; ss++)
-		switch (OP(s = m->g->strip[ss])) {
-		case OCHAR:
-			if (sp == stop)
-				return(NULL);
-			sp += XMBRTOWC(&wc, sp, stop - sp, &m->mbs, BADCHAR);
-			if (wc != OPND(s))
-				return(NULL);
-			break;
-		case OANY:
-			if (sp == stop)
-				return(NULL);
-			sp += XMBRTOWC(&wc, sp, stop - sp, &m->mbs, BADCHAR);
-			if (wc == BADCHAR)
-				return (NULL);
-			break;
-		case OANYOF:
-			if (sp == stop)
-				return (NULL);
-			cs = &m->g->sets[OPND(s)];
-			sp += XMBRTOWC(&wc, sp, stop - sp, &m->mbs, BADCHAR);
-			if (wc == BADCHAR || !CHIN(cs, wc))
-				return(NULL);
-			break;
-		case OBOL:
-			if ( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOL:
-			if ( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OBOW:
-			if (( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp > m->beginp &&
-							!ISWORD(*(sp-1))) ) &&
-					(sp < m->endp && ISWORD(*sp)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOW:
-			if (( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp < m->endp && !ISWORD(*sp)) ) &&
-					(sp > m->beginp && ISWORD(*(sp-1))) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case O_QUEST:
-			break;
-		case OOR1:	/* matches null but needs to skip */
-			ss++;
-			s = m->g->strip[ss];
-			do {
-				assert(OP(s) == OOR2);
-				ss += OPND(s);
-			} while (OP(s = m->g->strip[ss]) != O_CH);
-			/* note that the ss++ gets us past the O_CH */
-			break;
-		default:	/* have to make a choice */
-			hard = 1;
-			break;
-		}
-	if (!hard) {		/* that was it! */
-		if (sp != stop)
-			return(NULL);
-		return(sp);
-	}
-	ss--;			/* adjust for the for's final increment */
-
-	/* the hard stuff */
-	AT("hard", sp, stop, ss, stopst);
-	s = m->g->strip[ss];
-	switch (OP(s)) {
-	case OBACK_:		/* the vilest depths */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		if (m->pmatch[i].rm_eo == -1)
-			return(NULL);
-		assert(m->pmatch[i].rm_so != -1);
-		len = m->pmatch[i].rm_eo - m->pmatch[i].rm_so;
-		assert(stop - m->beginp >= len);
-		if (sp > stop - len)
-			return(NULL);	/* not enough left to match */
-		ssp = m->offp + m->pmatch[i].rm_so;
-		if (memcmp(sp, ssp, len) != 0)
-			return(NULL);
-		while (m->g->strip[ss] != SOP(O_BACK, i))
-			ss++;
-		return(backref(m, sp+len, stop, ss+1, stopst, lev));
-		break;
-	case OQUEST_:		/* to null or not */
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);	/* not */
-		return(backref(m, sp, stop, ss+OPND(s)+1, stopst, lev));
-		break;
-	case OPLUS_:
-		assert(m->lastpos != NULL);
-		assert(lev+1 <= m->g->nplus);
-		m->lastpos[lev+1] = sp;
-		return(backref(m, sp, stop, ss+1, stopst, lev+1));
-		break;
-	case O_PLUS:
-		if (sp == m->lastpos[lev])	/* last pass matched null */
-			return(backref(m, sp, stop, ss+1, stopst, lev-1));
-		/* try another pass */
-		m->lastpos[lev] = sp;
-		dp = backref(m, sp, stop, ss-OPND(s)+1, stopst, lev);
-		if (dp == NULL)
-			return(backref(m, sp, stop, ss+1, stopst, lev-1));
-		else
-			return(dp);
-		break;
-	case OCH_:		/* find the right one, if any */
-		ssub = ss + 1;
-		esub = ss + OPND(s) - 1;
-		assert(OP(m->g->strip[esub]) == OOR1);
-		for (;;) {	/* find first matching branch */
-			dp = backref(m, sp, stop, ssub, esub, lev);
-			if (dp != NULL)
-				return(dp);
-			/* that one missed, try next one */
-			if (OP(m->g->strip[esub]) == O_CH)
-				return(NULL);	/* there is none */
-			esub++;
-			assert(OP(m->g->strip[esub]) == OOR2);
-			ssub = esub + 1;
-			esub += OPND(m->g->strip[esub]);
-			if (OP(m->g->strip[esub]) == OOR2)
-				esub--;
-			else
-				assert(OP(m->g->strip[esub]) == O_CH);
-		}
-		break;
-	case OLPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_so;
-		m->pmatch[i].rm_so = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_so = offsave;
-		return(NULL);
-		break;
-	case ORPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_eo;
-		m->pmatch[i].rm_eo = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_eo = offsave;
-		return(NULL);
-		break;
-	default:		/* uh oh */
-		assert(nope);
-		break;
-	}
-
-	/* "can't happen" */
-	assert(nope);
-	/* NOTREACHED */
-	return "shut up gcc";
-}
-
-/*
- - fast - step through the string at top speed
- == static char *fast(struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst);
- */
-static char *			/* where tentative match ended, or NULL */
-fast(m, start, stop, startst, stopst)
-struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	states st = m->st;
-	states fresh = m->fresh;
-	states tmp = m->tmp;
-	char *p = start;
-	wint_t c;
-	wint_t lastc;		/* previous c */
-	wint_t flagch;
-	int i;
-	char *coldp;		/* last p after which no match was underway */
-	size_t clen;
-
-	CLEAR(st);
-	SET1(st, startst);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	ASSIGN(fresh, st);
-	SP("start", st, *p);
-	coldp = NULL;
-	if (start == m->beginp)
-		c = OUT;
-	else {
-		/*
-		 * XXX Wrong if the previous character was multi-byte.
-		 * Newline never is (in encodings supported by FreeBSD),
-		 * so this only breaks the ISWORD tests below.
-		 */
-		c = (uch)*(start - 1);
-	}
-	for (;;) {
-		/* next character */
-		lastc = c;
-		if (p == m->endp)
-			c = OUT;
-		else
-			clen = XMBRTOWC(&c, p, stop - p, &m->mbs, BADCHAR);
-		if (EQ(st, fresh))
-			coldp = p;
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst) || p == stop)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, fresh);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("aft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p += clen;
-	}
-
-	assert(coldp != NULL);
-	m->coldp = coldp;
-	if (ISSET(st, stopst))
-		return(p+XMBRTOWC(NULL, p, stop - p, &m->mbs, 0));
-	else
-		return(NULL);
-}
-
-/*
- - slow - step through the string more deliberately
- == static char *slow(struct match *m, char *start, \
- ==	char *stop, sopno startst, sopno stopst);
- */
-static char *			/* where it ended */
-slow(m, start, stop, startst, stopst)
-struct match *m;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	states st = m->st;
-	states empty = m->empty;
-	states tmp = m->tmp;
-	char *p = start;
-	wint_t c;
-	wint_t lastc;		/* previous c */
-	wint_t flagch;
-	int i;
-	char *matchp;		/* last p at which a match ended */
-	size_t clen;
-
-	AT("slow", start, stop, startst, stopst);
-	CLEAR(st);
-	SET1(st, startst);
-	SP("sstart", st, *p);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	matchp = NULL;
-	if (start == m->beginp)
-		c = OUT;
-	else {
-		/*
-		 * XXX Wrong if the previous character was multi-byte.
-		 * Newline never is (in encodings supported by FreeBSD),
-		 * so this only breaks the ISWORD tests below.
-		 */
-		c = (uch)*(start - 1);
-	}
-	for (;;) {
-		/* next character */
-		lastc = c;
-		if (p == m->endp) {
-			c = OUT;
-			clen = 0;
-		} else
-			clen = XMBRTOWC(&c, p, stop - p, &m->mbs, BADCHAR);
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst))
-			matchp = p;
-		if (EQ(st, empty) || p == stop)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, empty);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("saft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p += clen;
-	}
-
-	return(matchp);
-}
-
-
-/*
- - step - map set of states reachable before char to set reachable after
- == static states step(struct re_guts *g, sopno start, sopno stop, \
- ==	states bef, int ch, states aft);
- == #define	BOL	(OUT-1)
- == #define	EOL	(BOL-1)
- == #define	BOLEOL	(BOL-2)
- == #define	NOTHING	(BOL-3)
- == #define	BOW	(BOL-4)
- == #define	EOW	(BOL-5)
- == #define	BADCHAR	(BOL-6)
- == #define	NONCHAR(c)	((c) <= OUT)
- */
-static states
-step(g, start, stop, bef, ch, aft)
-struct re_guts *g;
-sopno start;			/* start state within strip */
-sopno stop;			/* state after stop state within strip */
-states bef;			/* states reachable before */
-wint_t ch;			/* character or NONCHAR code */
-states aft;			/* states already known reachable after */
-{
-	cset *cs;
-	sop s;
-	sopno pc;
-	onestate here;		/* note, macros know this name */
-	sopno look;
-	int i;
-
-	for (pc = start, INIT(here, pc); pc != stop; pc++, INC(here)) {
-		s = g->strip[pc];
-		switch (OP(s)) {
-		case OEND:
-			assert(pc == stop-1);
-			break;
-		case OCHAR:
-			/* only characters can match */
-			assert(!NONCHAR(ch) || ch != OPND(s));
-			if (ch == OPND(s))
-				FWD(aft, bef, 1);
-			break;
-		case OBOL:
-			if (ch == BOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OEOL:
-			if (ch == EOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OBOW:
-			if (ch == BOW)
-				FWD(aft, bef, 1);
-			break;
-		case OEOW:
-			if (ch == EOW)
-				FWD(aft, bef, 1);
-			break;
-		case OANY:
-			if (!NONCHAR(ch))
-				FWD(aft, bef, 1);
-			break;
-		case OANYOF:
-			cs = &g->sets[OPND(s)];
-			if (!NONCHAR(ch) && CHIN(cs, ch))
-				FWD(aft, bef, 1);
-			break;
-		case OBACK_:		/* ignored here */
-		case O_BACK:
-			FWD(aft, aft, 1);
-			break;
-		case OPLUS_:		/* forward, this is just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case O_PLUS:		/* both forward and back */
-			FWD(aft, aft, 1);
-			i = ISSETBACK(aft, OPND(s));
-			BACK(aft, aft, OPND(s));
-			if (!i && ISSETBACK(aft, OPND(s))) {
-				/* oho, must reconsider loop body */
-				pc -= OPND(s) + 1;
-				INIT(here, pc);
-			}
-			break;
-		case OQUEST_:		/* two branches, both forward */
-			FWD(aft, aft, 1);
-			FWD(aft, aft, OPND(s));
-			break;
-		case O_QUEST:		/* just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case OLPAREN:		/* not significant here */
-		case ORPAREN:
-			FWD(aft, aft, 1);
-			break;
-		case OCH_:		/* mark the first two branches */
-			FWD(aft, aft, 1);
-			assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-			FWD(aft, aft, OPND(s));
-			break;
-		case OOR1:		/* done a branch, find the O_CH */
-			if (ISSTATEIN(aft, here)) {
-				for (look = 1;
-						OP(s = g->strip[pc+look]) != O_CH;
-						look += OPND(s))
-					assert(OP(s) == OOR2);
-				FWD(aft, aft, look);
-			}
-			break;
-		case OOR2:		/* propagate OCH_'s marking */
-			FWD(aft, aft, 1);
-			if (OP(g->strip[pc+OPND(s)]) != O_CH) {
-				assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-				FWD(aft, aft, OPND(s));
-			}
-			break;
-		case O_CH:		/* just empty */
-			FWD(aft, aft, 1);
-			break;
-		default:		/* ooooops... */
-			assert(nope);
-			break;
-		}
-	}
-
-	return(aft);
-}
-
-#ifdef REDEBUG
-/*
- - print - print a set of states
- == #ifdef REDEBUG
- == static void print(struct match *m, char *caption, states st, \
- ==	int ch, FILE *d);
- == #endif
- */
-static void
-print(m, caption, st, ch, d)
-struct match *m;
-char *caption;
-states st;
-int ch;
-FILE *d;
-{
-	struct re_guts *g = m->g;
-	int i;
-	int first = 1;
-
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	fprintf(d, "%s", caption);
-	if (ch != '\0')
-		fprintf(d, " %s", pchar(ch));
-	for (i = 0; i < g->nstates; i++)
-		if (ISSET(st, i)) {
-			fprintf(d, "%s%d", (first) ? "\t" : ", ", i);
-			first = 0;
-		}
-	fprintf(d, "\n");
-}
-
-/*
- - at - print current situation
- == #ifdef REDEBUG
- == static void at(struct match *m, char *title, char *start, char *stop, \
- ==						sopno startst, sopno stopst);
- == #endif
- */
-static void
-at(m, title, start, stop, startst, stopst)
-struct match *m;
-char *title;
-char *start;
-char *stop;
-sopno startst;
-sopno stopst;
-{
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	printf("%s %s-", title, pchar(*start));
-	printf("%s ", pchar(*stop));
-	printf("%ld-%ld\n", (long)startst, (long)stopst);
-}
-
-#ifndef PCHARDONE
-#define	PCHARDONE	/* never again */
-/*
- - pchar - make a character printable
- == #ifdef REDEBUG
- == static char *pchar(int ch);
- == #endif
- *
- * Is this identical to regchar() over in debug.c?  Well, yes.  But a
- * duplicate here avoids having a debugging-capable regexec.o tied to
- * a matching debug.o, and this is convenient.  It all disappears in
- * the non-debug compilation anyway, so it doesn't matter much.
- */
-static char *			/* -> representation */
-pchar(ch)
-int ch;
-{
-	static char pbuf[10];
-
-	if (isprint((uch)ch) || ch == ' ')
-		sprintf(pbuf, "%c", ch);
-	else
-		sprintf(pbuf, "\\%o", ch);
-	return(pbuf);
-}
-#endif
-#endif
-
-#undef	matcher
-#undef	fast
-#undef	slow
-#undef	dissect
-#undef	backref
-#undef	step
-#undef	print
-#undef	at
-#undef	match
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
deleted file mode 100644
index 268a579..0000000
--- a/lib/libc/regex/regcomp.c
+++ /dev/null
@@ -1,1844 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- *
- *	@(#)regcomp.c	8.5 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/regcomp.c,v 1.34 2004/10/03 15:42:59 stefanf Exp $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <regex.h>
-#include <runetype.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "collate.h"
-
-#include "utils.h"
-#include "regex2.h"
-
-#include "cname.h"
-
-/*
- * parse structure, passed up and down to avoid global variables and
- * other clumsinesses
- */
-struct parse {
-	char *next;		/* next character in RE */
-	char *end;		/* end of string (-> NUL normally) */
-	int error;		/* has an error been seen? */
-	sop *strip;		/* malloced strip */
-	sopno ssize;		/* malloced strip size (allocated) */
-	sopno slen;		/* malloced strip length (used) */
-	int ncsalloc;		/* number of csets allocated */
-	struct re_guts *g;
-#	define	NPAREN	10	/* we need to remember () 1-9 for back refs */
-	sopno pbegin[NPAREN];	/* -> ( ([0] unused) */
-	sopno pend[NPAREN];	/* -> ) ([0] unused) */
-};
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regcomp.c === */
-static void p_ere(struct parse *p, wint_t stop);
-static void p_ere_exp(struct parse *p);
-static void p_str(struct parse *p);
-static void p_bre(struct parse *p, wint_t end1, wint_t end2);
-static int p_simp_re(struct parse *p, int starordinary);
-static int p_count(struct parse *p);
-static void p_bracket(struct parse *p);
-static void p_b_term(struct parse *p, cset *cs);
-static void p_b_cclass(struct parse *p, cset *cs);
-static void p_b_eclass(struct parse *p, cset *cs);
-static wint_t p_b_symbol(struct parse *p);
-static wint_t p_b_coll_elem(struct parse *p, wint_t endc);
-static wint_t othercase(wint_t ch);
-static void bothcases(struct parse *p, wint_t ch);
-static void ordinary(struct parse *p, wint_t ch);
-static void nonnewline(struct parse *p);
-static void repeat(struct parse *p, sopno start, int from, int to);
-static int seterr(struct parse *p, int e);
-static cset *allocset(struct parse *p);
-static void freeset(struct parse *p, cset *cs);
-static void CHadd(struct parse *p, cset *cs, wint_t ch);
-static void CHaddrange(struct parse *p, cset *cs, wint_t min, wint_t max);
-static void CHaddtype(struct parse *p, cset *cs, wctype_t wct);
-static wint_t singleton(cset *cs);
-static sopno dupl(struct parse *p, sopno start, sopno finish);
-static void doemit(struct parse *p, sop op, size_t opnd);
-static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
-static void dofwd(struct parse *p, sopno pos, sop value);
-static void enlarge(struct parse *p, sopno size);
-static void stripsnug(struct parse *p, struct re_guts *g);
-static void findmust(struct parse *p, struct re_guts *g);
-static int altoffset(sop *scan, int offset);
-static void computejumps(struct parse *p, struct re_guts *g);
-static void computematchjumps(struct parse *p, struct re_guts *g);
-static sopno pluscount(struct parse *p, struct re_guts *g);
-static wint_t wgetnext(struct parse *p);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-
-static char nuls[10];		/* place to point scanner in event of error */
-
-/*
- * macros for use with parse structure
- * BEWARE:  these know that the parse structure is named `p' !!!
- */
-#define	PEEK()	(*p->next)
-#define	PEEK2()	(*(p->next+1))
-#define	MORE()	(p->next < p->end)
-#define	MORE2()	(p->next+1 < p->end)
-#define	SEE(c)	(MORE() && PEEK() == (c))
-#define	SEETWO(a, b)	(MORE() && MORE2() && PEEK() == (a) && PEEK2() == (b))
-#define	EAT(c)	((SEE(c)) ? (NEXT(), 1) : 0)
-#define	EATTWO(a, b)	((SEETWO(a, b)) ? (NEXT2(), 1) : 0)
-#define	NEXT()	(p->next++)
-#define	NEXT2()	(p->next += 2)
-#define	NEXTn(n)	(p->next += (n))
-#define	GETNEXT()	(*p->next++)
-#define	WGETNEXT()	wgetnext(p)
-#define	SETERROR(e)	seterr(p, (e))
-#define	REQUIRE(co, e)	((co) || SETERROR(e))
-#define	MUSTSEE(c, e)	(REQUIRE(MORE() && PEEK() == (c), e))
-#define	MUSTEAT(c, e)	(REQUIRE(MORE() && GETNEXT() == (c), e))
-#define	MUSTNOTSEE(c, e)	(REQUIRE(!MORE() || PEEK() != (c), e))
-#define	EMIT(op, sopnd)	doemit(p, (sop)(op), (size_t)(sopnd))
-#define	INSERT(op, pos)	doinsert(p, (sop)(op), HERE()-(pos)+1, pos)
-#define	AHEAD(pos)		dofwd(p, pos, HERE()-(pos))
-#define	ASTERN(sop, pos)	EMIT(sop, HERE()-pos)
-#define	HERE()		(p->slen)
-#define	THERE()		(p->slen - 1)
-#define	THERETHERE()	(p->slen - 2)
-#define	DROP(n)	(p->slen -= (n))
-
-#ifndef NDEBUG
-static int never = 0;		/* for use in asserts; shuts lint up */
-#else
-#define	never	0		/* some <assert.h>s have bugs too */
-#endif
-
-/* Macro used by computejump()/computematchjump() */
-#define MIN(a,b)	((a)<(b)?(a):(b))
-
-/*
- - regcomp - interface for parser and compilation
- = extern int regcomp(regex_t *, const char *, int);
- = #define	REG_BASIC	0000
- = #define	REG_EXTENDED	0001
- = #define	REG_ICASE	0002
- = #define	REG_NOSUB	0004
- = #define	REG_NEWLINE	0010
- = #define	REG_NOSPEC	0020
- = #define	REG_PEND	0040
- = #define	REG_DUMP	0200
- */
-int				/* 0 success, otherwise REG_something */
-regcomp(preg, pattern, cflags)
-regex_t * __restrict preg;
-const char * __restrict pattern;
-int cflags;
-{
-	struct parse pa;
-	struct re_guts *g;
-	struct parse *p = &pa;
-	int i;
-	size_t len;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&~REG_DUMP)
-#endif
-
-	cflags = GOODFLAGS(cflags);
-	if ((cflags&REG_EXTENDED) && (cflags&REG_NOSPEC))
-		return(REG_INVARG);
-
-	if (cflags&REG_PEND) {
-		if (preg->re_endp < pattern)
-			return(REG_INVARG);
-		len = preg->re_endp - pattern;
-	} else
-		len = strlen((char *)pattern);
-
-	/* do the mallocs early so failure handling is easy */
-	g = (struct re_guts *)malloc(sizeof(struct re_guts));
-	if (g == NULL)
-		return(REG_ESPACE);
-	p->ssize = len/(size_t)2*(size_t)3 + (size_t)1;	/* ugh */
-	p->strip = (sop *)malloc(p->ssize * sizeof(sop));
-	p->slen = 0;
-	if (p->strip == NULL) {
-		free((char *)g);
-		return(REG_ESPACE);
-	}
-
-	/* set things up */
-	p->g = g;
-	p->next = (char *)pattern;	/* convenience; we do not modify it */
-	p->end = p->next + len;
-	p->error = 0;
-	p->ncsalloc = 0;
-	for (i = 0; i < NPAREN; i++) {
-		p->pbegin[i] = 0;
-		p->pend[i] = 0;
-	}
-	g->sets = NULL;
-	g->ncsets = 0;
-	g->cflags = cflags;
-	g->iflags = 0;
-	g->nbol = 0;
-	g->neol = 0;
-	g->must = NULL;
-	g->moffset = -1;
-	g->charjump = NULL;
-	g->matchjump = NULL;
-	g->mlen = 0;
-	g->nsub = 0;
-	g->backrefs = 0;
-
-	/* do it */
-	EMIT(OEND, 0);
-	g->firststate = THERE();
-	if (cflags&REG_EXTENDED)
-		p_ere(p, OUT);
-	else if (cflags&REG_NOSPEC)
-		p_str(p);
-	else
-		p_bre(p, OUT, OUT);
-	EMIT(OEND, 0);
-	g->laststate = THERE();
-
-	/* tidy up loose ends and fill things in */
-	stripsnug(p, g);
-	findmust(p, g);
-	/* only use Boyer-Moore algorithm if the pattern is bigger
-	 * than three characters
-	 */
-	if(g->mlen > 3) {
-		computejumps(p, g);
-		computematchjumps(p, g);
-		if(g->matchjump == NULL && g->charjump != NULL) {
-			free(g->charjump);
-			g->charjump = NULL;
-		}
-	}
-	g->nplus = pluscount(p, g);
-	g->magic = MAGIC2;
-	preg->re_nsub = g->nsub;
-	preg->re_g = g;
-	preg->re_magic = MAGIC1;
-#ifndef REDEBUG
-	/* not debugging, so can't rely on the assert() in regexec() */
-	if (g->iflags&BAD)
-		SETERROR(REG_ASSERT);
-#endif
-
-	/* win or lose, we're done */
-	if (p->error != 0)	/* lose */
-		regfree(preg);
-	return(p->error);
-}
-
-/*
- - p_ere - ERE parser top level, concatenation and alternation
- == static void p_ere(struct parse *p, int stop);
- */
-static void
-p_ere(p, stop)
-struct parse *p;
-int stop;			/* character this ERE should end at */
-{
-	char c;
-	sopno prevback;
-	sopno prevfwd;
-	sopno conc;
-	int first = 1;		/* is this the first alternative? */
-
-	for (;;) {
-		/* do a bunch of concatenated expressions */
-		conc = HERE();
-		while (MORE() && (c = PEEK()) != '|' && c != stop)
-			p_ere_exp(p);
-		(void)REQUIRE(HERE() != conc, REG_EMPTY);	/* require nonempty */
-
-		if (!EAT('|'))
-			break;		/* NOTE BREAK OUT */
-
-		if (first) {
-			INSERT(OCH_, conc);	/* offset is wrong */
-			prevfwd = conc;
-			prevback = conc;
-			first = 0;
-		}
-		ASTERN(OOR1, prevback);
-		prevback = THERE();
-		AHEAD(prevfwd);			/* fix previous offset */
-		prevfwd = HERE();
-		EMIT(OOR2, 0);			/* offset is very wrong */
-	}
-
-	if (!first) {		/* tail-end fixups */
-		AHEAD(prevfwd);
-		ASTERN(O_CH, prevback);
-	}
-
-	assert(!MORE() || SEE(stop));
-}
-
-/*
- - p_ere_exp - parse one subERE, an atom possibly followed by a repetition op
- == static void p_ere_exp(struct parse *p);
- */
-static void
-p_ere_exp(p)
-struct parse *p;
-{
-	char c;
-	wint_t wc;
-	sopno pos;
-	int count;
-	int count2;
-	sopno subno;
-	int wascaret = 0;
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-
-	pos = HERE();
-	switch (c) {
-	case '(':
-		(void)REQUIRE(MORE(), REG_EPAREN);
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		if (!SEE(')'))
-			p_ere(p, ')');
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		(void)MUSTEAT(')', REG_EPAREN);
-		break;
-#ifndef POSIX_MISTAKE
-	case ')':		/* happens only if no current unmatched ( */
-		/*
-		 * You may ask, why the ifndef?  Because I didn't notice
-		 * this until slightly too late for 1003.2, and none of the
-		 * other 1003.2 regular-expression reviewers noticed it at
-		 * all.  So an unmatched ) is legal POSIX, at least until
-		 * we can get it fixed.
-		 */
-		SETERROR(REG_EPAREN);
-		break;
-#endif
-	case '^':
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-		wascaret = 1;
-		break;
-	case '$':
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-		break;
-	case '|':
-		SETERROR(REG_EMPTY);
-		break;
-	case '*':
-	case '+':
-	case '?':
-		SETERROR(REG_BADRPT);
-		break;
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case '\\':
-		(void)REQUIRE(MORE(), REG_EESCAPE);
-		wc = WGETNEXT();
-		ordinary(p, wc);
-		break;
-	case '{':		/* okay as ordinary except if digit follows */
-		(void)REQUIRE(!MORE() || !isdigit((uch)PEEK()), REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		p->next--;
-		wc = WGETNEXT();
-		ordinary(p, wc);
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	/* we call { a repetition if followed by a digit */
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit((uch)PEEK2())) ))
-		return;		/* no repetition, we're done */
-	NEXT();
-
-	(void)REQUIRE(!wascaret, REG_BADRPT);
-	switch (c) {
-	case '*':	/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-		break;
-	case '+':
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		break;
-	case '?':
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, pos);		/* offset slightly wrong */
-		ASTERN(OOR1, pos);		/* this one's right */
-		AHEAD(pos);			/* fix the OCH_ */
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case '{':
-		count = p_count(p);
-		if (EAT(',')) {
-			if (isdigit((uch)PEEK())) {
-				count2 = p_count(p);
-				(void)REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2);
-		if (!EAT('}')) {	/* error heuristics */
-			while (MORE() && PEEK() != '}')
-				NEXT();
-			(void)REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit((uch)PEEK2())) ) )
-		return;
-	SETERROR(REG_BADRPT);
-}
-
-/*
- - p_str - string (no metacharacters) "parser"
- == static void p_str(struct parse *p);
- */
-static void
-p_str(p)
-struct parse *p;
-{
-	(void)REQUIRE(MORE(), REG_EMPTY);
-	while (MORE())
-		ordinary(p, WGETNEXT());
-}
-
-/*
- - p_bre - BRE parser top level, anchoring and concatenation
- == static void p_bre(struct parse *p, int end1, \
- ==	int end2);
- * Giving end1 as OUT essentially eliminates the end1/end2 check.
- *
- * This implementation is a bit of a kludge, in that a trailing $ is first
- * taken as an ordinary character and then revised to be an anchor.
- * The amount of lookahead needed to avoid this kludge is excessive.
- */
-static void
-p_bre(p, end1, end2)
-struct parse *p;
-int end1;			/* first terminating character */
-int end2;			/* second terminating character */
-{
-	sopno start = HERE();
-	int first = 1;			/* first subexpression? */
-	int wasdollar = 0;
-
-	if (EAT('^')) {
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-	}
-	while (MORE() && !SEETWO(end1, end2)) {
-		wasdollar = p_simp_re(p, first);
-		first = 0;
-	}
-	if (wasdollar) {	/* oops, that was a trailing anchor */
-		DROP(1);
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-	}
-
-	(void)REQUIRE(HERE() != start, REG_EMPTY);	/* require nonempty */
-}
-
-/*
- - p_simp_re - parse a simple RE, an atom possibly followed by a repetition
- == static int p_simp_re(struct parse *p, int starordinary);
- */
-static int			/* was the simple RE an unbackslashed $? */
-p_simp_re(p, starordinary)
-struct parse *p;
-int starordinary;		/* is a leading * an ordinary character? */
-{
-	int c;
-	int count;
-	int count2;
-	sopno pos;
-	int i;
-	wint_t wc;
-	sopno subno;
-#	define	BACKSL	(1<<CHAR_BIT)
-
-	pos = HERE();		/* repetion op, if any, covers from here */
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-	if (c == '\\') {
-		(void)REQUIRE(MORE(), REG_EESCAPE);
-		c = BACKSL | GETNEXT();
-	}
-	switch (c) {
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case BACKSL|'{':
-		SETERROR(REG_BADRPT);
-		break;
-	case BACKSL|'(':
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		/* the MORE here is an error heuristic */
-		if (MORE() && !SEETWO('\\', ')'))
-			p_bre(p, '\\', ')');
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		(void)REQUIRE(EATTWO('\\', ')'), REG_EPAREN);
-		break;
-	case BACKSL|')':	/* should not get here -- must be user */
-	case BACKSL|'}':
-		SETERROR(REG_EPAREN);
-		break;
-	case BACKSL|'1':
-	case BACKSL|'2':
-	case BACKSL|'3':
-	case BACKSL|'4':
-	case BACKSL|'5':
-	case BACKSL|'6':
-	case BACKSL|'7':
-	case BACKSL|'8':
-	case BACKSL|'9':
-		i = (c&~BACKSL) - '0';
-		assert(i < NPAREN);
-		if (p->pend[i] != 0) {
-			assert(i <= p->g->nsub);
-			EMIT(OBACK_, i);
-			assert(p->pbegin[i] != 0);
-			assert(OP(p->strip[p->pbegin[i]]) == OLPAREN);
-			assert(OP(p->strip[p->pend[i]]) == ORPAREN);
-			(void) dupl(p, p->pbegin[i]+1, p->pend[i]);
-			EMIT(O_BACK, i);
-		} else
-			SETERROR(REG_ESUBREG);
-		p->g->backrefs = 1;
-		break;
-	case '*':
-		(void)REQUIRE(starordinary, REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		p->next--;
-		wc = WGETNEXT();
-		ordinary(p, wc);
-		break;
-	}
-
-	if (EAT('*')) {		/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-	} else if (EATTWO('\\', '{')) {
-		count = p_count(p);
-		if (EAT(',')) {
-			if (MORE() && isdigit((uch)PEEK())) {
-				count2 = p_count(p);
-				(void)REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2);
-		if (!EATTWO('\\', '}')) {	/* error heuristics */
-			while (MORE() && !SEETWO('\\', '}'))
-				NEXT();
-			(void)REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-	} else if (c == '$')     /* $ (but not \$) ends it */
-		return(1);
-
-	return(0);
-}
-
-/*
- - p_count - parse a repetition count
- == static int p_count(struct parse *p);
- */
-static int			/* the value */
-p_count(p)
-struct parse *p;
-{
-	int count = 0;
-	int ndigits = 0;
-
-	while (MORE() && isdigit((uch)PEEK()) && count <= DUPMAX) {
-		count = count*10 + (GETNEXT() - '0');
-		ndigits++;
-	}
-
-	(void)REQUIRE(ndigits > 0 && count <= DUPMAX, REG_BADBR);
-	return(count);
-}
-
-/*
- - p_bracket - parse a bracketed character list
- == static void p_bracket(struct parse *p);
- */
-static void
-p_bracket(p)
-struct parse *p;
-{
-	cset *cs;
-	wint_t ch;
-
-	/* Dept of Truly Sickening Special-Case Kludges */
-	if (p->next + 5 < p->end && strncmp(p->next, "[:<:]]", 6) == 0) {
-		EMIT(OBOW, 0);
-		NEXTn(6);
-		return;
-	}
-	if (p->next + 5 < p->end && strncmp(p->next, "[:>:]]", 6) == 0) {
-		EMIT(OEOW, 0);
-		NEXTn(6);
-		return;
-	}
-
-	if ((cs = allocset(p)) == NULL)
-		return;
-
-	if (p->g->cflags&REG_ICASE)
-		cs->icase = 1;
-	if (EAT('^'))
-		cs->invert = 1;
-	if (EAT(']'))
-		CHadd(p, cs, ']');
-	else if (EAT('-'))
-		CHadd(p, cs, '-');
-	while (MORE() && PEEK() != ']' && !SEETWO('-', ']'))
-		p_b_term(p, cs);
-	if (EAT('-'))
-		CHadd(p, cs, '-');
-	(void)MUSTEAT(']', REG_EBRACK);
-
-	if (p->error != 0)	/* don't mess things up further */
-		return;
-
-	if (cs->invert && p->g->cflags&REG_NEWLINE)
-		cs->bmp['\n' >> 3] |= 1 << ('\n' & 7);
-
-	if ((ch = singleton(cs)) != OUT) {	/* optimize singleton sets */
-		ordinary(p, ch);
-		freeset(p, cs);
-	} else
-		EMIT(OANYOF, (int)(cs - p->g->sets));
-}
-
-/*
- - p_b_term - parse one term of a bracketed character list
- == static void p_b_term(struct parse *p, cset *cs);
- */
-static void
-p_b_term(p, cs)
-struct parse *p;
-cset *cs;
-{
-	char c;
-	wint_t start, finish;
-	wint_t i;
-
-	/* classify what we've got */
-	switch ((MORE()) ? PEEK() : '\0') {
-	case '[':
-		c = (MORE2()) ? PEEK2() : '\0';
-		break;
-	case '-':
-		SETERROR(REG_ERANGE);
-		return;			/* NOTE RETURN */
-		break;
-	default:
-		c = '\0';
-		break;
-	}
-
-	switch (c) {
-	case ':':		/* character class */
-		NEXT2();
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		(void)REQUIRE(c != '-' && c != ']', REG_ECTYPE);
-		p_b_cclass(p, cs);
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		(void)REQUIRE(EATTWO(':', ']'), REG_ECTYPE);
-		break;
-	case '=':		/* equivalence class */
-		NEXT2();
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		(void)REQUIRE(c != '-' && c != ']', REG_ECOLLATE);
-		p_b_eclass(p, cs);
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		(void)REQUIRE(EATTWO('=', ']'), REG_ECOLLATE);
-		break;
-	default:		/* symbol, ordinary character, or range */
-		start = p_b_symbol(p);
-		if (SEE('-') && MORE2() && PEEK2() != ']') {
-			/* range */
-			NEXT();
-			if (EAT('-'))
-				finish = '-';
-			else
-				finish = p_b_symbol(p);
-		} else
-			finish = start;
-		if (start == finish)
-			CHadd(p, cs, start);
-		else {
-			if (__collate_load_error) {
-				(void)REQUIRE((uch)start <= (uch)finish, REG_ERANGE);
-				CHaddrange(p, cs, start, finish);
-			} else {
-				(void)REQUIRE(__collate_range_cmp(start, finish) <= 0, REG_ERANGE);
-				for (i = 0; i <= UCHAR_MAX; i++) {
-					if (   __collate_range_cmp(start, i) <= 0
-					    && __collate_range_cmp(i, finish) <= 0
-					   )
-						CHadd(p, cs, i);
-				}
-			}
-		}
-		break;
-	}
-}
-
-/*
- - p_b_cclass - parse a character-class name and deal with it
- == static void p_b_cclass(struct parse *p, cset *cs);
- */
-static void
-p_b_cclass(p, cs)
-struct parse *p;
-cset *cs;
-{
-	char *sp = p->next;
-	size_t len;
-	wctype_t wct;
-	char clname[16];
-
-	while (MORE() && isalpha((uch)PEEK()))
-		NEXT();
-	len = p->next - sp;
-	if (len >= sizeof(clname) - 1) {
-		SETERROR(REG_ECTYPE);
-		return;
-	}
-	memcpy(clname, sp, len);
-	clname[len] = '\0';
-	if ((wct = wctype(clname)) == 0) {
-		SETERROR(REG_ECTYPE);
-		return;
-	}
-	CHaddtype(p, cs, wct);
-}
-
-/*
- - p_b_eclass - parse an equivalence-class name and deal with it
- == static void p_b_eclass(struct parse *p, cset *cs);
- *
- * This implementation is incomplete. xxx
- */
-static void
-p_b_eclass(p, cs)
-struct parse *p;
-cset *cs;
-{
-	wint_t c;
-
-	c = p_b_coll_elem(p, '=');
-	CHadd(p, cs, c);
-}
-
-/*
- - p_b_symbol - parse a character or [..]ed multicharacter collating symbol
- == static char p_b_symbol(struct parse *p);
- */
-static wint_t			/* value of symbol */
-p_b_symbol(p)
-struct parse *p;
-{
-	wint_t value;
-
-	(void)REQUIRE(MORE(), REG_EBRACK);
-	if (!EATTWO('[', '.'))
-		return(WGETNEXT());
-
-	/* collating symbol */
-	value = p_b_coll_elem(p, '.');
-	(void)REQUIRE(EATTWO('.', ']'), REG_ECOLLATE);
-	return(value);
-}
-
-/*
- - p_b_coll_elem - parse a collating-element name and look it up
- == static char p_b_coll_elem(struct parse *p, int endc);
- */
-static wint_t			/* value of collating element */
-p_b_coll_elem(p, endc)
-struct parse *p;
-wint_t endc;			/* name ended by endc,']' */
-{
-	char *sp = p->next;
-	struct cname *cp;
-	int len;
-	mbstate_t mbs;
-	wchar_t wc;
-	size_t clen;
-
-	while (MORE() && !SEETWO(endc, ']'))
-		NEXT();
-	if (!MORE()) {
-		SETERROR(REG_EBRACK);
-		return(0);
-	}
-	len = p->next - sp;
-	for (cp = cnames; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
-			return(cp->code);	/* known name */
-	memset(&mbs, 0, sizeof(mbs));
-	if ((clen = mbrtowc(&wc, sp, len, &mbs)) == len)
-		return (wc);			/* single character */
-	else if (clen == (size_t)-1 || clen == (size_t)-2)
-		SETERROR(REG_ILLSEQ);
-	else
-		SETERROR(REG_ECOLLATE);		/* neither */
-	return(0);
-}
-
-/*
- - othercase - return the case counterpart of an alphabetic
- == static char othercase(int ch);
- */
-static wint_t			/* if no counterpart, return ch */
-othercase(ch)
-wint_t ch;
-{
-	assert(iswalpha(ch));
-	if (iswupper(ch))
-		return(towlower(ch));
-	else if (iswlower(ch))
-		return(towupper(ch));
-	else			/* peculiar, but could happen */
-		return(ch);
-}
-
-/*
- - bothcases - emit a dualcase version of a two-case character
- == static void bothcases(struct parse *p, int ch);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-bothcases(p, ch)
-struct parse *p;
-wint_t ch;
-{
-	char *oldnext = p->next;
-	char *oldend = p->end;
-	char bracket[3 + MB_LEN_MAX];
-	size_t n;
-	mbstate_t mbs;
-
-	assert(othercase(ch) != ch);	/* p_bracket() would recurse */
-	p->next = bracket;
-	memset(&mbs, 0, sizeof(mbs));
-	n = wcrtomb(bracket, ch, &mbs);
-	assert(n != (size_t)-1);
-	bracket[n] = ']';
-	bracket[n + 1] = '\0';
-	p->end = bracket+n+1;
-	p_bracket(p);
-	assert(p->next == p->end);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - ordinary - emit an ordinary character
- == static void ordinary(struct parse *p, int ch);
- */
-static void
-ordinary(p, ch)
-struct parse *p;
-wint_t ch;
-{
-	cset *cs;
-
-	if ((p->g->cflags&REG_ICASE) && iswalpha(ch) && othercase(ch) != ch)
-		bothcases(p, ch);
-	else if ((ch & OPDMASK) == ch)
-		EMIT(OCHAR, ch);
-	else {
-		/*
-		 * Kludge: character is too big to fit into an OCHAR operand.
-		 * Emit a singleton set.
-		 */
-		if ((cs = allocset(p)) == NULL)
-			return;
-		CHadd(p, cs, ch);
-		EMIT(OANYOF, (int)(cs - p->g->sets));
-	}
-}
-
-/*
- - nonnewline - emit REG_NEWLINE version of OANY
- == static void nonnewline(struct parse *p);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-nonnewline(p)
-struct parse *p;
-{
-	char *oldnext = p->next;
-	char *oldend = p->end;
-	char bracket[4];
-
-	p->next = bracket;
-	p->end = bracket+3;
-	bracket[0] = '^';
-	bracket[1] = '\n';
-	bracket[2] = ']';
-	bracket[3] = '\0';
-	p_bracket(p);
-	assert(p->next == bracket+3);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - repeat - generate code for a bounded repetition, recursively if needed
- == static void repeat(struct parse *p, sopno start, int from, int to);
- */
-static void
-repeat(p, start, from, to)
-struct parse *p;
-sopno start;			/* operand from here to end of strip */
-int from;			/* repeated from this number */
-int to;				/* to this number of times (maybe INFINITY) */
-{
-	sopno finish = HERE();
-#	define	N	2
-#	define	INF	3
-#	define	REP(f, t)	((f)*8 + (t))
-#	define	MAP(n)	(((n) <= 1) ? (n) : ((n) == INFINITY) ? INF : N)
-	sopno copy;
-
-	if (p->error != 0)	/* head off possible runaway recursion */
-		return;
-
-	assert(from <= to);
-
-	switch (REP(MAP(from), MAP(to))) {
-	case REP(0, 0):			/* must be user doing this */
-		DROP(finish-start);	/* drop the operand */
-		break;
-	case REP(0, 1):			/* as x{1,1}? */
-	case REP(0, N):			/* as x{1,n}? */
-	case REP(0, INF):		/* as x{1,}? */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);		/* offset is wrong... */
-		repeat(p, start+1, 1, to);
-		ASTERN(OOR1, start);
-		AHEAD(start);			/* ... fix it */
-		EMIT(OOR2, 0);
-		AHEAD(THERE());
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case REP(1, 1):			/* trivial case */
-		/* done */
-		break;
-	case REP(1, N):			/* as x?x{1,n-1} */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);
-		ASTERN(OOR1, start);
-		AHEAD(start);
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		copy = dupl(p, start+1, finish+1);
-		assert(copy == finish+4);
-		repeat(p, copy, 1, to-1);
-		break;
-	case REP(1, INF):		/* as x+ */
-		INSERT(OPLUS_, start);
-		ASTERN(O_PLUS, start);
-		break;
-	case REP(N, N):			/* as xx{m-1,n-1} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to-1);
-		break;
-	case REP(N, INF):		/* as xx{n-1,INF} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to);
-		break;
-	default:			/* "can't happen" */
-		SETERROR(REG_ASSERT);	/* just in case */
-		break;
-	}
-}
-
-/*
- - wgetnext - helper function for WGETNEXT() macro. Gets the next wide
- - character from the parse struct, signals a REG_ILLSEQ error if the
- - character can't be converted. Returns the number of bytes consumed.
- */
-static wint_t
-wgetnext(p)
-struct parse *p;
-{
-	mbstate_t mbs;
-	wchar_t wc;
-	size_t n;
-
-	memset(&mbs, 0, sizeof(mbs));
-	n = mbrtowc(&wc, p->next, p->end - p->next, &mbs);
-	if (n == (size_t)-1 || n == (size_t)-2) {
-		SETERROR(REG_ILLSEQ);
-		return (0);
-	}
-	if (n == 0)
-		n = 1;
-	p->next += n;
-	return (wc);
-}
-
-/*
- - seterr - set an error condition
- == static int seterr(struct parse *p, int e);
- */
-static int			/* useless but makes type checking happy */
-seterr(p, e)
-struct parse *p;
-int e;
-{
-	if (p->error == 0)	/* keep earliest error condition */
-		p->error = e;
-	p->next = nuls;		/* try to bring things to a halt */
-	p->end = nuls;
-	return(0);		/* make the return value well-defined */
-}
-
-/*
- - allocset - allocate a set of characters for []
- == static cset *allocset(struct parse *p);
- */
-static cset *
-allocset(p)
-struct parse *p;
-{
-	cset *cs, *ncs;
-
-	ncs = realloc(p->g->sets, (p->g->ncsets + 1) * sizeof(*ncs));
-	if (ncs == NULL) {
-		SETERROR(REG_ESPACE);
-		return (NULL);
-	}
-	p->g->sets = ncs;
-	cs = &p->g->sets[p->g->ncsets++];
-	memset(cs, 0, sizeof(*cs));
-
-	return(cs);
-}
-
-/*
- - freeset - free a now-unused set
- == static void freeset(struct parse *p, cset *cs);
- */
-static void
-freeset(p, cs)
-struct parse *p;
-cset *cs;
-{
-	cset *top = &p->g->sets[p->g->ncsets];
-
-	free(cs->wides);
-	free(cs->ranges);
-	free(cs->types);
-	memset(cs, 0, sizeof(*cs));
-	if (cs == top-1)	/* recover only the easy case */
-		p->g->ncsets--;
-}
-
-/*
- - singleton - Determine whether a set contains only one character,
- - returning it if so, otherwise returning OUT.
- */
-static wint_t
-singleton(cs)
-cset *cs;
-{
-	wint_t i, s, n;
-
-	for (i = n = 0; i < NC; i++)
-		if (CHIN(cs, i)) {
-			n++;
-			s = i;
-		}
-	if (n == 1)
-		return (s);
-	if (cs->nwides == 1 && cs->nranges == 0 && cs->ntypes == 0 &&
-	    cs->icase == 0)
-		return (cs->wides[0]);
-	/* Don't bother handling the other cases. */
-	return (OUT);
-}
-
-/*
- - CHadd - add character to character set.
- */
-static void
-CHadd(p, cs, ch)
-struct parse *p;
-cset *cs;
-wint_t ch;
-{
-	wint_t nch, *newwides;
-	assert(ch >= 0);
-	if (ch < NC)
-		cs->bmp[ch >> 3] |= 1 << (ch & 7);
-	else {
-		newwides = realloc(cs->wides, (cs->nwides + 1) *
-		    sizeof(*cs->wides));
-		if (newwides == NULL) {
-			SETERROR(REG_ESPACE);
-			return;
-		}
-		cs->wides = newwides;
-		cs->wides[cs->nwides++] = ch;
-	}
-	if (cs->icase) {
-		if ((nch = towlower(ch)) < NC)
-			cs->bmp[nch >> 3] |= 1 << (nch & 7);
-		if ((nch = towupper(ch)) < NC)
-			cs->bmp[nch >> 3] |= 1 << (nch & 7);
-	}
-}
-
-/*
- - CHaddrange - add all characters in the range [min,max] to a character set.
- */
-static void
-CHaddrange(p, cs, min, max)
-struct parse *p;
-cset *cs;
-wint_t min, max;
-{
-	crange *newranges;
-
-	for (; min < NC && min <= max; min++)
-		CHadd(p, cs, min);
-	if (min >= max)
-		return;
-	newranges = realloc(cs->ranges, (cs->nranges + 1) *
-	    sizeof(*cs->ranges));
-	if (newranges == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-	cs->ranges = newranges;
-	cs->ranges[cs->nranges].min = min;
-	cs->ranges[cs->nranges].min = max;
-	cs->nranges++;
-}
-
-/*
- - CHaddtype - add all characters of a certain type to a character set.
- */
-static void
-CHaddtype(p, cs, wct)
-struct parse *p;
-cset *cs;
-wctype_t wct;
-{
-	wint_t i;
-	wctype_t *newtypes;
-
-	for (i = 0; i < NC; i++)
-		if (iswctype(i, wct))
-			CHadd(p, cs, i);
-	newtypes = realloc(cs->types, (cs->ntypes + 1) *
-	    sizeof(*cs->types));
-	if (newtypes == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-	cs->types = newtypes;
-	cs->types[cs->ntypes++] = wct;
-}
-
-/*
- - dupl - emit a duplicate of a bunch of sops
- == static sopno dupl(struct parse *p, sopno start, sopno finish);
- */
-static sopno			/* start of duplicate */
-dupl(p, start, finish)
-struct parse *p;
-sopno start;			/* from here */
-sopno finish;			/* to this less one */
-{
-	sopno ret = HERE();
-	sopno len = finish - start;
-
-	assert(finish >= start);
-	if (len == 0)
-		return(ret);
-	enlarge(p, p->ssize + len);	/* this many unexpected additions */
-	assert(p->ssize >= p->slen + len);
-	(void) memcpy((char *)(p->strip + p->slen),
-		(char *)(p->strip + start), (size_t)len*sizeof(sop));
-	p->slen += len;
-	return(ret);
-}
-
-/*
- - doemit - emit a strip operator
- == static void doemit(struct parse *p, sop op, size_t opnd);
- *
- * It might seem better to implement this as a macro with a function as
- * hard-case backup, but it's just too big and messy unless there are
- * some changes to the data structures.  Maybe later.
- */
-static void
-doemit(p, op, opnd)
-struct parse *p;
-sop op;
-size_t opnd;
-{
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/* deal with oversize operands ("can't happen", more or less) */
-	assert(opnd < 1<<OPSHIFT);
-
-	/* deal with undersized strip */
-	if (p->slen >= p->ssize)
-		enlarge(p, (p->ssize+1) / 2 * 3);	/* +50% */
-	assert(p->slen < p->ssize);
-
-	/* finally, it's all reduced to the easy case */
-	p->strip[p->slen++] = SOP(op, opnd);
-}
-
-/*
- - doinsert - insert a sop into the strip
- == static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
- */
-static void
-doinsert(p, op, opnd, pos)
-struct parse *p;
-sop op;
-size_t opnd;
-sopno pos;
-{
-	sopno sn;
-	sop s;
-	int i;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	sn = HERE();
-	EMIT(op, opnd);		/* do checks, ensure space */
-	assert(HERE() == sn+1);
-	s = p->strip[sn];
-
-	/* adjust paren pointers */
-	assert(pos > 0);
-	for (i = 1; i < NPAREN; i++) {
-		if (p->pbegin[i] >= pos) {
-			p->pbegin[i]++;
-		}
-		if (p->pend[i] >= pos) {
-			p->pend[i]++;
-		}
-	}
-
-	memmove((char *)&p->strip[pos+1], (char *)&p->strip[pos],
-						(HERE()-pos-1)*sizeof(sop));
-	p->strip[pos] = s;
-}
-
-/*
- - dofwd - complete a forward reference
- == static void dofwd(struct parse *p, sopno pos, sop value);
- */
-static void
-dofwd(p, pos, value)
-struct parse *p;
-sopno pos;
-sop value;
-{
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	assert(value < 1<<OPSHIFT);
-	p->strip[pos] = OP(p->strip[pos]) | value;
-}
-
-/*
- - enlarge - enlarge the strip
- == static void enlarge(struct parse *p, sopno size);
- */
-static void
-enlarge(p, size)
-struct parse *p;
-sopno size;
-{
-	sop *sp;
-
-	if (p->ssize >= size)
-		return;
-
-	sp = (sop *)realloc(p->strip, size*sizeof(sop));
-	if (sp == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-	p->strip = sp;
-	p->ssize = size;
-}
-
-/*
- - stripsnug - compact the strip
- == static void stripsnug(struct parse *p, struct re_guts *g);
- */
-static void
-stripsnug(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	g->nstates = p->slen;
-	g->strip = (sop *)realloc((char *)p->strip, p->slen * sizeof(sop));
-	if (g->strip == NULL) {
-		SETERROR(REG_ESPACE);
-		g->strip = p->strip;
-	}
-}
-
-/*
- - findmust - fill in must and mlen with longest mandatory literal string
- == static void findmust(struct parse *p, struct re_guts *g);
- *
- * This algorithm could do fancy things like analyzing the operands of |
- * for common subsequences.  Someday.  This code is simple and finds most
- * of the interesting cases.
- *
- * Note that must and mlen got initialized during setup.
- */
-static void
-findmust(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	sop *scan;
-	sop *start;
-	sop *newstart;
-	sopno newlen;
-	sop s;
-	char *cp;
-	int offset;
-	char buf[MB_LEN_MAX];
-	size_t clen;
-	mbstate_t mbs;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/*
-	 * It's not generally safe to do a ``char'' substring search on
-	 * multibyte character strings, but it's safe for at least
-	 * UTF-8 (see RFC 3629).
-	 */
-	if (MB_CUR_MAX > 1 &&
-	    strcmp(_CurrentRuneLocale->__encoding, "UTF-8") != 0)
-		return;
-
-	/* find the longest OCHAR sequence in strip */
-	newlen = 0;
-	offset = 0;
-	g->moffset = 0;
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OCHAR:		/* sequence member */
-			if (newlen == 0) {		/* new sequence */
-				memset(&mbs, 0, sizeof(mbs));
-				newstart = scan - 1;
-			}
-			clen = wcrtomb(buf, OPND(s), &mbs);
-			if (clen == (size_t)-1)
-				goto toohard;
-			newlen += clen;
-			break;
-		case OPLUS_:		/* things that don't break one */
-		case OLPAREN:
-		case ORPAREN:
-			break;
-		case OQUEST_:		/* things that must be skipped */
-		case OCH_:
-			offset = altoffset(scan, offset);
-			scan--;
-			do {
-				scan += OPND(s);
-				s = *scan;
-				/* assert() interferes w debug printouts */
-				if (OP(s) != O_QUEST && OP(s) != O_CH &&
-							OP(s) != OOR2) {
-					g->iflags |= BAD;
-					return;
-				}
-			} while (OP(s) != O_QUEST && OP(s) != O_CH);
-			/* FALLTHROUGH */
-		case OBOW:		/* things that break a sequence */
-		case OEOW:
-		case OBOL:
-		case OEOL:
-		case O_QUEST:
-		case O_CH:
-		case OEND:
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1) {
-					g->moffset += offset;
-					offset = newlen;
-				} else
-					g->moffset = offset;
-			} else {
-				if (offset > -1)
-					offset += newlen;
-			}
-			newlen = 0;
-			break;
-		case OANY:
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1) {
-					g->moffset += offset;
-					offset = newlen;
-				} else
-					g->moffset = offset;
-			} else {
-				if (offset > -1)
-					offset += newlen;
-			}
-			if (offset > -1)
-				offset++;
-			newlen = 0;
-			break;
-		case OANYOF:		/* may or may not invalidate offset */
-			/* First, everything as OANY */
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1) {
-					g->moffset += offset;
-					offset = newlen;
-				} else
-					g->moffset = offset;
-			} else {
-				if (offset > -1)
-					offset += newlen;
-			}
-			if (offset > -1)
-				offset++;
-			newlen = 0;
-			break;
-		toohard:
-		default:
-			/* Anything here makes it impossible or too hard
-			 * to calculate the offset -- so we give up;
-			 * save the last known good offset, in case the
-			 * must sequence doesn't occur later.
-			 */
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1)
-					g->moffset += offset;
-				else
-					g->moffset = offset;
-			}
-			offset = -1;
-			newlen = 0;
-			break;
-		}
-	} while (OP(s) != OEND);
-
-	if (g->mlen == 0) {		/* there isn't one */
-		g->moffset = -1;
-		return;
-	}
-
-	/* turn it into a character string */
-	g->must = malloc((size_t)g->mlen + 1);
-	if (g->must == NULL) {		/* argh; just forget it */
-		g->mlen = 0;
-		g->moffset = -1;
-		return;
-	}
-	cp = g->must;
-	scan = start;
-	memset(&mbs, 0, sizeof(mbs));
-	while (cp < g->must + g->mlen) {
-		while (OP(s = *scan++) != OCHAR)
-			continue;
-		clen = wcrtomb(cp, OPND(s), &mbs);
-		assert(clen != (size_t)-1);
-		cp += clen;
-	}
-	assert(cp == g->must + g->mlen);
-	*cp++ = '\0';		/* just on general principles */
-}
-
-/*
- - altoffset - choose biggest offset among multiple choices
- == static int altoffset(sop *scan, int offset);
- *
- * Compute, recursively if necessary, the largest offset among multiple
- * re paths.
- */
-static int
-altoffset(scan, offset)
-sop *scan;
-int offset;
-{
-	int largest;
-	int try;
-	sop s;
-
-	/* If we gave up already on offsets, return */
-	if (offset == -1)
-		return -1;
-
-	largest = 0;
-	try = 0;
-	s = *scan++;
-	while (OP(s) != O_QUEST && OP(s) != O_CH) {
-		switch (OP(s)) {
-		case OOR1:
-			if (try > largest)
-				largest = try;
-			try = 0;
-			break;
-		case OQUEST_:
-		case OCH_:
-			try = altoffset(scan, try);
-			if (try == -1)
-				return -1;
-			scan--;
-			do {
-				scan += OPND(s);
-				s = *scan;
-				if (OP(s) != O_QUEST && OP(s) != O_CH &&
-							OP(s) != OOR2)
-					return -1;
-			} while (OP(s) != O_QUEST && OP(s) != O_CH);
-			/* We must skip to the next position, or we'll
-			 * leave altoffset() too early.
-			 */
-			scan++;
-			break;
-		case OANYOF:
-		case OCHAR:
-		case OANY:
-			try++;
-		case OBOW:
-		case OEOW:
-		case OLPAREN:
-		case ORPAREN:
-		case OOR2:
-			break;
-		default:
-			try = -1;
-			break;
-		}
-		if (try == -1)
-			return -1;
-		s = *scan++;
-	}
-
-	if (try > largest)
-		largest = try;
-
-	return largest+offset;
-}
-
-/*
- - computejumps - compute char jumps for BM scan
- == static void computejumps(struct parse *p, struct re_guts *g);
- *
- * This algorithm assumes g->must exists and is has size greater than
- * zero. It's based on the algorithm found on Computer Algorithms by
- * Sara Baase.
- *
- * A char jump is the number of characters one needs to jump based on
- * the value of the character from the text that was mismatched.
- */
-static void
-computejumps(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	int ch;
-	int mindex;
-
-	/* Avoid making errors worse */
-	if (p->error != 0)
-		return;
-
-	g->charjump = (int*) malloc((NC + 1) * sizeof(int));
-	if (g->charjump == NULL)	/* Not a fatal error */
-		return;
-	/* Adjust for signed chars, if necessary */
-	g->charjump = &g->charjump[-(CHAR_MIN)];
-
-	/* If the character does not exist in the pattern, the jump
-	 * is equal to the number of characters in the pattern.
-	 */
-	for (ch = CHAR_MIN; ch < (CHAR_MAX + 1); ch++)
-		g->charjump[ch] = g->mlen;
-
-	/* If the character does exist, compute the jump that would
-	 * take us to the last character in the pattern equal to it
-	 * (notice that we match right to left, so that last character
-	 * is the first one that would be matched).
-	 */
-	for (mindex = 0; mindex < g->mlen; mindex++)
-		g->charjump[(int)g->must[mindex]] = g->mlen - mindex - 1;
-}
-
-/*
- - computematchjumps - compute match jumps for BM scan
- == static void computematchjumps(struct parse *p, struct re_guts *g);
- *
- * This algorithm assumes g->must exists and is has size greater than
- * zero. It's based on the algorithm found on Computer Algorithms by
- * Sara Baase.
- *
- * A match jump is the number of characters one needs to advance based
- * on the already-matched suffix.
- * Notice that all values here are minus (g->mlen-1), because of the way
- * the search algorithm works.
- */
-static void
-computematchjumps(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	int mindex;		/* General "must" iterator */
-	int suffix;		/* Keeps track of matching suffix */
-	int ssuffix;		/* Keeps track of suffixes' suffix */
-	int* pmatches;		/* pmatches[k] points to the next i
-				 * such that i+1...mlen is a substring
-				 * of k+1...k+mlen-i-1
-				 */
-
-	/* Avoid making errors worse */
-	if (p->error != 0)
-		return;
-
-	pmatches = (int*) malloc(g->mlen * sizeof(unsigned int));
-	if (pmatches == NULL) {
-		g->matchjump = NULL;
-		return;
-	}
-
-	g->matchjump = (int*) malloc(g->mlen * sizeof(unsigned int));
-	if (g->matchjump == NULL)	/* Not a fatal error */
-		return;
-
-	/* Set maximum possible jump for each character in the pattern */
-	for (mindex = 0; mindex < g->mlen; mindex++)
-		g->matchjump[mindex] = 2*g->mlen - mindex - 1;
-
-	/* Compute pmatches[] */
-	for (mindex = g->mlen - 1, suffix = g->mlen; mindex >= 0;
-	    mindex--, suffix--) {
-		pmatches[mindex] = suffix;
-
-		/* If a mismatch is found, interrupting the substring,
-		 * compute the matchjump for that position. If no
-		 * mismatch is found, then a text substring mismatched
-		 * against the suffix will also mismatch against the
-		 * substring.
-		 */
-		while (suffix < g->mlen
-		    && g->must[mindex] != g->must[suffix]) {
-			g->matchjump[suffix] = MIN(g->matchjump[suffix],
-			    g->mlen - mindex - 1);
-			suffix = pmatches[suffix];
-		}
-	}
-
-	/* Compute the matchjump up to the last substring found to jump
-	 * to the beginning of the largest must pattern prefix matching
-	 * it's own suffix.
-	 */
-	for (mindex = 0; mindex <= suffix; mindex++)
-		g->matchjump[mindex] = MIN(g->matchjump[mindex],
-		    g->mlen + suffix - mindex);
-
-        ssuffix = pmatches[suffix];
-        while (suffix < g->mlen) {
-                while (suffix <= ssuffix && suffix < g->mlen) {
-                        g->matchjump[suffix] = MIN(g->matchjump[suffix],
-			    g->mlen + ssuffix - suffix);
-                        suffix++;
-                }
-		if (suffix < g->mlen)
-                	ssuffix = pmatches[ssuffix];
-        }
-
-	free(pmatches);
-}
-
-/*
- - pluscount - count + nesting
- == static sopno pluscount(struct parse *p, struct re_guts *g);
- */
-static sopno			/* nesting depth */
-pluscount(p, g)
-struct parse *p;
-struct re_guts *g;
-{
-	sop *scan;
-	sop s;
-	sopno plusnest = 0;
-	sopno maxnest = 0;
-
-	if (p->error != 0)
-		return(0);	/* there may not be an OEND */
-
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OPLUS_:
-			plusnest++;
-			break;
-		case O_PLUS:
-			if (plusnest > maxnest)
-				maxnest = plusnest;
-			plusnest--;
-			break;
-		}
-	} while (OP(s) != OEND);
-	if (plusnest != 0)
-		g->iflags |= BAD;
-	return(maxnest);
-}
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
deleted file mode 100644
index 4e43f3d..0000000
--- a/lib/libc/regex/regerror.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- *
- *	@(#)regerror.c	8.4 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/regerror.c,v 1.9 2004/07/12 06:07:26 tjr Exp $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <regex.h>
-
-#include "utils.h"
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regerror.c === */
-static char *regatoi(const regex_t *preg, char *localbuf);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-/*
- = #define	REG_NOMATCH	 1
- = #define	REG_BADPAT	 2
- = #define	REG_ECOLLATE	 3
- = #define	REG_ECTYPE	 4
- = #define	REG_EESCAPE	 5
- = #define	REG_ESUBREG	 6
- = #define	REG_EBRACK	 7
- = #define	REG_EPAREN	 8
- = #define	REG_EBRACE	 9
- = #define	REG_BADBR	10
- = #define	REG_ERANGE	11
- = #define	REG_ESPACE	12
- = #define	REG_BADRPT	13
- = #define	REG_EMPTY	14
- = #define	REG_ASSERT	15
- = #define	REG_INVARG	16
- = #define	REG_ILLSEQ	17
- = #define	REG_ATOI	255	// convert name to number (!)
- = #define	REG_ITOA	0400	// convert number to name (!)
- */
-static struct rerr {
-	int code;
-	char *name;
-	char *explain;
-} rerrs[] = {
-	{REG_NOMATCH,	"REG_NOMATCH",	"regexec() failed to match"},
-	{REG_BADPAT,	"REG_BADPAT",	"invalid regular expression"},
-	{REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element"},
-	{REG_ECTYPE,	"REG_ECTYPE",	"invalid character class"},
-	{REG_EESCAPE,	"REG_EESCAPE",	"trailing backslash (\\)"},
-	{REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number"},
-	{REG_EBRACK,	"REG_EBRACK",	"brackets ([ ]) not balanced"},
-	{REG_EPAREN,	"REG_EPAREN",	"parentheses not balanced"},
-	{REG_EBRACE,	"REG_EBRACE",	"braces not balanced"},
-	{REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)"},
-	{REG_ERANGE,	"REG_ERANGE",	"invalid character range"},
-	{REG_ESPACE,	"REG_ESPACE",	"out of memory"},
-	{REG_BADRPT,	"REG_BADRPT",	"repetition-operator operand invalid"},
-	{REG_EMPTY,	"REG_EMPTY",	"empty (sub)expression"},
-	{REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug"},
-	{REG_INVARG,	"REG_INVARG",	"invalid argument to regex routine"},
-	{REG_ILLSEQ,	"REG_ILLSEQ",	"illegal byte sequence"},
-	{0,		"",		"*** unknown regexp error code ***"}
-};
-
-/*
- - regerror - the interface to error numbers
- = extern size_t regerror(int, const regex_t *, char *, size_t);
- */
-/* ARGSUSED */
-size_t
-regerror(errcode, preg, errbuf, errbuf_size)
-int errcode;
-const regex_t * __restrict preg;
-char * __restrict errbuf;
-size_t errbuf_size;
-{
-	struct rerr *r;
-	size_t len;
-	int target = errcode &~ REG_ITOA;
-	char *s;
-	char convbuf[50];
-
-	if (errcode == REG_ATOI)
-		s = regatoi(preg, convbuf);
-	else {
-		for (r = rerrs; r->code != 0; r++)
-			if (r->code == target)
-				break;
-
-		if (errcode&REG_ITOA) {
-			if (r->code != 0)
-				(void) strcpy(convbuf, r->name);
-			else
-				sprintf(convbuf, "REG_0x%x", target);
-			assert(strlen(convbuf) < sizeof(convbuf));
-			s = convbuf;
-		} else
-			s = r->explain;
-	}
-
-	len = strlen(s) + 1;
-	if (errbuf_size > 0) {
-		if (errbuf_size > len)
-			(void) strcpy(errbuf, s);
-		else {
-			(void) strncpy(errbuf, s, errbuf_size-1);
-			errbuf[errbuf_size-1] = '\0';
-		}
-	}
-
-	return(len);
-}
-
-/*
- - regatoi - internal routine to implement REG_ATOI
- == static char *regatoi(const regex_t *preg, char *localbuf);
- */
-static char *
-regatoi(preg, localbuf)
-const regex_t *preg;
-char *localbuf;
-{
-	struct rerr *r;
-
-	for (r = rerrs; r->code != 0; r++)
-		if (strcmp(r->name, preg->re_endp) == 0)
-			break;
-	if (r->code == 0)
-		return("0");
-
-	sprintf(localbuf, "%d", r->code);
-	return(localbuf);
-}
diff --git a/lib/libc/regex/regex2.h b/lib/libc/regex/regex2.h
deleted file mode 100644
index c971c9c..0000000
--- a/lib/libc/regex/regex2.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- *
- *	@(#)regex2.h	8.4 (Berkeley) 3/20/94
- * $FreeBSD: src/lib/libc/regex/regex2.h,v 1.8 2004/07/12 07:35:59 tjr Exp $
- */
-
-/*
- * First, the stuff that ends up in the outside-world include file
- = typedef off_t regoff_t;
- = typedef struct {
- = 	int re_magic;
- = 	size_t re_nsub;		// number of parenthesized subexpressions
- = 	const char *re_endp;	// end pointer for REG_PEND
- = 	struct re_guts *re_g;	// none of your business :-)
- = } regex_t;
- = typedef struct {
- = 	regoff_t rm_so;		// start of match
- = 	regoff_t rm_eo;		// end of match
- = } regmatch_t;
- */
-/*
- * internals of regex_t
- */
-#define	MAGIC1	((('r'^0200)<<8) | 'e')
-
-/*
- * The internal representation is a *strip*, a sequence of
- * operators ending with an endmarker.  (Some terminology etc. is a
- * historical relic of earlier versions which used multiple strips.)
- * Certain oddities in the representation are there to permit running
- * the machinery backwards; in particular, any deviation from sequential
- * flow must be marked at both its source and its destination.  Some
- * fine points:
- *
- * - OPLUS_ and O_PLUS are *inside* the loop they create.
- * - OQUEST_ and O_QUEST are *outside* the bypass they create.
- * - OCH_ and O_CH are *outside* the multi-way branch they create, while
- *   OOR1 and OOR2 are respectively the end and the beginning of one of
- *   the branches.  Note that there is an implicit OOR2 following OCH_
- *   and an implicit OOR1 preceding O_CH.
- *
- * In state representations, an operator's bit is on to signify a state
- * immediately *preceding* "execution" of that operator.
- */
-typedef unsigned long sop;	/* strip operator */
-typedef long sopno;
-#define	OPRMASK	0xf8000000L
-#define	OPDMASK	0x07ffffffL
-#define	OPSHIFT	((unsigned)27)
-#define	OP(n)	((n)&OPRMASK)
-#define	OPND(n)	((n)&OPDMASK)
-#define	SOP(op, opnd)	((op)|(opnd))
-/* operators			   meaning	operand			*/
-/*						(back, fwd are offsets)	*/
-#define	OEND	(1L<<OPSHIFT)	/* endmarker	-			*/
-#define	OCHAR	(2L<<OPSHIFT)	/* character	wide character		*/
-#define	OBOL	(3L<<OPSHIFT)	/* left anchor	-			*/
-#define	OEOL	(4L<<OPSHIFT)	/* right anchor	-			*/
-#define	OANY	(5L<<OPSHIFT)	/* .		-			*/
-#define	OANYOF	(6L<<OPSHIFT)	/* [...]	set number		*/
-#define	OBACK_	(7L<<OPSHIFT)	/* begin \d	paren number		*/
-#define	O_BACK	(8L<<OPSHIFT)	/* end \d	paren number		*/
-#define	OPLUS_	(9L<<OPSHIFT)	/* + prefix	fwd to suffix		*/
-#define	O_PLUS	(10L<<OPSHIFT)	/* + suffix	back to prefix		*/
-#define	OQUEST_	(11L<<OPSHIFT)	/* ? prefix	fwd to suffix		*/
-#define	O_QUEST	(12L<<OPSHIFT)	/* ? suffix	back to prefix		*/
-#define	OLPAREN	(13L<<OPSHIFT)	/* (		fwd to )		*/
-#define	ORPAREN	(14L<<OPSHIFT)	/* )		back to (		*/
-#define	OCH_	(15L<<OPSHIFT)	/* begin choice	fwd to OOR2		*/
-#define	OOR1	(16L<<OPSHIFT)	/* | pt. 1	back to OOR1 or OCH_	*/
-#define	OOR2	(17L<<OPSHIFT)	/* | pt. 2	fwd to OOR2 or O_CH	*/
-#define	O_CH	(18L<<OPSHIFT)	/* end choice	back to OOR1		*/
-#define	OBOW	(19L<<OPSHIFT)	/* begin word	-			*/
-#define	OEOW	(20L<<OPSHIFT)	/* end word	-			*/
-
-/*
- * Structures for [] character-set representation.
- */
-typedef struct {
-	wint_t		min;
-	wint_t		max;
-} crange;
-typedef struct {
-	unsigned char	bmp[NC / 8];
-	wctype_t	*types;
-	int		ntypes;
-	wint_t		*wides;
-	int		nwides;
-	crange		*ranges;
-	int		nranges;
-	int		invert;
-	int		icase;
-} cset;
-
-static int
-CHIN1(cs, ch)
-cset *cs;
-wint_t ch;
-{
-	int i;
-
-	assert(ch >= 0);
-	if (ch < NC)
-		return (((cs->bmp[ch >> 3] & (1 << (ch & 7))) != 0) ^
-		    cs->invert);
-	for (i = 0; i < cs->nwides; i++)
-		if (ch == cs->wides[i])
-			return (!cs->invert);
-	for (i = 0; i < cs->nranges; i++)
-		if (cs->ranges[i].min <= ch && ch <= cs->ranges[i].max)
-			return (!cs->invert);
-	for (i = 0; i < cs->ntypes; i++)
-		if (iswctype(ch, cs->types[i]))
-			return (!cs->invert);
-	return (cs->invert);
-}
-
-static __inline int
-CHIN(cs, ch)
-cset *cs;
-wint_t ch;
-{
-
-	assert(ch >= 0);
-	if (ch < NC)
-		return (((cs->bmp[ch >> 3] & (1 << (ch & 7))) != 0) ^
-		    cs->invert);
-	else if (cs->icase)
-		return (CHIN1(cs, ch) || CHIN1(cs, towlower(ch)) ||
-		    CHIN1(cs, towupper(ch)));
-	else
-		return (CHIN1(cs, ch));
-}
-
-/*
- * main compiled-expression structure
- */
-struct re_guts {
-	int magic;
-#		define	MAGIC2	((('R'^0200)<<8)|'E')
-	sop *strip;		/* malloced area for strip */
-	int ncsets;		/* number of csets in use */
-	cset *sets;		/* -> cset [ncsets] */
-	int cflags;		/* copy of regcomp() cflags argument */
-	sopno nstates;		/* = number of sops */
-	sopno firststate;	/* the initial OEND (normally 0) */
-	sopno laststate;	/* the final OEND */
-	int iflags;		/* internal flags */
-#		define	USEBOL	01	/* used ^ */
-#		define	USEEOL	02	/* used $ */
-#		define	BAD	04	/* something wrong */
-	int nbol;		/* number of ^ used */
-	int neol;		/* number of $ used */
-	char *must;		/* match must contain this string */
-	int moffset;		/* latest point at which must may be located */
-	int *charjump;		/* Boyer-Moore char jump table */
-	int *matchjump;		/* Boyer-Moore match jump table */
-	int mlen;		/* length of must */
-	size_t nsub;		/* copy of re_nsub */
-	int backrefs;		/* does it use back references? */
-	sopno nplus;		/* how deep does it nest +s? */
-};
-
-/* misc utilities */
-#define	OUT	(-2)	/* a non-character value */
-#define ISWORD(c)       (iswalnum((uch)(c)) || (c) == '_')
diff --git a/lib/libc/regex/regexec.c b/lib/libc/regex/regexec.c
deleted file mode 100644
index c570369..0000000
--- a/lib/libc/regex/regexec.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- *
- *	@(#)regexec.c	8.3 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/regexec.c,v 1.6 2004/07/12 07:35:59 tjr Exp $");
-
-/*
- * the outer shell of regexec()
- *
- * This file includes engine.c three times, after muchos fiddling with the
- * macros that code uses.  This lets the same code operate on two different
- * representations for state sets and characters.
- */
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include <regex.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "utils.h"
-#include "regex2.h"
-
-static int nope __unused = 0;	/* for use in asserts; shuts lint up */
-
-static __inline size_t
-xmbrtowc(wi, s, n, mbs, dummy)
-wint_t *wi;
-const char *s;
-size_t n;
-mbstate_t *mbs;
-wint_t dummy;
-{
-	size_t nr;
-	wchar_t wc;
-
-	nr = mbrtowc(&wc, s, n, mbs);
-	if (wi != NULL)
-		*wi = wc;
-	if (nr == 0)
-		return (1);
-	else if (nr == (size_t)-1 || nr == (size_t)-2) {
-		memset(mbs, 0, sizeof(*mbs));
-		if (wi != NULL)
-			*wi = dummy;
-		return (1);
-	} else
-                return (nr);
-}
-
-static __inline size_t
-xmbrtowc_dummy(wi, s, n, mbs, dummy)
-wint_t *wi;
-const char *s;
-size_t n __unused;
-mbstate_t *mbs __unused;
-wint_t dummy __unused;
-{
-
-	if (wi != NULL)
-		*wi = (unsigned char)*s;
-	return (1);
-}
-
-/* macros for manipulating states, small version */
-#define	states	long
-#define	states1	states		/* for later use in regexec() decision */
-#define	CLEAR(v)	((v) = 0)
-#define	SET0(v, n)	((v) &= ~((unsigned long)1 << (n)))
-#define	SET1(v, n)	((v) |= (unsigned long)1 << (n))
-#define	ISSET(v, n)	(((v) & ((unsigned long)1 << (n))) != 0)
-#define	ASSIGN(d, s)	((d) = (s))
-#define	EQ(a, b)	((a) == (b))
-#define	STATEVARS	long dummy	/* dummy version */
-#define	STATESETUP(m, n)	/* nothing */
-#define	STATETEARDOWN(m)	/* nothing */
-#define	SETUP(v)	((v) = 0)
-#define	onestate	long
-#define	INIT(o, n)	((o) = (unsigned long)1 << (n))
-#define	INC(o)	((o) <<= 1)
-#define	ISSTATEIN(v, o)	(((v) & (o)) != 0)
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst) |= ((unsigned long)(src)&(here)) << (n))
-#define	BACK(dst, src, n)	((dst) |= ((unsigned long)(src)&(here)) >> (n))
-#define	ISSETBACK(v, n)	(((v) & ((unsigned long)here >> (n))) != 0)
-/* no multibyte support */
-#define	XMBRTOWC	xmbrtowc_dummy
-#define	ZAPSTATE(mbs)	((void)(mbs))
-/* function names */
-#define SNAMES			/* engine.c looks after details */
-
-#include "engine.c"
-
-/* now undo things */
-#undef	states
-#undef	CLEAR
-#undef	SET0
-#undef	SET1
-#undef	ISSET
-#undef	ASSIGN
-#undef	EQ
-#undef	STATEVARS
-#undef	STATESETUP
-#undef	STATETEARDOWN
-#undef	SETUP
-#undef	onestate
-#undef	INIT
-#undef	INC
-#undef	ISSTATEIN
-#undef	FWD
-#undef	BACK
-#undef	ISSETBACK
-#undef	SNAMES
-#undef	XMBRTOWC
-#undef	ZAPSTATE
-
-/* macros for manipulating states, large version */
-#define	states	char *
-#define	CLEAR(v)	memset(v, 0, m->g->nstates)
-#define	SET0(v, n)	((v)[n] = 0)
-#define	SET1(v, n)	((v)[n] = 1)
-#define	ISSET(v, n)	((v)[n])
-#define	ASSIGN(d, s)	memcpy(d, s, m->g->nstates)
-#define	EQ(a, b)	(memcmp(a, b, m->g->nstates) == 0)
-#define	STATEVARS	long vn; char *space
-#define	STATESETUP(m, nv)	{ (m)->space = malloc((nv)*(m)->g->nstates); \
-				if ((m)->space == NULL) return(REG_ESPACE); \
-				(m)->vn = 0; }
-#define	STATETEARDOWN(m)	{ free((m)->space); }
-#define	SETUP(v)	((v) = &m->space[m->vn++ * m->g->nstates])
-#define	onestate	long
-#define	INIT(o, n)	((o) = (n))
-#define	INC(o)	((o)++)
-#define	ISSTATEIN(v, o)	((v)[o])
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst)[here+(n)] |= (src)[here])
-#define	BACK(dst, src, n)	((dst)[here-(n)] |= (src)[here])
-#define	ISSETBACK(v, n)	((v)[here - (n)])
-/* no multibyte support */
-#define	XMBRTOWC	xmbrtowc_dummy
-#define	ZAPSTATE(mbs)	((void)(mbs))
-/* function names */
-#define	LNAMES			/* flag */
-
-#include "engine.c"
-
-/* multibyte character & large states version */
-#undef	LNAMES
-#undef	XMBRTOWC
-#undef	ZAPSTATE
-#define	XMBRTOWC	xmbrtowc
-#define	ZAPSTATE(mbs)	memset((mbs), 0, sizeof(*(mbs)))
-#define	MNAMES
-
-#include "engine.c"
-
-/*
- - regexec - interface for matching
- = extern int regexec(const regex_t *, const char *, size_t, \
- =					regmatch_t [], int);
- = #define	REG_NOTBOL	00001
- = #define	REG_NOTEOL	00002
- = #define	REG_STARTEND	00004
- = #define	REG_TRACE	00400	// tracing of execution
- = #define	REG_LARGE	01000	// force large representation
- = #define	REG_BACKR	02000	// force use of backref code
- *
- * We put this here so we can exploit knowledge of the state representation
- * when choosing which matcher to call.  Also, by this point the matchers
- * have been prototyped.
- */
-int				/* 0 success, REG_NOMATCH failure */
-regexec(preg, string, nmatch, pmatch, eflags)
-const regex_t * __restrict preg;
-const char * __restrict string;
-size_t nmatch;
-regmatch_t pmatch[__restrict];
-int eflags;
-{
-	struct re_guts *g = preg->re_g;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&(REG_NOTBOL|REG_NOTEOL|REG_STARTEND))
-#endif
-
-	if (preg->re_magic != MAGIC1 || g->magic != MAGIC2)
-		return(REG_BADPAT);
-	assert(!(g->iflags&BAD));
-	if (g->iflags&BAD)		/* backstop for no-debug case */
-		return(REG_BADPAT);
-	eflags = GOODFLAGS(eflags);
-
-	if (MB_CUR_MAX > 1)
-		return(mmatcher(g, (char *)string, nmatch, pmatch, eflags));
-	else if (g->nstates <= CHAR_BIT*sizeof(states1) && !(eflags&REG_LARGE))
-		return(smatcher(g, (char *)string, nmatch, pmatch, eflags));
-	else
-		return(lmatcher(g, (char *)string, nmatch, pmatch, eflags));
-}
diff --git a/lib/libc/regex/regfree.c b/lib/libc/regex/regfree.c
deleted file mode 100644
index 110879e..0000000
--- a/lib/libc/regex/regfree.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- *
- *	@(#)regfree.c	8.3 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/regex/regfree.c,v 1.6 2004/07/12 07:35:59 tjr Exp $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <regex.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "utils.h"
-#include "regex2.h"
-
-/*
- - regfree - free everything
- = extern void regfree(regex_t *);
- */
-void
-regfree(preg)
-regex_t *preg;
-{
-	struct re_guts *g;
-	int i;
-
-	if (preg->re_magic != MAGIC1)	/* oops */
-		return;			/* nice to complain, but hard */
-
-	g = preg->re_g;
-	if (g == NULL || g->magic != MAGIC2)	/* oops again */
-		return;
-	preg->re_magic = 0;		/* mark it invalid */
-	g->magic = 0;			/* mark it invalid */
-
-	if (g->strip != NULL)
-		free((char *)g->strip);
-	if (g->sets != NULL) {
-		for (i = 0; i < g->ncsets; i++) {
-			free(g->sets[i].ranges);
-			free(g->sets[i].wides);
-			free(g->sets[i].types);
-		}
-		free((char *)g->sets);
-	}
-	if (g->must != NULL)
-		free(g->must);
-	if (g->charjump != NULL)
-		free(&g->charjump[CHAR_MIN]);
-	if (g->matchjump != NULL)
-		free(g->matchjump);
-	free((char *)g);
-}
diff --git a/lib/libc/regex/utils.h b/lib/libc/regex/utils.h
deleted file mode 100644
index 5439b6c..0000000
--- a/lib/libc/regex/utils.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- *
- *	@(#)utils.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD: src/lib/libc/regex/utils.h,v 1.2 2002/03/22 23:41:56 obrien Exp $
- */
-
-/* utility definitions */
-#define	DUPMAX		_POSIX2_RE_DUP_MAX	/* xxx is this right? */
-#define	INFINITY	(DUPMAX + 1)
-#define	NC		(CHAR_MAX - CHAR_MIN + 1)
-typedef unsigned char uch;
-
-/* switch off assertions (if not already off) if no REDEBUG */
-#ifndef REDEBUG
-#ifndef NDEBUG
-#define	NDEBUG	/* no assertions please */
-#endif
-#endif
-#include <assert.h>
-
-/* for old systems with bcopy() but no memmove() */
-#ifdef USEBCOPY
-#define	memmove(d, s, c)	bcopy(s, d, c)
-#endif
diff --git a/lib/libc/resolv/Makefile b/lib/libc/resolv/Makefile
deleted file mode 100644
index f4377a1..0000000
--- a/lib/libc/resolv/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = h_errno.o herror.o mtctxres.o res_comp.o res_data.o res_debug.o res_init.o res_mkquery.o res_query.o res_send.o res_state.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/resolv/h_errno.c b/lib/libc/resolv/h_errno.c
deleted file mode 100644
index dcd240d..0000000
--- a/lib/libc/resolv/h_errno.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2006 The FreeBSD Project. 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.
- *
- * 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/lib/libc/resolv/h_errno.c,v 1.2.2.1 2006/07/17 10:09:58 ume Exp $
- */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-#undef	h_errno
-extern int h_errno;
-
-int *
-__h_errno(void)
-{
-	return (&__res_state()->res_h_errno);
-}
-
-void
-__h_errno_set(res_state res, int err)
-{
-	h_errno = res->res_h_errno = err;
-}
-
-/* binary backward compatibility for FreeBSD 5.x and 6.x */
-__weak_reference(__h_errno, __h_error);
diff --git a/lib/libc/resolv/herror.c b/lib/libc/resolv/herror.c
deleted file mode 100644
index cdc6b92..0000000
--- a/lib/libc/resolv/herror.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: herror.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/herror.c,v 1.2.2.1 2006/07/17 10:09:58 ume Exp $");
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "port_after.h"
-
-const char *h_errlist[] = {
-	"Resolver Error 0 (no error)",
-	"Unknown host",				/* 1 HOST_NOT_FOUND */
-	"Host name lookup failure",		/* 2 TRY_AGAIN */
-	"Unknown server error",			/* 3 NO_RECOVERY */
-	"No address associated with name",	/* 4 NO_ADDRESS */
-};
-const int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
-
-#undef	h_errno
-int	h_errno;
-
-/*
- * herror --
- *	print the error indicated by the h_errno value.
- */
-void
-herror(const char *s) {
-	struct iovec iov[4], *v = iov;
-	char *t;
-
-	if (s != NULL && *s != '\0') {
-		DE_CONST(s, t);
-		v->iov_base = t;
-		v->iov_len = strlen(t);
-		v++;
-		DE_CONST(": ", t);
-		v->iov_base = t;
-		v->iov_len = 2;
-		v++;
-	}
-	DE_CONST(hstrerror(*__h_errno()), t);
-	v->iov_base = t;
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	DE_CONST("\n", t);
-	v->iov_base = t;
-	v->iov_len = 1;
-	_writev(STDERR_FILENO, iov, (v - iov) + 1);
-}
-
-/*
- * hstrerror --
- *	return the string associated with a given "host" errno value.
- */
-const char *
-hstrerror(int err) {
-	if (err < 0)
-		return ("Resolver internal error");
-	else if (err < h_nerr)
-		return (h_errlist[err]);
-	return ("Unknown resolver error");
-}
diff --git a/lib/libc/resolv/mtctxres.c b/lib/libc/resolv/mtctxres.c
deleted file mode 100644
index ccb7ad8..0000000
--- a/lib/libc/resolv/mtctxres.c
+++ /dev/null
@@ -1,140 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/mtctxres.c,v 1.2.2.1 2006/07/17 10:09:58 ume Exp $");
-
-#include <port_before.h>
-#ifdef DO_PTHREADS
-#include <pthread.h>
-#ifdef _LIBC
-#include <pthread_np.h>
-#endif
-#endif
-#include <errno.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-#include <resolv_mt.h>
-#include <port_after.h>
-
-#ifdef DO_PTHREADS
-static pthread_key_t	key;
-static int		mt_key_initialized = 0;
-
-static int		__res_init_ctx(void);
-static void		__res_destroy_ctx(void *);
-
-#if defined(sun) && !defined(__GNUC__)
-#pragma init	(_mtctxres_init)
-#endif
-#endif
-
-static mtctxres_t	sharedctx;
-
-#ifdef DO_PTHREADS
-/*
- * Initialize the TSD key. By doing this at library load time, we're
- * implicitly running without interference from other threads, so there's
- * no need for locking.
- */
-static void
-_mtctxres_init(void) {
-	int pthread_keycreate_ret;
-
-	pthread_keycreate_ret = pthread_key_create(&key, __res_destroy_ctx);
-	if (pthread_keycreate_ret == 0)
-		mt_key_initialized = 1;
-}
-#endif
-
-#ifndef _LIBC
-/*
- * To support binaries that used the private MT-safe interface in
- * Solaris 8, we still need to provide the __res_enable_mt()
- * and __res_disable_mt() entry points. They're do-nothing routines.
- */
-int
-__res_enable_mt(void) {
-	return (-1);
-}
-
-int
-__res_disable_mt(void) {
-	return (0);
-}
-#endif
-
-#ifdef DO_PTHREADS
-static int
-__res_init_ctx(void) {
-
-	mtctxres_t	*mt;
-	int		ret;
-
-
-	if (pthread_getspecific(key) != 0) {
-		/* Already exists */
-		return (0);
-	}
-
-	if ((mt = malloc(sizeof (mtctxres_t))) == 0) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	memset(mt, 0, sizeof (mtctxres_t));
-
-	if ((ret = pthread_setspecific(key, mt)) != 0) {
-		free(mt);
-		errno = ret;
-		return (-1);
-	}
-
-	return (0);
-}
-
-static void
-__res_destroy_ctx(void *value) {
-
-	mtctxres_t	*mt = (mtctxres_t *)value;
-
-	if (mt != 0)
-		free(mt);
-}
-#endif
-
-mtctxres_t *
-___mtctxres(void) {
-#ifdef DO_PTHREADS
-	mtctxres_t	*mt;
-
-#ifdef _LIBC
-	if (pthread_main_np() != 0)
-		return (&sharedctx);
-#endif
-
-	/*
-	 * This if clause should only be executed if we are linking
-	 * statically.  When linked dynamically _mtctxres_init() should
-	 * be called at binding time due the #pragma above.
-	 */
-	if (!mt_key_initialized) {
-		static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER;
-                pthread_mutex_lock(&keylock);
-		_mtctxres_init();
-                pthread_mutex_unlock(&keylock);
-	}
-
-	/*
-	 * If we have already been called in this thread return the existing
-	 * context.  Otherwise recreat a new context and return it.  If
-	 * that fails return a global context.
-	 */
-	if (mt_key_initialized) {
-		if (((mt = pthread_getspecific(key)) != 0) ||
-		    (__res_init_ctx() == 0 &&
-		     (mt = pthread_getspecific(key)) != 0)) {
-			return (mt);
-		}
-	}
-#endif
-	return (&sharedctx);
-}
diff --git a/lib/libc/resolv/res_comp.c b/lib/libc/resolv/res_comp.c
deleted file mode 100644
index 509adcd..0000000
--- a/lib/libc/resolv/res_comp.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_comp.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_comp.c,v 1.2.2.1 2006/07/17 10:09:58 ume Exp $");
-
-#include "port_before.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "port_after.h"
-
-/*
- * Expand compressed domain name 'src' to full domain name.
- * 'msg' is a pointer to the begining of the message,
- * 'eom' points to the first location after the message,
- * 'dst' is a pointer to a buffer of size 'dstsiz' for the result.
- * Return size of compressed name or -1 if there was an error.
- */
-int
-dn_expand(const u_char *msg, const u_char *eom, const u_char *src,
-	  char *dst, int dstsiz)
-{
-	int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz);
-
-	if (n > 0 && dst[0] == '.')
-		dst[0] = '\0';
-	return (n);
-}
-
-/*
- * Pack domain name 'exp_dn' in presentation form into 'comp_dn'.
- * Return the size of the compressed name or -1.
- * 'length' is the size of the array pointed to by 'comp_dn'.
- */
-int
-dn_comp(const char *src, u_char *dst, int dstsiz,
-	u_char **dnptrs, u_char **lastdnptr)
-{
-	return (ns_name_compress(src, dst, (size_t)dstsiz,
-				 (const u_char **)dnptrs,
-				 (const u_char **)lastdnptr));
-}
-
-/*
- * Skip over a compressed domain name. Return the size or -1.
- */
-int
-dn_skipname(const u_char *ptr, const u_char *eom) {
-	const u_char *saveptr = ptr;
-
-	if (ns_name_skip(&ptr, eom) == -1)
-		return (-1);
-	return (ptr - saveptr);
-}
-
-/*
- * Verify that a domain name uses an acceptable character set.
- */
-
-/*
- * Note the conspicuous absence of ctype macros in these definitions.  On
- * non-ASCII hosts, we can't depend on string literals or ctype macros to
- * tell us anything about network-format data.  The rest of the BIND system
- * is not careful about this, but for some reason, we're doing it right here.
- */
-#define PERIOD 0x2e
-#define	hyphenchar(c) ((c) == 0x2d)
-#define bslashchar(c) ((c) == 0x5c)
-#define periodchar(c) ((c) == PERIOD)
-#define asterchar(c) ((c) == 0x2a)
-#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
-		   || ((c) >= 0x61 && (c) <= 0x7a))
-#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
-
-#define borderchar(c) (alphachar(c) || digitchar(c))
-#define middlechar(c) (borderchar(c) || hyphenchar(c))
-#define	domainchar(c) ((c) > 0x20 && (c) < 0x7f)
-
-int
-res_hnok(const char *dn) {
-	int pch = PERIOD, ch = *dn++;
-
-	while (ch != '\0') {
-		int nch = *dn++;
-
-		if (periodchar(ch)) {
-			(void)NULL;
-		} else if (periodchar(pch)) {
-			if (!borderchar(ch))
-				return (0);
-		} else if (periodchar(nch) || nch == '\0') {
-			if (!borderchar(ch))
-				return (0);
-		} else {
-			if (!middlechar(ch))
-				return (0);
-		}
-		pch = ch, ch = nch;
-	}
-	return (1);
-}
-
-/*
- * hostname-like (A, MX, WKS) owners can have "*" as their first label
- * but must otherwise be as a host name.
- */
-int
-res_ownok(const char *dn) {
-	if (asterchar(dn[0])) {
-		if (periodchar(dn[1]))
-			return (res_hnok(dn+2));
-		if (dn[1] == '\0')
-			return (1);
-	}
-	return (res_hnok(dn));
-}
-
-/*
- * SOA RNAMEs and RP RNAMEs can have any printable character in their first
- * label, but the rest of the name has to look like a host name.
- */
-int
-res_mailok(const char *dn) {
-	int ch, escaped = 0;
-
-	/* "." is a valid missing representation */
-	if (*dn == '\0')
-		return (1);
-
-	/* otherwise <label>.<hostname> */
-	while ((ch = *dn++) != '\0') {
-		if (!domainchar(ch))
-			return (0);
-		if (!escaped && periodchar(ch))
-			break;
-		if (escaped)
-			escaped = 0;
-		else if (bslashchar(ch))
-			escaped = 1;
-	}
-	if (periodchar(ch))
-		return (res_hnok(dn));
-	return (0);
-}
-
-/*
- * This function is quite liberal, since RFC 1034's character sets are only
- * recommendations.
- */
-int
-res_dnok(const char *dn) {
-	int ch;
-
-	while ((ch = *dn++) != '\0')
-		if (!domainchar(ch))
-			return (0);
-	return (1);
-}
-
-#ifdef BIND_4_COMPAT
-/*
- * This module must export the following externally-visible symbols:
- *	___putlong
- *	___putshort
- *	__getlong
- *	__getshort
- * Note that one _ comes from C and the others come from us.
- */
-
-#ifdef SOLARIS2
-#ifdef  __putlong
-#undef  __putlong
-#endif
-#ifdef  __putshort
-#undef  __putshort
-#endif
-#pragma weak    putlong         =       __putlong
-#pragma weak    putshort        =       __putshort
-#endif /* SOLARIS2 */
-
-void __putlong(uint32_t src, u_char *dst) { ns_put32(src, dst); }
-void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
-#ifndef __ultrix__
-uint32_t _getlong(const u_char *src) { return (ns_get32(src)); }
-u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
-#endif /*__ultrix__*/
-#endif /*BIND_4_COMPAT*/
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef dn_comp
-__weak_reference(__dn_comp, dn_comp);
-#undef dn_expand
-__weak_reference(__dn_expand, dn_expand);
diff --git a/lib/libc/resolv/res_data.c b/lib/libc/resolv/res_data.c
deleted file mode 100644
index b5abc02..0000000
--- a/lib/libc/resolv/res_data.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: res_data.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_data.c,v 1.3.2.1 2006/07/17 10:09:58 ume Exp $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <res_update.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "port_after.h"
-
-const char *_res_opcodes[] = {
-	"QUERY",
-	"IQUERY",
-	"CQUERYM",
-	"CQUERYU",	/* experimental */
-	"NOTIFY",	/* experimental */
-	"UPDATE",
-	"6",
-	"7",
-	"8",
-	"9",
-	"10",
-	"11",
-	"12",
-	"13",
-	"ZONEINIT",
-	"ZONEREF",
-};
-
-#ifdef BIND_UPDATE
-const char *_res_sectioncodes[] = {
-	"ZONE",
-	"PREREQUISITES",
-	"UPDATE",
-	"ADDITIONAL",
-};
-#endif
-
-#ifndef __BIND_NOSTATIC
-
-/* Proto. */
-
-int  res_ourserver_p(const res_state, const struct sockaddr_in *);
-
-int
-res_init(void) {
-	extern int __res_vinit(res_state, int);
-
-	/*
-	 * These three fields used to be statically initialized.  This made
-	 * it hard to use this code in a shared library.  It is necessary,
-	 * now that we're doing dynamic initialization here, that we preserve
-	 * the old semantics: if an application modifies one of these three
-	 * fields of _res before res_init() is called, res_init() will not
-	 * alter them.  Of course, if an application is setting them to
-	 * _zero_ before calling res_init(), hoping to override what used
-	 * to be the static default, we can't detect it and unexpected results
-	 * will follow.  Zero for any of these fields would make no sense,
-	 * so one can safely assume that the applications were already getting
-	 * unexpected results.
-	 *
-	 * _res.options is tricky since some apps were known to diddle the bits
-	 * before res_init() was first called. We can't replicate that semantic
-	 * with dynamic initialization (they may have turned bits off that are
-	 * set in RES_DEFAULT).  Our solution is to declare such applications
-	 * "broken".  They could fool us by setting RES_INIT but none do (yet).
-	 */
-	if (!_res.retrans)
-		_res.retrans = RES_TIMEOUT;
-	if (!_res.retry)
-		_res.retry = RES_DFLRETRY;
-	if (!(_res.options & RES_INIT))
-		_res.options = RES_DEFAULT;
-
-	/*
-	 * This one used to initialize implicitly to zero, so unless the app
-	 * has set it to something in particular, we can randomize it now.
-	 */
-	if (!_res.id)
-		_res.id = res_randomid();
-
-	return (__res_vinit(&_res, 1));
-}
-
-void
-p_query(const u_char *msg) {
-	fp_query(msg, stdout);
-}
-
-void
-fp_query(const u_char *msg, FILE *file) {
-	fp_nquery(msg, PACKETSZ, file);
-}
-
-void
-fp_nquery(const u_char *msg, int len, FILE *file) {
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1)
-		return;
-
-	res_pquery(&_res, msg, len, file);
-}
-
-int
-res_mkquery(int op,			/* opcode of query */
-	    const char *dname,		/* domain name */
-	    int class, int type,	/* class and type of query */
-	    const u_char *data,		/* resource record data */
-	    int datalen,		/* length of data */
-	    const u_char *newrr_in,	/* new rr for modify or append */
-	    u_char *buf,		/* buffer to put query */
-	    int buflen)			/* size of buffer */
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-	return (res_nmkquery(&_res, op, dname, class, type,
-			     data, datalen,
-			     newrr_in, buf, buflen));
-}
-
-int
-res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nmkupdate(&_res, rrecp_in, buf, buflen));
-}
-
-int
-res_query(const char *name,	/* domain name */
-	  int class, int type,	/* class and type of query */
-	  u_char *answer,	/* buffer to put answer */
-	  int anslen)		/* size of answer buffer */
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-	return (res_nquery(&_res, name, class, type, answer, anslen));
-}
-
-#ifndef _LIBC
-void
-res_send_setqhook(res_send_qhook hook) {
-	_res.qhook = hook;
-}
-
-void
-res_send_setrhook(res_send_rhook hook) {
-	_res.rhook = hook;
-}
-#endif
-
-int
-res_isourserver(const struct sockaddr_in *inp) {
-	return (res_ourserver_p(&_res, inp));
-}
-
-int
-res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) {
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-
-	return (res_nsend(&_res, buf, buflen, ans, anssiz));
-}
-
-#ifndef _LIBC
-int
-res_sendsigned(const u_char *buf, int buflen, ns_tsig_key *key,
-	       u_char *ans, int anssiz)
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-
-	return (res_nsendsigned(&_res, buf, buflen, key, ans, anssiz));
-}
-#endif
-
-void
-res_close(void) {
-	res_nclose(&_res);
-}
-
-int
-res_update(ns_updrec *rrecp_in) {
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nupdate(&_res, rrecp_in, NULL));
-}
-
-int
-res_search(const char *name,	/* domain name */
-	   int class, int type,	/* class and type of query */
-	   u_char *answer,	/* buffer to put answer */
-	   int anslen)		/* size of answer */
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nsearch(&_res, name, class, type, answer, anslen));
-}
-
-int
-res_querydomain(const char *name,
-		const char *domain,
-		int class, int type,	/* class and type of query */
-		u_char *answer,		/* buffer to put answer */
-		int anslen)		/* size of answer */
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nquerydomain(&_res, name, domain,
-				 class, type,
-				 answer, anslen));
-}
-
-int
-res_opt(int n0, u_char *buf, int buflen, int anslen)
-{
-	return (res_nopt(&_res, n0, buf, buflen, anslen));
-}
-
-const char *
-hostalias(const char *name) {
-	static char abuf[MAXDNAME];
-
-	return (res_hostalias(&_res, name, abuf, sizeof abuf));
-}
-
-/* binary backward compatibility for FreeBSD 5.x */
-const char *
-_res_hostalias(const char *name, char *dst, size_t siz) {
-	return (res_hostalias(&_res, name, dst, siz));
-}
-
-#ifdef ultrix
-int
-local_hostname_length(const char *hostname) {
-	int len_host, len_domain;
-
-	if (!*_res.defdname)
-		res_init();
-	len_host = strlen(hostname);
-	len_domain = strlen(_res.defdname);
-	if (len_host > len_domain &&
-	    !strcasecmp(hostname + len_host - len_domain, _res.defdname) &&
-	    hostname[len_host - len_domain - 1] == '.')
-		return (len_host - len_domain - 1);
-	return (0);
-}
-#endif /*ultrix*/
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef res_init
-__weak_reference(__res_init, res_init);
-#undef p_query
-__weak_reference(__p_query, p_query);
-#undef res_mkquery
-__weak_reference(__res_mkquery, res_mkquery);
-#undef res_query
-__weak_reference(__res_query, res_query);
-#undef res_send
-__weak_reference(__res_send, res_send);
-#undef res_close
-__weak_reference(__res_close, _res_close);
-#undef res_search
-__weak_reference(__res_search, res_search);
-#undef res_querydomain
-__weak_reference(__res_querydomain, res_querydomain);
-
-#endif
diff --git a/lib/libc/resolv/res_debug.c b/lib/libc/resolv/res_debug.c
deleted file mode 100644
index aeca8cb..0000000
--- a/lib/libc/resolv/res_debug.c
+++ /dev/null
@@ -1,1248 +0,0 @@
-/*
- * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1996-2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Copyright (c) 1985
- *    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.
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_debug.c 103 2016-01-12 05:32:24Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_debug.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <resolv_mt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) sprintf x
-#endif
-
-extern const char *_res_opcodes[];
-extern const char *_res_sectioncodes[];
-
-/*%
- * Print the current options.
- */
-void
-fp_resstat(const res_state statp, FILE *file) {
-	u_long mask;
-
-	fprintf(file, ";; res options:");
-	for (mask = 1;  mask != 0U;  mask <<= 1)
-		if (statp->options & mask)
-			fprintf(file, " %s", p_option(mask));
-	putc('\n', file);
-}
-
-static void
-do_section(const res_state statp,
-	   ns_msg *handle, ns_sect section,
-	   int pflag, FILE *file)
-{
-	int n, sflag, rrnum;
-	static int buflen = 2048;
-	char *buf;
-	ns_opcode opcode;
-	ns_rr rr;
-
-	/*
-	 * Print answer records.
-	 */
-	sflag = (statp->pfcode & pflag);
-	if (statp->pfcode && !sflag)
-		return;
-
-	buf = malloc(buflen);
-	if (buf == NULL) {
-		fprintf(file, ";; memory allocation failure\n");
-		return;
-	}
-
-	opcode = (ns_opcode) ns_msg_getflag(*handle, ns_f_opcode);
-	rrnum = 0;
-	for (;;) {
-		if (ns_parserr(handle, section, rrnum, &rr)) {
-			if (errno != ENODEV)
-				fprintf(file, ";; ns_parserr: %s\n",
-					strerror(errno));
-			else if (rrnum > 0 && sflag != 0 &&
-				 (statp->pfcode & RES_PRF_HEAD1))
-				putc('\n', file);
-			goto cleanup;
-		}
-		if (rrnum == 0 && sflag != 0 && (statp->pfcode & RES_PRF_HEAD1))
-			fprintf(file, ";; %s SECTION:\n",
-				p_section(section, opcode));
-		if (section == ns_s_qd)
-			fprintf(file, ";;\t%s, type = %s, class = %s\n",
-				ns_rr_name(rr),
-				p_type(ns_rr_type(rr)),
-				p_class(ns_rr_class(rr)));
-		else if (section == ns_s_ar && ns_rr_type(rr) == ns_t_opt) {
-			u_int16_t optcode, optlen, rdatalen = ns_rr_rdlen(rr);
-			uint32_t ttl = ns_rr_ttl(rr);
-
-			fprintf(file,
-				"; EDNS: version: %u, udp=%u, flags=%04x\n",
-				(ttl>>16)&0xff, ns_rr_class(rr), ttl&0xffff);
-
-			while (rdatalen >= 4) {
-				const u_char *cp = ns_rr_rdata(rr);
-				int i;
-
-				GETSHORT(optcode, cp);
-				GETSHORT(optlen, cp);
-
-				if (optcode == NS_OPT_NSID) {
-					fputs("; NSID: ", file);
-					if (optlen == 0) {
-						fputs("; NSID\n", file);
-					} else {
-						fputs("; NSID: ", file);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%02x ",
-								cp[i]);
-						fputs(" (",file);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%c",
-								isprint(cp[i])?
-								cp[i] : '.');
-						fputs(")\n", file);
-					}
-				} else {
-					if (optlen == 0) {
-						fprintf(file, "; OPT=%u\n",
-							optcode);
-					} else {
-						fprintf(file, "; OPT=%u: ",
-							optcode);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%02x ",
-								cp[i]);
-						fputs(" (",file);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%c",
-								isprint(cp[i]) ?
-									cp[i] : '.');
-						fputs(")\n", file);
-					}
-				}
-				rdatalen -= 4 + optlen;
-			}
-		} else {
-			n = ns_sprintrr(handle, &rr, NULL, NULL,
-					buf, buflen);
-			if (n < 0) {
-				if (errno == ENOSPC) {
-					free(buf);
-					buf = NULL;
-					if (buflen < 131072)
-						buf = malloc(buflen += 1024);
-					if (buf == NULL) {
-						fprintf(file,
-					      ";; memory allocation failure\n");
-					      return;
-					}
-					continue;
-				}
-				fprintf(file, ";; ns_sprintrr: %s\n",
-					strerror(errno));
-				goto cleanup;
-			}
-			fputs(buf, file);
-			fputc('\n', file);
-		}
-		rrnum++;
-	}
- cleanup:
-	if (buf != NULL)
-		free(buf);
-}
-
-/*%
- * Print the contents of a query.
- * This is intended to be primarily a debugging routine.
- */
-void
-res_pquery(const res_state statp, const u_char *msg, int len, FILE *file) {
-	ns_msg handle;
-	int qdcount, ancount, nscount, arcount;
-	u_int opcode, rcode, id;
-
-	if (ns_initparse(msg, len, &handle) < 0) {
-		fprintf(file, ";; ns_initparse: %s\n", strerror(errno));
-		return;
-	}
-	opcode = ns_msg_getflag(handle, ns_f_opcode);
-	rcode = ns_msg_getflag(handle, ns_f_rcode);
-	id = ns_msg_id(handle);
-	qdcount = ns_msg_count(handle, ns_s_qd);
-	ancount = ns_msg_count(handle, ns_s_an);
-	nscount = ns_msg_count(handle, ns_s_ns);
-	arcount = ns_msg_count(handle, ns_s_ar);
-
-	/*
-	 * Print header fields.
-	 */
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEADX) || rcode)
-		fprintf(file,
-			";; ->>HEADER<<- opcode: %s, status: %s, id: %d\n",
-			_res_opcodes[opcode], p_rcode(rcode), id);
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEADX))
-		putc(';', file);
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEAD2)) {
-		fprintf(file, "; flags:");
-		if (ns_msg_getflag(handle, ns_f_qr))
-			fprintf(file, " qr");
-		if (ns_msg_getflag(handle, ns_f_aa))
-			fprintf(file, " aa");
-		if (ns_msg_getflag(handle, ns_f_tc))
-			fprintf(file, " tc");
-		if (ns_msg_getflag(handle, ns_f_rd))
-			fprintf(file, " rd");
-		if (ns_msg_getflag(handle, ns_f_ra))
-			fprintf(file, " ra");
-		if (ns_msg_getflag(handle, ns_f_z))
-			fprintf(file, " ??");
-		if (ns_msg_getflag(handle, ns_f_ad))
-			fprintf(file, " ad");
-		if (ns_msg_getflag(handle, ns_f_cd))
-			fprintf(file, " cd");
-	}
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEAD1)) {
-		fprintf(file, "; %s: %d",
-			p_section(ns_s_qd, opcode), qdcount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_an, opcode), ancount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ns, opcode), nscount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ar, opcode), arcount);
-	}
-	if ((!statp->pfcode) || (statp->pfcode &
-		(RES_PRF_HEADX | RES_PRF_HEAD2 | RES_PRF_HEAD1))) {
-		putc('\n',file);
-	}
-	/*
-	 * Print the various sections.
-	 */
-	do_section(statp, &handle, ns_s_qd, RES_PRF_QUES, file);
-	do_section(statp, &handle, ns_s_an, RES_PRF_ANS, file);
-	do_section(statp, &handle, ns_s_ns, RES_PRF_AUTH, file);
-	do_section(statp, &handle, ns_s_ar, RES_PRF_ADD, file);
-	if (qdcount == 0 && ancount == 0 &&
-	    nscount == 0 && arcount == 0)
-		putc('\n', file);
-}
-
-const u_char *
-p_cdnname(const u_char *cp, const u_char *msg, int len, FILE *file) {
-	char name[MAXDNAME];
-	int n;
-
-	if ((n = dn_expand(msg, msg + len, cp, name, sizeof name)) < 0)
-		return (NULL);
-	if (name[0] == '\0')
-		putc('.', file);
-	else
-		fputs(name, file);
-	return (cp + n);
-}
-
-const u_char *
-p_cdname(const u_char *cp, const u_char *msg, FILE *file) {
-	return (p_cdnname(cp, msg, PACKETSZ, file));
-}
-
-/*%
- * Return a fully-qualified domain name from a compressed name (with
-   length supplied).  */
-
-const u_char *
-p_fqnname(cp, msg, msglen, name, namelen)
-	const u_char *cp, *msg;
-	int msglen;
-	char *name;
-	int namelen;
-{
-	int n, newlen;
-
-	if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
-		return (NULL);
-	newlen = strlen(name);
-	if (newlen == 0 || name[newlen - 1] != '.') {
-		if (newlen + 1 >= namelen)	/*%< Lack space for final dot */
-			return (NULL);
-		else
-			strcpy(name + newlen, ".");
-	}
-	return (cp + n);
-}
-
-/* XXX:	the rest of these functions need to become length-limited, too. */
-
-const u_char *
-p_fqname(const u_char *cp, const u_char *msg, FILE *file) {
-	char name[MAXDNAME];
-	const u_char *n;
-
-	n = p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
-	if (n == NULL)
-		return (NULL);
-	fputs(name, file);
-	return (n);
-}
-
-/*%
- * Names of RR classes and qclasses.  Classes and qclasses are the same, except
- * that C_ANY is a qclass but not a class.  (You can ask for records of class
- * C_ANY, but you can't have any records of that class in the database.)
- */
-const struct res_sym __p_class_syms[] = {
-	{C_IN,		"IN",		(char *)0},
-	{C_CHAOS,	"CH",		(char *)0},
-	{C_CHAOS,	"CHAOS",	(char *)0},
-	{C_HS,		"HS",		(char *)0},
-	{C_HS,		"HESIOD",	(char *)0},
-	{C_ANY,		"ANY",		(char *)0},
-	{C_NONE,	"NONE",		(char *)0},
-	{C_IN, 		(char *)0,	(char *)0}
-};
-
-/*%
- * Names of message sections.
- */
-static const struct res_sym __p_default_section_syms[] = {
-	{ns_s_qd,	"QUERY",	(char *)0},
-	{ns_s_an,	"ANSWER",	(char *)0},
-	{ns_s_ns,	"AUTHORITY",	(char *)0},
-	{ns_s_ar,	"ADDITIONAL",	(char *)0},
-	{0,		(char *)0,	(char *)0}
-};
-
-static const struct res_sym __p_update_section_syms[] = {
-	{S_ZONE,	"ZONE",		(char *)0},
-	{S_PREREQ,	"PREREQUISITE",	(char *)0},
-	{S_UPDATE,	"UPDATE",	(char *)0},
-	{S_ADDT,	"ADDITIONAL",	(char *)0},
-	{0,		(char *)0,	(char *)0}
-};
-
-const struct res_sym __p_key_syms[] = {
-	{NS_ALG_MD5RSA,		"RSA",		"RSA KEY with MD5 hash"},
-	{NS_ALG_DH,		"DH",		"Diffie Hellman"},
-	{NS_ALG_DSA,		"DSA",		"Digital Signature Algorithm"},
-	{NS_ALG_EXPIRE_ONLY,	"EXPIREONLY",	"No algorithm"},
-	{NS_ALG_PRIVATE_OID,	"PRIVATE",	"Algorithm obtained from OID"},
-	{0,			NULL,		NULL}
-};
-
-const struct res_sym __p_cert_syms[] = {
-	{cert_t_pkix,	"PKIX",		"PKIX (X.509v3) Certificate"},
-	{cert_t_spki,	"SPKI",		"SPKI certificate"},
-	{cert_t_pgp,	"PGP",		"PGP certificate"},
-	{cert_t_url,	"URL",		"URL Private"},
-	{cert_t_oid,	"OID",		"OID Private"},
-	{0,		NULL,		NULL}
-};
-
-/*%
- * Names of RR types and qtypes.  Types and qtypes are the same, except
- * that T_ANY is a qtype but not a type.  (You can ask for records of type
- * T_ANY, but you can't have any records of that type in the database.)
- */
-const struct res_sym __p_type_syms[] = {
-	{ns_t_a,	"A",		"address"},
-	{ns_t_ns,	"NS",		"name server"},
-	{ns_t_md,	"MD",		"mail destination (deprecated)"},
-	{ns_t_mf,	"MF",		"mail forwarder (deprecated)"},
-	{ns_t_cname,	"CNAME",	"canonical name"},
-	{ns_t_soa,	"SOA",		"start of authority"},
-	{ns_t_mb,	"MB",		"mailbox"},
-	{ns_t_mg,	"MG",		"mail group member"},
-	{ns_t_mr,	"MR",		"mail rename"},
-	{ns_t_null,	"NULL",		"null"},
-	{ns_t_wks,	"WKS",		"well-known service (deprecated)"},
-	{ns_t_ptr,	"PTR",		"domain name pointer"},
-	{ns_t_hinfo,	"HINFO",	"host information"},
-	{ns_t_minfo,	"MINFO",	"mailbox information"},
-	{ns_t_mx,	"MX",		"mail exchanger"},
-	{ns_t_txt,	"TXT",		"text"},
-	{ns_t_rp,	"RP",		"responsible person"},
-	{ns_t_afsdb,	"AFSDB",	"DCE or AFS server"},
-	{ns_t_x25,	"X25",		"X25 address"},
-	{ns_t_isdn,	"ISDN",		"ISDN address"},
-	{ns_t_rt,	"RT",		"router"},
-	{ns_t_nsap,	"NSAP",		"nsap address"},
-	{ns_t_nsap_ptr,	"NSAP_PTR",	"domain name pointer"},
-	{ns_t_sig,	"SIG",		"signature"},
-	{ns_t_key,	"KEY",		"key"},
-	{ns_t_px,	"PX",		"mapping information"},
-	{ns_t_gpos,	"GPOS",		"geographical position (withdrawn)"},
-	{ns_t_aaaa,	"AAAA",		"IPv6 address"},
-	{ns_t_loc,	"LOC",		"location"},
-	{ns_t_nxt,	"NXT",		"next valid name (unimplemented)"},
-	{ns_t_eid,	"EID",		"endpoint identifier (unimplemented)"},
-	{ns_t_nimloc,	"NIMLOC",	"NIMROD locator (unimplemented)"},
-	{ns_t_srv,	"SRV",		"server selection"},
-	{ns_t_atma,	"ATMA",		"ATM address (unimplemented)"},
-	{ns_t_naptr,	"NAPTR",	"naptr"},
-	{ns_t_kx,	"KX",		"key exchange"},
-	{ns_t_cert,	"CERT",		"certificate"},
-	{ns_t_a6,	"A",		"IPv6 address (experminental)"},
-	{ns_t_dname,	"DNAME",	"non-terminal redirection"},
-	{ns_t_opt,	"OPT",		"opt"},
-	{ns_t_apl,	"apl",		"apl"},
-	{ns_t_ds,	"DS",		"delegation signer"},
-	{ns_t_sshfp,	"SSFP",		"SSH fingerprint"},
-	{ns_t_ipseckey,	"IPSECKEY",	"IPSEC key"},
-	{ns_t_rrsig,	"RRSIG",	"rrsig"},
-	{ns_t_nsec,	"NSEC",		"nsec"},
-	{ns_t_dnskey,	"DNSKEY",	"DNS key"},
-	{ns_t_dhcid,	"DHCID",       "dynamic host configuration identifier"},
-	{ns_t_nsec3,	"NSEC3",	"nsec3"},
-	{ns_t_nsec3param, "NSEC3PARAM", "NSEC3 parameters"},
-	{ns_t_hip,	"HIP",		"host identity protocol"},
-	{ns_t_spf,	"SPF",		"sender policy framework"},
-	{ns_t_tkey,	"TKEY",		"tkey"},
-	{ns_t_tsig,	"TSIG",		"transaction signature"},
-	{ns_t_ixfr,	"IXFR",		"incremental zone transfer"},
-	{ns_t_axfr,	"AXFR",		"zone transfer"},
-	{ns_t_zxfr,	"ZXFR",		"compressed zone transfer"},
-	{ns_t_mailb,	"MAILB",	"mailbox-related data (deprecated)"},
-	{ns_t_maila,	"MAILA",	"mail agent (deprecated)"},
-	{ns_t_naptr,	"NAPTR",	"URN Naming Authority"},
-	{ns_t_kx,	"KX",		"Key Exchange"},
-	{ns_t_cert,	"CERT",		"Certificate"},
-	{ns_t_a6,	"A6",		"IPv6 Address"},
-	{ns_t_dname,	"DNAME",	"dname"},
-	{ns_t_sink,	"SINK",		"Kitchen Sink (experimental)"},
-	{ns_t_opt,	"OPT",		"EDNS Options"},
-	{ns_t_any,	"ANY",		"\"any\""},
-	{ns_t_dlv,	"DLV",		"DNSSEC look-aside validation"},
-	{0, 		NULL,		NULL}
-};
-
-/*%
- * Names of DNS rcodes.
- */
-const struct res_sym __p_rcode_syms[] = {
-	{ns_r_noerror,	"NOERROR",		"no error"},
-	{ns_r_formerr,	"FORMERR",		"format error"},
-	{ns_r_servfail,	"SERVFAIL",		"server failed"},
-	{ns_r_nxdomain,	"NXDOMAIN",		"no such domain name"},
-	{ns_r_notimpl,	"NOTIMP",		"not implemented"},
-	{ns_r_refused,	"REFUSED",		"refused"},
-	{ns_r_yxdomain,	"YXDOMAIN",		"domain name exists"},
-	{ns_r_yxrrset,	"YXRRSET",		"rrset exists"},
-	{ns_r_nxrrset,	"NXRRSET",		"rrset doesn't exist"},
-	{ns_r_notauth,	"NOTAUTH",		"not authoritative"},
-	{ns_r_notzone,	"NOTZONE",		"Not in zone"},
-	{ns_r_max,	"",			""},
-	{ns_r_badsig,	"BADSIG",		"bad signature"},
-	{ns_r_badkey,	"BADKEY",		"bad key"},
-	{ns_r_badtime,	"BADTIME",		"bad time"},
-	{0, 		NULL,			NULL}
-};
-
-int
-sym_ston(const struct res_sym *syms, const char *name, int *success) {
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (strcasecmp (name, syms->name) == 0) {
-			if (success)
-				*success = 1;
-			return (syms->number);
-		}
-	}
-	if (success)
-		*success = 0;
-	return (syms->number);		/*%< The default value. */
-}
-
-const char *
-sym_ntos(const struct res_sym *syms, int number, int *success) {
-	char *unname = sym_ntos_unname;
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->name);
-		}
-	}
-
-	sprintf(unname, "%d", number);		/*%< XXX nonreentrant */
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-const char *
-sym_ntop(const struct res_sym *syms, int number, int *success) {
-	char *unname = sym_ntop_unname;
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->humanname);
-		}
-	}
-	sprintf(unname, "%d", number);		/*%< XXX nonreentrant */
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-/*%
- * Return a string for the type.
- */
-const char *
-p_type(int type) {
-	int success;
-	const char *result;
-	static char typebuf[20];
-
-	result = sym_ntos(__p_type_syms, type, &success);
-	if (success)
-		return (result);
-	if (type < 0 || type > 0xffff)
-		return ("BADTYPE");
-	sprintf(typebuf, "TYPE%d", type);
-	return (typebuf);
-}
-
-/*%
- * Return a string for the type.
- */
-const char *
-p_section(int section, int opcode) {
-	const struct res_sym *symbols;
-
-	switch (opcode) {
-	case ns_o_update:
-		symbols = __p_update_section_syms;
-		break;
-	default:
-		symbols = __p_default_section_syms;
-		break;
-	}
-	return (sym_ntos(symbols, section, (int *)0));
-}
-
-/*%
- * Return a mnemonic for class.
- */
-const char *
-p_class(int class) {
-	int success;
-	const char *result;
-	static char classbuf[20];
-
-	result = sym_ntos(__p_class_syms, class, &success);
-	if (success)
-		return (result);
-	if (class < 0 || class > 0xffff)
-		return ("BADCLASS");
-	sprintf(classbuf, "CLASS%d", class);
-	return (classbuf);
-}
-
-/*%
- * Return a mnemonic for an option
- */
-const char *
-p_option(u_long option) {
-	char *nbuf = p_option_nbuf;
-
-	switch (option) {
-	case RES_INIT:		return "init";
-	case RES_DEBUG:		return "debug";
-	case RES_AAONLY:	return "aaonly(unimpl)";
-	case RES_USEVC:		return "usevc";
-	case RES_PRIMARY:	return "primry(unimpl)";
-	case RES_IGNTC:		return "igntc";
-	case RES_RECURSE:	return "recurs";
-	case RES_DEFNAMES:	return "defnam";
-	case RES_STAYOPEN:	return "styopn";
-	case RES_DNSRCH:	return "dnsrch";
-	case RES_INSECURE1:	return "insecure1";
-	case RES_INSECURE2:	return "insecure2";
-	case RES_NOALIASES:	return "noaliases";
-	case RES_USE_INET6:	return "inet6";
-#ifdef RES_USE_EDNS0	/*%< KAME extension */
-	case RES_USE_EDNS0:	return "edns0";
-	case RES_NSID:		return "nsid";
-#endif
-#ifdef RES_USE_DNAME
-	case RES_USE_DNAME:	return "dname";
-#endif
-#ifdef RES_USE_DNSSEC
-	case RES_USE_DNSSEC:	return "dnssec";
-#endif
-#ifdef RES_NOTLDQUERY
-	case RES_NOTLDQUERY:	return "no-tld-query";
-#endif
-#ifdef RES_NO_NIBBLE2
-	case RES_NO_NIBBLE2:	return "no-nibble2";
-#endif
-				/* XXX nonreentrant */
-	default:		sprintf(nbuf, "?0x%lx?", (u_long)option);
-				return (nbuf);
-	}
-}
-
-/*%
- * Return a mnemonic for a time to live.
- */
-const char *
-p_time(uint32_t value) {
-	char *nbuf = p_time_nbuf;
-
-	if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0)
-		sprintf(nbuf, "%u", value);
-	return (nbuf);
-}
-
-/*%
- * Return a string for the rcode.
- */
-const char *
-p_rcode(int rcode) {
-	return (sym_ntos(__p_rcode_syms, rcode, (int *)0));
-}
-
-/*%
- * Return a string for a res_sockaddr_union.
- */
-const char *
-p_sockun(union res_sockaddr_union u, char *buf, size_t size) {
-	char ret[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:123.123.123.123"];
-
-	switch (u.sin.sin_family) {
-	case AF_INET:
-		inet_ntop(AF_INET, &u.sin.sin_addr, ret, sizeof ret);
-		break;
-#ifdef HAS_INET6_STRUCTS
-	case AF_INET6:
-		inet_ntop(AF_INET6, &u.sin6.sin6_addr, ret, sizeof ret);
-		break;
-#endif
-	default:
-		sprintf(ret, "[af%d]", u.sin.sin_family);
-		break;
-	}
-	if (size > 0U) {
-		strncpy(buf, ret, size - 1);
-		buf[size - 1] = '0';
-	}
-	return (buf);
-}
-
-/*%
- * routines to convert between on-the-wire RR format and zone file format.
- * Does not contain conversion to/from decimal degrees; divide or multiply
- * by 60*60*1000 for that.
- */
-
-static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
-				      1000000,10000000,100000000,1000000000};
-
-/*% takes an XeY precision/size value, returns a string representation. */
-static const char *
-precsize_ntoa(prec)
-	u_int8_t prec;
-{
-	char *retbuf = precsize_ntoa_retbuf;
-	unsigned long val;
-	int mantissa, exponent;
-
-	mantissa = (int)((prec >> 4) & 0x0f) % 10;
-	exponent = (int)((prec >> 0) & 0x0f) % 10;
-
-	val = mantissa * poweroften[exponent];
-
-	(void) sprintf(retbuf, "%lu.%.2lu", val/100, val%100);
-	return (retbuf);
-}
-
-/*% converts ascii size/precision X * 10**Y(cm) to 0xXY.  moves pointer.  */
-static u_int8_t
-precsize_aton(const char **strptr) {
-	unsigned int mval = 0, cmval = 0;
-	u_int8_t retval = 0;
-	const char *cp;
-	int exponent;
-	int mantissa;
-
-	cp = *strptr;
-
-	while (isdigit((unsigned char)*cp))
-		mval = mval * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/*%< centimeters */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			cmval = (*cp++ - '0') * 10;
-			if (isdigit((unsigned char)*cp)) {
-				cmval += (*cp++ - '0');
-			}
-		}
-	}
-	cmval = (mval * 100) + cmval;
-
-	for (exponent = 0; exponent < 9; exponent++)
-		if (cmval < poweroften[exponent+1])
-			break;
-
-	mantissa = cmval / poweroften[exponent];
-	if (mantissa > 9)
-		mantissa = 9;
-
-	retval = (mantissa << 4) | exponent;
-
-	*strptr = cp;
-
-	return (retval);
-}
-
-/*% converts ascii lat/lon to unsigned encoded 32-bit number.  moves pointer. */
-static uint32_t
-latlon2ul(const char **latlonstrptr, int *which) {
-	const char *cp;
-	uint32_t retval;
-	int deg = 0, min = 0, secs = 0, secsfrac = 0;
-
-	cp = *latlonstrptr;
-
-	while (isdigit((unsigned char)*cp))
-		deg = deg * 10 + (*cp++ - '0');
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
-	if (!(isdigit((unsigned char)*cp)))
-		goto fndhemi;
-
-	while (isdigit((unsigned char)*cp))
-		min = min * 10 + (*cp++ - '0');
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
-	if (!(isdigit((unsigned char)*cp)))
-		goto fndhemi;
-
-	while (isdigit((unsigned char)*cp))
-		secs = secs * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/*%< decimal seconds */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			secsfrac = (*cp++ - '0') * 100;
-			if (isdigit((unsigned char)*cp)) {
-				secsfrac += (*cp++ - '0') * 10;
-				if (isdigit((unsigned char)*cp)) {
-					secsfrac += (*cp++ - '0');
-				}
-			}
-		}
-	}
-
-	while (!isspace((unsigned char)*cp))	/*%< if any trailing garbage */
-		cp++;
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
- fndhemi:
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'E': case 'e':
-		retval = ((unsigned)1<<31)
-			+ (((((deg * 60) + min) * 60) + secs) * 1000)
-			+ secsfrac;
-		break;
-	case 'S': case 's':
-	case 'W': case 'w':
-		retval = ((unsigned)1<<31)
-			- (((((deg * 60) + min) * 60) + secs) * 1000)
-			- secsfrac;
-		break;
-	default:
-		retval = 0;	/*%< invalid value -- indicates error */
-		break;
-	}
-
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'S': case 's':
-		*which = 1;	/*%< latitude */
-		break;
-	case 'E': case 'e':
-	case 'W': case 'w':
-		*which = 2;	/*%< longitude */
-		break;
-	default:
-		*which = 0;	/*%< error */
-		break;
-	}
-
-	cp++;			/*%< skip the hemisphere */
-	while (!isspace((unsigned char)*cp))	/*%< if any trailing garbage */
-		cp++;
-
-	while (isspace((unsigned char)*cp))	/*%< move to next field */
-		cp++;
-
-	*latlonstrptr = cp;
-
-	return (retval);
-}
-
-/*%
- * converts a zone file representation in a string to an RDATA on-the-wire
- * representation. */
-int
-loc_aton(ascii, binary)
-	const char *ascii;
-	u_char *binary;
-{
-	const char *cp, *maxcp;
-	u_char *bcp;
-
-	uint32_t latit = 0, longit = 0, alt = 0;
-	uint32_t lltemp1 = 0, lltemp2 = 0;
-	int altmeters = 0, altfrac = 0, altsign = 1;
-	u_int8_t hp = 0x16;	/*%< default = 1e6 cm = 10000.00m = 10km */
-	u_int8_t vp = 0x13;	/*%< default = 1e3 cm = 10.00m */
-	u_int8_t siz = 0x12;	/*%< default = 1e2 cm = 1.00m */
-	int which1 = 0, which2 = 0;
-
-	cp = ascii;
-	maxcp = cp + strlen(ascii);
-
-	lltemp1 = latlon2ul(&cp, &which1);
-
-	lltemp2 = latlon2ul(&cp, &which2);
-
-	switch (which1 + which2) {
-	case 3:			/*%< 1 + 2, the only valid combination */
-		if ((which1 == 1) && (which2 == 2)) { /*%< normal case */
-			latit = lltemp1;
-			longit = lltemp2;
-		} else if ((which1 == 2) && (which2 == 1)) { /*%< reversed */
-			longit = lltemp1;
-			latit = lltemp2;
-		} else {	/*%< some kind of brokenness */
-			return (0);
-		}
-		break;
-	default:		/*%< we didn't get one of each */
-		return (0);
-	}
-
-	/* altitude */
-	if (*cp == '-') {
-		altsign = -1;
-		cp++;
-	}
-
-	if (*cp == '+')
-		cp++;
-
-	while (isdigit((unsigned char)*cp))
-		altmeters = altmeters * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/*%< decimal meters */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			altfrac = (*cp++ - '0') * 10;
-			if (isdigit((unsigned char)*cp)) {
-				altfrac += (*cp++ - '0');
-			}
-		}
-	}
-
-	alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp)) /*%< if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	siz = precsize_aton(&cp);
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp))	/*%< if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	hp = precsize_aton(&cp);
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp))	/*%< if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	vp = precsize_aton(&cp);
-
- defaults:
-
-	bcp = binary;
-	*bcp++ = (u_int8_t) 0;	/*%< version byte */
-	*bcp++ = siz;
-	*bcp++ = hp;
-	*bcp++ = vp;
-	PUTLONG(latit,bcp);
-	PUTLONG(longit,bcp);
-	PUTLONG(alt,bcp);
-
-	return (16);		/*%< size of RR in octets */
-}
-
-/*% takes an on-the-wire LOC RR and formats it in a human readable format. */
-const char *
-loc_ntoa(binary, ascii)
-	const u_char *binary;
-	char *ascii;
-{
-	static const char *error = "?";
-	static char tmpbuf[sizeof
-"1000 60 60.000 N 1000 60 60.000 W -12345678.00m 90000000.00m 90000000.00m 90000000.00m"];
-	const u_char *cp = binary;
-
-	int latdeg, latmin, latsec, latsecfrac;
-	int longdeg, longmin, longsec, longsecfrac;
-	char northsouth, eastwest;
-	const char *altsign;
-	int altmeters, altfrac;
-
-	const uint32_t referencealt = 100000 * 100;
-
-	int32_t latval, longval, altval;
-	uint32_t templ;
-	u_int8_t sizeval, hpval, vpval, versionval;
-
-	char *sizestr, *hpstr, *vpstr;
-
-	versionval = *cp++;
-
-	if (ascii == NULL)
-		ascii = tmpbuf;
-
-	if (versionval) {
-		(void) sprintf(ascii, "; error: unknown LOC RR version");
-		return (ascii);
-	}
-
-	sizeval = *cp++;
-
-	hpval = *cp++;
-	vpval = *cp++;
-
-	GETLONG(templ, cp);
-	latval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	longval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	if (templ < referencealt) { /*%< below WGS 84 spheroid */
-		altval = referencealt - templ;
-		altsign = "-";
-	} else {
-		altval = templ - referencealt;
-		altsign = "";
-	}
-
-	if (latval < 0) {
-		northsouth = 'S';
-		latval = -latval;
-	} else
-		northsouth = 'N';
-
-	latsecfrac = latval % 1000;
-	latval = latval / 1000;
-	latsec = latval % 60;
-	latval = latval / 60;
-	latmin = latval % 60;
-	latval = latval / 60;
-	latdeg = latval;
-
-	if (longval < 0) {
-		eastwest = 'W';
-		longval = -longval;
-	} else
-		eastwest = 'E';
-
-	longsecfrac = longval % 1000;
-	longval = longval / 1000;
-	longsec = longval % 60;
-	longval = longval / 60;
-	longmin = longval % 60;
-	longval = longval / 60;
-	longdeg = longval;
-
-	altfrac = altval % 100;
-	altmeters = (altval / 100);
-
-	sizestr = strdup(precsize_ntoa(sizeval));
-	hpstr = strdup(precsize_ntoa(hpval));
-	vpstr = strdup(precsize_ntoa(vpval));
-
-	sprintf(ascii,
-	    "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %s%d.%.2dm %sm %sm %sm",
-		latdeg, latmin, latsec, latsecfrac, northsouth,
-		longdeg, longmin, longsec, longsecfrac, eastwest,
-		altsign, altmeters, altfrac,
-		(sizestr != NULL) ? sizestr : error,
-		(hpstr != NULL) ? hpstr : error,
-		(vpstr != NULL) ? vpstr : error);
-
-	if (sizestr != NULL)
-		free(sizestr);
-	if (hpstr != NULL)
-		free(hpstr);
-	if (vpstr != NULL)
-		free(vpstr);
-
-	return (ascii);
-}
-
-
-/*% Return the number of DNS hierarchy levels in the name. */
-int
-dn_count_labels(const char *name) {
-	int i, len, count;
-
-	len = strlen(name);
-	for (i = 0, count = 0; i < len; i++) {
-		/* XXX need to check for \. or use named's nlabels(). */
-		if (name[i] == '.')
-			count++;
-	}
-
-	/* don't count initial wildcard */
-	if (name[0] == '*')
-		if (count)
-			count--;
-
-	/* don't count the null label for root. */
-	/* if terminating '.' not found, must adjust */
-	/* count to include last label */
-	if (len > 0 && name[len-1] != '.')
-		count++;
-	return (count);
-}
-
-/*%
- * Make dates expressed in seconds-since-Jan-1-1970 easy to read.
- * SIG records are required to be printed like this, by the Secure DNS RFC.
- */
-char *
-p_secstodate (u_long secs) {
-	char *output = p_secstodate_output;
-	time_t clock = secs;
-	struct tm *time;
-#ifdef HAVE_TIME_R
-	struct tm res;
-
-	time = gmtime_r(&clock, &res);
-#else
-	time = gmtime(&clock);
-#endif
-	time->tm_year += 1900;
-	time->tm_mon += 1;
-	sprintf(output, "%04d%02d%02d%02d%02d%02d",
-		time->tm_year, time->tm_mon, time->tm_mday,
-		time->tm_hour, time->tm_min, time->tm_sec);
-	return (output);
-}
-
-u_int16_t
-res_nametoclass(const char *buf, int *successp) {
-	unsigned long result;
-	char *endptr;
-	int success;
-
-	result = sym_ston(__p_class_syms, buf, &success);
-	if (success)
-		goto done;
-
-	if (strncasecmp(buf, "CLASS", 5) != 0 ||
-	    !isdigit((unsigned char)buf[5]))
-		goto done;
-	errno = 0;
-	result = strtoul(buf + 5, &endptr, 10);
-	if (errno == 0 && *endptr == '\0' && result <= 0xffffU)
-		success = 1;
- done:
-	if (successp)
-		*successp = success;
-	return (result);
-}
-
-u_int16_t
-res_nametotype(const char *buf, int *successp) {
-	unsigned long result;
-	char *endptr;
-	int success;
-
-	result = sym_ston(__p_type_syms, buf, &success);
-	if (success)
-		goto done;
-
-	if (strncasecmp(buf, "type", 4) != 0 ||
-	    !isdigit((unsigned char)buf[4]))
-		goto done;
-	errno = 0;
-	result = strtoul(buf + 4, &endptr, 10);
-	if (errno == 0 && *endptr == '\0' && result <= 0xffffU)
-		success = 1;
- done:
-	if (successp)
-		*successp = success;
-	return (result);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef fp_resstat
-__weak_reference(__fp_resstat, fp_resstat);
-#undef p_fqnname
-__weak_reference(__p_fqnname, p_fqnname);
-#undef sym_ston
-__weak_reference(__sym_ston, sym_ston);
-#undef sym_ntos
-__weak_reference(__sym_ntos, sym_ntos);
-#undef sym_ntop
-__weak_reference(__sym_ntop, sym_ntop);
-#undef dn_count_labels
-__weak_reference(__dn_count_labels, dn_count_labels);
-#undef p_secstodate
-__weak_reference(__p_secstodate, p_secstodate);
-
-/*! \file */
diff --git a/lib/libc/resolv/res_debug.h b/lib/libc/resolv/res_debug.h
deleted file mode 100644
index 80ce117..0000000
--- a/lib/libc/resolv/res_debug.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD: src/lib/libc/resolv/res_debug.h,v 1.1.1.1.2.1 2006/07/17 10:09:58 ume Exp $
- */
-
-#ifndef _RES_DEBUG_H_
-#define _RES_DEBUG_H_
-
-#ifndef DEBUG
-#   define Dprint(cond, args) /*empty*/
-#   define DprintQ(cond, args, query, size) /*empty*/
-#   define Aerror(statp, file, string, error, address) /*empty*/
-#   define Perror(statp, file, string, error) /*empty*/
-#else
-#   define Dprint(cond, args) if (cond) {fprintf args;} else {}
-#   define DprintQ(cond, args, query, size) if (cond) {\
-			fprintf args;\
-			res_pquery(statp, query, size, stdout);\
-		} else {}
-#endif
-
-#endif /* _RES_DEBUG_H_ */ 
diff --git a/lib/libc/resolv/res_init.c b/lib/libc/resolv/res_init.c
deleted file mode 100644
index 33cf65e..0000000
--- a/lib/libc/resolv/res_init.c
+++ /dev/null
@@ -1,874 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$Id: res_init.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_init.c,v 1.2.2.2 2006/08/07 19:12:26 ume Exp $");
-
-#include "port_before.h"
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <netdb.h>
-
-#include "un-namespace.h"
-
-#include "port_after.h"
-
-/* ensure that sockaddr_in6 and IN6ADDR_ANY_INIT are declared / defined */
-#include <resolv.h>
-
-#include "res_private.h"
-
-/* Options.  Should all be left alone. */
-#define RESOLVSORT
-#define DEBUG
-
-#ifdef SOLARIS2
-#include <sys/systeminfo.h>
-#endif
-
-static void res_setoptions(res_state, const char *, const char *);
-
-#ifdef RESOLVSORT
-static const char sort_mask[] = "/&";
-#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static uint32_t net_mask(struct in_addr);
-#endif
-
-#if !defined(isascii)	/* XXX - could be a function */
-# define isascii(c) (!(c & 0200))
-#endif
-
-/*
- * Resolver state default settings.
- */
-
-/*
- * Set up default settings.  If the configuration file exist, the values
- * there will have precedence.  Otherwise, the server address is set to
- * INADDR_ANY and the default domain name comes from the gethostname().
- *
- * An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
- * rather than INADDR_ANY ("0.0.0.0") as the default name server address
- * since it was noted that INADDR_ANY actually meant ``the first interface
- * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
- * it had to be "up" in order for you to reach your own name server.  It
- * was later decided that since the recommended practice is to always 
- * install local static routes through 127.0.0.1 for all your network
- * interfaces, that we could solve this problem without a code change.
- *
- * The configuration file should always be used, since it is the only way
- * to specify a default domain.  If you are running a server on your local
- * machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
- * in the configuration file.
- *
- * Return 0 if completes successfully, -1 on error
- */
-int
-res_ninit(res_state statp) {
-	extern int __res_vinit(res_state, int);
-
-	return (__res_vinit(statp, 0));
-}
-
-/* This function has to be reachable by res_data.c but not publically. */
-int
-__res_vinit(res_state statp, int preinit) {
-	FILE *fp;
-	char *cp, **pp;
-	int n;
-	char buf[BUFSIZ];
-	int nserv = 0;    /* number of nameserver records read from file */
-	int haveenv = 0;
-	int havesearch = 0;
-#ifdef RESOLVSORT
-	int nsort = 0;
-	char *net;
-#endif
-	int dots;
-	union res_sockaddr_union u[2];
-
-	if (statp->_u._ext.ext != NULL)
-		res_ndestroy(statp);
-
-	if (!preinit) {
-		statp->retrans = RES_TIMEOUT;
-		statp->retry = RES_DFLRETRY;
-		statp->options = RES_DEFAULT;
-		statp->id = res_randomid();
-	}
-
-	memset(u, 0, sizeof(u));
-#ifdef USELOOPBACK
-	u[nserv].sin.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
-#else
-	u[nserv].sin.sin_addr.s_addr = INADDR_ANY;
-#endif
-	u[nserv].sin.sin_family = AF_INET;
-	u[nserv].sin.sin_port = htons(NAMESERVER_PORT);
-#ifdef HAVE_SA_LEN
-	u[nserv].sin.sin_len = sizeof(struct sockaddr_in);
-#endif
-	nserv++;
-#ifdef HAS_INET6_STRUCTS
-#ifdef USELOOPBACK
-	u[nserv].sin6.sin6_addr = in6addr_loopback;
-#else
-	u[nserv].sin6.sin6_addr = in6addr_any;
-#endif
-	u[nserv].sin6.sin6_family = AF_INET6;
-	u[nserv].sin6.sin6_port = htons(NAMESERVER_PORT);
-#ifdef HAVE_SA_LEN
-	u[nserv].sin6.sin6_len = sizeof(struct sockaddr_in6);
-#endif
-	nserv++;
-#endif
-	statp->nscount = 0;
-	statp->ndots = 1;
-	statp->pfcode = 0;
-	statp->_vcsock = -1;
-	statp->_flags = 0;
-	statp->qhook = NULL;
-	statp->rhook = NULL;
-	statp->_u._ext.nscount = 0;
-	statp->_u._ext.ext = malloc(sizeof(*statp->_u._ext.ext));
-	if (statp->_u._ext.ext != NULL) {
-	        memset(statp->_u._ext.ext, 0, sizeof(*statp->_u._ext.ext));
-		statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
-		strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
-		strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
-	} else
-		return (-1);
-#ifdef RESOLVSORT
-	statp->nsort = 0;
-#endif
-	res_setservers(statp, u, nserv);
-
-#ifdef	SOLARIS2
-	/*
-	 * The old libresolv derived the defaultdomain from NIS/NIS+.
-	 * We want to keep this behaviour
-	 */
-	{
-		char buf[sizeof(statp->defdname)], *cp;
-		int ret;
-
-		if ((ret = sysinfo(SI_SRPC_DOMAIN, buf, sizeof(buf))) > 0 &&
-			(unsigned int)ret <= sizeof(buf)) {
-			if (buf[0] == '+')
-				buf[0] = '.';
-			cp = strchr(buf, '.');
-			if (cp == NULL) {
-				if (strlcpy(statp->defdname, buf,
-					sizeof(statp->defdname))
-					>= sizeof(statp->defdname))
-					goto freedata;
-			} else {
-				if (strlcpy(statp->defdname, cp+1,
-					sizeof(statp->defdname))
-					 >= sizeof(statp->defdname))
-					goto freedata;
-			}
-		}
-	}
-#endif	/* SOLARIS2 */
-
-	/* Allow user to override the local domain definition */
-	if (issetugid() == 0 && (cp = getenv("LOCALDOMAIN")) != NULL) {
-		(void)strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
-		statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		haveenv++;
-
-		/*
-		 * Set search list to be blank-separated strings
-		 * from rest of env value.  Permits users of LOCALDOMAIN
-		 * to still have a search list, and anyone to set the
-		 * one that they want to use as an individual (even more
-		 * important now that the rfc1535 stuff restricts searches)
-		 */
-		cp = statp->defdname;
-		pp = statp->dnsrch;
-		*pp++ = cp;
-		for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
-			if (*cp == '\n')	/* silly backwards compat */
-				break;
-			else if (*cp == ' ' || *cp == '\t') {
-				*cp = 0;
-				n = 1;
-			} else if (n) {
-				*pp++ = cp;
-				n = 0;
-				havesearch = 1;
-			}
-		}
-		/* null terminate last domain if there are excess */
-		while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
-			cp++;
-		*cp = '\0';
-		*pp++ = 0;
-	}
-
-#define	MATCH(line, name) \
-	(!strncmp(line, name, sizeof(name) - 1) && \
-	(line[sizeof(name) - 1] == ' ' || \
-	 line[sizeof(name) - 1] == '\t'))
-
-	nserv = 0;
-	if ((fp = fopen(_PATH_RESCONF, "r")) != NULL) {
-	    /* read the config file */
-	    while (fgets(buf, sizeof(buf), fp) != NULL) {
-		/* skip comments */
-		if (*buf == ';' || *buf == '#')
-			continue;
-		/* read default domain name */
-		if (MATCH(buf, "domain")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("domain") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
-		    statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		    if ((cp = strpbrk(statp->defdname, " \t\n")) != NULL)
-			    *cp = '\0';
-		    havesearch = 0;
-		    continue;
-		}
-		/* set search list */
-		if (MATCH(buf, "search")) {
-		    if (haveenv)	/* skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("search") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
-		    statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		    if ((cp = strchr(statp->defdname, '\n')) != NULL)
-			    *cp = '\0';
-		    /*
-		     * Set search list to be blank-separated strings
-		     * on rest of line.
-		     */
-		    cp = statp->defdname;
-		    pp = statp->dnsrch;
-		    *pp++ = cp;
-		    for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
-			    if (*cp == ' ' || *cp == '\t') {
-				    *cp = 0;
-				    n = 1;
-			    } else if (n) {
-				    *pp++ = cp;
-				    n = 0;
-			    }
-		    }
-		    /* null terminate last domain if there are excess */
-		    while (*cp != '\0' && *cp != ' ' && *cp != '\t')
-			    cp++;
-		    *cp = '\0';
-		    *pp++ = 0;
-		    havesearch = 1;
-		    continue;
-		}
-		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < MAXNS) {
-		    struct addrinfo hints, *ai;
-		    char sbuf[NI_MAXSERV];
-		    const size_t minsiz =
-		        sizeof(statp->_u._ext.ext->nsaddrs[0]);
-
-		    cp = buf + sizeof("nameserver") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			cp++;
-		    cp[strcspn(cp, ";# \t\n")] = '\0';
-		    if ((*cp != '\0') && (*cp != '\n')) {
-			memset(&hints, 0, sizeof(hints));
-			hints.ai_family = PF_UNSPEC;
-			hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-			hints.ai_flags = AI_NUMERICHOST;
-			sprintf(sbuf, "%u", NAMESERVER_PORT);
-			if (getaddrinfo(cp, sbuf, &hints, &ai) == 0 &&
-			    ai->ai_addrlen <= minsiz) {
-			    if (statp->_u._ext.ext != NULL) {
-				memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
-				    ai->ai_addr, ai->ai_addrlen);
-			    }
-			    if (ai->ai_addrlen <=
-			        sizeof(statp->nsaddr_list[nserv])) {
-				memcpy(&statp->nsaddr_list[nserv],
-				    ai->ai_addr, ai->ai_addrlen);
-			    } else
-				statp->nsaddr_list[nserv].sin_family = 0;
-			    freeaddrinfo(ai);
-			    nserv++;
-			}
-		    }
-		    continue;
-		}
-#ifdef RESOLVSORT
-		if (MATCH(buf, "sortlist")) {
-		    struct in_addr a;
-		    struct in6_addr a6;
-		    int m, i;
-		    u_char *u;
-		    struct __res_state_ext *ext = statp->_u._ext.ext;
-
-		    cp = buf + sizeof("sortlist") - 1;
-		    while (nsort < MAXRESOLVSORT) {
-			while (*cp == ' ' || *cp == '\t')
-			    cp++;
-			if (*cp == '\0' || *cp == '\n' || *cp == ';')
-			    break;
-			net = cp;
-			while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
-			       isascii(*cp) && !isspace((unsigned char)*cp))
-				cp++;
-			n = *cp;
-			*cp = 0;
-			if (inet_aton(net, &a)) {
-			    statp->sort_list[nsort].addr = a;
-			    if (ISSORTMASK(n)) {
-				*cp++ = n;
-				net = cp;
-				while (*cp && *cp != ';' &&
-					isascii(*cp) &&
-					!isspace((unsigned char)*cp))
-				    cp++;
-				n = *cp;
-				*cp = 0;
-				if (inet_aton(net, &a)) {
-				    statp->sort_list[nsort].mask = a.s_addr;
-				} else {
-				    statp->sort_list[nsort].mask = 
-					net_mask(statp->sort_list[nsort].addr);
-				}
-			    } else {
-				statp->sort_list[nsort].mask = 
-				    net_mask(statp->sort_list[nsort].addr);
-			    }
-			    ext->sort_list[nsort].af = AF_INET;
-			    ext->sort_list[nsort].addr.ina =
-				statp->sort_list[nsort].addr;
-			    ext->sort_list[nsort].mask.ina.s_addr =
-				statp->sort_list[nsort].mask;
-			    nsort++;
-			}
-			else if (inet_pton(AF_INET6, net, &a6) == 1) {
-
-			    ext->sort_list[nsort].af = AF_INET6;
-			    ext->sort_list[nsort].addr.in6a = a6;
-			    u = (u_char *)&ext->sort_list[nsort].mask.in6a;
-			    *cp++ = n;
-			    net = cp;
-			    while (*cp && *cp != ';' &&
-				    isascii(*cp) && !isspace(*cp))
-				cp++;
-			    m = n;
-			    n = *cp;
-			    *cp = 0;
-			    switch (m) {
-			    case '/':
-				m = atoi(net);
-				break;
-			    case '&':
-				if (inet_pton(AF_INET6, net, u) == 1) {
-				    m = -1;
-				    break;
-				}
-				/*FALLTHROUGH*/
-			    default:
-				m = sizeof(struct in6_addr) * CHAR_BIT;
-				break;
-			    }
-			    if (m >= 0) {
-				for (i = 0; i < sizeof(struct in6_addr); i++) {
-				    if (m <= 0) {
-					*u = 0;
-				    } else {
-					m -= CHAR_BIT;
-					*u = (u_char)~0;
-					if (m < 0)
-					    *u <<= -m;
-				    }
-				    u++;
-				}
-			    }
-			    statp->sort_list[nsort].addr.s_addr =
-				(uint32_t)0xffffffff;
-			    statp->sort_list[nsort].mask =
-				(uint32_t)0xffffffff;
-			    nsort++;
-			}
-			*cp = n;
-		    }
-		    continue;
-		}
-#endif
-		if (MATCH(buf, "options")) {
-		    res_setoptions(statp, buf + sizeof("options") - 1, "conf");
-		    continue;
-		}
-	    }
-	    if (nserv > 0) 
-		statp->nscount = nserv;
-#ifdef RESOLVSORT
-	    statp->nsort = nsort;
-#endif
-	    (void) fclose(fp);
-	}
-/*
- * Last chance to get a nameserver.  This should not normally
- * be necessary
- */
-#ifdef NO_RESOLV_CONF
-	if(nserv == 0)
-		nserv = get_nameservers(statp);
-#endif
-
-	if (statp->defdname[0] == 0 &&
-	    gethostname(buf, sizeof(statp->defdname) - 1) == 0 &&
-	    (cp = strchr(buf, '.')) != NULL)
-		strcpy(statp->defdname, cp + 1);
-
-	/* find components of local domain that might be searched */
-	if (havesearch == 0) {
-		pp = statp->dnsrch;
-		*pp++ = statp->defdname;
-		*pp = NULL;
-
-		dots = 0;
-		for (cp = statp->defdname; *cp; cp++)
-			dots += (*cp == '.');
-
-		cp = statp->defdname;
-		while (pp < statp->dnsrch + MAXDFLSRCH) {
-			if (dots < LOCALDOMAINPARTS)
-				break;
-			cp = strchr(cp, '.') + 1;    /* we know there is one */
-			*pp++ = cp;
-			dots--;
-		}
-		*pp = NULL;
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG) {
-			printf(";; res_init()... default dnsrch list:\n");
-			for (pp = statp->dnsrch; *pp; pp++)
-				printf(";;\t%s\n", *pp);
-			printf(";;\t..END..\n");
-		}
-#endif
-	}
-
-	if (issetugid())
-		statp->options |= RES_NOALIASES;
-	else if ((cp = getenv("RES_OPTIONS")) != NULL)
-		res_setoptions(statp, cp, "env");
-	statp->options |= RES_INIT;
-	return (0);
-
-#ifdef	SOLARIS2
- freedata:
-	if (statp->_u._ext.ext != NULL) {
-		free(statp->_u._ext.ext);
-		statp->_u._ext.ext = NULL;
-	}
-	return (-1);
-#endif
-}
-
-static void
-res_setoptions(res_state statp, const char *options, const char *source)
-{
-	const char *cp = options;
-	int i;
-#ifndef _LIBC
-	struct __res_state_ext *ext = statp->_u._ext.ext;
-#endif
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_setoptions(\"%s\", \"%s\")...\n",
-		       options, source);
-#endif
-	while (*cp) {
-		/* skip leading and inner runs of spaces */
-		while (*cp == ' ' || *cp == '\t')
-			cp++;
-		/* search for and process individual options */
-		if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-			i = atoi(cp + sizeof("ndots:") - 1);
-			if (i <= RES_MAXNDOTS)
-				statp->ndots = i;
-			else
-				statp->ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\tndots=%d\n", statp->ndots);
-#endif
-		} else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) {
-			i = atoi(cp + sizeof("timeout:") - 1);
-			if (i <= RES_MAXRETRANS)
-				statp->retrans = i;
-			else
-				statp->retrans = RES_MAXRETRANS;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\ttimeout=%d\n", statp->retrans);
-#endif
-#ifdef	SOLARIS2
-		} else if (!strncmp(cp, "retrans:", sizeof("retrans:") - 1)) {
-			/*
-		 	 * For backward compatibility, 'retrans' is
-		 	 * supported as an alias for 'timeout', though
-		 	 * without an imposed maximum.
-		 	 */
-			statp->retrans = atoi(cp + sizeof("retrans:") - 1);
-		} else if (!strncmp(cp, "retry:", sizeof("retry:") - 1)){
-			/*
-			 * For backward compatibility, 'retry' is
-			 * supported as an alias for 'attempts', though
-			 * without an imposed maximum.
-			 */
-			statp->retry = atoi(cp + sizeof("retry:") - 1);
-#endif	/* SOLARIS2 */
-		} else if (!strncmp(cp, "attempts:", sizeof("attempts:") - 1)){
-			i = atoi(cp + sizeof("attempts:") - 1);
-			if (i <= RES_MAXRETRY)
-				statp->retry = i;
-			else
-				statp->retry = RES_MAXRETRY;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\tattempts=%d\n", statp->retry);
-#endif
-		} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-			if (!(statp->options & RES_DEBUG)) {
-				printf(";; res_setoptions(\"%s\", \"%s\")..\n",
-				       options, source);
-				statp->options |= RES_DEBUG;
-			}
-			printf(";;\tdebug\n");
-#endif
-		} else if (!strncmp(cp, "no_tld_query",
-				    sizeof("no_tld_query") - 1) ||
-			   !strncmp(cp, "no-tld-query",
-				    sizeof("no-tld-query") - 1)) {
-			statp->options |= RES_NOTLDQUERY;
-		} else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-			statp->options |= RES_USE_INET6;
-		} else if (!strncmp(cp, "insecure1", sizeof("insecure1") - 1)) {
-		       statp->options |= RES_INSECURE1;
-		} else if (!strncmp(cp, "insecure2", sizeof("insecure2") - 1)) {
-		       statp->options |= RES_INSECURE2;
-		} else if (!strncmp(cp, "rotate", sizeof("rotate") - 1)) {
-			statp->options |= RES_ROTATE;
-		} else if (!strncmp(cp, "no-check-names",
-				    sizeof("no-check-names") - 1)) {
-			statp->options |= RES_NOCHECKNAME;
-		}
-#ifdef RES_USE_EDNS0
-		else if (!strncmp(cp, "edns0", sizeof("edns0") - 1)) {
-			statp->options |= RES_USE_EDNS0;
-		}
-#endif
-#ifndef _LIBC
-		else if (!strncmp(cp, "dname", sizeof("dname") - 1)) {
-			statp->options |= RES_USE_DNAME;
-		}
-		else if (!strncmp(cp, "nibble:", sizeof("nibble:") - 1)) {
-			if (ext == NULL)
-				goto skip;
-			cp += sizeof("nibble:") - 1;
-			i = MIN(strcspn(cp, " \t"), sizeof(ext->nsuffix) - 1);
-			strncpy(ext->nsuffix, cp, i);
-			ext->nsuffix[i] = '\0';
-		}
-		else if (!strncmp(cp, "nibble2:", sizeof("nibble2:") - 1)) {
-			if (ext == NULL)
-				goto skip;
-			cp += sizeof("nibble2:") - 1;
-			i = MIN(strcspn(cp, " \t"), sizeof(ext->nsuffix2) - 1);
-			strncpy(ext->nsuffix2, cp, i);
-			ext->nsuffix2[i] = '\0';
-		}
-		else if (!strncmp(cp, "v6revmode:", sizeof("v6revmode:") - 1)) {
-			cp += sizeof("v6revmode:") - 1;
-			/* "nibble" and "bitstring" used to be valid */
-			if (!strncmp(cp, "single", sizeof("single") - 1)) {
-				statp->options |= RES_NO_NIBBLE2;
-			} else if (!strncmp(cp, "both", sizeof("both") - 1)) {
-				statp->options &=
-					 ~RES_NO_NIBBLE2;
-			}
-		}
-#endif
-		else {
-			/* XXX - print a warning here? */
-		}
-#ifndef _LIBC
-   skip:
-#endif
-		/* skip to next run of spaces */
-		while (*cp && *cp != ' ' && *cp != '\t')
-			cp++;
-	}
-}
-
-#ifdef RESOLVSORT
-/* XXX - should really support CIDR which means explicit masks always. */
-static uint32_t
-net_mask(in)		/* XXX - should really use system's version of this */
-	struct in_addr in;
-{
-	uint32_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (htonl(IN_CLASSA_NET));
-	else if (IN_CLASSB(i))
-		return (htonl(IN_CLASSB_NET));
-	return (htonl(IN_CLASSC_NET));
-}
-#endif
-
-u_int
-res_randomid(void) {
-	struct timeval now;
-
-	gettimeofday(&now, NULL);
-	return (0xffff & (now.tv_sec ^ now.tv_usec ^ getpid()));
-}
-
-/*
- * This routine is for closing the socket if a virtual circuit is used and
- * the program wants to close it.  This provides support for endhostent()
- * which expects to close the socket.
- *
- * This routine is not expected to be user visible.
- */
-void
-res_nclose(res_state statp) {
-	int ns;
-
-	if (statp->_vcsock >= 0) { 
-		(void) _close(statp->_vcsock);
-		statp->_vcsock = -1;
-		statp->_flags &= ~(RES_F_VC | RES_F_CONN);
-	}
-	for (ns = 0; ns < statp->_u._ext.nscount; ns++) {
-		if (statp->_u._ext.nssocks[ns] != -1) {
-			(void) _close(statp->_u._ext.nssocks[ns]);
-			statp->_u._ext.nssocks[ns] = -1;
-		}
-	}
-}
-
-void
-res_ndestroy(res_state statp) {
-	res_nclose(statp);
-	if (statp->_u._ext.ext != NULL)
-		free(statp->_u._ext.ext);
-	statp->options &= ~RES_INIT;
-	statp->_u._ext.ext = NULL;
-}
-
-#ifndef _LIBC
-const char *
-res_get_nibblesuffix(res_state statp) {
-	if (statp->_u._ext.ext)
-		return (statp->_u._ext.ext->nsuffix);
-	return ("ip6.arpa");
-}
-
-const char *
-res_get_nibblesuffix2(res_state statp) {
-	if (statp->_u._ext.ext)
-		return (statp->_u._ext.ext->nsuffix2);
-	return ("ip6.int");
-}
-#endif
-
-void
-res_setservers(res_state statp, const union res_sockaddr_union *set, int cnt) {
-	int i, nserv;
-	size_t size;
-
-	/* close open servers */
-	res_nclose(statp);
-
-	/* cause rtt times to be forgotten */
-	statp->_u._ext.nscount = 0;
-
-	nserv = 0;
-	for (i = 0; i < cnt && nserv < MAXNS; i++) {
-		switch (set->sin.sin_family) {
-		case AF_INET:
-			size = sizeof(set->sin);
-			if (statp->_u._ext.ext)
-				memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
-					&set->sin, size);
-			if (size <= sizeof(statp->nsaddr_list[nserv]))
-				memcpy(&statp->nsaddr_list[nserv],
-					&set->sin, size);
-			else
-				statp->nsaddr_list[nserv].sin_family = 0;
-			nserv++;
-			break;
-
-#ifdef HAS_INET6_STRUCTS
-		case AF_INET6:
-			size = sizeof(set->sin6);
-			if (statp->_u._ext.ext)
-				memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
-					&set->sin6, size);
-			if (size <= sizeof(statp->nsaddr_list[nserv]))
-				memcpy(&statp->nsaddr_list[nserv],
-					&set->sin6, size);
-			else
-				statp->nsaddr_list[nserv].sin_family = 0;
-			nserv++;
-			break;
-#endif
-
-		default:
-			break;
-		}
-		set++;
-	}
-	statp->nscount = nserv;
-	
-}
-
-int
-res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) {
-	int i;
-	size_t size;
-	u_int16_t family;
-
-	for (i = 0; i < statp->nscount && i < cnt; i++) {
-		if (statp->_u._ext.ext)
-			family = statp->_u._ext.ext->nsaddrs[i].sin.sin_family;
-		else 
-			family = statp->nsaddr_list[i].sin_family;
-
-		switch (family) {
-		case AF_INET:
-			size = sizeof(set->sin);
-			if (statp->_u._ext.ext)
-				memcpy(&set->sin,
-				       &statp->_u._ext.ext->nsaddrs[i],
-				       size);
-			else
-				memcpy(&set->sin, &statp->nsaddr_list[i],
-				       size);
-			break;
-
-#ifdef HAS_INET6_STRUCTS
-		case AF_INET6:
-			size = sizeof(set->sin6);
-			if (statp->_u._ext.ext)
-				memcpy(&set->sin6,
-				       &statp->_u._ext.ext->nsaddrs[i],
-				       size);
-			else
-				memcpy(&set->sin6, &statp->nsaddr_list[i],
-				       size);
-			break;
-#endif
-
-		default:
-			set->sin.sin_family = 0;
-			break;
-		}
-		set++;
-	}
-	return (statp->nscount);
-}
diff --git a/lib/libc/resolv/res_mkquery.c b/lib/libc/resolv/res_mkquery.c
deleted file mode 100644
index 18a1fd2..0000000
--- a/lib/libc/resolv/res_mkquery.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_mkquery.c,v 1.2.2.1 2006/07/17 10:09:58 ume Exp $");
-
-#include "port_before.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include "port_after.h"
-
-/* Options.  Leave them on. */
-#define DEBUG
-
-extern const char *_res_opcodes[];
-
-/*
- * Form all types of queries.
- * Returns the size of the result or -1.
- */
-int
-res_nmkquery(res_state statp,
-	     int op,			/* opcode of query */
-	     const char *dname,		/* domain name */
-	     int class, int type,	/* class and type of query */
-	     const u_char *data,	/* resource record data */
-	     int datalen,		/* length of data */
-	     const u_char *newrr_in,	/* new rr for modify or append */
-	     u_char *buf,		/* buffer to put query */
-	     int buflen)		/* size of buffer */
-{
-	HEADER *hp;
-	u_char *cp, *ep;
-	int n;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	UNUSED(newrr_in);
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_nmkquery(%s, %s, %s, %s)\n",
-		       _res_opcodes[op], dname, p_class(class), p_type(type));
-#endif
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	hp->id = htons(++statp->id);
-	hp->opcode = op;
-	hp->rd = (statp->options & RES_RECURSE) != 0U;
-	hp->rcode = NOERROR;
-	cp = buf + HFIXEDSZ;
-	ep = buf + buflen;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-	/*
-	 * perform opcode specific processing
-	 */
-	switch (op) {
-	case QUERY:	/*FALLTHROUGH*/
-	case NS_NOTIFY_OP:
-		if (ep - cp < QFIXEDSZ)
-			return (-1);
-		if ((n = dn_comp(dname, cp, ep - cp - QFIXEDSZ, dnptrs,
-		    lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		ns_put16(type, cp);
-		cp += INT16SZ;
-		ns_put16(class, cp);
-		cp += INT16SZ;
-		hp->qdcount = htons(1);
-		if (op == QUERY || data == NULL)
-			break;
-		/*
-		 * Make an additional record for completion domain.
-		 */
-		if ((ep - cp) < RRFIXEDSZ)
-			return (-1);
-		n = dn_comp((const char *)data, cp, ep - cp - RRFIXEDSZ,
-			    dnptrs, lastdnptr);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		ns_put16(T_NULL, cp);
-		cp += INT16SZ;
-		ns_put16(class, cp);
-		cp += INT16SZ;
-		ns_put32(0, cp);
-		cp += INT32SZ;
-		ns_put16(0, cp);
-		cp += INT16SZ;
-		hp->arcount = htons(1);
-		break;
-
-	case IQUERY:
-		/*
-		 * Initialize answer section
-		 */
-		if (ep - cp < 1 + RRFIXEDSZ + datalen)
-			return (-1);
-		*cp++ = '\0';	/* no domain name */
-		ns_put16(type, cp);
-		cp += INT16SZ;
-		ns_put16(class, cp);
-		cp += INT16SZ;
-		ns_put32(0, cp);
-		cp += INT32SZ;
-		ns_put16(datalen, cp);
-		cp += INT16SZ;
-		if (datalen) {
-			memcpy(cp, data, datalen);
-			cp += datalen;
-		}
-		hp->ancount = htons(1);
-		break;
-
-	default:
-		return (-1);
-	}
-	return (cp - buf);
-}
-
-#ifdef RES_USE_EDNS0
-/* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */
-#ifndef T_OPT
-#define T_OPT	41
-#endif
-
-int
-res_nopt(res_state statp,
-	 int n0,		/* current offset in buffer */
-	 u_char *buf,		/* buffer to put query */
-	 int buflen,		/* size of buffer */
-	 int anslen)		/* UDP answer buffer size */
-{
-	HEADER *hp;
-	u_char *cp, *ep;
-	u_int16_t flags = 0;
-
-#ifdef DEBUG
-	if ((statp->options & RES_DEBUG) != 0U)
-		printf(";; res_nopt()\n");
-#endif
-
-	hp = (HEADER *) buf;
-	cp = buf + n0;
-	ep = buf + buflen;
-
-	if ((ep - cp) < 1 + RRFIXEDSZ)
-		return (-1);
-
-	*cp++ = 0;	/* "." */
-
-	ns_put16(T_OPT, cp);	/* TYPE */
-	cp += INT16SZ;
-	if (anslen > 0xffff)
-		anslen = 0xffff;		/* limit to 16bit value */
-	ns_put16(anslen & 0xffff, cp);	/* CLASS = UDP payload size */
-	cp += INT16SZ;
-	*cp++ = NOERROR;	/* extended RCODE */
-	*cp++ = 0;		/* EDNS version */
-	if (statp->options & RES_USE_DNSSEC) {
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; res_opt()... ENDS0 DNSSEC\n");
-#endif
-		flags |= NS_OPT_DNSSEC_OK;
-	}
-	ns_put16(flags, cp);
-	cp += INT16SZ;
-	ns_put16(0, cp);	/* RDLEN */
-	cp += INT16SZ;
-	hp->arcount = htons(ntohs(hp->arcount) + 1);
-
-	return (cp - buf);
-}
-#endif
diff --git a/lib/libc/resolv/res_private.h b/lib/libc/resolv/res_private.h
deleted file mode 100644
index 06289b5..0000000
--- a/lib/libc/resolv/res_private.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $FreeBSD: src/lib/libc/resolv/res_private.h,v 1.1.1.1.2.1 2006/07/17 10:09:58 ume Exp $ */
-
-#ifndef res_private_h
-#define res_private_h
-
-struct __res_state_ext {
-	union res_sockaddr_union nsaddrs[MAXNS];
-	struct sort_list {
-		int     af;
-		union {
-			struct in_addr  ina;
-			struct in6_addr in6a;
-		} addr, mask;
-	} sort_list[MAXRESOLVSORT];
-	char nsuffix[64];
-	char nsuffix2[64];
-};
-
-extern int
-res_ourserver_p(const res_state statp, const struct sockaddr *sa);
-
-#endif
diff --git a/lib/libc/resolv/res_query.c b/lib/libc/resolv/res_query.c
deleted file mode 100644
index 9850ad1..0000000
--- a/lib/libc/resolv/res_query.c
+++ /dev/null
@@ -1,485 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_query.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_query.c,v 1.3.2.1 2006/07/17 10:09:58 ume Exp $");
-
-#include "port_before.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "port_after.h"
-
-/* Options.  Leave them on. */
-#define DEBUG
-
-#if PACKETSZ > 1024
-#define MAXPACKET	PACKETSZ
-#else
-#define MAXPACKET	1024
-#endif
-
-/*
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in H_ERRNO.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-int
-res_nquery(res_state statp,
-	   const char *name,	/* domain name */
-	   int class, int type,	/* class and type of query */
-	   u_char *answer,	/* buffer to put answer */
-	   int anslen)		/* size of answer buffer */
-{
-	u_char buf[MAXPACKET];
-	HEADER *hp = (HEADER *) answer;
-	int n;
-	u_int oflags;
-
-	oflags = statp->_flags;
-
-again:
-	hp->rcode = NOERROR;	/* default */
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-	n = res_nmkquery(statp, QUERY, name, class, type, NULL, 0, NULL,
-			 buf, sizeof(buf));
-#ifdef RES_USE_EDNS0
-	if (n > 0 && (statp->_flags & RES_F_EDNS0ERR) == 0 &&
-	    (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U)
-		n = res_nopt(statp, n, buf, sizeof(buf), anslen);
-#endif
-	if (n <= 0) {
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; res_query: mkquery failed\n");
-#endif
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (n);
-	}
-	n = res_nsend(statp, buf, n, answer, anslen);
-	if (n < 0) {
-#ifdef RES_USE_EDNS0
-		/* if the query choked with EDNS0, retry without EDNS0 */
-		if ((statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U &&
-		    ((oflags ^ statp->_flags) & RES_F_EDNS0ERR) != 0) {
-			statp->_flags |= RES_F_EDNS0ERR;
-			if (statp->options & RES_DEBUG)
-				printf(";; res_nquery: retry without EDNS0\n");
-			goto again;
-		}
-#endif
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; res_query: send error\n");
-#endif
-		RES_SET_H_ERRNO(statp, TRY_AGAIN);
-		return (n);
-	}
-
-	if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; rcode = (%s), counts = an:%d ns:%d ar:%d\n",
-			       p_rcode(hp->rcode),
-			       ntohs(hp->ancount),
-			       ntohs(hp->nscount),
-			       ntohs(hp->arcount));
-#endif
-		switch (hp->rcode) {
-		case NXDOMAIN:
-			RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-			break;
-		case SERVFAIL:
-			RES_SET_H_ERRNO(statp, TRY_AGAIN);
-			break;
-		case NOERROR:
-			RES_SET_H_ERRNO(statp, NO_DATA);
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			break;
-		}
-		return (-1);
-	}
-	return (n);
-}
-
-/*
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in H_ERRNO.
- */
-int
-res_nsearch(res_state statp,
-	    const char *name,	/* domain name */
-	    int class, int type,	/* class and type of query */
-	    u_char *answer,	/* buffer to put answer */
-	    int anslen)		/* size of answer */
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *) answer;
-	char tmp[NS_MAXDNAME];
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, root_on_list = 0;
-	int tried_as_is = 0;
-	int searched = 0;
-
-	errno = 0;
-	RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);  /* True if we never query. */
-
-	dots = 0;
-	for (cp = name; *cp != '\0'; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/* If there aren't any dots, it could be a user-level alias. */
-	if (!dots && (cp = res_hostalias(statp, name, tmp, sizeof tmp))!= NULL)
-		return (res_nquery(statp, cp, class, type, answer, anslen));
-
-	/*
-	 * If there are enough dots in the name, let's just give it a
-	 * try 'as is'. The threshold can be set with the "ndots" option.
-	 * Also, query 'as is', if there is a trailing dot in the name.
-	 */
-	saved_herrno = -1;
-	if (dots >= statp->ndots || trailing_dot) {
-		ret = res_nquerydomain(statp, name, NULL, class, type,
-					 answer, anslen);
-		if (ret > 0 || trailing_dot)
-			return (ret);
-		if (errno == ECONNREFUSED) {
-			RES_SET_H_ERRNO(statp, TRY_AGAIN);
-			return (-1);
-		}
-		switch (statp->res_h_errno) {
-		case NO_DATA:
-		case HOST_NOT_FOUND:
-			break;
-		case TRY_AGAIN:
-			if (hp->rcode == SERVFAIL)
-				break;
-			/* FALLTHROUGH */
-		default:
-			return (-1);
-		}
-		saved_herrno = statp->res_h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (statp->options & RES_DEFNAMES) != 0U) ||
-	    (dots && !trailing_dot && (statp->options & RES_DNSRCH) != 0U)) {
-		int done = 0;
-
-		for (domain = (const char * const *)statp->dnsrch;
-		     *domain && !done;
-		     domain++) {
-			searched = 1;
-
-			if (domain[0][0] == '\0' ||
-			    (domain[0][0] == '.' && domain[0][1] == '\0'))
-				root_on_list++;
-
-			if (root_on_list && tried_as_is)
-				continue;
-
-			ret = res_nquerydomain(statp, name, *domain,
-					       class, type,
-					       answer, anslen);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				RES_SET_H_ERRNO(statp, TRY_AGAIN);
-				return (-1);
-			}
-
-			switch (statp->res_h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				/*
-				 * This can occur due to a server failure
-				 * (that is, all listed servers have failed),
-				 * or all listed servers have timed out.
-				 * ((HEADER *)answer)->rcode may not be set
-				 * to SERVFAIL in the case of a timeout.
-				 *
-				 * Either way we must return TRY_AGAIN in
-				 * order to avoid non-deterministic
-				 * return codes.
-				 * For example, loaded name servers or races
-				 * against network startup/validation (dhcp,
-				 * ppp, etc) can cause the search to timeout
-				 * on one search element, e.g. 'fu.bar.com',
-				 * and return a definitive failure on the
-				 * next search element, e.g. 'fu.'.
-				 */
-				got_servfail++;
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-
-			/* if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if ((statp->options & RES_DNSRCH) == 0U)
-				done++;
-		}
-	}
-
-	switch (statp->res_h_errno) {
-	case NO_DATA:
-	case HOST_NOT_FOUND:
-		break;
-	case TRY_AGAIN:
-		if (hp->rcode == SERVFAIL)
-			break;
-		/* FALLTHROUGH */
-	default:
-		goto giveup;
-	}
-
-	/*
-	 * If the query has not already been tried as is then try it
-	 * unless RES_NOTLDQUERY is set and there were no dots.
-	 */
-	if ((dots || !searched || (statp->options & RES_NOTLDQUERY) == 0U) &&
-	    !(tried_as_is || root_on_list)) {
-		ret = res_nquerydomain(statp, name, NULL, class, type,
-				       answer, anslen);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/* if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's H_ERRNO
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless H_ERRNO, that being the one from
-	 * the last DNSRCH we did.
-	 */
-giveup:
-	if (saved_herrno != -1)
-		RES_SET_H_ERRNO(statp, saved_herrno);
-	else if (got_nodata)
-		RES_SET_H_ERRNO(statp, NO_DATA);
-	else if (got_servfail)
-		RES_SET_H_ERRNO(statp, TRY_AGAIN);
-	return (-1);
-}
-
-/*
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-int
-res_nquerydomain(res_state statp,
-	    const char *name,
-	    const char *domain,
-	    int class, int type,	/* class and type of query */
-	    u_char *answer,		/* buffer to put answer */
-	    int anslen)		/* size of answer */
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	int n, d;
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_nquerydomain(%s, %s, %d, %d)\n",
-		       name, domain?domain:"<Nil>", class, type);
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-		}
-		n--;
-		if (n >= 0 && name[n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-		}
-		sprintf(nbuf, "%s.%s", name, domain);
-	}
-	return (res_nquery(statp, longname, class, type, answer, anslen));
-}
-
-const char *
-res_hostalias(const res_state statp, const char *name, char *dst, size_t siz) {
-	char *file, *cp1, *cp2;
-	char buf[BUFSIZ];
-	FILE *fp;
-
-	if (statp->options & RES_NOALIASES)
-		return (NULL);
-	if (issetugid())
-		return (NULL);
-	file = getenv("HOSTALIASES");
-	if (file == NULL || (fp = fopen(file, "r")) == NULL)
-		return (NULL);
-	setbuf(fp, NULL);
-	buf[sizeof(buf) - 1] = '\0';
-	while (fgets(buf, sizeof(buf), fp)) {
-		for (cp1 = buf; *cp1 && !isspace((unsigned char)*cp1); ++cp1)
-			;
-		if (!*cp1)
-			break;
-		*cp1 = '\0';
-		if (ns_samename(buf, name) == 1) {
-			while (isspace((unsigned char)*++cp1))
-				;
-			if (!*cp1)
-				break;
-			for (cp2 = cp1 + 1; *cp2 &&
-			     !isspace((unsigned char)*cp2); ++cp2)
-				;
-			*cp2 = '\0';
-			strncpy(dst, cp1, siz - 1);
-			dst[siz - 1] = '\0';
-			fclose(fp);
-			return (dst);
-		}
-	}
-	fclose(fp);
-	return (NULL);
-}
diff --git a/lib/libc/resolv/res_send.c b/lib/libc/resolv/res_send.c
deleted file mode 100644
index a50e76c..0000000
--- a/lib/libc/resolv/res_send.c
+++ /dev/null
@@ -1,1166 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2005 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c 89 2016-01-12 00:20:40Z reddawg $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/resolv/res_send.c,v 1.2.2.2 2006/08/07 19:14:55 ume Exp $");
-
-/*
- * Send query to name server and wait for reply.
- */
-
-#include "port_before.h"
-#ifndef USE_KQUEUE
-#include "fd_setsize.h"
-#endif
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <isc/eventlib.h>
-
-#include "port_after.h"
-
-#ifdef USE_KQUEUE
-#include <sys/event.h>
-#else
-#ifdef USE_POLL
-#ifdef HAVE_STROPTS_H
-#include <stropts.h>
-#endif
-#include <poll.h>
-#endif /* USE_POLL */
-#endif
-
-#include "un-namespace.h"
-
-/* Options.  Leave them on. */
-#define DEBUG
-#include "res_debug.h"
-#include "res_private.h"
-
-#define EXT(res) ((res)->_u._ext)
-
-#ifndef USE_POLL
-static const int highestFD = FD_SETSIZE - 1;
-#else
-static int highestFD = 0;
-#endif
-
-/* Forward. */
-
-static int		get_salen(const struct sockaddr *);
-static struct sockaddr * get_nsaddr(res_state, size_t);
-static int		send_vc(res_state, const u_char *, int,
-				u_char *, int, int *, int);
-static int		send_dg(res_state,
-#ifdef USE_KQUEUE
-				int kq,
-#endif
-				const u_char *, int,
-				u_char *, int, int *, int,
-				int *, int *);
-static void		Aerror(const res_state, FILE *, const char *, int,
-			       const struct sockaddr *, int);
-static void		Perror(const res_state, FILE *, const char *, int);
-static int		sock_eq(struct sockaddr *, struct sockaddr *);
-#if defined(NEED_PSELECT) && !defined(USE_POLL) && !defined(USE_KQUEUE)
-static int		pselect(int, void *, void *, void *,
-				struct timespec *,
-				const sigset_t *);
-#endif
-void res_pquery(const res_state, const u_char *, int, FILE *);
-
-static const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
-
-/* Public. */
-
-/* int
- * res_isourserver(ina)
- *	looks up "ina" in _res.ns_addr_list[]
- * returns:
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_ourserver_p(const res_state statp, const struct sockaddr *sa) {
-	const struct sockaddr_in *inp, *srv;
-	const struct sockaddr_in6 *in6p, *srv6;
-	int ns;
-
-	switch (sa->sa_family) {
-	case AF_INET:
-		inp = (const struct sockaddr_in *)sa;
-		for (ns = 0;  ns < statp->nscount;  ns++) {
-			srv = (struct sockaddr_in *)get_nsaddr(statp, ns);
-			if (srv->sin_family == inp->sin_family &&
-			    srv->sin_port == inp->sin_port &&
-			    (srv->sin_addr.s_addr == INADDR_ANY ||
-			     srv->sin_addr.s_addr == inp->sin_addr.s_addr))
-				return (1);
-		}
-		break;
-	case AF_INET6:
-		if (EXT(statp).ext == NULL)
-			break;
-		in6p = (const struct sockaddr_in6 *)sa;
-		for (ns = 0;  ns < statp->nscount;  ns++) {
-			srv6 = (struct sockaddr_in6 *)get_nsaddr(statp, ns);
-			if (srv6->sin6_family == in6p->sin6_family &&
-			    srv6->sin6_port == in6p->sin6_port &&
-#ifdef HAVE_SIN6_SCOPE_ID
-			    (srv6->sin6_scope_id == 0 ||
-			     srv6->sin6_scope_id == in6p->sin6_scope_id) &&
-#endif
-			    (IN6_IS_ADDR_UNSPECIFIED(&srv6->sin6_addr) ||
-			     IN6_ARE_ADDR_EQUAL(&srv6->sin6_addr, &in6p->sin6_addr)))
-				return (1);
-		}
-		break;
-	default:
-		break;
-	}
-	return (0);
-}
-
-/* int
- * res_nameinquery(name, type, class, buf, eom)
- *	look for (name,type,class) in the query section of packet (buf,eom)
- * requires:
- *	buf + HFIXEDSZ <= eom
- * returns:
- *	-1 : format error
- *	0  : not found
- *	>0 : found
- * author:
- *	paul vixie, 29may94
- */
-int
-res_nameinquery(const char *name, int type, int class,
-		const u_char *buf, const u_char *eom)
-{
-	const u_char *cp = buf + HFIXEDSZ;
-	int qdcount = ntohs(((const HEADER*)buf)->qdcount);
-
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf, eom, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom)
-			return (-1);
-		ttype = ns_get16(cp); cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (ttype == type && tclass == class &&
-		    ns_samename(tname, name) == 1)
-			return (1);
-	}
-	return (0);
-}
-
-/* int
- * res_queriesmatch(buf1, eom1, buf2, eom2)
- *	is there a 1:1 mapping of (name,type,class)
- *	in (buf1,eom1) and (buf2,eom2)?
- * returns:
- *	-1 : format error
- *	0  : not a 1:1 mapping
- *	>0 : is a 1:1 mapping
- * author:
- *	paul vixie, 29may94
- */
-int
-res_queriesmatch(const u_char *buf1, const u_char *eom1,
-		 const u_char *buf2, const u_char *eom2)
-{
-	const u_char *cp = buf1 + HFIXEDSZ;
-	int qdcount = ntohs(((const HEADER*)buf1)->qdcount);
-
-	if (buf1 + HFIXEDSZ > eom1 || buf2 + HFIXEDSZ > eom2)
-		return (-1);
-
-	/*
-	 * Only header section present in replies to
-	 * dynamic update packets.
-	 */
-	if ((((const HEADER *)buf1)->opcode == ns_o_update) &&
-	    (((const HEADER *)buf2)->opcode == ns_o_update))
-		return (1);
-
-	if (qdcount != ntohs(((const HEADER*)buf2)->qdcount))
-		return (0);
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf1, eom1, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom1)
-			return (-1);
-		ttype = ns_get16(cp);	cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
-			return (0);
-	}
-	return (1);
-}
-
-int
-res_nsend(res_state statp,
-	  const u_char *buf, int buflen, u_char *ans, int anssiz)
-{
-	int gotsomewhere, terrno, try, v_circuit, resplen, ns, n;
-#ifdef USE_KQUEUE
-	int kq;
-#endif
-	char abuf[NI_MAXHOST];
-
-#ifdef USE_POLL
-	highestFD = sysconf(_SC_OPEN_MAX) - 1;
-#endif
-
-	if (statp->nscount == 0) {
-		errno = ESRCH;
-		return (-1);
-	}
-	if (anssiz < HFIXEDSZ) {
-		errno = EINVAL;
-		return (-1);
-	}
-	DprintQ((statp->options & RES_DEBUG) || (statp->pfcode & RES_PRF_QUERY),
-		(stdout, ";; res_send()\n"), buf, buflen);
-	v_circuit = (statp->options & RES_USEVC) || buflen > PACKETSZ;
-	gotsomewhere = 0;
-	terrno = ETIMEDOUT;
-
-#ifdef USE_KQUEUE
-	if ((kq = kqueue()) < 0) {
-		Perror(statp, stderr, "kqueue", errno);
-		return (-1);
-	}
-#endif
-
-	/*
-	 * If the ns_addr_list in the resolver context has changed, then
-	 * invalidate our cached copy and the associated timing data.
-	 */
-	if (EXT(statp).nscount != 0) {
-		int needclose = 0;
-		struct sockaddr_storage peer;
-		ISC_SOCKLEN_T peerlen;
-
-		if (EXT(statp).nscount != statp->nscount)
-			needclose++;
-		else
-			for (ns = 0; ns < statp->nscount; ns++) {
-				if (statp->nsaddr_list[ns].sin_family &&
-				    !sock_eq((struct sockaddr *)&statp->nsaddr_list[ns],
-					     (struct sockaddr *)&EXT(statp).ext->nsaddrs[ns])) {
-					needclose++;
-					break;
-				}
-
-				if (EXT(statp).nssocks[ns] == -1)
-					continue;
-				peerlen = sizeof(peer);
-				if (_getsockname(EXT(statp).nssocks[ns],
-				    (struct sockaddr *)&peer, &peerlen) < 0) {
-					needclose++;
-					break;
-				}
-				if (!sock_eq((struct sockaddr *)&peer,
-				    get_nsaddr(statp, ns))) {
-					needclose++;
-					break;
-				}
-			}
-		if (needclose) {
-			res_nclose(statp);
-			EXT(statp).nscount = 0;
-		}
-	}
-
-	/*
-	 * Maybe initialize our private copy of the ns_addr_list.
-	 */
-	if (EXT(statp).nscount == 0) {
-		for (ns = 0; ns < statp->nscount; ns++) {
-			EXT(statp).nstimes[ns] = RES_MAXTIME;
-			EXT(statp).nssocks[ns] = -1;
-			if (!statp->nsaddr_list[ns].sin_family)
-				continue;
-			EXT(statp).ext->nsaddrs[ns].sin =
-				 statp->nsaddr_list[ns];
-		}
-		EXT(statp).nscount = statp->nscount;
-	}
-
-	/*
-	 * Some resolvers want to even out the load on their nameservers.
-	 * Note that RES_BLAST overrides RES_ROTATE.
-	 */
-	if ((statp->options & RES_ROTATE) != 0U &&
-	    (statp->options & RES_BLAST) == 0U) {
-		union res_sockaddr_union inu;
-		struct sockaddr_in ina;
-		int lastns = statp->nscount - 1;
-		int fd;
-		u_int16_t nstime;
-
-		if (EXT(statp).ext != NULL)
-			inu = EXT(statp).ext->nsaddrs[0];
-		ina = statp->nsaddr_list[0];
-		fd = EXT(statp).nssocks[0];
-		nstime = EXT(statp).nstimes[0];
-		for (ns = 0; ns < lastns; ns++) {
-			if (EXT(statp).ext != NULL)
-                                EXT(statp).ext->nsaddrs[ns] = 
-					EXT(statp).ext->nsaddrs[ns + 1];
-			statp->nsaddr_list[ns] = statp->nsaddr_list[ns + 1];
-			EXT(statp).nssocks[ns] = EXT(statp).nssocks[ns + 1];
-			EXT(statp).nstimes[ns] = EXT(statp).nstimes[ns + 1];
-		}
-		if (EXT(statp).ext != NULL)
-			EXT(statp).ext->nsaddrs[lastns] = inu;
-		statp->nsaddr_list[lastns] = ina;
-		EXT(statp).nssocks[lastns] = fd;
-		EXT(statp).nstimes[lastns] = nstime;
-	}
-
-	/*
-	 * Send request, RETRY times, or until successful.
-	 */
-	for (try = 0; try < statp->retry; try++) {
-	    for (ns = 0; ns < statp->nscount; ns++) {
-		struct sockaddr *nsap;
-		int nsaplen;
-		nsap = get_nsaddr(statp, ns);
-		nsaplen = get_salen(nsap);
-		statp->_flags &= ~RES_F_LASTMASK;
-		statp->_flags |= (ns << RES_F_LASTSHIFT);
- same_ns:
-		if (statp->qhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*statp->qhook)(&nsap, &buf, &buflen,
-						      ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-					done = 1;
-					break;
-				case res_nextns:
-					res_nclose(statp);
-					goto next_ns;
-				case res_done:
-#ifdef USE_KQUEUE
-					_close(kq);
-#endif
-					return (resplen);
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					goto fail;
-				}
-			} while (!done);
-		}
-
-		Dprint(((statp->options & RES_DEBUG) &&
-			getnameinfo(nsap, nsaplen, abuf, sizeof(abuf),
-				    NULL, 0, niflags) == 0),
-		       (stdout, ";; Querying server (# %d) address = %s\n",
-			ns + 1, abuf));
-
-
-		if (v_circuit) {
-			/* Use VC; at most one attempt per server. */
-			try = statp->retry;
-			n = send_vc(statp, buf, buflen, ans, anssiz, &terrno,
-				    ns);
-			if (n < 0)
-				goto fail;
-			if (n == 0)
-				goto next_ns;
-			resplen = n;
-		} else {
-			/* Use datagrams. */
-			n = send_dg(statp,
-#ifdef USE_KQUEUE
-				    kq,
-#endif
-				    buf, buflen, ans, anssiz, &terrno,
-				    ns, &v_circuit, &gotsomewhere);
-			if (n < 0)
-				goto fail;
-			if (n == 0)
-				goto next_ns;
-			if (v_circuit)
-				goto same_ns;
-			resplen = n;
-		}
-
-		Dprint((statp->options & RES_DEBUG) ||
-		       ((statp->pfcode & RES_PRF_REPLY) &&
-			(statp->pfcode & RES_PRF_HEAD1)),
-		       (stdout, ";; got answer:\n"));
-
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, "%s", ""),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-
-		/*
-		 * If we have temporarily opened a virtual circuit,
-		 * or if we haven't been asked to keep a socket open,
-		 * close the socket.
-		 */
-		if ((v_circuit && (statp->options & RES_USEVC) == 0U) ||
-		    (statp->options & RES_STAYOPEN) == 0U) {
-			res_nclose(statp);
-		}
-		if (statp->rhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*statp->rhook)(nsap, buf, buflen,
-						      ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-				case res_done:
-					done = 1;
-					break;
-				case res_nextns:
-					res_nclose(statp);
-					goto next_ns;
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					goto fail;
-				}
-			} while (!done);
-
-		}
-#ifdef USE_KQUEUE
-		_close(kq);
-#endif
-		return (resplen);
- next_ns: ;
-	   } /*foreach ns*/
-	} /*foreach retry*/
-	res_nclose(statp);
-#ifdef USE_KQUEUE
-	_close(kq);
-#endif
-	if (!v_circuit) {
-		if (!gotsomewhere)
-			errno = ECONNREFUSED;	/* no nameservers found */
-		else
-			errno = ETIMEDOUT;	/* no answer obtained */
-	} else
-		errno = terrno;
-	return (-1);
- fail:
-	res_nclose(statp);
-#ifdef USE_KQUEUE
-	_close(kq);
-#endif
-	return (-1);
-}
-
-/* Private */
-
-static int
-get_salen(sa)
-	const struct sockaddr *sa;
-{
-
-#ifdef HAVE_SA_LEN
-	/* There are people do not set sa_len.  Be forgiving to them. */
-	if (sa->sa_len)
-		return (sa->sa_len);
-#endif
-
-	if (sa->sa_family == AF_INET)
-		return (sizeof(struct sockaddr_in));
-	else if (sa->sa_family == AF_INET6)
-		return (sizeof(struct sockaddr_in6));
-	else
-		return (0);	/* unknown, die on connect */
-}
-
-/*
- * pick appropriate nsaddr_list for use.  see res_init() for initialization.
- */
-static struct sockaddr *
-get_nsaddr(statp, n)
-	res_state statp;
-	size_t n;
-{
-
-	if (!statp->nsaddr_list[n].sin_family && EXT(statp).ext) {
-		/*
-		 * - EXT(statp).ext->nsaddrs[n] holds an address that is larger
-		 *   than struct sockaddr, and
-		 * - user code did not update statp->nsaddr_list[n].
-		 */
-		return (struct sockaddr *)(void *)&EXT(statp).ext->nsaddrs[n];
-	} else {
-		/*
-		 * - user code updated statp->nsaddr_list[n], or
-		 * - statp->nsaddr_list[n] has the same content as
-		 *   EXT(statp).ext->nsaddrs[n].
-		 */
-		return (struct sockaddr *)(void *)&statp->nsaddr_list[n];
-	}
-}
-
-static int
-send_vc(res_state statp,
-	const u_char *buf, int buflen, u_char *ans, int anssiz,
-	int *terrno, int ns)
-{
-	const HEADER *hp = (const HEADER *) buf;
-	HEADER *anhp = (HEADER *) ans;
-	struct sockaddr *nsap;
-	int nsaplen;
-	int truncating, connreset, resplen, n;
-	struct iovec iov[2];
-	u_short len;
-	u_char *cp;
-	void *tmp;
-
-	nsap = get_nsaddr(statp, ns);
-	nsaplen = get_salen(nsap);
-
-	connreset = 0;
- same_ns:
-	truncating = 0;
-
-	/* Are we still talking to whom we want to talk to? */
-	if (statp->_vcsock >= 0 && (statp->_flags & RES_F_VC) != 0) {
-		struct sockaddr_storage peer;
-		ISC_SOCKLEN_T size = sizeof peer;
-
-		if (_getpeername(statp->_vcsock,
-				(struct sockaddr *)&peer, &size) < 0 ||
-		    !sock_eq((struct sockaddr *)&peer, nsap)) {
-			res_nclose(statp);
-			statp->_flags &= ~RES_F_VC;
-		}
-	}
-
-	if (statp->_vcsock < 0 || (statp->_flags & RES_F_VC) == 0) {
-		if (statp->_vcsock >= 0)
-			res_nclose(statp);
-
-		statp->_vcsock = _socket(nsap->sa_family, SOCK_STREAM, 0);
-		if (statp->_vcsock > highestFD) {
-			res_nclose(statp);
-			errno = ENOTSOCK;
-		}
-		if (statp->_vcsock < 0) {
-			switch (errno) {
-			case EPROTONOSUPPORT:
-#ifdef EPFNOSUPPORT
-			case EPFNOSUPPORT:
-#endif
-			case EAFNOSUPPORT:
-				Perror(statp, stderr, "socket(vc)", errno);
-				return (0);
-			default:
-				*terrno = errno;
-				Perror(statp, stderr, "socket(vc)", errno);
-				return (-1);
-			}
-		}
-		errno = 0;
-		if (_connect(statp->_vcsock, nsap, nsaplen) < 0) {
-			*terrno = errno;
-			Aerror(statp, stderr, "connect/vc", errno, nsap,
-			    nsaplen);
-			res_nclose(statp);
-			return (0);
-		}
-		statp->_flags |= RES_F_VC;
-	}
-
-	/*
-	 * Send length & message
-	 */
-	ns_put16((u_short)buflen, (u_char*)&len);
-	iov[0] = evConsIovec(&len, INT16SZ);
-	DE_CONST(buf, tmp);
-	iov[1] = evConsIovec(tmp, buflen);
-	if (_writev(statp->_vcsock, iov, 2) != (INT16SZ + buflen)) {
-		*terrno = errno;
-		Perror(statp, stderr, "write failed", errno);
-		res_nclose(statp);
-		return (0);
-	}
-	/*
-	 * Receive length & response
-	 */
- read_len:
-	cp = ans;
-	len = INT16SZ;
-	while ((n = _read(statp->_vcsock, (char *)cp, (int)len)) > 0) {
-		cp += n;
-		if ((len -= n) == 0)
-			break;
-	}
-	if (n <= 0) {
-		*terrno = errno;
-		Perror(statp, stderr, "read failed", errno);
-		res_nclose(statp);
-		/*
-		 * A long running process might get its TCP
-		 * connection reset if the remote server was
-		 * restarted.  Requery the server instead of
-		 * trying a new one.  When there is only one
-		 * server, this means that a query might work
-		 * instead of failing.  We only allow one reset
-		 * per query to prevent looping.
-		 */
-		if (*terrno == ECONNRESET && !connreset) {
-			connreset = 1;
-			res_nclose(statp);
-			goto same_ns;
-		}
-		res_nclose(statp);
-		return (0);
-	}
-	resplen = ns_get16(ans);
-	if (resplen > anssiz) {
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; response truncated\n")
-		       );
-		truncating = 1;
-		len = anssiz;
-	} else
-		len = resplen;
-	if (len < HFIXEDSZ) {
-		/*
-		 * Undersized message.
-		 */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; undersized: %d\n", len));
-		*terrno = EMSGSIZE;
-		res_nclose(statp);
-		return (0);
-	}
-	cp = ans;
-	while (len != 0 &&
-	    (n = _read(statp->_vcsock, (char *)cp, (int)len)) > 0) {
-		cp += n;
-		len -= n;
-	}
-	if (n <= 0) {
-		*terrno = errno;
-		Perror(statp, stderr, "read(vc)", errno);
-		res_nclose(statp);
-		return (0);
-	}
-	if (truncating) {
-		/*
-		 * Flush rest of answer so connection stays in synch.
-		 */
-		anhp->tc = 1;
-		len = resplen - anssiz;
-		while (len != 0) {
-			char junk[PACKETSZ];
-
-			n = _read(statp->_vcsock, junk,
-			    (len > sizeof junk) ? sizeof junk : len);
-			if (n > 0)
-				len -= n;
-			else
-				break;
-		}
-	}
-	/*
-	 * If the calling applicating has bailed out of
-	 * a previous call and failed to arrange to have
-	 * the circuit closed or the server has got
-	 * itself confused, then drop the packet and
-	 * wait for the correct one.
-	 */
-	if (hp->id != anhp->id) {
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; old answer (unexpected):\n"),
-			ans, (resplen > anssiz) ? anssiz: resplen);
-		goto read_len;
-	}
-
-	/*
-	 * All is well, or the error is fatal.  Signal that the
-	 * next nameserver ought not be tried.
-	 */
-	return (resplen);
-}
-
-static int
-send_dg(res_state statp,
-#ifdef USE_KQUEUE
-	int kq,
-#endif
-	const u_char *buf, int buflen, u_char *ans, int anssiz,
-	int *terrno, int ns, int *v_circuit, int *gotsomewhere)
-{
-	const HEADER *hp = (const HEADER *) buf;
-	HEADER *anhp = (HEADER *) ans;
-	const struct sockaddr *nsap;
-	int nsaplen;
-	struct timespec now, timeout, finish;
-	struct sockaddr_storage from;
-	ISC_SOCKLEN_T fromlen;
-	int resplen, seconds, n, s;
-#ifdef USE_KQUEUE
-	struct kevent kv;
-#else
-#ifdef USE_POLL
-	int     polltimeout;
-	struct pollfd   pollfd;
-#else
-	fd_set dsmask;
-#endif
-#endif
-
-	nsap = get_nsaddr(statp, ns);
-	nsaplen = get_salen(nsap);
-	if (EXT(statp).nssocks[ns] == -1) {
-		EXT(statp).nssocks[ns] = _socket(nsap->sa_family,
-		    SOCK_DGRAM, 0);
-		if (EXT(statp).nssocks[ns] > highestFD) {
-			res_nclose(statp);
-			errno = ENOTSOCK;
-		}
-		if (EXT(statp).nssocks[ns] < 0) {
-			switch (errno) {
-			case EPROTONOSUPPORT:
-#ifdef EPFNOSUPPORT
-			case EPFNOSUPPORT:
-#endif
-			case EAFNOSUPPORT:
-				Perror(statp, stderr, "socket(dg)", errno);
-				return (0);
-			default:
-				*terrno = errno;
-				Perror(statp, stderr, "socket(dg)", errno);
-				return (-1);
-			}
-		}
-#ifndef CANNOT_CONNECT_DGRAM
-		/*
-		 * On a 4.3BSD+ machine (client and server,
-		 * actually), sending to a nameserver datagram
-		 * port with no nameserver will cause an
-		 * ICMP port unreachable message to be returned.
-		 * If our datagram socket is "connected" to the
-		 * server, we get an ECONNREFUSED error on the next
-		 * socket operation, and select returns if the
-		 * error message is received.  We can thus detect
-		 * the absence of a nameserver without timing out.
-		 *
-		 * When the option "insecure1" is specified, we'd
-		 * rather expect to see responses from an "unknown"
-		 * address.  In order to let the kernel accept such
-		 * responses, do not connect the socket here.
-		 * XXX: or do we need an explicit option to disable
-		 * connecting?
-		 */
-		if (!(statp->options & RES_INSECURE1) &&
-		    _connect(EXT(statp).nssocks[ns], nsap, nsaplen) < 0) {
-			Aerror(statp, stderr, "connect(dg)", errno, nsap,
-			    nsaplen);
-			res_nclose(statp);
-			return (0);
-		}
-#endif /* !CANNOT_CONNECT_DGRAM */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; new DG socket\n"))
-	}
-	s = EXT(statp).nssocks[ns];
-#ifndef CANNOT_CONNECT_DGRAM
-	if (statp->options & RES_INSECURE1) {
-		if (_sendto(s,
-		    (const char*)buf, buflen, 0, nsap, nsaplen) != buflen) {
-			Aerror(statp, stderr, "sendto", errno, nsap, nsaplen);
-			res_nclose(statp);
-			return (0);
-		}
-	} else if (send(s, (const char*)buf, buflen, 0) != buflen) {
-		Perror(statp, stderr, "send", errno);
-		res_nclose(statp);
-		return (0);
-	}
-#else /* !CANNOT_CONNECT_DGRAM */
-	if (_sendto(s, (const char*)buf, buflen, 0, nsap, nsaplen) != buflen)
-	{
-		Aerror(statp, stderr, "sendto", errno, nsap, nsaplen);
-		res_nclose(statp);
-		return (0);
-	}
-#endif /* !CANNOT_CONNECT_DGRAM */
-
-	/*
-	 * Wait for reply.
-	 */
-	seconds = (statp->retrans << ns);
-	if (ns > 0)
-		seconds /= statp->nscount;
-	if (seconds <= 0)
-		seconds = 1;
-	now = evNowTime();
-	timeout = evConsTime(seconds, 0);
-	finish = evAddTime(now, timeout);
-	goto nonow;
- wait:
-	now = evNowTime();
- nonow:
-#ifndef USE_POLL
-	if (evCmpTime(finish, now) > 0)
-		timeout = evSubTime(finish, now);
-	else
-		timeout = evConsTime(0, 0);
-#ifdef USE_KQUEUE
-	EV_SET(&kv, s, EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, 0);
-	n = _kevent(kq, &kv, 1, &kv, 1, &timeout);
-#else
-	FD_ZERO(&dsmask);
-	FD_SET(s, &dsmask);
-	n = pselect(s + 1, &dsmask, NULL, NULL, &timeout, NULL);
-#endif
-#else
-	timeout = evSubTime(finish, now);
-	if (timeout.tv_sec < 0)
-		timeout = evConsTime(0, 0);
-	polltimeout = 1000*timeout.tv_sec +
-		timeout.tv_nsec/1000000;
-	pollfd.fd = s;
-	pollfd.events = POLLRDNORM;
-	n = poll(&pollfd, 1, polltimeout);
-#endif /* USE_POLL */
-
-	if (n == 0) {
-		Dprint(statp->options & RES_DEBUG, (stdout, ";; timeout\n"));
-		*gotsomewhere = 1;
-		return (0);
-	}
-	if (n < 0) {
-		if (errno == EINTR)
-			goto wait;
-#ifdef USE_KQUEUE
-		Perror(statp, stderr, "kevent", errno);
-#else
-#ifndef USE_POLL
-		Perror(statp, stderr, "select", errno);
-#else
-		Perror(statp, stderr, "poll", errno);
-#endif /* USE_POLL */
-#endif
-		res_nclose(statp);
-		return (0);
-	}
-#ifdef USE_KQUEUE
-	if (kv.ident != s)
-		goto wait;
-#endif
-	errno = 0;
-	fromlen = sizeof(from);
-	resplen = _recvfrom(s, (char*)ans, anssiz,0,
-			   (struct sockaddr *)&from, &fromlen);
-	if (resplen <= 0) {
-		Perror(statp, stderr, "recvfrom", errno);
-		res_nclose(statp);
-		return (0);
-	}
-	*gotsomewhere = 1;
-	if (resplen < HFIXEDSZ) {
-		/*
-		 * Undersized message.
-		 */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; undersized: %d\n",
-			resplen));
-		*terrno = EMSGSIZE;
-		res_nclose(statp);
-		return (0);
-	}
-	if (hp->id != anhp->id) {
-		/*
-		 * response from old query, ignore it.
-		 * XXX - potential security hazard could
-		 *	 be detected here.
-		 */
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; old answer:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		goto wait;
-	}
-	if (!(statp->options & RES_INSECURE1) &&
-	    !res_ourserver_p(statp, (struct sockaddr *)&from)) {
-		/*
-		 * response from wrong server? ignore it.
-		 * XXX - potential security hazard could
-		 *	 be detected here.
-		 */
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; not our server:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		goto wait;
-	}
-#ifdef RES_USE_EDNS0
-	if (anhp->rcode == FORMERR && (statp->options & RES_USE_EDNS0) != 0U) {
-		/*
-		 * Do not retry if the server do not understand EDNS0.
-		 * The case has to be captured here, as FORMERR packet do not
-		 * carry query section, hence res_queriesmatch() returns 0.
-		 */
-		DprintQ(statp->options & RES_DEBUG,
-			(stdout, "server rejected query with EDNS0:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		/* record the error */
-		statp->_flags |= RES_F_EDNS0ERR;
-		res_nclose(statp);
-		return (0);
-	}
-#endif
-	if (!(statp->options & RES_INSECURE2) &&
-	    !res_queriesmatch(buf, buf + buflen,
-			      ans, ans + anssiz)) {
-		/*
-		 * response contains wrong query? ignore it.
-		 * XXX - potential security hazard could
-		 *	 be detected here.
-		 */
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; wrong query name:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		goto wait;
-	}
-	if (anhp->rcode == SERVFAIL ||
-	    anhp->rcode == NOTIMP ||
-	    anhp->rcode == REFUSED) {
-		DprintQ(statp->options & RES_DEBUG,
-			(stdout, "server rejected query:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		res_nclose(statp);
-		/* don't retry if called from dig */
-		if (!statp->pfcode)
-			return (0);
-	}
-	if (!(statp->options & RES_IGNTC) && anhp->tc) {
-		/*
-		 * To get the rest of answer,
-		 * use TCP with same server.
-		 */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; truncated answer\n"));
-		*v_circuit = 1;
-		res_nclose(statp);
-		return (1);
-	}
-	/*
-	 * All is well, or the error is fatal.  Signal that the
-	 * next nameserver ought not be tried.
-	 */
-	return (resplen);
-}
-
-static void
-Aerror(const res_state statp, FILE *file, const char *string, int error,
-       const struct sockaddr *address, int alen)
-{
-	int save = errno;
-	char hbuf[NI_MAXHOST];
-	char sbuf[NI_MAXSERV];
-
-	alen = alen;
-
-	if ((statp->options & RES_DEBUG) != 0U) {
-		if (getnameinfo(address, alen, hbuf, sizeof(hbuf),
-		    sbuf, sizeof(sbuf), niflags)) {
-			strncpy(hbuf, "?", sizeof(hbuf) - 1);
-			hbuf[sizeof(hbuf) - 1] = '\0';
-			strncpy(sbuf, "?", sizeof(sbuf) - 1);
-			sbuf[sizeof(sbuf) - 1] = '\0';
-		}
-		fprintf(file, "res_send: %s ([%s].%s): %s\n",
-			string, hbuf, sbuf, strerror(error));
-	}
-	errno = save;
-}
-
-static void
-Perror(const res_state statp, FILE *file, const char *string, int error) {
-	int save = errno;
-
-	if ((statp->options & RES_DEBUG) != 0U)
-		fprintf(file, "res_send: %s: %s\n",
-			string, strerror(error));
-	errno = save;
-}
-
-static int
-sock_eq(struct sockaddr *a, struct sockaddr *b) {
-	struct sockaddr_in *a4, *b4;
-	struct sockaddr_in6 *a6, *b6;
-
-	if (a->sa_family != b->sa_family)
-		return 0;
-	switch (a->sa_family) {
-	case AF_INET:
-		a4 = (struct sockaddr_in *)a;
-		b4 = (struct sockaddr_in *)b;
-		return a4->sin_port == b4->sin_port &&
-		    a4->sin_addr.s_addr == b4->sin_addr.s_addr;
-	case AF_INET6:
-		a6 = (struct sockaddr_in6 *)a;
-		b6 = (struct sockaddr_in6 *)b;
-		return a6->sin6_port == b6->sin6_port &&
-#ifdef HAVE_SIN6_SCOPE_ID
-		    a6->sin6_scope_id == b6->sin6_scope_id &&
-#endif
-		    IN6_ARE_ADDR_EQUAL(&a6->sin6_addr, &b6->sin6_addr);
-	default:
-		return 0;
-	}
-}
-
-#if defined(NEED_PSELECT) && !defined(USE_POLL) && !defined(USE_KQUEUE)
-/* XXX needs to move to the porting library. */
-static int
-pselect(int nfds, void *rfds, void *wfds, void *efds,
-	struct timespec *tsp, const sigset_t *sigmask)
-{
-	struct timeval tv, *tvp;
-	sigset_t sigs;
-	int n;
-
-	if (tsp) {
-		tvp = &tv;
-		tv = evTimeVal(*tsp);
-	} else
-		tvp = NULL;
-	if (sigmask)
-		sigprocmask(SIG_SETMASK, sigmask, &sigs);
-	n = select(nfds, rfds, wfds, efds, tvp);
-	if (sigmask)
-		sigprocmask(SIG_SETMASK, &sigs, NULL);
-	if (tsp)
-		*tsp = evTimeSpec(tv);
-	return (n);
-}
-#endif
diff --git a/lib/libc/resolv/res_state.c b/lib/libc/resolv/res_state.c
deleted file mode 100644
index 6456bd1..0000000
--- a/lib/libc/resolv/res_state.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 2006 The FreeBSD Project. 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.
- *
- * 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/lib/libc/resolv/res_state.c,v 1.3.2.1 2006/07/17 10:09:58 ume Exp $
- */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <stdlib.h>
-
-#include "namespace.h"
-#include "reentrant.h"
-#include "un-namespace.h"
-
-#undef _res
-
-struct __res_state _res;
-
-static thread_key_t res_key;
-static once_t res_init_once = ONCE_INITIALIZER;
-static int res_thr_keycreated = 0;
-
-static void
-free_res(void *ptr)
-{
-	res_state statp = ptr;
-
-	if (statp->_u._ext.ext != NULL)
-		res_ndestroy(statp);
-	free(statp);
-}
-
-static void
-res_keycreate(void)
-{
-	res_thr_keycreated = thr_keycreate(&res_key, free_res) == 0;
-}
-
-res_state
-__res_state(void)
-{
-	res_state statp;
-
-	if (thr_main() != 0)
-		return (&_res);
-
-	if (thr_once(&res_init_once, res_keycreate) != 0 ||
-	    !res_thr_keycreated)
-		return (&_res);
-
-	statp = thr_getspecific(res_key);
-	if (statp != NULL)
-		return (statp);
-	statp = calloc(1, sizeof(*statp));
-	if (statp == NULL)
-		return (&_res);
-#ifdef __BIND_RES_TEXT
-	statp->options = RES_TIMEOUT;			/* Motorola, et al. */
-#endif
-	if (thr_setspecific(res_key, statp) == 0)
-		return (statp);
-	free(statp);
-	return (&_res);
-}
-
-/* binary backward compatibility for FreeBSD 5.x and 6.x */
-struct __res_state_ext *
-___res_ext(void)
-{
-	return (__res_state()->_u._ext.ext);
-}
-
-__weak_reference(__res_state, ___res);
diff --git a/lib/libc/rpc/DISCLAIMER b/lib/libc/rpc/DISCLAIMER
deleted file mode 100644
index 738db7d..0000000
--- a/lib/libc/rpc/DISCLAIMER
+++ /dev/null
@@ -1,31 +0,0 @@
-/*	$NetBSD: DISCLAIMER,v 1.2 1998/01/09 04:11:51 perry Exp $	*/
-/*	$FreeBSD: src/lib/libc/rpc/DISCLAIMER,v 1.2 2001/03/19 12:49:49 alfred Exp $ */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
diff --git a/lib/libc/rpc/LICENSE b/lib/libc/rpc/LICENSE
deleted file mode 100644
index 6914461..0000000
--- a/lib/libc/rpc/LICENSE
+++ /dev/null
@@ -1,335 +0,0 @@
-$FreeBSD: src/lib/libc/rpc/LICENSE,v 1.1 2002/07/11 16:23:04 alfred Exp $
-
-Sun Industry Standards Source License 1.0
-
-DEFINITIONS
-
-1.1.  "Commercial Use" means distribution or otherwise
-making the Original Code available to a third party.
-
-1.2.  "Contributor Version" means the combination of the
-Original Code, and the Modifications made by that particular
-Contributor.
-
-1.3.  "Electronic Distribution Mechanism" means a mechanism
-generally accepted in the software development community for
-the electronic transfer of data.
-
-1.4.  "Executable" means Original Code in any form other
-than Source Code.
-
-1.5.  "Initial Developer" means the individual or entity
-identified as the Initial Developer in the Source Code
-notice required by 2 (Exhibit A)
-
-1.6.  "Larger Work" means a work which combines Original
-Code or portions thereof with code not governed by the terms
-of this License.
-
-1.7.  "License" means this document.
-
-1.8.  "Licensable" means having the right to grant, to the
-maximum extent possible, whether at the time of the initial
-grant or subsequently acquired, any and all of the rights
-conveyed herein.
-
-1.9.  "Modifications" means any addition to or deletion from
-the substance or structure of either the Original Code or
-any previous Modifications.  A Modification is:
-
-A.  Any addition to or deletion from the contents of a file
-containing Original Code or previous Modifications.
-
-B.  Any new file that contains any part of the Original Code
-or previous Modifications.  .
-
-1.10.  "Original Code" means Source Code of computer
-software code which is described in the Source Code notice
-required by Exhibit A as Original Code.
-
-1.11.  "Patent Claims" means any patent claims, now owned or
-hereafter acquired, including without limitation, method,
-process, and apparatus claims, in any patent Licensable by
-grantor.
-
-1.12.  "Source Code" means the preferred form of the
-Original Code for making modifications to it, including all
-modules it contains, plus any associated interface
-definition files, or scripts used to control compilation and
-installation of an Executable.
-
-1.13.  "Standards" means the standard identified in Exhibit
-B or a subsequent version of such standard.
-
-1.14.  "You" or "Your" means an individual or a legal entity
-exercising rights under, and complying with all of the terms
-of, this License or a future version of this License issued
-under Section 6.1.  For legal entities, "You" includes any
-entity which controls, is controlled by, or is under common
-control with You.  For purposes of this definition,
-"control" means (a) the power, direct or indirect, to cause
-the direction or management of such entity, whether by
-contract or otherwise, or (b) ownership of more than fifty
-percent (50%) of the outstanding shares or beneficial
-ownership of such entity.
-
-2.0 SOURCE CODE LICENSE
-
-2.1 The Initial Developer Grant:  The Initial Developer
-hereby grants You a world-wide, royalty-free, non-exclusive
-license, subject to third party intellectual property
-claims:
-
-a) under intellectual property rights (other than patent or
-trademark) Licensable by Initial Developer to use,
-reproduce, modify, display, perform, sub license and
-distribute the Original Code (or portions thereof )with or
-without Modifications, and/or as part of a Larger Work; and
-
-b) under Patents Claims infringed by the making, using or
-selling of Original Code, to make, have made, use, practice,
-sell, and offer for sale, and/or otherwise dispose of the
-Original Code (or portions thereof).
-
-c) the licenses granted in this Section 2.1(a ) and (b) are
-effective on the date Initial Developer first distributes
-Original Code under the terms of this License.
-
-d) Notwithstanding Section 2.1(b )above, no patent license
-is granted:  1) for code that You delete from the Original
-Code; 2) separate from the Original Code; or 3) for
-infringements caused by:  i) the modification of the
-Original Code or
-
-ii) the combination of the Original Code with other software
-or devices, including but not limited to Modifications.
-
-3.0 DISTRIBUTION OBLIGATIONS
-
-3.1 Application of License.  The Source Code version of
-Original Code may be distributed only under the terms of
-this License or a future version of this License released
-under Section 6.1, and You must include a copy of this
-License with every copy of the Source Code You distribute.
-You may not offer or impose any terms on any Source Code
-version that alters or restricts the applicable version of
-this License or the recipient's rights hereunder.  Your
-license for shipment of the Contributor Version is
-conditioned upon your full compliance with this Section.
-The Modifications which you create must comply with all
-requirements set out by the Standards body in effect 120
-days before You ship the Contributor Version.  In the event
-that the Modifications do not meet such requirements, You
-agree to publish (i) any deviation from the Standards
-protocol resulting from implementation of your Modifications
-and (ii) a reference implementation of Your Modifications,
-and to make any such deviation and reference implementation
-available to all third parties under the same terms as the
-license on a royalty free basis within thirty (30) days of
-Your first customer shipment of Your Modifications.
-
-3.2 Required Notices.  You must duplicate the notice in
-Exhibit A in each file of the Source Code.  If it is not
-possible to put such notice in a particular Source Code file
-due to its structure, then You must include such notice in a
-location (such as a relevant directory ) where a user would
-be likely to look for such a notice.  If You created one or
-more Modifications ) You may add your name as a Contributor
-to the notice described in Exhibit A.  You must also
-duplicate this License in any documentation for the Source
-Code where You describe recipients' rights or ownership
-rights relating to Initial Code.  You may choose to offer,
-and to charge a fee for, warranty, support, indemnity or
-liability obligations to one or more recipients of Your
-version of the Code.  However, You may do so only
-
-on Your own behalf, and not on behalf of the Initial
-Developer.  You must make it absolutely clear than any such
-warranty, support, indemnity or liability obligation is
-offered by You alone, and You hereby agree to indemnify the
-Initial Developer for any liability incurred by the Initial
-Developer as a result of warranty, support, indemnity or
-liability terms You offer.
-
-3.3 Distribution of Executable Versions.  You may distribute
-Original Code in Executable and Source form only if the
-requirements of Section 3.1 and 3.2 have been met for that
-Original Code, and if You include a notice stating that the
-Source Code version of the Original Code is available under
-the terms of this License.  The notice must be conspicuously
-included in any notice in an Executable or Source versions,
-related documentation or collateral in which You describe
-recipients' rights relating to the Original Code.  You may
-distribute the Executable and Source versions of Your
-version of the Code or ownership rights under a license of
-Your choice, which may contain terms different from this
-License, provided that You are in compliance with the terms
-of this License.  If You distribute the Executable and
-Source versions under a different license You must make it
-absolutely clear that any terms which differ from this
-License are offered by You alone, not by the Initial
-Developer .  You hereby agree to indemnify the Initial
-Developer for any liability incurred by the Initial
-Developer as a result of any such terms You offer .
-
-3.4 Larger Works.  You may create a Larger Work by combining
-Original Code with other code not governed by the terms of
-this License and distribute the Larger Work as a single
-product.  In such a case, You must make sure the
-requirements of this License are fulfilled for the Original
-Code.
-
-4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
-
-If it is impossible for You to comply with any of the terms
-of this License with respect to some or all of the Original
-Code due to statute, judicial order, or regulation then You
-must:
-
-a) comply with the terms of this License to the maximum
-extent possible; and
-
-b) describe the limitations and the code they affect.  Such
-description must be included in the LEGAL file described in
-Section 3.2 and must be included with all distributions of
-the Source Code.  Except to the extent prohibited by statute
-or regulation, such description must be sufficiently
-detailed for a recipient of ordinary skill to be able to
-understand it.
-
-5.0 APPLICATION OF THIS LICENSE This License applies to code
-to which the Initial Developer has attached the notice in
-Exhibit A and to related Modifications as set out in Section
-3.1.
-
-6.0 VERSIONS OF THE LICENSE
-
-6.1 New Versions.  Sun Microsystems, Inc.  Sun may publish
-revised and/or new versions of the License from time to
-time.  Each version will be given a distinguishing version
-number .
-
-6.2 Effect of New Versions.  Once Original Code has been
-published under a particular version of the License, You may
-always continue to use it under the terms of that version.
-You may also choose to use such Original Code under the
-terms of any subsequent version of the License published by
-Sun.  No one other than Sun has the right to modify the
-terms applicable to Original Code.
-
-7.  DISCLAIMER OF W ARRANTY.  ORIGINAL CODE IS PROVIDED
-UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF
-ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE ORIGINAL CODE IS FREE OF
-DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
-NON-INFRINGING.  THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE ORIGINAL CODE IS WITH YOU.  SHOULD ANY
-ORIGINAL CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-INITIAL DEVELOPER )ASSUME THE COST OF ANY NECESSARY
-SERVICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF
-WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.  NO
-USE OF ANY ORIGINAL CODE IS AUTHORIZED HEREUNDER EXCEPT
-UNDER THIS DISCLAIMER.
-
-8.0 TERMINATION
-
-8.1 This License and the rights granted hereunder will
-terminate automatically if You fail to comply with terms
-herein and fail to cure such breach within 30 days of
-becoming aware of the breach.  All sublicenses to the
-Original Code which are properly granted shall survive any
-termination of this License.  Provisions which, by their
-nature, must remain in effect beyond the termination of this
-License shall survive.
-
-8.2 .In the event of termination under Section 8.1 above,
-all end user license agreements (excluding distributors and
-resellers) which have been validly granted by You or any
-distributor hereunder prior to termination shall survive
-termination.
-
-9.0 LIMIT OF LIABILITY UNDER NO CIRCUMSTANCES AND UNDER NO
-LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE) ,CONTRACT,
-OR OTHER WISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
-CONTRIBUTOR, OR ANY DISTRIBUTOR OF ORIGINAL CODE, OR ANY
-SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR
-LOSS OF GOOD WILL, WORK STOPPAGE, COMPUTER FAILURE OR
-MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
-LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
-POSSIBILITY OF SUCH DAMAGES.  THIS LIMITATION OF LIABILITY
-SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT
-APPLICABLE LAW PROHIBITS SUCH LIMITATION.  SOME
-JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF
-INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND
-LIMITATION MAY NOT APPLY TO YOU.
-
-10.0 U .S.  GOVERNMENT END USERS U.S.  Government:  If this
-Software is being acquired by or on behalf of the U.S.
-Government or by a U.S.  Government prime contractor or
-subcontractor (at any tier), then the Government's rights in
-the Software and accompanying documentation shall be only as
-set forth in this license; this is in accordance with 48 C.F
-.R.  227.7201 through 227.7202-4 (for Department of Defense
-(DoD) acquisitions )and with 48 C.F.R.2.101 and 12.212( for
-non-DoD acquisitions).
-
-11.0 MISCELLANEOUS This License represents the complete
-agreement concerning subject matter hereof.  If any
-provision of this License is held to be unenforceable, such
-provision shall be reformed only to the extent necessary to
-make it enforceable.  This License shall be governed by
-California law provisions (except to the extent applicable
-law, if any, provides otherwise), excluding its
-conflict-of-law provisions.  With respect to disputes in
-which at least one party is a citizen of, or an entity
-chartered or registered to do business in the United States
-of America, any litigation relating to this License shall be
-subject to the jurisdiction of the Federal Courts of the
-Northern District of California, with venue lying in Santa
-Clara County, California, with the losing party responsible
-for costs, including without limitation, court costs and
-reasonable attorneys fees and expenses.  The application of
-the United Nations Convention on Contracts for the
-International Sale of Goods is expressly excluded.  Any law
-or regulation which provides that the language of a contract
-shall be construed against the drafter shall not apply to
-this License.
-
-EXHIBIT A - Sun Standards
-
-"The contents of this file are subject to the Sun Standards
-License Version 1.0 the (the "License";) You may not use
-this file except in compliance with the License.  You may
-obtain a copy of the License at
-_______________________________.
-
-    Software distributed under the License is distributed on
-an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
-express or implied.  See the License for the specific
-language governing rights and limitations under the License.
-
-The Original Code is Copyright 1998 by Sun Microsystems, Inc
-
-The Initial Developer of the Original Code is:  Sun
-Microsystems, Inc.
-
-Portions created by _____________________________ are
-Copyright ______________________________.
-
-All Rights Reserved.
-
-Contributors:  ______________________________________.
-
-EXHIBIT B - Sun Standards
-
-The Standard is defined as the following IETF RFCs:
-
-RFC1831:  RPC:  Remote Procedure Call Protocol Specification
-Version 2 RFC1832:  XDR:  External Data REpresentation
-Standard RFC1833:  Binding Protocols for ONC RPC Version 2
-RFC2078:  Generic Security Service Application Program
-Interface, Version 2 RFC2203:  RPCSEC_GSS Protocol
-Specification RFC2695:  Authentication Mechanisms for ONC RPC
diff --git a/lib/libc/rpc/Makefile b/lib/libc/rpc/Makefile
deleted file mode 100644
index 7c4444c..0000000
--- a/lib/libc/rpc/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = auth_des.o auth_none.o auth_time.o auth_unix.o authdes_prot.o authunix_prot.o bindresvport.o clnt_bcast.o clnt_dg.o clnt_generic.o clnt_perror.o clnt_raw.o clnt_simple.o clnt_vc.o crypt_client.o des_crypt.o des_soft.o getnetconfig.o getnetpath.o getpublickey.o getrpcent.o getrpcport.o key_call.o key_prot_xdr.o mt_misc.o netname.o netnamer.o pmap_clnt.o pmap_getmaps.o pmap_getport.o pmap_prot.o pmap_prot2.o pmap_rmt.o rpc_callmsg.o rpc_commondata.o rpc_dtablesize.o rpc_generic.o rpc_prot.o rpc_soc.o rpcb_clnt.o rpcb_prot.o rpcb_st_xdr.o rpcdname.o rtime.o svc.o svc_auth.o svc_auth_des.o svc_auth_unix.o svc_dg.o svc_generic.o svc_raw.o svc_run.o svc_simple.o svc_vc.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/rpc/PSD.doc/nfs.rfc.ms b/lib/libc/rpc/PSD.doc/nfs.rfc.ms
deleted file mode 100644
index 75c25a6..0000000
--- a/lib/libc/rpc/PSD.doc/nfs.rfc.ms
+++ /dev/null
@@ -1,1374 +0,0 @@
-.\"
-.\" Must use  --  tbl  --  with this one
-.\"
-.\" @(#)nfs.rfc.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/nfs.rfc.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
-.\"
-.de BT
-.if \\n%=1 .tl ''- % -''
-..
-.ND
-.\" prevent excess underlining in nroff
-.if n .fp 2 R
-.OH 'Network File System: Version 2 Protocol Specification''Page %'
-.EH 'Page %''Network File System: Version 2 Protocol Specification'
-.if \n%=1 .bp
-.SH
-\&Network File System: Version 2 Protocol Specification
-.IX NFS "" "" "" PAGE MAJOR
-.IX "Network File System" "" "" "" PAGE MAJOR
-.IX NFS "version-2 protocol specification"
-.IX "Network File System" "version-2 protocol specification"
-.LP
-.NH 0
-\&Status of this Standard
-.LP
-Note: This document specifies a protocol that Sun Microsystems, Inc.,
-and others are using.  It specifies it in standard ARPA RFC form.
-.NH 1
-\&Introduction
-.IX NFS introduction
-.LP
-The Sun Network Filesystem (NFS) protocol provides transparent remote 
-access to shared filesystems over local area networks.  The NFS 
-protocol is designed to be machine, operating system, network architecture, 
-and transport protocol independent.  This independence is 
-achieved through the use of Remote Procedure Call (RPC) primitives 
-built on top of an External Data Representation (XDR).  Implementations
-exist for a variety of machines, from personal computers to
-supercomputers.
-.LP
-The supporting mount protocol allows the server to hand out remote
-access privileges to a restricted set of clients.  It performs the
-operating system-specific functions that allow, for example, to
-attach remote directory trees to some local file system.
-.NH 2
-\&Remote Procedure Call
-.IX "Remote Procedure Call"
-.LP
-Sun's remote procedure call specification provides a procedure-
-oriented interface to remote services.  Each server supplies a
-program that is a set of procedures.  NFS is one such "program".
-The combination of host address, program number, and procedure
-number specifies one remote service procedure.  RPC does not depend
-on services provided by specific protocols, so it can be used with
-any underlying transport protocol.  See the
-.I "Remote Procedure Calls: Protocol Specification"
-chapter of this manual.
-.NH 2
-\&External Data Representation
-.IX "External Data Representation"
-.LP
-The External Data Representation (XDR) standard provides a common
-way of representing a set of data types over a network.  
-The NFS
-Protocol Specification is written using the RPC data description
-language.  
-For more information, see the
-.I " External Data Representation Standard: Protocol Specification."  
-Sun provides implementations of XDR and
-RPC,  but NFS does not require their use.  Any software that
-provides equivalent functionality can be used, and if the encoding
-is exactly the same it can interoperate with other implementations
-of NFS.
-.NH 2
-\&Stateless Servers
-.IX "stateless servers"
-.IX servers stateless
-.LP
-The NFS protocol is stateless.  That is, a server does not need to
-maintain any extra state information about any of its clients in
-order to function correctly.  Stateless servers have a distinct
-advantage over stateful servers in the event of a failure.  With
-stateless servers, a client need only retry a request until the
-server responds; it does not even need to know that the server has
-crashed, or the network temporarily went down.  The client of a
-stateful server, on the other hand, needs to either detect a server
-crash and rebuild the server's state when it comes back up, or
-cause client operations to fail.
-.LP
-This may not sound like an important issue, but it affects the
-protocol in some unexpected ways.  We feel that it is worth a bit
-of extra complexity in the protocol to be able to write very simple
-servers that do not require fancy crash recovery.
-.LP
-On the other hand, NFS deals with objects such as files and
-directories that inherently have state -- what good would a file be
-if it did not keep its contents intact?  The goal is to not
-introduce any extra state in the protocol itself.  Another way to
-simplify recovery is by making operations "idempotent" whenever
-possible (so that they can potentially be repeated).
-.NH 1
-\&NFS Protocol Definition
-.IX NFS "protocol definition"
-.IX NFS protocol
-.LP
-Servers have been known to change over time, and so can the
-protocol that they use. So RPC provides a version number with each
-RPC request. This RFC describes version two of the NFS protocol.
-Even in the second version, there are various obsolete procedures
-and parameters, which will be removed in later versions. An RFC
-for version three of the NFS protocol is currently under
-preparation.
-.NH 2
-\&File System Model
-.IX filesystem model
-.LP
-NFS assumes a file system that is hierarchical, with directories as
-all but the bottom-level files.  Each entry in a directory (file,
-directory, device, etc.)  has a string name.  Different operating
-systems may have restrictions on the depth of the tree or the names
-used, as well as using different syntax to represent the "pathname",
-which is the concatenation of all the "components" (directory and
-file names) in the name.  A "file system" is a tree on a single
-server (usually a single disk or physical partition) with a specified
-"root".  Some operating systems provide a "mount" operation to make
-all file systems appear as a single tree, while others maintain a
-"forest" of file systems.  Files are unstructured streams of
-uninterpreted bytes.  Version 3 of NFS uses a slightly more general
-file system model.
-.LP
-NFS looks up one component of a pathname at a time.  It may not be
-obvious why it does not just take the whole pathname, traipse down
-the directories, and return a file handle when it is done.  There are
-several good reasons not to do this.  First, pathnames need
-separators between the directory components, and different operating
-systems use different separators.  We could define a Network Standard
-Pathname Representation, but then every pathname would have to be
-parsed and converted at each end.  Other issues are discussed in
-\fINFS Implementation Issues\fP below.
-.LP
-Although files and directories are similar objects in many ways,
-different procedures are used to read directories and files.  This
-provides a network standard format for representing directories.  The
-same argument as above could have been used to justify a procedure
-that returns only one directory entry per call.  The problem is
-efficiency.  Directories can contain many entries, and a remote call
-to return each would be just too slow.
-.NH 2
-\&RPC Information
-.IX NFS "RPC information"
-.IP \fIAuthentication\fP
-The   NFS  service uses 
-.I AUTH_UNIX ,
-.I AUTH_DES ,
-or 
-.I AUTH_SHORT 
-style
-authentication, except in  the  NULL procedure where   
-.I AUTH_NONE 
-is also allowed.
-.IP "\fITransport Protocols\fP"
-NFS currently is supported on UDP/IP only.  
-.IP "\fIPort Number\fP"
-The NFS protocol currently uses the UDP port number 2049.  This is
-not an officially assigned port, so  later versions of the protocol
-use the \*QPortmapping\*U facility of RPC.
-.NH 2
-\&Sizes of XDR Structures
-.IX "XDR structure sizes"
-.LP
-These are the sizes, given in decimal bytes, of various XDR
-structures used in the protocol:
-.DS
-/* \fIThe maximum number of bytes of data in a READ or WRITE request\fP  */
-const MAXDATA = 8192;
-
-/* \fIThe maximum number of bytes in a pathname argument\fP */
-const MAXPATHLEN = 1024;
-
-/* \fIThe maximum number of bytes in a file name argument\fP */
-const MAXNAMLEN = 255;
-
-/* \fIThe size in bytes of the opaque "cookie" passed by READDIR\fP */
-const COOKIESIZE  = 4;
-
-/* \fIThe size in bytes of the opaque file handle\fP */
-const FHSIZE = 32;
-.DE
-.NH 2
-\&Basic Data Types
-.IX "NFS data types"
-.IX NFS "basic data types"
-.LP
-The following XDR  definitions are basic  structures and types used
-in other structures described further on.
-.KS
-.NH 3
-\&stat
-.IX "NFS data types" stat "" \fIstat\fP
-.DS
-enum stat {
-	NFS_OK = 0,
-	NFSERR_PERM=1,
-	NFSERR_NOENT=2,
-	NFSERR_IO=5,
-	NFSERR_NXIO=6,
-	NFSERR_ACCES=13,
-	NFSERR_EXIST=17,
-	NFSERR_NODEV=19,
-	NFSERR_NOTDIR=20,
-	NFSERR_ISDIR=21,
-	NFSERR_FBIG=27,
-	NFSERR_NOSPC=28,
-	NFSERR_ROFS=30,
-	NFSERR_NAMETOOLONG=63,
-	NFSERR_NOTEMPTY=66,
-	NFSERR_DQUOT=69,
-	NFSERR_STALE=70,
-	NFSERR_WFLUSH=99
-};
-.DE
-.KE
-.LP
-The 
-.I stat 
-type  is returned with every  procedure's  results.   A
-value of 
-.I NFS_OK 
-indicates that the  call completed successfully and
-the  results are  valid.  The  other  values indicate  some kind of
-error  occurred on the  server  side  during the servicing   of the
-procedure.  The error values are derived from UNIX error numbers.
-.IP \fBNFSERR_PERM\fP:
-Not owner.  The caller does not have correct ownership
-to perform the requested operation.
-.IP \fBNFSERR_NOENT\fP:
-No such file or directory.    The file or directory
-specified does not exist.
-.IP \fBNFSERR_IO\fP:
-Some sort of hard  error occurred when the operation was
-in progress.  This could be a disk error, for example.
-.IP \fBNFSERR_NXIO\fP:
-No such device or address.
-.IP \fBNFSERR_ACCES\fP:
-Permission  denied.  The  caller does  not  have the
-correct permission to perform the requested operation.
-.IP \fBNFSERR_EXIST\fP:
-File exists.  The file specified already exists.
-.IP \fBNFSERR_NODEV\fP:
-No such device.
-.IP \fBNFSERR_NOTDIR\fP:
-Not   a  directory.    The  caller  specified   a
-non-directory in a directory operation.
-.IP \fBNFSERR_ISDIR\fP:
-Is a directory.  The caller specified  a directory in
-a non- directory operation.
-.IP \fBNFSERR_FBIG\fP:
-File too large.   The  operation caused a file to grow
-beyond the server's limit.
-.IP \fBNFSERR_NOSPC\fP:
-No space left on  device.   The operation caused the
-server's filesystem to reach its limit.
-.IP \fBNFSERR_ROFS\fP:
-Read-only filesystem.  Write attempted on a read-only filesystem.
-.IP \fBNFSERR_NAMETOOLONG\fP:
-File name   too   long.  The file  name  in  an operation was too long.
-.IP \fBNFSERR_NOTEMPTY\fP:
-Directory   not empty.  Attempted  to   remove  a
-directory that was not empty.
-.IP \fBNFSERR_DQUOT\fP:
-Disk quota exceeded.  The client's disk  quota on the
-server has been exceeded.
-.IP \fBNFSERR_STALE\fP:
-The  "fhandle" given in   the arguments was invalid.
-That is, the file referred to by that file handle no longer exists,
-or access to it has been revoked.
-.IP \fBNFSERR_WFLUSH\fP:
-The server's  write cache  used  in the
-.I WRITECACHE 
-call got flushed to disk.
-.LP
-.KS
-.NH 3
-\&ftype
-.IX "NFS data types" ftype "" \fIftype\fP
-.DS
-enum ftype {
-	NFNON = 0,
-	NFREG = 1,
-	NFDIR = 2,
-	NFBLK = 3,
-	NFCHR = 4,
-	NFLNK = 5
-};
-.DE
-.KE
-The enumeration
-.I ftype 
-gives the type of a file.  The type 
-.I NFNON 
-indicates a non-file,
-.I NFREG 
-is a regular file, 
-.I NFDIR 
-is a directory,
-.I NFBLK 
-is a block-special device, 
-.I NFCHR 
-is a character-special device, and
-.I NFLNK 
-is a symbolic link.
-.KS
-.NH 3
-\&fhandle
-.IX "NFS data types" fhandle "" \fIfhandle\fP
-.DS
-typedef opaque fhandle[FHSIZE];
-.DE
-.KE
-The
-.I fhandle 
-is the file handle passed between the server and the client.  
-All file operations are done using file handles to refer to a file or 
-directory.  The file handle can contain whatever information the server
-needs to distinguish an individual file.
-.KS
-.NH 3
-\&timeval
-.IX "NFS data types" timeval "" \fItimeval\fP
-.DS
-struct timeval {
-	unsigned int seconds;
-	unsigned int useconds;
-};
-.DE
-.KE
-The 
-.I timeval
-structure is the number of seconds and microseconds 
-since midnight January 1, 1970, Greenwich Mean Time.  It is used to 
-pass time and date information.
-.KS
-.NH 3
-\&fattr
-.IX "NFS data types" fattr "" \fIfattr\fP
-.DS
-struct fattr {
-	ftype        type;
-	unsigned int mode;
-	unsigned int nlink;
-	unsigned int uid;
-	unsigned int gid;
-	unsigned int size;
-	unsigned int blocksize;
-	unsigned int rdev;
-	unsigned int blocks;
-	unsigned int fsid;
-	unsigned int fileid;
-	timeval      atime;
-	timeval      mtime;
-	timeval      ctime;
-};
-.DE
-.KE
-The
-.I fattr 
-structure contains the attributes of a file; "type" is the type of
-the file; "nlink" is the number of hard links to the file (the number
-of different names for the same file); "uid" is the user
-identification number of the owner of the file; "gid" is the group
-identification number of the group of the file; "size" is the size in
-bytes of the file; "blocksize" is the size in bytes of a block of the
-file; "rdev" is the device number of the file if it is type
-.I NFCHR 
-or
-.I NFBLK ;
-"blocks" is the number of blocks the file takes up on disk; "fsid" is
-the file system identifier for the filesystem containing the file;
-"fileid" is a number that uniquely identifies the file within its
-filesystem; "atime" is the time when the file was last accessed for
-either read or write; "mtime" is the time when the file data was last
-modified (written); and "ctime" is the time when the status of the
-file was last changed.  Writing to the file also changes "ctime" if
-the size of the file changes.
-.LP
-"mode" is the access mode encoded as a set of bits.  Notice that the
-file type is specified both in the mode bits and in the file type.
-This is really a bug in the protocol and will be fixed in future
-versions.  The descriptions given below specify the bit positions
-using octal numbers.
-.TS
-box tab (&) ;
-cfI cfI
-lfL l .
-Bit&Description
-_
-0040000&This is a directory; "type" field should be NFDIR.
-0020000&This is a character special file; "type" field should be NFCHR. 
-0060000&This is a block special file; "type" field should be NFBLK. 
-0100000&This is a regular file; "type" field should be NFREG.
-0120000&This is a symbolic link file;  "type" field should be NFLNK. 
-0140000&This is a named socket; "type" field should be NFNON.
-0004000&Set user id on execution.
-0002000&Set group id on execution.
-0001000&Save swapped text even after use.
-0000400&Read permission for owner.
-0000200&Write permission for owner.
-0000100&Execute and search permission for owner.
-0000040&Read permission for group.
-0000020&Write permission for group.
-0000010&Execute and search permission for group.
-0000004&Read permission for others.
-0000002&Write permission for others.
-0000001&Execute and search permission for others.
-.TE
-.KS
-Notes:
-.IP 
-The bits are  the same as the mode   bits returned  by  the
-.I stat(2) 
-system call in the UNIX system.  The file  type is  specified  both in
-the mode  bits  and in  the file type.   This   is fixed  in future
-versions.
-.IP
-The "rdev" field in the attributes structure is an operating system
-specific device specifier.  It  will be  removed and generalized in
-the next revision of the protocol.
-.KE
-.LP
-.KS
-.NH 3
-\&sattr
-.IX "NFS data types" sattr "" \fIsattr\fP
-.DS
-struct sattr {
-	unsigned int mode;
-	unsigned int uid;
-	unsigned int gid;
-	unsigned int size;
-	timeval      atime;
-	timeval      mtime;
-};
-.DE
-.KE
-The 
-.I sattr
-structure contains the file attributes which can be set
-from the client.  The fields are the same as for  
-.I fattr 
-above.  A "size" of zero  means the file should be  truncated.
-A value of -1 indicates a field that should be ignored.
-.LP
-.KS
-.NH 3
-\&filename
-.IX "NFS data types" filename "" \fIfilename\fP
-.DS
-typedef string filename<MAXNAMLEN>;
-.DE
-.KE
-The type
-.I filename 
-is used for  passing file names  or  pathname components.
-.LP
-.KS
-.NH 3
-\&path
-.IX "NFS data types" path "" \fIpath\fP
-.DS
-typedef string path<MAXPATHLEN>;
-.DE
-.KE
-The type
-.I path 
-is a pathname.  The server considers it as a string
-with no internal structure,  but to the client  it is the name of a
-node in a filesystem tree.
-.LP
-.KS
-.NH 3
-\&attrstat
-.IX "NFS data types" attrstat "" \fIattrstat\fP
-.DS
-union attrstat switch (stat status) {
-	case NFS_OK:
-		fattr attributes;
-	default:
-		void;
-};
-.DE
-.KE
-The 
-.I attrstat 
-structure is a common procedure result.  It contains
-a  "status" and,  if  the call   succeeded,   it also contains  the
-attributes of the file on which the operation was done.
-.LP
-.KS
-.NH 3
-\&diropargs
-.IX "NFS data types" diropargs "" \fIdiropargs\fP
-.DS
-struct diropargs {
-	fhandle  dir;
-	filename name;
-};
-.DE
-.KE
-The  
-.I diropargs 
-structure is used  in  directory  operations.  The
-"fhandle" "dir" is the directory in  which to find the file "name".
-A directory operation is one in which the directory is affected.
-.LP
-.KS
-.NH 3
-\&diropres
-.IX "NFS data types" diropres "" \fIdiropres\fP
-.DS
-union diropres switch (stat status) {
-	case NFS_OK:
-		struct {
-			fhandle file;
-			fattr   attributes;
-		} diropok;
-	default:
-		void;
-};
-.DE
-.KE
-The results of a directory operation  are returned  in a 
-.I diropres 
-structure.  If the call succeeded, a new file handle "file" and the
-"attributes" associated with that file are  returned along with the
-"status".
-.NH 2
-\&Server Procedures
-.IX "NFS server procedures" "" "" "" PAGE MAJOR
-.LP
-The  protocol definition  is given as   a  set  of  procedures with
-arguments  and results defined using the   RPC  language.   A brief
-description of the function of each procedure should provide enough
-information to allow implementation.
-.LP
-All of  the procedures  in   the NFS  protocol  are assumed  to  be
-synchronous.   When a procedure  returns to the  client, the client
-can assume that the operation has completed and any data associated
-with the request is  now on stable storage.  For  example, a client
-.I WRITE 
-request   may  cause  the   server  to  update  data  blocks,
-filesystem information blocks (such as indirect  blocks),  and file
-attribute  information (size  and  modify  times).  When  the 
-.I WRITE 
-returns to the client, it can assume  that the write  is safe, even
-in case of  a server  crash, and  it can discard the  data written.
-This is a very important part  of the statelessness  of the server.
-If the server waited to flush data from remote requests, the client
-would have to  save those requests so that  it could resend them in
-case of a server crash.
-.ie t .DS
-.el .DS L
-
-.ft I
-/*
-* Remote file service routines
-*/
-.ft CW
-program NFS_PROGRAM {
-	version NFS_VERSION {
-		void        NFSPROC_NULL(void)              = 0;
-		attrstat    NFSPROC_GETATTR(fhandle)        = 1;
-		attrstat    NFSPROC_SETATTR(sattrargs)      = 2;
-		void        NFSPROC_ROOT(void)              = 3;
-		diropres    NFSPROC_LOOKUP(diropargs)       = 4;
-		readlinkres NFSPROC_READLINK(fhandle)       = 5;
-		readres     NFSPROC_READ(readargs)          = 6;
-		void        NFSPROC_WRITECACHE(void)        = 7;
-		attrstat    NFSPROC_WRITE(writeargs)        = 8;
-		diropres    NFSPROC_CREATE(createargs)      = 9;
-		stat        NFSPROC_REMOVE(diropargs)       = 10;
-		stat        NFSPROC_RENAME(renameargs)      = 11;
-		stat        NFSPROC_LINK(linkargs)          = 12;
-		stat        NFSPROC_SYMLINK(symlinkargs)    = 13;
-		diropres    NFSPROC_MKDIR(createargs)       = 14;
-		stat        NFSPROC_RMDIR(diropargs)        = 15;
-		readdirres  NFSPROC_READDIR(readdirargs)    = 16;
-		statfsres   NFSPROC_STATFS(fhandle)         = 17;
-	} = 2;
-} = 100003;
-.DE
-.KS
-.NH 3
-\&Do Nothing
-.IX "NFS server procedures" NFSPROC_NULL() "" \fINFSPROC_NULL()\fP
-.DS
-void 
-NFSPROC_NULL(void) = 0;
-.DE
-.KE
-This procedure does no work.   It is made available  in  all RPC
-services to allow server response testing and timing.
-.KS
-.NH 3
-\&Get File Attributes
-.IX "NFS server procedures" NFSPROC_GETATTR() "" \fINFSPROC_GETATTR()\fP
-.DS
-attrstat 
-NFSPROC_GETATTR (fhandle) = 1;
-.DE
-.KE
-If the reply  status is 
-.I NFS_OK ,
-then  the reply attributes contains
-the attributes for the file given by the input fhandle.
-.KS
-.NH 3
-\&Set File Attributes
-.IX "NFS server procedures" NFSPROC_SETATTR() "" \fINFSPROC_SETATTR()\fP
-.DS
-struct sattrargs {
-	fhandle file;
-	sattr attributes;
-	};
-
-attrstat
-NFSPROC_SETATTR (sattrargs) = 2;
-.DE
-.KE
-The  "attributes" argument  contains fields which are either  -1 or
-are  the  new value for  the  attributes of  "file".   If the reply
-status is 
-.I NFS_OK ,
-then the  reply attributes have the attributes of
-the file after the "SETATTR" operation has completed.
-.LP
-Note: The use of -1 to indicate an unused field in "attributes" is
-changed in the next version of the protocol.
-.KS
-.NH 3
-\&Get Filesystem Root
-.IX "NFS server procedures" NFSPROC_ROOT "" \fINFSPROC_ROOT\fP
-.DS
-void 
-NFSPROC_ROOT(void) = 3;
-.DE
-.KE
-Obsolete.  This procedure  is no longer used   because  finding the
-root file handle of a filesystem requires moving  pathnames between
-client  and server.  To  do  this right we would  have  to define a
-network standard representation of pathnames.  Instead, the
-function  of  looking up  the   root  file handle  is  done  by the
-.I MNTPROC_MNT() 
-procedure.    (See the
-.I "Mount Protocol Definition"
-later in this chapter for details).
-.KS
-.NH 3
-\&Look Up File Name
-.IX "NFS server procedures" NFSPROC_LOOKUP() "" \fINFSPROC_LOOKUP()\fP
-.DS
-diropres
-NFSPROC_LOOKUP(diropargs) = 4;
-.DE
-.KE
-If  the reply "status"  is 
-.I NFS_OK ,
-then the reply  "file" and reply
-"attributes" are the file handle and attributes for the file "name"
-in the directory given by "dir" in the argument.
-.KS
-.NH 3
-\&Read From Symbolic Link
-.IX "NFS server procedures" NFSPROC_READLINK() "" \fINFSPROC_READLINK()\fP
-.DS
-union readlinkres switch (stat status) {
-	case NFS_OK:
-		path data;
-	default:
-		void;
-};
-
-readlinkres
-NFSPROC_READLINK(fhandle) = 5;
-.DE
-.KE
-If "status" has the value 
-.I NFS_OK ,
-then the reply "data" is the data in 
-the symbolic link given by the file referred to by the fhandle argument.
-.LP
-Note:  since   NFS always  parses pathnames    on the  client, the
-pathname in  a symbolic  link may  mean something  different (or be
-meaningless) on a different client or on the server if  a different
-pathname syntax is used.
-.KS
-.NH 3
-\&Read From File
-.IX "NFS server procedures" NFSPROC_READ "" \fINFSPROC_READ\fP
-.DS
-struct readargs {
-	fhandle file;
-	unsigned offset;
-	unsigned count;
-	unsigned totalcount;
-};
-
-union readres switch (stat status) {
-	case NFS_OK:
-		fattr attributes;
-		opaque data<NFS_MAXDATA>;
-	default:
-		void;
-};
-
-readres
-NFSPROC_READ(readargs) = 6;
-.DE
-.KE
-Returns  up  to  "count" bytes of   "data" from  the file  given by
-"file", starting at "offset" bytes from  the beginning of the file.
-The first byte of the file is  at offset zero.  The file attributes
-after the read takes place are returned in "attributes".
-.LP
-Note: The  argument "totalcount" is  unused, and is removed in the
-next protocol revision.
-.KS
-.NH 3
-\&Write to Cache
-.IX "NFS server procedures" NFSPROC_WRITECACHE() "" \fINFSPROC_WRITECACHE()\fP
-.DS
-void
-NFSPROC_WRITECACHE(void) = 7;
-.DE
-.KE
-To be used in the next protocol revision.
-.KS
-.NH 3
-\&Write to File
-.IX "NFS server procedures" NFSPROC_WRITE() "" \fINFSPROC_WRITE()\fP
-.DS
-struct writeargs {
-	fhandle file;          
-	unsigned beginoffset;  
-	unsigned offset;       
-	unsigned totalcount;   
-	opaque data<NFS_MAXDATA>;
-};
-
-attrstat	
-NFSPROC_WRITE(writeargs) = 8;
-.DE
-.KE
-Writes   "data" beginning  "offset"  bytes  from the  beginning  of
-"file".  The first byte  of  the file is at  offset  zero.  If  the
-reply "status" is NFS_OK, then  the reply "attributes" contains the
-attributes  of the file after the  write has  completed.  The write
-operation is atomic.  Data from this  call to 
-.I WRITE 
-will not be mixed with data from another client's calls.
-.LP
-Note: The arguments "beginoffset" and "totalcount" are ignored and
-are removed in the next protocol revision.
-.KS
-.NH 3
-\&Create File
-.IX "NFS server procedures" NFSPROC_CREATE() "" \fINFSPROC_CREATE()\fP
-.DS
-struct createargs {
-	diropargs where;
-	sattr attributes;
-};
-
-diropres
-NFSPROC_CREATE(createargs) = 9;
-.DE
-.KE
-The file "name" is created  in the directory given  by "dir".   The
-initial  attributes of the  new file  are given by "attributes".  A
-reply "status"  of NFS_OK indicates that the  file was created, and
-reply "file"   and   reply "attributes"  are    its file handle and
-attributes.   Any  other reply  "status"  means that  the operation
-failed and no file was created.
-.LP
-Note: This  routine should pass  an exclusive create flag, meaning
-"create the file only if it is not already there".
-.KS
-.NH 3
-\&Remove File
-.IX "NFS server procedures" NFSPROC_REMOVE() "" \fINFSPROC_REMOVE()\fP
-.DS
-stat
-NFSPROC_REMOVE(diropargs) = 10;
-.DE
-.KE
-The file "name" is  removed from the directory  given by "dir".   A
-reply of NFS_OK means the directory entry was removed.
-.LP
-Note: possibly non-idempotent operation.
-.KS
-.NH 3
-\&Rename File
-.IX "NFS server procedures" NFSPROC_RENAME() "" \fINFSPROC_RENAME()\fP
-.DS
-struct renameargs {
-	diropargs from;	
-	diropargs to;
-};
-
-stat
-NFSPROC_RENAME(renameargs) = 11;
-.DE
-.KE
-The existing file "from.name" in  the directory given by "from.dir"
-is renamed to "to.name" in the directory given by "to.dir".  If the
-reply  is 
-.I NFS_OK ,
-the file was  renamed.  The  
-RENAME  
-operation is
-atomic on the server; it cannot be interrupted in the middle.
-.LP
-Note: possibly non-idempotent operation.
-.KS
-.NH 3
-\&Create Link to File
-.IX "NFS server procedures" NFSPROC_LINK() "" \fINFSPROC_LINK()\fP
-.DS
-struct linkargs {
-	fhandle from;
-	diropargs to;
-};
-
-stat
-NFSPROC_LINK(linkargs) = 12;
-.DE
-.KE
-Creates the  file "to.name"  in the directory  given   by "to.dir",
-which is a hard link to the existing file given  by "from".  If the
-return value is 
-.I NFS_OK ,
-a link was created.  Any other return value
-indicates an error, and the link was not created.
-.LP
-A hard link should have the property that changes  to either of the
-linked files are reflected in both files.  When a hard link is made
-to a  file, the attributes  for  the file should  have  a value for
-"nlink" that is one greater than the value before the link.
-.LP
-Note: possibly non-idempotent operation.
-.KS
-.NH 3
-\&Create Symbolic Link
-.IX "NFS server procedures" NFSPROC_SYMLINK() "" \fINFSPROC_SYMLINK()\fP
-.DS
-struct symlinkargs {
-	diropargs from;
-	path to;
-	sattr attributes;
-};
-
-stat
-NFSPROC_SYMLINK(symlinkargs) = 13;
-.DE
-.KE
-Creates the  file "from.name" with  ftype  
-.I NFLNK 
-in  the  directory
-given by "from.dir".   The new file contains  the pathname "to" and
-has initial attributes given by "attributes".  If  the return value
-is 
-.I NFS_OK ,
-a link was created.  Any other return value indicates an
-error, and the link was not created.
-.LP
-A symbolic  link is  a pointer to another file.   The name given in
-"to" is  not interpreted by  the server, only stored in  the  newly
-created file.  When the client references a file that is a symbolic
-link, the contents of the symbolic  link are normally transparently
-reinterpreted  as a pathname  to substitute.   A 
-.I READLINK 
-operation returns the data to the client for interpretation.
-.LP
-Note:  On UNIX servers the attributes are never used, since
-symbolic links always have mode 0777.
-.KS
-.NH 3
-\&Create Directory
-.IX "NFS server procedures" NFSPROC_MKDIR() "" \fINFSPROC_MKDIR()\fP
-.DS
-diropres
-NFSPROC_MKDIR (createargs) = 14;
-.DE
-.KE
-The new directory "where.name" is created in the directory given by
-"where.dir".  The initial attributes of the new directory are given
-by "attributes".  A reply "status" of NFS_OK indicates that the new
-directory was created, and reply "file" and  reply "attributes" are
-its file  handle and attributes.  Any  other  reply "status"  means
-that the operation failed and no directory was created.
-.LP
-Note: possibly non-idempotent operation.
-.KS
-.NH 3
-\&Remove Directory
-.IX "NFS server procedures" NFSPROC_RMDIR() "" \fINFSPROC_RMDIR()\fP
-.DS
-stat
-NFSPROC_RMDIR(diropargs) = 15;
-.DE
-.KE
-The existing empty directory "name" in the directory given by "dir"
-is removed.  If the reply is 
-.I NFS_OK ,
-the directory was removed.
-.LP
-Note: possibly non-idempotent operation.
-.KS
-.NH 3
-\&Read From Directory
-.IX "NFS server procedures" NFSPROC_READDIR() "" \fINFSPROC_READDIR()\fP
-.DS
-struct readdirargs {
-	fhandle dir;            
-	nfscookie cookie;
-	unsigned count;         
-};
-
-struct entry {
-	unsigned fileid;
-	filename name;
-	nfscookie cookie;
-	entry *nextentry;
-};
-
-union readdirres switch (stat status) {
-	case NFS_OK:
-		struct {
-			entry *entries;
-			bool eof;
-		} readdirok;
-	default:
-		void;
-};
-
-readdirres
-NFSPROC_READDIR (readdirargs) = 16;
-.DE
-.KE
-Returns a variable number of  directory entries,  with a total size
-of up to "count" bytes, from the directory given  by "dir".  If the
-returned  value of "status"  is 
-.I NFS_OK ,
-then  it  is followed  by a
-variable  number  of "entry"s.    Each "entry" contains  a "fileid"
-which consists of a  unique number  to identify the  file within  a
-filesystem,  the  "name" of the  file, and a "cookie" which   is an
-opaque pointer to the next entry in  the  directory.  The cookie is
-used  in the next  
-.I READDIR 
-call to get more  entries  starting at a
-given point in  the directory.  The  special cookie zero (all  bits
-zero) can be used to get the entries starting  at the  beginning of
-the directory.  The "fileid" field should be the same number as the
-"fileid" in the the  attributes of the  file.  (See the
-.I "Basic Data Types"
-section.) 
-The "eof" flag has a value of
-.I TRUE 
-if there are no more entries in the directory.
-.KS
-.NH 3
-\&Get Filesystem Attributes
-.IX "NFS server procedures" NFSPROC_STATFS() "" \fINFSPROC_STATFS()\fP
-.DS
-union statfsres (stat status) {
-	case NFS_OK:
-		struct {
-			unsigned tsize; 
-			unsigned bsize; 
-			unsigned blocks;
-			unsigned bfree; 
-			unsigned bavail;
-		} info;
-	default:
-		void;
-};
-
-statfsres
-NFSPROC_STATFS(fhandle) = 17;
-.DE
-.KE
-If the  reply "status"  is 
-.I NFS_OK ,
-then the  reply "info" gives the
-attributes for the filesystem that contains file referred to by the
-input fhandle.  The attribute fields contain the following values:
-.IP tsize:   
-The optimum transfer size of the server in bytes.  This is
-the number  of bytes the server  would like to have in the
-data part of READ and WRITE requests.
-.IP bsize:   
-The block size in bytes of the filesystem.
-.IP blocks:  
-The total number of "bsize" blocks on the filesystem.
-.IP bfree:   
-The number of free "bsize" blocks on the filesystem.
-.IP bavail:  
-The number of  "bsize" blocks  available to non-privileged users.
-.LP
-Note: This call does not  work well if a  filesystem has  variable
-size blocks.
-.NH 1
-\&NFS Implementation Issues
-.IX NFS implementation
-.LP
-The NFS protocol is designed to be operating system independent, but
-since this version was designed in a UNIX environment, many
-operations have semantics similar to the operations of the UNIX file
-system.  This section discusses some of the implementation-specific
-semantic issues.
-.NH 2
-\&Server/Client Relationship
-.IX NFS "server/client relationship"
-.LP
-The NFS protocol is designed to allow servers to be as simple and
-general as possible.  Sometimes the simplicity of the server can be a
-problem, if the client wants to implement complicated filesystem
-semantics.
-.LP
-For example, some operating systems allow removal of open files.  A
-process can open a file and, while it is open, remove it from the
-directory.  The file can be read and written as long as the process
-keeps it open, even though the file has no name in the filesystem.
-It is impossible for a stateless server to implement these semantics.
-The client can do some tricks such as renaming the file on remove,
-and only removing it on close.  We believe that the server provides
-enough functionality to implement most file system semantics on the
-client.
-.LP
-Every NFS client can also potentially be a server, and remote and
-local mounted filesystems can be freely intermixed.  This leads to
-some interesting problems when a client travels down the directory
-tree of a remote filesystem and reaches the mount point on the server
-for another remote filesystem.  Allowing the server to follow the
-second remote mount would require loop detection, server lookup, and
-user revalidation.  Instead, we decided not to let clients cross a
-server's mount point.  When a client does a LOOKUP on a directory on
-which the server has mounted a filesystem, the client sees the
-underlying directory instead of the mounted directory.  A client can
-do remote mounts that match the server's mount points to maintain the
-server's view.
-.LP
-.NH 2
-\&Pathname Interpretation
-.IX NFS "pathname interpretation"
-.LP
-There are a few complications to the rule that pathnames are always
-parsed on the client.  For example, symbolic links could have
-different interpretations on different clients.  Another common
-problem for non-UNIX implementations is the special interpretation of
-the pathname ".."  to mean the parent of a given directory.  The next
-revision of the protocol uses an explicit flag to indicate the parent
-instead.
-.NH 2
-\&Permission Issues
-.IX NFS "permission issues"
-.LP
-The NFS protocol, strictly speaking, does not define the permission
-checking used  by servers.  However,  it is  expected that a server
-will do normal operating system permission checking using 
-.I AUTH_UNIX 
-style authentication as the basis of its protection mechanism.  The
-server gets the client's effective "uid", effective "gid", and groups
-on each call and uses them to check permission.  There are various
-problems with this method that can been resolved in interesting ways.
-.LP
-Using "uid" and "gid" implies that the client and server share the
-same "uid" list.  Every server and client pair must have the same
-mapping from user to "uid" and from group to "gid".  Since every
-client can also be a server, this tends to imply that the whole
-network shares the same "uid/gid" space.
-.I AUTH_DES 
-(and the  next
-revision of the NFS protocol) uses string names instead of numbers,
-but there are still complex problems to be solved.
-.LP
-Another problem arises due to the usually stateful open operation.
-Most operating systems check permission at open time, and then check
-that the file is open on each read and write request.  With stateless
-servers, the server has no idea that the file is open and must do
-permission checking on each read and write call.  On a local
-filesystem, a user can open a file and then change the permissions so
-that no one is allowed to touch it, but will still be able to write
-to the file because it is open.  On a remote filesystem, by contrast,
-the write would fail.  To get around this problem, the server's
-permission checking algorithm should allow the owner of a file to
-access it regardless of the permission setting.
-.LP
-A similar problem has to do with paging in from a file over the
-network.  The operating system usually checks for execute permission
-before opening a file for demand paging, and then reads blocks from
-the open file.  The file may not have read permission, but after it
-is opened it doesn't matter.  An NFS server can not tell the
-difference between a normal file read and a demand page-in read.  To
-make this work, the server allows reading of files if the "uid" given
-in the call has execute or read permission on the file.
-.LP
-In most operating systems, a particular user (on the user ID zero)
-has access to all files no matter what permission and ownership they
-have.  This "super-user" permission may not be allowed on the server,
-since anyone who can become super-user on their workstation could
-gain access to all remote files.  The UNIX server by default maps
-user id 0 to -2 before doing its access checking.  This works except
-for NFS root filesystems, where super-user access cannot be avoided.
-.NH 2
-\&Setting RPC Parameters
-.IX NFS "setting RPC parameters"
-.LP
-Various file system parameters and options should be set at mount
-time.  The mount protocol is described in the appendix below.  For
-example, "Soft" mounts as well as "Hard" mounts are usually both
-provided.  Soft mounted file systems return errors when RPC
-operations fail (after a given number of optional retransmissions),
-while hard mounted file systems continue to retransmit forever.
-Clients and servers may need to keep caches of recent operations to
-help avoid problems with non-idempotent operations.
-.NH 1
-\&Mount Protocol Definition
-.IX "mount protocol" "" "" "" PAGE MAJOR
-.sp 1
-.NH 2
-\&Introduction
-.IX "mount protocol" introduction
-.LP
-The mount protocol is separate from, but related to, the NFS
-protocol.  It provides operating system specific services to get the
-NFS off the ground -- looking up server path names, validating user
-identity, and checking access permissions.  Clients use the mount
-protocol to get the first file handle, which allows them entry into a
-remote filesystem.
-.LP
-The mount protocol is kept separate from the NFS protocol to make it
-easy to plug in new access checking and validation methods without
-changing the NFS server protocol.
-.LP
-Notice that the protocol definition implies stateful servers because
-the server maintains a list of client's mount requests.  The mount
-list information is not critical for the correct functioning of
-either the client or the server.  It is intended for advisory use
-only, for example, to warn possible clients when a server is going
-down.
-.LP
-Version one of the mount protocol is used with version two of the NFS
-protocol.  The only connecting point is the
-.I fhandle 
-structure, which is the same for both protocols.
-.NH 2
-\&RPC Information
-.IX "mount protocol"  "RPC information"
-.IP \fIAuthentication\fP
-The mount service uses 
-.I AUTH_UNIX 
-and 
-.I AUTH_DES 
-style authentication only.
-.IP "\fITransport Protocols\fP"
-The mount service is currently supported on UDP/IP only.
-.IP "\fIPort Number\fP"
-Consult the server's portmapper, described in the chapter
-.I "Remote Procedure Calls: Protocol Specification",
-to  find  the  port number on which the mount service is registered.
-.NH 2
-\&Sizes of XDR Structures
-.IX "mount protocol" "XDR structure sizes"
-.LP
-These  are  the sizes,   given  in  decimal   bytes, of various XDR
-structures used in the protocol:
-.DS
-/* \fIThe maximum number of bytes in a pathname argument\fP */
-const MNTPATHLEN = 1024;
-
-/* \fIThe maximum number of bytes in a name argument\fP */
-const MNTNAMLEN = 255;
-
-/* \fIThe size in bytes of the opaque file handle\fP */
-const FHSIZE = 32;
-.DE
-.NH 2
-\&Basic Data Types
-.IX "mount protocol" "basic data types"
-.IX "mount data types"
-.LP
-This section presents the data  types used by  the  mount protocol.
-In many cases they are similar to the types used in NFS.
-.KS
-.NH 3
-\&fhandle
-.IX "mount data types" fhandle "" \fIfhandle\fP
-.DS
-typedef opaque fhandle[FHSIZE];
-.DE
-.KE
-The type 
-.I fhandle 
-is the file handle that the server passes to the
-client.  All file operations are done  using file handles  to refer
-to a  file  or directory.   The  file handle  can  contain whatever
-information the server needs to distinguish an individual file.
-.LP
-This  is the  same as the "fhandle" XDR definition in version 2 of
-the NFS protocol;  see 
-.I "Basic Data Types"
-in the definition of the NFS protocol, above.
-.KS
-.NH 3
-\&fhstatus
-.IX "mount data types" fhstatus "" \fIfhstatus\fP
-.DS
-union fhstatus switch (unsigned status) {
-	case 0:
-		fhandle directory;
-	default:
-		void;
-};
-.DE
-.KE
-The type 
-.I fhstatus 
-is a union.  If a "status" of zero is returned,
-the  call completed   successfully, and  a  file handle   for   the
-"directory"  follows.  A  non-zero  status indicates  some  sort of
-error.  In this case the status is a UNIX error number.
-.KS
-.NH 3
-\&dirpath
-.IX "mount data types" dirpath "" \fIdirpath\fP
-.DS
-typedef string dirpath<MNTPATHLEN>;
-.DE
-.KE
-The type 
-.I dirpath 
-is a server pathname of a directory.
-.KS
-.NH 3
-\&name
-.IX "mount data types" name "" \fIname\fP
-.DS
-typedef string name<MNTNAMLEN>;
-.DE
-.KE
-The type 
-.I name 
-is an arbitrary string used for various names.
-.NH 2
-\&Server Procedures
-.IX "mount server procedures"
-.LP
-The following sections define the RPC procedures  supplied by a
-mount server.
-.ie t .DS
-.el .DS L
-.ft I
-/*
-* Protocol description for the mount program
-*/
-.ft CW
-
-program MOUNTPROG {
-.ft I
-/*
-* Version 1 of the mount protocol used with
-* version 2 of the NFS protocol.
-*/
-.ft CW
-	version MOUNTVERS {
-		void        MOUNTPROC_NULL(void)    = 0;
-		fhstatus    MOUNTPROC_MNT(dirpath)  = 1;
-		mountlist   MOUNTPROC_DUMP(void)    = 2;
-		void        MOUNTPROC_UMNT(dirpath) = 3;
-		void        MOUNTPROC_UMNTALL(void) = 4;
-		exportlist  MOUNTPROC_EXPORT(void)  = 5;
-	} = 1;
-} = 100005;
-.DE
-.KS
-.NH 3
-\&Do Nothing
-.IX "mount server procedures" MNTPROC_NULL() "" \fIMNTPROC_NULL()\fP
-.DS
-void 
-MNTPROC_NULL(void) = 0;
-.DE
-.KE
-This  procedure does no work.  It   is  made  available in all  RPC
-services to allow server response testing and timing.
-.KS
-.NH 3
-\&Add Mount Entry
-.IX "mount server procedures" MNTPROC_MNT() "" \fIMNTPROC_MNT()\fP
-.DS
-fhstatus
-MNTPROC_MNT(dirpath) = 1;
-.DE
-.KE
-If the reply "status" is 0, then the reply "directory" contains the
-file handle for the directory "dirname".  This file handle may be
-used in the NFS protocol.  This procedure also adds a new entry to
-the mount list for this client mounting "dirname".
-.KS
-.NH 3
-\&Return Mount Entries
-.IX "mount server procedures" MNTPROC_DUMP() "" \fIMNTPROC_DUMP()\fP
-.DS
-struct *mountlist {
-	name      hostname;
-	dirpath   directory;
-	mountlist nextentry;
-};
-
-mountlist
-MNTPROC_DUMP(void) = 2;
-.DE
-.KE
-Returns  the list of  remote mounted filesystems.   The "mountlist"
-contains one entry for each "hostname" and "directory" pair.
-.KS
-.NH 3
-\&Remove Mount Entry
-.IX "mount server procedures" MNTPROC_UMNT() "" \fIMNTPROC_UMNT()\fP
-.DS
-void
-MNTPROC_UMNT(dirpath) = 3;
-.DE
-.KE
-Removes the mount list entry for the input "dirpath".
-.KS
-.NH 3
-\&Remove All Mount Entries
-.IX "mount server procedures" MNTPROC_UMNTALL() "" \fIMNTPROC_UMNTALL()\fP
-.DS
-void
-MNTPROC_UMNTALL(void) = 4;
-.DE
-.KE
-Removes all of the mount list entries for this client.
-.KS
-.NH 3
-\&Return Export List
-.IX "mount server procedures" MNTPROC_EXPORT() "" \fIMNTPROC_EXPORT()\fP
-.DS
-struct *groups {
-	name grname;
-	groups grnext;
-};
-
-struct *exportlist {
-	dirpath filesys;
-	groups groups;
-	exportlist next;
-};
-
-exportlist
-MNTPROC_EXPORT(void) = 5;
-.DE
-.KE
-Returns a variable number of export list entries.  Each entry
-contains a filesystem name and a list of groups that are allowed to
-import it.  The filesystem name is in "filesys", and the group name
-is in the list "groups".
-.LP
-Note:  The exportlist should contain
-more information about the status of the filesystem, such as a
-read-only flag.
diff --git a/lib/libc/rpc/PSD.doc/rpc.prog.ms b/lib/libc/rpc/PSD.doc/rpc.prog.ms
deleted file mode 100644
index 1fbde7d..0000000
--- a/lib/libc/rpc/PSD.doc/rpc.prog.ms
+++ /dev/null
@@ -1,2686 +0,0 @@
-.\"
-.\" Must use -- tbl and pic -- with this one
-.\"
-.\" @(#)rpc.prog.ms	2.3 88/08/11 4.0 RPCSRC
-.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/rpc.prog.ms,v 1.5 2003/01/01 18:48:43 schweikh Exp $
-.\"
-.de BT
-.if \\n%=1 .tl ''- % -''
-..
-.nr OF 0
-.ND
-.\" prevent excess underlining in nroff
-.if n .fp 2 R
-.OH 'Remote Procedure Call Programming Guide''Page %'
-.EH 'Page %''Remote Procedure Call Programming Guide'
-.SH
-\&Remote Procedure Call Programming Guide
-.nr OF 1
-.IX "Network Programming" "" "" "" PAGE MAJOR
-.IX "RPC Programming Guide"
-.LP
-This document assumes a working knowledge of network theory.  It is
-intended for programmers who wish to write network applications using
-remote procedure calls (explained below), and who want to understand
-the RPC mechanisms usually hidden by the
-.I rpcgen(1)
-protocol compiler.
-.I rpcgen
-is described in detail in the previous chapter, the
-.I "\fBrpcgen\fP \fIProgramming Guide\fP".
-.SH
-Note:
-.I
-.IX rpcgen "" \fIrpcgen\fP
-Before attempting to write a network application, or to convert an
-existing non-network application to run over the network, you may want to
-understand the material in this chapter.  However, for most applications,
-you can circumvent the need to cope with the details presented here by using
-.I rpcgen .
-The
-.I "Generating XDR Routines"
-section of that chapter contains the complete source for a working RPC
-service\(ema remote directory listing service which uses
-.I rpcgen
-to generate XDR routines as well as client and server stubs.
-.LP
-.LP
-What are remote procedure calls?  Simply put, they are the high-level
-communications paradigm used in the operating system.
-RPC presumes the existence of
-low-level networking mechanisms (such as TCP/IP and UDP/IP), and upon them
-it implements a logical client to server communications system designed
-specifically for the support of network applications.  With RPC, the client
-makes a procedure call to send a data packet to the server.  When the
-packet arrives, the server calls a dispatch routine, performs whatever
-service is requested, sends back the reply, and the procedure call returns
-to the client.
-.NH 0
-\&Layers of RPC
-.IX "layers of RPC"
-.IX "RPC" "layers"
-.LP
-The RPC interface can be seen as being divided into three layers.\**
-.FS
-For a complete specification of the routines in the remote procedure
-call Library, see the
-.I rpc(3N)
-manual page.
-.FE
-.LP
-.I "The Highest Layer:"
-.IX RPC "The Highest Layer"
-The highest layer is totally transparent to the operating system,
-machine and network upon which is is run.  It's probably best to
-think of this level as a way of
-.I using
-RPC, rather than as
-a \fIpart of\fP RPC proper.  Programmers who write RPC routines
-should (almost) always make this layer available to others by way
-of a simple C front end that entirely hides the networking.
-.LP
-To illustrate, at this level a program can simply make a call to
-.I rnusers (),
-a C routine which returns the number of users on a remote machine.
-The user is not explicitly aware of using RPC \(em they simply
-call a procedure, just as they would call
-.I malloc() .
-.LP
-.I "The Middle Layer:"
-.IX RPC "The Middle Layer"
-The middle layer is really \*QRPC proper.\*U  Here, the user doesn't
-need to consider details about sockets, the UNIX system, or other low-level
-implementation mechanisms.  They simply make remote procedure calls
-to routines on other machines.  The selling point here is simplicity.
-It's this layer that allows RPC to pass the \*Qhello world\*U test \(em
-simple things should be simple.  The middle-layer routines are used
-for most applications.
-.LP
-RPC calls are made with the system routines
-.I registerrpc()
-.I callrpc()
-and
-.I svc_run ().
-The first two of these are the most fundamental:
-.I registerrpc()
-obtains a unique system-wide procedure-identification number, and
-.I callrpc()
-actually executes a remote procedure call.  At the middle level, a
-call to
-.I rnusers()
-is implemented by way of these two routines.
-.LP
-The middle layer is unfortunately rarely used in serious programming
-due to its inflexibility (simplicity).  It does not allow timeout
-specifications or the choice of transport.  It allows no UNIX
-process control or flexibility in case of errors.  It doesn't support
-multiple kinds of call authentication.  The programmer rarely needs
-all these kinds of control, but one or two of them is often necessary.
-.LP
-.I "The Lowest Layer:"
-.IX RPC "The Lowest Layer"
-The lowest layer does allow these details to be controlled by the
-programmer, and for that reason it is often necessary.  Programs
-written at this level are also most efficient, but this is rarely a
-real issue \(em since RPC clients and servers rarely generate
-heavy network loads.
-.LP
-Although this document only discusses the interface to C,
-remote procedure calls can be made from any language.
-Even though this document discusses RPC
-when it is used to communicate
-between processes on different machines,
-it works just as well for communication
-between different processes on the same machine.
-.br
-.KS
-.NH 2
-\&The RPC Paradigm
-.IX RPC paradigm
-.LP
-Here is a diagram of the RPC paradigm:
-.LP
-\fBFigure 1-1\fI Network Communication with the Remote Reocedure Call\fR
-.LP
-.PS
-L1: arrow down 1i "client " rjust "program " rjust
-L2: line right 1.5i "\fIcallrpc\fP" "function"
-move up 1.5i; line dotted down 6i; move up 4.5i
-arrow right 1i
-L3: arrow down 1i "invoke " rjust "service " rjust
-L4: arrow right 1.5i "call" "service"
-L5: arrow down 1i " service" ljust " executes" ljust
-L6: arrow left 1.5i "\fIreturn\fP" "answer"
-L7: arrow down 1i "request " rjust "completed " rjust
-L8: line left 1i
-arrow left 1.5i "\fIreturn\fP" "reply"
-L9: arrow down 1i "program " rjust "continues " rjust
-line dashed down from L2 to L9
-line dashed down from L4 to L7
-line dashed up 1i from L3 "service " rjust "daemon " rjust
-arrow dashed down 1i from L8
-move right 1i from L3
-box invis "Machine B"
-move left 1.2i from L2; move down
-box invis "Machine A"
-.PE
-.KE
-.KS
-.NH 1
-\&Higher Layers of RPC
-.NH 2
-\&Highest Layer
-.IX "highest layer of RPC"
-.IX RPC "highest layer"
-.LP
-Imagine you're writing a program that needs to know
-how many users are logged into a remote machine.
-You can do this by calling the RPC library routine
-.I rnusers()
-as illustrated below:
-.ie t .DS
-.el .DS L
-.ft CW
-#include <stdio.h>
-
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	int num;
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: rnusers hostname\en");
-		exit(1);
-	}
-	if ((num = rnusers(argv[1])) < 0) {
-		fprintf(stderr, "error: rnusers\en");
-		exit(-1);
-	}
-	printf("%d users on %s\en", num, argv[1]);
-	exit(0);
-}
-.DE
-.KE
-RPC library routines such as
-.I rnusers()
-are in the RPC services library
-.I librpcsvc.a
-Thus, the program above should be compiled with
-.DS
-.ft CW
-% cc \fIprogram.c -lrpcsvc\fP
-.DE
-.I rnusers (),
-like the other RPC library routines, is documented in section 3R
-of the
-.I "System Interface Manual for the Sun Workstation" ,
-the same section which documents the standard Sun RPC services.
-.IX "RPC Services"
-See the
-.I intro(3R)
-manual page for an explanation of the documentation strategy
-for these services and their RPC protocols.
-.LP
-Here are some of the RPC service library routines available to the
-C programmer:
-.LP
-\fBTable 3-3\fI RPC Service Library Routines\fR
-.TS
-box tab (&) ;
-cfI cfI
-lfL l .
-Routine&Description
-_
-.sp .5
-rnusers&Return number of users on remote machine
-rusers&Return information about users on remote machine
-havedisk&Determine if remote machine has disk
-rstats&Get performance data from remote kernel
-rwall&Write to specified remote machines
-yppasswd&Update user password in Yellow Pages
-.TE
-.LP
-Other RPC services \(em for example
-.I ether()
-.I mount
-.I rquota()
-and
-.I spray
-\(em are not available to the C programmer as library routines.
-They do, however,
-have RPC program numbers so they can be invoked with
-.I callrpc()
-which will be discussed in the next section.  Most of them also
-have compilable
-.I rpcgen(1)
-protocol description files.  (The
-.I rpcgen
-protocol compiler radically simplifies the process of developing
-network applications.
-See the \fBrpcgen\fI Programming Guide\fR
-for detailed information about
-.I rpcgen
-and
-.I rpcgen
-protocol description files).
-.KS
-.NH 2
-\&Intermediate Layer
-.IX "intermediate layer of RPC"
-.IX "RPC" "intermediate layer"
-.LP
-The simplest interface, which explicitly makes RPC calls, uses the
-functions
-.I callrpc()
-and
-.I registerrpc()
-Using this method, the number of remote users can be gotten as follows:
-.ie t .DS
-.el .DS L
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <utmp.h>
-#include <rpcsvc/rusers.h>
-
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	unsigned long nusers;
-	int stat;
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: nusers hostname\en");
-		exit(-1);
-	}
-	if (stat = callrpc(argv[1],
-	  RUSERSPROG, RUSERSVERS, RUSERSPROC_NUM,
-	  xdr_void, 0, xdr_u_long, &nusers) != 0) {
-		clnt_perrno(stat);
-		exit(1);
-	}
-	printf("%d users on %s\en", nusers, argv[1]);
-	exit(0);
-}
-.DE
-.KE
-Each RPC procedure is uniquely defined by a program number,
-version number, and procedure number.  The program number
-specifies a group of related remote procedures, each of
-which has a different procedure number.  Each program also
-has a version number, so when a minor change is made to a
-remote service (adding a new procedure, for example), a new
-program number doesn't have to be assigned.  When you want
-to call a procedure to find the number of remote users, you
-look up the appropriate program, version and procedure numbers
-in a manual, just as you look up the name of a memory allocator
-when you want to allocate memory.
-.LP
-The simplest way of making remote procedure calls is with the the RPC
-library routine
-.I callrpc()
-It has eight parameters.  The first is the name of the remote server
-machine.  The next three parameters are the program, version, and procedure
-numbers\(emtogether they identify the procedure to be called.
-The fifth and sixth parameters are an XDR filter and an argument to
-be encoded and passed to the remote procedure.
-The final two parameters are a filter for decoding the results
-returned by the remote procedure and a pointer to the place where
-the procedure's results are to be stored.  Multiple arguments and
-results are handled by embedding them in structures.  If
-.I callrpc()
-completes successfully, it returns zero; else it returns a nonzero
-value.  The return codes (of type
-.IX "enum clnt_stat (in RPC programming)" "" "\fIenum clnt_stat\fP (in RPC programming)"
-cast into an integer) are found in
-.I <rpc/clnt.h> .
-.LP
-Since data types may be represented differently on different machines,
-.I callrpc()
-needs both the type of the RPC argument, as well as
-a pointer to the argument itself (and similarly for the result).  For
-.I RUSERSPROC_NUM ,
-the return value is an
-.I "unsigned long"
-so
-.I callrpc()
-has
-.I xdr_u_long()
-as its first return parameter, which says
-that the result is of type
-.I "unsigned long"
-and
-.I &nusers
-as its second return parameter,
-which is a pointer to where the long result will be placed.  Since
-.I RUSERSPROC_NUM
-takes no argument, the argument parameter of
-.I callrpc()
-is
-.I xdr_void ().
-.LP
-After trying several times to deliver a message, if
-.I callrpc()
-gets no answer, it returns with an error code.
-The delivery mechanism is UDP,
-which stands for User Datagram Protocol.
-Methods for adjusting the number of retries
-or for using a different protocol require you to use the lower
-layer of the RPC library, discussed later in this document.
-The remote server procedure
-corresponding to the above might look like this:
-.ie t .DS
-.el .DS L
-.ft CW
-.ft CW
-char *
-nuser(indata)
-	char *indata;
-{
-	unsigned long nusers;
-
-.ft I
-	/*
-	 * Code here to compute the number of users
-	 * and place result in variable \fInusers\fP.
-	 */
-.ft CW
-	return((char *)&nusers);
-}
-.DE
-.LP
-It takes one argument, which is a pointer to the input
-of the remote procedure call (ignored in our example),
-and it returns a pointer to the result.
-In the current version of C,
-character pointers are the generic pointers,
-so both the input argument and the return value are cast to
-.I "char *" .
-.LP
-Normally, a server registers all of the RPC calls it plans
-to handle, and then goes into an infinite loop waiting to service requests.
-In this example, there is only a single procedure
-to register, so the main body of the server would look like this:
-.ie t .DS
-.el .DS L
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <utmp.h>
-#include <rpcsvc/rusers.h>
-
-char *nuser();
-
-main()
-{
-	registerrpc(RUSERSPROG, RUSERSVERS, RUSERSPROC_NUM,
-		nuser, xdr_void, xdr_u_long);
-	svc_run();		/* \fINever returns\fP */
-	fprintf(stderr, "Error: svc_run returned!\en");
-	exit(1);
-}
-.DE
-.LP
-The
-.I registerrpc()
-routine registers a C procedure as corresponding to a
-given RPC procedure number.  The first three parameters,
-.I RUSERPROG ,
-.I RUSERSVERS ,
-and
-.I RUSERSPROC_NUM
-are the program, version, and procedure numbers
-of the remote procedure to be registered;
-.I nuser()
-is the name of the local procedure that implements the remote
-procedure; and
-.I xdr_void()
-and
-.I xdr_u_long()
-are the XDR filters for the remote procedure's arguments and
-results, respectively.  (Multiple arguments or multiple results
-are passed as structures).
-.LP
-Only the UDP transport mechanism can use
-.I registerrpc()
-thus, it is always safe in conjunction with calls generated by
-.I callrpc() .
-.SH
-.IX "UDP 8K warning"
-Warning: the UDP transport mechanism can only deal with
-arguments and results less than 8K bytes in length.
-.LP
-.LP
-After registering the local procedure, the server program's
-main procedure calls
-.I svc_run (),
-the RPC library's remote procedure dispatcher.  It is this
-function that calls the remote procedures in response to RPC
-call messages.  Note that the dispatcher takes care of decoding
-remote procedure arguments and encoding results, using the XDR
-filters specified when the remote procedure was registered.
-.NH 2
-\&Assigning Program Numbers
-.IX "program number assignment"
-.IX "assigning program numbers"
-.LP
-Program numbers are assigned in groups of
-.I 0x20000000
-according to the following chart:
-.DS
-.ft CW
-       0x0 - 0x1fffffff	\fRDefined by Sun\fP
-0x20000000 - 0x3fffffff	\fRDefined by user\fP
-0x40000000 - 0x5fffffff	\fRTransient\fP
-0x60000000 - 0x7fffffff	\fRReserved\fP
-0x80000000 - 0x9fffffff	\fRReserved\fP
-0xa0000000 - 0xbfffffff	\fRReserved\fP
-0xc0000000 - 0xdfffffff	\fRReserved\fP
-0xe0000000 - 0xffffffff	\fRReserved\fP
-.ft R
-.DE
-Sun Microsystems administers the first group of numbers, which
-should be identical for all Sun customers.  If a customer
-develops an application that might be of general interest, that
-application should be given an assigned number in the first
-range.  The second group of numbers is reserved for specific
-customer applications.  This range is intended primarily for
-debugging new programs.  The third group is reserved for
-applications that generate program numbers dynamically.  The
-final groups are reserved for future use, and should not be
-used.
-.LP
-To register a protocol specification, send a request by network
-mail to
-.I rpc@sun
-or write to:
-.DS
-RPC Administrator
-Sun Microsystems
-2550 Garcia Ave.
-Mountain View, CA 94043
-.DE
-Please include a compilable
-.I rpcgen
-\*Q.x\*U file describing your protocol.
-You will be given a unique program number in return.
-.IX RPC administration
-.IX administration "of RPC"
-.LP
-The RPC program numbers and protocol specifications
-of standard Sun RPC services can be
-found in the include files in
-.I "/usr/include/rpcsvc" .
-These services, however, constitute only a small subset
-of those which have been registered.  The complete list of
-registered programs, as of the time when this manual was
-printed, is:
-.LP
-\fBTable 3-2\fI RPC Registered Programs\fR
-.TS H
-box tab (&) ;
-lfBI lfBI lfBI
-lfL lfL lfI .
-RPC Number&Program&Description
-_
-.TH
-.sp .5
-100000&PMAPPROG&portmapper
-100001&RSTATPROG&remote stats
-100002&RUSERSPROG&remote users
-100003&NFSPROG&nfs
-100004&YPPROG&Yellow Pages
-100005&MOUNTPROG&mount daemon
-100006&DBXPROG&remote dbx
-100007&YPBINDPROG&yp binder
-100008&WALLPROG&shutdown msg
-100009&YPPASSWDPROG&yppasswd server
-100010&ETHERSTATPROG&ether stats
-100011&RQUOTAPROG&disk quotas
-100012&SPRAYPROG&spray packets
-100013&IBM3270PROG&3270 mapper
-100014&IBMRJEPROG&RJE mapper
-100015&SELNSVCPROG&selection service
-100016&RDATABASEPROG&remote database access
-100017&REXECPROG&remote execution
-100018&ALICEPROG&Alice Office Automation
-100019&SCHEDPROG&scheduling service
-100020&LOCKPROG&local lock manager
-100021&NETLOCKPROG&network lock manager
-100022&X25PROG&x.25 inr protocol
-100023&STATMON1PROG&status monitor 1
-100024&STATMON2PROG&status monitor 2
-100025&SELNLIBPROG&selection library
-100026&BOOTPARAMPROG&boot parameters service
-100027&MAZEPROG&mazewars game
-100028&YPUPDATEPROG&yp update
-100029&KEYSERVEPROG&key server
-100030&SECURECMDPROG&secure login
-100031&NETFWDIPROG&nfs net forwarder init
-100032&NETFWDTPROG&nfs net forwarder trans
-100033&SUNLINKMAP_PROG&sunlink MAP
-100034&NETMONPROG&network monitor
-100035&DBASEPROG&lightweight database
-100036&PWDAUTHPROG&password authorization
-100037&TFSPROG&translucent file svc
-100038&NSEPROG&nse server
-100039&NSE_ACTIVATE_PROG&nse activate daemon
-.sp .2i
-150001&PCNFSDPROG&pc passwd authorization
-.sp .2i
-200000&PYRAMIDLOCKINGPROG&Pyramid-locking
-200001&PYRAMIDSYS5&Pyramid-sys5
-200002&CADDS_IMAGE&CV cadds_image
-.sp .2i
-300001&ADT_RFLOCKPROG&ADT file locking
-.TE
-.NH 2
-\&Passing Arbitrary Data Types
-.IX "arbitrary data types"
-.LP
-In the previous example, the RPC call passes a single
-.I "unsigned long"
-RPC can handle arbitrary data structures, regardless of
-different machines' byte orders or structure layout conventions,
-by always converting them to a network standard called
-.I "External Data Representation"
-(XDR) before
-sending them over the wire.
-The process of converting from a particular machine representation
-to XDR format is called
-.I serializing ,
-and the reverse process is called
-.I deserializing .
-The type field parameters of
-.I callrpc()
-and
-.I registerrpc()
-can be a built-in procedure like
-.I xdr_u_long()
-in the previous example, or a user supplied one.
-XDR has these built-in type routines:
-.IX RPC "built-in routines"
-.DS
-.ft CW
-xdr_int()      xdr_u_int()      xdr_enum()
-xdr_long()     xdr_u_long()     xdr_bool()
-xdr_short()    xdr_u_short()    xdr_wrapstring()
-xdr_char()     xdr_u_char()
-.DE
-Note that the routine
-.I xdr_string()
-exists, but cannot be used with
-.I callrpc()
-and
-.I registerrpc (),
-which only pass two parameters to their XDR routines.
-.I xdr_wrapstring()
-has only two parameters, and is thus OK.  It calls
-.I xdr_string ().
-.LP
-As an example of a user-defined type routine,
-if you wanted to send the structure
-.DS
-.ft CW
-struct simple {
-	int a;
-	short b;
-} simple;
-.DE
-then you would call
-.I callrpc()
-as
-.DS
-.ft CW
-callrpc(hostname, PROGNUM, VERSNUM, PROCNUM,
-        xdr_simple, &simple ...);
-.DE
-where
-.I xdr_simple()
-is written as:
-.ie t .DS
-.el .DS L
-.ft CW
-#include <rpc/rpc.h>
-
-xdr_simple(xdrsp, simplep)
-	XDR *xdrsp;
-	struct simple *simplep;
-{
-	if (!xdr_int(xdrsp, &simplep->a))
-		return (0);
-	if (!xdr_short(xdrsp, &simplep->b))
-		return (0);
-	return (1);
-}
-.DE
-.LP
-An XDR routine returns nonzero (true in the sense of C) if it
-completes successfully, and zero otherwise.
-A complete description of XDR is in the
-.I "XDR Protocol Specification"
-section of this manual, only few implementation examples are
-given here.
-.LP
-In addition to the built-in primitives,
-there are also the prefabricated building blocks:
-.DS
-.ft CW
-xdr_array()       xdr_bytes()     xdr_reference()
-xdr_vector()      xdr_union()     xdr_pointer()
-xdr_string()      xdr_opaque()
-.DE
-To send a variable array of integers,
-you might package them up as a structure like this
-.DS
-.ft CW
-struct varintarr {
-	int *data;
-	int arrlnth;
-} arr;
-.DE
-and make an RPC call such as
-.DS
-.ft CW
-callrpc(hostname, PROGNUM, VERSNUM, PROCNUM,
-        xdr_varintarr, &arr...);
-.DE
-with
-.I xdr_varintarr()
-defined as:
-.ie t .DS
-.el .DS L
-.ft CW
-xdr_varintarr(xdrsp, arrp)
-	XDR *xdrsp;
-	struct varintarr *arrp;
-{
-	return (xdr_array(xdrsp, &arrp->data, &arrp->arrlnth,
-		MAXLEN, sizeof(int), xdr_int));
-}
-.DE
-This routine takes as parameters the XDR handle,
-a pointer to the array, a pointer to the size of the array,
-the maximum allowable array size,
-the size of each array element,
-and an XDR routine for handling each array element.
-.KS
-.LP
-If the size of the array is known in advance, one can use
-.I xdr_vector (),
-which serializes fixed-length arrays.
-.ie t .DS
-.el .DS L
-.ft CW
-int intarr[SIZE];
-
-xdr_intarr(xdrsp, intarr)
-	XDR *xdrsp;
-	int intarr[];
-{
-	int i;
-
-	return (xdr_vector(xdrsp, intarr, SIZE, sizeof(int),
-		xdr_int));
-}
-.DE
-.KE
-.LP
-XDR always converts quantities to 4-byte multiples when serializing.
-Thus, if either of the examples above involved characters
-instead of integers, each character would occupy 32 bits.
-That is the reason for the XDR routine
-.I xdr_bytes()
-which is like
-.I xdr_array()
-except that it packs characters;
-.I xdr_bytes()
-has four parameters, similar to the first four parameters of
-.I xdr_array ().
-For null-terminated strings, there is also the
-.I xdr_string()
-routine, which is the same as
-.I xdr_bytes()
-without the length parameter.
-On serializing it gets the string length from
-.I strlen (),
-and on deserializing it creates a null-terminated string.
-.LP
-Here is a final example that calls the previously written
-.I xdr_simple()
-as well as the built-in functions
-.I xdr_string()
-and
-.I xdr_reference (),
-which chases pointers:
-.ie t .DS
-.el .DS L
-.ft CW
-struct finalexample {
-	char *string;
-	struct simple *simplep;
-} finalexample;
-
-xdr_finalexample(xdrsp, finalp)
-	XDR *xdrsp;
-	struct finalexample *finalp;
-{
-
-	if (!xdr_string(xdrsp, &finalp->string, MAXSTRLEN))
-		return (0);
-	if (!xdr_reference(xdrsp, &finalp->simplep,
-	  sizeof(struct simple), xdr_simple);
-		return (0);
-	return (1);
-}
-.DE
-Note that we could as easily call
-.I xdr_simple()
-here instead of
-.I xdr_reference ().
-.NH 1
-\&Lowest Layer of RPC
-.IX "lowest layer of RPC"
-.IX "RPC" "lowest layer"
-.LP
-In the examples given so far,
-RPC takes care of many details automatically for you.
-In this section, we'll show you how you can change the defaults
-by using lower layers of the RPC library.
-It is assumed that you are familiar with sockets
-and the system calls for dealing with them.
-.LP
-There are several occasions when you may need to use lower layers of
-RPC.  First, you may need to use TCP, since the higher layer uses UDP,
-which restricts RPC calls to 8K bytes of data.  Using TCP permits calls
-to send long streams of data.
-For an example, see the
-.I TCP
-section below.  Second, you may want to allocate and free memory
-while serializing or deserializing with XDR routines.
-There is no call at the higher level to let
-you free memory explicitly.
-For more explanation, see the
-.I "Memory Allocation with XDR"
-section below.
-Third, you may need to perform authentication
-on either the client or server side, by supplying
-credentials or verifying them.
-See the explanation in the
-.I Authentication
-section below.
-.NH 2
-\&More on the Server Side
-.IX RPC "server side"
-.LP
-The server for the
-.I nusers()
-program shown below does the same thing as the one using
-.I registerrpc()
-above, but is written using a lower layer of the RPC package:
-.ie t .DS
-.el .DS L
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <utmp.h>
-#include <rpcsvc/rusers.h>
-
-main()
-{
-	SVCXPRT *transp;
-	int nuser();
-
-	transp = svcudp_create(RPC_ANYSOCK);
-	if (transp == NULL){
-		fprintf(stderr, "can't create an RPC server\en");
-		exit(1);
-	}
-	pmap_unset(RUSERSPROG, RUSERSVERS);
-	if (!svc_register(transp, RUSERSPROG, RUSERSVERS,
-			  nuser, IPPROTO_UDP)) {
-		fprintf(stderr, "can't register RUSER service\en");
-		exit(1);
-	}
-	svc_run();  /* \fINever returns\fP */
-	fprintf(stderr, "should never reach this point\en");
-}
-
-nuser(rqstp, transp)
-	struct svc_req *rqstp;
-	SVCXPRT *transp;
-{
-	unsigned long nusers;
-
-	switch (rqstp->rq_proc) {
-	case NULLPROC:
-		if (!svc_sendreply(transp, xdr_void, 0))
-			fprintf(stderr, "can't reply to RPC call\en");
-		return;
-	case RUSERSPROC_NUM:
-.ft I
-		/*
-		 * Code here to compute the number of users
-		 * and assign it to the variable \fInusers\fP
-		 */
-.ft CW
-		if (!svc_sendreply(transp, xdr_u_long, &nusers))
-			fprintf(stderr, "can't reply to RPC call\en");
-		return;
-	default:
-		svcerr_noproc(transp);
-		return;
-	}
-}
-.DE
-.LP
-First, the server gets a transport handle, which is used
-for receiving and replying to RPC messages.
-.I registerrpc()
-uses
-.I svcudp_create()
-to get a UDP handle.
-If you require a more reliable protocol, call
-.I svctcp_create()
-instead.
-If the argument to
-.I svcudp_create()
-is
-.I RPC_ANYSOCK
-the RPC library creates a socket
-on which to receive and reply to RPC calls.  Otherwise,
-.I svcudp_create()
-expects its argument to be a valid socket number.
-If you specify your own socket, it can be bound or unbound.
-If it is bound to a port by the user, the port numbers of
-.I svcudp_create()
-and
-.I clnttcp_create()
-(the low-level client routine) must match.
-.LP
-If the user specifies the
-.I RPC_ANYSOCK
-argument, the RPC library routines will open sockets.
-Otherwise they will expect the user to do so.  The routines
-.I svcudp_create()
-and
-.I clntudp_create()
-will cause the RPC library routines to
-.I bind()
-their socket if it is not bound already.
-.LP
-A service may choose to register its port number with the
-local portmapper service.  This is done is done by specifying
-a non-zero protocol number in
-.I svc_register ().
-Incidently, a client can discover the server's port number by
-consulting the portmapper on their server's machine.  This can
-be done automatically by specifying a zero port number in
-.I clntudp_create()
-or
-.I clnttcp_create ().
-.LP
-After creating an
-.I SVCXPRT ,
-the next step is to call
-.I pmap_unset()
-so that if the
-.I nusers()
-server crashed earlier,
-any previous trace of it is erased before restarting.
-More precisely,
-.I pmap_unset()
-erases the entry for
-.I RUSERSPROG
-from the port mapper's tables.
-.LP
-Finally, we associate the program number for
-.I nusers()
-with the procedure
-.I nuser ().
-The final argument to
-.I svc_register()
-is normally the protocol being used,
-which, in this case, is
-.I IPPROTO_UDP
-Notice that unlike
-.I registerrpc (),
-there are no XDR routines involved
-in the registration process.
-Also, registration is done on the program,
-rather than procedure, level.
-.LP
-The user routine
-.I nuser()
-must call and dispatch the appropriate XDR routines
-based on the procedure number.
-Note that
-two things are handled by
-.I nuser()
-that
-.I registerrpc()
-handles automatically.
-The first is that procedure
-.I NULLPROC
-(currently zero) returns with no results.
-This can be used as a simple test
-for detecting if a remote program is running.
-Second, there is a check for invalid procedure numbers.
-If one is detected,
-.I svcerr_noproc()
-is called to handle the error.
-.KS
-.LP
-The user service routine serializes the results and returns
-them to the RPC caller via
-.I svc_sendreply()
-Its first parameter is the
-.I SVCXPRT
-handle, the second is the XDR routine,
-and the third is a pointer to the data to be returned.
-Not illustrated above is how a server
-handles an RPC program that receives data.
-As an example, we can add a procedure
-.I RUSERSPROC_BOOL
-which has an argument
-.I nusers (),
-and returns
-.I TRUE
-or
-.I FALSE
-depending on whether there are nusers logged on.
-It would look like this:
-.ie t .DS
-.el .DS L
-.ft CW
-case RUSERSPROC_BOOL: {
-	int bool;
-	unsigned nuserquery;
-
-	if (!svc_getargs(transp, xdr_u_int, &nuserquery) {
-		svcerr_decode(transp);
-		return;
-	}
-.ft I
-	/*
-	 * Code to set \fInusers\fP = number of users
-	 */
-.ft CW
-	if (nuserquery == nusers)
-		bool = TRUE;
-	else
-		bool = FALSE;
-	if (!svc_sendreply(transp, xdr_bool, &bool)) {
-		 fprintf(stderr, "can't reply to RPC call\en");
-		 return (1);
-	}
-	return;
-}
-.DE
-.KE
-.LP
-The relevant routine is
-.I svc_getargs()
-which takes an
-.I SVCXPRT
-handle, the XDR routine,
-and a pointer to where the input is to be placed as arguments.
-.NH 2
-\&Memory Allocation with XDR
-.IX "memory allocation with XDR"
-.IX XDR "memory allocation"
-.LP
-XDR routines not only do input and output,
-they also do memory allocation.
-This is why the second parameter of
-.I xdr_array()
-is a pointer to an array, rather than the array itself.
-If it is
-.I NULL ,
-then
-.I xdr_array()
-allocates space for the array and returns a pointer to it,
-putting the size of the array in the third argument.
-As an example, consider the following XDR routine
-.I xdr_chararr1()
-which deals with a fixed array of bytes with length
-.I SIZE .
-.ie t .DS
-.el .DS L
-.ft CW
-xdr_chararr1(xdrsp, chararr)
-	XDR *xdrsp;
-	char chararr[];
-{
-	char *p;
-	int len;
-
-	p = chararr;
-	len = SIZE;
-	return (xdr_bytes(xdrsp, &p, &len, SIZE));
-}
-.DE
-If space has already been allocated in
-.I chararr ,
-it can be called from a server like this:
-.ie t .DS
-.el .DS L
-.ft CW
-char chararr[SIZE];
-
-svc_getargs(transp, xdr_chararr1, chararr);
-.DE
-If you want XDR to do the allocation,
-you would have to rewrite this routine in the following way:
-.ie t .DS
-.el .DS L
-.ft CW
-xdr_chararr2(xdrsp, chararrp)
-	XDR *xdrsp;
-	char **chararrp;
-{
-	int len;
-
-	len = SIZE;
-	return (xdr_bytes(xdrsp, charrarrp, &len, SIZE));
-}
-.DE
-Then the RPC call might look like this:
-.ie t .DS
-.el .DS L
-.ft CW
-char *arrptr;
-
-arrptr = NULL;
-svc_getargs(transp, xdr_chararr2, &arrptr);
-.ft I
-/*
- * Use the result here
- */
-.ft CW
-svc_freeargs(transp, xdr_chararr2, &arrptr);
-.DE
-Note that, after being used, the character array can be freed with
-.I svc_freeargs()
-.I svc_freeargs()
-will not attempt to free any memory if the variable indicating it
-is NULL.  For example, in the the routine
-.I xdr_finalexample (),
-given earlier, if
-.I finalp->string
-was NULL, then it would not be freed.  The same is true for
-.I finalp->simplep .
-.LP
-To summarize, each XDR routine is responsible
-for serializing, deserializing, and freeing memory.
-When an XDR routine is called from
-.I callrpc()
-the serializing part is used.
-When called from
-.I svc_getargs()
-the deserializer is used.
-And when called from
-.I svc_freeargs()
-the memory deallocator is used.  When building simple examples like those
-in this section, a user doesn't have to worry
-about the three modes.
-See the
-.I "External Data Representation: Sun Technical Notes"
-for examples of more sophisticated XDR routines that determine
-which of the three modes they are in and adjust their behavior accordingly.
-.KS
-.NH 2
-\&The Calling Side
-.IX RPC "calling side"
-.LP
-When you use
-.I callrpc()
-you have no control over the RPC delivery
-mechanism or the socket used to transport the data.
-To illustrate the layer of RPC that lets you adjust these
-parameters, consider the following code to call the
-.I nusers
-service:
-.ie t .DS
-.el .DS L
-.ft CW
-.vs 11
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <utmp.h>
-#include <rpcsvc/rusers.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netdb.h>
-
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	struct hostent *hp;
-	struct timeval pertry_timeout, total_timeout;
-	struct sockaddr_in server_addr;
-	int sock = RPC_ANYSOCK;
-	register CLIENT *client;
-	enum clnt_stat clnt_stat;
-	unsigned long nusers;
-
-	if (argc != 2) {
-		fprintf(stderr, "usage: nusers hostname\en");
-		exit(-1);
-	}
-	if ((hp = gethostbyname(argv[1])) == NULL) {
-		fprintf(stderr, "can't get addr for %s\en",argv[1]);
-		exit(-1);
-	}
-	pertry_timeout.tv_sec = 3;
-	pertry_timeout.tv_usec = 0;
-	bcopy(hp->h_addr, (caddr_t)&server_addr.sin_addr,
-		hp->h_length);
-	server_addr.sin_family = AF_INET;
-	server_addr.sin_port =  0;
-	if ((client = clntudp_create(&server_addr, RUSERSPROG,
-	  RUSERSVERS, pertry_timeout, &sock)) == NULL) {
-		clnt_pcreateerror("clntudp_create");
-		exit(-1);
-	}
-	total_timeout.tv_sec = 20;
-	total_timeout.tv_usec = 0;
-	clnt_stat = clnt_call(client, RUSERSPROC_NUM, xdr_void,
-		0, xdr_u_long, &nusers, total_timeout);
-	if (clnt_stat != RPC_SUCCESS) {
-		clnt_perror(client, "rpc");
-		exit(-1);
-	}
-	clnt_destroy(client);
-	close(sock);
-	exit(0);
-}
-.vs
-.DE
-.KE
-The low-level version of
-.I callrpc()
-is
-.I clnt_call()
-which takes a
-.I CLIENT
-pointer rather than a host name.  The parameters to
-.I clnt_call()
-are a
-.I CLIENT
-pointer, the procedure number,
-the XDR routine for serializing the argument,
-a pointer to the argument,
-the XDR routine for deserializing the return value,
-a pointer to where the return value will be placed,
-and the time in seconds to wait for a reply.
-.LP
-The
-.I CLIENT
-pointer is encoded with the transport mechanism.
-.I callrpc()
-uses UDP, thus it calls
-.I clntudp_create()
-to get a
-.I CLIENT
-pointer.  To get TCP (Transmission Control Protocol), you would use
-.I clnttcp_create() .
-.LP
-The parameters to
-.I clntudp_create()
-are the server address, the program number, the version number,
-a timeout value (between tries), and a pointer to a socket.
-The final argument to
-.I clnt_call()
-is the total time to wait for a response.
-Thus, the number of tries is the
-.I clnt_call()
-timeout divided by the
-.I clntudp_create()
-timeout.
-.LP
-Note that the
-.I clnt_destroy()
-call
-always deallocates the space associated with the
-.I CLIENT
-handle.  It closes the socket associated with the
-.I CLIENT
-handle, however, only if the RPC library opened it.  It the
-socket was opened by the user, it stays open.  This makes it
-possible, in cases where there are multiple client handles
-using the same socket, to destroy one handle without closing
-the socket that other handles are using.
-.LP
-To make a stream connection, the call to
-.I clntudp_create()
-is replaced with a call to
-.I clnttcp_create() .
-.DS
-.ft CW
-clnttcp_create(&server_addr, prognum, versnum, &sock,
-               inputsize, outputsize);
-.DE
-There is no timeout argument; instead, the receive and send buffer
-sizes must be specified.  When the
-.I clnttcp_create()
-call is made, a TCP connection is established.
-All RPC calls using that
-.I CLIENT
-handle would use this connection.
-The server side of an RPC call using TCP has
-.I svcudp_create()
-replaced by
-.I svctcp_create() .
-.DS
-.ft CW
-transp = svctcp_create(RPC_ANYSOCK, 0, 0);
-.DE
-The last two arguments to
-.I svctcp_create()
-are send and receive sizes respectively.  If `0' is specified for
-either of these, the system chooses a reasonable default.
-.KS
-.NH 1
-\&Other RPC Features
-.IX "RPC" "miscellaneous features"
-.IX "miscellaneous RPC features"
-.LP
-This section discusses some other aspects of RPC
-that are occasionally useful.
-.NH 2
-\&Select on the Server Side
-.IX RPC select() RPC \fIselect()\fP
-.IX select() "" \fIselect()\fP "on the server side"
-.LP
-Suppose a process is processing RPC requests
-while performing some other activity.
-If the other activity involves periodically updating a data structure,
-the process can set an alarm signal before calling
-.I svc_run()
-But if the other activity
-involves waiting on a file descriptor, the
-.I svc_run()
-call won't work.
-The code for
-.I svc_run()
-is as follows:
-.ie t .DS
-.el .DS L
-.ft CW
-.vs 11
-void
-svc_run()
-{
-	fd_set readfds;
-	int dtbsz = getdtablesize();
-
-	for (;;) {
-		readfds = svc_fds;
-		switch (select(dtbsz, &readfds, NULL,NULL,NULL)) {
-
-		case -1:
-			if (errno == EINTR)
-				continue;
-			perror("select");
-			return;
-		case 0:
-			break;
-		default:
-			svc_getreqset(&readfds);
-		}
-	}
-}
-.vs
-.DE
-.KE
-.LP
-You can bypass
-.I svc_run()
-and call
-.I svc_getreqset()
-yourself.
-All you need to know are the file descriptors
-of the socket(s) associated with the programs you are waiting on.
-Thus you can have your own
-.I select()
-.IX select() "" \fIselect()\fP
-that waits on both the RPC socket,
-and your own descriptors.  Note that
-.I svc_fds()
-is a bit mask of all the file descriptors that RPC is using for
-services.  It can change everytime that
-.I any
-RPC library routine is called, because descriptors are constantly
-being opened and closed, for example for TCP connections.
-.NH 2
-\&Broadcast RPC
-.IX "broadcast RPC"
-.IX RPC "broadcast"
-.LP
-The
-.I portmapper
-is a daemon that converts RPC program numbers
-into DARPA protocol port numbers; see the
-.I portmap
-man page.  You can't do broadcast RPC without the portmapper.
-Here are the main differences between
-broadcast RPC and normal RPC calls:
-.IP  1.
-Normal RPC expects one answer, whereas
-broadcast RPC expects many answers
-(one or more answer from each responding machine).
-.IP  2.
-Broadcast RPC can only be supported by packet-oriented (connectionless)
-transport protocols like UPD/IP.
-.IP  3.
-The implementation of broadcast RPC
-treats all unsuccessful responses as garbage by filtering them out.
-Thus, if there is a version mismatch between the
-broadcaster and a remote service,
-the user of broadcast RPC never knows.
-.IP  4.
-All broadcast messages are sent to the portmap port.
-Thus, only services that register themselves with their portmapper
-are accessible via the broadcast RPC mechanism.
-.IP  5.
-Broadcast requests are limited in size to the MTU (Maximum Transfer
-Unit) of the local network.  For Ethernet, the MTU is 1500 bytes.
-.KS
-.NH 3
-\&Broadcast RPC Synopsis
-.IX "broadcast RPC" synopsis
-.IX "RPC" "broadcast synopsis"
-.ie t .DS
-.el .DS L
-.ft CW
-#include <rpc/pmap_clnt.h>
-	. . .
-enum clnt_stat	clnt_stat;
-	. . .
-clnt_stat = clnt_broadcast(prognum, versnum, procnum,
-  inproc, in, outproc, out, eachresult)
-	u_long    prognum;        /* \fIprogram number\fP */
-	u_long    versnum;        /* \fIversion number\fP */
-	u_long    procnum;        /* \fIprocedure number\fP */
-	xdrproc_t inproc;         /* \fIxdr routine for args\fP */
-	caddr_t   in;             /* \fIpointer to args\fP */
-	xdrproc_t outproc;        /* \fIxdr routine for results\fP */
-	caddr_t   out;            /* \fIpointer to results\fP */
-	bool_t    (*eachresult)();/* \fIcall with each result gotten\fP */
-.DE
-.KE
-The procedure
-.I eachresult()
-is called each time a valid result is obtained.
-It returns a boolean that indicates
-whether or not the user wants more responses.
-.ie t .DS
-.el .DS L
-.ft CW
-bool_t done;
-	. . .
-done = eachresult(resultsp, raddr)
-	caddr_t resultsp;
-	struct sockaddr_in *raddr; /* \fIAddr of responding machine\fP */
-.DE
-If
-.I done
-is
-.I TRUE ,
-then broadcasting stops and
-.I clnt_broadcast()
-returns successfully.
-Otherwise, the routine waits for another response.
-The request is rebroadcast
-after a few seconds of waiting.
-If no responses come back,
-the routine returns with
-.I RPC_TIMEDOUT .
-.NH 2
-\&Batching
-.IX "batching"
-.IX RPC "batching"
-.LP
-The RPC architecture is designed so that clients send a call message,
-and wait for servers to reply that the call succeeded.
-This implies that clients do not compute
-while servers are processing a call.
-This is inefficient if the client does not want or need
-an acknowledgement for every message sent.
-It is possible for clients to continue computing
-while waiting for a response,
-using RPC batch facilities.
-.LP
-RPC messages can be placed in a \*Qpipeline\*U of calls
-to a desired server; this is called batching.
-Batching assumes that:
-1) each RPC call in the pipeline requires no response from the server,
-and the server does not send a response message; and
-2) the pipeline of calls is transported on a reliable
-byte stream transport such as TCP/IP.
-Since the server does not respond to every call,
-the client can generate new calls in parallel
-with the server executing previous calls.
-Furthermore, the TCP/IP implementation can buffer up
-many call messages, and send them to the server in one
-.I write()
-system call.  This overlapped execution
-greatly decreases the interprocess communication overhead of
-the client and server processes,
-and the total elapsed time of a series of calls.
-.LP
-Since the batched calls are buffered,
-the client should eventually do a nonbatched call
-in order to flush the pipeline.
-.LP
-A contrived example of batching follows.
-Assume a string rendering service (like a window system)
-has two similar calls: one renders a string and returns void results,
-while the other renders a string and remains silent.
-The service (using the TCP/IP transport) may look like:
-.ie t .DS
-.el .DS L
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <suntool/windows.h>
-
-void windowdispatch();
-
-main()
-{
-	SVCXPRT *transp;
-
-	transp = svctcp_create(RPC_ANYSOCK, 0, 0);
-	if (transp == NULL){
-		fprintf(stderr, "can't create an RPC server\en");
-		exit(1);
-	}
-	pmap_unset(WINDOWPROG, WINDOWVERS);
-	if (!svc_register(transp, WINDOWPROG, WINDOWVERS,
-	  windowdispatch, IPPROTO_TCP)) {
-		fprintf(stderr, "can't register WINDOW service\en");
-		exit(1);
-	}
-	svc_run();  /* \fINever returns\fP */
-	fprintf(stderr, "should never reach this point\en");
-}
-
-void
-windowdispatch(rqstp, transp)
-	struct svc_req *rqstp;
-	SVCXPRT *transp;
-{
-	char *s = NULL;
-
-	switch (rqstp->rq_proc) {
-	case NULLPROC:
-		if (!svc_sendreply(transp, xdr_void, 0))
-			fprintf(stderr, "can't reply to RPC call\en");
-		return;
-	case RENDERSTRING:
-		if (!svc_getargs(transp, xdr_wrapstring, &s)) {
-			fprintf(stderr, "can't decode arguments\en");
-.ft I
-			/*
-			 * Tell caller he screwed up
-			 */
-.ft CW
-			svcerr_decode(transp);
-			break;
-		}
-.ft I
-		/*
-		 * Code here to render the string \fIs\fP
-		 */
-.ft CW
-		if (!svc_sendreply(transp, xdr_void, NULL))
-			fprintf(stderr, "can't reply to RPC call\en");
-		break;
-	case RENDERSTRING_BATCHED:
-		if (!svc_getargs(transp, xdr_wrapstring, &s)) {
-			fprintf(stderr, "can't decode arguments\en");
-.ft I
-			/*
-			 * We are silent in the face of protocol errors
-			 */
-.ft CW
-			break;
-		}
-.ft I
-		/*
-		 * Code here to render string s, but send no reply!
-		 */
-.ft CW
-		break;
-	default:
-		svcerr_noproc(transp);
-		return;
-	}
-.ft I
-	/*
-	 * Now free string allocated while decoding arguments
-	 */
-.ft CW
-	svc_freeargs(transp, xdr_wrapstring, &s);
-}
-.DE
-Of course the service could have one procedure
-that takes the string and a boolean
-to indicate whether or not the procedure should respond.
-.LP
-In order for a client to take advantage of batching,
-the client must perform RPC calls on a TCP-based transport
-and the actual calls must have the following attributes:
-1) the result's XDR routine must be zero
-.I NULL ),
-and 2) the RPC call's timeout must be zero.
-.KS
-.LP
-Here is an example of a client that uses batching to render a
-bunch of strings; the batching is flushed when the client gets
-a null string (EOF):
-.ie t .DS
-.el .DS L
-.ft CW
-.vs 11
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netdb.h>
-#include <suntool/windows.h>
-
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	struct hostent *hp;
-	struct timeval pertry_timeout, total_timeout;
-	struct sockaddr_in server_addr;
-	int sock = RPC_ANYSOCK;
-	register CLIENT *client;
-	enum clnt_stat clnt_stat;
-	char buf[1000], *s = buf;
-
-	if ((client = clnttcp_create(&server_addr,
-	  WINDOWPROG, WINDOWVERS, &sock, 0, 0)) == NULL) {
-		perror("clnttcp_create");
-		exit(-1);
-	}
-	total_timeout.tv_sec = 0;
-	total_timeout.tv_usec = 0;
-	while (scanf("%s", s) != EOF) {
-		clnt_stat = clnt_call(client, RENDERSTRING_BATCHED,
-			xdr_wrapstring, &s, NULL, NULL, total_timeout);
-		if (clnt_stat != RPC_SUCCESS) {
-			clnt_perror(client, "batched rpc");
-			exit(-1);
-		}
-	}
-
-	/* \fINow flush the pipeline\fP */
-
-	total_timeout.tv_sec = 20;
-	clnt_stat = clnt_call(client, NULLPROC, xdr_void, NULL,
-		xdr_void, NULL, total_timeout);
-	if (clnt_stat != RPC_SUCCESS) {
-		clnt_perror(client, "rpc");
-		exit(-1);
-	}
-	clnt_destroy(client);
-	exit(0);
-}
-.vs
-.DE
-.KE
-Since the server sends no message,
-the clients cannot be notified of any of the failures that may occur.
-Therefore, clients are on their own when it comes to handling errors.
-.LP
-The above example was completed to render
-all of the (2000) lines in the file
-.I /etc/termcap .
-The rendering service did nothing but throw the lines away.
-The example was run in the following four configurations:
-1) machine to itself, regular RPC;
-2) machine to itself, batched RPC;
-3) machine to another, regular RPC; and
-4) machine to another, batched RPC.
-The results are as follows:
-1) 50 seconds;
-2) 16 seconds;
-3) 52 seconds;
-4) 10 seconds.
-Running
-.I fscanf()
-on
-.I /etc/termcap
-only requires six seconds.
-These timings show the advantage of protocols
-that allow for overlapped execution,
-though these protocols are often hard to design.
-.NH 2
-\&Authentication
-.IX "authentication"
-.IX "RPC" "authentication"
-.LP
-In the examples presented so far,
-the caller never identified itself to the server,
-and the server never required an ID from the caller.
-Clearly, some network services, such as a network filesystem,
-require stronger security than what has been presented so far.
-.LP
-In reality, every RPC call is authenticated by
-the RPC package on the server, and similarly,
-the RPC client package generates and sends authentication parameters.
-Just as different transports (TCP/IP or UDP/IP)
-can be used when creating RPC clients and servers,
-different forms of authentication can be associated with RPC clients;
-the default authentication type used as a default is type
-.I none .
-.LP
-The authentication subsystem of the RPC package is open ended.
-That is, numerous types of authentication are easy to support.
-.NH 3
-\&UNIX Authentication
-.IX "UNIX Authentication"
-.IP "\fIThe Client Side\fP"
-.LP
-When a caller creates a new RPC client handle as in:
-.DS
-.ft CW
-clnt = clntudp_create(address, prognum, versnum,
-		      wait, sockp)
-.DE
-the appropriate transport instance defaults
-the associate authentication handle to be
-.DS
-.ft CW
-clnt->cl_auth = authnone_create();
-.DE
-The RPC client can choose to use
-.I UNIX
-style authentication by setting
-.I clnt\->cl_auth
-after creating the RPC client handle:
-.DS
-.ft CW
-clnt->cl_auth = authunix_create_default();
-.DE
-This causes each RPC call associated with
-.I clnt
-to carry with it the following authentication credentials structure:
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * UNIX style credentials.
- */
-.ft CW
-struct authunix_parms {
-    u_long  aup_time;       /* \fIcredentials creation time\fP */
-    char    *aup_machname;  /* \fIhost name where client is\fP */
-    int     aup_uid;        /* \fIclient's UNIX effective uid\fP */
-    int     aup_gid;        /* \fIclient's current group id\fP */
-    u_int   aup_len;        /* \fIelement length of aup_gids\fP */
-    int     *aup_gids;      /* \fIarray of groups user is in\fP */
-};
-.DE
-These fields are set by
-.I authunix_create_default()
-by invoking the appropriate system calls.
-Since the RPC user created this new style of authentication,
-the user is responsible for destroying it with:
-.DS
-.ft CW
-auth_destroy(clnt->cl_auth);
-.DE
-This should be done in all cases, to conserve memory.
-.sp
-.IP "\fIThe Server Side\fP"
-.LP
-Service implementors have a harder time dealing with authentication issues
-since the RPC package passes the service dispatch routine a request
-that has an arbitrary authentication style associated with it.
-Consider the fields of a request handle passed to a service dispatch routine:
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * An RPC Service request
- */
-.ft CW
-struct svc_req {
-    u_long    rq_prog;    	/* \fIservice program number\fP */
-    u_long    rq_vers;    	/* \fIservice protocol vers num\fP */
-    u_long    rq_proc;    	/* \fIdesired procedure number\fP */
-    struct opaque_auth rq_cred; /* \fIraw credentials from wire\fP */
-    caddr_t   rq_clntcred;  /* \fIcredentials (read only)\fP */
-};
-.DE
-The
-.I rq_cred
-is mostly opaque, except for one field of interest:
-the style or flavor of authentication credentials:
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * Authentication info.  Mostly opaque to the programmer.
- */
-.ft CW
-struct opaque_auth {
-    enum_t  oa_flavor;  /* \fIstyle of credentials\fP */
-    caddr_t oa_base;    /* \fIaddress of more auth stuff\fP */
-    u_int   oa_length;  /* \fInot to exceed \fIMAX_AUTH_BYTES */
-};
-.DE
-.IX RPC guarantees
-The RPC package guarantees the following
-to the service dispatch routine:
-.IP  1.
-That the request's
-.I rq_cred
-is well formed.  Thus the service implementor may inspect the request's
-.I rq_cred.oa_flavor
-to determine which style of authentication the caller used.
-The service implementor may also wish to inspect the other fields of
-.I rq_cred
-if the style is not one of the styles supported by the RPC package.
-.IP  2.
-That the request's
-.I rq_clntcred
-field is either
-.I NULL
-or points to a well formed structure
-that corresponds to a supported style of authentication credentials.
-Remember that only
-.I unix
-style is currently supported, so (currently)
-.I rq_clntcred
-could be cast to a pointer to an
-.I authunix_parms
-structure.  If
-.I rq_clntcred
-is
-.I NULL ,
-the service implementor may wish to inspect the other (opaque) fields of
-.I rq_cred
-in case the service knows about a new type of authentication
-that the RPC package does not know about.
-.LP
-Our remote users service example can be extended so that
-it computes results for all users except UID 16:
-.ie t .DS
-.el .DS L
-.ft CW
-.vs 11
-nuser(rqstp, transp)
-	struct svc_req *rqstp;
-	SVCXPRT *transp;
-{
-	struct authunix_parms *unix_cred;
-	int uid;
-	unsigned long nusers;
-
-.ft I
-	/*
-	 * we don't care about authentication for null proc
-	 */
-.ft CW
-	if (rqstp->rq_proc == NULLPROC) {
-		if (!svc_sendreply(transp, xdr_void, 0)) {
-			fprintf(stderr, "can't reply to RPC call\en");
-			return (1);
-		 }
-		 return;
-	}
-.ft I
-	/*
-	 * now get the uid
-	 */
-.ft CW
-	switch (rqstp->rq_cred.oa_flavor) {
-	case AUTH_UNIX:
-		unix_cred =
-			(struct authunix_parms *)rqstp->rq_clntcred;
-		uid = unix_cred->aup_uid;
-		break;
-	case AUTH_NULL:
-	default:
-		svcerr_weakauth(transp);
-		return;
-	}
-	switch (rqstp->rq_proc) {
-	case RUSERSPROC_NUM:
-.ft I
-		/*
-		 * make sure caller is allowed to call this proc
-		 */
-.ft CW
-		if (uid == 16) {
-			svcerr_systemerr(transp);
-			return;
-		}
-.ft I
-		/*
-		 * Code here to compute the number of users
-		 * and assign it to the variable \fInusers\fP
-		 */
-.ft CW
-		if (!svc_sendreply(transp, xdr_u_long, &nusers)) {
-			fprintf(stderr, "can't reply to RPC call\en");
-			return (1);
-		}
-		return;
-	default:
-		svcerr_noproc(transp);
-		return;
-	}
-}
-.vs
-.DE
-A few things should be noted here.
-First, it is customary not to check
-the authentication parameters associated with the
-.I NULLPROC
-(procedure number zero).
-Second, if the authentication parameter's type is not suitable
-for your service, you should call
-.I svcerr_weakauth() .
-And finally, the service protocol itself should return status
-for access denied; in the case of our example, the protocol
-does not have such a status, so we call the service primitive
-.I svcerr_systemerr()
-instead.
-.LP
-The last point underscores the relation between
-the RPC authentication package and the services;
-RPC deals only with
-.I authentication
-and not with individual services'
-.I "access control" .
-The services themselves must implement their own access control policies
-and reflect these policies as return statuses in their protocols.
-.NH 2
-\&DES Authentication
-.IX RPC DES
-.IX RPC authentication
-.LP
-UNIX authentication is quite easy to defeat.  Instead of using
-.I authunix_create_default (),
-one can call
-.I authunix_create()
-and then modify the RPC authentication handle it returns by filling in
-whatever user ID and hostname they wish the server to think they have.
-DES authentication is thus recommended for people who want more security
-than UNIX authentication offers.
-.LP
-The details of the DES authentication protocol are complicated and
-are not explained here.
-See
-.I "Remote Procedure Calls: Protocol Specification"
-for the details.
-.LP
-In  order for  DES authentication   to  work, the
-.I keyserv(8c)
-daemon must be running  on both  the  server  and client machines.  The
-users on  these machines  need  public  keys  assigned by  the network
-administrator in  the
-.I publickey(5)
-database.  And,  they  need to have decrypted  their  secret keys
-using  their  login   password.  This automatically happens when one
-logs in using
-.I login(1) ,
-or can be done manually using
-.I keylogin(1) .
-The
-.I "Network Services"
-chapter
-.\" XXX
-explains more how to setup secure networking.
-.sp
-.IP "\fIClient Side\fP"
-.LP
-If a client wishes to use DES authentication, it must set its
-authentication handle appropriately.  Here is an example:
-.DS
-cl->cl_auth =
-	authdes_create(servername, 60, &server_addr, NULL);
-.DE
-The first argument is the network name or \*Qnetname\*U of the owner of
-the server process.  Typically, server processes are root processes
-and their netname can be derived using the following call:
-.DS
-char servername[MAXNETNAMELEN];
-
-host2netname(servername, rhostname, NULL);
-.DE
-Here,
-.I rhostname
-is the hostname of the machine the server process is running on.
-.I host2netname()
-fills in
-.I servername
-to contain this root process's netname.  If the
-server process was run by a regular user, one could use the call
-.I user2netname()
-instead.  Here is an example for a server process with the same user
-ID as the client:
-.DS
-char servername[MAXNETNAMELEN];
-
-user2netname(servername, getuid(), NULL);
-.DE
-The last argument to both of these calls,
-.I user2netname()
-and
-.I host2netname (),
-is the name of the naming domain where the server is located.  The
-.I NULL
-used here means \*Quse the local domain name.\*U
-.LP
-The second argument to
-.I authdes_create()
-is a lifetime for the credential.  Here it is set to sixty
-seconds.  What that means is that the credential will expire 60
-seconds from now.  If some mischievous user tries to reuse the
-credential, the server RPC subsystem will recognize that it has
-expired and not grant any requests.  If the same mischievous user
-tries to reuse the credential within the sixty second lifetime,
-he will still be rejected because the server RPC subsystem
-remembers which credentials it has already seen in the near past,
-and will not grant requests to duplicates.
-.LP
-The third argument to
-.I authdes_create()
-is the address of the host to synchronize with.  In order for DES
-authentication to work, the server and client must agree upon the
-time.  Here we pass the address of the server itself, so the
-client and server will both be using the same time: the server's
-time.  The argument can be
-.I NULL ,
-which means \*Qdon't bother synchronizing.\*U You should only do this
-if you are sure the client and server are already synchronized.
-.LP
-The final argument to
-.I authdes_create()
-is the address of a DES encryption key to use for encrypting
-timestamps and data.  If this argument is
-.I NULL ,
-as it is in this example, a random key will be chosen.  The client
-may find out the encryption key being used by consulting the
-.I ah_key
-field of the authentication handle.
-.sp
-.IP "\fIServer Side\fP"
-.LP
-The server side is a lot simpler than the client side.  Here is the
-previous example rewritten to use
-.I AUTH_DES
-instead of
-.I AUTH_UNIX :
-.ie t .DS
-.el .DS L
-.ft CW
-.vs 11
-#include <sys/time.h>
-#include <rpc/auth_des.h>
-	. . .
-	. . .
-nuser(rqstp, transp)
-	struct svc_req *rqstp;
-	SVCXPRT *transp;
-{
-	struct authdes_cred *des_cred;
-	int uid;
-	int gid;
-	int gidlen;
-	int gidlist[10];
-.ft I
-	/*
-	 * we don't care about authentication for null proc
-	 */
-.ft CW
-
-	if (rqstp->rq_proc == NULLPROC) {
-		/* \fIsame as before\fP */
-	}
-
-.ft I
-	/*
-	 * now get the uid
-	 */
-.ft CW
-	switch (rqstp->rq_cred.oa_flavor) {
-	case AUTH_DES:
-		des_cred =
-			(struct authdes_cred *) rqstp->rq_clntcred;
-		if (! netname2user(des_cred->adc_fullname.name,
-			&uid, &gid, &gidlen, gidlist))
-		{
-			fprintf(stderr, "unknown user: %s\en",
-				des_cred->adc_fullname.name);
-			svcerr_systemerr(transp);
-			return;
-		}
-		break;
-	case AUTH_NULL:
-	default:
-		svcerr_weakauth(transp);
-		return;
-	}
-
-.ft I
-	/*
-	 * The rest is the same as before
- 	 */
-.ft CW
-.vs
-.DE
-Note the use of the routine
-.I netname2user (),
-the inverse of
-.I user2netname ():
-it takes a network ID and converts to a unix ID.
-.I netname2user ()
-also supplies the group IDs which we don't use in this example,
-but which may be useful to other UNIX programs.
-.NH 2
-\&Using Inetd
-.IX inetd "" "using \fIinetd\fP"
-.LP
-An RPC server can be started from
-.I inetd
-The only difference from the usual code is that the service
-creation routine should be called in the following form:
-.ie t .DS
-.el .DS L
-.ft CW
-transp = svcudp_create(0);     /* \fIFor UDP\fP */
-transp = svctcp_create(0,0,0); /* \fIFor listener TCP sockets\fP */
-transp = svcfd_create(0,0,0);  /* \fIFor connected TCP sockets\fP */
-.DE
-since
-.I inet
-passes a socket as file descriptor 0.
-Also,
-.I svc_register()
-should be called as
-.ie t .DS
-.el .DS L
-.ft CW
-svc_register(transp, PROGNUM, VERSNUM, service, 0);
-.DE
-with the final flag as 0,
-since the program would already be registered by
-.I inetd
-Remember that if you want to exit
-from the server process and return control to
-.I inet
-you need to explicitly exit, since
-.I svc_run()
-never returns.
-.LP
-The format of entries in
-.I /etc/inetd.conf
-for RPC services is in one of the following two forms:
-.ie t .DS
-.el .DS L
-.ft CW
-p_name/version dgram  rpc/udp wait/nowait user server args
-p_name/version stream rpc/tcp wait/nowait user server args
-.DE
-where
-.I p_name
-is the symbolic name of the program as it appears in
-.I rpc(5) ,
-.I server
-is the program implementing the server,
-and
-.I program
-and
-.I version
-are the program and version numbers of the service.
-For more information, see
-.I inetd.conf(5) .
-.LP
-If the same program handles multiple versions,
-then the version number can be a range,
-as in this example:
-.ie t .DS
-.el .DS L
-.ft CW
-rstatd/1-2 dgram rpc/udp wait root /usr/etc/rpc.rstatd
-.DE
-.NH 1
-\&More Examples
-.sp 1
-.NH 2
-\&Versions
-.IX "versions"
-.IX "RPC" "versions"
-.LP
-By convention, the first version number of program
-.I PROG
-is
-.I PROGVERS_ORIG
-and the most recent version is
-.I PROGVERS
-Suppose there is a new version of the
-.I user
-program that returns an
-.I "unsigned short"
-rather than a
-.I long .
-If we name this version
-.I RUSERSVERS_SHORT
-then a server that wants to support both versions
-would do a double register.
-.ie t .DS
-.el .DS L
-.ft CW
-if (!svc_register(transp, RUSERSPROG, RUSERSVERS_ORIG,
-  nuser, IPPROTO_TCP)) {
-	fprintf(stderr, "can't register RUSER service\en");
-	exit(1);
-}
-if (!svc_register(transp, RUSERSPROG, RUSERSVERS_SHORT,
-  nuser, IPPROTO_TCP)) {
-	fprintf(stderr, "can't register RUSER service\en");
-	exit(1);
-}
-.DE
-Both versions can be handled by the same C procedure:
-.ie t .DS
-.el .DS L
-.ft CW
-.vs 11
-nuser(rqstp, transp)
-	struct svc_req *rqstp;
-	SVCXPRT *transp;
-{
-	unsigned long nusers;
-	unsigned short nusers2;
-
-	switch (rqstp->rq_proc) {
-	case NULLPROC:
-		if (!svc_sendreply(transp, xdr_void, 0)) {
-			fprintf(stderr, "can't reply to RPC call\en");
-            return (1);
-		}
-		return;
-	case RUSERSPROC_NUM:
-.ft I
-		/*
-         * Code here to compute the number of users
-         * and assign it to the variable \fInusers\fP
-		 */
-.ft CW
-		nusers2 = nusers;
-		switch (rqstp->rq_vers) {
-		case RUSERSVERS_ORIG:
-            if (!svc_sendreply(transp, xdr_u_long,
-		    &nusers)) {
-                fprintf(stderr,"can't reply to RPC call\en");
-			}
-			break;
-		case RUSERSVERS_SHORT:
-            if (!svc_sendreply(transp, xdr_u_short,
-		    &nusers2)) {
-                fprintf(stderr,"can't reply to RPC call\en");
-			}
-			break;
-		}
-	default:
-		svcerr_noproc(transp);
-		return;
-	}
-}
-.vs
-.DE
-.KS
-.NH 2
-\&TCP
-.IX "TCP"
-.LP
-Here is an example that is essentially
-.I rcp.
-The initiator of the RPC
-.I snd
-call takes its standard input and sends it to the server
-.I rcv
-which prints it on standard output.
-The RPC call uses TCP.
-This also illustrates an XDR procedure that behaves differently
-on serialization than on deserialization.
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
- * The xdr routine:
- *		on decode, read from wire, write onto fp
- *		on encode, read from fp, write onto wire
- */
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>
-
-xdr_rcp(xdrs, fp)
-	XDR *xdrs;
-	FILE *fp;
-{
-	unsigned long size;
-	char buf[BUFSIZ], *p;
-
-	if (xdrs->x_op == XDR_FREE)/* nothing to free */
-		return 1;
-	while (1) {
-		if (xdrs->x_op == XDR_ENCODE) {
-			if ((size = fread(buf, sizeof(char), BUFSIZ,
-			  fp)) == 0 && ferror(fp)) {
-				fprintf(stderr, "can't fread\en");
-				return (1);
-			}
-		}
-		p = buf;
-		if (!xdr_bytes(xdrs, &p, &size, BUFSIZ))
-			return 0;
-		if (size == 0)
-			return 1;
-		if (xdrs->x_op == XDR_DECODE) {
-			if (fwrite(buf, sizeof(char), size,
-			  fp) != size) {
-				fprintf(stderr, "can't fwrite\en");
-				return (1);
-			}
-		}
-	}
-}
-.vs
-.DE
-.KE
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
- * The sender routines
- */
-.ft CW
-#include <stdio.h>
-#include <netdb.h>
-#include <rpc/rpc.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	int xdr_rcp();
-	int err;
-
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s servername\en", argv[0]);
-		exit(-1);
-	}
-	if ((err = callrpctcp(argv[1], RCPPROG, RCPPROC,
-	  RCPVERS, xdr_rcp, stdin, xdr_void, 0) != 0)) {
-		clnt_perrno(err);
-		fprintf(stderr, "can't make RPC call\en");
-		exit(1);
-	}
-	exit(0);
-}
-
-callrpctcp(host, prognum, procnum, versnum,
-           inproc, in, outproc, out)
-	char *host, *in, *out;
-	xdrproc_t inproc, outproc;
-{
-	struct sockaddr_in server_addr;
-	int socket = RPC_ANYSOCK;
-	enum clnt_stat clnt_stat;
-	struct hostent *hp;
-	register CLIENT *client;
-	struct timeval total_timeout;
-
-	if ((hp = gethostbyname(host)) == NULL) {
-		fprintf(stderr, "can't get addr for '%s'\en", host);
-		return (-1);
-	}
-	bcopy(hp->h_addr, (caddr_t)&server_addr.sin_addr,
-		hp->h_length);
-	server_addr.sin_family = AF_INET;
-	server_addr.sin_port =  0;
-	if ((client = clnttcp_create(&server_addr, prognum,
-	  versnum, &socket, BUFSIZ, BUFSIZ)) == NULL) {
-		perror("rpctcp_create");
-		return (-1);
-	}
-	total_timeout.tv_sec = 20;
-	total_timeout.tv_usec = 0;
-	clnt_stat = clnt_call(client, procnum,
-		inproc, in, outproc, out, total_timeout);
-	clnt_destroy(client);
-	return (int)clnt_stat;
-}
-.vs
-.DE
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
- * The receiving routines
- */
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>
-
-main()
-{
-	register SVCXPRT *transp;
-     int rcp_service(), xdr_rcp();
-
-	if ((transp = svctcp_create(RPC_ANYSOCK,
-	  BUFSIZ, BUFSIZ)) == NULL) {
-		fprintf("svctcp_create: error\en");
-		exit(1);
-	}
-	pmap_unset(RCPPROG, RCPVERS);
-	if (!svc_register(transp,
-	  RCPPROG, RCPVERS, rcp_service, IPPROTO_TCP)) {
-		fprintf(stderr, "svc_register: error\en");
-		exit(1);
-	}
-	svc_run();  /* \fInever returns\fP */
-	fprintf(stderr, "svc_run should never return\en");
-}
-
-rcp_service(rqstp, transp)
-	register struct svc_req *rqstp;
-	register SVCXPRT *transp;
-{
-	switch (rqstp->rq_proc) {
-	case NULLPROC:
-		if (svc_sendreply(transp, xdr_void, 0) == 0) {
-			fprintf(stderr, "err: rcp_service");
-			return (1);
-		}
-		return;
-	case RCPPROC_FP:
-		if (!svc_getargs(transp, xdr_rcp, stdout)) {
-			svcerr_decode(transp);
-			return;
-		}
-		if (!svc_sendreply(transp, xdr_void, 0)) {
-			fprintf(stderr, "can't reply\en");
-			return;
-		}
-		return (0);
-	default:
-		svcerr_noproc(transp);
-		return;
-	}
-}
-.vs
-.DE
-.NH 2
-\&Callback Procedures
-.IX RPC "callback procedures"
-.LP
-Occasionally, it is useful to have a server become a client,
-and make an RPC call back to the process which is its client.
-An example is remote debugging,
-where the client is a window system program,
-and the server is a debugger running on the remote machine.
-Most of the time,
-the user clicks a mouse button at the debugging window,
-which converts this to a debugger command,
-and then makes an RPC call to the server
-(where the debugger is actually running),
-telling it to execute that command.
-However, when the debugger hits a breakpoint, the roles are reversed,
-and the debugger wants to make an rpc call to the window program,
-so that it can inform the user that a breakpoint has been reached.
-.LP
-In order to do an RPC callback,
-you need a program number to make the RPC call on.
-Since this will be a dynamically generated program number,
-it should be in the transient range,
-.I "0x40000000 - 0x5fffffff" .
-The routine
-.I gettransient()
-returns a valid program number in the transient range,
-and registers it with the portmapper.
-It only talks to the portmapper running on the same machine as the
-.I gettransient()
-routine itself.  The call to
-.I pmap_set()
-is a test and set operation,
-in that it indivisibly tests whether a program number
-has already been registered,
-and if it has not, then reserves it.  On return, the
-.I sockp
-argument will contain a socket that can be used
-as the argument to an
-.I svcudp_create()
-or
-.I svctcp_create()
-call.
-.ie t .DS
-.el .DS L
-.ft CW
-.vs 11
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <sys/socket.h>
-
-gettransient(proto, vers, sockp)
-	int proto, vers, *sockp;
-{
-	static int prognum = 0x40000000;
-	int s, len, socktype;
-	struct sockaddr_in addr;
-
-	switch(proto) {
-		case IPPROTO_UDP:
-			socktype = SOCK_DGRAM;
-			break;
-		case IPPROTO_TCP:
-			socktype = SOCK_STREAM;
-			break;
-		default:
-			fprintf(stderr, "unknown protocol type\en");
-			return 0;
-	}
-	if (*sockp == RPC_ANYSOCK) {
-		if ((s = socket(AF_INET, socktype, 0)) < 0) {
-			perror("socket");
-			return (0);
-		}
-		*sockp = s;
-	}
-	else
-		s = *sockp;
-	addr.sin_addr.s_addr = 0;
-	addr.sin_family = AF_INET;
-	addr.sin_port = 0;
-	len = sizeof(addr);
-.ft I
-	/*
-	 * may be already bound, so don't check for error
-	 */
-.ft CW
-	bind(s, &addr, len);
-	if (getsockname(s, &addr, &len)< 0) {
-		perror("getsockname");
-		return (0);
-	}
-	while (!pmap_set(prognum++, vers, proto,
-		ntohs(addr.sin_port))) continue;
-	return (prognum-1);
-}
-.vs
-.DE
-.SH
-Note:
-.I
-The call to
-.I ntohs()
-is necessary to ensure that the port number in
-.I "addr.sin_port" ,
-which is in
-.I network
-byte order, is passed in
-.I host
-byte order (as
-.I pmap_set()
-expects).  See the
-.I byteorder(3N)
-man page for more details on the conversion of network
-addresses from network to host byte order.
-.KS
-.LP
-The following pair of programs illustrate how to use the
-.I gettransient()
-routine.
-The client makes an RPC call to the server,
-passing it a transient program number.
-Then the client waits around to receive a callback
-from the server at that program number.
-The server registers the program
-.I EXAMPLEPROG
-so that it can receive the RPC call
-informing it of the callback program number.
-Then at some random time (on receiving an
-.I ALRM
-signal in this example), it sends a callback RPC call,
-using the program number it received earlier.
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
- * client
- */
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>
-
-int callback();
-char hostname[256];
-
-main()
-{
-	int x, ans, s;
-	SVCXPRT *xprt;
-
-	gethostname(hostname, sizeof(hostname));
-	s = RPC_ANYSOCK;
-	x = gettransient(IPPROTO_UDP, 1, &s);
-	fprintf(stderr, "client gets prognum %d\en", x);
-	if ((xprt = svcudp_create(s)) == NULL) {
-	  fprintf(stderr, "rpc_server: svcudp_create\en");
-		exit(1);
-	}
-.ft I
-	/* protocol is 0 - gettransient does registering
-	 */
-.ft CW
-	(void)svc_register(xprt, x, 1, callback, 0);
-	ans = callrpc(hostname, EXAMPLEPROG, EXAMPLEVERS,
-		EXAMPLEPROC_CALLBACK, xdr_int, &x, xdr_void, 0);
-	if ((enum clnt_stat) ans != RPC_SUCCESS) {
-		fprintf(stderr, "call: ");
-		clnt_perrno(ans);
-		fprintf(stderr, "\en");
-	}
-	svc_run();
-	fprintf(stderr, "Error: svc_run shouldn't return\en");
-}
-
-callback(rqstp, transp)
-	register struct svc_req *rqstp;
-	register SVCXPRT *transp;
-{
-	switch (rqstp->rq_proc) {
-		case 0:
-			if (!svc_sendreply(transp, xdr_void, 0)) {
-				fprintf(stderr, "err: exampleprog\en");
-				return (1);
-			}
-			return (0);
-		case 1:
-			if (!svc_getargs(transp, xdr_void, 0)) {
-				svcerr_decode(transp);
-				return (1);
-			}
-			fprintf(stderr, "client got callback\en");
-			if (!svc_sendreply(transp, xdr_void, 0)) {
-				fprintf(stderr, "err: exampleprog");
-				return (1);
-			}
-	}
-}
-.vs
-.DE
-.KE
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
- * server
- */
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <sys/signal.h>
-
-char *getnewprog();
-char hostname[256];
-int docallback();
-int pnum;		/* \fIprogram number for callback routine\fP */
-
-main()
-{
-	gethostname(hostname, sizeof(hostname));
-	registerrpc(EXAMPLEPROG, EXAMPLEVERS,
-	  EXAMPLEPROC_CALLBACK, getnewprog, xdr_int, xdr_void);
-	fprintf(stderr, "server going into svc_run\en");
-	signal(SIGALRM, docallback);
-	alarm(10);
-	svc_run();
-	fprintf(stderr, "Error: svc_run shouldn't return\en");
-}
-
-char *
-getnewprog(pnump)
-	char *pnump;
-{
-	pnum = *(int *)pnump;
-	return NULL;
-}
-
-docallback()
-{
-	int ans;
-
-	ans = callrpc(hostname, pnum, 1, 1, xdr_void, 0,
-		xdr_void, 0);
-	if (ans != 0) {
-		fprintf(stderr, "server: ");
-		clnt_perrno(ans);
-		fprintf(stderr, "\en");
-	}
-}
-.vs
-.DE
diff --git a/lib/libc/rpc/PSD.doc/rpc.rfc.ms b/lib/libc/rpc/PSD.doc/rpc.rfc.ms
deleted file mode 100644
index a7652c0..0000000
--- a/lib/libc/rpc/PSD.doc/rpc.rfc.ms
+++ /dev/null
@@ -1,1304 +0,0 @@
-.\"
-.\" Must use  --  tbl  --  with this one
-.\"
-.\" @(#)rpc.rfc.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/rpc.rfc.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
-.\"
-.de BT
-.if \\n%=1 .tl ''- % -''
-..
-.ND
-.\" prevent excess underlining in nroff
-.if n .fp 2 R
-.OH 'Remote Procedure Calls: Protocol Specification''Page %'
-.EH 'Page %''Remote Procedure Calls: Protocol Specification'
-.if \n%=1 .bp
-.SH
-\&Remote Procedure Calls: Protocol Specification
-.LP
-.NH 0
-\&Status of this Memo
-.LP
-Note: This chapter specifies a protocol that Sun Microsystems, Inc.,
-and others are using.  
-It has been designated RFC1050 by the ARPA Network
-Information Center.
-.LP
-.NH 1
-\&Introduction
-.LP
-This chapter specifies  a  message protocol  used in implementing
-Sun's Remote Procedure Call (RPC) package.  (The message protocol is
-specified with the External Data Representation (XDR) language.
-See the
-.I "External Data Representation Standard: Protocol Specification"
-for the details.  Here, we assume that  the  reader is familiar  
-with XDR and do not attempt to justify it or its uses).  The paper
-by Birrell and Nelson [1]  is recommended as an  excellent background
-to  and justification of RPC.
-.NH 2
-\&Terminology
-.LP
-This chapter discusses servers, services, programs, procedures,
-clients, and versions.  A server is a piece of software where network
-services are implemented.  A network service is a collection of one
-or more remote programs.  A remote program implements one or more
-remote procedures; the procedures, their parameters, and results are
-documented in the specific program's protocol specification (see the
-\fIPort Mapper Program Protocol\fP\, below, for an example).  Network
-clients are pieces of software that initiate remote procedure calls
-to services.  A server may support more than one version of a remote
-program in order to be forward compatible with changing protocols.
-.LP
-For example, a network file service may be composed of two programs.
-One program may deal with high-level applications such as file system
-access control and locking.  The other may deal with low-level file
-IO and have procedures like "read" and "write".  A client machine of
-the network file service would call the procedures associated with
-the two programs of the service on behalf of some user on the client
-machine.
-.NH 2
-\&The RPC Model
-.LP
-The remote procedure call model is similar to the local procedure
-call model.  In the local case, the caller places arguments to a
-procedure in some well-specified location (such as a result
-register).  It then transfers control to the procedure, and
-eventually gains back control.  At that point, the results of the
-procedure are extracted from the well-specified location, and the
-caller continues execution.
-.LP
-The remote procedure call is similar, in that one thread of control
-logically winds through two processes\(emone is the caller's process,
-the other is a server's process.  That is, the caller process sends a
-call message to the server process and waits (blocks) for a reply
-message.  The call message contains the procedure's parameters, among
-other things.  The reply message contains the procedure's results,
-among other things.  Once the reply message is received, the results
-of the procedure are extracted, and caller's execution is resumed.
-.LP
-On the server side, a process is dormant awaiting the arrival of a
-call message.  When one arrives, the server process extracts the
-procedure's parameters, computes the results, sends a reply message,
-and then awaits the next call message.
-.LP
-Note that in this model, only one of the two processes is active at
-any given time.  However, this model is only given as an example.
-The RPC protocol makes no restrictions on the concurrency model
-implemented, and others are possible.  For example, an implementation
-may choose to have RPC calls be asynchronous, so that the client may
-do useful work while waiting for the reply from the server.  Another
-possibility is to have the server create a task to process an
-incoming request, so that the server can be free to receive other
-requests.
-.NH 2
-\&Transports and Semantics
-.LP
-The RPC protocol is independent of transport protocols.  That is, RPC
-does not care how a message is passed from one process to another.
-The protocol deals only with specification and interpretation of
-messages.
-.LP
-It is important to point out that RPC does not try to implement any
-kind of reliability and that the application must be aware of the
-type of transport protocol underneath RPC.  If it knows it is running
-on top of a reliable transport such as TCP/IP[6], then most of the
-work is already done for it.  On the other hand, if it is running on
-top of an unreliable transport such as UDP/IP[7], it must implement
-is own retransmission and time-out policy as the RPC layer does not
-provide this service.
-.LP
-Because of transport independence, the RPC protocol does not attach
-specific semantics to the remote procedures or their execution.
-Semantics can be inferred from (but should be explicitly specified
-by) the underlying transport protocol.  For example, consider RPC
-running on top of an unreliable transport such as UDP/IP.  If an
-application retransmits RPC messages after short time-outs, the only
-thing it can infer if it receives no reply is that the procedure was
-executed zero or more times.  If it does receive a reply, then it can
-infer that the procedure was executed at least once.
-.LP
-A server may wish to remember previously granted requests from a
-client and not regrant them in order to insure some degree of
-execute-at-most-once semantics.  A server can do this by taking
-advantage of the transaction ID that is packaged with every RPC
-request.  The main use of this transaction is by the client RPC layer
-in matching replies to requests.  However, a client application may
-choose to reuse its previous transaction ID when retransmitting a
-request.  The server application, knowing this fact, may choose to
-remember this ID after granting a request and not regrant requests
-with the same ID in order to achieve some degree of
-execute-at-most-once semantics.  The server is not allowed to examine
-this ID in any other way except as a test for equality.
-.LP
-On the other hand, if using a reliable transport such as TCP/IP, the
-application can infer from a reply message that the procedure was
-executed exactly once, but if it receives no reply message, it cannot
-assume the remote procedure was not executed.  Note that even if a
-connection-oriented protocol like TCP is used, an application still
-needs time-outs and reconnection to handle server crashes.
-.LP
-There are other possibilities for transports besides datagram- or
-connection-oriented protocols.  For example, a request-reply protocol
-such as VMTP[2] is perhaps the most natural transport for RPC.
-.SH
-.I
-NOTE:  At Sun, RPC is currently implemented on top of both TCP/IP
-and UDP/IP transports.
-.LP
-.NH 2
-\&Binding and Rendezvous Independence
-.LP
-The act of binding a client to a service is NOT part of the remote
-procedure call specification.  This important and necessary function
-is left up to some higher-level software.  (The software may use RPC
-itself\(emsee the \fIPort Mapper Program Protocol\fP\, below).
-.LP
-Implementors should think of the RPC protocol as the jump-subroutine
-instruction ("JSR") of a network; the loader (binder) makes JSR
-useful, and the loader itself uses JSR to accomplish its task.
-Likewise, the network makes RPC useful, using RPC to accomplish this
-task.
-.NH 2
-\&Authentication
-.LP
-The RPC protocol provides the fields necessary for a client to
-identify itself to a service and vice-versa.  Security and access
-control mechanisms can be built on top of the message authentication.
-Several different authentication protocols can be supported.  A field
-in the RPC header indicates which protocol is being used.  More
-information on specific authentication protocols can be found in the
-\fIAuthentication Protocols\fP\,
-below.
-.KS
-.NH 1
-\&RPC Protocol Requirements
-.LP
-The RPC protocol must provide for the following:
-.IP  1.
-Unique specification of a procedure to be called.
-.IP  2.
-Provisions for matching response messages to request messages.
-.KE
-.IP  3.
-Provisions for authenticating the caller to service and vice-versa.
-.LP
-Besides these requirements, features that detect the following are
-worth supporting because of protocol roll-over errors, implementation
-bugs, user error, and network administration:
-.IP  1.
-RPC protocol mismatches.
-.IP  2.
-Remote program protocol version mismatches.
-.IP  3.
-Protocol errors (such as misspecification of a procedure's parameters).
-.IP  4.
-Reasons why remote authentication failed.
-.IP  5.
-Any other reasons why the desired procedure was not called.
-.NH 2
-\&Programs and Procedures
-.LP
-The RPC call message has three unsigned fields:  remote program
-number, remote program version number, and remote procedure number.
-The three fields uniquely identify the procedure to be called.
-Program numbers are administered by some central authority (like
-Sun).  Once an implementor has a program number, he can implement his
-remote program; the first implementation would most likely have the
-version number of 1.  Because most new protocols evolve into better,
-stable, and mature protocols, a version field of the call message
-identifies which version of the protocol the caller is using.
-Version numbers make speaking old and new protocols through the same
-server process possible.
-.LP
-The procedure number identifies the procedure to be called.  These
-numbers are documented in the specific program's protocol
-specification.  For example, a file service's protocol specification
-may state that its procedure number 5 is "read" and procedure number
-12 is "write".
-.LP
-Just as remote program protocols may change over several versions,
-the actual RPC message protocol could also change.  Therefore, the
-call message also has in it the RPC version number, which is always
-equal to two for the version of RPC described here.
-.LP
-The reply message to a request  message  has enough  information to
-distinguish the following error conditions:
-.IP  1.
-The remote implementation of RPC does speak protocol version 2.
-The lowest and highest supported RPC version numbers are returned.
-.IP  2.
-The remote program is not available on the remote system.
-.IP  3.
-The remote program does not support the requested version number.
-The lowest and highest supported remote program version numbers are
-returned.
-.IP  4.
-The requested procedure number does not exist.  (This is usually a
-caller side protocol or programming error.)
-.IP  5.
-The parameters to the remote procedure appear to be garbage from the
-server's point of view.  (Again, this is usually caused by a
-disagreement about the protocol between client and service.)
-.NH 2
-\&Authentication
-.LP
-Provisions for authentication of caller to service and vice-versa are
-provided as a part of the RPC protocol.  The call message has two
-authentication fields, the credentials and verifier.  The reply
-message has one authentication field, the response verifier.  The RPC
-protocol specification defines all three fields to be the following
-opaque type:
-.DS
-.ft CW
-.vs 11
-enum auth_flavor {
-    AUTH_NULL        = 0,
-    AUTH_UNIX        = 1,
-    AUTH_SHORT       = 2,
-    AUTH_DES         = 3
-    /* \fIand more to be defined\fP */
-};
-
-struct opaque_auth {
-    auth_flavor flavor;
-    opaque body<400>;
-};
-.DE
-.LP
-In simple English, any
-.I opaque_auth 
-structure is an 
-.I auth_flavor 
-enumeration followed by bytes which are  opaque to the RPC protocol
-implementation.
-.LP
-The interpretation and semantics  of the data contained  within the
-authentication   fields  is specified  by  individual,  independent
-authentication  protocol specifications.   (See 
-\fIAuthentication Protocols\fP\,
-below, for definitions of the various authentication protocols.)
-.LP
-If authentication parameters were   rejected, the  response message
-contains information stating why they were rejected.
-.NH 2
-\&Program Number Assignment
-.LP
-Program numbers are given out in groups of
-.I 0x20000000 
-(decimal 536870912) according to the following chart:
-.TS
-box tab (&) ;
-lfI lfI
-rfL cfI .
-Program Numbers&Description
-_
-.sp .5
-0 - 1fffffff&Defined by Sun
-20000000 - 3fffffff&Defined by user
-40000000 - 5fffffff&Transient
-60000000 - 7fffffff&Reserved
-80000000 - 9fffffff&Reserved
-a0000000 - bfffffff&Reserved
-c0000000 - dfffffff&Reserved
-e0000000 - ffffffff&Reserved
-.TE
-.LP
-The first group is a range of numbers administered by Sun
-Microsystems and should be identical for all sites.  The second range
-is for applications peculiar to a particular site.  This range is
-intended primarily for debugging new programs.  When a site develops
-an application that might be of general interest, that application
-should be given an assigned number in the first range.  The third
-group is for applications that generate program numbers dynamically.
-The final groups are reserved for future use, and should not be used.
-.NH 2
-\&Other Uses of the RPC Protocol
-.LP
-The intended use of this protocol is for calling remote procedures.
-That is, each call message is matched with a response message.
-However, the protocol itself is a message-passing protocol with which
-other (non-RPC) protocols can be implemented.  Sun currently uses, or
-perhaps abuses, the RPC message protocol for the following two
-(non-RPC) protocols:  batching (or pipelining) and broadcast RPC.
-These two protocols are discussed but not defined below.
-.NH 3
-\&Batching
-.LP
-Batching allows a client to send an arbitrarily large sequence of
-call messages to a server; batching typically uses reliable byte
-stream protocols (like TCP/IP) for its transport.  In the case of
-batching, the client never waits for a reply from the server, and the
-server does not send replies to batch requests.  A sequence of batch
-calls is usually terminated by a legitimate RPC in order to flush the
-pipeline (with positive acknowledgement).
-.NH 3
-\&Broadcast RPC
-.LP
-In broadcast RPC-based protocols, the client sends a broadcast packet
-to the network and waits for numerous replies.  Broadcast RPC uses
-unreliable, packet-based protocols (like UDP/IP) as its transports.
-Servers that support broadcast protocols only respond when the
-request is successfully processed, and are silent in the face of
-errors.  Broadcast RPC uses the Port Mapper RPC service to achieve
-its semantics.  See the \fIPort Mapper Program Protocol\fP\, below,
-for more information.
-.KS
-.NH 1
-\&The RPC Message Protocol
-.LP
-This section defines the RPC message protocol in the XDR data
-description language.  The message is defined in a top-down style.
-.ie t .DS
-.el .DS L
-.ft CW
-enum msg_type {
-	CALL  = 0,
-	REPLY = 1
-};
-
-.ft I
-/*
-* A reply to a call message can take on two forms:
-* The message was either accepted or rejected.
-*/
-.ft CW
-enum reply_stat {
-	MSG_ACCEPTED = 0,
-	MSG_DENIED   = 1
-};
-
-.ft I
-/*
-* Given that a call message was accepted,  the following is the
-* status of an attempt to call a remote procedure.
-*/
-.ft CW
-enum accept_stat {
-	SUCCESS       = 0, /* \fIRPC executed successfully       \fP*/
-	PROG_UNAVAIL  = 1, /* \fIremote hasn't exported program  \fP*/
-	PROG_MISMATCH = 2, /* \fIremote can't support version #  \fP*/
-	PROC_UNAVAIL  = 3, /* \fIprogram can't support procedure \fP*/
-	GARBAGE_ARGS  = 4  /* \fIprocedure can't decode params   \fP*/
-};
-.DE
-.ie t .DS
-.el .DS L
-.ft I
-/*
-* Reasons why a call message was rejected:
-*/
-.ft CW
-enum reject_stat {
-	RPC_MISMATCH = 0, /* \fIRPC version number != 2          \fP*/
-	AUTH_ERROR = 1    /* \fIremote can't authenticate caller \fP*/
-};
-
-.ft I
-/*
-* Why authentication failed:
-*/
-.ft CW
-enum auth_stat {
-	AUTH_BADCRED      = 1,  /* \fIbad credentials \fP*/
-	AUTH_REJECTEDCRED = 2,  /* \fIclient must begin new session \fP*/
-	AUTH_BADVERF      = 3,  /* \fIbad verifier \fP*/
-	AUTH_REJECTEDVERF = 4,  /* \fIverifier expired or replayed  \fP*/
-	AUTH_TOOWEAK      = 5   /* \fIrejected for security reasons \fP*/
-};
-.DE
-.KE
-.ie t .DS
-.el .DS L
-.ft I
-/*
-* The  RPC  message: 
-* All   messages  start with   a transaction  identifier,  xid,
-* followed  by a  two-armed  discriminated union.   The union's
-* discriminant is a  msg_type which switches to  one of the two
-* types   of the message.   The xid  of a \fIREPLY\fP  message always
-* matches  that of the initiating \fICALL\fP   message.   NB: The xid
-* field is only  used for clients  matching reply messages with
-* call messages  or for servers detecting  retransmissions; the
-* service side  cannot treat this id  as any type   of sequence
-* number.
-*/
-.ft CW
-struct rpc_msg {
-	unsigned int xid;
-	union switch (msg_type mtype) {
-		case CALL:
-			call_body cbody;
-		case REPLY:  
-			reply_body rbody;
-	} body;
-};
-.DE
-.ie t .DS
-.el .DS L
-.ft I
-/*
-* Body of an RPC request call: 
-* In version 2 of the  RPC protocol specification, rpcvers must
-* be equal to 2.  The  fields prog,  vers, and proc specify the
-* remote program, its version number, and the  procedure within
-* the remote program to be called.  After these  fields are two
-* authentication  parameters: cred (authentication credentials)
-* and verf  (authentication verifier).  The  two authentication
-* parameters are   followed by  the  parameters  to  the remote
-* procedure,  which  are specified  by  the  specific   program
-* protocol.
-*/
-.ft CW
-struct call_body {
-	unsigned int rpcvers;  /* \fImust be equal to two (2) \fP*/
-	unsigned int prog;
-	unsigned int vers;
-	unsigned int proc;
-	opaque_auth cred;
-	opaque_auth verf;
-	/* \fIprocedure specific parameters start here \fP*/
-};
-.DE
-.ie t .DS
-.el .DS L
-.ft I
-/*
-* Body of a reply to an RPC request:
-* The call message was either accepted or rejected.
-*/
-.ft CW
-union reply_body switch (reply_stat stat) {
-	case MSG_ACCEPTED:  
-		accepted_reply areply;
-	case MSG_DENIED:  
-		rejected_reply rreply;
-} reply;
-.DE
-.ie t .DS
-.el .DS L
-.ft I
-/*
-* Reply to   an RPC request  that  was accepted  by the server:
-* there could be an error even though the request was accepted.
-* The first field is an authentication verifier that the server
-* generates in order to  validate itself  to the caller.  It is
-* followed by    a  union whose     discriminant  is   an  enum
-* accept_stat.  The  \fISUCCESS\fP  arm of    the union  is  protocol
-* specific.  The \fIPROG_UNAVAIL\fP, \fIPROC_UNAVAIL\fP, and \fIGARBAGE_ARGP\fP
-* arms of the union are void.   The \fIPROG_MISMATCH\fP arm specifies
-* the lowest and highest version numbers of the  remote program
-* supported by the server.
-*/
-.ft CW
-struct accepted_reply {
-	opaque_auth verf;
-	union switch (accept_stat stat) {
-		case SUCCESS:
-			opaque results[0];
-			/* \fIprocedure-specific results start here\fP */
-		case PROG_MISMATCH:
-			struct {
-				unsigned int low;
-				unsigned int high;
-			} mismatch_info;
-		default:
-.ft I
-			/*
-			* Void.  Cases include \fIPROG_UNAVAIL, PROC_UNAVAIL\fP,
-			* and \fIGARBAGE_ARGS\fP.
-			*/
-.ft CW
-			void;
-	} reply_data;
-};
-.DE
-.ie t .DS
-.el .DS L
-.ft I
-/*
-* Reply to an RPC request that was rejected by the server: 
-* The request  can   be rejected for   two reasons:  either the
-* server   is not  running a   compatible  version  of the  RPC
-* protocol    (\fIRPC_MISMATCH\fP), or    the  server   refuses    to
-* authenticate the  caller  (\fIAUTH_ERROR\fP).  In  case of  an  RPC
-* version mismatch,  the server returns the  lowest and highest
-* supported    RPC  version    numbers.  In   case   of refused
-* authentication, failure status is returned.
-*/
-.ft CW
-union rejected_reply switch (reject_stat stat) {
-	case RPC_MISMATCH:
-		struct {
-			unsigned int low;
-			unsigned int high;
-		} mismatch_info;
-	case AUTH_ERROR: 
-		auth_stat stat;
-};
-.DE
-.NH 1
-\&Authentication Protocols
-.LP
-As previously stated, authentication parameters are opaque, but
-open-ended to the rest of the RPC protocol.  This section defines
-some "flavors" of authentication implemented at (and supported by)
-Sun.  Other sites are free to invent new authentication types, with
-the same rules of flavor number assignment as there is for program
-number assignment.
-.NH 2
-\&Null Authentication
-.LP
-Often calls must be made where the caller does not know who he is or
-the server does not care who the caller is.  In this case, the flavor
-value (the discriminant of the \fIopaque_auth\fP's union) of the RPC
-message's credentials, verifier, and response verifier is
-.I AUTH_NULL .
-The  bytes of the opaque_auth's body  are undefined.
-It is recommended that the opaque length be zero.
-.NH 2
-\&UNIX Authentication
-.LP
-The caller of a remote procedure may wish to identify himself as he
-is identified on a UNIX system.  The  value of the credential's
-discriminant of an RPC call  message is  
-.I AUTH_UNIX .
-The bytes of
-the credential's opaque body encode the following structure:
-.DS
-.ft CW
-struct auth_unix {
-	unsigned int stamp;
-	string machinename<255>;
-	unsigned int uid;
-	unsigned int gid;
-	unsigned int gids<10>;
-};
-.DE
-The 
-.I stamp 
-is an  arbitrary    ID which the  caller machine   may
-generate.  The 
-.I machinename 
-is the  name of the  caller's machine (like  "krypton").  The 
-.I uid 
-is  the caller's effective user  ID.  The  
-.I gid 
-is  the caller's effective  group  ID.  The 
-.I gids 
-is  a
-counted array of groups which contain the caller as  a member.  The
-verifier accompanying the  credentials  should  be  of  
-.I AUTH_NULL
-(defined above).
-.LP
-The value of the discriminant of  the response verifier received in
-the  reply  message  from  the    server  may   be   
-.I AUTH_NULL 
-or
-.I AUTH_SHORT .
-In  the  case  of 
-.I AUTH_SHORT ,
-the bytes of the response verifier's string encode an opaque
-structure.  This new opaque structure may now be passed to the server
-instead of the original
-.I AUTH_UNIX
-flavor credentials.  The server keeps a cache which maps shorthand
-opaque structures (passed back by way of an
-.I AUTH_SHORT
-style response verifier) to the original credentials of the caller.
-The caller can save network bandwidth and server cpu cycles by using
-the new credentials.
-.LP
-The server may flush the shorthand opaque structure at any time.  If
-this happens, the remote procedure call message will be rejected due
-to an authentication error.  The reason for the failure will be
-.I AUTH_REJECTEDCRED .
-At this point, the caller may wish to try the original
-.I AUTH_UNIX
-style of credentials.
-.KS
-.NH 2
-\&DES Authentication
-.LP
-UNIX authentication suffers from two major problems:
-.IP  1.
-The naming is too UNIX-system oriented.
-.IP  2.
-There is no verifier, so credentials can easily be faked.
-.LP
-DES authentication attempts to fix these two problems.
-.KE
-.NH 3
-\&Naming
-.LP
-The first problem is handled by addressing the caller by a simple
-string of characters instead of by an operating system specific
-integer.  This string of characters is known as the "netname" or
-network name of the caller.  The server is not allowed to interpret
-the contents of the caller's name in any other way except to
-identify the caller.  Thus, netnames should be unique for every
-caller in the internet.
-.LP
-It is up to each operating system's implementation of DES
-authentication to generate netnames for its users that insure this
-uniqueness when they call upon remote servers.  Operating systems
-already know how to distinguish users local to their systems.  It is
-usually a simple matter to extend this mechanism to the network.
-For example, a UNIX user at Sun with a user ID of 515 might be
-assigned the following netname: "unix.515@sun.com".  This netname
-contains three items that serve to insure it is unique.  Going
-backwards, there is only one naming domain called "sun.com" in the
-internet.  Within this domain, there is only one UNIX user with
-user ID 515.  However, there may be another user on another
-operating system, for example VMS, within the same naming domain
-that, by coincidence, happens to have the same user ID.  To insure
-that these two users can be distinguished we add the operating
-system name.  So one user is "unix.515@sun.com" and the other is
-"vms.515@sun.com".
-.LP
-The first field is actually a naming method rather than an
-operating system name.  It just happens that today there is almost
-a one-to-one correspondence between naming methods and operating
-systems.  If the world could agree on a naming standard, the first
-field could be the name of that standard, instead of an operating
-system name.
-.LP
-.NH 3
-\&DES Authentication Verifiers
-.LP
-Unlike UNIX authentication, DES authentication does have a verifier
-so the server can validate the client's credential (and
-vice-versa).  The contents of this verifier is primarily an
-encrypted timestamp.  The server can decrypt this timestamp, and if
-it is close to what the real time is, then the client must have
-encrypted it correctly.  The only way the client could encrypt it
-correctly is to know the "conversation key" of the RPC session.  And
-if the client knows the conversation key, then it must be the real
-client.
-.LP
-The conversation key is a DES [5] key which the client generates
-and notifies the server of in its first RPC call.  The conversation
-key is encrypted using a public key scheme in this first
-transaction.  The particular public key scheme used in DES
-authentication is Diffie-Hellman [3] with 192-bit keys.  The
-details of this encryption method are described later.
-.LP
-The client and the server need the same notion of the current time
-in order for all of this to work.  If network time synchronization
-cannot be guaranteed, then client can synchronize with the server
-before beginning the conversation, perhaps by consulting the
-Internet Time Server (TIME[4]).
-.LP
-The way a server determines if a client timestamp is valid is
-somewhat complicated.  For any other transaction but the first, the
-server just checks for two things:
-.IP  1.
-the timestamp is greater than the one previously seen from the
-same client.
-.IP  2.
-the timestamp has not expired.
-.LP
-A timestamp is expired if the server's time is later than the sum
-of the client's timestamp plus what is known as the client's
-"window".  The "window" is a number the client passes (encrypted)
-to the server in its first transaction.  You can think of it as a
-lifetime for the credential.
-.LP
-This explains everything but the first transaction.  In the first
-transaction, the server checks only that the timestamp has not
-expired.  If this was all that was done though, then it would be
-quite easy for the client to send random data in place of the
-timestamp with a fairly good chance of succeeding.  As an added
-check, the client sends an encrypted item in the first transaction
-known as the "window verifier" which must be equal to the window
-minus 1, or the server will reject the credential.
-.LP
-The client too must check the verifier returned from the server to
-be sure it is legitimate.  The server sends back to the client the
-encrypted timestamp it received from the client, minus one second.
-If the client gets anything different than this, it will reject it.
-.LP
-.NH 3
-\&Nicknames and Clock Synchronization
-.LP
-After the first transaction, the server's DES authentication
-subsystem returns in its verifier to the client an integer
-"nickname" which the client may use in its further transactions
-instead of passing its netname, encrypted DES key and window every
-time.  The nickname is most likely an index into a table on the
-server which stores for each client its netname, decrypted DES key
-and window.
-.LP
-Though they originally were synchronized, the client's and server's
-clocks can get out of sync again.  When this happens the client RPC
-subsystem most likely will get back
-.I RPC_AUTHERROR 
-at which point it should resynchronize.
-.LP
-A client may still get the
-.I RPC_AUTHERROR 
-error even though it is
-synchronized with the server.  The reason is that the server's
-nickname table is a limited size, and it may flush entries whenever
-it wants.  A client should resend its original credential in this
-case and the server will give it a new nickname.  If a server
-crashes, the entire nickname table gets flushed, and all clients
-will have to resend their original credentials.
-.KS
-.NH 3
-\&DES Authentication Protocol (in XDR language)
-.ie t .DS
-.el .DS L
-.ft I
-/*
-* There are two kinds of credentials: one in which the client uses
-* its full network name, and one in which it uses its "nickname"
-* (just an unsigned integer) given to it by the server.  The
-* client must use its fullname in its first transaction with the
-* server, in which the server will return to the client its
-* nickname.  The client may use its nickname in all further
-* transactions with the server.  There is no requirement to use the
-* nickname, but it is wise to use it for performance reasons.
-*/
-.ft CW
-enum authdes_namekind {
-	ADN_FULLNAME = 0,
-	ADN_NICKNAME = 1
-};
-
-.ft I
-/*
-* A 64-bit block of encrypted DES data
-*/
-.ft CW
-typedef opaque des_block[8];
-
-.ft I
-/*
-* Maximum length of a network user's name
-*/
-.ft CW
-const MAXNETNAMELEN = 255;
-
-.ft I
-/*
-* A fullname contains the network name of the client, an encrypted
-* conversation key and the window.  The window is actually a
-* lifetime for the credential.  If the time indicated in the
-* verifier timestamp plus the window has past, then the server
-* should expire the request and not grant it.  To insure that
-* requests are not replayed, the server should insist that
-* timestamps are greater than the previous one seen, unless it is
-* the first transaction.  In the first transaction, the server
-* checks instead that the window verifier is one less than the
-* window.
-*/
-.ft CW
-struct authdes_fullname {
-string name<MAXNETNAMELEN>;  /* \fIname of client \f(CW*/
-des_block key;               /* \fIPK encrypted conversation key \f(CW*/
-unsigned int window;         /* \fIencrypted window \f(CW*/
-};
-
-.ft I
-/*
-* A credential is either a fullname or a nickname
-*/
-.ft CW
-union authdes_cred switch (authdes_namekind adc_namekind) {
-	case ADN_FULLNAME:
-		authdes_fullname adc_fullname;
-	case ADN_NICKNAME:
-		unsigned int adc_nickname;
-};
-
-.ft I
-/*
-* A timestamp encodes the time since midnight, January 1, 1970.
-*/
-.ft CW
-struct timestamp {
-	unsigned int seconds;    /* \fIseconds \fP*/
-	unsigned int useconds;   /* \fIand microseconds \fP*/
-};
-
-.ft I
-/*
-* Verifier: client variety
-* The window verifier is only used in the first transaction.  In
-* conjunction with a fullname credential, these items are packed
-* into the following structure before being encrypted:
-*
-* \f(CWstruct {\fP
-*     \f(CWadv_timestamp;            \fP-- one DES block
-*     \f(CWadc_fullname.window;      \fP-- one half DES block
-*     \f(CWadv_winverf;              \fP-- one half DES block
-* \f(CW}\fP
-* This structure is encrypted using CBC mode encryption with an
-* input vector of zero.  All other encryptions of timestamps use
-* ECB mode encryption.
-*/
-.ft CW
-struct authdes_verf_clnt {
-	timestamp adv_timestamp;    /* \fIencrypted timestamp       \fP*/
-	unsigned int adv_winverf;   /* \fIencrypted window verifier \fP*/
-};
-
-.ft I
-/*
-* Verifier: server variety
-* The server returns (encrypted) the same timestamp the client
-* gave it minus one second.  It also tells the client its nickname
-* to be used in future transactions (unencrypted).
-*/
-.ft CW
-struct authdes_verf_svr {
-timestamp adv_timeverf;     /* \fIencrypted verifier      \fP*/
-unsigned int adv_nickname;  /* \fInew nickname for client \fP*/
-};
-.DE
-.KE
-.NH 3
-\&Diffie-Hellman Encryption
-.LP
-In this scheme, there are two constants,
-.I BASE 
-and
-.I MODULUS .
-The
-particular values Sun has chosen for these for the DES
-authentication protocol are:
-.ie t .DS
-.el .DS L
-.ft CW
-const BASE = 3;
-const MODULUS = 
-        "d4a0ba0250b6fd2ec626e7efd637df76c716e22d0944b88b"; /* \fIhex \fP*/
-.DE
-.ft R
-The way this scheme works is best explained by an example.  Suppose
-there are two people "A" and "B" who want to send encrypted
-messages to each other.  So, A and B both generate "secret" keys at
-random which they do not reveal to anyone.  Let these keys be
-represented as SK(A) and SK(B).  They also publish in a public
-directory their "public" keys.  These keys are computed as follows:
-.ie t .DS
-.el .DS L
-.ft CW
-PK(A) = ( BASE ** SK(A) ) mod MODULUS
-PK(B) = ( BASE ** SK(B) ) mod MODULUS
-.DE
-.ft R
-The "**" notation is used here to represent exponentiation.  Now,
-both A and B can arrive at the "common" key between them,
-represented here as CK(A, B), without revealing their secret keys.
-.LP
-A computes:
-.ie t .DS
-.el .DS L
-.ft CW
-CK(A, B) = ( PK(B) ** SK(A)) mod MODULUS
-.DE
-.ft R
-while B computes:
-.ie t .DS
-.el .DS L
-.ft CW
-CK(A, B) = ( PK(A) ** SK(B)) mod MODULUS
-.DE
-.ft R
-These two can be shown to be equivalent:
-.ie t .DS
-.el .DS L
-.ft CW
-(PK(B) ** SK(A)) mod MODULUS = (PK(A) ** SK(B)) mod MODULUS
-.DE
-.ft R
-We drop the "mod MODULUS" parts and assume modulo arithmetic to
-simplify things:
-.ie t .DS
-.el .DS L
-.ft CW
-PK(B) ** SK(A) = PK(A) ** SK(B)
-.DE
-.ft R
-Then, replace PK(B) by what B computed earlier and likewise for
-PK(A).
-.ie t .DS
-.el .DS L
-.ft CW
-((BASE ** SK(B)) ** SK(A) = (BASE ** SK(A)) ** SK(B)
-.DE
-.ft R
-which leads to:
-.ie t .DS
-.el .DS L
-.ft CW
-BASE ** (SK(A) * SK(B)) = BASE ** (SK(A) * SK(B))
-.DE
-.ft R
-This common key CK(A, B) is not used to encrypt the timestamps used
-in the protocol.  Rather, it is used only to encrypt a conversation
-key which is then used to encrypt the timestamps.  The reason for
-doing this is to use the common key as little as possible, for fear
-that it could be broken.  Breaking the conversation key is a far
-less serious offense, since conversations are relatively
-short-lived.
-.LP
-The conversation key is encrypted using 56-bit DES keys, yet the
-common key is 192 bits.  To reduce the number of bits, 56 bits are
-selected from the common key as follows.  The middle-most 8-bytes
-are selected from the common key, and then parity is added to the
-lower order bit of each byte, producing a 56-bit key with 8 bits of
-parity.
-.KS
-.NH 1
-\&Record Marking Standard
-.LP
-When RPC messages are passed on top of a byte stream protocol (like
-TCP/IP), it is necessary, or at least desirable, to delimit one
-message from another in order to detect and possibly recover from
-user protocol errors.  This is called record marking (RM).  Sun uses
-this RM/TCP/IP transport for passing RPC messages on TCP streams.
-One RPC message fits into one RM record.
-.LP
-A record is composed of one or more record fragments.  A record
-fragment is a four-byte header followed by 0 to (2**31) - 1 bytes of
-fragment data.  The bytes encode an unsigned binary number; as with
-XDR integers, the byte order is from highest to lowest.  The number
-encodes two values\(ema boolean which indicates whether the fragment
-is the last fragment of the record (bit value 1 implies the fragment
-is the last fragment) and a 31-bit unsigned binary value which is the
-length in bytes of the fragment's data.  The boolean value is the
-highest-order bit of the header; the length is the 31 low-order bits.
-(Note that this record specification is NOT in XDR standard form!)
-.KE
-.KS
-.NH 1
-\&The RPC Language
-.LP
-Just as there was a need to describe the XDR data-types in a formal
-language, there is also need to describe the procedures that operate
-on these XDR data-types in a formal language as well.  We use the RPC
-Language for this purpose.  It is an extension to the XDR language.
-The following example is used to describe the essence of the
-language.
-.NH 2
-\&An Example Service Described in the RPC Language
-.LP
-Here is an example of the specification of a simple ping program.
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
-* Simple ping program
-*/
-.ft CW
-program PING_PROG {
-	/* \fILatest and greatest version\fP */
-	version PING_VERS_PINGBACK {
-	void 
-	PINGPROC_NULL(void) = 0;
-
-.ft I
-	/*
-	* Ping the caller, return the round-trip time
-	* (in microseconds). Returns -1 if the operation
-	* timed out.
-	*/
-.ft CW
-	int
-	PINGPROC_PINGBACK(void) = 1;        
-} = 2;     
-
-.ft I
-/*
-* Original version
-*/
-.ft CW
-version PING_VERS_ORIG {
-	void 
-	PINGPROC_NULL(void) = 0;
-	} = 1;
-} = 1;
-
-const PING_VERS = 2;      /* \fIlatest version \fP*/
-.vs
-.DE
-.KE
-.LP
-The first version described is
-.I PING_VERS_PINGBACK
-with  two procedures,   
-.I PINGPROC_NULL 
-and 
-.I PINGPROC_PINGBACK .
-.I PINGPROC_NULL 
-takes no arguments and returns no results, but it is useful for
-computing round-trip times from the client to the server and back
-again.  By convention, procedure 0 of any RPC protocol should have
-the same semantics, and never require any kind of authentication.
-The second procedure is used for the client to have the server do a
-reverse ping operation back to the client, and it returns the amount
-of time (in microseconds) that the operation used.  The next version,
-.I PING_VERS_ORIG ,
-is the original version of the protocol
-and it does not contain
-.I PINGPROC_PINGBACK
-procedure. It  is useful
-for compatibility  with old client  programs,  and as  this program
-matures it may be dropped from the protocol entirely.
-.KS
-.NH 2
-\&The RPC Language Specification
-.LP
-The  RPC language is identical to  the XDR language, except for the
-added definition of a
-.I program-def 
-described below.
-.DS
-.ft CW
-program-def:
-	"program" identifier "{"
-		version-def 
-		version-def *
-	"}" "=" constant ";"
-
-version-def:
-	"version" identifier "{"
-		procedure-def
-		procedure-def *
-	"}" "=" constant ";"
-
-procedure-def:
-	type-specifier identifier "(" type-specifier ")"
-	"=" constant ";"
-.DE
-.KE
-.NH 2
-\&Syntax Notes
-.IP  1.
-The following keywords  are  added  and   cannot  be used   as
-identifiers: "program" and "version";
-.IP  2.
-A version name cannot occur more than once within the  scope of
-a program definition. Nor can a version number occur more than once
-within the scope of a program definition.
-.IP  3.
-A procedure name cannot occur  more than once within  the scope
-of a version definition. Nor can a procedure number occur more than
-once within the scope of version definition.
-.IP  4.
-Program identifiers are in the same name space as  constant and
-type identifiers.
-.IP  5.
-Only unsigned constants can  be assigned to programs, versions
-and procedures.
-.NH 1
-\&Port Mapper Program Protocol
-.LP
-The port mapper program maps RPC program and version numbers to
-transport-specific port numbers.  This program makes dynamic binding
-of remote programs possible.
-.LP
-This is desirable because the range of reserved port numbers is very
-small and the number of potential remote programs is very large.  By
-running only the port mapper on a reserved port, the port numbers of
-other remote programs can be ascertained by querying the port mapper.
-.LP
-The port mapper also aids in broadcast RPC.  A given RPC program will
-usually have different port number bindings on different machines, so
-there is no way to directly broadcast to all of these programs.  The
-port mapper, however, does have a fixed port number.  So, to
-broadcast to a given program, the client actually sends its message
-to the port mapper located at the broadcast address.  Each port
-mapper that picks up the broadcast then calls the local service
-specified by the client.  When the port mapper gets the reply from
-the local service, it sends the reply on back to the client.
-.KS
-.NH 2
-\&Port Mapper Protocol Specification (in RPC Language)
-.ie t .DS
-.el .DS L
-.ft CW
-.vs 11
-const PMAP_PORT = 111;      /* \fIportmapper port number \fP*/
-
-.ft I
-/*
-* A mapping of (program, version, protocol) to port number
-*/
-.ft CW
-struct mapping {
-	unsigned int prog;
-	unsigned int vers;
-	unsigned int prot;
-	unsigned int port;
-};
-
-.ft I
-/* 
-* Supported values for the "prot" field
-*/
-.ft CW
-const IPPROTO_TCP = 6;      /* \fIprotocol number for TCP/IP \fP*/
-const IPPROTO_UDP = 17;     /* \fIprotocol number for UDP/IP \fP*/
-
-.ft I
-/*
-* A list of mappings
-*/
-.ft CW
-struct *pmaplist {
-	mapping map;
-	pmaplist next;
-};
-.vs
-.DE
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
-* Arguments to callit
-*/
-.ft CW
-struct call_args {
-	unsigned int prog;
-	unsigned int vers;
-	unsigned int proc;
-	opaque args<>;
-};  
-
-.ft I
-/*
-* Results of callit
-*/
-.ft CW
-struct call_result {
-	unsigned int port;
-	opaque res<>;
-};
-.vs
-.DE
-.KE
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
-* Port mapper procedures
-*/
-.ft CW
-program PMAP_PROG {
-	version PMAP_VERS {
-		void 
-		PMAPPROC_NULL(void)         = 0;
-
-		bool
-		PMAPPROC_SET(mapping)       = 1;
-
-		bool
-		PMAPPROC_UNSET(mapping)     = 2;
-
-		unsigned int
-		PMAPPROC_GETPORT(mapping)   = 3;
-
-		pmaplist
-		PMAPPROC_DUMP(void)         = 4;
-
-		call_result
-		PMAPPROC_CALLIT(call_args)  = 5;
-	} = 2;
-} = 100000;
-.vs
-.DE
-.NH 2
-\&Port Mapper Operation
-.LP
-The portmapper program currently supports two protocols (UDP/IP and
-TCP/IP).  The portmapper is contacted by talking to it on assigned
-port number 111 (SUNRPC [8]) on either of these protocols.  The
-following is a description of each of the portmapper procedures:
-.IP \fBPMAPPROC_NULL:\fP
-This procedure does no work.  By convention, procedure zero of any
-protocol takes no parameters and returns no results.
-.IP \fBPMAPPROC_SET:\fP
-When a program first becomes available on a machine, it registers
-itself with the port mapper program on the same machine.  The program
-passes its program number "prog", version number "vers", transport
-protocol number "prot", and the port "port" on which it awaits
-service request.  The procedure returns a boolean response whose
-value is
-.I TRUE
-if the procedure successfully established the mapping and 
-.I FALSE 
-otherwise.  The procedure refuses to establish
-a mapping if one already exists for the tuple "(prog, vers, prot)".
-.IP \fBPMAPPROC_UNSET:\fP
-When a program becomes unavailable, it should unregister itself with
-the port mapper program on the same machine.  The parameters and
-results have meanings identical to those of
-.I PMAPPROC_SET .
-The protocol and port number fields of the argument are ignored.
-.IP \fBPMAPPROC_GETPORT:\fP
-Given a program number "prog", version number "vers", and transport
-protocol number "prot", this procedure returns the port number on
-which the program is awaiting call requests.  A port value of zeros
-means the program has not been registered.  The "port" field of the
-argument is ignored.
-.IP \fBPMAPPROC_DUMP:\fP
-This procedure enumerates all entries in the port mapper's database.
-The procedure takes no parameters and returns a list of program,
-version, protocol, and port values.
-.IP \fBPMAPPROC_CALLIT:\fP
-This procedure allows a caller to call another remote procedure on
-the same machine without knowing the remote procedure's port number.
-It is intended for supporting broadcasts to arbitrary remote programs
-via the well-known port mapper's port.  The parameters "prog",
-"vers", "proc", and the bytes of "args" are the program number,
-version number, procedure number, and parameters of the remote
-procedure.
-.LP
-.B Note:
-.RS
-.IP  1.
-This procedure only sends a response if the procedure was
-successfully executed and is silent (no response) otherwise.
-.IP  2.
-The port mapper communicates with the remote program using UDP/IP
-only.
-.RE
-.LP
-The procedure returns the remote program's port number, and the bytes
-of results are the results of the remote procedure.
-.bp
-.NH 1
-\&References
-.LP
-[1]  Birrell, Andrew D. & Nelson, Bruce Jay; "Implementing Remote
-Procedure Calls"; XEROX CSL-83-7, October 1983.
-.LP
-[2]  Cheriton, D.; "VMTP:  Versatile Message Transaction Protocol",
-Preliminary Version 0.3; Stanford University, January 1987.
-.LP
-[3]  Diffie & Hellman; "New Directions in Cryptography"; IEEE
-Transactions on Information Theory IT-22, November 1976.
-.LP
-[4]  Harrenstien, K.; "Time Server", RFC 738; Information Sciences
-Institute, October 1977.
-.LP
-[5]  National Bureau of Standards; "Data Encryption Standard"; Federal
-Information Processing Standards Publication 46, January 1977.
-.LP
-[6]  Postel, J.; "Transmission Control Protocol - DARPA Internet
-Program Protocol Specification", RFC 793; Information Sciences
-Institute, September 1981.
-.LP
-[7]  Postel, J.; "User Datagram Protocol", RFC 768; Information Sciences
-Institute, August 1980.
-.LP
-[8]  Reynolds, J.  & Postel, J.; "Assigned Numbers", RFC 923; Information
-Sciences Institute, October 1984.
diff --git a/lib/libc/rpc/PSD.doc/rpcgen.ms b/lib/libc/rpc/PSD.doc/rpcgen.ms
deleted file mode 100644
index de4f1ac..0000000
--- a/lib/libc/rpc/PSD.doc/rpcgen.ms
+++ /dev/null
@@ -1,1301 +0,0 @@
-.\"
-.\" Must use  --  tbl -- for this one
-.\"
-.\" @(#)rpcgen.ms	2.2 88/08/04 4.0 RPCSRC
-.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/rpcgen.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
-.\"
-.de BT
-.if \\n%=1 .tl ''- % -''
-..
-.ND
-.\" prevent excess underlining in nroff
-.if n .fp 2 R
-.OH '\fBrpcgen\fP Programming Guide''Page %'
-.EH 'Page %''\fBrpcgen\fP Programming Guide'
-.if \n%=1 .bp
-.SH
-\&\fBrpcgen\fP Programming Guide
-.NH 0
-\&The \fBrpcgen\fP Protocol Compiler
-.IX rpcgen "" \fIrpcgen\fP "" PAGE MAJOR
-.LP
-.IX RPC "" "" \fIrpcgen\fP
-The details of programming applications to use Remote Procedure Calls 
-can be overwhelming.  Perhaps most daunting is the writing of the XDR 
-routines necessary to convert procedure arguments and results into 
-their network format and vice-versa.  
-.LP
-Fortunately, 
-.I rpcgen(1) 
-exists to help programmers write RPC applications simply and directly.
-.I rpcgen 
-does most of the dirty work, allowing programmers to debug 
-the  main  features of their application, instead of requiring them to
-spend most of their time debugging their network interface code.
-.LP
-.I rpcgen 
-is a  compiler.  It accepts a remote program interface definition written
-in a language, called RPC Language, which is similar to C.  It produces a C
-language output which includes stub versions of the client routines, a
-server skeleton, XDR filter routines for both parameters and results, and a
-header file that contains common definitions. The client stubs interface
-with the RPC library and effectively hide the network from their callers.
-The server stub similarly hides the network from the server procedures that
-are to be invoked by remote clients.
-.I rpcgen 's
-output files can be compiled and linked in the usual way.  The developer
-writes server procedures\(emin any language that observes Sun calling
-conventions\(emand links them with the server skeleton produced by
-.I rpcgen 
-to get an executable server program.  To use a remote program, a programmer
-writes an ordinary main program that makes local procedure calls to the 
-client stubs produced by
-.I rpcgen .
-Linking this program with 
-.I rpcgen 's
-stubs creates an executable program.  (At present the main program must be 
-written in C).
-.I rpcgen 
-options can be used to suppress stub generation and to specify the transport
-to be used by the server stub.
-.LP
-Like all compilers, 
-.I rpcgen 
-reduces development time
-that would otherwise be spent coding and debugging low-level routines.
-All compilers, including 
-.I rpcgen ,
-do this at a small cost in efficiency
-and flexibility.  However,   many compilers allow  escape  hatches for
-programmers to  mix low-level code with  high-level code. 
-.I rpcgen 
-is no exception.  In speed-critical applications, hand-written routines 
-can be linked with the 
-.I rpcgen 
-output without any difficulty.  Also, one may proceed by using
-.I rpcgen 
-output as a starting point, and then rewriting it as necessary.
-(If you need a discussion of RPC programming without
-.I rpcgen ,
-see the
-.I "Remote Procedure Call Programming Guide)\.
-.NH 1
-\&Converting Local Procedures into Remote Procedures
-.IX rpcgen "local procedures" \fIrpcgen\fP
-.IX rpcgen "remote procedures" \fIrpcgen\fP
-.LP
-Assume an application that runs on a single machine, one which we want 
-to convert to run over the network.  Here we will demonstrate such a 
-conversion by way of a simple example\(ema program that prints a 
-message to the console:
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * printmsg.c: print a message on the console
- */
-.ft CW
-#include <stdio.h>
-
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	char *message;
-
-	if (argc < 2) {
-		fprintf(stderr, "usage: %s <message>\en", argv[0]);
-		exit(1);
-	}
-	message = argv[1];
-
-	if (!printmessage(message)) {
-		fprintf(stderr, "%s: couldn't print your message\en",
-			argv[0]);
-		exit(1);
-	} 
-	printf("Message Delivered!\en");
-	exit(0);
-}
-.ft I
-/*
- * Print a message to the console.
- * Return a boolean indicating whether the message was actually printed.
- */
-.ft CW
-printmessage(msg)
-	char *msg;
-{
-	FILE *f;
-
-	f = fopen("/dev/console", "w");
-	if (f == NULL) {
-		return (0);
-	}
-	fprintf(f, "%s\en", msg);
-	fclose(f);
-	return(1);
-}
-.DE
-.LP
-And then, of course:
-.ie t .DS
-.el .DS L
-.ft CW
-example%  \fBcc printmsg.c -o printmsg\fP
-example%  \fBprintmsg "Hello, there."\fP
-Message delivered!
-example%
-.DE
-.LP
-If  
-.I printmessage() 
-was turned into  a remote procedure,
-then it could be  called from anywhere in   the network.  
-Ideally,  one would just  like to stick   a  keyword like  
-.I remote 
-in  front  of a
-procedure to turn it into a  remote procedure.  Unfortunately,
-we  have to live  within the  constraints of  the   C language, since 
-it existed   long before  RPC did.  But   even without language 
-support, it's not very difficult to make a procedure remote.
-.LP
-In  general, it's necessary to figure  out  what the types are for
-all procedure inputs and outputs.  In  this case,   we  have a 
-procedure
-.I printmessage() 
-which takes a  string as input, and returns  an integer
-as output.  Knowing  this, we can write a  protocol specification in RPC
-language that  describes the remote  version of 
-.I printmessage ().
-Here it is:
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * msg.x: Remote message printing protocol
- */
-.ft CW
-
-program MESSAGEPROG {
-	version MESSAGEVERS {
-		int PRINTMESSAGE(string) = 1;
-	} = 1;
-} = 99;
-.DE
-.LP
-Remote procedures are part of remote programs, so we actually declared
-an  entire  remote program  here  which contains  the single procedure
-.I PRINTMESSAGE .
-This procedure was declared to be  in version  1 of the
-remote program.  No null procedure (procedure 0) is necessary because
-.I rpcgen 
-generates it automatically.
-.LP
-Notice that everything is declared with all capital  letters.  This is
-not required, but is a good convention to follow.
-.LP
-Notice also that the argument type is \*Qstring\*U and not \*Qchar *\*U.  This
-is because a \*Qchar *\*U in C is ambiguous.  Programmers usually intend it
-to mean  a null-terminated string   of characters, but  it  could also
-represent a pointer to a single character or a  pointer to an array of
-characters.  In  RPC language,  a  null-terminated  string is 
-unambiguously called a \*Qstring\*U.
-.LP
-There are  just two more things to  write.  First, there is the remote
-procedure itself.  Here's the definition of a remote procedure
-to implement the
-.I PRINTMESSAGE
-procedure we declared above:
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
- * msg_proc.c: implementation of the remote procedure "printmessage"
- */
-.ft CW
-
-#include <stdio.h>
-#include <rpc/rpc.h>    /* \fIalways needed\fP  */
-#include "msg.h"        /* \fIneed this too: msg.h will be generated by rpcgen\fP */
-
-.ft I
-/*
- * Remote verson of "printmessage"
- */
-.ft CW
-int *
-printmessage_1(msg)
-	char **msg;
-{
-	static int result;  /* \fImust be static!\fP */
-	FILE *f;
-
-	f = fopen("/dev/console", "w");
-	if (f == NULL) {
-		result = 0;
-		return (&result);
-	}
-	fprintf(f, "%s\en", *msg);
-	fclose(f);
-	result = 1;
-	return (&result);
-}
-.vs
-.DE
-.LP
-Notice here that the declaration of the remote procedure
-.I printmessage_1() 
-differs from that of the local procedure
-.I printmessage() 
-in three ways:
-.IP  1.
-It takes a pointer to a string instead of a string itself.  This
-is true of all  remote procedures:  they always take pointers to  their
-arguments rather than the arguments themselves.
-.IP  2.
-It returns a pointer to an  integer instead of  an integer itself. This is
-also generally true of remote procedures: they always return a pointer
-to their results.
-.IP  3.
-It has an \*Q_1\*U appended to its name.  In general, all remote
-procedures called by 
-.I rpcgen 
-are named by  the following rule: the name in the program  definition  
-(here 
-.I PRINTMESSAGE )
-is converted   to all
-lower-case letters, an underbar (\*Q_\*U) is appended to it, and
-finally the version number (here 1) is appended.
-.LP
-The last thing to do is declare the main client program that will call
-the remote procedure. Here it is:
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * rprintmsg.c: remote version of "printmsg.c"
- */
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>     /* \fIalways needed\fP  */
-#include "msg.h"         /* \fIneed this too: msg.h will be generated by rpcgen\fP */
-
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	CLIENT *cl;
-	int *result;
-	char *server;
-	char *message;
-
-	if (argc < 3) {
-		fprintf(stderr, "usage: %s host message\en", argv[0]);
-		exit(1);
-	}
-
-.ft I
-	/*
-	 * Save values of command line arguments 
-	 */
-.ft CW
-	server = argv[1];
-	message = argv[2];
-
-.ft I
-	/*
-	 * Create client "handle" used for calling \fIMESSAGEPROG\fP on the
-	 * server designated on the command line. We tell the RPC package
-	 * to use the "tcp" protocol when contacting the server.
-	 */
-.ft CW
-	cl = clnt_create(server, MESSAGEPROG, MESSAGEVERS, "tcp");
-	if (cl == NULL) {
-.ft I
-		/*
-		 * Couldn't establish connection with server.
-		 * Print error message and die.
-		 */
-.ft CW
-		clnt_pcreateerror(server);
-		exit(1);
-	}
-
-.ft I
-	/*
-	 * Call the remote procedure "printmessage" on the server
-	 */
-.ft CW
-	result = printmessage_1(&message, cl);
-	if (result == NULL) {
-.ft I
-		/*
-		 * An error occurred while calling the server. 
-	 	 * Print error message and die.
-		 */
-.ft CW
-		clnt_perror(cl, server);
-		exit(1);
-	}
-
-.ft I
-	/*
-	 * Okay, we successfully called the remote procedure.
-	 */
-.ft CW
-	if (*result == 0) {
-.ft I
-		/*
-		 * Server was unable to print our message. 
-		 * Print error message and die.
-		 */
-.ft CW
-		fprintf(stderr, "%s: %s couldn't print your message\en", 
-			argv[0], server);	
-		exit(1);
-	} 
-
-.ft I
-	/*
-	 * The message got printed on the server's console
-	 */
-.ft CW
-	printf("Message delivered to %s!\en", server);
-}
-.DE
-There are two things to note here:
-.IP  1.
-.IX "client handle, used by rpcgen" "" "client handle, used by \fIrpcgen\fP"
-First a client \*Qhandle\*U is created using the RPC library routine
-.I clnt_create ().
-This client handle will be passed  to the stub routines
-which call the remote procedure.
-.IP  2.
-The remote procedure  
-.I printmessage_1() 
-is called exactly  the same way as it is  declared in 
-.I msg_proc.c 
-except for the inserted client handle as the first argument.
-.LP
-Here's how to put all of the pieces together:
-.ie t .DS
-.el .DS L
-.ft CW
-example%  \fBrpcgen msg.x\fP
-example%  \fBcc rprintmsg.c msg_clnt.c -o rprintmsg\fP
-example%  \fBcc msg_proc.c msg_svc.c -o msg_server\fP
-.DE
-Two programs were compiled here: the client program 
-.I rprintmsg 
-and the server  program 
-.I msg_server .
-Before doing this  though,  
-.I rpcgen 
-was used to fill in the missing pieces.  
-.LP
-Here is what 
-.I rpcgen 
-did with the input file 
-.I msg.x :
-.IP  1.
-It created a header file called 
-.I msg.h 
-that contained
-.I #define 's
-for
-.I MESSAGEPROG ,
-.I MESSAGEVERS 
-and    
-.I PRINTMESSAGE 
-for use in  the  other modules.
-.IP  2.
-It created client \*Qstub\*U routines in the
-.I msg_clnt.c 
-file.   In this case there is only one, the 
-.I printmessage_1() 
-that was referred to from the
-.I printmsg 
-client program.  The name  of the output file for
-client stub routines is always formed in this way:  if the name of the
-input file is  
-.I FOO.x ,
-the   client  stubs   output file is    called
-.I FOO_clnt.c .
-.IP  3.
-It created  the  server   program which calls   
-.I printmessage_1() 
-in
-.I msg_proc.c .
-This server program is named  
-.I msg_svc.c .
-The rule for naming the server output file is similar  to the 
-previous one:  for an input  file   called  
-.I FOO.x ,
-the   output   server   file is  named
-.I FOO_svc.c .
-.LP
-Now we're ready to have some fun.  First, copy the server to a
-remote machine and run it.  For this  example,  the
-machine is called \*Qmoon\*U.  Server processes are run in the
-background, because they never exit.
-.ie t .DS
-.el .DS L
-.ft CW
-moon% \fBmsg_server &\fP	       
-.DE
-Then on our local machine (\*Qsun\*U) we can print a message on \*Qmoon\*Us
-console.
-.ie t .DS
-.el .DS L
-.ft CW
-sun% \fBprintmsg moon "Hello, moon."\fP
-.DE
-The message will get printed to \*Qmoon\*Us console.  You can print a
-message on anybody's console (including your own) with this program if
-you are able to copy the server to their machine and run it.
-.NH 1
-\&Generating XDR Routines
-.IX RPC "generating XDR routines"
-.LP
-The previous example  only demonstrated  the  automatic generation of
-client  and server RPC  code. 
-.I rpcgen 
-may also  be used to generate XDR routines, that  is,  the routines
-necessary to  convert   local  data
-structures into network format and vice-versa.  This example presents
-a complete RPC service\(ema remote directory listing service, which uses
-.I rpcgen
-not  only  to generate stub routines, but also to  generate  the XDR
-routines.  Here is the protocol description file:
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * dir.x: Remote directory listing protocol
- */
-.ft CW
-const MAXNAMELEN = 255;		/* \fImaximum length of a directory entry\fP */
-
-typedef string nametype<MAXNAMELEN>;	/* \fIa directory entry\fP */
-
-typedef struct namenode *namelist;		/* \fIa link in the listing\fP */
-
-.ft I
-/*
- * A node in the directory listing
- */
-.ft CW
-struct namenode {
-	nametype name;		/* \fIname of directory entry\fP */
-	namelist next;		/* \fInext entry\fP */
-};
-
-.ft I
-/*
- * The result of a READDIR operation.
- */
-.ft CW
-union readdir_res switch (int errno) {
-case 0:
-	namelist list;	/* \fIno error: return directory listing\fP */
-default:
-	void;		/* \fIerror occurred: nothing else to return\fP */
-};
-
-.ft I
-/*
- * The directory program definition
- */
-.ft CW
-program DIRPROG {
-	version DIRVERS {
-		readdir_res
-		READDIR(nametype) = 1;
-	} = 1;
-} = 76;
-.DE
-.SH
-Note:
-.I
-Types (like
-.I readdir_res 
-in the example above) can be defined using
-the \*Qstruct\*U, \*Qunion\*U and \*Qenum\*U keywords, but those keywords
-should not be used in subsequent declarations of variables of those types.
-For example, if you define a union \*Qfoo\*U, you should declare using
-only \*Qfoo\*U and not \*Qunion foo\*U.  In fact,
-.I rpcgen 
-compiles
-RPC unions into C structures and it is an error to declare them using the
-\*Qunion\*U keyword.
-.LP
-Running 
-.I rpcgen 
-on 
-.I dir.x 
-creates four output files.  Three are the same as before: header file,
-client stub routines and server skeleton.  The fourth are the XDR routines
-necessary for converting the data types we declared into XDR format and
-vice-versa.  These are output in the file
-.I dir_xdr.c .
-.LP
-Here is the implementation of the
-.I READDIR 
-procedure.
-.ie t .DS
-.el .DS L
-.vs 11
-.ft I
-/*
- * dir_proc.c: remote readdir implementation
- */
-.ft CW
-#include <rpc/rpc.h>
-#include <sys/dir.h>
-#include "dir.h"
-
-extern int errno;
-extern char *malloc();
-extern char *strdup();
-
-readdir_res *
-readdir_1(dirname)
-	nametype *dirname;
-{
-	DIR *dirp;
-	struct direct *d;
-	namelist nl;
-	namelist *nlp;
-	static readdir_res res; /* \fImust be static\fP! */
-
-.ft I
-	/*
-	 * Open directory
-	 */
-.ft CW
-	dirp = opendir(*dirname);
-	if (dirp == NULL) {
-		res.errno = errno;
-		return (&res);
-	}
-
-.ft I
-	/*
-	 * Free previous result
-	 */
-.ft CW
-	xdr_free(xdr_readdir_res, &res);
-
-.ft I
-	/*
-	 * Collect directory entries.
-	 * Memory allocated here will be freed by \fIxdr_free\fP
-	 * next time \fIreaddir_1\fP is called
-	 */
-.ft CW
-	nlp = &res.readdir_res_u.list;
-	while (d = readdir(dirp)) {
-		nl = *nlp = (namenode *) malloc(sizeof(namenode));
-		nl->name = strdup(d->d_name);
-		nlp = &nl->next;
-	}
-	*nlp = NULL;
-
-.ft I
-	/*
-	 * Return the result
-	 */
-.ft CW
-	res.errno = 0;
-	closedir(dirp);
-	return (&res);
-}
-.vs
-.DE
-Finally, there is the client side program to call the server:
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * rls.c: Remote directory listing client
- */
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>	/* \fIalways need this\fP */
-#include "dir.h"		/* \fIwill be generated by rpcgen\fP */
-
-extern int errno;
-
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	CLIENT *cl;
-	char *server;
-	char *dir;
-	readdir_res *result;
-	namelist nl;
-
-
-	if (argc != 3) {
-		fprintf(stderr, "usage: %s host directory\en", 
-		  argv[0]);
-		exit(1);
-	}
-
-.ft I
-	/*
-	 * Remember what our command line arguments refer to
-	 */
-.ft CW
-	server = argv[1];
-	dir = argv[2];
-
-.ft I
-	/*
-	 * Create client "handle" used for calling \fIMESSAGEPROG\fP on the
-	 * server designated on the command line. We tell the RPC package
-	 * to use the "tcp" protocol when contacting the server.
-	 */
-.ft CW
-	cl = clnt_create(server, DIRPROG, DIRVERS, "tcp");
-	if (cl == NULL) {
-.ft I
-		/*
-		 * Couldn't establish connection with server.
-		 * Print error message and die.
-		 */
-.ft CW
-		clnt_pcreateerror(server);
-		exit(1);
-	}
-
-.ft I
-	/*
-	 * Call the remote procedure \fIreaddir\fP on the server
-	 */
-.ft CW
-	result = readdir_1(&dir, cl);
-	if (result == NULL) {
-.ft I
-		/*
-		 * An error occurred while calling the server. 
-	 	 * Print error message and die.
-		 */
-.ft CW
-		clnt_perror(cl, server);
-		exit(1);
-	}
-
-.ft I
-	/*
-	 * Okay, we successfully called the remote procedure.
-	 */
-.ft CW
-	if (result->errno != 0) {
-.ft I
-		/*
-		 * A remote system error occurred.
-		 * Print error message and die.
-		 */
-.ft CW
-		errno = result->errno;
-		perror(dir);
-		exit(1);
-	}
-
-.ft I
-	/*
-	 * Successfully got a directory listing.
-	 * Print it out.
-	 */
-.ft CW
-	for (nl = result->readdir_res_u.list; nl != NULL; 
-	  nl = nl->next) {
-		printf("%s\en", nl->name);
-	}
-	exit(0);
-}
-.DE
-Compile everything, and run.
-.DS
-.ft CW
-sun%  \fBrpcgen dir.x\fP
-sun%  \fBcc rls.c dir_clnt.c dir_xdr.c -o rls\fP
-sun%  \fBcc dir_svc.c dir_proc.c dir_xdr.c -o dir_svc\fP
-
-sun%  \fBdir_svc &\fP
-
-moon%  \fBrls sun /usr/pub\fP
-\&.
-\&..
-ascii
-eqnchar
-greek
-kbd
-marg8
-tabclr
-tabs
-tabs4
-moon%
-.DE
-.LP
-.IX "debugging with rpcgen" "" "debugging with \fIrpcgen\fP"
-A final note about 
-.I rpcgen :
-The client program and the server procedure can be tested together 
-as a single program by simply linking them with each other rather 
-than with the client and server stubs.  The procedure calls will be
-executed as ordinary local procedure calls and the program can be 
-debugged with a local debugger such as 
-.I dbx .
-When the program is working, the client program can be linked to 
-the client stub produced by 
-.I rpcgen 
-and the server procedures can be linked to the server stub produced
-by 
-.I rpcgen .
-.SH
-.I NOTE :
-\fIIf you do this, you may want to comment out calls to RPC library
-routines, and have client-side routines call server routines
-directly.\fP
-.LP
-.NH 1
-\&The C-Preprocessor
-.IX rpcgen "C-preprocessor" \fIrpcgen\fP
-.LP
-The C-preprocessor is  run on all input  files before they are
-compiled, so all the preprocessor directives are legal within a \*Q.x\*U
-file. Four symbols may be defined, depending upon which output file is
-getting generated. The symbols are:
-.TS
-box tab (&);
-lfI lfI
-lfL l .
-Symbol&Usage
-_
-RPC_HDR&for header-file output
-RPC_XDR&for XDR routine output
-RPC_SVC&for server-skeleton output
-RPC_CLNT&for client stub output
-.TE
-.LP
-Also, 
-.I rpcgen 
-does  a little preprocessing   of its own. Any  line that
-begins  with  a percent sign is passed  directly into the output file,
-without any interpretation of the line.  Here is a simple example that
-demonstrates the preprocessing features.
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * time.x: Remote time protocol
- */
-.ft CW
-program TIMEPROG {
-        version TIMEVERS {
-                unsigned int TIMEGET(void) = 1;
-        } = 1;
-} = 44;
-
-#ifdef RPC_SVC
-%int *
-%timeget_1()
-%{
-%        static int thetime;
-%
-%        thetime = time(0);
-%        return (&thetime);
-%}
-#endif
-.DE
-The '%' feature is not generally recommended, as there is no guarantee
-that the compiler will stick the output where you intended.
-.NH 1
-\&\fBrpcgen\fP Programming Notes
-.IX rpcgen "other operations" \fIrpcgen\fP
-.sp 
-.NH 2
-\&Timeout Changes
-.IX rpcgen "timeout changes" \fIrpcgen\fP
-.LP
-RPC sets a default timeout of 25 seconds for RPC calls when
-.I clnt_create()
-is used.  This timeout may be changed using
-.I clnt_control()
-Here is a small code fragment to demonstrate use of
-.I clnt_control ():
-.ID
-struct timeval tv;
-CLIENT *cl;
-.sp .5
-cl = clnt_create("somehost", SOMEPROG, SOMEVERS, "tcp");
-if (cl == NULL) {
-	exit(1);
-}
-tv.tv_sec = 60;	/* \fIchange timeout to 1 minute\fP */
-tv.tv_usec = 0;
-clnt_control(cl, CLSET_TIMEOUT, &tv);	
-.DE
-.NH 2
-\&Handling Broadcast on the Server Side
-.IX "broadcast RPC"
-.IX rpcgen "broadcast RPC" \fIrpcgen\fP
-.LP
-When a procedure is known to be called via broadcast RPC,
-it is usually wise for the server to not reply unless it can provide
-some useful information to the client.  This prevents the network
-from getting flooded by useless replies.
-.LP
-To prevent the server from replying, a remote procedure can
-return NULL as its result, and the server code generated by
-.I rpcgen 
-will detect this and not send out a reply.
-.LP
-Here is an example of a procedure that replies only if it
-thinks it is an NFS server:
-.ID
-void *
-reply_if_nfsserver()
-{
-	char notnull;	/* \fIjust here so we can use its address\fP */
-.sp .5
-	if (access("/etc/exports", F_OK) < 0) {
-		return (NULL);	/* \fIprevent RPC from replying\fP */
-	}
-.ft I
-	/*
-	 * return non-null pointer so RPC will send out a reply
-	 */
-.ft L
-	return ((void *)&notnull);
-}
-.DE
-Note that if procedure returns type \*Qvoid *\*U, they must return a non-NULL
-pointer if they want RPC to reply for them.
-.NH 2
-\&Other Information Passed to Server Procedures
-.LP
-Server procedures will often want to know more about an RPC call
-than just its arguments.  For example, getting authentication information
-is important to procedures that want to implement some level of security.
-This extra information is actually supplied to the server procedure as a
-second argument.  Here is an example to demonstrate its use.  What we've
-done here is rewrite the previous
-.I printmessage_1() 
-procedure to only allow root users to print a message to the console.
-.ID
-int *
-printmessage_1(msg, rq)
-	char **msg;
-	struct svc_req	*rq;
-{
-	static in result;	/* \fIMust be static\fP */
-	FILE *f;
-	struct suthunix_parms *aup;
-.sp .5
-	aup = (struct authunix_parms *)rq->rq_clntcred;
-	if (aup->aup_uid != 0) {
-		result = 0;
-		return (&result);
-	}
-.sp
-.ft I
-	/*
-	 * Same code as before.
-	 */
-.ft L
-}
-.DE
-.NH 1
-\&RPC Language
-.IX RPCL
-.IX rpcgen "RPC Language" \fIrpcgen\fP
-.LP
-RPC language is an extension of XDR  language.   The sole extension is
-the addition of the
-.I program 
-type.  For a complete description of the XDR language syntax, see the
-.I "External Data Representation Standard: Protocol Specification"
-chapter.  For a description of the RPC extensions to the XDR language,
-see the
-.I "Remote Procedure Calls: Protocol Specification"
-chapter.
-.LP
-However, XDR language is so close to C that if you know C, you know most
-of it already.  We describe here  the syntax of the RPC language,
-showing a  few examples along the way.   We also show how  the various
-RPC and XDR type definitions get  compiled into C  type definitions in
-the output header file.
-.KS
-.NH 2
-Definitions
-\&
-.IX rpcgen definitions \fIrpcgen\fP
-.LP
-An RPC language file consists of a series of definitions.
-.DS L
-.ft CW
-    definition-list:
-        definition ";"
-        definition ";" definition-list
-.DE
-.KE
-It recognizes five types of definitions. 
-.DS L
-.ft CW
-    definition:
-        enum-definition
-        struct-definition
-        union-definition
-        typedef-definition
-        const-definition
-        program-definition
-.DE
-.NH 2
-Structures
-\&
-.IX rpcgen structures \fIrpcgen\fP
-.LP
-An XDR struct  is declared almost exactly like  its C counterpart.  It
-looks like the following:
-.DS L
-.ft CW
-    struct-definition:
-        "struct" struct-ident "{"
-            declaration-list
-        "}"
-
-    declaration-list:
-        declaration ";"
-        declaration ";" declaration-list
-.DE
-As an example, here is an XDR structure to a two-dimensional
-coordinate, and the C structure  that it  gets compiled into  in the
-output header file.
-.DS
-.ft CW
-   struct coord {             struct coord {
-        int x;       -->           int x;
-        int y;                     int y;
-   };                         };
-                              typedef struct coord coord;
-.DE
-The output is identical to the  input, except  for the added
-.I typedef
-at the end of the output.  This allows one to use \*Qcoord\*U instead of
-\*Qstruct coord\*U when declaring items.
-.NH 2
-Unions
-\&
-.IX rpcgen unions \fIrpcgen\fP
-.LP
-XDR unions are discriminated unions, and look quite different from C
-unions. They are more analogous to  Pascal variant records than they
-are to C unions.
-.DS L
-.ft CW
-    union-definition:
-        "union" union-ident "switch" "(" declaration ")" "{"
-            case-list
-        "}"
-
-    case-list:
-        "case" value ":" declaration ";"
-        "default" ":" declaration ";"
-        "case" value ":" declaration ";" case-list
-.DE
-Here is an example of a type that might be returned as the result of a
-\*Qread data\*U operation.  If there is no error, return a block of data.
-Otherwise, don't return anything.
-.DS L
-.ft CW
-    union read_result switch (int errno) {
-    case 0:
-        opaque data[1024];
-    default:
-        void;
-    };
-.DE
-It gets compiled into the following:
-.DS L
-.ft CW
-    struct read_result {
-        int errno;
-        union {
-            char data[1024];
-        } read_result_u;
-    };
-    typedef struct read_result read_result;
-.DE
-Notice that the union component of the  output struct  has the name as
-the type name, except for the trailing \*Q_u\*U.
-.NH 2
-Enumerations
-\&
-.IX rpcgen enumerations \fIrpcgen\fP
-.LP
-XDR enumerations have the same syntax as C enumerations.
-.DS L
-.ft CW
-    enum-definition:
-        "enum" enum-ident "{"
-            enum-value-list
-        "}"
-
-    enum-value-list:
-        enum-value
-        enum-value "," enum-value-list
-
-    enum-value:
-        enum-value-ident 
-        enum-value-ident "=" value
-.DE
-Here is a short example of  an XDR enum,  and the C enum that  it gets
-compiled into.
-.DS L
-.ft CW
-     enum colortype {      enum colortype {
-          RED = 0,              RED = 0,
-          GREEN = 1,   -->      GREEN = 1,
-          BLUE = 2              BLUE = 2,
-     };                    };
-                           typedef enum colortype colortype;
-.DE
-.NH 2
-Typedef
-\&
-.IX rpcgen typedef \fIrpcgen\fP
-.LP
-XDR typedefs have the same syntax as C typedefs.
-.DS L
-.ft CW
-    typedef-definition:
-        "typedef" declaration
-.DE
-Here  is an example  that defines a  
-.I fname_type 
-used  for declaring
-file name strings that have a maximum length of 255 characters.
-.DS L
-.ft CW
-typedef string fname_type<255>; --> typedef char *fname_type;
-.DE
-.NH 2
-Constants
-\&
-.IX rpcgen constants \fIrpcgen\fP
-.LP
-XDR constants  symbolic constants  that may be  used wherever  a
-integer constant is used, for example, in array size specifications.
-.DS L
-.ft CW
-    const-definition:
-        "const" const-ident "=" integer
-.DE
-For example, the following defines a constant
-.I DOZEN 
-equal to 12.
-.DS L
-.ft CW
-    const DOZEN = 12;  -->  #define DOZEN 12
-.DE
-.NH 2
-Programs
-\&
-.IX rpcgen programs \fIrpcgen\fP
-.LP
-RPC programs are declared using the following syntax:
-.DS L
-.ft CW
-    program-definition:
-        "program" program-ident "{" 
-            version-list
-        "}" "=" value 
-
-    version-list:
-        version ";"
-        version ";" version-list
-
-    version:
-        "version" version-ident "{"
-            procedure-list 
-        "}" "=" value
-
-    procedure-list:
-        procedure ";"
-        procedure ";" procedure-list
-
-    procedure:
-        type-ident procedure-ident "(" type-ident ")" "=" value
-.DE
-For example, here is the time protocol, revisited:
-.ie t .DS
-.el .DS L
-.ft I
-/*
- * time.x: Get or set the time. Time is represented as number of seconds
- * since 0:00, January 1, 1970.
- */
-.ft CW
-program TIMEPROG {
-    version TIMEVERS {
-        unsigned int TIMEGET(void) = 1;
-        void TIMESET(unsigned) = 2;
-    } = 1;
-} = 44;        
-.DE
-This file compiles into #defines in the output header file:
-.ie t .DS
-.el .DS L
-.ft CW
-#define TIMEPROG 44
-#define TIMEVERS 1
-#define TIMEGET 1
-#define TIMESET 2
-.DE
-.NH 2
-Declarations
-\&
-.IX rpcgen declarations \fIrpcgen\fP
-.LP
-In XDR, there are only four kinds of declarations.  
-.DS L
-.ft CW
-    declaration:
-        simple-declaration
-        fixed-array-declaration
-        variable-array-declaration
-        pointer-declaration
-.DE
-\fB1) Simple declarations\fP are just like simple C declarations.
-.DS L
-.ft CW
-    simple-declaration:
-        type-ident variable-ident
-.DE
-Example:
-.DS L
-.ft CW
-    colortype color;    --> colortype color;
-.DE
-\fB2) Fixed-length Array Declarations\fP are just like C array declarations:
-.DS L
-.ft CW
-    fixed-array-declaration:
-        type-ident variable-ident "[" value "]"
-.DE
-Example:
-.DS L
-.ft CW
-    colortype palette[8];    --> colortype palette[8];
-.DE
-\fB3) Variable-Length Array Declarations\fP have no explicit syntax 
-in C, so XDR invents its own using angle-brackets.
-.DS L
-.ft CW
-variable-array-declaration:
-    type-ident variable-ident "<" value ">"
-    type-ident variable-ident "<" ">"
-.DE
-The maximum size is specified between the angle brackets. The size may
-be omitted, indicating that the array may be of any size.
-.DS L
-.ft CW
-    int heights<12>;    /* \fIat most 12 items\fP */
-    int widths<>;       /* \fIany number of items\fP */
-.DE
-Since  variable-length  arrays have no  explicit  syntax in  C,  these
-declarations are actually compiled into \*Qstruct\*Us.  For example, the
-\*Qheights\*U declaration gets compiled into the following struct:
-.DS L
-.ft CW
-    struct {
-        u_int heights_len;  /* \fI# of items in array\fP */
-        int *heights_val;   /* \fIpointer to array\fP */
-    } heights;
-.DE
-Note that the number of items in the array is stored in the \*Q_len\*U
-component and the pointer to the array is stored in the \*Q_val\*U
-component. The first part of each of these component's names is the
-same as the name of the declared XDR variable.
-.LP
-\fB4) Pointer Declarations\fP are made in 
-XDR  exactly as they  are  in C.  You  can't
-really send pointers over the network,  but  you  can use XDR pointers
-for sending recursive data types such as lists and trees.  The type is
-actually called \*Qoptional-data\*U, not \*Qpointer\*U, in XDR language.
-.DS L
-.ft CW
-    pointer-declaration:
-        type-ident "*" variable-ident
-.DE
-Example:
-.DS L
-.ft CW
-    listitem *next;  -->  listitem *next;
-.DE
-.NH 2
-\&Special Cases
-.IX rpcgen "special cases" \fIrpcgen\fP
-.LP
-There are a few exceptions to the rules described above.
-.LP
-.B Booleans:
-C has no built-in boolean type. However, the RPC library does  a
-boolean type   called 
-.I bool_t 
-that   is either  
-.I TRUE 
-or  
-.I FALSE .
-Things declared as  type 
-.I bool 
-in  XDR language  are  compiled  into
-.I bool_t 
-in the output header file.
-.LP
-Example:
-.DS L
-.ft CW
-    bool married;  -->  bool_t married;
-.DE
-.B Strings:
-C has  no built-in string  type, but  instead uses the null-terminated
-\*Qchar *\*U convention.  In XDR language, strings are declared using the
-\*Qstring\*U keyword, and compiled into \*Qchar *\*Us in the output header
-file. The  maximum size contained  in the angle brackets specifies the
-maximum number of characters allowed in the  strings (not counting the
-.I NULL 
-character). The maximum size may be left off, indicating a string
-of arbitrary length.
-.LP
-Examples:
-.DS L
-.ft CW
-    string name<32>;    -->  char *name;
-    string longname<>;  -->  char *longname;
-.DE
-.B "Opaque  Data:"
-Opaque data is used in RPC and XDR to describe untyped  data, that is,
-just  sequences of arbitrary  bytes.  It may be  declared  either as a
-fixed or variable length array.
-.DS L
-Examples:
-.ft CW
-    opaque diskblock[512];  -->  char diskblock[512];
-
-    opaque filedata<1024>;  -->  struct {
-                                    u_int filedata_len;
-                                    char *filedata_val;
-                                 } filedata;
-.DE
-.B Voids:
-In a void declaration, the variable is  not named.  The declaration is
-just \*Qvoid\*U and nothing else.  Void declarations can only occur in two
-places: union definitions and program definitions (as the  argument or
-result of a remote procedure).
diff --git a/lib/libc/rpc/PSD.doc/stubs b/lib/libc/rpc/PSD.doc/stubs
deleted file mode 100644
index d715d3a..0000000
--- a/lib/libc/rpc/PSD.doc/stubs
+++ /dev/null
@@ -1,3 +0,0 @@
-.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/stubs,v 1.3 2002/10/29 15:00:10 ru Exp $
-.\"
-.if t .ftr L CR
diff --git a/lib/libc/rpc/PSD.doc/xdr.nts.ms b/lib/libc/rpc/PSD.doc/xdr.nts.ms
deleted file mode 100644
index 55f26c6..0000000
--- a/lib/libc/rpc/PSD.doc/xdr.nts.ms
+++ /dev/null
@@ -1,1968 +0,0 @@
-.\"
-.\" Must use --  eqn -- with this one
-.\"
-.\" @(#)xdr.nts.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/xdr.nts.ms,v 1.4 2003/01/01 18:48:43 schweikh Exp $
-.\"
-.EQ
-delim $$
-.EN
-.de BT
-.if \\n%=1 .tl ''- % -''
-..
-.ND
-.\" prevent excess underlining in nroff
-.if n .fp 2 R
-.OH 'External Data Representation: Sun Technical Notes''Page %'
-.EH 'Page %''External Data Representation: Sun Technical Notes'
-.if \n%=1 .bp
-.SH
-\&External Data Representation: Sun Technical Notes
-.IX XDR "Sun technical notes"
-.LP
-This chapter contains technical notes on Sun's implementation of the
-External Data Representation (XDR) standard, a set of library routines
-that allow a C programmer to describe arbitrary data structures in a
-machinex-independent fashion.
-For a formal specification of the XDR
-standard, see the
-.I "External Data Representation Standard: Protocol Specification".
-XDR is the backbone of Sun's Remote Procedure Call package, in the
-sense that data for remote procedure calls is transmitted using the
-standard.  XDR library routines should be used to transmit data
-that is accessed (read or written) by more than one type of machine.\**
-.FS
-.IX XDR "system routines"
-For a compete specification of the system External Data Representation
-routines, see the
-.I xdr(3N)
-manual page.
-.FE
-.LP
-This chapter contains a short tutorial overview of the XDR library
-routines, a guide to accessing currently available XDR streams, and
-information on defining new streams and data types.  XDR was designed
-to work across different languages, operating systems, and machine
-architectures.  Most users (particularly RPC users) will only need
-the information in the
-.I "Number Filters",
-.I "Floating Point Filters",
-and
-.I "Enumeration Filters"
-sections.
-Programmers wishing to implement RPC and XDR on new machines
-will be interested in the rest of the chapter, as well as the
-.I "External Data Representaiton Standard: Protocol Specification",
-which will be their primary reference.
-.SH
-Note:
-.I
-.I rpcgen
-can be used to write XDR routines even in cases where no RPC calls are
-being made.
-.LP
-On Sun systems,
-C programs that want to use XDR routines
-must include the file
-.I <rpc/rpc.h> ,
-which contains all the necessary interfaces to the XDR system.
-Since the C library
-.I libc.a
-contains all the XDR routines,
-compile as normal.
-.DS
-example% \fBcc\0\fIprogram\fP.c\fI
-.DE
-.ne 3i
-.NH 0
-\&Justification
-.IX XDR justification
-.LP
-Consider the following two programs,
-.I writer :
-.ie t .DS
-.el .DS L
-.ft CW
-#include <stdio.h>
-.sp .5
-main()			/* \fIwriter.c\fP */
-{
-	long i;
-.sp .5
-	for (i = 0; i < 8; i++) {
-		if (fwrite((char *)&i, sizeof(i), 1, stdout) != 1) {
-			fprintf(stderr, "failed!\en");
-			exit(1);
-		}
-	}
-	exit(0);
-}
-.DE
-and
-.I reader :
-.ie t .DS
-.el .DS L
-.ft CW
-#include <stdio.h>
-.sp .5
-main()			/* \fIreader.c\fP */
-{
-	long i, j;
-.sp .5
-	for (j = 0; j < 8; j++) {
-		if (fread((char *)&i, sizeof (i), 1, stdin) != 1) {
-			fprintf(stderr, "failed!\en");
-			exit(1);
-		}
-		printf("%ld ", i);
-	}
-	printf("\en");
-	exit(0);
-}
-.DE
-The two programs appear to be portable, because (a) they pass
-.I lint
-checking, and (b) they exhibit the same behavior when executed
-on two different hardware architectures, a Sun and a VAX.
-.LP
-Piping the output of the
-.I writer
-program to the
-.I reader
-program gives identical results on a Sun or a VAX.
-.DS
-.ft CW
-sun% \fBwriter | reader\fP
-0 1 2 3 4 5 6 7
-sun%
-
-
-vax% \fBwriter | reader\fP
-0 1 2 3 4 5 6 7
-vax%
-.DE
-With the advent of local area networks and 4.2BSD came the concept
-of \*Qnetwork pipes\*U \(em a process produces data on one machine,
-and a second process consumes data on another machine.
-A network pipe can be constructed with
-.I writer
-and
-.I reader .
-Here are the results if the first produces data on a Sun,
-and the second consumes data on a VAX.
-.DS
-.ft CW
-sun% \fBwriter | rsh vax reader\fP
-0 16777216 33554432 50331648 67108864 83886080 100663296
-117440512
-sun%
-.DE
-Identical results can be obtained by executing
-.I writer
-on the VAX and
-.I reader
-on the Sun.  These results occur because the byte ordering
-of long integers differs between the VAX and the Sun,
-even though word size is the same.
-Note that $16777216$ is $2 sup 24$ \(em
-when four bytes are reversed, the 1 winds up in the 24th bit.
-.LP
-Whenever data is shared by two or more machine types, there is
-a need for portable data.  Programs can be made data-portable by
-replacing the
-.I read()
-and
-.I write()
-calls with calls to an XDR library routine
-.I xdr_long() ,
-a filter that knows the standard representation
-of a long integer in its external form.
-Here are the revised versions of
-.I writer :
-.ie t .DS
-.el .DS L
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>	/* \fIxdr is a sub-library of rpc\fP */
-.sp .5
-main()		/* \fIwriter.c\fP */
-{
-	XDR xdrs;
-	long i;
-.sp .5
-	xdrstdio_create(&xdrs, stdout, XDR_ENCODE);
-	for (i = 0; i < 8; i++) {
-		if (!xdr_long(&xdrs, &i)) {
-			fprintf(stderr, "failed!\en");
-			exit(1);
-		}
-	}
-	exit(0);
-}
-.DE
-and
-.I reader :
-.ie t .DS
-.el .DS L
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>	/* \fIxdr is a sub-library of rpc\fP */
-.sp .5
-main()		/* \fIreader.c\fP */
-{
-	XDR xdrs;
-	long i, j;
-.sp .5
-	xdrstdio_create(&xdrs, stdin, XDR_DECODE);
-	for (j = 0; j < 8; j++) {
-		if (!xdr_long(&xdrs, &i)) {
-			fprintf(stderr, "failed!\en");
-			exit(1);
-		}
-		printf("%ld ", i);
-	}
-	printf("\en");
-	exit(0);
-}
-.DE
-The new programs were executed on a Sun,
-on a VAX, and from a Sun to a VAX;
-the results are shown below.
-.DS
-.ft CW
-sun% \fBwriter | reader\fP
-0 1 2 3 4 5 6 7
-sun%
-
-vax% \fBwriter | reader\fP
-0 1 2 3 4 5 6 7
-vax%
-
-sun% \fBwriter | rsh vax reader\fP
-0 1 2 3 4 5 6 7
-sun%
-.DE
-.SH
-Note:
-.I
-.IX XDR "portable data"
-Integers are just the tip of the portable-data iceberg.  Arbitrary
-data structures present portability problems, particularly with
-respect to alignment and pointers.  Alignment on word boundaries
-may cause the size of a structure to vary from machine to machine.
-And pointers, which are very convenient to use, have no meaning
-outside the machine where they are defined.
-.LP
-.NH 1
-\&A Canonical Standard
-.IX XDR "canonical standard"
-.LP
-XDR's approach to standardizing data representations is
-.I canonical .
-That is, XDR defines a single byte order (Big Endian), a single
-floating-point representation (IEEE), and so on.  Any program running on
-any machine can use XDR to create portable data by translating its
-local representation to the XDR standard representations; similarly, any
-program running on any machine can read portable data by translating the
-XDR standard representaions to its local equivalents.  The single standard
-completely decouples programs that create or send portable data from those
-that use or receive portable data.  The advent of a new machine or a new
-language has no effect upon the community of existing portable data creators
-and users.  A new machine joins this community by being \*Qtaught\*U how to
-convert the standard representations and its local representations; the
-local representations of other machines are irrelevant.  Conversely, to
-existing programs running on other machines, the local representations of
-the new machine are also irrelevant; such programs can immediately read
-portable data produced by the new machine because such data conforms to the
-canonical standards that they already understand.
-.LP
-There are strong precedents for XDR's canonical approach.  For example,
-TCP/IP, UDP/IP, XNS, Ethernet, and, indeed, all protocols below layer five
-of the ISO model, are canonical protocols.  The advantage of any canonical
-approach is simplicity; in the case of XDR, a single set of conversion
-routines is written once and is never touched again.  The canonical approach
-has a disadvantage, but it is unimportant in real-world data transfer
-applications.  Suppose two Little-Endian machines are transferring integers
-according to the XDR standard.  The sending machine converts the integers
-from Little-Endian byte order to XDR (Big-Endian) byte order; the receiving
-machine performs the reverse conversion.  Because both machines observe the
-same byte order, their conversions are unnecessary.  The point, however, is
-not necessity, but cost as compared to the alternative.
-.LP
-The time spent converting to and from a canonical representation is
-insignificant, especially in networking applications.  Most of the time
-required to prepare a data structure for transfer is not spent in conversion
-but in traversing the elements of the data structure.  To transmit a tree,
-for example, each leaf must be visited and each element in a leaf record must
-be copied to a buffer and aligned there; storage for the leaf may have to be
-deallocated as well.  Similarly, to receive a tree, storage must be
-allocated for each leaf, data must be moved from the buffer to the leaf and
-properly aligned, and pointers must be constructed to link the leaves
-together.  Every machine pays the cost of traversing and copying data
-structures whether or not conversion is required.  In networking
-applications, communications overhead\(emthe time required to move the data
-down through the sender's protocol layers, across the network and up through
-the receiver's protocol layers\(emdwarfs conversion overhead.
-.NH 1
-\&The XDR Library
-.IX "XDR" "library"
-.LP
-The XDR library not only solves data portability problems, it also
-allows you to write and read arbitrary C constructs in a consistent,
-specified, well-documented manner.  Thus, it can make sense to use the
-library even when the data is not shared among machines on a network.
-.LP
-The XDR library has filter routines for
-strings (null-terminated arrays of bytes),
-structures, unions, and arrays, to name a few.
-Using more primitive routines,
-you can write your own specific XDR routines
-to describe arbitrary data structures,
-including elements of arrays, arms of unions,
-or objects pointed at from other structures.
-The structures themselves may contain arrays of arbitrary elements,
-or pointers to other structures.
-.LP
-Let's examine the two programs more closely.
-There is a family of XDR stream creation routines
-in which each member treats the stream of bits differently.
-In our example, data is manipulated using standard I/O routines,
-so we use
-.I xdrstdio_create ().
-.IX xdrstdio_create() "" "\fIxdrstdio_create()\fP"
-The parameters to XDR stream creation routines
-vary according to their function.
-In our example,
-.I xdrstdio_create()
-takes a pointer to an XDR structure that it initializes,
-a pointer to a
-.I FILE
-that the input or output is performed on, and the operation.
-The operation may be
-.I XDR_ENCODE
-for serializing in the
-.I writer
-program, or
-.I XDR_DECODE
-for deserializing in the
-.I reader
-program.
-.LP
-Note: RPC users never need to create XDR streams;
-the RPC system itself creates these streams,
-which are then passed to the users.
-.LP
-The
-.I xdr_long()
-.IX xdr_long() "" "\fIxdr_long()\fP"
-primitive is characteristic of most XDR library
-primitives and all client XDR routines.
-First, the routine returns
-.I FALSE
-(0) if it fails, and
-.I TRUE
-(1) if it succeeds.
-Second, for each data type,
-.I xxx ,
-there is an associated XDR routine of the form:
-.DS
-.ft CW
-xdr_xxx(xdrs, xp)
-	XDR *xdrs;
-	xxx *xp;
-{
-}
-.DE
-In our case,
-.I xxx
-is long, and the corresponding XDR routine is
-a primitive,
-.I xdr_long() .
-The client could also define an arbitrary structure
-.I xxx
-in which case the client would also supply the routine
-.I xdr_xxx (),
-describing each field by calling XDR routines
-of the appropriate type.
-In all cases the first parameter,
-.I xdrs
-can be treated as an opaque handle,
-and passed to the primitive routines.
-.LP
-XDR routines are direction independent;
-that is, the same routines are called to serialize or deserialize data.
-This feature is critical to software engineering of portable data.
-The idea is to call the same routine for either operation \(em
-this almost guarantees that serialized data can also be deserialized.
-One routine is used by both producer and consumer of networked data.
-This is implemented by always passing the address
-of an object rather than the object itself \(em
-only in the case of deserialization is the object modified.
-This feature is not shown in our trivial example,
-but its value becomes obvious when nontrivial data structures
-are passed among machines.
-If needed, the user can obtain the
-direction of the XDR operation.
-See the
-.I "XDR Operation Directions"
-section below for details.
-.LP
-Let's look at a slightly more complicated example.
-Assume that a person's gross assets and liabilities
-are to be exchanged among processes.
-Also assume that these values are important enough
-to warrant their own data type:
-.ie t .DS
-.el .DS L
-.ft CW
-struct gnumbers {
-	long g_assets;
-	long g_liabilities;
-};
-.DE
-The corresponding XDR routine describing this structure would be:
-.ie t .DS
-.el .DS L
-.ft CW
-bool_t  		/* \fITRUE is success, FALSE is failure\fP */
-xdr_gnumbers(xdrs, gp)
-	XDR *xdrs;
-	struct gnumbers *gp;
-{
-	if (xdr_long(xdrs, &gp->g_assets) &&
-	    xdr_long(xdrs, &gp->g_liabilities))
-		return(TRUE);
-	return(FALSE);
-}
-.DE
-Note that the parameter
-.I xdrs
-is never inspected or modified;
-it is only passed on to the subcomponent routines.
-It is imperative to inspect the return value of each XDR routine call,
-and to give up immediately and return
-.I FALSE
-if the subroutine fails.
-.LP
-This example also shows that the type
-.I bool_t
-is declared as an integer whose only values are
-.I TRUE
-(1) and
-.I FALSE
-(0).  This document uses the following definitions:
-.ie t .DS
-.el .DS L
-.ft CW
-#define bool_t	int
-#define TRUE	1
-#define FALSE	0
-.DE
-.LP
-Keeping these conventions in mind,
-.I xdr_gnumbers()
-can be rewritten as follows:
-.ie t .DS
-.el .DS L
-.ft CW
-xdr_gnumbers(xdrs, gp)
-	XDR *xdrs;
-	struct gnumbers *gp;
-{
-	return(xdr_long(xdrs, &gp->g_assets) &&
-		xdr_long(xdrs, &gp->g_liabilities));
-}
-.DE
-This document uses both coding styles.
-.NH 1
-\&XDR Library Primitives
-.IX "library primitives for XDR"
-.IX XDR "library primitives"
-.LP
-This section gives a synopsis of each XDR primitive.
-It starts with basic data types and moves on to constructed data types.
-Finally, XDR utilities are discussed.
-The interface to these primitives
-and utilities is defined in the include file
-.I <rpc/xdr.h> ,
-automatically included by
-.I <rpc/rpc.h> .
-.NH 2
-\&Number Filters
-.IX "XDR library" "number filters"
-.LP
-The XDR library provides primitives to translate between numbers
-and their corresponding external representations.
-Primitives cover the set of numbers in:
-.DS
-.ft CW
-[signed, unsigned] * [short, int, long]
-.DE
-.ne 2i
-Specifically, the eight primitives are:
-.DS
-.ft CW
-bool_t xdr_char(xdrs, cp)
-	XDR *xdrs;
-	char *cp;
-.sp .5
-bool_t xdr_u_char(xdrs, ucp)
-	XDR *xdrs;
-	unsigned char *ucp;
-.sp .5
-bool_t xdr_int(xdrs, ip)
-	XDR *xdrs;
-	int *ip;
-.sp .5
-bool_t xdr_u_int(xdrs, up)
-	XDR *xdrs;
-	unsigned *up;
-.sp .5
-bool_t xdr_long(xdrs, lip)
-	XDR *xdrs;
-	long *lip;
-.sp .5
-bool_t xdr_u_long(xdrs, lup)
-	XDR *xdrs;
-	u_long *lup;
-.sp .5
-bool_t xdr_short(xdrs, sip)
-	XDR *xdrs;
-	short *sip;
-.sp .5
-bool_t xdr_u_short(xdrs, sup)
-	XDR *xdrs;
-	u_short *sup;
-.DE
-The first parameter,
-.I xdrs ,
-is an XDR stream handle.
-The second parameter is the address of the number
-that provides data to the stream or receives data from it.
-All routines return
-.I TRUE
-if they complete successfully, and
-.I FALSE
-otherwise.
-.NH 2
-\&Floating Point Filters
-.IX "XDR library" "floating point filters"
-.LP
-The XDR library also provides primitive routines
-for C's floating point types:
-.DS
-.ft CW
-bool_t xdr_float(xdrs, fp)
-	XDR *xdrs;
-	float *fp;
-.sp .5
-bool_t xdr_double(xdrs, dp)
-	XDR *xdrs;
-	double *dp;
-.DE
-The first parameter,
-.I xdrs
-is an XDR stream handle.
-The second parameter is the address
-of the floating point number that provides data to the stream
-or receives data from it.
-Both routines return
-.I TRUE
-if they complete successfully, and
-.I FALSE
-otherwise.
-.LP
-Note: Since the numbers are represented in IEEE floating point,
-routines may fail when decoding a valid IEEE representation
-into a machine-specific representation, or vice-versa.
-.NH 2
-\&Enumeration Filters
-.IX "XDR library" "enumeration filters"
-.LP
-The XDR library provides a primitive for generic enumerations.
-The primitive assumes that a C
-.I enum
-has the same representation inside the machine as a C integer.
-The boolean type is an important instance of the
-.I enum .
-The external representation of a boolean is always
-.I TRUE
-(1) or
-.I FALSE
-(0).
-.DS
-.ft CW
-#define bool_t	int
-#define FALSE	0
-#define TRUE	1
-.sp .5
-#define enum_t int
-.sp .5
-bool_t xdr_enum(xdrs, ep)
-	XDR *xdrs;
-	enum_t *ep;
-.sp .5
-bool_t xdr_bool(xdrs, bp)
-	XDR *xdrs;
-	bool_t *bp;
-.DE
-The second parameters
-.I ep
-and
-.I bp
-are addresses of the associated type that provides data to, or
-receives data from, the stream
-.I xdrs .
-.NH 2
-\&No Data
-.IX "XDR library" "no data"
-.LP
-Occasionally, an XDR routine must be supplied to the RPC system,
-even when no data is passed or required.
-The library provides such a routine:
-.DS
-.ft CW
-bool_t xdr_void();  /* \fIalways returns TRUE\fP */
-.DE
-.NH 2
-\&Constructed Data Type Filters
-.IX "XDR library" "constructed data type filters"
-.LP
-Constructed or compound data type primitives
-require more parameters and perform more complicated functions
-then the primitives discussed above.
-This section includes primitives for
-strings, arrays, unions, and pointers to structures.
-.LP
-Constructed data type primitives may use memory management.
-In many cases, memory is allocated when deserializing data with
-.I XDR_DECODE
-Therefore, the XDR package must provide means to deallocate memory.
-This is done by an XDR operation,
-.I XDR_FREE
-To review, the three XDR directional operations are
-.I XDR_ENCODE ,
-.I XDR_DECODE
-and
-.I XDR_FREE .
-.NH 3
-\&Strings
-.IX "XDR library" "strings"
-.LP
-In C, a string is defined as a sequence of bytes
-terminated by a null byte,
-which is not considered when calculating string length.
-However, when a string is passed or manipulated,
-a pointer to it is employed.
-Therefore, the XDR library defines a string to be a
-.I "char *"
-and not a sequence of characters.
-The external representation of a string is drastically different
-from its internal representation.
-Externally, strings are represented as
-sequences of ASCII characters,
-while internally, they are represented with character pointers.
-Conversion between the two representations
-is accomplished with the routine
-.I xdr_string ():
-.IX xdr_string() "" \fIxdr_string()\fP
-.DS
-.ft CW
-bool_t xdr_string(xdrs, sp, maxlength)
-	XDR *xdrs;
-	char **sp;
-	u_int maxlength;
-.DE
-The first parameter
-.I xdrs
-is the XDR stream handle.
-The second parameter
-.I sp
-is a pointer to a string (type
-.I "char **" .
-The third parameter
-.I maxlength
-specifies the maximum number of bytes allowed during encoding or decoding.
-its value is usually specified by a protocol.  For example, a protocol
-specification may say that a file name may be no longer than 255 characters.
-.LP
-The routine returns
-.I FALSE
-if the number of characters exceeds
-.I maxlength ,
-and
-.I TRUE
-if it doesn't.
-.SH
-Keep
-.I maxlength
-small.  If it is too big you can blow the heap, since
-.I xdr_string()
-will call
-.I malloc()
-for space.
-.LP
-The behavior of
-.I xdr_string()
-.IX xdr_string() "" \fIxdr_string()\fP
-is similar to the behavior of other routines
-discussed in this section.  The direction
-.I XDR_ENCODE
-is easiest to understand.  The parameter
-.I sp
-points to a string of a certain length;
-if the string does not exceed
-.I maxlength ,
-the bytes are serialized.
-.LP
-The effect of deserializing a string is subtle.
-First the length of the incoming string is determined;
-it must not exceed
-.I maxlength .
-Next
-.I sp
-is dereferenced; if the the value is
-.I NULL ,
-then a string of the appropriate length is allocated and
-.I *sp
-is set to this string.
-If the original value of
-.I *sp
-is non-null, then the XDR package assumes
-that a target area has been allocated,
-which can hold strings no longer than
-.I maxlength .
-In either case, the string is decoded into the target area.
-The routine then appends a null character to the string.
-.LP
-In the
-.I XDR_FREE
-operation, the string is obtained by dereferencing
-.I sp .
-If the string is not
-.I NULL ,
-it is freed and
-.I *sp
-is set to
-.I NULL .
-In this operation,
-.I xdr_string()
-ignores the
-.I maxlength
-parameter.
-.NH 3
-\&Byte Arrays
-.IX "XDR library" "byte arrays"
-.LP
-Often variable-length arrays of bytes are preferable to strings.
-Byte arrays differ from strings in the following three ways:
-1) the length of the array (the byte count) is explicitly
-located in an unsigned integer,
-2) the byte sequence is not terminated by a null character, and
-3) the external representation of the bytes is the same as their
-internal representation.
-The primitive
-.I xdr_bytes()
-.IX xdr_bytes() "" \fIxdr_bytes()\fP
-converts between the internal and external
-representations of byte arrays:
-.DS
-.ft CW
-bool_t xdr_bytes(xdrs, bpp, lp, maxlength)
-    XDR *xdrs;
-    char **bpp;
-    u_int *lp;
-    u_int maxlength;
-.DE
-The usage of the first, second and fourth parameters
-are identical to the first, second and third parameters of
-.I xdr_string (),
-respectively.
-The length of the byte area is obtained by dereferencing
-.I lp
-when serializing;
-.I *lp
-is set to the byte length when deserializing.
-.NH 3
-\&Arrays
-.IX "XDR library" "arrays"
-.LP
-The XDR library package provides a primitive
-for handling arrays of arbitrary elements.
-The
-.I xdr_bytes()
-routine treats a subset of generic arrays,
-in which the size of array elements is known to be 1,
-and the external description of each element is built-in.
-The generic array primitive,
-.I xdr_array() ,
-.IX xdr_array() "" \fIxdr_array()\fP
-requires parameters identical to those of
-.I xdr_bytes()
-plus two more:
-the size of array elements,
-and an XDR routine to handle each of the elements.
-This routine is called to encode or decode
-each element of the array.
-.DS
-.ft CW
-bool_t
-xdr_array(xdrs, ap, lp, maxlength, elementsiz, xdr_element)
-    XDR *xdrs;
-    char **ap;
-    u_int *lp;
-    u_int maxlength;
-    u_int elementsiz;
-    bool_t (*xdr_element)();
-.DE
-The parameter
-.I ap
-is the address of the pointer to the array.
-If
-.I *ap
-is
-.I NULL
-when the array is being deserialized,
-XDR allocates an array of the appropriate size and sets
-.I *ap
-to that array.
-The element count of the array is obtained from
-.I *lp
-when the array is serialized;
-.I *lp
-is set to the array length when the array is deserialized.
-The parameter
-.I maxlength
-is the maximum number of elements that the array is allowed to have;
-.I elementsiz
-is the byte size of each element of the array
-(the C function
-.I sizeof()
-can be used to obtain this value).
-The
-.I xdr_element()
-.IX xdr_element() "" \fIxdr_element()\fP
-routine is called to serialize, deserialize, or free
-each element of the array.
-.br
-.LP
-Before defining more constructed data types, it is appropriate to
-present three examples.
-.LP
-.I "Example A:"
-.br
-A user on a networked machine can be identified by
-(a) the machine name, such as
-.I krypton :
-see the
-.I gethostname
-man page; (b) the user's UID: see the
-.I geteuid
-man page; and (c) the group numbers to which the user belongs:
-see the
-.I getgroups
-man page.  A structure with this information and its associated
-XDR routine could be coded like this:
-.ie t .DS
-.el .DS L
-.ft CW
-struct netuser {
-    char    *nu_machinename;
-    int     nu_uid;
-    u_int   nu_glen;
-    int     *nu_gids;
-};
-#define NLEN 255    /* \fImachine names < 256 chars\fP */
-#define NGRPS 20    /* \fIuser can't be in > 20 groups\fP */
-.sp .5
-bool_t
-xdr_netuser(xdrs, nup)
-    XDR *xdrs;
-    struct netuser *nup;
-{
-    return(xdr_string(xdrs, &nup->nu_machinename, NLEN) &&
-        xdr_int(xdrs, &nup->nu_uid) &&
-        xdr_array(xdrs, &nup->nu_gids, &nup->nu_glen,
-        NGRPS, sizeof (int), xdr_int));
-}
-.DE
-.LP
-.I "Example B:"
-.br
-A party of network users could be implemented
-as an array of
-.I netuser
-structure.
-The declaration and its associated XDR routines
-are as follows:
-.ie t .DS
-.el .DS L
-.ft CW
-struct party {
-    u_int p_len;
-    struct netuser *p_nusers;
-};
-#define PLEN 500    /* \fImax number of users in a party\fP */
-.sp .5
-bool_t
-xdr_party(xdrs, pp)
-    XDR *xdrs;
-    struct party *pp;
-{
-    return(xdr_array(xdrs, &pp->p_nusers, &pp->p_len, PLEN,
-        sizeof (struct netuser), xdr_netuser));
-}
-.DE
-.LP
-.I "Example C:"
-.br
-The well-known parameters to
-.I main ,
-.I argc
-and
-.I argv
-can be combined into a structure.
-An array of these structures can make up a history of commands.
-The declarations and XDR routines might look like:
-.ie t .DS
-.el .DS L
-.ft CW
-struct cmd {
-    u_int c_argc;
-    char **c_argv;
-};
-#define ALEN 1000   /* \fIargs cannot be > 1000 chars\fP */
-#define NARGC 100   /* \fIcommands cannot have > 100 args\fP */
-
-struct history {
-    u_int h_len;
-    struct cmd *h_cmds;
-};
-#define NCMDS 75    /* \fIhistory is no more than 75 commands\fP */
-
-bool_t
-xdr_wrap_string(xdrs, sp)
-    XDR *xdrs;
-    char **sp;
-{
-    return(xdr_string(xdrs, sp, ALEN));
-}
-.DE
-.ie t .DS
-.el .DS L
-.ft CW
-bool_t
-xdr_cmd(xdrs, cp)
-    XDR *xdrs;
-    struct cmd *cp;
-{
-    return(xdr_array(xdrs, &cp->c_argv, &cp->c_argc, NARGC,
-        sizeof (char *), xdr_wrap_string));
-}
-.DE
-.ie t .DS
-.el .DS L
-.ft CW
-bool_t
-xdr_history(xdrs, hp)
-    XDR *xdrs;
-    struct history *hp;
-{
-    return(xdr_array(xdrs, &hp->h_cmds, &hp->h_len, NCMDS,
-        sizeof (struct cmd), xdr_cmd));
-}
-.DE
-The most confusing part of this example is that the routine
-.I xdr_wrap_string()
-is needed to package the
-.I xdr_string()
-routine, because the implementation of
-.I xdr_array()
-only passes two parameters to the array element description routine;
-.I xdr_wrap_string()
-supplies the third parameter to
-.I xdr_string ().
-.LP
-By now the recursive nature of the XDR library should be obvious.
-Let's continue with more constructed data types.
-.NH 3
-\&Opaque Data
-.IX "XDR library" "opaque data"
-.LP
-In some protocols, handles are passed from a server to client.
-The client passes the handle back to the server at some later time.
-Handles are never inspected by clients;
-they are obtained and submitted.
-That is to say, handles are opaque.
-The
-.I xdr_opaque()
-.IX xdr_opaque() "" \fIxdr_opaque()\fP
-primitive is used for describing fixed sized, opaque bytes.
-.DS
-.ft CW
-bool_t xdr_opaque(xdrs, p, len)
-    XDR *xdrs;
-    char *p;
-    u_int len;
-.DE
-The parameter
-.I p
-is the location of the bytes;
-.I len
-is the number of bytes in the opaque object.
-By definition, the actual data
-contained in the opaque object are not machine portable.
-.NH 3
-\&Fixed Sized Arrays
-.IX "XDR library" "fixed sized arrays"
-.LP
-The XDR library provides a primitive,
-.I xdr_vector (),
-for fixed-length arrays.
-.ie t .DS
-.el .DS L
-.ft CW
-#define NLEN 255    /* \fImachine names must be < 256 chars\fP */
-#define NGRPS 20    /* \fIuser belongs to exactly 20 groups\fP */
-.sp .5
-struct netuser {
-    char *nu_machinename;
-    int nu_uid;
-    int nu_gids[NGRPS];
-};
-.sp .5
-bool_t
-xdr_netuser(xdrs, nup)
-    XDR *xdrs;
-    struct netuser *nup;
-{
-    int i;
-.sp .5
-    if (!xdr_string(xdrs, &nup->nu_machinename, NLEN))
-        return(FALSE);
-    if (!xdr_int(xdrs, &nup->nu_uid))
-        return(FALSE);
-    if (!xdr_vector(xdrs, nup->nu_gids, NGRPS, sizeof(int),
-        xdr_int)) {
-            return(FALSE);
-    }
-    return(TRUE);
-}
-.DE
-.NH 3
-\&Discriminated Unions
-.IX "XDR library" "discriminated unions"
-.LP
-The XDR library supports discriminated unions.
-A discriminated union is a C union and an
-.I enum_t
-value that selects an \*Qarm\*U of the union.
-.DS
-.ft CW
-struct xdr_discrim {
-    enum_t value;
-    bool_t (*proc)();
-};
-.sp .5
-bool_t xdr_union(xdrs, dscmp, unp, arms, defaultarm)
-    XDR *xdrs;
-    enum_t *dscmp;
-    char *unp;
-    struct xdr_discrim *arms;
-    bool_t (*defaultarm)();  /* \fImay equal NULL\fP */
-.DE
-First the routine translates the discriminant of the union located at
-.I *dscmp .
-The discriminant is always an
-.I enum_t .
-Next the union located at
-.I *unp
-is translated.
-The parameter
-.I arms
-is a pointer to an array of
-.I xdr_discrim
-structures.
-Each structure contains an ordered pair of
-.I [value,proc] .
-If the union's discriminant is equal to the associated
-.I value ,
-then the
-.I proc
-is called to translate the union.
-The end of the
-.I xdr_discrim
-structure array is denoted by a routine of value
-.I NULL
-(0).  If the discriminant is not found in the
-.I arms
-array, then the
-.I defaultarm
-procedure is called if it is non-null;
-otherwise the routine returns
-.I FALSE .
-.LP
-.I "Example D:"
-Suppose the type of a union may be integer,
-character pointer (a string), or a
-.I gnumbers
-structure.
-Also, assume the union and its current type
-are declared in a structure.
-The declaration is:
-.ie t .DS
-.el .DS L
-.ft CW
-enum utype { INTEGER=1, STRING=2, GNUMBERS=3 };
-.sp .5
-struct u_tag {
-    enum utype utype;   /* \fIthe union's discriminant\fP */
-    union {
-        int ival;
-        char *pval;
-        struct gnumbers gn;
-    } uval;
-};
-.DE
-The following constructs and XDR procedure (de)serialize
-the discriminated union:
-.ie t .DS
-.el .DS L
-.ft CW
-struct xdr_discrim u_tag_arms[4] = {
-    { INTEGER, xdr_int },
-    { GNUMBERS, xdr_gnumbers }
-    { STRING, xdr_wrap_string },
-    { __dontcare__, NULL }
-    /* \fIalways terminate arms with a NULL xdr_proc\fP */
-}
-.sp .5
-bool_t
-xdr_u_tag(xdrs, utp)
-    XDR *xdrs;
-    struct u_tag *utp;
-{
-    return(xdr_union(xdrs, &utp->utype, &utp->uval,
-        u_tag_arms, NULL));
-}
-.DE
-The routine
-.I xdr_gnumbers()
-was presented above in
-.I "The XDR Library"
-section.
-.I xdr_wrap_string()
-was presented in example C.
-The default
-.I arm
-parameter to
-.I xdr_union()
-(the last parameter) is
-.I NULL
-in this example.  Therefore the value of the union's discriminant
-may legally take on only values listed in the
-.I u_tag_arms
-array.  This example also demonstrates that
-the elements of the arm's array do not need to be sorted.
-.LP
-It is worth pointing out that the values of the discriminant
-may be sparse, though in this example they are not.
-It is always good
-practice to assign explicitly integer values to each element of the
-discriminant's type.
-This practice both documents the external
-representation of the discriminant and guarantees that different
-C compilers emit identical discriminant values.
-.LP
-Exercise: Implement
-.I xdr_union()
-using the other primitives in this section.
-.NH 3
-\&Pointers
-.IX "XDR library" "pointers"
-.LP
-In C it is often convenient to put pointers
-to another structure within a structure.
-The
-.I xdr_reference()
-.IX xdr_reference() "" \fIxdr_reference()\fP
-primitive makes it easy to serialize, deserialize, and free
-these referenced structures.
-.DS
-.ft CW
-bool_t xdr_reference(xdrs, pp, size, proc)
-    XDR *xdrs;
-    char **pp;
-    u_int ssize;
-    bool_t (*proc)();
-.DE
-.LP
-Parameter
-.I pp
-is the address of
-the pointer to the structure;
-parameter
-.I ssize
-is the size in bytes of the structure (use the C function
-.I sizeof()
-to obtain this value); and
-.I proc
-is the XDR routine that describes the structure.
-When decoding data, storage is allocated if
-.I *pp
-is
-.I NULL .
-.LP
-There is no need for a primitive
-.I xdr_struct()
-to describe structures within structures,
-because pointers are always sufficient.
-.LP
-Exercise: Implement
-.I xdr_reference()
-using
-.I xdr_array ().
-Warning:
-.I xdr_reference()
-and
-.I xdr_array()
-are NOT interchangeable external representations of data.
-.LP
-.I "Example E:"
-Suppose there is a structure containing a person's name
-and a pointer to a
-.I gnumbers
-structure containing the person's gross assets and liabilities.
-The construct is:
-.DS
-.ft CW
-struct pgn {
-    char *name;
-    struct gnumbers *gnp;
-};
-.DE
-The corresponding XDR routine for this structure is:
-.DS
-.ft CW
-bool_t
-xdr_pgn(xdrs, pp)
-    XDR *xdrs;
-    struct pgn *pp;
-{
-    if (xdr_string(xdrs, &pp->name, NLEN) &&
-      xdr_reference(xdrs, &pp->gnp,
-      sizeof(struct gnumbers), xdr_gnumbers))
-        return(TRUE);
-    return(FALSE);
-}
-.DE
-.IX "pointer semantics and XDR"
-.I "Pointer Semantics and XDR"
-.LP
-In many applications, C programmers attach double meaning to
-the values of a pointer.  Typically the value
-.I NULL
-(or zero) means data is not needed,
-yet some application-specific interpretation applies.
-In essence, the C programmer is encoding
-a discriminated union efficiently
-by overloading the interpretation of the value of a pointer.
-For instance, in example E a
-.I NULL
-pointer value for
-.I gnp
-could indicate that
-the person's assets and liabilities are unknown.
-That is, the pointer value encodes two things:
-whether or not the data is known;
-and if it is known, where it is located in memory.
-Linked lists are an extreme example of the use
-of application-specific pointer interpretation.
-.LP
-The primitive
-.I xdr_reference()
-.IX xdr_reference() "" \fIxdr_reference()\fP
-cannot and does not attach any special
-meaning to a null-value pointer during serialization.
-That is, passing an address of a pointer whose value is
-.I NULL
-to
-.I xdr_reference()
-when serialing data will most likely cause a memory fault and, on the UNIX
-system, a core dump.
-.LP
-.I xdr_pointer()
-correctly handles
-.I NULL
-pointers.  For more information about its use, see
-the
-.I "Linked Lists"
-topics below.
-.LP
-.I Exercise:
-After reading the section on
-.I "Linked Lists" ,
-return here and extend example E so that
-it can correctly deal with
-.I NULL
-pointer values.
-.LP
-.I Exercise:
-Using the
-.I xdr_union (),
-.I xdr_reference()
-and
-.I xdr_void()
-primitives, implement a generic pointer handling primitive
-that implicitly deals with
-.I NULL
-pointers.  That is, implement
-.I xdr_pointer ().
-.NH 2
-\&Non-filter Primitives
-.IX "XDR" "non-filter primitives"
-.LP
-XDR streams can be manipulated with
-the primitives discussed in this section.
-.DS
-.ft CW
-u_int xdr_getpos(xdrs)
-    XDR *xdrs;
-.sp .5
-bool_t xdr_setpos(xdrs, pos)
-    XDR *xdrs;
-    u_int pos;
-.sp .5
-xdr_destroy(xdrs)
-    XDR *xdrs;
-.DE
-The routine
-.I xdr_getpos()
-.IX xdr_getpos() "" \fIxdr_getpos()\fP
-returns an unsigned integer
-that describes the current position in the data stream.
-Warning: In some XDR streams, the returned value of
-.I xdr_getpos()
-is meaningless;
-the routine returns a \-1 in this case
-(though \-1 should be a legitimate value).
-.LP
-The routine
-.I xdr_setpos()
-.IX xdr_setpos() "" \fIxdr_setpos()\fP
-sets a stream position to
-.I pos .
-Warning: In some XDR streams, setting a position is impossible;
-in such cases,
-.I xdr_setpos()
-will return
-.I FALSE .
-This routine will also fail if the requested position is out-of-bounds.
-The definition of bounds varies from stream to stream.
-.LP
-The
-.I xdr_destroy()
-.IX xdr_destroy() "" \fIxdr_destroy()\fP
-primitive destroys the XDR stream.
-Usage of the stream
-after calling this routine is undefined.
-.NH 2
-\&XDR Operation Directions
-.IX XDR "operation directions"
-.IX "direction of XDR operations"
-.LP
-At times you may wish to optimize XDR routines by taking
-advantage of the direction of the operation \(em
-.I XDR_ENCODE
-.I XDR_DECODE
-or
-.I XDR_FREE
-The value
-.I xdrs->x_op
-always contains the direction of the XDR operation.
-Programmers are not encouraged to take advantage of this information.
-Therefore, no example is presented here.  However, an example in the
-.I "Linked Lists"
-topic below, demonstrates the usefulness of the
-.I xdrs->x_op
-field.
-.NH 2
-\&XDR Stream Access
-.IX "XDR" "stream access"
-.LP
-An XDR stream is obtained by calling the appropriate creation routine.
-These creation routines take arguments that are tailored to the
-specific properties of the stream.
-.LP
-Streams currently exist for (de)serialization of data to or from
-standard I/O
-.I FILE
-streams, TCP/IP connections and UNIX files, and memory.
-.NH 3
-\&Standard I/O Streams
-.IX "XDR" "standard I/O streams"
-.LP
-XDR streams can be interfaced to standard I/O using the
-.I xdrstdio_create()
-.IX xdrstdio_create() "" \fIxdrstdio_create()\fP
-routine as follows:
-.DS
-.ft CW
-#include <stdio.h>
-#include <rpc/rpc.h>    /* \fIxdr streams part of rpc\fP */
-.sp .5
-void
-xdrstdio_create(xdrs, fp, x_op)
-    XDR *xdrs;
-    FILE *fp;
-    enum xdr_op x_op;
-.DE
-The routine
-.I xdrstdio_create()
-initializes an XDR stream pointed to by
-.I xdrs .
-The XDR stream interfaces to the standard I/O library.
-Parameter
-.I fp
-is an open file, and
-.I x_op
-is an XDR direction.
-.NH 3
-\&Memory Streams
-.IX "XDR" "memory streams"
-.LP
-Memory streams allow the streaming of data into or out of
-a specified area of memory:
-.DS
-.ft CW
-#include <rpc/rpc.h>
-.sp .5
-void
-xdrmem_create(xdrs, addr, len, x_op)
-    XDR *xdrs;
-    char *addr;
-    u_int len;
-    enum xdr_op x_op;
-.DE
-The routine
-.I xdrmem_create()
-.IX xdrmem_create() "" \fIxdrmem_create()\fP
-initializes an XDR stream in local memory.
-The memory is pointed to by parameter
-.I addr ;
-parameter
-.I len
-is the length in bytes of the memory.
-The parameters
-.I xdrs
-and
-.I x_op
-are identical to the corresponding parameters of
-.I xdrstdio_create ().
-Currently, the UDP/IP implementation of RPC uses
-.I xdrmem_create ().
-Complete call or result messages are built in memory before calling the
-.I sendto()
-system routine.
-.NH 3
-\&Record (TCP/IP) Streams
-.IX "XDR" "record (TCP/IP) streams"
-.LP
-A record stream is an XDR stream built on top of
-a record marking standard that is built on top of the
-UNIX file or 4.2 BSD connection interface.
-.DS
-.ft CW
-#include <rpc/rpc.h>    /* \fIxdr streams part of rpc\fP */
-.sp .5
-xdrrec_create(xdrs,
-  sendsize, recvsize, iohandle, readproc, writeproc)
-    XDR *xdrs;
-    u_int sendsize, recvsize;
-    char *iohandle;
-    int (*readproc)(), (*writeproc)();
-.DE
-The routine
-.I xdrrec_create()
-provides an XDR stream interface that allows for a bidirectional,
-arbitrarily long sequence of records.
-The contents of the records are meant to be data in XDR form.
-The stream's primary use is for interfacing RPC to TCP connections.
-However, it can be used to stream data into or out of normal
-UNIX files.
-.LP
-The parameter
-.I xdrs
-is similar to the corresponding parameter described above.
-The stream does its own data buffering similar to that of standard I/O.
-The parameters
-.I sendsize
-and
-.I recvsize
-determine the size in bytes of the output and input buffers, respectively;
-if their values are zero (0), then predetermined defaults are used.
-When a buffer needs to be filled or flushed, the routine
-.I readproc()
-or
-.I writeproc()
-is called, respectively.
-The usage and behavior of these
-routines are similar to the UNIX system calls
-.I read()
-and
-.I write ().
-However,
-the first parameter to each of these routines is the opaque parameter
-.I iohandle .
-The other two parameters
-.I buf ""
-and
-.I nbytes )
-and the results
-(byte count) are identical to the system routines.
-If
-.I xxx
-is
-.I readproc()
-or
-.I writeproc (),
-then it has the following form:
-.DS
-.ft CW
-.ft I
-/*
- * returns the actual number of bytes transferred.
- * -1 is an error
- */
-.ft CW
-int
-xxx(iohandle, buf, len)
-    char *iohandle;
-    char *buf;
-    int nbytes;
-.DE
-The XDR stream provides means for delimiting records in the byte stream.
-The implementation details of delimiting records in a stream are
-discussed in the
-.I "Advanced Topics"
-topic below.
-The primitives that are specific to record streams are as follows:
-.DS
-.ft CW
-bool_t
-xdrrec_endofrecord(xdrs, flushnow)
-    XDR *xdrs;
-    bool_t flushnow;
-.sp .5
-bool_t
-xdrrec_skiprecord(xdrs)
-    XDR *xdrs;
-.sp .5
-bool_t
-xdrrec_eof(xdrs)
-    XDR *xdrs;
-.DE
-The routine
-.I xdrrec_endofrecord()
-.IX xdrrec_endofrecord() "" \fIxdrrec_endofrecord()\fP
-causes the current outgoing data to be marked as a record.
-If the parameter
-.I flushnow
-is
-.I TRUE ,
-then the stream's
-.I writeproc
-will be called; otherwise,
-.I writeproc
-will be called when the output buffer has been filled.
-.LP
-The routine
-.I xdrrec_skiprecord()
-.IX xdrrec_skiprecord() "" \fIxdrrec_skiprecord()\fP
-causes an input stream's position to be moved past
-the current record boundary and onto the
-beginning of the next record in the stream.
-.LP
-If there is no more data in the stream's input buffer,
-then the routine
-.I xdrrec_eof()
-.IX xdrrec_eof() "" \fIxdrrec_eof()\fP
-returns
-.I TRUE .
-That is not to say that there is no more data
-in the underlying file descriptor.
-.NH 2
-\&XDR Stream Implementation
-.IX "XDR" "stream implementation"
-.IX "stream implementation in XDR"
-.LP
-This section provides the abstract data types needed
-to implement new instances of XDR streams.
-.NH 3
-\&The XDR Object
-.IX "XDR" "object"
-.LP
-The following structure defines the interface to an XDR stream:
-.ie t .DS
-.el .DS L
-.ft CW
-enum xdr_op { XDR_ENCODE=0, XDR_DECODE=1, XDR_FREE=2 };
-.sp .5
-typedef struct {
-    enum xdr_op x_op;            /* \fIoperation; fast added param\fP */
-    struct xdr_ops {
-        bool_t  (*x_getlong)();  /* \fIget long from stream\fP */
-        bool_t  (*x_putlong)();  /* \fIput long to stream\fP */
-        bool_t  (*x_getbytes)(); /* \fIget bytes from stream\fP */
-        bool_t  (*x_putbytes)(); /* \fIput bytes to stream\fP */
-        u_int   (*x_getpostn)(); /* \fIreturn stream offset\fP */
-        bool_t  (*x_setpostn)(); /* \fIreposition offset\fP */
-        caddr_t (*x_inline)();   /* \fIptr to buffered data\fP */
-        VOID    (*x_destroy)();  /* \fIfree private area\fP */
-    } *x_ops;
-    caddr_t     x_public;        /* \fIusers' data\fP */
-    caddr_t     x_private;       /* \fIpointer to private data\fP */
-    caddr_t     x_base;          /* \fIprivate for position info\fP */
-    int         x_handy;         /* \fIextra private word\fP */
-} XDR;
-.DE
-The
-.I x_op
-field is the current operation being performed on the stream.
-This field is important to the XDR primitives,
-but should not affect a stream's implementation.
-That is, a stream's implementation should not depend
-on this value.
-The fields
-.I x_private ,
-.I x_base ,
-and
-.I x_handy
-are private to the particular
-stream's implementation.
-The field
-.I x_public
-is for the XDR client and should never be used by
-the XDR stream implementations or the XDR primitives.
-.I x_getpostn() ,
-.I x_setpostn()
-and
-.I x_destroy()
-are macros for accessing operations.  The operation
-.I x_inline()
-takes two parameters:
-an XDR *, and an unsigned integer, which is a byte count.
-The routine returns a pointer to a piece of
-the stream's internal buffer.
-The caller can then use the buffer segment for any purpose.
-From the stream's point of view, the bytes in the
-buffer segment have been consumed or put.
-The routine may return
-.I NULL
-if it cannot return a buffer segment of the requested size.
-(The
-.I x_inline()
-routine is for cycle squeezers.
-Use of the resulting buffer is not data-portable.
-Users are encouraged not to use this feature.)
-.LP
-The operations
-.I x_getbytes()
-and
-.I x_putbytes()
-blindly get and put sequences of bytes
-from or to the underlying stream;
-they return
-.I TRUE
-if they are successful, and
-.I FALSE
-otherwise.  The routines have identical parameters (replace
-.I xxx ):
-.DS
-.ft CW
-bool_t
-xxxbytes(xdrs, buf, bytecount)
-	XDR *xdrs;
-	char *buf;
-	u_int bytecount;
-.DE
-The operations
-.I x_getlong()
-and
-.I x_putlong()
-receive and put
-long numbers from and to the data stream.
-It is the responsibility of these routines
-to translate the numbers between the machine representation
-and the (standard) external representation.
-The UNIX primitives
-.I htonl()
-and
-.I ntohl()
-can be helpful in accomplishing this.
-The higher-level XDR implementation assumes that
-signed and unsigned long integers contain the same number of bits,
-and that nonnegative integers
-have the same bit representations as unsigned integers.
-The routines return
-.I TRUE
-if they succeed, and
-.I FALSE
-otherwise.  They have identical parameters:
-.DS
-.ft CW
-bool_t
-xxxlong(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-.DE
-Implementors of new XDR streams must make an XDR structure
-(with new operation routines) available to clients,
-using some kind of create routine.
-.NH 1
-\&Advanced Topics
-.IX XDR "advanced topics"
-.LP
-This section describes techniques for passing data structures that
-are not covered in the preceding sections.  Such structures include
-linked lists (of arbitrary lengths).  Unlike the simpler examples
-covered in the earlier sections, the following examples are written
-using both the XDR C library routines and the XDR data description
-language.
-The
-.I "External Data Representation Standard: Protocol Specification"
-describes this
-language in complete detail.
-.NH 2
-\&Linked Lists
-.IX XDR "linked lists"
-.LP
-The last example in the
-.I Pointers
-topic earlier in this chapter
-presented a C data structure and its associated XDR
-routines for an individual's gross assets and liabilities.
-The example is duplicated below:
-.ie t .DS
-.el .DS L
-.ft CW
-struct gnumbers {
-	long g_assets;
-	long g_liabilities;
-};
-.sp .5
-bool_t
-xdr_gnumbers(xdrs, gp)
-	XDR *xdrs;
-	struct gnumbers *gp;
-{
-	if (xdr_long(xdrs, &(gp->g_assets)))
-		return(xdr_long(xdrs, &(gp->g_liabilities)));
-	return(FALSE);
-}
-.DE
-.LP
-Now assume that we wish to implement a linked list of such information.
-A data structure could be constructed as follows:
-.ie t .DS
-.el .DS L
-.ft CW
-struct gnumbers_node {
-	struct gnumbers gn_numbers;
-	struct gnumbers_node *gn_next;
-};
-.sp .5
-typedef struct gnumbers_node *gnumbers_list;
-.DE
-.LP
-The head of the linked list can be thought of as the data object;
-that is, the head is not merely a convenient shorthand for a
-structure.  Similarly the
-.I gn_next
-field is used to indicate whether or not the object has terminated.
-Unfortunately, if the object continues, the
-.I gn_next
-field is also the address of where it continues. The link addresses
-carry no useful information when the object is serialized.
-.LP
-The XDR data description of this linked list is described by the
-recursive declaration of
-.I gnumbers_list :
-.ie t .DS
-.el .DS L
-.ft CW
-struct gnumbers {
-	int g_assets;
-	int g_liabilities;
-};
-.sp .5
-struct gnumbers_node {
-	gnumbers gn_numbers;
-	gnumbers_node *gn_next;
-};
-.DE
-.LP
-In this description, the boolean indicates whether there is more data
-following it. If the boolean is
-.I FALSE ,
-then it is the last data field of the structure. If it is
-.I TRUE ,
-then it is followed by a gnumbers structure and (recursively) by a
-.I gnumbers_list .
-Note that the C declaration has no boolean explicitly declared in it
-(though the
-.I gn_next
-field implicitly carries the information), while the XDR data
-description has no pointer explicitly declared in it.
-.LP
-Hints for writing the XDR routines for a
-.I gnumbers_list
-follow easily from the XDR description above. Note how the primitive
-.I xdr_pointer()
-is used to implement the XDR union above.
-.ie t .DS
-.el .DS L
-.ft CW
-bool_t
-xdr_gnumbers_node(xdrs, gn)
-	XDR *xdrs;
-	gnumbers_node *gn;
-{
-	return(xdr_gnumbers(xdrs, &gn->gn_numbers) &&
-		xdr_gnumbers_list(xdrs, &gp->gn_next));
-}
-.sp .5
-bool_t
-xdr_gnumbers_list(xdrs, gnp)
-	XDR *xdrs;
-	gnumbers_list *gnp;
-{
-	return(xdr_pointer(xdrs, gnp,
-		sizeof(struct gnumbers_node),
-		xdr_gnumbers_node));
-}
-.DE
-.LP
-The unfortunate side effect of XDR'ing a list with these routines
-is that the C stack grows linearly with respect to the number of
-node in the list.  This is due to the recursion. The following
-routine collapses the above two mutually recursive into a single,
-non-recursive one.
-.ie t .DS
-.el .DS L
-.ft CW
-bool_t
-xdr_gnumbers_list(xdrs, gnp)
-	XDR *xdrs;
-	gnumbers_list *gnp;
-{
-	bool_t more_data;
-	gnumbers_list *nextp;
-.sp .5
-	for (;;) {
-		more_data = (*gnp != NULL);
-		if (!xdr_bool(xdrs, &more_data)) {
-			return(FALSE);
-		}
-		if (! more_data) {
-			break;
-		}
-		if (xdrs->x_op == XDR_FREE) {
-			nextp = &(*gnp)->gn_next;
-		}
-		if (!xdr_reference(xdrs, gnp,
-			sizeof(struct gnumbers_node), xdr_gnumbers)) {
-
-		return(FALSE);
-		}
-		gnp = (xdrs->x_op == XDR_FREE) ?
-			nextp : &(*gnp)->gn_next;
-	}
-	*gnp = NULL;
-	return(TRUE);
-}
-.DE
-.LP
-The first task is to find out whether there is more data or not,
-so that this boolean information can be serialized. Notice that
-this statement is unnecessary in the
-.I XDR_DECODE
-case, since the value of more_data is not known until we
-deserialize it in the next statement.
-.LP
-The next statement XDR's the more_data field of the XDR union.
-Then if there is truly no more data, we set this last pointer to
-.I NULL
-to indicate the end of the list, and return
-.I TRUE
-because we are done. Note that setting the pointer to
-.I NULL
-is only important in the
-.I XDR_DECODE
-case, since it is already
-.I NULL
-in the
-.I XDR_ENCODE
-and
-XDR_FREE
-cases.
-.LP
-Next, if the direction is
-.I XDR_FREE ,
-the value of
-.I nextp
-is set to indicate the location of the next pointer in the list.
-We do this now because we need to dereference gnp to find the
-location of the next item in the list, and after the next
-statement the storage pointed to by
-.I gnp
-will be freed up and no be longer valid.  We can't do this for all
-directions though, because in the
-.I XDR_DECODE
-direction the value of
-.I gnp
-won't be set until the next statement.
-.LP
-Next, we XDR the data in the node using the primitive
-.I xdr_reference ().
-.I xdr_reference()
-is like
-.I xdr_pointer()
-which we used before, but it does not
-send over the boolean indicating whether there is more data.
-We use it instead of
-.I xdr_pointer()
-because we have already XDR'd this information ourselves. Notice
-that the xdr routine passed is not the same type as an element
-in the list. The routine passed is
-.I xdr_gnumbers (),
-for XDR'ing gnumbers, but each element in the list is actually of
-type
-.I gnumbers_node .
-We don't pass
-.I xdr_gnumbers_node()
-because it is recursive, and instead use
-.I xdr_gnumbers()
-which XDR's all of the non-recursive part.  Note that this trick
-will work only if the
-.I gn_numbers
-field is the first item in each element, so that their addresses
-are identical when passed to
-.I xdr_reference ().
-.LP
-Finally, we update
-.I gnp
-to point to the next item in the list. If the direction is
-.I XDR_FREE ,
-we set it to the previously saved value, otherwise we can
-dereference
-.I gnp
-to get the proper value.  Though harder to understand than the
-recursive version, this non-recursive routine is far less likely
-to blow the C stack.  It will also run more efficiently since
-a lot of procedure call overhead has been removed. Most lists
-are small though (in the hundreds of items or less) and the
-recursive version should be sufficient for them.
-.EQ
-delim off
-.EN
diff --git a/lib/libc/rpc/PSD.doc/xdr.rfc.ms b/lib/libc/rpc/PSD.doc/xdr.rfc.ms
deleted file mode 100644
index aa09e2d..0000000
--- a/lib/libc/rpc/PSD.doc/xdr.rfc.ms
+++ /dev/null
@@ -1,1060 +0,0 @@
-.\"
-.\"  Must use -- tbl -- with this one
-.\"
-.\" @(#)xdr.rfc.ms	2.2 88/08/05 4.0 RPCSRC
-.\" $FreeBSD: src/lib/libc/rpc/PSD.doc/xdr.rfc.ms,v 1.3 2002/10/29 14:56:06 ru Exp $
-.\"
-.de BT
-.if \\n%=1 .tl ''- % -''
-..
-.ND
-.\" prevent excess underlining in nroff
-.if n .fp 2 R
-.OH 'External Data Representation Standard''Page %'
-.EH 'Page %''External Data Representation Standard'
-.if \n%=1 .bp
-.SH
-\&External Data Representation Standard: Protocol Specification
-.IX "External Data Representation"
-.IX XDR RFC
-.IX XDR "protocol specification"
-.LP
-.NH 0
-\&Status of this Standard
-.nr OF 1
-.IX XDR "RFC status"
-.LP
-Note: This chapter specifies a protocol that Sun Microsystems, Inc., and 
-others are using.  It has been designated RFC1014 by the ARPA Network
-Information Center.
-.NH 1
-Introduction
-\&
-.LP
-XDR is a standard for the description and encoding of data.  It is
-useful for transferring data between different computer
-architectures, and has been used to communicate data between such
-diverse machines as the Sun Workstation, VAX, IBM-PC, and Cray.
-XDR fits into the ISO presentation layer, and is roughly analogous in
-purpose to X.409, ISO Abstract Syntax Notation.  The major difference
-between these two is that XDR uses implicit typing, while X.409 uses
-explicit typing.
-.LP
-XDR uses a language to describe data formats.  The language can only
-be used only to describe data; it is not a programming language.
-This language allows one to describe intricate data formats in a
-concise manner. The alternative of using graphical representations
-(itself an informal language) quickly becomes incomprehensible when
-faced with complexity.  The XDR language itself is similar to the C
-language [1], just as Courier [4] is similar to Mesa. Protocols such
-as Sun RPC (Remote Procedure Call) and the NFS (Network File System)
-use XDR to describe the format of their data.
-.LP
-The XDR standard makes the following assumption: that bytes (or
-octets) are portable, where a byte is defined to be 8 bits of data.
-A given hardware device should encode the bytes onto the various
-media in such a way that other hardware devices may decode the bytes
-without loss of meaning.  For example, the Ethernet standard
-suggests that bytes be encoded in "little-endian" style [2], or least
-significant bit first.
-.NH 2
-\&Basic Block Size
-.IX XDR "basic block size"
-.IX XDR "block size"
-.LP
-The representation of all items requires a multiple of four bytes (or
-32 bits) of data.  The bytes are numbered 0 through n-1.  The bytes
-are read or written to some byte stream such that byte m always
-precedes byte m+1.  If the n bytes needed to contain the data are not
-a multiple of four, then the n bytes are followed by enough (0 to 3)
-residual zero bytes, r, to make the total byte count a multiple of 4.
-.LP
-We include the familiar graphic box notation for illustration and
-comparison.  In most illustrations, each box (delimited by a plus
-sign at the 4 corners and vertical bars and dashes) depicts a byte.
-Ellipses (...) between boxes show zero or more additional bytes where
-required.
-.ie t .DS
-.el .DS L
-\fIA Block\fP
-
-\f(CW+--------+--------+...+--------+--------+...+--------+
-| byte 0 | byte 1 |...|byte n-1|    0   |...|    0   |
-+--------+--------+...+--------+--------+...+--------+
-|<-----------n bytes---------->|<------r bytes------>|
-|<-----------n+r (where (n+r) mod 4 = 0)>----------->|\fP
-
-.DE
-.NH 1
-\&XDR Data Types
-.IX XDR "data types"
-.IX "XDR data types"
-.LP
-Each of the sections that follow describes a data type defined in the
-XDR standard, shows how it is declared in the language, and includes
-a graphic illustration of its encoding.
-.LP
-For each data type in the language we show a general paradigm
-declaration.  Note that angle brackets (< and >) denote
-variable length sequences of data and square brackets ([ and ]) denote
-fixed-length sequences of data.  "n", "m" and "r" denote integers.
-For the full language specification and more formal definitions of
-terms such as "identifier" and "declaration", refer to
-.I "The XDR Language Specification" ,
-below.
-.LP
-For some data types, more specific examples are included.  
-A more extensive example of a data description is in
-.I "An Example of an XDR Data Description"
-below.
-.NH 2
-\&Integer
-.IX XDR integer
-.LP
-An XDR signed integer is a 32-bit datum that encodes an integer in
-the range [-2147483648,2147483647].  The integer is represented in
-two's complement notation.  The most and least significant bytes are
-0 and 3, respectively.  Integers are declared as follows:
-.ie t .DS
-.el .DS L
-\fIInteger\fP
-
-\f(CW(MSB)                   (LSB)
-+-------+-------+-------+-------+
-|byte 0 |byte 1 |byte 2 |byte 3 |
-+-------+-------+-------+-------+
-<------------32 bits------------>\fP
-.DE
-.NH 2
-\&Unsigned Integer
-.IX XDR "unsigned integer"
-.IX XDR "integer, unsigned"
-.LP
-An XDR unsigned integer is a 32-bit datum that encodes a nonnegative
-integer in the range [0,4294967295].  It is represented by an
-unsigned binary number whose most and least significant bytes are 0
-and 3, respectively.  An unsigned integer is declared as follows:
-.ie t .DS
-.el .DS L
-\fIUnsigned Integer\fP
-
-\f(CW(MSB)                   (LSB)
-+-------+-------+-------+-------+
-|byte 0 |byte 1 |byte 2 |byte 3 |
-+-------+-------+-------+-------+
-<------------32 bits------------>\fP
-.DE
-.NH 2
-\&Enumeration
-.IX XDR enumeration
-.LP
-Enumerations have the same representation as signed integers.
-Enumerations are handy for describing subsets of the integers.
-Enumerated data is declared as follows:
-.ft CW
-.DS
-enum { name-identifier = constant, ... } identifier;
-.DE
-For example, the three colors red, yellow, and blue could be
-described by an enumerated type:
-.DS
-.ft CW
-enum { RED = 2, YELLOW = 3, BLUE = 5 } colors;
-.DE
-It is an error to encode as an enum any other integer than those that
-have been given assignments in the enum declaration.
-.NH 2
-\&Boolean
-.IX XDR boolean
-.LP
-Booleans are important enough and occur frequently enough to warrant
-their own explicit type in the standard.  Booleans are declared as
-follows:
-.DS
-.ft CW
-bool identifier;
-.DE
-This is equivalent to:
-.DS
-.ft CW
-enum { FALSE = 0, TRUE = 1 } identifier;
-.DE
-.NH 2
-\&Hyper Integer and Unsigned Hyper Integer
-.IX XDR "hyper integer"
-.IX XDR "integer, hyper"
-.LP
-The standard also defines 64-bit (8-byte) numbers called hyper
-integer and unsigned hyper integer.  Their representations are the
-obvious extensions of integer and unsigned integer defined above.
-They are represented in two's complement notation.  The most and
-least significant bytes are 0 and 7, respectively.  Their
-declarations:
-.ie t .DS
-.el .DS L
-\fIHyper Integer\fP
-\fIUnsigned Hyper Integer\fP
-
-\f(CW(MSB)                                                   (LSB)
-+-------+-------+-------+-------+-------+-------+-------+-------+
-|byte 0 |byte 1 |byte 2 |byte 3 |byte 4 |byte 5 |byte 6 |byte 7 |
-+-------+-------+-------+-------+-------+-------+-------+-------+
-<----------------------------64 bits---------------------------->\fP
-.DE
-.NH 2
-\&Floating-point
-.IX XDR "integer, floating point"
-.IX XDR "floating-point integer"
-.LP
-The standard defines the floating-point data type "float" (32 bits or
-4 bytes).  The encoding used is the IEEE standard for normalized
-single-precision floating-point numbers [3].  The following three
-fields describe the single-precision floating-point number:
-.RS
-.IP \fBS\fP:
-The sign of the number.  Values 0 and  1 represent  positive and
-negative, respectively.  One bit.
-.IP \fBE\fP:
-The exponent of the number, base 2.  8  bits are devoted to this
-field.  The exponent is biased by 127.
-.IP \fBF\fP:
-The fractional part of the number's mantissa,  base 2.   23 bits
-are devoted to this field.
-.RE
-.LP
-Therefore, the floating-point number is described by:
-.DS
-(-1)**S * 2**(E-Bias) * 1.F
-.DE
-It is declared as follows:
-.ie t .DS
-.el .DS L
-\fISingle-Precision Floating-Point\fP
-
-\f(CW+-------+-------+-------+-------+
-|byte 0 |byte 1 |byte 2 |byte 3 |
-S|   E   |           F          |
-+-------+-------+-------+-------+
-1|<- 8 ->|<-------23 bits------>|
-<------------32 bits------------>\fP
-.DE
-Just as the most and least significant bytes of a number are 0 and 3,
-the most and least significant bits of a single-precision floating-
-point number are 0 and 31.  The beginning bit (and most significant
-bit) offsets of S, E, and F are 0, 1, and 9, respectively.  Note that
-these numbers refer to the mathematical positions of the bits, and
-NOT to their actual physical locations (which vary from medium to
-medium).
-.LP
-The IEEE specifications should be consulted concerning the encoding
-for signed zero, signed infinity (overflow), and denormalized numbers
-(underflow) [3].  According to IEEE specifications, the "NaN" (not a
-number) is system dependent and should not be used externally.
-.NH 2
-\&Double-precision Floating-point
-.IX XDR "integer, double-precision floating point"
-.IX XDR "double-precision floating-point integer"
-.LP
-The standard defines the encoding for the double-precision floating-
-point data type "double" (64 bits or 8 bytes).  The encoding used is
-the IEEE standard for normalized double-precision floating-point
-numbers [3].  The standard encodes the following three fields, which
-describe the double-precision floating-point number:
-.RS
-.IP \fBS\fP:
-The sign of the number.  Values  0 and 1  represent positive and
-negative, respectively.  One bit.
-.IP \fBE\fP:
-The exponent of the number, base 2.  11 bits are devoted to this
-field.  The exponent is biased by 1023.
-.IP \fBF\fP:
-The fractional part of the number's  mantissa, base 2.   52 bits
-are devoted to this field.
-.RE
-.LP
-Therefore, the floating-point number is described by:
-.DS
-(-1)**S * 2**(E-Bias) * 1.F
-.DE
-It is declared as follows:
-.ie t .DS
-.el .DS L
-\fIDouble-Precision Floating-Point\fP
-
-\f(CW+------+------+------+------+------+------+------+------+
-|byte 0|byte 1|byte 2|byte 3|byte 4|byte 5|byte 6|byte 7|
-S|    E   |                    F                        |
-+------+------+------+------+------+------+------+------+
-1|<--11-->|<-----------------52 bits------------------->|
-<-----------------------64 bits------------------------->\fP
-.DE
-Just as the most and least significant bytes of a number are 0 and 3,
-the most and least significant bits of a double-precision floating-
-point number are 0 and 63.  The beginning bit (and most significant
-bit) offsets of S, E , and F are 0, 1, and 12, respectively.  Note
-that these numbers refer to the mathematical positions of the bits,
-and NOT to their actual physical locations (which vary from medium to
-medium).
-.LP
-The IEEE specifications should be consulted concerning the encoding
-for signed zero, signed infinity (overflow), and denormalized numbers
-(underflow) [3].  According to IEEE specifications, the "NaN" (not a
-number) is system dependent and should not be used externally.
-.NH 2
-\&Fixed-length Opaque Data
-.IX XDR "fixed-length opaque data"
-.IX XDR "opaque data, fixed length"
-.LP
-At times, fixed-length uninterpreted data needs to be passed among
-machines.  This data is called "opaque" and is declared as follows:
-.DS
-.ft CW
-opaque identifier[n];
-.DE
-where the constant n is the (static) number of bytes necessary to
-contain the opaque data.  If n is not a multiple of four, then the n
-bytes are followed by enough (0 to 3) residual zero bytes, r, to make
-the total byte count of the opaque object a multiple of four.
-.ie t .DS
-.el .DS L
-\fIFixed-Length Opaque\fP
-
-\f(CW0        1     ...
-+--------+--------+...+--------+--------+...+--------+
-| byte 0 | byte 1 |...|byte n-1|    0   |...|    0   |
-+--------+--------+...+--------+--------+...+--------+
-|<-----------n bytes---------->|<------r bytes------>|
-|<-----------n+r (where (n+r) mod 4 = 0)------------>|\fP
-.DE
-.NH 2
-\&Variable-length Opaque Data
-.IX XDR "variable-length opaque data"
-.IX XDR "opaque data, variable length"
-.LP
-The standard also provides for variable-length (counted) opaque data,
-defined as a sequence of n (numbered 0 through n-1) arbitrary bytes
-to be the number n encoded as an unsigned integer (as described
-below), and followed by the n bytes of the sequence.
-.LP
-Byte m of the sequence always precedes byte m+1 of the sequence, and
-byte 0 of the sequence always follows the sequence's length (count).
-enough (0 to 3) residual zero bytes, r, to make the total byte count
-a multiple of four.  Variable-length opaque data is declared in the
-following way:
-.DS
-.ft CW
-opaque identifier<m>;
-.DE
-or
-.DS
-.ft CW
-opaque identifier<>;
-.DE
-The constant m denotes an upper bound of the number of bytes that the
-sequence may contain.  If m is not specified, as in the second
-declaration, it is assumed to be (2**32) - 1, the maximum length.
-The constant m would normally be found in a protocol specification.
-For example, a filing protocol may state that the maximum data
-transfer size is 8192 bytes, as follows:
-.DS
-.ft CW
-opaque filedata<8192>;
-.DE
-This can be illustrated as follows:
-.ie t .DS
-.el .DS L
-\fIVariable-Length Opaque\fP
-
-\f(CW0     1     2     3     4     5   ...
-+-----+-----+-----+-----+-----+-----+...+-----+-----+...+-----+
-|        length n       |byte0|byte1|...| n-1 |  0  |...|  0  |
-+-----+-----+-----+-----+-----+-----+...+-----+-----+...+-----+
-|<-------4 bytes------->|<------n bytes------>|<---r bytes--->|
-|<----n+r (where (n+r) mod 4 = 0)---->|\fP
-.DE
-.LP
-It   is  an error  to  encode  a  length  greater  than the maximum
-described in the specification.
-.NH 2
-\&String
-.IX XDR string
-.LP
-The standard defines a string of n (numbered 0 through n-1) ASCII
-bytes to be the number n encoded as an unsigned integer (as described
-above), and followed by the n bytes of the string.  Byte m of the
-string always precedes byte m+1 of the string, and byte 0 of the
-string always follows the string's length.  If n is not a multiple of
-four, then the n bytes are followed by enough (0 to 3) residual zero
-bytes, r, to make the total byte count a multiple of four.  Counted
-byte strings are declared as follows:
-.DS
-.ft CW
-string object<m>;
-.DE
-or
-.DS
-.ft CW
-string object<>;
-.DE
-The constant m denotes an upper bound of the number of bytes that a
-string may contain.  If m is not specified, as in the second
-declaration, it is assumed to be (2**32) - 1, the maximum length.
-The constant m would normally be found in a protocol specification.
-For example, a filing protocol may state that a file name can be no
-longer than 255 bytes, as follows:
-.DS
-.ft CW
-string filename<255>;
-.DE
-Which can be illustrated as:
-.ie t .DS
-.el .DS L
-\fIA String\fP
-
-\f(CW0     1     2     3     4     5   ...
-+-----+-----+-----+-----+-----+-----+...+-----+-----+...+-----+
-|        length n       |byte0|byte1|...| n-1 |  0  |...|  0  |
-+-----+-----+-----+-----+-----+-----+...+-----+-----+...+-----+
-|<-------4 bytes------->|<------n bytes------>|<---r bytes--->|
-|<----n+r (where (n+r) mod 4 = 0)---->|\fP
-.DE
-.LP
-It   is an  error  to  encode  a length greater  than   the maximum
-described in the specification.
-.NH 2
-\&Fixed-length Array
-.IX XDR "fixed-length array"
-.IX XDR "array, fixed length"
-.LP
-Declarations for fixed-length arrays of homogeneous elements are in
-the following form:
-.DS
-.ft CW
-type-name identifier[n];
-.DE
-Fixed-length arrays of elements numbered 0 through n-1 are encoded by
-individually encoding the elements of the array in their natural
-order, 0 through n-1.  Each element's size is a multiple of four
-bytes. Though all elements are of the same type, the elements may
-have different sizes.  For example, in a fixed-length array of
-strings, all elements are of type "string", yet each element will
-vary in its length.
-.ie t .DS
-.el .DS L
-\fIFixed-Length Array\fP
-
-\f(CW+---+---+---+---+---+---+---+---+...+---+---+---+---+
-|   element 0   |   element 1   |...|  element n-1  |
-+---+---+---+---+---+---+---+---+...+---+---+---+---+
-|<--------------------n elements------------------->|\fP
-.DE
-.NH 2
-\&Variable-length Array
-.IX XDR "variable-length array"
-.IX XDR "array, variable length"
-.LP
-Counted arrays provide the ability to encode variable-length arrays
-of homogeneous elements.  The array is encoded as the element count n
-(an unsigned integer) followed by the encoding of each of the array's
-elements, starting with element 0 and progressing through element n-
-1.  The declaration for variable-length arrays follows this form:
-.DS
-.ft CW
-type-name identifier<m>;
-.DE
-or
-.DS
-.ft CW
-type-name identifier<>;
-.DE
-The constant m specifies the maximum acceptable element count of an
-array; if  m is not specified, as  in the second declaration, it is
-assumed to be (2**32) - 1.
-.ie t .DS
-.el .DS L
-\fICounted Array\fP
-
-\f(CW0  1  2  3
-+--+--+--+--+--+--+--+--+--+--+--+--+...+--+--+--+--+
-|     n     | element 0 | element 1 |...|element n-1|
-+--+--+--+--+--+--+--+--+--+--+--+--+...+--+--+--+--+
-|<-4 bytes->|<--------------n elements------------->|\fP
-.DE
-It is  an error to  encode  a  value of n that  is greater than the
-maximum described in the specification.
-.NH 2
-\&Structure
-.IX XDR structure
-.LP
-Structures are declared as follows:
-.DS
-.ft CW
-struct {
-	component-declaration-A;
-	component-declaration-B;
-	\&...
-} identifier;
-.DE
-The components of the structure are encoded in the order of their
-declaration in the structure.  Each component's size is a multiple of
-four bytes, though the components may be different sizes.
-.ie t .DS
-.el .DS L
-\fIStructure\fP
-
-\f(CW+-------------+-------------+...
-| component A | component B |...
-+-------------+-------------+...\fP
-.DE
-.NH 2
-\&Discriminated Union
-.IX XDR "discriminated union"
-.IX XDR union discriminated
-.LP
-A discriminated union is a type composed of a discriminant followed
-by a type selected from a set of prearranged types according to the
-value of the discriminant.  The type of discriminant is either "int",
-"unsigned int", or an enumerated type, such as "bool".  The component
-types are called "arms" of the union, and are preceded by the value
-of the discriminant which implies their encoding.  Discriminated
-unions are declared as follows:
-.DS
-.ft CW
-union switch (discriminant-declaration) {
-	case discriminant-value-A:
-	arm-declaration-A;
-	case discriminant-value-B:
-	arm-declaration-B;
-	\&...
-	default: default-declaration;
-} identifier;
-.DE
-Each "case" keyword is followed by a legal value of the discriminant.
-The default arm is optional.  If it is not specified, then a valid
-encoding of the union cannot take on unspecified discriminant values.
-The size of the implied arm is always a multiple of four bytes.
-.LP
-The discriminated union is encoded as its discriminant followed by
-the encoding of the implied arm.
-.ie t .DS
-.el .DS L
-\fIDiscriminated Union\fP
-
-\f(CW0   1   2   3
-+---+---+---+---+---+---+---+---+
-|  discriminant |  implied arm  |
-+---+---+---+---+---+---+---+---+
-|<---4 bytes--->|\fP
-.DE
-.NH 2
-\&Void
-.IX XDR void
-.LP
-An XDR void is a 0-byte quantity.  Voids are useful for describing
-operations that take no data as input or no data as output. They are
-also useful in unions, where some arms may contain data and others do
-not.  The declaration is simply as follows:
-.DS
-.ft CW
-void;
-.DE
-Voids are illustrated as follows:
-.ie t .DS
-.el .DS L
-\fIVoid\fP
-
-\f(CW  ++
-  ||
-  ++
---><-- 0 bytes\fP
-.DE
-.NH 2
-\&Constant
-.IX XDR constant
-.LP
-The data declaration for a constant follows this form:
-.DS
-.ft CW
-const name-identifier = n;
-.DE
-"const" is used to define a symbolic name for a constant; it does not
-declare any data.  The symbolic constant may be used anywhere a
-regular constant may be used.  For example, the following defines a
-symbolic constant DOZEN, equal to 12.
-.DS
-.ft CW
-const DOZEN = 12;
-.DE
-.NH 2
-\&Typedef
-.IX XDR typedef
-.LP
-"typedef" does not declare any data either, but serves to define new
-identifiers for declaring data. The syntax is:
-.DS
-.ft CW
-typedef declaration;
-.DE
-The new type name is actually the variable name in the declaration
-part of the typedef.  For example, the following defines a new type
-called "eggbox" using an existing type called "egg":
-.DS
-.ft CW
-typedef egg eggbox[DOZEN];
-.DE
-Variables declared using the new type name have the same type as the
-new type name would have in the typedef, if it was considered a
-variable.  For example, the following two declarations are equivalent
-in declaring the variable "fresheggs":
-.DS
-.ft CW
-eggbox  fresheggs;
-egg     fresheggs[DOZEN];
-.DE
-When a typedef involves a struct, enum, or union definition, there is
-another (preferred) syntax that may be used to define the same type.
-In general, a typedef of the following form:
-.DS
-.ft CW
-typedef <<struct, union, or enum definition>> identifier;
-.DE
-may be converted to the alternative form by removing the "typedef"
-part and placing the identifier after the "struct", "union", or
-"enum" keyword, instead of at the end.  For example, here are the two
-ways to define the type "bool":
-.DS
-.ft CW
-typedef enum {    /* \fIusing typedef\fP */
-	FALSE = 0,
-	TRUE = 1
-	} bool;
-
-enum bool {       /* \fIpreferred alternative\fP */
-	FALSE = 0,
-	TRUE = 1
-	};
-.DE
-The reason this syntax is preferred is one does not have to wait
-until the end of a declaration to figure out the name of the new
-type.
-.NH 2
-\&Optional-data
-.IX XDR "optional data"
-.IX XDR "data, optional"
-.LP
-Optional-data is one kind of union that occurs so frequently that we
-give it a special syntax of its own for declaring it.  It is declared
-as follows:
-.DS
-.ft CW
-type-name *identifier;
-.DE
-This is equivalent to the following union:
-.DS
-.ft CW
-union switch (bool opted) {
-	case TRUE:
-	type-name element;
-	case FALSE:
-	void;
-} identifier;
-.DE
-It is also equivalent to the following variable-length array
-declaration, since the boolean "opted" can be interpreted as the
-length of the array:
-.DS
-.ft CW
-type-name identifier<1>;
-.DE
-Optional-data is not so interesting in itself, but it is very useful
-for describing recursive data-structures such as linked-lists and
-trees.  For example, the following defines a type "stringlist" that
-encodes lists of arbitrary length strings:
-.DS
-.ft CW
-struct *stringlist {
-	string item<>;
-	stringlist next;
-};
-.DE
-It could have been equivalently declared as the following union:
-.DS
-.ft CW
-union stringlist switch (bool opted) {
-	case TRUE:
-		struct {
-			string item<>;
-			stringlist next;
-		} element;
-	case FALSE:
-		void;
-};
-.DE
-or as a variable-length array:
-.DS
-.ft CW
-struct stringlist<1> {
-	string item<>;
-	stringlist next;
-};
-.DE
-Both of these declarations obscure the intention of the stringlist
-type, so the optional-data declaration is preferred over both of
-them.  The optional-data type also has a close correlation to how
-recursive data structures are represented in high-level languages
-such as Pascal or C by use of pointers. In fact, the syntax is the
-same as that of the C language for pointers.
-.NH 2
-\&Areas for Future Enhancement
-.IX XDR futures
-.LP
-The XDR standard lacks representations for bit fields and bitmaps,
-since the standard is based on bytes.  Also missing are packed (or
-binary-coded) decimals.
-.LP
-The intent of the XDR standard was not to describe every kind of data
-that people have ever sent or will ever want to send from machine to
-machine. Rather, it only describes the most commonly used data-types
-of high-level languages such as Pascal or C so that applications
-written in these languages will be able to communicate easily over
-some medium.
-.LP
-One could imagine extensions to XDR that would let it describe almost
-any existing protocol, such as TCP.  The minimum necessary for this
-are support for different block sizes and byte-orders.  The XDR
-discussed here could then be considered the 4-byte big-endian member
-of a larger XDR family.
-.NH 1
-\&Discussion
-.sp 2
-.NH 2
-\&Why a Language for Describing Data?
-.IX XDR language
-.LP
-There are many advantages in using a data-description language such
-as  XDR  versus using  diagrams.   Languages are  more  formal than
-diagrams   and   lead  to less  ambiguous   descriptions  of  data.
-Languages are also easier  to understand and allow  one to think of
-other   issues instead of  the   low-level details of bit-encoding.
-Also,  there is  a close analogy  between the  types  of XDR and  a
-high-level language   such  as C   or    Pascal.   This makes   the
-implementation of XDR encoding and decoding modules an easier task.
-Finally, the language specification itself  is an ASCII string that
-can be passed from  machine to machine  to perform  on-the-fly data
-interpretation.
-.NH 2
-\&Why Only one Byte-Order for an XDR Unit?
-.IX XDR "byte order"
-.LP
-Supporting two byte-orderings requires a higher level protocol for
-determining in which byte-order the data is encoded.  Since XDR is
-not a protocol, this can't be done.  The advantage of this, though,
-is that data in XDR format can be written to a magnetic tape, for
-example, and any machine will be able to interpret it, since no
-higher level protocol is necessary for determining the byte-order.
-.NH 2
-\&Why does XDR use Big-Endian Byte-Order?
-.LP
-Yes, it is unfair, but having only one byte-order means you have to
-be unfair to somebody.  Many architectures, such as the Motorola
-68000 and IBM 370, support the big-endian byte-order.
-.NH 2
-\&Why is the XDR Unit Four Bytes Wide?
-.LP
-There is a tradeoff in choosing the XDR unit size.  Choosing a small
-size such as two makes the encoded data small, but causes alignment
-problems for machines that aren't aligned on these boundaries.  A
-large size such as eight means the data will be aligned on virtually
-every machine, but causes the encoded data to grow too big.  We chose
-four as a compromise.  Four is big enough to support most
-architectures efficiently, except for rare machines such as the
-eight-byte aligned Cray.  Four is also small enough to keep the
-encoded data restricted to a reasonable size.
-.NH 2
-\&Why must Variable-Length Data be Padded with Zeros?
-.IX XDR "variable-length data"
-.LP
-It is desirable that the same data encode into the same thing on all
-machines, so that encoded data can be meaningfully compared or
-checksummed.  Forcing the padded bytes to be zero ensures this.
-.NH 2
-\&Why is there No Explicit Data-Typing?
-.LP
-Data-typing has a relatively high cost for what small advantages it
-may have.  One cost is the expansion of data due to the inserted type
-fields.  Another is the added cost of interpreting these type fields
-and acting accordingly.  And most protocols already know what type
-they expect, so data-typing supplies only redundant information.
-However, one can still get the benefits of data-typing using XDR. One
-way is to encode two things: first a string which is the XDR data
-description of the encoded data, and then the encoded data itself.
-Another way is to assign a value to all the types in XDR, and then
-define a universal type which takes this value as its discriminant
-and for each value, describes the corresponding data type.
-.NH 1
-\&The XDR Language Specification
-.IX XDR language
-.sp 1
-.NH 2
-\&Notational Conventions
-.IX "XDR language" notation
-.LP
-This specification  uses an extended Backus-Naur Form  notation for
-describing the XDR language.   Here is  a brief description  of the
-notation:
-.IP  1.
-The characters
-.I | ,
-.I ( ,
-.I ) ,
-.I [ ,
-.I ] ,
-.I " ,
-and
-.I * 
-are special.
-.IP  2.
-Terminal symbols are  strings of any  characters surrounded by
-double quotes.
-.IP  3.
-Non-terminal symbols are strings of non-special characters.
-.IP  4.
-Alternative items are separated by a vertical bar ("\fI|\fP").
-.IP  5.
-Optional items are enclosed in brackets.
-.IP  6.
-Items are grouped together by enclosing them in parentheses.
-.IP  7.
-A
-.I * 
-following an item means  0 or more  occurrences of that item.
-.LP
-For example,  consider  the  following pattern:
-.DS L
-"a " "very" (", " " very")* [" cold " "and"]  " rainy " ("day" | "night")
-.DE
-.LP
-An infinite  number of  strings match  this pattern. A few  of them
-are:
-.DS
-"a very rainy day"
-"a very, very rainy day"
-"a very cold and  rainy day"
-"a very, very, very cold and  rainy night"
-.DE
-.NH 2
-\&Lexical Notes
-.IP  1.
-Comments begin with '/*' and terminate with '*/'.
-.IP  2.
-White space serves to separate items and is otherwise ignored.
-.IP  3.
-An identifier is a letter followed by  an optional sequence of
-letters, digits or underbar ('_').  The case of identifiers is
-not ignored.
-.IP  4.
-A  constant is  a  sequence  of  one  or  more decimal digits,
-optionally preceded by a minus-sign ('-').
-.NH 2
-\&Syntax Information
-.IX "XDR language" syntax
-.DS
-.ft CW
-declaration:
-	type-specifier identifier
-	| type-specifier identifier "[" value "]"
-	| type-specifier identifier "<" [ value ] ">"
-	| "opaque" identifier "[" value "]"
-	| "opaque" identifier "<" [ value ] ">"
-	| "string" identifier "<" [ value ] ">"
-	| type-specifier "*" identifier
-	| "void"
-.DE
-.DS
-.ft CW
-value:
-	constant
-	| identifier
-
-type-specifier:
-	  [ "unsigned" ] "int"
-	| [ "unsigned" ] "hyper"
-	| "float"
-	| "double"
-	| "bool"
-	| enum-type-spec
-	| struct-type-spec
-	| union-type-spec
-	| identifier
-.DE
-.DS
-.ft CW
-enum-type-spec:
-	"enum" enum-body
-
-enum-body:
-	"{"
-	( identifier "=" value )
-	( "," identifier "=" value )*
-	"}"
-.DE
-.DS
-.ft CW
-struct-type-spec:
-	"struct" struct-body
-
-struct-body:
-	"{"
-	( declaration ";" )
-	( declaration ";" )*
-	"}"
-.DE
-.DS
-.ft CW
-union-type-spec:
-	"union" union-body
-
-union-body:
-	"switch" "(" declaration ")" "{"
-	( "case" value ":" declaration ";" )
-	( "case" value ":" declaration ";" )*
-	[ "default" ":" declaration ";" ]
-	"}"
-
-constant-def:
-	"const" identifier "=" constant ";"
-.DE
-.DS
-.ft CW
-type-def:
-	"typedef" declaration ";"
-	| "enum" identifier enum-body ";"
-	| "struct" identifier struct-body ";"
-	| "union" identifier union-body ";"
-
-definition:
-	type-def
-	| constant-def
-
-specification:
-	definition *
-.DE
-.NH 3
-\&Syntax Notes
-.IX "XDR language" syntax
-.LP
-.IP  1.
-The following are keywords and cannot be used as identifiers:
-"bool", "case", "const", "default", "double", "enum", "float",
-"hyper", "opaque", "string", "struct", "switch", "typedef", "union",
-"unsigned" and "void".
-.IP  2.
-Only unsigned constants may be used as size specifications for
-arrays.  If an identifier is used, it must have been declared
-previously as an unsigned constant in a "const" definition.
-.IP  3.
-Constant and type identifiers within the scope of a specification
-are in the same name space and must be declared uniquely within this
-scope.
-.IP  4.
-Similarly, variable names must  be unique within  the scope  of
-struct and union declarations. Nested struct and union declarations
-create new scopes.
-.IP  5.
-The discriminant of a union must be of a type that evaluates to
-an integer. That is, "int", "unsigned int", "bool", an enumerated
-type or any typedefed type that evaluates to one of these is legal.
-Also, the case values must be one of the legal values of the
-discriminant.  Finally, a case value may not be specified more than
-once within the scope of a union declaration.
-.NH 1
-\&An Example of an XDR Data Description
-.LP
-Here is a short XDR data description of a thing called a "file",
-which might be used to transfer files from one machine to another.
-.ie t .DS
-.el .DS L
-.ft CW
-
-const MAXUSERNAME = 32;     /*\fI max length of a user name \fP*/
-const MAXFILELEN = 65535;   /*\fI max length of a file      \fP*/
-const MAXNAMELEN = 255;     /*\fI max length of a file name \fP*/
-
-.ft I
-/*
- * Types of files:
- */
-.ft CW
-
-enum filekind {
-	TEXT = 0,       /*\fI ascii data \fP*/
-	DATA = 1,       /*\fI raw data   \fP*/
-	EXEC = 2        /*\fI executable \fP*/
-};
-
-.ft I
-/*
- * File information, per kind of file:
- */
-.ft CW
-
-union filetype switch (filekind kind) {
-	case TEXT:
-		void;                           /*\fI no extra information \fP*/
-	case DATA:
-		string creator<MAXNAMELEN>;     /*\fI data creator         \fP*/
-	case EXEC:
-		string interpretor<MAXNAMELEN>; /*\fI program interpretor  \fP*/
-};
-
-.ft I
-/*
- * A complete file:
- */
-.ft CW
-
-struct file {
-	string filename<MAXNAMELEN>; /*\fI name of file \fP*/
-	filetype type;               /*\fI info about file \fP*/
-	string owner<MAXUSERNAME>;   /*\fI owner of file   \fP*/
-	opaque data<MAXFILELEN>;     /*\fI file data       \fP*/
-};
-.DE
-.LP
-Suppose now that there is  a user named  "john" who wants to  store
-his lisp program "sillyprog" that contains just  the data "(quit)".
-His file would be encoded as follows:
-.TS
-box tab (&) ;
-lfI lfI lfI lfI
-rfL rfL rfL l .
-Offset&Hex Bytes&ASCII&Description
-_
-0&00 00 00 09&....&Length of filename = 9
-4&73 69 6c 6c&sill&Filename characters
-8&79 70 72 6f&ypro& ... and more characters ...
-12&67 00 00 00&g...& ... and 3 zero-bytes of fill
-16&00 00 00 02&....&Filekind is EXEC = 2
-20&00 00 00 04&....&Length of interpretor = 4
-24&6c 69 73 70&lisp&Interpretor characters
-28&00 00 00 04&....&Length of owner = 4
-32&6a 6f 68 6e&john&Owner characters
-36&00 00 00 06&....&Length of file data = 6
-40&28 71 75 69&(qui&File data bytes ...
-44&74 29 00 00&t)..& ... and 2 zero-bytes of fill
-.TE
-.NH 1
-\&References
-.LP
-[1]  Brian W. Kernighan & Dennis M. Ritchie, "The C Programming
-Language", Bell Laboratories, Murray Hill, New Jersey, 1978.
-.LP
-[2]  Danny Cohen, "On Holy Wars and a Plea for Peace", IEEE Computer,
-October 1981.
-.LP
-[3]  "IEEE Standard for Binary Floating-Point Arithmetic", ANSI/IEEE
-Standard 754-1985, Institute of Electrical and Electronics
-Engineers, August 1985.
-.LP
-[4]  "Courier: The Remote Procedure Call Protocol", XEROX
-Corporation, XSIS 038112, December 1981.
diff --git a/lib/libc/rpc/README b/lib/libc/rpc/README
deleted file mode 100644
index 45bbd52..0000000
--- a/lib/libc/rpc/README
+++ /dev/null
@@ -1,176 +0,0 @@
-$FreeBSD: src/lib/libc/rpc/README,v 1.2 2001/03/19 12:49:50 alfred Exp $
-
-PLEASE READ THE DISCLAIMER FILE.  DO NOT CALL THE SUN MICROSYSTEMS SUPPORT
-LINE WITH QUESTIONS ON THIS RELEASE.  THEY CANNOT ANSWER QUESTIONS ABOUT THIS
-UNSUPPORTED SOURCE RELEASE.
-
-TIRPCSRC 2.3 29 Aug 1994
-
-This distribution contains SunSoft's implementation of transport-independent
-RPC (TI-RPC), External Data Representation (XDR), and various utilities and
-documentation.  These libraries and programs form the base of Open Network
-Computing (ONC), and are derived directly from the Solaris 2.3 source.
-
-Previous releases of RPC Source based on SunOS 4.x were ported to 4.2BSD and
-used Sockets as the transport interface.  These versions were
-transport-specific RPC (TS-RPC).
-
-TI-RPC is an enhanced version of TS-RPC that requires the UNIX System V
-Transport Layer Interface (TLI) or an equivalent X/Open Transport Interface
-(XTI).  TI-RPC is on-the-wire compatible with the TS-RPC, which is supported
-by almost 70 vendors on all major operating systems.  TS-RPC source code
-(RPCSRC 4.0) remains available from several internet sites.
-
-This release is a native source release, that is, it is compatible for
-building on Solaris 2.3.  This release was built on Solaris 2.3 using SunPro
-SPARCompiler 2.0.1.
-
-Solaris 2.3 is based on System V, Release 4 (SVR4), and while this release
-should be mostly compatible with other SVR4 systems, some Solaris facilities
-that are assumed may not be available.  In particular, this release uses the
-Makefile format supported by SparcCompiler 2.0.1.  Second, the Secure RPC
-routines use the Solaris Name Service Switch to access public-key credential
-databases.  This code will need to be ported if your system does not support
-the Name Service Switch.  Finally, this release uses the synchronization
-interfaces of UI Threads to make certain interfaces thread-safe.  These
-interfaces are found in libthread in Solaris 2.3 and later.
-
-Applications linked with this release's librpc must link with the United
-States domestic version of libcrypt in order to resolve the cbc_crypt() and
-ecb_crypt() functions.  These routines are used with Secure RPC however all
-RPC programs that link with this release's librpc will need to link with the
-domestic libcrypt.  Note that the Solaris 2.3 Encryption Kit is only available
-within the United States.  (PLEASE NOTE: The RPC implementation found in
-Solaris 2.3's libnsl does *not* have this requirement; linking with libcrypt
-is only a requirement for the TIRPCSRC 2.3 version of librpc.)
-
-
-DOCUMENTATION NOTE
-
-The documentation found in the doc directory are derived from the Solaris 2.3
-Network Interfaces Programming Guide.  A small number of compile examples are
-given, and these use libnsl to link in the RPC library.  This release builds
-the RPC library as librpc.  To use this release's librpc, use the link command
-"-lrpc -lnsl -lcrypt".  This links the application with TIRPCSRC 2.3's librpc
-for RPC routines, Solaris's libnsl for other networking functions, and
-libcrypt for the cbc_crypt() and ecb_crypt functions.
-
-
-WHY IS THIS RELEASE BEING DONE?
-
-This release is being distributed to make the Sun implementation of the ONC
-technologies available for reference and porting to non-Solaris platforms.
-The current release is a native source distribution, and provides services
-that are already available on Solaris 2.3 (such as the RPC headers, the RPC
-library in libnsl, rpcbind, rpcinfo, etc.).  It is not our intention to
-replace these services.  See the DISCLAIMER for further information about the
-legal status of this release.
-
-
-WHAT'S NEW IN THIS RELEASE: TIRPCSRC 2.3
-
-The previous release was TIRPCSRC 2.0.
-
-1.      This release is based on Solaris 2.3.  The previous release was
-	based on Solaris 2.0.  This release contains a siginificant number of
-	bug fixes and other enhancements over TIRPCSRC 2.0.
-
-2.      The RPC library is thread safe for all client-side interfaces
-	(clnt_create, clnt_call, etc.).  The server-side interfaces
-	(svc_create, svc_run, etc.) are not thread safe in this release. The
-	server-side interfaces will be made thread safe in the next release of
-	TIRPCSRC.  Please see the manual pages for details about which
-	interfaces are thread safe.
-
-3.      As part of the work to make the RPC library thread-safe, rpcgen has
-	been enhanced to generate thread-safe RPC stubs (the -M option).  Note
-	that this modifies the call-signature for the stub functions; the
-	procedure calling the RPC stub must now pass to the stub a pointer to
-	an allocated structure where results will be placed by the stub.  See
-	the rpcgen manual page and the rpcgen Programming Guide for details.
-
-4.      The Remote Asynchronous Calls (RAC) library is now included.  RAC was
-	first introduced in TIRPCSRC 1.0, and was bundled with librpc.  It is
-	now a separate library.  The asynchronous call model that RAC provides
-	can be achieved by using threads for making client-side RPC calls.
-	The ONC Technology group recommends using threads (where possible) to
-	achieve asynchrony rather than RAC.  See the rpc_rac(3n) manual page
-	for details.
-
-
-ROADMAP
-
-The directory hierarchy is as follows:
-
-    cmd/        Utilities
-    cmd/rpcgen      The RPC Language compiler (for .x files)
-    cmd/rpcbind     The RPC bindery and portmapper
-    cmd/rpcinfo     RPC bindery query utility
-    cmd/keyserv     The Secure RPC keyserver
-    cmd/demo        Some simple ONC demo services
-
-    doc/        Postscript versions of ONC documentation
-
-    head/       Header files
-    head/rpcsvc     RPCL (.x) specifications for various ONC services, and
-                    header files.
-
-    lib/        Libraries
-    lib/librpc      The RPC and XDR library
-    lib/librac      The Remote Asynchronous Calls (RAC) library
-
-    man/        Manual pages for the RPC library and utilities.
-
-    uts/common/rpc      RPC header files
-
-
-
-BUILD INSTRUCTIONS
-
-Prior to building the release, you must define the SRC environment variable
-to be the path to the top-level Makefile.  For example, if /usr/src/tirpcsrc
-is where to top-level Makefile is located, execute this command prior to
-building the release:
-
-        setenv SRC /usr/src/tirpcsrc        (csh)
-or
-        SRC=/usr/src/tirpcsrc; export SRC   (sh)
-
-The sources in the lib directory depend on header files installed from head
-and uts/common/rpc, and the programs in the cmd directory depend on libraries
-from lib.  Therefore, you should do a "make install" to build the release.
-
-The top-level Makefile builds the release.  The "ROOT" macro defines where the
-headers and libraries are installed.  The default for ROOT is "/proto".  You
-may change this by either modifiying Makefile.master, or issuing the build
-command with a new definition for ROOT:
-
-        make install ROOT=/opt/onc
-
-You will of course need write privileges for the destination directory.
-The headers, libraries and executables will be built and installed under the
-ROOT.
-
-
-The demonstration services in the demo directory are not built by the
-top-level "make install" command.  To build these, cd to the cmd/demo
-directory and enter "make".  The four services will be built.
-RPCGEN MUST BE INSTALLED in a path that make can find.  To run the
-services, rpcbind must be running, then invoke the service
-(you probably will want to put it in the background).  rpcinfo can be
-used to check that the service succeeded in getting registered with
-rpcbind, and to ping the service (see rpcinfo's man page).  You can
-then use the corresponding client program to exercise the service.
-
-
-BUILDING ONC APPLICATIONS
-
-See the Makefiles in the demonstration services for examples of building
-ONC applications with this release.  The $(ROOT)/usr/include directory
-must be included in the compiler header file search path (-I), and the
-$(ROOT)/usr/lib directory must be included in the linker library file search
-path (-L).  Also, to run executables built dynamically, the shared library
-search path (LD_LIBRARY_PATH) must also include $(ROOT)/usr/lib.  In addition
-to linking in this release's librpc (via -lrpc), you must also link with
-Solaris's libnsl (-lnsl) and the US domestic version of libcrypt (-lcrypt).
-
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
deleted file mode 100644
index ccaf422..0000000
--- a/lib/libc/rpc/auth_des.c
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1988 by Sun Microsystems, Inc.
- */
-/*
- * auth_des.c, client-side implementation of DES authentication
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <err.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/cdefs.h>
-#include <rpc/des_crypt.h>
-#include <syslog.h>
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/auth_des.h>
-#include <rpc/clnt.h>
-#include <rpc/xdr.h>
-#include <sys/socket.h>
-#undef NIS
-#include <rpcsvc/nis.h>
-#include "un-namespace.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = 	"@(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_des.c,v 1.9 2004/10/16 06:11:34 obrien Exp $");
-
-#define USEC_PER_SEC		1000000
-#define RTIME_TIMEOUT		5	/* seconds to wait for sync */
-
-#define AUTH_PRIVATE(auth)	(struct ad_private *) auth->ah_private
-#define ALLOC(object_type)	(object_type *) mem_alloc(sizeof(object_type))
-#define FREE(ptr, size)		mem_free((char *)(ptr), (int) size)
-#define ATTEMPT(xdr_op)		if (!(xdr_op)) return (FALSE)
-
-extern bool_t xdr_authdes_cred( XDR *, struct authdes_cred *);
-extern bool_t xdr_authdes_verf( XDR *, struct authdes_verf *);
-extern int key_encryptsession_pk();
-
-extern bool_t __rpc_get_time_offset(struct timeval *, nis_server *, char *,
-	char **, char **);
-
-/* 
- * DES authenticator operations vector
- */
-static void	authdes_nextverf(AUTH *);
-static bool_t	authdes_marshal(AUTH *, XDR *);
-static bool_t	authdes_validate(AUTH *, struct opaque_auth *);
-static bool_t	authdes_refresh(AUTH *, void *);
-static void	authdes_destroy(AUTH *);
-
-static struct auth_ops *authdes_ops(void);
-
-/*
- * This struct is pointed to by the ah_private field of an "AUTH *"
- */
-struct ad_private {
-	char *ad_fullname; 		/* client's full name */
-	u_int ad_fullnamelen;		/* length of name, rounded up */
-	char *ad_servername; 		/* server's full name */
-	u_int ad_servernamelen;		/* length of name, rounded up */
-	u_int ad_window;	  	/* client specified window */
-	bool_t ad_dosync;		/* synchronize? */		
-	struct netbuf ad_syncaddr;	/* remote host to synch with */
-	char *ad_timehost;		/* remote host to synch with */
-	struct timeval ad_timediff;	/* server's time - client's time */
-	u_int ad_nickname;		/* server's nickname for client */
-	struct authdes_cred ad_cred;	/* storage for credential */
-	struct authdes_verf ad_verf;	/* storage for verifier */
-	struct timeval ad_timestamp;	/* timestamp sent */
-	des_block ad_xkey;		/* encrypted conversation key */
-	u_char ad_pkey[1024];		/* Server's actual public key */
-	char *ad_netid;			/* Timehost netid */
-	char *ad_uaddr;			/* Timehost uaddr */
-	nis_server *ad_nis_srvr;	/* NIS+ server struct */
-};
-
-AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *,
-	const des_block *, nis_server *);
-	
-/*
- * documented version of authdes_seccreate
- */
-/*
-	servername:	network name of server
-	win:		time to live
-	timehost:	optional hostname to sync with
-	ckey:		optional conversation key to use
-*/
-
-AUTH *
-authdes_seccreate(const char *servername, const u_int win,
-	const char *timehost, const des_block *ckey)
-{
-	u_char  pkey_data[1024];
-	netobj  pkey;
-	AUTH    *dummy;
-
-	if (! getpublickey(servername, (char *) pkey_data)) {
-		syslog(LOG_ERR,
-		    "authdes_seccreate: no public key found for %s",
-		    servername);
-		return (NULL);
-	}
-
-	pkey.n_bytes = (char *) pkey_data;
-	pkey.n_len = (u_int)strlen((char *)pkey_data) + 1;
-	dummy = authdes_pk_seccreate(servername, &pkey, win, timehost,
-	    ckey, NULL);
-	return (dummy);
-}
-
-/*
- * Slightly modified version of authdessec_create which takes the public key
- * of the server principal as an argument. This spares us a call to
- * getpublickey() which in the nameserver context can cause a deadlock.
- */
-AUTH *
-authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window,
-	const char *timehost, const des_block *ckey, nis_server *srvr)
-{
-	AUTH *auth;
-	struct ad_private *ad;
-	char namebuf[MAXNETNAMELEN+1];
-
-	/*
-	 * Allocate everything now
-	 */
-	auth = ALLOC(AUTH);
-	if (auth == NULL) {
-		syslog(LOG_ERR, "authdes_pk_seccreate: out of memory");
-		return (NULL);
-	}
-	ad = ALLOC(struct ad_private);
-	if (ad == NULL) {
-		syslog(LOG_ERR, "authdes_pk_seccreate: out of memory");
-		goto failed;
-	}
-	ad->ad_fullname = ad->ad_servername = NULL; /* Sanity reasons */
-	ad->ad_timehost = NULL;
-	ad->ad_netid = NULL;
-	ad->ad_uaddr = NULL;
-	ad->ad_nis_srvr = NULL;
-	ad->ad_timediff.tv_sec = 0;
-	ad->ad_timediff.tv_usec = 0;
-	memcpy(ad->ad_pkey, pkey->n_bytes, pkey->n_len);
-	if (!getnetname(namebuf))
-		goto failed;
-	ad->ad_fullnamelen = RNDUP((u_int) strlen(namebuf));
-	ad->ad_fullname = (char *)mem_alloc(ad->ad_fullnamelen + 1);
-	ad->ad_servernamelen = strlen(servername);
-	ad->ad_servername = (char *)mem_alloc(ad->ad_servernamelen + 1);
-
-	if (ad->ad_fullname == NULL || ad->ad_servername == NULL) {
-		syslog(LOG_ERR, "authdes_seccreate: out of memory");
-		goto failed;
-	}
-	if (timehost != NULL) {
-		ad->ad_timehost = (char *)mem_alloc(strlen(timehost) + 1);
-		if (ad->ad_timehost == NULL) {
-			syslog(LOG_ERR, "authdes_seccreate: out of memory");
-			goto failed;
-		}
-		memcpy(ad->ad_timehost, timehost, strlen(timehost) + 1);
-		ad->ad_dosync = TRUE;
-	} else if (srvr != NULL) {
-		ad->ad_nis_srvr = srvr;	/* transient */
-		ad->ad_dosync = TRUE;
-	} else {
-		ad->ad_dosync = FALSE;
-	}
-	memcpy(ad->ad_fullname, namebuf, ad->ad_fullnamelen + 1);
-	memcpy(ad->ad_servername, servername, ad->ad_servernamelen + 1);
-	ad->ad_window = window;
-	if (ckey == NULL) {
-		if (key_gendes(&auth->ah_key) < 0) {
-			syslog(LOG_ERR,
-	    "authdes_seccreate: keyserv(1m) is unable to generate session key");
-			goto failed;
-		}
-	} else {
-		auth->ah_key = *ckey;
-	}
-
-	/*
-	 * Set up auth handle
-	 */
-	auth->ah_cred.oa_flavor = AUTH_DES;
-	auth->ah_verf.oa_flavor = AUTH_DES;
-	auth->ah_ops = authdes_ops();
-	auth->ah_private = (caddr_t)ad;
-
-	if (!authdes_refresh(auth, NULL)) {
-		goto failed;
-	}
-	ad->ad_nis_srvr = NULL; /* not needed any longer */
-	return (auth);
-
-failed:
-	if (auth)
-		FREE(auth, sizeof (AUTH));
-	if (ad) {
-		if (ad->ad_fullname)
-			FREE(ad->ad_fullname, ad->ad_fullnamelen + 1);
-		if (ad->ad_servername)
-			FREE(ad->ad_servername, ad->ad_servernamelen + 1);
-		if (ad->ad_timehost)
-			FREE(ad->ad_timehost, strlen(ad->ad_timehost) + 1);
-		if (ad->ad_netid)
-			FREE(ad->ad_netid, strlen(ad->ad_netid) + 1);
-		if (ad->ad_uaddr)
-			FREE(ad->ad_uaddr, strlen(ad->ad_uaddr) + 1);
-		FREE(ad, sizeof (struct ad_private));
-	}
-	return (NULL);
-}
-
-/*
- * Implement the five authentication operations
- */
-
-
-/*
- * 1. Next Verifier
- */	
-/*ARGSUSED*/
-static void
-authdes_nextverf(AUTH *auth)
-{
-	/* what the heck am I supposed to do??? */
-}
-
-
-/*
- * 2. Marshal
- */
-static bool_t
-authdes_marshal(AUTH *auth, XDR *xdrs)
-{
-/* LINTED pointer alignment */
-	struct ad_private *ad = AUTH_PRIVATE(auth);
-	struct authdes_cred *cred = &ad->ad_cred;
-	struct authdes_verf *verf = &ad->ad_verf;
-	des_block cryptbuf[2];	
-	des_block ivec;
-	int status;
-	int len;
-	rpc_inline_t *ixdr;
-
-	/*
-	 * Figure out the "time", accounting for any time difference
-	 * with the server if necessary.
-	 */
-	(void) gettimeofday(&ad->ad_timestamp, (struct timezone *)NULL);
-	ad->ad_timestamp.tv_sec += ad->ad_timediff.tv_sec;
-	ad->ad_timestamp.tv_usec += ad->ad_timediff.tv_usec;
-	while (ad->ad_timestamp.tv_usec >= USEC_PER_SEC) {
-		ad->ad_timestamp.tv_usec -= USEC_PER_SEC;
-		ad->ad_timestamp.tv_sec++;
-	}
-
-	/*
-	 * XDR the timestamp and possibly some other things, then
-	 * encrypt them.
-	 */
-	ixdr = (rpc_inline_t *)cryptbuf;
-	IXDR_PUT_INT32(ixdr, ad->ad_timestamp.tv_sec);
-	IXDR_PUT_INT32(ixdr, ad->ad_timestamp.tv_usec);
-	if (ad->ad_cred.adc_namekind == ADN_FULLNAME) {
-		IXDR_PUT_U_INT32(ixdr, ad->ad_window);
-		IXDR_PUT_U_INT32(ixdr, ad->ad_window - 1);
-		ivec.key.high = ivec.key.low = 0;	
-		status = cbc_crypt((char *)&auth->ah_key, (char *)cryptbuf, 
-			(u_int) 2 * sizeof (des_block),
-			DES_ENCRYPT | DES_HW, (char *)&ivec);
-	} else {
-		status = ecb_crypt((char *)&auth->ah_key, (char *)cryptbuf, 
-			(u_int) sizeof (des_block),
-			DES_ENCRYPT | DES_HW);
-	}
-	if (DES_FAILED(status)) {
-		syslog(LOG_ERR, "authdes_marshal: DES encryption failure");
-		return (FALSE);
-	}
-	ad->ad_verf.adv_xtimestamp = cryptbuf[0];
-	if (ad->ad_cred.adc_namekind == ADN_FULLNAME) {
-		ad->ad_cred.adc_fullname.window = cryptbuf[1].key.high;
-		ad->ad_verf.adv_winverf = cryptbuf[1].key.low;
-	} else {
-		ad->ad_cred.adc_nickname = ad->ad_nickname;
-		ad->ad_verf.adv_winverf = 0;
-	}
-
-	/*
-	 * Serialize the credential and verifier into opaque
-	 * authentication data.
-	 */
-	if (ad->ad_cred.adc_namekind == ADN_FULLNAME) {
-		len = ((1 + 1 + 2 + 1)*BYTES_PER_XDR_UNIT + ad->ad_fullnamelen);
-	} else {
-		len = (1 + 1)*BYTES_PER_XDR_UNIT;
-	}
-
-	if ((ixdr = xdr_inline(xdrs, 2*BYTES_PER_XDR_UNIT))) {
-		IXDR_PUT_INT32(ixdr, AUTH_DES);
-		IXDR_PUT_INT32(ixdr, len);
-	} else {
-		ATTEMPT(xdr_putint32(xdrs, (int *)&auth->ah_cred.oa_flavor));
-		ATTEMPT(xdr_putint32(xdrs, &len));
-	}
-	ATTEMPT(xdr_authdes_cred(xdrs, cred));
-
-	len = (2 + 1)*BYTES_PER_XDR_UNIT; 
-	if ((ixdr = xdr_inline(xdrs, 2*BYTES_PER_XDR_UNIT))) {
-		IXDR_PUT_INT32(ixdr, AUTH_DES);
-		IXDR_PUT_INT32(ixdr, len);
-	} else {
-		ATTEMPT(xdr_putint32(xdrs, (int *)&auth->ah_verf.oa_flavor));
-		ATTEMPT(xdr_putint32(xdrs, &len));
-	}
-	ATTEMPT(xdr_authdes_verf(xdrs, verf));
-	return (TRUE);
-}
-
-
-/*
- * 3. Validate
- */
-static bool_t
-authdes_validate(AUTH *auth, struct opaque_auth *rverf)
-{
-/* LINTED pointer alignment */
-	struct ad_private *ad = AUTH_PRIVATE(auth);
-	struct authdes_verf verf;
-	int status;
-	uint32_t *ixdr;
-	des_block buf;
-
-	if (rverf->oa_length != (2 + 1) * BYTES_PER_XDR_UNIT) {
-		return (FALSE);
-	}
-/* LINTED pointer alignment */
-	ixdr = (uint32_t *)rverf->oa_base;
-	buf.key.high = (uint32_t)*ixdr++;
-	buf.key.low = (uint32_t)*ixdr++;
-	verf.adv_int_u = (uint32_t)*ixdr++;
-
-	/*
-	 * Decrypt the timestamp
-	 */
-	status = ecb_crypt((char *)&auth->ah_key, (char *)&buf,
-		(u_int)sizeof (des_block), DES_DECRYPT | DES_HW);
-
-	if (DES_FAILED(status)) {
-		syslog(LOG_ERR, "authdes_validate: DES decryption failure");
-		return (FALSE);
-	}
-
-	/*
-	 * xdr the decrypted timestamp
-	 */
-/* LINTED pointer alignment */
-	ixdr = (uint32_t *)buf.c;
-	verf.adv_timestamp.tv_sec = IXDR_GET_INT32(ixdr) + 1;
-	verf.adv_timestamp.tv_usec = IXDR_GET_INT32(ixdr);
-
-	/*
-	 * validate
-	 */
-	if (bcmp((char *)&ad->ad_timestamp, (char *)&verf.adv_timestamp,
-		 sizeof(struct timeval)) != 0) {
-		syslog(LOG_DEBUG, "authdes_validate: verifier mismatch");
-		return (FALSE);
-	}
-
-	/*
-	 * We have a nickname now, let's use it
-	 */
-	ad->ad_nickname = verf.adv_nickname;
-	ad->ad_cred.adc_namekind = ADN_NICKNAME;
-	return (TRUE);
-}
-
-/*
- * 4. Refresh
- */
-/*ARGSUSED*/
-static bool_t
-authdes_refresh(AUTH *auth, void *dummy)
-{
-/* LINTED pointer alignment */
-	struct ad_private *ad = AUTH_PRIVATE(auth);
-	struct authdes_cred *cred = &ad->ad_cred;
-	int		ok;
-	netobj		pkey;
-
-	if (ad->ad_dosync) {
-                ok = __rpc_get_time_offset(&ad->ad_timediff, ad->ad_nis_srvr,
-		    ad->ad_timehost, &(ad->ad_uaddr),
-		    &(ad->ad_netid));
-		if (! ok) {
-			/*
-			 * Hope the clocks are synced!
-			 */
-			ad->ad_dosync = 0;
-			syslog(LOG_DEBUG,
-			    "authdes_refresh: unable to synchronize clock");
-		 }
-	}
-	ad->ad_xkey = auth->ah_key;
-	pkey.n_bytes = (char *)(ad->ad_pkey);
-	pkey.n_len = (u_int)strlen((char *)ad->ad_pkey) + 1;
-	if (key_encryptsession_pk(ad->ad_servername, &pkey, &ad->ad_xkey) < 0) {
-		syslog(LOG_INFO,
-		    "authdes_refresh: keyserv(1m) is unable to encrypt session key");
-		return (FALSE);
-	}
-	cred->adc_fullname.key = ad->ad_xkey;
-	cred->adc_namekind = ADN_FULLNAME;
-	cred->adc_fullname.name = ad->ad_fullname;
-	return (TRUE);
-}
-
-
-/*
- * 5. Destroy
- */
-static void
-authdes_destroy(AUTH *auth)
-{
-/* LINTED pointer alignment */
-	struct ad_private *ad = AUTH_PRIVATE(auth);
-
-	FREE(ad->ad_fullname, ad->ad_fullnamelen + 1);
-	FREE(ad->ad_servername, ad->ad_servernamelen + 1);
-	if (ad->ad_timehost)
-		FREE(ad->ad_timehost, strlen(ad->ad_timehost) + 1);
-	if (ad->ad_netid)
-		FREE(ad->ad_netid, strlen(ad->ad_netid) + 1);
-	if (ad->ad_uaddr)
-		FREE(ad->ad_uaddr, strlen(ad->ad_uaddr) + 1);
-	FREE(ad, sizeof (struct ad_private));
-	FREE(auth, sizeof(AUTH));
-}
-
-static struct auth_ops *
-authdes_ops(void)
-{
-	static struct auth_ops ops;
-	extern mutex_t authdes_ops_lock;
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
- 
-	mutex_lock(&authdes_ops_lock);
-	if (ops.ah_nextverf == NULL) {
-		ops.ah_nextverf = authdes_nextverf;
-		ops.ah_marshal = authdes_marshal;
-		ops.ah_validate = authdes_validate;
-		ops.ah_refresh = authdes_refresh;
-		ops.ah_destroy = authdes_destroy;
-        }
-	mutex_unlock(&authdes_ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
deleted file mode 100644
index b8704ba..0000000
--- a/lib/libc/rpc/auth_none.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*	$NetBSD: auth_none.c,v 1.13 2000/01/22 22:19:17 mycroft Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_none.c,v 1.13 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * auth_none.c
- * Creates a client authentication handle for passing "null"
- * credentials and verifiers to remote systems.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include "un-namespace.h"
-
-#define MAX_MARSHAL_SIZE 20
-
-/*
- * Authenticator operations routines
- */
-
-static bool_t authnone_marshal (AUTH *, XDR *);
-static void authnone_verf (AUTH *);
-static bool_t authnone_validate (AUTH *, struct opaque_auth *);
-static bool_t authnone_refresh (AUTH *, void *);
-static void authnone_destroy (AUTH *);
-
-extern bool_t xdr_opaque_auth();
-
-static struct auth_ops *authnone_ops();
-
-static struct authnone_private {
-	AUTH	no_client;
-	char	marshalled_client[MAX_MARSHAL_SIZE];
-	u_int	mcnt;
-} *authnone_private;
-
-AUTH *
-authnone_create()
-{
-	struct authnone_private *ap = authnone_private;
-	XDR xdr_stream;
-	XDR *xdrs;
-	extern mutex_t authnone_lock;
-
-	mutex_lock(&authnone_lock);
-	if (ap == 0) {
-		ap = (struct authnone_private *)calloc(1, sizeof (*ap));
-		if (ap == 0) {
-			mutex_unlock(&authnone_lock);
-			return (0);
-		}
-		authnone_private = ap;
-	}
-	if (!ap->mcnt) {
-		ap->no_client.ah_cred = ap->no_client.ah_verf = _null_auth;
-		ap->no_client.ah_ops = authnone_ops();
-		xdrs = &xdr_stream;
-		xdrmem_create(xdrs, ap->marshalled_client,
-		    (u_int)MAX_MARSHAL_SIZE, XDR_ENCODE);
-		(void)xdr_opaque_auth(xdrs, &ap->no_client.ah_cred);
-		(void)xdr_opaque_auth(xdrs, &ap->no_client.ah_verf);
-		ap->mcnt = XDR_GETPOS(xdrs);
-		XDR_DESTROY(xdrs);
-	}
-	mutex_unlock(&authnone_lock);
-	return (&ap->no_client);
-}
-
-/*ARGSUSED*/
-static bool_t
-authnone_marshal(AUTH *client, XDR *xdrs)
-{
-	struct authnone_private *ap;
-	bool_t dummy;
-	extern mutex_t authnone_lock;
-
-	assert(xdrs != NULL);
-
-	ap = authnone_private;
-	if (ap == NULL) {
-		mutex_unlock(&authnone_lock);
-		return (FALSE);
-	}
-	dummy = (*xdrs->x_ops->x_putbytes)(xdrs,
-	    ap->marshalled_client, ap->mcnt);
-	mutex_unlock(&authnone_lock);
-	return (dummy);
-}
-
-/* All these unused parameters are required to keep ANSI-C from grumbling */
-/*ARGSUSED*/
-static void
-authnone_verf(AUTH *client)
-{
-}
-
-/*ARGSUSED*/
-static bool_t
-authnone_validate(AUTH *client, struct opaque_auth *opaque)
-{
-
-	return (TRUE);
-}
-
-/*ARGSUSED*/
-static bool_t
-authnone_refresh(AUTH *client, void *dummy)
-{
-
-	return (FALSE);
-}
-
-/*ARGSUSED*/
-static void
-authnone_destroy(AUTH *client)
-{
-}
-
-static struct auth_ops *
-authnone_ops()
-{
-	static struct auth_ops ops;
-	extern mutex_t ops_lock;
- 
-/* VARIABLES PROTECTED BY ops_lock: ops */
- 
-	mutex_lock(&ops_lock);
-	if (ops.ah_nextverf == NULL) {
-		ops.ah_nextverf = authnone_verf;
-		ops.ah_marshal = authnone_marshal;
-		ops.ah_validate = authnone_validate;
-		ops.ah_refresh = authnone_refresh;
-		ops.ah_destroy = authnone_destroy;
-	}
-	mutex_unlock(&ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc/rpc/auth_time.c b/lib/libc/rpc/auth_time.c
deleted file mode 100644
index a663917..0000000
--- a/lib/libc/rpc/auth_time.c
+++ /dev/null
@@ -1,498 +0,0 @@
-/* #pragma ident	"@(#)auth_time.c	1.4	92/11/10 SMI" */
-
-/*
- *	auth_time.c
- *
- * This module contains the private function __rpc_get_time_offset()
- * which will return the difference in seconds between the local system's
- * notion of time and a remote server's notion of time. This must be
- * possible without calling any functions that may invoke the name
- * service. (netdir_getbyxxx, getXbyY, etc). The function is used in the
- * synchronize call of the authdes code to synchronize clocks between
- * NIS+ clients and their servers.
- *
- * Note to minimize the amount of duplicate code, portions of the
- * synchronize() function were folded into this code, and the synchronize
- * call becomes simply a wrapper around this function. Further, if this
- * function is called with a timehost it *DOES* recurse to the name
- * server so don't use it in that mode if you are doing name service code.
- *
- *	Copyright (c) 1992 Sun Microsystems Inc.
- *	All rights reserved.
- *
- * Side effects :
- *	When called a client handle to a RPCBIND process is created
- *	and destroyed. Two strings "netid" and "uaddr" are malloc'd
- *	and returned. The SIGALRM processing is modified only if
- *	needed to deal with TCP connections.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_time.c,v 1.11 2005/03/10 00:57:01 stefanf Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <sys/signal.h>
-#include <sys/errno.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <rpc/rpc.h>
-#include <rpc/rpc_com.h>
-#include <rpc/rpcb_prot.h>
-#undef NIS
-#include <rpcsvc/nis.h>
-#include "un-namespace.h"
-
-extern int _rpc_dtablesize( void );
-
-#ifdef TESTING
-#define	msg(x)	printf("ERROR: %s\n", x)
-/* #define msg(x) syslog(LOG_ERR, "%s", x) */
-#else
-#define	msg(x)
-#endif
-
-static int saw_alarm = 0;
-
-static void
-alarm_hndler(s)
-	int	s;
-{
-	saw_alarm = 1;
-	return;
-}
-
-/*
- * The internet time server defines the epoch to be Jan 1, 1900
- * whereas UNIX defines it to be Jan 1, 1970. To adjust the result
- * from internet time-service time, into UNIX time we subtract the
- * following offset :
- */
-#define	NYEARS	(1970 - 1900)
-#define	TOFFSET ((u_long)60*60*24*(365*NYEARS + (NYEARS/4)))
-
-
-/*
- * Stolen from rpc.nisd:
- * Turn a 'universal address' into a struct sockaddr_in.
- * Bletch.
- */
-static int uaddr_to_sockaddr(uaddr, sin)
-#ifdef foo
-	endpoint		*endpt;
-#endif
-	char			*uaddr;
-	struct sockaddr_in	*sin;
-{
-	unsigned char		p_bytes[2];
-	int			i;
-	unsigned long		a[6];
-
-	i = sscanf(uaddr, "%lu.%lu.%lu.%lu.%lu.%lu", &a[0], &a[1], &a[2],
-						&a[3], &a[4], &a[5]);
-
-	if (i < 6)
-		return(1);
-
-	for (i = 0; i < 4; i++)
-		sin->sin_addr.s_addr |= (a[i] & 0x000000FF) << (8 * i);
-
-	p_bytes[0] = (unsigned char)a[4] & 0x000000FF;
-	p_bytes[1] = (unsigned char)a[5] & 0x000000FF;
-
-	sin->sin_family = AF_INET; /* always */
-	bcopy((char *)&p_bytes, (char *)&sin->sin_port, 2);
-
-	return (0);
-}
-
-/*
- * free_eps()
- *
- * Free the strings that were strduped into the eps structure.
- */
-static void
-free_eps(eps, num)
-	endpoint	eps[];
-	int		num;
-{
-	int		i;
-
-	for (i = 0; i < num; i++) {
-		free(eps[i].uaddr);
-		free(eps[i].proto);
-		free(eps[i].family);
-	}
-	return;
-}
-
-/*
- * get_server()
- *
- * This function constructs a nis_server structure description for the
- * indicated hostname.
- *
- * NOTE: There is a chance we may end up recursing here due to the
- * fact that gethostbyname() could do an NIS search. Ideally, the
- * NIS+ server will call __rpc_get_time_offset() with the nis_server
- * structure already populated.
- */
-static nis_server *
-get_server(sin, host, srv, eps, maxep)
-	struct sockaddr_in *sin;
-	char		*host;	/* name of the time host	*/
-	nis_server	*srv;	/* nis_server struct to use.	*/
-	endpoint	eps[];	/* array of endpoints		*/
-	int		maxep;	/* max array size		*/
-{
-	char			hname[256];
-	int			num_ep = 0, i;
-	struct hostent		*he;
-	struct hostent		dummy;
-	char			*ptr[2];
-
-	if (host == NULL && sin == NULL)
-		return (NULL);
-
-	if (sin == NULL) {
-		he = gethostbyname(host);
-		if (he == NULL)
-			return(NULL);
-	} else {
-		he = &dummy;
-		ptr[0] = (char *)&sin->sin_addr.s_addr;
-		ptr[1] = NULL;
-		dummy.h_addr_list = ptr;
-	}
-
-	/*
-	 * This is lame. We go around once for TCP, then again
-	 * for UDP.
-	 */
-	for (i = 0; (he->h_addr_list[i] != NULL) && (num_ep < maxep);
-						i++, num_ep++) {
-		struct in_addr *a;
-
-		a = (struct in_addr *)he->h_addr_list[i];
-		snprintf(hname, sizeof(hname), "%s.0.111", inet_ntoa(*a));
-		eps[num_ep].uaddr = strdup(hname);
-		eps[num_ep].family = strdup("inet");
-		eps[num_ep].proto =  strdup("tcp");
-	}
-
-	for (i = 0; (he->h_addr_list[i] != NULL) && (num_ep < maxep);
-						i++, num_ep++) {
-		struct in_addr *a;
-
-		a = (struct in_addr *)he->h_addr_list[i];
-		snprintf(hname, sizeof(hname), "%s.0.111", inet_ntoa(*a));
-		eps[num_ep].uaddr = strdup(hname);
-		eps[num_ep].family = strdup("inet");
-		eps[num_ep].proto =  strdup("udp");
-	}
-
-	srv->name = (nis_name) host;
-	srv->ep.ep_len = num_ep;
-	srv->ep.ep_val = eps;
-	srv->key_type = NIS_PK_NONE;
-	srv->pkey.n_bytes = NULL;
-	srv->pkey.n_len = 0;
-	return (srv);
-}
-
-/*
- * __rpc_get_time_offset()
- *
- * This function uses a nis_server structure to contact the a remote
- * machine (as named in that structure) and returns the offset in time
- * between that machine and this one. This offset is returned in seconds
- * and may be positive or negative.
- *
- * The first time through, a lot of fiddling is done with the netconfig
- * stuff to find a suitable transport. The function is very aggressive
- * about choosing UDP or at worst TCP if it can. This is because
- * those transports support both the RCPBIND call and the internet
- * time service.
- *
- * Once through, *uaddr is set to the universal address of
- * the machine and *netid is set to the local netid for the transport
- * that uaddr goes with. On the second call, the netconfig stuff
- * is skipped and the uaddr/netid pair are used to fetch the netconfig
- * structure and to then contact the machine for the time.
- *
- * td = "server" - "client"
- */
-int
-__rpc_get_time_offset(td, srv, thost, uaddr, netid)
-	struct timeval	*td;	 /* Time difference			*/
-	nis_server	*srv;	 /* NIS Server description 		*/
-	char		*thost;	 /* if no server, this is the timehost	*/
-	char		**uaddr; /* known universal address		*/
-	struct sockaddr_in *netid; /* known network identifier		*/
-{
-	CLIENT			*clnt; 		/* Client handle 	*/
-	endpoint		*ep,		/* useful endpoints	*/
-				*useep = NULL;	/* endpoint of xp	*/
-	char			*useua = NULL;	/* uaddr of selected xp	*/
-	int			epl, i;		/* counters		*/
-	enum clnt_stat		status;		/* result of clnt_call	*/
-	u_long			thetime, delta;
-	int			needfree = 0;
-	struct timeval		tv;
-	int			time_valid;
-	int			udp_ep = -1, tcp_ep = -1;
-	int			a1, a2, a3, a4;
-	char			ut[64], ipuaddr[64];
-	endpoint		teps[32];
-	nis_server		tsrv;
-	void			(*oldsig)() = NULL; /* old alarm handler */
-	struct sockaddr_in	sin;
-	socklen_t		len;
-	int			s = RPC_ANYSOCK;
-	int			type = 0;
-
-	td->tv_sec = 0;
-	td->tv_usec = 0;
-
-	/*
-	 * First check to see if we need to find and address for this
-	 * server.
-	 */
-	if (*uaddr == NULL) {
-		if ((srv != NULL) && (thost != NULL)) {
-			msg("both timehost and srv pointer used!");
-			return (0);
-		}
-		if (! srv) {
-			srv = get_server(netid, thost, &tsrv, teps, 32);
-			if (srv == NULL) {
-				msg("unable to contruct server data.");
-				return (0);
-			}
-			needfree = 1;	/* need to free data in endpoints */
-		}
-
-		ep = srv->ep.ep_val;
-		epl = srv->ep.ep_len;
-
-		/* Identify the TCP and UDP endpoints */
-		for (i = 0;
-			(i < epl) && ((udp_ep == -1) || (tcp_ep == -1)); i++) {
-			if (strcasecmp(ep[i].proto, "udp") == 0)
-				udp_ep = i;
-			if (strcasecmp(ep[i].proto, "tcp") == 0)
-				tcp_ep = i;
-		}
-
-		/* Check to see if it is UDP or TCP */
-		if (tcp_ep > -1) {
-			useep = &ep[tcp_ep];
-			useua = ep[tcp_ep].uaddr;
-			type = SOCK_STREAM;
-		} else if (udp_ep > -1) {
-			useep = &ep[udp_ep];
-			useua = ep[udp_ep].uaddr;
-			type = SOCK_DGRAM;
-		}
-
-		if (useep == NULL) {
-			msg("no acceptable transport endpoints.");
-			if (needfree)
-				free_eps(teps, tsrv.ep.ep_len);
-			return (0);
-		}
-	}
-
-	/*
-	 * Create a sockaddr from the uaddr.
-	 */
-	if (*uaddr != NULL)
-		useua = *uaddr;
-
-	/* Fixup test for NIS+ */
-	sscanf(useua, "%d.%d.%d.%d.", &a1, &a2, &a3, &a4);
-	sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4);
-	useua = &ipuaddr[0];
-
-	bzero((char *)&sin, sizeof(sin));
-	if (uaddr_to_sockaddr(useua, &sin)) {
-		msg("unable to translate uaddr to sockaddr.");
-		if (needfree)
-			free_eps(teps, tsrv.ep.ep_len);
-		return (0);
-	}
-
-	/*
-	 * Create the client handle to rpcbind. Note we always try
-	 * version 3 since that is the earliest version that supports
-	 * the RPCB_GETTIME call. Also it is the version that comes
-	 * standard with SVR4. Since most everyone supports TCP/IP
-	 * we could consider trying the rtime call first.
-	 */
-	clnt = clnttcp_create(&sin, RPCBPROG, RPCBVERS, &s, 0, 0);
-	if (clnt == NULL) {
-		msg("unable to create client handle to rpcbind.");
-		if (needfree)
-			free_eps(teps, tsrv.ep.ep_len);
-		return (0);
-	}
-
-	tv.tv_sec = 5;
-	tv.tv_usec = 0;
-	time_valid = 0;
-	status = clnt_call(clnt, RPCBPROC_GETTIME, (xdrproc_t)xdr_void, NULL,
-					(xdrproc_t)xdr_u_long, &thetime, tv);
-	/*
-	 * The only error we check for is anything but success. In
-	 * fact we could have seen PROGMISMATCH if talking to a 4.1
-	 * machine (pmap v2) or TIMEDOUT if the net was busy.
-	 */
-	if (status == RPC_SUCCESS)
-		time_valid = 1;
-	else {
-		int save;
-
-		/* Blow away possible stale CLNT handle. */
-		if (clnt != NULL) {
-			clnt_destroy(clnt);
-			clnt = NULL;
-		}
-
-		/*
-		 * Convert PMAP address into timeservice address
-		 * We take advantage of the fact that we "know" what
-		 * the universal address looks like for inet transports.
-		 *
-		 * We also know that the internet timeservice is always
-		 * listening on port 37.
-		 */
-		sscanf(useua, "%d.%d.%d.%d.", &a1, &a2, &a3, &a4);
-		sprintf(ut, "%d.%d.%d.%d.0.37", a1, a2, a3, a4);
-
-		if (uaddr_to_sockaddr(ut, &sin)) {
-			msg("cannot convert timeservice uaddr to sockaddr.");
-			goto error;
-		}
-
-		s = _socket(AF_INET, type, 0);
-		if (s == -1) {
-			msg("unable to open fd to network.");
-			goto error;
-		}
-
-		/*
-		 * Now depending on whether or not we're talking to
-		 * UDP we set a timeout or not.
-		 */
-		if (type == SOCK_DGRAM) {
-			struct timeval timeout = { 20, 0 };
-			struct sockaddr_in from;
-			fd_set readfds;
-			int res;
-
-			if (_sendto(s, &thetime, sizeof(thetime), 0,
-				(struct sockaddr *)&sin, sizeof(sin)) == -1) {
-				msg("udp : sendto failed.");
-				goto error;
-			}
-			do {
-				FD_ZERO(&readfds);
-				FD_SET(s, &readfds);
-				res = _select(_rpc_dtablesize(), &readfds,
-				     (fd_set *)NULL, (fd_set *)NULL, &timeout);
-			} while (res < 0 && errno == EINTR);
-			if (res <= 0)
-				goto error;
-			len = sizeof(from);
-			res = _recvfrom(s, (char *)&thetime, sizeof(thetime), 0,
-				       (struct sockaddr *)&from, &len);
-			if (res == -1) {
-				msg("recvfrom failed on udp transport.");
-				goto error;
-			}
-			time_valid = 1;
-		} else {
-			int res;
-
-			oldsig = (void (*)())signal(SIGALRM, alarm_hndler);
-			saw_alarm = 0; /* global tracking the alarm */
-			alarm(20); /* only wait 20 seconds */
-			res = _connect(s, (struct sockaddr *)&sin, sizeof(sin));
-			if (res == -1) {
-				msg("failed to connect to tcp endpoint.");
-				goto error;
-			}
-			if (saw_alarm) {
-				msg("alarm caught it, must be unreachable.");
-				goto error;
-			}
-			res = _read(s, (char *)&thetime, sizeof(thetime));
-			if (res != sizeof(thetime)) {
-				if (saw_alarm)
-					msg("timed out TCP call.");
-				else
-					msg("wrong size of results returned");
-
-				goto error;
-			}
-			time_valid = 1;
-		}
-		save = errno;
-		(void)_close(s);
-		errno = save;
-		s = RPC_ANYSOCK;
-
-		if (time_valid) {
-			thetime = ntohl(thetime);
-			thetime = thetime - TOFFSET; /* adjust to UNIX time */
-		} else
-			thetime = 0;
-	}
-
-	gettimeofday(&tv, 0);
-
-error:
-	/*
-	 * clean up our allocated data structures.
-	 */
-
-	if (s != RPC_ANYSOCK)
-		(void)_close(s);
-
-	if (clnt != NULL)
-		clnt_destroy(clnt);
-
-	alarm(0);	/* reset that alarm if its outstanding */
-	if (oldsig) {
-		signal(SIGALRM, oldsig);
-	}
-
-	/*
-	 * note, don't free uaddr strings until after we've made a
-	 * copy of them.
-	 */
-	if (time_valid) {
-		if (*uaddr == NULL)
-			*uaddr = strdup(useua);
-
-		/* Round to the nearest second */
-		tv.tv_sec += (tv.tv_sec > 500000) ? 1 : 0;
-		delta = (thetime > tv.tv_sec) ? thetime - tv.tv_sec :
-						tv.tv_sec - thetime;
-		td->tv_sec = (thetime < tv.tv_sec) ? - delta : delta;
-		td->tv_usec = 0;
-	} else {
-		msg("unable to get the server's time.");
-	}
-
-	if (needfree)
-		free_eps(teps, tsrv.ep.ep_len);
-
-	return (time_valid);
-}
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
deleted file mode 100644
index 2ce1e5e..0000000
--- a/lib/libc/rpc/auth_unix.c
+++ /dev/null
@@ -1,373 +0,0 @@
-/*	$NetBSD: auth_unix.c,v 1.18 2000/07/06 03:03:30 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/auth_unix.c,v 1.16 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * auth_unix.c, Implements UNIX style authentication parameters.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * The system is very weak.  The client uses no encryption for it's
- * credentials and only sends null verifiers.  The server sends backs
- * null verifiers or optionally a verifier that suggests a new short hand
- * for the credentials.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
-#include "un-namespace.h"
-
-/* auth_unix.c */
-static void authunix_nextverf (AUTH *);
-static bool_t authunix_marshal (AUTH *, XDR *);
-static bool_t authunix_validate (AUTH *, struct opaque_auth *);
-static bool_t authunix_refresh (AUTH *, void *);
-static void authunix_destroy (AUTH *);
-static void marshal_new_auth (AUTH *);
-static struct auth_ops *authunix_ops (void);
-
-/*
- * This struct is pointed to by the ah_private field of an auth_handle.
- */
-struct audata {
-	struct opaque_auth	au_origcred;	/* original credentials */
-	struct opaque_auth	au_shcred;	/* short hand cred */
-	u_long			au_shfaults;	/* short hand cache faults */
-	char			au_marshed[MAX_AUTH_BYTES];
-	u_int			au_mpos;	/* xdr pos at end of marshed */
-};
-#define	AUTH_PRIVATE(auth)	((struct audata *)auth->ah_private)
-
-/*
- * Create a unix style authenticator.
- * Returns an auth handle with the given stuff in it.
- */
-AUTH *
-authunix_create(machname, uid, gid, len, aup_gids)
-	char *machname;
-	int uid;
-	int gid;
-	int len;
-	int *aup_gids;
-{
-	struct authunix_parms aup;
-	char mymem[MAX_AUTH_BYTES];
-	struct timeval now;
-	XDR xdrs;
-	AUTH *auth;
-	struct audata *au;
-
-	/*
-	 * Allocate and set up auth handle
-	 */
-	au = NULL;
-	auth = mem_alloc(sizeof(*auth));
-#ifndef _KERNEL
-	if (auth == NULL) {
-		warnx("authunix_create: out of memory");
-		goto cleanup_authunix_create;
-	}
-#endif
-	au = mem_alloc(sizeof(*au));
-#ifndef _KERNEL
-	if (au == NULL) {
-		warnx("authunix_create: out of memory");
-		goto cleanup_authunix_create;
-	}
-#endif
-	auth->ah_ops = authunix_ops();
-	auth->ah_private = (caddr_t)au;
-	auth->ah_verf = au->au_shcred = _null_auth;
-	au->au_shfaults = 0;
-	au->au_origcred.oa_base = NULL;
-
-	/*
-	 * fill in param struct from the given params
-	 */
-	(void)gettimeofday(&now, NULL);
-	aup.aup_time = now.tv_sec;
-	aup.aup_machname = machname;
-	aup.aup_uid = uid;
-	aup.aup_gid = gid;
-	aup.aup_len = (u_int)len;
-	aup.aup_gids = aup_gids;
-
-	/*
-	 * Serialize the parameters into origcred
-	 */
-	xdrmem_create(&xdrs, mymem, MAX_AUTH_BYTES, XDR_ENCODE);
-	if (! xdr_authunix_parms(&xdrs, &aup)) 
-		abort();
-	au->au_origcred.oa_length = len = XDR_GETPOS(&xdrs);
-	au->au_origcred.oa_flavor = AUTH_UNIX;
-#ifdef _KERNEL
-	au->au_origcred.oa_base = mem_alloc((u_int) len);
-#else
-	if ((au->au_origcred.oa_base = mem_alloc((u_int) len)) == NULL) {
-		warnx("authunix_create: out of memory");
-		goto cleanup_authunix_create;
-	}
-#endif
-	memmove(au->au_origcred.oa_base, mymem, (size_t)len);
-
-	/*
-	 * set auth handle to reflect new cred.
-	 */
-	auth->ah_cred = au->au_origcred;
-	marshal_new_auth(auth);
-	return (auth);
-#ifndef _KERNEL
- cleanup_authunix_create:
-	if (auth)
-		mem_free(auth, sizeof(*auth));
-	if (au) {
-		if (au->au_origcred.oa_base)
-			mem_free(au->au_origcred.oa_base, (u_int)len);
-		mem_free(au, sizeof(*au));
-	}
-	return (NULL);
-#endif
-}
-
-/*
- * Returns an auth handle with parameters determined by doing lots of
- * syscalls.
- */
-AUTH *
-authunix_create_default()
-{
-	int len;
-	char machname[MAXHOSTNAMELEN + 1];
-	uid_t uid;
-	gid_t gid;
-	gid_t gids[NGRPS];
-
-	if (gethostname(machname, sizeof machname) == -1)
-		abort();
-	machname[sizeof(machname) - 1] = 0;
-	uid = geteuid();
-	gid = getegid();
-	if ((len = getgroups(NGRPS, gids)) < 0)
-		abort();
-	/* XXX: interface problem; those should all have been unsigned */
-	return (authunix_create(machname, (int)uid, (int)gid, len,
-	    (int *)gids));
-}
-
-/*
- * authunix operations
- */
-
-/* ARGSUSED */
-static void
-authunix_nextverf(auth)
-	AUTH *auth;
-{
-	/* no action necessary */
-}
-
-static bool_t
-authunix_marshal(auth, xdrs)
-	AUTH *auth;
-	XDR *xdrs;
-{
-	struct audata *au;
-
-	assert(auth != NULL);
-	assert(xdrs != NULL);
-
-	au = AUTH_PRIVATE(auth);
-	return (XDR_PUTBYTES(xdrs, au->au_marshed, au->au_mpos));
-}
-
-static bool_t
-authunix_validate(auth, verf)
-	AUTH *auth;
-	struct opaque_auth *verf;
-{
-	struct audata *au;
-	XDR xdrs;
-
-	assert(auth != NULL);
-	assert(verf != NULL);
-
-	if (verf->oa_flavor == AUTH_SHORT) {
-		au = AUTH_PRIVATE(auth);
-		xdrmem_create(&xdrs, verf->oa_base, verf->oa_length,
-		    XDR_DECODE);
-
-		if (au->au_shcred.oa_base != NULL) {
-			mem_free(au->au_shcred.oa_base,
-			    au->au_shcred.oa_length);
-			au->au_shcred.oa_base = NULL;
-		}
-		if (xdr_opaque_auth(&xdrs, &au->au_shcred)) {
-			auth->ah_cred = au->au_shcred;
-		} else {
-			xdrs.x_op = XDR_FREE;
-			(void)xdr_opaque_auth(&xdrs, &au->au_shcred);
-			au->au_shcred.oa_base = NULL;
-			auth->ah_cred = au->au_origcred;
-		}
-		marshal_new_auth(auth);
-	}
-	return (TRUE);
-}
-
-static bool_t
-authunix_refresh(AUTH *auth, void *dummy)
-{
-	struct audata *au = AUTH_PRIVATE(auth);
-	struct authunix_parms aup;
-	struct timeval now;
-	XDR xdrs;
-	int stat;
-
-	assert(auth != NULL);
-
-	if (auth->ah_cred.oa_base == au->au_origcred.oa_base) {
-		/* there is no hope.  Punt */
-		return (FALSE);
-	}
-	au->au_shfaults ++;
-
-	/* first deserialize the creds back into a struct authunix_parms */
-	aup.aup_machname = NULL;
-	aup.aup_gids = NULL;
-	xdrmem_create(&xdrs, au->au_origcred.oa_base,
-	    au->au_origcred.oa_length, XDR_DECODE);
-	stat = xdr_authunix_parms(&xdrs, &aup);
-	if (! stat)
-		goto done;
-
-	/* update the time and serialize in place */
-	(void)gettimeofday(&now, NULL);
-	aup.aup_time = now.tv_sec;
-	xdrs.x_op = XDR_ENCODE;
-	XDR_SETPOS(&xdrs, 0);
-	stat = xdr_authunix_parms(&xdrs, &aup);
-	if (! stat)
-		goto done;
-	auth->ah_cred = au->au_origcred;
-	marshal_new_auth(auth);
-done:
-	/* free the struct authunix_parms created by deserializing */
-	xdrs.x_op = XDR_FREE;
-	(void)xdr_authunix_parms(&xdrs, &aup);
-	XDR_DESTROY(&xdrs);
-	return (stat);
-}
-
-static void
-authunix_destroy(auth)
-	AUTH *auth;
-{
-	struct audata *au;
-
-	assert(auth != NULL);
-
-	au = AUTH_PRIVATE(auth);
-	mem_free(au->au_origcred.oa_base, au->au_origcred.oa_length);
-
-	if (au->au_shcred.oa_base != NULL)
-		mem_free(au->au_shcred.oa_base, au->au_shcred.oa_length);
-
-	mem_free(auth->ah_private, sizeof(struct audata));
-
-	if (auth->ah_verf.oa_base != NULL)
-		mem_free(auth->ah_verf.oa_base, auth->ah_verf.oa_length);
-
-	mem_free(auth, sizeof(*auth));
-}
-
-/*
- * Marshals (pre-serializes) an auth struct.
- * sets private data, au_marshed and au_mpos
- */
-static void
-marshal_new_auth(auth)
-	AUTH *auth;
-{
-	XDR	xdr_stream;
-	XDR	*xdrs = &xdr_stream;
-	struct audata *au;
-
-	assert(auth != NULL);
-
-	au = AUTH_PRIVATE(auth);
-	xdrmem_create(xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE);
-	if ((! xdr_opaque_auth(xdrs, &(auth->ah_cred))) ||
-	    (! xdr_opaque_auth(xdrs, &(auth->ah_verf))))
-		warnx("auth_none.c - Fatal marshalling problem");
-	else
-		au->au_mpos = XDR_GETPOS(xdrs);
-	XDR_DESTROY(xdrs);
-}
-
-static struct auth_ops *
-authunix_ops()
-{
-	static struct auth_ops ops;
-	extern mutex_t ops_lock;
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.ah_nextverf == NULL) {
-		ops.ah_nextverf = authunix_nextverf;
-		ops.ah_marshal = authunix_marshal;
-		ops.ah_validate = authunix_validate;
-		ops.ah_refresh = authunix_refresh;
-		ops.ah_destroy = authunix_destroy;
-	}
-	mutex_unlock(&ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc/rpc/authdes_prot.c b/lib/libc/rpc/authdes_prot.c
deleted file mode 100644
index b9069c5..0000000
--- a/lib/libc/rpc/authdes_prot.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = 	"@(#)authdes_prot.c	2.1 88/07/29 4.0 RPCSRC; from 1.6 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/authdes_prot.c,v 1.4 2002/03/22 23:18:36 obrien Exp $");
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-/*
- * authdes_prot.c, XDR routines for DES authentication
- */
-
-#include "namespace.h"
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_des.h>
-#include "un-namespace.h"
-
-#define ATTEMPT(xdr_op) if (!(xdr_op)) return (FALSE)
-
-bool_t
-xdr_authdes_cred(xdrs, cred)
-	XDR *xdrs;
-	struct authdes_cred *cred;
-{
-	/*
-	 * Unrolled xdr
-	 */
-	ATTEMPT(xdr_enum(xdrs, (enum_t *)&cred->adc_namekind));
-	switch (cred->adc_namekind) {
-	case ADN_FULLNAME:
-		ATTEMPT(xdr_string(xdrs, &cred->adc_fullname.name,
-		    MAXNETNAMELEN));
-		ATTEMPT(xdr_opaque(xdrs, (caddr_t)&cred->adc_fullname.key,
-		    sizeof(des_block)));
-		ATTEMPT(xdr_opaque(xdrs, (caddr_t)&cred->adc_fullname.window,
-		    sizeof(cred->adc_fullname.window)));
-		return (TRUE);
-	case ADN_NICKNAME:
-		ATTEMPT(xdr_opaque(xdrs, (caddr_t)&cred->adc_nickname,
-		    sizeof(cred->adc_nickname)));
-		return (TRUE);
-	default:
-		return (FALSE);
-	}
-}
-
-
-bool_t
-xdr_authdes_verf(xdrs, verf)
-	XDR *xdrs;
-	struct authdes_verf *verf;	
-{
-	/*
- 	 * Unrolled xdr
- 	 */
-	ATTEMPT(xdr_opaque(xdrs, (caddr_t)&verf->adv_xtimestamp,
-	    sizeof(des_block)));
-	ATTEMPT(xdr_opaque(xdrs, (caddr_t)&verf->adv_int_u,
-	    sizeof(verf->adv_int_u)));
-	return (TRUE);
-}
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
deleted file mode 100644
index 9b5b4cb..0000000
--- a/lib/libc/rpc/authunix_prot.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*	$NetBSD: authunix_prot.c,v 1.12 2000/01/22 22:19:17 mycroft Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/authunix_prot.c,v 1.9 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * authunix_prot.c
- * XDR for UNIX style authentication parameters for RPC
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
-#include "un-namespace.h"
-
-/*
- * XDR for unix authentication parameters.
- */
-bool_t
-xdr_authunix_parms(xdrs, p)
-	XDR *xdrs;
-	struct authunix_parms *p;
-{
-
-	assert(xdrs != NULL);
-	assert(p != NULL);
-
-	if (xdr_u_long(xdrs, &(p->aup_time))
-	    && xdr_string(xdrs, &(p->aup_machname), MAX_MACHINE_NAME)
-	    && xdr_int(xdrs, &(p->aup_uid))
-	    && xdr_int(xdrs, &(p->aup_gid))
-	    && xdr_array(xdrs, (caddr_t *)&(p->aup_gids),
-		    &(p->aup_len), NGRPS, sizeof(int), (xdrproc_t)xdr_int) ) {
-		return (TRUE);
-	}
-	return (FALSE);
-}
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
deleted file mode 100644
index 9ab2221..0000000
--- a/lib/libc/rpc/bindresvport.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*	$NetBSD: bindresvport.c,v 1.19 2000/07/06 03:03:59 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";
-static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";
-#endif
-/* from: $OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/bindresvport.c,v 1.16 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * Copyright (c) 1987 by Sun Microsystems, Inc.
- *
- * Portions Copyright(C) 1996, Jason Downs.  All rights reserved.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-
-#include <string.h>
-#include "un-namespace.h"
-
-/*
- * Bind a socket to a privileged IP port
- */
-int
-bindresvport(sd, sin)
-	int sd;
-	struct sockaddr_in *sin;
-{
-	return bindresvport_sa(sd, (struct sockaddr *)sin);
-}
-
-/*
- * Bind a socket to a privileged IP port
- */
-int
-bindresvport_sa(sd, sa)
-	int sd;
-	struct sockaddr *sa;
-{
-	int old, error, af;
-	struct sockaddr_storage myaddr;
-	struct sockaddr_in *sin;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	int proto, portrange, portlow;
-	u_int16_t *portp;
-	socklen_t salen;
-
-	if (sa == NULL) {
-		salen = sizeof(myaddr);
-		sa = (struct sockaddr *)&myaddr;
-
-		if (_getsockname(sd, sa, &salen) == -1)
-			return -1;	/* errno is correctly set */
-
-		af = sa->sa_family;
-		memset(sa, 0, salen);
-	} else
-		af = sa->sa_family;
-
-	switch (af) {
-	case AF_INET:
-		proto = IPPROTO_IP;
-		portrange = IP_PORTRANGE;
-		portlow = IP_PORTRANGE_LOW;
-		sin = (struct sockaddr_in *)sa;
-		salen = sizeof(struct sockaddr_in);
-		portp = &sin->sin_port;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		proto = IPPROTO_IPV6;
-		portrange = IPV6_PORTRANGE;
-		portlow = IPV6_PORTRANGE_LOW;
-		sin6 = (struct sockaddr_in6 *)sa;
-		salen = sizeof(struct sockaddr_in6);
-		portp = &sin6->sin6_port;
-		break;
-#endif
-	default:
-		errno = EPFNOSUPPORT;
-		return (-1);
-	}
-	sa->sa_family = af;
-	sa->sa_len = salen;
-
-	if (*portp == 0) {
-		socklen_t oldlen = sizeof(old);
-
-		error = _getsockopt(sd, proto, portrange, &old, &oldlen);
-		if (error < 0)
-			return (error);
-
-		error = _setsockopt(sd, proto, portrange, &portlow,
-		    sizeof(portlow));
-		if (error < 0)
-			return (error);
-	}
-
-	error = _bind(sd, sa, salen);
-
-	if (*portp == 0) {
-		int saved_errno = errno;
-
-		if (error < 0) {
-			if (_setsockopt(sd, proto, portrange, &old,
-			    sizeof(old)) < 0)
-				errno = saved_errno;
-			return (error);
-		}
-
-		if (sa != (struct sockaddr *)&myaddr) {
-			/* Hmm, what did the kernel assign? */
-			if (_getsockname(sd, sa, &salen) < 0)
-				errno = saved_errno;
-			return (error);
-		}
-	}
-	return (error);
-}
diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c
deleted file mode 100644
index 6f6f8fb..0000000
--- a/lib/libc/rpc/clnt_bcast.c
+++ /dev/null
@@ -1,670 +0,0 @@
-/*	$NetBSD: clnt_bcast.c,v 1.3 2000/07/06 03:05:20 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)clnt_bcast.c	1.18	94/05/03 SMI"
-static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_bcast.c,v 1.8 2004/10/16 06:11:34 obrien Exp $");
-
-
-/*
- * clnt_bcast.c
- * Client interface to broadcast service.
- *
- * Copyright (C) 1988, Sun Microsystems, Inc.
- *
- * The following is kludged-up support for simple rpc broadcasts.
- * Someday a large, complicated system will replace these routines.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <ifaddrs.h>
-#include <sys/poll.h>
-#include <rpc/rpc.h>
-#ifdef PORTMAP
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_rmt.h>
-#endif				/* PORTMAP */
-#include <rpc/nettype.h>
-#include <arpa/inet.h>
-#ifdef RPC_DEBUG
-#include <stdio.h>
-#endif
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <err.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-
-#define	MAXBCAST 20	/* Max no of broadcasting transports */
-#define	INITTIME 4000	/* Time to wait initially */
-#define	WAITTIME 8000	/* Maximum time to wait */
-
-/*
- * If nettype is NULL, it broadcasts on all the available
- * datagram_n transports. May potentially lead to broadacst storms
- * and hence should be used with caution, care and courage.
- *
- * The current parameter xdr packet size is limited by the max tsdu
- * size of the transport. If the max tsdu size of any transport is
- * smaller than the parameter xdr packet, then broadcast is not
- * sent on that transport.
- *
- * Also, the packet size should be less the packet size of
- * the data link layer (for ethernet it is 1400 bytes).  There is
- * no easy way to find out the max size of the data link layer and
- * we are assuming that the args would be smaller than that.
- *
- * The result size has to be smaller than the transport tsdu size.
- *
- * If PORTMAP has been defined, we send two packets for UDP, one for
- * rpcbind and one for portmap. For those machines which support
- * both rpcbind and portmap, it will cause them to reply twice, and
- * also here it will get two responses ... inefficient and clumsy.
- */
-
-struct broadif {
-	int index;
-	struct sockaddr_storage broadaddr;
-	TAILQ_ENTRY(broadif) link;
-};
-
-typedef TAILQ_HEAD(, broadif) broadlist_t;
-
-int __rpc_getbroadifs(int, int, int, broadlist_t *);
-void __rpc_freebroadifs(broadlist_t *);
-int __rpc_broadenable(int, int, struct broadif *);
-
-int __rpc_lowvers = 0;
-
-int
-__rpc_getbroadifs(int af, int proto, int socktype, broadlist_t *list)
-{
-	int count = 0;
-	struct broadif *bip;
-	struct ifaddrs *ifap, *ifp;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	struct sockaddr_in *sin;
-	struct addrinfo hints, *res;
-
-	if (getifaddrs(&ifp) < 0)
-		return 0;
-
-	memset(&hints, 0, sizeof hints);
-
-	hints.ai_family = af;
-	hints.ai_protocol = proto;
-	hints.ai_socktype = socktype;
-
-	if (getaddrinfo(NULL, "sunrpc", &hints, &res) != 0)
-		return 0;
-
-	for (ifap = ifp; ifap != NULL; ifap = ifap->ifa_next) {
-		if (ifap->ifa_addr->sa_family != af ||
-		    !(ifap->ifa_flags & IFF_UP))
-			continue;
-		bip = (struct broadif *)malloc(sizeof *bip);
-		if (bip == NULL)
-			break;
-		bip->index = if_nametoindex(ifap->ifa_name);
-		if (
-#ifdef INET6
-		af != AF_INET6 &&
-#endif
-		(ifap->ifa_flags & IFF_BROADCAST) &&
-		 ifap->ifa_broadaddr) {
-			memcpy(&bip->broadaddr, ifap->ifa_broadaddr,
-			    (size_t)ifap->ifa_broadaddr->sa_len);
-			sin = (struct sockaddr_in *)(void *)&bip->broadaddr;
-			sin->sin_port =
-			    ((struct sockaddr_in *)
-			    (void *)res->ai_addr)->sin_port;
-		} else
-#ifdef INET6
-		if (af == AF_INET6 && (ifap->ifa_flags & IFF_MULTICAST)) {
-			sin6 = (struct sockaddr_in6 *)(void *)&bip->broadaddr;
-			inet_pton(af, RPCB_MULTICAST_ADDR, &sin6->sin6_addr);
-			sin6->sin6_family = af;
-			sin6->sin6_len = sizeof *sin6;
-			sin6->sin6_port =
-			    ((struct sockaddr_in6 *)
-			    (void *)res->ai_addr)->sin6_port;
-			sin6->sin6_scope_id = bip->index;
-		} else
-#endif
-		{
-			free(bip);
-			continue;
-		}
-		TAILQ_INSERT_TAIL(list, bip, link);
-		count++;
-	}
-	freeifaddrs(ifp);
-	freeaddrinfo(res);
-
-	return count;
-}
-
-void
-__rpc_freebroadifs(broadlist_t *list)
-{
-	struct broadif *bip, *next;
-
-	bip = TAILQ_FIRST(list);
-
-	while (bip != NULL) {
-		next = TAILQ_NEXT(bip, link);
-		free(bip);
-		bip = next;
-	}
-}
-
-int
-/*ARGSUSED*/
-__rpc_broadenable(int af, int s, struct broadif *bip)
-{
-	int o = 1;
-
-#if 0
-	if (af == AF_INET6) {
-		fprintf(stderr, "set v6 multicast if to %d\n", bip->index);
-		if (_setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_IF, &bip->index,
-		    sizeof bip->index) < 0)
-			return -1;
-	} else
-#endif
-		if (_setsockopt(s, SOL_SOCKET, SO_BROADCAST, &o, sizeof o) < 0)
-			return -1;
-
-	return 0;
-}
-
-
-enum clnt_stat
-rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp,
-	eachresult, inittime, waittime, nettype)
-	rpcprog_t	prog;		/* program number */
-	rpcvers_t	vers;		/* version number */
-	rpcproc_t	proc;		/* procedure number */
-	xdrproc_t	xargs;		/* xdr routine for args */
-	caddr_t		argsp;		/* pointer to args */
-	xdrproc_t	xresults;	/* xdr routine for results */
-	caddr_t		resultsp;	/* pointer to results */
-	resultproc_t	eachresult;	/* call with each result obtained */
-	int 		inittime;	/* how long to wait initially */
-	int 		waittime;	/* maximum time to wait */
-	const char		*nettype;	/* transport type */
-{
-	enum clnt_stat	stat = RPC_SUCCESS; /* Return status */
-	XDR 		xdr_stream; /* XDR stream */
-	XDR 		*xdrs = &xdr_stream;
-	struct rpc_msg	msg;	/* RPC message */
-	struct timeval	t;
-	char 		*outbuf = NULL;	/* Broadcast msg buffer */
-	char		*inbuf = NULL; /* Reply buf */
-	int		inlen;
-	u_int 		maxbufsize = 0;
-	AUTH 		*sys_auth = authunix_create_default();
-	int		i;
-	void		*handle;
-	char		uaddress[1024];	/* A self imposed limit */
-	char		*uaddrp = uaddress;
-	int 		pmap_reply_flag; /* reply recvd from PORTMAP */
-	/* An array of all the suitable broadcast transports */
-	struct {
-		int fd;		/* File descriptor */
-		int af;
-		int proto;
-		struct netconfig *nconf; /* Netconfig structure */
-		u_int asize;	/* Size of the addr buf */
-		u_int dsize;	/* Size of the data buf */
-		struct sockaddr_storage raddr; /* Remote address */
-		broadlist_t nal;
-	} fdlist[MAXBCAST];
-	struct pollfd pfd[MAXBCAST];
-	size_t fdlistno = 0;
-	struct r_rpcb_rmtcallargs barg;	/* Remote arguments */
-	struct r_rpcb_rmtcallres bres; /* Remote results */
-	size_t outlen;
-	struct netconfig *nconf;
-	int msec;
-	int pollretval;
-	int fds_found;
-
-#ifdef PORTMAP
-	size_t outlen_pmap = 0;
-	u_long port;		/* Remote port number */
-	int pmap_flag = 0;	/* UDP exists ? */
-	char *outbuf_pmap = NULL;
-	struct rmtcallargs barg_pmap;	/* Remote arguments */
-	struct rmtcallres bres_pmap; /* Remote results */
-	u_int udpbufsz = 0;
-#endif				/* PORTMAP */
-
-	if (sys_auth == NULL) {
-		return (RPC_SYSTEMERROR);
-	}
-	/*
-	 * initialization: create a fd, a broadcast address, and send the
-	 * request on the broadcast transport.
-	 * Listen on all of them and on replies, call the user supplied
-	 * function.
-	 */
-
-	if (nettype == NULL)
-		nettype = "datagram_n";
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		return (RPC_UNKNOWNPROTO);
-	}
-	while ((nconf = __rpc_getconf(handle)) != NULL) {
-		int fd;
-		struct __rpc_sockinfo si;
-
-		if (nconf->nc_semantics != NC_TPI_CLTS)
-			continue;
-		if (fdlistno >= MAXBCAST)
-			break;	/* No more slots available */
-		if (!__rpc_nconf2sockinfo(nconf, &si))
-			continue;
-
-		TAILQ_INIT(&fdlist[fdlistno].nal);
-		if (__rpc_getbroadifs(si.si_af, si.si_proto, si.si_socktype, 
-		    &fdlist[fdlistno].nal) == 0)
-			continue;
-
-		fd = _socket(si.si_af, si.si_socktype, si.si_proto);
-		if (fd < 0) {
-			stat = RPC_CANTSEND;
-			continue;
-		}
-		fdlist[fdlistno].af = si.si_af;
-		fdlist[fdlistno].proto = si.si_proto;
-		fdlist[fdlistno].fd = fd;
-		fdlist[fdlistno].nconf = nconf;
-		fdlist[fdlistno].asize = __rpc_get_a_size(si.si_af);
-		pfd[fdlistno].events = POLLIN | POLLPRI |
-			POLLRDNORM | POLLRDBAND;
-		pfd[fdlistno].fd = fdlist[fdlistno].fd = fd;
-		fdlist[fdlistno].dsize = __rpc_get_t_size(si.si_af, si.si_proto,
-							  0);
-
-		if (maxbufsize <= fdlist[fdlistno].dsize)
-			maxbufsize = fdlist[fdlistno].dsize;
-
-#ifdef PORTMAP
-		if (si.si_af == AF_INET && si.si_proto == IPPROTO_UDP) {
-			udpbufsz = fdlist[fdlistno].dsize;
-			if ((outbuf_pmap = malloc(udpbufsz)) == NULL) {
-				_close(fd);
-				stat = RPC_SYSTEMERROR;
-				goto done_broad;
-			}
-			pmap_flag = 1;
-		}
-#endif				/* PORTMAP */
-		fdlistno++;
-	}
-
-	if (fdlistno == 0) {
-		if (stat == RPC_SUCCESS)
-			stat = RPC_UNKNOWNPROTO;
-		goto done_broad;
-	}
-	if (maxbufsize == 0) {
-		if (stat == RPC_SUCCESS)
-			stat = RPC_CANTSEND;
-		goto done_broad;
-	}
-	inbuf = malloc(maxbufsize);
-	outbuf = malloc(maxbufsize);
-	if ((inbuf == NULL) || (outbuf == NULL)) {
-		stat = RPC_SYSTEMERROR;
-		goto done_broad;
-	}
-
-	/* Serialize all the arguments which have to be sent */
-	(void) gettimeofday(&t, NULL);
-	msg.rm_xid = __RPC_GETXID(&t);
-	msg.rm_direction = CALL;
-	msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	msg.rm_call.cb_prog = RPCBPROG;
-	msg.rm_call.cb_vers = RPCBVERS;
-	msg.rm_call.cb_proc = RPCBPROC_CALLIT;
-	barg.prog = prog;
-	barg.vers = vers;
-	barg.proc = proc;
-	barg.args.args_val = argsp;
-	barg.xdr_args = xargs;
-	bres.addr = uaddrp;
-	bres.results.results_val = resultsp;
-	bres.xdr_res = xresults;
-	msg.rm_call.cb_cred = sys_auth->ah_cred;
-	msg.rm_call.cb_verf = sys_auth->ah_verf;
-	xdrmem_create(xdrs, outbuf, maxbufsize, XDR_ENCODE);
-	if ((!xdr_callmsg(xdrs, &msg)) ||
-	    (!xdr_rpcb_rmtcallargs(xdrs,
-	    (struct rpcb_rmtcallargs *)(void *)&barg))) {
-		stat = RPC_CANTENCODEARGS;
-		goto done_broad;
-	}
-	outlen = xdr_getpos(xdrs);
-	xdr_destroy(xdrs);
-
-#ifdef PORTMAP
-	/* Prepare the packet for version 2 PORTMAP */
-	if (pmap_flag) {
-		msg.rm_xid++;	/* One way to distinguish */
-		msg.rm_call.cb_prog = PMAPPROG;
-		msg.rm_call.cb_vers = PMAPVERS;
-		msg.rm_call.cb_proc = PMAPPROC_CALLIT;
-		barg_pmap.prog = prog;
-		barg_pmap.vers = vers;
-		barg_pmap.proc = proc;
-		barg_pmap.args_ptr = argsp;
-		barg_pmap.xdr_args = xargs;
-		bres_pmap.port_ptr = &port;
-		bres_pmap.xdr_results = xresults;
-		bres_pmap.results_ptr = resultsp;
-		xdrmem_create(xdrs, outbuf_pmap, udpbufsz, XDR_ENCODE);
-		if ((! xdr_callmsg(xdrs, &msg)) ||
-		    (! xdr_rmtcall_args(xdrs, &barg_pmap))) {
-			stat = RPC_CANTENCODEARGS;
-			goto done_broad;
-		}
-		outlen_pmap = xdr_getpos(xdrs);
-		xdr_destroy(xdrs);
-	}
-#endif				/* PORTMAP */
-
-	/*
-	 * Basic loop: broadcast the packets to transports which
-	 * support data packets of size such that one can encode
-	 * all the arguments.
-	 * Wait a while for response(s).
-	 * The response timeout grows larger per iteration.
-	 */
-	for (msec = inittime; msec <= waittime; msec += msec) {
-		struct broadif *bip;
-
-		/* Broadcast all the packets now */
-		for (i = 0; i < fdlistno; i++) {
-			if (fdlist[i].dsize < outlen) {
-				stat = RPC_CANTSEND;
-				continue;
-			}
-			for (bip = TAILQ_FIRST(&fdlist[i].nal); bip != NULL;
-			     bip = TAILQ_NEXT(bip, link)) {
-				void *addr;
-
-				addr = &bip->broadaddr;
-
-				__rpc_broadenable(fdlist[i].af, fdlist[i].fd,
-				    bip);
-
-				/*
-				 * Only use version 3 if lowvers is not set
-				 */
-
-				if (!__rpc_lowvers)
-					if (_sendto(fdlist[i].fd, outbuf,
-					    outlen, 0, (struct sockaddr*)addr,
-					    (size_t)fdlist[i].asize) !=
-					    outlen) {
-#ifdef RPC_DEBUG
-						perror("sendto");
-#endif
-						warnx("clnt_bcast: cannot send"
-						      "broadcast packet");
-						stat = RPC_CANTSEND;
-						continue;
-					};
-#ifdef RPC_DEBUG
-				if (!__rpc_lowvers)
-					fprintf(stderr, "Broadcast packet sent "
-						"for %s\n",
-						 fdlist[i].nconf->nc_netid);
-#endif
-#ifdef PORTMAP
-				/*
-				 * Send the version 2 packet also
-				 * for UDP/IP
-				 */
-				if (pmap_flag &&
-				    fdlist[i].proto == IPPROTO_UDP) {
-					if (_sendto(fdlist[i].fd, outbuf_pmap,
-					    outlen_pmap, 0, addr,
-					    (size_t)fdlist[i].asize) !=
-						outlen_pmap) {
-						warnx("clnt_bcast: "
-						    "Cannot send broadcast packet");
-						stat = RPC_CANTSEND;
-						continue;
-					}
-				}
-#ifdef RPC_DEBUG
-				fprintf(stderr, "PMAP Broadcast packet "
-					"sent for %s\n",
-					fdlist[i].nconf->nc_netid);
-#endif
-#endif				/* PORTMAP */
-			}
-			/* End for sending all packets on this transport */
-		}	/* End for sending on all transports */
-
-		if (eachresult == NULL) {
-			stat = RPC_SUCCESS;
-			goto done_broad;
-		}
-
-		/*
-		 * Get all the replies from these broadcast requests
-		 */
-	recv_again:
-
-		switch (pollretval = _poll(pfd, fdlistno, msec)) {
-		case 0:		/* timed out */
-			stat = RPC_TIMEDOUT;
-			continue;
-		case -1:	/* some kind of error - we ignore it */
-			goto recv_again;
-		}		/* end of poll results switch */
-
-		for (i = fds_found = 0;
-		     i < fdlistno && fds_found < pollretval; i++) {
-			bool_t done = FALSE;
-
-			if (pfd[i].revents == 0)
-				continue;
-			else if (pfd[i].revents & POLLNVAL) {
-				/*
-				 * Something bad has happened to this descri-
-				 * ptor. We can cause _poll() to ignore
-				 * it simply by using a negative fd.  We do that
-				 * rather than compacting the pfd[] and fdlist[]
-				 * arrays.
-				 */
-				pfd[i].fd = -1;
-				fds_found++;
-				continue;
-			} else
-				fds_found++;
-#ifdef RPC_DEBUG
-			fprintf(stderr, "response for %s\n",
-				fdlist[i].nconf->nc_netid);
-#endif
-		try_again:
-			inlen = _recvfrom(fdlist[i].fd, inbuf, fdlist[i].dsize,
-			    0, (struct sockaddr *)(void *)&fdlist[i].raddr,
-			    &fdlist[i].asize);
-			if (inlen < 0) {
-				if (errno == EINTR)
-					goto try_again;
-				warnx("clnt_bcast: Cannot receive reply to "
-					"broadcast");
-				stat = RPC_CANTRECV;
-				continue;
-			}
-			if (inlen < sizeof (uint32_t))
-				continue; /* Drop that and go ahead */
-			/*
-			 * see if reply transaction id matches sent id.
-			 * If so, decode the results. If return id is xid + 1
-			 * it was a PORTMAP reply
-			 */
-			if (*((uint32_t *)(void *)(inbuf)) ==
-			    *((uint32_t *)(void *)(outbuf))) {
-				pmap_reply_flag = 0;
-				msg.acpted_rply.ar_verf = _null_auth;
-				msg.acpted_rply.ar_results.where =
-					(caddr_t)(void *)&bres;
-				msg.acpted_rply.ar_results.proc =
-					(xdrproc_t)xdr_rpcb_rmtcallres;
-#ifdef PORTMAP
-			} else if (pmap_flag &&
-				*((uint32_t *)(void *)(inbuf)) ==
-				*((uint32_t *)(void *)(outbuf_pmap))) {
-				pmap_reply_flag = 1;
-				msg.acpted_rply.ar_verf = _null_auth;
-				msg.acpted_rply.ar_results.where =
-					(caddr_t)(void *)&bres_pmap;
-				msg.acpted_rply.ar_results.proc =
-					(xdrproc_t)xdr_rmtcallres;
-#endif				/* PORTMAP */
-			} else
-				continue;
-			xdrmem_create(xdrs, inbuf, (u_int)inlen, XDR_DECODE);
-			if (xdr_replymsg(xdrs, &msg)) {
-				if ((msg.rm_reply.rp_stat == MSG_ACCEPTED) &&
-				    (msg.acpted_rply.ar_stat == SUCCESS)) {
-					struct netbuf taddr, *np;
-					struct sockaddr_in *sin;
-
-#ifdef PORTMAP
-					if (pmap_flag && pmap_reply_flag) {
-						sin = (struct sockaddr_in *)
-						    (void *)&fdlist[i].raddr;
-						sin->sin_port =
-						    htons((u_short)port);
-						taddr.len = taddr.maxlen = 
-						    fdlist[i].raddr.ss_len;
-						taddr.buf = &fdlist[i].raddr;
-						done = (*eachresult)(resultsp,
-						    &taddr, fdlist[i].nconf);
-					} else {
-#endif				/* PORTMAP */
-#ifdef RPC_DEBUG
-						fprintf(stderr, "uaddr %s\n",
-						    uaddrp);
-#endif
-						np = uaddr2taddr(
-						    fdlist[i].nconf, uaddrp);
-						done = (*eachresult)(resultsp,
-						    np, fdlist[i].nconf);
-						free(np);
-#ifdef PORTMAP
-					}
-#endif				/* PORTMAP */
-				}
-				/* otherwise, we just ignore the errors ... */
-			}
-			/* else some kind of deserialization problem ... */
-
-			xdrs->x_op = XDR_FREE;
-			msg.acpted_rply.ar_results.proc = (xdrproc_t) xdr_void;
-			(void) xdr_replymsg(xdrs, &msg);
-			(void) (*xresults)(xdrs, resultsp);
-			XDR_DESTROY(xdrs);
-			if (done) {
-				stat = RPC_SUCCESS;
-				goto done_broad;
-			} else {
-				goto recv_again;
-			}
-		}		/* The recv for loop */
-	}			/* The giant for loop */
-
-done_broad:
-	if (inbuf)
-		(void) free(inbuf);
-	if (outbuf)
-		(void) free(outbuf);
-#ifdef PORTMAP
-	if (outbuf_pmap)
-		(void) free(outbuf_pmap);
-#endif				/* PORTMAP */
-	for (i = 0; i < fdlistno; i++) {
-		(void)_close(fdlist[i].fd);
-		__rpc_freebroadifs(&fdlist[i].nal);
-	}
-	AUTH_DESTROY(sys_auth);
-	(void) __rpc_endconf(handle);
-
-	return (stat);
-}
-
-
-enum clnt_stat
-rpc_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp,
-			eachresult, nettype)
-	rpcprog_t	prog;		/* program number */
-	rpcvers_t	vers;		/* version number */
-	rpcproc_t	proc;		/* procedure number */
-	xdrproc_t	xargs;		/* xdr routine for args */
-	caddr_t		argsp;		/* pointer to args */
-	xdrproc_t	xresults;	/* xdr routine for results */
-	caddr_t		resultsp;	/* pointer to results */
-	resultproc_t	eachresult;	/* call with each result obtained */
-	const char		*nettype;	/* transport type */
-{
-	enum clnt_stat	dummy;
-
-	dummy = rpc_broadcast_exp(prog, vers, proc, xargs, argsp,
-		xresults, resultsp, eachresult,
-		INITTIME, WAITTIME, nettype);
-	return (dummy);
-}
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
deleted file mode 100644
index 1294d12..0000000
--- a/lib/libc/rpc/clnt_dg.c
+++ /dev/null
@@ -1,789 +0,0 @@
-/*	$NetBSD: clnt_dg.c,v 1.4 2000/07/14 08:40:41 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)clnt_dg.c	1.23	94/04/22 SMI"
-static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_dg.c,v 1.17 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * Implements a connectionless client side RPC.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <arpa/inet.h>
-#include <rpc/rpc.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
-#include <err.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-
-
-#define	RPC_MAX_BACKOFF		30 /* seconds */
-
-
-static struct clnt_ops *clnt_dg_ops(void);
-static bool_t time_not_ok(struct timeval *);
-static enum clnt_stat clnt_dg_call(CLIENT *, rpcproc_t, xdrproc_t, void *,
-	    xdrproc_t, void *, struct timeval);
-static void clnt_dg_geterr(CLIENT *, struct rpc_err *);
-static bool_t clnt_dg_freeres(CLIENT *, xdrproc_t, void *);
-static void clnt_dg_abort(CLIENT *);
-static bool_t clnt_dg_control(CLIENT *, u_int, void *);
-static void clnt_dg_destroy(CLIENT *);
-
-
-
-
-/*
- *	This machinery implements per-fd locks for MT-safety.  It is not
- *	sufficient to do per-CLIENT handle locks for MT-safety because a
- *	user may create more than one CLIENT handle with the same fd behind
- *	it.  Therfore, we allocate an array of flags (dg_fd_locks), protected
- *	by the clnt_fd_lock mutex, and an array (dg_cv) of condition variables
- *	similarly protected.  Dg_fd_lock[fd] == 1 => a call is activte on some
- *	CLIENT handle created for that fd.
- *	The current implementation holds locks across the entire RPC and reply,
- *	including retransmissions.  Yes, this is silly, and as soon as this
- *	code is proven to work, this should be the first thing fixed.  One step
- *	at a time.
- */
-static int	*dg_fd_locks;
-extern mutex_t clnt_fd_lock;
-static cond_t	*dg_cv;
-#define	release_fd_lock(fd, mask) {		\
-	mutex_lock(&clnt_fd_lock);	\
-	dg_fd_locks[fd] = 0;		\
-	mutex_unlock(&clnt_fd_lock);	\
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL); \
-	cond_signal(&dg_cv[fd]);	\
-}
-
-static const char mem_err_clnt_dg[] = "clnt_dg_create: out of memory";
-
-/* VARIABLES PROTECTED BY clnt_fd_lock: dg_fd_locks, dg_cv */
-
-/*
- * Private data kept per client handle
- */
-struct cu_data {
-	int			cu_fd;		/* connections fd */
-	bool_t			cu_closeit;	/* opened by library */
-	struct sockaddr_storage	cu_raddr;	/* remote address */
-	int			cu_rlen;
-	struct timeval		cu_wait;	/* retransmit interval */
-	struct timeval		cu_total;	/* total time for the call */
-	struct rpc_err		cu_error;
-	XDR			cu_outxdrs;
-	u_int			cu_xdrpos;
-	u_int			cu_sendsz;	/* send size */
-	char			*cu_outbuf;
-	u_int			cu_recvsz;	/* recv size */
-	int			cu_async;
-	int			cu_connect;	/* Use connect(). */
-	int			cu_connected;	/* Have done connect(). */
-	struct kevent		cu_kin;
-	int			cu_kq;
-	char			cu_inbuf[1];
-};
-
-/*
- * Connection less client creation returns with client handle parameters.
- * Default options are set, which the user can change using clnt_control().
- * fd should be open and bound.
- * NB: The rpch->cl_auth is initialized to null authentication.
- * 	Caller may wish to set this something more useful.
- *
- * sendsz and recvsz are the maximum allowable packet sizes that can be
- * sent and received. Normally they are the same, but they can be
- * changed to improve the program efficiency and buffer allocation.
- * If they are 0, use the transport default.
- *
- * If svcaddr is NULL, returns NULL.
- */
-CLIENT *
-clnt_dg_create(fd, svcaddr, program, version, sendsz, recvsz)
-	int fd;				/* open file descriptor */
-	const struct netbuf *svcaddr;	/* servers address */
-	rpcprog_t program;		/* program number */
-	rpcvers_t version;		/* version number */
-	u_int sendsz;			/* buffer recv size */
-	u_int recvsz;			/* buffer send size */
-{
-	CLIENT *cl = NULL;		/* client handle */
-	struct cu_data *cu = NULL;	/* private data */
-	struct timeval now;
-	struct rpc_msg call_msg;
-	sigset_t mask;
-	sigset_t newmask;
-	struct __rpc_sockinfo si;
-	int one = 1;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	if (dg_fd_locks == (int *) NULL) {
-		int cv_allocsz;
-		size_t fd_allocsz;
-		int dtbsize = __rpc_dtbsize();
-
-		fd_allocsz = dtbsize * sizeof (int);
-		dg_fd_locks = (int *) mem_alloc(fd_allocsz);
-		if (dg_fd_locks == (int *) NULL) {
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err1;
-		} else
-			memset(dg_fd_locks, '\0', fd_allocsz);
-
-		cv_allocsz = dtbsize * sizeof (cond_t);
-		dg_cv = (cond_t *) mem_alloc(cv_allocsz);
-		if (dg_cv == (cond_t *) NULL) {
-			mem_free(dg_fd_locks, fd_allocsz);
-			dg_fd_locks = (int *) NULL;
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err1;
-		} else {
-			int i;
-
-			for (i = 0; i < dtbsize; i++)
-				cond_init(&dg_cv[i], 0, (void *) 0);
-		}
-	}
-
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-
-	if (svcaddr == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (NULL);
-	}
-
-	if (!__rpc_fd2sockinfo(fd, &si)) {
-		rpc_createerr.cf_stat = RPC_TLIERROR;
-		rpc_createerr.cf_error.re_errno = 0;
-		return (NULL);
-	}
-	/*
-	 * Find the receive and the send size
-	 */
-	sendsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsz);
-	recvsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsz);
-	if ((sendsz == 0) || (recvsz == 0)) {
-		rpc_createerr.cf_stat = RPC_TLIERROR; /* XXX */
-		rpc_createerr.cf_error.re_errno = 0;
-		return (NULL);
-	}
-
-	if ((cl = mem_alloc(sizeof (CLIENT))) == NULL)
-		goto err1;
-	/*
-	 * Should be multiple of 4 for XDR.
-	 */
-	sendsz = ((sendsz + 3) / 4) * 4;
-	recvsz = ((recvsz + 3) / 4) * 4;
-	cu = mem_alloc(sizeof (*cu) + sendsz + recvsz);
-	if (cu == NULL)
-		goto err1;
-	(void) memcpy(&cu->cu_raddr, svcaddr->buf, (size_t)svcaddr->len);
-	cu->cu_rlen = svcaddr->len;
-	cu->cu_outbuf = &cu->cu_inbuf[recvsz];
-	/* Other values can also be set through clnt_control() */
-	cu->cu_wait.tv_sec = 15;	/* heuristically chosen */
-	cu->cu_wait.tv_usec = 0;
-	cu->cu_total.tv_sec = -1;
-	cu->cu_total.tv_usec = -1;
-	cu->cu_sendsz = sendsz;
-	cu->cu_recvsz = recvsz;
-	cu->cu_async = FALSE;
-	cu->cu_connect = FALSE;
-	cu->cu_connected = FALSE;
-	(void) gettimeofday(&now, NULL);
-	call_msg.rm_xid = __RPC_GETXID(&now);
-	call_msg.rm_call.cb_prog = program;
-	call_msg.rm_call.cb_vers = version;
-	xdrmem_create(&(cu->cu_outxdrs), cu->cu_outbuf, sendsz, XDR_ENCODE);
-	if (! xdr_callhdr(&(cu->cu_outxdrs), &call_msg)) {
-		rpc_createerr.cf_stat = RPC_CANTENCODEARGS;  /* XXX */
-		rpc_createerr.cf_error.re_errno = 0;
-		goto err2;
-	}
-	cu->cu_xdrpos = XDR_GETPOS(&(cu->cu_outxdrs));
-
-	/* XXX fvdl - do we still want this? */
-#if 0
-	(void)bindresvport_sa(fd, (struct sockaddr *)svcaddr->buf);
-#endif
-	_ioctl(fd, FIONBIO, (char *)(void *)&one);
-
-	/*
-	 * By default, closeit is always FALSE. It is users responsibility
-	 * to do a close on it, else the user may use clnt_control
-	 * to let clnt_destroy do it for him/her.
-	 */
-	cu->cu_closeit = FALSE;
-	cu->cu_fd = fd;
-	cl->cl_ops = clnt_dg_ops();
-	cl->cl_private = (caddr_t)(void *)cu;
-	cl->cl_auth = authnone_create();
-	cl->cl_tp = NULL;
-	cl->cl_netid = NULL;
-	cu->cu_kq = -1;
-	EV_SET(&cu->cu_kin, cu->cu_fd, EVFILT_READ, EV_ADD, 0, 0, 0);
-	return (cl);
-err1:
-	warnx(mem_err_clnt_dg);
-	rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-	rpc_createerr.cf_error.re_errno = errno;
-err2:
-	if (cl) {
-		mem_free(cl, sizeof (CLIENT));
-		if (cu)
-			mem_free(cu, sizeof (*cu) + sendsz + recvsz);
-	}
-	return (NULL);
-}
-
-static enum clnt_stat
-clnt_dg_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout)
-	CLIENT	*cl;			/* client handle */
-	rpcproc_t	proc;		/* procedure number */
-	xdrproc_t	xargs;		/* xdr routine for args */
-	void		*argsp;		/* pointer to args */
-	xdrproc_t	xresults;	/* xdr routine for results */
-	void		*resultsp;	/* pointer to results */
-	struct timeval	utimeout;	/* seconds to wait before giving up */
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	XDR *xdrs;
-	size_t outlen = 0;
-	struct rpc_msg reply_msg;
-	XDR reply_xdrs;
-	bool_t ok;
-	int nrefreshes = 2;		/* number of times to refresh cred */
-	struct timeval timeout;
-	struct timeval retransmit_time;
-	struct timeval next_sendtime, starttime, time_waited, tv;
-	struct timespec ts;
-	struct kevent kv;
-	struct sockaddr *sa;
-	sigset_t mask;
-	sigset_t newmask;
-	socklen_t inlen, salen;
-	ssize_t recvlen = 0;
-	int kin_len, n, rpc_lock_value;
-	uint32_t xid;
-
-	outlen = 0;
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu->cu_fd])
-		cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock);
-	if (__isthreaded)
-		rpc_lock_value = 1;
-	else
-		rpc_lock_value = 0;
-	dg_fd_locks[cu->cu_fd] = rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-	if (cu->cu_total.tv_usec == -1) {
-		timeout = utimeout;	/* use supplied timeout */
-	} else {
-		timeout = cu->cu_total;	/* use default timeout */
-	}
-
-	if (cu->cu_connect && !cu->cu_connected) {
-		if (_connect(cu->cu_fd, (struct sockaddr *)&cu->cu_raddr,
-		    cu->cu_rlen) < 0) {
-			cu->cu_error.re_errno = errno;
-			cu->cu_error.re_status = RPC_CANTSEND;
-			goto out;
-		}
-		cu->cu_connected = 1;
-	}
-	if (cu->cu_connected) {
-		sa = NULL;
-		salen = 0;
-	} else {
-		sa = (struct sockaddr *)&cu->cu_raddr;
-		salen = cu->cu_rlen;
-	}
-	time_waited.tv_sec = 0;
-	time_waited.tv_usec = 0;
-	retransmit_time = next_sendtime = cu->cu_wait;
-	gettimeofday(&starttime, NULL);
-
-	/* Clean up in case the last call ended in a longjmp(3) call. */
-	if (cu->cu_kq >= 0)
-		_close(cu->cu_kq);
-	if ((cu->cu_kq = kqueue()) < 0) {
-		cu->cu_error.re_errno = errno;
-		cu->cu_error.re_status = RPC_CANTSEND;
-		goto out;
-	}
-	kin_len = 1;
-
-call_again:
-	xdrs = &(cu->cu_outxdrs);
-	if (cu->cu_async == TRUE && xargs == NULL)
-		goto get_reply;
-	xdrs->x_op = XDR_ENCODE;
-	XDR_SETPOS(xdrs, cu->cu_xdrpos);
-	/*
-	 * the transaction is the first thing in the out buffer
-	 * XXX Yes, and it's in network byte order, so we should to
-	 * be careful when we increment it, shouldn't we.
-	 */
-	xid = ntohl(*(uint32_t *)(void *)(cu->cu_outbuf));
-	xid++;
-	*(uint32_t *)(void *)(cu->cu_outbuf) = htonl(xid);
-
-	if ((! XDR_PUTINT32(xdrs, &proc)) ||
-	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
-	    (! (*xargs)(xdrs, argsp))) {
-		cu->cu_error.re_status = RPC_CANTENCODEARGS;
-		goto out;
-	}
-	outlen = (size_t)XDR_GETPOS(xdrs);
-
-send_again:
-	if (_sendto(cu->cu_fd, cu->cu_outbuf, outlen, 0, sa, salen) != outlen) {
-		cu->cu_error.re_errno = errno;
-		cu->cu_error.re_status = RPC_CANTSEND;
-		goto out;
-	}
-
-	/*
-	 * Hack to provide rpc-based message passing
-	 */
-	if (timeout.tv_sec == 0 && timeout.tv_usec == 0) {
-		cu->cu_error.re_status = RPC_TIMEDOUT;
-		goto out;
-	}
-
-get_reply:
-
-	/*
-	 * sub-optimal code appears here because we have
-	 * some clock time to spare while the packets are in flight.
-	 * (We assume that this is actually only executed once.)
-	 */
-	reply_msg.acpted_rply.ar_verf = _null_auth;
-	reply_msg.acpted_rply.ar_results.where = resultsp;
-	reply_msg.acpted_rply.ar_results.proc = xresults;
-
-	for (;;) {
-		/* Decide how long to wait. */
-		if (timercmp(&next_sendtime, &timeout, <))
-			timersub(&next_sendtime, &time_waited, &tv);
-		else
-			timersub(&timeout, &time_waited, &tv);
-		if (tv.tv_sec < 0 || tv.tv_usec < 0)
-			tv.tv_sec = tv.tv_usec = 0;
-		TIMEVAL_TO_TIMESPEC(&tv, &ts);
-
-		n = _kevent(cu->cu_kq, &cu->cu_kin, kin_len, &kv, 1, &ts);
-		/* We don't need to register the event again. */
-		kin_len = 0;
-
-		if (n == 1) {
-			if (kv.flags & EV_ERROR) {
-				cu->cu_error.re_errno = kv.data;
-				cu->cu_error.re_status = RPC_CANTRECV;
-				goto out;
-			}
-			/* We have some data now */
-			do {
-				recvlen = _recvfrom(cu->cu_fd, cu->cu_inbuf,
-				    cu->cu_recvsz, 0, NULL, NULL);
-			} while (recvlen < 0 && errno == EINTR);
-			if (recvlen < 0 && errno != EWOULDBLOCK) {
-				cu->cu_error.re_errno = errno;
-				cu->cu_error.re_status = RPC_CANTRECV;
-				goto out;
-			}
-			if (recvlen >= sizeof(uint32_t) &&
-			    (cu->cu_async == TRUE ||
-			    *((uint32_t *)(void *)(cu->cu_inbuf)) ==
-			    *((uint32_t *)(void *)(cu->cu_outbuf)))) {
-				/* We now assume we have the proper reply. */
-				break;
-			}
-		}
-		if (n == -1 && errno != EINTR) {
-			cu->cu_error.re_errno = errno;
-			cu->cu_error.re_status = RPC_CANTRECV;
-			goto out;
-		}
-		gettimeofday(&tv, NULL);
-		timersub(&tv, &starttime, &time_waited);
-
-		/* Check for timeout. */
-		if (timercmp(&time_waited, &timeout, >)) {
-			cu->cu_error.re_status = RPC_TIMEDOUT;
-			goto out;
-		}
-
-		/* Retransmit if necessary. */		
-		if (timercmp(&time_waited, &next_sendtime, >)) {
-			/* update retransmit_time */
-			if (retransmit_time.tv_sec < RPC_MAX_BACKOFF)
-				timeradd(&retransmit_time, &retransmit_time,
-				    &retransmit_time);
-			timeradd(&next_sendtime, &retransmit_time,
-			    &next_sendtime);
-			goto send_again;
-		}
-	}
-	inlen = (socklen_t)recvlen;
-
-	/*
-	 * now decode and validate the response
-	 */
-
-	xdrmem_create(&reply_xdrs, cu->cu_inbuf, (u_int)recvlen, XDR_DECODE);
-	ok = xdr_replymsg(&reply_xdrs, &reply_msg);
-	/* XDR_DESTROY(&reply_xdrs);	save a few cycles on noop destroy */
-	if (ok) {
-		if ((reply_msg.rm_reply.rp_stat == MSG_ACCEPTED) &&
-			(reply_msg.acpted_rply.ar_stat == SUCCESS))
-			cu->cu_error.re_status = RPC_SUCCESS;
-		else
-			_seterr_reply(&reply_msg, &(cu->cu_error));
-
-		if (cu->cu_error.re_status == RPC_SUCCESS) {
-			if (! AUTH_VALIDATE(cl->cl_auth,
-					    &reply_msg.acpted_rply.ar_verf)) {
-				cu->cu_error.re_status = RPC_AUTHERROR;
-				cu->cu_error.re_why = AUTH_INVALIDRESP;
-			}
-			if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) {
-				xdrs->x_op = XDR_FREE;
-				(void) xdr_opaque_auth(xdrs,
-					&(reply_msg.acpted_rply.ar_verf));
-			}
-		}		/* end successful completion */
-		/*
-		 * If unsuccesful AND error is an authentication error
-		 * then refresh credentials and try again, else break
-		 */
-		else if (cu->cu_error.re_status == RPC_AUTHERROR)
-			/* maybe our credentials need to be refreshed ... */
-			if (nrefreshes > 0 &&
-			    AUTH_REFRESH(cl->cl_auth, &reply_msg)) {
-				nrefreshes--;
-				goto call_again;
-			}
-		/* end of unsuccessful completion */
-	}	/* end of valid reply message */
-	else {
-		cu->cu_error.re_status = RPC_CANTDECODERES;
-
-	}
-out:
-	if (cu->cu_kq >= 0)
-		_close(cu->cu_kq);
-	cu->cu_kq = -1;
-	release_fd_lock(cu->cu_fd, mask);
-	return (cu->cu_error.re_status);
-}
-
-static void
-clnt_dg_geterr(cl, errp)
-	CLIENT *cl;
-	struct rpc_err *errp;
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-
-	*errp = cu->cu_error;
-}
-
-static bool_t
-clnt_dg_freeres(cl, xdr_res, res_ptr)
-	CLIENT *cl;
-	xdrproc_t xdr_res;
-	void *res_ptr;
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	XDR *xdrs = &(cu->cu_outxdrs);
-	bool_t dummy;
-	sigset_t mask;
-	sigset_t newmask;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu->cu_fd])
-		cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock);
-	xdrs->x_op = XDR_FREE;
-	dummy = (*xdr_res)(xdrs, res_ptr);
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &mask, NULL);
-	cond_signal(&dg_cv[cu->cu_fd]);
-	return (dummy);
-}
-
-/*ARGSUSED*/
-static void
-clnt_dg_abort(h)
-	CLIENT *h;
-{
-}
-
-static bool_t
-clnt_dg_control(cl, request, info)
-	CLIENT *cl;
-	u_int request;
-	void *info;
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	struct netbuf *addr;
-	sigset_t mask;
-	sigset_t newmask;
-	int rpc_lock_value;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu->cu_fd])
-		cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock);
-	if (__isthreaded)
-                rpc_lock_value = 1;
-        else
-                rpc_lock_value = 0;
-	dg_fd_locks[cu->cu_fd] = rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-	switch (request) {
-	case CLSET_FD_CLOSE:
-		cu->cu_closeit = TRUE;
-		release_fd_lock(cu->cu_fd, mask);
-		return (TRUE);
-	case CLSET_FD_NCLOSE:
-		cu->cu_closeit = FALSE;
-		release_fd_lock(cu->cu_fd, mask);
-		return (TRUE);
-	}
-
-	/* for other requests which use info */
-	if (info == NULL) {
-		release_fd_lock(cu->cu_fd, mask);
-		return (FALSE);
-	}
-	switch (request) {
-	case CLSET_TIMEOUT:
-		if (time_not_ok((struct timeval *)info)) {
-			release_fd_lock(cu->cu_fd, mask);
-			return (FALSE);
-		}
-		cu->cu_total = *(struct timeval *)info;
-		break;
-	case CLGET_TIMEOUT:
-		*(struct timeval *)info = cu->cu_total;
-		break;
-	case CLGET_SERVER_ADDR:		/* Give him the fd address */
-		/* Now obsolete. Only for backward compatibility */
-		(void) memcpy(info, &cu->cu_raddr, (size_t)cu->cu_rlen);
-		break;
-	case CLSET_RETRY_TIMEOUT:
-		if (time_not_ok((struct timeval *)info)) {
-			release_fd_lock(cu->cu_fd, mask);
-			return (FALSE);
-		}
-		cu->cu_wait = *(struct timeval *)info;
-		break;
-	case CLGET_RETRY_TIMEOUT:
-		*(struct timeval *)info = cu->cu_wait;
-		break;
-	case CLGET_FD:
-		*(int *)info = cu->cu_fd;
-		break;
-	case CLGET_SVC_ADDR:
-		addr = (struct netbuf *)info;
-		addr->buf = &cu->cu_raddr;
-		addr->len = cu->cu_rlen;
-		addr->maxlen = sizeof cu->cu_raddr;
-		break;
-	case CLSET_SVC_ADDR:		/* set to new address */
-		addr = (struct netbuf *)info;
-		if (addr->len < sizeof cu->cu_raddr) {
-			release_fd_lock(cu->cu_fd, mask);
-			return (FALSE);
-		}
-		(void) memcpy(&cu->cu_raddr, addr->buf, addr->len);
-		cu->cu_rlen = addr->len;
-		break;
-	case CLGET_XID:
-		/*
-		 * use the knowledge that xid is the
-		 * first element in the call structure *.
-		 * This will get the xid of the PREVIOUS call
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)cu->cu_outbuf);
-		break;
-
-	case CLSET_XID:
-		/* This will set the xid of the NEXT call */
-		*(uint32_t *)(void *)cu->cu_outbuf =
-		    htonl(*(uint32_t *)info - 1);
-		/* decrement by 1 as clnt_dg_call() increments once */
-		break;
-
-	case CLGET_VERS:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the version number field is the fifth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)(cu->cu_outbuf +
-		    4 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_VERS:
-		*(uint32_t *)(void *)(cu->cu_outbuf + 4 * BYTES_PER_XDR_UNIT)
-			= htonl(*(uint32_t *)info);
-		break;
-
-	case CLGET_PROG:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the program number field is the fourth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)(cu->cu_outbuf +
-		    3 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_PROG:
-		*(uint32_t *)(void *)(cu->cu_outbuf + 3 * BYTES_PER_XDR_UNIT)
-			= htonl(*(uint32_t *)info);
-		break;
-	case CLSET_ASYNC:
-		cu->cu_async = *(int *)info;
-		break;
-	case CLSET_CONNECT:
-		cu->cu_connect = *(int *)info;
-		break;
-	default:
-		release_fd_lock(cu->cu_fd, mask);
-		return (FALSE);
-	}
-	release_fd_lock(cu->cu_fd, mask);
-	return (TRUE);
-}
-
-static void
-clnt_dg_destroy(cl)
-	CLIENT *cl;
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	int cu_fd = cu->cu_fd;
-	sigset_t mask;
-	sigset_t newmask;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu_fd])
-		cond_wait(&dg_cv[cu_fd], &clnt_fd_lock);
-	if (cu->cu_closeit)
-		(void)_close(cu_fd);
-	if (cu->cu_kq >= 0)
-		_close(cu->cu_kq);
-	XDR_DESTROY(&(cu->cu_outxdrs));
-	mem_free(cu, (sizeof (*cu) + cu->cu_sendsz + cu->cu_recvsz));
-	if (cl->cl_netid && cl->cl_netid[0])
-		mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);
-	if (cl->cl_tp && cl->cl_tp[0])
-		mem_free(cl->cl_tp, strlen(cl->cl_tp) +1);
-	mem_free(cl, sizeof (CLIENT));
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &mask, NULL);
-	cond_signal(&dg_cv[cu_fd]);
-}
-
-static struct clnt_ops *
-clnt_dg_ops()
-{
-	static struct clnt_ops ops;
-	extern mutex_t	ops_lock;
-	sigset_t mask;
-	sigset_t newmask;
-
-/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&ops_lock);
-	if (ops.cl_call == NULL) {
-		ops.cl_call = clnt_dg_call;
-		ops.cl_abort = clnt_dg_abort;
-		ops.cl_geterr = clnt_dg_geterr;
-		ops.cl_freeres = clnt_dg_freeres;
-		ops.cl_destroy = clnt_dg_destroy;
-		ops.cl_control = clnt_dg_control;
-	}
-	mutex_unlock(&ops_lock);
-	thr_sigsetmask(SIG_SETMASK, &mask, NULL);
-	return (&ops);
-}
-
-/*
- * Make sure that the time is not garbage.  -1 value is allowed.
- */
-static bool_t
-time_not_ok(t)
-	struct timeval *t;
-{
-	return (t->tv_sec < -1 || t->tv_sec > 100000000 ||
-		t->tv_usec < -1 || t->tv_usec > 1000000);
-}
-
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
deleted file mode 100644
index 9b74c6a..0000000
--- a/lib/libc/rpc/clnt_generic.c
+++ /dev/null
@@ -1,466 +0,0 @@
-/*	$NetBSD: clnt_generic.c,v 1.18 2000/07/06 03:10:34 christos Exp $	*/
-
-/*
- * The contents of this file are subject to the Sun Standards
- * License Version 1.0 the (the "License";) You may not use
- * this file except in compliance with the License.  You may
- * obtain a copy of the License at lib/libc/rpc/LICENSE
- *
- * Software distributed under the License is distributed on
- * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied.  See the License for the specific
- * language governing rights and limitations under the License.
- *
- * The Original Code is Copyright 1998 by Sun Microsystems, Inc
- *
- * The Initial Developer of the Original Code is:  Sun
- * Microsystems, Inc.
- *
- * All Rights Reserved.
- *
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/* #ident	"@(#)clnt_generic.c	1.40	99/04/21 SMI" */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
-static char *sccsid = "from: @(#)clnt_generic.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_generic.c,v 1.15 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * Copyright (c) 1986-1996,1998 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <stdio.h>
-#include <errno.h>
-#include <netdb.h>
-#include <syslog.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-
-extern bool_t __rpc_is_local_host(const char *);
-int __rpc_raise_fd(int);
-
-#ifndef NETIDLEN
-#define	NETIDLEN 32
-#endif
-
-
-/*
- * Generic client creation with version checking the value of
- * vers_out is set to the highest server supported value
- * vers_low <= vers_out <= vers_high  AND an error results
- * if this can not be done.
- *
- * It calls clnt_create_vers_timed() with a NULL value for the timeout
- * pointer, which indicates that the default timeout should be used.
- */
-CLIENT *
-clnt_create_vers(const char *hostname, rpcprog_t prog, rpcvers_t *vers_out,
-	rpcvers_t vers_low, rpcvers_t vers_high, const char *nettype)
-{
-
-	return (clnt_create_vers_timed(hostname, prog, vers_out, vers_low,
-				vers_high, nettype, NULL));
-}
-
-/*
- * This the routine has the same definition as clnt_create_vers(),
- * except it takes an additional timeout parameter - a pointer to
- * a timeval structure.  A NULL value for the pointer indicates
- * that the default timeout value should be used.
- */
-CLIENT *
-clnt_create_vers_timed(const char *hostname, rpcprog_t prog,
-    rpcvers_t *vers_out, rpcvers_t vers_low, rpcvers_t vers_high,
-    const char *nettype, const struct timeval *tp)
-{
-	CLIENT *clnt;
-	struct timeval to;
-	enum clnt_stat rpc_stat;
-	struct rpc_err rpcerr;
-
-	clnt = clnt_create_timed(hostname, prog, vers_high, nettype, tp);
-	if (clnt == NULL) {
-		return (NULL);
-	}
-	to.tv_sec = 10;
-	to.tv_usec = 0;
-	rpc_stat = clnt_call(clnt, NULLPROC, (xdrproc_t)xdr_void,
-			(char *)NULL, (xdrproc_t)xdr_void, (char *)NULL, to);
-	if (rpc_stat == RPC_SUCCESS) {
-		*vers_out = vers_high;
-		return (clnt);
-	}
-	while (rpc_stat == RPC_PROGVERSMISMATCH && vers_high > vers_low) {
-		unsigned int minvers, maxvers;
-
-		clnt_geterr(clnt, &rpcerr);
-		minvers = rpcerr.re_vers.low;
-		maxvers = rpcerr.re_vers.high;
-		if (maxvers < vers_high)
-			vers_high = maxvers;
-		else
-			vers_high--;
-		if (minvers > vers_low)
-			vers_low = minvers;
-		if (vers_low > vers_high) {
-			goto error;
-		}
-		CLNT_CONTROL(clnt, CLSET_VERS, (char *)&vers_high);
-		rpc_stat = clnt_call(clnt, NULLPROC, (xdrproc_t)xdr_void,
-				(char *)NULL, (xdrproc_t)xdr_void,
-				(char *)NULL, to);
-		if (rpc_stat == RPC_SUCCESS) {
-			*vers_out = vers_high;
-			return (clnt);
-		}
-	}
-	clnt_geterr(clnt, &rpcerr);
-
-error:
-	rpc_createerr.cf_stat = rpc_stat;
-	rpc_createerr.cf_error = rpcerr;
-	clnt_destroy(clnt);
-	return (NULL);
-}
-
-/*
- * Top level client creation routine.
- * Generic client creation: takes (servers name, program-number, nettype) and
- * returns client handle. Default options are set, which the user can
- * change using the rpc equivalent of _ioctl()'s.
- *
- * It tries for all the netids in that particular class of netid until
- * it succeeds.
- * XXX The error message in the case of failure will be the one
- * pertaining to the last create error.
- *
- * It calls clnt_create_timed() with the default timeout.
- */
-CLIENT *
-clnt_create(const char *hostname, rpcprog_t prog, rpcvers_t vers,
-    const char *nettype)
-{
-
-	return (clnt_create_timed(hostname, prog, vers, nettype, NULL));
-}
-
-/*
- * This the routine has the same definition as clnt_create(),
- * except it takes an additional timeout parameter - a pointer to
- * a timeval structure.  A NULL value for the pointer indicates
- * that the default timeout value should be used.
- *
- * This function calls clnt_tp_create_timed().
- */
-CLIENT *
-clnt_create_timed(const char *hostname, rpcprog_t prog, rpcvers_t vers,
-    const char *netclass, const struct timeval *tp)
-{
-	struct netconfig *nconf;
-	CLIENT *clnt = NULL;
-	void *handle;
-	enum clnt_stat	save_cf_stat = RPC_SUCCESS;
-	struct rpc_err	save_cf_error;
-	char nettype_array[NETIDLEN];
-	char *nettype = &nettype_array[0];
-
-	if (netclass == NULL)
-		nettype = NULL;
-	else {
-		size_t len = strlen(netclass);
-		if (len >= sizeof (nettype_array)) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			return (NULL);
-		}
-		strcpy(nettype, netclass);
-	}
-
-	if ((handle = __rpc_setconf((char *)nettype)) == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-	rpc_createerr.cf_stat = RPC_SUCCESS;
-	while (clnt == NULL) {
-		if ((nconf = __rpc_getconf(handle)) == NULL) {
-			if (rpc_createerr.cf_stat == RPC_SUCCESS)
-				rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			break;
-		}
-#ifdef CLNT_DEBUG
-		printf("trying netid %s\n", nconf->nc_netid);
-#endif
-		clnt = clnt_tp_create_timed(hostname, prog, vers, nconf, tp);
-		if (clnt)
-			break;
-		else
-			/*
-			 *	Since we didn't get a name-to-address
-			 *	translation failure here, we remember
-			 *	this particular error.  The object of
-			 *	this is to enable us to return to the
-			 *	caller a more-specific error than the
-			 *	unhelpful ``Name to address translation
-			 *	failed'' which might well occur if we
-			 *	merely returned the last error (because
-			 *	the local loopbacks are typically the
-			 *	last ones in /etc/netconfig and the most
-			 *	likely to be unable to translate a host
-			 *	name).  We also check for a more
-			 *	meaningful error than ``unknown host
-			 *	name'' for the same reasons.
-			 */
-			if (rpc_createerr.cf_stat != RPC_N2AXLATEFAILURE &&
-			    rpc_createerr.cf_stat != RPC_UNKNOWNHOST) {
-				save_cf_stat = rpc_createerr.cf_stat;
-				save_cf_error = rpc_createerr.cf_error;
-			}
-	}
-
-	/*
-	 *	Attempt to return an error more specific than ``Name to address
-	 *	translation failed'' or ``unknown host name''
-	 */
-	if ((rpc_createerr.cf_stat == RPC_N2AXLATEFAILURE ||
-				rpc_createerr.cf_stat == RPC_UNKNOWNHOST) &&
-					(save_cf_stat != RPC_SUCCESS)) {
-		rpc_createerr.cf_stat = save_cf_stat;
-		rpc_createerr.cf_error = save_cf_error;
-	}
-	__rpc_endconf(handle);
-	return (clnt);
-}
-
-/*
- * Generic client creation: takes (servers name, program-number, netconf) and
- * returns client handle. Default options are set, which the user can
- * change using the rpc equivalent of _ioctl()'s : clnt_control()
- * It finds out the server address from rpcbind and calls clnt_tli_create().
- *
- * It calls clnt_tp_create_timed() with the default timeout.
- */
-CLIENT *
-clnt_tp_create(const char *hostname, rpcprog_t prog, rpcvers_t vers,
-    const struct netconfig *nconf)
-{
-
-	return (clnt_tp_create_timed(hostname, prog, vers, nconf, NULL));
-}
-
-/*
- * This has the same definition as clnt_tp_create(), except it
- * takes an additional parameter - a pointer to a timeval structure.
- * A NULL value for the timeout pointer indicates that the default
- * value for the timeout should be used.
- */
-CLIENT *
-clnt_tp_create_timed(const char *hostname, rpcprog_t prog, rpcvers_t vers,
-    const struct netconfig *nconf, const struct timeval *tp)
-{
-	struct netbuf *svcaddr;			/* servers address */
-	CLIENT *cl = NULL;			/* client handle */
-
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-
-	/*
-	 * Get the address of the server
-	 */
-	if ((svcaddr = __rpcb_findaddr_timed(prog, vers,
-			(struct netconfig *)nconf, (char *)hostname,
-			&cl, (struct timeval *)tp)) == NULL) {
-		/* appropriate error number is set by rpcbind libraries */
-		return (NULL);
-	}
-	if (cl == NULL) {
-		cl = clnt_tli_create(RPC_ANYFD, nconf, svcaddr,
-					prog, vers, 0, 0);
-	} else {
-		/* Reuse the CLIENT handle and change the appropriate fields */
-		if (CLNT_CONTROL(cl, CLSET_SVC_ADDR, (void *)svcaddr) == TRUE) {
-			if (cl->cl_netid == NULL)
-				cl->cl_netid = strdup(nconf->nc_netid);
-			if (cl->cl_tp == NULL)
-				cl->cl_tp = strdup(nconf->nc_device);
-			(void) CLNT_CONTROL(cl, CLSET_PROG, (void *)&prog);
-			(void) CLNT_CONTROL(cl, CLSET_VERS, (void *)&vers);
-		} else {
-			CLNT_DESTROY(cl);
-			cl = clnt_tli_create(RPC_ANYFD, nconf, svcaddr,
-					prog, vers, 0, 0);
-		}
-	}
-	free(svcaddr->buf);
-	free(svcaddr);
-	return (cl);
-}
-
-/*
- * Generic client creation:  returns client handle.
- * Default options are set, which the user can
- * change using the rpc equivalent of _ioctl()'s : clnt_control().
- * If fd is RPC_ANYFD, it will be opened using nconf.
- * It will be bound if not so.
- * If sizes are 0; appropriate defaults will be chosen.
- */
-CLIENT *
-clnt_tli_create(int fd, const struct netconfig *nconf,
-	struct netbuf *svcaddr, rpcprog_t prog, rpcvers_t vers,
-	uint sendsz, uint recvsz)
-{
-	CLIENT *cl;			/* client handle */
-	bool_t madefd = FALSE;		/* whether fd opened here */
-	long servtype;
-	int one = 1;
-	struct __rpc_sockinfo si;
-	extern int __rpc_minfd;
-
-	if (fd == RPC_ANYFD) {
-		if (nconf == NULL) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			return (NULL);
-		}
-
-		fd = __rpc_nconf2fd(nconf);
-
-		if (fd == -1)
-			goto err;
-		if (fd < __rpc_minfd)
-			fd = __rpc_raise_fd(fd);
-		madefd = TRUE;
-		servtype = nconf->nc_semantics;
-		if (!__rpc_fd2sockinfo(fd, &si))
-			goto err;
-		bindresvport(fd, NULL);
-	} else {
-		if (!__rpc_fd2sockinfo(fd, &si))
-			goto err;
-		servtype = __rpc_socktype2seman(si.si_socktype);
-		if (servtype == -1) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			return (NULL);
-		}
-	}
-
-	if (si.si_af != ((struct sockaddr *)svcaddr->buf)->sa_family) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNHOST;	/* XXX */
-		goto err1;
-	}
-
-	switch (servtype) {
-	case NC_TPI_COTS:
-		cl = clnt_vc_create(fd, svcaddr, prog, vers, sendsz, recvsz);
-		break;
-	case NC_TPI_COTS_ORD:
-		if (nconf && ((strcmp(nconf->nc_protofmly, "inet") == 0))) {
-			_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &one,
-			    sizeof (one));
-		}
-		cl = clnt_vc_create(fd, svcaddr, prog, vers, sendsz, recvsz);
-		break;
-	case NC_TPI_CLTS:
-		cl = clnt_dg_create(fd, svcaddr, prog, vers, sendsz, recvsz);
-		break;
-	default:
-		goto err;
-	}
-
-	if (cl == NULL)
-		goto err1; /* borrow errors from clnt_dg/vc creates */
-	if (nconf) {
-		cl->cl_netid = strdup(nconf->nc_netid);
-		cl->cl_tp = strdup(nconf->nc_device);
-	} else {
-		cl->cl_netid = "";
-		cl->cl_tp = "";
-	}
-	if (madefd) {
-		(void) CLNT_CONTROL(cl, CLSET_FD_CLOSE, NULL);
-/*		(void) CLNT_CONTROL(cl, CLSET_POP_TIMOD, NULL);  */
-	};
-
-	return (cl);
-
-err:
-	rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-	rpc_createerr.cf_error.re_errno = errno;
-err1:	if (madefd)
-		(void)_close(fd);
-	return (NULL);
-}
-
-/*
- *  To avoid conflicts with the "magic" file descriptors (0, 1, and 2),
- *  we try to not use them.  The __rpc_raise_fd() routine will dup
- *  a descriptor to a higher value.  If we fail to do it, we continue
- *  to use the old one (and hope for the best).
- */
-int __rpc_minfd = 3;
-
-int
-__rpc_raise_fd(int fd)
-{
-	int nfd;
-
-	if (fd >= __rpc_minfd)
-		return (fd);
-
-	if ((nfd = _fcntl(fd, F_DUPFD, __rpc_minfd)) == -1)
-		return (fd);
-
-	if (_fsync(nfd) == -1) {
-		_close(nfd);
-		return (fd);
-	}
-
-	if (_close(fd) == -1) {
-		/* this is okay, we will syslog an error, then use the new fd */
-		(void) syslog(LOG_ERR,
-			"could not close() fd %d; mem & fd leak", fd);
-	}
-
-	return (nfd);
-}
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
deleted file mode 100644
index e3e982b..0000000
--- a/lib/libc/rpc/clnt_perror.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*	$NetBSD: clnt_perror.c,v 1.24 2000/06/02 23:11:07 fvdl Exp $	*/
-
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)clnt_perror.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_perror.c,v 1.17 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * clnt_perror.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- */
-#include "namespace.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/clnt.h>
-#include "un-namespace.h"
-
-static char *buf;
-
-static char *_buf(void);
-static char *auth_errmsg(enum auth_stat);
-#define CLNT_PERROR_BUFLEN 256
-
-static char *
-_buf()
-{
-
-	if (buf == 0)
-		buf = (char *)malloc(CLNT_PERROR_BUFLEN);
-	return (buf);
-}
-
-/*
- * Print reply error info
- */
-char *
-clnt_sperror(rpch, s)
-	CLIENT *rpch;
-	const char *s;
-{
-	struct rpc_err e;
-	char *err;
-	char *str;
-	char *strstart;
-	size_t len, i;
-
-	assert(rpch != NULL);
-	assert(s != NULL);
-
-	str = _buf(); /* side effect: sets CLNT_PERROR_BUFLEN */
-	if (str == 0)
-		return (0);
-	len = CLNT_PERROR_BUFLEN;
-	strstart = str;
-	CLNT_GETERR(rpch, &e);
-
-	if ((i = snprintf(str, len, "%s: ", s)) > 0) {
-		str += i;
-		len -= i;
-	}
-
-	(void)strncpy(str, clnt_sperrno(e.re_status), len - 1);
-	i = strlen(str);
-	str += i;
-	len -= i;
-
-	switch (e.re_status) {
-	case RPC_SUCCESS:
-	case RPC_CANTENCODEARGS:
-	case RPC_CANTDECODERES:
-	case RPC_TIMEDOUT:
-	case RPC_PROGUNAVAIL:
-	case RPC_PROCUNAVAIL:
-	case RPC_CANTDECODEARGS:
-	case RPC_SYSTEMERROR:
-	case RPC_UNKNOWNHOST:
-	case RPC_UNKNOWNPROTO:
-	case RPC_PMAPFAILURE:
-	case RPC_PROGNOTREGISTERED:
-	case RPC_FAILED:
-		break;
-
-	case RPC_CANTSEND:
-	case RPC_CANTRECV:
-		i = snprintf(str, len, "; errno = %s", strerror(e.re_errno)); 
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-
-	case RPC_VERSMISMATCH:
-		i = snprintf(str, len, "; low version = %u, high version = %u", 
-			e.re_vers.low, e.re_vers.high);
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-
-	case RPC_AUTHERROR:
-		err = auth_errmsg(e.re_why);
-		i = snprintf(str, len, "; why = ");
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		if (err != NULL) {
-			i = snprintf(str, len, "%s",err);
-		} else {
-			i = snprintf(str, len,
-				"(unknown authentication error - %d)",
-				(int) e.re_why);
-		}
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-
-	case RPC_PROGVERSMISMATCH:
-		i = snprintf(str, len, "; low version = %u, high version = %u", 
-			e.re_vers.low, e.re_vers.high);
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-
-	default:	/* unknown */
-		i = snprintf(str, len, "; s1 = %u, s2 = %u", 
-			e.re_lb.s1, e.re_lb.s2);
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-	}
-	strstart[CLNT_PERROR_BUFLEN-1] = '\0';
-	return(strstart) ;
-}
-
-void
-clnt_perror(rpch, s)
-	CLIENT *rpch;
-	const char *s;
-{
-
-	assert(rpch != NULL);
-	assert(s != NULL);
-
-	(void) fprintf(stderr, "%s\n", clnt_sperror(rpch,s));
-}
-
-static const char *const rpc_errlist[] = {
-	"RPC: Success",				/*  0 - RPC_SUCCESS */
-	"RPC: Can't encode arguments",		/*  1 - RPC_CANTENCODEARGS */
-	"RPC: Can't decode result",		/*  2 - RPC_CANTDECODERES */
-	"RPC: Unable to send",			/*  3 - RPC_CANTSEND */
-	"RPC: Unable to receive",		/*  4 - RPC_CANTRECV */
-	"RPC: Timed out",			/*  5 - RPC_TIMEDOUT */
-	"RPC: Incompatible versions of RPC",	/*  6 - RPC_VERSMISMATCH */
-	"RPC: Authentication error",		/*  7 - RPC_AUTHERROR */
-	"RPC: Program unavailable",		/*  8 - RPC_PROGUNAVAIL */
-	"RPC: Program/version mismatch",	/*  9 - RPC_PROGVERSMISMATCH */
-	"RPC: Procedure unavailable",		/* 10 - RPC_PROCUNAVAIL */
-	"RPC: Server can't decode arguments",	/* 11 - RPC_CANTDECODEARGS */
-	"RPC: Remote system error",		/* 12 - RPC_SYSTEMERROR */
-	"RPC: Unknown host",			/* 13 - RPC_UNKNOWNHOST */
-	"RPC: Port mapper failure",		/* 14 - RPC_PMAPFAILURE */
-	"RPC: Program not registered",		/* 15 - RPC_PROGNOTREGISTERED */
-	"RPC: Failed (unspecified error)",	/* 16 - RPC_FAILED */
-	"RPC: Unknown protocol"			/* 17 - RPC_UNKNOWNPROTO */
-};
-
-
-/*
- * This interface for use by clntrpc
- */
-char *
-clnt_sperrno(stat)
-	enum clnt_stat stat;
-{
-	unsigned int errnum = stat;
-
-	if (errnum < (sizeof(rpc_errlist)/sizeof(rpc_errlist[0])))
-		/* LINTED interface problem */
-		return (char *)rpc_errlist[errnum];
-
-	return ("RPC: (unknown error code)");
-}
-
-void
-clnt_perrno(num)
-	enum clnt_stat num;
-{
-	(void) fprintf(stderr, "%s\n", clnt_sperrno(num));
-}
-
-
-char *
-clnt_spcreateerror(s)
-	const char *s;
-{
-	char *str;
-	size_t len, i;
-
-	assert(s != NULL);
-
-	str = _buf(); /* side effect: sets CLNT_PERROR_BUFLEN */
-	if (str == 0)
-		return(0);
-	len = CLNT_PERROR_BUFLEN;
-	i = snprintf(str, len, "%s: ", s);
-	if (i > 0)
-		len -= i;
-	(void)strncat(str, clnt_sperrno(rpc_createerr.cf_stat), len - 1);
-	switch (rpc_createerr.cf_stat) {
-	case RPC_PMAPFAILURE:
-		(void) strncat(str, " - ", len - 1);
-		(void) strncat(str,
-		    clnt_sperrno(rpc_createerr.cf_error.re_status), len - 4);
-		break;
-
-	case RPC_SYSTEMERROR:
-		(void)strncat(str, " - ", len - 1);
-		(void)strncat(str, strerror(rpc_createerr.cf_error.re_errno),
-		    len - 4);
-		break;
-
-	case RPC_CANTSEND:
-	case RPC_CANTDECODERES:
-	case RPC_CANTENCODEARGS:
-	case RPC_SUCCESS:
-	case RPC_UNKNOWNPROTO:
-	case RPC_PROGNOTREGISTERED:
-	case RPC_FAILED:
-	case RPC_UNKNOWNHOST:
-	case RPC_CANTDECODEARGS:
-	case RPC_PROCUNAVAIL:
-	case RPC_PROGVERSMISMATCH:
-	case RPC_PROGUNAVAIL:
-	case RPC_AUTHERROR:
-	case RPC_VERSMISMATCH:
-	case RPC_TIMEDOUT:
-	case RPC_CANTRECV:
-	default:
-		break;
-	}
-	str[CLNT_PERROR_BUFLEN-1] = '\0';
-	return (str);
-}
-
-void
-clnt_pcreateerror(s)
-	const char *s;
-{
-
-	assert(s != NULL);
-
-	(void) fprintf(stderr, "%s\n", clnt_spcreateerror(s));
-}
-
-static const char *const auth_errlist[] = {
-	"Authentication OK",			/* 0 - AUTH_OK */
-	"Invalid client credential",		/* 1 - AUTH_BADCRED */
-	"Server rejected credential",		/* 2 - AUTH_REJECTEDCRED */
-	"Invalid client verifier", 		/* 3 - AUTH_BADVERF */
-	"Server rejected verifier", 		/* 4 - AUTH_REJECTEDVERF */
-	"Client credential too weak",		/* 5 - AUTH_TOOWEAK */
-	"Invalid server verifier",		/* 6 - AUTH_INVALIDRESP */
-	"Failed (unspecified error)"		/* 7 - AUTH_FAILED */
-};
-
-static char *
-auth_errmsg(stat)
-	enum auth_stat stat;
-{
-	unsigned int errnum = stat;
-
-	if (errnum < (sizeof(auth_errlist)/sizeof(auth_errlist[0])))
-		/* LINTED interface problem */
-		return (char *)auth_errlist[errnum];
-
-	return(NULL);
-}
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
deleted file mode 100644
index 0fdb798..0000000
--- a/lib/libc/rpc/clnt_raw.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*	$NetBSD: clnt_raw.c,v 1.20 2000/12/10 04:12:03 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_raw.c,v 1.19 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * clnt_raw.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * Memory based rpc for simple testing and timing.
- * Interface to create an rpc client and server in the same process.
- * This lets us similate rpc and get round trip overhead, without
- * any interference from the kernel.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rpc/rpc.h>
-#include <rpc/raw.h>
-#include "un-namespace.h"
-
-extern mutex_t clntraw_lock;
-
-#define MCALL_MSG_SIZE 24
-
-/*
- * This is the "network" we will be moving stuff over.
- */
-static struct clntraw_private {
-	CLIENT	client_object;
-	XDR	xdr_stream;
-	char	*_raw_buf;
-	union {
-	    struct rpc_msg	mashl_rpcmsg;
-	    char 		mashl_callmsg[MCALL_MSG_SIZE];
-	} u;
-	u_int	mcnt;
-} *clntraw_private;
-
-static enum clnt_stat clnt_raw_call(CLIENT *, rpcproc_t, xdrproc_t, void *,
-	xdrproc_t, void *, struct timeval);
-static void clnt_raw_geterr(CLIENT *, struct rpc_err *);
-static bool_t clnt_raw_freeres(CLIENT *, xdrproc_t, void *);
-static void clnt_raw_abort(CLIENT *);
-static bool_t clnt_raw_control(CLIENT *, u_int, void *);
-static void clnt_raw_destroy(CLIENT *);
-static struct clnt_ops *clnt_raw_ops(void);
-
-/*
- * Create a client handle for memory based rpc.
- */
-CLIENT *
-clnt_raw_create(prog, vers)
-	rpcprog_t prog;
-	rpcvers_t vers;
-{
-	struct clntraw_private *clp = clntraw_private;
-	struct rpc_msg call_msg;
-	XDR *xdrs = &clp->xdr_stream;
-	CLIENT	*client = &clp->client_object;
-
-	mutex_lock(&clntraw_lock);
-	if (clp == NULL) {
-		clp = (struct clntraw_private *)calloc(1, sizeof (*clp));
-		if (clp == NULL) {
-			mutex_unlock(&clntraw_lock);
-			return NULL;
-		}
-		if (__rpc_rawcombuf == NULL)
-			__rpc_rawcombuf =
-			    (char *)calloc(UDPMSGSIZE, sizeof (char));
-		clp->_raw_buf = __rpc_rawcombuf;
-		clntraw_private = clp;
-	}
-	/*
-	 * pre-serialize the static part of the call msg and stash it away
-	 */
-	call_msg.rm_direction = CALL;
-	call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	/* XXX: prog and vers have been long historically :-( */
-	call_msg.rm_call.cb_prog = (uint32_t)prog;
-	call_msg.rm_call.cb_vers = (uint32_t)vers;
-	xdrmem_create(xdrs, clp->u.mashl_callmsg, MCALL_MSG_SIZE, XDR_ENCODE); 
-	if (! xdr_callhdr(xdrs, &call_msg))
-		warnx("clntraw_create - Fatal header serialization error.");
-	clp->mcnt = XDR_GETPOS(xdrs);
-	XDR_DESTROY(xdrs);
-
-	/*
-	 * Set xdrmem for client/server shared buffer
-	 */
-	xdrmem_create(xdrs, clp->_raw_buf, UDPMSGSIZE, XDR_FREE);
-
-	/*
-	 * create client handle
-	 */
-	client->cl_ops = clnt_raw_ops();
-	client->cl_auth = authnone_create();
-	mutex_unlock(&clntraw_lock);
-	return (client);
-}
-
-/* ARGSUSED */
-static enum clnt_stat 
-clnt_raw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
-	CLIENT *h;
-	rpcproc_t proc;
-	xdrproc_t xargs;
-	void *argsp;
-	xdrproc_t xresults;
-	void *resultsp;
-	struct timeval timeout;
-{
-	struct clntraw_private *clp = clntraw_private;
-	XDR *xdrs = &clp->xdr_stream;
-	struct rpc_msg msg;
-	enum clnt_stat status;
-	struct rpc_err error;
-
-	assert(h != NULL);
-
-	mutex_lock(&clntraw_lock);
-	if (clp == NULL) {
-		mutex_unlock(&clntraw_lock);
-		return (RPC_FAILED);
-	}
-	mutex_unlock(&clntraw_lock);
-
-call_again:
-	/*
-	 * send request
-	 */
-	xdrs->x_op = XDR_ENCODE;
-	XDR_SETPOS(xdrs, 0);
-	clp->u.mashl_rpcmsg.rm_xid ++ ;
-	if ((! XDR_PUTBYTES(xdrs, clp->u.mashl_callmsg, clp->mcnt)) ||
-	    (! XDR_PUTINT32(xdrs, &proc)) ||
-	    (! AUTH_MARSHALL(h->cl_auth, xdrs)) ||
-	    (! (*xargs)(xdrs, argsp))) {
-		return (RPC_CANTENCODEARGS);
-	}
-	(void)XDR_GETPOS(xdrs);  /* called just to cause overhead */
-
-	/*
-	 * We have to call server input routine here because this is
-	 * all going on in one process. Yuk.
-	 */
-	svc_getreq_common(FD_SETSIZE);
-
-	/*
-	 * get results
-	 */
-	xdrs->x_op = XDR_DECODE;
-	XDR_SETPOS(xdrs, 0);
-	msg.acpted_rply.ar_verf = _null_auth;
-	msg.acpted_rply.ar_results.where = resultsp;
-	msg.acpted_rply.ar_results.proc = xresults;
-	if (! xdr_replymsg(xdrs, &msg)) {
-		/*
-		 * It's possible for xdr_replymsg() to fail partway
-		 * through its attempt to decode the result from the
-		 * server. If this happens, it will leave the reply
-		 * structure partially populated with dynamically
-		 * allocated memory. (This can happen if someone uses
-		 * clntudp_bufcreate() to create a CLIENT handle and
-		 * specifies a receive buffer size that is too small.)
-		 * This memory must be free()ed to avoid a leak.
-		 */
-		int op = xdrs->x_op;
-		xdrs->x_op = XDR_FREE;
-		xdr_replymsg(xdrs, &msg);
-		xdrs->x_op = op;
-		return (RPC_CANTDECODERES);
-	}
-	_seterr_reply(&msg, &error);
-	status = error.re_status;
-
-	if (status == RPC_SUCCESS) {
-		if (! AUTH_VALIDATE(h->cl_auth, &msg.acpted_rply.ar_verf)) {
-			status = RPC_AUTHERROR;
-		}
-	}  /* end successful completion */
-	else {
-		if (AUTH_REFRESH(h->cl_auth, &msg))
-			goto call_again;
-	}  /* end of unsuccessful completion */
-
-	if (status == RPC_SUCCESS) {
-		if (! AUTH_VALIDATE(h->cl_auth, &msg.acpted_rply.ar_verf)) {
-			status = RPC_AUTHERROR;
-		}
-		if (msg.acpted_rply.ar_verf.oa_base != NULL) {
-			xdrs->x_op = XDR_FREE;
-			(void)xdr_opaque_auth(xdrs, &(msg.acpted_rply.ar_verf));
-		}
-	}
-
-	return (status);
-}
-
-/*ARGSUSED*/
-static void
-clnt_raw_geterr(cl, err)
-	CLIENT *cl;
-	struct rpc_err *err;
-{
-}
-
-
-/* ARGSUSED */
-static bool_t
-clnt_raw_freeres(cl, xdr_res, res_ptr)
-	CLIENT *cl;
-	xdrproc_t xdr_res;
-	void *res_ptr;
-{
-	struct clntraw_private *clp = clntraw_private;
-	XDR *xdrs = &clp->xdr_stream;
-	bool_t rval;
-
-	mutex_lock(&clntraw_lock);
-	if (clp == NULL) {
-		rval = (bool_t) RPC_FAILED;
-		mutex_unlock(&clntraw_lock);
-		return (rval);
-	}
-	mutex_unlock(&clntraw_lock);
-	xdrs->x_op = XDR_FREE;
-	return ((*xdr_res)(xdrs, res_ptr));
-}
-
-/*ARGSUSED*/
-static void
-clnt_raw_abort(cl)
-	CLIENT *cl;
-{
-}
-
-/*ARGSUSED*/
-static bool_t
-clnt_raw_control(cl, ui, str)
-	CLIENT *cl;
-	u_int ui;
-	void *str;
-{
-	return (FALSE);
-}
-
-/*ARGSUSED*/
-static void
-clnt_raw_destroy(cl)
-	CLIENT *cl;
-{
-}
-
-static struct clnt_ops *
-clnt_raw_ops()
-{
-	static struct clnt_ops ops;
-	extern mutex_t  ops_lock;
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.cl_call == NULL) {
-		ops.cl_call = clnt_raw_call;
-		ops.cl_abort = clnt_raw_abort;
-		ops.cl_geterr = clnt_raw_geterr;
-		ops.cl_freeres = clnt_raw_freeres;
-		ops.cl_destroy = clnt_raw_destroy;
-		ops.cl_control = clnt_raw_control;
-	}
-	mutex_unlock(&ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
deleted file mode 100644
index f3ee6ed..0000000
--- a/lib/libc/rpc/clnt_simple.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*	$NetBSD: clnt_simple.c,v 1.21 2000/07/06 03:10:34 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "from: @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_simple.c,v 1.19 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * clnt_simple.c
- * Simplified front end to client rpc.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-#include <stdio.h>
-#include <errno.h>
-#include <rpc/rpc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#ifndef MAXHOSTNAMELEN
-#define	MAXHOSTNAMELEN 64
-#endif
-
-#ifndef NETIDLEN
-#define	NETIDLEN 32
-#endif
-
-struct rpc_call_private {
-	int	valid;			/* Is this entry valid ? */
-	CLIENT	*client;		/* Client handle */
-	pid_t	pid;			/* process-id at moment of creation */
-	rpcprog_t prognum;		/* Program */
-	rpcvers_t versnum;		/* Version */
-	char	host[MAXHOSTNAMELEN];	/* Servers host */
-	char	nettype[NETIDLEN];	/* Network type */
-};
-static struct rpc_call_private *rpc_call_private_main;
-
-static void rpc_call_destroy(void *);
-
-static void
-rpc_call_destroy(void *vp)
-{
-	struct rpc_call_private *rcp = (struct rpc_call_private *)vp;
-
-	if (rcp) {
-		if (rcp->client)
-			CLNT_DESTROY(rcp->client);
-		free(rcp);
-	}
-}
-
-/*
- * This is the simplified interface to the client rpc layer.
- * The client handle is not destroyed here and is reused for
- * the future calls to same prog, vers, host and nettype combination.
- *
- * The total time available is 25 seconds.
- */
-enum clnt_stat
-rpc_call(host, prognum, versnum, procnum, inproc, in, outproc, out, nettype)
-	const char *host;			/* host name */
-	rpcprog_t prognum;			/* program number */
-	rpcvers_t versnum;			/* version number */
-	rpcproc_t procnum;			/* procedure number */
-	xdrproc_t inproc, outproc;	/* in/out XDR procedures */
-	const char *in;
-	char  *out;			/* recv/send data */
-	const char *nettype;			/* nettype */
-{
-	struct rpc_call_private *rcp = (struct rpc_call_private *) 0;
-	enum clnt_stat clnt_stat;
-	struct timeval timeout, tottimeout;
-	static thread_key_t rpc_call_key;
-	extern mutex_t tsd_lock;
-	int main_thread = 1;
-
-	if ((main_thread = thr_main())) {
-		rcp = rpc_call_private_main;
-	} else {
-		if (rpc_call_key == 0) {
-			mutex_lock(&tsd_lock);
-			if (rpc_call_key == 0)
-				thr_keycreate(&rpc_call_key, rpc_call_destroy);
-			mutex_unlock(&tsd_lock);
-		}
-		rcp = (struct rpc_call_private *)thr_getspecific(rpc_call_key);
-	}
-	if (rcp == NULL) {
-		rcp = malloc(sizeof (*rcp));
-		if (rcp == NULL) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			return (rpc_createerr.cf_stat);
-		}
-		if (main_thread)
-			rpc_call_private_main = rcp;
-		else
-			thr_setspecific(rpc_call_key, (void *) rcp);
-		rcp->valid = 0;
-		rcp->client = NULL;
-	}
-	if ((nettype == NULL) || (nettype[0] == 0))
-		nettype = "netpath";
-	if (!(rcp->valid && rcp->pid == getpid() &&
-		(rcp->prognum == prognum) &&
-		(rcp->versnum == versnum) &&
-		(!strcmp(rcp->host, host)) &&
-		(!strcmp(rcp->nettype, nettype)))) {
-		int fd;
-
-		rcp->valid = 0;
-		if (rcp->client)
-			CLNT_DESTROY(rcp->client);
-		/*
-		 * Using the first successful transport for that type
-		 */
-		rcp->client = clnt_create(host, prognum, versnum, nettype);
-		rcp->pid = getpid();
-		if (rcp->client == NULL) {
-			return (rpc_createerr.cf_stat);
-		}
-		/*
-		 * Set time outs for connectionless case.  Do it
-		 * unconditionally.  Faster than doing a t_getinfo()
-		 * and then doing the right thing.
-		 */
-		timeout.tv_usec = 0;
-		timeout.tv_sec = 5;
-		(void) CLNT_CONTROL(rcp->client,
-				CLSET_RETRY_TIMEOUT, (char *)(void *)&timeout);
-		if (CLNT_CONTROL(rcp->client, CLGET_FD, (char *)(void *)&fd))
-			_fcntl(fd, F_SETFD, 1);	/* make it "close on exec" */
-		rcp->prognum = prognum;
-		rcp->versnum = versnum;
-		if ((strlen(host) < (size_t)MAXHOSTNAMELEN) &&
-		    (strlen(nettype) < (size_t)NETIDLEN)) {
-			(void) strcpy(rcp->host, host);
-			(void) strcpy(rcp->nettype, nettype);
-			rcp->valid = 1;
-		} else {
-			rcp->valid = 0;
-		}
-	} /* else reuse old client */
-	tottimeout.tv_sec = 25;
-	tottimeout.tv_usec = 0;
-	/*LINTED const castaway*/
-	clnt_stat = CLNT_CALL(rcp->client, procnum, inproc, (char *) in,
-	    outproc, out, tottimeout);
-	/*
-	 * if call failed, empty cache
-	 */
-	if (clnt_stat != RPC_SUCCESS)
-		rcp->valid = 0;
-	return (clnt_stat);
-}
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
deleted file mode 100644
index aed8d10..0000000
--- a/lib/libc/rpc/clnt_vc.c
+++ /dev/null
@@ -1,847 +0,0 @@
-/*	$NetBSD: clnt_vc.c,v 1.4 2000/07/14 08:40:42 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";
-static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/clnt_vc.c,v 1.18.2.1 2006/09/23 15:02:39 mbr Exp $");
- 
-/*
- * clnt_tcp.c, Implements a TCP/IP based, client side RPC.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * TCP based RPC supports 'batched calls'.
- * A sequence of calls may be batched-up in a send buffer.  The rpc call
- * return immediately to the client even though the call was not necessarily
- * sent.  The batching occurs if the results' xdr routine is NULL (0) AND
- * the rpc timeout value is zero (see clnt.h, rpc).
- *
- * Clients should NOT casually batch calls that in fact return results; that is,
- * the server side should be aware that a call is batched and not produce any
- * return message.  Batched calls that produce many result messages can
- * deadlock (netlock) the client and the server....
- *
- * Now go hang yourself.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/poll.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/uio.h>
-
-#include <arpa/inet.h>
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-
-#define MCALL_MSG_SIZE 24
-
-struct cmessage {
-        struct cmsghdr cmsg;
-        struct cmsgcred cmcred;
-};
-
-static enum clnt_stat clnt_vc_call(CLIENT *, rpcproc_t, xdrproc_t, void *,
-    xdrproc_t, void *, struct timeval);
-static void clnt_vc_geterr(CLIENT *, struct rpc_err *);
-static bool_t clnt_vc_freeres(CLIENT *, xdrproc_t, void *);
-static void clnt_vc_abort(CLIENT *);
-static bool_t clnt_vc_control(CLIENT *, u_int, void *);
-static void clnt_vc_destroy(CLIENT *);
-static struct clnt_ops *clnt_vc_ops(void);
-static bool_t time_not_ok(struct timeval *);
-static int read_vc(void *, void *, int);
-static int write_vc(void *, void *, int);
-static int __msgwrite(int, void *, size_t);
-static int __msgread(int, void *, size_t);
-
-struct ct_data {
-	int		ct_fd;		/* connection's fd */
-	bool_t		ct_closeit;	/* close it on destroy */
-	struct timeval	ct_wait;	/* wait interval in milliseconds */
-	bool_t          ct_waitset;	/* wait set by clnt_control? */
-	struct netbuf	ct_addr;	/* remote addr */
-	struct rpc_err	ct_error;
-	union {
-		char	ct_mcallc[MCALL_MSG_SIZE];	/* marshalled callmsg */
-		uint32_t ct_mcalli;
-	} ct_u;
-	u_int		ct_mpos;	/* pos after marshal */
-	XDR		ct_xdrs;	/* XDR stream */
-};
-
-/*
- *      This machinery implements per-fd locks for MT-safety.  It is not
- *      sufficient to do per-CLIENT handle locks for MT-safety because a
- *      user may create more than one CLIENT handle with the same fd behind
- *      it.  Therfore, we allocate an array of flags (vc_fd_locks), protected
- *      by the clnt_fd_lock mutex, and an array (vc_cv) of condition variables
- *      similarly protected.  Vc_fd_lock[fd] == 1 => a call is activte on some
- *      CLIENT handle created for that fd.
- *      The current implementation holds locks across the entire RPC and reply.
- *      Yes, this is silly, and as soon as this code is proven to work, this
- *      should be the first thing fixed.  One step at a time.
- */
-static int      *vc_fd_locks;
-extern mutex_t  clnt_fd_lock;
-static cond_t   *vc_cv;
-#define release_fd_lock(fd, mask) {	\
-	mutex_lock(&clnt_fd_lock);	\
-	vc_fd_locks[fd] = 0;		\
-	mutex_unlock(&clnt_fd_lock);	\
-	thr_sigsetmask(SIG_SETMASK, &(mask), (sigset_t *) NULL);	\
-	cond_signal(&vc_cv[fd]);	\
-}
-
-static const char clnt_vc_errstr[] = "%s : %s";
-static const char clnt_vc_str[] = "clnt_vc_create";
-static const char clnt_read_vc_str[] = "read_vc";
-static const char __no_mem_str[] = "out of memory";
-
-/*
- * Create a client handle for a connection.
- * Default options are set, which the user can change using clnt_control()'s.
- * The rpc/vc package does buffering similar to stdio, so the client
- * must pick send and receive buffer sizes, 0 => use the default.
- * NB: fd is copied into a private area.
- * NB: The rpch->cl_auth is set null authentication. Caller may wish to
- * set this something more useful.
- *
- * fd should be an open socket
- */
-CLIENT *
-clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz)
-	int fd;				/* open file descriptor */
-	const struct netbuf *raddr;	/* servers address */
-	const rpcprog_t prog;			/* program number */
-	const rpcvers_t vers;			/* version number */
-	u_int sendsz;			/* buffer recv size */
-	u_int recvsz;			/* buffer send size */
-{
-	CLIENT *cl;			/* client handle */
-	struct ct_data *ct = NULL;	/* client handle */
-	struct timeval now;
-	struct rpc_msg call_msg;
-	static uint32_t disrupt;
-	sigset_t mask;
-	sigset_t newmask;
-	struct sockaddr_storage ss;
-	socklen_t slen;
-	struct __rpc_sockinfo si;
-
-	if (disrupt == 0)
-		disrupt = (uint32_t)(long)raddr;
-
-	cl = (CLIENT *)mem_alloc(sizeof (*cl));
-	ct = (struct ct_data *)mem_alloc(sizeof (*ct));
-	if ((cl == (CLIENT *)NULL) || (ct == (struct ct_data *)NULL)) {
-		(void) syslog(LOG_ERR, clnt_vc_errstr,
-		    clnt_vc_str, __no_mem_str);
-		rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-		rpc_createerr.cf_error.re_errno = errno;
-		goto err;
-	}
-	ct->ct_addr.buf = NULL;
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	if (vc_fd_locks == (int *) NULL) {
-		int cv_allocsz, fd_allocsz;
-		int dtbsize = __rpc_dtbsize();
-
-		fd_allocsz = dtbsize * sizeof (int);
-		vc_fd_locks = (int *) mem_alloc(fd_allocsz);
-		if (vc_fd_locks == (int *) NULL) {
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err;
-		} else
-			memset(vc_fd_locks, '\0', fd_allocsz);
-
-		assert(vc_cv == (cond_t *) NULL);
-		cv_allocsz = dtbsize * sizeof (cond_t);
-		vc_cv = (cond_t *) mem_alloc(cv_allocsz);
-		if (vc_cv == (cond_t *) NULL) {
-			mem_free(vc_fd_locks, fd_allocsz);
-			vc_fd_locks = (int *) NULL;
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err;
-		} else {
-			int i;
-
-			for (i = 0; i < dtbsize; i++)
-				cond_init(&vc_cv[i], 0, (void *) 0);
-		}
-	} else
-		assert(vc_cv != (cond_t *) NULL);
-
-	/*
-	 * XXX - fvdl connecting while holding a mutex?
-	 */
-	slen = sizeof ss;
-	if (_getpeername(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		if (errno != ENOTCONN) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err;
-		}
-		if (_connect(fd, (struct sockaddr *)raddr->buf, raddr->len) < 0){
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err;
-		}
-	}
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	if (!__rpc_fd2sockinfo(fd, &si))
-		goto err;
-
-	ct->ct_closeit = FALSE;
-
-	/*
-	 * Set up private data struct
-	 */
-	ct->ct_fd = fd;
-	ct->ct_wait.tv_usec = 0;
-	ct->ct_waitset = FALSE;
-	ct->ct_addr.buf = malloc(raddr->maxlen);
-	if (ct->ct_addr.buf == NULL)
-		goto err;
-	memcpy(ct->ct_addr.buf, raddr->buf, raddr->len);
-	ct->ct_addr.len = raddr->maxlen;
-	ct->ct_addr.maxlen = raddr->maxlen;
-
-	/*
-	 * Initialize call message
-	 */
-	(void)gettimeofday(&now, NULL);
-	call_msg.rm_xid = ((uint32_t)++disrupt) ^ __RPC_GETXID(&now);
-	call_msg.rm_direction = CALL;
-	call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	call_msg.rm_call.cb_prog = (uint32_t)prog;
-	call_msg.rm_call.cb_vers = (uint32_t)vers;
-
-	/*
-	 * pre-serialize the static part of the call msg and stash it away
-	 */
-	xdrmem_create(&(ct->ct_xdrs), ct->ct_u.ct_mcallc, MCALL_MSG_SIZE,
-	    XDR_ENCODE);
-	if (! xdr_callhdr(&(ct->ct_xdrs), &call_msg)) {
-		if (ct->ct_closeit) {
-			(void)_close(fd);
-		}
-		goto err;
-	}
-	ct->ct_mpos = XDR_GETPOS(&(ct->ct_xdrs));
-	XDR_DESTROY(&(ct->ct_xdrs));
-
-	/*
-	 * Create a client handle which uses xdrrec for serialization
-	 * and authnone for authentication.
-	 */
-	cl->cl_ops = clnt_vc_ops();
-	cl->cl_private = ct;
-	cl->cl_auth = authnone_create();
-	sendsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsz);
-	recvsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsz);
-	xdrrec_create(&(ct->ct_xdrs), sendsz, recvsz,
-	    cl->cl_private, read_vc, write_vc);
-	return (cl);
-
-err:
-	if (cl) {
-		if (ct) {
-			if (ct->ct_addr.len)
-				mem_free(ct->ct_addr.buf, ct->ct_addr.len);
-			mem_free(ct, sizeof (struct ct_data));
-		}
-		if (cl)
-			mem_free(cl, sizeof (CLIENT));
-	}
-	return ((CLIENT *)NULL);
-}
-
-static enum clnt_stat
-clnt_vc_call(cl, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
-	CLIENT *cl;
-	rpcproc_t proc;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-	xdrproc_t xdr_results;
-	void *results_ptr;
-	struct timeval timeout;
-{
-	struct ct_data *ct = (struct ct_data *) cl->cl_private;
-	XDR *xdrs = &(ct->ct_xdrs);
-	struct rpc_msg reply_msg;
-	uint32_t x_id;
-	uint32_t *msg_x_id = &ct->ct_u.ct_mcalli;    /* yuk */
-	bool_t shipnow;
-	int refreshes = 2;
-	sigset_t mask, newmask;
-	int rpc_lock_value;
-
-	assert(cl != NULL);
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (vc_fd_locks[ct->ct_fd])
-		cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock);
-	if (__isthreaded)
-                rpc_lock_value = 1;
-        else
-                rpc_lock_value = 0;
-	vc_fd_locks[ct->ct_fd] = rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-	if (!ct->ct_waitset) {
-		/* If time is not within limits, we ignore it. */
-		if (time_not_ok(&timeout) == FALSE)
-			ct->ct_wait = timeout;
-	}
-
-	shipnow =
-	    (xdr_results == NULL && timeout.tv_sec == 0
-	    && timeout.tv_usec == 0) ? FALSE : TRUE;
-
-call_again:
-	xdrs->x_op = XDR_ENCODE;
-	ct->ct_error.re_status = RPC_SUCCESS;
-	x_id = ntohl(--(*msg_x_id));
-
-	if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) ||
-	    (! XDR_PUTINT32(xdrs, &proc)) ||
-	    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
-	    (! (*xdr_args)(xdrs, args_ptr))) {
-		if (ct->ct_error.re_status == RPC_SUCCESS)
-			ct->ct_error.re_status = RPC_CANTENCODEARGS;
-		(void)xdrrec_endofrecord(xdrs, TRUE);
-		release_fd_lock(ct->ct_fd, mask);
-		return (ct->ct_error.re_status);
-	}
-	if (! xdrrec_endofrecord(xdrs, shipnow)) {
-		release_fd_lock(ct->ct_fd, mask);
-		return (ct->ct_error.re_status = RPC_CANTSEND);
-	}
-	if (! shipnow) {
-		release_fd_lock(ct->ct_fd, mask);
-		return (RPC_SUCCESS);
-	}
-	/*
-	 * Hack to provide rpc-based message passing
-	 */
-	if (timeout.tv_sec == 0 && timeout.tv_usec == 0) {
-		release_fd_lock(ct->ct_fd, mask);
-		return(ct->ct_error.re_status = RPC_TIMEDOUT);
-	}
-
-
-	/*
-	 * Keep receiving until we get a valid transaction id
-	 */
-	xdrs->x_op = XDR_DECODE;
-	while (TRUE) {
-		reply_msg.acpted_rply.ar_verf = _null_auth;
-		reply_msg.acpted_rply.ar_results.where = NULL;
-		reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
-		if (! xdrrec_skiprecord(xdrs)) {
-			release_fd_lock(ct->ct_fd, mask);
-			return (ct->ct_error.re_status);
-		}
-		/* now decode and validate the response header */
-		if (! xdr_replymsg(xdrs, &reply_msg)) {
-			if (ct->ct_error.re_status == RPC_SUCCESS)
-				continue;
-			release_fd_lock(ct->ct_fd, mask);
-			return (ct->ct_error.re_status);
-		}
-		if (reply_msg.rm_xid == x_id)
-			break;
-	}
-
-	/*
-	 * process header
-	 */
-	_seterr_reply(&reply_msg, &(ct->ct_error));
-	if (ct->ct_error.re_status == RPC_SUCCESS) {
-		if (! AUTH_VALIDATE(cl->cl_auth,
-		    &reply_msg.acpted_rply.ar_verf)) {
-			ct->ct_error.re_status = RPC_AUTHERROR;
-			ct->ct_error.re_why = AUTH_INVALIDRESP;
-		} else if (! (*xdr_results)(xdrs, results_ptr)) {
-			if (ct->ct_error.re_status == RPC_SUCCESS)
-				ct->ct_error.re_status = RPC_CANTDECODERES;
-		}
-		/* free verifier ... */
-		if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) {
-			xdrs->x_op = XDR_FREE;
-			(void)xdr_opaque_auth(xdrs,
-			    &(reply_msg.acpted_rply.ar_verf));
-		}
-	}  /* end successful completion */
-	else {
-		/* maybe our credentials need to be refreshed ... */
-		if (refreshes-- && AUTH_REFRESH(cl->cl_auth, &reply_msg))
-			goto call_again;
-	}  /* end of unsuccessful completion */
-	release_fd_lock(ct->ct_fd, mask);
-	return (ct->ct_error.re_status);
-}
-
-static void
-clnt_vc_geterr(cl, errp)
-	CLIENT *cl;
-	struct rpc_err *errp;
-{
-	struct ct_data *ct;
-
-	assert(cl != NULL);
-	assert(errp != NULL);
-
-	ct = (struct ct_data *) cl->cl_private;
-	*errp = ct->ct_error;
-}
-
-static bool_t
-clnt_vc_freeres(cl, xdr_res, res_ptr)
-	CLIENT *cl;
-	xdrproc_t xdr_res;
-	void *res_ptr;
-{
-	struct ct_data *ct;
-	XDR *xdrs;
-	bool_t dummy;
-	sigset_t mask;
-	sigset_t newmask;
-
-	assert(cl != NULL);
-
-	ct = (struct ct_data *)cl->cl_private;
-	xdrs = &(ct->ct_xdrs);
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (vc_fd_locks[ct->ct_fd])
-		cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock);
-	xdrs->x_op = XDR_FREE;
-	dummy = (*xdr_res)(xdrs, res_ptr);
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	cond_signal(&vc_cv[ct->ct_fd]);
-
-	return dummy;
-}
-
-/*ARGSUSED*/
-static void
-clnt_vc_abort(cl)
-	CLIENT *cl;
-{
-}
-
-static bool_t
-clnt_vc_control(cl, request, info)
-	CLIENT *cl;
-	u_int request;
-	void *info;
-{
-	struct ct_data *ct;
-	void *infop = info;
-	sigset_t mask;
-	sigset_t newmask;
-	int rpc_lock_value;
-
-	assert(cl != NULL);
-
-	ct = (struct ct_data *)cl->cl_private;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (vc_fd_locks[ct->ct_fd])
-		cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock);
-	if (__isthreaded)
-                rpc_lock_value = 1;
-        else
-                rpc_lock_value = 0;
-	vc_fd_locks[ct->ct_fd] = rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-
-	switch (request) {
-	case CLSET_FD_CLOSE:
-		ct->ct_closeit = TRUE;
-		release_fd_lock(ct->ct_fd, mask);
-		return (TRUE);
-	case CLSET_FD_NCLOSE:
-		ct->ct_closeit = FALSE;
-		release_fd_lock(ct->ct_fd, mask);
-		return (TRUE);
-	default:
-		break;
-	}
-
-	/* for other requests which use info */
-	if (info == NULL) {
-		release_fd_lock(ct->ct_fd, mask);
-		return (FALSE);
-	}
-	switch (request) {
-	case CLSET_TIMEOUT:
-		if (time_not_ok((struct timeval *)info)) {
-			release_fd_lock(ct->ct_fd, mask);
-			return (FALSE);
-		}
-		ct->ct_wait = *(struct timeval *)infop;
-		ct->ct_waitset = TRUE;
-		break;
-	case CLGET_TIMEOUT:
-		*(struct timeval *)infop = ct->ct_wait;
-		break;
-	case CLGET_SERVER_ADDR:
-		(void) memcpy(info, ct->ct_addr.buf, (size_t)ct->ct_addr.len);
-		break;
-	case CLGET_FD:
-		*(int *)info = ct->ct_fd;
-		break;
-	case CLGET_SVC_ADDR:
-		/* The caller should not free this memory area */
-		*(struct netbuf *)info = ct->ct_addr;
-		break;
-	case CLSET_SVC_ADDR:		/* set to new address */
-		release_fd_lock(ct->ct_fd, mask);
-		return (FALSE);
-	case CLGET_XID:
-		/*
-		 * use the knowledge that xid is the
-		 * first element in the call structure
-		 * This will get the xid of the PREVIOUS call
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)&ct->ct_u.ct_mcalli);
-		break;
-	case CLSET_XID:
-		/* This will set the xid of the NEXT call */
-		*(uint32_t *)(void *)&ct->ct_u.ct_mcalli =
-		    htonl(*((uint32_t *)info) + 1);
-		/* increment by 1 as clnt_vc_call() decrements once */
-		break;
-	case CLGET_VERS:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the version number field is the fifth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    4 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_VERS:
-		*(uint32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    4 * BYTES_PER_XDR_UNIT) =
-		    htonl(*(uint32_t *)info);
-		break;
-
-	case CLGET_PROG:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the program number field is the fourth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    3 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_PROG:
-		*(uint32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    3 * BYTES_PER_XDR_UNIT) =
-		    htonl(*(uint32_t *)info);
-		break;
-
-	default:
-		release_fd_lock(ct->ct_fd, mask);
-		return (FALSE);
-	}
-	release_fd_lock(ct->ct_fd, mask);
-	return (TRUE);
-}
-
-
-static void
-clnt_vc_destroy(cl)
-	CLIENT *cl;
-{
-	struct ct_data *ct = (struct ct_data *) cl->cl_private;
-	int ct_fd = ct->ct_fd;
-	sigset_t mask;
-	sigset_t newmask;
-
-	assert(cl != NULL);
-
-	ct = (struct ct_data *) cl->cl_private;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (vc_fd_locks[ct_fd])
-		cond_wait(&vc_cv[ct_fd], &clnt_fd_lock);
-	if (ct->ct_closeit && ct->ct_fd != -1) {
-		(void)_close(ct->ct_fd);
-	}
-	XDR_DESTROY(&(ct->ct_xdrs));
-	if (ct->ct_addr.buf)
-		free(ct->ct_addr.buf);
-	mem_free(ct, sizeof(struct ct_data));
-	mem_free(cl, sizeof(CLIENT));
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	cond_signal(&vc_cv[ct_fd]);
-}
-
-/*
- * Interface between xdr serializer and tcp connection.
- * Behaves like the system calls, read & write, but keeps some error state
- * around for the rpc level.
- */
-static int
-read_vc(ctp, buf, len)
-	void *ctp;
-	void *buf;
-	int len;
-{
-	struct sockaddr sa;
-	socklen_t sal;
-	struct ct_data *ct = (struct ct_data *)ctp;
-	struct pollfd fd;
-	int milliseconds = (int)((ct->ct_wait.tv_sec * 1000) +
-	    (ct->ct_wait.tv_usec / 1000));
-
-	if (len == 0)
-		return (0);
-	fd.fd = ct->ct_fd;
-	fd.events = POLLIN;
-	for (;;) {
-		switch (_poll(&fd, 1, milliseconds)) {
-		case 0:
-			ct->ct_error.re_status = RPC_TIMEDOUT;
-			return (-1);
-
-		case -1:
-			if (errno == EINTR)
-				continue;
-			ct->ct_error.re_status = RPC_CANTRECV;
-			ct->ct_error.re_errno = errno;
-			return (-1);
-		}
-		break;
-	}
-
-	sal = sizeof(sa);
-	if ((_getpeername(ct->ct_fd, &sa, &sal) == 0) &&
-	    (sa.sa_family == AF_LOCAL)) {
-		len = __msgread(ct->ct_fd, buf, (size_t)len);
-	} else {
-		len = _read(ct->ct_fd, buf, (size_t)len);
-	}
-
-	switch (len) {
-	case 0:
-		/* premature eof */
-		ct->ct_error.re_errno = ECONNRESET;
-		ct->ct_error.re_status = RPC_CANTRECV;
-		len = -1;  /* it's really an error */
-		break;
-
-	case -1:
-		ct->ct_error.re_errno = errno;
-		ct->ct_error.re_status = RPC_CANTRECV;
-		break;
-	}
-	return (len);
-}
-
-static int
-write_vc(ctp, buf, len)
-	void *ctp;
-	void *buf;
-	int len;
-{
-	struct sockaddr sa;
-	socklen_t sal;
-	struct ct_data *ct = (struct ct_data *)ctp;
-	int i, cnt;
-
-	sal = sizeof(sa);
-	if ((_getpeername(ct->ct_fd, &sa, &sal) == 0) &&
-	    (sa.sa_family == AF_LOCAL)) {
-		for (cnt = len; cnt > 0; cnt -= i, buf = (char *)buf + i) {
-			if ((i = __msgwrite(ct->ct_fd, buf,
-			     (size_t)cnt)) == -1) {
-				ct->ct_error.re_errno = errno;
-				ct->ct_error.re_status = RPC_CANTSEND;
-				return (-1);
-			}
-		}
-	} else {
-		for (cnt = len; cnt > 0; cnt -= i, buf = (char *)buf + i) {
-			if ((i = _write(ct->ct_fd, buf, (size_t)cnt)) == -1) {
-				ct->ct_error.re_errno = errno;
-				ct->ct_error.re_status = RPC_CANTSEND;
-				return (-1);
-			}
-		}
-	}
-	return (len);
-}
-
-static struct clnt_ops *
-clnt_vc_ops()
-{
-	static struct clnt_ops ops;
-	extern mutex_t  ops_lock;
-	sigset_t mask, newmask;
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&ops_lock);
-	if (ops.cl_call == NULL) {
-		ops.cl_call = clnt_vc_call;
-		ops.cl_abort = clnt_vc_abort;
-		ops.cl_geterr = clnt_vc_geterr;
-		ops.cl_freeres = clnt_vc_freeres;
-		ops.cl_destroy = clnt_vc_destroy;
-		ops.cl_control = clnt_vc_control;
-	}
-	mutex_unlock(&ops_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	return (&ops);
-}
-
-/*
- * Make sure that the time is not garbage.   -1 value is disallowed.
- * Note this is different from time_not_ok in clnt_dg.c
- */
-static bool_t
-time_not_ok(t)
-	struct timeval *t;
-{
-	return (t->tv_sec <= -1 || t->tv_sec > 100000000 ||
-		t->tv_usec <= -1 || t->tv_usec > 1000000);
-}
-
-static int
-__msgread(sock, buf, cnt)
-	int sock;
-	void *buf;
-	size_t cnt;
-{
-	struct iovec iov[1];
-	struct msghdr msg;
-	union {
-		struct cmsghdr cmsg;
-		char control[CMSG_SPACE(sizeof(struct cmsgcred))];
-	} cm;
- 
-	bzero((char *)&cm, sizeof(cm));
-	iov[0].iov_base = buf;
-	iov[0].iov_len = cnt;
- 
-	msg.msg_iov = iov;
-	msg.msg_iovlen = 1;
-	msg.msg_name = NULL;
-	msg.msg_namelen = 0;
-	msg.msg_control = (caddr_t)&cm;
-	msg.msg_controllen = CMSG_SPACE(sizeof(struct cmsgcred));
-	msg.msg_flags = 0;
- 
-	return(_recvmsg(sock, &msg, 0));
-}
-
-static int
-__msgwrite(sock, buf, cnt)
-	int sock;
-	void *buf;
-	size_t cnt;
-{
-	struct iovec iov[1];
-	struct msghdr msg;
-	union {
-		struct cmsghdr cmsg;
-		char control[CMSG_SPACE(sizeof(struct cmsgcred))];
-	} cm;
- 
-	bzero((char *)&cm, sizeof(cm));
-	iov[0].iov_base = buf;
-	iov[0].iov_len = cnt;
- 
-	cm.cmsg.cmsg_type = SCM_CREDS;
-	cm.cmsg.cmsg_level = SOL_SOCKET;
-	cm.cmsg.cmsg_len = CMSG_LEN(sizeof(struct cmsgcred));
- 
-	msg.msg_iov = iov;
-	msg.msg_iovlen = 1;
-	msg.msg_name = NULL;
-	msg.msg_namelen = 0;
-	msg.msg_control = (caddr_t)&cm;
-	msg.msg_controllen = CMSG_SPACE(sizeof(struct cmsgcred));
-	msg.msg_flags = 0;
-
-	return(_sendmsg(sock, &msg, 0));
-}
diff --git a/lib/libc/rpc/crypt_client.c b/lib/libc/rpc/crypt_client.c
deleted file mode 100644
index cdb5a0d..0000000
--- a/lib/libc/rpc/crypt_client.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1996
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/crypt_client.c,v 1.9 2003/02/16 17:29:10 nectar Exp $");
-
-#include "namespace.h"
-#include <err.h>
-#include <sys/types.h>
-#include <rpc/des_crypt.h>
-#include <rpc/des.h>
-#include <string.h>
-#include <rpcsvc/crypt.h>
-#include "un-namespace.h"
-
-int
-_des_crypt_call(buf, len, dparms)
-	char *buf;
-	int len;
-	struct desparams *dparms;
-{
-	CLIENT *clnt;
-	desresp  *result_1;
-	desargs  des_crypt_1_arg;
-	struct netconfig *nconf;
-	void *localhandle;
-	int stat;
-
-	nconf = NULL;
-	localhandle = setnetconfig();
-	while ((nconf = getnetconfig(localhandle)) != NULL) {
-		if (nconf->nc_protofmly != NULL &&
-		     strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
-			break;
-	}
-	if (nconf == NULL) {
-		warnx("getnetconfig: %s", nc_sperror());
-		return(DESERR_HWERROR);
-	}
-	clnt = clnt_tp_create(NULL, CRYPT_PROG, CRYPT_VERS, nconf);
-	if (clnt == (CLIENT *) NULL) {
-		endnetconfig(localhandle);
-		return(DESERR_HWERROR);
-	}
-	endnetconfig(localhandle);
-
-	des_crypt_1_arg.desbuf.desbuf_len = len;
-	des_crypt_1_arg.desbuf.desbuf_val = buf;
-	des_crypt_1_arg.des_dir = dparms->des_dir;
-	des_crypt_1_arg.des_mode = dparms->des_mode;
-	bcopy(dparms->des_ivec, des_crypt_1_arg.des_ivec, 8);
-	bcopy(dparms->des_key, des_crypt_1_arg.des_key, 8);
-
-	result_1 = des_crypt_1(&des_crypt_1_arg, clnt);
-	if (result_1 == (desresp *) NULL) {
-		clnt_destroy(clnt);
-		return(DESERR_HWERROR);
-	}
-
-	stat = result_1->stat;
-
-	if (result_1->stat == DESERR_NONE ||
-	    result_1->stat == DESERR_NOHWDEVICE) {
-		bcopy(result_1->desbuf.desbuf_val, buf, len);
-		bcopy(result_1->des_ivec, dparms->des_ivec, 8);
-	}
-
-	clnt_freeres(clnt, (xdrproc_t)xdr_desresp, result_1);
-	clnt_destroy(clnt);
-
-	return(stat);
-}
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
deleted file mode 100644
index f1e4b9e..0000000
--- a/lib/libc/rpc/des_crypt.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * des_crypt.c, DES encryption library routines
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-
-#include <sys/types.h>
-#include <rpc/des_crypt.h>
-#include <rpc/des.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/des_crypt.c,v 1.8 2004/10/16 06:11:34 obrien Exp $");
-
-static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
-int (*__des_crypt_LOCAL)() = 0;
-extern int _des_crypt_call(char *, int, struct desparams *);
-/*
- * Copy 8 bytes
- */
-#define COPY8(src, dst) { \
-	char *a = (char *) dst; \
-	char *b = (char *) src; \
-	*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
-	*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
-}
- 
-/*
- * Copy multiple of 8 bytes
- */
-#define DESCOPY(src, dst, len) { \
-	char *a = (char *) dst; \
-	char *b = (char *) src; \
-	int i; \
-	for (i = (int) len; i > 0; i -= 8) { \
-		*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
-		*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
-	} \
-}
-
-/*
- * CBC mode encryption
- */
-int
-cbc_crypt(key, buf, len, mode, ivec)
-	char *key;
-	char *buf;
-	unsigned len;
-	unsigned mode;
-	char *ivec;	
-{
-	int err;
-	struct desparams dp;
-
-#ifdef BROKEN_DES
-	dp.UDES.UDES_buf = buf;
-	dp.des_mode = ECB;
-#else
-	dp.des_mode = CBC;
-#endif
-	COPY8(ivec, dp.des_ivec);
-	err = common_crypt(key, buf, len, mode, &dp);
-	COPY8(dp.des_ivec, ivec);
-	return(err);
-}
-
-
-/*
- * ECB mode encryption
- */
-int
-ecb_crypt(key, buf, len, mode)
-	char *key;
-	char *buf;
-	unsigned len;
-	unsigned mode;
-{
-	struct desparams dp;
-
-#ifdef BROKEN_DES
-	dp.UDES.UDES_buf = buf;
-	dp.des_mode = CBC;
-#else
-	dp.des_mode = ECB;
-#endif
-	return(common_crypt(key, buf, len, mode, &dp));
-}
-
-
-
-/*
- * Common code to cbc_crypt() & ecb_crypt()
- */
-static int
-common_crypt(key, buf, len, mode, desp)	
-	char *key;	
-	char *buf;
-	unsigned len;
-	unsigned mode;
-	struct desparams *desp;
-{
-	int desdev;
-
-	if ((len % 8) != 0 || len > DES_MAXDATA) {
-		return(DESERR_BADPARAM);
-	}
-	desp->des_dir =
-		((mode & DES_DIRMASK) == DES_ENCRYPT) ? ENCRYPT : DECRYPT;
-
-	desdev = mode & DES_DEVMASK;
-	COPY8(key, desp->des_key);
-	/* 
-	 * software
-	 */
-	if (__des_crypt_LOCAL != NULL) {
-		if (!__des_crypt_LOCAL(buf, len, desp)) {
-			return (DESERR_HWERROR);
-		}
-	} else {
-		if (!_des_crypt_call(buf, len, desp)) {
-			return (DESERR_HWERROR);
-		}
-	}
-	return(desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE);
-}
diff --git a/lib/libc/rpc/des_soft.c b/lib/libc/rpc/des_soft.c
deleted file mode 100644
index f5bef95..0000000
--- a/lib/libc/rpc/des_soft.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)des_soft.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/des_soft.c,v 1.3 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * Table giving odd parity in the low bit for ASCII characters
- */
-static char partab[128] = {
-	0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x07, 0x07,
-	0x08, 0x08, 0x0b, 0x0b, 0x0d, 0x0d, 0x0e, 0x0e,
-	0x10, 0x10, 0x13, 0x13, 0x15, 0x15, 0x16, 0x16,
-	0x19, 0x19, 0x1a, 0x1a, 0x1c, 0x1c, 0x1f, 0x1f,
-	0x20, 0x20, 0x23, 0x23, 0x25, 0x25, 0x26, 0x26,
-	0x29, 0x29, 0x2a, 0x2a, 0x2c, 0x2c, 0x2f, 0x2f,
-	0x31, 0x31, 0x32, 0x32, 0x34, 0x34, 0x37, 0x37,
-	0x38, 0x38, 0x3b, 0x3b, 0x3d, 0x3d, 0x3e, 0x3e,
-	0x40, 0x40, 0x43, 0x43, 0x45, 0x45, 0x46, 0x46,
-	0x49, 0x49, 0x4a, 0x4a, 0x4c, 0x4c, 0x4f, 0x4f,
-	0x51, 0x51, 0x52, 0x52, 0x54, 0x54, 0x57, 0x57,
-	0x58, 0x58, 0x5b, 0x5b, 0x5d, 0x5d, 0x5e, 0x5e,
-	0x61, 0x61, 0x62, 0x62, 0x64, 0x64, 0x67, 0x67,
-	0x68, 0x68, 0x6b, 0x6b, 0x6d, 0x6d, 0x6e, 0x6e,
-	0x70, 0x70, 0x73, 0x73, 0x75, 0x75, 0x76, 0x76,
-	0x79, 0x79, 0x7a, 0x7a, 0x7c, 0x7c, 0x7f, 0x7f,
-};
-
-/*
- * Add odd parity to low bit of 8 byte key
- */
-void
-des_setparity(p)
-	char *p;
-{
-	int i;
-
-	for (i = 0; i < 8; i++) {
-		*p = partab[*p & 0x7f];
-		p++;
-	}
-}
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
deleted file mode 100644
index ec091f3..0000000
--- a/lib/libc/rpc/getnetconfig.c
+++ /dev/null
@@ -1,702 +0,0 @@
-/*	$NetBSD: getnetconfig.c,v 1.3 2000/07/06 03:10:34 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetconfig.c	1.12 91/12/19 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetconfig.c,v 1.11 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * Copyright (c) 1989 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/cdefs.h>
-#include <stdio.h>
-#include <errno.h>
-#include <netconfig.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <rpc/rpc.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-
-/*
- * The five library routines in this file provide application access to the
- * system network configuration database, /etc/netconfig.  In addition to the
- * netconfig database and the routines for accessing it, the environment
- * variable NETPATH and its corresponding routines in getnetpath.c may also be
- * used to specify the network transport to be used.
- */
-
-
-/*
- * netconfig errors
- */
-
-#define NC_NONETCONFIG	ENOENT
-#define NC_NOMEM	ENOMEM
-#define NC_NOTINIT	EINVAL	    /* setnetconfig was not called first */
-#define NC_BADFILE	EBADF	    /* format for netconfig file is bad */
-#define NC_NOTFOUND	ENOPROTOOPT /* specified netid was not found */
-
-/*
- * semantics as strings (should be in netconfig.h)
- */
-#define NC_TPI_CLTS_S	    "tpi_clts"
-#define	NC_TPI_COTS_S	    "tpi_cots"
-#define	NC_TPI_COTS_ORD_S   "tpi_cots_ord"
-#define	NC_TPI_RAW_S        "tpi_raw"
-
-/*
- * flags as characters (also should be in netconfig.h)
- */
-#define	NC_NOFLAG_C	'-'
-#define	NC_VISIBLE_C	'v'
-#define	NC_BROADCAST_C	'b'
-
-/*
- * Character used to indicate there is no name-to-address lookup library
- */
-#define NC_NOLOOKUP	"-"
-
-static const char * const _nc_errors[] = {
-    "Netconfig database not found",
-    "Not enough memory",
-    "Not initialized",
-    "Netconfig database has invalid format",
-    "Netid not found in netconfig database"
-};
-
-struct netconfig_info {
-    int		eof;	/* all entries has been read */
-    int		ref;	/* # of times setnetconfig() has been called */
-    struct netconfig_list	*head;	/* head of the list */
-    struct netconfig_list	*tail;	/* last of the list */
-};
-
-struct netconfig_list {
-    char			*linep;	/* hold line read from netconfig */
-    struct netconfig		*ncp;
-    struct netconfig_list	*next;
-};
-
-struct netconfig_vars {
-    int   valid;	/* token that indicates a valid netconfig_vars */
-    int   flag;		/* first time flag */
-    struct netconfig_list *nc_configs;  /* pointer to the current netconfig entry */
-};
-
-#define NC_VALID	0xfeed
-#define NC_STORAGE	0xf00d
-#define NC_INVALID	0
-
-
-static int *__nc_error(void);
-static int parse_ncp(char *, struct netconfig *);
-static struct netconfig *dup_ncp(struct netconfig *);
-
-
-static FILE *nc_file;		/* for netconfig db */
-static struct netconfig_info	ni = { 0, 0, NULL, NULL};
-
-#define MAXNETCONFIGLINE    1000
-
-static int *
-__nc_error()
-{
-	static pthread_mutex_t nc_lock = PTHREAD_MUTEX_INITIALIZER;
-	static thread_key_t nc_key = 0;
-	static int nc_error = 0;
-	int error, *nc_addr;
-
-	/*
-	 * Use the static `nc_error' if we are the main thread
-	 * (including non-threaded programs), or if an allocation
-	 * fails.
-	 */
-	if (thr_main())
-		return (&nc_error);
-	if (nc_key == 0) {
-		error = 0;
-		mutex_lock(&nc_lock);
-		if (nc_key == 0)
-			error = thr_keycreate(&nc_key, free);
-		mutex_unlock(&nc_lock);
-		if (error)
-			return (&nc_error);
-	}
-	if ((nc_addr = (int *)thr_getspecific(nc_key)) == NULL) {
-		nc_addr = (int *)malloc(sizeof (int));
-		if (thr_setspecific(nc_key, (void *) nc_addr) != 0) {
-			if (nc_addr)
-				free(nc_addr);
-			return (&nc_error);
-		}
-		*nc_addr = 0;
-	}
-	return (nc_addr);
-}
-
-#define nc_error        (*(__nc_error()))
-/*
- * A call to setnetconfig() establishes a /etc/netconfig "session".  A session
- * "handle" is returned on a successful call.  At the start of a session (after
- * a call to setnetconfig()) searches through the /etc/netconfig database will
- * proceed from the start of the file.  The session handle must be passed to
- * getnetconfig() to parse the file.  Each call to getnetconfig() using the
- * current handle will process one subsequent entry in /etc/netconfig.
- * setnetconfig() must be called before the first call to getnetconfig().
- * (Handles are used to allow for nested calls to setnetpath()).
- *
- * A new session is established with each call to setnetconfig(), with a new
- * handle being returned on each call.  Previously established sessions remain
- * active until endnetconfig() is called with that session's handle as an
- * argument.
- *
- * setnetconfig() need *not* be called before a call to getnetconfigent().
- * setnetconfig() returns a NULL pointer on failure (for example, if
- * the netconfig database is not present).
- */
-void *
-setnetconfig()
-{
-    struct netconfig_vars *nc_vars;
-
-    if ((nc_vars = (struct netconfig_vars *)malloc(sizeof
-		(struct netconfig_vars))) == NULL) {
-	return(NULL);
-    }
-
-    /*
-     * For multiple calls, i.e. nc_file is not NULL, we just return the
-     * handle without reopening the netconfig db.
-     */
-    ni.ref++;
-    if ((nc_file != NULL) || (nc_file = fopen(NETCONFIG, "r")) != NULL) {
-	nc_vars->valid = NC_VALID;
-	nc_vars->flag = 0;
-	nc_vars->nc_configs = ni.head;
-	return ((void *)nc_vars);
-    }
-    ni.ref--;
-    nc_error = NC_NONETCONFIG;
-    free(nc_vars);
-    return (NULL);
-}
-
-
-/*
- * When first called, getnetconfig() returns a pointer to the first entry in
- * the netconfig database, formatted as a struct netconfig.  On each subsequent
- * call, getnetconfig() returns a pointer to the next entry in the database.
- * getnetconfig() can thus be used to search the entire netconfig file.
- * getnetconfig() returns NULL at end of file.
- */
-
-struct netconfig *
-getnetconfig(handlep)
-void *handlep;
-{
-    struct netconfig_vars *ncp = (struct netconfig_vars *)handlep;
-    char *stringp;		/* tmp string pointer */
-    struct netconfig_list	*list;
-    struct netconfig *np;
-
-    /*
-     * Verify that handle is valid
-     */
-    if (ncp == NULL || nc_file == NULL) {
-	nc_error = NC_NOTINIT;
-	return (NULL);
-    }
-
-    switch (ncp->valid) {
-    case NC_VALID:
-	/*
-	 * If entry has already been read into the list,
-	 * we return the entry in the linked list.
-	 * If this is the first time call, check if there are any entries in
-	 * linked list.  If no entries, we need to read the netconfig db.
-	 * If we have been here and the next entry is there, we just return
-	 * it.
-	 */
-	if (ncp->flag == 0) {	/* first time */
-	    ncp->flag = 1;
-	    ncp->nc_configs = ni.head;
-	    if (ncp->nc_configs != NULL)	/* entry already exist */
-		return(ncp->nc_configs->ncp);
-	}
-	else if (ncp->nc_configs != NULL && ncp->nc_configs->next != NULL) {
-	    ncp->nc_configs = ncp->nc_configs->next;
-	    return(ncp->nc_configs->ncp);
-	}
-
-	/*
-	 * If we cannot find the entry in the list and is end of file,
-	 * we give up.
-	 */
-	if (ni.eof == 1)	return(NULL);
-	break;
-    default:
-	nc_error = NC_NOTINIT;
-	return (NULL);
-    }
-
-    stringp = (char *) malloc(MAXNETCONFIGLINE);
-    if (stringp == NULL)
-    	return (NULL);
-
-#ifdef MEM_CHK
-    if (malloc_verify() == 0) {
-	fprintf(stderr, "memory heap corrupted in getnetconfig\n");
-	exit(1);
-    }
-#endif
-
-    /*
-     * Read a line from netconfig file.
-     */
-    do {
-	if (fgets(stringp, MAXNETCONFIGLINE, nc_file) == NULL) {
-	    free(stringp);
-	    ni.eof = 1;
-	    return (NULL);
-        }
-    } while (*stringp == '#');
-
-    list = (struct netconfig_list *) malloc(sizeof (struct netconfig_list));
-    if (list == NULL) {
-    	free(stringp);
-    	return(NULL);
-    }
-    np = (struct netconfig *) malloc(sizeof (struct netconfig));
-    if (np == NULL) {
-    	free(stringp);
-	free(list);
-    	return(NULL);
-    }
-    list->ncp = np;
-    list->next = NULL;
-    list->ncp->nc_lookups = NULL;
-    list->linep = stringp;
-    if (parse_ncp(stringp, list->ncp) == -1) {
-	free(stringp);
-	free(np);
-	free(list);
-	return (NULL);
-    }
-    else {
-	/*
-	 * If this is the first entry that's been read, it is the head of
-	 * the list.  If not, put the entry at the end of the list.
-	 * Reposition the current pointer of the handle to the last entry
-	 * in the list.
-	 */
-	if (ni.head == NULL) {	/* first entry */
-	    ni.head = ni.tail = list;
-	}
-    	else {
-    	    ni.tail->next = list;
-    	    ni.tail = ni.tail->next;
-    	}
-	ncp->nc_configs = ni.tail;
-	return(ni.tail->ncp);
-    }
-}
-
-/*
- * endnetconfig() may be called to "unbind" or "close" the netconfig database
- * when processing is complete, releasing resources for reuse.  endnetconfig()
- * may not be called before setnetconfig().  endnetconfig() returns 0 on
- * success and -1 on failure (for example, if setnetconfig() was not called
- * previously).
- */
-int
-endnetconfig(handlep)
-void *handlep;
-{
-    struct netconfig_vars *nc_handlep = (struct netconfig_vars *)handlep;
-
-    struct netconfig_list *q, *p;
-
-    /*
-     * Verify that handle is valid
-     */
-    if (nc_handlep == NULL || (nc_handlep->valid != NC_VALID &&
-	    nc_handlep->valid != NC_STORAGE)) {
-	nc_error = NC_NOTINIT;
-	return (-1);
-    }
-
-    /*
-     * Return 0 if anyone still needs it.
-     */
-    nc_handlep->valid = NC_INVALID;
-    nc_handlep->flag = 0;
-    nc_handlep->nc_configs = NULL;
-    if (--ni.ref > 0) {
-    	free(nc_handlep);
-	return(0);
-    }
-
-    /*
-     * Noone needs these entries anymore, then frees them.
-     * Make sure all info in netconfig_info structure has been reinitialized.
-     */
-    q = p = ni.head;
-    ni.eof = ni.ref = 0;
-    ni.head = NULL;
-    ni.tail = NULL;
-    while (q) {
-	p = q->next;
-	if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups);
-	free(q->ncp);
-	free(q->linep);
-	free(q);
-	q = p;
-    }
-    free(nc_handlep);
-
-    fclose(nc_file);
-    nc_file = NULL;
-    return (0);
-}
-
-/*
- * getnetconfigent(netid) returns a pointer to the struct netconfig structure
- * corresponding to netid.  It returns NULL if netid is invalid (that is, does
- * not name an entry in the netconfig database).  It returns NULL and sets
- * errno in case of failure (for example, if the netconfig database cannot be
- * opened).
- */
-
-struct netconfig *
-getnetconfigent(netid)
-	const char *netid;
-{
-    FILE *file;		/* NETCONFIG db's file pointer */
-    char *linep;	/* holds current netconfig line */
-    char *stringp;	/* temporary string pointer */
-    struct netconfig *ncp = NULL;   /* returned value */
-    struct netconfig_list *list;	/* pointer to cache list */
-
-    nc_error = NC_NOTFOUND;	/* default error. */
-    if (netid == NULL || strlen(netid) == 0) {
-	return (NULL);
-    }
-
-    if (strcmp(netid, "unix") == 0) {
-	fprintf(stderr, "The local transport is called \"unix\" ");
-	fprintf(stderr, "in /etc/netconfig.\n");
-	fprintf(stderr, "Please change this to \"local\" manually ");
-	fprintf(stderr, "or run mergemaster(8).\n");
-	fprintf(stderr, "See UPDATING entry 20021216 for details.\n");
-	fprintf(stderr, "Continuing in 10 seconds\n\n");
-	fprintf(stderr, "This warning will be removed 20030301\n");
-	sleep(10);
-
-    }
-
-    /*
-     * Look up table if the entries have already been read and parsed in
-     * getnetconfig(), then copy this entry into a buffer and return it.
-     * If we cannot find the entry in the current list and there are more
-     * entries in the netconfig db that has not been read, we then read the
-     * db and try find the match netid.
-     * If all the netconfig db has been read and placed into the list and
-     * there is no match for the netid, return NULL.
-     */
-    if (ni.head != NULL) {
-	for (list = ni.head; list; list = list->next) {
-	    if (strcmp(list->ncp->nc_netid, netid) == 0) {
-	        return(dup_ncp(list->ncp));
-	    }
-	}
-	if (ni.eof == 1)	/* that's all the entries */
-		return(NULL);
-    }
-
-
-    if ((file = fopen(NETCONFIG, "r")) == NULL) {
-	nc_error = NC_NONETCONFIG;
-	return (NULL);
-    }
-
-    if ((linep = malloc(MAXNETCONFIGLINE)) == NULL) {
-	fclose(file);
-	nc_error = NC_NOMEM;
-	return (NULL);
-    }
-    do {
-	ptrdiff_t len;
-	char *tmpp;	/* tmp string pointer */
-
-	do {
-	    if ((stringp = fgets(linep, MAXNETCONFIGLINE, file)) == NULL) {
-		break;
-	    }
-	} while (*stringp == '#');
-	if (stringp == NULL) {	    /* eof */
-	    break;
-	}
-	if ((tmpp = strpbrk(stringp, "\t ")) == NULL) {	/* can't parse file */
-	    nc_error = NC_BADFILE;
-	    break;
-	}
-	if (strlen(netid) == (size_t) (len = tmpp - stringp) &&	/* a match */
-		strncmp(stringp, netid, (size_t)len) == 0) {
-	    if ((ncp = (struct netconfig *)
-		    malloc(sizeof (struct netconfig))) == NULL) {
-		break;
-	    }
-	    ncp->nc_lookups = NULL;
-	    if (parse_ncp(linep, ncp) == -1) {
-		free(ncp);
-		ncp = NULL;
-	    }
-	    break;
-	}
-    } while (stringp != NULL);
-    if (ncp == NULL) {
-	free(linep);
-    }
-    fclose(file);
-    return(ncp);
-}
-
-/*
- * freenetconfigent(netconfigp) frees the netconfig structure pointed to by
- * netconfigp (previously returned by getnetconfigent()).
- */
-
-void
-freenetconfigent(netconfigp)
-	struct netconfig *netconfigp;
-{
-    if (netconfigp != NULL) {
-	free(netconfigp->nc_netid);	/* holds all netconfigp's strings */
-	if (netconfigp->nc_lookups != NULL)
-	    free(netconfigp->nc_lookups);
-	free(netconfigp);
-    }
-    return;
-}
-
-/*
- * Parse line and stuff it in a struct netconfig
- * Typical line might look like:
- *	udp tpi_cots vb inet udp /dev/udp /usr/lib/ip.so,/usr/local/ip.so
- *
- * We return -1 if any of the tokens don't parse, or malloc fails.
- *
- * Note that we modify stringp (putting NULLs after tokens) and
- * we set the ncp's string field pointers to point to these tokens within
- * stringp.
- */
-
-static int
-parse_ncp(stringp, ncp)
-char *stringp;		/* string to parse */
-struct netconfig *ncp;	/* where to put results */
-{
-    char    *tokenp;	/* for processing tokens */
-    char    *lasts;
-
-    nc_error = NC_BADFILE;	/* nearly anything that breaks is for this reason */
-    stringp[strlen(stringp)-1] = '\0';	/* get rid of newline */
-    /* netid */
-    if ((ncp->nc_netid = strtok_r(stringp, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-
-    /* semantics */
-    if ((tokenp = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    if (strcmp(tokenp, NC_TPI_COTS_ORD_S) == 0)
-	ncp->nc_semantics = NC_TPI_COTS_ORD;
-    else if (strcmp(tokenp, NC_TPI_COTS_S) == 0)
-	ncp->nc_semantics = NC_TPI_COTS;
-    else if (strcmp(tokenp, NC_TPI_CLTS_S) == 0)
-	ncp->nc_semantics = NC_TPI_CLTS;
-    else if (strcmp(tokenp, NC_TPI_RAW_S) == 0)
-	ncp->nc_semantics = NC_TPI_RAW;
-    else
-	return (-1);
-
-    /* flags */
-    if ((tokenp = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    for (ncp->nc_flag = NC_NOFLAG; *tokenp != '\0';
-	    tokenp++) {
-	switch (*tokenp) {
-	case NC_NOFLAG_C:
-	    break;
-	case NC_VISIBLE_C:
-	    ncp->nc_flag |= NC_VISIBLE;
-	    break;
-	case NC_BROADCAST_C:
-	    ncp->nc_flag |= NC_BROADCAST;
-	    break;
-	default:
-	    return (-1);
-	}
-    }
-    /* protocol family */
-    if ((ncp->nc_protofmly = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    /* protocol name */
-    if ((ncp->nc_proto = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    /* network device */
-    if ((ncp->nc_device = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    if ((tokenp = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    if (strcmp(tokenp, NC_NOLOOKUP) == 0) {
-	ncp->nc_nlookups = 0;
-	ncp->nc_lookups = NULL;
-    } else {
-	char *cp;	    /* tmp string */
-
-	if (ncp->nc_lookups != NULL)	/* from last visit */
-	    free(ncp->nc_lookups);
-	/* preallocate one string pointer */
-	ncp->nc_lookups = (char **)malloc(sizeof (char *));
-	ncp->nc_nlookups = 0;
-	while ((cp = tokenp) != NULL) {
-	    tokenp = _get_next_token(cp, ',');
-	    ncp->nc_lookups[(size_t)ncp->nc_nlookups++] = cp;
-	    ncp->nc_lookups = (char **)realloc(ncp->nc_lookups,
-		(size_t)(ncp->nc_nlookups+1) *sizeof(char *));	/* for next loop */
-	}
-    }
-    return (0);
-}
-
-
-/*
- * Returns a string describing the reason for failure.
- */
-char *
-nc_sperror()
-{
-    const char *message;
-
-    switch(nc_error) {
-    case NC_NONETCONFIG:
-	message = _nc_errors[0];
-	break;
-    case NC_NOMEM:
-	message = _nc_errors[1];
-	break;
-    case NC_NOTINIT:
-	message = _nc_errors[2];
-	break;
-    case NC_BADFILE:
-	message = _nc_errors[3];
-	break;
-    case NC_NOTFOUND:
-	message = _nc_errors[4];
-	break;
-    default:
-	message = "Unknown network selection error";
-    }
-    /* LINTED const castaway */
-    return ((char *)message);
-}
-
-/*
- * Prints a message onto standard error describing the reason for failure.
- */
-void
-nc_perror(s)
-	const char *s;
-{
-    fprintf(stderr, "%s: %s\n", s, nc_sperror());
-}
-
-/*
- * Duplicates the matched netconfig buffer.
- */
-static struct netconfig *
-dup_ncp(ncp)
-struct netconfig	*ncp;
-{
-    struct netconfig	*p;
-    char	*tmp;
-    u_int	i;
-
-    if ((tmp=malloc(MAXNETCONFIGLINE)) == NULL)
-	return(NULL);
-    if ((p=(struct netconfig *)malloc(sizeof(struct netconfig))) == NULL) {
-	free(tmp);
-	return(NULL);
-    }
-    /*
-     * First we dup all the data from matched netconfig buffer.  Then we
-     * adjust some of the member pointer to a pre-allocated buffer where
-     * contains part of the data.
-     * To follow the convention used in parse_ncp(), we store all the
-     * necessary information in the pre-allocated buffer and let each
-     * of the netconfig char pointer member point to the right address
-     * in the buffer.
-     */
-    *p = *ncp;
-    p->nc_netid = (char *)strcpy(tmp,ncp->nc_netid);
-    tmp = strchr(tmp, '\0') + 1;
-    p->nc_protofmly = (char *)strcpy(tmp,ncp->nc_protofmly);
-    tmp = strchr(tmp, '\0') + 1;
-    p->nc_proto = (char *)strcpy(tmp,ncp->nc_proto);
-    tmp = strchr(tmp, '\0') + 1;
-    p->nc_device = (char *)strcpy(tmp,ncp->nc_device);
-    p->nc_lookups = (char **)malloc((size_t)(p->nc_nlookups+1) * sizeof(char *));
-    if (p->nc_lookups == NULL) {
-	free(p->nc_netid);
-	return(NULL);
-    }
-    for (i=0; i < p->nc_nlookups; i++) {
-    	tmp = strchr(tmp, '\0') + 1;
-    	p->nc_lookups[i] = (char *)strcpy(tmp,ncp->nc_lookups[i]);
-    }
-    return(p);
-}
diff --git a/lib/libc/rpc/getnetpath.c b/lib/libc/rpc/getnetpath.c
deleted file mode 100644
index d0f8187..0000000
--- a/lib/libc/rpc/getnetpath.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*	$NetBSD: getnetpath.c,v 1.3 2000/07/06 03:10:34 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetpath.c	1.11 91/12/19 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/getnetpath.c,v 1.5 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * Copyright (c) 1989 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <stdio.h>
-#include <errno.h>
-#include <netconfig.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-/*
- * internal structure to keep track of a netpath "session"
- */
-struct netpath_chain {
-    struct netconfig *ncp;  /* an nconf entry */
-    struct netpath_chain *nchain_next;	/* next nconf entry allocated */
-};
-
-
-struct netpath_vars {
-    int   valid;	    /* token that indicates a valid netpath_vars */
-    void *nc_handlep;	    /* handle for current netconfig "session" */
-    char *netpath;	    /* pointer to current view-point in NETPATH */
-    char *netpath_start;    /* pointer to start of our copy of NETPATH */
-    struct netpath_chain *ncp_list;  /* list of nconfs allocated this session*/
-};
-
-#define NP_VALID	0xf00d
-#define NP_INVALID	0
-
-char *_get_next_token(char *, int);
-
-
-/*
- * A call to setnetpath() establishes a NETPATH "session".  setnetpath()
- * must be called before the first call to getnetpath().  A "handle" is
- * returned to distinguish the session; this handle should be passed
- * subsequently to getnetpath().  (Handles are used to allow for nested calls
- * to setnetpath()).
- * If setnetpath() is unable to establish a session (due to lack of memory
- * resources, or the absence of the /etc/netconfig file), a NULL pointer is
- * returned.
- */
-
-void *
-setnetpath()
-{
-
-    struct netpath_vars *np_sessionp;   /* this session's variables */
-    char *npp;				/* NETPATH env variable */
-
-#ifdef MEM_CHK
-    malloc_debug(1);
-#endif
-
-    if ((np_sessionp =
-	(struct netpath_vars *)malloc(sizeof (struct netpath_vars))) == NULL) {
-	return (NULL);
-    }
-    if ((np_sessionp->nc_handlep = setnetconfig()) == NULL) {
-	syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-	return (NULL);
-    }
-    np_sessionp->valid = NP_VALID;
-    np_sessionp->ncp_list = NULL;
-    if ((npp = getenv(NETPATH)) == NULL) {
-	np_sessionp->netpath = NULL;
-    } else {
-	(void) endnetconfig(np_sessionp->nc_handlep);/* won't need nc session*/
-	np_sessionp->nc_handlep = NULL;
-	if ((np_sessionp->netpath = malloc(strlen(npp)+1)) == NULL) {
-	    free(np_sessionp);
-	    return (NULL);
-	} else {
-	    (void) strcpy(np_sessionp->netpath, npp);
-	}
-    }
-    np_sessionp->netpath_start = np_sessionp->netpath;
-    return ((void *)np_sessionp);
-}
-
-/*
- * When first called, getnetpath() returns a pointer to the netconfig
- * database entry corresponding to the first valid NETPATH component.  The
- * netconfig entry is formatted as a struct netconfig.
- * On each subsequent call, getnetpath returns a pointer to the netconfig
- * entry that corresponds to the next valid NETPATH component.  getnetpath
- * can thus be used to search the netconfig database for all networks
- * included in the NETPATH variable.
- * When NETPATH has been exhausted, getnetpath() returns NULL.  It returns
- * NULL and sets errno in case of an error (e.g., setnetpath was not called
- * previously).
- * getnetpath() silently ignores invalid NETPATH components.  A NETPATH
- * compnent is invalid if there is no corresponding entry in the netconfig
- * database.
- * If the NETPATH variable is unset, getnetpath() behaves as if NETPATH
- * were set to the sequence of default or visible networks in the netconfig
- * database, in the order in which they are listed.
- */
-
-struct netconfig *
-getnetpath(handlep)
-    void *handlep;
-{
-    struct netpath_vars *np_sessionp = (struct netpath_vars *)handlep;
-    struct netconfig *ncp = NULL;   /* temp. holds a netconfig session */
-    struct netpath_chain *chainp;   /* holds chain of ncp's we alloc */
-    char  *npp;		/* holds current NETPATH */
-
-    if (np_sessionp == NULL || np_sessionp->valid != NP_VALID) {
-	errno = EINVAL;
-	return (NULL);
-    }
-    if (np_sessionp->netpath_start == NULL) {	/* NETPATH was not set */
-	do {                /* select next visible network */
-	    if (np_sessionp->nc_handlep == NULL) {
-		np_sessionp->nc_handlep = setnetconfig();
-		if (np_sessionp->nc_handlep == NULL)
-		    syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-	    }
-	    if ((ncp = getnetconfig(np_sessionp->nc_handlep)) == NULL) {
-		return(NULL);
-	    }
-	} while ((ncp->nc_flag & NC_VISIBLE) == 0);
-	return (ncp);
-    }
-    /*
-     * Find first valid network ID in netpath.
-     */
-    while ((npp = np_sessionp->netpath) != NULL && strlen(npp) != 0) {
-	np_sessionp->netpath = _get_next_token(npp, ':');
-    	/*
-    	 * npp is a network identifier.
-	 */
-	if ((ncp = getnetconfigent(npp)) != NULL) {
-	    chainp = (struct netpath_chain *)	/* cobble alloc chain entry */
-		    malloc(sizeof (struct netpath_chain));
-	    chainp->ncp = ncp;
-	    chainp->nchain_next = NULL;
-	    if (np_sessionp->ncp_list == NULL) {
-		np_sessionp->ncp_list = chainp;
-	    } else {
-		np_sessionp->ncp_list->nchain_next = chainp;
-	    }
-	    return (ncp);
-	}
-	/* couldn't find this token in the database; go to next one. */
-    }
-    return (NULL);
-}
-
-/*
- * endnetpath() may be called to unbind NETPATH when processing is complete,
- * releasing resources for reuse.  It returns 0 on success and -1 on failure
- * (e.g. if setnetpath() was not called previously.
- */
-int
-endnetpath(handlep)
-    void *handlep;
-{
-    struct netpath_vars *np_sessionp = (struct netpath_vars *)handlep;
-    struct netpath_chain *chainp, *lastp;
-
-    if (np_sessionp == NULL || np_sessionp->valid != NP_VALID) {
-	errno = EINVAL;
-	return (-1);
-    }
-    if (np_sessionp->nc_handlep != NULL)
-	endnetconfig(np_sessionp->nc_handlep);
-    if (np_sessionp->netpath_start != NULL)
-	free(np_sessionp->netpath_start);
-    for (chainp = np_sessionp->ncp_list; chainp != NULL;
-	    lastp=chainp, chainp=chainp->nchain_next, free(lastp)) {
-	freenetconfigent(chainp->ncp);
-    }
-    free(np_sessionp);
-#ifdef MEM_CHK
-    if (malloc_verify() == 0) {
-	fprintf(stderr, "memory heap corrupted in endnetpath\n");
-	exit(1);
-    }
-#endif
-    return (0);
-}
-
-
-
-/*
- * Returns pointer to the rest-of-the-string after the current token.
- * The token itself starts at arg, and we null terminate it.  We return NULL
- * if either the arg is empty, or if this is the last token.
- */
-
-char *
-_get_next_token(npp, token)
-char *npp;		/* string */
-int token;		/* char to parse string for */
-{
-    char  *cp;		/* char pointer */
-    char  *np;		/* netpath pointer */
-    char  *ep;		/* escape pointer */
-
-    if ((cp = strchr(npp, token)) == NULL) {
-	return (NULL);
-    }
-    /*
-     * did find a token, but it might be escaped.
-     */
-    if ((cp > npp) && (cp[-1] == '\\')) {
-        /* if slash was also escaped, carry on, otherwise find next token */
-	if ((cp > npp + 1) && (cp[-2] != '\\')) {
-	    /* shift r-o-s  onto the escaped token */
-	    strcpy(&cp[-1], cp);    /* XXX: overlapping string copy */
-	    /*
-	     * Do a recursive call.
-	     * We don't know how many escaped tokens there might be.
-	     */
-	    return (_get_next_token(cp, token));
-	}
-    }
-
-    *cp++ = '\0';		/* null-terminate token */
-    /* get rid of any backslash escapes */
-    ep = npp;
-    while ((np = strchr(ep, '\\')) != 0) {
-	if (np[1] == '\\')
-	    np++;
-	strcpy(np, (ep = &np[1]));  /* XXX: overlapping string copy */
-    }
-    return (cp);		/* return ptr to r-o-s */
-}
diff --git a/lib/libc/rpc/getpublickey.c b/lib/libc/rpc/getpublickey.c
deleted file mode 100644
index b531b46..0000000
--- a/lib/libc/rpc/getpublickey.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)publickey.c 1.10 91/03/11 Copyr 1986 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/getpublickey.c,v 1.7 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * publickey.c
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-
-/*
- * Public key lookup routines
- */
-#include "namespace.h"
-#include <stdio.h>
-#include <pwd.h>
-#include <rpc/rpc.h>
-#include <rpc/key_prot.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include <string.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-#define PKFILE "/etc/publickey"
-
-/*
- * Hack to let ypserv/rpc.nisd use AUTH_DES.
- */
-int (*__getpublickey_LOCAL)() = 0;
-
-/*
- * Get somebody's public key
- */
-int
-__getpublickey_real(netname, publickey)
-	char *netname;
-	char *publickey;
-{
-	char lookup[3 * HEXKEYBYTES];
-	char *p;
-
-	if (publickey == NULL)
-		return (0);
-	if (!getpublicandprivatekey(netname, lookup))
-		return (0);
-	p = strchr(lookup, ':');
-	if (p == NULL) {
-		return (0);
-	}
-	*p = '\0';
-	(void) strncpy(publickey, lookup, HEXKEYBYTES);
-	publickey[HEXKEYBYTES] = '\0';
-	return (1);
-}
-
-/*
- * reads the file /etc/publickey looking for a + to optionally go to the
- * yellow pages
- */
-
-int
-getpublicandprivatekey(key, ret)
-	char *key;
-	char *ret;
-{
-	char buf[1024];	/* big enough */
-	char *res;
-	FILE *fd;
-	char *mkey;
-	char *mval;
-
-	fd = fopen(PKFILE, "r");
-	if (fd == NULL)
-		return (0);
-	for (;;) {
-		res = fgets(buf, sizeof(buf), fd);
-		if (res == NULL) {
-			fclose(fd);
-			return (0);
-		}
-		if (res[0] == '#')
-			continue;
-		else if (res[0] == '+') {
-#ifdef YP
-			char *PKMAP = "publickey.byname";
-			char *lookup;
-			char *domain;
-			int err;
-			int len;
-
-			err = yp_get_default_domain(&domain);
-			if (err) {
-				continue;
-			}
-			lookup = NULL;
-			err = yp_match(domain, PKMAP, key, strlen(key), &lookup, &len);
-			if (err) {
-#ifdef DEBUG
-				fprintf(stderr, "match failed error %d\n", err);
-#endif
-				continue;
-			}
-			lookup[len] = 0;
-			strcpy(ret, lookup);
-			fclose(fd);
-			free(lookup);
-			return (2);
-#else /* YP */
-#ifdef DEBUG
-			fprintf(stderr,
-"Bad record in %s '+' -- NIS not supported in this library copy\n", PKFILE);
-#endif /* DEBUG */
-			continue;
-#endif /* YP */
-		} else {
-			mkey = strsep(&res, "\t ");
-			if (mkey == NULL) {
-				fprintf(stderr,
-				"Bad record in %s -- %s", PKFILE, buf);
-				continue;
-			}
-			do {
-				mval = strsep(&res, " \t#\n");
-			} while (mval != NULL && !*mval);
-			if (mval == NULL) {
-				fprintf(stderr,
-			"Bad record in %s val problem - %s", PKFILE, buf);
-				continue;
-			}
-			if (strcmp(mkey, key) == 0) {
-				strcpy(ret, mval);
-				fclose(fd);
-				return (1);
-			}
-		}
-	}
-}
-
-int getpublickey(netname, publickey)
-	const char *netname;
-	char *publickey;
-{
-	if (__getpublickey_LOCAL != NULL)
-		return(__getpublickey_LOCAL(netname, publickey));
-	else
-		return(__getpublickey_real(netname, publickey));
-}
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
deleted file mode 100644
index 927dc3f..0000000
--- a/lib/libc/rpc/getrpcent.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*	$NetBSD: getrpcent.c,v 1.17 2000/01/22 22:19:17 mycroft Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcent.c,v 1.14 2003/02/27 13:40:01 nectar Exp $");
-
-/*
- * Copyright (c) 1984 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#ifdef YP
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include "un-namespace.h"
-#include "libc_private.h"
-
-/*
- * Internet version.
- */
-static struct rpcdata {
-	FILE	*rpcf;
-	int	stayopen;
-#define	MAXALIASES	35
-	char	*rpc_aliases[MAXALIASES];
-	struct	rpcent rpc;
-	char	line[BUFSIZ+1];
-#ifdef	YP
-	char	*domain;
-	char	*current;
-	int	currentlen;
-#endif
-} *rpcdata;
-
-static	struct rpcent *interpret(char *val, size_t len);
-
-#ifdef	YP
-static int	__yp_nomap = 0;
-#endif	/* YP */
-
-#define	RPCDB	"/etc/rpc"
-
-static struct rpcdata *_rpcdata(void);
-
-static struct rpcdata *
-_rpcdata()
-{
-	struct rpcdata *d = rpcdata;
-
-	if (d == 0) {
-		d = (struct rpcdata *)calloc(1, sizeof (struct rpcdata));
-		rpcdata = d;
-	}
-	return (d);
-}
-
-struct rpcent *
-getrpcbynumber(number)
-	int number;
-{
-#ifdef	YP
-	int reason;
-	char adrstr[16];
-#endif
-	struct rpcent *p;
-	struct rpcdata *d = _rpcdata();
-
-	if (d == 0)
-		return (0);
-#ifdef	YP
-        if (!__yp_nomap && _yp_check(&d->domain)) {
-                sprintf(adrstr, "%d", number);
-                reason = yp_match(d->domain, "rpc.bynumber", adrstr, strlen(adrstr),
-                                  &d->current, &d->currentlen);
-                switch(reason) {
-                case 0:
-                        break;
-                case YPERR_MAP:
-                        __yp_nomap = 1;
-                        goto no_yp;
-                        break;
-                default:
-                        return(0);
-                        break;
-                }
-                d->current[d->currentlen] = '\0';
-                p = interpret(d->current, d->currentlen);
-                (void) free(d->current);
-                return p;
-        }
-no_yp:
-#endif	/* YP */
-
-	setrpcent(0);
-	while ((p = getrpcent()) != NULL) {
-		if (p->r_number == number)
-			break;
-	}
-	endrpcent();
-	return (p);
-}
-
-struct rpcent *
-getrpcbyname(name)
-	char *name;
-{
-	struct rpcent *rpc = NULL;
-	char **rp;
-
-	assert(name != NULL);
-
-	setrpcent(0);
-	while ((rpc = getrpcent()) != NULL) {
-		if (strcmp(rpc->r_name, name) == 0)
-			goto done;
-		for (rp = rpc->r_aliases; *rp != NULL; rp++) {
-			if (strcmp(*rp, name) == 0)
-				goto done;
-		}
-	}
-done:
-	endrpcent();
-	return (rpc);
-}
-
-void
-setrpcent(f)
-	int f;
-{
-	struct rpcdata *d = _rpcdata();
-
-	if (d == 0)
-		return;
-#ifdef	YP
-        if (!__yp_nomap && _yp_check(NULL)) {
-                if (d->current)
-                        free(d->current);
-                d->current = NULL;
-                d->currentlen = 0;
-                return;
-        }
-        __yp_nomap = 0;
-#endif	/* YP */
-	if (d->rpcf == NULL)
-		d->rpcf = fopen(RPCDB, "r");
-	else
-		rewind(d->rpcf);
-	d->stayopen |= f;
-}
-
-void
-endrpcent()
-{
-	struct rpcdata *d = _rpcdata();
-
-	if (d == 0)
-		return;
-#ifdef	YP
-        if (!__yp_nomap && _yp_check(NULL)) {
-        	if (d->current && !d->stayopen)
-                        free(d->current);
-                d->current = NULL;
-                d->currentlen = 0;
-                return;
-        }
-        __yp_nomap = 0;
-#endif	/* YP */
-	if (d->rpcf && !d->stayopen) {
-		fclose(d->rpcf);
-		d->rpcf = NULL;
-	}
-}
-
-struct rpcent *
-getrpcent()
-{
-	struct rpcdata *d = _rpcdata();
-#ifdef	YP
-	struct rpcent *hp;
-	int reason;
-	char *val = NULL;
-	int vallen;
-#endif
-
-	if (d == 0)
-		return(NULL);
-#ifdef	YP
-        if (!__yp_nomap && _yp_check(&d->domain)) {
-                if (d->current == NULL && d->currentlen == 0) {
-                        reason = yp_first(d->domain, "rpc.bynumber",
-                                          &d->current, &d->currentlen,
-                                          &val, &vallen);
-                } else {
-                        reason = yp_next(d->domain, "rpc.bynumber",
-                                         d->current, d->currentlen,
-                                         &d->current, &d->currentlen,
-                                         &val, &vallen);
-                }
-                switch(reason) {
-                case 0:
-                        break;
-                case YPERR_MAP:
-                        __yp_nomap = 1;
-                        goto no_yp;
-                        break;
-                default:
-                        return(0);
-                        break;
-                }
-                val[vallen] = '\0';
-                hp = interpret(val, vallen);
-                (void) free(val);
-                return hp;
-        }
-no_yp:
-#endif	/* YP */
-	if (d->rpcf == NULL && (d->rpcf = fopen(RPCDB, "r")) == NULL)
-		return (NULL);
-	/* -1 so there is room to append a \n below */
-        if (fgets(d->line, BUFSIZ - 1, d->rpcf) == NULL)
-		return (NULL);
-	return (interpret(d->line, strlen(d->line)));
-}
-
-static struct rpcent *
-interpret(val, len)
-	char *val;
-	size_t len;
-{
-	struct rpcdata *d = _rpcdata();
-	char *p;
-	char *cp, **q;
-
-	assert(val != NULL);
-
-	if (d == 0)
-		return (0);
-	(void) strncpy(d->line, val, BUFSIZ);
-	d->line[BUFSIZ] = '\0';
-	p = d->line;
-	p[len] = '\n';
-	if (*p == '#')
-		return (getrpcent());
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		return (getrpcent());
-	*cp = '\0';
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		return (getrpcent());
-	*cp++ = '\0';
-	/* THIS STUFF IS INTERNET SPECIFIC */
-	d->rpc.r_name = d->line;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	d->rpc.r_number = atoi(cp);
-	q = d->rpc.r_aliases = d->rpc_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &(d->rpc_aliases[MAXALIASES - 1]))
-			*q++ = cp;
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return (&d->rpc);
-}
-
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
deleted file mode 100644
index 155320f..0000000
--- a/lib/libc/rpc/getrpcport.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$NetBSD: getrpcport.c,v 1.16 2000/01/22 22:19:18 mycroft Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)getrpcport.c 1.3 87/08/11 SMI";
-static char *sccsid = "@(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/getrpcport.c,v 1.13 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * Copyright (c) 1985 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <assert.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
-#include "un-namespace.h"
-
-int
-getrpcport(host, prognum, versnum, proto)
-	char *host;
-	int prognum, versnum, proto;
-{
-	struct sockaddr_in addr;
-	struct hostent *hp;
-
-	assert(host != NULL);
-
-	if ((hp = gethostbyname(host)) == NULL)
-		return (0);
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_len = sizeof(struct sockaddr_in);
-	addr.sin_family = AF_INET;
-	addr.sin_port =  0;
-	if (hp->h_length > addr.sin_len)
-		hp->h_length = addr.sin_len;
-	memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length);
-	/* Inconsistent interfaces need casts! :-( */
-	return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, 
-	    (u_int)proto));
-}
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
deleted file mode 100644
index 2353985..0000000
--- a/lib/libc/rpc/key_call.c
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#ident	"@(#)key_call.c	1.25	94/04/24 SMI"
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/key_call.c,v 1.15 2004/10/16 06:11:34 obrien Exp $");
-
-/*
- * key_call.c, Interface to keyserver
- *
- * setsecretkey(key) - set your secret key
- * encryptsessionkey(agent, deskey) - encrypt a session key to talk to agent
- * decryptsessionkey(agent, deskey) - decrypt ditto
- * gendeskey(deskey) - generate a secure des key
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <rpc/rpc.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
-#include <rpc/key_prot.h>
-#include <string.h>
-#include <netconfig.h>
-#include <sys/utsname.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/fcntl.h>
-#include "un-namespace.h"
-
-
-#define	KEY_TIMEOUT	5	/* per-try timeout in seconds */
-#define	KEY_NRETRY	12	/* number of retries */
-
-#ifdef DEBUG
-#define	debug(msg)	(void) fprintf(stderr, "%s\n", msg);
-#else
-#define	debug(msg)
-#endif /* DEBUG */
-
-/*
- * Hack to allow the keyserver to use AUTH_DES (for authenticated
- * NIS+ calls, for example).  The only functions that get called
- * are key_encryptsession_pk, key_decryptsession_pk, and key_gendes.
- *
- * The approach is to have the keyserver fill in pointers to local
- * implementations of these functions, and to call those in key_call().
- */
-
-cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
-cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
-des_block *(*__key_gendes_LOCAL)() = 0;
-
-static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *);
-
-int
-key_setsecret(secretkey)
-	const char *secretkey;
-{
-	keystatus status;
-
-	if (!key_call((u_long) KEY_SET, (xdrproc_t)xdr_keybuf,
-			(void *)secretkey,
-			(xdrproc_t)xdr_keystatus, &status)) {
-		return (-1);
-	}
-	if (status != KEY_SUCCESS) {
-		debug("set status is nonzero");
-		return (-1);
-	}
-	return (0);
-}
-
-
-/* key_secretkey_is_set() returns 1 if the keyserver has a secret key
- * stored for the caller's effective uid; it returns 0 otherwise
- *
- * N.B.:  The KEY_NET_GET key call is undocumented.  Applications shouldn't
- * be using it, because it allows them to get the user's secret key.
- */
-
-int
-key_secretkey_is_set(void)
-{
-	struct key_netstres 	kres;
-
-	memset((void*)&kres, 0, sizeof (kres));
-	if (key_call((u_long) KEY_NET_GET, (xdrproc_t)xdr_void, NULL,
-			(xdrproc_t)xdr_key_netstres, &kres) &&
-	    (kres.status == KEY_SUCCESS) &&
-	    (kres.key_netstres_u.knet.st_priv_key[0] != 0)) {
-		/* avoid leaving secret key in memory */
-		memset(kres.key_netstres_u.knet.st_priv_key, 0, HEXKEYBYTES);
-		return (1);
-	}
-	return (0);
-}
-
-int
-key_encryptsession_pk(remotename, remotekey, deskey)
-	char *remotename;
-	netobj *remotekey;
-	des_block *deskey;
-{
-	cryptkeyarg2 arg;
-	cryptkeyres res;
-
-	arg.remotename = remotename;
-	arg.remotekey = *remotekey;
-	arg.deskey = *deskey;
-	if (!key_call((u_long)KEY_ENCRYPT_PK, (xdrproc_t)xdr_cryptkeyarg2, &arg,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("encrypt status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-int
-key_decryptsession_pk(remotename, remotekey, deskey)
-	char *remotename;
-	netobj *remotekey;
-	des_block *deskey;
-{
-	cryptkeyarg2 arg;
-	cryptkeyres res;
-
-	arg.remotename = remotename;
-	arg.remotekey = *remotekey;
-	arg.deskey = *deskey;
-	if (!key_call((u_long)KEY_DECRYPT_PK, (xdrproc_t)xdr_cryptkeyarg2, &arg,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("decrypt status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-int
-key_encryptsession(remotename, deskey)
-	const char *remotename;
-	des_block *deskey;
-{
-	cryptkeyarg arg;
-	cryptkeyres res;
-
-	arg.remotename = (char *) remotename;
-	arg.deskey = *deskey;
-	if (!key_call((u_long)KEY_ENCRYPT, (xdrproc_t)xdr_cryptkeyarg, &arg,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("encrypt status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-int
-key_decryptsession(remotename, deskey)
-	const char *remotename;
-	des_block *deskey;
-{
-	cryptkeyarg arg;
-	cryptkeyres res;
-
-	arg.remotename = (char *) remotename;
-	arg.deskey = *deskey;
-	if (!key_call((u_long)KEY_DECRYPT, (xdrproc_t)xdr_cryptkeyarg, &arg,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("decrypt status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-int
-key_gendes(key)
-	des_block *key;
-{
-	if (!key_call((u_long)KEY_GEN, (xdrproc_t)xdr_void, NULL,
-			(xdrproc_t)xdr_des_block, key)) {
-		return (-1);
-	}
-	return (0);
-}
-
-int
-key_setnet(arg)
-struct key_netstarg *arg;
-{
-	keystatus status;
-
-
-	if (!key_call((u_long) KEY_NET_PUT, (xdrproc_t)xdr_key_netstarg, arg,
-			(xdrproc_t)xdr_keystatus, &status)){
-		return (-1);
-	}
-
-	if (status != KEY_SUCCESS) {
-		debug("key_setnet status is nonzero");
-		return (-1);
-	}
-	return (1);
-}
-
-
-int
-key_get_conv(pkey, deskey)
-	char *pkey;
-	des_block *deskey;
-{
-	cryptkeyres res;
-
-	if (!key_call((u_long) KEY_GET_CONV, (xdrproc_t)xdr_keybuf, pkey,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("get_conv status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-struct  key_call_private {
-	CLIENT	*client;	/* Client handle */
-	pid_t	pid;		/* process-id at moment of creation */
-	uid_t	uid;		/* user-id at last authorization */
-};
-static struct key_call_private *key_call_private_main = NULL;
-
-static void
-key_call_destroy(void *vp)
-{
-	struct key_call_private *kcp = (struct key_call_private *)vp;
-
-	if (kcp) {
-		if (kcp->client)
-			clnt_destroy(kcp->client);
-		free(kcp);
-	}
-}
-
-/*
- * Keep the handle cached.  This call may be made quite often.
- */
-static CLIENT *
-getkeyserv_handle(vers)
-int	vers;
-{
-	void *localhandle;
-	struct netconfig *nconf;
-	struct netconfig *tpconf;
-	struct key_call_private *kcp = key_call_private_main;
-	struct timeval wait_time;
-	struct utsname u;
-	int main_thread;
-	int fd;
-	static thread_key_t key_call_key;
-	extern mutex_t tsd_lock;
-
-#define	TOTAL_TIMEOUT	30	/* total timeout talking to keyserver */
-#define	TOTAL_TRIES	5	/* Number of tries */
-
-	if ((main_thread = thr_main())) {
-		kcp = key_call_private_main;
-	} else {
-		if (key_call_key == 0) {
-			mutex_lock(&tsd_lock);
-			if (key_call_key == 0)
-				thr_keycreate(&key_call_key, key_call_destroy);
-			mutex_unlock(&tsd_lock);
-		}
-		kcp = (struct key_call_private *)thr_getspecific(key_call_key);
-	}	
-	if (kcp == (struct key_call_private *)NULL) {
-		kcp = (struct key_call_private *)malloc(sizeof (*kcp));
-		if (kcp == (struct key_call_private *)NULL) {
-			return ((CLIENT *) NULL);
-		}
-                if (main_thread)
-                        key_call_private_main = kcp;
-                else
-                        thr_setspecific(key_call_key, (void *) kcp);
-		kcp->client = NULL;
-	}
-
-	/* if pid has changed, destroy client and rebuild */
-	if (kcp->client != NULL && kcp->pid != getpid()) {
-		clnt_destroy(kcp->client);
-		kcp->client = NULL;
-	}
-
-	if (kcp->client != NULL) {
-		/* if uid has changed, build client handle again */
-		if (kcp->uid != geteuid()) {
-			kcp->uid = geteuid();
-			auth_destroy(kcp->client->cl_auth);
-			kcp->client->cl_auth =
-				authsys_create("", kcp->uid, 0, 0, NULL);
-			if (kcp->client->cl_auth == NULL) {
-				clnt_destroy(kcp->client);
-				kcp->client = NULL;
-				return ((CLIENT *) NULL);
-			}
-		}
-		/* Change the version number to the new one */
-		clnt_control(kcp->client, CLSET_VERS, (void *)&vers);
-		return (kcp->client);
-	}
-	if (!(localhandle = setnetconfig())) {
-		return ((CLIENT *) NULL);
-	}
-        tpconf = NULL;
-#if defined(__FreeBSD__)
-	if (uname(&u) == -1)
-#else
-#if defined(i386)
-	if (_nuname(&u) == -1)
-#elif defined(sparc)
-	if (_uname(&u) == -1)
-#else
-#error Unknown architecture!
-#endif
-#endif
-	{
-		endnetconfig(localhandle);
-		return ((CLIENT *) NULL);
-        }
-	while ((nconf = getnetconfig(localhandle)) != NULL) {
-		if (strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0) {
-			/*
-			 * We use COTS_ORD here so that the caller can
-			 * find out immediately if the server is dead.
-			 */
-			if (nconf->nc_semantics == NC_TPI_COTS_ORD) {
-				kcp->client = clnt_tp_create(u.nodename,
-					KEY_PROG, vers, nconf);
-				if (kcp->client)
-					break;
-			} else {
-				tpconf = nconf;
-			}
-		}
-	}
-	if ((kcp->client == (CLIENT *) NULL) && (tpconf))
-		/* Now, try the CLTS or COTS loopback transport */
-		kcp->client = clnt_tp_create(u.nodename,
-			KEY_PROG, vers, tpconf);
-	endnetconfig(localhandle);
-
-	if (kcp->client == (CLIENT *) NULL) {
-		return ((CLIENT *) NULL);
-        }
-	kcp->uid = geteuid();
-	kcp->pid = getpid();
-	kcp->client->cl_auth = authsys_create("", kcp->uid, 0, 0, NULL);
-	if (kcp->client->cl_auth == NULL) {
-		clnt_destroy(kcp->client);
-		kcp->client = NULL;
-		return ((CLIENT *) NULL);
-	}
-
-	wait_time.tv_sec = TOTAL_TIMEOUT/TOTAL_TRIES;
-	wait_time.tv_usec = 0;
-	(void) clnt_control(kcp->client, CLSET_RETRY_TIMEOUT,
-		(char *)&wait_time);
-	if (clnt_control(kcp->client, CLGET_FD, (char *)&fd))
-		_fcntl(fd, F_SETFD, 1);	/* make it "close on exec" */
-
-	return (kcp->client);
-}
-
-/* returns  0 on failure, 1 on success */
-
-static int
-key_call(proc, xdr_arg, arg, xdr_rslt, rslt)
-	u_long proc;
-	xdrproc_t xdr_arg;
-	void *arg;
-	xdrproc_t xdr_rslt;
-	void *rslt;
-{
-	CLIENT *clnt;
-	struct timeval wait_time;
-
-	if (proc == KEY_ENCRYPT_PK && __key_encryptsession_pk_LOCAL) {
-		cryptkeyres *res;
-		res = (*__key_encryptsession_pk_LOCAL)(geteuid(), arg);
-		*(cryptkeyres*)rslt = *res;
-		return (1);
-	} else if (proc == KEY_DECRYPT_PK && __key_decryptsession_pk_LOCAL) {
-		cryptkeyres *res;
-		res = (*__key_decryptsession_pk_LOCAL)(geteuid(), arg);
-		*(cryptkeyres*)rslt = *res;
-		return (1);
-	} else if (proc == KEY_GEN && __key_gendes_LOCAL) {
-		des_block *res;
-		res = (*__key_gendes_LOCAL)(geteuid(), 0);
-		*(des_block*)rslt = *res;
-		return (1);
-	}
-
-	if ((proc == KEY_ENCRYPT_PK) || (proc == KEY_DECRYPT_PK) ||
-	    (proc == KEY_NET_GET) || (proc == KEY_NET_PUT) ||
-	    (proc == KEY_GET_CONV))
-		clnt = getkeyserv_handle(2); /* talk to version 2 */
-	else
-		clnt = getkeyserv_handle(1); /* talk to version 1 */
-
-	if (clnt == NULL) {
-		return (0);
-	}
-
-	wait_time.tv_sec = TOTAL_TIMEOUT;
-	wait_time.tv_usec = 0;
-
-	if (clnt_call(clnt, proc, xdr_arg, arg, xdr_rslt, rslt,
-		wait_time) == RPC_SUCCESS) {
-		return (1);
-	} else {
-		return (0);
-	}
-}
diff --git a/lib/libc/rpc/key_prot_xdr.c b/lib/libc/rpc/key_prot_xdr.c
deleted file mode 100644
index fe3c107..0000000
--- a/lib/libc/rpc/key_prot_xdr.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "namespace.h"
-#include <rpc/key_prot.h>
-#include "un-namespace.h"
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
-
-/* #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/key_prot_xdr.c,v 1.5 2004/10/16 06:11:34 obrien Exp $");
-
-/* 
- * Compiled from key_prot.x using rpcgen.
- * DO NOT EDIT THIS FILE!
- * This is NOT source code!
- */
-
-bool_t
-xdr_keystatus(register XDR *xdrs, keystatus *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_keybuf(register XDR *xdrs, keybuf objp)
-{
-
-	if (!xdr_opaque(xdrs, objp, HEXKEYBYTES))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_netnamestr(register XDR *xdrs, netnamestr *objp)
-{
-
-	if (!xdr_string(xdrs, objp, MAXNETNAMELEN))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_cryptkeyarg(register XDR *xdrs, cryptkeyarg *objp)
-{
-
-	if (!xdr_netnamestr(xdrs, &objp->remotename))
-		return (FALSE);
-	if (!xdr_des_block(xdrs, &objp->deskey))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_cryptkeyarg2(register XDR *xdrs, cryptkeyarg2 *objp)
-{
-
-	if (!xdr_netnamestr(xdrs, &objp->remotename))
-		return (FALSE);
-	if (!xdr_netobj(xdrs, &objp->remotekey))
-		return (FALSE);
-	if (!xdr_des_block(xdrs, &objp->deskey))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_cryptkeyres(register XDR *xdrs, cryptkeyres *objp)
-{
-
-	if (!xdr_keystatus(xdrs, &objp->status))
-		return (FALSE);
-	switch (objp->status) {
-	case KEY_SUCCESS:
-		if (!xdr_des_block(xdrs, &objp->cryptkeyres_u.deskey))
-			return (FALSE);
-		break;
-	default:
-		break;
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_unixcred(register XDR *xdrs, unixcred *objp)
-{
-
-	if (!xdr_u_int(xdrs, &objp->uid))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->gid))
-		return (FALSE);
-	if (!xdr_array(xdrs, (char **)&objp->gids.gids_val, (u_int *) &objp->gids.gids_len, MAXGIDS,
-		sizeof (u_int), (xdrproc_t) xdr_u_int))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_getcredres(register XDR *xdrs, getcredres *objp)
-{
-
-	if (!xdr_keystatus(xdrs, &objp->status))
-		return (FALSE);
-	switch (objp->status) {
-	case KEY_SUCCESS:
-		if (!xdr_unixcred(xdrs, &objp->getcredres_u.cred))
-			return (FALSE);
-		break;
-	default:
-		break;
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_key_netstarg(register XDR *xdrs, key_netstarg *objp)
-{
-
-	if (!xdr_keybuf(xdrs, objp->st_priv_key))
-		return (FALSE);
-	if (!xdr_keybuf(xdrs, objp->st_pub_key))
-		return (FALSE);
-	if (!xdr_netnamestr(xdrs, &objp->st_netname))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_key_netstres(register XDR *xdrs, key_netstres *objp)
-{
-
-	if (!xdr_keystatus(xdrs, &objp->status))
-		return (FALSE);
-	switch (objp->status) {
-	case KEY_SUCCESS:
-		if (!xdr_key_netstarg(xdrs, &objp->key_netstres_u.knet))
-			return (FALSE);
-		break;
-	default:
-		break;
-	}
-	return (TRUE);
-}
diff --git a/lib/libc/rpc/mt_misc.c b/lib/libc/rpc/mt_misc.c
deleted file mode 100644
index adabbb8..0000000
--- a/lib/libc/rpc/mt_misc.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*	$NetBSD: mt_misc.c,v 1.1 2000/06/02 23:11:11 fvdl Exp $	*/
-
-/* #pragma ident	"@(#)mt_misc.c	1.24	93/04/29 SMI" */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/mt_misc.c,v 1.6 2004/10/16 06:11:34 obrien Exp $");
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <rpc/rpc.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-/* protects the services list (svc.c) */
-pthread_rwlock_t	svc_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-/* protects svc_fdset and the xports[] array */
-pthread_rwlock_t	svc_fd_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-/* protects the RPCBIND address cache */
-pthread_rwlock_t	rpcbaddr_cache_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-/* protects authdes cache (svcauth_des.c) */
-pthread_mutex_t	authdes_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* serializes authdes ops initializations */
-pthread_mutex_t authdes_ops_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects des stats list */
-pthread_mutex_t svcauthdesstats_lock = PTHREAD_MUTEX_INITIALIZER;
-
-#ifdef KERBEROS
-/* auth_kerb.c serialization */
-pthread_mutex_t authkerb_lock = PTHREAD_MUTEX_INITIALIZER;
-/* protects kerb stats list */
-pthread_mutex_t svcauthkerbstats_lock = PTHREAD_MUTEX_INITIALIZER;
-#endif /* KERBEROS */
-
-/* auth_none.c serialization */
-pthread_mutex_t	authnone_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects the Auths list (svc_auth.c) */
-pthread_mutex_t	authsvc_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects client-side fd lock array */
-pthread_mutex_t	clnt_fd_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* clnt_raw.c serialization */
-pthread_mutex_t	clntraw_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* domainname and domain_fd (getdname.c) and default_domain (rpcdname.c) */
-pthread_mutex_t	dname_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* dupreq variables (svc_dg.c) */
-pthread_mutex_t	dupreq_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects first_time and hostname (key_call.c) */
-pthread_mutex_t	keyserv_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* serializes rpc_trace() (rpc_trace.c) */
-pthread_mutex_t	libnsl_trace_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* loopnconf (rpcb_clnt.c) */
-pthread_mutex_t	loopnconf_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* serializes ops initializations */
-pthread_mutex_t	ops_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects ``port'' static in bindresvport() */
-pthread_mutex_t	portnum_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects proglst list (svc_simple.c) */
-pthread_mutex_t	proglst_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* serializes clnt_com_create() (rpc_soc.c) */
-pthread_mutex_t	rpcsoc_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* svc_raw.c serialization */
-pthread_mutex_t	svcraw_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects TSD key creation */
-pthread_mutex_t	tsd_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* xprtlist (svc_generic.c) */
-pthread_mutex_t	xprtlist_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* serializes calls to public key routines */
-pthread_mutex_t serialize_pkey = PTHREAD_MUTEX_INITIALIZER;
-
-#undef	rpc_createerr
-
-struct rpc_createerr rpc_createerr;
-
-struct rpc_createerr *
-__rpc_createerr()
-{
-	static thread_key_t rce_key = 0;
-	struct rpc_createerr *rce_addr = 0;
-
-	if (thr_main())
-		return (&rpc_createerr);
-	if ((rce_addr =
-	    (struct rpc_createerr *)thr_getspecific(rce_key)) != 0) {
-		mutex_lock(&tsd_lock);
-		if (thr_keycreate(&rce_key, free) != 0) {
-			mutex_unlock(&tsd_lock);
-			return (&rpc_createerr);
-		}
-		mutex_unlock(&tsd_lock);
-	}
-	if (!rce_addr) {
-		rce_addr = (struct rpc_createerr *)
-			malloc(sizeof (struct rpc_createerr));
-		if (thr_setspecific(rce_key, (void *) rce_addr) != 0) {
-			if (rce_addr)
-				free(rce_addr);
-			return (&rpc_createerr);
-		}
-		memset(rce_addr, 0, sizeof (struct rpc_createerr));
-		return (rce_addr);
-	}
-	return (rce_addr);
-}
diff --git a/lib/libc/rpc/netname.c b/lib/libc/rpc/netname.c
deleted file mode 100644
index e8e72c3..0000000
--- a/lib/libc/rpc/netname.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)netname.c 1.8 91/03/11 Copyr 1986 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/netname.c,v 1.8 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * netname utility routines
- * convert from unix names to network names and vice-versa
- * This module is operating system dependent!
- * What we define here will work with any unix system that has adopted
- * the sun NIS domain architecture.
- */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <rpc/rpc.h>
-#include <rpc/rpc_com.h>
-#ifdef YP
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 256
-#endif
-#ifndef NGROUPS
-#define NGROUPS 16
-#endif
-
-#define TYPE_BIT(type)  (sizeof (type) * CHAR_BIT)
-
-#define TYPE_SIGNED(type) (((type) -1) < 0)
-
-/*
-** 302 / 1000 is log10(2.0) rounded up.
-** Subtract one for the sign bit if the type is signed;
-** add one for integer division truncation;
-** add one more for a minus sign if the type is signed.
-*/
-#define INT_STRLEN_MAXIMUM(type) \
-    ((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
-
-static char *OPSYS = "unix";
-
-/*
- * Figure out my fully qualified network name
- */
-int
-getnetname(name)
-	char name[MAXNETNAMELEN+1];
-{
-	uid_t uid;
-
-	uid = geteuid();
-	if (uid == 0) {
-		return (host2netname(name, (char *) NULL, (char *) NULL));
-	} else {
-		return (user2netname(name, uid, (char *) NULL));
-	}
-}
-
-
-/*
- * Convert unix cred to network-name
- */
-int
-user2netname(netname, uid, domain)
-	char netname[MAXNETNAMELEN + 1];
-	const uid_t uid;
-	const char *domain;
-{
-	char *dfltdom;
-
-	if (domain == NULL) {
-		if (__rpc_get_default_domain(&dfltdom) != 0) {
-			return (0);
-		}
-		domain = dfltdom;
-	}
-	if (strlen(domain) + 1 + INT_STRLEN_MAXIMUM(u_long) + 1 + strlen(OPSYS) > MAXNETNAMELEN) {
-		return (0);
-	}
-	(void) sprintf(netname, "%s.%ld@%s", OPSYS, (u_long)uid, domain);	
-	return (1);
-}
-
-
-/*
- * Convert host to network-name
- */
-int
-host2netname(netname, host, domain)
-	char netname[MAXNETNAMELEN + 1];
-	const char *host;
-	const char *domain;
-{
-	char *dfltdom;
-	char hostname[MAXHOSTNAMELEN+1];
-
-	if (domain == NULL) {
-		if (__rpc_get_default_domain(&dfltdom) != 0) {
-			return (0);
-		}
-		domain = dfltdom;
-	}
-	if (host == NULL) {
-		(void) gethostname(hostname, sizeof(hostname));
-		host = hostname;
-	}
-	if (strlen(domain) + 1 + strlen(host) + 1 + strlen(OPSYS) > MAXNETNAMELEN) {
-		return (0);
-	} 
-	(void) sprintf(netname, "%s.%s@%s", OPSYS, host, domain);
-	return (1);
-}
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
deleted file mode 100644
index d88793d..0000000
--- a/lib/libc/rpc/netnamer.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/netnamer.c,v 1.12 2005/03/10 00:58:21 stefanf Exp $");
-
-/*
- * netname utility routines convert from unix names to network names and
- * vice-versa This module is operating system dependent! What we define here
- * will work with any unix system that has adopted the sun NIS domain
- * architecture.
- */
-#include "namespace.h"
-#include <sys/param.h>
-#include <rpc/rpc.h>
-#include <rpc/rpc_com.h>
-#ifdef YP
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <ctype.h>
-#include <stdio.h>
-#include <grp.h>
-#include <pwd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-static char    *OPSYS = "unix";
-#ifdef YP
-static char    *NETID = "netid.byname";
-#endif
-static char    *NETIDFILE = "/etc/netid";
-
-static int getnetid( char *, char * );
-static int _getgroups( char *, gid_t * );
-
-#ifndef NGROUPS
-#define NGROUPS 16
-#endif
-
-/*
- * Convert network-name into unix credential
- */
-int
-netname2user(netname, uidp, gidp, gidlenp, gidlist)
-	char            netname[MAXNETNAMELEN + 1];
-	uid_t            *uidp;
-	gid_t            *gidp;
-	int            *gidlenp;
-	gid_t	       *gidlist;
-{
-	char           *p;
-	int             gidlen;
-	uid_t           uid;
-	long		luid;
-	struct passwd  *pwd;
-	char            val[1024];
-	char           *val1, *val2;
-	char           *domain;
-	int             vallen;
-	int             err;
-
-	if (getnetid(netname, val)) {
-		char *res = val;
-
-		p = strsep(&res, ":");
-		if (p == NULL)
-			return (0);
-		*uidp = (uid_t) atol(p);
-		p = strsep(&res, "\n,");
-		if (p == NULL) {
-			return (0);
-		}
-		*gidp = (gid_t) atol(p);
-		for (gidlen = 0; gidlen < NGROUPS; gidlen++) {
-			p = strsep(&res, "\n,");
-			if (p == NULL)
-				break;
-			gidlist[gidlen] = (gid_t) atol(p);
-		}
-		*gidlenp = gidlen;
-
-		return (1);
-	}
-	val1 = strchr(netname, '.');
-	if (val1 == NULL)
-		return (0);
-	if (strncmp(netname, OPSYS, (val1-netname)))
-		return (0);
-	val1++;
-	val2 = strchr(val1, '@');
-	if (val2 == NULL)
-		return (0);
-	vallen = val2 - val1;
-	if (vallen > (1024 - 1))
-		vallen = 1024 - 1;
-	(void) strncpy(val, val1, 1024);
-	val[vallen] = 0;
-
-	err = __rpc_get_default_domain(&domain);	/* change to rpc */
-	if (err)
-		return (0);
-
-	if (strcmp(val2 + 1, domain))
-		return (0);	/* wrong domain */
-
-	if (sscanf(val, "%ld", &luid) != 1)
-		return (0);
-	uid = luid;
-
-	/* use initgroups method */
-	pwd = getpwuid(uid);
-	if (pwd == NULL)
-		return (0);
-	*uidp = pwd->pw_uid;
-	*gidp = pwd->pw_gid;
-	*gidlenp = _getgroups(pwd->pw_name, gidlist);
-	return (1);
-}
-
-/*
- * initgroups
- */
-
-static int
-_getgroups(uname, groups)
-	char           *uname;
-	gid_t          groups[NGROUPS];
-{
-	gid_t           ngroups = 0;
-	struct group *grp;
-	int    i;
-	int    j;
-	int             filter;
-
-	setgrent();
-	while ((grp = getgrent())) {
-		for (i = 0; grp->gr_mem[i]; i++)
-			if (!strcmp(grp->gr_mem[i], uname)) {
-				if (ngroups == NGROUPS) {
-#ifdef DEBUG
-					fprintf(stderr,
-				"initgroups: %s is in too many groups\n", uname);
-#endif
-					goto toomany;
-				}
-				/* filter out duplicate group entries */
-				filter = 0;
-				for (j = 0; j < ngroups; j++)
-					if (groups[j] == grp->gr_gid) {
-						filter++;
-						break;
-					}
-				if (!filter)
-					groups[ngroups++] = grp->gr_gid;
-			}
-	}
-toomany:
-	endgrent();
-	return (ngroups);
-}
-
-/*
- * Convert network-name to hostname
- */
-int
-netname2host(netname, hostname, hostlen)
-	char            netname[MAXNETNAMELEN + 1];
-	char           *hostname;
-	int             hostlen;
-{
-	int             err;
-	char            valbuf[1024];
-	char           *val;
-	char           *val2;
-	int             vallen;
-	char           *domain;
-
-	if (getnetid(netname, valbuf)) {
-		val = valbuf;
-		if ((*val == '0') && (val[1] == ':')) {
-			(void) strncpy(hostname, val + 2, hostlen);
-			return (1);
-		}
-	}
-	val = strchr(netname, '.');
-	if (val == NULL)
-		return (0);
-	if (strncmp(netname, OPSYS, (val - netname)))
-		return (0);
-	val++;
-	val2 = strchr(val, '@');
-	if (val2 == NULL)
-		return (0);
-	vallen = val2 - val;
-	if (vallen > (hostlen - 1))
-		vallen = hostlen - 1;
-	(void) strncpy(hostname, val, vallen);
-	hostname[vallen] = 0;
-
-	err = __rpc_get_default_domain(&domain);	/* change to rpc */
-	if (err)
-		return (0);
-
-	if (strcmp(val2 + 1, domain))
-		return (0);	/* wrong domain */
-	else
-		return (1);
-}
-
-/*
- * reads the file /etc/netid looking for a + to optionally go to the
- * network information service.
- */
-int
-getnetid(key, ret)
-	char           *key, *ret;
-{
-	char            buf[1024];	/* big enough */
-	char           *res;
-	char           *mkey;
-	char           *mval;
-	FILE           *fd;
-#ifdef YP
-	char           *domain;
-	int             err;
-	char           *lookup;
-	int             len;
-#endif
-
-	fd = fopen(NETIDFILE, "r");
-	if (fd == NULL) {
-#ifdef YP
-		res = "+";
-		goto getnetidyp;
-#else
-		return (0);
-#endif
-	}
-	for (;;) {
-		if (fd == NULL)
-			return (0);	/* getnetidyp brings us here */
-		res = fgets(buf, sizeof(buf), fd);
-		if (res == NULL) {
-			fclose(fd);
-			return (0);
-		}
-		if (res[0] == '#')
-			continue;
-		else if (res[0] == '+') {
-#ifdef YP
-	getnetidyp:
-			err = yp_get_default_domain(&domain);
-			if (err) {
-				continue;
-			}
-			lookup = NULL;
-			err = yp_match(domain, NETID, key,
-				strlen(key), &lookup, &len);
-			if (err) {
-#ifdef DEBUG
-				fprintf(stderr, "match failed error %d\n", err);
-#endif
-				continue;
-			}
-			lookup[len] = 0;
-			strcpy(ret, lookup);
-			free(lookup);
-			if (fd != NULL)
-				fclose(fd);
-			return (2);
-#else	/* YP */
-#ifdef DEBUG
-			fprintf(stderr,
-"Bad record in %s '+' -- NIS not supported in this library copy\n",
-				NETIDFILE);
-#endif
-			continue;
-#endif	/* YP */
-		} else {
-			mkey = strsep(&res, "\t ");
-			if (mkey == NULL) {
-				fprintf(stderr,
-		"Bad record in %s -- %s", NETIDFILE, buf);
-				continue;
-			}
-			do {
-				mval = strsep(&res, " \t#\n");
-			} while (mval != NULL && !*mval);
-			if (mval == NULL) {
-				fprintf(stderr,
-		"Bad record in %s val problem - %s", NETIDFILE, buf);
-				continue;
-			}
-			if (strcmp(mkey, key) == 0) {
-				strcpy(ret, mval);
-				fclose(fd);
-				return (1);
-
-			}
-		}
-	}
-}
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
deleted file mode 100644
index 117eff9..0000000
--- a/lib/libc/rpc/pmap_clnt.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*	$NetBSD: pmap_clnt.c,v 1.16 2000/07/06 03:10:34 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_clnt.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * pmap_clnt.c
- * Client interface to pmap rpc service.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/nettype.h>
-#include <netinet/in.h>
-#include "un-namespace.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "rpc_com.h"
-
-bool_t
-pmap_set(u_long program, u_long version, int protocol, int port)
-{
-	bool_t rslt;
-	struct netbuf *na;
-	struct netconfig *nconf;
-	char buf[32];
-
-	if ((protocol != IPPROTO_UDP) && (protocol != IPPROTO_TCP)) {
-		return (FALSE);
-	}
-	nconf = __rpc_getconfip(protocol == IPPROTO_UDP ? "udp" : "tcp");
-	if (nconf == NULL) {
-		return (FALSE);
-	}
-	snprintf(buf, sizeof buf, "0.0.0.0.%d.%d", 
-	    (((uint32_t)port) >> 8) & 0xff, port & 0xff);
-	na = uaddr2taddr(nconf, buf);
-	if (na == NULL) {
-		freenetconfigent(nconf);
-		return (FALSE);
-	}
-	rslt = rpcb_set((rpcprog_t)program, (rpcvers_t)version, nconf, na);
-	free(na);
-	freenetconfigent(nconf);
-	return (rslt);
-}
-
-/*
- * Remove the mapping between program, version and port.
- * Calls the pmap service remotely to do the un-mapping.
- */
-bool_t
-pmap_unset(u_long program, u_long version)
-{
-	struct netconfig *nconf;
-	bool_t udp_rslt = FALSE;
-	bool_t tcp_rslt = FALSE;
-
-	nconf = __rpc_getconfip("udp");
-	if (nconf != NULL) {
-		udp_rslt = rpcb_unset((rpcprog_t)program, (rpcvers_t)version,
-		    nconf);
-		freenetconfigent(nconf);
-	}
-	nconf = __rpc_getconfip("tcp");
-	if (nconf != NULL) {
-		tcp_rslt = rpcb_unset((rpcprog_t)program, (rpcvers_t)version,
-		    nconf);
-		freenetconfigent(nconf);
-	}
-	/*
-	 * XXX: The call may still succeed even if only one of the
-	 * calls succeeded.  This was the best that could be
-	 * done for backward compatibility.
-	 */
-	return (tcp_rslt || udp_rslt);
-}
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
deleted file mode 100644
index dcb895c..0000000
--- a/lib/libc/rpc/pmap_getmaps.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: pmap_getmaps.c,v 1.16 2000/07/06 03:10:34 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getmaps.c,v 1.16 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * pmap_getmap.c
- * Client interface to pmap rpc service.
- * contains pmap_getmaps, which is only tcp service involved
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-
-#include <arpa/inet.h>
-#include <net/if.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include "un-namespace.h"
-
-#define NAMELEN 255
-#define MAX_BROADCAST_SIZE 1400
-
-/*
- * Get a copy of the current port maps.
- * Calls the pmap service remotely to do get the maps.
- */
-struct pmaplist *
-pmap_getmaps(address)
-	 struct sockaddr_in *address;
-{
-	struct pmaplist *head = NULL;
-	int sock = -1;
-	struct timeval minutetimeout;
-	CLIENT *client;
-
-	assert(address != NULL);
-
-	minutetimeout.tv_sec = 60;
-	minutetimeout.tv_usec = 0;
-	address->sin_port = htons(PMAPPORT);
-	client = clnttcp_create(address, PMAPPROG,
-	    PMAPVERS, &sock, 50, 500);
-	if (client != NULL) {
-		if (CLNT_CALL(client, (rpcproc_t)PMAPPROC_DUMP,
-		    (xdrproc_t)xdr_void, NULL,
-		    (xdrproc_t)xdr_pmaplist, &head, minutetimeout) !=
-		    RPC_SUCCESS) {
-			clnt_perror(client, "pmap_getmaps rpc problem");
-		}
-		CLNT_DESTROY(client);
-	}
-	address->sin_port = 0;
-	return (head);
-}
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
deleted file mode 100644
index 1fdda9a..0000000
--- a/lib/libc/rpc/pmap_getport.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*	$NetBSD: pmap_getport.c,v 1.16 2000/07/06 03:10:34 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "from: @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_getport.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * pmap_getport.c
- * Client interface to pmap rpc service.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <arpa/inet.h>
-#include <net/if.h>
-
-#include <assert.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include "un-namespace.h"
-
-static const struct timeval timeout = { 5, 0 };
-static const struct timeval tottimeout = { 60, 0 };
-
-/*
- * Find the mapped port for program,version.
- * Calls the pmap service remotely to do the lookup.
- * Returns 0 if no map exists.
- */
-u_short
-pmap_getport(address, program, version, protocol)
-	struct sockaddr_in *address;
-	u_long program;
-	u_long version;
-	u_int protocol;
-{
-	u_short port = 0;
-	int sock = -1;
-	CLIENT *client;
-	struct pmap parms;
-
-	assert(address != NULL);
-
-	address->sin_port = htons(PMAPPORT);
-	client = clntudp_bufcreate(address, PMAPPROG,
-	    PMAPVERS, timeout, &sock, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
-	if (client != NULL) {
-		parms.pm_prog = program;
-		parms.pm_vers = version;
-		parms.pm_prot = protocol;
-		parms.pm_port = 0;  /* not needed or used */
-		if (CLNT_CALL(client, (rpcproc_t)PMAPPROC_GETPORT,
-		    (xdrproc_t)xdr_pmap,
-		    &parms, (xdrproc_t)xdr_u_short, &port, tottimeout) !=
-		    RPC_SUCCESS){
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-		} else if (port == 0) {
-			rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-		}
-		CLNT_DESTROY(client);
-	}
-	address->sin_port = 0;
-	return (port);
-}
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
deleted file mode 100644
index d9b66e8..0000000
--- a/lib/libc/rpc/pmap_prot.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$NetBSD: pmap_prot.c,v 1.10 2000/01/22 22:19:18 mycroft Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_prot.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot.c,v 1.9 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * pmap_prot.c
- * Protocol for the local binder service, or pmap.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/pmap_prot.h>
-#include "un-namespace.h"
-
-
-bool_t
-xdr_pmap(xdrs, regs)
-	XDR *xdrs;
-	struct pmap *regs;
-{
-
-	assert(xdrs != NULL);
-	assert(regs != NULL);
-
-	if (xdr_u_long(xdrs, &regs->pm_prog) &&
-		xdr_u_long(xdrs, &regs->pm_vers) &&
-		xdr_u_long(xdrs, &regs->pm_prot))
-		return (xdr_u_long(xdrs, &regs->pm_port));
-	return (FALSE);
-}
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
deleted file mode 100644
index e3c6c2f..0000000
--- a/lib/libc/rpc/pmap_prot2.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*	$NetBSD: pmap_prot2.c,v 1.14 2000/07/06 03:10:34 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_prot2.c,v 1.10 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * pmap_prot2.c
- * Protocol for the local binder service, or pmap.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/pmap_prot.h>
-#include "un-namespace.h"
-
-
-/*
- * What is going on with linked lists? (!)
- * First recall the link list declaration from pmap_prot.h:
- *
- * struct pmaplist {
- *	struct pmap pml_map;
- *	struct pmaplist *pml_map;
- * };
- *
- * Compare that declaration with a corresponding xdr declaration that
- * is (a) pointer-less, and (b) recursive:
- *
- * typedef union switch (bool_t) {
- *
- *	case TRUE: struct {
- *		struct pmap;
- * 		pmaplist_t foo;
- *	};
- *
- *	case FALSE: struct {};
- * } pmaplist_t;
- *
- * Notice that the xdr declaration has no nxt pointer while
- * the C declaration has no bool_t variable.  The bool_t can be
- * interpreted as ``more data follows me''; if FALSE then nothing
- * follows this bool_t; if TRUE then the bool_t is followed by
- * an actual struct pmap, and then (recursively) by the
- * xdr union, pamplist_t.
- *
- * This could be implemented via the xdr_union primitive, though this
- * would cause a one recursive call per element in the list.  Rather than do
- * that we can ``unwind'' the recursion
- * into a while loop and do the union arms in-place.
- *
- * The head of the list is what the C programmer wishes to past around
- * the net, yet is the data that the pointer points to which is interesting;
- * this sounds like a job for xdr_reference!
- */
-bool_t
-xdr_pmaplist(xdrs, rp)
-	XDR *xdrs;
-	struct pmaplist **rp;
-{
-	/*
-	 * more_elements is pre-computed in case the direction is
-	 * XDR_ENCODE or XDR_FREE.  more_elements is overwritten by
-	 * xdr_bool when the direction is XDR_DECODE.
-	 */
-	bool_t more_elements;
-	int freeing;
-	struct pmaplist **next	= NULL; /* pacify gcc */
-
-	assert(xdrs != NULL);
-	assert(rp != NULL);
-
-	freeing = (xdrs->x_op == XDR_FREE);
-
-	for (;;) {
-		more_elements = (bool_t)(*rp != NULL);
-		if (! xdr_bool(xdrs, &more_elements))
-			return (FALSE);
-		if (! more_elements)
-			return (TRUE);  /* we are done */
-		/*
-		 * the unfortunate side effect of non-recursion is that in
-		 * the case of freeing we must remember the next object
-		 * before we free the current object ...
-		 */
-		if (freeing)
-			next = &((*rp)->pml_next); 
-		if (! xdr_reference(xdrs, (caddr_t *)rp,
-		    (u_int)sizeof(struct pmaplist), (xdrproc_t)xdr_pmap))
-			return (FALSE);
-		rp = (freeing) ? next : &((*rp)->pml_next);
-	}
-}
-
-
-/*
- * xdr_pmaplist_ptr() is specified to take a PMAPLIST *, but is identical in
- * functionality to xdr_pmaplist().
- */
-bool_t
-xdr_pmaplist_ptr(xdrs, rp)
-	XDR *xdrs;
-	struct pmaplist *rp;
-{
-	return xdr_pmaplist(xdrs, (struct pmaplist **)(void *)rp);
-}
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
deleted file mode 100644
index a74f75b..0000000
--- a/lib/libc/rpc/pmap_rmt.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*	$NetBSD: pmap_rmt.c,v 1.29 2000/07/06 03:10:34 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/pmap_rmt.c,v 1.20 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * pmap_rmt.c
- * Client interface to pmap rpc service.
- * remote call and broadcast service
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_rmt.h>
-#include "un-namespace.h"
-
-static const struct timeval timeout = { 3, 0 };
-
-/*
- * pmapper remote-call-service interface.
- * This routine is used to call the pmapper remote call service
- * which will look up a service program in the port maps, and then
- * remotely call that routine with the given parameters.  This allows
- * programs to do a lookup and call in one step.
-*/
-enum clnt_stat
-pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout,
-    port_ptr)
-	struct sockaddr_in *addr;
-	u_long prog, vers, proc;
-	xdrproc_t xdrargs, xdrres;
-	caddr_t argsp, resp;
-	struct timeval tout;
-	u_long *port_ptr;
-{
-	int sock = -1;
-	CLIENT *client;
-	struct rmtcallargs a;
-	struct rmtcallres r;
-	enum clnt_stat stat;
-
-	assert(addr != NULL);
-	assert(port_ptr != NULL);
-
-	addr->sin_port = htons(PMAPPORT);
-	client = clntudp_create(addr, PMAPPROG, PMAPVERS, timeout, &sock);
-	if (client != NULL) {
-		a.prog = prog;
-		a.vers = vers;
-		a.proc = proc;
-		a.args_ptr = argsp;
-		a.xdr_args = xdrargs;
-		r.port_ptr = port_ptr;
-		r.results_ptr = resp;
-		r.xdr_results = xdrres;
-		stat = CLNT_CALL(client, (rpcproc_t)PMAPPROC_CALLIT,
-		    (xdrproc_t)xdr_rmtcall_args, &a, (xdrproc_t)xdr_rmtcallres,
-		    &r, tout);
-		CLNT_DESTROY(client);
-	} else {
-		stat = RPC_FAILED;
-	}
-	addr->sin_port = 0;
-	return (stat);
-}
-
-
-/*
- * XDR remote call arguments
- * written for XDR_ENCODE direction only
- */
-bool_t
-xdr_rmtcall_args(xdrs, cap)
-	XDR *xdrs;
-	struct rmtcallargs *cap;
-{
-	u_int lenposition, argposition, position;
-
-	assert(xdrs != NULL);
-	assert(cap != NULL);
-
-	if (xdr_u_long(xdrs, &(cap->prog)) &&
-	    xdr_u_long(xdrs, &(cap->vers)) &&
-	    xdr_u_long(xdrs, &(cap->proc))) {
-		lenposition = XDR_GETPOS(xdrs);
-		if (! xdr_u_long(xdrs, &(cap->arglen)))
-		    return (FALSE);
-		argposition = XDR_GETPOS(xdrs);
-		if (! (*(cap->xdr_args))(xdrs, cap->args_ptr))
-		    return (FALSE);
-		position = XDR_GETPOS(xdrs);
-		cap->arglen = (u_long)position - (u_long)argposition;
-		XDR_SETPOS(xdrs, lenposition);
-		if (! xdr_u_long(xdrs, &(cap->arglen)))
-		    return (FALSE);
-		XDR_SETPOS(xdrs, position);
-		return (TRUE);
-	}
-	return (FALSE);
-}
-
-/*
- * XDR remote call results
- * written for XDR_DECODE direction only
- */
-bool_t
-xdr_rmtcallres(xdrs, crp)
-	XDR *xdrs;
-	struct rmtcallres *crp;
-{
-	caddr_t port_ptr;
-
-	assert(xdrs != NULL);
-	assert(crp != NULL);
-
-	port_ptr = (caddr_t)(void *)crp->port_ptr;
-	if (xdr_reference(xdrs, &port_ptr, sizeof (u_long),
-	    (xdrproc_t)xdr_u_long) && xdr_u_long(xdrs, &crp->resultslen)) {
-		crp->port_ptr = (u_long *)(void *)port_ptr;
-		return ((*(crp->xdr_results))(xdrs, crp->results_ptr));
-	}
-	return (FALSE);
-}
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
deleted file mode 100644
index dc706be..0000000
--- a/lib/libc/rpc/rpc_callmsg.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*	$NetBSD: rpc_callmsg.c,v 1.16 2000/07/14 08:40:42 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_callmsg.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * rpc_callmsg.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- */
-
-#include "namespace.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-/*
- * XDR a call message
- */
-bool_t
-xdr_callmsg(xdrs, cmsg)
-	XDR *xdrs;
-	struct rpc_msg *cmsg;
-{
-	int32_t *buf;
-	struct opaque_auth *oa;
-
-	assert(xdrs != NULL);
-	assert(cmsg != NULL);
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		if (cmsg->rm_call.cb_cred.oa_length > MAX_AUTH_BYTES) {
-			return (FALSE);
-		}
-		if (cmsg->rm_call.cb_verf.oa_length > MAX_AUTH_BYTES) {
-			return (FALSE);
-		}
-		buf = XDR_INLINE(xdrs, 8 * BYTES_PER_XDR_UNIT
-			+ RNDUP(cmsg->rm_call.cb_cred.oa_length)
-			+ 2 * BYTES_PER_XDR_UNIT
-			+ RNDUP(cmsg->rm_call.cb_verf.oa_length));
-		if (buf != NULL) {
-			IXDR_PUT_INT32(buf, cmsg->rm_xid);
-			IXDR_PUT_ENUM(buf, cmsg->rm_direction);
-			if (cmsg->rm_direction != CALL) {
-				return (FALSE);
-			}
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_rpcvers);
-			if (cmsg->rm_call.cb_rpcvers != RPC_MSG_VERSION) {
-				return (FALSE);
-			}
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_prog);
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_vers);
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_proc);
-			oa = &cmsg->rm_call.cb_cred;
-			IXDR_PUT_ENUM(buf, oa->oa_flavor);
-			IXDR_PUT_INT32(buf, oa->oa_length);
-			if (oa->oa_length) {
-				memmove(buf, oa->oa_base, oa->oa_length);
-				buf += RNDUP(oa->oa_length) / sizeof (int32_t);
-			}
-			oa = &cmsg->rm_call.cb_verf;
-			IXDR_PUT_ENUM(buf, oa->oa_flavor);
-			IXDR_PUT_INT32(buf, oa->oa_length);
-			if (oa->oa_length) {
-				memmove(buf, oa->oa_base, oa->oa_length);
-				/* no real need....
-				buf += RNDUP(oa->oa_length) / sizeof (int32_t);
-				*/
-			}
-			return (TRUE);
-		}
-	}
-	if (xdrs->x_op == XDR_DECODE) {
-		buf = XDR_INLINE(xdrs, 8 * BYTES_PER_XDR_UNIT);
-		if (buf != NULL) {
-			cmsg->rm_xid = IXDR_GET_U_INT32(buf);
-			cmsg->rm_direction = IXDR_GET_ENUM(buf, enum msg_type);
-			if (cmsg->rm_direction != CALL) {
-				return (FALSE);
-			}
-			cmsg->rm_call.cb_rpcvers = IXDR_GET_U_INT32(buf);
-			if (cmsg->rm_call.cb_rpcvers != RPC_MSG_VERSION) {
-				return (FALSE);
-			}
-			cmsg->rm_call.cb_prog = IXDR_GET_U_INT32(buf);
-			cmsg->rm_call.cb_vers = IXDR_GET_U_INT32(buf);
-			cmsg->rm_call.cb_proc = IXDR_GET_U_INT32(buf);
-			oa = &cmsg->rm_call.cb_cred;
-			oa->oa_flavor = IXDR_GET_ENUM(buf, enum_t);
-			oa->oa_length = (u_int)IXDR_GET_U_INT32(buf);
-			if (oa->oa_length) {
-				if (oa->oa_length > MAX_AUTH_BYTES) {
-					return (FALSE);
-				}
-				if (oa->oa_base == NULL) {
-					oa->oa_base = (caddr_t)
-					    mem_alloc(oa->oa_length);
-					if (oa->oa_base == NULL)
-						return (FALSE);
-				}
-				buf = XDR_INLINE(xdrs, RNDUP(oa->oa_length));
-				if (buf == NULL) {
-					if (xdr_opaque(xdrs, oa->oa_base,
-					    oa->oa_length) == FALSE) {
-						return (FALSE);
-					}
-				} else {
-					memmove(oa->oa_base, buf,
-					    oa->oa_length);
-					/* no real need....
-					buf += RNDUP(oa->oa_length) /
-						sizeof (int32_t);
-					*/
-				}
-			}
-			oa = &cmsg->rm_call.cb_verf;
-			buf = XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT);
-			if (buf == NULL) {
-				if (xdr_enum(xdrs, &oa->oa_flavor) == FALSE ||
-				    xdr_u_int(xdrs, &oa->oa_length) == FALSE) {
-					return (FALSE);
-				}
-			} else {
-				oa->oa_flavor = IXDR_GET_ENUM(buf, enum_t);
-				oa->oa_length = (u_int)IXDR_GET_U_INT32(buf);
-			}
-			if (oa->oa_length) {
-				if (oa->oa_length > MAX_AUTH_BYTES) {
-					return (FALSE);
-				}
-				if (oa->oa_base == NULL) {
-					oa->oa_base = (caddr_t)
-					    mem_alloc(oa->oa_length);
-					if (oa->oa_base == NULL)
-						return (FALSE);
-				}
-				buf = XDR_INLINE(xdrs, RNDUP(oa->oa_length));
-				if (buf == NULL) {
-					if (xdr_opaque(xdrs, oa->oa_base,
-					    oa->oa_length) == FALSE) {
-						return (FALSE);
-					}
-				} else {
-					memmove(oa->oa_base, buf,
-					    oa->oa_length);
-					/* no real need...
-					buf += RNDUP(oa->oa_length) /
-						sizeof (int32_t);
-					*/
-				}
-			}
-			return (TRUE);
-		}
-	}
-	if (
-	    xdr_uint32_t(xdrs, &(cmsg->rm_xid)) &&
-	    xdr_enum(xdrs, (enum_t *)&(cmsg->rm_direction)) &&
-	    (cmsg->rm_direction == CALL) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) &&
-	    (cmsg->rm_call.cb_rpcvers == RPC_MSG_VERSION) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_prog)) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_vers)) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_proc)) &&
-	    xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_cred)) )
-		return (xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_verf)));
-	return (FALSE);
-}
diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h
deleted file mode 100644
index 232b9ad..0000000
--- a/lib/libc/rpc/rpc_com.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- *
- * $FreeBSD: src/lib/libc/rpc/rpc_com.h,v 1.7 2003/02/27 13:40:01 nectar Exp $
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * rpc_com.h, Common definitions for both the server and client side.
- * All for the topmost layer of rpc
- *
- * In Sun's tirpc distribution, this was installed as <rpc/rpc_com.h>,
- * but as it contains only non-exported interfaces, it was moved here.
- */
-
-#ifndef _RPC_RPCCOM_H
-#define	_RPC_RPCCOM_H
-
-#include <sys/cdefs.h>
-
-/* #pragma ident	"@(#)rpc_com.h	1.11	93/07/05 SMI" */
-
-/*
- * The max size of the transport, if the size cannot be determined
- * by other means.
- */
-#define	RPC_MAXDATASIZE 9000
-#define	RPC_MAXADDRSIZE 1024
-
-#define __RPC_GETXID(now) ((uint32_t)getpid() ^ (uint32_t)(now)->tv_sec ^ \
-    (uint32_t)(now)->tv_usec)
-
-__BEGIN_DECLS
-extern u_int __rpc_get_a_size(int);
-extern int __rpc_dtbsize(void);
-extern struct netconfig * __rpcgettp(int);
-extern  int  __rpc_get_default_domain(char **);
-
-char *__rpc_taddr2uaddr_af(int, const struct netbuf *);
-struct netbuf *__rpc_uaddr2taddr_af(int, const char *);
-int __rpc_fixup_addr(struct netbuf *, const struct netbuf *);
-int __rpc_sockinfo2netid(struct __rpc_sockinfo *, const char **);
-int __rpc_seman2socktype(int);
-int __rpc_socktype2seman(int);
-void *rpc_nullproc(CLIENT *);
-int __rpc_sockisbound(int);
-
-struct netbuf *__rpcb_findaddr(rpcprog_t, rpcvers_t, const struct netconfig *,
-    const char *, CLIENT **);
-struct netbuf *__rpcb_findaddr_timed(rpcprog_t, rpcvers_t,
-    const struct netconfig *, const char *host, CLIENT **clpp,
-    struct timeval *tp);
-
-bool_t __rpc_control(int,void *);
-
-char *_get_next_token(char *, int);
-
-bool_t __svc_clean_idle(fd_set *, int, bool_t);
-bool_t __xdrrec_setnonblock(XDR *, int);
-bool_t __xdrrec_getrec(XDR *, enum xprt_stat *, bool_t);
-void __xprt_unregister_unlocked(SVCXPRT *);
-
-SVCXPRT **__svc_xports;
-int __svc_maxrec;
-
-__END_DECLS
-
-#endif /* _RPC_RPCCOM_H */
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
deleted file mode 100644
index 8f7e897..0000000
--- a/lib/libc/rpc/rpc_commondata.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: rpc_commondata.c,v 1.7 2000/06/02 23:11:13 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_commondata.c,v 1.9 2002/03/22 23:18:37 obrien Exp $");
-
-#include "namespace.h"
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-/*
- * This file should only contain common data (global data) that is exported
- * by public interfaces 
- */
-struct opaque_auth _null_auth;
-fd_set svc_fdset;
-int svc_maxfd = -1;
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
deleted file mode 100644
index 2358099..0000000
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*	$NetBSD: rpc_dtablesize.c,v 1.14 1998/11/15 17:32:43 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
-static char *sccsid = "@(#)rpc_dtablesize.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_dtablesize.c,v 1.15 2004/10/16 06:11:35 obrien Exp $");
-
-#include "namespace.h"
-#include <unistd.h>
-#include "un-namespace.h"
-
-int _rpc_dtablesize(void);	/* XXX */
-
-/*
- * Cache the result of getdtablesize(), so we don't have to do an
- * expensive system call every time.
- */
-/*
- * XXX In FreeBSD 2.x, you can have the maximum number of open file
- * descriptors be greater than FD_SETSIZE (which us 256 by default).
- *
- * Since old programs tend to use this call to determine the first arg
- * for _select(), having this return > FD_SETSIZE is a Bad Idea(TM)!
- */
-int
-_rpc_dtablesize(void)
-{
-	static int size;
-
-	if (size == 0) {
-		size = getdtablesize();
-		if (size > FD_SETSIZE)
-			size = FD_SETSIZE;
-	}
-	return (size);
-}
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
deleted file mode 100644
index dd987ac..0000000
--- a/lib/libc/rpc/rpc_generic.c
+++ /dev/null
@@ -1,842 +0,0 @@
-/*	$NetBSD: rpc_generic.c,v 1.4 2000/09/28 09:07:04 kleink Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #pragma ident	"@(#)rpc_generic.c	1.17	94/04/24 SMI" */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_generic.c,v 1.12 2003/10/29 09:20:33 mbr Exp $");
-
-/*
- * rpc_generic.c, Miscl routines for RPC.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/un.h>
-#include <sys/resource.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <rpc/rpc.h>
-#include <ctype.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <netdb.h>
-#include <netconfig.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <rpc/nettype.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-
-struct handle {
-	NCONF_HANDLE *nhandle;
-	int nflag;		/* Whether NETPATH or NETCONFIG */
-	int nettype;
-};
-
-static const struct _rpcnettype {
-	const char *name;
-	const int type;
-} _rpctypelist[] = {
-	{ "netpath", _RPC_NETPATH },
-	{ "visible", _RPC_VISIBLE },
-	{ "circuit_v", _RPC_CIRCUIT_V },
-	{ "datagram_v", _RPC_DATAGRAM_V },
-	{ "circuit_n", _RPC_CIRCUIT_N },
-	{ "datagram_n", _RPC_DATAGRAM_N },
-	{ "tcp", _RPC_TCP },
-	{ "udp", _RPC_UDP },
-	{ 0, _RPC_NONE }
-};
-
-struct netid_af {
-	const char	*netid;
-	int		af;
-	int		protocol;
-};
-
-static const struct netid_af na_cvt[] = {
-	{ "udp",  AF_INET,  IPPROTO_UDP },
-	{ "tcp",  AF_INET,  IPPROTO_TCP },
-#ifdef INET6
-	{ "udp6", AF_INET6, IPPROTO_UDP },
-	{ "tcp6", AF_INET6, IPPROTO_TCP },
-#endif
-	{ "local", AF_LOCAL, 0 }
-};
-
-#if 0
-static char *strlocase(char *);
-#endif
-static int getnettype(const char *);
-
-/*
- * Cache the result of getrlimit(), so we don't have to do an
- * expensive call every time.
- */
-int
-__rpc_dtbsize()
-{
-	static int tbsize;
-	struct rlimit rl;
-
-	if (tbsize) {
-		return (tbsize);
-	}
-	if (getrlimit(RLIMIT_NOFILE, &rl) == 0) {
-		return (tbsize = (int)rl.rlim_max);
-	}
-	/*
-	 * Something wrong.  I'll try to save face by returning a
-	 * pessimistic number.
-	 */
-	return (32);
-}
-
-
-/*
- * Find the appropriate buffer size
- */
-u_int
-/*ARGSUSED*/
-__rpc_get_t_size(af, proto, size)
-	int af, proto;
-	int size;	/* Size requested */
-{
-	int maxsize, defsize;
-
-	maxsize = 256 * 1024;	/* XXX */
-	switch (proto) {
-	case IPPROTO_TCP:
-		defsize = 64 * 1024;	/* XXX */
-		break;
-	case IPPROTO_UDP:
-		defsize = UDPMSGSIZE;
-		break;
-	default:
-		defsize = RPC_MAXDATASIZE;
-		break;
-	}
-	if (size == 0)
-		return defsize;
-
-	/* Check whether the value is within the upper max limit */
-	return (size > maxsize ? (u_int)maxsize : (u_int)size);
-}
-
-/*
- * Find the appropriate address buffer size
- */
-u_int
-__rpc_get_a_size(af)
-	int af;
-{
-	switch (af) {
-	case AF_INET:
-		return sizeof (struct sockaddr_in);
-#ifdef INET6
-	case AF_INET6:
-		return sizeof (struct sockaddr_in6);
-#endif
-	case AF_LOCAL:
-		return sizeof (struct sockaddr_un);
-	default:
-		break;
-	}
-	return ((u_int)RPC_MAXADDRSIZE);
-}
-
-#if 0
-static char *
-strlocase(p)
-	char *p;
-{
-	char *t = p;
-
-	for (; *p; p++)
-		if (isupper(*p))
-			*p = tolower(*p);
-	return (t);
-}
-#endif
-
-/*
- * Returns the type of the network as defined in <rpc/nettype.h>
- * If nettype is NULL, it defaults to NETPATH.
- */
-static int
-getnettype(nettype)
-	const char *nettype;
-{
-	int i;
-
-	if ((nettype == NULL) || (nettype[0] == 0)) {
-		return (_RPC_NETPATH);	/* Default */
-	}
-
-#if 0
-	nettype = strlocase(nettype);
-#endif
-	for (i = 0; _rpctypelist[i].name; i++)
-		if (strcasecmp(nettype, _rpctypelist[i].name) == 0) {
-			return (_rpctypelist[i].type);
-		}
-	return (_rpctypelist[i].type);
-}
-
-/*
- * For the given nettype (tcp or udp only), return the first structure found.
- * This should be freed by calling freenetconfigent()
- */
-struct netconfig *
-__rpc_getconfip(nettype)
-	const char *nettype;
-{
-	char *netid;
-	char *netid_tcp = (char *) NULL;
-	char *netid_udp = (char *) NULL;
-	static char *netid_tcp_main;
-	static char *netid_udp_main;
-	struct netconfig *dummy;
-	int main_thread;
-	static thread_key_t tcp_key, udp_key;
-	extern mutex_t tsd_lock;
-
-	if ((main_thread = thr_main())) {
-		netid_udp = netid_udp_main;
-		netid_tcp = netid_tcp_main;
-	} else {
-		if (tcp_key == 0) {
-			mutex_lock(&tsd_lock);
-			if (tcp_key == 0)
-				thr_keycreate(&tcp_key, free);
-			mutex_unlock(&tsd_lock);
-		}
-		netid_tcp = (char *)thr_getspecific(tcp_key);
-		if (udp_key == 0) {
-			mutex_lock(&tsd_lock);
-			if (udp_key == 0)
-				thr_keycreate(&udp_key, free);
-			mutex_unlock(&tsd_lock);
-		}
-		netid_udp = (char *)thr_getspecific(udp_key);
-	}
-	if (!netid_udp && !netid_tcp) {
-		struct netconfig *nconf;
-		void *confighandle;
-
-		if (!(confighandle = setnetconfig())) {
-			syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-			return (NULL);
-		}
-		while ((nconf = getnetconfig(confighandle)) != NULL) {
-			if (strcmp(nconf->nc_protofmly, NC_INET) == 0) {
-				if (strcmp(nconf->nc_proto, NC_TCP) == 0) {
-					netid_tcp = strdup(nconf->nc_netid);
-					if (main_thread)
-						netid_tcp_main = netid_tcp;
-					else
-						thr_setspecific(tcp_key,
-							(void *) netid_tcp);
-				} else
-				if (strcmp(nconf->nc_proto, NC_UDP) == 0) {
-					netid_udp = strdup(nconf->nc_netid);
-					if (main_thread)
-						netid_udp_main = netid_udp;
-					else
-						thr_setspecific(udp_key,
-						(void *) netid_udp);
-				}
-			}
-		}
-		endnetconfig(confighandle);
-	}
-	if (strcmp(nettype, "udp") == 0)
-		netid = netid_udp;
-	else if (strcmp(nettype, "tcp") == 0)
-		netid = netid_tcp;
-	else {
-		return (NULL);
-	}
-	if ((netid == NULL) || (netid[0] == 0)) {
-		return (NULL);
-	}
-	dummy = getnetconfigent(netid);
-	return (dummy);
-}
-
-/*
- * Returns the type of the nettype, which should then be used with
- * __rpc_getconf().
- */
-void *
-__rpc_setconf(nettype)
-	const char *nettype;
-{
-	struct handle *handle;
-
-	handle = (struct handle *) malloc(sizeof (struct handle));
-	if (handle == NULL) {
-		return (NULL);
-	}
-	switch (handle->nettype = getnettype(nettype)) {
-	case _RPC_NETPATH:
-	case _RPC_CIRCUIT_N:
-	case _RPC_DATAGRAM_N:
-		if (!(handle->nhandle = setnetpath())) {
-			free(handle);
-			return (NULL);
-		}
-		handle->nflag = TRUE;
-		break;
-	case _RPC_VISIBLE:
-	case _RPC_CIRCUIT_V:
-	case _RPC_DATAGRAM_V:
-	case _RPC_TCP:
-	case _RPC_UDP:
-		if (!(handle->nhandle = setnetconfig())) {
-		        syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-			free(handle);
-			return (NULL);
-		}
-		handle->nflag = FALSE;
-		break;
-	default:
-		return (NULL);
-	}
-
-	return (handle);
-}
-
-/*
- * Returns the next netconfig struct for the given "net" type.
- * __rpc_setconf() should have been called previously.
- */
-struct netconfig *
-__rpc_getconf(vhandle)
-	void *vhandle;
-{
-	struct handle *handle;
-	struct netconfig *nconf;
-
-	handle = (struct handle *)vhandle;
-	if (handle == NULL) {
-		return (NULL);
-	}
-	for (;;) {
-		if (handle->nflag)
-			nconf = getnetpath(handle->nhandle);
-		else
-			nconf = getnetconfig(handle->nhandle);
-		if (nconf == NULL)
-			break;
-		if ((nconf->nc_semantics != NC_TPI_CLTS) &&
-			(nconf->nc_semantics != NC_TPI_COTS) &&
-			(nconf->nc_semantics != NC_TPI_COTS_ORD))
-			continue;
-		switch (handle->nettype) {
-		case _RPC_VISIBLE:
-			if (!(nconf->nc_flag & NC_VISIBLE))
-				continue;
-			/* FALLTHROUGH */
-		case _RPC_NETPATH:	/* Be happy */
-			break;
-		case _RPC_CIRCUIT_V:
-			if (!(nconf->nc_flag & NC_VISIBLE))
-				continue;
-			/* FALLTHROUGH */
-		case _RPC_CIRCUIT_N:
-			if ((nconf->nc_semantics != NC_TPI_COTS) &&
-				(nconf->nc_semantics != NC_TPI_COTS_ORD))
-				continue;
-			break;
-		case _RPC_DATAGRAM_V:
-			if (!(nconf->nc_flag & NC_VISIBLE))
-				continue;
-			/* FALLTHROUGH */
-		case _RPC_DATAGRAM_N:
-			if (nconf->nc_semantics != NC_TPI_CLTS)
-				continue;
-			break;
-		case _RPC_TCP:
-			if (((nconf->nc_semantics != NC_TPI_COTS) &&
-				(nconf->nc_semantics != NC_TPI_COTS_ORD)) ||
-				(strcmp(nconf->nc_protofmly, NC_INET)
-#ifdef INET6
-				 && strcmp(nconf->nc_protofmly, NC_INET6))
-#else
-				)
-#endif
-				||
-				strcmp(nconf->nc_proto, NC_TCP))
-				continue;
-			break;
-		case _RPC_UDP:
-			if ((nconf->nc_semantics != NC_TPI_CLTS) ||
-				(strcmp(nconf->nc_protofmly, NC_INET)
-#ifdef INET6
-				&& strcmp(nconf->nc_protofmly, NC_INET6))
-#else
-				)
-#endif
-				||
-				strcmp(nconf->nc_proto, NC_UDP))
-				continue;
-			break;
-		}
-		break;
-	}
-	return (nconf);
-}
-
-void
-__rpc_endconf(vhandle)
-	void * vhandle;
-{
-	struct handle *handle;
-
-	handle = (struct handle *) vhandle;
-	if (handle == NULL) {
-		return;
-	}
-	if (handle->nflag) {
-		endnetpath(handle->nhandle);
-	} else {
-		endnetconfig(handle->nhandle);
-	}
-	free(handle);
-}
-
-/*
- * Used to ping the NULL procedure for clnt handle.
- * Returns NULL if fails, else a non-NULL pointer.
- */
-void *
-rpc_nullproc(clnt)
-	CLIENT *clnt;
-{
-	struct timeval TIMEOUT = {25, 0};
-
-	if (clnt_call(clnt, NULLPROC, (xdrproc_t) xdr_void, NULL,
-		(xdrproc_t) xdr_void, NULL, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return ((void *) clnt);
-}
-
-/*
- * Try all possible transports until
- * one succeeds in finding the netconf for the given fd.
- */
-struct netconfig *
-__rpcgettp(fd)
-	int fd;
-{
-	const char *netid;
-	struct __rpc_sockinfo si;
-
-	if (!__rpc_fd2sockinfo(fd, &si))
-		return NULL;
-
-	if (!__rpc_sockinfo2netid(&si, &netid))
-		return NULL;
-
-	/*LINTED const castaway*/
-	return getnetconfigent((char *)netid);
-}
-
-int
-__rpc_fd2sockinfo(int fd, struct __rpc_sockinfo *sip)
-{
-	socklen_t len;
-	int type, proto;
-	struct sockaddr_storage ss;
-
-	len = sizeof ss;
-	if (_getsockname(fd, (struct sockaddr *)(void *)&ss, &len) < 0)
-		return 0;
-	sip->si_alen = len;
-
-	len = sizeof type;
-	if (_getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &len) < 0)
-		return 0;
-
-	/* XXX */
-	if (ss.ss_family != AF_LOCAL) {
-		if (type == SOCK_STREAM)
-			proto = IPPROTO_TCP;
-		else if (type == SOCK_DGRAM)
-			proto = IPPROTO_UDP;
-		else
-			return 0;
-	} else
-		proto = 0;
-
-	sip->si_af = ss.ss_family;
-	sip->si_proto = proto;
-	sip->si_socktype = type;
-
-	return 1;
-}
-
-/*
- * Linear search, but the number of entries is small.
- */
-int
-__rpc_nconf2sockinfo(const struct netconfig *nconf, struct __rpc_sockinfo *sip)
-{
-	int i;
-
-	for (i = 0; i < (sizeof na_cvt) / (sizeof (struct netid_af)); i++)
-		if (strcmp(na_cvt[i].netid, nconf->nc_netid) == 0 || (
-		    strcmp(nconf->nc_netid, "unix") == 0 &&
-		    strcmp(na_cvt[i].netid, "local") == 0)) {
-			sip->si_af = na_cvt[i].af;
-			sip->si_proto = na_cvt[i].protocol;
-			sip->si_socktype =
-			    __rpc_seman2socktype((int)nconf->nc_semantics);
-			if (sip->si_socktype == -1)
-				return 0;
-			sip->si_alen = __rpc_get_a_size(sip->si_af);
-			return 1;
-		}
-
-	return 0;
-}
-
-int
-__rpc_nconf2fd(const struct netconfig *nconf)
-{
-	struct __rpc_sockinfo si;
-
-	if (!__rpc_nconf2sockinfo(nconf, &si))
-		return 0;
-
-	return _socket(si.si_af, si.si_socktype, si.si_proto);
-}
-
-int
-__rpc_sockinfo2netid(struct __rpc_sockinfo *sip, const char **netid)
-{
-	int i;
-	struct netconfig *nconf;
-
-	nconf = getnetconfigent("local");
-
-	for (i = 0; i < (sizeof na_cvt) / (sizeof (struct netid_af)); i++) {
-		if (na_cvt[i].af == sip->si_af &&
-		    na_cvt[i].protocol == sip->si_proto) {
-			if (strcmp(na_cvt[i].netid, "local") == 0 && nconf == NULL) {
-				if (netid)
-					*netid = "unix";
-			} else {
-				if (netid)
-					*netid = na_cvt[i].netid;
-			}
-			if (nconf != NULL)
-				freenetconfigent(nconf);
-			return 1;
-		}
-	}
-	if (nconf != NULL)
-		freenetconfigent(nconf);
-
-	return 0;
-}
-
-char *
-taddr2uaddr(const struct netconfig *nconf, const struct netbuf *nbuf)
-{
-	struct __rpc_sockinfo si;
-
-	if (!__rpc_nconf2sockinfo(nconf, &si))
-		return NULL;
-	return __rpc_taddr2uaddr_af(si.si_af, nbuf);
-}
-
-struct netbuf *
-uaddr2taddr(const struct netconfig *nconf, const char *uaddr)
-{
-	struct __rpc_sockinfo si;
-	
-	if (!__rpc_nconf2sockinfo(nconf, &si))
-		return NULL;
-	return __rpc_uaddr2taddr_af(si.si_af, uaddr);
-}
-
-char *
-__rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf)
-{
-	char *ret;
-	struct sockaddr_in *sin;
-	struct sockaddr_un *sun;
-	char namebuf[INET_ADDRSTRLEN];
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-	char namebuf6[INET6_ADDRSTRLEN];
-#endif
-	u_int16_t port;
-
-	switch (af) {
-	case AF_INET:
-		sin = nbuf->buf;
-		if (inet_ntop(af, &sin->sin_addr, namebuf, sizeof namebuf)
-		    == NULL)
-			return NULL;
-		port = ntohs(sin->sin_port);
-		if (asprintf(&ret, "%s.%u.%u", namebuf, ((uint32_t)port) >> 8,
-		    port & 0xff) < 0)
-			return NULL;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		sin6 = nbuf->buf;
-		if (inet_ntop(af, &sin6->sin6_addr, namebuf6, sizeof namebuf6)
-		    == NULL)
-			return NULL;
-		port = ntohs(sin6->sin6_port);
-		if (asprintf(&ret, "%s.%u.%u", namebuf6, ((uint32_t)port) >> 8,
-		    port & 0xff) < 0)
-			return NULL;
-		break;
-#endif
-	case AF_LOCAL:
-		sun = nbuf->buf;
-		if (asprintf(&ret, "%.*s", (int)(sun->sun_len -
-		    offsetof(struct sockaddr_un, sun_path)),
-		    sun->sun_path) < 0)
-			return (NULL);
-		break;
-	default:
-		return NULL;
-	}
-
-	return ret;
-}
-
-struct netbuf *
-__rpc_uaddr2taddr_af(int af, const char *uaddr)
-{
-	struct netbuf *ret = NULL;
-	char *addrstr, *p;
-	unsigned port, portlo, porthi;
-	struct sockaddr_in *sin;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	struct sockaddr_un *sun;
-
-	port = 0;
-	sin = NULL;
-	addrstr = strdup(uaddr);
-	if (addrstr == NULL)
-		return NULL;
-
-	/*
-	 * AF_LOCAL addresses are expected to be absolute
-	 * pathnames, anything else will be AF_INET or AF_INET6.
-	 */
-	if (*addrstr != '/') {
-		p = strrchr(addrstr, '.');
-		if (p == NULL)
-			goto out;
-		portlo = (unsigned)atoi(p + 1);
-		*p = '\0';
-
-		p = strrchr(addrstr, '.');
-		if (p == NULL)
-			goto out;
-		porthi = (unsigned)atoi(p + 1);
-		*p = '\0';
-		port = (porthi << 8) | portlo;
-	}
-
-	ret = (struct netbuf *)malloc(sizeof *ret);
-	if (ret == NULL)
-		goto out;
-	
-	switch (af) {
-	case AF_INET:
-		sin = (struct sockaddr_in *)malloc(sizeof *sin);
-		if (sin == NULL)
-			goto out;
-		memset(sin, 0, sizeof *sin);
-		sin->sin_family = AF_INET;
-		sin->sin_port = htons(port);
-		if (inet_pton(AF_INET, addrstr, &sin->sin_addr) <= 0) {
-			free(sin);
-			free(ret);
-			ret = NULL;
-			goto out;
-		}
-		sin->sin_len = ret->maxlen = ret->len = sizeof *sin;
-		ret->buf = sin;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		sin6 = (struct sockaddr_in6 *)malloc(sizeof *sin6);
-		if (sin6 == NULL)
-			goto out;
-		memset(sin6, 0, sizeof *sin6);
-		sin6->sin6_family = AF_INET6;
-		sin6->sin6_port = htons(port);
-		if (inet_pton(AF_INET6, addrstr, &sin6->sin6_addr) <= 0) {
-			free(sin6);
-			free(ret);
-			ret = NULL;
-			goto out;
-		}
-		sin6->sin6_len = ret->maxlen = ret->len = sizeof *sin6;
-		ret->buf = sin6;
-		break;
-#endif
-	case AF_LOCAL:
-		sun = (struct sockaddr_un *)malloc(sizeof *sun);
-		if (sun == NULL)
-			goto out;
-		memset(sun, 0, sizeof *sun);
-		sun->sun_family = AF_LOCAL;
-		strncpy(sun->sun_path, addrstr, sizeof(sun->sun_path) - 1);
-		ret->len = ret->maxlen = sun->sun_len = SUN_LEN(sun);
-		ret->buf = sun;
-		break;
-	default:
-		break;
-	}
-out:
-	free(addrstr);
-	return ret;
-}
-
-int
-__rpc_seman2socktype(int semantics)
-{
-	switch (semantics) {
-	case NC_TPI_CLTS:
-		return SOCK_DGRAM;
-	case NC_TPI_COTS_ORD:
-		return SOCK_STREAM;
-	case NC_TPI_RAW:
-		return SOCK_RAW;
-	default:
-		break;
-	}
-
-	return -1;
-}
-
-int
-__rpc_socktype2seman(int socktype)
-{
-	switch (socktype) {
-	case SOCK_DGRAM:
-		return NC_TPI_CLTS;
-	case SOCK_STREAM:
-		return NC_TPI_COTS_ORD;
-	case SOCK_RAW:
-		return NC_TPI_RAW;
-	default:
-		break;
-	}
-
-	return -1;
-}
-
-/*
- * XXXX - IPv6 scope IDs can't be handled in universal addresses.
- * Here, we compare the original server address to that of the RPC
- * service we just received back from a call to rpcbind on the remote
- * machine. If they are both "link local" or "site local", copy
- * the scope id of the server address over to the service address.
- */
-int
-__rpc_fixup_addr(struct netbuf *new, const struct netbuf *svc)
-{
-#ifdef INET6
-	struct sockaddr *sa_new, *sa_svc;
-	struct sockaddr_in6 *sin6_new, *sin6_svc;
-
-	sa_svc = (struct sockaddr *)svc->buf;
-	sa_new = (struct sockaddr *)new->buf;
-
-	if (sa_new->sa_family == sa_svc->sa_family &&
-	    sa_new->sa_family == AF_INET6) {
-		sin6_new = (struct sockaddr_in6 *)new->buf;
-		sin6_svc = (struct sockaddr_in6 *)svc->buf;
-
-		if ((IN6_IS_ADDR_LINKLOCAL(&sin6_new->sin6_addr) &&
-		     IN6_IS_ADDR_LINKLOCAL(&sin6_svc->sin6_addr)) ||
-		    (IN6_IS_ADDR_SITELOCAL(&sin6_new->sin6_addr) &&
-		     IN6_IS_ADDR_SITELOCAL(&sin6_svc->sin6_addr))) {
-			sin6_new->sin6_scope_id = sin6_svc->sin6_scope_id;
-		}
-	}
-#endif
-	return 1;
-}
-
-int
-__rpc_sockisbound(int fd)
-{
-	struct sockaddr_storage ss;
-	socklen_t slen;
-
-	slen = sizeof (struct sockaddr_storage);
-	if (_getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) < 0)
-		return 0;
-
-	switch (ss.ss_family) {
-		case AF_INET:
-			return (((struct sockaddr_in *)
-			    (void *)&ss)->sin_port != 0);
-#ifdef INET6
-		case AF_INET6:
-			return (((struct sockaddr_in6 *)
-			    (void *)&ss)->sin6_port != 0);
-#endif
-		case AF_LOCAL:
-			/* XXX check this */
-			return (((struct sockaddr_un *)
-			    (void *)&ss)->sun_path[0] != '\0');
-		default:
-			break;
-	}
-
-	return 0;
-}
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
deleted file mode 100644
index 7054e26..0000000
--- a/lib/libc/rpc/rpc_prot.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*	$NetBSD: rpc_prot.c,v 1.16 2000/06/02 23:11:13 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_prot.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * rpc_prot.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * This set of routines implements the rpc message definition,
- * its serializer and some common rpc utility routines.
- * The routines are meant for various implementations of rpc -
- * they are NOT for the rpc client or rpc service implementations!
- * Because authentication stuff is easy and is part of rpc, the opaque
- * routines are also in this program.
- */
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <assert.h>
-
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-static void accepted(enum accept_stat, struct rpc_err *);
-static void rejected(enum reject_stat, struct rpc_err *);
-
-/* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
-
-extern struct opaque_auth _null_auth;
-
-/*
- * XDR an opaque authentication struct
- * (see auth.h)
- */
-bool_t
-xdr_opaque_auth(xdrs, ap)
-	XDR *xdrs;
-	struct opaque_auth *ap;
-{
-
-	assert(xdrs != NULL);
-	assert(ap != NULL);
-
-	if (xdr_enum(xdrs, &(ap->oa_flavor)))
-		return (xdr_bytes(xdrs, &ap->oa_base,
-			&ap->oa_length, MAX_AUTH_BYTES));
-	return (FALSE);
-}
-
-/*
- * XDR a DES block
- */
-bool_t
-xdr_des_block(xdrs, blkp)
-	XDR *xdrs;
-	des_block *blkp;
-{
-
-	assert(xdrs != NULL);
-	assert(blkp != NULL);
-
-	return (xdr_opaque(xdrs, (caddr_t)(void *)blkp, sizeof(des_block)));
-}
-
-/* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */
-
-/*
- * XDR the MSG_ACCEPTED part of a reply message union
- */
-bool_t
-xdr_accepted_reply(xdrs, ar)
-	XDR *xdrs;   
-	struct accepted_reply *ar;
-{
-
-	assert(xdrs != NULL);
-	assert(ar != NULL);
-
-	/* personalized union, rather than calling xdr_union */
-	if (! xdr_opaque_auth(xdrs, &(ar->ar_verf)))
-		return (FALSE);
-	if (! xdr_enum(xdrs, (enum_t *)&(ar->ar_stat)))
-		return (FALSE);
-	switch (ar->ar_stat) {
-
-	case SUCCESS:
-		return ((*(ar->ar_results.proc))(xdrs, ar->ar_results.where));
-
-	case PROG_MISMATCH:
-		if (! xdr_uint32_t(xdrs, &(ar->ar_vers.low)))
-			return (FALSE);
-		return (xdr_uint32_t(xdrs, &(ar->ar_vers.high)));
-
-	case GARBAGE_ARGS:
-	case SYSTEM_ERR:
-	case PROC_UNAVAIL:
-	case PROG_UNAVAIL:
-		break;
-	}
-	return (TRUE);  /* TRUE => open ended set of problems */
-}
-
-/*
- * XDR the MSG_DENIED part of a reply message union
- */
-bool_t 
-xdr_rejected_reply(xdrs, rr)
-	XDR *xdrs;
-	struct rejected_reply *rr;
-{
-
-	assert(xdrs != NULL);
-	assert(rr != NULL);
-
-	/* personalized union, rather than calling xdr_union */
-	if (! xdr_enum(xdrs, (enum_t *)&(rr->rj_stat)))
-		return (FALSE);
-	switch (rr->rj_stat) {
-
-	case RPC_MISMATCH:
-		if (! xdr_uint32_t(xdrs, &(rr->rj_vers.low)))
-			return (FALSE);
-		return (xdr_uint32_t(xdrs, &(rr->rj_vers.high)));
-
-	case AUTH_ERROR:
-		return (xdr_enum(xdrs, (enum_t *)&(rr->rj_why)));
-	}
-	/* NOTREACHED */
-	assert(0);
-	return (FALSE);
-}
-
-static const struct xdr_discrim reply_dscrm[3] = {
-	{ (int)MSG_ACCEPTED, (xdrproc_t)xdr_accepted_reply },
-	{ (int)MSG_DENIED, (xdrproc_t)xdr_rejected_reply },
-	{ __dontcare__, NULL_xdrproc_t } };
-
-/*
- * XDR a reply message
- */
-bool_t
-xdr_replymsg(xdrs, rmsg)
-	XDR *xdrs;
-	struct rpc_msg *rmsg;
-{
-	assert(xdrs != NULL);
-	assert(rmsg != NULL);
-
-	if (
-	    xdr_uint32_t(xdrs, &(rmsg->rm_xid)) && 
-	    xdr_enum(xdrs, (enum_t *)&(rmsg->rm_direction)) &&
-	    (rmsg->rm_direction == REPLY) )
-		return (xdr_union(xdrs, (enum_t *)&(rmsg->rm_reply.rp_stat),
-		   (caddr_t)(void *)&(rmsg->rm_reply.ru), reply_dscrm,
-		   NULL_xdrproc_t));
-	return (FALSE);
-}
-
-
-/*
- * Serializes the "static part" of a call message header.
- * The fields include: rm_xid, rm_direction, rpcvers, prog, and vers.
- * The rm_xid is not really static, but the user can easily munge on the fly.
- */
-bool_t
-xdr_callhdr(xdrs, cmsg)
-	XDR *xdrs;
-	struct rpc_msg *cmsg;
-{
-
-	assert(xdrs != NULL);
-	assert(cmsg != NULL);
-
-	cmsg->rm_direction = CALL;
-	cmsg->rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	if (
-	    (xdrs->x_op == XDR_ENCODE) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_xid)) &&
-	    xdr_enum(xdrs, (enum_t *)&(cmsg->rm_direction)) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_prog)) )
-		return (xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_vers)));
-	return (FALSE);
-}
-
-/* ************************** Client utility routine ************* */
-
-static void
-accepted(acpt_stat, error)
-	enum accept_stat acpt_stat;
-	struct rpc_err *error;
-{
-
-	assert(error != NULL);
-
-	switch (acpt_stat) {
-
-	case PROG_UNAVAIL:
-		error->re_status = RPC_PROGUNAVAIL;
-		return;
-
-	case PROG_MISMATCH:
-		error->re_status = RPC_PROGVERSMISMATCH;
-		return;
-
-	case PROC_UNAVAIL:
-		error->re_status = RPC_PROCUNAVAIL;
-		return;
-
-	case GARBAGE_ARGS:
-		error->re_status = RPC_CANTDECODEARGS;
-		return;
-
-	case SYSTEM_ERR:
-		error->re_status = RPC_SYSTEMERROR;
-		return;
-
-	case SUCCESS:
-		error->re_status = RPC_SUCCESS;
-		return;
-	}
-	/* NOTREACHED */
-	/* something's wrong, but we don't know what ... */
-	error->re_status = RPC_FAILED;
-	error->re_lb.s1 = (int32_t)MSG_ACCEPTED;
-	error->re_lb.s2 = (int32_t)acpt_stat;
-}
-
-static void 
-rejected(rjct_stat, error)
-	enum reject_stat rjct_stat;
-	struct rpc_err *error;
-{
-
-	assert(error != NULL);
-
-	switch (rjct_stat) {
-	case RPC_MISMATCH:
-		error->re_status = RPC_VERSMISMATCH;
-		return;
-
-	case AUTH_ERROR:
-		error->re_status = RPC_AUTHERROR;
-		return;
-	}
-	/* something's wrong, but we don't know what ... */
-	/* NOTREACHED */
-	error->re_status = RPC_FAILED;
-	error->re_lb.s1 = (int32_t)MSG_DENIED;
-	error->re_lb.s2 = (int32_t)rjct_stat;
-}
-
-/*
- * given a reply message, fills in the error
- */
-void
-_seterr_reply(msg, error)
-	struct rpc_msg *msg;
-	struct rpc_err *error;
-{
-
-	assert(msg != NULL);
-	assert(error != NULL);
-
-	/* optimized for normal, SUCCESSful case */
-	switch (msg->rm_reply.rp_stat) {
-
-	case MSG_ACCEPTED:
-		if (msg->acpted_rply.ar_stat == SUCCESS) {
-			error->re_status = RPC_SUCCESS;
-			return;
-		}
-		accepted(msg->acpted_rply.ar_stat, error);
-		break;
-
-	case MSG_DENIED:
-		rejected(msg->rjcted_rply.rj_stat, error);
-		break;
-
-	default:
-		error->re_status = RPC_FAILED;
-		error->re_lb.s1 = (int32_t)(msg->rm_reply.rp_stat);
-		break;
-	}
-	switch (error->re_status) {
-
-	case RPC_VERSMISMATCH:
-		error->re_vers.low = msg->rjcted_rply.rj_vers.low;
-		error->re_vers.high = msg->rjcted_rply.rj_vers.high;
-		break;
-
-	case RPC_AUTHERROR:
-		error->re_why = msg->rjcted_rply.rj_why;
-		break;
-
-	case RPC_PROGVERSMISMATCH:
-		error->re_vers.low = msg->acpted_rply.ar_vers.low;
-		error->re_vers.high = msg->acpted_rply.ar_vers.high;
-		break;
-
-	case RPC_FAILED:
-	case RPC_SUCCESS:
-	case RPC_PROGNOTREGISTERED:
-	case RPC_PMAPFAILURE:
-	case RPC_UNKNOWNPROTO:
-	case RPC_UNKNOWNHOST:
-	case RPC_SYSTEMERROR:
-	case RPC_CANTDECODEARGS:
-	case RPC_PROCUNAVAIL:
-	case RPC_PROGUNAVAIL:
-	case RPC_TIMEDOUT:
-	case RPC_CANTRECV:
-	case RPC_CANTSEND:
-	case RPC_CANTDECODERES:
-	case RPC_CANTENCODEARGS:
-	default:
-		break;
-	}
-}
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
deleted file mode 100644
index b756ffa..0000000
--- a/lib/libc/rpc/rpc_soc.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/*	$NetBSD: rpc_soc.c,v 1.6 2000/07/06 03:10:35 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/* #ident	"@(#)rpc_soc.c	1.17	94/04/24 SMI" */
-
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- * In addition, portions of such source code were derived from Berkeley
- * 4.3 BSD under license from the Regents of the University of
- * California.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpc_soc.c,v 1.14 2004/10/16 06:11:35 obrien Exp $");
-
-#ifdef PORTMAP
-/*
- * rpc_soc.c
- *
- * The backward compatibility routines for the earlier implementation
- * of RPC, where the only transports supported were tcp/ip and udp/ip.
- * Based on berkeley socket abstraction, now implemented on the top
- * of TLI/Streams
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/nettype.h>
-#include <syslog.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <errno.h>
-#include <syslog.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-
-extern mutex_t	rpcsoc_lock;
-
-static CLIENT *clnt_com_create(struct sockaddr_in *, rpcprog_t, rpcvers_t,
-    int *, u_int, u_int, char *);
-static SVCXPRT *svc_com_create(int, u_int, u_int, char *);
-static bool_t rpc_wrap_bcast(char *, struct netbuf *, struct netconfig *);
-
-/* XXX */
-#define IN4_LOCALHOST_STRING    "127.0.0.1"
-#define IN6_LOCALHOST_STRING    "::1"
-
-/*
- * A common clnt create routine
- */
-static CLIENT *
-clnt_com_create(raddr, prog, vers, sockp, sendsz, recvsz, tp)
-	struct sockaddr_in *raddr;
-	rpcprog_t prog;
-	rpcvers_t vers;
-	int *sockp;
-	u_int sendsz;
-	u_int recvsz;
-	char *tp;
-{
-	CLIENT *cl;
-	int madefd = FALSE;
-	int fd = *sockp;
-	struct netconfig *nconf;
-	struct netbuf bindaddr;
-
-	mutex_lock(&rpcsoc_lock);
-	if ((nconf = __rpc_getconfip(tp)) == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		mutex_unlock(&rpcsoc_lock);
-		return (NULL);
-	}
-	if (fd == RPC_ANYSOCK) {
-		fd = __rpc_nconf2fd(nconf);
-		if (fd == -1)
-			goto syserror;
-		madefd = TRUE;
-	}
-
-	if (raddr->sin_port == 0) {
-		u_int proto;
-		u_short sport;
-
-		mutex_unlock(&rpcsoc_lock);	/* pmap_getport is recursive */
-		proto = strcmp(tp, "udp") == 0 ? IPPROTO_UDP : IPPROTO_TCP;
-		sport = pmap_getport(raddr, (u_long)prog, (u_long)vers,
-		    proto);
-		if (sport == 0) {
-			goto err;
-		}
-		raddr->sin_port = htons(sport);
-		mutex_lock(&rpcsoc_lock);	/* pmap_getport is recursive */
-	}
-
-	/* Transform sockaddr_in to netbuf */
-	bindaddr.maxlen = bindaddr.len =  sizeof (struct sockaddr_in);
-	bindaddr.buf = raddr;
-
-	bindresvport(fd, NULL);
-	cl = clnt_tli_create(fd, nconf, &bindaddr, prog, vers,
-				sendsz, recvsz);
-	if (cl) {
-		if (madefd == TRUE) {
-			/*
-			 * The fd should be closed while destroying the handle.
-			 */
-			(void) CLNT_CONTROL(cl, CLSET_FD_CLOSE, NULL);
-			*sockp = fd;
-		}
-		(void) freenetconfigent(nconf);
-		mutex_unlock(&rpcsoc_lock);
-		return (cl);
-	}
-	goto err;
-
-syserror:
-	rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-	rpc_createerr.cf_error.re_errno = errno;
-
-err:	if (madefd == TRUE)
-		(void)_close(fd);
-	(void) freenetconfigent(nconf);
-	mutex_unlock(&rpcsoc_lock);
-	return (NULL);
-}
-
-CLIENT *
-clntudp_bufcreate(raddr, prog, vers, wait, sockp, sendsz, recvsz)
-	struct sockaddr_in *raddr;
-	u_long prog;
-	u_long vers;
-	struct timeval wait;
-	int *sockp;
-	u_int sendsz;
-	u_int recvsz;
-{
-	CLIENT *cl;
-
-	cl = clnt_com_create(raddr, (rpcprog_t)prog, (rpcvers_t)vers, sockp,
-	    sendsz, recvsz, "udp");
-	if (cl == NULL) {
-		return (NULL);
-	}
-	(void) CLNT_CONTROL(cl, CLSET_RETRY_TIMEOUT, &wait);
-	return (cl);
-}
-
-CLIENT *
-clntudp_create(raddr, program, version, wait, sockp)
-	struct sockaddr_in *raddr;
-	u_long program;
-	u_long version;
-	struct timeval wait;
-	int *sockp;
-{
-
-	return clntudp_bufcreate(raddr, program, version, wait, sockp,
-					UDPMSGSIZE, UDPMSGSIZE);
-}
-
-CLIENT *
-clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
-	struct sockaddr_in *raddr;
-	u_long prog;
-	u_long vers;
-	int *sockp;
-	u_int sendsz;
-	u_int recvsz;
-{
-
-	return clnt_com_create(raddr, (rpcprog_t)prog, (rpcvers_t)vers, sockp,
-	    sendsz, recvsz, "tcp");
-}
-
-CLIENT *
-clntraw_create(prog, vers)
-	u_long prog;
-	u_long vers;
-{
-
-	return clnt_raw_create((rpcprog_t)prog, (rpcvers_t)vers);
-}
-
-/*
- * A common server create routine
- */
-static SVCXPRT *
-svc_com_create(fd, sendsize, recvsize, netid)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-	char *netid;
-{
-	struct netconfig *nconf;
-	SVCXPRT *svc;
-	int madefd = FALSE;
-	int port;
-	struct sockaddr_in sin;
-
-	if ((nconf = __rpc_getconfip(netid)) == NULL) {
-		(void) syslog(LOG_ERR, "Could not get %s transport", netid);
-		return (NULL);
-	}
-	if (fd == RPC_ANYSOCK) {
-		fd = __rpc_nconf2fd(nconf);
-		if (fd == -1) {
-			(void) freenetconfigent(nconf);
-			(void) syslog(LOG_ERR,
-			"svc%s_create: could not open connection", netid);
-			return (NULL);
-		}
-		madefd = TRUE;
-	}
-
-	memset(&sin, 0, sizeof sin);
-	sin.sin_family = AF_INET;
-	bindresvport(fd, &sin);
-	_listen(fd, SOMAXCONN);
-	svc = svc_tli_create(fd, nconf, NULL, sendsize, recvsize);
-	(void) freenetconfigent(nconf);
-	if (svc == NULL) {
-		if (madefd)
-			(void)_close(fd);
-		return (NULL);
-	}
-	port = (((struct sockaddr_in *)svc->xp_ltaddr.buf)->sin_port);
-	svc->xp_port = ntohs(port);
-	return (svc);
-}
-
-SVCXPRT *
-svctcp_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-
-	return svc_com_create(fd, sendsize, recvsize, "tcp");
-}
-
-SVCXPRT *
-svcudp_bufcreate(fd, sendsz, recvsz)
-	int fd;
-	u_int sendsz, recvsz;
-{
-
-	return svc_com_create(fd, sendsz, recvsz, "udp");
-}
-
-SVCXPRT *
-svcfd_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-
-	return svc_fd_create(fd, sendsize, recvsize);
-}
-
-
-SVCXPRT *
-svcudp_create(fd)
-	int fd;
-{
-
-	return svc_com_create(fd, UDPMSGSIZE, UDPMSGSIZE, "udp");
-}
-
-SVCXPRT *
-svcraw_create()
-{
-
-	return svc_raw_create();
-}
-
-int
-get_myaddress(addr)
-	struct sockaddr_in *addr;
-{
-
-	memset((void *) addr, 0, sizeof(*addr));
-	addr->sin_family = AF_INET;
-	addr->sin_port = htons(PMAPPORT);
-	addr->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-	return (0);
-}
-
-/*
- * For connectionless "udp" transport. Obsoleted by rpc_call().
- */
-int
-callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
-	const char *host;
-	int prognum, versnum, procnum;
-	xdrproc_t inproc, outproc;
-	void *in, *out;
-{
-
-	return (int)rpc_call(host, (rpcprog_t)prognum, (rpcvers_t)versnum,
-	    (rpcproc_t)procnum, inproc, in, outproc, out, "udp");
-}
-
-/*
- * For connectionless kind of transport. Obsoleted by rpc_reg()
- */
-int
-registerrpc(prognum, versnum, procnum, progname, inproc, outproc)
-	int prognum, versnum, procnum;
-	char *(*progname)(char [UDPMSGSIZE]);
-	xdrproc_t inproc, outproc;
-{
-
-	return rpc_reg((rpcprog_t)prognum, (rpcvers_t)versnum,
-	    (rpcproc_t)procnum, progname, inproc, outproc, "udp");
-}
-
-/*
- * All the following clnt_broadcast stuff is convulated; it supports
- * the earlier calling style of the callback function
- */
-static thread_key_t	clnt_broadcast_key;
-static resultproc_t	clnt_broadcast_result_main;
-
-/*
- * Need to translate the netbuf address into sockaddr_in address.
- * Dont care about netid here.
- */
-/* ARGSUSED */
-static bool_t
-rpc_wrap_bcast(resultp, addr, nconf)
-	char *resultp;		/* results of the call */
-	struct netbuf *addr;	/* address of the guy who responded */
-	struct netconfig *nconf; /* Netconf of the transport */
-{
-	resultproc_t clnt_broadcast_result;
-
-	if (strcmp(nconf->nc_netid, "udp"))
-		return (FALSE);
-	if (thr_main())
-		clnt_broadcast_result = clnt_broadcast_result_main;
-	else
-		clnt_broadcast_result = (resultproc_t)thr_getspecific(clnt_broadcast_key);
-	return (*clnt_broadcast_result)(resultp,
-				(struct sockaddr_in *)addr->buf);
-}
-
-/*
- * Broadcasts on UDP transport. Obsoleted by rpc_broadcast().
- */
-enum clnt_stat
-clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
-	u_long		prog;		/* program number */
-	u_long		vers;		/* version number */
-	u_long		proc;		/* procedure number */
-	xdrproc_t	xargs;		/* xdr routine for args */
-	void	       *argsp;		/* pointer to args */
-	xdrproc_t	xresults;	/* xdr routine for results */
-	void	       *resultsp;	/* pointer to results */
-	resultproc_t	eachresult;	/* call with each result obtained */
-{
-	extern mutex_t tsd_lock;
-
-	if (thr_main())
-		clnt_broadcast_result_main = eachresult;
-	else {
-		if (clnt_broadcast_key == 0) {
-			mutex_lock(&tsd_lock);
-			if (clnt_broadcast_key == 0)
-				thr_keycreate(&clnt_broadcast_key, free);
-			mutex_unlock(&tsd_lock);
-		}
-		thr_setspecific(clnt_broadcast_key, (void *) eachresult);
-	}
-	return rpc_broadcast((rpcprog_t)prog, (rpcvers_t)vers,
-	    (rpcproc_t)proc, xargs, argsp, xresults, resultsp,
-	    (resultproc_t) rpc_wrap_bcast, "udp");
-}
-
-/*
- * Create the client des authentication object. Obsoleted by
- * authdes_seccreate().
- */
-AUTH *
-authdes_create(servername, window, syncaddr, ckey)
-	char *servername;		/* network name of server */
-	u_int window;			/* time to live */
-	struct sockaddr *syncaddr;	/* optional hostaddr to sync with */
-	des_block *ckey;		/* optional conversation key to use */
-{
-	AUTH *dummy;
-	AUTH *nauth;
-	char hostname[NI_MAXHOST];
-
-	if (syncaddr) {
-		/*
-		 * Change addr to hostname, because that is the way
-		 * new interface takes it.
-		 */
-		if (getnameinfo(syncaddr, syncaddr->sa_len, hostname,
-		    sizeof hostname, NULL, 0, 0) != 0)
-			goto fallback;
-
-		nauth = authdes_seccreate(servername, window, hostname, ckey);
-		return (nauth);
-	}
-fallback:
-	dummy = authdes_seccreate(servername, window, NULL, ckey);
-	return (dummy);
-}
-
-/*
- * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
- */
-CLIENT *
-clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
-	struct sockaddr_un *raddr;
-	u_long prog;
-	u_long vers;
-	int *sockp;
-	u_int sendsz;
-	u_int recvsz;
-{
-	struct netbuf *svcaddr;
-	struct netconfig *nconf;
-	CLIENT *cl;
-	int len;
-
-	cl = NULL;
-	nconf = NULL;
-	svcaddr = NULL;
-	if ((raddr->sun_len == 0) ||
-	   ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) ||
-	   ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) {
-		if (svcaddr != NULL)
-			free(svcaddr);
-		rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-		rpc_createerr.cf_error.re_errno = errno;
-		return(cl);
-	}
-	if (*sockp < 0) {
-		*sockp = _socket(AF_LOCAL, SOCK_STREAM, 0);
-		len = raddr->sun_len = SUN_LEN(raddr);
-		if ((*sockp < 0) || (_connect(*sockp,
-		    (struct sockaddr *)raddr, len) < 0)) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			if (*sockp != -1)
-				(void)_close(*sockp);
-			goto done;
-		}
-	}
-	svcaddr->buf = raddr;
-	svcaddr->len = raddr->sun_len;
-	svcaddr->maxlen = sizeof (struct sockaddr_un);
-	cl = clnt_vc_create(*sockp, svcaddr, prog,
-	    vers, sendsz, recvsz);
-done:
-	free(svcaddr->buf);
-	free(svcaddr);
-	return(cl);
-}
-
-/*
- * Creates, registers, and returns a (rpc) unix based transporter.
- * Obsoleted by svc_vc_create().
- */
-SVCXPRT *
-svcunix_create(sock, sendsize, recvsize, path)
-	int sock;
-	u_int sendsize;
-	u_int recvsize;
-	char *path;
-{
-	struct netconfig *nconf;
-	void *localhandle;
-	struct sockaddr_un sun;
-	struct sockaddr *sa;
-	struct t_bind taddr;
-	SVCXPRT *xprt;
-	int addrlen;
-
-	xprt = (SVCXPRT *)NULL;
-	localhandle = setnetconfig();
-	while ((nconf = getnetconfig(localhandle)) != NULL) {
-		if (nconf->nc_protofmly != NULL &&
-		    strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
-			break;
-	}
-	if (nconf == NULL)
-		return(xprt);
-
-	if ((sock = __rpc_nconf2fd(nconf)) < 0)
-		goto done;
-
-	memset(&sun, 0, sizeof sun);
-	sun.sun_family = AF_LOCAL;
-	if (strlcpy(sun.sun_path, path, sizeof(sun.sun_path)) >=
-	    sizeof(sun.sun_path))
-		goto done;
-	sun.sun_len = SUN_LEN(&sun);
-	addrlen = sizeof (struct sockaddr_un);
-	sa = (struct sockaddr *)&sun;
-
-	if (_bind(sock, sa, addrlen) < 0)
-		goto done;
-
-	taddr.addr.len = taddr.addr.maxlen = addrlen;
-	taddr.addr.buf = malloc(addrlen);
-	if (taddr.addr.buf == NULL)
-		goto done;
-	memcpy(taddr.addr.buf, sa, addrlen);
-
-	if (nconf->nc_semantics != NC_TPI_CLTS) {
-		if (_listen(sock, SOMAXCONN) < 0) {
-			free(taddr.addr.buf);
-			goto done;
-		}
-	}
-
-	xprt = (SVCXPRT *)svc_tli_create(sock, nconf, &taddr, sendsize, recvsize);
-
-done:
-	endnetconfig(localhandle);
-	return(xprt);
-}
-
-/*
- * Like svunix_create(), except the routine takes any *open* UNIX file
- * descriptor as its first input. Obsoleted by svc_fd_create();
- */
-SVCXPRT *
-svcunixfd_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
- 	return (svc_fd_create(fd, sendsize, recvsize));
-}
-
-#endif /* PORTMAP */
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
deleted file mode 100644
index 51f5450..0000000
--- a/lib/libc/rpc/rpcb_clnt.c
+++ /dev/null
@@ -1,1354 +0,0 @@
-/*	$NetBSD: rpcb_clnt.c,v 1.6 2000/07/16 06:41:43 itojun Exp $	*/
-
-/*
- * The contents of this file are subject to the Sun Standards
- * License Version 1.0 the (the "License";) You may not use
- * this file except in compliance with the License.  You may
- * obtain a copy of the License at lib/libc/rpc/LICENSE
- *
- * Software distributed under the License is distributed on
- * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied.  See the License for the specific
- * language governing rights and limitations under the License.
- *
- * The Original Code is Copyright 1998 by Sun Microsystems, Inc
- *
- * The Initial Developer of the Original Code is:  Sun
- * Microsystems, Inc.
- *
- * All Rights Reserved.
- *
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)rpcb_clnt.c	1.27	94/04/24 SMI" */
-
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_clnt.c,v 1.14 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * rpcb_clnt.c
- * interface to rpcbind rpc service.
- *
- * Copyright (C) 1988, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/utsname.h>
-#include <rpc/rpc.h>
-#include <rpc/rpcb_prot.h>
-#include <rpc/nettype.h>
-#include <netconfig.h>
-#ifdef PORTMAP
-#include <netinet/in.h>		/* FOR IPPROTO_TCP/UDP definitions */
-#include <rpc/pmap_prot.h>
-#endif				/* PORTMAP */
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-
-static struct timeval tottimeout = { 60, 0 };
-static const struct timeval rmttimeout = { 3, 0 };
-static struct timeval rpcbrmttime = { 15, 0 };
-
-extern bool_t xdr_wrapstring(XDR *, char **);
-
-static const char nullstring[] = "\000";
-
-#define	CACHESIZE 6
-
-struct address_cache {
-	char *ac_host;
-	char *ac_netid;
-	char *ac_uaddr;
-	struct netbuf *ac_taddr;
-	struct address_cache *ac_next;
-};
-
-static struct address_cache *front;
-static int cachesize;
-
-#define	CLCR_GET_RPCB_TIMEOUT	1
-#define	CLCR_SET_RPCB_TIMEOUT	2
-
-
-extern int __rpc_lowvers;
-
-static struct address_cache *check_cache(const char *, const char *);
-static void delete_cache(struct netbuf *);
-static void add_cache(const char *, const char *, struct netbuf *, char *);
-static CLIENT *getclnthandle(const char *, const struct netconfig *, char **);
-static CLIENT *local_rpcb(void);
-static struct netbuf *got_entry(rpcb_entry_list_ptr, const struct netconfig *);
-
-/*
- * This routine adjusts the timeout used for calls to the remote rpcbind.
- * Also, this routine can be used to set the use of portmapper version 2
- * only when doing rpc_broadcasts
- * These are private routines that may not be provided in future releases.
- */
-bool_t
-__rpc_control(request, info)
-	int	request;
-	void	*info;
-{
-	switch (request) {
-	case CLCR_GET_RPCB_TIMEOUT:
-		*(struct timeval *)info = tottimeout;
-		break;
-	case CLCR_SET_RPCB_TIMEOUT:
-		tottimeout = *(struct timeval *)info;
-		break;
-	case CLCR_SET_LOWVERS:
-		__rpc_lowvers = *(int *)info;
-		break;
-	case CLCR_GET_LOWVERS:
-		*(int *)info = __rpc_lowvers;
-		break;
-	default:
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- *	It might seem that a reader/writer lock would be more reasonable here.
- *	However because getclnthandle(), the only user of the cache functions,
- *	may do a delete_cache() operation if a check_cache() fails to return an
- *	address useful to clnt_tli_create(), we may as well use a mutex.
- */
-/*
- * As it turns out, if the cache lock is *not* a reader/writer lock, we will
- * block all clnt_create's if we are trying to connect to a host that's down,
- * since the lock will be held all during that time.
- */
-extern rwlock_t	rpcbaddr_cache_lock;
-
-/*
- * The routines check_cache(), add_cache(), delete_cache() manage the
- * cache of rpcbind addresses for (host, netid).
- */
-
-static struct address_cache *
-check_cache(host, netid)
-	const char *host, *netid;
-{
-	struct address_cache *cptr;
-
-	/* READ LOCK HELD ON ENTRY: rpcbaddr_cache_lock */
-
-	for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
-		if (!strcmp(cptr->ac_host, host) &&
-		    !strcmp(cptr->ac_netid, netid)) {
-#ifdef ND_DEBUG
-			fprintf(stderr, "Found cache entry for %s: %s\n",
-				host, netid);
-#endif
-			return (cptr);
-		}
-	}
-	return ((struct address_cache *) NULL);
-}
-
-static void
-delete_cache(addr)
-	struct netbuf *addr;
-{
-	struct address_cache *cptr, *prevptr = NULL;
-
-	/* WRITE LOCK HELD ON ENTRY: rpcbaddr_cache_lock */
-	for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
-		if (!memcmp(cptr->ac_taddr->buf, addr->buf, addr->len)) {
-			free(cptr->ac_host);
-			free(cptr->ac_netid);
-			free(cptr->ac_taddr->buf);
-			free(cptr->ac_taddr);
-			if (cptr->ac_uaddr)
-				free(cptr->ac_uaddr);
-			if (prevptr)
-				prevptr->ac_next = cptr->ac_next;
-			else
-				front = cptr->ac_next;
-			free(cptr);
-			cachesize--;
-			break;
-		}
-		prevptr = cptr;
-	}
-}
-
-static void
-add_cache(host, netid, taddr, uaddr)
-	const char *host, *netid;
-	char *uaddr;
-	struct netbuf *taddr;
-{
-	struct address_cache  *ad_cache, *cptr, *prevptr;
-
-	ad_cache = (struct address_cache *)
-			malloc(sizeof (struct address_cache));
-	if (!ad_cache) {
-		return;
-	}
-	ad_cache->ac_host = strdup(host);
-	ad_cache->ac_netid = strdup(netid);
-	ad_cache->ac_uaddr = uaddr ? strdup(uaddr) : NULL;
-	ad_cache->ac_taddr = (struct netbuf *)malloc(sizeof (struct netbuf));
-	if (!ad_cache->ac_host || !ad_cache->ac_netid || !ad_cache->ac_taddr ||
-		(uaddr && !ad_cache->ac_uaddr)) {
-		return;
-	}
-	ad_cache->ac_taddr->len = ad_cache->ac_taddr->maxlen = taddr->len;
-	ad_cache->ac_taddr->buf = (char *) malloc(taddr->len);
-	if (ad_cache->ac_taddr->buf == NULL) {
-		return;
-	}
-	memcpy(ad_cache->ac_taddr->buf, taddr->buf, taddr->len);
-#ifdef ND_DEBUG
-	fprintf(stderr, "Added to cache: %s : %s\n", host, netid);
-#endif
-
-/* VARIABLES PROTECTED BY rpcbaddr_cache_lock:  cptr */
-
-	rwlock_wrlock(&rpcbaddr_cache_lock);
-	if (cachesize < CACHESIZE) {
-		ad_cache->ac_next = front;
-		front = ad_cache;
-		cachesize++;
-	} else {
-		/* Free the last entry */
-		cptr = front;
-		prevptr = NULL;
-		while (cptr->ac_next) {
-			prevptr = cptr;
-			cptr = cptr->ac_next;
-		}
-
-#ifdef ND_DEBUG
-		fprintf(stderr, "Deleted from cache: %s : %s\n",
-			cptr->ac_host, cptr->ac_netid);
-#endif
-		free(cptr->ac_host);
-		free(cptr->ac_netid);
-		free(cptr->ac_taddr->buf);
-		free(cptr->ac_taddr);
-		if (cptr->ac_uaddr)
-			free(cptr->ac_uaddr);
-
-		if (prevptr) {
-			prevptr->ac_next = NULL;
-			ad_cache->ac_next = front;
-			front = ad_cache;
-		} else {
-			front = ad_cache;
-			ad_cache->ac_next = NULL;
-		}
-		free(cptr);
-	}
-	rwlock_unlock(&rpcbaddr_cache_lock);
-}
-
-/*
- * This routine will return a client handle that is connected to the
- * rpcbind. If targaddr is non-NULL, the "universal address" of the
- * host will be stored in *targaddr; the caller is responsible for
- * freeing this string.
- * On error, returns NULL and free's everything.
- */
-static CLIENT *
-getclnthandle(host, nconf, targaddr)
-	const char *host;
-	const struct netconfig *nconf;
-	char **targaddr;
-{
-	CLIENT *client;
-	struct netbuf *addr, taddr;
-	struct netbuf addr_to_delete;
-	struct __rpc_sockinfo si;
-	struct addrinfo hints, *res, *tres;
-	struct address_cache *ad_cache;
-	char *tmpaddr;
-
-/* VARIABLES PROTECTED BY rpcbaddr_cache_lock:  ad_cache */
-
-	/* Get the address of the rpcbind.  Check cache first */
-	client = NULL;
-	addr_to_delete.len = 0;
-	rwlock_rdlock(&rpcbaddr_cache_lock);
-	ad_cache = NULL;
-	if (host != NULL)
-		ad_cache = check_cache(host, nconf->nc_netid);
-	if (ad_cache != NULL) {
-		addr = ad_cache->ac_taddr;
-		client = clnt_tli_create(RPC_ANYFD, nconf, addr,
-		    (rpcprog_t)RPCBPROG, (rpcvers_t)RPCBVERS4, 0, 0);
-		if (client != NULL) {
-			if (targaddr)
-				*targaddr = strdup(ad_cache->ac_uaddr);
-			rwlock_unlock(&rpcbaddr_cache_lock);
-			return (client);
-		}
-		addr_to_delete.len = addr->len;
-		addr_to_delete.buf = (char *)malloc(addr->len);
-		if (addr_to_delete.buf == NULL) {
-			addr_to_delete.len = 0;
-		} else {
-			memcpy(addr_to_delete.buf, addr->buf, addr->len);
-		}
-	}
-	rwlock_unlock(&rpcbaddr_cache_lock);
-	if (addr_to_delete.len != 0) {
-		/*
-		 * Assume this may be due to cache data being
-		 *  outdated
-		 */
-		rwlock_wrlock(&rpcbaddr_cache_lock);
-		delete_cache(&addr_to_delete);
-		rwlock_unlock(&rpcbaddr_cache_lock);
-		free(addr_to_delete.buf);
-	}
-	if (!__rpc_nconf2sockinfo(nconf, &si)) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return NULL;
-	}
-
-	memset(&hints, 0, sizeof hints);
-	hints.ai_family = si.si_af;
-	hints.ai_socktype = si.si_socktype;
-	hints.ai_protocol = si.si_proto;
-
-#ifdef CLNT_DEBUG
-	printf("trying netid %s family %d proto %d socktype %d\n",
-	    nconf->nc_netid, si.si_af, si.si_proto, si.si_socktype);
-#endif
-
-	if (nconf->nc_protofmly != NULL && strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0) {
-		client = local_rpcb();
-		if (! client) {
-#ifdef ND_DEBUG
-			clnt_pcreateerror("rpcbind clnt interface");
-#endif
-			return (NULL);
-		} else {
-			struct sockaddr_un sun;
-
-			*targaddr = malloc(sizeof(sun.sun_path));
-			strncpy(*targaddr, _PATH_RPCBINDSOCK,
-			    sizeof(sun.sun_path));
-			return (client);
-		}
-	} else {
-		if (getaddrinfo(host, "sunrpc", &hints, &res) != 0) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNHOST;
-			return NULL;
-		}
-	}
-
-	for (tres = res; tres != NULL; tres = tres->ai_next) {
-		taddr.buf = tres->ai_addr;
-		taddr.len = taddr.maxlen = tres->ai_addrlen;
-
-#ifdef ND_DEBUG
-		{
-			char *ua;
-
-			ua = taddr2uaddr(nconf, &taddr);
-			fprintf(stderr, "Got it [%s]\n", ua);
-			free(ua);
-		}
-#endif
-
-#ifdef ND_DEBUG
-		{
-			int i;
-
-			fprintf(stderr, "\tnetbuf len = %d, maxlen = %d\n",
-				taddr.len, taddr.maxlen);
-			fprintf(stderr, "\tAddress is ");
-			for (i = 0; i < taddr.len; i++)
-				fprintf(stderr, "%u.", ((char *)(taddr.buf))[i]);
-			fprintf(stderr, "\n");
-		}
-#endif
-		client = clnt_tli_create(RPC_ANYFD, nconf, &taddr,
-		    (rpcprog_t)RPCBPROG, (rpcvers_t)RPCBVERS4, 0, 0);
-#ifdef ND_DEBUG
-		if (! client) {
-			clnt_pcreateerror("rpcbind clnt interface");
-		}
-#endif
-
-		if (client) {
-			tmpaddr = targaddr ? taddr2uaddr(nconf, &taddr) : NULL;
-			add_cache(host, nconf->nc_netid, &taddr, tmpaddr);
-			if (targaddr)
-				*targaddr = tmpaddr;
-			break;
-		}
-	}
-	if (res)
-		freeaddrinfo(res);
-	return (client);
-}
-
-/* XXX */
-#define IN4_LOCALHOST_STRING	"127.0.0.1"
-#define IN6_LOCALHOST_STRING	"::1"
-
-/*
- * This routine will return a client handle that is connected to the local
- * rpcbind. Returns NULL on error and free's everything.
- */
-static CLIENT *
-local_rpcb()
-{
-	CLIENT *client;
-	static struct netconfig *loopnconf;
-	static char *hostname;
-	extern mutex_t loopnconf_lock;
-	int sock;
-	size_t tsize;
-	struct netbuf nbuf;
-	struct sockaddr_un sun;
-
-	/*
-	 * Try connecting to the local rpcbind through a local socket
-	 * first. If this doesn't work, try all transports defined in
-	 * the netconfig file.
-	 */
-	memset(&sun, 0, sizeof sun);
-	sock = _socket(AF_LOCAL, SOCK_STREAM, 0);
-	if (sock < 0)
-		goto try_nconf;
-	sun.sun_family = AF_LOCAL;
-	strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
-	nbuf.len = sun.sun_len = SUN_LEN(&sun);
-	nbuf.maxlen = sizeof (struct sockaddr_un);
-	nbuf.buf = &sun;
-
-	tsize = __rpc_get_t_size(AF_LOCAL, 0, 0);
-	client = clnt_vc_create(sock, &nbuf, (rpcprog_t)RPCBPROG,
-	    (rpcvers_t)RPCBVERS, tsize, tsize);
-
-	if (client != NULL) {
-		/* Mark the socket to be closed in destructor */
-		(void) CLNT_CONTROL(client, CLSET_FD_CLOSE, NULL);
-		return client;
-	}
-
-	/* Nobody needs this socket anymore; free the descriptor. */
-	_close(sock);
-
-try_nconf:
-
-/* VARIABLES PROTECTED BY loopnconf_lock: loopnconf */
-	mutex_lock(&loopnconf_lock);
-	if (loopnconf == NULL) {
-		struct netconfig *nconf, *tmpnconf = NULL;
-		void *nc_handle;
-		int fd;
-
-		nc_handle = setnetconfig();
-		if (nc_handle == NULL) {
-			/* fails to open netconfig file */
-			syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			mutex_unlock(&loopnconf_lock);
-			return (NULL);
-		}
-		while ((nconf = getnetconfig(nc_handle)) != NULL) {
-#ifdef INET6
-			if ((strcmp(nconf->nc_protofmly, NC_INET6) == 0 ||
-#else
-			if ((
-#endif
-			     strcmp(nconf->nc_protofmly, NC_INET) == 0) &&
-			    (nconf->nc_semantics == NC_TPI_COTS ||
-			     nconf->nc_semantics == NC_TPI_COTS_ORD)) {
-				fd = __rpc_nconf2fd(nconf);
-				/*
-				 * Can't create a socket, assume that
-				 * this family isn't configured in the kernel.
-				 */
-				if (fd < 0)
-					continue;
-				_close(fd);
-				tmpnconf = nconf;
-				if (!strcmp(nconf->nc_protofmly, NC_INET))
-					hostname = IN4_LOCALHOST_STRING;
-				else
-					hostname = IN6_LOCALHOST_STRING;
-			}
-		}
-		if (tmpnconf == NULL) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			mutex_unlock(&loopnconf_lock);
-			return (NULL);
-		}
-		loopnconf = getnetconfigent(tmpnconf->nc_netid);
-		/* loopnconf is never freed */
-		endnetconfig(nc_handle);
-	}
-	mutex_unlock(&loopnconf_lock);
-	client = getclnthandle(hostname, loopnconf, NULL);
-	return (client);
-}
-
-/*
- * Set a mapping between program, version and address.
- * Calls the rpcbind service to do the mapping.
- */
-bool_t
-rpcb_set(program, version, nconf, address)
-	rpcprog_t program;
-	rpcvers_t version;
-	const struct netconfig *nconf;	/* Network structure of transport */
-	const struct netbuf *address;		/* Services netconfig address */
-{
-	CLIENT *client;
-	bool_t rslt = FALSE;
-	RPCB parms;
-	char uidbuf[32];
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (FALSE);
-	}
-	if (address == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (FALSE);
-	}
-	client = local_rpcb();
-	if (! client) {
-		return (FALSE);
-	}
-
-	/* convert to universal */
-	/*LINTED const castaway*/
-	parms.r_addr = taddr2uaddr((struct netconfig *) nconf,
-				   (struct netbuf *)address);
-	if (!parms.r_addr) {
-		CLNT_DESTROY(client);
-		rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;
-		return (FALSE); /* no universal address */
-	}
-	parms.r_prog = program;
-	parms.r_vers = version;
-	parms.r_netid = nconf->nc_netid;
-	/*
-	 * Though uid is not being used directly, we still send it for
-	 * completeness.  For non-unix platforms, perhaps some other
-	 * string or an empty string can be sent.
-	 */
-	(void) snprintf(uidbuf, sizeof uidbuf, "%d", geteuid());
-	parms.r_owner = uidbuf;
-
-	CLNT_CALL(client, (rpcproc_t)RPCBPROC_SET, (xdrproc_t) xdr_rpcb,
-	    (char *)(void *)&parms, (xdrproc_t) xdr_bool,
-	    (char *)(void *)&rslt, tottimeout);
-
-	CLNT_DESTROY(client);
-	free(parms.r_addr);
-	return (rslt);
-}
-
-/*
- * Remove the mapping between program, version and netbuf address.
- * Calls the rpcbind service to do the un-mapping.
- * If netbuf is NULL, unset for all the transports, otherwise unset
- * only for the given transport.
- */
-bool_t
-rpcb_unset(program, version, nconf)
-	rpcprog_t program;
-	rpcvers_t version;
-	const struct netconfig *nconf;
-{
-	CLIENT *client;
-	bool_t rslt = FALSE;
-	RPCB parms;
-	char uidbuf[32];
-
-	client = local_rpcb();
-	if (! client) {
-		return (FALSE);
-	}
-
-	parms.r_prog = program;
-	parms.r_vers = version;
-	if (nconf)
-		parms.r_netid = nconf->nc_netid;
-	else {
-		/*LINTED const castaway*/
-		parms.r_netid = (char *) &nullstring[0]; /* unsets  all */
-	}
-	/*LINTED const castaway*/
-	parms.r_addr = (char *) &nullstring[0];
-	(void) snprintf(uidbuf, sizeof uidbuf, "%d", geteuid());
-	parms.r_owner = uidbuf;
-
-	CLNT_CALL(client, (rpcproc_t)RPCBPROC_UNSET, (xdrproc_t) xdr_rpcb,
-	    (char *)(void *)&parms, (xdrproc_t) xdr_bool,
-	    (char *)(void *)&rslt, tottimeout);
-
-	CLNT_DESTROY(client);
-	return (rslt);
-}
-
-/*
- * From the merged list, find the appropriate entry
- */
-static struct netbuf *
-got_entry(relp, nconf)
-	rpcb_entry_list_ptr relp;
-	const struct netconfig *nconf;
-{
-	struct netbuf *na = NULL;
-	rpcb_entry_list_ptr sp;
-	rpcb_entry *rmap;
-
-	for (sp = relp; sp != NULL; sp = sp->rpcb_entry_next) {
-		rmap = &sp->rpcb_entry_map;
-		if ((strcmp(nconf->nc_proto, rmap->r_nc_proto) == 0) &&
-		    (strcmp(nconf->nc_protofmly, rmap->r_nc_protofmly) == 0) &&
-		    (nconf->nc_semantics == rmap->r_nc_semantics) &&
-		    (rmap->r_maddr != NULL) && (rmap->r_maddr[0] != 0)) {
-			na = uaddr2taddr(nconf, rmap->r_maddr);
-#ifdef ND_DEBUG
-			fprintf(stderr, "\tRemote address is [%s].\n",
-				rmap->r_maddr);
-			if (!na)
-				fprintf(stderr,
-				    "\tCouldn't resolve remote address!\n");
-#endif
-			break;
-		}
-	}
-	return (na);
-}
-
-/*
- * Quick check to see if rpcbind is up.  Tries to connect over
- * local transport.
- */
-bool_t
-__rpcbind_is_up()
-{
-	struct netconfig *nconf;
-	struct sockaddr_un sun;
-	void *localhandle;
-	int sock;
-
-	nconf = NULL;
-	localhandle = setnetconfig();
-	while ((nconf = getnetconfig(localhandle)) != NULL) {
-		if (nconf->nc_protofmly != NULL &&
-		    strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
-			 break;
-	}
-	if (nconf == NULL)
-		return (FALSE);
-
-	endnetconfig(localhandle);
-
-	memset(&sun, 0, sizeof sun);
-	sock = _socket(AF_LOCAL, SOCK_STREAM, 0);
-	if (sock < 0)
-		return (FALSE);
-	sun.sun_family = AF_LOCAL;
-	strncpy(sun.sun_path, _PATH_RPCBINDSOCK, sizeof(sun.sun_path));
-	sun.sun_len = SUN_LEN(&sun);
-
-	if (_connect(sock, (struct sockaddr *)&sun, sun.sun_len) < 0) {
-		_close(sock);
-		return (FALSE);
-	}
-
-	_close(sock);
-	return (TRUE);
-}
-
-/*
- * An internal function which optimizes rpcb_getaddr function.  It also
- * returns the client handle that it uses to contact the remote rpcbind.
- *
- * The algorithm used: If the transports is TCP or UDP, it first tries
- * version 2 (portmap), 4 and then 3 (svr4).  This order should be
- * changed in the next OS release to 4, 2 and 3.  We are assuming that by
- * that time, version 4 would be available on many machines on the network.
- * With this algorithm, we get performance as well as a plan for
- * obsoleting version 2.
- *
- * For all other transports, the algorithm remains as 4 and then 3.
- *
- * XXX: Due to some problems with t_connect(), we do not reuse the same client
- * handle for COTS cases and hence in these cases we do not return the
- * client handle.  This code will change if t_connect() ever
- * starts working properly.  Also look under clnt_vc.c.
- */
-struct netbuf *
-__rpcb_findaddr_timed(program, version, nconf, host, clpp, tp)
-	rpcprog_t program;
-	rpcvers_t version;
-	const struct netconfig *nconf;
-	const char *host;
-	CLIENT **clpp;
-	struct timeval *tp;
-{
-	static bool_t check_rpcbind = TRUE;
-	CLIENT *client = NULL;
-	RPCB parms;
-	enum clnt_stat clnt_st;
-	char *ua = NULL;
-	rpcvers_t vers;
-	struct netbuf *address = NULL;
-	rpcvers_t start_vers = RPCBVERS4;
-	struct netbuf servaddr;
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-
-	parms.r_addr = NULL;
-
-	/*
-	 * Use default total timeout if no timeout is specified.
-	 */
-	if (tp == NULL)
-		tp = &tottimeout;
-
-#ifdef PORTMAP
-	/* Try version 2 for TCP or UDP */
-	if (strcmp(nconf->nc_protofmly, NC_INET) == 0) {
-		u_short port = 0;
-		struct netbuf remote;
-		rpcvers_t pmapvers = 2;
-		struct pmap pmapparms;
-
-		/*
-		 * Try UDP only - there are some portmappers out
-		 * there that use UDP only.
-		 */
-		if (strcmp(nconf->nc_proto, NC_TCP) == 0) {
-			struct netconfig *newnconf;
-
-			if ((newnconf = getnetconfigent("udp")) == NULL) {
-				rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-				return (NULL);
-			}
-			client = getclnthandle(host, newnconf, &parms.r_addr);
-			freenetconfigent(newnconf);
-		} else {
-			client = getclnthandle(host, nconf, &parms.r_addr);
-		}
-		if (client == NULL)
-			return (NULL);
-
-		/*
-		 * Set version and retry timeout.
-		 */
-		CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *)&rpcbrmttime);
-		CLNT_CONTROL(client, CLSET_VERS, (char *)&pmapvers);
-
-		pmapparms.pm_prog = program;
-		pmapparms.pm_vers = version;
-		pmapparms.pm_prot = strcmp(nconf->nc_proto, NC_TCP) ?
-					IPPROTO_UDP : IPPROTO_TCP;
-		pmapparms.pm_port = 0;	/* not needed */
-		clnt_st = CLNT_CALL(client, (rpcproc_t)PMAPPROC_GETPORT,
-		    (xdrproc_t) xdr_pmap, (caddr_t)(void *)&pmapparms,
-		    (xdrproc_t) xdr_u_short, (caddr_t)(void *)&port,
-		    *tp);
-		if (clnt_st != RPC_SUCCESS) {
-			if ((clnt_st == RPC_PROGVERSMISMATCH) ||
-				(clnt_st == RPC_PROGUNAVAIL))
-				goto try_rpcbind; /* Try different versions */
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			goto error;
-		} else if (port == 0) {
-			address = NULL;
-			rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-			goto error;
-		}
-		port = htons(port);
-		CLNT_CONTROL(client, CLGET_SVC_ADDR, (char *)&remote);
-		if (((address = (struct netbuf *)
-			malloc(sizeof (struct netbuf))) == NULL) ||
-		    ((address->buf = (char *)
-			malloc(remote.len)) == NULL)) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			if (address) {
-				free(address);
-				address = NULL;
-			}
-			goto error;
-		}
-		memcpy(address->buf, remote.buf, remote.len);
-		memcpy(&((char *)address->buf)[sizeof (short)],
-				(char *)(void *)&port, sizeof (short));
-		address->len = address->maxlen = remote.len;
-		goto done;
-	}
-#endif				/* PORTMAP */
-
-try_rpcbind:
-	/*
-	 * Check if rpcbind is up.  This prevents needless delays when
-	 * accessing applications such as the keyserver while booting
-	 * disklessly.
-	 */
-	if (check_rpcbind && strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0) {
-		if (!__rpcbind_is_up()) {
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			rpc_createerr.cf_error.re_errno = 0;
-			goto error;
-		}
-		check_rpcbind = FALSE;
-	}
-
-	/*
-	 * Now we try version 4 and then 3.
-	 * We also send the remote system the address we used to
-	 * contact it in case it can help to connect back with us
-	 */
-	parms.r_prog = program;
-	parms.r_vers = version;
-	/*LINTED const castaway*/
-	parms.r_owner = (char *) &nullstring[0];	/* not needed; */
-							/* just for xdring */
-	parms.r_netid = nconf->nc_netid; /* not really needed */
-
-	/*
-	 * If a COTS transport is being used, try getting address via CLTS
-	 * transport.  This works only with version 4.
-	 */
-	if (nconf->nc_semantics == NC_TPI_COTS_ORD ||
-			nconf->nc_semantics == NC_TPI_COTS) {
-
-		void *handle;
-		struct netconfig *nconf_clts;
-		rpcb_entry_list_ptr relp = NULL;
-
-		if (client == NULL) {
-			/* This did not go through the above PORTMAP/TCP code */
-			if ((handle = __rpc_setconf("datagram_v")) != NULL) {
-				while ((nconf_clts = __rpc_getconf(handle))
-					!= NULL) {
-					if (strcmp(nconf_clts->nc_protofmly,
-						nconf->nc_protofmly) != 0) {
-						continue;
-					}
-					client = getclnthandle(host, nconf_clts,
-							&parms.r_addr);
-					break;
-				}
-				__rpc_endconf(handle);
-			}
-			if (client == NULL)
-				goto regular_rpcbind;	/* Go the regular way */
-		} else {
-			/* This is a UDP PORTMAP handle.  Change to version 4 */
-			vers = RPCBVERS4;
-			CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-		}
-		/*
-		 * We also send the remote system the address we used to
-		 * contact it in case it can help it connect back with us
-		 */
-		if (parms.r_addr == NULL) {
-			/*LINTED const castaway*/
-			parms.r_addr = (char *) &nullstring[0]; /* for XDRing */
-		}
-
-		CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *)&rpcbrmttime);
-
-		clnt_st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETADDRLIST,
-		    (xdrproc_t) xdr_rpcb, (char *)(void *)&parms,
-		    (xdrproc_t) xdr_rpcb_entry_list_ptr,
-		    (char *)(void *)&relp, *tp);
-		if (clnt_st == RPC_SUCCESS) {
-			if ((address = got_entry(relp, nconf)) != NULL) {
-				xdr_free((xdrproc_t) xdr_rpcb_entry_list_ptr,
-				    (char *)(void *)&relp);
-				CLNT_CONTROL(client, CLGET_SVC_ADDR,
-					(char *)(void *)&servaddr);
-				__rpc_fixup_addr(address, &servaddr);
-				goto done;
-			}
-			/* Entry not found for this transport */
-			xdr_free((xdrproc_t) xdr_rpcb_entry_list_ptr,
-			    (char *)(void *)&relp);
-			/*
-			 * XXX: should have perhaps returned with error but
-			 * since the remote machine might not always be able
-			 * to send the address on all transports, we try the
-			 * regular way with regular_rpcbind
-			 */
-			goto regular_rpcbind;
-		} else if ((clnt_st == RPC_PROGVERSMISMATCH) ||
-			(clnt_st == RPC_PROGUNAVAIL)) {
-			start_vers = RPCBVERS;	/* Try version 3 now */
-			goto regular_rpcbind; /* Try different versions */
-		} else {
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			goto error;
-		}
-	}
-
-regular_rpcbind:
-
-	/* Now the same transport is to be used to get the address */
-	if (client && ((nconf->nc_semantics == NC_TPI_COTS_ORD) ||
-			(nconf->nc_semantics == NC_TPI_COTS))) {
-		/* A CLTS type of client - destroy it */
-		CLNT_DESTROY(client);
-		client = NULL;
-	}
-
-	if (client == NULL) {
-		client = getclnthandle(host, nconf, &parms.r_addr);
-		if (client == NULL) {
-			goto error;
-		}
-	}
-	if (parms.r_addr == NULL) {
-		/*LINTED const castaway*/
-		parms.r_addr = (char *) &nullstring[0];
-	}
-
-	/* First try from start_vers and then version 3 (RPCBVERS) */
-
-	CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *) &rpcbrmttime);
-	for (vers = start_vers;  vers >= RPCBVERS; vers--) {
-		/* Set the version */
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-		clnt_st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETADDR,
-		    (xdrproc_t) xdr_rpcb, (char *)(void *)&parms,
-		    (xdrproc_t) xdr_wrapstring, (char *)(void *) &ua, *tp);
-		if (clnt_st == RPC_SUCCESS) {
-			if ((ua == NULL) || (ua[0] == 0)) {
-				/* address unknown */
-				rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-				goto error;
-			}
-			address = uaddr2taddr(nconf, ua);
-#ifdef ND_DEBUG
-			fprintf(stderr, "\tRemote address is [%s]\n", ua);
-			if (!address)
-				fprintf(stderr,
-					"\tCouldn't resolve remote address!\n");
-#endif
-			xdr_free((xdrproc_t)xdr_wrapstring,
-			    (char *)(void *)&ua);
-
-			if (! address) {
-				/* We don't know about your universal address */
-				rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;
-				goto error;
-			}
-			CLNT_CONTROL(client, CLGET_SVC_ADDR,
-			    (char *)(void *)&servaddr);
-			__rpc_fixup_addr(address, &servaddr);
-			goto done;
-		} else if (clnt_st == RPC_PROGVERSMISMATCH) {
-			struct rpc_err rpcerr;
-
-			clnt_geterr(client, &rpcerr);
-			if (rpcerr.re_vers.low > RPCBVERS4)
-				goto error;  /* a new version, can't handle */
-		} else if (clnt_st != RPC_PROGUNAVAIL) {
-			/* Cant handle this error */
-			rpc_createerr.cf_stat = clnt_st;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			goto error;
-		}
-	}
-
-	if ((address == NULL) || (address->len == 0)) {
-		rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-	}
-
-error:
-	if (client) {
-		CLNT_DESTROY(client);
-		client = NULL;
-	}
-done:
-	if (nconf->nc_semantics != NC_TPI_CLTS) {
-		/* This client is the connectionless one */
-		if (client) {
-			CLNT_DESTROY(client);
-			client = NULL;
-		}
-	}
-	if (clpp) {
-		*clpp = client;
-	} else if (client) {
-		CLNT_DESTROY(client);
-	}
-	if (parms.r_addr != NULL && parms.r_addr != nullstring)
-		free(parms.r_addr);
-	return (address);
-}
-
-
-/*
- * Find the mapped address for program, version.
- * Calls the rpcbind service remotely to do the lookup.
- * Uses the transport specified in nconf.
- * Returns FALSE (0) if no map exists, else returns 1.
- *
- * Assuming that the address is all properly allocated
- */
-int
-rpcb_getaddr(program, version, nconf, address, host)
-	rpcprog_t program;
-	rpcvers_t version;
-	const struct netconfig *nconf;
-	struct netbuf *address;
-	const char *host;
-{
-	struct netbuf *na;
-
-	if ((na = __rpcb_findaddr_timed(program, version,
-	    (struct netconfig *) nconf, (char *) host,
-	    (CLIENT **) NULL, (struct timeval *) NULL)) == NULL)
-		return (FALSE);
-
-	if (na->len > address->maxlen) {
-		/* Too long address */
-		free(na->buf);
-		free(na);
-		rpc_createerr.cf_stat = RPC_FAILED;
-		return (FALSE);
-	}
-	memcpy(address->buf, na->buf, (size_t)na->len);
-	address->len = na->len;
-	free(na->buf);
-	free(na);
-	return (TRUE);
-}
-
-/*
- * Get a copy of the current maps.
- * Calls the rpcbind service remotely to get the maps.
- *
- * It returns only a list of the services
- * It returns NULL on failure.
- */
-rpcblist *
-rpcb_getmaps(nconf, host)
-	const struct netconfig *nconf;
-	const char *host;
-{
-	rpcblist_ptr head = NULL;
-	CLIENT *client;
-	enum clnt_stat clnt_st;
-	rpcvers_t vers = 0;
-
-	client = getclnthandle(host, nconf, NULL);
-	if (client == NULL) {
-		return (head);
-	}
-	clnt_st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_DUMP,
-	    (xdrproc_t) xdr_void, NULL, (xdrproc_t) xdr_rpcblist_ptr,
-	    (char *)(void *)&head, tottimeout);
-	if (clnt_st == RPC_SUCCESS)
-		goto done;
-
-	if ((clnt_st != RPC_PROGVERSMISMATCH) &&
-	    (clnt_st != RPC_PROGUNAVAIL)) {
-		rpc_createerr.cf_stat = RPC_RPCBFAILURE;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-		goto done;
-	}
-
-	/* fall back to earlier version */
-	CLNT_CONTROL(client, CLGET_VERS, (char *)(void *)&vers);
-	if (vers == RPCBVERS4) {
-		vers = RPCBVERS;
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-		if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_DUMP,
-		    (xdrproc_t) xdr_void, NULL, (xdrproc_t) xdr_rpcblist_ptr,
-		    (char *)(void *)&head, tottimeout) == RPC_SUCCESS)
-			goto done;
-	}
-	rpc_createerr.cf_stat = RPC_RPCBFAILURE;
-	clnt_geterr(client, &rpc_createerr.cf_error);
-
-done:
-	CLNT_DESTROY(client);
-	return (head);
-}
-
-/*
- * rpcbinder remote-call-service interface.
- * This routine is used to call the rpcbind remote call service
- * which will look up a service program in the address maps, and then
- * remotely call that routine with the given parameters. This allows
- * programs to do a lookup and call in one step.
-*/
-enum clnt_stat
-rpcb_rmtcall(nconf, host, prog, vers, proc, xdrargs, argsp,
-		xdrres, resp, tout, addr_ptr)
-	const struct netconfig *nconf;	/* Netconfig structure */
-	const char *host;			/* Remote host name */
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;			/* Remote proc identifiers */
-	xdrproc_t xdrargs, xdrres;	/* XDR routines */
-	caddr_t argsp, resp;		/* Argument and Result */
-	struct timeval tout;		/* Timeout value for this call */
-	const struct netbuf *addr_ptr;	/* Preallocated netbuf address */
-{
-	CLIENT *client;
-	enum clnt_stat stat;
-	struct r_rpcb_rmtcallargs a;
-	struct r_rpcb_rmtcallres r;
-	rpcvers_t rpcb_vers;
-
-	stat = 0;
-	client = getclnthandle(host, nconf, NULL);
-	if (client == NULL) {
-		return (RPC_FAILED);
-	}
-	/*LINTED const castaway*/
-	CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *)(void *)&rmttimeout);
-	a.prog = prog;
-	a.vers = vers;
-	a.proc = proc;
-	a.args.args_val = argsp;
-	a.xdr_args = xdrargs;
-	r.addr = NULL;
-	r.results.results_val = resp;
-	r.xdr_res = xdrres;
-
-	for (rpcb_vers = RPCBVERS4; rpcb_vers >= RPCBVERS; rpcb_vers--) {
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&rpcb_vers);
-		stat = CLNT_CALL(client, (rpcproc_t)RPCBPROC_CALLIT,
-		    (xdrproc_t) xdr_rpcb_rmtcallargs, (char *)(void *)&a,
-		    (xdrproc_t) xdr_rpcb_rmtcallres, (char *)(void *)&r, tout);
-		if ((stat == RPC_SUCCESS) && (addr_ptr != NULL)) {
-			struct netbuf *na;
-			/*LINTED const castaway*/
-			na = uaddr2taddr((struct netconfig *) nconf, r.addr);
-			if (!na) {
-				stat = RPC_N2AXLATEFAILURE;
-				/*LINTED const castaway*/
-				((struct netbuf *) addr_ptr)->len = 0;
-				goto error;
-			}
-			if (na->len > addr_ptr->maxlen) {
-				/* Too long address */
-				stat = RPC_FAILED; /* XXX A better error no */
-				free(na->buf);
-				free(na);
-				/*LINTED const castaway*/
-				((struct netbuf *) addr_ptr)->len = 0;
-				goto error;
-			}
-			memcpy(addr_ptr->buf, na->buf, (size_t)na->len);
-			/*LINTED const castaway*/
-			((struct netbuf *)addr_ptr)->len = na->len;
-			free(na->buf);
-			free(na);
-			break;
-		} else if ((stat != RPC_PROGVERSMISMATCH) &&
-			    (stat != RPC_PROGUNAVAIL)) {
-			goto error;
-		}
-	}
-error:
-	CLNT_DESTROY(client);
-	if (r.addr)
-		xdr_free((xdrproc_t) xdr_wrapstring, (char *)(void *)&r.addr);
-	return (stat);
-}
-
-/*
- * Gets the time on the remote host.
- * Returns 1 if succeeds else 0.
- */
-bool_t
-rpcb_gettime(host, timep)
-	const char *host;
-	time_t *timep;
-{
-	CLIENT *client = NULL;
-	void *handle;
-	struct netconfig *nconf;
-	rpcvers_t vers;
-	enum clnt_stat st;
-
-
-	if ((host == NULL) || (host[0] == 0)) {
-		time(timep);
-		return (TRUE);
-	}
-
-	if ((handle = __rpc_setconf("netpath")) == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (FALSE);
-	}
-	rpc_createerr.cf_stat = RPC_SUCCESS;
-	while (client == NULL) {
-		if ((nconf = __rpc_getconf(handle)) == NULL) {
-			if (rpc_createerr.cf_stat == RPC_SUCCESS)
-				rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			break;
-		}
-		client = getclnthandle(host, nconf, NULL);
-		if (client)
-			break;
-	}
-	__rpc_endconf(handle);
-	if (client == (CLIENT *) NULL) {
-		return (FALSE);
-	}
-
-	st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETTIME,
-		(xdrproc_t) xdr_void, NULL,
-		(xdrproc_t) xdr_int, (char *)(void *)timep, tottimeout);
-
-	if ((st == RPC_PROGVERSMISMATCH) || (st == RPC_PROGUNAVAIL)) {
-		CLNT_CONTROL(client, CLGET_VERS, (char *)(void *)&vers);
-		if (vers == RPCBVERS4) {
-			/* fall back to earlier version */
-			vers = RPCBVERS;
-			CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-			st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETTIME,
-				(xdrproc_t) xdr_void, NULL,
-				(xdrproc_t) xdr_int, (char *)(void *)timep,
-				tottimeout);
-		}
-	}
-	CLNT_DESTROY(client);
-	return (st == RPC_SUCCESS? TRUE: FALSE);
-}
-
-/*
- * Converts taddr to universal address.  This routine should never
- * really be called because local n2a libraries are always provided.
- */
-char *
-rpcb_taddr2uaddr(nconf, taddr)
-	struct netconfig *nconf;
-	struct netbuf *taddr;
-{
-	CLIENT *client;
-	char *uaddr = NULL;
-
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-	if (taddr == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (NULL);
-	}
-	client = local_rpcb();
-	if (! client) {
-		return (NULL);
-	}
-
-	CLNT_CALL(client, (rpcproc_t)RPCBPROC_TADDR2UADDR,
-	    (xdrproc_t) xdr_netbuf, (char *)(void *)taddr,
-	    (xdrproc_t) xdr_wrapstring, (char *)(void *)&uaddr, tottimeout);
-	CLNT_DESTROY(client);
-	return (uaddr);
-}
-
-/*
- * Converts universal address to netbuf.  This routine should never
- * really be called because local n2a libraries are always provided.
- */
-struct netbuf *
-rpcb_uaddr2taddr(nconf, uaddr)
-	struct netconfig *nconf;
-	char *uaddr;
-{
-	CLIENT *client;
-	struct netbuf *taddr;
-
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-	if (uaddr == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (NULL);
-	}
-	client = local_rpcb();
-	if (! client) {
-		return (NULL);
-	}
-
-	taddr = (struct netbuf *)calloc(1, sizeof (struct netbuf));
-	if (taddr == NULL) {
-		CLNT_DESTROY(client);
-		return (NULL);
-	}
-	if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_UADDR2TADDR,
-	    (xdrproc_t) xdr_wrapstring, (char *)(void *)&uaddr,
-	    (xdrproc_t) xdr_netbuf, (char *)(void *)taddr,
-	    tottimeout) != RPC_SUCCESS) {
-		free(taddr);
-		taddr = NULL;
-	}
-	CLNT_DESTROY(client);
-	return (taddr);
-}
diff --git a/lib/libc/rpc/rpcb_prot.c b/lib/libc/rpc/rpcb_prot.c
deleted file mode 100644
index eaea1ca..0000000
--- a/lib/libc/rpc/rpcb_prot.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*	$NetBSD: rpcb_prot.c,v 1.3 2000/07/14 08:40:42 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)rpcb_prot.c	1.13	94/04/24 SMI" */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rpcb_prot.c 1.9 89/04/21 Copyr 1984 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_prot.c,v 1.5 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * rpcb_prot.c
- * XDR routines for the rpcbinder version 3.
- *
- * Copyright (C) 1984, 1988, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <rpc/rpc.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/rpcb_prot.h>
-#include "un-namespace.h"
-
-bool_t
-xdr_rpcb(xdrs, objp)
-	XDR *xdrs;
-	RPCB *objp;
-{
-	if (!xdr_uint32_t(xdrs, &objp->r_prog)) {
-		return (FALSE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->r_vers)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_addr, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_owner, (u_int)~0)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- * rpcblist_ptr implements a linked list.  The RPCL definition from
- * rpcb_prot.x is:
- *
- * struct rpcblist {
- * 	rpcb		rpcb_map;
- *	struct rpcblist *rpcb_next;
- * };
- * typedef rpcblist *rpcblist_ptr;
- *
- * Recall that "pointers" in XDR are encoded as a boolean, indicating whether
- * there's any data behind the pointer, followed by the data (if any exists).
- * The boolean can be interpreted as ``more data follows me''; if FALSE then
- * nothing follows the boolean; if TRUE then the boolean is followed by an
- * actual struct rpcb, and another rpcblist_ptr (declared in RPCL as "struct
- * rpcblist *").
- *
- * This could be implemented via the xdr_pointer type, though this would
- * result in one recursive call per element in the list.  Rather than do that
- * we can ``unwind'' the recursion into a while loop and use xdr_reference to
- * serialize the rpcb elements.
- */
-
-bool_t
-xdr_rpcblist_ptr(xdrs, rp)
-	XDR *xdrs;
-	rpcblist_ptr *rp;
-{
-	/*
-	 * more_elements is pre-computed in case the direction is
-	 * XDR_ENCODE or XDR_FREE.  more_elements is overwritten by
-	 * xdr_bool when the direction is XDR_DECODE.
-	 */
-	bool_t more_elements;
-	int freeing = (xdrs->x_op == XDR_FREE);
-	rpcblist_ptr next;
-	rpcblist_ptr next_copy;
-
-	next = NULL;
-	for (;;) {
-		more_elements = (bool_t)(*rp != NULL);
-		if (! xdr_bool(xdrs, &more_elements)) {
-			return (FALSE);
-		}
-		if (! more_elements) {
-			return (TRUE);  /* we are done */
-		}
-		/*
-		 * the unfortunate side effect of non-recursion is that in
-		 * the case of freeing we must remember the next object
-		 * before we free the current object ...
-		 */
-		if (freeing)
-			next = (*rp)->rpcb_next;
-		if (! xdr_reference(xdrs, (caddr_t *)rp,
-		    (u_int)sizeof (rpcblist), (xdrproc_t)xdr_rpcb)) {
-			return (FALSE);
-		}
-		if (freeing) {
-			next_copy = next;
-			rp = &next_copy;
-			/*
-			 * Note that in the subsequent iteration, next_copy
-			 * gets nulled out by the xdr_reference
-			 * but next itself survives.
-			 */
-		} else {
-			rp = &((*rp)->rpcb_next);
-		}
-	}
-	/*NOTREACHED*/
-}
-
-/*
- * xdr_rpcblist() is specified to take a RPCBLIST **, but is identical in
- * functionality to xdr_rpcblist_ptr().
- */
-bool_t
-xdr_rpcblist(xdrs, rp)
-	XDR *xdrs;
-	RPCBLIST **rp;
-{
-	bool_t	dummy;
-
-	dummy = xdr_rpcblist_ptr(xdrs, (rpcblist_ptr *)rp);
-	return (dummy);
-}
-
-
-bool_t
-xdr_rpcb_entry(xdrs, objp)
-	XDR *xdrs;
-	rpcb_entry *objp;
-{
-	if (!xdr_string(xdrs, &objp->r_maddr, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_nc_netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->r_nc_semantics)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_nc_protofmly, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_nc_proto, (u_int)~0)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcb_entry_list_ptr(xdrs, rp)
-	XDR *xdrs;
-	rpcb_entry_list_ptr *rp;
-{
-	/*
-	 * more_elements is pre-computed in case the direction is
-	 * XDR_ENCODE or XDR_FREE.  more_elements is overwritten by
-	 * xdr_bool when the direction is XDR_DECODE.
-	 */
-	bool_t more_elements;
-	int freeing = (xdrs->x_op == XDR_FREE);
-	rpcb_entry_list_ptr next;
-	rpcb_entry_list_ptr next_copy;
-
-	next = NULL;
-	for (;;) {
-		more_elements = (bool_t)(*rp != NULL);
-		if (! xdr_bool(xdrs, &more_elements)) {
-			return (FALSE);
-		}
-		if (! more_elements) {
-			return (TRUE);  /* we are done */
-		}
-		/*
-		 * the unfortunate side effect of non-recursion is that in
-		 * the case of freeing we must remember the next object
-		 * before we free the current object ...
-		 */
-		if (freeing)
-			next = (*rp)->rpcb_entry_next;
-		if (! xdr_reference(xdrs, (caddr_t *)rp,
-		    (u_int)sizeof (rpcb_entry_list),
-				    (xdrproc_t)xdr_rpcb_entry)) {
-			return (FALSE);
-		}
-		if (freeing) {
-			next_copy = next;
-			rp = &next_copy;
-			/*
-			 * Note that in the subsequent iteration, next_copy
-			 * gets nulled out by the xdr_reference
-			 * but next itself survives.
-			 */
-		} else {
-			rp = &((*rp)->rpcb_entry_next);
-		}
-	}
-	/*NOTREACHED*/
-}
-
-/*
- * XDR remote call arguments
- * written for XDR_ENCODE direction only
- */
-bool_t
-xdr_rpcb_rmtcallargs(xdrs, p)
-	XDR *xdrs;
-	struct rpcb_rmtcallargs *p;
-{
-	struct r_rpcb_rmtcallargs *objp =
-	    (struct r_rpcb_rmtcallargs *)(void *)p;
-	u_int lenposition, argposition, position;
-	int32_t *buf;
-
-	buf = XDR_INLINE(xdrs, 3 * BYTES_PER_XDR_UNIT);
-	if (buf == NULL) {
-		if (!xdr_uint32_t(xdrs, &objp->prog)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->vers)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->proc)) {
-			return (FALSE);
-		}
-	} else {
-		IXDR_PUT_U_INT32(buf, objp->prog);
-		IXDR_PUT_U_INT32(buf, objp->vers);
-		IXDR_PUT_U_INT32(buf, objp->proc);
-	}
-
-	/*
-	 * All the jugglery for just getting the size of the arguments
-	 */
-	lenposition = XDR_GETPOS(xdrs);
-	if (! xdr_u_int(xdrs, &(objp->args.args_len))) {
-		return (FALSE);
-	}
-	argposition = XDR_GETPOS(xdrs);
-	if (! (*objp->xdr_args)(xdrs, objp->args.args_val)) {
-		return (FALSE);
-	}
-	position = XDR_GETPOS(xdrs);
-	objp->args.args_len = (u_int)((u_long)position - (u_long)argposition);
-	XDR_SETPOS(xdrs, lenposition);
-	if (! xdr_u_int(xdrs, &(objp->args.args_len))) {
-		return (FALSE);
-	}
-	XDR_SETPOS(xdrs, position);
-	return (TRUE);
-}
-
-/*
- * XDR remote call results
- * written for XDR_DECODE direction only
- */
-bool_t
-xdr_rpcb_rmtcallres(xdrs, p)
-	XDR *xdrs;
-	struct rpcb_rmtcallres *p;
-{
-	bool_t dummy;
-	struct r_rpcb_rmtcallres *objp = (struct r_rpcb_rmtcallres *)(void *)p;
-
-	if (!xdr_string(xdrs, &objp->addr, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_u_int(xdrs, &objp->results.results_len)) {
-		return (FALSE);
-	}
-	dummy = (*(objp->xdr_res))(xdrs, objp->results.results_val);
-	return (dummy);
-}
-
-bool_t
-xdr_netbuf(xdrs, objp)
-	XDR *xdrs;
-	struct netbuf *objp;
-{
-	bool_t dummy;
-
-	if (!xdr_uint32_t(xdrs, (uint32_t *) &objp->maxlen)) {
-		return (FALSE);
-	}
-	dummy = xdr_bytes(xdrs, (char **)&(objp->buf),
-			(u_int *)&(objp->len), objp->maxlen);
-	return (dummy);
-}
diff --git a/lib/libc/rpc/rpcb_st_xdr.c b/lib/libc/rpc/rpcb_st_xdr.c
deleted file mode 100644
index 26b0295..0000000
--- a/lib/libc/rpc/rpcb_st_xdr.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*	$NetBSD: rpcb_st_xdr.c,v 1.3 2000/07/14 08:40:42 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright 1991 Sun Microsystems, Inc.
- * rpcb_stat_xdr.c
- */
-
-/*
- * This file was generated from rpcb_prot.x, but includes only those
- * routines used with the rpcbind stats facility.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcb_st_xdr.c,v 1.3 2002/07/14 23:38:37 alfred Exp $");
-
-#include "namespace.h"
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-/* Link list of all the stats about getport and getaddr */
-
-bool_t
-xdr_rpcbs_addrlist(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_addrlist *objp;
-{
-
-	    if (!xdr_uint32_t(xdrs, &objp->prog)) {
-		return (FALSE);
-	    }
-	    if (!xdr_uint32_t(xdrs, &objp->vers)) {
-		return (FALSE);
-	    }
-	    if (!xdr_int(xdrs, &objp->success)) {
-		return (FALSE);
-	    }
-	    if (!xdr_int(xdrs, &objp->failure)) {
-		return (FALSE);
-	    }
-	    if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	    }
-
-	    if (!xdr_pointer(xdrs, (char **)&objp->next,
-			sizeof (rpcbs_addrlist),
-			(xdrproc_t)xdr_rpcbs_addrlist)) {
-		return (FALSE);
-	    }
-
-	return (TRUE);
-}
-
-/* Link list of all the stats about rmtcall */
-
-bool_t
-xdr_rpcbs_rmtcalllist(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_rmtcalllist *objp;
-{
-	int32_t *buf;
-
-	if (xdrs->x_op == XDR_ENCODE) {
-	buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT);
-	if (buf == NULL) {
-		if (!xdr_uint32_t(xdrs, &objp->prog)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->vers)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->proc)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->success)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->failure)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->indirect)) {
-			return (FALSE);
-		}
-	} else {
-		IXDR_PUT_U_INT32(buf, objp->prog);
-		IXDR_PUT_U_INT32(buf, objp->vers);
-		IXDR_PUT_U_INT32(buf, objp->proc);
-		IXDR_PUT_INT32(buf, objp->success);
-		IXDR_PUT_INT32(buf, objp->failure);
-		IXDR_PUT_INT32(buf, objp->indirect);
-	}
-	if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **)&objp->next,
-			sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-	} else if (xdrs->x_op == XDR_DECODE) {
-	buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT);
-	if (buf == NULL) {
-		if (!xdr_uint32_t(xdrs, &objp->prog)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->vers)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->proc)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->success)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->failure)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->indirect)) {
-			return (FALSE);
-		}
-	} else {
-		objp->prog = (rpcprog_t)IXDR_GET_U_INT32(buf);
-		objp->vers = (rpcvers_t)IXDR_GET_U_INT32(buf);
-		objp->proc = (rpcproc_t)IXDR_GET_U_INT32(buf);
-		objp->success = (int)IXDR_GET_INT32(buf);
-		objp->failure = (int)IXDR_GET_INT32(buf);
-		objp->indirect = (int)IXDR_GET_INT32(buf);
-	}
-	if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **)&objp->next,
-			sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->prog)) {
-		return (FALSE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->vers)) {
-		return (FALSE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->proc)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->success)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->failure)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->indirect)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **)&objp->next,
-			sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcbs_proc(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_proc objp;
-{
-	if (!xdr_vector(xdrs, (char *)(void *)objp, RPCBSTAT_HIGHPROC,
-	    sizeof (int), (xdrproc_t)xdr_int)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcbs_addrlist_ptr(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_addrlist_ptr *objp;
-{
-	if (!xdr_pointer(xdrs, (char **)objp, sizeof (rpcbs_addrlist),
-			(xdrproc_t)xdr_rpcbs_addrlist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcbs_rmtcalllist_ptr(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_rmtcalllist_ptr *objp;
-{
-	if (!xdr_pointer(xdrs, (char **)objp, sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcb_stat(xdrs, objp)
-	XDR *xdrs;
-	rpcb_stat *objp;
-{
-
-	if (!xdr_rpcbs_proc(xdrs, objp->info)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->setinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->unsetinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_rpcbs_addrlist_ptr(xdrs, &objp->addrinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_rpcbs_rmtcalllist_ptr(xdrs, &objp->rmtinfo)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- * One rpcb_stat structure is returned for each version of rpcbind
- * being monitored.
- */
-bool_t
-xdr_rpcb_stat_byvers(xdrs, objp)
-    XDR *xdrs;
-    rpcb_stat_byvers objp;
-{
-	if (!xdr_vector(xdrs, (char *)(void *)objp, RPCBVERS_STAT,
-	    sizeof (rpcb_stat), (xdrproc_t)xdr_rpcb_stat)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
diff --git a/lib/libc/rpc/rpcdname.c b/lib/libc/rpc/rpcdname.c
deleted file mode 100644
index fd97528..0000000
--- a/lib/libc/rpc/rpcdname.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user or with the express written consent of
- * Sun Microsystems, Inc.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rpcdname.c 1.7 91/03/11 Copyr 1989 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rpcdname.c,v 1.5 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * rpcdname.c
- * Gets the default domain name
- */
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include "un-namespace.h"
-
-static char *default_domain = 0;
-
-static char *
-get_default_domain()
-{
-	char temp[256];
-
-	if (default_domain)
-		return (default_domain);
-	if (getdomainname(temp, sizeof(temp)) < 0)
-		return (0);
-	if ((int) strlen(temp) > 0) {
-		default_domain = (char *)malloc((strlen(temp)+(unsigned)1));
-		if (default_domain == 0)
-			return (0);
-		(void) strcpy(default_domain, temp);
-		return (default_domain);
-	}
-	return (0);
-}
-
-/*
- * This is a wrapper for the system call getdomainname which returns a
- * ypclnt.h error code in the failure case.  It also checks to see that
- * the domain name is non-null, knowing that the null string is going to
- * get rejected elsewhere in the NIS client package.
- */
-int
-__rpc_get_default_domain(domain)
-	char **domain;
-{
-	if ((*domain = get_default_domain()) != 0)
-		return (0);
-	return (-1);
-}
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
deleted file mode 100644
index f8883ee..0000000
--- a/lib/libc/rpc/rtime.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * Copyright (c) 1988 by Sun Microsystems, Inc.
-
- */
-
-/*
- * rtime - get time from remote machine
- *
- * gets time, obtaining value from host
- * on the udp/time socket.  Since timeserver returns
- * with time of day in seconds since Jan 1, 1900,  must
- * subtract seconds before Jan 1, 1970 to get
- * what unix uses.
- */
-#include "namespace.h"
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <netdb.h>
-#include "un-namespace.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = 	"@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/rtime.c,v 1.9 2005/03/10 00:57:01 stefanf Exp $");
-
-extern int _rpc_dtablesize( void );
-
-#define NYEARS	(unsigned long)(1970 - 1900)
-#define TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4)))
-
-static void do_close( int );
-
-int
-rtime(addrp, timep, timeout)
-	struct sockaddr_in *addrp;
-	struct timeval *timep;
-	struct timeval *timeout;
-{
-	int s;
-	fd_set readfds;
-	int res;
-	unsigned long thetime;
-	struct sockaddr_in from;
-	socklen_t fromlen;
-	int type;
-	struct servent *serv;
-
-	if (timeout == NULL) {
-		type = SOCK_STREAM;
-	} else {
-		type = SOCK_DGRAM;
-	}
-	s = _socket(AF_INET, type, 0);
-	if (s < 0) {
-		return(-1);
-	}
-	addrp->sin_family = AF_INET;
-
-	/* TCP and UDP port are the same in this case */
-	if ((serv = getservbyname("time", "tcp")) == NULL) {
-		return(-1);
-	}
-
-	addrp->sin_port = serv->s_port;
-
-	if (type == SOCK_DGRAM) {
-		res = _sendto(s, (char *)&thetime, sizeof(thetime), 0, 
-			     (struct sockaddr *)addrp, sizeof(*addrp));
-		if (res < 0) {
-			do_close(s);
-			return(-1);	
-		}
-		do {
-			FD_ZERO(&readfds);
-			FD_SET(s, &readfds);
-			res = _select(_rpc_dtablesize(), &readfds,
-				     (fd_set *)NULL, (fd_set *)NULL, timeout);
-		} while (res < 0 && errno == EINTR);
-		if (res <= 0) {
-			if (res == 0) {
-				errno = ETIMEDOUT;
-			}
-			do_close(s);
-			return(-1);	
-		}
-		fromlen = sizeof(from);
-		res = _recvfrom(s, (char *)&thetime, sizeof(thetime), 0, 
-			       (struct sockaddr *)&from, &fromlen);
-		do_close(s);
-		if (res < 0) {
-			return(-1);	
-		}
-	} else {
-		if (_connect(s, (struct sockaddr *)addrp, sizeof(*addrp)) < 0) {
-			do_close(s);
-			return(-1);
-		}
-		res = _read(s, (char *)&thetime, sizeof(thetime));
-		do_close(s);
-		if (res < 0) {
-			return(-1);
-		}
-	}
-	if (res != sizeof(thetime)) {
-		errno = EIO;
-		return(-1);	
-	}
-	thetime = ntohl(thetime);
-	timep->tv_sec = thetime - TOFFSET;
-	timep->tv_usec = 0;
-	return(0);
-}
-
-static void
-do_close(s)
-	int s;
-{
-	int save;
-
-	save = errno;
-	(void)_close(s);
-	errno = save;
-}
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
deleted file mode 100644
index 4d18b89..0000000
--- a/lib/libc/rpc/svc.c
+++ /dev/null
@@ -1,752 +0,0 @@
-/*	$NetBSD: svc.c,v 1.21 2000/07/06 03:10:35 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc.c	2.4 88/08/11 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc.c,v 1.23 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * svc.c, Server-side remote procedure call interface.
- *
- * There are two sets of procedures here.  The xprt routines are
- * for handling transport handles.  The svc routines handle the
- * list of service routines.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/poll.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#ifdef PORTMAP
-#include <rpc/pmap_clnt.h>
-#endif				/* PORTMAP */
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-
-#define	RQCRED_SIZE	400		/* this size is excessive */
-
-#define SVC_VERSQUIET 0x0001		/* keep quiet about vers mismatch */
-#define version_keepquiet(xp) ((u_long)(xp)->xp_p3 & SVC_VERSQUIET)
-
-#define max(a, b) (a > b ? a : b)
-
-/*
- * The services list
- * Each entry represents a set of procedures (an rpc program).
- * The dispatch routine takes request structs and runs the
- * apropriate procedure.
- */
-static struct svc_callout {
-	struct svc_callout *sc_next;
-	rpcprog_t	    sc_prog;
-	rpcvers_t	    sc_vers;
-	char		   *sc_netid;
-	void		    (*sc_dispatch)(struct svc_req *, SVCXPRT *);
-} *svc_head;
-
-extern rwlock_t svc_lock;
-extern rwlock_t svc_fd_lock;
-
-static struct svc_callout *svc_find(rpcprog_t, rpcvers_t,
-    struct svc_callout **, char *);
-static void __xprt_do_unregister (SVCXPRT *xprt, bool_t dolock);
-
-/* ***************  SVCXPRT related stuff **************** */
-
-/*
- * Activate a transport handle.
- */
-void
-xprt_register(xprt)
-	SVCXPRT *xprt;
-{
-	int sock;
-
-	assert(xprt != NULL);
-
-	sock = xprt->xp_fd;
-
-	rwlock_wrlock(&svc_fd_lock);
-	if (__svc_xports == NULL) {
-		__svc_xports = (SVCXPRT **)
-			mem_alloc(FD_SETSIZE * sizeof(SVCXPRT *));
-		if (__svc_xports == NULL)
-			return;
-		memset(__svc_xports, '\0', FD_SETSIZE * sizeof(SVCXPRT *));
-	}
-	if (sock < FD_SETSIZE) {
-		__svc_xports[sock] = xprt;
-		FD_SET(sock, &svc_fdset);
-		svc_maxfd = max(svc_maxfd, sock);
-	}
-	rwlock_unlock(&svc_fd_lock);
-}
-
-void
-xprt_unregister(SVCXPRT *xprt)
-{
-	__xprt_do_unregister(xprt, TRUE);
-}
-
-void
-__xprt_unregister_unlocked(SVCXPRT *xprt)
-{
-	__xprt_do_unregister(xprt, FALSE);
-}
-
-/*
- * De-activate a transport handle.
- */
-static void
-__xprt_do_unregister(xprt, dolock)
-	SVCXPRT *xprt;
-	bool_t dolock;
-{
-	int sock;
-
-	assert(xprt != NULL);
-
-	sock = xprt->xp_fd;
-
-	if (dolock)
-		rwlock_wrlock(&svc_fd_lock);
-	if ((sock < FD_SETSIZE) && (__svc_xports[sock] == xprt)) {
-		__svc_xports[sock] = NULL;
-		FD_CLR(sock, &svc_fdset);
-		if (sock >= svc_maxfd) {
-			for (svc_maxfd--; svc_maxfd>=0; svc_maxfd--)
-				if (__svc_xports[svc_maxfd])
-					break;
-		}
-	}
-	if (dolock)
-		rwlock_unlock(&svc_fd_lock);
-}
-
-/*
- * Add a service program to the callout list.
- * The dispatch routine will be called when a rpc request for this
- * program number comes in.
- */
-bool_t
-svc_reg(xprt, prog, vers, dispatch, nconf)
-	SVCXPRT *xprt;
-	const rpcprog_t prog;
-	const rpcvers_t vers;
-	void (*dispatch)(struct svc_req *, SVCXPRT *);
-	const struct netconfig *nconf;
-{
-	bool_t dummy;
-	struct svc_callout *prev;
-	struct svc_callout *s;
-	struct netconfig *tnconf;
-	char *netid = NULL;
-	int flag = 0;
-
-/* VARIABLES PROTECTED BY svc_lock: s, prev, svc_head */
-
-	if (xprt->xp_netid) {
-		netid = strdup(xprt->xp_netid);
-		flag = 1;
-	} else if (nconf && nconf->nc_netid) {
-		netid = strdup(nconf->nc_netid);
-		flag = 1;
-	} else if ((tnconf = __rpcgettp(xprt->xp_fd)) != NULL) {
-		netid = strdup(tnconf->nc_netid);
-		flag = 1;
-		freenetconfigent(tnconf);
-	} /* must have been created with svc_raw_create */
-	if ((netid == NULL) && (flag == 1)) {
-		return (FALSE);
-	}
-
-	rwlock_wrlock(&svc_lock);
-	if ((s = svc_find(prog, vers, &prev, netid)) != NULL) {
-		if (netid)
-			free(netid);
-		if (s->sc_dispatch == dispatch)
-			goto rpcb_it; /* he is registering another xptr */
-		rwlock_unlock(&svc_lock);
-		return (FALSE);
-	}
-	s = mem_alloc(sizeof (struct svc_callout));
-	if (s == NULL) {
-		if (netid)
-			free(netid);
-		rwlock_unlock(&svc_lock);
-		return (FALSE);
-	}
-
-	s->sc_prog = prog;
-	s->sc_vers = vers;
-	s->sc_dispatch = dispatch;
-	s->sc_netid = netid;
-	s->sc_next = svc_head;
-	svc_head = s;
-
-	if ((xprt->xp_netid == NULL) && (flag == 1) && netid)
-		((SVCXPRT *) xprt)->xp_netid = strdup(netid);
-
-rpcb_it:
-	rwlock_unlock(&svc_lock);
-	/* now register the information with the local binder service */
-	if (nconf) {
-		/*LINTED const castaway*/
-		dummy = rpcb_set(prog, vers, (struct netconfig *) nconf,
-		&((SVCXPRT *) xprt)->xp_ltaddr);
-		return (dummy);
-	}
-	return (TRUE);
-}
-
-/*
- * Remove a service program from the callout list.
- */
-void
-svc_unreg(prog, vers)
-	const rpcprog_t prog;
-	const rpcvers_t vers;
-{
-	struct svc_callout *prev;
-	struct svc_callout *s;
-
-	/* unregister the information anyway */
-	(void) rpcb_unset(prog, vers, NULL);
-	rwlock_wrlock(&svc_lock);
-	while ((s = svc_find(prog, vers, &prev, NULL)) != NULL) {
-		if (prev == NULL) {
-			svc_head = s->sc_next;
-		} else {
-			prev->sc_next = s->sc_next;
-		}
-		s->sc_next = NULL;
-		if (s->sc_netid)
-			mem_free(s->sc_netid, sizeof (s->sc_netid) + 1);
-		mem_free(s, sizeof (struct svc_callout));
-	}
-	rwlock_unlock(&svc_lock);
-}
-
-/* ********************** CALLOUT list related stuff ************* */
-
-#ifdef PORTMAP
-/*
- * Add a service program to the callout list.
- * The dispatch routine will be called when a rpc request for this
- * program number comes in.
- */
-bool_t
-svc_register(xprt, prog, vers, dispatch, protocol)
-	SVCXPRT *xprt;
-	u_long prog;
-	u_long vers;
-	void (*dispatch)(struct svc_req *, SVCXPRT *);
-	int protocol;
-{
-	struct svc_callout *prev;
-	struct svc_callout *s;
-
-	assert(xprt != NULL);
-	assert(dispatch != NULL);
-
-	if ((s = svc_find((rpcprog_t)prog, (rpcvers_t)vers, &prev, NULL)) !=
-	    NULL) {
-		if (s->sc_dispatch == dispatch)
-			goto pmap_it;  /* he is registering another xptr */
-		return (FALSE);
-	}
-	s = mem_alloc(sizeof(struct svc_callout));
-	if (s == NULL) {
-		return (FALSE);
-	}
-	s->sc_prog = (rpcprog_t)prog;
-	s->sc_vers = (rpcvers_t)vers;
-	s->sc_dispatch = dispatch;
-	s->sc_next = svc_head;
-	svc_head = s;
-pmap_it:
-	/* now register the information with the local binder service */
-	if (protocol) {
-		return (pmap_set(prog, vers, protocol, xprt->xp_port));
-	}
-	return (TRUE);
-}
-
-/*
- * Remove a service program from the callout list.
- */
-void
-svc_unregister(prog, vers)
-	u_long prog;
-	u_long vers;
-{
-	struct svc_callout *prev;
-	struct svc_callout *s;
-
-	if ((s = svc_find((rpcprog_t)prog, (rpcvers_t)vers, &prev, NULL)) ==
-	    NULL)
-		return;
-	if (prev == NULL) {
-		svc_head = s->sc_next;
-	} else {
-		prev->sc_next = s->sc_next;
-	}
-	s->sc_next = NULL;
-	mem_free(s, sizeof(struct svc_callout));
-	/* now unregister the information with the local binder service */
-	(void)pmap_unset(prog, vers);
-}
-#endif				/* PORTMAP */
-
-/*
- * Search the callout list for a program number, return the callout
- * struct.
- */
-static struct svc_callout *
-svc_find(prog, vers, prev, netid)
-	rpcprog_t prog;
-	rpcvers_t vers;
-	struct svc_callout **prev;
-	char *netid;
-{
-	struct svc_callout *s, *p;
-
-	assert(prev != NULL);
-
-	p = NULL;
-	for (s = svc_head; s != NULL; s = s->sc_next) {
-		if (((s->sc_prog == prog) && (s->sc_vers == vers)) &&
-		    ((netid == NULL) || (s->sc_netid == NULL) ||
-		    (strcmp(netid, s->sc_netid) == 0)))
-			break;
-		p = s;
-	}
-	*prev = p;
-	return (s);
-}
-
-/* ******************* REPLY GENERATION ROUTINES  ************ */
-
-/*
- * Send a reply to an rpc request
- */
-bool_t
-svc_sendreply(xprt, xdr_results, xdr_location)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_results;
-	void * xdr_location;
-{
-	struct rpc_msg rply; 
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;  
-	rply.rm_reply.rp_stat = MSG_ACCEPTED; 
-	rply.acpted_rply.ar_verf = xprt->xp_verf; 
-	rply.acpted_rply.ar_stat = SUCCESS;
-	rply.acpted_rply.ar_results.where = xdr_location;
-	rply.acpted_rply.ar_results.proc = xdr_results;
-	return (SVC_REPLY(xprt, &rply)); 
-}
-
-/*
- * No procedure error reply
- */
-void
-svcerr_noproc(xprt)
-	SVCXPRT *xprt;
-{
-	struct rpc_msg rply;
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;
-	rply.rm_reply.rp_stat = MSG_ACCEPTED;
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = PROC_UNAVAIL;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Can't decode args error reply
- */
-void
-svcerr_decode(xprt)
-	SVCXPRT *xprt;
-{
-	struct rpc_msg rply; 
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY; 
-	rply.rm_reply.rp_stat = MSG_ACCEPTED; 
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = GARBAGE_ARGS;
-	SVC_REPLY(xprt, &rply); 
-}
-
-/*
- * Some system error
- */
-void
-svcerr_systemerr(xprt)
-	SVCXPRT *xprt;
-{
-	struct rpc_msg rply; 
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY; 
-	rply.rm_reply.rp_stat = MSG_ACCEPTED; 
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = SYSTEM_ERR;
-	SVC_REPLY(xprt, &rply); 
-}
-
-#if 0
-/*
- * Tell RPC package to not complain about version errors to the client.	 This
- * is useful when revving broadcast protocols that sit on a fixed address.
- * There is really one (or should be only one) example of this kind of
- * protocol: the portmapper (or rpc binder).
- */
-void
-__svc_versquiet_on(xprt)
-	SVCXPRT *xprt;
-{
-	u_long	tmp;
-
-	tmp = ((u_long) xprt->xp_p3) | SVC_VERSQUIET;
-	xprt->xp_p3 = tmp;
-}
-
-void
-__svc_versquiet_off(xprt)
-	SVCXPRT *xprt;
-{
-	u_long	tmp;
-
-	tmp = ((u_long) xprt->xp_p3) & ~SVC_VERSQUIET;
-	xprt->xp_p3 = tmp;
-}
-
-void
-svc_versquiet(xprt)
-	SVCXPRT *xprt;
-{
-	__svc_versquiet_on(xprt);
-}
-
-int
-__svc_versquiet_get(xprt)
-	SVCXPRT *xprt;
-{
-	return ((int) xprt->xp_p3) & SVC_VERSQUIET;
-}
-#endif
-
-/*
- * Authentication error reply
- */
-void
-svcerr_auth(xprt, why)
-	SVCXPRT *xprt;
-	enum auth_stat why;
-{
-	struct rpc_msg rply;
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;
-	rply.rm_reply.rp_stat = MSG_DENIED;
-	rply.rjcted_rply.rj_stat = AUTH_ERROR;
-	rply.rjcted_rply.rj_why = why;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Auth too weak error reply
- */
-void
-svcerr_weakauth(xprt)
-	SVCXPRT *xprt;
-{
-
-	assert(xprt != NULL);
-
-	svcerr_auth(xprt, AUTH_TOOWEAK);
-}
-
-/*
- * Program unavailable error reply
- */
-void 
-svcerr_noprog(xprt)
-	SVCXPRT *xprt;
-{
-	struct rpc_msg rply;  
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;   
-	rply.rm_reply.rp_stat = MSG_ACCEPTED;  
-	rply.acpted_rply.ar_verf = xprt->xp_verf;  
-	rply.acpted_rply.ar_stat = PROG_UNAVAIL;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Program version mismatch error reply
- */
-void  
-svcerr_progvers(xprt, low_vers, high_vers)
-	SVCXPRT *xprt; 
-	rpcvers_t low_vers;
-	rpcvers_t high_vers;
-{
-	struct rpc_msg rply;
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;
-	rply.rm_reply.rp_stat = MSG_ACCEPTED;
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = PROG_MISMATCH;
-	rply.acpted_rply.ar_vers.low = (uint32_t)low_vers;
-	rply.acpted_rply.ar_vers.high = (uint32_t)high_vers;
-	SVC_REPLY(xprt, &rply);
-}
-
-/* ******************* SERVER INPUT STUFF ******************* */
-
-/*
- * Get server side input from some transport.
- *
- * Statement of authentication parameters management:
- * This function owns and manages all authentication parameters, specifically
- * the "raw" parameters (msg.rm_call.cb_cred and msg.rm_call.cb_verf) and
- * the "cooked" credentials (rqst->rq_clntcred).
- * However, this function does not know the structure of the cooked
- * credentials, so it make the following assumptions:
- *   a) the structure is contiguous (no pointers), and
- *   b) the cred structure size does not exceed RQCRED_SIZE bytes.
- * In all events, all three parameters are freed upon exit from this routine.
- * The storage is trivially management on the call stack in user land, but
- * is mallocated in kernel land.
- */
-
-void
-svc_getreq(rdfds)
-	int rdfds;
-{
-	fd_set readfds;
-
-	FD_ZERO(&readfds);
-	readfds.fds_bits[0] = rdfds;
-	svc_getreqset(&readfds);
-}
-
-void
-svc_getreqset(readfds)
-	fd_set *readfds;
-{
-	int bit, fd;
-	fd_mask mask, *maskp;
-	int sock;
-
-	assert(readfds != NULL);
-
-	maskp = readfds->fds_bits;
-	for (sock = 0; sock < FD_SETSIZE; sock += NFDBITS) {
-	    for (mask = *maskp++; (bit = ffs(mask)) != 0;
-		mask ^= (1 << (bit - 1))) {
-		/* sock has input waiting */
-		fd = sock + bit - 1;
-		svc_getreq_common(fd);
-	    }
-	}
-}
-
-void
-svc_getreq_common(fd)
-	int fd;
-{
-	SVCXPRT *xprt;
-	struct svc_req r;
-	struct rpc_msg msg;
-	int prog_found;
-	rpcvers_t low_vers;
-	rpcvers_t high_vers;
-	enum xprt_stat stat;
-	char cred_area[2*MAX_AUTH_BYTES + RQCRED_SIZE];
-
-	msg.rm_call.cb_cred.oa_base = cred_area;
-	msg.rm_call.cb_verf.oa_base = &(cred_area[MAX_AUTH_BYTES]);
-	r.rq_clntcred = &(cred_area[2*MAX_AUTH_BYTES]);
-
-	rwlock_rdlock(&svc_fd_lock);
-	xprt = __svc_xports[fd];
-	rwlock_unlock(&svc_fd_lock);
-	if (xprt == NULL)
-		/* But do we control sock? */
-		return;
-	/* now receive msgs from xprtprt (support batch calls) */
-	do {
-		if (SVC_RECV(xprt, &msg)) {
-
-			/* now find the exported program and call it */
-			struct svc_callout *s;
-			enum auth_stat why;
-
-			r.rq_xprt = xprt;
-			r.rq_prog = msg.rm_call.cb_prog;
-			r.rq_vers = msg.rm_call.cb_vers;
-			r.rq_proc = msg.rm_call.cb_proc;
-			r.rq_cred = msg.rm_call.cb_cred;
-			/* first authenticate the message */
-			if ((why = _authenticate(&r, &msg)) != AUTH_OK) {
-				svcerr_auth(xprt, why);
-				goto call_done;
-			}
-			/* now match message with a registered service*/
-			prog_found = FALSE;
-			low_vers = (rpcvers_t) -1L;
-			high_vers = (rpcvers_t) 0L;
-			for (s = svc_head; s != NULL; s = s->sc_next) {
-				if (s->sc_prog == r.rq_prog) {
-					if (s->sc_vers == r.rq_vers) {
-						(*s->sc_dispatch)(&r, xprt);
-						goto call_done;
-					}  /* found correct version */
-					prog_found = TRUE;
-					if (s->sc_vers < low_vers)
-						low_vers = s->sc_vers;
-					if (s->sc_vers > high_vers)
-						high_vers = s->sc_vers;
-				}   /* found correct program */
-			}
-			/*
-			 * if we got here, the program or version
-			 * is not served ...
-			 */
-			if (prog_found)
-				svcerr_progvers(xprt, low_vers, high_vers);
-			else
-				 svcerr_noprog(xprt);
-			/* Fall through to ... */
-		}
-		/*
-		 * Check if the xprt has been disconnected in a
-		 * recursive call in the service dispatch routine.
-		 * If so, then break.
-		 */
-		rwlock_rdlock(&svc_fd_lock);
-		if (xprt != __svc_xports[fd]) {
-			rwlock_unlock(&svc_fd_lock);
-			break;
-		}
-		rwlock_unlock(&svc_fd_lock);
-call_done:
-		if ((stat = SVC_STAT(xprt)) == XPRT_DIED){
-			SVC_DESTROY(xprt);
-			break;
-		}
-	} while (stat == XPRT_MOREREQS);
-}
-
-
-void
-svc_getreq_poll(pfdp, pollretval)
-	struct pollfd	*pfdp;
-	int	pollretval;
-{
-	int i;
-	int fds_found;
-
-	for (i = fds_found = 0; fds_found < pollretval; i++) {
-		struct pollfd *p = &pfdp[i];
-
-		if (p->revents) {
-			/* fd has input waiting */
-			fds_found++;
-			/*
-			 *	We assume that this function is only called
-			 *	via someone _select()ing from svc_fdset or
-			 *	_poll()ing from svc_pollset[].  Thus it's safe
-			 *	to handle the POLLNVAL event by simply turning
-			 *	the corresponding bit off in svc_fdset.  The
-			 *	svc_pollset[] array is derived from svc_fdset
-			 *	and so will also be updated eventually.
-			 *
-			 *	XXX Should we do an xprt_unregister() instead?
-			 */
-			if (p->revents & POLLNVAL) {
-				rwlock_wrlock(&svc_fd_lock);
-				FD_CLR(p->fd, &svc_fdset);
-				rwlock_unlock(&svc_fd_lock);
-			} else
-				svc_getreq_common(p->fd);
-		}
-	}
-}
-
-bool_t
-rpc_control(int what, void *arg)
-{
-	int val;
-
-	switch (what) {
-	case RPC_SVC_CONNMAXREC_SET:
-		val = *(int *)arg;
-		if (val <= 0)
-			return FALSE;
-		__svc_maxrec = val;
-		return TRUE;
-	case RPC_SVC_CONNMAXREC_GET:
-		*(int *)arg = __svc_maxrec;
-		return TRUE;
-	default:
-		break;
-	}
-	return FALSE;
-}
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
deleted file mode 100644
index ef37b17..0000000
--- a/lib/libc/rpc/svc_auth.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*	$NetBSD: svc_auth.c,v 1.12 2000/07/06 03:10:35 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)svc_auth.c	1.16	94/04/24 SMI"
-static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth.c,v 1.12 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * svc_auth.c, Server-side rpc authenticator interface.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <rpc/rpc.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-/*
- * svcauthsw is the bdevsw of server side authentication.
- *
- * Server side authenticators are called from authenticate by
- * using the client auth struct flavor field to index into svcauthsw.
- * The server auth flavors must implement a routine that looks
- * like:
- *
- *	enum auth_stat
- *	flavorx_auth(rqst, msg)
- *		struct svc_req *rqst;
- *		struct rpc_msg *msg;
- *
- */
-
-/* declarations to allow servers to specify new authentication flavors */
-struct authsvc {
-	int	flavor;
-	enum	auth_stat (*handler)(struct svc_req *, struct rpc_msg *);
-	struct	authsvc	  *next;
-};
-static struct authsvc *Auths = NULL;
-
-/*
- * The call rpc message, msg has been obtained from the wire.  The msg contains
- * the raw form of credentials and verifiers.  authenticate returns AUTH_OK
- * if the msg is successfully authenticated.  If AUTH_OK then the routine also
- * does the following things:
- * set rqst->rq_xprt->verf to the appropriate response verifier;
- * sets rqst->rq_client_cred to the "cooked" form of the credentials.
- *
- * NB: rqst->rq_cxprt->verf must be pre-alloctaed;
- * its length is set appropriately.
- *
- * The caller still owns and is responsible for msg->u.cmb.cred and
- * msg->u.cmb.verf.  The authentication system retains ownership of
- * rqst->rq_client_cred, the cooked credentials.
- *
- * There is an assumption that any flavour less than AUTH_NULL is
- * invalid.
- */
-enum auth_stat
-_authenticate(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-	int cred_flavor;
-	struct authsvc *asp;
-	enum auth_stat dummy;
-	extern mutex_t authsvc_lock;
-
-/* VARIABLES PROTECTED BY authsvc_lock: asp, Auths */
-
-	rqst->rq_cred = msg->rm_call.cb_cred;
-	rqst->rq_xprt->xp_verf.oa_flavor = _null_auth.oa_flavor;
-	rqst->rq_xprt->xp_verf.oa_length = 0;
-	cred_flavor = rqst->rq_cred.oa_flavor;
-	switch (cred_flavor) {
-	case AUTH_NULL:
-		dummy = _svcauth_null(rqst, msg);
-		return (dummy);
-	case AUTH_SYS:
-		dummy = _svcauth_unix(rqst, msg);
-		return (dummy);
-	case AUTH_SHORT:
-		dummy = _svcauth_short(rqst, msg);
-		return (dummy);
-#ifdef DES_BUILTIN
-	case AUTH_DES:
-		dummy = _svcauth_des(rqst, msg);
-		return (dummy);
-#endif
-	default:
-		break;
-	}
-
-	/* flavor doesn't match any of the builtin types, so try new ones */
-	mutex_lock(&authsvc_lock);
-	for (asp = Auths; asp; asp = asp->next) {
-		if (asp->flavor == cred_flavor) {
-			enum auth_stat as;
-
-			as = (*asp->handler)(rqst, msg);
-			mutex_unlock(&authsvc_lock);
-			return (as);
-		}
-	}
-	mutex_unlock(&authsvc_lock);
-
-	return (AUTH_REJECTEDCRED);
-}
-
-/*ARGSUSED*/
-enum auth_stat
-_svcauth_null(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-	return (AUTH_OK);
-}
-
-/*
- *  Allow the rpc service to register new authentication types that it is
- *  prepared to handle.  When an authentication flavor is registered,
- *  the flavor is checked against already registered values.  If not
- *  registered, then a new Auths entry is added on the list.
- *
- *  There is no provision to delete a registration once registered.
- *
- *  This routine returns:
- *	 0 if registration successful
- *	 1 if flavor already registered
- *	-1 if can't register (errno set)
- */
-
-int
-svc_auth_reg(cred_flavor, handler)
-	int cred_flavor;
-	enum auth_stat (*handler)(struct svc_req *, struct rpc_msg *);
-{
-	struct authsvc *asp;
-	extern mutex_t authsvc_lock;
-
-	switch (cred_flavor) {
-	    case AUTH_NULL:
-	    case AUTH_SYS:
-	    case AUTH_SHORT:
-#ifdef DES_BUILTIN
-	    case AUTH_DES:
-#endif
-		/* already registered */
-		return (1);
-
-	    default:
-		mutex_lock(&authsvc_lock);
-		for (asp = Auths; asp; asp = asp->next) {
-			if (asp->flavor == cred_flavor) {
-				/* already registered */
-				mutex_unlock(&authsvc_lock);
-				return (1);
-			}
-		}
-
-		/* this is a new one, so go ahead and register it */
-		asp = mem_alloc(sizeof (*asp));
-		if (asp == NULL) {
-			mutex_unlock(&authsvc_lock);
-			return (-1);
-		}
-		asp->flavor = cred_flavor;
-		asp->handler = handler;
-		asp->next = Auths;
-		Auths = asp;
-		mutex_unlock(&authsvc_lock);
-		break;
-	}
-	return (0);
-}
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
deleted file mode 100644
index 7529c29..0000000
--- a/lib/libc/rpc/svc_auth_des.c
+++ /dev/null
@@ -1,538 +0,0 @@
-
-/*
- * Copyright (c) 1988 by Sun Microsystems, Inc.
- */
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * svcauth_des.c, server-side des authentication
- *
- * We insure for the service the following:
- * (1) The timestamp microseconds do not exceed 1 million.
- * (2) The timestamp plus the window is less than the current time.
- * (3) The timestamp is not less than the one previously
- *     seen in the current session.
- *
- * It is up to the server to determine if the window size is
- * too small .
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <rpc/des_crypt.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_des.h>
-#include <rpc/svc.h>
-#include <rpc/rpc_msg.h>
-#include <rpc/svc_auth.h>
-#include "libc_private.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = 	"@(#)svcauth_des.c	2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_des.c,v 1.9 2002/03/22 23:18:37 obrien Exp $");
-
-extern int key_decryptsession_pk(const char *, netobj *, des_block *);
-
-#define debug(msg)	 printf("svcauth_des: %s\n", msg) 
-
-#define USEC_PER_SEC ((u_long) 1000000L)
-#define BEFORE(t1, t2) timercmp(t1, t2, <)
-
-/*
- * LRU cache of conversation keys and some other useful items.
- */
-#define AUTHDES_CACHESZ 64
-struct cache_entry {
-	des_block key;		/* conversation key */
-	char *rname;		/* client's name */
-	u_int window;		/* credential lifetime window */
-	struct timeval laststamp;	/* detect replays of creds */
-	char *localcred;	/* generic local credential */
-};
-static struct cache_entry *authdes_cache/* [AUTHDES_CACHESZ] */;
-static short *authdes_lru/* [AUTHDES_CACHESZ] */;
-
-static void cache_init();	/* initialize the cache */
-static short cache_spot();	/* find an entry in the cache */
-static void cache_ref(/*short sid*/);	/* note that sid was ref'd */
-
-static void invalidate();	/* invalidate entry in cache */
-
-/*
- * cache statistics 
- */
-static struct {
-	u_long ncachehits;	/* times cache hit, and is not replay */
-	u_long ncachereplays;	/* times cache hit, and is replay */
-	u_long ncachemisses;	/* times cache missed */
-} svcauthdes_stats;
-
-/*
- * Service side authenticator for AUTH_DES
- */
-enum auth_stat
-_svcauth_des(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-
-	long *ixdr;
-	des_block cryptbuf[2];
-	struct authdes_cred *cred;
-	struct authdes_verf verf;
-	int status;
-	struct cache_entry *entry;
-	short sid = 0;
-	des_block *sessionkey;
-	des_block ivec;
-	u_int window;
-	struct timeval timestamp;
-	u_long namelen;
-	struct area {
-		struct authdes_cred area_cred;
-		char area_netname[MAXNETNAMELEN+1];
-	} *area;
-
-	if (authdes_cache == NULL) {
-		cache_init();
-	}
-
-	area = (struct area *)rqst->rq_clntcred;
-	cred = (struct authdes_cred *)&area->area_cred;
-
-	/*
-	 * Get the credential
-	 */
-	ixdr = (long *)msg->rm_call.cb_cred.oa_base;
-	cred->adc_namekind = IXDR_GET_ENUM(ixdr, enum authdes_namekind);
-	switch (cred->adc_namekind) {
-	case ADN_FULLNAME:
-		namelen = IXDR_GET_U_LONG(ixdr);
-		if (namelen > MAXNETNAMELEN) {
-			return (AUTH_BADCRED);
-		}
-		cred->adc_fullname.name = area->area_netname;
-		bcopy((char *)ixdr, cred->adc_fullname.name, 
-			(u_int)namelen);
-		cred->adc_fullname.name[namelen] = 0;
-		ixdr += (RNDUP(namelen) / BYTES_PER_XDR_UNIT);
-		cred->adc_fullname.key.key.high = (u_long)*ixdr++;
-		cred->adc_fullname.key.key.low = (u_long)*ixdr++;
-		cred->adc_fullname.window = (u_long)*ixdr++;
-		break;
-	case ADN_NICKNAME:
-		cred->adc_nickname = (u_long)*ixdr++;
-		break;
-	default:
-		return (AUTH_BADCRED);	
-	}
-
-	/*
-	 * Get the verifier
-	 */
-	ixdr = (long *)msg->rm_call.cb_verf.oa_base;
-	verf.adv_xtimestamp.key.high = (u_long)*ixdr++;
-	verf.adv_xtimestamp.key.low =  (u_long)*ixdr++;
-	verf.adv_int_u = (u_long)*ixdr++;
-
-
-	/*
-	 * Get the conversation key
- 	 */
-	if (cred->adc_namekind == ADN_FULLNAME) {
-		netobj pkey;
-		char pkey_data[1024];
-
-		sessionkey = &cred->adc_fullname.key;
-		if (! getpublickey(cred->adc_fullname.name, pkey_data)) {
-			debug("getpublickey");
-			return(AUTH_BADCRED);
-		}
-		pkey.n_bytes = pkey_data;
-		pkey.n_len = strlen(pkey_data) + 1;
-		if (key_decryptsession_pk(cred->adc_fullname.name, &pkey,
-				       sessionkey) < 0) {
-			debug("decryptsessionkey");
-			return (AUTH_BADCRED); /* key not found */
-		}
-	} else { /* ADN_NICKNAME */	
-		sid = (short)cred->adc_nickname;
-		if (sid < 0 || sid >= AUTHDES_CACHESZ) {
-			debug("bad nickname");
-			return (AUTH_BADCRED);	/* garbled credential */
-		}
-		sessionkey = &authdes_cache[sid].key;
-	}
-
-
-	/*
-	 * Decrypt the timestamp
-	 */
-	cryptbuf[0] = verf.adv_xtimestamp; 
-	if (cred->adc_namekind == ADN_FULLNAME) {
-		cryptbuf[1].key.high = cred->adc_fullname.window;
-		cryptbuf[1].key.low = verf.adv_winverf;
-		ivec.key.high = ivec.key.low = 0;	
-		status = cbc_crypt((char *)sessionkey, (char *)cryptbuf,
-			2*sizeof(des_block), DES_DECRYPT | DES_HW, 
-			(char *)&ivec);
-	} else {
-		status = ecb_crypt((char *)sessionkey, (char *)cryptbuf,
-			sizeof(des_block), DES_DECRYPT | DES_HW);
-	}
-	if (DES_FAILED(status)) {
-		debug("decryption failure");
-		return (AUTH_FAILED);	/* system error */
-	}
-
-	/*
-	 * XDR the decrypted timestamp
-	 */
-	ixdr = (long *)cryptbuf;
-	timestamp.tv_sec = IXDR_GET_LONG(ixdr);
-	timestamp.tv_usec = IXDR_GET_LONG(ixdr);
-
-	/*
- 	 * Check for valid credentials and verifiers.
-	 * They could be invalid because the key was flushed
-	 * out of the cache, and so a new session should begin.
-	 * Be sure and send AUTH_REJECTED{CRED, VERF} if this is the case.
-	 */
-	{
-		struct timeval current;
-		int nick;
-		int winverf;
-
-		if (cred->adc_namekind == ADN_FULLNAME) {
-			window = IXDR_GET_U_LONG(ixdr);
-			winverf = IXDR_GET_U_LONG(ixdr);
-			if (winverf != window - 1) {
-				debug("window verifier mismatch");
-				return (AUTH_BADCRED);	/* garbled credential */
-			}
-			sid = cache_spot(sessionkey, cred->adc_fullname.name, 
-			    &timestamp);
-			if (sid < 0) {
-				debug("replayed credential");
-				return (AUTH_REJECTEDCRED);	/* replay */
-			}
-			nick = 0;
-		} else {	/* ADN_NICKNAME */
-			window = authdes_cache[sid].window;
-			nick = 1;
-		}
-
-		if ((u_long)timestamp.tv_usec >= USEC_PER_SEC) {
-			debug("invalid usecs");
-			/* cached out (bad key), or garbled verifier */
-			return (nick ? AUTH_REJECTEDVERF : AUTH_BADVERF);
-		}
-		if (nick && BEFORE(&timestamp, 
-				   &authdes_cache[sid].laststamp)) {
-			debug("timestamp before last seen");
-			return (AUTH_REJECTEDVERF);	/* replay */
-		}
-		(void) gettimeofday(&current, (struct timezone *)NULL);
-		current.tv_sec -= window;	/* allow for expiration */
-		if (!BEFORE(&current, &timestamp)) {
-			debug("timestamp expired");
-			/* replay, or garbled credential */
-			return (nick ? AUTH_REJECTEDVERF : AUTH_BADCRED);
-		}
-	}
-
-	/*
-	 * Set up the reply verifier
-	 */
-	verf.adv_nickname = (u_long)sid;
-
-	/*
-	 * xdr the timestamp before encrypting
-	 */
-	ixdr = (long *)cryptbuf;
-	IXDR_PUT_LONG(ixdr, timestamp.tv_sec - 1);
-	IXDR_PUT_LONG(ixdr, timestamp.tv_usec);
-
-	/*	 
-	 * encrypt the timestamp
-	 */
-	status = ecb_crypt((char *)sessionkey, (char *)cryptbuf,
-	    sizeof(des_block), DES_ENCRYPT | DES_HW);
-	if (DES_FAILED(status)) {
-		debug("encryption failure");
-		return (AUTH_FAILED);	/* system error */
-	}
-	verf.adv_xtimestamp = cryptbuf[0];
-
-	/*
-	 * Serialize the reply verifier, and update rqst
-	 */
-	ixdr = (long *)msg->rm_call.cb_verf.oa_base;
-	*ixdr++ = (long)verf.adv_xtimestamp.key.high;
-	*ixdr++ = (long)verf.adv_xtimestamp.key.low;
-	*ixdr++ = (long)verf.adv_int_u;
-
-	rqst->rq_xprt->xp_verf.oa_flavor = AUTH_DES;
-	rqst->rq_xprt->xp_verf.oa_base = msg->rm_call.cb_verf.oa_base;
-	rqst->rq_xprt->xp_verf.oa_length = 
-		(char *)ixdr - msg->rm_call.cb_verf.oa_base;
-
-	/*
-	 * We succeeded, commit the data to the cache now and
-	 * finish cooking the credential.
-	 */
-	entry = &authdes_cache[sid];
-	entry->laststamp = timestamp;
-	cache_ref(sid);
-	if (cred->adc_namekind == ADN_FULLNAME) {
-		cred->adc_fullname.window = window;
-		cred->adc_nickname = (u_long)sid;	/* save nickname */
-		if (entry->rname != NULL) {
-			mem_free(entry->rname, strlen(entry->rname) + 1);
-		}
-		entry->rname = (char *)mem_alloc((u_int)strlen(cred->adc_fullname.name)
-					 + 1);
-		if (entry->rname != NULL) {
-			(void) strcpy(entry->rname, cred->adc_fullname.name);
-		} else {
-			debug("out of memory");
-		}
-		entry->key = *sessionkey;
-		entry->window = window;
-		invalidate(entry->localcred); /* mark any cached cred invalid */
-	} else { /* ADN_NICKNAME */
-		/*
-		 * nicknames are cooked into fullnames
-		 */	
-		cred->adc_namekind = ADN_FULLNAME;
-		cred->adc_fullname.name = entry->rname;
-		cred->adc_fullname.key = entry->key;
-		cred->adc_fullname.window = entry->window;
-	}
-	return (AUTH_OK);	/* we made it!*/
-}
-
-
-/*
- * Initialize the cache
- */
-static void
-cache_init()
-{
-	int i;
-
-	authdes_cache = (struct cache_entry *)
-		mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ);	
-	bzero((char *)authdes_cache, 
-		sizeof(struct cache_entry) * AUTHDES_CACHESZ);
-
-	authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ);
-	/*
-	 * Initialize the lru list
-	 */
-	for (i = 0; i < AUTHDES_CACHESZ; i++) {
-		authdes_lru[i] = i;
-	}
-}
-
-
-/*
- * Find the lru victim
- */
-static short
-cache_victim()
-{
-	return (authdes_lru[AUTHDES_CACHESZ-1]);
-}
-
-/*
- * Note that sid was referenced
- */
-static void
-cache_ref(sid)
-	short sid;
-{
-	int i;
-	short curr;
-	short prev;
-
-	prev = authdes_lru[0];
-	authdes_lru[0] = sid;
-	for (i = 1; prev != sid; i++) {
-		curr = authdes_lru[i];
-		authdes_lru[i] = prev;
-		prev = curr;
-	}
-}
-
-
-/*
- * Find a spot in the cache for a credential containing
- * the items given.  Return -1 if a replay is detected, otherwise
- * return the spot in the cache.
- */
-static short
-cache_spot(key, name, timestamp)
-	des_block *key;
-	char *name;
-	struct timeval *timestamp;
-{
-	struct cache_entry *cp;
-	int i;
-	u_long hi;
-
-	hi = key->key.high;
-	for (cp = authdes_cache, i = 0; i < AUTHDES_CACHESZ; i++, cp++) {
-		if (cp->key.key.high == hi && 
-		    cp->key.key.low == key->key.low &&
-		    cp->rname != NULL &&
-		    bcmp(cp->rname, name, strlen(name) + 1) == 0) {
-			if (BEFORE(timestamp, &cp->laststamp)) {
-				svcauthdes_stats.ncachereplays++;
-				return (-1); /* replay */
-			}
-			svcauthdes_stats.ncachehits++;
-			return (i);	/* refresh */
-		}
-	}
-	svcauthdes_stats.ncachemisses++;
-	return (cache_victim());	/* new credential */
-}
-
-
-#if (defined(sun) || defined(vax) || defined(__FreeBSD__))
-/*
- * Local credential handling stuff.
- * NOTE: bsd unix dependent.
- * Other operating systems should put something else here.
- */
-#define UNKNOWN 	-2	/* grouplen, if cached cred is unknown user */
-#define INVALID		-1 	/* grouplen, if cache entry is invalid */
-
-struct bsdcred {
-	short uid;		/* cached uid */
-	short gid;		/* cached gid */
-	short grouplen;	/* length of cached groups */
-	short groups[NGROUPS];	/* cached groups */
-};
-
-/*
- * Map a des credential into a unix cred.
- * We cache the credential here so the application does
- * not have to make an rpc call every time to interpret
- * the credential.
- */
-int
-authdes_getucred(adc, uid, gid, grouplen, groups)
-	struct authdes_cred *adc;
-	uid_t *uid;
-	gid_t *gid;
-	int *grouplen;
-	gid_t *groups;
-{
-	unsigned sid;
-	int i;
-	uid_t i_uid;	
-	gid_t i_gid;
-	int i_grouplen;
-	struct bsdcred *cred;
-
-	sid = adc->adc_nickname;
-	if (sid >= AUTHDES_CACHESZ) {
-		debug("invalid nickname");
-		return (0);
-	}
-	cred = (struct bsdcred *)authdes_cache[sid].localcred;
-	if (cred == NULL) {
-		cred = (struct bsdcred *)mem_alloc(sizeof(struct bsdcred));
-		authdes_cache[sid].localcred = (char *)cred;
-		cred->grouplen = INVALID;
-	}
-	if (cred->grouplen == INVALID) {
-		/*
-		 * not in cache: lookup
-		 */
-		if (!netname2user(adc->adc_fullname.name, &i_uid, &i_gid, 
-			&i_grouplen, groups))
-		{
-			debug("unknown netname");
-			cred->grouplen = UNKNOWN;	/* mark as lookup up, but not found */
-			return (0);
-		}
-		debug("missed ucred cache");
-		*uid = cred->uid = i_uid;
-		*gid = cred->gid = i_gid;
-		*grouplen = cred->grouplen = i_grouplen;
-		for (i = i_grouplen - 1; i >= 0; i--) {
-			cred->groups[i] = groups[i]; /* int to short */
-		}
-		return (1);
-	} else if (cred->grouplen == UNKNOWN) {
-		/*
-		 * Already lookup up, but no match found
-		 */	
-		return (0);
-	}
-
-	/*
-	 * cached credentials
-	 */
-	*uid = cred->uid;
-	*gid = cred->gid;
-	*grouplen = cred->grouplen;
-	for (i = cred->grouplen - 1; i >= 0; i--) {
-		groups[i] = cred->groups[i];	/* short to int */
-	}
-	return (1);
-}
-
-static void
-invalidate(cred)
-	char *cred;
-{
-	if (cred == NULL) {
-		return;
-	}
-	((struct bsdcred *)cred)->grouplen = INVALID;
-}
-#endif
-
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
deleted file mode 100644
index d84afbb..0000000
--- a/lib/libc/rpc/svc_auth_unix.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_auth_unix.c,v 1.11 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * svc_auth_unix.c
- * Handles UNIX flavor authentication parameters on the service side of rpc.
- * There are two svc auth implementations here: AUTH_UNIX and AUTH_SHORT.
- * _svcauth_unix does full blown unix style uid,gid+gids auth,
- * _svcauth_short uses a shorthand auth to index into a cache of longhand auths.
- * Note: the shorthand has been gutted for efficiency.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-/*
- * Unix longhand authenticator
- */
-enum auth_stat
-_svcauth_unix(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-	enum auth_stat stat;
-	XDR xdrs;
-	struct authunix_parms *aup;
-	int32_t *buf;
-	struct area {
-		struct authunix_parms area_aup;
-		char area_machname[MAX_MACHINE_NAME+1];
-		int area_gids[NGRPS];
-	} *area;
-	u_int auth_len;
-	size_t str_len, gid_len;
-	u_int i;
-
-	assert(rqst != NULL);
-	assert(msg != NULL);
-
-	area = (struct area *) rqst->rq_clntcred;
-	aup = &area->area_aup;
-	aup->aup_machname = area->area_machname;
-	aup->aup_gids = area->area_gids;
-	auth_len = (u_int)msg->rm_call.cb_cred.oa_length;
-	xdrmem_create(&xdrs, msg->rm_call.cb_cred.oa_base, auth_len,XDR_DECODE);
-	buf = XDR_INLINE(&xdrs, auth_len);
-	if (buf != NULL) {
-		aup->aup_time = IXDR_GET_INT32(buf);
-		str_len = (size_t)IXDR_GET_U_INT32(buf);
-		if (str_len > MAX_MACHINE_NAME) {
-			stat = AUTH_BADCRED;
-			goto done;
-		}
-		memmove(aup->aup_machname, buf, str_len);
-		aup->aup_machname[str_len] = 0;
-		str_len = RNDUP(str_len);
-		buf += str_len / sizeof (int32_t);
-		aup->aup_uid = (int)IXDR_GET_INT32(buf);
-		aup->aup_gid = (int)IXDR_GET_INT32(buf);
-		gid_len = (size_t)IXDR_GET_U_INT32(buf);
-		if (gid_len > NGRPS) {
-			stat = AUTH_BADCRED;
-			goto done;
-		}
-		aup->aup_len = gid_len;
-		for (i = 0; i < gid_len; i++) {
-			aup->aup_gids[i] = (int)IXDR_GET_INT32(buf);
-		}
-		/*
-		 * five is the smallest unix credentials structure -
-		 * timestamp, hostname len (0), uid, gid, and gids len (0).
-		 */
-		if ((5 + gid_len) * BYTES_PER_XDR_UNIT + str_len > auth_len) {
-			(void) printf("bad auth_len gid %ld str %ld auth %u\n",
-			    (long)gid_len, (long)str_len, auth_len);
-			stat = AUTH_BADCRED;
-			goto done;
-		}
-	} else if (! xdr_authunix_parms(&xdrs, aup)) {
-		xdrs.x_op = XDR_FREE;
-		(void)xdr_authunix_parms(&xdrs, aup);
-		stat = AUTH_BADCRED;
-		goto done;
-	}
-
-       /* get the verifier */
-	if ((u_int)msg->rm_call.cb_verf.oa_length) {
-		rqst->rq_xprt->xp_verf.oa_flavor =
-			msg->rm_call.cb_verf.oa_flavor;
-		rqst->rq_xprt->xp_verf.oa_base =
-			msg->rm_call.cb_verf.oa_base;
-		rqst->rq_xprt->xp_verf.oa_length =
-			msg->rm_call.cb_verf.oa_length;
-	} else {
-		rqst->rq_xprt->xp_verf.oa_flavor = AUTH_NULL;
-		rqst->rq_xprt->xp_verf.oa_length = 0;
-	}
-	stat = AUTH_OK;
-done:
-	XDR_DESTROY(&xdrs);
-	return (stat);
-}
-
-
-/*
- * Shorthand unix authenticator
- * Looks up longhand in a cache.
- */
-/*ARGSUSED*/
-enum auth_stat 
-_svcauth_short(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-	return (AUTH_REJECTEDCRED);
-}
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
deleted file mode 100644
index 26dca6d..0000000
--- a/lib/libc/rpc/svc_dg.c
+++ /dev/null
@@ -1,605 +0,0 @@
-/*	$NetBSD: svc_dg.c,v 1.4 2000/07/06 03:10:35 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)svc_dg.c	1.17	94/04/24 SMI"
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_dg.c,v 1.7 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * svc_dg.c, Server side for connectionless RPC.
- *
- * Does some caching in the hopes of achieving execute-at-most-once semantics.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <rpc/rpc.h>
-#include <rpc/svc_dg.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef RPC_CACHE_DEBUG
-#include <netconfig.h>
-#include <netdir.h>
-#endif
-#include <err.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-
-#define	su_data(xprt)	((struct svc_dg_data *)(xprt->xp_p2))
-#define	rpc_buffer(xprt) ((xprt)->xp_p1)
-
-#ifndef MAX
-#define	MAX(a, b)	(((a) > (b)) ? (a) : (b))
-#endif
-
-static void svc_dg_ops(SVCXPRT *);
-static enum xprt_stat svc_dg_stat(SVCXPRT *);
-static bool_t svc_dg_recv(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_dg_reply(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_dg_getargs(SVCXPRT *, xdrproc_t, void *);
-static bool_t svc_dg_freeargs(SVCXPRT *, xdrproc_t, void *);
-static void svc_dg_destroy(SVCXPRT *);
-static bool_t svc_dg_control(SVCXPRT *, const u_int, void *);
-static int cache_get(SVCXPRT *, struct rpc_msg *, char **, size_t *);
-static void cache_set(SVCXPRT *, size_t);
-int svc_dg_enablecache(SVCXPRT *, u_int);
-
-/*
- * Usage:
- *	xprt = svc_dg_create(sock, sendsize, recvsize);
- * Does other connectionless specific initializations.
- * Once *xprt is initialized, it is registered.
- * see (svc.h, xprt_register). If recvsize or sendsize are 0 suitable
- * system defaults are chosen.
- * The routines returns NULL if a problem occurred.
- */
-static const char svc_dg_str[] = "svc_dg_create: %s";
-static const char svc_dg_err1[] = "could not get transport information";
-static const char svc_dg_err2[] = " transport does not support data transfer";
-static const char __no_mem_str[] = "out of memory";
-
-SVCXPRT *
-svc_dg_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-	SVCXPRT *xprt;
-	struct svc_dg_data *su = NULL;
-	struct __rpc_sockinfo si;
-	struct sockaddr_storage ss;
-	socklen_t slen;
-
-	if (!__rpc_fd2sockinfo(fd, &si)) {
-		warnx(svc_dg_str, svc_dg_err1);
-		return (NULL);
-	}
-	/*
-	 * Find the receive and the send size
-	 */
-	sendsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsize);
-	recvsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsize);
-	if ((sendsize == 0) || (recvsize == 0)) {
-		warnx(svc_dg_str, svc_dg_err2);
-		return (NULL);
-	}
-
-	xprt = mem_alloc(sizeof (SVCXPRT));
-	if (xprt == NULL)
-		goto freedata;
-	memset(xprt, 0, sizeof (SVCXPRT));
-
-	su = mem_alloc(sizeof (*su));
-	if (su == NULL)
-		goto freedata;
-	su->su_iosz = ((MAX(sendsize, recvsize) + 3) / 4) * 4;
-	if ((rpc_buffer(xprt) = mem_alloc(su->su_iosz)) == NULL)
-		goto freedata;
-	xdrmem_create(&(su->su_xdrs), rpc_buffer(xprt), su->su_iosz,
-		XDR_DECODE);
-	su->su_cache = NULL;
-	xprt->xp_fd = fd;
-	xprt->xp_p2 = su;
-	xprt->xp_verf.oa_base = su->su_verfbody;
-	svc_dg_ops(xprt);
-	xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
-
-	slen = sizeof ss;
-	if (_getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) < 0)
-		goto freedata;
-	xprt->xp_ltaddr.buf = mem_alloc(sizeof (struct sockaddr_storage));
-	xprt->xp_ltaddr.maxlen = sizeof (struct sockaddr_storage);
-	xprt->xp_ltaddr.len = slen;
-	memcpy(xprt->xp_ltaddr.buf, &ss, slen);
-
-	xprt_register(xprt);
-	return (xprt);
-freedata:
-	(void) warnx(svc_dg_str, __no_mem_str);
-	if (xprt) {
-		if (su)
-			(void) mem_free(su, sizeof (*su));
-		(void) mem_free(xprt, sizeof (SVCXPRT));
-	}
-	return (NULL);
-}
-
-/*ARGSUSED*/
-static enum xprt_stat
-svc_dg_stat(xprt)
-	SVCXPRT *xprt;
-{
-	return (XPRT_IDLE);
-}
-
-static bool_t
-svc_dg_recv(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct svc_dg_data *su = su_data(xprt);
-	XDR *xdrs = &(su->su_xdrs);
-	char *reply;
-	struct sockaddr_storage ss;
-	socklen_t alen;
-	size_t replylen;
-	ssize_t rlen;
-
-again:
-	alen = sizeof (struct sockaddr_storage);
-	rlen = _recvfrom(xprt->xp_fd, rpc_buffer(xprt), su->su_iosz, 0,
-	    (struct sockaddr *)(void *)&ss, &alen);
-	if (rlen == -1 && errno == EINTR)
-		goto again;
-	if (rlen == -1 || (rlen < (ssize_t)(4 * sizeof (uint32_t))))
-		return (FALSE);
-	if (xprt->xp_rtaddr.len < alen) {
-		if (xprt->xp_rtaddr.len != 0)
-			mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.len);
-		xprt->xp_rtaddr.buf = mem_alloc(alen);
-		xprt->xp_rtaddr.len = alen;
-	}
-	memcpy(xprt->xp_rtaddr.buf, &ss, alen);
-#ifdef PORTMAP
-	if (ss.ss_family == AF_INET) {
-		xprt->xp_raddr = *(struct sockaddr_in *)xprt->xp_rtaddr.buf;
-		xprt->xp_addrlen = sizeof (struct sockaddr_in);
-	}
-#endif				/* PORTMAP */
-	xdrs->x_op = XDR_DECODE;
-	XDR_SETPOS(xdrs, 0);
-	if (! xdr_callmsg(xdrs, msg)) {
-		return (FALSE);
-	}
-	su->su_xid = msg->rm_xid;
-	if (su->su_cache != NULL) {
-		if (cache_get(xprt, msg, &reply, &replylen)) {
-			(void)_sendto(xprt->xp_fd, reply, replylen, 0,
-			    (struct sockaddr *)(void *)&ss, alen);
-			return (FALSE);
-		}
-	}
-	return (TRUE);
-}
-
-static bool_t
-svc_dg_reply(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct svc_dg_data *su = su_data(xprt);
-	XDR *xdrs = &(su->su_xdrs);
-	bool_t stat = FALSE;
-	size_t slen;
-
-	xdrs->x_op = XDR_ENCODE;
-	XDR_SETPOS(xdrs, 0);
-	msg->rm_xid = su->su_xid;
-	if (xdr_replymsg(xdrs, msg)) {
-		slen = XDR_GETPOS(xdrs);
-		if (_sendto(xprt->xp_fd, rpc_buffer(xprt), slen, 0,
-		    (struct sockaddr *)xprt->xp_rtaddr.buf,
-		    (socklen_t)xprt->xp_rtaddr.len) == (ssize_t) slen) {
-			stat = TRUE;
-			if (su->su_cache)
-				cache_set(xprt, slen);
-		}
-	}
-	return (stat);
-}
-
-static bool_t
-svc_dg_getargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr);
-}
-
-static bool_t
-svc_dg_freeargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	XDR *xdrs = &(su_data(xprt)->su_xdrs);
-
-	xdrs->x_op = XDR_FREE;
-	return (*xdr_args)(xdrs, args_ptr);
-}
-
-static void
-svc_dg_destroy(xprt)
-	SVCXPRT *xprt;
-{
-	struct svc_dg_data *su = su_data(xprt);
-
-	xprt_unregister(xprt);
-	if (xprt->xp_fd != -1)
-		(void)_close(xprt->xp_fd);
-	XDR_DESTROY(&(su->su_xdrs));
-	(void) mem_free(rpc_buffer(xprt), su->su_iosz);
-	(void) mem_free(su, sizeof (*su));
-	if (xprt->xp_rtaddr.buf)
-		(void) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
-	if (xprt->xp_ltaddr.buf)
-		(void) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen);
-	if (xprt->xp_tp)
-		(void) free(xprt->xp_tp);
-	(void) mem_free(xprt, sizeof (SVCXPRT));
-}
-
-static bool_t
-/*ARGSUSED*/
-svc_dg_control(xprt, rq, in)
-	SVCXPRT *xprt;
-	const u_int	rq;
-	void		*in;
-{
-	return (FALSE);
-}
-
-static void
-svc_dg_ops(xprt)
-	SVCXPRT *xprt;
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-	extern mutex_t ops_lock;
-
-/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = svc_dg_recv;
-		ops.xp_stat = svc_dg_stat;
-		ops.xp_getargs = svc_dg_getargs;
-		ops.xp_reply = svc_dg_reply;
-		ops.xp_freeargs = svc_dg_freeargs;
-		ops.xp_destroy = svc_dg_destroy;
-		ops2.xp_control = svc_dg_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
-
-/*  The CACHING COMPONENT */
-
-/*
- * Could have been a separate file, but some part of it depends upon the
- * private structure of the client handle.
- *
- * Fifo cache for cl server
- * Copies pointers to reply buffers into fifo cache
- * Buffers are sent again if retransmissions are detected.
- */
-
-#define	SPARSENESS 4	/* 75% sparse */
-
-#define	ALLOC(type, size)	\
-	(type *) mem_alloc((sizeof (type) * (size)))
-
-#define	MEMZERO(addr, type, size)	 \
-	(void) memset((void *) (addr), 0, sizeof (type) * (int) (size))
-
-#define	FREE(addr, type, size)	\
-	mem_free((addr), (sizeof (type) * (size)))
-
-/*
- * An entry in the cache
- */
-typedef struct cache_node *cache_ptr;
-struct cache_node {
-	/*
-	 * Index into cache is xid, proc, vers, prog and address
-	 */
-	uint32_t cache_xid;
-	rpcproc_t cache_proc;
-	rpcvers_t cache_vers;
-	rpcprog_t cache_prog;
-	struct netbuf cache_addr;
-	/*
-	 * The cached reply and length
-	 */
-	char *cache_reply;
-	size_t cache_replylen;
-	/*
-	 * Next node on the list, if there is a collision
-	 */
-	cache_ptr cache_next;
-};
-
-/*
- * The entire cache
- */
-struct cl_cache {
-	u_int uc_size;		/* size of cache */
-	cache_ptr *uc_entries;	/* hash table of entries in cache */
-	cache_ptr *uc_fifo;	/* fifo list of entries in cache */
-	u_int uc_nextvictim;	/* points to next victim in fifo list */
-	rpcprog_t uc_prog;	/* saved program number */
-	rpcvers_t uc_vers;	/* saved version number */
-	rpcproc_t uc_proc;	/* saved procedure number */
-};
-
-
-/*
- * the hashing function
- */
-#define	CACHE_LOC(transp, xid)	\
-	(xid % (SPARSENESS * ((struct cl_cache *) \
-		su_data(transp)->su_cache)->uc_size))
-
-extern mutex_t	dupreq_lock;
-
-/*
- * Enable use of the cache. Returns 1 on success, 0 on failure.
- * Note: there is no disable.
- */
-static const char cache_enable_str[] = "svc_enablecache: %s %s";
-static const char alloc_err[] = "could not allocate cache ";
-static const char enable_err[] = "cache already enabled";
-
-int
-svc_dg_enablecache(transp, size)
-	SVCXPRT *transp;
-	u_int size;
-{
-	struct svc_dg_data *su = su_data(transp);
-	struct cl_cache *uc;
-
-	mutex_lock(&dupreq_lock);
-	if (su->su_cache != NULL) {
-		(void) warnx(cache_enable_str, enable_err, " ");
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	uc = ALLOC(struct cl_cache, 1);
-	if (uc == NULL) {
-		warnx(cache_enable_str, alloc_err, " ");
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	uc->uc_size = size;
-	uc->uc_nextvictim = 0;
-	uc->uc_entries = ALLOC(cache_ptr, size * SPARSENESS);
-	if (uc->uc_entries == NULL) {
-		warnx(cache_enable_str, alloc_err, "data");
-		FREE(uc, struct cl_cache, 1);
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	MEMZERO(uc->uc_entries, cache_ptr, size * SPARSENESS);
-	uc->uc_fifo = ALLOC(cache_ptr, size);
-	if (uc->uc_fifo == NULL) {
-		warnx(cache_enable_str, alloc_err, "fifo");
-		FREE(uc->uc_entries, cache_ptr, size * SPARSENESS);
-		FREE(uc, struct cl_cache, 1);
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	MEMZERO(uc->uc_fifo, cache_ptr, size);
-	su->su_cache = (char *)(void *)uc;
-	mutex_unlock(&dupreq_lock);
-	return (1);
-}
-
-/*
- * Set an entry in the cache.  It assumes that the uc entry is set from
- * the earlier call to cache_get() for the same procedure.  This will always
- * happen because cache_get() is calle by svc_dg_recv and cache_set() is called
- * by svc_dg_reply().  All this hoopla because the right RPC parameters are
- * not available at svc_dg_reply time.
- */
-
-static const char cache_set_str[] = "cache_set: %s";
-static const char cache_set_err1[] = "victim not found";
-static const char cache_set_err2[] = "victim alloc failed";
-static const char cache_set_err3[] = "could not allocate new rpc buffer";
-
-static void
-cache_set(xprt, replylen)
-	SVCXPRT *xprt;
-	size_t replylen;
-{
-	cache_ptr victim;
-	cache_ptr *vicp;
-	struct svc_dg_data *su = su_data(xprt);
-	struct cl_cache *uc = (struct cl_cache *) su->su_cache;
-	u_int loc;
-	char *newbuf;
-#ifdef RPC_CACHE_DEBUG
-	struct netconfig *nconf;
-	char *uaddr;
-#endif
-
-	mutex_lock(&dupreq_lock);
-	/*
-	 * Find space for the new entry, either by
-	 * reusing an old entry, or by mallocing a new one
-	 */
-	victim = uc->uc_fifo[uc->uc_nextvictim];
-	if (victim != NULL) {
-		loc = CACHE_LOC(xprt, victim->cache_xid);
-		for (vicp = &uc->uc_entries[loc];
-			*vicp != NULL && *vicp != victim;
-			vicp = &(*vicp)->cache_next)
-			;
-		if (*vicp == NULL) {
-			warnx(cache_set_str, cache_set_err1);
-			mutex_unlock(&dupreq_lock);
-			return;
-		}
-		*vicp = victim->cache_next;	/* remove from cache */
-		newbuf = victim->cache_reply;
-	} else {
-		victim = ALLOC(struct cache_node, 1);
-		if (victim == NULL) {
-			warnx(cache_set_str, cache_set_err2);
-			mutex_unlock(&dupreq_lock);
-			return;
-		}
-		newbuf = mem_alloc(su->su_iosz);
-		if (newbuf == NULL) {
-			warnx(cache_set_str, cache_set_err3);
-			FREE(victim, struct cache_node, 1);
-			mutex_unlock(&dupreq_lock);
-			return;
-		}
-	}
-
-	/*
-	 * Store it away
-	 */
-#ifdef RPC_CACHE_DEBUG
-	if (nconf = getnetconfigent(xprt->xp_netid)) {
-		uaddr = taddr2uaddr(nconf, &xprt->xp_rtaddr);
-		freenetconfigent(nconf);
-		printf(
-	"cache set for xid= %x prog=%d vers=%d proc=%d for rmtaddr=%s\n",
-			su->su_xid, uc->uc_prog, uc->uc_vers,
-			uc->uc_proc, uaddr);
-		free(uaddr);
-	}
-#endif
-	victim->cache_replylen = replylen;
-	victim->cache_reply = rpc_buffer(xprt);
-	rpc_buffer(xprt) = newbuf;
-	xdrmem_create(&(su->su_xdrs), rpc_buffer(xprt),
-			su->su_iosz, XDR_ENCODE);
-	victim->cache_xid = su->su_xid;
-	victim->cache_proc = uc->uc_proc;
-	victim->cache_vers = uc->uc_vers;
-	victim->cache_prog = uc->uc_prog;
-	victim->cache_addr = xprt->xp_rtaddr;
-	victim->cache_addr.buf = ALLOC(char, xprt->xp_rtaddr.len);
-	(void) memcpy(victim->cache_addr.buf, xprt->xp_rtaddr.buf,
-	    (size_t)xprt->xp_rtaddr.len);
-	loc = CACHE_LOC(xprt, victim->cache_xid);
-	victim->cache_next = uc->uc_entries[loc];
-	uc->uc_entries[loc] = victim;
-	uc->uc_fifo[uc->uc_nextvictim++] = victim;
-	uc->uc_nextvictim %= uc->uc_size;
-	mutex_unlock(&dupreq_lock);
-}
-
-/*
- * Try to get an entry from the cache
- * return 1 if found, 0 if not found and set the stage for cache_set()
- */
-static int
-cache_get(xprt, msg, replyp, replylenp)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-	char **replyp;
-	size_t *replylenp;
-{
-	u_int loc;
-	cache_ptr ent;
-	struct svc_dg_data *su = su_data(xprt);
-	struct cl_cache *uc = (struct cl_cache *) su->su_cache;
-#ifdef RPC_CACHE_DEBUG
-	struct netconfig *nconf;
-	char *uaddr;
-#endif
-
-	mutex_lock(&dupreq_lock);
-	loc = CACHE_LOC(xprt, su->su_xid);
-	for (ent = uc->uc_entries[loc]; ent != NULL; ent = ent->cache_next) {
-		if (ent->cache_xid == su->su_xid &&
-			ent->cache_proc == msg->rm_call.cb_proc &&
-			ent->cache_vers == msg->rm_call.cb_vers &&
-			ent->cache_prog == msg->rm_call.cb_prog &&
-			ent->cache_addr.len == xprt->xp_rtaddr.len &&
-			(memcmp(ent->cache_addr.buf, xprt->xp_rtaddr.buf,
-				xprt->xp_rtaddr.len) == 0)) {
-#ifdef RPC_CACHE_DEBUG
-			if (nconf = getnetconfigent(xprt->xp_netid)) {
-				uaddr = taddr2uaddr(nconf, &xprt->xp_rtaddr);
-				freenetconfigent(nconf);
-				printf(
-	"cache entry found for xid=%x prog=%d vers=%d proc=%d for rmtaddr=%s\n",
-					su->su_xid, msg->rm_call.cb_prog,
-					msg->rm_call.cb_vers,
-					msg->rm_call.cb_proc, uaddr);
-				free(uaddr);
-			}
-#endif
-			*replyp = ent->cache_reply;
-			*replylenp = ent->cache_replylen;
-			mutex_unlock(&dupreq_lock);
-			return (1);
-		}
-	}
-	/*
-	 * Failed to find entry
-	 * Remember a few things so we can do a set later
-	 */
-	uc->uc_proc = msg->rm_call.cb_proc;
-	uc->uc_vers = msg->rm_call.cb_vers;
-	uc->uc_prog = msg->rm_call.cb_prog;
-	mutex_unlock(&dupreq_lock);
-	return (0);
-}
diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c
deleted file mode 100644
index 945a9ff..0000000
--- a/lib/libc/rpc/svc_generic.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*	$NetBSD: svc_generic.c,v 1.3 2000/07/06 03:10:35 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)svc_generic.c	1.19	94/04/24 SMI" 
-static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.6 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * svc_generic.c, Server side for RPC.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <err.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-
-extern int __svc_vc_setflag(SVCXPRT *, int);
-
-/*
- * The highest level interface for server creation.
- * It tries for all the nettokens in that particular class of token
- * and returns the number of handles it can create and/or find.
- *
- * It creates a link list of all the handles it could create.
- * If svc_create() is called multiple times, it uses the handle
- * created earlier instead of creating a new handle every time.
- */
-int
-svc_create(dispatch, prognum, versnum, nettype)
-	void (*dispatch)(struct svc_req *, SVCXPRT *);
-	rpcprog_t prognum;		/* Program number */
-	rpcvers_t versnum;		/* Version number */
-	const char *nettype;		/* Networktype token */
-{
-	struct xlist {
-		SVCXPRT *xprt;		/* Server handle */
-		struct xlist *next;	/* Next item */
-	} *l;
-	static struct xlist *xprtlist;	/* A link list of all the handles */
-	int num = 0;
-	SVCXPRT *xprt;
-	struct netconfig *nconf;
-	void *handle;
-	extern mutex_t xprtlist_lock;
-
-/* VARIABLES PROTECTED BY xprtlist_lock: xprtlist */
-
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		warnx("svc_create: unknown protocol");
-		return (0);
-	}
-	while ((nconf = __rpc_getconf(handle)) != NULL) {
-		mutex_lock(&xprtlist_lock);
-		for (l = xprtlist; l; l = l->next) {
-			if (strcmp(l->xprt->xp_netid, nconf->nc_netid) == 0) {
-				/* Found an old one, use it */
-				(void) rpcb_unset(prognum, versnum, nconf);
-				if (svc_reg(l->xprt, prognum, versnum,
-					dispatch, nconf) == FALSE)
-					warnx(
-		"svc_create: could not register prog %u vers %u on %s",
-					(unsigned)prognum, (unsigned)versnum,
-					 nconf->nc_netid);
-				else
-					num++;
-				break;
-			}
-		}
-		if (l == NULL) {
-			/* It was not found. Now create a new one */
-			xprt = svc_tp_create(dispatch, prognum, versnum, nconf);
-			if (xprt) {
-				l = (struct xlist *)malloc(sizeof (*l));
-				if (l == NULL) {
-					warnx("svc_create: no memory");
-					mutex_unlock(&xprtlist_lock);
-					return (0);
-				}
-				l->xprt = xprt;
-				l->next = xprtlist;
-				xprtlist = l;
-				num++;
-			}
-		}
-		mutex_unlock(&xprtlist_lock);
-	}
-	__rpc_endconf(handle);
-	/*
-	 * In case of num == 0; the error messages are generated by the
-	 * underlying layers; and hence not needed here.
-	 */
-	return (num);
-}
-
-/*
- * The high level interface to svc_tli_create().
- * It tries to create a server for "nconf" and registers the service
- * with the rpcbind. It calls svc_tli_create();
- */
-SVCXPRT *
-svc_tp_create(dispatch, prognum, versnum, nconf)
-	void (*dispatch)(struct svc_req *, SVCXPRT *);
-	rpcprog_t prognum;		/* Program number */
-	rpcvers_t versnum;		/* Version number */
-	const struct netconfig *nconf; /* Netconfig structure for the network */
-{
-	SVCXPRT *xprt;
-
-	if (nconf == NULL) {
-		warnx(
-	"svc_tp_create: invalid netconfig structure for prog %u vers %u",
-				(unsigned)prognum, (unsigned)versnum);
-		return (NULL);
-	}
-	xprt = svc_tli_create(RPC_ANYFD, nconf, NULL, 0, 0);
-	if (xprt == NULL) {
-		return (NULL);
-	}
-	/*LINTED const castaway*/
-	(void) rpcb_unset(prognum, versnum, (struct netconfig *) nconf);
-	if (svc_reg(xprt, prognum, versnum, dispatch, nconf) == FALSE) {
-		warnx(
-		"svc_tp_create: Could not register prog %u vers %u on %s",
-				(unsigned)prognum, (unsigned)versnum,
-				nconf->nc_netid);
-		SVC_DESTROY(xprt);
-		return (NULL);
-	}
-	return (xprt);
-}
-
-/*
- * If fd is RPC_ANYFD, then it opens a fd for the given transport
- * provider (nconf cannot be NULL then). If the t_state is T_UNBND and
- * bindaddr is NON-NULL, it performs a t_bind using the bindaddr. For
- * NULL bindadr and Connection oriented transports, the value of qlen
- * is set to 8.
- *
- * If sendsz or recvsz are zero, their default values are chosen.
- */
-SVCXPRT *
-svc_tli_create(fd, nconf, bindaddr, sendsz, recvsz)
-	int fd;				/* Connection end point */
-	const struct netconfig *nconf;	/* Netconfig struct for nettoken */
-	const struct t_bind *bindaddr;	/* Local bind address */
-	u_int sendsz;			/* Max sendsize */
-	u_int recvsz;			/* Max recvsize */
-{
-	SVCXPRT *xprt = NULL;		/* service handle */
-	bool_t madefd = FALSE;		/* whether fd opened here  */
-	struct __rpc_sockinfo si;
-	struct sockaddr_storage ss;
-	socklen_t slen;
-
-	if (fd == RPC_ANYFD) {
-		if (nconf == NULL) {
-			warnx("svc_tli_create: invalid netconfig");
-			return (NULL);
-		}
-		fd = __rpc_nconf2fd(nconf);
-		if (fd == -1) {
-			warnx(
-			    "svc_tli_create: could not open connection for %s",
-					nconf->nc_netid);
-			return (NULL);
-		}
-		__rpc_nconf2sockinfo(nconf, &si);
-		madefd = TRUE;
-	} else {
-		/*
-		 * It is an open descriptor. Get the transport info.
-		 */
-		if (!__rpc_fd2sockinfo(fd, &si)) {
-			warnx(
-		"svc_tli_create: could not get transport information");
-			return (NULL);
-		}
-	}
-
-	/*
-	 * If the fd is unbound, try to bind it.
-	 */
-	if (madefd || !__rpc_sockisbound(fd)) {
-		if (bindaddr == NULL) {
-			if (bindresvport(fd, NULL) < 0) {
-				memset(&ss, 0, sizeof ss);
-				ss.ss_family = si.si_af;
-				ss.ss_len = si.si_alen;
-				if (_bind(fd, (struct sockaddr *)(void *)&ss,
-				    (socklen_t)si.si_alen) < 0) {
-					warnx(
-			"svc_tli_create: could not bind to anonymous port");
-					goto freedata;
-				}
-			}
-			_listen(fd, SOMAXCONN);
-		} else {
-			if (_bind(fd,
-			    (struct sockaddr *)bindaddr->addr.buf,
-			    (socklen_t)si.si_alen) < 0) {
-				warnx(
-		"svc_tli_create: could not bind to requested address");
-				goto freedata;
-			}
-			_listen(fd, (int)bindaddr->qlen);
-		}
-			
-	}
-	/*
-	 * call transport specific function.
-	 */
-	switch (si.si_socktype) {
-		case SOCK_STREAM:
-			slen = sizeof ss;
-			if (_getpeername(fd, (struct sockaddr *)(void *)&ss, &slen)
-			    == 0) {
-				/* accepted socket */
-				xprt = svc_fd_create(fd, sendsz, recvsz);
-			} else
-				xprt = svc_vc_create(fd, sendsz, recvsz);
-			if (!nconf || !xprt)
-				break;
-#if 0
-			/* XXX fvdl */
-			if (strcmp(nconf->nc_protofmly, "inet") == 0 ||
-			    strcmp(nconf->nc_protofmly, "inet6") == 0)
-				(void) __svc_vc_setflag(xprt, TRUE);
-#endif
-			break;
-		case SOCK_DGRAM:
-			xprt = svc_dg_create(fd, sendsz, recvsz);
-			break;
-		default:
-			warnx("svc_tli_create: bad service type");
-			goto freedata;
-	}
-
-	if (xprt == NULL)
-		/*
-		 * The error messages here are spitted out by the lower layers:
-		 * svc_vc_create(), svc_fd_create() and svc_dg_create().
-		 */
-		goto freedata;
-
-	/* Fill in type of service */
-	xprt->xp_type = __rpc_socktype2seman(si.si_socktype);
-
-	if (nconf) {
-		xprt->xp_netid = strdup(nconf->nc_netid);
-		xprt->xp_tp = strdup(nconf->nc_device);
-	}
-	return (xprt);
-
-freedata:
-	if (madefd)
-		(void)_close(fd);
-	if (xprt) {
-		if (!madefd) /* so that svc_destroy doesnt close fd */
-			xprt->xp_fd = RPC_ANYFD;
-		SVC_DESTROY(xprt);
-	}
-	return (NULL);
-}
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
deleted file mode 100644
index f68313c..0000000
--- a/lib/libc/rpc/svc_raw.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*	$NetBSD: svc_raw.c,v 1.14 2000/07/06 03:10:35 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)svc_raw.c	1.16	94/04/24 SMI" */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)svc_raw.c 1.25 89/01/31 Copyr 1984 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_raw.c,v 1.14 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * svc_raw.c,   This a toy for simple testing and timing.
- * Interface to create an rpc client and server in the same UNIX process.
- * This lets us similate rpc and get rpc (round trip) overhead, without
- * any interference from the kernel.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <rpc/rpc.h>
-#include <sys/types.h>
-#include <rpc/raw.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-#ifndef UDPMSGSIZE
-#define	UDPMSGSIZE 8800
-#endif
-
-/*
- * This is the "network" that we will be moving data over
- */
-static struct svc_raw_private {
-	char	*raw_buf;	/* should be shared with the cl handle */
-	SVCXPRT	server;
-	XDR	xdr_stream;
-	char	verf_body[MAX_AUTH_BYTES];
-} *svc_raw_private;
-
-extern mutex_t	svcraw_lock;
-
-static enum xprt_stat svc_raw_stat(SVCXPRT *);
-static bool_t svc_raw_recv(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_raw_reply(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_raw_getargs(SVCXPRT *, xdrproc_t, void *);
-static bool_t svc_raw_freeargs(SVCXPRT *, xdrproc_t, void *);
-static void svc_raw_destroy(SVCXPRT *);
-static void svc_raw_ops(SVCXPRT *);
-static bool_t svc_raw_control(SVCXPRT *, const u_int, void *);
-
-char *__rpc_rawcombuf = NULL;
-
-SVCXPRT *
-svc_raw_create()
-{
-	struct svc_raw_private *srp;
-/* VARIABLES PROTECTED BY svcraw_lock: svc_raw_private, srp */
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		srp = (struct svc_raw_private *)calloc(1, sizeof (*srp));
-		if (srp == NULL) {
-			mutex_unlock(&svcraw_lock);
-			return (NULL);
-		}
-		if (__rpc_rawcombuf == NULL)
-			__rpc_rawcombuf = calloc(UDPMSGSIZE, sizeof (char));
-		srp->raw_buf = __rpc_rawcombuf; /* Share it with the client */
-		svc_raw_private = srp;
-	}
-	srp->server.xp_fd = FD_SETSIZE;
-	srp->server.xp_port = 0;
-	srp->server.xp_p3 = NULL;
-	svc_raw_ops(&srp->server);
-	srp->server.xp_verf.oa_base = srp->verf_body;
-	xdrmem_create(&srp->xdr_stream, srp->raw_buf, UDPMSGSIZE, XDR_DECODE);
-	xprt_register(&srp->server);
-	mutex_unlock(&svcraw_lock);
-	return (&srp->server);
-}
-
-/*ARGSUSED*/
-static enum xprt_stat
-svc_raw_stat(xprt)
-SVCXPRT *xprt; /* args needed to satisfy ANSI-C typechecking */
-{
-	return (XPRT_IDLE);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_recv(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct svc_raw_private *srp;
-	XDR *xdrs;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	xdrs = &srp->xdr_stream;
-	xdrs->x_op = XDR_DECODE;
-	(void) XDR_SETPOS(xdrs, 0);
-	if (! xdr_callmsg(xdrs, msg)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_reply(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct svc_raw_private *srp;
-	XDR *xdrs;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	xdrs = &srp->xdr_stream;
-	xdrs->x_op = XDR_ENCODE;
-	(void) XDR_SETPOS(xdrs, 0);
-	if (! xdr_replymsg(xdrs, msg)) {
-		return (FALSE);
-	}
-	(void) XDR_GETPOS(xdrs);  /* called just for overhead */
-	return (TRUE);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_getargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	struct svc_raw_private *srp;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-	return (*xdr_args)(&srp->xdr_stream, args_ptr);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_freeargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	struct svc_raw_private *srp;
-	XDR *xdrs;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	xdrs = &srp->xdr_stream;
-	xdrs->x_op = XDR_FREE;
-	return (*xdr_args)(xdrs, args_ptr);
-}
-
-/*ARGSUSED*/
-static void
-svc_raw_destroy(xprt)
-SVCXPRT *xprt;
-{
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_control(xprt, rq, in)
-	SVCXPRT *xprt;
-	const u_int	rq;
-	void		*in;
-{
-	return (FALSE);
-}
-
-static void
-svc_raw_ops(xprt)
-	SVCXPRT *xprt;
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-	extern mutex_t ops_lock;
-
-/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = svc_raw_recv;
-		ops.xp_stat = svc_raw_stat;
-		ops.xp_getargs = svc_raw_getargs;
-		ops.xp_reply = svc_raw_reply;
-		ops.xp_freeargs = svc_raw_freeargs;
-		ops.xp_destroy = svc_raw_destroy;
-		ops2.xp_control = svc_raw_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
deleted file mode 100644
index 326ec02..0000000
--- a/lib/libc/rpc/svc_run.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	$NetBSD: svc_run.c,v 1.17 2000/07/06 03:10:35 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";
-static char *sccsid = "from: @(#)svc_run.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_run.c,v 1.19 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * This is the rpc server side idle loop
- * Wait for input, call server program.
- */
-#include "namespace.h"
-#include "reentrant.h"
-#include <err.h>
-#include <errno.h>
-#include <rpc/rpc.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <rpc/rpc.h>
-#include "rpc_com.h"
-
-void
-svc_run()
-{
-	fd_set readfds, cleanfds;
-	struct timeval timeout;
-	extern rwlock_t svc_fd_lock;
-
-	timeout.tv_sec = 30;
-	timeout.tv_usec = 0;
-
-	for (;;) {
-		rwlock_rdlock(&svc_fd_lock);
-		readfds = svc_fdset;
-		cleanfds = svc_fdset;
-		rwlock_unlock(&svc_fd_lock);
-		switch (_select(svc_maxfd+1, &readfds, NULL, NULL, &timeout)) {
-		case -1:
-			FD_ZERO(&readfds);
-			if (errno == EINTR) {
-				continue;
-			}
-			_warn("svc_run: - select failed");
-			return;
-		case 0:
-			__svc_clean_idle(&cleanfds, 30, FALSE);
-			continue;
-		default:
-			svc_getreqset(&readfds);
-		}
-	}
-}
-
-/*
- *      This function causes svc_run() to exit by telling it that it has no
- *      more work to do.
- */
-void
-svc_exit()
-{
-	extern rwlock_t svc_fd_lock;
-
-	rwlock_wrlock(&svc_fd_lock);
-	FD_ZERO(&svc_fdset);
-	rwlock_unlock(&svc_fd_lock);
-}
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
deleted file mode 100644
index 008af57..0000000
--- a/lib/libc/rpc/svc_simple.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*	$NetBSD: svc_simple.c,v 1.20 2000/07/06 03:10:35 christos Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #pragma ident	"@(#)svc_simple.c	1.18	94/04/24 SMI" */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_simple.c,v 1.14 2002/03/22 23:18:37 obrien Exp $");
-
-/*
- * svc_simple.c
- * Simplified front end to rpc.
- */
-
-/*
- * This interface creates a virtual listener for all the services
- * started thru rpc_reg(). It listens on the same endpoint for
- * all the services and then executes the corresponding service
- * for the given prognum and procnum.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-
-static void universal(struct svc_req *, SVCXPRT *);
-
-static struct proglst {
-	char *(*p_progname)(char *);
-	rpcprog_t p_prognum;
-	rpcvers_t p_versnum;
-	rpcproc_t p_procnum;
-	SVCXPRT *p_transp;
-	char *p_netid;
-	char *p_xdrbuf;
-	int p_recvsz;
-	xdrproc_t p_inproc, p_outproc;
-	struct proglst *p_nxt;
-} *proglst;
-
-static const char rpc_reg_err[] = "%s: %s";
-static const char rpc_reg_msg[] = "rpc_reg: ";
-static const char __reg_err1[] = "can't find appropriate transport";
-static const char __reg_err2[] = "can't get protocol info";
-static const char __reg_err3[] = "unsupported transport size";
-static const char __no_mem_str[] = "out of memory";
-
-/*
- * For simplified, easy to use kind of rpc interfaces.
- * nettype indicates the type of transport on which the service will be
- * listening. Used for conservation of the system resource. Only one
- * handle is created for all the services (actually one of each netid)
- * and same xdrbuf is used for same netid. The size of the arguments
- * is also limited by the recvsize for that transport, even if it is
- * a COTS transport. This may be wrong, but for cases like these, they
- * should not use the simplified interfaces like this.
- */
-
-int
-rpc_reg(prognum, versnum, procnum, progname, inproc, outproc, nettype)
-	rpcprog_t prognum;			/* program number */
-	rpcvers_t versnum;			/* version number */
-	rpcproc_t procnum;			/* procedure number */
-	char *(*progname)(char *); /* Server routine */
-	xdrproc_t inproc, outproc;	/* in/out XDR procedures */
-	char *nettype;			/* nettype */
-{
-	struct netconfig *nconf;
-	int done = FALSE;
-	void *handle;
-	extern mutex_t proglst_lock;
-
-
-
-	if (procnum == NULLPROC) {
-		warnx("%s can't reassign procedure number %u", rpc_reg_msg,
-			NULLPROC);
-		return (-1);
-	}
-
-	if (nettype == NULL)
-		nettype = "netpath";		/* The default behavior */
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		warnx(rpc_reg_err, rpc_reg_msg, __reg_err1);
-		return (-1);
-	}
-/* VARIABLES PROTECTED BY proglst_lock: proglst */
-	mutex_lock(&proglst_lock);
-	while ((nconf = __rpc_getconf(handle)) != NULL) {
-		struct proglst *pl;
-		SVCXPRT *svcxprt;
-		int madenow;
-		u_int recvsz;
-		char *xdrbuf;
-		char *netid;
-
-		madenow = FALSE;
-		svcxprt = NULL;
-		recvsz = 0;
-		xdrbuf = netid = NULL;
-		for (pl = proglst; pl; pl = pl->p_nxt) {
-			if (strcmp(pl->p_netid, nconf->nc_netid) == 0) {
-				svcxprt = pl->p_transp;
-				xdrbuf = pl->p_xdrbuf;
-				recvsz = pl->p_recvsz;
-				netid = pl->p_netid;
-				break;
-			}
-		}
-
-		if (svcxprt == NULL) {
-			struct __rpc_sockinfo si;
-
-			svcxprt = svc_tli_create(RPC_ANYFD, nconf, NULL, 0, 0);
-			if (svcxprt == NULL)
-				continue;
-			if (!__rpc_fd2sockinfo(svcxprt->xp_fd, &si)) {
-				warnx(rpc_reg_err, rpc_reg_msg, __reg_err2);
-				SVC_DESTROY(svcxprt);
-				continue;
-			}
-			recvsz = __rpc_get_t_size(si.si_af, si.si_proto, 0);
-			if (recvsz == 0) {
-				warnx(rpc_reg_err, rpc_reg_msg, __reg_err3);
-				SVC_DESTROY(svcxprt);
-				continue;
-			}
-			if (((xdrbuf = malloc((unsigned)recvsz)) == NULL) ||
-				((netid = strdup(nconf->nc_netid)) == NULL)) {
-				warnx(rpc_reg_err, rpc_reg_msg, __no_mem_str);
-				SVC_DESTROY(svcxprt);
-				break;
-			}
-			madenow = TRUE;
-		}
-		/*
-		 * Check if this (program, version, netid) had already been
-		 * registered.  The check may save a few RPC calls to rpcbind
-		 */
-		for (pl = proglst; pl; pl = pl->p_nxt)
-			if ((pl->p_prognum == prognum) &&
-				(pl->p_versnum == versnum) &&
-				(strcmp(pl->p_netid, netid) == 0))
-				break;
-		if (pl == NULL) { /* Not yet */
-			(void) rpcb_unset(prognum, versnum, nconf);
-		} else {
-			/* so that svc_reg does not call rpcb_set() */
-			nconf = NULL;
-		}
-
-		if (!svc_reg(svcxprt, prognum, versnum, universal, nconf)) {
-			warnx("%s couldn't register prog %u vers %u for %s",
-				rpc_reg_msg, (unsigned)prognum,
-				(unsigned)versnum, netid);
-			if (madenow) {
-				SVC_DESTROY(svcxprt);
-				free(xdrbuf);
-				free(netid);
-			}
-			continue;
-		}
-
-		pl = malloc(sizeof (struct proglst));
-		if (pl == NULL) {
-			warnx(rpc_reg_err, rpc_reg_msg, __no_mem_str);
-			if (madenow) {
-				SVC_DESTROY(svcxprt);
-				free(xdrbuf);
-				free(netid);
-			}
-			break;
-		}
-		pl->p_progname = progname;
-		pl->p_prognum = prognum;
-		pl->p_versnum = versnum;
-		pl->p_procnum = procnum;
-		pl->p_inproc = inproc;
-		pl->p_outproc = outproc;
-		pl->p_transp = svcxprt;
-		pl->p_xdrbuf = xdrbuf;
-		pl->p_recvsz = recvsz;
-		pl->p_netid = netid;
-		pl->p_nxt = proglst;
-		proglst = pl;
-		done = TRUE;
-	}
-	__rpc_endconf(handle);
-	mutex_unlock(&proglst_lock);
-
-	if (done == FALSE) {
-		warnx("%s cant find suitable transport for %s",
-			rpc_reg_msg, nettype);
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * The universal handler for the services registered using registerrpc.
- * It handles both the connectionless and the connection oriented cases.
- */
-
-static void
-universal(rqstp, transp)
-	struct svc_req *rqstp;
-	SVCXPRT *transp;
-{
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;
-	char *outdata;
-	char *xdrbuf;
-	struct proglst *pl;
-	extern mutex_t proglst_lock;
-
-	/*
-	 * enforce "procnum 0 is echo" convention
-	 */
-	if (rqstp->rq_proc == NULLPROC) {
-		if (svc_sendreply(transp, (xdrproc_t) xdr_void, NULL) ==
-		    FALSE) {
-			warnx("svc_sendreply failed");
-		}
-		return;
-	}
-	prog = rqstp->rq_prog;
-	vers = rqstp->rq_vers;
-	proc = rqstp->rq_proc;
-	mutex_lock(&proglst_lock);
-	for (pl = proglst; pl; pl = pl->p_nxt)
-		if (pl->p_prognum == prog && pl->p_procnum == proc &&
-			pl->p_versnum == vers &&
-			(strcmp(pl->p_netid, transp->xp_netid) == 0)) {
-			/* decode arguments into a CLEAN buffer */
-			xdrbuf = pl->p_xdrbuf;
-			/* Zero the arguments: reqd ! */
-			(void) memset(xdrbuf, 0, sizeof (pl->p_recvsz));
-			/*
-			 * Assuming that sizeof (xdrbuf) would be enough
-			 * for the arguments; if not then the program
-			 * may bomb. BEWARE!
-			 */
-			if (!svc_getargs(transp, pl->p_inproc, xdrbuf)) {
-				svcerr_decode(transp);
-				mutex_unlock(&proglst_lock);
-				return;
-			}
-			outdata = (*(pl->p_progname))(xdrbuf);
-			if (outdata == NULL &&
-				pl->p_outproc != (xdrproc_t) xdr_void){
-				/* there was an error */
-				mutex_unlock(&proglst_lock);
-				return;
-			}
-			if (!svc_sendreply(transp, pl->p_outproc, outdata)) {
-				warnx(
-			"rpc: rpc_reg trouble replying to prog %u vers %u",
-				(unsigned)prog, (unsigned)vers);
-				mutex_unlock(&proglst_lock);
-				return;
-			}
-			/* free the decoded arguments */
-			(void)svc_freeargs(transp, pl->p_inproc, xdrbuf);
-			mutex_unlock(&proglst_lock);
-			return;
-		}
-	mutex_unlock(&proglst_lock);
-	/* This should never happen */
-	warnx("rpc: rpc_reg: never registered prog %u vers %u",
-		(unsigned)prog, (unsigned)vers);
-	return;
-}
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
deleted file mode 100644
index 5738804..0000000
--- a/lib/libc/rpc/svc_vc.c
+++ /dev/null
@@ -1,790 +0,0 @@
-/*	$NetBSD: svc_vc.c,v 1.7 2000/08/03 00:01:53 fvdl Exp $	*/
-
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_vc.c,v 1.24 2004/10/16 06:11:35 obrien Exp $");
-
-/*
- * svc_vc.c, Server side for Connection Oriented based RPC. 
- *
- * Actually implements two flavors of transporter -
- * a tcp rendezvouser (a listner and connection establisher)
- * and a record/tcp stream.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/poll.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-
-#include "rpc_com.h"
-#include "un-namespace.h"
-
-extern rwlock_t svc_fd_lock;
-
-static SVCXPRT *makefd_xprt(int, u_int, u_int);
-static bool_t rendezvous_request(SVCXPRT *, struct rpc_msg *);
-static enum xprt_stat rendezvous_stat(SVCXPRT *);
-static void svc_vc_destroy(SVCXPRT *);
-static void __svc_vc_dodestroy (SVCXPRT *);
-static int read_vc(void *, void *, int);
-static int write_vc(void *, void *, int);
-static enum xprt_stat svc_vc_stat(SVCXPRT *);
-static bool_t svc_vc_recv(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_vc_getargs(SVCXPRT *, xdrproc_t, void *);
-static bool_t svc_vc_freeargs(SVCXPRT *, xdrproc_t, void *);
-static bool_t svc_vc_reply(SVCXPRT *, struct rpc_msg *);
-static void svc_vc_rendezvous_ops(SVCXPRT *);
-static void svc_vc_ops(SVCXPRT *);
-static bool_t svc_vc_control(SVCXPRT *xprt, const u_int rq, void *in);
-static bool_t svc_vc_rendezvous_control (SVCXPRT *xprt, const u_int rq,
-				   	     void *in);
-
-struct cf_rendezvous { /* kept in xprt->xp_p1 for rendezvouser */
-	u_int sendsize;
-	u_int recvsize;
-	int maxrec;
-};
-
-struct cf_conn {  /* kept in xprt->xp_p1 for actual connection */
-	enum xprt_stat strm_stat;
-	uint32_t x_id;
-	XDR xdrs;
-	char verf_body[MAX_AUTH_BYTES];
-	u_int sendsize;
-	u_int recvsize;
-	int maxrec;
-	bool_t nonblock;
-	struct timeval last_recv_time;
-};
-
-/*
- * Usage:
- *	xprt = svc_vc_create(sock, send_buf_size, recv_buf_size);
- *
- * Creates, registers, and returns a (rpc) tcp based transporter.
- * Once *xprt is initialized, it is registered as a transporter
- * see (svc.h, xprt_register).  This routine returns
- * a NULL if a problem occurred.
- *
- * The filedescriptor passed in is expected to refer to a bound, but
- * not yet connected socket.
- *
- * Since streams do buffered io similar to stdio, the caller can specify
- * how big the send and receive buffers are via the second and third parms;
- * 0 => use the system default.
- */
-SVCXPRT *
-svc_vc_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-	SVCXPRT *xprt;
-	struct cf_rendezvous *r = NULL;
-	struct __rpc_sockinfo si;
-	struct sockaddr_storage sslocal;
-	socklen_t slen;
-
-	r = mem_alloc(sizeof(*r));
-	if (r == NULL) {
-		warnx("svc_vc_create: out of memory");
-		goto cleanup_svc_vc_create;
-	}
-	if (!__rpc_fd2sockinfo(fd, &si))
-		return NULL;
-	r->sendsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsize);
-	r->recvsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsize);
-	r->maxrec = __svc_maxrec;
-	xprt = mem_alloc(sizeof(SVCXPRT));
-	if (xprt == NULL) {
-		warnx("svc_vc_create: out of memory");
-		goto cleanup_svc_vc_create;
-	}
-	xprt->xp_tp = NULL;
-	xprt->xp_p1 = r;
-	xprt->xp_p2 = NULL;
-	xprt->xp_p3 = NULL;
-	xprt->xp_verf = _null_auth;
-	svc_vc_rendezvous_ops(xprt);
-	xprt->xp_port = (u_short)-1;	/* It is the rendezvouser */
-	xprt->xp_fd = fd;
-
-	slen = sizeof (struct sockaddr_storage);
-	if (_getsockname(fd, (struct sockaddr *)(void *)&sslocal, &slen) < 0) {
-		warnx("svc_vc_create: could not retrieve local addr");
-		goto cleanup_svc_vc_create;
-	}
-
-	xprt->xp_ltaddr.maxlen = xprt->xp_ltaddr.len = sslocal.ss_len;
-	xprt->xp_ltaddr.buf = mem_alloc((size_t)sslocal.ss_len);
-	if (xprt->xp_ltaddr.buf == NULL) {
-		warnx("svc_vc_create: no mem for local addr");
-		goto cleanup_svc_vc_create;
-	}
-	memcpy(xprt->xp_ltaddr.buf, &sslocal, (size_t)sslocal.ss_len);
-
-	xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
-	xprt_register(xprt);
-	return (xprt);
-cleanup_svc_vc_create:
-	if (r != NULL)
-		mem_free(r, sizeof(*r));
-	return (NULL);
-}
-
-/*
- * Like svtcp_create(), except the routine takes any *open* UNIX file
- * descriptor as its first input.
- */
-SVCXPRT *
-svc_fd_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-	struct sockaddr_storage ss;
-	socklen_t slen;
-	SVCXPRT *ret;
-
-	assert(fd != -1);
-
-	ret = makefd_xprt(fd, sendsize, recvsize);
-	if (ret == NULL)
-		return NULL;
-
-	slen = sizeof (struct sockaddr_storage);
-	if (_getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		warnx("svc_fd_create: could not retrieve local addr");
-		goto freedata;
-	}
-	ret->xp_ltaddr.maxlen = ret->xp_ltaddr.len = ss.ss_len;
-	ret->xp_ltaddr.buf = mem_alloc((size_t)ss.ss_len);
-	if (ret->xp_ltaddr.buf == NULL) {
-		warnx("svc_fd_create: no mem for local addr");
-		goto freedata;
-	}
-	memcpy(ret->xp_ltaddr.buf, &ss, (size_t)ss.ss_len);
-
-	slen = sizeof (struct sockaddr_storage);
-	if (_getpeername(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		warnx("svc_fd_create: could not retrieve remote addr");
-		goto freedata;
-	}
-	ret->xp_rtaddr.maxlen = ret->xp_rtaddr.len = ss.ss_len;
-	ret->xp_rtaddr.buf = mem_alloc((size_t)ss.ss_len);
-	if (ret->xp_rtaddr.buf == NULL) {
-		warnx("svc_fd_create: no mem for local addr");
-		goto freedata;
-	}
-	memcpy(ret->xp_rtaddr.buf, &ss, (size_t)ss.ss_len);
-#ifdef PORTMAP
-	if (ss.ss_family == AF_INET || ss.ss_family == AF_LOCAL) {
-		ret->xp_raddr = *(struct sockaddr_in *)ret->xp_rtaddr.buf;
-		ret->xp_addrlen = sizeof (struct sockaddr_in);
-	}
-#endif				/* PORTMAP */
-
-	return ret;
-
-freedata:
-	if (ret->xp_ltaddr.buf != NULL)
-		mem_free(ret->xp_ltaddr.buf, rep->xp_ltaddr.maxlen);
-
-	return NULL;
-}
-
-static SVCXPRT *
-makefd_xprt(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-	SVCXPRT *xprt;
-	struct cf_conn *cd;
-	const char *netid;
-	struct __rpc_sockinfo si;
- 
-	assert(fd != -1);
-
-	xprt = mem_alloc(sizeof(SVCXPRT));
-	if (xprt == NULL) {
-		warnx("svc_vc: makefd_xprt: out of memory");
-		goto done;
-	}
-	memset(xprt, 0, sizeof *xprt);
-	cd = mem_alloc(sizeof(struct cf_conn));
-	if (cd == NULL) {
-		warnx("svc_tcp: makefd_xprt: out of memory");
-		mem_free(xprt, sizeof(SVCXPRT));
-		xprt = NULL;
-		goto done;
-	}
-	cd->strm_stat = XPRT_IDLE;
-	xdrrec_create(&(cd->xdrs), sendsize, recvsize,
-	    xprt, read_vc, write_vc);
-	xprt->xp_p1 = cd;
-	xprt->xp_verf.oa_base = cd->verf_body;
-	svc_vc_ops(xprt);  /* truely deals with calls */
-	xprt->xp_port = 0;  /* this is a connection, not a rendezvouser */
-	xprt->xp_fd = fd;
-        if (__rpc_fd2sockinfo(fd, &si) && __rpc_sockinfo2netid(&si, &netid))
-		xprt->xp_netid = strdup(netid);
-
-	xprt_register(xprt);
-done:
-	return (xprt);
-}
-
-/*ARGSUSED*/
-static bool_t
-rendezvous_request(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	int sock, flags;
-	struct cf_rendezvous *r;
-	struct cf_conn *cd;
-	struct sockaddr_storage addr;
-	socklen_t len;
-	struct __rpc_sockinfo si;
-	SVCXPRT *newxprt;
-	fd_set cleanfds;
-
-	assert(xprt != NULL);
-	assert(msg != NULL);
-
-	r = (struct cf_rendezvous *)xprt->xp_p1;
-again:
-	len = sizeof addr;
-	if ((sock = _accept(xprt->xp_fd, (struct sockaddr *)(void *)&addr,
-	    &len)) < 0) {
-		if (errno == EINTR)
-			goto again;
-		/*
-		 * Clean out the most idle file descriptor when we're
-		 * running out.
-		 */
-		if (errno == EMFILE || errno == ENFILE) {
-			cleanfds = svc_fdset;
-			__svc_clean_idle(&cleanfds, 0, FALSE);
-			goto again;
-		}
-		return (FALSE);
-	}
-	/*
-	 * make a new transporter (re-uses xprt)
-	 */
-	newxprt = makefd_xprt(sock, r->sendsize, r->recvsize);
-	newxprt->xp_rtaddr.buf = mem_alloc(len);
-	if (newxprt->xp_rtaddr.buf == NULL)
-		return (FALSE);
-	memcpy(newxprt->xp_rtaddr.buf, &addr, len);
-	newxprt->xp_rtaddr.len = len;
-#ifdef PORTMAP
-	if (addr.ss_family == AF_INET || addr.ss_family == AF_LOCAL) {
-		newxprt->xp_raddr = *(struct sockaddr_in *)newxprt->xp_rtaddr.buf;
-		newxprt->xp_addrlen = sizeof (struct sockaddr_in);
-	}
-#endif				/* PORTMAP */
-	if (__rpc_fd2sockinfo(sock, &si) && si.si_proto == IPPROTO_TCP) {
-		len = 1;
-		/* XXX fvdl - is this useful? */
-		_setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &len, sizeof (len));
-	}
-
-	cd = (struct cf_conn *)newxprt->xp_p1;
-
-	cd->recvsize = r->recvsize;
-	cd->sendsize = r->sendsize;
-	cd->maxrec = r->maxrec;
-
-	if (cd->maxrec != 0) {
-		flags = _fcntl(sock, F_GETFL, 0);
-		if (flags  == -1)
-			return (FALSE);
-		if (_fcntl(sock, F_SETFL, flags | O_NONBLOCK) == -1)
-			return (FALSE);
-		if (cd->recvsize > cd->maxrec)
-			cd->recvsize = cd->maxrec;
-		cd->nonblock = TRUE;
-		__xdrrec_setnonblock(&cd->xdrs, cd->maxrec);
-	} else
-		cd->nonblock = FALSE;
-
-	gettimeofday(&cd->last_recv_time, NULL);
-
-	return (FALSE); /* there is never an rpc msg to be processed */
-}
-
-/*ARGSUSED*/
-static enum xprt_stat
-rendezvous_stat(xprt)
-	SVCXPRT *xprt;
-{
-
-	return (XPRT_IDLE);
-}
-
-static void
-svc_vc_destroy(xprt)
-	SVCXPRT *xprt;
-{
-	assert(xprt != NULL);
-	
-	xprt_unregister(xprt);
-	__svc_vc_dodestroy(xprt);
-}
-
-static void
-__svc_vc_dodestroy(xprt)
-	SVCXPRT *xprt;
-{
-	struct cf_conn *cd;
-	struct cf_rendezvous *r;
-
-	cd = (struct cf_conn *)xprt->xp_p1;
-
-	if (xprt->xp_fd != RPC_ANYFD)
-		(void)_close(xprt->xp_fd);
-	if (xprt->xp_port != 0) {
-		/* a rendezvouser socket */
-		r = (struct cf_rendezvous *)xprt->xp_p1;
-		mem_free(r, sizeof (struct cf_rendezvous));
-		xprt->xp_port = 0;
-	} else {
-		/* an actual connection socket */
-		XDR_DESTROY(&(cd->xdrs));
-		mem_free(cd, sizeof(struct cf_conn));
-	}
-	if (xprt->xp_rtaddr.buf)
-		mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
-	if (xprt->xp_ltaddr.buf)
-		mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen);
-	if (xprt->xp_tp)
-		free(xprt->xp_tp);
-	if (xprt->xp_netid)
-		free(xprt->xp_netid);
-	mem_free(xprt, sizeof(SVCXPRT));
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_vc_control(xprt, rq, in)
-	SVCXPRT *xprt;
-	const u_int rq;
-	void *in;
-{
-	return (FALSE);
-}
-
-static bool_t
-svc_vc_rendezvous_control(xprt, rq, in)
-	SVCXPRT *xprt;
-	const u_int rq;
-	void *in;
-{
-	struct cf_rendezvous *cfp;
-
-	cfp = (struct cf_rendezvous *)xprt->xp_p1;
-	if (cfp == NULL)
-		return (FALSE);
-	switch (rq) {
-		case SVCGET_CONNMAXREC:
-			*(int *)in = cfp->maxrec;
-			break;
-		case SVCSET_CONNMAXREC:
-			cfp->maxrec = *(int *)in;
-			break;
-		default:
-			return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- * reads data from the tcp or uip connection.
- * any error is fatal and the connection is closed.
- * (And a read of zero bytes is a half closed stream => error.)
- * All read operations timeout after 35 seconds.  A timeout is
- * fatal for the connection.
- */
-static int
-read_vc(xprtp, buf, len)
-	void *xprtp;
-	void *buf;
-	int len;
-{
-	SVCXPRT *xprt;
-	int sock;
-	int milliseconds = 35 * 1000;
-	struct pollfd pollfd;
-	struct cf_conn *cfp;
-
-	xprt = (SVCXPRT *)xprtp;
-	assert(xprt != NULL);
-
-	sock = xprt->xp_fd;
-
-	cfp = (struct cf_conn *)xprt->xp_p1;
-
-	if (cfp->nonblock) {
-		len = _read(sock, buf, (size_t)len);
-		if (len < 0) {
-			if (errno == EAGAIN)
-				len = 0;
-			else
-				goto fatal_err;
-		}
-		if (len != 0)
-			gettimeofday(&cfp->last_recv_time, NULL);
-		return len;
-	}
-
-	do {
-		pollfd.fd = sock;
-		pollfd.events = POLLIN;
-		pollfd.revents = 0;
-		switch (_poll(&pollfd, 1, milliseconds)) {
-		case -1:
-			if (errno == EINTR)
-				continue;
-			/*FALLTHROUGH*/
-		case 0:
-			goto fatal_err;
-
-		default:
-			break;
-		}
-	} while ((pollfd.revents & POLLIN) == 0);
-
-	if ((len = _read(sock, buf, (size_t)len)) > 0) {
-		gettimeofday(&cfp->last_recv_time, NULL);
-		return (len);
-	}
-
-fatal_err:
-	((struct cf_conn *)(xprt->xp_p1))->strm_stat = XPRT_DIED;
-	return (-1);
-}
-
-/*
- * writes data to the tcp connection.
- * Any error is fatal and the connection is closed.
- */
-static int
-write_vc(xprtp, buf, len)
-	void *xprtp;
-	void *buf;
-	int len;
-{
-	SVCXPRT *xprt;
-	int i, cnt;
-	struct cf_conn *cd;
-	struct timeval tv0, tv1;
-
-	xprt = (SVCXPRT *)xprtp;
-	assert(xprt != NULL);
-
-	cd = (struct cf_conn *)xprt->xp_p1;
-
-	if (cd->nonblock)
-		gettimeofday(&tv0, NULL);
-	
-	for (cnt = len; cnt > 0; cnt -= i, buf = (char *)buf + i) {
-		i = _write(xprt->xp_fd, buf, (size_t)cnt);
-		if (i  < 0) {
-			if (errno != EAGAIN || !cd->nonblock) {
-				cd->strm_stat = XPRT_DIED;
-				return (-1);
-			}
-			if (cd->nonblock && i != cnt) {
-				/*
-				 * For non-blocking connections, do not
-				 * take more than 2 seconds writing the
-				 * data out.
-				 *
-				 * XXX 2 is an arbitrary amount.
-				 */
-				gettimeofday(&tv1, NULL);
-				if (tv1.tv_sec - tv0.tv_sec >= 2) {
-					cd->strm_stat = XPRT_DIED;
-					return (-1);
-				}
-			}
-		}
-	}
-
-	return (len);
-}
-
-static enum xprt_stat
-svc_vc_stat(xprt)
-	SVCXPRT *xprt;
-{
-	struct cf_conn *cd;
-
-	assert(xprt != NULL);
-
-	cd = (struct cf_conn *)(xprt->xp_p1);
-
-	if (cd->strm_stat == XPRT_DIED)
-		return (XPRT_DIED);
-	if (! xdrrec_eof(&(cd->xdrs)))
-		return (XPRT_MOREREQS);
-	return (XPRT_IDLE);
-}
-
-static bool_t
-svc_vc_recv(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct cf_conn *cd;
-	XDR *xdrs;
-
-	assert(xprt != NULL);
-	assert(msg != NULL);
-
-	cd = (struct cf_conn *)(xprt->xp_p1);
-	xdrs = &(cd->xdrs);
-
-	if (cd->nonblock) {
-		if (!__xdrrec_getrec(xdrs, &cd->strm_stat, TRUE))
-			return FALSE;
-	}
-
-	xdrs->x_op = XDR_DECODE;
-	(void)xdrrec_skiprecord(xdrs);
-	if (xdr_callmsg(xdrs, msg)) {
-		cd->x_id = msg->rm_xid;
-		return (TRUE);
-	}
-	cd->strm_stat = XPRT_DIED;
-	return (FALSE);
-}
-
-static bool_t
-svc_vc_getargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-
-	assert(xprt != NULL);
-	/* args_ptr may be NULL */
-	return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs),
-	    args_ptr));
-}
-
-static bool_t
-svc_vc_freeargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	XDR *xdrs;
-
-	assert(xprt != NULL);
-	/* args_ptr may be NULL */
-
-	xdrs = &(((struct cf_conn *)(xprt->xp_p1))->xdrs);
-
-	xdrs->x_op = XDR_FREE;
-	return ((*xdr_args)(xdrs, args_ptr));
-}
-
-static bool_t
-svc_vc_reply(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct cf_conn *cd;
-	XDR *xdrs;
-	bool_t rstat;
-
-	assert(xprt != NULL);
-	assert(msg != NULL);
-
-	cd = (struct cf_conn *)(xprt->xp_p1);
-	xdrs = &(cd->xdrs);
-
-	xdrs->x_op = XDR_ENCODE;
-	msg->rm_xid = cd->x_id;
-	rstat = xdr_replymsg(xdrs, msg);
-	(void)xdrrec_endofrecord(xdrs, TRUE);
-	return (rstat);
-}
-
-static void
-svc_vc_ops(xprt)
-	SVCXPRT *xprt;
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-	extern mutex_t ops_lock;
-
-/* VARIABLES PROTECTED BY ops_lock: ops, ops2 */
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = svc_vc_recv;
-		ops.xp_stat = svc_vc_stat;
-		ops.xp_getargs = svc_vc_getargs;
-		ops.xp_reply = svc_vc_reply;
-		ops.xp_freeargs = svc_vc_freeargs;
-		ops.xp_destroy = svc_vc_destroy;
-		ops2.xp_control = svc_vc_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
-
-static void
-svc_vc_rendezvous_ops(xprt)
-	SVCXPRT *xprt;
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-	extern mutex_t ops_lock;
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = rendezvous_request;
-		ops.xp_stat = rendezvous_stat;
-		ops.xp_getargs =
-		    (bool_t (*)(SVCXPRT *, xdrproc_t, void *))abort;
-		ops.xp_reply =
-		    (bool_t (*)(SVCXPRT *, struct rpc_msg *))abort;
-		ops.xp_freeargs =
-		    (bool_t (*)(SVCXPRT *, xdrproc_t, void *))abort,
-		ops.xp_destroy = svc_vc_destroy;
-		ops2.xp_control = svc_vc_rendezvous_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
-
-/*
- * Get the effective UID of the sending process. Used by rpcbind, keyserv
- * and rpc.yppasswdd on AF_LOCAL.
- */
-int
-__rpc_get_local_uid(SVCXPRT *transp, uid_t *uid) {
-	int sock, ret;
-	gid_t egid;
-	uid_t euid;
-	struct sockaddr *sa;
-
-	sock = transp->xp_fd;
-	sa = (struct sockaddr *)transp->xp_rtaddr.buf;
-	if (sa->sa_family == AF_LOCAL) {
-		ret = getpeereid(sock, &euid, &egid);
-		if (ret == 0)
-			*uid = euid;
-		return (ret);
-	} else
-		return (-1);
-}
-
-/*
- * Destroy xprts that have not have had any activity in 'timeout' seconds.
- * If 'cleanblock' is true, blocking connections (the default) are also
- * cleaned. If timeout is 0, the least active connection is picked.
- */
-bool_t
-__svc_clean_idle(fd_set *fds, int timeout, bool_t cleanblock)
-{
-	int i, ncleaned;
-	SVCXPRT *xprt, *least_active;
-	struct timeval tv, tdiff, tmax;
-	struct cf_conn *cd;
-
-	gettimeofday(&tv, NULL);
-	tmax.tv_sec = tmax.tv_usec = 0;
-	least_active = NULL;
-	rwlock_wrlock(&svc_fd_lock);
-	for (i = ncleaned = 0; i <= svc_maxfd; i++) {
-		if (FD_ISSET(i, fds)) {
-			xprt = __svc_xports[i];
-			if (xprt == NULL || xprt->xp_ops == NULL ||
-			    xprt->xp_ops->xp_recv != svc_vc_recv)
-				continue;
-			cd = (struct cf_conn *)xprt->xp_p1;
-			if (!cleanblock && !cd->nonblock)
-				continue;
-			if (timeout == 0) {
-				timersub(&tv, &cd->last_recv_time, &tdiff);
-				if (timercmp(&tdiff, &tmax, >)) {
-					tmax = tdiff;
-					least_active = xprt;
-				}
-				continue;
-			}
-			if (tv.tv_sec - cd->last_recv_time.tv_sec > timeout) {
-				__xprt_unregister_unlocked(xprt);
-				__svc_vc_dodestroy(xprt);
-				ncleaned++;
-			}
-		}
-	}
-	if (timeout == 0 && least_active != NULL) {
-		__xprt_unregister_unlocked(least_active);
-		__svc_vc_dodestroy(least_active);
-		ncleaned++;
-	}
-	rwlock_unlock(&svc_fd_lock);
-	return ncleaned > 0 ? TRUE : FALSE;
-}
diff --git a/lib/libc/stdio/Makefile b/lib/libc/stdio/Makefile
deleted file mode 100644
index 7bf5c77..0000000
--- a/lib/libc/stdio/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/ -I../../../contrib/gdtoa/ -I../i386
-
-#Objects
-OBJS = _flock_stub.o asprintf.o clrerr.o fclose.o fdopen.o feof.o ferror.o fflush.o fgetc.o fgetln.o fgetpos.o fgets.o fgetwc.o fgetwln.o fgetws.o fileno.o findfp.o flags.o fopen.o fprintf.o fpurge.o fputc.o fputs.o fputwc.o fputws.o fread.o freopen.o fscanf.o fseek.o fsetpos.o ftell.o funopen.o fvwrite.o fwalk.o fwide.o fwprintf.o fwrite.o fwscanf.o getc.o getchar.o gets.o getw.o getwc.o getwchar.o makebuf.o mktemp.o perror.o printf.o putc.o putchar.o puts.o putw.o putwc.o putwchar.o refill.o remove.o rewind.o rget.o scanf.o setbuf.o setbuffer.o setvbuf.o snprintf.o sprintf.o sscanf.o stdio.o swprintf.o swscanf.o tempnam.o tmpfile.o tmpnam.o ungetc.o ungetwc.o unlocked.o vasprintf.o vfprintf.o vfscanf.o vfwprintf.o vfwscanf.o vprintf.o vscanf.o vsnprintf.o vsprintf.o vsscanf.o vswprintf.o vswscanf.o vwprintf.o vwscanf.o wbuf.o wprintf.o wscanf.o wsetup.o xprintf.o xprintf_errno.o xprintf_float.o xprintf_hexdump.o xprintf_int.o xprintf_quote.o xprintf_str.o xprintf_time.o xprintf_vis.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/stdio/_flock_stub.c b/lib/libc/stdio/_flock_stub.c
deleted file mode 100644
index 3a73ee1..0000000
--- a/lib/libc/stdio/_flock_stub.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- */
-
-/*
- * POSIX stdio FILE locking functions. These assume that the locking
- * is only required at FILE structure level, not at file descriptor
- * level too.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.14 2004/03/09 04:51:58 jb Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "local.h"
-
-
-/*
- * Weak symbols for externally visible functions in this file:
- */
-__weak_reference(_flockfile, flockfile);
-__weak_reference(_flockfile_debug_stub, _flockfile_debug);
-__weak_reference(_ftrylockfile, ftrylockfile);
-__weak_reference(_funlockfile, funlockfile);
-
-/*
- * We need to retain binary compatibility for a while.  So pretend
- * that _lock is part of FILE * even though it is dereferenced off
- * _extra now.  When we stop encoding the size of FILE into binaries
- * this can be changed in stdio.h.  This will reduce the amount of
- * code that has to change in the future (just remove this comment
- * and #define).
- */
-#define _lock _extra
-
-void
-_flockfile(FILE *fp)
-{
-	pthread_t curthread = _pthread_self();
-
-	if (fp->_lock->fl_owner == curthread)
-		fp->_lock->fl_count++;
-	else {
-		/*
-		 * Make sure this mutex is treated as a private
-		 * internal mutex:
-		 */
-		_pthread_mutex_lock(&fp->_lock->fl_mutex);
-		fp->_lock->fl_owner = curthread;
-		fp->_lock->fl_count = 1;
-	}
-}
-
-/*
- * This can be overriden by the threads library if it is linked in.
- */
-void
-_flockfile_debug_stub(FILE *fp, char *fname, int lineno)
-{
-	_flockfile(fp);
-}
-
-int
-_ftrylockfile(FILE *fp)
-{
-	pthread_t curthread = _pthread_self();
-	int	ret = 0;
-
-	if (fp->_lock->fl_owner == curthread)
-		fp->_lock->fl_count++;
-	/*
-	 * Make sure this mutex is treated as a private
-	 * internal mutex:
-	 */
-	else if (_pthread_mutex_trylock(&fp->_lock->fl_mutex) == 0) {
-		fp->_lock->fl_owner = curthread;
-		fp->_lock->fl_count = 1;
-	}
-	else
-		ret = -1;
-	return (ret);
-}
-
-void 
-_funlockfile(FILE *fp)
-{
-	pthread_t	curthread = _pthread_self();
-
-	/*
-	 * Check if this file is owned by the current thread:
-	 */
-	if (fp->_lock->fl_owner == curthread) {
-		/*
-		 * Check if this thread has locked the FILE
-		 * more than once:
-		 */
-		if (fp->_lock->fl_count > 1)
-			/*
-			 * Decrement the count of the number of
-			 * times the running thread has locked this
-			 * file:
-			 */
-			fp->_lock->fl_count--;
-		else {
-			/*
-			 * The running thread will release the
-			 * lock now:
-			 */
-			fp->_lock->fl_count = 0;
-			fp->_lock->fl_owner = NULL;
-			_pthread_mutex_unlock(&fp->_lock->fl_mutex);
-		}
-	}
-}
diff --git a/lib/libc/stdio/asprintf.c b/lib/libc/stdio/asprintf.c
deleted file mode 100644
index 02362b0..0000000
--- a/lib/libc/stdio/asprintf.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$OpenBSD: asprintf.c,v 1.8 2002/02/19 19:39:36 millert Exp $	*/
-
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.13 2002/09/26 13:09:48 tjr Exp $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdarg.h>
-
-#include "local.h"
-
-int
-asprintf(char **str, char const *fmt, ...)
-{
-	int ret;
-	va_list ap;
-	FILE f;
-	struct __sFILEX ext;
-
-	f._file = -1;
-	f._flags = __SWR | __SSTR | __SALC;
-	f._bf._base = f._p = (unsigned char *)malloc(128);
-	if (f._bf._base == NULL) {
-		*str = NULL;
-		errno = ENOMEM;
-		return (-1);
-	}
-	f._bf._size = f._w = 127;		/* Leave room for the NUL */
-	f._extra = &ext;
-	INITEXTRA(&f);
-	va_start(ap, fmt);
-	ret = __vfprintf(&f, fmt, ap);		/* Use unlocked __vfprintf */
-	va_end(ap);
-	if (ret < 0) {
-		free(f._bf._base);
-		*str = NULL;
-		errno = ENOMEM;
-		return (-1);
-	}
-	*f._p = '\0';
-	*str = (char *)f._bf._base;
-	return (ret);
-}
diff --git a/lib/libc/stdio/clrerr.c b/lib/libc/stdio/clrerr.c
deleted file mode 100644
index bfac2c1..0000000
--- a/lib/libc/stdio/clrerr.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/clrerr.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#undef	clearerr
-
-void
-clearerr(fp)
-	FILE *fp;
-{
-	FLOCKFILE(fp);
-	__sclearerr(fp);
-	FUNLOCKFILE(fp);
-}
diff --git a/lib/libc/stdio/fclose.c b/lib/libc/stdio/fclose.c
deleted file mode 100644
index ad4dae7..0000000
--- a/lib/libc/stdio/fclose.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fclose.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fclose.c,v 1.11 2002/03/22 21:53:04 obrien Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-int
-fclose(FILE *fp)
-{
-	int r;
-
-	if (fp->_flags == 0) {	/* not open! */
-		errno = EBADF;
-		return (EOF);
-	}
-	FLOCKFILE(fp);
-	r = fp->_flags & __SWR ? __sflush(fp) : 0;
-	if (fp->_close != NULL && (*fp->_close)(fp->_cookie) < 0)
-		r = EOF;
-	if (fp->_flags & __SMBF)
-		free((char *)fp->_bf._base);
-	if (HASUB(fp))
-		FREEUB(fp);
-	if (HASLB(fp))
-		FREELB(fp);
-	fp->_file = -1;
-	fp->_r = fp->_w = 0;	/* Mess up if reaccessed. */
-	fp->_flags = 0;		/* Release this FILE for reuse. */
-	FUNLOCKFILE(fp);
-	return (r);
-}
diff --git a/lib/libc/stdio/fdopen.c b/lib/libc/stdio/fdopen.c
deleted file mode 100644
index 15e7e8f..0000000
--- a/lib/libc/stdio/fdopen.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fdopen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fdopen.c,v 1.7 2002/03/22 21:53:04 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include "un-namespace.h"
-#include "local.h"
-
-FILE *
-fdopen(fd, mode)
-	int fd;
-	const char *mode;
-{
-	FILE *fp;
-	static int nofile;
-	int flags, oflags, fdflags, tmp;
-
-	if (nofile == 0)
-		nofile = getdtablesize();
-
-	if ((flags = __sflags(mode, &oflags)) == 0)
-		return (NULL);
-
-	/* Make sure the mode the user wants is a subset of the actual mode. */
-	if ((fdflags = _fcntl(fd, F_GETFL, 0)) < 0)
-		return (NULL);
-	tmp = fdflags & O_ACCMODE;
-	if (tmp != O_RDWR && (tmp != (oflags & O_ACCMODE))) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if ((fp = __sfp()) == NULL)
-		return (NULL);
-	fp->_flags = flags;
-	/*
-	 * If opened for appending, but underlying descriptor does not have
-	 * O_APPEND bit set, assert __SAPP so that __swrite() caller
-	 * will _sseek() to the end before write.
-	 */
-	if ((oflags & O_APPEND) && !(fdflags & O_APPEND))
-		fp->_flags |= __SAPP;
-	fp->_file = fd;
-	fp->_cookie = fp;
-	fp->_read = __sread;
-	fp->_write = __swrite;
-	fp->_seek = __sseek;
-	fp->_close = __sclose;
-	return (fp);
-}
diff --git a/lib/libc/stdio/feof.c b/lib/libc/stdio/feof.c
deleted file mode 100644
index 7c09187..0000000
--- a/lib/libc/stdio/feof.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/feof.c,v 1.9 2004/03/17 01:43:07 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#undef feof
-
-int
-feof(FILE *fp)
-{
-	int	ret;
-
-	FLOCKFILE(fp);
-	ret= __sfeof(fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
diff --git a/lib/libc/stdio/ferror.c b/lib/libc/stdio/ferror.c
deleted file mode 100644
index 0f960f7..0000000
--- a/lib/libc/stdio/ferror.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ferror.c,v 1.9 2004/03/17 01:43:07 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#undef ferror
-
-int
-ferror(FILE *fp)
-{
-	int	ret;
-
-	FLOCKFILE(fp);
-	ret = __sferror(fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
diff --git a/lib/libc/stdio/fflush.c b/lib/libc/stdio/fflush.c
deleted file mode 100644
index 59da908..0000000
--- a/lib/libc/stdio/fflush.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fflush.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fflush.c,v 1.13 2004/07/04 20:17:00 cperciva Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-static int	sflush_locked(FILE *);
-
-/*
- * Flush a single file, or (if fp is NULL) all files.
- * MT-safe version
- */
-int
-fflush(FILE *fp)
-{
-	int retval;
-
-	if (fp == NULL)
-		return (_fwalk(sflush_locked));
-	FLOCKFILE(fp);
-
-	/*
-	 * There is disagreement about the correct behaviour of fflush()
-	 * when passed a file which is not open for reading.  According to
-	 * the ISO C standard, the behaviour is undefined.
-	 * Under linux, such an fflush returns success and has no effect;
-	 * under Windows, such an fflush is documented as behaving instead
-	 * as fpurge().
-	 * Given that applications may be written with the expectation of
-	 * either of these two behaviours, the only safe (non-astonishing)
-	 * option is to return EBADF and ask that applications be fixed.
-	 */
-	if ((fp->_flags & (__SWR | __SRW)) == 0) {
-		errno = EBADF;
-		retval = EOF;
-	} else
-		retval = __sflush(fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
-
-/*
- * Flush a single file, or (if fp is NULL) all files.
- * Non-MT-safe version
- */
-int
-__fflush(FILE *fp)
-{
-	int retval;
-
-	if (fp == NULL)
-		return (_fwalk(sflush_locked));
-	if ((fp->_flags & (__SWR | __SRW)) == 0) {
-		errno = EBADF;
-		retval = EOF;
-	} else
-		retval = __sflush(fp);
-	return (retval);
-}
-
-int
-__sflush(FILE *fp)
-{
-	unsigned char *p;
-	int n, t;
-
-	t = fp->_flags;
-	if ((t & __SWR) == 0)
-		return (0);
-
-	if ((p = fp->_bf._base) == NULL)
-		return (0);
-
-	n = fp->_p - p;		/* write this much */
-
-	/*
-	 * Set these immediately to avoid problems with longjmp and to allow
-	 * exchange buffering (via setvbuf) in user write function.
-	 */
-	fp->_p = p;
-	fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
-
-	for (; n > 0; n -= t, p += t) {
-		t = _swrite(fp, (char *)p, n);
-		if (t <= 0) {
-			fp->_flags |= __SERR;
-			return (EOF);
-		}
-	}
-	return (0);
-}
-
-static int
-sflush_locked(FILE *fp)
-{
-	int	ret;
-
-	FLOCKFILE(fp);
-	ret = __sflush(fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
diff --git a/lib/libc/stdio/fgetc.c b/lib/libc/stdio/fgetc.c
deleted file mode 100644
index 5cd8c7e..0000000
--- a/lib/libc/stdio/fgetc.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fgetc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetc.c,v 1.12 2004/03/19 09:04:56 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-int
-fgetc(fp)
-	FILE *fp;
-{
-	int retval;
-	FLOCKFILE(fp);
-	/* Orientation set by __sgetc() when buffer is empty. */
-	/* ORIENT(fp, -1); */
-	retval = __sgetc(fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc/stdio/fgetln.c b/lib/libc/stdio/fgetln.c
deleted file mode 100644
index a1b303e..0000000
--- a/lib/libc/stdio/fgetln.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fgetln.c	8.2 (Berkeley) 1/2/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.10 2004/07/16 05:52:51 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-/*
- * Expand the line buffer.  Return -1 on error.
-#ifdef notdef
- * The `new size' does not account for a terminating '\0',
- * so we add 1 here.
-#endif
- */
-int
-__slbexpand(FILE *fp, size_t newsize)
-{
-	void *p;
-
-#ifdef notdef
-	++newsize;
-#endif
-	if (fp->_lb._size >= newsize)
-		return (0);
-	if ((p = realloc(fp->_lb._base, newsize)) == NULL)
-		return (-1);
-	fp->_lb._base = p;
-	fp->_lb._size = newsize;
-	return (0);
-}
-
-/*
- * Get an input line.  The returned pointer often (but not always)
- * points into a stdio buffer.  Fgetln does not alter the text of
- * the returned line (which is thus not a C string because it will
- * not necessarily end with '\0'), but does allow callers to modify
- * it if they wish.  Thus, we set __SMOD in case the caller does.
- */
-char *
-fgetln(FILE *fp, size_t *lenp)
-{
-	unsigned char *p;
-	size_t len;
-	size_t off;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	/* make sure there is input */
-	if (fp->_r <= 0 && __srefill(fp)) {
-		*lenp = 0;
-		FUNLOCKFILE(fp);
-		return (NULL);
-	}
-
-	/* look for a newline in the input */
-	if ((p = memchr((void *)fp->_p, '\n', (size_t)fp->_r)) != NULL) {
-		char *ret;
-
-		/*
-		 * Found one.  Flag buffer as modified to keep fseek from
-		 * `optimising' a backward seek, in case the user stomps on
-		 * the text.
-		 */
-		p++;		/* advance over it */
-		ret = (char *)fp->_p;
-		*lenp = len = p - fp->_p;
-		fp->_flags |= __SMOD;
-		fp->_r -= len;
-		fp->_p = p;
-		FUNLOCKFILE(fp);
-		return (ret);
-	}
-
-	/*
-	 * We have to copy the current buffered data to the line buffer.
-	 * As a bonus, though, we can leave off the __SMOD.
-	 *
-	 * OPTIMISTIC is length that we (optimistically) expect will
-	 * accomodate the `rest' of the string, on each trip through the
-	 * loop below.
-	 */
-#define OPTIMISTIC 80
-
-	for (len = fp->_r, off = 0;; len += fp->_r) {
-		size_t diff;
-
-		/*
-		 * Make sure there is room for more bytes.  Copy data from
-		 * file buffer to line buffer, refill file and look for
-		 * newline.  The loop stops only when we find a newline.
-		 */
-		if (__slbexpand(fp, len + OPTIMISTIC))
-			goto error;
-		(void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
-		    len - off);
-		off = len;
-		if (__srefill(fp))
-			break;	/* EOF or error: return partial line */
-		if ((p = memchr((void *)fp->_p, '\n', (size_t)fp->_r)) == NULL)
-			continue;
-
-		/* got it: finish up the line (like code above) */
-		p++;
-		diff = p - fp->_p;
-		len += diff;
-		if (__slbexpand(fp, len))
-			goto error;
-		(void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
-		    diff);
-		fp->_r -= diff;
-		fp->_p = p;
-		break;
-	}
-	*lenp = len;
-#ifdef notdef
-	fp->_lb._base[len] = 0;
-#endif
-	FUNLOCKFILE(fp);
-	return ((char *)fp->_lb._base);
-
-error:
-	*lenp = 0;		/* ??? */
-	FUNLOCKFILE(fp);
-	return (NULL);		/* ??? */
-}
diff --git a/lib/libc/stdio/fgetpos.c b/lib/libc/stdio/fgetpos.c
deleted file mode 100644
index 581c5c8..0000000
--- a/lib/libc/stdio/fgetpos.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fgetpos.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetpos.c,v 1.12 2002/10/12 16:13:37 mike Exp $");
-
-#include <stdio.h>
-
-int
-fgetpos(FILE * __restrict fp, fpos_t * __restrict pos)
-{
-	/*
-	 * ftello is thread-safe; no need to lock fp.
-	 */
-	if ((*pos = ftello(fp)) == (fpos_t)-1)
-		return (-1);
-	else
-		return (0);
-}
diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
deleted file mode 100644
index 36ae4fd..0000000
--- a/lib/libc/stdio/fgets.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fgets.c	8.2 (Berkeley) 12/22/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgets.c,v 1.13 2002/08/13 09:30:41 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * Read at most n-1 characters from the given file.
- * Stop when a newline has been read, or the count runs out.
- * Return first argument, or NULL if no characters were read.
- */
-char *
-fgets(buf, n, fp)
-	char *buf;
-	int n;
-	FILE *fp;
-{
-	size_t len;
-	char *s;
-	unsigned char *p, *t;
-
-	if (n <= 0)		/* sanity check */
-		return (NULL);
-
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	s = buf;
-	n--;			/* leave space for NUL */
-	while (n != 0) {
-		/*
-		 * If the buffer is empty, refill it.
-		 */
-		if ((len = fp->_r) <= 0) {
-			if (__srefill(fp)) {
-				/* EOF/error: stop with partial or no line */
-				if (s == buf) {
-					FUNLOCKFILE(fp);
-					return (NULL);
-				}
-				break;
-			}
-			len = fp->_r;
-		}
-		p = fp->_p;
-
-		/*
-		 * Scan through at most n bytes of the current buffer,
-		 * looking for '\n'.  If found, copy up to and including
-		 * newline, and stop.  Otherwise, copy entire chunk
-		 * and loop.
-		 */
-		if (len > n)
-			len = n;
-		t = memchr((void *)p, '\n', len);
-		if (t != NULL) {
-			len = ++t - p;
-			fp->_r -= len;
-			fp->_p = t;
-			(void)memcpy((void *)s, (void *)p, len);
-			s[len] = 0;
-			FUNLOCKFILE(fp);
-			return (buf);
-		}
-		fp->_r -= len;
-		fp->_p += len;
-		(void)memcpy((void *)s, (void *)p, len);
-		s += len;
-		n -= len;
-	}
-	*s = 0;
-	FUNLOCKFILE(fp);
-	return (buf);
-}
diff --git a/lib/libc/stdio/fgetwc.c b/lib/libc/stdio/fgetwc.c
deleted file mode 100644
index f4a273a..0000000
--- a/lib/libc/stdio/fgetwc.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwc.c,v 1.12 2004/07/20 08:27:27 tjr Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-
-/*
- * MT-safe version.
- */
-wint_t
-fgetwc(FILE *fp)
-{
-	wint_t r;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	r = __fgetwc(fp);
-	FUNLOCKFILE(fp);
-
-	return (r);
-}
-
-/*
- * Non-MT-safe version.
- */
-wint_t
-__fgetwc(FILE *fp)
-{
-	wchar_t wc;
-	size_t nconv;
-
-	if (fp->_r <= 0 && __srefill(fp))
-		return (WEOF);
-	if (MB_CUR_MAX == 1) {
-		/* Fast path for single-byte encodings. */
-		wc = *fp->_p++;
-		fp->_r--;
-		return (wc);
-	}
-	do {
-		nconv = __mbrtowc(&wc, fp->_p, fp->_r, &fp->_extra->mbstate);
-		if (nconv == (size_t)-1)
-			break;
-		else if (nconv == (size_t)-2)
-			continue;
-		else if (nconv == 0) {
-			/*
-			 * Assume that the only valid representation of
-			 * the null wide character is a single null byte.
-			 */
-			fp->_p++;
-			fp->_r--;
-			return (L'\0');
-		} else {
-			fp->_p += nconv;
-			fp->_r -= nconv;
-			return (wc);
-		}
-	} while (__srefill(fp) == 0);
-	fp->_flags |= __SERR;
-	errno = EILSEQ;
-	return (WEOF);
-}
diff --git a/lib/libc/stdio/fgetwln.c b/lib/libc/stdio/fgetwln.c
deleted file mode 100644
index 49b52af..0000000
--- a/lib/libc/stdio/fgetwln.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwln.c,v 1.2 2004/08/06 17:00:09 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-wchar_t *
-fgetwln(FILE * __restrict fp, size_t *lenp)
-{
-	wint_t wc;
-	size_t len;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-
-	len = 0;
-	while ((wc = __fgetwc(fp)) != WEOF) {
-#define	GROW	512
-		if (len * sizeof(wchar_t) >= fp->_lb._size &&
-		    __slbexpand(fp, (len + GROW) * sizeof(wchar_t)))
-			goto error;
-		*((wchar_t *)fp->_lb._base + len++) = wc;
-		if (wc == L'\n')
-			break;
-	}
-	if (len == 0)
-		goto error;
-
-	FUNLOCKFILE(fp);
-	*lenp = len;
-	return ((wchar_t *)fp->_lb._base);
-
-error:
-	FUNLOCKFILE(fp);
-	*lenp = 0;
-	return (NULL);
-}
diff --git a/lib/libc/stdio/fgetws.c b/lib/libc/stdio/fgetws.c
deleted file mode 100644
index be180c9..0000000
--- a/lib/libc/stdio/fgetws.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-
-wchar_t *
-fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
-{
-	wchar_t *wsp;
-	size_t nconv;
-	const char *src;
-	unsigned char *nl;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-
-	if (n <= 0) {
-		errno = EINVAL;
-		goto error;
-	}
-
-	if (fp->_r <= 0 && __srefill(fp))
-		/* EOF */
-		goto error;
-	wsp = ws;
-	do {
-		src = fp->_p;
-		nl = memchr(fp->_p, '\n', fp->_r);
-		nconv = __mbsnrtowcs(wsp, &src,
-		    nl != NULL ? (nl - fp->_p + 1) : fp->_r,
-		    n - 1, &fp->_extra->mbstate);
-		if (nconv == (size_t)-1)
-			/* Conversion error */
-			goto error;
-		if (src == NULL) {
-			/*
-			 * We hit a null byte. Increment the character count,
-			 * since mbsnrtowcs()'s return value doesn't include
-			 * the terminating null, then resume conversion
-			 * after the null.
-			 */
-			nconv++;
-			src = memchr(fp->_p, '\0', fp->_r);
-			src++;
-		}
-		fp->_r -= (unsigned char *)src - fp->_p;
-		fp->_p = (unsigned char *)src;
-		n -= nconv;
-		wsp += nconv;
-	} while (wsp[-1] != L'\n' && n > 1 && (fp->_r > 0 ||
-	    __srefill(fp) == 0));
-	if (wsp == ws)
-		/* EOF */
-		goto error;
-	if (!__mbsinit(&fp->_extra->mbstate))
-		/* Incomplete character */
-		goto error;
-	*wsp++ = L'\0';
-	FUNLOCKFILE(fp);
-
-	return (ws);
-
-error:
-	FUNLOCKFILE(fp);
-	return (NULL);
-}
diff --git a/lib/libc/stdio/fileno.c b/lib/libc/stdio/fileno.c
deleted file mode 100644
index 60bac45..0000000
--- a/lib/libc/stdio/fileno.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fileno.c,v 1.10 2004/03/17 01:43:07 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#undef fileno
-
-int
-fileno(FILE *fp)
-{
-	int fd;
-
-	FLOCKFILE(fp);
-	fd = __sfileno(fp);
-	FUNLOCKFILE(fp);
-
-	return (fd);
-}
diff --git a/lib/libc/stdio/findfp.c b/lib/libc/stdio/findfp.c
deleted file mode 100644
index 2621966..0000000
--- a/lib/libc/stdio/findfp.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)findfp.c	8.2 (Berkeley) 1/4/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/findfp.c,v 1.29 2004/05/22 15:19:41 tjr Exp $");
-
-#include <sys/param.h>
-#include <machine/atomic.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <spinlock.h>
-
-#include "libc_private.h"
-#include "local.h"
-#include "glue.h"
-
-int	__sdidinit;
-
-#define	NDYNAMIC 10		/* add ten more whenever necessary */
-
-#define	std(flags, file) \
-  	{0,0,0,flags,file,{0},0,__sF+file,__sclose,__sread,__sseek,__swrite, \
-	 {0}, __sFX + file}
-  /*	 p r w flags file _bf z  cookie      close    read    seek    write */
-  /*     _ub _extra */
-				/* the usual - (stdin + stdout + stderr) */
-static FILE usual[FOPEN_MAX - 3];
-static struct __sFILEX usual_extra[FOPEN_MAX - 3];
-static struct glue uglue = { NULL, FOPEN_MAX - 3, usual };
-
-static struct __sFILEX __sFX[3];
-
-/*
- * We can't make this 'static' until 6.0-current due to binary
- * compatibility concerns.  This also means we cannot change the
- * sizeof(FILE) until that time either and must continue to use the
- * __sFILEX stuff to add to FILE.
- */
-FILE __sF[3] = {
-	std(__SRD, STDIN_FILENO),
-	std(__SWR, STDOUT_FILENO),
-	std(__SWR|__SNBF, STDERR_FILENO)
-};
-
-/*
- * The following kludge is done to ensure enough binary compatibility
- * with future versions of libc.  Or rather it allows us to work with
- * libraries that have been built with a newer libc that defines these
- * symbols and expects libc to provide them.  We only have need to support
- * i386 and alpha because they are the only "old" systems we have deployed.
- */
-FILE *__stdinp = &__sF[0];
-FILE *__stdoutp = &__sF[1];
-FILE *__stderrp = &__sF[2];
-
-struct glue __sglue = { &uglue, 3, __sF };
-static struct glue *lastglue = &uglue;
-
-static struct glue *	moreglue(int);
-
-static spinlock_t thread_lock = _SPINLOCK_INITIALIZER;
-#define THREAD_LOCK()	if (__isthreaded) _SPINLOCK(&thread_lock)
-#define THREAD_UNLOCK()	if (__isthreaded) _SPINUNLOCK(&thread_lock)
-
-#if NOT_YET
-#define	SET_GLUE_PTR(ptr, val)	atomic_set_rel_ptr(&(ptr), (uintptr_t)(val))
-#else
-#define	SET_GLUE_PTR(ptr, val)	ptr = val
-#endif
-
-static struct glue *
-moreglue(n)
-	int n;
-{
-	struct glue *g;
-	static FILE empty;
-	static struct __sFILEX emptyx;
-	FILE *p;
-	struct __sFILEX *fx;
-
-	g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE) +
-	    n * sizeof(struct __sFILEX));
-	if (g == NULL)
-		return (NULL);
-	p = (FILE *)ALIGN(g + 1);
-	fx = (struct __sFILEX *)&p[n];
-	g->next = NULL;
-	g->niobs = n;
-	g->iobs = p;
-	while (--n >= 0) {
-		*p = empty;
-		p->_extra = fx;
-		*p->_extra = emptyx;
-		p++, fx++;
-	}
-	return (g);
-}
-
-/*
- * Find a free FILE for fopen et al.
- */
-FILE *
-__sfp()
-{
-	FILE	*fp;
-	int	n;
-	struct glue *g;
-
-	if (!__sdidinit)
-		__sinit();
-	/*
-	 * The list must be locked because a FILE may be updated.
-	 */
-	THREAD_LOCK();
-	for (g = &__sglue; g != NULL; g = g->next) {
-		for (fp = g->iobs, n = g->niobs; --n >= 0; fp++)
-			if (fp->_flags == 0)
-				goto found;
-	}
-	THREAD_UNLOCK();	/* don't hold lock while malloc()ing. */
-	if ((g = moreglue(NDYNAMIC)) == NULL)
-		return (NULL);
-	THREAD_LOCK();		/* reacquire the lock */
-	SET_GLUE_PTR(lastglue->next, g); /* atomically append glue to list */
-	lastglue = g;		/* not atomic; only accessed when locked */
-	fp = g->iobs;
-found:
-	fp->_flags = 1;		/* reserve this slot; caller sets real flags */
-	THREAD_UNLOCK();
-	fp->_p = NULL;		/* no current pointer */
-	fp->_w = 0;		/* nothing to read or write */
-	fp->_r = 0;
-	fp->_bf._base = NULL;	/* no buffer */
-	fp->_bf._size = 0;
-	fp->_lbfsize = 0;	/* not line buffered */
-	fp->_file = -1;		/* no file */
-/*	fp->_cookie = <any>; */	/* caller sets cookie, _read/_write etc */
-	fp->_ub._base = NULL;	/* no ungetc buffer */
-	fp->_ub._size = 0;
-	fp->_lb._base = NULL;	/* no line buffer */
-	fp->_lb._size = 0;
-/*	fp->_lock = NULL; */	/* once set always set (reused) */
-	fp->_extra->orientation = 0;
-	memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t));
-	return (fp);
-}
-
-/*
- * XXX.  Force immediate allocation of internal memory.  Not used by stdio,
- * but documented historically for certain applications.  Bad applications.
- */
-__warn_references(f_prealloc, 
-	"warning: this program uses f_prealloc(), which is not recommended.");
-
-void
-f_prealloc()
-{
-	struct glue *g;
-	int n;
-
-	n = getdtablesize() - FOPEN_MAX + 20;		/* 20 for slop. */
-	/*
-	 * It should be safe to walk the list without locking it;
-	 * new nodes are only added to the end and none are ever
-	 * removed.
-	 */
-	for (g = &__sglue; (n -= g->niobs) > 0 && g->next; g = g->next)
-		/* void */;
-	if ((n > 0) && ((g = moreglue(n)) != NULL)) {
-		THREAD_LOCK();
-		SET_GLUE_PTR(lastglue->next, g);
-		lastglue = g;
-		THREAD_UNLOCK();
-	}
-}
-
-/*
- * exit() calls _cleanup() through *__cleanup, set whenever we
- * open or buffer a file.  This chicanery is done so that programs
- * that do not use stdio need not link it all in.
- *
- * The name `_cleanup' is, alas, fairly well known outside stdio.
- */
-void
-_cleanup()
-{
-	/* (void) _fwalk(fclose); */
-	(void) _fwalk(__sflush);		/* `cheating' */
-}
-
-/*
- * __sinit() is called whenever stdio's internal variables must be set up.
- */
-void
-__sinit()
-{
-	int	i;
-
-	THREAD_LOCK();
-	if (__sdidinit == 0) {
-		/* Set _extra for the usual suspects. */
-		for (i = 0; i < FOPEN_MAX - 3; i++)
-			usual[i]._extra = &usual_extra[i];
-
-		/* Make sure we clean up on exit. */
-		__cleanup = _cleanup;		/* conservative */
-		__sdidinit = 1;
-	}
-	THREAD_UNLOCK();
-}
diff --git a/lib/libc/stdio/flags.c b/lib/libc/stdio/flags.c
deleted file mode 100644
index cd90f83..0000000
--- a/lib/libc/stdio/flags.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)flags.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/flags.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include "local.h"
-
-/*
- * Return the (stdio) flags for a given mode.  Store the flags
- * to be passed to an _open() syscall through *optr.
- * Return 0 on error.
- */
-int
-__sflags(mode, optr)
-	const char *mode;
-	int *optr;
-{
-	int ret, m, o;
-
-	switch (*mode++) {
-
-	case 'r':	/* open for reading */
-		ret = __SRD;
-		m = O_RDONLY;
-		o = 0;
-		break;
-
-	case 'w':	/* open for writing */
-		ret = __SWR;
-		m = O_WRONLY;
-		o = O_CREAT | O_TRUNC;
-		break;
-
-	case 'a':	/* open for appending */
-		ret = __SWR;
-		m = O_WRONLY;
-		o = O_CREAT | O_APPEND;
-		break;
-
-	default:	/* illegal mode */
-		errno = EINVAL;
-		return (0);
-	}
-
-	/* [rwa]\+ or [rwa]b\+ means read and write */
-	if (*mode == '+' || (*mode == 'b' && mode[1] == '+')) {
-		ret = __SRW;
-		m = O_RDWR;
-	}
-	*optr = m | o;
-	return (ret);
-}
diff --git a/lib/libc/stdio/floatio.h b/lib/libc/stdio/floatio.h
deleted file mode 100644
index 83beec7..0000000
--- a/lib/libc/stdio/floatio.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- *
- *	@(#)floatio.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/lib/libc/stdio/floatio.h,v 1.5 2004/01/18 08:28:47 das Exp $
- */
-
-/*
- * Floating point scanf/printf (input/output) definitions.
- */
-
-/*
- * MAXEXPDIG is the maximum number of decimal digits needed to store a
- * floating point exponent in the largest supported format.  It should
- * be ceil(log10(LDBL_MAX_10_EXP)) or, if hexadecimal floating point
- * conversions are supported, ceil(log10(LDBL_MAX_EXP)).  But since it
- * is presently never greater than 5 in practice, we fudge it.
- */
-#define	MAXEXPDIG	6
-#if LDBL_MAX_EXP > 999999
-#error "floating point buffers too small"
-#endif
-
-char *__hdtoa(double, const char *, int, int *, int *, char **);
-char *__hldtoa(long double, const char *, int, int *, int *, char **);
-char *__ldtoa(long double *, int, int, int *, int *, char **);
diff --git a/lib/libc/stdio/fopen.c b/lib/libc/stdio/fopen.c
deleted file mode 100644
index 5a043ca..0000000
--- a/lib/libc/stdio/fopen.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fopen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.10 2002/10/12 16:13:37 mike Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <errno.h>
-#include "un-namespace.h"
-
-#include "local.h"
-
-FILE *
-fopen(file, mode)
-	const char * __restrict file;
-	const char * __restrict mode;
-{
-	FILE *fp;
-	int f;
-	int flags, oflags;
-
-	if ((flags = __sflags(mode, &oflags)) == 0)
-		return (NULL);
-	if ((fp = __sfp()) == NULL)
-		return (NULL);
-	if ((f = _open(file, oflags, DEFFILEMODE)) < 0) {
-		fp->_flags = 0;			/* release */
-		return (NULL);
-	}
-	fp->_file = f;
-	fp->_flags = flags;
-	fp->_cookie = fp;
-	fp->_read = __sread;
-	fp->_write = __swrite;
-	fp->_seek = __sseek;
-	fp->_close = __sclose;
-	/*
-	 * When opening in append mode, even though we use O_APPEND,
-	 * we need to seek to the end so that ftell() gets the right
-	 * answer.  If the user then alters the seek pointer, or
-	 * the file extends, this will fail, but there is not much
-	 * we can do about this.  (We could set __SAPP and check in
-	 * fseek and ftell.)
-	 */
-	if (oflags & O_APPEND)
-		(void)_sseek(fp, (fpos_t)0, SEEK_END);
-	return (fp);
-}
diff --git a/lib/libc/stdio/fprintf.c b/lib/libc/stdio/fprintf.c
deleted file mode 100644
index 35093b0..0000000
--- a/lib/libc/stdio/fprintf.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fprintf.c,v 1.10 2002/09/06 11:23:55 tjr Exp $");
-
-#include <stdio.h>
-#include <stdarg.h>
-
-int
-fprintf(FILE * __restrict fp, const char * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfprintf(fp, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc/stdio/fpurge.c b/lib/libc/stdio/fpurge.c
deleted file mode 100644
index f191843..0000000
--- a/lib/libc/stdio/fpurge.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fpurge.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fpurge.c,v 1.10 2002/03/22 21:53:04 obrien Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * fpurge: like fflush, but without writing anything: leave the
- * given FILE's buffer empty.
- */
-int
-fpurge(fp)
-	FILE *fp;
-{
-	int retval;
-	FLOCKFILE(fp);
-	if (!fp->_flags) {
-		errno = EBADF;
-		retval = EOF;
-	} else {
-		if (HASUB(fp))
-			FREEUB(fp);
-		fp->_p = fp->_bf._base;
-		fp->_r = 0;
-		fp->_w = fp->_flags & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
-		retval = 0;
-	}
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc/stdio/fputc.c b/lib/libc/stdio/fputc.c
deleted file mode 100644
index a10af2b..0000000
--- a/lib/libc/stdio/fputc.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fputc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fputc.c,v 1.13 2004/03/19 09:04:56 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-int
-fputc(c, fp)
-	int c;
-	FILE *fp;
-{
-	int retval;
-	FLOCKFILE(fp);
-	/* Orientation set by __sputc() when buffer is full. */
-	/* ORIENT(fp, -1); */
-	retval = __sputc(c, fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc/stdio/fputs.c b/lib/libc/stdio/fputs.c
deleted file mode 100644
index 58278ab..0000000
--- a/lib/libc/stdio/fputs.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fputs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fputs.c,v 1.11 2002/10/12 16:13:37 mike Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-#include "local.h"
-
-/*
- * Write the given string to the given file.
- */
-int
-fputs(s, fp)
-	const char * __restrict s;
-	FILE * __restrict fp;
-{
-	int retval;
-	struct __suio uio;
-	struct __siov iov;
-
-	iov.iov_base = (void *)s;
-	iov.iov_len = uio.uio_resid = strlen(s);
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	retval = __sfvwrite(fp, &uio);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c
deleted file mode 100644
index dfe876f..0000000
--- a/lib/libc/stdio/fputwc.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fputwc.c,v 1.10 2004/07/20 08:27:27 tjr Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-
-/*
- * Non-MT-safe version.
- */
-wint_t
-__fputwc(wchar_t wc, FILE *fp)
-{
-	char buf[MB_LEN_MAX];
-	size_t i, len;
-
-	if (MB_CUR_MAX == 1 && wc > 0 && wc <= UCHAR_MAX) {
-		/*
-		 * Assume single-byte locale with no special encoding.
-		 * A more careful test would be to check
-		 * _CurrentRuneLocale->encoding.
-		 */
-		*buf = (unsigned char)wc;
-		len = 1;
-	} else {
-		if ((len = __wcrtomb(buf, wc, &fp->_extra->mbstate)) ==
-		    (size_t)-1) {
-			fp->_flags |= __SERR;
-			return (WEOF);
-		}
-	}
-
-	for (i = 0; i < len; i++)
-		if (__sputc((unsigned char)buf[i], fp) == EOF)
-			return (WEOF);
-
-	return ((wint_t)wc);
-}
-
-/*
- * MT-safe version.
- */
-wint_t
-fputwc(wchar_t wc, FILE *fp)
-{
-	wint_t r;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	r = __fputwc(wc, fp);
-	FUNLOCKFILE(fp);
-
-	return (r);
-}
diff --git a/lib/libc/stdio/fputws.c b/lib/libc/stdio/fputws.c
deleted file mode 100644
index fea5914..0000000
--- a/lib/libc/stdio/fputws.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fputws.c,v 1.6 2004/07/21 10:54:57 tjr Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-
-int
-fputws(const wchar_t * __restrict ws, FILE * __restrict fp)
-{
-	size_t nbytes;
-	char buf[BUFSIZ];
-	struct __suio uio;
-	struct __siov iov;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	if (prepwrite(fp) != 0)
-		goto error;
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-	iov.iov_base = buf;
-	do {
-		nbytes = __wcsnrtombs(buf, &ws, SIZE_T_MAX, sizeof(buf),
-		    &fp->_extra->mbstate);
-		if (nbytes == (size_t)-1)
-			goto error;
-		iov.iov_len = uio.uio_resid = nbytes;
-		if (__sfvwrite(fp, &uio) != 0)
-			goto error;
-	} while (ws != NULL);
-	FUNLOCKFILE(fp);
-	return (0);
-
-error:
-	FUNLOCKFILE(fp);
-	return (-1);
-}
diff --git a/lib/libc/stdio/fread.c b/lib/libc/stdio/fread.c
deleted file mode 100644
index 2f42e53..0000000
--- a/lib/libc/stdio/fread.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fread.c	8.2 (Berkeley) 12/11/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fread.c,v 1.12.14.1 2005/12/23 06:07:43 davidxu Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * MT-safe version
- */
-
-size_t
-fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = __fread(buf, size, count, fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-size_t
-__fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
-{
-	size_t resid;
-	char *p;
-	int r;
-	size_t total;
-
-	/*
-	 * The ANSI standard requires a return value of 0 for a count
-	 * or a size of 0.  Peculiarily, it imposes no such requirements
-	 * on fwrite; it only requires fread to be broken.
-	 */
-	if ((resid = count * size) == 0)
-		return (0);
-	ORIENT(fp, -1);
-	if (fp->_r < 0)
-		fp->_r = 0;
-	total = resid;
-	p = buf;
-	while (resid > (r = fp->_r)) {
-		(void)memcpy((void *)p, (void *)fp->_p, (size_t)r);
-		fp->_p += r;
-		/* fp->_r = 0 ... done in __srefill */
-		p += r;
-		resid -= r;
-		if (__srefill(fp)) {
-			/* no more input: return partial result */
-			return ((total - resid) / size);
-		}
-	}
-	(void)memcpy((void *)p, (void *)fp->_p, resid);
-	fp->_r -= resid;
-	fp->_p += resid;
-	return (count);
-}
diff --git a/lib/libc/stdio/freopen.c b/lib/libc/stdio/freopen.c
deleted file mode 100644
index ddd978e..0000000
--- a/lib/libc/stdio/freopen.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)freopen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/freopen.c,v 1.13 2004/05/22 15:19:41 tjr Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-/*
- * Re-direct an existing, open (probably) file to some other file.
- * ANSI is written such that the original file gets closed if at
- * all possible, no matter what.
- */
-FILE *
-freopen(file, mode, fp)
-	const char * __restrict file;
-	const char * __restrict mode;
-	FILE *fp;
-{
-	int f;
-	int dflags, flags, isopen, oflags, sverrno, wantfd;
-
-	if ((flags = __sflags(mode, &oflags)) == 0) {
-		(void) fclose(fp);
-		return (NULL);
-	}
-
-	FLOCKFILE(fp);
-
-	if (!__sdidinit)
-		__sinit();
-
-	/*
-	 * If the filename is a NULL pointer, the caller is asking us to
-	 * re-open the same file with a different mode. We allow this only
-	 * if the modes are compatible.
-	 */
-	if (file == NULL) {
-		/* See comment below regarding freopen() of closed files. */
-		if (fp->_flags == 0) {
-			FUNLOCKFILE(fp);
-			errno = EINVAL;
-			return (NULL);
-		}
-		if ((dflags = _fcntl(fp->_file, F_GETFL)) < 0) {
-			sverrno = errno;
-			fclose(fp);
-			FUNLOCKFILE(fp);
-			errno = sverrno;
-			return (NULL);
-		}
-		if ((dflags & O_ACCMODE) != O_RDWR && (dflags & O_ACCMODE) !=
-		    (oflags & O_ACCMODE)) {
-			fclose(fp);
-			FUNLOCKFILE(fp);
-			errno = EINVAL;
-			return (NULL);
-		}
-		if ((oflags ^ dflags) & O_APPEND) {
-			dflags &= ~O_APPEND;
-			dflags |= oflags & O_APPEND;
-			if (_fcntl(fp->_file, F_SETFL, dflags) < 0) {
-				sverrno = errno;
-				fclose(fp);
-				FUNLOCKFILE(fp);
-				errno = sverrno;
-				return (NULL);
-			}
-		}
-		if (oflags & O_TRUNC)
-			ftruncate(fp->_file, 0);
-		if (_fseeko(fp, 0, oflags & O_APPEND ? SEEK_END : SEEK_SET,
-		    0) < 0 && errno != ESPIPE) {
-			sverrno = errno;
-			fclose(fp);
-			FUNLOCKFILE(fp);
-			errno = sverrno;
-			return (NULL);
-		}
-		f = fp->_file;
-		isopen = 0;
-		wantfd = -1;
-		goto finish;
-	}
-
-	/*
-	 * There are actually programs that depend on being able to "freopen"
-	 * descriptors that weren't originally open.  Keep this from breaking.
-	 * Remember whether the stream was open to begin with, and which file
-	 * descriptor (if any) was associated with it.  If it was attached to
-	 * a descriptor, defer closing it; freopen("/dev/stdin", "r", stdin)
-	 * should work.  This is unnecessary if it was not a Unix file.
-	 */
-	if (fp->_flags == 0) {
-		fp->_flags = __SEOF;	/* hold on to it */
-		isopen = 0;
-		wantfd = -1;
-	} else {
-		/* flush the stream; ANSI doesn't require this. */
-		if (fp->_flags & __SWR)
-			(void) __sflush(fp);
-		/* if close is NULL, closing is a no-op, hence pointless */
-		isopen = fp->_close != NULL;
-		if ((wantfd = fp->_file) < 0 && isopen) {
-			(void) (*fp->_close)(fp->_cookie);
-			isopen = 0;
-		}
-	}
-
-	/* Get a new descriptor to refer to the new file. */
-	f = _open(file, oflags, DEFFILEMODE);
-	if (f < 0 && isopen) {
-		/* If out of fd's close the old one and try again. */
-		if (errno == ENFILE || errno == EMFILE) {
-			(void) (*fp->_close)(fp->_cookie);
-			isopen = 0;
-			f = _open(file, oflags, DEFFILEMODE);
-		}
-	}
-	sverrno = errno;
-
-finish:
-	/*
-	 * Finish closing fp.  Even if the open succeeded above, we cannot
-	 * keep fp->_base: it may be the wrong size.  This loses the effect
-	 * of any setbuffer calls, but stdio has always done this before.
-	 */
-	if (isopen)
-		(void) (*fp->_close)(fp->_cookie);
-	if (fp->_flags & __SMBF)
-		free((char *)fp->_bf._base);
-	fp->_w = 0;
-	fp->_r = 0;
-	fp->_p = NULL;
-	fp->_bf._base = NULL;
-	fp->_bf._size = 0;
-	fp->_lbfsize = 0;
-	if (HASUB(fp))
-		FREEUB(fp);
-	fp->_ub._size = 0;
-	if (HASLB(fp))
-		FREELB(fp);
-	fp->_lb._size = 0;
-	fp->_extra->orientation = 0;
-	memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t));
-
-	if (f < 0) {			/* did not get it after all */
-		fp->_flags = 0;		/* set it free */
-		errno = sverrno;	/* restore in case _close clobbered */
-		FUNLOCKFILE(fp);
-		return (NULL);
-	}
-
-	/*
-	 * If reopening something that was open before on a real file, try
-	 * to maintain the descriptor.  Various C library routines (perror)
-	 * assume stderr is always fd STDERR_FILENO, even if being freopen'd.
-	 */
-	if (wantfd >= 0 && f != wantfd) {
-		if (_dup2(f, wantfd) >= 0) {
-			(void)_close(f);
-			f = wantfd;
-		}
-	}
-
-	fp->_flags = flags;
-	fp->_file = f;
-	fp->_cookie = fp;
-	fp->_read = __sread;
-	fp->_write = __swrite;
-	fp->_seek = __sseek;
-	fp->_close = __sclose;
-	FUNLOCKFILE(fp);
-	return (fp);
-}
diff --git a/lib/libc/stdio/fscanf.c b/lib/libc/stdio/fscanf.c
deleted file mode 100644
index aaad500..0000000
--- a/lib/libc/stdio/fscanf.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-int
-fscanf(FILE * __restrict fp, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	FLOCKFILE(fp);
-	ret = __svfscanf(fp, fmt, ap);
-	va_end(ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c
deleted file mode 100644
index e6a5bd6..0000000
--- a/lib/libc/stdio/fseek.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fseek.c	8.3 (Berkeley) 1/2/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fseek.c,v 1.41 2004/05/22 15:19:41 tjr Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-#define	POS_ERR	(-(fpos_t)1)
-
-int
-fseek(fp, offset, whence)
-	FILE *fp;
-	long offset;
-	int whence;
-{
-	int ret;
-	int serrno = errno;
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	FLOCKFILE(fp);
-	ret = _fseeko(fp, (off_t)offset, whence, 1);
-	FUNLOCKFILE(fp);
-	if (ret == 0)
-		errno = serrno;
-	return (ret);
-}
-
-int
-fseeko(fp, offset, whence)
-	FILE *fp;
-	off_t offset;
-	int whence;
-{
-	int ret;
-	int serrno = errno;
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	FLOCKFILE(fp);
-	ret = _fseeko(fp, offset, whence, 0);
-	FUNLOCKFILE(fp);
-	if (ret == 0)
-		errno = serrno;
-	return (ret);
-}
-
-/*
- * Seek the given file to the given offset.
- * `Whence' must be one of the three SEEK_* macros.
- */
-int
-_fseeko(fp, offset, whence, ltest)
-	FILE *fp;
-	off_t offset;
-	int whence;
-	int ltest;
-{
-	fpos_t (*seekfn)(void *, fpos_t, int);
-	fpos_t target, curoff, ret;
-	size_t n;
-	struct stat st;
-	int havepos;
-
-	/*
-	 * Have to be able to seek.
-	 */
-	if ((seekfn = fp->_seek) == NULL) {
-		errno = ESPIPE;		/* historic practice */
-		return (-1);
-	}
-
-	/*
-	 * Change any SEEK_CUR to SEEK_SET, and check `whence' argument.
-	 * After this, whence is either SEEK_SET or SEEK_END.
-	 */
-	switch (whence) {
-
-	case SEEK_CUR:
-		/*
-		 * In order to seek relative to the current stream offset,
-		 * we have to first find the current stream offset via
-		 * ftell (see ftell for details).
-		 */
-		if (_ftello(fp, &curoff))
-			return (-1);
-		if (curoff < 0) {
-			/* Unspecified position because of ungetc() at 0 */
-			errno = ESPIPE;
-			return (-1);
-		}
-		if (offset > 0 && curoff > OFF_MAX - offset) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		offset += curoff;
-		if (offset < 0) {
-			errno = EINVAL;
-			return (-1);
-		}
-		if (ltest && offset > LONG_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		whence = SEEK_SET;
-		havepos = 1;
-		break;
-
-	case SEEK_SET:
-		if (offset < 0) {
-			errno = EINVAL;
-			return (-1);
-		}
-	case SEEK_END:
-		curoff = 0;		/* XXX just to keep gcc quiet */
-		havepos = 0;
-		break;
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/*
-	 * Can only optimise if:
-	 *	reading (and not reading-and-writing);
-	 *	not unbuffered; and
-	 *	this is a `regular' Unix file (and hence seekfn==__sseek).
-	 * We must check __NBF first, because it is possible to have __NBF
-	 * and __SOPT both set.
-	 */
-	if (fp->_bf._base == NULL)
-		__smakebuf(fp);
-	if (fp->_flags & (__SWR | __SRW | __SNBF | __SNPT))
-		goto dumb;
-	if ((fp->_flags & __SOPT) == 0) {
-		if (seekfn != __sseek ||
-		    fp->_file < 0 || _fstat(fp->_file, &st) ||
-		    (st.st_mode & S_IFMT) != S_IFREG) {
-			fp->_flags |= __SNPT;
-			goto dumb;
-		}
-		fp->_blksize = st.st_blksize;
-		fp->_flags |= __SOPT;
-	}
-
-	/*
-	 * We are reading; we can try to optimise.
-	 * Figure out where we are going and where we are now.
-	 */
-	if (whence == SEEK_SET)
-		target = offset;
-	else {
-		if (_fstat(fp->_file, &st))
-			goto dumb;
-		if (offset > 0 && st.st_size > OFF_MAX - offset) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		target = st.st_size + offset;
-		if ((off_t)target < 0) {
-			errno = EINVAL;
-			return (-1);
-		}
-		if (ltest && (off_t)target > LONG_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-	}
-
-	if (!havepos && _ftello(fp, &curoff))
-		goto dumb;
-
-	/*
-	 * (If the buffer was modified, we have to
-	 * skip this; see fgetln.c.)
-	 */
-	if (fp->_flags & __SMOD)
-		goto abspos;
-
-	/*
-	 * Compute the number of bytes in the input buffer (pretending
-	 * that any ungetc() input has been discarded).  Adjust current
-	 * offset backwards by this count so that it represents the
-	 * file offset for the first byte in the current input buffer.
-	 */
-	if (HASUB(fp)) {
-		curoff += fp->_r;	/* kill off ungetc */
-		n = fp->_extra->_up - fp->_bf._base;
-		curoff -= n;
-		n += fp->_ur;
-	} else {
-		n = fp->_p - fp->_bf._base;
-		curoff -= n;
-		n += fp->_r;
-	}
-
-	/*
-	 * If the target offset is within the current buffer,
-	 * simply adjust the pointers, clear EOF, undo ungetc(),
-	 * and return.
-	 */
-	if (target >= curoff && target < curoff + n) {
-		size_t o = target - curoff;
-
-		fp->_p = fp->_bf._base + o;
-		fp->_r = n - o;
-		if (HASUB(fp))
-			FREEUB(fp);
-		fp->_flags &= ~__SEOF;
-		memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t));
-		return (0);
-	}
-
-abspos:
-	/*
-	 * The place we want to get to is not within the current buffer,
-	 * but we can still be kind to the kernel copyout mechanism.
-	 * By aligning the file offset to a block boundary, we can let
-	 * the kernel use the VM hardware to map pages instead of
-	 * copying bytes laboriously.  Using a block boundary also
-	 * ensures that we only read one block, rather than two.
-	 */
-	curoff = target & ~(fp->_blksize - 1);
-	if (_sseek(fp, curoff, SEEK_SET) == POS_ERR)
-		goto dumb;
-	fp->_r = 0;
-	fp->_p = fp->_bf._base;
-	if (HASUB(fp))
-		FREEUB(fp);
-	n = target - curoff;
-	if (n) {
-		if (__srefill(fp) || fp->_r < n)
-			goto dumb;
-		fp->_p += n;
-		fp->_r -= n;
-	}
-	fp->_flags &= ~__SEOF;
-	return (0);
-
-	/*
-	 * We get here if we cannot optimise the seek ... just
-	 * do it.  Allow the seek function to change fp->_bf._base.
-	 */
-dumb:
-	if (__sflush(fp) ||
-	    (ret = _sseek(fp, (fpos_t)offset, whence)) == POS_ERR)
-		return (-1);
-	/* success: clear EOF indicator and discard ungetc() data */
-	if (HASUB(fp))
-		FREEUB(fp);
-	fp->_p = fp->_bf._base;
-	fp->_r = 0;
-	/* fp->_w = 0; */	/* unnecessary (I think...) */
-	fp->_flags &= ~__SEOF;
-	memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t));
-	if (ltest && ret > LONG_MAX) {
-		fp->_flags |= __SERR;
-		errno = EOVERFLOW;
-		return (-1);
-	}
-	return (0);
-}
diff --git a/lib/libc/stdio/fsetpos.c b/lib/libc/stdio/fsetpos.c
deleted file mode 100644
index 6d75acd..0000000
--- a/lib/libc/stdio/fsetpos.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fsetpos.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fsetpos.c,v 1.8 2002/03/22 21:53:04 obrien Exp $");
-
-#include <sys/types.h>
-#include <stdio.h>
-
-/*
- * fsetpos: like fseek.
- */
-int
-fsetpos(iop, pos)
-	FILE *iop;
-	const fpos_t *pos;
-{
-	return (fseeko(iop, (off_t)*pos, SEEK_SET));
-}
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c
deleted file mode 100644
index 477e3a1..0000000
--- a/lib/libc/stdio/ftell.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ftell.c	8.2 (Berkeley) 5/4/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ftell.c,v 1.26 2002/03/22 21:53:04 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * standard ftell function.
- */
-long
-ftell(fp)
-	FILE *fp;
-{
-	off_t rv;
-
-	rv = ftello(fp);
-	if (rv > LONG_MAX) {
-		errno = EOVERFLOW;
-		return (-1);
-	}
-	return (rv);
-}
-
-/*
- * ftello: return current offset.
- */
-off_t
-ftello(fp)
-	FILE *fp;
-{
-	fpos_t rv;
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = _ftello(fp, &rv);
-	FUNLOCKFILE(fp);
-	if (ret)
-		return (-1);
-	if (rv < 0) {   /* Unspecified value because of ungetc() at 0 */
-		errno = ESPIPE;
-		return (-1);
-	}
-	return (rv);
-}
-
-int
-_ftello(fp, offset)
-	FILE *fp;
-	fpos_t *offset;
-{
-	fpos_t pos;
-	size_t n;
-
-	if (fp->_seek == NULL) {
-		errno = ESPIPE;			/* historic practice */
-		return (1);
-	}
-
-	/*
-	 * Find offset of underlying I/O object, then
-	 * adjust for buffered bytes.
-	 */
-	if (fp->_flags & __SOFF)
-		pos = fp->_offset;
-	else {
-		pos = _sseek(fp, (fpos_t)0, SEEK_CUR);
-		if (pos == -1)
-			return (1);
-	}
-	if (fp->_flags & __SRD) {
-		/*
-		 * Reading.  Any unread characters (including
-		 * those from ungetc) cause the position to be
-		 * smaller than that in the underlying object.
-		 */
-		if ((pos -= (HASUB(fp) ? fp->_ur : fp->_r)) < 0) {
-			fp->_flags |= __SERR;
-			errno = EIO;
-			return (1);
-		}
-		if (HASUB(fp))
-			pos -= fp->_r;  /* Can be negative at this point. */
-	} else if ((fp->_flags & __SWR) && fp->_p != NULL) {
-		/*
-		 * Writing.  Any buffered characters cause the
-		 * position to be greater than that in the
-		 * underlying object.
-		 */
-		n = fp->_p - fp->_bf._base;
-		if (pos > OFF_MAX - n) {
-			errno = EOVERFLOW;
-			return (1);
-		}
-		pos += n;
-	}
-	*offset = pos;
-	return (0);
-}
diff --git a/lib/libc/stdio/funopen.c b/lib/libc/stdio/funopen.c
deleted file mode 100644
index 040c806..0000000
--- a/lib/libc/stdio/funopen.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)funopen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/funopen.c,v 1.5 2002/05/28 16:59:39 alfred Exp $");
-
-#include <stdio.h>
-#include <errno.h>
-
-#include "local.h"
-
-FILE *
-funopen(cookie, readfn, writefn, seekfn, closefn)
-	const void *cookie;
-	int (*readfn)(), (*writefn)();
-	fpos_t (*seekfn)(void *cookie, fpos_t off, int whence);
-	int (*closefn)();
-{
-	FILE *fp;
-	int flags;
-
-	if (readfn == NULL) {
-		if (writefn == NULL) {		/* illegal */
-			errno = EINVAL;
-			return (NULL);
-		} else
-			flags = __SWR;		/* write only */
-	} else {
-		if (writefn == NULL)
-			flags = __SRD;		/* read only */
-		else
-			flags = __SRW;		/* read-write */
-	}
-	if ((fp = __sfp()) == NULL)
-		return (NULL);
-	fp->_flags = flags;
-	fp->_file = -1;
-	fp->_cookie = (void *)cookie;
-	fp->_read = readfn;
-	fp->_write = writefn;
-	fp->_seek = seekfn;
-	fp->_close = closefn;
-	return (fp);
-}
diff --git a/lib/libc/stdio/fvwrite.c b/lib/libc/stdio/fvwrite.c
deleted file mode 100644
index b3ea910..0000000
--- a/lib/libc/stdio/fvwrite.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fvwrite.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fvwrite.c,v 1.17 2004/06/08 05:45:48 das Exp $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "local.h"
-#include "fvwrite.h"
-
-/*
- * Write some memory regions.  Return zero on success, EOF on error.
- *
- * This routine is large and unsightly, but most of the ugliness due
- * to the three different kinds of output buffering is handled here.
- */
-int
-__sfvwrite(fp, uio)
-	FILE *fp;
-	struct __suio *uio;
-{
-	size_t len;
-	char *p;
-	struct __siov *iov;
-	int w, s;
-	char *nl;
-	int nlknown, nldist;
-
-	if ((len = uio->uio_resid) == 0)
-		return (0);
-	/* make sure we can write */
-	if (prepwrite(fp) != 0)
-		return (EOF);
-
-#define	MIN(a, b) ((a) < (b) ? (a) : (b))
-#define	COPY(n)	  (void)memcpy((void *)fp->_p, (void *)p, (size_t)(n))
-
-	iov = uio->uio_iov;
-	p = iov->iov_base;
-	len = iov->iov_len;
-	iov++;
-#define GETIOV(extra_work) \
-	while (len == 0) { \
-		extra_work; \
-		p = iov->iov_base; \
-		len = iov->iov_len; \
-		iov++; \
-	}
-	if (fp->_flags & __SNBF) {
-		/*
-		 * Unbuffered: write up to BUFSIZ bytes at a time.
-		 */
-		do {
-			GETIOV(;);
-			w = _swrite(fp, p, MIN(len, BUFSIZ));
-			if (w <= 0)
-				goto err;
-			p += w;
-			len -= w;
-		} while ((uio->uio_resid -= w) != 0);
-	} else if ((fp->_flags & __SLBF) == 0) {
-		/*
-		 * Fully buffered: fill partially full buffer, if any,
-		 * and then flush.  If there is no partial buffer, write
-		 * one _bf._size byte chunk directly (without copying).
-		 *
-		 * String output is a special case: write as many bytes
-		 * as fit, but pretend we wrote everything.  This makes
-		 * snprintf() return the number of bytes needed, rather
-		 * than the number used, and avoids its write function
-		 * (so that the write function can be invalid).
-		 */
-		do {
-			GETIOV(;);
-			if ((fp->_flags & (__SALC | __SSTR)) ==
-			    (__SALC | __SSTR) && fp->_w < len) {
-				size_t blen = fp->_p - fp->_bf._base;
-
-				/*
-				 * Alloc an extra 128 bytes (+ 1 for NULL)
-				 * so we don't call realloc(3) so often.
-				 */
-				fp->_w = len + 128;
-				fp->_bf._size = blen + len + 128;
-				fp->_bf._base =
-				    reallocf(fp->_bf._base, fp->_bf._size + 1);
-				if (fp->_bf._base == NULL)
-					goto err;
-				fp->_p = fp->_bf._base + blen;
-			}
-			w = fp->_w;
-
-			if (fp->_flags & __SSTR) {
-				if (len < w)
-					w = len;
-				if (w > 0) {
-					COPY(w);        /* copy MIN(fp->_w,len), */
-					fp->_w -= w;
-					fp->_p += w;
-				}
-				w = len;	/* but pretend copied all */
-			} else if (fp->_p > fp->_bf._base && len > w) {
-				/* fill and flush */
-				COPY(w);
-				/* fp->_w -= w; */ /* unneeded */
-				fp->_p += w;
-				if (__fflush(fp))
-					goto err;
-			} else if (len >= (w = fp->_bf._size)) {
-				/* write directly */
-				w = _swrite(fp, p, w);
-				if (w <= 0)
-					goto err;
-			} else {
-				/* fill and done */
-				w = len;
-				COPY(w);
-				fp->_w -= w;
-				fp->_p += w;
-			}
-			p += w;
-			len -= w;
-		} while ((uio->uio_resid -= w) != 0);
-	} else {
-		/*
-		 * Line buffered: like fully buffered, but we
-		 * must check for newlines.  Compute the distance
-		 * to the first newline (including the newline),
-		 * or `infinity' if there is none, then pretend
-		 * that the amount to write is MIN(len,nldist).
-		 */
-		nlknown = 0;
-		nldist = 0;	/* XXX just to keep gcc happy */
-		do {
-			GETIOV(nlknown = 0);
-			if (!nlknown) {
-				nl = memchr((void *)p, '\n', len);
-				nldist = nl ? nl + 1 - p : len + 1;
-				nlknown = 1;
-			}
-			s = MIN(len, nldist);
-			w = fp->_w + fp->_bf._size;
-			if (fp->_p > fp->_bf._base && s > w) {
-				COPY(w);
-				/* fp->_w -= w; */
-				fp->_p += w;
-				if (__fflush(fp))
-					goto err;
-			} else if (s >= (w = fp->_bf._size)) {
-				w = _swrite(fp, p, w);
-				if (w <= 0)
-				 	goto err;
-			} else {
-				w = s;
-				COPY(w);
-				fp->_w -= w;
-				fp->_p += w;
-			}
-			if ((nldist -= w) == 0) {
-				/* copied the newline: flush and forget */
-				if (__fflush(fp))
-					goto err;
-				nlknown = 0;
-			}
-			p += w;
-			len -= w;
-		} while ((uio->uio_resid -= w) != 0);
-	}
-	return (0);
-
-err:
-	fp->_flags |= __SERR;
-	return (EOF);
-}
diff --git a/lib/libc/stdio/fvwrite.h b/lib/libc/stdio/fvwrite.h
deleted file mode 100644
index 5414ec8..0000000
--- a/lib/libc/stdio/fvwrite.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- *
- *	@(#)fvwrite.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/lib/libc/stdio/fvwrite.h,v 1.3 2002/05/28 16:59:39 alfred Exp $
- */
-
-/*
- * I/O descriptors for __sfvwrite().
- */
-struct __siov {
-	void	*iov_base;
-	size_t	iov_len;
-};
-struct __suio {
-	struct	__siov *uio_iov;
-	int	uio_iovcnt;
-	int	uio_resid;
-};
-
-extern int __sfvwrite(FILE *, struct __suio *);
diff --git a/lib/libc/stdio/fwalk.c b/lib/libc/stdio/fwalk.c
deleted file mode 100644
index a8a49fc..0000000
--- a/lib/libc/stdio/fwalk.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fwalk.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fwalk.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
-
-#include <sys/types.h>
-#include <machine/atomic.h>
-#include <stdio.h>
-#include "local.h"
-#include "glue.h"
-
-int
-_fwalk(function)
-	int (*function)(FILE *);
-{
-	FILE *fp;
-	int n, ret;
-	struct glue *g;
-
-	ret = 0;
-	/*
-	 * It should be safe to walk the list without locking it;
-	 * new nodes are only added to the end and none are ever
-	 * removed.
-	 *
-	 * Avoid locking this list while walking it or else you will
-	 * introduce a potential deadlock in [at least] refill.c.
-	 */
-	for (g = &__sglue; g != NULL; g = g->next)
-		for (fp = g->iobs, n = g->niobs; --n >= 0; fp++)
-			if ((fp->_flags != 0) && ((fp->_flags & __SIGN) == 0))
-				ret |= (*function)(fp);
-	return (ret);
-}
diff --git a/lib/libc/stdio/fwide.c b/lib/libc/stdio/fwide.c
deleted file mode 100644
index 1386c48..0000000
--- a/lib/libc/stdio/fwide.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fwide.c,v 1.1 2002/08/13 09:30:41 tjr Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-int
-fwide(FILE *fp, int mode)
-{
-	int m;
-
-	FLOCKFILE(fp);
-	/* Only change the orientation if the stream is not oriented yet. */
-	if (mode != 0 && fp->_extra->orientation == 0)
-		fp->_extra->orientation = mode > 0 ? 1 : -1;
-	m = fp->_extra->orientation;
-	FUNLOCKFILE(fp);
-
-	return (m);
-}
diff --git a/lib/libc/stdio/fwprintf.c b/lib/libc/stdio/fwprintf.c
deleted file mode 100644
index dcd6c38..0000000
--- a/lib/libc/stdio/fwprintf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-int
-fwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf(fp, fmt, ap);
-	va_end(ap);
-
-	return (ret);
-}
diff --git a/lib/libc/stdio/fwrite.c b/lib/libc/stdio/fwrite.c
deleted file mode 100644
index 27b660e..0000000
--- a/lib/libc/stdio/fwrite.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fwrite.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fwrite.c,v 1.11 2002/10/12 16:13:41 mike Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-
-/*
- * Write `count' objects (each size `size') from memory to the given file.
- * Return the number of whole objects written.
- */
-size_t
-fwrite(buf, size, count, fp)
-	const void * __restrict buf;
-	size_t size, count;
-	FILE * __restrict fp;
-{
-	size_t n;
-	struct __suio uio;
-	struct __siov iov;
-
-	iov.iov_base = (void *)buf;
-	uio.uio_resid = iov.iov_len = n = count * size;
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	/*
-	 * The usual case is success (__sfvwrite returns 0);
-	 * skip the divide if this happens, since divides are
-	 * generally slow and since this occurs whenever size==0.
-	 */
-	if (__sfvwrite(fp, &uio) != 0)
-	    count = (n - uio.uio_resid) / size;
-	FUNLOCKFILE(fp);
-	return (count);
-}
diff --git a/lib/libc/stdio/fwscanf.c b/lib/libc/stdio/fwscanf.c
deleted file mode 100644
index 47e8550..0000000
--- a/lib/libc/stdio/fwscanf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-int
-fwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf(fp, fmt, ap);
-	va_end(ap);
-
-	return (r);
-}
diff --git a/lib/libc/stdio/getc.c b/lib/libc/stdio/getc.c
deleted file mode 100644
index 0aa9dca..0000000
--- a/lib/libc/stdio/getc.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getc.c,v 1.13 2004/03/19 09:04:56 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-#undef getc
-
-int
-getc(FILE *fp)
-{
-	int retval;
-	FLOCKFILE(fp);
-	/* Orientation set by __sgetc() when buffer is empty. */
-	/* ORIENT(fp, -1); */
-	retval = __sgetc(fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc/stdio/getchar.c b/lib/libc/stdio/getchar.c
deleted file mode 100644
index 2ea530f..0000000
--- a/lib/libc/stdio/getchar.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getchar.c,v 1.12 2004/03/19 09:04:56 tjr Exp $");
-
-/*
- * A subroutine version of the macro getchar.
- */
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-#undef getchar
-
-int
-getchar()
-{
-	int retval;
-	FLOCKFILE(stdin);
-	/* Orientation set by __sgetc() when buffer is empty. */
-	/* ORIENT(stdin, -1); */
-	retval = __sgetc(stdin);
-	FUNLOCKFILE(stdin);
-	return (retval);
-}
diff --git a/lib/libc/stdio/gets.c b/lib/libc/stdio/gets.c
deleted file mode 100644
index 5ef23ab..0000000
--- a/lib/libc/stdio/gets.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gets.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/gets.c,v 1.16 2003/01/30 23:32:53 tjr Exp $");
-
-#include "namespace.h"
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/cdefs.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-__warn_references(gets, "warning: this program uses gets(), which is unsafe.");
-
-char *
-gets(buf)
-	char *buf;
-{
-	int c;
-	char *s;
-	static int warned;
-	static char w[] =
-	    "warning: this program uses gets(), which is unsafe.\n";
-
-	FLOCKFILE(stdin);
-	ORIENT(stdin, -1);
-	if (!warned) {
-		(void) _write(STDERR_FILENO, w, sizeof(w) - 1);
-		warned = 1;
-	}
-	for (s = buf; (c = __sgetc(stdin)) != '\n';)
-		if (c == EOF)
-			if (s == buf) {
-				FUNLOCKFILE(stdin);
-				return (NULL);
-			} else
-				break;
-		else
-			*s++ = c;
-	*s = 0;
-	FUNLOCKFILE(stdin);
-	return (buf);
-}
diff --git a/lib/libc/stdio/getw.c b/lib/libc/stdio/getw.c
deleted file mode 100644
index c7ba04f..0000000
--- a/lib/libc/stdio/getw.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getw.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getw.c,v 1.7 2002/03/22 21:53:04 obrien Exp $");
-
-#include <stdio.h>
-
-int
-getw(fp)
-	FILE *fp;
-{
-	int x;
-
-	return (fread((void *)&x, sizeof(x), 1, fp) == 1 ? x : EOF);
-}
diff --git a/lib/libc/stdio/getwc.c b/lib/libc/stdio/getwc.c
deleted file mode 100644
index 34a7de3..0000000
--- a/lib/libc/stdio/getwc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getwc.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-#undef getwc
-
-/*
- * Synonym for fgetwc(). The only difference is that getwc(), if it is a
- * macro, may evaluate `fp' more than once.
- */
-wint_t
-getwc(FILE *fp)
-{
-
-	return (fgetwc(fp));
-}
diff --git a/lib/libc/stdio/getwchar.c b/lib/libc/stdio/getwchar.c
deleted file mode 100644
index 1297cbb..0000000
--- a/lib/libc/stdio/getwchar.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/getwchar.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-#undef getwchar
-
-/*
- * Synonym for fgetwc(stdin).
- */
-wint_t
-getwchar(void)
-{
-
-	return (fgetwc(stdin));
-}
diff --git a/lib/libc/stdio/glue.h b/lib/libc/stdio/glue.h
deleted file mode 100644
index fc5c6df..0000000
--- a/lib/libc/stdio/glue.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- *
- *	@(#)glue.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: src/lib/libc/stdio/glue.h,v 1.3 2005/05/13 21:12:34 stefanf Exp $
- */
-
-/*
- * The first few FILEs are statically allocated; others are dynamically
- * allocated and linked in via this glue structure.
- */
-struct glue {
-	struct	glue *next;
-	int	niobs;
-	FILE	*iobs;
-};
-extern struct glue __sglue;
diff --git a/lib/libc/stdio/local.h b/lib/libc/stdio/local.h
deleted file mode 100644
index e91dea1..0000000
--- a/lib/libc/stdio/local.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- *
- *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD: releng/10.2/lib/libc/stdio/local.h 234799 2012-04-29 16:28:39Z das $
- */
-
-#include <sys/types.h>	/* for off_t */
-#include <pthread.h>
-#include <string.h>
-#include <wchar.h>
-#include <locale.h>
-
-/*
- * Information local to this implementation of stdio,
- * in particular, macros and private variables.
- */
-
-extern int	_sread(FILE *, char *, int);
-extern int	_swrite(FILE *, char const *, int);
-extern fpos_t	_sseek(FILE *, fpos_t, int);
-extern int	_ftello(FILE *, fpos_t *);
-extern int	_fseeko(FILE *, off_t, int, int);
-extern int	__fflush(FILE *fp);
-extern void	__fcloseall(void);
-extern wint_t	__fgetwc_mbs(FILE *, mbstate_t *, int *, locale_t);
-extern wint_t	__fputwc(wchar_t, FILE *, locale_t);
-extern int	__sflush(FILE *);
-extern FILE	*__sfp(void);
-extern int	__slbexpand(FILE *, size_t);
-extern int	__srefill(FILE *);
-extern int	__sread(void *, char *, int);
-extern int	__swrite(void *, char const *, int);
-extern fpos_t	__sseek(void *, fpos_t, int);
-extern int	__sclose(void *);
-extern void	__sinit(void);
-extern void	_cleanup(void);
-extern void	__smakebuf(FILE *);
-extern int	__swhatbuf(FILE *, size_t *, int *);
-extern int	_fwalk(int (*)(FILE *));
-extern int	__svfscanf(FILE *, locale_t, const char *, __va_list);
-extern int	__swsetup(FILE *);
-extern int	__sflags(const char *, int *);
-extern int	__ungetc(int, FILE *);
-extern wint_t	__ungetwc(wint_t, FILE *, locale_t);
-extern int	__vfprintf(FILE *, locale_t, const char *, __va_list);
-extern int	__vfscanf(FILE *, const char *, __va_list);
-extern int	__vfwprintf(FILE *, locale_t, const wchar_t *, __va_list);
-extern int	__vfwscanf(FILE * __restrict, locale_t, const wchar_t * __restrict,
-		    __va_list);
-extern size_t	__fread(void * __restrict buf, size_t size, size_t count,
-		FILE * __restrict fp);
-extern int	__sdidinit;
-
-static inline wint_t
-__fgetwc(FILE *fp, locale_t locale)
-{
-	int nread;
-
-	return (__fgetwc_mbs(fp, &fp->_mbstate, &nread, locale));
-}
-
-/*
- * Prepare the given FILE for writing, and return 0 iff it
- * can be written now.  Otherwise, return EOF and set errno.
- */
-#define	prepwrite(fp) \
- 	((((fp)->_flags & __SWR) == 0 || \
- 	    ((fp)->_bf._base == NULL && ((fp)->_flags & __SSTR) == 0)) && \
-	 __swsetup(fp))
-
-/*
- * Test whether the given stdio file has an active ungetc buffer;
- * release such a buffer, without restoring ordinary unread data.
- */
-#define	HASUB(fp) ((fp)->_ub._base != NULL)
-#define	FREEUB(fp) { \
-	if ((fp)->_ub._base != (fp)->_ubuf) \
-		free((char *)(fp)->_ub._base); \
-	(fp)->_ub._base = NULL; \
-}
-
-/*
- * test for an fgetln() buffer.
- */
-#define	HASLB(fp) ((fp)->_lb._base != NULL)
-#define	FREELB(fp) { \
-	free((char *)(fp)->_lb._base); \
-	(fp)->_lb._base = NULL; \
-}
-
-/*
- * Structure initializations for 'fake' FILE objects.
- */
-#define	FAKE_FILE {				\
-	._file = -1,				\
-	._fl_mutex = PTHREAD_MUTEX_INITIALIZER, \
-}
-
-/*
- * Set the orientation for a stream. If o > 0, the stream has wide-
- * orientation. If o < 0, the stream has byte-orientation.
- */
-#define	ORIENT(fp, o)	do {				\
-	if ((fp)->_orientation == 0)			\
-		(fp)->_orientation = (o);		\
-} while (0)
diff --git a/lib/libc/stdio/makebuf.c b/lib/libc/stdio/makebuf.c
deleted file mode 100644
index 6fbfa9e..0000000
--- a/lib/libc/stdio/makebuf.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)makebuf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/makebuf.c,v 1.4 2002/03/22 21:53:04 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "local.h"
-#include "un-namespace.h"
-
-/*
- * Allocate a file buffer, or switch to unbuffered I/O.
- * Per the ANSI C standard, ALL tty devices default to line buffered.
- *
- * As a side effect, we set __SOPT or __SNPT (en/dis-able fseek
- * optimisation) right after the _fstat() that finds the buffer size.
- */
-void
-__smakebuf(fp)
-	FILE *fp;
-{
-	void *p;
-	int flags;
-	size_t size;
-	int couldbetty;
-
-	if (fp->_flags & __SNBF) {
-		fp->_bf._base = fp->_p = fp->_nbuf;
-		fp->_bf._size = 1;
-		return;
-	}
-	flags = __swhatbuf(fp, &size, &couldbetty);
-	if ((p = malloc(size)) == NULL) {
-		fp->_flags |= __SNBF;
-		fp->_bf._base = fp->_p = fp->_nbuf;
-		fp->_bf._size = 1;
-		return;
-	}
-	__cleanup = _cleanup;
-	flags |= __SMBF;
-	fp->_bf._base = fp->_p = p;
-	fp->_bf._size = size;
-	if (couldbetty && isatty(fp->_file)) {
-          flags |= __SLBF;
-          }        
-	fp->_flags |= flags;
-}
-
-/*
- * Internal routine to determine `proper' buffering for a file.
- */
-int
-__swhatbuf(fp, bufsize, couldbetty)
-	FILE *fp;
-	size_t *bufsize;
-	int *couldbetty;
-{
-	struct stat st;
-
-	if (fp->_file < 0 || _fstat(fp->_file, &st) < 0) {
-		*couldbetty = 0;
-		*bufsize = BUFSIZ;
-		return (__SNPT);
-	}
-
-	/* could be a tty iff it is a character device */
-	*couldbetty = (st.st_mode & S_IFMT) == S_IFCHR;
-	if (st.st_blksize <= 0) {
-		*bufsize = BUFSIZ;
-		return (__SNPT);
-	}
-
-	/*
-	 * Optimise fseek() only if it is a regular file.  (The test for
-	 * __sseek is mainly paranoia.)  It is safe to set _blksize
-	 * unconditionally; it will only be used if __SOPT is also set.
-	 */
-	*bufsize = st.st_blksize;
-	fp->_blksize = st.st_blksize;
-	return ((st.st_mode & S_IFMT) == S_IFREG && fp->_seek == __sseek ?
-	    __SOPT : __SNPT);
-}
diff --git a/lib/libc/stdio/mktemp.c b/lib/libc/stdio/mktemp.c
deleted file mode 100644
index 8207c17..0000000
--- a/lib/libc/stdio/mktemp.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/mktemp.c,v 1.28 2003/02/16 17:29:10 nectar Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-char *_mktemp(char *);
-
-static int _gettemp(char *, int *, int, int);
-
-static const unsigned char padchar[] =
-"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-int
-mkstemps(path, slen)
-	char *path;
-	int slen;
-{
-	int fd;
-
-	return (_gettemp(path, &fd, 0, slen) ? fd : -1);
-}
-
-int
-mkstemp(path)
-	char *path;
-{
-	int fd;
-
-	return (_gettemp(path, &fd, 0, 0) ? fd : -1);
-}
-
-char *
-mkdtemp(path)
-	char *path;
-{
-	return (_gettemp(path, (int *)NULL, 1, 0) ? path : (char *)NULL);
-}
-
-char *
-_mktemp(path)
-	char *path;
-{
-	return (_gettemp(path, (int *)NULL, 0, 0) ? path : (char *)NULL);
-}
-
-__warn_references(mktemp,
-    "warning: mktemp() possibly used unsafely; consider using mkstemp()");
-
-char *
-mktemp(path)
-	char *path;
-{
-	return (_mktemp(path));
-}
-
-static int
-_gettemp(path, doopen, domkdir, slen)
-	char *path;
-	int *doopen;
-	int domkdir;
-	int slen;
-{
-	char *start, *trv, *suffp;
-	char *pad;
-	struct stat sbuf;
-	int rval;
-	uint32_t rand;
-
-	if (doopen != NULL && domkdir) {
-		errno = EINVAL;
-		return (0);
-	}
-
-	for (trv = path; *trv != '\0'; ++trv)
-		;
-	trv -= slen;
-	suffp = trv;
-	--trv;
-	if (trv < path) {
-		errno = EINVAL;
-		return (0);
-	}
-
-	/* Fill space with random characters */
-	while (trv >= path && *trv == 'X') {
-		rand = arc4random() % (sizeof(padchar) - 1);
-		*trv-- = padchar[rand];
-	}
-	start = trv + 1;
-
-	/*
-	 * check the target directory.
-	 */
-	if (doopen != NULL || domkdir) {
-		for (; trv > path; --trv) {
-			if (*trv == '/') {
-				*trv = '\0';
-				rval = stat(path, &sbuf);
-				*trv = '/';
-				if (rval != 0)
-					return (0);
-				if (!S_ISDIR(sbuf.st_mode)) {
-					errno = ENOTDIR;
-					return (0);
-				}
-				break;
-			}
-		}
-	}
-
-	for (;;) {
-		if (doopen) {
-			if ((*doopen =
-			    _open(path, O_CREAT|O_EXCL|O_RDWR, 0600)) >= 0)
-				return (1);
-			if (errno != EEXIST)
-				return (0);
-		} else if (domkdir) {
-			if (mkdir(path, 0700) == 0)
-				return (1);
-			if (errno != EEXIST)
-				return (0);
-		} else if (lstat(path, &sbuf))
-			return (errno == ENOENT);
-
-		/* If we have a collision, cycle through the space of filenames */
-		for (trv = start;;) {
-			if (*trv == '\0' || trv == suffp)
-				return (0);
-			pad = strchr(padchar, *trv);
-			if (pad == NULL || *++pad == '\0')
-				*trv++ = padchar[0];
-			else {
-				*trv++ = *pad;
-				break;
-			}
-		}
-	}
-	/*NOTREACHED*/
-}
diff --git a/lib/libc/stdio/perror.c b/lib/libc/stdio/perror.c
deleted file mode 100644
index 658b880..0000000
--- a/lib/libc/stdio/perror.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)perror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/perror.c,v 1.8 2002/12/19 09:53:26 tjr Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-void
-perror(s)
-	const char *s;
-{
-	char msgbuf[NL_TEXTMAX];
-	struct iovec *v;
-	struct iovec iov[4];
-
-	v = iov;
-	if (s != NULL && *s != '\0') {
-		v->iov_base = (char *)s;
-		v->iov_len = strlen(s);
-		v++;
-		v->iov_base = ": ";
-		v->iov_len = 2;
-		v++;
-	}
-	strerror_r(errno, msgbuf, sizeof(msgbuf));
-	v->iov_base = msgbuf;
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	v->iov_base = "\n";
-	v->iov_len = 1;
-	FLOCKFILE(stderr);
-	__sflush(stderr);
-	(void)_writev(stderr->_file, iov, (v - iov) + 1);
-	stderr->_flags &= ~__SOFF;
-	FUNLOCKFILE(stderr);
-}
diff --git a/lib/libc/stdio/printf.c b/lib/libc/stdio/printf.c
deleted file mode 100644
index d1c4d4f..0000000
--- a/lib/libc/stdio/printf.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-
-int
-printf(char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfprintf(stdout, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc/stdio/putc.c b/lib/libc/stdio/putc.c
deleted file mode 100644
index e78bb42..0000000
--- a/lib/libc/stdio/putc.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putc.c,v 1.13 2004/03/19 09:04:56 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-#undef putc
-
-int
-putc(c, fp)
-	int c;
-	FILE *fp;
-{
-	int retval;
-	FLOCKFILE(fp);
-	/* Orientation set by __sputc() when buffer is full. */
-	/* ORIENT(fp, -1); */
-	retval = __sputc(c, fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc/stdio/putchar.c b/lib/libc/stdio/putchar.c
deleted file mode 100644
index d23161d..0000000
--- a/lib/libc/stdio/putchar.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putchar.c,v 1.13 2004/03/19 09:04:56 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-#undef putchar
-
-/*
- * A subroutine version of the macro putchar
- */
-int
-putchar(c)
-	int c;
-{
-	int retval;
-	FILE *so = stdout;
-
-	FLOCKFILE(so);
-	/* Orientation set by __sputc() when buffer is full. */
-	/* ORIENT(so, -1); */
-	retval = __sputc(c, so);
-	FUNLOCKFILE(so);
-	return (retval);
-}
diff --git a/lib/libc/stdio/puts.c b/lib/libc/stdio/puts.c
deleted file mode 100644
index 9ac915e..0000000
--- a/lib/libc/stdio/puts.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)puts.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/puts.c,v 1.10 2004/03/10 09:15:38 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-#include "local.h"
-
-/*
- * Write the given string to stdout, appending a newline.
- */
-int
-puts(s)
-	char const *s;
-{
-	int retval;
-	size_t c = strlen(s);
-	struct __suio uio;
-	struct __siov iov[2];
-
-	iov[0].iov_base = (void *)s;
-	iov[0].iov_len = c;
-	iov[1].iov_base = "\n";
-	iov[1].iov_len = 1;
-	uio.uio_resid = c + 1;
-	uio.uio_iov = &iov[0];
-	uio.uio_iovcnt = 2;
-	FLOCKFILE(stdout);
-	ORIENT(stdout, -1);
-	retval = __sfvwrite(stdout, &uio) ? EOF : '\n';
-	FUNLOCKFILE(stdout);
-	return (retval);
-}
diff --git a/lib/libc/stdio/putw.c b/lib/libc/stdio/putw.c
deleted file mode 100644
index ee0c23b..0000000
--- a/lib/libc/stdio/putw.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)putw.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putw.c,v 1.9 2002/03/22 21:53:04 obrien Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-
-int
-putw(w, fp)
-	int w;
-	FILE *fp;
-{
-	int retval;
-	struct __suio uio;
-	struct __siov iov;
-
-	iov.iov_base = &w;
-	iov.iov_len = uio.uio_resid = sizeof(w);
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-	FLOCKFILE(fp);
-	retval = __sfvwrite(fp, &uio);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc/stdio/putwc.c b/lib/libc/stdio/putwc.c
deleted file mode 100644
index 0feec5b..0000000
--- a/lib/libc/stdio/putwc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putwc.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-#undef putwc
-
-/*
- * Synonym for fputwc(). The only difference is that putwc(), if it is a
- * macro, may evaluate `fp' more than once.
- */
-wint_t
-putwc(wchar_t wc, FILE *fp)
-{
-
-	return (fputwc(wc, fp));
-}
diff --git a/lib/libc/stdio/putwchar.c b/lib/libc/stdio/putwchar.c
deleted file mode 100644
index b983995..0000000
--- a/lib/libc/stdio/putwchar.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/putwchar.c,v 1.3 2004/05/25 10:42:52 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-#undef putwchar
-
-/*
- * Synonym for fputwc(wc, stdout).
- */
-wint_t
-putwchar(wchar_t wc)
-{
-
-	return (fputwc(wc, stdout));
-}
diff --git a/lib/libc/stdio/refill.c b/lib/libc/stdio/refill.c
deleted file mode 100644
index edd8bb6..0000000
--- a/lib/libc/stdio/refill.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)refill.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/refill.c,v 1.18 2002/08/13 09:30:41 tjr Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-
-static int lflush(FILE *);
-
-static int
-lflush(FILE *fp)
-{
-	int	ret = 0;
-
-	if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR)) {
-		FLOCKFILE(fp);
-		ret = __sflush(fp);
-		FUNLOCKFILE(fp);
-	}
-	return (ret);
-}
-
-/*
- * Refill a stdio buffer.
- * Return EOF on eof or error, 0 otherwise.
- */
-int
-__srefill(FILE *fp)
-{
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	ORIENT(fp, -1);
-
-	fp->_r = 0;		/* largely a convenience for callers */
-
-	/* SysV does not make this test; take it out for compatibility */
-	if (fp->_flags & __SEOF)
-		return (EOF);
-
-	/* if not already reading, have to be reading and writing */
-	if ((fp->_flags & __SRD) == 0) {
-		if ((fp->_flags & __SRW) == 0) {
-			errno = EBADF;
-			fp->_flags |= __SERR;
-			return (EOF);
-		}
-		/* switch to reading */
-		if (fp->_flags & __SWR) {
-			if (__sflush(fp))
-				return (EOF);
-			fp->_flags &= ~__SWR;
-			fp->_w = 0;
-			fp->_lbfsize = 0;
-		}
-		fp->_flags |= __SRD;
-	} else {
-		/*
-		 * We were reading.  If there is an ungetc buffer,
-		 * we must have been reading from that.  Drop it,
-		 * restoring the previous buffer (if any).  If there
-		 * is anything in that buffer, return.
-		 */
-		if (HASUB(fp)) {
-			FREEUB(fp);
-			if ((fp->_r = fp->_ur) != 0) {
-				fp->_p = fp->_extra->_up;
-				return (0);
-			}
-		}
-	}
-
-	if (fp->_bf._base == NULL)
-		__smakebuf(fp);
-
-	/*
-	 * Before reading from a line buffered or unbuffered file,
-	 * flush all line buffered output files, per the ANSI C
-	 * standard.
-	 */
-	if (fp->_flags & (__SLBF|__SNBF)) {
-		/* Ignore this file in _fwalk to avoid potential deadlock. */
-		fp->_flags |= __SIGN;
-		(void) _fwalk(lflush);
-		fp->_flags &= ~__SIGN;
-
-		/* Now flush this file without locking it. */
-		if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR))
-			__sflush(fp);
-	}
-	fp->_p = fp->_bf._base;
-	fp->_r = _sread(fp, (char *)fp->_p, fp->_bf._size);
-	fp->_flags &= ~__SMOD;	/* buffer contents are again pristine */
-	if (fp->_r <= 0) {
-		if (fp->_r == 0)
-			fp->_flags |= __SEOF;
-		else {
-			fp->_r = 0;
-			fp->_flags |= __SERR;
-		}
-		return (EOF);
-	}
-	return (0);
-}
diff --git a/lib/libc/stdio/remove.c b/lib/libc/stdio/remove.c
deleted file mode 100644
index 2553f64..0000000
--- a/lib/libc/stdio/remove.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)remove.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/remove.c,v 1.8 2002/03/22 21:53:04 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-
-int
-remove(file)
-	const char *file;
-{
-	struct stat sb;
-
-	if (lstat(file, &sb) < 0)
-		return (-1);
-	if (S_ISDIR(sb.st_mode))
-		return (rmdir(file));
-	return (unlink(file));
-}
diff --git a/lib/libc/stdio/rewind.c b/lib/libc/stdio/rewind.c
deleted file mode 100644
index 76f2ed3..0000000
--- a/lib/libc/stdio/rewind.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rewind.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/rewind.c,v 1.11 2002/03/22 21:53:04 obrien Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-void
-rewind(FILE *fp)
-{
-	int serrno = errno;
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	FLOCKFILE(fp);
-	if (_fseeko(fp, (off_t)0, SEEK_SET, 1) == 0) {
-		clearerr_unlocked(fp);
-		errno = serrno;
-	}
-	FUNLOCKFILE(fp);
-}
diff --git a/lib/libc/stdio/rget.c b/lib/libc/stdio/rget.c
deleted file mode 100644
index 9b7f586..0000000
--- a/lib/libc/stdio/rget.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rget.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/rget.c,v 1.5 2002/03/22 21:53:04 obrien Exp $");
-
-#include <stdio.h>
-#include "local.h"
-
-/*
- * Handle getc() when the buffer ran out:
- * Refill, then return the first character
- * in the newly-filled buffer.
- */
-int
-__srget(FILE *fp)
-{
-	if (__srefill(fp) == 0) {
-		fp->_r--;
-		return (*fp->_p++);
-	}
-	return (EOF);
-}
diff --git a/lib/libc/stdio/scanf.c b/lib/libc/stdio/scanf.c
deleted file mode 100644
index b4fb1a3..0000000
--- a/lib/libc/stdio/scanf.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)scanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/scanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-int
-scanf(char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	FLOCKFILE(stdin);
-	ret = __svfscanf(stdin, fmt, ap);
-	FUNLOCKFILE(stdin);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc/stdio/setbuf.c b/lib/libc/stdio/setbuf.c
deleted file mode 100644
index 5eb6fb1..0000000
--- a/lib/libc/stdio/setbuf.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setbuf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuf.c,v 1.4 2002/09/06 11:23:55 tjr Exp $");
-
-#include <stdio.h>
-#include "local.h"
-
-void
-setbuf(FILE * __restrict fp, char * __restrict buf)
-{
-	(void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
-}
diff --git a/lib/libc/stdio/setbuffer.c b/lib/libc/stdio/setbuffer.c
deleted file mode 100644
index 6ec4376..0000000
--- a/lib/libc/stdio/setbuffer.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setbuffer.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/setbuffer.c,v 1.7 2002/03/22 21:53:04 obrien Exp $");
-
-#include <stdio.h>
-
-void
-setbuffer(fp, buf, size)
-	FILE *fp;
-	char *buf;
-	int size;
-{
-
-	(void)setvbuf(fp, buf, buf ? _IOFBF : _IONBF, (size_t)size);
-}
-
-/*
- * set line buffering
- */
-int
-setlinebuf(fp)
-	FILE *fp;
-{
-
-	return (setvbuf(fp, (char *)NULL, _IOLBF, (size_t)0));
-}
diff --git a/lib/libc/stdio/setvbuf.c b/lib/libc/stdio/setvbuf.c
deleted file mode 100644
index 166d5b1..0000000
--- a/lib/libc/stdio/setvbuf.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setvbuf.c	8.2 (Berkeley) 11/16/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/setvbuf.c,v 1.13 2002/09/06 11:23:55 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * Set one of the three kinds of buffering, optionally including
- * a buffer.
- */
-int
-setvbuf(FILE * __restrict fp, char * __restrict buf, int mode, size_t size)
-{
-	int ret, flags;
-	size_t iosize;
-	int ttyflag;
-
-	/*
-	 * Verify arguments.  The `int' limit on `size' is due to this
-	 * particular implementation.  Note, buf and size are ignored
-	 * when setting _IONBF.
-	 */
-	if (mode != _IONBF)
-		if ((mode != _IOFBF && mode != _IOLBF) || (int)size < 0)
-			return (EOF);
-
-	FLOCKFILE(fp);
-	/*
-	 * Write current buffer, if any.  Discard unread input (including
-	 * ungetc data), cancel line buffering, and free old buffer if
-	 * malloc()ed.  We also clear any eof condition, as if this were
-	 * a seek.
-	 */
-	ret = 0;
-	(void)__sflush(fp);
-	if (HASUB(fp))
-		FREEUB(fp);
-	fp->_r = fp->_lbfsize = 0;
-	flags = fp->_flags;
-	if (flags & __SMBF)
-		free((void *)fp->_bf._base);
-	flags &= ~(__SLBF | __SNBF | __SMBF | __SOPT | __SOFF | __SNPT | __SEOF);
-
-	/* If setting unbuffered mode, skip all the hard work. */
-	if (mode == _IONBF)
-		goto nbf;
-
-	/*
-	 * Find optimal I/O size for seek optimization.  This also returns
-	 * a `tty flag' to suggest that we check isatty(fd), but we do not
-	 * care since our caller told us how to buffer.
-	 */
-	flags |= __swhatbuf(fp, &iosize, &ttyflag);
-	if (size == 0) {
-		buf = NULL;	/* force local allocation */
-		size = iosize;
-	}
-
-	/* Allocate buffer if needed. */
-	if (buf == NULL) {
-		if ((buf = malloc(size)) == NULL) {
-			/*
-			 * Unable to honor user's request.  We will return
-			 * failure, but try again with file system size.
-			 */
-			ret = EOF;
-			if (size != iosize) {
-				size = iosize;
-				buf = malloc(size);
-			}
-		}
-		if (buf == NULL) {
-			/* No luck; switch to unbuffered I/O. */
-nbf:
-			fp->_flags = flags | __SNBF;
-			fp->_w = 0;
-			fp->_bf._base = fp->_p = fp->_nbuf;
-			fp->_bf._size = 1;
-			FUNLOCKFILE(fp);
-			return (ret);
-		}
-		flags |= __SMBF;
-	}
-
-	/*
-	 * Kill any seek optimization if the buffer is not the
-	 * right size.
-	 *
-	 * SHOULD WE ALLOW MULTIPLES HERE (i.e., ok iff (size % iosize) == 0)?
-	 */
-	if (size != iosize)
-		flags |= __SNPT;
-
-	/*
-	 * Fix up the FILE fields, and set __cleanup for output flush on
-	 * exit (since we are buffered in some way).
-	 */
-	if (mode == _IOLBF)
-		flags |= __SLBF;
-	fp->_flags = flags;
-	fp->_bf._base = fp->_p = (unsigned char *)buf;
-	fp->_bf._size = size;
-	/* fp->_lbfsize is still 0 */
-	if (flags & __SWR) {
-		/*
-		 * Begin or continue writing: see __swsetup().  Note
-		 * that __SNBF is impossible (it was handled earlier).
-		 */
-		if (flags & __SLBF) {
-			fp->_w = 0;
-			fp->_lbfsize = -fp->_bf._size;
-		} else
-			fp->_w = size;
-	} else {
-		/* begin/continue reading, or stay in intermediate state */
-		fp->_w = 0;
-	}
-	__cleanup = _cleanup;
-
-	FUNLOCKFILE(fp);
-	return (ret);
-}
diff --git a/lib/libc/stdio/snprintf.c b/lib/libc/stdio/snprintf.c
deleted file mode 100644
index b381852..0000000
--- a/lib/libc/stdio/snprintf.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/snprintf.c,v 1.20 2002/09/06 11:23:55 tjr Exp $");
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#include "local.h"
-
-int
-snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...)
-{
-	size_t on;
-	int ret;
-	va_list ap;
-	FILE f;
-	struct __sFILEX ext;
-
-	on = n;
-	if (n != 0)
-		n--;
-	if (n > INT_MAX)
-		n = INT_MAX;
-	va_start(ap, fmt);
-	f._file = -1;
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = n;
-	f._extra = &ext;
-	INITEXTRA(&f);
-	ret = __vfprintf(&f, fmt, ap);
-	if (on > 0)
-		*f._p = '\0';
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc/stdio/sprintf.c b/lib/libc/stdio/sprintf.c
deleted file mode 100644
index 6b9ed99..0000000
--- a/lib/libc/stdio/sprintf.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.14 2002/09/06 11:23:55 tjr Exp $");
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <limits.h>
-#include "local.h"
-
-int
-sprintf(char * __restrict str, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-	FILE f;
-	struct __sFILEX ext;
-
-	f._file = -1;
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = INT_MAX;
-	f._extra = &ext;
-	INITEXTRA(&f);
-	va_start(ap, fmt);
-	ret = __vfprintf(&f, fmt, ap);
-	va_end(ap);
-	*f._p = 0;
-	return (ret);
-}
diff --git a/lib/libc/stdio/sscanf.c b/lib/libc/stdio/sscanf.c
deleted file mode 100644
index b4850cd..0000000
--- a/lib/libc/stdio/sscanf.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.11 2002/10/12 16:13:41 mike Exp $");
-
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include "local.h"
-
-static int eofread(void *, char *, int);
-
-/* ARGSUSED */
-static int
-eofread(cookie, buf, len)
-	void *cookie;
-	char *buf;
-	int len;
-{
-
-	return (0);
-}
-
-int
-sscanf(const char * __restrict str, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-	struct __sFILEX extra;
-	FILE f;
-
-	f._file = -1;
-	f._flags = __SRD;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._r = strlen(str);
-	f._read = eofread;
-	f._ub._base = NULL;
-	f._lb._base = NULL;
-	f._extra = &extra;
-	INITEXTRA(&f);
-	va_start(ap, fmt);
-	ret = __svfscanf(&f, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc/stdio/stdio.c b/lib/libc/stdio/stdio.c
deleted file mode 100644
index d3f7125..0000000
--- a/lib/libc/stdio/stdio.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/stdio.c,v 1.24 2003/01/07 06:17:13 tjr Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "local.h"
-
-/*
- * Small standard I/O/seek/close functions.
- */
-int
-__sread(cookie, buf, n)
-	void *cookie;
-	char *buf;
-	int n;
-{
-	FILE *fp = cookie;
-
-	return(_read(fp->_file, buf, (size_t)n));
-}
-
-int
-__swrite(cookie, buf, n)
-	void *cookie;
-	char const *buf;
-	int n;
-{
-	FILE *fp = cookie;
-	return (_write(fp->_file, buf, (size_t)n));
-}
-
-fpos_t
-__sseek(cookie, offset, whence)
-	void *cookie;
-	fpos_t offset;
-	int whence;
-{
-	FILE *fp = cookie;
-
-	return (lseek(fp->_file, (off_t)offset, whence));
-}
-
-int
-__sclose(cookie)
-	void *cookie;
-{
-
-	return (_close(((FILE *)cookie)->_file));
-}
-
-/*
- * Higher level wrappers.
- */
-int
-_sread(fp, buf, n)
-	FILE *fp;
-	char *buf;
-	int n;
-{
-	int ret;
-
-	ret = (*fp->_read)(fp->_cookie, buf, n);
-	if (ret > 0) {
-		if (fp->_flags & __SOFF) {
-			if (fp->_offset <= OFF_MAX - ret)
-				fp->_offset += ret;
-			else
-				fp->_flags &= ~__SOFF;
-		}
-	} else if (ret < 0)
-		fp->_flags &= ~__SOFF;
-	return (ret);
-}
-
-int
-_swrite(fp, buf, n)
-	FILE *fp;
-	char const *buf;
-	int n;
-{
-	int ret;
-	int serrno;
-
-	if (fp->_flags & __SAPP) {
-		serrno = errno;
-		if (_sseek(fp, (fpos_t)0, SEEK_END) == -1 &&
-		    (fp->_flags & __SOPT))
-			return (-1);
-		errno = serrno;
-	}
-	ret = (*fp->_write)(fp->_cookie, buf, n);
-
-	/* __SOFF removed even on success in case O_APPEND mode is set. */
-	if (ret >= 0) {
-		if ((fp->_flags & (__SAPP|__SOFF)) == (__SAPP|__SOFF) &&
-		    fp->_offset <= OFF_MAX - ret)
-			fp->_offset += ret;
-		else
-			fp->_flags &= ~__SOFF;
-
-	} else if (ret < 0)
-		fp->_flags &= ~__SOFF;
-	return (ret);
-}
-
-fpos_t
-_sseek(fp, offset, whence)
-	FILE *fp;
-	fpos_t offset;
-	int whence;
-{
-	fpos_t ret;
-	int serrno, errret;
-
-	serrno = errno;
-	errno = 0;
-	ret = (*fp->_seek)(fp->_cookie, offset, whence);
-	errret = errno;
-	if (errno == 0)
-		errno = serrno;
-	/*
-	 * Disallow negative seeks per POSIX.
-	 * It is needed here to help upper level caller
-	 * in the cases it can't detect.
-	 */
-	if (ret < 0) {
-		if (errret == 0) {
-			if (offset != 0 || whence != SEEK_CUR) {
-				if (HASUB(fp))
-					FREEUB(fp);
-				fp->_p = fp->_bf._base;
-				fp->_r = 0;
-				fp->_flags &= ~__SEOF;
-			}
-			fp->_flags |= __SERR;
-			errno = EINVAL;
-		} else if (errret == ESPIPE)
-			fp->_flags &= ~__SAPP;
-		fp->_flags &= ~__SOFF;
-		ret = -1;
-	} else if (fp->_flags & __SOPT) {
-		fp->_flags |= __SOFF;
-		fp->_offset = ret;
-	}
-	return (ret);
-}
diff --git a/lib/libc/stdio/swprintf.c b/lib/libc/stdio/swprintf.c
deleted file mode 100644
index 190326a..0000000
--- a/lib/libc/stdio/swprintf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/swprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-int
-swprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vswprintf(s, n, fmt, ap);
-	va_end(ap);
-
-	return (ret);
-}
diff --git a/lib/libc/stdio/swscanf.c b/lib/libc/stdio/swscanf.c
deleted file mode 100644
index 81ac9f1..0000000
--- a/lib/libc/stdio/swscanf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/swscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-int
-swscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vswscanf(str, fmt, ap);
-	va_end(ap);
-
-	return (r);
-}
diff --git a/lib/libc/stdio/tempnam.c b/lib/libc/stdio/tempnam.c
deleted file mode 100644
index d4dbaa3..0000000
--- a/lib/libc/stdio/tempnam.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tempnam.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/tempnam.c,v 1.10 2002/03/22 21:53:04 obrien Exp $");
-
-#include <sys/param.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <paths.h>
-
-__warn_references(tempnam,
-    "warning: tempnam() possibly used unsafely; consider using mkstemp()");
-
-extern char *_mktemp(char *);
-
-char *
-tempnam(dir, pfx)
-	const char *dir, *pfx;
-{
-	int sverrno;
-	char *f, *name;
-
-	if (!(name = malloc(MAXPATHLEN)))
-		return(NULL);
-
-	if (!pfx)
-		pfx = "tmp.";
-
-	if (issetugid() == 0 && (f = getenv("TMPDIR"))) {
-		(void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f,
-		    *(f + strlen(f) - 1) == '/'? "": "/", pfx);
-		if ((f = _mktemp(name)))
-			return(f);
-	}
-
-	if ((f = (char *)dir)) {
-		(void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f,
-		    *(f + strlen(f) - 1) == '/'? "": "/", pfx);
-		if ((f = _mktemp(name)))
-			return(f);
-	}
-
-	f = P_tmpdir;
-	(void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx);
-	if ((f = _mktemp(name)))
-		return(f);
-
-	f = _PATH_TMP;
-	(void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx);
-	if ((f = _mktemp(name)))
-		return(f);
-
-	sverrno = errno;
-	free(name);
-	errno = sverrno;
-	return(NULL);
-}
diff --git a/lib/libc/stdio/tmpfile.c b/lib/libc/stdio/tmpfile.c
deleted file mode 100644
index cf5b70a..0000000
--- a/lib/libc/stdio/tmpfile.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tmpfile.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/tmpfile.c,v 1.9 2003/02/06 01:08:19 mtm Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <signal.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <paths.h>
-#include "un-namespace.h"
-
-FILE *
-tmpfile()
-{
-	sigset_t set, oset;
-	FILE *fp;
-	int fd, sverrno;
-#define	TRAILER	"tmp.XXXXXX"
-	char *buf;
-	const char *tmpdir;
-
-	tmpdir = NULL;
-	if (issetugid() == 0)
-		tmpdir = getenv("TMPDIR");
-	if (tmpdir == NULL)
-		tmpdir = _PATH_TMP;
-
-	(void)asprintf(&buf, "%s%s%s", tmpdir,
-	    (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", TRAILER);
-	if (buf == NULL)
-		return (NULL);
-
-	sigfillset(&set);
-	(void)_sigprocmask(SIG_BLOCK, &set, &oset);
-
-	fd = mkstemp(buf);
-	if (fd != -1)
-		(void)unlink(buf);
-
-	free(buf);
-
-	(void)_sigprocmask(SIG_SETMASK, &oset, NULL);
-
-	if (fd == -1)
-		return (NULL);
-
-	if ((fp = fdopen(fd, "w+")) == NULL) {
-		sverrno = errno;
-		(void)_close(fd);
-		errno = sverrno;
-		return (NULL);
-	}
-	return (fp);
-}
diff --git a/lib/libc/stdio/tmpnam.c b/lib/libc/stdio/tmpnam.c
deleted file mode 100644
index 38fcdd6..0000000
--- a/lib/libc/stdio/tmpnam.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tmpnam.c	8.3 (Berkeley) 3/28/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/tmpnam.c,v 1.5 2002/03/22 21:53:04 obrien Exp $");
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <unistd.h>
-
-__warn_references(tmpnam,
-    "warning: tmpnam() possibly used unsafely; consider using mkstemp()");
-
-extern char *_mktemp(char *);
-
-char *
-tmpnam(s)
-	char *s;
-{
-	static u_long tmpcount;
-	static char buf[L_tmpnam];
-
-	if (s == NULL)
-		s = buf;
-	(void)snprintf(s, L_tmpnam, "%stmp.%lu.XXXXXX", P_tmpdir, tmpcount);
-	++tmpcount;
-	return (_mktemp(s));
-}
diff --git a/lib/libc/stdio/ungetc.c b/lib/libc/stdio/ungetc.c
deleted file mode 100644
index 2217259..0000000
--- a/lib/libc/stdio/ungetc.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ungetc.c	8.2 (Berkeley) 11/3/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetc.c,v 1.16 2004/03/10 12:41:11 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-static int __submore(FILE *);
-
-/*
- * Expand the ungetc buffer `in place'.  That is, adjust fp->_p when
- * the buffer moves, so that it points the same distance from the end,
- * and move the bytes in the buffer around as necessary so that they
- * are all at the end (stack-style).
- */
-static int
-__submore(FILE *fp)
-{
-	int i;
-	unsigned char *p;
-
-	if (fp->_ub._base == fp->_ubuf) {
-		/*
-		 * Get a new buffer (rather than expanding the old one).
-		 */
-		if ((p = malloc((size_t)BUFSIZ)) == NULL)
-			return (EOF);
-		fp->_ub._base = p;
-		fp->_ub._size = BUFSIZ;
-		p += BUFSIZ - sizeof(fp->_ubuf);
-		for (i = sizeof(fp->_ubuf); --i >= 0;)
-			p[i] = fp->_ubuf[i];
-		fp->_p = p;
-		return (0);
-	}
-	i = fp->_ub._size;
-	p = realloc(fp->_ub._base, (size_t)(i << 1));
-	if (p == NULL)
-		return (EOF);
-	/* no overlap (hence can use memcpy) because we doubled the size */
-	(void)memcpy((void *)(p + i), (void *)p, (size_t)i);
-	fp->_p = p + i;
-	fp->_ub._base = p;
-	fp->_ub._size = i << 1;
-	return (0);
-}
-
-/*
- * MT-safe version
- */
-int
-ungetc(int c, FILE *fp)
-{
-	int ret;
-
-	if (!__sdidinit)
-		__sinit();
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	ret = __ungetc(c, fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-/*
- * Non-MT-safe version
- */
-int
-__ungetc(int c, FILE *fp)
-{
-
-	if (c == EOF)
-		return (EOF);
-	if ((fp->_flags & __SRD) == 0) {
-		/*
-		 * Not already reading: no good unless reading-and-writing.
-		 * Otherwise, flush any current write stuff.
-		 */
-		if ((fp->_flags & __SRW) == 0)
-			return (EOF);
-		if (fp->_flags & __SWR) {
-			if (__sflush(fp))
-				return (EOF);
-			fp->_flags &= ~__SWR;
-			fp->_w = 0;
-			fp->_lbfsize = 0;
-		}
-		fp->_flags |= __SRD;
-	}
-	c = (unsigned char)c;
-
-	/*
-	 * If we are in the middle of ungetc'ing, just continue.
-	 * This may require expanding the current ungetc buffer.
-	 */
-	if (HASUB(fp)) {
-		if (fp->_r >= fp->_ub._size && __submore(fp))
-			return (EOF);
-		*--fp->_p = c;
-		fp->_r++;
-		return (c);
-	}
-	fp->_flags &= ~__SEOF;
-
-	/*
-	 * If we can handle this by simply backing up, do so,
-	 * but never replace the original character.
-	 * (This makes sscanf() work when scanning `const' data.)
-	 */
-	if (fp->_bf._base != NULL && fp->_p > fp->_bf._base &&
-	    fp->_p[-1] == c) {
-		fp->_p--;
-		fp->_r++;
-		return (c);
-	}
-
-	/*
-	 * Create an ungetc buffer.
-	 * Initially, we will use the `reserve' buffer.
-	 */
-	fp->_ur = fp->_r;
-	fp->_extra->_up = fp->_p;
-	fp->_ub._base = fp->_ubuf;
-	fp->_ub._size = sizeof(fp->_ubuf);
-	fp->_ubuf[sizeof(fp->_ubuf) - 1] = c;
-	fp->_p = &fp->_ubuf[sizeof(fp->_ubuf) - 1];
-	fp->_r = 1;
-	return (c);
-}
diff --git a/lib/libc/stdio/ungetwc.c b/lib/libc/stdio/ungetwc.c
deleted file mode 100644
index b90671a..0000000
--- a/lib/libc/stdio/ungetwc.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.9 2004/07/20 08:27:27 tjr Exp $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-
-/*
- * Non-MT-safe version.
- */
-wint_t
-__ungetwc(wint_t wc, FILE *fp)
-{
-	char buf[MB_LEN_MAX];
-	size_t len;
-
-	if (wc == WEOF)
-		return (WEOF);
-	if ((len = __wcrtomb(buf, wc, &fp->_extra->mbstate)) == (size_t)-1) {
-		fp->_flags |= __SERR;
-		return (WEOF);
-	}
-	while (len-- != 0)
-		if (__ungetc((unsigned char)buf[len], fp) == EOF)
-			return (WEOF);
-
-	return (wc);
-}
-
-/*
- * MT-safe version.
- */
-wint_t
-ungetwc(wint_t wc, FILE *fp)
-{
-	wint_t r;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	r = __ungetwc(wc, fp);
-	FUNLOCKFILE(fp);
-
-	return (r);
-}
diff --git a/lib/libc/stdio/unlocked.c b/lib/libc/stdio/unlocked.c
deleted file mode 100644
index 6b1c0ef..0000000
--- a/lib/libc/stdio/unlocked.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/unlocked.c,v 1.1 2003/01/10 04:35:08 tjr Exp $");
-
-#include <stdio.h>
-
-#undef getchar_unlocked
-int
-getchar_unlocked(void)
-{
-
-	return (__sgetc(stdin));
-}
-
-#undef getc_unlocked
-int
-getc_unlocked(FILE *fp)
-{
-
-	return (__sgetc(fp));
-}
-
-#undef putchar_unlocked
-int
-putchar_unlocked(int ch)
-{
-
-	return (__sputc(ch, stdout));
-}
-
-#undef putc_unlocked
-int
-putc_unlocked(int ch, FILE *fp)
-{
-
-	return (__sputc(ch, fp));
-}
-
-#undef feof_unlocked
-int
-feof_unlocked(FILE *fp)
-{
-
-	return (__sfeof(fp));
-}
-
-#undef ferror_unlocked
-int
-ferror_unlocked(FILE *fp)
-{
-
-	return (__sferror(fp));
-}
-
-#undef clearerr_unlocked
-void
-clearerr_unlocked(FILE *fp)
-{
-
-	__sclearerr(fp);
-}
-
-#undef fileno_unlocked
-int
-fileno_unlocked(FILE *fp)
-{
-
-	return (__sfileno(fp));
-}
diff --git a/lib/libc/stdio/vasprintf.c b/lib/libc/stdio/vasprintf.c
deleted file mode 100644
index 197c427..0000000
--- a/lib/libc/stdio/vasprintf.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*	$OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $	*/
-
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.18 2002/09/26 13:11:24 tjr Exp $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include "local.h"
-
-int
-vasprintf(str, fmt, ap)
-	char **str;
-	const char *fmt;
-	__va_list ap;
-{
-	int ret;
-	FILE f;
-	struct __sFILEX ext;
-
-	f._file = -1;
-	f._flags = __SWR | __SSTR | __SALC;
-	f._bf._base = f._p = (unsigned char *)malloc(128);
-	if (f._bf._base == NULL) {
-		*str = NULL;
-		errno = ENOMEM;
-		return (-1);
-	}
-	f._bf._size = f._w = 127;		/* Leave room for the NUL */
-	f._extra = &ext;
-	INITEXTRA(&f);
-	ret = __vfprintf(&f, fmt, ap);
-	if (ret < 0) {
-		free(f._bf._base);
-		*str = NULL;
-		errno = ENOMEM;
-		return (-1);
-	}
-	*f._p = '\0';
-	*str = (char *)f._bf._base;
-	return (ret);
-}
diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c
deleted file mode 100644
index 44b5b66..0000000
--- a/lib/libc/stdio/vfprintf.c
+++ /dev/null
@@ -1,1657 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.69.2.1 2006/06/25 07:35:50 phk Exp $");
-
-/*
- * Actual printf innards.
- *
- * This code is large and complicated...
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <limits.h>
-#include <locale.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <printf.h>
-
-#include <stdarg.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-#include "fvwrite.h"
-
-union arg {
-	int	intarg;
-	u_int	uintarg;
-	long	longarg;
-	u_long	ulongarg;
-	long long longlongarg;
-	unsigned long long ulonglongarg;
-	ptrdiff_t ptrdiffarg;
-	size_t	sizearg;
-	intmax_t intmaxarg;
-	uintmax_t uintmaxarg;
-	void	*pvoidarg;
-	char	*pchararg;
-	signed char *pschararg;
-	short	*pshortarg;
-	int	*pintarg;
-	long	*plongarg;
-	long long *plonglongarg;
-	ptrdiff_t *pptrdiffarg;
-	size_t	*psizearg;
-	intmax_t *pintmaxarg;
-#ifndef NO_FLOATING_POINT
-	double	doublearg;
-	long double longdoublearg;
-#endif
-	wint_t	wintarg;
-	wchar_t	*pwchararg;
-};
-
-/*
- * Type ids for argument type table.
- */
-enum typeid {
-	T_UNUSED, TP_SHORT, T_INT, T_U_INT, TP_INT,
-	T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
-	T_PTRDIFFT, TP_PTRDIFFT, T_SIZET, TP_SIZET,
-	T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
-	T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
-};
-
-static int	__sprint(FILE *, struct __suio *);
-static int	__sbprintf(FILE *, const char *, va_list) __printflike(2, 0);
-static char	*__ujtoa(uintmax_t, char *, int, int, const char *, int, char,
-		    const char *);
-static char	*__ultoa(u_long, char *, int, int, const char *, int, char,
-		    const char *);
-static char	*__wcsconv(wchar_t *, int);
-static void	__find_arguments(const char *, va_list, union arg **);
-static void	__grow_type_table(int, enum typeid **, int *);
-
-/*
- * Flush out all the vectors defined by the given uio,
- * then reset it so that it can be reused.
- */
-static int
-__sprint(FILE *fp, struct __suio *uio)
-{
-	int err;
-	if (uio->uio_resid == 0) {
-		uio->uio_iovcnt = 0;
-		return (0);
-	}
-	err = __sfvwrite(fp, uio);
-	uio->uio_resid = 0;
-	uio->uio_iovcnt = 0;
-	return (err);
-}
-
-/*
- * Helper function for `fprintf to unbuffered unix file': creates a
- * temporary buffer.  We only work on write-only files; this avoids
- * worries about ungetc buffers and so forth.
- */
-static int
-__sbprintf(FILE *fp, const char *fmt, va_list ap)
-{
-	int ret;
-	FILE fake;
-	unsigned char buf[BUFSIZ];
-
-	/* copy the important variables */
-	fake._flags = fp->_flags & ~__SNBF;
-	fake._file = fp->_file;
-	fake._cookie = fp->_cookie;
-	fake._write = fp->_write;
-	fake._extra = fp->_extra;
-
-	/* set up the buffer */
-	fake._bf._base = fake._p = buf;
-	fake._bf._size = fake._w = sizeof(buf);
-	fake._lbfsize = 0;	/* not actually used, but Just In Case */
-
-	/* do the work, then copy any error status */
-	ret = __vfprintf(&fake, fmt, ap);
-	if (ret >= 0 && __fflush(&fake))
-		ret = EOF;
-	if (fake._flags & __SERR)
-		fp->_flags |= __SERR;
-	return (ret);
-}
-
-/*
- * Macros for converting digits to letters and vice versa
- */
-#define	to_digit(c)	((c) - '0')
-#define is_digit(c)	((unsigned)to_digit(c) <= 9)
-#define	to_char(n)	((n) + '0')
-
-/*
- * Convert an unsigned long to ASCII for printf purposes, returning
- * a pointer to the first character of the string representation.
- * Octal numbers can be forced to have a leading zero; hex numbers
- * use the given digits.
- */
-static char *
-__ultoa(u_long val, char *endp, int base, int octzero, const char *xdigs,
-	int needgrp, char thousep, const char *grp)
-{
-	char *cp = endp;
-	long sval;
-	int ndig;
-
-	/*
-	 * Handle the three cases separately, in the hope of getting
-	 * better/faster code.
-	 */
-	switch (base) {
-	case 10:
-		if (val < 10) {	/* many numbers are 1 digit */
-			*--cp = to_char(val);
-			return (cp);
-		}
-		ndig = 0;
-		/*
-		 * On many machines, unsigned arithmetic is harder than
-		 * signed arithmetic, so we do at most one unsigned mod and
-		 * divide; this is sufficient to reduce the range of
-		 * the incoming value to where signed arithmetic works.
-		 */
-		if (val > LONG_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp && ndig == *grp && *grp != CHAR_MAX
-					&& sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		if (octzero && *cp != '0')
-			*--cp = '0';
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:			/* oops */
-		abort();
-	}
-	return (cp);
-}
-
-/* Identical to __ultoa, but for intmax_t. */
-static char *
-__ujtoa(uintmax_t val, char *endp, int base, int octzero, const char *xdigs, 
-	int needgrp, char thousep, const char *grp)
-{
-	char *cp = endp;
-	intmax_t sval;
-	int ndig;
-
-	/* quick test for small values; __ultoa is typically much faster */
-	/* (perhaps instead we should run until small, then call __ultoa?) */
-	if (val <= ULONG_MAX)
-		return (__ultoa((u_long)val, endp, base, octzero, xdigs,
-		    needgrp, thousep, grp));
-	switch (base) {
-	case 10:
-		if (val < 10) {
-			*--cp = to_char(val % 10);
-			return (cp);
-		}
-		ndig = 0;
-		if (val > INTMAX_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp && *grp != CHAR_MAX && ndig == *grp
-					&& sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		if (octzero && *cp != '0')
-			*--cp = '0';
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:
-		abort();
-	}
-	return (cp);
-}
-
-/*
- * Convert a wide character string argument for the %ls format to a multibyte
- * string representation. ``prec'' specifies the maximum number of bytes
- * to output. If ``prec'' is greater than or equal to zero, we can't assume
- * that the wide char. string ends in a null character.
- */
-static char *
-__wcsconv(wchar_t *wcsarg, int prec)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char buf[MB_LEN_MAX];
-	wchar_t *p;
-	char *convbuf, *mbp;
-	size_t clen, nbytes;
-
-	/*
-	 * Determine the number of bytes to output and allocate space for
-	 * the output.
-	 */
-	if (prec >= 0) {
-		nbytes = 0;
-		p = wcsarg;
-		mbs = initial;
-		for (;;) {
-			clen = wcrtomb(buf, *p++, &mbs);
-			if (clen == 0 || clen == (size_t)-1 ||
-			    nbytes + clen > prec)
-				break;
-			nbytes += clen;
-		}
-	} else {
-		p = wcsarg;
-		mbs = initial;
-		nbytes = wcsrtombs(NULL, (const wchar_t **)&p, 0, &mbs);
-		if (nbytes == (size_t)-1)
-			return (NULL);
-	}
-	if ((convbuf = malloc(nbytes + 1)) == NULL)
-		return (NULL);
-
-	/*
-	 * Fill the output buffer with the multibyte representations of as
-	 * many wide characters as will fit.
-	 */
-	mbp = convbuf;
-	p = wcsarg;
-	mbs = initial;
-	while (mbp - convbuf < nbytes) {
-		clen = wcrtomb(mbp, *p++, &mbs);
-		if (clen == 0 || clen == (size_t)-1)
-			break;
-		mbp += clen;
-	}
-	if (clen == (size_t)-1) {
-		free(convbuf);
-		return (NULL);
-	}
-	*mbp = '\0';
-
-	return (convbuf);
-}
-
-/*
- * MT-safe version
- */
-int
-vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap)
-
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = __vfprintf(fp, fmt0, ap);
-	FUNLOCKFILE(fp);
-
-	return (ret);
-}
-
-#ifndef NO_FLOATING_POINT
-
-#define	dtoa		__dtoa
-#define	freedtoa	__freedtoa
-
-#include <float.h>
-#include <math.h>
-#include "floatio.h"
-#include "gdtoa.h"
-
-#define	DEFPREC		6
-
-static int exponent(char *, int, int);
-
-#endif /* !NO_FLOATING_POINT */
-
-/*
- * The size of the buffer we use as scratch space for integer
- * conversions, among other things.  Technically, we would need the
- * most space for base 10 conversions with thousands' grouping
- * characters between each pair of digits.  100 bytes is a
- * conservative overestimate even for a 128-bit uintmax_t.
- */
-#define	BUF	100
-
-#define STATIC_ARG_TBL_SIZE 8           /* Size of static argument table. */
-
-/*
- * Flags used during conversion.
- */
-#define	ALT		0x001		/* alternate form */
-#define	LADJUST		0x004		/* left adjustment */
-#define	LONGDBL		0x008		/* long double */
-#define	LONGINT		0x010		/* long integer */
-#define	LLONGINT	0x020		/* long long integer */
-#define	SHORTINT	0x040		/* short integer */
-#define	ZEROPAD		0x080		/* zero (as opposed to blank) pad */
-#define	FPT		0x100		/* Floating point number */
-#define	GROUPING	0x200		/* use grouping ("'" flag) */
-					/* C99 additional size modifiers: */
-#define	SIZET		0x400		/* size_t */
-#define	PTRDIFFT	0x800		/* ptrdiff_t */
-#define	INTMAXT		0x1000		/* intmax_t */
-#define	CHARINT		0x2000		/* print char using int format */
-
-/*
- * Non-MT-safe version
- */
-int
-__vfprintf(FILE *fp, const char *fmt0, va_list ap)
-{
-	char *fmt;		/* format string */
-	int ch;			/* character from fmt */
-	int n, n2;		/* handy integer (short term usage) */
-	char *cp;		/* handy char pointer (short term usage) */
-	struct __siov *iovp;	/* for PRINT macro */
-	int flags;		/* flags as above */
-	int ret;		/* return value accumulator */
-	int width;		/* width from format (%8d), or 0 */
-	int prec;		/* precision from format; <0 for N/A */
-	char sign;		/* sign prefix (' ', '+', '-', or \0) */
-	char thousands_sep;	/* locale specific thousands separator */
-	const char *grouping;	/* locale specific numeric grouping rules */
-
-	if (__use_xprintf == 0 && getenv("USE_XPRINTF"))
-		__use_xprintf = 1;
-	if (__use_xprintf > 0)
-		return (__xvprintf(fp, fmt0, ap));
-
-#ifndef NO_FLOATING_POINT
-	/*
-	 * We can decompose the printed representation of floating
-	 * point numbers into several parts, some of which may be empty:
-	 *
-	 * [+|-| ] [0x|0X] MMM . NNN [e|E|p|P] [+|-] ZZ
-	 *    A       B     ---C---      D       E   F
-	 *
-	 * A:	'sign' holds this value if present; '\0' otherwise
-	 * B:	ox[1] holds the 'x' or 'X'; '\0' if not hexadecimal
-	 * C:	cp points to the string MMMNNN.  Leading and trailing
-	 *	zeros are not in the string and must be added.
-	 * D:	expchar holds this character; '\0' if no exponent, e.g. %f
-	 * F:	at least two digits for decimal, at least one digit for hex
-	 */
-	char *decimal_point;	/* locale specific decimal point */
-	int signflag;		/* true if float is negative */
-	union {			/* floating point arguments %[aAeEfFgG] */
-		double dbl;
-		long double ldbl;
-	} fparg;
-	int expt;		/* integer value of exponent */
-	char expchar;		/* exponent character: [eEpP\0] */
-	char *dtoaend;		/* pointer to end of converted digits */
-	int expsize;		/* character count for expstr */
-	int lead;		/* sig figs before decimal or group sep */
-	int ndig;		/* actual number of digits returned by dtoa */
-	char expstr[MAXEXPDIG+2];	/* buffer for exponent string: e+ZZZ */
-	char *dtoaresult;	/* buffer allocated by dtoa */
-	int nseps;		/* number of group separators with ' */
-	int nrepeats;		/* number of repeats of the last group */
-#endif
-	u_long	ulval;		/* integer arguments %[diouxX] */
-	uintmax_t ujval;	/* %j, %ll, %q, %t, %z integers */
-	int base;		/* base for [diouxX] conversion */
-	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
-	int realsz;		/* field size expanded by dprec, sign, etc */
-	int size;		/* size of converted field or string */
-	int prsize;             /* max size of printed field */
-	const char *xdigs;     	/* digits for %[xX] conversion */
-#define NIOV 8
-	struct __suio uio;	/* output information: summary */
-	struct __siov iov[NIOV];/* ... and individual io vectors */
-	char buf[BUF];		/* buffer with space for digits of uintmax_t */
-	char ox[2];		/* space for 0x; ox[1] is either x, X, or \0 */
-	union arg *argtable;    /* args, built due to positional arg */
-	union arg statargtable [STATIC_ARG_TBL_SIZE];
-	int nextarg;            /* 1-based argument index */
-	va_list orgap;          /* original argument pointer */
-	char *convbuf;		/* wide to multibyte conversion result */
-
-	/*
-	 * Choose PADSIZE to trade efficiency vs. size.  If larger printf
-	 * fields occur frequently, increase PADSIZE and make the initialisers
-	 * below longer.
-	 */
-#define	PADSIZE	16		/* pad chunk size */
-	static char blanks[PADSIZE] =
-	 {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
-	static char zeroes[PADSIZE] =
-	 {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
-
-	static const char xdigs_lower[17] = "0123456789abcdef?";
-	static const char xdigs_upper[17] = "0123456789ABCDEF?";
-
-	/*
-	 * BEWARE, these `goto error' on error, and PAD uses `n'.
-	 */
-#define	PRINT(ptr, len) { \
-	iovp->iov_base = (ptr); \
-	iovp->iov_len = (len); \
-	uio.uio_resid += (len); \
-	iovp++; \
-	if (++uio.uio_iovcnt >= NIOV) { \
-		if (__sprint(fp, &uio)) \
-			goto error; \
-		iovp = iov; \
-	} \
-}
-#define	PAD(howmany, with) { \
-	if ((n = (howmany)) > 0) { \
-		while (n > PADSIZE) { \
-			PRINT(with, PADSIZE); \
-			n -= PADSIZE; \
-		} \
-		PRINT(with, n); \
-	} \
-}
-#define	PRINTANDPAD(p, ep, len, with) do {	\
-	n2 = (ep) - (p);       			\
-	if (n2 > (len))				\
-		n2 = (len);			\
-	if (n2 > 0)				\
-		PRINT((p), n2);			\
-	PAD((len) - (n2 > 0 ? n2 : 0), (with));	\
-} while(0)
-#define	FLUSH() { \
-	if (uio.uio_resid && __sprint(fp, &uio)) \
-		goto error; \
-	uio.uio_iovcnt = 0; \
-	iovp = iov; \
-}
-
-	/*
-	 * Get the argument indexed by nextarg.   If the argument table is
-	 * built, use it to get the argument.  If its not, get the next
-	 * argument (and arguments must be gotten sequentially).
-	 */
-#define GETARG(type) \
-	((argtable != NULL) ? *((type*)(&argtable[nextarg++])) : \
-	    (nextarg++, va_arg(ap, type)))
-
-	/*
-	 * To extend shorts properly, we need both signed and unsigned
-	 * argument extraction methods.
-	 */
-#define	SARG() \
-	(flags&LONGINT ? GETARG(long) : \
-	    flags&SHORTINT ? (long)(short)GETARG(int) : \
-	    flags&CHARINT ? (long)(signed char)GETARG(int) : \
-	    (long)GETARG(int))
-#define	UARG() \
-	(flags&LONGINT ? GETARG(u_long) : \
-	    flags&SHORTINT ? (u_long)(u_short)GETARG(int) : \
-	    flags&CHARINT ? (u_long)(u_char)GETARG(int) : \
-	    (u_long)GETARG(u_int))
-#define	INTMAX_SIZE	(INTMAXT|SIZET|PTRDIFFT|LLONGINT)
-#define SJARG() \
-	(flags&INTMAXT ? GETARG(intmax_t) : \
-	    flags&SIZET ? (intmax_t)GETARG(size_t) : \
-	    flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
-	    (intmax_t)GETARG(long long))
-#define	UJARG() \
-	(flags&INTMAXT ? GETARG(uintmax_t) : \
-	    flags&SIZET ? (uintmax_t)GETARG(size_t) : \
-	    flags&PTRDIFFT ? (uintmax_t)GETARG(ptrdiff_t) : \
-	    (uintmax_t)GETARG(unsigned long long))
-
-	/*
-	 * Get * arguments, including the form *nn$.  Preserve the nextarg
-	 * that the argument can be gotten once the type is determined.
-	 */
-#define GETASTER(val) \
-	n2 = 0; \
-	cp = fmt; \
-	while (is_digit(*cp)) { \
-		n2 = 10 * n2 + to_digit(*cp); \
-		cp++; \
-	} \
-	if (*cp == '$') { \
-		int hold = nextarg; \
-		if (argtable == NULL) { \
-			argtable = statargtable; \
-			__find_arguments (fmt0, orgap, &argtable); \
-		} \
-		nextarg = n2; \
-		val = GETARG (int); \
-		nextarg = hold; \
-		fmt = ++cp; \
-	} else { \
-		val = GETARG (int); \
-	}
-
-
-	thousands_sep = '\0';
-	grouping = NULL;
-	convbuf = NULL;
-#ifndef NO_FLOATING_POINT
-	dtoaresult = NULL;
-	decimal_point = localeconv()->decimal_point;
-#endif
-	/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
-	if (prepwrite(fp) != 0)
-		return (EOF);
-
-	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
-	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-	    fp->_file >= 0)
-		return (__sbprintf(fp, fmt0, ap));
-	fmt = (char *)fmt0;
-	argtable = NULL;
-	nextarg = 1;
-	va_copy(orgap, ap);
-	uio.uio_iov = iovp = iov;
-	uio.uio_resid = 0;
-	uio.uio_iovcnt = 0;
-	ret = 0;
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
-			/* void */;
-		if ((n = fmt - cp) != 0) {
-			if ((unsigned)ret + n > INT_MAX) {
-				ret = EOF;
-				goto error;
-			}
-			PRINT(cp, n);
-			ret += n;
-		}
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-		dprec = 0;
-		width = 0;
-		prec = -1;
-		sign = '\0';
-		ox[1] = '\0';
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-			/*-
-			 * ``If the space and + flags both appear, the space
-			 * flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-			if (!sign)
-				sign = ' ';
-			goto rflag;
-		case '#':
-			flags |= ALT;
-			goto rflag;
-		case '*':
-			/*-
-			 * ``A negative field width argument is taken as a
-			 * - flag followed by a positive field width.''
-			 *	-- ANSI X3J11
-			 * They don't exclude field widths read from args.
-			 */
-			GETASTER (width);
-			if (width >= 0)
-				goto rflag;
-			width = -width;
-			/* FALLTHROUGH */
-		case '-':
-			flags |= LADJUST;
-			goto rflag;
-		case '+':
-			sign = '+';
-			goto rflag;
-		case '\'':
-			flags |= GROUPING;
-			thousands_sep = *(localeconv()->thousands_sep);
-			grouping = localeconv()->grouping;
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				GETASTER (prec);
-				goto rflag;
-			}
-			prec = 0;
-			while (is_digit(ch)) {
-				prec = 10 * prec + to_digit(ch);
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			/*-
-			 * ``Note that 0 is taken as a flag, not as the
-			 * beginning of a field width.''
-			 *	-- ANSI X3J11
-			 */
-			flags |= ZEROPAD;
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				nextarg = n;
-				if (argtable == NULL) {
-					argtable = statargtable;
-					__find_arguments (fmt0, orgap,
-					    &argtable);
-				}
-				goto rflag;
-			}
-			width = n;
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-			if (flags & LONGINT) {
-				static const mbstate_t initial;
-				mbstate_t mbs;
-				size_t mbseqlen;
-
-				mbs = initial;
-				mbseqlen = wcrtomb(cp = buf,
-				    (wchar_t)GETARG(wint_t), &mbs);
-				if (mbseqlen == (size_t)-1) {
-					fp->_flags |= __SERR;
-					goto error;
-				}
-				size = (int)mbseqlen;
-			} else {
-				*(cp = buf) = GETARG(int);
-				size = 1;
-			}
-			sign = '\0';
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			if (flags & INTMAX_SIZE) {
-				ujval = SJARG();
-				if ((intmax_t)ujval < 0) {
-					ujval = -ujval;
-					sign = '-';
-				}
-			} else {
-				ulval = SARG();
-				if ((long)ulval < 0) {
-					ulval = -ulval;
-					sign = '-';
-				}
-			}
-			base = 10;
-			goto number;
-#ifndef NO_FLOATING_POINT
-		case 'a':
-		case 'A':
-			if (ch == 'a') {
-				ox[1] = 'x';
-				xdigs = xdigs_lower;
-				expchar = 'p';
-			} else {
-				ox[1] = 'X';
-				xdigs = xdigs_upper;
-				expchar = 'P';
-			}
-			if (prec >= 0)
-				prec++;
-			if (dtoaresult != NULL)
-				freedtoa(dtoaresult);
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult = cp =
-				    __hldtoa(fparg.ldbl, xdigs, prec,
-				    &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult = cp =
-				    __hdtoa(fparg.dbl, xdigs, prec,
-				    &expt, &signflag, &dtoaend);
-			}
-			if (prec < 0)
-				prec = dtoaend - cp;
-			if (expt == INT_MAX)
-				ox[1] = '\0';
-			goto fp_common;
-		case 'e':
-		case 'E':
-			expchar = ch;
-			if (prec < 0)	/* account for digit before decpt */
-				prec = DEFPREC + 1;
-			else
-				prec++;
-			goto fp_begin;
-		case 'f':
-		case 'F':
-			expchar = '\0';
-			goto fp_begin;
-		case 'g':
-		case 'G':
-			expchar = ch - ('g' - 'e');
-			if (prec == 0)
-				prec = 1;
-fp_begin:
-			if (prec < 0)
-				prec = DEFPREC;
-			if (dtoaresult != NULL)
-				freedtoa(dtoaresult);
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult = cp =
-				    __ldtoa(&fparg.ldbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult = cp =
-				    dtoa(fparg.dbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-				if (expt == 9999)
-					expt = INT_MAX;
-			}
-fp_common:
-			if (signflag)
-				sign = '-';
-			if (expt == INT_MAX) {	/* inf or nan */
-				if (*cp == 'N') {
-					cp = (ch >= 'a') ? "nan" : "NAN";
-					sign = '\0';
-				} else
-					cp = (ch >= 'a') ? "inf" : "INF";
-				size = 3;
-				break;
-			}
-			flags |= FPT;
-			ndig = dtoaend - cp;
-			if (ch == 'g' || ch == 'G') {
-				if (expt > -4 && expt <= prec) {
-					/* Make %[gG] smell like %[fF] */
-					expchar = '\0';
-					if (flags & ALT)
-						prec -= expt;
-					else
-						prec = ndig - expt;
-					if (prec < 0)
-						prec = 0;
-				} else {
-					/*
-					 * Make %[gG] smell like %[eE], but
-					 * trim trailing zeroes if no # flag.
-					 */
-					if (!(flags & ALT))
-						prec = ndig;
-				}
-			}
-			if (expchar) {
-				expsize = exponent(expstr, expt - 1, expchar);
-				size = expsize + prec;
-				if (prec > 1 || flags & ALT)
-					++size;
-			} else {
-				/* space for digits before decimal point */
-				if (expt > 0)
-					size = expt;
-				else	/* "0" */
-					size = 1;
-				/* space for decimal pt and following digits */
-				if (prec || flags & ALT)
-					size += prec + 1;
-				if (grouping && expt > 0) {
-					/* space for thousands' grouping */
-					nseps = nrepeats = 0;
-					lead = expt;
-					while (*grouping != CHAR_MAX) {
-						if (lead <= *grouping)
-							break;
-						lead -= *grouping;
-						if (*(grouping+1)) {
-							nseps++;
-							grouping++;
-						} else
-							nrepeats++;
-					}
-					size += nseps + nrepeats;
-				} else
-					lead = expt;
-			}
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			/*
-			 * Assignment-like behavior is specified if the
-			 * value overflows or is otherwise unrepresentable.
-			 * C99 says to use `signed char' for %hhn conversions.
-			 */
-			if (flags & LLONGINT)
-				*GETARG(long long *) = ret;
-			else if (flags & SIZET)
-				*GETARG(ssize_t *) = (ssize_t)ret;
-			else if (flags & PTRDIFFT)
-				*GETARG(ptrdiff_t *) = ret;
-			else if (flags & INTMAXT)
-				*GETARG(intmax_t *) = ret;
-			else if (flags & LONGINT)
-				*GETARG(long *) = ret;
-			else if (flags & SHORTINT)
-				*GETARG(short *) = ret;
-			else if (flags & CHARINT)
-				*GETARG(signed char *) = ret;
-			else
-				*GETARG(int *) = ret;
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 8;
-			goto nosign;
-		case 'p':
-			/*-
-			 * ``The argument shall be a pointer to void.  The
-			 * value of the pointer is converted to a sequence
-			 * of printable characters, in an implementation-
-			 * defined manner.''
-			 *	-- ANSI X3J11
-			 */
-			ujval = (uintmax_t)(uintptr_t)GETARG(void *);
-			base = 16;
-			xdigs = xdigs_lower;
-			flags = flags | INTMAXT;
-			ox[1] = 'x';
-			goto nosign;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			if (flags & LONGINT) {
-				wchar_t *wcp;
-
-				if (convbuf != NULL)
-					free(convbuf);
-				if ((wcp = GETARG(wchar_t *)) == NULL)
-					cp = "(null)";
-				else {
-					convbuf = __wcsconv(wcp, prec);
-					if (convbuf == NULL) {
-						fp->_flags |= __SERR;
-						goto error;
-					}
-					cp = convbuf;
-				}
-			} else if ((cp = GETARG(char *)) == NULL)
-				cp = "(null)";
-			if (prec >= 0) {
-				/*
-				 * can't use strlen; can only look for the
-				 * NUL in the first `prec' characters, and
-				 * strlen() will go further.
-				 */
-				char *p = memchr(cp, 0, (size_t)prec);
-
-				if (p != NULL) {
-					size = p - cp;
-					if (size > prec)
-						size = prec;
-				} else
-					size = prec;
-			} else
-				size = strlen(cp);
-			sign = '\0';
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 10;
-			goto nosign;
-		case 'X':
-			xdigs = xdigs_upper;
-			goto hex;
-		case 'x':
-			xdigs = xdigs_lower;
-hex:
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 16;
-			/* leading 0x/X only if non-zero */
-			if (flags & ALT &&
-			    (flags & INTMAX_SIZE ? ujval != 0 : ulval != 0))
-				ox[1] = ch;
-
-			flags &= ~GROUPING;
-			/* unsigned conversions */
-nosign:			sign = '\0';
-			/*-
-			 * ``... diouXx conversions ... if a precision is
-			 * specified, the 0 flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-number:			if ((dprec = prec) >= 0)
-				flags &= ~ZEROPAD;
-
-			/*-
-			 * ``The result of converting a zero value with an
-			 * explicit precision of zero is no characters.''
-			 *	-- ANSI X3J11
-			 *
-			 * ``The C Standard is clear enough as is.  The call
-			 * printf("%#.0o", 0) should print 0.''
-			 *	-- Defect Report #151
-			 */
-			cp = buf + BUF;
-			if (flags & INTMAX_SIZE) {
-				if (ujval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					cp = __ujtoa(ujval, cp, base,
-					    flags & ALT, xdigs,
-					    flags & GROUPING, thousands_sep,
-					    grouping);
-			} else {
-				if (ulval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					cp = __ultoa(ulval, cp, base,
-					    flags & ALT, xdigs,
-					    flags & GROUPING, thousands_sep,
-					    grouping);
-			}
-			size = buf + BUF - cp;
-			if (size > BUF)	/* should never happen */
-				abort();
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			/* pretend it was %c with argument ch */
-			cp = buf;
-			*cp = ch;
-			size = 1;
-			sign = '\0';
-			break;
-		}
-		/*
-		 * All reasonable formats wind up here.  At this point, `cp'
-		 * points to a string which (if not flags&LADJUST) should be
-		 * padded out to `width' places.  If flags&ZEROPAD, it should
-		 * first be prefixed by any sign or other prefix; otherwise,
-		 * it should be blank padded before the prefix is emitted.
-		 * After any left-hand padding and prefixing, emit zeroes
-		 * required by a decimal [diouxX] precision, then print the
-		 * string proper, then emit zeroes required by any leftover
-		 * floating precision; finally, if LADJUST, pad with blanks.
-		 *
-		 * Compute actual size, so we know how much to pad.
-		 * size excludes decimal prec; realsz includes it.
-		 */
-		realsz = dprec > size ? dprec : size;
-		if (sign)
-			realsz++;
-		if (ox[1])
-			realsz += 2;
-
-		prsize = width > realsz ? width : realsz;
-		if ((unsigned)ret + prsize > INT_MAX) {
-			ret = EOF;
-			goto error;
-		}
-
-		/* right-adjusting blank padding */
-		if ((flags & (LADJUST|ZEROPAD)) == 0)
-			PAD(width - realsz, blanks);
-
-		/* prefix */
-		if (sign)
-			PRINT(&sign, 1);
-
-		if (ox[1]) {	/* ox[1] is either x, X, or \0 */
-			ox[0] = '0';
-			PRINT(ox, 2);
-		}
-
-		/* right-adjusting zero padding */
-		if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
-			PAD(width - realsz, zeroes);
-
-		/* leading zeroes from decimal precision */
-		PAD(dprec - size, zeroes);
-
-		/* the string or number proper */
-#ifndef NO_FLOATING_POINT
-		if ((flags & FPT) == 0) {
-			PRINT(cp, size);
-		} else {	/* glue together f_p fragments */
-			if (!expchar) {	/* %[fF] or sufficiently short %[gG] */
-				if (expt <= 0) {
-					PRINT(zeroes, 1);
-					if (prec || flags & ALT)
-						PRINT(decimal_point, 1);
-					PAD(-expt, zeroes);
-					/* already handled initial 0's */
-					prec += expt;
-				} else {
-					PRINTANDPAD(cp, dtoaend, lead, zeroes);
-					cp += lead;
-					if (grouping) {
-						while (nseps>0 || nrepeats>0) {
-							if (nrepeats > 0)
-								nrepeats--;
-							else {
-								grouping--;
-								nseps--;
-							}
-							PRINT(&thousands_sep,
-							    1);
-							PRINTANDPAD(cp,dtoaend,
-							    *grouping, zeroes);
-							cp += *grouping;
-						}
-						if (cp > dtoaend)
-							cp = dtoaend;
-					}
-					if (prec || flags & ALT)
-						PRINT(decimal_point,1);
-				}
-				PRINTANDPAD(cp, dtoaend, prec, zeroes);
-			} else {	/* %[eE] or sufficiently long %[gG] */
-				if (prec > 1 || flags & ALT) {
-					buf[0] = *cp++;
-					buf[1] = *decimal_point;
-					PRINT(buf, 2);
-					PRINT(cp, ndig-1);
-					PAD(prec - ndig, zeroes);
-				} else	/* XeYYY */
-					PRINT(cp, 1);
-				PRINT(expstr, expsize);
-			}
-		}
-#else
-		PRINT(cp, size);
-#endif
-		/* left-adjusting padding (always blank) */
-		if (flags & LADJUST)
-			PAD(width - realsz, blanks);
-
-		/* finally, adjust ret */
-		ret += prsize;
-
-		FLUSH();	/* copy out the I/O vectors */
-	}
-done:
-	FLUSH();
-error:
-	va_end(orgap);
-#ifndef NO_FLOATING_POINT
-	if (dtoaresult != NULL)
-		freedtoa(dtoaresult);
-#endif
-	if (convbuf != NULL)
-		free(convbuf);
-	if (__sferror(fp))
-		ret = EOF;
-	if ((argtable != NULL) && (argtable != statargtable))
-		free (argtable);
-	return (ret);
-	/* NOTREACHED */
-}
-
-/*
- * Find all arguments when a positional parameter is encountered.  Returns a
- * table, indexed by argument number, of pointers to each arguments.  The
- * initial argument table should be an array of STATIC_ARG_TBL_SIZE entries.
- * It will be replaces with a malloc-ed one if it overflows.
- */ 
-static void
-__find_arguments (const char *fmt0, va_list ap, union arg **argtable)
-{
-	char *fmt;		/* format string */
-	int ch;			/* character from fmt */
-	int n, n2;		/* handy integer (short term usage) */
-	char *cp;		/* handy char pointer (short term usage) */
-	int flags;		/* flags as above */
-	int width;		/* width from format (%8d), or 0 */
-	enum typeid *typetable; /* table of types */
-	enum typeid stattypetable [STATIC_ARG_TBL_SIZE];
-	int tablesize;		/* current size of type table */
-	int tablemax;		/* largest used index in table */
-	int nextarg;		/* 1-based argument index */
-
-	/*
-	 * Add an argument type to the table, expanding if necessary.
-	 */
-#define ADDTYPE(type) \
-	((nextarg >= tablesize) ? \
-		__grow_type_table(nextarg, &typetable, &tablesize) : (void)0, \
-	(nextarg > tablemax) ? tablemax = nextarg : 0, \
-	typetable[nextarg++] = type)
-
-#define	ADDSARG() \
-	((flags&INTMAXT) ? ADDTYPE(T_INTMAXT) : \
-		((flags&SIZET) ? ADDTYPE(T_SIZET) : \
-		((flags&PTRDIFFT) ? ADDTYPE(T_PTRDIFFT) : \
-		((flags&LLONGINT) ? ADDTYPE(T_LLONG) : \
-		((flags&LONGINT) ? ADDTYPE(T_LONG) : ADDTYPE(T_INT))))))
-
-#define	ADDUARG() \
-	((flags&INTMAXT) ? ADDTYPE(T_UINTMAXT) : \
-		((flags&SIZET) ? ADDTYPE(T_SIZET) : \
-		((flags&PTRDIFFT) ? ADDTYPE(T_PTRDIFFT) : \
-		((flags&LLONGINT) ? ADDTYPE(T_U_LLONG) : \
-		((flags&LONGINT) ? ADDTYPE(T_U_LONG) : ADDTYPE(T_U_INT))))))
-
-	/*
-	 * Add * arguments to the type array.
-	 */
-#define ADDASTER() \
-	n2 = 0; \
-	cp = fmt; \
-	while (is_digit(*cp)) { \
-		n2 = 10 * n2 + to_digit(*cp); \
-		cp++; \
-	} \
-	if (*cp == '$') { \
-		int hold = nextarg; \
-		nextarg = n2; \
-		ADDTYPE (T_INT); \
-		nextarg = hold; \
-		fmt = ++cp; \
-	} else { \
-		ADDTYPE (T_INT); \
-	}
-	fmt = (char *)fmt0;
-	typetable = stattypetable;
-	tablesize = STATIC_ARG_TBL_SIZE;
-	tablemax = 0; 
-	nextarg = 1;
-	for (n = 0; n < STATIC_ARG_TBL_SIZE; n++)
-		typetable[n] = T_UNUSED;
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
-			/* void */;
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-		width = 0;
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-		case '#':
-			goto rflag;
-		case '*':
-			ADDASTER ();
-			goto rflag;
-		case '-':
-		case '+':
-		case '\'':
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				ADDASTER ();
-				goto rflag;
-			}
-			while (is_digit(ch)) {
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				nextarg = n;
-				goto rflag;
-			}
-			width = n;
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-			if (flags & LONGINT)
-				ADDTYPE(T_WINT);
-			else
-				ADDTYPE(T_INT);
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			ADDSARG();
-			break;
-#ifndef NO_FLOATING_POINT
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'g':
-		case 'G':
-			if (flags & LONGDBL)
-				ADDTYPE(T_LONG_DOUBLE);
-			else
-				ADDTYPE(T_DOUBLE);
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			if (flags & INTMAXT)
-				ADDTYPE(TP_INTMAXT);
-			else if (flags & PTRDIFFT)
-				ADDTYPE(TP_PTRDIFFT);
-			else if (flags & SIZET)
-				ADDTYPE(TP_SIZET);
-			else if (flags & LLONGINT)
-				ADDTYPE(TP_LLONG);
-			else if (flags & LONGINT)
-				ADDTYPE(TP_LONG);
-			else if (flags & SHORTINT)
-				ADDTYPE(TP_SHORT);
-			else if (flags & CHARINT)
-				ADDTYPE(TP_SCHAR);
-			else
-				ADDTYPE(TP_INT);
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			ADDUARG();
-			break;
-		case 'p':
-			ADDTYPE(TP_VOID);
-			break;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			if (flags & LONGINT)
-				ADDTYPE(TP_WCHAR);
-			else
-				ADDTYPE(TP_CHAR);
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-		case 'X':
-		case 'x':
-			ADDUARG();
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			break;
-		}
-	}
-done:
-	/*
-	 * Build the argument table.
-	 */
-	if (tablemax >= STATIC_ARG_TBL_SIZE) {
-		*argtable = (union arg *)
-		    malloc (sizeof (union arg) * (tablemax + 1));
-	}
-
-	(*argtable) [0].intarg = 0;
-	for (n = 1; n <= tablemax; n++) {
-		switch (typetable [n]) {
-		    case T_UNUSED: /* whoops! */
-			(*argtable) [n].intarg = va_arg (ap, int);
-			break;
-		    case TP_SCHAR:
-			(*argtable) [n].pschararg = va_arg (ap, signed char *);
-			break;
-		    case TP_SHORT:
-			(*argtable) [n].pshortarg = va_arg (ap, short *);
-			break;
-		    case T_INT:
-			(*argtable) [n].intarg = va_arg (ap, int);
-			break;
-		    case T_U_INT:
-			(*argtable) [n].uintarg = va_arg (ap, unsigned int);
-			break;
-		    case TP_INT:
-			(*argtable) [n].pintarg = va_arg (ap, int *);
-			break;
-		    case T_LONG:
-			(*argtable) [n].longarg = va_arg (ap, long);
-			break;
-		    case T_U_LONG:
-			(*argtable) [n].ulongarg = va_arg (ap, unsigned long);
-			break;
-		    case TP_LONG:
-			(*argtable) [n].plongarg = va_arg (ap, long *);
-			break;
-		    case T_LLONG:
-			(*argtable) [n].longlongarg = va_arg (ap, long long);
-			break;
-		    case T_U_LLONG:
-			(*argtable) [n].ulonglongarg = va_arg (ap, unsigned long long);
-			break;
-		    case TP_LLONG:
-			(*argtable) [n].plonglongarg = va_arg (ap, long long *);
-			break;
-		    case T_PTRDIFFT:
-			(*argtable) [n].ptrdiffarg = va_arg (ap, ptrdiff_t);
-			break;
-		    case TP_PTRDIFFT:
-			(*argtable) [n].pptrdiffarg = va_arg (ap, ptrdiff_t *);
-			break;
-		    case T_SIZET:
-			(*argtable) [n].sizearg = va_arg (ap, size_t);
-			break;
-		    case TP_SIZET:
-			(*argtable) [n].psizearg = va_arg (ap, ssize_t *);
-			break;
-		    case T_INTMAXT:
-			(*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
-			break;
-		    case T_UINTMAXT:
-			(*argtable) [n].uintmaxarg = va_arg (ap, uintmax_t);
-			break;
-		    case TP_INTMAXT:
-			(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
-			break;
-		    case T_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			(*argtable) [n].doublearg = va_arg (ap, double);
-#endif
-			break;
-		    case T_LONG_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			(*argtable) [n].longdoublearg = va_arg (ap, long double);
-#endif
-			break;
-		    case TP_CHAR:
-			(*argtable) [n].pchararg = va_arg (ap, char *);
-			break;
-		    case TP_VOID:
-			(*argtable) [n].pvoidarg = va_arg (ap, void *);
-			break;
-		    case T_WINT:
-			(*argtable) [n].wintarg = va_arg (ap, wint_t);
-			break;
-		    case TP_WCHAR:
-			(*argtable) [n].pwchararg = va_arg (ap, wchar_t *);
-			break;
-		}
-	}
-
-	if ((typetable != NULL) && (typetable != stattypetable))
-		free (typetable);
-}
-
-/*
- * Increase the size of the type table.
- */
-static void
-__grow_type_table (int nextarg, enum typeid **typetable, int *tablesize)
-{
-	enum typeid *const oldtable = *typetable;
-	const int oldsize = *tablesize;
-	enum typeid *newtable;
-	int n, newsize = oldsize * 2;
-
-	if (newsize < nextarg + 1)
-		newsize = nextarg + 1;
-	if (oldsize == STATIC_ARG_TBL_SIZE) {
-		if ((newtable = malloc(newsize * sizeof(enum typeid))) == NULL)
-			abort();			/* XXX handle better */
-		bcopy(oldtable, newtable, oldsize * sizeof(enum typeid));
-	} else {
-		newtable = reallocf(oldtable, newsize * sizeof(enum typeid));
-		if (newtable == NULL)
-			abort();			/* XXX handle better */
-	}
-	for (n = oldsize; n < newsize; n++)
-		newtable[n] = T_UNUSED;
-
-	*typetable = newtable;
-	*tablesize = newsize;
-}
-
-
-#ifndef NO_FLOATING_POINT
-
-static int
-exponent(char *p0, int exp, int fmtch)
-{
-	char *p, *t;
-	char expbuf[MAXEXPDIG];
-
-	p = p0;
-	*p++ = fmtch;
-	if (exp < 0) {
-		exp = -exp;
-		*p++ = '-';
-	}
-	else
-		*p++ = '+';
-	t = expbuf + MAXEXPDIG;
-	if (exp > 9) {
-		do {
-			*--t = to_char(exp % 10);
-		} while ((exp /= 10) > 9);
-		*--t = to_char(exp);
-		for (; t < expbuf + MAXEXPDIG; *p++ = *t++);
-	}
-	else {
-		/*
-		 * Exponents for decimal floating point conversions
-		 * (%[eEgG]) must be at least two characters long,
-		 * whereas exponents for hexadecimal conversions can
-		 * be only one character long.
-		 */
-		if (fmtch == 'e' || fmtch == 'E')
-			*p++ = '0';
-		*p++ = to_char(exp);
-	}
-	return (p - p0);
-}
-#endif /* !NO_FLOATING_POINT */
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c
deleted file mode 100644
index 17d4a63..0000000
--- a/lib/libc/stdio/vfscanf.c
+++ /dev/null
@@ -1,1068 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.38.2.2 2006/06/25 07:35:50 phk Exp $");
-
-#include "namespace.h"
-#include <ctype.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "un-namespace.h"
-
-#include "collate.h"
-#include "libc_private.h"
-#include "local.h"
-
-#ifndef NO_FLOATING_POINT
-#include <locale.h>
-#endif
-
-#define	BUF		513	/* Maximum length of numeric string. */
-
-/*
- * Flags used during conversion.
- */
-#define	LONG		0x01	/* l: long or double */
-#define	LONGDBL		0x02	/* L: long double */
-#define	SHORT		0x04	/* h: short */
-#define	SUPPRESS	0x08	/* *: suppress assignment */
-#define	POINTER		0x10	/* p: void * (as hex) */
-#define	NOSKIP		0x20	/* [ or c: do not skip blanks */
-#define	LONGLONG	0x400	/* ll: long long (+ deprecated q: quad) */
-#define	INTMAXT		0x800	/* j: intmax_t */
-#define	PTRDIFFT	0x1000	/* t: ptrdiff_t */
-#define	SIZET		0x2000	/* z: size_t */
-#define	SHORTSHORT	0x4000	/* hh: char */
-#define	UNSIGNED	0x8000	/* %[oupxX] conversions */
-
-/*
- * The following are used in integral conversions only:
- * SIGNOK, NDIGITS, PFXOK, and NZDIGITS
- */
-#define	SIGNOK		0x40	/* +/- is (still) legal */
-#define	NDIGITS		0x80	/* no digits detected */
-#define	PFXOK		0x100	/* 0x prefix is (still) legal */
-#define	NZDIGITS	0x200	/* no zero digits detected */
-#define	HAVESIGN	0x10000	/* sign detected */
-
-/*
- * Conversion types.
- */
-#define	CT_CHAR		0	/* %c conversion */
-#define	CT_CCL		1	/* %[...] conversion */
-#define	CT_STRING	2	/* %s conversion */
-#define	CT_INT		3	/* %[dioupxX] conversion */
-#define	CT_FLOAT	4	/* %[efgEFG] conversion */
-
-static const u_char *__sccl(char *, const u_char *);
-#ifndef NO_FLOATING_POINT
-static int parsefloat(FILE *, char *, char *);
-#endif
-
-int __scanfdebug = 0;
-
-__weak_reference(__vfscanf, vfscanf);
-
-/*
- * __vfscanf - MT-safe version
- */
-int
-__vfscanf(FILE *fp, char const *fmt0, va_list ap)
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = __svfscanf(fp, fmt0, ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-/*
- * __svfscanf - non-MT-safe version of __vfscanf
- */
-int
-__svfscanf(FILE *fp, const char *fmt0, va_list ap)
-{
-	const u_char *fmt = (const u_char *)fmt0;
-	int c;			/* character from format, or conversion */
-	size_t width;		/* field width, or 0 */
-	char *p;		/* points into all kinds of strings */
-	int n;			/* handy integer */
-	int flags;		/* flags as defined above */
-	char *p0;		/* saves original value of p when necessary */
-	int nassigned;		/* number of fields assigned */
-	int nconversions;	/* number of conversions */
-	int nread;		/* number of characters consumed from fp */
-	int base;		/* base argument to conversion function */
-	char ccltab[256];	/* character class table for %[...] */
-	char buf[BUF];		/* buffer for numeric and mb conversions */
-	wchar_t *wcp;		/* handy wide character pointer */
-	size_t nconv;		/* length of multibyte sequence converted */
-	static const mbstate_t initial;
-	mbstate_t mbs;
-
-	/* `basefix' is used to avoid `if' tests in the integer scanner */
-	static short basefix[17] =
-		{ 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-
-	ORIENT(fp, -1);
-
-	nassigned = 0;
-	nconversions = 0;
-	nread = 0;
-	for (;;) {
-		c = *fmt++;
-		if (c == 0)
-			return (nassigned);
-		if (isspace(c)) {
-			while ((fp->_r > 0 || __srefill(fp) == 0) && isspace(*fp->_p))
-				nread++, fp->_r--, fp->_p++;
-			continue;
-		}
-		if (c != '%')
-			goto literal;
-		width = 0;
-		flags = 0;
-		/*
-		 * switch on the format.  continue if done;
-		 * break once format type is derived.
-		 */
-again:		c = *fmt++;
-		switch (c) {
-		case '%':
-literal:
-			if (fp->_r <= 0 && __srefill(fp))
-				goto input_failure;
-			if (*fp->_p != c)
-				goto match_failure;
-			fp->_r--, fp->_p++;
-			nread++;
-			continue;
-
-		case '*':
-			flags |= SUPPRESS;
-			goto again;
-		case 'j':
-			flags |= INTMAXT;
-			goto again;
-		case 'l':
-			if (flags & LONG) {
-				flags &= ~LONG;
-				flags |= LONGLONG;
-			} else
-				flags |= LONG;
-			goto again;
-		case 'q':
-			flags |= LONGLONG;	/* not quite */
-			goto again;
-		case 't':
-			flags |= PTRDIFFT;
-			goto again;
-		case 'z':
-			flags |= SIZET;
-			goto again;
-		case 'L':
-			flags |= LONGDBL;
-			goto again;
-		case 'h':
-			if (flags & SHORT) {
-				flags &= ~SHORT;
-				flags |= SHORTSHORT;
-			} else
-				flags |= SHORT;
-			goto again;
-
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			width = width * 10 + c - '0';
-			goto again;
-
-		/*
-		 * Conversions.
-		 */
-		case 'd':
-			c = CT_INT;
-			base = 10;
-			break;
-
-		case 'i':
-			c = CT_INT;
-			base = 0;
-			break;
-
-		case 'o':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 8;
-			break;
-
-		case 'u':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 10;
-			break;
-
-		case 'X':
-		case 'x':
-			flags |= PFXOK;	/* enable 0x prefixing */
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 16;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case 'A': case 'E': case 'F': case 'G':
-		case 'a': case 'e': case 'f': case 'g':
-			c = CT_FLOAT;
-			break;
-#endif
-
-		case 'S':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 's':
-			c = CT_STRING;
-			break;
-
-		case '[':
-			fmt = __sccl(ccltab, fmt);
-			flags |= NOSKIP;
-			c = CT_CCL;
-			break;
-
-		case 'C':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 'c':
-			flags |= NOSKIP;
-			c = CT_CHAR;
-			break;
-
-		case 'p':	/* pointer format is like hex */
-			flags |= POINTER | PFXOK;
-			c = CT_INT;		/* assumes sizeof(uintmax_t) */
-			flags |= UNSIGNED;	/*      >= sizeof(uintptr_t) */
-			base = 16;
-			break;
-
-		case 'n':
-			nconversions++;
-			if (flags & SUPPRESS)	/* ??? */
-				continue;
-			if (flags & SHORTSHORT)
-				*va_arg(ap, char *) = nread;
-			else if (flags & SHORT)
-				*va_arg(ap, short *) = nread;
-			else if (flags & LONG)
-				*va_arg(ap, long *) = nread;
-			else if (flags & LONGLONG)
-				*va_arg(ap, long long *) = nread;
-			else if (flags & INTMAXT)
-				*va_arg(ap, intmax_t *) = nread;
-			else if (flags & SIZET)
-				*va_arg(ap, size_t *) = nread;
-			else if (flags & PTRDIFFT)
-				*va_arg(ap, ptrdiff_t *) = nread;
-			else
-				*va_arg(ap, int *) = nread;
-			continue;
-
-		default:
-			goto match_failure;
-
-		/*
-		 * Disgusting backwards compatibility hack.	XXX
-		 */
-		case '\0':	/* compat */
-			return (EOF);
-		}
-
-		/*
-		 * We have a conversion that requires input.
-		 */
-		if (fp->_r <= 0 && __srefill(fp))
-			goto input_failure;
-
-		/*
-		 * Consume leading white space, except for formats
-		 * that suppress this.
-		 */
-		if ((flags & NOSKIP) == 0) {
-			while (isspace(*fp->_p)) {
-				nread++;
-				if (--fp->_r > 0)
-					fp->_p++;
-				else if (__srefill(fp))
-					goto input_failure;
-			}
-			/*
-			 * Note that there is at least one character in
-			 * the buffer, so conversions that do not set NOSKIP
-			 * ca no longer result in an input failure.
-			 */
-		}
-
-		/*
-		 * Do the conversion.
-		 */
-		switch (c) {
-
-		case CT_CHAR:
-			/* scan arbitrary characters (sets NOSKIP) */
-			if (width == 0)
-				width = 1;
-			if (flags & LONG) {
-				if ((flags & SUPPRESS) == 0)
-					wcp = va_arg(ap, wchar_t *);
-				else
-					wcp = NULL;
-				n = 0;
-				while (width != 0) {
-					if (n == MB_CUR_MAX) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					buf[n++] = *fp->_p;
-					fp->_p++;
-					fp->_r--;
-					mbs = initial;
-					nconv = mbrtowc(wcp, buf, n, &mbs);
-					if (nconv == (size_t)-1) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					if (nconv == 0 && !(flags & SUPPRESS))
-						*wcp = L'\0';
-					if (nconv != (size_t)-2) {
-						nread += n;
-						width--;
-						if (!(flags & SUPPRESS))
-							wcp++;
-						n = 0;
-					}
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (n != 0) {
-							fp->_flags |= __SERR;
-							goto input_failure;
-						}
-						break;
-					}
-				}
-				if (!(flags & SUPPRESS))
-					nassigned++;
-			} else if (flags & SUPPRESS) {
-				size_t sum = 0;
-				for (;;) {
-					if ((n = fp->_r) < width) {
-						sum += n;
-						width -= n;
-						fp->_p += n;
-						if (__srefill(fp)) {
-							if (sum == 0)
-							    goto input_failure;
-							break;
-						}
-					} else {
-						sum += width;
-						fp->_r -= width;
-						fp->_p += width;
-						break;
-					}
-				}
-				nread += sum;
-			} else {
-				size_t r = __fread((void *)va_arg(ap, char *), 1,
-				    width, fp);
-
-				if (r == 0)
-					goto input_failure;
-				nread += r;
-				nassigned++;
-			}
-			nconversions++;
-			break;
-
-		case CT_CCL:
-			/* scan a (nonempty) character class (sets NOSKIP) */
-			if (width == 0)
-				width = (size_t)~0;	/* `infinity' */
-			/* take only those things in the class */
-			if (flags & LONG) {
-				wchar_t twc;
-				int nchars;
-
-				if ((flags & SUPPRESS) == 0)
-					wcp = va_arg(ap, wchar_t *);
-				else
-					wcp = &twc;
-				n = 0;
-				nchars = 0;
-				while (width != 0) {
-					if (n == MB_CUR_MAX) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					buf[n++] = *fp->_p;
-					fp->_p++;
-					fp->_r--;
-					mbs = initial;
-					nconv = mbrtowc(wcp, buf, n, &mbs);
-					if (nconv == (size_t)-1) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					if (nconv == 0)
-						*wcp = L'\0';
-					if (nconv != (size_t)-2) {
-						if (wctob(*wcp) != EOF &&
-						    !ccltab[wctob(*wcp)]) {
-							while (n != 0) {
-								n--;
-								__ungetc(buf[n],
-								    fp);
-							}
-							break;
-						}
-						nread += n;
-						width--;
-						if (!(flags & SUPPRESS))
-							wcp++;
-						nchars++;
-						n = 0;
-					}
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (n != 0) {
-							fp->_flags |= __SERR;
-							goto input_failure;
-						}
-						break;
-					}
-				}
-				if (n != 0) {
-					fp->_flags |= __SERR;
-					goto input_failure;
-				}
-				n = nchars;
-				if (n == 0)
-					goto match_failure;
-				if (!(flags & SUPPRESS)) {
-					*wcp = L'\0';
-					nassigned++;
-				}
-			} else if (flags & SUPPRESS) {
-				n = 0;
-				while (ccltab[*fp->_p]) {
-					n++, fp->_r--, fp->_p++;
-					if (--width == 0)
-						break;
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (n == 0)
-							goto input_failure;
-						break;
-					}
-				}
-				if (n == 0)
-					goto match_failure;
-			} else {
-				p0 = p = va_arg(ap, char *);
-				while (ccltab[*fp->_p]) {
-					fp->_r--;
-					*p++ = *fp->_p++;
-					if (--width == 0)
-						break;
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (p == p0)
-							goto input_failure;
-						break;
-					}
-				}
-				n = p - p0;
-				if (n == 0)
-					goto match_failure;
-				*p = 0;
-				nassigned++;
-			}
-			nread += n;
-			nconversions++;
-			break;
-
-		case CT_STRING:
-			/* like CCL, but zero-length string OK, & no NOSKIP */
-			if (width == 0)
-				width = (size_t)~0;
-			if (flags & LONG) {
-				wchar_t twc;
-
-				if ((flags & SUPPRESS) == 0)
-					wcp = va_arg(ap, wchar_t *);
-				else
-					wcp = &twc;
-				n = 0;
-				while (!isspace(*fp->_p) && width != 0) {
-					if (n == MB_CUR_MAX) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					buf[n++] = *fp->_p;
-					fp->_p++;
-					fp->_r--;
-					mbs = initial;
-					nconv = mbrtowc(wcp, buf, n, &mbs);
-					if (nconv == (size_t)-1) {
-						fp->_flags |= __SERR;
-						goto input_failure;
-					}
-					if (nconv == 0)
-						*wcp = L'\0';
-					if (nconv != (size_t)-2) {
-						if (iswspace(*wcp)) {
-							while (n != 0) {
-								n--;
-								__ungetc(buf[n],
-								    fp);
-							}
-							break;
-						}
-						nread += n;
-						width--;
-						if (!(flags & SUPPRESS))
-							wcp++;
-						n = 0;
-					}
-					if (fp->_r <= 0 && __srefill(fp)) {
-						if (n != 0) {
-							fp->_flags |= __SERR;
-							goto input_failure;
-						}
-						break;
-					}
-				}
-				if (!(flags & SUPPRESS)) {
-					*wcp = L'\0';
-					nassigned++;
-				}
-			} else if (flags & SUPPRESS) {
-				n = 0;
-				while (!isspace(*fp->_p)) {
-					n++, fp->_r--, fp->_p++;
-					if (--width == 0)
-						break;
-					if (fp->_r <= 0 && __srefill(fp))
-						break;
-				}
-				nread += n;
-			} else {
-				p0 = p = va_arg(ap, char *);
-				while (!isspace(*fp->_p)) {
-					fp->_r--;
-					*p++ = *fp->_p++;
-					if (--width == 0)
-						break;
-					if (fp->_r <= 0 && __srefill(fp))
-						break;
-				}
-				*p = 0;
-				nread += p - p0;
-				nassigned++;
-			}
-			nconversions++;
-			continue;
-
-		case CT_INT:
-			/* scan an integer as if by the conversion function */
-#ifdef hardway
-			if (width == 0 || width > sizeof(buf) - 1)
-				width = sizeof(buf) - 1;
-#else
-			/* size_t is unsigned, hence this optimisation */
-			if (--width > sizeof(buf) - 2)
-				width = sizeof(buf) - 2;
-			width++;
-#endif
-			flags |= SIGNOK | NDIGITS | NZDIGITS;
-			for (p = buf; width; width--) {
-				c = *fp->_p;
-				/*
-				 * Switch on the character; `goto ok'
-				 * if we accept it as a part of number.
-				 */
-				switch (c) {
-
-				/*
-				 * The digit 0 is always legal, but is
-				 * special.  For %i conversions, if no
-				 * digits (zero or nonzero) have been
-				 * scanned (only signs), we will have
-				 * base==0.  In that case, we should set
-				 * it to 8 and enable 0x prefixing.
-				 * Also, if we have not scanned zero digits
-				 * before this, do not turn off prefixing
-				 * (someone else will turn it off if we
-				 * have scanned any nonzero digits).
-				 */
-				case '0':
-					if (base == 0) {
-						base = 8;
-						flags |= PFXOK;
-					}
-					if (flags & NZDIGITS)
-					    flags &= ~(SIGNOK|NZDIGITS|NDIGITS);
-					else
-					    flags &= ~(SIGNOK|PFXOK|NDIGITS);
-					goto ok;
-
-				/* 1 through 7 always legal */
-				case '1': case '2': case '3':
-				case '4': case '5': case '6': case '7':
-					base = basefix[base];
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* digits 8 and 9 ok iff decimal or hex */
-				case '8': case '9':
-					base = basefix[base];
-					if (base <= 8)
-						break;	/* not legal here */
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* letters ok iff hex */
-				case 'A': case 'B': case 'C':
-				case 'D': case 'E': case 'F':
-				case 'a': case 'b': case 'c':
-				case 'd': case 'e': case 'f':
-					/* no need to fix base here */
-					if (base <= 10)
-						break;	/* not legal here */
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* sign ok only as first character */
-				case '+': case '-':
-					if (flags & SIGNOK) {
-						flags &= ~SIGNOK;
-						flags |= HAVESIGN;
-						goto ok;
-					}
-					break;
-					
-				/*
-				 * x ok iff flag still set & 2nd char (or
-				 * 3rd char if we have a sign).
-				 */
-				case 'x': case 'X':
-					if (flags & PFXOK && p ==
-					    buf + 1 + !!(flags & HAVESIGN)) {
-						base = 16;	/* if %i */
-						flags &= ~PFXOK;
-						goto ok;
-					}
-					break;
-				}
-
-				/*
-				 * If we got here, c is not a legal character
-				 * for a number.  Stop accumulating digits.
-				 */
-				break;
-		ok:
-				/*
-				 * c is legal: store it and look at the next.
-				 */
-				*p++ = c;
-				if (--fp->_r > 0)
-					fp->_p++;
-				else if (__srefill(fp))
-					break;		/* EOF */
-			}
-			/*
-			 * If we had only a sign, it is no good; push
-			 * back the sign.  If the number ends in `x',
-			 * it was [sign] '0' 'x', so push back the x
-			 * and treat it as [sign] '0'.
-			 */
-			if (flags & NDIGITS) {
-				if (p > buf)
-					(void) __ungetc(*(u_char *)--p, fp);
-				goto match_failure;
-			}
-			c = ((u_char *)p)[-1];
-			if (c == 'x' || c == 'X') {
-				--p;
-				(void) __ungetc(c, fp);
-			}
-			if ((flags & SUPPRESS) == 0) {
-				uintmax_t res;
-
-				*p = 0;
-				if ((flags & UNSIGNED) == 0)
-				    res = strtoimax(buf, (char **)NULL, base);
-				else
-				    res = strtoumax(buf, (char **)NULL, base);
-				if (flags & POINTER)
-					*va_arg(ap, void **) =
-							(void *)(uintptr_t)res;
-				else if (flags & SHORTSHORT)
-					*va_arg(ap, char *) = res;
-				else if (flags & SHORT)
-					*va_arg(ap, short *) = res;
-				else if (flags & LONG)
-					*va_arg(ap, long *) = res;
-				else if (flags & LONGLONG)
-					*va_arg(ap, long long *) = res;
-				else if (flags & INTMAXT)
-					*va_arg(ap, intmax_t *) = res;
-				else if (flags & PTRDIFFT)
-					*va_arg(ap, ptrdiff_t *) = res;
-				else if (flags & SIZET)
-					*va_arg(ap, size_t *) = res;
-				else
-					*va_arg(ap, int *) = res;
-				nassigned++;
-			}
-			nread += p - buf;
-			nconversions++;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case CT_FLOAT:
-			/* scan a floating point number as if by strtod */
-			if (width == 0 || width > sizeof(buf) - 1)
-				width = sizeof(buf) - 1;
-			if ((width = parsefloat(fp, buf, buf + width)) == 0)
-				goto match_failure;
-			if ((flags & SUPPRESS) == 0) {
-				if (flags & LONGDBL) {
-					long double res = strtold(buf, &p);
-					*va_arg(ap, long double *) = res;
-				} else if (flags & LONG) {
-					double res = strtod(buf, &p);
-					*va_arg(ap, double *) = res;
-				} else {
-					float res = strtof(buf, &p);
-					*va_arg(ap, float *) = res;
-				}
-				if (__scanfdebug && p - buf != width)
-					abort();
-				nassigned++;
-			}
-			nread += width;
-			nconversions++;
-			break;
-#endif /* !NO_FLOATING_POINT */
-		}
-	}
-input_failure:
-	return (nconversions != 0 ? nassigned : EOF);
-match_failure:
-	return (nassigned);
-}
-
-/*
- * Fill in the given table from the scanset at the given format
- * (just after `[').  Return a pointer to the character past the
- * closing `]'.  The table has a 1 wherever characters should be
- * considered part of the scanset.
- */
-static const u_char *
-__sccl(tab, fmt)
-	char *tab;
-	const u_char *fmt;
-{
-	int c, n, v, i;
-
-	/* first `clear' the whole table */
-	c = *fmt++;		/* first char hat => negated scanset */
-	if (c == '^') {
-		v = 1;		/* default => accept */
-		c = *fmt++;	/* get new first char */
-	} else
-		v = 0;		/* default => reject */
-
-	/* XXX: Will not work if sizeof(tab*) > sizeof(char) */
-	(void) memset(tab, v, 256);
-
-	if (c == 0)
-		return (fmt - 1);/* format ended before closing ] */
-
-	/*
-	 * Now set the entries corresponding to the actual scanset
-	 * to the opposite of the above.
-	 *
-	 * The first character may be ']' (or '-') without being special;
-	 * the last character may be '-'.
-	 */
-	v = 1 - v;
-	for (;;) {
-		tab[c] = v;		/* take character c */
-doswitch:
-		n = *fmt++;		/* and examine the next */
-		switch (n) {
-
-		case 0:			/* format ended too soon */
-			return (fmt - 1);
-
-		case '-':
-			/*
-			 * A scanset of the form
-			 *	[01+-]
-			 * is defined as `the digit 0, the digit 1,
-			 * the character +, the character -', but
-			 * the effect of a scanset such as
-			 *	[a-zA-Z0-9]
-			 * is implementation defined.  The V7 Unix
-			 * scanf treats `a-z' as `the letters a through
-			 * z', but treats `a-a' as `the letter a, the
-			 * character -, and the letter a'.
-			 *
-			 * For compatibility, the `-' is not considerd
-			 * to define a range if the character following
-			 * it is either a close bracket (required by ANSI)
-			 * or is not numerically greater than the character
-			 * we just stored in the table (c).
-			 */
-			n = *fmt;
-			if (n == ']'
-			    || (__collate_load_error ? n < c :
-				__collate_range_cmp (n, c) < 0
-			       )
-			   ) {
-				c = '-';
-				break;	/* resume the for(;;) */
-			}
-			fmt++;
-			/* fill in the range */
-			if (__collate_load_error) {
-				do {
-					tab[++c] = v;
-				} while (c < n);
-			} else {
-				for (i = 0; i < 256; i ++)
-					if (   __collate_range_cmp (c, i) < 0
-					    && __collate_range_cmp (i, n) <= 0
-					   )
-						tab[i] = v;
-			}
-#if 1	/* XXX another disgusting compatibility hack */
-			c = n;
-			/*
-			 * Alas, the V7 Unix scanf also treats formats
-			 * such as [a-c-e] as `the letters a through e'.
-			 * This too is permitted by the standard....
-			 */
-			goto doswitch;
-#else
-			c = *fmt++;
-			if (c == 0)
-				return (fmt - 1);
-			if (c == ']')
-				return (fmt);
-#endif
-			break;
-
-		case ']':		/* end of scanset */
-			return (fmt);
-
-		default:		/* just another character */
-			c = n;
-			break;
-		}
-	}
-	/* NOTREACHED */
-}
-
-#ifndef NO_FLOATING_POINT
-static int
-parsefloat(FILE *fp, char *buf, char *end)
-{
-	char *commit, *p;
-	int infnanpos = 0;
-	enum {
-		S_START, S_GOTSIGN, S_INF, S_NAN, S_MAYBEHEX,
-		S_DIGITS, S_FRAC, S_EXP, S_EXPDIGITS
-	} state = S_START;
-	unsigned char c;
-	char decpt = *localeconv()->decimal_point;
-	_Bool gotmantdig = 0, ishex = 0;
-
-	/*
-	 * We set commit = p whenever the string we have read so far
-	 * constitutes a valid representation of a floating point
-	 * number by itself.  At some point, the parse will complete
-	 * or fail, and we will ungetc() back to the last commit point.
-	 * To ensure that the file offset gets updated properly, it is
-	 * always necessary to read at least one character that doesn't
-	 * match; thus, we can't short-circuit "infinity" or "nan(...)".
-	 */
-	commit = buf - 1;
-	for (p = buf; p < end; ) {
-		c = *fp->_p;
-reswitch:
-		switch (state) {
-		case S_START:
-			state = S_GOTSIGN;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_GOTSIGN:
-			switch (c) {
-			case '0':
-				state = S_MAYBEHEX;
-				commit = p;
-				break;
-			case 'I':
-			case 'i':
-				state = S_INF;
-				break;
-			case 'N':
-			case 'n':
-				state = S_NAN;
-				break;
-			default:
-				state = S_DIGITS;
-				goto reswitch;
-			}
-			break;
-		case S_INF:
-			if (infnanpos > 6 ||
-			    (c != "nfinity"[infnanpos] &&
-			     c != "NFINITY"[infnanpos]))
-				goto parsedone;
-			if (infnanpos == 1 || infnanpos == 6)
-				commit = p;	/* inf or infinity */
-			infnanpos++;
-			break;
-		case S_NAN:
-			switch (infnanpos) {
-			case -1:	/* XXX kludge to deal with nan(...) */
-				goto parsedone;
-			case 0:
-				if (c != 'A' && c != 'a')
-					goto parsedone;
-				break;
-			case 1:
-				if (c != 'N' && c != 'n')
-					goto parsedone;
-				else
-					commit = p;
-				break;
-			case 2:
-				if (c != '(')
-					goto parsedone;
-				break;
-			default:
-				if (c == ')') {
-					commit = p;
-					infnanpos = -2;
-				} else if (!isalnum(c) && c != '_')
-					goto parsedone;
-				break;
-			}
-			infnanpos++;
-			break;
-		case S_MAYBEHEX:
-			state = S_DIGITS;
-			if (c == 'X' || c == 'x') {
-				ishex = 1;
-				break;
-			} else {	/* we saw a '0', but no 'x' */
-				gotmantdig = 1;
-				goto reswitch;
-			}
-		case S_DIGITS:
-			if ((ishex && isxdigit(c)) || isdigit(c))
-				gotmantdig = 1;
-			else {
-				state = S_FRAC;
-				if (c != decpt)
-					goto reswitch;
-			}
-			if (gotmantdig)
-				commit = p;
-			break;
-		case S_FRAC:
-			if (((c == 'E' || c == 'e') && !ishex) ||
-			    ((c == 'P' || c == 'p') && ishex)) {
-				if (!gotmantdig)
-					goto parsedone;
-				else
-					state = S_EXP;
-			} else if ((ishex && isxdigit(c)) || isdigit(c)) {
-				commit = p;
-				gotmantdig = 1;
-			} else
-				goto parsedone;
-			break;
-		case S_EXP:
-			state = S_EXPDIGITS;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_EXPDIGITS:
-			if (isdigit(c))
-				commit = p;
-			else
-				goto parsedone;
-			break;
-		default:
-			abort();
-		}
-		*p++ = c;
-		if (--fp->_r > 0)
-			fp->_p++;
-		else if (__srefill(fp))
-			break;	/* EOF */
-	}
-
-parsedone:
-	while (commit < --p)
-		__ungetc(*(u_char *)p, fp);
-	*++commit = '\0';
-	return (commit - buf);
-}
-#endif
diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c
deleted file mode 100644
index 3b5ded5..0000000
--- a/lib/libc/stdio/vfwprintf.c
+++ /dev/null
@@ -1,1648 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.24.2.1 2006/06/25 07:35:50 phk Exp $");
-
-/*
- * Actual wprintf innards.
- *
- * Avoid making gratuitous changes to this source file; it should be kept
- * as close as possible to vfprintf.c for ease of maintenance.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-#include "fvwrite.h"
-
-union arg {
-	int	intarg;
-	u_int	uintarg;
-	long	longarg;
-	u_long	ulongarg;
-	long long longlongarg;
-	unsigned long long ulonglongarg;
-	ptrdiff_t ptrdiffarg;
-	size_t	sizearg;
-	intmax_t intmaxarg;
-	uintmax_t uintmaxarg;
-	void	*pvoidarg;
-	char	*pchararg;
-	signed char *pschararg;
-	short	*pshortarg;
-	int	*pintarg;
-	long	*plongarg;
-	long long *plonglongarg;
-	ptrdiff_t *pptrdiffarg;
-	size_t	*psizearg;
-	intmax_t *pintmaxarg;
-#ifndef NO_FLOATING_POINT
-	double	doublearg;
-	long double longdoublearg;
-#endif
-	wint_t	wintarg;
-	wchar_t	*pwchararg;
-};
-
-/*
- * Type ids for argument type table.
- */
-enum typeid {
-	T_UNUSED, TP_SHORT, T_INT, T_U_INT, TP_INT,
-	T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
-	T_PTRDIFFT, TP_PTRDIFFT, T_SIZET, TP_SIZET,
-	T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
-	T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
-};
-
-static int	__sbprintf(FILE *, const wchar_t *, va_list);
-static wint_t	__xfputwc(wchar_t, FILE *);
-static wchar_t	*__ujtoa(uintmax_t, wchar_t *, int, int, const char *, int,
-		    char, const char *);
-static wchar_t	*__ultoa(u_long, wchar_t *, int, int, const char *, int,
-		    char, const char *);
-static wchar_t	*__mbsconv(char *, int);
-static void	__find_arguments(const wchar_t *, va_list, union arg **);
-static void	__grow_type_table(int, enum typeid **, int *);
-
-/*
- * Helper function for `fprintf to unbuffered unix file': creates a
- * temporary buffer.  We only work on write-only files; this avoids
- * worries about ungetc buffers and so forth.
- */
-static int
-__sbprintf(FILE *fp, const wchar_t *fmt, va_list ap)
-{
-	int ret;
-	FILE fake;
-	unsigned char buf[BUFSIZ];
-
-	/* copy the important variables */
-	fake._flags = fp->_flags & ~__SNBF;
-	fake._file = fp->_file;
-	fake._cookie = fp->_cookie;
-	fake._write = fp->_write;
-	fake._extra = fp->_extra;
-
-	/* set up the buffer */
-	fake._bf._base = fake._p = buf;
-	fake._bf._size = fake._w = sizeof(buf);
-	fake._lbfsize = 0;	/* not actually used, but Just In Case */
-
-	/* do the work, then copy any error status */
-	ret = __vfwprintf(&fake, fmt, ap);
-	if (ret >= 0 && __fflush(&fake))
-		ret = WEOF;
-	if (fake._flags & __SERR)
-		fp->_flags |= __SERR;
-	return (ret);
-}
-
-/*
- * Like __fputwc, but handles fake string (__SSTR) files properly.
- * File must already be locked.
- */
-static wint_t
-__xfputwc(wchar_t wc, FILE *fp)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char buf[MB_LEN_MAX];
-	struct __suio uio;
-	struct __siov iov;
-	size_t len;
-
-	if ((fp->_flags & __SSTR) == 0)
-		return (__fputwc(wc, fp));
-
-	mbs = initial;
-	if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) {
-		fp->_flags |= __SERR;
-		return (WEOF);
-	}
-	uio.uio_iov = &iov;
-	uio.uio_resid = len;
-	uio.uio_iovcnt = 1;
-	iov.iov_base = buf;
-	iov.iov_len = len;
-	return (__sfvwrite(fp, &uio) != EOF ? (wint_t)wc : WEOF);
-}
-
-/*
- * Macros for converting digits to letters and vice versa
- */
-#define	to_digit(c)	((c) - '0')
-#define is_digit(c)	((unsigned)to_digit(c) <= 9)
-#define	to_char(n)	((n) + '0')
-
-/*
- * Convert an unsigned long to ASCII for printf purposes, returning
- * a pointer to the first character of the string representation.
- * Octal numbers can be forced to have a leading zero; hex numbers
- * use the given digits.
- */
-static wchar_t *
-__ultoa(u_long val, wchar_t *endp, int base, int octzero, const char *xdigs,
-	int needgrp, char thousep, const char *grp)
-{
-	wchar_t *cp = endp;
-	long sval;
-	int ndig;
-
-	/*
-	 * Handle the three cases separately, in the hope of getting
-	 * better/faster code.
-	 */
-	switch (base) {
-	case 10:
-		if (val < 10) {	/* many numbers are 1 digit */
-			*--cp = to_char(val);
-			return (cp);
-		}
-		ndig = 0;
-		/*
-		 * On many machines, unsigned arithmetic is harder than
-		 * signed arithmetic, so we do at most one unsigned mod and
-		 * divide; this is sufficient to reduce the range of
-		 * the incoming value to where signed arithmetic works.
-		 */
-		if (val > LONG_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp && ndig == *grp && *grp != CHAR_MAX
-					&& sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		if (octzero && *cp != '0')
-			*--cp = '0';
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:			/* oops */
-		abort();
-	}
-	return (cp);
-}
-
-/* Identical to __ultoa, but for intmax_t. */
-static wchar_t *
-__ujtoa(uintmax_t val, wchar_t *endp, int base, int octzero,
-	const char *xdigs, int needgrp, char thousep, const char *grp)
-{
-	wchar_t *cp = endp;
-	intmax_t sval;
-	int ndig;
-
-	/* quick test for small values; __ultoa is typically much faster */
-	/* (perhaps instead we should run until small, then call __ultoa?) */
-	if (val <= ULONG_MAX)
-		return (__ultoa((u_long)val, endp, base, octzero, xdigs,
-		    needgrp, thousep, grp));
-	switch (base) {
-	case 10:
-		if (val < 10) {
-			*--cp = to_char(val % 10);
-			return (cp);
-		}
-		ndig = 0;
-		if (val > INTMAX_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp && *grp != CHAR_MAX && ndig == *grp
-					&& sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		if (octzero && *cp != '0')
-			*--cp = '0';
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:
-		abort();
-	}
-	return (cp);
-}
-
-/*
- * Convert a multibyte character string argument for the %s format to a wide
- * string representation. ``prec'' specifies the maximum number of bytes
- * to output. If ``prec'' is greater than or equal to zero, we can't assume
- * that the multibyte char. string ends in a null character.
- */
-static wchar_t *
-__mbsconv(char *mbsarg, int prec)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	wchar_t *convbuf, *wcp;
-	const char *p;
-	size_t insize, nchars, nconv;
-
-	if (mbsarg == NULL)
-		return (NULL);
-
-	/*
-	 * Supplied argument is a multibyte string; convert it to wide
-	 * characters first.
-	 */
-	if (prec >= 0) {
-		/*
-		 * String is not guaranteed to be NUL-terminated. Find the
-		 * number of characters to print.
-		 */
-		p = mbsarg;
-		insize = nchars = 0;
-		mbs = initial;
-		while (nchars != (size_t)prec) {
-			nconv = mbrlen(p, MB_CUR_MAX, &mbs);
-			if (nconv == 0 || nconv == (size_t)-1 ||
-			    nconv == (size_t)-2)
-				break;
-			p += nconv;
-			nchars++;
-			insize += nconv;
-		}
-		if (nconv == (size_t)-1 || nconv == (size_t)-2)
-			return (NULL);
-	} else
-		insize = strlen(mbsarg);
-
-	/*
-	 * Allocate buffer for the result and perform the conversion,
-	 * converting at most `size' bytes of the input multibyte string to
-	 * wide characters for printing.
-	 */
-	convbuf = malloc((insize + 1) * sizeof(*convbuf));
-	if (convbuf == NULL)
-		return (NULL);
-	wcp = convbuf;
-	p = mbsarg;
-	mbs = initial;
-	while (insize != 0) {
-		nconv = mbrtowc(wcp, p, insize, &mbs);
-		if (nconv == 0 || nconv == (size_t)-1 || nconv == (size_t)-2)
-			break;
-		wcp++;
-		p += nconv;
-		insize -= nconv;
-	}
-	if (nconv == (size_t)-1 || nconv == (size_t)-2) {
-		free(convbuf);
-		return (NULL);
-	}
-	*wcp = L'\0';
-
-	return (convbuf);
-}
-
-/*
- * MT-safe version
- */
-int
-vfwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt0, va_list ap)
-
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = __vfwprintf(fp, fmt0, ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-#ifndef NO_FLOATING_POINT
-
-#define	dtoa		__dtoa
-#define	freedtoa	__freedtoa
-
-#include <float.h>
-#include <math.h>
-#include "floatio.h"
-#include "gdtoa.h"
-
-#define	DEFPREC		6
-
-static int exponent(wchar_t *, int, wchar_t);
-
-#endif /* !NO_FLOATING_POINT */
-
-/*
- * The size of the buffer we use as scratch space for integer
- * conversions, among other things.  Technically, we would need the
- * most space for base 10 conversions with thousands' grouping
- * characters between each pair of digits.  100 bytes is a
- * conservative overestimate even for a 128-bit uintmax_t.
- */
-#define	BUF	100
-
-#define STATIC_ARG_TBL_SIZE 8           /* Size of static argument table. */
-
-/*
- * Flags used during conversion.
- */
-#define	ALT		0x001		/* alternate form */
-#define	LADJUST		0x004		/* left adjustment */
-#define	LONGDBL		0x008		/* long double */
-#define	LONGINT		0x010		/* long integer */
-#define	LLONGINT	0x020		/* long long integer */
-#define	SHORTINT	0x040		/* short integer */
-#define	ZEROPAD		0x080		/* zero (as opposed to blank) pad */
-#define	FPT		0x100		/* Floating point number */
-#define	GROUPING	0x200		/* use grouping ("'" flag) */
-					/* C99 additional size modifiers: */
-#define	SIZET		0x400		/* size_t */
-#define	PTRDIFFT	0x800		/* ptrdiff_t */
-#define	INTMAXT		0x1000		/* intmax_t */
-#define	CHARINT		0x2000		/* print char using int format */
-
-/*
- * Non-MT-safe version
- */
-int
-__vfwprintf(FILE *fp, const wchar_t *fmt0, va_list ap)
-{
-	wchar_t *fmt;		/* format string */
-	wchar_t ch;		/* character from fmt */
-	int n, n2, n3;		/* handy integer (short term usage) */
-	wchar_t *cp;		/* handy char pointer (short term usage) */
-	int flags;		/* flags as above */
-	int ret;		/* return value accumulator */
-	int width;		/* width from format (%8d), or 0 */
-	int prec;		/* precision from format; <0 for N/A */
-	wchar_t sign;		/* sign prefix (' ', '+', '-', or \0) */
-	char thousands_sep;	/* locale specific thousands separator */
-	const char *grouping;	/* locale specific numeric grouping rules */
-#ifndef NO_FLOATING_POINT
-	/*
-	 * We can decompose the printed representation of floating
-	 * point numbers into several parts, some of which may be empty:
-	 *
-	 * [+|-| ] [0x|0X] MMM . NNN [e|E|p|P] [+|-] ZZ
-	 *    A       B     ---C---      D       E   F
-	 *
-	 * A:	'sign' holds this value if present; '\0' otherwise
-	 * B:	ox[1] holds the 'x' or 'X'; '\0' if not hexadecimal
-	 * C:	cp points to the string MMMNNN.  Leading and trailing
-	 *	zeros are not in the string and must be added.
-	 * D:	expchar holds this character; '\0' if no exponent, e.g. %f
-	 * F:	at least two digits for decimal, at least one digit for hex
-	 */
-	char *decimal_point;	/* locale specific decimal point */
-	int signflag;		/* true if float is negative */
-	union {			/* floating point arguments %[aAeEfFgG] */
-		double dbl;
-		long double ldbl;
-	} fparg;
-	int expt;		/* integer value of exponent */
-	char expchar;		/* exponent character: [eEpP\0] */
-	char *dtoaend;		/* pointer to end of converted digits */
-	int expsize;		/* character count for expstr */
-	int lead;		/* sig figs before decimal or group sep */
-	int ndig;		/* actual number of digits returned by dtoa */
-	wchar_t expstr[MAXEXPDIG+2];	/* buffer for exponent string: e+ZZZ */
-	char *dtoaresult;	/* buffer allocated by dtoa */
-	int nseps;		/* number of group separators with ' */
-	int nrepeats;		/* number of repeats of the last group */
-#endif
-	u_long	ulval;		/* integer arguments %[diouxX] */
-	uintmax_t ujval;	/* %j, %ll, %q, %t, %z integers */
-	int base;		/* base for [diouxX] conversion */
-	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
-	int realsz;		/* field size expanded by dprec, sign, etc */
-	int size;		/* size of converted field or string */
-	int prsize;             /* max size of printed field */
-	const char *xdigs;	/* digits for [xX] conversion */
-	wchar_t buf[BUF];	/* buffer with space for digits of uintmax_t */
-	wchar_t ox[2];		/* space for 0x hex-prefix */
-	union arg *argtable;	/* args, built due to positional arg */
-	union arg statargtable [STATIC_ARG_TBL_SIZE];
-	int nextarg;		/* 1-based argument index */
-	va_list orgap;		/* original argument pointer */
-	wchar_t *convbuf;	/* multibyte to wide conversion result */
-
-	/*
-	 * Choose PADSIZE to trade efficiency vs. size.  If larger printf
-	 * fields occur frequently, increase PADSIZE and make the initialisers
-	 * below longer.
-	 */
-#define	PADSIZE	16		/* pad chunk size */
-	static wchar_t blanks[PADSIZE] =
-	 {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
-	static wchar_t zeroes[PADSIZE] =
-	 {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
-
-	static const char xdigs_lower[16] = "0123456789abcdef";
-	static const char xdigs_upper[16] = "0123456789ABCDEF";
-
-	/*
-	 * BEWARE, these `goto error' on error, PRINT uses `n2' and
-	 * PAD uses `n'.
-	 */
-#define	PRINT(ptr, len)	do {			\
-	for (n3 = 0; n3 < (len); n3++)		\
-		__xfputwc((ptr)[n3], fp);	\
-} while (0)
-#define	PAD(howmany, with)	do {		\
-	if ((n = (howmany)) > 0) {		\
-		while (n > PADSIZE) {		\
-			PRINT(with, PADSIZE);	\
-			n -= PADSIZE;		\
-		}				\
-		PRINT(with, n);			\
-	}					\
-} while (0)
-#define	PRINTANDPAD(p, ep, len, with) do {	\
-	n2 = (ep) - (p);       			\
-	if (n2 > (len))				\
-		n2 = (len);			\
-	if (n2 > 0)				\
-		PRINT((p), n2);			\
-	PAD((len) - (n2 > 0 ? n2 : 0), (with));	\
-} while(0)
-
-	/*
-	 * Get the argument indexed by nextarg.   If the argument table is
-	 * built, use it to get the argument.  If its not, get the next
-	 * argument (and arguments must be gotten sequentially).
-	 */
-#define GETARG(type) \
-	((argtable != NULL) ? *((type*)(&argtable[nextarg++])) : \
-	    (nextarg++, va_arg(ap, type)))
-
-	/*
-	 * To extend shorts properly, we need both signed and unsigned
-	 * argument extraction methods.
-	 */
-#define	SARG() \
-	(flags&LONGINT ? GETARG(long) : \
-	    flags&SHORTINT ? (long)(short)GETARG(int) : \
-	    flags&CHARINT ? (long)(signed char)GETARG(int) : \
-	    (long)GETARG(int))
-#define	UARG() \
-	(flags&LONGINT ? GETARG(u_long) : \
-	    flags&SHORTINT ? (u_long)(u_short)GETARG(int) : \
-	    flags&CHARINT ? (u_long)(u_char)GETARG(int) : \
-	    (u_long)GETARG(u_int))
-#define	INTMAX_SIZE	(INTMAXT|SIZET|PTRDIFFT|LLONGINT)
-#define SJARG() \
-	(flags&INTMAXT ? GETARG(intmax_t) : \
-	    flags&SIZET ? (intmax_t)GETARG(size_t) : \
-	    flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
-	    (intmax_t)GETARG(long long))
-#define	UJARG() \
-	(flags&INTMAXT ? GETARG(uintmax_t) : \
-	    flags&SIZET ? (uintmax_t)GETARG(size_t) : \
-	    flags&PTRDIFFT ? (uintmax_t)GETARG(ptrdiff_t) : \
-	    (uintmax_t)GETARG(unsigned long long))
-
-	/*
-	 * Get * arguments, including the form *nn$.  Preserve the nextarg
-	 * that the argument can be gotten once the type is determined.
-	 */
-#define GETASTER(val) \
-	n2 = 0; \
-	cp = fmt; \
-	while (is_digit(*cp)) { \
-		n2 = 10 * n2 + to_digit(*cp); \
-		cp++; \
-	} \
-	if (*cp == '$') { \
-		int hold = nextarg; \
-		if (argtable == NULL) { \
-			argtable = statargtable; \
-			__find_arguments (fmt0, orgap, &argtable); \
-		} \
-		nextarg = n2; \
-		val = GETARG (int); \
-		nextarg = hold; \
-		fmt = ++cp; \
-	} else { \
-		val = GETARG (int); \
-	}
-
-
-	thousands_sep = '\0';
-	grouping = NULL;
-#ifndef NO_FLOATING_POINT
-	decimal_point = localeconv()->decimal_point;
-#endif
-	convbuf = NULL;
-	/* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */
-	if (prepwrite(fp) != 0)
-		return (EOF);
-
-	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
-	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-	    fp->_file >= 0)
-		return (__sbprintf(fp, fmt0, ap));
-
-	fmt = (wchar_t *)fmt0;
-	argtable = NULL;
-	nextarg = 1;
-	va_copy(orgap, ap);
-	ret = 0;
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
-			/* void */;
-		if ((n = fmt - cp) != 0) {
-			if ((unsigned)ret + n > INT_MAX) {
-				ret = EOF;
-				goto error;
-			}
-			PRINT(cp, n);
-			ret += n;
-		}
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-		dprec = 0;
-		width = 0;
-		prec = -1;
-		sign = '\0';
-		ox[1] = '\0';
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-			/*-
-			 * ``If the space and + flags both appear, the space
-			 * flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-			if (!sign)
-				sign = ' ';
-			goto rflag;
-		case '#':
-			flags |= ALT;
-			goto rflag;
-		case '*':
-			/*-
-			 * ``A negative field width argument is taken as a
-			 * - flag followed by a positive field width.''
-			 *	-- ANSI X3J11
-			 * They don't exclude field widths read from args.
-			 */
-			GETASTER (width);
-			if (width >= 0)
-				goto rflag;
-			width = -width;
-			/* FALLTHROUGH */
-		case '-':
-			flags |= LADJUST;
-			goto rflag;
-		case '+':
-			sign = '+';
-			goto rflag;
-		case '\'':
-			flags |= GROUPING;
-			thousands_sep = *(localeconv()->thousands_sep);
-			grouping = localeconv()->grouping;
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				GETASTER (prec);
-				goto rflag;
-			}
-			prec = 0;
-			while (is_digit(ch)) {
-				prec = 10 * prec + to_digit(ch);
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			/*-
-			 * ``Note that 0 is taken as a flag, not as the
-			 * beginning of a field width.''
-			 *	-- ANSI X3J11
-			 */
-			flags |= ZEROPAD;
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				nextarg = n;
-				if (argtable == NULL) {
-					argtable = statargtable;
-					__find_arguments (fmt0, orgap,
-					    &argtable);
-				}
-				goto rflag;
-			}
-			width = n;
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-			if (flags & LONGINT)
-				*(cp = buf) = (wchar_t)GETARG(wint_t);
-			else
-				*(cp = buf) = (wchar_t)btowc(GETARG(int));
-			size = 1;
-			sign = '\0';
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			if (flags & INTMAX_SIZE) {
-				ujval = SJARG();
-				if ((intmax_t)ujval < 0) {
-					ujval = -ujval;
-					sign = '-';
-				}
-			} else {
-				ulval = SARG();
-				if ((long)ulval < 0) {
-					ulval = -ulval;
-					sign = '-';
-				}
-			}
-			base = 10;
-			goto number;
-#ifndef NO_FLOATING_POINT
-		case 'a':
-		case 'A':
-			if (ch == 'a') {
-				ox[1] = 'x';
-				xdigs = xdigs_lower;
-				expchar = 'p';
-			} else {
-				ox[1] = 'X';
-				xdigs = xdigs_upper;
-				expchar = 'P';
-			}
-			if (prec >= 0)
-				prec++;
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult =
-				    __hldtoa(fparg.ldbl, xdigs, prec,
-				        &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult =
-				    __hdtoa(fparg.dbl, xdigs, prec,
-				        &expt, &signflag, &dtoaend);
-			}
-			if (prec < 0)
-				prec = dtoaend - dtoaresult;
-			if (expt == INT_MAX)
-				ox[1] = '\0';
-			if (convbuf != NULL)
-				free(convbuf);
-			ndig = dtoaend - dtoaresult;
-			cp = convbuf = __mbsconv(dtoaresult, -1);
-			freedtoa(dtoaresult);
-			goto fp_common;
-		case 'e':
-		case 'E':
-			expchar = ch;
-			if (prec < 0)	/* account for digit before decpt */
-				prec = DEFPREC + 1;
-			else
-				prec++;
-			goto fp_begin;
-		case 'f':
-		case 'F':
-			expchar = '\0';
-			goto fp_begin;
-		case 'g':
-		case 'G':
-			expchar = ch - ('g' - 'e');
-			if (prec == 0)
-				prec = 1;
-fp_begin:
-			if (prec < 0)
-				prec = DEFPREC;
-			if (convbuf != NULL)
-				free(convbuf);
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult =
-				    __ldtoa(&fparg.ldbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult =
-				    dtoa(fparg.dbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-				if (expt == 9999)
-					expt = INT_MAX;
-			}
-			ndig = dtoaend - dtoaresult;
-			cp = convbuf = __mbsconv(dtoaresult, -1);
-			freedtoa(dtoaresult);
-fp_common:
-			if (signflag)
-				sign = '-';
-			if (expt == INT_MAX) {	/* inf or nan */
-				if (*cp == 'N') {
-					cp = (ch >= 'a') ? L"nan" : L"NAN";
-					sign = '\0';
-				} else
-					cp = (ch >= 'a') ? L"inf" : L"INF";
-				size = 3;
-				break;
-			}
-			flags |= FPT;
-			if (ch == 'g' || ch == 'G') {
-				if (expt > -4 && expt <= prec) {
-					/* Make %[gG] smell like %[fF] */
-					expchar = '\0';
-					if (flags & ALT)
-						prec -= expt;
-					else
-						prec = ndig - expt;
-					if (prec < 0)
-						prec = 0;
-				} else {
-					/*
-					 * Make %[gG] smell like %[eE], but
-					 * trim trailing zeroes if no # flag.
-					 */
-					if (!(flags & ALT))
-						prec = ndig;
-				}
-			}
-			if (expchar) {
-				expsize = exponent(expstr, expt - 1, expchar);
-				size = expsize + prec;
-				if (prec > 1 || flags & ALT)
-					++size;
-			} else {
-				/* space for digits before decimal point */
-				if (expt > 0)
-					size = expt;
-				else	/* "0" */
-					size = 1;
-				/* space for decimal pt and following digits */
-				if (prec || flags & ALT)
-					size += prec + 1;
-				if (grouping && expt > 0) {
-					/* space for thousands' grouping */
-					nseps = nrepeats = 0;
-					lead = expt;
-					while (*grouping != CHAR_MAX) {
-						if (lead <= *grouping)
-							break;
-						lead -= *grouping;
-						if (*(grouping+1)) {
-							nseps++;
-							grouping++;
-						} else
-							nrepeats++;
-					}
-					size += nseps + nrepeats;
-				} else
-					lead = expt;
-			}
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			/*
-			 * Assignment-like behavior is specified if the
-			 * value overflows or is otherwise unrepresentable.
-			 * C99 says to use `signed char' for %hhn conversions.
-			 */
-			if (flags & LLONGINT)
-				*GETARG(long long *) = ret;
-			else if (flags & SIZET)
-				*GETARG(ssize_t *) = (ssize_t)ret;
-			else if (flags & PTRDIFFT)
-				*GETARG(ptrdiff_t *) = ret;
-			else if (flags & INTMAXT)
-				*GETARG(intmax_t *) = ret;
-			else if (flags & LONGINT)
-				*GETARG(long *) = ret;
-			else if (flags & SHORTINT)
-				*GETARG(short *) = ret;
-			else if (flags & CHARINT)
-				*GETARG(signed char *) = ret;
-			else
-				*GETARG(int *) = ret;
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 8;
-			goto nosign;
-		case 'p':
-			/*-
-			 * ``The argument shall be a pointer to void.  The
-			 * value of the pointer is converted to a sequence
-			 * of printable characters, in an implementation-
-			 * defined manner.''
-			 *	-- ANSI X3J11
-			 */
-			ujval = (uintmax_t)(uintptr_t)GETARG(void *);
-			base = 16;
-			xdigs = xdigs_lower;
-			flags = flags | INTMAXT;
-			ox[1] = 'x';
-			goto nosign;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			if (flags & LONGINT) {
-				if ((cp = GETARG(wchar_t *)) == NULL)
-					cp = L"(null)";
-			} else {
-				char *mbp;
-
-				if (convbuf != NULL)
-					free(convbuf);
-				if ((mbp = GETARG(char *)) == NULL)
-					cp = L"(null)";
-				else {
-					convbuf = __mbsconv(mbp, prec);
-					if (convbuf == NULL) {
-						fp->_flags |= __SERR;
-						goto error;
-					}
-					cp = convbuf;
-				}
-			}
-
-			if (prec >= 0) {
-				/*
-				 * can't use wcslen; can only look for the
-				 * NUL in the first `prec' characters, and
-				 * wcslen() will go further.
-				 */
-				wchar_t *p = wmemchr(cp, 0, (size_t)prec);
-
-				if (p != NULL) {
-					size = p - cp;
-					if (size > prec)
-						size = prec;
-				} else
-					size = prec;
-			} else
-				size = wcslen(cp);
-			sign = '\0';
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 10;
-			goto nosign;
-		case 'X':
-			xdigs = xdigs_upper;
-			goto hex;
-		case 'x':
-			xdigs = xdigs_lower;
-hex:
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 16;
-			/* leading 0x/X only if non-zero */
-			if (flags & ALT &&
-			    (flags & INTMAX_SIZE ? ujval != 0 : ulval != 0))
-				ox[1] = ch;
-
-			flags &= ~GROUPING;
-			/* unsigned conversions */
-nosign:			sign = '\0';
-			/*-
-			 * ``... diouXx conversions ... if a precision is
-			 * specified, the 0 flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-number:			if ((dprec = prec) >= 0)
-				flags &= ~ZEROPAD;
-
-			/*-
-			 * ``The result of converting a zero value with an
-			 * explicit precision of zero is no characters.''
-			 *	-- ANSI X3J11
-			 *
-			 * ``The C Standard is clear enough as is.  The call
-			 * printf("%#.0o", 0) should print 0.''
-			 *	-- Defect Report #151
-			 */
-			cp = buf + BUF;
-			if (flags & INTMAX_SIZE) {
-				if (ujval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					cp = __ujtoa(ujval, cp, base,
-					    flags & ALT, xdigs,
-					    flags & GROUPING, thousands_sep,
-					    grouping);
-			} else {
-				if (ulval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					cp = __ultoa(ulval, cp, base,
-					    flags & ALT, xdigs,
-					    flags & GROUPING, thousands_sep,
-					    grouping);
-			}
-			size = buf + BUF - cp;
-			if (size > BUF)	/* should never happen */
-				abort();
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			/* pretend it was %c with argument ch */
-			cp = buf;
-			*cp = ch;
-			size = 1;
-			sign = '\0';
-			break;
-		}
-
-		/*
-		 * All reasonable formats wind up here.  At this point, `cp'
-		 * points to a string which (if not flags&LADJUST) should be
-		 * padded out to `width' places.  If flags&ZEROPAD, it should
-		 * first be prefixed by any sign or other prefix; otherwise,
-		 * it should be blank padded before the prefix is emitted.
-		 * After any left-hand padding and prefixing, emit zeroes
-		 * required by a decimal [diouxX] precision, then print the
-		 * string proper, then emit zeroes required by any leftover
-		 * floating precision; finally, if LADJUST, pad with blanks.
-		 *
-		 * Compute actual size, so we know how much to pad.
-		 * size excludes decimal prec; realsz includes it.
-		 */
-		realsz = dprec > size ? dprec : size;
-		if (sign)
-			realsz++;
-		if (ox[1])
-			realsz += 2;
-
-		prsize = width > realsz ? width : realsz;
-		if ((unsigned)ret + prsize > INT_MAX) {
-			ret = EOF;
-			goto error;
-		}
-
-		/* right-adjusting blank padding */
-		if ((flags & (LADJUST|ZEROPAD)) == 0)
-			PAD(width - realsz, blanks);
-
-		/* prefix */
-		if (sign)
-			PRINT(&sign, 1);
-
-		if (ox[1]) {	/* ox[1] is either x, X, or \0 */
-			ox[0] = '0';
-			PRINT(ox, 2);
-		}
-
-		/* right-adjusting zero padding */
-		if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
-			PAD(width - realsz, zeroes);
-
-		/* leading zeroes from decimal precision */
-		PAD(dprec - size, zeroes);
-
-		/* the string or number proper */
-#ifndef NO_FLOATING_POINT
-		if ((flags & FPT) == 0) {
-			PRINT(cp, size);
-		} else {	/* glue together f_p fragments */
-			if (!expchar) {	/* %[fF] or sufficiently short %[gG] */
-				if (expt <= 0) {
-					PRINT(zeroes, 1);
-					if (prec || flags & ALT)
-						PRINT(decimal_point, 1);
-					PAD(-expt, zeroes);
-					/* already handled initial 0's */
-					prec += expt;
-				} else {
-					PRINTANDPAD(cp, convbuf + ndig, lead, zeroes);
-					cp += lead;
-					if (grouping) {
-						while (nseps>0 || nrepeats>0) {
-							if (nrepeats > 0)
-								nrepeats--;
-							else {
-								grouping--;
-								nseps--;
-							}
-							PRINT(&thousands_sep,
-							    1);
-							PRINTANDPAD(cp,
-							    convbuf + ndig,
-							    *grouping, zeroes);
-							cp += *grouping;
-						}
-						if (cp > convbuf + ndig)
-							cp = convbuf + ndig;
-					}
-					if (prec || flags & ALT) {
-						buf[0] = *decimal_point;
-						PRINT(buf, 1);
-					}
-				}
-				PRINTANDPAD(cp, convbuf + ndig, prec, zeroes);
-			} else {	/* %[eE] or sufficiently long %[gG] */
-				if (prec > 1 || flags & ALT) {
-					buf[0] = *cp++;
-					buf[1] = *decimal_point;
-					PRINT(buf, 2);
-					PRINT(cp, ndig-1);
-					PAD(prec - ndig, zeroes);
-				} else	/* XeYYY */
-					PRINT(cp, 1);
-				PRINT(expstr, expsize);
-			}
-		}
-#else
-		PRINT(cp, size);
-#endif
-		/* left-adjusting padding (always blank) */
-		if (flags & LADJUST)
-			PAD(width - realsz, blanks);
-
-		/* finally, adjust ret */
-		ret += prsize;
-	}
-done:
-error:
-	va_end(orgap);
-	if (convbuf != NULL)
-		free(convbuf);
-	if (__sferror(fp))
-		ret = EOF;
-	if ((argtable != NULL) && (argtable != statargtable))
-		free (argtable);
-	return (ret);
-	/* NOTREACHED */
-}
-
-/*
- * Find all arguments when a positional parameter is encountered.  Returns a
- * table, indexed by argument number, of pointers to each arguments.  The
- * initial argument table should be an array of STATIC_ARG_TBL_SIZE entries.
- * It will be replaces with a malloc-ed one if it overflows.
- */ 
-static void
-__find_arguments (const wchar_t *fmt0, va_list ap, union arg **argtable)
-{
-	wchar_t *fmt;		/* format string */
-	wchar_t ch;		/* character from fmt */
-	int n, n2;		/* handy integer (short term usage) */
-	wchar_t *cp;		/* handy char pointer (short term usage) */
-	int flags;		/* flags as above */
-	int width;		/* width from format (%8d), or 0 */
-	enum typeid *typetable; /* table of types */
-	enum typeid stattypetable [STATIC_ARG_TBL_SIZE];
-	int tablesize;		/* current size of type table */
-	int tablemax;		/* largest used index in table */
-	int nextarg;		/* 1-based argument index */
-
-	/*
-	 * Add an argument type to the table, expanding if necessary.
-	 */
-#define ADDTYPE(type) \
-	((nextarg >= tablesize) ? \
-		__grow_type_table(nextarg, &typetable, &tablesize) : (void)0, \
-	(nextarg > tablemax) ? tablemax = nextarg : 0, \
-	typetable[nextarg++] = type)
-
-#define	ADDSARG() \
-	((flags&INTMAXT) ? ADDTYPE(T_INTMAXT) : \
-		((flags&SIZET) ? ADDTYPE(T_SIZET) : \
-		((flags&PTRDIFFT) ? ADDTYPE(T_PTRDIFFT) : \
-		((flags&LLONGINT) ? ADDTYPE(T_LLONG) : \
-		((flags&LONGINT) ? ADDTYPE(T_LONG) : ADDTYPE(T_INT))))))
-
-#define	ADDUARG() \
-	((flags&INTMAXT) ? ADDTYPE(T_UINTMAXT) : \
-		((flags&SIZET) ? ADDTYPE(T_SIZET) : \
-		((flags&PTRDIFFT) ? ADDTYPE(T_PTRDIFFT) : \
-		((flags&LLONGINT) ? ADDTYPE(T_U_LLONG) : \
-		((flags&LONGINT) ? ADDTYPE(T_U_LONG) : ADDTYPE(T_U_INT))))))
-
-	/*
-	 * Add * arguments to the type array.
-	 */
-#define ADDASTER() \
-	n2 = 0; \
-	cp = fmt; \
-	while (is_digit(*cp)) { \
-		n2 = 10 * n2 + to_digit(*cp); \
-		cp++; \
-	} \
-	if (*cp == '$') { \
-		int hold = nextarg; \
-		nextarg = n2; \
-		ADDTYPE (T_INT); \
-		nextarg = hold; \
-		fmt = ++cp; \
-	} else { \
-		ADDTYPE (T_INT); \
-	}
-	fmt = (wchar_t *)fmt0;
-	typetable = stattypetable;
-	tablesize = STATIC_ARG_TBL_SIZE;
-	tablemax = 0; 
-	nextarg = 1;
-	for (n = 0; n < STATIC_ARG_TBL_SIZE; n++)
-		typetable[n] = T_UNUSED;
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
-			/* void */;
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-		width = 0;
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-		case '#':
-			goto rflag;
-		case '*':
-			ADDASTER ();
-			goto rflag;
-		case '-':
-		case '+':
-		case '\'':
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				ADDASTER ();
-				goto rflag;
-			}
-			while (is_digit(ch)) {
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				nextarg = n;
-				goto rflag;
-			}
-			width = n;
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-			if (flags & LONGINT)
-				ADDTYPE(T_WINT);
-			else
-				ADDTYPE(T_INT);
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			ADDSARG();
-			break;
-#ifndef NO_FLOATING_POINT
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'g':
-		case 'G':
-			if (flags & LONGDBL)
-				ADDTYPE(T_LONG_DOUBLE);
-			else
-				ADDTYPE(T_DOUBLE);
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			if (flags & INTMAXT)
-				ADDTYPE(TP_INTMAXT);
-			else if (flags & PTRDIFFT)
-				ADDTYPE(TP_PTRDIFFT);
-			else if (flags & SIZET)
-				ADDTYPE(TP_SIZET);
-			else if (flags & LLONGINT)
-				ADDTYPE(TP_LLONG);
-			else if (flags & LONGINT)
-				ADDTYPE(TP_LONG);
-			else if (flags & SHORTINT)
-				ADDTYPE(TP_SHORT);
-			else if (flags & CHARINT)
-				ADDTYPE(TP_SCHAR);
-			else
-				ADDTYPE(TP_INT);
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			ADDUARG();
-			break;
-		case 'p':
-			ADDTYPE(TP_VOID);
-			break;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			if (flags & LONGINT)
-				ADDTYPE(TP_WCHAR);
-			else
-				ADDTYPE(TP_CHAR);
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-		case 'X':
-		case 'x':
-			ADDUARG();
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			break;
-		}
-	}
-done:
-	/*
-	 * Build the argument table.
-	 */
-	if (tablemax >= STATIC_ARG_TBL_SIZE) {
-		*argtable = (union arg *)
-		    malloc (sizeof (union arg) * (tablemax + 1));
-	}
-
-	(*argtable) [0].intarg = 0;
-	for (n = 1; n <= tablemax; n++) {
-		switch (typetable [n]) {
-		    case T_UNUSED: /* whoops! */
-			(*argtable) [n].intarg = va_arg (ap, int);
-			break;
-		    case TP_SCHAR:
-			(*argtable) [n].pschararg = va_arg (ap, signed char *);
-			break;
-		    case TP_SHORT:
-			(*argtable) [n].pshortarg = va_arg (ap, short *);
-			break;
-		    case T_INT:
-			(*argtable) [n].intarg = va_arg (ap, int);
-			break;
-		    case T_U_INT:
-			(*argtable) [n].uintarg = va_arg (ap, unsigned int);
-			break;
-		    case TP_INT:
-			(*argtable) [n].pintarg = va_arg (ap, int *);
-			break;
-		    case T_LONG:
-			(*argtable) [n].longarg = va_arg (ap, long);
-			break;
-		    case T_U_LONG:
-			(*argtable) [n].ulongarg = va_arg (ap, unsigned long);
-			break;
-		    case TP_LONG:
-			(*argtable) [n].plongarg = va_arg (ap, long *);
-			break;
-		    case T_LLONG:
-			(*argtable) [n].longlongarg = va_arg (ap, long long);
-			break;
-		    case T_U_LLONG:
-			(*argtable) [n].ulonglongarg = va_arg (ap, unsigned long long);
-			break;
-		    case TP_LLONG:
-			(*argtable) [n].plonglongarg = va_arg (ap, long long *);
-			break;
-		    case T_PTRDIFFT:
-			(*argtable) [n].ptrdiffarg = va_arg (ap, ptrdiff_t);
-			break;
-		    case TP_PTRDIFFT:
-			(*argtable) [n].pptrdiffarg = va_arg (ap, ptrdiff_t *);
-			break;
-		    case T_SIZET:
-			(*argtable) [n].sizearg = va_arg (ap, size_t);
-			break;
-		    case TP_SIZET:
-			(*argtable) [n].psizearg = va_arg (ap, ssize_t *);
-			break;
-		    case T_INTMAXT:
-			(*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
-			break;
-		    case T_UINTMAXT:
-			(*argtable) [n].uintmaxarg = va_arg (ap, uintmax_t);
-			break;
-		    case TP_INTMAXT:
-			(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
-			break;
-		    case T_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			(*argtable) [n].doublearg = va_arg (ap, double);
-#endif
-			break;
-		    case T_LONG_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			(*argtable) [n].longdoublearg = va_arg (ap, long double);
-#endif
-			break;
-		    case TP_CHAR:
-			(*argtable) [n].pchararg = va_arg (ap, char *);
-			break;
-		    case TP_VOID:
-			(*argtable) [n].pvoidarg = va_arg (ap, void *);
-			break;
-		    case T_WINT:
-			(*argtable) [n].wintarg = va_arg (ap, wint_t);
-			break;
-		    case TP_WCHAR:
-			(*argtable) [n].pwchararg = va_arg (ap, wchar_t *);
-			break;
-		}
-	}
-
-	if ((typetable != NULL) && (typetable != stattypetable))
-		free (typetable);
-}
-
-/*
- * Increase the size of the type table.
- */
-static void
-__grow_type_table (int nextarg, enum typeid **typetable, int *tablesize)
-{
-	enum typeid *const oldtable = *typetable;
-	const int oldsize = *tablesize;
-	enum typeid *newtable;
-	int n, newsize = oldsize * 2;
-
-	if (newsize < nextarg + 1)
-		newsize = nextarg + 1;
-	if (oldsize == STATIC_ARG_TBL_SIZE) {
-		if ((newtable = malloc(newsize * sizeof(enum typeid))) == NULL)
-			abort();			/* XXX handle better */
-		bcopy(oldtable, newtable, oldsize * sizeof(enum typeid));
-	} else {
-		newtable = reallocf(oldtable, newsize * sizeof(enum typeid));
-		if (newtable == NULL)
-			abort();			/* XXX handle better */
-	}
-	for (n = oldsize; n < newsize; n++)
-		newtable[n] = T_UNUSED;
-
-	*typetable = newtable;
-	*tablesize = newsize;
-}
-
-
-#ifndef NO_FLOATING_POINT
-
-static int
-exponent(wchar_t *p0, int exp, wchar_t fmtch)
-{
-	wchar_t *p, *t;
-	wchar_t expbuf[MAXEXPDIG];
-
-	p = p0;
-	*p++ = fmtch;
-	if (exp < 0) {
-		exp = -exp;
-		*p++ = '-';
-	}
-	else
-		*p++ = '+';
-	t = expbuf + MAXEXPDIG;
-	if (exp > 9) {
-		do {
-			*--t = to_char(exp % 10);
-		} while ((exp /= 10) > 9);
-		*--t = to_char(exp);
-		for (; t < expbuf + MAXEXPDIG; *p++ = *t++);
-	}
-	else {
-		/*
-		 * Exponents for decimal floating point conversions
-		 * (%[eEgG]) must be at least two characters long,
-		 * whereas exponents for hexadecimal conversions can
-		 * be only one character long.
-		 */
-		if (fmtch == 'e' || fmtch == 'E')
-			*p++ = '0';
-		*p++ = to_char(exp);
-	}
-	return (p - p0);
-}
-#endif /* !NO_FLOATING_POINT */
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
deleted file mode 100644
index e24d139..0000000
--- a/lib/libc/stdio/vfwscanf.c
+++ /dev/null
@@ -1,880 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.12.8.1 2006/06/25 07:35:51 phk Exp $");
-
-#include "namespace.h"
-#include <ctype.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-
-#ifndef NO_FLOATING_POINT
-#include <locale.h>
-#endif
-
-#define	BUF		513	/* Maximum length of numeric string. */
-
-/*
- * Flags used during conversion.
- */
-#define	LONG		0x01	/* l: long or double */
-#define	LONGDBL		0x02	/* L: long double */
-#define	SHORT		0x04	/* h: short */
-#define	SUPPRESS	0x08	/* *: suppress assignment */
-#define	POINTER		0x10	/* p: void * (as hex) */
-#define	NOSKIP		0x20	/* [ or c: do not skip blanks */
-#define	LONGLONG	0x400	/* ll: long long (+ deprecated q: quad) */
-#define	INTMAXT		0x800	/* j: intmax_t */
-#define	PTRDIFFT	0x1000	/* t: ptrdiff_t */
-#define	SIZET		0x2000	/* z: size_t */
-#define	SHORTSHORT	0x4000	/* hh: char */
-#define	UNSIGNED	0x8000	/* %[oupxX] conversions */
-
-/*
- * The following are used in integral conversions only:
- * SIGNOK, NDIGITS, PFXOK, and NZDIGITS
- */
-#define	SIGNOK		0x40	/* +/- is (still) legal */
-#define	NDIGITS		0x80	/* no digits detected */
-#define	PFXOK		0x100	/* 0x prefix is (still) legal */
-#define	NZDIGITS	0x200	/* no zero digits detected */
-#define	HAVESIGN	0x10000	/* sign detected */
-
-/*
- * Conversion types.
- */
-#define	CT_CHAR		0	/* %c conversion */
-#define	CT_CCL		1	/* %[...] conversion */
-#define	CT_STRING	2	/* %s conversion */
-#define	CT_INT		3	/* %[dioupxX] conversion */
-#define	CT_FLOAT	4	/* %[efgEFG] conversion */
-
-#ifndef NO_FLOATING_POINT
-static int parsefloat(FILE *, wchar_t *, wchar_t *);
-#endif
-
-extern int __scanfdebug;
-
-#define	INCCL(_c)	\
-	(cclcompl ? (wmemchr(ccls, (_c), ccle - ccls) == NULL) : \
-	(wmemchr(ccls, (_c), ccle - ccls) != NULL))
-
-/*
- * MT-safe version.
- */
-int
-vfwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, va_list ap)
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	ret = __vfwscanf(fp, fmt, ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-/*
- * Non-MT-safe version.
- */
-int
-__vfwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, va_list ap)
-{
-	wint_t c;		/* character from format, or conversion */
-	size_t width;		/* field width, or 0 */
-	wchar_t *p;		/* points into all kinds of strings */
-	int n;			/* handy integer */
-	int flags;		/* flags as defined above */
-	wchar_t *p0;		/* saves original value of p when necessary */
-	int nassigned;		/* number of fields assigned */
-	int nconversions;	/* number of conversions */
-	int nread;		/* number of characters consumed from fp */
-	int base;		/* base argument to conversion function */
-	wchar_t buf[BUF];	/* buffer for numeric conversions */
-	const wchar_t *ccls;	/* character class start */
-	const wchar_t *ccle;	/* character class end */
-	int cclcompl;		/* ccl is complemented? */
-	wint_t wi;		/* handy wint_t */
-	char *mbp;		/* multibyte string pointer for %c %s %[ */
-	size_t nconv;		/* number of bytes in mb. conversion */
-	char mbbuf[MB_LEN_MAX];	/* temporary mb. character buffer */
-	static const mbstate_t initial;
-	mbstate_t mbs;
-
-	/* `basefix' is used to avoid `if' tests in the integer scanner */
-	static short basefix[17] =
-		{ 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-
-	nassigned = 0;
-	nconversions = 0;
-	nread = 0;
-	ccls = ccle = NULL;
-	for (;;) {
-		c = *fmt++;
-		if (c == 0)
-			return (nassigned);
-		if (iswspace(c)) {
-			while ((c = __fgetwc(fp)) != WEOF &&
-			    iswspace(c))
-				;
-			if (c != WEOF)
-				__ungetwc(c, fp);
-			continue;
-		}
-		if (c != '%')
-			goto literal;
-		width = 0;
-		flags = 0;
-		/*
-		 * switch on the format.  continue if done;
-		 * break once format type is derived.
-		 */
-again:		c = *fmt++;
-		switch (c) {
-		case '%':
-literal:
-			if ((wi = __fgetwc(fp)) == WEOF)
-				goto input_failure;
-			if (wi != c) {
-				__ungetwc(wi, fp);
-				goto input_failure;
-			}
-			nread++;
-			continue;
-
-		case '*':
-			flags |= SUPPRESS;
-			goto again;
-		case 'j':
-			flags |= INTMAXT;
-			goto again;
-		case 'l':
-			if (flags & LONG) {
-				flags &= ~LONG;
-				flags |= LONGLONG;
-			} else
-				flags |= LONG;
-			goto again;
-		case 'q':
-			flags |= LONGLONG;	/* not quite */
-			goto again;
-		case 't':
-			flags |= PTRDIFFT;
-			goto again;
-		case 'z':
-			flags |= SIZET;
-			goto again;
-		case 'L':
-			flags |= LONGDBL;
-			goto again;
-		case 'h':
-			if (flags & SHORT) {
-				flags &= ~SHORT;
-				flags |= SHORTSHORT;
-			} else
-				flags |= SHORT;
-			goto again;
-
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			width = width * 10 + c - '0';
-			goto again;
-
-		/*
-		 * Conversions.
-		 */
-		case 'd':
-			c = CT_INT;
-			base = 10;
-			break;
-
-		case 'i':
-			c = CT_INT;
-			base = 0;
-			break;
-
-		case 'o':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 8;
-			break;
-
-		case 'u':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 10;
-			break;
-
-		case 'X':
-		case 'x':
-			flags |= PFXOK;	/* enable 0x prefixing */
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 16;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case 'A': case 'E': case 'F': case 'G':
-		case 'a': case 'e': case 'f': case 'g':
-			c = CT_FLOAT;
-			break;
-#endif
-
-		case 'S':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 's':
-			c = CT_STRING;
-			break;
-
-		case '[':
-			ccls = fmt;
-			if (*fmt == '^') {
-				cclcompl = 1;
-				fmt++;
-			} else
-				cclcompl = 0;
-			if (*fmt == ']')
-				fmt++;
-			while (*fmt != '\0' && *fmt != ']')
-				fmt++;
-			ccle = fmt;
-			fmt++;
-			flags |= NOSKIP;
-			c = CT_CCL;
-			break;
-
-		case 'C':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 'c':
-			flags |= NOSKIP;
-			c = CT_CHAR;
-			break;
-
-		case 'p':	/* pointer format is like hex */
-			flags |= POINTER | PFXOK;
-			c = CT_INT;		/* assumes sizeof(uintmax_t) */
-			flags |= UNSIGNED;	/*      >= sizeof(uintptr_t) */
-			base = 16;
-			break;
-
-		case 'n':
-			nconversions++;
-			if (flags & SUPPRESS)	/* ??? */
-				continue;
-			if (flags & SHORTSHORT)
-				*va_arg(ap, char *) = nread;
-			else if (flags & SHORT)
-				*va_arg(ap, short *) = nread;
-			else if (flags & LONG)
-				*va_arg(ap, long *) = nread;
-			else if (flags & LONGLONG)
-				*va_arg(ap, long long *) = nread;
-			else if (flags & INTMAXT)
-				*va_arg(ap, intmax_t *) = nread;
-			else if (flags & SIZET)
-				*va_arg(ap, size_t *) = nread;
-			else if (flags & PTRDIFFT)
-				*va_arg(ap, ptrdiff_t *) = nread;
-			else
-				*va_arg(ap, int *) = nread;
-			continue;
-
-		default:
-			goto match_failure;
-
-		/*
-		 * Disgusting backwards compatibility hack.	XXX
-		 */
-		case '\0':	/* compat */
-			return (EOF);
-		}
-
-		/*
-		 * Consume leading white space, except for formats
-		 * that suppress this.
-		 */
-		if ((flags & NOSKIP) == 0) {
-			while ((wi = __fgetwc(fp)) != WEOF && iswspace(wi))
-				nread++;
-			if (wi == WEOF)
-				goto input_failure;
-			__ungetwc(wi, fp);
-		}
-
-		/*
-		 * Do the conversion.
-		 */
-		switch (c) {
-
-		case CT_CHAR:
-			/* scan arbitrary characters (sets NOSKIP) */
-			if (width == 0)
-				width = 1;
-			if (flags & LONG) {
-				if (!(flags & SUPPRESS))
-					p = va_arg(ap, wchar_t *);
-				n = 0;
-				while (width-- != 0 &&
-				    (wi = __fgetwc(fp)) != WEOF) {
-					if (!(flags & SUPPRESS))
-						*p++ = (wchar_t)wi;
-					n++;
-				}
-				if (n == 0)
-					goto input_failure;
-				nread += n;
-				if (!(flags & SUPPRESS))
-					nassigned++;
-			} else {
-				if (!(flags & SUPPRESS))
-					mbp = va_arg(ap, char *);
-				n = 0;
-				mbs = initial;
-				while (width != 0 &&
-				    (wi = __fgetwc(fp)) != WEOF) {
-					if (width >= MB_CUR_MAX &&
-					    !(flags & SUPPRESS)) {
-						nconv = wcrtomb(mbp, wi, &mbs);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-					} else {
-						nconv = wcrtomb(mbbuf, wi,
-						    &mbs);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-						if (nconv > width) {
-							__ungetwc(wi, fp);
-							break;
-						}
-						if (!(flags & SUPPRESS))
-							memcpy(mbp, mbbuf,
-							    nconv);
-					}
-					if (!(flags & SUPPRESS))
-						mbp += nconv;
-					width -= nconv;
-					n++;
-				}
-				if (n == 0)
-					goto input_failure;
-				nread += n;
-				if (!(flags & SUPPRESS))
-					nassigned++;
-			}
-			nconversions++;
-			break;
-
-		case CT_CCL:
-			/* scan a (nonempty) character class (sets NOSKIP) */
-			if (width == 0)
-				width = (size_t)~0;	/* `infinity' */
-			/* take only those things in the class */
-			if ((flags & SUPPRESS) && (flags & LONG)) {
-				n = 0;
-				while ((wi = __fgetwc(fp)) != WEOF &&
-				    width-- != 0 && INCCL(wi))
-					n++;
-				if (wi != WEOF)
-					__ungetwc(wi, fp);
-				if (n == 0)
-					goto match_failure;
-			} else if (flags & LONG) {
-				p0 = p = va_arg(ap, wchar_t *);
-				while ((wi = __fgetwc(fp)) != WEOF &&
-				    width-- != 0 && INCCL(wi))
-					*p++ = (wchar_t)wi;
-				if (wi != WEOF)
-					__ungetwc(wi, fp);
-				n = p - p0;
-				if (n == 0)
-					goto match_failure;
-				*p = 0;
-				nassigned++;
-			} else {
-				if (!(flags & SUPPRESS))
-					mbp = va_arg(ap, char *);
-				n = 0;
-				mbs = initial;
-				while ((wi = __fgetwc(fp)) != WEOF &&
-				    width != 0 && INCCL(wi)) {
-					if (width >= MB_CUR_MAX &&
-					   !(flags & SUPPRESS)) {
-						nconv = wcrtomb(mbp, wi, &mbs);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-					} else {
-						nconv = wcrtomb(mbbuf, wi,
-						    &mbs);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-						if (nconv > width)
-							break;
-						if (!(flags & SUPPRESS))
-							memcpy(mbp, mbbuf,
-							    nconv);
-					}
-					if (!(flags & SUPPRESS))
-						mbp += nconv;
-					width -= nconv;
-					n++;
-				}
-				if (wi != WEOF)
-					__ungetwc(wi, fp);
-				if (!(flags & SUPPRESS)) {
-					*mbp = 0;
-					nassigned++;
-				}
-			}
-			nread += n;
-			nconversions++;
-			break;
-
-		case CT_STRING:
-			/* like CCL, but zero-length string OK, & no NOSKIP */
-			if (width == 0)
-				width = (size_t)~0;
-			if ((flags & SUPPRESS) && (flags & LONG)) {
-				while ((wi = __fgetwc(fp)) != WEOF &&
-				    width-- != 0 &&
-				    !iswspace(wi))
-					nread++;
-				if (wi != WEOF)
-					__ungetwc(wi, fp);
-			} else if (flags & LONG) {
-				p0 = p = va_arg(ap, wchar_t *);
-				while ((wi = __fgetwc(fp)) != WEOF &&
-				    width-- != 0 &&
-				    !iswspace(wi)) {
-					*p++ = (wchar_t)wi;
-					nread++;
-				}
-				if (wi != WEOF)
-					__ungetwc(wi, fp);
-				*p = '\0';
-				nassigned++;
-			} else {
-				if (!(flags & SUPPRESS))
-					mbp = va_arg(ap, char *);
-				mbs = initial;
-				while ((wi = __fgetwc(fp)) != WEOF &&
-				    width != 0 &&
-				    !iswspace(wi)) {
-					if (width >= MB_CUR_MAX &&
-					    !(flags & SUPPRESS)) {
-						nconv = wcrtomb(mbp, wi, &mbs);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-					} else {
-						nconv = wcrtomb(mbbuf, wi,
-						    &mbs);
-						if (nconv == (size_t)-1)
-							goto input_failure;
-						if (nconv > width)
-							break;
-						if (!(flags & SUPPRESS))
-							memcpy(mbp, mbbuf,
-							    nconv);
-					}
-					if (!(flags & SUPPRESS))
-						mbp += nconv;
-					width -= nconv;
-					nread++;
-				}
-				if (wi != WEOF)
-					__ungetwc(wi, fp);
-				if (!(flags & SUPPRESS)) {
-					*mbp = 0;
-					nassigned++;
-				}
-			}
-			nconversions++;
-			continue;
-
-		case CT_INT:
-			/* scan an integer as if by the conversion function */
-			if (width == 0 || width > sizeof(buf) /
-			    sizeof(*buf) - 1)
-				width = sizeof(buf) / sizeof(*buf) - 1;
-			flags |= SIGNOK | NDIGITS | NZDIGITS;
-			for (p = buf; width; width--) {
-				c = __fgetwc(fp);
-				/*
-				 * Switch on the character; `goto ok'
-				 * if we accept it as a part of number.
-				 */
-				switch (c) {
-
-				/*
-				 * The digit 0 is always legal, but is
-				 * special.  For %i conversions, if no
-				 * digits (zero or nonzero) have been
-				 * scanned (only signs), we will have
-				 * base==0.  In that case, we should set
-				 * it to 8 and enable 0x prefixing.
-				 * Also, if we have not scanned zero digits
-				 * before this, do not turn off prefixing
-				 * (someone else will turn it off if we
-				 * have scanned any nonzero digits).
-				 */
-				case '0':
-					if (base == 0) {
-						base = 8;
-						flags |= PFXOK;
-					}
-					if (flags & NZDIGITS)
-					    flags &= ~(SIGNOK|NZDIGITS|NDIGITS);
-					else
-					    flags &= ~(SIGNOK|PFXOK|NDIGITS);
-					goto ok;
-
-				/* 1 through 7 always legal */
-				case '1': case '2': case '3':
-				case '4': case '5': case '6': case '7':
-					base = basefix[base];
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* digits 8 and 9 ok iff decimal or hex */
-				case '8': case '9':
-					base = basefix[base];
-					if (base <= 8)
-						break;	/* not legal here */
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* letters ok iff hex */
-				case 'A': case 'B': case 'C':
-				case 'D': case 'E': case 'F':
-				case 'a': case 'b': case 'c':
-				case 'd': case 'e': case 'f':
-					/* no need to fix base here */
-					if (base <= 10)
-						break;	/* not legal here */
-					flags &= ~(SIGNOK | PFXOK | NDIGITS);
-					goto ok;
-
-				/* sign ok only as first character */
-				case '+': case '-':
-					if (flags & SIGNOK) {
-						flags &= ~SIGNOK;
-						flags |= HAVESIGN;
-						goto ok;
-					}
-					break;
-					
-				/*
-				 * x ok iff flag still set & 2nd char (or
-				 * 3rd char if we have a sign).
-				 */
-				case 'x': case 'X':
-					if (flags & PFXOK && p ==
-					    buf + 1 + !!(flags & HAVESIGN)) {
-						base = 16;	/* if %i */
-						flags &= ~PFXOK;
-						goto ok;
-					}
-					break;
-				}
-
-				/*
-				 * If we got here, c is not a legal character
-				 * for a number.  Stop accumulating digits.
-				 */
-				if (c != WEOF)
-					__ungetwc(c, fp);
-				break;
-		ok:
-				/*
-				 * c is legal: store it and look at the next.
-				 */
-				*p++ = (wchar_t)c;
-			}
-			/*
-			 * If we had only a sign, it is no good; push
-			 * back the sign.  If the number ends in `x',
-			 * it was [sign] '0' 'x', so push back the x
-			 * and treat it as [sign] '0'.
-			 */
-			if (flags & NDIGITS) {
-				if (p > buf)
-					__ungetwc(*--p, fp);
-				goto match_failure;
-			}
-			c = p[-1];
-			if (c == 'x' || c == 'X') {
-				--p;
-				__ungetwc(c, fp);
-			}
-			if ((flags & SUPPRESS) == 0) {
-				uintmax_t res;
-
-				*p = 0;
-				if ((flags & UNSIGNED) == 0)
-				    res = wcstoimax(buf, NULL, base);
-				else
-				    res = wcstoumax(buf, NULL, base);
-				if (flags & POINTER)
-					*va_arg(ap, void **) =
-							(void *)(uintptr_t)res;
-				else if (flags & SHORTSHORT)
-					*va_arg(ap, char *) = res;
-				else if (flags & SHORT)
-					*va_arg(ap, short *) = res;
-				else if (flags & LONG)
-					*va_arg(ap, long *) = res;
-				else if (flags & LONGLONG)
-					*va_arg(ap, long long *) = res;
-				else if (flags & INTMAXT)
-					*va_arg(ap, intmax_t *) = res;
-				else if (flags & PTRDIFFT)
-					*va_arg(ap, ptrdiff_t *) = res;
-				else if (flags & SIZET)
-					*va_arg(ap, size_t *) = res;
-				else
-					*va_arg(ap, int *) = res;
-				nassigned++;
-			}
-			nread += p - buf;
-			nconversions++;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case CT_FLOAT:
-			/* scan a floating point number as if by strtod */
-			if (width == 0 || width > sizeof(buf) /
-			    sizeof(*buf) - 1)
-				width = sizeof(buf) / sizeof(*buf) - 1;
-			if ((width = parsefloat(fp, buf, buf + width)) == 0)
-				goto match_failure;
-			if ((flags & SUPPRESS) == 0) {
-				if (flags & LONGDBL) {
-					long double res = wcstold(buf, &p);
-					*va_arg(ap, long double *) = res;
-				} else if (flags & LONG) {
-					double res = wcstod(buf, &p);
-					*va_arg(ap, double *) = res;
-				} else {
-					float res = wcstof(buf, &p);
-					*va_arg(ap, float *) = res;
-				}
-				if (__scanfdebug && p - buf != width)
-					abort();
-				nassigned++;
-			}
-			nread += width;
-			nconversions++;
-			break;
-#endif /* !NO_FLOATING_POINT */
-		}
-	}
-input_failure:
-	return (nconversions != 0 ? nassigned : EOF);
-match_failure:
-	return (nassigned);
-}
-
-#ifndef NO_FLOATING_POINT
-static int
-parsefloat(FILE *fp, wchar_t *buf, wchar_t *end)
-{
-	wchar_t *commit, *p;
-	int infnanpos = 0;
-	enum {
-		S_START, S_GOTSIGN, S_INF, S_NAN, S_MAYBEHEX,
-		S_DIGITS, S_FRAC, S_EXP, S_EXPDIGITS
-	} state = S_START;
-	wchar_t c;
-	wchar_t decpt = (wchar_t)(unsigned char)*localeconv()->decimal_point;
-	_Bool gotmantdig = 0, ishex = 0;
-
-	/*
-	 * We set commit = p whenever the string we have read so far
-	 * constitutes a valid representation of a floating point
-	 * number by itself.  At some point, the parse will complete
-	 * or fail, and we will ungetc() back to the last commit point.
-	 * To ensure that the file offset gets updated properly, it is
-	 * always necessary to read at least one character that doesn't
-	 * match; thus, we can't short-circuit "infinity" or "nan(...)".
-	 */
-	commit = buf - 1;
-	c = WEOF;
-	for (p = buf; p < end; ) {
-		if ((c = __fgetwc(fp)) == WEOF)
-			break;
-reswitch:
-		switch (state) {
-		case S_START:
-			state = S_GOTSIGN;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_GOTSIGN:
-			switch (c) {
-			case '0':
-				state = S_MAYBEHEX;
-				commit = p;
-				break;
-			case 'I':
-			case 'i':
-				state = S_INF;
-				break;
-			case 'N':
-			case 'n':
-				state = S_NAN;
-				break;
-			default:
-				state = S_DIGITS;
-				goto reswitch;
-			}
-			break;
-		case S_INF:
-			if (infnanpos > 6 ||
-			    (c != "nfinity"[infnanpos] &&
-			     c != "NFINITY"[infnanpos]))
-				goto parsedone;
-			if (infnanpos == 1 || infnanpos == 6)
-				commit = p;	/* inf or infinity */
-			infnanpos++;
-			break;
-		case S_NAN:
-			switch (infnanpos) {
-			case -1:	/* XXX kludge to deal with nan(...) */
-				goto parsedone;
-			case 0:
-				if (c != 'A' && c != 'a')
-					goto parsedone;
-				break;
-			case 1:
-				if (c != 'N' && c != 'n')
-					goto parsedone;
-				else
-					commit = p;
-				break;
-			case 2:
-				if (c != '(')
-					goto parsedone;
-				break;
-			default:
-				if (c == ')') {
-					commit = p;
-					infnanpos = -2;
-				} else if (!iswalnum(c) && c != '_')
-					goto parsedone;
-				break;
-			}
-			infnanpos++;
-			break;
-		case S_MAYBEHEX:
-			state = S_DIGITS;
-			if (c == 'X' || c == 'x') {
-				ishex = 1;
-				break;
-			} else {	/* we saw a '0', but no 'x' */
-				gotmantdig = 1;
-				goto reswitch;
-			}
-		case S_DIGITS:
-			if ((ishex && iswxdigit(c)) || iswdigit(c))
-				gotmantdig = 1;
-			else {
-				state = S_FRAC;
-				if (c != decpt)
-					goto reswitch;
-			}
-			if (gotmantdig)
-				commit = p;
-			break;
-		case S_FRAC:
-			if (((c == 'E' || c == 'e') && !ishex) ||
-			    ((c == 'P' || c == 'p') && ishex)) {
-				if (!gotmantdig)
-					goto parsedone;
-				else
-					state = S_EXP;
-			} else if ((ishex && iswxdigit(c)) || iswdigit(c)) {
-				commit = p;
-				gotmantdig = 1;
-			} else
-				goto parsedone;
-			break;
-		case S_EXP:
-			state = S_EXPDIGITS;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_EXPDIGITS:
-			if (iswdigit(c))
-				commit = p;
-			else
-				goto parsedone;
-			break;
-		default:
-			abort();
-		}
-		*p++ = c;
-		c = WEOF;
-	}
-
-parsedone:
-	if (c != WEOF)
-		__ungetwc(c, fp);
-	while (commit < --p)
-		__ungetwc(*p, fp);
-	*++commit = '\0';
-	return (commit - buf);
-}
-#endif
diff --git a/lib/libc/stdio/vprintf.c b/lib/libc/stdio/vprintf.c
deleted file mode 100644
index 329bbf0..0000000
--- a/lib/libc/stdio/vprintf.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vprintf.c,v 1.10 2002/09/06 11:23:56 tjr Exp $");
-
-#include <stdio.h>
-
-int
-vprintf(const char * __restrict fmt, __va_list ap)
-{
-
-	return (vfprintf(stdout, fmt, ap));
-}
diff --git a/lib/libc/stdio/vscanf.c b/lib/libc/stdio/vscanf.c
deleted file mode 100644
index 6945736..0000000
--- a/lib/libc/stdio/vscanf.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Donn Seeley at UUNET Technologies, Inc.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vscanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-int
-vscanf(fmt, ap)
-	const char * __restrict fmt;
-	__va_list ap;
-{
-	int retval;
-
-	FLOCKFILE(stdin);
-	retval = __svfscanf(stdin, fmt, ap);
-	FUNLOCKFILE(stdin);
-	return (retval);
-}
diff --git a/lib/libc/stdio/vsnprintf.c b/lib/libc/stdio/vsnprintf.c
deleted file mode 100644
index 3a43939..0000000
--- a/lib/libc/stdio/vsnprintf.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.22 2003/07/02 07:08:44 jkh Exp $");
-
-#include <limits.h>
-#include <stdio.h>
-#include "local.h"
-
-int
-vsnprintf(char * __restrict str, size_t n, const char * __restrict fmt,
-    __va_list ap)
-{
-	size_t on;
-	int ret;
-	char dummy[2];
-	FILE f;
-	struct __sFILEX ext;
-
-	on = n;
-	if (n != 0)
-		n--;
-	if (n > INT_MAX)
-		n = INT_MAX;
-	/* Stdio internals do not deal correctly with zero length buffer */
-	if (n == 0) {
-		if (on > 0)
-	  		*str = '\0';
-		str = dummy;
-		n = 1;
-	}
-	f._file = -1;
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = n;
-	f._extra = &ext;
-	INITEXTRA(&f);
-	ret = __vfprintf(&f, fmt, ap);
-	if (on > 0)
-		*f._p = '\0';
-	return (ret);
-}
diff --git a/lib/libc/stdio/vsprintf.c b/lib/libc/stdio/vsprintf.c
deleted file mode 100644
index 698f752..0000000
--- a/lib/libc/stdio/vsprintf.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vsprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vsprintf.c,v 1.14 2002/09/06 11:23:56 tjr Exp $");
-
-#include <stdio.h>
-#include <limits.h>
-#include "local.h"
-
-int
-vsprintf(char * __restrict str, const char * __restrict fmt, __va_list ap)
-{
-	int ret;
-	FILE f;
-	struct __sFILEX ext;
-
-	f._file = -1;
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = INT_MAX;
-	f._extra = &ext;
-	INITEXTRA(&f);
-	ret = __vfprintf(&f, fmt, ap);
-	*f._p = 0;
-	return (ret);
-}
diff --git a/lib/libc/stdio/vsscanf.c b/lib/libc/stdio/vsscanf.c
deleted file mode 100644
index e7bbe25..0000000
--- a/lib/libc/stdio/vsscanf.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Donn Seeley at UUNET Technologies, Inc.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.12 2002/10/12 16:13:41 mike Exp $");
-
-#include <stdio.h>
-#include <string.h>
-#include "local.h"
-
-static int
-eofread(void *, char *, int);
-
-/* ARGSUSED */
-static int
-eofread(cookie, buf, len)
-	void *cookie;
-	char *buf;
-	int len;
-{
-
-	return (0);
-}
-
-int
-vsscanf(str, fmt, ap)
-	const char * __restrict str;
-	const char * __restrict fmt;
-	__va_list ap;
-{
-	FILE f;
-	struct __sFILEX ext;
-
-	f._file = -1;
-	f._flags = __SRD;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._r = strlen(str);
-	f._read = eofread;
-	f._ub._base = NULL;
-	f._lb._base = NULL;
-	f._extra = &ext;
-	INITEXTRA(&f);
-	return (__svfscanf(&f, fmt, ap));
-}
diff --git a/lib/libc/stdio/vswprintf.c b/lib/libc/stdio/vswprintf.c
deleted file mode 100644
index a4b6306..0000000
--- a/lib/libc/stdio/vswprintf.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*	$OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $	*/
-
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.6 2005/02/21 19:41:44 fjoe Exp $");
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "local.h"
-
-int
-vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
-    __va_list ap)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	FILE f;
-	struct __sFILEX ext;
-	char *mbp;
-	int ret, sverrno;
-	size_t nwc;
-
-	if (n == 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	f._file = -1;
-	f._flags = __SWR | __SSTR | __SALC;
-	f._bf._base = f._p = (unsigned char *)malloc(128);
-	if (f._bf._base == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	f._bf._size = f._w = 127;		/* Leave room for the NUL */
-	f._extra = &ext;
-	INITEXTRA(&f);
-	ret = __vfwprintf(&f, fmt, ap);
-	if (ret < 0) {
-		sverrno = errno;
-		free(f._bf._base);
-		errno = sverrno;
-		return (-1);
-	}
-	*f._p = '\0';
-	mbp = f._bf._base;
-	/*
-	 * XXX Undo the conversion from wide characters to multibyte that
-	 * fputwc() did in __vfwprintf().
-	 */
-	mbs = initial;
-	nwc = mbsrtowcs(s, (const char **)&mbp, n, &mbs);
-	free(f._bf._base);
-	if (nwc == (size_t)-1) {
-		errno = EILSEQ;
-		return (-1);
-	}
-	if (nwc == n) {
-		s[n - 1] = L'\0';
-		errno = EOVERFLOW;
-		return (-1);
-	}
-
-	return (ret);
-}
diff --git a/lib/libc/stdio/vswscanf.c b/lib/libc/stdio/vswscanf.c
deleted file mode 100644
index 03675d4..0000000
--- a/lib/libc/stdio/vswscanf.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Donn Seeley at UUNET Technologies, Inc.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.11 2002/08/21 16:19:57 mike Exp ");
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vswscanf.c,v 1.3 2004/04/07 09:55:05 tjr Exp $");
-
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "local.h"
-
-static int	eofread(void *, char *, int);
-
-static int
-eofread(void *cookie, char *buf, int len)
-{
-
-	return (0);
-}
-
-int
-vswscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt,
-    va_list ap)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	FILE f;
-	struct __sFILEX ext;
-	char *mbstr;
-	size_t mlen;
-	int r;
-
-	/*
-	 * XXX Convert the wide character string to multibyte, which
-	 * __vfwscanf() will convert back to wide characters.
-	 */
-	if ((mbstr = malloc(wcslen(str) * MB_CUR_MAX + 1)) == NULL)
-		return (EOF);
-	mbs = initial;
-	if ((mlen = wcsrtombs(mbstr, &str, SIZE_T_MAX, &mbs)) == (size_t)-1) {
-		free(mbstr);
-		return (EOF);
-	}
-	f._file = -1;
-	f._flags = __SRD;
-	f._bf._base = f._p = (unsigned char *)mbstr;
-	f._bf._size = f._r = mlen;
-	f._read = eofread;
-	f._ub._base = NULL;
-	f._lb._base = NULL;
-	f._extra = &ext;
-	INITEXTRA(&f);
-	r = __vfwscanf(&f, fmt, ap);
-	free(mbstr);
-
-	return (r);
-}
diff --git a/lib/libc/stdio/vwprintf.c b/lib/libc/stdio/vwprintf.c
deleted file mode 100644
index 4390c06..0000000
--- a/lib/libc/stdio/vwprintf.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vwprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-int
-vwprintf(const wchar_t * __restrict fmt, va_list ap)
-{
-
-	return (vfwprintf(stdout, fmt, ap));
-}
diff --git a/lib/libc/stdio/vwscanf.c b/lib/libc/stdio/vwscanf.c
deleted file mode 100644
index 6e103d5..0000000
--- a/lib/libc/stdio/vwscanf.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/vwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-int
-vwscanf(const wchar_t * __restrict fmt, va_list ap)
-{
-
-	return (vfwscanf(stdin, fmt, ap));
-}
diff --git a/lib/libc/stdio/wbuf.c b/lib/libc/stdio/wbuf.c
deleted file mode 100644
index 3697be8..0000000
--- a/lib/libc/stdio/wbuf.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wbuf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/wbuf.c,v 1.11 2004/06/08 05:45:32 das Exp $");
-
-#include <stdio.h>
-#include "local.h"
-
-/*
- * Write the given character into the (probably full) buffer for
- * the given file.  Flush the buffer out if it is or becomes full,
- * or if c=='\n' and the file is line buffered.
- *
- * Non-MT-safe
- */
-int
-__swbuf(c, fp)
-	int c;
-	FILE *fp;
-{
-	int n;
-
-	/*
-	 * In case we cannot write, or longjmp takes us out early,
-	 * make sure _w is 0 (if fully- or un-buffered) or -_bf._size
-	 * (if line buffered) so that we will get called again.
-	 * If we did not do this, a sufficient number of putc()
-	 * calls might wrap _w from negative to positive.
-	 */
-	fp->_w = fp->_lbfsize;
-	if (prepwrite(fp) != 0)
-		return (EOF);
-	c = (unsigned char)c;
-
-	ORIENT(fp, -1);
-
-	/*
-	 * If it is completely full, flush it out.  Then, in any case,
-	 * stuff c into the buffer.  If this causes the buffer to fill
-	 * completely, or if c is '\n' and the file is line buffered,
-	 * flush it (perhaps a second time).  The second flush will always
-	 * happen on unbuffered streams, where _bf._size==1; fflush()
-	 * guarantees that putc() will always call wbuf() by setting _w
-	 * to 0, so we need not do anything else.
-	 */
-	n = fp->_p - fp->_bf._base;
-	if (n >= fp->_bf._size) {
-		if (__fflush(fp))
-			return (EOF);
-		n = 0;
-	}
-	fp->_w--;
-	*fp->_p++ = c;
-	if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n'))
-		if (__fflush(fp))
-			return (EOF);
-	return (c);
-}
diff --git a/lib/libc/stdio/wprintf.c b/lib/libc/stdio/wprintf.c
deleted file mode 100644
index 4b5596e..0000000
--- a/lib/libc/stdio/wprintf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/wprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-int
-wprintf(const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf(stdout, fmt, ap);
-	va_end(ap);
-
-	return (ret);
-}
diff --git a/lib/libc/stdio/wscanf.c b/lib/libc/stdio/wscanf.c
deleted file mode 100644
index 8629027..0000000
--- a/lib/libc/stdio/wscanf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/wscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-
-int
-wscanf(const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf(stdin, fmt, ap);
-	va_end(ap);
-
-	return (r);
-}
diff --git a/lib/libc/stdio/wsetup.c b/lib/libc/stdio/wsetup.c
deleted file mode 100644
index a604584..0000000
--- a/lib/libc/stdio/wsetup.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wsetup.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/wsetup.c,v 1.9 2004/06/08 05:44:52 das Exp $");
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "local.h"
-
-/*
- * Various output routines call wsetup to be sure it is safe to write,
- * because either _flags does not include __SWR, or _buf is NULL.
- * _wsetup returns 0 if OK to write; otherwise, it returns EOF and sets errno.
- */
-int
-__swsetup(fp)
-	FILE *fp;
-{
-	/* make sure stdio is set up */
-	if (!__sdidinit) {
-		__sinit();
-               }
-	/*
-	 * If we are not writing, we had better be reading and writing.
-	 */
-	if ((fp->_flags & __SWR) == 0) {
-		if ((fp->_flags & __SRW) == 0) {
-			errno = EBADF;
-			return (EOF);
-		}
-		if (fp->_flags & __SRD) {
-			/* clobber any ungetc data */
-			if (HASUB(fp))
-				FREEUB(fp);
-			fp->_flags &= ~(__SRD|__SEOF);
-			fp->_r = 0;
-			fp->_p = fp->_bf._base;
-		}
-		fp->_flags |= __SWR;
-	}
-
-	/*
-	 * Make a buffer if necessary, then set _w.
-	 */
-	if (fp->_bf._base == NULL) {
-		__smakebuf(fp);
-                }
-	if (fp->_flags & __SLBF) {
-		/*
-		 * It is line buffered, so make _lbfsize be -_bufsize
-		 * for the putc() macro.  We will change _lbfsize back
-		 * to 0 whenever we turn off __SWR.
-		 */
-		fp->_w = 0;
-		fp->_lbfsize = -fp->_bf._size;
-	} else
-		fp->_w = fp->_flags & __SNBF ? 0 : fp->_bf._size;
-	return (0);
-}
diff --git a/lib/libc/stdio/xprintf.c b/lib/libc/stdio/xprintf.c
deleted file mode 100644
index 3f62890..0000000
--- a/lib/libc/stdio/xprintf.c
+++ /dev/null
@@ -1,690 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdio/xprintf.c 238111 2012-07-04 17:35:07Z pjd $
- */
-
-#include "namespace.h"
-#include <err.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <stdint.h>
-#include <assert.h>
-#include <stdarg.h>
-#include <namespace.h>
-#include <string.h>
-#include <wchar.h>
-#include "un-namespace.h"
-
-#include "local.h"
-#include "printf.h"
-#include "fvwrite.h"
-
-int __use_xprintf = -1;
-
-/* private stuff -----------------------------------------------------*/
-
-union arg {
-	int			intarg;
-	long			longarg;
-	intmax_t 		intmaxarg;
-#ifndef NO_FLOATING_POINT
-	double			doublearg;
-	long double 		longdoublearg;
-#endif
-	wint_t			wintarg;
-	char			*pchararg;
-	wchar_t			*pwchararg;
-	void			*pvoidarg;
-};
-
-/*
- * Macros for converting digits to letters and vice versa
- */
-#define	to_digit(c)	((c) - '0')
-#define is_digit(c)	(((unsigned)to_digit(c)) <= 9)
-
-/* various globals ---------------------------------------------------*/
-
-const char __lowercase_hex[17] = "0123456789abcdef?";	/*lint !e784 */
-const char __uppercase_hex[17] = "0123456789ABCDEF?";	/*lint !e784 */
-
-#define PADSIZE 16
-static char blanks[PADSIZE] =
-	 {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
-static char zeroes[PADSIZE] =
-	 {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
-
-/* printing and padding functions ------------------------------------*/
-
-#define NIOV 8
-
-struct __printf_io {
-	FILE		*fp;
-	struct __suio	uio;
-	struct __siov	iov[NIOV];
-	struct __siov	*iovp;
-};
-
-static void
-__printf_init(struct __printf_io *io)
-{
-
-	io->uio.uio_iov = io->iovp = &io->iov[0];
-	io->uio.uio_resid = 0;
-	io->uio.uio_iovcnt = 0;
-}
-
-void
-__printf_flush(struct __printf_io *io)
-{
-
-	__sfvwrite(io->fp, &io->uio);
-	__printf_init(io);
-}
-
-int
-__printf_puts(struct __printf_io *io, const void *ptr, int len)
-{
-
-
-	if (io->fp->_flags & __SERR)
-		return (0);
-	if (len == 0)
-		return (0);
-	io->iovp->iov_base = __DECONST(void *, ptr);
-	io->iovp->iov_len = len;
-	io->uio.uio_resid += len;
-	io->iovp++;
-	io->uio.uio_iovcnt++;
-	if (io->uio.uio_iovcnt >= NIOV)
-		__printf_flush(io);
-	return (len);
-}
-
-int
-__printf_pad(struct __printf_io *io, int howmany, int zero)
-{
-	int n;
-	const char *with;
-	int ret = 0;
-
-	if (zero)
-		with = zeroes;
-	else
-		with = blanks;
-
-	if ((n = (howmany)) > 0) {
-		while (n > PADSIZE) { 
-			ret += __printf_puts(io, with, PADSIZE);
-			n -= PADSIZE;
-		}
-		ret += __printf_puts(io, with, n);
-	}
-	return (ret);
-}
-
-int
-__printf_out(struct __printf_io *io, const struct printf_info *pi, const void *ptr, int len)
-{
-	int ret = 0;
-
-	if ((!pi->left) && pi->width > len)
-		ret += __printf_pad(io, pi->width - len, pi->pad == '0');
-	ret += __printf_puts(io, ptr, len);
-	if (pi->left && pi->width > len)
-		ret += __printf_pad(io, pi->width - len, pi->pad == '0');
-	return (ret);
-}
-
-
-/* percent handling  -------------------------------------------------*/
-
-static int
-__printf_arginfo_pct(const struct printf_info *pi __unused, size_t n __unused, int *argt __unused)
-{
-
-	return (0);
-}
-
-static int
-__printf_render_pct(struct __printf_io *io, const struct printf_info *pi __unused, const void *const *arg __unused)
-{
-
-	return (__printf_puts(io, "%", 1));
-}
-
-/* 'n' ---------------------------------------------------------------*/
-
-static int
-__printf_arginfo_n(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-
-/*
- * This is a printf_render so that all output has been flushed before it
- * gets called.
- */
-
-static int
-__printf_render_n(FILE *io __unused, const struct printf_info *pi, const void *const *arg)
-{
-
-	if (pi->is_char)
-		**((signed char **)arg[0]) = (signed char)pi->sofar;
-	else if (pi->is_short)
-		**((short **)arg[0]) = (short)pi->sofar;
-	else if (pi->is_long)
-		**((long **)arg[0]) = pi->sofar;
-	else if (pi->is_long_double)
-		**((long long **)arg[0]) = pi->sofar;
-	else if (pi->is_intmax)
-		**((intmax_t **)arg[0]) = pi->sofar;
-	else if (pi->is_ptrdiff)
-		**((ptrdiff_t **)arg[0]) = pi->sofar;
-	else if (pi->is_quad)
-		**((quad_t **)arg[0]) = pi->sofar;
-	else if (pi->is_size)
-		**((size_t **)arg[0]) = pi->sofar;
-	else
-		**((int **)arg[0]) = pi->sofar;
-
-	return (0);
-}
-
-/* table -------------------------------------------------------------*/
-
-/*lint -esym(785, printf_tbl) */
-static struct {
-	printf_arginfo_function	*arginfo;
-	printf_function		*gnurender;
-	printf_render		*render;
-} printf_tbl[256] = {
-	['%'] = { __printf_arginfo_pct,		NULL,	__printf_render_pct },
-	['A'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['C'] = { __printf_arginfo_chr,		NULL,	__printf_render_chr },
-	['E'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['F'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['G'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['S'] = { __printf_arginfo_str,		NULL,	__printf_render_str },
-	['X'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['a'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['c'] = { __printf_arginfo_chr,		NULL,	__printf_render_chr },
-	['d'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['e'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['f'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['g'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['i'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['n'] = { __printf_arginfo_n,		__printf_render_n, NULL },
-	['o'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['p'] = { __printf_arginfo_ptr,		NULL,	__printf_render_ptr },
-	['q'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['s'] = { __printf_arginfo_str,		NULL,	__printf_render_str },
-	['u'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['x'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-};
-
-
-static int
-__v2printf(FILE *fp, const char *fmt0, unsigned pct, va_list ap)
-{
-	struct printf_info	*pi, *pil;
-	const char		*fmt;
-	int			ch;
-	struct printf_info	pia[pct + 10];
-	int			argt[pct + 10];
-	union arg		args[pct + 10];
-	int			nextarg;
-	int			maxarg;
-	int			ret = 0;
-	int			n;
-	struct __printf_io	io;
-
-	__printf_init(&io);
-	io.fp = fp;
-
-	fmt = fmt0;
-	maxarg = 0;
-	nextarg = 1;
-	memset(argt, 0, sizeof argt);
-	for (pi = pia; ; pi++) {
-		memset(pi, 0, sizeof *pi);
-		pil = pi;
-		if (*fmt == '\0')
-			break;
-		pil = pi + 1;
-		pi->prec = -1;
-		pi->pad = ' ';
-		pi->begin = pi->end = fmt;
-		while (*fmt != '\0' && *fmt != '%')
-			pi->end = ++fmt;
-		if (*fmt == '\0') 
-			break;
-		fmt++;
-		for (;;) {
-			pi->spec = *fmt;
-			switch (pi->spec) {
-			case ' ':
-				/*-
-				 * ``If the space and + flags both appear, the space
-				 * flag will be ignored.''
-				 *      -- ANSI X3J11
-				 */
-				if (pi->showsign == 0)
-					pi->showsign = ' ';
-				fmt++;
-				continue;
-			case '#':
-				pi->alt = 1;
-				fmt++;
-				continue;
-			case '.':
-				pi->prec = 0;
-				fmt++;
-				if (*fmt == '*') {
-					fmt++;
-					pi->get_prec = nextarg;
-					argt[nextarg++] = PA_INT;
-					continue;
-				}
-				while (*fmt != '\0' && is_digit(*fmt)) {
-					pi->prec *= 10;
-					pi->prec += to_digit(*fmt);
-					fmt++;
-				}
-				continue;
-			case '-':
-				pi->left = 1;
-				fmt++;
-				continue;
-			case '+':
-				pi->showsign = '+';
-				fmt++;
-				continue;
-			case '*':
-				fmt++;
-				pi->get_width = nextarg;
-				argt[nextarg++] = PA_INT;
-				continue;
-			case '%':
-				fmt++;
-				break;
-			case '\'':
-				pi->group = 1;
-				fmt++;
-				continue;
-			case '0':
-				/*-
-				 * ``Note that 0 is taken as a flag, not as the
-				 * beginning of a field width.''
-				 *      -- ANSI X3J11
-				 */
-				pi->pad = '0';
-				fmt++;
-				continue;
-			case '1': case '2': case '3':
-			case '4': case '5': case '6':
-			case '7': case '8': case '9':
-				n = 0;
-				while (*fmt != '\0' && is_digit(*fmt)) {
-					n *= 10;
-					n += to_digit(*fmt);
-					fmt++;
-				}
-				if (*fmt == '$') {
-					if (nextarg > maxarg)
-						maxarg = nextarg;
-					nextarg = n;
-					fmt++;
-				} else 
-					pi->width = n;
-				continue;
-			case 'D':
-			case 'O':
-			case 'U':
-				pi->spec += ('a' - 'A');
-				pi->is_intmax = 0;
-				if (pi->is_long_double || pi->is_quad) {
-					pi->is_long = 0;
-					pi->is_long_double = 1;
-				} else {
-					pi->is_long = 1;
-					pi->is_long_double = 0;
-				}
-				fmt++;
-				break;
-			case 'j':
-				pi->is_intmax = 1;
-				fmt++;
-				continue;
-			case 'q':
-				pi->is_long = 0;
-				pi->is_quad = 1;
-				fmt++;
-				continue;
-			case 'L':
-				pi->is_long_double = 1;
-				fmt++;
-				continue;
-			case 'h':
-				fmt++;
-				if (*fmt == 'h') {
-					fmt++;
-					pi->is_char = 1;
-				} else {
-					pi->is_short = 1;
-				}
-				continue;
-			case 'l':
-				fmt++;
-				if (*fmt == 'l') {
-					fmt++;
-					pi->is_long_double = 1;
-					pi->is_quad = 0;
-				} else {
-					pi->is_quad = 0;
-					pi->is_long = 1;
-				}
-				continue;
-			case 't':
-				pi->is_ptrdiff = 1;
-				fmt++;
-				continue;
-			case 'z':
-				pi->is_size = 1;
-				fmt++;
-				continue;
-			default:
-				fmt++;
-				break;
-			}
-			if (printf_tbl[pi->spec].arginfo == NULL)
-				errx(1, "arginfo[%c] = NULL", pi->spec);
-			ch = printf_tbl[pi->spec].arginfo(
-			    pi, __PRINTFMAXARG, &argt[nextarg]);
-			if (ch > 0)
-				pi->arg[0] = &args[nextarg];
-			if (ch > 1)
-				pi->arg[1] = &args[nextarg + 1];
-			nextarg += ch;
-			break;
-		}
-	}
-	if (nextarg > maxarg)
-		maxarg = nextarg;
-#if 0
-	fprintf(stderr, "fmt0 <%s>\n", fmt0);
-	fprintf(stderr, "pil %p\n", pil);
-#endif
-	for (ch = 1; ch < maxarg; ch++) {
-#if 0
-		fprintf(stderr, "arg %d %x\n", ch, argt[ch]);
-#endif
-		switch(argt[ch]) {
-		case PA_CHAR:
-			args[ch].intarg = (char)va_arg (ap, int);
-			break;
-		case PA_INT:
-			args[ch].intarg = va_arg (ap, int);
-			break;
-		case PA_INT | PA_FLAG_SHORT:
-			args[ch].intarg = (short)va_arg (ap, int);
-			break;
-		case PA_INT | PA_FLAG_LONG:
-			args[ch].longarg = va_arg (ap, long);
-			break;
-		case PA_INT | PA_FLAG_INTMAX:
-			args[ch].intmaxarg = va_arg (ap, intmax_t);
-			break;
-		case PA_INT | PA_FLAG_QUAD:
-			args[ch].intmaxarg = va_arg (ap, quad_t);
-			break;
-		case PA_INT | PA_FLAG_LONG_LONG:
-			args[ch].intmaxarg = va_arg (ap, long long);
-			break;
-		case PA_INT | PA_FLAG_SIZE:
-			args[ch].intmaxarg = va_arg (ap, size_t);
-			break;
-		case PA_INT | PA_FLAG_PTRDIFF:
-			args[ch].intmaxarg = va_arg (ap, ptrdiff_t);
-			break;
-		case PA_WCHAR:
-			args[ch].wintarg = va_arg (ap, wint_t);
-			break;
-		case PA_POINTER:
-			args[ch].pvoidarg = va_arg (ap, void *);
-			break;
-		case PA_STRING:
-			args[ch].pchararg = va_arg (ap, char *);
-			break;
-		case PA_WSTRING:
-			args[ch].pwchararg = va_arg (ap, wchar_t *);
-			break;
-		case PA_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			args[ch].doublearg = va_arg (ap, double);
-#endif
-			break;
-		case PA_DOUBLE | PA_FLAG_LONG_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			args[ch].longdoublearg = va_arg (ap, long double);
-#endif
-			break;
-		default:
-			errx(1, "argtype = %x (fmt = \"%s\")\n",
-			    argt[ch], fmt0);
-		}
-	}
-	for (pi = pia; pi < pil; pi++) {
-#if 0
-		fprintf(stderr, "pi %p", pi);
-		fprintf(stderr, " spec '%c'", pi->spec);
-		fprintf(stderr, " args %d",
-		    ((uintptr_t)pi->arg[0] - (uintptr_t)args) / sizeof args[0]);
-		if (pi->width) fprintf(stderr, " width %d", pi->width);
-		if (pi->pad) fprintf(stderr, " pad 0x%x", pi->pad);
-		if (pi->left) fprintf(stderr, " left");
-		if (pi->showsign) fprintf(stderr, " showsign");
-		if (pi->prec != -1) fprintf(stderr, " prec %d", pi->prec);
-		if (pi->is_char) fprintf(stderr, " char");
-		if (pi->is_short) fprintf(stderr, " short");
-		if (pi->is_long) fprintf(stderr, " long");
-		if (pi->is_long_double) fprintf(stderr, " long_double");
-		fprintf(stderr, "\n");
-		fprintf(stderr, "\t\"%.*s\"\n", pi->end - pi->begin, pi->begin);
-#endif
-		if (pi->get_width) {
-			pi->width = args[pi->get_width].intarg;
-			/*-
-			 * ``A negative field width argument is taken as a
-			 * - flag followed by a positive field width.''
-			 *      -- ANSI X3J11
-			 * They don't exclude field widths read from args.
-			 */
-			if (pi->width < 0) {
-				pi->left = 1;
-				pi->width = -pi->width;
-			}
-		}
-		if (pi->get_prec) 
-			pi->prec = args[pi->get_prec].intarg;
-		ret += __printf_puts(&io, pi->begin, pi->end - pi->begin);
-		if (printf_tbl[pi->spec].gnurender != NULL) {
-			__printf_flush(&io);
-			pi->sofar = ret;
-			ret += printf_tbl[pi->spec].gnurender(
-			    fp, pi, (const void *)pi->arg);
-		} else if (printf_tbl[pi->spec].render != NULL) {
-			pi->sofar = ret;
-			n = printf_tbl[pi->spec].render(
-			    &io, pi, (const void *)pi->arg);
-			if (n < 0)
-				io.fp->_flags |= __SERR;
-			else
-				ret += n;
-		} else if (pi->begin == pi->end)
-			errx(1, "render[%c] = NULL", *fmt);
-	}
-	__printf_flush(&io);
-	return (ret);
-}
-
-extern int      __fflush(FILE *fp);
-
-/*
- * Helper function for `fprintf to unbuffered unix file': creates a
- * temporary buffer.  We only work on write-only files; this avoids
- * worries about ungetc buffers and so forth.
- */
-static int
-__v3printf(FILE *fp, const char *fmt, int pct, va_list ap)
-{
-	int ret;
-	FILE fake = FAKE_FILE;
-	unsigned char buf[BUFSIZ];
-
-	/* copy the important variables */
-	fake._flags = fp->_flags & ~__SNBF;
-	fake._file = fp->_file;
-	fake._cookie = fp->_cookie;
-	fake._write = fp->_write;
-	fake._orientation = fp->_orientation;
-	fake._mbstate = fp->_mbstate;
-
-	/* set up the buffer */
-	fake._bf._base = fake._p = buf;
-	fake._bf._size = fake._w = sizeof(buf);
-	fake._lbfsize = 0;	/* not actually used, but Just In Case */
-
-	/* do the work, then copy any error status */
-	ret = __v2printf(&fake, fmt, pct, ap);
-	if (ret >= 0 && __fflush(&fake))
-		ret = EOF;
-	if (fake._flags & __SERR)
-		fp->_flags |= __SERR;
-	return (ret);
-}
-
-int
-__xvprintf(FILE *fp, const char *fmt0, va_list ap)
-{
-	unsigned u;
-	const char *p;
-
-	/* Count number of '%' signs handling double '%' signs */
-	for (p = fmt0, u = 0; *p; p++) {
-		if (*p != '%')
-			continue;
-		u++;
-		if (p[1] == '%')
-			p++;
-	}
-
-	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
-	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-	    fp->_file >= 0)
-		return (__v3printf(fp, fmt0, u, ap));
-	else
-		return (__v2printf(fp, fmt0, u, ap));
-}
-
-/* extending ---------------------------------------------------------*/
-
-int
-register_printf_function(int spec, printf_function *render, printf_arginfo_function *arginfo)
-{
-
-	if (spec > 255 || spec < 0)
-		return (-1);
-	printf_tbl[spec].gnurender = render;
-	printf_tbl[spec].arginfo = arginfo;
-	__use_xprintf = 1;
-	return (0);
-}
-
-int
-register_printf_render(int spec, printf_render *render, printf_arginfo_function *arginfo)
-{
-
-	if (spec > 255 || spec < 0)
-		return (-1);
-	printf_tbl[spec].render = render;
-	printf_tbl[spec].arginfo = arginfo;
-	__use_xprintf = 1;
-	return (0);
-}
-
-int
-register_printf_render_std(const char *specs)
-{
-
-	for (; *specs != '\0'; specs++) {
-		switch (*specs) {
-		case 'H':
-			register_printf_render(*specs,
-			    __printf_render_hexdump,
-			    __printf_arginfo_hexdump);
-			break;
-		case 'M':
-			register_printf_render(*specs,
-			    __printf_render_errno,
-			    __printf_arginfo_errno);
-			break;
-		case 'Q':
-			register_printf_render(*specs,
-			    __printf_render_quote,
-			    __printf_arginfo_quote);
-			break;
-		case 'T':
-			register_printf_render(*specs,
-			    __printf_render_time,
-			    __printf_arginfo_time);
-			break;
-		case 'V':
-			register_printf_render(*specs,
-			    __printf_render_vis,
-			    __printf_arginfo_vis);
-			break;
-		default:
-			return (-1);
-		}
-	}
-	return (0);
-}
-
diff --git a/lib/libc/stdio/xprintf_errno.c b/lib/libc/stdio/xprintf_errno.c
deleted file mode 100644
index 6416f50..0000000
--- a/lib/libc/stdio/xprintf_errno.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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/lib/libc/stdio/xprintf_errno.c,v 1.1.2.1 2006/06/25 07:35:51 phk Exp $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <vis.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "printf.h"
-
-int
-__printf_arginfo_errno(const struct printf_info *pi __unused, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_INT;
-	return (1);
-}
-
-int
-__printf_render_errno(struct __printf_io *io, const struct printf_info *pi __unused, const void *const *arg)
-{
-	int ret, error;
-	char buf[64];
-	const char *p;
-
-	ret = 0;
-	error = *((const int *)arg[0]);
-	if (error >= 0 && error < sys_nerr) {
-		p = strerror(error);
-		return (__printf_out(io, pi, p, strlen(p)));
-	}
-	sprintf(buf, "errno=%d/0x%x", error, error);
-	ret += __printf_out(io, pi, buf, strlen(buf));
-	__printf_flush(io);
-	return(ret);
-}
diff --git a/lib/libc/stdio/xprintf_float.c b/lib/libc/stdio/xprintf_float.c
deleted file mode 100644
index cf3c7c5..0000000
--- a/lib/libc/stdio/xprintf_float.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: src/lib/libc/stdio/xprintf_float.c,v 1.1.2.1 2006/06/25 07:35:51 phk Exp $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <assert.h>
-#include <locale.h>
-#include <limits.h>
-
-#define	dtoa		__dtoa
-#define	freedtoa	__freedtoa
-
-#include <float.h>
-#include <math.h>
-#include "gdtoa.h"
-#include "floatio.h"
-#include "printf.h"
-#include <un-namespace.h>
-
-/*
- * The size of the buffer we use as scratch space for integer
- * conversions, among other things.  Technically, we would need the
- * most space for base 10 conversions with thousands' grouping
- * characters between each pair of digits.  100 bytes is a
- * conservative overestimate even for a 128-bit uintmax_t.
- */
-#define	BUF	100
-
-#define	DEFPREC		6	/* Default FP precision */
-
-
-/* various globals ---------------------------------------------------*/
-
-
-/* padding function---------------------------------------------------*/
-
-#define	PRINTANDPAD(p, ep, len, with) do {		\
-	n2 = (ep) - (p);       				\
-	if (n2 > (len))					\
-		n2 = (len);				\
-	if (n2 > 0)					\
-		ret += __printf_puts(io, (p), n2);		\
-	ret += __printf_pad(io, (len) - (n2 > 0 ? n2 : 0), (with));	\
-} while(0)
-
-/* misc --------------------------------------------------------------*/
-
-#define	to_char(n)	((n) + '0')
-
-static int
-exponent(char *p0, int expo, int fmtch)
-{
-	char *p, *t;
-	char expbuf[MAXEXPDIG];
-
-	p = p0;
-	*p++ = fmtch;
-	if (expo < 0) {
-		expo = -expo;
-		*p++ = '-';
-	}
-	else
-		*p++ = '+';
-	t = expbuf + MAXEXPDIG;
-	if (expo > 9) {
-		do {
-			*--t = to_char(expo % 10);
-		} while ((expo /= 10) > 9);
-		*--t = to_char(expo);
-		for (; t < expbuf + MAXEXPDIG; *p++ = *t++)
-			;
-	}
-	else {
-		/*
-		 * Exponents for decimal floating point conversions
-		 * (%[eEgG]) must be at least two characters long,
-		 * whereas exponents for hexadecimal conversions can
-		 * be only one character long.
-		 */
-		if (fmtch == 'e' || fmtch == 'E')
-			*p++ = '0';
-		*p++ = to_char(expo);
-	}
-	return (p - p0);
-}
-
-/* 'f' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_float(const struct printf_info *pi, size_t n, int *argt)
-{
-	assert (n > 0);
-	argt[0] = PA_DOUBLE;
-	if (pi->is_long_double)
-		argt[0] |= PA_FLAG_LONG_DOUBLE;
-	return (1);
-}
-
-/*
- * We can decompose the printed representation of floating
- * point numbers into several parts, some of which may be empty:
- *
- * [+|-| ] [0x|0X] MMM . NNN [e|E|p|P] [+|-] ZZ
- *    A       B     ---C---      D       E   F
- *
- * A:	'sign' holds this value if present; '\0' otherwise
- * B:	ox[1] holds the 'x' or 'X'; '\0' if not hexadecimal
- * C:	cp points to the string MMMNNN.  Leading and trailing
- *	zeros are not in the string and must be added.
- * D:	expchar holds this character; '\0' if no exponent, e.g. %f
- * F:	at least two digits for decimal, at least one digit for hex
- */
-
-int
-__printf_render_float(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	int prec;		/* precision from format; <0 for N/A */
-	char *dtoaresult;	/* buffer allocated by dtoa */
-	char expchar;		/* exponent character: [eEpP\0] */
-	char *cp;
-	int expt;		/* integer value of exponent */
-	int signflag;		/* true if float is negative */
-	char *dtoaend;		/* pointer to end of converted digits */
-	char sign;		/* sign prefix (' ', '+', '-', or \0) */
-	int size;		/* size of converted field or string */
-	int ndig;		/* actual number of digits returned by dtoa */
-	int expsize;		/* character count for expstr */
-	char expstr[MAXEXPDIG+2];	/* buffer for exponent string: e+ZZZ */
-	int nseps;		/* number of group separators with ' */
-	int nrepeats;		/* number of repeats of the last group */
-	const char *grouping;	/* locale specific numeric grouping rules */
-	int lead;		/* sig figs before decimal or group sep */
-	long double ld;
-	double d;
-	int realsz;		/* field size expanded by dprec, sign, etc */
-	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
-	char ox[2];		/* space for 0x; ox[1] is either x, X, or \0 */
-	int prsize;             /* max size of printed field */
-	int ret;		/* return value accumulator */
-	char *decimal_point;	/* locale specific decimal point */
-	int n2;			/* XXX: for PRINTANDPAD */
-	char thousands_sep;	/* locale specific thousands separator */
-	char buf[BUF];		/* buffer with space for digits of uintmax_t */
-	const char *xdigs;
-	int flag;
-
-	prec = pi->prec;
-	ox[1] = '\0';
-	sign = pi->showsign;
-	flag = 0;
-	ret = 0;
-
-	thousands_sep = *(localeconv()->thousands_sep);
-	grouping = NULL;
-	if (pi->alt)
-		grouping = localeconv()->grouping;
-	decimal_point = localeconv()->decimal_point;
-	dprec = -1;
-
-	switch(pi->spec) {
-	case 'a':
-	case 'A':
-		if (pi->spec == 'a') {
-			ox[1] = 'x';
-			xdigs = __lowercase_hex;
-			expchar = 'p';
-		} else {
-			ox[1] = 'X';
-			xdigs = __uppercase_hex;
-			expchar = 'P';
-		}
-		if (prec >= 0)
-			prec++;
-		if (pi->is_long_double) {
-			ld = *((long double *)arg[0]);
-			dtoaresult = cp =
-			    __hldtoa(ld, xdigs, prec,
-			    &expt, &signflag, &dtoaend);
-		} else {
-			d = *((double *)arg[0]);
-			dtoaresult = cp =
-			    __hdtoa(d, xdigs, prec,
-			    &expt, &signflag, &dtoaend);
-		}
-		if (prec < 0)
-			prec = dtoaend - cp;
-		if (expt == INT_MAX)
-			ox[1] = '\0';
-		goto fp_common;
-	case 'e':
-	case 'E':
-		expchar = pi->spec;
-		if (prec < 0)	/* account for digit before decpt */
-			prec = DEFPREC + 1;
-		else
-			prec++;
-		break;
-	case 'f':
-	case 'F':
-		expchar = '\0';
-		break;
-	case 'g':
-	case 'G':
-		expchar = pi->spec - ('g' - 'e');
-		if (prec == 0)
-			prec = 1;
-		break;
-	default:
-		assert(pi->spec == 'f');
-	}
-
-	if (prec < 0)
-		prec = DEFPREC;
-	if (pi->is_long_double) {
-		ld = *((long double *)arg[0]);
-		dtoaresult = cp =
-		    __ldtoa(&ld, expchar ? 2 : 3, prec,
-		    &expt, &signflag, &dtoaend);
-	} else {
-		d = *((double *)arg[0]);
-		dtoaresult = cp =
-		    dtoa(d, expchar ? 2 : 3, prec,
-		    &expt, &signflag, &dtoaend);
-		if (expt == 9999)
-			expt = INT_MAX;
-	}
-fp_common:
-	if (signflag)
-		sign = '-';
-	if (expt == INT_MAX) {	/* inf or nan */
-		if (*cp == 'N') {
-			cp = (pi->spec >= 'a') ? "nan" : "NAN";
-			sign = '\0';
-		} else
-			cp = (pi->spec >= 'a') ? "inf" : "INF";
-		size = 3;
-		flag = 1;
-		goto here;
-	}
-	ndig = dtoaend - cp;
-	if (pi->spec == 'g' || pi->spec == 'G') {
-		if (expt > -4 && expt <= prec) {
-			/* Make %[gG] smell like %[fF] */
-			expchar = '\0';
-			if (pi->alt)
-				prec -= expt;
-			else
-				prec = ndig - expt;
-			if (prec < 0)
-				prec = 0;
-		} else {
-			/*
-			 * Make %[gG] smell like %[eE], but
-			 * trim trailing zeroes if no # flag.
-			 */
-			if (!pi->alt)
-				prec = ndig;
-		}
-	}
-	if (expchar) {
-		expsize = exponent(expstr, expt - 1, expchar);
-		size = expsize + prec;
-		if (prec > 1 || pi->alt)
-			++size;
-	} else {
-		/* space for digits before decimal point */
-		if (expt > 0)
-			size = expt;
-		else	/* "0" */
-			size = 1;
-		/* space for decimal pt and following digits */
-		if (prec || pi->alt)
-			size += prec + 1;
-		if (grouping && expt > 0) {
-			/* space for thousands' grouping */
-			nseps = nrepeats = 0;
-			lead = expt;
-			while (*grouping != CHAR_MAX) {
-				if (lead <= *grouping)
-					break;
-				lead -= *grouping;
-				if (*(grouping+1)) {
-					nseps++;
-					grouping++;
-				} else
-					nrepeats++;
-			}
-			size += nseps + nrepeats;
-		} else
-			lead = expt;
-	}
-
-here:
-	/*
-	 * All reasonable formats wind up here.  At this point, `cp'
-	 * points to a string which (if not flags&LADJUST) should be
-	 * padded out to `width' places.  If flags&ZEROPAD, it should
-	 * first be prefixed by any sign or other prefix; otherwise,
-	 * it should be blank padded before the prefix is emitted.
-	 * After any left-hand padding and prefixing, emit zeroes
-	 * required by a decimal [diouxX] precision, then print the
-	 * string proper, then emit zeroes required by any leftover
-	 * floating precision; finally, if LADJUST, pad with blanks.
-	 *
-	 * Compute actual size, so we know how much to pad.
-	 * size excludes decimal prec; realsz includes it.
-	 */
-	realsz = dprec > size ? dprec : size;
-	if (sign)
-		realsz++;
-	if (ox[1])
-		realsz += 2;
-
-	prsize = pi->width > realsz ? pi->width : realsz;
-
-	/* right-adjusting blank padding */
-	if (pi->pad != '0' && pi->left == 0)
-		ret += __printf_pad(io, pi->width - realsz, 0);
-
-	/* prefix */
-	if (sign)
-		ret += __printf_puts(io, &sign, 1);
-
-	if (ox[1]) {	/* ox[1] is either x, X, or \0 */
-		ox[0] = '0';
-		ret += __printf_puts(io, ox, 2);
-	}
-
-	/* right-adjusting zero padding */
-	if (pi->pad == '0' && pi->left == 0)
-		ret += __printf_pad(io, pi->width - realsz, 1);
-
-	/* leading zeroes from decimal precision */
-	ret += __printf_pad(io, dprec - size, 1);
-
-	if (flag)
-		ret += __printf_puts(io, cp, size);
-	else {
-		/* glue together f_p fragments */
-		if (!expchar) {	/* %[fF] or sufficiently short %[gG] */
-			if (expt <= 0) {
-				ret += __printf_puts(io, "0", 1);
-				if (prec || pi->alt)
-					ret += __printf_puts(io, decimal_point, 1);
-				ret += __printf_pad(io, -expt, 1);
-				/* already handled initial 0's */
-				prec += expt;
-			} else {
-				PRINTANDPAD(cp, dtoaend, lead, 1);
-				cp += lead;
-				if (grouping) {
-					while (nseps>0 || nrepeats>0) {
-						if (nrepeats > 0)
-							nrepeats--;
-						else {
-							grouping--;
-							nseps--;
-						}
-						ret += __printf_puts(io, &thousands_sep, 1);
-						PRINTANDPAD(cp,dtoaend,
-						    *grouping, 1);
-						cp += *grouping;
-					}
-					if (cp > dtoaend)
-						cp = dtoaend;
-				}
-				if (prec || pi->alt)
-					ret += __printf_puts(io, decimal_point,1);
-			}
-			PRINTANDPAD(cp, dtoaend, prec, 1);
-		} else {	/* %[eE] or sufficiently long %[gG] */
-			if (prec > 1 || pi->alt) {
-				buf[0] = *cp++;
-				buf[1] = *decimal_point;
-				ret += __printf_puts(io, buf, 2);
-				ret += __printf_puts(io, cp, ndig-1);
-				ret += __printf_pad(io, prec - ndig, 1);
-			} else	/* XeYYY */
-				ret += __printf_puts(io, cp, 1);
-			ret += __printf_puts(io, expstr, expsize);
-		}
-	}
-	/* left-adjusting padding (always blank) */
-	if (pi->left)
-		ret += __printf_pad(io, pi->width - realsz, 0);
-
-	__printf_flush(io);
-	if (dtoaresult != NULL)
-		freedtoa(dtoaresult);
-
-	return (ret);
-}
diff --git a/lib/libc/stdio/xprintf_hexdump.c b/lib/libc/stdio/xprintf_hexdump.c
deleted file mode 100644
index 57e6e58..0000000
--- a/lib/libc/stdio/xprintf_hexdump.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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/lib/libc/stdio/xprintf_hexdump.c,v 1.1.2.1 2006/06/25 07:35:51 phk Exp $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <stdint.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "printf.h"
-
-int
-__printf_arginfo_hexdump(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert(n >= 2);
-	argt[0] = PA_POINTER;
-	argt[1] = PA_INT;
-	return (2);
-}
-
-int
-__printf_render_hexdump(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	unsigned char *p;
-	unsigned u, l, j, a;
-	char buf[100], *q;
-	int ret;
-
-	if (pi->width > 0 && pi->width < 16)
-		l = pi->width;
-	else
-		l = 16;
-	p = *((unsigned char **)arg[0]);
-	u = *((unsigned *)arg[1]);
-
-	ret = 0;
-	a = 0;
-	while (u > 0) {
-		q = buf;
-		if (pi->showsign)
-			q += sprintf(q, " %04x", a);
-		for (j = 0; j < l && j < u; j++)
-			q += sprintf(q, " %02x", p[j]);
-		if (pi->alt) {
-			for (; j < l; j++)
-				q += sprintf(q, "   ");
-			q += sprintf(q, "  |");
-			for (j = 0; j < l && j < u; j++) {
-				if (p[j] < ' ' || p[j] > '~')
-					*q++ = '.';
-				else
-					*q++ = p[j];
-			}
-			for (; j < l; j++)
-				*q++ = ' ';
-			*q++ = '|';
-		}
-		if (l < u)
-			j = l;
-		else
-			j = u;
-		p += j;
-		u -= j;
-		a += j;
-		if (u > 0)
-			*q++ = '\n';
-		ret += __printf_puts(io, buf + 1, q - (buf + 1));
-		__printf_flush(io);
-	}
-	return (ret);
-}
diff --git a/lib/libc/stdio/xprintf_int.c b/lib/libc/stdio/xprintf_int.c
deleted file mode 100644
index 1a6ab04..0000000
--- a/lib/libc/stdio/xprintf_int.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: src/lib/libc/stdio/xprintf_int.c,v 1.2.2.1 2006/06/25 07:35:51 phk Exp $
- */
-
-#include <namespace.h>
-#include <err.h>
-#include <sys/types.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdint.h>
-#include <assert.h>
-#include <namespace.h>
-#include <string.h>
-#include <wchar.h>
-#include <un-namespace.h>
-
-#include "printf.h"
-
-/* private stuff -----------------------------------------------------*/
-
-union arg {
-	int			intarg;
-	u_int			uintarg;
-	long			longarg;
-	u_long			ulongarg;
-	intmax_t 		intmaxarg;
-	uintmax_t 		uintmaxarg;
-};
-
-/*
- * Macros for converting digits to letters and vice versa
- */
-#define	to_char(n)	((n) + '0')
-
-/* various globals ---------------------------------------------------*/
-
-/*
- * The size of the buffer we use for integer conversions.
- * Technically, we would need the most space for base 10
- * conversions with thousands' grouping characters between
- * each pair of digits: 60 digits for 128 bit intmax_t.
- * Use a bit more for better alignment of stuff.
- */
-#define	BUF	64
-
-/* misc --------------------------------------------------------------*/
-
-/*
- * Convert an unsigned long to ASCII for printf purposes, returning
- * a pointer to the first character of the string representation.
- * Octal numbers can be forced to have a leading zero; hex numbers
- * use the given digits.
- */
-static char *
-__ultoa(u_long val, char *endp, int base, const char *xdigs,
-	int needgrp, char thousep, const char *grp)
-{
-	char *cp = endp;
-	long sval;
-	int ndig;
-
-	/*
-	 * Handle the three cases separately, in the hope of getting
-	 * better/faster code.
-	 */
-	switch (base) {
-	case 10:
-		if (val < 10) {	/* many numbers are 1 digit */
-			*--cp = to_char(val);
-			return (cp);
-		}
-		ndig = 0;
-		/*
-		 * On many machines, unsigned arithmetic is harder than
-		 * signed arithmetic, so we do at most one unsigned mod and
-		 * divide; this is sufficient to reduce the range of
-		 * the incoming value to where signed arithmetic works.
-		 */
-		if (val > LONG_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp && ndig == *grp && *grp != CHAR_MAX
-					&& sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:			/* oops */
-		assert(base == 16);
-	}
-	return (cp);
-}
-
-
-/* Identical to __ultoa, but for intmax_t. */
-static char *
-__ujtoa(uintmax_t val, char *endp, int base, const char *xdigs, 
-	int needgrp, char thousep, const char *grp)
-{
-	char *cp = endp;
-	intmax_t sval;
-	int ndig;
-
-	switch (base) {
-	case 10:
-		if (val < 10) {
-			*--cp = to_char(val % 10);
-			return (cp);
-		}
-		ndig = 0;
-		if (val > INTMAX_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp && *grp != CHAR_MAX && ndig == *grp
-					&& sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:
-		abort();
-	}
-	return (cp);
-}
-
-
-/* 'd' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_int(const struct printf_info *pi, size_t n, int *argt)
-{
-	assert (n > 0);
-	argt[0] = PA_INT;
-	if (pi->is_ptrdiff)
-		argt[0] |= PA_FLAG_PTRDIFF;
-	else if (pi->is_size)
-		argt[0] |= PA_FLAG_SIZE;
-	else if (pi->is_long)
-		argt[0] |= PA_FLAG_LONG;
-	else if (pi->is_intmax)
-		argt[0] |= PA_FLAG_INTMAX;
-	else if (pi->is_quad)
-		argt[0] |= PA_FLAG_QUAD;
-	else if (pi->is_long_double)
-		argt[0] |= PA_FLAG_LONG_LONG;
-	else if (pi->is_short)
-		argt[0] |= PA_FLAG_SHORT;
-	else if (pi->is_char)
-		argt[0] = PA_CHAR;
-	return (1);
-}
-
-int
-__printf_render_int(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	const union arg *argp;
-	char buf[BUF];
-	char *p, *pe;
-	char ns, l;
-	int rdx, sign, zext, ngrp;
-	const char *nalt, *digit;
-	char thousands_sep;	/* locale specific thousands separator */
-	const char *grouping;	/* locale specific numeric grouping rules */
-	uintmax_t uu;
-	int ret;
-
-	ret = 0;
-	nalt = NULL;
-	digit = __lowercase_hex;
-	ns = '\0';
-	pe = buf + sizeof buf - 1;
-
-	if (pi->group) {
-		thousands_sep = *(localeconv()->thousands_sep);
-		grouping = localeconv()->grouping;
-		ngrp = 1;
-	} else {
-		thousands_sep = 0;
-		grouping = NULL;
-		ngrp = 0;
-	}
-
-	switch(pi->spec) {
-	case 'd':
-	case 'i':
-		rdx = 10;
-		sign = 1;
-		break;
-	case 'X':
-		digit = __uppercase_hex;
-		/*FALLTHOUGH*/
-	case 'x':
-		rdx = 16;
-		sign = 0;
-		break;
-	case 'u':
-	case 'U':
-		rdx = 10;
-		sign = 0;
-		break;
-	case 'o':
-	case 'O':
-		rdx = 8;
-		sign = 0;
-		break;
-	default:
-		fprintf(stderr, "pi->spec = '%c'\n", pi->spec);
-		assert(1 == 0);
-	}
-	argp = arg[0];
-
-	if (sign)
-		ns = pi->showsign;
-
-	if (pi->is_long_double || pi->is_quad || pi->is_intmax ||
-	    pi->is_size || pi->is_ptrdiff) {
-		if (sign && argp->intmaxarg < 0) {
-			uu = -argp->intmaxarg;
-			ns = '-';
-		} else
-			uu = argp->uintmaxarg;
-	} else if (pi->is_long) {
-		if (sign && argp->longarg < 0) {
-			uu = (u_long)-argp->longarg;
-			ns = '-';
-		} else 
-			uu = argp->ulongarg;
-	} else if (pi->is_short) {
-		if (sign && (short)argp->intarg < 0) {
-			uu = -(short)argp->intarg;
-			ns = '-';
-		} else 
-			uu = (unsigned short)argp->uintarg;
-	} else if (pi->is_char) {
-		if (sign && (signed char)argp->intarg < 0) {
-			uu = -(signed char)argp->intarg;
-			ns = '-';
-		} else 
-			uu = (unsigned char)argp->uintarg;
-	} else {
-		if (sign && argp->intarg < 0) {
-			uu = (unsigned)-argp->intarg;
-			ns = '-';
-		} else
-			uu = argp->uintarg;
-	}
-	if (uu <= ULONG_MAX)
-		p = __ultoa(uu, pe, rdx, digit, ngrp, thousands_sep, grouping);
-	else
-		p = __ujtoa(uu, pe, rdx, digit, ngrp, thousands_sep, grouping);
-
-	l = 0;
-	if (uu == 0) {
-		/*-
-		 * ``The result of converting a zero value with an
-		 * explicit precision of zero is no characters.''
-		 *      -- ANSI X3J11
-		 *
-		 * ``The C Standard is clear enough as is.  The call
-		 * printf("%#.0o", 0) should print 0.''
-		 *      -- Defect Report #151
-		 */
-			;
-		if (pi->prec == 0 && !(pi->alt && rdx == 8))
-			p = pe;
-	} else if (pi->alt) {
-		if (rdx == 8) 
-			*--p = '0';
-		if (rdx == 16) {
-			if (pi->spec == 'x')
-				nalt = "0x";
-			else
-				nalt = "0X";
-			l += 2;
-		}
-	}
-	l += pe - p;
-	if (ns)
-		l++;
-
-	/*-
-	 * ``... diouXx conversions ... if a precision is
-	 * specified, the 0 flag will be ignored.''
-	 *      -- ANSI X3J11
-	 */
-	if (pi->prec > (pe - p))
-		zext = pi->prec - (pe - p);
-	else if (pi->prec != -1)
-		zext = 0;
-	else if (pi->pad == '0' && pi->width > l && !pi->left)
-		zext = pi->width - l;
-	else
-		zext = 0;
-
-	l += zext;
-
-	while (zext > 0 && p > buf) {
-		*--p = '0';
-		zext--;
-	}
-
-	if (l < BUF) {
-		if (ns) {
-			*--p = ns;
-		} else if (nalt != NULL) {
-			*--p = nalt[1];
-			*--p = nalt[0];
-		}
-		if (pi->width > (pe - p) && !pi->left) {
-			l = pi->width - (pe - p);
-			while (l > 0 && p > buf) {
-				*--p = ' ';
-				l--;
-			}
-			if (l)
-				ret += __printf_pad(io, l, 0);
-		}
-	} else {
-		if (!pi->left && pi->width > l)
-			ret += __printf_pad(io, pi->width - l, 0);
-		if (ns != '\0')
-			ret += __printf_puts(io, &ns, 1);
-		else if (nalt != NULL)
-			ret += __printf_puts(io, nalt, 2);
-		if (zext > 0)
-			ret += __printf_pad(io, zext, 1);
-	}
-	
-	ret += __printf_puts(io, p, pe - p);
-	if (pi->width > ret && pi->left) 
-		ret += __printf_pad(io, pi->width - ret, 0);
-	__printf_flush(io);
-	return (ret);
-}
-
-/* 'p' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_ptr(const struct printf_info *pi __unused, size_t n, int *argt)
-{
-
-	assert (n > 0);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-
-int
-__printf_render_ptr(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	struct printf_info p2;
-	uintmax_t u;
-	const void *p;
-
-	/*-
-	 * ``The argument shall be a pointer to void.  The
-	 * value of the pointer is converted to a sequence
-	 * of printable characters, in an implementation-
-	 * defined manner.''
-	 *      -- ANSI X3J11
-	 */
-	u = (uintmax_t)(uintptr_t) *((void **)arg[0]);
-	p2 = *pi;
-
-	p2.spec = 'x';
-	p2.alt = 1;
-	p2.is_long_double = 1;
-	p = &u;
-	return (__printf_render_int(io, &p2, &p));
-}
diff --git a/lib/libc/stdio/xprintf_quote.c b/lib/libc/stdio/xprintf_quote.c
deleted file mode 100644
index 6f7176b..0000000
--- a/lib/libc/stdio/xprintf_quote.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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/lib/libc/stdio/xprintf_quote.c,v 1.2.2.1 2006/06/25 07:35:51 phk Exp $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <wchar.h>
-#include <vis.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "printf.h"
-
-int
-__printf_arginfo_quote(const struct printf_info *pi __unused, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-
-int
-__printf_render_quote(struct __printf_io *io, const struct printf_info *pi __unused, const void *const *arg)
-{
-	const char *str, *p, *t, *o;
-	char r[5];
-	int i, ret;
-
-	str = *((const char *const *)arg[0]);
-	if (str == NULL)
-		return (__printf_out(io, pi, "\"(null)\"", 8));
-	if (*str == '\0')
-		return (__printf_out(io, pi, "\"\"", 2));
-
-	for (i = 0, p = str; *p; p++)
-		if (isspace(*p) || *p == '\\' || *p == '"')
-			i++;
-	if (!i) 
-		return (__printf_out(io, pi, str, strlen(str)));
-	
-	ret = __printf_out(io, pi, "\"", 1);
-	for (t = p = str; *p; p++) {
-		o = NULL;
-		if (*p == '\\')
-			o = "\\\\";
-		else if (*p == '\n')
-			o = "\\n";
-		else if (*p == '\r')
-			o = "\\r";
-		else if (*p == '\t')
-			o = "\\t";
-		else if (*p == ' ')
-			o = " ";
-		else if (*p == '"')
-			o = "\\\"";
-		else if (isspace(*p)) {
-			sprintf(r, "\\%03o", *p);
-			o = r;
-		} else
-			continue;
-		if (p != t)
-			ret += __printf_out(io, pi, t, p - t);
-		ret += __printf_out(io, pi, o, strlen(o));
-		t = p + 1;
-	}
-	if (p != t)
-		ret += __printf_out(io, pi, t, p - t);
-	ret += __printf_out(io, pi, "\"", 1);
-	__printf_flush(io);
-	return(ret);
-}
diff --git a/lib/libc/stdio/xprintf_str.c b/lib/libc/stdio/xprintf_str.c
deleted file mode 100644
index ec11596..0000000
--- a/lib/libc/stdio/xprintf_str.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: src/lib/libc/stdio/xprintf_str.c,v 1.1.2.1 2006/06/25 07:35:51 phk Exp $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <stdint.h>
-#include <assert.h>
-#include <wchar.h>
-#include "printf.h"
-
-/*
- * Convert a wide character string argument for the %ls format to a multibyte
- * string representation. If not -1, prec specifies the maximum number of
- * bytes to output, and also means that we can't assume that the wide char.
- * string ends is null-terminated.
- */
-static char *
-__wcsconv(wchar_t *wcsarg, int prec)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char buf[MB_LEN_MAX];
-	wchar_t *p;
-	char *convbuf;
-	size_t clen, nbytes;
-
-	/* Allocate space for the maximum number of bytes we could output. */
-	if (prec < 0) {
-		p = wcsarg;
-		mbs = initial;
-		nbytes = wcsrtombs(NULL, (const wchar_t **)&p, 0, &mbs);
-		if (nbytes == (size_t)-1)
-			return (NULL);
-	} else {
-		/*
-		 * Optimisation: if the output precision is small enough,
-		 * just allocate enough memory for the maximum instead of
-		 * scanning the string.
-		 */
-		if (prec < 128)
-			nbytes = prec;
-		else {
-			nbytes = 0;
-			p = wcsarg;
-			mbs = initial;
-			for (;;) {
-				clen = wcrtomb(buf, *p++, &mbs);
-				if (clen == 0 || clen == (size_t)-1 ||
-				    (int)(nbytes + clen) > prec)
-					break;
-				nbytes += clen;
-			}
-		}
-	}
-	if ((convbuf = malloc(nbytes + 1)) == NULL)
-		return (NULL);
-
-	/* Fill the output buffer. */
-	p = wcsarg;
-	mbs = initial;
-	if ((nbytes = wcsrtombs(convbuf, (const wchar_t **)&p,
-	    nbytes, &mbs)) == (size_t)-1) {
-		free(convbuf);
-		return (NULL);
-	}
-	convbuf[nbytes] = '\0';
-	return (convbuf);
-}
-
-
-/* 's' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_str(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert (n > 0);
-	if (pi->is_long || pi->spec == 'C')
-		argt[0] = PA_WSTRING;
-	else
-		argt[0] = PA_STRING;
-	return (1);
-}
-
-int
-__printf_render_str(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	const char *p;
-	wchar_t *wcp;
-	char *convbuf;
-	int l;
-
-	if (pi->is_long || pi->spec == 'S') {
-		wcp = *((wint_t **)arg[0]);
-		if (wcp == NULL)
-			return (__printf_out(io, pi, "(null)", 6));
-		convbuf = __wcsconv(wcp, pi->prec);
-		if (convbuf == NULL) 
-			return (-1);
-		l = __printf_out(io, pi, convbuf, strlen(convbuf));
-		free(convbuf);
-		return (l);
-	} 
-	p = *((char **)arg[0]);
-	if (p == NULL)
-		return (__printf_out(io, pi, "(null)", 6));
-	l = strlen(p);
-	if (pi->prec >= 0 && pi->prec < l)
-		l = pi->prec;
-	return (__printf_out(io, pi, p, l));
-}
-
-/* 'c' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_chr(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert (n > 0);
-	if (pi->is_long || pi->spec == 'C')
-		argt[0] = PA_WCHAR;
-	else
-		argt[0] = PA_INT;
-	return (1);
-}
-
-int
-__printf_render_chr(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	int i;
-	wint_t ii;
-	unsigned char c;
-	static const mbstate_t initial;		/* XXX: this is bogus! */
-	mbstate_t mbs;
-	size_t mbseqlen;
-	char buf[MB_CUR_MAX];
-
-	if (pi->is_long || pi->spec == 'C') {
-		ii = *((wint_t *)arg[0]);
-
-		mbs = initial;
-		mbseqlen = wcrtomb(buf, (wchar_t)ii, &mbs);
-		if (mbseqlen == (size_t) -1)
-			return (-1);
-		return (__printf_out(io, pi, buf, mbseqlen));
-	}
-	i = *((int *)arg[0]);
-	c = i;
-	i = __printf_out(io, pi, &c, 1);
-	__printf_flush(io);
-	return (i);
-}
diff --git a/lib/libc/stdio/xprintf_time.c b/lib/libc/stdio/xprintf_time.c
deleted file mode 100644
index 559e190..0000000
--- a/lib/libc/stdio/xprintf_time.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: src/lib/libc/stdio/xprintf_time.c,v 1.3.2.1 2006/06/25 07:35:51 phk Exp $
- */
-#include <namespace.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <stdint.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "printf.h"
-
-int
-__printf_arginfo_time(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-#define MINUTE 60
-#define HOUR	(60 * MINUTE)
-#define DAY	(24 * HOUR)
-#define YEAR	(365 * DAY)
-
-int
-__printf_render_time(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	char buf[100];
-	char *p;
-	struct timeval *tv;
-	struct timespec *ts;
-	time_t *tp;
-	intmax_t t, tx;
-	int i, prec, nsec;
-
-	prec = 0;
-	if (pi->is_long) {
-		tv = *((struct timeval **)arg[0]);
-		t = tv->tv_sec;
-		nsec = tv->tv_usec * 1000;
-		prec = 6;
-	} else if (pi->is_long_double) {
-		ts = *((struct timespec **)arg[0]);
-		t = ts->tv_sec;
-		nsec = ts->tv_nsec;
-		prec = 9;
-	} else {
-		tp = *((time_t **)arg[0]);
-		t = *tp;
-	}
-
-	p = buf;
-	if (pi->alt) {
-		tx = t;
-		if (t >= YEAR) {
-			p += sprintf(p, "%jdy", t / YEAR);
-			t %= YEAR;
-		}
-		if (t >= DAY && t != 0) {
-			p += sprintf(p, "%jdd", t / DAY);
-			t %= DAY;
-		}
-		if (t >= HOUR && t != 0) {
-			p += sprintf(p, "%jdh", t / HOUR);
-			t %= HOUR;
-		}
-		if (t >= MINUTE && t != 0) {
-			p += sprintf(p, "%jdm", t / MINUTE);
-			t %= MINUTE;
-		}
-		if (t != 0 || tx == 0)
-			p += sprintf(p, "%jds", t);
-	} else  {
-		p += sprintf(p, "%jd", (intmax_t)t);
-	}
-	if (pi->is_long || pi->is_long_double) {
-		if (pi->prec >= 0) 
-			prec = pi->prec;
-		for (i = prec; i < 9; i++)
-			nsec /= 10;
-		p += sprintf(p, ".%.*d", prec, nsec);
-	}
-	return(__printf_out(io, pi, buf, p - buf));
-}
diff --git a/lib/libc/stdio/xprintf_vis.c b/lib/libc/stdio/xprintf_vis.c
deleted file mode 100644
index 08d8db0..0000000
--- a/lib/libc/stdio/xprintf_vis.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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/lib/libc/stdio/xprintf_vis.c,v 1.2.2.1 2006/06/25 07:35:51 phk Exp $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <vis.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "printf.h"
-
-int
-__printf_arginfo_vis(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-
-int
-__printf_render_vis(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	char *p, *buf;
-	unsigned l;
-	int ret;
-
-	ret = 0;
-	p = *((char **)arg[0]);
-	if (p == NULL)
-		return (__printf_out(io, pi, "(null)", 6));
-	if (pi->prec >= 0)
-		l = pi->prec;
-	else
-		l = strlen(p);
-	buf = malloc(l * 4 + 1);
-	if (buf == NULL)
-		return (-1);
-	if (pi->showsign)
-		ret = strvisx(buf, p, l, VIS_WHITE | VIS_HTTPSTYLE);
-	else if (pi->pad == '0')
-		ret = strvisx(buf, p, l, VIS_WHITE | VIS_OCTAL);
-	else if (pi->alt)
-		ret = strvisx(buf, p, l, VIS_WHITE);
-	else
-		ret = strvisx(buf, p, l, VIS_WHITE | VIS_CSTYLE | VIS_OCTAL);
-	ret += __printf_out(io, pi, buf, ret);
-	__printf_flush(io);
-	free(buf);
-	return(ret);
-}
diff --git a/lib/libc/stdlib/Makefile b/lib/libc/stdlib/Makefile
deleted file mode 100644
index 755c409..0000000
--- a/lib/libc/stdlib/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Objects
-OBJS = _Exit.o a64l.o abort.o atexit.o atof.o atoi.o atol.o atoll.o bsearch.o calloc.o exit.o getenv.o getopt.o getopt_long.o getsubopt.o grantpt.o hcreate.o heapsort.o imaxabs.o imaxdiv.o insque.o l64a.o llabs.o lldiv.o lsearch.o malloc.o merge.o putenv.o qsort.o qsort_r.o radixsort.o rand.o random.o reallocf.o realpath.o remque.o setenv.o strfmon.o strtoimax.o strtol.o strtoll.o strtonum.o strtoq.o strtoul.o strtoull.o strtoumax.o strtouq.o system.o tdelete.o tfind.o tsearch.o twalk.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/stdlib/_Exit.c b/lib/libc/stdlib/_Exit.c
deleted file mode 100644
index 3a2e94e..0000000
--- a/lib/libc/stdlib/_Exit.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is in the public domain.  Written by Garrett A. Wollman,
- * 2002-09-07.
- *
- * $FreeBSD: src/lib/libc/stdlib/_Exit.c,v 1.1 2002/09/10 02:04:49 wollman Exp $
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-
-/*
- * ISO C99 added this function to provide for Standard C applications
- * which needed something like POSIX _exit().  A new interface was created
- * in case it turned out that _exit() was insufficient to meet the
- * requirements of ISO C.  (That's probably not the case, but here
- * is where you would put the extra code if it were.)
- */
-void
-_Exit(int code)
-{
-	_exit(code);
-}
diff --git a/lib/libc/stdlib/a64l.c b/lib/libc/stdlib/a64l.c
deleted file mode 100644
index 493deda..0000000
--- a/lib/libc/stdlib/a64l.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: a64l.c,v 1.8 2000/01/22 22:19:19 mycroft Exp $");
-#endif /* not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/a64l.c,v 1.1.2.2 2006/05/24 18:14:34 jkim Exp $");
-
-#include <stdlib.h>
-#include <inttypes.h>
-
-#define	ADOT	46		/* ASCII '.' */
-#define	ASLASH	47		/* ASCII '/' */
-#define	A0	48		/* ASCII '0' */
-#define	AA	65		/* ASCII 'A' */
-#define	Aa	97		/* ASCII 'a' */
-
-long
-a64l(const char *s)
-{
-	long shift;
-	int digit, i, value;
-
-	value = 0;
-	shift = 0;
-	for (i = 0; *s != '\0' && i < 6; i++, s++) {
-		if (*s <= ASLASH)
-			digit = *s - ASLASH + 1;
-		else if (*s <= A0 + 9)
-			digit = *s - A0 + 2;
-		else if (*s <= AA + 25)
-			digit = *s - AA + 12;
-		else
-			digit = *s - Aa + 38;
-
-		value |= digit << shift;
-		shift += 6;
-	}
-	return (value);
-}
diff --git a/lib/libc/stdlib/abort.c b/lib/libc/stdlib/abort.c
deleted file mode 100644
index 18d0c73..0000000
--- a/lib/libc/stdlib/abort.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)abort.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/abort.c,v 1.9 2003/08/16 11:43:57 davidxu Exp $");
-
-#include "namespace.h"
-#include <signal.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "un-namespace.h"
-
-void (*__cleanup)();
-
-void
-abort()
-{
-	struct sigaction act;
-
-	/*
-	 * POSIX requires we flush stdio buffers on abort.
-	 * XXX ISO C requires that abort() be async-signal-safe.
-	 */
-	if (__cleanup)
-		(*__cleanup)();
-
-	sigfillset(&act.sa_mask);
-	/*
-	 * Don't block SIGABRT to give any handler a chance; we ignore
-	 * any errors -- ISO C doesn't allow abort to return anyway.
-	 */
-	sigdelset(&act.sa_mask, SIGABRT);
-	(void)_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
-	(void)raise(SIGABRT);
-
-	/*
-	 * If SIGABRT was ignored, or caught and the handler returns, do
-	 * it again, only harder.
-	 */
-	act.sa_handler = SIG_DFL;
-	act.sa_flags = 0;
-	sigfillset(&act.sa_mask);
-	(void)_sigaction(SIGABRT, &act, NULL);
-	sigdelset(&act.sa_mask, SIGABRT);
-	(void)_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
-	(void)raise(SIGABRT);
-	exit(1);
-}
diff --git a/lib/libc/stdlib/abs.c b/lib/libc/stdlib/abs.c
deleted file mode 100644
index 26f87eb..0000000
--- a/lib/libc/stdlib/abs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)abs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/abs.c,v 1.2 2002/03/22 21:53:09 obrien Exp $");
-
-#include <stdlib.h>
-
-int
-abs(j)
-	int j;
-{
-	return(j < 0 ? -j : j);
-}
diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
deleted file mode 100644
index bd94bcd..0000000
--- a/lib/libc/stdlib/atexit.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)atexit.c	8.2 (Berkeley) 7/3/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/atexit.c,v 1.7 2003/12/19 17:11:20 kan Exp $");
-
-#include "namespace.h"
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "atexit.h"
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-#define	ATEXIT_FN_EMPTY	0
-#define	ATEXIT_FN_STD	1
-#define	ATEXIT_FN_CXA	2
-
-static pthread_mutex_t atexit_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define _MUTEX_LOCK(x)		if (__isthreaded) _pthread_mutex_lock(x)
-#define _MUTEX_UNLOCK(x)	if (__isthreaded) _pthread_mutex_unlock(x)
-
-struct atexit {
-	struct atexit *next;			/* next in list */
-	int ind;				/* next index in this table */
-	struct atexit_fn {
-		int fn_type;			/* ATEXIT_? from above */
-		union {
-			void (*std_func)(void);
-			void (*cxa_func)(void *);
-		} fn_ptr;			/* function pointer */
-		void *fn_arg;			/* argument for CXA callback */
-		void *fn_dso;			/* shared module handle */
-	} fns[ATEXIT_SIZE];			/* the table itself */
-};
-
-static struct atexit *__atexit;		/* points to head of LIFO stack */
-
-/*
- * Register the function described by 'fptr' to be called at application
- * exit or owning shared object unload time. This is a helper function
- * for atexit and __cxa_atexit.
- */
-static int
-atexit_register(struct atexit_fn *fptr)
-{
-	static struct atexit __atexit0;	/* one guaranteed table */
-	struct atexit *p;
-
-	_MUTEX_LOCK(&atexit_mutex);
-	if ((p = __atexit) == NULL)
-		__atexit = p = &__atexit0;
-	else while (p->ind >= ATEXIT_SIZE) {
-		struct atexit *old__atexit;
-		old__atexit = __atexit;
-	        _MUTEX_UNLOCK(&atexit_mutex);
-		if ((p = (struct atexit *)malloc(sizeof(*p))) == NULL)
-			return (-1);
-		_MUTEX_LOCK(&atexit_mutex);
-		if (old__atexit != __atexit) {
-			/* Lost race, retry operation */
-			_MUTEX_UNLOCK(&atexit_mutex);
-			free(p);
-			_MUTEX_LOCK(&atexit_mutex);
-			p = __atexit;
-			continue;
-		}
-		p->ind = 0;
-		p->next = __atexit;
-		__atexit = p;
-	}
-	p->fns[p->ind++] = *fptr;
-	_MUTEX_UNLOCK(&atexit_mutex);
-	return 0;
-}
-
-/*
- * Register a function to be performed at exit.
- */
-int
-atexit(void (*func)(void))
-{
-	struct atexit_fn fn;
-	int error;
-
-	fn.fn_type = ATEXIT_FN_STD;
-	fn.fn_ptr.std_func = func;;
-	fn.fn_arg = NULL;
-	fn.fn_dso = NULL;
-
- 	error = atexit_register(&fn);	
-	return (error);
-}
-
-/*
- * Register a function to be performed at exit or when an shared object
- * with given dso handle is unloaded dynamically.
- */
-int
-__cxa_atexit(void (*func)(void *), void *arg, void *dso)
-{
-	struct atexit_fn fn;
-	int error;
-
-	fn.fn_type = ATEXIT_FN_CXA;
-	fn.fn_ptr.cxa_func = func;;
-	fn.fn_arg = arg;
-	fn.fn_dso = dso;
-
- 	error = atexit_register(&fn);	
-	return (error);
-}
-
-/*
- * Call all handlers registered with __cxa_atexit for the shared
- * object owning 'dso'.  Note: if 'dso' is NULL, then all remaining
- * handlers are called.
- */
-void
-__cxa_finalize(void *dso)
-{
-	struct atexit *p;
-	struct atexit_fn fn;
-	int n;
-
-	_MUTEX_LOCK(&atexit_mutex);
-	for (p = __atexit; p; p = p->next) {
-		for (n = p->ind; --n >= 0;) {
-			if (p->fns[n].fn_type == ATEXIT_FN_EMPTY)
-				continue; /* already been called */
-			if (dso != NULL && dso != p->fns[n].fn_dso)
-				continue; /* wrong DSO */
-			fn = p->fns[n];
-			/*
-			  Mark entry to indicate that this particular handler
-			  has already been called.
-			*/
-			p->fns[n].fn_type = ATEXIT_FN_EMPTY;
-		        _MUTEX_UNLOCK(&atexit_mutex);
-		
-			/* Call the function of correct type. */
-			if (fn.fn_type == ATEXIT_FN_CXA)
-				fn.fn_ptr.cxa_func(fn.fn_arg);
-			else if (fn.fn_type == ATEXIT_FN_STD)
-				fn.fn_ptr.std_func();
-			_MUTEX_LOCK(&atexit_mutex);
-		}
-	}
-	_MUTEX_UNLOCK(&atexit_mutex);
-}
diff --git a/lib/libc/stdlib/atexit.h b/lib/libc/stdlib/atexit.h
deleted file mode 100644
index cd30b3f..0000000
--- a/lib/libc/stdlib/atexit.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- *
- *	@(#)atexit.h	8.2 (Berkeley) 7/3/94
- * $FreeBSD: src/lib/libc/stdlib/atexit.h,v 1.3 2003/12/19 17:11:20 kan Exp $
- */
-
-/* must be at least 32 to guarantee ANSI conformance */
-#define	ATEXIT_SIZE	32
-
-void __cxa_finalize(void *dso);
diff --git a/lib/libc/stdlib/atof.c b/lib/libc/stdlib/atof.c
deleted file mode 100644
index ca69ab6..0000000
--- a/lib/libc/stdlib/atof.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)atof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/atof.c,v 1.5 2004/02/10 20:42:32 cperciva Exp $");
-
-#include <stdlib.h>
-
-double
-atof(ascii)
-	const char *ascii;
-{
-	return strtod(ascii, (char **)NULL);
-}
diff --git a/lib/libc/stdlib/atoi.c b/lib/libc/stdlib/atoi.c
deleted file mode 100644
index 3da2fda..0000000
--- a/lib/libc/stdlib/atoi.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)atoi.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoi.c,v 1.5 2002/03/22 21:53:09 obrien Exp $");
-
-#include <stdlib.h>
-
-int
-atoi(str)
-	const char *str;
-{
-	return (int)strtol(str, (char **)NULL, 10);
-}
diff --git a/lib/libc/stdlib/atol.c b/lib/libc/stdlib/atol.c
deleted file mode 100644
index c66c04e..0000000
--- a/lib/libc/stdlib/atol.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)atol.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/atol.c,v 1.4 2002/03/22 21:53:09 obrien Exp $");
-
-#include <stdlib.h>
-
-long
-atol(str)
-	const char *str;
-{
-	return strtol(str, (char **)NULL, 10);
-}
diff --git a/lib/libc/stdlib/atoll.c b/lib/libc/stdlib/atoll.c
deleted file mode 100644
index b7c38b8..0000000
--- a/lib/libc/stdlib/atoll.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/atoll.c,v 1.4 2002/03/22 21:53:10 obrien Exp $");
-
-#include <stdlib.h>
-
-long long
-atoll(str)
-	const char *str;
-{
-	return strtoll(str, (char **)NULL, 10);
-}
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c
deleted file mode 100644
index 7717582..0000000
--- a/lib/libc/stdlib/bsearch.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bsearch.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/bsearch.c,v 1.3 2002/03/21 22:48:41 obrien Exp $");
-
-#include <stddef.h>
-#include <stdlib.h>
-
-/*
- * Perform a binary search.
- *
- * The code below is a bit sneaky.  After a comparison fails, we
- * divide the work in half by moving either left or right. If lim
- * is odd, moving left simply involves halving lim: e.g., when lim
- * is 5 we look at item 2, so we change lim to 2 so that we will
- * look at items 0 & 1.  If lim is even, the same applies.  If lim
- * is odd, moving right again involes halving lim, this time moving
- * the base up one item past p: e.g., when lim is 5 we change base
- * to item 3 and make lim 2 so that we will look at items 3 and 4.
- * If lim is even, however, we have to shrink it by one before
- * halving: e.g., when lim is 4, we still looked at item 2, so we
- * have to make lim 3, then halve, obtaining 1, so that we will only
- * look at item 3.
- */
-void *
-bsearch(key, base0, nmemb, size, compar)
-	const void *key;
-	const void *base0;
-	size_t nmemb;
-	size_t size;
-	int (*compar)(const void *, const void *);
-{
-	const char *base = base0;
-	size_t lim;
-	int cmp;
-	const void *p;
-
-	for (lim = nmemb; lim != 0; lim >>= 1) {
-		p = base + (lim >> 1) * size;
-		cmp = (*compar)(key, p);
-		if (cmp == 0)
-			return ((void *)p);
-		if (cmp > 0) {	/* key > p: move right */
-			base = (char *)p + size;
-			lim--;
-		}		/* else move left */
-	}
-	return (NULL);
-}
diff --git a/lib/libc/stdlib/calloc.c b/lib/libc/stdlib/calloc.c
deleted file mode 100644
index 0bdbb23..0000000
--- a/lib/libc/stdlib/calloc.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)calloc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/calloc.c,v 1.7 2002/08/04 04:11:48 ache Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-void *
-calloc(num, size)
-	size_t num;
-	size_t size;
-{
-	void *p;
-
-	if (size != 0 && SIZE_T_MAX / size < num) {
-		errno = ENOMEM;
-		return (NULL);
-	}
-
-	size *= num;
-	if ( (p = malloc(size)) )
-		bzero(p, size);
-	return(p);
-}
diff --git a/lib/libc/stdlib/div.c b/lib/libc/stdlib/div.c
deleted file mode 100644
index 54278d6..0000000
--- a/lib/libc/stdlib/div.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)div.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/div.c,v 1.2 2002/03/22 21:53:10 obrien Exp $");
-
-#include <stdlib.h>		/* div_t */
-
-div_t
-div(num, denom)
-	int num, denom;
-{
-	div_t r;
-
-	r.quot = num / denom;
-	r.rem = num % denom;
-	/*
-	 * The ANSI standard says that |r.quot| <= |n/d|, where
-	 * n/d is to be computed in infinite precision.  In other
-	 * words, we should always truncate the quotient towards
-	 * 0, never -infinity.
-	 *
-	 * Machine division and remainer may work either way when
-	 * one or both of n or d is negative.  If only one is
-	 * negative and r.quot has been truncated towards -inf,
-	 * r.rem will have the same sign as denom and the opposite
-	 * sign of num; if both are negative and r.quot has been
-	 * truncated towards -inf, r.rem will be positive (will
-	 * have the opposite sign of num).  These are considered
-	 * `wrong'.
-	 *
-	 * If both are num and denom are positive, r will always
-	 * be positive.
-	 *
-	 * This all boils down to:
-	 *	if num >= 0, but r.rem < 0, we got the wrong answer.
-	 * In that case, to get the right answer, add 1 to r.quot and
-	 * subtract denom from r.rem.
-	 */
-	if (num >= 0 && r.rem < 0) {
-		r.quot++;
-		r.rem -= denom;
-	}
-	return (r);
-}
diff --git a/lib/libc/stdlib/exit.c b/lib/libc/stdlib/exit.c
deleted file mode 100644
index d2f83ad..0000000
--- a/lib/libc/stdlib/exit.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)exit.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/exit.c,v 1.7 2003/12/19 17:11:20 kan Exp $");
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "atexit.h"
-
-void (*__cleanup)();
-
-/*
- * This variable is zero until a process has created a thread.
- * It is used to avoid calling locking functions in libc when they
- * are not required. By default, libc is intended to be(come)
- * thread-safe, but without a (significant) penalty to non-threaded
- * processes.
- */
-int	__isthreaded	= 0;
-
-/*
- * Exit, flushing stdio buffers if necessary.
- */
-void
-exit(status)
-	int status;
-{
-   //HACK
-   _exit(status);
-	/* Ensure that the auto-initialization routine is linked in: */
-	extern int _thread_autoinit_dummy_decl;
-
-	_thread_autoinit_dummy_decl = 1;
-
-	__cxa_finalize(NULL);
-	if (__cleanup)
-		(*__cleanup)();
-	_exit(status);
-}
diff --git a/lib/libc/stdlib/getenv.c b/lib/libc/stdlib/getenv.c
deleted file mode 100644
index aa15989..0000000
--- a/lib/libc/stdlib/getenv.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getenv.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/getenv.c,v 1.4 2002/03/21 22:48:41 obrien Exp $");
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-
-inline char *__findenv(const char *, int *);
-
-/*
- * __findenv --
- *	Returns pointer to value associated with name, if any, else NULL.
- *	Sets offset to be the offset of the name/value combination in the
- *	environmental array, for use by setenv(3) and unsetenv(3).
- *	Explicitly removes '=' in argument name.
- *
- *	This routine *should* be a static; don't use it.
- */
-inline char *
-__findenv(name, offset)
-	const char *name;
-	int *offset;
-{
-	extern char **environ;
-	int len, i;
-	const char *np;
-	char **p, *cp;
-
-	if (name == NULL || environ == NULL)
-		return (NULL);
-	for (np = name; *np && *np != '='; ++np)
-		continue;
-	len = np - name;
-	for (p = environ; (cp = *p) != NULL; ++p) {
-		for (np = name, i = len; i && *cp; i--)
-			if (*cp++ != *np++)
-				break;
-		if (i == 0 && *cp++ == '=') {
-			*offset = p - environ;
-			return (cp);
-		}
-	}
-	return (NULL);
-}
-
-/*
- * getenv --
- *	Returns ptr to value associated with name, if any, else NULL.
- */
-char *
-getenv(name)
-	const char *name;
-{
-	int offset;
-
-	return (__findenv(name, &offset));
-}
diff --git a/lib/libc/stdlib/getopt.c b/lib/libc/stdlib/getopt.c
deleted file mode 100644
index 5e28400..0000000
--- a/lib/libc/stdlib/getopt.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*	$NetBSD: getopt.c,v 1.26 2003/08/07 16:43:40 agc Exp $	*/
-
-/*
- * Copyright (c) 1987, 1993, 1994
- *	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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt.c,v 1.7 2004/03/06 17:05:45 ache Exp $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-int	opterr = 1,		/* if error message should be printed */
-	optind = 1,		/* index into parent argv vector */
-	optopt,			/* character checked for validity */
-	optreset;		/* reset getopt */
-char	*optarg;		/* argument associated with option */
-
-#define	BADCH	(int)'?'
-#define	BADARG	(int)':'
-#define	EMSG	""
-
-/*
- * getopt --
- *	Parse argc/argv argument vector.
- */
-int
-getopt(nargc, nargv, ostr)
-	int nargc;
-	char * const nargv[];
-	const char *ostr;
-{
-	static char *place = EMSG;		/* option letter processing */
-	char *oli;				/* option letter list index */
-  char tmp[32];
-sprintf(tmp,"0x%X:%i",&optind,optind);
-__sys_write(1,tmp,32);
-	if (optreset || *place == 0) {		/* update scanning pointer */
-__sys_write(1,"opt",3);
-		optreset = 0;
-		place = nargv[optind];
-		if (optind >= nargc || *place++ != '-') {
-__sys_write(1,"moo",3);
-			/* Argument is absent or is not an option */
-			place = EMSG;
-			return (-1);
-		}
-		optopt = *place++;
-		if (optopt == '-' && *place == 0) {
-__sys_write(1,"woo",3);
-			/* "--" => end of options */
-			++optind;
-			place = EMSG;
-			return (-1);
-		}
-		if (optopt == 0) {
-__sys_write(1,"boo",3);
-			/* Solitary '-', treat as a '-' option
-			   if the program (eg su) is looking for it. */
-			place = EMSG;
-			if (strchr(ostr, '-') == NULL)
-				return (-1);
-			optopt = '-';
-		}
-	} else
-		optopt = *place++;
-
-	/* See if option letter is one the caller wanted... */
-	if (optopt == ':' || (oli = strchr(ostr, optopt)) == NULL) {
-		if (*place == 0)
-			++optind;
-		if (opterr && *ostr != ':')
-			(void)fprintf(stderr,
-			    "%s: illegal option -- %c\n", _getprogname(),
-			    optopt);
-		return (BADCH);
-	}
-
-	/* Does this option need an argument? */
-	if (oli[1] != ':') {
-		/* don't need argument */
-		optarg = NULL;
-		if (*place == 0)
-			++optind;
-	} else {
-		/* Option-argument is either the rest of this argument or the
-		   entire next argument. */
-		if (*place)
-			optarg = place;
-		else if (nargc > ++optind)
-			optarg = nargv[optind];
-		else {
-			/* option-argument absent */
-			place = EMSG;
-			if (*ostr == ':')
-				return (BADARG);
-			if (opterr)
-				(void)fprintf(stderr,
-				    "%s: option requires an argument -- %c\n",
-				    _getprogname(), optopt);
-			return (BADCH);
-		}
-		place = EMSG;
-		++optind;
-	}
-tmp[0] = '0' + optind;
-tmp[1] = 'a' + *place;
-tmp[2] = '\0';
-__sys_write(1,tmp,3);
-
-	return (optopt);			/* return option letter */
-}
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
deleted file mode 100644
index 736d6ca..0000000
--- a/lib/libc/stdlib/getopt_long.c
+++ /dev/null
@@ -1,624 +0,0 @@
-/*	$OpenBSD: getopt_long.c,v 1.21 2006/09/22 17:22:05 millert Exp $	*/
-/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
-
-/*
- * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron and Thomas Klausner.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getopt_long.c,v 1.16 2004/02/04 18:17:25 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.12.8.1 2006/09/25 17:19:28 ache Exp $");
-
-#include <err.h>
-#include <errno.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define GNU_COMPATIBLE		/* Be more compatible, configure's use us! */
-
-#if 0				/* we prefer to keep our getopt(3) */
-#define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */
-#endif
-
-#ifdef REPLACE_GETOPT
-int	opterr = 1;		/* if error message should be printed */
-int	optind = 1;		/* index into parent argv vector */
-int	optopt = '?';		/* character checked for validity */
-int	optreset;		/* reset getopt */
-char    *optarg;		/* argument associated with option */
-#endif
-
-#define PRINT_ERROR	((opterr) && (*options != ':'))
-
-#define FLAG_PERMUTE	0x01	/* permute non-options to the end of argv */
-#define FLAG_ALLARGS	0x02	/* treat non-options as args to option "-1" */
-#define FLAG_LONGONLY	0x04	/* operate as getopt_long_only */
-
-/* return values */
-#define	BADCH		(int)'?'
-#define	BADARG		((*options == ':') ? (int)':' : (int)'?')
-#define	INORDER 	(int)1
-
-#define	EMSG		""
-
-#ifdef GNU_COMPATIBLE
-#define NO_PREFIX	(-1)
-#define D_PREFIX	0
-#define DD_PREFIX	1
-#define W_PREFIX	2
-#endif
-
-static int getopt_internal(int, char * const *, const char *,
-			   const struct option *, int *, int);
-static int parse_long_options(char * const *, const char *,
-			      const struct option *, int *, int, int);
-static int gcd(int, int);
-static void permute_args(int, int, int, char * const *);
-
-static char *place = EMSG; /* option letter processing */
-
-/* XXX: set optreset to 1 rather than these two */
-static int nonopt_start = -1; /* first non option argument (for permute) */
-static int nonopt_end = -1;   /* first option after non options (for permute) */
-
-/* Error messages */
-static const char recargchar[] = "option requires an argument -- %c";
-static const char illoptchar[] = "illegal option -- %c"; /* From P1003.2 */
-#ifdef GNU_COMPATIBLE
-static int dash_prefix = NO_PREFIX;
-static const char gnuoptchar[] = "invalid option -- %c";
-
-static const char recargstring[] = "option `%s%s' requires an argument";
-static const char ambig[] = "option `%s%.*s' is ambiguous";
-static const char noarg[] = "option `%s%.*s' doesn't allow an argument";
-static const char illoptstring[] = "unrecognized option `%s%s'";
-#else
-static const char recargstring[] = "option requires an argument -- %s";
-static const char ambig[] = "ambiguous option -- %.*s";
-static const char noarg[] = "option doesn't take an argument -- %.*s";
-static const char illoptstring[] = "unknown option -- %s";
-#endif
-
-/*
- * Compute the greatest common divisor of a and b.
- */
-static int
-gcd(int a, int b)
-{
-	int c;
-
-	c = a % b;
-	while (c != 0) {
-		a = b;
-		b = c;
-		c = a % b;
-	}
-
-	return (b);
-}
-
-/*
- * Exchange the block from nonopt_start to nonopt_end with the block
- * from nonopt_end to opt_end (keeping the same order of arguments
- * in each block).
- */
-static void
-permute_args(int panonopt_start, int panonopt_end, int opt_end,
-	char * const *nargv)
-{
-	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
-	char *swap;
-
-	/*
-	 * compute lengths of blocks and number and size of cycles
-	 */
-	nnonopts = panonopt_end - panonopt_start;
-	nopts = opt_end - panonopt_end;
-	ncycle = gcd(nnonopts, nopts);
-	cyclelen = (opt_end - panonopt_start) / ncycle;
-
-	for (i = 0; i < ncycle; i++) {
-		cstart = panonopt_end+i;
-		pos = cstart;
-		for (j = 0; j < cyclelen; j++) {
-			if (pos >= panonopt_end)
-				pos -= nnonopts;
-			else
-				pos += nopts;
-			swap = nargv[pos];
-			/* LINTED const cast */
-			((char **) nargv)[pos] = nargv[cstart];
-			/* LINTED const cast */
-			((char **)nargv)[cstart] = swap;
-		}
-	}
-}
-
-/*
- * parse_long_options --
- *	Parse long options in argc/argv argument vector.
- * Returns -1 if short_too is set and the option does not match long_options.
- */
-static int
-parse_long_options(char * const *nargv, const char *options,
-	const struct option *long_options, int *idx, int short_too, int flags)
-{
-	char *current_argv, *has_equal;
-#ifdef GNU_COMPATIBLE
-	char *current_dash;
-#endif
-	size_t current_argv_len;
-	int i, match, exact_match, second_partial_match;
-
-	current_argv = place;
-#ifdef GNU_COMPATIBLE
-	switch (dash_prefix) {
-		case D_PREFIX:
-			current_dash = "-";
-			break;
-		case DD_PREFIX:
-			current_dash = "--";
-			break;
-		case W_PREFIX:
-			current_dash = "-W ";
-			break;
-		default:
-			current_dash = "";
-			break;
-	}
-#endif
-	match = -1;
-	exact_match = 0;
-	second_partial_match = 0;
-
-	optind++;
-	if ((has_equal = strchr(current_argv, '=')) != NULL) {
-		/* argument found (--option=arg) */
-		current_argv_len = has_equal - current_argv;
-		has_equal++;
-	} else
-		current_argv_len = strlen(current_argv);
-
-	for (i = 0; long_options[i].name; i++) {
-		/* find matching long option */
-		if (strncmp(current_argv, long_options[i].name,
-		    current_argv_len))
-			continue;
-
-		if (strlen(long_options[i].name) == current_argv_len) {
-			/* exact match */
-			match = i;
-			exact_match = 1;
-			break;
-		}
-		/*
-		 * If this is a known short option, don't allow
-		 * a partial match of a single character.
-		 */
-		if (short_too && current_argv_len == 1)
-			continue;
-
-		if (match == -1)        /* first partial match */
-			match = i;
-		else if ((flags & FLAG_LONGONLY) ||
-			 long_options[i].has_arg !=
-			     long_options[match].has_arg ||
-			 long_options[i].flag != long_options[match].flag ||
-			 long_options[i].val != long_options[match].val)
-			second_partial_match = 1;
-	}
-	if (!exact_match && second_partial_match) {
-		/* ambiguous abbreviation */
-		if (PRINT_ERROR)
-			warnx(ambig,
-#ifdef GNU_COMPATIBLE
-			     current_dash,
-#endif
-			     (int)current_argv_len,
-			     current_argv);
-		optopt = 0;
-		return (BADCH);
-	}
-	if (match != -1) {		/* option found */
-		if (long_options[match].has_arg == no_argument
-		    && has_equal) {
-			if (PRINT_ERROR)
-				warnx(noarg,
-#ifdef GNU_COMPATIBLE
-				     current_dash,
-#endif
-				     (int)current_argv_len,
-				     current_argv);
-			/*
-			 * XXX: GNU sets optopt to val regardless of flag
-			 */
-			if (long_options[match].flag == NULL)
-				optopt = long_options[match].val;
-			else
-				optopt = 0;
-#ifdef GNU_COMPATIBLE
-			return (BADCH);
-#else
-			return (BADARG);
-#endif
-		}
-		if (long_options[match].has_arg == required_argument ||
-		    long_options[match].has_arg == optional_argument) {
-			if (has_equal)
-				optarg = has_equal;
-			else if (long_options[match].has_arg ==
-			    required_argument) {
-				/*
-				 * optional argument doesn't use next nargv
-				 */
-				optarg = nargv[optind++];
-			}
-		}
-		if ((long_options[match].has_arg == required_argument)
-		    && (optarg == NULL)) {
-			/*
-			 * Missing argument; leading ':' indicates no error
-			 * should be generated.
-			 */
-			if (PRINT_ERROR)
-				warnx(recargstring,
-#ifdef GNU_COMPATIBLE
-				    current_dash,
-#endif
-				    current_argv);
-			/*
-			 * XXX: GNU sets optopt to val regardless of flag
-			 */
-			if (long_options[match].flag == NULL)
-				optopt = long_options[match].val;
-			else
-				optopt = 0;
-			--optind;
-			return (BADARG);
-		}
-	} else {			/* unknown option */
-		if (short_too) {
-			--optind;
-			return (-1);
-		}
-		if (PRINT_ERROR)
-			warnx(illoptstring,
-#ifdef GNU_COMPATIBLE
-			      current_dash,
-#endif
-			      current_argv);
-		optopt = 0;
-		return (BADCH);
-	}
-	if (idx)
-		*idx = match;
-	if (long_options[match].flag) {
-		*long_options[match].flag = long_options[match].val;
-		return (0);
-	} else
-		return (long_options[match].val);
-}
-
-/*
- * getopt_internal --
- *	Parse argc/argv argument vector.  Called by user level routines.
- */
-static int
-getopt_internal(int nargc, char * const *nargv, const char *options,
-	const struct option *long_options, int *idx, int flags)
-{
-	char *oli;				/* option letter list index */
-	int optchar, short_too;
-	int posixly_correct;	/* no static, can be changed on the fly */
-
-	if (options == NULL)
-		return (-1);
-
-	/*
-	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
-	 * string begins with a '+'.
-	 */
-	posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
-#ifdef GNU_COMPATIBLE
-	if (*options == '-')
-		flags |= FLAG_ALLARGS;
-	else if (posixly_correct || *options == '+')
-		flags &= ~FLAG_PERMUTE;
-#else
-	if (posixly_correct || *options == '+')
-		flags &= ~FLAG_PERMUTE;
-	else if (*options == '-')
-		flags |= FLAG_ALLARGS;
-#endif
-	if (*options == '+' || *options == '-')
-		options++;
-
-	/*
-	 * XXX Some GNU programs (like cvs) set optind to 0 instead of
-	 * XXX using optreset.  Work around this braindamage.
-	 */
-	if (optind == 0)
-		optind = optreset = 1;
-
-	optarg = NULL;
-	if (optreset)
-		nonopt_start = nonopt_end = -1;
-start:
-	if (optreset || !*place) {		/* update scanning pointer */
-		optreset = 0;
-		if (optind >= nargc) {          /* end of argument vector */
-			place = EMSG;
-			if (nonopt_end != -1) {
-				/* do permutation, if we have to */
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			else if (nonopt_start != -1) {
-				/*
-				 * If we skipped non-options, set optind
-				 * to the first of them.
-				 */
-				optind = nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return (-1);
-		}
-		if (*(place = nargv[optind]) != '-' ||
-#ifdef GNU_COMPATIBLE
-		    place[1] == '\0') {
-#else
-		    (place[1] == '\0' && strchr(options, '-') == NULL)) {
-#endif
-			place = EMSG;		/* found non-option */
-			if (flags & FLAG_ALLARGS) {
-				/*
-				 * GNU extension:
-				 * return non-option as argument to option 1
-				 */
-				optarg = nargv[optind++];
-				return (INORDER);
-			}
-			if (!(flags & FLAG_PERMUTE)) {
-				/*
-				 * If no permutation wanted, stop parsing
-				 * at first non-option.
-				 */
-				return (-1);
-			}
-			/* do permutation */
-			if (nonopt_start == -1)
-				nonopt_start = optind;
-			else if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				nonopt_start = optind -
-				    (nonopt_end - nonopt_start);
-				nonopt_end = -1;
-			}
-			optind++;
-			/* process next argument */
-			goto start;
-		}
-		if (nonopt_start != -1 && nonopt_end == -1)
-			nonopt_end = optind;
-
-		/*
-		 * If we have "-" do nothing, if "--" we are done.
-		 */
-		if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
-			optind++;
-			place = EMSG;
-			/*
-			 * We found an option (--), so if we skipped
-			 * non-options, we have to permute.
-			 */
-			if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return (-1);
-		}
-	}
-
-	/*
-	 * Check long options if:
-	 *  1) we were passed some
-	 *  2) the arg is not just "-"
-	 *  3) either the arg starts with -- we are getopt_long_only()
-	 */
-	if (long_options != NULL && place != nargv[optind] &&
-	    (*place == '-' || (flags & FLAG_LONGONLY))) {
-		short_too = 0;
-#ifdef GNU_COMPATIBLE
-		dash_prefix = D_PREFIX;
-#endif
-		if (*place == '-') {
-			place++;		/* --foo long option */
-#ifdef GNU_COMPATIBLE
-			dash_prefix = DD_PREFIX;
-#endif
-		} else if (*place != ':' && strchr(options, *place) != NULL)
-			short_too = 1;		/* could be short option too */
-
-		optchar = parse_long_options(nargv, options, long_options,
-		    idx, short_too, flags);
-		if (optchar != -1) {
-			place = EMSG;
-			return (optchar);
-		}
-	}
-
-	if ((optchar = (int)*place++) == (int)':' ||
-	    (optchar == (int)'-' && *place != '\0') ||
-	    (oli = strchr(options, optchar)) == NULL) {
-		/*
-		 * If the user specified "-" and  '-' isn't listed in
-		 * options, return -1 (non-option) as per POSIX.
-		 * Otherwise, it is an unknown option character (or ':').
-		 */
-		if (optchar == (int)'-' && *place == '\0')
-			return (-1);
-		if (!*place)
-			++optind;
-#ifdef GNU_COMPATIBLE
-		if (PRINT_ERROR)
-			warnx(posixly_correct ? illoptchar : gnuoptchar,
-			      optchar);
-#else
-		if (PRINT_ERROR)
-			warnx(illoptchar, optchar);
-#endif
-		optopt = optchar;
-		return (BADCH);
-	}
-	if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
-		/* -W long-option */
-		if (*place)			/* no space */
-			/* NOTHING */;
-		else if (++optind >= nargc) {	/* no arg */
-			place = EMSG;
-			if (PRINT_ERROR)
-				warnx(recargchar, optchar);
-			optopt = optchar;
-			return (BADARG);
-		} else				/* white space */
-			place = nargv[optind];
-#ifdef GNU_COMPATIBLE
-		dash_prefix = W_PREFIX;
-#endif
-		optchar = parse_long_options(nargv, options, long_options,
-		    idx, 0, flags);
-		place = EMSG;
-		return (optchar);
-	}
-	if (*++oli != ':') {			/* doesn't take argument */
-		if (!*place)
-			++optind;
-	} else {				/* takes (optional) argument */
-		optarg = NULL;
-		if (*place)			/* no white space */
-			optarg = place;
-		else if (oli[1] != ':') {	/* arg not optional */
-			if (++optind >= nargc) {	/* no arg */
-				place = EMSG;
-				if (PRINT_ERROR)
-					warnx(recargchar, optchar);
-				optopt = optchar;
-				return (BADARG);
-			} else
-				optarg = nargv[optind];
-		}
-		place = EMSG;
-		++optind;
-	}
-	/* dump back option letter */
-	return (optchar);
-}
-
-#ifdef REPLACE_GETOPT
-/*
- * getopt --
- *	Parse argc/argv argument vector.
- *
- * [eventually this will replace the BSD getopt]
- */
-int
-getopt(int nargc, char * const *nargv, const char *options)
-{
-
-	/*
-	 * We don't pass FLAG_PERMUTE to getopt_internal() since
-	 * the BSD getopt(3) (unlike GNU) has never done this.
-	 *
-	 * Furthermore, since many privileged programs call getopt()
-	 * before dropping privileges it makes sense to keep things
-	 * as simple (and bug-free) as possible.
-	 */
-	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
-}
-#endif /* REPLACE_GETOPT */
-
-/*
- * getopt_long --
- *	Parse argc/argv argument vector.
- */
-int
-getopt_long(int nargc, char * const *nargv, const char *options,
-	const struct option *long_options, int *idx)
-{
-
-	return (getopt_internal(nargc, nargv, options, long_options, idx,
-	    FLAG_PERMUTE));
-}
-
-/*
- * getopt_long_only --
- *	Parse argc/argv argument vector.
- */
-int
-getopt_long_only(int nargc, char * const *nargv, const char *options,
-	const struct option *long_options, int *idx)
-{
-
-	return (getopt_internal(nargc, nargv, options, long_options, idx,
-	    FLAG_PERMUTE|FLAG_LONGONLY));
-}
diff --git a/lib/libc/stdlib/getsubopt.c b/lib/libc/stdlib/getsubopt.c
deleted file mode 100644
index 488706a..0000000
--- a/lib/libc/stdlib/getsubopt.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getsubopt.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/getsubopt.c,v 1.6 2004/02/23 03:30:02 ache Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * The SVID interface to getsubopt provides no way of figuring out which
- * part of the suboptions list wasn't matched.  This makes error messages
- * tricky...  The extern variable suboptarg is a pointer to the token
- * which didn't match.
- */
-char *suboptarg;
-
-int
-getsubopt(optionp, tokens, valuep)
-	char **optionp, **valuep;
-	char * const *tokens;
-{
-	int cnt;
-	char *p;
-
-	suboptarg = *valuep = NULL;
-
-	if (!optionp || !*optionp)
-		return(-1);
-
-	/* skip leading white-space, commas */
-	for (p = *optionp; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
-
-	if (!*p) {
-		*optionp = p;
-		return(-1);
-	}
-
-	/* save the start of the token, and skip the rest of the token. */
-	for (suboptarg = p;
-	    *++p && *p != ',' && *p != '=' && *p != ' ' && *p != '\t';);
-
-	if (*p) {
-		/*
-		 * If there's an equals sign, set the value pointer, and
-		 * skip over the value part of the token.  Terminate the
-		 * token.
-		 */
-		if (*p == '=') {
-			*p = '\0';
-			for (*valuep = ++p;
-			    *p && *p != ',' && *p != ' ' && *p != '\t'; ++p);
-			if (*p)
-				*p++ = '\0';
-		} else
-			*p++ = '\0';
-		/* Skip any whitespace or commas after this token. */
-		for (; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
-	}
-
-	/* set optionp for next round. */
-	*optionp = p;
-
-	for (cnt = 0; *tokens; ++tokens, ++cnt)
-		if (!strcmp(suboptarg, *tokens))
-			return(cnt);
-	return(-1);
-}
diff --git a/lib/libc/stdlib/grantpt.c b/lib/libc/stdlib/grantpt.c
deleted file mode 100644
index fd21382..0000000
--- a/lib/libc/stdlib/grantpt.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2002 The FreeBSD Project, Inc.
- * All rights reserved.
- *
- * This software includes code contributed to the FreeBSD Project
- * by Ryan Younce of North Carolina State University.
- *
- * 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. Neither the name of the FreeBSD Project 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 FREEBSD PROJECT 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 FREEBSD PROJECT OR ITS 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.4 2005/07/07 17:48:40 marcus Exp $");
-#endif /* not lint */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <paths.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sysexits.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#define PTM_PREFIX	"pty"	/* pseudo tty master naming convention */
-#define PTS_PREFIX	"tty"	/* pseudo tty slave naming convention */
-
-/*
- * The following are range values for pseudo TTY devices.  Pseudo TTYs have a
- * name of /dev/[pt]ty[p-sP-S][0-9a-v], yielding 256 combinations per major.
- */
-#define PT_MAX		256
-#define	PT_DEV1		"pqrsPQRS"
-#define PT_DEV2		"0123456789abcdefghijklmnopqrstuv"
-
-/*
- * grantpt(3) support utility.
- */
-#define _PATH_PTCHOWN	"/usr/libexec/pt_chown"
-
-/*
- * ISPTM(x) returns 0 for struct stat x if x is not a pty master.
- * The bounds checking may be unnecessary but it does eliminate doubt.
- */
-#define ISPTM(x)	(S_ISCHR((x).st_mode) && 			\
-			 minor((x).st_rdev) >= 0 &&			\
-			 minor((x).st_rdev) < PT_MAX)
-
-/*
- * grantpt():  grant ownership of a slave pseudo-terminal device to the
- *             current user.
- */
-
-int
-grantpt(int fildes)
-{
-	int retval, serrno, status;
-	pid_t pid, spid;
-	gid_t gid;
-	char *slave;
-	sigset_t oblock, nblock;
-	struct group *grp;
-
-	retval = -1;
-	serrno = errno;
-
-	if ((slave = ptsname(fildes)) != NULL) {
-		/*
-		 * Block SIGCHLD.
-		 */
-		(void)sigemptyset(&nblock);
-		(void)sigaddset(&nblock, SIGCHLD);
-		(void)_sigprocmask(SIG_BLOCK, &nblock, &oblock);
-
-		switch (pid = fork()) {
-		case -1:
-			break;
-		case 0:		/* child */
-			/*
-			 * pt_chown expects the master pseudo TTY to be its
-			 * standard input.
-			 */
-			(void)_dup2(fildes, STDIN_FILENO);
-			(void)_sigprocmask(SIG_SETMASK, &oblock, NULL);
-			execl(_PATH_PTCHOWN, _PATH_PTCHOWN, (char *)NULL);
-			_exit(EX_UNAVAILABLE);
-			/* NOTREACHED */
-		default:	/* parent */
-			/*
-			 * Just wait for the process.  Error checking is
-			 * done below.
-			 */
-			while ((spid = _waitpid(pid, &status, 0)) == -1 &&
-			       (errno == EINTR))
-				;
-			if (spid != -1 && WIFEXITED(status) &&
-			    WEXITSTATUS(status) == EX_OK)
-				retval = 0;
-			else
-				errno = EACCES;
-			break;
-		}
-
-		/*
-		 * Restore process's signal mask.
-		 */
-		(void)_sigprocmask(SIG_SETMASK, &oblock, NULL);
-
-		if (retval) {
-			/*
-			 * pt_chown failed.  Try to manually change the
-			 * permissions for the slave.
-			 */
-			gid = (grp = getgrnam("tty")) ? grp->gr_gid : -1;
-			if (chown(slave, getuid(), gid) == -1 ||
-			    chmod(slave, S_IRUSR | S_IWUSR | S_IWGRP) == -1)
-				errno = EACCES;
-			else
-				retval = 0;
-		}
-	}
-
-	if (!retval)
-		errno = serrno;
-
-	return (retval);
-}
-
-/*
- * posix_openpt():  open the first available master pseudo-terminal device
- *                  and return descriptor.
- */
-int
-posix_openpt(int oflag)
-{
-	char *mc1, *mc2, master[] = _PATH_DEV PTM_PREFIX "XY";
-	const char *pc1, *pc2;
-	int fildes, bflag, serrno;
-
-	fildes = -1;
-	bflag = 0;
-	serrno = errno;
-
-	/*
-	 * Check flag validity.  POSIX doesn't require it,
-	 * but we still do so.
-	 */
-	if (oflag & ~(O_RDWR | O_NOCTTY))
-		errno = EINVAL;
-	else {
-		mc1 = master + strlen(_PATH_DEV PTM_PREFIX);
-		mc2 = mc1 + 1;
-
-		/* Cycle through all possible master PTY devices. */
-		for (pc1 = PT_DEV1; !bflag && (*mc1 = *pc1); ++pc1)
-			for (pc2 = PT_DEV2; (*mc2 = *pc2) != '\0'; ++pc2) {
-				/*
-				 * Break out if we successfully open a PTY,
-				 * or if open() fails due to limits.
-				 */
-				if ((fildes = _open(master, oflag)) != -1 ||
-				    (errno == EMFILE || errno == ENFILE)) {
-					++bflag;
-					break;
-				}
-			}
-
-		if (fildes != -1)
-			errno = serrno;
-		else if (!bflag)
-			errno = EAGAIN;
-	}
-
-	return (fildes);
-}
-
-/*
- * ptsname():  return the pathname of the slave pseudo-terminal device
- *             associated with the specified master.
- */
-char *
-ptsname(int fildes)
-{
-	static char slave[] = _PATH_DEV PTS_PREFIX "XY";
-	char *retval;
-	struct stat sbuf;
-
-	retval = NULL;
-
-	if (_fstat(fildes, &sbuf) == 0) {
-		if (!ISPTM(sbuf))
-			errno = EINVAL;
-		else {
-			(void)snprintf(slave, sizeof(slave),
-				       _PATH_DEV PTS_PREFIX "%s",
-				       devname(sbuf.st_rdev, S_IFCHR) +
-				       strlen(PTM_PREFIX));
-			retval = slave;
-		}
-	}
-
-	return (retval);
-}
-
-/*
- * unlockpt():  unlock a pseudo-terminal device pair.
- */
-int
-unlockpt(int fildes)
-{
-	int retval;
-	struct stat sbuf;
-
-	/*
-	 * Unlocking a master/slave pseudo-terminal pair has no meaning in a
-	 * non-streams PTY environment.  However, we do ensure fildes is a
-	 * valid master pseudo-terminal device.
-	 */
-	if ((retval = _fstat(fildes, &sbuf)) == 0 && !ISPTM(sbuf)) {
-		errno = EINVAL;
-		retval = -1;
-	}
-
-	return (retval);
-}
diff --git a/lib/libc/stdlib/hcreate.c b/lib/libc/stdlib/hcreate.c
deleted file mode 100644
index 32531df..0000000
--- a/lib/libc/stdlib/hcreate.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/* $NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * 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 for the
- *          NetBSD Project.  See http://www.netbsd.org/ for
- *          information about NetBSD.
- * 4. 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 ``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 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.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-/*
- * hcreate() / hsearch() / hdestroy()
- *
- * SysV/XPG4 hash table functions.
- *
- * Implementation done based on NetBSD manual page and Solaris manual page,
- * plus my own personal experience about how they're supposed to work.
- *
- * I tried to look at Knuth (as cited by the Solaris manual page), but
- * nobody had a copy in the office, so...
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/hcreate.c,v 1.3 2002/06/27 13:18:27 deischen Exp $");
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <errno.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * DO NOT MAKE THIS STRUCTURE LARGER THAN 32 BYTES (4 ptrs on 64-bit
- * ptr machine) without adjusting MAX_BUCKETS_LG2 below.
- */
-struct internal_entry {
-	SLIST_ENTRY(internal_entry) link;
-	ENTRY ent;
-};
-SLIST_HEAD(internal_head, internal_entry);
-
-#define	MIN_BUCKETS_LG2	4
-#define	MIN_BUCKETS	(1 << MIN_BUCKETS_LG2)
-
-/*
- * max * sizeof internal_entry must fit into size_t.
- * assumes internal_entry is <= 32 (2^5) bytes.
- */
-#define	MAX_BUCKETS_LG2	(sizeof (size_t) * 8 - 1 - 5)
-#define	MAX_BUCKETS	((size_t)1 << MAX_BUCKETS_LG2)
-
-/* Default hash function, from db/hash/hash_func.c */
-extern uint32_t (*__default_hash)(const void *, size_t);
-
-static struct internal_head *htable;
-static size_t htablesize;
-
-int
-hcreate(size_t nel)
-{
-	size_t idx;
-	unsigned int p2;
-
-	/* Make sure this this isn't called when a table already exists. */
-	if (htable != NULL) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	/* If nel is too small, make it min sized. */
-	if (nel < MIN_BUCKETS)
-		nel = MIN_BUCKETS;
-
-	/* If it's too large, cap it. */
-	if (nel > MAX_BUCKETS)
-		nel = MAX_BUCKETS;
-
-	/* If it's is not a power of two in size, round up. */
-	if ((nel & (nel - 1)) != 0) {
-		for (p2 = 0; nel != 0; p2++)
-			nel >>= 1;
-		nel = 1 << p2;
-	}
-	
-	/* Allocate the table. */
-	htablesize = nel;
-	htable = malloc(htablesize * sizeof htable[0]);
-	if (htable == NULL) {
-		errno = ENOMEM;
-		return 0;
-	}
-
-	/* Initialize it. */
-	for (idx = 0; idx < htablesize; idx++)
-		SLIST_INIT(&htable[idx]);
-
-	return 1;
-}
-
-void
-hdestroy(void)
-{
-	struct internal_entry *ie;
-	size_t idx;
-
-	if (htable == NULL)
-		return;
-
-	for (idx = 0; idx < htablesize; idx++) {
-		while (!SLIST_EMPTY(&htable[idx])) {
-			ie = SLIST_FIRST(&htable[idx]);
-			SLIST_REMOVE_HEAD(&htable[idx], link);
-			free(ie->ent.key);
-			free(ie);
-		}
-	}
-	free(htable);
-	htable = NULL;
-}
-
-ENTRY *
-hsearch(ENTRY item, ACTION action)
-{
-	struct internal_head *head;
-	struct internal_entry *ie;
-	uint32_t hashval;
-	size_t len;
-
-	len = strlen(item.key);
-	hashval = (*__default_hash)(item.key, len);
-
-	head = &htable[hashval & (htablesize - 1)];
-	ie = SLIST_FIRST(head);
-	while (ie != NULL) {
-		if (strcmp(ie->ent.key, item.key) == 0)
-			break;
-		ie = SLIST_NEXT(ie, link);
-	}
-
-	if (ie != NULL)
-		return &ie->ent;
-	else if (action == FIND)
-		return NULL;
-
-	ie = malloc(sizeof *ie);
-	if (ie == NULL)
-		return NULL;
-	ie->ent.key = item.key;
-	ie->ent.data = item.data;
-
-	SLIST_INSERT_HEAD(head, ie, link);
-	return &ie->ent;
-}
diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c
deleted file mode 100644
index e846be2..0000000
--- a/lib/libc/stdlib/heapsort.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ronnie Kon at Mindcraft Inc., Kevin Lew and Elmer Yglesias.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)heapsort.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/heapsort.c,v 1.4 2002/03/21 22:48:41 obrien Exp $");
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-/*
- * Swap two areas of size number of bytes.  Although qsort(3) permits random
- * blocks of memory to be sorted, sorting pointers is almost certainly the
- * common case (and, were it not, could easily be made so).  Regardless, it
- * isn't worth optimizing; the SWAP's get sped up by the cache, and pointer
- * arithmetic gets lost in the time required for comparison function calls.
- */
-#define	SWAP(a, b, count, size, tmp) { \
-	count = size; \
-	do { \
-		tmp = *a; \
-		*a++ = *b; \
-		*b++ = tmp; \
-	} while (--count); \
-}
-
-/* Copy one block of size size to another. */
-#define COPY(a, b, count, size, tmp1, tmp2) { \
-	count = size; \
-	tmp1 = a; \
-	tmp2 = b; \
-	do { \
-		*tmp1++ = *tmp2++; \
-	} while (--count); \
-}
-
-/*
- * Build the list into a heap, where a heap is defined such that for
- * the records K1 ... KN, Kj/2 >= Kj for 1 <= j/2 <= j <= N.
- *
- * There two cases.  If j == nmemb, select largest of Ki and Kj.  If
- * j < nmemb, select largest of Ki, Kj and Kj+1.
- */
-#define CREATE(initval, nmemb, par_i, child_i, par, child, size, count, tmp) { \
-	for (par_i = initval; (child_i = par_i * 2) <= nmemb; \
-	    par_i = child_i) { \
-		child = base + child_i * size; \
-		if (child_i < nmemb && compar(child, child + size) < 0) { \
-			child += size; \
-			++child_i; \
-		} \
-		par = base + par_i * size; \
-		if (compar(child, par) <= 0) \
-			break; \
-		SWAP(par, child, count, size, tmp); \
-	} \
-}
-
-/*
- * Select the top of the heap and 'heapify'.  Since by far the most expensive
- * action is the call to the compar function, a considerable optimization
- * in the average case can be achieved due to the fact that k, the displaced
- * elememt, is ususally quite small, so it would be preferable to first
- * heapify, always maintaining the invariant that the larger child is copied
- * over its parent's record.
- *
- * Then, starting from the *bottom* of the heap, finding k's correct place,
- * again maintianing the invariant.  As a result of the invariant no element
- * is 'lost' when k is assigned its correct place in the heap.
- *
- * The time savings from this optimization are on the order of 15-20% for the
- * average case. See Knuth, Vol. 3, page 158, problem 18.
- *
- * XXX Don't break the #define SELECT line, below.  Reiser cpp gets upset.
- */
-#define SELECT(par_i, child_i, nmemb, par, child, size, k, count, tmp1, tmp2) { \
-	for (par_i = 1; (child_i = par_i * 2) <= nmemb; par_i = child_i) { \
-		child = base + child_i * size; \
-		if (child_i < nmemb && compar(child, child + size) < 0) { \
-			child += size; \
-			++child_i; \
-		} \
-		par = base + par_i * size; \
-		COPY(par, child, count, size, tmp1, tmp2); \
-	} \
-	for (;;) { \
-		child_i = par_i; \
-		par_i = child_i / 2; \
-		child = base + child_i * size; \
-		par = base + par_i * size; \
-		if (child_i == 1 || compar(k, par) < 0) { \
-			COPY(child, k, count, size, tmp1, tmp2); \
-			break; \
-		} \
-		COPY(child, par, count, size, tmp1, tmp2); \
-	} \
-}
-
-/*
- * Heapsort -- Knuth, Vol. 3, page 145.  Runs in O (N lg N), both average
- * and worst.  While heapsort is faster than the worst case of quicksort,
- * the BSD quicksort does median selection so that the chance of finding
- * a data set that will trigger the worst case is nonexistent.  Heapsort's
- * only advantage over quicksort is that it requires little additional memory.
- */
-int
-heapsort(vbase, nmemb, size, compar)
-	void *vbase;
-	size_t nmemb, size;
-	int (*compar)(const void *, const void *);
-{
-	int cnt, i, j, l;
-	char tmp, *tmp1, *tmp2;
-	char *base, *k, *p, *t;
-
-	if (nmemb <= 1)
-		return (0);
-
-	if (!size) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if ((k = malloc(size)) == NULL)
-		return (-1);
-
-	/*
-	 * Items are numbered from 1 to nmemb, so offset from size bytes
-	 * below the starting address.
-	 */
-	base = (char *)vbase - size;
-
-	for (l = nmemb / 2 + 1; --l;)
-		CREATE(l, nmemb, i, j, t, p, size, cnt, tmp);
-
-	/*
-	 * For each element of the heap, save the largest element into its
-	 * final slot, save the displaced element (k), then recreate the
-	 * heap.
-	 */
-	while (nmemb > 1) {
-		COPY(k, base + nmemb * size, cnt, size, tmp1, tmp2);
-		COPY(base + nmemb * size, base + size, cnt, size, tmp1, tmp2);
-		--nmemb;
-		SELECT(i, j, nmemb, t, p, size, k, cnt, tmp1, tmp2);
-	}
-	free(k);
-	return (0);
-}
diff --git a/lib/libc/stdlib/imaxabs.c b/lib/libc/stdlib/imaxabs.c
deleted file mode 100644
index 531de24..0000000
--- a/lib/libc/stdlib/imaxabs.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/imaxabs.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
-
-#include <inttypes.h>
-
-intmax_t
-imaxabs(intmax_t j)
-{
-	return (j < 0 ? -j : j);
-}
diff --git a/lib/libc/stdlib/imaxdiv.c b/lib/libc/stdlib/imaxdiv.c
deleted file mode 100644
index ff3087b..0000000
--- a/lib/libc/stdlib/imaxdiv.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/imaxdiv.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
-
-#include <inttypes.h>
-
-/* See comments in div.c for implementation details. */
-imaxdiv_t
-imaxdiv(intmax_t numer, intmax_t denom)
-{
-	imaxdiv_t retval;
-
-	retval.quot = numer / denom;
-	retval.rem = numer % denom;
-	if (numer >= 0 && retval.rem < 0) {
-		retval.quot++;
-		retval.rem -= denom;
-	}
-	return (retval);
-}
diff --git a/lib/libc/stdlib/insque.c b/lib/libc/stdlib/insque.c
deleted file mode 100644
index 92984b0..0000000
--- a/lib/libc/stdlib/insque.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Initial implementation:
- * Copyright (c) 2002 Robert Drehmel
- * All rights reserved.
- *
- * As long as the above copyright statement and this notice remain
- * unchanged, you can do what ever you want with this file. 
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/insque.c,v 1.3 2003/01/04 07:34:41 tjr Exp $");
-
-#define	_SEARCH_PRIVATE
-#include <search.h>
-#ifdef DEBUG
-#include <stdio.h>
-#else
-#include <stdlib.h>	/* for NULL */
-#endif
-
-void
-insque(void *element, void *pred)
-{
-	struct que_elem *prev, *next, *elem;
-
-	elem = (struct que_elem *)element;
-	prev = (struct que_elem *)pred;
-
-	if (prev == NULL) {
-		elem->prev = elem->next = NULL;
-		return;
-	}
-
-	next = prev->next;
-	if (next != NULL) {
-#ifdef DEBUG
-		if (next->prev != prev) {
-			fprintf(stderr, "insque: Inconsistency detected:"
-			    " next(%p)->prev(%p) != prev(%p)\n",
-			    next, next->prev, prev);
-		}
-#endif
-		next->prev = elem;
-	}
-	prev->next = elem;
-	elem->prev = prev;
-	elem->next = next;
-}
diff --git a/lib/libc/stdlib/l64a.c b/lib/libc/stdlib/l64a.c
deleted file mode 100644
index c503558..0000000
--- a/lib/libc/stdlib/l64a.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: l64a.c,v 1.13 2003/07/26 19:24:54 salo Exp $");
-#endif /* not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/l64a.c,v 1.1.2.1 2006/01/27 05:17:25 trhodes Exp $");
-
-#include <stdlib.h>
-
-#define	ADOT	46		/* ASCII '.' */
-#define	ASLASH	ADOT + 1	/* ASCII '/' */
-#define	A0	48		/* ASCII '0' */
-#define	AA	65		/* ASCII 'A' */
-#define	Aa	97		/* ASCII 'a' */
-
-char *
-l64a(long value)
-{
-	static char buf[8];
-
-	(void)l64a_r(value, buf, sizeof(buf));
-	return (buf);
-}
-
-int
-l64a_r(long value, char *buffer, int buflen)
-{
-	long v;
-	int digit;
-
-	v = value & (long)0xffffffff;
-	for (; v != 0 && buflen > 1; buffer++, buflen--) {
-		digit = v & 0x3f;
-		if (digit < 2)
-			*buffer = digit + ADOT;
-		else if (digit < 12)
-			*buffer = digit + A0 - 2;
-		else if (digit < 38)
-			*buffer = digit + AA - 12;
-		else
-			*buffer = digit + Aa - 38;
-		v >>= 6;
-	}
-	return (v == 0 ? 0 : -1);
-}
diff --git a/lib/libc/stdlib/labs.c b/lib/libc/stdlib/labs.c
deleted file mode 100644
index 42e63d1..0000000
--- a/lib/libc/stdlib/labs.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)labs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/labs.c,v 1.2 2002/03/22 21:53:10 obrien Exp $");
-
-#include <stdlib.h>
-
-long
-labs(j)
-	long j;
-{
-	return(j < 0 ? -j : j);
-}
diff --git a/lib/libc/stdlib/ldiv.c b/lib/libc/stdlib/ldiv.c
deleted file mode 100644
index 560d5c2..0000000
--- a/lib/libc/stdlib/ldiv.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ldiv.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/ldiv.c,v 1.2 2002/03/22 21:53:10 obrien Exp $");
-
-#include <stdlib.h>		/* ldiv_t */
-
-ldiv_t
-ldiv(num, denom)
-	long num, denom;
-{
-	ldiv_t r;
-
-	/* see div.c for comments */
-
-	r.quot = num / denom;
-	r.rem = num % denom;
-	if (num >= 0 && r.rem < 0) {
-		r.quot++;
-		r.rem -= denom;
-	}
-	return (r);
-}
diff --git a/lib/libc/stdlib/llabs.c b/lib/libc/stdlib/llabs.c
deleted file mode 100644
index 4721fce..0000000
--- a/lib/libc/stdlib/llabs.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/llabs.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
-
-#include <stdlib.h>
-
-long long
-llabs(long long j)
-{
-	return (j < 0 ? -j : j);
-}
diff --git a/lib/libc/stdlib/lldiv.c b/lib/libc/stdlib/lldiv.c
deleted file mode 100644
index c9a4853..0000000
--- a/lib/libc/stdlib/lldiv.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/lldiv.c,v 1.1 2001/11/15 02:05:03 mike Exp $");
-
-#include <stdlib.h>
-
-/* See comments in div.c for implementation details. */
-lldiv_t
-lldiv(long long numer, long long denom)
-{
-	lldiv_t retval;
-
-	retval.quot = numer / denom;
-	retval.rem = numer % denom;
-	if (numer >= 0 && retval.rem < 0) {
-		retval.quot++;
-		retval.rem -= denom;
-	}
-	return (retval);
-}
diff --git a/lib/libc/stdlib/lsearch.c b/lib/libc/stdlib/lsearch.c
deleted file mode 100644
index 791bc49..0000000
--- a/lib/libc/stdlib/lsearch.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Initial implementation:
- * Copyright (c) 2002 Robert Drehmel
- * All rights reserved.
- *
- * As long as the above copyright statement and this notice remain
- * unchanged, you can do what ever you want with this file. 
- */
-#include <sys/types.h>
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/lsearch.c,v 1.1 2002/10/16 14:29:22 robert Exp $");
-
-#define	_SEARCH_PRIVATE
-#include <search.h>
-#include <stdint.h>	/* for uint8_t */
-#include <stdlib.h>	/* for NULL */
-#include <string.h>	/* for memcpy() prototype */
-
-static void *lwork(const void *, const void *, size_t *, size_t,
-    int (*)(const void *, const void *), int);
-
-void *lsearch(const void *key, void *base, size_t *nelp, size_t width,
-    int (*compar)(const void *, const void *))
-{
-
-	return (lwork(key, base, nelp, width, compar, 1));
-}
-
-void *lfind(const void *key, const void *base, size_t *nelp, size_t width,
-    int (*compar)(const void *, const void *))
-{
-
-	return (lwork(key, base, nelp, width, compar, 0));
-}
-
-static void *
-lwork(const void *key, const void *base, size_t *nelp, size_t width,
-    int (*compar)(const void *, const void *), int addelem)
-{
-	uint8_t *ep, *endp;
-
-	/*
-	 * Cast to an integer value first to avoid the warning for removing
-	 * 'const' via a cast.
-	 */
-	ep = (uint8_t *)(uintptr_t)base;
-	for (endp = (uint8_t *)(ep + width * *nelp); ep < endp; ep += width) {
-		if (compar(key, ep) == 0)
-			return (ep);
-	}
-
-	/* lfind() shall return when the key was not found. */
-	if (!addelem)
-		return (NULL);
-
-	/*
-	 * lsearch() adds the key to the end of the table and increments
-	 * the number of elements.
-	 */
-	memcpy(endp, key, width);
-	++*nelp;
-
-	return (endp);
-}
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
deleted file mode 100644
index bd67e70..0000000
--- a/lib/libc/stdlib/malloc.c
+++ /dev/null
@@ -1,1128 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.90.2.1 2005/09/18 03:45:24 scottl Exp $");
-
-/*
- * Defining MALLOC_EXTRA_SANITY will enable extra checks which are related
- * to internal conditions and consistency in malloc.c. This has a
- * noticeable runtime performance hit, and generally will not do you
- * any good unless you fiddle with the internals of malloc or want
- * to catch random pointer corruption as early as possible.
- */
-#undef MALLOC_EXTRA_SANITY
-
-/*
- * What to use for Junk.  This is the byte value we use to fill with
- * when the 'J' option is enabled.
- */
-#define SOME_JUNK	0xd0		/* as in "Duh" :-) */
-
-/*
- * The basic parameters you can tweak.
- *
- * malloc_pageshift	pagesize = 1 << malloc_pageshift
- *			It's probably best if this is the native
- *			page size, but it doesn't have to be.
- *
- * malloc_minsize	minimum size of an allocation in bytes.
- *			If this is too small it's too much work
- *			to manage them.  This is also the smallest
- *			unit of alignment used for the storage
- *			returned by malloc/realloc.
- *
- */
-
-#include "namespace.h"
-#if defined(__FreeBSD__)
-#   if defined(__i386__)
-#       define malloc_pageshift		12U
-#       define malloc_minsize		16U
-#   endif
-#   if defined(__ia64__)
-#	define malloc_pageshift		13U
-#	define malloc_minsize		16U
-#   endif
-#   if defined(__alpha__)
-#       define malloc_pageshift		13U
-#       define malloc_minsize		16U
-#   endif
-#   if defined(__sparc64__)
-#       define malloc_pageshift		13U
-#       define malloc_minsize		16U
-#   endif
-#   if defined(__amd64__)
-#       define malloc_pageshift		12U
-#       define malloc_minsize		16U
-#   endif
-#   if defined(__arm__)
-#       define malloc_pageshift         12U
-#       define malloc_minsize           16U
-#   endif
-#   define HAS_UTRACE
-    /*
-     * Make malloc/free/realloc thread-safe in libc for use with
-     * kernel threads.
-     */
-#   include "libc_private.h"
-#   include "spinlock.h"
-    static spinlock_t thread_lock	= _SPINLOCK_INITIALIZER;
-    spinlock_t *__malloc_lock		= &thread_lock;
-#   define _MALLOC_LOCK()		if (__isthreaded) _SPINLOCK(&thread_lock);
-#   define _MALLOC_UNLOCK()		if (__isthreaded) _SPINUNLOCK(&thread_lock);
-#endif /* __FreeBSD__ */
-
-/* Insert your combination here... */
-#if defined(__FOOCPU__) && defined(__BAROS__)
-#   define malloc_pageshift		12U
-#   define malloc_minsize		16U
-#endif /* __FOOCPU__ && __BAROS__ */
-
-#ifndef ZEROSIZEPTR
-#define ZEROSIZEPTR	((void *)(uintptr_t)(1 << (malloc_pageshift - 1)))
-#endif
-
-/*
- * No user serviceable parts behind this point.
- */
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-/*
- * This structure describes a page worth of chunks.
- */
-
-struct pginfo {
-    struct pginfo	*next;	/* next on the free list */
-    void		*page;	/* Pointer to the page */
-    u_short		size;	/* size of this page's chunks */
-    u_short		shift;	/* How far to shift for this size chunks */
-    u_short		free;	/* How many free chunks */
-    u_short		total;	/* How many chunk */
-    u_int		bits[1]; /* Which chunks are free */
-};
-
-/*
- * This structure describes a number of free pages.
- */
-
-struct pgfree {
-    struct pgfree	*next;	/* next run of free pages */
-    struct pgfree	*prev;	/* prev run of free pages */
-    void		*page;	/* pointer to free pages */
-    void		*end;	/* pointer to end of free pages */
-    size_t		size;	/* number of bytes free */
-};
-
-/*
- * How many bits per u_int in the bitmap.
- * Change only if not 8 bits/byte
- */
-#define	MALLOC_BITS	(8*sizeof(u_int))
-
-/*
- * Magic values to put in the page_directory
- */
-#define MALLOC_NOT_MINE	((struct pginfo*) 0)
-#define MALLOC_FREE 	((struct pginfo*) 1)
-#define MALLOC_FIRST	((struct pginfo*) 2)
-#define MALLOC_FOLLOW	((struct pginfo*) 3)
-#define MALLOC_MAGIC	((struct pginfo*) 4)
-
-#ifndef malloc_pageshift
-#define malloc_pageshift		12U
-#endif
-
-#ifndef malloc_minsize
-#define malloc_minsize			16U
-#endif
-
-#if !defined(malloc_pagesize)
-#define malloc_pagesize			(1UL<<malloc_pageshift)
-#endif
-
-#if ((1<<malloc_pageshift) != malloc_pagesize)
-#error	"(1<<malloc_pageshift) != malloc_pagesize"
-#endif
-
-#ifndef malloc_maxsize
-#define malloc_maxsize			((malloc_pagesize)>>1)
-#endif
-
-/* A mask for the offset inside a page.  */
-#define malloc_pagemask	((malloc_pagesize)-1)
-
-#define pageround(foo) (((foo) + (malloc_pagemask))&(~(malloc_pagemask)))
-#define ptr2index(foo) (((u_long)(foo) >> malloc_pageshift)-malloc_origo)
-
-#ifndef _MALLOC_LOCK
-#define _MALLOC_LOCK()
-#endif
-
-#ifndef _MALLOC_UNLOCK
-#define _MALLOC_UNLOCK()
-#endif
-
-#ifndef MMAP_FD
-#define MMAP_FD (-1)
-#endif
-
-#ifndef INIT_MMAP
-#define INIT_MMAP()
-#endif
-
-/* Number of free pages we cache */
-static unsigned malloc_cache = 16;
-
-/* The offset from pagenumber to index into the page directory */
-static u_long malloc_origo;
-
-/* The last index in the page directory we care about */
-static u_long last_index;
-
-/* Pointer to page directory. Allocated "as if with" malloc */
-static struct	pginfo **page_dir;
-
-/* How many slots in the page directory */
-static unsigned	malloc_ninfo;
-
-/* Free pages line up here */
-static struct pgfree free_list;
-
-/* Abort(), user doesn't handle problems.  */
-static int malloc_abort = 0;
-
-/* Are we trying to die ?  */
-static int suicide;
-
-/* always realloc ?  */
-static int malloc_realloc;
-
-#if defined(MADV_FREE)
-/* pass the kernel a hint on free pages ?  */
-static int malloc_hint = 0;
-#endif
-
-/* xmalloc behaviour ?  */
-static int malloc_xmalloc;
-
-/* sysv behaviour for malloc(0) ?  */
-static int malloc_sysv;
-
-/* zero fill ?  */
-static int malloc_zero;
-
-/* junk fill ?  */
-static int malloc_junk = 0;
-
-#ifdef HAS_UTRACE
-
-/* utrace ?  */
-static int malloc_utrace;
-
-struct ut { void *p; size_t s; void *r; };
-
-void utrace(struct ut *, int);
-
-#define UTRACE(a, b, c) \
-	if (malloc_utrace) \
-		{struct ut u; u.p=a; u.s = b; u.r=c; utrace(&u, sizeof u);}
-#else /* !HAS_UTRACE */
-#define UTRACE(a,b,c)
-#endif /* HAS_UTRACE */
-
-/* my last break. */
-static void *malloc_brk;
-
-/* one location cache for free-list holders */
-static struct pgfree *px;
-
-/* compile-time options */
-const char *_malloc_options;
-
-/* Name of the current public function */
-static const char *malloc_func;
-
-/* Macro for mmap */
-#define MMAP(size) \
-	mmap(NULL, (size), PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, MMAP_FD, (off_t)0);
-
-/*
- * Necessary function declarations
- */
-static int extend_pgdir(u_long index);
-static void *imalloc(size_t size);
-static void ifree(void *ptr);
-static void *irealloc(void *ptr, size_t size);
-
-static void
-wrtmessage(const char *p1, const char *p2, const char *p3, const char *p4)
-{
-
-    _write(STDERR_FILENO, p1, strlen(p1));
-    _write(STDERR_FILENO, p2, strlen(p2));
-    _write(STDERR_FILENO, p3, strlen(p3));
-    _write(STDERR_FILENO, p4, strlen(p4));
-}
-
-void (*_malloc_message)(const char *p1, const char *p2, const char *p3,
-	    const char *p4) = wrtmessage;
-
-static void
-wrterror(char const *p)
-{
-
-    suicide = 1;
-    _malloc_message(_getprogname(), malloc_func, " error: ", p);
-    abort();
-}
-
-static void
-wrtwarning(char *p)
-{
-
-    /*
-     * Sensitive processes, somewhat arbitrarily defined here as setuid,
-     * setgid, root and wheel cannot afford to have malloc mistakes.
-     */
-    if (malloc_abort || issetugid() || getuid() == 0 || getgid() == 0)
-	wrterror(p);
-    _malloc_message(_getprogname(), malloc_func, " warning: ", p);
-}
-
-/*
- * Allocate a number of pages from the OS
- */
-static void *map_pages(size_t pages) {
-  caddr_t result, tail;
-
-  result = (caddr_t)pageround((u_long)sbrk(0));
-  tail = result + (pages << malloc_pageshift);
-
-  if (tail < result)
-    return (NULL);
-
-  if (brk(tail)) {
-    wrterror("(ES): map_pages fails\n");
-    return (NULL);
-    }
-
-  last_index = ptr2index(tail) - 1;
-  malloc_brk = tail;
-
-
-  if ((last_index+1) >= malloc_ninfo && !extend_pgdir(last_index))
-    return (NULL);
-
-  return (result);
-  }
-
-/*
- * Extend page directory
- */
-static int
-extend_pgdir(u_long index)
-{
-    struct  pginfo **new, **old;
-    u_long i, oldlen;
-
-    /* Make it this many pages */
-    i = index * sizeof *page_dir;
-    i /= malloc_pagesize;
-    i += 2;
-
-    /* remember the old mapping size */
-    oldlen = malloc_ninfo * sizeof *page_dir;
-
-    /*
-     * NOTE: we allocate new pages and copy the directory rather than tempt
-     * fate by trying to "grow" the region.. There is nothing to prevent
-     * us from accidently re-mapping space that's been allocated by our caller
-     * via dlopen() or other mmap().
-     *
-     * The copy problem is not too bad, as there is 4K of page index per
-     * 4MB of malloc arena.
-     *
-     * We can totally avoid the copy if we open a file descriptor to associate
-     * the anon mappings with.  Then, when we remap the pages at the new
-     * address, the old pages will be "magically" remapped..  But this means
-     * keeping open a "secret" file descriptor.....
-     */
-
-    /* Get new pages */
-    new = (struct pginfo**) MMAP(i * malloc_pagesize);
-    if (new == MAP_FAILED)
-	return (0);
-
-    /* Copy the old stuff */
-    memcpy(new, page_dir,
-	    malloc_ninfo * sizeof *page_dir);
-
-    /* register the new size */
-    malloc_ninfo = i * malloc_pagesize / sizeof *page_dir;
-
-    /* swap the pointers */
-    old = page_dir;
-    page_dir = new;
-
-    /* Now free the old stuff */
-    munmap(old, oldlen);
-    return (1);
-}
-
-/*
- * Initialize the world
- */
-static void
-malloc_init(void)
-{
-    const char *p;
-    char b[64];
-    int i, j;
-    int save_errno = errno;
-
-    INIT_MMAP();
-
-#ifdef MALLOC_EXTRA_SANITY
-    malloc_junk = 1;
-#endif /* MALLOC_EXTRA_SANITY */
-
-    for (i = 0; i < 3; i++) {
-	if (i == 0) {
-	    j = readlink("/etc/malloc.conf", b, sizeof b - 1);
-	    if (j <= 0)
-		continue;
-	    b[j] = '\0';
-	    p = b;
-	} else if (i == 1 && issetugid() == 0) {
-	    p = getenv("MALLOC_OPTIONS");
-	} else if (i == 1) {
-	    continue;
-	} else {
-	    p = _malloc_options;
-	}
-	for (; p != NULL && *p != '\0'; p++) {
-	    switch (*p) {
-		case '>': malloc_cache   <<= 1; break;
-		case '<': malloc_cache   >>= 1; break;
-		case 'a': malloc_abort   = 0; break;
-		case 'A': malloc_abort   = 1; break;
-#if defined(MADV_FREE)
-		case 'h': malloc_hint    = 0; break;
-		case 'H': malloc_hint    = 1; break;
-#endif
-		case 'r': malloc_realloc = 0; break;
-		case 'R': malloc_realloc = 1; break;
-		case 'j': malloc_junk    = 0; break;
-		case 'J': malloc_junk    = 1; break;
-#ifdef HAS_UTRACE
-		case 'u': malloc_utrace  = 0; break;
-		case 'U': malloc_utrace  = 1; break;
-#endif
-		case 'v': malloc_sysv    = 0; break;
-		case 'V': malloc_sysv    = 1; break;
-		case 'x': malloc_xmalloc = 0; break;
-		case 'X': malloc_xmalloc = 1; break;
-		case 'z': malloc_zero    = 0; break;
-		case 'Z': malloc_zero    = 1; break;
-		default:
-		    _malloc_message(_getprogname(), malloc_func,
-			 " warning: ", "unknown char in MALLOC_OPTIONS\n");
-		    break;
-	    }
-	}
-    }
-    UTRACE(0, 0, 0);
-
-    /*
-     * We want junk in the entire allocation, and zero only in the part
-     * the user asked for.
-     */
-    if (malloc_zero)
-	malloc_junk=1;
-
-    /* Allocate one page for the page directory */
-    page_dir = (struct pginfo **) MMAP(malloc_pagesize);
-
-    if (page_dir == MAP_FAILED)
-	wrterror("mmap(2) failed, check limits\n");
-
-    /*
-     * We need a maximum of malloc_pageshift buckets, steal these from the
-     * front of the page_directory;
-     */
-    malloc_origo = ((u_long)pageround((u_long)sbrk(0))) >> malloc_pageshift;
-    malloc_origo -= malloc_pageshift;
-    malloc_ninfo = malloc_pagesize / sizeof *page_dir;
-
-    /* Recalculate the cache size in bytes, and make sure it's nonzero */
-
-    if (!malloc_cache)
-	malloc_cache++;
-
-    malloc_cache <<= malloc_pageshift;
-
-    /*
-     * This is a nice hack from Kaleb Keithly (kaleb@x.org).
-     * We can sbrk(2) further back when we keep this on a low address.
-     */
-    px = (struct pgfree *) imalloc (sizeof *px);
-    errno = save_errno;
-}
-
-/*
- * Allocate a number of complete pages
- */
-static void *malloc_pages(size_t size) {
-  void *p, *delay_free = NULL;
-  size_t i;
-  struct pgfree *pf;
-  u_long index;
-
-  size = pageround(size);
-
-  p = NULL;
-  /* Look for free pages before asking for more */
-  for(pf = free_list.next; pf; pf = pf->next) {
-
-    if (pf->size < size)
-       continue;
-
-    if (pf->size == size) {
-      p = pf->page;
-     if (pf->next != NULL)
-       pf->next->prev = pf->prev;
-       pf->prev->next = pf->next;
-       delay_free = pf;
-       break;
-       }
-
-    p = pf->page;
-    pf->page = (char *)pf->page + size;
-    pf->size -= size;
-    break;
-    }
-
-  size >>= malloc_pageshift;
-  /* Map new pages */
-  if (p == NULL)
-    p = map_pages(size);
-
-
-    if (p != NULL) {
-
-	index = ptr2index(p);
-	page_dir[index] = MALLOC_FIRST;
-	for (i=1;i<size;i++)
-	    page_dir[index+i] = MALLOC_FOLLOW;
-
-	if (malloc_junk)
-	    memset(p, SOME_JUNK, size << malloc_pageshift);
-    }
-
-    if (delay_free) {
-	if (px == NULL)
-	    px = delay_free;
-	else
-	    ifree(delay_free);
-    }
-
-    return (p);
-}
-
-/*
- * Allocate a page of fragments
- */
-
-static __inline int
-malloc_make_chunks(int bits)
-{
-    struct  pginfo *bp;
-    void *pp;
-    int i, k, l;
-
-    /* Allocate a new bucket */
-    pp = malloc_pages(malloc_pagesize);
-    if (pp == NULL)
-	return (0);
-    /* Find length of admin structure */
-    l = offsetof(struct pginfo, bits[0]);
-    l += sizeof bp->bits[0] *
-	(((malloc_pagesize >> bits)+MALLOC_BITS-1) / MALLOC_BITS);
-
-    /* Don't waste more than two chunks on this */
-    if ((1<<(bits)) <= l+l) {
-	bp = (struct  pginfo *)pp;
-    } else {
-	bp = (struct  pginfo *)imalloc(l);
-	if (bp == NULL) {
-	    ifree(pp);
-	    return (0);
-	}
-    }
-
-    bp->size = (1<<bits);
-    bp->shift = bits;
-    bp->total = bp->free = malloc_pagesize >> bits;
-    bp->page = pp;
-
-    /* set all valid bits in the bitmap */
-    k = bp->total;
-    i = 0;
-
-    /* Do a bunch at a time */
-    for(;k-i >= MALLOC_BITS; i += MALLOC_BITS)
-	bp->bits[i / MALLOC_BITS] = ~0;
-
-    for(; i < k; i++)
-        bp->bits[i/MALLOC_BITS] |= 1<<(i%MALLOC_BITS);
-
-    if (bp == bp->page) {
-	/* Mark the ones we stole for ourselves */
-	for(i=0;l > 0;i++) {
-	    bp->bits[i/MALLOC_BITS] &= ~(1<<(i%MALLOC_BITS));
-	    bp->free--;
-	    bp->total--;
-	    l -= (1 << bits);
-	}
-    }
-
-    /* MALLOC_LOCK */
-
-    page_dir[ptr2index(pp)] = bp;
-
-    bp->next = page_dir[bits];
-    page_dir[bits] = bp;
-
-    /* MALLOC_UNLOCK */
-
-    return (1);
-}
-
-/*
- * Allocate a fragment
- */
-static void *
-malloc_bytes(size_t size)
-{
-    int i,j;
-    u_int u;
-    struct  pginfo *bp;
-    int k;
-    u_int *lp;
-
-    /* Don't bother with anything less than this */
-    if (size < malloc_minsize)
-	size = malloc_minsize;
-
-    /* Find the right bucket */
-    j = 1;
-    i = size-1;
-    while (i >>= 1)
-	j++;
-    /* If it's empty, make a page more of that size chunks */
-    if (page_dir[j] == NULL && !malloc_make_chunks(j))
-	return (NULL);
-    bp = page_dir[j];
-
-    /* Find first word of bitmap which isn't empty */
-    for (lp = bp->bits; !*lp; lp++)
-	;
-
-    /* Find that bit, and tweak it */
-    u = 1;
-    k = 0;
-    while (!(*lp & u)) {
-	u += u;
-	k++;
-    }
-    *lp ^= u;
-
-    /* If there are no more free, remove from free-list */
-    if (!--bp->free) {
-	page_dir[j] = bp->next;
-	bp->next = NULL;
-    }
-
-    /* Adjust to the real offset of that chunk */
-    k += (lp-bp->bits)*MALLOC_BITS;
-    k <<= bp->shift;
-
-    if (malloc_junk)
-	memset((u_char *)bp->page + k, SOME_JUNK, bp->size);
-
-    return ((u_char *)bp->page + k);
-}
-
-/*
- * Allocate a piece of memory
- */
-static void *
-imalloc(size_t size)
-{
-    void *result;
-
-    if (suicide)
-	abort();
-
-  if ((size + malloc_pagesize) < size) {	/* Check for overflow */
-    result = NULL;
-    }
-  else if ((size + malloc_pagesize) >= (uintptr_t)page_dir) {
-    result = NULL;
-    }
-  else if (size <= malloc_maxsize) {
-    result = malloc_bytes(size);
-    }
-  else {
-    result = malloc_pages(size);
-    }
-  if (malloc_zero && result != NULL)
-    memset(result, 0, size);
-
-  return (result);
-  }
-
-/*
- * Change the size of an allocation.
- */
-static void *
-irealloc(void *ptr, size_t size)
-{
-    void *p;
-    u_long osize, index;
-    struct pginfo **mp;
-    int i;
-
-    if (suicide)
-	abort();
-
-    index = ptr2index(ptr);
-
-    if (index < malloc_pageshift) {
-	wrtwarning("junk pointer, too low to make sense\n");
-	return (NULL);
-    }
-
-    if (index > last_index) {
-	wrtwarning("junk pointer, too high to make sense\n");
-	return (NULL);
-    }
-
-    mp = &page_dir[index];
-
-    if (*mp == MALLOC_FIRST) {			/* Page allocation */
-
-	/* Check the pointer */
-	if ((u_long)ptr & malloc_pagemask) {
-	    wrtwarning("modified (page-) pointer\n");
-	    return (NULL);
-	}
-
-	/* Find the size in bytes */
-	for (osize = malloc_pagesize; *(++mp) == MALLOC_FOLLOW;)
-	    osize += malloc_pagesize;
-
-        if (!malloc_realloc && 			/* Unless we have to, */
-	  size <= osize && 			/* .. or are too small, */
-	  size > (osize - malloc_pagesize)) {	/* .. or can free a page, */
-	    if (malloc_junk)
-		memset((u_char *)ptr + size, SOME_JUNK, osize-size);
-	    return (ptr);			/* ..don't do anything else. */
-	}
-
-    } else if (*mp >= MALLOC_MAGIC) {		/* Chunk allocation */
-
-	/* Check the pointer for sane values */
-	if (((u_long)ptr & ((*mp)->size-1))) {
-	    wrtwarning("modified (chunk-) pointer\n");
-	    return (NULL);
-	}
-
-	/* Find the chunk index in the page */
-	i = ((u_long)ptr & malloc_pagemask) >> (*mp)->shift;
-
-	/* Verify that it isn't a free chunk already */
-        if ((*mp)->bits[i/MALLOC_BITS] & (1<<(i%MALLOC_BITS))) {
-	    wrtwarning("chunk is already free\n");
-	    return (NULL);
-	}
-
-	osize = (*mp)->size;
-
-	if (!malloc_realloc &&		/* Unless we have to, */
-	  size <= osize && 		/* ..or are too small, */
-	  (size > osize/2 ||	 	/* ..or could use a smaller size, */
-	  osize == malloc_minsize)) {	/* ..(if there is one) */
-	    if (malloc_junk)
-		memset((u_char *)ptr + size, SOME_JUNK, osize-size);
-	    return (ptr);		/* ..don't do anything else. */
-	}
-
-    } else {
-	wrtwarning("pointer to wrong page\n");
-	return (NULL);
-    }
-
-    p = imalloc(size);
-
-    if (p != NULL) {
-	/* copy the lesser of the two sizes, and free the old one */
-	if (!size || !osize)
-	    ;
-	else if (osize < size)
-	    memcpy(p, ptr, osize);
-	else
-	    memcpy(p, ptr, size);
-	ifree(ptr);
-    }
-    return (p);
-}
-
-/*
- * Free a sequence of pages
- */
-
-static __inline void
-free_pages(void *ptr, u_long index, struct pginfo const *info)
-{
-    u_long i;
-    struct pgfree *pf, *pt=NULL;
-    u_long l;
-    void *tail;
-
-    if (info == MALLOC_FREE) {
-	wrtwarning("page is already free\n");
-	return;
-    }
-
-    if (info != MALLOC_FIRST) {
-	wrtwarning("pointer to wrong page\n");
-	return;
-    }
-
-    if ((u_long)ptr & malloc_pagemask) {
-	wrtwarning("modified (page-) pointer\n");
-	return;
-    }
-
-    /* Count how many pages and mark them free at the same time */
-    page_dir[index] = MALLOC_FREE;
-    for (i = 1; page_dir[index+i] == MALLOC_FOLLOW; i++)
-	page_dir[index + i] = MALLOC_FREE;
-
-    l = i << malloc_pageshift;
-
-    if (malloc_junk)
-	memset(ptr, SOME_JUNK, l);
-
-#if defined(MADV_FREE)
-    if (malloc_hint)
-	madvise(ptr, l, MADV_FREE);
-#endif
-
-    tail = (char *)ptr+l;
-
-    /* add to free-list */
-    if (px == NULL)
-	px = imalloc(sizeof *px);	/* This cannot fail... */
-    px->page = ptr;
-    px->end =  tail;
-    px->size = l;
-    if (free_list.next == NULL) {
-
-	/* Nothing on free list, put this at head */
-	px->next = free_list.next;
-	px->prev = &free_list;
-	free_list.next = px;
-	pf = px;
-	px = NULL;
-
-    } else {
-
-	/* Find the right spot, leave pf pointing to the modified entry. */
-	tail = (char *)ptr+l;
-
-	for(pf = free_list.next; pf->end < ptr && pf->next != NULL;
-	    pf = pf->next)
-	    ; /* Race ahead here */
-
-	if (pf->page > tail) {
-	    /* Insert before entry */
-	    px->next = pf;
-	    px->prev = pf->prev;
-	    pf->prev = px;
-	    px->prev->next = px;
-	    pf = px;
-	    px = NULL;
-	} else if (pf->end == ptr ) {
-	    /* Append to the previous entry */
-	    pf->end = (char *)pf->end + l;
-	    pf->size += l;
-	    if (pf->next != NULL && pf->end == pf->next->page ) {
-		/* And collapse the next too. */
-		pt = pf->next;
-		pf->end = pt->end;
-		pf->size += pt->size;
-		pf->next = pt->next;
-		if (pf->next != NULL)
-		    pf->next->prev = pf;
-	    }
-	} else if (pf->page == tail) {
-	    /* Prepend to entry */
-	    pf->size += l;
-	    pf->page = ptr;
-	} else if (pf->next == NULL) {
-	    /* Append at tail of chain */
-	    px->next = NULL;
-	    px->prev = pf;
-	    pf->next = px;
-	    pf = px;
-	    px = NULL;
-	} else {
-	    wrterror("freelist is destroyed\n");
-	}
-    }
-
-    /* Return something to OS ? */
-    if (pf->next == NULL &&			/* If we're the last one, */
-      pf->size > malloc_cache &&		/* ..and the cache is full, */
-      pf->end == malloc_brk &&			/* ..and none behind us, */
-      malloc_brk == sbrk(0)) {			/* ..and it's OK to do... */
-
-	/*
-	 * Keep the cache intact.  Notice that the '>' above guarantees that
-	 * the pf will always have at least one page afterwards.
-	 */
-	pf->end = (char *)pf->page + malloc_cache;
-	pf->size = malloc_cache;
-
-	brk(pf->end);
-	malloc_brk = pf->end;
-
-	index = ptr2index(pf->end);
-
-	for(i=index;i <= last_index;)
-	    page_dir[i++] = MALLOC_NOT_MINE;
-
-	last_index = index - 1;
-
-	/* XXX: We could realloc/shrink the pagedir here I guess. */
-    }
-    if (pt != NULL)
-	ifree(pt);
-}
-
-/*
- * Free a chunk, and possibly the page it's on, if the page becomes empty.
- */
-
-static __inline void
-free_bytes(void *ptr, u_long index, struct pginfo *info)
-{
-    int i;
-    struct pginfo **mp;
-    void *vp;
-
-    /* Find the chunk number on the page */
-    i = ((u_long)ptr & malloc_pagemask) >> info->shift;
-
-    if (((u_long)ptr & (info->size-1))) {
-	wrtwarning("modified (chunk-) pointer\n");
-	return;
-    }
-
-    if (info->bits[i/MALLOC_BITS] & (1<<(i%MALLOC_BITS))) {
-	wrtwarning("chunk is already free\n");
-	return;
-    }
-
-    if (malloc_junk)
-	memset(ptr, SOME_JUNK, info->size);
-
-    info->bits[i/MALLOC_BITS] |= 1<<(i%MALLOC_BITS);
-    info->free++;
-
-    mp = page_dir + info->shift;
-
-    if (info->free == 1) {
-
-	/* Page became non-full */
-
-	mp = page_dir + info->shift;
-	/* Insert in address order */
-	while (*mp && (*mp)->next && (*mp)->next->page < info->page)
-	    mp = &(*mp)->next;
-	info->next = *mp;
-	*mp = info;
-	return;
-    }
-
-    if (info->free != info->total)
-	return;
-
-    /* Find & remove this page in the queue */
-    while (*mp != info) {
-	mp = &((*mp)->next);
-#ifdef MALLOC_EXTRA_SANITY
-	if (!*mp)
-		wrterror("(ES): Not on queue\n");
-#endif /* MALLOC_EXTRA_SANITY */
-    }
-    *mp = info->next;
-
-    /* Free the page & the info structure if need be */
-    page_dir[ptr2index(info->page)] = MALLOC_FIRST;
-    vp = info->page;		/* Order is important ! */
-    if(vp != (void*)info)
-	ifree(info);
-    ifree(vp);
-}
-
-static void
-ifree(void *ptr)
-{
-    struct pginfo *info;
-    u_long index;
-
-    /* This is legal */
-    if (ptr == NULL)
-	return;
-
-    /* If we're already sinking, don't make matters any worse. */
-    if (suicide)
-	return;
-
-    index = ptr2index(ptr);
-
-    if (index < malloc_pageshift) {
-	wrtwarning("junk pointer, too low to make sense\n");
-	return;
-    }
-
-    if (index > last_index) {
-	wrtwarning("junk pointer, too high to make sense\n");
-	return;
-    }
-
-    info = page_dir[index];
-
-    if (info < MALLOC_MAGIC)
-        free_pages(ptr, index, info);
-    else
-	free_bytes(ptr, index, info);
-    return;
-}
-
-static void *
-pubrealloc(void *ptr, size_t size, const char *func)
-{
-    void *r;
-    int err = 0;
-    static int malloc_active; /* Recusion flag for public interface. */
-    static unsigned malloc_started; /* Set when initialization has been done */
-
-    /*
-     * If a thread is inside our code with a functional lock held, and then
-     * catches a signal which calls us again, we would get a deadlock if the
-     * lock is not of a recursive type.
-     */
-    _MALLOC_LOCK();
-    malloc_func = func;
-    if (malloc_active > 0) {
-	if (malloc_active == 1) {
-	    wrtwarning("recursive call\n");
-	    malloc_active = 2;
-	}
-        _MALLOC_UNLOCK();
-	errno = EDOOFUS;
-	return (NULL);
-    } 
-    malloc_active = 1;
-
-    if (!malloc_started) {
-        if (ptr != NULL) {
-	    wrtwarning("malloc() has never been called\n");
-	    malloc_active = 0;
-            _MALLOC_UNLOCK();
-	    errno = EDOOFUS;
-	    return (NULL);
-	}
-	malloc_init();
-	malloc_started = 1;
-    }
-   
-    if (ptr == ZEROSIZEPTR)
-	ptr = NULL;
- 
-    if (malloc_sysv && !size) {
-      if (ptr != NULL)
-        ifree(ptr);
-      r = NULL;
-      }
-    else if (!size) {
-      if (ptr != NULL)
-        ifree(ptr);
-      r = ZEROSIZEPTR;
-      }
-    else if (ptr == NULL) {
-      r = imalloc(size);
-      if (r == 0x0)
-      err = (r == NULL);
-      }
-    else {
-      r = irealloc(ptr, size);
-      err = (r == NULL);
-      }
-    UTRACE(ptr, size, r);
-    malloc_active = 0;
-    _MALLOC_UNLOCK();
-    if (malloc_xmalloc && err)
-	wrterror("out of memory\n");
-    if (err)
-	errno = ENOMEM;
-    return (r);
-}
-
-/*
- * These are the public exported interface routines.
- */
-
-void *
-malloc(size_t size)
-{
-
-    return (pubrealloc(NULL, size, " in malloc():"));
-}
-
-void
-free(void *ptr)
-{
-
-    pubrealloc(ptr, 0, " in free():");
-}
-
-void *
-realloc(void *ptr, size_t size)
-{
-
-    return (pubrealloc(ptr, size, " in realloc():"));
-}
-
diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c
deleted file mode 100644
index de3440a..0000000
--- a/lib/libc/stdlib/merge.c
+++ /dev/null
@@ -1,355 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Peter McIlroy.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/merge.c,v 1.7 2005/01/12 03:39:34 brian Exp $");
-
-/*
- * Hybrid exponential search/linear search merge sort with hybrid
- * natural/pairwise first pass.  Requires about .3% more comparisons
- * for random data than LSMS with pairwise first pass alone.
- * It works for objects as small as two bytes.
- */
-
-#define NATURAL
-#define THRESHOLD 16	/* Best choice for natural merge cut-off. */
-
-/* #define NATURAL to get hybrid natural merge.
- * (The default is pairwise merging.)
- */
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-static void setup(u_char *, u_char *, size_t, size_t,
-    int (*)(const void *, const void *));
-static void insertionsort(u_char *, size_t, size_t,
-    int (*)(const void *, const void *));
-
-#define ISIZE sizeof(int)
-#define PSIZE sizeof(u_char *)
-#define ICOPY_LIST(src, dst, last)				\
-	do							\
-	*(int*)dst = *(int*)src, src += ISIZE, dst += ISIZE;	\
-	while(src < last)
-#define ICOPY_ELT(src, dst, i)					\
-	do							\
-	*(int*) dst = *(int*) src, src += ISIZE, dst += ISIZE;	\
-	while (i -= ISIZE)
-
-#define CCOPY_LIST(src, dst, last)		\
-	do					\
-		*dst++ = *src++;		\
-	while (src < last)
-#define CCOPY_ELT(src, dst, i)			\
-	do					\
-		*dst++ = *src++;		\
-	while (i -= 1)
-
-/*
- * Find the next possible pointer head.  (Trickery for forcing an array
- * to do double duty as a linked list when objects do not align with word
- * boundaries.
- */
-/* Assumption: PSIZE is a power of 2. */
-#define EVAL(p) (u_char **)						\
-	((u_char *)0 +							\
-	    (((u_char *)p + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1)))
-
-/*
- * Arguments are as for qsort.
- */
-int
-mergesort(base, nmemb, size, cmp)
-	void *base;
-	size_t nmemb;
-	size_t size;
-	int (*cmp)(const void *, const void *);
-{
-	size_t i;
-	int sense;
-	int big, iflag;
-	u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
-	u_char *list2, *list1, *p2, *p, *last, **p1;
-
-	if (size < PSIZE / 2) {		/* Pointers must fit into 2 * size. */
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (nmemb == 0)
-		return (0);
-
-	/*
-	 * XXX
-	 * Stupid subtraction for the Cray.
-	 */
-	iflag = 0;
-	if (!(size % ISIZE) && !(((char *)base - (char *)0) % ISIZE))
-		iflag = 1;
-
-	if ((list2 = malloc(nmemb * size + PSIZE)) == NULL)
-		return (-1);
-
-	list1 = base;
-	setup(list1, list2, nmemb, size, cmp);
-	last = list2 + nmemb * size;
-	i = big = 0;
-	while (*EVAL(list2) != last) {
-	    l2 = list1;
-	    p1 = EVAL(list1);
-	    for (tp2 = p2 = list2; p2 != last; p1 = EVAL(l2)) {
-	    	p2 = *EVAL(p2);
-	    	f1 = l2;
-	    	f2 = l1 = list1 + (p2 - list2);
-	    	if (p2 != last)
-	    		p2 = *EVAL(p2);
-	    	l2 = list1 + (p2 - list2);
-	    	while (f1 < l1 && f2 < l2) {
-	    		if ((*cmp)(f1, f2) <= 0) {
-	    			q = f2;
-	    			b = f1, t = l1;
-	    			sense = -1;
-	    		} else {
-	    			q = f1;
-	    			b = f2, t = l2;
-	    			sense = 0;
-	    		}
-	    		if (!big) {	/* here i = 0 */
-				while ((b += size) < t && cmp(q, b) >sense)
-	    				if (++i == 6) {
-	    					big = 1;
-	    					goto EXPONENTIAL;
-	    				}
-	    		} else {
-EXPONENTIAL:	    		for (i = size; ; i <<= 1)
-	    				if ((p = (b + i)) >= t) {
-	    					if ((p = t - size) > b &&
-						    (*cmp)(q, p) <= sense)
-	    						t = p;
-	    					else
-	    						b = p;
-	    					break;
-	    				} else if ((*cmp)(q, p) <= sense) {
-	    					t = p;
-	    					if (i == size)
-	    						big = 0;
-	    					goto FASTCASE;
-	    				} else
-	    					b = p;
-				while (t > b+size) {
-	    				i = (((t - b) / size) >> 1) * size;
-	    				if ((*cmp)(q, p = b + i) <= sense)
-	    					t = p;
-	    				else
-	    					b = p;
-	    			}
-	    			goto COPY;
-FASTCASE:	    		while (i > size)
-	    				if ((*cmp)(q,
-	    					p = b + (i >>= 1)) <= sense)
-	    					t = p;
-	    				else
-	    					b = p;
-COPY:	    			b = t;
-	    		}
-	    		i = size;
-	    		if (q == f1) {
-	    			if (iflag) {
-	    				ICOPY_LIST(f2, tp2, b);
-	    				ICOPY_ELT(f1, tp2, i);
-	    			} else {
-	    				CCOPY_LIST(f2, tp2, b);
-	    				CCOPY_ELT(f1, tp2, i);
-	    			}
-	    		} else {
-	    			if (iflag) {
-	    				ICOPY_LIST(f1, tp2, b);
-	    				ICOPY_ELT(f2, tp2, i);
-	    			} else {
-	    				CCOPY_LIST(f1, tp2, b);
-	    				CCOPY_ELT(f2, tp2, i);
-	    			}
-	    		}
-	    	}
-	    	if (f2 < l2) {
-	    		if (iflag)
-	    			ICOPY_LIST(f2, tp2, l2);
-	    		else
-	    			CCOPY_LIST(f2, tp2, l2);
-	    	} else if (f1 < l1) {
-	    		if (iflag)
-	    			ICOPY_LIST(f1, tp2, l1);
-	    		else
-	    			CCOPY_LIST(f1, tp2, l1);
-	    	}
-	    	*p1 = l2;
-	    }
-	    tp2 = list1;	/* swap list1, list2 */
-	    list1 = list2;
-	    list2 = tp2;
-	    last = list2 + nmemb*size;
-	}
-	if (base == list2) {
-		memmove(list2, list1, nmemb*size);
-		list2 = list1;
-	}
-	free(list2);
-	return (0);
-}
-
-#define	swap(a, b) {					\
-		s = b;					\
-		i = size;				\
-		do {					\
-			tmp = *a; *a++ = *s; *s++ = tmp; \
-		} while (--i);				\
-		a -= size;				\
-	}
-#define reverse(bot, top) {				\
-	s = top;					\
-	do {						\
-		i = size;				\
-		do {					\
-			tmp = *bot; *bot++ = *s; *s++ = tmp; \
-		} while (--i);				\
-		s -= size2;				\
-	} while(bot < s);				\
-}
-
-/*
- * Optional hybrid natural/pairwise first pass.  Eats up list1 in runs of
- * increasing order, list2 in a corresponding linked list.  Checks for runs
- * when THRESHOLD/2 pairs compare with same sense.  (Only used when NATURAL
- * is defined.  Otherwise simple pairwise merging is used.)
- */
-void
-setup(list1, list2, n, size, cmp)
-	size_t n, size;
-	int (*cmp)(const void *, const void *);
-	u_char *list1, *list2;
-{
-	int i, length, size2, tmp, sense;
-	u_char *f1, *f2, *s, *l2, *last, *p2;
-
-	size2 = size*2;
-	if (n <= 5) {
-		insertionsort(list1, n, size, cmp);
-		*EVAL(list2) = (u_char*) list2 + n*size;
-		return;
-	}
-	/*
-	 * Avoid running pointers out of bounds; limit n to evens
-	 * for simplicity.
-	 */
-	i = 4 + (n & 1);
-	insertionsort(list1 + (n - i) * size, i, size, cmp);
-	last = list1 + size * (n - i);
-	*EVAL(list2 + (last - list1)) = list2 + n * size;
-
-#ifdef NATURAL
-	p2 = list2;
-	f1 = list1;
-	sense = (cmp(f1, f1 + size) > 0);
-	for (; f1 < last; sense = !sense) {
-		length = 2;
-					/* Find pairs with same sense. */
-		for (f2 = f1 + size2; f2 < last; f2 += size2) {
-			if ((cmp(f2, f2+ size) > 0) != sense)
-				break;
-			length += 2;
-		}
-		if (length < THRESHOLD) {		/* Pairwise merge */
-			do {
-				p2 = *EVAL(p2) = f1 + size2 - list1 + list2;
-				if (sense > 0)
-					swap (f1, f1 + size);
-			} while ((f1 += size2) < f2);
-		} else {				/* Natural merge */
-			l2 = f2;
-			for (f2 = f1 + size2; f2 < l2; f2 += size2) {
-				if ((cmp(f2-size, f2) > 0) != sense) {
-					p2 = *EVAL(p2) = f2 - list1 + list2;
-					if (sense > 0)
-						reverse(f1, f2-size);
-					f1 = f2;
-				}
-			}
-			if (sense > 0)
-				reverse (f1, f2-size);
-			f1 = f2;
-			if (f2 < last || cmp(f2 - size, f2) > 0)
-				p2 = *EVAL(p2) = f2 - list1 + list2;
-			else
-				p2 = *EVAL(p2) = list2 + n*size;
-		}
-	}
-#else		/* pairwise merge only. */
-	for (f1 = list1, p2 = list2; f1 < last; f1 += size2) {
-		p2 = *EVAL(p2) = p2 + size2;
-		if (cmp (f1, f1 + size) > 0)
-			swap(f1, f1 + size);
-	}
-#endif /* NATURAL */
-}
-
-/*
- * This is to avoid out-of-bounds addresses in sorting the
- * last 4 elements.
- */
-static void
-insertionsort(a, n, size, cmp)
-	u_char *a;
-	size_t n, size;
-	int (*cmp)(const void *, const void *);
-{
-	u_char *ai, *s, *t, *u, tmp;
-	int i;
-
-	for (ai = a+size; --n >= 1; ai += size)
-		for (t = ai; t > a; t -= size) {
-			u = t - size;
-			if (cmp(u, t) <= 0)
-				break;
-			swap(u, t);
-		}
-}
diff --git a/lib/libc/stdlib/putenv.c b/lib/libc/stdlib/putenv.c
deleted file mode 100644
index c8f3b60..0000000
--- a/lib/libc/stdlib/putenv.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)putenv.c	8.2 (Berkeley) 3/27/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/putenv.c,v 1.2 2002/03/22 21:53:10 obrien Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-
-int
-putenv(str)
-	const char *str;
-{
-	char *p, *equal;
-	int rval;
-
-	if ((p = strdup(str)) == NULL)
-		return (-1);
-	if ((equal = index(p, '=')) == NULL) {
-		(void)free(p);
-		return (-1);
-	}
-	*equal = '\0';
-	rval = setenv(p, equal + 1, 1);
-	(void)free(p);
-	return (rval);
-}
diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
deleted file mode 100644
index f1add73..0000000
--- a/lib/libc/stdlib/qsort.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/qsort.c,v 1.12 2002/09/10 02:04:49 wollman Exp $");
-
-#include <stdlib.h>
-
-#ifdef I_AM_QSORT_R
-typedef int		 cmp_t(void *, const void *, const void *);
-#else
-typedef int		 cmp_t(const void *, const void *);
-#endif
-static inline char	*med3(char *, char *, char *, cmp_t *, void *);
-static inline void	 swapfunc(char *, char *, int, int);
-
-#define min(a, b)	(a) < (b) ? a : b
-
-/*
- * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
- */
-#define swapcode(TYPE, parmi, parmj, n) { 		\
-	long i = (n) / sizeof (TYPE); 			\
-	TYPE *pi = (TYPE *) (parmi); 		\
-	TYPE *pj = (TYPE *) (parmj); 		\
-	do { 						\
-		TYPE	t = *pi;		\
-		*pi++ = *pj;				\
-		*pj++ = t;				\
-        } while (--i > 0);				\
-}
-
-#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
-	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-
-static inline void
-swapfunc(a, b, n, swaptype)
-	char *a, *b;
-	int n, swaptype;
-{
-	if(swaptype <= 1)
-		swapcode(long, a, b, n)
-	else
-		swapcode(char, a, b, n)
-}
-
-#define swap(a, b)					\
-	if (swaptype == 0) {				\
-		long t = *(long *)(a);			\
-		*(long *)(a) = *(long *)(b);		\
-		*(long *)(b) = t;			\
-	} else						\
-		swapfunc(a, b, es, swaptype)
-
-#define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
-
-#ifdef I_AM_QSORT_R
-#define	CMP(t, x, y) (cmp((t), (x), (y)))
-#else
-#define	CMP(t, x, y) (cmp((x), (y)))
-#endif
-
-static inline char *
-med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk
-#ifndef I_AM_QSORT_R
-__unused
-#endif
-)
-{
-	return CMP(thunk, a, b) < 0 ?
-	       (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a ))
-              :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c ));
-}
-
-#ifdef I_AM_QSORT_R
-void
-qsort_r(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp)
-#else
-#define thunk NULL
-void
-qsort(void *a, size_t n, size_t es, cmp_t *cmp)
-#endif
-{
-	char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
-	int d, r, swaptype, swap_cnt;
-
-loop:	SWAPINIT(a, es);
-	swap_cnt = 0;
-	if (n < 7) {
-		for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
-			for (pl = pm; 
-			     pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
-			     pl -= es)
-				swap(pl, pl - es);
-		return;
-	}
-	pm = (char *)a + (n / 2) * es;
-	if (n > 7) {
-		pl = a;
-		pn = (char *)a + (n - 1) * es;
-		if (n > 40) {
-			d = (n / 8) * es;
-			pl = med3(pl, pl + d, pl + 2 * d, cmp, thunk);
-			pm = med3(pm - d, pm, pm + d, cmp, thunk);
-			pn = med3(pn - 2 * d, pn - d, pn, cmp, thunk);
-		}
-		pm = med3(pl, pm, pn, cmp, thunk);
-	}
-	swap(a, pm);
-	pa = pb = (char *)a + es;
-
-	pc = pd = (char *)a + (n - 1) * es;
-	for (;;) {
-		while (pb <= pc && (r = CMP(thunk, pb, a)) <= 0) {
-			if (r == 0) {
-				swap_cnt = 1;
-				swap(pa, pb);
-				pa += es;
-			}
-			pb += es;
-		}
-		while (pb <= pc && (r = CMP(thunk, pc, a)) >= 0) {
-			if (r == 0) {
-				swap_cnt = 1;
-				swap(pc, pd);
-				pd -= es;
-			}
-			pc -= es;
-		}
-		if (pb > pc)
-			break;
-		swap(pb, pc);
-		swap_cnt = 1;
-		pb += es;
-		pc -= es;
-	}
-	if (swap_cnt == 0) {  /* Switch to insertion sort */
-		for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
-			for (pl = pm; 
-			     pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
-			     pl -= es)
-				swap(pl, pl - es);
-		return;
-	}
-
-	pn = (char *)a + n * es;
-	r = min(pa - (char *)a, pb - pa);
-	vecswap(a, pb - r, r);
-	r = min(pd - pc, pn - pd - es);
-	vecswap(pb, pn - r, r);
-	if ((r = pb - pa) > es)
-#ifdef I_AM_QSORT_R
-		qsort_r(a, r / es, es, thunk, cmp);
-#else
-		qsort(a, r / es, es, cmp);
-#endif
-	if ((r = pd - pc) > es) {
-		/* Iterate rather than recurse to save stack space */
-		a = pn - r;
-		n = r / es;
-		goto loop;
-	}
-/*		qsort(pn - r, r / es, es, cmp);*/
-}
diff --git a/lib/libc/stdlib/qsort_r.c b/lib/libc/stdlib/qsort_r.c
deleted file mode 100644
index f7c0e54..0000000
--- a/lib/libc/stdlib/qsort_r.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * This file is in the public domain.  Originally written by Garrett
- * A. Wollman.
- *
- * $FreeBSD: src/lib/libc/stdlib/qsort_r.c,v 1.1 2002/09/10 02:04:49 wollman Exp $
- */
-#define I_AM_QSORT_R
-#include "qsort.c"
diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c
deleted file mode 100644
index 5f9eaeb..0000000
--- a/lib/libc/stdlib/radixsort.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Peter McIlroy and by Dan Bernstein at New York University,
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)radixsort.c	8.2 (Berkeley) 4/28/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/radixsort.c,v 1.7 2003/11/11 04:59:23 kientzle Exp $");
-
-/*
- * Radixsort routines.
- *
- * Program r_sort_a() is unstable but uses O(logN) extra memory for a stack.
- * Use radixsort(a, n, trace, endchar) for this case.
- *
- * For stable sorting (using N extra pointers) use sradixsort(), which calls
- * r_sort_b().
- *
- * For a description of this code, see D. McIlroy, P. McIlroy, K. Bostic,
- * "Engineering Radix Sort".
- */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <errno.h>
-
-typedef struct {
-	const u_char **sa;
-	int sn, si;
-} stack;
-
-static inline void simplesort
-(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_b(const u_char **, const u_char **, int, int,
-    const u_char *, u_int);
-
-#define	THRESHOLD	20		/* Divert to simplesort(). */
-#define	SIZE		512		/* Default stack size. */
-
-#define SETUP {								\
-	if (tab == NULL) {						\
-		tr = tr0;						\
-		for (c = 0; c < endch; c++)				\
-			tr0[c] = c + 1;					\
-		tr0[c] = 0;						\
-		for (c++; c < 256; c++)					\
-			tr0[c] = c;					\
-		endch = 0;						\
-	} else {							\
-		endch = tab[endch];					\
-		tr = tab;						\
-		if (endch != 0 && endch != 255) {			\
-			errno = EINVAL;					\
-			return (-1);					\
-		}							\
-	}								\
-}
-
-int
-radixsort(a, n, tab, endch)
-	const u_char **a, *tab;
-	int n;
-	u_int endch;
-{
-	const u_char *tr;
-	int c;
-	u_char tr0[256];
-
-	SETUP;
-	r_sort_a(a, n, 0, tr, endch);
-	return (0);
-}
-
-int
-sradixsort(a, n, tab, endch)
-	const u_char **a, *tab;
-	int n;
-	u_int endch;
-{
-	const u_char *tr, **ta;
-	int c;
-	u_char tr0[256];
-
-	SETUP;
-	if (n < THRESHOLD)
-		simplesort(a, n, 0, tr, endch);
-	else {
-		if ((ta = malloc(n * sizeof(a))) == NULL)
-			return (-1);
-		r_sort_b(a, ta, n, 0, tr, endch);
-		free(ta);
-	}
-	return (0);
-}
-
-#define empty(s)	(s >= sp)
-#define pop(a, n, i)	a = (--sp)->sa, n = sp->sn, i = sp->si
-#define push(a, n, i)	sp->sa = a, sp->sn = n, (sp++)->si = i
-#define swap(a, b, t)	t = a, a = b, b = t
-
-/* Unstable, in-place sort. */
-static void
-r_sort_a(a, n, i, tr, endch)
-	const u_char **a;
-	int n, i;
-	const u_char *tr;
-	u_int endch;
-{
-	static int count[256], nc, bmin;
-	int c;
-	const u_char **ak, *r;
-	stack s[SIZE], *sp, *sp0, *sp1, temp;
-	int *cp, bigc;
-	const u_char **an, *t, **aj, **top[256];
-
-	/* Set up stack. */
-	sp = s;
-	push(a, n, i);
-	while (!empty(s)) {
-		pop(a, n, i);
-		if (n < THRESHOLD) {
-			simplesort(a, n, i, tr, endch);
-			continue;
-		}
-		an = a + n;
-
-		/* Make character histogram. */
-		if (nc == 0) {
-			bmin = 255;	/* First occupied bin, excluding eos. */
-			for (ak = a; ak < an;) {
-				c = tr[(*ak++)[i]];
-				if (++count[c] == 1 && c != endch) {
-					if (c < bmin)
-						bmin = c;
-					nc++;
-				}
-			}
-			if (sp + nc > s + SIZE) {	/* Get more stack. */
-				r_sort_a(a, n, i, tr, endch);
-				continue;
-			}
-		}
-
-		/*
-		 * Special case: if all strings have the same
-		 * character at position i, move on to the next
-		 * character.
-		 */
-		if (nc == 1 && count[bmin] == n) {
-			push(a, n, i+1);
-			nc = count[bmin] = 0;
-			continue;
-		}
-
-		/*
-		 * Set top[]; push incompletely sorted bins onto stack.
-		 * top[] = pointers to last out-of-place element in bins.
-		 * count[] = counts of elements in bins.
-		 * Before permuting: top[c-1] + count[c] = top[c];
-		 * during deal: top[c] counts down to top[c-1].
-		 */
-		sp0 = sp1 = sp;		/* Stack position of biggest bin. */
-		bigc = 2;		/* Size of biggest bin. */
-		if (endch == 0)		/* Special case: set top[eos]. */
-			top[0] = ak = a + count[0];
-		else {
-			ak = a;
-			top[255] = an;
-		}
-		for (cp = count + bmin; nc > 0; cp++) {
-			while (*cp == 0)	/* Find next non-empty pile. */
-				cp++;
-			if (*cp > 1) {
-				if (*cp > bigc) {
-					bigc = *cp;
-					sp1 = sp;
-				}
-				push(ak, *cp, i+1);
-			}
-			top[cp-count] = ak += *cp;
-			nc--;
-		}
-		swap(*sp0, *sp1, temp);	/* Play it safe -- biggest bin last. */
-
-		/*
-		 * Permute misplacements home.  Already home: everything
-		 * before aj, and in bin[c], items from top[c] on.
-		 * Inner loop:
-		 *	r = next element to put in place;
-		 *	ak = top[r[i]] = location to put the next element.
-		 *	aj = bottom of 1st disordered bin.
-		 * Outer loop:
-		 *	Once the 1st disordered bin is done, ie. aj >= ak,
-		 *	aj<-aj + count[c] connects the bins in a linked list;
-		 *	reset count[c].
-		 */
-		for (aj = a; aj < an;  *aj = r, aj += count[c], count[c] = 0)
-			for (r = *aj;  aj < (ak = --top[c = tr[r[i]]]);)
-				swap(*ak, r, t);
-	}
-}
-
-/* Stable sort, requiring additional memory. */
-static void
-r_sort_b(a, ta, n, i, tr, endch)
-	const u_char **a, **ta;
-	int n, i;
-	const u_char *tr;
-	u_int endch;
-{
-	static int count[256], nc, bmin;
-	int c;
-	const u_char **ak, **ai;
-	stack s[512], *sp, *sp0, *sp1, temp;
-	const u_char **top[256];
-	int *cp, bigc;
-
-	sp = s;
-	push(a, n, i);
-	while (!empty(s)) {
-		pop(a, n, i);
-		if (n < THRESHOLD) {
-			simplesort(a, n, i, tr, endch);
-			continue;
-		}
-
-		if (nc == 0) {
-			bmin = 255;
-			for (ak = a + n; --ak >= a;) {
-				c = tr[(*ak)[i]];
-				if (++count[c] == 1 && c != endch) {
-					if (c < bmin)
-						bmin = c;
-					nc++;
-				}
-			}
-			if (sp + nc > s + SIZE) {
-				r_sort_b(a, ta, n, i, tr, endch);
-				continue;
-			}
-		}
-
-		sp0 = sp1 = sp;
-		bigc = 2;
-		if (endch == 0) {
-			top[0] = ak = a + count[0];
-			count[0] = 0;
-		} else {
-			ak = a;
-			top[255] = a + n;
-			count[255] = 0;
-		}
-		for (cp = count + bmin; nc > 0; cp++) {
-			while (*cp == 0)
-				cp++;
-			if ((c = *cp) > 1) {
-				if (c > bigc) {
-					bigc = c;
-					sp1 = sp;
-				}
-				push(ak, c, i+1);
-			}
-			top[cp-count] = ak += c;
-			*cp = 0;			/* Reset count[]. */
-			nc--;
-		}
-		swap(*sp0, *sp1, temp);
-
-		for (ak = ta + n, ai = a+n; ak > ta;)	/* Copy to temp. */
-			*--ak = *--ai;
-		for (ak = ta+n; --ak >= ta;)		/* Deal to piles. */
-			*--top[tr[(*ak)[i]]] = *ak;
-	}
-}
-
-static inline void
-simplesort(a, n, b, tr, endch)	/* insertion sort */
-	const u_char **a;
-	int n, b;
-	const u_char *tr;
-	u_int endch;
-{
-	u_char ch;
-	const u_char  **ak, **ai, *s, *t;
-
-	for (ak = a+1; --n >= 1; ak++)
-		for (ai = ak; ai > a; ai--) {
-			for (s = ai[0] + b, t = ai[-1] + b;
-			    (ch = tr[*s]) != endch; s++, t++)
-				if (ch != tr[*t])
-					break;
-			if (ch >= tr[*t])
-				break;
-			swap(ai[0], ai[-1], s);
-		}
-}
diff --git a/lib/libc/stdlib/rand.c b/lib/libc/stdlib/rand.c
deleted file mode 100644
index 359e12a..0000000
--- a/lib/libc/stdlib/rand.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- *
- * Posix rand_r function added May 1999 by Wes Peters <wes@softweyr.com>.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rand.c	8.1 (Berkeley) 6/14/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/rand.c,v 1.15 2003/02/17 03:52:35 ache Exp $");
-
-#include "namespace.h"
-#include <sys/time.h>          /* for sranddev() */
-#include <sys/types.h>
-#include <fcntl.h>             /* for sranddev() */
-#include <stdlib.h>
-#include <unistd.h>            /* for sranddev() */
-#include "un-namespace.h"
-
-#ifdef TEST
-#include <stdio.h>
-#endif /* TEST */
-
-static int
-do_rand(unsigned long *ctx)
-{
-#ifdef  USE_WEAK_SEEDING
-/*
- * Historic implementation compatibility.
- * The random sequences do not vary much with the seed,
- * even with overflowing.
- */
-	return ((*ctx = *ctx * 1103515245 + 12345) % ((u_long)RAND_MAX + 1));
-#else   /* !USE_WEAK_SEEDING */
-/*
- * Compute x = (7^5 * x) mod (2^31 - 1)
- * wihout overflowing 31 bits:
- *      (2^31 - 1) = 127773 * (7^5) + 2836
- * From "Random number generators: good ones are hard to find",
- * Park and Miller, Communications of the ACM, vol. 31, no. 10,
- * October 1988, p. 1195.
- */
-	long hi, lo, x;
-
-	/* Can't be initialized with 0, so use another value. */
-	if (*ctx == 0)
-		*ctx = 123459876;
-	hi = *ctx / 127773;
-	lo = *ctx % 127773;
-	x = 16807 * lo - 2836 * hi;
-	if (x < 0)
-		x += 0x7fffffff;
-	return ((*ctx = x) % ((u_long)RAND_MAX + 1));
-#endif  /* !USE_WEAK_SEEDING */
-}
-
-
-int
-rand_r(unsigned int *ctx)
-{
-	u_long val = (u_long) *ctx;
-	int r = do_rand(&val);
-
-	*ctx = (unsigned int) val;
-	return (r);
-}
-
-
-static u_long next = 1;
-
-int
-rand()
-{
-	return (do_rand(&next));
-}
-
-void
-srand(seed)
-u_int seed;
-{
-	next = seed;
-}
-
-
-/*
- * sranddev:
- *
- * Many programs choose the seed value in a totally predictable manner.
- * This often causes problems.  We seed the generator using the much more
- * secure random(4) interface.
- */
-void
-sranddev()
-{
-	int fd, done;
-
-	done = 0;
-	fd = _open("/dev/random", O_RDONLY, 0);
-	if (fd >= 0) {
-		if (_read(fd, (void *) &next, sizeof(next)) == sizeof(next))
-			done = 1;
-		_close(fd);
-	}
-
-	if (!done) {
-		struct timeval tv;
-		unsigned long junk;
-
-		gettimeofday(&tv, NULL);
-		srand((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ junk);
-	}
-}
-
-
-#ifdef TEST
-
-main()
-{
-    int i;
-    unsigned myseed;
-
-    printf("seeding rand with 0x19610910: \n");
-    srand(0x19610910);
-
-    printf("generating three pseudo-random numbers:\n");
-    for (i = 0; i < 3; i++)
-    {
-	printf("next random number = %d\n", rand());
-    }
-
-    printf("generating the same sequence with rand_r:\n");
-    myseed = 0x19610910;
-    for (i = 0; i < 3; i++)
-    {
-	printf("next random number = %d\n", rand_r(&myseed));
-    }
-
-    return 0;
-}
-
-#endif /* TEST */
-
diff --git a/lib/libc/stdlib/random.c b/lib/libc/stdlib/random.c
deleted file mode 100644
index f42436a..0000000
--- a/lib/libc/stdlib/random.c
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)random.c	8.2 (Berkeley) 5/19/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/random.c,v 1.24 2004/01/20 03:02:18 das Exp $");
-
-#include "namespace.h"
-#include <sys/time.h>          /* for srandomdev() */
-#include <fcntl.h>             /* for srandomdev() */
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>            /* for srandomdev() */
-#include "un-namespace.h"
-
-/*
- * random.c:
- *
- * An improved random number generation package.  In addition to the standard
- * rand()/srand() like interface, this package also has a special state info
- * interface.  The initstate() routine is called with a seed, an array of
- * bytes, and a count of how many bytes are being passed in; this array is
- * then initialized to contain information for random number generation with
- * that much state information.  Good sizes for the amount of state
- * information are 32, 64, 128, and 256 bytes.  The state can be switched by
- * calling the setstate() routine with the same array as was initiallized
- * with initstate().  By default, the package runs with 128 bytes of state
- * information and generates far better random numbers than a linear
- * congruential generator.  If the amount of state information is less than
- * 32 bytes, a simple linear congruential R.N.G. is used.
- *
- * Internally, the state information is treated as an array of uint32_t's; the
- * zeroeth element of the array is the type of R.N.G. being used (small
- * integer); the remainder of the array is the state information for the
- * R.N.G.  Thus, 32 bytes of state information will give 7 ints worth of
- * state information, which will allow a degree seven polynomial.  (Note:
- * the zeroeth word of state information also has some other information
- * stored in it -- see setstate() for details).
- *
- * The random number generation technique is a linear feedback shift register
- * approach, employing trinomials (since there are fewer terms to sum up that
- * way).  In this approach, the least significant bit of all the numbers in
- * the state table will act as a linear feedback shift register, and will
- * have period 2^deg - 1 (where deg is the degree of the polynomial being
- * used, assuming that the polynomial is irreducible and primitive).  The
- * higher order bits will have longer periods, since their values are also
- * influenced by pseudo-random carries out of the lower bits.  The total
- * period of the generator is approximately deg*(2**deg - 1); thus doubling
- * the amount of state information has a vast influence on the period of the
- * generator.  Note: the deg*(2**deg - 1) is an approximation only good for
- * large deg, when the period of the shift is the dominant factor.
- * With deg equal to seven, the period is actually much longer than the
- * 7*(2**7 - 1) predicted by this formula.
- *
- * Modified 28 December 1994 by Jacob S. Rosenberg.
- * The following changes have been made:
- * All references to the type u_int have been changed to unsigned long.
- * All references to type int have been changed to type long.  Other
- * cleanups have been made as well.  A warning for both initstate and
- * setstate has been inserted to the effect that on Sparc platforms
- * the 'arg_state' variable must be forced to begin on word boundaries.
- * This can be easily done by casting a long integer array to char *.
- * The overall logic has been left STRICTLY alone.  This software was
- * tested on both a VAX and Sun SpacsStation with exactly the same
- * results.  The new version and the original give IDENTICAL results.
- * The new version is somewhat faster than the original.  As the
- * documentation says:  "By default, the package runs with 128 bytes of
- * state information and generates far better random numbers than a linear
- * congruential generator.  If the amount of state information is less than
- * 32 bytes, a simple linear congruential R.N.G. is used."  For a buffer of
- * 128 bytes, this new version runs about 19 percent faster and for a 16
- * byte buffer it is about 5 percent faster.
- */
-
-/*
- * For each of the currently supported random number generators, we have a
- * break value on the amount of state information (you need at least this
- * many bytes of state info to support this random number generator), a degree
- * for the polynomial (actually a trinomial) that the R.N.G. is based on, and
- * the separation between the two lower order coefficients of the trinomial.
- */
-#define	TYPE_0		0		/* linear congruential */
-#define	BREAK_0		8
-#define	DEG_0		0
-#define	SEP_0		0
-
-#define	TYPE_1		1		/* x**7 + x**3 + 1 */
-#define	BREAK_1		32
-#define	DEG_1		7
-#define	SEP_1		3
-
-#define	TYPE_2		2		/* x**15 + x + 1 */
-#define	BREAK_2		64
-#define	DEG_2		15
-#define	SEP_2		1
-
-#define	TYPE_3		3		/* x**31 + x**3 + 1 */
-#define	BREAK_3		128
-#define	DEG_3		31
-#define	SEP_3		3
-
-#define	TYPE_4		4		/* x**63 + x + 1 */
-#define	BREAK_4		256
-#define	DEG_4		63
-#define	SEP_4		1
-
-/*
- * Array versions of the above information to make code run faster --
- * relies on fact that TYPE_i == i.
- */
-#define	MAX_TYPES	5		/* max number of types above */
-
-#ifdef  USE_WEAK_SEEDING
-#define NSHUFF 0
-#else   /* !USE_WEAK_SEEDING */
-#define NSHUFF 50       /* to drop some "seed -> 1st value" linearity */
-#endif  /* !USE_WEAK_SEEDING */
-
-static const int degrees[MAX_TYPES] =	{ DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 };
-static const int seps [MAX_TYPES] =	{ SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
-
-/*
- * Initially, everything is set up as if from:
- *
- *	initstate(1, randtbl, 128);
- *
- * Note that this initialization takes advantage of the fact that srandom()
- * advances the front and rear pointers 10*rand_deg times, and hence the
- * rear pointer which starts at 0 will also end up at zero; thus the zeroeth
- * element of the state information, which contains info about the current
- * position of the rear pointer is just
- *
- *	MAX_TYPES * (rptr - state) + TYPE_3 == TYPE_3.
- */
-
-static uint32_t randtbl[DEG_3 + 1] = {
-	TYPE_3,
-#ifdef  USE_WEAK_SEEDING
-/* Historic implementation compatibility */
-/* The random sequences do not vary much with the seed */
-	0x9a319039, 0x32d9c024, 0x9b663182, 0x5da1f342, 0xde3b81e0, 0xdf0a6fb5,
-	0xf103bc02, 0x48f340fb, 0x7449e56b, 0xbeb1dbb0, 0xab5c5918, 0x946554fd,
-	0x8c2e680f, 0xeb3d799f, 0xb11ee0b7, 0x2d436b86, 0xda672e2a, 0x1588ca88,
-	0xe369735d, 0x904f35f7, 0xd7158fd6, 0x6fa6f051, 0x616e6b96, 0xac94efdc,
-	0x36413f93, 0xc622c298, 0xf5a42ab8, 0x8a88d77b, 0xf5ad9d0e, 0x8999220b,
-	0x27fb47b9,
-#else   /* !USE_WEAK_SEEDING */
-	0x991539b1, 0x16a5bce3, 0x6774a4cd, 0x3e01511e, 0x4e508aaa, 0x61048c05,
-	0xf5500617, 0x846b7115, 0x6a19892c, 0x896a97af, 0xdb48f936, 0x14898454,
-	0x37ffd106, 0xb58bff9c, 0x59e17104, 0xcf918a49, 0x09378c83, 0x52c7a471,
-	0x8d293ea9, 0x1f4fc301, 0xc3db71be, 0x39b44e1c, 0xf8a44ef9, 0x4c8b80b1,
-	0x19edc328, 0x87bf4bdd, 0xc9b240e5, 0xe9ee4b1b, 0x4382aee7, 0x535b6b41,
-	0xf3bec5da
-#endif  /* !USE_WEAK_SEEDING */
-};
-
-/*
- * fptr and rptr are two pointers into the state info, a front and a rear
- * pointer.  These two pointers are always rand_sep places aparts, as they
- * cycle cyclically through the state information.  (Yes, this does mean we
- * could get away with just one pointer, but the code for random() is more
- * efficient this way).  The pointers are left positioned as they would be
- * from the call
- *
- *	initstate(1, randtbl, 128);
- *
- * (The position of the rear pointer, rptr, is really 0 (as explained above
- * in the initialization of randtbl) because the state table pointer is set
- * to point to randtbl[1] (as explained below).
- */
-static uint32_t *fptr = &randtbl[SEP_3 + 1];
-static uint32_t *rptr = &randtbl[1];
-
-/*
- * The following things are the pointer to the state information table, the
- * type of the current generator, the degree of the current polynomial being
- * used, and the separation between the two pointers.  Note that for efficiency
- * of random(), we remember the first location of the state information, not
- * the zeroeth.  Hence it is valid to access state[-1], which is used to
- * store the type of the R.N.G.  Also, we remember the last location, since
- * this is more efficient than indexing every time to find the address of
- * the last element to see if the front and rear pointers have wrapped.
- */
-static uint32_t *state = &randtbl[1];
-static int rand_type = TYPE_3;
-static int rand_deg = DEG_3;
-static int rand_sep = SEP_3;
-static uint32_t *end_ptr = &randtbl[DEG_3 + 1];
-
-static inline uint32_t good_rand(int32_t);
-
-static inline uint32_t good_rand (x)
-	int32_t x;
-{
-#ifdef  USE_WEAK_SEEDING
-/*
- * Historic implementation compatibility.
- * The random sequences do not vary much with the seed,
- * even with overflowing.
- */
-	return (1103515245 * x + 12345);
-#else   /* !USE_WEAK_SEEDING */
-/*
- * Compute x = (7^5 * x) mod (2^31 - 1)
- * wihout overflowing 31 bits:
- *      (2^31 - 1) = 127773 * (7^5) + 2836
- * From "Random number generators: good ones are hard to find",
- * Park and Miller, Communications of the ACM, vol. 31, no. 10,
- * October 1988, p. 1195.
- */
-	int32_t hi, lo;
-
-	/* Can't be initialized with 0, so use another value. */
-	if (x == 0)
-		x = 123459876;
-	hi = x / 127773;
-	lo = x % 127773;
-	x = 16807 * lo - 2836 * hi;
-	if (x < 0)
-		x += 0x7fffffff;
-	return (x);
-#endif  /* !USE_WEAK_SEEDING */
-}
-
-/*
- * srandom:
- *
- * Initialize the random number generator based on the given seed.  If the
- * type is the trivial no-state-information type, just remember the seed.
- * Otherwise, initializes state[] based on the given "seed" via a linear
- * congruential generator.  Then, the pointers are set to known locations
- * that are exactly rand_sep places apart.  Lastly, it cycles the state
- * information a given number of times to get rid of any initial dependencies
- * introduced by the L.C.R.N.G.  Note that the initialization of randtbl[]
- * for default usage relies on values produced by this routine.
- */
-void
-srandom(x)
-	unsigned long x;
-{
-	int i, lim;
-
-	state[0] = (uint32_t)x;
-	if (rand_type == TYPE_0)
-		lim = NSHUFF;
-	else {
-		for (i = 1; i < rand_deg; i++)
-			state[i] = good_rand(state[i - 1]);
-		fptr = &state[rand_sep];
-		rptr = &state[0];
-		lim = 10 * rand_deg;
-	}
-	for (i = 0; i < lim; i++)
-		(void)random();
-}
-
-/*
- * srandomdev:
- *
- * Many programs choose the seed value in a totally predictable manner.
- * This often causes problems.  We seed the generator using the much more
- * secure random(4) interface.  Note that this particular seeding
- * procedure can generate states which are impossible to reproduce by
- * calling srandom() with any value, since the succeeding terms in the
- * state buffer are no longer derived from the LC algorithm applied to
- * a fixed seed.
- */
-void
-srandomdev()
-{
-	int fd, done;
-	size_t len;
-
-	if (rand_type == TYPE_0)
-		len = sizeof state[0];
-	else
-		len = rand_deg * sizeof state[0];
-
-	done = 0;
-	fd = _open("/dev/random", O_RDONLY, 0);
-	if (fd >= 0) {
-		if (_read(fd, (void *) state, len) == (ssize_t) len)
-			done = 1;
-		_close(fd);
-	}
-
-	if (!done) {
-		struct timeval tv;
-		unsigned long junk;
-
-		gettimeofday(&tv, NULL);
-		srandom((getpid() << 16) ^ tv.tv_sec ^ tv.tv_usec ^ junk);
-		return;
-	}
-
-	if (rand_type != TYPE_0) {
-		fptr = &state[rand_sep];
-		rptr = &state[0];
-	}
-}
-
-/*
- * initstate:
- *
- * Initialize the state information in the given array of n bytes for future
- * random number generation.  Based on the number of bytes we are given, and
- * the break values for the different R.N.G.'s, we choose the best (largest)
- * one we can and set things up for it.  srandom() is then called to
- * initialize the state information.
- *
- * Note that on return from srandom(), we set state[-1] to be the type
- * multiplexed with the current value of the rear pointer; this is so
- * successive calls to initstate() won't lose this information and will be
- * able to restart with setstate().
- *
- * Note: the first thing we do is save the current state, if any, just like
- * setstate() so that it doesn't matter when initstate is called.
- *
- * Returns a pointer to the old state.
- *
- * Note: The Sparc platform requires that arg_state begin on an int
- * word boundary; otherwise a bus error will occur. Even so, lint will
- * complain about mis-alignment, but you should disregard these messages.
- */
-char *
-initstate(seed, arg_state, n)
-	unsigned long seed;		/* seed for R.N.G. */
-	char *arg_state;		/* pointer to state array */
-	long n;				/* # bytes of state info */
-{
-	char *ostate = (char *)(&state[-1]);
-	uint32_t *int_arg_state = (uint32_t *)arg_state;
-
-	if (rand_type == TYPE_0)
-		state[-1] = rand_type;
-	else
-		state[-1] = MAX_TYPES * (rptr - state) + rand_type;
-	if (n < BREAK_0) {
-		(void)fprintf(stderr,
-		    "random: not enough state (%ld bytes); ignored.\n", n);
-		return(0);
-	}
-	if (n < BREAK_1) {
-		rand_type = TYPE_0;
-		rand_deg = DEG_0;
-		rand_sep = SEP_0;
-	} else if (n < BREAK_2) {
-		rand_type = TYPE_1;
-		rand_deg = DEG_1;
-		rand_sep = SEP_1;
-	} else if (n < BREAK_3) {
-		rand_type = TYPE_2;
-		rand_deg = DEG_2;
-		rand_sep = SEP_2;
-	} else if (n < BREAK_4) {
-		rand_type = TYPE_3;
-		rand_deg = DEG_3;
-		rand_sep = SEP_3;
-	} else {
-		rand_type = TYPE_4;
-		rand_deg = DEG_4;
-		rand_sep = SEP_4;
-	}
-	state = int_arg_state + 1; /* first location */
-	end_ptr = &state[rand_deg];	/* must set end_ptr before srandom */
-	srandom(seed);
-	if (rand_type == TYPE_0)
-		int_arg_state[0] = rand_type;
-	else
-		int_arg_state[0] = MAX_TYPES * (rptr - state) + rand_type;
-	return(ostate);
-}
-
-/*
- * setstate:
- *
- * Restore the state from the given state array.
- *
- * Note: it is important that we also remember the locations of the pointers
- * in the current state information, and restore the locations of the pointers
- * from the old state information.  This is done by multiplexing the pointer
- * location into the zeroeth word of the state information.
- *
- * Note that due to the order in which things are done, it is OK to call
- * setstate() with the same state as the current state.
- *
- * Returns a pointer to the old state information.
- *
- * Note: The Sparc platform requires that arg_state begin on an int
- * word boundary; otherwise a bus error will occur. Even so, lint will
- * complain about mis-alignment, but you should disregard these messages.
- */
-char *
-setstate(arg_state)
-	char *arg_state;		/* pointer to state array */
-{
-	uint32_t *new_state = (uint32_t *)arg_state;
-	uint32_t type = new_state[0] % MAX_TYPES;
-	uint32_t rear = new_state[0] / MAX_TYPES;
-	char *ostate = (char *)(&state[-1]);
-
-	if (rand_type == TYPE_0)
-		state[-1] = rand_type;
-	else
-		state[-1] = MAX_TYPES * (rptr - state) + rand_type;
-	switch(type) {
-	case TYPE_0:
-	case TYPE_1:
-	case TYPE_2:
-	case TYPE_3:
-	case TYPE_4:
-		rand_type = type;
-		rand_deg = degrees[type];
-		rand_sep = seps[type];
-		break;
-	default:
-		(void)fprintf(stderr,
-		    "random: state info corrupted; not changed.\n");
-	}
-	state = new_state + 1;
-	if (rand_type != TYPE_0) {
-		rptr = &state[rear];
-		fptr = &state[(rear + rand_sep) % rand_deg];
-	}
-	end_ptr = &state[rand_deg];		/* set end_ptr too */
-	return(ostate);
-}
-
-/*
- * random:
- *
- * If we are using the trivial TYPE_0 R.N.G., just do the old linear
- * congruential bit.  Otherwise, we do our fancy trinomial stuff, which is
- * the same in all the other cases due to all the global variables that have
- * been set up.  The basic operation is to add the number at the rear pointer
- * into the one at the front pointer.  Then both pointers are advanced to
- * the next location cyclically in the table.  The value returned is the sum
- * generated, reduced to 31 bits by throwing away the "least random" low bit.
- *
- * Note: the code takes advantage of the fact that both the front and
- * rear pointers can't wrap on the same call by not testing the rear
- * pointer if the front one has wrapped.
- *
- * Returns a 31-bit random number.
- */
-long
-random()
-{
-	uint32_t i;
-	uint32_t *f, *r;
-
-	if (rand_type == TYPE_0) {
-		i = state[0];
-		state[0] = i = (good_rand(i)) & 0x7fffffff;
-	} else {
-		/*
-		 * Use local variables rather than static variables for speed.
-		 */
-		f = fptr; r = rptr;
-		*f += *r;
-		i = (*f >> 1) & 0x7fffffff;	/* chucking least random bit */
-		if (++f >= end_ptr) {
-			f = state;
-			++r;
-		}
-		else if (++r >= end_ptr) {
-			r = state;
-		}
-
-		fptr = f; rptr = r;
-	}
-	return((long)i);
-}
diff --git a/lib/libc/stdlib/reallocf.c b/lib/libc/stdlib/reallocf.c
deleted file mode 100644
index d502006..0000000
--- a/lib/libc/stdlib/reallocf.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 1998, M. Warner Losh <imp@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/reallocf.c,v 1.4 2002/03/22 21:53:10 obrien Exp $");
-
-#include <stdlib.h>
-
-void *
-reallocf(void *ptr, size_t size)
-{
-	void *nptr;
-
-	nptr = realloc(ptr, size);
-	if (!nptr && ptr)
-		free(ptr);
-	return (nptr);
-}
diff --git a/lib/libc/stdlib/realpath.c b/lib/libc/stdlib/realpath.c
deleted file mode 100644
index 31e0977..0000000
--- a/lib/libc/stdlib/realpath.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
- *
- * 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 names of the authors 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)realpath.c	8.1 (Berkeley) 2/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/realpath.c,v 1.20 2003/05/28 08:23:01 fjoe Exp $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-/*
- * char *realpath(const char *path, char resolved[PATH_MAX]);
- *
- * Find the real name of path, by removing all ".", ".." and symlink
- * components.  Returns (resolved) on success, or (NULL) on failure,
- * in which case the path which caused trouble is left in (resolved).
- */
-char *
-realpath(const char *path, char resolved[PATH_MAX])
-{
-	struct stat sb;
-	char *p, *q, *s;
-	size_t left_len, resolved_len;
-	unsigned symlinks;
-	int serrno, slen;
-	char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
-
-	serrno = errno;
-	symlinks = 0;
-	if (path[0] == '/') {
-		resolved[0] = '/';
-		resolved[1] = '\0';
-		if (path[1] == '\0')
-			return (resolved);
-		resolved_len = 1;
-		left_len = strlcpy(left, path + 1, sizeof(left));
-	} else {
-		if (getcwd(resolved, PATH_MAX) == NULL) {
-			strlcpy(resolved, ".", PATH_MAX);
-			return (NULL);
-		}
-		resolved_len = strlen(resolved);
-		left_len = strlcpy(left, path, sizeof(left));
-	}
-	if (left_len >= sizeof(left) || resolved_len >= PATH_MAX) {
-		errno = ENAMETOOLONG;
-		return (NULL);
-	}
-
-	/*
-	 * Iterate over path components in `left'.
-	 */
-	while (left_len != 0) {
-		/*
-		 * Extract the next path component and adjust `left'
-		 * and its length.
-		 */
-		p = strchr(left, '/');
-		s = p ? p : left + left_len;
-		if (s - left >= sizeof(next_token)) {
-			errno = ENAMETOOLONG;
-			return (NULL);
-		}
-		memcpy(next_token, left, s - left);
-		next_token[s - left] = '\0';
-		left_len -= s - left;
-		if (p != NULL)
-			memmove(left, s + 1, left_len + 1);
-		if (resolved[resolved_len - 1] != '/') {
-			if (resolved_len + 1 >= PATH_MAX) {
-				errno = ENAMETOOLONG;
-				return (NULL);
-			}
-			resolved[resolved_len++] = '/';
-			resolved[resolved_len] = '\0';
-		}
-		if (next_token[0] == '\0')
-			continue;
-		else if (strcmp(next_token, ".") == 0)
-			continue;
-		else if (strcmp(next_token, "..") == 0) {
-			/*
-			 * Strip the last path component except when we have
-			 * single "/"
-			 */
-			if (resolved_len > 1) {
-				resolved[resolved_len - 1] = '\0';
-				q = strrchr(resolved, '/') + 1;
-				*q = '\0';
-				resolved_len = q - resolved;
-			}
-			continue;
-		}
-
-		/*
-		 * Append the next path component and lstat() it. If
-		 * lstat() fails we still can return successfully if
-		 * there are no more path components left.
-		 */
-		resolved_len = strlcat(resolved, next_token, PATH_MAX);
-		if (resolved_len >= PATH_MAX) {
-			errno = ENAMETOOLONG;
-			return (NULL);
-		}
-		if (lstat(resolved, &sb) != 0) {
-			if (errno == ENOENT && p == NULL) {
-				errno = serrno;
-				return (resolved);
-			}
-			return (NULL);
-		}
-		if (S_ISLNK(sb.st_mode)) {
-			if (symlinks++ > MAXSYMLINKS) {
-				errno = ELOOP;
-				return (NULL);
-			}
-			slen = readlink(resolved, symlink, sizeof(symlink) - 1);
-			if (slen < 0)
-				return (NULL);
-			symlink[slen] = '\0';
-			if (symlink[0] == '/') {
-				resolved[1] = 0;
-				resolved_len = 1;
-			} else if (resolved_len > 1) {
-				/* Strip the last path component. */
-				resolved[resolved_len - 1] = '\0';
-				q = strrchr(resolved, '/') + 1;
-				*q = '\0';
-				resolved_len = q - resolved;
-			}
-
-			/*
-			 * If there are any path components left, then
-			 * append them to symlink. The result is placed
-			 * in `left'.
-			 */
-			if (p != NULL) {
-				if (symlink[slen - 1] != '/') {
-					if (slen + 1 >= sizeof(symlink)) {
-						errno = ENAMETOOLONG;
-						return (NULL);
-					}
-					symlink[slen] = '/';
-					symlink[slen + 1] = 0;
-				}
-				left_len = strlcat(symlink, left, sizeof(left));
-				if (left_len >= sizeof(left)) {
-					errno = ENAMETOOLONG;
-					return (NULL);
-				}
-			}
-			left_len = strlcpy(left, symlink, sizeof(left));
-		}
-	}
-
-	/*
-	 * Remove trailing slash except when the resolved pathname
-	 * is a single "/".
-	 */
-	if (resolved_len > 1 && resolved[resolved_len - 1] == '/')
-		resolved[resolved_len - 1] = '\0';
-	return (resolved);
-}
diff --git a/lib/libc/stdlib/remque.c b/lib/libc/stdlib/remque.c
deleted file mode 100644
index 068a75f..0000000
--- a/lib/libc/stdlib/remque.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Initial implementation:
- * Copyright (c) 2002 Robert Drehmel
- * All rights reserved.
- *
- * As long as the above copyright statement and this notice remain
- * unchanged, you can do what ever you want with this file. 
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/remque.c,v 1.3 2003/01/04 07:34:41 tjr Exp $");
-
-#define	_SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>	/* for NULL */
-
-void
-remque(void *element)
-{
-	struct que_elem *prev, *next, *elem;
-
-	elem = (struct que_elem *)element;
-
-	prev = elem->prev;
-	next = elem->next;
-
-	if (prev != NULL)
-		prev->next = next;
-	if (next != NULL)
-		next->prev = prev;
-}
diff --git a/lib/libc/stdlib/setenv.c b/lib/libc/stdlib/setenv.c
deleted file mode 100644
index 90c384a..0000000
--- a/lib/libc/stdlib/setenv.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setenv.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/setenv.c,v 1.9 2002/03/22 21:53:10 obrien Exp $");
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *__findenv(const char *, int *);
-
-/*
- * setenv --
- *	Set the value of the environmental variable "name" to be
- *	"value".  If rewrite is set, replace any current value.
- */
-int
-setenv(name, value, rewrite)
-	const char *name;
-	const char *value;
-	int rewrite;
-{
-	extern char **environ;
-	static char **alloced;			/* if allocated space before */
-	char *c;
-	int l_value, offset;
-        char blah[32];
-
-
-__sys_write(1,"setenv",sizeof("setenv"));
-	if (*value == '=')			/* no `=' in value */
-		++value;
-	l_value = strlen(value);
-__sys_write(1,"setenv2",sizeof("setenv2"));
-	if ((c = __findenv(name, &offset))) {	/* find if already exists */
-		if (!rewrite)
-			return (0);
-		if (strlen(c) >= l_value) {	/* old larger; copy over */
-			while ( (*c++ = *value++) );
-			return (0);
-		}
-	} else {					/* create new slot */
-		int cnt;
-		char **p;
-
-__sys_write(1,"setenv3",sizeof("setenv3"));
-sprintf(blah,"[0x%X]",environ);
-__sys_write(1,blah,32);
-		for (p = environ, cnt = 0; *p; ++p, ++cnt);
-__sys_write(1,"setenv3.1",sizeof("setenv3.1"));
-		if (alloced == environ) {			/* just increase size */
-__sys_write(1,"setenv4",sizeof("setenv4"));
-			p = (char **)realloc((char *)environ,
-			    (size_t)(sizeof(char *) * (cnt + 2)));
-			if (!p)
-				return (-1);
-			alloced = environ = p;
-		}
-		else {				/* get new space */
-						/* copy old entries into it */
-__sys_write(1,"setenv5",sizeof("setenv5"));
-			p = malloc((size_t)(sizeof(char *) * (cnt + 2)));
-			if (!p)
-				return (-1);
-			bcopy(environ, p, cnt * sizeof(char *));
-			alloced = environ = p;
-		}
-		environ[cnt + 1] = NULL;
-		offset = cnt;
-	}
-	for (c = (char *)name; *c && *c != '='; ++c);	/* no `=' in name */
-	if (!(environ[offset] =			/* name + `=' + value */
-	    malloc((size_t)((int)(c - name) + l_value + 2))))
-		return (-1);
-	for (c = environ[offset]; (*c = *name++) && *c != '='; ++c);
-	for (*c++ = '='; (*c++ = *value++); );
-	return (0);
-}
-
-/*
- * unsetenv(name) --
- *	Delete environmental variable "name".
- */
-void
-unsetenv(name)
-	const char *name;
-{
-	extern char **environ;
-	char **p;
-	int offset;
-
-	while (__findenv(name, &offset))	/* if set multiple times */
-		for (p = &environ[offset];; ++p)
-			if (!(*p = *(p + 1)))
-				break;
-}
diff --git a/lib/libc/stdlib/strfmon.c b/lib/libc/stdlib/strfmon.c
deleted file mode 100644
index db569d5..0000000
--- a/lib/libc/stdlib/strfmon.c
+++ /dev/null
@@ -1,603 +0,0 @@
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.14 2003/03/20 08:18:55 ache Exp $");
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* internal flags */
-#define	NEED_GROUPING		0x01	/* print digits grouped (default) */
-#define	SIGN_POSN_USED		0x02	/* '+' or '(' usage flag */
-#define	LOCALE_POSN		0x04	/* use locale defined +/- (default) */
-#define	PARENTH_POSN		0x08	/* enclose negative amount in () */
-#define	SUPRESS_CURR_SYMBOL	0x10	/* supress the currency from output */
-#define	LEFT_JUSTIFY		0x20	/* left justify */
-#define	USE_INTL_CURRENCY	0x40	/* use international currency symbol */
-#define IS_NEGATIVE		0x80	/* is argument value negative ? */
-
-/* internal macros */
-#define PRINT(CH) do {						\
-	if (dst >= s + maxsize) 				\
-		goto e2big_error;				\
-	*dst++ = CH;						\
-} while (0)
-
-#define PRINTS(STR) do {					\
-	char *tmps = STR;					\
-	while (*tmps != '\0')					\
-		PRINT(*tmps++);					\
-} while (0)
-
-#define GET_NUMBER(VAR)	do {					\
-	VAR = 0;						\
-	while (isdigit((unsigned char)*fmt)) {			\
-		VAR *= 10;					\
-		VAR += *fmt - '0';				\
-		fmt++;						\
-	}							\
-} while (0)
-
-#define GRPCPY(howmany) do {					\
-	int i = howmany;					\
-	while (i-- > 0) {					\
-		avalue_size--;					\
-		*--bufend = *(avalue+avalue_size+padded);	\
-	}							\
-} while (0)
-
-#define GRPSEP do {						\
-	*--bufend = thousands_sep;				\
-	groups++;						\
-} while (0)
-
-static void __setup_vars(int, char *, char *, char *, char **);
-static int __calc_left_pad(int, char *);
-static char *__format_grouped_double(double, int *, int, int, int);
-
-ssize_t
-strfmon(char * __restrict s, size_t maxsize, const char * __restrict format,
-    ...)
-{
-	va_list		ap;
-	char 		*dst;		/* output destination pointer */
-	const char 	*fmt;		/* current format poistion pointer */
-	struct lconv 	*lc;		/* pointer to lconv structure */
-	char		*asciivalue;	/* formatted double pointer */
-
-	int		flags;		/* formatting options */
-	int		pad_char;	/* padding character */
-	int		pad_size;	/* pad size */
-	int		width;		/* field width */
-	int		left_prec;	/* left precision */
-	int		right_prec;	/* right precision */
-	double		value;		/* just value */
-	char		space_char = ' '; /* space after currency */
-
-	char		cs_precedes,	/* values gathered from struct lconv */
-			sep_by_space,
-			sign_posn,
-			*signstr,
-			*currency_symbol;
-
-	char		*tmpptr;	/* temporary vars */
-	int		sverrno;
-
-        va_start(ap, format);
-
-	lc = localeconv();
-	dst = s;
-	fmt = format;
-	asciivalue = NULL;
-	currency_symbol = NULL;
-	pad_size = 0;
-
-	while (*fmt) {
-		/* pass nonformating characters AS IS */
-		if (*fmt != '%')
-			goto literal;
-
-		/* '%' found ! */
-
-		/* "%%" mean just '%' */
-		if (*(fmt+1) == '%') {
-			fmt++;
-	literal:
-			PRINT(*fmt++);
-			continue;
-		}
-
-		/* set up initial values */
-		flags = (NEED_GROUPING|LOCALE_POSN);
-		pad_char = ' ';		/* padding character is "space" */
-		left_prec = -1;		/* no left precision specified */
-		right_prec = -1;	/* no right precision specified */
-		width = -1;		/* no width specified */
-		value = 0;		/* we have no value to print now */
-
-		/* Flags */
-		while (1) {
-			switch (*++fmt) {
-				case '=':	/* fill character */
-					pad_char = *++fmt;
-					if (pad_char == '\0')
-						goto format_error;
-					continue;
-				case '^':	/* not group currency  */
-					flags &= ~(NEED_GROUPING);
-					continue;
-				case '+':	/* use locale defined signs */
-					if (flags & SIGN_POSN_USED)
-						goto format_error;
-					flags |= (SIGN_POSN_USED|LOCALE_POSN);
-					continue;
-				case '(':	/* enclose negatives with () */
-					if (flags & SIGN_POSN_USED)
-						goto format_error;
-					flags |= (SIGN_POSN_USED|PARENTH_POSN);
-					continue;
-				case '!':	/* suppress currency symbol */
-					flags |= SUPRESS_CURR_SYMBOL;
-					continue;
-				case '-':	/* alignment (left)  */
-					flags |= LEFT_JUSTIFY;
-					continue;
-				default:
-					break;
-			}
-			break;
-		}
-
-		/* field Width */
-		if (isdigit((unsigned char)*fmt)) {
-			GET_NUMBER(width);
-			/* Do we have enough space to put number with
-			 * required width ?
-			 */
-			if (dst + width >= s + maxsize)
-				goto e2big_error;
-		}
-
-		/* Left precision */
-		if (*fmt == '#') {
-			if (!isdigit((unsigned char)*++fmt))
-				goto format_error;
-			GET_NUMBER(left_prec);
-		}
-
-		/* Right precision */
-		if (*fmt == '.') {
-			if (!isdigit((unsigned char)*++fmt))
-				goto format_error;
-			GET_NUMBER(right_prec);
-		}
-
-		/* Conversion Characters */
-		switch (*fmt++) {
-			case 'i':	/* use internaltion currency format */
-				flags |= USE_INTL_CURRENCY;
-				break;
-			case 'n':	/* use national currency format */
-				flags &= ~(USE_INTL_CURRENCY);
-				break;
-			default:	/* required character is missing or
-					   premature EOS */
-				goto format_error;
-		}
-
-		if (flags & USE_INTL_CURRENCY) {
-			currency_symbol = strdup(lc->int_curr_symbol);
-			if (currency_symbol != NULL)
-				space_char = *(currency_symbol+3);
-		} else
-			currency_symbol = strdup(lc->currency_symbol);
-
-		if (currency_symbol == NULL)
-			goto end_error;			/* ENOMEM. */
-
-		/* value itself */
-		value = va_arg(ap, double);
-
-		/* detect sign */
-		if (value < 0) {
-			flags |= IS_NEGATIVE;
-			value = -value;
-		}
-
-		/* fill left_prec with amount of padding chars */
-		if (left_prec >= 0) {
-			pad_size = __calc_left_pad((flags ^ IS_NEGATIVE),
-							currency_symbol) -
-				   __calc_left_pad(flags, currency_symbol);
-			if (pad_size < 0)
-				pad_size = 0;
-		}
-
-		asciivalue = __format_grouped_double(value, &flags,
-				left_prec, right_prec, pad_char);
-		if (asciivalue == NULL)
-			goto end_error;		/* errno already set     */
-						/* to ENOMEM by malloc() */
-
-		/* set some variables for later use */
-		__setup_vars(flags, &cs_precedes, &sep_by_space,
-				&sign_posn, &signstr);
-
-		/*
-		 * Description of some LC_MONETARY's values:
-		 *
-		 * p_cs_precedes & n_cs_precedes
-		 *
-		 * = 1 - $currency_symbol precedes the value
-		 *       for a monetary quantity with a non-negative value
-		 * = 0 - symbol succeeds the value
-		 *
-		 * p_sep_by_space & n_sep_by_space
-                 *
-		 * = 0 - no space separates $currency_symbol
-		 *       from the value for a monetary quantity with a
-		 *	 non-negative value
-		 * = 1 - space separates the symbol from the value
-		 * = 2 - space separates the symbol and the sign string,
-		 *       if adjacent.
-                 *
-		 * p_sign_posn & n_sign_posn
-                 *
-		 * = 0 - parentheses enclose the quantity and the
-		 *	 $currency_symbol
-		 * = 1 - the sign string precedes the quantity and the 
-		 *       $currency_symbol
-		 * = 2 - the sign string succeeds the quantity and the 
-		 *       $currency_symbol
-		 * = 3 - the sign string precedes the $currency_symbol
-		 * = 4 - the sign string succeeds the $currency_symbol
-                 *
-		 */
-
-		tmpptr = dst;
-
-		while (pad_size-- > 0)
-			PRINT(' ');
-
-		if (sign_posn == 0 && (flags & IS_NEGATIVE))
-			PRINT('(');
-
-		if (cs_precedes == 1) {
-			if (sign_posn == 1 || sign_posn == 3) {
-				PRINTS(signstr);
-				if (sep_by_space == 2)		/* XXX: ? */
-					PRINT(' ');
-			}
-
-			if (!(flags & SUPRESS_CURR_SYMBOL)) {
-				PRINTS(currency_symbol);
-
-				if (sign_posn == 4) {
-					if (sep_by_space == 2)
-						PRINT(space_char);
-					PRINTS(signstr);
-					if (sep_by_space == 1)
-						PRINT(' ');
-				} else if (sep_by_space == 1)
-					PRINT(space_char);
-			}
-		} else if (sign_posn == 1)
-			PRINTS(signstr);
-
-		PRINTS(asciivalue);
-
-		if (cs_precedes == 0) {
-			if (sign_posn == 3) {
-				if (sep_by_space == 1)
-					PRINT(' ');
-				PRINTS(signstr);
-			}
-
-			if (!(flags & SUPRESS_CURR_SYMBOL)) {
-				if ((sign_posn == 3 && sep_by_space == 2)
-				    || (sep_by_space == 1
-				    && (sign_posn == 0
-				    || sign_posn == 1
-				    || sign_posn == 2
-				    || sign_posn == 4)))
-					PRINT(space_char);
-				PRINTS(currency_symbol); /* XXX: len */
-				if (sign_posn == 4) {
-					if (sep_by_space == 2)
-						PRINT(' ');
-					PRINTS(signstr);
-				}
-			}
-		}
-
-		if (sign_posn == 2) {
-			if (sep_by_space == 2)
-				PRINT(' ');
-			PRINTS(signstr);
-		}
-
-		if (sign_posn == 0 && (flags & IS_NEGATIVE))
-			PRINT(')');
-
-		if (dst - tmpptr < width) {
-			if (flags & LEFT_JUSTIFY) {
-				while (dst - tmpptr < width)
-					PRINT(' ');
-			} else {
-				pad_size = dst-tmpptr;
-				memmove(tmpptr + width-pad_size, tmpptr,
-				    pad_size);
-				memset(tmpptr, ' ', width-pad_size);
-				dst += width-pad_size;
-			}
-		}
-	}
-
-	PRINT('\0');
-	va_end(ap);
-	free(asciivalue);
-	free(currency_symbol);
-	return (dst - s - 1);	/* return size of put data except trailing '\0' */
-
-e2big_error:
-	errno = E2BIG;
-	goto end_error;
-
-format_error:
-	errno = EINVAL;
-
-end_error:
-	sverrno = errno;
-	if (asciivalue != NULL)
-		free(asciivalue);
-	if (currency_symbol != NULL)
-		free(currency_symbol);
-	errno = sverrno;
-	va_end(ap);
-	return (-1);
-}
-
-static void
-__setup_vars(int flags, char *cs_precedes, char *sep_by_space,
-		char *sign_posn, char **signstr) {
-
-	struct lconv *lc = localeconv();
-
-	if ((flags & IS_NEGATIVE) && (flags & USE_INTL_CURRENCY)) {
-		*cs_precedes = lc->int_n_cs_precedes;
-		*sep_by_space = lc->int_n_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_n_sign_posn;
-		*signstr = (lc->negative_sign == '\0') ? "-"
-		    : lc->negative_sign;
-	} else if (flags & USE_INTL_CURRENCY) {
-		*cs_precedes = lc->int_p_cs_precedes;
-		*sep_by_space = lc->int_p_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_p_sign_posn;
-		*signstr = lc->positive_sign;
-	} else if (flags & IS_NEGATIVE) {
-		*cs_precedes = lc->n_cs_precedes;
-		*sep_by_space = lc->n_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->n_sign_posn;
-		*signstr = (lc->negative_sign == '\0') ? "-"
-		    : lc->negative_sign;
-	} else {
-		*cs_precedes = lc->p_cs_precedes;
-		*sep_by_space = lc->p_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->p_sign_posn;
-		*signstr = lc->positive_sign;
-	}
-
-	/* Set defult values for unspecified information. */
-	if (*cs_precedes != 0)
-		*cs_precedes = 1;
-	if (*sep_by_space == CHAR_MAX)
-		*sep_by_space = 0;
-	if (*sign_posn == CHAR_MAX)
-		*sign_posn = 0;
-}
-
-static int
-__calc_left_pad(int flags, char *cur_symb) {
-
-	char cs_precedes, sep_by_space, sign_posn, *signstr;
-	int left_chars = 0;
-
-	__setup_vars(flags, &cs_precedes, &sep_by_space, &sign_posn, &signstr);
-
-	if (cs_precedes != 0) {
-		left_chars += strlen(cur_symb);
-		if (sep_by_space != 0)
-			left_chars++;
-	}
-
-	switch (sign_posn) {
-		case 1:
-			left_chars += strlen(signstr);
-			break;
-		case 3:
-		case 4:
-			if (cs_precedes != 0)
-				left_chars += strlen(signstr);
-	}
-	return (left_chars);
-}
-
-static int
-get_groups(int size, char *grouping) {
-
-	int	chars = 0;
-
-	if (*grouping == CHAR_MAX || *grouping <= 0)	/* no grouping ? */
-		return (0);
-
-	while (size > (int)*grouping) {
-		chars++;
-		size -= (int)*grouping++;
-		/* no more grouping ? */
-		if (*grouping == CHAR_MAX)
-			break;
-		/* rest grouping with same value ? */
-		if (*grouping == 0) {
-			chars += (size - 1) / *(grouping - 1);
-			break;
-		}
-	}
-	return (chars);
-}
-
-/* convert double to ASCII */
-static char *
-__format_grouped_double(double value, int *flags,
-			int left_prec, int right_prec, int pad_char) {
-
-	char		*rslt;
-	char		*avalue;
-	int		avalue_size;
-	char		fmt[32];
-
-	size_t		bufsize;
-	char		*bufend;
-
-	int		padded;
-
-	struct lconv	*lc = localeconv();
-	char		*grouping;
-	char		decimal_point;
-	char		thousands_sep;
-
-	int groups = 0;
-
-	grouping = lc->mon_grouping;
-	decimal_point = *lc->mon_decimal_point;
-	if (decimal_point == '\0')
-		decimal_point = *lc->decimal_point;
-	thousands_sep = *lc->mon_thousands_sep;
-	if (thousands_sep == '\0')
-		thousands_sep = *lc->thousands_sep;
-
-	/* fill left_prec with default value */
-	if (left_prec == -1)
-		left_prec = 0;
-
-	/* fill right_prec with default value */
-	if (right_prec == -1) {
-                if (*flags & USE_INTL_CURRENCY)
-                        right_prec = lc->int_frac_digits;
-                else
-                        right_prec = lc->frac_digits;
-
-		if (right_prec == CHAR_MAX)	/* POSIX locale ? */
-			right_prec = 2;
-	}
-
-	if (*flags & NEED_GROUPING)
-		left_prec += get_groups(left_prec, grouping);
-
-	/* convert to string */
-	snprintf(fmt, sizeof(fmt), "%%%d.%df", left_prec + right_prec + 1,
-	    right_prec);
-	avalue_size = asprintf(&avalue, fmt, value);
-	if (avalue_size < 0)
-		return (NULL);
-
-	/* make sure that we've enough space for result string */
-	bufsize = strlen(avalue)*2+1;
-	rslt = malloc(bufsize);
-	if (rslt == NULL) {
-		free(avalue);
-		return (NULL);
-	}
-	memset(rslt, 0, bufsize);
-	bufend = rslt + bufsize - 1;	/* reserve space for trailing '\0' */
-
-	/* skip spaces at beggining */
-	padded = 0;
-	while (avalue[padded] == ' ') {
-		padded++;
-		avalue_size--;
-	}
-
-	if (right_prec > 0) {
-		bufend -= right_prec;
-		memcpy(bufend, avalue + avalue_size+padded-right_prec,
-		    right_prec);
-		*--bufend = decimal_point;
-		avalue_size -= (right_prec + 1);
-	}
-
-	if ((*flags & NEED_GROUPING) &&
-	    thousands_sep != '\0' &&	/* XXX: need investigation */
-	    *grouping != CHAR_MAX &&
-	    *grouping > 0) {
-		while (avalue_size > (int)*grouping) {
-			GRPCPY(*grouping);
-			GRPSEP;
-			grouping++;
-
-			/* no more grouping ? */
-			if (*grouping == CHAR_MAX)
-				break;
-
-			/* rest grouping with same value ? */
-			if (*grouping == 0) {
-				grouping--;
-				while (avalue_size > *grouping) {
-					GRPCPY(*grouping);
-					GRPSEP;
-				}
-			}
-		}
-		if (avalue_size != 0)
-			GRPCPY(avalue_size);
-		padded -= groups;
-
-	} else {
-		bufend -= avalue_size;
-		memcpy(bufend, avalue+padded, avalue_size);
-		if (right_prec == 0)
-			padded--;	/* decrease assumed $decimal_point */
-	}
-
-	/* do padding with pad_char */
-	if (padded > 0) {
-		bufend -= padded;
-		memset(bufend, pad_char, padded);
-	}
-
-	bufsize = bufsize - (bufend - rslt) + 1;
-	memmove(rslt, bufend, bufsize);
-	free(avalue);
-	return (rslt);
-}
diff --git a/lib/libc/stdlib/strtoimax.c b/lib/libc/stdlib/strtoimax.c
deleted file mode 100644
index f5bc3b4..0000000
--- a/lib/libc/stdlib/strtoimax.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "from @(#)strtol.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.11 2005/01/21 13:31:02 ache Exp $");
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <inttypes.h>
-
-/*
- * Convert a string to an intmax_t integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-intmax_t
-strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	const char *s;
-	uintmax_t acc;
-	char c;
-	uintmax_t cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace((unsigned char)c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	/*
-	 * Compute the cutoff value between legal numbers and illegal
-	 * numbers.  That is the largest legal value, divided by the
-	 * base.  An input number that is greater than this value, if
-	 * followed by a legal input character, is too big.  One that
-	 * is equal to this value may be valid or not; the limit
-	 * between valid and invalid numbers is then based on the last
-	 * digit.  For instance, if the range for intmax_t is
-	 * [-9223372036854775808..9223372036854775807] and the input base
-	 * is 10, cutoff will be set to 922337203685477580 and cutlim to
-	 * either 7 (neg==0) or 8 (neg==1), meaning that if we have
-	 * accumulated a value > 922337203685477580, or equal but the
-	 * next digit is > 7 (or 8), the number is too big, and we will
-	 * return a range error.
-	 *
-	 * Set 'any' if any `digits' consumed; make it negative to indicate
-	 * overflow.
-	 */
-	cutoff = neg ? (uintmax_t)-(INTMAX_MIN + INTMAX_MAX) + INTMAX_MAX
-	    : INTMAX_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? INTMAX_MIN : INTMAX_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/stdlib/strtol.c b/lib/libc/stdlib/strtol.c
deleted file mode 100644
index 53a746e..0000000
--- a/lib/libc/stdlib/strtol.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtol.c,v 1.19 2005/01/21 13:31:02 ache Exp $");
-
-#include <limits.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-
-
-/*
- * Convert a string to a long integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-long
-strtol(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	const char *s;
-	unsigned long acc;
-	char c;
-	unsigned long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace((unsigned char)c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	/*
-	 * Compute the cutoff value between legal numbers and illegal
-	 * numbers.  That is the largest legal value, divided by the
-	 * base.  An input number that is greater than this value, if
-	 * followed by a legal input character, is too big.  One that
-	 * is equal to this value may be valid or not; the limit
-	 * between valid and invalid numbers is then based on the last
-	 * digit.  For instance, if the range for longs is
-	 * [-2147483648..2147483647] and the input base is 10,
-	 * cutoff will be set to 214748364 and cutlim to either
-	 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
-	 * a value > 214748364, or equal but the next digit is > 7 (or 8),
-	 * the number is too big, and we will return a range error.
-	 *
-	 * Set 'any' if any `digits' consumed; make it negative to indicate
-	 * overflow.
-	 */
-	cutoff = neg ? (unsigned long)-(LONG_MIN + LONG_MAX) + LONG_MAX
-	    : LONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LONG_MIN : LONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
deleted file mode 100644
index a24f6f8..0000000
--- a/lib/libc/stdlib/strtoll.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.21 2005/01/21 13:31:02 ache Exp $");
-
-#include <limits.h>
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-/*
- * Convert a string to a long long integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-long long
-strtoll(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	const char *s;
-	unsigned long long acc;
-	char c;
-	unsigned long long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace((unsigned char)c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	/*
-	 * Compute the cutoff value between legal numbers and illegal
-	 * numbers.  That is the largest legal value, divided by the
-	 * base.  An input number that is greater than this value, if
-	 * followed by a legal input character, is too big.  One that
-	 * is equal to this value may be valid or not; the limit
-	 * between valid and invalid numbers is then based on the last
-	 * digit.  For instance, if the range for quads is
-	 * [-9223372036854775808..9223372036854775807] and the input base
-	 * is 10, cutoff will be set to 922337203685477580 and cutlim to
-	 * either 7 (neg==0) or 8 (neg==1), meaning that if we have
-	 * accumulated a value > 922337203685477580, or equal but the
-	 * next digit is > 7 (or 8), the number is too big, and we will
-	 * return a range error.
-	 *
-	 * Set 'any' if any `digits' consumed; make it negative to indicate
-	 * overflow.
-	 */
-	cutoff = neg ? (unsigned long long)-(LLONG_MIN + LLONG_MAX) + LLONG_MAX
-	    : LLONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LLONG_MIN : LLONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/stdlib/strtonum.c b/lib/libc/stdlib/strtonum.c
deleted file mode 100644
index b99345c..0000000
--- a/lib/libc/stdlib/strtonum.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2004 Ted Unangst and Todd Miller
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtonum.c,v 1.2.2.1 2006/04/04 19:56:46 andre Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-#define INVALID 	1
-#define TOOSMALL 	2
-#define TOOLARGE 	3
-
-long long
-strtonum(const char *numstr, long long minval, long long maxval,
-    const char **errstrp)
-{
-	long long ll = 0;
-	char *ep;
-	int error = 0;
-	struct errval {
-		const char *errstr;
-		int err;
-	} ev[4] = {
-		{ NULL,		0 },
-		{ "invalid",	EINVAL },
-		{ "too small",	ERANGE },
-		{ "too large",	ERANGE },
-	};
-
-	ev[0].err = errno;
-	errno = 0;
-	if (minval > maxval)
-		error = INVALID;
-	else {
-		ll = strtoll(numstr, &ep, 10);
-		if (errno == EINVAL || numstr == ep || *ep != '\0')
-			error = INVALID;
-		else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
-			error = TOOSMALL;
-		else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
-			error = TOOLARGE;
-	}
-	if (errstrp != NULL)
-		*errstrp = ev[error].errstr;
-	errno = ev[error].err;
-	if (error)
-		ll = 0;
-
-	return (ll);
-}
diff --git a/lib/libc/stdlib/strtoq.c b/lib/libc/stdlib/strtoq.c
deleted file mode 100644
index 6e8bcb8..0000000
--- a/lib/libc/stdlib/strtoq.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoq.c,v 1.11 2002/08/15 09:25:04 robert Exp $");
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-
-/*
- * Convert a string to a quad integer.
- */
-quad_t
-strtoq(const char *nptr, char **endptr, int base)
-{
-
-	return strtoll(nptr, endptr, base);
-}
diff --git a/lib/libc/stdlib/strtoul.c b/lib/libc/stdlib/strtoul.c
deleted file mode 100644
index 13deb32..0000000
--- a/lib/libc/stdlib/strtoul.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoul.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoul.c,v 1.18 2005/01/21 13:31:02 ache Exp $");
-
-#include <limits.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-
-/*
- * Convert a string to an unsigned long integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-unsigned long
-strtoul(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	const char *s;
-	unsigned long acc;
-	char c;
-	unsigned long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * See strtol for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace((unsigned char)c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = ULONG_MAX / base;
-	cutlim = ULONG_MAX % base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = ULONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
deleted file mode 100644
index 51c08a0..0000000
--- a/lib/libc/stdlib/strtoull.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.20 2005/01/21 13:31:02 ache Exp $");
-
-#include <limits.h>
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-/*
- * Convert a string to an unsigned long long integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-unsigned long long
-strtoull(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	const char *s;
-	unsigned long long acc;
-	char c;
-	unsigned long long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * See strtoq for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace((unsigned char)c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = ULLONG_MAX / base;
-	cutlim = ULLONG_MAX % base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = ULLONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/stdlib/strtoumax.c b/lib/libc/stdlib/strtoumax.c
deleted file mode 100644
index 442b281..0000000
--- a/lib/libc/stdlib/strtoumax.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "from @(#)strtoul.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.10 2005/01/21 13:31:02 ache Exp $");
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <inttypes.h>
-
-/*
- * Convert a string to a uintmax_t integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-uintmax_t
-strtoumax(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	const char *s;
-	uintmax_t acc;
-	char c;
-	uintmax_t cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * See strtoimax for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace((unsigned char)c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = UINTMAX_MAX / base;
-	cutlim = UINTMAX_MAX % base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = UINTMAX_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc/stdlib/strtouq.c b/lib/libc/stdlib/strtouq.c
deleted file mode 100644
index c0e0bef..0000000
--- a/lib/libc/stdlib/strtouq.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strtouq.c,v 1.11 2002/08/15 09:25:04 robert Exp $");
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-
-/*
- * Convert a string to an unsigned quad integer.
- */
-u_quad_t
-strtouq(const char *nptr, char **endptr, int base)
-{
-
-	return strtoull(nptr, endptr, base);
-}
diff --git a/lib/libc/stdlib/system.c b/lib/libc/stdlib/system.c
deleted file mode 100644
index fd2cc2a..0000000
--- a/lib/libc/stdlib/system.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)system.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/system.c,v 1.10 2002/03/22 21:53:10 obrien Exp $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <paths.h>
-#include <errno.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-int
-__system(command)
-	const char *command;
-{
-	pid_t pid, savedpid;
-	int pstat;
-	struct sigaction ign, intact, quitact;
-	sigset_t newsigblock, oldsigblock;
-
-	if (!command)		/* just checking... */
-		return(1);
-
-	/*
-	 * Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save
-	 * existing signal dispositions.
-	 */
-	ign.sa_handler = SIG_IGN;
-	(void)sigemptyset(&ign.sa_mask);
-	ign.sa_flags = 0;
-	(void)_sigaction(SIGINT, &ign, &intact);
-	(void)_sigaction(SIGQUIT, &ign, &quitact);
-	(void)sigemptyset(&newsigblock);
-	(void)sigaddset(&newsigblock, SIGCHLD);
-	(void)_sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
-	switch(pid = fork()) {
-	case -1:			/* error */
-		break;
-	case 0:				/* child */
-		/*
-		 * Restore original signal dispositions and exec the command.
-		 */
-		(void)_sigaction(SIGINT, &intact, NULL);
-		(void)_sigaction(SIGQUIT,  &quitact, NULL);
-		(void)_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-		execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL);
-		_exit(127);
-	default:			/* parent */
-		savedpid = pid;
-		do {
-			pid = _wait4(savedpid, &pstat, 0, (struct rusage *)0);
-		} while (pid == -1 && errno == EINTR);
-		break;
-	}
-	(void)_sigaction(SIGINT, &intact, NULL);
-	(void)_sigaction(SIGQUIT,  &quitact, NULL);
-	(void)_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-	return(pid == -1 ? -1 : pstat);
-}
-
-__weak_reference(__system, system);
-__weak_reference(__system, _system);
diff --git a/lib/libc/stdlib/tdelete.c b/lib/libc/stdlib/tdelete.c
deleted file mode 100644
index 7fb6893..0000000
--- a/lib/libc/stdlib/tdelete.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/tdelete.c,v 1.6 2003/01/05 02:43:18 tjr Exp $");
-
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-
-/*
- * delete node with given key
- *
- * vkey:   key to be deleted
- * vrootp: address of the root of the tree
- * compar: function to carry out node comparisons
- */
-void *
-tdelete(const void * __restrict vkey, void ** __restrict vrootp,
-    int (*compar)(const void *, const void *))
-{
-	node_t **rootp = (node_t **)vrootp;
-	node_t *p, *q, *r;
-	int cmp;
-
-	if (rootp == NULL || (p = *rootp) == NULL)
-		return NULL;
-
-	while ((cmp = (*compar)(vkey, (*rootp)->key)) != 0) {
-		p = *rootp;
-		rootp = (cmp < 0) ?
-		    &(*rootp)->llink :		/* follow llink branch */
-		    &(*rootp)->rlink;		/* follow rlink branch */
-		if (*rootp == NULL)
-			return NULL;		/* key not found */
-	}
-	r = (*rootp)->rlink;			/* D1: */
-	if ((q = (*rootp)->llink) == NULL)	/* Left NULL? */
-		q = r;
-	else if (r != NULL) {			/* Right link is NULL? */
-		if (r->llink == NULL) {		/* D2: Find successor */
-			r->llink = q;
-			q = r;
-		} else {			/* D3: Find NULL link */
-			for (q = r->llink; q->llink != NULL; q = r->llink)
-				r = q;
-			r->llink = q->rlink;
-			q->llink = (*rootp)->llink;
-			q->rlink = (*rootp)->rlink;
-		}
-	}
-	free(*rootp);				/* D4: Free node */
-	*rootp = q;				/* link parent to new node */
-	return p;
-}
diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c
deleted file mode 100644
index b58ed88..0000000
--- a/lib/libc/stdlib/tfind.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/tfind.c,v 1.5 2003/01/05 02:43:18 tjr Exp $");
-
-#define _SEARCH_PRIVATE
-#include <stdlib.h>
-#include <search.h>
-
-/* find a node, or return 0 */
-void *
-tfind(vkey, vrootp, compar)
-	const void *vkey;		/* key to be found */
-	void * const *vrootp;		/* address of the tree root */
-	int (*compar)(const void *, const void *);
-{
-	node_t **rootp = (node_t **)vrootp;
-
-	if (rootp == NULL)
-		return NULL;
-
-	while (*rootp != NULL) {		/* T1: */
-		int r;
-
-		if ((r = (*compar)(vkey, (*rootp)->key)) == 0)	/* T2: */
-			return *rootp;		/* key found */
-		rootp = (r < 0) ?
-		    &(*rootp)->llink :		/* T3: follow left branch */
-		    &(*rootp)->rlink;		/* T4: follow right branch */
-	}
-	return NULL;
-}
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c
deleted file mode 100644
index edeccde..0000000
--- a/lib/libc/stdlib/tsearch.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/tsearch.c,v 1.4 2003/01/05 02:43:18 tjr Exp $");
-
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-/* find or insert datum into search tree */
-void *
-tsearch(vkey, vrootp, compar)
-	const void *vkey;		/* key to be located */
-	void **vrootp;			/* address of tree root */
-	int (*compar)(const void *, const void *);
-{
-	node_t *q;
-	node_t **rootp = (node_t **)vrootp;
-
-	if (rootp == NULL)
-		return NULL;
-
-	while (*rootp != NULL) {	/* Knuth's T1: */
-		int r;
-
-		if ((r = (*compar)(vkey, (*rootp)->key)) == 0)	/* T2: */
-			return *rootp;		/* we found it! */
-
-		rootp = (r < 0) ?
-		    &(*rootp)->llink :		/* T3: follow left branch */
-		    &(*rootp)->rlink;		/* T4: follow right branch */
-	}
-
-	q = malloc(sizeof(node_t));		/* T5: key not found */
-	if (q != 0) {				/* make new node */
-		*rootp = q;			/* link new node to old */
-		/* LINTED const castaway ok */
-		q->key = (void *)vkey;		/* initialize new node */
-		q->llink = q->rlink = NULL;
-	}
-	return q;
-}
diff --git a/lib/libc/stdlib/twalk.c b/lib/libc/stdlib/twalk.c
deleted file mode 100644
index 516ef44..0000000
--- a/lib/libc/stdlib/twalk.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: twalk.c,v 1.1 1999/02/22 10:33:16 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/twalk.c,v 1.5 2003/01/05 02:43:18 tjr Exp $");
-
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-static void trecurse(const node_t *,
-    void (*action)(const void *, VISIT, int), int level);
-
-/* Walk the nodes of a tree */
-static void
-trecurse(root, action, level)
-	const node_t *root;	/* Root of the tree to be walked */
-	void (*action)(const void *, VISIT, int);
-	int level;
-{
-
-	if (root->llink == NULL && root->rlink == NULL)
-		(*action)(root, leaf, level);
-	else {
-		(*action)(root, preorder, level);
-		if (root->llink != NULL)
-			trecurse(root->llink, action, level + 1);
-		(*action)(root, postorder, level);
-		if (root->rlink != NULL)
-			trecurse(root->rlink, action, level + 1);
-		(*action)(root, endorder, level);
-	}
-}
-
-/* Walk the nodes of a tree */
-void
-twalk(vroot, action)
-	const void *vroot;	/* Root of the tree to be walked */
-	void (*action)(const void *, VISIT, int);
-{
-	if (vroot != NULL && action != NULL)
-		trecurse(vroot, action, 0);
-}
diff --git a/lib/libc/stdtime/Makefile b/lib/libc/stdtime/Makefile
deleted file mode 100644
index fc3123f..0000000
--- a/lib/libc/stdtime/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale
-
-#Objects
-OBJS = asctime.o difftime.o localtime.o strftime.o strptime.o time32.o timelocal.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/stdtime/asctime.c b/lib/libc/stdtime/asctime.c
deleted file mode 100644
index c28abae..0000000
--- a/lib/libc/stdtime/asctime.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-*/
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifndef NOID
-static char	elsieid[] __unused = "@(#)asctime.c	7.9";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/asctime.c,v 1.12 2004/06/14 10:31:52 stefanf Exp $");
-
-/*LINTLIBRARY*/
-
-#include "namespace.h"
-#include "private.h"
-#include "un-namespace.h"
-#include "tzfile.h"
-
-/*
-** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, Second Edition, 1996-07-12.
-*/
-
-char *
-asctime_r(timeptr, buf)
-const struct tm *	timeptr;
-char *			buf;
-{
-	static const char	wday_name[][3] = {
-		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-	};
-	static const char	mon_name[][3] = {
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-	};
-	const char *	wn;
-	const char *	mn;
-
-	if (timeptr->tm_wday < 0 || timeptr->tm_wday >= DAYSPERWEEK)
-		wn = "???";
-	else	wn = wday_name[timeptr->tm_wday];
-	if (timeptr->tm_mon < 0 || timeptr->tm_mon >= MONSPERYEAR)
-		mn = "???";
-	else	mn = mon_name[timeptr->tm_mon];
-	/*
-	** The X3J11-suggested format is
-	**	"%.3s %.3s%3d %02.2d:%02.2d:%02.2d %d\n"
-	** Since the .2 in 02.2d is ignored, we drop it.
-	*/
-	(void) sprintf(buf, "%.3s %.3s%3d %02d:%02d:%02d %d\n",
-		wn, mn,
-		timeptr->tm_mday, timeptr->tm_hour,
-		timeptr->tm_min, timeptr->tm_sec,
-		TM_YEAR_BASE + timeptr->tm_year);
-	return buf;
-}
-
-/*
-** A la X3J11, with core dump avoidance.
-*/
-
-char *
-asctime(timeptr)
-const struct tm *	timeptr;
-{
-	/*
-	** Big enough for something such as
-	** ??? ???-2147483648 -2147483648:-2147483648:-2147483648 -2147483648\n
-	** (two three-character abbreviations, five strings denoting integers,
-	** three explicit spaces, two explicit colons, a newline,
-	** and a trailing ASCII nul).
-	*/
-	static char		result[3 * 2 + 5 * INT_STRLEN_MAXIMUM(int) +
-					3 + 2 + 1 + 1];
-
-	return asctime_r(timeptr, result);
-}
diff --git a/lib/libc/stdtime/difftime.c b/lib/libc/stdtime/difftime.c
deleted file mode 100644
index df55753..0000000
--- a/lib/libc/stdtime/difftime.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-** This file is in the public domain, so clarified as of
-** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
-*/
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifndef NOID
-static char	elsieid[] __unused = "@(#)difftime.c	7.9";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/difftime.c,v 1.8 2004/06/14 10:31:52 stefanf Exp $");
-
-/*LINTLIBRARY*/
-
-#include "namespace.h"
-#include "private.h"
-#include "un-namespace.h"
-
-/*
-** Algorithm courtesy Paul Eggert (eggert@twinsun.com).
-*/
-
-#ifdef HAVE_LONG_DOUBLE
-#define long_double	long double
-#endif /* defined HAVE_LONG_DOUBLE */
-#ifndef HAVE_LONG_DOUBLE
-#define long_double	double
-#endif /* !defined HAVE_LONG_DOUBLE */
-
-double
-difftime(time1, time0)
-const time_t	time1;
-const time_t	time0;
-{
-	time_t	delta;
-	time_t	hibit;
-
-	{
-		time_t		tt;
-		double		d;
-		long_double	ld;
-
-		if (sizeof tt < sizeof d)
-			return (double) time1 - (double) time0;
-		if (sizeof tt < sizeof ld)
-			return (long_double) time1 - (long_double) time0;
-	}
-	if (time1 < time0)
-		return -difftime(time0, time1);
-	/*
-	** As much as possible, avoid loss of precision
-	** by computing the difference before converting to double.
-	*/
-	delta = time1 - time0;
-	if (delta >= 0)
-		return delta;
-	/*
-	** Repair delta overflow.
-	*/
-	hibit = (~ (time_t) 0) << (TYPE_BIT(time_t) - 1);
-	/*
-	** The following expression rounds twice, which means
-	** the result may not be the closest to the true answer.
-	** For example, suppose time_t is 64-bit signed int,
-	** long_double is IEEE 754 double with default rounding,
-	** time1 = 9223372036854775807 and time0 = -1536.
-	** Then the true difference is 9223372036854777343,
-	** which rounds to 9223372036854777856
-	** with a total error of 513.
-	** But delta overflows to -9223372036854774273,
-	** which rounds to -9223372036854774784, and correcting
-	** this by subtracting 2 * (long_double) hibit
-	** (i.e. by adding 2**64 = 18446744073709551616)
-	** yields 9223372036854776832, which
-	** rounds to 9223372036854775808
-	** with a total error of 1535 instead.
-	** This problem occurs only with very large differences.
-	** It's too painful to fix this portably.
-	** We are not alone in this problem;
-	** some C compilers round twice when converting
-	** large unsigned types to small floating types,
-	** so if time_t is unsigned the "return delta" above
-	** has the same double-rounding problem with those compilers.
-	*/
-	return delta - 2 * (long_double) hibit;
-}
diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c
deleted file mode 100644
index c07f298..0000000
--- a/lib/libc/stdtime/localtime.c
+++ /dev/null
@@ -1,1813 +0,0 @@
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-*/
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifndef NOID
-static char	elsieid[] __unused = "@(#)localtime.c	7.78";
-#endif /* !defined NOID */
-#endif /* !defined lint */
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.40 2004/08/24 00:15:37 peter Exp $");
-
-/*
-** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu).
-** POSIX-style TZ environment variable handling from Guy Harris
-** (guy@auspex.com).
-*/
-
-/*LINTLIBRARY*/
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "private.h"
-#include "un-namespace.h"
-
-#include "tzfile.h"
-
-#include "libc_private.h"
-
-#define	_MUTEX_LOCK(x)		if (__isthreaded) _pthread_mutex_lock(x)
-#define	_MUTEX_UNLOCK(x)	if (__isthreaded) _pthread_mutex_unlock(x)
-
-/*
-** SunOS 4.1.1 headers lack O_BINARY.
-*/
-
-#ifdef O_BINARY
-#define OPEN_MODE	(O_RDONLY | O_BINARY)
-#endif /* defined O_BINARY */
-#ifndef O_BINARY
-#define OPEN_MODE	O_RDONLY
-#endif /* !defined O_BINARY */
-
-#ifndef WILDABBR
-/*
-** Someone might make incorrect use of a time zone abbreviation:
-**	1.	They might reference tzname[0] before calling tzset (explicitly
-**		or implicitly).
-**	2.	They might reference tzname[1] before calling tzset (explicitly
-**		or implicitly).
-**	3.	They might reference tzname[1] after setting to a time zone
-**		in which Daylight Saving Time is never observed.
-**	4.	They might reference tzname[0] after setting to a time zone
-**		in which Standard Time is never observed.
-**	5.	They might reference tm.TM_ZONE after calling offtime.
-** What's best to do in the above cases is open to debate;
-** for now, we just set things up so that in any of the five cases
-** WILDABBR is used.  Another possibility:  initialize tzname[0] to the
-** string "tzname[0] used before set", and similarly for the other cases.
-** And another:  initialize tzname[0] to "ERA", with an explanation in the
-** manual page of what this "time zone abbreviation" means (doing this so
-** that tzname[0] has the "normal" length of three characters).
-*/
-#define WILDABBR	"   "
-#endif /* !defined WILDABBR */
-
-static char		wildabbr[] = "WILDABBR";
-
-/*
- * In June 2004 it was decided UTC was a more appropriate default time
- * zone than GMT.
- */
-
-static const char	gmt[] = "UTC";
-
-/*
-** The DST rules to use if TZ has no rules and we can't load TZDEFRULES.
-** We default to US rules as of 1999-08-17.
-** POSIX 1003.1 section 8.1.1 says that the default DST rules are
-** implementation dependent; for historical reasons, US rules are a
-** common default.
-*/
-#ifndef TZDEFRULESTRING
-#define TZDEFRULESTRING ",M4.1.0,M10.5.0"
-#endif /* !defined TZDEFDST */
-
-struct ttinfo {				/* time type information */
-	long		tt_gmtoff;	/* UTC offset in seconds */
-	int		tt_isdst;	/* used to set tm_isdst */
-	int		tt_abbrind;	/* abbreviation list index */
-	int		tt_ttisstd;	/* TRUE if transition is std time */
-	int		tt_ttisgmt;	/* TRUE if transition is UTC */
-};
-
-struct lsinfo {				/* leap second information */
-	time_t		ls_trans;	/* transition time */
-	long		ls_corr;	/* correction to apply */
-};
-
-#define BIGGEST(a, b)	(((a) > (b)) ? (a) : (b))
-
-#ifdef TZNAME_MAX
-#define MY_TZNAME_MAX	TZNAME_MAX
-#endif /* defined TZNAME_MAX */
-#ifndef TZNAME_MAX
-#define MY_TZNAME_MAX	255
-#endif /* !defined TZNAME_MAX */
-
-struct state {
-	int		leapcnt;
-	int		timecnt;
-	int		typecnt;
-	int		charcnt;
-	time_t		ats[TZ_MAX_TIMES];
-	unsigned char	types[TZ_MAX_TIMES];
-	struct ttinfo	ttis[TZ_MAX_TYPES];
-	char		chars[BIGGEST(BIGGEST(TZ_MAX_CHARS + 1, sizeof gmt),
-				(2 * (MY_TZNAME_MAX + 1)))];
-	struct lsinfo	lsis[TZ_MAX_LEAPS];
-};
-
-struct rule {
-	int		r_type;		/* type of rule--see below */
-	int		r_day;		/* day number of rule */
-	int		r_week;		/* week number of rule */
-	int		r_mon;		/* month number of rule */
-	long		r_time;		/* transition time of rule */
-};
-
-#define JULIAN_DAY		0	/* Jn - Julian day */
-#define DAY_OF_YEAR		1	/* n - day of year */
-#define MONTH_NTH_DAY_OF_WEEK	2	/* Mm.n.d - month, week, day of week */
-
-/*
-** Prototypes for static functions.
-*/
-
-static long		detzcode(const char * codep);
-static const char *	getzname(const char * strp);
-static const char *	getnum(const char * strp, int * nump, int min,
-				int max);
-static const char *	getsecs(const char * strp, long * secsp);
-static const char *	getoffset(const char * strp, long * offsetp);
-static const char *	getrule(const char * strp, struct rule * rulep);
-static void		gmtload(struct state * sp);
-static void		gmtsub(const time_t * timep, long offset,
-				struct tm * tmp);
-static void		localsub(const time_t * timep, long offset,
-				struct tm * tmp);
-static int		increment_overflow(int * number, int delta);
-static int		normalize_overflow(int * tensptr, int * unitsptr,
-				int base);
-static void		settzname(void);
-static time_t		time1(struct tm * tmp,
-				void(*funcp) (const time_t *,
-				long, struct tm *),
-				long offset);
-static time_t		time2(struct tm *tmp,
-				void(*funcp) (const time_t *,
-				long, struct tm*),
-				long offset, int * okayp);
-static time_t		time2sub(struct tm *tmp,
-				void(*funcp) (const time_t *,
-				long, struct tm*),
-				long offset, int * okayp, int do_norm_secs);
-static void		timesub(const time_t * timep, long offset,
-				const struct state * sp, struct tm * tmp);
-static int		tmcomp(const struct tm * atmp,
-				const struct tm * btmp);
-static time_t		transtime(time_t janfirst, int year,
-				const struct rule * rulep, long offset);
-static int		tzload(const char * name, struct state * sp);
-static int		tzparse(const char * name, struct state * sp,
-				int lastditch);
-
-#ifdef ALL_STATE
-static struct state *	lclptr;
-static struct state *	gmtptr;
-#endif /* defined ALL_STATE */
-
-#ifndef ALL_STATE
-static struct state	lclmem;
-static struct state	gmtmem;
-#define lclptr		(&lclmem)
-#define gmtptr		(&gmtmem)
-#endif /* State Farm */
-
-#ifndef TZ_STRLEN_MAX
-#define TZ_STRLEN_MAX 255
-#endif /* !defined TZ_STRLEN_MAX */
-
-static char		lcl_TZname[TZ_STRLEN_MAX + 1];
-static int		lcl_is_set;
-static int		gmt_is_set;
-static pthread_mutex_t	lcl_mutex = PTHREAD_MUTEX_INITIALIZER;
-static pthread_mutex_t	gmt_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-char *			tzname[2] = {
-	wildabbr,
-	wildabbr
-};
-
-/*
-** Section 4.12.3 of X3.159-1989 requires that
-**	Except for the strftime function, these functions [asctime,
-**	ctime, gmtime, localtime] return values in one of two static
-**	objects: a broken-down time structure and an array of char.
-** Thanks to Paul Eggert (eggert@twinsun.com) for noting this.
-*/
-
-static struct tm	tm;
-
-#ifdef USG_COMPAT
-time_t			timezone = 0;
-int			daylight = 0;
-#endif /* defined USG_COMPAT */
-
-#ifdef ALTZONE
-time_t			altzone = 0;
-#endif /* defined ALTZONE */
-
-static long
-detzcode(codep)
-const char * const	codep;
-{
-	long	result;
-	int	i;
-
-	result = (codep[0] & 0x80) ? ~0L : 0L;
-	for (i = 0; i < 4; ++i)
-		result = (result << 8) | (codep[i] & 0xff);
-	return result;
-}
-
-static void
-settzname(void)
-{
-	struct state * 	sp = lclptr;
-	int			i;
-
-	tzname[0] = wildabbr;
-	tzname[1] = wildabbr;
-#ifdef USG_COMPAT
-	daylight = 0;
-	timezone = 0;
-#endif /* defined USG_COMPAT */
-#ifdef ALTZONE
-	altzone = 0;
-#endif /* defined ALTZONE */
-#ifdef ALL_STATE
-	if (sp == NULL) {
-		tzname[0] = tzname[1] = gmt;
-		return;
-	}
-#endif /* defined ALL_STATE */
-	for (i = 0; i < sp->typecnt; ++i) {
-		const struct ttinfo * const	ttisp = &sp->ttis[i];
-
-		tzname[ttisp->tt_isdst] =
-			&sp->chars[ttisp->tt_abbrind];
-#ifdef USG_COMPAT
-		if (ttisp->tt_isdst)
-			daylight = 1;
-		if (i == 0 || !ttisp->tt_isdst)
-			timezone = -(ttisp->tt_gmtoff);
-#endif /* defined USG_COMPAT */
-#ifdef ALTZONE
-		if (i == 0 || ttisp->tt_isdst)
-			altzone = -(ttisp->tt_gmtoff);
-#endif /* defined ALTZONE */
-	}
-	/*
-	** And to get the latest zone names into tzname. . .
-	*/
-	for (i = 0; i < sp->timecnt; ++i) {
-		const struct ttinfo * const	ttisp =
-							&sp->ttis[
-								sp->types[i]];
-
-		tzname[ttisp->tt_isdst] =
-			&sp->chars[ttisp->tt_abbrind];
-	}
-}
-
-static int
-tzload(name, sp)
-const char *		name;
-struct state * const	sp;
-{
-	const char *	p;
-	int		i;
-	int		fid;
-
-	/* XXX The following is from OpenBSD, and I'm not sure it is correct */
-	if (name != NULL && issetugid() != 0)
-		if ((name[0] == ':' && name[1] == '/') || 
-		    name[0] == '/' || strchr(name, '.'))
-			name = NULL;
-	if (name == NULL && (name = TZDEFAULT) == NULL)
-		return -1;
-	{
-		int	doaccess;
-		struct stat	stab;
-		/*
-		** Section 4.9.1 of the C standard says that
-		** "FILENAME_MAX expands to an integral constant expression
-		** that is the size needed for an array of char large enough
-		** to hold the longest file name string that the implementation
-		** guarantees can be opened."
-		*/
-		char		fullname[FILENAME_MAX + 1];
-
-		if (name[0] == ':')
-			++name;
-		doaccess = name[0] == '/';
-		if (!doaccess) {
-			if ((p = TZDIR) == NULL)
-				return -1;
-			if ((strlen(p) + 1 + strlen(name) + 1) >= sizeof fullname)
-				return -1;
-			(void) strcpy(fullname, p);
-			(void) strcat(fullname, "/");
-			(void) strcat(fullname, name);
-			/*
-			** Set doaccess if '.' (as in "../") shows up in name.
-			*/
-			if (strchr(name, '.') != NULL)
-				doaccess = TRUE;
-			name = fullname;
-		}
-		if (doaccess && access(name, R_OK) != 0)
-		     	return -1;
-		if ((fid = _open(name, OPEN_MODE)) == -1)
-			return -1;
-		if ((_fstat(fid, &stab) < 0) || !S_ISREG(stab.st_mode)) {
-			_close(fid);
-			return -1;
-		}
-	}
-	{
-		struct tzhead *	tzhp;
-		union {
-			struct tzhead	tzhead;
-			char		buf[sizeof *sp + sizeof *tzhp];
-		} u;
-		int		ttisstdcnt;
-		int		ttisgmtcnt;
-
-		i = _read(fid, u.buf, sizeof u.buf);
-		if (_close(fid) != 0)
-			return -1;
-		ttisstdcnt = (int) detzcode(u.tzhead.tzh_ttisstdcnt);
-		ttisgmtcnt = (int) detzcode(u.tzhead.tzh_ttisgmtcnt);
-		sp->leapcnt = (int) detzcode(u.tzhead.tzh_leapcnt);
-		sp->timecnt = (int) detzcode(u.tzhead.tzh_timecnt);
-		sp->typecnt = (int) detzcode(u.tzhead.tzh_typecnt);
-		sp->charcnt = (int) detzcode(u.tzhead.tzh_charcnt);
-		p = u.tzhead.tzh_charcnt + sizeof u.tzhead.tzh_charcnt;
-		if (sp->leapcnt < 0 || sp->leapcnt > TZ_MAX_LEAPS ||
-			sp->typecnt <= 0 || sp->typecnt > TZ_MAX_TYPES ||
-			sp->timecnt < 0 || sp->timecnt > TZ_MAX_TIMES ||
-			sp->charcnt < 0 || sp->charcnt > TZ_MAX_CHARS ||
-			(ttisstdcnt != sp->typecnt && ttisstdcnt != 0) ||
-			(ttisgmtcnt != sp->typecnt && ttisgmtcnt != 0))
-				return -1;
-		if (i - (p - u.buf) < sp->timecnt * 4 +	/* ats */
-			sp->timecnt +			/* types */
-			sp->typecnt * (4 + 2) +		/* ttinfos */
-			sp->charcnt +			/* chars */
-			sp->leapcnt * (4 + 4) +		/* lsinfos */
-			ttisstdcnt +			/* ttisstds */
-			ttisgmtcnt)			/* ttisgmts */
-				return -1;
-		for (i = 0; i < sp->timecnt; ++i) {
-			sp->ats[i] = detzcode(p);
-			p += 4;
-		}
-		for (i = 0; i < sp->timecnt; ++i) {
-			sp->types[i] = (unsigned char) *p++;
-			if (sp->types[i] >= sp->typecnt)
-				return -1;
-		}
-		for (i = 0; i < sp->typecnt; ++i) {
-			struct ttinfo *	ttisp;
-
-			ttisp = &sp->ttis[i];
-			ttisp->tt_gmtoff = detzcode(p);
-			p += 4;
-			ttisp->tt_isdst = (unsigned char) *p++;
-			if (ttisp->tt_isdst != 0 && ttisp->tt_isdst != 1)
-				return -1;
-			ttisp->tt_abbrind = (unsigned char) *p++;
-			if (ttisp->tt_abbrind < 0 ||
-				ttisp->tt_abbrind > sp->charcnt)
-					return -1;
-		}
-		for (i = 0; i < sp->charcnt; ++i)
-			sp->chars[i] = *p++;
-		sp->chars[i] = '\0';	/* ensure '\0' at end */
-		for (i = 0; i < sp->leapcnt; ++i) {
-			struct lsinfo *	lsisp;
-
-			lsisp = &sp->lsis[i];
-			lsisp->ls_trans = detzcode(p);
-			p += 4;
-			lsisp->ls_corr = detzcode(p);
-			p += 4;
-		}
-		for (i = 0; i < sp->typecnt; ++i) {
-			struct ttinfo *	ttisp;
-
-			ttisp = &sp->ttis[i];
-			if (ttisstdcnt == 0)
-				ttisp->tt_ttisstd = FALSE;
-			else {
-				ttisp->tt_ttisstd = *p++;
-				if (ttisp->tt_ttisstd != TRUE &&
-					ttisp->tt_ttisstd != FALSE)
-						return -1;
-			}
-		}
-		for (i = 0; i < sp->typecnt; ++i) {
-			struct ttinfo *	ttisp;
-
-			ttisp = &sp->ttis[i];
-			if (ttisgmtcnt == 0)
-				ttisp->tt_ttisgmt = FALSE;
-			else {
-				ttisp->tt_ttisgmt = *p++;
-				if (ttisp->tt_ttisgmt != TRUE &&
-					ttisp->tt_ttisgmt != FALSE)
-						return -1;
-			}
-		}
-	}
-	return 0;
-}
-
-static const int	mon_lengths[2][MONSPERYEAR] = {
-	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
-	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
-};
-
-static const int	year_lengths[2] = {
-	DAYSPERNYEAR, DAYSPERLYEAR
-};
-
-/*
-** Given a pointer into a time zone string, scan until a character that is not
-** a valid character in a zone name is found.  Return a pointer to that
-** character.
-*/
-
-static const char *
-getzname(strp)
-const char *	strp;
-{
-	char	c;
-
-	while ((c = *strp) != '\0' && !is_digit(c) && c != ',' && c != '-' &&
-		c != '+')
-			++strp;
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract a number from that string.
-** Check that the number is within a specified range; if it is not, return
-** NULL.
-** Otherwise, return a pointer to the first character not part of the number.
-*/
-
-static const char *
-getnum(strp, nump, min, max)
-const char *	strp;
-int * const		nump;
-const int		min;
-const int		max;
-{
-	char	c;
-	int	num;
-
-	if (strp == NULL || !is_digit(c = *strp))
-		return NULL;
-	num = 0;
-	do {
-		num = num * 10 + (c - '0');
-		if (num > max)
-			return NULL;	/* illegal value */
-		c = *++strp;
-	} while (is_digit(c));
-	if (num < min)
-		return NULL;		/* illegal value */
-	*nump = num;
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract a number of seconds,
-** in hh[:mm[:ss]] form, from the string.
-** If any error occurs, return NULL.
-** Otherwise, return a pointer to the first character not part of the number
-** of seconds.
-*/
-
-static const char *
-getsecs(strp, secsp)
-const char *	strp;
-long * const		secsp;
-{
-	int	num;
-
-	/*
-	** `HOURSPERDAY * DAYSPERWEEK - 1' allows quasi-Posix rules like
-	** "M10.4.6/26", which does not conform to Posix,
-	** but which specifies the equivalent of
-	** ``02:00 on the first Sunday on or after 23 Oct''.
-	*/
-	strp = getnum(strp, &num, 0, HOURSPERDAY * DAYSPERWEEK - 1);
-	if (strp == NULL)
-		return NULL;
-	*secsp = num * (long) SECSPERHOUR;
-	if (*strp == ':') {
-		++strp;
-		strp = getnum(strp, &num, 0, MINSPERHOUR - 1);
-		if (strp == NULL)
-			return NULL;
-		*secsp += num * SECSPERMIN;
-		if (*strp == ':') {
-			++strp;
-			/* `SECSPERMIN' allows for leap seconds.  */
-			strp = getnum(strp, &num, 0, SECSPERMIN);
-			if (strp == NULL)
-				return NULL;
-			*secsp += num;
-		}
-	}
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract an offset, in
-** [+-]hh[:mm[:ss]] form, from the string.
-** If any error occurs, return NULL.
-** Otherwise, return a pointer to the first character not part of the time.
-*/
-
-static const char *
-getoffset(strp, offsetp)
-const char *	strp;
-long * const		offsetp;
-{
-	int	neg = 0;
-
-	if (*strp == '-') {
-		neg = 1;
-		++strp;
-	} else if (*strp == '+')
-		++strp;
-	strp = getsecs(strp, offsetp);
-	if (strp == NULL)
-		return NULL;		/* illegal time */
-	if (neg)
-		*offsetp = -*offsetp;
-	return strp;
-}
-
-/*
-** Given a pointer into a time zone string, extract a rule in the form
-** date[/time].  See POSIX section 8 for the format of "date" and "time".
-** If a valid rule is not found, return NULL.
-** Otherwise, return a pointer to the first character not part of the rule.
-*/
-
-static const char *
-getrule(strp, rulep)
-const char *			strp;
-struct rule * const	rulep;
-{
-	if (*strp == 'J') {
-		/*
-		** Julian day.
-		*/
-		rulep->r_type = JULIAN_DAY;
-		++strp;
-		strp = getnum(strp, &rulep->r_day, 1, DAYSPERNYEAR);
-	} else if (*strp == 'M') {
-		/*
-		** Month, week, day.
-		*/
-		rulep->r_type = MONTH_NTH_DAY_OF_WEEK;
-		++strp;
-		strp = getnum(strp, &rulep->r_mon, 1, MONSPERYEAR);
-		if (strp == NULL)
-			return NULL;
-		if (*strp++ != '.')
-			return NULL;
-		strp = getnum(strp, &rulep->r_week, 1, 5);
-		if (strp == NULL)
-			return NULL;
-		if (*strp++ != '.')
-			return NULL;
-		strp = getnum(strp, &rulep->r_day, 0, DAYSPERWEEK - 1);
-	} else if (is_digit(*strp)) {
-		/*
-		** Day of year.
-		*/
-		rulep->r_type = DAY_OF_YEAR;
-		strp = getnum(strp, &rulep->r_day, 0, DAYSPERLYEAR - 1);
-	} else	return NULL;		/* invalid format */
-	if (strp == NULL)
-		return NULL;
-	if (*strp == '/') {
-		/*
-		** Time specified.
-		*/
-		++strp;
-		strp = getsecs(strp, &rulep->r_time);
-	} else	rulep->r_time = 2 * SECSPERHOUR;	/* default = 2:00:00 */
-	return strp;
-}
-
-/*
-** Given the Epoch-relative time of January 1, 00:00:00 UTC, in a year, the
-** year, a rule, and the offset from UTC at the time that rule takes effect,
-** calculate the Epoch-relative time that rule takes effect.
-*/
-
-static time_t
-transtime(janfirst, year, rulep, offset)
-const time_t				janfirst;
-const int				year;
-const struct rule * const	rulep;
-const long				offset;
-{
-	int	leapyear;
-	time_t	value;
-	int	i;
-	int		d, m1, yy0, yy1, yy2, dow;
-
-	INITIALIZE(value);
-	leapyear = isleap(year);
-	switch (rulep->r_type) {
-
-	case JULIAN_DAY:
-		/*
-		** Jn - Julian day, 1 == January 1, 60 == March 1 even in leap
-		** years.
-		** In non-leap years, or if the day number is 59 or less, just
-		** add SECSPERDAY times the day number-1 to the time of
-		** January 1, midnight, to get the day.
-		*/
-		value = janfirst + (rulep->r_day - 1) * SECSPERDAY;
-		if (leapyear && rulep->r_day >= 60)
-			value += SECSPERDAY;
-		break;
-
-	case DAY_OF_YEAR:
-		/*
-		** n - day of year.
-		** Just add SECSPERDAY times the day number to the time of
-		** January 1, midnight, to get the day.
-		*/
-		value = janfirst + rulep->r_day * SECSPERDAY;
-		break;
-
-	case MONTH_NTH_DAY_OF_WEEK:
-		/*
-		** Mm.n.d - nth "dth day" of month m.
-		*/
-		value = janfirst;
-		for (i = 0; i < rulep->r_mon - 1; ++i)
-			value += mon_lengths[leapyear][i] * SECSPERDAY;
-
-		/*
-		** Use Zeller's Congruence to get day-of-week of first day of
-		** month.
-		*/
-		m1 = (rulep->r_mon + 9) % 12 + 1;
-		yy0 = (rulep->r_mon <= 2) ? (year - 1) : year;
-		yy1 = yy0 / 100;
-		yy2 = yy0 % 100;
-		dow = ((26 * m1 - 2) / 10 +
-			1 + yy2 + yy2 / 4 + yy1 / 4 - 2 * yy1) % 7;
-		if (dow < 0)
-			dow += DAYSPERWEEK;
-
-		/*
-		** "dow" is the day-of-week of the first day of the month.  Get
-		** the day-of-month (zero-origin) of the first "dow" day of the
-		** month.
-		*/
-		d = rulep->r_day - dow;
-		if (d < 0)
-			d += DAYSPERWEEK;
-		for (i = 1; i < rulep->r_week; ++i) {
-			if (d + DAYSPERWEEK >=
-				mon_lengths[leapyear][rulep->r_mon - 1])
-					break;
-			d += DAYSPERWEEK;
-		}
-
-		/*
-		** "d" is the day-of-month (zero-origin) of the day we want.
-		*/
-		value += d * SECSPERDAY;
-		break;
-	}
-
-	/*
-	** "value" is the Epoch-relative time of 00:00:00 UTC on the day in
-	** question.  To get the Epoch-relative time of the specified local
-	** time on that day, add the transition time and the current offset
-	** from UTC.
-	*/
-	return value + rulep->r_time + offset;
-}
-
-/*
-** Given a POSIX section 8-style TZ string, fill in the rule tables as
-** appropriate.
-*/
-
-static int
-tzparse(name, sp, lastditch)
-const char *			name;
-struct state * const	sp;
-const int			lastditch;
-{
-	const char *			stdname;
-	const char *			dstname;
-	size_t				stdlen;
-	size_t				dstlen;
-	long				stdoffset;
-	long				dstoffset;
-	time_t *		atp;
-	unsigned char *	typep;
-	char *			cp;
-	int			load_result;
-
-	INITIALIZE(dstname);
-	stdname = name;
-	if (lastditch) {
-		stdlen = strlen(name);	/* length of standard zone name */
-		name += stdlen;
-		if (stdlen >= sizeof sp->chars)
-			stdlen = (sizeof sp->chars) - 1;
-		stdoffset = 0;
-	} else {
-		name = getzname(name);
-		stdlen = name - stdname;
-		if (stdlen < 3)
-			return -1;
-		if (*name == '\0')
-			return -1;	/* was "stdoffset = 0;" */
-		else {
-			name = getoffset(name, &stdoffset);
-			if (name == NULL)
-				return -1;
-		}
-	}
-	load_result = tzload(TZDEFRULES, sp);
-	if (load_result != 0)
-		sp->leapcnt = 0;		/* so, we're off a little */
-	if (*name != '\0') {
-		dstname = name;
-		name = getzname(name);
-		dstlen = name - dstname;	/* length of DST zone name */
-		if (dstlen < 3)
-			return -1;
-		if (*name != '\0' && *name != ',' && *name != ';') {
-			name = getoffset(name, &dstoffset);
-			if (name == NULL)
-				return -1;
-		} else	dstoffset = stdoffset - SECSPERHOUR;
-		if (*name == '\0' && load_result != 0)
-			name = TZDEFRULESTRING;
-		if (*name == ',' || *name == ';') {
-			struct rule	start;
-			struct rule	end;
-			int	year;
-			time_t	janfirst;
-			time_t		starttime;
-			time_t		endtime;
-
-			++name;
-			if ((name = getrule(name, &start)) == NULL)
-				return -1;
-			if (*name++ != ',')
-				return -1;
-			if ((name = getrule(name, &end)) == NULL)
-				return -1;
-			if (*name != '\0')
-				return -1;
-			sp->typecnt = 2;	/* standard time and DST */
-			/*
-			** Two transitions per year, from EPOCH_YEAR to 2037.
-			*/
-			sp->timecnt = 2 * (2037 - EPOCH_YEAR + 1);
-			if (sp->timecnt > TZ_MAX_TIMES)
-				return -1;
-			sp->ttis[0].tt_gmtoff = -dstoffset;
-			sp->ttis[0].tt_isdst = 1;
-			sp->ttis[0].tt_abbrind = stdlen + 1;
-			sp->ttis[1].tt_gmtoff = -stdoffset;
-			sp->ttis[1].tt_isdst = 0;
-			sp->ttis[1].tt_abbrind = 0;
-			atp = sp->ats;
-			typep = sp->types;
-			janfirst = 0;
-			for (year = EPOCH_YEAR; year <= 2037; ++year) {
-				starttime = transtime(janfirst, year, &start,
-					stdoffset);
-				endtime = transtime(janfirst, year, &end,
-					dstoffset);
-				if (starttime > endtime) {
-					*atp++ = endtime;
-					*typep++ = 1;	/* DST ends */
-					*atp++ = starttime;
-					*typep++ = 0;	/* DST begins */
-				} else {
-					*atp++ = starttime;
-					*typep++ = 0;	/* DST begins */
-					*atp++ = endtime;
-					*typep++ = 1;	/* DST ends */
-				}
-				janfirst += year_lengths[isleap(year)] *
-					SECSPERDAY;
-			}
-		} else {
-			long	theirstdoffset;
-			long	theirdstoffset;
-			long	theiroffset;
-			int	isdst;
-			int	i;
-			int	j;
-
-			if (*name != '\0')
-				return -1;
-			/*
-			** Initial values of theirstdoffset and theirdstoffset.
-			*/
-			theirstdoffset = 0;
-			for (i = 0; i < sp->timecnt; ++i) {
-				j = sp->types[i];
-				if (!sp->ttis[j].tt_isdst) {
-					theirstdoffset =
-						-sp->ttis[j].tt_gmtoff;
-					break;
-				}
-			}
-			theirdstoffset = 0;
-			for (i = 0; i < sp->timecnt; ++i) {
-				j = sp->types[i];
-				if (sp->ttis[j].tt_isdst) {
-					theirdstoffset =
-						-sp->ttis[j].tt_gmtoff;
-					break;
-				}
-			}
-			/*
-			** Initially we're assumed to be in standard time.
-			*/
-			isdst = FALSE;
-			theiroffset = theirstdoffset;
-			/*
-			** Now juggle transition times and types
-			** tracking offsets as you do.
-			*/
-			for (i = 0; i < sp->timecnt; ++i) {
-				j = sp->types[i];
-				sp->types[i] = sp->ttis[j].tt_isdst;
-				if (sp->ttis[j].tt_ttisgmt) {
-					/* No adjustment to transition time */
-				} else {
-					/*
-					** If summer time is in effect, and the
-					** transition time was not specified as
-					** standard time, add the summer time
-					** offset to the transition time;
-					** otherwise, add the standard time
-					** offset to the transition time.
-					*/
-					/*
-					** Transitions from DST to DDST
-					** will effectively disappear since
-					** POSIX provides for only one DST
-					** offset.
-					*/
-					if (isdst && !sp->ttis[j].tt_ttisstd) {
-						sp->ats[i] += dstoffset -
-							theirdstoffset;
-					} else {
-						sp->ats[i] += stdoffset -
-							theirstdoffset;
-					}
-				}
-				theiroffset = -sp->ttis[j].tt_gmtoff;
-				if (sp->ttis[j].tt_isdst)
-					theirdstoffset = theiroffset;
-				else	theirstdoffset = theiroffset;
-			}
-			/*
-			** Finally, fill in ttis.
-			** ttisstd and ttisgmt need not be handled.
-			*/
-			sp->ttis[0].tt_gmtoff = -stdoffset;
-			sp->ttis[0].tt_isdst = FALSE;
-			sp->ttis[0].tt_abbrind = 0;
-			sp->ttis[1].tt_gmtoff = -dstoffset;
-			sp->ttis[1].tt_isdst = TRUE;
-			sp->ttis[1].tt_abbrind = stdlen + 1;
-			sp->typecnt = 2;
-		}
-	} else {
-		dstlen = 0;
-		sp->typecnt = 1;		/* only standard time */
-		sp->timecnt = 0;
-		sp->ttis[0].tt_gmtoff = -stdoffset;
-		sp->ttis[0].tt_isdst = 0;
-		sp->ttis[0].tt_abbrind = 0;
-	}
-	sp->charcnt = stdlen + 1;
-	if (dstlen != 0)
-		sp->charcnt += dstlen + 1;
-	if ((size_t) sp->charcnt > sizeof sp->chars)
-		return -1;
-	cp = sp->chars;
-	(void) strncpy(cp, stdname, stdlen);
-	cp += stdlen;
-	*cp++ = '\0';
-	if (dstlen != 0) {
-		(void) strncpy(cp, dstname, dstlen);
-		*(cp + dstlen) = '\0';
-	}
-	return 0;
-}
-
-static void
-gmtload(sp)
-struct state * const	sp;
-{
-	if (tzload(gmt, sp) != 0)
-		(void) tzparse(gmt, sp, TRUE);
-}
-
-static void
-tzsetwall_basic(void)
-{
-	if (lcl_is_set < 0)
-		return;
-	lcl_is_set = -1;
-
-#ifdef ALL_STATE
-	if (lclptr == NULL) {
-		lclptr = (struct state *) malloc(sizeof *lclptr);
-		if (lclptr == NULL) {
-			settzname();	/* all we can do */
-			return;
-		}
-	}
-#endif /* defined ALL_STATE */
-	if (tzload((char *) NULL, lclptr) != 0)
-		gmtload(lclptr);
-	settzname();
-}
-
-void
-tzsetwall(void)
-{
-	_MUTEX_LOCK(&lcl_mutex);
-	tzsetwall_basic();
-	_MUTEX_UNLOCK(&lcl_mutex);
-}
-
-static void
-tzset_basic(void)
-{
-	const char *	name;
-
-	name = getenv("TZ");
-	if (name == NULL) {
-		tzsetwall_basic();
-		return;
-	}
-
-	if (lcl_is_set > 0 && strcmp(lcl_TZname, name) == 0)
-		return;
-	lcl_is_set = strlen(name) < sizeof lcl_TZname;
-	if (lcl_is_set)
-		(void) strcpy(lcl_TZname, name);
-
-#ifdef ALL_STATE
-	if (lclptr == NULL) {
-		lclptr = (struct state *) malloc(sizeof *lclptr);
-		if (lclptr == NULL) {
-			settzname();	/* all we can do */
-			return;
-		}
-	}
-#endif /* defined ALL_STATE */
-	if (*name == '\0') {
-		/*
-		** User wants it fast rather than right.
-		*/
-		lclptr->leapcnt = 0;		/* so, we're off a little */
-		lclptr->timecnt = 0;
-		lclptr->typecnt = 0;
-		lclptr->ttis[0].tt_isdst = 0;
-		lclptr->ttis[0].tt_gmtoff = 0;
-		lclptr->ttis[0].tt_abbrind = 0;
-		(void) strcpy(lclptr->chars, gmt);
-	} else if (tzload(name, lclptr) != 0)
-		if (name[0] == ':' || tzparse(name, lclptr, FALSE) != 0)
-			(void) gmtload(lclptr);
-	settzname();
-}
-
-void
-tzset(void)
-{
-	_MUTEX_LOCK(&lcl_mutex);
-	tzset_basic();
-	_MUTEX_UNLOCK(&lcl_mutex);
-}
-
-/*
-** The easy way to behave "as if no library function calls" localtime
-** is to not call it--so we drop its guts into "localsub", which can be
-** freely called.  (And no, the PANS doesn't require the above behavior--
-** but it *is* desirable.)
-**
-** The unused offset argument is for the benefit of mktime variants.
-*/
-
-/*ARGSUSED*/
-static void
-localsub(timep, offset, tmp)
-const time_t * const	timep;
-const long		offset;
-struct tm * const	tmp;
-{
-	struct state *		sp;
-	const struct ttinfo *	ttisp;
-	int			i;
-	const time_t			t = *timep;
-
-	sp = lclptr;
-#ifdef ALL_STATE
-	if (sp == NULL) {
-		gmtsub(timep, offset, tmp);
-		return;
-	}
-#endif /* defined ALL_STATE */
-	if (sp->timecnt == 0 || t < sp->ats[0]) {
-		i = 0;
-		while (sp->ttis[i].tt_isdst)
-			if (++i >= sp->typecnt) {
-				i = 0;
-				break;
-			}
-	} else {
-		for (i = 1; i < sp->timecnt; ++i)
-			if (t < sp->ats[i])
-				break;
-		i = sp->types[i - 1];
-	}
-	ttisp = &sp->ttis[i];
-	/*
-	** To get (wrong) behavior that's compatible with System V Release 2.0
-	** you'd replace the statement below with
-	**	t += ttisp->tt_gmtoff;
-	**	timesub(&t, 0L, sp, tmp);
-	*/
-	timesub(&t, ttisp->tt_gmtoff, sp, tmp);
-	tmp->tm_isdst = ttisp->tt_isdst;
-	tzname[tmp->tm_isdst] = &sp->chars[ttisp->tt_abbrind];
-#ifdef TM_ZONE
-	tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind];
-#endif /* defined TM_ZONE */
-}
-
-struct tm *
-localtime(timep)
-const time_t * const	timep;
-{
-	static pthread_mutex_t localtime_mutex = PTHREAD_MUTEX_INITIALIZER;
-	static pthread_key_t localtime_key = -1;
-	struct tm *p_tm;
-
-	if (__isthreaded != 0) {
-		_pthread_mutex_lock(&localtime_mutex);
-		if (localtime_key < 0) {
-			if (_pthread_key_create(&localtime_key, free) < 0) {
-				_pthread_mutex_unlock(&localtime_mutex);
-				return(NULL);
-			}
-		}
-		_pthread_mutex_unlock(&localtime_mutex);
-		p_tm = _pthread_getspecific(localtime_key);
-		if (p_tm == NULL) {
-			if ((p_tm = (struct tm *)malloc(sizeof(struct tm)))
-			    == NULL)
-				return(NULL);
-			_pthread_setspecific(localtime_key, p_tm);
-		}
-		_pthread_mutex_lock(&lcl_mutex);
-		tzset_basic();
-		localsub(timep, 0L, p_tm);
-		_pthread_mutex_unlock(&lcl_mutex);
-		return(p_tm);
-	} else {
-		tzset_basic();
-		localsub(timep, 0L, &tm);
-		return(&tm);
-	}
-}
-
-/*
-** Re-entrant version of localtime.
-*/
-
-struct tm *
-localtime_r(timep, tm)
-const time_t * const	timep;
-struct tm *		tm;
-{
-	_MUTEX_LOCK(&lcl_mutex);
-	tzset_basic();
-	localsub(timep, 0L, tm);
-	_MUTEX_UNLOCK(&lcl_mutex);
-	return tm;
-}
-
-/*
-** gmtsub is to gmtime as localsub is to localtime.
-*/
-
-static void
-gmtsub(timep, offset, tmp)
-const time_t * const	timep;
-const long		offset;
-struct tm * const	tmp;
-{
-	_MUTEX_LOCK(&gmt_mutex);
-	if (!gmt_is_set) {
-		gmt_is_set = TRUE;
-#ifdef ALL_STATE
-		gmtptr = (struct state *) malloc(sizeof *gmtptr);
-		if (gmtptr != NULL)
-#endif /* defined ALL_STATE */
-			gmtload(gmtptr);
-	}
-	_MUTEX_UNLOCK(&gmt_mutex);
-	timesub(timep, offset, gmtptr, tmp);
-#ifdef TM_ZONE
-	/*
-	** Could get fancy here and deliver something such as
-	** "UTC+xxxx" or "UTC-xxxx" if offset is non-zero,
-	** but this is no time for a treasure hunt.
-	*/
-	if (offset != 0)
-		tmp->TM_ZONE = wildabbr;
-	else {
-#ifdef ALL_STATE
-		if (gmtptr == NULL)
-			tmp->TM_ZONE = gmt;
-		else	tmp->TM_ZONE = gmtptr->chars;
-#endif /* defined ALL_STATE */
-#ifndef ALL_STATE
-		tmp->TM_ZONE = gmtptr->chars;
-#endif /* State Farm */
-	}
-#endif /* defined TM_ZONE */
-}
-
-struct tm *
-gmtime(timep)
-const time_t * const	timep;
-{
-	static pthread_mutex_t gmtime_mutex = PTHREAD_MUTEX_INITIALIZER;
-	static pthread_key_t gmtime_key = -1;
-	struct tm *p_tm;
-
-	if (__isthreaded != 0) {
-		_pthread_mutex_lock(&gmtime_mutex);
-		if (gmtime_key < 0) {
-			if (_pthread_key_create(&gmtime_key, free) < 0) {
-				_pthread_mutex_unlock(&gmtime_mutex);
-				return(NULL);
-			}
-		}
-		_pthread_mutex_unlock(&gmtime_mutex);
-		/*
-		 * Changed to follow POSIX.1 threads standard, which
-		 * is what BSD currently has.
-		 */
-		if ((p_tm = _pthread_getspecific(gmtime_key)) == NULL) {
-			if ((p_tm = (struct tm *)malloc(sizeof(struct tm)))
-			    == NULL) {
-				return(NULL);
-			}
-			_pthread_setspecific(gmtime_key, p_tm);
-		}
-		gmtsub(timep, 0L, p_tm);
-		return(p_tm);
-	}
-	else {
-		gmtsub(timep, 0L, &tm);
-		return(&tm);
-	}
-}
-
-/*
-* Re-entrant version of gmtime.
-*/
-
-struct tm *
-gmtime_r(timep, tm)
-const time_t * const	timep;
-struct tm *		tm;
-{
-	gmtsub(timep, 0L, tm);
-	return tm;
-}
-
-#ifdef STD_INSPIRED
-
-struct tm *
-offtime(timep, offset)
-const time_t * const	timep;
-const long		offset;
-{
-	gmtsub(timep, offset, &tm);
-	return &tm;
-}
-
-#endif /* defined STD_INSPIRED */
-
-static void
-timesub(timep, offset, sp, tmp)
-const time_t * const			timep;
-const long				offset;
-const struct state * const	sp;
-struct tm * const		tmp;
-{
-	const struct lsinfo *	lp;
-	long			days;
-	long			rem;
-	long			y;
-	int			yleap;
-	const int *		ip;
-	long			corr;
-	int			hit;
-	int			i;
-
-	corr = 0;
-	hit = 0;
-#ifdef ALL_STATE
-	i = (sp == NULL) ? 0 : sp->leapcnt;
-#endif /* defined ALL_STATE */
-#ifndef ALL_STATE
-	i = sp->leapcnt;
-#endif /* State Farm */
-	while (--i >= 0) {
-		lp = &sp->lsis[i];
-		if (*timep >= lp->ls_trans) {
-			if (*timep == lp->ls_trans) {
-				hit = ((i == 0 && lp->ls_corr > 0) ||
-					lp->ls_corr > sp->lsis[i - 1].ls_corr);
-				if (hit)
-					while (i > 0 &&
-						sp->lsis[i].ls_trans ==
-						sp->lsis[i - 1].ls_trans + 1 &&
-						sp->lsis[i].ls_corr ==
-						sp->lsis[i - 1].ls_corr + 1) {
-							++hit;
-							--i;
-					}
-			}
-			corr = lp->ls_corr;
-			break;
-		}
-	}
-	days = *timep / SECSPERDAY;
-	rem = *timep % SECSPERDAY;
-#ifdef mc68k
-	if (*timep == 0x80000000) {
-		/*
-		** A 3B1 muffs the division on the most negative number.
-		*/
-		days = -24855;
-		rem = -11648;
-	}
-#endif /* defined mc68k */
-	rem += (offset - corr);
-	while (rem < 0) {
-		rem += SECSPERDAY;
-		--days;
-	}
-	while (rem >= SECSPERDAY) {
-		rem -= SECSPERDAY;
-		++days;
-	}
-	tmp->tm_hour = (int) (rem / SECSPERHOUR);
-	rem = rem % SECSPERHOUR;
-	tmp->tm_min = (int) (rem / SECSPERMIN);
-	/*
-	** A positive leap second requires a special
-	** representation.  This uses "... ??:59:60" et seq.
-	*/
-	tmp->tm_sec = (int) (rem % SECSPERMIN) + hit;
-	tmp->tm_wday = (int) ((EPOCH_WDAY + days) % DAYSPERWEEK);
-	if (tmp->tm_wday < 0)
-		tmp->tm_wday += DAYSPERWEEK;
-	y = EPOCH_YEAR;
-#define LEAPS_THRU_END_OF(y)	((y) / 4 - (y) / 100 + (y) / 400)
-	while (days < 0 || days >= (long) year_lengths[yleap = isleap(y)]) {
-		long	newy;
-
-		newy = y + days / DAYSPERNYEAR;
-		if (days < 0)
-			--newy;
-		days -= (newy - y) * DAYSPERNYEAR +
-			LEAPS_THRU_END_OF(newy - 1) -
-			LEAPS_THRU_END_OF(y - 1);
-		y = newy;
-	}
-	tmp->tm_year = y - TM_YEAR_BASE;
-	tmp->tm_yday = (int) days;
-	ip = mon_lengths[yleap];
-	for (tmp->tm_mon = 0; days >= (long) ip[tmp->tm_mon]; ++(tmp->tm_mon))
-		days = days - (long) ip[tmp->tm_mon];
-	tmp->tm_mday = (int) (days + 1);
-	tmp->tm_isdst = 0;
-#ifdef TM_GMTOFF
-	tmp->TM_GMTOFF = offset;
-#endif /* defined TM_GMTOFF */
-}
-
-char *
-ctime(timep)
-const time_t * const	timep;
-{
-/*
-** Section 4.12.3.2 of X3.159-1989 requires that
-**	The ctime function converts the calendar time pointed to by timer
-**	to local time in the form of a string.  It is equivalent to
-**		asctime(localtime(timer))
-*/
-	return asctime(localtime(timep));
-}
-
-char *
-ctime_r(timep, buf)
-const time_t * const	timep;
-char *			buf;
-{
-	struct tm	tm;
-
-	return asctime_r(localtime_r(timep, &tm), buf);
-}
-
-/*
-** Adapted from code provided by Robert Elz, who writes:
-**	The "best" way to do mktime I think is based on an idea of Bob
-**	Kridle's (so its said...) from a long time ago.
-**	[kridle@xinet.com as of 1996-01-16.]
-**	It does a binary search of the time_t space.  Since time_t's are
-**	just 32 bits, its a max of 32 iterations (even at 64 bits it
-**	would still be very reasonable).
-*/
-
-#ifndef WRONG
-#define WRONG	(-1)
-#endif /* !defined WRONG */
-
-/*
-** Simplified normalize logic courtesy Paul Eggert (eggert@twinsun.com).
-*/
-
-static int
-increment_overflow(number, delta)
-int *	number;
-int	delta;
-{
-	int	number0;
-
-	number0 = *number;
-	*number += delta;
-	return (*number < number0) != (delta < 0);
-}
-
-static int
-normalize_overflow(tensptr, unitsptr, base)
-int * const	tensptr;
-int * const	unitsptr;
-const int	base;
-{
-	int	tensdelta;
-
-	tensdelta = (*unitsptr >= 0) ?
-		(*unitsptr / base) :
-		(-1 - (-1 - *unitsptr) / base);
-	*unitsptr -= tensdelta * base;
-	return increment_overflow(tensptr, tensdelta);
-}
-
-static int
-tmcomp(atmp, btmp)
-const struct tm * const atmp;
-const struct tm * const btmp;
-{
-	int	result;
-
-	if ((result = (atmp->tm_year - btmp->tm_year)) == 0 &&
-		(result = (atmp->tm_mon - btmp->tm_mon)) == 0 &&
-		(result = (atmp->tm_mday - btmp->tm_mday)) == 0 &&
-		(result = (atmp->tm_hour - btmp->tm_hour)) == 0 &&
-		(result = (atmp->tm_min - btmp->tm_min)) == 0)
-			result = atmp->tm_sec - btmp->tm_sec;
-	return result;
-}
-
-static time_t
-time2sub(tmp, funcp, offset, okayp, do_norm_secs)
-struct tm * const	tmp;
-void (* const		funcp)(const time_t*, long, struct tm*);
-const long		offset;
-int * const		okayp;
-const int		do_norm_secs;
-{
-	const struct state *	sp;
-	int			dir;
-	int			bits;
-	int			i, j ;
-	int			saved_seconds;
-	time_t				newt;
-	time_t				t;
-	struct tm			yourtm, mytm;
-
-	*okayp = FALSE;
-	yourtm = *tmp;
-	if (do_norm_secs) {
-		if (normalize_overflow(&yourtm.tm_min, &yourtm.tm_sec,
-			SECSPERMIN))
-				return WRONG;
-	}
-	if (normalize_overflow(&yourtm.tm_hour, &yourtm.tm_min, MINSPERHOUR))
-		return WRONG;
-	if (normalize_overflow(&yourtm.tm_mday, &yourtm.tm_hour, HOURSPERDAY))
-		return WRONG;
-	if (normalize_overflow(&yourtm.tm_year, &yourtm.tm_mon, MONSPERYEAR))
-		return WRONG;
-	/*
-	** Turn yourtm.tm_year into an actual year number for now.
-	** It is converted back to an offset from TM_YEAR_BASE later.
-	*/
-	if (increment_overflow(&yourtm.tm_year, TM_YEAR_BASE))
-		return WRONG;
-	while (yourtm.tm_mday <= 0) {
-		if (increment_overflow(&yourtm.tm_year, -1))
-			return WRONG;
-		i = yourtm.tm_year + (1 < yourtm.tm_mon);
-		yourtm.tm_mday += year_lengths[isleap(i)];
-	}
-	while (yourtm.tm_mday > DAYSPERLYEAR) {
-		i = yourtm.tm_year + (1 < yourtm.tm_mon);
-		yourtm.tm_mday -= year_lengths[isleap(i)];
-		if (increment_overflow(&yourtm.tm_year, 1))
-			return WRONG;
-	}
-	for ( ; ; ) {
-		i = mon_lengths[isleap(yourtm.tm_year)][yourtm.tm_mon];
-		if (yourtm.tm_mday <= i)
-			break;
-		yourtm.tm_mday -= i;
-		if (++yourtm.tm_mon >= MONSPERYEAR) {
-			yourtm.tm_mon = 0;
-			if (increment_overflow(&yourtm.tm_year, 1))
-				return WRONG;
-		}
-	}
-	if (increment_overflow(&yourtm.tm_year, -TM_YEAR_BASE))
-		return WRONG;
-	/* Don't go below 1900 for POLA */
-	if (yourtm.tm_year < 0)
-		return WRONG;
-	if (yourtm.tm_sec >= 0 && yourtm.tm_sec < SECSPERMIN)
-		saved_seconds = 0;
-	else if (yourtm.tm_year + TM_YEAR_BASE < EPOCH_YEAR) {
-		/*
-		** We can't set tm_sec to 0, because that might push the
-		** time below the minimum representable time.
-		** Set tm_sec to 59 instead.
-		** This assumes that the minimum representable time is
-		** not in the same minute that a leap second was deleted from,
-		** which is a safer assumption than using 58 would be.
-		*/
-		if (increment_overflow(&yourtm.tm_sec, 1 - SECSPERMIN))
-			return WRONG;
-		saved_seconds = yourtm.tm_sec;
-		yourtm.tm_sec = SECSPERMIN - 1;
-	} else {
-		saved_seconds = yourtm.tm_sec;
-		yourtm.tm_sec = 0;
-	}
-	/*
-	** Divide the search space in half
-	** (this works whether time_t is signed or unsigned).
-	*/
-	bits = TYPE_BIT(time_t) - 1;
-	/*
-	** If we have more than this, we will overflow tm_year for tmcomp().
-	** We should really return an error if we cannot represent it.
-	*/
-	if (bits > 56)
-		bits = 56;
-	/*
-	** If time_t is signed, then 0 is just above the median,
-	** assuming two's complement arithmetic.
-	** If time_t is unsigned, then (1 << bits) is just above the median.
-	*/
-	t = TYPE_SIGNED(time_t) ? 0 : (((time_t) 1) << bits);
-	for ( ; ; ) {
-		(*funcp)(&t, offset, &mytm);
-		dir = tmcomp(&mytm, &yourtm);
-		if (dir != 0) {
-			if (bits-- < 0)
-				return WRONG;
-			if (bits < 0)
-				--t; /* may be needed if new t is minimal */
-			else if (dir > 0)
-				t -= ((time_t) 1) << bits;
-			else	t += ((time_t) 1) << bits;
-			continue;
-		}
-		if (yourtm.tm_isdst < 0 || mytm.tm_isdst == yourtm.tm_isdst)
-			break;
-		/*
-		** Right time, wrong type.
-		** Hunt for right time, right type.
-		** It's okay to guess wrong since the guess
-		** gets checked.
-		*/
-		sp = (funcp == localsub) ? lclptr : gmtptr;
-#ifdef ALL_STATE
-		if (sp == NULL)
-			return WRONG;
-#endif /* defined ALL_STATE */
-		for (i = sp->typecnt - 1; i >= 0; --i) {
-			if (sp->ttis[i].tt_isdst != yourtm.tm_isdst)
-				continue;
-			for (j = sp->typecnt - 1; j >= 0; --j) {
-				if (sp->ttis[j].tt_isdst == yourtm.tm_isdst)
-					continue;
-				newt = t + sp->ttis[j].tt_gmtoff -
-					sp->ttis[i].tt_gmtoff;
-				(*funcp)(&newt, offset, &mytm);
-				if (tmcomp(&mytm, &yourtm) != 0)
-					continue;
-				if (mytm.tm_isdst != yourtm.tm_isdst)
-					continue;
-				/*
-				** We have a match.
-				*/
-				t = newt;
-				goto label;
-			}
-		}
-		return WRONG;
-	}
-label:
-	newt = t + saved_seconds;
-	if ((newt < t) != (saved_seconds < 0))
-		return WRONG;
-	t = newt;
-	(*funcp)(&t, offset, tmp);
-	*okayp = TRUE;
-	return t;
-}
-
-static time_t
-time2(tmp, funcp, offset, okayp)
-struct tm * const	tmp;
-void (* const		funcp)(const time_t*, long, struct tm*);
-const long		offset;
-int * const		okayp;
-{
-	time_t	t;
-
-	/*
-	** First try without normalization of seconds
-	** (in case tm_sec contains a value associated with a leap second).
-	** If that fails, try with normalization of seconds.
-	*/
-	t = time2sub(tmp, funcp, offset, okayp, FALSE);
-	return *okayp ? t : time2sub(tmp, funcp, offset, okayp, TRUE);
-}
-
-static time_t
-time1(tmp, funcp, offset)
-struct tm * const	tmp;
-void (* const		funcp)(const time_t *, long, struct tm *);
-const long		offset;
-{
-	time_t			t;
-	const struct state *	sp;
-	int			samei, otheri;
-	int			sameind, otherind;
-	int			i;
-	int			nseen;
-	int				seen[TZ_MAX_TYPES];
-	int				types[TZ_MAX_TYPES];
-	int				okay;
-
-	if (tmp->tm_isdst > 1)
-		tmp->tm_isdst = 1;
-	t = time2(tmp, funcp, offset, &okay);
-#ifdef PCTS
-	/*
-	** PCTS code courtesy Grant Sullivan (grant@osf.org).
-	*/
-	if (okay)
-		return t;
-	if (tmp->tm_isdst < 0)
-		tmp->tm_isdst = 0;	/* reset to std and try again */
-#endif /* defined PCTS */
-#ifndef PCTS
-	if (okay || tmp->tm_isdst < 0)
-		return t;
-#endif /* !defined PCTS */
-	/*
-	** We're supposed to assume that somebody took a time of one type
-	** and did some math on it that yielded a "struct tm" that's bad.
-	** We try to divine the type they started from and adjust to the
-	** type they need.
-	*/
-	sp = (funcp == localsub) ? lclptr : gmtptr;
-#ifdef ALL_STATE
-	if (sp == NULL)
-		return WRONG;
-#endif /* defined ALL_STATE */
-	for (i = 0; i < sp->typecnt; ++i)
-		seen[i] = FALSE;
-	nseen = 0;
-	for (i = sp->timecnt - 1; i >= 0; --i)
-		if (!seen[sp->types[i]]) {
-			seen[sp->types[i]] = TRUE;
-			types[nseen++] = sp->types[i];
-		}
-	for (sameind = 0; sameind < nseen; ++sameind) {
-		samei = types[sameind];
-		if (sp->ttis[samei].tt_isdst != tmp->tm_isdst)
-			continue;
-		for (otherind = 0; otherind < nseen; ++otherind) {
-			otheri = types[otherind];
-			if (sp->ttis[otheri].tt_isdst == tmp->tm_isdst)
-				continue;
-			tmp->tm_sec += sp->ttis[otheri].tt_gmtoff -
-					sp->ttis[samei].tt_gmtoff;
-			tmp->tm_isdst = !tmp->tm_isdst;
-			t = time2(tmp, funcp, offset, &okay);
-			if (okay)
-				return t;
-			tmp->tm_sec -= sp->ttis[otheri].tt_gmtoff -
-					sp->ttis[samei].tt_gmtoff;
-			tmp->tm_isdst = !tmp->tm_isdst;
-		}
-	}
-	return WRONG;
-}
-
-time_t
-mktime(tmp)
-struct tm * const	tmp;
-{
-	time_t mktime_return_value;
-	_MUTEX_LOCK(&lcl_mutex);
-	tzset_basic();
-	mktime_return_value = time1(tmp, localsub, 0L);
-	_MUTEX_UNLOCK(&lcl_mutex);
-	return(mktime_return_value);
-}
-
-#ifdef STD_INSPIRED
-
-time_t
-timelocal(tmp)
-struct tm * const	tmp;
-{
-	tmp->tm_isdst = -1;	/* in case it wasn't initialized */
-	return mktime(tmp);
-}
-
-time_t
-timegm(tmp)
-struct tm * const	tmp;
-{
-	tmp->tm_isdst = 0;
-	return time1(tmp, gmtsub, 0L);
-}
-
-time_t
-timeoff(tmp, offset)
-struct tm * const	tmp;
-const long		offset;
-{
-	tmp->tm_isdst = 0;
-	return time1(tmp, gmtsub, offset);
-}
-
-#endif /* defined STD_INSPIRED */
-
-#ifdef CMUCS
-
-/*
-** The following is supplied for compatibility with
-** previous versions of the CMUCS runtime library.
-*/
-
-long
-gtime(tmp)
-struct tm * const	tmp;
-{
-	const time_t	t = mktime(tmp);
-
-	if (t == WRONG)
-		return -1;
-	return t;
-}
-
-#endif /* defined CMUCS */
-
-/*
-** XXX--is the below the right way to conditionalize??
-*/
-
-#ifdef STD_INSPIRED
-
-/*
-** IEEE Std 1003.1-1988 (POSIX) legislates that 536457599
-** shall correspond to "Wed Dec 31 23:59:59 UTC 1986", which
-** is not the case if we are accounting for leap seconds.
-** So, we provide the following conversion routines for use
-** when exchanging timestamps with POSIX conforming systems.
-*/
-
-static long
-leapcorr(timep)
-time_t *	timep;
-{
-	struct state *		sp;
-	struct lsinfo *	lp;
-	int			i;
-
-	sp = lclptr;
-	i = sp->leapcnt;
-	while (--i >= 0) {
-		lp = &sp->lsis[i];
-		if (*timep >= lp->ls_trans)
-			return lp->ls_corr;
-	}
-	return 0;
-}
-
-time_t
-time2posix(t)
-time_t	t;
-{
-	tzset();
-	return t - leapcorr(&t);
-}
-
-time_t
-posix2time(t)
-time_t	t;
-{
-	time_t	x;
-	time_t	y;
-
-	tzset();
-	/*
-	** For a positive leap second hit, the result
-	** is not unique.  For a negative leap second
-	** hit, the corresponding time doesn't exist,
-	** so we return an adjacent second.
-	*/
-	x = t + leapcorr(&t);
-	y = x - leapcorr(&x);
-	if (y < t) {
-		do {
-			x++;
-			y = x - leapcorr(&x);
-		} while (y < t);
-		if (t != y)
-			return x - 1;
-	} else if (y > t) {
-		do {
-			--x;
-			y = x - leapcorr(&x);
-		} while (y > t);
-		if (t != y)
-			return x + 1;
-	}
-	return x;
-}
-
-#endif /* defined STD_INSPIRED */
diff --git a/lib/libc/stdtime/private.h b/lib/libc/stdtime/private.h
deleted file mode 100644
index 9878a1a..0000000
--- a/lib/libc/stdtime/private.h
+++ /dev/null
@@ -1,260 +0,0 @@
-#ifndef PRIVATE_H
-
-#define PRIVATE_H
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-**
-** $FreeBSD: src/lib/libc/stdtime/private.h,v 1.10 2004/06/14 10:31:52 stefanf Exp $
-*/
-
-/* Stuff moved from Makefile.inc to reduce clutter */
-#ifndef TM_GMTOFF
-#define TM_GMTOFF	tm_gmtoff
-#define TM_ZONE		tm_zone
-#define STD_INSPIRED	1
-#define PCTS		1
-#define HAVE_LONG_DOUBLE 1
-#define HAVE_STRERROR	1
-#define	HAVE_UNISTD_H	1
-#define	LOCALE_HOME	_PATH_LOCALE
-#define TZDIR		"/usr/share/zoneinfo"
-#endif /* ndef TM_GMTOFF */
-
-/*
-** This header is for use ONLY with the time conversion code.
-** There is no guarantee that it will remain unchanged,
-** or that it will remain at all.
-** Do NOT copy it to any system include directory.
-** Thank you!
-*/
-
-/*
-** ID
-*/
-
-#ifndef lint
-#ifndef NOID
-/*
-static char	privatehid[] = "@(#)private.h	7.53";
-*/
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-/*
-** Defaults for preprocessor symbols.
-** You can override these in your C compiler options, e.g. `-DHAVE_ADJTIME=0'.
-*/
-
-#ifndef HAVE_ADJTIME
-#define HAVE_ADJTIME		1
-#endif /* !defined HAVE_ADJTIME */
-
-#ifndef HAVE_GETTEXT
-#define HAVE_GETTEXT		0
-#endif /* !defined HAVE_GETTEXT */
-
-#ifndef HAVE_INCOMPATIBLE_CTIME_R
-#define HAVE_INCOMPATIBLE_CTIME_R	0
-#endif /* !defined INCOMPATIBLE_CTIME_R */
-
-#ifndef HAVE_SETTIMEOFDAY
-#define HAVE_SETTIMEOFDAY	3
-#endif /* !defined HAVE_SETTIMEOFDAY */
-
-#ifndef HAVE_STRERROR
-#define HAVE_STRERROR		1
-#endif /* !defined HAVE_STRERROR */
-
-#ifndef HAVE_SYMLINK
-#define HAVE_SYMLINK		1
-#endif /* !defined HAVE_SYMLINK */
-
-#ifndef HAVE_SYS_STAT_H
-#define HAVE_SYS_STAT_H		1
-#endif /* !defined HAVE_SYS_STAT_H */
-
-#ifndef HAVE_SYS_WAIT_H
-#define HAVE_SYS_WAIT_H		1
-#endif /* !defined HAVE_SYS_WAIT_H */
-
-#ifndef HAVE_UNISTD_H
-#define HAVE_UNISTD_H		1
-#endif /* !defined HAVE_UNISTD_H */
-
-#ifndef HAVE_UTMPX_H
-#define HAVE_UTMPX_H		0
-#endif /* !defined HAVE_UTMPX_H */
-
-#ifndef LOCALE_HOME
-#define LOCALE_HOME		"/usr/lib/locale"
-#endif /* !defined LOCALE_HOME */
-
-#if HAVE_INCOMPATIBLE_CTIME_R
-#define asctime_r _incompatible_asctime_r
-#define ctime_r _incompatible_ctime_r
-#endif /* HAVE_INCOMPATIBLE_CTIME_R */
-
-/*
-** Nested includes
-*/
-
-#include "sys/types.h"	/* for time_t */
-#include "stdio.h"
-#include "errno.h"
-#include "string.h"
-#include "limits.h"	/* for CHAR_BIT */
-#include "time.h"
-#include "stdlib.h"
-
-#if HAVE_GETTEXT - 0
-#include "libintl.h"
-#endif /* HAVE_GETTEXT - 0 */
-
-#if HAVE_SYS_WAIT_H - 0
-#include <sys/wait.h>	/* for WIFEXITED and WEXITSTATUS */
-#endif /* HAVE_SYS_WAIT_H - 0 */
-
-#ifndef WIFEXITED
-#define WIFEXITED(status)	(((status) & 0xff) == 0)
-#endif /* !defined WIFEXITED */
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(status)	(((status) >> 8) & 0xff)
-#endif /* !defined WEXITSTATUS */
-
-#if HAVE_UNISTD_H - 0
-#include "unistd.h"	/* for F_OK and R_OK */
-#endif /* HAVE_UNISTD_H - 0 */
-
-#if !(HAVE_UNISTD_H - 0)
-#ifndef F_OK
-#define F_OK	0
-#endif /* !defined F_OK */
-#ifndef R_OK
-#define R_OK	4
-#endif /* !defined R_OK */
-#endif /* !(HAVE_UNISTD_H - 0) */
-
-/* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX.  */
-#define is_digit(c) ((unsigned)(c) - '0' <= 9)
-
-/*
-** SunOS 4.1.1 headers lack FILENAME_MAX.
-*/
-
-#ifndef FILENAME_MAX
-
-#ifndef MAXPATHLEN
-#ifdef unix
-#include "sys/param.h"
-#endif /* defined unix */
-#endif /* !defined MAXPATHLEN */
-
-#ifdef MAXPATHLEN
-#define FILENAME_MAX	MAXPATHLEN
-#endif /* defined MAXPATHLEN */
-#ifndef MAXPATHLEN
-#define FILENAME_MAX	1024		/* Pure guesswork */
-#endif /* !defined MAXPATHLEN */
-
-#endif /* !defined FILENAME_MAX */
-
-/*
-** Private function declarations.
-*/
-char *	icalloc(int nelem, int elsize);
-char *	icatalloc(char * old, const char * new);
-char *	icpyalloc(const char * string);
-char *	imalloc(int n);
-void *	irealloc(void * pointer, int size);
-void	icfree(char * pointer);
-void	ifree(char * pointer);
-char *	scheck(const char *string, const char *format);
-
-
-/*
-** Finally, some convenience items.
-*/
-
-#ifndef TRUE
-#define TRUE	1
-#endif /* !defined TRUE */
-
-#ifndef FALSE
-#define FALSE	0
-#endif /* !defined FALSE */
-
-#ifndef TYPE_BIT
-#define TYPE_BIT(type)	(sizeof (type) * CHAR_BIT)
-#endif /* !defined TYPE_BIT */
-
-#ifndef TYPE_SIGNED
-#define TYPE_SIGNED(type) (((type) -1) < 0)
-#endif /* !defined TYPE_SIGNED */
-
-#ifndef INT_STRLEN_MAXIMUM
-/*
-** 302 / 1000 is log10(2.0) rounded up.
-** Subtract one for the sign bit if the type is signed;
-** add one for integer division truncation;
-** add one more for a minus sign if the type is signed.
-*/
-#define INT_STRLEN_MAXIMUM(type) \
-    ((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
-#endif /* !defined INT_STRLEN_MAXIMUM */
-
-/*
-** INITIALIZE(x)
-*/
-
-#ifndef GNUC_or_lint
-#ifdef lint
-#define GNUC_or_lint
-#endif /* defined lint */
-#ifndef lint
-#ifdef __GNUC__
-#define GNUC_or_lint
-#endif /* defined __GNUC__ */
-#endif /* !defined lint */
-#endif /* !defined GNUC_or_lint */
-
-#ifndef INITIALIZE
-#ifdef GNUC_or_lint
-#define INITIALIZE(x)	((x) = 0)
-#endif /* defined GNUC_or_lint */
-#ifndef GNUC_or_lint
-#define INITIALIZE(x)
-#endif /* !defined GNUC_or_lint */
-#endif /* !defined INITIALIZE */
-
-/*
-** For the benefit of GNU folk...
-** `_(MSGID)' uses the current locale's message library string for MSGID.
-** The default is to use gettext if available, and use MSGID otherwise.
-*/
-
-#ifndef _
-#if HAVE_GETTEXT - 0
-#define _(msgid) gettext(msgid)
-#else /* !(HAVE_GETTEXT - 0) */
-#define _(msgid) msgid
-#endif /* !(HAVE_GETTEXT - 0) */
-#endif /* !defined _ */
-
-#ifndef TZ_DOMAIN
-#define TZ_DOMAIN "tz"
-#endif /* !defined TZ_DOMAIN */
-
-#if HAVE_INCOMPATIBLE_CTIME_R
-#undef asctime_r
-#undef ctime_r
-char *asctime_r(struct tm const *, char *);
-char *ctime_r(time_t const *, char *);
-#endif /* HAVE_INCOMPATIBLE_CTIME_R */
-
-/*
-** UNIX was a registered trademark of The Open Group in 2003.
-*/
-
-#endif /* !defined PRIVATE_H */
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
deleted file mode 100644
index 7e8a3dc..0000000
--- a/lib/libc/stdtime/strftime.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-#ifndef NOID
-static const char	elsieid[] = "@(#)strftime.c	7.64";
-/*
-** Based on the UCB version with the ID appearing below.
-** This is ANSIish only when "multibyte character == plain character".
-*/
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-#include "namespace.h"
-#include "private.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char	sccsid[] = "@(#)strftime.c	5.4 (Berkeley) 3/14/89";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/strftime.c,v 1.41 2004/11/04 08:34:57 delphij Exp $");
-
-#include "tzfile.h"
-#include <fcntl.h>
-#include <sys/stat.h>
-#include "un-namespace.h"
-#include "timelocal.h"
-
-static char *	_add(const char *, char *, const char *);
-static char *	_conv(int, const char *, char *, const char *);
-static char *	_fmt(const char *, const struct tm *, char *, const char *, int *);
-
-size_t strftime(char * __restrict, size_t, const char * __restrict,
-    const struct tm * __restrict);
-
-extern char *	tzname[];
-
-#ifndef YEAR_2000_NAME
-#define YEAR_2000_NAME	"CHECK_STRFTIME_FORMATS_FOR_TWO_DIGIT_YEARS"
-#endif /* !defined YEAR_2000_NAME */
-
-
-#define IN_NONE	0
-#define IN_SOME	1
-#define IN_THIS	2
-#define IN_ALL	3
-
-#define PAD_DEFAULT 0
-#define PAD_LESS	1
-#define PAD_SPACE	2
-#define PAD_ZERO	3
-
-static const char* fmt_padding[][4] = {
-	/* DEFAULT,	LESS,	SPACE,	ZERO */
-#define PAD_FMT_MONTHDAY	0
-#define PAD_FMT_HMS			0
-#define PAD_FMT_CENTURY		0
-#define PAD_FMT_SHORTYEAR	0
-#define PAD_FMT_MONTH		0
-#define PAD_FMT_WEEKOFYEAR	0
-#define PAD_FMT_DAYOFMONTH	0
-	{ "%02d",	"%d",	"%2d",	"%02d" },
-#define PAD_FMT_SDAYOFMONTH	1
-#define PAD_FMT_SHMS		1
-	{ "%2d",	"%d",	"%2d",	"%02d" },
-#define	PAD_FMT_DAYOFYEAR	2
-	{ "%03d",	"%d",	"%3d",	"%03d" },
-#define PAD_FMT_YEAR		3
-	{ "%04d",	"%d",	"%4d",	"%04d" }
-};
-
-size_t
-strftime(char * __restrict s, size_t maxsize, const char * __restrict format,
-    const struct tm * __restrict t)
-{
-	char *	p;
-	int	warn;
-
-	tzset();
-	warn = IN_NONE;
-	p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn);
-#ifndef NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU
-	if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) {
-		(void) fprintf(stderr, "\n");
-		if (format == NULL)
-			(void) fprintf(stderr, "NULL strftime format ");
-		else	(void) fprintf(stderr, "strftime format \"%s\" ",
-				format);
-		(void) fprintf(stderr, "yields only two digits of years in ");
-		if (warn == IN_SOME)
-			(void) fprintf(stderr, "some locales");
-		else if (warn == IN_THIS)
-			(void) fprintf(stderr, "the current locale");
-		else	(void) fprintf(stderr, "all locales");
-		(void) fprintf(stderr, "\n");
-	}
-#endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */
-	if (p == s + maxsize)
-		return 0;
-	*p = '\0';
-	return p - s;
-}
-
-static char *
-_fmt(format, t, pt, ptlim, warnp)
-const char *		format;
-const struct tm * const	t;
-char *			pt;
-const char * const	ptlim;
-int *			warnp;
-{
-	int Ealternative, Oalternative, PadIndex;
-	struct lc_time_T *tptr = __get_current_time_locale();
-
-	for ( ; *format; ++format) {
-		if (*format == '%') {
-			Ealternative = 0;
-			Oalternative = 0;
-			PadIndex	 = PAD_DEFAULT;
-label:
-			switch (*++format) {
-			case '\0':
-				--format;
-				break;
-			case 'A':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : tptr->weekday[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'a':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : tptr->wday[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'B':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : (Oalternative ? tptr->alt_month :
-					tptr->month)[t->tm_mon],
-					pt, ptlim);
-				continue;
-			case 'b':
-			case 'h':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : tptr->mon[t->tm_mon],
-					pt, ptlim);
-				continue;
-			case 'C':
-				/*
-				** %C used to do a...
-				**	_fmt("%a %b %e %X %Y", t);
-				** ...whereas now POSIX 1003.2 calls for
-				** something completely different.
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv((t->tm_year + TM_YEAR_BASE) / 100,
-					fmt_padding[PAD_FMT_CENTURY][PadIndex], pt, ptlim);
-				continue;
-			case 'c':
-				{
-				int warn2 = IN_SOME;
-
-				pt = _fmt(tptr->c_fmt, t, pt, ptlim, warnp);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'D':
-				pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp);
-				continue;
-			case 'd':
-				pt = _conv(t->tm_mday, fmt_padding[PAD_FMT_DAYOFMONTH][PadIndex],
-					pt, ptlim);
-				continue;
-			case 'E':
-				if (Ealternative || Oalternative)
-					break;
-				Ealternative++;
-				goto label;
-			case 'O':
-				/*
-				** C99 locale modifiers.
-				** The sequences
-				**	%Ec %EC %Ex %EX %Ey %EY
-				**	%Od %oe %OH %OI %Om %OM
-				**	%OS %Ou %OU %OV %Ow %OW %Oy
-				** are supposed to provide alternate
-				** representations.
-				**
-				** FreeBSD extension
-				**      %OB
-				*/
-				if (Ealternative || Oalternative)
-					break;
-				Oalternative++;
-				goto label;
-			case 'e':
-				pt = _conv(t->tm_mday,
-					fmt_padding[PAD_FMT_SDAYOFMONTH][PadIndex], pt, ptlim);
-				continue;
-			case 'F':
-				pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp);
-				continue;
-			case 'H':
-				pt = _conv(t->tm_hour, fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim);
-				continue;
-			case 'I':
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					fmt_padding[PAD_FMT_HMS][PadIndex], pt, ptlim);
-				continue;
-			case 'j':
-				pt = _conv(t->tm_yday + 1,
-					fmt_padding[PAD_FMT_DAYOFYEAR][PadIndex], pt, ptlim);
-				continue;
-			case 'k':
-				/*
-				** This used to be...
-				**	_conv(t->tm_hour % 12 ?
-				**		t->tm_hour % 12 : 12, 2, ' ');
-				** ...and has been changed to the below to
-				** match SunOS 4.1.1 and Arnold Robbins'
-				** strftime version 3.0.  That is, "%k" and
-				** "%l" have been swapped.
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv(t->tm_hour, fmt_padding[PAD_FMT_SHMS][PadIndex],
-					pt, ptlim);
-				continue;
-#ifdef KITCHEN_SINK
-			case 'K':
-				/*
-				** After all this time, still unclaimed!
-				*/
-				pt = _add("kitchen sink", pt, ptlim);
-				continue;
-#endif /* defined KITCHEN_SINK */
-			case 'l':
-				/*
-				** This used to be...
-				**	_conv(t->tm_hour, 2, ' ');
-				** ...and has been changed to the below to
-				** match SunOS 4.1.1 and Arnold Robbin's
-				** strftime version 3.0.  That is, "%k" and
-				** "%l" have been swapped.
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					fmt_padding[PAD_FMT_SHMS][PadIndex], pt, ptlim);
-				continue;
-			case 'M':
-				pt = _conv(t->tm_min, fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim);
-				continue;
-			case 'm':
-				pt = _conv(t->tm_mon + 1,
-					fmt_padding[PAD_FMT_MONTH][PadIndex], pt, ptlim);
-				continue;
-			case 'n':
-				pt = _add("\n", pt, ptlim);
-				continue;
-			case 'p':
-				pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ?
-					tptr->pm :
-					tptr->am,
-					pt, ptlim);
-				continue;
-			case 'R':
-				pt = _fmt("%H:%M", t, pt, ptlim, warnp);
-				continue;
-			case 'r':
-				pt = _fmt(tptr->ampm_fmt, t, pt, ptlim,
-					warnp);
-				continue;
-			case 'S':
-				pt = _conv(t->tm_sec, fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim);
-				continue;
-			case 's':
-				{
-					struct tm	tm;
-					char		buf[INT_STRLEN_MAXIMUM(
-								time_t) + 1];
-					time_t		mkt;
-
-					tm = *t;
-					mkt = mktime(&tm);
-					if (TYPE_SIGNED(time_t))
-						(void) sprintf(buf, "%ld",
-							(long) mkt);
-					else	(void) sprintf(buf, "%lu",
-							(unsigned long) mkt);
-					pt = _add(buf, pt, ptlim);
-				}
-				continue;
-			case 'T':
-				pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp);
-				continue;
-			case 't':
-				pt = _add("\t", pt, ptlim);
-				continue;
-			case 'U':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					t->tm_wday) / DAYSPERWEEK,
-					fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex], pt, ptlim);
-				continue;
-			case 'u':
-				/*
-				** From Arnold Robbins' strftime version 3.0:
-				** "ISO 8601: Weekday as a decimal number
-				** [1 (Monday) - 7]"
-				** (ado, 1993-05-24)
-				*/
-				pt = _conv((t->tm_wday == 0) ?
-					DAYSPERWEEK : t->tm_wday,
-					"%d", pt, ptlim);
-				continue;
-			case 'V':	/* ISO 8601 week number */
-			case 'G':	/* ISO 8601 year (four digits) */
-			case 'g':	/* ISO 8601 year (two digits) */
-/*
-** From Arnold Robbins' strftime version 3.0:  "the week number of the
-** year (the first Monday as the first day of week 1) as a decimal number
-** (01-53)."
-** (ado, 1993-05-24)
-**
-** From "http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html" by Markus Kuhn:
-** "Week 01 of a year is per definition the first week which has the
-** Thursday in this year, which is equivalent to the week which contains
-** the fourth day of January. In other words, the first week of a new year
-** is the week which has the majority of its days in the new year. Week 01
-** might also contain days from the previous year and the week before week
-** 01 of a year is the last week (52 or 53) of the previous year even if
-** it contains days from the new year. A week starts with Monday (day 1)
-** and ends with Sunday (day 7).  For example, the first week of the year
-** 1997 lasts from 1996-12-30 to 1997-01-05..."
-** (ado, 1996-01-02)
-*/
-				{
-					int	year;
-					int	yday;
-					int	wday;
-					int	w;
-
-					year = t->tm_year + TM_YEAR_BASE;
-					yday = t->tm_yday;
-					wday = t->tm_wday;
-					for ( ; ; ) {
-						int	len;
-						int	bot;
-						int	top;
-
-						len = isleap(year) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
-						/*
-						** What yday (-3 ... 3) does
-						** the ISO year begin on?
-						*/
-						bot = ((yday + 11 - wday) %
-							DAYSPERWEEK) - 3;
-						/*
-						** What yday does the NEXT
-						** ISO year begin on?
-						*/
-						top = bot -
-							(len % DAYSPERWEEK);
-						if (top < -3)
-							top += DAYSPERWEEK;
-						top += len;
-						if (yday >= top) {
-							++year;
-							w = 1;
-							break;
-						}
-						if (yday >= bot) {
-							w = 1 + ((yday - bot) /
-								DAYSPERWEEK);
-							break;
-						}
-						--year;
-						yday += isleap(year) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
-					}
-#ifdef XPG4_1994_04_09
-					if ((w == 52
-					     && t->tm_mon == TM_JANUARY)
-					    || (w == 1
-						&& t->tm_mon == TM_DECEMBER))
-						w = 53;
-#endif /* defined XPG4_1994_04_09 */
-					if (*format == 'V')
-						pt = _conv(w, fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex],
-							pt, ptlim);
-					else if (*format == 'g') {
-						*warnp = IN_ALL;
-						pt = _conv(year % 100, fmt_padding[PAD_FMT_SHORTYEAR][PadIndex],
-							pt, ptlim);
-					} else	pt = _conv(year, fmt_padding[PAD_FMT_YEAR][PadIndex],
-							pt, ptlim);
-				}
-				continue;
-			case 'v':
-				/*
-				** From Arnold Robbins' strftime version 3.0:
-				** "date as dd-bbb-YYYY"
-				** (ado, 1993-05-24)
-				*/
-				pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp);
-				continue;
-			case 'W':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					(t->tm_wday ?
-					(t->tm_wday - 1) :
-					(DAYSPERWEEK - 1))) / DAYSPERWEEK,
-					fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex], pt, ptlim);
-				continue;
-			case 'w':
-				pt = _conv(t->tm_wday, "%d", pt, ptlim);
-				continue;
-			case 'X':
-				pt = _fmt(tptr->X_fmt, t, pt, ptlim, warnp);
-				continue;
-			case 'x':
-				{
-				int	warn2 = IN_SOME;
-
-				pt = _fmt(tptr->x_fmt, t, pt, ptlim, &warn2);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'y':
-				*warnp = IN_ALL;
-				pt = _conv((t->tm_year + TM_YEAR_BASE) % 100,
-					fmt_padding[PAD_FMT_SHORTYEAR][PadIndex], pt, ptlim);
-				continue;
-			case 'Y':
-				pt = _conv(t->tm_year + TM_YEAR_BASE,
-					fmt_padding[PAD_FMT_YEAR][PadIndex],
-					pt, ptlim);
-				continue;
-			case 'Z':
-#ifdef TM_ZONE
-				if (t->TM_ZONE != NULL)
-					pt = _add(t->TM_ZONE, pt, ptlim);
-				else
-#endif /* defined TM_ZONE */
-				if (t->tm_isdst >= 0)
-					pt = _add(tzname[t->tm_isdst != 0],
-						pt, ptlim);
-				/*
-				** C99 says that %Z must be replaced by the
-				** empty string if the time zone is not
-				** determinable.
-				*/
-				continue;
-			case 'z':
-				{
-				int		diff;
-				char const *	sign;
-
-				if (t->tm_isdst < 0)
-					continue;
-#ifdef TM_GMTOFF
-				diff = t->TM_GMTOFF;
-#else /* !defined TM_GMTOFF */
-				/*
-				** C99 says that the UTC offset must
-				** be computed by looking only at
-				** tm_isdst.  This requirement is
-				** incorrect, since it means the code
-				** must rely on magic (in this case
-				** altzone and timezone), and the
-				** magic might not have the correct
-				** offset.  Doing things correctly is
-				** tricky and requires disobeying C99;
-				** see GNU C strftime for details.
-				** For now, punt and conform to the
-				** standard, even though it's incorrect.
-				**
-				** C99 says that %z must be replaced by the
-				** empty string if the time zone is not
-				** determinable, so output nothing if the
-				** appropriate variables are not available.
-				*/
-				if (t->tm_isdst == 0)
-#ifdef USG_COMPAT
-					diff = -timezone;
-#else /* !defined USG_COMPAT */
-					continue;
-#endif /* !defined USG_COMPAT */
-				else
-#ifdef ALTZONE
-					diff = -altzone;
-#else /* !defined ALTZONE */
-					continue;
-#endif /* !defined ALTZONE */
-#endif /* !defined TM_GMTOFF */
-				if (diff < 0) {
-					sign = "-";
-					diff = -diff;
-				} else	sign = "+";
-				pt = _add(sign, pt, ptlim);
-				diff /= 60;
-				pt = _conv((diff/60)*100 + diff%60,
-					fmt_padding[PAD_FMT_YEAR][PadIndex], pt, ptlim);
-				}
-				continue;
-			case '+':
-				pt = _fmt(tptr->date_fmt, t, pt, ptlim,
-					warnp);
-				continue;
-			case '-':
-				if (PadIndex != PAD_DEFAULT)
-					break;
-				PadIndex = PAD_LESS;
-				goto label;
-			case '_':
-				if (PadIndex != PAD_DEFAULT)
-					break;
-				PadIndex = PAD_SPACE;
-				goto label;
-			case '0':
-				if (PadIndex != PAD_DEFAULT)
-					break;
-				PadIndex = PAD_ZERO;
-				goto label;
-			case '%':
-			/*
-			** X311J/88-090 (4.12.3.5): if conversion char is
-			** undefined, behavior is undefined.  Print out the
-			** character itself as printf(3) also does.
-			*/
-			default:
-				break;
-			}
-		}
-		if (pt == ptlim)
-			break;
-		*pt++ = *format;
-	}
-	return pt;
-}
-
-static char *
-_conv(n, format, pt, ptlim)
-const int		n;
-const char * const	format;
-char * const		pt;
-const char * const	ptlim;
-{
-	char	buf[INT_STRLEN_MAXIMUM(int) + 1];
-
-	(void) sprintf(buf, format, n);
-	return _add(buf, pt, ptlim);
-}
-
-static char *
-_add(str, pt, ptlim)
-const char *		str;
-char *			pt;
-const char * const	ptlim;
-{
-	while (pt < ptlim && (*pt = *str++) != '\0')
-		++pt;
-	return pt;
-}
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
deleted file mode 100644
index 901a742..0000000
--- a/lib/libc/stdtime/strptime.c
+++ /dev/null
@@ -1,538 +0,0 @@
-/*
- * Powerdog Industries kindly requests feedback from anyone modifying
- * this function:
- *
- * Date: Thu, 05 Jun 1997 23:17:17 -0400  
- * From: Kevin Ruddy <kevin.ruddy@powerdog.com>
- * To: James FitzGibbon <james@nexis.net>
- * Subject: Re: Use of your strptime(3) code (fwd)
- * 
- * The reason for the "no mod" clause was so that modifications would
- * come back and we could integrate them and reissue so that a wider 
- * audience could use it (thereby spreading the wealth).  This has   
- * made it possible to get strptime to work on many operating systems.
- * I'm not sure why that's "plain unacceptable" to the FreeBSD team.
- * 
- * Anyway, you can change it to "with or without modification" as
- * you see fit.  Enjoy.                                          
- * 
- * Kevin Ruddy
- * Powerdog Industries, Inc.
- */
-/*
- * Copyright (c) 1994 Powerdog Industries.  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 Powerdog Industries.
- * 4. The name of Powerdog Industries may not be used to endorse or
- *    promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``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 POWERDOG INDUSTRIES 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifndef NOID
-static char copyright[] __unused =
-"@(#) Copyright (c) 1994 Powerdog Industries.  All rights reserved.";
-static char sccsid[] __unused = "@(#)strptime.c	0.1 (Powerdog) 94/03/27";
-#endif /* !defined NOID */
-#endif /* not lint */
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.35 2003/11/17 04:19:15 nectar Exp $");
-
-#include "namespace.h"
-#include <time.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "timelocal.h"
-
-static char * _strptime(const char *, const char *, struct tm *, int *);
-
-#define asizeof(a)	(sizeof (a) / sizeof ((a)[0]))
-
-static char *
-_strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp)
-{
-	char	c;
-	const char *ptr;
-	int	i,
-		len;
-	int Ealternative, Oalternative;
-	struct lc_time_T *tptr = __get_current_time_locale();
-
-	ptr = fmt;
-	while (*ptr != 0) {
-		if (*buf == 0)
-			break;
-
-		c = *ptr++;
-
-		if (c != '%') {
-			if (isspace((unsigned char)c))
-				while (*buf != 0 && isspace((unsigned char)*buf))
-					buf++;
-			else if (c != *buf++)
-				return 0;
-			continue;
-		}
-
-		Ealternative = 0;
-		Oalternative = 0;
-label:
-		c = *ptr++;
-		switch (c) {
-		case 0:
-		case '%':
-			if (*buf++ != '%')
-				return 0;
-			break;
-
-		case '+':
-			buf = _strptime(buf, tptr->date_fmt, tm, GMTp);
-			if (buf == 0)
-				return 0;
-			break;
-
-		case 'C':
-			if (!isdigit((unsigned char)*buf))
-				return 0;
-
-			/* XXX This will break for 3-digit centuries. */
-			len = 2;
-			for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i < 19)
-				return 0;
-
-			tm->tm_year = i * 100 - 1900;
-			break;
-
-		case 'c':
-			buf = _strptime(buf, tptr->c_fmt, tm, GMTp);
-			if (buf == 0)
-				return 0;
-			break;
-
-		case 'D':
-			buf = _strptime(buf, "%m/%d/%y", tm, GMTp);
-			if (buf == 0)
-				return 0;
-			break;
-
-		case 'E':
-			if (Ealternative || Oalternative)
-				break;
-			Ealternative++;
-			goto label;
-
-		case 'O':
-			if (Ealternative || Oalternative)
-				break;
-			Oalternative++;
-			goto label;
-
-		case 'F':
-			buf = _strptime(buf, "%Y-%m-%d", tm, GMTp);
-			if (buf == 0)
-				return 0;
-			break;
-
-		case 'R':
-			buf = _strptime(buf, "%H:%M", tm, GMTp);
-			if (buf == 0)
-				return 0;
-			break;
-
-		case 'r':
-			buf = _strptime(buf, tptr->ampm_fmt, tm, GMTp);
-			if (buf == 0)
-				return 0;
-			break;
-
-		case 'T':
-			buf = _strptime(buf, "%H:%M:%S", tm, GMTp);
-			if (buf == 0)
-				return 0;
-			break;
-
-		case 'X':
-			buf = _strptime(buf, tptr->X_fmt, tm, GMTp);
-			if (buf == 0)
-				return 0;
-			break;
-
-		case 'x':
-			buf = _strptime(buf, tptr->x_fmt, tm, GMTp);
-			if (buf == 0)
-				return 0;
-			break;
-
-		case 'j':
-			if (!isdigit((unsigned char)*buf))
-				return 0;
-
-			len = 3;
-			for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i < 1 || i > 366)
-				return 0;
-
-			tm->tm_yday = i - 1;
-			break;
-
-		case 'M':
-		case 'S':
-			if (*buf == 0 || isspace((unsigned char)*buf))
-				break;
-
-			if (!isdigit((unsigned char)*buf))
-				return 0;
-
-			len = 2;
-			for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-
-			if (c == 'M') {
-				if (i > 59)
-					return 0;
-				tm->tm_min = i;
-			} else {
-				if (i > 60)
-					return 0;
-				tm->tm_sec = i;
-			}
-
-			if (*buf != 0 && isspace((unsigned char)*buf))
-				while (*ptr != 0 && !isspace((unsigned char)*ptr))
-					ptr++;
-			break;
-
-		case 'H':
-		case 'I':
-		case 'k':
-		case 'l':
-			/*
-			 * Of these, %l is the only specifier explicitly
-			 * documented as not being zero-padded.  However,
-			 * there is no harm in allowing zero-padding.
-			 *
-			 * XXX The %l specifier may gobble one too many
-			 * digits if used incorrectly.
-			 */
-			if (!isdigit((unsigned char)*buf))
-				return 0;
-
-			len = 2;
-			for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (c == 'H' || c == 'k') {
-				if (i > 23)
-					return 0;
-			} else if (i > 12)
-				return 0;
-
-			tm->tm_hour = i;
-
-			if (*buf != 0 && isspace((unsigned char)*buf))
-				while (*ptr != 0 && !isspace((unsigned char)*ptr))
-					ptr++;
-			break;
-
-		case 'p':
-			/*
-			 * XXX This is bogus if parsed before hour-related
-			 * specifiers.
-			 */
-			len = strlen(tptr->am);
-			if (strncasecmp(buf, tptr->am, len) == 0) {
-				if (tm->tm_hour > 12)
-					return 0;
-				if (tm->tm_hour == 12)
-					tm->tm_hour = 0;
-				buf += len;
-				break;
-			}
-
-			len = strlen(tptr->pm);
-			if (strncasecmp(buf, tptr->pm, len) == 0) {
-				if (tm->tm_hour > 12)
-					return 0;
-				if (tm->tm_hour != 12)
-					tm->tm_hour += 12;
-				buf += len;
-				break;
-			}
-
-			return 0;
-
-		case 'A':
-		case 'a':
-			for (i = 0; i < asizeof(tptr->weekday); i++) {
-				len = strlen(tptr->weekday[i]);
-				if (strncasecmp(buf, tptr->weekday[i],
-						len) == 0)
-					break;
-				len = strlen(tptr->wday[i]);
-				if (strncasecmp(buf, tptr->wday[i],
-						len) == 0)
-					break;
-			}
-			if (i == asizeof(tptr->weekday))
-				return 0;
-
-			tm->tm_wday = i;
-			buf += len;
-			break;
-
-		case 'U':
-		case 'W':
-			/*
-			 * XXX This is bogus, as we can not assume any valid
-			 * information present in the tm structure at this
-			 * point to calculate a real value, so just check the
-			 * range for now.
-			 */
-			if (!isdigit((unsigned char)*buf))
-				return 0;
-
-			len = 2;
-			for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i > 53)
-				return 0;
-
-			if (*buf != 0 && isspace((unsigned char)*buf))
-				while (*ptr != 0 && !isspace((unsigned char)*ptr))
-					ptr++;
-			break;
-
-		case 'w':
-			if (!isdigit((unsigned char)*buf))
-				return 0;
-
-			i = *buf - '0';
-			if (i > 6)
-				return 0;
-
-			tm->tm_wday = i;
-
-			if (*buf != 0 && isspace((unsigned char)*buf))
-				while (*ptr != 0 && !isspace((unsigned char)*ptr))
-					ptr++;
-			break;
-
-		case 'd':
-		case 'e':
-			/*
-			 * The %e specifier is explicitly documented as not
-			 * being zero-padded but there is no harm in allowing
-			 * such padding.
-			 *
-			 * XXX The %e specifier may gobble one too many
-			 * digits if used incorrectly.
-			 */
-			if (!isdigit((unsigned char)*buf))
-				return 0;
-
-			len = 2;
-			for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i > 31)
-				return 0;
-
-			tm->tm_mday = i;
-
-			if (*buf != 0 && isspace((unsigned char)*buf))
-				while (*ptr != 0 && !isspace((unsigned char)*ptr))
-					ptr++;
-			break;
-
-		case 'B':
-		case 'b':
-		case 'h':
-			for (i = 0; i < asizeof(tptr->month); i++) {
-				if (Oalternative) {
-					if (c == 'B') {
-						len = strlen(tptr->alt_month[i]);
-						if (strncasecmp(buf,
-								tptr->alt_month[i],
-								len) == 0)
-							break;
-					}
-				} else {
-					len = strlen(tptr->month[i]);
-					if (strncasecmp(buf, tptr->month[i],
-							len) == 0)
-						break;
-					len = strlen(tptr->mon[i]);
-					if (strncasecmp(buf, tptr->mon[i],
-							len) == 0)
-						break;
-				}
-			}
-			if (i == asizeof(tptr->month))
-				return 0;
-
-			tm->tm_mon = i;
-			buf += len;
-			break;
-
-		case 'm':
-			if (!isdigit((unsigned char)*buf))
-				return 0;
-
-			len = 2;
-			for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i < 1 || i > 12)
-				return 0;
-
-			tm->tm_mon = i - 1;
-
-			if (*buf != 0 && isspace((unsigned char)*buf))
-				while (*ptr != 0 && !isspace((unsigned char)*ptr))
-					ptr++;
-			break;
-
-		case 's':
-			{
-			char *cp;
-			int sverrno;
-			long n;
-			time_t t;
-
-			sverrno = errno;
-			errno = 0;
-			n = strtol(buf, &cp, 10);
-			if (errno == ERANGE || (long)(t = n) != n) {
-				errno = sverrno;
-				return 0;
-			}
-			errno = sverrno;
-			buf = cp;
-			gmtime_r(&t, tm);
-			*GMTp = 1;
-			}
-			break;
-
-		case 'Y':
-		case 'y':
-			if (*buf == 0 || isspace((unsigned char)*buf))
-				break;
-
-			if (!isdigit((unsigned char)*buf))
-				return 0;
-
-			len = (c == 'Y') ? 4 : 2;
-			for (i = 0; len && *buf != 0 && isdigit((unsigned char)*buf); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (c == 'Y')
-				i -= 1900;
-			if (c == 'y' && i < 69)
-				i += 100;
-			if (i < 0)
-				return 0;
-
-			tm->tm_year = i;
-
-			if (*buf != 0 && isspace((unsigned char)*buf))
-				while (*ptr != 0 && !isspace((unsigned char)*ptr))
-					ptr++;
-			break;
-
-		case 'Z':
-			{
-			const char *cp;
-			char *zonestr;
-
-			for (cp = buf; *cp && isupper((unsigned char)*cp); ++cp) {/*empty*/}
-			if (cp - buf) {
-				zonestr = alloca(cp - buf + 1);
-				strncpy(zonestr, buf, cp - buf);
-				zonestr[cp - buf] = '\0';
-				tzset();
-				if (0 == strcmp(zonestr, "GMT")) {
-				    *GMTp = 1;
-				} else if (0 == strcmp(zonestr, tzname[0])) {
-				    tm->tm_isdst = 0;
-				} else if (0 == strcmp(zonestr, tzname[1])) {
-				    tm->tm_isdst = 1;
-				} else {
-				    return 0;
-				}
-				buf += cp - buf;
-			}
-			}
-			break;
-		}
-	}
-	return (char *)buf;
-}
-
-
-char *
-strptime(const char * __restrict buf, const char * __restrict fmt,
-    struct tm * __restrict tm)
-{
-	char *ret;
-	int gmt;
-
-	gmt = 0;
-	ret = _strptime(buf, fmt, tm, &gmt);
-	if (ret && gmt) {
-		time_t t = timegm(tm);
-		localtime_r(&t, tm);
-	}
-
-	return (ret);
-}
diff --git a/lib/libc/stdtime/time32.c b/lib/libc/stdtime/time32.c
deleted file mode 100644
index 5085dd7..0000000
--- a/lib/libc/stdtime/time32.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 2001 FreeBSD Inc.
- * All rights reserved.
- *
- * These routines are for converting time_t to fixed-bit representations
- * for use in protocols or storage.  When converting time to a larger
- * representation of time_t these routines are expected to assume temporal
- * locality and use the 50-year rule to properly set the msb bits.  XXX
- *
- * Redistribution and use under the terms of the COPYRIGHT file at the
- * base of the source tree.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/time32.c,v 1.5 2002/06/17 01:42:29 wollman Exp $");
-
-#include <sys/types.h>
-#include <timeconv.h>
-
-/*
- * Convert a 32 bit representation of time_t into time_t.  XXX needs to
- * implement the 50-year rule to handle post-2038 conversions.
- */
-time_t
-_time32_to_time(__int32_t t32)
-{
-    return((time_t)t32);
-}
-
-/*
- * Convert time_t to a 32 bit representation.  If time_t is 64 bits we can
- * simply chop it down.   The resulting 32 bit representation can be 
- * converted back to a temporally local 64 bit time_t using time32_to_time.
- */
-__int32_t
-_time_to_time32(time_t t)
-{
-    return((__int32_t)t);
-}
-
-/*
- * Convert a 64 bit representation of time_t into time_t.  If time_t is
- * represented as 32 bits we can simply chop it and not support times
- * past 2038.
- */
-time_t
-_time64_to_time(__int64_t t64)
-{
-    return((time_t)t64);
-}
-
-/*
- * Convert time_t to a 64 bit representation.  If time_t is represented
- * as 32 bits we simply sign-extend and do not support times past 2038.
- */
-__int64_t
-_time_to_time64(time_t t)
-{
-    return((__int64_t)t);
-}
-
-/*
- * Convert to/from 'long'.  Depending on the sizeof(long) this may or 
- * may not require using the 50-year rule.
- */
-long
-_time_to_long(time_t t)
-{
-    if (sizeof(long) == sizeof(__int64_t))
-	return(_time_to_time64(t));
-    return((long)t);
-}
-
-time_t
-_long_to_time(long tlong)
-{
-    if (sizeof(long) == sizeof(__int32_t))
-	return(_time32_to_time(tlong));
-    return((time_t)tlong);
-}
-
-/*
- * Convert to/from 'int'.  Depending on the sizeof(int) this may or 
- * may not require using the 50-year rule.
- */
-int
-_time_to_int(time_t t)
-{
-    if (sizeof(int) == sizeof(__int64_t))
-	return(_time_to_time64(t));
-    return((int)t);
-}
-
-time_t
-_int_to_time(int tint)
-{
-    if (sizeof(int) == sizeof(__int32_t))
-	return(_time32_to_time(tint));
-    return((time_t)tint);
-}
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
deleted file mode 100644
index 2aba03c..0000000
--- a/lib/libc/stdtime/timelocal.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * Copyright (c) 1997 FreeBSD Inc.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/timelocal.c,v 1.25 2003/06/13 00:14:07 jkh Exp $");
-
-#include <stddef.h>
-
-#include "ldpart.h"
-#include "timelocal.h"
-
-static struct lc_time_T _time_locale;
-static int _time_using_locale;
-static char *time_locale_buf;
-
-#define LCTIME_SIZE (sizeof(struct lc_time_T) / sizeof(char *))
-
-static const struct lc_time_T	_C_time_locale = {
-	{
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-	}, {
-		"January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"
-	}, {
-		"Sun", "Mon", "Tue", "Wed",
-		"Thu", "Fri", "Sat"
-	}, {
-		"Sunday", "Monday", "Tuesday", "Wednesday",
-		"Thursday", "Friday", "Saturday"
-	},
-
-	/* X_fmt */
-	"%H:%M:%S",
-
-	/*
-	 * x_fmt
-	 * Since the C language standard calls for
-	 * "date, using locale's date format," anything goes.
-	 * Using just numbers (as here) makes Quakers happier;
-	 * it's also compatible with SVR4.
-	 */
-	"%m/%d/%y",
-
-	/*
-	 * c_fmt
-	 */
-	"%a %b %e %H:%M:%S %Y",
-
-	/* am */
-	"AM",
-
-	/* pm */
-	"PM",
-
-	/* date_fmt */
-	"%a %b %e %H:%M:%S %Z %Y",
-	
-	/* alt_month
-	 * Standalone months forms for %OB
-	 */
-	{
-		"January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"
-	},
-
-	/* md_order
-	 * Month / day order in dates
-	 */
-	"md",
-
-	/* ampm_fmt
-	 * To determine 12-hour clock format time (empty, if N/A)
-	 */
-	"%I:%M:%S %p"
-};
-
-struct lc_time_T *
-__get_current_time_locale(void)
-{
-	return (_time_using_locale
-		? &_time_locale
-		: (struct lc_time_T *)&_C_time_locale);
-}
-
-int
-__time_load_locale(const char *name)
-{
-	return (__part_load_locale(name, &_time_using_locale,
-			&time_locale_buf, "LC_TIME",
-			LCTIME_SIZE, LCTIME_SIZE,
-			(const char **)&_time_locale));
-}
diff --git a/lib/libc/stdtime/timelocal.h b/lib/libc/stdtime/timelocal.h
deleted file mode 100644
index 0b0a59a..0000000
--- a/lib/libc/stdtime/timelocal.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1997-2002 FreeBSD Project.
- * 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.
- *
- * 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/lib/libc/stdtime/timelocal.h,v 1.11 2002/01/24 15:07:44 phantom Exp $
- */
-
-#ifndef _TIMELOCAL_H_
-#define	_TIMELOCAL_H_
-
-/*
- * Private header file for the strftime and strptime localization
- * stuff.
- */
-struct lc_time_T {
-	const char	*mon[12];
-	const char	*month[12];
-	const char	*wday[7];
-	const char	*weekday[7];
-	const char	*X_fmt;
-	const char	*x_fmt;
-	const char	*c_fmt;
-	const char	*am;
-	const char	*pm;
-	const char	*date_fmt;
-	const char	*alt_month[12];
-	const char	*md_order;
-	const char	*ampm_fmt;
-};
-
-struct lc_time_T *__get_current_time_locale(void);
-int	__time_load_locale(const char *);
-
-#endif /* !_TIMELOCAL_H_ */
diff --git a/lib/libc/stdtime/tzfile.h b/lib/libc/stdtime/tzfile.h
deleted file mode 100644
index 378d7ae..0000000
--- a/lib/libc/stdtime/tzfile.h
+++ /dev/null
@@ -1,192 +0,0 @@
-#ifndef TZFILE_H
-#define TZFILE_H
-
-
-/*
-** This file is in the public domain, so clarified as of
-** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
-**
-** $FreeBSD: src/lib/libc/stdtime/tzfile.h,v 1.8 2002/03/22 23:42:05 obrien Exp $
-*/
-
-/*
-** This header is for use ONLY with the time conversion code.
-** There is no guarantee that it will remain unchanged,
-** or that it will remain at all.
-** Do NOT copy it to any system include directory.
-** Thank you!
-*/
-
-/*
-** ID
-*/
-
-#ifndef lint
-#ifndef NOID
-/*
-static char	tzfilehid[] = "@(#)tzfile.h	7.14";
-*/
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-/*
-** Information about time zone files.
-*/
-
-#ifndef TZDIR
-#define TZDIR	"/usr/share/zoneinfo" /* Time zone object file directory */
-#endif /* !defined TZDIR */
-
-#ifndef TZDEFAULT
-#define TZDEFAULT	"/etc/localtime"
-#endif /* !defined TZDEFAULT */
-
-#ifndef TZDEFRULES
-#define TZDEFRULES	"posixrules"
-#endif /* !defined TZDEFRULES */
-
-/*
-** Each file begins with. . .
-*/
-
-#define	TZ_MAGIC	"TZif"
-
-struct tzhead {
- 	char	tzh_magic[4];		/* TZ_MAGIC */
-	char	tzh_reserved[16];	/* reserved for future use */
-	char	tzh_ttisgmtcnt[4];	/* coded number of trans. time flags */
-	char	tzh_ttisstdcnt[4];	/* coded number of trans. time flags */
-	char	tzh_leapcnt[4];		/* coded number of leap seconds */
-	char	tzh_timecnt[4];		/* coded number of transition times */
-	char	tzh_typecnt[4];		/* coded number of local time types */
-	char	tzh_charcnt[4];		/* coded number of abbr. chars */
-};
-
-/*
-** . . .followed by. . .
-**
-**	tzh_timecnt (char [4])s		coded transition times a la time(2)
-**	tzh_timecnt (unsigned char)s	types of local time starting at above
-**	tzh_typecnt repetitions of
-**		one (char [4])		coded UTC offset in seconds
-**		one (unsigned char)	used to set tm_isdst
-**		one (unsigned char)	that's an abbreviation list index
-**	tzh_charcnt (char)s		'\0'-terminated zone abbreviations
-**	tzh_leapcnt repetitions of
-**		one (char [4])		coded leap second transition times
-**		one (char [4])		total correction after above
-**	tzh_ttisstdcnt (char)s		indexed by type; if TRUE, transition
-**					time is standard time, if FALSE,
-**					transition time is wall clock time
-**					if absent, transition times are
-**					assumed to be wall clock time
-**	tzh_ttisgmtcnt (char)s		indexed by type; if TRUE, transition
-**					time is UTC, if FALSE,
-**					transition time is local time
-**					if absent, transition times are
-**					assumed to be local time
-*/
-
-/*
-** In the current implementation, "tzset()" refuses to deal with files that
-** exceed any of the limits below.
-*/
-
-#ifndef TZ_MAX_TIMES
-/*
-** The TZ_MAX_TIMES value below is enough to handle a bit more than a
-** year's worth of solar time (corrected daily to the nearest second) or
-** 138 years of Pacific Presidential Election time
-** (where there are three time zone transitions every fourth year).
-*/
-#define TZ_MAX_TIMES	370
-#endif /* !defined TZ_MAX_TIMES */
-
-#ifndef TZ_MAX_TYPES
-#ifndef NOSOLAR
-#define TZ_MAX_TYPES	256 /* Limited by what (unsigned char)'s can hold */
-#endif /* !defined NOSOLAR */
-#ifdef NOSOLAR
-/*
-** Must be at least 14 for Europe/Riga as of Jan 12 1995,
-** as noted by Earl Chew <earl@hpato.aus.hp.com>.
-*/
-#define TZ_MAX_TYPES	20	/* Maximum number of local time types */
-#endif /* !defined NOSOLAR */
-#endif /* !defined TZ_MAX_TYPES */
-
-#ifndef TZ_MAX_CHARS
-#define TZ_MAX_CHARS	50	/* Maximum number of abbreviation characters */
-				/* (limited by what unsigned chars can hold) */
-#endif /* !defined TZ_MAX_CHARS */
-
-#ifndef TZ_MAX_LEAPS
-#define TZ_MAX_LEAPS	50	/* Maximum number of leap second corrections */
-#endif /* !defined TZ_MAX_LEAPS */
-
-#define SECSPERMIN	60
-#define MINSPERHOUR	60
-#define HOURSPERDAY	24
-#define DAYSPERWEEK	7
-#define DAYSPERNYEAR	365
-#define DAYSPERLYEAR	366
-#define SECSPERHOUR	(SECSPERMIN * MINSPERHOUR)
-#define SECSPERDAY	((long) SECSPERHOUR * HOURSPERDAY)
-#define MONSPERYEAR	12
-
-#define TM_SUNDAY	0
-#define TM_MONDAY	1
-#define TM_TUESDAY	2
-#define TM_WEDNESDAY	3
-#define TM_THURSDAY	4
-#define TM_FRIDAY	5
-#define TM_SATURDAY	6
-
-#define TM_JANUARY	0
-#define TM_FEBRUARY	1
-#define TM_MARCH	2
-#define TM_APRIL	3
-#define TM_MAY		4
-#define TM_JUNE		5
-#define TM_JULY		6
-#define TM_AUGUST	7
-#define TM_SEPTEMBER	8
-#define TM_OCTOBER	9
-#define TM_NOVEMBER	10
-#define TM_DECEMBER	11
-
-#define TM_YEAR_BASE	1900
-
-#define EPOCH_YEAR	1970
-#define EPOCH_WDAY	TM_THURSDAY
-
-/*
-** Accurate only for the past couple of centuries;
-** that will probably do.
-*/
-
-#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
-
-#ifndef USG
-
-/*
-** Use of the underscored variants may cause problems if you move your code to
-** certain System-V-based systems; for maximum portability, use the
-** underscore-free variants.  The underscored variants are provided for
-** backward compatibility only; they may disappear from future versions of
-** this file.
-*/
-
-#define SECS_PER_MIN	SECSPERMIN
-#define MINS_PER_HOUR	MINSPERHOUR
-#define HOURS_PER_DAY	HOURSPERDAY
-#define DAYS_PER_WEEK	DAYSPERWEEK
-#define DAYS_PER_NYEAR	DAYSPERNYEAR
-#define DAYS_PER_LYEAR	DAYSPERLYEAR
-#define SECS_PER_HOUR	SECSPERHOUR
-#define SECS_PER_DAY	SECSPERDAY
-#define MONS_PER_YEAR	MONSPERYEAR
-
-#endif /* !defined USG */
-
-#endif /* !defined TZFILE_H */
diff --git a/lib/libc/string/Makefile b/lib/libc/string/Makefile
deleted file mode 100644
index 4b9b460..0000000
--- a/lib/libc/string/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/
-
-#Objects
-OBJS = ffsl.o fls.o flsl.o memccpy.o memmem.o stpcpy.o strcasecmp.o strcasestr.o strcoll.o strcspn.o strdup.o strerror.o strlcat.o strlcpy.o strmode.o strncat.o strncpy.o strnstr.o strpbrk.o strsep.o strsignal.o strspn.o strstr.o strtok.o strxfrm.o wcscat.o wcscoll.o wcscpy.o wcscspn.o wcslcat.o wcslcpy.o wcsncat.o wcsncmp.o wcsncpy.o wcspbrk.o wcsrchr.o wcsspn.o wcsstr.o wcstok.o wcswidth.o wcsxfrm.o wmemcmp.o wmemcpy.o wmemmove.o wmemset.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
deleted file mode 100644
index f5227df..0000000
--- a/lib/libc/string/bcmp.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/bcmp.c,v 1.5 2002/08/30 21:07:40 robert Exp $");
-
-#include <strings.h>
-
-/*
- * bcmp -- vax cmpc3 instruction
- */
-int
-bcmp(const void *b1, const void *b2, size_t length)
-{
-	char *p1, *p2;
-
-	if (length == 0)
-		return (0);
-	p1 = (char *)b1;
-	p2 = (char *)b2;
-	do
-		if (*p1++ != *p2++)
-			break;
-	while (--length);
-	return (length);
-}
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
deleted file mode 100644
index 983b2fb..0000000
--- a/lib/libc/string/bcopy.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bcopy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/bcopy.c,v 1.6 2003/10/26 03:55:58 peter Exp $");
-
-#include <sys/types.h>
-
-/*
- * sizeof(word) MUST BE A POWER OF TWO
- * SO THAT wmask BELOW IS ALL ONES
- */
-typedef	int word;		/* "word" used for optimal copy speed */
-
-#define	wsize	sizeof(word)
-#define	wmask	(wsize - 1)
-
-/*
- * Copy a block of memory, handling overlap.
- * This is the routine that actually implements
- * (the portable versions of) bcopy, memcpy, and memmove.
- */
-#if defined(MEMCOPY) || defined(MEMMOVE)
-#include <string.h>
-
-void *
-#ifdef MEMCOPY
-memcpy
-#else
-memmove
-#endif
-(void *dst0, const void *src0, size_t length)
-#else
-#include <strings.h>
-
-void
-bcopy(const void *src0, void *dst0, size_t length)
-#endif
-{
-	char *dst = dst0;
-	const char *src = src0;
-	size_t t;
-
-	if (length == 0 || dst == src)		/* nothing to do */
-		goto done;
-
-	/*
-	 * Macros: loop-t-times; and loop-t-times, t>0
-	 */
-#define	TLOOP(s) if (t) TLOOP1(s)
-#define	TLOOP1(s) do { s; } while (--t)
-
-	if ((unsigned long)dst < (unsigned long)src) {
-		/*
-		 * Copy forward.
-		 */
-		t = (uintptr_t)src;	/* only need low bits */
-		if ((t | (uintptr_t)dst) & wmask) {
-			/*
-			 * Try to align operands.  This cannot be done
-			 * unless the low bits match.
-			 */
-			if ((t ^ (uintptr_t)dst) & wmask || length < wsize)
-				t = length;
-			else
-				t = wsize - (t & wmask);
-			length -= t;
-			TLOOP1(*dst++ = *src++);
-		}
-		/*
-		 * Copy whole words, then mop up any trailing bytes.
-		 */
-		t = length / wsize;
-		TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
-		t = length & wmask;
-		TLOOP(*dst++ = *src++);
-	} else {
-		/*
-		 * Copy backwards.  Otherwise essentially the same.
-		 * Alignment works as before, except that it takes
-		 * (t&wmask) bytes to align, not wsize-(t&wmask).
-		 */
-		src += length;
-		dst += length;
-		t = (uintptr_t)src;
-		if ((t | (uintptr_t)dst) & wmask) {
-			if ((t ^ (uintptr_t)dst) & wmask || length <= wsize)
-				t = length;
-			else
-				t &= wmask;
-			length -= t;
-			TLOOP1(*--dst = *--src);
-		}
-		t = length / wsize;
-		TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
-		t = length & wmask;
-		TLOOP(*--dst = *--src);
-	}
-done:
-#if defined(MEMCOPY) || defined(MEMMOVE)
-	return (dst0);
-#else
-	return;
-#endif
-}
diff --git a/lib/libc/string/bzero.c b/lib/libc/string/bzero.c
deleted file mode 100644
index 85bc5e8..0000000
--- a/lib/libc/string/bzero.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/bzero.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	BZERO
-#include "memset.c"
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
deleted file mode 100644
index ef4d0f0..0000000
--- a/lib/libc/string/ffs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ffs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/ffs.c,v 1.7 2004/01/14 07:46:36 des Exp $");
-
-#include <strings.h>
-
-/*
- * Find First Set bit
- */
-int
-ffs(int mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return(0);
-	for (bit = 1; !(mask & 1); bit++)
-		mask = (unsigned int)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc/string/ffsl.c b/lib/libc/string/ffsl.c
deleted file mode 100644
index 1c25a0a..0000000
--- a/lib/libc/string/ffsl.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/ffsl.c,v 1.2 2004/01/14 07:46:36 des Exp $");
-
-#include <strings.h>
-
-/*
- * Find First Set bit
- */
-int
-ffsl(long mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return(0);
-	for (bit = 1; !(mask & 1); bit++)
-		mask = (unsigned long)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc/string/fls.c b/lib/libc/string/fls.c
deleted file mode 100644
index 8550cf8..0000000
--- a/lib/libc/string/fls.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/fls.c,v 1.2 2004/01/14 07:46:36 des Exp $");
-
-#include <strings.h>
-
-/*
- * Find Last Set bit
- */
-int
-fls(int mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return (0);
-	for (bit = 1; mask != 1; bit++)
-		mask = (unsigned int)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc/string/flsl.c b/lib/libc/string/flsl.c
deleted file mode 100644
index f9612b5..0000000
--- a/lib/libc/string/flsl.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/flsl.c,v 1.2 2004/01/14 07:46:36 des Exp $");
-
-#include <strings.h>
-
-/*
- * Find Last Set bit
- */
-int
-flsl(long mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return (0);
-	for (bit = 1; mask != 1; bit++)
-		mask = (unsigned long)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
deleted file mode 100644
index be2c052..0000000
--- a/lib/libc/string/index.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)index.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/index.c,v 1.7 2003/12/18 07:44:53 jkh Exp $");
-
-#include <stddef.h>
-
-#ifdef STRCHR
-#include <string.h>
-
-char *
-strchr
-#else
-#include <strings.h>
-
-char *
-index
-#endif
-(const char *p, int ch)
-{
-	char c;
-
-	c = ch;
-	for (;; ++p) {
-		if (*p == c)
-			return ((char *)p);
-		if (*p == '\0')
-			return (NULL);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/string/memccpy.c b/lib/libc/string/memccpy.c
deleted file mode 100644
index 0bc6a11..0000000
--- a/lib/libc/string/memccpy.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memccpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memccpy.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-void *
-memccpy(t, f, c, n)
-	void *t;
-	const void *f;
-	int c;
-	size_t n;
-{
-
-	if (n) {
-		unsigned char *tp = t;
-		const unsigned char *fp = f;
-		unsigned char uc = c;
-		do {
-			if ((*tp++ = *fp++) == uc)
-				return (tp);
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
deleted file mode 100644
index e3c6679..0000000
--- a/lib/libc/string/memchr.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memchr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memchr.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-void *
-memchr(s, c, n)
-	const void *s;
-	unsigned char c;
-	size_t n;
-{
-	if (n != 0) {
-		const unsigned char *p = s;
-
-		do {
-			if (*p++ == c)
-				return ((void *)(p - 1));
-		} while (--n != 0);
-	}
-	return (NULL);
-}
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
deleted file mode 100644
index 045e4d9..0000000
--- a/lib/libc/string/memcmp.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memcmp.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Compare memory regions.
- */
-int
-memcmp(s1, s2, n)
-	const void *s1, *s2;
-	size_t n;
-{
-	if (n != 0) {
-		const unsigned char *p1 = s1, *p2 = s2;
-
-		do {
-			if (*p1++ != *p2++)
-				return (*--p1 - *--p2);
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/lib/libc/string/memcpy.c b/lib/libc/string/memcpy.c
deleted file mode 100644
index dfc03ae..0000000
--- a/lib/libc/string/memcpy.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memcpy.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	MEMCOPY
-#include "bcopy.c"
diff --git a/lib/libc/string/memmem.c b/lib/libc/string/memmem.c
deleted file mode 100644
index b5c02b6..0000000
--- a/lib/libc/string/memmem.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memmem.c,v 1.1.2.1 2005/08/29 18:46:39 andre Exp $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence of the byte string s in byte string l.
- */
-
-void *
-memmem(l, l_len, s, s_len)
-	const void *l; size_t l_len;
-	const void *s; size_t s_len;
-{
-	register char *cur, *last;
-	const char *cl = (const char *)l;
-	const char *cs = (const char *)s;
-
-	/* we need something to compare */
-	if (l_len == 0 || s_len == 0)
-		return NULL;
-
-	/* "s" must be smaller or equal to "l" */
-	if (l_len < s_len)
-		return NULL;
-
-	/* special case where s_len == 1 */
-	if (s_len == 1)
-		return memchr(l, (int)*cs, l_len);
-
-	/* the last position where its possible to find "s" in "l" */
-	last = (char *)cl + l_len - s_len;
-
-	for (cur = (char *)cl; cur <= last; cur++)
-		if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0)
-			return cur;
-
-	return NULL;
-}
diff --git a/lib/libc/string/memmove.c b/lib/libc/string/memmove.c
deleted file mode 100644
index 8f44e82..0000000
--- a/lib/libc/string/memmove.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memmove.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	MEMMOVE
-#include "bcopy.c"
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
deleted file mode 100644
index 1cb8644..0000000
--- a/lib/libc/string/memset.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Hibler and Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memset.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memset.c,v 1.8 2002/09/01 21:53:46 robert Exp $");
-
-#include <sys/types.h>
-
-#include <limits.h>
-
-#define	wsize	sizeof(u_int)
-#define	wmask	(wsize - 1)
-
-#ifdef BZERO
-#include <strings.h>
-
-#define	RETURN	return
-#define	VAL	0
-#define	WIDEVAL	0
-
-void
-bzero(void *dst0, size_t length)
-#else
-#include <string.h>
-
-#define	RETURN	return (dst0)
-#define	VAL	c0
-#define	WIDEVAL	c
-
-void *
-memset(void *dst0, int c0, size_t length)
-#endif
-{
-	size_t t;
-#ifndef BZERO
-	u_int c;
-#endif
-	u_char *dst;
-
-	dst = dst0;
-	/*
-	 * If not enough words, just fill bytes.  A length >= 2 words
-	 * guarantees that at least one of them is `complete' after
-	 * any necessary alignment.  For instance:
-	 *
-	 *	|-----------|-----------|-----------|
-	 *	|00|01|02|03|04|05|06|07|08|09|0A|00|
-	 *	          ^---------------------^
-	 *		 dst		 dst+length-1
-	 *
-	 * but we use a minimum of 3 here since the overhead of the code
-	 * to do word writes is substantial.
-	 */
-	if (length < 3 * wsize) {
-		while (length != 0) {
-			*dst++ = VAL;
-			--length;
-		}
-		RETURN;
-	}
-
-#ifndef BZERO
-	if ((c = (u_char)c0) != 0) {	/* Fill the word. */
-		c = (c << 8) | c;	/* u_int is 16 bits. */
-#if UINT_MAX > 0xffff
-		c = (c << 16) | c;	/* u_int is 32 bits. */
-#endif
-#if UINT_MAX > 0xffffffff
-		c = (c << 32) | c;	/* u_int is 64 bits. */
-#endif
-	}
-#endif
-	/* Align destination by filling in bytes. */
-	if ((t = (long)dst & wmask) != 0) {
-		t = wsize - t;
-		length -= t;
-		do {
-			*dst++ = VAL;
-		} while (--t != 0);
-	}
-
-	/* Fill words.  Length was >= 2*words so we know t >= 1 here. */
-	t = length / wsize;
-	do {
-		*(u_int *)dst = WIDEVAL;
-		dst += wsize;
-	} while (--t != 0);
-
-	/* Mop up trailing bytes, if any. */
-	t = length & wmask;
-	if (t != 0)
-		do {
-			*dst++ = VAL;
-		} while (--t != 0);
-	RETURN;
-}
diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c
deleted file mode 100644
index 697b69a..0000000
--- a/lib/libc/string/rindex.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rindex.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/rindex.c,v 1.7 2003/12/18 07:44:53 jkh Exp $");
-
-#include <stddef.h>
-
-#ifdef STRRCHR
-#include <string.h>
-
-char *
-strrchr
-#else
-#include <strings.h>
-
-char *
-rindex
-#endif
-(const char *p, int ch)
-{
-	char *save;
-	char c;
-
-	c = ch;
-	for (save = NULL;; ++p) {
-		if (*p == c)
-			save = (char *)p;
-		if (*p == '\0')
-			return (save);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/string/stpcpy.c b/lib/libc/string/stpcpy.c
deleted file mode 100644
index 2742bf7..0000000
--- a/lib/libc/string/stpcpy.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1999
- *	David E. O'Brien
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/stpcpy.c,v 1.1 2002/10/03 19:39:20 obrien Exp $");
-
-#include <string.h>
-
-char *
-stpcpy(char * to, const char * from)
-{
-
-	for (; (*to = *from); ++from, ++to);
-	return(to);
-}
diff --git a/lib/libc/string/strcasecmp.c b/lib/libc/string/strcasecmp.c
deleted file mode 100644
index 6f400d7..0000000
--- a/lib/libc/string/strcasecmp.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcasecmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.6 2002/08/30 15:40:01 robert Exp $");
-
-#include <strings.h>
-#include <ctype.h>
-
-typedef unsigned char u_char;
-
-int
-strcasecmp(s1, s2)
-	const char *s1, *s2;
-{
-	const u_char
-			*us1 = (const u_char *)s1,
-			*us2 = (const u_char *)s2;
-
-	while (tolower(*us1) == tolower(*us2++))
-		if (*us1++ == '\0')
-			return (0);
-	return (tolower(*us1) - tolower(*--us2));
-}
-
-int
-strncasecmp(s1, s2, n)
-	const char *s1, *s2;
-	size_t n;
-{
-	if (n != 0) {
-		const u_char
-				*us1 = (const u_char *)s1,
-				*us2 = (const u_char *)s2;
-
-		do {
-			if (tolower(*us1) != tolower(*us2++))
-				return (tolower(*us1) - tolower(*--us2));
-			if (*us1++ == '\0')
-				break;
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/lib/libc/string/strcasestr.c b/lib/libc/string/strcasestr.c
deleted file mode 100644
index dafcb79..0000000
--- a/lib/libc/string/strcasestr.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcasestr.c,v 1.3 2002/03/21 18:44:54 obrien Exp $");
-
-#include <ctype.h>
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s, ignore case.
- */
-char *
-strcasestr(s, find)
-	const char *s, *find;
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != 0) {
-		c = tolower((unsigned char)c);
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == 0)
-					return (NULL);
-			} while ((char)tolower((unsigned char)sc) != c);
-		} while (strncasecmp(s, find, len) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
deleted file mode 100644
index 5d28c86..0000000
--- a/lib/libc/string/strcat.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcat.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcat.c,v 1.7 2002/09/06 11:24:06 tjr Exp $");
-
-#include <string.h>
-
-char *
-strcat(char * __restrict s, const char * __restrict append)
-{
-	char *save = s;
-
-	for (; *s; ++s);
-	while ((*s++ = *append++));
-	return(save);
-}
diff --git a/lib/libc/string/strchr.c b/lib/libc/string/strchr.c
deleted file mode 100644
index 2fb9114..0000000
--- a/lib/libc/string/strchr.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strchr.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	STRCHR
-#include "index.c"
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
deleted file mode 100644
index 1befcbc..0000000
--- a/lib/libc/string/strcmp.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcmp.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Compare strings.
- */
-int
-strcmp(s1, s2)
-	const char *s1, *s2;
-{
-	while (*s1 == *s2++)
-		if (*s1++ == 0)
-			return (0);
-	return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1));
-}
diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c
deleted file mode 100644
index b93ce48..0000000
--- a/lib/libc/string/strcoll.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcoll.c,v 1.13 2001/11/07 19:55:16 obrien Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-#include "collate.h"
-
-int
-strcoll(s, s2)
-	const char *s, *s2;
-{
-	int len, len2, prim, prim2, sec, sec2, ret, ret2;
-	const char *t, *t2;
-	char *tt, *tt2;
-
-	if (__collate_load_error)
-		return strcmp(s, s2);
-
-	len = len2 = 1;
-	ret = ret2 = 0;
-	if (__collate_substitute_nontrivial) {
-		t = tt = __collate_substitute(s);
-		t2 = tt2 = __collate_substitute(s2);
-	} else {
-		tt = tt2 = NULL;
-		t = s;
-		t2 = s2;
-	}
-	while(*t && *t2) {
-		prim = prim2 = 0;
-		while(*t && !prim) {
-			__collate_lookup(t, &len, &prim, &sec);
-			t += len;
-		}
-		while(*t2 && !prim2) {
-			__collate_lookup(t2, &len2, &prim2, &sec2);
-			t2 += len2;
-		}
-		if(!prim || !prim2)
-			break;
-		if(prim != prim2) {
-			ret = prim - prim2;
-			goto end;
-		}
-		if(!ret2)
-			ret2 = sec - sec2;
-	}
-	if(!*t && *t2)
-		ret = -(int)((u_char)*t2);
-	else if(*t && !*t2)
-		ret = (u_char)*t;
-	else if(!*t && !*t2)
-		ret = ret2;
-  end:
-	free(tt);
-	free(tt2);
-
-	return ret;
-}
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
deleted file mode 100644
index 5cd2f45..0000000
--- a/lib/libc/string/strcpy.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcpy.c,v 1.7 2002/09/06 11:24:06 tjr Exp $");
-
-#include <string.h>
-
-char *
-strcpy(char * __restrict to, const char * __restrict from)
-{
-	char *save = to;
-
-	for (; (*to = *from); ++from, ++to);
-	return(save);
-}
diff --git a/lib/libc/string/strcspn.c b/lib/libc/string/strcspn.c
deleted file mode 100644
index 55acb8b..0000000
--- a/lib/libc/string/strcspn.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 2005 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcspn.c,v 1.5 2005/04/02 18:52:44 das Exp $");
-
-#include <sys/types.h>
-#include <limits.h>
-#include <string.h>
-
-#define	IDX(c)	((u_char)(c) / LONG_BIT)
-#define	BIT(c)	((u_long)1 << ((u_char)(c) % LONG_BIT))
-
-size_t
-strcspn(const char *s, const char *charset)
-{
-	/*
-	 * NB: idx and bit are temporaries whose use causes gcc 3.4.2 to
-	 * generate better code.  Without them, gcc gets a little confused.
-	 */
-	const char *s1;
-	u_long bit;
-	u_long tbl[(UCHAR_MAX + 1) / LONG_BIT];
-	int idx;
-
-	if(*s == '\0')
-		return (0);
-
-#if LONG_BIT == 64	/* always better to unroll on 64-bit architectures */
-	tbl[0] = 1;
-	tbl[3] = tbl[2] = tbl[1] = 0;
-#else
-	for (tbl[0] = idx = 1; idx < sizeof(tbl) / sizeof(tbl[0]); idx++)
-		tbl[idx] = 0;
-#endif
-	for (; *charset != '\0'; charset++) {
-		idx = IDX(*charset);
-		bit = BIT(*charset);
-		tbl[idx] |= bit;
-	}
-
-	for(s1 = s; ; s1++) {
-		idx = IDX(*s1);
-		bit = BIT(*s1);
-		if ((tbl[idx] & bit) != 0)
-			break;
-	}
-	return (s1 - s);
-}
diff --git a/lib/libc/string/strdup.c b/lib/libc/string/strdup.c
deleted file mode 100644
index a9881a1..0000000
--- a/lib/libc/string/strdup.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strdup.c,v 1.4 2001/11/07 19:55:16 obrien Exp $");
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-strdup(str)
-	const char *str;
-{
-	size_t len;
-	char *copy;
-
-	len = strlen(str) + 1;
-	if ((copy = malloc(len)) == NULL)
-		return (NULL);
-	memcpy(copy, str, len);
-	return (copy);
-}
diff --git a/lib/libc/string/strerror.c b/lib/libc/string/strerror.c
deleted file mode 100644
index 13ce92c..0000000
--- a/lib/libc/string/strerror.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strerror.c,v 1.15 2005/02/27 21:17:22 phantom Exp $");
-
-#if defined(NLS)
-#include <nl_types.h>
-#endif
-
-#include <limits.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-
-#define	UPREFIX		"Unknown error"
-
-/*
- * Define a buffer size big enough to describe a 64-bit signed integer
- * converted to ASCII decimal (19 bytes), with an optional leading sign
- * (1 byte); finally, we get the prefix, delimiter (": ") and a trailing
- * NUL from UPREFIX.
- */
-#define	EBUFSIZE	(20 + 2 + sizeof(UPREFIX))
-
-/*
- * Doing this by hand instead of linking with stdio(3) avoids bloat for
- * statically linked binaries.
- */
-static void
-errstr(int num, char *uprefix, char *buf, size_t len)
-{
-	char *t;
-	unsigned int uerr;
-	char tmp[EBUFSIZE];
-
-	t = tmp + sizeof(tmp);
-	*--t = '\0';
-	uerr = (num >= 0) ? num : -num;
-	do {
-		*--t = "0123456789"[uerr % 10];
-	} while (uerr /= 10);
-	if (num < 0)
-		*--t = '-';
-	*--t = ' ';
-	*--t = ':';
-	strlcpy(buf, uprefix, len);
-	strlcat(buf, t, len);
-}
-
-int
-strerror_r(int errnum, char *strerrbuf, size_t buflen)
-{
-	int retval = 0;
-#if defined(NLS)
-	int saved_errno = errno;
-	nl_catd catd;
-	catd = catopen("libc", NL_CAT_LOCALE);
-#endif
-
-	if (errnum < 1 || errnum >= sys_nerr) {
-		errstr(errnum,
-#if defined(NLS)
-			catgets(catd, 1, 0xffff, UPREFIX),
-#else
-			UPREFIX,
-#endif
-			strerrbuf, buflen);
-		retval = EINVAL;
-	} else {
-		if (strlcpy(strerrbuf,
-#if defined(NLS)
-			catgets(catd, 1, errnum, sys_errlist[errnum]),
-#else
-			sys_errlist[errnum],
-#endif
-			buflen) >= buflen)
-		retval = ERANGE;
-	}
-
-#if defined(NLS)
-	catclose(catd);
-	errno = saved_errno;
-#endif
-
-	return (retval);
-}
-
-char *
-strerror(int num)
-{
-	static char ebuf[NL_TEXTMAX];
-
-	if (strerror_r(num, ebuf, sizeof(ebuf)) != 0)
-	errno = EINVAL;
-	return (ebuf);
-}
diff --git a/lib/libc/string/strlcat.c b/lib/libc/string/strlcat.c
deleted file mode 100644
index b8f0ff3..0000000
--- a/lib/libc/string/strlcat.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strlcat.c,v 1.10 2004/10/16 06:32:43 obrien Exp $");
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-strlcat(dst, src, siz)
-	char *dst;
-	const char *src;
-	size_t siz;
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-	size_t dlen;
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (n-- != 0 && *d != '\0')
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + strlen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
-	}
-	*d = '\0';
-
-	return(dlen + (s - src));	/* count does not include NUL */
-}
diff --git a/lib/libc/string/strlcpy.c b/lib/libc/string/strlcpy.c
deleted file mode 100644
index 9383236..0000000
--- a/lib/libc/string/strlcpy.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.8 2004/10/14 21:31:42 stefanf Exp $");
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t strlcpy(dst, src, siz)
-	char *dst;
-	const char *src;
-	size_t siz;
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
deleted file mode 100644
index c67667d..0000000
--- a/lib/libc/string/strlen.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strlen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strlen.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-size_t
-strlen(str)
-	const char *str;
-{
-	const char *s;
-
-	for (s = str; *s; ++s);
-	return(s - str);
-}
-
diff --git a/lib/libc/string/strmode.c b/lib/libc/string/strmode.c
deleted file mode 100644
index 2409b4e..0000000
--- a/lib/libc/string/strmode.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strmode.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-
-void
-strmode(mode, p)
-	mode_t mode;
-	char *p;
-{
-	 /* print type */
-	switch (mode & S_IFMT) {
-	case S_IFDIR:			/* directory */
-		*p++ = 'd';
-		break;
-	case S_IFCHR:			/* character special */
-		*p++ = 'c';
-		break;
-	case S_IFBLK:			/* block special */
-		*p++ = 'b';
-		break;
-	case S_IFREG:			/* regular */
-		*p++ = '-';
-		break;
-	case S_IFLNK:			/* symbolic link */
-		*p++ = 'l';
-		break;
-	case S_IFSOCK:			/* socket */
-		*p++ = 's';
-		break;
-#ifdef S_IFIFO
-	case S_IFIFO:			/* fifo */
-		*p++ = 'p';
-		break;
-#endif
-#ifdef S_IFWHT
-	case S_IFWHT:			/* whiteout */
-		*p++ = 'w';
-		break;
-#endif
-	default:			/* unknown */
-		*p++ = '?';
-		break;
-	}
-	/* usr */
-	if (mode & S_IRUSR)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWUSR)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXUSR | S_ISUID)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXUSR:
-		*p++ = 'x';
-		break;
-	case S_ISUID:
-		*p++ = 'S';
-		break;
-	case S_IXUSR | S_ISUID:
-		*p++ = 's';
-		break;
-	}
-	/* group */
-	if (mode & S_IRGRP)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWGRP)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXGRP | S_ISGID)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXGRP:
-		*p++ = 'x';
-		break;
-	case S_ISGID:
-		*p++ = 'S';
-		break;
-	case S_IXGRP | S_ISGID:
-		*p++ = 's';
-		break;
-	}
-	/* other */
-	if (mode & S_IROTH)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWOTH)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXOTH | S_ISVTX)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXOTH:
-		*p++ = 'x';
-		break;
-	case S_ISVTX:
-		*p++ = 'T';
-		break;
-	case S_IXOTH | S_ISVTX:
-		*p++ = 't';
-		break;
-	}
-	*p++ = ' ';		/* will be a '+' if ACL's implemented */
-	*p = '\0';
-}
diff --git a/lib/libc/string/strncat.c b/lib/libc/string/strncat.c
deleted file mode 100644
index e05e030..0000000
--- a/lib/libc/string/strncat.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncat.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strncat.c,v 1.6 2002/09/06 11:24:06 tjr Exp $");
-
-#include <string.h>
-
-/*
- * Concatenate src on the end of dst.  At most strlen(dst)+n+1 bytes
- * are written at dst (at most n+1 bytes being appended).  Return dst.
- */
-char *
-strncat(char * __restrict dst, const char * __restrict src, size_t n)
-{
-	if (n != 0) {
-		char *d = dst;
-		const char *s = src;
-
-		while (*d != 0)
-			d++;
-		do {
-			if ((*d = *s++) == 0)
-				break;
-			d++;
-		} while (--n != 0);
-		*d = 0;
-	}
-	return (dst);
-}
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
deleted file mode 100644
index 6b0cfc8..0000000
--- a/lib/libc/string/strncmp.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strncmp.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-int
-strncmp(s1, s2, n)
-	const char *s1, *s2;
-	size_t n;
-{
-
-	if (n == 0)
-		return (0);
-	do {
-		if (*s1 != *s2++)
-			return (*(const unsigned char *)s1 -
-				*(const unsigned char *)(s2 - 1));
-		if (*s1++ == 0)
-			break;
-	} while (--n != 0);
-	return (0);
-}
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
deleted file mode 100644
index 2fcc957..0000000
--- a/lib/libc/string/strncpy.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strncpy.c,v 1.6 2002/09/06 11:24:06 tjr Exp $");
-
-#include <string.h>
-
-/*
- * Copy src to dst, truncating or null-padding to always copy n bytes.
- * Return dst.
- */
-char *
-strncpy(char * __restrict dst, const char * __restrict src, size_t n)
-{
-	if (n != 0) {
-		char *d = dst;
-		const char *s = src;
-
-		do {
-			if ((*d++ = *s++) == 0) {
-				/* NUL pad the remaining n-1 bytes */
-				while (--n != 0)
-					*d++ = 0;
-				break;
-			}
-		} while (--n != 0);
-	}
-	return (dst);
-}
diff --git a/lib/libc/string/strnstr.c b/lib/libc/string/strnstr.c
deleted file mode 100644
index abe2f8d..0000000
--- a/lib/libc/string/strnstr.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strnstr.c,v 1.3 2005/02/11 21:07:51 pjd Exp $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s, where the search is limited to the
- * first slen characters of s.
- */
-char *
-strnstr(s, find, slen)
-	const char *s;
-	const char *find;
-	size_t slen;
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != '\0') {
-		len = strlen(find);
-		do {
-			do {
-				if (slen-- < 1 || (sc = *s++) == '\0')
-					return (NULL);
-			} while (sc != c);
-			if (len > slen)
-				return (NULL);
-		} while (strncmp(s, find, len) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
diff --git a/lib/libc/string/strpbrk.c b/lib/libc/string/strpbrk.c
deleted file mode 100644
index fb0e1d4..0000000
--- a/lib/libc/string/strpbrk.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strpbrk.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strpbrk.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence in s1 of a character in s2 (excluding NUL).
- */
-char *
-strpbrk(s1, s2)
-	const char *s1, *s2;
-{
-	const char *scanp;
-	int c, sc;
-
-	while ((c = *s1++) != 0) {
-		for (scanp = s2; (sc = *scanp++) != 0;)
-			if (sc == c)
-				return ((char *)(s1 - 1));
-	}
-	return (NULL);
-}
diff --git a/lib/libc/string/strrchr.c b/lib/libc/string/strrchr.c
deleted file mode 100644
index b8c0500..0000000
--- a/lib/libc/string/strrchr.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strrchr.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	STRRCHR
-#include "rindex.c"
diff --git a/lib/libc/string/strsep.c b/lib/libc/string/strsep.c
deleted file mode 100644
index d0bccce..0000000
--- a/lib/libc/string/strsep.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strsep.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- */
-char *
-strsep(stringp, delim)
-	char **stringp;
-	const char *delim;
-{
-	char *s;
-	const char *spanp;
-	int c, sc;
-	char *tok;
-
-	if ((s = *stringp) == NULL)
-		return (NULL);
-	for (tok = s;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/string/strsignal.c b/lib/libc/string/strsignal.c
deleted file mode 100644
index 7211a54..0000000
--- a/lib/libc/string/strsignal.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strsignal.c,v 1.7 2005/03/06 03:19:19 mux Exp $");
-
-#if defined(NLS)
-#include <nl_types.h>
-#endif
-
-#include <limits.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#define	UPREFIX		"Unknown signal"
-
-/* XXX: negative 'num' ? (REGR) */
-char *
-strsignal(int num)
-{
-	static char ebuf[NL_TEXTMAX];
-	char tmp[20];
-	size_t n;
-	int signum;
-	char *t, *p;
-
-#if defined(NLS)
-	int saved_errno = errno;
-	nl_catd catd;
-	catd = catopen("libc", NL_CAT_LOCALE);
-#endif
-
-	if (num > 0 && num < sys_nsig) {
-		n = strlcpy(ebuf,
-#if defined(NLS)
-			catgets(catd, 2, num, sys_siglist[num]),
-#else
-			sys_siglist[num],
-#endif
-			sizeof(ebuf));
-	} else {
-		n = strlcpy(ebuf,
-#if defined(NLS)
-			catgets(catd, 2, 0xffff, UPREFIX),
-#else
-			UPREFIX,
-#endif
-			sizeof(ebuf));
-	}
-
-	signum = num;
-	if (num < 0)
-		signum = -signum;
-
-	t = tmp;
-	do {
-		*t++ = "0123456789"[signum % 10];
-	} while (signum /= 10);
-	if (num < 0)
-		*t++ = '-';
-
-	p = (ebuf + n);
-	*p++ = ':';
-	*p++ = ' ';
-
-	for (;;) {
-		*p++ = *--t;
-		if (t <= tmp)
-			break;
-	}
-	*p = '\0';
-
-#if defined(NLS)
-	catclose(catd);
-	errno = saved_errno;
-#endif
-	return (ebuf);
-}
diff --git a/lib/libc/string/strspn.c b/lib/libc/string/strspn.c
deleted file mode 100644
index 3b96365..0000000
--- a/lib/libc/string/strspn.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 2005 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strspn.c,v 1.5 2005/04/02 18:52:44 das Exp $");
-
-#include <sys/types.h>
-#include <limits.h>
-#include <string.h>
-
-#define	IDX(c)	((u_char)(c) / LONG_BIT)
-#define	BIT(c)	((u_long)1 << ((u_char)(c) % LONG_BIT))
-
-size_t
-strspn(const char *s, const char *charset)
-{
-	/*
-	 * NB: idx and bit are temporaries whose use causes gcc 3.4.2 to
-	 * generate better code.  Without them, gcc gets a little confused.
-	 */
-	const char *s1;
-	u_long bit;
-	u_long tbl[(UCHAR_MAX + 1) / LONG_BIT];
-	int idx;
-
-	if(*s == '\0')
-		return (0);
-
-#if LONG_BIT == 64	/* always better to unroll on 64-bit architectures */
-	tbl[3] = tbl[2] = tbl[1] = tbl[0] = 0;
-#else
-	for (idx = 0; idx < sizeof(tbl) / sizeof(tbl[0]); idx++)
-		tbl[idx] = 0;
-#endif
-	for (; *charset != '\0'; charset++) {
-		idx = IDX(*charset);
-		bit = BIT(*charset);
-		tbl[idx] |= bit;
-	}
-
-	for(s1 = s; ; s1++) {
-		idx = IDX(*s1);
-		bit = BIT(*s1);
-		if ((tbl[idx] & bit) == 0)
-			break;
-	}
-	return (s1 - s);
-}
diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c
deleted file mode 100644
index f51d170..0000000
--- a/lib/libc/string/strstr.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strstr.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s.
- */
-char *
-strstr(s, find)
-	const char *s, *find;
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != 0) {
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == 0)
-					return (NULL);
-			} while (sc != c);
-		} while (strncmp(s, find, len) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
diff --git a/lib/libc/string/strtok.c b/lib/libc/string/strtok.c
deleted file mode 100644
index 6aec194..0000000
--- a/lib/libc/string/strtok.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
- *
- * strtok_r, from Berkeley strtok
- * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
- *
- * Copyright (c) 1988, 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
- *    notices, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notices, 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 Softweyr LLC, 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtok.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strtok.c,v 1.9 2002/09/07 02:53:19 tjr Exp $");
-
-#include <stddef.h>
-#ifdef DEBUG_STRTOK
-#include <stdio.h>
-#endif
-#include <string.h>
-
-char	*__strtok_r(char *, const char *, char **);
-
-__weak_reference(__strtok_r, strtok_r);
-
-char *
-__strtok_r(char *s, const char *delim, char **last)
-{
-	char *spanp, *tok;
-	int c, sc;
-
-	if (s == NULL && (s = *last) == NULL)
-		return (NULL);
-
-	/*
-	 * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
-	 */
-cont:
-	c = *s++;
-	for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
-		if (c == sc)
-			goto cont;
-	}
-
-	if (c == 0) {		/* no non-delimiter characters */
-		*last = NULL;
-		return (NULL);
-	}
-	tok = s - 1;
-
-	/*
-	 * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
-	 * Note that delim must have one NUL; we stop if we see that, too.
-	 */
-	for (;;) {
-		c = *s++;
-		spanp = (char *)delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = '\0';
-				*last = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
-
-char *
-strtok(char *s, const char *delim)
-{
-	static char *last;
-
-	return (__strtok_r(s, delim, &last));
-}
-
-#ifdef DEBUG_STRTOK
-/*
- * Test the tokenizer.
- */
-int
-main(void)
-{
-	char blah[80], test[80];
-	char *brkb, *brkt, *phrase, *sep, *word;
-
-	sep = "\\/:;=-";
-	phrase = "foo";
-
-	printf("String tokenizer test:\n");
-	strcpy(test, "This;is.a:test:of=the/string\\tokenizer-function.");
-	for (word = strtok(test, sep); word; word = strtok(NULL, sep))
-		printf("Next word is \"%s\".\n", word);
-	strcpy(test, "This;is.a:test:of=the/string\\tokenizer-function.");
-
-	for (word = strtok_r(test, sep, &brkt); word;
-	    word = strtok_r(NULL, sep, &brkt)) {
-		strcpy(blah, "blah:blat:blab:blag");
-
-		for (phrase = strtok_r(blah, sep, &brkb); phrase;
-		    phrase = strtok_r(NULL, sep, &brkb))
-			printf("So far we're at %s:%s\n", word, phrase);
-	}
-
-	return (0);
-}
-
-#endif /* DEBUG_STRTOK */
diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
deleted file mode 100644
index 3ab7b72..0000000
--- a/lib/libc/string/strxfrm.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-#include "collate.h"
-
-size_t
-strxfrm(char * __restrict dest, const char * __restrict src, size_t len)
-{
-	int prim, sec, l;
-	size_t slen;
-	char *s, *ss;
-
-	if (!*src) {
-		if (len > 0)
-			*dest = '\0';
-		return 0;
-	}
-
-	if (__collate_load_error) {
-		slen = strlen(src);
-		if (len > 0) {
-			if (slen < len)
-				strcpy(dest, src);
-			else {
-				strncpy(dest, src, len - 1);
-				dest[len - 1] = '\0';
-			}
-		}
-		return slen;
-	}
-
-	slen = 0;
-	prim = sec = 0;
-	ss = s = __collate_substitute(src);
-	while (*s) {
-		while (*s && !prim) {
-			__collate_lookup(s, &l, &prim, &sec);
-			s += l;
-		}
-		if (prim) {
-			if (len > 1) {
-				*dest++ = (char)prim;
-				len--;
-			}
-			slen++;
-			prim = 0;
-		}
-	}
-	free(ss);
-	if (len > 0)
-		*dest = '\0';
-
-	return slen;
-}
diff --git a/lib/libc/string/swab.c b/lib/libc/string/swab.c
deleted file mode 100644
index 9877a08..0000000
--- a/lib/libc/string/swab.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jeffrey Mogul.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)swab.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.6 2004/12/10 15:24:40 trhodes Exp $");
-
-#include <unistd.h>
-
-void
-swab(const void * __restrict from, void * __restrict to, ssize_t len)
-{
-	unsigned long temp;
-	int n;
-	char *fp, *tp;
-
-	n = len >> 1;
-	fp = (char *)from;
-	tp = (char *)to;
-#define	STEP	temp = *fp++,*tp++ = *fp++,*tp++ = temp
-	/* round to multiple of 8 */
-	for (; n & 0x7; --n)
-		STEP;
-	for (n >>= 3; n > 0; --n) {
-		STEP; STEP; STEP; STEP;
-		STEP; STEP; STEP; STEP;
-	}
-}
diff --git a/lib/libc/string/wcscat.c b/lib/libc/string/wcscat.c
deleted file mode 100644
index cf7812f..0000000
--- a/lib/libc/string/wcscat.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcscat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcscat.c,v 1.8 2002/09/26 09:28:55 tjr Exp $");
-
-#include <wchar.h>
-
-wchar_t *
-wcscat(s1, s2)
-	wchar_t * __restrict s1;
-	const wchar_t * __restrict s2;
-{
-	wchar_t *cp;
-
-	cp = s1;
-	while (*cp != L'\0')
-		cp++;
-	while ((*cp++ = *s2++) != L'\0')
-		;
-
-	return (s1);
-}
diff --git a/lib/libc/string/wcschr.c b/lib/libc/string/wcschr.c
deleted file mode 100644
index 0fae132..0000000
--- a/lib/libc/string/wcschr.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/wcschr.c,v 1.7 2002/10/23 10:47:47 tjr Exp $");
-
-#include <wchar.h>
-
-wchar_t *
-wcschr(const wchar_t *s, wchar_t c)
-{
-
-	while (*s != c && *s != L'\0')
-		s++;
-	if (*s == c)
-		return ((wchar_t *)s);
-	return (NULL);
-}
diff --git a/lib/libc/string/wcscmp.c b/lib/libc/string/wcscmp.c
deleted file mode 100644
index 20152b2..0000000
--- a/lib/libc/string/wcscmp.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
-#if 0
-__RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD: src/lib/libc/string/wcscmp.c,v 1.7 2002/10/23 11:08:40 tjr Exp $");
-
-#include <wchar.h>
-
-/*
- * Compare strings.
- */
-int
-wcscmp(s1, s2)
-	const wchar_t *s1, *s2;
-{
-
-	while (*s1 == *s2++)
-		if (*s1++ == 0)
-			return (0);
-	/* XXX assumes wchar_t = int */
-	return (*(const unsigned int *)s1 - *(const unsigned int *)--s2);
-}
diff --git a/lib/libc/string/wcscoll.c b/lib/libc/string/wcscoll.c
deleted file mode 100644
index 5095158..0000000
--- a/lib/libc/string/wcscoll.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/wcscoll.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "collate.h"
-
-static char *__mbsdup(const wchar_t *);
-
-/*
- * Placeholder implementation of wcscoll(). Attempts to use the single-byte
- * collation ordering where possible, and falls back on wcscmp() in locales
- * with extended character sets.
- */
-int
-wcscoll(const wchar_t *ws1, const wchar_t *ws2)
-{
-	char *mbs1, *mbs2;
-	int diff, sverrno;
-
-	if (__collate_load_error || MB_CUR_MAX > 1)
-		/*
-		 * Locale has no special collating order, could not be
-		 * loaded, or has an extended character set; do a fast binary
-		 * comparison.
-		 */
-		return (wcscmp(ws1, ws2));
-
-	if ((mbs1 = __mbsdup(ws1)) == NULL || (mbs2 = __mbsdup(ws2)) == NULL) {
-		/*
-		 * Out of memory or illegal wide chars; fall back to wcscmp()
-		 * but leave errno indicating the error. Callers that don't
-		 * check for error will get a reasonable but often slightly
-		 * incorrect result.
-		 */
-		sverrno = errno;
-		free(mbs1);
-		errno = sverrno;
-		return (wcscmp(ws1, ws2));
-	}
-
-	diff = strcoll(mbs1, mbs2);
-	sverrno = errno;
-	free(mbs1);
-	free(mbs2);
-	errno = sverrno;
-
-	return (diff);
-}
-
-static char *
-__mbsdup(const wchar_t *ws)
-{
-	static const mbstate_t initial;
-	mbstate_t st;
-	const wchar_t *wcp;
-	size_t len;
-	char *mbs;
-
-	wcp = ws;
-	st = initial;
-	if ((len = wcsrtombs(NULL, &wcp, 0, &st)) == (size_t)-1)
-		return (NULL);
-	if ((mbs = malloc(len + 1)) == NULL)
-		return (NULL);
-	st = initial;
-	wcsrtombs(mbs, &ws, len + 1, &st);
-
-	return (mbs);
-}
diff --git a/lib/libc/string/wcscpy.c b/lib/libc/string/wcscpy.c
deleted file mode 100644
index b4c236a..0000000
--- a/lib/libc/string/wcscpy.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcscpy.c,v 1.2 2000/12/21 04:51:09 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcscpy.c,v 1.8 2002/09/26 09:23:07 tjr Exp $");
-
-#include <wchar.h>
-
-wchar_t *
-wcscpy(s1, s2)
-	wchar_t * __restrict s1;
-	const wchar_t * __restrict s2;
-{
-	wchar_t *cp;
-
-	cp = s1;
-	while ((*cp++ = *s2++) != L'\0')
-		;
-
-	return (s1);
-}
diff --git a/lib/libc/string/wcscspn.c b/lib/libc/string/wcscspn.c
deleted file mode 100644
index c16f270..0000000
--- a/lib/libc/string/wcscspn.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcscspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcscspn.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
-
-#include <wchar.h>
-
-size_t
-wcscspn(s, set)
-	const wchar_t *s;
-	const wchar_t *set;
-{
-	const wchar_t *p;
-	const wchar_t *q;
-
-	p = s;
-	while (*p) {
-		q = set;
-		while (*q) {
-			if (*p == *q)
-				goto done;
-			q++;
-		}
-		p++;
-	}
-
-done:
-	return (p - s);
-}
diff --git a/lib/libc/string/wcslcat.c b/lib/libc/string/wcslcat.c
deleted file mode 100644
index f3b9a63..0000000
--- a/lib/libc/string/wcslcat.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- *
- *	from OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcslcat.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
-
-#include <sys/types.h>
-#include <wchar.h>
-
-/*
- * Appends src to string dst of size siz (unlike wcsncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns wcslen(initial dst) + wcslen(src); if retval >= siz,
- * truncation occurred.
- */
-size_t
-wcslcat(dst, src, siz)
-	wchar_t *dst;
-	const wchar_t *src;
-	size_t siz;
-{
-	wchar_t *d = dst;
-	const wchar_t *s = src;
-	size_t n = siz;
-	size_t dlen;
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (*d != '\0' && n-- != 0)
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + wcslen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
-	}
-	*d = '\0';
-
-	return(dlen + (s - src));	/* count does not include NUL */
-}
diff --git a/lib/libc/string/wcslcpy.c b/lib/libc/string/wcslcpy.c
deleted file mode 100644
index 273c8fd..0000000
--- a/lib/libc/string/wcslcpy.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- *
- *	from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcslcpy.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
-
-#include <sys/types.h>
-#include <wchar.h>
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns wcslen(src); if retval >= siz, truncation occurred.
- */
-size_t
-wcslcpy(dst, src, siz)
-	wchar_t *dst;
-	const wchar_t *src;
-	size_t siz;
-{
-	wchar_t *d = dst;
-	const wchar_t *s = src;
-	size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
diff --git a/lib/libc/string/wcslen.c b/lib/libc/string/wcslen.c
deleted file mode 100644
index 5e462a1..0000000
--- a/lib/libc/string/wcslen.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcslen.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcslen.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
-
-#include <wchar.h>
-
-size_t
-wcslen(s)
-	const wchar_t *s;
-{
-	const wchar_t *p;
-
-	p = s;
-	while (*p)
-		p++;
-
-	return p - s;
-}
diff --git a/lib/libc/string/wcsncat.c b/lib/libc/string/wcsncat.c
deleted file mode 100644
index 5abb442..0000000
--- a/lib/libc/string/wcsncat.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcsncat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcsncat.c,v 1.7 2002/09/21 00:29:23 tjr Exp $");
-
-#include <wchar.h>
-
-wchar_t *
-wcsncat(s1, s2, n)
-	wchar_t * __restrict s1;
-	const wchar_t * __restrict s2;
-	size_t n;
-{
-	wchar_t *p;
-	wchar_t *q;
-	const wchar_t *r;
-
-	p = s1;
-	while (*p)
-		p++;
-	q = p;
-	r = s2;
-	while (*r && n) {
-		*q++ = *r++;
-		n--;
-	}
-	*q = '\0';
-	return s1;
-}
diff --git a/lib/libc/string/wcsncmp.c b/lib/libc/string/wcsncmp.c
deleted file mode 100644
index 7043e06..0000000
--- a/lib/libc/string/wcsncmp.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
-__RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcsncmp.c,v 1.7 2002/10/23 11:08:40 tjr Exp $");
-
-#include <wchar.h>
-
-int
-wcsncmp(s1, s2, n)
-	const wchar_t *s1, *s2;
-	size_t n;
-{
-
-	if (n == 0)
-		return (0);
-	do {
-		if (*s1 != *s2++) {
-			/* XXX assumes wchar_t = int */
-			return (*(const unsigned int *)s1 -
-			    *(const unsigned int *)--s2);
-		}
-		if (*s1++ == 0)
-			break;
-	} while (--n != 0);
-	return (0);
-}
diff --git a/lib/libc/string/wcsncpy.c b/lib/libc/string/wcsncpy.c
deleted file mode 100644
index fb9cef0..0000000
--- a/lib/libc/string/wcsncpy.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/wcsncpy.c,v 1.9 2002/10/24 02:48:45 tjr Exp $");
-
-#include <wchar.h>
-
-/*
- * Copy src to dst, truncating or null-padding to always copy n bytes.
- * Return dst.
- */
-wchar_t *
-wcsncpy(wchar_t * __restrict dst, const wchar_t * __restrict src, size_t n)
-{
-	if (n != 0) {
-		wchar_t *d = dst;
-		const wchar_t *s = src;
-
-		do {
-			if ((*d++ = *s++) == L'\0') {
-				/* NUL pad the remaining n-1 bytes */
-				while (--n != 0)
-					*d++ = L'\0';
-				break;
-			}
-		} while (--n != 0);
-	}
-	return (dst);
-}
diff --git a/lib/libc/string/wcspbrk.c b/lib/libc/string/wcspbrk.c
deleted file mode 100644
index 5502440..0000000
--- a/lib/libc/string/wcspbrk.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcspbrk.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcspbrk.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
-
-#include <wchar.h>
-
-wchar_t *
-wcspbrk(s, set)
-	const wchar_t *s;
-	const wchar_t *set;
-{
-	const wchar_t *p;
-	const wchar_t *q;
-
-	p = s;
-	while (*p) {
-		q = set;
-		while (*q) {
-			if (*p == *q) {
-				/* LINTED interface specification */
-				return (wchar_t *)p;
-			}
-			q++;
-		}
-		p++;
-	}
-	return NULL;
-}
diff --git a/lib/libc/string/wcsrchr.c b/lib/libc/string/wcsrchr.c
deleted file mode 100644
index 093dd08..0000000
--- a/lib/libc/string/wcsrchr.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/wcsrchr.c,v 1.7 2002/10/23 10:52:04 tjr Exp $");
-
-#include <wchar.h>
-
-wchar_t *
-wcsrchr(const wchar_t *s, wchar_t c)
-{
-	const wchar_t *last;
-
-	last = NULL;
-	for (;;) {
-		if (*s == c)
-			last = s;
-		if (*s == L'\0')
-			break;
-		s++;
-	}
-
-	return ((wchar_t *)last);
-}
diff --git a/lib/libc/string/wcsspn.c b/lib/libc/string/wcsspn.c
deleted file mode 100644
index d4101c7..0000000
--- a/lib/libc/string/wcsspn.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcsspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcsspn.c,v 1.7 2002/09/21 00:29:23 tjr Exp $");
-
-#include <wchar.h>
-
-size_t
-wcsspn(s, set)
-	const wchar_t *s;
-	const wchar_t *set;
-{
-	const wchar_t *p;
-	const wchar_t *q;
-
-	p = s;
-	while (*p) {
-		q = set;
-		while (*q) {
-			if (*p == *q)
-				break;
-			q++;
-		}
-		if (!*q)
-			goto done;
-		p++;
-	}
-
-done:
-	return (p - s);
-}
diff --git a/lib/libc/string/wcsstr.c b/lib/libc/string/wcsstr.c
deleted file mode 100644
index 0533e59..0000000
--- a/lib/libc/string/wcsstr.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/wcsstr.c,v 1.8 2002/10/24 02:53:45 tjr Exp $");
-
-#include <wchar.h>
-
-/*
- * Find the first occurrence of find in s.
- */
-wchar_t *
-wcsstr(const wchar_t * __restrict s, const wchar_t * __restrict find)
-{
-	wchar_t c, sc;
-	size_t len;
-
-	if ((c = *find++) != 0) {
-		len = wcslen(find);
-		do {
-			do {
-				if ((sc = *s++) == L'\0')
-					return (NULL);
-			} while (sc != c);
-		} while (wcsncmp(s, find, len) != 0);
-		s--;
-	}
-	return ((wchar_t *)s);
-}
diff --git a/lib/libc/string/wcstok.c b/lib/libc/string/wcstok.c
deleted file mode 100644
index 5781adb..0000000
--- a/lib/libc/string/wcstok.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
- *
- * strtok_r, from Berkeley strtok
- * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
- *
- * Copyright (c) 1988, 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
- *    notices, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notices, 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 Softweyr LLC, 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/wcstok.c,v 1.2 2003/03/12 06:41:49 tjr Exp $");
-
-#include <wchar.h>
-
-wchar_t *
-wcstok(wchar_t * __restrict s, const wchar_t * __restrict delim,
-    wchar_t ** __restrict last)
-{
-	const wchar_t *spanp;
-	wchar_t *tok;
-	wchar_t c, sc;
-
-	if (s == NULL && (s = *last) == NULL)
-		return (NULL);
-
-	/*
-	 * Skip (span) leading delimiters (s += wcsspn(s, delim), sort of).
-	 */
-cont:
-	c = *s++;
-	for (spanp = delim; (sc = *spanp++) != L'\0';) {
-		if (c == sc)
-			goto cont;
-	}
-
-	if (c == L'\0') {	/* no non-delimiter characters */
-		*last = NULL;
-		return (NULL);
-	}
-	tok = s - 1;
-
-	/*
-	 * Scan token (scan for delimiters: s += wcscspn(s, delim), sort of).
-	 * Note that delim must have one NUL; we stop if we see that, too.
-	 */
-	for (;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == L'\0')
-					s = NULL;
-				else
-					s[-1] = L'\0';
-				*last = s;
-				return (tok);
-			}
-		} while (sc != L'\0');
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc/string/wcswidth.c b/lib/libc/string/wcswidth.c
deleted file mode 100644
index 98a095d..0000000
--- a/lib/libc/string/wcswidth.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/wcswidth.c,v 1.6 2002/08/20 02:06:28 ache Exp $");
-
-#include <wchar.h>
-
-int
-wcswidth(const wchar_t *pwcs, size_t n)
-{
-	wchar_t wc;
-	int len, l;
-
-	len = 0;
-	while (n-- > 0 && (wc = *pwcs++) != L'\0') {
-		if ((l = wcwidth(wc)) < 0)
-			return (-1);
-		len += l;
-	}
-	return (len);
-}
-
diff --git a/lib/libc/string/wcsxfrm.c b/lib/libc/string/wcsxfrm.c
deleted file mode 100644
index 7aea3d1..0000000
--- a/lib/libc/string/wcsxfrm.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wcsxfrm.c,v 1.3 2004/04/07 09:47:56 tjr Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "collate.h"
-
-static char *__mbsdup(const wchar_t *);
-
-/*
- * Placeholder wcsxfrm() implementation. See wcscoll.c for a description of
- * the logic used.
- */
-size_t
-wcsxfrm(wchar_t * __restrict dest, const wchar_t * __restrict src, size_t len)
-{
-	int prim, sec, l;
-	size_t slen;
-	char *mbsrc, *s, *ss;
-
-	if (*src == L'\0') {
-		if (len != 0)
-			*dest = L'\0';
-		return (0);
-	}
-
-	if (__collate_load_error || MB_CUR_MAX > 1) {
-		slen = wcslen(src);
-		if (len > 0) {
-			if (slen < len)
-				wcscpy(dest, src);
-			else {
-				wcsncpy(dest, src, len - 1);
-				dest[len - 1] = L'\0';
-			}
-		}
-		return (slen);
-	}
-
-	mbsrc = __mbsdup(src);
-	slen = 0;
-	prim = sec = 0;
-	ss = s = __collate_substitute(mbsrc);
-	while (*s != '\0') {
-		while (*s != '\0' && prim == 0) {
-			__collate_lookup(s, &l, &prim, &sec);
-			s += l;
-		}
-		if (prim != 0) {
-			if (len > 1) {
-				*dest++ = (wchar_t)prim;
-				len--;
-			}
-			slen++;
-			prim = 0;
-		}
-	}
-	free(ss);
-	free(mbsrc);
-	if (len != 0)
-		*dest = L'\0';
-
-	return (slen);
-}
-
-static char *
-__mbsdup(const wchar_t *ws)
-{
-	static const mbstate_t initial;
-	mbstate_t st;
-	const wchar_t *wcp;
-	size_t len;
-	char *mbs;
-
-	wcp = ws;
-	st = initial;
-	if ((len = wcsrtombs(NULL, &wcp, 0, &st)) == (size_t)-1)
-		return (NULL);
-	if ((mbs = malloc(len + 1)) == NULL)
-		return (NULL);
-	st = initial;
-	wcsrtombs(mbs, &ws, len + 1, &st);
-
-	return (mbs);
-}
diff --git a/lib/libc/string/wmemchr.c b/lib/libc/string/wmemchr.c
deleted file mode 100644
index 0b09f94..0000000
--- a/lib/libc/string/wmemchr.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemchr.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wmemchr.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
-
-#include <wchar.h>
-
-wchar_t	*
-wmemchr(s, c, n)
-	const wchar_t *s;
-	wchar_t c;
-	size_t n;
-{
-	size_t i;
-
-	for (i = 0; i < n; i++) {
-		if (*s == c) {
-			/* LINTED const castaway */
-			return (wchar_t *)s;
-		}
-		s++;
-	}
-	return NULL;
-}
diff --git a/lib/libc/string/wmemcmp.c b/lib/libc/string/wmemcmp.c
deleted file mode 100644
index 3014041..0000000
--- a/lib/libc/string/wmemcmp.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemcmp.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wmemcmp.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
-
-#include <wchar.h>
-
-int
-wmemcmp(s1, s2, n)
-	const wchar_t *s1;
-	const wchar_t *s2;
-	size_t n;
-{
-	size_t i;
-
-	for (i = 0; i < n; i++) {
-		if (*s1 != *s2) {
-			/* wchar might be unsigned */
-			return *s1 > *s2 ? 1 : -1; 
-		}
-		s1++;
-		s2++;
-	}
-	return 0;
-}
diff --git a/lib/libc/string/wmemcpy.c b/lib/libc/string/wmemcpy.c
deleted file mode 100644
index 4391309..0000000
--- a/lib/libc/string/wmemcpy.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemcpy.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wmemcpy.c,v 1.7 2002/09/21 00:29:23 tjr Exp $");
-
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-wmemcpy(d, s, n)
-	wchar_t * __restrict d;
-	const wchar_t * __restrict s;
-	size_t n;
-{
-
-	return (wchar_t *)memcpy(d, s, n * sizeof(wchar_t));
-}
diff --git a/lib/libc/string/wmemmove.c b/lib/libc/string/wmemmove.c
deleted file mode 100644
index dd2036c..0000000
--- a/lib/libc/string/wmemmove.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemmove.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wmemmove.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
-
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-wmemmove(d, s, n)
-	wchar_t *d;
-	const wchar_t *s;
-	size_t n;
-{
-
-	return (wchar_t *)memmove(d, s, n * sizeof(wchar_t));
-}
diff --git a/lib/libc/string/wmemset.c b/lib/libc/string/wmemset.c
deleted file mode 100644
index df91537..0000000
--- a/lib/libc/string/wmemset.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemset.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: src/lib/libc/string/wmemset.c,v 1.6 2002/09/21 00:29:23 tjr Exp $");
-
-#include <wchar.h>
-
-wchar_t	*
-wmemset(s, c, n)
-	wchar_t *s;
-	wchar_t c;
-	size_t n;
-{
-	size_t i;
-	wchar_t *p;
-
-	p = (wchar_t *)s;
-	for (i = 0; i < n; i++) {
-		*p = c;
-		p++;
-	}
-	return s;
-}
diff --git a/lib/libc/sys/Makefile b/lib/libc/sys/Makefile
deleted file mode 100644
index 5d608a8..0000000
--- a/lib/libc/sys/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Objects
-OBJS = __error.o ftruncate.o lseek.o mmap.o pread.o pwrite.o truncate.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/sys/__error.c b/lib/libc/sys/__error.c
deleted file mode 100644
index 4219db2..0000000
--- a/lib/libc/sys/__error.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/sys/__error.c,v 1.4 2002/03/22 21:53:24 obrien Exp $");
-
-extern int errno;
-
-/*
- * Declare a weak reference in case the application is not linked
- * with libpthread.
- */
-__weak_reference(__error_unthreaded, __error);
-
-int *
-__error_unthreaded()
-{
-	return(&errno);
-}
diff --git a/lib/libc/sys/ftruncate.c b/lib/libc/sys/ftruncate.c
deleted file mode 100644
index ac6f58e..0000000
--- a/lib/libc/sys/ftruncate.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ftruncate.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/sys/ftruncate.c,v 1.5 2002/03/22 21:53:24 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-int
-ftruncate(fd, length)
-	int	fd;
-	off_t	length;
-{
-
-	return(__syscall((quad_t)SYS_ftruncate, fd, 0, length));
-}
diff --git a/lib/libc/sys/lseek.c b/lib/libc/sys/lseek.c
deleted file mode 100644
index 161abfe..0000000
--- a/lib/libc/sys/lseek.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lseek.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/sys/lseek.c,v 1.5 2002/03/22 21:53:24 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-off_t
-lseek(fd, offset, whence)
-	int	fd;
-	off_t	offset;
-	int	whence;
-{
-	return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence));
-}
diff --git a/lib/libc/sys/mmap.c b/lib/libc/sys/mmap.c
deleted file mode 100644
index 00d5e2a..0000000
--- a/lib/libc/sys/mmap.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/sys/mmap.c,v 1.5 2002/12/22 03:20:16 jmallett Exp $");
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-void *
-mmap(addr, len, prot, flags, fd, offset)
-	void *	addr;
-	size_t	len;
-	int	prot;
-	int	flags;
-	int	fd;
-	off_t	offset;
-{
-
-	return ((void *)(intptr_t)__syscall((quad_t)SYS_mmap, addr, len, prot,
-	    flags, fd, 0, offset));
-}
diff --git a/lib/libc/sys/pread.c b/lib/libc/sys/pread.c
deleted file mode 100644
index db10601..0000000
--- a/lib/libc/sys/pread.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/sys/pread.c,v 1.2 2002/03/22 21:53:24 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-pread(fd, buf, nbyte, offset)
-	int	fd;
-	void   *buf;
-	size_t	nbyte;
-	off_t	offset;
-{
-	return ((ssize_t)__syscall((quad_t)SYS_pread, fd, buf, nbyte, 0, offset));
-}
diff --git a/lib/libc/sys/pwrite.c b/lib/libc/sys/pwrite.c
deleted file mode 100644
index dc1b060..0000000
--- a/lib/libc/sys/pwrite.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/sys/pwrite.c,v 1.2 2002/03/22 21:53:24 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-pwrite(fd, buf, nbyte, offset)
-	int	fd;
-	const void *buf;
-	size_t	nbyte;
-	off_t	offset;
-{
-	return ((ssize_t)__syscall((quad_t)SYS_pwrite, fd, buf, nbyte, 0, offset));
-}
diff --git a/lib/libc/sys/truncate.c b/lib/libc/sys/truncate.c
deleted file mode 100644
index fe8ad8a..0000000
--- a/lib/libc/sys/truncate.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)truncate.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/sys/truncate.c,v 1.3 2002/03/22 21:53:24 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-
-#include <unistd.h>
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-int
-truncate(path, length)
-	const char	*path;
-	off_t	length;
-{
-
-	return(__syscall((quad_t)SYS_truncate, path, 0, length));
-}
diff --git a/lib/libc/uthread/Makefile b/lib/libc/uthread/Makefile
deleted file mode 100644
index 5f38ddd..0000000
--- a/lib/libc/uthread/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../locale/ -I.
-
-#Objects
-OBJS = uthread_accept.o uthread_acl_aclcheck_fd.o uthread_acl_delete_fd.o uthread_acl_get_fd.o uthread_acl_set_fd.o uthread_aio_suspend.o uthread_atfork.o uthread_attr_destroy.o uthread_attr_get_np.o uthread_attr_getdetachstate.o uthread_attr_getguardsize.o uthread_attr_getinheritsched.o uthread_attr_getschedparam.o uthread_attr_getschedpolicy.o uthread_attr_getscope.o uthread_attr_getstack.o uthread_attr_getstackaddr.o uthread_attr_getstacksize.o uthread_attr_init.o uthread_attr_setcreatesuspend_np.o uthread_attr_setdetachstate.o uthread_attr_setguardsize.o uthread_attr_setinheritsched.o uthread_attr_setschedparam.o uthread_attr_setschedpolicy.o uthread_attr_setscope.o uthread_attr_setstack.o uthread_attr_setstackaddr.o uthread_attr_setstacksize.o uthread_autoinit.o uthread_bind.o uthread_cancel.o uthread_clean.o uthread_close.o uthread_concurrency.o uthread_cond.o uthread_condattr_destroy.o uthread_condattr_init.o uthread_connect.o uthread_creat.o uthread_create.o uthread_detach.o uthread_dup.o uthread_dup2.o uthread_equal.o uthread_execve.o uthread_exit.o uthread_fchflags.o uthread_fchmod.o uthread_fchown.o uthread_fcntl.o uthread_fd.o uthread_file.o uthread_find_thread.o uthread_flock.o uthread_fork.o uthread_fpathconf.o uthread_fstat.o uthread_fstatfs.o uthread_fsync.o uthread_gc.o uthread_getdirentries.o uthread_getpeername.o uthread_getprio.o uthread_getschedparam.o uthread_getsockname.o uthread_getsockopt.o uthread_info.o uthread_init.o uthread_ioctl.o uthread_jmp.o uthread_join.o uthread_kern.o uthread_kevent.o uthread_kill.o uthread_kqueue.o uthread_listen.o uthread_main_np.o uthread_mattr_init.o uthread_mattr_kind_np.o uthread_msync.o uthread_multi_np.o uthread_mutex.o uthread_mutex_prioceiling.o uthread_mutex_protocol.o uthread_mutexattr_destroy.o uthread_nanosleep.o uthread_once.o uthread_open.o uthread_pause.o uthread_pipe.o uthread_poll.o uthread_priority_queue.o uthread_pselect.o uthread_read.o uthread_readv.o uthread_recvfrom.o uthread_recvmsg.o uthread_resume_np.o uthread_rwlock.o uthread_rwlockattr.o uthread_select.o uthread_self.o uthread_sem.o uthread_sendfile.o uthread_sendmsg.o uthread_sendto.o uthread_seterrno.o uthread_setprio.o uthread_setschedparam.o uthread_setsockopt.o uthread_shutdown.o uthread_sig.o uthread_sigaction.o uthread_sigmask.o uthread_sigpending.o uthread_sigprocmask.o uthread_sigsuspend.o uthread_sigwait.o uthread_single_np.o uthread_sleep.o uthread_socket.o uthread_socketpair.o uthread_spec.o uthread_spinlock.o uthread_stack.o uthread_suspend_np.o uthread_switch_np.o uthread_system.o uthread_tcdrain.o uthread_vfork.o uthread_wait.o uthread_wait4.o uthread_waitpid.o uthread_write.o uthread_writev.o uthread_yield.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/uthread/pthread_private.h b/lib/libc/uthread/pthread_private.h
deleted file mode 100644
index 5ea9c61..0000000
--- a/lib/libc/uthread/pthread_private.h
+++ /dev/null
@@ -1,1414 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- *
- * Private thread definitions for the uthread kernel.
- *
- * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.87 2005/05/31 19:57:23 jhb Exp $
- */
-
-#ifndef _PTHREAD_PRIVATE_H
-#define _PTHREAD_PRIVATE_H
-
-/*
- * Evaluate the storage class specifier.
- */
-#ifdef GLOBAL_PTHREAD_PRIVATE
-#define SCLASS
-#else
-#define SCLASS extern
-#endif
-
-/*
- * Include files.
- */
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/cdefs.h>
-#include <sched.h>
-#include <spinlock.h>
-#include <ucontext.h>
-#include <pthread_np.h>
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-#include <vm/vm_map.h>
-
-/*
- * Define machine dependent macros to get and set the stack pointer
- * from the supported contexts.  Also define a macro to set the return
- * address in a jmp_buf context.
- *
- * XXX - These need to be moved into architecture dependent support files.
- * XXX - These need to be documented so porters know what's required.
- */
-#if	defined(__i386__)
-#define	GET_STACK_JB(jb)	((unsigned long)((jb)[0]._jb[2]))
-#define	GET_STACK_SJB(sjb)	((unsigned long)((sjb)[0]._sjb[2]))
-#define	GET_STACK_UC(ucp)	((unsigned long)((ucp)->uc_mcontext.mc_esp))
-#define	SET_STACK_JB(jb, stk)	(jb)[0]._jb[2] = (int)(stk)
-#define	SET_STACK_SJB(sjb, stk)	(sjb)[0]._sjb[2] = (int)(stk)
-#define	SET_STACK_UC(ucp, stk)	(ucp)->uc_mcontext.mc_esp = (int)(stk)
-#define	FP_SAVE_UC(ucp)		do {			\
-	char	*fdata;					\
-	fdata = (char *) (ucp)->uc_mcontext.mc_fpstate;	\
-	__asm__("fnsave %0": :"m"(*fdata));		\
-} while (0)
-#define	FP_RESTORE_UC(ucp)	do {			\
-	char	*fdata;					\
-	fdata = (char *) (ucp)->uc_mcontext.mc_fpstate;	\
-	__asm__("frstor %0": :"m"(*fdata));		\
-} while (0)
-#define	SET_RETURN_ADDR_JB(jb, ra)	do {		\
-	(jb)[0]._jb[0] = (int)(ra);			\
-	(jb)[0]._jb[3] = 0;				\
-} while (0)
-#elif	defined(__amd64__)
-#define	GET_STACK_JB(jb)	((unsigned long)((jb)[0]._jb[2]))
-#define	GET_STACK_SJB(sjb)	((unsigned long)((sjb)[0]._sjb[2]))
-#define	GET_STACK_UC(ucp)	((unsigned long)((ucp)->uc_mcontext.mc_rsp))
-#define	SET_STACK_JB(jb, stk)	(jb)[0]._jb[2] = (long)(stk)
-#define	SET_STACK_SJB(sjb, stk)	(sjb)[0]._sjb[2] = (long)(stk)
-#define	SET_STACK_UC(ucp, stk)	(ucp)->uc_mcontext.mc_rsp = (long)(stk)
-#define	FP_SAVE_UC(ucp)		do {			\
-	char	*fdata;					\
-	fdata = (char *) (ucp)->uc_mcontext.mc_fpstate;	\
-	__asm__("fxsave %0": :"m"(*fdata));		\
-} while (0)
-#define	FP_RESTORE_UC(ucp)	do {			\
-	char	*fdata;					\
-	fdata = (char *) (ucp)->uc_mcontext.mc_fpstate;	\
-	__asm__("fxrstor %0": :"m"(*fdata));		\
-} while (0)
-#define SET_RETURN_ADDR_JB(jb, ra)	(jb)[0]._jb[0] = (long)(ra)
-#elif	defined(__alpha__)
-#include <machine/reg.h>
-#define	GET_STACK_JB(jb)	((unsigned long)((jb)[0]._jb[R_SP + 4]))
-#define	GET_STACK_SJB(sjb)	((unsigned long)((sjb)[0]._sjb[R_SP + 4]))
-#define	GET_STACK_UC(ucp)	((ucp)->uc_mcontext.mc_regs[R_SP])
-#define	SET_STACK_JB(jb, stk)	(jb)[0]._jb[R_SP + 4] = (long)(stk)
-#define	SET_STACK_SJB(sjb, stk)	(sjb)[0]._sjb[R_SP + 4] = (long)(stk)
-#define	SET_STACK_UC(ucp, stk)	(ucp)->uc_mcontext.mc_regs[R_SP] = (unsigned long)(stk)
-#define	FP_SAVE_UC(ucp)
-#define	FP_RESTORE_UC(ucp)
-#define SET_RETURN_ADDR_JB(jb, ra) do {			\
-	(jb)[0]._jb[2] = (long)(ra);			\
-	(jb)[0]._jb[R_RA + 4] = (long)(ra);		\
-	(jb)[0]._jb[R_T12 + 4] = (long)(ra);		\
-} while (0)
-#elif defined(__ia64__)
-#define	GET_BSP_JB(jb)		(*((unsigned long*)JMPBUF_ADDR_OF(jb,J_BSP)))
-#define	GET_STACK_JB(jb)	(*((unsigned long*)JMPBUF_ADDR_OF(jb,J_SP)))
-#define	GET_STACK_SJB(sjb)	GET_STACK_JB(sjb)
-#define	SET_RETURN_ADDR_JB(jb, ra)			\
-do {							\
-	*((unsigned long*)JMPBUF_ADDR_OF(jb,J_B0)) = ((long*)(ra))[0];	\
-	*((unsigned long*)JMPBUF_ADDR_OF(jb,J_GP)) = ((long*)(ra))[1];	\
-	*((unsigned long*)JMPBUF_ADDR_OF(jb,J_PFS)) &= ~0x1FFFFFFFFFUL;	\
-} while (0)
-#define SET_STACK_JB(jb, stk, sz)			\
-do {							\
-	UPD_STACK_JB(jb, stk + sz - 16);		\
-	GET_BSP_JB(jb) = (long)(stk);			\
-} while (0)
-#define UPD_STACK_JB(jb, stk)	GET_STACK_JB(jb) = (long)(stk)
-#elif	defined(__sparc64__)
-#include <machine/frame.h>
-
-#define	CCFSZ	sizeof (struct frame)
-
-#define	GET_STACK_JB(jb)				\
-	((unsigned long)((jb)[0]._jb[_JB_SP]) + SPOFF)
-#define	GET_STACK_SJB(sjb)				\
-	((unsigned long)((sjb)[0]._sjb[_JB_SP]) + SPOFF)
-#define	GET_STACK_UC(ucp)				\
-	((ucp)->uc_mcontext.mc_sp + SPOFF)
-/*
- * XXX: sparc64 _longjmp() expects a register window on the stack
- * at the given position, so we must make sure that the space where
- * it is expected is readable. Subtracting the frame size here works
- * because the SET_STACK macros are only used to set up new stacks
- * or signal stacks, but it is a bit dirty.
- */
-#define	SET_STACK_JB(jb, stk)				\
-	(jb)[0]._jb[_JB_SP] = (long)(stk) - SPOFF - CCFSZ
-#define	SET_STACK_SJB(sjb, stk)				\
-	(sjb)[0]._sjb[_JB_SP] = (long)(stk) - SPOFF - CCFSZ
-#define	SET_STACK_UC(ucp, stk)				\
-	(ucp)->uc_mcontext.mc_sp = (unsigned long)(stk) - SPOFF - CCFSZ
-#define	FP_SAVE_UC(ucp)		/* XXX */
-#define	FP_RESTORE_UC(ucp)	/* XXX */
-#define	SET_RETURN_ADDR_JB(jb, ra)			\
-	(jb)[0]._jb[_JB_PC] = (long)(ra) - 8
-#else
-#error "Don't recognize this architecture!"
-#endif
-
-/*
- * Kernel fatal error handler macro.
- */
-#define PANIC(string)   _thread_exit(__FILE__,__LINE__,string)
-
-
-/* Output debug messages like this: */
-#define stdout_debug(args...)	do {		\
-	char buf[128];				\
-	snprintf(buf, sizeof(buf), ##args);	\
-	__sys_write(1, buf, strlen(buf));	\
-} while (0)
-#define stderr_debug(args...)	do {		\
-	char buf[128];				\
-	snprintf(buf, sizeof(buf), ##args);	\
-	__sys_write(2, buf, strlen(buf));	\
-} while (0)
-
-
-
-/*
- * Priority queue manipulation macros (using pqe link):
- */
-#define PTHREAD_PRIOQ_INSERT_HEAD(thrd)	_pq_insert_head(&_readyq,thrd)
-#define PTHREAD_PRIOQ_INSERT_TAIL(thrd)	_pq_insert_tail(&_readyq,thrd)
-#define PTHREAD_PRIOQ_REMOVE(thrd)	_pq_remove(&_readyq,thrd)
-#define PTHREAD_PRIOQ_FIRST()		_pq_first(&_readyq)
-
-/*
- * Waiting queue manipulation macros (using pqe link):
- */
-#define PTHREAD_WAITQ_REMOVE(thrd)	_waitq_remove(thrd)
-#define PTHREAD_WAITQ_INSERT(thrd)	_waitq_insert(thrd)
-
-#if defined(_PTHREADS_INVARIANTS)
-#define PTHREAD_WAITQ_CLEARACTIVE()	_waitq_clearactive()
-#define PTHREAD_WAITQ_SETACTIVE()	_waitq_setactive()
-#else
-#define PTHREAD_WAITQ_CLEARACTIVE()
-#define PTHREAD_WAITQ_SETACTIVE()
-#endif
-
-/*
- * Work queue manipulation macros (using qe link):
- */
-#define PTHREAD_WORKQ_INSERT(thrd) do {					\
-	TAILQ_INSERT_TAIL(&_workq,thrd,qe);				\
-	(thrd)->flags |= PTHREAD_FLAGS_IN_WORKQ;			\
-} while (0)
-#define PTHREAD_WORKQ_REMOVE(thrd) do {					\
-	TAILQ_REMOVE(&_workq,thrd,qe);					\
-	(thrd)->flags &= ~PTHREAD_FLAGS_IN_WORKQ;			\
-} while (0)
-
-
-/*
- * State change macro without scheduling queue change:
- */
-#define PTHREAD_SET_STATE(thrd, newstate) do {				\
-	(thrd)->state = newstate;					\
-	(thrd)->fname = __FILE__;					\
-	(thrd)->lineno = __LINE__;					\
-} while (0)
-
-/*
- * State change macro with scheduling queue change - This must be
- * called with preemption deferred (see thread_kern_sched_[un]defer).
- */
-#if defined(_PTHREADS_INVARIANTS)
-#include <assert.h>
-#define PTHREAD_ASSERT(cond, msg) do {	\
-	if (!(cond))			\
-		PANIC(msg);		\
-} while (0)
-#define PTHREAD_ASSERT_NOT_IN_SYNCQ(thrd) \
-	PTHREAD_ASSERT((((thrd)->flags & PTHREAD_FLAGS_IN_SYNCQ) == 0),	\
-	    "Illegal call from signal handler");
-#define PTHREAD_NEW_STATE(thrd, newstate) do {				\
-	if (_thread_kern_new_state != 0)				\
-		PANIC("Recursive PTHREAD_NEW_STATE");			\
-	_thread_kern_new_state = 1;					\
-	if ((thrd)->state != newstate) {				\
-		if ((thrd)->state == PS_RUNNING) {			\
-			PTHREAD_PRIOQ_REMOVE(thrd);			\
-			PTHREAD_SET_STATE(thrd, newstate);		\
-			PTHREAD_WAITQ_INSERT(thrd);			\
-		} else if (newstate == PS_RUNNING) { 			\
-			PTHREAD_WAITQ_REMOVE(thrd);			\
-			PTHREAD_SET_STATE(thrd, newstate);		\
-			PTHREAD_PRIOQ_INSERT_TAIL(thrd);		\
-		}							\
-	}								\
-	_thread_kern_new_state = 0;					\
-} while (0)
-#else
-#define PTHREAD_ASSERT(cond, msg)
-#define PTHREAD_ASSERT_NOT_IN_SYNCQ(thrd)
-#define PTHREAD_NEW_STATE(thrd, newstate) do {				\
-	if ((thrd)->state != newstate) {				\
-		if ((thrd)->state == PS_RUNNING) {			\
-			PTHREAD_PRIOQ_REMOVE(thrd);			\
-			PTHREAD_WAITQ_INSERT(thrd);			\
-		} else if (newstate == PS_RUNNING) { 			\
-			PTHREAD_WAITQ_REMOVE(thrd);			\
-			PTHREAD_PRIOQ_INSERT_TAIL(thrd);		\
-		}							\
-	}								\
-	PTHREAD_SET_STATE(thrd, newstate);				\
-} while (0)
-#endif
-
-/*
- * Define the signals to be used for scheduling.
- */
-#if defined(_PTHREADS_COMPAT_SCHED)
-#define _ITIMER_SCHED_TIMER	ITIMER_VIRTUAL
-#define _SCHED_SIGNAL		SIGVTALRM
-#else
-#define _ITIMER_SCHED_TIMER	ITIMER_PROF
-#define _SCHED_SIGNAL		SIGPROF
-#endif
-
-/*
- * Priority queues.
- *
- * XXX It'd be nice if these were contained in uthread_priority_queue.[ch].
- */
-typedef struct pq_list {
-	TAILQ_HEAD(, pthread)	pl_head; /* list of threads at this priority */
-	TAILQ_ENTRY(pq_list)	pl_link; /* link for queue of priority lists */
-	int			pl_prio; /* the priority of this list */
-	int			pl_queued; /* is this in the priority queue */
-} pq_list_t;
-
-typedef struct pq_queue {
-	TAILQ_HEAD(, pq_list)	 pq_queue; /* queue of priority lists */
-	pq_list_t		*pq_lists; /* array of all priority lists */
-	int			 pq_size;  /* number of priority lists */
-} pq_queue_t;
-
-
-/*
- * TailQ initialization values.
- */
-#define TAILQ_INITIALIZER	{ NULL, NULL }
-
-/* 
- * Mutex definitions.
- */
-union pthread_mutex_data {
-	void	*m_ptr;
-	int	m_count;
-};
-
-struct pthread_mutex {
-	enum pthread_mutextype		m_type;
-	int				m_protocol;
-	TAILQ_HEAD(mutex_head, pthread)	m_queue;
-	struct pthread			*m_owner;
-	union pthread_mutex_data	m_data;
-	long				m_flags;
-	int				m_refcount;
-
-	/*
-	 * Used for priority inheritence and protection.
-	 *
-	 *   m_prio       - For priority inheritence, the highest active
-	 *                  priority (threads locking the mutex inherit
-	 *                  this priority).  For priority protection, the
-	 *                  ceiling priority of this mutex.
-	 *   m_saved_prio - mutex owners inherited priority before
-	 *                  taking the mutex, restored when the owner
-	 *                  unlocks the mutex.
-	 */
-	int				m_prio;
-	int				m_saved_prio;
-
-	/*
-	 * Link for list of all mutexes a thread currently owns.
-	 */
-	TAILQ_ENTRY(pthread_mutex)	m_qe;
-
-	/*
-	 * Lock for accesses to this structure.
-	 */
-	spinlock_t			lock;
-};
-
-/*
- * Flags for mutexes. 
- */
-#define MUTEX_FLAGS_PRIVATE	0x01
-#define MUTEX_FLAGS_INITED	0x02
-#define MUTEX_FLAGS_BUSY	0x04
-
-/*
- * Static mutex initialization values. 
- */
-#define PTHREAD_MUTEX_STATIC_INITIALIZER   \
-	{ PTHREAD_MUTEX_DEFAULT, PTHREAD_PRIO_NONE, TAILQ_INITIALIZER, \
-	NULL, { NULL }, MUTEX_FLAGS_PRIVATE, 0, 0, 0, TAILQ_INITIALIZER, \
-	_SPINLOCK_INITIALIZER }
-
-struct pthread_mutex_attr {
-	enum pthread_mutextype	m_type;
-	int			m_protocol;
-	int			m_ceiling;
-	long			m_flags;
-};
-
-#define PTHREAD_MUTEXATTR_STATIC_INITIALIZER \
-	{ PTHREAD_MUTEX_DEFAULT, PTHREAD_PRIO_NONE, 0, MUTEX_FLAGS_PRIVATE }
-
-/* 
- * Condition variable definitions.
- */
-enum pthread_cond_type {
-	COND_TYPE_FAST,
-	COND_TYPE_MAX
-};
-
-struct pthread_cond {
-	enum pthread_cond_type		c_type;
-	TAILQ_HEAD(cond_head, pthread)	c_queue;
-	pthread_mutex_t			c_mutex;
-	void				*c_data;
-	long				c_flags;
-	int				c_seqno;
-
-	/*
-	 * Lock for accesses to this structure.
-	 */
-	spinlock_t			lock;
-};
-
-struct pthread_cond_attr {
-	enum pthread_cond_type	c_type;
-	long			c_flags;
-};
-
-/*
- * Flags for condition variables.
- */
-#define COND_FLAGS_PRIVATE	0x01
-#define COND_FLAGS_INITED	0x02
-#define COND_FLAGS_BUSY		0x04
-
-/*
- * Static cond initialization values. 
- */
-#define PTHREAD_COND_STATIC_INITIALIZER    \
-	{ COND_TYPE_FAST, TAILQ_INITIALIZER, NULL, NULL, \
-	0, 0, _SPINLOCK_INITIALIZER }
-
-/*
- * Semaphore definitions.
- */
-struct sem {
-#define	SEM_MAGIC	((uint32_t) 0x09fa4012)
-	uint32_t	magic;
-	pthread_mutex_t	lock;
-	pthread_cond_t	gtzero;
-	uint32_t	count;
-	uint32_t	nwaiters;
-};
-
-/*
- * Cleanup definitions.
- */
-struct pthread_cleanup {
-	struct pthread_cleanup	*next;
-	void			(*routine) ();
-	void			*routine_arg;
-};
-
-struct pthread_atfork {
-	TAILQ_ENTRY(pthread_atfork) qe;
-	void (*prepare)(void);
-	void (*parent)(void);
-	void (*child)(void);
-};
-
-struct pthread_attr {
-	int	sched_policy;
-	int	sched_inherit;
-	int	sched_interval;
-	int	prio;
-	int	suspend;
-	int	flags;
-	void	*arg_attr;
-	void	(*cleanup_attr) ();
-	void	*stackaddr_attr;
-	size_t	stacksize_attr;
-	size_t	guardsize_attr;
-};
-
-/*
- * Thread creation state attributes.
- */
-#define PTHREAD_CREATE_RUNNING			0
-#define PTHREAD_CREATE_SUSPENDED		1
-
-/*
- * Miscellaneous definitions.
- */
-#define PTHREAD_STACK32_DEFAULT			(1 * 1024 * 1024)
-#define PTHREAD_STACK64_DEFAULT			(2 * 1024 * 1024)
-
-/*
- * Size of default red zone at the end of each stack.  In actuality, this "red
- * zone" is merely an unmapped region, except in the case of the initial stack.
- * Since mmap() makes it possible to specify the maximum growth of a MAP_STACK
- * region, an unmapped gap between thread stacks achieves the same effect as
- * explicitly mapped red zones.
- * This is declared and initialized in uthread_init.c.
- */
-extern int _pthread_guard_default;
-
-extern int _pthread_page_size;
-
-extern int _pthread_stack_default;
-
-extern int _pthread_stack_initial;
-
-/*
- * Maximum size of initial thread's stack.  This perhaps deserves to be larger
- * than the stacks of other threads, since many applications are likely to run
- * almost entirely on this stack.
- */
-#define PTHREAD_STACK32_INITIAL			(2 * 1024 * 1024)
-#define PTHREAD_STACK64_INITIAL			(4 * 1024 * 1024)
-
-/*
- * Define the different priority ranges.  All applications have thread
- * priorities constrained within 0-31.  The threads library raises the
- * priority when delivering signals in order to ensure that signal
- * delivery happens (from the POSIX spec) "as soon as possible".
- * In the future, the threads library will also be able to map specific
- * threads into real-time (cooperating) processes or kernel threads.
- * The RT and SIGNAL priorities will be used internally and added to
- * thread base priorities so that the scheduling queue can handle both
- * normal and RT priority threads with and without signal handling.
- *
- * The approach taken is that, within each class, signal delivery
- * always has priority over thread execution.
- */
-#define PTHREAD_DEFAULT_PRIORITY		15
-#define PTHREAD_MIN_PRIORITY			0
-#define PTHREAD_MAX_PRIORITY			31	/* 0x1F */
-#define PTHREAD_SIGNAL_PRIORITY			32	/* 0x20 */
-#define PTHREAD_RT_PRIORITY			64	/* 0x40 */
-#define PTHREAD_FIRST_PRIORITY			PTHREAD_MIN_PRIORITY
-#define PTHREAD_LAST_PRIORITY	\
-	(PTHREAD_MAX_PRIORITY + PTHREAD_SIGNAL_PRIORITY + PTHREAD_RT_PRIORITY)
-#define PTHREAD_BASE_PRIORITY(prio)	((prio) & PTHREAD_MAX_PRIORITY)
-
-/*
- * Clock resolution in microseconds.
- */
-#define CLOCK_RES_USEC				10000
-#define CLOCK_RES_USEC_MIN			1000
-
-/*
- * Time slice period in microseconds.
- */
-#define TIMESLICE_USEC				20000
-
-/*
- * Define a thread-safe macro to get the current time of day
- * which is updated at regular intervals by the scheduling signal
- * handler.
- */
-#define	GET_CURRENT_TOD(tv)				\
-	do {						\
-		tv.tv_sec = _sched_tod.tv_sec;		\
-		tv.tv_usec = _sched_tod.tv_usec;	\
-	} while (tv.tv_sec != _sched_tod.tv_sec)
-
-
-struct pthread_rwlockattr {
-	int		pshared;
-};
-
-struct pthread_rwlock {
-	pthread_mutex_t	lock;	/* monitor lock */
-	int		state;	/* 0 = idle  >0 = # of readers  -1 = writer */
-	pthread_cond_t	read_signal;
-	pthread_cond_t	write_signal;
-	int		blocked_writers;
-};
-
-/*
- * Thread states.
- */
-enum pthread_state {
-	PS_RUNNING,
-	PS_SIGTHREAD,
-	PS_MUTEX_WAIT,
-	PS_COND_WAIT,
-	PS_FDLR_WAIT,
-	PS_FDLW_WAIT,
-	PS_FDR_WAIT,
-	PS_FDW_WAIT,
-	PS_FILE_WAIT,
-	PS_POLL_WAIT,
-	PS_SELECT_WAIT,
-	PS_SLEEP_WAIT,
-	PS_WAIT_WAIT,
-	PS_SIGSUSPEND,
-	PS_SIGWAIT,
-	PS_SPINBLOCK,
-	PS_JOIN,
-	PS_SUSPENDED,
-	PS_DEAD,
-	PS_DEADLOCK,
-	PS_STATE_MAX
-};
-
-
-/*
- * File descriptor locking definitions.
- */
-#define FD_READ             0x1
-#define FD_WRITE            0x2
-#define FD_RDWR             (FD_READ | FD_WRITE)
-
-/*
- * File descriptor table structure.
- */
-struct fd_table_entry {
-	/*
-	 * Lock for accesses to this file descriptor table
-	 * entry. This is passed to _spinlock() to provide atomic
-	 * access to this structure. It does *not* represent the
-	 * state of the lock on the file descriptor.
-	 */
-	spinlock_t		lock;
-	TAILQ_HEAD(, pthread)	r_queue;	/* Read queue.                        */
-	TAILQ_HEAD(, pthread)	w_queue;	/* Write queue.                       */
-	struct pthread		*r_owner;	/* Ptr to thread owning read lock.    */
-	struct pthread		*w_owner;	/* Ptr to thread owning write lock.   */
-	char			*r_fname;	/* Ptr to read lock source file name  */
-	int			r_lineno;	/* Read lock source line number.      */
-	char			*w_fname;	/* Ptr to write lock source file name */
-	int			w_lineno;	/* Write lock source line number.     */
-	int			r_lockcount;	/* Count for FILE read locks.         */
-	int			w_lockcount;	/* Count for FILE write locks.        */
-	int			flags;		/* Flags used in open.                */
-};
-
-struct pthread_poll_data {
-	int	nfds;
-	struct pollfd *fds;
-};
-
-union pthread_wait_data {
-	pthread_mutex_t	mutex;
-	pthread_cond_t	cond;
-	const sigset_t	*sigwait;	/* Waiting on a signal in sigwait */
-	struct {
-		short	fd;		/* Used when thread waiting on fd */
-		short	branch;		/* Line number, for debugging.    */
-		char	*fname;		/* Source file name for debugging.*/
-	} fd;
-	FILE		*fp;
-	struct pthread_poll_data *poll_data;
-	spinlock_t	*spinlock;
-	struct pthread	*thread;
-};
-
-/*
- * Define a continuation routine that can be used to perform a
- * transfer of control:
- */
-typedef void	(*thread_continuation_t) (void *);
-
-struct pthread_signal_frame;
-
-struct pthread_state_data {
-	struct pthread_signal_frame *psd_curframe;
-	sigset_t		psd_sigmask;
-	struct timespec		psd_wakeup_time;
-	union pthread_wait_data psd_wait_data;
-	enum pthread_state	psd_state;
-	int			psd_flags;
-	int			psd_interrupted;
-	int			psd_longjmp_val;
-	int			psd_sigmask_seqno;
-	int			psd_signo;
-	int			psd_sig_defer_count;
-	/* XXX - What about thread->timeout and/or thread->error? */
-};
-
-struct join_status {
-	struct pthread	*thread;
-	void		*ret;
-	int		error;
-};
-
-/*
- * The frame that is added to the top of a threads stack when setting up
- * up the thread to run a signal handler.
- */
-struct pthread_signal_frame {
-	/*
-	 * This stores the threads state before the signal.
-	 */
-	struct pthread_state_data saved_state;
-
-	/*
-	 * Threads return context; we use only jmp_buf's for now.
-	 */
-	union {
-		jmp_buf		jb;
-		ucontext_t	uc;
-	} ctx;
-	int			signo;	/* signal, arg 1 to sighandler */
-	int			sig_has_args;	/* use signal args if true */
-	ucontext_t		uc;
-	siginfo_t		siginfo;
-};
-
-struct pthread_specific_elem {
-	const void	*data;
-	int		seqno;
-};
-
-/*
- * Thread structure.
- */
-struct pthread {
-	/*
-	 * Magic value to help recognize a valid thread structure
-	 * from an invalid one:
-	 */
-#define	PTHREAD_MAGIC		((uint32_t) 0xd09ba115)
-	uint32_t		magic;
-	char			*name;
-	u_int64_t		uniqueid; /* for gdb */
-
-	/*
-	 * Lock for accesses to this thread structure.
-	 */
-	spinlock_t		lock;
-
-	/* Queue entry for list of all threads: */
-	TAILQ_ENTRY(pthread)	tle;
-
-	/* Queue entry for list of dead threads: */
-	TAILQ_ENTRY(pthread)	dle;
-
-	/*
-	 * Thread start routine, argument, stack pointer and thread
-	 * attributes.
-	 */
-	void			*(*start_routine)(void *);
-	void			*arg;
-	void			*stack;
-	struct pthread_attr	attr;
-
-	/*
-	 * Threads return context; we use only jmp_buf's for now.
-	 */
-	union {
-		jmp_buf		jb;
-		ucontext_t	uc;
-	} ctx;
-
-	/*
-	 * Used for tracking delivery of signal handlers.
-	 */
-	struct pthread_signal_frame	*curframe;
-
- 	/*
-	 * Cancelability flags - the lower 2 bits are used by cancel
-	 * definitions in pthread.h
-	 */
-#define PTHREAD_AT_CANCEL_POINT		0x0004
-#define PTHREAD_CANCELLING		0x0008
-#define PTHREAD_CANCEL_NEEDED		0x0010
-	int	cancelflags;
-
-	thread_continuation_t	continuation;
-
-	/*
-	 * Current signal mask and pending signals.
-	 */
-	sigset_t	sigmask;
-	sigset_t	sigpend;
-	int		sigmask_seqno;
-	int		check_pending;
-
-	/* Thread state: */
-	enum pthread_state	state;
-
-	/* Scheduling clock when this thread was last made active. */
-	long	last_active;
-
-	/* Scheduling clock when this thread was last made inactive. */
-	long	last_inactive;
-
-	/*
-	 * Number of microseconds accumulated by this thread when
-	 * time slicing is active.
-	 */
-	long	slice_usec;
-
-	/*
-	 * Time to wake up thread. This is used for sleeping threads and
-	 * for any operation which may time out (such as select).
-	 */
-	struct timespec	wakeup_time;
-
-	/* TRUE if operation has timed out. */
-	int	timeout;
-
-	/*
-	 * Error variable used instead of errno. The function __error()
-	 * returns a pointer to this. 
-	 */
-	int	error;
-
-	/*
-	 * The joiner is the thread that is joining to this thread.  The
-	 * join status keeps track of a join operation to another thread.
-	 */
-	struct pthread		*joiner;
-	struct join_status	join_status;
-
-	/*
-	 * The current thread can belong to only one scheduling queue at
-	 * a time (ready or waiting queue).  It can also belong to:
-	 *
-	 *   o A queue of threads waiting for a mutex
-	 *   o A queue of threads waiting for a condition variable
-	 *   o A queue of threads waiting for a file descriptor lock
-	 *   o A queue of threads needing work done by the kernel thread
-	 *     (waiting for a spinlock or file I/O)
-	 *
-	 * A thread can also be joining a thread (the joiner field above).
-	 *
-	 * It must not be possible for a thread to belong to any of the
-	 * above queues while it is handling a signal.  Signal handlers
-	 * may longjmp back to previous stack frames circumventing normal
-	 * control flow.  This could corrupt queue integrity if the thread
-	 * retains membership in the queue.  Therefore, if a thread is a
-	 * member of one of these queues when a signal handler is invoked,
-	 * it must remove itself from the queue before calling the signal
-	 * handler and reinsert itself after normal return of the handler.
-	 *
-	 * Use pqe for the scheduling queue link (both ready and waiting),
-	 * sqe for synchronization (mutex and condition variable) queue
-	 * links, and qe for all other links.
-	 */
-	TAILQ_ENTRY(pthread)	pqe;	/* priority queue link */
-	TAILQ_ENTRY(pthread)	sqe;	/* synchronization queue link */
-	TAILQ_ENTRY(pthread)	qe;	/* all other queues link */
-
-	/* Wait data. */
-	union pthread_wait_data data;
-
-	/*
-	 * Allocated for converting select into poll.
-	 */
-	struct pthread_poll_data poll_data;
-
-	/*
-	 * Set to TRUE if a blocking operation was
-	 * interrupted by a signal:
-	 */
-	int		interrupted;
-
-	/* Signal number when in state PS_SIGWAIT: */
-	int		signo;
-
-	/*
-	 * Set to non-zero when this thread has deferred signals.
-	 * We allow for recursive deferral.
-	 */
-	int		sig_defer_count;
-
-	/*
-	 * Set to TRUE if this thread should yield after undeferring
-	 * signals.
-	 */
-	int		yield_on_sig_undefer;
-
-	/* Miscellaneous flags; only set with signals deferred. */
-	int		flags;
-#define PTHREAD_FLAGS_PRIVATE	0x0001
-#define PTHREAD_EXITING		0x0002
-#define PTHREAD_FLAGS_IN_WAITQ	0x0004	/* in waiting queue using pqe link */
-#define PTHREAD_FLAGS_IN_PRIOQ	0x0008	/* in priority queue using pqe link */
-#define PTHREAD_FLAGS_IN_WORKQ	0x0010	/* in work queue using qe link */
-#define PTHREAD_FLAGS_IN_FILEQ	0x0020	/* in file lock queue using qe link */
-#define PTHREAD_FLAGS_IN_FDQ	0x0040	/* in fd lock queue using qe link */
-#define PTHREAD_FLAGS_IN_CONDQ	0x0080	/* in condition queue using sqe link*/
-#define PTHREAD_FLAGS_IN_MUTEXQ	0x0100	/* in mutex queue using sqe link */
-#define	PTHREAD_FLAGS_SUSPENDED	0x0200	/* thread is suspended */
-#define PTHREAD_FLAGS_TRACE	0x0400	/* for debugging purposes */
-#define PTHREAD_FLAGS_IN_SYNCQ	\
-    (PTHREAD_FLAGS_IN_CONDQ | PTHREAD_FLAGS_IN_MUTEXQ)
-
-	/*
-	 * Base priority is the user setable and retrievable priority
-	 * of the thread.  It is only affected by explicit calls to
-	 * set thread priority and upon thread creation via a thread
-	 * attribute or default priority.
-	 */
-	char		base_priority;
-
-	/*
-	 * Inherited priority is the priority a thread inherits by
-	 * taking a priority inheritence or protection mutex.  It
-	 * is not affected by base priority changes.  Inherited
-	 * priority defaults to and remains 0 until a mutex is taken
-	 * that is being waited on by any other thread whose priority
-	 * is non-zero.
-	 */
-	char		inherited_priority;
-
-	/*
-	 * Active priority is always the maximum of the threads base
-	 * priority and inherited priority.  When there is a change
-	 * in either the base or inherited priority, the active
-	 * priority must be recalculated.
-	 */
-	char		active_priority;
-
-	/* Number of priority ceiling or protection mutexes owned. */
-	int		priority_mutex_count;
-
-	/* Number rwlocks rdlocks held. */
-	int			rdlock_count;
-
-	/*
-	 * Queue of currently owned mutexes.
-	 */
-	TAILQ_HEAD(, pthread_mutex)	mutexq;
-
-	void				*ret;
-	struct pthread_specific_elem	*specific;
-	int				specific_data_count;
-
-	/* Cleanup handlers Link List */
-	struct pthread_cleanup *cleanup;
-	char			*fname;	/* Ptr to source file name  */
-	int			lineno;	/* Source line number.      */
-};
-
-/*
- * Global variables for the uthread kernel.
- */
-
-SCLASS void *_usrstack
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= (void *) USRSTACK;
-#else
-;
-#endif
-
-/* Kernel thread structure used when there are no running threads: */
-SCLASS struct pthread   _thread_kern_thread;
-
-/* Ptr to the thread structure for the running thread: */
-SCLASS struct pthread   * volatile _thread_run
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= &_thread_kern_thread;
-#else
-;
-#endif
-
-/* Ptr to the thread structure for the last user thread to run: */
-SCLASS struct pthread   * volatile _last_user_thread
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= &_thread_kern_thread;
-#else
-;
-#endif
-
-/* List of all threads: */
-SCLASS TAILQ_HEAD(, pthread)	_thread_list
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= TAILQ_HEAD_INITIALIZER(_thread_list);
-#else
-;
-#endif
-
-/*
- * Array of kernel pipe file descriptors that are used to ensure that
- * no signals are missed in calls to _select.
- */
-SCLASS int		_thread_kern_pipe[2]
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= {
-	-1,
-	-1
-};
-#else
-;
-#endif
-SCLASS int		volatile _queue_signals
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= 0;
-#else
-;
-#endif
-SCLASS int              _thread_kern_in_sched
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= 0;
-#else
-;
-#endif
-
-SCLASS int              _sig_in_handler
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= 0;
-#else
-;
-#endif
-
-/* Time of day at last scheduling timer signal: */
-SCLASS struct timeval volatile	_sched_tod
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= { 0, 0 };
-#else
-;
-#endif
-
-/*
- * Current scheduling timer ticks; used as resource usage.
- */
-SCLASS unsigned int volatile	_sched_ticks
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= 0;
-#else
-;
-#endif
-
-/* Dead threads: */
-SCLASS TAILQ_HEAD(, pthread) _dead_list
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= TAILQ_HEAD_INITIALIZER(_dead_list);
-#else
-;
-#endif
-
-/* Initial thread: */
-SCLASS struct pthread *_thread_initial
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= NULL;
-#else
-;
-#endif
-
-SCLASS TAILQ_HEAD(atfork_head, pthread_atfork)	_atfork_list;
-SCLASS pthread_mutex_t		_atfork_mutex;
-
-/* Default thread attributes: */
-SCLASS struct pthread_attr _pthread_attr_default
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= { SCHED_RR, 0, TIMESLICE_USEC, PTHREAD_DEFAULT_PRIORITY,
-	PTHREAD_CREATE_RUNNING, PTHREAD_CREATE_JOINABLE, NULL, NULL, NULL,
-	-1, -1 };
-#else
-;
-#endif
-
-/* Default mutex attributes: */
-#define	PTHREAD_MUTEXATTR_DEFAULT \
-	{ PTHREAD_MUTEX_DEFAULT, PTHREAD_PRIO_NONE, 0, 0 }
-
-/* Default condition variable attributes: */
-#define	PTHREAD_CONDATTR_DEFAULT	{ COND_TYPE_FAST, 0 }
-
-/*
- * Standard I/O file descriptors need special flag treatment since
- * setting one to non-blocking does all on *BSD. Sigh. This array
- * is used to store the initial flag settings.
- */
-SCLASS int	_pthread_stdio_flags[3];
-
-/* File table information: */
-SCLASS struct fd_table_entry **_thread_fd_table
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= NULL;
-#else
-;
-#endif
-
-/* Table for polling file descriptors: */
-SCLASS struct pollfd *_thread_pfd_table
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= NULL;
-#else
-;
-#endif
-
-SCLASS const int dtablecount
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= 4096/sizeof(struct fd_table_entry);
-#else
-;
-#endif
-SCLASS int    _thread_dtablesize        /* Descriptor table size.           */
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= 0;
-#else
-;
-#endif
-
-SCLASS int    _clock_res_usec		/* Clock resolution in usec.	*/
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= CLOCK_RES_USEC;
-#else
-;
-#endif
-
-/* Garbage collector mutex and condition variable. */
-SCLASS	pthread_mutex_t _gc_mutex
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= NULL
-#endif
-;
-SCLASS	pthread_cond_t  _gc_cond
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= NULL
-#endif
-;
-
-/*
- * Array of signal actions for this process.
- */
-SCLASS struct  sigaction _thread_sigact[NSIG];
-
-/*
- * Array of counts of dummy handlers for SIG_DFL signals.  This is used to
- * assure that there is always a dummy signal handler installed while there is a
- * thread sigwait()ing on the corresponding signal.
- */
-SCLASS int	_thread_dfl_count[NSIG];
-
-/*
- * Pending signals and mask for this process:
- */
-SCLASS sigset_t	_process_sigpending;
-SCLASS sigset_t	_process_sigmask
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= { {0, 0, 0, 0} }
-#endif
-;
-
-/*
- * Scheduling queues:
- */
-SCLASS pq_queue_t		_readyq;
-SCLASS TAILQ_HEAD(, pthread)	_waitingq;
-
-/*
- * Work queue:
- */
-SCLASS TAILQ_HEAD(, pthread)	_workq;
-
-/* Tracks the number of threads blocked while waiting for a spinlock. */
-SCLASS	volatile int	_spinblock_count
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= 0
-#endif
-;
-
-/* Used to maintain pending and active signals: */
-struct sigstatus {
-	int		pending;	/* Is this a pending signal? */
-	int		blocked;	/*
-					 * A handler is currently active for
-					 * this signal; ignore subsequent
-					 * signals until the handler is done.
-					 */
-	int		signo;		/* arg 1 to signal handler */
-	siginfo_t	siginfo;	/* arg 2 to signal handler */
-	ucontext_t	uc;		/* arg 3 to signal handler */
-};
-
-SCLASS struct sigstatus	_thread_sigq[NSIG];
-
-/* Indicates that the signal queue needs to be checked. */
-SCLASS	volatile int	_sigq_check_reqd
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= 0
-#endif
-;
-
-/* Thread switch hook. */
-SCLASS pthread_switch_routine_t _sched_switch_hook
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= NULL
-#endif
-;
-
-/*
- * Declare the kernel scheduler jump buffer and stack:
- */
-SCLASS jmp_buf	_thread_kern_sched_jb;
-
-SCLASS void *	_thread_kern_sched_stack
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= NULL
-#endif
-;
-
-
-/* Used for _PTHREADS_INVARIANTS checking. */
-SCLASS int	_thread_kern_new_state
-#ifdef GLOBAL_PTHREAD_PRIVATE
-= 0
-#endif
-;
-
-/* Undefine the storage class specifier: */
-#undef  SCLASS
-
-#ifdef _LOCK_DEBUG
-#define	_FD_LOCK(_fd,_type,_ts)		_thread_fd_lock_debug(_fd, _type, \
-						_ts, __FILE__, __LINE__)
-#define _FD_UNLOCK(_fd,_type)		_thread_fd_unlock_debug(_fd, _type, \
-						__FILE__, __LINE__)
-#else
-#define	_FD_LOCK(_fd,_type,_ts)		_thread_fd_lock(_fd, _type, _ts)
-#define _FD_UNLOCK(_fd,_type)		_thread_fd_unlock(_fd, _type)
-#endif
-
-/*
- * Function prototype definitions.
- */
-__BEGIN_DECLS
-char    *__ttyname_basic(int);
-void	_cond_wait_backout(pthread_t);
-void	_fd_lock_backout(pthread_t);
-int     _find_thread(pthread_t);
-struct pthread *_get_curthread(void);
-void	_set_curthread(struct pthread *);
-void	*_thread_stack_alloc(size_t, size_t);
-void	_thread_stack_free(void *, size_t, size_t);
-int     _thread_create(pthread_t *,const pthread_attr_t *,void *(*start_routine)(void *),void *,pthread_t);
-int	_mutex_cv_lock(pthread_mutex_t *);
-int	_mutex_cv_unlock(pthread_mutex_t *);
-void	_mutex_lock_backout(pthread_t);
-void	_mutex_notify_priochange(pthread_t);
-int	_mutex_reinit(pthread_mutex_t *);
-void	_mutex_unlock_private(pthread_t);
-int	_cond_reinit(pthread_cond_t *);
-int	_pq_alloc(struct pq_queue *, int, int);
-int	_pq_init(struct pq_queue *);
-void	_pq_remove(struct pq_queue *pq, struct pthread *);
-void	_pq_insert_head(struct pq_queue *pq, struct pthread *);
-void	_pq_insert_tail(struct pq_queue *pq, struct pthread *);
-struct pthread *_pq_first(struct pq_queue *pq);
-void	*_pthread_getspecific(pthread_key_t);
-int	_pthread_key_create(pthread_key_t *, void (*) (void *));
-int	_pthread_key_delete(pthread_key_t);
-int	_pthread_mutex_destroy(pthread_mutex_t *);
-int	_pthread_mutex_init(pthread_mutex_t *, const pthread_mutexattr_t *);
-int	_pthread_mutex_lock(pthread_mutex_t *);
-int	_pthread_mutex_trylock(pthread_mutex_t *);
-int	_pthread_mutex_unlock(pthread_mutex_t *);
-int	_pthread_mutexattr_init(pthread_mutexattr_t *);
-int	_pthread_mutexattr_destroy(pthread_mutexattr_t *);
-int	_pthread_mutexattr_settype(pthread_mutexattr_t *, int);
-int	_pthread_once(pthread_once_t *, void (*) (void));
-pthread_t _pthread_self(void);
-int	_pthread_setspecific(pthread_key_t, const void *);
-void	_waitq_insert(pthread_t pthread);
-void	_waitq_remove(pthread_t pthread);
-#if defined(_PTHREADS_INVARIANTS)
-void	_waitq_setactive(void);
-void	_waitq_clearactive(void);
-#endif
-void    _thread_exit(char *, int, char *) __dead2;
-void    _thread_exit_cleanup(void);
-int	_thread_fd_getflags(int);
-int     _thread_fd_lock(int, int, struct timespec *);
-int     _thread_fd_lock_debug(int, int, struct timespec *,char *fname,int lineno);
-void	_thread_fd_setflags(int, int);
-int     _thread_fd_table_init(int fd);
-void    _thread_fd_unlock(int, int);
-void    _thread_fd_unlock_debug(int, int, char *, int);
-void    _thread_fd_unlock_owned(pthread_t);
-void    *_thread_cleanup(pthread_t);
-void    _thread_cleanupspecific(void);
-void    _thread_dump_info(void);
-void    _thread_init(void);
-void    _thread_kern_sched(ucontext_t *);
-void 	_thread_kern_scheduler(void);
-void    _thread_kern_sched_frame(struct pthread_signal_frame *psf);
-void    _thread_kern_sched_sig(void);
-void    _thread_kern_sched_state(enum pthread_state, char *fname, int lineno);
-void	_thread_kern_sched_state_unlock(enum pthread_state state,
-	    spinlock_t *lock, char *fname, int lineno);
-void    _thread_kern_set_timeout(const struct timespec *);
-void    _thread_kern_sig_defer(void);
-void    _thread_kern_sig_undefer(void);
-void    _thread_sig_handler(int, siginfo_t *, ucontext_t *);
-void    _thread_sig_check_pending(struct pthread *pthread);
-void    _thread_sig_handle_pending(void);
-void	_thread_sig_send(struct pthread *pthread, int sig);
-void	_thread_sig_wrapper(void);
-void	_thread_sigframe_restore(struct pthread *thread,
-	    struct pthread_signal_frame *psf);
-void    _thread_start(void);
-void	_thread_seterrno(pthread_t, int);
-pthread_addr_t _thread_gc(pthread_addr_t);
-void	_thread_enter_cancellation_point(void);
-void	_thread_leave_cancellation_point(void);
-void	_thread_cancellation_point(void);
-
-/* #include <sys/acl.h> */
-#ifdef _SYS_ACL_H
-int	__sys___acl_aclcheck_fd(int, acl_type_t, struct acl *);
-int	__sys___acl_delete_fd(int, acl_type_t);
-int	__sys___acl_get_fd(int, acl_type_t, struct acl *);
-int	__sys___acl_set_fd(int, acl_type_t, struct acl *);
-#endif
-
-/* #include <sys/aio.h> */
-#ifdef _SYS_AIO_H_
-int	__sys_aio_suspend(const struct aiocb * const[], int, const struct timespec *);
-#endif
-
-/* #include <sys/event.h> */
-#ifdef _SYS_EVENT_H_
-int	__sys_kevent(int, const struct kevent *, int, struct kevent *,
-	    int, const struct timespec *);
-#endif
-
-/* #include <sys/ioctl.h> */
-#ifdef _SYS_IOCTL_H_
-int	__sys_ioctl(int, unsigned long, ...);
-#endif
-
-/* #include <sys/mman.h> */
-#ifdef _SYS_MMAN_H_
-int	__sys_msync(void *, size_t, int);
-#endif
-
-/* #include <sys/mount.h> */
-#ifdef _SYS_MOUNT_H_
-int	__sys_fstatfs(int, struct statfs *);
-#endif
-
-/* #include <sys/socket.h> */
-#ifdef _SYS_SOCKET_H_
-int	__sys_accept(int, struct sockaddr *, socklen_t *);
-int	__sys_bind(int, const struct sockaddr *, socklen_t);
-int	__sys_connect(int, const struct sockaddr *, socklen_t);
-int	__sys_getpeername(int, struct sockaddr *, socklen_t *);
-int	__sys_getsockname(int, struct sockaddr *, socklen_t *);
-int	__sys_getsockopt(int, int, int, void *, socklen_t *);
-int	__sys_listen(int, int);
-ssize_t	__sys_recvfrom(int, void *, size_t, int, struct sockaddr *, socklen_t *);
-ssize_t	__sys_recvmsg(int, struct msghdr *, int);
-int	__sys_sendfile(int, int, off_t, size_t, struct sf_hdtr *, off_t *, int);
-ssize_t	__sys_sendmsg(int, const struct msghdr *, int);
-ssize_t	__sys_sendto(int, const void *,size_t, int, const struct sockaddr *, socklen_t);
-int	__sys_setsockopt(int, int, int, const void *, socklen_t);
-int	__sys_shutdown(int, int);
-int	__sys_socket(int, int, int);
-int	__sys_socketpair(int, int, int, int *);
-#endif
-
-/* #include <sys/stat.h> */
-#ifdef _SYS_STAT_H_
-int	__sys_fchflags(int, u_long);
-int	__sys_fchmod(int, mode_t);
-int	__sys_fstat(int, struct stat *);
-#endif
-
-/* #include <sys/uio.h> */
-#ifdef _SYS_UIO_H_
-ssize_t	__sys_readv(int, const struct iovec *, int);
-ssize_t	__sys_writev(int, const struct iovec *, int);
-#endif
-
-/* #include <sys/wait.h> */
-#ifdef WNOHANG
-pid_t	__sys_wait4(pid_t, int *, int, struct rusage *);
-#endif
-
-/* #include <dirent.h> */
-#ifdef _DIRENT_H_
-int	__sys_getdirentries(int, char *, int, long *);
-#endif
-
-/* #include <fcntl.h> */
-#ifdef _SYS_FCNTL_H_
-int	__sys_fcntl(int, int, ...);
-int	__sys_flock(int, int);
-int	__sys_open(const char *, int, ...);
-#endif
-
-/* #include <poll.h> */
-#ifdef _SYS_POLL_H_
-int	__sys_poll(struct pollfd *, unsigned, int);
-#endif
-
-/* #include <signal.h> */
-#ifdef _SIGNAL_H_
-int	__sys_sigaction(int, const struct sigaction *, struct sigaction *);
-int	__sys_sigprocmask(int, const sigset_t *, sigset_t *);
-int	__sys_sigreturn(ucontext_t *);
-#endif
-
-/* #include <unistd.h> */
-#ifdef _UNISTD_H_
-int	__sys_close(int);
-int	__sys_dup(int);
-int	__sys_dup2(int, int);
-int	__sys_execve(const char *, char * const *, char * const *);
-void	__sys_exit(int) __dead2;
-int	__sys_fchown(int, uid_t, gid_t);
-pid_t	__sys_fork(void);
-long	__sys_fpathconf(int, int);
-int	__sys_fsync(int);
-int	__sys_pipe(int *);
-ssize_t	__sys_read(int, void *, size_t);
-ssize_t	__sys_write(int, const void *, size_t);
-#endif
-
-/* #include <setjmp.h> */
-#ifdef _SETJMP_H_
-extern void	__siglongjmp(sigjmp_buf, int) __dead2;
-extern void	__longjmp(jmp_buf, int) __dead2;
-extern void	___longjmp(jmp_buf, int) __dead2;
-#endif
-__END_DECLS
-
-#endif  /* !_PTHREAD_PRIVATE_H */
diff --git a/lib/libc/uthread/uthread_accept.c b/lib/libc/uthread/uthread_accept.c
deleted file mode 100644
index 968f8bf..0000000
--- a/lib/libc/uthread/uthread_accept.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_accept.c,v 1.17 2002/12/19 11:39:20 ru Exp $
- */
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__accept, accept);
-
-int
-_accept(int fd, struct sockaddr * name, socklen_t *namelen)
-{
-	struct pthread	*curthread = _get_curthread();
-	int             ret;
-
-	/* Lock the file descriptor: */
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		/* Enter a loop to wait for a connection request: */
-		while ((ret = __sys_accept(fd, name, namelen)) < 0) {
-			/* Check if the socket is to block: */
-			if ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0
-			    && (errno == EWOULDBLOCK || errno == EAGAIN)) {
-				/* Save the socket file descriptor: */
-				curthread->data.fd.fd = fd;
-				curthread->data.fd.fname = __FILE__;
-				curthread->data.fd.branch = __LINE__;
-
-				/* Set the timeout: */
-				_thread_kern_set_timeout(NULL);
-				curthread->interrupted = 0;
-
-				/* Schedule the next thread: */
-				_thread_kern_sched_state(PS_FDR_WAIT, __FILE__, __LINE__);
-
-				/* Check if the wait was interrupted: */
-				if (curthread->interrupted) {
-					/* Return an error status: */
-					errno = EINTR;
-					ret = -1;
-					break;
-				}
-			} else {
-				/*
-				 * Another error has occurred, so exit the
-				 * loop here: 
-				 */
-				break;
-			}
-		}
-
-		/* Check for errors: */
-		if (ret < 0) {
-		}
-		/* Initialise the file descriptor table for the new socket: */
-		else if (_thread_fd_table_init(ret) != 0) {
-			/* Quietly close the socket: */
-			__sys_close(ret);
-
-			/* Return an error: */
-			ret = -1;
-		}
-		/* 
-		 * If the parent socket was blocking, make sure that
-		 * the new socket is also set blocking here (as the
-		 * call to _thread_fd_table_init() above will always 
-		 * set the new socket flags to non-blocking, as that 
-		 * will be the inherited state of the new socket.
-		 */
-		if((ret > 0) && (_thread_fd_getflags(fd) & O_NONBLOCK) == 0)
-			_thread_fd_setflags(ret,
-			    _thread_fd_getflags(ret) & ~O_NONBLOCK);
-		/* Unlock the file descriptor: */
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	/* Return the socket file descriptor or -1 on error: */
-	return (ret);
-}
-
-int
-__accept(int fd, struct sockaddr * name, socklen_t *namelen)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _accept(fd, name, namelen);
-	_thread_leave_cancellation_point();
-
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_acl_aclcheck_fd.c b/lib/libc/uthread/uthread_acl_aclcheck_fd.c
deleted file mode 100644
index 35cbb33..0000000
--- a/lib/libc/uthread/uthread_acl_aclcheck_fd.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2001 Thomas Moestl
- * 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.
- *
- * 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/lib/libc_r/uthread/uthread_acl_aclcheck_fd.c,v 1.3 2001/05/20 23:08:32 jasone Exp $
- */
-
-#include <sys/types.h>
-#include <sys/acl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(___acl_aclcheck_fd, __acl_aclcheck_fd);
-
-int
-___acl_aclcheck_fd(int fd, acl_type_t tp, acl_t acl)
-{
-	int	error;
-
-	if ((error = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		error = __sys___acl_aclcheck_fd(fd, tp, (struct acl *)acl);
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return (error);
-}
-
diff --git a/lib/libc/uthread/uthread_acl_delete_fd.c b/lib/libc/uthread/uthread_acl_delete_fd.c
deleted file mode 100644
index 850bd76..0000000
--- a/lib/libc/uthread/uthread_acl_delete_fd.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2001 Thomas Moestl
- * 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.
- *
- * 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/lib/libc_r/uthread/uthread_acl_delete_fd.c,v 1.2 2001/04/10 04:19:19 deischen Exp $
- */
-
-#include <sys/types.h>
-#include <sys/acl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(___acl_delete_fd, __acl_delete_fd);
-
-int
-___acl_delete_fd(int fd, acl_type_t tp)
-{
-	int error;
-
-	if ((error = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-		error = __sys___acl_delete_fd(fd, tp);
-		_FD_UNLOCK(fd, FD_WRITE);
-	}
-	return (error);
-}
diff --git a/lib/libc/uthread/uthread_acl_get_fd.c b/lib/libc/uthread/uthread_acl_get_fd.c
deleted file mode 100644
index 525a549..0000000
--- a/lib/libc/uthread/uthread_acl_get_fd.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2001 Thomas Moestl
- * 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.
- *
- * 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/lib/libc_r/uthread/uthread_acl_get_fd.c,v 1.2 2001/04/10 04:19:19 deischen Exp $
- */
-
-#include <sys/types.h>
-#include <sys/acl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(___acl_get_fd, __acl_get_fd);
-
-int
-___acl_get_fd(int fd, acl_type_t tp, struct acl *acl_p)
-{
-	int	error;
-
-	if ((error = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		error = __sys___acl_get_fd(fd, tp, acl_p);
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return (error);
-
-}
diff --git a/lib/libc/uthread/uthread_acl_set_fd.c b/lib/libc/uthread/uthread_acl_set_fd.c
deleted file mode 100644
index c38fe9e..0000000
--- a/lib/libc/uthread/uthread_acl_set_fd.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2001 Thomas Moestl
- * 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.
- *
- * 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/lib/libc_r/uthread/uthread_acl_set_fd.c,v 1.2 2001/04/10 04:19:19 deischen Exp $
- */
-
-#include <sys/types.h>
-#include <sys/acl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(___acl_set_fd, __acl_set_fd);
-
-int
-___acl_set_fd(int fd, acl_type_t tp, struct acl *acl_p)
-{
-	int	error;
-
-	if ((error = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-		error = __sys___acl_set_fd(fd, tp, acl_p);
-		_FD_UNLOCK(fd, FD_WRITE);
-	}
-	return (error);
-}
diff --git a/lib/libc/uthread/uthread_aio_suspend.c b/lib/libc/uthread/uthread_aio_suspend.c
deleted file mode 100644
index a922e1f..0000000
--- a/lib/libc/uthread/uthread_aio_suspend.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_aio_suspend.c,v 1.5 2001/04/10 04:19:19 deischen Exp $
- */
-
-#include <aio.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_aio_suspend, aio_suspend);
-
-int
-_aio_suspend(const struct aiocb * const iocbs[], int niocb, const struct
-    timespec *timeout)
-{
-	int	ret;
-
-	_thread_enter_cancellation_point();
-	ret = __sys_aio_suspend(iocbs, niocb, timeout);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
-
diff --git a/lib/libc/uthread/uthread_atfork.c b/lib/libc/uthread/uthread_atfork.c
deleted file mode 100644
index b306bb0..0000000
--- a/lib/libc/uthread/uthread_atfork.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2003 Daniel Eischen <deischen@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. Neither the name of the author nor the names of any co-contributors
- *    may 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/lib/libc_r/uthread/uthread_atfork.c,v 1.1 2004/12/10 03:36:45 grog Exp $
- */
-#include <errno.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <sys/queue.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_atfork, pthread_atfork);
-
-int
-_pthread_atfork(void (*prepare)(void), void (*parent)(void),
-    void (*child)(void))
-{
-	struct pthread_atfork *af;
-
-	if (_thread_initial == NULL)
-		_thread_init();
-
-	if ((af = malloc(sizeof(struct pthread_atfork))) == NULL)
-		return (ENOMEM);
-
-	af->prepare = prepare;
-	af->parent = parent;
-	af->child = child;
-	_pthread_mutex_lock(&_atfork_mutex);
-	TAILQ_INSERT_TAIL(&_atfork_list, af, qe);
-	_pthread_mutex_unlock(&_atfork_mutex);
-	return (0);
-}
-
diff --git a/lib/libc/uthread/uthread_attr_destroy.c b/lib/libc/uthread/uthread_attr_destroy.c
deleted file mode 100644
index 9d57cd5..0000000
--- a/lib/libc/uthread/uthread_attr_destroy.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_attr_destroy.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <stdlib.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_destroy, pthread_attr_destroy);
-
-int
-_pthread_attr_destroy(pthread_attr_t *attr)
-{
-	int	ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL)
-		/* Invalid argument: */
-		ret = EINVAL;
-	else {
-		/* Free the memory allocated to the attribute object: */
-		free(*attr);
-
-		/*
-		 * Leave the attribute pointer NULL now that the memory
-		 * has been freed:
-		 */
-		*attr = NULL;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_get_np.c b/lib/libc/uthread/uthread_attr_get_np.c
deleted file mode 100644
index 9d2adac..0000000
--- a/lib/libc/uthread/uthread_attr_get_np.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2002,2003 Alexey Zelkin <phantom@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.
- *
- * 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/lib/libc_r/uthread/uthread_attr_get_np.c,v 1.3 2003/02/03 10:08:45 phantom Exp $
- */
-#include <errno.h>
-#include <string.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_get_np, pthread_attr_get_np);
-
-int
-_pthread_attr_get_np(pthread_t pid, pthread_attr_t *dst)
-{
-	int	ret;
-
-	if (pid == NULL || dst == NULL || *dst == NULL)
-		return (EINVAL);
-
-	if ((ret = _find_thread(pid)) != 0)
-		return (ret);
-
-	memcpy(*dst, &pid->attr, sizeof(struct pthread_attr));
-
-	/*
-	 * Special case, if stack address was not provided by caller
-	 * of pthread_create(), then return address allocated internally
-	 */
-	if ((*dst)->stackaddr_attr == NULL)
-		(*dst)->stackaddr_attr = pid->stack;
-
-	return (0);
-}
diff --git a/lib/libc/uthread/uthread_attr_getdetachstate.c b/lib/libc/uthread/uthread_attr_getdetachstate.c
deleted file mode 100644
index d590c88..0000000
--- a/lib/libc/uthread/uthread_attr_getdetachstate.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_attr_getdetachstate.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_getdetachstate, pthread_attr_getdetachstate);
-
-int
-_pthread_attr_getdetachstate(const pthread_attr_t *attr, int *detachstate)
-{
-	int	ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL || detachstate == NULL)
-		ret = EINVAL;
-	else {
-		/* Check if the detached flag is set: */
-		if ((*attr)->flags & PTHREAD_DETACHED)
-			/* Return detached: */
-			*detachstate = PTHREAD_CREATE_DETACHED;
-		else
-			/* Return joinable: */
-			*detachstate = PTHREAD_CREATE_JOINABLE;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_getguardsize.c b/lib/libc/uthread/uthread_attr_getguardsize.c
deleted file mode 100644
index 66f94ef..0000000
--- a/lib/libc/uthread/uthread_attr_getguardsize.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2001 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer
- *    unmodified other than the allowable addition of one or more
- *    copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_attr_getguardsize.c,v 1.1 2001/07/20 04:23:10 jasone Exp $
- */
-
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_getguardsize, pthread_attr_getguardsize);
-
-int
-_pthread_attr_getguardsize(const pthread_attr_t *attr, size_t *guardsize)
-{
-	int	ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL || guardsize == NULL)
-		ret = EINVAL;
-	else {
-		/* Return the guard size: */
-		*guardsize = (*attr)->guardsize_attr;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_getinheritsched.c b/lib/libc/uthread/uthread_attr_getinheritsched.c
deleted file mode 100644
index b2106c4..0000000
--- a/lib/libc/uthread/uthread_attr_getinheritsched.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_attr_getinheritsched.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_getinheritsched, pthread_attr_getinheritsched);
-
-int
-_pthread_attr_getinheritsched(const pthread_attr_t *attr, int *sched_inherit)
-{
-	int ret = 0;
-
-	if ((attr == NULL) || (*attr == NULL))
-		ret = EINVAL;
-	else
-		*sched_inherit = (*attr)->sched_inherit;
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_getschedparam.c b/lib/libc/uthread/uthread_attr_getschedparam.c
deleted file mode 100644
index e2c69b3..0000000
--- a/lib/libc/uthread/uthread_attr_getschedparam.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_attr_getschedparam.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_getschedparam, pthread_attr_getschedparam);
-
-int
-_pthread_attr_getschedparam(const pthread_attr_t *attr, struct sched_param *param)
-{
-	int ret = 0;
-
-	if ((attr == NULL) || (*attr == NULL) || (param == NULL))
-		ret = EINVAL;
-	else
-		param->sched_priority = (*attr)->prio;
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_getschedpolicy.c b/lib/libc/uthread/uthread_attr_getschedpolicy.c
deleted file mode 100644
index 6386984..0000000
--- a/lib/libc/uthread/uthread_attr_getschedpolicy.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_attr_getschedpolicy.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_getschedpolicy, pthread_attr_getschedpolicy);
-
-int
-_pthread_attr_getschedpolicy(const pthread_attr_t *attr, int *policy)
-{
-	int ret = 0;
-
-	if ((attr == NULL) || (*attr == NULL) || (policy == NULL))
-		ret = EINVAL;
-	else
-		*policy = (*attr)->sched_policy;
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_getscope.c b/lib/libc/uthread/uthread_attr_getscope.c
deleted file mode 100644
index 3747c14..0000000
--- a/lib/libc/uthread/uthread_attr_getscope.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_attr_getscope.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_getscope, pthread_attr_getscope);
-
-int
-_pthread_attr_getscope(const pthread_attr_t *attr, int *contentionscope)
-{
-	int ret = 0;
-
-	if ((attr == NULL) || (*attr == NULL) || (contentionscope == NULL))
-		/* Return an invalid argument: */
-		ret = EINVAL;
-
-	else
-		*contentionscope = (*attr)->flags & PTHREAD_SCOPE_SYSTEM ?
-		    PTHREAD_SCOPE_SYSTEM : PTHREAD_SCOPE_PROCESS;
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_getstack.c b/lib/libc/uthread/uthread_attr_getstack.c
deleted file mode 100644
index 8222d0f..0000000
--- a/lib/libc/uthread/uthread_attr_getstack.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2003 Craig Rodrigues <rodrigc@attbi.com>.
- * 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 Craig Rodrigues.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CRAIG RODRIGUES 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/lib/libc_r/uthread/uthread_attr_getstack.c,v 1.1 2003/02/10 08:48:03 alfred Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_getstack, pthread_attr_getstack);
-
-int
-_pthread_attr_getstack(const pthread_attr_t * __restrict attr,
-                        void ** __restrict stackaddr,
-                        size_t * __restrict stacksize)
-{
-	int     ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL || stackaddr == NULL
-	    || stacksize == NULL )
-		ret = EINVAL;
-	else {
-		/* Return the stack address and size */
-		*stackaddr = (*attr)->stackaddr_attr;
-		*stacksize = (*attr)->stacksize_attr;
-		ret = 0;
-	}
-	return(ret);
-}
-
diff --git a/lib/libc/uthread/uthread_attr_getstackaddr.c b/lib/libc/uthread/uthread_attr_getstackaddr.c
deleted file mode 100644
index 41bc45d..0000000
--- a/lib/libc/uthread/uthread_attr_getstackaddr.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_attr_getstackaddr.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_getstackaddr, pthread_attr_getstackaddr);
-
-int
-_pthread_attr_getstackaddr(const pthread_attr_t *attr, void **stackaddr)
-{
-	int	ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL || stackaddr == NULL)
-		ret = EINVAL;
-	else {
-		/* Return the stack address: */
-		*stackaddr = (*attr)->stackaddr_attr;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_getstacksize.c b/lib/libc/uthread/uthread_attr_getstacksize.c
deleted file mode 100644
index 44c982d..0000000
--- a/lib/libc/uthread/uthread_attr_getstacksize.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_attr_getstacksize.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_getstacksize, pthread_attr_getstacksize);
-
-int
-_pthread_attr_getstacksize(const pthread_attr_t *attr, size_t *stacksize)
-{
-	int	ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL || stacksize  == NULL)
-		ret = EINVAL;
-	else {
-		/* Return the stack size: */
-		*stacksize = (*attr)->stacksize_attr;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_init.c b/lib/libc/uthread/uthread_attr_init.c
deleted file mode 100644
index 715265b..0000000
--- a/lib/libc/uthread/uthread_attr_init.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_attr_init.c,v 1.7 2002/11/13 18:13:26 deischen Exp $
- */
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_init, pthread_attr_init);
-
-int
-_pthread_attr_init(pthread_attr_t *attr)
-{
-	int	ret;
-	pthread_attr_t	pattr;
-
-	/* Allocate memory for the attribute object: */
-	if ((pattr = (pthread_attr_t) malloc(sizeof(struct pthread_attr))) == NULL)
-		/* Insufficient memory: */
-		ret = ENOMEM;
-	else {
-		/* Initialise the attribute object with the defaults: */
-		memcpy(pattr, &_pthread_attr_default, sizeof(*pattr));
-
-		/* Return a pointer to the attribute object: */
-		*attr = pattr;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_setcreatesuspend_np.c b/lib/libc/uthread/uthread_attr_setcreatesuspend_np.c
deleted file mode 100644
index 7edbf17..0000000
--- a/lib/libc/uthread/uthread_attr_setcreatesuspend_np.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_attr_setcreatesuspend_np.c,v 1.5 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setcreatesuspend_np, pthread_attr_setcreatesuspend_np);
-
-int
-_pthread_attr_setcreatesuspend_np(pthread_attr_t *attr)
-{
-	int	ret;
-	if (attr == NULL || *attr == NULL) {
-		errno = EINVAL;
-		ret = -1;
-	} else {
-		(*attr)->suspend = PTHREAD_CREATE_SUSPENDED;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_setdetachstate.c b/lib/libc/uthread/uthread_attr_setdetachstate.c
deleted file mode 100644
index 66c5c80..0000000
--- a/lib/libc/uthread/uthread_attr_setdetachstate.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_attr_setdetachstate.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setdetachstate, pthread_attr_setdetachstate);
-
-int
-_pthread_attr_setdetachstate(pthread_attr_t *attr, int detachstate)
-{
-	int	ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL ||
-	    (detachstate != PTHREAD_CREATE_DETACHED &&
-	    detachstate != PTHREAD_CREATE_JOINABLE))
-		ret = EINVAL;
-	else {
-		/* Check if detached state: */
-		if (detachstate == PTHREAD_CREATE_DETACHED)
-			/* Set the detached flag: */
-			(*attr)->flags |= PTHREAD_DETACHED;
-		else
-			/* Reset the detached flag: */
-			(*attr)->flags &= ~PTHREAD_DETACHED;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_setguardsize.c b/lib/libc/uthread/uthread_attr_setguardsize.c
deleted file mode 100644
index 404d167..0000000
--- a/lib/libc/uthread/uthread_attr_setguardsize.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2001 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer
- *    unmodified other than the allowable addition of one or more
- *    copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_attr_setguardsize.c,v 1.3 2002/05/15 05:37:48 alfred Exp $
- */
-
-#include <sys/param.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setguardsize, pthread_attr_setguardsize);
-
-int
-_pthread_attr_setguardsize(pthread_attr_t *attr, size_t guardsize)
-{
-	int	ret;
-
-	/* Check for invalid arguments. */
-	if (attr == NULL || *attr == NULL)
-		ret = EINVAL;
-	else {
-		/*
-		 * Round guardsize up to the nearest multiple of
-		 * _pthread_page_size.
-		 */
-		if (guardsize % _pthread_page_size != 0)
-			guardsize = ((guardsize / _pthread_page_size) + 1) *
-			    _pthread_page_size;
-
-		/* Save the stack size. */
-		(*attr)->guardsize_attr = guardsize;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_setinheritsched.c b/lib/libc/uthread/uthread_attr_setinheritsched.c
deleted file mode 100644
index 03729d3..0000000
--- a/lib/libc/uthread/uthread_attr_setinheritsched.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_attr_setinheritsched.c,v 1.5 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setinheritsched, pthread_attr_setinheritsched);
-
-int
-_pthread_attr_setinheritsched(pthread_attr_t *attr, int sched_inherit)
-{
-	int ret = 0;
-
-	if ((attr == NULL) || (*attr == NULL))
-		ret = EINVAL;
-	else
-		(*attr)->sched_inherit = sched_inherit;
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_setschedparam.c b/lib/libc/uthread/uthread_attr_setschedparam.c
deleted file mode 100644
index 2ab5964..0000000
--- a/lib/libc/uthread/uthread_attr_setschedparam.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_attr_setschedparam.c,v 1.8 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setschedparam, pthread_attr_setschedparam);
-
-int
-_pthread_attr_setschedparam(pthread_attr_t *attr, const struct sched_param *param)
-{
-	int ret = 0;
-
-	if ((attr == NULL) || (*attr == NULL))
-		ret = EINVAL;
-	else if (param == NULL) {
-		ret = ENOTSUP;
-	} else if ((param->sched_priority < PTHREAD_MIN_PRIORITY) ||
-	    (param->sched_priority > PTHREAD_MAX_PRIORITY)) {
-		/* Return an unsupported value error. */
-		ret = ENOTSUP;
-	} else
-		(*attr)->prio = param->sched_priority;
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_setschedpolicy.c b/lib/libc/uthread/uthread_attr_setschedpolicy.c
deleted file mode 100644
index 642263f..0000000
--- a/lib/libc/uthread/uthread_attr_setschedpolicy.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_attr_setschedpolicy.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setschedpolicy, pthread_attr_setschedpolicy);
-
-int
-_pthread_attr_setschedpolicy(pthread_attr_t *attr, int policy)
-{
-	int ret = 0;
-
-	if ((attr == NULL) || (*attr == NULL))
-		ret = EINVAL;
-	else if ((policy < SCHED_FIFO) || (policy > SCHED_RR)) {
-		ret = ENOTSUP;
-	} else
-		(*attr)->sched_policy = policy;
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_setscope.c b/lib/libc/uthread/uthread_attr_setscope.c
deleted file mode 100644
index 6d739c4..0000000
--- a/lib/libc/uthread/uthread_attr_setscope.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_attr_setscope.c,v 1.7 2002/02/14 15:20:36 maxim Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setscope, pthread_attr_setscope);
-
-int
-_pthread_attr_setscope(pthread_attr_t *attr, int contentionscope)
-{
-	int ret = 0;
-
-	if ((attr == NULL) || (*attr == NULL)) {
-		/* Return an invalid argument: */
-		ret = EINVAL;
-	} else if ((contentionscope != PTHREAD_SCOPE_PROCESS) ||
-	    (contentionscope == PTHREAD_SCOPE_SYSTEM)) {
-		/* We don't support PTHREAD_SCOPE_SYSTEM. */
-		ret = ENOTSUP;
-	} else
-		(*attr)->flags |= contentionscope;
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_setstack.c b/lib/libc/uthread/uthread_attr_setstack.c
deleted file mode 100644
index c51f943..0000000
--- a/lib/libc/uthread/uthread_attr_setstack.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2003 Craig Rodrigues <rodrigc@attbi.com>.
- * 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 Craig Rodrigues.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY CRAIG RODRIGUES 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/lib/libc_r/uthread/uthread_attr_setstack.c,v 1.1 2003/02/10 08:48:03 alfred Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setstack, pthread_attr_setstack);
-
-int
-_pthread_attr_setstack(pthread_attr_t *attr, void *stackaddr,
-                        size_t stacksize)
-{
-	int     ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL || stackaddr == NULL
-	    || stacksize < PTHREAD_STACK_MIN )
-		ret = EINVAL;
-	else {
-		/* Save the stack address and stack size */
-		(*attr)->stackaddr_attr = stackaddr;
-		(*attr)->stacksize_attr = stacksize;
-		ret = 0;
-	}
-	return(ret);
-}
-
diff --git a/lib/libc/uthread/uthread_attr_setstackaddr.c b/lib/libc/uthread/uthread_attr_setstackaddr.c
deleted file mode 100644
index c06d34d..0000000
--- a/lib/libc/uthread/uthread_attr_setstackaddr.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_attr_setstackaddr.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setstackaddr, pthread_attr_setstackaddr);
-
-int
-_pthread_attr_setstackaddr(pthread_attr_t *attr, void *stackaddr)
-{
-	int	ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL || stackaddr == NULL)
-		ret = EINVAL;
-	else {
-		/* Save the stack address: */
-		(*attr)->stackaddr_attr = stackaddr;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_attr_setstacksize.c b/lib/libc/uthread/uthread_attr_setstacksize.c
deleted file mode 100644
index 71cc726..0000000
--- a/lib/libc/uthread/uthread_attr_setstacksize.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_attr_setstacksize.c,v 1.7 2001/04/10 04:19:19 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_attr_setstacksize, pthread_attr_setstacksize);
-
-int
-_pthread_attr_setstacksize(pthread_attr_t *attr, size_t stacksize)
-{
-	int	ret;
-
-	/* Check for invalid arguments: */
-	if (attr == NULL || *attr == NULL || stacksize < PTHREAD_STACK_MIN)
-		ret = EINVAL;
-	else {
-		/* Save the stack size: */
-		(*attr)->stacksize_attr = stacksize;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_autoinit.c b/lib/libc/uthread/uthread_autoinit.c
deleted file mode 100644
index a8ba932..0000000
--- a/lib/libc/uthread/uthread_autoinit.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2002 Alfred Perlstein <alfred@freebsd.org>.
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_autoinit.c,v 1.2 2002/11/13 18:13:26 deischen Exp $
- */
-
-#include <pthread.h>
-#include <pthread_private.h>
-
-/*
- * This module uses GCC extentions to initialize the
- * threads package at program start-up time.
- */
-
-void	_thread_init_hack(void) __attribute__ ((constructor));
-
-void
-_thread_init_hack(void)
-{
-
-	_thread_init();
-}
-
-/*
- * For the shared version of the threads library, the above is sufficient.
- * But for the archive version of the library, we need a little bit more.
- * Namely, we must arrange for this particular module to be pulled in from
- * the archive library at link time.  To accomplish that, we define and
- * initialize a variable, "_thread_autoinit_dummy_decl".  This variable is
- * referenced (as an extern) from libc/stdlib/exit.c. This will always
- * create a need for this module, ensuring that it is present in the
- * executable.
- */
-extern int _thread_autoinit_dummy_decl;
-int _thread_autoinit_dummy_decl = 0;
diff --git a/lib/libc/uthread/uthread_bind.c b/lib/libc/uthread/uthread_bind.c
deleted file mode 100644
index 8816451..0000000
--- a/lib/libc/uthread/uthread_bind.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_bind.c,v 1.11 2001/04/10 04:19:19 deischen Exp $
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_bind, bind);
-
-int
-_bind(int fd, const struct sockaddr * name, socklen_t namelen)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		ret = __sys_bind(fd, name, namelen);
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_cancel.c b/lib/libc/uthread/uthread_cancel.c
deleted file mode 100644
index 68487da..0000000
--- a/lib/libc/uthread/uthread_cancel.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * David Leonard <d@openbsd.org>, 1999. Public domain.
- * $FreeBSD: src/lib/libc_r/uthread/uthread_cancel.c,v 1.14 2002/05/24 04:32:28 deischen Exp $
- */
-#include <sys/errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-static void	finish_cancellation(void *arg);
-
-__weak_reference(_pthread_cancel, pthread_cancel);
-__weak_reference(_pthread_setcancelstate, pthread_setcancelstate);
-__weak_reference(_pthread_setcanceltype, pthread_setcanceltype);
-__weak_reference(_pthread_testcancel, pthread_testcancel);
-
-int
-_pthread_cancel(pthread_t pthread)
-{
-	int ret;
-
-	if ((ret = _find_thread(pthread)) != 0) {
-		/* NOTHING */
-	} else if (pthread->state == PS_DEAD || pthread->state == PS_DEADLOCK
-	    || (pthread->flags & PTHREAD_EXITING) != 0) {
-		ret = 0;
-	} else {
-		/* Protect the scheduling queues: */
-		_thread_kern_sig_defer();
-
-		if (((pthread->cancelflags & PTHREAD_CANCEL_DISABLE) != 0) ||
-		    (((pthread->cancelflags & PTHREAD_CANCEL_ASYNCHRONOUS) == 0) &&
-		    ((pthread->cancelflags & PTHREAD_AT_CANCEL_POINT) == 0)))
-			/* Just mark it for cancellation: */
-			pthread->cancelflags |= PTHREAD_CANCELLING;
-		else {
-			/*
-			 * Check if we need to kick it back into the
-			 * run queue:
-			 */
-			switch (pthread->state) {
-			case PS_RUNNING:
-				/* No need to resume: */
-				pthread->cancelflags |= PTHREAD_CANCELLING;
-				break;
-
-			case PS_SPINBLOCK:
-			case PS_FDR_WAIT:
-			case PS_FDW_WAIT:
-			case PS_POLL_WAIT:
-			case PS_SELECT_WAIT:
-				/* Remove these threads from the work queue: */
-				if ((pthread->flags & PTHREAD_FLAGS_IN_WORKQ)
-				    != 0)
-					PTHREAD_WORKQ_REMOVE(pthread);
-				/* Fall through: */
-			case PS_SIGTHREAD:
-			case PS_SLEEP_WAIT:
-			case PS_WAIT_WAIT:
-			case PS_SIGSUSPEND:
-			case PS_SIGWAIT:
-				/* Interrupt and resume: */
-				pthread->interrupted = 1;
-				pthread->cancelflags |= PTHREAD_CANCELLING;
-				PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-				break;
-
-			case PS_JOIN:
-				/*
-				 * Disconnect the thread from the joinee:
-				 */
-				if (pthread->join_status.thread != NULL) {
-					pthread->join_status.thread->joiner
-					    = NULL;
-					pthread->join_status.thread = NULL;
-				}
-				pthread->cancelflags |= PTHREAD_CANCELLING;
-				PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-				break;
-
-			case PS_SUSPENDED:
-			case PS_MUTEX_WAIT:
-			case PS_COND_WAIT:
-			case PS_FDLR_WAIT:
-			case PS_FDLW_WAIT:
-			case PS_FILE_WAIT:
-				/*
-				 * Threads in these states may be in queues.
-				 * In order to preserve queue integrity, the
-				 * cancelled thread must remove itself from the
-				 * queue.  Mark the thread as interrupted and
-				 * needing cancellation, and set the state to
-				 * running.  When the thread resumes, it will
-				 * remove itself from the queue and call the
-				 * cancellation completion routine.
-				 */
-				pthread->interrupted = 1;
-				pthread->cancelflags |= PTHREAD_CANCEL_NEEDED;
-				PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-				pthread->continuation = finish_cancellation;
-				break;
-
-			case PS_DEAD:
-			case PS_DEADLOCK:
-			case PS_STATE_MAX:
-				/* Ignore - only here to silence -Wall: */
-				break;
-			}
-		}
-
-		/* Unprotect the scheduling queues: */
-		_thread_kern_sig_undefer();
-
-		ret = 0;
-	}
-	return (ret);
-}
-
-int
-_pthread_setcancelstate(int state, int *oldstate)
-{
-	struct pthread	*curthread = _get_curthread();
-	int ostate;
-	int ret;
-
-	ostate = curthread->cancelflags & PTHREAD_CANCEL_DISABLE;
-
-	switch (state) {
-	case PTHREAD_CANCEL_ENABLE:
-		if (oldstate != NULL)
-			*oldstate = ostate;
-		curthread->cancelflags &= ~PTHREAD_CANCEL_DISABLE;
-		if ((curthread->cancelflags & PTHREAD_CANCEL_ASYNCHRONOUS) != 0)
-			pthread_testcancel();
-		ret = 0;
-		break;
-	case PTHREAD_CANCEL_DISABLE:
-		if (oldstate != NULL)
-			*oldstate = ostate;
-		curthread->cancelflags |= PTHREAD_CANCEL_DISABLE;
-		ret = 0;
-		break;
-	default:
-		ret = EINVAL;
-	}
-
-	return (ret);
-}
-
-int
-_pthread_setcanceltype(int type, int *oldtype)
-{
-	struct pthread	*curthread = _get_curthread();
-	int otype;
-	int ret;
-
-	otype = curthread->cancelflags & PTHREAD_CANCEL_ASYNCHRONOUS;
-	switch (type) {
-	case PTHREAD_CANCEL_ASYNCHRONOUS:
-		if (oldtype != NULL)
-			*oldtype = otype;
-		curthread->cancelflags |= PTHREAD_CANCEL_ASYNCHRONOUS;
-		pthread_testcancel();
-		ret = 0;
-		break;
-	case PTHREAD_CANCEL_DEFERRED:
-		if (oldtype != NULL)
-			*oldtype = otype;
-		curthread->cancelflags &= ~PTHREAD_CANCEL_ASYNCHRONOUS;
-		ret = 0;
-		break;
-	default:
-		ret = EINVAL;
-	}
-
-	return (ret);
-}
-
-void
-_pthread_testcancel(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	if (((curthread->cancelflags & PTHREAD_CANCEL_DISABLE) == 0) &&
-	    ((curthread->cancelflags & PTHREAD_CANCELLING) != 0) &&
-	    ((curthread->flags & PTHREAD_EXITING) == 0)) {
-		/*
-		 * It is possible for this thread to be swapped out
-		 * while performing cancellation; do not allow it
-		 * to be cancelled again.
-		 */
-		curthread->cancelflags &= ~PTHREAD_CANCELLING;
-		_thread_exit_cleanup();
-		pthread_exit(PTHREAD_CANCELED);
-		PANIC("cancel");
-	}
-}
-
-void
-_thread_enter_cancellation_point(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/* Look for a cancellation before we block: */
-	pthread_testcancel();
-	curthread->cancelflags |= PTHREAD_AT_CANCEL_POINT;
-}
-
-void
-_thread_leave_cancellation_point(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	curthread->cancelflags &= ~PTHREAD_AT_CANCEL_POINT;
-	/* Look for a cancellation after we unblock: */
-	pthread_testcancel();
-}
-
-static void
-finish_cancellation(void *arg)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	curthread->continuation = NULL;
-	curthread->interrupted = 0;
-
-	if ((curthread->cancelflags & PTHREAD_CANCEL_NEEDED) != 0) {
-		curthread->cancelflags &= ~PTHREAD_CANCEL_NEEDED;
-		_thread_exit_cleanup();
-		pthread_exit(PTHREAD_CANCELED);
-	}
-}
diff --git a/lib/libc/uthread/uthread_clean.c b/lib/libc/uthread/uthread_clean.c
deleted file mode 100644
index dc5f8fe..0000000
--- a/lib/libc/uthread/uthread_clean.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_clean.c,v 1.6 2001/04/10 04:19:19 deischen Exp $
- */
-#include <signal.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_cleanup_push, pthread_cleanup_push);
-__weak_reference(_pthread_cleanup_pop, pthread_cleanup_pop);
-
-void
-_pthread_cleanup_push(void (*routine) (void *), void *routine_arg)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct pthread_cleanup *new;
-
-	if ((new = (struct pthread_cleanup *) malloc(sizeof(struct pthread_cleanup))) != NULL) {
-		new->routine = routine;
-		new->routine_arg = routine_arg;
-		new->next = curthread->cleanup;
-
-		curthread->cleanup = new;
-	}
-}
-
-void
-_pthread_cleanup_pop(int execute)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct pthread_cleanup *old;
-
-	if ((old = curthread->cleanup) != NULL) {
-		curthread->cleanup = old->next;
-		if (execute) {
-			old->routine(old->routine_arg);
-		}
-		free(old);
-	}
-}
-
diff --git a/lib/libc/uthread/uthread_close.c b/lib/libc/uthread/uthread_close.c
deleted file mode 100644
index a7aa24e..0000000
--- a/lib/libc/uthread/uthread_close.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_close.c,v 1.16 2003/06/09 16:45:37 netchild Exp $
- */
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__close, close);
-
-int
-_close(int fd)
-{
-	int		flags;
-	int		ret;
-	struct stat	sb;
-	struct fd_table_entry	*entry;
-
-	if ((fd < 0) || (fd >= _thread_dtablesize) ||
-	    (fd == _thread_kern_pipe[0]) || (fd == _thread_kern_pipe[1]) ||
-	    (_thread_fd_table[fd] == NULL)) {
-		/*
-		 * Don't allow silly programs to close the kernel pipe
-		 * and non-active descriptors.
-		 */
-		errno = EBADF;
-		ret = -1;
-	}
-	/*
-	 * Lock the file descriptor while the file is closed and get
-	 * the file descriptor status:
-	 */
-	else if (((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) &&
-	    ((ret = __sys_fstat(fd, &sb)) == 0)) {
-		/*
-		 * Check if the file should be left as blocking.
-		 *
-		 * This is so that the file descriptors shared with a parent
-		 * process aren't left set to non-blocking if the child
-		 * closes them prior to exit.  An example where this causes
-		 * problems with /bin/sh is when a child closes stdin.
-		 *
-		 * Setting a file as blocking causes problems if a threaded
-		 * parent accesses the file descriptor before the child exits.
-		 * Once the threaded parent receives a SIGCHLD then it resets
-		 * all of its files to non-blocking, and so it is then safe
-		 * to access them.
-		 *
-		 * Pipes are not set to blocking when they are closed, as
-		 * the parent and child will normally close the file
-		 * descriptor of the end of the pipe that they are not
-		 * using, which would then cause any reads to block
-		 * indefinitely.
-		 */
-		if ((S_ISREG(sb.st_mode) || S_ISCHR(sb.st_mode))
-		    && (_thread_fd_getflags(fd) & O_NONBLOCK) == 0) {
-			/* Get the current flags: */
-			flags = __sys_fcntl(fd, F_GETFL, NULL);
-			/* Clear the nonblocking file descriptor flag: */
-			__sys_fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
-		}
-
-		/* XXX: Assumes well behaved threads. */
-		/* XXX: Defer real close to avoid race condition */
-		entry = _thread_fd_table[fd];
-		_thread_fd_table[fd] = NULL;
-		free(entry);
-
-		/* Drop stale pthread stdio descriptor flags. */
-		if (fd < 3)
-			_pthread_stdio_flags[fd] = -1;
-
-		/* Close the file descriptor: */
-		ret = __sys_close(fd);
-	}
-	return (ret);
-}
-
-int
-__close(int fd)
-{
-	int	ret;
-
-	_thread_enter_cancellation_point();
-	ret = _close(fd);
-	_thread_leave_cancellation_point();
-	
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_concurrency.c b/lib/libc/uthread/uthread_concurrency.c
deleted file mode 100644
index 8662bb5..0000000
--- a/lib/libc/uthread/uthread_concurrency.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2003 Sergey Osokin <osa@FreeBSD.org.ru>.
- * 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 Sergey Osokin.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY SERGEY OSOKIN 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/lib/libc_r/uthread/uthread_concurrency.c,v 1.1 2003/04/20 01:53:12 jdp Exp $
- */
-
-#include <errno.h>
-
-static int current_concurrency = 0;
-
-__weak_reference(_pthread_getconcurrency, pthread_getconcurrency);
-__weak_reference(_pthread_setconcurrency, pthread_setconcurrency);
-
-int
-_pthread_getconcurrency(void)
-{
-	return current_concurrency;
-}
-
-int
-_pthread_setconcurrency(int new_level)
-{
-	int ret;
-
-	if (new_level < 0) {
-		ret = EINVAL;
-	} else {
-		current_concurrency = new_level;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_cond.c b/lib/libc/uthread/uthread_cond.c
deleted file mode 100644
index dee5cab..0000000
--- a/lib/libc/uthread/uthread_cond.c
+++ /dev/null
@@ -1,768 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_cond.c,v 1.34 2002/11/13 18:13:26 deischen Exp $
- */
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-#include "pthread_private.h"
-
-/*
- * Prototypes
- */
-static inline pthread_t	cond_queue_deq(pthread_cond_t);
-static inline void	cond_queue_remove(pthread_cond_t, pthread_t);
-static inline void	cond_queue_enq(pthread_cond_t, pthread_t);
-int			__pthread_cond_timedwait(pthread_cond_t *,
-				pthread_mutex_t *, const struct timespec *);
-int			__pthread_cond_wait(pthread_cond_t *,
-				pthread_mutex_t *);
-
-
-/*
- * Double underscore versions are cancellation points.  Single underscore
- * versions are not and are provided for libc internal usage (which
- * shouldn't introduce cancellation points).
- */
-__weak_reference(__pthread_cond_wait, pthread_cond_wait);
-__weak_reference(__pthread_cond_timedwait, pthread_cond_timedwait);
-
-__weak_reference(_pthread_cond_init, pthread_cond_init);
-__weak_reference(_pthread_cond_destroy, pthread_cond_destroy);
-__weak_reference(_pthread_cond_signal, pthread_cond_signal);
-__weak_reference(_pthread_cond_broadcast, pthread_cond_broadcast);
-
-
-/*
- * Reinitialize a private condition variable; this is only used for
- * internal condition variables.  Currently, there is no difference.
- */
-int
-_cond_reinit(pthread_cond_t *cond)
-{
-	int ret = 0;
-
-	if (cond == NULL)
-		ret = EINVAL;
-	else if (*cond == NULL)
-		ret = _pthread_cond_init(cond, NULL);
-	else {
-		/*
-		 * Initialize the condition variable structure:
-		 */
-		TAILQ_INIT(&(*cond)->c_queue);
-		(*cond)->c_flags = COND_FLAGS_INITED;
-		(*cond)->c_type = COND_TYPE_FAST;
-		(*cond)->c_mutex = NULL;
-		(*cond)->c_seqno = 0;
-		memset(&(*cond)->lock, 0, sizeof((*cond)->lock));
-	}
-	return (ret);
-}
-
-int
-_pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *cond_attr)
-{
-	enum pthread_cond_type type;
-	pthread_cond_t	pcond;
-	int             rval = 0;
-
-	if (cond == NULL)
-		rval = EINVAL;
-	else {
-		/*
-		 * Check if a pointer to a condition variable attribute
-		 * structure was passed by the caller: 
-		 */
-		if (cond_attr != NULL && *cond_attr != NULL) {
-			/* Default to a fast condition variable: */
-			type = (*cond_attr)->c_type;
-		} else {
-			/* Default to a fast condition variable: */
-			type = COND_TYPE_FAST;
-		}
-
-		/* Process according to condition variable type: */
-		switch (type) {
-		/* Fast condition variable: */
-		case COND_TYPE_FAST:
-			/* Nothing to do here. */
-			break;
-
-		/* Trap invalid condition variable types: */
-		default:
-			/* Return an invalid argument error: */
-			rval = EINVAL;
-			break;
-		}
-
-		/* Check for no errors: */
-		if (rval == 0) {
-			if ((pcond = (pthread_cond_t)
-			    malloc(sizeof(struct pthread_cond))) == NULL) {
-				rval = ENOMEM;
-			} else {
-				/*
-				 * Initialise the condition variable
-				 * structure:
-				 */
-				TAILQ_INIT(&pcond->c_queue);
-				pcond->c_flags |= COND_FLAGS_INITED;
-				pcond->c_type = type;
-				pcond->c_mutex = NULL;
-				pcond->c_seqno = 0;
-				memset(&pcond->lock,0,sizeof(pcond->lock));
-				*cond = pcond;
-			}
-		}
-	}
-	/* Return the completion status: */
-	return (rval);
-}
-
-int
-_pthread_cond_destroy(pthread_cond_t *cond)
-{
-	int             rval = 0;
-
-	if (cond == NULL || *cond == NULL)
-		rval = EINVAL;
-	else {
-		/* Lock the condition variable structure: */
-		_SPINLOCK(&(*cond)->lock);
-
-		/*
-		 * Free the memory allocated for the condition
-		 * variable structure:
-		 */
-		free(*cond);
-
-		/*
-		 * NULL the caller's pointer now that the condition
-		 * variable has been destroyed:
-		 */
-		*cond = NULL;
-	}
-	/* Return the completion status: */
-	return (rval);
-}
-
-int
-_pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	rval = 0;
-	int	done = 0;
-	int	interrupted = 0;
-	int	seqno;
-
-	if (cond == NULL)
-		return (EINVAL);
-
-	/*
-	 * If the condition variable is statically initialized,
-	 * perform the dynamic initialization:
-	 */
-	if (*cond == NULL &&
-	    (rval = _pthread_cond_init(cond, NULL)) != 0)
-		return (rval);
-
-	/*
-	 * Enter a loop waiting for a condition signal or broadcast
-	 * to wake up this thread.  A loop is needed in case the waiting
-	 * thread is interrupted by a signal to execute a signal handler.
-	 * It is not (currently) possible to remain in the waiting queue
-	 * while running a handler.  Instead, the thread is interrupted
-	 * and backed out of the waiting queue prior to executing the
-	 * signal handler.
-	 */
-	do {
-		/* Lock the condition variable structure: */
-		_SPINLOCK(&(*cond)->lock);
-
-		/*
-		 * If the condvar was statically allocated, properly
-		 * initialize the tail queue.
-		 */
-		if (((*cond)->c_flags & COND_FLAGS_INITED) == 0) {
-			TAILQ_INIT(&(*cond)->c_queue);
-			(*cond)->c_flags |= COND_FLAGS_INITED;
-		}
-
-		/* Process according to condition variable type: */
-		switch ((*cond)->c_type) {
-		/* Fast condition variable: */
-		case COND_TYPE_FAST:
-			if ((mutex == NULL) || (((*cond)->c_mutex != NULL) &&
-			    ((*cond)->c_mutex != *mutex))) {
-				/* Unlock the condition variable structure: */
-				_SPINUNLOCK(&(*cond)->lock);
-
-				/* Return invalid argument error: */
-				rval = EINVAL;
-			} else {
-				/* Reset the timeout and interrupted flags: */
-				curthread->timeout = 0;
-				curthread->interrupted = 0;
-
-				/*
-				 * Queue the running thread for the condition
-				 * variable:
-				 */
-				cond_queue_enq(*cond, curthread);
-
-				/* Remember the mutex and sequence number: */
-				(*cond)->c_mutex = *mutex;
-				seqno = (*cond)->c_seqno;
-
-				/* Wait forever: */
-				curthread->wakeup_time.tv_sec = -1;
-
-				/* Unlock the mutex: */
-				if ((rval = _mutex_cv_unlock(mutex)) != 0) {
-					/*
-					 * Cannot unlock the mutex, so remove
-					 * the running thread from the condition
-					 * variable queue:
-					 */
-					cond_queue_remove(*cond, curthread);
-
-					/* Check for no more waiters: */
-					if (TAILQ_FIRST(&(*cond)->c_queue) ==
-					    NULL)
-						(*cond)->c_mutex = NULL;
-
-					/* Unlock the condition variable structure: */
-					_SPINUNLOCK(&(*cond)->lock);
-				} else {
-					/*
-					 * Schedule the next thread and unlock
-					 * the condition variable structure:
-					 */
-					_thread_kern_sched_state_unlock(PS_COND_WAIT,
-				    	    &(*cond)->lock, __FILE__, __LINE__);
-
-					done = (seqno != (*cond)->c_seqno);
-
-					interrupted = curthread->interrupted;
-
-					/*
-					 * Check if the wait was interrupted
-					 * (canceled) or needs to be resumed
-					 * after handling a signal.
-					 */
-					if (interrupted != 0) {
-						/*
-						 * Lock the mutex and ignore any
-						 * errors.  Note that even
-						 * though this thread may have
-						 * been canceled, POSIX requires
-						 * that the mutex be reaquired
-						 * prior to cancellation.
-						 */
-						(void)_mutex_cv_lock(mutex);
-					} else {
-						/*
-						 * Lock the condition variable
-						 * while removing the thread.
-						 */
-						_SPINLOCK(&(*cond)->lock);
-
-						cond_queue_remove(*cond,
-						    curthread);
-
-						/* Check for no more waiters: */
-						if (TAILQ_FIRST(&(*cond)->c_queue) == NULL)
-							(*cond)->c_mutex = NULL;
-
-						_SPINUNLOCK(&(*cond)->lock);
-
-						/* Lock the mutex: */
-						rval = _mutex_cv_lock(mutex);
-					}
-				}
-			}
-			break;
-
-		/* Trap invalid condition variable types: */
-		default:
-			/* Unlock the condition variable structure: */
-			_SPINUNLOCK(&(*cond)->lock);
-
-			/* Return an invalid argument error: */
-			rval = EINVAL;
-			break;
-		}
-
-		if ((interrupted != 0) && (curthread->continuation != NULL))
-			curthread->continuation((void *) curthread);
-	} while ((done == 0) && (rval == 0));
-
-	/* Return the completion status: */
-	return (rval);
-}
-
-int
-__pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _pthread_cond_wait(cond, mutex);
-	_thread_leave_cancellation_point();
-	return (ret);
-}
-
-int
-_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-		       const struct timespec *abstime)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	rval = 0;
-	int	done = 0;
-	int	interrupted = 0;
-	int	seqno;
-
-	if (abstime == NULL || abstime->tv_sec < 0 || abstime->tv_nsec < 0 ||
-	    abstime->tv_nsec >= 1000000000)
-		return (EINVAL);
-	/*
-	 * If the condition variable is statically initialized, perform dynamic
-	 * initialization.
-	 */
-	if (*cond == NULL && (rval = _pthread_cond_init(cond, NULL)) != 0)
-		return (rval);
-
-	/*
-	 * Enter a loop waiting for a condition signal or broadcast
-	 * to wake up this thread.  A loop is needed in case the waiting
-	 * thread is interrupted by a signal to execute a signal handler.
-	 * It is not (currently) possible to remain in the waiting queue
-	 * while running a handler.  Instead, the thread is interrupted
-	 * and backed out of the waiting queue prior to executing the
-	 * signal handler.
-	 */
-	do {
-		/* Lock the condition variable structure: */
-		_SPINLOCK(&(*cond)->lock);
-
-		/*
-		 * If the condvar was statically allocated, properly
-		 * initialize the tail queue.
-		 */
-		if (((*cond)->c_flags & COND_FLAGS_INITED) == 0) {
-			TAILQ_INIT(&(*cond)->c_queue);
-			(*cond)->c_flags |= COND_FLAGS_INITED;
-		}
-
-		/* Process according to condition variable type: */
-		switch ((*cond)->c_type) {
-		/* Fast condition variable: */
-		case COND_TYPE_FAST:
-			if ((mutex == NULL) || (((*cond)->c_mutex != NULL) &&
-			    ((*cond)->c_mutex != *mutex))) {
-				/* Return invalid argument error: */
-				rval = EINVAL;
-
-				/* Unlock the condition variable structure: */
-				_SPINUNLOCK(&(*cond)->lock);
-			} else {
-				/* Set the wakeup time: */
-				curthread->wakeup_time.tv_sec =
-				    abstime->tv_sec;
-				curthread->wakeup_time.tv_nsec =
-				    abstime->tv_nsec;
-
-				/* Reset the timeout and interrupted flags: */
-				curthread->timeout = 0;
-				curthread->interrupted = 0;
-
-				/*
-				 * Queue the running thread for the condition
-				 * variable:
-				 */
-				cond_queue_enq(*cond, curthread);
-
-				/* Remember the mutex and sequence number: */
-				(*cond)->c_mutex = *mutex;
-				seqno = (*cond)->c_seqno;
-
-				/* Unlock the mutex: */
-				if ((rval = _mutex_cv_unlock(mutex)) != 0) {
-					/*
-					 * Cannot unlock the mutex, so remove
-					 * the running thread from the condition
-					 * variable queue: 
-					 */
-					cond_queue_remove(*cond, curthread);
-
-					/* Check for no more waiters: */
-					if (TAILQ_FIRST(&(*cond)->c_queue) == NULL)
-						(*cond)->c_mutex = NULL;
-
-					/* Unlock the condition variable structure: */
-					_SPINUNLOCK(&(*cond)->lock);
-				} else {
-					/*
-					 * Schedule the next thread and unlock
-					 * the condition variable structure:
-					 */
-					_thread_kern_sched_state_unlock(PS_COND_WAIT,
-				  	     &(*cond)->lock, __FILE__, __LINE__);
-
-					done = (seqno != (*cond)->c_seqno);
-
-					interrupted = curthread->interrupted;
-
-					/*
-					 * Check if the wait was interrupted
-					 * (canceled) or needs to be resumed
-					 * after handling a signal.
-					 */
-					if (interrupted != 0) {
-						/*
-						 * Lock the mutex and ignore any
-						 * errors.  Note that even
-						 * though this thread may have
-						 * been canceled, POSIX requires
-						 * that the mutex be reaquired
-						 * prior to cancellation.
-						 */
-						(void)_mutex_cv_lock(mutex);
-					} else {
-						/*
-						 * Lock the condition variable
-						 * while removing the thread.
-						 */
-						_SPINLOCK(&(*cond)->lock);
-
-						cond_queue_remove(*cond,
-						    curthread);
-
-						/* Check for no more waiters: */
-						if (TAILQ_FIRST(&(*cond)->c_queue) == NULL)
-							(*cond)->c_mutex = NULL;
-
-						_SPINUNLOCK(&(*cond)->lock);
-
-						/* Lock the mutex: */
-						rval = _mutex_cv_lock(mutex);
-
-						/*
-						 * Return ETIMEDOUT if the wait
-						 * timed out and there wasn't an
-						 * error locking the mutex:
-						 */
-						if ((curthread->timeout != 0)
-						    && rval == 0)
-							rval = ETIMEDOUT;
-
-					}
-				}
-			}
-			break;
-
-		/* Trap invalid condition variable types: */
-		default:
-			/* Unlock the condition variable structure: */
-			_SPINUNLOCK(&(*cond)->lock);
-
-			/* Return an invalid argument error: */
-			rval = EINVAL;
-			break;
-		}
-
-		if ((interrupted != 0) && (curthread->continuation != NULL))
-			curthread->continuation((void *) curthread);
-	} while ((done == 0) && (rval == 0));
-
-	/* Return the completion status: */
-	return (rval);
-}
-
-int
-__pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-		       const struct timespec *abstime)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _pthread_cond_timedwait(cond, mutex, abstime);
-	_thread_enter_cancellation_point();
-	return (ret);
-}
-
-int
-_pthread_cond_signal(pthread_cond_t *cond)
-{
-	int             rval = 0;
-	pthread_t       pthread;
-
-	if (cond == NULL)
-		rval = EINVAL;
-       /*
-        * If the condition variable is statically initialized, perform dynamic
-        * initialization.
-        */
-	else if (*cond != NULL ||
-	    (rval = _pthread_cond_init(cond, NULL)) == 0) {
-		/*
-		 * Defer signals to protect the scheduling queues
-		 * from access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		/* Lock the condition variable structure: */
-		_SPINLOCK(&(*cond)->lock);
-
-		/* Process according to condition variable type: */
-		switch ((*cond)->c_type) {
-		/* Fast condition variable: */
-		case COND_TYPE_FAST:
-			/* Increment the sequence number: */
-			(*cond)->c_seqno++;
-
-			if ((pthread = cond_queue_deq(*cond)) != NULL) {
-				/*
-				 * Wake up the signaled thread:
-				 */
-				PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-			}
-
-			/* Check for no more waiters: */
-			if (TAILQ_FIRST(&(*cond)->c_queue) == NULL)
-				(*cond)->c_mutex = NULL;
-			break;
-
-		/* Trap invalid condition variable types: */
-		default:
-			/* Return an invalid argument error: */
-			rval = EINVAL;
-			break;
-		}
-
-		/* Unlock the condition variable structure: */
-		_SPINUNLOCK(&(*cond)->lock);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	}
-
-	/* Return the completion status: */
-	return (rval);
-}
-
-int
-_pthread_cond_broadcast(pthread_cond_t *cond)
-{
-	int             rval = 0;
-	pthread_t       pthread;
-
-	if (cond == NULL)
-		rval = EINVAL;
-       /*
-        * If the condition variable is statically initialized, perform dynamic
-        * initialization.
-        */
-	else if (*cond != NULL ||
-	    (rval = _pthread_cond_init(cond, NULL)) == 0) {
-		/*
-		 * Defer signals to protect the scheduling queues
-		 * from access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		/* Lock the condition variable structure: */
-		_SPINLOCK(&(*cond)->lock);
-
-		/* Process according to condition variable type: */
-		switch ((*cond)->c_type) {
-		/* Fast condition variable: */
-		case COND_TYPE_FAST:
-			/* Increment the sequence number: */
-			(*cond)->c_seqno++;
-
-			/*
-			 * Enter a loop to bring all threads off the
-			 * condition queue:
-			 */
-			while ((pthread = cond_queue_deq(*cond)) != NULL) {
-				/*
-				 * Wake up the signaled thread:
-				 */
-				PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-			}
-
-			/* There are no more waiting threads: */
-			(*cond)->c_mutex = NULL;
-			break;
-	
-		/* Trap invalid condition variable types: */
-		default:
-			/* Return an invalid argument error: */
-			rval = EINVAL;
-			break;
-		}
-
-		/* Unlock the condition variable structure: */
-		_SPINUNLOCK(&(*cond)->lock);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	}
-
-	/* Return the completion status: */
-	return (rval);
-}
-
-void
-_cond_wait_backout(pthread_t pthread)
-{
-	pthread_cond_t	cond;
-
-	cond = pthread->data.cond;
-	if (cond != NULL) {
-		/*
-		 * Defer signals to protect the scheduling queues
-		 * from access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		/* Lock the condition variable structure: */
-		_SPINLOCK(&cond->lock);
-
-		/* Process according to condition variable type: */
-		switch (cond->c_type) {
-		/* Fast condition variable: */
-		case COND_TYPE_FAST:
-			cond_queue_remove(cond, pthread);
-
-			/* Check for no more waiters: */
-			if (TAILQ_FIRST(&cond->c_queue) == NULL)
-				cond->c_mutex = NULL;
-			break;
-
-		default:
-			break;
-		}
-
-		/* Unlock the condition variable structure: */
-		_SPINUNLOCK(&cond->lock);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	}
-}
-
-/*
- * Dequeue a waiting thread from the head of a condition queue in
- * descending priority order.
- */
-static inline pthread_t
-cond_queue_deq(pthread_cond_t cond)
-{
-	pthread_t pthread;
-
-	while ((pthread = TAILQ_FIRST(&cond->c_queue)) != NULL) {
-		TAILQ_REMOVE(&cond->c_queue, pthread, sqe);
-		pthread->flags &= ~PTHREAD_FLAGS_IN_CONDQ;
-		if ((pthread->timeout == 0) && (pthread->interrupted == 0))
-			/*
-			 * Only exit the loop when we find a thread
-			 * that hasn't timed out or been canceled;
-			 * those threads are already running and don't
-			 * need their run state changed.
-			 */
-			break;
-	}
-
-	return(pthread);
-}
-
-/*
- * Remove a waiting thread from a condition queue in descending priority
- * order.
- */
-static inline void
-cond_queue_remove(pthread_cond_t cond, pthread_t pthread)
-{
-	/*
-	 * Because pthread_cond_timedwait() can timeout as well
-	 * as be signaled by another thread, it is necessary to
-	 * guard against removing the thread from the queue if
-	 * it isn't in the queue.
-	 */
-	if (pthread->flags & PTHREAD_FLAGS_IN_CONDQ) {
-		TAILQ_REMOVE(&cond->c_queue, pthread, sqe);
-		pthread->flags &= ~PTHREAD_FLAGS_IN_CONDQ;
-	}
-}
-
-/*
- * Enqueue a waiting thread to a condition queue in descending priority
- * order.
- */
-static inline void
-cond_queue_enq(pthread_cond_t cond, pthread_t pthread)
-{
-	pthread_t tid = TAILQ_LAST(&cond->c_queue, cond_head);
-
-	PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread);
-
-	/*
-	 * For the common case of all threads having equal priority,
-	 * we perform a quick check against the priority of the thread
-	 * at the tail of the queue.
-	 */
-	if ((tid == NULL) || (pthread->active_priority <= tid->active_priority))
-		TAILQ_INSERT_TAIL(&cond->c_queue, pthread, sqe);
-	else {
-		tid = TAILQ_FIRST(&cond->c_queue);
-		while (pthread->active_priority <= tid->active_priority)
-			tid = TAILQ_NEXT(tid, sqe);
-		TAILQ_INSERT_BEFORE(tid, pthread, sqe);
-	}
-	pthread->flags |= PTHREAD_FLAGS_IN_CONDQ;
-	pthread->data.cond = cond;
-}
diff --git a/lib/libc/uthread/uthread_condattr_destroy.c b/lib/libc/uthread/uthread_condattr_destroy.c
deleted file mode 100644
index 2cb83f3..0000000
--- a/lib/libc/uthread/uthread_condattr_destroy.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_condattr_destroy.c,v 1.6 2001/04/10 04:19:20 deischen Exp $
- */
-#include <stdlib.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_condattr_destroy, pthread_condattr_destroy);
-
-int
-_pthread_condattr_destroy(pthread_condattr_t *attr)
-{
-	int	ret;
-	if (attr == NULL || *attr == NULL) {
-		ret = EINVAL;
-	} else {
-		free(*attr);
-		*attr = NULL;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_condattr_init.c b/lib/libc/uthread/uthread_condattr_init.c
deleted file mode 100644
index 2fb0bf5..0000000
--- a/lib/libc/uthread/uthread_condattr_init.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_condattr_init.c,v 1.7 2002/11/13 18:13:26 deischen Exp $
- */
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_condattr_init, pthread_condattr_init);
-
-static struct pthread_cond_attr default_condattr = PTHREAD_CONDATTR_DEFAULT;
-
-int
-_pthread_condattr_init(pthread_condattr_t *attr)
-{
-	int ret;
-	pthread_condattr_t pattr;
-
-	if ((pattr = (pthread_condattr_t)
-	    malloc(sizeof(struct pthread_cond_attr))) == NULL) {
-		ret = ENOMEM;
-	} else {
-		memcpy(pattr, &default_condattr,
-		    sizeof(struct pthread_cond_attr));
-		*attr = pattr;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_connect.c b/lib/libc/uthread/uthread_connect.c
deleted file mode 100644
index d65a501..0000000
--- a/lib/libc/uthread/uthread_connect.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_connect.c,v 1.14 2002/12/19 11:39:20 ru Exp $
- */
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__connect, connect);
-
-int
-_connect(int fd, const struct sockaddr * name, socklen_t namelen)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct sockaddr tmpname;
-	int             errnolen, ret, tmpnamelen;
-
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		if ((ret = __sys_connect(fd, name, namelen)) < 0) {
-			if ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0
-			    && ((errno == EWOULDBLOCK) || (errno == EINPROGRESS)
-			    || (errno == EALREADY) || (errno == EAGAIN))) {
-				curthread->data.fd.fd = fd;
-
-				/* Set the timeout: */
-				_thread_kern_set_timeout(NULL);
-				_thread_kern_sched_state(PS_FDW_WAIT, __FILE__, __LINE__);
-
-				tmpnamelen = sizeof(tmpname);
-				/* 0 now lets see if it really worked */
-				if (((ret = __sys_getpeername(fd, &tmpname, &tmpnamelen)) < 0) && (errno == ENOTCONN)) {
-
-					/*
-					 * Get the error, this function
-					 * should not fail 
-					 */
-					errnolen = sizeof(errno);
-					__sys_getsockopt(fd, SOL_SOCKET, SO_ERROR, &errno, &errnolen);
-				}
-			} else {
-				ret = -1;
-			}
-		}
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	return (ret);
-}
-
-int
-__connect(int fd, const struct sockaddr * name, socklen_t namelen)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _connect(fd, name, namelen);
-	_thread_leave_cancellation_point();
-
- 	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_creat.c b/lib/libc/uthread/uthread_creat.c
deleted file mode 100644
index 087d7a5..0000000
--- a/lib/libc/uthread/uthread_creat.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_creat.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(___creat, creat);
-
-int
-___creat(const char *path, mode_t mode)
-{
-	int	ret;
-
-	_thread_enter_cancellation_point();
-	ret = __creat(path, mode);
-	_thread_leave_cancellation_point();
-	
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_create.c b/lib/libc/uthread/uthread_create.c
deleted file mode 100644
index b333d7b..0000000
--- a/lib/libc/uthread/uthread_create.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_create.c,v 1.38 2003/12/03 06:54:40 peter Exp $
- */
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stddef.h>
-#include <sys/time.h>
-#include <machine/reg.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "pthread_private.h"
-#include "libc_private.h"
-
-static u_int64_t next_uniqueid = 1;
-
-#define OFF(f)	offsetof(struct pthread, f)
-int _thread_next_offset			= OFF(tle.tqe_next);
-int _thread_uniqueid_offset		= OFF(uniqueid);
-int _thread_state_offset		= OFF(state);
-int _thread_name_offset			= OFF(name);
-int _thread_ctx_offset			= OFF(ctx);
-#undef OFF
-
-int _thread_PS_RUNNING_value		= PS_RUNNING;
-int _thread_PS_DEAD_value		= PS_DEAD;
-
-__weak_reference(_pthread_create, pthread_create);
-
-int
-_pthread_create(pthread_t *thread, const pthread_attr_t *attr,
-	       void *(*start_routine) (void *), void *arg)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct itimerval itimer;
-	int		f_gc = 0;
-	int             ret = 0;
-	pthread_t       gc_thread;
-	pthread_t       new_thread;
-	pthread_attr_t	pattr;
-	void           *stack;
-#if !defined(__ia64__)
-	u_long 		stackp;
-#endif
-
-	if (thread == NULL)
-		return(EINVAL);
-
-	/*
-	 * Locking functions in libc are required when there are
-	 * threads other than the initial thread.
-	 */
-	__isthreaded = 1;
-
-	/* Allocate memory for the thread structure: */
-	if ((new_thread = (pthread_t) malloc(sizeof(struct pthread))) == NULL) {
-		/* Insufficient memory to create a thread: */
-		ret = EAGAIN;
-	} else {
-		/* Check if default thread attributes are required: */
-		if (attr == NULL || *attr == NULL) {
-			/* Use the default thread attributes: */
-			pattr = &_pthread_attr_default;
-		} else {
-			pattr = *attr;
-		}
-		/* Check if a stack was specified in the thread attributes: */
-		if ((stack = pattr->stackaddr_attr) != NULL) {
-		}
-		/* Allocate a stack: */
-		else {
-			stack = _thread_stack_alloc(pattr->stacksize_attr,
-			    pattr->guardsize_attr);
-			if (stack == NULL) {
-				ret = EAGAIN;
-				free(new_thread);
-			}
-		}
-
-		/* Check for errors: */
-		if (ret != 0) {
-		} else {
-			/* Initialise the thread structure: */
-			memset(new_thread, 0, sizeof(struct pthread));
-			new_thread->slice_usec = -1;
-			new_thread->stack = stack;
-			new_thread->start_routine = start_routine;
-			new_thread->arg = arg;
-
-			new_thread->cancelflags = PTHREAD_CANCEL_ENABLE |
-			    PTHREAD_CANCEL_DEFERRED;
-
-			/*
-			 * Write a magic value to the thread structure
-			 * to help identify valid ones:
-			 */
-			new_thread->magic = PTHREAD_MAGIC;
-
-			/* Initialise the thread for signals: */
-			new_thread->sigmask = curthread->sigmask;
-			new_thread->sigmask_seqno = 0;
-
-			/* Initialize the signal frame: */
-			new_thread->curframe = NULL;
-
-			/* Initialise the jump buffer: */
-			_setjmp(new_thread->ctx.jb);
-
-			/*
-			 * Set up new stack frame so that it looks like it
-			 * returned from a longjmp() to the beginning of
-			 * _thread_start().
-			 */
-			SET_RETURN_ADDR_JB(new_thread->ctx.jb, _thread_start);
-
-#if !defined(__ia64__)
-			stackp = (long)new_thread->stack + pattr->stacksize_attr - sizeof(double);
-#if defined(__amd64__)
-			stackp &= ~0xFUL;
-#endif
-			/* The stack starts high and builds down: */
-			SET_STACK_JB(new_thread->ctx.jb, stackp);
-#else
-			SET_STACK_JB(new_thread->ctx.jb,
-			    (long)new_thread->stack, pattr->stacksize_attr);
-#endif
-
-			/* Copy the thread attributes: */
-			memcpy(&new_thread->attr, pattr, sizeof(struct pthread_attr));
-
-			/*
-			 * Check if this thread is to inherit the scheduling
-			 * attributes from its parent:
-			 */
-			if (new_thread->attr.flags & PTHREAD_INHERIT_SCHED) {
-				/* Copy the scheduling attributes: */
-				new_thread->base_priority =
-				    curthread->base_priority &
-				    ~PTHREAD_SIGNAL_PRIORITY;
-				new_thread->attr.prio =
-				    curthread->base_priority &
-				    ~PTHREAD_SIGNAL_PRIORITY;
-				new_thread->attr.sched_policy =
-				    curthread->attr.sched_policy;
-			} else {
-				/*
-				 * Use just the thread priority, leaving the
-				 * other scheduling attributes as their
-				 * default values:
-				 */
-				new_thread->base_priority =
-				    new_thread->attr.prio;
-			}
-			new_thread->active_priority = new_thread->base_priority;
-			new_thread->inherited_priority = 0;
-
-			/* Initialize joiner to NULL (no joiner): */
-			new_thread->joiner = NULL;
-
-			/* Initialize the mutex queue: */
-			TAILQ_INIT(&new_thread->mutexq);
-
-			/* Initialise hooks in the thread structure: */
-			new_thread->specific = NULL;
-			new_thread->cleanup = NULL;
-			new_thread->flags = 0;
-			new_thread->poll_data.nfds = 0;
-			new_thread->poll_data.fds = NULL;
-			new_thread->continuation = NULL;
-
-			/*
-			 * Defer signals to protect the scheduling queues
-			 * from access by the signal handler:
-			 */
-			_thread_kern_sig_defer();
-
-			/*
-			 * Initialise the unique id which GDB uses to
-			 * track threads.
-			 */
-			new_thread->uniqueid = next_uniqueid++;
-
-			/*
-			 * Check if the garbage collector thread
-			 * needs to be started.
-			 */
-			f_gc = (TAILQ_FIRST(&_thread_list) == _thread_initial);
-
-			/* Add the thread to the linked list of all threads: */
-			TAILQ_INSERT_HEAD(&_thread_list, new_thread, tle);
-
-			if (pattr->suspend == PTHREAD_CREATE_SUSPENDED) {
-				new_thread->flags |= PTHREAD_FLAGS_SUSPENDED;
-				new_thread->state = PS_SUSPENDED;
-			} else {
-				new_thread->state = PS_RUNNING;
-				PTHREAD_PRIOQ_INSERT_TAIL(new_thread);
-			}
-
-			/*
-			 * Undefer and handle pending signals, yielding
-			 * if necessary.
-			 */
-			_thread_kern_sig_undefer();
-
-			/* Return a pointer to the thread structure: */
-			(*thread) = new_thread;
-
-			if (f_gc != 0) {
-				/* Install the scheduling timer: */
-				itimer.it_interval.tv_sec = 0;
-				itimer.it_interval.tv_usec = _clock_res_usec;
-				itimer.it_value = itimer.it_interval;
-				if (setitimer(_ITIMER_SCHED_TIMER, &itimer,
-				    NULL) != 0)
-					PANIC("Cannot set interval timer");
-			}
-
-			/* Schedule the new user thread: */
-			_thread_kern_sched(NULL);
-
-			/*
-			 * Start a garbage collector thread
-			 * if necessary.
-			 */
-			if (f_gc && _pthread_create(&gc_thread, NULL,
-				    _thread_gc, NULL) != 0)
-				PANIC("Can't create gc thread");
-
-		}
-	}
-
-	/* Return the status: */
-	return (ret);
-}
-
-void
-_thread_start(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/* We just left the scheduler via longjmp: */
-	_thread_kern_in_sched = 0;
-
-	/* Run the current thread's start routine with argument: */
-	_pthread_exit(curthread->start_routine(curthread->arg));
-
-	/* This point should never be reached. */
-	PANIC("Thread has resumed after exit");
-}
diff --git a/lib/libc/uthread/uthread_detach.c b/lib/libc/uthread/uthread_detach.c
deleted file mode 100644
index 7d586b9..0000000
--- a/lib/libc/uthread/uthread_detach.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_detach.c,v 1.17 2002/03/06 19:28:41 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_detach, pthread_detach);
-
-int
-_pthread_detach(pthread_t pthread)
-{
-	int             rval = 0;
-
-	/* Check for invalid calling parameters: */
-	if (pthread == NULL || pthread->magic != PTHREAD_MAGIC)
-		/* Return an invalid argument error: */
-		rval = EINVAL;
-
-	/* Check if the thread has not been detached: */
-	else if ((pthread->attr.flags & PTHREAD_DETACHED) == 0) {
-		/* Flag the thread as detached: */
-		pthread->attr.flags |= PTHREAD_DETACHED;
-
-		/*
-		 * Defer signals to protect the scheduling queues from
-		 * access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		/* Check if there is a joiner: */
-		if (pthread->joiner != NULL) {
-			struct pthread	*joiner = pthread->joiner;
-
-			/* Make the thread runnable: */
-			PTHREAD_NEW_STATE(joiner, PS_RUNNING);
-
-			/* Set the return value for the woken thread: */
-			joiner->join_status.error = ESRCH;
-			joiner->join_status.ret = NULL;
-			joiner->join_status.thread = NULL;
-
-			/*
-			 * Disconnect the joiner from the thread being detached:
-			 */
-			pthread->joiner = NULL;
-		}
-
-		/*
-		 * Undefer and handle pending signals, yielding if a
-		 * scheduling signal occurred while in the critical region.
-		 */
-		_thread_kern_sig_undefer();
-	} else
-		/* Return an error: */
-		rval = EINVAL;
-
-	/* Return the completion status: */
-	return (rval);
-}
diff --git a/lib/libc/uthread/uthread_dup.c b/lib/libc/uthread/uthread_dup.c
deleted file mode 100644
index 130a29b..0000000
--- a/lib/libc/uthread/uthread_dup.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_dup.c,v 1.11 2002/08/29 23:06:07 deischen Exp $
- */
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_dup, dup);
-
-int
-_dup(int fd)
-{
-	int             ret;
-
-	/* Lock the file descriptor: */
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		/* Perform the 'dup' syscall: */
-		if ((ret = __sys_dup(fd)) < 0) {
-		}
-		/* Initialise the file descriptor table entry: */
-		else if (_thread_fd_table_init(ret) != 0) {
-			/* Quietly close the file: */
-			__sys_close(ret);
-
-			/* Reset the file descriptor: */
-			ret = -1;
-		} else {
-			/*
-			 * Save the file open flags so that they can be
-			 * checked later: 
-			 */
-			_thread_fd_setflags(ret, _thread_fd_getflags(fd));
-		}
-
-		/* Unlock the file descriptor: */
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_dup2.c b/lib/libc/uthread/uthread_dup2.c
deleted file mode 100644
index 01fab8c..0000000
--- a/lib/libc/uthread/uthread_dup2.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_dup2.c,v 1.14 2002/08/29 23:06:07 deischen Exp $
- */
-#include <errno.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_dup2, dup2);
-
-int
-_dup2(int fd, int newfd)
-{
-	int             ret;
-	int		newfd_opened;
-
-	/* Check if the file descriptor is out of range: */
-	if (newfd < 0 || newfd >= _thread_dtablesize ||
-	    newfd == _thread_kern_pipe[0] || newfd == _thread_kern_pipe[1]) {
-		/* Return a bad file descriptor error: */
-		errno = EBADF;
-		ret = -1;
-	}
-
-	/* Lock the file descriptor: */
-	else if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		/* Lock the file descriptor: */
-		if (!(newfd_opened = (_thread_fd_table[newfd] != NULL)) || 
-		    (ret = _FD_LOCK(newfd, FD_RDWR, NULL)) == 0) {
-			/* Perform the 'dup2' syscall: */
-			ret = __sys_dup2(fd, newfd);
-			if (ret >= 0) {
-				/*
-				 * If we are duplicating one of the standard
-				 * file descriptors, update its flags in the
-				 * table of pthread stdio descriptor flags.
-				 */
-				if (ret < 3) {
-					_pthread_stdio_flags[ret] =
-					    _thread_fd_table[fd]->flags;
-				}
-				/* Initialise the file descriptor table entry */
-				if (_thread_fd_table_init(ret) != 0) {
-					/* Quietly close the file: */
-					__sys_close(ret);
-
-					/* Reset the file descriptor: */
-					ret = -1;
-				} else {
-					/*
-					 * Save the file open flags so that
-					 * they can be checked later: 
-					 */
-					_thread_fd_setflags(ret,
-					    _thread_fd_getflags(fd));
-				}
-			}
-
-			/* Unlock the file descriptor: */
-			if (newfd_opened)
-				_FD_UNLOCK(newfd, FD_RDWR);
-		}
-		/* Unlock the file descriptor: */
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_equal.c b/lib/libc/uthread/uthread_equal.c
deleted file mode 100644
index 45ed67b..0000000
--- a/lib/libc/uthread/uthread_equal.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_equal.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
- */
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_equal, pthread_equal);
-
-int
-_pthread_equal(pthread_t t1, pthread_t t2)
-{
-	/* Compare the two thread pointers: */
-	return (t1 == t2);
-}
diff --git a/lib/libc/uthread/uthread_execve.c b/lib/libc/uthread/uthread_execve.c
deleted file mode 100644
index d91cb0d..0000000
--- a/lib/libc/uthread/uthread_execve.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_execve.c,v 1.16 2002/11/15 00:34:28 archie Exp $
- */
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_execve, execve);
-
-int 
-_execve(const char *name, char *const * argv, char *const * envp)
-{
-	struct pthread	*curthread = _get_curthread();
-	int		flags;
-	int             i;
-	int             ret;
-	struct sigaction act;
-	struct sigaction oact;
-	struct itimerval itimer;
-
-	/* Disable the interval timer: */
-	itimer.it_interval.tv_sec  = 0;
-	itimer.it_interval.tv_usec = 0;
-	itimer.it_value.tv_sec     = 0;
-	itimer.it_value.tv_usec    = 0;
-	setitimer(_ITIMER_SCHED_TIMER, &itimer, NULL);
-
-	/* Close the pthread kernel pipe: */
-	__sys_close(_thread_kern_pipe[0]);
-	__sys_close(_thread_kern_pipe[1]);
-
-	/*
-	 * Enter a loop to set all file descriptors to blocking
-	 * if they were not created as non-blocking:
-	 */
-	for (i = 0; i < _thread_dtablesize; i++) {
-		/* Check if this file descriptor is in use: */
-		if (_thread_fd_table[i] != NULL &&
-		    (_thread_fd_getflags(i) & O_NONBLOCK) == 0) {
-			/* Skip if the close-on-exec flag is set */
-			flags = __sys_fcntl(i, F_GETFD, NULL);
-			if ((flags & FD_CLOEXEC) != 0)
-				continue;	/* don't bother, no point */
-			/* Get the current flags: */
-			flags = __sys_fcntl(i, F_GETFL, NULL);
-			/* Clear the nonblocking file descriptor flag: */
-			__sys_fcntl(i, F_SETFL, flags & ~O_NONBLOCK);
-		}
-	}
-
-	/* Enter a loop to adopt the signal actions for the running thread: */
-	for (i = 1; i < NSIG; i++) {
-		/* Check for signals which cannot be caught: */
-		if (i == SIGKILL || i == SIGSTOP) {
-			/* Don't do anything with these signals. */
-		} else {
-			/* Check if ignoring this signal: */
-			if (_thread_sigact[i - 1].sa_handler == SIG_IGN) {
-				/* Continue to ignore this signal: */
-				act.sa_handler = SIG_IGN;
-			} else {
-				/* Use the default handler for this signal: */
-				act.sa_handler = SIG_DFL;
-			}
-
-			/* Copy the mask and flags for this signal: */
-			act.sa_mask = _thread_sigact[i - 1].sa_mask;
-			act.sa_flags = _thread_sigact[i - 1].sa_flags;
-
-			/* Change the signal action for the process: */
-			__sys_sigaction(i, &act, &oact);
-		}
-	}
-
-	/* Set the signal mask: */
-	__sys_sigprocmask(SIG_SETMASK, &curthread->sigmask, NULL);
-
-	/* Execute the process: */
-	ret = __sys_execve(name, argv, envp);
-
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_exit.c b/lib/libc/uthread/uthread_exit.c
deleted file mode 100644
index 7ab7741..0000000
--- a/lib/libc/uthread/uthread_exit.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_exit.c,v 1.29 2005/05/31 19:56:52 jhb Exp $
- */
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-#include "pthread_private.h"
-
-__weak_reference(_pthread_exit, pthread_exit);
-
-void
-_exit(int status)
-{
-	int		flags;
-	int             i;
-	struct itimerval itimer;
-
-	/* Disable the interval timer: */
-	itimer.it_interval.tv_sec  = 0;
-	itimer.it_interval.tv_usec = 0;
-	itimer.it_value.tv_sec     = 0;
-	itimer.it_value.tv_usec    = 0;
-	setitimer(_ITIMER_SCHED_TIMER, &itimer, NULL);
-
-	/* Close the pthread kernel pipe: */
-	__sys_close(_thread_kern_pipe[0]);
-	__sys_close(_thread_kern_pipe[1]);
-
-	/*
-	 * Enter a loop to set all file descriptors to blocking
-	 * if they were not created as non-blocking:
-	 */
-	for (i = 0; i < _thread_dtablesize; i++) {
-		/* Check if this file descriptor is in use: */
-		if (_thread_fd_table[i] != NULL &&
-		    (_thread_fd_getflags(i) & O_NONBLOCK) == 0) {
-			/* Get the current flags: */
-			flags = __sys_fcntl(i, F_GETFL, NULL);
-			/* Clear the nonblocking file descriptor flag: */
-			__sys_fcntl(i, F_SETFL, flags & ~O_NONBLOCK);
-		}
-	}
-
-	/* Call the _exit syscall: */
-	__sys_exit(status);
-}
-
-void
-_thread_exit(char *fname, int lineno, char *string)
-{
-	char            s[256];
-
-	/* Prepare an error message string: */
-	snprintf(s, sizeof(s),
-	    "Fatal error '%s' at line %d in file %s (errno = %d)\n",
-	    string, lineno, fname, errno);
-
-	/* Write the string to the standard error file descriptor: */
-	__sys_write(2, s, strlen(s));
-
-	/* Force this process to exit: */
-	/* XXX - Do we want abort to be conditional on _PTHREADS_INVARIANTS? */
-#if defined(_PTHREADS_INVARIANTS)
-	abort();
-#else
-	__sys_exit(1);
-#endif
-}
-
-/*
- * Only called when a thread is cancelled.  It may be more useful
- * to call it from pthread_exit() if other ways of asynchronous or
- * abnormal thread termination can be found.
- */
-void
-_thread_exit_cleanup(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/*
-	 * POSIX states that cancellation/termination of a thread should
-	 * not release any visible resources (such as mutexes) and that
-	 * it is the applications responsibility.  Resources that are
-	 * internal to the threads library, including file and fd locks,
-	 * are not visible to the application and need to be released.
-	 */
-	/* Unlock all owned fd locks: */
-	_thread_fd_unlock_owned(curthread);
-
-	/* Unlock all private mutexes: */
-	_mutex_unlock_private(curthread);
-
-	/*
-	 * This still isn't quite correct because we don't account
-	 * for held spinlocks (see libc/stdlib/malloc.c).
-	 */
-}
-
-void
-_pthread_exit(void *status)
-{
-	struct pthread	*curthread = _get_curthread();
-	pthread_t pthread;
-
-	/* Check if this thread is already in the process of exiting: */
-	if ((curthread->flags & PTHREAD_EXITING) != 0) {
-		char msg[128];
-		snprintf(msg, sizeof(msg), "Thread %p has called pthread_exit() from a destructor. POSIX 1003.1 1996 s16.2.5.2 does not allow this!",curthread);
-		PANIC(msg);
-	}
-
-	/* Flag this thread as exiting: */
-	curthread->flags |= PTHREAD_EXITING;
-
-	/* Save the return value: */
-	curthread->ret = status;
-
-	while (curthread->cleanup != NULL) {
-		pthread_cleanup_pop(1);
-	}
-	if (curthread->attr.cleanup_attr != NULL) {
-		curthread->attr.cleanup_attr(curthread->attr.arg_attr);
-	}
-	/* Check if there is thread specific data: */
-	if (curthread->specific != NULL) {
-		/* Run the thread-specific data destructors: */
-		_thread_cleanupspecific();
-	}
-
-	/* Free thread-specific poll_data structure, if allocated: */
-	if (curthread->poll_data.fds != NULL) {
-		free(curthread->poll_data.fds);
-		curthread->poll_data.fds = NULL;
-	}
-
-	/*
-	 * Lock the garbage collector mutex to ensure that the garbage
-	 * collector is not using the dead thread list.
-	 */
-	if (_pthread_mutex_lock(&_gc_mutex) != 0)
-		PANIC("Cannot lock gc mutex");
-
-	/* Add this thread to the list of dead threads. */
-	TAILQ_INSERT_HEAD(&_dead_list, curthread, dle);
-
-	/*
-	 * Signal the garbage collector thread that there is something
-	 * to clean up.
-	 */
-	if (_pthread_cond_signal(&_gc_cond) != 0)
-		PANIC("Cannot signal gc cond");
-
-	/*
-	 * Avoid a race condition where a scheduling signal can occur
-	 * causing the garbage collector thread to run.  If this happens,
-	 * the current thread can be cleaned out from under us.
-	 */
-	_thread_kern_sig_defer();
-
-	/* Unlock the garbage collector mutex: */
-	if (_pthread_mutex_unlock(&_gc_mutex) != 0)
-		PANIC("Cannot unlock gc mutex");
-
-	/* Check if there is a thread joining this one: */
-	if (curthread->joiner != NULL) {
-		pthread = curthread->joiner;
-		curthread->joiner = NULL;
-
-		/* Make the joining thread runnable: */
-		PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-
-		/* Set the return value for the joining thread: */
-		pthread->join_status.ret = curthread->ret;
-		pthread->join_status.error = 0;
-		pthread->join_status.thread = NULL;
-
-		/* Make this thread collectable by the garbage collector. */
-		PTHREAD_ASSERT(((curthread->attr.flags & PTHREAD_DETACHED) ==
-		    0), "Cannot join a detached thread");
-		curthread->attr.flags |= PTHREAD_DETACHED;
-	}
-
-	/* Remove this thread from the thread list: */
-	TAILQ_REMOVE(&_thread_list, curthread, tle);
-
-	/* This thread will never be re-scheduled. */
-	_thread_kern_sched_state(PS_DEAD, __FILE__, __LINE__);
-
-	/* This point should not be reached. */
-	PANIC("Dead thread has resumed");
-}
diff --git a/lib/libc/uthread/uthread_fchflags.c b/lib/libc/uthread/uthread_fchflags.c
deleted file mode 100644
index 4fdd502..0000000
--- a/lib/libc/uthread/uthread_fchflags.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * David Leonard <d@openbsd.org>, 1999. Public Domain.
- *
- * $OpenBSD: uthread_fchflags.c,v 1.1 1999/01/08 05:42:18 d Exp $
- * $FreeBSD: src/lib/libc_r/uthread/uthread_fchflags.c,v 1.6 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <sys/stat.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_fchflags, fchflags);
-int
-_fchflags(int fd, u_long flags)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-		ret = __sys_fchflags(fd, flags);
-		_FD_UNLOCK(fd, FD_WRITE);
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_fchmod.c b/lib/libc/uthread/uthread_fchmod.c
deleted file mode 100644
index a5fe333..0000000
--- a/lib/libc/uthread/uthread_fchmod.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_fchmod.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_fchmod, fchmod);
-
-int
-_fchmod(int fd, mode_t mode)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-		ret = __sys_fchmod(fd, mode);
-		_FD_UNLOCK(fd, FD_WRITE);
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_fchown.c b/lib/libc/uthread/uthread_fchown.c
deleted file mode 100644
index a599a83..0000000
--- a/lib/libc/uthread/uthread_fchown.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_fchown.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/types.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_fchown, fchown);
-
-int
-_fchown(int fd, uid_t owner, gid_t group)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-		ret = __sys_fchown(fd, owner, group);
-		_FD_UNLOCK(fd, FD_WRITE);
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_fcntl.c b/lib/libc/uthread/uthread_fcntl.c
deleted file mode 100644
index 6e40023..0000000
--- a/lib/libc/uthread/uthread_fcntl.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_fcntl.c,v 1.15 2002/08/29 23:06:07 deischen Exp $
- */
-#include <stdarg.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__fcntl, fcntl);
-
-int
-_fcntl(int fd, int cmd,...)
-{
-	int             flags = 0;
-	int		nonblock;
-	int             oldfd;
-	int             ret;
-	va_list         ap;
-
-	/* Lock the file descriptor: */
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		/* Initialise the variable argument list: */
-		va_start(ap, cmd);
-
-		/* Process according to file control command type: */
-		switch (cmd) {
-		/* Duplicate a file descriptor: */
-		case F_DUPFD:
-			/*
-			 * Get the file descriptor that the caller wants to
-			 * use: 
-			 */
-			oldfd = va_arg(ap, int);
-
-			/* Initialise the file descriptor table entry: */
-			if ((ret = __sys_fcntl(fd, cmd, oldfd)) < 0) {
-			}
-			/* Initialise the file descriptor table entry: */
-			else if (_thread_fd_table_init(ret) != 0) {
-				/* Quietly close the file: */
-				__sys_close(ret);
-
-				/* Reset the file descriptor: */
-				ret = -1;
-			} else {
-				/*
-				 * Save the file open flags so that they can
-				 * be checked later: 
-				 */
-				_thread_fd_setflags(ret,
-				    _thread_fd_getflags(fd));
-			}
-			break;
-		case F_SETFD:
-			flags = va_arg(ap, int);
-			ret = __sys_fcntl(fd, cmd, flags);
-			break;
-		case F_GETFD:
-			ret = __sys_fcntl(fd, cmd, 0);
-			break;
-		case F_GETFL:
-			ret = _thread_fd_getflags(fd);
-			break;
-		case F_SETFL:
-			/*
-			 * Get the file descriptor flags passed by the
-			 * caller:
-			 */
-			flags = va_arg(ap, int);
-
-			/*
-			 * Check if the user wants a non-blocking file
-			 * descriptor:
-			 */
-			nonblock = flags & O_NONBLOCK;
-
-			/* Set the file descriptor flags: */
-			if ((ret = __sys_fcntl(fd, cmd, flags | O_NONBLOCK)) != 0) {
-
-			/* Get the flags so that we behave like the kernel: */
-			} else if ((flags = __sys_fcntl(fd,
-			    F_GETFL, 0)) == -1) {
-				/* Error getting flags: */
-				ret = -1;
-
-			/*
-			 * Check if the file descriptor is non-blocking
-			 * with respect to the user:
-			 */
-			} else if (nonblock)
-				/* A non-blocking descriptor: */
-				_thread_fd_setflags(fd, flags | O_NONBLOCK);
-			else
-				/* Save the flags: */
-				_thread_fd_setflags(fd, flags & ~O_NONBLOCK);
-			break;
-		default:
-			/* Might want to make va_arg use a union */
-			ret = __sys_fcntl(fd, cmd, va_arg(ap, void *));
-			break;
-		}
-
-		/* Free variable arguments: */
-		va_end(ap);
-
-		/* Unlock the file descriptor: */
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	/* Return the completion status: */
-	return (ret);
-}
-
-int
-__fcntl(int fd, int cmd,...)
-{
-	int	ret;
-	va_list	ap;
-	
-	_thread_enter_cancellation_point();
-
-	va_start(ap, cmd);
-	switch (cmd) {
-		case F_DUPFD:
-		case F_SETFD:
-		case F_SETFL:
-			ret = _fcntl(fd, cmd, va_arg(ap, int));
-			break;
-		case F_GETFD:
-		case F_GETFL:
-			ret = _fcntl(fd, cmd);
-			break;
-		default:
-			ret = _fcntl(fd, cmd, va_arg(ap, void *));
-	}
-	va_end(ap);
-
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_fd.c b/lib/libc/uthread/uthread_fd.c
deleted file mode 100644
index 532e275..0000000
--- a/lib/libc/uthread/uthread_fd.c
+++ /dev/null
@@ -1,1056 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_fd.c,v 1.22 2002/08/29 23:06:07 deischen Exp $
- *
- */
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-#define FDQ_INSERT(q,p)					\
-do {							\
-	TAILQ_INSERT_TAIL(q,p,qe);			\
-	p->flags |= PTHREAD_FLAGS_IN_FDQ;		\
-} while (0)
-
-#define FDQ_REMOVE(q,p)					\
-do {							\
-	if ((p->flags & PTHREAD_FLAGS_IN_FDQ) != 0) {	\
-		TAILQ_REMOVE(q,p,qe);			\
-		p->flags &= ~PTHREAD_FLAGS_IN_FDQ;	\
-	}						\
-} while (0)
-
-
-/* Static variables: */
-static	spinlock_t	fd_table_lock	= _SPINLOCK_INITIALIZER;
-
-/* Prototypes: */
-#ifdef _FDLOCKS_ENABLED
-static inline pthread_t fd_next_reader(int fd);
-static inline pthread_t fd_next_writer(int fd);
-#endif
-
-
-/*
- * This function *must* return -1 and set the thread specific errno
- * as a system call. This is because the error return from this
- * function is propagated directly back from thread-wrapped system
- * calls.
- */
-
-int
-_thread_fd_table_init(int fd)
-{
-	int	ret = 0;
-	struct fd_table_entry *entry;
-	int	saved_errno;
-
-	if (_thread_initial == NULL)
-		_thread_init();
-
-	/* Check if the file descriptor is out of range: */
-	if (fd < 0 || fd >= _thread_dtablesize) {
-		/* Return a bad file descriptor error: */
-		errno = EBADF;
-		ret = -1;
-	}
-
-	/*
-	 * Check if memory has already been allocated for this file
-	 * descriptor: 
-	 */
-	else if (_thread_fd_table[fd] != NULL) {
-		/* Memory has already been allocated. */
-
-	/* Allocate memory for the file descriptor table entry: */
-	} else if ((entry = (struct fd_table_entry *)
-	    malloc(sizeof(struct fd_table_entry))) == NULL) {
-		/* Return an insufficient memory error: */
-		errno = ENOMEM;
-		ret = -1;
-	} else {
-		/* Initialise the file locks: */
-		memset(&entry->lock, 0, sizeof(entry->lock));
-		entry->r_owner = NULL;
-		entry->w_owner = NULL;
-		entry->r_fname = NULL;
-		entry->w_fname = NULL;
-		entry->r_lineno = 0;
-		entry->w_lineno = 0;
-		entry->r_lockcount = 0;
-		entry->w_lockcount = 0;
-
-		/* Initialise the read/write queues: */
-		TAILQ_INIT(&entry->r_queue);
-		TAILQ_INIT(&entry->w_queue);
-
-		/* Get the flags for the file: */
-		if (((fd >= 3) || (_pthread_stdio_flags[fd] == -1)) &&
-		    (entry->flags = __sys_fcntl(fd, F_GETFL, 0)) == -1) {
-			ret = -1;
-		}
-		else {
-			/* Check if a stdio descriptor: */
-			if ((fd < 3) && (_pthread_stdio_flags[fd] != -1))
-				/*
-				 * Use the stdio flags read by
-				 * _pthread_init() to avoid
-				 * mistaking the non-blocking
-				 * flag that, when set on one
-				 * stdio fd, is set on all stdio
-				 * fds.
-				 */
-				entry->flags = _pthread_stdio_flags[fd];
-
-			/*
-			 * Make the file descriptor non-blocking.
-			 * This might fail if the device driver does
-			 * not support non-blocking calls, or if the
-			 * driver is naturally non-blocking.
-			 */
-			saved_errno = errno;
-			__sys_fcntl(fd, F_SETFL,
-			    entry->flags | O_NONBLOCK);
-			errno = saved_errno;
-
-			/* Lock the file descriptor table: */
-			_SPINLOCK(&fd_table_lock);
-
-			/*
-			 * Check if another thread allocated the
-			 * file descriptor entry while this thread
-			 * was doing the same thing. The table wasn't
-			 * kept locked during this operation because
-			 * it has the potential to recurse.
-			 */
-			if (_thread_fd_table[fd] == NULL) {
-				/* This thread wins: */
-				_thread_fd_table[fd] = entry;
-				entry = NULL;
-			}
-
-			/* Unlock the file descriptor table: */
-			_SPINUNLOCK(&fd_table_lock);
-		}
-
-		/*
-		 * Check if another thread initialised the table entry
-		 * before this one could:
-		 */
-		if (entry != NULL)
-			/*
-			 * Throw away the table entry that this thread
-			 * prepared. The other thread wins.
-			 */
-			free(entry);
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
-
-int
-_thread_fd_getflags(int fd)
-{
-	if (_thread_fd_table[fd] != NULL)
-		return (_thread_fd_table[fd]->flags);
-	else
-		return (0);
-}
-
-void
-_thread_fd_setflags(int fd, int flags)
-{
-	if (_thread_fd_table[fd] != NULL)
-		_thread_fd_table[fd]->flags = flags;
-}
-
-#ifdef _FDLOCKS_ENABLED
-void
-_thread_fd_unlock(int fd, int lock_type)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	ret;
-
-	/*
-	 * Check that the file descriptor table is initialised for this
-	 * entry: 
-	 */
-	if ((ret = _thread_fd_table_init(fd)) == 0) {
-		/*
-		 * Defer signals to protect the scheduling queues from
-		 * access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		/*
-		 * Lock the file descriptor table entry to prevent
-		 * other threads for clashing with the current
-		 * thread's accesses:
-		 */
-		_SPINLOCK(&_thread_fd_table[fd]->lock);
-
-		/* Check if the running thread owns the read lock: */
-		if (_thread_fd_table[fd]->r_owner == curthread) {
-			/* Check the file descriptor and lock types: */
-			if (lock_type == FD_READ || lock_type == FD_RDWR) {
-				/*
-				 * Decrement the read lock count for the
-				 * running thread: 
-				 */
-				_thread_fd_table[fd]->r_lockcount--;
-
-				/*
-				 * Check if the running thread still has read
-				 * locks on this file descriptor: 
-				 */
-				if (_thread_fd_table[fd]->r_lockcount != 0) {
-				}
-				/*
-				 * Get the next thread in the queue for a
-				 * read lock on this file descriptor: 
-				 */
-				else if ((_thread_fd_table[fd]->r_owner = fd_next_reader(fd)) == NULL) {
-				} else {
-					/* Remove this thread from the queue: */
-					FDQ_REMOVE(&_thread_fd_table[fd]->r_queue,
-					    _thread_fd_table[fd]->r_owner);
-
-					/*
-					 * Set the state of the new owner of
-					 * the thread to running: 
-					 */
-					PTHREAD_NEW_STATE(_thread_fd_table[fd]->r_owner,PS_RUNNING);
-
-					/*
-					 * Reset the number of read locks.
-					 * This will be incremented by the
-					 * new owner of the lock when it sees
-					 * that it has the lock.                           
-					 */
-					_thread_fd_table[fd]->r_lockcount = 0;
-				}
-			}
-		}
-		/* Check if the running thread owns the write lock: */
-		if (_thread_fd_table[fd]->w_owner == curthread) {
-			/* Check the file descriptor and lock types: */
-			if (lock_type == FD_WRITE || lock_type == FD_RDWR) {
-				/*
-				 * Decrement the write lock count for the
-				 * running thread: 
-				 */
-				_thread_fd_table[fd]->w_lockcount--;
-
-				/*
-				 * Check if the running thread still has
-				 * write locks on this file descriptor: 
-				 */
-				if (_thread_fd_table[fd]->w_lockcount != 0) {
-				}
-				/*
-				 * Get the next thread in the queue for a
-				 * write lock on this file descriptor: 
-				 */
-				else if ((_thread_fd_table[fd]->w_owner = fd_next_writer(fd)) == NULL) {
-				} else {
-					/* Remove this thread from the queue: */
-					FDQ_REMOVE(&_thread_fd_table[fd]->w_queue,
-					    _thread_fd_table[fd]->w_owner);
-
-					/*
-					 * Set the state of the new owner of
-					 * the thread to running: 
-					 */
-					PTHREAD_NEW_STATE(_thread_fd_table[fd]->w_owner,PS_RUNNING);
-
-					/*
-					 * Reset the number of write locks.
-					 * This will be incremented by the
-					 * new owner of the lock when it  
-					 * sees that it has the lock.
-					 */
-					_thread_fd_table[fd]->w_lockcount = 0;
-				}
-			}
-		}
-
-		/* Unlock the file descriptor table entry: */
-		_SPINUNLOCK(&_thread_fd_table[fd]->lock);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	}
-}
-
-int
-_thread_fd_lock(int fd, int lock_type, struct timespec * timeout)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	ret;
-
-	/*
-	 * Check that the file descriptor table is initialised for this
-	 * entry: 
-	 */
-	if ((ret = _thread_fd_table_init(fd)) == 0) {
-		/* Clear the interrupted flag: */
-		curthread->interrupted = 0;
-		/*
-		 * Lock the file descriptor table entry to prevent
-		 * other threads for clashing with the current
-		 * thread's accesses:
-		 */
-		_SPINLOCK(&_thread_fd_table[fd]->lock);
-
-		/* Check the file descriptor and lock types: */
-		if (lock_type == FD_READ || lock_type == FD_RDWR) {
-			/*
-			 * Wait for the file descriptor to be locked
-			 * for read for the current thread: 
-			 */
-			while ((_thread_fd_table[fd]->r_owner != curthread) &&
-			    (curthread->interrupted == 0)) {
-				/*
-				 * Check if the file descriptor is locked by
-				 * another thread: 
-				 */
-				if (_thread_fd_table[fd]->r_owner != NULL) {
-					/*
-					 * Another thread has locked the file
-					 * descriptor for read, so join the
-					 * queue of threads waiting for a  
-					 * read lock on this file descriptor: 
-					 */
-					FDQ_INSERT(&_thread_fd_table[fd]->r_queue, curthread);
-
-					/*
-					 * Save the file descriptor details
-					 * in the thread structure for the
-					 * running thread: 
-					 */
-					curthread->data.fd.fd = fd;
-
-					/* Set the timeout: */
-					_thread_kern_set_timeout(timeout);
-
-					/*
-					 * Unlock the file descriptor
-					 * table entry:
-					 */
-					_SPINUNLOCK(&_thread_fd_table[fd]->lock);
-
-					/*
-					 * Schedule this thread to wait on
-					 * the read lock. It will only be
-					 * woken when it becomes the next in
-					 * the   queue and is granted access
-					 * to the lock by the       thread
-					 * that is unlocking the file
-					 * descriptor.        
-					 */
-					_thread_kern_sched_state(PS_FDLR_WAIT, __FILE__, __LINE__);
-
-					/*
-					 * Lock the file descriptor
-					 * table entry again:
-					 */
-					_SPINLOCK(&_thread_fd_table[fd]->lock);
-
-					if (curthread->interrupted != 0) {
-						FDQ_REMOVE(&_thread_fd_table[fd]->r_queue,
-						    curthread);
-					}
-				} else {
-					/*
-					 * The running thread now owns the
-					 * read lock on this file descriptor: 
-					 */
-					_thread_fd_table[fd]->r_owner = curthread;
-
-					/*
-					 * Reset the number of read locks for
-					 * this file descriptor: 
-					 */
-					_thread_fd_table[fd]->r_lockcount = 0;
-				}
-			}
-
-			if (_thread_fd_table[fd]->r_owner == curthread)
-				/* Increment the read lock count: */
-				_thread_fd_table[fd]->r_lockcount++;
-		}
-
-		/* Check the file descriptor and lock types: */
-		if (curthread->interrupted == 0 &&
-		    (lock_type == FD_WRITE || lock_type == FD_RDWR)) {
-			/*
-			 * Wait for the file descriptor to be locked
-			 * for write for the current thread: 
-			 */
-			while ((_thread_fd_table[fd]->w_owner != curthread) &&
-			    (curthread->interrupted == 0)) {
-				/*
-				 * Check if the file descriptor is locked by
-				 * another thread: 
-				 */
-				if (_thread_fd_table[fd]->w_owner != NULL) {
-					/*
-					 * Another thread has locked the file
-					 * descriptor for write, so join the
-					 * queue of threads waiting for a 
-					 * write lock on this file
-					 * descriptor: 
-					 */
-					FDQ_INSERT(&_thread_fd_table[fd]->w_queue, curthread);
-
-					/*
-					 * Save the file descriptor details
-					 * in the thread structure for the
-					 * running thread: 
-					 */
-					curthread->data.fd.fd = fd;
-
-					/* Set the timeout: */
-					_thread_kern_set_timeout(timeout);
-
-					/*
-					 * Unlock the file descriptor
-					 * table entry:
-					 */
-					_SPINUNLOCK(&_thread_fd_table[fd]->lock);
-
-					/*
-					 * Schedule this thread to wait on
-					 * the write lock. It will only be
-					 * woken when it becomes the next in
-					 * the queue and is granted access to
-					 * the lock by the thread that is
-					 * unlocking the file descriptor.        
-					 */
-					_thread_kern_sched_state(PS_FDLW_WAIT, __FILE__, __LINE__);
-
-					/*
-					 * Lock the file descriptor
-					 * table entry again:
-					 */
-					_SPINLOCK(&_thread_fd_table[fd]->lock);
-
-					if (curthread->interrupted != 0) {
-						FDQ_REMOVE(&_thread_fd_table[fd]->w_queue,
-						    curthread);
-					}
-				} else {
-					/*
-					 * The running thread now owns the
-					 * write lock on this   file
-					 * descriptor: 
-					 */
-					_thread_fd_table[fd]->w_owner = curthread;
-
-					/*
-					 * Reset the number of write locks
-					 * for this file descriptor: 
-					 */
-					_thread_fd_table[fd]->w_lockcount = 0;
-				}
-			}
-
-			if (_thread_fd_table[fd]->w_owner == curthread)
-				/* Increment the write lock count: */
-				_thread_fd_table[fd]->w_lockcount++;
-		}
-
-		/* Unlock the file descriptor table entry: */
-		_SPINUNLOCK(&_thread_fd_table[fd]->lock);
-
-		if (curthread->interrupted != 0) {
-			ret = -1;
-			errno = EINTR;
-			if (curthread->continuation != NULL)
-				curthread->continuation((void *)curthread);
-		}
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
-
-void
-_thread_fd_unlock_debug(int fd, int lock_type, char *fname, int lineno)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	ret;
-
-	/*
-	 * Check that the file descriptor table is initialised for this
-	 * entry: 
-	 */
-	if ((ret = _thread_fd_table_init(fd)) == 0) {
-		/*
-		 * Defer signals to protect the scheduling queues from
-		 * access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		/*
-		 * Lock the file descriptor table entry to prevent
-		 * other threads for clashing with the current
-		 * thread's accesses:
-		 */
-		_spinlock_debug(&_thread_fd_table[fd]->lock, fname, lineno);
-
-		/* Check if the running thread owns the read lock: */
-		if (_thread_fd_table[fd]->r_owner == curthread) {
-			/* Check the file descriptor and lock types: */
-			if (lock_type == FD_READ || lock_type == FD_RDWR) {
-				/*
-				 * Decrement the read lock count for the
-				 * running thread: 
-				 */
-				_thread_fd_table[fd]->r_lockcount--;
-
-				/*
-				 * Check if the running thread still has read
-				 * locks on this file descriptor: 
-				 */
-				if (_thread_fd_table[fd]->r_lockcount != 0) {
-				}
-				/*
-				 * Get the next thread in the queue for a
-				 * read lock on this file descriptor: 
-				 */
-				else if ((_thread_fd_table[fd]->r_owner = fd_next_reader(fd)) == NULL) {
-				} else {
-					/* Remove this thread from the queue: */
-					FDQ_REMOVE(&_thread_fd_table[fd]->r_queue,
-					    _thread_fd_table[fd]->r_owner);
-
-					/*
-					 * Set the state of the new owner of
-					 * the thread to  running: 
-					 */
-					PTHREAD_NEW_STATE(_thread_fd_table[fd]->r_owner,PS_RUNNING);
-
-					/*
-					 * Reset the number of read locks.
-					 * This will be incremented by the
-					 * new owner of the lock when it sees
-					 * that it has the lock.                           
-					 */
-					_thread_fd_table[fd]->r_lockcount = 0;
-				}
-			}
-		}
-		/* Check if the running thread owns the write lock: */
-		if (_thread_fd_table[fd]->w_owner == curthread) {
-			/* Check the file descriptor and lock types: */
-			if (lock_type == FD_WRITE || lock_type == FD_RDWR) {
-				/*
-				 * Decrement the write lock count for the
-				 * running thread: 
-				 */
-				_thread_fd_table[fd]->w_lockcount--;
-
-				/*
-				 * Check if the running thread still has
-				 * write locks on this file descriptor: 
-				 */
-				if (_thread_fd_table[fd]->w_lockcount != 0) {
-				}
-				/*
-				 * Get the next thread in the queue for a
-				 * write lock on this file descriptor: 
-				 */
-				else if ((_thread_fd_table[fd]->w_owner = fd_next_writer(fd)) == NULL) {
-				} else {
-					/* Remove this thread from the queue: */
-					FDQ_REMOVE(&_thread_fd_table[fd]->w_queue,
-					    _thread_fd_table[fd]->w_owner);
-
-					/*
-					 * Set the state of the new owner of
-					 * the thread to running: 
-					 */
-					PTHREAD_NEW_STATE(_thread_fd_table[fd]->w_owner,PS_RUNNING);
-
-					/*
-					 * Reset the number of write locks.
-					 * This will be incremented by the
-					 * new owner of the lock when it  
-					 * sees that it has the lock.
-					 */
-					_thread_fd_table[fd]->w_lockcount = 0;
-				}
-			}
-		}
-
-		/* Unlock the file descriptor table entry: */
-		_SPINUNLOCK(&_thread_fd_table[fd]->lock);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary.
-		 */
-		_thread_kern_sig_undefer();
-	}
-}
-
-int
-_thread_fd_lock_debug(int fd, int lock_type, struct timespec * timeout,
-		char *fname, int lineno)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	ret;
-
-	/*
-	 * Check that the file descriptor table is initialised for this
-	 * entry: 
-	 */
-	if ((ret = _thread_fd_table_init(fd)) == 0) {
-		/* Clear the interrupted flag: */
-		curthread->interrupted = 0;
-
-		/*
-		 * Lock the file descriptor table entry to prevent
-		 * other threads for clashing with the current
-		 * thread's accesses:
-		 */
-		_spinlock_debug(&_thread_fd_table[fd]->lock, fname, lineno);
-
-		/* Check the file descriptor and lock types: */
-		if (lock_type == FD_READ || lock_type == FD_RDWR) {
-			/*
-			 * Wait for the file descriptor to be locked
-			 * for read for the current thread: 
-			 */
-			while ((_thread_fd_table[fd]->r_owner != curthread) &&
-			    (curthread->interrupted == 0)) {
-				/*
-				 * Check if the file descriptor is locked by
-				 * another thread: 
-				 */
-				if (_thread_fd_table[fd]->r_owner != NULL) {
-					/*
-					 * Another thread has locked the file
-					 * descriptor for read, so join the
-					 * queue of threads waiting for a  
-					 * read lock on this file descriptor: 
-					 */
-					FDQ_INSERT(&_thread_fd_table[fd]->r_queue, curthread);
-
-					/*
-					 * Save the file descriptor details
-					 * in the thread structure for the
-					 * running thread: 
-					 */
-					curthread->data.fd.fd = fd;
-					curthread->data.fd.branch = lineno;
-					curthread->data.fd.fname = fname;
-
-					/* Set the timeout: */
-					_thread_kern_set_timeout(timeout);
-
-					/*
-					 * Unlock the file descriptor
-					 * table entry:
-					 */
-					_SPINUNLOCK(&_thread_fd_table[fd]->lock);
-
-					/*
-					 * Schedule this thread to wait on
-					 * the read lock. It will only be
-					 * woken when it becomes the next in
-					 * the   queue and is granted access
-					 * to the lock by the       thread
-					 * that is unlocking the file
-					 * descriptor.        
-					 */
-					_thread_kern_sched_state(PS_FDLR_WAIT, __FILE__, __LINE__);
-
-					/*
-					 * Lock the file descriptor
-					 * table entry again:
-					 */
-					_SPINLOCK(&_thread_fd_table[fd]->lock);
-
-					if (curthread->interrupted != 0) {
-						FDQ_REMOVE(&_thread_fd_table[fd]->r_queue,
-						    curthread);
-					}
-				} else {
-					/*
-					 * The running thread now owns the
-					 * read lock on this file descriptor: 
-					 */
-					_thread_fd_table[fd]->r_owner = curthread;
-
-					/*
-					 * Reset the number of read locks for
-					 * this file descriptor: 
-					 */
-					_thread_fd_table[fd]->r_lockcount = 0;
-
-					/*
-					 * Save the source file details for
-					 * debugging: 
-					 */
-					_thread_fd_table[fd]->r_fname = fname;
-					_thread_fd_table[fd]->r_lineno = lineno;
-				}
-			}
-
-			if (_thread_fd_table[fd]->r_owner == curthread)
-				/* Increment the read lock count: */
-				_thread_fd_table[fd]->r_lockcount++;
-		}
-
-		/* Check the file descriptor and lock types: */
-		if (curthread->interrupted == 0 &&
-		    (lock_type == FD_WRITE || lock_type == FD_RDWR)) {
-			/*
-			 * Wait for the file descriptor to be locked
-			 * for write for the current thread: 
-			 */
-			while ((_thread_fd_table[fd]->w_owner != curthread) &&
-			    (curthread->interrupted == 0)) {
-				/*
-				 * Check if the file descriptor is locked by
-				 * another thread: 
-				 */
-				if (_thread_fd_table[fd]->w_owner != NULL) {
-					/*
-					 * Another thread has locked the file
-					 * descriptor for write, so join the
-					 * queue of threads waiting for a 
-					 * write lock on this file
-					 * descriptor: 
-					 */
-					FDQ_INSERT(&_thread_fd_table[fd]->w_queue, curthread);
-
-					/*
-					 * Save the file descriptor details
-					 * in the thread structure for the
-					 * running thread: 
-					 */
-					curthread->data.fd.fd = fd;
-					curthread->data.fd.branch = lineno;
-					curthread->data.fd.fname = fname;
-
-					/* Set the timeout: */
-					_thread_kern_set_timeout(timeout);
-
-					/*
-					 * Unlock the file descriptor
-					 * table entry:
-					 */
-					_SPINUNLOCK(&_thread_fd_table[fd]->lock);
-
-					/*
-					 * Schedule this thread to wait on
-					 * the write lock. It will only be
-					 * woken when it becomes the next in
-					 * the queue and is granted access to
-					 * the lock by the thread that is
-					 * unlocking the file descriptor.        
-					 */
-					_thread_kern_sched_state(PS_FDLW_WAIT, __FILE__, __LINE__);
-
-					/*
-					 * Lock the file descriptor
-					 * table entry again:
-					 */
-					_SPINLOCK(&_thread_fd_table[fd]->lock);
-
-					if (curthread->interrupted != 0) {
-						FDQ_REMOVE(&_thread_fd_table[fd]->w_queue,
-						    curthread);
-					}
-				} else {
-					/*
-					 * The running thread now owns the
-					 * write lock on this   file
-					 * descriptor: 
-					 */
-					_thread_fd_table[fd]->w_owner = curthread;
-
-					/*
-					 * Reset the number of write locks
-					 * for this file descriptor: 
-					 */
-					_thread_fd_table[fd]->w_lockcount = 0;
-
-					/*
-					 * Save the source file details for
-					 * debugging: 
-					 */
-					_thread_fd_table[fd]->w_fname = fname;
-					_thread_fd_table[fd]->w_lineno = lineno;
-				}
-			}
-
-			if (_thread_fd_table[fd]->w_owner == curthread)
-				/* Increment the write lock count: */
-				_thread_fd_table[fd]->w_lockcount++;
-		}
-
-		/* Unlock the file descriptor table entry: */
-		_SPINUNLOCK(&_thread_fd_table[fd]->lock);
-
-		if (curthread->interrupted != 0) {
-			ret = -1;
-			errno = EINTR;
-			if (curthread->continuation != NULL)
-				curthread->continuation((void *)curthread);
-		}
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
-
-void
-_thread_fd_unlock_owned(pthread_t pthread)
-{
-	int fd;
-
-	for (fd = 0; fd < _thread_dtablesize; fd++) {
-		if ((_thread_fd_table[fd] != NULL) &&
-		    ((_thread_fd_table[fd]->r_owner == pthread) ||
-		    (_thread_fd_table[fd]->w_owner == pthread))) {
-			/*
-			 * Defer signals to protect the scheduling queues
-			 * from access by the signal handler:
-			 */
-			_thread_kern_sig_defer();
-
-			/*
-			 * Lock the file descriptor table entry to prevent
-			 * other threads for clashing with the current
-			 * thread's accesses:
-			 */
-			_SPINLOCK(&_thread_fd_table[fd]->lock);
-
-			/* Check if the thread owns the read lock: */
-			if (_thread_fd_table[fd]->r_owner == pthread) {
-				/* Clear the read lock count: */
-				_thread_fd_table[fd]->r_lockcount = 0;
-
-				/*
-				 * Get the next thread in the queue for a
-				 * read lock on this file descriptor: 
-				 */
-				if ((_thread_fd_table[fd]->r_owner = fd_next_reader(fd)) != NULL) {
-					/* Remove this thread from the queue: */
-					FDQ_REMOVE(&_thread_fd_table[fd]->r_queue,
-					    _thread_fd_table[fd]->r_owner);
-
-					/*
-					 * Set the state of the new owner of
-					 * the thread to running: 
-					 */
-					PTHREAD_NEW_STATE(_thread_fd_table[fd]->r_owner,PS_RUNNING);
-				}
-			}
-
-			/* Check if the thread owns the write lock: */
-			if (_thread_fd_table[fd]->w_owner == pthread) {
-				/* Clear the write lock count: */
-				_thread_fd_table[fd]->w_lockcount = 0;
-
-				/*
-				 * Get the next thread in the queue for a
-				 * write lock on this file descriptor: 
-				 */
-				if ((_thread_fd_table[fd]->w_owner = fd_next_writer(fd)) != NULL) {
-					/* Remove this thread from the queue: */
-					FDQ_REMOVE(&_thread_fd_table[fd]->w_queue,
-					    _thread_fd_table[fd]->w_owner);
-
-					/*
-					 * Set the state of the new owner of
-					 * the thread to running: 
-					 */
-					PTHREAD_NEW_STATE(_thread_fd_table[fd]->w_owner,PS_RUNNING);
-
-				}
-			}
-
-			/* Unlock the file descriptor table entry: */
-			_SPINUNLOCK(&_thread_fd_table[fd]->lock);
-
-			/*
-			 * Undefer and handle pending signals, yielding if
-			 * necessary.
-			 */
-			_thread_kern_sig_undefer();
-		}
-	}
-}
-
-void
-_fd_lock_backout(pthread_t pthread)
-{
-	int	fd;
-
-	/*
-	 * Defer signals to protect the scheduling queues
-	 * from access by the signal handler:
-	 */
-	_thread_kern_sig_defer();
-
-	switch (pthread->state) {
-
-	case PS_FDLR_WAIT:
-		fd = pthread->data.fd.fd;
-
-		/*
-		 * Lock the file descriptor table entry to prevent
-		 * other threads for clashing with the current
-		 * thread's accesses:
-		 */
-		_SPINLOCK(&_thread_fd_table[fd]->lock);
-
-		/* Remove the thread from the waiting queue: */
-		FDQ_REMOVE(&_thread_fd_table[fd]->r_queue, pthread);
-		break;
-
-	case PS_FDLW_WAIT:
-		fd = pthread->data.fd.fd;
-
-		/*
-		 * Lock the file descriptor table entry to prevent
-		 * other threads from clashing with the current
-		 * thread's accesses:
-		 */
-		_SPINLOCK(&_thread_fd_table[fd]->lock);
-
-		/* Remove the thread from the waiting queue: */
-		FDQ_REMOVE(&_thread_fd_table[fd]->w_queue, pthread);
-		break;
-
-	default:
-		break;
-	}
-
-	/*
-	 * Undefer and handle pending signals, yielding if
-	 * necessary.
-	 */
-	_thread_kern_sig_undefer();
-}
-
-static inline pthread_t
-fd_next_reader(int fd)
-{
-	pthread_t pthread;
-
-	while (((pthread = TAILQ_FIRST(&_thread_fd_table[fd]->r_queue)) != NULL) &&
-	    (pthread->interrupted != 0)) {
-		/*
-		 * This thread has either been interrupted by a signal or
-		 * it has been canceled.  Remove it from the queue.
-		 */
-		FDQ_REMOVE(&_thread_fd_table[fd]->r_queue, pthread);
-	}
-
-	return (pthread);
-}
-
-static inline pthread_t
-fd_next_writer(int fd)
-{
-	pthread_t pthread;
-
-	while (((pthread = TAILQ_FIRST(&_thread_fd_table[fd]->w_queue)) != NULL) &&
-	    (pthread->interrupted != 0)) {
-		/*
-		 * This thread has either been interrupted by a signal or
-		 * it has been canceled.  Remove it from the queue.
-		 */
-		FDQ_REMOVE(&_thread_fd_table[fd]->w_queue, pthread);
-	}
-
-	return (pthread);
-}
-
-#else
-
-void
-_thread_fd_unlock(int fd, int lock_type)
-{
-}
-
-int
-_thread_fd_lock(int fd, int lock_type, struct timespec * timeout)
-{
-	/*
-	 * Insure that the file descriptor table is initialized for this
-	 * entry: 
-	 */
-	return (_thread_fd_table_init(fd));
-}
-
-void
-_thread_fd_unlock_debug(int fd, int lock_type, char *fname, int lineno)
-{
-}
-
-int
-_thread_fd_lock_debug(int fd, int lock_type, struct timespec * timeout,
-		char *fname, int lineno)
-{
-	/*
-	 * Insure that the file descriptor table is initialized for this
-	 * entry: 
-	 */
-	return (_thread_fd_table_init(fd));
-}
-
-void
-_thread_fd_unlock_owned(pthread_t pthread)
-{
-}
-
-void
-_fd_lock_backout(pthread_t pthread)
-{
-}
-
-#endif
diff --git a/lib/libc/uthread/uthread_file.c b/lib/libc/uthread/uthread_file.c
deleted file mode 100644
index 61e99fd..0000000
--- a/lib/libc/uthread/uthread_file.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * Copyright (c) 2001 Daniel Eischen <deischen@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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_file.c,v 1.18 2001/02/11 22:07:32 deischen Exp $
- *
- * POSIX stdio FILE locking functions. These assume that the locking
- * is only required at FILE structure level, not at file descriptor
- * level too.
- *
- */
-#include <stdio.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-extern void	_flockfile(FILE *);
-
-void
-_flockfile_debug(FILE *fp, char *fname, int lineno)
-{
-	pthread_t curthread = _pthread_self();
-
-	curthread->lineno = lineno;
-	curthread->fname = fname;
-	_flockfile(fp);
-}
diff --git a/lib/libc/uthread/uthread_find_thread.c b/lib/libc/uthread/uthread_find_thread.c
deleted file mode 100644
index 3eb207b..0000000
--- a/lib/libc/uthread/uthread_find_thread.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_find_thread.c,v 1.7 2001/06/27 11:41:13 jasone Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-/* Find a thread in the linked list of active threads: */
-int
-_find_thread(pthread_t pthread)
-{
-	pthread_t pthread1;
-
-	/* Check if the caller has specified an invalid thread: */
-	if (pthread == NULL || pthread->magic != PTHREAD_MAGIC)
-		/* Invalid thread: */
-		return(EINVAL);
-
-	/*
-	 * Defer signals to protect the thread list from access
-	 * by the signal handler:
-	 */
-	_thread_kern_sig_defer();
-
-	/* Search for the specified thread: */
-	TAILQ_FOREACH(pthread1, &_thread_list, tle) {
-		if (pthread == pthread1)
-			break;
-	}
-
-	/* Undefer and handle pending signals, yielding if necessary: */
-	_thread_kern_sig_undefer();
-
-	/* Return zero if the thread exists: */
-	return ((pthread1 != NULL) ? 0:ESRCH);
-}
diff --git a/lib/libc/uthread/uthread_flock.c b/lib/libc/uthread/uthread_flock.c
deleted file mode 100644
index 22965ce..0000000
--- a/lib/libc/uthread/uthread_flock.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_flock.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/file.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_flock, flock);
-
-int
-_flock(int fd, int operation)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		ret = __sys_flock(fd, operation);
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_fork.c b/lib/libc/uthread/uthread_fork.c
deleted file mode 100644
index 8bf1e48..0000000
--- a/lib/libc/uthread/uthread_fork.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_fork.c,v 1.28 2004/12/10 03:36:45 grog Exp $
- */
-#include <sys/param.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-static void	free_thread_resources(struct pthread *thread);
-
-__weak_reference(_fork, fork);
-
-pid_t
-_fork(void)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct pthread_atfork *af;
-	int             i, flags, use_deadlist = 0;
-	pid_t           ret;
-	pthread_t	pthread;
-	pthread_t	pthread_save;
-
-	/*
-	 * Defer signals to protect the scheduling queues from access
-	 * by the signal handler:
-	 */
-	_thread_kern_sig_defer();
-
-	_pthread_mutex_lock(&_atfork_mutex);
-
-	/* Run down atfork prepare handlers. */
-	TAILQ_FOREACH_REVERSE(af, &_atfork_list, atfork_head, qe) {
-		if (af->prepare != NULL)
-			af->prepare();
-	}
-
-	/* Fork a new process: */
-	if ((ret = __sys_fork()) != 0) {
-		/* Run down atfork parent handlers. */
-		TAILQ_FOREACH(af, &_atfork_list, qe) {
-			if (af->parent != NULL)
-			af->parent();
-		}
-		_pthread_mutex_unlock(&_atfork_mutex);
-
-	} else {
-		/* Close the pthread kernel pipe: */
-		__sys_close(_thread_kern_pipe[0]);
-		__sys_close(_thread_kern_pipe[1]);
-
-		/* Reset signals pending for the running thread: */
-		sigemptyset(&curthread->sigpend);
-
-		/*
-		 * Create a pipe that is written to by the signal handler to
-		 * prevent signals being missed in calls to
-		 * __sys_select: 
-		 */
-		if (__sys_pipe(_thread_kern_pipe) != 0) {
-			/* Cannot create pipe, so abort: */
-			PANIC("Cannot create pthread kernel pipe for forked process");
-		}
-		/* Get the flags for the read pipe: */
-		else if ((flags = __sys_fcntl(_thread_kern_pipe[0], F_GETFL, NULL)) == -1) {
-			/* Abort this application: */
-			abort();
-		}
-		/* Make the read pipe non-blocking: */
-		else if (__sys_fcntl(_thread_kern_pipe[0], F_SETFL, flags | O_NONBLOCK) == -1) {
-			/* Abort this application: */
-			abort();
-		}
-		/* Get the flags for the write pipe: */
-		else if ((flags = __sys_fcntl(_thread_kern_pipe[1], F_GETFL, NULL)) == -1) {
-			/* Abort this application: */
-			abort();
-		}
-		/* Make the write pipe non-blocking: */
-		else if (__sys_fcntl(_thread_kern_pipe[1], F_SETFL, flags | O_NONBLOCK) == -1) {
-			/* Abort this application: */
-			abort();
-		}
-		/* Reinitialize the GC mutex: */
-		else if (_mutex_reinit(&_gc_mutex) != 0) {
-			/* Abort this application: */
-			PANIC("Cannot initialize GC mutex for forked process");
-		}
-		/* Reinitialize the GC condition variable: */
-		else if (_cond_reinit(&_gc_cond) != 0) {
-			/* Abort this application: */
-			PANIC("Cannot initialize GC condvar for forked process");
-		}
-		/* Initialize the ready queue: */
-		else if (_pq_init(&_readyq) != 0) {
-			/* Abort this application: */
-			PANIC("Cannot initialize priority ready queue.");
-		} else {
-			/*
-			 * Enter a loop to remove all threads other than
-			 * the running thread from the thread list:
-			 */
-			if ((pthread = TAILQ_FIRST(&_thread_list)) == NULL) {
-				pthread = TAILQ_FIRST(&_dead_list);
-				use_deadlist = 1;
-			}
-			while (pthread != NULL) {
-				/* Save the thread to be freed: */
-				pthread_save = pthread;
-
-				/*
-				 * Advance to the next thread before
-				 * destroying the current thread:
-				 */
-				if (use_deadlist != 0)
-					pthread = TAILQ_NEXT(pthread, dle);
-				else
-					pthread = TAILQ_NEXT(pthread, tle);
-
-				/* Make sure this isn't the running thread: */
-				if (pthread_save != curthread) {
-					/*
-					 * Remove this thread from the
-					 * appropriate list:
-					 */
-					if (use_deadlist != 0)
-						TAILQ_REMOVE(&_thread_list,
-						    pthread_save, dle);
-					else
-						TAILQ_REMOVE(&_thread_list,
-						    pthread_save, tle);
-
-					free_thread_resources(pthread_save);
-				}
-
-				/*
-				 * Switch to the deadlist when the active
-				 * thread list has been consumed.  This can't
-				 * be at the top of the loop because it is
-				 * used to determine to which list the thread
-				 * belongs (when it is removed from the list).
-				 */
-				if (pthread == NULL) {
-					pthread = TAILQ_FIRST(&_dead_list);
-					use_deadlist = 1;
-				}
-			}
-
-			/* Treat the current thread as the initial thread: */
-			_thread_initial = curthread;
-
-			/* Re-init the dead thread list: */
-			TAILQ_INIT(&_dead_list);
-
-			/* Re-init the waiting and work queues. */
-			TAILQ_INIT(&_waitingq);
-			TAILQ_INIT(&_workq);
-
-			/* Re-init the threads mutex queue: */
-			TAILQ_INIT(&curthread->mutexq);
-
-			/* No spinlocks yet: */
-			_spinblock_count = 0;
-
-			/* Don't queue signals yet: */
-			_queue_signals = 0;
-
-			/* Initialize the scheduling switch hook routine: */
-			_sched_switch_hook = NULL;
-
-			/* Clear out any locks in the file descriptor table: */
-			for (i = 0; i < _thread_dtablesize; i++) {
-				if (_thread_fd_table[i] != NULL) {
-					/* Initialise the file locks: */
-					memset(&_thread_fd_table[i]->lock, 0,
-					    sizeof(_thread_fd_table[i]->lock));
-					_thread_fd_table[i]->r_owner = NULL;
-					_thread_fd_table[i]->w_owner = NULL;
-					_thread_fd_table[i]->r_fname = NULL;
-					_thread_fd_table[i]->w_fname = NULL;
-					_thread_fd_table[i]->r_lineno = 0;;
-					_thread_fd_table[i]->w_lineno = 0;;
-					_thread_fd_table[i]->r_lockcount = 0;;
-					_thread_fd_table[i]->w_lockcount = 0;;
-
-					/* Initialise the read/write queues: */
-					TAILQ_INIT(&_thread_fd_table[i]->r_queue);
-					TAILQ_INIT(&_thread_fd_table[i]->w_queue);
-				}
-			}
-		}
-		/* Run down atfork child handlers. */
-		TAILQ_FOREACH(af, &_atfork_list, qe) {
-			if (af->child != NULL)
-				af->child();
-		}
-		_mutex_reinit(&_atfork_mutex);
-	}
-
-
-	/*
-	 * Undefer and handle pending signals, yielding if necessary:
-	 */
-	_thread_kern_sig_undefer();
-
-	/* Return the process ID: */
-	return (ret);
-}
-
-static void
-free_thread_resources(struct pthread *thread)
-{
-
-	/* Check to see if the threads library allocated the stack. */
-	if ((thread->attr.stackaddr_attr == NULL) && (thread->stack != NULL)) {
-		/*
-		 * Since this is being called from fork, we are currently single
-		 * threaded so there is no need to protect the call to
-		 * _thread_stack_free() with _gc_mutex.
-		 */
-		_thread_stack_free(thread->stack, thread->attr.stacksize_attr,
-		    thread->attr.guardsize_attr);
-	}
-
-	if (thread->specific != NULL)
-		free(thread->specific);
-
-	if (thread->poll_data.fds != NULL)
-		free(thread->poll_data.fds);
-
-	free(thread);
-}
diff --git a/lib/libc/uthread/uthread_fpathconf.c b/lib/libc/uthread/uthread_fpathconf.c
deleted file mode 100644
index 5e78e95..0000000
--- a/lib/libc/uthread/uthread_fpathconf.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2000 Maxim Sobolev <sobomax@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.
- *
- * 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/lib/libc_r/uthread/uthread_fpathconf.c,v 1.3 2001/04/10 04:19:20 deischen Exp $
- */
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_fpathconf, fpathconf);
-
-long
-_fpathconf(int fd, int name)
-{
-	long            ret;
-
-	if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		ret = __sys_fpathconf(fd, name);
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return ret;
-}
-
diff --git a/lib/libc/uthread/uthread_fstat.c b/lib/libc/uthread/uthread_fstat.c
deleted file mode 100644
index 2801ab0..0000000
--- a/lib/libc/uthread/uthread_fstat.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_fstat.c,v 1.12 2001/10/10 17:48:43 bde Exp $
- */
-#include <signal.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_fstat, fstat);
-
-int
-_fstat(int fd, struct stat * buf)
-{
-	int             ret;
-
-	/* Lock the file descriptor for read: */
-	if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		/* Get the file status: */
-		ret = __sys_fstat(fd, buf);
-		/* Unlock the file descriptor: */
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return (ret);
-}
-
diff --git a/lib/libc/uthread/uthread_fstatfs.c b/lib/libc/uthread/uthread_fstatfs.c
deleted file mode 100644
index be51e97..0000000
--- a/lib/libc/uthread/uthread_fstatfs.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_fstatfs.c,v 1.12 2001/10/10 17:48:43 bde Exp $
- */
-#include <signal.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_fstatfs, fstatfs);
-
-int
-_fstatfs(int fd, struct statfs * buf)
-{
-	int             ret;
-
-	/* Lock the file descriptor for read: */
-	if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		/* Get the file system status: */
-		ret = __sys_fstatfs(fd, buf);
-		/* Unlock the file descriptor: */
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_fsync.c b/lib/libc/uthread/uthread_fsync.c
deleted file mode 100644
index 884b232..0000000
--- a/lib/libc/uthread/uthread_fsync.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_fsync.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
- */
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__fsync, fsync);
-
-int
-_fsync(int fd)
-{
-	int	ret;
-
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		ret = __sys_fsync(fd);
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	return (ret);
-}
-
-int
-__fsync(int fd)
-{
-	int	ret;
-
-	_thread_enter_cancellation_point();
-	ret = _fsync(fd);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_gc.c b/lib/libc/uthread/uthread_gc.c
deleted file mode 100644
index 3f8705a..0000000
--- a/lib/libc/uthread/uthread_gc.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_gc.c,v 1.17 2002/11/13 18:13:26 deischen Exp $
- *
- * Garbage collector thread. Frees memory allocated for dead threads.
- *
- */
-#include <sys/param.h>
-#include <errno.h>
-#include <time.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-#include "pthread_private.h"
-
-pthread_addr_t
-_thread_gc(pthread_addr_t arg)
-{
-	struct pthread	*curthread = _get_curthread();
-	int		f_debug;
-	int		f_done = 0;
-	int		ret;
-	sigset_t	mask;
-	pthread_t	pthread;
-	pthread_t	pthread_cln;
-	struct timespec	abstime;
-	void		*p_stack;
-
-	/* Block all signals */
-	sigfillset(&mask);
-	_pthread_sigmask(SIG_BLOCK, &mask, NULL);
-
-	/* Mark this thread as a library thread (not a user thread). */
-	curthread->flags |= PTHREAD_FLAGS_PRIVATE;
-
-	/* Set a debug flag based on an environment variable. */
-	f_debug = (getenv("LIBC_R_DEBUG") != NULL);
-
-	/* Set the name of this thread. */
-	pthread_set_name_np(curthread,"GC");
-
-	while (!f_done) {
-		/* Check if debugging this application. */
-		if (f_debug)
-			/* Dump thread info to file. */
-			_thread_dump_info();
-
-		/*
-		 * Defer signals to protect the scheduling queues from
-		 * access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		/* Check if this is the last running thread: */
-		if (TAILQ_FIRST(&_thread_list) == curthread &&
-		    TAILQ_NEXT(curthread, tle) == NULL)
-			/*
-			 * This is the last thread, so it can exit
-			 * now.
-			 */
-			f_done = 1;
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-
-		/* No stack of thread structure to free yet: */
-		p_stack = NULL;
-		pthread_cln = NULL;
-
-		/*
-		 * Lock the garbage collector mutex which ensures that
-		 * this thread sees another thread exit:
-		 */
-		if (_pthread_mutex_lock(&_gc_mutex) != 0)
-			PANIC("Cannot lock gc mutex");
-
-		/*
-		 * Enter a loop to search for the first dead thread that
-		 * has memory to free.
-		 */
-		for (pthread = TAILQ_FIRST(&_dead_list);
-		     p_stack == NULL && pthread_cln == NULL && pthread != NULL;
-		     pthread = TAILQ_NEXT(pthread, dle)) {
-			/* Check if the initial thread: */
-			if (pthread == _thread_initial) {
-				/* Don't destroy the initial thread. */
-			}
-			/*
-			 * Check if this thread has detached:
-			 */
-			else if ((pthread->attr.flags &
-			    PTHREAD_DETACHED) != 0) {
-				/* Remove this thread from the dead list: */
-				TAILQ_REMOVE(&_dead_list, pthread, dle);
-
-				/*
-				 * Check if the stack was not specified by
-				 * the caller to pthread_create() and has not
-				 * been destroyed yet: 
-				 */
-				if (pthread->attr.stackaddr_attr == NULL &&
-				    pthread->stack != NULL) {
-					_thread_stack_free(pthread->stack,
-					    pthread->attr.stacksize_attr,
-					    pthread->attr.guardsize_attr);
-				}
-
-				/*
-				 * Point to the thread structure that must
-				 * be freed outside the locks:
-				 */
-				pthread_cln = pthread;
-
-			} else {
-				/*
-				 * This thread has not detached, so do
-				 * not destroy it.
-				 *
-				 * Check if the stack was not specified by
-				 * the caller to pthread_create() and has not
-				 * been destroyed yet: 
-				 */
-				if (pthread->attr.stackaddr_attr == NULL &&
-				    pthread->stack != NULL) {
-					_thread_stack_free(pthread->stack,
-					    pthread->attr.stacksize_attr,
-					    pthread->attr.guardsize_attr);
-
-					/*
-					 * NULL the stack pointer now that the
-					 * memory has been freed:
-					 */
-					pthread->stack = NULL;
-				}
-			}
-		}
-
-		/*
-		 * Check if this is not the last thread and there is no
-		 * memory to free this time around.
-		 */
-		if (!f_done && p_stack == NULL && pthread_cln == NULL) {
-			/* Get the current time. */
-			if (clock_gettime(CLOCK_REALTIME,&abstime) != 0)
-				PANIC("gc cannot get time");
-
-			/*
-			 * Do a backup poll in 10 seconds if no threads
-			 * die before then.
-			 */
-			abstime.tv_sec += 10;
-
-			/*
-			 * Wait for a signal from a dying thread or a
-			 * timeout (for a backup poll).
-			 */
-			if ((ret = _pthread_cond_timedwait(&_gc_cond,
-			    &_gc_mutex, &abstime)) != 0 && ret != ETIMEDOUT)
-				PANIC("gc cannot wait for a signal");
-		}
-
-		/* Unlock the garbage collector mutex: */
-		if (_pthread_mutex_unlock(&_gc_mutex) != 0)
-			PANIC("Cannot unlock gc mutex");
-
-		/*
-		 * If there is memory to free, do it now. The call to
-		 * free() might block, so this must be done outside the
-		 * locks.
-		 */
-		if (p_stack != NULL)
-			free(p_stack);
-		if (pthread_cln != NULL) {
-			if (pthread_cln->name != NULL) {
-				/* Free the thread name string. */
-				free(pthread_cln->name);
-			}
-			/*
-			 * Free the memory allocated for the thread
-			 * structure.
-			 */
-			free(pthread_cln);
-		}
-	}
-	return (NULL);
-}
diff --git a/lib/libc/uthread/uthread_getdirentries.c b/lib/libc/uthread/uthread_getdirentries.c
deleted file mode 100644
index 1455ad0..0000000
--- a/lib/libc/uthread/uthread_getdirentries.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_getdirentries.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/types.h>
-#include <dirent.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_getdirentries, getdirentries);
-
-int
-_getdirentries(int fd, char *buf, int nbytes, long *basep)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		ret = __sys_getdirentries(fd, buf, nbytes, basep);
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_getpeername.c b/lib/libc/uthread/uthread_getpeername.c
deleted file mode 100644
index 1416949..0000000
--- a/lib/libc/uthread/uthread_getpeername.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_getpeername.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_getpeername, getpeername);
-
-int
-_getpeername(int fd, struct sockaddr * peer, socklen_t *paddrlen)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		ret = __sys_getpeername(fd, peer, paddrlen);
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return ret;
-}
-
diff --git a/lib/libc/uthread/uthread_getprio.c b/lib/libc/uthread/uthread_getprio.c
deleted file mode 100644
index 53ee11d..0000000
--- a/lib/libc/uthread/uthread_getprio.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_getprio.c,v 1.8 2001/04/10 04:19:20 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_getprio, pthread_getprio);
-
-int
-_pthread_getprio(pthread_t pthread)
-{
-	int policy, ret;
-	struct sched_param param;
-
-	if ((ret = pthread_getschedparam(pthread, &policy, &param)) == 0)
-		ret = param.sched_priority;
-	else {
-		/* Invalid thread: */
-		errno = ret;
-		ret = -1;
-	}
-
-	/* Return the thread priority or an error status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_getschedparam.c b/lib/libc/uthread/uthread_getschedparam.c
deleted file mode 100644
index 595b5e1..0000000
--- a/lib/libc/uthread/uthread_getschedparam.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_getschedparam.c,v 1.7 2001/04/10 04:19:20 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_getschedparam, pthread_getschedparam);
-
-int
-_pthread_getschedparam(pthread_t pthread, int *policy, 
-	struct sched_param *param)
-{
-	int ret;
-
-	if ((param == NULL) || (policy == NULL))
-		/* Return an invalid argument error: */
-		ret = EINVAL;
-
-	/* Find the thread in the list of active threads: */
-	else if ((ret = _find_thread(pthread)) == 0) {
-		/* Return the threads base priority and scheduling policy: */
-		param->sched_priority =
-		    PTHREAD_BASE_PRIORITY(pthread->base_priority);
-		*policy = pthread->attr.sched_policy;
-	}
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_getsockname.c b/lib/libc/uthread/uthread_getsockname.c
deleted file mode 100644
index af76ef0..0000000
--- a/lib/libc/uthread/uthread_getsockname.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_getsockname.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_getsockname, getsockname);
-
-int
-_getsockname(int s, struct sockaddr * name, socklen_t *namelen)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(s, FD_READ, NULL)) == 0) {
-		ret = __sys_getsockname(s, name, namelen);
-		_FD_UNLOCK(s, FD_READ);
-	}
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_getsockopt.c b/lib/libc/uthread/uthread_getsockopt.c
deleted file mode 100644
index 34d3c45..0000000
--- a/lib/libc/uthread/uthread_getsockopt.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_getsockopt.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_getsockopt, getsockopt);
-
-int
-_getsockopt(int fd, int level, int optname, void *optval, socklen_t
-    *optlen)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		ret = __sys_getsockopt(fd, level, optname, optval, optlen);
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_info.c b/lib/libc/uthread/uthread_info.c
deleted file mode 100644
index a38dbb1..0000000
--- a/lib/libc/uthread/uthread_info.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_info.c,v 1.24 2002/12/28 05:20:03 deischen Exp $
- */
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <paths.h>
-#include <pthread.h>
-#include <unistd.h>
-#include "pthread_private.h"
-
-#ifndef NELEMENTS
-#define NELEMENTS(arr)	(sizeof(arr) / sizeof(arr[0]))
-#endif
-
-static void	dump_thread(int fd, pthread_t pthread, int long_version);
-
-__weak_reference(_pthread_set_name_np, pthread_set_name_np);
-
-struct s_thread_info {
-	enum pthread_state state;
-	char           *name;
-};
-
-/* Static variables: */
-static const struct s_thread_info thread_info[] = {
-	{PS_RUNNING	, "Running"},
-	{PS_SIGTHREAD	, "Waiting on signal thread"},
-	{PS_MUTEX_WAIT	, "Waiting on a mutex"},
-	{PS_COND_WAIT	, "Waiting on a condition variable"},
-	{PS_FDLR_WAIT	, "Waiting for a file read lock"},
-	{PS_FDLW_WAIT	, "Waiting for a file write lock"},
-	{PS_FDR_WAIT	, "Waiting for read"},
-	{PS_FDW_WAIT	, "Waiting for write"},
-	{PS_FILE_WAIT	, "Waiting for FILE lock"},
-	{PS_POLL_WAIT	, "Waiting on poll"},
-	{PS_SELECT_WAIT	, "Waiting on select"},
-	{PS_SLEEP_WAIT	, "Sleeping"},
-	{PS_WAIT_WAIT	, "Waiting process"},
-	{PS_SIGSUSPEND	, "Suspended, waiting for a signal"},
-	{PS_SIGWAIT	, "Waiting for a signal"},
-	{PS_SPINBLOCK	, "Waiting for a spinlock"},
-	{PS_JOIN	, "Waiting to join"},
-	{PS_SUSPENDED	, "Suspended"},
-	{PS_DEAD	, "Dead"},
-	{PS_DEADLOCK	, "Deadlocked"},
-	{PS_STATE_MAX	, "Not a real state!"}
-};
-
-void
-_thread_dump_info(void)
-{
-	char            s[512];
-	int             fd;
-	int             i;
-	pthread_t       pthread;
-	char		*tmpdir;
-	char		tmpfile[PATH_MAX];
-	pq_list_t	*pq_list;
-
-	if (issetugid() != 0 || (tmpdir = getenv("TMPDIR")) == NULL)
-		tmpdir = _PATH_TMP;
-	for (i = 0; i < 100000; i++) {
-		snprintf(tmpfile, sizeof(tmpfile), "%s/uthread.dump.%u.%i",
-			tmpdir, getpid(), i);
-		/* Open the dump file for append and create it if necessary: */
-		if ((fd = __sys_open(tmpfile, O_RDWR | O_CREAT | O_EXCL,
-			0644)) < 0) {
-				/* Can't open the dump file. */
-				if (errno == EEXIST)
-					continue;
-				/*
-				 * We only need to continue in case of
-				 * EEXIST error. Most other error
-				 * codes means that we will fail all
-				 * the time.
-				 */
-				return;
-		} else {
-			break;
-		}
-	}
-	if (i==100000) {
-		/* all 100000 possibilities are in use :( */
-		return;
-	} else {
-		/* Output a header for active threads: */
-		strcpy(s, "\n\n=============\nACTIVE THREADS\n\n");
-		__sys_write(fd, s, strlen(s));
-
-		/* Enter a loop to report each thread in the global list: */
-		TAILQ_FOREACH(pthread, &_thread_list, tle) {
-			dump_thread(fd, pthread, /*long_verson*/ 1);
-		}
-
-		/* Output a header for ready threads: */
-		strcpy(s, "\n\n=============\nREADY THREADS\n\n");
-		__sys_write(fd, s, strlen(s));
-
-		/* Enter a loop to report each thread in the ready queue: */
-		TAILQ_FOREACH (pq_list, &_readyq.pq_queue, pl_link) {
-			TAILQ_FOREACH(pthread, &pq_list->pl_head, pqe) {
-				dump_thread(fd, pthread, /*long_version*/ 0);
-			}
-		}
-
-		/* Output a header for waiting threads: */
-		strcpy(s, "\n\n=============\nWAITING THREADS\n\n");
-		__sys_write(fd, s, strlen(s));
-
-		/* Enter a loop to report each thread in the waiting queue: */
-		TAILQ_FOREACH (pthread, &_waitingq, pqe) {
-			dump_thread(fd, pthread, /*long_version*/ 0);
-		}
-
-		/* Output a header for threads in the work queue: */
-		strcpy(s, "\n\n=============\nTHREADS IN WORKQ\n\n");
-		__sys_write(fd, s, strlen(s));
-
-		/* Enter a loop to report each thread in the waiting queue: */
-		TAILQ_FOREACH (pthread, &_workq, qe) {
-			dump_thread(fd, pthread, /*long_version*/ 0);
-		}
-
-		/* Check if there are no dead threads: */
-		if (TAILQ_FIRST(&_dead_list) == NULL) {
-			/* Output a record: */
-			strcpy(s, "\n\nTHERE ARE NO DEAD THREADS\n");
-			__sys_write(fd, s, strlen(s));
-		} else {
-			/* Output a header for dead threads: */
-			strcpy(s, "\n\nDEAD THREADS\n\n");
-			__sys_write(fd, s, strlen(s));
-
-			/*
-			 * Enter a loop to report each thread in the global
-			 * dead thread list:
-			 */
-			TAILQ_FOREACH(pthread, &_dead_list, dle) {
-				dump_thread(fd, pthread, /*long_version*/ 0);
-			}
-		}
-
-		/* Output a header for file descriptors: */
-		snprintf(s, sizeof(s), "\n\n=============\nFILE DESCRIPTOR "
-		    "TABLE (table size %d)\n\n", _thread_dtablesize);
-		__sys_write(fd, s, strlen(s));
-
-		/* Enter a loop to report file descriptor lock usage: */
-		for (i = 0; i < _thread_dtablesize; i++) {
-			/*
-			 * Check if memory is allocated for this file
-			 * descriptor:
-			 */
-			if (_thread_fd_table[i] != NULL) {
-				/* Report the file descriptor lock status: */
-				snprintf(s, sizeof(s),
-				    "fd[%3d] read owner %p count %d [%s:%d]\n"
-				    "        write owner %p count %d [%s:%d]\n",
-				    i, _thread_fd_table[i]->r_owner,
-				    _thread_fd_table[i]->r_lockcount,
-				    _thread_fd_table[i]->r_fname,
-				    _thread_fd_table[i]->r_lineno,
-				    _thread_fd_table[i]->w_owner,
-				    _thread_fd_table[i]->w_lockcount,
-				    _thread_fd_table[i]->w_fname,
-				    _thread_fd_table[i]->w_lineno);
-				    __sys_write(fd, s, strlen(s));
-			}
-		}
-
-		/* Close the dump file: */
-		__sys_close(fd);
-	}
-}
-
-static void
-dump_thread(int fd, pthread_t pthread, int long_version)
-{
-	struct pthread	*curthread = _get_curthread();
-	char		s[512];
-	int		i;
-
-	/* Find the state: */
-	for (i = 0; i < NELEMENTS(thread_info) - 1; i++)
-		if (thread_info[i].state == pthread->state)
-			break;
-
-	/* Output a record for the thread: */
-	snprintf(s, sizeof(s),
-	    "--------------------\nThread %p (%s) prio %3d state %s",
-	    pthread, (pthread->name == NULL) ? "" : pthread->name,
-	    pthread->active_priority, thread_info[i].name);
-	__sys_write(fd, s, strlen(s));
-	/* And now where it is. */
-	if (pthread->fname != NULL) {
-		snprintf(s, sizeof(s), " [%s:%d]", pthread->fname,
-		    pthread->lineno);
-		__sys_write(fd, s, strlen(s));
-	}
-	__sys_write(fd, "\n", 1);
-
-	if (long_version != 0) {
-		/* Check if this is the running thread: */
-		if (pthread == curthread) {
-			/* Output a record for the running thread: */
-			strcpy(s, "This is the running thread\n");
-			__sys_write(fd, s, strlen(s));
-		}
-		/* Check if this is the initial thread: */
-		if (pthread == _thread_initial) {
-			/* Output a record for the initial thread: */
-			strcpy(s, "This is the initial thread\n");
-			__sys_write(fd, s, strlen(s));
-		}
-		/* Process according to thread state: */
-		switch (pthread->state) {
-		/* File descriptor read lock wait: */
-		case PS_FDLR_WAIT:
-		case PS_FDLW_WAIT:
-		case PS_FDR_WAIT:
-		case PS_FDW_WAIT:
-			/* Write the lock details: */
-			snprintf(s, sizeof(s), "fd %d[%s:%d]",
-			    pthread->data.fd.fd,
-			    pthread->data.fd.fname,
-			    pthread->data.fd.branch);
-			__sys_write(fd, s, strlen(s));
-			break;
-		case PS_SIGWAIT:
-			snprintf(s, sizeof(s), "sigmask (hi)");
-			__sys_write(fd, s, strlen(s));
-			for (i = _SIG_WORDS - 1; i >= 0; i--) {
-				snprintf(s, sizeof(s), "%08x\n",
-				    pthread->sigmask.__bits[i]);
-				__sys_write(fd, s, strlen(s));
-			}
-			snprintf(s, sizeof(s), "(lo)\n");
-			__sys_write(fd, s, strlen(s));
-			break;
-		/*
-		 * Trap other states that are not explicitly
-		 * coded to dump information:
-		 */
-		default:
-			/* Nothing to do here. */
-			break;
-		}
-	}
-}
-
-/* Set the thread name for debug: */
-void
-_pthread_set_name_np(pthread_t thread, const char *name)
-{
-	/* Check if the caller has specified a valid thread: */
-	if (thread != NULL && thread->magic == PTHREAD_MAGIC) {
-		if (thread->name != NULL) {
-			/* Free space for previous name. */
-			free(thread->name);
-		}
-		thread->name = strdup(name);
-	}
-}
diff --git a/lib/libc/uthread/uthread_init.c b/lib/libc/uthread/uthread_init.c
deleted file mode 100644
index 72d2906..0000000
--- a/lib/libc/uthread/uthread_init.c
+++ /dev/null
@@ -1,576 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_init.c,v 1.49 2005/02/28 17:15:31 marcus Exp $
- */
-
-/* Allocate space for global thread variables here: */
-#define GLOBAL_PTHREAD_PRIVATE
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <machine/reg.h>
-
-#include <sys/ioctl.h>
-#include <sys/mount.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-#include <sys/event.h>
-#include <sys/stat.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/ttycom.h>
-#include <sys/wait.h>
-#include <sys/mman.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <poll.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "pthread_private.h"
-
-int	__pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *);
-int	__pthread_mutex_lock(pthread_mutex_t *);
-int	__pthread_mutex_trylock(pthread_mutex_t *);
-
-/*
- * All weak references used within libc should be in this table.
- * This allows static libraries to work.
- */
-static void *references[] = {
-	&_accept,
-	&_bind,
-	&_close,
-	&_connect,
-	&_dup,
-	&_dup2,
-	&_execve,
-	&_fcntl,
-	&_flock,
-	&_flockfile,
-	&_fstat,
-	&_fstatfs,
-	&_fsync,
-	&_funlockfile,
-	&_getdirentries,
-	&_getlogin,
-	&_getpeername,
-	&_getsockname,
-	&_getsockopt,
-	&_ioctl,
-	&_kevent,
-	&_listen,
-	&_nanosleep,
-	&_open,
-	&_pthread_cond_destroy,
-	&_pthread_cond_init,
-	&_pthread_cond_signal,
-	&_pthread_cond_wait,
-	&_pthread_getspecific,
-	&_pthread_key_create,
-	&_pthread_key_delete,
-	&_pthread_mutex_destroy,
-	&_pthread_mutex_init,
-	&_pthread_mutex_lock,
-	&_pthread_mutex_trylock,
-	&_pthread_mutex_unlock,
-	&_pthread_mutexattr_init,
-	&_pthread_mutexattr_destroy,
-	&_pthread_mutexattr_settype,
-	&_pthread_once,
-	&_pthread_setspecific,
-	&_read,
-	&_readv,
-	&_recvfrom,
-	&_recvmsg,
-	&_select,
-	&_sendmsg,
-	&_sendto,
-	&_setsockopt,
-	&_sigaction,
-	&_sigprocmask,
-	&_sigsuspend,
-	&_socket,
-	&_socketpair,
-	&_wait4,
-	&_write,
-	&_writev
-};
-
-/*
- * These are needed when linking statically.  All references within
- * libgcc (and libc) to these routines are weak, but if they are not
- * (strongly) referenced by the application or other libraries, then
- * the actual functions will not be loaded.
- */
-static void *libgcc_references[] = {
-	&_pthread_once,
-	&_pthread_key_create,
-	&_pthread_key_delete,
-	&_pthread_getspecific,
-	&_pthread_setspecific,
-	&_pthread_mutex_init,
-	&_pthread_mutex_destroy,
-	&_pthread_mutex_lock,
-	&_pthread_mutex_trylock,
-	&_pthread_mutex_unlock
-};
-
-#define	DUAL_ENTRY(entry)	\
-	(pthread_func_t)entry, (pthread_func_t)entry
-
-static pthread_func_t jmp_table[][2] = {
-	{DUAL_ENTRY(_pthread_cond_broadcast)},	/* PJT_COND_BROADCAST */
-	{DUAL_ENTRY(_pthread_cond_destroy)},	/* PJT_COND_DESTROY */
-	{DUAL_ENTRY(_pthread_cond_init)},	/* PJT_COND_INIT */
-	{DUAL_ENTRY(_pthread_cond_signal)},	/* PJT_COND_SIGNAL */
-	{(pthread_func_t)__pthread_cond_wait,
-	 (pthread_func_t)_pthread_cond_wait},	/* PJT_COND_WAIT */
-	{DUAL_ENTRY(_pthread_getspecific)},	/* PJT_GETSPECIFIC */
-	{DUAL_ENTRY(_pthread_key_create)},	/* PJT_KEY_CREATE */
-	{DUAL_ENTRY(_pthread_key_delete)},	/* PJT_KEY_DELETE*/
-	{DUAL_ENTRY(_pthread_main_np)},		/* PJT_MAIN_NP */
-	{DUAL_ENTRY(_pthread_mutex_destroy)},	/* PJT_MUTEX_DESTROY */
-	{DUAL_ENTRY(_pthread_mutex_init)},	/* PJT_MUTEX_INIT */
-	{(pthread_func_t)__pthread_mutex_lock,
-	 (pthread_func_t)_pthread_mutex_lock},	/* PJT_MUTEX_LOCK */
-	{(pthread_func_t)__pthread_mutex_trylock,
-	 (pthread_func_t)_pthread_mutex_trylock},/* PJT_MUTEX_TRYLOCK */
-	{DUAL_ENTRY(_pthread_mutex_unlock)},	/* PJT_MUTEX_UNLOCK */
-	{DUAL_ENTRY(_pthread_mutexattr_destroy)}, /* PJT_MUTEXATTR_DESTROY */
-	{DUAL_ENTRY(_pthread_mutexattr_init)},	/* PJT_MUTEXATTR_INIT */
-	{DUAL_ENTRY(_pthread_mutexattr_settype)}, /* PJT_MUTEXATTR_SETTYPE */
-	{DUAL_ENTRY(_pthread_once)},		/* PJT_ONCE */
-	{DUAL_ENTRY(_pthread_rwlock_destroy)},	/* PJT_RWLOCK_DESTROY */
-	{DUAL_ENTRY(_pthread_rwlock_init)},	/* PJT_RWLOCK_INIT */
-	{DUAL_ENTRY(_pthread_rwlock_rdlock)},	/* PJT_RWLOCK_RDLOCK */
-	{DUAL_ENTRY(_pthread_rwlock_tryrdlock)},/* PJT_RWLOCK_TRYRDLOCK */
-	{DUAL_ENTRY(_pthread_rwlock_trywrlock)},/* PJT_RWLOCK_TRYWRLOCK */
-	{DUAL_ENTRY(_pthread_rwlock_unlock)},	/* PJT_RWLOCK_UNLOCK */
-	{DUAL_ENTRY(_pthread_rwlock_wrlock)},	/* PJT_RWLOCK_WRLOCK */
-	{DUAL_ENTRY(_pthread_self)},		/* PJT_SELF */
-	{DUAL_ENTRY(_pthread_setspecific)},	/* PJT_SETSPECIFIC */
-	{DUAL_ENTRY(_pthread_sigmask)}		/* PJT_SIGMASK */
-};
-
-int _pthread_guard_default;
-int _pthread_page_size;
-int _pthread_stack_default;
-int _pthread_stack_initial;
-
-/*
- * Threaded process initialization
- */
-void
-_thread_init(void)
-{
-	int		fd;
-	int             flags;
-	int             i;
-	size_t		len;
-	int		mib[2];
-	int		sched_stack_size;	/* Size of scheduler stack. */
-#if !defined(__ia64__)
-	u_long		stackp;
-#endif
-
-	struct clockinfo clockinfo;
-	struct sigaction act;
-
-	/* Check if this function has already been called: */
-	if (_thread_initial)
-		/* Only initialise the threaded application once. */
-		return;
-
-	_pthread_page_size = getpagesize();
-	_pthread_guard_default = _pthread_page_size;
-	sched_stack_size = 4 * _pthread_page_size;
-	if (sizeof(void *) == 8) {
-		_pthread_stack_default = PTHREAD_STACK64_DEFAULT;
-		_pthread_stack_initial = PTHREAD_STACK64_INITIAL;
-	}
-	else {
-		_pthread_stack_default = PTHREAD_STACK32_DEFAULT;
-		_pthread_stack_initial = PTHREAD_STACK32_INITIAL;
-	}
-
-	_pthread_attr_default.guardsize_attr = _pthread_guard_default;
-	_pthread_attr_default.stacksize_attr = _pthread_stack_default;
-
-	/*
-	 * Make gcc quiescent about {,libgcc_}references not being
-	 * referenced:
-	 */
-	if ((references[0] == NULL) || (libgcc_references[0] == NULL))
-		PANIC("Failed loading mandatory references in _thread_init");
-
-	/*
-	 * Check the size of the jump table to make sure it is preset
-	 * with the correct number of entries.
-	 */
-	if (sizeof(jmp_table) != (sizeof(pthread_func_t) * PJT_MAX * 2))
-		PANIC("Thread jump table not properly initialized");
-	memcpy(__thr_jtable, jmp_table, sizeof(jmp_table));
-
-	/*
-	 * Check for the special case of this process running as
-	 * or in place of init as pid = 1:
-	 */
-	if (getpid() == 1) {
-		/*
-		 * Setup a new session for this process which is
-		 * assumed to be running as root.
-		 */
-		if (setsid() == -1)
-			PANIC("Can't set session ID");
-		if (revoke(_PATH_CONSOLE) != 0)
-			PANIC("Can't revoke console");
-		if ((fd = __sys_open(_PATH_CONSOLE, O_RDWR)) < 0)
-			PANIC("Can't open console");
-		if (setlogin("root") == -1)
-			PANIC("Can't set login to root");
-		if (__sys_ioctl(fd, TIOCSCTTY, (char *) NULL) == -1)
-			PANIC("Can't set controlling terminal");
-		if (__sys_dup2(fd, 0) == -1 ||
-		    __sys_dup2(fd, 1) == -1 ||
-		    __sys_dup2(fd, 2) == -1)
-			PANIC("Can't dup2");
-	}
-	/* Get the standard I/O flags before messing with them : */
-	for (i = 0; i < 3; i++) {
-		if (((_pthread_stdio_flags[i] =
-		    __sys_fcntl(i, F_GETFL, NULL)) == -1) &&
-		    (errno != EBADF))
-			PANIC("Cannot get stdio flags");
-	}
-
-	/*
-	 * Create a pipe that is written to by the signal handler to prevent
-	 * signals being missed in calls to _select:
-	 */
-	if (__sys_pipe(_thread_kern_pipe) != 0) {
-		/* Cannot create pipe, so abort: */
-		PANIC("Cannot create kernel pipe");
-	}
-
-	/*
-	 * Make sure the pipe does not get in the way of stdio:
-	 */
-	for (i = 0; i < 2; i++) {
-		if (_thread_kern_pipe[i] < 3) {
-			fd = __sys_fcntl(_thread_kern_pipe[i], F_DUPFD, 3);
-			if (fd == -1)
-			    PANIC("Cannot create kernel pipe");
-			__sys_close(_thread_kern_pipe[i]);
-			_thread_kern_pipe[i] = fd;
-		}
-	}
-	/* Get the flags for the read pipe: */
-	if ((flags = __sys_fcntl(_thread_kern_pipe[0], F_GETFL, NULL)) == -1) {
-		/* Abort this application: */
-		PANIC("Cannot get kernel read pipe flags");
-	}
-	/* Make the read pipe non-blocking: */
-	else if (__sys_fcntl(_thread_kern_pipe[0], F_SETFL, flags | O_NONBLOCK) == -1) {
-		/* Abort this application: */
-		PANIC("Cannot make kernel read pipe non-blocking");
-	}
-	/* Get the flags for the write pipe: */
-	else if ((flags = __sys_fcntl(_thread_kern_pipe[1], F_GETFL, NULL)) == -1) {
-		/* Abort this application: */
-		PANIC("Cannot get kernel write pipe flags");
-	}
-	/* Make the write pipe non-blocking: */
-	else if (__sys_fcntl(_thread_kern_pipe[1], F_SETFL, flags | O_NONBLOCK) == -1) {
-		/* Abort this application: */
-		PANIC("Cannot get kernel write pipe flags");
-	}
-	/* Allocate and initialize the ready queue: */
-	else if (_pq_alloc(&_readyq, PTHREAD_MIN_PRIORITY, PTHREAD_LAST_PRIORITY) != 0) {
-		/* Abort this application: */
-		PANIC("Cannot allocate priority ready queue.");
-	}
-	/* Allocate memory for the thread structure of the initial thread: */
-	else if ((_thread_initial = (pthread_t) malloc(sizeof(struct pthread))) == NULL) {
-		/*
-		 * Insufficient memory to initialise this application, so
-		 * abort:
-		 */
-		PANIC("Cannot allocate memory for initial thread");
-	}
-	/* Allocate memory for the scheduler stack: */
-	else if ((_thread_kern_sched_stack = malloc(sched_stack_size)) == NULL)
-		PANIC("Failed to allocate stack for scheduler");
-	else {
-		/* Zero the global kernel thread structure: */
-		memset(&_thread_kern_thread, 0, sizeof(struct pthread));
-		_thread_kern_thread.flags = PTHREAD_FLAGS_PRIVATE;
-		memset(_thread_initial, 0, sizeof(struct pthread));
-
-		/* Initialize the waiting and work queues: */
-		TAILQ_INIT(&_waitingq);
-		TAILQ_INIT(&_workq);
-
-		/* Initialize the scheduling switch hook routine: */
-		_sched_switch_hook = NULL;
-
-		/* Give this thread default attributes: */
-		memcpy((void *) &_thread_initial->attr, &_pthread_attr_default,
-		    sizeof(struct pthread_attr));
-
-		/* Find the stack top */
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_USRSTACK;
-		len = sizeof (_usrstack);
-		if (sysctl(mib, 2, &_usrstack, &len, NULL, 0) == -1)
-			_usrstack = (void *)USRSTACK;
-		/*
-		 * Create a red zone below the main stack.  All other stacks are
-		 * constrained to a maximum size by the paramters passed to
-		 * mmap(), but this stack is only limited by resource limits, so
-		 * this stack needs an explicitly mapped red zone to protect the
-		 * thread stack that is just beyond.
-		 */
-		if (mmap(_usrstack - _pthread_stack_initial -
-		    _pthread_guard_default, _pthread_guard_default, 0,
-		    MAP_ANON, -1, 0) == MAP_FAILED)
-			PANIC("Cannot allocate red zone for initial thread");
-		/* Set the main thread stack pointer. */
-		_thread_initial->stack = _usrstack - _pthread_stack_initial;
-
-		/* Set the stack attributes: */
-		_thread_initial->attr.stackaddr_attr = _thread_initial->stack;
-		_thread_initial->attr.stacksize_attr = _pthread_stack_initial;
-
-		/* Setup the context for the scheduler: */
-		_setjmp(_thread_kern_sched_jb);
-#if !defined(__ia64__)
-		stackp = (long)_thread_kern_sched_stack + sched_stack_size - sizeof(double);
-#if defined(__amd64__)
-		stackp &= ~0xFUL;
-#endif
-		SET_STACK_JB(_thread_kern_sched_jb, stackp);
-#else
-		SET_STACK_JB(_thread_kern_sched_jb, _thread_kern_sched_stack,
-		    sched_stack_size);
-#endif
-		SET_RETURN_ADDR_JB(_thread_kern_sched_jb, _thread_kern_scheduler);
-
-		/*
-		 * Write a magic value to the thread structure
-		 * to help identify valid ones:
-		 */
-		_thread_initial->magic = PTHREAD_MAGIC;
-
-		/* Set the initial cancel state */
-		_thread_initial->cancelflags = PTHREAD_CANCEL_ENABLE |
-		    PTHREAD_CANCEL_DEFERRED;
-
-		/* Default the priority of the initial thread: */
-		_thread_initial->base_priority = PTHREAD_DEFAULT_PRIORITY;
-		_thread_initial->active_priority = PTHREAD_DEFAULT_PRIORITY;
-		_thread_initial->inherited_priority = 0;
-
-		/* Initialise the state of the initial thread: */
-		_thread_initial->state = PS_RUNNING;
-
-		/* Set the name of the thread: */
-		_thread_initial->name = strdup("_thread_initial");
-
-		/* Initialize joiner to NULL (no joiner): */
-		_thread_initial->joiner = NULL;
-
-		/* Initialize the owned mutex queue and count: */
-		TAILQ_INIT(&(_thread_initial->mutexq));
-		_thread_initial->priority_mutex_count = 0;
-
-		/* Initialize the global scheduling time: */
-		_sched_ticks = 0;
-		gettimeofday((struct timeval *) &_sched_tod, NULL);
-
-		/* Initialize last active: */
-		_thread_initial->last_active = (long) _sched_ticks;
-
-		/* Initialize the initial context: */
-		_thread_initial->curframe = NULL;
-
-		/* Initialise the rest of the fields: */
-		_thread_initial->poll_data.nfds = 0;
-		_thread_initial->poll_data.fds = NULL;
-		_thread_initial->sig_defer_count = 0;
-		_thread_initial->yield_on_sig_undefer = 0;
-		_thread_initial->specific = NULL;
-		_thread_initial->cleanup = NULL;
-		_thread_initial->flags = 0;
-		_thread_initial->error = 0;
-		TAILQ_INIT(&_thread_list);
-		TAILQ_INSERT_HEAD(&_thread_list, _thread_initial, tle);
-		_set_curthread(_thread_initial);
-		TAILQ_INIT(&_atfork_list);
-		_pthread_mutex_init(&_atfork_mutex, NULL);
-
-		/* Initialise the global signal action structure: */
-		sigfillset(&act.sa_mask);
-		act.sa_handler = (void (*) ()) _thread_sig_handler;
-		act.sa_flags = SA_SIGINFO | SA_RESTART;
-
-		/* Clear pending signals for the process: */
-		sigemptyset(&_process_sigpending);
-
-		/* Clear the signal queue: */
-		memset(_thread_sigq, 0, sizeof(_thread_sigq));
-
-		/* Enter a loop to get the existing signal status: */
-		for (i = 1; i < NSIG; i++) {
-			/* Check for signals which cannot be trapped: */
-			if (i == SIGKILL || i == SIGSTOP) {
-			}
-
-			/* Get the signal handler details: */
-			else if (__sys_sigaction(i, NULL,
-			    &_thread_sigact[i - 1]) != 0) {
-				/*
-				 * Abort this process if signal
-				 * initialisation fails:
-				 */
-				PANIC("Cannot read signal handler info");
-			}
-
-			/* Initialize the SIG_DFL dummy handler count. */
-			_thread_dfl_count[i] = 0;
-		}
-
-		/*
-		 * Install the signal handler for the most important
-		 * signals that the user-thread kernel needs. Actually
-		 * SIGINFO isn't really needed, but it is nice to have.
-		 */
-		if (__sys_sigaction(_SCHED_SIGNAL, &act, NULL) != 0 ||
-		    __sys_sigaction(SIGINFO,       &act, NULL) != 0 ||
-		    __sys_sigaction(SIGCHLD,       &act, NULL) != 0) {
-			/*
-			 * Abort this process if signal initialisation fails:
-			 */
-			PANIC("Cannot initialise signal handler");
-		}
-		_thread_sigact[_SCHED_SIGNAL - 1].sa_flags = SA_SIGINFO;
-		_thread_sigact[SIGINFO - 1].sa_flags = SA_SIGINFO;
-		_thread_sigact[SIGCHLD - 1].sa_flags = SA_SIGINFO;
-
-		/* Get the process signal mask: */
-		__sys_sigprocmask(SIG_SETMASK, NULL, &_process_sigmask);
-
-		/* Get the kernel clockrate: */
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_CLOCKRATE;
-		len = sizeof (struct clockinfo);
-		if (sysctl(mib, 2, &clockinfo, &len, NULL, 0) == 0)
-			_clock_res_usec = clockinfo.tick > CLOCK_RES_USEC_MIN ?
-			    clockinfo.tick : CLOCK_RES_USEC_MIN;
-
-		/* Get the table size: */
-		if ((_thread_dtablesize = getdtablesize()) < 0) {
-			/*
-			 * Cannot get the system defined table size, so abort
-			 * this process.
-			 */
-			PANIC("Cannot get dtablesize");
-		}
-		/* Allocate memory for the file descriptor table: */
-		if ((_thread_fd_table = (struct fd_table_entry **) malloc(sizeof(struct fd_table_entry *) * _thread_dtablesize)) == NULL) {
-			/* Avoid accesses to file descriptor table on exit: */
-			_thread_dtablesize = 0;
-
-			/*
-			 * Cannot allocate memory for the file descriptor
-			 * table, so abort this process.
-			 */
-			PANIC("Cannot allocate memory for file descriptor table");
-		}
-		/* Allocate memory for the pollfd table: */
-		if ((_thread_pfd_table = (struct pollfd *) malloc(sizeof(struct pollfd) * _thread_dtablesize)) == NULL) {
-			/*
-			 * Cannot allocate memory for the file descriptor
-			 * table, so abort this process.
-			 */
-			PANIC("Cannot allocate memory for pollfd table");
-		} else {
-			/*
-			 * Enter a loop to initialise the file descriptor
-			 * table:
-			 */
-			for (i = 0; i < _thread_dtablesize; i++) {
-				/* Initialise the file descriptor table: */
-				_thread_fd_table[i] = NULL;
-			}
-
-			/* Initialize stdio file descriptor table entries: */
-			for (i = 0; i < 3; i++) {
-				if ((_thread_fd_table_init(i) != 0) &&
-				    (errno != EBADF))
-					PANIC("Cannot initialize stdio file "
-					    "descriptor table entry");
-			}
-		}
-	}
-
-	/* Initialise the garbage collector mutex and condition variable. */
-	if (_pthread_mutex_init(&_gc_mutex,NULL) != 0 ||
-	    _pthread_cond_init(&_gc_cond,NULL) != 0)
-		PANIC("Failed to initialise garbage collector mutex or condvar");
-}
-
-
-/*
- * Special start up code for NetBSD/Alpha
- */
-#if	defined(__NetBSD__) && defined(__alpha__)
-int
-main(int argc, char *argv[], char *env);
-
-int
-_thread_main(int argc, char *argv[], char *env)
-{
-	_thread_init();
-	return (main(argc, argv, env));
-}
-#endif
diff --git a/lib/libc/uthread/uthread_ioctl.c b/lib/libc/uthread/uthread_ioctl.c
deleted file mode 100644
index 408af95..0000000
--- a/lib/libc/uthread/uthread_ioctl.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_ioctl.c,v 1.12 2002/08/29 23:06:07 deischen Exp $
- */
-#include <stdarg.h>
-#include <sys/ioctl.h>
-#include <sys/fcntl.h>	/* O_NONBLOCK*/
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_ioctl, ioctl);
-
-int
-_ioctl(int fd, unsigned long request,...)
-{
-	int             ret;
-	int		flags;
-	int		*op;
-	va_list         ap;
-
-	/* Lock the file descriptor: */
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		/* Initialise the variable argument list: */
-		va_start(ap, request);
-
-		switch( request) {
-		case FIONBIO:
-			/*
-			 * descriptors must be non-blocking; we are only
-			 * twiddling the flag based on the request
-			 */
-			op = va_arg(ap, int *);
-			flags = _thread_fd_getflags(fd);
-			if (*op == 0)
-				flags &= ~O_NONBLOCK;
-			else
-				flags |= O_NONBLOCK;
-			_thread_fd_setflags(fd, flags);
-			ret = 0;
-			break;
-		default:
-			ret = __sys_ioctl(fd, request, va_arg(ap, char *));
-			break;
-		}
-
-		/* Free variable arguments: */
-		va_end(ap);
-
-		/* Unlock the file descriptor: */
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_jmp.c b/lib/libc/uthread/uthread_jmp.c
deleted file mode 100644
index 6697ea2..0000000
--- a/lib/libc/uthread/uthread_jmp.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@freebsd.org>.
- * All rights reserved.
- * Copyright (C) 2000 Daniel M. Eischen <eischen@vigrid.com>.
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_jmp.c,v 1.10 2004/11/27 06:51:31 das Exp $
- */
-
-#include <unistd.h>
-#include <setjmp.h>
-#include <sys/param.h>
-#include <machine/reg.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-/* Prototypes: */
-static inline int	check_stack(pthread_t thread, void *stackp);
-
-__weak_reference(_thread_siglongjmp, siglongjmp);
-__weak_reference(_thread_longjmp, longjmp);
-__weak_reference(__thread_longjmp, _longjmp);
-
-void
-_thread_siglongjmp(sigjmp_buf env, int savemask)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	if (check_stack(curthread, (void *) GET_STACK_SJB(env)))
-		PANIC("siglongjmp()ing between thread contexts is undefined by "
-		    "POSIX 1003.1");
-
-	/*
-	 * The stack pointer is somewhere within the threads stack.
-	 * Jump to the users context.
-	 */
-	__siglongjmp(env, savemask);
-}
-
-void
-_thread_longjmp(jmp_buf env, int val)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	if (check_stack(curthread, (void *) GET_STACK_JB(env)))
-		PANIC("longjmp()ing between thread contexts is undefined by "
-		    "POSIX 1003.1");
-
-	/*
-	 * The stack pointer is somewhere within the threads stack.
-	 * Jump to the users context.
-	 */
-	__longjmp(env, val);
-}
-
-void
-__thread_longjmp(jmp_buf env, int val)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	if (check_stack(curthread, (void *) GET_STACK_JB(env)))
-		PANIC("_longjmp()ing between thread contexts is undefined by "
-		    "POSIX 1003.1");
-
-	/*
-	 * The stack pointer is somewhere within the threads stack.
-	 * Jump to the users context.
-	 */
-	___longjmp(env, val);
-}
-
-/* Returns 0 if stack check is OK, non-zero otherwise. */
-static inline int
-check_stack(pthread_t thread, void *stackp)
-{
-	void	*stack_begin, *stack_end;
-
-	/* Get the bounds of the current threads stack. */
-	PTHREAD_ASSERT(thread->stack != NULL,
-	    "Thread stack pointer is null");
-	stack_begin = thread->stack;
-	stack_end = stack_begin + thread->attr.stacksize_attr;
-
-	/*
-	 * Make sure we aren't jumping to a different stack.  Make sure
-	 * jmp_stackp is between stack_begin and stack end, to correctly detect
-	 * this condition regardless of whether the stack grows up or down.
-	 */
-	if (((stackp < stack_begin) && (stackp < stack_end)) ||
-	    ((stackp > stack_begin) && (stackp > stack_end)))
-		return (1);
-	else
-		return (0);
-}
diff --git a/lib/libc/uthread/uthread_join.c b/lib/libc/uthread/uthread_join.c
deleted file mode 100644
index f26f0b5..0000000
--- a/lib/libc/uthread/uthread_join.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_join.c,v 1.22 2003/12/31 13:41:54 deischen Exp $
- */
-#include <errno.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-#include "pthread_private.h"
-
-__weak_reference(_pthread_join, pthread_join);
-
-int
-_pthread_join(pthread_t pthread, void **thread_return)
-{
-	struct pthread	*curthread = _get_curthread();
-	int ret = 0;
-	pthread_t thread;
- 
-	_thread_enter_cancellation_point();
-
-	/* Check if the caller has specified an invalid thread: */
-	if (pthread == NULL || pthread->magic != PTHREAD_MAGIC) {
-		/* Invalid thread: */
-		_thread_leave_cancellation_point();
-		return(EINVAL);
-	}
-
-	/* Check if the caller has specified itself: */
-	if (pthread == curthread) {
-		/* Avoid a deadlock condition: */
-		_thread_leave_cancellation_point();
-		return(EDEADLK);
-	}
-
-	/*
-	 * Lock the garbage collector mutex to ensure that the garbage
-	 * collector is not using the dead thread list.
-	 */
-	if (_pthread_mutex_lock(&_gc_mutex) != 0)
-		PANIC("Cannot lock gc mutex");
-
-	/*
-	 * Defer signals to protect the thread list from access
-	 * by the signal handler:
-	 */
-	_thread_kern_sig_defer();
-
-	/*
-	 * Unlock the garbage collector mutex, now that the garbage collector
-	 * can't be run:
-	 */
-	if (_pthread_mutex_unlock(&_gc_mutex) != 0)
-		PANIC("Cannot lock gc mutex");
-
-	/*
-	 * Search for the specified thread in the list of active threads.  This
-	 * is done manually here rather than calling _find_thread() because
-	 * the searches in _thread_list and _dead_list (as well as setting up
-	 * join/detach state) have to be done atomically.
-	 */
-	TAILQ_FOREACH(thread, &_thread_list, tle) {
-		if (thread == pthread)
-			break;
-	}
-	if (thread == NULL) {
-		/*
-		 * Search for the specified thread in the list of dead threads:
-		 */
-		TAILQ_FOREACH(thread, &_dead_list, dle) {
-			if (thread == pthread)
-				break;
-		}
-	}
-
-	/* Check if the thread was not found or has been detached: */
-	if (thread == NULL ||
-	    ((pthread->attr.flags & PTHREAD_DETACHED) != 0)) {
-		/* Undefer and handle pending signals, yielding if necessary: */
-		_thread_kern_sig_undefer();
-
-		/* Return an error: */
-		ret = ESRCH;
-
-	} else if (pthread->joiner != NULL) {
-		/* Undefer and handle pending signals, yielding if necessary: */
-		_thread_kern_sig_undefer();
-
-		/* Multiple joiners are not supported. */
-		ret = ENOTSUP;
-
-	/* Check if the thread is not dead: */
-	} else if (pthread->state != PS_DEAD) {
-		/* Set the running thread to be the joiner: */
-		pthread->joiner = curthread;
-
-		/* Keep track of which thread we're joining to: */
-		curthread->join_status.thread = pthread;
-
-		while (curthread->join_status.thread == pthread) {
-			/* Schedule the next thread: */
-			_thread_kern_sched_state(PS_JOIN, __FILE__, __LINE__);
-		}
-
-		/*
-		 * The thread return value and error are set by the thread we're
-		 * joining to when it exits or detaches:
-		 */
-		ret = curthread->join_status.error;
-		if ((ret == 0) && (thread_return != NULL))
-			*thread_return = curthread->join_status.ret;
-
-		/* Undefer and handle pending signals, yielding if necessary: */
-		_thread_kern_sig_undefer();
-	} else {
-		/*
-		 * The thread exited (is dead) without being detached, and no
-		 * thread has joined it.
-		 */
-
-		/* Check if the return value is required: */
-		if (thread_return != NULL) {
-			/* Return the thread's return value: */
-			*thread_return = pthread->ret;
-		}
-
-		/* Make the thread collectable by the garbage collector. */
-		pthread->attr.flags |= PTHREAD_DETACHED;
-
-		/* Undefer and handle pending signals, yielding if necessary: */
-		_thread_kern_sig_undefer();
-	}
-
-	_thread_leave_cancellation_point();
-
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_kern.c b/lib/libc/uthread/uthread_kern.c
deleted file mode 100644
index b0de5a1..0000000
--- a/lib/libc/uthread/uthread_kern.c
+++ /dev/null
@@ -1,1138 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_kern.c,v 1.45 2002/10/05 02:22:26 deischen Exp $
- *
- */
-#include <errno.h>
-#include <poll.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/signalvar.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <sys/syscall.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-/* #define DEBUG_THREAD_KERN */
-#ifdef DEBUG_THREAD_KERN
-#define DBG_MSG		stdout_debug
-#else
-#define DBG_MSG(x...)
-#endif
-
-/* Static function prototype definitions: */
-static void
-thread_kern_poll(int wait_reqd);
-
-static void
-dequeue_signals(void);
-
-static inline void
-thread_run_switch_hook(pthread_t thread_out, pthread_t thread_in);
-
-/* Static variables: */
-static int	last_tick = 0;
-static int	called_from_handler = 0;
-
-/*
- * This is called when a signal handler finishes and wants to
- * return to a previous frame.
- */
-void
-_thread_kern_sched_frame(struct pthread_signal_frame *psf)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/*
-	 * Flag the pthread kernel as executing scheduler code
-	 * to avoid a signal from interrupting this execution and
-	 * corrupting the (soon-to-be) current frame.
-	 */
-	_thread_kern_in_sched = 1;
-
-	/* Restore the signal frame: */
-	_thread_sigframe_restore(curthread, psf);
-
-	/* The signal mask was restored; check for any pending signals: */
-	curthread->check_pending = 1;
-
-	/* Switch to the thread scheduler: */
-	___longjmp(_thread_kern_sched_jb, 1);
-}
-
-
-void
-_thread_kern_sched(ucontext_t *ucp)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/*
-	 * Flag the pthread kernel as executing scheduler code
-	 * to avoid a scheduler signal from interrupting this
-	 * execution and calling the scheduler again.
-	 */
-	_thread_kern_in_sched = 1;
-
-	/* Check if this function was called from the signal handler: */
-	if (ucp != NULL) {
-		called_from_handler = 1;
-		DBG_MSG("Entering scheduler due to signal\n");
-	}
-
-	/* Save the state of the current thread: */
-	if (_setjmp(curthread->ctx.jb) != 0) {
-		DBG_MSG("Returned from ___longjmp, thread %p\n",
-		    curthread);
-		/*
-		 * This point is reached when a longjmp() is called
-		 * to restore the state of a thread.
-		 *
-		 * This is the normal way out of the scheduler.
-		 */
-		_thread_kern_in_sched = 0;
-
-		if (curthread->sig_defer_count == 0) {
-			if (((curthread->cancelflags &
-			    PTHREAD_AT_CANCEL_POINT) == 0) &&
-			    ((curthread->cancelflags &
-			    PTHREAD_CANCEL_ASYNCHRONOUS) != 0))
-				/*
-				 * Cancellations override signals.
-				 *
-				 * Stick a cancellation point at the
-				 * start of each async-cancellable
-				 * thread's resumption.
-				 *
-				 * We allow threads woken at cancel
-				 * points to do their own checks.
-				 */
-				pthread_testcancel();
-		}
-
-		if (_sched_switch_hook != NULL) {
-			/* Run the installed switch hook: */
-			thread_run_switch_hook(_last_user_thread, curthread);
-		}
-		if (ucp == NULL)
-			return;
-		else {
-			/*
-			 * Set the process signal mask in the context; it
-			 * could have changed by the handler.
-			 */
-			ucp->uc_sigmask = _process_sigmask;
-
-			/* Resume the interrupted thread: */
-			__sys_sigreturn(ucp);
-		}
-	}
-	/* Switch to the thread scheduler: */
-	___longjmp(_thread_kern_sched_jb, 1);
-}
-
-void
-_thread_kern_sched_sig(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	curthread->check_pending = 1;
-	_thread_kern_sched(NULL);
-}
-
-
-void
-_thread_kern_scheduler(void)
-{
-	struct timespec	ts;
-	struct timeval	tv;
-	struct pthread	*curthread = _get_curthread();
-	pthread_t	pthread, pthread_h;
-	unsigned int	current_tick;
-	int		add_to_prioq;
-
-	/* If the currently running thread is a user thread, save it: */
-	if ((curthread->flags & PTHREAD_FLAGS_PRIVATE) == 0)
-		_last_user_thread = curthread;
-
-	if (called_from_handler != 0) {
-		called_from_handler = 0;
-
-		/*
-		 * We were called from a signal handler; restore the process
-		 * signal mask.
-		 */
-		if (__sys_sigprocmask(SIG_SETMASK,
-		    &_process_sigmask, NULL) != 0)
-			PANIC("Unable to restore process mask after signal");
-	}
-
-	/*
-	 * Enter a scheduling loop that finds the next thread that is
-	 * ready to run. This loop completes when there are no more threads
-	 * in the global list or when a thread has its state restored by
-	 * either a sigreturn (if the state was saved as a sigcontext) or a
-	 * longjmp (if the state was saved by a setjmp).
-	 */
-	while (!(TAILQ_EMPTY(&_thread_list))) {
-		/* Get the current time of day: */
-		GET_CURRENT_TOD(tv);
-		TIMEVAL_TO_TIMESPEC(&tv, &ts);
-		current_tick = _sched_ticks;
-
-		/*
-		 * Protect the scheduling queues from access by the signal
-		 * handler.
-		 */
-		_queue_signals = 1;
-		add_to_prioq = 0;
-
-		if (curthread != &_thread_kern_thread) {
-			/*
-			 * This thread no longer needs to yield the CPU.
-			 */
-			curthread->yield_on_sig_undefer = 0;
-	
-			if (curthread->state != PS_RUNNING) {
-				/*
-				 * Save the current time as the time that the
-				 * thread became inactive:
-				 */
-				curthread->last_inactive = (long)current_tick;
-				if (curthread->last_inactive <
-				    curthread->last_active) {
-					/* Account for a rollover: */
-					curthread->last_inactive =+
-					    UINT_MAX + 1;
-				}
-			}
-
-			/*
-			 * Place the currently running thread into the
-			 * appropriate queue(s).
-			 */
-			switch (curthread->state) {
-			case PS_DEAD:
-			case PS_STATE_MAX: /* to silence -Wall */
-			case PS_SUSPENDED:
-				/*
-				 * Dead and suspended threads are not placed
-				 * in any queue:
-				 */
-				break;
-
-			case PS_RUNNING:
-				/*
-				 * Runnable threads can't be placed in the
-				 * priority queue until after waiting threads
-				 * are polled (to preserve round-robin
-				 * scheduling).
-				 */
-				add_to_prioq = 1;
-				break;
-
-			/*
-			 * States which do not depend on file descriptor I/O
-			 * operations or timeouts:
-			 */
-			case PS_DEADLOCK:
-			case PS_FDLR_WAIT:
-			case PS_FDLW_WAIT:
-			case PS_FILE_WAIT:
-			case PS_JOIN:
-			case PS_MUTEX_WAIT:
-			case PS_SIGSUSPEND:
-			case PS_SIGTHREAD:
-			case PS_SIGWAIT:
-			case PS_WAIT_WAIT:
-				/* No timeouts for these states: */
-				curthread->wakeup_time.tv_sec = -1;
-				curthread->wakeup_time.tv_nsec = -1;
-
-				/* Restart the time slice: */
-				curthread->slice_usec = -1;
-
-				/* Insert into the waiting queue: */
-				PTHREAD_WAITQ_INSERT(curthread);
-				break;
-
-			/* States which can timeout: */
-			case PS_COND_WAIT:
-			case PS_SLEEP_WAIT:
-				/* Restart the time slice: */
-				curthread->slice_usec = -1;
-
-				/* Insert into the waiting queue: */
-				PTHREAD_WAITQ_INSERT(curthread);
-				break;
-	
-			/* States that require periodic work: */
-			case PS_SPINBLOCK:
-				/* No timeouts for this state: */
-				curthread->wakeup_time.tv_sec = -1;
-				curthread->wakeup_time.tv_nsec = -1;
-
-				/* Increment spinblock count: */
-				_spinblock_count++;
-
-				/* FALLTHROUGH */
-			case PS_FDR_WAIT:
-			case PS_FDW_WAIT:
-			case PS_POLL_WAIT:
-			case PS_SELECT_WAIT:
-				/* Restart the time slice: */
-				curthread->slice_usec = -1;
-	
-				/* Insert into the waiting queue: */
-				PTHREAD_WAITQ_INSERT(curthread);
-	
-				/* Insert into the work queue: */
-				PTHREAD_WORKQ_INSERT(curthread);
-				break;
-			}
-
-			/*
-			 * Are there pending signals for this thread?
-			 *
-			 * This check has to be performed after the thread
-			 * has been placed in the queue(s) appropriate for
-			 * its state.  The process of adding pending signals
-			 * can change a threads state, which in turn will
-			 * attempt to add or remove the thread from any
-			 * scheduling queue to which it belongs.
-			 */
-			if (curthread->check_pending != 0) {
-				curthread->check_pending = 0;
-				_thread_sig_check_pending(curthread);
-			}
-		}
-
-		/*
-		 * Avoid polling file descriptors if there are none
-		 * waiting:
-		 */
-		if (TAILQ_EMPTY(&_workq) != 0) {
-		}
-		/*
-		 * Poll file descriptors only if a new scheduling signal
-		 * has occurred or if we have no more runnable threads.
-		 */
-		else if (((current_tick = _sched_ticks) != last_tick) ||
-		    ((curthread->state != PS_RUNNING) &&
-		    (PTHREAD_PRIOQ_FIRST() == NULL))) {
-			/* Unprotect the scheduling queues: */
-			_queue_signals = 0;
-
-			/*
-			 * Poll file descriptors to update the state of threads
-			 * waiting on file I/O where data may be available:
-			 */
-			thread_kern_poll(0);
-
-			/* Protect the scheduling queues: */
-			_queue_signals = 1;
-		}
-		last_tick = current_tick;
-
-		/*
-		 * Wake up threads that have timedout.  This has to be
-		 * done after polling in case a thread does a poll or
-		 * select with zero time.
-		 */
-		PTHREAD_WAITQ_SETACTIVE();
-		while (((pthread = TAILQ_FIRST(&_waitingq)) != NULL) &&
-		    (pthread->wakeup_time.tv_sec != -1) &&
-		    (((pthread->wakeup_time.tv_sec == 0) &&
-		    (pthread->wakeup_time.tv_nsec == 0)) ||
-		    (pthread->wakeup_time.tv_sec < ts.tv_sec) ||
-		    ((pthread->wakeup_time.tv_sec == ts.tv_sec) &&
-		    (pthread->wakeup_time.tv_nsec <= ts.tv_nsec)))) {
-			switch (pthread->state) {
-			case PS_POLL_WAIT:
-			case PS_SELECT_WAIT:
-				/* Return zero file descriptors ready: */
-				pthread->data.poll_data->nfds = 0;
-				/* FALLTHROUGH */
-			default:
-				/*
-				 * Remove this thread from the waiting queue
-				 * (and work queue if necessary) and place it
-				 * in the ready queue.
-				 */
-				PTHREAD_WAITQ_CLEARACTIVE();
-				if (pthread->flags & PTHREAD_FLAGS_IN_WORKQ)
-					PTHREAD_WORKQ_REMOVE(pthread);
-				PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-				PTHREAD_WAITQ_SETACTIVE();
-				break;
-			}
-			/*
-			 * Flag the timeout in the thread structure:
-			 */
-			pthread->timeout = 1;
-		}
-		PTHREAD_WAITQ_CLEARACTIVE();
-
-		/*
-		 * Check to see if the current thread needs to be added
-		 * to the priority queue:
-		 */
-		if (add_to_prioq != 0) {
-			/*
-			 * Save the current time as the time that the
-			 * thread became inactive:
-			 */
-			current_tick = _sched_ticks;
-			curthread->last_inactive = (long)current_tick;
-			if (curthread->last_inactive <
-			    curthread->last_active) {
-				/* Account for a rollover: */
-				curthread->last_inactive =+ UINT_MAX + 1;
-			}
-
-			if ((curthread->slice_usec != -1) &&
-		 	   (curthread->attr.sched_policy != SCHED_FIFO)) {
-				/*
-				 * Accumulate the number of microseconds for
-				 * which the current thread has run:
-				 */
-				curthread->slice_usec +=
-				    (curthread->last_inactive -
-				    curthread->last_active) *
-				    (long)_clock_res_usec;
-				/* Check for time quantum exceeded: */
-				if (curthread->slice_usec > TIMESLICE_USEC)
-					curthread->slice_usec = -1;
-			}
-
-			if (curthread->slice_usec == -1) {
-				/*
-				 * The thread exceeded its time
-				 * quantum or it yielded the CPU;
-				 * place it at the tail of the
-				 * queue for its priority.
-				 */
-				PTHREAD_PRIOQ_INSERT_TAIL(curthread);
-			} else {
-				/*
-				 * The thread hasn't exceeded its
-				 * interval.  Place it at the head
-				 * of the queue for its priority.
-				 */
-				PTHREAD_PRIOQ_INSERT_HEAD(curthread);
-			}
-		}
-
-		/*
-		 * Get the highest priority thread in the ready queue.
-		 */
-		pthread_h = PTHREAD_PRIOQ_FIRST();
-
-		/* Check if there are no threads ready to run: */
-		if (pthread_h == NULL) {
-			/*
-			 * Lock the pthread kernel by changing the pointer to
-			 * the running thread to point to the global kernel
-			 * thread structure:
-			 */
-			_set_curthread(&_thread_kern_thread);
-			curthread = &_thread_kern_thread;
-
-			DBG_MSG("No runnable threads, using kernel thread %p\n",
-			    curthread);
-
-			/* Unprotect the scheduling queues: */
-			_queue_signals = 0;
-
-			/*
-			 * There are no threads ready to run, so wait until
-			 * something happens that changes this condition:
-			 */
-			thread_kern_poll(1);
-
-			/*
-			 * This process' usage will likely be very small
-			 * while waiting in a poll.  Since the scheduling
-			 * clock is based on the profiling timer, it is
-			 * unlikely that the profiling timer will fire
-			 * and update the time of day.  To account for this,
-			 * get the time of day after polling with a timeout.
-			 */
-			gettimeofday((struct timeval *) &_sched_tod, NULL);
-			
-			/* Check once more for a runnable thread: */
-			_queue_signals = 1;
-			pthread_h = PTHREAD_PRIOQ_FIRST();
-			_queue_signals = 0;
-		}
-
-		if (pthread_h != NULL) {
-			/* Remove the thread from the ready queue: */
-			PTHREAD_PRIOQ_REMOVE(pthread_h);
-
-			/* Unprotect the scheduling queues: */
-			_queue_signals = 0;
-
-			/*
-			 * Check for signals queued while the scheduling
-			 * queues were protected:
-			 */
-			while (_sigq_check_reqd != 0) {
-				/* Clear before handling queued signals: */
-				_sigq_check_reqd = 0;
-
-				/* Protect the scheduling queues again: */
-				_queue_signals = 1;
-
-				dequeue_signals();
-
-				/*
-				 * Check for a higher priority thread that
-				 * became runnable due to signal handling.
-				 */
-				if (((pthread = PTHREAD_PRIOQ_FIRST()) != NULL) &&
-				    (pthread->active_priority > pthread_h->active_priority)) {
-					/* Remove the thread from the ready queue: */
-					PTHREAD_PRIOQ_REMOVE(pthread);
-
-					/*
-					 * Insert the lower priority thread
-					 * at the head of its priority list:
-					 */
-					PTHREAD_PRIOQ_INSERT_HEAD(pthread_h);
-
-					/* There's a new thread in town: */
-					pthread_h = pthread;
-				}
-
-				/* Unprotect the scheduling queues: */
-				_queue_signals = 0;
-			}
-
-			/* Make the selected thread the current thread: */
-			_set_curthread(pthread_h);
-			curthread = pthread_h;
-
-			/*
-			 * Save the current time as the time that the thread
-			 * became active:
-			 */
-			current_tick = _sched_ticks;
-			curthread->last_active = (long) current_tick;
-
-			/*
-			 * Check if this thread is running for the first time
-			 * or running again after using its full time slice
-			 * allocation:
-			 */
-			if (curthread->slice_usec == -1) {
-				/* Reset the accumulated time slice period: */
-				curthread->slice_usec = 0;
-			}
-
-			/*
-			 * If we had a context switch, run any
-			 * installed switch hooks.
-			 */
-			if ((_sched_switch_hook != NULL) &&
-			    (_last_user_thread != curthread)) {
-				thread_run_switch_hook(_last_user_thread,
-				    curthread);
-			}
-			/*
-			 * Continue the thread at its current frame:
-			 */
-#if NOT_YET
-			_setcontext(&curthread->ctx.uc);
-#else
-			___longjmp(curthread->ctx.jb, 1);
-#endif
-			/* This point should not be reached. */
-			PANIC("Thread has returned from sigreturn or longjmp");
-		}
-	}
-
-	/* There are no more threads, so exit this process: */
-	exit(0);
-}
-
-void
-_thread_kern_sched_state(enum pthread_state state, char *fname, int lineno)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/*
-	 * Flag the pthread kernel as executing scheduler code
-	 * to avoid a scheduler signal from interrupting this
-	 * execution and calling the scheduler again.
-	 */
-	_thread_kern_in_sched = 1;
-
-	/*
-	 * Prevent the signal handler from fiddling with this thread
-	 * before its state is set and is placed into the proper queue.
-	 */
-	_queue_signals = 1;
-
-	/* Change the state of the current thread: */
-	curthread->state = state;
-	curthread->fname = fname;
-	curthread->lineno = lineno;
-
-	/* Schedule the next thread that is ready: */
-	_thread_kern_sched(NULL);
-}
-
-void
-_thread_kern_sched_state_unlock(enum pthread_state state,
-    spinlock_t *lock, char *fname, int lineno)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/*
-	 * Flag the pthread kernel as executing scheduler code
-	 * to avoid a scheduler signal from interrupting this
-	 * execution and calling the scheduler again.
-	 */
-	_thread_kern_in_sched = 1;
-
-	/*
-	 * Prevent the signal handler from fiddling with this thread
-	 * before its state is set and it is placed into the proper
-	 * queue(s).
-	 */
-	_queue_signals = 1;
-
-	/* Change the state of the current thread: */
-	curthread->state = state;
-	curthread->fname = fname;
-	curthread->lineno = lineno;
-
-	_SPINUNLOCK(lock);
-
-	/* Schedule the next thread that is ready: */
-	_thread_kern_sched(NULL);
-}
-
-static void
-thread_kern_poll(int wait_reqd)
-{
-	int             count = 0;
-	int             i, found;
-	int		kern_pipe_added = 0;
-	int             nfds = 0;
-	int		timeout_ms = 0;
-	struct pthread	*pthread;
-	struct timespec ts;
-	struct timeval  tv;
-
-	/* Check if the caller wants to wait: */
-	if (wait_reqd == 0) {
-		timeout_ms = 0;
-	}
-	else {
-		/* Get the current time of day: */
-		GET_CURRENT_TOD(tv);
-		TIMEVAL_TO_TIMESPEC(&tv, &ts);
-
-		_queue_signals = 1;
-		pthread = TAILQ_FIRST(&_waitingq);
-		_queue_signals = 0;
-
-		if ((pthread == NULL) || (pthread->wakeup_time.tv_sec == -1)) {
-			/*
-			 * Either there are no threads in the waiting queue,
-			 * or there are no threads that can timeout.
-			 */
-			timeout_ms = INFTIM;
-		}
-		else if (pthread->wakeup_time.tv_sec - ts.tv_sec > 60000)
-			/* Limit maximum timeout to prevent rollover. */
-			timeout_ms = 60000;
-		else {
-			/*
-			 * Calculate the time left for the next thread to
-			 * timeout:
-			 */
-			timeout_ms = ((pthread->wakeup_time.tv_sec - ts.tv_sec) *
-			    1000) + ((pthread->wakeup_time.tv_nsec - ts.tv_nsec) /
-			    1000000);
-			/*
-			 * Don't allow negative timeouts:
-			 */
-			if (timeout_ms < 0)
-				timeout_ms = 0;
-		}
-	}
-			
-	/* Protect the scheduling queues: */
-	_queue_signals = 1;
-
-	/*
-	 * Check to see if the signal queue needs to be walked to look
-	 * for threads awoken by a signal while in the scheduler.
-	 */
-	if (_sigq_check_reqd != 0) {
-		/* Reset flag before handling queued signals: */
-		_sigq_check_reqd = 0;
-
-		dequeue_signals();
-	}
-
-	/*
-	 * Check for a thread that became runnable due to a signal:
-	 */
-	if (PTHREAD_PRIOQ_FIRST() != NULL) {
-		/*
-		 * Since there is at least one runnable thread,
-		 * disable the wait.
-		 */
-		timeout_ms = 0;
-	}
-
-	/*
-	 * Form the poll table:
-	 */
-	nfds = 0;
-	if (timeout_ms != 0) {
-		/* Add the kernel pipe to the poll table: */
-		_thread_pfd_table[nfds].fd = _thread_kern_pipe[0];
-		_thread_pfd_table[nfds].events = POLLRDNORM;
-		_thread_pfd_table[nfds].revents = 0;
-		nfds++;
-		kern_pipe_added = 1;
-	}
-
-	PTHREAD_WAITQ_SETACTIVE();
-	TAILQ_FOREACH(pthread, &_workq, qe) {
-		switch (pthread->state) {
-		case PS_SPINBLOCK:
-			/*
-			 * If the lock is available, let the thread run.
-			 */
-			if (pthread->data.spinlock->access_lock == 0) {
-				PTHREAD_WAITQ_CLEARACTIVE();
-				PTHREAD_WORKQ_REMOVE(pthread);
-				PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-				PTHREAD_WAITQ_SETACTIVE();
-				/* One less thread in a spinblock state: */
-				_spinblock_count--;
-				/*
-				 * Since there is at least one runnable
-				 * thread, disable the wait.
-				 */
-				timeout_ms = 0;
-			}
-			break;
-
-		/* File descriptor read wait: */
-		case PS_FDR_WAIT:
-			/* Limit number of polled files to table size: */
-			if (nfds < _thread_dtablesize) {
-				_thread_pfd_table[nfds].events = POLLRDNORM;
-				_thread_pfd_table[nfds].fd = pthread->data.fd.fd;
-				nfds++;
-			}
-			break;
-
-		/* File descriptor write wait: */
-		case PS_FDW_WAIT:
-			/* Limit number of polled files to table size: */
-			if (nfds < _thread_dtablesize) {
-				_thread_pfd_table[nfds].events = POLLWRNORM;
-				_thread_pfd_table[nfds].fd = pthread->data.fd.fd;
-				nfds++;
-			}
-			break;
-
-		/* File descriptor poll or select wait: */
-		case PS_POLL_WAIT:
-		case PS_SELECT_WAIT:
-			/* Limit number of polled files to table size: */
-			if (pthread->data.poll_data->nfds + nfds <
-			    _thread_dtablesize) {
-				for (i = 0; i < pthread->data.poll_data->nfds; i++) {
-					_thread_pfd_table[nfds + i].fd =
-					    pthread->data.poll_data->fds[i].fd;
-					_thread_pfd_table[nfds + i].events =
-					    pthread->data.poll_data->fds[i].events;
-				}
-				nfds += pthread->data.poll_data->nfds;
-			}
-			break;
-
-		/* Other states do not depend on file I/O. */
-		default:
-			break;
-		}
-	}
-	PTHREAD_WAITQ_CLEARACTIVE();
-
-	/*
-	 * Wait for a file descriptor to be ready for read, write, or
-	 * an exception, or a timeout to occur:
-	 */
-	count = __sys_poll(_thread_pfd_table, nfds, timeout_ms);
-
-	if (kern_pipe_added != 0)
-		/*
-		 * Remove the pthread kernel pipe file descriptor
-		 * from the pollfd table:
-		 */
-		nfds = 1;
-	else
-		nfds = 0;
-
-	/*
-	 * Check if it is possible that there are bytes in the kernel
-	 * read pipe waiting to be read:
-	 */
-	if (count < 0 || ((kern_pipe_added != 0) &&
-	    (_thread_pfd_table[0].revents & POLLRDNORM))) {
-		/*
-		 * If the kernel read pipe was included in the
-		 * count:
-		 */
-		if (count > 0) {
-			/* Decrement the count of file descriptors: */
-			count--;
-		}
-
-		if (_sigq_check_reqd != 0) {
-			/* Reset flag before handling signals: */
-			_sigq_check_reqd = 0;
-
-			dequeue_signals();
-		}
-	}
-
-	/*
-	 * Check if any file descriptors are ready:
-	 */
-	if (count > 0) {
-		/*
-		 * Enter a loop to look for threads waiting on file
-		 * descriptors that are flagged as available by the
-		 * _poll syscall:
-		 */
-		PTHREAD_WAITQ_SETACTIVE();
-		TAILQ_FOREACH(pthread, &_workq, qe) {
-			switch (pthread->state) {
-			case PS_SPINBLOCK:
-				/*
-				 * If the lock is available, let the thread run.
-				 */
-				if (pthread->data.spinlock->access_lock == 0) {
-					PTHREAD_WAITQ_CLEARACTIVE();
-					PTHREAD_WORKQ_REMOVE(pthread);
-					PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-					PTHREAD_WAITQ_SETACTIVE();
-
-					/*
-					 * One less thread in a spinblock state:
-					 */
-					_spinblock_count--;
-				}
-				break;
-
-			/* File descriptor read wait: */
-			case PS_FDR_WAIT:
-				if ((nfds < _thread_dtablesize) &&
-				    (_thread_pfd_table[nfds].revents
-				       & (POLLRDNORM|POLLERR|POLLHUP|POLLNVAL))
-				      != 0) {
-					PTHREAD_WAITQ_CLEARACTIVE();
-					PTHREAD_WORKQ_REMOVE(pthread);
-					PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-					PTHREAD_WAITQ_SETACTIVE();
-				}
-				nfds++;
-				break;
-
-			/* File descriptor write wait: */
-			case PS_FDW_WAIT:
-				if ((nfds < _thread_dtablesize) &&
-				    (_thread_pfd_table[nfds].revents
-				       & (POLLWRNORM|POLLERR|POLLHUP|POLLNVAL))
-				      != 0) {
-					PTHREAD_WAITQ_CLEARACTIVE();
-					PTHREAD_WORKQ_REMOVE(pthread);
-					PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-					PTHREAD_WAITQ_SETACTIVE();
-				}
-				nfds++;
-				break;
-
-			/* File descriptor poll or select wait: */
-			case PS_POLL_WAIT:
-			case PS_SELECT_WAIT:
-				if (pthread->data.poll_data->nfds + nfds <
-				    _thread_dtablesize) {
-					/*
-					 * Enter a loop looking for I/O
-					 * readiness:
-					 */
-					found = 0;
-					for (i = 0; i < pthread->data.poll_data->nfds; i++) {
-						if (_thread_pfd_table[nfds + i].revents != 0) {
-							pthread->data.poll_data->fds[i].revents =
-							    _thread_pfd_table[nfds + i].revents;
-							found++;
-						}
-					}
-
-					/* Increment before destroying: */
-					nfds += pthread->data.poll_data->nfds;
-
-					if (found != 0) {
-						pthread->data.poll_data->nfds = found;
-						PTHREAD_WAITQ_CLEARACTIVE();
-						PTHREAD_WORKQ_REMOVE(pthread);
-						PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-						PTHREAD_WAITQ_SETACTIVE();
-					}
-				}
-				else
-					nfds += pthread->data.poll_data->nfds;
-				break;
-
-			/* Other states do not depend on file I/O. */
-			default:
-				break;
-			}
-		}
-		PTHREAD_WAITQ_CLEARACTIVE();
-	}
-	else if (_spinblock_count != 0) {
-		/*
-		 * Enter a loop to look for threads waiting on a spinlock
-		 * that is now available.
-		 */
-		PTHREAD_WAITQ_SETACTIVE();
-		TAILQ_FOREACH(pthread, &_workq, qe) {
-			if (pthread->state == PS_SPINBLOCK) {
-				/*
-				 * If the lock is available, let the thread run.
-				 */
-				if (pthread->data.spinlock->access_lock == 0) {
-					PTHREAD_WAITQ_CLEARACTIVE();
-					PTHREAD_WORKQ_REMOVE(pthread);
-					PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-					PTHREAD_WAITQ_SETACTIVE();
-
-					/*
-					 * One less thread in a spinblock state:
-					 */
-					_spinblock_count--;
-				}
-			}
-		}
-		PTHREAD_WAITQ_CLEARACTIVE();
-	}
-
-	/* Unprotect the scheduling queues: */
-	_queue_signals = 0;
-
-	while (_sigq_check_reqd != 0) {
-		/* Handle queued signals: */
-		_sigq_check_reqd = 0;
-
-		/* Protect the scheduling queues: */
-		_queue_signals = 1;
-
-		dequeue_signals();
-
-		/* Unprotect the scheduling queues: */
-		_queue_signals = 0;
-	}
-}
-
-void
-_thread_kern_set_timeout(const struct timespec * timeout)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct timespec current_time;
-	struct timeval  tv;
-
-	/* Reset the timeout flag for the running thread: */
-	curthread->timeout = 0;
-
-	/* Check if the thread is to wait forever: */
-	if (timeout == NULL) {
-		/*
-		 * Set the wakeup time to something that can be recognised as
-		 * different to an actual time of day:
-		 */
-		curthread->wakeup_time.tv_sec = -1;
-		curthread->wakeup_time.tv_nsec = -1;
-	}
-	/* Check if no waiting is required: */
-	else if (timeout->tv_sec == 0 && timeout->tv_nsec == 0) {
-		/* Set the wake up time to 'immediately': */
-		curthread->wakeup_time.tv_sec = 0;
-		curthread->wakeup_time.tv_nsec = 0;
-	} else {
-		/* Get the current time: */
-		GET_CURRENT_TOD(tv);
-		TIMEVAL_TO_TIMESPEC(&tv, &current_time);
-
-		/* Calculate the time for the current thread to wake up: */
-		curthread->wakeup_time.tv_sec = current_time.tv_sec + timeout->tv_sec;
-		curthread->wakeup_time.tv_nsec = current_time.tv_nsec + timeout->tv_nsec;
-
-		/* Check if the nanosecond field needs to wrap: */
-		if (curthread->wakeup_time.tv_nsec >= 1000000000) {
-			/* Wrap the nanosecond field: */
-			curthread->wakeup_time.tv_sec += 1;
-			curthread->wakeup_time.tv_nsec -= 1000000000;
-		}
-	}
-}
-
-void
-_thread_kern_sig_defer(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/* Allow signal deferral to be recursive. */
-	curthread->sig_defer_count++;
-}
-
-void
-_thread_kern_sig_undefer(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/*
-	 * Perform checks to yield only if we are about to undefer
-	 * signals.
-	 */
-	if (curthread->sig_defer_count > 1) {
-		/* Decrement the signal deferral count. */
-		curthread->sig_defer_count--;
-	}
-	else if (curthread->sig_defer_count == 1) {
-		/* Reenable signals: */
-		curthread->sig_defer_count = 0;
-
-		/*
-		 * Check if there are queued signals:
-		 */
-		if (_sigq_check_reqd != 0)
-			_thread_kern_sched(NULL);
-
-		/*
-		 * Check for asynchronous cancellation before delivering any
-		 * pending signals:
-		 */
-		if (((curthread->cancelflags & PTHREAD_AT_CANCEL_POINT) == 0) &&
-		    ((curthread->cancelflags & PTHREAD_CANCEL_ASYNCHRONOUS) != 0))
-			pthread_testcancel();
-
-		/*
-		 * If there are pending signals or this thread has
-		 * to yield the CPU, call the kernel scheduler:
-		 *
-		 * XXX - Come back and revisit the pending signal problem
-		 */
-		if ((curthread->yield_on_sig_undefer != 0) ||
-		    SIGNOTEMPTY(curthread->sigpend)) {
-			curthread->yield_on_sig_undefer = 0;
-			_thread_kern_sched(NULL);
-		}
-	}
-}
-
-static void
-dequeue_signals(void)
-{
-	char	bufr[128];
-	int	num;
-
-	/*
-	 * Enter a loop to clear the pthread kernel pipe:
-	 */
-	while (((num = __sys_read(_thread_kern_pipe[0], bufr,
-	    sizeof(bufr))) > 0) || (num == -1 && errno == EINTR)) {
-	}
-	if ((num < 0) && (errno != EAGAIN)) {
-		/*
-		 * The only error we should expect is if there is
-		 * no data to read.
-		 */
-		PANIC("Unable to read from thread kernel pipe");
-	}
-	/* Handle any pending signals: */
-	_thread_sig_handle_pending();
-}
-
-static inline void
-thread_run_switch_hook(pthread_t thread_out, pthread_t thread_in)
-{
-	pthread_t tid_out = thread_out;
-	pthread_t tid_in = thread_in;
-
-	if ((tid_out != NULL) &&
-	    (tid_out->flags & PTHREAD_FLAGS_PRIVATE) != 0)
-		tid_out = NULL;
-	if ((tid_in != NULL) &&
-	    (tid_in->flags & PTHREAD_FLAGS_PRIVATE) != 0)
-		tid_in = NULL;
-
-	if ((_sched_switch_hook != NULL) && (tid_out != tid_in)) {
-		/* Run the scheduler switch hook: */
-		_sched_switch_hook(tid_out, tid_in);
-	}
-}
-
-struct pthread *
-_get_curthread(void)
-{
-	if (_thread_initial == NULL)
-		_thread_init();
-
-	return (_thread_run);
-}
-
-void
-_set_curthread(struct pthread *newthread)
-{
-	_thread_run = newthread;
-}
diff --git a/lib/libc/uthread/uthread_kevent.c b/lib/libc/uthread/uthread_kevent.c
deleted file mode 100644
index c383003..0000000
--- a/lib/libc/uthread/uthread_kevent.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2000 Jonathan Lemon <jlemon@flugsvamp.com>
- * 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.
- *
- * 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/lib/libc_r/uthread/uthread_kevent.c,v 1.6 2001/12/08 00:53:37 sobomax Exp $
- */
-
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/event.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_kevent, kevent);
-
-int 
-_kevent(int kq, const struct kevent *changelist, int nchanges,
-    struct kevent *eventlist, int nevents, const struct timespec *timeout)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct timespec nullts = { 0, 0 };
-	int rc;
-
-	/* Set the wake up time */
-	_thread_kern_set_timeout(timeout);
-
-	rc = __sys_kevent(kq, changelist, nchanges,
-	    eventlist, nevents, &nullts);
-	if (rc == 0 && eventlist != NULL && nevents > 0 && (timeout == NULL ||
-	    timeout->tv_sec != 0 || timeout->tv_nsec != 0)) {
-		/* Save the socket file descriptor: */
-		curthread->data.fd.fd = kq;
-		curthread->data.fd.fname = __FILE__;
-		curthread->data.fd.branch = __LINE__;
-
-		do {
-			/* Reset the interrupted and timeout flags: */
-			curthread->interrupted = 0;
-			curthread->timeout = 0;
-
-			_thread_kern_sched_state(PS_FDR_WAIT,
-			    __FILE__, __LINE__);
-
-			if (curthread->interrupted) {
-				errno = EINTR;
-				rc = -1;
-				break;
-			}
-			rc = __sys_kevent(kq, NULL, 0,
-			    eventlist, nevents, &nullts);
-		} while (rc == 0 && curthread->timeout == 0);
-	}
-	return (rc);
-}
diff --git a/lib/libc/uthread/uthread_kill.c b/lib/libc/uthread/uthread_kill.c
deleted file mode 100644
index 9f692b6..0000000
--- a/lib/libc/uthread/uthread_kill.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_kill.c,v 1.12 2001/04/10 04:19:20 deischen Exp $
- */
-#include <errno.h>
-#include <signal.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_kill, pthread_kill);
-
-int
-_pthread_kill(pthread_t pthread, int sig)
-{
-	int ret;
-
-	/* Check for invalid signal numbers: */
-	if (sig < 0 || sig >= NSIG)
-		/* Invalid signal: */
-		ret = EINVAL;
-	/*
-	 * Ensure the thread is in the list of active threads, and the
-	 * signal is valid (signal 0 specifies error checking only) and
-	 * not being ignored:
-	 */
-	else if (((ret = _find_thread(pthread)) == 0) && (sig > 0) &&
-	    (_thread_sigact[sig - 1].sa_handler != SIG_IGN)) {
-		/*
-		 * Defer signals to protect the scheduling queues from
-		 * access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		_thread_sig_send(pthread, sig);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_kqueue.c b/lib/libc/uthread/uthread_kqueue.c
deleted file mode 100644
index fee328b..0000000
--- a/lib/libc/uthread/uthread_kqueue.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2003 Mark Peek <mp@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.
- *
- * 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/lib/libc_r/uthread/uthread_kqueue.c,v 1.1 2003/07/25 17:02:33 mp Exp $
- */
-
-#include <sys/types.h>
-#include <sys/event.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_kqueue, kqueue);
-
-int
-_kqueue(void)
-{
-	int fd;
-
-	/* Create a kqueue: */
-	if ((fd = __sys_kqueue()) < 0) {
-		/* Error creating socket. */
-
-	/* Initialise the entry in the file descriptor table: */
-	} else if (_thread_fd_table_init(fd) != 0) {
-		__sys_close(fd);
-		fd = -1;
-	}
-	return (fd);
-}
diff --git a/lib/libc/uthread/uthread_listen.c b/lib/libc/uthread/uthread_listen.c
deleted file mode 100644
index 573fc8c..0000000
--- a/lib/libc/uthread/uthread_listen.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_listen.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_listen, listen);
-
-int
-_listen(int fd, int backlog)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		ret = __sys_listen(fd, backlog);
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	return (ret);
-}
-
diff --git a/lib/libc/uthread/uthread_main_np.c b/lib/libc/uthread/uthread_main_np.c
deleted file mode 100644
index ab53524..0000000
--- a/lib/libc/uthread/uthread_main_np.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2001 Alfred Perlstein
- * Author: Alfred Perlstein <alfred@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.
- *
- * 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/lib/libc_r/uthread/uthread_main_np.c,v 1.4 2002/10/15 16:40:57 fjoe Exp $
- */
-
-#include <pthread.h>
-#include <pthread_np.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_main_np, pthread_main_np);
-
-/*
- * Provide the equivalent to Solaris thr_main() function
- */
-int
-_pthread_main_np()
-{
-
-	if (!_thread_initial)
-		return (-1);
-	else
-		return (pthread_equal(pthread_self(), _thread_initial) ? 1 : 0);
-}
diff --git a/lib/libc/uthread/uthread_mattr_init.c b/lib/libc/uthread/uthread_mattr_init.c
deleted file mode 100644
index cdedd30..0000000
--- a/lib/libc/uthread/uthread_mattr_init.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1996 Jeffrey Hsu <hsu@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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Jeffrey Hsu.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JEFFREY HSU 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/lib/libc_r/uthread/uthread_mattr_init.c,v 1.10 2005/01/08 17:16:43 hsu Exp $
- */
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_mutexattr_init, pthread_mutexattr_init);
-
-static struct pthread_mutex_attr default_mutexattr = PTHREAD_MUTEXATTR_DEFAULT;
-
-int
-_pthread_mutexattr_init(pthread_mutexattr_t *attr)
-{
-	int ret;
-	pthread_mutexattr_t pattr;
-
-	if ((pattr = (pthread_mutexattr_t)
-			malloc(sizeof(struct pthread_mutex_attr))) == NULL) {
-		ret = ENOMEM;
-	} else {
-		memcpy(pattr, &default_mutexattr,
-		    sizeof(struct pthread_mutex_attr));
-		*attr = pattr;
-		ret = 0;
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_mattr_kind_np.c b/lib/libc/uthread/uthread_mattr_kind_np.c
deleted file mode 100644
index 90200b4..0000000
--- a/lib/libc/uthread/uthread_mattr_kind_np.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1996 Jeffrey Hsu <hsu@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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Jeffrey Hsu.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JEFFREY HSU 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/lib/libc_r/uthread/uthread_mattr_kind_np.c,v 1.9 2005/01/08 17:16:43 hsu Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_mutexattr_setkind_np, pthread_mutexattr_setkind_np);
-__weak_reference(_pthread_mutexattr_getkind_np, pthread_mutexattr_getkind_np);
-__weak_reference(_pthread_mutexattr_gettype, pthread_mutexattr_gettype);
-__weak_reference(_pthread_mutexattr_settype, pthread_mutexattr_settype);
-
-int
-_pthread_mutexattr_setkind_np(pthread_mutexattr_t *attr, int kind)
-{
-	int	ret;
-	if (attr == NULL || *attr == NULL) {
-		errno = EINVAL;
-		ret = -1;
-	} else {
-		(*attr)->m_type = kind;
-		ret = 0;
-	}
-	return(ret);
-}
-
-int
-_pthread_mutexattr_getkind_np(pthread_mutexattr_t attr)
-{
-	int	ret;
-	if (attr == NULL) {
-		errno = EINVAL;
-		ret = -1;
-	} else {
-		ret = attr->m_type;
-	}
-	return(ret);
-}
-
-int
-_pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type)
-{
-	int	ret;
-	if (attr == NULL || *attr == NULL || type >= MUTEX_TYPE_MAX) {
-		errno = EINVAL;
-		ret = -1;
-	} else {
-		(*attr)->m_type = type;
-		ret = 0;
-	}
-	return(ret);
-}
-
-int
-_pthread_mutexattr_gettype(pthread_mutexattr_t *attr, int *type)
-{
-	int	ret;
-
-	if (attr == NULL || *attr == NULL || (*attr)->m_type >=
-	    MUTEX_TYPE_MAX) {
-		ret = EINVAL;
-	} else {
-		*type = (*attr)->m_type;
-		ret = 0;
-	}
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_msync.c b/lib/libc/uthread/uthread_msync.c
deleted file mode 100644
index 1b3098c..0000000
--- a/lib/libc/uthread/uthread_msync.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * David Leonard <d@openbsd.org>, 1999. Public Domain.
- *
- * $OpenBSD: uthread_msync.c,v 1.2 1999/06/09 07:16:17 d Exp $
- *
- * $FreeBSD: src/lib/libc_r/uthread/uthread_msync.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__msync, msync);
-
-int
-_msync(void *addr, size_t len, int flags)
-{
-	int ret;
-
-	ret = __sys_msync(addr, len, flags);
-
-	return (ret);
-}
-
-int
-__msync(void *addr, size_t len, int flags)
-{
-	int	ret;
-
-	/*
-	 * XXX This is quite pointless unless we know how to get the
-	 * file descriptor associated with the memory, and lock it for
-	 * write. The only real use of this wrapper is to guarantee
-	 * a cancellation point, as per the standard. sigh.
-	 */
-	_thread_enter_cancellation_point();
-	ret = _msync(addr, len, flags);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_multi_np.c b/lib/libc/uthread/uthread_multi_np.c
deleted file mode 100644
index 7cabc70..0000000
--- a/lib/libc/uthread/uthread_multi_np.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_multi_np.c,v 1.7 2002/05/24 04:32:28 deischen Exp $
- */
-#include <pthread.h>
-#include <pthread_np.h>
-
-__weak_reference(_pthread_multi_np, pthread_multi_np);
-
-int
-_pthread_multi_np()
-{
-
-	/* Return to multi-threaded scheduling mode: */
-	/*
-	 * XXX - Do we want to do this?
-	 * __is_threaded = 1;
-	 */
-	pthread_resume_all_np();
-	return (0);
-}
diff --git a/lib/libc/uthread/uthread_mutex.c b/lib/libc/uthread/uthread_mutex.c
deleted file mode 100644
index ac4defb..0000000
--- a/lib/libc/uthread/uthread_mutex.c
+++ /dev/null
@@ -1,1545 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_mutex.c,v 1.33 2002/11/13 18:13:26 deischen Exp $
- */
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-#if defined(_PTHREADS_INVARIANTS)
-#define _MUTEX_INIT_LINK(m) 		do {		\
-	(m)->m_qe.tqe_prev = NULL;			\
-	(m)->m_qe.tqe_next = NULL;			\
-} while (0)
-#define _MUTEX_ASSERT_IS_OWNED(m)	do {		\
-	if ((m)->m_qe.tqe_prev == NULL)			\
-		PANIC("mutex is not on list");		\
-} while (0)
-#define _MUTEX_ASSERT_NOT_OWNED(m)	do {		\
-	if (((m)->m_qe.tqe_prev != NULL) ||		\
-	    ((m)->m_qe.tqe_next != NULL))		\
-		PANIC("mutex is on list");		\
-} while (0)
-#else
-#define _MUTEX_INIT_LINK(m)
-#define _MUTEX_ASSERT_IS_OWNED(m)
-#define _MUTEX_ASSERT_NOT_OWNED(m)
-#endif
-
-/*
- * Prototypes
- */
-static inline int	mutex_self_trylock(pthread_mutex_t);
-static inline int	mutex_self_lock(pthread_mutex_t);
-static inline int	mutex_unlock_common(pthread_mutex_t *, int);
-static void		mutex_priority_adjust(pthread_mutex_t);
-static void		mutex_rescan_owned (pthread_t, pthread_mutex_t);
-static inline pthread_t	mutex_queue_deq(pthread_mutex_t);
-static inline void	mutex_queue_remove(pthread_mutex_t, pthread_t);
-static inline void	mutex_queue_enq(pthread_mutex_t, pthread_t);
-
-
-static spinlock_t static_init_lock = _SPINLOCK_INITIALIZER;
-
-static struct pthread_mutex_attr	static_mutex_attr =
-    PTHREAD_MUTEXATTR_STATIC_INITIALIZER;
-static pthread_mutexattr_t		static_mattr = &static_mutex_attr;
-
-/* Single underscore versions provided for libc internal usage: */
-__weak_reference(__pthread_mutex_trylock, pthread_mutex_trylock);
-__weak_reference(__pthread_mutex_lock, pthread_mutex_lock);
-
-/* No difference between libc and application usage of these: */
-__weak_reference(_pthread_mutex_init, pthread_mutex_init);
-__weak_reference(_pthread_mutex_destroy, pthread_mutex_destroy);
-__weak_reference(_pthread_mutex_unlock, pthread_mutex_unlock);
-
-
-/*
- * Reinitialize a private mutex; this is only used for internal mutexes.
- */
-int
-_mutex_reinit(pthread_mutex_t * mutex)
-{
-	int	ret = 0;
-
-	if (mutex == NULL)
-		ret = EINVAL;
-	else if (*mutex == NULL)
-		ret = _pthread_mutex_init(mutex, NULL);
-	else {
-		/*
-		 * Initialize the mutex structure:
-		 */
-		(*mutex)->m_type = PTHREAD_MUTEX_DEFAULT;
-		(*mutex)->m_protocol = PTHREAD_PRIO_NONE;
-		TAILQ_INIT(&(*mutex)->m_queue);
-		(*mutex)->m_owner = NULL;
-		(*mutex)->m_data.m_count = 0;
-		(*mutex)->m_flags |= MUTEX_FLAGS_INITED | MUTEX_FLAGS_PRIVATE;
-		(*mutex)->m_refcount = 0;
-		(*mutex)->m_prio = 0;
-		(*mutex)->m_saved_prio = 0;
-		_MUTEX_INIT_LINK(*mutex);
-		memset(&(*mutex)->lock, 0, sizeof((*mutex)->lock));
-	}
-	return (ret);
-}
-
-int
-_pthread_mutex_init(pthread_mutex_t * mutex,
-		   const pthread_mutexattr_t * mutex_attr)
-{
-	enum pthread_mutextype	type;
-	int		protocol;
-	int		ceiling;
-	int		flags;
-	pthread_mutex_t	pmutex;
-	int		ret = 0;
-
-	if (mutex == NULL)
-		ret = EINVAL;
-
-	/* Check if default mutex attributes: */
-	if (mutex_attr == NULL || *mutex_attr == NULL) {
-		/* Default to a (error checking) POSIX mutex: */
-		type = PTHREAD_MUTEX_ERRORCHECK;
-		protocol = PTHREAD_PRIO_NONE;
-		ceiling = PTHREAD_MAX_PRIORITY;
-		flags = 0;
-	}
-
-	/* Check mutex type: */
-	else if (((*mutex_attr)->m_type < PTHREAD_MUTEX_ERRORCHECK) ||
-	    ((*mutex_attr)->m_type >= MUTEX_TYPE_MAX))
-		/* Return an invalid argument error: */
-		ret = EINVAL;
-
-	/* Check mutex protocol: */
-	else if (((*mutex_attr)->m_protocol < PTHREAD_PRIO_NONE) ||
-	    ((*mutex_attr)->m_protocol > PTHREAD_MUTEX_RECURSIVE))
-		/* Return an invalid argument error: */
-		ret = EINVAL;
-
-	else {
-		/* Use the requested mutex type and protocol: */
-		type = (*mutex_attr)->m_type;
-		protocol = (*mutex_attr)->m_protocol;
-		ceiling = (*mutex_attr)->m_ceiling;
-		flags = (*mutex_attr)->m_flags;
-	}
-
-	/* Check no errors so far: */
-	if (ret == 0) {
-		if ((pmutex = (pthread_mutex_t)
-		    malloc(sizeof(struct pthread_mutex))) == NULL)
-			ret = ENOMEM;
-		else {
-			/* Set the mutex flags: */
-			pmutex->m_flags = flags;
-
-			/* Process according to mutex type: */
-			switch (type) {
-			/* case PTHREAD_MUTEX_DEFAULT: */
-			case PTHREAD_MUTEX_ERRORCHECK:
-			case PTHREAD_MUTEX_NORMAL:
-				/* Nothing to do here. */
-				break;
-
-			/* Single UNIX Spec 2 recursive mutex: */
-			case PTHREAD_MUTEX_RECURSIVE:
-				/* Reset the mutex count: */
-				pmutex->m_data.m_count = 0;
-				break;
-
-			/* Trap invalid mutex types: */
-			default:
-				/* Return an invalid argument error: */
-				ret = EINVAL;
-				break;
-			}
-			if (ret == 0) {
-				/* Initialise the rest of the mutex: */
-				TAILQ_INIT(&pmutex->m_queue);
-				pmutex->m_flags |= MUTEX_FLAGS_INITED;
-				pmutex->m_owner = NULL;
-				pmutex->m_type = type;
-				pmutex->m_protocol = protocol;
-				pmutex->m_refcount = 0;
-				if (protocol == PTHREAD_PRIO_PROTECT)
-					pmutex->m_prio = ceiling;
-				else
-					pmutex->m_prio = 0;
-				pmutex->m_saved_prio = 0;
-				_MUTEX_INIT_LINK(pmutex);
-				memset(&pmutex->lock, 0, sizeof(pmutex->lock));
-				*mutex = pmutex;
-			} else {
-				free(pmutex);
-				*mutex = NULL;
-			}
-		}
-	}
-	/* Return the completion status: */
-	return (ret);
-}
-
-int
-_pthread_mutex_destroy(pthread_mutex_t * mutex)
-{
-	int	ret = 0;
-
-	if (mutex == NULL || *mutex == NULL)
-		ret = EINVAL;
-	else {
-		/* Lock the mutex structure: */
-		_SPINLOCK(&(*mutex)->lock);
-
-		/*
-		 * Check to see if this mutex is in use:
-		 */
-		if (((*mutex)->m_owner != NULL) ||
-		    (TAILQ_FIRST(&(*mutex)->m_queue) != NULL) ||
-		    ((*mutex)->m_refcount != 0)) {
-			ret = EBUSY;
-
-			/* Unlock the mutex structure: */
-			_SPINUNLOCK(&(*mutex)->lock);
-		}
-		else {
-			/*
-			 * Free the memory allocated for the mutex
-			 * structure:
-			 */
-			_MUTEX_ASSERT_NOT_OWNED(*mutex);
-			free(*mutex);
-
-			/*
-			 * Leave the caller's pointer NULL now that
-			 * the mutex has been destroyed:
-			 */
-			*mutex = NULL;
-		}
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
-
-static int
-init_static(pthread_mutex_t *mutex)
-{
-	int	ret;
-
-	_SPINLOCK(&static_init_lock);
-
-	if (*mutex == NULL)
-		ret = _pthread_mutex_init(mutex, NULL);
-	else
-		ret = 0;
-
-	_SPINUNLOCK(&static_init_lock);
-
-	return (ret);
-}
-
-static int
-init_static_private(pthread_mutex_t *mutex)
-{
-	int	ret;
-
-	_SPINLOCK(&static_init_lock);
-
-	if (*mutex == NULL)
-		ret = _pthread_mutex_init(mutex, &static_mattr);
-	else
-		ret = 0;
-
-	_SPINUNLOCK(&static_init_lock);
-
-	return (ret);
-}
-
-static int
-mutex_trylock_common(pthread_mutex_t *mutex)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	ret = 0;
-
-	PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL),
-	    "Uninitialized mutex in pthread_mutex_trylock_basic");
-
-	/*
-	 * Defer signals to protect the scheduling queues from
-	 * access by the signal handler:
-	 */
-	_thread_kern_sig_defer();
-
-	/* Lock the mutex structure: */
-	_SPINLOCK(&(*mutex)->lock);
-
-	/*
-	 * If the mutex was statically allocated, properly
-	 * initialize the tail queue.
-	 */
-	if (((*mutex)->m_flags & MUTEX_FLAGS_INITED) == 0) {
-		TAILQ_INIT(&(*mutex)->m_queue);
-		_MUTEX_INIT_LINK(*mutex);
-		(*mutex)->m_flags |= MUTEX_FLAGS_INITED;
-	}
-
-	/* Process according to mutex type: */
-	switch ((*mutex)->m_protocol) {
-	/* Default POSIX mutex: */
-	case PTHREAD_PRIO_NONE:	
-		/* Check if this mutex is not locked: */
-		if ((*mutex)->m_owner == NULL) {
-			/* Lock the mutex for the running thread: */
-			(*mutex)->m_owner = curthread;
-
-			/* Add to the list of owned mutexes: */
-			_MUTEX_ASSERT_NOT_OWNED(*mutex);
-			TAILQ_INSERT_TAIL(&curthread->mutexq,
-			    (*mutex), m_qe);
-		} else if ((*mutex)->m_owner == curthread)
-			ret = mutex_self_trylock(*mutex);
-		else
-			/* Return a busy error: */
-			ret = EBUSY;
-		break;
-
-	/* POSIX priority inheritence mutex: */
-	case PTHREAD_PRIO_INHERIT:
-		/* Check if this mutex is not locked: */
-		if ((*mutex)->m_owner == NULL) {
-			/* Lock the mutex for the running thread: */
-			(*mutex)->m_owner = curthread;
-
-			/* Track number of priority mutexes owned: */
-			curthread->priority_mutex_count++;
-
-			/*
-			 * The mutex takes on the attributes of the
-			 * running thread when there are no waiters.
-			 */
-			(*mutex)->m_prio = curthread->active_priority;
-			(*mutex)->m_saved_prio =
-			    curthread->inherited_priority;
-
-			/* Add to the list of owned mutexes: */
-			_MUTEX_ASSERT_NOT_OWNED(*mutex);
-			TAILQ_INSERT_TAIL(&curthread->mutexq,
-			    (*mutex), m_qe);
-		} else if ((*mutex)->m_owner == curthread)
-			ret = mutex_self_trylock(*mutex);
-		else
-			/* Return a busy error: */
-			ret = EBUSY;
-		break;
-
-	/* POSIX priority protection mutex: */
-	case PTHREAD_PRIO_PROTECT:
-		/* Check for a priority ceiling violation: */
-		if (curthread->active_priority > (*mutex)->m_prio)
-			ret = EINVAL;
-
-		/* Check if this mutex is not locked: */
-		else if ((*mutex)->m_owner == NULL) {
-			/* Lock the mutex for the running thread: */
-			(*mutex)->m_owner = curthread;
-
-			/* Track number of priority mutexes owned: */
-			curthread->priority_mutex_count++;
-
-			/*
-			 * The running thread inherits the ceiling
-			 * priority of the mutex and executes at that
-			 * priority.
-			 */
-			curthread->active_priority = (*mutex)->m_prio;
-			(*mutex)->m_saved_prio =
-			    curthread->inherited_priority;
-			curthread->inherited_priority =
-			    (*mutex)->m_prio;
-
-			/* Add to the list of owned mutexes: */
-			_MUTEX_ASSERT_NOT_OWNED(*mutex);
-			TAILQ_INSERT_TAIL(&curthread->mutexq,
-			    (*mutex), m_qe);
-		} else if ((*mutex)->m_owner == curthread)
-			ret = mutex_self_trylock(*mutex);
-		else
-			/* Return a busy error: */
-			ret = EBUSY;
-		break;
-
-	/* Trap invalid mutex types: */
-	default:
-		/* Return an invalid argument error: */
-		ret = EINVAL;
-		break;
-	}
-
-	/* Unlock the mutex structure: */
-	_SPINUNLOCK(&(*mutex)->lock);
-
-	/*
-	 * Undefer and handle pending signals, yielding if
-	 * necessary:
-	 */
-	_thread_kern_sig_undefer();
-
-	/* Return the completion status: */
-	return (ret);
-}
-
-int
-__pthread_mutex_trylock(pthread_mutex_t *mutex)
-{
-	int	ret = 0;
-
-	if (mutex == NULL)
-		ret = EINVAL;
-
-	/*
-	 * If the mutex is statically initialized, perform the dynamic
-	 * initialization:
-	 */
-	else if ((*mutex != NULL) || (ret = init_static(mutex)) == 0)
-		ret = mutex_trylock_common(mutex);
-
-	return (ret);
-}
-
-int
-_pthread_mutex_trylock(pthread_mutex_t *mutex)
-{
-	int	ret = 0;
-
-	if (mutex == NULL)
-		ret = EINVAL;
-
-	/*
-	 * If the mutex is statically initialized, perform the dynamic
-	 * initialization marking the mutex private (delete safe):
-	 */
-	else if ((*mutex != NULL) || (ret = init_static_private(mutex)) == 0)
-		ret = mutex_trylock_common(mutex);
-
-	return (ret);
-}
-
-static int
-mutex_lock_common(pthread_mutex_t * mutex)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	ret = 0;
-
-	PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL),
-	    "Uninitialized mutex in pthread_mutex_trylock_basic");
-
-	/* Reset the interrupted flag: */
-	curthread->interrupted = 0;
-
-	/*
-	 * Enter a loop waiting to become the mutex owner.  We need a
-	 * loop in case the waiting thread is interrupted by a signal
-	 * to execute a signal handler.  It is not (currently) possible
-	 * to remain in the waiting queue while running a handler.
-	 * Instead, the thread is interrupted and backed out of the
-	 * waiting queue prior to executing the signal handler.
-	 */
-	do {
-		/*
-		 * Defer signals to protect the scheduling queues from
-		 * access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		/* Lock the mutex structure: */
-		_SPINLOCK(&(*mutex)->lock);
-
-		/*
-		 * If the mutex was statically allocated, properly
-		 * initialize the tail queue.
-		 */
-		if (((*mutex)->m_flags & MUTEX_FLAGS_INITED) == 0) {
-			TAILQ_INIT(&(*mutex)->m_queue);
-			(*mutex)->m_flags |= MUTEX_FLAGS_INITED;
-			_MUTEX_INIT_LINK(*mutex);
-		}
-
-		/* Process according to mutex type: */
-		switch ((*mutex)->m_protocol) {
-		/* Default POSIX mutex: */
-		case PTHREAD_PRIO_NONE:
-			if ((*mutex)->m_owner == NULL) {
-				/* Lock the mutex for this thread: */
-				(*mutex)->m_owner = curthread;
-
-				/* Add to the list of owned mutexes: */
-				_MUTEX_ASSERT_NOT_OWNED(*mutex);
-				TAILQ_INSERT_TAIL(&curthread->mutexq,
-				    (*mutex), m_qe);
-
-			} else if ((*mutex)->m_owner == curthread)
-				ret = mutex_self_lock(*mutex);
-			else {
-				/*
-				 * Join the queue of threads waiting to lock
-				 * the mutex: 
-				 */
-				mutex_queue_enq(*mutex, curthread);
-
-				/*
-				 * Keep a pointer to the mutex this thread
-				 * is waiting on:
-				 */
-				curthread->data.mutex = *mutex;
-
-				/*
-				 * Unlock the mutex structure and schedule the
-				 * next thread:
-				 */
-				_thread_kern_sched_state_unlock(PS_MUTEX_WAIT,
-				    &(*mutex)->lock, __FILE__, __LINE__);
-
-				/* Lock the mutex structure again: */
-				_SPINLOCK(&(*mutex)->lock);
-			}
-			break;
-
-		/* POSIX priority inheritence mutex: */
-		case PTHREAD_PRIO_INHERIT:
-			/* Check if this mutex is not locked: */
-			if ((*mutex)->m_owner == NULL) {
-				/* Lock the mutex for this thread: */
-				(*mutex)->m_owner = curthread;
-
-				/* Track number of priority mutexes owned: */
-				curthread->priority_mutex_count++;
-
-				/*
-				 * The mutex takes on attributes of the
-				 * running thread when there are no waiters.
-				 */
-				(*mutex)->m_prio = curthread->active_priority;
-				(*mutex)->m_saved_prio =
-				    curthread->inherited_priority;
-				curthread->inherited_priority =
-				    (*mutex)->m_prio;
-
-				/* Add to the list of owned mutexes: */
-				_MUTEX_ASSERT_NOT_OWNED(*mutex);
-				TAILQ_INSERT_TAIL(&curthread->mutexq,
-				    (*mutex), m_qe);
-
-			} else if ((*mutex)->m_owner == curthread)
-				ret = mutex_self_lock(*mutex);
-			else {
-				/*
-				 * Join the queue of threads waiting to lock
-				 * the mutex: 
-				 */
-				mutex_queue_enq(*mutex, curthread);
-
-				/*
-				 * Keep a pointer to the mutex this thread
-				 * is waiting on:
-				 */
-				curthread->data.mutex = *mutex;
-
-				if (curthread->active_priority >
-				    (*mutex)->m_prio)
-					/* Adjust priorities: */
-					mutex_priority_adjust(*mutex);
-
-				/*
-				 * Unlock the mutex structure and schedule the
-				 * next thread:
-				 */
-				_thread_kern_sched_state_unlock(PS_MUTEX_WAIT,
-				    &(*mutex)->lock, __FILE__, __LINE__);
-
-				/* Lock the mutex structure again: */
-				_SPINLOCK(&(*mutex)->lock);
-			}
-			break;
-
-		/* POSIX priority protection mutex: */
-		case PTHREAD_PRIO_PROTECT:
-			/* Check for a priority ceiling violation: */
-			if (curthread->active_priority > (*mutex)->m_prio)
-				ret = EINVAL;
-
-			/* Check if this mutex is not locked: */
-			else if ((*mutex)->m_owner == NULL) {
-				/*
-				 * Lock the mutex for the running
-				 * thread:
-				 */
-				(*mutex)->m_owner = curthread;
-
-				/* Track number of priority mutexes owned: */
-				curthread->priority_mutex_count++;
-
-				/*
-				 * The running thread inherits the ceiling
-				 * priority of the mutex and executes at that
-				 * priority:
-				 */
-				curthread->active_priority = (*mutex)->m_prio;
-				(*mutex)->m_saved_prio =
-				    curthread->inherited_priority;
-				curthread->inherited_priority =
-				    (*mutex)->m_prio;
-
-				/* Add to the list of owned mutexes: */
-				_MUTEX_ASSERT_NOT_OWNED(*mutex);
-				TAILQ_INSERT_TAIL(&curthread->mutexq,
-				    (*mutex), m_qe);
-			} else if ((*mutex)->m_owner == curthread)
-				ret = mutex_self_lock(*mutex);
-			else {
-				/*
-				 * Join the queue of threads waiting to lock
-				 * the mutex: 
-				 */
-				mutex_queue_enq(*mutex, curthread);
-
-				/*
-				 * Keep a pointer to the mutex this thread
-				 * is waiting on:
-				 */
-				curthread->data.mutex = *mutex;
-
-				/* Clear any previous error: */
-				curthread->error = 0;
-
-				/*
-				 * Unlock the mutex structure and schedule the
-				 * next thread:
-				 */
-				_thread_kern_sched_state_unlock(PS_MUTEX_WAIT,
-				    &(*mutex)->lock, __FILE__, __LINE__);
-
-				/* Lock the mutex structure again: */
-				_SPINLOCK(&(*mutex)->lock);
-
-				/*
-				 * The threads priority may have changed while
-				 * waiting for the mutex causing a ceiling
-				 * violation.
-				 */
-				ret = curthread->error;
-				curthread->error = 0;
-			}
-			break;
-
-		/* Trap invalid mutex types: */
-		default:
-			/* Return an invalid argument error: */
-			ret = EINVAL;
-			break;
-		}
-
-		/*
-		 * Check to see if this thread was interrupted and
-		 * is still in the mutex queue of waiting threads:
-		 */
-		if (curthread->interrupted != 0)
-			mutex_queue_remove(*mutex, curthread);
-
-		/* Unlock the mutex structure: */
-		_SPINUNLOCK(&(*mutex)->lock);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	} while (((*mutex)->m_owner != curthread) && (ret == 0) &&
-	    (curthread->interrupted == 0));
-
-	if (curthread->interrupted != 0 &&
-	    curthread->continuation != NULL)
-		curthread->continuation((void *) curthread);
-
-	/* Return the completion status: */
-	return (ret);
-}
-
-int
-__pthread_mutex_lock(pthread_mutex_t *mutex)
-{
-	int	ret = 0;
-
-	if (_thread_initial == NULL)
-		_thread_init();
-
-	if (mutex == NULL)
-		ret = EINVAL;
-
-	/*
-	 * If the mutex is statically initialized, perform the dynamic
-	 * initialization:
-	 */
-	else if ((*mutex != NULL) || ((ret = init_static(mutex)) == 0))
-		ret = mutex_lock_common(mutex);
-
-	return (ret);
-}
-
-int
-_pthread_mutex_lock(pthread_mutex_t *mutex)
-{
-	int	ret = 0;
-
-	if (_thread_initial == NULL)
-		_thread_init();
-
-	if (mutex == NULL)
-		ret = EINVAL;
-
-	/*
-	 * If the mutex is statically initialized, perform the dynamic
-	 * initialization marking it private (delete safe):
-	 */
-	else if ((*mutex != NULL) || ((ret = init_static_private(mutex)) == 0))
-		ret = mutex_lock_common(mutex);
-
-	return (ret);
-}
-
-int
-_pthread_mutex_unlock(pthread_mutex_t * mutex)
-{
-	return (mutex_unlock_common(mutex, /* add reference */ 0));
-}
-
-int
-_mutex_cv_unlock(pthread_mutex_t * mutex)
-{
-	return (mutex_unlock_common(mutex, /* add reference */ 1));
-}
-
-int
-_mutex_cv_lock(pthread_mutex_t * mutex)
-{
-	int	ret;
-	if ((ret = _pthread_mutex_lock(mutex)) == 0)
-		(*mutex)->m_refcount--;
-	return (ret);
-}
-
-static inline int
-mutex_self_trylock(pthread_mutex_t mutex)
-{
-	int	ret = 0;
-
-	switch (mutex->m_type) {
-
-	/* case PTHREAD_MUTEX_DEFAULT: */
-	case PTHREAD_MUTEX_ERRORCHECK:
-	case PTHREAD_MUTEX_NORMAL:
-		/*
-		 * POSIX specifies that mutexes should return EDEADLK if a
-		 * recursive lock is detected.
-		 */
-		ret = EBUSY; 
-		break;
-
-	case PTHREAD_MUTEX_RECURSIVE:
-		/* Increment the lock count: */
-		mutex->m_data.m_count++;
-		break;
-
-	default:
-		/* Trap invalid mutex types; */
-		ret = EINVAL;
-	}
-
-	return (ret);
-}
-
-static inline int
-mutex_self_lock(pthread_mutex_t mutex)
-{
-	int ret = 0;
-
-	switch (mutex->m_type) {
-	/* case PTHREAD_MUTEX_DEFAULT: */
-	case PTHREAD_MUTEX_ERRORCHECK:
-		/*
-		 * POSIX specifies that mutexes should return EDEADLK if a
-		 * recursive lock is detected.
-		 */
-		ret = EDEADLK; 
-		break;
-
-	case PTHREAD_MUTEX_NORMAL:
-		/*
-		 * What SS2 define as a 'normal' mutex.  Intentionally
-		 * deadlock on attempts to get a lock you already own.
-		 */
-		_thread_kern_sched_state_unlock(PS_DEADLOCK,
-		    &mutex->lock, __FILE__, __LINE__);
-		break;
-
-	case PTHREAD_MUTEX_RECURSIVE:
-		/* Increment the lock count: */
-		mutex->m_data.m_count++;
-		break;
-
-	default:
-		/* Trap invalid mutex types; */
-		ret = EINVAL;
-	}
-
-	return (ret);
-}
-
-static inline int
-mutex_unlock_common(pthread_mutex_t * mutex, int add_reference)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	ret = 0;
-
-	if (mutex == NULL || *mutex == NULL) {
-		ret = EINVAL;
-	} else {
-		/*
-		 * Defer signals to protect the scheduling queues from
-		 * access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		/* Lock the mutex structure: */
-		_SPINLOCK(&(*mutex)->lock);
-
-		/* Process according to mutex type: */
-		switch ((*mutex)->m_protocol) {
-		/* Default POSIX mutex: */
-		case PTHREAD_PRIO_NONE:
-			/*
-			 * Check if the running thread is not the owner of the
-			 * mutex:
-			 */
-			if ((*mutex)->m_owner != curthread) {
-				/*
-				 * Return an invalid argument error for no
-				 * owner and a permission error otherwise:
-				 */
-				ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
-			}
-			else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
-			    ((*mutex)->m_data.m_count > 0)) {
-				/* Decrement the count: */
-				(*mutex)->m_data.m_count--;
-			} else {
-				/*
-				 * Clear the count in case this is recursive
-				 * mutex.
-				 */
-				(*mutex)->m_data.m_count = 0;
-
-				/* Remove the mutex from the threads queue. */
-				_MUTEX_ASSERT_IS_OWNED(*mutex);
-				TAILQ_REMOVE(&(*mutex)->m_owner->mutexq,
-				    (*mutex), m_qe);
-				_MUTEX_INIT_LINK(*mutex);
-
-				/*
-				 * Get the next thread from the queue of
-				 * threads waiting on the mutex: 
-				 */
-				if (((*mutex)->m_owner =
-			  	    mutex_queue_deq(*mutex)) != NULL) {
-					/* Make the new owner runnable: */
-					PTHREAD_NEW_STATE((*mutex)->m_owner,
-					    PS_RUNNING);
-
-					/*
-					 * Add the mutex to the threads list of
-					 * owned mutexes:
-					 */
-					TAILQ_INSERT_TAIL(&(*mutex)->m_owner->mutexq,
-					    (*mutex), m_qe);
-
-					/*
-					 * The owner is no longer waiting for
-					 * this mutex:
-					 */
-					(*mutex)->m_owner->data.mutex = NULL;
-				}
-			}
-			break;
-
-		/* POSIX priority inheritence mutex: */
-		case PTHREAD_PRIO_INHERIT:
-			/*
-			 * Check if the running thread is not the owner of the
-			 * mutex:
-			 */
-			if ((*mutex)->m_owner != curthread) {
-				/*
-				 * Return an invalid argument error for no
-				 * owner and a permission error otherwise:
-				 */
-				ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
-			}
-			else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
-			    ((*mutex)->m_data.m_count > 0)) {
-				/* Decrement the count: */
-				(*mutex)->m_data.m_count--;
-			} else {
-				/*
-				 * Clear the count in case this is recursive
-				 * mutex.
-				 */
-				(*mutex)->m_data.m_count = 0;
-
-				/*
-				 * Restore the threads inherited priority and
-				 * recompute the active priority (being careful
-				 * not to override changes in the threads base
-				 * priority subsequent to locking the mutex).
-				 */
-				curthread->inherited_priority =
-					(*mutex)->m_saved_prio;
-				curthread->active_priority =
-				    MAX(curthread->inherited_priority,
-				    curthread->base_priority);
-
-				/*
-				 * This thread now owns one less priority mutex.
-				 */
-				curthread->priority_mutex_count--;
-
-				/* Remove the mutex from the threads queue. */
-				_MUTEX_ASSERT_IS_OWNED(*mutex);
-				TAILQ_REMOVE(&(*mutex)->m_owner->mutexq,
-				    (*mutex), m_qe);
-				_MUTEX_INIT_LINK(*mutex);
-
-				/*
-				 * Get the next thread from the queue of threads
-				 * waiting on the mutex: 
-				 */
-				if (((*mutex)->m_owner = 
-				    mutex_queue_deq(*mutex)) == NULL)
-					/* This mutex has no priority. */
-					(*mutex)->m_prio = 0;
-				else {
-					/*
-					 * Track number of priority mutexes owned:
-					 */
-					(*mutex)->m_owner->priority_mutex_count++;
-
-					/*
-					 * Add the mutex to the threads list
-					 * of owned mutexes:
-					 */
-					TAILQ_INSERT_TAIL(&(*mutex)->m_owner->mutexq,
-					    (*mutex), m_qe);
-
-					/*
-					 * The owner is no longer waiting for
-					 * this mutex:
-					 */
-					(*mutex)->m_owner->data.mutex = NULL;
-
-					/*
-					 * Set the priority of the mutex.  Since
-					 * our waiting threads are in descending
-					 * priority order, the priority of the
-					 * mutex becomes the active priority of
-					 * the thread we just dequeued.
-					 */
-					(*mutex)->m_prio =
-					    (*mutex)->m_owner->active_priority;
-
-					/*
-					 * Save the owning threads inherited
-					 * priority:
-					 */
-					(*mutex)->m_saved_prio =
-						(*mutex)->m_owner->inherited_priority;
-
-					/*
-					 * The owning threads inherited priority
-					 * now becomes his active priority (the
-					 * priority of the mutex).
-					 */
-					(*mutex)->m_owner->inherited_priority =
-						(*mutex)->m_prio;
-
-					/*
-					 * Make the new owner runnable:
-					 */
-					PTHREAD_NEW_STATE((*mutex)->m_owner,
-					    PS_RUNNING);
-				}
-			}
-			break;
-
-		/* POSIX priority ceiling mutex: */
-		case PTHREAD_PRIO_PROTECT:
-			/*
-			 * Check if the running thread is not the owner of the
-			 * mutex:
-			 */
-			if ((*mutex)->m_owner != curthread) {
-				/*
-				 * Return an invalid argument error for no
-				 * owner and a permission error otherwise:
-				 */
-				ret = (*mutex)->m_owner == NULL ? EINVAL : EPERM;
-			}
-			else if (((*mutex)->m_type == PTHREAD_MUTEX_RECURSIVE) &&
-			    ((*mutex)->m_data.m_count > 0)) {
-				/* Decrement the count: */
-				(*mutex)->m_data.m_count--;
-			} else {
-				/*
-				 * Clear the count in case this is recursive
-				 * mutex.
-				 */
-				(*mutex)->m_data.m_count = 0;
-
-				/*
-				 * Restore the threads inherited priority and
-				 * recompute the active priority (being careful
-				 * not to override changes in the threads base
-				 * priority subsequent to locking the mutex).
-				 */
-				curthread->inherited_priority =
-					(*mutex)->m_saved_prio;
-				curthread->active_priority =
-				    MAX(curthread->inherited_priority,
-				    curthread->base_priority);
-
-				/*
-				 * This thread now owns one less priority mutex.
-				 */
-				curthread->priority_mutex_count--;
-
-				/* Remove the mutex from the threads queue. */
-				_MUTEX_ASSERT_IS_OWNED(*mutex);
-				TAILQ_REMOVE(&(*mutex)->m_owner->mutexq,
-				    (*mutex), m_qe);
-				_MUTEX_INIT_LINK(*mutex);
-
-				/*
-				 * Enter a loop to find a waiting thread whose
-				 * active priority will not cause a ceiling
-				 * violation:
-				 */
-				while ((((*mutex)->m_owner =
-				    mutex_queue_deq(*mutex)) != NULL) &&
-				    ((*mutex)->m_owner->active_priority >
-				     (*mutex)->m_prio)) {
-					/*
-					 * Either the mutex ceiling priority
-					 * been lowered and/or this threads
-					 * priority has been raised subsequent
-					 * to this thread being queued on the
-					 * waiting list.
-					 */
-					(*mutex)->m_owner->error = EINVAL;
-					PTHREAD_NEW_STATE((*mutex)->m_owner,
-					    PS_RUNNING);
-					/*
-					 * The thread is no longer waiting for
-					 * this mutex:
-					 */
-					(*mutex)->m_owner->data.mutex = NULL;
-				}
-
-				/* Check for a new owner: */
-				if ((*mutex)->m_owner != NULL) {
-					/*
-					 * Track number of priority mutexes owned:
-					 */
-					(*mutex)->m_owner->priority_mutex_count++;
-
-					/*
-					 * Add the mutex to the threads list
-					 * of owned mutexes:
-					 */
-					TAILQ_INSERT_TAIL(&(*mutex)->m_owner->mutexq,
-					    (*mutex), m_qe);
-
-					/*
-					 * The owner is no longer waiting for
-					 * this mutex:
-					 */
-					(*mutex)->m_owner->data.mutex = NULL;
-
-					/*
-					 * Save the owning threads inherited
-					 * priority:
-					 */
-					(*mutex)->m_saved_prio =
-						(*mutex)->m_owner->inherited_priority;
-
-					/*
-					 * The owning thread inherits the
-					 * ceiling priority of the mutex and
-					 * executes at that priority:
-					 */
-					(*mutex)->m_owner->inherited_priority =
-					    (*mutex)->m_prio;
-					(*mutex)->m_owner->active_priority =
-					    (*mutex)->m_prio;
-
-					/*
-					 * Make the new owner runnable:
-					 */
-					PTHREAD_NEW_STATE((*mutex)->m_owner,
-					    PS_RUNNING);
-				}
-			}
-			break;
-
-		/* Trap invalid mutex types: */
-		default:
-			/* Return an invalid argument error: */
-			ret = EINVAL;
-			break;
-		}
-
-		if ((ret == 0) && (add_reference != 0)) {
-			/* Increment the reference count: */
-			(*mutex)->m_refcount++;
-		}
-
-		/* Unlock the mutex structure: */
-		_SPINUNLOCK(&(*mutex)->lock);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
-
-
-/*
- * This function is called when a change in base priority occurs for
- * a thread that is holding or waiting for a priority protection or
- * inheritence mutex.  A change in a threads base priority can effect
- * changes to active priorities of other threads and to the ordering
- * of mutex locking by waiting threads.
- *
- * This must be called while thread scheduling is deferred.
- */
-void
-_mutex_notify_priochange(pthread_t pthread)
-{
-	/* Adjust the priorites of any owned priority mutexes: */
-	if (pthread->priority_mutex_count > 0) {
-		/*
-		 * Rescan the mutexes owned by this thread and correct
-		 * their priorities to account for this threads change
-		 * in priority.  This has the side effect of changing
-		 * the threads active priority.
-		 */
-		mutex_rescan_owned(pthread, /* rescan all owned */ NULL);
-	}
-
-	/*
-	 * If this thread is waiting on a priority inheritence mutex,
-	 * check for priority adjustments.  A change in priority can
-	 * also effect a ceiling violation(*) for a thread waiting on
-	 * a priority protection mutex; we don't perform the check here
-	 * as it is done in pthread_mutex_unlock.
-	 *
-	 * (*) It should be noted that a priority change to a thread
-	 *     _after_ taking and owning a priority ceiling mutex
-	 *     does not affect ownership of that mutex; the ceiling
-	 *     priority is only checked before mutex ownership occurs.
-	 */
-	if (pthread->state == PS_MUTEX_WAIT) {
-		/* Lock the mutex structure: */
-		_SPINLOCK(&pthread->data.mutex->lock);
-
-		/*
-		 * Check to make sure this thread is still in the same state
-		 * (the spinlock above can yield the CPU to another thread):
-		 */
-		if (pthread->state == PS_MUTEX_WAIT) {
-			/*
-			 * Remove and reinsert this thread into the list of
-			 * waiting threads to preserve decreasing priority
-			 * order.
-			 */
-			mutex_queue_remove(pthread->data.mutex, pthread);
-			mutex_queue_enq(pthread->data.mutex, pthread);
-
-			if (pthread->data.mutex->m_protocol ==
-			     PTHREAD_PRIO_INHERIT) {
-				/* Adjust priorities: */
-				mutex_priority_adjust(pthread->data.mutex);
-			}
-		}
-
-		/* Unlock the mutex structure: */
-		_SPINUNLOCK(&pthread->data.mutex->lock);
-	}
-}
-
-/*
- * Called when a new thread is added to the mutex waiting queue or
- * when a threads priority changes that is already in the mutex
- * waiting queue.
- */
-static void
-mutex_priority_adjust(pthread_mutex_t mutex)
-{
-	pthread_t	pthread_next, pthread = mutex->m_owner;
-	int		temp_prio;
-	pthread_mutex_t	m = mutex;
-
-	/*
-	 * Calculate the mutex priority as the maximum of the highest
-	 * active priority of any waiting threads and the owning threads
-	 * active priority(*).
-	 *
-	 * (*) Because the owning threads current active priority may
-	 *     reflect priority inherited from this mutex (and the mutex
-	 *     priority may have changed) we must recalculate the active
-	 *     priority based on the threads saved inherited priority
-	 *     and its base priority.
-	 */
-	pthread_next = TAILQ_FIRST(&m->m_queue);  /* should never be NULL */
-	temp_prio = MAX(pthread_next->active_priority,
-	    MAX(m->m_saved_prio, pthread->base_priority));
-
-	/* See if this mutex really needs adjusting: */
-	if (temp_prio == m->m_prio)
-		/* No need to propagate the priority: */
-		return;
-
-	/* Set new priority of the mutex: */
-	m->m_prio = temp_prio;
-
-	while (m != NULL) {
-		/*
-		 * Save the threads priority before rescanning the
-		 * owned mutexes:
-		 */
-		temp_prio = pthread->active_priority;
-
-		/*
-		 * Fix the priorities for all the mutexes this thread has
-		 * locked since taking this mutex.  This also has a
-		 * potential side-effect of changing the threads priority.
-		 */
-		mutex_rescan_owned(pthread, m);
-
-		/*
-		 * If the thread is currently waiting on a mutex, check
-		 * to see if the threads new priority has affected the
-		 * priority of the mutex.
-		 */
-		if ((temp_prio != pthread->active_priority) &&
-		    (pthread->state == PS_MUTEX_WAIT) &&
-		    (pthread->data.mutex->m_protocol == PTHREAD_PRIO_INHERIT)) {
-			/* Grab the mutex this thread is waiting on: */
-			m = pthread->data.mutex;
-
-			/*
-			 * The priority for this thread has changed.  Remove
-			 * and reinsert this thread into the list of waiting
-			 * threads to preserve decreasing priority order.
-			 */
-			mutex_queue_remove(m, pthread);
-			mutex_queue_enq(m, pthread);
-
-			/* Grab the waiting thread with highest priority: */
-			pthread_next = TAILQ_FIRST(&m->m_queue);
-
-			/*
-			 * Calculate the mutex priority as the maximum of the
-			 * highest active priority of any waiting threads and
-			 * the owning threads active priority.
-			 */
-			temp_prio = MAX(pthread_next->active_priority,
-			    MAX(m->m_saved_prio, m->m_owner->base_priority));
-
-			if (temp_prio != m->m_prio) {
-				/*
-				 * The priority needs to be propagated to the
-				 * mutex this thread is waiting on and up to
-				 * the owner of that mutex.
-				 */
-				m->m_prio = temp_prio;
-				pthread = m->m_owner;
-			}
-			else
-				/* We're done: */
-				m = NULL;
-
-		}
-		else
-			/* We're done: */
-			m = NULL;
-	}
-}
-
-static void
-mutex_rescan_owned(pthread_t pthread, pthread_mutex_t mutex)
-{
-	int		active_prio, inherited_prio;
-	pthread_mutex_t	m;
-	pthread_t	pthread_next;
-
-	/*
-	 * Start walking the mutexes the thread has taken since
-	 * taking this mutex.
-	 */
-	if (mutex == NULL) {
-		/*
-		 * A null mutex means start at the beginning of the owned
-		 * mutex list.
-		 */
-		m = TAILQ_FIRST(&pthread->mutexq);
-
-		/* There is no inherited priority yet. */
-		inherited_prio = 0;
-	}
-	else {
-		/*
-		 * The caller wants to start after a specific mutex.  It
-		 * is assumed that this mutex is a priority inheritence
-		 * mutex and that its priority has been correctly
-		 * calculated.
-		 */
-		m = TAILQ_NEXT(mutex, m_qe);
-
-		/* Start inheriting priority from the specified mutex. */
-		inherited_prio = mutex->m_prio;
-	}
-	active_prio = MAX(inherited_prio, pthread->base_priority);
-
-	while (m != NULL) {
-		/*
-		 * We only want to deal with priority inheritence
-		 * mutexes.  This might be optimized by only placing
-		 * priority inheritence mutexes into the owned mutex
-		 * list, but it may prove to be useful having all
-		 * owned mutexes in this list.  Consider a thread
-		 * exiting while holding mutexes...
-		 */
-		if (m->m_protocol == PTHREAD_PRIO_INHERIT) {
-			/*
-			 * Fix the owners saved (inherited) priority to
-			 * reflect the priority of the previous mutex.
-			 */
-			m->m_saved_prio = inherited_prio;
-
-			if ((pthread_next = TAILQ_FIRST(&m->m_queue)) != NULL)
-				/* Recalculate the priority of the mutex: */
-				m->m_prio = MAX(active_prio,
-				     pthread_next->active_priority);
-			else
-				m->m_prio = active_prio;
-
-			/* Recalculate new inherited and active priorities: */
-			inherited_prio = m->m_prio;
-			active_prio = MAX(m->m_prio, pthread->base_priority);
-		}
-
-		/* Advance to the next mutex owned by this thread: */
-		m = TAILQ_NEXT(m, m_qe);
-	}
-
-	/*
-	 * Fix the threads inherited priority and recalculate its
-	 * active priority.
-	 */
-	pthread->inherited_priority = inherited_prio;
-	active_prio = MAX(inherited_prio, pthread->base_priority);
-
-	if (active_prio != pthread->active_priority) {
-		/*
-		 * If this thread is in the priority queue, it must be
-		 * removed and reinserted for its new priority.
-	 	 */
-		if (pthread->flags & PTHREAD_FLAGS_IN_PRIOQ) {
-			/*
-			 * Remove the thread from the priority queue
-			 * before changing its priority:
-			 */
-			PTHREAD_PRIOQ_REMOVE(pthread);
-
-			/*
-			 * POSIX states that if the priority is being
-			 * lowered, the thread must be inserted at the
-			 * head of the queue for its priority if it owns
-			 * any priority protection or inheritence mutexes.
-			 */
-			if ((active_prio < pthread->active_priority) &&
-			    (pthread->priority_mutex_count > 0)) {
-				/* Set the new active priority. */
-				pthread->active_priority = active_prio;
-
-				PTHREAD_PRIOQ_INSERT_HEAD(pthread);
-			}
-			else {
-				/* Set the new active priority. */
-				pthread->active_priority = active_prio;
-
-				PTHREAD_PRIOQ_INSERT_TAIL(pthread);
-			}
-		}
-		else {
-			/* Set the new active priority. */
-			pthread->active_priority = active_prio;
-		}
-	}
-}
-
-void
-_mutex_unlock_private(pthread_t pthread)
-{
-	struct pthread_mutex	*m, *m_next;
-
-	for (m = TAILQ_FIRST(&pthread->mutexq); m != NULL; m = m_next) {
-		m_next = TAILQ_NEXT(m, m_qe);
-		if ((m->m_flags & MUTEX_FLAGS_PRIVATE) != 0)
-			_pthread_mutex_unlock(&m);
-	}
-}
-
-void
-_mutex_lock_backout(pthread_t pthread)
-{
-	struct pthread_mutex	*mutex;
-
-	/*
-	 * Defer signals to protect the scheduling queues from
-	 * access by the signal handler:
-	 */
-	_thread_kern_sig_defer();
-	if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) {
-		mutex = pthread->data.mutex;
-
-		/* Lock the mutex structure: */
-		_SPINLOCK(&mutex->lock);
-
-		mutex_queue_remove(mutex, pthread);
-
-		/* This thread is no longer waiting for the mutex: */
-		pthread->data.mutex = NULL;
-
-		/* Unlock the mutex structure: */
-		_SPINUNLOCK(&mutex->lock);
-
-	}
-	/*
-	 * Undefer and handle pending signals, yielding if
-	 * necessary:
-	 */
-	_thread_kern_sig_undefer();
-}
-
-/*
- * Dequeue a waiting thread from the head of a mutex queue in descending
- * priority order.
- */
-static inline pthread_t
-mutex_queue_deq(pthread_mutex_t mutex)
-{
-	pthread_t pthread;
-
-	while ((pthread = TAILQ_FIRST(&mutex->m_queue)) != NULL) {
-		TAILQ_REMOVE(&mutex->m_queue, pthread, sqe);
-		pthread->flags &= ~PTHREAD_FLAGS_IN_MUTEXQ;
-
-		/*
-		 * Only exit the loop if the thread hasn't been
-		 * cancelled.
-		 */
-		if (pthread->interrupted == 0)
-			break;
-	}
-
-	return (pthread);
-}
-
-/*
- * Remove a waiting thread from a mutex queue in descending priority order.
- */
-static inline void
-mutex_queue_remove(pthread_mutex_t mutex, pthread_t pthread)
-{
-	if ((pthread->flags & PTHREAD_FLAGS_IN_MUTEXQ) != 0) {
-		TAILQ_REMOVE(&mutex->m_queue, pthread, sqe);
-		pthread->flags &= ~PTHREAD_FLAGS_IN_MUTEXQ;
-	}
-}
-
-/*
- * Enqueue a waiting thread to a queue in descending priority order.
- */
-static inline void
-mutex_queue_enq(pthread_mutex_t mutex, pthread_t pthread)
-{
-	pthread_t tid = TAILQ_LAST(&mutex->m_queue, mutex_head);
-
-	PTHREAD_ASSERT_NOT_IN_SYNCQ(pthread);
-	/*
-	 * For the common case of all threads having equal priority,
-	 * we perform a quick check against the priority of the thread
-	 * at the tail of the queue.
-	 */
-	if ((tid == NULL) || (pthread->active_priority <= tid->active_priority))
-		TAILQ_INSERT_TAIL(&mutex->m_queue, pthread, sqe);
-	else {
-		tid = TAILQ_FIRST(&mutex->m_queue);
-		while (pthread->active_priority <= tid->active_priority)
-			tid = TAILQ_NEXT(tid, sqe);
-		TAILQ_INSERT_BEFORE(tid, pthread, sqe);
-	}
-	pthread->flags |= PTHREAD_FLAGS_IN_MUTEXQ;
-}
-
diff --git a/lib/libc/uthread/uthread_mutex_prioceiling.c b/lib/libc/uthread/uthread_mutex_prioceiling.c
deleted file mode 100644
index a62bc16..0000000
--- a/lib/libc/uthread/uthread_mutex_prioceiling.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_mutex_prioceiling.c,v 1.6 2002/11/13 18:13:26 deischen Exp $
- */
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-#include "pthread_private.h"
-
-__weak_reference(_pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling);
-__weak_reference(_pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling);
-__weak_reference(_pthread_mutex_getprioceiling, pthread_mutex_getprioceiling);
-__weak_reference(_pthread_mutex_setprioceiling, pthread_mutex_setprioceiling);
-
-int
-_pthread_mutexattr_getprioceiling(pthread_mutexattr_t *mattr, int *prioceiling)
-{
-	int ret = 0;
-
-	if ((mattr == NULL) || (*mattr == NULL))
-		ret = EINVAL;
-	else if ((*mattr)->m_protocol != PTHREAD_PRIO_PROTECT)
-		ret = EINVAL;
-	else
-		*prioceiling = (*mattr)->m_ceiling;
-
-	return(ret);
-}
-
-int
-_pthread_mutexattr_setprioceiling(pthread_mutexattr_t *mattr, int prioceiling)
-{
-	int ret = 0;
-
-	if ((mattr == NULL) || (*mattr == NULL))
-		ret = EINVAL;
-	else if ((*mattr)->m_protocol != PTHREAD_PRIO_PROTECT)
-		ret = EINVAL;
-	else
-		(*mattr)->m_ceiling = prioceiling;
-
-	return(ret);
-}
-
-int
-_pthread_mutex_getprioceiling(pthread_mutex_t *mutex,
-			      int *prioceiling)
-{
-	int ret;
-
-	if ((mutex == NULL) || (*mutex == NULL))
-		ret = EINVAL;
-	else if ((*mutex)->m_protocol != PTHREAD_PRIO_PROTECT)
-		ret = EINVAL;
-	else
-		ret = (*mutex)->m_prio;
-
-	return(ret);
-}
-
-int
-_pthread_mutex_setprioceiling(pthread_mutex_t *mutex,
-			      int prioceiling, int *old_ceiling)
-{
-	int ret = 0;
-
-	if ((mutex == NULL) || (*mutex == NULL))
-		ret = EINVAL;
-	else if ((*mutex)->m_protocol != PTHREAD_PRIO_PROTECT)
-		ret = EINVAL;
-	else {
-		/* Lock the mutex: */
-		if ((ret = _pthread_mutex_lock(mutex)) == 0) {
-			/* Return the old ceiling and set the new ceiling: */
-			*old_ceiling = (*mutex)->m_prio;
-			(*mutex)->m_prio = prioceiling;
-
-			/* Unlock the mutex: */
-			ret = _pthread_mutex_unlock(mutex);
-		}
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_mutex_protocol.c b/lib/libc/uthread/uthread_mutex_protocol.c
deleted file mode 100644
index 79d0e03..0000000
--- a/lib/libc/uthread/uthread_mutex_protocol.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_mutex_protocol.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
- */
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_mutexattr_getprotocol, pthread_mutexattr_getprotocol);
-__weak_reference(_pthread_mutexattr_setprotocol, pthread_mutexattr_setprotocol);
-
-int
-_pthread_mutexattr_getprotocol(pthread_mutexattr_t *mattr, int *protocol)
-{
-	int ret = 0;
-
-	if ((mattr == NULL) || (*mattr == NULL))
-		ret = EINVAL;
-	else
-		*protocol = (*mattr)->m_protocol;
-
-	return(ret);
-}
-
-int
-_pthread_mutexattr_setprotocol(pthread_mutexattr_t *mattr, int protocol)
-{
-	int ret = 0;
-
-	if ((mattr == NULL) || (*mattr == NULL) ||
-	    (protocol < PTHREAD_PRIO_NONE) || (protocol > PTHREAD_PRIO_PROTECT))
-		ret = EINVAL;
-	else {
-		(*mattr)->m_protocol = protocol;
-		(*mattr)->m_ceiling = PTHREAD_MAX_PRIORITY;
-	}
-	return(ret);
-}
-
diff --git a/lib/libc/uthread/uthread_mutexattr_destroy.c b/lib/libc/uthread/uthread_mutexattr_destroy.c
deleted file mode 100644
index a3b8c1f..0000000
--- a/lib/libc/uthread/uthread_mutexattr_destroy.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_mutexattr_destroy.c,v 1.7 2001/04/10 04:19:20 deischen Exp $
- */
-#include <stdlib.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_mutexattr_destroy, pthread_mutexattr_destroy);
-
-int
-_pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
-{
-	int	ret;
-	if (attr == NULL || *attr == NULL) {
-		ret = EINVAL;
-	} else {
-		free(*attr);
-		*attr = NULL;
-		ret = 0;
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_nanosleep.c b/lib/libc/uthread/uthread_nanosleep.c
deleted file mode 100644
index bfe3096..0000000
--- a/lib/libc/uthread/uthread_nanosleep.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_nanosleep.c,v 1.16 2001/04/10 04:19:20 deischen Exp $
- */
-#include <stdio.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__nanosleep, nanosleep);
-
-int
-_nanosleep(const struct timespec * time_to_sleep,
-    struct timespec * time_remaining)
-{
-	struct pthread	*curthread = _get_curthread();
-	int             ret = 0;
-	struct timespec current_time;
-	struct timespec current_time1;
-	struct timespec remaining_time;
-	struct timeval  tv;
-
-	/* Check if the time to sleep is legal: */
-	if (time_to_sleep == NULL || time_to_sleep->tv_sec < 0 ||
-		time_to_sleep->tv_nsec < 0 || time_to_sleep->tv_nsec >= 1000000000) {
-		/* Return an EINVAL error : */
-		errno = EINVAL;
-		ret = -1;
-	} else {
-		/*
-		 * As long as we're going to get the time of day, we
-		 * might as well store it in the global time of day:
-		 */
-		gettimeofday((struct timeval *) &_sched_tod, NULL);
-		GET_CURRENT_TOD(tv);
-		TIMEVAL_TO_TIMESPEC(&tv, &current_time);
-
-		/* Calculate the time for the current thread to wake up: */
-		curthread->wakeup_time.tv_sec = current_time.tv_sec + time_to_sleep->tv_sec;
-		curthread->wakeup_time.tv_nsec = current_time.tv_nsec + time_to_sleep->tv_nsec;
-
-		/* Check if the nanosecond field has overflowed: */
-		if (curthread->wakeup_time.tv_nsec >= 1000000000) {
-			/* Wrap the nanosecond field: */
-			curthread->wakeup_time.tv_sec += 1;
-			curthread->wakeup_time.tv_nsec -= 1000000000;
-		}
-		curthread->interrupted = 0;
-
-		/* Reschedule the current thread to sleep: */
-		_thread_kern_sched_state(PS_SLEEP_WAIT, __FILE__, __LINE__);
-
-		/*
-		 * As long as we're going to get the time of day, we
-		 * might as well store it in the global time of day:
-		 */
-		gettimeofday((struct timeval *) &_sched_tod, NULL);
-		GET_CURRENT_TOD(tv);
-		TIMEVAL_TO_TIMESPEC(&tv, &current_time1);
-
-		/* Calculate the remaining time to sleep: */
-		remaining_time.tv_sec = time_to_sleep->tv_sec + current_time.tv_sec - current_time1.tv_sec;
-		remaining_time.tv_nsec = time_to_sleep->tv_nsec + current_time.tv_nsec - current_time1.tv_nsec;
-
-		/* Check if the nanosecond field has underflowed: */
-		if (remaining_time.tv_nsec < 0) {
-			/* Handle the underflow: */
-			remaining_time.tv_sec -= 1;
-			remaining_time.tv_nsec += 1000000000;
-		}
-
-		/* Check if the nanosecond field has overflowed: */
-		if (remaining_time.tv_nsec >= 1000000000) {
-			/* Handle the overflow: */
-			remaining_time.tv_sec += 1;
-			remaining_time.tv_nsec -= 1000000000;
-		}
-
-		/* Check if the sleep was longer than the required time: */
-		if (remaining_time.tv_sec < 0) {
-			/* Reset the time left: */
-			remaining_time.tv_sec = 0;
-			remaining_time.tv_nsec = 0;
-		}
-
-		/* Check if the time remaining is to be returned: */
-		if (time_remaining != NULL) {
-			/* Return the actual time slept: */
-			time_remaining->tv_sec = remaining_time.tv_sec;
-			time_remaining->tv_nsec = remaining_time.tv_nsec;
-		}
-
-		/* Check if the sleep was interrupted: */
-		if (curthread->interrupted) {
-			/* Return an EINTR error : */
-			errno = EINTR;
-			ret = -1;
-		}
-	}
-	return (ret);
-}
-
-int
-__nanosleep(const struct timespec * time_to_sleep, struct timespec *
-    time_remaining)
-{
-	int	ret;
-
-	_thread_enter_cancellation_point();
-	ret = _nanosleep(time_to_sleep, time_remaining);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_once.c b/lib/libc/uthread/uthread_once.c
deleted file mode 100644
index e626e10..0000000
--- a/lib/libc/uthread/uthread_once.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_once.c,v 1.7 2002/11/13 18:13:26 deischen Exp $
- */
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-#include "pthread_private.h"
-
-__weak_reference(_pthread_once, pthread_once);
-
-int
-_pthread_once(pthread_once_t * once_control, void (*init_routine) (void))
-{
-	if (once_control->state == PTHREAD_NEEDS_INIT) {
-		if (_thread_initial == NULL)
-			_thread_init();
-		_pthread_mutex_lock(&(once_control->mutex));
-		if (once_control->state == PTHREAD_NEEDS_INIT) {
-			init_routine();
-			once_control->state = PTHREAD_DONE_INIT;
-		}
-		_pthread_mutex_unlock(&(once_control->mutex));
-	}
-	return (0);
-}
diff --git a/lib/libc/uthread/uthread_open.c b/lib/libc/uthread/uthread_open.c
deleted file mode 100644
index 650f5a4..0000000
--- a/lib/libc/uthread/uthread_open.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_open.c,v 1.12 2001/04/18 12:42:11 deischen Exp $
- *
- */
-#include <stdarg.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__open, open);
-
-int
-_open(const char *path, int flags,...)
-{
-	int	fd;
-	int	mode = 0;
-	va_list	ap;
-	/* Check if the file is being created: */
-	if (flags & O_CREAT) {
-		/* Get the creation mode: */
-		va_start(ap, flags);
-		mode = va_arg(ap, int);
-		va_end(ap);
-	}
-	/* Open the file: */
-	if ((fd = __sys_open(path, flags, mode)) < 0) {
-	}
-	/* Initialise the file descriptor table entry: */
-	else if (_thread_fd_table_init(fd) != 0) {
-		/* Quietly close the file: */
-		__sys_close(fd);
-
-		/* Reset the file descriptor: */
-		fd = -1;
-	}
-
-	/* Return the file descriptor or -1 on error: */
-	return (fd);
-}
-
-int
-__open(const char *path, int flags,...)
-{
-	int	ret;
-	int	mode = 0;
-	va_list	ap;
-
-	_thread_enter_cancellation_point();
-
-	/* Check if the file is being created: */
-	if (flags & O_CREAT) {
-		/* Get the creation mode: */
-		va_start(ap, flags);
-		mode = va_arg(ap, int);
-		va_end(ap);
-	}
-	
-	ret = _open(path, flags, mode);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_pause.c b/lib/libc/uthread/uthread_pause.c
deleted file mode 100644
index 6807f9c..0000000
--- a/lib/libc/uthread/uthread_pause.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_pause.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pause, pause);
-
-int
-_pause(void)
-{
-	int	ret;
-
-	_thread_enter_cancellation_point();
-	ret = __pause();
-	_thread_leave_cancellation_point();
-	
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_pipe.c b/lib/libc/uthread/uthread_pipe.c
deleted file mode 100644
index 638c48e..0000000
--- a/lib/libc/uthread/uthread_pipe.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_pipe.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
- */
-#include <unistd.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pipe, pipe);
-
-int
-_pipe(int fds[2])
-{
-	int             ret;
-	if ((ret = __sys_pipe(fds)) >= 0) {
-		if (_thread_fd_table_init(fds[0]) != 0 ||
-		    _thread_fd_table_init(fds[1]) != 0) {
-			__sys_close(fds[0]);
-			__sys_close(fds[1]);
-			ret = -1;
-		}
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_poll.c b/lib/libc/uthread/uthread_poll.c
deleted file mode 100644
index b22f039..0000000
--- a/lib/libc/uthread/uthread_poll.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1999 Daniel Eischen <eischen@vigrid.com>
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_poll.c,v 1.12 2002/05/02 19:58:43 archie Exp $
- */
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <poll.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__poll, poll);
-
-int 
-_poll(struct pollfd *fds, unsigned int nfds, int timeout)
-{
-	struct pthread *curthread = _get_curthread();
-	struct timespec	ts;
-	int		numfds = nfds;
-	int             i, ret = 0;
-	struct pthread_poll_data data;
-
-	if (numfds > _thread_dtablesize) {
-		numfds = _thread_dtablesize;
-	}
-	/* Check if a timeout was specified: */
-	if (timeout == INFTIM) {
-		/* Wait for ever: */
-		_thread_kern_set_timeout(NULL);
-	} else if (timeout > 0) {
-		/* Convert the timeout in msec to a timespec: */
-		ts.tv_sec = timeout / 1000;
-		ts.tv_nsec = (timeout % 1000) * 1000000;
-
-		/* Set the wake up time: */
-		_thread_kern_set_timeout(&ts);
-	} else if (timeout < 0) {
-		/* a timeout less than zero but not == INFTIM is invalid */
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (((ret = __sys_poll(fds, numfds, 0)) == 0) && (timeout != 0)) {
-		data.nfds = numfds;
-		data.fds = fds;
-
-		/*
-		 * Clear revents in case of a timeout which leaves fds
-		 * unchanged:
-		 */
-		for (i = 0; i < numfds; i++) {
-			fds[i].revents = 0;
-		}
-
-		curthread->data.poll_data = &data;
-		curthread->interrupted = 0;
-		_thread_kern_sched_state(PS_POLL_WAIT, __FILE__, __LINE__);
-		if (curthread->interrupted) {
-			errno = EINTR;
-			ret = -1;
-		} else {
-			ret = data.nfds;
-		}
-	}
-
-	return (ret);
-}
-
-int
-__poll(struct pollfd *fds, unsigned int nfds, int timeout)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _poll(fds, nfds, timeout);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_priority_queue.c b/lib/libc/uthread/uthread_priority_queue.c
deleted file mode 100644
index e1fde3c..0000000
--- a/lib/libc/uthread/uthread_priority_queue.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_priority_queue.c,v 1.8 2002/05/24 04:32:28 deischen Exp $
- */
-#include <stdlib.h>
-#include <sys/queue.h>
-#include <string.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-/* Prototypes: */
-static void pq_insert_prio_list(pq_queue_t *pq, int prio);
-
-#if defined(_PTHREADS_INVARIANTS)
-
-static int _pq_active = 0;
-
-#define _PQ_IN_SCHEDQ	(PTHREAD_FLAGS_IN_PRIOQ | PTHREAD_FLAGS_IN_WAITQ | PTHREAD_FLAGS_IN_WORKQ)
-
-#define _PQ_SET_ACTIVE()		_pq_active = 1
-#define _PQ_CLEAR_ACTIVE()		_pq_active = 0
-#define _PQ_ASSERT_ACTIVE(msg)		do {		\
-	if (_pq_active == 0)				\
-		PANIC(msg);				\
-} while (0)
-#define _PQ_ASSERT_INACTIVE(msg)	do {		\
-	if (_pq_active != 0)				\
-		PANIC(msg);				\
-} while (0)
-#define _PQ_ASSERT_IN_WAITQ(thrd, msg)	do {		\
-	if (((thrd)->flags & PTHREAD_FLAGS_IN_WAITQ) == 0) \
-		PANIC(msg);				\
-} while (0)
-#define _PQ_ASSERT_IN_PRIOQ(thrd, msg)	do {		\
-	if (((thrd)->flags & PTHREAD_FLAGS_IN_PRIOQ) == 0) \
-		PANIC(msg);				\
-} while (0)
-#define _PQ_ASSERT_NOT_QUEUED(thrd, msg) do {		\
-	if (((thrd)->flags & _PQ_IN_SCHEDQ) != 0)	\
-		PANIC(msg);				\
-} while (0)
-#define _PQ_ASSERT_PROTECTED(msg)			\
-	PTHREAD_ASSERT((_thread_kern_in_sched != 0) ||	\
-	    ((_get_curthread())->sig_defer_count > 0) ||\
-	    (_sig_in_handler != 0), msg);
-
-#else
-
-#define _PQ_SET_ACTIVE()
-#define _PQ_CLEAR_ACTIVE()
-#define _PQ_ASSERT_ACTIVE(msg)
-#define _PQ_ASSERT_INACTIVE(msg)
-#define _PQ_ASSERT_IN_WAITQ(thrd, msg)
-#define _PQ_ASSERT_IN_PRIOQ(thrd, msg)
-#define _PQ_ASSERT_NOT_QUEUED(thrd, msg)
-#define _PQ_ASSERT_PROTECTED(msg)
-
-#endif
-
-int
-_pq_alloc(pq_queue_t *pq, int minprio, int maxprio)
-{
-	int ret = 0;
-	int prioslots = maxprio - minprio + 1;
-
-	if (pq == NULL)
-		ret = -1;
-
-	/* Create the priority queue with (maxprio - minprio + 1) slots: */
-	else if	((pq->pq_lists = (pq_list_t *) malloc(sizeof(pq_list_t) * prioslots)) == NULL) {
-          __sys_write(1,"MALLOC FAILED");
-	  ret = -1;
-          }
-
-	else {
-		/* Remember the queue size: */
-		pq->pq_size = prioslots;
-		ret = _pq_init(pq);
-	}
-	return (ret);
-}
-
-int
-_pq_init(pq_queue_t *pq)
-{
-	int i, ret = 0;
-
-	if ((pq == NULL) || (pq->pq_lists == NULL))
-		ret = -1;
-
-	else {
-		/* Initialize the queue for each priority slot: */
-		for (i = 0; i < pq->pq_size; i++) {
-			TAILQ_INIT(&pq->pq_lists[i].pl_head);
-			pq->pq_lists[i].pl_prio = i;
-			pq->pq_lists[i].pl_queued = 0;
-		}
-
-		/* Initialize the priority queue: */
-		TAILQ_INIT(&pq->pq_queue);
-		_PQ_CLEAR_ACTIVE();
-	}
-	return (ret);
-}
-
-void
-_pq_remove(pq_queue_t *pq, pthread_t pthread)
-{
-	int prio = pthread->active_priority;
-
-	/*
-	 * Make some assertions when debugging is enabled:
-	 */
-	_PQ_ASSERT_INACTIVE("_pq_remove: pq_active");
-	_PQ_SET_ACTIVE();
-	_PQ_ASSERT_IN_PRIOQ(pthread, "_pq_remove: Not in priority queue");
-	_PQ_ASSERT_PROTECTED("_pq_remove: prioq not protected!");
-
-	/*
-	 * Remove this thread from priority list.  Note that if
-	 * the priority list becomes empty, it is not removed
-	 * from the priority queue because another thread may be
-	 * added to the priority list (resulting in a needless
-	 * removal/insertion).  Priority lists are only removed
-	 * from the priority queue when _pq_first is called.
-	 */
-	TAILQ_REMOVE(&pq->pq_lists[prio].pl_head, pthread, pqe);
-
-	/* This thread is now longer in the priority queue. */
-	pthread->flags &= ~PTHREAD_FLAGS_IN_PRIOQ;
-
-	_PQ_CLEAR_ACTIVE();
-}
-
-
-void
-_pq_insert_head(pq_queue_t *pq, pthread_t pthread)
-{
-	int prio;
-
-	/*
-	 * Don't insert suspended threads into the priority queue.
-	 * The caller is responsible for setting the threads state.
-	 */
-	if ((pthread->flags & PTHREAD_FLAGS_SUSPENDED) != 0) {
-		/* Make sure the threads state is suspended. */
-		if (pthread->state != PS_SUSPENDED)
-			PTHREAD_SET_STATE(pthread, PS_SUSPENDED);
-	} else {
-		/*
-		 * Make some assertions when debugging is enabled:
-		 */
-		_PQ_ASSERT_INACTIVE("_pq_insert_head: pq_active");
-		_PQ_SET_ACTIVE();
-		_PQ_ASSERT_NOT_QUEUED(pthread,
-		    "_pq_insert_head: Already in priority queue");
-		_PQ_ASSERT_PROTECTED("_pq_insert_head: prioq not protected!");
-
-		prio = pthread->active_priority;
-		TAILQ_INSERT_HEAD(&pq->pq_lists[prio].pl_head, pthread, pqe);
-		if (pq->pq_lists[prio].pl_queued == 0)
-			/* Insert the list into the priority queue: */
-			pq_insert_prio_list(pq, prio);
-
-		/* Mark this thread as being in the priority queue. */
-		pthread->flags |= PTHREAD_FLAGS_IN_PRIOQ;
-
-		_PQ_CLEAR_ACTIVE();
-	}
-}
-
-
-void
-_pq_insert_tail(pq_queue_t *pq, pthread_t pthread)
-{
-	int prio;
-
-	/*
-	 * Don't insert suspended threads into the priority queue.
-	 * The caller is responsible for setting the threads state.
-	 */
-	if ((pthread->flags & PTHREAD_FLAGS_SUSPENDED) != 0) {
-		/* Make sure the threads state is suspended. */
-		if (pthread->state != PS_SUSPENDED)
-			PTHREAD_SET_STATE(pthread, PS_SUSPENDED);
-	} else {
-		/*
-		 * Make some assertions when debugging is enabled:
-		 */
-		_PQ_ASSERT_INACTIVE("_pq_insert_tail: pq_active");
-		_PQ_SET_ACTIVE();
-		_PQ_ASSERT_NOT_QUEUED(pthread,
-		    "_pq_insert_tail: Already in priority queue");
-		_PQ_ASSERT_PROTECTED("_pq_insert_tail: prioq not protected!");
-
-		prio = pthread->active_priority;
-		TAILQ_INSERT_TAIL(&pq->pq_lists[prio].pl_head, pthread, pqe);
-		if (pq->pq_lists[prio].pl_queued == 0)
-			/* Insert the list into the priority queue: */
-			pq_insert_prio_list(pq, prio);
-
-		/* Mark this thread as being in the priority queue. */
-		pthread->flags |= PTHREAD_FLAGS_IN_PRIOQ;
-
-		_PQ_CLEAR_ACTIVE();
-	}
-}
-
-
-pthread_t
-_pq_first(pq_queue_t *pq)
-{
-	pq_list_t *pql;
-	pthread_t pthread = NULL;
-
-	/*
-	 * Make some assertions when debugging is enabled:
-	 */
-	_PQ_ASSERT_INACTIVE("_pq_first: pq_active");
-	_PQ_SET_ACTIVE();
-	_PQ_ASSERT_PROTECTED("_pq_first: prioq not protected!");
-
-	while (((pql = TAILQ_FIRST(&pq->pq_queue)) != NULL) &&
-	    (pthread == NULL)) {
-		if ((pthread = TAILQ_FIRST(&pql->pl_head)) == NULL) {
-			/*
-			 * The priority list is empty; remove the list
-			 * from the queue.
-			 */
-			TAILQ_REMOVE(&pq->pq_queue, pql, pl_link);
-
-			/* Mark the list as not being in the queue: */
-			pql->pl_queued = 0;
-		} else if ((pthread->flags & PTHREAD_FLAGS_SUSPENDED) != 0) {
-			/*
-			 * This thread is suspended; remove it from the
-			 * list and ensure its state is suspended.
-			 */
-			TAILQ_REMOVE(&pql->pl_head, pthread, pqe);
-			PTHREAD_SET_STATE(pthread, PS_SUSPENDED);
-
-			/* This thread is now longer in the priority queue. */
-			pthread->flags &= ~PTHREAD_FLAGS_IN_PRIOQ;
-			pthread = NULL;
-		}
-	}
-
-	_PQ_CLEAR_ACTIVE();
-	return (pthread);
-}
-
-
-static void
-pq_insert_prio_list(pq_queue_t *pq, int prio)
-{
-	pq_list_t *pql;
-
-	/*
-	 * Make some assertions when debugging is enabled:
-	 */
-	_PQ_ASSERT_ACTIVE("pq_insert_prio_list: pq_active");
-	_PQ_ASSERT_PROTECTED("_pq_insert_prio_list: prioq not protected!");
-
-	/*
-	 * The priority queue is in descending priority order.  Start at
-	 * the beginning of the queue and find the list before which the
-	 * new list should be inserted.
-	 */
-	pql = TAILQ_FIRST(&pq->pq_queue);
-	while ((pql != NULL) && (pql->pl_prio > prio))
-		pql = TAILQ_NEXT(pql, pl_link);
-
-	/* Insert the list: */
-	if (pql == NULL)
-		TAILQ_INSERT_TAIL(&pq->pq_queue, &pq->pq_lists[prio], pl_link);
-	else
-		TAILQ_INSERT_BEFORE(pql, &pq->pq_lists[prio], pl_link);
-
-	/* Mark this list as being in the queue: */
-	pq->pq_lists[prio].pl_queued = 1;
-}
-
-void
-_waitq_insert(pthread_t pthread)
-{
-	pthread_t	tid;
-
-	/*
-	 * Make some assertions when debugging is enabled:
-	 */
-	_PQ_ASSERT_INACTIVE("_waitq_insert: pq_active");
-	_PQ_SET_ACTIVE();
-	_PQ_ASSERT_NOT_QUEUED(pthread, "_waitq_insert: Already in queue");
-
-	if (pthread->wakeup_time.tv_sec == -1)
-		TAILQ_INSERT_TAIL(&_waitingq, pthread, pqe);
-	else {
-		tid = TAILQ_FIRST(&_waitingq);
-		while ((tid != NULL) && (tid->wakeup_time.tv_sec != -1) &&
-		    ((tid->wakeup_time.tv_sec < pthread->wakeup_time.tv_sec) ||
-		    ((tid->wakeup_time.tv_sec == pthread->wakeup_time.tv_sec) &&
-		    (tid->wakeup_time.tv_nsec <= pthread->wakeup_time.tv_nsec))))
-			tid = TAILQ_NEXT(tid, pqe);
-		if (tid == NULL)
-			TAILQ_INSERT_TAIL(&_waitingq, pthread, pqe);
-		else
-			TAILQ_INSERT_BEFORE(tid, pthread, pqe);
-	}
-	pthread->flags |= PTHREAD_FLAGS_IN_WAITQ;
-
-	_PQ_CLEAR_ACTIVE();
-}
-
-void
-_waitq_remove(pthread_t pthread)
-{
-	/*
-	 * Make some assertions when debugging is enabled:
-	 */
-	_PQ_ASSERT_INACTIVE("_waitq_remove: pq_active");
-	_PQ_SET_ACTIVE();
-	_PQ_ASSERT_IN_WAITQ(pthread, "_waitq_remove: Not in queue");
-
-	TAILQ_REMOVE(&_waitingq, pthread, pqe);
-	pthread->flags &= ~PTHREAD_FLAGS_IN_WAITQ;
-
-	_PQ_CLEAR_ACTIVE();
-}
-
-void
-_waitq_setactive(void)
-{
-	_PQ_ASSERT_INACTIVE("_waitq_setactive: pq_active");
-	_PQ_SET_ACTIVE();
-} 
-
-void
-_waitq_clearactive(void)
-{
-	_PQ_ASSERT_ACTIVE("_waitq_clearactive: ! pq_active");
-	_PQ_CLEAR_ACTIVE();
-}
diff --git a/lib/libc/uthread/uthread_pselect.c b/lib/libc/uthread/uthread_pselect.c
deleted file mode 100644
index a48f2cc..0000000
--- a/lib/libc/uthread/uthread_pselect.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2002 Daniel M. Eischen <deischen@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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc_r/uthread/uthread_pselect.c,v 1.2 2002/11/13 18:13:26 deischen Exp $");
-
-#include <sys/select.h>
-#include <sys/time.h>
-
-#include <errno.h>
-#include <signal.h>
-#include <pthread.h>
-
-#include "pthread_private.h"
-
-extern int __pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, 
-		const struct timespec *timo, const sigset_t *mask);
-
-__weak_reference(_pselect, pselect);
-
-int 
-_pselect(int count, fd_set *rfds, fd_set *wfds, fd_set *efds, 
-	const struct timespec *timo, const sigset_t *mask)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = __pselect(count, rfds, wfds, efds, timo, mask);
-	_thread_leave_cancellation_point();
-
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_read.c b/lib/libc/uthread/uthread_read.c
deleted file mode 100644
index 35a9867..0000000
--- a/lib/libc/uthread/uthread_read.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_read.c,v 1.14 2002/08/29 23:06:07 deischen Exp $
- *
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/uio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__read, read);
-
-ssize_t
-_read(int fd, void *buf, size_t nbytes)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	ret;
-	int	type;
-
-	/* POSIX says to do just this: */
-	if (nbytes == 0) {
-		return (0);
-	}
-
-	/* Lock the file descriptor for read: */
-	if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		/* Get the read/write mode type: */
-		type = _thread_fd_getflags(fd) & O_ACCMODE;
-
-		/* Check if the file is not open for read: */
-		if (type != O_RDONLY && type != O_RDWR) {
-			/* File is not open for read: */
-			errno = EBADF;
-			_FD_UNLOCK(fd, FD_READ);
-			return (-1);
-		}
-
-		/* Perform a non-blocking read syscall: */
-		while ((ret = __sys_read(fd, buf, nbytes)) < 0) {
-			if ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0 &&
-			    (errno == EWOULDBLOCK || errno == EAGAIN)) {
-				curthread->data.fd.fd = fd;
-				_thread_kern_set_timeout(NULL);
-
-				/* Reset the interrupted operation flag: */
-				curthread->interrupted = 0;
-
-				_thread_kern_sched_state(PS_FDR_WAIT,
-				    __FILE__, __LINE__);
-
-				/*
-				 * Check if the operation was
-				 * interrupted by a signal
-				 */
-				if (curthread->interrupted) {
-					errno = EINTR;
-					ret = -1;
-					break;
-				}
-			} else {
-				break;
-			}
-		}
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return (ret);
-}
-
-ssize_t
-__read(int fd, void *buf, size_t nbytes)
-{
-	ssize_t	ret;
-
-	_thread_enter_cancellation_point();
-	ret = _read(fd, buf, nbytes);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_readv.c b/lib/libc/uthread/uthread_readv.c
deleted file mode 100644
index ba39221..0000000
--- a/lib/libc/uthread/uthread_readv.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_readv.c,v 1.15 2002/08/29 23:06:07 deischen Exp $
- *
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/uio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__readv, readv);
-
-ssize_t
-_readv(int fd, const struct iovec * iov, int iovcnt)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	ret;
-	int	type;
-
-	/* Lock the file descriptor for read: */
-	if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		/* Get the read/write mode type: */
-		type = _thread_fd_getflags(fd) & O_ACCMODE;
-
-		/* Check if the file is not open for read: */
-		if (type != O_RDONLY && type != O_RDWR) {
-			/* File is not open for read: */
-			errno = EBADF;
-			_FD_UNLOCK(fd, FD_READ);
-			return (-1);
-		}
-
-		/* Perform a non-blocking readv syscall: */
-		while ((ret = __sys_readv(fd, iov, iovcnt)) < 0) {
-			if ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0 &&
-			    (errno == EWOULDBLOCK || errno == EAGAIN)) {
-				curthread->data.fd.fd = fd;
-				_thread_kern_set_timeout(NULL);
-
-				/* Reset the interrupted operation flag: */
-				curthread->interrupted = 0;
-
-				_thread_kern_sched_state(PS_FDR_WAIT,
-				    __FILE__, __LINE__);
-
-				/*
-				 * Check if the operation was
-				 * interrupted by a signal
-				 */
-				if (curthread->interrupted) {
-					errno = EINTR;
-					ret = -1;
-					break;
-				}
-			} else {
-				break;
-			}
-		}
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return (ret);
-}
-
-ssize_t
-__readv(int fd, const struct iovec *iov, int iovcnt)
-{
-	ssize_t ret;
-
-	_thread_enter_cancellation_point();
-	ret = _readv(fd, iov, iovcnt);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_recvfrom.c b/lib/libc/uthread/uthread_recvfrom.c
deleted file mode 100644
index e862b0b..0000000
--- a/lib/libc/uthread/uthread_recvfrom.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_recvfrom.c,v 1.13 2002/12/19 11:39:20 ru Exp $
- */
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__recvfrom, recvfrom);
-
-ssize_t
-_recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr * from,
-    socklen_t *from_len)
-{
-	struct pthread	*curthread = _get_curthread();
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		while ((ret = __sys_recvfrom(fd, buf, len, flags, from, from_len)) < 0) {
-			if (((_thread_fd_getflags(fd) & O_NONBLOCK) == 0)
-			    && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) {
-				curthread->data.fd.fd = fd;
-
-				/* Set the timeout: */
-				_thread_kern_set_timeout(NULL);
-				curthread->interrupted = 0;
-				_thread_kern_sched_state(PS_FDR_WAIT, __FILE__, __LINE__);
-
-				/* Check if the wait was interrupted: */
-				if (curthread->interrupted) {
-					/* Return an error status: */
-					errno = EINTR;
-					ret = -1;
-					break;
-				}
-			} else {
-				ret = -1;
-				break;
-			}
-		}
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return (ret);
-}
-
-ssize_t
-__recvfrom(int fd, void *buf, size_t len, int flags, struct sockaddr * from,
-    socklen_t *from_len)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _recvfrom(fd, buf, len, flags, from, from_len);
-	_thread_leave_cancellation_point();
-
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_recvmsg.c b/lib/libc/uthread/uthread_recvmsg.c
deleted file mode 100644
index e63c04d..0000000
--- a/lib/libc/uthread/uthread_recvmsg.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_recvmsg.c,v 1.11 2002/12/19 11:39:20 ru Exp $
- */
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__recvmsg, recvmsg);
-
-ssize_t
-_recvmsg(int fd, struct msghdr *msg, int flags)
-{
-	struct pthread	*curthread = _get_curthread();
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-		while ((ret = __sys_recvmsg(fd, msg, flags)) < 0) {
-			if (((_thread_fd_getflags(fd) & O_NONBLOCK) == 0)
-			    && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) {
-				curthread->data.fd.fd = fd;
-
-				/* Set the timeout: */
-				_thread_kern_set_timeout(NULL);
-				curthread->interrupted = 0;
-				_thread_kern_sched_state(PS_FDR_WAIT, __FILE__, __LINE__);
-
-				/* Check if the wait was interrupted: */
-				if (curthread->interrupted) {
-					/* Return an error status: */
-					errno = EINTR;
-					ret = -1;
-					break;
-				}
-			} else {
-				ret = -1;
-				break;
-			}
-		}
-		_FD_UNLOCK(fd, FD_READ);
-	}
-	return (ret);
-}
-
-ssize_t
-__recvmsg(int fd, struct msghdr *msg, int flags)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _recvmsg(fd, msg, flags);
-	_thread_leave_cancellation_point();
-
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_resume_np.c b/lib/libc/uthread/uthread_resume_np.c
deleted file mode 100644
index a4da7a2..0000000
--- a/lib/libc/uthread/uthread_resume_np.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_resume_np.c,v 1.13 2002/05/24 04:32:28 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-static void	resume_common(struct pthread *);
-
-__weak_reference(_pthread_resume_np, pthread_resume_np);
-__weak_reference(_pthread_resume_all_np, pthread_resume_all_np);
-
-/* Resume a thread: */
-int
-_pthread_resume_np(pthread_t thread)
-{
-	int ret;
-
-	/* Find the thread in the list of active threads: */
-	if ((ret = _find_thread(thread)) == 0) {
-		/*
-		 * Defer signals to protect the scheduling queues
-		 * from access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		if ((thread->flags & PTHREAD_FLAGS_SUSPENDED) != 0)
-			resume_common(thread);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	}
-	return (ret);
-}
-
-void
-_pthread_resume_all_np(void)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct pthread	*thread;
-
-	/*
-	 * Defer signals to protect the scheduling queues from access
-	 * by the signal handler:
-	 */
-	_thread_kern_sig_defer();
-
-	TAILQ_FOREACH(thread, &_thread_list, tle) {
-		if ((thread != curthread) &&
-		    ((thread->flags & PTHREAD_FLAGS_SUSPENDED) != 0))
-			resume_common(thread);
-	}
-
-	/*
-	 * Undefer and handle pending signals, yielding if necessary:
-	 */
-	_thread_kern_sig_undefer();
-}
-
-static void
-resume_common(struct pthread *thread)
-{
-	/* Clear the suspend flag: */
-	thread->flags &= ~PTHREAD_FLAGS_SUSPENDED;
-
-	/*
-	 * If the thread's state is suspended, that means it is
-	 * now runnable but not in any scheduling queue.  Set the
-	 * state to running and insert it into the run queue.
-	 */
-	if (thread->state == PS_SUSPENDED) {
-		PTHREAD_SET_STATE(thread, PS_RUNNING);
-		if (thread->priority_mutex_count > 0)
-			PTHREAD_PRIOQ_INSERT_HEAD(thread);
-		else
-			PTHREAD_PRIOQ_INSERT_TAIL(thread);
-	}
-}
diff --git a/lib/libc/uthread/uthread_rwlock.c b/lib/libc/uthread/uthread_rwlock.c
deleted file mode 100644
index fc87c29..0000000
--- a/lib/libc/uthread/uthread_rwlock.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/*-
- * Copyright (c) 1998 Alex Nash
- * 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.
- *
- * 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/lib/libc_r/uthread/uthread_rwlock.c,v 1.9 2004/01/08 15:39:12 deischen Exp $
- */
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "pthread_private.h"
-
-/* maximum number of times a read lock may be obtained */
-#define	MAX_READ_LOCKS		(INT_MAX - 1)
-
-__weak_reference(_pthread_rwlock_destroy, pthread_rwlock_destroy);
-__weak_reference(_pthread_rwlock_init, pthread_rwlock_init);
-__weak_reference(_pthread_rwlock_rdlock, pthread_rwlock_rdlock);
-__weak_reference(_pthread_rwlock_tryrdlock, pthread_rwlock_tryrdlock);
-__weak_reference(_pthread_rwlock_trywrlock, pthread_rwlock_trywrlock);
-__weak_reference(_pthread_rwlock_unlock, pthread_rwlock_unlock);
-__weak_reference(_pthread_rwlock_wrlock, pthread_rwlock_wrlock);
-
-static int init_static (pthread_rwlock_t *rwlock);
-
-static spinlock_t static_init_lock = _SPINLOCK_INITIALIZER;
-
-static int
-init_static (pthread_rwlock_t *rwlock)
-{
-	int ret;
-
-	_SPINLOCK(&static_init_lock);
-
-	if (*rwlock == NULL)
-		ret = _pthread_rwlock_init(rwlock, NULL);
-	else
-		ret = 0;
-
-	_SPINUNLOCK(&static_init_lock);
-
-	return (ret);
-}
-
-int
-_pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
-{
-	int ret;
-
-	if (rwlock == NULL)
-		ret = EINVAL;
-	else {
-		pthread_rwlock_t prwlock;
-
-		prwlock = *rwlock;
-
-		_pthread_mutex_destroy(&prwlock->lock);
-		_pthread_cond_destroy(&prwlock->read_signal);
-		_pthread_cond_destroy(&prwlock->write_signal);
-		free(prwlock);
-
-		*rwlock = NULL;
-
-		ret = 0;
-	}
-	return (ret);
-}
-
-int
-_pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr)
-{
-	pthread_rwlock_t prwlock;
-	int ret;
-
-	/* allocate rwlock object */
-	prwlock = (pthread_rwlock_t)malloc(sizeof(struct pthread_rwlock));
-
-	if (prwlock == NULL)
-		return(ENOMEM);
-
-	/* initialize the lock */
-	if ((ret = _pthread_mutex_init(&prwlock->lock, NULL)) != 0)
-		free(prwlock);
-	else {
-		/* initialize the read condition signal */
-		ret = _pthread_cond_init(&prwlock->read_signal, NULL);
-
-		if (ret != 0) {
-			_pthread_mutex_destroy(&prwlock->lock);
-			free(prwlock);
-		} else {
-			/* initialize the write condition signal */
-			ret = _pthread_cond_init(&prwlock->write_signal, NULL);
-
-			if (ret != 0) {
-				_pthread_cond_destroy(&prwlock->read_signal);
-				_pthread_mutex_destroy(&prwlock->lock);
-				free(prwlock);
-			} else {
-				/* success */
-				prwlock->state = 0;
-				prwlock->blocked_writers = 0;
-
-				*rwlock = prwlock;
-			}
-		}
-	}
-
-	return (ret);
-}
-
-int
-_pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
-{
-	pthread_rwlock_t prwlock;
-	struct pthread *curthread;
-	int ret;
-
-	if (rwlock == NULL)
-		return(EINVAL);
-
-	prwlock = *rwlock;
-
-	/* check for static initialization */
-	if (prwlock == NULL) {
-		if ((ret = init_static(rwlock)) != 0)
-			return(ret);
-
-		prwlock = *rwlock;
-	}
-
-	/* grab the monitor lock */
-	if ((ret = _pthread_mutex_lock(&prwlock->lock)) != 0)
-		return(ret);
-
-	/* check lock count */
-	if (prwlock->state == MAX_READ_LOCKS) {
-		_pthread_mutex_unlock(&prwlock->lock);
-		return (EAGAIN);
-	}
-
-	curthread = _get_curthread();
-	if ((curthread->rdlock_count > 0) && (prwlock->state > 0)) {
-		/*
-		 * To avoid having to track all the rdlocks held by
-		 * a thread or all of the threads that hold a rdlock,
-		 * we keep a simple count of all the rdlocks held by
-		 * a thread.  If a thread holds any rdlocks it is
-		 * possible that it is attempting to take a recursive
-		 * rdlock.  If there are blocked writers and precedence
-		 * is given to them, then that would result in the thread
-		 * deadlocking.  So allowing a thread to take the rdlock
-		 * when it already has one or more rdlocks avoids the
-		 * deadlock.  I hope the reader can follow that logic ;-)
-		 */
-		;	/* nothing needed */
-	} else {
-		/* give writers priority over readers */
-		while (prwlock->blocked_writers || prwlock->state < 0) {
-			ret = _pthread_cond_wait(&prwlock->read_signal,
-			    &prwlock->lock);
-
-			if (ret != 0) {
-				/* can't do a whole lot if this fails */
-				_pthread_mutex_unlock(&prwlock->lock);
-				return(ret);
-			}
-		}
-	}
-
-	curthread->rdlock_count++;
-	prwlock->state++; /* indicate we are locked for reading */
-
-	/*
-	 * Something is really wrong if this call fails.  Returning
-	 * error won't do because we've already obtained the read
-	 * lock.  Decrementing 'state' is no good because we probably
-	 * don't have the monitor lock.
-	 */
-	_pthread_mutex_unlock(&prwlock->lock);
-
-	return (ret);
-}
-
-int
-_pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
-{
-	pthread_rwlock_t prwlock;
-	struct pthread *curthread;
-	int ret;
-
-	if (rwlock == NULL)
-		return(EINVAL);
-
-	prwlock = *rwlock;
-
-	/* check for static initialization */
-	if (prwlock == NULL) {
-		if ((ret = init_static(rwlock)) != 0)
-			return(ret);
-
-		prwlock = *rwlock;
-	}
-
-	/* grab the monitor lock */
-	if ((ret = _pthread_mutex_lock(&prwlock->lock)) != 0)
-		return(ret);
-
-	curthread = _get_curthread();
-	if (prwlock->state == MAX_READ_LOCKS)
-		ret = EAGAIN; /* too many read locks acquired */
-	else if ((curthread->rdlock_count > 0) && (prwlock->state > 0)) {
-		/* see comment for pthread_rwlock_rdlock() */
-		curthread->rdlock_count++;
-		prwlock->state++;
-	}
-	/* give writers priority over readers */
-	else if (prwlock->blocked_writers || prwlock->state < 0)
-		ret = EBUSY;
-	else {
-		prwlock->state++; /* indicate we are locked for reading */
-		curthread->rdlock_count++;
-	}
-
-	/* see the comment on this in pthread_rwlock_rdlock */
-	_pthread_mutex_unlock(&prwlock->lock);
-
-	return (ret);
-}
-
-int
-_pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
-{
-	pthread_rwlock_t prwlock;
-	int ret;
-
-	if (rwlock == NULL)
-		return(EINVAL);
-
-	prwlock = *rwlock;
-
-	/* check for static initialization */
-	if (prwlock == NULL) {
-		if ((ret = init_static(rwlock)) != 0)
-			return(ret);
-
-		prwlock = *rwlock;
-	}
-
-	/* grab the monitor lock */
-	if ((ret = _pthread_mutex_lock(&prwlock->lock)) != 0)
-		return(ret);
-
-	if (prwlock->state != 0)
-		ret = EBUSY;
-	else
-		/* indicate we are locked for writing */
-		prwlock->state = -1;
-
-	/* see the comment on this in pthread_rwlock_rdlock */
-	_pthread_mutex_unlock(&prwlock->lock);
-
-	return (ret);
-}
-
-int
-_pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
-{
-	pthread_rwlock_t prwlock;
-	struct pthread *curthread;
-	int ret;
-
-	if (rwlock == NULL)
-		return(EINVAL);
-
-	prwlock = *rwlock;
-
-	if (prwlock == NULL)
-		return(EINVAL);
-
-	/* grab the monitor lock */
-	if ((ret = _pthread_mutex_lock(&prwlock->lock)) != 0)
-		return(ret);
-
-	curthread = _get_curthread();
-	if (prwlock->state > 0) {
-		curthread->rdlock_count--;
-		prwlock->state--;
-		if (prwlock->state == 0 && prwlock->blocked_writers)
-			ret = _pthread_cond_signal(&prwlock->write_signal);
-	} else if (prwlock->state < 0) {
-		prwlock->state = 0;
-
-		if (prwlock->blocked_writers)
-			ret = _pthread_cond_signal(&prwlock->write_signal);
-		else
-			ret = _pthread_cond_broadcast(&prwlock->read_signal);
-	} else
-		ret = EINVAL;
-
-	/* see the comment on this in pthread_rwlock_rdlock */
-	_pthread_mutex_unlock(&prwlock->lock);
-
-	return (ret);
-}
-
-int
-_pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
-{
-	pthread_rwlock_t prwlock;
-	int ret;
-
-	if (rwlock == NULL)
-		return(EINVAL);
-
-	prwlock = *rwlock;
-
-	/* check for static initialization */
-	if (prwlock == NULL) {
-		if ((ret = init_static(rwlock)) != 0)
-			return(ret);
-
-		prwlock = *rwlock;
-	}
-
-	/* grab the monitor lock */
-	if ((ret = _pthread_mutex_lock(&prwlock->lock)) != 0)
-		return(ret);
-
-	while (prwlock->state != 0) {
-		prwlock->blocked_writers++;
-
-		ret = _pthread_cond_wait(&prwlock->write_signal,
-		    &prwlock->lock);
-
-		if (ret != 0) {
-			prwlock->blocked_writers--;
-			_pthread_mutex_unlock(&prwlock->lock);
-			return(ret);
-		}
-
-		prwlock->blocked_writers--;
-	}
-
-	/* indicate we are locked for writing */
-	prwlock->state = -1;
-
-	/* see the comment on this in pthread_rwlock_rdlock */
-	_pthread_mutex_unlock(&prwlock->lock);
-
-	return (ret);
-}
-
diff --git a/lib/libc/uthread/uthread_rwlockattr.c b/lib/libc/uthread/uthread_rwlockattr.c
deleted file mode 100644
index c304e6e..0000000
--- a/lib/libc/uthread/uthread_rwlockattr.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 1998 Alex Nash
- * 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.
- *
- * 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/lib/libc_r/uthread/uthread_rwlockattr.c,v 1.7 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <errno.h>
-#include <stdlib.h>
-
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_rwlockattr_destroy, pthread_rwlockattr_destroy);
-__weak_reference(_pthread_rwlockattr_getpshared, pthread_rwlockattr_getpshared);
-__weak_reference(_pthread_rwlockattr_init, pthread_rwlockattr_init);
-__weak_reference(_pthread_rwlockattr_setpshared, pthread_rwlockattr_setpshared);
-
-int
-_pthread_rwlockattr_destroy(pthread_rwlockattr_t *rwlockattr)
-{
-	pthread_rwlockattr_t prwlockattr;
-
-	if (rwlockattr == NULL)
-		return(EINVAL);
-
-	prwlockattr = *rwlockattr;
-
-	if (prwlockattr == NULL)
-		return(EINVAL);
-
-	free(prwlockattr);
-
-	return(0);
-}
-
-int
-_pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *rwlockattr,
-	int *pshared)
-{
-	*pshared = (*rwlockattr)->pshared;
-
-	return(0);
-}
-
-int
-_pthread_rwlockattr_init(pthread_rwlockattr_t *rwlockattr)
-{
-	pthread_rwlockattr_t prwlockattr;
-
-	if (rwlockattr == NULL)
-		return(EINVAL);
-
-	prwlockattr = (pthread_rwlockattr_t)
-		malloc(sizeof(struct pthread_rwlockattr));
-
-	if (prwlockattr == NULL)
-		return(ENOMEM);
-
-	prwlockattr->pshared 	= PTHREAD_PROCESS_PRIVATE;
-	*rwlockattr		= prwlockattr;
-
-	return(0);
-}
-
-int
-_pthread_rwlockattr_setpshared(pthread_rwlockattr_t *rwlockattr, int pshared)
-{
-	/* Only PTHREAD_PROCESS_PRIVATE is supported. */
-	if (pshared != PTHREAD_PROCESS_PRIVATE)
-		return(EINVAL);
-
-	(*rwlockattr)->pshared = pshared;
-
-	return(0);
-}
-
diff --git a/lib/libc/uthread/uthread_select.c b/lib/libc/uthread/uthread_select.c
deleted file mode 100644
index a78061d..0000000
--- a/lib/libc/uthread/uthread_select.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_select.c,v 1.21.14.1 2006/10/23 20:07:45 jhb Exp $
- */
-#include <unistd.h>
-#include <errno.h>
-#include <poll.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__select, select);
-
-int 
-_select(int numfds, fd_set * readfds, fd_set * writefds, fd_set * exceptfds,
-    struct timeval * timeout)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct timespec ts;
-	int             i, ret = 0, f_wait = 1;
-	int		pfd_index, got_events = 0, fd_count = 0;
-	struct pthread_poll_data data;
-
-	if (numfds > _thread_dtablesize) {
-		numfds = _thread_dtablesize;
-	}
-	/* Count the number of file descriptors to be polled: */
-	if (readfds || writefds || exceptfds) {
-		for (i = 0; i < numfds; i++) {
-			if ((readfds && FD_ISSET(i, readfds)) ||
-			    (exceptfds && FD_ISSET(i, exceptfds)) ||
-			    (writefds && FD_ISSET(i, writefds))) {
-				fd_count++;
-			}
-		}
-	}
-
-	/*
-	 * Allocate memory for poll data if it hasn't already been
-	 * allocated or if previously allocated memory is insufficient.
-	 */
-	if ((curthread->poll_data.fds == NULL) ||
-	    (curthread->poll_data.nfds < fd_count)) {
-		data.fds = (struct pollfd *) realloc(curthread->poll_data.fds,
-		    sizeof(struct pollfd) * MAX(128, fd_count));
-		if (data.fds == NULL) {
-			errno = ENOMEM;
-			ret = -1;
-		}
-		else {
-			/*
-			 * Note that the threads poll data always
-			 * indicates what is allocated, not what is
-			 * currently being polled.
-			 */
-			curthread->poll_data.fds = data.fds;
-			curthread->poll_data.nfds = MAX(128, fd_count);
-		}
-	}
-	/* Check if a timeout was specified: */
-	if (timeout) {
-		if (timeout->tv_sec < 0 ||
-			timeout->tv_usec < 0 || timeout->tv_usec >= 1000000) {
-			errno = EINVAL;
-			return (-1);
-		}
-
-		/* Convert the timeval to a timespec: */
-		TIMEVAL_TO_TIMESPEC(timeout, &ts);
-
-		/* Set the wake up time: */
-		_thread_kern_set_timeout(&ts);
-		if (ts.tv_sec == 0 && ts.tv_nsec == 0)
-			f_wait = 0;
-	} else {
-		/* Wait for ever: */
-		_thread_kern_set_timeout(NULL);
-	}
-
-	if (ret == 0) {
-		/* Setup the wait data. */
-		data.fds = curthread->poll_data.fds;
-		data.nfds = fd_count;
-
-		/*
-		 * Setup the array of pollfds.  Optimize this by
-		 * running the loop in reverse and stopping when
-		 * the number of selected file descriptors is reached.
-		 */
-		for (i = numfds - 1, pfd_index = fd_count - 1;
-		    (i >= 0) && (pfd_index >= 0); i--) {
-			data.fds[pfd_index].events = 0;
-			if (readfds && FD_ISSET(i, readfds)) {
-				data.fds[pfd_index].events = POLLRDNORM;
-			}
-			if (exceptfds && FD_ISSET(i, exceptfds)) {
-				data.fds[pfd_index].events |= POLLRDBAND;
-			}
-			if (writefds && FD_ISSET(i, writefds)) {
-				data.fds[pfd_index].events |= POLLWRNORM;
-			}
-			if (data.fds[pfd_index].events != 0) {
-				/*
-				 * Set the file descriptor to be polled and
-				 * clear revents in case of a timeout which
-				 * leaves fds unchanged:
-				 */
-				data.fds[pfd_index].fd = i;
-				data.fds[pfd_index].revents = 0;
-				pfd_index--;
-			}
-		}
-		if (((ret = __sys_poll(data.fds, data.nfds, 0)) == 0) &&
-		   (f_wait != 0)) {
-			curthread->data.poll_data = &data;
-			curthread->interrupted = 0;
-			_thread_kern_sched_state(PS_SELECT_WAIT, __FILE__, __LINE__);
-			if (curthread->interrupted) {
-				errno = EINTR;
-				data.nfds = 0;
-				ret = -1;
-			} else
-				ret = data.nfds;
-		}
-	}
-
-	if (ret >= 0) {
-		numfds = 0;
-		for (i = 0; i < fd_count; i++) {
-			/*
-			 * Check the results of the poll and clear
-			 * this file descriptor from the fdset if
-			 * the requested event wasn't ready.
-			 */
-
-			/*
-			 * First check for invalid descriptor.
-			 * If found, set errno and return -1.
-			 */
-			if (data.fds[i].revents & POLLNVAL) {
-				errno = EBADF;
-				return -1;
-			}
-
-			got_events = 0;
-			if (readfds != NULL) {
-				if (FD_ISSET(data.fds[i].fd, readfds)) {
-					if ((data.fds[i].revents & (POLLIN
-					    | POLLRDNORM | POLLERR
-					    | POLLHUP | POLLNVAL)) != 0)
-						got_events++;
-					else
-						FD_CLR(data.fds[i].fd, readfds);
-				}
-			}
-			if (writefds != NULL) {
-				if (FD_ISSET(data.fds[i].fd, writefds)) {
-					if ((data.fds[i].revents & (POLLOUT
-					    | POLLWRNORM | POLLWRBAND | POLLERR
-					    | POLLHUP | POLLNVAL)) != 0)
-						got_events++;
-					else
-						FD_CLR(data.fds[i].fd,
-						    writefds);
-				}
-			}
-			if (exceptfds != NULL) {
-				if (FD_ISSET(data.fds[i].fd, exceptfds)) {
-					if (data.fds[i].revents & (POLLRDBAND |
-					    POLLPRI))
-						got_events++;
-					else
-						FD_CLR(data.fds[i].fd,
-						    exceptfds);
-				}
-			}
-			if (got_events != 0)
-				numfds+=got_events;
-		}
-		ret = numfds;
-	}
-
-	return (ret);
-}
-
-int 
-__select(int numfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
-	struct timeval *timeout)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _select(numfds, readfds, writefds, exceptfds, timeout);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_self.c b/lib/libc/uthread/uthread_self.c
deleted file mode 100644
index 1e6b774..0000000
--- a/lib/libc/uthread/uthread_self.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_self.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
- */
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_self, pthread_self);
-
-pthread_t
-_pthread_self(void)
-{
-	/* Return the running thread pointer: */
-	return (_get_curthread());
-}
diff --git a/lib/libc/uthread/uthread_sem.c b/lib/libc/uthread/uthread_sem.c
deleted file mode 100644
index f374e54..0000000
--- a/lib/libc/uthread/uthread_sem.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_sem.c,v 1.11 2002/11/13 18:13:26 deischen Exp $
- */
-
-#include <stdlib.h>
-#include <errno.h>
-#include <semaphore.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-#include "pthread_private.h"
-
-#define _SEM_CHECK_VALIDITY(sem)		\
-	if ((*(sem))->magic != SEM_MAGIC) {	\
-		errno = EINVAL;			\
-		retval = -1;			\
-		goto RETURN;			\
-	}
-
-__weak_reference(_sem_init, sem_init);
-__weak_reference(_sem_destroy, sem_destroy);
-__weak_reference(_sem_open, sem_open);
-__weak_reference(_sem_close, sem_close);
-__weak_reference(_sem_unlink, sem_unlink);
-__weak_reference(_sem_wait, sem_wait);
-__weak_reference(_sem_trywait, sem_trywait);
-__weak_reference(_sem_post, sem_post);
-__weak_reference(_sem_getvalue, sem_getvalue);
-
-
-int
-_sem_init(sem_t *sem, int pshared, unsigned int value)
-{
-	int	retval;
-
-	/*
-	 * Range check the arguments.
-	 */
-	if (pshared != 0) {
-		/*
-		 * The user wants a semaphore that can be shared among
-		 * processes, which this implementation can't do.  Sounds like a
-		 * permissions problem to me (yeah right).
-		 */
-		errno = EPERM;
-		retval = -1;
-		goto RETURN;
-	}
-
-	if (value > SEM_VALUE_MAX) {
-		errno = EINVAL;
-		retval = -1;
-		goto RETURN;
-	}
-
-	*sem = (sem_t)malloc(sizeof(struct sem));
-	if (*sem == NULL) {
-		errno = ENOSPC;
-		retval = -1;
-		goto RETURN;
-	}
-
-	/*
-	 * Initialize the semaphore.
-	 */
-	if (_pthread_mutex_init(&(*sem)->lock, NULL) != 0) {
-		free(*sem);
-		errno = ENOSPC;
-		retval = -1;
-		goto RETURN;
-	}
-
-	if (_pthread_cond_init(&(*sem)->gtzero, NULL) != 0) {
-		_pthread_mutex_destroy(&(*sem)->lock);
-		free(*sem);
-		errno = ENOSPC;
-		retval = -1;
-		goto RETURN;
-	}
-	
-	(*sem)->count = (uint32_t)value;
-	(*sem)->nwaiters = 0;
-	(*sem)->magic = SEM_MAGIC;
-
-	retval = 0;
-  RETURN:
-	return retval;
-}
-
-int
-_sem_destroy(sem_t *sem)
-{
-	int	retval;
-	
-	_SEM_CHECK_VALIDITY(sem);
-
-	/* Make sure there are no waiters. */
-	_pthread_mutex_lock(&(*sem)->lock);
-	if ((*sem)->nwaiters > 0) {
-		_pthread_mutex_unlock(&(*sem)->lock);
-		errno = EBUSY;
-		retval = -1;
-		goto RETURN;
-	}
-	_pthread_mutex_unlock(&(*sem)->lock);
-	
-	_pthread_mutex_destroy(&(*sem)->lock);
-	_pthread_cond_destroy(&(*sem)->gtzero);
-	(*sem)->magic = 0;
-
-	free(*sem);
-
-	retval = 0;
-  RETURN:
-	return retval;
-}
-
-sem_t *
-_sem_open(const char *name, int oflag, ...)
-{
-	errno = ENOSYS;
-	return SEM_FAILED;
-}
-
-int
-_sem_close(sem_t *sem)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-int
-_sem_unlink(const char *name)
-{
-	errno = ENOSYS;
-	return -1;
-}
-
-int
-_sem_wait(sem_t *sem)
-{
-	int	retval;
-
-	_thread_enter_cancellation_point();
-	
-	_SEM_CHECK_VALIDITY(sem);
-
-	_pthread_mutex_lock(&(*sem)->lock);
-
-	while ((*sem)->count == 0) {
-		(*sem)->nwaiters++;
-		_pthread_cond_wait(&(*sem)->gtzero, &(*sem)->lock);
-		(*sem)->nwaiters--;
-	}
-	(*sem)->count--;
-
-	_pthread_mutex_unlock(&(*sem)->lock);
-
-	retval = 0;
-  RETURN:
-	_thread_leave_cancellation_point();
-	return retval;
-}
-
-int
-_sem_trywait(sem_t *sem)
-{
-	int	retval;
-
-	_SEM_CHECK_VALIDITY(sem);
-
-	_pthread_mutex_lock(&(*sem)->lock);
-
-	if ((*sem)->count > 0) {
-		(*sem)->count--;
-		retval = 0;
-	} else {
-		errno = EAGAIN;
-		retval = -1;
-	}
-	
-	_pthread_mutex_unlock(&(*sem)->lock);
-
-  RETURN:
-	return retval;
-}
-
-int
-_sem_post(sem_t *sem)
-{
-	int	retval;
-
-	_SEM_CHECK_VALIDITY(sem);
-
-	/*
-	 * sem_post() is required to be safe to call from within signal
-	 * handlers.  Thus, we must defer signals.
-	 */
-	_thread_kern_sig_defer();
-
-	_pthread_mutex_lock(&(*sem)->lock);
-
-	(*sem)->count++;
-	if ((*sem)->nwaiters > 0)
-		_pthread_cond_signal(&(*sem)->gtzero);
-
-	_pthread_mutex_unlock(&(*sem)->lock);
-
-	_thread_kern_sig_undefer();
-	retval = 0;
-  RETURN:
-	return retval;
-}
-
-int
-_sem_getvalue(sem_t *sem, int *sval)
-{
-	int	retval;
-
-	_SEM_CHECK_VALIDITY(sem);
-
-	_pthread_mutex_lock(&(*sem)->lock);
-	*sval = (int)(*sem)->count;
-	_pthread_mutex_unlock(&(*sem)->lock);
-
-	retval = 0;
-  RETURN:
-	return retval;
-}
diff --git a/lib/libc/uthread/uthread_sendfile.c b/lib/libc/uthread/uthread_sendfile.c
deleted file mode 100644
index 64fdf8e..0000000
--- a/lib/libc/uthread/uthread_sendfile.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_sendfile.c,v 1.10 2002/08/29 23:06:07 deischen Exp $
- */
-
-#include <sys/fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_sendfile, sendfile);
-
-int
-_sendfile(int fd, int s, off_t offset, size_t nbytes, struct sf_hdtr *hdtr,
-    off_t *sbytes, int flags)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	type, blocking;
-	int	ret = 0;
-	ssize_t wvret, num = 0;
-	off_t	n, nwritten = 0;
-
-	/*
-	 * Write the headers if any.
-	 * If some data is written but not all we must return here.
-	 */
-	if ((hdtr != NULL) && (hdtr->headers != NULL)) {
-		if ((wvret = writev(s, hdtr->headers, hdtr->hdr_cnt)) == -1) {
-			ret = -1;
-			goto ERROR;
-		} else {
-			int i;
-			ssize_t hdrtot;
-
-			nwritten += wvret;
-
-			for (i = 0, hdrtot = 0; i < hdtr->hdr_cnt; i++)
-				hdrtot += hdtr->headers[i].iov_len;
-			if (wvret < hdrtot)
-				goto SHORT_WRITE;
-		}
-	}
-	
-	/* Lock the descriptors. */
-	if ((ret = _FD_LOCK(fd, FD_READ, NULL)) != 0) {
-		ret = -1;
-		errno = EBADF;
-		goto ERROR;
-	}
-	if ((ret = _FD_LOCK(s, FD_WRITE, NULL)) != 0) {
-		ret = -1;
-		errno = EBADF;
-		goto ERROR_1;
-	}
-	
-	/* Check the descriptor access modes. */
-	type = _thread_fd_getflags(fd) & O_ACCMODE;
-	if (type != O_RDONLY && type != O_RDWR) {
-		/* File is not open for read. */
-		ret = -1;
-		errno = EBADF;
-		goto ERROR_2;
-	}
-	type = _thread_fd_getflags(s) & O_ACCMODE;
-	if (type != O_WRONLY && type != O_RDWR) {
-		/* File is not open for write. */
-		ret = -1;
-		errno = EBADF;
-		goto ERROR_2;
-	}
-
-	/* Check if file operations are to block */
-	blocking = ((_thread_fd_getflags(s) & O_NONBLOCK) == 0);
-
-	/*
-	 * Loop while no error occurs and until the expected number of bytes are
-	 * written.
-	 */
-	for (;;) {
-		/* Perform a non-blocking sendfile syscall. */
-		ret = __sys_sendfile(fd, s, offset + num, nbytes - num,
-		    NULL, &n, flags);
-
-		/*
-		 * We have to handle the sideways return path of sendfile.
-		 *
-		 * If the result is 0, we're done.
-		 * If the result is anything else check the errno.
-		 * If the errno is not EGAIN return the error.
-		 * Otherwise, take into account how much
-		 * sendfile may have written for us because sendfile can
-		 * return EAGAIN even though it has written data.
-		 *
-		 * We don't clear 'ret' because the sendfile(2) syscall
-		 * would not have either.
-		 */
-		if (ret == 0) {
-			/* Writing completed. */
-			num += n;
-			break;
-		} else if ((ret == -1) && (errno == EAGAIN)) {
-			/*
-			 * Some bytes were written but there are still more to
-			 * write.
-			 */
-
-			/* Update the count of bytes written. */
-			num += n;
-
-			/*
-			 * If we're not blocking then return.
-			 */
-			if (!blocking) {
-				_FD_UNLOCK(s, FD_WRITE);
-				_FD_UNLOCK(fd, FD_READ);
-				goto SHORT_WRITE;
-			}
-
-			/*
-			 * Otherwise wait on the fd.
-			 */
-			curthread->data.fd.fd = fd;
-			_thread_kern_set_timeout(NULL);
-
-			/* Reset the interrupted operation flag. */
-			curthread->interrupted = 0;
-
-			_thread_kern_sched_state(PS_FDW_WAIT, __FILE__,
-			    __LINE__);
-
-			if (curthread->interrupted) {
-				/* Interrupted by a signal.  Return an error. */
-				break;
-			}
-		} else {
-			/* Incomplete non-blocking syscall, or error. */
-			break;
-		}
-	}
-
-  ERROR_2:
-	_FD_UNLOCK(s, FD_WRITE);
-  ERROR_1:
-	_FD_UNLOCK(fd, FD_READ);
-  ERROR:
-	if (ret == 0) {
-		/* Write the trailers, if any. */
-		if ((hdtr != NULL) && (hdtr->trailers != NULL)) {
-			if ((wvret = writev(s, hdtr->trailers, hdtr->trl_cnt))
-			    == -1)
-				ret = -1;
-			else
-				nwritten += wvret;
-		}
-	}
-  SHORT_WRITE:
-	if (sbytes != NULL) {
-		/*
-		 * Number of bytes written in headers/trailers, plus in the main
-		 * sendfile() loop.
-		 */
-		*sbytes = nwritten + num;
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_sendmsg.c b/lib/libc/uthread/uthread_sendmsg.c
deleted file mode 100644
index 041f148..0000000
--- a/lib/libc/uthread/uthread_sendmsg.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_sendmsg.c,v 1.11 2002/12/19 11:39:20 ru Exp $
- */
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__sendmsg, sendmsg);
-
-ssize_t
-_sendmsg(int fd, const struct msghdr *msg, int flags)
-{
-	struct pthread	*curthread = _get_curthread();
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-		while ((ret = __sys_sendmsg(fd, msg, flags)) < 0) {
-			if (!(_thread_fd_getflags(fd) & O_NONBLOCK)
-			    && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) {
-				curthread->data.fd.fd = fd;
-
-				/* Set the timeout: */
-				_thread_kern_set_timeout(NULL);
-				curthread->interrupted = 0;
-				_thread_kern_sched_state(PS_FDW_WAIT, __FILE__, __LINE__);
-
-				/* Check if the operation was interrupted: */
-				if (curthread->interrupted) {
-					errno = EINTR;
-					ret = -1;
-					break;
-				}
-			} else {
-				ret = -1;
-				break;
-			}
-		}
-		_FD_UNLOCK(fd, FD_WRITE);
-	}
-	return (ret);
-}
-
-ssize_t
-__sendmsg(int fd, const struct msghdr *msg, int flags)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _sendmsg(fd, msg, flags);
-	_thread_leave_cancellation_point();
-
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_sendto.c b/lib/libc/uthread/uthread_sendto.c
deleted file mode 100644
index 9174b3a..0000000
--- a/lib/libc/uthread/uthread_sendto.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_sendto.c,v 1.13 2002/12/19 11:39:20 ru Exp $
- */
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__sendto, sendto);
-
-ssize_t
-_sendto(int fd, const void *msg, size_t len, int flags, const struct
-    sockaddr * to, socklen_t to_len)
-{
-	struct pthread	*curthread = _get_curthread();
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-		while ((ret = __sys_sendto(fd, msg, len, flags, to, to_len)) < 0) {
-			if (((_thread_fd_getflags(fd) & O_NONBLOCK) == 0)
-			    && ((errno == EWOULDBLOCK) || (errno == EAGAIN))) {
-				curthread->data.fd.fd = fd;
-
-				/* Set the timeout: */
-				_thread_kern_set_timeout(NULL);
-				curthread->interrupted = 0;
-				_thread_kern_sched_state(PS_FDW_WAIT, __FILE__, __LINE__);
-
-				/* Check if the operation was interrupted: */
-				if (curthread->interrupted) {
-					errno = EINTR;
-					ret = -1;
-					break;
-				}
-			} else {
-				ret = -1;
-				break;
-			}
-		}
-		_FD_UNLOCK(fd, FD_WRITE);
-	}
-	return (ret);
-}
-
-ssize_t
-__sendto(int fd, const void *msg, size_t len, int flags, const struct
-    sockaddr * to, socklen_t to_len)
-{
-	int ret;
-
-	_thread_enter_cancellation_point();
-	ret = _sendto(fd, msg, len, flags, to, to_len);
-	_thread_leave_cancellation_point();
-
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_seterrno.c b/lib/libc/uthread/uthread_seterrno.c
deleted file mode 100644
index 1308341..0000000
--- a/lib/libc/uthread/uthread_seterrno.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_seterrno.c,v 1.5 2001/01/24 13:03:35 deischen Exp $
- */
-#include <pthread.h>
-#include "pthread_private.h"
-
-/*
- * This function needs to reference the global error variable which is
- * normally hidden from the user. 
- */
-#ifdef errno
-#undef errno;
-#endif
-extern int      errno;
-
-void
-_thread_seterrno(pthread_t thread, int error)
-{
-	/* Check for the initial thread: */
-	if (thread == _thread_initial)
-		/* The initial thread always uses the global error variable: */
-		errno = error;
-	else
-		/*
-		 * Threads other than the initial thread always use the error
-		 * field in the thread structureL 
-		 */
-		thread->error = error;
-}
diff --git a/lib/libc/uthread/uthread_setprio.c b/lib/libc/uthread/uthread_setprio.c
deleted file mode 100644
index cab5349..0000000
--- a/lib/libc/uthread/uthread_setprio.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_setprio.c,v 1.9 2001/04/10 04:19:20 deischen Exp $
- */
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_setprio, pthread_setprio);
-
-int
-_pthread_setprio(pthread_t pthread, int prio)
-{
-	int ret, policy;
-	struct sched_param param;
-
-	if ((ret = pthread_getschedparam(pthread, &policy, &param)) == 0) {
-		param.sched_priority = prio;
-		ret = pthread_setschedparam(pthread, policy, &param);
-	}
-
-	/* Return the error status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_setschedparam.c b/lib/libc/uthread/uthread_setschedparam.c
deleted file mode 100644
index 1c6d847..0000000
--- a/lib/libc/uthread/uthread_setschedparam.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_setschedparam.c,v 1.9 2001/04/10 04:19:20 deischen Exp $
- */
-#include <errno.h>
-#include <sys/param.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_setschedparam, pthread_setschedparam);
-
-int
-_pthread_setschedparam(pthread_t pthread, int policy, 
-	const struct sched_param *param)
-{
-	int old_prio, in_readyq = 0, ret = 0;
-
-	if ((param == NULL) || (policy < SCHED_FIFO) || (policy > SCHED_RR)) {
-		/* Return an invalid argument error: */
-		ret = EINVAL;
-	} else if ((param->sched_priority < PTHREAD_MIN_PRIORITY) ||
-	    (param->sched_priority > PTHREAD_MAX_PRIORITY)) {
-		/* Return an unsupported value error. */
-		ret = ENOTSUP;
-
-	/* Find the thread in the list of active threads: */
-	} else if ((ret = _find_thread(pthread)) == 0) {
-		/*
-		 * Defer signals to protect the scheduling queues from
-		 * access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		if (param->sched_priority !=
-		    PTHREAD_BASE_PRIORITY(pthread->base_priority)) {
-			/*
-			 * Remove the thread from its current priority
-			 * queue before any adjustments are made to its
-			 * active priority:
-			 */
-			old_prio = pthread->active_priority;
-			if ((pthread->flags & PTHREAD_FLAGS_IN_PRIOQ) != 0) {
-				in_readyq = 1;
-				PTHREAD_PRIOQ_REMOVE(pthread);
-			}
-
-			/* Set the thread base priority: */
-			pthread->base_priority &=
-			    (PTHREAD_SIGNAL_PRIORITY | PTHREAD_RT_PRIORITY);
-			pthread->base_priority = param->sched_priority;
-
-			/* Recalculate the active priority: */
-			pthread->active_priority = MAX(pthread->base_priority,
-			    pthread->inherited_priority);
-
-			if (in_readyq) {
-				if ((pthread->priority_mutex_count > 0) &&
-				    (old_prio > pthread->active_priority)) {
-					/*
-					 * POSIX states that if the priority is
-					 * being lowered, the thread must be
-					 * inserted at the head of the queue for
-					 * its priority if it owns any priority
-					 * protection or inheritence mutexes.
-					 */
-					PTHREAD_PRIOQ_INSERT_HEAD(pthread);
-				}
-				else
-					PTHREAD_PRIOQ_INSERT_TAIL(pthread);
-			}
-
-			/*
-			 * Check for any mutex priority adjustments.  This
-			 * includes checking for a priority mutex on which
-			 * this thread is waiting.
-			 */
-			_mutex_notify_priochange(pthread);
-		}
-
-		/* Set the scheduling policy: */
-		pthread->attr.sched_policy = policy;
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	}
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_setsockopt.c b/lib/libc/uthread/uthread_setsockopt.c
deleted file mode 100644
index d99675e..0000000
--- a/lib/libc/uthread/uthread_setsockopt.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_setsockopt.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_setsockopt, setsockopt);
-
-int
-_setsockopt(int fd, int level, int optname, const void *optval, socklen_t
-    optlen)
-{
-	int             ret;
-
-	if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-		ret = __sys_setsockopt(fd, level, optname, optval, optlen);
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_shutdown.c b/lib/libc/uthread/uthread_shutdown.c
deleted file mode 100644
index 41f3999..0000000
--- a/lib/libc/uthread/uthread_shutdown.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_shutdown.c,v 1.11 2001/04/10 04:19:20 deischen Exp $
- */
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_shutdown, shutdown);
-
-int
-_shutdown(int fd, int how)
-{
-	int             ret;
-
-	switch (how) {
-	case 0:
-			if ((ret = _FD_LOCK(fd, FD_READ, NULL)) == 0) {
-			ret = __sys_shutdown(fd, how);
-			_FD_UNLOCK(fd, FD_READ);
-		}
-		break;
-	case 1:
-			if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-			ret = __sys_shutdown(fd, how);
-			_FD_UNLOCK(fd, FD_WRITE);
-		}
-		break;
-	case 2:
-			if ((ret = _FD_LOCK(fd, FD_RDWR, NULL)) == 0) {
-			ret = __sys_shutdown(fd, how);
-			_FD_UNLOCK(fd, FD_RDWR);
-		}
-		break;
-	default:
-		errno =  EBADF;
-		ret = -1;
-		break;
-	}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_sig.c b/lib/libc/uthread/uthread_sig.c
deleted file mode 100644
index 7cbcace..0000000
--- a/lib/libc/uthread/uthread_sig.c
+++ /dev/null
@@ -1,1168 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_sig.c,v 1.46.10.1 2006/10/23 20:07:45 jhb Exp $
- */
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/signalvar.h>
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <setjmp.h>
-#include <string.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-/* Prototypes: */
-static void	thread_sig_add(struct pthread *pthread, int sig, int has_args);
-static void	thread_sig_check_state(struct pthread *pthread, int sig);
-static struct pthread *thread_sig_find(int sig);
-static void	thread_sig_handle_special(int sig);
-static void	thread_sigframe_add(struct pthread *thread, int sig,
-		    int has_args);
-static void	thread_sigframe_save(struct pthread *thread,
-		    struct pthread_signal_frame *psf);
-static void	thread_sig_invoke_handler(int sig, siginfo_t *info,
-		    ucontext_t *ucp, int unblock);
-
-/*#define DEBUG_SIGNAL*/
-#ifdef DEBUG_SIGNAL
-#define DBG_MSG		stdout_debug
-#else
-#define DBG_MSG(x...)
-#endif
-
-#if defined(_PTHREADS_INVARIANTS)
-#define SIG_SET_ACTIVE()	_sig_in_handler = 1
-#define SIG_SET_INACTIVE()	_sig_in_handler = 0
-#else
-#define SIG_SET_ACTIVE()
-#define SIG_SET_INACTIVE()
-#endif
-
-void
-_thread_sig_handler(int sig, siginfo_t *info, ucontext_t *ucp)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct pthread	*pthread, *pthread_h;
-	int		in_sched = _thread_kern_in_sched;
-	char		c;
-	sigset_t        sigset;
-
-	if (ucp == NULL)
-		PANIC("Thread signal handler received null context");
-	DBG_MSG("Got signal %d, current thread %p\n", sig, curthread);
-
-	/* Check if an interval timer signal: */
-	if (sig == _SCHED_SIGNAL) {
-		/* Update the scheduling clock: */
-		gettimeofday((struct timeval *)&_sched_tod, NULL);
-		_sched_ticks++;
-
-		if (in_sched != 0) {
-			/*
-			 * The scheduler is already running; ignore this
-			 * signal.
-			 */
-		}
-		/*
-		 * Check if the scheduler interrupt has come when
-		 * the currently running thread has deferred thread
-		 * signals.
-		 */
-		else if (curthread->sig_defer_count > 0)
-			curthread->yield_on_sig_undefer = 1;
-		else {
-			/* Schedule the next thread: */
-			_thread_kern_sched(ucp);
-
-			/*
-			 * This point should not be reached, so abort the
-			 * process:
-			 */
-			PANIC("Returned to signal function from scheduler");
-		}
-	}
-	/*
-	 * Check if the kernel has been interrupted while the scheduler
-	 * is accessing the scheduling queues or if there is a currently
-	 * running thread that has deferred signals.
-	 */
-	else if ((in_sched != 0) || (curthread->sig_defer_count > 0)) {
-		/* Cast the signal number to a character variable: */
-		c = sig;
-
-		/*
-		 * Write the signal number to the kernel pipe so that it will
-		 * be ready to read when this signal handler returns.
-		 */
-		if (_queue_signals != 0) {
-			ssize_t wgot;
-			do {
-				wgot = __sys_write(_thread_kern_pipe[1], &c,
-						   1);
-			} while (wgot < 0 && errno == EINTR);
-			if (wgot < 0 && errno != EAGAIN) {
-				PANIC("Failed to queue signal");
-			}
-			DBG_MSG("Got signal %d, queueing to kernel pipe\n", sig);
-		}
-		if (_thread_sigq[sig - 1].blocked == 0) {
-			DBG_MSG("Got signal %d, adding to _thread_sigq\n", sig);
-			/*
-			 * Do not block this signal; it will be blocked
-			 * when the pending signals are run down.
-			 */
-			/* _thread_sigq[sig - 1].blocked = 1; */
-
-			/*
-			 * Queue the signal, saving siginfo and sigcontext
-			 * (ucontext).
-			 *
-			 * XXX - Do we need to copy siginfo and ucp?
-			 */
-			_thread_sigq[sig - 1].signo = sig;
-			if (info != NULL)
-				memcpy(&_thread_sigq[sig - 1].siginfo, info,
-				    sizeof(*info));
-			memcpy(&_thread_sigq[sig - 1].uc, ucp, sizeof(*ucp));
-
-			/* Indicate that there are queued signals: */
-			_thread_sigq[sig - 1].pending = 1;
-			_sigq_check_reqd = 1;
-		}
-		/* These signals need special handling: */
-		else if (sig == SIGCHLD || sig == SIGTSTP ||
-		    sig == SIGTTIN || sig == SIGTTOU) {
-			_thread_sigq[sig - 1].pending = 1;
-			_thread_sigq[sig - 1].signo = sig;
-			_sigq_check_reqd = 1;
-		}
-		else
-			DBG_MSG("Got signal %d, ignored.\n", sig);
-	}
-	/*
-	 * The signal handlers should have been installed so that they
-	 * cannot be interrupted by other signals.
-	 */
-	else if (_thread_sigq[sig - 1].blocked == 0) {
-		/*
-		 * The signal is not blocked; handle the signal.
-		 *
-		 * Ignore subsequent occurrences of this signal
-		 * until the current signal is handled:
-		 */
-		_thread_sigq[sig - 1].blocked = 1;
-
-		/* This signal will be handled; clear the pending flag: */
-		_thread_sigq[sig - 1].pending = 0;
-
-		/*
-		 * Save siginfo and sigcontext (ucontext).
-		 *
-		 * XXX - Do we need to copy siginfo and ucp?
-		 */
-		_thread_sigq[sig - 1].signo = sig;
-
-		if (info != NULL)
-			memcpy(&_thread_sigq[sig - 1].siginfo, info,
-			    sizeof(*info));
-		memcpy(&_thread_sigq[sig - 1].uc, ucp, sizeof(*ucp));
-		SIG_SET_ACTIVE();
-
-		/* Handle special signals: */
-		thread_sig_handle_special(sig);
-
-		pthread_h = NULL;
-		if ((pthread = thread_sig_find(sig)) == NULL)
-			DBG_MSG("No thread to handle signal %d\n", sig);
-		else if (pthread == curthread) {
-			/* Call the signal handler for the current thread: */
-			thread_sig_invoke_handler(sig, info, ucp, 2);
-
-			/*
-			 * Set the process signal mask in the context; it
-			 * could have changed by the handler.
- 			 */
-			ucp->uc_sigmask = _process_sigmask;
- 
-			/*
-			 * The signal mask was restored; check for any
-			 * pending signals: 
-			 */
-			sigset = curthread->sigpend;
-			SIGSETOR(sigset, _process_sigpending);
-			SIGSETNAND(sigset, curthread->sigmask);
-			if (SIGNOTEMPTY(sigset))
-				curthread->check_pending = 1;
-
-			/* Resume the interrupted thread: */
-			__sys_sigreturn(ucp);
-		} else {
-			DBG_MSG("Got signal %d, adding frame to thread %p\n",
-			    sig, pthread);
-
-			/* Setup the target thread to receive the signal: */
-			thread_sig_add(pthread, sig, /*has_args*/ 1);
-
-			/* Take a peek at the next ready to run thread: */
-			pthread_h = PTHREAD_PRIOQ_FIRST();
-			DBG_MSG("Finished adding frame, head of prio list %p\n",
-			    pthread_h);
-		}
-		SIG_SET_INACTIVE();
-
-		/*
-		 * Switch to a different context if the currently running
-		 * thread takes a signal, or if another thread takes a
-		 * signal and the currently running thread is not in a
-		 * signal handler.
-		 */
-		if ((pthread_h != NULL) &&
-		    (pthread_h->active_priority > curthread->active_priority)) {
-			/* Enter the kernel scheduler: */
-			_thread_kern_sched(ucp);
-		}
-	}
-	else {
-		SIG_SET_ACTIVE();
-		thread_sig_handle_special(sig);
-		SIG_SET_INACTIVE();
-	}
-}
-
-static void
-thread_sig_invoke_handler(int sig, siginfo_t *info, ucontext_t *ucp,
-			  int unblock)
- {
-	struct pthread	*curthread = _get_curthread();
-	void (*sigfunc)(int, siginfo_t *, void *);
-	int		saved_seqno;
-	sigset_t	saved_sigmask;
-
-	/* Invoke the signal handler without going through the scheduler:
-	 */
-	DBG_MSG("Got signal %d, calling handler for current thread %p\n",
-	    sig, curthread);
-
-	/* Save the threads signal mask: */
-	saved_sigmask = curthread->sigmask;
-	saved_seqno = curthread->sigmask_seqno;
- 
-	/* Setup the threads signal mask: */
-	SIGSETOR(curthread->sigmask, _thread_sigact[sig - 1].sa_mask);
-	sigaddset(&curthread->sigmask, sig);
- 
-	if (unblock > 0) {
-		/*
-		 * Unblock the signal and restore the process signal
-		 * mask in case we don't return from the handler:
-		 */
-		_thread_sigq[sig - 1].blocked = 0;
-		if (unblock > 1)
-			__sys_sigprocmask(SIG_SETMASK, &_process_sigmask,
-					  NULL);
-	}
-
-	/*
-	 * Check that a custom handler is installed and if
-	 * the signal is not blocked:
-	 */
-	sigfunc = _thread_sigact[sig - 1].sa_sigaction;
-	if (((__sighandler_t *)sigfunc != SIG_DFL) &&
-	    ((__sighandler_t *)sigfunc != SIG_IGN)) {
-		if (((_thread_sigact[sig - 1].sa_flags & SA_SIGINFO) != 0) ||
-		    (info == NULL))
-			(*(sigfunc))(sig, info, ucp);
-		else
-			(*(sigfunc))(sig, (void*)(intptr_t)info->si_code, ucp);
-	}
-	/*
-	 * Only restore the signal mask if it hasn't been changed by the
-	 * application during invocation of the signal handler:
-	 */
-	if (curthread->sigmask_seqno == saved_seqno)
-		curthread->sigmask = saved_sigmask;
-}
-
-/*
- * Find a thread that can handle the signal.
- */
-struct pthread *
-thread_sig_find(int sig)
-{
-	struct pthread	*curthread = _get_curthread();
-	int		handler_installed;
-	struct pthread	*pthread, *pthread_next;
-	struct pthread	*suspended_thread, *signaled_thread;
-
-	DBG_MSG("Looking for thread to handle signal %d\n", sig);
-	/* Check if the signal requires a dump of thread information: */
-	if (sig == SIGINFO) {
-		/* Dump thread information to file: */
-		_thread_dump_info();
-
-		/* Unblock this signal to allow further dumps: */
-		_thread_sigq[sig - 1].blocked = 0;
-	}
-	/* Check if an interval timer signal: */
-	else if (sig == _SCHED_SIGNAL) {
-		/*
-		 * This shouldn't ever occur (should this panic?).
-		 */
-	} else {
-		/*
-		 * Enter a loop to look for threads that have the signal
-		 * unmasked.  POSIX specifies that a thread in a sigwait
-		 * will get the signal over any other threads.  Second
-		 * preference will be threads in in a sigsuspend.  Third
-		 * preference will be the current thread.  If none of the
-		 * above, then the signal is delivered to the first thread
-		 * that is found.  Note that if a custom handler is not
-		 * installed, the signal only affects threads in sigwait.
-		 */
-		suspended_thread = NULL;
-		if ((curthread != &_thread_kern_thread) &&
-		    !sigismember(&curthread->sigmask, sig))
-			signaled_thread = curthread;
-		else
-			signaled_thread = NULL;
-		if ((_thread_sigact[sig - 1].sa_handler == SIG_IGN) ||
-		    (_thread_sigact[sig - 1].sa_handler == SIG_DFL))
-			handler_installed = 0;
-		else
-			handler_installed = 1;
-
-		for (pthread = TAILQ_FIRST(&_waitingq);
-		    pthread != NULL; pthread = pthread_next) {
-			/*
-			 * Grab the next thread before possibly destroying
-			 * the link entry.
-			 */
-			pthread_next = TAILQ_NEXT(pthread, pqe);
-
-			if ((pthread->state == PS_SIGWAIT) &&
-			    sigismember(pthread->data.sigwait, sig)) {
-				/* Change the state of the thread to run: */
-				PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-				/*
-				 * A signal handler is not invoked for threads
-				 * in sigwait.  Clear the blocked and pending
-				 * flags.
-				 */
-				_thread_sigq[sig - 1].blocked = 0;
-				_thread_sigq[sig - 1].pending = 0;
-
-				/* Return the signal number: */
-				pthread->signo = sig;
-
-				/*
-				 * POSIX doesn't doesn't specify which thread
-				 * will get the signal if there are multiple
-				 * waiters, so we give it to the first thread
-				 * we find.
-				 *
-				 * Do not attempt to deliver this signal
-				 * to other threads and do not add the signal
-				 * to the process pending set.
-				 */
-				return (NULL);
-			}
-			else if ((handler_installed != 0) &&
-			    !sigismember(&pthread->sigmask, sig) &&
-			    ((pthread->flags & PTHREAD_FLAGS_SUSPENDED) == 0)) {
-				if (pthread->state == PS_SIGSUSPEND) {
-					if (suspended_thread == NULL)
-						suspended_thread = pthread;
-				} else if (signaled_thread == NULL)
-					signaled_thread = pthread;
-			}
-		}
-
-		/*
-		 * Only perform wakeups and signal delivery if there is a
-		 * custom handler installed:
-		 */
-		if (handler_installed == 0) {
-			/*
-			 * There is no handler installed.  Unblock the
-			 * signal so that if a handler _is_ installed, any
-			 * subsequent signals can be handled.
-			 */
-			_thread_sigq[sig - 1].blocked = 0;
-		} else {
-			/*
-			 * If we didn't find a thread in the waiting queue,
-			 * check the all threads queue:
-			 */
-			if (suspended_thread == NULL &&
-			    signaled_thread == NULL) {
-				/*
-				 * Enter a loop to look for other threads
-				 * capable of receiving the signal:
-				 */
-				TAILQ_FOREACH(pthread, &_thread_list, tle) {
-					if (!sigismember(&pthread->sigmask,
-					    sig)) {
-						signaled_thread = pthread;
-						break;
-					}
-				}
-			}
-
-			if (suspended_thread == NULL &&
-			    signaled_thread == NULL)
-				/*
-				 * Add it to the set of signals pending
-				 * on the process:
-				 */
-				sigaddset(&_process_sigpending, sig);
-			else {
-				/*
-				 * We only deliver the signal to one thread;
-				 * give preference to the suspended thread:
-				 */
-				if (suspended_thread != NULL)
-					pthread = suspended_thread;
-				else
-					pthread = signaled_thread;
-				return (pthread);
-			}
-		}
-	}
-
-	/* Returns nothing. */
-	return (NULL);
-}
-
-void
-_thread_sig_check_pending(struct pthread *pthread)
-{
-	sigset_t	sigset;
-	int		i;
-
-	/*
-	 * Check if there are pending signals for the running
-	 * thread or process that aren't blocked:
-	 */
-	sigset = pthread->sigpend;
-	SIGSETOR(sigset, _process_sigpending);
-	SIGSETNAND(sigset, pthread->sigmask);
-	if (SIGNOTEMPTY(sigset)) {
-		for (i = 1; i < NSIG; i++) {
-			if (sigismember(&sigset, i) != 0) {
-				if (sigismember(&pthread->sigpend, i) != 0)
-					thread_sig_add(pthread, i,
-					    /*has_args*/ 0);
-				else {
-					thread_sig_add(pthread, i,
-					    /*has_args*/ 1);
-					sigdelset(&_process_sigpending, i);
-				}
-			}
-		}
-	}
-}
-
-/*
- * This can only be called from the kernel scheduler.  It assumes that
- * all thread contexts are saved and that a signal frame can safely be
- * added to any user thread.
- */
-void
-_thread_sig_handle_pending(void)
-{
-	struct pthread	*pthread;
-	int		i, sig;
-
-	PTHREAD_ASSERT(_thread_kern_in_sched != 0,
-	    "_thread_sig_handle_pending called from outside kernel schedule");
-	/*
-	 * Check the array of pending signals:
-	 */
-	for (i = 0; i < NSIG; i++) {
-		if (_thread_sigq[i].pending != 0) {
-			/* This signal is no longer pending. */
-			_thread_sigq[i].pending = 0;
-
-			sig = _thread_sigq[i].signo;
-
-			/* Some signals need special handling: */
-			thread_sig_handle_special(sig);
-
-			if (_thread_sigq[i].blocked == 0) {
-				/*
-				 * Block future signals until this one
-				 * is handled:
-				 */
-				_thread_sigq[i].blocked = 1;
-
-				if ((pthread = thread_sig_find(sig)) != NULL) {
-					/*
-					 * Setup the target thread to receive
-					 * the signal:
-					 */
-					thread_sig_add(pthread, sig,
-					    /*has_args*/ 1);
-				}
-			}
-		}
-	}
-}
-
-static void
-thread_sig_handle_special(int sig)
-{
-	struct pthread	*pthread, *pthread_next;
-	int		i;
-
-	switch (sig) {
-	case SIGCHLD:
-		/*
-		 * Go through the file list and set all files
-		 * to non-blocking again in case the child
-		 * set some of them to block. Sigh.
-		 */
-		for (i = 0; i < _thread_dtablesize; i++) {
-			/* Check if this file is used: */
-			if (_thread_fd_table[i] != NULL) {
-				/*
-				 * Set the file descriptor to non-blocking:
-				 */
-				__sys_fcntl(i, F_SETFL,
-				    _thread_fd_getflags(i) | O_NONBLOCK);
-			}
-		}
-		/*
-		 * Enter a loop to wake up all threads waiting
-		 * for a process to complete:
-		 */
-		for (pthread = TAILQ_FIRST(&_waitingq);
-		    pthread != NULL; pthread = pthread_next) {
-			/*
-			 * Grab the next thread before possibly
-			 * destroying the link entry:
-			 */
-			pthread_next = TAILQ_NEXT(pthread, pqe);
-
-			/*
-			 * If this thread is waiting for a child
-			 * process to complete, wake it up:
-			 */
-			if (pthread->state == PS_WAIT_WAIT) {
-				/* Make the thread runnable: */
-				PTHREAD_NEW_STATE(pthread,PS_RUNNING);
-
-				/* Return the signal number: */
-				pthread->signo = sig;
-			}
-		}
-		break;
-
-	/*
-	 * POSIX says that pending SIGCONT signals are
-	 * discarded when one of these signals occurs.
-	 */
-	case SIGTSTP:
-	case SIGTTIN:
-	case SIGTTOU:
-		/*
-		 * Enter a loop to discard pending SIGCONT
-		 * signals:
-		 */
-		TAILQ_FOREACH(pthread, &_thread_list, tle) {
-			sigdelset(&pthread->sigpend, SIGCONT);
-		}
-		break;
-
-	default:
-		break;
-	}
-}
-
-/*
- * Perform thread specific actions in response to a signal.
- * This function is only called if there is a handler installed
- * for the signal, and if the target thread has the signal
- * unmasked.
- */
-static void
-thread_sig_add(struct pthread *pthread, int sig, int has_args)
-{
-	int	restart;
-	int	suppress_handler = 0;
-	int	thread_is_active = 0;
-
-	restart = _thread_sigact[sig - 1].sa_flags & SA_RESTART;
-
-	/* Make sure this signal isn't still in the pending set: */
-	sigdelset(&pthread->sigpend, sig);
-
-	/*
-	 * Process according to thread state:
-	 */
-	switch (pthread->state) {
-	/*
-	 * States which do not change when a signal is trapped:
-	 */
-	case PS_DEAD:
-	case PS_DEADLOCK:
-	case PS_STATE_MAX:
-	case PS_SIGTHREAD:
-		/*
-		 * You can't call a signal handler for threads in these
-		 * states.
-		 */
-		suppress_handler = 1;
-		break;
-
-	/*
-	 * States which do not need any cleanup handling when signals
-	 * occur:
-	 */
-	case PS_RUNNING:
-		/*
-		 * Remove the thread from the queue before changing its
-		 * priority:
-		 */
-		if ((pthread->flags & PTHREAD_FLAGS_IN_PRIOQ) != 0)
-			PTHREAD_PRIOQ_REMOVE(pthread);
-		else
-			/*
-			 * This thread is running; avoid placing it in
-			 * the run queue:
-			 */
-			thread_is_active = 1;
-		break;
-
-	case PS_SUSPENDED:
-		break;
-
-	case PS_SPINBLOCK:
-		/* Remove the thread from the workq and waitq: */
-		PTHREAD_WORKQ_REMOVE(pthread);
-		PTHREAD_WAITQ_REMOVE(pthread);
-		/* Make the thread runnable: */
-		PTHREAD_SET_STATE(pthread, PS_RUNNING);
-		break;
-
-	case PS_SIGWAIT:
-		/* The signal handler is not called for threads in SIGWAIT. */
-		suppress_handler = 1;
-		/* Wake up the thread if the signal is blocked. */
-		if (sigismember(pthread->data.sigwait, sig)) {
-			/* Change the state of the thread to run: */
-			PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-
-			/* Return the signal number: */
-			pthread->signo = sig;
-		} else
-			/* Increment the pending signal count. */
-			sigaddset(&pthread->sigpend, sig);
-		break;
-
-	/*
-	 * The wait state is a special case due to the handling of
-	 * SIGCHLD signals.
-	 */
-	case PS_WAIT_WAIT:
-		if (sig == SIGCHLD) {
-			/* Change the state of the thread to run: */
-			PTHREAD_WAITQ_REMOVE(pthread);
-			PTHREAD_SET_STATE(pthread, PS_RUNNING);
-
-			/* Return the signal number: */
-			pthread->signo = sig;
-		}
-		else {
-			/*
-			 * Mark the thread as interrupted only if the
-			 * restart flag is not set on the signal action:
-			 */
-			if (restart == 0)
-				pthread->interrupted = 1;
-			PTHREAD_WAITQ_REMOVE(pthread);
-			PTHREAD_SET_STATE(pthread, PS_RUNNING);
-		}
-		break;
-
-	/*
-	 * States which cannot be interrupted but still require the
-	 * signal handler to run:
-	 */
-	case PS_COND_WAIT:
-	case PS_MUTEX_WAIT:
-		/*
-		 * Remove the thread from the wait queue.  It will
-		 * be added back to the wait queue once all signal
-		 * handlers have been invoked.
-		 */
-		PTHREAD_WAITQ_REMOVE(pthread);
-		break;
-
-	case PS_JOIN:
-		/*
-		 * Remove the thread from the wait queue.  It will
-		 * be added back to the wait queue once all signal
-		 * handlers have been invoked.
-		 */
-		PTHREAD_WAITQ_REMOVE(pthread);
-		/* Make the thread runnable: */
-		PTHREAD_SET_STATE(pthread, PS_RUNNING);
-		break;
-
-	/*
-	 * States which are interruptible but may need to be removed
-	 * from queues before any signal handler is called.
-	 *
-	 * XXX - We may not need to handle this condition, but will
-	 *       mark it as a potential problem.
-	 */
-	case PS_FDLR_WAIT:
-	case PS_FDLW_WAIT:
-	case PS_FILE_WAIT:
-		if (restart == 0)
-			pthread->interrupted = 1;
-		/*
-		 * Remove the thread from the wait queue.  Our
-		 * signal handler hook will remove this thread
-		 * from the fd or file queue before invoking
-		 * the actual handler.
-		 */
-		PTHREAD_WAITQ_REMOVE(pthread);
-		break;
-
-	/*
-	 * States which are interruptible:
-	 */
-	case PS_FDR_WAIT:
-	case PS_FDW_WAIT:
-		if (restart == 0) {
-			/*
-			 * Flag the operation as interrupted and
-			 * set the state to running:
-			 */
-			pthread->interrupted = 1;
-			PTHREAD_SET_STATE(pthread, PS_RUNNING);
-		}
-		PTHREAD_WORKQ_REMOVE(pthread);
-		PTHREAD_WAITQ_REMOVE(pthread);
-		break;
-
-	case PS_POLL_WAIT:
-	case PS_SELECT_WAIT:
-	case PS_SLEEP_WAIT:
-		/*
-		 * Unmasked signals always cause poll, select, and sleep
-		 * to terminate early, regardless of SA_RESTART:
-		 */
-		pthread->interrupted = 1;
-		/* Remove threads in poll and select from the workq: */
-		if ((pthread->flags & PTHREAD_FLAGS_IN_WORKQ) != 0)
-			PTHREAD_WORKQ_REMOVE(pthread);
-		PTHREAD_WAITQ_REMOVE(pthread);
-		PTHREAD_SET_STATE(pthread, PS_RUNNING);
-		break;
-
-	case PS_SIGSUSPEND:
-		PTHREAD_WAITQ_REMOVE(pthread);
-		PTHREAD_SET_STATE(pthread, PS_RUNNING);
-		break;
-	}
-
-	if (suppress_handler == 0) {
-		/* Setup a signal frame and save the current threads state: */
-		thread_sigframe_add(pthread, sig, has_args);
-
-		/*
-		 * Signals are deferred until just before the threads
-		 * signal handler is invoked:
-		 */
-		pthread->sig_defer_count = 1;
-
-		/* Make sure the thread is runnable: */
-		if (pthread->state != PS_RUNNING)
-			PTHREAD_SET_STATE(pthread, PS_RUNNING);
-		/*
-		 * The thread should be removed from all scheduling
-		 * queues at this point.  Raise the priority and place
-		 * the thread in the run queue.  It is also possible
-		 * for a signal to be sent to a suspended thread,
-		 * mostly via pthread_kill().  If a thread is suspended,
-		 * don't insert it into the priority queue; just set
-		 * its state to suspended and it will run the signal
-		 * handler when it is resumed.
-		 */
-		pthread->active_priority |= PTHREAD_SIGNAL_PRIORITY;
-		if ((pthread->flags & PTHREAD_FLAGS_SUSPENDED) != 0)
-			PTHREAD_SET_STATE(pthread, PS_SUSPENDED);
-		else if (thread_is_active == 0)
-			PTHREAD_PRIOQ_INSERT_TAIL(pthread);
-	}
-}
-
-static void
-thread_sig_check_state(struct pthread *pthread, int sig)
-{
-	/*
-	 * Process according to thread state:
-	 */
-	switch (pthread->state) {
-	/*
-	 * States which do not change when a signal is trapped:
-	 */
-	case PS_DEAD:
-	case PS_DEADLOCK:
-	case PS_STATE_MAX:
-	case PS_SIGTHREAD:
-	case PS_RUNNING:
-	case PS_SUSPENDED:
-	case PS_SPINBLOCK:
-	case PS_COND_WAIT:
-	case PS_JOIN:
-	case PS_MUTEX_WAIT:
-		break;
-
-	case PS_SIGWAIT:
-		/* Wake up the thread if the signal is blocked. */
-		if (sigismember(pthread->data.sigwait, sig)) {
-			/* Change the state of the thread to run: */
-			PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-
-			/* Return the signal number: */
-			pthread->signo = sig;
-		} else
-			/* Increment the pending signal count. */
-			sigaddset(&pthread->sigpend, sig);
-		break;
-
-	/*
-	 * The wait state is a special case due to the handling of
-	 * SIGCHLD signals.
-	 */
-	case PS_WAIT_WAIT:
-		if (sig == SIGCHLD) {
-			/*
-			 * Remove the thread from the wait queue and
-			 * make it runnable:
-			 */
-			PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-
-			/* Return the signal number: */
-			pthread->signo = sig;
-		}
-		break;
-
-	case PS_FDLR_WAIT:
-	case PS_FDLW_WAIT:
-	case PS_SIGSUSPEND:
-	case PS_SLEEP_WAIT:
-		/*
-		 * Remove the thread from the wait queue and make it
-		 * runnable:
-		 */
-		PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-
-		/* Flag the operation as interrupted: */
-		pthread->interrupted = 1;
-		break;
-
-	/*
-	 * These states are additionally in the work queue:
-	 */
-	case PS_FDR_WAIT:
-	case PS_FDW_WAIT:
-	case PS_FILE_WAIT:
-	case PS_POLL_WAIT:
-	case PS_SELECT_WAIT:
-		/*
-		 * Remove the thread from the wait and work queues, and
-		 * make it runnable:
-		 */
-		PTHREAD_WORKQ_REMOVE(pthread);
-		PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-
-		/* Flag the operation as interrupted: */
-		pthread->interrupted = 1;
-		break;
-	}
-}
-
-/*
- * Send a signal to a specific thread (ala pthread_kill):
- */
-void
-_thread_sig_send(struct pthread *pthread, int sig)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/* Check for signals whose actions are SIG_DFL: */
-	if (_thread_sigact[sig - 1].sa_handler == SIG_DFL) {
-		/*
-		 * Check to see if a temporary signal handler is
-		 * installed for sigwaiters:
-		 */
-		if (_thread_dfl_count[sig] == 0)
-			/*
-			 * Deliver the signal to the process if a handler
-			 * is not installed:
-			 */
-			kill(getpid(), sig);
-		/*
-		 * Assuming we're still running after the above kill(),
-		 * make any necessary state changes to the thread:
-		 */
-		thread_sig_check_state(pthread, sig);
-	}
-	/*
-	 * Check that the signal is not being ignored:
-	 */
-	else if (_thread_sigact[sig - 1].sa_handler != SIG_IGN) {
-		if (pthread->state == PS_SIGWAIT &&
-		    sigismember(pthread->data.sigwait, sig)) {
-			/* Change the state of the thread to run: */
-			PTHREAD_NEW_STATE(pthread, PS_RUNNING);
-	
-			/* Return the signal number: */
-			pthread->signo = sig;
-		} else if (sigismember(&pthread->sigmask, sig))
-			/* Add the signal to the pending set: */
-			sigaddset(&pthread->sigpend, sig);
-		else if (pthread == curthread)
-			/* Call the signal handler for the current thread: */
-			thread_sig_invoke_handler(sig, NULL, NULL, 0);
-		else {
-			/* Protect the scheduling queues: */
-			_thread_kern_sig_defer();
-			/*
-			 * Perform any state changes due to signal
-			 * arrival:
-			 */
-			thread_sig_add(pthread, sig, /* has args */ 0);
-			/* Unprotect the scheduling queues: */
-			_thread_kern_sig_undefer();
-		}
-	}
-}
-
-/*
- * User thread signal handler wrapper.
- *
- *   thread - current running thread
- */
-void
-_thread_sig_wrapper(void)
-{
-	struct pthread_signal_frame *psf;
-	struct pthread	*thread = _get_curthread();
-
-	/* Get the current frame and state: */
-	psf = thread->curframe;
-	thread->curframe = NULL;
-	PTHREAD_ASSERT(psf != NULL, "Invalid signal frame in signal handler");
-
-	/*
-	 * We're coming from the kernel scheduler; clear the in
-	 * scheduler flag:
-	 */
-	_thread_kern_in_sched = 0;
-
-	/* Check the threads previous state: */
-	if (psf->saved_state.psd_state != PS_RUNNING) {
-		/*
-		 * Do a little cleanup handling for those threads in
-		 * queues before calling the signal handler.  Signals
-		 * for these threads are temporarily blocked until
-		 * after cleanup handling.
-		 */
-		switch (psf->saved_state.psd_state) {
-		case PS_FDLR_WAIT:
-		case PS_FDLW_WAIT:
-			_fd_lock_backout(thread);
-			psf->saved_state.psd_state = PS_RUNNING;
-			break;
-
-		case PS_COND_WAIT:
-			_cond_wait_backout(thread);
-			psf->saved_state.psd_state = PS_RUNNING;
-			break;
-
-		case PS_MUTEX_WAIT:
-			_mutex_lock_backout(thread);
-			psf->saved_state.psd_state = PS_RUNNING;
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	/*
-	 * Lower the priority before calling the handler in case
-	 * it never returns (longjmps back):
-	 */
-	thread->active_priority &= ~PTHREAD_SIGNAL_PRIORITY;
-
-	/*
-	 * Reenable interruptions without checking for the need to
-	 * context switch:
-	 */
-	thread->sig_defer_count = 0;
-
-	/*
-	 * Dispatch the signal via the custom signal handler:
-	 */
-	if (psf->sig_has_args == 0)
-		thread_sig_invoke_handler(psf->signo, NULL, NULL, 1);
-	else
-		thread_sig_invoke_handler(psf->signo, &psf->siginfo, &psf->uc,
-					  1);
-
-	/*
-	 * Call the kernel scheduler to safely restore the frame and
-	 * schedule the next thread:
-	 */
-	_thread_kern_sched_frame(psf);
-}
-
-static void
-thread_sigframe_add(struct pthread *thread, int sig, int has_args)
-{
-	struct pthread_signal_frame *psf = NULL;
-	unsigned long	stackp;
-
- 	/* Get the top of the threads stack: */
-	stackp = GET_STACK_JB(thread->ctx.jb);
-
-#if !defined(__ia64__)
-	/*
-	 * Leave a little space on the stack and round down to the
-	 * nearest aligned word:
-	 */
-#if defined(__amd64__)
-	stackp -= 128;		/* Skip over 128 byte red-zone */
-#endif
-	stackp -= sizeof(double);
-#if defined(__amd64__)
-	stackp &= ~0xFUL;
-#else
-	stackp &= ~0x3UL;
-#endif
-#endif
-
-	/* Allocate room on top of the stack for a new signal frame: */
-	stackp -= sizeof(struct pthread_signal_frame);
-#if defined(__ia64__) || defined(__amd64__)
-	stackp &= ~0xFUL;
-#endif
-
-	psf = (struct pthread_signal_frame *) stackp;
-
-	/* Save the current context in the signal frame: */
-	thread_sigframe_save(thread, psf);
-
-	/* Set handler specific information: */
-	psf->sig_has_args = has_args;
-	psf->signo = sig;
-	if (has_args) {
-		/* Copy the signal handler arguments to the signal frame: */
-		memcpy(&psf->uc, &_thread_sigq[psf->signo - 1].uc,
-		    sizeof(psf->uc));
-		memcpy(&psf->siginfo, &_thread_sigq[psf->signo - 1].siginfo,
-		    sizeof(psf->siginfo));
-	}
-
-	/* Setup the signal mask: */
-	SIGSETOR(thread->sigmask, _thread_sigact[sig - 1].sa_mask);
-	sigaddset(&thread->sigmask, sig);
-
-	/* Set up the new frame: */
-	thread->curframe = psf;
-	thread->flags &= PTHREAD_FLAGS_PRIVATE | PTHREAD_FLAGS_TRACE |
-	    PTHREAD_FLAGS_IN_SYNCQ;
-	/*
-	 * Set up the context:
-	 */
-#if !defined(__ia64__)
-	stackp -= sizeof(double);
-#if defined(__amd64__)
-	stackp &= ~0xFUL;
-#endif
-#endif
-	_setjmp(thread->ctx.jb);
-#if !defined(__ia64__)
-	SET_STACK_JB(thread->ctx.jb, stackp);
-#else
-	UPD_STACK_JB(thread->ctx.jb, stackp - 16);
-#endif
-	SET_RETURN_ADDR_JB(thread->ctx.jb, _thread_sig_wrapper);
-}
-
-void
-_thread_sigframe_restore(struct pthread *thread,
-    struct pthread_signal_frame *psf)
-{
-	memcpy(&thread->ctx, &psf->ctx, sizeof(thread->ctx));
-	/*
-	 * Only restore the signal mask if it hasn't been changed
-	 * by the application during invocation of the signal handler:
-	 */
-	if (thread->sigmask_seqno == psf->saved_state.psd_sigmask_seqno)
-		thread->sigmask = psf->saved_state.psd_sigmask;
-	thread->curframe = psf->saved_state.psd_curframe;
-	thread->wakeup_time = psf->saved_state.psd_wakeup_time;
-	thread->data = psf->saved_state.psd_wait_data;
-	thread->state = psf->saved_state.psd_state;
-	thread->flags = psf->saved_state.psd_flags;
-	thread->interrupted = psf->saved_state.psd_interrupted;
-	thread->signo = psf->saved_state.psd_signo;
-	thread->sig_defer_count = psf->saved_state.psd_sig_defer_count;
-}
-
-static void
-thread_sigframe_save(struct pthread *thread, struct pthread_signal_frame *psf)
-{
-	memcpy(&psf->ctx, &thread->ctx, sizeof(thread->ctx));
-	psf->saved_state.psd_sigmask = thread->sigmask;
-	psf->saved_state.psd_curframe = thread->curframe;
-	psf->saved_state.psd_wakeup_time = thread->wakeup_time;
-	psf->saved_state.psd_wait_data = thread->data;
-	psf->saved_state.psd_state = thread->state;
-	psf->saved_state.psd_flags = thread->flags &
-	    (PTHREAD_FLAGS_PRIVATE | PTHREAD_FLAGS_TRACE);
-	psf->saved_state.psd_interrupted = thread->interrupted;
-	psf->saved_state.psd_sigmask_seqno = thread->sigmask_seqno;
-	psf->saved_state.psd_signo = thread->signo;
-	psf->saved_state.psd_sig_defer_count = thread->sig_defer_count;
-}
-
diff --git a/lib/libc/uthread/uthread_sigaction.c b/lib/libc/uthread/uthread_sigaction.c
deleted file mode 100644
index 7778604..0000000
--- a/lib/libc/uthread/uthread_sigaction.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_sigaction.c,v 1.16 2002/09/30 08:47:42 deischen Exp $
- */
-#include <signal.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_sigaction, sigaction);
-
-int
-_sigaction(int sig, const struct sigaction * act, struct sigaction * oact)
-{
-	int ret = 0;
-	struct sigaction gact;
-
-	/* Check if the signal number is out of range: */
-	if (sig < 1 || sig > NSIG) {
-		/* Return an invalid argument: */
-		errno = EINVAL;
-		ret = -1;
-	} else {
-		if (_thread_initial == NULL)
-			_thread_init();
-
-		/*
-		 * Check if the existing signal action structure contents are
-		 * to be returned: 
-		 */
-		if (oact != NULL) {
-			/* Return the existing signal action contents: */
-			oact->sa_handler = _thread_sigact[sig - 1].sa_handler;
-			oact->sa_mask = _thread_sigact[sig - 1].sa_mask;
-			oact->sa_flags = _thread_sigact[sig - 1].sa_flags;
-		}
-
-		/* Check if a signal action was supplied: */
-		if (act != NULL) {
-			/* Set the new signal handler: */
-			_thread_sigact[sig - 1].sa_mask = act->sa_mask;
-			_thread_sigact[sig - 1].sa_flags = act->sa_flags;
-			_thread_sigact[sig - 1].sa_handler = act->sa_handler;
-		}
-
-		/*
-		 * Check if the kernel needs to be advised of a change
-		 * in signal action:
-		 */
-		if (act != NULL && sig != _SCHED_SIGNAL && sig != SIGCHLD &&
-		    sig != SIGINFO) {
-			/*
-			 * Ensure the signal handler cannot be interrupted
-			 * by other signals.  Always request the POSIX signal
-			 * handler arguments.
-			 */
-			sigfillset(&gact.sa_mask);
-			gact.sa_flags = SA_SIGINFO | SA_RESTART;
-
-			/*
-			 * Check if the signal handler is being set to
-			 * the default or ignore handlers:
-			 */
-			if (act->sa_handler == SIG_DFL ||
-			    act->sa_handler == SIG_IGN)
-				/* Specify the built in handler: */
-				gact.sa_handler = act->sa_handler;
-			else
-				/*
-				 * Specify the thread kernel signal
-				 * handler:
-				 */
-				gact.sa_handler = (void (*) ()) _thread_sig_handler;
-
-			/* Change the signal action in the kernel: */
-		    	if (__sys_sigaction(sig,&gact,NULL) != 0)
-				ret = -1;
-		}
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_sigmask.c b/lib/libc/uthread/uthread_sigmask.c
deleted file mode 100644
index 719c908..0000000
--- a/lib/libc/uthread/uthread_sigmask.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_sigmask.c,v 1.9 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/signalvar.h>
-#include <errno.h>
-#include <signal.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_pthread_sigmask, pthread_sigmask);
-
-int
-_pthread_sigmask(int how, const sigset_t *set, sigset_t *oset)
-{
-	struct pthread	*curthread = _get_curthread();
-	sigset_t	sigset;
-	int		ret = 0;
-
-	/* Check if the existing signal process mask is to be returned: */
-	if (oset != NULL) {
-		/* Return the current mask: */
-		*oset = curthread->sigmask;
-	}
-	/* Check if a new signal set was provided by the caller: */
-	if (set != NULL) {
-		/* Process according to what to do: */
-		switch (how) {
-		/* Block signals: */
-		case SIG_BLOCK:
-			/* Add signals to the existing mask: */
-			SIGSETOR(curthread->sigmask, *set);
-			break;
-
-		/* Unblock signals: */
-		case SIG_UNBLOCK:
-			/* Clear signals from the existing mask: */
-			SIGSETNAND(curthread->sigmask, *set);
-			break;
-
-		/* Set the signal process mask: */
-		case SIG_SETMASK:
-			/* Set the new mask: */
-			curthread->sigmask = *set;
-			break;
-
-		/* Trap invalid actions: */
-		default:
-			/* Return an invalid argument: */
-			errno = EINVAL;
-			ret = -1;
-			break;
-		}
-
-		/* Increment the sequence number: */
-		curthread->sigmask_seqno++;
-
-		/*
-		 * Check if there are pending signals for the running
-		 * thread or process that aren't blocked:
-		 */
-		sigset = curthread->sigpend;
-		SIGSETOR(sigset, _process_sigpending);
-		SIGSETNAND(sigset, curthread->sigmask);
-		if (SIGNOTEMPTY(sigset))
-			/*
-			 * Call the kernel scheduler which will safely
-			 * install a signal frame for the running thread:
-			 */
-			_thread_kern_sched_sig();
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_sigpending.c b/lib/libc/uthread/uthread_sigpending.c
deleted file mode 100644
index d9ed24d..0000000
--- a/lib/libc/uthread/uthread_sigpending.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1999 Daniel Eischen <eischen@vigrid.com>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_sigpending.c,v 1.9 2002/06/28 13:28:41 deischen Exp $
- */
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/signalvar.h>
-#include <signal.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_sigpending, sigpending);
-
-int
-_sigpending(sigset_t *set)
-{
-	struct pthread *curthread = _get_curthread();
-	int ret = 0;
-
-	/* Check for a null signal set pointer: */
-	if (set == NULL) {
-		/* Return an invalid argument: */
-		ret = EINVAL;
-	}
-	else {
-		*set = curthread->sigpend;
-		SIGSETOR(*set, _process_sigpending);
-	}
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_sigprocmask.c b/lib/libc/uthread/uthread_sigprocmask.c
deleted file mode 100644
index b741b5b..0000000
--- a/lib/libc/uthread/uthread_sigprocmask.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_sigprocmask.c,v 1.12 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/signalvar.h>
-#include <signal.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_sigprocmask, sigprocmask);
-
-int
-_sigprocmask(int how, const sigset_t *set, sigset_t *oset)
-{
-	return (pthread_sigmask(how, set, oset));
-}
diff --git a/lib/libc/uthread/uthread_sigsuspend.c b/lib/libc/uthread/uthread_sigsuspend.c
deleted file mode 100644
index 3ac4d93..0000000
--- a/lib/libc/uthread/uthread_sigsuspend.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_sigsuspend.c,v 1.12 2002/06/28 13:28:41 deischen Exp $
- */
-#include <signal.h>
-#include <sys/param.h>
-#include <sys/signalvar.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__sigsuspend, sigsuspend);
-
-int
-_sigsuspend(const sigset_t * set)
-{
-	struct pthread	*curthread = _get_curthread();
-	int             ret = -1;
-	sigset_t        oset, sigset;
-
-	/* Check if a new signal set was provided by the caller: */
-	if (set != NULL) {
-		/* Save the current signal mask: */
-		oset = curthread->sigmask;
-
-		/* Change the caller's mask: */
-		curthread->sigmask = *set;
-
-		/*
-		 * Check if there are pending signals for the running
-		 * thread or process that aren't blocked:
-		 */
-		sigset = curthread->sigpend;
-		SIGSETOR(sigset, _process_sigpending);
-		SIGSETNAND(sigset, curthread->sigmask);
-		if (SIGNOTEMPTY(sigset)) {
-			/*
-			 * Call the kernel scheduler which will safely
-			 * install a signal frame for the running thread:
-			 */
-			_thread_kern_sched_sig();
-		} else {
-			/* Wait for a signal: */
-			_thread_kern_sched_state(PS_SIGSUSPEND,
-			    __FILE__, __LINE__);
-		}
-
-		/* Always return an interrupted error: */
-		errno = EINTR;
-
-		/* Restore the signal mask: */
-		curthread->sigmask = oset;
-	} else {
-		/* Return an invalid argument error: */
-		errno = EINVAL;
-	}
-
-	/* Return the completion status: */
-	return (ret);
-}
-
-int
-__sigsuspend(const sigset_t * set)
-{
-	int	ret;
-
-	_thread_enter_cancellation_point();
-	ret = _sigsuspend(set);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_sigwait.c b/lib/libc/uthread/uthread_sigwait.c
deleted file mode 100644
index 29c90ac..0000000
--- a/lib/libc/uthread/uthread_sigwait.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_sigwait.c,v 1.20 2002/10/02 10:53:44 robert Exp $
- */
-#include <signal.h>
-#include <sys/param.h>
-#include <sys/signalvar.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_sigwait, sigwait);
-
-int
-_sigwait(const sigset_t * __restrict set, int * __restrict sig)
-{
-	struct pthread	*curthread = _get_curthread();
-	int		ret = 0;
-	int		i;
-	sigset_t	tempset, waitset;
-	struct sigaction act;
-	
-	_thread_enter_cancellation_point();
-	/*
-	 * Specify the thread kernel signal handler.
-	 */
-	act.sa_handler = (void (*) ()) _thread_sig_handler;
-	act.sa_flags = SA_SIGINFO | SA_RESTART;
-	/* Ensure the signal handler cannot be interrupted by other signals: */
-	sigfillset(&act.sa_mask);
-
-	/*
-	 * Initialize the set of signals that will be waited on:
-	 */
-	waitset = *set;
-
-	/* These signals can't be waited on. */
-	sigdelset(&waitset, SIGKILL);
-	sigdelset(&waitset, SIGSTOP);
-	sigdelset(&waitset, _SCHED_SIGNAL);
-	sigdelset(&waitset, SIGCHLD);
-	sigdelset(&waitset, SIGINFO);
-
-	/* Check to see if a pending signal is in the wait mask. */
-	tempset = curthread->sigpend;
-	SIGSETOR(tempset, _process_sigpending);
-	SIGSETAND(tempset, waitset);
-	if (SIGNOTEMPTY(tempset)) {
-		/* Enter a loop to find a pending signal: */
-		for (i = 1; i < NSIG; i++) {
-			if (sigismember (&tempset, i))
-				break;
-		}
-
-		/* Clear the pending signal: */
-		if (sigismember(&curthread->sigpend,i))
-			sigdelset(&curthread->sigpend,i);
-		else
-			sigdelset(&_process_sigpending,i);
-
-		/* Return the signal number to the caller: */
-		*sig = i;
-
-		_thread_leave_cancellation_point();
-		return (0);
-	}
-
-	/*
-	 * Access the _thread_dfl_count array under the protection of signal
-	 * deferral.
-	 */
-	_thread_kern_sig_defer();
-
-	/*
-	 * Enter a loop to find the signals that are SIG_DFL.  For
-	 * these signals we must install a dummy signal handler in
-	 * order for the kernel to pass them in to us.  POSIX says
-	 * that the _application_ must explicitly install a dummy
-	 * handler for signals that are SIG_IGN in order to sigwait
-	 * on them.  Note that SIG_IGN signals are left in the
-	 * mask because a subsequent sigaction could enable an
-	 * ignored signal.
-	 */
-	sigemptyset(&tempset);
-	for (i = 1; i < NSIG; i++) {
-		if (sigismember(&waitset, i) &&
-		    (_thread_sigact[i - 1].sa_handler == SIG_DFL)) {
-			_thread_dfl_count[i]++;
-			sigaddset(&tempset, i);
-			if (_thread_dfl_count[i] == 1) {
-				if (__sys_sigaction(i,&act,NULL) != 0)
-					ret = -1;
-			}
-		}
-	}
-	/* Done accessing _thread_dfl_count for now. */
-	_thread_kern_sig_undefer();
-
-	if (ret == 0) {
-		/*
-		 * Save the wait signal mask.  The wait signal
-		 * mask is independent of the threads signal mask
-		 * and requires separate storage.
-		 */
-		curthread->data.sigwait = &waitset;
-
-		/* Wait for a signal: */
-		_thread_kern_sched_state(PS_SIGWAIT, __FILE__, __LINE__);
-
-		/* Return the signal number to the caller: */
-		*sig = curthread->signo;
-
-		/*
-		 * Probably unnecessary, but since it's in a union struct
-		 * we don't know how it could be used in the future.
-		 */
-		curthread->data.sigwait = NULL;
-	}
-
-	/*
-	 * Access the _thread_dfl_count array under the protection of signal
-	 * deferral.
-	 */
-	_thread_kern_sig_defer();
-
-	/* Restore the sigactions: */
-	act.sa_handler = SIG_DFL;
-	for (i = 1; i < NSIG; i++) {
-		if (sigismember(&tempset, i)) {
-			_thread_dfl_count[i]--;
-			if ((_thread_sigact[i - 1].sa_handler == SIG_DFL) &&
-			    (_thread_dfl_count[i] == 0)) {
-				if (__sys_sigaction(i,&act,NULL) != 0)
-					ret = -1;
-			}
-		}
-	}
-	/* Done accessing _thread_dfl_count. */
-	_thread_kern_sig_undefer();
-
-	_thread_leave_cancellation_point();
-	
-	/* Return the completion status: */
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_single_np.c b/lib/libc/uthread/uthread_single_np.c
deleted file mode 100644
index 7a85bc2..0000000
--- a/lib/libc/uthread/uthread_single_np.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_single_np.c,v 1.6 2002/05/24 04:32:28 deischen Exp $
- */
-#include <pthread.h>
-#include <pthread_np.h>
-
-__weak_reference(_pthread_single_np, pthread_single_np);
-
-int _pthread_single_np()
-{
-
-	/* Enter single-threaded (non-POSIX) scheduling mode: */
-	pthread_suspend_all_np();
-	/*
-	 * XXX - Do we want to do this?
-	 * __is_threaded = 0;
-	 */
-	return (0);
-}
diff --git a/lib/libc/uthread/uthread_sleep.c b/lib/libc/uthread/uthread_sleep.c
deleted file mode 100644
index 4583a9d..0000000
--- a/lib/libc/uthread/uthread_sleep.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_sleep.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_sleep, sleep);
-
-unsigned int
-_sleep(unsigned int seconds)
-{
-	unsigned int	ret;
-
-	_thread_enter_cancellation_point();
-	ret = __sleep(seconds);
-	_thread_leave_cancellation_point();
-	
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_socket.c b/lib/libc/uthread/uthread_socket.c
deleted file mode 100644
index 51cf0dd..0000000
--- a/lib/libc/uthread/uthread_socket.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_socket.c,v 1.10 2001/04/10 04:19:20 deischen Exp $
- */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_socket, socket);
-
-int
-_socket(int af, int type, int protocol)
-{
-	int fd;
-
-	/* Create a socket: */
-	if ((fd = __sys_socket(af, type, protocol)) < 0) {
-		/* Error creating socket. */
-
-	/* Initialise the entry in the file descriptor table: */
-	} else if (_thread_fd_table_init(fd) != 0) {
-		__sys_close(fd);
-		fd = -1;
-	}
-	return (fd);
-}
diff --git a/lib/libc/uthread/uthread_socketpair.c b/lib/libc/uthread/uthread_socketpair.c
deleted file mode 100644
index ebcffb2..0000000
--- a/lib/libc/uthread/uthread_socketpair.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_socketpair.c,v 1.12 2001/04/10 04:19:20 deischen Exp $
- *
- */
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_socketpair, socketpair);
-
-int
-_socketpair(int af, int type, int protocol, int pair[2])
-{
-	int             ret;
-	if (!((ret = __sys_socketpair(af, type, protocol, pair)) < 0))
-		if (_thread_fd_table_init(pair[0]) != 0 ||
-		    _thread_fd_table_init(pair[1]) != 0) {
-			__sys_close(pair[0]);
-			__sys_close(pair[1]);
-			ret = -1;
-		}
-	return (ret);
-}
diff --git a/lib/libc/uthread/uthread_spec.c b/lib/libc/uthread/uthread_spec.c
deleted file mode 100644
index c3cd5d2..0000000
--- a/lib/libc/uthread/uthread_spec.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_spec.c,v 1.17 2002/03/19 22:58:56 deischen Exp $
- */
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-struct pthread_key {
-	spinlock_t	lock;
-	volatile int	allocated;
-	volatile int	count;
-	int		seqno;
-	void            (*destructor) ();
-};
-
-/* Static variables: */
-static	struct pthread_key key_table[PTHREAD_KEYS_MAX];
-
-__weak_reference(_pthread_key_create, pthread_key_create);
-__weak_reference(_pthread_key_delete, pthread_key_delete);
-__weak_reference(_pthread_getspecific, pthread_getspecific);
-__weak_reference(_pthread_setspecific, pthread_setspecific);
-
-
-int
-_pthread_key_create(pthread_key_t * key, void (*destructor) (void *))
-{
-	for ((*key) = 0; (*key) < PTHREAD_KEYS_MAX; (*key)++) {
-		/* Lock the key table entry: */
-		_SPINLOCK(&key_table[*key].lock);
-
-		if (key_table[(*key)].allocated == 0) {
-			key_table[(*key)].allocated = 1;
-			key_table[(*key)].destructor = destructor;
-			key_table[(*key)].seqno++;
-
-			/* Unlock the key table entry: */
-			_SPINUNLOCK(&key_table[*key].lock);
-			return (0);
-		}
-
-		/* Unlock the key table entry: */
-		_SPINUNLOCK(&key_table[*key].lock);
-	}
-	return (EAGAIN);
-}
-
-int
-_pthread_key_delete(pthread_key_t key)
-{
-	int ret = 0;
-
-	if (key < PTHREAD_KEYS_MAX) {
-		/* Lock the key table entry: */
-		_SPINLOCK(&key_table[key].lock);
-
-		if (key_table[key].allocated)
-			key_table[key].allocated = 0;
-		else
-			ret = EINVAL;
-
-		/* Unlock the key table entry: */
-		_SPINUNLOCK(&key_table[key].lock);
-	} else
-		ret = EINVAL;
-	return (ret);
-}
-
-void 
-_thread_cleanupspecific(void)
-{
-	struct pthread	*curthread = _get_curthread();
-	void		*data = NULL;
-	int		key;
-	int		itr;
-	void		(*destructor)( void *);
-
-	for (itr = 0; itr < PTHREAD_DESTRUCTOR_ITERATIONS; itr++) {
-		for (key = 0; key < PTHREAD_KEYS_MAX; key++) {
-			if (curthread->specific_data_count > 0) {
-				/* Lock the key table entry: */
-				_SPINLOCK(&key_table[key].lock);
-				destructor = NULL;
-
-				if (key_table[key].allocated &&
-				    (curthread->specific[key].data != NULL)) {
-					if (curthread->specific[key].seqno ==
-					    key_table[key].seqno) {
-						data = (void *) curthread->specific[key].data;
-						destructor = key_table[key].destructor;
-					}
-					curthread->specific[key].data = NULL;
-					curthread->specific_data_count--;
-				}
-
-				/* Unlock the key table entry: */
-				_SPINUNLOCK(&key_table[key].lock);
-
-				/*
-				 * If there is a destructore, call it
-				 * with the key table entry unlocked:
-				 */
-				if (destructor)
-					destructor(data);
-			} else {
-				free(curthread->specific);
-				curthread->specific = NULL;
-				return;
-			}
-		}
-	}
-	if (curthread->specific != NULL) {
-		free(curthread->specific);
-		curthread->specific = NULL;
-	}
-}
-
-static inline struct pthread_specific_elem *
-pthread_key_allocate_data(void)
-{
-	struct pthread_specific_elem *new_data;
-
-	new_data = (struct pthread_specific_elem *)
-	    malloc(sizeof(struct pthread_specific_elem) * PTHREAD_KEYS_MAX);
-	if (new_data != NULL) {
-		memset((void *) new_data, 0,
-		    sizeof(struct pthread_specific_elem) * PTHREAD_KEYS_MAX);
-	}
-	return (new_data);
-}
-
-int 
-_pthread_setspecific(pthread_key_t key, const void *value)
-{
-	struct pthread	*pthread;
-	int		ret = 0;
-
-	/* Point to the running thread: */
-	pthread = _get_curthread();
-
-	if ((pthread->specific) ||
-	    (pthread->specific = pthread_key_allocate_data())) {
-		if (key < PTHREAD_KEYS_MAX) {
-			if (key_table[key].allocated) {
-				if (pthread->specific[key].data == NULL) {
-					if (value != NULL)
-						pthread->specific_data_count++;
-				} else {
-					if (value == NULL)
-						pthread->specific_data_count--;
-				}
-				pthread->specific[key].data = value;
-				pthread->specific[key].seqno =
-				    key_table[key].seqno;
-				ret = 0;
-			} else
-				ret = EINVAL;
-		} else
-			ret = EINVAL;
-	} else
-		ret = ENOMEM;
-	return (ret);
-}
-
-void *
-_pthread_getspecific(pthread_key_t key)
-{
-	struct pthread	*pthread;
-	void		*data;
-
-	/* Point to the running thread: */
-	pthread = _get_curthread();
-
-	/* Check if there is specific data: */
-	if (pthread->specific != NULL && key < PTHREAD_KEYS_MAX) {
-		/* Check if this key has been used before: */
-		if (key_table[key].allocated &&
-		    (pthread->specific[key].seqno == key_table[key].seqno)) {
-			/* Return the value: */
-			data = (void *) pthread->specific[key].data;
-		} else {
-			/*
-			 * This key has not been used before, so return NULL
-			 * instead: 
-			 */
-			data = NULL;
-		}
-	} else
-		/* No specific data has been created, so just return NULL: */
-		data = NULL;
-	return (data);
-}
diff --git a/lib/libc/uthread/uthread_spinlock.c b/lib/libc/uthread/uthread_spinlock.c
deleted file mode 100644
index 23bc330..0000000
--- a/lib/libc/uthread/uthread_spinlock.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_spinlock.c,v 1.12 2003/03/26 04:02:24 jeff Exp $
- *
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sched.h>
-#include <pthread.h>
-#include <unistd.h>
-
-#include <libc_private.h>
-
-#include "pthread_private.h"
-
-void
-_spinunlock(spinlock_t *lck)
-{
-	lck->access_lock = 0;
-}
-
-/*
- * Lock a location for the running thread. Yield to allow other
- * threads to run if this thread is blocked because the lock is
- * not available. Note that this function does not sleep. It
- * assumes that the lock will be available very soon.
- */
-void
-_spinlock(spinlock_t *lck)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/*
-	 * Try to grab the lock and loop if another thread grabs
-	 * it before we do.
-	 */
-	while(_atomic_lock(&lck->access_lock)) {
-		/* Block the thread until the lock. */
-		curthread->data.spinlock = lck;
-		_thread_kern_sched_state(PS_SPINBLOCK, __FILE__, __LINE__);
-	}
-
-	/* The running thread now owns the lock: */
-	lck->lock_owner = (long) curthread;
-}
-
-/*
- * Lock a location for the running thread. Yield to allow other
- * threads to run if this thread is blocked because the lock is
- * not available. Note that this function does not sleep. It
- * assumes that the lock will be available very soon.
- *
- * This function checks if the running thread has already locked the
- * location, warns if this occurs and creates a thread dump before
- * returning.
- */
-void
-_spinlock_debug(spinlock_t *lck, char *fname, int lineno)
-{
-	struct pthread	*curthread = _get_curthread();
-	int cnt = 0;
-
-	/*
-	 * Try to grab the lock and loop if another thread grabs
-	 * it before we do.
-	 */
-	while(_atomic_lock(&lck->access_lock)) {
-		cnt++;
-		if (cnt > 100) {
-			char str[256];
-			snprintf(str, sizeof(str), "%s - Warning: Thread %p attempted to lock %p from %s (%d) was left locked from %s (%d)\n", getprogname(), curthread, lck, fname, lineno, lck->fname, lck->lineno);
-			__sys_write(2,str,strlen(str));
-			__sleep(1);
-			cnt = 0;
-		}
-
-		/* Block the thread until the lock. */
-		curthread->data.spinlock = lck;
-		_thread_kern_sched_state(PS_SPINBLOCK, fname, lineno);
-	}
-
-	/* The running thread now owns the lock: */
-	lck->lock_owner = (long) curthread;
-	lck->fname = fname;
-	lck->lineno = lineno;
-}
diff --git a/lib/libc/uthread/uthread_stack.c b/lib/libc/uthread/uthread_stack.c
deleted file mode 100644
index 7336cf1..0000000
--- a/lib/libc/uthread/uthread_stack.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@freebsd.org>
- * Copyright (c) 2000-2001 Jason Evans <jasone@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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/lib/libc_r/uthread/uthread_stack.c,v 1.7 2005/02/28 17:15:31 marcus Exp $
- */
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "pthread_private.h"
-
-/* Spare thread stack. */
-struct stack {
-	LIST_ENTRY(stack)	qe;		/* Stack queue linkage. */
-	size_t			stacksize;	/* Stack size (rounded up). */
-	size_t			guardsize;	/* Guard size. */
-	void			*stackaddr;	/* Stack address. */
-};
-
-/*
- * Default sized (stack and guard) spare stack queue.  Stacks are cached to
- * avoid additional complexity managing mmap()ed stack regions.  Spare stacks
- * are used in LIFO order to increase cache locality.
- */
-static LIST_HEAD(, stack)	_dstackq = LIST_HEAD_INITIALIZER(_dstackq);
-
-/*
- * Miscellaneous sized (non-default stack and/or guard) spare stack queue.
- * Stacks are cached to avoid additional complexity managing mmap()ed stack
- * regions.  This list is unordered, since ordering on both stack size and guard
- * size would be more trouble than it's worth.  Stacks are allocated from this
- * cache on a first size match basis.
- */
-static LIST_HEAD(, stack)	_mstackq = LIST_HEAD_INITIALIZER(_mstackq);
-
-/**
- * Base address of the last stack allocated (including its red zone, if there is
- * one).  Stacks are allocated contiguously, starting beyond the top of the main
- * stack.  When a new stack is created, a red zone is typically created
- * (actually, the red zone is simply left unmapped) above the top of the stack,
- * such that the stack will not be able to grow all the way to the bottom of the
- * next stack.  This isn't fool-proof.  It is possible for a stack to grow by a
- * large amount, such that it grows into the next stack, and as long as the
- * memory within the red zone is never accessed, nothing will prevent one thread
- * stack from trouncing all over the next.
- *
- * low memory
- *     . . . . . . . . . . . . . . . . . . 
- *    |                                   |
- *    |             stack 3               | start of 3rd thread stack
- *    +-----------------------------------+
- *    |                                   |
- *    |       Red Zone (guard page)       | red zone for 2nd thread
- *    |                                   |
- *    +-----------------------------------+
- *    |  stack 2 - _pthread_stack_default | top of 2nd thread stack
- *    |                                   |
- *    |                                   |
- *    |                                   |
- *    |                                   |
- *    |             stack 2               |
- *    +-----------------------------------+ <-- start of 2nd thread stack
- *    |                                   |
- *    |       Red Zone                    | red zone for 1st thread
- *    |                                   |
- *    +-----------------------------------+
- *    |  stack 1 - _pthread_stack_default | top of 1st thread stack
- *    |                                   |
- *    |                                   |
- *    |                                   |
- *    |                                   |
- *    |             stack 1               |
- *    +-----------------------------------+ <-- start of 1st thread stack
- *    |                                   |   (initial value of last_stack)
- *    |       Red Zone                    |
- *    |                                   | red zone for main thread
- *    +-----------------------------------+
- *    | USRSTACK - _pthread_stack_initial | top of main thread stack
- *    |                                   | ^
- *    |                                   | |
- *    |                                   | |
- *    |                                   | | stack growth
- *    |                                   |
- *    +-----------------------------------+ <-- start of main thread stack
- *                                              (USRSTACK)
- * high memory
- *
- */
-static void *	last_stack;
-
-void *
-_thread_stack_alloc(size_t stacksize, size_t guardsize)
-{
-	void		*stack = NULL;
-	struct stack	*spare_stack;
-	size_t		stack_size;
-
-	/*
-	 * Round up stack size to nearest multiple of _pthread_page_size,
-	 * so that mmap() * will work.  If the stack size is not an even
-	 * multiple, we end up initializing things such that there is unused
-	 * space above the beginning of the stack, so the stack sits snugly
-	 * against its guard.
-	 */
-	if (stacksize % _pthread_page_size != 0)
-		stack_size = ((stacksize / _pthread_page_size) + 1) *
-		    _pthread_page_size;
-	else
-		stack_size = stacksize;
-
-	/*
-	 * If the stack and guard sizes are default, try to allocate a stack
-	 * from the default-size stack cache:
-	 */
-	if (stack_size == _pthread_stack_default &&
-	    guardsize == _pthread_guard_default) {
-		/*
-		 * Use the garbage collector mutex for synchronization of the
-		 * spare stack list.
-		 */
-		if (_pthread_mutex_lock(&_gc_mutex) != 0)
-			PANIC("Cannot lock gc mutex");
-
-		if ((spare_stack = LIST_FIRST(&_dstackq)) != NULL) {
-				/* Use the spare stack. */
-			LIST_REMOVE(spare_stack, qe);
-			stack = spare_stack->stackaddr;
-		}
-
-		/* Unlock the garbage collector mutex. */
-		if (_pthread_mutex_unlock(&_gc_mutex) != 0)
-			PANIC("Cannot unlock gc mutex");
-	}
-	/*
-	 * The user specified a non-default stack and/or guard size, so try to
-	 * allocate a stack from the non-default size stack cache, using the
-	 * rounded up stack size (stack_size) in the search:
-	 */
-	else {
-		/*
-		 * Use the garbage collector mutex for synchronization of the
-		 * spare stack list.
-		 */
-		if (_pthread_mutex_lock(&_gc_mutex) != 0)
-			PANIC("Cannot lock gc mutex");
-
-		LIST_FOREACH(spare_stack, &_mstackq, qe) {
-			if (spare_stack->stacksize == stack_size &&
-			    spare_stack->guardsize == guardsize) {
-				LIST_REMOVE(spare_stack, qe);
-				stack = spare_stack->stackaddr;
-				break;
-			}
-		}
-
-		/* Unlock the garbage collector mutex. */
-		if (_pthread_mutex_unlock(&_gc_mutex) != 0)
-			PANIC("Cannot unlock gc mutex");
-	}
-
-	/* Check if a stack was not allocated from a stack cache: */
-	if (stack == NULL) {
-
-		if (last_stack == NULL)
-			last_stack = _usrstack - _pthread_stack_initial -
-			    _pthread_guard_default;
-
-		/* Allocate a new stack. */
-		stack = last_stack - stack_size;
-
-		/*
-		 * Even if stack allocation fails, we don't want to try to use
-		 * this location again, so unconditionally decrement
-		 * last_stack.  Under normal operating conditions, the most
-		 * likely reason for an mmap() error is a stack overflow of the
-		 * adjacent thread stack.
-		 */
-		last_stack -= (stack_size + guardsize);
-
-		/* Stack: */
-		if (mmap(stack, stack_size, PROT_READ | PROT_WRITE, MAP_STACK,
-		    -1, 0) == MAP_FAILED)
-			stack = NULL;
-	}
-
-	return (stack);
-}
-
-/* This function must be called with _gc_mutex held. */
-void
-_thread_stack_free(void *stack, size_t stacksize, size_t guardsize)
-{
-	struct stack	*spare_stack;
-
-	spare_stack = (stack + stacksize - sizeof(struct stack));
-	/* Round stacksize up to nearest multiple of _pthread_page_size. */
-	if (stacksize % _pthread_page_size != 0) {
-		spare_stack->stacksize =
-		    ((stacksize / _pthread_page_size) + 1) *
-		    _pthread_page_size;
-	} else
-		spare_stack->stacksize = stacksize;
-	spare_stack->guardsize = guardsize;
-	spare_stack->stackaddr = stack;
-
-	if (spare_stack->stacksize == _pthread_stack_default &&
-	    spare_stack->guardsize == _pthread_guard_default) {
-		/* Default stack/guard size. */
-		LIST_INSERT_HEAD(&_dstackq, spare_stack, qe);
-	} else {
-		/* Non-default stack/guard size. */
-		LIST_INSERT_HEAD(&_mstackq, spare_stack, qe);
-	}
-}
diff --git a/lib/libc/uthread/uthread_suspend_np.c b/lib/libc/uthread/uthread_suspend_np.c
deleted file mode 100644
index f9dcb05..0000000
--- a/lib/libc/uthread/uthread_suspend_np.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_suspend_np.c,v 1.14 2002/05/24 04:32:28 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-static void	suspend_common(struct pthread *thread);
-
-__weak_reference(_pthread_suspend_np, pthread_suspend_np);
-__weak_reference(_pthread_suspend_all_np, pthread_suspend_all_np);
-
-/* Suspend a thread: */
-int
-_pthread_suspend_np(pthread_t thread)
-{
-	int ret;
-
-	/* Suspending the current thread doesn't make sense. */
-	if (thread == _get_curthread())
-		ret = EDEADLK;
-
-	/* Find the thread in the list of active threads: */
-	else if ((ret = _find_thread(thread)) == 0) {
-		/*
-		 * Defer signals to protect the scheduling queues from
-		 * access by the signal handler:
-		 */
-		_thread_kern_sig_defer();
-
-		suspend_common(thread);
-
-		/*
-		 * Undefer and handle pending signals, yielding if
-		 * necessary:
-		 */
-		_thread_kern_sig_undefer();
-	}
-	return (ret);
-}
-
-void
-_pthread_suspend_all_np(void)
-{
-	struct pthread	*curthread = _get_curthread();
-	struct pthread	*thread;
-
-	/*
-	 * Defer signals to protect the scheduling queues from
-	 * access by the signal handler:
-	 */
-	_thread_kern_sig_defer();
-
-	TAILQ_FOREACH(thread, &_thread_list, tle) {
-		if (thread != curthread)
-			suspend_common(thread);
-	}
-
-	/*
-	 * Undefer and handle pending signals, yielding if
-	 * necessary:
-	 */
-	_thread_kern_sig_undefer();
-}
-
-void
-suspend_common(struct pthread *thread)
-{
-	thread->flags |= PTHREAD_FLAGS_SUSPENDED;
-	if (thread->flags & PTHREAD_FLAGS_IN_PRIOQ) {
-		PTHREAD_PRIOQ_REMOVE(thread);
-		PTHREAD_SET_STATE(thread, PS_SUSPENDED);
-	}
-}
diff --git a/lib/libc/uthread/uthread_switch_np.c b/lib/libc/uthread/uthread_switch_np.c
deleted file mode 100644
index 2e5dde2..0000000
--- a/lib/libc/uthread/uthread_switch_np.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1998 Daniel Eischen <eischen@vigrid.com>.
- * 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 Daniel Eischen.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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/lib/libc_r/uthread/uthread_switch_np.c,v 1.5 2001/04/10 04:19:20 deischen Exp $
- */
-#include <errno.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include "pthread_private.h"
-
-
-__weak_reference(_pthread_switch_add_np, pthread_switch_add_np);
-__weak_reference(_pthread_switch_delete_np, pthread_switch_delete_np);
-
-int
-_pthread_switch_add_np(pthread_switch_routine_t routine)
-{
-	int ret = 0;
-
-	if (routine == NULL)
-		/* Return an invalid argument error: */
-		ret = EINVAL;
-	else
-		/* Shouldn't need a lock to protect this assigment. */
-		_sched_switch_hook = routine;
-
-	return(ret);
-}
-
-int
-_pthread_switch_delete_np(pthread_switch_routine_t routine)
-{
-	int ret = 0;
-
-	if (routine != _sched_switch_hook)
-		/* Return an invalid argument error: */
-		ret = EINVAL;
-	else
-		/* Shouldn't need a lock to protect this assigment. */
-		_sched_switch_hook = NULL;
-
-	return(ret);
-}
diff --git a/lib/libc/uthread/uthread_system.c b/lib/libc/uthread/uthread_system.c
deleted file mode 100644
index 733c366..0000000
--- a/lib/libc/uthread/uthread_system.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_system.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <stdlib.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_system, system);
-
-int
-_system(const char *string)
-{
-	int	ret;
-
-	_thread_enter_cancellation_point();
-	ret = __system(string);
-	_thread_leave_cancellation_point();
-	
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_tcdrain.c b/lib/libc/uthread/uthread_tcdrain.c
deleted file mode 100644
index 4ccccc6..0000000
--- a/lib/libc/uthread/uthread_tcdrain.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_tcdrain.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <termios.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_tcdrain, tcdrain);
-
-int
-_tcdrain(int fd)
-{
-	int	ret;
-	
-	_thread_enter_cancellation_point();
-	ret = __tcdrain(fd);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_vfork.c b/lib/libc/uthread/uthread_vfork.c
deleted file mode 100644
index 87f2aa1..0000000
--- a/lib/libc/uthread/uthread_vfork.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * $FreeBSD: src/lib/libc_r/uthread/uthread_vfork.c,v 1.3 2001/04/10 04:19:20 deischen Exp $
- */
-#include <unistd.h>
-
-__weak_reference(_vfork, vfork);
-
-int
-_vfork(void)
-{
-	return (fork());
-}
diff --git a/lib/libc/uthread/uthread_wait.c b/lib/libc/uthread/uthread_wait.c
deleted file mode 100644
index 7464a0f..0000000
--- a/lib/libc/uthread/uthread_wait.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_wait.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_wait, wait);
-
-pid_t
-_wait(int *istat)
-{
-	pid_t	ret;
-
-	_thread_enter_cancellation_point();
-	ret = __wait(istat);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_wait4.c b/lib/libc/uthread/uthread_wait4.c
deleted file mode 100644
index 3f00ba8..0000000
--- a/lib/libc/uthread/uthread_wait4.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_wait4.c,v 1.14 2002/05/02 19:58:43 archie Exp $
- */
-#include <sys/types.h>
-
-#include <errno.h>
-#include <sys/wait.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__wait4, wait4);
-
-pid_t
-_wait4(pid_t pid, int *istat, int options, struct rusage * rusage)
-{
-	struct pthread	*curthread = _get_curthread();
-	pid_t	ret;
-
-	_thread_kern_sig_defer();
-
-	/* Perform a non-blocking wait4 syscall: */
-	while ((ret = __sys_wait4(pid, istat, options | WNOHANG, rusage)) == 0 && (options & WNOHANG) == 0) {
-		/* Reset the interrupted operation flag: */
-		curthread->interrupted = 0;
-
-		/* Schedule the next thread while this one waits: */
-		_thread_kern_sched_state(PS_WAIT_WAIT, __FILE__, __LINE__);
-
-		/* Check if this call was interrupted by a signal: */
-		if (curthread->interrupted) {
-			errno = EINTR;
-			ret = -1;
-			break;
-		}
-	}
-
-	_thread_kern_sig_undefer();
-
-	return (ret);
-}
-
-pid_t
-__wait4(pid_t pid, int *istat, int options, struct rusage *rusage)
-{
-	pid_t ret;
-
-	_thread_enter_cancellation_point();
-	ret = _wait4(pid, istat, options, rusage);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_waitpid.c b/lib/libc/uthread/uthread_waitpid.c
deleted file mode 100644
index 72ccdc3..0000000
--- a/lib/libc/uthread/uthread_waitpid.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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/lib/libc_r/uthread/uthread_waitpid.c,v 1.4 2001/04/10 04:19:20 deischen Exp $
- */
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_waitpid, waitpid);
-
-pid_t
-_waitpid(pid_t wpid, int *status, int options)
-{
-	pid_t	ret;
-
-	_thread_enter_cancellation_point();
-	ret = __waitpid(wpid, status, options);
-	_thread_leave_cancellation_point();
-	
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_write.c b/lib/libc/uthread/uthread_write.c
deleted file mode 100644
index ff1cd1d..0000000
--- a/lib/libc/uthread/uthread_write.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_write.c,v 1.24 2004/08/14 17:46:10 stefanf Exp $
- *
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/uio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__write, write);
-
-ssize_t
-_write(int fd, const void *buf, size_t nbytes)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	blocking;
-	int	type;
-	ssize_t n;
-	ssize_t num = 0;
-	ssize_t	ret;
-
-	/* POSIX says to do just this: */
-	if (nbytes == 0)
-		return (0);
-
-	/* Lock the file descriptor for write: */
-	if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-		/* Get the read/write mode type: */
-		type = _thread_fd_getflags(fd) & O_ACCMODE;
-type = O_RDWR;
-		/* Check if the file is not open for write: */
-		if (type != O_WRONLY && type != O_RDWR) {
-			/* File is not open for write: */
-			errno = EBADF;
-			_FD_UNLOCK(fd, FD_WRITE);
-			return (-1);
-		}
-
-
-		/* Check if file operations are to block */
-		blocking = ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0);
-
-		/*
-		 * Loop while no error occurs and until the expected number
-		 * of bytes are written if performing a blocking write:
-		 */
-		while (ret == 0) {
-			/* Perform a non-blocking write syscall: */
-			n = __sys_write(fd, (const char *)buf + num,
-			    nbytes - num);
-
-			/* Check if one or more bytes were written: */
-			if (n > 0)
-				/*
-				 * Keep a count of the number of bytes
-				 * written:
-				 */
-				num += n;
-
-			/*
-			 * If performing a blocking write, check if the
-			 * write would have blocked or if some bytes
-			 * were written but there are still more to
-			 * write:
-			 */
-			if (blocking && ((n < 0 && (errno == EWOULDBLOCK ||
-			    errno == EAGAIN)) || (n > 0 && num < nbytes))) {
-				curthread->data.fd.fd = fd;
-				_thread_kern_set_timeout(NULL);
-
-				/* Reset the interrupted operation flag: */
-				curthread->interrupted = 0;
-
-				_thread_kern_sched_state(PS_FDW_WAIT,
-				    __FILE__, __LINE__);
-
-				/*
-				 * Check if the operation was
-				 * interrupted by a signal
-				 */
-				if (curthread->interrupted) {
-					if (num > 0) {
-						/* Return partial success: */
-						ret = num;
-					} else {
-						/* Return an error: */
-						errno = EINTR;
-						ret = -1;
-					}
-				}
-
-			/*
-			 * If performing a non-blocking write,
-			 * just return whatever the write syscall did:
-			 */
-			} else if (!blocking) {
-				/* A non-blocking call might return zero: */
-				ret = n;
-				break;
-
-			/*
-			 * If there was an error, return partial success
-			 * (if any bytes were written) or else the error:
-			 */
-			} else if (n <= 0) {
-				if (num > 0)
-					ret = num;
-				else
-					ret = n;
-				if (n == 0)
-					break;
-
-			/* Check if the write has completed: */
-			} else if (num >= nbytes)
-				/* Return the number of bytes written: */
-				ret = num;
-		}
-		_FD_UNLOCK(fd, FD_WRITE);
-	}
-	return (ret);
-}
-
-ssize_t
-__write(int fd, const void *buf, size_t nbytes)
-{
-	ssize_t	ret;
-
-	_thread_enter_cancellation_point();
-	ret = _write(fd, buf, nbytes);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_writev.c b/lib/libc/uthread/uthread_writev.c
deleted file mode 100644
index fec0f29..0000000
--- a/lib/libc/uthread/uthread_writev.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au>
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_writev.c,v 1.22 2004/08/14 17:46:10 stefanf Exp $
- *
- */
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/uio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(__writev, writev);
-
-ssize_t
-_writev(int fd, const struct iovec * iov, int iovcnt)
-{
-	struct pthread	*curthread = _get_curthread();
-	int	blocking;
-	int	idx = 0;
-	int	type;
-	ssize_t cnt;
-	ssize_t n;
-	ssize_t num = 0;
-	ssize_t	ret;
-	struct iovec liov[20];
-	struct iovec *p_iov = liov;
-
-	/* Check if the array size exceeds to compiled in size: */
-	if (iovcnt > (sizeof(liov) / sizeof(struct iovec))) {
-		/* Allocate memory for the local array: */
-		if ((p_iov = (struct iovec *)
-		    malloc(iovcnt * sizeof(struct iovec))) == NULL) {
-			/* Insufficient memory: */
-			errno = ENOMEM;
-			return (-1);
-		}
-	}
-
-	/* Copy the caller's array so that it can be modified locally: */
-	memcpy(p_iov,iov,iovcnt * sizeof(struct iovec));
-
-	/* Lock the file descriptor for write: */
-	if ((ret = _FD_LOCK(fd, FD_WRITE, NULL)) == 0) {
-		/* Get the read/write mode type: */
-		type = _thread_fd_getflags(fd) & O_ACCMODE;
-
-		/* Check if the file is not open for write: */
-		if (type != O_WRONLY && type != O_RDWR) {
-			/* File is not open for write: */
-			errno = EBADF;
-			_FD_UNLOCK(fd, FD_WRITE);
-			return (-1);
-		}
-
-		/* Check if file operations are to block */
-		blocking = ((_thread_fd_getflags(fd) & O_NONBLOCK) == 0);
-
-		/*
-		 * Loop while no error occurs and until the expected number
-		 * of bytes are written if performing a blocking write:
-		 */
-		while (ret == 0) {
-			/* Perform a non-blocking write syscall: */
-			n = __sys_writev(fd, &p_iov[idx], iovcnt - idx);
-
-			/* Check if one or more bytes were written: */
-			if (n > 0) {
-				/*
-				 * Keep a count of the number of bytes
-				 * written:
-				 */
-				num += n;
-
-				/*
-				 * Enter a loop to check if a short write
-				 * occurred and move the index to the
-				 * array entry where the short write
-				 * ended:
-				 */
-				cnt = n;
-				while (cnt > 0 && idx < iovcnt) {
-					/*
-					 * If the residual count exceeds
-					 * the size of this vector, then
-					 * it was completely written:
-					 */
-					if (cnt >= p_iov[idx].iov_len)
-						/*
-						 * Decrement the residual
-						 * count and increment the
-						 * index to the next array
-						 * entry:
-						 */
-						cnt -= p_iov[idx++].iov_len;
-					else {
-						/*
-						 * This entry was only
-						 * partially written, so
-						 * adjust it's length
-						 * and base pointer ready
-						 * for the next write:
-						 */
-						p_iov[idx].iov_len -= cnt;
-						p_iov[idx].iov_base =
-						    (char *)p_iov[idx].iov_base
-						    + cnt;
-						cnt = 0;
-					}
-				}
-			} else if (n == 0) {
-				/*
-				 * Avoid an infinite loop if the last iov_len is
-				 * 0.
-				 */
-				while (idx < iovcnt && p_iov[idx].iov_len == 0)
-					idx++;
-
-				if (idx == iovcnt) {
-					ret = num;
-					break;
-				}
-			}
-                       
-			/*
-			 * If performing a blocking write, check if the
-			 * write would have blocked or if some bytes
-			 * were written but there are still more to
-			 * write:
-			 */
-			if (blocking && ((n < 0 && (errno == EWOULDBLOCK ||
-			    errno == EAGAIN)) || (n >= 0 && idx < iovcnt))) {
-				curthread->data.fd.fd = fd;
-				_thread_kern_set_timeout(NULL);
-
-				/* Reset the interrupted operation flag: */
-				curthread->interrupted = 0;
-
-				_thread_kern_sched_state(PS_FDW_WAIT,
-				    __FILE__, __LINE__);
-
-				/*
-				 * Check if the operation was
-				 * interrupted by a signal
-				 */
-				if (curthread->interrupted) {
-					if (num > 0) {
-						/* Return partial success: */
-						ret = num;
-					} else {
-						/* Return an error: */
-						errno = EINTR;
-						ret = -1;
-					}
-				}
-
-			/*
-			 * If performing a non-blocking write,
-			 * just return whatever the write syscall did:
-			 */
-			} else if (!blocking) {
-				/* A non-blocking call might return zero: */
-				ret = n;
-				break;
-
-			/*
-			 * If there was an error, return partial success
-			 * (if any bytes were written) or else the error:
-			 */
-			} else if (n < 0) {
-				if (num > 0)
-					ret = num;
-				else
-					ret = n;
-
-			/* Check if the write has completed: */
-			} else if (idx == iovcnt)
-				/* Return the number of bytes written: */
-				ret = num;
-		}
-		_FD_UNLOCK(fd, FD_RDWR);
-	}
-
-	/* If memory was allocated for the array, free it: */
-	if (p_iov != liov)
-		free(p_iov);
-
-	return (ret);
-}
-
-ssize_t
-__writev(int fd, const struct iovec *iov, int iovcnt)
-{
-	ssize_t ret;
-
-	_thread_enter_cancellation_point();
-	ret = _writev(fd, iov, iovcnt);
-	_thread_leave_cancellation_point();
-
-	return ret;
-}
diff --git a/lib/libc/uthread/uthread_yield.c b/lib/libc/uthread/uthread_yield.c
deleted file mode 100644
index 8b34177..0000000
--- a/lib/libc/uthread/uthread_yield.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1995 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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/lib/libc_r/uthread/uthread_yield.c,v 1.7 2001/04/10 04:19:21 deischen Exp $
- */
-#include <pthread.h>
-#include "pthread_private.h"
-
-__weak_reference(_sched_yield, sched_yield);
-__weak_reference(_pthread_yield, pthread_yield);
-
-int
-_sched_yield(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/* Reset the accumulated time slice value for the current thread: */
-	curthread->slice_usec = -1;
-
-	/* Schedule the next thread: */
-	_thread_kern_sched(NULL);
-
-	/* Always return no error. */
-	return(0);
-}
-
-/* Draft 4 yield */
-void
-_pthread_yield(void)
-{
-	struct pthread	*curthread = _get_curthread();
-
-	/* Reset the accumulated time slice value for the current thread: */
-	curthread->slice_usec = -1;
-
-	/* Schedule the next thread: */
-	_thread_kern_sched(NULL);
-}
diff --git a/lib/libc/uuid/Makefile b/lib/libc/uuid/Makefile
deleted file mode 100644
index b2dfb0a..0000000
--- a/lib/libc/uuid/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Objects
-OBJS = uuid_compare.o uuid_create.o uuid_create_nil.o uuid_equal.o uuid_from_string.o uuid_hash.o uuid_is_nil.o uuid_to_string.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/uuid/uuid_compare.c b/lib/libc/uuid/uuid_compare.c
deleted file mode 100644
index 2541184..0000000
--- a/lib/libc/uuid/uuid_compare.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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/lib/libc/uuid/uuid_compare.c,v 1.4 2005/01/03 02:56:15 marcel Exp $
- */
-
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_compare() - compare two UUIDs.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_compare.htm
- *
- * NOTE: Either UUID can be NULL, meaning a nil UUID. nil UUIDs are smaller
- *	 than any non-nil UUID.
- */
-int32_t
-uuid_compare(const uuid_t *a, const uuid_t *b, uint32_t *status)
-{
-	int res;
-
-	if (status != NULL)
-		*status = uuid_s_ok;
-
-	/* Deal with NULL or equal pointers. */
-	if (a == b)
-		return (0);
-	if (a == NULL)
-		return ((uuid_is_nil(b, NULL)) ? 0 : -1);
-	if (b == NULL)
-		return ((uuid_is_nil(a, NULL)) ? 0 : 1);
-
-	/* We have to compare the hard way. */
-	res = (int)((int64_t)a->time_low - (int64_t)b->time_low);
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = (int)a->time_mid - (int)b->time_mid;
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = (int)a->time_hi_and_version - (int)b->time_hi_and_version;
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = (int)a->clock_seq_hi_and_reserved -
-	    (int)b->clock_seq_hi_and_reserved;
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = (int)a->clock_seq_low - (int)b->clock_seq_low;
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	res = memcmp(a->node, b->node, sizeof(a->node));
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	return (0);
-}
diff --git a/lib/libc/uuid/uuid_create.c b/lib/libc/uuid/uuid_create.c
deleted file mode 100644
index 407e371..0000000
--- a/lib/libc/uuid/uuid_create.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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/lib/libc/uuid/uuid_create.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <uuid.h>
-
-/*
- * uuid_create() - create an UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_create.htm
- */
-void
-uuid_create(uuid_t *u, uint32_t *status)
-{
-
-	if (status)
-		*status = uuid_s_ok;
-
-	uuidgen(u, 1);
-}
diff --git a/lib/libc/uuid/uuid_create_nil.c b/lib/libc/uuid/uuid_create_nil.c
deleted file mode 100644
index 0dc6d5d..0000000
--- a/lib/libc/uuid/uuid_create_nil.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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/lib/libc/uuid/uuid_create_nil.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <strings.h>
-#include <uuid.h>
-
-/*
- * uuid_create_nil() - create a nil UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_create_nil.htm
- */
-void
-uuid_create_nil(uuid_t *u, uint32_t *status)
-{
-
-	if (status)
-		*status = uuid_s_ok;
-
-	bzero(u, sizeof(*u));
-}
diff --git a/lib/libc/uuid/uuid_equal.c b/lib/libc/uuid/uuid_equal.c
deleted file mode 100644
index 7c0936b..0000000
--- a/lib/libc/uuid/uuid_equal.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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/lib/libc/uuid/uuid_equal.c,v 1.3 2005/01/03 02:56:15 marcel Exp $
- */
-
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_equal() - compare for equality.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_equal.htm
- */
-int32_t
-uuid_equal(const uuid_t *a, const uuid_t *b, uint32_t *status)
-{
-
-	if (status != NULL)
-		*status = uuid_s_ok;
-
-	/* Deal with equal or NULL pointers. */
-	if (a == b)
-		return (1);
-	if (a == NULL)
-		return (uuid_is_nil(b, NULL));
-	if (b == NULL)
-		return (uuid_is_nil(a, NULL));
-
-	/* Do a byte for byte comparison. */
-	return ((memcmp(a, b, sizeof(uuid_t))) ? 0 : 1);
-}
diff --git a/lib/libc/uuid/uuid_from_string.c b/lib/libc/uuid/uuid_from_string.c
deleted file mode 100644
index a2c7193..0000000
--- a/lib/libc/uuid/uuid_from_string.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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/lib/libc/uuid/uuid_from_string.c,v 1.2 2003/08/08 19:18:43 marcel Exp $
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_from_string() - convert a string representation of an UUID into
- *			a binary representation.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_from_string.htm
- *
- * NOTE: The sequence field is in big-endian, while the time fields are in
- *	 native byte order.
- */
-void
-uuid_from_string(const char *s, uuid_t *u, uint32_t *status)
-{
-	int n;
-
-	/* Short-circuit 2 special cases: NULL pointer and empty string. */
-	if (s == NULL || *s == '\0') {
-		uuid_create_nil(u, status);
-		return;
-	}
-
-	/* Assume the worst. */
-	if (status != NULL)
-		*status = uuid_s_invalid_string_uuid;
-
-	/* The UUID string representation has a fixed length. */
-	if (strlen(s) != 36)
-		return;
-
-	/*
-	 * We only work with "new" UUIDs. New UUIDs have the form:
-	 *	01234567-89ab-cdef-0123-456789abcdef
-	 * The so called "old" UUIDs, which we don't support, have the form:
-	 *	0123456789ab.cd.ef.01.23.45.67.89.ab
-	 */
-	if (s[8] != '-')
-		return;
-
-	n = sscanf(s,
-	    "%8x-%4hx-%4hx-%2hhx%2hhx-%2hhx%2hhx%2hhx%2hhx%2hhx%2hhx",
-	    &u->time_low, &u->time_mid, &u->time_hi_and_version,
-	    &u->clock_seq_hi_and_reserved, &u->clock_seq_low, &u->node[0],
-	    &u->node[1], &u->node[2], &u->node[3], &u->node[4], &u->node[5]);
-
-	/* Make sure we have all conversions. */
-	if (n != 11)
-		return;
-
-	/* We have a successful scan. Check semantics... */
-	n = u->clock_seq_hi_and_reserved;
-	if ((n & 0x80) != 0x00 &&			/* variant 0? */
-	    (n & 0xc0) != 0x80 &&			/* variant 1? */
-	    (n & 0xe0) != 0xc0) {			/* variant 2? */
-		if (status != NULL)
-			*status = uuid_s_bad_version;
-	} else {
-		if (status != NULL)
-			*status = uuid_s_ok;
-	}
-}
diff --git a/lib/libc/uuid/uuid_hash.c b/lib/libc/uuid/uuid_hash.c
deleted file mode 100644
index 81133f8..0000000
--- a/lib/libc/uuid/uuid_hash.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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/lib/libc/uuid/uuid_hash.c,v 1.3 2005/01/03 02:56:15 marcel Exp $
- */
-
-#include <uuid.h>
-
-/*
- * uuid_hash() - generate a hash value.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_hash.htm
- */
-uint16_t
-uuid_hash(const uuid_t *u, uint32_t *status)
-{
-
-	if (status)
-		*status = uuid_s_ok;
-
-	/*
-	 * Use the most frequently changing bits in the UUID as the hash
-	 * value. This should yield a good enough distribution...
-	 */
-	return ((u) ? u->time_low & 0xffff : 0);
-}
diff --git a/lib/libc/uuid/uuid_is_nil.c b/lib/libc/uuid/uuid_is_nil.c
deleted file mode 100644
index 4d35d87..0000000
--- a/lib/libc/uuid/uuid_is_nil.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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/lib/libc/uuid/uuid_is_nil.c,v 1.4 2005/05/11 13:18:10 delphij Exp $
- */
-
-#include <uuid.h>
-
-/*
- * uuid_is_nil() - return whether the UUID is a nil UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_is_nil.htm
- */
-int32_t
-uuid_is_nil(const uuid_t *u, uint32_t *status)
-{
-	const uint32_t *p;
-
-	if (status)
-		*status = uuid_s_ok;
-
-	if (!u)
-		return (1);
-
-	/*
-	 * Pick the largest type that has equivalent alignment constraints
-	 * as an UUID and use it to test if the UUID consists of all zeroes.
-	 */
-	p = (const uint32_t*)u;
-	return ((p[0] == 0 && p[1] == 0 && p[2] == 0 && p[3] == 0) ? 1 : 0);
-}
diff --git a/lib/libc/uuid/uuid_to_string.c b/lib/libc/uuid/uuid_to_string.c
deleted file mode 100644
index f524b48..0000000
--- a/lib/libc/uuid/uuid_to_string.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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/lib/libc/uuid/uuid_to_string.c,v 1.3 2005/01/03 02:56:15 marcel Exp $
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_to_string() - Convert a binary UUID into a string representation.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_to_string.htm
- *
- * NOTE: The references given above do not have a status code for when
- *	 the string could not be allocated. The status code has been
- *	 taken from the Hewlett-Packard implementation.
- */
-void
-uuid_to_string(const uuid_t *u, char **s, uint32_t *status)
-{
-	uuid_t nil;
-
-	if (status != NULL)
-		*status = uuid_s_ok;
-
-	/* Why allow a NULL-pointer here? */
-	if (s == 0)
-		return;
-
-	if (u == NULL) {
-		u = &nil;
-		uuid_create_nil(&nil, NULL);
-	}
-
-	asprintf(s, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-	    u->time_low, u->time_mid, u->time_hi_and_version,
-	    u->clock_seq_hi_and_reserved, u->clock_seq_low, u->node[0],
-	    u->node[1], u->node[2], u->node[3], u->node[4], u->node[5]);
-
-	if (*s == NULL && status != NULL)
-		*status = uuid_s_no_memory;
-}
diff --git a/lib/libc/xdr/Makefile b/lib/libc/xdr/Makefile
deleted file mode 100644
index ec5017d..0000000
--- a/lib/libc/xdr/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../rpc
-
-#Objects
-OBJS = crypt_clnt.o crypt_xdr.o xdr.o xdr_array.o xdr_float.o xdr_mem.o xdr_rec.o xdr_reference.o xdr_sizeof.o xdr_stdio.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/xdr/crypt.h b/lib/libc/xdr/crypt.h
deleted file mode 100644
index 8272db2..0000000
--- a/lib/libc/xdr/crypt.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _CRYPT_H_RPCGEN
-#define	_CRYPT_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-enum des_dir {
-	ENCRYPT_DES = 0,
-	DECRYPT_DES = 1
-};
-typedef enum des_dir des_dir;
-
-enum des_mode {
-	CBC_DES = 0,
-	ECB_DES = 1
-};
-typedef enum des_mode des_mode;
-
-struct desargs {
-	u_char des_key[8];
-	des_dir des_dir;
-	des_mode des_mode;
-	u_char des_ivec[8];
-	struct {
-		u_int desbuf_len;
-		char *desbuf_val;
-	} desbuf;
-};
-typedef struct desargs desargs;
-
-struct desresp {
-	struct {
-		u_int desbuf_len;
-		char *desbuf_val;
-	} desbuf;
-	u_char des_ivec[8];
-	int stat;
-};
-typedef struct desresp desresp;
-
-#define	CRYPT_PROG ((unsigned long)(600100029))
-#define	CRYPT_VERS ((unsigned long)(1))
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  void crypt_prog_1(struct svc_req *rqstp, register SVCXPRT *transp);
-#define	DES_CRYPT ((unsigned long)(1))
-extern  desresp * des_crypt_1(desargs *, CLIENT *);
-extern  desresp * des_crypt_1_svc(desargs *, struct svc_req *);
-extern int crypt_prog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-extern  void crypt_prog_1();
-#define	DES_CRYPT ((unsigned long)(1))
-extern  desresp * des_crypt_1();
-extern  desresp * des_crypt_1_svc();
-extern int crypt_prog_1_freeresult();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_des_dir(XDR *, des_dir*);
-extern  bool_t xdr_des_mode(XDR *, des_mode*);
-extern  bool_t xdr_desargs(XDR *, desargs*);
-extern  bool_t xdr_desresp(XDR *, desresp*);
-
-#else /* K&R C */
-extern bool_t xdr_des_dir();
-extern bool_t xdr_des_mode();
-extern bool_t xdr_desargs();
-extern bool_t xdr_desresp();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_CRYPT_H_RPCGEN */
diff --git a/lib/libc/xdr/crypt_clnt.c b/lib/libc/xdr/crypt_clnt.c
deleted file mode 100644
index 0c00944..0000000
--- a/lib/libc/xdr/crypt_clnt.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <string.h> /* for memset */
-#include "crypt.h"
-#include <sys/cdefs.h>
-
-/* Default timeout can be changed using clnt_control() */
-static struct timeval TIMEOUT = { 25, 0 };
-
-desresp *
-des_crypt_1(desargs *argp, CLIENT *clnt)
-{
-	static desresp clnt_res;
-
-	memset((char *)&clnt_res, 0, sizeof (clnt_res));
-	if (clnt_call(clnt, DES_CRYPT,
-		(xdrproc_t) xdr_desargs, (caddr_t) argp,
-		(xdrproc_t) xdr_desresp, (caddr_t) &clnt_res,
-		TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&clnt_res);
-}
diff --git a/lib/libc/xdr/crypt_xdr.c b/lib/libc/xdr/crypt_xdr.c
deleted file mode 100644
index 4bbe927..0000000
--- a/lib/libc/xdr/crypt_xdr.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "crypt.h"
-#include <sys/cdefs.h>
-
-bool_t
-xdr_des_dir(register XDR *xdrs, des_dir *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_des_mode(register XDR *xdrs, des_mode *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_desargs(register XDR *xdrs, desargs *objp)
-{
-
-	if (!xdr_vector(xdrs, (char *)objp->des_key, 8,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
-		return (FALSE);
-	if (!xdr_des_dir(xdrs, &objp->des_dir))
-		return (FALSE);
-	if (!xdr_des_mode(xdrs, &objp->des_mode))
-		return (FALSE);
-	if (!xdr_vector(xdrs, (char *)objp->des_ivec, 8,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
-		return (FALSE);
-	if (!xdr_bytes(xdrs, (char **)&objp->desbuf.desbuf_val, (u_int *) &objp->desbuf.desbuf_len, ~0))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_desresp(register XDR *xdrs, desresp *objp)
-{
-
-	if (!xdr_bytes(xdrs, (char **)&objp->desbuf.desbuf_val, (u_int *) &objp->desbuf.desbuf_len, ~0))
-		return (FALSE);
-	if (!xdr_vector(xdrs, (char *)objp->des_ivec, 8,
-		sizeof (u_char), (xdrproc_t) xdr_u_char))
-		return (FALSE);
-	if (!xdr_int(xdrs, &objp->stat))
-		return (FALSE);
-	return (TRUE);
-}
diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c
deleted file mode 100644
index 204e292..0000000
--- a/lib/libc/xdr/xdr.c
+++ /dev/null
@@ -1,872 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr.c 1.35 87/08/12";
-static char *sccsid = "@(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-
-/*
- * xdr.c, Generic XDR routines implementation.
- *
- * Copyright (C) 1986, Sun Microsystems, Inc.
- *
- * These are the "generic" xdr routines used to serialize and de-serialize
- * most common data items.  See xdr.h for more info on the interface to
- * xdr.
- */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-typedef quad_t          longlong_t;     /* ANSI long long type */
-typedef u_quad_t        u_longlong_t;   /* ANSI unsigned long long type */
-
-/*
- * constants specific to the xdr "protocol"
- */
-#define XDR_FALSE	((long) 0)
-#define XDR_TRUE	((long) 1)
-#define LASTUNSIGNED	((u_int) 0-1)
-
-/*
- * for unit alignment
- */
-static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
-
-/*
- * Free a data structure using XDR
- * Not a filter, but a convenient utility nonetheless
- */
-void
-xdr_free(proc, objp)
-	xdrproc_t proc;
-	void *objp;
-{
-	XDR x;
-	
-	x.x_op = XDR_FREE;
-	(*proc)(&x, objp);
-}
-
-/*
- * XDR nothing
- */
-bool_t
-xdr_void(void)
-{
-
-	return (TRUE);
-}
-
-
-/*
- * XDR integers
- */
-bool_t
-xdr_int(xdrs, ip)
-	XDR *xdrs;
-	int *ip;
-{
-	long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *ip;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*ip = (int) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned integers
- */
-bool_t
-xdr_u_int(xdrs, up)
-	XDR *xdrs;
-	u_int *up;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *up;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*up = (u_int) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR long integers
- * same as xdr_u_long - open coded to save a proc call!
- */
-bool_t
-xdr_long(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		return (XDR_PUTLONG(xdrs, lp));
-	case XDR_DECODE:
-		return (XDR_GETLONG(xdrs, lp));
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned long integers
- * same as xdr_long - open coded to save a proc call!
- */
-bool_t
-xdr_u_long(xdrs, ulp)
-	XDR *xdrs;
-	u_long *ulp;
-{
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		return (XDR_PUTLONG(xdrs, (long *)ulp));
-	case XDR_DECODE:
-		return (XDR_GETLONG(xdrs, (long *)ulp));
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR 32-bit integers
- * same as xdr_uint32_t - open coded to save a proc call!
- */
-bool_t
-xdr_int32_t(xdrs, int32_p)
-	XDR *xdrs;
-	int32_t *int32_p;
-{
-	long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *int32_p;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*int32_p = (int32_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned 32-bit integers
- * same as xdr_int32_t - open coded to save a proc call!
- */
-bool_t
-xdr_uint32_t(xdrs, u_int32_p)
-	XDR *xdrs;
-	uint32_t *u_int32_p;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *u_int32_p;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*u_int32_p = (uint32_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR short integers
- */
-bool_t
-xdr_short(xdrs, sp)
-	XDR *xdrs;
-	short *sp;
-{
-	long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *sp;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*sp = (short) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned short integers
- */
-bool_t
-xdr_u_short(xdrs, usp)
-	XDR *xdrs;
-	u_short *usp;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *usp;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*usp = (u_short) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR 16-bit integers
- */
-bool_t
-xdr_int16_t(xdrs, int16_p)
-	XDR *xdrs;
-	int16_t *int16_p;
-{
-	long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *int16_p;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*int16_p = (int16_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned 16-bit integers
- */
-bool_t
-xdr_u_int16_t(xdrs, u_int16_p)
-	XDR *xdrs;
-	u_int16_t *u_int16_p;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *u_int16_p;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*u_int16_p = (u_int16_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR a char
- */
-bool_t
-xdr_char(xdrs, cp)
-	XDR *xdrs;
-	char *cp;
-{
-	int i;
-
-	i = (*cp);
-	if (!xdr_int(xdrs, &i)) {
-		return (FALSE);
-	}
-	*cp = i;
-	return (TRUE);
-}
-
-/*
- * XDR an unsigned char
- */
-bool_t
-xdr_u_char(xdrs, cp)
-	XDR *xdrs;
-	u_char *cp;
-{
-	u_int u;
-
-	u = (*cp);
-	if (!xdr_u_int(xdrs, &u)) {
-		return (FALSE);
-	}
-	*cp = u;
-	return (TRUE);
-}
-
-/*
- * XDR booleans
- */
-bool_t
-xdr_bool(xdrs, bp)
-	XDR *xdrs;
-	bool_t *bp;
-{
-	long lb;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		lb = *bp ? XDR_TRUE : XDR_FALSE;
-		return (XDR_PUTLONG(xdrs, &lb));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &lb)) {
-			return (FALSE);
-		}
-		*bp = (lb == XDR_FALSE) ? FALSE : TRUE;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR enumerations
- */
-bool_t
-xdr_enum(xdrs, ep)
-	XDR *xdrs;
-	enum_t *ep;
-{
-	enum sizecheck { SIZEVAL };	/* used to find the size of an enum */
-
-	/*
-	 * enums are treated as ints
-	 */
-	/* LINTED */ if (sizeof (enum sizecheck) == sizeof (long)) {
-		return (xdr_long(xdrs, (long *)(void *)ep));
-	} else /* LINTED */ if (sizeof (enum sizecheck) == sizeof (int)) {
-		return (xdr_int(xdrs, (int *)(void *)ep));
-	} else /* LINTED */ if (sizeof (enum sizecheck) == sizeof (short)) {
-		return (xdr_short(xdrs, (short *)(void *)ep));
-	} else {
-		return (FALSE);
-	}
-}
-
-/*
- * XDR opaque data
- * Allows the specification of a fixed size sequence of opaque bytes.
- * cp points to the opaque object and cnt gives the byte length.
- */
-bool_t
-xdr_opaque(xdrs, cp, cnt)
-	XDR *xdrs;
-	caddr_t cp;
-	u_int cnt;
-{
-	u_int rndup;
-	static int crud[BYTES_PER_XDR_UNIT];
-
-	/*
-	 * if no data we are done
-	 */
-	if (cnt == 0)
-		return (TRUE);
-
-	/*
-	 * round byte count to full xdr units
-	 */
-	rndup = cnt % BYTES_PER_XDR_UNIT;
-	if (rndup > 0)
-		rndup = BYTES_PER_XDR_UNIT - rndup;
-
-	if (xdrs->x_op == XDR_DECODE) {
-		if (!XDR_GETBYTES(xdrs, cp, cnt)) {
-			return (FALSE);
-		}
-		if (rndup == 0)
-			return (TRUE);
-		return (XDR_GETBYTES(xdrs, (caddr_t)(void *)crud, rndup));
-	}
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		if (!XDR_PUTBYTES(xdrs, cp, cnt)) {
-			return (FALSE);
-		}
-		if (rndup == 0)
-			return (TRUE);
-		return (XDR_PUTBYTES(xdrs, xdr_zero, rndup));
-	}
-
-	if (xdrs->x_op == XDR_FREE) {
-		return (TRUE);
-	}
-
-	return (FALSE);
-}
-
-/*
- * XDR counted bytes
- * *cpp is a pointer to the bytes, *sizep is the count.
- * If *cpp is NULL maxsize bytes are allocated
- */
-bool_t
-xdr_bytes(xdrs, cpp, sizep, maxsize)
-	XDR *xdrs;
-	char **cpp;
-	u_int *sizep;
-	u_int maxsize;
-{
-	char *sp = *cpp;  /* sp is the actual string pointer */
-	u_int nodesize;
-
-	/*
-	 * first deal with the length since xdr bytes are counted
-	 */
-	if (! xdr_u_int(xdrs, sizep)) {
-		return (FALSE);
-	}
-	nodesize = *sizep;
-	if ((nodesize > maxsize) && (xdrs->x_op != XDR_FREE)) {
-		return (FALSE);
-	}
-
-	/*
-	 * now deal with the actual bytes
-	 */
-	switch (xdrs->x_op) {
-
-	case XDR_DECODE:
-		if (nodesize == 0) {
-			return (TRUE);
-		}
-		if (sp == NULL) {
-			*cpp = sp = mem_alloc(nodesize);
-		}
-		if (sp == NULL) {
-			warnx("xdr_bytes: out of memory");
-			return (FALSE);
-		}
-		/* FALLTHROUGH */
-
-	case XDR_ENCODE:
-		return (xdr_opaque(xdrs, sp, nodesize));
-
-	case XDR_FREE:
-		if (sp != NULL) {
-			mem_free(sp, nodesize);
-			*cpp = NULL;
-		}
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * Implemented here due to commonality of the object.
- */
-bool_t
-xdr_netobj(xdrs, np)
-	XDR *xdrs;
-	struct netobj *np;
-{
-
-	return (xdr_bytes(xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
-}
-
-/*
- * XDR a descriminated union
- * Support routine for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * an entry with a null procedure pointer.  The routine gets
- * the discriminant value and then searches the array of xdrdiscrims
- * looking for that value.  It calls the procedure given in the xdrdiscrim
- * to handle the discriminant.  If there is no specific routine a default
- * routine may be called.
- * If there is no specific or default routine an error is returned.
- */
-bool_t
-xdr_union(xdrs, dscmp, unp, choices, dfault)
-	XDR *xdrs;
-	enum_t *dscmp;		/* enum to decide which arm to work on */
-	char *unp;		/* the union itself */
-	const struct xdr_discrim *choices;	/* [value, xdr proc] for each arm */
-	xdrproc_t dfault;	/* default xdr routine */
-{
-	enum_t dscm;
-
-	/*
-	 * we deal with the discriminator;  it's an enum
-	 */
-	if (! xdr_enum(xdrs, dscmp)) {
-		return (FALSE);
-	}
-	dscm = *dscmp;
-
-	/*
-	 * search choices for a value that matches the discriminator.
-	 * if we find one, execute the xdr routine for that value.
-	 */
-	for (; choices->proc != NULL_xdrproc_t; choices++) {
-		if (choices->value == dscm)
-			return ((*(choices->proc))(xdrs, unp));
-	}
-
-	/*
-	 * no match - execute the default xdr routine if there is one
-	 */
-	return ((dfault == NULL_xdrproc_t) ? FALSE :
-	    (*dfault)(xdrs, unp));
-}
-
-
-/*
- * Non-portable xdr primitives.
- * Care should be taken when moving these routines to new architectures.
- */
-
-
-/*
- * XDR null terminated ASCII strings
- * xdr_string deals with "C strings" - arrays of bytes that are
- * terminated by a NULL character.  The parameter cpp references a
- * pointer to storage; If the pointer is null, then the necessary
- * storage is allocated.  The last parameter is the max allowed length
- * of the string as specified by a protocol.
- */
-bool_t
-xdr_string(xdrs, cpp, maxsize)
-	XDR *xdrs;
-	char **cpp;
-	u_int maxsize;
-{
-	char *sp = *cpp;  /* sp is the actual string pointer */
-	u_int size;
-	u_int nodesize;
-
-	/*
-	 * first deal with the length since xdr strings are counted-strings
-	 */
-	switch (xdrs->x_op) {
-	case XDR_FREE:
-		if (sp == NULL) {
-			return(TRUE);	/* already free */
-		}
-		/* FALLTHROUGH */
-	case XDR_ENCODE:
-		size = strlen(sp);
-		break;
-	case XDR_DECODE:
-		break;
-	}
-	if (! xdr_u_int(xdrs, &size)) {
-		return (FALSE);
-	}
-	if (size > maxsize) {
-		return (FALSE);
-	}
-	nodesize = size + 1;
-
-	/*
-	 * now deal with the actual bytes
-	 */
-	switch (xdrs->x_op) {
-
-	case XDR_DECODE:
-		if (nodesize == 0) {
-			return (TRUE);
-		}
-		if (sp == NULL)
-			*cpp = sp = mem_alloc(nodesize);
-		if (sp == NULL) {
-			warnx("xdr_string: out of memory");
-			return (FALSE);
-		}
-		sp[size] = 0;
-		/* FALLTHROUGH */
-
-	case XDR_ENCODE:
-		return (xdr_opaque(xdrs, sp, size));
-
-	case XDR_FREE:
-		mem_free(sp, nodesize);
-		*cpp = NULL;
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/* 
- * Wrapper for xdr_string that can be called directly from 
- * routines like clnt_call
- */
-bool_t
-xdr_wrapstring(xdrs, cpp)
-	XDR *xdrs;
-	char **cpp;
-{
-	return xdr_string(xdrs, cpp, LASTUNSIGNED);
-}
-
-/*
- * NOTE: xdr_hyper(), xdr_u_hyper(), xdr_longlong_t(), and xdr_u_longlong_t()
- * are in the "non-portable" section because they require that a `long long'
- * be a 64-bit type.
- *
- *	--thorpej@netbsd.org, November 30, 1999
- */
-
-/*
- * XDR 64-bit integers
- */
-bool_t
-xdr_int64_t(xdrs, llp)
-	XDR *xdrs;
-	int64_t *llp;
-{
-	u_long ul[2];
-
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		ul[0] = (u_long)((u_int64_t)*llp >> 32) & 0xffffffff;
-		ul[1] = (u_long)((u_int64_t)*llp) & 0xffffffff;
-		if (XDR_PUTLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		return (XDR_PUTLONG(xdrs, (long *)&ul[1]));
-	case XDR_DECODE:
-		if (XDR_GETLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		if (XDR_GETLONG(xdrs, (long *)&ul[1]) == FALSE)
-			return (FALSE);
-		*llp = (int64_t)
-		    (((u_int64_t)ul[0] << 32) | ((u_int64_t)ul[1]));
-		return (TRUE);
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR unsigned 64-bit integers
- */
-bool_t
-xdr_u_int64_t(xdrs, ullp)
-	XDR *xdrs;
-	u_int64_t *ullp;
-{
-	u_long ul[2];
-
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		ul[0] = (u_long)(*ullp >> 32) & 0xffffffff;
-		ul[1] = (u_long)(*ullp) & 0xffffffff;
-		if (XDR_PUTLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		return (XDR_PUTLONG(xdrs, (long *)&ul[1]));
-	case XDR_DECODE:
-		if (XDR_GETLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		if (XDR_GETLONG(xdrs, (long *)&ul[1]) == FALSE)
-			return (FALSE);
-		*ullp = (u_int64_t)
-		    (((u_int64_t)ul[0] << 32) | ((u_int64_t)ul[1]));
-		return (TRUE);
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR hypers
- */
-bool_t
-xdr_hyper(xdrs, llp)
-	XDR *xdrs;
-	longlong_t *llp;
-{
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_int64_t().
-	 */
-	return (xdr_int64_t(xdrs, (int64_t *)llp));
-}
-
-
-/*
- * XDR unsigned hypers
- */
-bool_t
-xdr_u_hyper(xdrs, ullp)
-	XDR *xdrs;
-	u_longlong_t *ullp;
-{
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_u_int64_t().
-	 */
-	return (xdr_u_int64_t(xdrs, (u_int64_t *)ullp));
-}
-
-
-/*
- * XDR longlong_t's
- */
-bool_t
-xdr_longlong_t(xdrs, llp)
-	XDR *xdrs;
-	longlong_t *llp;
-{
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_int64_t().
-	 */
-	return (xdr_int64_t(xdrs, (int64_t *)llp));
-}
-
-
-/*
- * XDR u_longlong_t's
- */
-bool_t
-xdr_u_longlong_t(xdrs, ullp)
-	XDR *xdrs;
-	u_longlong_t *ullp;
-{
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_u_int64_t().
-	 */
-	return (xdr_u_int64_t(xdrs, (u_int64_t *)ullp));
-}
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
deleted file mode 100644
index dbe4930..0000000
--- a/lib/libc/xdr/xdr_array.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-
-/*
- * xdr_array.c, Generic XDR routines impelmentation.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * These are the "non-trivial" xdr primitives used to serialize and de-serialize
- * arrays.  See xdr.h for more info on the interface to xdr.
- */
-
-#include "namespace.h"
-#include <err.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-/*
- * XDR an array of arbitrary elements
- * *addrp is a pointer to the array, *sizep is the number of elements.
- * If addrp is NULL (*sizep * elsize) bytes are allocated.
- * elsize is the size (in bytes) of each element, and elproc is the
- * xdr procedure to call to handle each element of the array.
- */
-bool_t
-xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc)
-	XDR *xdrs;
-	caddr_t *addrp;		/* array pointer */
-	u_int *sizep;		/* number of elements */
-	u_int maxsize;		/* max numberof elements */
-	u_int elsize;		/* size in bytes of each element */
-	xdrproc_t elproc;	/* xdr routine to handle each element */
-{
-	u_int i;
-	caddr_t target = *addrp;
-	u_int c;  /* the actual element count */
-	bool_t stat = TRUE;
-	u_int nodesize;
-
-	/* like strings, arrays are really counted arrays */
-	if (!xdr_u_int(xdrs, sizep)) {
-		return (FALSE);
-	}
-	c = *sizep;
-	if ((c > maxsize || UINT_MAX/elsize < c) &&
-	    (xdrs->x_op != XDR_FREE)) {
-		return (FALSE);
-	}
-	nodesize = c * elsize;
-
-	/*
-	 * if we are deserializing, we may need to allocate an array.
-	 * We also save time by checking for a null array if we are freeing.
-	 */
-	if (target == NULL)
-		switch (xdrs->x_op) {
-		case XDR_DECODE:
-			if (c == 0)
-				return (TRUE);
-			*addrp = target = mem_alloc(nodesize);
-			if (target == NULL) {
-				warnx("xdr_array: out of memory");
-				return (FALSE);
-			}
-			memset(target, 0, nodesize);
-			break;
-
-		case XDR_FREE:
-			return (TRUE);
-
-		case XDR_ENCODE:
-			break;
-	}
-	
-	/*
-	 * now we xdr each element of array
-	 */
-	for (i = 0; (i < c) && stat; i++) {
-		stat = (*elproc)(xdrs, target);
-		target += elsize;
-	}
-
-	/*
-	 * the array may need freeing
-	 */
-	if (xdrs->x_op == XDR_FREE) {
-		mem_free(*addrp, nodesize);
-		*addrp = NULL;
-	}
-	return (stat);
-}
-
-/*
- * xdr_vector():
- *
- * XDR a fixed length array. Unlike variable-length arrays,
- * the storage of fixed length arrays is static and unfreeable.
- * > basep: base of the array
- * > size: size of the array
- * > elemsize: size of each element
- * > xdr_elem: routine to XDR each element
- */
-bool_t
-xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem)
-	XDR *xdrs;
-	char *basep;
-	u_int nelem;
-	u_int elemsize;
-	xdrproc_t xdr_elem;	
-{
-	u_int i;
-	char *elptr;
-
-	elptr = basep;
-	for (i = 0; i < nelem; i++) {
-		if (!(*xdr_elem)(xdrs, elptr)) {
-			return(FALSE);
-		}
-		elptr += elemsize;
-	}
-	return(TRUE);	
-}
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
deleted file mode 100644
index e832bd5..0000000
--- a/lib/libc/xdr/xdr_float.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-
-/*
- * xdr_float.c, Generic XDR routines implementation.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * These are the "floating point" xdr routines used to (de)serialize
- * most common data items.  See xdr.h for more info on the interface to
- * xdr.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <stdio.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-/*
- * NB: Not portable.
- * This routine works on machines with IEEE754 FP and Vaxen.
- */
-
-#if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
-    defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
-    defined(__arm__) || defined(__ppc__) || defined(__ia64__) || \
-    defined(__arm26__) || defined(__sparc64__) || defined(__amd64__)
-#include <machine/endian.h>
-#define IEEEFP
-#endif
-
-#if defined(__vax__)
-
-/* What IEEE single precision floating point looks like on a Vax */
-struct	ieee_single {
-	unsigned int	mantissa: 23;
-	unsigned int	exp     : 8;
-	unsigned int	sign    : 1;
-};
-
-/* Vax single precision floating point */
-struct	vax_single {
-	unsigned int	mantissa1 : 7;
-	unsigned int	exp       : 8;
-	unsigned int	sign      : 1;
-	unsigned int	mantissa2 : 16;
-};
-
-#define VAX_SNG_BIAS	0x81
-#define IEEE_SNG_BIAS	0x7f
-
-static struct sgl_limits {
-	struct vax_single s;
-	struct ieee_single ieee;
-} sgl_limits[2] = {
-	{{ 0x7f, 0xff, 0x0, 0xffff },	/* Max Vax */
-	{ 0x0, 0xff, 0x0 }},		/* Max IEEE */
-	{{ 0x0, 0x0, 0x0, 0x0 },	/* Min Vax */
-	{ 0x0, 0x0, 0x0 }}		/* Min IEEE */
-};
-#endif /* vax */
-
-bool_t
-xdr_float(xdrs, fp)
-	XDR *xdrs;
-	float *fp;
-{
-#ifndef IEEEFP
-	struct ieee_single is;
-	struct vax_single vs, *vsp;
-	struct sgl_limits *lim;
-	int i;
-#endif
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-#ifdef IEEEFP
-		return (XDR_PUTINT32(xdrs, (int32_t *)fp));
-#else
-		vs = *((struct vax_single *)fp);
-		for (i = 0, lim = sgl_limits;
-			i < sizeof(sgl_limits)/sizeof(struct sgl_limits);
-			i++, lim++) {
-			if ((vs.mantissa2 == lim->s.mantissa2) &&
-				(vs.exp == lim->s.exp) &&
-				(vs.mantissa1 == lim->s.mantissa1)) {
-				is = lim->ieee;
-				goto shipit;
-			}
-		}
-		is.exp = vs.exp - VAX_SNG_BIAS + IEEE_SNG_BIAS;
-		is.mantissa = (vs.mantissa1 << 16) | vs.mantissa2;
-	shipit:
-		is.sign = vs.sign;
-		return (XDR_PUTINT32(xdrs, (int32_t *)&is));
-#endif
-
-	case XDR_DECODE:
-#ifdef IEEEFP
-		return (XDR_GETINT32(xdrs, (int32_t *)fp));
-#else
-		vsp = (struct vax_single *)fp;
-		if (!XDR_GETINT32(xdrs, (int32_t *)&is))
-			return (FALSE);
-		for (i = 0, lim = sgl_limits;
-			i < sizeof(sgl_limits)/sizeof(struct sgl_limits);
-			i++, lim++) {
-			if ((is.exp == lim->ieee.exp) &&
-				(is.mantissa == lim->ieee.mantissa)) {
-				*vsp = lim->s;
-				goto doneit;
-			}
-		}
-		vsp->exp = is.exp - IEEE_SNG_BIAS + VAX_SNG_BIAS;
-		vsp->mantissa2 = is.mantissa;
-		vsp->mantissa1 = (is.mantissa >> 16);
-	doneit:
-		vsp->sign = is.sign;
-		return (TRUE);
-#endif
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-#if defined(__vax__)
-/* What IEEE double precision floating point looks like on a Vax */
-struct	ieee_double {
-	unsigned int	mantissa1 : 20;
-	unsigned int	exp       : 11;
-	unsigned int	sign      : 1;
-	unsigned int	mantissa2 : 32;
-};
-
-/* Vax double precision floating point */
-struct  vax_double {
-	unsigned int	mantissa1 : 7;
-	unsigned int	exp       : 8;
-	unsigned int	sign      : 1;
-	unsigned int	mantissa2 : 16;
-	unsigned int	mantissa3 : 16;
-	unsigned int	mantissa4 : 16;
-};
-
-#define VAX_DBL_BIAS	0x81
-#define IEEE_DBL_BIAS	0x3ff
-#define MASK(nbits)	((1 << nbits) - 1)
-
-static struct dbl_limits {
-	struct	vax_double d;
-	struct	ieee_double ieee;
-} dbl_limits[2] = {
-	{{ 0x7f, 0xff, 0x0, 0xffff, 0xffff, 0xffff },	/* Max Vax */
-	{ 0x0, 0x7ff, 0x0, 0x0 }},			/* Max IEEE */
-	{{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},		/* Min Vax */
-	{ 0x0, 0x0, 0x0, 0x0 }}				/* Min IEEE */
-};
-
-#endif /* vax */
-
-
-bool_t
-xdr_double(xdrs, dp)
-	XDR *xdrs;
-	double *dp;
-{
-#ifdef IEEEFP
-	int32_t *i32p;
-	bool_t rv;
-#else
-	int32_t *lp;
-	struct	ieee_double id;
-	struct	vax_double vd;
-	struct dbl_limits *lim;
-	int i;
-#endif
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-#ifdef IEEEFP
-		i32p = (int32_t *)(void *)dp;
-#if BYTE_ORDER == BIG_ENDIAN
-		rv = XDR_PUTINT32(xdrs, i32p);
-		if (!rv)
-			return (rv);
-		rv = XDR_PUTINT32(xdrs, i32p+1);
-#else
-		rv = XDR_PUTINT32(xdrs, i32p+1);
-		if (!rv)
-			return (rv);
-		rv = XDR_PUTINT32(xdrs, i32p);
-#endif
-		return (rv);
-#else
-		vd = *((struct vax_double *)dp);
-		for (i = 0, lim = dbl_limits;
-			i < sizeof(dbl_limits)/sizeof(struct dbl_limits);
-			i++, lim++) {
-			if ((vd.mantissa4 == lim->d.mantissa4) &&
-				(vd.mantissa3 == lim->d.mantissa3) &&
-				(vd.mantissa2 == lim->d.mantissa2) &&
-				(vd.mantissa1 == lim->d.mantissa1) &&
-				(vd.exp == lim->d.exp)) {
-				id = lim->ieee;
-				goto shipit;
-			}
-		}
-		id.exp = vd.exp - VAX_DBL_BIAS + IEEE_DBL_BIAS;
-		id.mantissa1 = (vd.mantissa1 << 13) | (vd.mantissa2 >> 3);
-		id.mantissa2 = ((vd.mantissa2 & MASK(3)) << 29) |
-				(vd.mantissa3 << 13) |
-				((vd.mantissa4 >> 3) & MASK(13));
-	shipit:
-		id.sign = vd.sign;
-		lp = (int32_t *)&id;
-		return (XDR_PUTINT32(xdrs, lp++) && XDR_PUTINT32(xdrs, lp));
-#endif
-
-	case XDR_DECODE:
-#ifdef IEEEFP
-		i32p = (int32_t *)(void *)dp;
-#if BYTE_ORDER == BIG_ENDIAN
-		rv = XDR_GETINT32(xdrs, i32p);
-		if (!rv)
-			return (rv);
-		rv = XDR_GETINT32(xdrs, i32p+1);
-#else
-		rv = XDR_GETINT32(xdrs, i32p+1);
-		if (!rv)
-			return (rv);
-		rv = XDR_GETINT32(xdrs, i32p);
-#endif
-		return (rv);
-#else
-		lp = (int32_t *)&id;
-		if (!XDR_GETINT32(xdrs, lp++) || !XDR_GETINT32(xdrs, lp))
-			return (FALSE);
-		for (i = 0, lim = dbl_limits;
-			i < sizeof(dbl_limits)/sizeof(struct dbl_limits);
-			i++, lim++) {
-			if ((id.mantissa2 == lim->ieee.mantissa2) &&
-				(id.mantissa1 == lim->ieee.mantissa1) &&
-				(id.exp == lim->ieee.exp)) {
-				vd = lim->d;
-				goto doneit;
-			}
-		}
-		vd.exp = id.exp - IEEE_DBL_BIAS + VAX_DBL_BIAS;
-		vd.mantissa1 = (id.mantissa1 >> 13);
-		vd.mantissa2 = ((id.mantissa1 & MASK(13)) << 3) |
-				(id.mantissa2 >> 29);
-		vd.mantissa3 = (id.mantissa2 >> 13);
-		vd.mantissa4 = (id.mantissa2 << 3);
-	doneit:
-		vd.sign = id.sign;
-		*dp = *((double *)&vd);
-		return (TRUE);
-#endif
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
deleted file mode 100644
index 453562e..0000000
--- a/lib/libc/xdr/xdr_mem.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-
-/*
- * xdr_mem.h, XDR implementation using memory buffers.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * If you have some data to be interpreted as external data representation
- * or to be converted to external data representation in a memory buffer,
- * then this is the package for you.
- *
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <netinet/in.h>
-
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-static void xdrmem_destroy(XDR *);
-static bool_t xdrmem_getlong_aligned(XDR *, long *);
-static bool_t xdrmem_putlong_aligned(XDR *, const long *);
-static bool_t xdrmem_getlong_unaligned(XDR *, long *);
-static bool_t xdrmem_putlong_unaligned(XDR *, const long *);
-static bool_t xdrmem_getbytes(XDR *, char *, u_int);
-static bool_t xdrmem_putbytes(XDR *, const char *, u_int);
-/* XXX: w/64-bit pointers, u_int not enough! */
-static u_int xdrmem_getpos(XDR *);
-static bool_t xdrmem_setpos(XDR *, u_int);
-static int32_t *xdrmem_inline_aligned(XDR *, u_int);
-static int32_t *xdrmem_inline_unaligned(XDR *, u_int);
-
-static const struct	xdr_ops xdrmem_ops_aligned = {
-	xdrmem_getlong_aligned,
-	xdrmem_putlong_aligned,
-	xdrmem_getbytes,
-	xdrmem_putbytes,
-	xdrmem_getpos,
-	xdrmem_setpos,
-	xdrmem_inline_aligned,
-	xdrmem_destroy
-};
-
-static const struct	xdr_ops xdrmem_ops_unaligned = {
-	xdrmem_getlong_unaligned,
-	xdrmem_putlong_unaligned,
-	xdrmem_getbytes,
-	xdrmem_putbytes,
-	xdrmem_getpos,
-	xdrmem_setpos,
-	xdrmem_inline_unaligned,
-	xdrmem_destroy
-};
-
-/*
- * The procedure xdrmem_create initializes a stream descriptor for a
- * memory buffer.
- */
-void
-xdrmem_create(xdrs, addr, size, op)
-	XDR *xdrs;
-	char *addr;
-	u_int size;
-	enum xdr_op op;
-{
-
-	xdrs->x_op = op;
-	xdrs->x_ops = ((unsigned long)addr & (sizeof(int32_t) - 1))
-	    ? &xdrmem_ops_unaligned : &xdrmem_ops_aligned;
-	xdrs->x_private = xdrs->x_base = addr;
-	xdrs->x_handy = size;
-}
-
-/*ARGSUSED*/
-static void
-xdrmem_destroy(xdrs)
-	XDR *xdrs;
-{
-
-}
-
-static bool_t
-xdrmem_getlong_aligned(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	*lp = ntohl(*(uint32_t *)xdrs->x_private);
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_putlong_aligned(xdrs, lp)
-	XDR *xdrs;
-	const long *lp;
-{
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	*(uint32_t *)xdrs->x_private = htonl((uint32_t)*lp);
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_getlong_unaligned(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-	uint32_t l;
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	memmove(&l, xdrs->x_private, sizeof(int32_t));
-	*lp = ntohl(l);
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_putlong_unaligned(xdrs, lp)
-	XDR *xdrs;
-	const long *lp;
-{
-	uint32_t l;
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	l = htonl((uint32_t)*lp);
-	memmove(xdrs->x_private, &l, sizeof(int32_t));
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_getbytes(xdrs, addr, len)
-	XDR *xdrs;
-	char *addr;
-	u_int len;
-{
-
-	if (xdrs->x_handy < len)
-		return (FALSE);
-	xdrs->x_handy -= len;
-	memmove(addr, xdrs->x_private, len);
-	xdrs->x_private = (char *)xdrs->x_private + len;
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_putbytes(xdrs, addr, len)
-	XDR *xdrs;
-	const char *addr;
-	u_int len;
-{
-
-	if (xdrs->x_handy < len)
-		return (FALSE);
-	xdrs->x_handy -= len;
-	memmove(xdrs->x_private, addr, len);
-	xdrs->x_private = (char *)xdrs->x_private + len;
-	return (TRUE);
-}
-
-static u_int
-xdrmem_getpos(xdrs)
-	XDR *xdrs;
-{
-
-	/* XXX w/64-bit pointers, u_int not enough! */
-	return (u_int)((u_long)xdrs->x_private - (u_long)xdrs->x_base);
-}
-
-static bool_t
-xdrmem_setpos(xdrs, pos)
-	XDR *xdrs;
-	u_int pos;
-{
-	char *newaddr = xdrs->x_base + pos;
-	char *lastaddr = (char *)xdrs->x_private + xdrs->x_handy;
-
-	if (newaddr > lastaddr)
-		return (FALSE);
-	xdrs->x_private = newaddr;
-	xdrs->x_handy = (u_int)(lastaddr - newaddr); /* XXX sizeof(u_int) <? sizeof(ptrdiff_t) */
-	return (TRUE);
-}
-
-static int32_t *
-xdrmem_inline_aligned(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-	int32_t *buf = 0;
-
-	if (xdrs->x_handy >= len) {
-		xdrs->x_handy -= len;
-		buf = (int32_t *)xdrs->x_private;
-		xdrs->x_private = (char *)xdrs->x_private + len;
-	}
-	return (buf);
-}
-
-/* ARGSUSED */
-static int32_t *
-xdrmem_inline_unaligned(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-
-	return (0);
-}
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
deleted file mode 100644
index 8ec1d08..0000000
--- a/lib/libc/xdr/xdr_rec.c
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint) 
-static char *sccsid2 = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-
-/*
- * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
- * layer above tcp (for rpc's use).
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * These routines interface XDRSTREAMS to a tcp/ip connection.
- * There is a record marking layer between the xdr stream
- * and the tcp transport level.  A record is composed on one or more
- * record fragments.  A record fragment is a thirty-two bit header followed
- * by n bytes of data, where n is contained in the header.  The header
- * is represented as a htonl(u_long).  Thegh order bit encodes
- * whether or not the fragment is the last fragment of the record
- * (1 => fragment is last, 0 => more fragments to follow. 
- * The other 31 bits encode the byte length of the fragment.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <netinet/in.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/svc.h>
-#include <rpc/clnt.h>
-#include <sys/stddef.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-
-static bool_t	xdrrec_getlong(XDR *, long *);
-static bool_t	xdrrec_putlong(XDR *, const long *);
-static bool_t	xdrrec_getbytes(XDR *, char *, u_int);
-
-static bool_t	xdrrec_putbytes(XDR *, const char *, u_int);
-static u_int	xdrrec_getpos(XDR *);
-static bool_t	xdrrec_setpos(XDR *, u_int);
-static int32_t *xdrrec_inline(XDR *, u_int);
-static void	xdrrec_destroy(XDR *);
-
-static const struct  xdr_ops xdrrec_ops = {
-	xdrrec_getlong,
-	xdrrec_putlong,
-	xdrrec_getbytes,
-	xdrrec_putbytes,
-	xdrrec_getpos,
-	xdrrec_setpos,
-	xdrrec_inline,
-	xdrrec_destroy
-};
-
-/*
- * A record is composed of one or more record fragments.
- * A record fragment is a four-byte header followed by zero to
- * 2**32-1 bytes.  The header is treated as a long unsigned and is
- * encode/decoded to the network via htonl/ntohl.  The low order 31 bits
- * are a byte count of the fragment.  The highest order bit is a boolean:
- * 1 => this fragment is the last fragment of the record,
- * 0 => this fragment is followed by more fragment(s).
- *
- * The fragment/record machinery is not general;  it is constructed to
- * meet the needs of xdr and rpc based on tcp.
- */
-
-#define LAST_FRAG ((uint32_t)(1 << 31))
-
-typedef struct rec_strm {
-	char *tcp_handle;
-	/*
-	 * out-goung bits
-	 */
-	int (*writeit)(void *, void *, int);
-	char *out_base;	/* output buffer (points to frag header) */
-	char *out_finger;	/* next output position */
-	char *out_boundry;	/* data cannot up to this address */
-	uint32_t *frag_header;	/* beginning of curren fragment */
-	bool_t frag_sent;	/* true if buffer sent in middle of record */
-	/*
-	 * in-coming bits
-	 */
-	int (*readit)(void *, void *, int);
-	u_long in_size;	/* fixed size of the input buffer */
-	char *in_base;
-	char *in_finger;	/* location of next byte to be had */
-	char *in_boundry;	/* can read up to this location */
-	long fbtbc;		/* fragment bytes to be consumed */
-	bool_t last_frag;
-	u_int sendsize;
-	u_int recvsize;
-
-	bool_t nonblock;
-	bool_t in_haveheader;
-	uint32_t in_header;
-	char *in_hdrp;
-	int in_hdrlen;
-	int in_reclen;
-	int in_received;
-	int in_maxrec;
-} RECSTREAM;
-
-static u_int	fix_buf_size(u_int);
-static bool_t	flush_out(RECSTREAM *, bool_t);
-static bool_t	fill_input_buf(RECSTREAM *);
-static bool_t	get_input_bytes(RECSTREAM *, char *, int);
-static bool_t	set_input_fragment(RECSTREAM *);
-static bool_t	skip_input_bytes(RECSTREAM *, long);
-static bool_t	realloc_stream(RECSTREAM *, int);
-
-
-/*
- * Create an xdr handle for xdrrec
- * xdrrec_create fills in xdrs.  Sendsize and recvsize are
- * send and recv buffer sizes (0 => use default).
- * tcp_handle is an opaque handle that is passed as the first parameter to
- * the procedures readit and writeit.  Readit and writeit are read and
- * write respectively.   They are like the system
- * calls expect that they take an opaque handle rather than an fd.
- */
-void
-xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit)
-	XDR *xdrs;
-	u_int sendsize;
-	u_int recvsize;
-	void *tcp_handle;
-	/* like read, but pass it a tcp_handle, not sock */
-	int (*readit)(void *, void *, int);
-	/* like write, but pass it a tcp_handle, not sock */
-	int (*writeit)(void *, void *, int);
-{
-	RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM));
-
-	if (rstrm == NULL) {
-		warnx("xdrrec_create: out of memory");
-		/* 
-		 *  This is bad.  Should rework xdrrec_create to 
-		 *  return a handle, and in this case return NULL
-		 */
-		return;
-	}
-	rstrm->sendsize = sendsize = fix_buf_size(sendsize);
-	rstrm->out_base = mem_alloc(rstrm->sendsize);
-	if (rstrm->out_base == NULL) {
-		warnx("xdrrec_create: out of memory");
-		mem_free(rstrm, sizeof(RECSTREAM));
-		return;
-	}
-	rstrm->recvsize = recvsize = fix_buf_size(recvsize);
-	rstrm->in_base = mem_alloc(recvsize);
-	if (rstrm->in_base == NULL) {
-		warnx("xdrrec_create: out of memory");
-		mem_free(rstrm->out_base, sendsize);
-		mem_free(rstrm, sizeof(RECSTREAM));
-		return;
-	}
-	/*
-	 * now the rest ...
-	 */
-	xdrs->x_ops = &xdrrec_ops;
-	xdrs->x_private = rstrm;
-	rstrm->tcp_handle = tcp_handle;
-	rstrm->readit = readit;
-	rstrm->writeit = writeit;
-	rstrm->out_finger = rstrm->out_boundry = rstrm->out_base;
-	rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base;
-	rstrm->out_finger += sizeof(uint32_t);
-	rstrm->out_boundry += sendsize;
-	rstrm->frag_sent = FALSE;
-	rstrm->in_size = recvsize;
-	rstrm->in_boundry = rstrm->in_base;
-	rstrm->in_finger = (rstrm->in_boundry += recvsize);
-	rstrm->fbtbc = 0;
-	rstrm->last_frag = TRUE;
-	rstrm->in_haveheader = FALSE;
-	rstrm->in_hdrlen = 0;
-	rstrm->in_hdrp = (char *)(void *)&rstrm->in_header;
-	rstrm->nonblock = FALSE;
-	rstrm->in_reclen = 0;
-	rstrm->in_received = 0;
-}
-
-
-/*
- * The reoutines defined below are the xdr ops which will go into the
- * xdr handle filled in by xdrrec_create.
- */
-
-static bool_t
-xdrrec_getlong(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	int32_t *buflp = (int32_t *)(void *)(rstrm->in_finger);
-	int32_t mylong;
-
-	/* first try the inline, fast case */
-	if ((rstrm->fbtbc >= sizeof(int32_t)) &&
-		(((long)rstrm->in_boundry - (long)buflp) >= sizeof(int32_t))) {
-		*lp = (long)ntohl((uint32_t)(*buflp));
-		rstrm->fbtbc -= sizeof(int32_t);
-		rstrm->in_finger += sizeof(int32_t);
-	} else {
-		if (! xdrrec_getbytes(xdrs, (char *)(void *)&mylong,
-		    sizeof(int32_t)))
-			return (FALSE);
-		*lp = (long)ntohl((uint32_t)mylong);
-	}
-	return (TRUE);
-}
-
-static bool_t
-xdrrec_putlong(xdrs, lp)
-	XDR *xdrs;
-	const long *lp;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	int32_t *dest_lp = ((int32_t *)(void *)(rstrm->out_finger));
-
-	if ((rstrm->out_finger += sizeof(int32_t)) > rstrm->out_boundry) {
-		/*
-		 * this case should almost never happen so the code is
-		 * inefficient
-		 */
-		rstrm->out_finger -= sizeof(int32_t);
-		rstrm->frag_sent = TRUE;
-		if (! flush_out(rstrm, FALSE))
-			return (FALSE);
-		dest_lp = ((int32_t *)(void *)(rstrm->out_finger));
-		rstrm->out_finger += sizeof(int32_t);
-	}
-	*dest_lp = (int32_t)htonl((uint32_t)(*lp));
-	return (TRUE);
-}
-
-static bool_t  /* must manage buffers, fragments, and records */
-xdrrec_getbytes(xdrs, addr, len)
-	XDR *xdrs;
-	char *addr;
-	u_int len;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	int current;
-
-	while (len > 0) {
-		current = (int)rstrm->fbtbc;
-		if (current == 0) {
-			if (rstrm->last_frag)
-				return (FALSE);
-			if (! set_input_fragment(rstrm))
-				return (FALSE);
-			continue;
-		}
-		current = (len < current) ? len : current;
-		if (! get_input_bytes(rstrm, addr, current))
-			return (FALSE);
-		addr += current; 
-		rstrm->fbtbc -= current;
-		len -= current;
-	}
-	return (TRUE);
-}
-
-static bool_t
-xdrrec_putbytes(xdrs, addr, len)
-	XDR *xdrs;
-	const char *addr;
-	u_int len;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	size_t current;
-
-	while (len > 0) {
-		current = (size_t)((u_long)rstrm->out_boundry -
-		    (u_long)rstrm->out_finger);
-		current = (len < current) ? len : current;
-		memmove(rstrm->out_finger, addr, current);
-		rstrm->out_finger += current;
-		addr += current;
-		len -= current;
-		if (rstrm->out_finger == rstrm->out_boundry) {
-			rstrm->frag_sent = TRUE;
-			if (! flush_out(rstrm, FALSE))
-				return (FALSE);
-		}
-	}
-	return (TRUE);
-}
-
-static u_int
-xdrrec_getpos(xdrs)
-	XDR *xdrs;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	off_t pos;
-
-	pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1);
-	if (pos != -1)
-		switch (xdrs->x_op) {
-
-		case XDR_ENCODE:
-			pos += rstrm->out_finger - rstrm->out_base;
-			break;
-
-		case XDR_DECODE:
-			pos -= rstrm->in_boundry - rstrm->in_finger;
-			break;
-
-		default:
-			pos = (off_t) -1;
-			break;
-		}
-	return ((u_int) pos);
-}
-
-static bool_t
-xdrrec_setpos(xdrs, pos)
-	XDR *xdrs;
-	u_int pos;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	u_int currpos = xdrrec_getpos(xdrs);
-	int delta = currpos - pos;
-	char *newpos;
-
-	if ((int)currpos != -1)
-		switch (xdrs->x_op) {
-
-		case XDR_ENCODE:
-			newpos = rstrm->out_finger - delta;
-			if ((newpos > (char *)(void *)(rstrm->frag_header)) &&
-				(newpos < rstrm->out_boundry)) {
-				rstrm->out_finger = newpos;
-				return (TRUE);
-			}
-			break;
-
-		case XDR_DECODE:
-			newpos = rstrm->in_finger - delta;
-			if ((delta < (int)(rstrm->fbtbc)) &&
-				(newpos <= rstrm->in_boundry) &&
-				(newpos >= rstrm->in_base)) {
-				rstrm->in_finger = newpos;
-				rstrm->fbtbc -= delta;
-				return (TRUE);
-			}
-			break;
-
-		case XDR_FREE:
-			break;
-		}
-	return (FALSE);
-}
-
-static int32_t *
-xdrrec_inline(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	int32_t *buf = NULL;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		if ((rstrm->out_finger + len) <= rstrm->out_boundry) {
-			buf = (int32_t *)(void *)rstrm->out_finger;
-			rstrm->out_finger += len;
-		}
-		break;
-
-	case XDR_DECODE:
-		if ((len <= rstrm->fbtbc) &&
-			((rstrm->in_finger + len) <= rstrm->in_boundry)) {
-			buf = (int32_t *)(void *)rstrm->in_finger;
-			rstrm->fbtbc -= len;
-			rstrm->in_finger += len;
-		}
-		break;
-
-	case XDR_FREE:
-		break;
-	}
-	return (buf);
-}
-
-static void
-xdrrec_destroy(xdrs)
-	XDR *xdrs;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-
-	mem_free(rstrm->out_base, rstrm->sendsize);
-	mem_free(rstrm->in_base, rstrm->recvsize);
-	mem_free(rstrm, sizeof(RECSTREAM));
-}
-
-
-/*
- * Exported routines to manage xdr records
- */
-
-/*
- * Before reading (deserializing from the stream, one should always call
- * this procedure to guarantee proper record alignment.
- */
-bool_t
-xdrrec_skiprecord(xdrs)
-	XDR *xdrs;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	enum xprt_stat xstat;
-
-	if (rstrm->nonblock) {
-		if (__xdrrec_getrec(xdrs, &xstat, FALSE)) {
-			rstrm->fbtbc = 0;
-			return TRUE;
-		}
-		if (rstrm->in_finger == rstrm->in_boundry &&
-		    xstat == XPRT_MOREREQS) {
-			rstrm->fbtbc = 0;
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
-		if (! skip_input_bytes(rstrm, rstrm->fbtbc))
-			return (FALSE);
-		rstrm->fbtbc = 0;
-		if ((! rstrm->last_frag) && (! set_input_fragment(rstrm)))
-			return (FALSE);
-	}
-	rstrm->last_frag = FALSE;
-	return (TRUE);
-}
-
-/*
- * Look ahead function.
- * Returns TRUE iff there is no more input in the buffer
- * after consuming the rest of the current record.
- */
-bool_t
-xdrrec_eof(xdrs)
-	XDR *xdrs;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-
-	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
-		if (! skip_input_bytes(rstrm, rstrm->fbtbc))
-			return (TRUE);
-		rstrm->fbtbc = 0;
-		if ((! rstrm->last_frag) && (! set_input_fragment(rstrm)))
-			return (TRUE);
-	}
-	if (rstrm->in_finger == rstrm->in_boundry)
-		return (TRUE);
-	return (FALSE);
-}
-
-/*
- * The client must tell the package when an end-of-record has occurred.
- * The second paraemters tells whether the record should be flushed to the
- * (output) tcp stream.  (This let's the package support batched or
- * pipelined procedure calls.)  TRUE => immmediate flush to tcp connection.
- */
-bool_t
-xdrrec_endofrecord(xdrs, sendnow)
-	XDR *xdrs;
-	bool_t sendnow;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	u_long len;  /* fragment length */
-
-	if (sendnow || rstrm->frag_sent ||
-		((u_long)rstrm->out_finger + sizeof(uint32_t) >=
-		(u_long)rstrm->out_boundry)) {
-		rstrm->frag_sent = FALSE;
-		return (flush_out(rstrm, TRUE));
-	}
-	len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->frag_header) -
-	   sizeof(uint32_t);
-	*(rstrm->frag_header) = htonl((uint32_t)len | LAST_FRAG);
-	rstrm->frag_header = (uint32_t *)(void *)rstrm->out_finger;
-	rstrm->out_finger += sizeof(uint32_t);
-	return (TRUE);
-}
-
-/*
- * Fill the stream buffer with a record for a non-blocking connection.
- * Return true if a record is available in the buffer, false if not.
- */
-bool_t
-__xdrrec_getrec(xdrs, statp, expectdata)
-	XDR *xdrs;
-	enum xprt_stat *statp;
-	bool_t expectdata;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	ssize_t n;
-	int fraglen;
-
-	if (!rstrm->in_haveheader) {
-		n = rstrm->readit(rstrm->tcp_handle, rstrm->in_hdrp,
-		    (int)sizeof (rstrm->in_header) - rstrm->in_hdrlen);
-		if (n == 0) {
-			*statp = expectdata ? XPRT_DIED : XPRT_IDLE;
-			return FALSE;
-		}
-		if (n < 0) {
-			*statp = XPRT_DIED;
-			return FALSE;
-		}
-		rstrm->in_hdrp += n;
-		rstrm->in_hdrlen += n;
-		if (rstrm->in_hdrlen < sizeof (rstrm->in_header)) {
-			*statp = XPRT_MOREREQS;
-			return FALSE;
-		}
-		rstrm->in_header = ntohl(rstrm->in_header);
-		fraglen = (int)(rstrm->in_header & ~LAST_FRAG);
-		if (fraglen == 0 || fraglen > rstrm->in_maxrec ||
-		    (rstrm->in_reclen + fraglen) > rstrm->in_maxrec) {
-			*statp = XPRT_DIED;
-			return FALSE;
-		}
-		rstrm->in_reclen += fraglen;
-		if (rstrm->in_reclen > rstrm->recvsize)
-			realloc_stream(rstrm, rstrm->in_reclen);
-		if (rstrm->in_header & LAST_FRAG) {
-			rstrm->in_header &= ~LAST_FRAG;
-			rstrm->last_frag = TRUE;
-		}
-	}
-
-	n =  rstrm->readit(rstrm->tcp_handle,
-	    rstrm->in_base + rstrm->in_received,
-	    (rstrm->in_reclen - rstrm->in_received));
-
-	if (n < 0) {
-		*statp = XPRT_DIED;
-		return FALSE;
-	}
-
-	if (n == 0) {
-		*statp = expectdata ? XPRT_DIED : XPRT_IDLE;
-		return FALSE;
-	}
-
-	rstrm->in_received += n;
-
-	if (rstrm->in_received == rstrm->in_reclen) {
-		rstrm->in_haveheader = FALSE;
-		rstrm->in_hdrp = (char *)(void *)&rstrm->in_header;
-		rstrm->in_hdrlen = 0;
-		if (rstrm->last_frag) {
-			rstrm->fbtbc = rstrm->in_reclen;
-			rstrm->in_boundry = rstrm->in_base + rstrm->in_reclen;
-			rstrm->in_finger = rstrm->in_base;
-			rstrm->in_reclen = rstrm->in_received = 0;
-			*statp = XPRT_MOREREQS;
-			return TRUE;
-		}
-	}
-
-	*statp = XPRT_MOREREQS;
-	return FALSE;
-}
-
-bool_t
-__xdrrec_setnonblock(xdrs, maxrec)
-	XDR *xdrs;
-	int maxrec;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-
-	rstrm->nonblock = TRUE;
-	if (maxrec == 0)
-		maxrec = rstrm->recvsize;
-	rstrm->in_maxrec = maxrec;
-	return TRUE;
-}
-
-/*
- * Internal useful routines
- */
-static bool_t
-flush_out(rstrm, eor)
-	RECSTREAM *rstrm;
-	bool_t eor;
-{
-	uint32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
-	uint32_t len = (uint32_t)((u_long)(rstrm->out_finger) - 
-		(u_long)(rstrm->frag_header) - sizeof(uint32_t));
-
-	*(rstrm->frag_header) = htonl(len | eormask);
-	len = (uint32_t)((u_long)(rstrm->out_finger) - 
-	    (u_long)(rstrm->out_base));
-	if ((*(rstrm->writeit))(rstrm->tcp_handle, rstrm->out_base, (int)len)
-		!= (int)len)
-		return (FALSE);
-	rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base;
-	rstrm->out_finger = (char *)rstrm->out_base + sizeof(uint32_t);
-	return (TRUE);
-}
-
-static bool_t  /* knows nothing about records!  Only about input buffers */
-fill_input_buf(rstrm)
-	RECSTREAM *rstrm;
-{
-	char *where;
-	uint32_t i;
-	int len;
-
-	if (rstrm->nonblock)
-		return FALSE;
-
-	where = rstrm->in_base;
-	i = (uint32_t)((u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT);
-	where += i;
-	len = (uint32_t)(rstrm->in_size - i);
-	if ((len = (*(rstrm->readit))(rstrm->tcp_handle, where, len)) == -1)
-		return (FALSE);
-	rstrm->in_finger = where;
-	where += len;
-	rstrm->in_boundry = where;
-	return (TRUE);
-}
-
-static bool_t  /* knows nothing about records!  Only about input buffers */
-get_input_bytes(rstrm, addr, len)
-	RECSTREAM *rstrm;
-	char *addr;
-	int len;
-{
-	size_t current;
-
-	if (rstrm->nonblock) {
-		if (len > (int)(rstrm->in_boundry - rstrm->in_finger))
-			return FALSE;
-		memcpy(addr, rstrm->in_finger, (size_t)len);
-		rstrm->in_finger += len;
-		return TRUE;
-	}
-
-	while (len > 0) {
-		current = (size_t)((long)rstrm->in_boundry -
-		    (long)rstrm->in_finger);
-		if (current == 0) {
-			if (! fill_input_buf(rstrm))
-				return (FALSE);
-			continue;
-		}
-		current = (len < current) ? len : current;
-		memmove(addr, rstrm->in_finger, current);
-		rstrm->in_finger += current;
-		addr += current;
-		len -= current;
-	}
-	return (TRUE);
-}
-
-static bool_t  /* next two bytes of the input stream are treated as a header */
-set_input_fragment(rstrm)
-	RECSTREAM *rstrm;
-{
-	uint32_t header;
-
-	if (rstrm->nonblock)
-		return FALSE;
-	if (! get_input_bytes(rstrm, (char *)(void *)&header, sizeof(header)))
-		return (FALSE);
-	header = ntohl(header);
-	rstrm->last_frag = ((header & LAST_FRAG) == 0) ? FALSE : TRUE;
-	/*
-	 * Sanity check. Try not to accept wildly incorrect
-	 * record sizes. Unfortunately, the only record size
-	 * we can positively identify as being 'wildly incorrect'
-	 * is zero. Ridiculously large record sizes may look wrong,
-	 * but we don't have any way to be certain that they aren't
-	 * what the client actually intended to send us.
-	 */
-	if (header == 0)
-		return(FALSE);
-	rstrm->fbtbc = header & (~LAST_FRAG);
-	return (TRUE);
-}
-
-static bool_t  /* consumes input bytes; knows nothing about records! */
-skip_input_bytes(rstrm, cnt)
-	RECSTREAM *rstrm;
-	long cnt;
-{
-	uint32_t current;
-
-	while (cnt > 0) {
-		current = (size_t)((long)rstrm->in_boundry - 
-		    (long)rstrm->in_finger);
-		if (current == 0) {
-			if (! fill_input_buf(rstrm))
-				return (FALSE);
-			continue;
-		}
-		current = (uint32_t)((cnt < current) ? cnt : current);
-		rstrm->in_finger += current;
-		cnt -= current;
-	}
-	return (TRUE);
-}
-
-static u_int
-fix_buf_size(s)
-	u_int s;
-{
-
-	if (s < 100)
-		s = 4000;
-	return (RNDUP(s));
-}
-
-/*
- * Reallocate the input buffer for a non-block stream.
- */
-static bool_t
-realloc_stream(rstrm, size)
-	RECSTREAM *rstrm;
-	int size;
-{
-	ptrdiff_t diff;
-	char *buf;
-
-	if (size > rstrm->recvsize) {
-		buf = realloc(rstrm->in_base, (size_t)size);
-		if (buf == NULL)
-			return FALSE;
-		diff = buf - rstrm->in_base;
-		rstrm->in_finger += diff;
-		rstrm->in_base = buf;
-		rstrm->in_boundry = buf + size;
-		rstrm->recvsize = size;
-		rstrm->in_size = size;
-	}
-
-	return TRUE;
-}
diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c
deleted file mode 100644
index 36bd263..0000000
--- a/lib/libc/xdr/xdr_reference.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint) 
-static char *sccsid2 = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
-static char *sccsid = "@(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-
-/*
- * xdr_reference.c, Generic XDR routines impelmentation.
- *
- * Copyright (C) 1987, Sun Microsystems, Inc.
- *
- * These are the "non-trivial" xdr primitives used to serialize and de-serialize
- * "pointers".  See xdr.h for more info on the interface to xdr.
- */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "libc_private.h"
-
-/*
- * XDR an indirect pointer
- * xdr_reference is for recursively translating a structure that is
- * referenced by a pointer inside the structure that is currently being
- * translated.  pp references a pointer to storage. If *pp is null
- * the  necessary storage is allocated.
- * size is the sizeof the referneced structure.
- * proc is the routine to handle the referenced structure.
- */
-bool_t
-xdr_reference(xdrs, pp, size, proc)
-	XDR *xdrs;
-	caddr_t *pp;		/* the pointer to work on */
-	u_int size;		/* size of the object pointed to */
-	xdrproc_t proc;		/* xdr routine to handle the object */
-{
-	caddr_t loc = *pp;
-	bool_t stat;
-
-	if (loc == NULL)
-		switch (xdrs->x_op) {
-		case XDR_FREE:
-			return (TRUE);
-
-		case XDR_DECODE:
-			*pp = loc = (caddr_t) mem_alloc(size);
-			if (loc == NULL) {
-				warnx("xdr_reference: out of memory");
-				return (FALSE);
-			}
-			memset(loc, 0, size);
-			break;
-
-		case XDR_ENCODE:
-			break;
-		}
-
-	stat = (*proc)(xdrs, loc);
-
-	if (xdrs->x_op == XDR_FREE) {
-		mem_free(loc, size);
-		*pp = NULL;
-	}
-	return (stat);
-}
-
-
-/*
- * xdr_pointer():
- *
- * XDR a pointer to a possibly recursive data structure. This
- * differs with xdr_reference in that it can serialize/deserialiaze
- * trees correctly.
- *
- *  What's sent is actually a union:
- *
- *  union object_pointer switch (boolean b) {
- *  case TRUE: object_data data;
- *  case FALSE: void nothing;
- *  }
- *
- * > objpp: Pointer to the pointer to the object.
- * > obj_size: size of the object.
- * > xdr_obj: routine to XDR an object.
- *
- */
-bool_t
-xdr_pointer(xdrs,objpp,obj_size,xdr_obj)
-	XDR *xdrs;
-	char **objpp;
-	u_int obj_size;
-	xdrproc_t xdr_obj;
-{
-
-	bool_t more_data;
-
-	more_data = (*objpp != NULL);
-	if (! xdr_bool(xdrs,&more_data)) {
-		return (FALSE);
-	}
-	if (! more_data) {
-		*objpp = NULL;
-		return (TRUE);
-	}
-	return (xdr_reference(xdrs,objpp,obj_size,xdr_obj));
-}
diff --git a/lib/libc/xdr/xdr_sizeof.c b/lib/libc/xdr/xdr_sizeof.c
deleted file mode 100644
index de97034..0000000
--- a/lib/libc/xdr/xdr_sizeof.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- * 
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- * 
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- * 
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- * 
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-/*
- * xdr_sizeof.c
- *
- * Copyright 1990 Sun Microsystems, Inc.
- *
- * General purpose routine to see how much space something will use
- * when serialized using XDR.
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-/* ARGSUSED */
-static bool_t
-x_putlong(xdrs, longp)
-	XDR *xdrs;
-	long *longp;
-{
-	xdrs->x_handy += BYTES_PER_XDR_UNIT;
-	return (TRUE);
-}
-
-/* ARGSUSED */
-static bool_t
-x_putbytes(xdrs, bp, len)
-	XDR *xdrs;
-	char  *bp;
-	u_int len;
-{
-	xdrs->x_handy += len;
-	return (TRUE);
-}
-
-static u_int
-x_getpostn(xdrs)
-	XDR *xdrs;
-{
-	return (xdrs->x_handy);
-}
-
-/* ARGSUSED */
-static bool_t
-x_setpostn(xdrs, pos)
-	XDR *xdrs;
-	u_int pos;
-{
-	/* This is not allowed */
-	return (FALSE);
-}
-
-static int32_t *
-x_inline(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-	if (len == 0) {
-		return (NULL);
-	}
-	if (xdrs->x_op != XDR_ENCODE) {
-		return (NULL);
-	}
-	if (len < (u_int)xdrs->x_base) {
-		/* x_private was already allocated */
-		xdrs->x_handy += len;
-		return ((int32_t *) xdrs->x_private);
-	} else {
-		/* Free the earlier space and allocate new area */
-		if (xdrs->x_private)
-			free(xdrs->x_private);
-		if ((xdrs->x_private = (caddr_t) malloc(len)) == NULL) {
-			xdrs->x_base = 0;
-			return (NULL);
-		}
-		xdrs->x_base = (caddr_t) len;
-		xdrs->x_handy += len;
-		return ((int32_t *) xdrs->x_private);
-	}
-}
-
-static int
-harmless()
-{
-	/* Always return FALSE/NULL, as the case may be */
-	return (0);
-}
-
-static void
-x_destroy(xdrs)
-	XDR *xdrs;
-{
-	xdrs->x_handy = 0;
-	xdrs->x_base = 0;
-	if (xdrs->x_private) {
-		free(xdrs->x_private);
-		xdrs->x_private = NULL;
-	}
-	return;
-}
-
-unsigned long
-xdr_sizeof(func, data)
-	xdrproc_t func;
-	void *data;
-{
-	XDR x;
-	struct xdr_ops ops;
-	bool_t stat;
-	/* to stop ANSI-C compiler from complaining */
-	typedef  bool_t (* dummyfunc1)(XDR *, long *);
-	typedef  bool_t (* dummyfunc2)(XDR *, caddr_t, u_int);
-
-	ops.x_putlong = x_putlong;
-	ops.x_putbytes = x_putbytes;
-	ops.x_inline = x_inline;
-	ops.x_getpostn = x_getpostn;
-	ops.x_setpostn = x_setpostn;
-	ops.x_destroy = x_destroy;
-
-	/* the other harmless ones */
-	ops.x_getlong =  (dummyfunc1) harmless;
-	ops.x_getbytes = (dummyfunc2) harmless;
-
-	x.x_op = XDR_ENCODE;
-	x.x_ops = &ops;
-	x.x_handy = 0;
-	x.x_private = (caddr_t) NULL;
-	x.x_base = (caddr_t) 0;
-
-	stat = func(&x, data);
-	if (x.x_private)
-		free(x.x_private);
-	return (stat == TRUE ? (unsigned) x.x_handy: 0);
-}
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
deleted file mode 100644
index 55ab0fd..0000000
--- a/lib/libc/xdr/xdr_stdio.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
- * unrestricted use provided that this legend is included on all tape
- * media and as a part of the software program in whole or part.  Users
- * may copy or modify Sun RPC without charge, but are not authorized
- * to license or distribute it to anyone else except as part of a product or
- * program developed by the user.
- *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- *
- * Sun RPC is provided with no support and without any obligation on the
- * part of Sun Microsystems, Inc. to assist in its use, correction,
- * modification or enhancement.
- *
- * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
- * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
- * OR ANY PART THEREOF.
- *
- * In no event will Sun Microsystems, Inc. be liable for any lost revenue
- * or profits or other special, indirect and consequential damages, even if
- * Sun has been advised of the possibility of such damages.
- *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_stdio.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-
-/*
- * xdr_stdio.c, XDR implementation on standard i/o file.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * This set of routines implements a XDR on a stdio stream.
- * XDR_ENCODE serializes onto the stream, XDR_DECODE de-serializes
- * from the stream.
- */
-
-#include "namespace.h"
-#include <stdio.h>
-
-#include <arpa/inet.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-static void xdrstdio_destroy(XDR *);
-static bool_t xdrstdio_getlong(XDR *, long *);
-static bool_t xdrstdio_putlong(XDR *, const long *);
-static bool_t xdrstdio_getbytes(XDR *, char *, u_int);
-static bool_t xdrstdio_putbytes(XDR *, const char *, u_int);
-static u_int xdrstdio_getpos(XDR *);
-static bool_t xdrstdio_setpos(XDR *, u_int);
-static int32_t *xdrstdio_inline(XDR *, u_int);
-
-/*
- * Ops vector for stdio type XDR
- */
-static const struct xdr_ops	xdrstdio_ops = {
-	xdrstdio_getlong,	/* deseraialize a long int */
-	xdrstdio_putlong,	/* seraialize a long int */
-	xdrstdio_getbytes,	/* deserialize counted bytes */
-	xdrstdio_putbytes,	/* serialize counted bytes */
-	xdrstdio_getpos,	/* get offset in the stream */
-	xdrstdio_setpos,	/* set offset in the stream */
-	xdrstdio_inline,	/* prime stream for inline macros */
-	xdrstdio_destroy	/* destroy stream */
-};
-
-/*
- * Initialize a stdio xdr stream.
- * Sets the xdr stream handle xdrs for use on the stream file.
- * Operation flag is set to op.
- */
-void
-xdrstdio_create(xdrs, file, op)
-	XDR *xdrs;
-	FILE *file;
-	enum xdr_op op;
-{
-
-	xdrs->x_op = op;
-	xdrs->x_ops = &xdrstdio_ops;
-	xdrs->x_private = file;
-	xdrs->x_handy = 0;
-	xdrs->x_base = 0;
-}
-
-/*
- * Destroy a stdio xdr stream.
- * Cleans up the xdr stream handle xdrs previously set up by xdrstdio_create.
- */
-static void
-xdrstdio_destroy(xdrs)
-	XDR *xdrs;
-{
-	(void)fflush((FILE *)xdrs->x_private);
-		/* XXX: should we close the file ?? */
-}
-
-static bool_t
-xdrstdio_getlong(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-	uint32_t temp;
-
-	if (fread(&temp, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1)
-		return (FALSE);
-	*lp = (long)ntohl(temp);
-	return (TRUE);
-}
-
-static bool_t
-xdrstdio_putlong(xdrs, lp)
-	XDR *xdrs;
-	const long *lp;
-{
-	int32_t mycopy = htonl((uint32_t)*lp);
-
-	if (fwrite(&mycopy, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1)
-		return (FALSE);
-	return (TRUE);
-}
-
-static bool_t
-xdrstdio_getbytes(xdrs, addr, len)
-	XDR *xdrs;
-	char *addr;
-	u_int len;
-{
-
-	if ((len != 0) && (fread(addr, (size_t)len, 1, (FILE *)xdrs->x_private) != 1))
-		return (FALSE);
-	return (TRUE);
-}
-
-static bool_t
-xdrstdio_putbytes(xdrs, addr, len)
-	XDR *xdrs;
-	const char *addr;
-	u_int len;
-{
-
-	if ((len != 0) && (fwrite(addr, (size_t)len, 1,
-	    (FILE *)xdrs->x_private) != 1))
-		return (FALSE);
-	return (TRUE);
-}
-
-static u_int
-xdrstdio_getpos(xdrs)
-	XDR *xdrs;
-{
-
-	return ((u_int) ftell((FILE *)xdrs->x_private));
-}
-
-static bool_t
-xdrstdio_setpos(xdrs, pos) 
-	XDR *xdrs;
-	u_int pos;
-{ 
-
-	return ((fseek((FILE *)xdrs->x_private, (long)pos, 0) < 0) ?
-		FALSE : TRUE);
-}
-
-/* ARGSUSED */
-static int32_t *
-xdrstdio_inline(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-
-	/*
-	 * Must do some work to implement this: must insure
-	 * enough data in the underlying stdio buffer,
-	 * that the buffer is aligned so that we can indirect through a
-	 * long *, and stuff this pointer in xdrs->x_buf.  Doing
-	 * a fread or fwrite to a scratch buffer would defeat
-	 * most of the gains to be had here and require storage
-	 * management on this buffer, so we don't do this.
-	 */
-	return (NULL);
-}
diff --git a/lib/libc/yp/Makefile b/lib/libc/yp/Makefile
deleted file mode 100644
index 0552057..0000000
--- a/lib/libc/yp/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Objects
-OBJS = xdryp.o yp_xdr.o yplib.o
-
-all: $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-
diff --git a/lib/libc/yp/xdryp.c b/lib/libc/yp/xdryp.c
deleted file mode 100644
index 1e12261..0000000
--- a/lib/libc/yp/xdryp.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <rpc/rpc.h>
-#include <rpcsvc/yp.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern int (*ypresp_allfn)();
-extern void *ypresp_data;
-
-/*
- * I'm leaving the xdr_datum() function in purely for backwards
- * compatibility. yplib.c doesn't actually use it, but it's listed
- * in yp_prot.h as being available, so it's probably a good idea to
- * leave it in in case somebody goes looking for it.
- */
-typedef struct {
-	char *dptr;
-	int  dsize;
-} datum;
-
-bool_t
-xdr_datum(XDR *xdrs, datum *objp)
-{
-	if (!xdr_bytes(xdrs, (char **)&objp->dptr, (u_int *)&objp->dsize, YPMAXRECORD)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresp_all_seq(XDR *xdrs, u_long *objp)
-{
-	struct ypresp_all out;
-	u_long status;
-	char *key, *val;
-	int r;
-
-	bzero(&out, sizeof out);
-	while (1) {
-		if (!xdr_ypresp_all(xdrs, &out)) {
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-			*objp = YP_YPERR;
-			return (FALSE);
-		}
-		if (out.more == 0) {
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-			*objp = YP_NOMORE;
-			return (TRUE);
-		}
-		status = out.ypresp_all_u.val.stat;
-		switch (status) {
-		case YP_TRUE:
-			key = (char *)malloc(out.ypresp_all_u.val.key.keydat_len + 1);
-			bcopy(out.ypresp_all_u.val.key.keydat_val, key,
-				out.ypresp_all_u.val.key.keydat_len);
-			key[out.ypresp_all_u.val.key.keydat_len] = '\0';
-			val = (char *)malloc(out.ypresp_all_u.val.val.valdat_len + 1);
-			bcopy(out.ypresp_all_u.val.val.valdat_val, val,
-				out.ypresp_all_u.val.val.valdat_len);
-			val[out.ypresp_all_u.val.val.valdat_len] = '\0';
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-
-			r = (*ypresp_allfn)(status,
-				key, out.ypresp_all_u.val.key.keydat_len,
-				val, out.ypresp_all_u.val.val.valdat_len,
-				ypresp_data);
-			*objp = status;
-			free(key);
-			free(val);
-			if (r)
-				return (TRUE);
-			break;
-		case YP_NOMORE:
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-			*objp = YP_NOMORE;
-			return (TRUE);
-		default:
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-			*objp = status;
-			return (TRUE);
-		}
-	}
-}
diff --git a/lib/libc/yp/yp.h b/lib/libc/yp/yp.h
deleted file mode 100644
index c364ad9..0000000
--- a/lib/libc/yp/yp.h
+++ /dev/null
@@ -1,520 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#ifndef _YP_H_RPCGEN
-#define	_YP_H_RPCGEN
-
-#include <rpc/rpc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	YPMAXRECORD 1024
-#define	YPMAXDOMAIN 64
-#define	YPMAXMAP 64
-#define	YPMAXPEER 64
-
-enum ypstat {
-	YP_TRUE = 1,
-	YP_NOMORE = 2,
-	YP_FALSE = 0,
-	YP_NOMAP = -1,
-	YP_NODOM = -2,
-	YP_NOKEY = -3,
-	YP_BADOP = -4,
-	YP_BADDB = -5,
-	YP_YPERR = -6,
-	YP_BADARGS = -7,
-	YP_VERS = -8
-};
-typedef enum ypstat ypstat;
-
-enum ypxfrstat {
-	YPXFR_SUCC = 1,
-	YPXFR_AGE = 2,
-	YPXFR_NOMAP = -1,
-	YPXFR_NODOM = -2,
-	YPXFR_RSRC = -3,
-	YPXFR_RPC = -4,
-	YPXFR_MADDR = -5,
-	YPXFR_YPERR = -6,
-	YPXFR_BADARGS = -7,
-	YPXFR_DBM = -8,
-	YPXFR_FILE = -9,
-	YPXFR_SKEW = -10,
-	YPXFR_CLEAR = -11,
-	YPXFR_FORCE = -12,
-	YPXFR_XFRERR = -13,
-	YPXFR_REFUSED = -14
-};
-typedef enum ypxfrstat ypxfrstat;
-
-typedef char *domainname;
-
-typedef char *mapname;
-
-typedef char *peername;
-
-typedef struct {
-	u_int keydat_len;
-	char *keydat_val;
-} keydat;
-
-typedef struct {
-	u_int valdat_len;
-	char *valdat_val;
-} valdat;
-
-struct ypmap_parms {
-	domainname domain;
-	mapname map;
-	u_int ordernum;
-	peername peer;
-};
-typedef struct ypmap_parms ypmap_parms;
-
-struct ypreq_key {
-	domainname domain;
-	mapname map;
-	keydat key;
-};
-typedef struct ypreq_key ypreq_key;
-
-struct ypreq_nokey {
-	domainname domain;
-	mapname map;
-};
-typedef struct ypreq_nokey ypreq_nokey;
-
-struct ypreq_xfr {
-	ypmap_parms map_parms;
-	u_int transid;
-	u_int prog;
-	u_int port;
-};
-typedef struct ypreq_xfr ypreq_xfr;
-
-struct ypresp_val {
-	ypstat stat;
-	valdat val;
-};
-typedef struct ypresp_val ypresp_val;
-
-struct ypresp_key_val {
-	ypstat stat;
-	valdat val;
-	keydat key;
-};
-typedef struct ypresp_key_val ypresp_key_val;
-
-struct ypresp_master {
-	ypstat stat;
-	peername peer;
-};
-typedef struct ypresp_master ypresp_master;
-
-struct ypresp_order {
-	ypstat stat;
-	u_int ordernum;
-};
-typedef struct ypresp_order ypresp_order;
-
-struct ypresp_all {
-	bool_t more;
-	union {
-		ypresp_key_val val;
-	} ypresp_all_u;
-};
-typedef struct ypresp_all ypresp_all;
-
-struct ypresp_xfr {
-	u_int transid;
-	ypxfrstat xfrstat;
-};
-typedef struct ypresp_xfr ypresp_xfr;
-
-struct ypmaplist {
-	mapname map;
-	struct ypmaplist *next;
-};
-typedef struct ypmaplist ypmaplist;
-
-struct ypresp_maplist {
-	ypstat stat;
-	ypmaplist *maps;
-};
-typedef struct ypresp_maplist ypresp_maplist;
-
-enum yppush_status {
-	YPPUSH_SUCC = 1,
-	YPPUSH_AGE = 2,
-	YPPUSH_NOMAP = -1,
-	YPPUSH_NODOM = -2,
-	YPPUSH_RSRC = -3,
-	YPPUSH_RPC = -4,
-	YPPUSH_MADDR = -5,
-	YPPUSH_YPERR = -6,
-	YPPUSH_BADARGS = -7,
-	YPPUSH_DBM = -8,
-	YPPUSH_FILE = -9,
-	YPPUSH_SKEW = -10,
-	YPPUSH_CLEAR = -11,
-	YPPUSH_FORCE = -12,
-	YPPUSH_XFRERR = -13,
-	YPPUSH_REFUSED = -14
-};
-typedef enum yppush_status yppush_status;
-
-struct yppushresp_xfr {
-	u_int transid;
-	yppush_status status;
-};
-typedef struct yppushresp_xfr yppushresp_xfr;
-
-enum ypbind_resptype {
-	YPBIND_SUCC_VAL = 1,
-	YPBIND_FAIL_VAL = 2
-};
-typedef enum ypbind_resptype ypbind_resptype;
-
-struct ypbind_binding {
-	char ypbind_binding_addr[4];
-	char ypbind_binding_port[2];
-};
-typedef struct ypbind_binding ypbind_binding;
-
-struct ypbind_resp {
-	ypbind_resptype ypbind_status;
-	union {
-		u_int ypbind_error;
-		ypbind_binding ypbind_bindinfo;
-	} ypbind_resp_u;
-};
-typedef struct ypbind_resp ypbind_resp;
-#define	YPBIND_ERR_ERR 1
-#define	YPBIND_ERR_NOSERV 2
-#define	YPBIND_ERR_RESC 3
-
-struct ypbind_setdom {
-	domainname ypsetdom_domain;
-	ypbind_binding ypsetdom_binding;
-	u_int ypsetdom_vers;
-};
-typedef struct ypbind_setdom ypbind_setdom;
-
-enum ypreqtype {
-	YPREQ_KEY = 1,
-	YPREQ_NOKEY = 2,
-	YPREQ_MAP_PARMS = 3
-};
-typedef enum ypreqtype ypreqtype;
-
-enum ypresptype {
-	YPRESP_VAL = 1,
-	YPRESP_KEY_VAL = 2,
-	YPRESP_MAP_PARMS = 3
-};
-typedef enum ypresptype ypresptype;
-
-struct yprequest {
-	ypreqtype yp_reqtype;
-	union {
-		ypreq_key yp_req_keytype;
-		ypreq_nokey yp_req_nokeytype;
-		ypmap_parms yp_req_map_parmstype;
-	} yprequest_u;
-};
-typedef struct yprequest yprequest;
-
-struct ypresponse {
-	ypresptype yp_resptype;
-	union {
-		ypresp_val yp_resp_valtype;
-		ypresp_key_val yp_resp_key_valtype;
-		ypmap_parms yp_resp_map_parmstype;
-	} ypresponse_u;
-};
-typedef struct ypresponse ypresponse;
-
-#define	YPPROG ((unsigned long)(100004))
-#define	YPOLDVERS ((unsigned long)(1))
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  void ypprog_1(struct svc_req *rqstp, register SVCXPRT *transp);
-#define	YPOLDPROC_NULL ((unsigned long)(0))
-extern  void * ypoldproc_null_1(void *, CLIENT *);
-extern  void * ypoldproc_null_1_svc(void *, struct svc_req *);
-#define	YPOLDPROC_DOMAIN ((unsigned long)(1))
-extern  bool_t * ypoldproc_domain_1(domainname *, CLIENT *);
-extern  bool_t * ypoldproc_domain_1_svc(domainname *, struct svc_req *);
-#define	YPOLDPROC_DOMAIN_NONACK ((unsigned long)(2))
-extern  bool_t * ypoldproc_domain_nonack_1(domainname *, CLIENT *);
-extern  bool_t * ypoldproc_domain_nonack_1_svc(domainname *, struct svc_req *);
-#define	YPOLDPROC_MATCH ((unsigned long)(3))
-extern  ypresponse * ypoldproc_match_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_match_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_FIRST ((unsigned long)(4))
-extern  ypresponse * ypoldproc_first_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_first_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_NEXT ((unsigned long)(5))
-extern  ypresponse * ypoldproc_next_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_next_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_POLL ((unsigned long)(6))
-extern  ypresponse * ypoldproc_poll_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_poll_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_PUSH ((unsigned long)(7))
-extern  ypresponse * ypoldproc_push_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_push_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_PULL ((unsigned long)(8))
-extern  ypresponse * ypoldproc_pull_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_pull_1_svc(yprequest *, struct svc_req *);
-#define	YPOLDPROC_GET ((unsigned long)(9))
-extern  ypresponse * ypoldproc_get_1(yprequest *, CLIENT *);
-extern  ypresponse * ypoldproc_get_1_svc(yprequest *, struct svc_req *);
-extern int ypprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-extern  void ypprog_1();
-#define	YPOLDPROC_NULL ((unsigned long)(0))
-extern  void * ypoldproc_null_1();
-extern  void * ypoldproc_null_1_svc();
-#define	YPOLDPROC_DOMAIN ((unsigned long)(1))
-extern  bool_t * ypoldproc_domain_1();
-extern  bool_t * ypoldproc_domain_1_svc();
-#define	YPOLDPROC_DOMAIN_NONACK ((unsigned long)(2))
-extern  bool_t * ypoldproc_domain_nonack_1();
-extern  bool_t * ypoldproc_domain_nonack_1_svc();
-#define	YPOLDPROC_MATCH ((unsigned long)(3))
-extern  ypresponse * ypoldproc_match_1();
-extern  ypresponse * ypoldproc_match_1_svc();
-#define	YPOLDPROC_FIRST ((unsigned long)(4))
-extern  ypresponse * ypoldproc_first_1();
-extern  ypresponse * ypoldproc_first_1_svc();
-#define	YPOLDPROC_NEXT ((unsigned long)(5))
-extern  ypresponse * ypoldproc_next_1();
-extern  ypresponse * ypoldproc_next_1_svc();
-#define	YPOLDPROC_POLL ((unsigned long)(6))
-extern  ypresponse * ypoldproc_poll_1();
-extern  ypresponse * ypoldproc_poll_1_svc();
-#define	YPOLDPROC_PUSH ((unsigned long)(7))
-extern  ypresponse * ypoldproc_push_1();
-extern  ypresponse * ypoldproc_push_1_svc();
-#define	YPOLDPROC_PULL ((unsigned long)(8))
-extern  ypresponse * ypoldproc_pull_1();
-extern  ypresponse * ypoldproc_pull_1_svc();
-#define	YPOLDPROC_GET ((unsigned long)(9))
-extern  ypresponse * ypoldproc_get_1();
-extern  ypresponse * ypoldproc_get_1_svc();
-extern int ypprog_1_freeresult();
-#endif /* K&R C */
-#define	YPVERS ((unsigned long)(2))
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  void ypprog_2(struct svc_req *rqstp, register SVCXPRT *transp);
-#define	YPPROC_NULL ((unsigned long)(0))
-extern  void * ypproc_null_2(void *, CLIENT *);
-extern  void * ypproc_null_2_svc(void *, struct svc_req *);
-#define	YPPROC_DOMAIN ((unsigned long)(1))
-extern  bool_t * ypproc_domain_2(domainname *, CLIENT *);
-extern  bool_t * ypproc_domain_2_svc(domainname *, struct svc_req *);
-#define	YPPROC_DOMAIN_NONACK ((unsigned long)(2))
-extern  bool_t * ypproc_domain_nonack_2(domainname *, CLIENT *);
-extern  bool_t * ypproc_domain_nonack_2_svc(domainname *, struct svc_req *);
-#define	YPPROC_MATCH ((unsigned long)(3))
-extern  ypresp_val * ypproc_match_2(ypreq_key *, CLIENT *);
-extern  ypresp_val * ypproc_match_2_svc(ypreq_key *, struct svc_req *);
-#define	YPPROC_FIRST ((unsigned long)(4))
-extern  ypresp_key_val * ypproc_first_2(ypreq_nokey *, CLIENT *);
-extern  ypresp_key_val * ypproc_first_2_svc(ypreq_nokey *, struct svc_req *);
-#define	YPPROC_NEXT ((unsigned long)(5))
-extern  ypresp_key_val * ypproc_next_2(ypreq_key *, CLIENT *);
-extern  ypresp_key_val * ypproc_next_2_svc(ypreq_key *, struct svc_req *);
-#define	YPPROC_XFR ((unsigned long)(6))
-extern  ypresp_xfr * ypproc_xfr_2(ypreq_xfr *, CLIENT *);
-extern  ypresp_xfr * ypproc_xfr_2_svc(ypreq_xfr *, struct svc_req *);
-#define	YPPROC_CLEAR ((unsigned long)(7))
-extern  void * ypproc_clear_2(void *, CLIENT *);
-extern  void * ypproc_clear_2_svc(void *, struct svc_req *);
-#define	YPPROC_ALL ((unsigned long)(8))
-extern  ypresp_all * ypproc_all_2(ypreq_nokey *, CLIENT *);
-extern  ypresp_all * ypproc_all_2_svc(ypreq_nokey *, struct svc_req *);
-#define	YPPROC_MASTER ((unsigned long)(9))
-extern  ypresp_master * ypproc_master_2(ypreq_nokey *, CLIENT *);
-extern  ypresp_master * ypproc_master_2_svc(ypreq_nokey *, struct svc_req *);
-#define	YPPROC_ORDER ((unsigned long)(10))
-extern  ypresp_order * ypproc_order_2(ypreq_nokey *, CLIENT *);
-extern  ypresp_order * ypproc_order_2_svc(ypreq_nokey *, struct svc_req *);
-#define	YPPROC_MAPLIST ((unsigned long)(11))
-extern  ypresp_maplist * ypproc_maplist_2(domainname *, CLIENT *);
-extern  ypresp_maplist * ypproc_maplist_2_svc(domainname *, struct svc_req *);
-extern int ypprog_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-extern  void ypprog_2();
-#define	YPPROC_NULL ((unsigned long)(0))
-extern  void * ypproc_null_2();
-extern  void * ypproc_null_2_svc();
-#define	YPPROC_DOMAIN ((unsigned long)(1))
-extern  bool_t * ypproc_domain_2();
-extern  bool_t * ypproc_domain_2_svc();
-#define	YPPROC_DOMAIN_NONACK ((unsigned long)(2))
-extern  bool_t * ypproc_domain_nonack_2();
-extern  bool_t * ypproc_domain_nonack_2_svc();
-#define	YPPROC_MATCH ((unsigned long)(3))
-extern  ypresp_val * ypproc_match_2();
-extern  ypresp_val * ypproc_match_2_svc();
-#define	YPPROC_FIRST ((unsigned long)(4))
-extern  ypresp_key_val * ypproc_first_2();
-extern  ypresp_key_val * ypproc_first_2_svc();
-#define	YPPROC_NEXT ((unsigned long)(5))
-extern  ypresp_key_val * ypproc_next_2();
-extern  ypresp_key_val * ypproc_next_2_svc();
-#define	YPPROC_XFR ((unsigned long)(6))
-extern  ypresp_xfr * ypproc_xfr_2();
-extern  ypresp_xfr * ypproc_xfr_2_svc();
-#define	YPPROC_CLEAR ((unsigned long)(7))
-extern  void * ypproc_clear_2();
-extern  void * ypproc_clear_2_svc();
-#define	YPPROC_ALL ((unsigned long)(8))
-extern  ypresp_all * ypproc_all_2();
-extern  ypresp_all * ypproc_all_2_svc();
-#define	YPPROC_MASTER ((unsigned long)(9))
-extern  ypresp_master * ypproc_master_2();
-extern  ypresp_master * ypproc_master_2_svc();
-#define	YPPROC_ORDER ((unsigned long)(10))
-extern  ypresp_order * ypproc_order_2();
-extern  ypresp_order * ypproc_order_2_svc();
-#define	YPPROC_MAPLIST ((unsigned long)(11))
-extern  ypresp_maplist * ypproc_maplist_2();
-extern  ypresp_maplist * ypproc_maplist_2_svc();
-extern int ypprog_2_freeresult();
-#endif /* K&R C */
-
-#define	YPPUSH_XFRRESPPROG ((unsigned long)(0x40000000))
-#define	YPPUSH_XFRRESPVERS ((unsigned long)(1))
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  void yppush_xfrrespprog_1(struct svc_req *rqstp, register SVCXPRT *transp);
-#define	YPPUSHPROC_NULL ((unsigned long)(0))
-extern  void * yppushproc_null_1(void *, CLIENT *);
-extern  void * yppushproc_null_1_svc(void *, struct svc_req *);
-#define	YPPUSHPROC_XFRRESP ((unsigned long)(1))
-extern  void * yppushproc_xfrresp_1(yppushresp_xfr *, CLIENT *);
-extern  void * yppushproc_xfrresp_1_svc(yppushresp_xfr *, struct svc_req *);
-extern int yppush_xfrrespprog_1_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-extern  void yppush_xfrrespprog_1();
-#define	YPPUSHPROC_NULL ((unsigned long)(0))
-extern  void * yppushproc_null_1();
-extern  void * yppushproc_null_1_svc();
-#define	YPPUSHPROC_XFRRESP ((unsigned long)(1))
-extern  void * yppushproc_xfrresp_1();
-extern  void * yppushproc_xfrresp_1_svc();
-extern int yppush_xfrrespprog_1_freeresult();
-#endif /* K&R C */
-
-#define	YPBINDPROG ((unsigned long)(100007))
-#define	YPBINDVERS ((unsigned long)(2))
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  void ypbindprog_2(struct svc_req *rqstp, register SVCXPRT *transp);
-#define	YPBINDPROC_NULL ((unsigned long)(0))
-extern  void * ypbindproc_null_2(void *, CLIENT *);
-extern  void * ypbindproc_null_2_svc(void *, struct svc_req *);
-#define	YPBINDPROC_DOMAIN ((unsigned long)(1))
-extern  ypbind_resp * ypbindproc_domain_2(domainname *, CLIENT *);
-extern  ypbind_resp * ypbindproc_domain_2_svc(domainname *, struct svc_req *);
-#define	YPBINDPROC_SETDOM ((unsigned long)(2))
-extern  void * ypbindproc_setdom_2(ypbind_setdom *, CLIENT *);
-extern  void * ypbindproc_setdom_2_svc(ypbind_setdom *, struct svc_req *);
-extern int ypbindprog_2_freeresult(SVCXPRT *, xdrproc_t, caddr_t);
-
-#else /* K&R C */
-extern  void ypbindprog_2();
-#define	YPBINDPROC_NULL ((unsigned long)(0))
-extern  void * ypbindproc_null_2();
-extern  void * ypbindproc_null_2_svc();
-#define	YPBINDPROC_DOMAIN ((unsigned long)(1))
-extern  ypbind_resp * ypbindproc_domain_2();
-extern  ypbind_resp * ypbindproc_domain_2_svc();
-#define	YPBINDPROC_SETDOM ((unsigned long)(2))
-extern  void * ypbindproc_setdom_2();
-extern  void * ypbindproc_setdom_2_svc();
-extern int ypbindprog_2_freeresult();
-#endif /* K&R C */
-
-/* the xdr functions */
-
-#if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t xdr_ypstat(XDR *, ypstat*);
-extern  bool_t xdr_ypxfrstat(XDR *, ypxfrstat*);
-extern  bool_t xdr_domainname(XDR *, domainname*);
-extern  bool_t xdr_mapname(XDR *, mapname*);
-extern  bool_t xdr_peername(XDR *, peername*);
-extern  bool_t xdr_keydat(XDR *, keydat*);
-extern  bool_t xdr_valdat(XDR *, valdat*);
-extern  bool_t xdr_ypmap_parms(XDR *, ypmap_parms*);
-extern  bool_t xdr_ypreq_key(XDR *, ypreq_key*);
-extern  bool_t xdr_ypreq_nokey(XDR *, ypreq_nokey*);
-extern  bool_t xdr_ypreq_xfr(XDR *, ypreq_xfr*);
-extern  bool_t xdr_ypresp_val(XDR *, ypresp_val*);
-extern  bool_t xdr_ypresp_key_val(XDR *, ypresp_key_val*);
-extern  bool_t xdr_ypresp_master(XDR *, ypresp_master*);
-extern  bool_t xdr_ypresp_order(XDR *, ypresp_order*);
-extern  bool_t xdr_ypresp_all(XDR *, ypresp_all*);
-extern  bool_t xdr_ypresp_xfr(XDR *, ypresp_xfr*);
-extern  bool_t xdr_ypmaplist(XDR *, ypmaplist*);
-extern  bool_t xdr_ypresp_maplist(XDR *, ypresp_maplist*);
-extern  bool_t xdr_yppush_status(XDR *, yppush_status*);
-extern  bool_t xdr_yppushresp_xfr(XDR *, yppushresp_xfr*);
-extern  bool_t xdr_ypbind_resptype(XDR *, ypbind_resptype*);
-extern  bool_t xdr_ypbind_binding(XDR *, ypbind_binding*);
-extern  bool_t xdr_ypbind_resp(XDR *, ypbind_resp*);
-extern  bool_t xdr_ypbind_setdom(XDR *, ypbind_setdom*);
-extern  bool_t xdr_ypreqtype(XDR *, ypreqtype*);
-extern  bool_t xdr_ypresptype(XDR *, ypresptype*);
-extern  bool_t xdr_yprequest(XDR *, yprequest*);
-extern  bool_t xdr_ypresponse(XDR *, ypresponse*);
-
-#else /* K&R C */
-extern bool_t xdr_ypstat();
-extern bool_t xdr_ypxfrstat();
-extern bool_t xdr_domainname();
-extern bool_t xdr_mapname();
-extern bool_t xdr_peername();
-extern bool_t xdr_keydat();
-extern bool_t xdr_valdat();
-extern bool_t xdr_ypmap_parms();
-extern bool_t xdr_ypreq_key();
-extern bool_t xdr_ypreq_nokey();
-extern bool_t xdr_ypreq_xfr();
-extern bool_t xdr_ypresp_val();
-extern bool_t xdr_ypresp_key_val();
-extern bool_t xdr_ypresp_master();
-extern bool_t xdr_ypresp_order();
-extern bool_t xdr_ypresp_all();
-extern bool_t xdr_ypresp_xfr();
-extern bool_t xdr_ypmaplist();
-extern bool_t xdr_ypresp_maplist();
-extern bool_t xdr_yppush_status();
-extern bool_t xdr_yppushresp_xfr();
-extern bool_t xdr_ypbind_resptype();
-extern bool_t xdr_ypbind_binding();
-extern bool_t xdr_ypbind_resp();
-extern bool_t xdr_ypbind_setdom();
-extern bool_t xdr_ypreqtype();
-extern bool_t xdr_ypresptype();
-extern bool_t xdr_yprequest();
-extern bool_t xdr_ypresponse();
-
-#endif /* K&R C */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_YP_H_RPCGEN */
diff --git a/lib/libc/yp/yp_xdr.c b/lib/libc/yp/yp_xdr.c
deleted file mode 100644
index e64a90e..0000000
--- a/lib/libc/yp/yp_xdr.c
+++ /dev/null
@@ -1,359 +0,0 @@
-#include "yp.h"
-#include <sys/cdefs.h>
-
-bool_t
-xdr_ypstat(register XDR *xdrs, ypstat *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypxfrstat(register XDR *xdrs, ypxfrstat *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_domainname(register XDR *xdrs, domainname *objp)
-{
-
-	if (!xdr_string(xdrs, objp, YPMAXDOMAIN))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_mapname(register XDR *xdrs, mapname *objp)
-{
-
-	if (!xdr_string(xdrs, objp, YPMAXMAP))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_peername(register XDR *xdrs, peername *objp)
-{
-
-	if (!xdr_string(xdrs, objp, YPMAXPEER))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_keydat(register XDR *xdrs, keydat *objp)
-{
-
-	if (!xdr_bytes(xdrs, (char **)&objp->keydat_val, (u_int *) &objp->keydat_len, YPMAXRECORD))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_valdat(register XDR *xdrs, valdat *objp)
-{
-
-	if (!xdr_bytes(xdrs, (char **)&objp->valdat_val, (u_int *) &objp->valdat_len, YPMAXRECORD))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypmap_parms(register XDR *xdrs, ypmap_parms *objp)
-{
-
-	if (!xdr_domainname(xdrs, &objp->domain))
-		return (FALSE);
-	if (!xdr_mapname(xdrs, &objp->map))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->ordernum))
-		return (FALSE);
-	if (!xdr_peername(xdrs, &objp->peer))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypreq_key(register XDR *xdrs, ypreq_key *objp)
-{
-
-	if (!xdr_domainname(xdrs, &objp->domain))
-		return (FALSE);
-	if (!xdr_mapname(xdrs, &objp->map))
-		return (FALSE);
-	if (!xdr_keydat(xdrs, &objp->key))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypreq_nokey(register XDR *xdrs, ypreq_nokey *objp)
-{
-
-	if (!xdr_domainname(xdrs, &objp->domain))
-		return (FALSE);
-	if (!xdr_mapname(xdrs, &objp->map))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypreq_xfr(register XDR *xdrs, ypreq_xfr *objp)
-{
-
-	if (!xdr_ypmap_parms(xdrs, &objp->map_parms))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->transid))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->prog))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->port))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresp_val(register XDR *xdrs, ypresp_val *objp)
-{
-
-	if (!xdr_ypstat(xdrs, &objp->stat))
-		return (FALSE);
-	if (!xdr_valdat(xdrs, &objp->val))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresp_key_val(register XDR *xdrs, ypresp_key_val *objp)
-{
-
-	if (!xdr_ypstat(xdrs, &objp->stat))
-		return (FALSE);
-	if (!xdr_valdat(xdrs, &objp->val))
-		return (FALSE);
-	if (!xdr_keydat(xdrs, &objp->key))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresp_master(register XDR *xdrs, ypresp_master *objp)
-{
-
-	if (!xdr_ypstat(xdrs, &objp->stat))
-		return (FALSE);
-	if (!xdr_peername(xdrs, &objp->peer))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresp_order(register XDR *xdrs, ypresp_order *objp)
-{
-
-	if (!xdr_ypstat(xdrs, &objp->stat))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->ordernum))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresp_all(register XDR *xdrs, ypresp_all *objp)
-{
-
-	if (!xdr_bool(xdrs, &objp->more))
-		return (FALSE);
-	switch (objp->more) {
-	case TRUE:
-		if (!xdr_ypresp_key_val(xdrs, &objp->ypresp_all_u.val))
-			return (FALSE);
-		break;
-	case FALSE:
-		break;
-	default:
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresp_xfr(register XDR *xdrs, ypresp_xfr *objp)
-{
-
-	if (!xdr_u_int(xdrs, &objp->transid))
-		return (FALSE);
-	if (!xdr_ypxfrstat(xdrs, &objp->xfrstat))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypmaplist(register XDR *xdrs, ypmaplist *objp)
-{
-
-	if (!xdr_mapname(xdrs, &objp->map))
-		return (FALSE);
-	if (!xdr_pointer(xdrs, (char **)&objp->next, sizeof (ypmaplist), (xdrproc_t) xdr_ypmaplist))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresp_maplist(register XDR *xdrs, ypresp_maplist *objp)
-{
-
-	if (!xdr_ypstat(xdrs, &objp->stat))
-		return (FALSE);
-	if (!xdr_pointer(xdrs, (char **)&objp->maps, sizeof (ypmaplist), (xdrproc_t) xdr_ypmaplist))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_yppush_status(register XDR *xdrs, yppush_status *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_yppushresp_xfr(register XDR *xdrs, yppushresp_xfr *objp)
-{
-
-	if (!xdr_u_int(xdrs, &objp->transid))
-		return (FALSE);
-	if (!xdr_yppush_status(xdrs, &objp->status))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypbind_resptype(register XDR *xdrs, ypbind_resptype *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypbind_binding(register XDR *xdrs, ypbind_binding *objp)
-{
-
-	if (!xdr_opaque(xdrs, objp->ypbind_binding_addr, 4))
-		return (FALSE);
-	if (!xdr_opaque(xdrs, objp->ypbind_binding_port, 2))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypbind_resp(register XDR *xdrs, ypbind_resp *objp)
-{
-
-	if (!xdr_ypbind_resptype(xdrs, &objp->ypbind_status))
-		return (FALSE);
-	switch (objp->ypbind_status) {
-	case YPBIND_FAIL_VAL:
-		if (!xdr_u_int(xdrs, &objp->ypbind_resp_u.ypbind_error))
-			return (FALSE);
-		break;
-	case YPBIND_SUCC_VAL:
-		if (!xdr_ypbind_binding(xdrs, &objp->ypbind_resp_u.ypbind_bindinfo))
-			return (FALSE);
-		break;
-	default:
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_ypbind_setdom(register XDR *xdrs, ypbind_setdom *objp)
-{
-
-	if (!xdr_domainname(xdrs, &objp->ypsetdom_domain))
-		return (FALSE);
-	if (!xdr_ypbind_binding(xdrs, &objp->ypsetdom_binding))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->ypsetdom_vers))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypreqtype(register XDR *xdrs, ypreqtype *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresptype(register XDR *xdrs, ypresptype *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_yprequest(register XDR *xdrs, yprequest *objp)
-{
-
-	if (!xdr_ypreqtype(xdrs, &objp->yp_reqtype))
-		return (FALSE);
-	switch (objp->yp_reqtype) {
-	case YPREQ_KEY:
-		if (!xdr_ypreq_key(xdrs, &objp->yprequest_u.yp_req_keytype))
-			return (FALSE);
-		break;
-	case YPREQ_NOKEY:
-		if (!xdr_ypreq_nokey(xdrs, &objp->yprequest_u.yp_req_nokeytype))
-			return (FALSE);
-		break;
-	case YPREQ_MAP_PARMS:
-		if (!xdr_ypmap_parms(xdrs, &objp->yprequest_u.yp_req_map_parmstype))
-			return (FALSE);
-		break;
-	default:
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresponse(register XDR *xdrs, ypresponse *objp)
-{
-
-	if (!xdr_ypresptype(xdrs, &objp->yp_resptype))
-		return (FALSE);
-	switch (objp->yp_resptype) {
-	case YPRESP_VAL:
-		if (!xdr_ypresp_val(xdrs, &objp->ypresponse_u.yp_resp_valtype))
-			return (FALSE);
-		break;
-	case YPRESP_KEY_VAL:
-		if (!xdr_ypresp_key_val(xdrs, &objp->ypresponse_u.yp_resp_key_valtype))
-			return (FALSE);
-		break;
-	case YPRESP_MAP_PARMS:
-		if (!xdr_ypmap_parms(xdrs, &objp->ypresponse_u.yp_resp_map_parmstype))
-			return (FALSE);
-		break;
-	default:
-		return (FALSE);
-	}
-	return (TRUE);
-}
diff --git a/lib/libc/yp/yplib.c b/lib/libc/yp/yplib.c
deleted file mode 100644
index dc21ce7..0000000
--- a/lib/libc/yp/yplib.c
+++ /dev/null
@@ -1,1165 +0,0 @@
-/*
- * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
- * Copyright (c) 1998 Bill Paul <wpaul@ctr.columbia.edu>
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/uio.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
-#include <rpcsvc/yp.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-/*
- * We have to define these here due to clashes between yp_prot.h and
- * yp.h.
- */
-
-#define YPMATCHCACHE
-
-#ifdef YPMATCHCACHE
-struct ypmatch_ent {
-        char			*ypc_map;
-	keydat			ypc_key;
-	valdat			ypc_val;
-        time_t			ypc_expire_t;
-        struct ypmatch_ent	*ypc_next;
-};
-#define YPLIB_MAXCACHE	5	/* At most 5 entries */
-#define YPLIB_EXPIRE	5	/* Expire after 5 seconds */
-#endif
-
-struct dom_binding {
-        struct dom_binding *dom_pnext;
-        char dom_domain[YPMAXDOMAIN + 1];
-        struct sockaddr_in dom_server_addr;
-        u_short dom_server_port;
-        int dom_socket;
-        CLIENT *dom_client;
-        u_short dom_local_port; /* now I finally know what this is for. */
-        long dom_vers;
-#ifdef YPMATCHCACHE
-	struct ypmatch_ent *cache;
-	int ypmatch_cachecnt;
-#endif
-};
-
-#include <rpcsvc/ypclnt.h>
-
-#ifndef BINDINGDIR
-#define BINDINGDIR "/var/yp/binding"
-#endif
-#define MAX_RETRIES 20
-
-extern bool_t xdr_domainname(), xdr_ypbind_resp();
-extern bool_t xdr_ypreq_key(), xdr_ypresp_val();
-extern bool_t xdr_ypreq_nokey(), xdr_ypresp_key_val();
-extern bool_t xdr_ypresp_all(), xdr_ypresp_all_seq();
-extern bool_t xdr_ypresp_master();
-
-int (*ypresp_allfn)();
-void *ypresp_data;
-
-static void _yp_unbind(struct dom_binding *);
-struct dom_binding *_ypbindlist;
-static char _yp_domain[MAXHOSTNAMELEN];
-int _yplib_timeout = 10;
-
-static mutex_t _ypmutex = MUTEX_INITIALIZER;
-#define YPLOCK()	mutex_lock(&_ypmutex);
-#define YPUNLOCK()	mutex_unlock(&_ypmutex);
-
-#ifdef YPMATCHCACHE
-static void
-ypmatch_cache_delete(struct dom_binding *ypdb, struct ypmatch_ent *prev,
-    struct ypmatch_ent *cur)
-{
-	if (prev == NULL)
-		ypdb->cache = cur->ypc_next;
-	else
-		prev->ypc_next = cur->ypc_next;
-
-	free(cur->ypc_map);
-	free(cur->ypc_key.keydat_val);
-	free(cur->ypc_val.valdat_val);
-	free(cur);
-
-	ypdb->ypmatch_cachecnt--;
-
-	return;
-}
-
-static void
-ypmatch_cache_flush(struct dom_binding *ypdb)
-{
-	struct ypmatch_ent	*n, *c = ypdb->cache;
-
-	while (c != NULL) {
-		n = c->ypc_next;
-		ypmatch_cache_delete(ypdb, NULL, c);
-		c = n;
-	}
-
-	return;
-}
-
-static void
-ypmatch_cache_expire(struct dom_binding *ypdb)
-{
-	struct ypmatch_ent	*c = ypdb->cache;
-	struct ypmatch_ent	*n, *p = NULL;
-	time_t			t;
-
-	time(&t);
-
-	while (c != NULL) {
-		if (t >= c->ypc_expire_t) {
-			n = c->ypc_next;
-			ypmatch_cache_delete(ypdb, p, c);
-			c = n;
-		} else {
-			p = c;
-			c = c->ypc_next;
-		}
-	}
-
-	return;
-}
-
-static void
-ypmatch_cache_insert(struct dom_binding *ypdb, char *map, keydat *key,
-    valdat *val)
-{
-	struct ypmatch_ent	*new;
-
-	/* Do an expire run to maybe open up a slot. */
-	if (ypdb->ypmatch_cachecnt)
-		ypmatch_cache_expire(ypdb);
-
-	/*
-	 * If there are no slots free, then force an expire of
-	 * the least recently used entry.
- 	 */
-	if (ypdb->ypmatch_cachecnt >= YPLIB_MAXCACHE) {
-		struct ypmatch_ent	*o = NULL, *c = ypdb->cache;
-		time_t			oldest = 0;
-
-		oldest = ~oldest;
-
-		while (c != NULL) {
-			if (c->ypc_expire_t < oldest) {
-				oldest = c->ypc_expire_t;
-				o = c;
-			}
-			c = c->ypc_next;
-		}
-
-		if (o == NULL)
-			return;
-		o->ypc_expire_t = 0;
-		ypmatch_cache_expire(ypdb);
-	}
-
-	new = malloc(sizeof(struct ypmatch_ent));
-	if (new == NULL)
-		return;
-
-	new->ypc_map = strdup(map);
-	if (new->ypc_map == NULL) {
-		free(new);
-		return;
-	}
-	new->ypc_key.keydat_val = malloc(key->keydat_len);
-	if (new->ypc_key.keydat_val == NULL) {
-		free(new->ypc_map);
-		free(new);
-		return;
-	}
-	new->ypc_val.valdat_val = malloc(val->valdat_len);
-	if (new->ypc_val.valdat_val == NULL) {
-		free(new->ypc_val.valdat_val);
-		free(new->ypc_map);
-		free(new);
-		return;
-	}
-
-	new->ypc_expire_t = time(NULL) + YPLIB_EXPIRE;
-	new->ypc_key.keydat_len = key->keydat_len;
-	new->ypc_val.valdat_len = val->valdat_len;
-	bcopy(key->keydat_val, new->ypc_key.keydat_val, key->keydat_len);
-	bcopy(val->valdat_val, new->ypc_val.valdat_val, val->valdat_len);
-
-	new->ypc_next = ypdb->cache;
-	ypdb->cache = new;
-
-	ypdb->ypmatch_cachecnt++;
-
-	return;
-}
-
-static bool_t
-ypmatch_cache_lookup(struct dom_binding *ypdb, char *map, keydat *key,
-    valdat *val)
-{
-	struct ypmatch_ent	*c = ypdb->cache;
-
-	ypmatch_cache_expire(ypdb);
-
-	for (c = ypdb->cache; c != NULL; c = c->ypc_next) {
-		if (strcmp(map, c->ypc_map))
-			continue;
-		if (key->keydat_len != c->ypc_key.keydat_len)
-			continue;
-		if (bcmp(key->keydat_val, c->ypc_key.keydat_val,
-				key->keydat_len))
-			continue;
-	}
-
-	if (c == NULL)
-		return(FALSE);
-
-	val->valdat_len = c->ypc_val.valdat_len;
-	val->valdat_val = c->ypc_val.valdat_val;
-
-	return(TRUE);
-}
-#endif
-
-const char *
-ypbinderr_string(int incode)
-{
-	static char err[80];
-	switch (incode) {
-	case 0:
-		return ("Success");
-	case YPBIND_ERR_ERR:
-		return ("Internal ypbind error");
-	case YPBIND_ERR_NOSERV:
-		return ("Domain not bound");
-	case YPBIND_ERR_RESC:
-		return ("System resource allocation failure");
-	}
-	sprintf(err, "Unknown ypbind error: #%d\n", incode);
-	return (err);
-}
-
-int
-_yp_dobind(char *dom, struct dom_binding **ypdb)
-{
-	static pid_t pid = -1;
-	char path[MAXPATHLEN];
-	struct dom_binding *ysd, *ysd2;
-	struct ypbind_resp ypbr;
-	struct timeval tv;
-	struct sockaddr_in clnt_sin;
-	int clnt_sock, fd;
-	pid_t gpid;
-	CLIENT *client;
-	int new = 0, r;
-	int retries = 0;
-	struct sockaddr_in check;
-	socklen_t checklen = sizeof(struct sockaddr_in);
-
-	/* Not allowed; bad doggie. Bad. */
-	if (strchr(dom, '/') != NULL)
-		return(YPERR_BADARGS);
-
-	gpid = getpid();
-	if (!(pid == -1 || pid == gpid)) {
-		ysd = _ypbindlist;
-		while (ysd) {
-			if (ysd->dom_client != NULL)
-				_yp_unbind(ysd);
-			ysd2 = ysd->dom_pnext;
-			free(ysd);
-			ysd = ysd2;
-		}
-		_ypbindlist = NULL;
-	}
-	pid = gpid;
-
-	if (ypdb != NULL)
-		*ypdb = NULL;
-
-	if (dom == NULL || strlen(dom) == 0)
-		return (YPERR_BADARGS);
-
-	for (ysd = _ypbindlist; ysd; ysd = ysd->dom_pnext)
-		if (strcmp(dom, ysd->dom_domain) == 0)
-			break;
-
-
-	if (ysd == NULL) {
-		ysd = (struct dom_binding *)malloc(sizeof *ysd);
-		bzero((char *)ysd, sizeof *ysd);
-		ysd->dom_socket = -1;
-		ysd->dom_vers = 0;
-		new = 1;
-	} else {
-	/* Check the socket -- may have been hosed by the caller. */
-		if (_getsockname(ysd->dom_socket, (struct sockaddr *)&check,
-		    &checklen) == -1 || check.sin_family != AF_INET ||
-		    check.sin_port != ysd->dom_local_port) {
-		/* Socket became bogus somehow... need to rebind. */
-			int save, sock;
-
-			sock = ysd->dom_socket;
-			save = _dup(ysd->dom_socket);
-			if (ysd->dom_client != NULL)
-				clnt_destroy(ysd->dom_client);
-			ysd->dom_vers = 0;
-			ysd->dom_client = NULL;
-			sock = _dup2(save, sock);
-			_close(save);
-		}
-	}
-
-again:
-	retries++;
-	if (retries > MAX_RETRIES) {
-		if (new)
-			free(ysd);
-		return(YPERR_YPBIND);
-	}
-#ifdef BINDINGDIR
-	if (ysd->dom_vers == 0) {
-		/*
-		 * We're trying to make a new binding: zorch the
-		 * existing handle now (if any).
-		 */
-		if (ysd->dom_client != NULL) {
-			clnt_destroy(ysd->dom_client);
-			ysd->dom_client = NULL;
-			ysd->dom_socket = -1;
-		}
-		snprintf(path, sizeof(path), "%s/%s.%d", BINDINGDIR, dom, 2);
-		if ((fd = _open(path, O_RDONLY)) == -1) {
-			/* no binding file, YP is dead. */
-			/* Try to bring it back to life. */
-			_close(fd);
-			goto skipit;
-		}
-		if (_flock(fd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK) {
-			struct iovec iov[2];
-			struct ypbind_resp ybr;
-			u_short	ypb_port;
-
-			iov[0].iov_base = (caddr_t)&ypb_port;
-			iov[0].iov_len = sizeof ypb_port;
-			iov[1].iov_base = (caddr_t)&ybr;
-			iov[1].iov_len = sizeof ybr;
-
-			r = _readv(fd, iov, 2);
-			if (r != iov[0].iov_len + iov[1].iov_len) {
-				_close(fd);
-				ysd->dom_vers = -1;
-				goto again;
-			}
-
-			bzero(&ysd->dom_server_addr, sizeof ysd->dom_server_addr);
-			ysd->dom_server_addr.sin_family = AF_INET;
-			ysd->dom_server_addr.sin_len = sizeof(struct sockaddr_in);
-			bcopy(&ybr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr,
-			    &ysd->dom_server_addr.sin_addr.s_addr,
-			    sizeof(ysd->dom_server_addr.sin_addr.s_addr));
-			bcopy(&ybr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port,
-			    &ysd->dom_server_addr.sin_port,
-			    sizeof(ysd->dom_server_addr.sin_port));
-
-			ysd->dom_server_port = ysd->dom_server_addr.sin_port;
-			_close(fd);
-			goto gotit;
-		} else {
-			/* no lock on binding file, YP is dead. */
-			/* Try to bring it back to life. */
-			_close(fd);
-			goto skipit;
-		}
-	}
-skipit:
-#endif
-	if (ysd->dom_vers == -1 || ysd->dom_vers == 0) {
-		/*
-		 * We're trying to make a new binding: zorch the
-		 * existing handle now (if any).
-		 */
-		if (ysd->dom_client != NULL) {
-			clnt_destroy(ysd->dom_client);
-			ysd->dom_client = NULL;
-			ysd->dom_socket = -1;
-		}
-		bzero((char *)&clnt_sin, sizeof clnt_sin);
-		clnt_sin.sin_family = AF_INET;
-		clnt_sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-		clnt_sock = RPC_ANYSOCK;
-		client = clnttcp_create(&clnt_sin, YPBINDPROG, YPBINDVERS, &clnt_sock,
-			0, 0);
-		if (client == NULL) {
-			/*
-			 * These conditions indicate ypbind just isn't
-			 * alive -- we probably don't want to shoot our
-			 * mouth off in this case; instead generate error
-			 * messages only for really exotic problems.
-			 */
-			if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED &&
-			   (rpc_createerr.cf_stat != RPC_SYSTEMERROR &&
-			   rpc_createerr.cf_error.re_errno == ECONNREFUSED))
-				clnt_pcreateerror("clnttcp_create");
-			if (new)
-				free(ysd);
-			return (YPERR_YPBIND);
-		}
-
-		/*
-		 * Check the port number -- should be < IPPORT_RESERVED.
-		 * If not, it's possible someone has registered a bogus
-		 * ypbind with the portmapper and is trying to trick us.
-		 */
-		if (ntohs(clnt_sin.sin_port) >= IPPORT_RESERVED) {
-			if (client != NULL)
-				clnt_destroy(client);
-			if (new)
-				free(ysd);
-			return(YPERR_YPBIND);
-		}
-		tv.tv_sec = _yplib_timeout/2;
-		tv.tv_usec = 0;
-		r = clnt_call(client, YPBINDPROC_DOMAIN,
-			(xdrproc_t)xdr_domainname, &dom,
-			(xdrproc_t)xdr_ypbind_resp, &ypbr, tv);
-		if (r != RPC_SUCCESS) {
-			clnt_destroy(client);
-			ysd->dom_vers = -1;
-			if (r == RPC_PROGUNAVAIL || r == RPC_PROCUNAVAIL) {
-				if (new)
-					free(ysd);
-				return(YPERR_YPBIND);
-			}
-			fprintf(stderr,
-			"YP: server for domain %s not responding, retrying\n", dom);
-			goto again;
-		} else {
-			if (ypbr.ypbind_status != YPBIND_SUCC_VAL) {
-				struct timespec time_to_sleep, time_remaining;
-
-				clnt_destroy(client);
-				ysd->dom_vers = -1;
-
-				time_to_sleep.tv_sec = _yplib_timeout/2;
-				time_to_sleep.tv_nsec = 0;
-				_nanosleep(&time_to_sleep,
-				    &time_remaining);
-				goto again;
-			}
-		}
-		clnt_destroy(client);
-
-		bzero((char *)&ysd->dom_server_addr, sizeof ysd->dom_server_addr);
-		ysd->dom_server_addr.sin_family = AF_INET;
-		bcopy(&ypbr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port,
-		    &ysd->dom_server_addr.sin_port,
-		    sizeof(ysd->dom_server_addr.sin_port));
-		bcopy(&ypbr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr,
-		    &ysd->dom_server_addr.sin_addr.s_addr,
-		    sizeof(ysd->dom_server_addr.sin_addr.s_addr));
-
-		/*
-		 * We could do a reserved port check here too, but this
-		 * could pose compatibility problems. The local ypbind is
-		 * supposed to decide whether or not to trust yp servers
-		 * on insecure ports. For now, we trust its judgement.
-		 */
-		ysd->dom_server_port =
-			*(u_short *)&ypbr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port;
-gotit:
-		ysd->dom_vers = YPVERS;
-		strlcpy(ysd->dom_domain, dom, sizeof(ysd->dom_domain));
-	}
-
-	/* Don't rebuild the connection to the server unless we have to. */
-	if (ysd->dom_client == NULL) {
-		tv.tv_sec = _yplib_timeout/2;
-		tv.tv_usec = 0;
-		ysd->dom_socket = RPC_ANYSOCK;
-		ysd->dom_client = clntudp_bufcreate(&ysd->dom_server_addr,
-			YPPROG, YPVERS, tv, &ysd->dom_socket, 1280, 2304);
-		if (ysd->dom_client == NULL) {
-			clnt_pcreateerror("clntudp_create");
-			ysd->dom_vers = -1;
-			goto again;
-		}
-		if (_fcntl(ysd->dom_socket, F_SETFD, 1) == -1)
-			perror("fcntl: F_SETFD");
-		/*
-		 * We want a port number associated with this socket
-		 * so that we can check its authenticity later.
-		 */
-		checklen = sizeof(struct sockaddr_in);
-		bzero((char *)&check, checklen);
-		_bind(ysd->dom_socket, (struct sockaddr *)&check, checklen);
-		check.sin_family = AF_INET;
-		if (!_getsockname(ysd->dom_socket,
-		    (struct sockaddr *)&check, &checklen)) {
-			ysd->dom_local_port = check.sin_port;
-		} else {
-			clnt_destroy(ysd->dom_client);
-			if (new)
-				free(ysd);
-			return(YPERR_YPBIND);
-		}
-	}
-
-	if (new) {
-		ysd->dom_pnext = _ypbindlist;
-		_ypbindlist = ysd;
-	}
-
-	if (ypdb != NULL)
-		*ypdb = ysd;
-	return (0);
-}
-
-static void
-_yp_unbind(struct dom_binding *ypb)
-{
-	struct sockaddr_in check;
-	socklen_t checklen = sizeof(struct sockaddr_in);
-
-	if (ypb->dom_client != NULL) {
-		/* Check the socket -- may have been hosed by the caller. */
-		if (_getsockname(ypb->dom_socket, (struct sockaddr *)&check,
-	    	&checklen) == -1 || check.sin_family != AF_INET ||
-	    	check.sin_port != ypb->dom_local_port) {
-			int save, sock;
-
-			sock = ypb->dom_socket;
-			save = _dup(ypb->dom_socket);
-			clnt_destroy(ypb->dom_client);
-			sock = _dup2(save, sock);
-			_close(save);
-		} else
-			clnt_destroy(ypb->dom_client);
-	}
-
-	ypb->dom_client = NULL;
-	ypb->dom_socket = -1;
-	ypb->dom_vers = -1;
-#ifdef YPMATCHCACHE
-	ypmatch_cache_flush(ypb);
-#endif
-}
-
-static int
-yp_bind_locked(char *dom)
-{
-	return (_yp_dobind(dom, NULL));
-}
-
-int
-yp_bind(char *dom)
-{
-	int r;
-
-	YPLOCK();
-	r = yp_bind_locked(dom);
-	YPUNLOCK();
-	return (r);
-}
-
-static void
-yp_unbind_locked(char *dom)
-{
-	struct dom_binding *ypb, *ypbp;
-
-	ypbp = NULL;
-	for (ypb = _ypbindlist; ypb; ypb = ypb->dom_pnext) {
-		if (strcmp(dom, ypb->dom_domain) == 0) {
-			_yp_unbind(ypb);
-			if (ypbp)
-				ypbp->dom_pnext = ypb->dom_pnext;
-			else
-				_ypbindlist = ypb->dom_pnext;
-			free(ypb);
-			return;
-		}
-		ypbp = ypb;
-	}
-	return;
-}
-
-void
-yp_unbind(char *dom)
-{
-	YPLOCK();
-	yp_unbind_locked(dom);
-	YPUNLOCK();
-}
-
-int
-yp_match(char *indomain, char *inmap, const char *inkey, int inkeylen,
-    char **outval, int *outvallen)
-{
-	struct dom_binding *ysd;
-	struct ypresp_val yprv;
-	struct timeval tv;
-	struct ypreq_key yprk;
-	int r;
-
-	*outval = NULL;
-	*outvallen = 0;
-
-	/* Sanity check */
-
-	if (inkey == NULL || !strlen(inkey) || inkeylen <= 0 ||
-	    inmap == NULL || !strlen(inmap) ||
-	    indomain == NULL || !strlen(indomain))
-		return (YPERR_BADARGS);
-
-	YPLOCK();
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return(YPERR_DOMAIN);
-	}
-
-	yprk.domain = indomain;
-	yprk.map = inmap;
-	yprk.key.keydat_val = (char *)inkey;
-	yprk.key.keydat_len = inkeylen;
-
-#ifdef YPMATCHCACHE
-	if (ypmatch_cache_lookup(ysd, yprk.map, &yprk.key, &yprv.val) == TRUE) {
-/*
-	if (!strcmp(_yp_domain, indomain) && ypmatch_find(inmap, inkey,
-	    inkeylen, &yprv.val.valdat_val, &yprv.val.valdat_len)) {
-*/
-		*outvallen = yprv.val.valdat_len;
-		*outval = (char *)malloc(*outvallen+1);
-		bcopy(yprv.val.valdat_val, *outval, *outvallen);
-		(*outval)[*outvallen] = '\0';
-		YPUNLOCK();
-		return (0);
-	}
-#endif
-
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	bzero((char *)&yprv, sizeof yprv);
-
-	r = clnt_call(ysd->dom_client, YPPROC_MATCH,
-		(xdrproc_t)xdr_ypreq_key, &yprk,
-		(xdrproc_t)xdr_ypresp_val, &yprv, tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_match: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-
-	if (!(r = ypprot_err(yprv.stat))) {
-		*outvallen = yprv.val.valdat_len;
-		*outval = (char *)malloc(*outvallen+1);
-		bcopy(yprv.val.valdat_val, *outval, *outvallen);
-		(*outval)[*outvallen] = '\0';
-#ifdef YPMATCHCACHE
-		ypmatch_cache_insert(ysd, yprk.map, &yprk.key, &yprv.val);
-#endif
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_val, &yprv);
-	YPUNLOCK();
-	return (r);
-}
-
-static int
-yp_get_default_domain_locked(char **domp)
-{
-	*domp = NULL;
-	if (_yp_domain[0] == '\0')
-		if (getdomainname(_yp_domain, sizeof _yp_domain))
-			return (YPERR_NODOM);
-	*domp = _yp_domain;
-	return (0);
-}
-
-int
-yp_get_default_domain(char **domp)
-{
-	int r;
-
-	YPLOCK();
-	r = yp_get_default_domain_locked(domp);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_first(char *indomain, char *inmap, char **outkey, int *outkeylen,
-    char **outval, int *outvallen)
-{
-	struct ypresp_key_val yprkv;
-	struct ypreq_nokey yprnk;
-	struct dom_binding *ysd;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain) ||
-	    inmap == NULL || !strlen(inmap))
-		return (YPERR_BADARGS);
-
-	*outkey = *outval = NULL;
-	*outkeylen = *outvallen = 0;
-
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-	bzero((char *)&yprkv, sizeof yprkv);
-
-	r = clnt_call(ysd->dom_client, YPPROC_FIRST,
-		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		(xdrproc_t)xdr_ypresp_key_val, &yprkv, tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_first: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-	if (!(r = ypprot_err(yprkv.stat))) {
-		*outkeylen = yprkv.key.keydat_len;
-		*outkey = (char *)malloc(*outkeylen+1);
-		bcopy(yprkv.key.keydat_val, *outkey, *outkeylen);
-		(*outkey)[*outkeylen] = '\0';
-		*outvallen = yprkv.val.valdat_len;
-		*outval = (char *)malloc(*outvallen+1);
-		bcopy(yprkv.val.valdat_val, *outval, *outvallen);
-		(*outval)[*outvallen] = '\0';
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_next(char *indomain, char *inmap, char *inkey, int inkeylen,
-    char **outkey, int *outkeylen, char **outval, int *outvallen)
-{
-	struct ypresp_key_val yprkv;
-	struct ypreq_key yprk;
-	struct dom_binding *ysd;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (inkey == NULL || !strlen(inkey) || inkeylen <= 0 ||
-	    inmap == NULL || !strlen(inmap) ||
-	    indomain == NULL || !strlen(indomain))
-		return (YPERR_BADARGS);
-
-	*outkey = *outval = NULL;
-	*outkeylen = *outvallen = 0;
-
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	yprk.domain = indomain;
-	yprk.map = inmap;
-	yprk.key.keydat_val = inkey;
-	yprk.key.keydat_len = inkeylen;
-	bzero((char *)&yprkv, sizeof yprkv);
-
-	r = clnt_call(ysd->dom_client, YPPROC_NEXT,
-		(xdrproc_t)xdr_ypreq_key, &yprk,
-		(xdrproc_t)xdr_ypresp_key_val, &yprkv, tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_next: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-	if (!(r = ypprot_err(yprkv.stat))) {
-		*outkeylen = yprkv.key.keydat_len;
-		*outkey = (char *)malloc(*outkeylen+1);
-		bcopy(yprkv.key.keydat_val, *outkey, *outkeylen);
-		(*outkey)[*outkeylen] = '\0';
-		*outvallen = yprkv.val.valdat_len;
-		*outval = (char *)malloc(*outvallen+1);
-		bcopy(yprkv.val.valdat_val, *outval, *outvallen);
-		(*outval)[*outvallen] = '\0';
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_all(char *indomain, char *inmap, struct ypall_callback *incallback)
-{
-	struct ypreq_nokey yprnk;
-	struct dom_binding *ysd;
-	struct timeval tv;
-	struct sockaddr_in clnt_sin;
-	CLIENT *clnt;
-	u_long status, savstat;
-	int clnt_sock;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain) ||
-	    inmap == NULL || !strlen(inmap))
-		return (YPERR_BADARGS);
-
-	YPLOCK();
-again:
-
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	/* YPPROC_ALL manufactures its own channel to ypserv using TCP */
-
-	clnt_sock = RPC_ANYSOCK;
-	clnt_sin = ysd->dom_server_addr;
-	clnt_sin.sin_port = 0;
-	clnt = clnttcp_create(&clnt_sin, YPPROG, YPVERS, &clnt_sock, 0, 0);
-	if (clnt == NULL) {
-		YPUNLOCK();
-		printf("clnttcp_create failed\n");
-		return (YPERR_PMAP);
-	}
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-	ypresp_allfn = incallback->foreach;
-	ypresp_data = (void *)incallback->data;
-
-	if (clnt_call(clnt, YPPROC_ALL,
-		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		(xdrproc_t)xdr_ypresp_all_seq, &status, tv) != RPC_SUCCESS) {
-			clnt_perror(ysd->dom_client, "yp_all: clnt_call");
-			clnt_destroy(clnt);
-			_yp_unbind(ysd);
-			goto again;
-	}
-
-	clnt_destroy(clnt);
-	savstat = status;
-	xdr_free((xdrproc_t)xdr_ypresp_all_seq, &status);	/* not really needed... */
-	YPUNLOCK();
-	if (savstat != YP_NOMORE)
-		return (ypprot_err(savstat));
-	return (0);
-}
-
-int
-yp_order(char *indomain, char *inmap, int *outorder)
-{
- 	struct dom_binding *ysd;
-	struct ypresp_order ypro;
-	struct ypreq_nokey yprnk;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain) ||
-	    inmap == NULL || !strlen(inmap))
-		return (YPERR_BADARGS);
-
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-
-	bzero((char *)(char *)&ypro, sizeof ypro);
-
-	r = clnt_call(ysd->dom_client, YPPROC_ORDER,
-		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		(xdrproc_t)xdr_ypresp_order, &ypro, tv);
-
-	/*
-	 * NIS+ in YP compat mode doesn't support the YPPROC_ORDER
-	 * procedure.
-	 */
-	if (r == RPC_PROCUNAVAIL) {
-		YPUNLOCK();
-		return(YPERR_YPERR);
-	}
-
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_order: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-
-	if (!(r = ypprot_err(ypro.stat))) {
-		*outorder = ypro.ordernum;
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_order, &ypro);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_master(char *indomain, char *inmap, char **outname)
-{
-	struct dom_binding *ysd;
-	struct ypresp_master yprm;
-	struct ypreq_nokey yprnk;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain) ||
-	    inmap == NULL || !strlen(inmap))
-		return (YPERR_BADARGS);
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-
-	bzero((char *)&yprm, sizeof yprm);
-
-	r = clnt_call(ysd->dom_client, YPPROC_MASTER,
-		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		(xdrproc_t)xdr_ypresp_master, &yprm, tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_master: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-
-	if (!(r = ypprot_err(yprm.stat))) {
-		*outname = (char *)strdup(yprm.peer);
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_master, &yprm);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_maplist(char *indomain, struct ypmaplist **outmaplist)
-{
-	struct dom_binding *ysd;
-	struct ypresp_maplist ypml;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain))
-		return (YPERR_BADARGS);
-
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	bzero((char *)&ypml, sizeof ypml);
-
-	r = clnt_call(ysd->dom_client, YPPROC_MAPLIST,
-		(xdrproc_t)xdr_domainname, &indomain,
-		(xdrproc_t)xdr_ypresp_maplist, &ypml,tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_maplist: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-	if (!(r = ypprot_err(ypml.stat))) {
-		*outmaplist = ypml.maps;
-	}
-
-	/* NO: xdr_free((xdrproc_t)xdr_ypresp_maplist, &ypml);*/
-	YPUNLOCK();
-	return (r);
-}
-
-const char *
-yperr_string(int incode)
-{
-	static char err[80];
-
-	switch (incode) {
-	case 0:
-		return ("Success");
-	case YPERR_BADARGS:
-		return ("Request arguments bad");
-	case YPERR_RPC:
-		return ("RPC failure");
-	case YPERR_DOMAIN:
-		return ("Can't bind to server which serves this domain");
-	case YPERR_MAP:
-		return ("No such map in server's domain");
-	case YPERR_KEY:
-		return ("No such key in map");
-	case YPERR_YPERR:
-		return ("YP server error");
-	case YPERR_RESRC:
-		return ("Local resource allocation failure");
-	case YPERR_NOMORE:
-		return ("No more records in map database");
-	case YPERR_PMAP:
-		return ("Can't communicate with portmapper");
-	case YPERR_YPBIND:
-		return ("Can't communicate with ypbind");
-	case YPERR_YPSERV:
-		return ("Can't communicate with ypserv");
-	case YPERR_NODOM:
-		return ("Local domain name not set");
-	case YPERR_BADDB:
-		return ("Server data base is bad");
-	case YPERR_VERS:
-		return ("YP server version mismatch - server can't supply service.");
-	case YPERR_ACCESS:
-		return ("Access violation");
-	case YPERR_BUSY:
-		return ("Database is busy");
-	}
-	sprintf(err, "YP unknown error %d\n", incode);
-	return (err);
-}
-
-int
-ypprot_err(unsigned int incode)
-{
-	switch (incode) {
-	case YP_TRUE:
-		return (0);
-	case YP_FALSE:
-		return (YPERR_YPBIND);
-	case YP_NOMORE:
-		return (YPERR_NOMORE);
-	case YP_NOMAP:
-		return (YPERR_MAP);
-	case YP_NODOM:
-		return (YPERR_DOMAIN);
-	case YP_NOKEY:
-		return (YPERR_KEY);
-	case YP_BADOP:
-		return (YPERR_YPERR);
-	case YP_BADDB:
-		return (YPERR_BADDB);
-	case YP_YPERR:
-		return (YPERR_YPERR);
-	case YP_BADARGS:
-		return (YPERR_BADARGS);
-	case YP_VERS:
-		return (YPERR_VERS);
-	}
-	return (YPERR_YPERR);
-}
-
-int
-_yp_check(char **dom)
-{
-	char *unused;
-
-	YPLOCK();
-	if (_yp_domain[0]=='\0')
-		if (yp_get_default_domain_locked(&unused)) {
-			YPUNLOCK();
-			return (0);
-		}
-
-	if (dom)
-		*dom = _yp_domain;
-
-	if (yp_bind_locked(_yp_domain) == 0) {
-		yp_unbind_locked(_yp_domain);
-		YPUNLOCK();
-		return (1);
-	}
-	YPUNLOCK();
-	return (0);
-}
diff --git a/lib/libc_bsd/Makefile b/lib/libc_bsd/Makefile
deleted file mode 100644
index bdc7151..0000000
--- a/lib/libc_bsd/Makefile
+++ /dev/null
@@ -1,178 +0,0 @@
-#	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD: releng/10.2/lib/libc/Makefile 282854 2015-05-13 11:32:55Z ngie $
-
-SHLIBDIR?= /lib
-
-.include <bsd.own.mk>
-
-# Pick the current architecture directory for libc. In general, this is
-# named MACHINE_CPUARCH, but some ABIs are different enough to require
-# their own libc, so allow a directory named MACHINE_ARCH to override this.
-
-.if exists(${.CURDIR}/${MACHINE_ARCH})
-LIBC_ARCH=${MACHINE_ARCH}
-.else
-LIBC_ARCH=${MACHINE_CPUARCH}
-.endif
-
-# All library objects contain FreeBSD revision strings by default; they may be
-# excluded as a space-saving measure.  To produce a library that does
-# not contain these strings, add -DSTRIP_FBSDID (see <sys/cdefs.h>) to CFLAGS
-# below.  Note: there are no IDs for syscall stubs whose sources are generated.
-# To include legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS
-# to CFLAGS below.  -DSYSLIBC_SCCS affects just the system call stubs.
-LIB=c
-SHLIB_MAJOR= 7
-SHLIB_LDSCRIPT=libc.ldscript
-WARNS?=	2
-CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
-CFLAGS+=-I${.CURDIR}/${LIBC_ARCH}
-.if ${MK_NLS} != "no"
-CFLAGS+=-DNLS
-.endif
-CLEANFILES+=tags
-INSTALL_PIC_ARCHIVE=
-PRECIOUSLIB=
-
-.ifndef NO_THREAD_STACK_UNWIND
-CANCELPOINTS_CFLAGS=-fexceptions
-CFLAGS+=${CANCELPOINTS_CFLAGS}
-.endif
-
-#
-# Only link with static libgcc.a (no libgcc_eh.a).
-#
-DPADD+=	${LIBGCC}
-LDFLAGS+= -nodefaultlibs
-LDADD+= -lgcc
-
-.if ${MK_SSP} != "no"
-DPADD+= ${LIBSSP_NONSHARED}
-LDADD+= -lssp_nonshared
-.endif
-
-# Extras that live in either libc.a or libc_nonshared.a
-LIBC_NONSHARED_SRCS=
-
-# Define (empty) variables so that make doesn't give substitution
-# errors if the included makefiles don't change these:
-MDSRCS=
-MISRCS=
-MDASM=
-MIASM=
-NOASM=
-
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-.if ${MK_ICONV} != "no"
-Makefile.incl"
-.endif
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-.if ${LIBC_ARCH} != "amd64" && \
-    ${LIBC_ARCH} != "ia64" && \
-    ${LIBC_ARCH} != "powerpc64" && \
-    ${LIBC_ARCH} != "sparc64" && \
-    ${MACHINE_ARCH:Mmipsn32*} == "" && \
-    ${MACHINE_ARCH:Mmips64*} == ""
-Makefile.incl"
-.endif
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-.if ${LIBC_ARCH} == "arm" || ${LIBC_ARCH} == "mips"
-Makefile.incl"
-.endif
-.if ${MK_NIS} != "no"
-CFLAGS+= -DYP
-Makefile.incl"
-.endif
-Makefile.incl"
-.if ${MK_HESIOD} != "no"
-CFLAGS+= -DHESIOD
-.endif
-.if ${MK_FP_LIBC} == "no"
-CFLAGS+= -DNO_FLOATING_POINT
-.endif
-.if ${MK_NS_CACHING} != "no"
-CFLAGS+= -DNS_CACHING
-.endif
-.if defined(_FREEFALL_CONFIG)
-CFLAGS+=-D_FREEFALL_CONFIG
-.endif
-
-STATICOBJS+=${LIBC_NONSHARED_SRCS:S/.c$/.o/}
-
-VERSION_DEF=${.CURDIR}/Versions.def
-SYMBOL_MAPS=${SYM_MAPS}
-CFLAGS+= -DSYMBOL_VERSIONING
-
-# If there are no machine dependent sources, append all the
-# machine-independent sources:
-.if empty(MDSRCS)
-SRCS+=	${MISRCS}
-.else
-# Append machine-dependent sources, then append machine-independent sources
-# for which there is no machine-dependent variant.
-SRCS+=	${MDSRCS}
-.for _src in ${MISRCS}
-.if ${MDSRCS:R:M${_src:R}} == ""
-SRCS+=	${_src}
-.endif
-.endfor
-.endif
-
-KQSRCS=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c iordi3.c \
-	lshldi3.c lshrdi3.c moddi3.c muldi3.c negdi2.c notdi2.c qdivrem.c \
-	subdi3.c ucmpdi2.c udivdi3.c umoddi3.c xordi3.c
-KSRCS=	bcmp.c ffs.c ffsl.c fls.c flsl.c mcount.c strcat.c strchr.c \
-	strcmp.c strcpy.c strlen.c strncpy.c strrchr.c
-
-libkern: libkern.gen libkern.${LIBC_ARCH}
-
-libkern.gen: ${KQSRCS} ${KSRCS}
-	cp -p ${.CURDIR}/quad/quad.h ${.ALLSRC} ${DESTDIR}/sys/libkern
-
-libkern.${LIBC_ARCH}:: ${KMSRCS}
-.if defined(KMSRCS) && !empty(KMSRCS)
-	cp -p ${.ALLSRC} ${DESTDIR}/sys/libkern/${LIBC_ARCH}
-.endif
-
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-CFLAGS+=-DSYSCALL_COMPAT
-.endif
-
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
-
-.include <bsd.lib.mk>
-
-# Disable warnings in contributed sources.
-CWARNFLAGS:=	${.IMPSRC:Ngdtoa_*.c:C/^.+$/${CWARNFLAGS}/:C/^$/-w/}
-# XXX For now, we don't allow libc to be compiled with
-# -fstack-protector-all because it breaks rtld.  We may want to make a librtld
-# in the future to circumvent this.
-SSP_CFLAGS:=	${SSP_CFLAGS:S/^-fstack-protector-all$/-fstack-protector/}
-# Disable stack protection for SSP symbols.
-SSP_CFLAGS:=	${.IMPSRC:N*/stack_protector.c:C/^.+$/${SSP_CFLAGS}/}
-# Generate stack unwinding tables for cancellation points
-CANCELPOINTS_CFLAGS:=	${.IMPSRC:Mcancelpoints_*:C/^.+$/${CANCELPOINTS_CFLAGS}/:C/^$//}
diff --git a/lib/libc_bsd/Versions.def b/lib/libc_bsd/Versions.def
deleted file mode 100644
index 747f0af..0000000
--- a/lib/libc_bsd/Versions.def
+++ /dev/null
@@ -1,38 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/Versions.def 269792 2014-08-10 22:26:29Z ian $
-
-#
-# Note: Whenever bumping the FBSD version, always make
-#       FBSDprivate_1.0 depend on the new FBSD version.
-#       This will keep it at the end of the dependency chain.
-#
-
-# This is our first version; it depends on no other.
-# This version was first added to 7.0-current.
-FBSD_1.0 {
-};
-
-# This version was first added to 8.0-current.
-FBSD_1.1 {
-} FBSD_1.0;
-
-# This version was first added to 9.0-current.
-FBSD_1.2 {
-} FBSD_1.1;
-
-# This version was first added to 10.0-current.
-FBSD_1.3 {
-} FBSD_1.2;
-
-# This version was first added to 11.0-current.
-FBSD_1.4 {
-} FBSD_1.3;
-
-
-# This is our private namespace.  Any global interfaces that are
-# strictly for use only by other FreeBSD applications and libraries
-# are listed here.  We use a separate namespace so we can write
-# simple ABI-checking tools.
-#
-# Please do NOT increment the version of this namespace.
-FBSDprivate_1.0 {
-} FBSD_1.4;
diff --git a/lib/libc_bsd/amd64/Makefile.inc b/lib/libc_bsd/amd64/Makefile.inc
deleted file mode 100644
index c1849bd..0000000
--- a/lib/libc_bsd/amd64/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.incl 174204 2007-12-03 07:17:33Z das $
-#
-# Machine dependent definitions for the amd64 architecture.
-#
-
-# Long double is 80 bits
-GDTOASRCS+=strtorx.c
-MDSRCS+=machdep_ldisx.c
-SYM_MAPS+=${.CURDIR}/amd64/Symbol.map
diff --git a/lib/libc_bsd/amd64/SYS.h b/lib/libc_bsd/amd64/SYS.h
deleted file mode 100644
index 26bc464..0000000
--- a/lib/libc_bsd/amd64/SYS.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD: releng/10.2/lib/libc/amd64/SYS.h 240178 2012-09-06 20:59:49Z jilles $
- */
-
-#include <sys/syscall.h>
-#include <machine/asm.h>
-
-#define	RSYSCALL(x)	ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(x);					\
-			.set CNAME(x),CNAME(__CONCAT(__sys_,x));	\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL;		\
-			jb HIDENAME(cerror); ret;			\
-			END(__CONCAT(__sys_,x))
-
-#define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL;		\
-			jb HIDENAME(cerror); ret;			\
-			END(__CONCAT(__sys_,x))
-
-#define KERNCALL	movq %rcx, %r10; syscall
diff --git a/lib/libc_bsd/amd64/Symbol.map b/lib/libc_bsd/amd64/Symbol.map
deleted file mode 100644
index 9897a5a..0000000
--- a/lib/libc_bsd/amd64/Symbol.map
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/amd64/Symbol.map 240178 2012-09-06 20:59:49Z jilles $
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSD_1.0 {
-	/* PSEUDO syscalls */
-	_exit;
-
-	.mcount;
-	_setjmp;
-	_longjmp;
-	fabs;
-	__flt_rounds;
-	fpgetmask;
-	fpgetprec;
-	fpgetround;
-	fpgetsticky;
-	fpsetmask;
-	fpsetprec;
-	fpsetround;
-	__infinity;
-	__nan;
-	makecontext;
-	rfork_thread;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
-	htonl;
-	htons;
-	ntohl;
-	ntohs;
-	amd64_get_fsbase;
-	amd64_get_gsbase;
-	amd64_set_fsbase;
-	amd64_set_gsbase;
-	brk;
-	exect;
-	sbrk;
-	vfork;
-};
-
-/*
- *
- * FreeBSD private ABI
- *
- */
-FBSDprivate_1.0 {
-	/* PSEUDO syscalls */
-	__sys_getlogin;
-	_getlogin;
-	__sys_exit;
-
-	_set_tp;
-	___longjmp;
-	__makecontext;
-	__longjmp;
-	__signalcontext;
-	signalcontext;
-	__siglongjmp;
-	.curbrk;
-	.minbrk;
-	_brk;
-	_end;
-	__sys_vfork;
-	_vfork;
-};
diff --git a/lib/libc_bsd/amd64/_fpmath.h b/lib/libc_bsd/amd64/_fpmath.h
deleted file mode 100644
index 6c8cd4a..0000000
--- a/lib/libc_bsd/amd64/_fpmath.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/amd64/_fpmath.h 175402 2008-01-17 16:39:07Z bde $
- */
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-		unsigned int	manl	:32;
-		unsigned int	manh	:32;
-		unsigned int	exp	:15;
-		unsigned int	sign	:1;
-		unsigned int	junkl	:16;
-		unsigned int	junkh	:32;
-	} bits;
-	struct {
-		unsigned long	man	:64;
-		unsigned int	expsign	:16;
-		unsigned long	junk	:48;
-	} xbits;
-};
-
-#define	LDBL_NBIT	0x80000000
-#define	mask_nbit_l(u)	((u).bits.manh &= ~LDBL_NBIT)
-
-#define	LDBL_MANH_SIZE	32
-#define	LDBL_MANL_SIZE	32
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)(u).bits.manh;		\
-} while (0)
diff --git a/lib/libc_bsd/amd64/arith.h b/lib/libc_bsd/amd64/arith.h
deleted file mode 100644
index d008ec1..0000000
--- a/lib/libc_bsd/amd64/arith.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD: releng/10.2/lib/libc/amd64/arith.h 114839 2003-05-08 13:50:44Z das $
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-
-#define IEEE_8087
-#define Arith_Kind_ASL 1
-#define Long int
-#define Intcast (int)(long)
-#define Double_Align
-#define X64_bit_pointers
diff --git a/lib/libc_bsd/amd64/gd_qnan.h b/lib/libc_bsd/amd64/gd_qnan.h
deleted file mode 100644
index 6308f57..0000000
--- a/lib/libc_bsd/amd64/gd_qnan.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * This file can be generated by compiling and running contrib/gdtoa/qnan.c
- * on the target architecture after arith.h has been generated.
- *
- * $FreeBSD: releng/10.2/lib/libc/amd64/gd_qnan.h 174680 2007-12-16 21:15:09Z das $
- */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
-#define ld_QNAN0 0x0
-#define ld_QNAN1 0xc0000000
-#define ld_QNAN2 0x7fff
-#define ld_QNAN3 0x0
-#define ldus_QNAN0 0x0
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0xc000
-#define ldus_QNAN4 0x7fff
diff --git a/lib/libc_bsd/amd64/gen/Makefile.inc b/lib/libc_bsd/amd64/gen/Makefile.inc
deleted file mode 100644
index ca987bf..0000000
--- a/lib/libc_bsd/amd64/gen/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 230429 2012-01-21 18:00:28Z kib $
-
-SRCS+=	_setjmp.S _set_tp.c rfork_thread.S setjmp.S sigsetjmp.S \
-	fabs.S getcontextx.c \
-	infinity.c ldexp.c makecontext.c signalcontext.c \
-	flt_rounds.c fpgetmask.c fpsetmask.c fpgetprec.c fpsetprec.c \
-	fpgetround.c fpsetround.c fpgetsticky.c
diff --git a/lib/libc_bsd/amd64/gen/_set_tp.c b/lib/libc_bsd/amd64/gen/_set_tp.c
deleted file mode 100644
index 8f2360a..0000000
--- a/lib/libc_bsd/amd64/gen/_set_tp.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/amd64/gen/_set_tp.c 133754 2004-08-15 16:18:52Z dfr $
- */
-
-#include <string.h>
-#include <stdint.h>
-#include <machine/sysarch.h>
-
-void
-_set_tp(void *tp)
-{
-
-	amd64_set_fsbase(tp);
-}
diff --git a/lib/libc_bsd/amd64/gen/_setjmp.S b/lib/libc_bsd/amd64/gen/_setjmp.S
deleted file mode 100644
index a7e5c4a..0000000
--- a/lib/libc_bsd/amd64/gen/_setjmp.S
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/_setjmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	_setjmp(a)
- * by restoring registers from the environment 'a'.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	movq	%rdi,%rax
-	movq	0(%rsp),%rdx		/* retval */
-	movq	%rdx, 0(%rax)		/* 0; retval */
-	movq	%rbx, 8(%rax)		/* 1; rbx */
-	movq	%rsp,16(%rax)		/* 2; rsp */
-	movq	%rbp,24(%rax)		/* 3; rbp */
-	movq	%r12,32(%rax)		/* 4; r12 */
-	movq	%r13,40(%rax)		/* 5; r13 */
-	movq	%r14,48(%rax)		/* 6; r14 */
-	movq	%r15,56(%rax)		/* 7; r15 */
-	fnstcw	64(%rax)		/* 8; fpu cw */
-	stmxcsr	68(%rax)		/*    and mxcsr */
-	xorq	%rax,%rax
-	ret
-END(_setjmp)
-
-	.weak	CNAME(_longjmp)
-	.set	CNAME(_longjmp),CNAME(___longjmp)
-ENTRY(___longjmp)
-	movq	%rdi,%rdx
-	/* Restore the mxcsr, but leave exception flags intact. */
-	stmxcsr	-4(%rsp)
-	movl	68(%rdx),%eax
-	andl	$0xffffffc0,%eax
-	movl	-4(%rsp),%edi
-	andl	$0x3f,%edi
-	xorl	%eax,%edi
-	movl	%edi,-4(%rsp)
-	ldmxcsr -4(%rsp)
-	movq	%rsi,%rax		/* retval */
-	movq	0(%rdx),%rcx
-	movq	8(%rdx),%rbx
-	movq	16(%rdx),%rsp
-	movq	24(%rdx),%rbp
-	movq	32(%rdx),%r12
-	movq	40(%rdx),%r13
-	movq	48(%rdx),%r14
-	movq	56(%rdx),%r15
-	fldcw	64(%rdx)
-	testq	%rax,%rax
-	jnz	1f
-	incq	%rax
-1:	movq	%rcx,0(%rsp)
-	ret
-END(___longjmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/gen/fabs.S b/lib/libc_bsd/amd64/gen/fabs.S
deleted file mode 100644
index 08d1b1c..0000000
--- a/lib/libc_bsd/amd64/gen/fabs.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2004 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/fabs.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * Return floating point absolute value of a double.
- */
-
-	.text
-ENTRY(fabs)
-	movsd	%xmm0, %xmm1
-	movsd	signbit(%rip), %xmm0
-	andnpd  %xmm1, %xmm0
-	ret
-END(fabs)
-
-	.data
-signbit:
-	.quad	0x8000000000000000
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/gen/flt_rounds.c b/lib/libc_bsd/amd64/gen/flt_rounds.c
deleted file mode 100644
index 98fd397..0000000
--- a/lib/libc_bsd/amd64/gen/flt_rounds.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/flt_rounds.c 132383 2004-07-19 08:17:25Z das $");
-
-#include <float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	3,	/* round to zero */
-	2,	/* round to negative infinity */
-	0	/* round to positive infinity */
-};
-
-int
-__flt_rounds(void)
-{
-	int x;
-
-        /* Assume that the x87 and the SSE unit agree on the rounding mode. */
-	__asm("fnstcw %0" : "=m" (x));
-        return (map[(x >> 10) & 0x03]);
-}
diff --git a/lib/libc_bsd/amd64/gen/fpgetmask.c b/lib/libc_bsd/amd64/gen/fpgetmask.c
deleted file mode 100644
index 9788244..0000000
--- a/lib/libc_bsd/amd64/gen/fpgetmask.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/amd64/gen/fpgetmask.c 117864 2003-07-22 06:46:17Z peter $ */
-#define __IEEEFP_NOINLINES__ 1
-#include <ieeefp.h>
-
-fp_except_t fpgetmask(void)
-{
-	return __fpgetmask();
-}
diff --git a/lib/libc_bsd/amd64/gen/fpgetprec.c b/lib/libc_bsd/amd64/gen/fpgetprec.c
deleted file mode 100644
index 03eae41..0000000
--- a/lib/libc_bsd/amd64/gen/fpgetprec.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/amd64/gen/fpgetprec.c 117864 2003-07-22 06:46:17Z peter $ */
-#define __IEEEFP_NOINLINES__ 1
-#include <ieeefp.h>
-
-fp_prec_t fpgetprec(void)
-{
-	return __fpgetprec();
-}
diff --git a/lib/libc_bsd/amd64/gen/fpgetround.c b/lib/libc_bsd/amd64/gen/fpgetround.c
deleted file mode 100644
index 53427bb..0000000
--- a/lib/libc_bsd/amd64/gen/fpgetround.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/amd64/gen/fpgetround.c 117864 2003-07-22 06:46:17Z peter $ */
-#define __IEEEFP_NOINLINES__ 1
-#include <ieeefp.h>
-
-fp_rnd_t fpgetround(void)
-{
-	return __fpgetround();
-}
diff --git a/lib/libc_bsd/amd64/gen/fpgetsticky.c b/lib/libc_bsd/amd64/gen/fpgetsticky.c
deleted file mode 100644
index e209637..0000000
--- a/lib/libc_bsd/amd64/gen/fpgetsticky.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/amd64/gen/fpgetsticky.c 117864 2003-07-22 06:46:17Z peter $ */
-#define __IEEEFP_NOINLINES__ 1
-#include <ieeefp.h>
-
-fp_except_t fpgetsticky(void)
-{
-	return __fpgetsticky();
-}
diff --git a/lib/libc_bsd/amd64/gen/fpsetmask.c b/lib/libc_bsd/amd64/gen/fpsetmask.c
deleted file mode 100644
index 94d2762..0000000
--- a/lib/libc_bsd/amd64/gen/fpsetmask.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/amd64/gen/fpsetmask.c 117864 2003-07-22 06:46:17Z peter $ */
-#define __IEEEFP_NOINLINES__ 1
-#include <ieeefp.h>
-
-fp_except_t fpsetmask(fp_except_t m)
-{
-	return (__fpsetmask(m));
-}
diff --git a/lib/libc_bsd/amd64/gen/fpsetprec.c b/lib/libc_bsd/amd64/gen/fpsetprec.c
deleted file mode 100644
index a8779cb..0000000
--- a/lib/libc_bsd/amd64/gen/fpsetprec.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/amd64/gen/fpsetprec.c 117864 2003-07-22 06:46:17Z peter $ */
-#define __IEEEFP_NOINLINES__ 1
-#include <ieeefp.h>
-
-fp_prec_t fpsetprec(fp_prec_t m)
-{
-	return (__fpsetprec(m));
-}
diff --git a/lib/libc_bsd/amd64/gen/fpsetround.c b/lib/libc_bsd/amd64/gen/fpsetround.c
deleted file mode 100644
index fcb46c8..0000000
--- a/lib/libc_bsd/amd64/gen/fpsetround.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/amd64/gen/fpsetround.c 117864 2003-07-22 06:46:17Z peter $ */
-#define __IEEEFP_NOINLINES__ 1
-#include <ieeefp.h>
-
-fp_rnd_t fpsetround(fp_rnd_t m)
-{
-	return (__fpsetround(m));
-}
diff --git a/lib/libc_bsd/amd64/gen/getcontextx.c b/lib/libc_bsd/amd64/gen/getcontextx.c
deleted file mode 100644
index eea4c71..0000000
--- a/lib/libc_bsd/amd64/gen/getcontextx.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2011 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/getcontextx.c 251047 2013-05-28 04:54:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <machine/cpufunc.h>
-#include <machine/fpu.h>
-#include <machine/specialreg.h>
-#include <machine/sysarch.h>
-
-static int xstate_sz = -1;
-
-int
-__getcontextx_size(void)
-{
-	u_int p[4];
-
-	if (xstate_sz == -1) {
-		do_cpuid(1, p);
-		if ((p[2] & CPUID2_OSXSAVE) != 0) {
-			cpuid_count(0xd, 0x0, p);
-			xstate_sz = p[1] - sizeof(struct savefpu);
-		} else
-			xstate_sz = 0;
-	}
-
-	return (sizeof(ucontext_t) + xstate_sz);
-}
-
-int
-__fillcontextx2(char *ctx)
-{
-	struct amd64_get_xfpustate xfpu;
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	if (xstate_sz != 0) {
-		xfpu.addr = (char *)(ucp + 1);
-		xfpu.len = xstate_sz;
-		if (sysarch(AMD64_GET_XFPUSTATE, &xfpu) == -1)
-			return (-1);
-		ucp->uc_mcontext.mc_xfpustate = (__register_t)xfpu.addr;
-		ucp->uc_mcontext.mc_xfpustate_len = xstate_sz;
-		ucp->uc_mcontext.mc_flags |= _MC_HASFPXSTATE;
-	} else {
-		ucp->uc_mcontext.mc_xfpustate = 0;
-		ucp->uc_mcontext.mc_xfpustate_len = 0;
-	}
-	return (0);
-}
-
-int
-__fillcontextx(char *ctx)
-{
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	if (getcontext(ucp) == -1)
-		return (-1);
-	__fillcontextx2(ctx);
-	return (0);
-}
-
-__weak_reference(__getcontextx, getcontextx);
-
-ucontext_t *
-__getcontextx(void)
-{
-	char *ctx;
-	int error;
-
-	ctx = malloc(__getcontextx_size());
-	if (ctx == NULL)
-		return (NULL);
-	if (__fillcontextx(ctx) == -1) {
-		error = errno;
-		free(ctx);
-		errno = error;
-		return (NULL);
-	}
-	return ((ucontext_t *)ctx);
-}
diff --git a/lib/libc_bsd/amd64/gen/infinity.c b/lib/libc_bsd/amd64/gen/infinity.c
deleted file mode 100644
index 919f82a..0000000
--- a/lib/libc_bsd/amd64/gen/infinity.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * infinity.c
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/infinity.c 110566 2003-02-08 20:37:55Z mike $");
-
-#include <math.h>
-
-/* bytes for +Infinity on a 387 */
-const union __infinity_un __infinity = { { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f } };
-
-/* bytes for NaN */
-const union __nan_un __nan = { { 0, 0, 0xc0, 0xff } };
diff --git a/lib/libc_bsd/amd64/gen/makecontext.c b/lib/libc_bsd/amd64/gen/makecontext.c
deleted file mode 100644
index 4b8b66d..0000000
--- a/lib/libc_bsd/amd64/gen/makecontext.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/makecontext.c 132912 2004-07-31 01:41:41Z davidxu $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-typedef void (*func_t)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t,
-    uint64_t);
-
-/* Prototypes */
-static void makectx_wrapper(ucontext_t *ucp, func_t func, uint64_t *args);
-
-__weak_reference(__makecontext, makecontext);
-
-void
-__makecontext(ucontext_t *ucp, void (*start)(void), int argc, ...)
-{
-	uint64_t *args;
-	uint64_t *sp;
-	va_list ap;
-	int i;
-
-	/* A valid context is required. */
-	if ((ucp == NULL) || (ucp->uc_mcontext.mc_len != sizeof(mcontext_t)))
-		return;
-	else if ((argc < 0) || (argc > 6) || (ucp->uc_stack.ss_sp == NULL) ||
-	    (ucp->uc_stack.ss_size < MINSIGSTKSZ)) {
-		/*
-		 * This should really return -1 with errno set to ENOMEM
-		 * or something, but the spec says that makecontext is
-		 * a void function.   At least make sure that the context
-		 * isn't valid so it can't be used without an error.
-		 */
-		ucp->uc_mcontext.mc_len = 0;
-		return;
-	}
-
-	/* Align the stack to 16 bytes. */
-	sp = (uint64_t *)(ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-	sp = (uint64_t *)((uint64_t)sp & ~15UL);
-
-	/* Allocate space for a maximum of 6 arguments on the stack. */
-	args = sp - 6;
-
-	/*
-	 * Account for arguments on stack and do the funky C entry alignment.
-	 * This means that we need an 8-byte-odd alignment since the ABI expects
-	 * the return address to be pushed, thus breaking the 16 byte alignment.
-	 */
-	sp -= 7;
-
-	/* Add the arguments: */
-	va_start(ap, argc);
-	for (i = 0; i < argc; i++)
-		args[i] = va_arg(ap, uint64_t);
-	va_end(ap);
-	for (i = argc; i < 6; i++)
-		args[i] = 0;
-
-	ucp->uc_mcontext.mc_rdi = (register_t)ucp;
-	ucp->uc_mcontext.mc_rsi = (register_t)start;
-	ucp->uc_mcontext.mc_rdx = (register_t)args;
-	ucp->uc_mcontext.mc_rbp = 0;
-	ucp->uc_mcontext.mc_rbx = (register_t)sp;
-	ucp->uc_mcontext.mc_rsp = (register_t)sp;
-	ucp->uc_mcontext.mc_rip = (register_t)makectx_wrapper;
-}
-
-static void
-makectx_wrapper(ucontext_t *ucp, func_t func, uint64_t *args)
-{
-	(*func)(args[0], args[1], args[2], args[3], args[4], args[5]);
-	if (ucp->uc_link == NULL)
-		exit(0);
-	setcontext((const ucontext_t *)ucp->uc_link);
-	/* should never get here */
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/amd64/gen/rfork_thread.S b/lib/libc_bsd/amd64/gen/rfork_thread.S
deleted file mode 100644
index a5a42b3..0000000
--- a/lib/libc_bsd/amd64/gen/rfork_thread.S
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 2000 Peter Wemm <peter@FreeBSD.org>
- * Copyright (c) 2003 Alan L. Cox <alc@cs.rice.edu>
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/rfork_thread.S 240178 2012-09-06 20:59:49Z jilles $");
-
-/*
- * With thanks to John Dyson for the original version of this.
- */
-
-#include <SYS.h>
-
-/*
- *              %edi   %rsi        %rdx       %rcx
- * rfork_thread(flags, stack_addr, start_fnc, start_arg);
- *
- * flags:		Flags to rfork system call.  See rfork(2).
- * stack_addr:		Top of stack for thread.
- * start_fnc:		Address of thread function to call in child.
- * start_arg:		Argument to pass to the thread function in child.
- */
-
-ENTRY(rfork_thread)
-	pushq	%rbx
-	pushq	%r12
-	movq	%rdx, %rbx
-	movq	%rcx, %r12
-
-	/*
-	 * Prepare and execute the thread creation syscall
-	 */
-	movq	$SYS_rfork, %rax
-	KERNCALL
-	jb 	2f
-
-	/*
-	 * Check to see if we are in the parent or child
-	 */
-	cmpl	$0, %edx
-	jnz	1f
-	popq	%r12
-	popq	%rbx
-	ret
-
-	/*
-	 * If we are in the child (new thread), then
-	 * set-up the call to the internal subroutine.  If it
-	 * returns, then call __exit.
-	 */
-1:
-	movq	%rsi, %rsp
-	movq	%r12, %rdi 
-	call	*%rbx
-	movl	%eax, %edi
-
-	/*
-	 * Exit system call
-	 */
-#ifdef SYS_exit
-	movq	$SYS_exit, %rax
-#else
-	movq	$SYS_sys_exit, %rax
-#endif
-	KERNCALL
-
-	/*
-	 * Branch here if the thread creation fails:
-	 */
-2:
-	popq	%r12
-	popq	%rbx
-	jmp	HIDENAME(cerror)
-END(rfork_thread)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/gen/setjmp.S b/lib/libc_bsd/amd64/gen/setjmp.S
deleted file mode 100644
index 39a2372..0000000
--- a/lib/libc_bsd/amd64/gen/setjmp.S
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/setjmp.S 287872 2015-09-16 20:59:41Z delphij $");
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	setjmp(a)
- * by restoring registers from the environment 'a'.
- * The previous signal state is restored.
- */
-
-#include "SYS.h"
-
-ENTRY(setjmp)
-	pushq	%rdi
-	movq	%rdi,%rcx
-	movq	$1,%rdi			/* SIG_BLOCK       */
-	movq	$0,%rsi			/* (sigset_t*)set  */
-	leaq	72(%rcx),%rdx		/* 9,10; (sigset_t*)oset */
-	/* stack is 16-byte aligned */
-	call	__libc_sigprocmask
-	popq	%rdi
-	movq	%rdi,%rcx
-	movq	0(%rsp),%rdx		/* retval */
-	movq	%rdx, 0(%rcx)		/* 0; retval */
-	movq	%rbx, 8(%rcx)		/* 1; rbx */
-	movq	%rsp,16(%rcx)		/* 2; rsp */
-	movq	%rbp,24(%rcx)		/* 3; rbp */
-	movq	%r12,32(%rcx)		/* 4; r12 */
-	movq	%r13,40(%rcx)		/* 5; r13 */
-	movq	%r14,48(%rcx)		/* 6; r14 */
-	movq	%r15,56(%rcx)		/* 7; r15 */
-	fnstcw	64(%rcx)		/* 8; fpu cw */
-	stmxcsr	68(%rcx)		/*    and mxcsr */
-	xorq	%rax,%rax
-	ret
-END(setjmp)
-
-	.weak CNAME(longjmp)
-	.set CNAME(longjmp),CNAME(__longjmp)
-ENTRY(__longjmp)
-	pushq	%rdi
-	pushq	%rsi
-	movq	%rdi,%rdx
-	movq	$3,%rdi			/* SIG_SETMASK     */
-	leaq	72(%rdx),%rsi		/* (sigset_t*)set  */
-	movq	$0,%rdx			/* (sigset_t*)oset */
-	subq	$0x8,%rsp		/* make the stack 16-byte aligned */
-	call	__libc_sigprocmask
-	addq	$0x8,%rsp
-	popq	%rsi
-	popq	%rdi			/* jmpbuf */
-	movq	%rdi,%rdx
-	/* Restore the mxcsr, but leave exception flags intact. */
-	stmxcsr	-4(%rsp)
-	movl	68(%rdx),%eax
-	andl	$0xffffffc0,%eax
-	movl	-4(%rsp),%edi
-	andl	$0x3f,%edi
-	xorl	%eax,%edi
-	movl	%edi,-4(%rsp)
-	ldmxcsr -4(%rsp)
-	movq	%rsi,%rax		/* retval */
-	movq	0(%rdx),%rcx
-	movq	8(%rdx),%rbx
-	movq	16(%rdx),%rsp
-	movq	24(%rdx),%rbp
-	movq	32(%rdx),%r12
-	movq	40(%rdx),%r13
-	movq	48(%rdx),%r14
-	movq	56(%rdx),%r15
-	fldcw	64(%rdx)
-	testq	%rax,%rax
-	jnz	1f
-	incq	%rax
-1:	movq	%rcx,0(%rsp)
-	ret
-END(__longjmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/gen/signalcontext.c b/lib/libc_bsd/amd64/gen/signalcontext.c
deleted file mode 100644
index 382322c..0000000
--- a/lib/libc_bsd/amd64/gen/signalcontext.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/signalcontext.c 132795 2004-07-28 13:08:24Z davidxu $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <strings.h>
-
-typedef void (*handler_t)(uint64_t, uint64_t, uint64_t);
-
-/* Prototypes */
-static void sigctx_wrapper(ucontext_t *ucp, handler_t func, uint64_t *args);
-
-__weak_reference(__signalcontext, signalcontext);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	uint64_t *args;
-	siginfo_t *sig_si;
-	ucontext_t *sig_uc;
-	uint64_t sp;
-
-	/* Bail out if we don't have a valid ucontext pointer. */
-	if (ucp == NULL)
-		abort();
-
-	/*
-	 * Build a signal frame and copy the arguments of signal handler
-	 * 'func' onto the stack and do the funky stack alignment.
-	 * This means that we need an 8-byte-odd alignment since the ABI expects
-	 * the return address to be pushed, thus breaking the 16 byte alignment.
-	 */
-	sp = (ucp->uc_mcontext.mc_rsp - 128 - sizeof(ucontext_t)) & ~15UL;
-	sig_uc = (ucontext_t *)sp;
-	bcopy(ucp, sig_uc, sizeof(*sig_uc));
-	sp = (sp - sizeof(siginfo_t)) & ~15UL;
-	sig_si = (siginfo_t *)sp;
-	bzero(sig_si, sizeof(*sig_si));
-	sig_si->si_signo = sig;
-	sp -= 3 * sizeof(uint64_t);
-	args = (uint64_t *)sp;
-	args[0] = sig;
-	args[1] = (intptr_t)sig_si;
-	args[2] = (intptr_t)sig_uc;
-	sp -= 16;
-
-	/*
-	 * Setup the ucontext of the signal handler.
-	 */
-	bzero(&ucp->uc_mcontext, sizeof(ucp->uc_mcontext));
-	ucp->uc_mcontext.mc_fpformat = _MC_FPFMT_NODEV;
-	ucp->uc_mcontext.mc_ownedfp = _MC_FPOWNED_NONE;
-	ucp->uc_link = sig_uc;
-	sigdelset(&ucp->uc_sigmask, sig);
-
-	ucp->uc_mcontext.mc_len = sizeof(mcontext_t);
-	ucp->uc_mcontext.mc_rdi = (register_t)ucp;
-	ucp->uc_mcontext.mc_rsi = (register_t)func;
-	ucp->uc_mcontext.mc_rdx = (register_t)args;
-	ucp->uc_mcontext.mc_rbp = (register_t)sp;
-	ucp->uc_mcontext.mc_rbx = (register_t)sp;
-	ucp->uc_mcontext.mc_rsp = (register_t)sp;
-	ucp->uc_mcontext.mc_rip = (register_t)sigctx_wrapper;
-	return (0);
-}
-
-static void
-sigctx_wrapper(ucontext_t *ucp, handler_t func, uint64_t *args)
-{
-
-	(*func)(args[0], args[1], args[2]);
-	if (ucp->uc_link == NULL)
-		exit(0);
-	setcontext((const ucontext_t *)ucp->uc_link);
-	/* should never get here */
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/amd64/gen/sigsetjmp.S b/lib/libc_bsd/amd64/gen/sigsetjmp.S
deleted file mode 100644
index c56c5ea..0000000
--- a/lib/libc_bsd/amd64/gen/sigsetjmp.S
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/gen/sigsetjmp.S 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "SYS.h"
-
-/*-
- * TODO:
- *	Rename sigsetjmp to __sigsetjmp and siglongjmp to __siglongjmp,
- *	remove the other *jmp functions and define everything in terms
- *	of the renamed functions.  This requires compiler support for
- *	the renamed functions (introduced in gcc-2.5.3; previous versions
- *	only supported *jmp with 0 or 1 leading underscores).
- *
- *	Restore _all_ the registers and the signal mask atomically.  Can
- *	use sigreturn() if sigreturn() works.
- */
-
-ENTRY(sigsetjmp)
-	movl	%esi,88(%rdi)		/* 11; savemask */
-	testl	%esi,%esi
-	jz	2f
-	pushq	%rdi
-	movq	%rdi,%rcx
-	movq	$1,%rdi			/* SIG_BLOCK       */
-	movq	$0,%rsi			/* (sigset_t*)set  */
-	leaq	72(%rcx),%rdx		/* 9,10 (sigset_t*)oset */
-	/* stack is 16-byte aligned */
-	call	__libc_sigprocmask
-	popq	%rdi
-2:	movq	%rdi,%rcx
-	movq	0(%rsp),%rdx		/* retval */
-	movq	%rdx, 0(%rcx)		/* 0; retval */
-	movq	%rbx, 8(%rcx)		/* 1; rbx */
-	movq	%rsp,16(%rcx)		/* 2; rsp */
-	movq	%rbp,24(%rcx)		/* 3; rbp */
-	movq	%r12,32(%rcx)		/* 4; r12 */
-	movq	%r13,40(%rcx)		/* 5; r13 */
-	movq	%r14,48(%rcx)		/* 6; r14 */
-	movq	%r15,56(%rcx)		/* 7; r15 */
-	fnstcw	64(%rcx)		/* 8; fpu cw */
-	xorq	%rax,%rax
-	ret
-END(sigsetjmp)
-
-	.weak CNAME(siglongjmp)
-	.set CNAME(siglongjmp),CNAME(__siglongjmp)
-ENTRY(__siglongjmp)
-	cmpl	$0,88(%rdi)
-	jz	2f
-	movq	%rdi,%rdx
-	pushq	%rdi
-	pushq	%rsi
-	movq	$3,%rdi			/* SIG_SETMASK     */
-	leaq	72(%rdx),%rsi		/* (sigset_t*)set  */
-	movq	$0,%rdx			/* (sigset_t*)oset */
-	subq	$0x8,%rsp		/* make the stack 16-byte aligned */
-	call	__libc_sigprocmask
-	addq	$0x8,%rsp
-	popq	%rsi
-	popq	%rdi			/* jmpbuf */
-2:	movq	%rdi,%rdx
-	movq	%rsi,%rax		/* retval */
-	movq	0(%rdx),%rcx
-	movq	8(%rdx),%rbx
-	movq	16(%rdx),%rsp
-	movq	24(%rdx),%rbp
-	movq	32(%rdx),%r12
-	movq	40(%rdx),%r13
-	movq	48(%rdx),%r14
-	movq	56(%rdx),%r15
-	fninit
-	fldcw	64(%rdx)
-	testq	%rax,%rax
-	jnz	1f
-	incq	%rax
-1:	movq	%rcx,0(%rsp)
-	ret
-END(__siglongjmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/stdlib/Makefile.inc b/lib/libc_bsd/amd64/stdlib/Makefile.inc
deleted file mode 100644
index 3d49bfb..0000000
--- a/lib/libc_bsd/amd64/stdlib/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 168336 2007-04-04 01:19:54Z jkim $
-
-MDSRCS+=div.S ldiv.S lldiv.S
diff --git a/lib/libc_bsd/amd64/stdlib/div.S b/lib/libc_bsd/amd64/stdlib/div.S
deleted file mode 100644
index b5dd23d..0000000
--- a/lib/libc_bsd/amd64/stdlib/div.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/*	$NetBSD: div.S,v 1.1 2001/06/19 00:25:04 fvdl Exp $	*/
-
-/*-
- * Written by Frank van der Linden (fvdl@wasabisystems.com)
- * Public domain.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/stdlib/div.S 217106 2011-01-07 16:08:40Z kib $");
-
-ENTRY(div)
-	movl	%edi,%eax
-	cltd
-	idivl	%esi
-	salq	$32,%rdx
-	orq	%rdx,%rax
-	ret
-END(div)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/stdlib/ldiv.S b/lib/libc_bsd/amd64/stdlib/ldiv.S
deleted file mode 100644
index 8b670ad..0000000
--- a/lib/libc_bsd/amd64/stdlib/ldiv.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$NetBSD: ldiv.S,v 1.1 2001/06/19 00:25:04 fvdl Exp $	*/
-
-/*-
- * Written by gcc 3.0.
- * Copy/pasted by Frank van der Linden (fvdl@wasabisystems.com)
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/stdlib/ldiv.S 217106 2011-01-07 16:08:40Z kib $");
-
-ENTRY(ldiv)
-	movq	%rdi,%rax
-	cqto
-	idivq	%rsi
-	ret
-END(ldiv)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/stdlib/lldiv.S b/lib/libc_bsd/amd64/stdlib/lldiv.S
deleted file mode 100644
index c3149b3..0000000
--- a/lib/libc_bsd/amd64/stdlib/lldiv.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$NetBSD: ldiv.S,v 1.1 2001/06/19 00:25:04 fvdl Exp $	*/
-
-/*-
- * Written by gcc 3.0.
- * Copy/pasted by Frank van der Linden (fvdl@wasabisystems.com)
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/stdlib/lldiv.S 217106 2011-01-07 16:08:40Z kib $");
-
-ENTRY(lldiv)
-	movq	%rdi,%rax
-	cqto
-	idivq	%rsi
-	ret
-END(lldiv)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/string/Makefile.inc b/lib/libc_bsd/amd64/string/Makefile.inc
deleted file mode 100644
index ed27bf7..0000000
--- a/lib/libc_bsd/amd64/string/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile.incl 224246 2011-07-21 16:32:13Z gnn $
-
-MDSRCS+= bcmp.S bcopy.S bzero.S memcmp.S memcpy.S memmove.S memset.S \
-	strcat.S strcmp.S stpcpy.S strcpy.c
diff --git a/lib/libc_bsd/amd64/string/bcmp.S b/lib/libc_bsd/amd64/string/bcmp.S
deleted file mode 100644
index aff9183..0000000
--- a/lib/libc_bsd/amd64/string/bcmp.S
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/string/bcmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-#if 0
-	RCSID("$NetBSD: bcmp.S,v 1.1 2001/06/19 00:25:04 fvdl Exp $")
-#endif
-
-ENTRY(bcmp)
-	cld				/* set compare direction forward */
-
-	movq	%rdx,%rcx		/* compare by words */
-	shrq	$3,%rcx
-	repe
-	cmpsq
-	jne	L1
-
-	movq	%rdx,%rcx		/* compare remainder by bytes */
-	andq	$7,%rcx
-	repe
-	cmpsb
-L1:
-	setne	%al
-	movsbl	%al,%eax
-	ret
-END(bcmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/string/bcopy.S b/lib/libc_bsd/amd64/string/bcopy.S
deleted file mode 100644
index 605cf42..0000000
--- a/lib/libc_bsd/amd64/string/bcopy.S
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from locore.s.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/string/bcopy.S 217106 2011-01-07 16:08:40Z kib $");
-
-#if 0
-	RCSID("$NetBSD: bcopy.S,v 1.2 2003/08/07 16:42:36 agc Exp $")
-#endif
-
-	/*
-	 * (ov)bcopy (src,dst,cnt)
-	 *  ws@tools.de     (Wolfgang Solfrank, TooLs GmbH) +49-228-985800
-	 */
-
-#ifdef MEMCOPY
-ENTRY(memcpy)
-#else
-#ifdef MEMMOVE
-ENTRY(memmove)
-#else
-ENTRY(bcopy)
-#endif
-#endif
-#if defined(MEMCOPY) || defined(MEMMOVE)
-	movq	%rdi,%rax	/* return dst */
-#else
-	xchgq	%rdi,%rsi
-#endif
-	movq	%rdx,%rcx
-	movq	%rdi,%r8
-	subq	%rsi,%r8
-	cmpq	%rcx,%r8	/* overlapping? */
-	jb	1f
-	cld			/* nope, copy forwards. */
-	shrq	$3,%rcx		/* copy by words */
-	rep
-	movsq
-	movq	%rdx,%rcx
-	andq	$7,%rcx		/* any bytes left? */
-	rep
-	movsb
-	ret
-1:
-	addq	%rcx,%rdi	/* copy backwards. */
-	addq	%rcx,%rsi
-	std
-	andq	$7,%rcx		/* any fractional bytes? */
-	decq	%rdi
-	decq	%rsi
-	rep
-	movsb
-	movq	%rdx,%rcx	/* copy remainder by words */
-	shrq	$3,%rcx
-	subq	$7,%rsi
-	subq	$7,%rdi
-	rep
-	movsq
-	cld
-	ret
-#ifdef MEMCOPY
-END(memcpy)
-#else
-#ifdef MEMMOVE
-END(memmove)
-#else
-END(bcopy)
-#endif
-#endif
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/string/bzero.S b/lib/libc_bsd/amd64/string/bzero.S
deleted file mode 100644
index 52dfeaa..0000000
--- a/lib/libc_bsd/amd64/string/bzero.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- * Adapted for NetBSD/x86_64 by Frank van der Linden <fvdl@wasabisystems.com>
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/string/bzero.S 217106 2011-01-07 16:08:40Z kib $");
-
-#if 0
-	RCSID("$NetBSD: bzero.S,v 1.2 2003/07/26 19:24:38 salo Exp $")
-#endif
-
-ENTRY(bzero)
-	cld				/* set fill direction forward */
-	xorq	%rax,%rax		/* set fill data to 0 */
-
-	/*
-	 * if the string is too short, it's really not worth the overhead
-	 * of aligning to word boundries, etc.  So we jump to a plain
-	 * unaligned set.
-	 */
-	cmpq	$16,%rsi
-	jb	L1
-
-	movq	%rdi,%rcx		/* compute misalignment */
-	negq	%rcx
-	andq	$7,%rcx
-	subq	%rcx,%rsi
-	rep				/* zero until word aligned */
-	stosb
-
-	movq	%rsi,%rcx		/* zero by words */
-	shrq	$3,%rcx
-	andq	$7,%rsi
-	rep
-	stosq
-
-L1:	movq	%rsi,%rcx		/* zero remainder by bytes */
-	rep
-	stosb
-
-	ret
-END(bzero)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/string/memcmp.S b/lib/libc_bsd/amd64/string/memcmp.S
deleted file mode 100644
index 4b81da1..0000000
--- a/lib/libc_bsd/amd64/string/memcmp.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- * Adapted for NetBSD/x86_64 by Frank van der Linden <fvdl@wasabisystems.com>
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/string/memcmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-#if 0
-	RCSID("$NetBSD: memcmp.S,v 1.2 2003/07/26 19:24:39 salo Exp $")
-#endif
-
-ENTRY(memcmp)
-	cld				/* set compare direction forward */
-	movq	%rdx,%rcx		/* compare by longs */
-	shrq	$3,%rcx
-	repe
-	cmpsq
-	jne	L5			/* do we match so far? */
-
-	movq	%rdx,%rcx		/* compare remainder by bytes */
-	andq	$7,%rcx
-	repe
-	cmpsb
-	jne	L6			/* do we match? */
-
-	xorl	%eax,%eax		/* we match, return zero	*/
-	ret
-
-L5:	movl	$8,%ecx			/* We know that one of the next	*/
-	subq	%rcx,%rdi		/* eight pairs of bytes do not	*/
-	subq	%rcx,%rsi		/* match.			*/
-	repe
-	cmpsb
-L6:	xorl	%eax,%eax		/* Perform unsigned comparison	*/
-	movb	-1(%rdi),%al
-	xorl	%edx,%edx
-	movb	-1(%rsi),%dl
-	subl    %edx,%eax
-	ret
-END(memcmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/string/memcpy.S b/lib/libc_bsd/amd64/string/memcpy.S
deleted file mode 100644
index e47f454..0000000
--- a/lib/libc_bsd/amd64/string/memcpy.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: memcpy.S,v 1.1 2001/06/19 00:25:05 fvdl Exp $	*/
-/*	$FreeBSD: releng/10.2/lib/libc/amd64/string/memcpy.S 144730 2005-04-07 03:56:03Z alc $ */
-
-#define MEMCOPY
-#include "bcopy.S"
diff --git a/lib/libc_bsd/amd64/string/memmove.S b/lib/libc_bsd/amd64/string/memmove.S
deleted file mode 100644
index 2a4d3b5..0000000
--- a/lib/libc_bsd/amd64/string/memmove.S
+++ /dev/null
@@ -1,5 +0,0 @@
-/*	$NetBSD: memmove.S,v 1.1 2001/06/19 00:25:05 fvdl Exp $	*/
-/*	$FreeBSD: releng/10.2/lib/libc/amd64/string/memmove.S 218303 2011-02-04 21:04:00Z kib $ */
-
-#define MEMMOVE
-#include "bcopy.S"
diff --git a/lib/libc_bsd/amd64/string/memset.S b/lib/libc_bsd/amd64/string/memset.S
deleted file mode 100644
index a96620e..0000000
--- a/lib/libc_bsd/amd64/string/memset.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- * Adapted for NetBSD/x86_64 by Frank van der Linden <fvdl@wasabisystems.com>
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/string/memset.S 217106 2011-01-07 16:08:40Z kib $");
-
-#if 0
-	RCSID("$NetBSD: memset.S,v 1.3 2004/02/26 20:50:06 drochner Exp $")
-#endif
-
-ENTRY(memset)
-	movq	%rsi,%rax
-	andq	$0xff,%rax
-	movq	%rdx,%rcx
-	movq	%rdi,%r11
-
-	cld				/* set fill direction forward */
-
-	/*
-	 * if the string is too short, it's really not worth the overhead
-	 * of aligning to word boundries, etc.  So we jump to a plain
-	 * unaligned set.
-	 */
-	cmpq	$0x0f,%rcx
-	jle	L1
-
-	movb	%al,%ah			/* copy char to all bytes in word */
-	movl	%eax,%edx
-	sall	$16,%eax
-	orl	%edx,%eax
-
-	movl	%eax,%edx
-	salq	$32,%rax
-	orq	%rdx,%rax
-
-	movq	%rdi,%rdx		/* compute misalignment */
-	negq	%rdx
-	andq	$7,%rdx
-	movq	%rcx,%r8
-	subq	%rdx,%r8
-
-	movq	%rdx,%rcx		/* set until word aligned */
-	rep
-	stosb
-
-	movq	%r8,%rcx
-	shrq	$3,%rcx			/* set by words */
-	rep
-	stosq
-
-	movq	%r8,%rcx		/* set remainder by bytes */
-	andq	$7,%rcx
-L1:	rep
-	stosb
-	movq	%r11,%rax
-
-	ret
-END(memset)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/string/stpcpy.S b/lib/libc_bsd/amd64/string/stpcpy.S
deleted file mode 100644
index 02d168b..0000000
--- a/lib/libc_bsd/amd64/string/stpcpy.S
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Adapted by Guillaume Morin <guillaume@morinfr.org> from strcpy.S
- * written by J.T. Conklin <jtc@acorntoolworks.com>
- * Public domain.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/string/stpcpy.S 224253 2011-07-21 20:06:14Z gnn $");
-
-/*
- * This stpcpy implementation copies a byte at a time until the
- * source pointer is aligned to a word boundary, it then copies by
- * words until it finds a word containing a zero byte, and finally
- * copies by bytes until the end of the string is reached.
- *
- * While this may result in unaligned stores if the source and
- * destination pointers are unaligned with respect to each other,
- * it is still faster than either byte copies or the overhead of
- * an implementation suitable for machines with strict alignment
- * requirements.
- */
-
-	.globl	stpcpy,__stpcpy
-ENTRY(stpcpy)
-__stpcpy:
-	movabsq $0x0101010101010101,%r8
-	movabsq $0x8080808080808080,%r9
-
-	/*
-	 * Align source to a word boundary.
-	 * Consider unrolling loop?
-	 */
-.Lalign:
-	testb	$7,%sil
-	je	.Lword_aligned
-	movb	(%rsi),%dl
-	incq	%rsi
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl
-	jne	.Lalign
-	movq	%rdi,%rax
-	dec	%rax
-	ret
-
-	.p2align 4
-.Lloop:
-	movq	%rdx,(%rdi)
-	addq	$8,%rdi
-.Lword_aligned:
-	movq	(%rsi),%rdx
-	movq	%rdx,%rcx
-	addq	$8,%rsi
-	subq	%r8,%rcx
-	testq	%r9,%rcx
-	je	.Lloop
-
-	/*
-	 * In rare cases, the above loop may exit prematurely. We must
-	 * return to the loop if none of the bytes in the word equal 0.
-	 */
-
-	movb	%dl,(%rdi)
-	testb	%dl,%dl		/* 1st byte == 0? */
-	je	.Ldone
-	incq	%rdi
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	testb	%dl,%dl		/* 2nd byte == 0? */
-	je	.Ldone
-	incq	%rdi
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	testb	%dl,%dl		/* 3rd byte == 0? */
-	je	.Ldone
-	incq	%rdi
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	testb	%dl,%dl		/* 4th byte == 0? */
-	je	.Ldone
-	incq	%rdi
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	testb	%dl,%dl		/* 5th byte == 0? */
-	je	.Ldone
-	incq	%rdi
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	testb	%dl,%dl		/* 6th byte == 0? */
-	je	.Ldone
-	incq	%rdi
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	testb	%dl,%dl		/* 7th byte == 0? */
-	je	.Ldone
-	incq	%rdi
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl		/* 8th byte == 0? */
-	jne	.Lword_aligned
-	decq	%rdi
-
-.Ldone:
-	movq	%rdi,%rax
-	ret
-END(stpcpy)
-	
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/string/strcat.S b/lib/libc_bsd/amd64/string/strcat.S
deleted file mode 100644
index e1c51fe..0000000
--- a/lib/libc_bsd/amd64/string/strcat.S
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@acorntoolworks.com>
- * Public domain.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/string/strcat.S 217106 2011-01-07 16:08:40Z kib $");
-
-#if 0
-	RCSID("$NetBSD: strcat.S,v 1.4 2004/07/26 18:51:21 drochner Exp $")
-#endif
-
-ENTRY(strcat)
-	movq	%rdi,%rax
-	movabsq	$0x0101010101010101,%r8
-	movabsq	$0x8080808080808080,%r9
-
-	/*
-	 * Align destination to word boundary.
-	 * Consider unrolling loop?
-	 */
-.Lscan:
-.Lscan_align:
-	testb	$7,%dil
-	je	.Lscan_aligned
-	cmpb	$0,(%rdi)
-	je	.Lcopy
-	incq	%rdi
-	jmp	.Lscan_align
-
-	.align	4
-.Lscan_aligned:
-.Lscan_loop:
-	movq	(%rdi),%rdx
-	addq	$8,%rdi
-	subq	%r8,%rdx
-	testq	%r9,%rdx
-	je	.Lscan_loop
-
-	/*
-	 * In rare cases, the above loop may exit prematurely. We must
-	 * return to the loop if none of the bytes in the word equal 0.
-	 */
-
-	cmpb	$0,-8(%rdi)	/* 1st byte == 0? */
-	jne	1f
-	subq	$8,%rdi
-	jmp	.Lcopy
-
-1:	cmpb	$0,-7(%rdi)	/* 2nd byte == 0? */
-	jne	1f
-	subq	$7,%rdi
-	jmp	.Lcopy
-
-1:	cmpb	$0,-6(%rdi)	/* 3rd byte == 0? */
-	jne	1f
-	subq	$6,%rdi
-	jmp	.Lcopy
-
-1:	cmpb	$0,-5(%rdi)	/* 4th byte == 0? */
-	jne	1f
-	subq	$5,%rdi
-	jmp	.Lcopy
-
-1:	cmpb	$0,-4(%rdi)	/* 5th byte == 0? */
-	jne	1f
-	subq	$4,%rdi
-	jmp	.Lcopy
-
-1:	cmpb	$0,-3(%rdi)	/* 6th byte == 0? */
-	jne	1f
-	subq	$3,%rdi
-	jmp	.Lcopy
-
-1:	cmpb	$0,-2(%rdi)	/* 7th byte == 0? */
-	jne	1f
-	subq	$2,%rdi
-	jmp	.Lcopy
-
-1:	cmpb	$0,-1(%rdi)	/* 8th byte == 0? */
-	jne	.Lscan_loop
-	subq	$1,%rdi
-
-	/*
-	 * Align source to a word boundary.
-	 * Consider unrolling loop?
-	 */
-.Lcopy:
-.Lcopy_align:
-	testb	$7,%sil
-	je	.Lcopy_aligned
-	movb	(%rsi),%dl
-	incq	%rsi
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl
-	jne	.Lcopy_align
-	ret
-
-	.align	4
-.Lcopy_loop:
-	movq	%rdx,(%rdi)
-	addq	$8,%rdi
-.Lcopy_aligned:
-	movq	(%rsi),%rdx
-	movq	%rdx,%rcx
-	addq	$8,%rsi
-	subq	%r8,%rcx
-	testq	%r9,%rcx
-	je	.Lcopy_loop
-
-	/*
-	 * In rare cases, the above loop may exit prematurely. We must
-	 * return to the loop if none of the bytes in the word equal 0.
-	 */
-
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl		/* 1st byte == 0? */
-	je	.Ldone
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl		/* 2nd byte == 0? */
-	je	.Ldone
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl		/* 3rd byte == 0? */
-	je	.Ldone
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl		/* 4th byte == 0? */
-	je	.Ldone
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl		/* 5th byte == 0? */
-	je	.Ldone
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl		/* 6th byte == 0? */
-	je	.Ldone
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl		/* 7th byte == 0? */
-	je	.Ldone
-
-	shrq	$8,%rdx
-	movb	%dl,(%rdi)
-	incq	%rdi
-	testb	%dl,%dl		/* 8th byte == 0? */
-	jne	.Lcopy_aligned
-
-.Ldone:
-	ret
-END(strcat)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/string/strcmp.S b/lib/libc_bsd/amd64/string/strcmp.S
deleted file mode 100644
index 54feadc..0000000
--- a/lib/libc_bsd/amd64/string/strcmp.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@acorntoolworks.com>
- * Public domain.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/string/strcmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-#if 0
-	RCSID("$NetBSD: strcmp.S,v 1.3 2004/07/19 20:04:41 drochner Exp $")
-#endif
-
-ENTRY(strcmp)
-	/*
-	 * Align s1 to word boundary.
-	 * Consider unrolling loop?
-	 */
-.Ls1align:
-	testb	$7,%dil
-	je	.Ls1aligned
-	movb	(%rdi),%al
-	incq	%rdi
-	movb	(%rsi),%dl
-	incq	%rsi
-	testb	%al,%al
-	je	.Ldone
-	cmpb	%al,%dl
-	je	.Ls1align
-	jmp	.Ldone
-
-	/*
-	 * Check whether s2 is aligned to a word boundry.  If it is, we
-	 * can compare by words.  Otherwise we have to compare by bytes.
-	 */
-.Ls1aligned:
-	testb	$7,%sil
-	jne	.Lbyte_loop
-
-	movabsq	$0x0101010101010101,%r8
-	subq	$8,%rdi
-	movabsq	$0x8080808080808080,%r9
-	subq	$8,%rsi
-
-	.align	4
-.Lword_loop:
-	movq	8(%rdi),%rax
-	addq	$8,%rdi
-	movq	8(%rsi),%rdx
-	addq	$8,%rsi
-	cmpq	%rax,%rdx
-	jne	.Lbyte_loop
-	subq	%r8,%rdx
-	notq	%rax
-	andq	%rax,%rdx
-	testq	%r9,%rdx
-	je	.Lword_loop
-
-	.align	4
-.Lbyte_loop:
-	movb	(%rdi),%al
-	incq	%rdi
-	movb	(%rsi),%dl
-	incq	%rsi
-	testb	%al,%al
-	je	.Ldone
-	cmpb	%al,%dl
-	je	.Lbyte_loop
-
-.Ldone:
-	movzbq	%al,%rax
-	movzbq	%dl,%rdx
-	subq	%rdx,%rax
-	ret
-END(strcmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/string/strcpy.c b/lib/libc_bsd/amd64/string/strcpy.c
deleted file mode 100644
index 4e164a8..0000000
--- a/lib/libc_bsd/amd64/string/strcpy.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011 George V. Neville-Neil. All rights reserved.
- *
- * The compilation of software known as FreeBSD is distributed under the
- * following terms:
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/string/strcpy.c 224246 2011-07-21 16:32:13Z gnn $");
-
-char *__stpcpy(char * __restrict, const char * __restrict);
-
-char *
-strcpy(char * __restrict to, const char * __restrict from)
-{
-	__stpcpy(to, from);
-	return(to);
-}
diff --git a/lib/libc_bsd/amd64/sys/Makefile.inc b/lib/libc_bsd/amd64/sys/Makefile.inc
deleted file mode 100644
index 8ccbe5a..0000000
--- a/lib/libc_bsd/amd64/sys/Makefile.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-#	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-Makefile.incl 237434 2012-06-22 07:13:30Z kib $
-
-SRCS+=	amd64_get_fsbase.c amd64_get_gsbase.c amd64_set_fsbase.c \
-	amd64_set_gsbase.c __vdso_gettc.c
-
-MDASM=	vfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \
-	reboot.S sbrk.S setlogin.S sigreturn.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
diff --git a/lib/libc_bsd/amd64/sys/__vdso_gettc.c b/lib/libc_bsd/amd64/sys/__vdso_gettc.c
deleted file mode 100644
index 8ddb237..0000000
--- a/lib/libc_bsd/amd64/sys/__vdso_gettc.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/__vdso_gettc.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/elf.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <machine/cpufunc.h>
-#include "libc_private.h"
-
-static u_int
-__vdso_gettc_low(const struct vdso_timehands *th)
-{
-	uint32_t rv;
-
-	__asm __volatile("rdtsc; shrd %%cl, %%edx, %0"
-	    : "=a" (rv) : "c" (th->th_x86_shift) : "edx");
-	return (rv);
-}
-
-#pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
-{
-
-	return (th->th_x86_shift > 0 ? __vdso_gettc_low(th) : rdtsc32());
-}
-
-#pragma weak __vdso_gettimekeep
-int
-__vdso_gettimekeep(struct vdso_timekeep **tk)
-{
-
-	return (_elf_aux_info(AT_TIMEKEEP, tk, sizeof(*tk)));
-}
diff --git a/lib/libc_bsd/amd64/sys/amd64_get_fsbase.c b/lib/libc_bsd/amd64/sys/amd64_get_fsbase.c
deleted file mode 100644
index 86d0630..0000000
--- a/lib/libc_bsd/amd64/sys/amd64_get_fsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2003 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/amd64_get_fsbase.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <machine/sysarch.h>
-
-int
-amd64_get_fsbase(void **addr)
-{
-
-	return (sysarch(AMD64_GET_FSBASE, addr));
-}
diff --git a/lib/libc_bsd/amd64/sys/amd64_get_gsbase.c b/lib/libc_bsd/amd64/sys/amd64_get_gsbase.c
deleted file mode 100644
index 53018b6..0000000
--- a/lib/libc_bsd/amd64/sys/amd64_get_gsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2003 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/amd64_get_gsbase.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <machine/sysarch.h>
-
-int
-amd64_get_gsbase(void **addr)
-{
-
-	return (sysarch(AMD64_GET_GSBASE, addr));
-}
diff --git a/lib/libc_bsd/amd64/sys/amd64_set_fsbase.c b/lib/libc_bsd/amd64/sys/amd64_set_fsbase.c
deleted file mode 100644
index c3cb65f..0000000
--- a/lib/libc_bsd/amd64/sys/amd64_set_fsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2003 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/amd64_set_fsbase.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <machine/sysarch.h>
-
-int
-amd64_set_fsbase(void *addr)
-{
-
-	return (sysarch(AMD64_SET_FSBASE, &addr));
-}
diff --git a/lib/libc_bsd/amd64/sys/amd64_set_gsbase.c b/lib/libc_bsd/amd64/sys/amd64_set_gsbase.c
deleted file mode 100644
index b629cac..0000000
--- a/lib/libc_bsd/amd64/sys/amd64_set_gsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2003 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/amd64_set_gsbase.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <machine/sysarch.h>
-
-int
-amd64_set_gsbase(void *addr)
-{
-
-	return (sysarch(AMD64_SET_GSBASE, &addr));
-}
diff --git a/lib/libc_bsd/amd64/sys/brk.S b/lib/libc_bsd/amd64/sys/brk.S
deleted file mode 100644
index 070b9ba..0000000
--- a/lib/libc_bsd/amd64/sys/brk.S
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)brk.s	5.2 (Berkeley) 12/17/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/brk.S 240178 2012-09-06 20:59:49Z jilles $");
-
-#include "SYS.h"
-
-	.globl	HIDENAME(curbrk)
-	.globl	HIDENAME(minbrk)
-ENTRY(_brk)
-	pushq	%rdi
-	jmp	ok
-END(_brk)
-
-ENTRY(brk)
-	pushq	%rdi
-	movq	%rdi,%rax
-#ifdef PIC
-	movq	PIC_GOT(HIDENAME(minbrk)),%rdx
-	cmpq	%rax,(%rdx)
-#else
-	cmpq	%rax,HIDENAME(minbrk)(%rip)
-#endif
-	jbe	ok
-#ifdef PIC
-	movq	(%rdx),%rdi
-#else
-	movq	HIDENAME(minbrk)(%rip),%rdi
-#endif
-ok:
-	movq	$SYS_break,%rax
-	KERNCALL
-	jb	err
-	movq	0(%rsp),%rax
-#ifdef PIC
-	movq	PIC_GOT(HIDENAME(curbrk)),%rdx
-	movq	%rax,(%rdx)
-#else
-	movq	%rax,HIDENAME(curbrk)(%rip)
-#endif
-	movq	$0,%rax
-	popq	%rdi
-	ret
-err:
-	addq	$8, %rsp
-	jmp	HIDENAME(cerror)
-END(brk)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/cerror.S b/lib/libc_bsd/amd64/sys/cerror.S
deleted file mode 100644
index 03d0093..0000000
--- a/lib/libc_bsd/amd64/sys/cerror.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)cerror.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/cerror.S 217106 2011-01-07 16:08:40Z kib $");
-
-#include "SYS.h"
-
-	.globl HIDENAME(cerror)
-
-	/*
-	 * The __error() function is thread aware. For non-threaded
-	 * programs and the initial threaded in threaded programs,
-	 * it returns a pointer to the global errno variable.
-	 */
-	.globl	CNAME(__error)
-	.type	CNAME(__error),@function
-HIDENAME(cerror):
-	pushq	%rax
-	call	PIC_PLT(CNAME(__error))
-	popq	%rcx
-	movl	%ecx,(%rax)
-	movq	$-1,%rax
-	movq	$-1,%rdx
-	ret
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/exect.S b/lib/libc_bsd/amd64/sys/exect.S
deleted file mode 100644
index 1253b60..0000000
--- a/lib/libc_bsd/amd64/sys/exect.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)exect.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/exect.S 240178 2012-09-06 20:59:49Z jilles $");
-
-#include "SYS.h"
-#include <machine/psl.h>
-
-ENTRY(exect)
-	movq	$SYS_execve,%rax
-	pushfq
-	popq	%r8
-	orq	$PSL_T,%r8
-	pushq	%r8
-	popfq
-	KERNCALL
-	jmp	HIDENAME(cerror)
-END(exect)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/getcontext.S b/lib/libc_bsd/amd64/sys/getcontext.S
deleted file mode 100644
index a3bd7de..0000000
--- a/lib/libc_bsd/amd64/sys/getcontext.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2003 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/getcontext.S 240178 2012-09-06 20:59:49Z jilles $");
-
-#include <SYS.h>
-
-/*
- * This has to be magic to handle the multiple returns.
- * Otherwise, the setcontext() syscall will return here and we'll
- * pop off the return address and go to the *setcontext* call.
- */
-	.weak	_getcontext
-	.set	_getcontext,__sys_getcontext
-	.weak	getcontext
-	.set	getcontext,__sys_getcontext
-ENTRY(__sys_getcontext)
-	movq	(%rsp),%rsi	/* save getcontext return address */
-	mov	$SYS_getcontext,%rax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	addq	$8,%rsp		/* remove stale (setcontext) return address */
-	jmp	*%rsi		/* restore return address */
-END(__sys_getcontext)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/pipe.S b/lib/libc_bsd/amd64/sys/pipe.S
deleted file mode 100644
index 8512fa0..0000000
--- a/lib/libc_bsd/amd64/sys/pipe.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)pipe.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/pipe.S 240178 2012-09-06 20:59:49Z jilles $");
-
-#include "SYS.h"
-
-	.weak	_pipe
-	.set	_pipe,__sys_pipe
-	.weak	pipe
-	.set	pipe,__sys_pipe
-ENTRY(__sys_pipe)
-	mov	$SYS_pipe,%rax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	movl	%eax,(%rdi)	/* %rdi is preserved by syscall */
-	movl	%edx,4(%rdi)
-	movq	$0,%rax
-	ret
-END(__sys_pipe)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/ptrace.S b/lib/libc_bsd/amd64/sys/ptrace.S
deleted file mode 100644
index ac7285d..0000000
--- a/lib/libc_bsd/amd64/sys/ptrace.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)ptrace.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/ptrace.S 240178 2012-09-06 20:59:49Z jilles $");
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-	xorl	%eax,%eax
-#ifdef PIC
-	movq	PIC_GOT(CNAME(errno)),%r8
-	movl	%eax,(%r8)
-#else
-	movl	%eax,CNAME(errno)(%rip)
-#endif
-	mov	$SYS_ptrace,%eax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	ret
-END(ptrace)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/reboot.S b/lib/libc_bsd/amd64/sys/reboot.S
deleted file mode 100644
index e38e0fb..0000000
--- a/lib/libc_bsd/amd64/sys/reboot.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)reboot.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/reboot.S 240178 2012-09-06 20:59:49Z jilles $");
-
-#include "SYS.h"
-
-	.weak	_reboot
-	.set	_reboot,__sys_reboot
-	.weak	reboot
-	.set	reboot,__sys_reboot
-ENTRY(__sys_reboot)
-	mov	$SYS_reboot,%rax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	iretq
-END(__sys_reboot)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/sbrk.S b/lib/libc_bsd/amd64/sys/sbrk.S
deleted file mode 100644
index 35e7a21..0000000
--- a/lib/libc_bsd/amd64/sys/sbrk.S
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)sbrk.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/sbrk.S 240178 2012-09-06 20:59:49Z jilles $");
-
-#include "SYS.h"
-
-	.globl	CNAME(_end)
-	.globl	HIDENAME(minbrk)
-	.globl	HIDENAME(curbrk)
-
-	.data
-HIDENAME(minbrk):	.quad	CNAME(_end)
-HIDENAME(curbrk):	.quad	CNAME(_end)
-	.text
-
-ENTRY(sbrk)
-	pushq	%rdi
-	movq	%rdi,%rcx
-#ifdef PIC
-	movq	PIC_GOT(HIDENAME(curbrk)),%rdx
-	movq	(%rdx),%rax
-#else
-	movq	HIDENAME(curbrk)(%rip),%rax
-#endif
-	testq	%rcx,%rcx
-	jz	back
-	addq	%rax,%rdi
-	mov	$SYS_break,%eax
-	KERNCALL
-	jb	err
-#ifdef PIC
-	movq	PIC_GOT(HIDENAME(curbrk)),%rdx
-	movq	(%rdx),%rax
-#else
-	movq	HIDENAME(curbrk)(%rip),%rax
-#endif
-	movq	0(%rsp), %rcx
-#ifdef PIC
-	addq	%rcx,(%rdx)
-#else
-	addq	%rcx,HIDENAME(curbrk)(%rip)
-#endif
-back:
-	addq	$8, %rsp
-	ret
-err:
-	addq	$8, %rsp
-	jmp	HIDENAME(cerror)
-END(sbrk)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/setlogin.S b/lib/libc_bsd/amd64/sys/setlogin.S
deleted file mode 100644
index 2492821..0000000
--- a/lib/libc_bsd/amd64/sys/setlogin.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)setlogin.s	5.2 (Berkeley) 4/12/91"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/setlogin.S 254463 2013-08-17 19:24:58Z jilles $");
-
-#include "SYS.h"
-
-.globl	CNAME(_logname_valid)		/* in _getlogin() */
-
-	.weak	_setlogin
-	.set	_setlogin,__sys_setlogin
-	.weak	setlogin
-	.set	setlogin,__sys_setlogin
-ENTRY(__sys_setlogin)
-	mov	$SYS_setlogin,%rax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	movl	$0,CNAME(_logname_valid)(%rip)
-	ret				/* setlogin(name) */
-END(__sys_setlogin)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/sigreturn.S b/lib/libc_bsd/amd64/sys/sigreturn.S
deleted file mode 100644
index 0810ec5..0000000
--- a/lib/libc_bsd/amd64/sys/sigreturn.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/sigreturn.S 217106 2011-01-07 16:08:40Z kib $");
-
-#include "SYS.h"
-
-/*
- * NOTE: If the profiling ENTRY() code ever changes any registers, they
- * must be saved.   On FreeBSD, this is not the case.
- */
-
-RSYSCALL(sigreturn)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/amd64/sys/vfork.S b/lib/libc_bsd/amd64/sys/vfork.S
deleted file mode 100644
index 1a89a88..0000000
--- a/lib/libc_bsd/amd64/sys/vfork.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)Ovfork.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/amd64/sys/vfork.S 240178 2012-09-06 20:59:49Z jilles $");
-
-#include "SYS.h"
-
-	.weak	_vfork
-	.set	_vfork,__sys_vfork
-	.weak	vfork
-	.set	vfork,__sys_vfork
-ENTRY(__sys_vfork)
-	popq	%rsi		/* fetch return address (%rsi preserved) */
-	mov	$SYS_vfork,%rax
-	KERNCALL
-	jb	1f
-	jmp	*%rsi
-1:
-	pushq	%rsi
-	jmp	HIDENAME(cerror)
-END(__sys_vfork)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/arm/Makefile.inc b/lib/libc_bsd/arm/Makefile.inc
deleted file mode 100644
index 73a7cde..0000000
--- a/lib/libc_bsd/arm/Makefile.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-Makefile.incl 245655 2013-01-19 05:33:55Z andrew $
-#
-# Machine dependent definitions for the arm architecture.
-#
-
-SOFTFLOAT_BITS=32
-
-# Long double is just double precision.
-MDSRCS+=machdep_ldisd.c
-SYM_MAPS+=${.CURDIR}/arm/Symbol.map
-
-.if ${MK_ARM_EABI} == "no"
-# This contains the symbols that were removed when moving to the ARM EABI
-SYM_MAPS+=${.CURDIR}/arm/Symbol_oabi.map
-.else
-Makefile.incl"
-.endif
-
diff --git a/lib/libc_bsd/arm/SYS.h b/lib/libc_bsd/arm/SYS.h
deleted file mode 100644
index f5b741c..0000000
--- a/lib/libc_bsd/arm/SYS.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.8 2003/08/07 16:42:02 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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. 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.
- *
- *	from: @(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD: releng/10.2/lib/libc/arm/SYS.h 245650 2013-01-19 04:03:18Z andrew $
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-#include <machine/swi.h>
-
-#ifdef __ARM_EABI__
-#define SYSTRAP(x)							\
-			mov ip, r7;					\
-			ldr r7, =SYS_ ## x;				\
-			swi 0;						\
-			mov r7, ip
-#else
-#define SYSTRAP(x)	swi 0 | SYS_ ## x
-#endif
-
-#define	CERROR		_C_LABEL(cerror)
-#define	CURBRK		_C_LABEL(curbrk)
-
-#define _SYSCALL_NOERROR(x)						\
-	ENTRY(__CONCAT(__sys_, x));					\
-	.weak _C_LABEL(x);						\
-	.set _C_LABEL(x), _C_LABEL(__CONCAT(__sys_,x));			\
-	.weak _C_LABEL(__CONCAT(_,x));					\
-	.set _C_LABEL(__CONCAT(_,x)),_C_LABEL(__CONCAT(__sys_,x));	\
-	SYSTRAP(x)
-
-#define _SYSCALL(x)							\
-	_SYSCALL_NOERROR(x);						\
-	bcs PIC_SYM(CERROR, PLT)
-
-#define SYSCALL(x)							\
-	_SYSCALL(x)
-
-#define PSEUDO(x)							\
-	ENTRY(__CONCAT(__sys_, x));					\
-	.weak _C_LABEL(__CONCAT(_,x));					\
-	.set _C_LABEL(__CONCAT(_,x)),_C_LABEL(__CONCAT(__sys_,x));	\
-	SYSTRAP(x);							\
-	bcs PIC_SYM(CERROR, PLT);					\
-	RET
-
-#define RSYSCALL(x)							\
-	_SYSCALL(x);							\
-	RET
-
-	.globl  CERROR
diff --git a/lib/libc_bsd/arm/Symbol.map b/lib/libc_bsd/arm/Symbol.map
deleted file mode 100644
index 5a399a6..0000000
--- a/lib/libc_bsd/arm/Symbol.map
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/arm/Symbol.map 269792 2014-08-10 22:26:29Z ian $
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSD_1.0 {
-	/* PSEUDO syscalls */
-	_exit;
-
-	__mcount;
-	_setjmp;
-	_longjmp;
-	alloca;
-	fabs;
-	__infinity;
-	__nan;
-	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
-	htonl;
-	htons;
-	ntohl;
-	ntohs;
-	vfork;
-	brk;
-	cerror;		/* XXX - Should this be .cerror (see sys/cerror.S)? */
-	sbrk;
-};
-
-FBSD_1.3 {
-	__flt_rounds;
-};
-
-FBSD_1.4 {
-	__gnu_Unwind_Find_exidx;
-	dl_unwind_find_exidx;
-};
-
-FBSDprivate_1.0 {
-	/* PSEUDO syscalls */
-	__sys_getlogin;
-	_getlogin;
-	__sys_exit;
-
-	_set_tp;
-	__aeabi_read_tp;
-	___longjmp;
-	__makecontext;
-	__longjmp;
-	signalcontext;
-	_signalcontext;
-	__siglongjmp;
-	__sys_vfork;
-	_vfork;
-	_brk;
-	_end;
-	curbrk;
-	minbrk;
-	_sbrk;
-
-	/* softfloat */
-	__addsf3;
-	__adddf3;
-	__subsf3;
-	__subdf3;
-	__mulsf3;
-	__muldf3;
-	__divsf3;
-	__divdf3;
-	__floatsisf;
-	__floatsidf;
-	__fixsfsi;
-	__fixdfsi;
-	__fixunssfsi;
-	__fixunsdfsi;
-	__extendsfdf2;
-	__truncdfsf2;
-
-	_libc_arm_fpu_present;
-};
diff --git a/lib/libc_bsd/arm/Symbol_oabi.map b/lib/libc_bsd/arm/Symbol_oabi.map
deleted file mode 100644
index d75433f..0000000
--- a/lib/libc_bsd/arm/Symbol_oabi.map
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/arm/Symbol_oabi.map 245651 2013-01-19 04:11:45Z andrew $
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...)
- * and are not used in the ARM EABI.
- */
-FBSDprivate_1.0 {
-	__umodsi3;
-	__modsi3;
-	__udivsi3;
-	__divsi3;
-};
diff --git a/lib/libc_bsd/arm/_fpmath.h b/lib/libc_bsd/arm/_fpmath.h
deleted file mode 100644
index b053f48..0000000
--- a/lib/libc_bsd/arm/_fpmath.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/arm/_fpmath.h 255361 2013-09-07 14:04:10Z andrew $
- */
-
-#if defined(__VFP_FP__) || defined(__ARM_EABI__)
-#define	_IEEE_WORD_ORDER	_BYTE_ORDER
-#else
-#define	_IEEE_WORD_ORDER	_BIG_ENDIAN
-#endif
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#if _IEEE_WORD_ORDER == _LITTLE_ENDIAN
-		unsigned int	manl	:32;
-#endif
-		unsigned int	manh	:20;
-		unsigned int	exp	:11;
-		unsigned int	sign	:1;
-#if _IEEE_WORD_ORDER == _BIG_ENDIAN
-		unsigned int	manl	:32;
-#endif
-#else	/* _BYTE_ORDER == _LITTLE_ENDIAN */
-		unsigned int		sign	:1;
-		unsigned int		exp	:11;
-		unsigned int		manh	:20;
-		unsigned int		manl	:32;
-#endif
-	} bits;
-};
-
-#define	LDBL_NBIT	0
-#define	LDBL_IMPLICIT_NBIT
-#define	mask_nbit_l(u)	((void)0)
-
-#define	LDBL_MANH_SIZE	20
-#define	LDBL_MANL_SIZE	32
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)(u).bits.manh;		\
-} while(0)
diff --git a/lib/libc_bsd/arm/aeabi/Makefile.inc b/lib/libc_bsd/arm/aeabi/Makefile.inc
deleted file mode 100644
index f08ef48..0000000
--- a/lib/libc_bsd/arm/aeabi/Makefile.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-Makefile.incl 273471 2014-10-22 13:50:38Z andrew $
-
-.PATH: ${.CURDIR}/arm/aeabi
-
-SRCS+=	aeabi_asm_double.S	\
-	aeabi_asm_float.S	\
-	aeabi_atexit.c		\
-	aeabi_double.c		\
-	aeabi_float.c		\
-	aeabi_unwind_cpp.c	\
-	aeabi_unwind_exidx.c
-.if ${MACHINE_ARCH:Marmv6*}
-SRCS+=	aeabi_vfp_double.S	\
-	aeabi_vfp_float.S
-.endif
-
-# Add the aeabi_mem* functions. While they live in compiler-rt they call into
-# libc. This causes issues when other parts of libc call these functions.
-# We work around this by including these functions in libc but mark them as
-# hidden so users of libc will not pick up these versions.
-.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/arm
-
-SRCS+=	aeabi_memcmp.S		\
-	aeabi_memcpy.S		\
-	aeabi_memmove.S		\
-	aeabi_memset.S
-
-# Mark the functions as hidden so they are not available outside of libc.
-CFLAGS.aeabi_memcmp.S=	-DVISIBILITY_HIDDEN
-CFLAGS.aeabi_memcpy.S=	-DVISIBILITY_HIDDEN
-CFLAGS.aeabi_memmove.S=	-DVISIBILITY_HIDDEN
-CFLAGS.aeabi_memset.S=	-DVISIBILITY_HIDDEN
-CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
-
-
-SYM_MAPS+=${.CURDIR}/arm/aeabi/Symbol.map
-
diff --git a/lib/libc_bsd/arm/aeabi/Symbol.map b/lib/libc_bsd/arm/aeabi/Symbol.map
deleted file mode 100644
index 689ed79..0000000
--- a/lib/libc_bsd/arm/aeabi/Symbol.map
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/arm/aeabi/Symbol.map 273471 2014-10-22 13:50:38Z andrew $
- */
-
-/*
- * This only needs to contain AEABI symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSDprivate_1.0 {
-	__aeabi_atexit;
-
-	__aeabi_dcmpeq;
-	__aeabi_dcmplt;
-	__aeabi_dcmple;
-	__aeabi_dcmpge;
-	__aeabi_dcmpgt;
-	__aeabi_dcmpun;
-
-	__aeabi_cdcmpeq;
-	__aeabi_cdcmple;
-	__aeabi_cdrcmple;
-
-	__aeabi_d2iz;
-	__aeabi_d2f;
-
-	__aeabi_dadd;
-	__aeabi_ddiv;
-	__aeabi_dmul;
-	__aeabi_dsub;
-
-
-	__aeabi_fcmpeq;
-	__aeabi_fcmplt;
-	__aeabi_fcmple;
-	__aeabi_fcmpge;
-	__aeabi_fcmpgt;
-	__aeabi_fcmpun;
-
-	__aeabi_cfcmpeq;
-	__aeabi_cfcmple;
-	__aeabi_cfrcmple;
-
-	__aeabi_f2iz;
-	__aeabi_f2d;
-
-	__aeabi_fadd;
-	__aeabi_fdiv;
-	__aeabi_fmul;
-	__aeabi_fsub;
-
-
-	__aeabi_i2d;
-	__aeabi_i2f;
-};
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_asm_double.S b/lib/libc_bsd/arm/aeabi/aeabi_asm_double.S
deleted file mode 100644
index fed1e44..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_asm_double.S
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/aeabi/aeabi_asm_double.S 273471 2014-10-22 13:50:38Z andrew $");
-
-#define	PCR_Z	(1 << 30)
-#define	PCR_C	(1 << 29)
-
-/*
- * These functions return the result in the CPSR register.
- *
- * For __aeabi_cdcmple:
- *      Z C
- *   LT 0 0
- *   EQ 1 1
- * else 0 1
- *
- * __aeabi_cdrcmple is the same as __aeabi_cdcmple, however the arguments
- * have been swapped.
- */
-ENTRY(__aeabi_cdcmple)
-	push	{r4, r5, r6, r7, ip, lr}
-
-	/* Backup the input registers */
-	mov	r4, r0
-	mov	r5, r1
-	mov	r6, r2
-	mov	r7, r3
-	/* Is it less than? */
-	bl	__aeabi_dcmplt
-	cmp	r0, #1
-	bne	1f
-	/* Yes, clear Z and C */
-	msr	cpsr_c, #(0)
-	b	99f
-
-1:
-	/* Restore the input regsters for the next function call */
-	mov	r0, r4
-	mov	r1, r5
-	mov	r2, r6
-	mov	r3, r7
-	/* Is it equal? */
-	bl	__aeabi_dcmpeq
-	cmp	r0, #1
-	bne	2f
-	/* Yes, set Z and C */
-	msr	cpsr_c, #(PCR_Z | PCR_C)
-	b 99f
-
-2:
-	/* Not less than or equal, set C and clear Z */
-	msr	cpsr_c, #(PCR_C)
-
-99:
-	pop	{r4, r5, r6, r7, ip, pc}
-END(__aeabi_cdcmple)
-
-ENTRY(__aeabi_cdrcmple)
-	/* Swap the first half of the arguments */
-	mov	ip, r0
-	mov	r0, r2
-	mov	r2, ip
-
-	/* And the second half */
-	mov	ip, r1
-	mov	r1, r3
-	mov	r3, ip
-
-	b	__aeabi_cdcmple
-END(__aeabi_cdrcmple)
-
-/*
- * This is just like __aeabi_cdcmple except it will not throw an exception
- * in the presence of a quiet NaN. If either argument is a signalling NaN we
- * will still signal.
- */
-ENTRY(__aeabi_cdcmpeq)
-	/* Check if we can call __aeabi_cfcmple safely */
-	push	{r0, r1, r2, r3, r4, lr}
-	bl	__aeabi_cdcmpeq_helper
-	cmp	r0, #1
-	pop	{r0, r1, r2, r3, r4, lr}
-	beq	1f
-
-	bl	__aeabi_cdcmple
-	RET
-
-1:
-	msr	cpsr_c, #(PCR_C)
-	RET
-END(__aeabi_cdcmpeq)
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_asm_float.S b/lib/libc_bsd/arm/aeabi/aeabi_asm_float.S
deleted file mode 100644
index 77440db..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_asm_float.S
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/aeabi/aeabi_asm_float.S 273471 2014-10-22 13:50:38Z andrew $");
-
-#define	PCR_Z	(1 << 30)
-#define	PCR_C	(1 << 29)
-
-/*
- * These functions return the result in the CPSR register.
- *
- * For __aeabi_cfcmple:
- *      Z C
- *   LT 0 0
- *   EQ 1 1
- * else 0 1
- *
- * __aeabi_cfrcmple is the same as __aeabi_cfcmple, however the arguments
- * have been swapped.
- */
-ENTRY(__aeabi_cfcmple)
-	push	{r4, r5, ip, lr}
-
-	/* Backup the input registers */
-	mov	r4, r0
-	mov	r5, r1
-	/* Is it less than? */
-	bl	__aeabi_fcmplt
-	cmp	r0, #1
-	bne	1f
-	/* Yes, clear Z and C */
-	msr	cpsr_c, #(0)
-	b	99f
-
-1:
-	/* Restore the input regsters for the next function call */
-	mov	r0, r4
-	mov	r1, r5
-	/* Is it equal? */
-	bl	__aeabi_fcmpeq
-	cmp	r0, #1
-	bne	2f
-	/* Yes, set Z and C */
-	msr	cpsr_c, #(PCR_Z | PCR_C)
-	b 99f
-
-2:
-	/* Not less than or equal, set C and clear Z */
-	msr	cpsr_c, #(PCR_C)
-
-99:
-	pop	{r4, r5, ip, pc}
-END(__aeabi_cfcmple)
-
-ENTRY(__aeabi_cfrcmple)
-	/* Swap the arguments */
-	mov	ip, r0
-	mov	r0, r1
-	mov	r1, ip
-
-	b	__aeabi_cfcmple
-END(__aeabi_cfrcmple)
-
-/*
- * This is just like __aeabi_cfcmple except it will not throw an exception
- * in the presence of a quiet NaN. If either argument is a signalling NaN we
- * will still signal.
- */
-ENTRY(__aeabi_cfcmpeq)
-	/* Check if we can call __aeabi_cfcmple safely */
-	push	{r0, r1, r2, lr}
-	bl	__aeabi_cfcmpeq_helper
-	cmp	r0, #1
-	pop	{r0, r1, r2, lr}
-	beq	1f
-
-	bl	__aeabi_cfcmple
-	RET
-
-1:
-	msreq	cpsr_c, #(PCR_C)
-	RET
-END(__aeabi_cfcmpeq)
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_atexit.c b/lib/libc_bsd/arm/aeabi/aeabi_atexit.c
deleted file mode 100644
index b4c8e77..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_atexit.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2012 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/aeabi/aeabi_atexit.c 245655 2013-01-19 05:33:55Z andrew $");
-
-int __cxa_atexit(void (*)(void *), void *, void *);
-
-int
-__aeabi_atexit(void *object, void (*func)(void*), void *dso)
-{
-	return __cxa_atexit(func, object, dso);
-}
-
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_double.c b/lib/libc_bsd/arm/aeabi/aeabi_double.c
deleted file mode 100644
index 1965ce4..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_double.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2012 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/aeabi/aeabi_double.c 273471 2014-10-22 13:50:38Z andrew $");
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include "aeabi_vfp.h"
-
-extern int _libc_arm_fpu_present;
-
-flag __unorddf2(float64, float64);
-
-/* These are written in asm and are only called from this file */
-int __aeabi_dcmpeq_vfp(float64, float64);
-int __aeabi_dcmplt_vfp(float64, float64);
-int __aeabi_dcmple_vfp(float64, float64);
-int __aeabi_dcmpgt_vfp(float64, float64);
-int __aeabi_dcmpge_vfp(float64, float64);
-int __aeabi_dcmpun_vfp(float64, float64);
-int __aeabi_d2iz_vfp(float64);
-float32 __aeabi_d2f_vfp(float64);
-float64 __aeabi_i2d_vfp(int);
-float64 __aeabi_dadd_vfp(float64, float64);
-float64 __aeabi_ddiv_vfp(float64, float64);
-float64 __aeabi_dmul_vfp(float64, float64);
-float64 __aeabi_dsub_vfp(float64, float64);
-
-/*
- * Depending on the target these will:
- *  On armv6 with a vfp call the above function, or
- *  Call the softfloat function in the 3rd argument.
- */
-int AEABI_FUNC2(dcmpeq, float64, float64_eq)
-int AEABI_FUNC2(dcmplt, float64, float64_lt)
-int AEABI_FUNC2(dcmple, float64, float64_le)
-int AEABI_FUNC2_REV(dcmpge, float64, float64_le)
-int AEABI_FUNC2_REV(dcmpgt, float64, float64_lt)
-int AEABI_FUNC2(dcmpun, float64, __unorddf2)
-
-int AEABI_FUNC(d2iz, float64, float64_to_int32_round_to_zero)
-float32 AEABI_FUNC(d2f, float64, float64_to_float32)
-float64 AEABI_FUNC(i2d, int, int32_to_float64)
-
-float64 AEABI_FUNC2(dadd, float64, float64_add)
-float64 AEABI_FUNC2(ddiv, float64, float64_div)
-float64 AEABI_FUNC2(dmul, float64, float64_mul)
-float64 AEABI_FUNC2(dsub, float64, float64_sub)
-
-int
-__aeabi_cdcmpeq_helper(float64 a, float64 b)
-{
-	int quiet = 0;
-
-	/* Check if a is a NaN */
-	if ((a << 1) > 0xffe0000000000000ull) {
-		/* If it's a signalling NaN we will always signal */
-		if ((a & 0x0008000000000000ull) == 0)
-			return (0);
-
-		quiet = 1;
-	}
-
-	/* Check if b is a NaN */
-	if ((b << 1) > 0xffe0000000000000ull) {
-		/* If it's a signalling NaN we will always signal */
-		if ((b & 0x0008000000000000ull) == 0)
-			return (0);
-
-		quiet = 1;
-	}
-
-	return (quiet);
-}
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_float.c b/lib/libc_bsd/arm/aeabi/aeabi_float.c
deleted file mode 100644
index 39e5736..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_float.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2012 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/aeabi/aeabi_float.c 273471 2014-10-22 13:50:38Z andrew $");
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include "aeabi_vfp.h"
-
-extern int _libc_arm_fpu_present;
-
-flag __unordsf2(float32, float32);
-
-/* These are written in asm and are only called from this file */
-int __aeabi_fcmpeq_vfp(float32, float32);
-int __aeabi_fcmplt_vfp(float32, float32);
-int __aeabi_fcmple_vfp(float32, float32);
-int __aeabi_fcmpgt_vfp(float32, float32);
-int __aeabi_fcmpge_vfp(float32, float32);
-int __aeabi_fcmpun_vfp(float32, float32);
-int __aeabi_f2iz_vfp(float32);
-float64 __aeabi_f2d_vfp(float32);
-float32 __aeabi_i2f_vfp(int);
-float32 __aeabi_fadd_vfp(float32, float32);
-float32 __aeabi_fdiv_vfp(float32, float32);
-float32 __aeabi_fmul_vfp(float32, float32);
-float32 __aeabi_fsub_vfp(float32, float32);
-
-/*
- * Depending on the target these will:
- *  On armv6 with a vfp call the above function, or
- *  Call the softfloat function in the 3rd argument.
- */
-int AEABI_FUNC2(fcmpeq, float32, float32_eq)
-int AEABI_FUNC2(fcmplt, float32, float32_lt)
-int AEABI_FUNC2(fcmple, float32, float32_le)
-int AEABI_FUNC2_REV(fcmpge, float32, float32_le)
-int AEABI_FUNC2_REV(fcmpgt, float32, float32_lt)
-int AEABI_FUNC2(fcmpun, float32, __unordsf2)
-
-int AEABI_FUNC(f2iz, float32, float32_to_int32_round_to_zero)
-float64 AEABI_FUNC(f2d, float32, float32_to_float64)
-float32 AEABI_FUNC(i2f, int, int32_to_float32)
-
-float32 AEABI_FUNC2(fadd, float32, float32_add)
-float32 AEABI_FUNC2(fdiv, float32, float32_div)
-float32 AEABI_FUNC2(fmul, float32, float32_mul)
-float32 AEABI_FUNC2(fsub, float32, float32_sub)
-
-int
-__aeabi_cfcmpeq_helper(float32 a, float32 b)
-{
-	int quiet = 0;
-
-	/* Check if a is a NaN */
-	if ((a << 1) > 0xff000000u) {
-		/* If it's a signalling NaN we will always signal */
-		if ((a & 0x00400000u) == 0)
-			return (0);
-
-		quiet = 1;
-	}
-
-	/* Check if b is a NaN */
-	if ((b << 1) > 0xff000000u) {
-		/* If it's a signalling NaN we will always signal */
-		if ((b & 0x00400000u) == 0)
-			return (0);
-
-		quiet = 1;
-	}
-
-	return (quiet);
-}
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_unwind_cpp.c b/lib/libc_bsd/arm/aeabi/aeabi_unwind_cpp.c
deleted file mode 100644
index 9768f20..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_unwind_cpp.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2011 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-/*
- * Provide an implementation of __aeabi_unwind_cpp_pr{0,1,2}. These are
- * required by libc but are implemented in libgcc_eh.a which we don't link
- * against. The libgcc_eh.a version will be called so we call abort to
- * check this.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/aeabi/aeabi_unwind_cpp.c 245655 2013-01-19 05:33:55Z andrew $");
-
-#include <stdlib.h>
-
-void __aeabi_unwind_cpp_pr0(void) __hidden;
-void __aeabi_unwind_cpp_pr1(void) __hidden;
-void __aeabi_unwind_cpp_pr2(void) __hidden;
-
-void
-__aeabi_unwind_cpp_pr0(void)
-{
-	abort();
-}
-
-void
-__aeabi_unwind_cpp_pr1(void)
-{
-	abort();
-}
-
-void
-__aeabi_unwind_cpp_pr2(void)
-{
-	abort();
-}
-
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_unwind_exidx.c b/lib/libc_bsd/arm/aeabi/aeabi_unwind_exidx.c
deleted file mode 100644
index 478e42e..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_unwind_exidx.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 2014 Ian Lepore <ian@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/aeabi/aeabi_unwind_exidx.c 269792 2014-08-10 22:26:29Z ian $");
-
-#include <sys/types.h>
-#include <machine/elf.h>
-#include <link.h>
-#include <stddef.h>
-
-/*
- * ARM EABI unwind helper.
- *
- * This finds the exidx section address and size associated with a given code
- * address.  There are separate implementations for static and dynamic code.
- *
- * GCC expects this function to exist as __gnu_Unwind_Find_exidx(), clang and
- * BSD tools expect it to be dl_unwind_find_exidx().  Both have the same API, so
- * we set up an alias for GCC.
- */
-__strong_reference(dl_unwind_find_exidx, __gnu_Unwind_Find_exidx);
-
-/*
- * Each entry in the exidx section is a pair of 32-bit words.  We don't
- * interpret the contents of the entries here; this typedef is just a local
- * convenience for using sizeof() and doing pointer math.
- */
-typedef struct exidx_entry {
-	uint32_t data[2];
-} exidx_entry;
-
-#ifdef __PIC__
-
-/*
- * Unwind helper for dynamically linked code.
- *
- * This finds the shared object that contains the given address, and returns the
- * address of the exidx section in that shared object along with the number of
- * entries in that section, or NULL if it wasn't found.
- */
-void *
-dl_unwind_find_exidx(const void *pc, int *pcount)
-{
-	const Elf_Phdr *hdr;
-	struct dl_phdr_info info;
-	int i;
-
-	if (_rtld_addr_phdr(pc, &info)) {
-		hdr = info.dlpi_phdr;
-		for (i = 0; i < info.dlpi_phnum; i++, hdr++) {
-			if (hdr->p_type == PT_ARM_EXIDX) {
-				*pcount = hdr->p_memsz / sizeof(exidx_entry);
-				return ((void *)(info.dlpi_addr + hdr->p_vaddr));
-			}
-		}
-	}
-	return (NULL);
-}
-
-#else	/* !__PIC__ */
-
-/*
- * Unwind helper for statically linked code.
- *
- * In a statically linked program, the linker populates a pair of symbols with
- * the addresses of the start and end of the exidx table, so returning the
- * address and count of elements is pretty straighforward.
- */
-void *
-dl_unwind_find_exidx(const void *pc, int *pcount)
-{
-	extern struct exidx_entry __exidx_start;
-	extern struct exidx_entry __exidx_end;
-
-	*pcount = (int)(&__exidx_end - &__exidx_start);
-	return (&__exidx_start);
-}
-
-#endif	/* __PIC__ */
-
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_vfp.h b/lib/libc_bsd/arm/aeabi/aeabi_vfp.h
deleted file mode 100644
index abe7513..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_vfp.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2013 Andrew Turner
- * 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.
- *
- * 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: releng/10.2/lib/libc/arm/aeabi/aeabi_vfp.h 273827 2014-10-29 16:24:02Z andrew $
- *
- */
-
-#ifndef AEABI_VFP_H
-#define	AEABI_VFP_H
-
-#include <machine/acle-compat.h>
-
-/*
- * ASM helper macros. These allow the functions to be changed depending on
- * the endian-ness we are building for.
- */
-
-/* Allow the name of the function to be changed depending on the ABI */
-#ifndef __ARM_PCS_VFP
-#define	AEABI_ENTRY(x)	ENTRY(__aeabi_ ## x ## _vfp)
-#define	AEABI_END(x)	END(__aeabi_ ## x ## _vfp)
-#else
-#define	AEABI_ENTRY(x)	ENTRY(__aeabi_ ## x)
-#define	AEABI_END(x)	END(__aeabi_ ## x)
-#endif
-
-/*
- * These should be used when a function either takes, or returns a floating
- * point falue. They will load the data from an ARM to a VFP register(s),
- * or from a VFP to an ARM register
- */
-#ifdef __ARM_BIG_ENDIAN
-#define	LOAD_DREG(vreg, reg0, reg1)   vmov vreg, reg1, reg0
-#define	UNLOAD_DREG(reg0, reg1, vreg) vmov reg1, reg0, vreg
-#else
-#define	LOAD_DREG(vreg, reg0, reg1)   vmov vreg, reg0, reg1
-#define	UNLOAD_DREG(reg0, reg1, vreg) vmov reg0, reg1, vreg
-#endif
-
-#define	LOAD_SREGS(vreg0, vreg1, reg0, reg1) vmov vreg0, vreg1, reg0, reg1
-#define	LOAD_SREG(vreg, reg)                 vmov vreg, reg
-#define	UNLOAD_SREG(reg, vreg)               vmov reg, vreg
-
-/*
- * C Helper macros
- */
-
-#if __ARM_ARCH >= 6
-/*
- * Generate a function that will either call into the VFP implementation,
- * or the soft float version for a given __aeabi_* helper. The function
- * will take a single argument of the type given by in_type.
- */
-#define	AEABI_FUNC(name, in_type, soft_func)			\
-__aeabi_ ## name(in_type a)					\
-{								\
-	if (_libc_arm_fpu_present)				\
-		return __aeabi_ ## name ## _vfp(a);		\
-	else							\
-		return soft_func (a);				\
-}
-
-/* As above, but takes two arguments of the same type */
-#define	AEABI_FUNC2(name, in_type, soft_func)			\
-__aeabi_ ## name(in_type a, in_type b)				\
-{								\
-	if (_libc_arm_fpu_present)				\
-		return __aeabi_ ## name ## _vfp(a, b);	\
-	else							\
-		return soft_func (a, b);			\
-}
-
-/* As above, but with the soft float arguments reversed */
-#define	AEABI_FUNC2_REV(name, in_type, soft_func)		\
-__aeabi_ ## name(in_type a, in_type b)				\
-{								\
-	if (_libc_arm_fpu_present)				\
-		return __aeabi_ ## name ## _vfp(a, b);	\
-	else							\
-		return soft_func (b, a);			\
-}
-#else
-/*
- * Helper macros for when we are only able to use the softfloat
- * version of these functions, i.e. on arm before armv6.
- */
-#define	AEABI_FUNC(name, in_type, soft_func)			\
-__aeabi_ ## name(in_type a)					\
-{								\
-	return soft_func (a);					\
-}
-
-/* As above, but takes two arguments of the same type */
-#define	AEABI_FUNC2(name, in_type, soft_func)			\
-__aeabi_ ## name(in_type a, in_type b)				\
-{								\
-	return soft_func (a, b);				\
-}
-
-/* As above, but with the soft float arguments reversed */
-#define	AEABI_FUNC2_REV(name, in_type, soft_func)		\
-__aeabi_ ## name(in_type a, in_type b)				\
-{								\
-	return soft_func (b, a);				\
-}
-#endif
-
-#endif
-
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_vfp_double.S b/lib/libc_bsd/arm/aeabi/aeabi_vfp_double.S
deleted file mode 100644
index 89e57d3..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_vfp_double.S
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (C) 2013 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/aeabi/aeabi_vfp_double.S 273471 2014-10-22 13:50:38Z andrew $");
-
-#include "aeabi_vfp.h"
-
-.fpu	vfp
-.syntax	unified
-
-/* void __aeabi_cdcmpeq(double, double) */
-AEABI_ENTRY(cdcmpeq)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vcmp.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	RET
-AEABI_END(cdcmpeq)
-
-/* void __aeabi_cdcmple(double, double) */
-AEABI_ENTRY(cdcmple)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vcmpe.f64	d0, d1
-	vmrs		APSR_nzcv, fpscr
-	RET
-AEABI_END(cdcmple)
-
-/* void __aeabi_cdrcmple(double, double) */
-AEABI_ENTRY(cdrcmple)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vcmpe.f64	d1, d0
-	vmrs		APSR_nzcv, fpscr
-	RET
-AEABI_END(cdrcmple)
-
-/* int __aeabi_dcmpeq(double, double) */
-AEABI_ENTRY(dcmpeq)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vcmp.f64 d0, d1
-	vmrs     APSR_nzcv, fpscr
-	movne    r0, #0
-	moveq    r0, #1
-	RET
-AEABI_END(dcmpeq)
-
-/* int __aeabi_dcmplt(double, double) */
-AEABI_ENTRY(dcmplt)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vcmp.f64 d0, d1
-	vmrs     APSR_nzcv, fpscr
-	movcs    r0, #0
-	movlt    r0, #1
-	RET
-AEABI_END(dcmplt)
-
-/* int __aeabi_dcmple(double, double) */
-AEABI_ENTRY(dcmple)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vcmp.f64 d0, d1
-	vmrs     APSR_nzcv, fpscr
-	movhi    r0, #0
-	movls    r0, #1
-	RET
-AEABI_END(dcmple)
-
-/* int __aeabi_dcmpge(double, double) */
-AEABI_ENTRY(dcmpge)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vcmp.f64 d0, d1
-	vmrs     APSR_nzcv, fpscr
-	movlt    r0, #0
-	movge    r0, #1
-	RET
-AEABI_END(dcmpge)
-
-/* int __aeabi_dcmpgt(double, double) */
-AEABI_ENTRY(dcmpgt)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vcmp.f64 d0, d1
-	vmrs     APSR_nzcv, fpscr
-	movle    r0, #0
-	movgt    r0, #1
-	RET
-AEABI_END(dcmpgt)
-
-/* int __aeabi_dcmpun(double, double) */
-AEABI_ENTRY(dcmpun)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vcmp.f64 d0, d1
-	vmrs     APSR_nzcv, fpscr
-	movvc    r0, #0
-	movvs    r0, #1
-	RET
-AEABI_END(dcmpun)
-
-/* int __aeabi_d2iz(double) */
-AEABI_ENTRY(d2iz)
-	LOAD_DREG(d0, r0, r1)
-#if 0
-	/*
-	 * This should be the correct instruction, but binutils incorrectly
-	 * encodes it as the version that used FPSCR to determine the rounding.
-	 * When binutils is fixed we can use this again.
-	 */
-	vcvt.s32.f64 s0, d0
-#else
-	ftosizd s0, d0
-#endif
-	vmov         r0, s0
-	RET
-AEABI_END(d2iz)
-
-/* float __aeabi_d2f(double) */
-AEABI_ENTRY(d2f)
-	LOAD_DREG(d0, r0, r1)
-	vcvt.f32.f64 s0, d0
-	UNLOAD_SREG(r0, s0)
-	RET
-AEABI_END(d2f)
-
-/* double __aeabi_i2d(int) */
-AEABI_ENTRY(i2d)
-	vmov         s0, r0
-	vcvt.f64.s32 d0, s0
-	UNLOAD_DREG(r0, r1, d0)
-	RET
-AEABI_END(i2d)
-
-/* double __aeabi_dadd(double, double) */
-AEABI_ENTRY(dadd)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vadd.f64 d0, d0, d1
-	UNLOAD_DREG(r0, r1, d0)
-	RET
-AEABI_END(dadd)
-
-/* double __aeabi_ddiv(double, double) */
-AEABI_ENTRY(ddiv)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vdiv.f64 d0, d0, d1
-	UNLOAD_DREG(r0, r1, d0)
-	RET
-AEABI_END(ddiv)
-
-/* double __aeabi_dmul(double, double) */
-AEABI_ENTRY(dmul)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vmul.f64 d0, d0, d1
-	UNLOAD_DREG(r0, r1, d0)
-	RET
-AEABI_END(dmul)
-
-/* double __aeabi_dsub(double, double) */
-AEABI_ENTRY(dsub)
-	LOAD_DREG(d0, r0, r1)
-	LOAD_DREG(d1, r2, r3)
-	vsub.f64 d0, d0, d1
-	UNLOAD_DREG(r0, r1, d0)
-	RET
-AEABI_END(dsub)
-
diff --git a/lib/libc_bsd/arm/aeabi/aeabi_vfp_float.S b/lib/libc_bsd/arm/aeabi/aeabi_vfp_float.S
deleted file mode 100644
index 7bfcb97..0000000
--- a/lib/libc_bsd/arm/aeabi/aeabi_vfp_float.S
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2013 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/aeabi/aeabi_vfp_float.S 273471 2014-10-22 13:50:38Z andrew $");
-
-#include "aeabi_vfp.h"
-
-.fpu	vfp
-.syntax	unified
-
-/* void __aeabi_cfcmpeq(float, float) */
-AEABI_ENTRY(cfcmpeq)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vcmp.f32	s0, s1
-	vmrs     	APSR_nzcv, fpscr
-	RET
-AEABI_END(cfcmpeq)
-
-/* void __aeabi_cfcmple(float, float) */
-AEABI_ENTRY(cfcmple)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vcmpe.f32	s0, s1
-	vmrs     	APSR_nzcv, fpscr
-	RET
-AEABI_END(cfcmple)
-
-/* void __aeabi_cfrcmple(float, float) */
-AEABI_ENTRY(cfrcmple)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vcmpe.f32	s1, s0
-	vmrs     	APSR_nzcv, fpscr
-	RET
-AEABI_END(cfrcmple)
-
-/* int __aeabi_fcmpeq(float, float) */
-AEABI_ENTRY(fcmpeq)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vcmp.f32 s0, s1
-	vmrs     APSR_nzcv, fpscr
-	movne    r0, #0
-	moveq    r0, #1
-	RET
-AEABI_END(fcmpeq)
-
-/* int __aeabi_fcmplt(float, float) */
-AEABI_ENTRY(fcmplt)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vcmp.f32 s0, s1
-	vmrs     APSR_nzcv, fpscr
-	movcs    r0, #0
-	movlt    r0, #1
-	RET
-AEABI_END(fcmplt)
-
-/* int __aeabi_fcmple(float, float) */
-AEABI_ENTRY(fcmple)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vcmp.f32 s0, s1
-	vmrs     APSR_nzcv, fpscr
-	movhi    r0, #0
-	movls    r0, #1
-	RET
-AEABI_END(fcmple)
-
-/* int __aeabi_fcmpge(float, float) */
-AEABI_ENTRY(fcmpge)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vcmp.f32 s0, s1
-	vmrs     APSR_nzcv, fpscr
-	movlt    r0, #0
-	movge    r0, #1
-	RET
-AEABI_END(fcmpge)
-
-/* int __aeabi_fcmpgt(float, float) */
-AEABI_ENTRY(fcmpgt)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vcmp.f32 s0, s1
-	vmrs     APSR_nzcv, fpscr
-	movle    r0, #0
-	movgt    r0, #1
-	RET
-AEABI_END(fcmpgt)
-
-/* int __aeabi_fcmpun(float, float) */
-AEABI_ENTRY(fcmpun)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vcmp.f32 s0, s1
-	vmrs     APSR_nzcv, fpscr
-	movvc    r0, #0
-	movvs    r0, #1
-	RET
-AEABI_END(fcmpun)
-
-/* int __aeabi_f2iz(float) */
-AEABI_ENTRY(f2iz)
-	LOAD_SREG(s0, r0)
-#if 0
-	/*
-	 * This should be the correct instruction, but binutils incorrectly
-	 * encodes it as the version that used FPSCR to determine the rounding.
-	 * When binutils is fixed we can use this again.
-	 */
-	vcvt.s32.f32 s0, s0
-#else
-	ftosizs      s0, s0
-#endif
-	vmov         r0, s0
-	RET
-AEABI_END(f2iz)
-
-/* double __aeabi_f2d(float) */
-AEABI_ENTRY(f2d)
-	LOAD_SREG(s0, r0)
-	vcvt.f64.f32 d0, s0
-	UNLOAD_DREG(r0, r1, d0)
-	RET
-AEABI_END(f2d)
-
-/* float __aeabi_i2f(int) */
-AEABI_ENTRY(i2f)
-	vmov         s0, r0
-	vcvt.f32.s32 s0, s0
-	UNLOAD_SREG(r0, s0)
-	RET
-AEABI_END(i2f)
-
-/* float __aeabi_fadd(float, float) */
-AEABI_ENTRY(fadd)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vadd.f32 s0, s0, s1
-	UNLOAD_SREG(r0, s0)
-	RET
-AEABI_END(fadd)
-
-/* float __aeabi_fmul(float, float) */
-AEABI_ENTRY(fdiv)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vdiv.f32 s0, s0, s1
-	UNLOAD_SREG(r0, s0)
-	RET
-AEABI_END(fdiv)
-
-/* float __aeabi_fmul(float, float) */
-AEABI_ENTRY(fmul)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vmul.f32 s0, s0, s1
-	UNLOAD_SREG(r0, s0)
-	RET
-AEABI_END(fmul)
-
-/* float __aeabi_fsub(float, float) */
-AEABI_ENTRY(fsub)
-	LOAD_SREGS(s0, s1, r0, r1)
-	vsub.f32 s0, s0, s1
-	UNLOAD_SREG(r0, s0)
-	RET
-AEABI_END(fsub)
-
diff --git a/lib/libc_bsd/arm/arith.h b/lib/libc_bsd/arm/arith.h
deleted file mode 100644
index 5f3ad0d..0000000
--- a/lib/libc_bsd/arm/arith.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD: releng/10.2/lib/libc/arm/arith.h 255361 2013-09-07 14:04:10Z andrew $
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-
-#if !defined(__ARMEB__) && (defined(__VFP_FP__) || defined(__ARM_EABI__))
-#define IEEE_8087
-#define Arith_Kind_ASL 1
-#define Sudden_Underflow
-#else
-#define IEEE_MC68k
-#define Arith_Kind_ASL 2
-#endif
diff --git a/lib/libc_bsd/arm/gd_qnan.h b/lib/libc_bsd/arm/gd_qnan.h
deleted file mode 100644
index 9cb9da4..0000000
--- a/lib/libc_bsd/arm/gd_qnan.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * This file can be generated by compiling and running contrib/gdtoa/qnan.c
- * on the target architecture after arith.h has been generated.
- *
- * XXX I don't have ARM hardware, so I just guessed.  --das
- *
- * $FreeBSD: releng/10.2/lib/libc/arm/gd_qnan.h 174680 2007-12-16 21:15:09Z das $
- */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
-#define ld_QNAN0 0x0
-#define ld_QNAN1 0xc0000000
-#define ld_QNAN2 0x7fff
-#define ld_QNAN3 0x0
-#define ldus_QNAN0 0x0
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0xc000
-#define ldus_QNAN4 0x7fff
diff --git a/lib/libc_bsd/arm/gen/Makefile.inc b/lib/libc_bsd/arm/gen/Makefile.inc
deleted file mode 100644
index 5639c08..0000000
--- a/lib/libc_bsd/arm/gen/Makefile.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 266370 2014-05-17 22:19:16Z ian $
-
-SRCS+=	_ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \
-	getcontextx.c infinity.c ldexp.c makecontext.c \
-	__aeabi_read_tp.S setjmp.S signalcontext.c sigsetjmp.S flt_rounds.c \
-	arm_initfini.c
-
-.if ${MK_ARM_EABI} == "no"
-SRCS+=	divsi3.S
-.endif
-
-.if ${MACHINE_ARCH} == "armv6hf"
-SRCS+=	fpgetmask_vfp.c fpgetround_vfp.c fpgetsticky_vfp.c fpsetmask_vfp.c \
-	fpsetround_vfp.c fpsetsticky_vfp.c
-.endif
diff --git a/lib/libc_bsd/arm/gen/__aeabi_read_tp.S b/lib/libc_bsd/arm/gen/__aeabi_read_tp.S
deleted file mode 100644
index 0fac306..0000000
--- a/lib/libc_bsd/arm/gen/__aeabi_read_tp.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2012 Oleksandr Tymoshenko
- * Copyright (c) 2012 Andrew Turner
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/__aeabi_read_tp.S 271337 2014-09-09 22:24:01Z ian $");
-
-#include <machine/sysarch.h>
-
-ENTRY(__aeabi_read_tp)
-#ifdef ARM_TP_ADDRESS
-	ldr	r0, .Larm_tp_address
-	ldr	r0, [r0]
-#else
-	mrc	p15, 0, r0, c13, c0, 3
-#endif
-	RET
-END(__aeabi_read_tp)
-
-#ifdef ARM_TP_ADDRESS
-.Larm_tp_address:
-	.word ARM_TP_ADDRESS
-#endif
-
diff --git a/lib/libc_bsd/arm/gen/_ctx_start.S b/lib/libc_bsd/arm/gen/_ctx_start.S
deleted file mode 100644
index 312254c..0000000
--- a/lib/libc_bsd/arm/gen/_ctx_start.S
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <machine/asm.h>
-
-.ident	"$FreeBSD: releng/10.2/lib/libc/arm/gen/_ctx_start.S 271337 2014-09-09 22:24:01Z ian $"
-ENTRY(_ctx_start)
-	mov	lr, pc
-	mov	pc, r4
-	mov	r0, r5
-	bl	_C_LABEL(ctx_done)
-	bl	_C_LABEL(abort)
-END(_ctx_start)
diff --git a/lib/libc_bsd/arm/gen/_set_tp.c b/lib/libc_bsd/arm/gen/_set_tp.c
deleted file mode 100644
index 15bb60e..0000000
--- a/lib/libc_bsd/arm/gen/_set_tp.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/arm/gen/_set_tp.c 239271 2012-08-15 03:09:00Z gonzo $
- */
-
-#include <string.h>
-#include <sys/types.h>
-
-#include <machine/sysarch.h>
-
-void
-_set_tp(void *tp)
-{
-
-#ifdef ARM_TP_ADDRESS
-	*((struct tcb **)ARM_TP_ADDRESS) = tp;
-#else
-	sysarch(ARM_SET_TP, tp);
-#endif
-}
diff --git a/lib/libc_bsd/arm/gen/_setjmp.S b/lib/libc_bsd/arm/gen/_setjmp.S
deleted file mode 100644
index 23fc3d7..0000000
--- a/lib/libc_bsd/arm/gen/_setjmp.S
+++ /dev/null
@@ -1,144 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.12 2013/04/19 13:45:45 matt Exp $	*/
-
-/*
- * Copyright (c) 1997 Mark Brinicombe
- * 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 Mark Brinicombe
- * 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 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.
- */
-
-#if !defined(__SOFTFP__) && !defined(__VFP_FP__) && !defined(__ARM_PCS)
-#error FPA is not supported anymore
-#endif
-
-#if defined(__ARM_EABI__) && !defined(_STANDALONE)
-	.fpu	vfp
-#endif
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/_setjmp.S 271337 2014-09-09 22:24:01Z ian $");
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	_setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is NOT restored.
- *
- * Note: r0 is the return value
- *       r1-r3,ip are scratch registers in functions
- */
-
-ENTRY(_setjmp)
-	ldr	r1, .L_setjmp_magic
-
-#if defined(__ARM_EABI__) && !defined(_STANDALONE)
-	ldr	r2, .Lfpu_present
-#ifdef PIC
-	GOT_INIT(r3, .L_setjmp_got, .L_setjmp_gotinit)
-	ldr	r2, [r2, r3]
-#else
-	ldr	r2, [r2]
-#endif
-	teq	r2, #0		/* do we have a FPU? */
-	beq	1f		/*   no, don't save VFP registers */
-
-	orr	r1, r1, #(_JB_MAGIC__SETJMP ^ _JB_MAGIC__SETJMP_VFP)
-				/* change magic to VFP magic */
-	add	r2, r0, #(_JB_REG_D8 * 4)
-	vstmia	r2, {d8-d15}
-	vmrs	r2, fpscr
-	str	r2, [r0, #(_JB_REG_FPSCR * 4)]
-1:
-#endif /* __ARM_EABI__ */
-
-	str	r1, [r0]
-
-	add	r0, r0, #(_JB_REG_R4 * 4)
-	/* Store integer registers */
-        stmia	r0, {r4-r14}
-
-        mov	r0, #0x00000000
-	RET
-END(_setjmp)
-
-.L_setjmp_magic:
-	.word	_JB_MAGIC__SETJMP
-#if defined(__ARM_EABI__) && !defined(_STANDALONE)
-	GOT_INITSYM(.L_setjmp_got, .L_setjmp_gotinit)
-.Lfpu_present:
-	.word	PIC_SYM(_libc_arm_fpu_present, GOTOFF)
-#endif /* __ARM_EABI__ */
-
-WEAK_ALIAS(___longjmp, _longjmp)
-ENTRY(_longjmp)
-	ldr	r2, [r0]			/* get magic from jmp_buf */
-	bic	r3, r2, #(_JB_MAGIC__SETJMP ^ _JB_MAGIC__SETJMP_VFP)
-						/* ignore VFP-ness of magic */
-	ldr	ip, .L_setjmp_magic		/* load magic */
-	teq	ip, r3				/* magic correct? */
-	bne	botch				/*   no, botch */
-
-#if defined(__ARM_EABI__) && !defined(_STANDALONE)
-	teq	r3, r2				/* did magic change? */
-	beq	1f				/*   no, don't restore VFP */
-	add	ip, r0, #(_JB_REG_D8 * 4)
-	vldmia	ip, {d8-d15}
-	ldr	ip, [r0, #(_JB_REG_FPSCR * 4)]
-	vmsr	fpscr, ip
-1:
-#endif /* __ARM_EABI__ */
-
-	add	r0, r0, #(_JB_REG_R4 * 4)
-       	/* Restore integer registers */
-        ldmia	r0, {r4-r14}
-
-	/* Validate sp and r14 */
-	teq	sp, #0
-	teqne	r14, #0
-	beq	botch
-
-	/* Set return value */
-	movs	r0, r1
-	moveq	r0, #0x00000001
-	RET
-
-	/* validation failed, die die die. */
-botch:
-#if !defined(_STANDALONE)
-	bl	PIC_SYM(_C_LABEL(longjmperror), PLT)
-	bl	PIC_SYM(_C_LABEL(abort), PLT)
-	b	. - 8		/* Cannot get here */
-#else
-	b	.
-#endif
-END(_longjmp)
diff --git a/lib/libc_bsd/arm/gen/alloca.S b/lib/libc_bsd/arm/gen/alloca.S
deleted file mode 100644
index 11575ac..0000000
--- a/lib/libc_bsd/arm/gen/alloca.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: alloca.S,v 1.3 2003/04/05 23:08:51 bjh21 Exp $	*/
-
-/*
- * Copyright (c) 1995 Mark Brinicombe
- * 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 Mark Brinicombe
- * 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 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.
- */
-
-/* like alloc, but automatic automatic free in return */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/alloca.S 271337 2014-09-09 22:24:01Z ian $");
-
-ENTRY(alloca)
-	add	r0, r0, #0x00000007	/* round up to next 8 byte alignment */
-	bic	r0, r0, #0x00000007
-	sub	sp, sp, r0		/* Adjust the stack pointer */
-	mov	r0, sp			/* r0 = base of new space */
-	RET
-END(alloca)
diff --git a/lib/libc_bsd/arm/gen/arm_initfini.c b/lib/libc_bsd/arm/gen/arm_initfini.c
deleted file mode 100644
index a3239ce..0000000
--- a/lib/libc_bsd/arm/gen/arm_initfini.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 2013 The NetBSD Foundation, Inc.
- * Copyright (c) 2013 Andrew Turner
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Matt Thomas of 3am Software Foundry.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- * 
- * Bases on NetBSD lib/libc/arch/arm/misc/arm_initfini.c
- * $NetBSD: arm_initfini.c,v 1.2 2013/01/31 06:47:55 matt Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/arm_initfini.c 251514 2013-06-07 22:01:06Z andrew $");
-
-/*
- * To properly implement setjmp/longjmp for the ARM AAPCS ABI, it has to be
- * aware of whether there is a FPU is present or not.  Regardless of whether
- * the hard-float ABI is being used, setjmp needs to save D8-D15.  But it can
- * only do this if those instructions won't cause an exception.
- */
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <stdbool.h>
-#include <stddef.h>
-
-extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
-    void *newp, size_t newlen);
-
-int _libc_arm_fpu_present;
-static bool _libc_aapcs_initialized;
-
-void	_libc_aapcs_init(void) __attribute__((__constructor__, __used__));
-
-void
-_libc_aapcs_init(void)
-{
-	int mib[2];
-	size_t len;
-
-	if (_libc_aapcs_initialized)
-		return;
-
-	mib[0] = CTL_HW;
-	mib[1] = HW_FLOATINGPT;
-
-	len = sizeof(_libc_arm_fpu_present);
-	if (__sysctl(mib, 2, &_libc_arm_fpu_present, &len, NULL, 0) == -1 ||
-	    len != sizeof(_libc_arm_fpu_present)) {
-		/* sysctl failed, assume no vfp */
-		_libc_arm_fpu_present = 0;
-	}
-
-	_libc_aapcs_initialized = true;
-}
diff --git a/lib/libc_bsd/arm/gen/divsi3.S b/lib/libc_bsd/arm/gen/divsi3.S
deleted file mode 100644
index 790f67f..0000000
--- a/lib/libc_bsd/arm/gen/divsi3.S
+++ /dev/null
@@ -1,391 +0,0 @@
-/*	$NetBSD: divsi3.S,v 1.4 2003/04/05 23:27:15 bjh21 Exp $	*/
-
-/*
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/divsi3.S 271337 2014-09-09 22:24:01Z ian $");
-
-/* 
- * stack is aligned as there's a possibility of branching to L_overflow
- * which makes a C call
- */
-
-ENTRY(__umodsi3)
-	stmfd	sp!, {lr}
-	sub	sp, sp, #4	/* align stack */
-	bl	.L_udivide
-	add	sp, sp, #4	/* unalign stack */
-	mov	r0, r1
-	ldmfd	sp!, {pc}
-END(__umodsi3)
-
-ENTRY(__modsi3)
-	stmfd	sp!, {lr}
-	sub	sp, sp, #4	/* align stack */
-	bl	.L_divide
-	add	sp, sp, #4	/* unalign stack */
-	mov	r0, r1
-	ldmfd	sp!, {pc}
-
-.L_overflow:
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-	mov	r0, #8			/* SIGFPE */
-	bl	PIC_SYM(_C_LABEL(raise), PLT)	/* raise it */
-	mov	r0, #0
-#else
-	/* XXX should cause a fatal error */
-	mvn	r0, #0
-#endif
-	RET
-END(__modsi3)
-
-ENTRY(__udivsi3)
-.L_udivide:				/* r0 = r0 / r1; r1 = r0 % r1 */
-	eor     r0, r1, r0 
-	eor     r1, r0, r1 
-	eor     r0, r1, r0 
-					/* r0 = r1 / r0; r1 = r1 % r0 */
-	cmp	r0, #1
-	bcc	.L_overflow
-	beq	.L_divide_l0
-	mov	ip, #0
-	movs	r1, r1
-	bpl	.L_divide_l1
-	orr	ip, ip, #0x20000000	/* ip bit 0x20000000 = -ve r1 */
-	movs	r1, r1, lsr #1
-	orrcs	ip, ip, #0x10000000	/* ip bit 0x10000000 = bit 0 of r1 */
-	b	.L_divide_l1
-
-.L_divide_l0:				/* r0 == 1 */
-	mov	r0, r1
-	mov	r1, #0
-	RET
-END(__udivsi3)
-
-ENTRY(__divsi3)
-.L_divide:				/* r0 = r0 / r1; r1 = r0 % r1 */
-	eor     r0, r1, r0 
-	eor     r1, r0, r1 
-	eor     r0, r1, r0 
-					/* r0 = r1 / r0; r1 = r1 % r0 */
-	cmp	r0, #1
-	bcc	.L_overflow
-	beq	.L_divide_l0
-	ands	ip, r0, #0x80000000
-	rsbmi	r0, r0, #0
-	ands	r2, r1, #0x80000000
-	eor	ip, ip, r2
-	rsbmi	r1, r1, #0
-	orr	ip, r2, ip, lsr #1	/* ip bit 0x40000000 = -ve division */
-					/* ip bit 0x80000000 = -ve remainder */
-
-.L_divide_l1:
-	mov	r2, #1
-	mov	r3, #0
-
-	/*
-	 * If the highest bit of the dividend is set, we have to be
-	 * careful when shifting the divisor. Test this. 
-	 */
-	movs	r1,r1
-	bpl	.L_old_code
-
-	/*
-	 * At this point, the highest bit of r1 is known to be set.
-	 * We abuse this below in the tst instructions.
-	 */
-	tst	r1, r0 /*, lsl #0 */
-	bmi	.L_divide_b1
-	tst	r1, r0, lsl #1
-	bmi	.L_divide_b2
-	tst	r1, r0, lsl #2
-	bmi	.L_divide_b3
-	tst	r1, r0, lsl #3
-	bmi	.L_divide_b4
-	tst	r1, r0, lsl #4
-	bmi	.L_divide_b5
-	tst	r1, r0, lsl #5
-	bmi	.L_divide_b6
-	tst	r1, r0, lsl #6
-	bmi	.L_divide_b7
-	tst	r1, r0, lsl #7
-	bmi	.L_divide_b8
-	tst	r1, r0, lsl #8
-	bmi	.L_divide_b9
-	tst	r1, r0, lsl #9
-	bmi	.L_divide_b10
-	tst	r1, r0, lsl #10
-	bmi	.L_divide_b11
-	tst	r1, r0, lsl #11
-	bmi	.L_divide_b12
-	tst	r1, r0, lsl #12
-	bmi	.L_divide_b13
-	tst	r1, r0, lsl #13
-	bmi	.L_divide_b14
-	tst	r1, r0, lsl #14
-	bmi	.L_divide_b15
-	tst	r1, r0, lsl #15
-	bmi	.L_divide_b16
-	tst	r1, r0, lsl #16
-	bmi	.L_divide_b17
-	tst	r1, r0, lsl #17
-	bmi	.L_divide_b18
-	tst	r1, r0, lsl #18
-	bmi	.L_divide_b19
-	tst	r1, r0, lsl #19
-	bmi	.L_divide_b20
-	tst	r1, r0, lsl #20
-	bmi	.L_divide_b21
-	tst	r1, r0, lsl #21
-	bmi	.L_divide_b22
-	tst	r1, r0, lsl #22
-	bmi	.L_divide_b23
-	tst	r1, r0, lsl #23
-	bmi	.L_divide_b24
-	tst	r1, r0, lsl #24
-	bmi	.L_divide_b25
-	tst	r1, r0, lsl #25
-	bmi	.L_divide_b26
-	tst	r1, r0, lsl #26
-	bmi	.L_divide_b27
-	tst	r1, r0, lsl #27
-	bmi	.L_divide_b28
-	tst	r1, r0, lsl #28
-	bmi	.L_divide_b29
-	tst	r1, r0, lsl #29
-	bmi	.L_divide_b30
-	tst	r1, r0, lsl #30
-	bmi	.L_divide_b31
-/*
- * instead of:
- *	tst	r1, r0, lsl #31
- *	bmi	.L_divide_b32
- */
-	b	.L_divide_b32
-
-.L_old_code:
-	cmp	r1, r0
-	bcc	.L_divide_b0
-	cmp	r1, r0, lsl #1
-	bcc	.L_divide_b1
-	cmp	r1, r0, lsl #2
-	bcc	.L_divide_b2
-	cmp	r1, r0, lsl #3
-	bcc	.L_divide_b3
-	cmp	r1, r0, lsl #4
-	bcc	.L_divide_b4
-	cmp	r1, r0, lsl #5
-	bcc	.L_divide_b5
-	cmp	r1, r0, lsl #6
-	bcc	.L_divide_b6
-	cmp	r1, r0, lsl #7
-	bcc	.L_divide_b7
-	cmp	r1, r0, lsl #8
-	bcc	.L_divide_b8
-	cmp	r1, r0, lsl #9
-	bcc	.L_divide_b9
-	cmp	r1, r0, lsl #10
-	bcc	.L_divide_b10
-	cmp	r1, r0, lsl #11
-	bcc	.L_divide_b11
-	cmp	r1, r0, lsl #12
-	bcc	.L_divide_b12
-	cmp	r1, r0, lsl #13
-	bcc	.L_divide_b13
-	cmp	r1, r0, lsl #14
-	bcc	.L_divide_b14
-	cmp	r1, r0, lsl #15
-	bcc	.L_divide_b15
-	cmp	r1, r0, lsl #16
-	bcc	.L_divide_b16
-	cmp	r1, r0, lsl #17
-	bcc	.L_divide_b17
-	cmp	r1, r0, lsl #18
-	bcc	.L_divide_b18
-	cmp	r1, r0, lsl #19
-	bcc	.L_divide_b19
-	cmp	r1, r0, lsl #20
-	bcc	.L_divide_b20
-	cmp	r1, r0, lsl #21
-	bcc	.L_divide_b21
-	cmp	r1, r0, lsl #22
-	bcc	.L_divide_b22
-	cmp	r1, r0, lsl #23
-	bcc	.L_divide_b23
-	cmp	r1, r0, lsl #24
-	bcc	.L_divide_b24
-	cmp	r1, r0, lsl #25
-	bcc	.L_divide_b25
-	cmp	r1, r0, lsl #26
-	bcc	.L_divide_b26
-	cmp	r1, r0, lsl #27
-	bcc	.L_divide_b27
-	cmp	r1, r0, lsl #28
-	bcc	.L_divide_b28
-	cmp	r1, r0, lsl #29
-	bcc	.L_divide_b29
-	cmp	r1, r0, lsl #30
-	bcc	.L_divide_b30
-.L_divide_b32:
-	cmp	r1, r0, lsl #31
-	subhs	r1, r1,r0, lsl #31
-	addhs	r3, r3,r2, lsl #31
-.L_divide_b31:
-	cmp	r1, r0, lsl #30
-	subhs	r1, r1,r0, lsl #30
-	addhs	r3, r3,r2, lsl #30
-.L_divide_b30:
-	cmp	r1, r0, lsl #29
-	subhs	r1, r1,r0, lsl #29
-	addhs	r3, r3,r2, lsl #29
-.L_divide_b29:
-	cmp	r1, r0, lsl #28
-	subhs	r1, r1,r0, lsl #28
-	addhs	r3, r3,r2, lsl #28
-.L_divide_b28:
-	cmp	r1, r0, lsl #27
-	subhs	r1, r1,r0, lsl #27
-	addhs	r3, r3,r2, lsl #27
-.L_divide_b27:
-	cmp	r1, r0, lsl #26
-	subhs	r1, r1,r0, lsl #26
-	addhs	r3, r3,r2, lsl #26
-.L_divide_b26:
-	cmp	r1, r0, lsl #25
-	subhs	r1, r1,r0, lsl #25
-	addhs	r3, r3,r2, lsl #25
-.L_divide_b25:
-	cmp	r1, r0, lsl #24
-	subhs	r1, r1,r0, lsl #24
-	addhs	r3, r3,r2, lsl #24
-.L_divide_b24:
-	cmp	r1, r0, lsl #23
-	subhs	r1, r1,r0, lsl #23
-	addhs	r3, r3,r2, lsl #23
-.L_divide_b23:
-	cmp	r1, r0, lsl #22
-	subhs	r1, r1,r0, lsl #22
-	addhs	r3, r3,r2, lsl #22
-.L_divide_b22:
-	cmp	r1, r0, lsl #21
-	subhs	r1, r1,r0, lsl #21
-	addhs	r3, r3,r2, lsl #21
-.L_divide_b21:
-	cmp	r1, r0, lsl #20
-	subhs	r1, r1,r0, lsl #20
-	addhs	r3, r3,r2, lsl #20
-.L_divide_b20:
-	cmp	r1, r0, lsl #19
-	subhs	r1, r1,r0, lsl #19
-	addhs	r3, r3,r2, lsl #19
-.L_divide_b19:
-	cmp	r1, r0, lsl #18
-	subhs	r1, r1,r0, lsl #18
-	addhs	r3, r3,r2, lsl #18
-.L_divide_b18:
-	cmp	r1, r0, lsl #17
-	subhs	r1, r1,r0, lsl #17
-	addhs	r3, r3,r2, lsl #17
-.L_divide_b17:
-	cmp	r1, r0, lsl #16
-	subhs	r1, r1,r0, lsl #16
-	addhs	r3, r3,r2, lsl #16
-.L_divide_b16:
-	cmp	r1, r0, lsl #15
-	subhs	r1, r1,r0, lsl #15
-	addhs	r3, r3,r2, lsl #15
-.L_divide_b15:
-	cmp	r1, r0, lsl #14
-	subhs	r1, r1,r0, lsl #14
-	addhs	r3, r3,r2, lsl #14
-.L_divide_b14:
-	cmp	r1, r0, lsl #13
-	subhs	r1, r1,r0, lsl #13
-	addhs	r3, r3,r2, lsl #13
-.L_divide_b13:
-	cmp	r1, r0, lsl #12
-	subhs	r1, r1,r0, lsl #12
-	addhs	r3, r3,r2, lsl #12
-.L_divide_b12:
-	cmp	r1, r0, lsl #11
-	subhs	r1, r1,r0, lsl #11
-	addhs	r3, r3,r2, lsl #11
-.L_divide_b11:
-	cmp	r1, r0, lsl #10
-	subhs	r1, r1,r0, lsl #10
-	addhs	r3, r3,r2, lsl #10
-.L_divide_b10:
-	cmp	r1, r0, lsl #9
-	subhs	r1, r1,r0, lsl #9
-	addhs	r3, r3,r2, lsl #9
-.L_divide_b9:
-	cmp	r1, r0, lsl #8
-	subhs	r1, r1,r0, lsl #8
-	addhs	r3, r3,r2, lsl #8
-.L_divide_b8:
-	cmp	r1, r0, lsl #7
-	subhs	r1, r1,r0, lsl #7
-	addhs	r3, r3,r2, lsl #7
-.L_divide_b7:
-	cmp	r1, r0, lsl #6
-	subhs	r1, r1,r0, lsl #6
-	addhs	r3, r3,r2, lsl #6
-.L_divide_b6:
-	cmp	r1, r0, lsl #5
-	subhs	r1, r1,r0, lsl #5
-	addhs	r3, r3,r2, lsl #5
-.L_divide_b5:
-	cmp	r1, r0, lsl #4
-	subhs	r1, r1,r0, lsl #4
-	addhs	r3, r3,r2, lsl #4
-.L_divide_b4:
-	cmp	r1, r0, lsl #3
-	subhs	r1, r1,r0, lsl #3
-	addhs	r3, r3,r2, lsl #3
-.L_divide_b3:
-	cmp	r1, r0, lsl #2
-	subhs	r1, r1,r0, lsl #2
-	addhs	r3, r3,r2, lsl #2
-.L_divide_b2:
-	cmp	r1, r0, lsl #1
-	subhs	r1, r1,r0, lsl #1
-	addhs	r3, r3,r2, lsl #1
-.L_divide_b1:
-	cmp	r1, r0
-	subhs	r1, r1, r0
-	addhs	r3, r3, r2
-.L_divide_b0:
-
-	tst	ip, #0x20000000
-	bne	.L_udivide_l1
-	mov	r0, r3
-	cmp	ip, #0
-	rsbmi	r1, r1, #0
-	movs	ip, ip, lsl #1
-	bicmi	r0, r0, #0x80000000	/* Fix incase we divided 0x80000000 */
-	rsbmi	r0, r0, #0
-	RET
-
-.L_udivide_l1:
-	tst	ip, #0x10000000
-	mov	r1, r1, lsl #1
-	orrne	r1, r1, #1
-	mov	r3, r3, lsl #1
-	cmp	r1, r0
-	subhs	r1, r1, r0
-	addhs	r3, r3, r2
-	mov	r0, r3
-	RET
-END(__divsi3)
diff --git a/lib/libc_bsd/arm/gen/fabs.c b/lib/libc_bsd/arm/gen/fabs.c
deleted file mode 100644
index 5726561..0000000
--- a/lib/libc_bsd/arm/gen/fabs.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: fabs.c,v 1.2 2002/05/26 11:48:01 wiz Exp $	*/
-
-/*
- * Copyright (c) 1996 Mark Brinicombe
- *
- * 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 Mark Brinicombe
- * 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 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.
- */
-
-/*
- * fabs(x) returns the absolute value of x.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/fabs.c 129202 2004-05-14 12:04:31Z cognet $");
-
-double
-fabs(double x)
-{
-	if (x < 0)
-		x = -x;
-	return(x);
-}
diff --git a/lib/libc_bsd/arm/gen/flt_rounds.c b/lib/libc_bsd/arm/gen/flt_rounds.c
deleted file mode 100644
index 32ebe0b..0000000
--- a/lib/libc_bsd/arm/gen/flt_rounds.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 2012 Ian Lepore <freebsd@damnhippie.dyndns.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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/flt_rounds.c 266337 2014-05-17 18:53:36Z ian $");
-
-#include <fenv.h>
-#include <float.h>
-
-#ifndef __ARM_PCS_VFP
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-#endif
-
-int
-__flt_rounds(void)
-{
-	int mode;
-
-#ifndef __ARM_PCS_VFP
-	/*
-	 * Translate our rounding modes to the unnamed
-	 * manifest constants required by C99 et. al.
-	 */
-	mode = __softfloat_float_rounding_mode;
-#else /* __ARM_PCS_VFP */
-	/*
-	 * Read the floating-point status and control register
-	 */
-	__asm __volatile("vmrs %0, fpscr" : "=&r"(mode));
-	mode &= _ROUND_MASK;
-#endif /* __ARM_PCS_VFP */
-
-	switch (mode) {
-	case FE_TOWARDZERO:
-		return (0);
-	case FE_TONEAREST:
-		return (1);
-	case FE_UPWARD:
-		return (2);
-	case FE_DOWNWARD:
-		return (3);
-	}
-	return (-1);
-}
diff --git a/lib/libc_bsd/arm/gen/fpgetmask_vfp.c b/lib/libc_bsd/arm/gen/fpgetmask_vfp.c
deleted file mode 100644
index ee18f5c..0000000
--- a/lib/libc_bsd/arm/gen/fpgetmask_vfp.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/fpgetmask_vfp.c 266370 2014-05-17 22:19:16Z ian $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-#define FP_X_MASK	(FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP)
-
-fp_except_t
-fpgetmask(void)
-{
-	fp_except mask;
-
-	__asm __volatile("vmrs %0, fpscr" : "=&r"(mask));
-
-	return ((mask >> 8) & FP_X_MASK);
-}
-
diff --git a/lib/libc_bsd/arm/gen/fpgetround_vfp.c b/lib/libc_bsd/arm/gen/fpgetround_vfp.c
deleted file mode 100644
index 53b53a1..0000000
--- a/lib/libc_bsd/arm/gen/fpgetround_vfp.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/fpgetround_vfp.c 266370 2014-05-17 22:19:16Z ian $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd_t
-fpgetround(void)
-{
-	uint32_t fpscr;
-
-	__asm __volatile("vmrs %0, fpscr" : "=&r"(fpscr));
-
-	return ((fpscr >> 22) & 3);
-}
-
diff --git a/lib/libc_bsd/arm/gen/fpgetsticky_vfp.c b/lib/libc_bsd/arm/gen/fpgetsticky_vfp.c
deleted file mode 100644
index 53f949f..0000000
--- a/lib/libc_bsd/arm/gen/fpgetsticky_vfp.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/fpgetsticky_vfp.c 266370 2014-05-17 22:19:16Z ian $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-#define FP_X_MASK	(FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP)
-
-fp_except
-fpgetsticky(void)
-{
-	fp_except old;
-
-	__asm __volatile("vmrs %0, fpscr" : "=&r"(old));
-
-	return (old & FP_X_MASK);
-}
-
diff --git a/lib/libc_bsd/arm/gen/fpsetmask_vfp.c b/lib/libc_bsd/arm/gen/fpsetmask_vfp.c
deleted file mode 100644
index d3c31ce..0000000
--- a/lib/libc_bsd/arm/gen/fpsetmask_vfp.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/fpsetmask_vfp.c 266377 2014-05-17 23:20:29Z ian $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-#define FP_X_MASK	(FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP)
-
-fp_except_t
-fpsetmask(fp_except_t mask)
-{
-	fp_except old, new;
-
-	__asm __volatile("vmrs %0, fpscr" : "=&r"(old));
-	mask = (mask & FP_X_MASK) << 8;
-	new = (old & ~(FP_X_MASK << 8)) | mask;
-	__asm __volatile("vmsr fpscr, %0" : : "r"(new));
-
-	return ((old >> 8) & FP_X_MASK);
-}
-
diff --git a/lib/libc_bsd/arm/gen/fpsetround_vfp.c b/lib/libc_bsd/arm/gen/fpsetround_vfp.c
deleted file mode 100644
index 5dd0779..0000000
--- a/lib/libc_bsd/arm/gen/fpsetround_vfp.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/fpsetround_vfp.c 266370 2014-05-17 22:19:16Z ian $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd_t
-fpsetround(fp_rnd_t rnd_dir)
-{
-	uint32_t old, new;
-
-	__asm __volatile("vmrs %0, fpscr" : "=&r"(old));
-	new = old & ~(3 << 22);
-	new |= rnd_dir << 22;
-	__asm __volatile("vmsr fpscr, %0" : : "r"(new));
-
-	return ((old >> 22) & 3);
-}
-
diff --git a/lib/libc_bsd/arm/gen/fpsetsticky_vfp.c b/lib/libc_bsd/arm/gen/fpsetsticky_vfp.c
deleted file mode 100644
index d7d349c..0000000
--- a/lib/libc_bsd/arm/gen/fpsetsticky_vfp.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2014 Andrew Turner
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/fpsetsticky_vfp.c 266370 2014-05-17 22:19:16Z ian $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-#define FP_X_MASK	(FP_X_INV | FP_X_DZ | FP_X_OFL | FP_X_UFL | FP_X_IMP)
-
-fp_except
-fpsetsticky(fp_except except)
-{
-	fp_except old, new;
-
-	__asm __volatile("vmrs %0, fpscr" : "=&r"(old));
-	new = old & ~(FP_X_MASK);
-	new &= ~except;
-	__asm __volatile("vmsr fpscr, %0" : : "r"(new));
-
-	return (old & except);
-}
-
diff --git a/lib/libc_bsd/arm/gen/getcontextx.c b/lib/libc_bsd/arm/gen/getcontextx.c
deleted file mode 100644
index f4c9d2a..0000000
--- a/lib/libc_bsd/arm/gen/getcontextx.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/getcontextx.c 251047 2013-05-28 04:54:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stdlib.h>
-
-int
-__getcontextx_size(void)
-{
-
-	return (sizeof(ucontext_t));
-}
-
-int
-__fillcontextx2(char *ctx)
-{
-
-	return (0);
-}
-
-int
-__fillcontextx(char *ctx)
-{
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	return (getcontext(ucp));
-}
-
-__weak_reference(__getcontextx, getcontextx);
-
-ucontext_t *
-__getcontextx(void)
-{
-	char *ctx;
-	int error;
-
-	ctx = malloc(__getcontextx_size());
-	if (ctx == NULL)
-		return (NULL);
-	if (__fillcontextx(ctx) == -1) {
-		error = errno;
-		free(ctx);
-		errno = error;
-		return (NULL);
-	}
-	return ((ucontext_t *)ctx);
-}
diff --git a/lib/libc_bsd/arm/gen/infinity.c b/lib/libc_bsd/arm/gen/infinity.c
deleted file mode 100644
index 8d0a33d..0000000
--- a/lib/libc_bsd/arm/gen/infinity.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * infinity.c
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/infinity.c 129202 2004-05-14 12:04:31Z cognet $");
-
-#include <math.h>
-
-/* bytes for +Infinity on a 387 */
-const union __infinity_un __infinity = { 
-#if BYTE_ORDER == BIG_ENDIAN
-	{ 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
-#else
-	{ 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }
-#endif
-};
-
-/* bytes for NaN */
-const union __nan_un __nan = {
-#if BYTE_ORDER == BIG_ENDIAN
-	{0xff, 0xc0, 0, 0}
-#else
-	{ 0, 0, 0xc0, 0xff }
-#endif
-};
diff --git a/lib/libc_bsd/arm/gen/makecontext.c b/lib/libc_bsd/arm/gen/makecontext.c
deleted file mode 100644
index 9065252..0000000
--- a/lib/libc_bsd/arm/gen/makecontext.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.2 2003/01/18 11:06:24 thorpej Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/makecontext.c 204607 2010-03-02 22:16:40Z joel $");
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <inttypes.h>
-#include <ucontext.h>
-
-#include <stdarg.h>
-
-extern void _ctx_start(void);
-
-void
-ctx_done(ucontext_t *ucp)
-{       
-	        
-	if (ucp->uc_link == NULL)
-		exit(0);
-	else {  
-		setcontext((const ucontext_t *)ucp->uc_link);
-		abort();
-	}                                                      
-}   
-
-__weak_reference(__makecontext, makecontext);
-
-void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	int i;
-	unsigned int *sp;
-	va_list ap;
-
-	/* Compute and align stack pointer. */
-	sp = (unsigned int *)
-	    (((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size -
-	      sizeof(double)) & ~7);
-	/* Allocate necessary stack space for arguments exceeding r0-3. */
-	if (argc > 4)
-		sp -= argc - 4;
-	gr[_REG_SP] = (__greg_t)sp;
-	/* Wipe out frame pointer. */
-	gr[_REG_FP] = 0;
-	/* Arrange for return via the trampoline code. */
-	gr[_REG_PC] = (__greg_t)_ctx_start;
-	gr[_REG_R4] = (__greg_t)func;
-	gr[_REG_R5] = (__greg_t)ucp;
-
-	va_start(ap, argc);
-	/* Pass up to four arguments in r0-3. */
-	for (i = 0; i < argc && i < 4; i++)
-		gr[_REG_R0 + i] = va_arg(ap, int);
-	/* Pass any additional arguments on the stack. */
-	for (argc -= i; argc > 0; argc--)
-		*sp++ = va_arg(ap, int);
-	va_end(ap);
-}
diff --git a/lib/libc_bsd/arm/gen/setjmp.S b/lib/libc_bsd/arm/gen/setjmp.S
deleted file mode 100644
index 3b3ba4c..0000000
--- a/lib/libc_bsd/arm/gen/setjmp.S
+++ /dev/null
@@ -1,153 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.14 2013/04/19 13:45:45 matt Exp $	*/
-
-/*
- * Copyright (c) 1997 Mark Brinicombe
- * 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 Mark Brinicombe
- * 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 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.
- */
-
-#if !defined(__SOFTFP__) && !defined(__VFP_FP__) && !defined(__ARM_PCS)
-#error FPA is not supported anymore
-#endif
-
-#ifdef __ARM_EABI__
-	.fpu	vfp
-#endif
-
-#include <machine/asm.h>
-#include <machine/setjmp.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/setjmp.S 271337 2014-09-09 22:24:01Z ian $");
-
-/*
- * C library -- setjmp, longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(setjmp)
-	/* Block all signals and retrieve the old signal mask */
-	stmfd	sp!, {r0, r14}
-	add	r2, r0, #(_JB_SIGMASK * 4)	/* oset */
-	mov	r1, #0x00000000			/* set */
-	mov	r0, #0x00000001			/* SIG_BLOCK */
-	bl	PIC_SYM(_C_LABEL(sigprocmask), PLT)
-	ldmfd	sp!, {r0, r14}
-
-	ldr	r1, .Lsetjmp_magic
-
-#ifdef __ARM_EABI__
-	ldr	r2, .Lfpu_present
-#ifdef PIC
-	GOT_INIT(r3, .Lsetjmp_got, .Lsetjmp_gotinit)
-	ldr	r2, [r2, r3]
-#else
-	ldr	r2, [r2]
-#endif
-	teq	r2, #0		/* do we have a FPU? */
-	beq	1f		/*   no, don't save VFP registers */
-
-	orr	r1, r1, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-				/* change magic to VFP magic */
-	add	r2, r0, #(_JB_REG_D8 * 4)
-	vstmia	r2, {d8-d15}
-	vmrs	r2, fpscr
-	str	r2, [r0, #(_JB_REG_FPSCR * 4)]
-1:
-#endif /* __ARM_EABI__ */
-
-	str	r1, [r0]		/* store magic */
-
-	/* Store integer registers */
-	add	r0, r0, #(_JB_REG_R4 * 4)
-        stmia	r0, {r4-r14}
-        mov	r0, #0x00000000
-	RET
-
-.Lsetjmp_magic:
-	.word	_JB_MAGIC_SETJMP
-#ifdef __ARM_EABI__
-	GOT_INITSYM(.Lsetjmp_got, .Lsetjmp_gotinit)
-.Lfpu_present:
-	.word	PIC_SYM(_libc_arm_fpu_present, GOTOFF)
-#endif /* __ARM_EABI__ */
-END(setjmp)
-
-.weak _C_LABEL(longjmp)
-.set _C_LABEL(longjmp), _C_LABEL(__longjmp)
-ENTRY(__longjmp)
-	ldr	r2, [r0]
-	ldr	ip, .Lsetjmp_magic
-	bic	r3, r2, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-	teq	r3, ip
-	bne	.Lbotch
-
-	/* Restore the signal mask. */
-	stmfd	sp!, {r0-r2, r14}
-	mov	r2, #0x00000000
-	add	r1, r0, #(_JB_SIGMASK * 4)	/* Signal mask */
-	mov	r0, #3				/* SIG_SETMASK */
-	bl	PIC_SYM(_C_LABEL(sigprocmask), PLT)
-	ldmfd	sp!, {r0-r2, r14}
-
-#ifdef __ARM_EABI__
-	tst	r2, #(_JB_MAGIC_SETJMP ^ _JB_MAGIC_SETJMP_VFP)
-						/* is this a VFP magic? */
-	beq	1f				/*   no, don't restore VFP */
-	add	ip, r0, #(_JB_REG_D8 * 4)
-	vldmia	ip, {d8-d15}
-	ldr	ip, [r0, #(_JB_REG_FPSCR * 4)]
-	vmsr	fpscr, ip
-1:
-#endif /* __ARM_EABI__ */
-
-	add	r0, r0, #(_JB_REG_R4 * 4)
-	/* Restore integer registers */
-        ldmia	r0, {r4-r14}
-
-	/* Validate sp and r14 */
-	teq	sp, #0
-	teqne	r14, #0
-	beq	.Lbotch
-
-	/* Set return value */
-	movs	r0, r1
-	moveq	r0, #0x00000001
-	RET
-
-	/* validation failed, die die die. */
-.Lbotch:
-	bl	PIC_SYM(_C_LABEL(longjmperror), PLT)
-	bl	PIC_SYM(_C_LABEL(abort), PLT)
-	b	. - 8		/* Cannot get here */
-END(__longjmp)
diff --git a/lib/libc_bsd/arm/gen/signalcontext.c b/lib/libc_bsd/arm/gen/signalcontext.c
deleted file mode 100644
index 4b0ef82..0000000
--- a/lib/libc_bsd/arm/gen/signalcontext.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 2004 Olivier Houchard
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/signalcontext.c 137286 2004-11-05 23:53:02Z cognet $");
-
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/ucontext.h>
-
-#include <machine/frame.h>
-#include <machine/sigframe.h>
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <strings.h>
-#include <signal.h>
-
-__weak_reference(__signalcontext, signalcontext);
-
-extern void _ctx_start(void);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	struct sigframe *sfp;
-	__greg_t *gr = ucp->uc_mcontext.__gregs;
-	unsigned int *sp;
-
-	sp = (unsigned int *)gr[_REG_SP];
-
-	sfp = (struct sigframe *)sp - 1;
-	
-	bzero(sfp, sizeof(*sfp));
-	bcopy(ucp, &sfp->sf_uc, sizeof(*ucp));
-	sfp->sf_si.si_signo = sig;
-
-	gr[_REG_SP] = (__greg_t)sfp;
-	/* Wipe out frame pointer. */
-	gr[_REG_FP] = 0;
-	/* Arrange for return via the trampoline code. */
-	gr[_REG_PC] = (__greg_t)_ctx_start;
-	gr[_REG_R4] = (__greg_t)func;
-	gr[_REG_R5] = (__greg_t)ucp;
-	gr[_REG_R0] = (__greg_t)sig;
-	gr[_REG_R1] = (__greg_t)&sfp->sf_si;
-	gr[_REG_R2] = (__greg_t)&sfp->sf_uc;
-
-	ucp->uc_link = &sfp->sf_uc;
-	sigdelset(&ucp->uc_sigmask, sig);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/arm/gen/sigsetjmp.S b/lib/libc_bsd/arm/gen/sigsetjmp.S
deleted file mode 100644
index 61e0858..0000000
--- a/lib/libc_bsd/arm/gen/sigsetjmp.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.6 2013/04/19 16:50:22 matt Exp $	*/
-
-/*
- * Copyright (c) 1997 Mark Brinicombe
- * 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 Mark Brinicombe
- * 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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/gen/sigsetjmp.S 271337 2014-09-09 22:24:01Z ian $");
-
-#include <machine/setjmp.h>
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	setjmp(a, m)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- */
-
-ENTRY(sigsetjmp)
-	teq	r1, #0
-	beq	PIC_SYM(_C_LABEL(_setjmp), PLT)
-	b	PIC_SYM(_C_LABEL(setjmp), PLT)
-END(sigsetjmp)
-
-.L_setjmp_magic:
-	.word	_JB_MAGIC__SETJMP
-WEAK_ALIAS(__siglongjmp, siglongjmp)
-
-ENTRY(siglongjmp)
-	ldr	r2, .L_setjmp_magic		/* load magic */
-	ldr	r3, [r0]			/* get magic from jmp_buf */
-	bic	r3, r3, #(_JB_MAGIC__SETJMP ^ _JB_MAGIC__SETJMP_VFP)
-						/* ignore VFP-ness of magic */
-	teq	r2, r3				/* magic correct? */
-	beq	PIC_SYM(_C_LABEL(_longjmp), PLT)
-	b	PIC_SYM(_C_LABEL(longjmp), PLT)
-END(siglongjmp)
diff --git a/lib/libc_bsd/arm/softfloat/arm-gcc.h b/lib/libc_bsd/arm/softfloat/arm-gcc.h
deleted file mode 100644
index 2ad038b..0000000
--- a/lib/libc_bsd/arm/softfloat/arm-gcc.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/arm/softfloat/arm-gcc.h 255361 2013-09-07 14:04:10Z andrew $ */
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#ifdef __ARMEB__
-#define BIGENDIAN
-#else
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef int uint8;
-typedef int int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static __inline
-
-/*
--------------------------------------------------------------------------------
-The ARM FPA is odd in that it stores doubles high-order word first, no matter
-what the endianness of the CPU.  VFP is sane.
--------------------------------------------------------------------------------
-*/
-#if defined(SOFTFLOAT_FOR_GCC)
-#if defined (__ARM_EABI__) || defined(__VFP_FP__) || defined(__ARMEB__)
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
-#else
-#define FLOAT64_DEMANGLE(a)	((((a) & 0xfffffffful) << 32) | ((a) >> 32))
-#define FLOAT64_MANGLE(a)	FLOAT64_DEMANGLE(a)
-#endif
-#endif
diff --git a/lib/libc_bsd/arm/softfloat/milieu.h b/lib/libc_bsd/arm/softfloat/milieu.h
deleted file mode 100644
index 63db4d9..0000000
--- a/lib/libc_bsd/arm/softfloat/milieu.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/arm/softfloat/milieu.h 129202 2004-05-14 12:04:31Z cognet $ */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "arm-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc_bsd/arm/softfloat/softfloat.h b/lib/libc_bsd/arm/softfloat/softfloat.h
deleted file mode 100644
index 601a077..0000000
--- a/lib/libc_bsd/arm/softfloat/softfloat.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $	*/
-/* $FreeBSD: releng/10.2/lib/libc/arm/softfloat/softfloat.h 230189 2012-01-16 04:05:53Z das $ */
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-/* #define FLOAT128 */
-
-#include <fenv.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern int float_rounding_mode;
-enum {
-    float_round_nearest_even = FE_TONEAREST,
-    float_round_to_zero      = FE_TOWARDZERO,
-    float_round_down         = FE_DOWNWARD,
-    float_round_up           = FE_UPWARD
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern int float_exception_flags;
-extern int float_exception_mask;
-enum {
-    float_flag_inexact   = FE_INEXACT,
-    float_flag_underflow = FE_UNDERFLOW,
-    float_flag_overflow  = FE_OVERFLOW,
-    float_flag_divbyzero = FE_DIVBYZERO,
-    float_flag_invalid   = FE_INVALID
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( int );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int );
-float64 int32_to_float64( int );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __floatdi?f is in libgcc2.c */
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float32_to_uint32_round_to_zero( float32 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-#endif
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-int float32_eq( float32, float32 );
-int float32_le( float32, float32 );
-int float32_lt( float32, float32 );
-int float32_eq_signaling( float32, float32 );
-int float32_le_quiet( float32, float32 );
-int float32_lt_quiet( float32, float32 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float64_to_uint32_round_to_zero( float64 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-#endif
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-int float64_eq( float64, float64 );
-int float64_le( float64, float64 );
-int float64_lt( float64, float64 );
-int float64_eq_signaling( float64, float64 );
-int float64_le_quiet( float64, float64 );
-int float64_lt_quiet( float64, float64 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float64_is_signaling_nan( float64 );
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-int floatx80_eq( floatx80, floatx80 );
-int floatx80_le( floatx80, floatx80 );
-int floatx80_lt( floatx80, floatx80 );
-int floatx80_eq_signaling( floatx80, floatx80 );
-int floatx80_le_quiet( floatx80, floatx80 );
-int floatx80_lt_quiet( floatx80, floatx80 );
-int floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-int float128_eq( float128, float128 );
-int float128_le( float128, float128 );
-int float128_lt( float128, float128 );
-int float128_eq_signaling( float128, float128 );
-int float128_le_quiet( float128, float128 );
-int float128_lt_quiet( float128, float128 );
-int float128_is_signaling_nan( float128 );
-
-#endif
-
diff --git a/lib/libc_bsd/arm/string/Makefile.inc b/lib/libc_bsd/arm/string/Makefile.inc
deleted file mode 100644
index 15b9d2c..0000000
--- a/lib/libc_bsd/arm/string/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 229368 2012-01-03 07:14:01Z ed $
-
-MDSRCS+=bcmp.c bcopy.S bzero.S ffs.S memchr.c memcmp.S memcpy.S \
-	memmove.S memset.S strcat.c strchr.c strcmp.S strcpy.c strlen.S \
-	strncmp.S strrchr.c swab.c wcschr.c wcscmp.c wcslen.c wmemchr.c
diff --git a/lib/libc_bsd/arm/string/bcopy.S b/lib/libc_bsd/arm/string/bcopy.S
deleted file mode 100644
index 6e2cd2b..0000000
--- a/lib/libc_bsd/arm/string/bcopy.S
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$NetBSD: bcopy.S,v 1.3 2003/10/14 07:51:45 scw Exp $	*/
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/bcopy.S 129202 2004-05-14 12:04:31Z cognet $");
-#define _BCOPY
-#include "memmove.S"
diff --git a/lib/libc_bsd/arm/string/bzero.S b/lib/libc_bsd/arm/string/bzero.S
deleted file mode 100644
index 318ef62..0000000
--- a/lib/libc_bsd/arm/string/bzero.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.3 2003/10/14 07:51:45 scw Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and Mark Brinicombe
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/bzero.S 204607 2010-03-02 22:16:40Z joel $");
-
-#define _BZERO
-#include "memset.S"
diff --git a/lib/libc_bsd/arm/string/ffs.S b/lib/libc_bsd/arm/string/ffs.S
deleted file mode 100644
index 9b9da48..0000000
--- a/lib/libc_bsd/arm/string/ffs.S
+++ /dev/null
@@ -1,85 +0,0 @@
-/*	$NetBSD: ffs.S,v 1.5 2003/04/05 23:08:52 bjh21 Exp $	*/
-/*
- * Copyright (c) 2001 Christopher Gilbert
- * 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 company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- */
-
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/ffs.S 275767 2014-12-14 16:28:53Z andrew $");
-
-.syntax unified
-
-/*
- * ffs - find first set bit, this algorithm isolates the first set
- * bit, then multiplies the number by 0x0450fbaf which leaves the top
- * 6 bits as an index into the table.  This algorithm should be a win
- * over the checking each bit in turn as per the C compiled version.
- *
- * under ARMv5 there's an instruction called CLZ (count leading Zero's) that
- * could be used
- *
- * This is the ffs algorithm devised by d.seal and posted to comp.sys.arm on
- * 16 Feb 1994.
- */
-
-ENTRY(ffs)
-	/* Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry */
- 	rsb     r1, r0, #0
- 	ands    r0, r0, r1
-#ifndef _ARM_ARCH_5
-	/*
-	 * now r0 has at most one set bit, call this X
-	 * if X = 0, all further instructions are skipped
-	 */
-	adrne   r2, .L_ffs_table
-	orrne   r0, r0, r0, lsl #4  /* r0 = X * 0x11 */ 
-	orrne   r0, r0, r0, lsl #6  /* r0 = X * 0x451 */
-	rsbne   r0, r0, r0, lsl #16 /* r0 = X * 0x0450fbaf */
-              
-	/* now lookup in table indexed on top 6 bits of r0 */
-	ldrbne  r0, [ r2, r0, lsr #26 ]
-
-        RET
-.text;
-.type .L_ffs_table, _ASM_TYPE_OBJECT;
-.L_ffs_table:
-/*               0   1   2   3   4   5   6   7           */
-	.byte	 0,  1,  2, 13,  3,  7,  0, 14  /*  0- 7 */
-	.byte	 4,  0,  8,  0,  0,  0,  0, 15  /*  8-15 */
-	.byte	11,  5,  0,  0,  9,  0,  0, 26  /* 16-23 */
-	.byte	 0,  0,  0,  0,  0, 22, 28, 16  /* 24-31 */
-	.byte	32, 12,  6,  0,  0,  0,  0,  0	/* 32-39 */
-	.byte	10,  0,  0, 25,  0,  0, 21, 27  /* 40-47 */
-	.byte	31,  0,  0,  0,  0, 24,  0, 20  /* 48-55 */
-	.byte   30,  0, 23, 19, 29, 18, 17,  0  /* 56-63 */
-#else
-	clzne	r0, r0
-	rsbne	r0, r0, #32
-	RET
-#endif
-END(ffs)
diff --git a/lib/libc_bsd/arm/string/memcmp.S b/lib/libc_bsd/arm/string/memcmp.S
deleted file mode 100644
index 420390c..0000000
--- a/lib/libc_bsd/arm/string/memcmp.S
+++ /dev/null
@@ -1,183 +0,0 @@
-/*      $NetBSD: memcmp.S,v 1.3 2003/10/14 07:51:45 scw Exp $ */
-
-/*
- * Copyright 2003 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Steve C. Woodford for Wasabi Systems, Inc.
- *
- * 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 for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
- * 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.
- */
-/*
- * Copyright (c) 2002 ARM Ltd
- * 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 company may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY ARM LTD ``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 ARM LTD 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.
- */
-
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/memcmp.S 275767 2014-12-14 16:28:53Z andrew $");
-
-.syntax	unified
-
-ENTRY(memcmp)
-	mov	ip, r0
-#if defined(_KERNEL) && !defined(_STANDALONE)
-	cmp	r2, #0x06
-	beq	.Lmemcmp_6bytes
-#endif
-	mov	r0, #0x00
-
-	/* Are both addresses aligned the same way? */
-	cmp	r2, #0x00
-	eorsne	r3, ip, r1
-	RETeq			/* len == 0, or same addresses! */
-	tst	r3, #0x03
-	subne	r2, r2, #0x01
-	bne	.Lmemcmp_bytewise2	/* Badly aligned. Do it the slow way */
-
-	/* Word-align the addresses, if necessary */
-	sub	r3, r1, #0x05
-	ands	r3, r3, #0x03
-	add	r3, r3, r3, lsl #1
-	addne	pc, pc, r3, lsl #3
-	nop
-
-	/* Compare up to 3 bytes */
-	ldrb	r0, [ip], #0x01
-	ldrb	r3, [r1], #0x01
-	subs	r0, r0, r3
-	RETne
-	subs	r2, r2, #0x01
-	RETeq
-
-	/* Compare up to 2 bytes */
-	ldrb	r0, [ip], #0x01
-	ldrb	r3, [r1], #0x01
-	subs	r0, r0, r3
-	RETne
-	subs	r2, r2, #0x01
-	RETeq
-
-	/* Compare 1 byte */
-	ldrb	r0, [ip], #0x01
-	ldrb	r3, [r1], #0x01
-	subs	r0, r0, r3
-	RETne
-	subs	r2, r2, #0x01
-	RETeq
-
-	/* Compare 4 bytes at a time, if possible */
-	subs	r2, r2, #0x04
-	bcc	.Lmemcmp_bytewise
-.Lmemcmp_word_aligned:
-	ldr	r0, [ip], #0x04
-	ldr	r3, [r1], #0x04
-	subs	r2, r2, #0x04
-	cmpcs	r0, r3
-	beq	.Lmemcmp_word_aligned
-	sub	r0, r0, r3
-
-	/* Correct for extra subtraction, and check if done */
-	adds	r2, r2, #0x04
-	cmpeq	r0, #0x00		/* If done, did all bytes match? */
-	RETeq			/* Yup. Just return */
-
-	/* Re-do the final word byte-wise */
-	sub	ip, ip, #0x04
-	sub	r1, r1, #0x04
-
-.Lmemcmp_bytewise:
-	add	r2, r2, #0x03
-.Lmemcmp_bytewise2:
-	ldrb	r0, [ip], #0x01
-	ldrb	r3, [r1], #0x01
-	subs	r2, r2, #0x01
-	cmpcs	r0, r3
-	beq	.Lmemcmp_bytewise2
-	sub	r0, r0, r3
-	RET
-
-#if defined(_KERNEL) && !defined(_STANDALONE)
-	/*
-	 * 6 byte compares are very common, thanks to the network stack.
-	 * This code is hand-scheduled to reduce the number of stalls for
-	 * load results. Everything else being equal, this will be ~32%
-	 * faster than a byte-wise memcmp.
-	 */
-	.align	5
-.Lmemcmp_6bytes:
-	ldrb	r3, [r1, #0x00]		/* r3 = b2#0 */
-	ldrb	r0, [ip, #0x00]		/* r0 = b1#0 */
-	ldrb	r2, [r1, #0x01]		/* r2 = b2#1 */
-	subs	r0, r0, r3		/* r0 = b1#0 - b2#0 */
-	ldreqb	r3, [ip, #0x01]		/* r3 = b1#1 */
-	RETne			/* Return if mismatch on #0 */
-	subs	r0, r3, r2		/* r0 = b1#1 - b2#1 */
-	ldreqb	r3, [r1, #0x02]		/* r3 = b2#2 */
-	ldreqb	r0, [ip, #0x02]		/* r0 = b1#2 */
-	RETne			/* Return if mismatch on #1 */
-	ldrb	r2, [r1, #0x03]		/* r2 = b2#3 */
-	subs	r0, r0, r3		/* r0 = b1#2 - b2#2 */
-	ldreqb	r3, [ip, #0x03]		/* r3 = b1#3 */
-	RETne			/* Return if mismatch on #2 */
-	subs	r0, r3, r2		/* r0 = b1#3 - b2#3 */
-	ldreqb	r3, [r1, #0x04]		/* r3 = b2#4 */
-	ldreqb	r0, [ip, #0x04]		/* r0 = b1#4 */
-	RETne			/* Return if mismatch on #3 */
-	ldrb	r2, [r1, #0x05]		/* r2 = b2#5 */
-	subs	r0, r0, r3		/* r0 = b1#4 - b2#4 */
-	ldreqb	r3, [ip, #0x05]		/* r3 = b1#5 */
-	RETne			/* Return if mismatch on #4 */
-	sub	r0, r3, r2		/* r0 = b1#5 - b2#5 */
-	RET
-#endif
-END(memcmp)
diff --git a/lib/libc_bsd/arm/string/memcpy.S b/lib/libc_bsd/arm/string/memcpy.S
deleted file mode 100644
index a03395f..0000000
--- a/lib/libc_bsd/arm/string/memcpy.S
+++ /dev/null
@@ -1,9 +0,0 @@
-/*	$NetBSD: memcpy.S,v 1.4 2003/10/14 07:51:45 scw Exp $	*/
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/memcpy.S 172616 2007-10-13 12:06:31Z cognet $");
-#if !defined(_ARM_ARCH_5E) || defined(_STANDALONE)
-#include "memcpy_arm.S"
-#else
-#include "memcpy_xscale.S"
-#endif
diff --git a/lib/libc_bsd/arm/string/memcpy_arm.S b/lib/libc_bsd/arm/string/memcpy_arm.S
deleted file mode 100644
index 90e04d8..0000000
--- a/lib/libc_bsd/arm/string/memcpy_arm.S
+++ /dev/null
@@ -1,336 +0,0 @@
-/*	$NetBSD: memcpy_arm.S,v 1.1 2003/10/14 07:51:45 scw Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and Mark Brinicombe
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/memcpy_arm.S 275767 2014-12-14 16:28:53Z andrew $");
-
-.syntax	unified
-
-/*
- * This is one fun bit of code ...
- * Some easy listening music is suggested while trying to understand this
- * code e.g. Iron Maiden
- *
- * For anyone attempting to understand it :
- *
- * The core code is implemented here with simple stubs for memcpy().
- *
- * All local labels are prefixed with Lmemcpy_
- * Following the prefix a label starting f is used in the forward copy code
- * while a label using b is used in the backwards copy code
- * The source and destination addresses determine whether a forward or
- * backward copy is performed.
- * Separate bits of code are used to deal with the following situations
- * for both the forward and backwards copy.
- * unaligned source address
- * unaligned destination address
- * Separate copy routines are used to produce an optimised result for each
- * of these cases.
- * The copy code will use LDM/STM instructions to copy up to 32 bytes at
- * a time where possible.
- *
- * Note: r12 (aka ip) can be trashed during the function along with
- * r0-r3 although r0-r2 have defined uses i.e. src, dest, len through out.
- * Additional registers are preserved prior to use i.e. r4, r5 & lr
- *
- * Apologies for the state of the comments ;-)
- */
-/* LINTSTUB: Func: void *memcpy(void *dst, const void *src, size_t len) */
-ENTRY(memcpy)
-	/* save leaf functions having to store this away */
-	stmdb	sp!, {r0, lr}		/* memcpy() returns dest addr */
-
-	subs	r2, r2, #4
-	blt	.Lmemcpy_l4		/* less than 4 bytes */
-	ands	r12, r0, #3
-	bne	.Lmemcpy_destul		/* oh unaligned destination addr */
-	ands	r12, r1, #3
-	bne	.Lmemcpy_srcul		/* oh unaligned source addr */
-
-.Lmemcpy_t8:
-	/* We have aligned source and destination */
-	subs	r2, r2, #8
-	blt	.Lmemcpy_l12		/* less than 12 bytes (4 from above) */
-	subs	r2, r2, #0x14         
-	blt	.Lmemcpy_l32		/* less than 32 bytes (12 from above) */
-	stmdb	sp!, {r4}		/* borrow r4 */
-
-	/* blat 32 bytes at a time */
-	/* XXX for really big copies perhaps we should use more registers */
-.Lmemcpy_loop32:	
-	ldmia	r1!, {r3, r4, r12, lr}
-	stmia	r0!, {r3, r4, r12, lr}
-	ldmia	r1!, {r3, r4, r12, lr}
-	stmia	r0!, {r3, r4, r12, lr}
-	subs	r2, r2, #0x20         
-	bge	.Lmemcpy_loop32
-
-	cmn	r2, #0x10
-	ldmiage	r1!, {r3, r4, r12, lr}	/* blat a remaining 16 bytes */
-	stmiage	r0!, {r3, r4, r12, lr}
-	subge	r2, r2, #0x10         
-	ldmia	sp!, {r4}		/* return r4 */
-
-.Lmemcpy_l32:
-	adds	r2, r2, #0x14         
-
-	/* blat 12 bytes at a time */
-.Lmemcpy_loop12:
-	ldmiage	r1!, {r3, r12, lr}
-	stmiage	r0!, {r3, r12, lr}
-	subsge	r2, r2, #0x0c         
-	bge	.Lmemcpy_loop12
-
-.Lmemcpy_l12:
-	adds	r2, r2, #8
-	blt	.Lmemcpy_l4
-
-	subs	r2, r2, #4
-	ldrlt	r3, [r1], #4
-	strlt	r3, [r0], #4
-	ldmiage	r1!, {r3, r12}
-	stmiage	r0!, {r3, r12}
-	subge	r2, r2, #4
-
-.Lmemcpy_l4:
-	/* less than 4 bytes to go */
-	adds	r2, r2, #4
-#ifdef __APCS_26_
-	ldmiaeq sp!, {r0, pc}^		/* done */
-#else
-	ldmiaeq	sp!, {r0, pc}		/* done */
-#endif
-	/* copy the crud byte at a time */
-	cmp	r2, #2
-	ldrb	r3, [r1], #1
-	strb	r3, [r0], #1
-	ldrbge	r3, [r1], #1
-	strbge	r3, [r0], #1
-	ldrbgt	r3, [r1], #1
-	strbgt	r3, [r0], #1
-	ldmia	sp!, {r0, pc}
-
-	/* erg - unaligned destination */
-.Lmemcpy_destul:
-	rsb	r12, r12, #4
-	cmp	r12, #2
-
-	/* align destination with byte copies */
-	ldrb	r3, [r1], #1
-	strb	r3, [r0], #1
-	ldrbge	r3, [r1], #1
-	strbge	r3, [r0], #1
-	ldrbgt	r3, [r1], #1
-	strbgt	r3, [r0], #1
-	subs	r2, r2, r12
-	blt	.Lmemcpy_l4		/* less the 4 bytes */
-
-	ands	r12, r1, #3
-	beq	.Lmemcpy_t8		/* we have an aligned source */
-
-	/* erg - unaligned source */
-	/* This is where it gets nasty ... */
-.Lmemcpy_srcul:
-	bic	r1, r1, #3
-	ldr	lr, [r1], #4
-	cmp	r12, #2
-	bgt	.Lmemcpy_srcul3
-	beq	.Lmemcpy_srcul2
-	cmp	r2, #0x0c            
-	blt	.Lmemcpy_srcul1loop4
-	sub	r2, r2, #0x0c         
-	stmdb	sp!, {r4, r5}
-
-.Lmemcpy_srcul1loop16:
-#ifdef __ARMEB__
-	mov	r3, lr, lsl #8
-#else
-	mov	r3, lr, lsr #8
-#endif
-	ldmia	r1!, {r4, r5, r12, lr}
-#ifdef __ARMEB__
-	orr	r3, r3, r4, lsr #24
-	mov	r4, r4, lsl #8
-	orr	r4, r4, r5, lsr #24
-	mov	r5, r5, lsl #8
-	orr	r5, r5, r12, lsr #24
-	mov	r12, r12, lsl #8
-	orr	r12, r12, lr, lsr #24
-#else
-	orr	r3, r3, r4, lsl #24
-	mov	r4, r4, lsr #8
-	orr	r4, r4, r5, lsl #24
-	mov	r5, r5, lsr #8
-	orr	r5, r5, r12, lsl #24
-	mov	r12, r12, lsr #8
-	orr	r12, r12, lr, lsl #24
-#endif
-	stmia	r0!, {r3-r5, r12}
-	subs	r2, r2, #0x10         
-	bge	.Lmemcpy_srcul1loop16
-	ldmia	sp!, {r4, r5}
-	adds	r2, r2, #0x0c         
-	blt	.Lmemcpy_srcul1l4
-
-.Lmemcpy_srcul1loop4:
-#ifdef __ARMEB__
-	mov	r12, lr, lsl #8
-#else
-	mov	r12, lr, lsr #8
-#endif
-	ldr	lr, [r1], #4
-#ifdef __ARMEB__
-	orr	r12, r12, lr, lsr #24
-#else
-	orr	r12, r12, lr, lsl #24
-#endif
-	str	r12, [r0], #4
-	subs	r2, r2, #4
-	bge	.Lmemcpy_srcul1loop4
-
-.Lmemcpy_srcul1l4:
-	sub	r1, r1, #3
-	b	.Lmemcpy_l4
-
-.Lmemcpy_srcul2:
-	cmp	r2, #0x0c            
-	blt	.Lmemcpy_srcul2loop4
-	sub	r2, r2, #0x0c         
-	stmdb	sp!, {r4, r5}
-
-.Lmemcpy_srcul2loop16:
-#ifdef __ARMEB__
-	mov	r3, lr, lsl #16
-#else
-	mov	r3, lr, lsr #16
-#endif
-	ldmia	r1!, {r4, r5, r12, lr}
-#ifdef __ARMEB__
-	orr	r3, r3, r4, lsr #16
-	mov	r4, r4, lsl #16
-	orr	r4, r4, r5, lsr #16
-	mov	r5, r5, lsl #16
-	orr	r5, r5, r12, lsr #16
-	mov	r12, r12, lsl #16
-	orr	r12, r12, lr, lsr #16
-#else
-	orr	r3, r3, r4, lsl #16
-	mov	r4, r4, lsr #16
-	orr	r4, r4, r5, lsl #16
-	mov	r5, r5, lsr #16
-	orr	r5, r5, r12, lsl #16
-	mov	r12, r12, lsr #16
-	orr	r12, r12, lr, lsl #16
-#endif
-	stmia	r0!, {r3-r5, r12}
-	subs	r2, r2, #0x10         
-	bge	.Lmemcpy_srcul2loop16
-	ldmia	sp!, {r4, r5}
-	adds	r2, r2, #0x0c         
-	blt	.Lmemcpy_srcul2l4
-
-.Lmemcpy_srcul2loop4:
-#ifdef __ARMEB__
-	mov	r12, lr, lsl #16
-#else
-	mov	r12, lr, lsr #16
-#endif
-	ldr	lr, [r1], #4
-#ifdef __ARMEB__
-	orr	r12, r12, lr, lsr #16
-#else
-	orr	r12, r12, lr, lsl #16
-#endif
-	str	r12, [r0], #4
-	subs	r2, r2, #4
-	bge	.Lmemcpy_srcul2loop4
-
-.Lmemcpy_srcul2l4:
-	sub	r1, r1, #2
-	b	.Lmemcpy_l4
-
-.Lmemcpy_srcul3:
-	cmp	r2, #0x0c            
-	blt	.Lmemcpy_srcul3loop4
-	sub	r2, r2, #0x0c         
-	stmdb	sp!, {r4, r5}
-
-.Lmemcpy_srcul3loop16:
-#ifdef __ARMEB__
-	mov	r3, lr, lsl #24
-#else
-	mov	r3, lr, lsr #24
-#endif
-	ldmia	r1!, {r4, r5, r12, lr}
-#ifdef __ARMEB__
-	orr	r3, r3, r4, lsr #8
-	mov	r4, r4, lsl #24
-	orr	r4, r4, r5, lsr #8
-	mov	r5, r5, lsl #24
-	orr	r5, r5, r12, lsr #8
-	mov	r12, r12, lsl #24
-	orr	r12, r12, lr, lsr #8
-#else
-	orr	r3, r3, r4, lsl #8
-	mov	r4, r4, lsr #24
-	orr	r4, r4, r5, lsl #8
-	mov	r5, r5, lsr #24
-	orr	r5, r5, r12, lsl #8
-	mov	r12, r12, lsr #24
-	orr	r12, r12, lr, lsl #8
-#endif
-	stmia	r0!, {r3-r5, r12}
-	subs	r2, r2, #0x10         
-	bge	.Lmemcpy_srcul3loop16
-	ldmia	sp!, {r4, r5}
-	adds	r2, r2, #0x0c         
-	blt	.Lmemcpy_srcul3l4
-
-.Lmemcpy_srcul3loop4:
-#ifdef __ARMEB__
-	mov	r12, lr, lsl #24
-#else
-	mov	r12, lr, lsr #24
-#endif
-	ldr	lr, [r1], #4
-#ifdef __ARMEB__
-	orr	r12, r12, lr, lsr #8
-#else
-	orr	r12, r12, lr, lsl #8
-#endif
-	str	r12, [r0], #4
-	subs	r2, r2, #4
-	bge	.Lmemcpy_srcul3loop4
-
-.Lmemcpy_srcul3l4:
-	sub	r1, r1, #1
-	b	.Lmemcpy_l4
-END(memcpy)
diff --git a/lib/libc_bsd/arm/string/memcpy_xscale.S b/lib/libc_bsd/arm/string/memcpy_xscale.S
deleted file mode 100644
index 68bd5d0..0000000
--- a/lib/libc_bsd/arm/string/memcpy_xscale.S
+++ /dev/null
@@ -1,1786 +0,0 @@
-/*	$NetBSD: memcpy_xscale.S,v 1.1 2003/10/14 07:51:45 scw Exp $	*/
-
-/*
- * Copyright 2003 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Steve C. Woodford for Wasabi Systems, Inc.
- *
- * 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 for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/memcpy_xscale.S 275767 2014-12-14 16:28:53Z andrew $");
-
-.syntax	unified
-
-/* LINTSTUB: Func: void *memcpy(void *dst, const void *src, size_t len) */
-ENTRY(memcpy)
-	pld	[r1]
-	cmp	r2, #0x0c
-	ble	.Lmemcpy_short		/* <= 12 bytes */
-	mov	r3, r0			/* We must not clobber r0 */
-
-	/* Word-align the destination buffer */
-	ands	ip, r3, #0x03		/* Already word aligned? */
-	beq	.Lmemcpy_wordaligned	/* Yup */
-	cmp	ip, #0x02
-	ldrb	ip, [r1], #0x01
-	sub	r2, r2, #0x01
-	strb	ip, [r3], #0x01
-	ldrble	ip, [r1], #0x01
-	suble	r2, r2, #0x01
-	strble	ip, [r3], #0x01
-	ldrblt	ip, [r1], #0x01
-	sublt	r2, r2, #0x01
-	strblt	ip, [r3], #0x01
-
-	/* Destination buffer is now word aligned */
-.Lmemcpy_wordaligned:
-	ands	ip, r1, #0x03		/* Is src also word-aligned? */
-	bne	.Lmemcpy_bad_align	/* Nope. Things just got bad */
-
-	/* Quad-align the destination buffer */
-	tst	r3, #0x07		/* Already quad aligned? */
-	ldrne	ip, [r1], #0x04
-	stmfd	sp!, {r4-r9}		/* Free up some registers */
-	subne	r2, r2, #0x04
-	strne	ip, [r3], #0x04
-
-	/* Destination buffer quad aligned, source is at least word aligned */
-	subs	r2, r2, #0x80
-	blt	.Lmemcpy_w_lessthan128
-
-	/* Copy 128 bytes at a time */
-.Lmemcpy_w_loop128:
-	ldr	r4, [r1], #0x04		/* LD:00-03 */
-	ldr	r5, [r1], #0x04		/* LD:04-07 */
-	pld	[r1, #0x18]		/* Prefetch 0x20 */
-	ldr	r6, [r1], #0x04		/* LD:08-0b */
-	ldr	r7, [r1], #0x04		/* LD:0c-0f */
-	ldr	r8, [r1], #0x04		/* LD:10-13 */
-	ldr	r9, [r1], #0x04		/* LD:14-17 */
-	strd	r4, [r3], #0x08		/* ST:00-07 */
-	ldr	r4, [r1], #0x04		/* LD:18-1b */
-	ldr	r5, [r1], #0x04		/* LD:1c-1f */
-	strd	r6, [r3], #0x08		/* ST:08-0f */
-	ldr	r6, [r1], #0x04		/* LD:20-23 */
-	ldr	r7, [r1], #0x04		/* LD:24-27 */
-	pld	[r1, #0x18]		/* Prefetch 0x40 */
-	strd	r8, [r3], #0x08		/* ST:10-17 */
-	ldr	r8, [r1], #0x04		/* LD:28-2b */
-	ldr	r9, [r1], #0x04		/* LD:2c-2f */
-	strd	r4, [r3], #0x08		/* ST:18-1f */
-	ldr	r4, [r1], #0x04		/* LD:30-33 */
-	ldr	r5, [r1], #0x04		/* LD:34-37 */
-	strd	r6, [r3], #0x08		/* ST:20-27 */
-	ldr	r6, [r1], #0x04		/* LD:38-3b */
-	ldr	r7, [r1], #0x04		/* LD:3c-3f */
-	strd	r8, [r3], #0x08		/* ST:28-2f */
-	ldr	r8, [r1], #0x04		/* LD:40-43 */
-	ldr	r9, [r1], #0x04		/* LD:44-47 */
-	pld	[r1, #0x18]		/* Prefetch 0x60 */
-	strd	r4, [r3], #0x08		/* ST:30-37 */
-	ldr	r4, [r1], #0x04		/* LD:48-4b */
-	ldr	r5, [r1], #0x04		/* LD:4c-4f */
-	strd	r6, [r3], #0x08		/* ST:38-3f */
-	ldr	r6, [r1], #0x04		/* LD:50-53 */
-	ldr	r7, [r1], #0x04		/* LD:54-57 */
-	strd	r8, [r3], #0x08		/* ST:40-47 */
-	ldr	r8, [r1], #0x04		/* LD:58-5b */
-	ldr	r9, [r1], #0x04		/* LD:5c-5f */
-	strd	r4, [r3], #0x08		/* ST:48-4f */
-	ldr	r4, [r1], #0x04		/* LD:60-63 */
-	ldr	r5, [r1], #0x04		/* LD:64-67 */
-	pld	[r1, #0x18]		/* Prefetch 0x80 */
-	strd	r6, [r3], #0x08		/* ST:50-57 */
-	ldr	r6, [r1], #0x04		/* LD:68-6b */
-	ldr	r7, [r1], #0x04		/* LD:6c-6f */
-	strd	r8, [r3], #0x08		/* ST:58-5f */
-	ldr	r8, [r1], #0x04		/* LD:70-73 */
-	ldr	r9, [r1], #0x04		/* LD:74-77 */
-	strd	r4, [r3], #0x08		/* ST:60-67 */
-	ldr	r4, [r1], #0x04		/* LD:78-7b */
-	ldr	r5, [r1], #0x04		/* LD:7c-7f */
-	strd	r6, [r3], #0x08		/* ST:68-6f */
-	strd	r8, [r3], #0x08		/* ST:70-77 */
-	subs	r2, r2, #0x80
-	strd	r4, [r3], #0x08		/* ST:78-7f */
-	bge	.Lmemcpy_w_loop128
-
-.Lmemcpy_w_lessthan128:
-	adds	r2, r2, #0x80		/* Adjust for extra sub */
-	ldmfdeq	sp!, {r4-r9}
-	bxeq	lr			/* Return now if done */
-	subs	r2, r2, #0x20
-	blt	.Lmemcpy_w_lessthan32
-
-	/* Copy 32 bytes at a time */
-.Lmemcpy_w_loop32:
-	ldr	r4, [r1], #0x04
-	ldr	r5, [r1], #0x04
-	pld	[r1, #0x18]
-	ldr	r6, [r1], #0x04
-	ldr	r7, [r1], #0x04
-	ldr	r8, [r1], #0x04
-	ldr	r9, [r1], #0x04
-	strd	r4, [r3], #0x08
-	ldr	r4, [r1], #0x04
-	ldr	r5, [r1], #0x04
-	strd	r6, [r3], #0x08
-	strd	r8, [r3], #0x08
-	subs	r2, r2, #0x20
-	strd	r4, [r3], #0x08
-	bge	.Lmemcpy_w_loop32
-
-.Lmemcpy_w_lessthan32:
-	adds	r2, r2, #0x20		/* Adjust for extra sub */
-	ldmfdeq	sp!, {r4-r9}
-	bxeq	lr			/* Return now if done */
-
-	and	r4, r2, #0x18
-	rsbs	r4, r4, #0x18
-	addne	pc, pc, r4, lsl #1
-	nop
-
-	/* At least 24 bytes remaining */
-	ldr	r4, [r1], #0x04
-	ldr	r5, [r1], #0x04
-	sub	r2, r2, #0x08
-	strd	r4, [r3], #0x08
-
-	/* At least 16 bytes remaining */
-	ldr	r4, [r1], #0x04
-	ldr	r5, [r1], #0x04
-	sub	r2, r2, #0x08
-	strd	r4, [r3], #0x08
-
-	/* At least 8 bytes remaining */
-	ldr	r4, [r1], #0x04
-	ldr	r5, [r1], #0x04
-	subs	r2, r2, #0x08
-	strd	r4, [r3], #0x08
-
-	/* Less than 8 bytes remaining */
-	ldmfd	sp!, {r4-r9}
-	bxeq	lr			/* Return now if done */
-	subs	r2, r2, #0x04
-	ldrge	ip, [r1], #0x04
-	strge	ip, [r3], #0x04
-	bxeq	lr			/* Return now if done */
-	addlt	r2, r2, #0x04
-	ldrb	ip, [r1], #0x01
-	cmp	r2, #0x02
-	ldrbge	r2, [r1], #0x01
-	strb	ip, [r3], #0x01
-	ldrbgt	ip, [r1]
-	strbge	r2, [r3], #0x01
-	strbgt	ip, [r3]
-	bx	lr
-
-
-/*
- * At this point, it has not been possible to word align both buffers.
- * The destination buffer is word aligned, but the source buffer is not.
- */
-.Lmemcpy_bad_align:
-	stmfd	sp!, {r4-r7}
-	bic	r1, r1, #0x03
-	cmp	ip, #2
-	ldr	ip, [r1], #0x04
-	bgt	.Lmemcpy_bad3
-	beq	.Lmemcpy_bad2
-	b	.Lmemcpy_bad1
-
-.Lmemcpy_bad1_loop16:
-#ifdef __ARMEB__
-	mov	r4, ip, lsl #8
-#else
-	mov	r4, ip, lsr #8
-#endif
-	ldr	r5, [r1], #0x04
-	pld	[r1, #0x018]
-	ldr	r6, [r1], #0x04
-	ldr	r7, [r1], #0x04
-	ldr	ip, [r1], #0x04
-#ifdef __ARMEB__
-	orr	r4, r4, r5, lsr #24
-	mov	r5, r5, lsl #8
-	orr	r5, r5, r6, lsr #24
-	mov	r6, r6, lsl #8
-	orr	r6, r6, r7, lsr #24
-	mov	r7, r7, lsl #8
-	orr	r7, r7, ip, lsr #24
-#else
-	orr	r4, r4, r5, lsl #24
-	mov	r5, r5, lsr #8
-	orr	r5, r5, r6, lsl #24
-	mov	r6, r6, lsr #8
-	orr	r6, r6, r7, lsl #24
-	mov	r7, r7, lsr #8
-	orr	r7, r7, ip, lsl #24
-#endif
-	str	r4, [r3], #0x04
-	str	r5, [r3], #0x04
-	str	r6, [r3], #0x04
-	str	r7, [r3], #0x04
-.Lmemcpy_bad1:
-	subs	r2, r2, #0x10         
-	bge	.Lmemcpy_bad1_loop16
-
-	adds	r2, r2, #0x10         
-	ldmfdeq	sp!, {r4-r7}
-	bxeq	lr			/* Return now if done */
-	subs	r2, r2, #0x04
-	sublt	r1, r1, #0x03
-	blt	.Lmemcpy_bad_done
-
-.Lmemcpy_bad1_loop4:
-#ifdef __ARMEB__
-	mov	r4, ip, lsl #8
-#else
-	mov	r4, ip, lsr #8
-#endif
-	ldr	ip, [r1], #0x04
-	subs	r2, r2, #0x04
-#ifdef __ARMEB__
-	orr	r4, r4, ip, lsr #24
-#else
-	orr	r4, r4, ip, lsl #24
-#endif
-	str	r4, [r3], #0x04
-	bge	.Lmemcpy_bad1_loop4
-	sub	r1, r1, #0x03
-	b	.Lmemcpy_bad_done
-
-.Lmemcpy_bad2_loop16:
-#ifdef __ARMEB__
-	mov	r4, ip, lsl #16
-#else
-	mov	r4, ip, lsr #16
-#endif
-	ldr	r5, [r1], #0x04
-	pld	[r1, #0x018]
-	ldr	r6, [r1], #0x04
-	ldr	r7, [r1], #0x04
-	ldr	ip, [r1], #0x04
-#ifdef __ARMEB__
-	orr	r4, r4, r5, lsr #16
-	mov	r5, r5, lsl #16
-	orr	r5, r5, r6, lsr #16
-	mov	r6, r6, lsl #16
-	orr	r6, r6, r7, lsr #16
-	mov	r7, r7, lsl #16
-	orr	r7, r7, ip, lsr #16
-#else
-	orr	r4, r4, r5, lsl #16
-	mov	r5, r5, lsr #16
-	orr	r5, r5, r6, lsl #16
-	mov	r6, r6, lsr #16
-	orr	r6, r6, r7, lsl #16
-	mov	r7, r7, lsr #16
-	orr	r7, r7, ip, lsl #16
-#endif
-	str	r4, [r3], #0x04
-	str	r5, [r3], #0x04
-	str	r6, [r3], #0x04
-	str	r7, [r3], #0x04
-.Lmemcpy_bad2:
-	subs	r2, r2, #0x10         
-	bge	.Lmemcpy_bad2_loop16
-
-	adds	r2, r2, #0x10         
-	ldmfdeq	sp!, {r4-r7}
-	bxeq	lr			/* Return now if done */
-	subs	r2, r2, #0x04
-	sublt	r1, r1, #0x02
-	blt	.Lmemcpy_bad_done
-
-.Lmemcpy_bad2_loop4:
-#ifdef __ARMEB__
-	mov	r4, ip, lsl #16
-#else
-	mov	r4, ip, lsr #16
-#endif
-	ldr	ip, [r1], #0x04
-	subs	r2, r2, #0x04
-#ifdef __ARMEB__
-	orr	r4, r4, ip, lsr #16
-#else
-	orr	r4, r4, ip, lsl #16
-#endif
-	str	r4, [r3], #0x04
-	bge	.Lmemcpy_bad2_loop4
-	sub	r1, r1, #0x02
-	b	.Lmemcpy_bad_done
-
-.Lmemcpy_bad3_loop16:
-#ifdef __ARMEB__
-	mov	r4, ip, lsl #24
-#else
-	mov	r4, ip, lsr #24
-#endif
-	ldr	r5, [r1], #0x04
-	pld	[r1, #0x018]
-	ldr	r6, [r1], #0x04
-	ldr	r7, [r1], #0x04
-	ldr	ip, [r1], #0x04
-#ifdef __ARMEB__
-	orr	r4, r4, r5, lsr #8
-	mov	r5, r5, lsl #24
-	orr	r5, r5, r6, lsr #8
-	mov	r6, r6, lsl #24
-	orr	r6, r6, r7, lsr #8
-	mov	r7, r7, lsl #24
-	orr	r7, r7, ip, lsr #8
-#else
-	orr	r4, r4, r5, lsl #8
-	mov	r5, r5, lsr #24
-	orr	r5, r5, r6, lsl #8
-	mov	r6, r6, lsr #24
-	orr	r6, r6, r7, lsl #8
-	mov	r7, r7, lsr #24
-	orr	r7, r7, ip, lsl #8
-#endif
-	str	r4, [r3], #0x04
-	str	r5, [r3], #0x04
-	str	r6, [r3], #0x04
-	str	r7, [r3], #0x04
-.Lmemcpy_bad3:
-	subs	r2, r2, #0x10         
-	bge	.Lmemcpy_bad3_loop16
-
-	adds	r2, r2, #0x10         
-	ldmfdeq	sp!, {r4-r7}
-	bxeq	lr			/* Return now if done */
-	subs	r2, r2, #0x04
-	sublt	r1, r1, #0x01
-	blt	.Lmemcpy_bad_done
-
-.Lmemcpy_bad3_loop4:
-#ifdef __ARMEB__
-	mov	r4, ip, lsl #24
-#else
-	mov	r4, ip, lsr #24
-#endif
-	ldr	ip, [r1], #0x04
-	subs	r2, r2, #0x04
-#ifdef __ARMEB__
-	orr	r4, r4, ip, lsr #8
-#else
-	orr	r4, r4, ip, lsl #8
-#endif
-	str	r4, [r3], #0x04
-	bge	.Lmemcpy_bad3_loop4
-	sub	r1, r1, #0x01
-
-.Lmemcpy_bad_done:
-	ldmfd	sp!, {r4-r7}
-	adds	r2, r2, #0x04
-	bxeq	lr
-	ldrb	ip, [r1], #0x01
-	cmp	r2, #0x02
-	ldrbge	r2, [r1], #0x01
-	strb	ip, [r3], #0x01
-	ldrbgt	ip, [r1]
-	strbge	r2, [r3], #0x01
-	strbgt	ip, [r3]
-	bx	lr
-
-
-/*
- * Handle short copies (less than 16 bytes), possibly misaligned.
- * Some of these are *very* common, thanks to the network stack,
- * and so are handled specially.
- */
-.Lmemcpy_short:
-#ifndef _STANDALONE
-	add	pc, pc, r2, lsl #2
-	nop
-	bx	lr			/* 0x00 */
-	b	.Lmemcpy_bytewise	/* 0x01 */
-	b	.Lmemcpy_bytewise	/* 0x02 */
-	b	.Lmemcpy_bytewise	/* 0x03 */
-	b	.Lmemcpy_4		/* 0x04 */
-	b	.Lmemcpy_bytewise	/* 0x05 */
-	b	.Lmemcpy_6		/* 0x06 */
-	b	.Lmemcpy_bytewise	/* 0x07 */
-	b	.Lmemcpy_8		/* 0x08 */
-	b	.Lmemcpy_bytewise	/* 0x09 */
-	b	.Lmemcpy_bytewise	/* 0x0a */
-	b	.Lmemcpy_bytewise	/* 0x0b */
-	b	.Lmemcpy_c		/* 0x0c */
-#endif
-.Lmemcpy_bytewise:
-	mov	r3, r0			/* We must not clobber r0 */
-	ldrb	ip, [r1], #0x01
-1:	subs	r2, r2, #0x01
-	strb	ip, [r3], #0x01
-	ldrbne	ip, [r1], #0x01
-	bne	1b
-	bx	lr
-
-#ifndef _STANDALONE
-/******************************************************************************
- * Special case for 4 byte copies
- */
-#define	LMEMCPY_4_LOG2	6	/* 64 bytes */
-#define	LMEMCPY_4_PAD	.align LMEMCPY_4_LOG2
-	LMEMCPY_4_PAD
-.Lmemcpy_4:
-	and	r2, r1, #0x03
-	orr	r2, r2, r0, lsl #2
-	ands	r2, r2, #0x0f
-	sub	r3, pc, #0x14
-	addne	pc, r3, r2, lsl #LMEMCPY_4_LOG2
-
-/*
- * 0000: dst is 32-bit aligned, src is 32-bit aligned
- */
-	ldr	r2, [r1]
-	str	r2, [r0]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 0001: dst is 32-bit aligned, src is 8-bit aligned
- */
-	ldr	r3, [r1, #-1]		/* BE:r3 = x012  LE:r3 = 210x */
-	ldr	r2, [r1, #3]		/* BE:r2 = 3xxx  LE:r2 = xxx3 */
-#ifdef __ARMEB__
-	mov	r3, r3, lsl #8		/* r3 = 012. */
-	orr	r3, r3, r2, lsr #24	/* r3 = 0123 */
-#else
-	mov	r3, r3, lsr #8		/* r3 = .210 */
-	orr	r3, r3, r2, lsl #24	/* r3 = 3210 */
-#endif
-	str	r3, [r0]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 0010: dst is 32-bit aligned, src is 16-bit aligned
- */
-#ifdef __ARMEB__
-	ldrh	r3, [r1]
-	ldrh	r2, [r1, #0x02]
-#else
-	ldrh	r3, [r1, #0x02]
-	ldrh	r2, [r1]
-#endif
-	orr	r3, r2, r3, lsl #16
-	str	r3, [r0]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 0011: dst is 32-bit aligned, src is 8-bit aligned
- */
-	ldr	r3, [r1, #-3]		/* BE:r3 = xxx0  LE:r3 = 0xxx */
-	ldr	r2, [r1, #1]		/* BE:r2 = 123x  LE:r2 = x321 */
-#ifdef __ARMEB__
-	mov	r3, r3, lsl #24		/* r3 = 0... */
-	orr	r3, r3, r2, lsr #8	/* r3 = 0123 */
-#else
-	mov	r3, r3, lsr #24		/* r3 = ...0 */
-	orr	r3, r3, r2, lsl #8	/* r3 = 3210 */
-#endif
-	str	r3, [r0]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 0100: dst is 8-bit aligned, src is 32-bit aligned
- */
-	ldr	r2, [r1]
-#ifdef __ARMEB__
-	strb	r2, [r0, #0x03]
-	mov	r3, r2, lsr #8
-	mov	r1, r2, lsr #24
-	strb	r1, [r0]
-#else
-	strb	r2, [r0]
-	mov	r3, r2, lsr #8
-	mov	r1, r2, lsr #24
-	strb	r1, [r0, #0x03]
-#endif
-	strh	r3, [r0, #0x01]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 0101: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldrh	r3, [r1, #0x01]
-	ldrb	r1, [r1, #0x03]
-	strb	r2, [r0]
-	strh	r3, [r0, #0x01]
-	strb	r1, [r0, #0x03]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 0110: dst is 8-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	ldrh	r3, [r1, #0x02]		/* LE:r3 = ..23  LE:r3 = ..32 */
-#ifdef __ARMEB__
-	mov	r1, r2, lsr #8		/* r1 = ...0 */
-	strb	r1, [r0]
-	mov	r2, r2, lsl #8		/* r2 = .01. */
-	orr	r2, r2, r3, lsr #8	/* r2 = .012 */
-#else
-	strb	r2, [r0]
-	mov	r2, r2, lsr #8		/* r2 = ...1 */
-	orr	r2, r2, r3, lsl #8	/* r2 = .321 */
-	mov	r3, r3, lsr #8		/* r3 = ...3 */
-#endif
-	strh	r2, [r0, #0x01]
-	strb	r3, [r0, #0x03]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 0111: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldrh	r3, [r1, #0x01]
-	ldrb	r1, [r1, #0x03]
-	strb	r2, [r0]
-	strh	r3, [r0, #0x01]
-	strb	r1, [r0, #0x03]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 1000: dst is 16-bit aligned, src is 32-bit aligned
- */
-	ldr	r2, [r1]
-#ifdef __ARMEB__
-	strh	r2, [r0, #0x02]
-	mov	r3, r2, lsr #16
-	strh	r3, [r0]
-#else
-	strh	r2, [r0]
-	mov	r3, r2, lsr #16
-	strh	r3, [r0, #0x02]
-#endif
-	bx	 lr
-	LMEMCPY_4_PAD
-
-/*
- * 1001: dst is 16-bit aligned, src is 8-bit aligned
- */
-	ldr	r2, [r1, #-1]		/* BE:r2 = x012  LE:r2 = 210x */
-	ldr	r3, [r1, #3]		/* BE:r3 = 3xxx  LE:r3 = xxx3 */
-	mov	r1, r2, lsr #8		/* BE:r1 = .x01  LE:r1 = .210 */
-	strh	r1, [r0]
-#ifdef __ARMEB__
-	mov	r2, r2, lsl #8		/* r2 = 012. */
-	orr	r2, r2, r3, lsr #24	/* r2 = 0123 */
-#else
-	mov	r2, r2, lsr #24		/* r2 = ...2 */
-	orr	r2, r2, r3, lsl #8	/* r2 = xx32 */
-#endif
-	strh	r2, [r0, #0x02]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 1010: dst is 16-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]
-	ldrh	r3, [r1, #0x02]
-	strh	r2, [r0]
-	strh	r3, [r0, #0x02]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 1011: dst is 16-bit aligned, src is 8-bit aligned
- */
-	ldr	r3, [r1, #1]		/* BE:r3 = 123x  LE:r3 = x321 */
-	ldr	r2, [r1, #-3]		/* BE:r2 = xxx0  LE:r2 = 0xxx */
-	mov	r1, r3, lsr #8		/* BE:r1 = .123  LE:r1 = .x32 */
-	strh	r1, [r0, #0x02]
-#ifdef __ARMEB__
-	mov	r3, r3, lsr #24		/* r3 = ...1 */
-	orr	r3, r3, r2, lsl #8	/* r3 = xx01 */
-#else
-	mov	r3, r3, lsl #8		/* r3 = 321. */
-	orr	r3, r3, r2, lsr #24	/* r3 = 3210 */
-#endif
-	strh	r3, [r0]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 1100: dst is 8-bit aligned, src is 32-bit aligned
- */
-	ldr	r2, [r1]		/* BE:r2 = 0123  LE:r2 = 3210 */
-#ifdef __ARMEB__
-	strb	r2, [r0, #0x03]
-	mov	r3, r2, lsr #8
-	mov	r1, r2, lsr #24
-	strh	r3, [r0, #0x01]
-	strb	r1, [r0]
-#else
-	strb	r2, [r0]
-	mov	r3, r2, lsr #8
-	mov	r1, r2, lsr #24
-	strh	r3, [r0, #0x01]
-	strb	r1, [r0, #0x03]
-#endif
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 1101: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldrh	r3, [r1, #0x01]
-	ldrb	r1, [r1, #0x03]
-	strb	r2, [r0]
-	strh	r3, [r0, #0x01]
-	strb	r1, [r0, #0x03]
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 1110: dst is 8-bit aligned, src is 16-bit aligned
- */
-#ifdef __ARMEB__
-	ldrh	r3, [r1, #0x02]		/* BE:r3 = ..23  LE:r3 = ..32 */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	strb	r3, [r0, #0x03]
-	mov	r3, r3, lsr #8		/* r3 = ...2 */
-	orr	r3, r3, r2, lsl #8	/* r3 = ..12 */
-	strh	r3, [r0, #0x01]
-	mov	r2, r2, lsr #8		/* r2 = ...0 */
-	strb	r2, [r0]
-#else
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	ldrh	r3, [r1, #0x02]		/* BE:r3 = ..23  LE:r3 = ..32 */
-	strb	r2, [r0]
-	mov	r2, r2, lsr #8		/* r2 = ...1 */
-	orr	r2, r2, r3, lsl #8	/* r2 = .321 */
-	strh	r2, [r0, #0x01]
-	mov	r3, r3, lsr #8		/* r3 = ...3 */
-	strb	r3, [r0, #0x03]
-#endif
-	bx	lr
-	LMEMCPY_4_PAD
-
-/*
- * 1111: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldrh	r3, [r1, #0x01]
-	ldrb	r1, [r1, #0x03]
-	strb	r2, [r0]
-	strh	r3, [r0, #0x01]
-	strb	r1, [r0, #0x03]
-	bx	lr
-	LMEMCPY_4_PAD
-
-
-/******************************************************************************
- * Special case for 6 byte copies
- */
-#define	LMEMCPY_6_LOG2	6	/* 64 bytes */
-#define	LMEMCPY_6_PAD	.align LMEMCPY_6_LOG2
-	LMEMCPY_6_PAD
-.Lmemcpy_6:
-	and	r2, r1, #0x03
-	orr	r2, r2, r0, lsl #2
-	ands	r2, r2, #0x0f
-	sub	r3, pc, #0x14
-	addne	pc, r3, r2, lsl #LMEMCPY_6_LOG2
-
-/*
- * 0000: dst is 32-bit aligned, src is 32-bit aligned
- */
-	ldr	r2, [r1]
-	ldrh	r3, [r1, #0x04]
-	str	r2, [r0]
-	strh	r3, [r0, #0x04]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 0001: dst is 32-bit aligned, src is 8-bit aligned
- */
-	ldr	r2, [r1, #-1]		/* BE:r2 = x012  LE:r2 = 210x */
-	ldr	r3, [r1, #0x03]		/* BE:r3 = 345x  LE:r3 = x543 */
-#ifdef __ARMEB__
-	mov	r2, r2, lsl #8		/* r2 = 012. */
-	orr	r2, r2, r3, lsr #24	/* r2 = 0123 */
-#else
-	mov	r2, r2, lsr #8		/* r2 = .210 */
-	orr	r2, r2, r3, lsl #24	/* r2 = 3210 */
-#endif
-	mov	r3, r3, lsr #8		/* BE:r3 = .345  LE:r3 = .x54 */
-	str	r2, [r0]
-	strh	r3, [r0, #0x04]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 0010: dst is 32-bit aligned, src is 16-bit aligned
- */
-	ldr	r3, [r1, #0x02]		/* BE:r3 = 2345  LE:r3 = 5432 */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-#ifdef __ARMEB__
-	mov	r1, r3, lsr #16		/* r1 = ..23 */
-	orr	r1, r1, r2, lsl #16	/* r1 = 0123 */
-	str	r1, [r0]
-	strh	r3, [r0, #0x04]
-#else
-	mov	r1, r3, lsr #16		/* r1 = ..54 */
-	orr	r2, r2, r3, lsl #16	/* r2 = 3210 */
-	str	r2, [r0]
-	strh	r1, [r0, #0x04]
-#endif
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 0011: dst is 32-bit aligned, src is 8-bit aligned
- */
-	ldr	r2, [r1, #-3]		/* BE:r2 = xxx0  LE:r2 = 0xxx */
-	ldr	r3, [r1, #1]		/* BE:r3 = 1234  LE:r3 = 4321 */
-	ldr	r1, [r1, #5]		/* BE:r1 = 5xxx  LE:r3 = xxx5 */
-#ifdef __ARMEB__
-	mov	r2, r2, lsl #24		/* r2 = 0... */
-	orr	r2, r2, r3, lsr #8	/* r2 = 0123 */
-	mov	r3, r3, lsl #8		/* r3 = 234. */
-	orr	r1, r3, r1, lsr #24	/* r1 = 2345 */
-#else
-	mov	r2, r2, lsr #24		/* r2 = ...0 */
-	orr	r2, r2, r3, lsl #8	/* r2 = 3210 */
-	mov	r1, r1, lsl #8		/* r1 = xx5. */
-	orr	r1, r1, r3, lsr #24	/* r1 = xx54 */
-#endif
-	str	r2, [r0]
-	strh	r1, [r0, #0x04]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 0100: dst is 8-bit aligned, src is 32-bit aligned
- */
-	ldr	r3, [r1]		/* BE:r3 = 0123  LE:r3 = 3210 */
-	ldrh	r2, [r1, #0x04]		/* BE:r2 = ..45  LE:r2 = ..54 */
-	mov	r1, r3, lsr #8		/* BE:r1 = .012  LE:r1 = .321 */
-	strh	r1, [r0, #0x01]
-#ifdef __ARMEB__
-	mov	r1, r3, lsr #24		/* r1 = ...0 */
-	strb	r1, [r0]
-	mov	r3, r3, lsl #8		/* r3 = 123. */
-	orr	r3, r3, r2, lsr #8	/* r3 = 1234 */
-#else
-	strb	r3, [r0]
-	mov	r3, r3, lsr #24		/* r3 = ...3 */
-	orr	r3, r3, r2, lsl #8	/* r3 = .543 */
-	mov	r2, r2, lsr #8		/* r2 = ...5 */
-#endif
-	strh	r3, [r0, #0x03]
-	strb	r2, [r0, #0x05]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 0101: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldrh	r3, [r1, #0x01]
-	ldrh	ip, [r1, #0x03]
-	ldrb	r1, [r1, #0x05]
-	strb	r2, [r0]
-	strh	r3, [r0, #0x01]
-	strh	ip, [r0, #0x03]
-	strb	r1, [r0, #0x05]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 0110: dst is 8-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	ldr	r1, [r1, #0x02]		/* BE:r1 = 2345  LE:r1 = 5432 */
-#ifdef __ARMEB__
-	mov	r3, r2, lsr #8		/* r3 = ...0 */
-	strb	r3, [r0]
-	strb	r1, [r0, #0x05]
-	mov	r3, r1, lsr #8		/* r3 = .234 */
-	strh	r3, [r0, #0x03]
-	mov	r3, r2, lsl #8		/* r3 = .01. */
-	orr	r3, r3, r1, lsr #24	/* r3 = .012 */
-	strh	r3, [r0, #0x01]
-#else
-	strb	r2, [r0]
-	mov	r3, r1, lsr #24
-	strb	r3, [r0, #0x05]
-	mov	r3, r1, lsr #8		/* r3 = .543 */
-	strh	r3, [r0, #0x03]
-	mov	r3, r2, lsr #8		/* r3 = ...1 */
-	orr	r3, r3, r1, lsl #8	/* r3 = 4321 */
-	strh	r3, [r0, #0x01]
-#endif
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 0111: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldrh	r3, [r1, #0x01]
-	ldrh	ip, [r1, #0x03]
-	ldrb	r1, [r1, #0x05]
-	strb	r2, [r0]
-	strh	r3, [r0, #0x01]
-	strh	ip, [r0, #0x03]
-	strb	r1, [r0, #0x05]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 1000: dst is 16-bit aligned, src is 32-bit aligned
- */
-#ifdef __ARMEB__
-	ldr	r2, [r1]		/* r2 = 0123 */
-	ldrh	r3, [r1, #0x04]		/* r3 = ..45 */
-	mov	r1, r2, lsr #16		/* r1 = ..01 */
-	orr	r3, r3, r2, lsl#16	/* r3 = 2345 */
-	strh	r1, [r0]
-	str	r3, [r0, #0x02]
-#else
-	ldrh	r2, [r1, #0x04]		/* r2 = ..54 */
-	ldr	r3, [r1]		/* r3 = 3210 */
-	mov	r2, r2, lsl #16		/* r2 = 54.. */
-	orr	r2, r2, r3, lsr #16	/* r2 = 5432 */
-	strh	r3, [r0]
-	str	r2, [r0, #0x02]
-#endif
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 1001: dst is 16-bit aligned, src is 8-bit aligned
- */
-	ldr	r3, [r1, #-1]		/* BE:r3 = x012  LE:r3 = 210x */
-	ldr	r2, [r1, #3]		/* BE:r2 = 345x  LE:r2 = x543 */
-	mov	r1, r3, lsr #8		/* BE:r1 = .x01  LE:r1 = .210 */
-#ifdef __ARMEB__
-	mov	r2, r2, lsr #8		/* r2 = .345 */
-	orr	r2, r2, r3, lsl #24	/* r2 = 2345 */
-#else
-	mov	r2, r2, lsl #8		/* r2 = 543. */
-	orr	r2, r2, r3, lsr #24	/* r2 = 5432 */
-#endif
-	strh	r1, [r0]
-	str	r2, [r0, #0x02]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 1010: dst is 16-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]
-	ldr	r3, [r1, #0x02]
-	strh	r2, [r0]
-	str	r3, [r0, #0x02]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 1011: dst is 16-bit aligned, src is 8-bit aligned
- */
-	ldrb	r3, [r1]		/* r3 = ...0 */
-	ldr	r2, [r1, #0x01]		/* BE:r2 = 1234  LE:r2 = 4321 */
-	ldrb	r1, [r1, #0x05]		/* r1 = ...5 */
-#ifdef __ARMEB__
-	mov	r3, r3, lsl #8		/* r3 = ..0. */
-	orr	r3, r3, r2, lsr #24	/* r3 = ..01 */
-	orr	r1, r1, r2, lsl #8	/* r1 = 2345 */
-#else
-	orr	r3, r3, r2, lsl #8	/* r3 = 3210 */
-	mov	r1, r1, lsl #24		/* r1 = 5... */
-	orr	r1, r1, r2, lsr #8	/* r1 = 5432 */
-#endif
-	strh	r3, [r0]
-	str	r1, [r0, #0x02]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 1100: dst is 8-bit aligned, src is 32-bit aligned
- */
-	ldr	r2, [r1]		/* BE:r2 = 0123  LE:r2 = 3210 */
-	ldrh	r1, [r1, #0x04]		/* BE:r1 = ..45  LE:r1 = ..54 */
-#ifdef __ARMEB__
-	mov	r3, r2, lsr #24		/* r3 = ...0 */
-	strb	r3, [r0]
-	mov	r2, r2, lsl #8		/* r2 = 123. */
-	orr	r2, r2, r1, lsr #8	/* r2 = 1234 */
-#else
-	strb	r2, [r0]
-	mov	r2, r2, lsr #8		/* r2 = .321 */
-	orr	r2, r2, r1, lsl #24	/* r2 = 4321 */
-	mov	r1, r1, lsr #8		/* r1 = ...5 */
-#endif
-	str	r2, [r0, #0x01]
-	strb	r1, [r0, #0x05]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 1101: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldrh	r3, [r1, #0x01]
-	ldrh	ip, [r1, #0x03]
-	ldrb	r1, [r1, #0x05]
-	strb	r2, [r0]
-	strh	r3, [r0, #0x01]
-	strh	ip, [r0, #0x03]
-	strb	r1, [r0, #0x05]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 1110: dst is 8-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	ldr	r1, [r1, #0x02]		/* BE:r1 = 2345  LE:r1 = 5432 */
-#ifdef __ARMEB__
-	mov	r3, r2, lsr #8		/* r3 = ...0 */
-	strb	r3, [r0]
-	mov	r2, r2, lsl #24		/* r2 = 1... */
-	orr	r2, r2, r1, lsr #8	/* r2 = 1234 */
-#else
-	strb	r2, [r0]
-	mov	r2, r2, lsr #8		/* r2 = ...1 */
-	orr	r2, r2, r1, lsl #8	/* r2 = 4321 */
-	mov	r1, r1, lsr #24		/* r1 = ...5 */
-#endif
-	str	r2, [r0, #0x01]
-	strb	r1, [r0, #0x05]
-	bx	lr
-	LMEMCPY_6_PAD
-
-/*
- * 1111: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldr	r3, [r1, #0x01]
-	ldrb	r1, [r1, #0x05]
-	strb	r2, [r0]
-	str	r3, [r0, #0x01]
-	strb	r1, [r0, #0x05]
-	bx	lr
-	LMEMCPY_6_PAD
-
-
-/******************************************************************************
- * Special case for 8 byte copies
- */
-#define	LMEMCPY_8_LOG2	6	/* 64 bytes */
-#define	LMEMCPY_8_PAD	.align LMEMCPY_8_LOG2
-	LMEMCPY_8_PAD
-.Lmemcpy_8:
-	and	r2, r1, #0x03
-	orr	r2, r2, r0, lsl #2
-	ands	r2, r2, #0x0f
-	sub	r3, pc, #0x14
-	addne	pc, r3, r2, lsl #LMEMCPY_8_LOG2
-
-/*
- * 0000: dst is 32-bit aligned, src is 32-bit aligned
- */
-	ldr	r2, [r1]
-	ldr	r3, [r1, #0x04]
-	str	r2, [r0]
-	str	r3, [r0, #0x04]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 0001: dst is 32-bit aligned, src is 8-bit aligned
- */
-	ldr	r3, [r1, #-1]		/* BE:r3 = x012  LE:r3 = 210x */
-	ldr	r2, [r1, #0x03]		/* BE:r2 = 3456  LE:r2 = 6543 */
-	ldrb	r1, [r1, #0x07]		/* r1 = ...7 */
-#ifdef __ARMEB__
-	mov	r3, r3, lsl #8		/* r3 = 012. */
-	orr	r3, r3, r2, lsr #24	/* r3 = 0123 */
-	orr	r2, r1, r2, lsl #8	/* r2 = 4567 */
-#else
-	mov	r3, r3, lsr #8		/* r3 = .210 */
-	orr	r3, r3, r2, lsl #24	/* r3 = 3210 */
-	mov	r1, r1, lsl #24		/* r1 = 7... */
-	orr	r2, r1, r2, lsr #8	/* r2 = 7654 */
-#endif
-	str	r3, [r0]
-	str	r2, [r0, #0x04]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 0010: dst is 32-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	ldr	r3, [r1, #0x02]		/* BE:r3 = 2345  LE:r3 = 5432 */
-	ldrh	r1, [r1, #0x06]		/* BE:r1 = ..67  LE:r1 = ..76 */
-#ifdef __ARMEB__
-	mov	r2, r2, lsl #16		/* r2 = 01.. */
-	orr	r2, r2, r3, lsr #16	/* r2 = 0123 */
-	orr	r3, r1, r3, lsl #16	/* r3 = 4567 */
-#else
-	orr	r2, r2, r3, lsl #16	/* r2 = 3210 */
-	mov	r3, r3, lsr #16		/* r3 = ..54 */
-	orr	r3, r3, r1, lsl #16	/* r3 = 7654 */
-#endif
-	str	r2, [r0]
-	str	r3, [r0, #0x04]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 0011: dst is 32-bit aligned, src is 8-bit aligned
- */
-	ldrb	r3, [r1]		/* r3 = ...0 */
-	ldr	r2, [r1, #0x01]		/* BE:r2 = 1234  LE:r2 = 4321 */
-	ldr	r1, [r1, #0x05]		/* BE:r1 = 567x  LE:r1 = x765 */
-#ifdef __ARMEB__
-	mov	r3, r3, lsl #24		/* r3 = 0... */
-	orr	r3, r3, r2, lsr #8	/* r3 = 0123 */
-	mov	r2, r2, lsl #24		/* r2 = 4... */
-	orr	r2, r2, r1, lsr #8	/* r2 = 4567 */
-#else
-	orr	r3, r3, r2, lsl #8	/* r3 = 3210 */
-	mov	r2, r2, lsr #24		/* r2 = ...4 */
-	orr	r2, r2, r1, lsl #8	/* r2 = 7654 */
-#endif
-	str	r3, [r0]
-	str	r2, [r0, #0x04]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 0100: dst is 8-bit aligned, src is 32-bit aligned
- */
-	ldr	r3, [r1]		/* BE:r3 = 0123  LE:r3 = 3210 */
-	ldr	r2, [r1, #0x04]		/* BE:r2 = 4567  LE:r2 = 7654 */
-#ifdef __ARMEB__
-	mov	r1, r3, lsr #24		/* r1 = ...0 */
-	strb	r1, [r0]
-	mov	r1, r3, lsr #8		/* r1 = .012 */
-	strb	r2, [r0, #0x07]
-	mov	r3, r3, lsl #24		/* r3 = 3... */
-	orr	r3, r3, r2, lsr #8	/* r3 = 3456 */
-#else
-	strb	r3, [r0]
-	mov	r1, r2, lsr #24		/* r1 = ...7 */
-	strb	r1, [r0, #0x07]
-	mov	r1, r3, lsr #8		/* r1 = .321 */
-	mov	r3, r3, lsr #24		/* r3 = ...3 */
-	orr	r3, r3, r2, lsl #8	/* r3 = 6543 */
-#endif
-	strh	r1, [r0, #0x01]
-	str	r3, [r0, #0x03]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 0101: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldrh	r3, [r1, #0x01]
-	ldr	ip, [r1, #0x03]
-	ldrb	r1, [r1, #0x07]
-	strb	r2, [r0]
-	strh	r3, [r0, #0x01]
-	str	ip, [r0, #0x03]
-	strb	r1, [r0, #0x07]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 0110: dst is 8-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	ldr	r3, [r1, #0x02]		/* BE:r3 = 2345  LE:r3 = 5432 */
-	ldrh	r1, [r1, #0x06]		/* BE:r1 = ..67  LE:r1 = ..76 */
-#ifdef __ARMEB__
-	mov	ip, r2, lsr #8		/* ip = ...0 */
-	strb	ip, [r0]
-	mov	ip, r2, lsl #8		/* ip = .01. */
-	orr	ip, ip, r3, lsr #24	/* ip = .012 */
-	strb	r1, [r0, #0x07]
-	mov	r3, r3, lsl #8		/* r3 = 345. */
-	orr	r3, r3, r1, lsr #8	/* r3 = 3456 */
-#else
-	strb	r2, [r0]		/* 0 */
-	mov	ip, r1, lsr #8		/* ip = ...7 */
-	strb	ip, [r0, #0x07]		/* 7 */
-	mov	ip, r2, lsr #8		/* ip = ...1 */
-	orr	ip, ip, r3, lsl #8	/* ip = 4321 */
-	mov	r3, r3, lsr #8		/* r3 = .543 */
-	orr	r3, r3, r1, lsl #24	/* r3 = 6543 */
-#endif
-	strh	ip, [r0, #0x01]
-	str	r3, [r0, #0x03]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 0111: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r3, [r1]		/* r3 = ...0 */
-	ldr	ip, [r1, #0x01]		/* BE:ip = 1234  LE:ip = 4321 */
-	ldrh	r2, [r1, #0x05]		/* BE:r2 = ..56  LE:r2 = ..65 */
-	ldrb	r1, [r1, #0x07]		/* r1 = ...7 */
-	strb	r3, [r0]
-	mov	r3, ip, lsr #16		/* BE:r3 = ..12  LE:r3 = ..43 */
-#ifdef __ARMEB__
-	strh	r3, [r0, #0x01]
-	orr	r2, r2, ip, lsl #16	/* r2 = 3456 */
-#else
-	strh	ip, [r0, #0x01]
-	orr	r2, r3, r2, lsl #16	/* r2 = 6543 */
-#endif
-	str	r2, [r0, #0x03]
-	strb	r1, [r0, #0x07]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 1000: dst is 16-bit aligned, src is 32-bit aligned
- */
-	ldr	r2, [r1]		/* BE:r2 = 0123  LE:r2 = 3210 */
-	ldr	r3, [r1, #0x04]		/* BE:r3 = 4567  LE:r3 = 7654 */
-	mov	r1, r2, lsr #16		/* BE:r1 = ..01  LE:r1 = ..32 */
-#ifdef __ARMEB__
-	strh	r1, [r0]
-	mov	r1, r3, lsr #16		/* r1 = ..45 */
-	orr	r2, r1 ,r2, lsl #16	/* r2 = 2345 */
-#else
-	strh	r2, [r0]
-	orr	r2, r1, r3, lsl #16	/* r2 = 5432 */
-	mov	r3, r3, lsr #16		/* r3 = ..76 */
-#endif
-	str	r2, [r0, #0x02]
-	strh	r3, [r0, #0x06]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 1001: dst is 16-bit aligned, src is 8-bit aligned
- */
-	ldr	r2, [r1, #-1]		/* BE:r2 = x012  LE:r2 = 210x */
-	ldr	r3, [r1, #0x03]		/* BE:r3 = 3456  LE:r3 = 6543 */
-	ldrb	ip, [r1, #0x07]		/* ip = ...7 */
-	mov	r1, r2, lsr #8		/* BE:r1 = .x01  LE:r1 = .210 */
-	strh	r1, [r0]
-#ifdef __ARMEB__
-	mov	r1, r2, lsl #24		/* r1 = 2... */
-	orr	r1, r1, r3, lsr #8	/* r1 = 2345 */
-	orr	r3, ip, r3, lsl #8	/* r3 = 4567 */
-#else
-	mov	r1, r2, lsr #24		/* r1 = ...2 */
-	orr	r1, r1, r3, lsl #8	/* r1 = 5432 */
-	mov	r3, r3, lsr #24		/* r3 = ...6 */
-	orr	r3, r3, ip, lsl #8	/* r3 = ..76 */
-#endif
-	str	r1, [r0, #0x02]
-	strh	r3, [r0, #0x06]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 1010: dst is 16-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]
-	ldr	ip, [r1, #0x02]
-	ldrh	r3, [r1, #0x06]
-	strh	r2, [r0]
-	str	ip, [r0, #0x02]
-	strh	r3, [r0, #0x06]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 1011: dst is 16-bit aligned, src is 8-bit aligned
- */
-	ldr	r3, [r1, #0x05]		/* BE:r3 = 567x  LE:r3 = x765 */
-	ldr	r2, [r1, #0x01]		/* BE:r2 = 1234  LE:r2 = 4321 */
-	ldrb	ip, [r1]		/* ip = ...0 */
-	mov	r1, r3, lsr #8		/* BE:r1 = .567  LE:r1 = .x76 */
-	strh	r1, [r0, #0x06]
-#ifdef __ARMEB__
-	mov	r3, r3, lsr #24		/* r3 = ...5 */
-	orr	r3, r3, r2, lsl #8	/* r3 = 2345 */
-	mov	r2, r2, lsr #24		/* r2 = ...1 */
-	orr	r2, r2, ip, lsl #8	/* r2 = ..01 */
-#else
-	mov	r3, r3, lsl #24		/* r3 = 5... */
-	orr	r3, r3, r2, lsr #8	/* r3 = 5432 */
-	orr	r2, ip, r2, lsl #8	/* r2 = 3210 */
-#endif
-	str	r3, [r0, #0x02]
-	strh	r2, [r0]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 1100: dst is 8-bit aligned, src is 32-bit aligned
- */
-	ldr	r3, [r1, #0x04]		/* BE:r3 = 4567  LE:r3 = 7654 */
-	ldr	r2, [r1]		/* BE:r2 = 0123  LE:r2 = 3210 */
-	mov	r1, r3, lsr #8		/* BE:r1 = .456  LE:r1 = .765 */
-	strh	r1, [r0, #0x05]
-#ifdef __ARMEB__
-	strb	r3, [r0, #0x07]
-	mov	r1, r2, lsr #24		/* r1 = ...0 */
-	strb	r1, [r0]
-	mov	r2, r2, lsl #8		/* r2 = 123. */
-	orr	r2, r2, r3, lsr #24	/* r2 = 1234 */
-	str	r2, [r0, #0x01]
-#else
-	strb	r2, [r0]
-	mov	r1, r3, lsr #24		/* r1 = ...7 */
-	strb	r1, [r0, #0x07]
-	mov	r2, r2, lsr #8		/* r2 = .321 */
-	orr	r2, r2, r3, lsl #24	/* r2 = 4321 */
-	str	r2, [r0, #0x01]
-#endif
-	bx	 lr
-	LMEMCPY_8_PAD
-
-/*
- * 1101: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r3, [r1]		/* r3 = ...0 */
-	ldrh	r2, [r1, #0x01]		/* BE:r2 = ..12  LE:r2 = ..21 */
-	ldr	ip, [r1, #0x03]		/* BE:ip = 3456  LE:ip = 6543 */
-	ldrb	r1, [r1, #0x07]		/* r1 = ...7 */
-	strb	r3, [r0]
-	mov	r3, ip, lsr #16		/* BE:r3 = ..34  LE:r3 = ..65 */
-#ifdef __ARMEB__
-	strh	ip, [r0, #0x05]
-	orr	r2, r3, r2, lsl #16	/* r2 = 1234 */
-#else
-	strh	r3, [r0, #0x05]
-	orr	r2, r2, ip, lsl #16	/* r2 = 4321 */
-#endif
-	str	r2, [r0, #0x01]
-	strb	r1, [r0, #0x07]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 1110: dst is 8-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	ldr	r3, [r1, #0x02]		/* BE:r3 = 2345  LE:r3 = 5432 */
-	ldrh	r1, [r1, #0x06]		/* BE:r1 = ..67  LE:r1 = ..76 */
-#ifdef __ARMEB__
-	mov	ip, r2, lsr #8		/* ip = ...0 */
-	strb	ip, [r0]
-	mov	ip, r2, lsl #24		/* ip = 1... */
-	orr	ip, ip, r3, lsr #8	/* ip = 1234 */
-	strb	r1, [r0, #0x07]
-	mov	r1, r1, lsr #8		/* r1 = ...6 */
-	orr	r1, r1, r3, lsl #8	/* r1 = 3456 */
-#else
-	strb	r2, [r0]
-	mov	ip, r2, lsr #8		/* ip = ...1 */
-	orr	ip, ip, r3, lsl #8	/* ip = 4321 */
-	mov	r2, r1, lsr #8		/* r2 = ...7 */
-	strb	r2, [r0, #0x07]
-	mov	r1, r1, lsl #8		/* r1 = .76. */
-	orr	r1, r1, r3, lsr #24	/* r1 = .765 */
-#endif
-	str	ip, [r0, #0x01]
-	strh	r1, [r0, #0x05]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/*
- * 1111: dst is 8-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]
-	ldr	ip, [r1, #0x01]
-	ldrh	r3, [r1, #0x05]
-	ldrb	r1, [r1, #0x07]
-	strb	r2, [r0]
-	str	ip, [r0, #0x01]
-	strh	r3, [r0, #0x05]
-	strb	r1, [r0, #0x07]
-	bx	lr
-	LMEMCPY_8_PAD
-
-/******************************************************************************
- * Special case for 12 byte copies
- */
-#define	LMEMCPY_C_LOG2	7	/* 128 bytes */
-#define	LMEMCPY_C_PAD	.align LMEMCPY_C_LOG2
-	LMEMCPY_C_PAD
-.Lmemcpy_c:
-	and	r2, r1, #0x03
-	orr	r2, r2, r0, lsl #2
-	ands	r2, r2, #0x0f
-	sub	r3, pc, #0x14
-	addne	pc, r3, r2, lsl #LMEMCPY_C_LOG2
-
-/*
- * 0000: dst is 32-bit aligned, src is 32-bit aligned
- */
-	ldr	r2, [r1]
-	ldr	r3, [r1, #0x04]
-	ldr	r1, [r1, #0x08]
-	str	r2, [r0]
-	str	r3, [r0, #0x04]
-	str	r1, [r0, #0x08]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 0001: dst is 32-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1, #0xb]		/* r2 = ...B */
-	ldr	ip, [r1, #0x07]		/* BE:ip = 789A  LE:ip = A987 */
-	ldr	r3, [r1, #0x03]		/* BE:r3 = 3456  LE:r3 = 6543 */
-	ldr	r1, [r1, #-1]		/* BE:r1 = x012  LE:r1 = 210x */
-#ifdef __ARMEB__
-	orr	r2, r2, ip, lsl #8	/* r2 = 89AB */
-	str	r2, [r0, #0x08]
-	mov	r2, ip, lsr #24		/* r2 = ...7 */
-	orr	r2, r2, r3, lsl #8	/* r2 = 4567 */
-	mov	r1, r1, lsl #8		/* r1 = 012. */
-	orr	r1, r1, r3, lsr #24	/* r1 = 0123 */
-#else
-	mov	r2, r2, lsl #24		/* r2 = B... */
-	orr	r2, r2, ip, lsr #8	/* r2 = BA98 */
-	str	r2, [r0, #0x08]
-	mov	r2, ip, lsl #24		/* r2 = 7... */
-	orr	r2, r2, r3, lsr #8	/* r2 = 7654 */
-	mov	r1, r1, lsr #8		/* r1 = .210 */
-	orr	r1, r1, r3, lsl #24	/* r1 = 3210 */
-#endif
-	str	r2, [r0, #0x04]
-	str	r1, [r0]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 0010: dst is 32-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	ldr	r3, [r1, #0x02]		/* BE:r3 = 2345  LE:r3 = 5432 */
-	ldr	ip, [r1, #0x06]		/* BE:ip = 6789  LE:ip = 9876 */
-	ldrh	r1, [r1, #0x0a]		/* BE:r1 = ..AB  LE:r1 = ..BA */
-#ifdef __ARMEB__
-	mov	r2, r2, lsl #16		/* r2 = 01.. */
-	orr	r2, r2, r3, lsr #16	/* r2 = 0123 */
-	str	r2, [r0]
-	mov	r3, r3, lsl #16		/* r3 = 45.. */
-	orr	r3, r3, ip, lsr #16	/* r3 = 4567 */
-	orr	r1, r1, ip, lsl #16	/* r1 = 89AB */
-#else
-	orr	r2, r2, r3, lsl #16	/* r2 = 3210 */
-	str	r2, [r0]
-	mov	r3, r3, lsr #16		/* r3 = ..54 */
-	orr	r3, r3, ip, lsl #16	/* r3 = 7654 */
-	mov	r1, r1, lsl #16		/* r1 = BA.. */
-	orr	r1, r1, ip, lsr #16	/* r1 = BA98 */
-#endif
-	str	r3, [r0, #0x04]
-	str	r1, [r0, #0x08]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 0011: dst is 32-bit aligned, src is 8-bit aligned
- */
-	ldrb	r2, [r1]		/* r2 = ...0 */
-	ldr	r3, [r1, #0x01]		/* BE:r3 = 1234  LE:r3 = 4321 */
-	ldr	ip, [r1, #0x05]		/* BE:ip = 5678  LE:ip = 8765 */
-	ldr	r1, [r1, #0x09]		/* BE:r1 = 9ABx  LE:r1 = xBA9 */
-#ifdef __ARMEB__
-	mov	r2, r2, lsl #24		/* r2 = 0... */
-	orr	r2, r2, r3, lsr #8	/* r2 = 0123 */
-	str	r2, [r0]
-	mov	r3, r3, lsl #24		/* r3 = 4... */
-	orr	r3, r3, ip, lsr #8	/* r3 = 4567 */
-	mov	r1, r1, lsr #8		/* r1 = .9AB */
-	orr	r1, r1, ip, lsl #24	/* r1 = 89AB */
-#else
-	orr	r2, r2, r3, lsl #8	/* r2 = 3210 */
-	str	r2, [r0]
-	mov	r3, r3, lsr #24		/* r3 = ...4 */
-	orr	r3, r3, ip, lsl #8	/* r3 = 7654 */
-	mov	r1, r1, lsl #8		/* r1 = BA9. */
-	orr	r1, r1, ip, lsr #24	/* r1 = BA98 */
-#endif
-	str	r3, [r0, #0x04]
-	str	r1, [r0, #0x08]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 0100: dst is 8-bit aligned (byte 1), src is 32-bit aligned
- */
-	ldr	r2, [r1]		/* BE:r2 = 0123  LE:r2 = 3210 */
-	ldr	r3, [r1, #0x04]		/* BE:r3 = 4567  LE:r3 = 7654 */
-	ldr	ip, [r1, #0x08]		/* BE:ip = 89AB  LE:ip = BA98 */
-	mov	r1, r2, lsr #8		/* BE:r1 = .012  LE:r1 = .321 */
-	strh	r1, [r0, #0x01]
-#ifdef __ARMEB__
-	mov	r1, r2, lsr #24		/* r1 = ...0 */
-	strb	r1, [r0]
-	mov	r1, r2, lsl #24		/* r1 = 3... */
-	orr	r2, r1, r3, lsr #8	/* r1 = 3456 */
-	mov	r1, r3, lsl #24		/* r1 = 7... */
-	orr	r1, r1, ip, lsr #8	/* r1 = 789A */
-#else
-	strb	r2, [r0]
-	mov	r1, r2, lsr #24		/* r1 = ...3 */
-	orr	r2, r1, r3, lsl #8	/* r1 = 6543 */
-	mov	r1, r3, lsr #24		/* r1 = ...7 */
-	orr	r1, r1, ip, lsl #8	/* r1 = A987 */
-	mov	ip, ip, lsr #24		/* ip = ...B */
-#endif
-	str	r2, [r0, #0x03]
-	str	r1, [r0, #0x07]
-	strb	ip, [r0, #0x0b]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 0101: dst is 8-bit aligned (byte 1), src is 8-bit aligned (byte 1)
- */
-	ldrb	r2, [r1]
-	ldrh	r3, [r1, #0x01]
-	ldr	ip, [r1, #0x03]
-	strb	r2, [r0]
-	ldr	r2, [r1, #0x07]
-	ldrb	r1, [r1, #0x0b]
-	strh	r3, [r0, #0x01]
-	str	ip, [r0, #0x03]
-	str	r2, [r0, #0x07]
-	strb	r1, [r0, #0x0b]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 0110: dst is 8-bit aligned (byte 1), src is 16-bit aligned
- */
-	ldrh	r2, [r1]		/* BE:r2 = ..01  LE:r2 = ..10 */
-	ldr	r3, [r1, #0x02]		/* BE:r3 = 2345  LE:r3 = 5432 */
-	ldr	ip, [r1, #0x06]		/* BE:ip = 6789  LE:ip = 9876 */
-	ldrh	r1, [r1, #0x0a]		/* BE:r1 = ..AB  LE:r1 = ..BA */
-#ifdef __ARMEB__
-	mov	r2, r2, ror #8		/* r2 = 1..0 */
-	strb	r2, [r0]
-	mov	r2, r2, lsr #16		/* r2 = ..1. */
-	orr	r2, r2, r3, lsr #24	/* r2 = ..12 */
-	strh	r2, [r0, #0x01]
-	mov	r2, r3, lsl #8		/* r2 = 345. */
-	orr	r3, r2, ip, lsr #24	/* r3 = 3456 */
-	mov	r2, ip, lsl #8		/* r2 = 789. */
-	orr	r2, r2, r1, lsr #8	/* r2 = 789A */
-#else
-	strb	r2, [r0]
-	mov	r2, r2, lsr #8		/* r2 = ...1 */
-	orr	r2, r2, r3, lsl #8	/* r2 = 4321 */
-	strh	r2, [r0, #0x01]
-	mov	r2, r3, lsr #8		/* r2 = .543 */
-	orr	r3, r2, ip, lsl #24	/* r3 = 6543 */
-	mov	r2, ip, lsr #8		/* r2 = .987 */
-	orr	r2, r2, r1, lsl #24	/* r2 = A987 */
-	mov	r1, r1, lsr #8		/* r1 = ...B */
-#endif
-	str	r3, [r0, #0x03]
-	str	r2, [r0, #0x07]
-	strb	r1, [r0, #0x0b]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 0111: dst is 8-bit aligned (byte 1), src is 8-bit aligned (byte 3)
- */
-	ldrb	r2, [r1]
-	ldr	r3, [r1, #0x01]		/* BE:r3 = 1234  LE:r3 = 4321 */
-	ldr	ip, [r1, #0x05]		/* BE:ip = 5678  LE:ip = 8765 */
-	ldr	r1, [r1, #0x09]		/* BE:r1 = 9ABx  LE:r1 = xBA9 */
-	strb	r2, [r0]
-#ifdef __ARMEB__
-	mov	r2, r3, lsr #16		/* r2 = ..12 */
-	strh	r2, [r0, #0x01]
-	mov	r3, r3, lsl #16		/* r3 = 34.. */
-	orr	r3, r3, ip, lsr #16	/* r3 = 3456 */
-	mov	ip, ip, lsl #16		/* ip = 78.. */
-	orr	ip, ip, r1, lsr #16	/* ip = 789A */
-	mov	r1, r1, lsr #8		/* r1 = .9AB */
-#else
-	strh	r3, [r0, #0x01]
-	mov	r3, r3, lsr #16		/* r3 = ..43 */
-	orr	r3, r3, ip, lsl #16	/* r3 = 6543 */
-	mov	ip, ip, lsr #16		/* ip = ..87 */
-	orr	ip, ip, r1, lsl #16	/* ip = A987 */
-	mov	r1, r1, lsr #16		/* r1 = ..xB */
-#endif
-	str	r3, [r0, #0x03]
-	str	ip, [r0, #0x07]
-	strb	r1, [r0, #0x0b]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 1000: dst is 16-bit aligned, src is 32-bit aligned
- */
-	ldr	ip, [r1]		/* BE:ip = 0123  LE:ip = 3210 */
-	ldr	r3, [r1, #0x04]		/* BE:r3 = 4567  LE:r3 = 7654 */
-	ldr	r2, [r1, #0x08]		/* BE:r2 = 89AB  LE:r2 = BA98 */
-	mov	r1, ip, lsr #16		/* BE:r1 = ..01  LE:r1 = ..32 */
-#ifdef __ARMEB__
-	strh	r1, [r0]
-	mov	r1, ip, lsl #16		/* r1 = 23.. */
-	orr	r1, r1, r3, lsr #16	/* r1 = 2345 */
-	mov	r3, r3, lsl #16		/* r3 = 67.. */
-	orr	r3, r3, r2, lsr #16	/* r3 = 6789 */
-#else
-	strh	ip, [r0]
-	orr	r1, r1, r3, lsl #16	/* r1 = 5432 */
-	mov	r3, r3, lsr #16		/* r3 = ..76 */
-	orr	r3, r3, r2, lsl #16	/* r3 = 9876 */
-	mov	r2, r2, lsr #16		/* r2 = ..BA */
-#endif
-	str	r1, [r0, #0x02]
-	str	r3, [r0, #0x06]
-	strh	r2, [r0, #0x0a]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 1001: dst is 16-bit aligned, src is 8-bit aligned (byte 1)
- */
-	ldr	r2, [r1, #-1]		/* BE:r2 = x012  LE:r2 = 210x */
-	ldr	r3, [r1, #0x03]		/* BE:r3 = 3456  LE:r3 = 6543 */
-	mov	ip, r2, lsr #8		/* BE:ip = .x01  LE:ip = .210 */
-	strh	ip, [r0]
-	ldr	ip, [r1, #0x07]		/* BE:ip = 789A  LE:ip = A987 */
-	ldrb	r1, [r1, #0x0b]		/* r1 = ...B */
-#ifdef __ARMEB__
-	mov	r2, r2, lsl #24		/* r2 = 2... */
-	orr	r2, r2, r3, lsr #8	/* r2 = 2345 */
-	mov	r3, r3, lsl #24		/* r3 = 6... */
-	orr	r3, r3, ip, lsr #8	/* r3 = 6789 */
-	orr	r1, r1, ip, lsl #8	/* r1 = 89AB */
-#else
-	mov	r2, r2, lsr #24		/* r2 = ...2 */
-	orr	r2, r2, r3, lsl #8	/* r2 = 5432 */
-	mov	r3, r3, lsr #24		/* r3 = ...6 */
-	orr	r3, r3, ip, lsl #8	/* r3 = 9876 */
-	mov	r1, r1, lsl #8		/* r1 = ..B. */
-	orr	r1, r1, ip, lsr #24	/* r1 = ..BA */
-#endif
-	str	r2, [r0, #0x02]
-	str	r3, [r0, #0x06]
-	strh	r1, [r0, #0x0a]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 1010: dst is 16-bit aligned, src is 16-bit aligned
- */
-	ldrh	r2, [r1]
-	ldr	r3, [r1, #0x02]
-	ldr	ip, [r1, #0x06]
-	ldrh	r1, [r1, #0x0a]
-	strh	r2, [r0]
-	str	r3, [r0, #0x02]
-	str	ip, [r0, #0x06]
-	strh	r1, [r0, #0x0a]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 1011: dst is 16-bit aligned, src is 8-bit aligned (byte 3)
- */
-	ldr	r2, [r1, #0x09]		/* BE:r2 = 9ABx  LE:r2 = xBA9 */
-	ldr	r3, [r1, #0x05]		/* BE:r3 = 5678  LE:r3 = 8765 */
-	mov	ip, r2, lsr #8		/* BE:ip = .9AB  LE:ip = .xBA */
-	strh	ip, [r0, #0x0a]
-	ldr	ip, [r1, #0x01]		/* BE:ip = 1234  LE:ip = 4321 */
-	ldrb	r1, [r1]		/* r1 = ...0 */
-#ifdef __ARMEB__
-	mov	r2, r2, lsr #24		/* r2 = ...9 */
-	orr	r2, r2, r3, lsl #8	/* r2 = 6789 */
-	mov	r3, r3, lsr #24		/* r3 = ...5 */
-	orr	r3, r3, ip, lsl #8	/* r3 = 2345 */
-	mov	r1, r1, lsl #8		/* r1 = ..0. */
-	orr	r1, r1, ip, lsr #24	/* r1 = ..01 */
-#else
-	mov	r2, r2, lsl #24		/* r2 = 9... */
-	orr	r2, r2, r3, lsr #8	/* r2 = 9876 */
-	mov	r3, r3, lsl #24		/* r3 = 5... */
-	orr	r3, r3, ip, lsr #8	/* r3 = 5432 */
-	orr	r1, r1, ip, lsl #8	/* r1 = 3210 */
-#endif
-	str	r2, [r0, #0x06]
-	str	r3, [r0, #0x02]
-	strh	r1, [r0]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 1100: dst is 8-bit aligned (byte 3), src is 32-bit aligned
- */
-	ldr	r2, [r1]		/* BE:r2 = 0123  LE:r2 = 3210 */
-	ldr	ip, [r1, #0x04]		/* BE:ip = 4567  LE:ip = 7654 */
-	ldr	r1, [r1, #0x08]		/* BE:r1 = 89AB  LE:r1 = BA98 */
-#ifdef __ARMEB__
-	mov	r3, r2, lsr #24		/* r3 = ...0 */
-	strb	r3, [r0]
-	mov	r2, r2, lsl #8		/* r2 = 123. */
-	orr	r2, r2, ip, lsr #24	/* r2 = 1234 */
-	str	r2, [r0, #0x01]
-	mov	r2, ip, lsl #8		/* r2 = 567. */
-	orr	r2, r2, r1, lsr #24	/* r2 = 5678 */
-	str	r2, [r0, #0x05]
-	mov	r2, r1, lsr #8		/* r2 = ..9A */
-	strh	r2, [r0, #0x09]
-	strb	r1, [r0, #0x0b]
-#else
-	strb	r2, [r0]
-	mov	r3, r2, lsr #8		/* r3 = .321 */
-	orr	r3, r3, ip, lsl #24	/* r3 = 4321 */
-	str	r3, [r0, #0x01]
-	mov	r3, ip, lsr #8		/* r3 = .765 */
-	orr	r3, r3, r1, lsl #24	/* r3 = 8765 */
-	str	r3, [r0, #0x05]
-	mov	r1, r1, lsr #8		/* r1 = .BA9 */
-	strh	r1, [r0, #0x09]
-	mov	r1, r1, lsr #16		/* r1 = ...B */
-	strb	r1, [r0, #0x0b]
-#endif
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 1101: dst is 8-bit aligned (byte 3), src is 8-bit aligned (byte 1)
- */
-	ldrb	r2, [r1, #0x0b]		/* r2 = ...B */
-	ldr	r3, [r1, #0x07]		/* BE:r3 = 789A  LE:r3 = A987 */
-	ldr	ip, [r1, #0x03]		/* BE:ip = 3456  LE:ip = 6543 */
-	ldr	r1, [r1, #-1]		/* BE:r1 = x012  LE:r1 = 210x */
-	strb	r2, [r0, #0x0b]
-#ifdef __ARMEB__
-	strh	r3, [r0, #0x09]
-	mov	r3, r3, lsr #16		/* r3 = ..78 */
-	orr	r3, r3, ip, lsl #16	/* r3 = 5678 */
-	mov	ip, ip, lsr #16		/* ip = ..34 */
-	orr	ip, ip, r1, lsl #16	/* ip = 1234 */
-	mov	r1, r1, lsr #16		/* r1 = ..x0 */
-#else
-	mov	r2, r3, lsr #16		/* r2 = ..A9 */
-	strh	r2, [r0, #0x09]
-	mov	r3, r3, lsl #16		/* r3 = 87.. */
-	orr	r3, r3, ip, lsr #16	/* r3 = 8765 */
-	mov	ip, ip, lsl #16		/* ip = 43.. */
-	orr	ip, ip, r1, lsr #16	/* ip = 4321 */
-	mov	r1, r1, lsr #8		/* r1 = .210 */
-#endif
-	str	r3, [r0, #0x05]
-	str	ip, [r0, #0x01]
-	strb	r1, [r0]
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 1110: dst is 8-bit aligned (byte 3), src is 16-bit aligned
- */
-#ifdef __ARMEB__
-	ldrh	r2, [r1, #0x0a]		/* r2 = ..AB */
-	ldr	ip, [r1, #0x06]		/* ip = 6789 */
-	ldr	r3, [r1, #0x02]		/* r3 = 2345 */
-	ldrh	r1, [r1]		/* r1 = ..01 */
-	strb	r2, [r0, #0x0b]
-	mov	r2, r2, lsr #8		/* r2 = ...A */
-	orr	r2, r2, ip, lsl #8	/* r2 = 789A */
-	mov	ip, ip, lsr #8		/* ip = .678 */
-	orr	ip, ip, r3, lsl #24	/* ip = 5678 */
-	mov	r3, r3, lsr #8		/* r3 = .234 */
-	orr	r3, r3, r1, lsl #24	/* r3 = 1234 */
-	mov	r1, r1, lsr #8		/* r1 = ...0 */
-	strb	r1, [r0]
-	str	r3, [r0, #0x01]
-	str	ip, [r0, #0x05]
-	strh	r2, [r0, #0x09]
-#else
-	ldrh	r2, [r1]		/* r2 = ..10 */
-	ldr	r3, [r1, #0x02]		/* r3 = 5432 */
-	ldr	ip, [r1, #0x06]		/* ip = 9876 */
-	ldrh	r1, [r1, #0x0a]		/* r1 = ..BA */
-	strb	r2, [r0]
-	mov	r2, r2, lsr #8		/* r2 = ...1 */
-	orr	r2, r2, r3, lsl #8	/* r2 = 4321 */
-	mov	r3, r3, lsr #24		/* r3 = ...5 */
-	orr	r3, r3, ip, lsl #8	/* r3 = 8765 */
-	mov	ip, ip, lsr #24		/* ip = ...9 */
-	orr	ip, ip, r1, lsl #8	/* ip = .BA9 */
-	mov	r1, r1, lsr #8		/* r1 = ...B */
-	str	r2, [r0, #0x01]
-	str	r3, [r0, #0x05]
-	strh	ip, [r0, #0x09]
-	strb	r1, [r0, #0x0b]
-#endif
-	bx	lr
-	LMEMCPY_C_PAD
-
-/*
- * 1111: dst is 8-bit aligned (byte 3), src is 8-bit aligned (byte 3)
- */
-	ldrb	r2, [r1]
-	ldr	r3, [r1, #0x01]
-	ldr	ip, [r1, #0x05]
-	strb	r2, [r0]
-	ldrh	r2, [r1, #0x09]
-	ldrb	r1, [r1, #0x0b]
-	str	r3, [r0, #0x01]
-	str	ip, [r0, #0x05]
-	strh	r2, [r0, #0x09]
-	strb	r1, [r0, #0x0b]
-	bx	lr
-#endif	/* !_STANDALONE */
-END(memcpy)
diff --git a/lib/libc_bsd/arm/string/memmove.S b/lib/libc_bsd/arm/string/memmove.S
deleted file mode 100644
index 10c3266..0000000
--- a/lib/libc_bsd/arm/string/memmove.S
+++ /dev/null
@@ -1,589 +0,0 @@
-/*	$NetBSD: memmove.S,v 1.4 2003/10/14 07:51:45 scw Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and Mark Brinicombe
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/memmove.S 275767 2014-12-14 16:28:53Z andrew $");
-
-.syntax	unified
-
-#ifndef _BCOPY
-/* LINTSTUB: Func: void *memmove(void *, const void *, size_t) */
-ENTRY(memmove)
-#else
-/* bcopy = memcpy/memmove with arguments reversed. */
-/* LINTSTUB: Func: void bcopy(void *, void *, size_t) */
-ENTRY(bcopy)
-	/* switch the source and destination registers */
-	eor     r0, r1, r0 
-	eor     r1, r0, r1 
-	eor     r0, r1, r0 
-#endif
-	/* Do the buffers overlap? */
-	cmp	r0, r1
-	RETeq		/* Bail now if src/dst are the same */
-	subcc	r3, r0, r1	/* if (dst > src) r3 = dst - src */
-	subcs	r3, r1, r0	/* if (src > dsr) r3 = src - dst */
-	cmp	r3, r2		/* if (r3 < len) we have an overlap */
-	bcc	PIC_SYM(_C_LABEL(memcpy), PLT)
-
-	/* Determine copy direction */
-	cmp	r1, r0
-	bcc	.Lmemmove_backwards
-
-	moveq	r0, #0			/* Quick abort for len=0 */
-	RETeq
-
-	stmdb	sp!, {r0, lr}		/* memmove() returns dest addr */
-	subs	r2, r2, #4
-	blt	.Lmemmove_fl4		/* less than 4 bytes */
-	ands	r12, r0, #3
-	bne	.Lmemmove_fdestul	/* oh unaligned destination addr */
-	ands	r12, r1, #3
-	bne	.Lmemmove_fsrcul		/* oh unaligned source addr */
-
-.Lmemmove_ft8:
-	/* We have aligned source and destination */
-	subs	r2, r2, #8
-	blt	.Lmemmove_fl12		/* less than 12 bytes (4 from above) */
-	subs	r2, r2, #0x14         
-	blt	.Lmemmove_fl32		/* less than 32 bytes (12 from above) */
-	stmdb	sp!, {r4}		/* borrow r4 */
-
-	/* blat 32 bytes at a time */
-	/* XXX for really big copies perhaps we should use more registers */
-.Lmemmove_floop32:	
-	ldmia	r1!, {r3, r4, r12, lr}
-	stmia	r0!, {r3, r4, r12, lr}
-	ldmia	r1!, {r3, r4, r12, lr}
-	stmia	r0!, {r3, r4, r12, lr}
-	subs	r2, r2, #0x20         
-	bge	.Lmemmove_floop32
-
-	cmn	r2, #0x10
-	ldmiage	r1!, {r3, r4, r12, lr}	/* blat a remaining 16 bytes */
-	stmiage	r0!, {r3, r4, r12, lr}
-	subge	r2, r2, #0x10         
-	ldmia	sp!, {r4}		/* return r4 */
-
-.Lmemmove_fl32:
-	adds	r2, r2, #0x14         
-
-	/* blat 12 bytes at a time */
-.Lmemmove_floop12:
-	ldmiage	r1!, {r3, r12, lr}
-	stmiage	r0!, {r3, r12, lr}
-	subsge	r2, r2, #0x0c         
-	bge	.Lmemmove_floop12
-
-.Lmemmove_fl12:
-	adds	r2, r2, #8
-	blt	.Lmemmove_fl4
-
-	subs	r2, r2, #4
-	ldrlt	r3, [r1], #4
-	strlt	r3, [r0], #4
-	ldmiage	r1!, {r3, r12}
-	stmiage	r0!, {r3, r12}
-	subge	r2, r2, #4
-
-.Lmemmove_fl4:
-	/* less than 4 bytes to go */
-	adds	r2, r2, #4
-	ldmiaeq	sp!, {r0, pc}		/* done */
-
-	/* copy the crud byte at a time */
-	cmp	r2, #2
-	ldrb	r3, [r1], #1
-	strb	r3, [r0], #1
-	ldrbge	r3, [r1], #1
-	strbge	r3, [r0], #1
-	ldrbgt	r3, [r1], #1
-	strbgt	r3, [r0], #1
-	ldmia	sp!, {r0, pc}
-
-	/* erg - unaligned destination */
-.Lmemmove_fdestul:
-	rsb	r12, r12, #4
-	cmp	r12, #2
-
-	/* align destination with byte copies */
-	ldrb	r3, [r1], #1
-	strb	r3, [r0], #1
-	ldrbge	r3, [r1], #1
-	strbge	r3, [r0], #1
-	ldrbgt	r3, [r1], #1
-	strbgt	r3, [r0], #1
-	subs	r2, r2, r12
-	blt	.Lmemmove_fl4		/* less the 4 bytes */
-
-	ands	r12, r1, #3
-	beq	.Lmemmove_ft8		/* we have an aligned source */
-
-	/* erg - unaligned source */
-	/* This is where it gets nasty ... */
-.Lmemmove_fsrcul:
-	bic	r1, r1, #3
-	ldr	lr, [r1], #4
-	cmp	r12, #2
-	bgt	.Lmemmove_fsrcul3
-	beq	.Lmemmove_fsrcul2
-	cmp	r2, #0x0c            
-	blt	.Lmemmove_fsrcul1loop4
-	sub	r2, r2, #0x0c         
-	stmdb	sp!, {r4, r5}
-
-.Lmemmove_fsrcul1loop16:
-#ifdef __ARMEB__
-	mov	r3, lr, lsl #8
-#else
-	mov	r3, lr, lsr #8
-#endif
-	ldmia	r1!, {r4, r5, r12, lr}
-#ifdef __ARMEB__
-	orr	r3, r3, r4, lsr #24
-	mov	r4, r4, lsl #8
-	orr	r4, r4, r5, lsr #24
-	mov	r5, r5, lsl #8
-	orr	r5, r5, r12, lsr #24
-	mov	r12, r12, lsl #8
-	orr	r12, r12, lr, lsr #24
-#else
-	orr	r3, r3, r4, lsl #24
-	mov	r4, r4, lsr #8
-	orr	r4, r4, r5, lsl #24
-	mov	r5, r5, lsr #8
-	orr	r5, r5, r12, lsl #24
-	mov	r12, r12, lsr #8
-	orr	r12, r12, lr, lsl #24
-#endif
-	stmia	r0!, {r3-r5, r12}
-	subs	r2, r2, #0x10         
-	bge	.Lmemmove_fsrcul1loop16
-	ldmia	sp!, {r4, r5}
-	adds	r2, r2, #0x0c         
-	blt	.Lmemmove_fsrcul1l4
-
-.Lmemmove_fsrcul1loop4:
-#ifdef __ARMEB__
-	mov	r12, lr, lsl #8
-#else
-	mov	r12, lr, lsr #8
-#endif
-	ldr	lr, [r1], #4
-#ifdef __ARMEB__
-	orr	r12, r12, lr, lsr #24
-#else
-	orr	r12, r12, lr, lsl #24
-#endif
-	str	r12, [r0], #4
-	subs	r2, r2, #4
-	bge	.Lmemmove_fsrcul1loop4
-
-.Lmemmove_fsrcul1l4:
-	sub	r1, r1, #3
-	b	.Lmemmove_fl4
-
-.Lmemmove_fsrcul2:
-	cmp	r2, #0x0c            
-	blt	.Lmemmove_fsrcul2loop4
-	sub	r2, r2, #0x0c         
-	stmdb	sp!, {r4, r5}
-
-.Lmemmove_fsrcul2loop16:
-#ifdef __ARMEB__
-	mov	r3, lr, lsl #16
-#else
-	mov	r3, lr, lsr #16
-#endif
-	ldmia	r1!, {r4, r5, r12, lr}
-#ifdef __ARMEB__
-	orr	r3, r3, r4, lsr #16
-	mov	r4, r4, lsl #16
-	orr	r4, r4, r5, lsr #16
-	mov	r5, r5, lsl #16
-	orr	r5, r5, r12, lsr #16
-	mov	r12, r12, lsl #16
-	orr	r12, r12, lr, lsr #16
-#else
-	orr	r3, r3, r4, lsl #16
-	mov	r4, r4, lsr #16
-	orr	r4, r4, r5, lsl #16
-	mov	r5, r5, lsr #16
-	orr	r5, r5, r12, lsl #16
-	mov	r12, r12, lsr #16
-	orr	r12, r12, lr, lsl #16
-#endif
-	stmia	r0!, {r3-r5, r12}
-	subs	r2, r2, #0x10         
-	bge	.Lmemmove_fsrcul2loop16
-	ldmia	sp!, {r4, r5}
-	adds	r2, r2, #0x0c         
-	blt	.Lmemmove_fsrcul2l4
-
-.Lmemmove_fsrcul2loop4:
-#ifdef __ARMEB__
-	mov	r12, lr, lsl #16
-#else
-	mov	r12, lr, lsr #16
-#endif
-	ldr	lr, [r1], #4
-#ifdef __ARMEB__
-	orr	r12, r12, lr, lsr #16
-#else
-	orr	r12, r12, lr, lsl #16
-#endif
-	str	r12, [r0], #4
-	subs	r2, r2, #4
-	bge	.Lmemmove_fsrcul2loop4
-
-.Lmemmove_fsrcul2l4:
-	sub	r1, r1, #2
-	b	.Lmemmove_fl4
-
-.Lmemmove_fsrcul3:
-	cmp	r2, #0x0c            
-	blt	.Lmemmove_fsrcul3loop4
-	sub	r2, r2, #0x0c         
-	stmdb	sp!, {r4, r5}
-
-.Lmemmove_fsrcul3loop16:
-#ifdef __ARMEB__
-	mov	r3, lr, lsl #24
-#else
-	mov	r3, lr, lsr #24
-#endif
-	ldmia	r1!, {r4, r5, r12, lr}
-#ifdef __ARMEB__
-	orr	r3, r3, r4, lsr #8
-	mov	r4, r4, lsl #24
-	orr	r4, r4, r5, lsr #8
-	mov	r5, r5, lsl #24
-	orr	r5, r5, r12, lsr #8
-	mov	r12, r12, lsl #24
-	orr	r12, r12, lr, lsr #8
-#else
-	orr	r3, r3, r4, lsl #8
-	mov	r4, r4, lsr #24
-	orr	r4, r4, r5, lsl #8
-	mov	r5, r5, lsr #24
-	orr	r5, r5, r12, lsl #8
-	mov	r12, r12, lsr #24
-	orr	r12, r12, lr, lsl #8
-#endif
-	stmia	r0!, {r3-r5, r12}
-	subs	r2, r2, #0x10         
-	bge	.Lmemmove_fsrcul3loop16
-	ldmia	sp!, {r4, r5}
-	adds	r2, r2, #0x0c         
-	blt	.Lmemmove_fsrcul3l4
-
-.Lmemmove_fsrcul3loop4:
-#ifdef __ARMEB__
-	mov	r12, lr, lsl #24
-#else
-	mov	r12, lr, lsr #24
-#endif
-	ldr	lr, [r1], #4
-#ifdef __ARMEB__
-	orr	r12, r12, lr, lsr #8
-#else
-	orr	r12, r12, lr, lsl #8
-#endif
-	str	r12, [r0], #4
-	subs	r2, r2, #4
-	bge	.Lmemmove_fsrcul3loop4
-
-.Lmemmove_fsrcul3l4:
-	sub	r1, r1, #1
-	b	.Lmemmove_fl4
-
-.Lmemmove_backwards:
-	add	r1, r1, r2
-	add	r0, r0, r2
-	subs	r2, r2, #4
-	blt	.Lmemmove_bl4		/* less than 4 bytes */
-	ands	r12, r0, #3
-	bne	.Lmemmove_bdestul	/* oh unaligned destination addr */
-	ands	r12, r1, #3
-	bne	.Lmemmove_bsrcul		/* oh unaligned source addr */
-
-.Lmemmove_bt8:
-	/* We have aligned source and destination */
-	subs	r2, r2, #8
-	blt	.Lmemmove_bl12		/* less than 12 bytes (4 from above) */
-	stmdb	sp!, {r4, lr}
-	subs	r2, r2, #0x14		/* less than 32 bytes (12 from above) */
-	blt	.Lmemmove_bl32
-
-	/* blat 32 bytes at a time */
-	/* XXX for really big copies perhaps we should use more registers */
-.Lmemmove_bloop32:
-	ldmdb	r1!, {r3, r4, r12, lr}
-	stmdb	r0!, {r3, r4, r12, lr}
-	ldmdb	r1!, {r3, r4, r12, lr}
-	stmdb	r0!, {r3, r4, r12, lr}
-	subs	r2, r2, #0x20         
-	bge	.Lmemmove_bloop32
-
-.Lmemmove_bl32:
-	cmn	r2, #0x10            
-	ldmdbge	r1!, {r3, r4, r12, lr}	/* blat a remaining 16 bytes */
-	stmdbge	r0!, {r3, r4, r12, lr}
-	subge	r2, r2, #0x10         
-	adds	r2, r2, #0x14         
-	ldmdbge	r1!, {r3, r12, lr}	/* blat a remaining 12 bytes */
-	stmdbge	r0!, {r3, r12, lr}
-	subge	r2, r2, #0x0c         
-	ldmia	sp!, {r4, lr}
-
-.Lmemmove_bl12:
-	adds	r2, r2, #8
-	blt	.Lmemmove_bl4
-	subs	r2, r2, #4
-	ldrlt	r3, [r1, #-4]!
-	strlt	r3, [r0, #-4]!
-	ldmdbge	r1!, {r3, r12}
-	stmdbge	r0!, {r3, r12}
-	subge	r2, r2, #4
-
-.Lmemmove_bl4:
-	/* less than 4 bytes to go */
-	adds	r2, r2, #4
-	RETeq			/* done */
-
-	/* copy the crud byte at a time */
-	cmp	r2, #2
-	ldrb	r3, [r1, #-1]!
-	strb	r3, [r0, #-1]!
-	ldrbge	r3, [r1, #-1]!
-	strbge	r3, [r0, #-1]!
-	ldrbgt	r3, [r1, #-1]!
-	strbgt	r3, [r0, #-1]!
-	RET
-
-	/* erg - unaligned destination */
-.Lmemmove_bdestul:
-	cmp	r12, #2
-
-	/* align destination with byte copies */
-	ldrb	r3, [r1, #-1]!
-	strb	r3, [r0, #-1]!
-	ldrbge	r3, [r1, #-1]!
-	strbge	r3, [r0, #-1]!
-	ldrbgt	r3, [r1, #-1]!
-	strbgt	r3, [r0, #-1]!
-	subs	r2, r2, r12
-	blt	.Lmemmove_bl4		/* less than 4 bytes to go */
-	ands	r12, r1, #3
-	beq	.Lmemmove_bt8		/* we have an aligned source */
-
-	/* erg - unaligned source */
-	/* This is where it gets nasty ... */
-.Lmemmove_bsrcul:
-	bic	r1, r1, #3
-	ldr	r3, [r1, #0]
-	cmp	r12, #2
-	blt	.Lmemmove_bsrcul1
-	beq	.Lmemmove_bsrcul2
-	cmp	r2, #0x0c            
-	blt	.Lmemmove_bsrcul3loop4
-	sub	r2, r2, #0x0c         
-	stmdb	sp!, {r4, r5, lr}
-
-.Lmemmove_bsrcul3loop16:
-#ifdef __ARMEB__
-	mov	lr, r3, lsr #8
-#else
-	mov	lr, r3, lsl #8
-#endif
-	ldmdb	r1!, {r3-r5, r12}
-#ifdef __ARMEB__
-	orr	lr, lr, r12, lsl #24
-	mov	r12, r12, lsr #8
-	orr	r12, r12, r5, lsl #24
-	mov	r5, r5, lsr #8
-	orr	r5, r5, r4, lsl #24
-	mov	r4, r4, lsr #8
-	orr	r4, r4, r3, lsl #24
-#else
-	orr	lr, lr, r12, lsr #24
-	mov	r12, r12, lsl #8
-	orr	r12, r12, r5, lsr #24
-	mov	r5, r5, lsl #8
-	orr	r5, r5, r4, lsr #24
-	mov	r4, r4, lsl #8
-	orr	r4, r4, r3, lsr #24
-#endif
-	stmdb	r0!, {r4, r5, r12, lr}
-	subs	r2, r2, #0x10         
-	bge	.Lmemmove_bsrcul3loop16
-	ldmia	sp!, {r4, r5, lr}
-	adds	r2, r2, #0x0c         
-	blt	.Lmemmove_bsrcul3l4
-
-.Lmemmove_bsrcul3loop4:
-#ifdef __ARMEB__
-	mov	r12, r3, lsr #8
-#else
-	mov	r12, r3, lsl #8
-#endif
-	ldr	r3, [r1, #-4]!
-#ifdef __ARMEB__
-	orr	r12, r12, r3, lsl #24
-#else
-	orr	r12, r12, r3, lsr #24
-#endif
-	str	r12, [r0, #-4]!
-	subs	r2, r2, #4
-	bge	.Lmemmove_bsrcul3loop4
-
-.Lmemmove_bsrcul3l4:
-	add	r1, r1, #3
-	b	.Lmemmove_bl4
-
-.Lmemmove_bsrcul2:
-	cmp	r2, #0x0c            
-	blt	.Lmemmove_bsrcul2loop4
-	sub	r2, r2, #0x0c         
-	stmdb	sp!, {r4, r5, lr}
-
-.Lmemmove_bsrcul2loop16:
-#ifdef __ARMEB__
-	mov	lr, r3, lsr #16
-#else
-	mov	lr, r3, lsl #16
-#endif
-	ldmdb	r1!, {r3-r5, r12}
-#ifdef __ARMEB__
-	orr	lr, lr, r12, lsl #16
-	mov	r12, r12, lsr #16
-	orr	r12, r12, r5, lsl #16
-	mov	r5, r5, lsr #16
-	orr	r5, r5, r4, lsl #16
-	mov	r4, r4, lsr #16
-	orr	r4, r4, r3, lsl #16
-#else
-	orr	lr, lr, r12, lsr #16
-	mov	r12, r12, lsl #16
-	orr	r12, r12, r5, lsr #16
-	mov	r5, r5, lsl #16
-	orr	r5, r5, r4, lsr #16
-	mov	r4, r4, lsl #16
-	orr	r4, r4, r3, lsr #16
-#endif
-	stmdb	r0!, {r4, r5, r12, lr}
-	subs	r2, r2, #0x10         
-	bge	.Lmemmove_bsrcul2loop16
-	ldmia	sp!, {r4, r5, lr}
-	adds	r2, r2, #0x0c         
-	blt	.Lmemmove_bsrcul2l4
-
-.Lmemmove_bsrcul2loop4:
-#ifdef __ARMEB__
-	mov	r12, r3, lsr #16
-#else
-	mov	r12, r3, lsl #16
-#endif
-	ldr	r3, [r1, #-4]!
-#ifdef __ARMEB__
-	orr	r12, r12, r3, lsl #16
-#else
-	orr	r12, r12, r3, lsr #16
-#endif
-	str	r12, [r0, #-4]!
-	subs	r2, r2, #4
-	bge	.Lmemmove_bsrcul2loop4
-
-.Lmemmove_bsrcul2l4:
-	add	r1, r1, #2
-	b	.Lmemmove_bl4
-
-.Lmemmove_bsrcul1:
-	cmp	r2, #0x0c            
-	blt	.Lmemmove_bsrcul1loop4
-	sub	r2, r2, #0x0c         
-	stmdb	sp!, {r4, r5, lr}
-
-.Lmemmove_bsrcul1loop32:
-#ifdef __ARMEB__
-	mov	lr, r3, lsr #24
-#else
-	mov	lr, r3, lsl #24
-#endif
-	ldmdb	r1!, {r3-r5, r12}
-#ifdef __ARMEB__
-	orr	lr, lr, r12, lsl #8
-	mov	r12, r12, lsr #24
-	orr	r12, r12, r5, lsl #8
-	mov	r5, r5, lsr #24
-	orr	r5, r5, r4, lsl #8
-	mov	r4, r4, lsr #24
-	orr	r4, r4, r3, lsl #8
-#else
-	orr	lr, lr, r12, lsr #8
-	mov	r12, r12, lsl #24
-	orr	r12, r12, r5, lsr #8
-	mov	r5, r5, lsl #24
-	orr	r5, r5, r4, lsr #8
-	mov	r4, r4, lsl #24
-	orr	r4, r4, r3, lsr #8
-#endif
-	stmdb	r0!, {r4, r5, r12, lr}
-	subs	r2, r2, #0x10         
-	bge	.Lmemmove_bsrcul1loop32
-	ldmia	sp!, {r4, r5, lr}
-	adds	r2, r2, #0x0c         
-	blt	.Lmemmove_bsrcul1l4
-
-.Lmemmove_bsrcul1loop4:
-#ifdef __ARMEB__
-	mov	r12, r3, lsr #24
-#else
-	mov	r12, r3, lsl #24
-#endif
-	ldr	r3, [r1, #-4]!
-#ifdef __ARMEB__
-	orr	r12, r12, r3, lsl #8
-#else
-	orr	r12, r12, r3, lsr #8
-#endif
-	str	r12, [r0, #-4]!
-	subs	r2, r2, #4
-	bge	.Lmemmove_bsrcul1loop4
-
-.Lmemmove_bsrcul1l4:
-	add	r1, r1, #1
-	b	.Lmemmove_bl4
-#ifndef _BCOPY
-END(memmove)
-#else
-END(bcopy)
-#endif
diff --git a/lib/libc_bsd/arm/string/memset.S b/lib/libc_bsd/arm/string/memset.S
deleted file mode 100644
index 20c7dcd..0000000
--- a/lib/libc_bsd/arm/string/memset.S
+++ /dev/null
@@ -1,243 +0,0 @@
-/*	$NetBSD: memset.S,v 1.4 2003/10/14 07:51:45 scw Exp $	*/
-
-/*
- * Copyright 2003 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Steve C. Woodford for Wasabi Systems, Inc.
- *
- * 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 for the NetBSD Project by
- *      Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- *    or promote products derived from this software without specific prior
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
- * 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.
- */
-/*
- * Copyright (c) 1995 Mark Brinicombe.
- * 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 Mark Brinicombe.
- * 4. The name of the company nor the name of the author may be used to
- *    endorse or promote products derived from this software without specific
- *    prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/memset.S 275767 2014-12-14 16:28:53Z andrew $");
-
-.syntax	unified
-
-/*
- * memset: Sets a block of memory to the specified value
- *
- * On entry:
- *   r0 - dest address
- *   r1 - byte to write
- *   r2 - number of bytes to write
- *
- * On exit:
- *   r0 - dest address
- */
-#ifdef _BZERO
-/* LINTSTUB: Func: void bzero(void *, size_t) */
-ENTRY(bzero)
-	mov	r3, #0x00
-#else
-/* LINTSTUB: Func: void *memset(void *, int, size_t) */
-ENTRY(memset)
-	and	r3, r1, #0xff		/* We deal with bytes */
-	mov	r1, r2
-#endif
-	cmp	r1, #0x04		/* Do we have less than 4 bytes */
-	mov	ip, r0
-	blt	.Lmemset_lessthanfour
-
-	/* Ok first we will word align the address */
-	ands	r2, ip, #0x03		/* Get the bottom two bits */
-	bne	.Lmemset_wordunaligned	/* The address is not word aligned */
-
-	/* We are now word aligned */
-.Lmemset_wordaligned:
-#ifndef _BZERO
-	orr	r3, r3, r3, lsl #8	/* Extend value to 16-bits */
-#endif
-#ifdef _ARM_ARCH_5E
-	tst	ip, #0x04		/* Quad-align for armv5e */
-#else
-	cmp	r1, #0x10
-#endif
-#ifndef _BZERO
-	orr	r3, r3, r3, lsl #16	/* Extend value to 32-bits */
-#endif
-#ifdef _ARM_ARCH_5E
-	subne	r1, r1, #0x04		/* Quad-align if necessary */
-	strne	r3, [ip], #0x04
-	cmp	r1, #0x10
-#endif
-	blt	.Lmemset_loop4		/* If less than 16 then use words */
-	mov	r2, r3			/* Duplicate data */
-	cmp	r1, #0x80		/* If < 128 then skip the big loop */
-	blt	.Lmemset_loop32
-
-	/* Do 128 bytes at a time */
-.Lmemset_loop128:
-	subs	r1, r1, #0x80
-#ifdef _ARM_ARCH_5E
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-#else
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-#endif
-	bgt	.Lmemset_loop128
-	RETeq			/* Zero length so just exit */
-
-	add	r1, r1, #0x80		/* Adjust for extra sub */
-
-	/* Do 32 bytes at a time */
-.Lmemset_loop32:
-	subs	r1, r1, #0x20
-#ifdef _ARM_ARCH_5E
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-#else
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-#endif
-	bgt	.Lmemset_loop32
-	RETeq			/* Zero length so just exit */
-
-	adds	r1, r1, #0x10		/* Partially adjust for extra sub */
-
-	/* Deal with 16 bytes or more */
-#ifdef _ARM_ARCH_5E
-	strdge	r2, [ip], #0x08
-	strdge	r2, [ip], #0x08
-#else
-	stmiage	ip!, {r2-r3}
-	stmiage	ip!, {r2-r3}
-#endif
-	RETeq			/* Zero length so just exit */
-
-	addlt	r1, r1, #0x10		/* Possibly adjust for extra sub */
-
-	/* We have at least 4 bytes so copy as words */
-.Lmemset_loop4:
-	subs	r1, r1, #0x04
-	strge	r3, [ip], #0x04
-	bgt	.Lmemset_loop4
-	RETeq			/* Zero length so just exit */
-
-#ifdef _ARM_ARCH_5E
-	/* Compensate for 64-bit alignment check */
-	adds	r1, r1, #0x04
-	RETeq
-	cmp	r1, #2
-#else
-	cmp	r1, #-2
-#endif
-
-	strb	r3, [ip], #0x01		/* Set 1 byte */
-	strbge	r3, [ip], #0x01		/* Set another byte */
-	strbgt	r3, [ip]		/* and a third */
-	RET			/* Exit */
-
-.Lmemset_wordunaligned:
-	rsb	r2, r2, #0x004
-	strb	r3, [ip], #0x01		/* Set 1 byte */
-	cmp	r2, #0x02
-	strbge	r3, [ip], #0x01		/* Set another byte */
-	sub	r1, r1, r2
-	strbgt	r3, [ip], #0x01		/* and a third */
-	cmp	r1, #0x04		/* More than 4 bytes left? */
-	bge	.Lmemset_wordaligned	/* Yup */
-
-.Lmemset_lessthanfour:
-	cmp	r1, #0x00
-	RETeq			/* Zero length so exit */
-	strb	r3, [ip], #0x01		/* Set 1 byte */
-	cmp	r1, #0x02
-	strbge	r3, [ip], #0x01		/* Set another byte */
-	strbgt	r3, [ip]		/* and a third */
-	RET			/* Exit */
-#ifdef _BZERO
-END(bzero)
-#else
-END(memset)
-#endif
diff --git a/lib/libc_bsd/arm/string/strcmp.S b/lib/libc_bsd/arm/string/strcmp.S
deleted file mode 100644
index f1441ca..0000000
--- a/lib/libc_bsd/arm/string/strcmp.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*      $NetBSD: strcmp.S,v 1.3 2003/04/05 23:08:52 bjh21 Exp $ */
-
-/*
- * Copyright (c) 2002 ARM Ltd
- * 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 company may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY ARM LTD ``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 ARM LTD 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.
- */
-
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/strcmp.S 271337 2014-09-09 22:24:01Z ian $");
-
-ENTRY(strcmp)
-1:
-	ldrb	r2, [r0], #1
-	ldrb	r3, [r1], #1
-	cmp	r2, #1
-	cmpcs	r2, r3
-	beq	1b
-	sub	r0, r2, r3
-	RET
-END(strcmp)
diff --git a/lib/libc_bsd/arm/string/strlen.S b/lib/libc_bsd/arm/string/strlen.S
deleted file mode 100644
index f08d1aa..0000000
--- a/lib/libc_bsd/arm/string/strlen.S
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 2005 Olivier Houchard
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/strlen.S 275767 2014-12-14 16:28:53Z andrew $");
-
-.syntax	unified
-
-ENTRY(strlen)
-	mov	r1, #0
-	/* Check that the pointer is aligned on 32 bits. */
-	ands	r3, r0, #3
-	beq	.Loop
-	sub	r0, r0, r3
-	ldr	r2, [r0]
-	add	r0, r0, #4
-	cmp	r3, #2
-	blt	.Ldo_3
-	bgt	.Ldo_1
-	/* So that the N bit is set. */
-	cmp	r3, #0
-	b	.Ldo_2
-
-.Loop:
-	ldr	r2, [r0]
-	add	r0, r0, #4
-#ifndef __ARMEB__
-	ands	r3, r2, #0x000000ff
-#else
-	ands	r3, r2, #0xff000000
-#endif
-	addne	r1, r1, #1
-.Ldo_3:
-#ifndef __ARMEB__
-	andsne    r3, r2, #0x0000ff00
-#else
-  	andsne    r3, r2, #0x00ff0000
-#endif  
-	addne     r1, r1, #1
-.Ldo_2:
-#ifndef __ARMEB__
-	andsne    r3, r2, #0x00ff0000
-#else
-	andsne    r3, r2, #0x0000ff00
-#endif  
-	addne	r1, r1, #1
-.Ldo_1:
-#ifndef __ARMEB__
-	andsne	r3, r2, #0xff000000
-#else
-	andsne	r3, r2, #0x000000ff
-#endif  
-	addne	r1, r1, #1
-	bne	.Loop				
-.Lexit:
-	mov	r0, r1
-	RET
-END(strlen)
diff --git a/lib/libc_bsd/arm/string/strncmp.S b/lib/libc_bsd/arm/string/strncmp.S
deleted file mode 100644
index ff4b08e..0000000
--- a/lib/libc_bsd/arm/string/strncmp.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*      $NetBSD: strncmp.S,v 1.2 2003/04/05 23:08:52 bjh21 Exp $ */
-
-/*
- * Copyright (c) 2002 ARM Ltd
- * 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 company may not be used to endorse or promote
- *    products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY ARM LTD ``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 ARM LTD 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.
- */
-
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/string/strncmp.S 271337 2014-09-09 22:24:01Z ian $");
-
-ENTRY(strncmp)
-/* if (len == 0) return 0 */
-	cmp	r2, #0
-	moveq	r0, #0
-	moveq	pc, lr
-
-/* ip == last src address to compare */
-	adds	ip, r0, r2
-/* Use last possible address on overflow. */
-	movcs	ip, #0
-	sub	ip, ip, #1
-1:
-	ldrb	r2, [r0], #1
-	ldrb	r3, [r1], #1
-	cmp	ip, r0
-	cmpcs	r2, #1
-	cmpcs	r2, r3
-	beq	1b
-	sub	r0, r2, r3
-	RET
-END(strncmp)
diff --git a/lib/libc_bsd/arm/sys/Makefile.inc b/lib/libc_bsd/arm/sys/Makefile.inc
deleted file mode 100644
index 1e6da65..0000000
--- a/lib/libc_bsd/arm/sys/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Makefile.incl 246117 2013-01-30 12:48:16Z kib $
-
-SRCS+=	__vdso_gettc.c
-
-MDASM= Ovfork.S brk.S cerror.S pipe.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
-
-PSEUDO= _exit.o _getlogin.o
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
diff --git a/lib/libc_bsd/arm/sys/Ovfork.S b/lib/libc_bsd/arm/sys/Ovfork.S
deleted file mode 100644
index 80b6e55..0000000
--- a/lib/libc_bsd/arm/sys/Ovfork.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: Ovfork.S,v 1.6 2003/08/07 16:42:03 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 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. 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.
- *
- *	from: @(#)Ovfork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/Ovfork.S 271337 2014-09-09 22:24:01Z ian $");
-#include "SYS.h"
-
-/*
- * pid = vfork();
- *
- * On return from the SWI:
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- */
-	.text
-	.align	0
-
-ENTRY(vfork)
-	mov	r2, r14
-	SYSTRAP(vfork)
-	bcs	PIC_SYM(CERROR, PLT)
-	sub	r1, r1, #1	/* r1 == 0xffffffff if parent, 0 if child */
-	and	r0, r0, r1	/* r0 == 0 if child, else unchanged */
-	mov	r15, r2
-END(vfork)
diff --git a/lib/libc_bsd/arm/sys/__vdso_gettc.c b/lib/libc_bsd/arm/sys/__vdso_gettc.c
deleted file mode 100644
index dc676f3..0000000
--- a/lib/libc_bsd/arm/sys/__vdso_gettc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2013 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/__vdso_gettc.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-
-#pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
-{
-
-	return (0);
-}
-
-#pragma weak __vdso_gettimekeep
-int
-__vdso_gettimekeep(struct vdso_timekeep **tk)
-{
-
-	return (ENOSYS);
-}
diff --git a/lib/libc_bsd/arm/sys/brk.S b/lib/libc_bsd/arm/sys/brk.S
deleted file mode 100644
index 1d63f34..0000000
--- a/lib/libc_bsd/arm/sys/brk.S
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	$NetBSD: brk.S,v 1.6 2003/08/07 16:42:04 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 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. 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.
- *
- *	from: @(#)brk.s	5.2 (Berkeley) 12/17/90
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/brk.S 271337 2014-09-09 22:24:01Z ian $");
-#include "SYS.h"
-
-	.globl	_C_LABEL(_end)
-	.globl	CURBRK
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(brk, _brk)
-#endif
-
-	.data
-	.align	0
-	.globl	_C_LABEL(minbrk)
-	.type	_C_LABEL(minbrk),#object
-_C_LABEL(minbrk):
-	.word	_C_LABEL(_end)
-
-/*
- * Change the data segment size
- */
-ENTRY(_brk)
-#ifdef PIC
-	/* Setup the GOT */
-	ldr	r3, .Lgot
-	add	r3, pc, r3
-.L1:
-	ldr	r1, .Lminbrk
-	ldr	r1, [r3, r1]
-#else
-	ldr	r1, .Lminbrk
-#endif
-	/* Get the minimum allowable brk address */
-	ldr	r1, [r1]
-
-	/*
-	 * Valid the address specified and set to the minimum
-	 * if the address is below minbrk.
-	 */
-	cmp	r0, r1
-	movlt	r0, r1
-	mov	r2, r0
-	SYSTRAP(break)
-	bcs	PIC_SYM(CERROR, PLT)
-
-#ifdef PIC
-	ldr	r1, .Lcurbrk
-	ldr	r1, [r3, r1]
-#else
-	ldr	r1, .Lcurbrk
-#endif
-	/* Store the new address in curbrk */
-	str	r2, [r1]
-
-	/* Return 0 for success */
-	mov	r0, #0x00000000
-	RET
-
-	.align	2
-#ifdef PIC
-.Lgot:
-	.word	_GLOBAL_OFFSET_TABLE_ - (.L1+4)
-#endif
-.Lminbrk:
-	.word	PIC_SYM(_C_LABEL(minbrk), GOT)
-.Lcurbrk:
-	.word	PIC_SYM(CURBRK, GOT)
-END(_brk)
diff --git a/lib/libc_bsd/arm/sys/cerror.S b/lib/libc_bsd/arm/sys/cerror.S
deleted file mode 100644
index c4457a0..0000000
--- a/lib/libc_bsd/arm/sys/cerror.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.5 2003/08/07 16:42:04 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 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. 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.
- *
- *	from: @(#)cerror.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/cerror.S 271337 2014-09-09 22:24:01Z ian $");
-#include "SYS.h"
-
-.globl  _C_LABEL(__error)
-.type   _C_LABEL(__error),%function
-		
-ASENTRY(CERROR)
-	stmfd	sp!, {r4, lr}
-	mov	r4, r0
-	bl	PIC_SYM(_C_LABEL(__error), PLT)
-	str	r4, [r0]
-	mvn	r0, #0x00000000
-	mvn	r1, #0x00000000
-	ldmfd	sp!, {r4, pc}
-END(CERROR)
diff --git a/lib/libc_bsd/arm/sys/fork.S b/lib/libc_bsd/arm/sys/fork.S
deleted file mode 100644
index 5778e39..0000000
--- a/lib/libc_bsd/arm/sys/fork.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: fork.S,v 1.5 2003/08/07 16:42:04 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 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. 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.
- *
- *	from: @(#)fork.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/fork.S 137464 2004-11-09 16:49:14Z cognet $");
-#include "SYS.h"
-
-/*
- * pid = fork();
- *
- * On return from the SWI:
- * r1 == 0 in parent process, r1 == 1 in child process.
- * r0 == pid of child in parent, r0 == pid of parent in child.
- */
-
-_SYSCALL(fork)
-	sub	r1, r1, #1	/* r1 == 0xffffffff if parent, 0 if child */
-	and	r0, r0, r1	/* r0 == 0 if child, else unchanged */
-	RET
diff --git a/lib/libc_bsd/arm/sys/pipe.S b/lib/libc_bsd/arm/sys/pipe.S
deleted file mode 100644
index 7944460..0000000
--- a/lib/libc_bsd/arm/sys/pipe.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.5 2003/08/07 16:42:04 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 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. 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.
- *
- *	from: @(#)pipe.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/pipe.S 271337 2014-09-09 22:24:01Z ian $");
-#include "SYS.h"
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(pipe, _pipe)
-WEAK_ALIAS(__sys_pipe, _pipe)
-#endif
-
-ENTRY(_pipe)
-	mov	r2, r0
-	SYSTRAP(pipe)
-	bcs	PIC_SYM(CERROR, PLT)
-	str	r0, [r2, #0x0000]
-	str	r1, [r2, #0x0004]
-	mov	r0, #0x00000000
-	RET
-END(_pipe)
diff --git a/lib/libc_bsd/arm/sys/ptrace.S b/lib/libc_bsd/arm/sys/ptrace.S
deleted file mode 100644
index 0c8964a..0000000
--- a/lib/libc_bsd/arm/sys/ptrace.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.7 2003/08/07 16:42:04 agc Exp $ */
-
-/*-
- * Copyright (c) 1990 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. 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.
- *
- *	from: @(#)ptrace.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/ptrace.S 271337 2014-09-09 22:24:01Z ian $");
-#include "SYS.h"
-
-ENTRY(ptrace)
-	stmfd	sp!, {r0-r3, lr}
-	sub	sp, sp, #4	/* align stack */
-	bl	PIC_SYM(_C_LABEL(__error), PLT)
-	add	sp, sp, #4	/* unalign stack */
-	mov	r1, #0x00000000
-	str	r1, [r0]
-	ldmfd	sp!, {r0-r3, lr}
-	SYSTRAP(ptrace)
-	bcs	PIC_SYM(CERROR, PLT)
-	RET
-END(ptrace)
diff --git a/lib/libc_bsd/arm/sys/sbrk.S b/lib/libc_bsd/arm/sys/sbrk.S
deleted file mode 100644
index cf91984..0000000
--- a/lib/libc_bsd/arm/sys/sbrk.S
+++ /dev/null
@@ -1,89 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.7 2003/08/07 16:42:05 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 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. 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.
- *
- *	from: @(#)sbrk.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/sbrk.S 271337 2014-09-09 22:24:01Z ian $");
-#include "SYS.h"
-
-	.globl	_C_LABEL(_end)
-
-#ifdef WEAK_ALIAS
-WEAK_ALIAS(sbrk, _sbrk)
-#endif
-
-	.data
-	.align	0
-	.globl	CURBRK
-	.type	CURBRK,#object
-CURBRK:
-	.word	_C_LABEL(_end)
-
-/*
- * Change the data segment size
- */
-ENTRY(_sbrk)
-#ifdef PIC
-	/* Setup the GOT */
-	ldr	r3, .Lgot
-	add	r3, pc, r3
-.L1:
-	ldr	r2, .Lcurbrk
-	ldr	r2, [r3, r2]
-#else
-	ldr	r2, .Lcurbrk
-#endif
-	/* Get the current brk address */
-	ldr	r1, [r2]
-
-	/* Calculate new value */
-	mov	r3, r0
-	add	r0, r0, r1
-	SYSTRAP(break)
-	bcs	PIC_SYM(CERROR, PLT)
-
-	/* Store new curbrk value */
-	ldr	r0, [r2]
-	add	r1, r0, r3
-	str	r1, [r2]
-
-	/* Return old curbrk value */
-	RET
-
-	.align	0
-#ifdef PIC
-.Lgot:
-	.word	_GLOBAL_OFFSET_TABLE_ - (.L1+4)
-#endif
-.Lcurbrk:
-	.word	PIC_SYM(CURBRK, GOT)
-END(_sbrk)
diff --git a/lib/libc_bsd/arm/sys/shmat.S b/lib/libc_bsd/arm/sys/shmat.S
deleted file mode 100644
index 4b9e392..0000000
--- a/lib/libc_bsd/arm/sys/shmat.S
+++ /dev/null
@@ -1,7 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/12/29 20:14:04 bjh21 Exp $	*/
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/shmat.S 129202 2004-05-14 12:04:31Z cognet $");
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc_bsd/arm/sys/sigreturn.S b/lib/libc_bsd/arm/sys/sigreturn.S
deleted file mode 100644
index 9fbc397..0000000
--- a/lib/libc_bsd/arm/sys/sigreturn.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: __sigreturn14.S,v 1.3 2003/08/07 16:42:03 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 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. 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.
- *
- *	from: @(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/sigreturn.S 129202 2004-05-14 12:04:31Z cognet $");
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- */
-
-RSYSCALL(sigreturn)
diff --git a/lib/libc_bsd/arm/sys/syscall.S b/lib/libc_bsd/arm/sys/syscall.S
deleted file mode 100644
index 73ebe72..0000000
--- a/lib/libc_bsd/arm/sys/syscall.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.4 2003/08/07 16:42:05 agc Exp $	*/
-
-/*-
- * Copyright (c) 1990 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. 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.
- *
- *	from: @(#)syscall.s	5.1 (Berkeley) 4/23/90
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/arm/sys/syscall.S 129202 2004-05-14 12:04:31Z cognet $");
-#include "SYS.h"
-
-RSYSCALL(syscall)
diff --git a/lib/libc_bsd/capability/Makefile.inc b/lib/libc_bsd/capability/Makefile.inc
deleted file mode 100644
index d2e0aba..0000000
--- a/lib/libc_bsd/capability/Makefile.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-Makefile.incl 257771 2013-11-06 23:59:19Z pjd $
-
-# capability sources
-.PATH: ${.CURDIR}/../../sys/kern ${.CURDIR}/capability
-
-SRCS+=	subr_capability.c
-
-SYM_MAPS+=	${.CURDIR}/capability/Symbol.map
-
-MAN+=	cap_rights_init.3
-
-MLINKS+=cap_rights_init.3 cap_rights_set.3
-MLINKS+=cap_rights_init.3 cap_rights_clear.3
-MLINKS+=cap_rights_init.3 cap_rights_is_set.3
-MLINKS+=cap_rights_init.3 cap_rights_is_valid.3
-MLINKS+=cap_rights_init.3 cap_rights_merge.3
-MLINKS+=cap_rights_init.3 cap_rights_remove.3
-MLINKS+=cap_rights_init.3 cap_rights_contains.3
diff --git a/lib/libc_bsd/capability/Symbol.map b/lib/libc_bsd/capability/Symbol.map
deleted file mode 100644
index f9eee56..0000000
--- a/lib/libc_bsd/capability/Symbol.map
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/capability/Symbol.map 255219 2013-09-05 00:09:56Z pjd $
- */
-
-FBSD_1.3 {
-	__cap_rights_clear;
-	cap_rights_contains;
-	__cap_rights_init;
-	__cap_rights_is_set;
-	cap_rights_is_valid;
-	cap_rights_merge;
-	cap_rights_remove;
-	__cap_rights_set;
-};
diff --git a/lib/libc_bsd/capability/cap_rights_init.3 b/lib/libc_bsd/capability/cap_rights_init.3
deleted file mode 100644
index 7a0e346..0000000
--- a/lib/libc_bsd/capability/cap_rights_init.3
+++ /dev/null
@@ -1,241 +0,0 @@
-.\"
-.\" Copyright (c) 2013 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by Pawel Jakub Dawidek under sponsorship
-.\" from the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/capability/cap_rights_init.3 280247 2015-03-19 11:24:07Z rwatson $
-.\"
-.Dd March 27, 2014
-.Dt CAP_RIGHTS_INIT 3
-.Os
-.Sh NAME
-.Nm cap_rights_init ,
-.Nm cap_rights_set ,
-.Nm cap_rights_clear ,
-.Nm cap_rights_is_set ,
-.Nm cap_rights_is_valid ,
-.Nm cap_rights_merge ,
-.Nm cap_rights_remove ,
-.Nm cap_rights_contains
-.Nd manage cap_rights_t structure
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/capsicum.h
-.Ft cap_rights_t *
-.Fn cap_rights_init "cap_rights_t *rights" "..."
-.Ft cap_rights_t *
-.Fn cap_rights_set "cap_rights_t *rights" "..."
-.Ft cap_rights_t *
-.Fn cap_rights_clear "cap_rights_t *rights" "..."
-.Ft bool
-.Fn cap_rights_is_set "const cap_rights_t *rights" "..."
-.Ft bool
-.Fn cap_rights_is_valid "const cap_rights_t *rights"
-.Ft cap_rights_t *
-.Fn cap_rights_merge "cap_rights_t *dst" "const cap_rights_t *src"
-.Ft cap_rights_t *
-.Fn cap_rights_remove "cap_rights_t *dst" "const cap_rights_t *src"
-.Ft bool
-.Fn cap_rights_contains "const cap_rights_t *big" "const cap_rights_t *little"
-.Sh DESCRIPTION
-The functions documented here allow to manage the
-.Vt cap_rights_t
-structure.
-.Pp
-Capability rights should be separated with comma when passed to the
-.Fn cap_rights_init ,
-.Fn cap_rights_set ,
-.Fn cap_rights_clear
-and
-.Fn cap_rights_is_set
-functions.
-For example:
-.Bd -literal
-cap_rights_set(&rights, CAP_READ, CAP_WRITE, CAP_FSTAT, CAP_SEEK);
-.Ed
-.Pp
-The complete list of the capability rights can be found in the
-.Xr rights 4
-manual page.
-.Pp
-The
-.Fn cap_rights_init
-function initialize provided
-.Vt cap_rights_t
-structure.
-Only properly initialized structure can be passed to the remaining functions.
-For convenience the structure can be filled with capability rights instead of
-calling the
-.Fn cap_rights_set
-function later.
-For even more convenience pointer to the given structure is returned, so it can
-be directly passed to
-.Xr cap_rights_limit 2 :
-.Bd -literal
-cap_rights_t rights;
-
-if (cap_rights_limit(fd, cap_rights_init(&rights, CAP_READ, CAP_WRITE)) < 0)
-	err(1, "Unable to limit capability rights");
-.Ed
-.Pp
-The
-.Fn cap_rights_set
-function adds the given capability rights to the given
-.Vt cap_rights_t
-structure.
-.Pp
-The
-.Fn cap_rights_clear
-function removes the given capability rights from the given
-.Vt cap_rights_t
-structure.
-.Pp
-The
-.Fn cap_rights_is_set
-function checks if all the given capability rights are set for the given
-.Vt cap_rights_t
-structure.
-.Pp
-The
-.Fn cap_rights_is_valid
-function verifies if the given
-.Vt cap_rights_t
-structure is valid.
-.Pp
-The
-.Fn cap_rights_merge
-function merges all capability rights present in the
-.Fa src
-structure into the
-.Fa dst
-structure.
-.Pp
-The
-.Fn cap_rights_remove
-function removes all capability rights present in the
-.Fa src
-structure from the
-.Fa dst
-structure.
-.Pp
-The
-.Fn cap_rights_contains
-function checks if the
-.Fa big
-structure contains all capability rights present in the
-.Fa little
-structure.
-.Sh RETURN VALUES
-The functions never fail.
-In case an invalid capability right or an invalid
-.Vt cap_rights_t
-structure is given as an argument, the program will be aborted.
-.Pp
-The
-.Fn cap_rights_init ,
-.Fn cap_rights_set
-and
-.Fn cap_rights_clear
-functions return pointer to the
-.Vt cap_rights_t
-structure given in the
-.Fa rights
-argument.
-.Pp
-The
-.Fn cap_rights_merge
-and
-.Fn cap_rights_remove
-functions return pointer to the
-.Vt cap_rights_t
-structure given in the
-.Fa dst
-argument.
-.Pp
-The
-.Fn cap_rights_is_set
-returns
-.Va true
-if all the given capability rights are set in the
-.Fa rights
-argument.
-.Pp
-The
-.Fn cap_rights_is_valid
-function performs various checks to see if the given
-.Vt cap_rights_t
-structure is valid and returns
-.Va true
-if it is.
-.Pp
-The
-.Fn cap_rights_contains
-function returns
-.Va true
-if all capability rights set in the
-.Fa little
-structure are also present in the
-.Fa big
-structure.
-.Sh EXAMPLES
-The following example demonstrates how to prepare a
-.Vt cap_rights_t
-structure to be passed to the
-.Xr cap_rights_limit 2
-system call.
-.Bd -literal
-cap_rights_t rights;
-int fd;
-
-fd = open("/tmp/foo", O_RDWR);
-if (fd < 0)
-	err(1, "open() failed");
-
-cap_rights_init(&rights, CAP_FSTAT, CAP_READ);
-
-if (allow_write_and_seek)
-	cap_rights_set(&rights, CAP_WRITE, CAP_SEEK);
-
-if (dont_allow_seek)
-	cap_rights_clear(&rights, CAP_SEEK);
-
-if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS)
-	err(1, "cap_rights_limit() failed");
-.Ed
-.Sh SEE ALSO
-.Xr cap_rights_limit 2 ,
-.Xr open 2 ,
-.Xr capsicum 4 ,
-.Xr rights 4
-.Sh HISTORY
-Support for capabilities and capabilities mode was developed as part of the
-.Tn TrustedBSD
-Project.
-.Sh AUTHORS
-This family of functions was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
-under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc_bsd/compat-43/Makefile.inc b/lib/libc_bsd/compat-43/Makefile.inc
deleted file mode 100644
index 4496f9f..0000000
--- a/lib/libc_bsd/compat-43/Makefile.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/2/93
-Makefile.incl 211774 2010-08-24 20:54:43Z imp $
-
-# compat-43 sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/compat-43 ${.CURDIR}/compat-43
-
-SRCS+=	creat.c gethostid.c getwd.c killpg.c sethostid.c setpgrp.c \
-	setrgid.c setruid.c sigcompat.c
-
-SYM_MAPS+=${.CURDIR}/compat-43/Symbol.map
-
-MAN+=	creat.2 killpg.2 sigpause.2 sigsetmask.2 sigvec.2
-MAN+=	gethostid.3 setruid.3
-
-MLINKS+=gethostid.3 sethostid.3
-MLINKS+=sigpause.2 sighold.2
-MLINKS+=sigpause.2 sigignore.2
-MLINKS+=sigpause.2 sigrelse.2
-MLINKS+=sigpause.2 sigset.2
-MLINKS+=sigpause.2 xsi_sigpause.2
-MLINKS+=setruid.3 setrgid.3
-
-MLINKS+=sigsetmask.2 sigblock.2
-MLINKS+=sigsetmask.2 sigmask.2
diff --git a/lib/libc_bsd/compat-43/Symbol.map b/lib/libc_bsd/compat-43/Symbol.map
deleted file mode 100644
index ec4255c..0000000
--- a/lib/libc_bsd/compat-43/Symbol.map
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/compat-43/Symbol.map 199827 2009-11-26 13:49:37Z kib $
- */
-
-FBSD_1.0 {
-	creat;
-	gethostid;
-	getwd;
-	killpg;
-	sethostid;
-	setpgrp;
-	setrgid;
-	setruid;
-	sigblock;
-	sigpause;
-	sigsetmask;
-	sigvec;
-};
-
-FBSD_1.2 {
-	sighold;
-	sigignore;
-	sigrelse;
-	sigset;
-	xsi_sigpause;
-};
-
-FBSDprivate_1.0 {
-	__creat;
-	_creat;
-};
diff --git a/lib/libc_bsd/compat-43/creat.2 b/lib/libc_bsd/compat-43/creat.2
deleted file mode 100644
index 4cd2132..0000000
--- a/lib/libc_bsd/compat-43/creat.2
+++ /dev/null
@@ -1,62 +0,0 @@
-.\" Copyright (c) 1989, 1990, 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.
-.\" 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.
-.\"
-.\"     @(#)creat.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD: releng/10.2/lib/libc/compat-43/creat.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 2, 1993
-.Dt CREAT 2
-.Os
-.Sh NAME
-.Nm creat
-.Nd create a new file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.Ft int
-.Fn creat "const char *path" "mode_t mode"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by:
-.Ef
-.Xr open 2 .
-.Pp
-The
-.Fn creat
-function
-is the same as:
-.Bd -literal -offset indent
-open(path, O_CREAT | O_TRUNC | O_WRONLY, mode);
-.Ed
-.Sh SEE ALSO
-.Xr open 2
-.Sh HISTORY
-The
-.Fn creat
-function appeared in
-.At v6 .
diff --git a/lib/libc_bsd/compat-43/creat.c b/lib/libc_bsd/compat-43/creat.c
deleted file mode 100644
index 16b2939..0000000
--- a/lib/libc_bsd/compat-43/creat.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)creat.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/compat-43/creat.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include "namespace.h"
-#include <fcntl.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-__weak_reference(__creat, creat);
-__weak_reference(__creat, _creat);
-
-#pragma weak creat
-int
-__creat(const char *path, mode_t mode)
-{
-
-	return (((int (*)(int, const char *, int, ...))
-	    __libc_interposing[INTERPOS_openat])(AT_FDCWD, path, O_WRONLY |
-	    O_CREAT | O_TRUNC, mode));
-}
-
diff --git a/lib/libc_bsd/compat-43/gethostid.3 b/lib/libc_bsd/compat-43/gethostid.3
deleted file mode 100644
index 9305f36..0000000
--- a/lib/libc_bsd/compat-43/gethostid.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)gethostid.3	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD: releng/10.2/lib/libc/compat-43/gethostid.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 2, 1993
-.Dt GETHOSTID 3
-.Os
-.Sh NAME
-.Nm gethostid ,
-.Nm sethostid
-.Nd get/set unique identifier of current host
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft long
-.Fn gethostid void
-.Ft void
-.Fn sethostid "long hostid"
-.Sh DESCRIPTION
-The
-.Fn sethostid
-function
-establishes a 32-bit identifier for the
-current processor that is intended to be unique among all
-UNIX systems in existence.
-This is normally a DARPA Internet
-address for the local machine.
-This call is allowed only to the
-super-user and is normally performed at boot time.
-.Pp
-The
-.Fn gethostid
-function
-returns the 32-bit identifier for the current processor.
-.Pp
-This function has been deprecated.
-The hostid should be set or retrieved by use of
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr gethostname 3 ,
-.Xr sysctl 3 ,
-.Xr sysctl 8
-.Sh HISTORY
-The
-.Fn gethostid
-and
-.Fn sethostid
-syscalls appeared in
-.Bx 4.2
-and were dropped in
-.Bx 4.4 .
-.Sh BUGS
-32 bits for the identifier is too small.
diff --git a/lib/libc_bsd/compat-43/gethostid.c b/lib/libc_bsd/compat-43/gethostid.c
deleted file mode 100644
index abb7f97..0000000
--- a/lib/libc_bsd/compat-43/gethostid.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/compat-43/gethostid.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <unistd.h>
-
-long
-gethostid(void)
-{
-	int mib[2];
-	size_t size;
-	long value;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTID;
-	size = sizeof value;
-	if (sysctl(mib, 2, &value, &size, NULL, 0) == -1)
-		return (-1);
-	return (value);
-}
diff --git a/lib/libc_bsd/compat-43/getwd.c b/lib/libc_bsd/compat-43/getwd.c
deleted file mode 100644
index c70644e..0000000
--- a/lib/libc_bsd/compat-43/getwd.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getwd.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/compat-43/getwd.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-char *
-getwd(char *buf)
-{
-	char *p;
-
-	if ( (p = getcwd(buf, MAXPATHLEN)) )
-		return(p);
-	(void)strerror_r(errno, buf, MAXPATHLEN);
-	return((char *)NULL);
-}
diff --git a/lib/libc_bsd/compat-43/killpg.2 b/lib/libc_bsd/compat-43/killpg.2
deleted file mode 100644
index 38ab87f..0000000
--- a/lib/libc_bsd/compat-43/killpg.2
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)killpg.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD: releng/10.2/lib/libc/compat-43/killpg.2 241855 2012-10-22 03:37:00Z eadler $
-.\"
-.Dd March 15, 2012
-.Dt KILLPG 2
-.Os
-.Sh NAME
-.Nm killpg
-.Nd send signal to a process group
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In signal.h
-.Ft int
-.Fn killpg "pid_t pgrp" "int sig"
-.Sh DESCRIPTION
-The
-.Fn killpg
-function
-sends the signal
-.Fa sig
-to the process group
-.Fa pgrp .
-See
-.Xr sigaction 2
-for a list of signals.
-If
-.Fa pgrp
-is 0,
-.Fn killpg
-sends the signal to the sending process's process group.
-.Pp
-The sending process must be able to
-.Fn kill
-at least one process in the receiving process group.
-.Sh RETURN VALUES
-.Rv -std killpg
-.Sh ERRORS
-The
-.Fn killpg
-function
-will fail and no signal will be sent if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sig
-argument
-is not a valid signal number.
-.It Bq Er ESRCH
-No process can be found in the process group specified by
-.Fa pgrp .
-.It Bq Er EPERM
-.Fn kill
-returns EPERM for all processes in the process group.
-.El
-.Sh SEE ALSO
-.Xr getpgrp 2 ,
-.Xr kill 2 ,
-.Xr sigaction 2
-.Sh HISTORY
-The
-.Fn killpg
-function appeared in
-.Bx 4.0 .
diff --git a/lib/libc_bsd/compat-43/killpg.c b/lib/libc_bsd/compat-43/killpg.c
deleted file mode 100644
index 936e8e4..0000000
--- a/lib/libc_bsd/compat-43/killpg.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)killpg.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/compat-43/killpg.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <signal.h>
-#include <errno.h>
-
-/*
- * Backwards-compatible killpg().
- */
-int
-killpg(pid_t pgid, int sig)
-{
-	if (pgid == 1) {
-		errno = ESRCH;
-		return (-1);
-	}
-	return (kill(-pgid, sig));
-}
diff --git a/lib/libc_bsd/compat-43/sethostid.c b/lib/libc_bsd/compat-43/sethostid.c
deleted file mode 100644
index 286784d..0000000
--- a/lib/libc_bsd/compat-43/sethostid.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sethostid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/compat-43/sethostid.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <unistd.h>
-
-void
-sethostid(long hostid)
-{
-	int mib[2];
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTID;
-	sysctl(mib, 2, NULL, NULL, &hostid, sizeof hostid);
-}
diff --git a/lib/libc_bsd/compat-43/setpgrp.c b/lib/libc_bsd/compat-43/setpgrp.c
deleted file mode 100644
index d1fa11b..0000000
--- a/lib/libc_bsd/compat-43/setpgrp.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setpgrp.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/compat-43/setpgrp.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <unistd.h>
-
-int
-setpgrp(pid_t pid, pid_t pgid)
-{
-	return(setpgid(pid, pgid));
-}
diff --git a/lib/libc_bsd/compat-43/setrgid.c b/lib/libc_bsd/compat-43/setrgid.c
deleted file mode 100644
index 95b95d7..0000000
--- a/lib/libc_bsd/compat-43/setrgid.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setrgid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/compat-43/setrgid.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <unistd.h>
-
-int
-setrgid(gid_t rgid)
-{
-
-	return (setregid(rgid, -1));
-}
diff --git a/lib/libc_bsd/compat-43/setruid.3 b/lib/libc_bsd/compat-43/setruid.3
deleted file mode 100644
index 4d5e95b..0000000
--- a/lib/libc_bsd/compat-43/setruid.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)setruid.3	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD: releng/10.2/lib/libc/compat-43/setruid.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 2, 1993
-.Dt SETRUID 3
-.Os
-.Sh NAME
-.Nm setruid ,
-.Nm setrgid
-.Nd set user and group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn setruid "uid_t ruid"
-.Ft int
-.Fn setrgid "gid_t rgid"
-.Sh DESCRIPTION
-The
-.Fn setruid
-function
-.Pq Fn setrgid
-sets the real user ID (group ID) of the
-current process.
-.Sh RETURN VALUES
-.Rv -std
-.Sh COMPATIBILITY
-The use of these calls is not portable.
-Their use is discouraged; they will be removed in the future.
-.Sh ERRORS
-The functions fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The user is not the super user and the ID
-specified is not the real or effective ID.
-.El
-.Sh SEE ALSO
-.Xr getgid 2 ,
-.Xr getuid 2 ,
-.Xr setegid 2 ,
-.Xr seteuid 2 ,
-.Xr setgid 2 ,
-.Xr setuid 2
-.Sh HISTORY
-The
-.Fn setruid
-and
-.Fn setrgid
-syscalls appeared in
-.Bx 4.2
-and were dropped in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/compat-43/setruid.c b/lib/libc_bsd/compat-43/setruid.c
deleted file mode 100644
index 48b1066..0000000
--- a/lib/libc_bsd/compat-43/setruid.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setruid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/compat-43/setruid.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <unistd.h>
-
-int
-setruid(uid_t ruid)
-{
-
-	return (setreuid(ruid, -1));
-}
diff --git a/lib/libc_bsd/compat-43/sigcompat.c b/lib/libc_bsd/compat-43/sigcompat.c
deleted file mode 100644
index e00b5a9..0000000
--- a/lib/libc_bsd/compat-43/sigcompat.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sigcompat.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/compat-43/sigcompat.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-int
-sigvec(signo, sv, osv)
-	int signo;
-	struct sigvec *sv, *osv;
-{
-	struct sigaction sa, osa;
-	struct sigaction *sap, *osap;
-	int ret;
-
-	if (sv != NULL) {
-		sa.sa_handler = sv->sv_handler;
-		sa.sa_flags = sv->sv_flags ^ SV_INTERRUPT;
-		sigemptyset(&sa.sa_mask);
-		sa.sa_mask.__bits[0] = sv->sv_mask;
-		sap = &sa;
-	} else
-		sap = NULL;
-	osap = osv != NULL ? &osa : NULL;
-	ret = __libc_sigaction(signo, sap, osap);
-	if (ret == 0 && osv != NULL) {
-		osv->sv_handler = osa.sa_handler;
-		osv->sv_flags = osa.sa_flags ^ SV_INTERRUPT;
-		osv->sv_mask = osa.sa_mask.__bits[0];
-	}
-	return (ret);
-}
-
-int
-sigsetmask(mask)
-	int mask;
-{
-	sigset_t set, oset;
-	int n;
-
-	sigemptyset(&set);
-	set.__bits[0] = mask;
-	n = __libc_sigprocmask(SIG_SETMASK, &set, &oset);
-	if (n)
-		return (n);
-	return (oset.__bits[0]);
-}
-
-int
-sigblock(mask)
-	int mask;
-{
-	sigset_t set, oset;
-	int n;
-
-	sigemptyset(&set);
-	set.__bits[0] = mask;
-	n = __libc_sigprocmask(SIG_BLOCK, &set, &oset);
-	if (n)
-		return (n);
-	return (oset.__bits[0]);
-}
-
-int
-sigpause(int mask)
-{
-	sigset_t set;
-
-	sigemptyset(&set);
-	set.__bits[0] = mask;
-	return (__libc_sigsuspend(&set));
-}
-
-int
-xsi_sigpause(int sig)
-{
-	sigset_t set;
-
-	if (__libc_sigprocmask(SIG_BLOCK, NULL, &set) == -1)
-		return (-1);
-	if (sigdelset(&set, sig) == -1)
-		return (-1);
-	return (__libc_sigsuspend(&set));
-}
-
-int
-sighold(int sig)
-{
-	sigset_t set;
-
-	sigemptyset(&set);
-	if (sigaddset(&set, sig) == -1)
-		return (-1);
-	return (__libc_sigprocmask(SIG_BLOCK, &set, NULL));
-}
-
-int
-sigignore(int sig)
-{
-	struct sigaction sa;
-
-	bzero(&sa, sizeof(sa));
-	sa.sa_handler = SIG_IGN;
-	return (__libc_sigaction(sig, &sa, NULL));
-}
-
-int
-sigrelse(int sig)
-{
-	sigset_t set;
-
-	sigemptyset(&set);
-	if (sigaddset(&set, sig) == -1)
-		return (-1);
-	return (__libc_sigprocmask(SIG_UNBLOCK, &set, NULL));
-}
-
-void
-(*sigset(int sig, void (*disp)(int)))(int)
-{
-	sigset_t set, pset;
-	struct sigaction sa, psa;
-
-	sigemptyset(&set);
-	if (sigaddset(&set, sig) == -1)
-		return (SIG_ERR);
-	if (__libc_sigprocmask(SIG_BLOCK, NULL, &pset) == -1)
-		return (SIG_ERR);
-	if ((__sighandler_t *)disp == SIG_HOLD) {
-		if (__libc_sigprocmask(SIG_BLOCK, &set, &pset) == -1)
-			return (SIG_ERR);
-		if (sigismember(&pset, sig))
-			return (SIG_HOLD);
-		else {
-			if (__libc_sigaction(sig, NULL, &psa) == -1)
-				return (SIG_ERR);
-			return (psa.sa_handler);
-		}
-	} else {
-		if (__libc_sigprocmask(SIG_UNBLOCK, &set, &pset) == -1)
-			return (SIG_ERR);
-	}
-
-	bzero(&sa, sizeof(sa));
-	sa.sa_handler = disp;
-	if (__libc_sigaction(sig, &sa, &psa) == -1)
-		return (SIG_ERR);
-	if (sigismember(&pset, sig))
-		return (SIG_HOLD);
-	else
-		return (psa.sa_handler);
-}
diff --git a/lib/libc_bsd/compat-43/sigpause.2 b/lib/libc_bsd/compat-43/sigpause.2
deleted file mode 100644
index 27ec209..0000000
--- a/lib/libc_bsd/compat-43/sigpause.2
+++ /dev/null
@@ -1,243 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)sigpause.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD: releng/10.2/lib/libc/compat-43/sigpause.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.\" Part of the content of the man page was derived from
-.\" The Open Group Base Specifications Issue 7
-.\" IEEE Std 1003.1-2008
-.\"
-.Dd June 2, 1993
-.Dt SIGPAUSE 2
-.Os
-.Sh NAME
-.Nm sighold ,
-.Nm sigignore ,
-.Nm sigpause ,
-.Nm sigrelse ,
-.Nm sigset
-.Nd legacy interface for signal management
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sighold "int sig"
-.Ft int
-.Fn sigignore "int sig"
-.Ft int
-.Fn xsi_sigpause "int sigmask"
-.Ft int
-.Fn sigrelse "int sig"
-.Ft void (*)(int)
-.Fn sigset "int" "void (*disp)(int)"
-.Ft int
-.Fn sigpause "int sigmask"
-.Sh DESCRIPTION
-.Sy This interface is made obsolete by
-.Xr sigsuspend 2
-.Sy and
-.Xr sigaction 2 .
-.Pp
-The
-.Fn sigset
-function modifies signal dispositions.
-The
-.Fa sig
-argument specifies the signal, which may be any signal except
-.Dv SIGKILL
-and
-.Dv SIGSTOP .
-The
-.Fa disp
-argument specifies the signal's disposition,
-which may be
-.Dv SIG_DFL ,
-.Dv SIG_IGN ,
-or the address of a signal handler.
-If
-.Fn sigset
-is used, and
-.Fa disp
-is the address of a signal handler, the
-system adds
-.Fa sig
-to the signal mask of the calling process before executing the signal
-handler; when the signal handler returns, the system restores the
-signal mask of the calling process to its state prior to the delivery
-of the signal.
-In addition, if
-.Fn sigset
-is used, and
-.Fa disp
-is equal to
-.Dv SIG_HOLD ,
-.Fa sig
-is added to the signal
-mask of the calling process and
-.Fa sig 's
-disposition remains unchanged.
-If
-.Fn sigset
-is used, and
-.Fa disp
-is not equal to
-.Dv SIG_HOLD ,
-.Fa sig
-is removed from the signal mask of the calling process.
-.Pp
-The
-.Fn sighold
-function adds
-.Fa sig
-to the signal mask of the calling process.
-.Pp
-The
-.Fn sigrelse
-function removes
-.Fa sig
-from the signal mask of the calling process.
-.Pp
-The
-.Fn sigignore
-function sets the disposition of
-.Fa sig
-to
-.Dv SIG_IGN .
-.Pp
-The
-.Fn xsi_sigpause
-function removes
-.Fa sig
-from the signal mask of the calling process and suspend the calling process
-until a signal is received.
-The
-.Fn xsi_sigpause
-function restores the signal mask of the process to its original state before
-returning.
-.Pp
-The
-.Fn sigpause
-function
-assigns
-.Fa sigmask
-to the set of masked signals
-and then waits for a signal to arrive;
-on return the set of masked signals is restored.
-The
-.Fa sigmask
-argument
-is usually 0 to indicate that no
-signals are to be blocked.
-.Sh RETURN VALUES
-The
-.Fn sigpause
-and
-.Fn xsi_sigpause
-functions
-always terminate by being interrupted, returning -1 with
-.Va errno
-set to
-.Er EINTR .
-.Pp
-Upon successful completion,
-.Fn sigset
-returns
-.Dv SIG_HOLD
-if the signal had been blocked and the signal's previous disposition if
-it had not been blocked.
-Otherwise,
-.Dv SIG_ERR
-is returned and
-.Va errno
-set to indicate the error.
-.Pp
-For all other functions, upon successful completion, 0 is returned.
-Otherwise, -1 is returned and
-.Va errno
-is set to indicate the error:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sig
-argument
-is not a valid signal number.
-.It Bq Er EINVAL
-For
-.Fn sigset
-and
-.Fn sigignore
-functions, an attempt was made to catch or ignore
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-.El
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigblock 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr sigvec 2
-.Sh STANDARDS
-The
-.Fn sigpause
-function is implemented for compatibility with historic
-.Bx 4.3
-applications.
-An incompatible interface by the same name, which used a single signal number
-rather than a mask, was present in
-.At V ,
-and was copied from there into the
-.Sy X/Open System Interfaces
-.Pq Tn XSI
-option of
-.St -p1003.1-2001 .
-.Fx
-implements it under the name
-.Fn xsi_sigpause .
-The
-.Fn sighold ,
-.Fn sigignore ,
-.Fn sigrelse
-and
-.Fn sigset
-functions are implemented for compatibility with
-.Sy System V
-and
-.Sy XSI
-interfaces.
-.Sh HISTORY
-The
-.Fn sigpause
-function appeared in
-.Bx 4.2
-and has been deprecated.
-All other functions appeared in
-.Fx 8.1
-and were deprecated before being implemented.
diff --git a/lib/libc_bsd/compat-43/sigsetmask.2 b/lib/libc_bsd/compat-43/sigsetmask.2
deleted file mode 100644
index 4838a86..0000000
--- a/lib/libc_bsd/compat-43/sigsetmask.2
+++ /dev/null
@@ -1,103 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)sigsetmask.2	8.1 (Berkeley) 6/2/93
-.\" $FreeBSD: releng/10.2/lib/libc/compat-43/sigsetmask.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 2, 1993
-.Dt SIGSETMASK 2
-.Os
-.Sh NAME
-.Nm sigsetmask ,
-.Nm sigblock
-.Nd manipulate current signal mask
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigsetmask "int mask"
-.Ft int
-.Fn sigblock "int mask"
-.Ft int
-.Fn sigmask "int signum"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by:
-.Ef
-.Xr sigprocmask 2 .
-.Pp
-The
-.Fn sigsetmask
-function
-sets the current signal mask to the specified
-.Fa mask .
-Signals are blocked from delivery if the corresponding bit in
-.Fa mask
-is a 1.
-The
-.Fn sigblock
-function
-adds the signals in the specified
-.Fa mask
-to the current signal mask,
-rather than overwriting it as
-.Fn sigsetmask
-does.
-The macro
-.Fn sigmask
-is provided to construct the mask for a given
-.Fa signum .
-.Pp
-The system
-quietly disallows
-.Dv SIGKILL
-or
-.Dv SIGSTOP
-to be blocked.
-.Sh RETURN VALUES
-The
-.Fn sigblock
-and
-.Fn sigsetmask
-functions
-return the previous set of masked signals.
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr sigvec 2 ,
-.Xr sigsetops 3
-.Sh HISTORY
-The
-.Fn sigsetmask
-and
-.Fn sigblock
-functions first appeared in
-.Bx 4.2
-and have been deprecated.
diff --git a/lib/libc_bsd/compat-43/sigvec.2 b/lib/libc_bsd/compat-43/sigvec.2
deleted file mode 100644
index b90e28c..0000000
--- a/lib/libc_bsd/compat-43/sigvec.2
+++ /dev/null
@@ -1,342 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)sigvec.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/compat-43/sigvec.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 19, 1994
-.Dt SIGVEC 2
-.Os
-.Sh NAME
-.Nm sigvec
-.Nd software signal facilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Bd -literal
-struct sigvec {
-        void     (*sv_handler)();
-	int      sv_mask;
-	int      sv_flags;
-};
-.Ed
-.Ft int
-.Fn sigvec "int sig" "struct sigvec *vec" "struct sigvec *ovec"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by
-.Xr sigaction 2 .
-.Ef
-.Pp
-The system defines a set of signals that may be delivered to a process.
-Signal delivery resembles the occurrence of a hardware interrupt:
-the signal is blocked from further occurrence, the current process
-context is saved, and a new one is built.
-A process may specify a
-.Em handler
-to which a signal is delivered, or specify that a signal is to be
-.Em blocked
-or
-.Em ignored .
-A process may also specify that a default action is to be taken
-by the system when a signal occurs.
-Normally, signal handlers execute on the current stack
-of the process.
-This may be changed, on a per-handler basis,
-so that signals are taken on a special
-.Em "signal stack" .
-.Pp
-All signals have the same
-.Em priority .
-Signal routines execute with the signal that caused their
-invocation
-.Em blocked ,
-but other signals may yet occur.
-A global
-.Em "signal mask"
-defines the set of signals currently blocked from delivery
-to a process.
-The signal mask for a process is initialized
-from that of its parent (normally 0).
-It
-may be changed with a
-.Xr sigblock 2
-or
-.Xr sigsetmask 2
-call, or when a signal is delivered to the process.
-.Pp
-When a signal
-condition arises for a process, the signal is added to a set of
-signals pending for the process.
-If the signal is not currently
-.Em blocked
-by the process then it is delivered to the process.
-When a signal
-is delivered, the current state of the process is saved,
-a new signal mask is calculated (as described below),
-and the signal handler is invoked.
-The call to the handler
-is arranged so that if the signal handling routine returns
-normally the process will resume execution in the context
-from before the signal's delivery.
-If the process wishes to resume in a different context, then it
-must arrange to restore the previous context itself.
-.Pp
-When a signal is delivered to a process a new signal mask is
-installed for the duration of the process' signal handler
-(or until a
-.Xr sigblock 2
-or
-.Xr sigsetmask 2
-call is made).
-This mask is formed by taking the current signal mask,
-adding the signal to be delivered, and
-.Em or Ns 'ing
-in the signal mask associated with the handler to be invoked.
-.Pp
-The
-.Fn sigvec
-function
-assigns a handler for a specific signal.
-If
-.Fa vec
-is non-zero, it
-specifies a handler routine and mask
-to be used when delivering the specified signal.
-Further, if the
-.Dv SV_ONSTACK
-bit is set in
-.Fa sv_flags ,
-the system will deliver the signal to the process on a
-.Em "signal stack" ,
-specified with
-.Xr sigaltstack 2 .
-If
-.Fa ovec
-is non-zero, the previous handling information for the signal
-is returned to the user.
-.Pp
-The following is a list of all signals
-with names as in the include file
-.In signal.h :
-.Bl -column SIGVTALARMXX "create core imagexxx"
-.It Sy "NAME	Default Action	Description"
-.It Dv SIGHUP No "	terminate process" "	terminal line hangup"
-.It Dv SIGINT No "	terminate process" "	interrupt program"
-.It Dv SIGQUIT No "	create core image" "	quit program"
-.It Dv SIGILL No "	create core image" "	illegal instruction"
-.It Dv SIGTRAP No "	create core image" "	trace trap"
-.It Dv SIGABRT No "	create core image" Ta Xr abort 3
-call (formerly
-.Dv SIGIOT )
-.It Dv SIGEMT No "	create core image" "	emulate instruction executed"
-.It Dv SIGFPE No "	create core image" "	floating-point exception"
-.It Dv SIGKILL No "	terminate process" "	kill program"
-.It Dv SIGBUS No "	create core image" "	bus error"
-.It Dv SIGSEGV No "	create core image" "	segmentation violation"
-.It Dv SIGSYS No "	create core image" "	non-existent system call invoked"
-.It Dv SIGPIPE No "	terminate process" "	write on a pipe with no reader"
-.It Dv SIGALRM No "	terminate process" "	real-time timer expired"
-.It Dv SIGTERM No "	terminate process" "	software termination signal"
-.It Dv SIGURG No "	discard signal" "	urgent condition present on socket"
-.It Dv SIGSTOP No "	stop process" "	stop (cannot be caught or ignored)"
-.It Dv SIGTSTP No "	stop process" "	stop signal generated from keyboard"
-.It Dv SIGCONT No "	discard signal" "	continue after stop"
-.It Dv SIGCHLD No "	discard signal" "	child status has changed"
-.It Dv SIGTTIN No "	stop process" "	background read attempted from control terminal"
-.It Dv SIGTTOU No "	stop process" "	background write attempted to control terminal"
-.It Dv SIGIO No "	discard signal" Tn "	I/O"
-is possible on a descriptor (see
-.Xr fcntl 2 )
-.It Dv SIGXCPU No "	terminate process" "	cpu time limit exceeded (see"
-.Xr setrlimit 2 )
-.It Dv SIGXFSZ No "	terminate process" "	file size limit exceeded (see"
-.Xr setrlimit 2 )
-.It Dv SIGVTALRM No "	terminate process" "	virtual time alarm (see"
-.Xr setitimer 2 )
-.It Dv SIGPROF No "	terminate process" "	profiling timer alarm (see"
-.Xr setitimer 2 )
-.It Dv SIGWINCH No "	discard signal" "	Window size change"
-.It Dv SIGINFO No "	discard signal" "	status request from keyboard"
-.It Dv SIGUSR1 No "	terminate process" "	User defined signal 1"
-.It Dv SIGUSR2 No "	terminate process" "	User defined signal 2"
-.El
-.Pp
-Once a signal handler is installed, it remains installed
-until another
-.Fn sigvec
-call is made, or an
-.Xr execve 2
-is performed.
-A signal-specific default action may be reset by
-setting
-.Fa sv_handler
-to
-.Dv SIG_DFL .
-The defaults are process termination, possibly with core dump;
-no action; stopping the process; or continuing the process.
-See the above signal list for each signal's default action.
-If
-.Fa sv_handler
-is
-.Dv SIG_IGN
-current and pending instances
-of the signal are ignored and discarded.
-.Pp
-If a signal is caught during the system calls listed below,
-the call is normally restarted.
-The call can be forced to terminate prematurely with an
-.Er EINTR
-error return by setting the
-.Dv SV_INTERRUPT
-bit in
-.Fa sv_flags .
-The affected system calls include
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr sendto 2 ,
-.Xr recvfrom 2 ,
-.Xr sendmsg 2
-and
-.Xr recvmsg 2
-on a communications channel or a slow device (such as a terminal,
-but not a regular file)
-and during a
-.Xr wait 2
-or
-.Xr ioctl 2 .
-However, calls that have already committed are not restarted,
-but instead return a partial success (for example, a short read count).
-.Pp
-After a
-.Xr fork 2
-or
-.Xr vfork 2
-all signals, the signal mask, the signal stack,
-and the restart/interrupt flags are inherited by the child.
-.Pp
-The
-.Xr execve 2
-system call reinstates the default
-action for all signals which were caught and
-resets all signals to be caught on the user stack.
-Ignored signals remain ignored;
-the signal mask remains the same;
-signals that interrupt system calls continue to do so.
-.Sh NOTES
-The mask specified in
-.Fa vec
-is not allowed to block
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-This is done silently by the system.
-.Pp
-The
-.Dv SV_INTERRUPT
-flag is not available in
-.Bx 4.2 ,
-hence it should not be used if backward compatibility is needed.
-.Sh RETURN VALUES
-.Rv -std sigvec
-.Sh EXAMPLES
-On the
-.Tn VAX\-11
-The handler routine can be declared:
-.Bd -literal -offset indent
-void handler(sig, code, scp)
-int sig, code;
-struct sigcontext *scp;
-.Ed
-.Pp
-Here
-.Fa sig
-is the signal number, into which the hardware faults and traps are
-mapped as defined below.
-The
-.Fa code
-argument
-is either a constant
-as given below or, for compatibility mode faults, the code provided by
-the hardware (Compatibility mode faults are distinguished from the
-other
-.Dv SIGILL
-traps by having
-.Dv PSL_CM
-set in the psl).
-The
-.Fa scp
-argument
-is a pointer to the
-.Fa sigcontext
-structure (defined in
-.In signal.h ) ,
-used to restore the context from before the signal.
-.Sh ERRORS
-The
-.Fn sigvec
-function
-will fail and no new signal handler will be installed if one
-of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Either
-.Fa vec
-or
-.Fa ovec
-points to memory that is not a valid part of the process
-address space.
-.It Bq Er EINVAL
-The
-.Fa sig
-argument
-is not a valid signal number.
-.It Bq Er EINVAL
-An attempt is made to ignore or supply a handler for
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-.El
-.Sh SEE ALSO
-.Xr kill 1 ,
-.Xr kill 2 ,
-.Xr ptrace 2 ,
-.Xr sigaction 2 ,
-.Xr sigaltstack 2 ,
-.Xr sigblock 2 ,
-.Xr sigpause 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsetmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr setjmp 3 ,
-.Xr siginterrupt 3 ,
-.Xr signal 3 ,
-.Xr sigsetops 3 ,
-.Xr tty 4
-.Sh BUGS
-This manual page is still confusing.
diff --git a/lib/libc_bsd/db/Makefile.inc b/lib/libc_bsd/db/Makefile.inc
deleted file mode 100644
index ed0f993..0000000
--- a/lib/libc_bsd/db/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-#	from @(#)Makefile.inc	8.2 (Berkeley) 2/21/94
-Makefile.incl 156613 2006-03-13 01:15:01Z deischen $
-#
-CFLAGS+=-D__DBINTERFACE_PRIVATE
-
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-Makefile.incl"
-
-SYM_MAPS+=${.CURDIR}/db/Symbol.map
diff --git a/lib/libc_bsd/db/README b/lib/libc_bsd/db/README
deleted file mode 100644
index 10e73c0..0000000
--- a/lib/libc_bsd/db/README
+++ /dev/null
@@ -1,34 +0,0 @@
-#	@(#)README	8.27 (Berkeley) 9/1/94
-# $FreeBSD: releng/10.2/lib/libc/db/README 190482 2009-03-28 04:00:46Z delphij $
-
-This is version 1.85 of the Berkeley DB code.
-
-For information on compiling and installing this software, see the file
-PORT/README.
-
-Newer versions of this software will periodically be made available by
-anonymous ftp from ftp.cs.berkeley.edu.  An archive in compressed format
-is in ucb/4bsd/db.tar.Z, or in gzip format in ucb/4bsd/db.tar.gz.  If
-you'd like to receive announcements of future releases of this software,
-send email to the contact address below.
-
-Email questions may be addressed to Keith Bostic at bostic@cs.berkeley.edu.
-
-============================================
-Distribution contents:
-
-Makefile.inc	Ignore this, it's the 4.4BSD subsystem Makefile.
-PORT		The per OS/architecture directories to use to build
-		libdb.a, if you're not running 4.4BSD.  See the file
-		PORT/README for more information.
-README		This file.
-btree		The B+tree routines.
-changelog	List of changes, per version.
-db		The dbopen(3) interface routine.
-docs		Various USENIX papers, and the formatted manual pages.
-hash		The extended linear hashing routines.
-man		The unformatted manual pages.
-mpool		The memory pool routines.
-recno		The fixed/variable length record routines.
-test		Test package.
-
diff --git a/lib/libc_bsd/db/Symbol.map b/lib/libc_bsd/db/Symbol.map
deleted file mode 100644
index f5397b7..0000000
--- a/lib/libc_bsd/db/Symbol.map
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/db/Symbol.map 190498 2009-03-28 07:31:02Z delphij $
- */
-
-FBSD_1.0 {
-	dbopen;
-	dbm_open;
-	dbm_close;
-	dbm_fetch;
-	dbm_firstkey;
-	dbm_nextkey;
-	dbm_delete;
-	dbm_store;
-	dbm_error;
-	dbm_clearerr;
-	dbm_dirfno;
-	mpool_open;
-	mpool_filter;
-	mpool_get;
-	mpool_put;
-	mpool_close;
-	mpool_sync;
-	mpool_stat;
-};
-
-FBSD_1.1 {
-	mpool_new;
-	mpool_delete;
-};
-
-FBSDprivate_1.0 {
-	__bt_open;
-	__dbpanic;
-	__hash_open;
-	__rec_open;
-};
diff --git a/lib/libc_bsd/db/btree/Makefile.inc b/lib/libc_bsd/db/btree/Makefile.inc
deleted file mode 100644
index 3f4131d..0000000
--- a/lib/libc_bsd/db/btree/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	from @(#)Makefile.inc	8.2 (Berkeley) 7/14/94
-Makefile.incl 107052 2002-11-18 09:50:57Z ru $
-
-.PATH: ${.CURDIR}/db/btree
-
-SRCS+=	bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \
-	bt_overflow.c bt_page.c bt_put.c bt_search.c bt_seq.c bt_split.c \
-	bt_utils.c
diff --git a/lib/libc_bsd/db/btree/bt_close.c b/lib/libc_bsd/db/btree/bt_close.c
deleted file mode 100644
index 2629462..0000000
--- a/lib/libc_bsd/db/btree/bt_close.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_close.c	8.7 (Berkeley) 8/17/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_close.c 189291 2009-03-02 23:47:18Z delphij $");
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-#include "btree.h"
-
-static int bt_meta(BTREE *);
-
-/*
- * BT_CLOSE -- Close a btree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__bt_close(DB *dbp)
-{
-	BTREE *t;
-	int fd;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Sync the tree. */
-	if (__bt_sync(dbp, 0) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Close the memory pool. */
-	if (mpool_close(t->bt_mp) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Free random memory. */
-	if (t->bt_cursor.key.data != NULL) {
-		free(t->bt_cursor.key.data);
-		t->bt_cursor.key.size = 0;
-		t->bt_cursor.key.data = NULL;
-	}
-	if (t->bt_rkey.data) {
-		free(t->bt_rkey.data);
-		t->bt_rkey.size = 0;
-		t->bt_rkey.data = NULL;
-	}
-	if (t->bt_rdata.data) {
-		free(t->bt_rdata.data);
-		t->bt_rdata.size = 0;
-		t->bt_rdata.data = NULL;
-	}
-
-	fd = t->bt_fd;
-	free(t);
-	free(dbp);
-	return (_close(fd) ? RET_ERROR : RET_SUCCESS);
-}
-
-/*
- * BT_SYNC -- sync the btree to disk.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__bt_sync(const DB *dbp, u_int flags)
-{
-	BTREE *t;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Sync doesn't currently take any flags. */
-	if (flags != 0) {
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (F_ISSET(t, B_INMEM | B_RDONLY) || !F_ISSET(t, B_MODIFIED))
-		return (RET_SUCCESS);
-
-	if (F_ISSET(t, B_METADIRTY) && bt_meta(t) == RET_ERROR)
-		return (RET_ERROR);
-
-	if ((status = mpool_sync(t->bt_mp)) == RET_SUCCESS)
-		F_CLR(t, B_MODIFIED);
-
-	return (status);
-}
-
-/*
- * BT_META -- write the tree meta data to disk.
- *
- * Parameters:
- *	t:	tree
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-bt_meta(BTREE *t)
-{
-	BTMETA m;
-	void *p;
-
-	if ((p = mpool_get(t->bt_mp, P_META, 0)) == NULL)
-		return (RET_ERROR);
-
-	/* Fill in metadata. */
-	m.magic = BTREEMAGIC;
-	m.version = BTREEVERSION;
-	m.psize = t->bt_psize;
-	m.free = t->bt_free;
-	m.nrecs = t->bt_nrecs;
-	m.flags = F_ISSET(t, SAVEMETA);
-
-	memmove(p, &m, sizeof(BTMETA));
-	mpool_put(t->bt_mp, p, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc_bsd/db/btree/bt_conv.c b/lib/libc_bsd/db/btree/bt_conv.c
deleted file mode 100644
index 2aca98f..0000000
--- a/lib/libc_bsd/db/btree/bt_conv.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_conv.c	8.5 (Berkeley) 8/17/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_conv.c 189291 2009-03-02 23:47:18Z delphij $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-static void mswap(PAGE *);
-
-/*
- * __BT_BPGIN, __BT_BPGOUT --
- *	Convert host-specific number layout to/from the host-independent
- *	format stored on disk.
- *
- * Parameters:
- *	t:	tree
- *	pg:	page number
- *	h:	page to convert
- */
-void
-__bt_pgin(void *t, pgno_t pg, void *pp)
-{
-	PAGE *h;
-	indx_t i, top;
-	u_char flags;
-	char *p;
-
-	if (!F_ISSET(((BTREE *)t), B_NEEDSWAP))
-		return;
-	if (pg == P_META) {
-		mswap(pp);
-		return;
-	}
-
-	h = pp;
-	M_32_SWAP(h->pgno);
-	M_32_SWAP(h->prevpg);
-	M_32_SWAP(h->nextpg);
-	M_32_SWAP(h->flags);
-	M_16_SWAP(h->lower);
-	M_16_SWAP(h->upper);
-
-	top = NEXTINDEX(h);
-	if ((h->flags & P_TYPE) == P_BINTERNAL)
-		for (i = 0; i < top; i++) {
-			M_16_SWAP(h->linp[i]);
-			p = (char *)GETBINTERNAL(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(pgno_t);
-			if (*(u_char *)p & P_BIGKEY) {
-				p += sizeof(u_char);
-				P_32_SWAP(p);
-				p += sizeof(pgno_t);
-				P_32_SWAP(p);
-			}
-		}
-	else if ((h->flags & P_TYPE) == P_BLEAF)
-		for (i = 0; i < top; i++) {
-			M_16_SWAP(h->linp[i]);
-			p = (char *)GETBLEAF(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			flags = *(u_char *)p;
-			if (flags & (P_BIGKEY | P_BIGDATA)) {
-				p += sizeof(u_char);
-				if (flags & P_BIGKEY) {
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-				if (flags & P_BIGDATA) {
-					p += sizeof(uint32_t);
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-			}
-		}
-}
-
-void
-__bt_pgout(void *t, pgno_t pg, void *pp)
-{
-	PAGE *h;
-	indx_t i, top;
-	u_char flags;
-	char *p;
-
-	if (!F_ISSET(((BTREE *)t), B_NEEDSWAP))
-		return;
-	if (pg == P_META) {
-		mswap(pp);
-		return;
-	}
-
-	h = pp;
-	top = NEXTINDEX(h);
-	if ((h->flags & P_TYPE) == P_BINTERNAL)
-		for (i = 0; i < top; i++) {
-			p = (char *)GETBINTERNAL(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(pgno_t);
-			if (*(u_char *)p & P_BIGKEY) {
-				p += sizeof(u_char);
-				P_32_SWAP(p);
-				p += sizeof(pgno_t);
-				P_32_SWAP(p);
-			}
-			M_16_SWAP(h->linp[i]);
-		}
-	else if ((h->flags & P_TYPE) == P_BLEAF)
-		for (i = 0; i < top; i++) {
-			p = (char *)GETBLEAF(h, i);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			P_32_SWAP(p);
-			p += sizeof(uint32_t);
-			flags = *(u_char *)p;
-			if (flags & (P_BIGKEY | P_BIGDATA)) {
-				p += sizeof(u_char);
-				if (flags & P_BIGKEY) {
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-				if (flags & P_BIGDATA) {
-					p += sizeof(uint32_t);
-					P_32_SWAP(p);
-					p += sizeof(pgno_t);
-					P_32_SWAP(p);
-				}
-			}
-			M_16_SWAP(h->linp[i]);
-		}
-
-	M_32_SWAP(h->pgno);
-	M_32_SWAP(h->prevpg);
-	M_32_SWAP(h->nextpg);
-	M_32_SWAP(h->flags);
-	M_16_SWAP(h->lower);
-	M_16_SWAP(h->upper);
-}
-
-/*
- * MSWAP -- Actually swap the bytes on the meta page.
- *
- * Parameters:
- *	p:	page to convert
- */
-static void
-mswap(PAGE *pg)
-{
-	char *p;
-
-	p = (char *)pg;
-	P_32_SWAP(p);		/* magic */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* version */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* psize */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* free */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* nrecs */
-	p += sizeof(uint32_t);
-	P_32_SWAP(p);		/* flags */
-	p += sizeof(uint32_t);
-}
diff --git a/lib/libc_bsd/db/btree/bt_debug.c b/lib/libc_bsd/db/btree/bt_debug.c
deleted file mode 100644
index 9b7ce1e..0000000
--- a/lib/libc_bsd/db/btree/bt_debug.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_debug.c	8.5 (Berkeley) 8/17/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_debug.c 190498 2009-03-28 07:31:02Z delphij $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-#ifdef DEBUG
-/*
- * BT_DUMP -- Dump the tree
- *
- * Parameters:
- *	dbp:	pointer to the DB
- */
-void
-__bt_dump(DB *dbp)
-{
-	BTREE *t;
-	PAGE *h;
-	pgno_t i;
-	char *sep;
-
-	t = dbp->internal;
-	(void)fprintf(stderr, "%s: pgsz %u",
-	    F_ISSET(t, B_INMEM) ? "memory" : "disk", t->bt_psize);
-	if (F_ISSET(t, R_RECNO))
-		(void)fprintf(stderr, " keys %u", t->bt_nrecs);
-#undef X
-#define	X(flag, name) \
-	if (F_ISSET(t, flag)) { \
-		(void)fprintf(stderr, "%s%s", sep, name); \
-		sep = ", "; \
-	}
-	if (t->flags != 0) {
-		sep = " flags (";
-		X(R_FIXLEN,	"FIXLEN");
-		X(B_INMEM,	"INMEM");
-		X(B_NODUPS,	"NODUPS");
-		X(B_RDONLY,	"RDONLY");
-		X(R_RECNO,	"RECNO");
-		X(B_METADIRTY,"METADIRTY");
-		(void)fprintf(stderr, ")\n");
-	}
-#undef X
-
-	for (i = P_ROOT;
-	    (h = mpool_get(t->bt_mp, i, MPOOL_IGNOREPIN)) != NULL; ++i)
-		__bt_dpage(h);
-}
-
-/*
- * BT_DMPAGE -- Dump the meta page
- *
- * Parameters:
- *	h:	pointer to the PAGE
- */
-void
-__bt_dmpage(PAGE *h)
-{
-	BTMETA *m;
-	char *sep;
-
-	m = (BTMETA *)h;
-	(void)fprintf(stderr, "magic %x\n", m->magic);
-	(void)fprintf(stderr, "version %u\n", m->version);
-	(void)fprintf(stderr, "psize %u\n", m->psize);
-	(void)fprintf(stderr, "free %u\n", m->free);
-	(void)fprintf(stderr, "nrecs %u\n", m->nrecs);
-	(void)fprintf(stderr, "flags %u", m->flags);
-#undef X
-#define	X(flag, name) \
-	if (m->flags & flag) { \
-		(void)fprintf(stderr, "%s%s", sep, name); \
-		sep = ", "; \
-	}
-	if (m->flags) {
-		sep = " (";
-		X(B_NODUPS,	"NODUPS");
-		X(R_RECNO,	"RECNO");
-		(void)fprintf(stderr, ")");
-	}
-}
-
-/*
- * BT_DNPAGE -- Dump the page
- *
- * Parameters:
- *	n:	page number to dump.
- */
-void
-__bt_dnpage(DB *dbp, pgno_t pgno)
-{
-	BTREE *t;
-	PAGE *h;
-
-	t = dbp->internal;
-	if ((h = mpool_get(t->bt_mp, pgno, MPOOL_IGNOREPIN)) != NULL)
-		__bt_dpage(h);
-}
-
-/*
- * BT_DPAGE -- Dump the page
- *
- * Parameters:
- *	h:	pointer to the PAGE
- */
-void
-__bt_dpage(PAGE *h)
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	RINTERNAL *ri;
-	RLEAF *rl;
-	indx_t cur, top;
-	char *sep;
-
-	(void)fprintf(stderr, "    page %u: (", h->pgno);
-#undef X
-#define	X(flag, name) \
-	if (h->flags & flag) { \
-		(void)fprintf(stderr, "%s%s", sep, name); \
-		sep = ", "; \
-	}
-	sep = "";
-	X(P_BINTERNAL,	"BINTERNAL")		/* types */
-	X(P_BLEAF,	"BLEAF")
-	X(P_RINTERNAL,	"RINTERNAL")		/* types */
-	X(P_RLEAF,	"RLEAF")
-	X(P_OVERFLOW,	"OVERFLOW")
-	X(P_PRESERVE,	"PRESERVE");
-	(void)fprintf(stderr, ")\n");
-#undef X
-
-	(void)fprintf(stderr, "\tprev %2u next %2u", h->prevpg, h->nextpg);
-	if (h->flags & P_OVERFLOW)
-		return;
-
-	top = NEXTINDEX(h);
-	(void)fprintf(stderr, " lower %3d upper %3d nextind %d\n",
-	    h->lower, h->upper, top);
-	for (cur = 0; cur < top; cur++) {
-		(void)fprintf(stderr, "\t[%03d] %4d ", cur, h->linp[cur]);
-		switch (h->flags & P_TYPE) {
-		case P_BINTERNAL:
-			bi = GETBINTERNAL(h, cur);
-			(void)fprintf(stderr,
-			    "size %03d pgno %03d", bi->ksize, bi->pgno);
-			if (bi->flags & P_BIGKEY)
-				(void)fprintf(stderr, " (indirect)");
-			else if (bi->ksize)
-				(void)fprintf(stderr,
-				    " {%.*s}", (int)bi->ksize, bi->bytes);
-			break;
-		case P_RINTERNAL:
-			ri = GETRINTERNAL(h, cur);
-			(void)fprintf(stderr, "entries %03d pgno %03d",
-				ri->nrecs, ri->pgno);
-			break;
-		case P_BLEAF:
-			bl = GETBLEAF(h, cur);
-			if (bl->flags & P_BIGKEY)
-				(void)fprintf(stderr,
-				    "big key page %u size %u/",
-				    *(pgno_t *)bl->bytes,
-				    *(uint32_t *)(bl->bytes + sizeof(pgno_t)));
-			else if (bl->ksize)
-				(void)fprintf(stderr, "%.*s/",
-				    bl->ksize, bl->bytes);
-			if (bl->flags & P_BIGDATA)
-				(void)fprintf(stderr,
-				    "big data page %u size %u",
-				    *(pgno_t *)(bl->bytes + bl->ksize),
-				    *(uint32_t *)(bl->bytes + bl->ksize +
-				    sizeof(pgno_t)));
-			else if (bl->dsize)
-				(void)fprintf(stderr, "%.*s",
-				    (int)bl->dsize, bl->bytes + bl->ksize);
-			break;
-		case P_RLEAF:
-			rl = GETRLEAF(h, cur);
-			if (rl->flags & P_BIGDATA)
-				(void)fprintf(stderr,
-				    "big data page %u size %u",
-				    *(pgno_t *)rl->bytes,
-				    *(uint32_t *)(rl->bytes + sizeof(pgno_t)));
-			else if (rl->dsize)
-				(void)fprintf(stderr,
-				    "%.*s", (int)rl->dsize, rl->bytes);
-			break;
-		}
-		(void)fprintf(stderr, "\n");
-	}
-}
-#endif
-
-#ifdef STATISTICS
-/*
- * BT_STAT -- Gather/print the tree statistics
- *
- * Parameters:
- *	dbp:	pointer to the DB
- */
-void
-__bt_stat(DB *dbp)
-{
-	extern u_long bt_cache_hit, bt_cache_miss, bt_pfxsaved, bt_rootsplit;
-	extern u_long bt_sortsplit, bt_split;
-	BTREE *t;
-	PAGE *h;
-	pgno_t i, pcont, pinternal, pleaf;
-	u_long ifree, lfree, nkeys;
-	int levels;
-
-	t = dbp->internal;
-	pcont = pinternal = pleaf = 0;
-	nkeys = ifree = lfree = 0;
-	for (i = P_ROOT;
-	    (h = mpool_get(t->bt_mp, i, MPOOL_IGNOREPIN)) != NULL; ++i)
-		switch (h->flags & P_TYPE) {
-		case P_BINTERNAL:
-		case P_RINTERNAL:
-			++pinternal;
-			ifree += h->upper - h->lower;
-			break;
-		case P_BLEAF:
-		case P_RLEAF:
-			++pleaf;
-			lfree += h->upper - h->lower;
-			nkeys += NEXTINDEX(h);
-			break;
-		case P_OVERFLOW:
-			++pcont;
-			break;
-		}
-
-	/* Count the levels of the tree. */
-	for (i = P_ROOT, levels = 0 ;; ++levels) {
-		h = mpool_get(t->bt_mp, i, MPOOL_IGNOREPIN);
-		if (h->flags & (P_BLEAF|P_RLEAF)) {
-			if (levels == 0)
-				levels = 1;
-			break;
-		}
-		i = F_ISSET(t, R_RECNO) ?
-		    GETRINTERNAL(h, 0)->pgno :
-		    GETBINTERNAL(h, 0)->pgno;
-	}
-
-	(void)fprintf(stderr, "%d level%s with %lu keys",
-	    levels, levels == 1 ? "" : "s", nkeys);
-	if (F_ISSET(t, R_RECNO))
-		(void)fprintf(stderr, " (%u header count)", t->bt_nrecs);
-	(void)fprintf(stderr,
-	    "\n%u pages (leaf %u, internal %u, overflow %u)\n",
-	    pinternal + pleaf + pcont, pleaf, pinternal, pcont);
-	(void)fprintf(stderr, "%lu cache hits, %lu cache misses\n",
-	    bt_cache_hit, bt_cache_miss);
-	(void)fprintf(stderr, "%lu splits (%lu root splits, %lu sort splits)\n",
-	    bt_split, bt_rootsplit, bt_sortsplit);
-	pleaf *= t->bt_psize - BTDATAOFF;
-	if (pleaf)
-		(void)fprintf(stderr,
-		    "%.0f%% leaf fill (%lu bytes used, %lu bytes free)\n",
-		    ((double)(pleaf - lfree) / pleaf) * 100,
-		    pleaf - lfree, lfree);
-	pinternal *= t->bt_psize - BTDATAOFF;
-	if (pinternal)
-		(void)fprintf(stderr,
-		    "%.0f%% internal fill (%lu bytes used, %lu bytes free\n",
-		    ((double)(pinternal - ifree) / pinternal) * 100,
-		    pinternal - ifree, ifree);
-	if (bt_pfxsaved)
-		(void)fprintf(stderr, "prefix checking removed %lu bytes.\n",
-		    bt_pfxsaved);
-}
-#endif
diff --git a/lib/libc_bsd/db/btree/bt_delete.c b/lib/libc_bsd/db/btree/bt_delete.c
deleted file mode 100644
index 589473b..0000000
--- a/lib/libc_bsd/db/btree/bt_delete.c
+++ /dev/null
@@ -1,635 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_delete.c	8.13 (Berkeley) 7/28/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_delete.c 189327 2009-03-04 00:58:04Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int __bt_bdelete(BTREE *, const DBT *);
-static int __bt_curdel(BTREE *, const DBT *, PAGE *, u_int);
-static int __bt_pdelete(BTREE *, PAGE *);
-static int __bt_relink(BTREE *, PAGE *);
-static int __bt_stkacq(BTREE *, PAGE **, CURSOR *);
-
-/*
- * __bt_delete
- *	Delete the item(s) referenced by a key.
- *
- * Return RET_SPECIAL if the key is not found.
- */
-int
-__bt_delete(const DB *dbp, const DBT *key, u_int flags)
-{
-	BTREE *t;
-	CURSOR *c;
-	PAGE *h;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Check for change to a read-only tree. */
-	if (F_ISSET(t, B_RDONLY)) {
-		errno = EPERM;
-		return (RET_ERROR);
-	}
-
-	switch (flags) {
-	case 0:
-		status = __bt_bdelete(t, key);
-		break;
-	case R_CURSOR:
-		/*
-		 * If flags is R_CURSOR, delete the cursor.  Must already
-		 * have started a scan and not have already deleted it.
-		 */
-		c = &t->bt_cursor;
-		if (F_ISSET(c, CURS_INIT)) {
-			if (F_ISSET(c, CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE))
-				return (RET_SPECIAL);
-			if ((h = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL)
-				return (RET_ERROR);
-
-			/*
-			 * If the page is about to be emptied, we'll need to
-			 * delete it, which means we have to acquire a stack.
-			 */
-			if (NEXTINDEX(h) == 1)
-				if (__bt_stkacq(t, &h, &t->bt_cursor))
-					return (RET_ERROR);
-
-			status = __bt_dleaf(t, NULL, h, c->pg.index);
-
-			if (NEXTINDEX(h) == 0 && status == RET_SUCCESS) {
-				if (__bt_pdelete(t, h))
-					return (RET_ERROR);
-			} else
-				mpool_put(t->bt_mp,
-				    h, status == RET_SUCCESS ? MPOOL_DIRTY : 0);
-			break;
-		}
-		/* FALLTHROUGH */
-	default:
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-	if (status == RET_SUCCESS)
-		F_SET(t, B_MODIFIED);
-	return (status);
-}
-
-/*
- * __bt_stkacq --
- *	Acquire a stack so we can delete a cursor entry.
- *
- * Parameters:
- *	  t:	tree
- *	 hp:	pointer to current, pinned PAGE pointer
- *	  c:	pointer to the cursor
- *
- * Returns:
- *	0 on success, 1 on failure
- */
-static int
-__bt_stkacq(BTREE *t, PAGE **hp, CURSOR *c)
-{
-	BINTERNAL *bi;
-	EPG *e;
-	EPGNO *parent;
-	PAGE *h;
-	indx_t idx;
-	pgno_t pgno;
-	recno_t nextpg, prevpg;
-	int exact, level;
-
-	/*
-	 * Find the first occurrence of the key in the tree.  Toss the
-	 * currently locked page so we don't hit an already-locked page.
-	 */
-	h = *hp;
-	mpool_put(t->bt_mp, h, 0);
-	if ((e = __bt_search(t, &c->key, &exact)) == NULL)
-		return (1);
-	h = e->page;
-
-	/* See if we got it in one shot. */
-	if (h->pgno == c->pg.pgno)
-		goto ret;
-
-	/*
-	 * Move right, looking for the page.  At each move we have to move
-	 * up the stack until we don't have to move to the next page.  If
-	 * we have to change pages at an internal level, we have to fix the
-	 * stack back up.
-	 */
-	while (h->pgno != c->pg.pgno) {
-		if ((nextpg = h->nextpg) == P_INVALID)
-			break;
-		mpool_put(t->bt_mp, h, 0);
-
-		/* Move up the stack. */
-		for (level = 0; (parent = BT_POP(t)) != NULL; ++level) {
-			/* Get the parent page. */
-			if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-				return (1);
-
-			/* Move to the next index. */
-			if (parent->index != NEXTINDEX(h) - 1) {
-				idx = parent->index + 1;
-				BT_PUSH(t, h->pgno, idx);
-				break;
-			}
-			mpool_put(t->bt_mp, h, 0);
-		}
-
-		/* Restore the stack. */
-		while (level--) {
-			/* Push the next level down onto the stack. */
-			bi = GETBINTERNAL(h, idx);
-			pgno = bi->pgno;
-			BT_PUSH(t, pgno, 0);
-
-			/* Lose the currently pinned page. */
-			mpool_put(t->bt_mp, h, 0);
-
-			/* Get the next level down. */
-			if ((h = mpool_get(t->bt_mp, pgno, 0)) == NULL)
-				return (1);
-			idx = 0;
-		}
-		mpool_put(t->bt_mp, h, 0);
-		if ((h = mpool_get(t->bt_mp, nextpg, 0)) == NULL)
-			return (1);
-	}
-
-	if (h->pgno == c->pg.pgno)
-		goto ret;
-
-	/* Reacquire the original stack. */
-	mpool_put(t->bt_mp, h, 0);
-	if ((e = __bt_search(t, &c->key, &exact)) == NULL)
-		return (1);
-	h = e->page;
-
-	/*
-	 * Move left, looking for the page.  At each move we have to move
-	 * up the stack until we don't have to change pages to move to the
-	 * next page.  If we have to change pages at an internal level, we
-	 * have to fix the stack back up.
-	 */
-	while (h->pgno != c->pg.pgno) {
-		if ((prevpg = h->prevpg) == P_INVALID)
-			break;
-		mpool_put(t->bt_mp, h, 0);
-
-		/* Move up the stack. */
-		for (level = 0; (parent = BT_POP(t)) != NULL; ++level) {
-			/* Get the parent page. */
-			if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-				return (1);
-
-			/* Move to the next index. */
-			if (parent->index != 0) {
-				idx = parent->index - 1;
-				BT_PUSH(t, h->pgno, idx);
-				break;
-			}
-			mpool_put(t->bt_mp, h, 0);
-		}
-
-		/* Restore the stack. */
-		while (level--) {
-			/* Push the next level down onto the stack. */
-			bi = GETBINTERNAL(h, idx);
-			pgno = bi->pgno;
-
-			/* Lose the currently pinned page. */
-			mpool_put(t->bt_mp, h, 0);
-
-			/* Get the next level down. */
-			if ((h = mpool_get(t->bt_mp, pgno, 0)) == NULL)
-				return (1);
-
-			idx = NEXTINDEX(h) - 1;
-			BT_PUSH(t, pgno, idx);
-		}
-		mpool_put(t->bt_mp, h, 0);
-		if ((h = mpool_get(t->bt_mp, prevpg, 0)) == NULL)
-			return (1);
-	}
-
-
-ret:	mpool_put(t->bt_mp, h, 0);
-	return ((*hp = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL);
-}
-
-/*
- * __bt_bdelete --
- *	Delete all key/data pairs matching the specified key.
- *
- * Parameters:
- *	  t:	tree
- *	key:	key to delete
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-static int
-__bt_bdelete(BTREE *t, const DBT *key)
-{
-	EPG *e;
-	PAGE *h;
-	int deleted, exact, redo;
-
-	deleted = 0;
-
-	/* Find any matching record; __bt_search pins the page. */
-loop:	if ((e = __bt_search(t, key, &exact)) == NULL)
-		return (deleted ? RET_SUCCESS : RET_ERROR);
-	if (!exact) {
-		mpool_put(t->bt_mp, e->page, 0);
-		return (deleted ? RET_SUCCESS : RET_SPECIAL);
-	}
-
-	/*
-	 * Delete forward, then delete backward, from the found key.  If
-	 * there are duplicates and we reach either side of the page, do
-	 * the key search again, so that we get them all.
-	 */
-	redo = 0;
-	h = e->page;
-	do {
-		if (__bt_dleaf(t, key, h, e->index)) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		if (F_ISSET(t, B_NODUPS)) {
-			if (NEXTINDEX(h) == 0) {
-				if (__bt_pdelete(t, h))
-					return (RET_ERROR);
-			} else
-				mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			return (RET_SUCCESS);
-		}
-		deleted = 1;
-	} while (e->index < NEXTINDEX(h) && __bt_cmp(t, key, e) == 0);
-
-	/* Check for right-hand edge of the page. */
-	if (e->index == NEXTINDEX(h))
-		redo = 1;
-
-	/* Delete from the key to the beginning of the page. */
-	while (e->index-- > 0) {
-		if (__bt_cmp(t, key, e) != 0)
-			break;
-		if (__bt_dleaf(t, key, h, e->index) == RET_ERROR) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		if (e->index == 0)
-			redo = 1;
-	}
-
-	/* Check for an empty page. */
-	if (NEXTINDEX(h) == 0) {
-		if (__bt_pdelete(t, h))
-			return (RET_ERROR);
-		goto loop;
-	}
-
-	/* Put the page. */
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	if (redo)
-		goto loop;
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_pdelete --
- *	Delete a single page from the tree.
- *
- * Parameters:
- *	t:	tree
- *	h:	leaf page
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- *
- * Side-effects:
- *	mpool_put's the page
- */
-static int
-__bt_pdelete(BTREE *t, PAGE *h)
-{
-	BINTERNAL *bi;
-	PAGE *pg;
-	EPGNO *parent;
-	indx_t cnt, idx, *ip, offset;
-	uint32_t nksize;
-	char *from;
-
-	/*
-	 * Walk the parent page stack -- a LIFO stack of the pages that were
-	 * traversed when we searched for the page where the delete occurred.
-	 * Each stack entry is a page number and a page index offset.  The
-	 * offset is for the page traversed on the search.  We've just deleted
-	 * a page, so we have to delete the key from the parent page.
-	 *
-	 * If the delete from the parent page makes it empty, this process may
-	 * continue all the way up the tree.  We stop if we reach the root page
-	 * (which is never deleted, it's just not worth the effort) or if the
-	 * delete does not empty the page.
-	 */
-	while ((parent = BT_POP(t)) != NULL) {
-		/* Get the parent page. */
-		if ((pg = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-			return (RET_ERROR);
-
-		idx = parent->index;
-		bi = GETBINTERNAL(pg, idx);
-
-		/* Free any overflow pages. */
-		if (bi->flags & P_BIGKEY &&
-		    __ovfl_delete(t, bi->bytes) == RET_ERROR) {
-			mpool_put(t->bt_mp, pg, 0);
-			return (RET_ERROR);
-		}
-
-		/*
-		 * Free the parent if it has only the one key and it's not the
-		 * root page. If it's the rootpage, turn it back into an empty
-		 * leaf page.
-		 */
-		if (NEXTINDEX(pg) == 1) {
-			if (pg->pgno == P_ROOT) {
-				pg->lower = BTDATAOFF;
-				pg->upper = t->bt_psize;
-				pg->flags = P_BLEAF;
-			} else {
-				if (__bt_relink(t, pg) || __bt_free(t, pg))
-					return (RET_ERROR);
-				continue;
-			}
-		} else {
-			/* Pack remaining key items at the end of the page. */
-			nksize = NBINTERNAL(bi->ksize);
-			from = (char *)pg + pg->upper;
-			memmove(from + nksize, from, (char *)bi - from);
-			pg->upper += nksize;
-
-			/* Adjust indices' offsets, shift the indices down. */
-			offset = pg->linp[idx];
-			for (cnt = idx, ip = &pg->linp[0]; cnt--; ++ip)
-				if (ip[0] < offset)
-					ip[0] += nksize;
-			for (cnt = NEXTINDEX(pg) - idx; --cnt; ++ip)
-				ip[0] = ip[1] < offset ? ip[1] + nksize : ip[1];
-			pg->lower -= sizeof(indx_t);
-		}
-
-		mpool_put(t->bt_mp, pg, MPOOL_DIRTY);
-		break;
-	}
-
-	/* Free the leaf page, as long as it wasn't the root. */
-	if (h->pgno == P_ROOT) {
-		mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-		return (RET_SUCCESS);
-	}
-	return (__bt_relink(t, h) || __bt_free(t, h));
-}
-
-/*
- * __bt_dleaf --
- *	Delete a single record from a leaf page.
- *
- * Parameters:
- *	t:	tree
- *    key:	referenced key
- *	h:	page
- *	idx:	index on page to delete
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__bt_dleaf(BTREE *t, const DBT *key, PAGE *h, u_int idx)
-{
-	BLEAF *bl;
-	indx_t cnt, *ip, offset;
-	uint32_t nbytes;
-	void *to;
-	char *from;
-
-	/* If this record is referenced by the cursor, delete the cursor. */
-	if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-	    !F_ISSET(&t->bt_cursor, CURS_ACQUIRE) &&
-	    t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index == idx &&
-	    __bt_curdel(t, key, h, idx))
-		return (RET_ERROR);
-
-	/* If the entry uses overflow pages, make them available for reuse. */
-	to = bl = GETBLEAF(h, idx);
-	if (bl->flags & P_BIGKEY && __ovfl_delete(t, bl->bytes) == RET_ERROR)
-		return (RET_ERROR);
-	if (bl->flags & P_BIGDATA &&
-	    __ovfl_delete(t, bl->bytes + bl->ksize) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Pack the remaining key/data items at the end of the page. */
-	nbytes = NBLEAF(bl);
-	from = (char *)h + h->upper;
-	memmove(from + nbytes, from, (char *)to - from);
-	h->upper += nbytes;
-
-	/* Adjust the indices' offsets, shift the indices down. */
-	offset = h->linp[idx];
-	for (cnt = idx, ip = &h->linp[0]; cnt--; ++ip)
-		if (ip[0] < offset)
-			ip[0] += nbytes;
-	for (cnt = NEXTINDEX(h) - idx; --cnt; ++ip)
-		ip[0] = ip[1] < offset ? ip[1] + nbytes : ip[1];
-	h->lower -= sizeof(indx_t);
-
-	/* If the cursor is on this page, adjust it as necessary. */
-	if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-	    !F_ISSET(&t->bt_cursor, CURS_ACQUIRE) &&
-	    t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index > idx)
-		--t->bt_cursor.pg.index;
-
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_curdel --
- *	Delete the cursor.
- *
- * Parameters:
- *	t:	tree
- *    key:	referenced key (or NULL)
- *	h:	page
- *    idx:	index on page to delete
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-static int
-__bt_curdel(BTREE *t, const DBT *key, PAGE *h, u_int idx)
-{
-	CURSOR *c;
-	EPG e;
-	PAGE *pg;
-	int curcopy, status;
-
-	/*
-	 * If there are duplicates, move forward or backward to one.
-	 * Otherwise, copy the key into the cursor area.
-	 */
-	c = &t->bt_cursor;
-	F_CLR(c, CURS_AFTER | CURS_BEFORE | CURS_ACQUIRE);
-
-	curcopy = 0;
-	if (!F_ISSET(t, B_NODUPS)) {
-		/*
-		 * We're going to have to do comparisons.  If we weren't
-		 * provided a copy of the key, i.e. the user is deleting
-		 * the current cursor position, get one.
-		 */
-		if (key == NULL) {
-			e.page = h;
-			e.index = idx;
-			if ((status = __bt_ret(t, &e,
-			    &c->key, &c->key, NULL, NULL, 1)) != RET_SUCCESS)
-				return (status);
-			curcopy = 1;
-			key = &c->key;
-		}
-		/* Check previous key, if not at the beginning of the page. */
-		if (idx > 0) {
-			e.page = h;
-			e.index = idx - 1;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_BEFORE);
-				goto dup2;
-			}
-		}
-		/* Check next key, if not at the end of the page. */
-		if (idx < NEXTINDEX(h) - 1) {
-			e.page = h;
-			e.index = idx + 1;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_AFTER);
-				goto dup2;
-			}
-		}
-		/* Check previous key if at the beginning of the page. */
-		if (idx == 0 && h->prevpg != P_INVALID) {
-			if ((pg = mpool_get(t->bt_mp, h->prevpg, 0)) == NULL)
-				return (RET_ERROR);
-			e.page = pg;
-			e.index = NEXTINDEX(pg) - 1;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_BEFORE);
-				goto dup1;
-			}
-			mpool_put(t->bt_mp, pg, 0);
-		}
-		/* Check next key if at the end of the page. */
-		if (idx == NEXTINDEX(h) - 1 && h->nextpg != P_INVALID) {
-			if ((pg = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL)
-				return (RET_ERROR);
-			e.page = pg;
-			e.index = 0;
-			if (__bt_cmp(t, key, &e) == 0) {
-				F_SET(c, CURS_AFTER);
-dup1:				mpool_put(t->bt_mp, pg, 0);
-dup2:				c->pg.pgno = e.page->pgno;
-				c->pg.index = e.index;
-				return (RET_SUCCESS);
-			}
-			mpool_put(t->bt_mp, pg, 0);
-		}
-	}
-	e.page = h;
-	e.index = idx;
-	if (curcopy || (status =
-	    __bt_ret(t, &e, &c->key, &c->key, NULL, NULL, 1)) == RET_SUCCESS) {
-		F_SET(c, CURS_ACQUIRE);
-		return (RET_SUCCESS);
-	}
-	return (status);
-}
-
-/*
- * __bt_relink --
- *	Link around a deleted page.
- *
- * Parameters:
- *	t:	tree
- *	h:	page to be deleted
- */
-static int
-__bt_relink(BTREE *t, PAGE *h)
-{
-	PAGE *pg;
-
-	if (h->nextpg != P_INVALID) {
-		if ((pg = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL)
-			return (RET_ERROR);
-		pg->prevpg = h->prevpg;
-		mpool_put(t->bt_mp, pg, MPOOL_DIRTY);
-	}
-	if (h->prevpg != P_INVALID) {
-		if ((pg = mpool_get(t->bt_mp, h->prevpg, 0)) == NULL)
-			return (RET_ERROR);
-		pg->nextpg = h->nextpg;
-		mpool_put(t->bt_mp, pg, MPOOL_DIRTY);
-	}
-	return (0);
-}
diff --git a/lib/libc_bsd/db/btree/bt_get.c b/lib/libc_bsd/db/btree/bt_get.c
deleted file mode 100644
index 6d0bb41..0000000
--- a/lib/libc_bsd/db/btree/bt_get.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_get.c	8.6 (Berkeley) 7/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_get.c 189291 2009-03-02 23:47:18Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * __BT_GET -- Get a record from the btree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key to find
- *	data:	data to return
- *	flag:	currently unused
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-int
-__bt_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
-{
-	BTREE *t;
-	EPG *e;
-	int exact, status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Get currently doesn't take any flags. */
-	if (flags) {
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if ((e = __bt_search(t, key, &exact)) == NULL)
-		return (RET_ERROR);
-	if (!exact) {
-		mpool_put(t->bt_mp, e->page, 0);
-		return (RET_SPECIAL);
-	}
-
-	status = __bt_ret(t, e, NULL, NULL, data, &t->bt_rdata, 0);
-
-	/*
-	 * If the user is doing concurrent access, we copied the
-	 * key/data, toss the page.
-	 */
-	if (F_ISSET(t, B_DB_LOCK))
-		mpool_put(t->bt_mp, e->page, 0);
-	else
-		t->bt_pinned = e->page;
-	return (status);
-}
diff --git a/lib/libc_bsd/db/btree/bt_open.c b/lib/libc_bsd/db/btree/bt_open.c
deleted file mode 100644
index 46c6182..0000000
--- a/lib/libc_bsd/db/btree/bt_open.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_open.c	8.10 (Berkeley) 8/17/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_open.c 287872 2015-09-16 20:59:41Z delphij $");
-
-/*
- * Implementation of btree access method for 4.4BSD.
- *
- * The design here was originally based on that of the btree access method
- * used in the Postgres database system at UC Berkeley.  This implementation
- * is wholly independent of the Postgres code.
- */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#include <db.h>
-#include "btree.h"
-
-#ifdef DEBUG
-#undef	MINPSIZE
-#define	MINPSIZE	128
-#endif
-
-static int byteorder(void);
-static int nroot(BTREE *);
-static int tmp(void);
-
-/*
- * __BT_OPEN -- Open a btree.
- *
- * Creates and fills a DB struct, and calls the routine that actually
- * opens the btree.
- *
- * Parameters:
- *	fname:	filename (NULL for in-memory trees)
- *	flags:	open flag bits
- *	mode:	open permission bits
- *	b:	BTREEINFO pointer
- *
- * Returns:
- *	NULL on failure, pointer to DB on success.
- *
- */
-DB *
-__bt_open(const char *fname, int flags, int mode, const BTREEINFO *openinfo, int dflags)
-{
-	struct stat sb;
-	BTMETA m;
-	BTREE *t;
-	BTREEINFO b;
-	DB *dbp;
-	pgno_t ncache;
-	ssize_t nr;
-	int machine_lorder, saved_errno;
-
-	t = NULL;
-
-	/*
-	 * Intention is to make sure all of the user's selections are okay
-	 * here and then use them without checking.  Can't be complete, since
-	 * we don't know the right page size, lorder or flags until the backing
-	 * file is opened.  Also, the file's page size can cause the cachesize
-	 * to change.
-	 */
-	machine_lorder = byteorder();
-	if (openinfo) {
-		b = *openinfo;
-
-		/* Flags: R_DUP. */
-		if (b.flags & ~(R_DUP))
-			goto einval;
-
-		/*
-		 * Page size must be indx_t aligned and >= MINPSIZE.  Default
-		 * page size is set farther on, based on the underlying file
-		 * transfer size.
-		 */
-		if (b.psize &&
-		    (b.psize < MINPSIZE || b.psize > MAX_PAGE_OFFSET + 1 ||
-		    b.psize & (sizeof(indx_t) - 1) ))
-			goto einval;
-
-		/* Minimum number of keys per page; absolute minimum is 2. */
-		if (b.minkeypage) {
-			if (b.minkeypage < 2)
-				goto einval;
-		} else
-			b.minkeypage = DEFMINKEYPAGE;
-
-		/* If no comparison, use default comparison and prefix. */
-		if (b.compare == NULL) {
-			b.compare = __bt_defcmp;
-			if (b.prefix == NULL)
-				b.prefix = __bt_defpfx;
-		}
-
-		if (b.lorder == 0)
-			b.lorder = machine_lorder;
-	} else {
-		b.compare = __bt_defcmp;
-		b.cachesize = 0;
-		b.flags = 0;
-		b.lorder = machine_lorder;
-		b.minkeypage = DEFMINKEYPAGE;
-		b.prefix = __bt_defpfx;
-		b.psize = 0;
-	}
-
-	/* Check for the ubiquitous PDP-11. */
-	if (b.lorder != BIG_ENDIAN && b.lorder != LITTLE_ENDIAN)
-		goto einval;
-
-	/* Allocate and initialize DB and BTREE structures. */
-	if ((t = (BTREE *)calloc(1, sizeof(BTREE))) == NULL)
-		goto err;
-	t->bt_fd = -1;			/* Don't close unopened fd on error. */
-	t->bt_lorder = b.lorder;
-	t->bt_order = NOT;
-	t->bt_cmp = b.compare;
-	t->bt_pfx = b.prefix;
-	t->bt_rfd = -1;
-
-	if ((t->bt_dbp = dbp = (DB *)calloc(1, sizeof(DB))) == NULL)
-		goto err;
-	if (t->bt_lorder != machine_lorder)
-		F_SET(t, B_NEEDSWAP);
-
-	dbp->type = DB_BTREE;
-	dbp->internal = t;
-	dbp->close = __bt_close;
-	dbp->del = __bt_delete;
-	dbp->fd = __bt_fd;
-	dbp->get = __bt_get;
-	dbp->put = __bt_put;
-	dbp->seq = __bt_seq;
-	dbp->sync = __bt_sync;
-
-	/*
-	 * If no file name was supplied, this is an in-memory btree and we
-	 * open a backing temporary file.  Otherwise, it's a disk-based tree.
-	 */
-	if (fname) {
-		switch (flags & O_ACCMODE) {
-		case O_RDONLY:
-			F_SET(t, B_RDONLY);
-			break;
-		case O_RDWR:
-			break;
-		case O_WRONLY:
-		default:
-			goto einval;
-		}
-
-		if ((t->bt_fd = _open(fname, flags | O_CLOEXEC, mode)) < 0)
-			goto err;
-
-	} else {
-		if ((flags & O_ACCMODE) != O_RDWR)
-			goto einval;
-		if ((t->bt_fd = tmp()) == -1)
-			goto err;
-		F_SET(t, B_INMEM);
-	}
-
-	if (_fstat(t->bt_fd, &sb))
-		goto err;
-	if (sb.st_size) {
-		if ((nr = _read(t->bt_fd, &m, sizeof(BTMETA))) < 0)
-			goto err;
-		if (nr != sizeof(BTMETA))
-			goto eftype;
-
-		/*
-		 * Read in the meta-data.  This can change the notion of what
-		 * the lorder, page size and flags are, and, when the page size
-		 * changes, the cachesize value can change too.  If the user
-		 * specified the wrong byte order for an existing database, we
-		 * don't bother to return an error, we just clear the NEEDSWAP
-		 * bit.
-		 */
-		if (m.magic == BTREEMAGIC)
-			F_CLR(t, B_NEEDSWAP);
-		else {
-			F_SET(t, B_NEEDSWAP);
-			M_32_SWAP(m.magic);
-			M_32_SWAP(m.version);
-			M_32_SWAP(m.psize);
-			M_32_SWAP(m.free);
-			M_32_SWAP(m.nrecs);
-			M_32_SWAP(m.flags);
-		}
-		if (m.magic != BTREEMAGIC || m.version != BTREEVERSION)
-			goto eftype;
-		if (m.psize < MINPSIZE || m.psize > MAX_PAGE_OFFSET + 1 ||
-		    m.psize & (sizeof(indx_t) - 1) )
-			goto eftype;
-		if (m.flags & ~SAVEMETA)
-			goto eftype;
-		b.psize = m.psize;
-		F_SET(t, m.flags);
-		t->bt_free = m.free;
-		t->bt_nrecs = m.nrecs;
-	} else {
-		/*
-		 * Set the page size to the best value for I/O to this file.
-		 * Don't overflow the page offset type.
-		 */
-		if (b.psize == 0) {
-			b.psize = sb.st_blksize;
-			if (b.psize < MINPSIZE)
-				b.psize = MINPSIZE;
-			if (b.psize > MAX_PAGE_OFFSET + 1)
-				b.psize = MAX_PAGE_OFFSET + 1;
-		}
-
-		/* Set flag if duplicates permitted. */
-		if (!(b.flags & R_DUP))
-			F_SET(t, B_NODUPS);
-
-		t->bt_free = P_INVALID;
-		t->bt_nrecs = 0;
-		F_SET(t, B_METADIRTY);
-	}
-
-	t->bt_psize = b.psize;
-
-	/* Set the cache size; must be a multiple of the page size. */
-	if (b.cachesize && b.cachesize & (b.psize - 1) )
-		b.cachesize += (~b.cachesize & (b.psize - 1) ) + 1;
-	if (b.cachesize < b.psize * MINCACHE)
-		b.cachesize = b.psize * MINCACHE;
-
-	/* Calculate number of pages to cache. */
-	ncache = (b.cachesize + t->bt_psize - 1) / t->bt_psize;
-
-	/*
-	 * The btree data structure requires that at least two keys can fit on
-	 * a page, but other than that there's no fixed requirement.  The user
-	 * specified a minimum number per page, and we translated that into the
-	 * number of bytes a key/data pair can use before being placed on an
-	 * overflow page.  This calculation includes the page header, the size
-	 * of the index referencing the leaf item and the size of the leaf item
-	 * structure.  Also, don't let the user specify a minkeypage such that
-	 * a key/data pair won't fit even if both key and data are on overflow
-	 * pages.
-	 */
-	t->bt_ovflsize = (t->bt_psize - BTDATAOFF) / b.minkeypage -
-	    (sizeof(indx_t) + NBLEAFDBT(0, 0));
-	if (t->bt_ovflsize < NBLEAFDBT(NOVFLSIZE, NOVFLSIZE) + sizeof(indx_t))
-		t->bt_ovflsize =
-		    NBLEAFDBT(NOVFLSIZE, NOVFLSIZE) + sizeof(indx_t);
-
-	/* Initialize the buffer pool. */
-	if ((t->bt_mp =
-	    mpool_open(NULL, t->bt_fd, t->bt_psize, ncache)) == NULL)
-		goto err;
-	if (!F_ISSET(t, B_INMEM))
-		mpool_filter(t->bt_mp, __bt_pgin, __bt_pgout, t);
-
-	/* Create a root page if new tree. */
-	if (nroot(t) == RET_ERROR)
-		goto err;
-
-	/* Global flags. */
-	if (dflags & DB_LOCK)
-		F_SET(t, B_DB_LOCK);
-	if (dflags & DB_SHMEM)
-		F_SET(t, B_DB_SHMEM);
-	if (dflags & DB_TXN)
-		F_SET(t, B_DB_TXN);
-
-	return (dbp);
-
-einval:	errno = EINVAL;
-	goto err;
-
-eftype:	errno = EFTYPE;
-	goto err;
-
-err:	saved_errno = errno;
-	if (t) {
-		if (t->bt_dbp)
-			free(t->bt_dbp);
-		if (t->bt_fd != -1)
-			(void)_close(t->bt_fd);
-		free(t);
-	}
-	errno = saved_errno;
-	return (NULL);
-}
-
-/*
- * NROOT -- Create the root of a new tree.
- *
- * Parameters:
- *	t:	tree
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-nroot(BTREE *t)
-{
-	PAGE *meta, *root;
-	pgno_t npg;
-
-	if ((root = mpool_get(t->bt_mp, 1, 0)) != NULL) {
-		if (root->lower == 0 &&
-		    root->pgno == 0 &&
-		    root->linp[0] == 0) {
-			mpool_delete(t->bt_mp, root);
-			errno = EINVAL;
-		} else {
-			mpool_put(t->bt_mp, root, 0);
-			return (RET_SUCCESS);
-		}
-	}
-	if (errno != EINVAL)		/* It's OK to not exist. */
-		return (RET_ERROR);
-	errno = 0;
-
-	if ((meta = mpool_new(t->bt_mp, &npg, MPOOL_PAGE_NEXT)) == NULL)
-		return (RET_ERROR);
-
-	if ((root = mpool_new(t->bt_mp, &npg, MPOOL_PAGE_NEXT)) == NULL)
-		return (RET_ERROR);
-
-	if (npg != P_ROOT)
-		return (RET_ERROR);
-	root->pgno = npg;
-	root->prevpg = root->nextpg = P_INVALID;
-	root->lower = BTDATAOFF;
-	root->upper = t->bt_psize;
-	root->flags = P_BLEAF;
-	memset(meta, 0, t->bt_psize);
-	mpool_put(t->bt_mp, meta, MPOOL_DIRTY);
-	mpool_put(t->bt_mp, root, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
-
-static int
-tmp(void)
-{
-	sigset_t set, oset;
-	int fd, len;
-	char *envtmp = NULL;
-	char path[MAXPATHLEN];
-
-	if (issetugid() == 0)
-		envtmp = getenv("TMPDIR");
-	len = snprintf(path,
-	    sizeof(path), "%s/bt.XXXXXXXXXX", envtmp ? envtmp : "/tmp");
-	if (len < 0 || len >= (int)sizeof(path)) {
-		errno = ENAMETOOLONG;
-		return(-1);
-	}
-
-	(void)sigfillset(&set);
-	(void)__libc_sigprocmask(SIG_BLOCK, &set, &oset);
-	if ((fd = mkostemp(path, O_CLOEXEC)) != -1)
-		(void)unlink(path);
-	(void)__libc_sigprocmask(SIG_SETMASK, &oset, NULL);
-	return(fd);
-}
-
-static int
-byteorder(void)
-{
-	uint32_t x;
-	u_char *p;
-
-	x = 0x01020304;
-	p = (u_char *)&x;
-	switch (*p) {
-	case 1:
-		return (BIG_ENDIAN);
-	case 4:
-		return (LITTLE_ENDIAN);
-	default:
-		return (0);
-	}
-}
-
-int
-__bt_fd(const DB *dbp)
-{
-	BTREE *t;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* In-memory database can't have a file descriptor. */
-	if (F_ISSET(t, B_INMEM)) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (t->bt_fd);
-}
diff --git a/lib/libc_bsd/db/btree/bt_overflow.c b/lib/libc_bsd/db/btree/bt_overflow.c
deleted file mode 100644
index 8e365b0..0000000
--- a/lib/libc_bsd/db/btree/bt_overflow.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_overflow.c	8.5 (Berkeley) 7/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_overflow.c 189387 2009-03-05 00:57:01Z delphij $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * Big key/data code.
- *
- * Big key and data entries are stored on linked lists of pages.  The initial
- * reference is byte string stored with the key or data and is the page number
- * and size.  The actual record is stored in a chain of pages linked by the
- * nextpg field of the PAGE header.
- *
- * The first page of the chain has a special property.  If the record is used
- * by an internal page, it cannot be deleted and the P_PRESERVE bit will be set
- * in the header.
- *
- * XXX
- * A single DBT is written to each chain, so a lot of space on the last page
- * is wasted.  This is a fairly major bug for some data sets.
- */
-
-/*
- * __OVFL_GET -- Get an overflow key/data item.
- *
- * Parameters:
- *	t:	tree
- *	p:	pointer to { pgno_t, uint32_t }
- *	buf:	storage address
- *	bufsz:	storage size
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__ovfl_get(BTREE *t, void *p, size_t *ssz, void **buf, size_t *bufsz)
-{
-	PAGE *h;
-	pgno_t pg;
-	size_t nb, plen;
-	uint32_t sz;
-
-	memmove(&pg, p, sizeof(pgno_t));
-	memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t));
-	*ssz = sz;
-
-#ifdef DEBUG
-	if (pg == P_INVALID || sz == 0)
-		abort();
-#endif
-	/* Make the buffer bigger as necessary. */
-	if (*bufsz < sz) {
-		*buf = reallocf(*buf, sz);
-		if (*buf == NULL)
-			return (RET_ERROR);
-		*bufsz = sz;
-	}
-
-	/*
-	 * Step through the linked list of pages, copying the data on each one
-	 * into the buffer.  Never copy more than the data's length.
-	 */
-	plen = t->bt_psize - BTDATAOFF;
-	for (p = *buf;; p = (char *)p + nb, pg = h->nextpg) {
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (RET_ERROR);
-
-		nb = MIN(sz, plen);
-		memmove(p, (char *)h + BTDATAOFF, nb);
-		mpool_put(t->bt_mp, h, 0);
-
-		if ((sz -= nb) == 0)
-			break;
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __OVFL_PUT -- Store an overflow key/data item.
- *
- * Parameters:
- *	t:	tree
- *	data:	DBT to store
- *	pgno:	storage page number
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__ovfl_put(BTREE *t, const DBT *dbt, pgno_t *pg)
-{
-	PAGE *h, *last;
-	void *p;
-	pgno_t npg;
-	size_t nb, plen;
-	uint32_t sz;
-
-	/*
-	 * Allocate pages and copy the key/data record into them.  Store the
-	 * number of the first page in the chain.
-	 */
-	plen = t->bt_psize - BTDATAOFF;
-	for (last = NULL, p = dbt->data, sz = dbt->size;;
-	    p = (char *)p + plen, last = h) {
-		if ((h = __bt_new(t, &npg)) == NULL)
-			return (RET_ERROR);
-
-		h->pgno = npg;
-		h->nextpg = h->prevpg = P_INVALID;
-		h->flags = P_OVERFLOW;
-		h->lower = h->upper = 0;
-
-		nb = MIN(sz, plen);
-		memmove((char *)h + BTDATAOFF, p, nb);
-
-		if (last) {
-			last->nextpg = h->pgno;
-			mpool_put(t->bt_mp, last, MPOOL_DIRTY);
-		} else
-			*pg = h->pgno;
-
-		if ((sz -= nb) == 0) {
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		}
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __OVFL_DELETE -- Delete an overflow chain.
- *
- * Parameters:
- *	t:	tree
- *	p:	pointer to { pgno_t, uint32_t }
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__ovfl_delete(BTREE *t, void *p)
-{
-	PAGE *h;
-	pgno_t pg;
-	size_t plen;
-	uint32_t sz;
-
-	memmove(&pg, p, sizeof(pgno_t));
-	memmove(&sz, (char *)p + sizeof(pgno_t), sizeof(uint32_t));
-
-#ifdef DEBUG
-	if (pg == P_INVALID || sz == 0)
-		abort();
-#endif
-	if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-		return (RET_ERROR);
-
-	/* Don't delete chains used by internal pages. */
-	if (h->flags & P_PRESERVE) {
-		mpool_put(t->bt_mp, h, 0);
-		return (RET_SUCCESS);
-	}
-
-	/* Step through the chain, calling the free routine for each page. */
-	for (plen = t->bt_psize - BTDATAOFF;; sz -= plen) {
-		pg = h->nextpg;
-		__bt_free(t, h);
-		if (sz <= plen)
-			break;
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (RET_ERROR);
-	}
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc_bsd/db/btree/bt_page.c b/lib/libc_bsd/db/btree/bt_page.c
deleted file mode 100644
index 01a9061..0000000
--- a/lib/libc_bsd/db/btree/bt_page.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_page.c	8.3 (Berkeley) 7/14/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_page.c 190498 2009-03-28 07:31:02Z delphij $");
-
-#include <sys/types.h>
-
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * __bt_free --
- *	Put a page on the freelist.
- *
- * Parameters:
- *	t:	tree
- *	h:	page to free
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- *
- * Side-effect:
- *	mpool_put's the page.
- */
-int
-__bt_free(BTREE *t, PAGE *h)
-{
-	/* Insert the page at the head of the free list. */
-	h->prevpg = P_INVALID;
-	h->nextpg = t->bt_free;
-	t->bt_free = h->pgno;
-	F_SET(t, B_METADIRTY);
-
-	/* Make sure the page gets written back. */
-	return (mpool_put(t->bt_mp, h, MPOOL_DIRTY));
-}
-
-/*
- * __bt_new --
- *	Get a new page, preferably from the freelist.
- *
- * Parameters:
- *	t:	tree
- *	npg:	storage for page number.
- *
- * Returns:
- *	Pointer to a page, NULL on error.
- */
-PAGE *
-__bt_new(BTREE *t, pgno_t *npg)
-{
-	PAGE *h;
-
-	if (t->bt_free != P_INVALID &&
-	    (h = mpool_get(t->bt_mp, t->bt_free, 0)) != NULL) {
-		*npg = t->bt_free;
-		t->bt_free = h->nextpg;
-		F_SET(t, B_METADIRTY);
-		return (h);
-	}
-	return (mpool_new(t->bt_mp, npg, MPOOL_PAGE_NEXT));
-}
diff --git a/lib/libc_bsd/db/btree/bt_put.c b/lib/libc_bsd/db/btree/bt_put.c
deleted file mode 100644
index e68a3b3..0000000
--- a/lib/libc_bsd/db/btree/bt_put.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_put.c	8.8 (Berkeley) 7/26/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_put.c 190484 2009-03-28 05:45:29Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-static EPG *bt_fast(BTREE *, const DBT *, const DBT *, int *);
-
-/*
- * __BT_PUT -- Add a btree item to the tree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key
- *	data:	data
- *	flag:	R_NOOVERWRITE
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key is already in the
- *	tree and R_NOOVERWRITE specified.
- */
-int
-__bt_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
-{
-	BTREE *t;
-	DBT tkey, tdata;
-	EPG *e;
-	PAGE *h;
-	indx_t idx, nxtindex;
-	pgno_t pg;
-	uint32_t nbytes, tmp;
-	int dflags, exact, status;
-	char *dest, db[NOVFLSIZE], kb[NOVFLSIZE];
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Check for change to a read-only tree. */
-	if (F_ISSET(t, B_RDONLY)) {
-		errno = EPERM;
-		return (RET_ERROR);
-	}
-
-	switch (flags) {
-	case 0:
-	case R_NOOVERWRITE:
-		break;
-	case R_CURSOR:
-		/*
-		 * If flags is R_CURSOR, put the cursor.  Must already
-		 * have started a scan and not have already deleted it.
-		 */
-		if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-		    !F_ISSET(&t->bt_cursor,
-			CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE))
-			break;
-		/* FALLTHROUGH */
-	default:
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	/*
-	 * If the key/data pair won't fit on a page, store it on overflow
-	 * pages.  Only put the key on the overflow page if the pair are
-	 * still too big after moving the data to an overflow page.
-	 *
-	 * XXX
-	 * If the insert fails later on, the overflow pages aren't recovered.
-	 */
-	dflags = 0;
-	if (key->size + data->size > t->bt_ovflsize) {
-		if (key->size > t->bt_ovflsize) {
-storekey:		if (__ovfl_put(t, key, &pg) == RET_ERROR)
-				return (RET_ERROR);
-			tkey.data = kb;
-			tkey.size = NOVFLSIZE;
-			memmove(kb, &pg, sizeof(pgno_t));
-			tmp = key->size;
-			memmove(kb + sizeof(pgno_t),
-			    &tmp, sizeof(uint32_t));
-			dflags |= P_BIGKEY;
-			key = &tkey;
-		}
-		if (key->size + data->size > t->bt_ovflsize) {
-			if (__ovfl_put(t, data, &pg) == RET_ERROR)
-				return (RET_ERROR);
-			tdata.data = db;
-			tdata.size = NOVFLSIZE;
-			memmove(db, &pg, sizeof(pgno_t));
-			tmp = data->size;
-			memmove(db + sizeof(pgno_t),
-			    &tmp, sizeof(uint32_t));
-			dflags |= P_BIGDATA;
-			data = &tdata;
-		}
-		if (key->size + data->size > t->bt_ovflsize)
-			goto storekey;
-	}
-
-	/* Replace the cursor. */
-	if (flags == R_CURSOR) {
-		if ((h = mpool_get(t->bt_mp, t->bt_cursor.pg.pgno, 0)) == NULL)
-			return (RET_ERROR);
-		idx = t->bt_cursor.pg.index;
-		goto delete;
-	}
-
-	/*
-	 * Find the key to delete, or, the location at which to insert.
-	 * Bt_fast and __bt_search both pin the returned page.
-	 */
-	if (t->bt_order == NOT || (e = bt_fast(t, key, data, &exact)) == NULL)
-		if ((e = __bt_search(t, key, &exact)) == NULL)
-			return (RET_ERROR);
-	h = e->page;
-	idx = e->index;
-
-	/*
-	 * Add the key/data pair to the tree.  If an identical key is already
-	 * in the tree, and R_NOOVERWRITE is set, an error is returned.  If
-	 * R_NOOVERWRITE is not set, the key is either added (if duplicates are
-	 * permitted) or an error is returned.
-	 */
-	switch (flags) {
-	case R_NOOVERWRITE:
-		if (!exact)
-			break;
-		mpool_put(t->bt_mp, h, 0);
-		return (RET_SPECIAL);
-	default:
-		if (!exact || !F_ISSET(t, B_NODUPS))
-			break;
-		/*
-		 * !!!
-		 * Note, the delete may empty the page, so we need to put a
-		 * new entry into the page immediately.
-		 */
-delete:		if (__bt_dleaf(t, key, h, idx) == RET_ERROR) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		break;
-	}
-
-	/*
-	 * If not enough room, or the user has put a ceiling on the number of
-	 * keys permitted in the page, split the page.  The split code will
-	 * insert the key and data and unpin the current page.  If inserting
-	 * into the offset array, shift the pointers up.
-	 */
-	nbytes = NBLEAFDBT(key->size, data->size);
-	if ((uint32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) {
-		if ((status = __bt_split(t, h, key,
-		    data, dflags, nbytes, idx)) != RET_SUCCESS)
-			return (status);
-		goto success;
-	}
-
-	if (idx < (nxtindex = NEXTINDEX(h)))
-		memmove(h->linp + idx + 1, h->linp + idx,
-		    (nxtindex - idx) * sizeof(indx_t));
-	h->lower += sizeof(indx_t);
-
-	h->linp[idx] = h->upper -= nbytes;
-	dest = (char *)h + h->upper;
-	WR_BLEAF(dest, key, data, dflags);
-
-	/* If the cursor is on this page, adjust it as necessary. */
-	if (F_ISSET(&t->bt_cursor, CURS_INIT) &&
-	    !F_ISSET(&t->bt_cursor, CURS_ACQUIRE) &&
-	    t->bt_cursor.pg.pgno == h->pgno && t->bt_cursor.pg.index >= idx)
-		++t->bt_cursor.pg.index;
-
-	if (t->bt_order == NOT) {
-		if (h->nextpg == P_INVALID) {
-			if (idx == NEXTINDEX(h) - 1) {
-				t->bt_order = FORWARD;
-				t->bt_last.index = idx;
-				t->bt_last.pgno = h->pgno;
-			}
-		} else if (h->prevpg == P_INVALID) {
-			if (idx == 0) {
-				t->bt_order = BACK;
-				t->bt_last.index = 0;
-				t->bt_last.pgno = h->pgno;
-			}
-		}
-	}
-
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-success:
-	if (flags == R_SETCURSOR)
-		__bt_setcur(t, e->page->pgno, e->index);
-
-	F_SET(t, B_MODIFIED);
-	return (RET_SUCCESS);
-}
-
-#ifdef STATISTICS
-u_long bt_cache_hit, bt_cache_miss;
-#endif
-
-/*
- * BT_FAST -- Do a quick check for sorted data.
- *
- * Parameters:
- *	t:	tree
- *	key:	key to insert
- *
- * Returns:
- *	EPG for new record or NULL if not found.
- */
-static EPG *
-bt_fast(BTREE *t, const DBT *key, const DBT *data, int *exactp)
-{
-	PAGE *h;
-	uint32_t nbytes;
-	int cmp;
-
-	if ((h = mpool_get(t->bt_mp, t->bt_last.pgno, 0)) == NULL) {
-		t->bt_order = NOT;
-		return (NULL);
-	}
-	t->bt_cur.page = h;
-	t->bt_cur.index = t->bt_last.index;
-
-	/*
-	 * If won't fit in this page or have too many keys in this page,
-	 * have to search to get split stack.
-	 */
-	nbytes = NBLEAFDBT(key->size, data->size);
-	if ((uint32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t))
-		goto miss;
-
-	if (t->bt_order == FORWARD) {
-		if (t->bt_cur.page->nextpg != P_INVALID)
-			goto miss;
-		if (t->bt_cur.index != NEXTINDEX(h) - 1)
-			goto miss;
-		if ((cmp = __bt_cmp(t, key, &t->bt_cur)) < 0)
-			goto miss;
-		t->bt_last.index = cmp ? ++t->bt_cur.index : t->bt_cur.index;
-	} else {
-		if (t->bt_cur.page->prevpg != P_INVALID)
-			goto miss;
-		if (t->bt_cur.index != 0)
-			goto miss;
-		if ((cmp = __bt_cmp(t, key, &t->bt_cur)) > 0)
-			goto miss;
-		t->bt_last.index = 0;
-	}
-	*exactp = cmp == 0;
-#ifdef STATISTICS
-	++bt_cache_hit;
-#endif
-	return (&t->bt_cur);
-
-miss:
-#ifdef STATISTICS
-	++bt_cache_miss;
-#endif
-	t->bt_order = NOT;
-	mpool_put(t->bt_mp, h, 0);
-	return (NULL);
-}
diff --git a/lib/libc_bsd/db/btree/bt_search.c b/lib/libc_bsd/db/btree/bt_search.c
deleted file mode 100644
index 59c96a7..0000000
--- a/lib/libc_bsd/db/btree/bt_search.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_search.c	8.8 (Berkeley) 7/31/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_search.c 189292 2009-03-03 02:16:12Z delphij $");
-
-#include <sys/types.h>
-
-#include <stdio.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int __bt_snext(BTREE *, PAGE *, const DBT *, int *);
-static int __bt_sprev(BTREE *, PAGE *, const DBT *, int *);
-
-/*
- * __bt_search --
- *	Search a btree for a key.
- *
- * Parameters:
- *	t:	tree to search
- *	key:	key to find
- *	exactp:	pointer to exact match flag
- *
- * Returns:
- *	The EPG for matching record, if any, or the EPG for the location
- *	of the key, if it were inserted into the tree, is entered into
- *	the bt_cur field of the tree.  A pointer to the field is returned.
- */
-EPG *
-__bt_search(BTREE *t, const DBT *key, int *exactp)
-{
-	PAGE *h;
-	indx_t base, idx, lim;
-	pgno_t pg;
-	int cmp;
-
-	BT_CLR(t);
-	for (pg = P_ROOT;;) {
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (NULL);
-
-		/* Do a binary search on the current page. */
-		t->bt_cur.page = h;
-		for (base = 0, lim = NEXTINDEX(h); lim; lim >>= 1) {
-			t->bt_cur.index = idx = base + (lim >> 1);
-			if ((cmp = __bt_cmp(t, key, &t->bt_cur)) == 0) {
-				if (h->flags & P_BLEAF) {
-					*exactp = 1;
-					return (&t->bt_cur);
-				}
-				goto next;
-			}
-			if (cmp > 0) {
-				base = idx + 1;
-				--lim;
-			}
-		}
-
-		/*
-		 * If it's a leaf page, we're almost done.  If no duplicates
-		 * are allowed, or we have an exact match, we're done.  Else,
-		 * it's possible that there were matching keys on this page,
-		 * which later deleted, and we're on a page with no matches
-		 * while there are matches on other pages.  If at the start or
-		 * end of a page, check the adjacent page.
-		 */
-		if (h->flags & P_BLEAF) {
-			if (!F_ISSET(t, B_NODUPS)) {
-				if (base == 0 &&
-				    h->prevpg != P_INVALID &&
-				    __bt_sprev(t, h, key, exactp))
-					return (&t->bt_cur);
-				if (base == NEXTINDEX(h) &&
-				    h->nextpg != P_INVALID &&
-				    __bt_snext(t, h, key, exactp))
-					return (&t->bt_cur);
-			}
-			*exactp = 0;
-			t->bt_cur.index = base;
-			return (&t->bt_cur);
-		}
-
-		/*
-		 * No match found.  Base is the smallest index greater than
-		 * key and may be zero or a last + 1 index.  If it's non-zero,
-		 * decrement by one, and record the internal page which should
-		 * be a parent page for the key.  If a split later occurs, the
-		 * inserted page will be to the right of the saved page.
-		 */
-		idx = base ? base - 1 : base;
-
-next:		BT_PUSH(t, h->pgno, idx);
-		pg = GETBINTERNAL(h, idx)->pgno;
-		mpool_put(t->bt_mp, h, 0);
-	}
-}
-
-/*
- * __bt_snext --
- *	Check for an exact match after the key.
- *
- * Parameters:
- *	t:	tree
- *	h:	current page
- *	key:	key
- *	exactp:	pointer to exact match flag
- *
- * Returns:
- *	If an exact match found.
- */
-static int
-__bt_snext(BTREE *t, PAGE *h, const DBT *key, int *exactp)
-{
-	EPG e;
-
-	/*
-	 * Get the next page.  The key is either an exact
-	 * match, or not as good as the one we already have.
-	 */
-	if ((e.page = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL)
-		return (0);
-	e.index = 0;
-	if (__bt_cmp(t, key, &e) == 0) {
-		mpool_put(t->bt_mp, h, 0);
-		t->bt_cur = e;
-		*exactp = 1;
-		return (1);
-	}
-	mpool_put(t->bt_mp, e.page, 0);
-	return (0);
-}
-
-/*
- * __bt_sprev --
- *	Check for an exact match before the key.
- *
- * Parameters:
- *	t:	tree
- *	h:	current page
- *	key:	key
- *	exactp:	pointer to exact match flag
- *
- * Returns:
- *	If an exact match found.
- */
-static int
-__bt_sprev(BTREE *t, PAGE *h, const DBT *key, int *exactp)
-{
-	EPG e;
-
-	/*
-	 * Get the previous page.  The key is either an exact
-	 * match, or not as good as the one we already have.
-	 */
-	if ((e.page = mpool_get(t->bt_mp, h->prevpg, 0)) == NULL)
-		return (0);
-	e.index = NEXTINDEX(e.page) - 1;
-	if (__bt_cmp(t, key, &e) == 0) {
-		mpool_put(t->bt_mp, h, 0);
-		t->bt_cur = e;
-		*exactp = 1;
-		return (1);
-	}
-	mpool_put(t->bt_mp, e.page, 0);
-	return (0);
-}
diff --git a/lib/libc_bsd/db/btree/bt_seq.c b/lib/libc_bsd/db/btree/bt_seq.c
deleted file mode 100644
index b21a123..0000000
--- a/lib/libc_bsd/db/btree/bt_seq.c
+++ /dev/null
@@ -1,441 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_seq.c	8.7 (Berkeley) 7/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_seq.c 189327 2009-03-04 00:58:04Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int __bt_first(BTREE *, const DBT *, EPG *, int *);
-static int __bt_seqadv(BTREE *, EPG *, int);
-static int __bt_seqset(BTREE *, EPG *, DBT *, int);
-
-/*
- * Sequential scan support.
- *
- * The tree can be scanned sequentially, starting from either end of the
- * tree or from any specific key.  A scan request before any scanning is
- * done is initialized as starting from the least node.
- */
-
-/*
- * __bt_seq --
- *	Btree sequential scan interface.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key for positioning and return value
- *	data:	data return value
- *	flags:	R_CURSOR, R_FIRST, R_LAST, R_NEXT, R_PREV.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-int
-__bt_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
-{
-	BTREE *t;
-	EPG e;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/*
-	 * If scan unitialized as yet, or starting at a specific record, set
-	 * the scan to a specific key.  Both __bt_seqset and __bt_seqadv pin
-	 * the page the cursor references if they're successful.
-	 */
-	switch (flags) {
-	case R_NEXT:
-	case R_PREV:
-		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
-			status = __bt_seqadv(t, &e, flags);
-			break;
-		}
-		/* FALLTHROUGH */
-	case R_FIRST:
-	case R_LAST:
-	case R_CURSOR:
-		status = __bt_seqset(t, &e, key, flags);
-		break;
-	default:
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (status == RET_SUCCESS) {
-		__bt_setcur(t, e.page->pgno, e.index);
-
-		status =
-		    __bt_ret(t, &e, key, &t->bt_rkey, data, &t->bt_rdata, 0);
-
-		/*
-		 * If the user is doing concurrent access, we copied the
-		 * key/data, toss the page.
-		 */
-		if (F_ISSET(t, B_DB_LOCK))
-			mpool_put(t->bt_mp, e.page, 0);
-		else
-			t->bt_pinned = e.page;
-	}
-	return (status);
-}
-
-/*
- * __bt_seqset --
- *	Set the sequential scan to a specific key.
- *
- * Parameters:
- *	t:	tree
- *	ep:	storage for returned key
- *	key:	key for initial scan position
- *	flags:	R_CURSOR, R_FIRST, R_LAST, R_NEXT, R_PREV
- *
- * Side effects:
- *	Pins the page the cursor references.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-static int
-__bt_seqset(BTREE *t, EPG *ep, DBT *key, int flags)
-{
-	PAGE *h;
-	pgno_t pg;
-	int exact;
-
-	/*
-	 * Find the first, last or specific key in the tree and point the
-	 * cursor at it.  The cursor may not be moved until a new key has
-	 * been found.
-	 */
-	switch (flags) {
-	case R_CURSOR:				/* Keyed scan. */
-		/*
-		 * Find the first instance of the key or the smallest key
-		 * which is greater than or equal to the specified key.
-		 */
-		if (key->data == NULL || key->size == 0) {
-			errno = EINVAL;
-			return (RET_ERROR);
-		}
-		return (__bt_first(t, key, ep, &exact));
-	case R_FIRST:				/* First record. */
-	case R_NEXT:
-		/* Walk down the left-hand side of the tree. */
-		for (pg = P_ROOT;;) {
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-
-			/* Check for an empty tree. */
-			if (NEXTINDEX(h) == 0) {
-				mpool_put(t->bt_mp, h, 0);
-				return (RET_SPECIAL);
-			}
-
-			if (h->flags & (P_BLEAF | P_RLEAF))
-				break;
-			pg = GETBINTERNAL(h, 0)->pgno;
-			mpool_put(t->bt_mp, h, 0);
-		}
-		ep->page = h;
-		ep->index = 0;
-		break;
-	case R_LAST:				/* Last record. */
-	case R_PREV:
-		/* Walk down the right-hand side of the tree. */
-		for (pg = P_ROOT;;) {
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-
-			/* Check for an empty tree. */
-			if (NEXTINDEX(h) == 0) {
-				mpool_put(t->bt_mp, h, 0);
-				return (RET_SPECIAL);
-			}
-
-			if (h->flags & (P_BLEAF | P_RLEAF))
-				break;
-			pg = GETBINTERNAL(h, NEXTINDEX(h) - 1)->pgno;
-			mpool_put(t->bt_mp, h, 0);
-		}
-
-		ep->page = h;
-		ep->index = NEXTINDEX(h) - 1;
-		break;
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_seqadvance --
- *	Advance the sequential scan.
- *
- * Parameters:
- *	t:	tree
- *	flags:	R_NEXT, R_PREV
- *
- * Side effects:
- *	Pins the page the new key/data record is on.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-static int
-__bt_seqadv(BTREE *t, EPG *ep, int flags)
-{
-	CURSOR *c;
-	PAGE *h;
-	indx_t idx;
-	pgno_t pg;
-	int exact;
-
-	/*
-	 * There are a couple of states that we can be in.  The cursor has
-	 * been initialized by the time we get here, but that's all we know.
-	 */
-	c = &t->bt_cursor;
-
-	/*
-	 * The cursor was deleted where there weren't any duplicate records,
-	 * so the key was saved.  Find out where that key would go in the
-	 * current tree.  It doesn't matter if the returned key is an exact
-	 * match or not -- if it's an exact match, the record was added after
-	 * the delete so we can just return it.  If not, as long as there's
-	 * a record there, return it.
-	 */
-	if (F_ISSET(c, CURS_ACQUIRE))
-		return (__bt_first(t, &c->key, ep, &exact));
-
-	/* Get the page referenced by the cursor. */
-	if ((h = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL)
-		return (RET_ERROR);
-
-	/*
-	 * Find the next/previous record in the tree and point the cursor at
-	 * it.  The cursor may not be moved until a new key has been found.
-	 */
-	switch (flags) {
-	case R_NEXT:			/* Next record. */
-		/*
-		 * The cursor was deleted in duplicate records, and moved
-		 * forward to a record that has yet to be returned.  Clear
-		 * that flag, and return the record.
-		 */
-		if (F_ISSET(c, CURS_AFTER))
-			goto usecurrent;
-		idx = c->pg.index;
-		if (++idx == NEXTINDEX(h)) {
-			pg = h->nextpg;
-			mpool_put(t->bt_mp, h, 0);
-			if (pg == P_INVALID)
-				return (RET_SPECIAL);
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-			idx = 0;
-		}
-		break;
-	case R_PREV:			/* Previous record. */
-		/*
-		 * The cursor was deleted in duplicate records, and moved
-		 * backward to a record that has yet to be returned.  Clear
-		 * that flag, and return the record.
-		 */
-		if (F_ISSET(c, CURS_BEFORE)) {
-usecurrent:		F_CLR(c, CURS_AFTER | CURS_BEFORE);
-			ep->page = h;
-			ep->index = c->pg.index;
-			return (RET_SUCCESS);
-		}
-		idx = c->pg.index;
-		if (idx == 0) {
-			pg = h->prevpg;
-			mpool_put(t->bt_mp, h, 0);
-			if (pg == P_INVALID)
-				return (RET_SPECIAL);
-			if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-				return (RET_ERROR);
-			idx = NEXTINDEX(h) - 1;
-		} else
-			--idx;
-		break;
-	}
-
-	ep->page = h;
-	ep->index = idx;
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_first --
- *	Find the first entry.
- *
- * Parameters:
- *	t:	the tree
- *    key:	the key
- *  erval:	return EPG
- * exactp:	pointer to exact match flag
- *
- * Returns:
- *	The first entry in the tree greater than or equal to key,
- *	or RET_SPECIAL if no such key exists.
- */
-static int
-__bt_first(BTREE *t, const DBT *key, EPG *erval, int *exactp)
-{
-	PAGE *h;
-	EPG *ep, save;
-	pgno_t pg;
-
-	/*
-	 * Find any matching record; __bt_search pins the page.
-	 *
-	 * If it's an exact match and duplicates are possible, walk backwards
-	 * in the tree until we find the first one.  Otherwise, make sure it's
-	 * a valid key (__bt_search may return an index just past the end of a
-	 * page) and return it.
-	 */
-	if ((ep = __bt_search(t, key, exactp)) == NULL)
-		return (0);
-	if (*exactp) {
-		if (F_ISSET(t, B_NODUPS)) {
-			*erval = *ep;
-			return (RET_SUCCESS);
-		}
-
-		/*
-		 * Walk backwards, as long as the entry matches and there are
-		 * keys left in the tree.  Save a copy of each match in case
-		 * we go too far.
-		 */
-		save = *ep;
-		h = ep->page;
-		do {
-			if (save.page->pgno != ep->page->pgno) {
-				mpool_put(t->bt_mp, save.page, 0);
-				save = *ep;
-			} else
-				save.index = ep->index;
-
-			/*
-			 * Don't unpin the page the last (or original) match
-			 * was on, but make sure it's unpinned if an error
-			 * occurs.
-			 */
-			if (ep->index == 0) {
-				if (h->prevpg == P_INVALID)
-					break;
-				if (h->pgno != save.page->pgno)
-					mpool_put(t->bt_mp, h, 0);
-				if ((h = mpool_get(t->bt_mp,
-				    h->prevpg, 0)) == NULL) {
-					if (h->pgno == save.page->pgno)
-						mpool_put(t->bt_mp,
-						    save.page, 0);
-					return (RET_ERROR);
-				}
-				ep->page = h;
-				ep->index = NEXTINDEX(h);
-			}
-			--ep->index;
-		} while (__bt_cmp(t, key, ep) == 0);
-
-		/*
-		 * Reach here with the last page that was looked at pinned,
-		 * which may or may not be the same as the last (or original)
-		 * match page.  If it's not useful, release it.
-		 */
-		if (h->pgno != save.page->pgno)
-			mpool_put(t->bt_mp, h, 0);
-
-		*erval = save;
-		return (RET_SUCCESS);
-	}
-
-	/* If at the end of a page, find the next entry. */
-	if (ep->index == NEXTINDEX(ep->page)) {
-		h = ep->page;
-		pg = h->nextpg;
-		mpool_put(t->bt_mp, h, 0);
-		if (pg == P_INVALID)
-			return (RET_SPECIAL);
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			return (RET_ERROR);
-		ep->index = 0;
-		ep->page = h;
-	}
-	*erval = *ep;
-	return (RET_SUCCESS);
-}
-
-/*
- * __bt_setcur --
- *	Set the cursor to an entry in the tree.
- *
- * Parameters:
- *	t:	the tree
- *   pgno:	page number
- *    idx:	page index
- */
-void
-__bt_setcur(BTREE *t, pgno_t pgno, u_int idx)
-{
-	/* Lose any already deleted key. */
-	if (t->bt_cursor.key.data != NULL) {
-		free(t->bt_cursor.key.data);
-		t->bt_cursor.key.size = 0;
-		t->bt_cursor.key.data = NULL;
-	}
-	F_CLR(&t->bt_cursor, CURS_ACQUIRE | CURS_AFTER | CURS_BEFORE);
-
-	/* Update the cursor. */
-	t->bt_cursor.pg.pgno = pgno;
-	t->bt_cursor.pg.index = idx;
-	F_SET(&t->bt_cursor, CURS_INIT);
-}
diff --git a/lib/libc_bsd/db/btree/bt_split.c b/lib/libc_bsd/db/btree/bt_split.c
deleted file mode 100644
index 0cadb76..0000000
--- a/lib/libc_bsd/db/btree/bt_split.c
+++ /dev/null
@@ -1,797 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_split.c	8.10 (Berkeley) 1/9/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_split.c 223262 2011-06-18 13:56:33Z benl $");
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-static int	 bt_broot(BTREE *, PAGE *, PAGE *, PAGE *);
-static PAGE	*bt_page(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
-static int	 bt_preserve(BTREE *, pgno_t);
-static PAGE	*bt_psplit(BTREE *, PAGE *, PAGE *, PAGE *, indx_t *, size_t);
-static PAGE	*bt_root(BTREE *, PAGE *, PAGE **, PAGE **, indx_t *, size_t);
-static int	 bt_rroot(BTREE *, PAGE *, PAGE *, PAGE *);
-static recno_t	 rec_total(PAGE *);
-
-#ifdef STATISTICS
-u_long	bt_rootsplit, bt_split, bt_sortsplit, bt_pfxsaved;
-#endif
-
-/*
- * __BT_SPLIT -- Split the tree.
- *
- * Parameters:
- *	t:	tree
- *	sp:	page to split
- *	key:	key to insert
- *	data:	data to insert
- *	flags:	BIGKEY/BIGDATA flags
- *	ilen:	insert length
- *	skip:	index to leave open
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__bt_split(BTREE *t, PAGE *sp, const DBT *key, const DBT *data, int flags,
-    size_t ilen, uint32_t argskip)
-{
-	BINTERNAL *bi;
-	BLEAF *bl, *tbl;
-	DBT a, b;
-	EPGNO *parent;
-	PAGE *h, *l, *r, *lchild, *rchild;
-	indx_t nxtindex;
-	u_int16_t skip;
-	uint32_t n, nbytes, nksize;
-	int parentsplit;
-	char *dest;
-
-	/*
-	 * Split the page into two pages, l and r.  The split routines return
-	 * a pointer to the page into which the key should be inserted and with
-	 * skip set to the offset which should be used.  Additionally, l and r
-	 * are pinned.
-	 */
-	skip = argskip;
-	h = sp->pgno == P_ROOT ?
-	    bt_root(t, sp, &l, &r, &skip, ilen) :
-	    bt_page(t, sp, &l, &r, &skip, ilen);
-	if (h == NULL)
-		return (RET_ERROR);
-
-	/*
-	 * Insert the new key/data pair into the leaf page.  (Key inserts
-	 * always cause a leaf page to split first.)
-	 */
-	h->linp[skip] = h->upper -= ilen;
-	dest = (char *)h + h->upper;
-	if (F_ISSET(t, R_RECNO))
-		WR_RLEAF(dest, data, flags)
-	else
-		WR_BLEAF(dest, key, data, flags)
-
-	/* If the root page was split, make it look right. */
-	if (sp->pgno == P_ROOT &&
-	    (F_ISSET(t, R_RECNO) ?
-	    bt_rroot(t, sp, l, r) : bt_broot(t, sp, l, r)) == RET_ERROR)
-		goto err2;
-
-	/*
-	 * Now we walk the parent page stack -- a LIFO stack of the pages that
-	 * were traversed when we searched for the page that split.  Each stack
-	 * entry is a page number and a page index offset.  The offset is for
-	 * the page traversed on the search.  We've just split a page, so we
-	 * have to insert a new key into the parent page.
-	 *
-	 * If the insert into the parent page causes it to split, may have to
-	 * continue splitting all the way up the tree.  We stop if the root
-	 * splits or the page inserted into didn't have to split to hold the
-	 * new key.  Some algorithms replace the key for the old page as well
-	 * as the new page.  We don't, as there's no reason to believe that the
-	 * first key on the old page is any better than the key we have, and,
-	 * in the case of a key being placed at index 0 causing the split, the
-	 * key is unavailable.
-	 *
-	 * There are a maximum of 5 pages pinned at any time.  We keep the left
-	 * and right pages pinned while working on the parent.   The 5 are the
-	 * two children, left parent and right parent (when the parent splits)
-	 * and the root page or the overflow key page when calling bt_preserve.
-	 * This code must make sure that all pins are released other than the
-	 * root page or overflow page which is unlocked elsewhere.
-	 */
-	while ((parent = BT_POP(t)) != NULL) {
-		lchild = l;
-		rchild = r;
-
-		/* Get the parent page. */
-		if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-			goto err2;
-
-		/*
-		 * The new key goes ONE AFTER the index, because the split
-		 * was to the right.
-		 */
-		skip = parent->index + 1;
-
-		/*
-		 * Calculate the space needed on the parent page.
-		 *
-		 * Prefix trees: space hack when inserting into BINTERNAL
-		 * pages.  Retain only what's needed to distinguish between
-		 * the new entry and the LAST entry on the page to its left.
-		 * If the keys compare equal, retain the entire key.  Note,
-		 * we don't touch overflow keys, and the entire key must be
-		 * retained for the next-to-left most key on the leftmost
-		 * page of each level, or the search will fail.  Applicable
-		 * ONLY to internal pages that have leaf pages as children.
-		 * Further reduction of the key between pairs of internal
-		 * pages loses too much information.
-		 */
-		switch (rchild->flags & P_TYPE) {
-		case P_BINTERNAL:
-			bi = GETBINTERNAL(rchild, 0);
-			nbytes = NBINTERNAL(bi->ksize);
-			break;
-		case P_BLEAF:
-			bl = GETBLEAF(rchild, 0);
-			nbytes = NBINTERNAL(bl->ksize);
-			if (t->bt_pfx && !(bl->flags & P_BIGKEY) &&
-			    (h->prevpg != P_INVALID || skip > 1)) {
-				tbl = GETBLEAF(lchild, NEXTINDEX(lchild) - 1);
-				a.size = tbl->ksize;
-				a.data = tbl->bytes;
-				b.size = bl->ksize;
-				b.data = bl->bytes;
-				nksize = t->bt_pfx(&a, &b);
-				n = NBINTERNAL(nksize);
-				if (n < nbytes) {
-#ifdef STATISTICS
-					bt_pfxsaved += nbytes - n;
-#endif
-					nbytes = n;
-				} else
-					nksize = 0;
-			} else
-				nksize = 0;
-			break;
-		case P_RINTERNAL:
-		case P_RLEAF:
-			nbytes = NRINTERNAL;
-			break;
-		default:
-			abort();
-		}
-
-		/* Split the parent page if necessary or shift the indices. */
-		if ((uint32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) {
-			sp = h;
-			h = h->pgno == P_ROOT ?
-			    bt_root(t, h, &l, &r, &skip, nbytes) :
-			    bt_page(t, h, &l, &r, &skip, nbytes);
-			if (h == NULL)
-				goto err1;
-			parentsplit = 1;
-		} else {
-			if (skip < (nxtindex = NEXTINDEX(h)))
-				memmove(h->linp + skip + 1, h->linp + skip,
-				    (nxtindex - skip) * sizeof(indx_t));
-			h->lower += sizeof(indx_t);
-			parentsplit = 0;
-		}
-
-		/* Insert the key into the parent page. */
-		switch (rchild->flags & P_TYPE) {
-		case P_BINTERNAL:
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)h + h->linp[skip];
-			memmove(dest, bi, nbytes);
-			((BINTERNAL *)dest)->pgno = rchild->pgno;
-			break;
-		case P_BLEAF:
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)h + h->linp[skip];
-			WR_BINTERNAL(dest, nksize ? nksize : bl->ksize,
-			    rchild->pgno, bl->flags & P_BIGKEY);
-			memmove(dest, bl->bytes, nksize ? nksize : bl->ksize);
-			if (bl->flags & P_BIGKEY &&
-			    bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
-				goto err1;
-			break;
-		case P_RINTERNAL:
-			/*
-			 * Update the left page count.  If split
-			 * added at index 0, fix the correct page.
-			 */
-			if (skip > 0)
-				dest = (char *)h + h->linp[skip - 1];
-			else
-				dest = (char *)l + l->linp[NEXTINDEX(l) - 1];
-			((RINTERNAL *)dest)->nrecs = rec_total(lchild);
-			((RINTERNAL *)dest)->pgno = lchild->pgno;
-
-			/* Update the right page count. */
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)h + h->linp[skip];
-			((RINTERNAL *)dest)->nrecs = rec_total(rchild);
-			((RINTERNAL *)dest)->pgno = rchild->pgno;
-			break;
-		case P_RLEAF:
-			/*
-			 * Update the left page count.  If split
-			 * added at index 0, fix the correct page.
-			 */
-			if (skip > 0)
-				dest = (char *)h + h->linp[skip - 1];
-			else
-				dest = (char *)l + l->linp[NEXTINDEX(l) - 1];
-			((RINTERNAL *)dest)->nrecs = NEXTINDEX(lchild);
-			((RINTERNAL *)dest)->pgno = lchild->pgno;
-
-			/* Update the right page count. */
-			h->linp[skip] = h->upper -= nbytes;
-			dest = (char *)h + h->linp[skip];
-			((RINTERNAL *)dest)->nrecs = NEXTINDEX(rchild);
-			((RINTERNAL *)dest)->pgno = rchild->pgno;
-			break;
-		default:
-			abort();
-		}
-
-		/* Unpin the held pages. */
-		if (!parentsplit) {
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		}
-
-		/* If the root page was split, make it look right. */
-		if (sp->pgno == P_ROOT &&
-		    (F_ISSET(t, R_RECNO) ?
-		    bt_rroot(t, sp, l, r) : bt_broot(t, sp, l, r)) == RET_ERROR)
-			goto err1;
-
-		mpool_put(t->bt_mp, lchild, MPOOL_DIRTY);
-		mpool_put(t->bt_mp, rchild, MPOOL_DIRTY);
-	}
-
-	/* Unpin the held pages. */
-	mpool_put(t->bt_mp, l, MPOOL_DIRTY);
-	mpool_put(t->bt_mp, r, MPOOL_DIRTY);
-
-	/* Clear any pages left on the stack. */
-	return (RET_SUCCESS);
-
-	/*
-	 * If something fails in the above loop we were already walking back
-	 * up the tree and the tree is now inconsistent.  Nothing much we can
-	 * do about it but release any memory we're holding.
-	 */
-err1:	mpool_put(t->bt_mp, lchild, MPOOL_DIRTY);
-	mpool_put(t->bt_mp, rchild, MPOOL_DIRTY);
-
-err2:	mpool_put(t->bt_mp, l, 0);
-	mpool_put(t->bt_mp, r, 0);
-	__dbpanic(t->bt_dbp);
-	return (RET_ERROR);
-}
-
-/*
- * BT_PAGE -- Split a non-root page of a btree.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	lp:	pointer to left page pointer
- *	rp:	pointer to right page pointer
- *	skip:	pointer to index to leave open
- *	ilen:	insert length
- *
- * Returns:
- *	Pointer to page in which to insert or NULL on error.
- */
-static PAGE *
-bt_page(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen)
-{
-	PAGE *l, *r, *tp;
-	pgno_t npg;
-
-#ifdef STATISTICS
-	++bt_split;
-#endif
-	/* Put the new right page for the split into place. */
-	if ((r = __bt_new(t, &npg)) == NULL)
-		return (NULL);
-	r->pgno = npg;
-	r->lower = BTDATAOFF;
-	r->upper = t->bt_psize;
-	r->nextpg = h->nextpg;
-	r->prevpg = h->pgno;
-	r->flags = h->flags & P_TYPE;
-
-	/*
-	 * If we're splitting the last page on a level because we're appending
-	 * a key to it (skip is NEXTINDEX()), it's likely that the data is
-	 * sorted.  Adding an empty page on the side of the level is less work
-	 * and can push the fill factor much higher than normal.  If we're
-	 * wrong it's no big deal, we'll just do the split the right way next
-	 * time.  It may look like it's equally easy to do a similar hack for
-	 * reverse sorted data, that is, split the tree left, but it's not.
-	 * Don't even try.
-	 */
-	if (h->nextpg == P_INVALID && *skip == NEXTINDEX(h)) {
-#ifdef STATISTICS
-		++bt_sortsplit;
-#endif
-		h->nextpg = r->pgno;
-		r->lower = BTDATAOFF + sizeof(indx_t);
-		*skip = 0;
-		*lp = h;
-		*rp = r;
-		return (r);
-	}
-
-	/* Put the new left page for the split into place. */
-	if ((l = (PAGE *)calloc(1, t->bt_psize)) == NULL) {
-		mpool_put(t->bt_mp, r, 0);
-		return (NULL);
-	}
-	l->pgno = h->pgno;
-	l->nextpg = r->pgno;
-	l->prevpg = h->prevpg;
-	l->lower = BTDATAOFF;
-	l->upper = t->bt_psize;
-	l->flags = h->flags & P_TYPE;
-
-	/* Fix up the previous pointer of the page after the split page. */
-	if (h->nextpg != P_INVALID) {
-		if ((tp = mpool_get(t->bt_mp, h->nextpg, 0)) == NULL) {
-			free(l);
-			/* XXX mpool_free(t->bt_mp, r->pgno); */
-			return (NULL);
-		}
-		tp->prevpg = r->pgno;
-		mpool_put(t->bt_mp, tp, MPOOL_DIRTY);
-	}
-
-	/*
-	 * Split right.  The key/data pairs aren't sorted in the btree page so
-	 * it's simpler to copy the data from the split page onto two new pages
-	 * instead of copying half the data to the right page and compacting
-	 * the left page in place.  Since the left page can't change, we have
-	 * to swap the original and the allocated left page after the split.
-	 */
-	tp = bt_psplit(t, h, l, r, skip, ilen);
-
-	/* Move the new left page onto the old left page. */
-	memmove(h, l, t->bt_psize);
-	if (tp == l)
-		tp = h;
-	free(l);
-
-	*lp = h;
-	*rp = r;
-	return (tp);
-}
-
-/*
- * BT_ROOT -- Split the root page of a btree.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	lp:	pointer to left page pointer
- *	rp:	pointer to right page pointer
- *	skip:	pointer to index to leave open
- *	ilen:	insert length
- *
- * Returns:
- *	Pointer to page in which to insert or NULL on error.
- */
-static PAGE *
-bt_root(BTREE *t, PAGE *h, PAGE **lp, PAGE **rp, indx_t *skip, size_t ilen)
-{
-	PAGE *l, *r, *tp;
-	pgno_t lnpg, rnpg;
-
-#ifdef STATISTICS
-	++bt_split;
-	++bt_rootsplit;
-#endif
-	/* Put the new left and right pages for the split into place. */
-	if ((l = __bt_new(t, &lnpg)) == NULL ||
-	    (r = __bt_new(t, &rnpg)) == NULL)
-		return (NULL);
-	l->pgno = lnpg;
-	r->pgno = rnpg;
-	l->nextpg = r->pgno;
-	r->prevpg = l->pgno;
-	l->prevpg = r->nextpg = P_INVALID;
-	l->lower = r->lower = BTDATAOFF;
-	l->upper = r->upper = t->bt_psize;
-	l->flags = r->flags = h->flags & P_TYPE;
-
-	/* Split the root page. */
-	tp = bt_psplit(t, h, l, r, skip, ilen);
-
-	*lp = l;
-	*rp = r;
-	return (tp);
-}
-
-/*
- * BT_RROOT -- Fix up the recno root page after it has been split.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	l:	left page
- *	r:	right page
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-bt_rroot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
-{
-	char *dest;
-
-	/* Insert the left and right keys, set the header information. */
-	h->linp[0] = h->upper = t->bt_psize - NRINTERNAL;
-	dest = (char *)h + h->upper;
-	WR_RINTERNAL(dest,
-	    l->flags & P_RLEAF ? NEXTINDEX(l) : rec_total(l), l->pgno);
-
-	__PAST_END(h->linp, 1) = h->upper -= NRINTERNAL;
-	dest = (char *)h + h->upper;
-	WR_RINTERNAL(dest,
-	    r->flags & P_RLEAF ? NEXTINDEX(r) : rec_total(r), r->pgno);
-
-	h->lower = BTDATAOFF + 2 * sizeof(indx_t);
-
-	/* Unpin the root page, set to recno internal page. */
-	h->flags &= ~P_TYPE;
-	h->flags |= P_RINTERNAL;
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	return (RET_SUCCESS);
-}
-
-/*
- * BT_BROOT -- Fix up the btree root page after it has been split.
- *
- * Parameters:
- *	t:	tree
- *	h:	root page
- *	l:	left page
- *	r:	right page
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-static int
-bt_broot(BTREE *t, PAGE *h, PAGE *l, PAGE *r)
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	uint32_t nbytes;
-	char *dest;
-
-	/*
-	 * If the root page was a leaf page, change it into an internal page.
-	 * We copy the key we split on (but not the key's data, in the case of
-	 * a leaf page) to the new root page.
-	 *
-	 * The btree comparison code guarantees that the left-most key on any
-	 * level of the tree is never used, so it doesn't need to be filled in.
-	 */
-	nbytes = NBINTERNAL(0);
-	h->linp[0] = h->upper = t->bt_psize - nbytes;
-	dest = (char *)h + h->upper;
-	WR_BINTERNAL(dest, 0, l->pgno, 0);
-
-	switch (h->flags & P_TYPE) {
-	case P_BLEAF:
-		bl = GETBLEAF(r, 0);
-		nbytes = NBINTERNAL(bl->ksize);
-		__PAST_END(h->linp, 1) = h->upper -= nbytes;
-		dest = (char *)h + h->upper;
-		WR_BINTERNAL(dest, bl->ksize, r->pgno, 0);
-		memmove(dest, bl->bytes, bl->ksize);
-
-		/*
-		 * If the key is on an overflow page, mark the overflow chain
-		 * so it isn't deleted when the leaf copy of the key is deleted.
-		 */
-		if (bl->flags & P_BIGKEY &&
-		    bt_preserve(t, *(pgno_t *)bl->bytes) == RET_ERROR)
-			return (RET_ERROR);
-		break;
-	case P_BINTERNAL:
-		bi = GETBINTERNAL(r, 0);
-		nbytes = NBINTERNAL(bi->ksize);
-		__PAST_END(h->linp, 1) = h->upper -= nbytes;
-		dest = (char *)h + h->upper;
-		memmove(dest, bi, nbytes);
-		((BINTERNAL *)dest)->pgno = r->pgno;
-		break;
-	default:
-		abort();
-	}
-
-	/* There are two keys on the page. */
-	h->lower = BTDATAOFF + 2 * sizeof(indx_t);
-
-	/* Unpin the root page, set to btree internal page. */
-	h->flags &= ~P_TYPE;
-	h->flags |= P_BINTERNAL;
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	return (RET_SUCCESS);
-}
-
-/*
- * BT_PSPLIT -- Do the real work of splitting the page.
- *
- * Parameters:
- *	t:	tree
- *	h:	page to be split
- *	l:	page to put lower half of data
- *	r:	page to put upper half of data
- *	pskip:	pointer to index to leave open
- *	ilen:	insert length
- *
- * Returns:
- *	Pointer to page in which to insert.
- */
-static PAGE *
-bt_psplit(BTREE *t, PAGE *h, PAGE *l, PAGE *r, indx_t *pskip, size_t ilen)
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	CURSOR *c;
-	RLEAF *rl;
-	PAGE *rval;
-	void *src;
-	indx_t full, half, nxt, off, skip, top, used;
-	uint32_t nbytes;
-	int bigkeycnt, isbigkey;
-
-	/*
-	 * Split the data to the left and right pages.  Leave the skip index
-	 * open.  Additionally, make some effort not to split on an overflow
-	 * key.  This makes internal page processing faster and can save
-	 * space as overflow keys used by internal pages are never deleted.
-	 */
-	bigkeycnt = 0;
-	skip = *pskip;
-	full = t->bt_psize - BTDATAOFF;
-	half = full / 2;
-	used = 0;
-	for (nxt = off = 0, top = NEXTINDEX(h); nxt < top; ++off) {
-		if (skip == off) {
-			nbytes = ilen;
-			isbigkey = 0;		/* XXX: not really known. */
-		} else
-			switch (h->flags & P_TYPE) {
-			case P_BINTERNAL:
-				src = bi = GETBINTERNAL(h, nxt);
-				nbytes = NBINTERNAL(bi->ksize);
-				isbigkey = bi->flags & P_BIGKEY;
-				break;
-			case P_BLEAF:
-				src = bl = GETBLEAF(h, nxt);
-				nbytes = NBLEAF(bl);
-				isbigkey = bl->flags & P_BIGKEY;
-				break;
-			case P_RINTERNAL:
-				src = GETRINTERNAL(h, nxt);
-				nbytes = NRINTERNAL;
-				isbigkey = 0;
-				break;
-			case P_RLEAF:
-				src = rl = GETRLEAF(h, nxt);
-				nbytes = NRLEAF(rl);
-				isbigkey = 0;
-				break;
-			default:
-				abort();
-			}
-
-		/*
-		 * If the key/data pairs are substantial fractions of the max
-		 * possible size for the page, it's possible to get situations
-		 * where we decide to try and copy too much onto the left page.
-		 * Make sure that doesn't happen.
-		 */
-		if ((skip <= off && used + nbytes + sizeof(indx_t) >= full) ||
-		    nxt == top - 1) {
-			--off;
-			break;
-		}
-
-		/* Copy the key/data pair, if not the skipped index. */
-		if (skip != off) {
-			++nxt;
-
-			l->linp[off] = l->upper -= nbytes;
-			memmove((char *)l + l->upper, src, nbytes);
-		}
-
-		used += nbytes + sizeof(indx_t);
-		if (used >= half) {
-			if (!isbigkey || bigkeycnt == 3)
-				break;
-			else
-				++bigkeycnt;
-		}
-	}
-
-	/*
-	 * Off is the last offset that's valid for the left page.
-	 * Nxt is the first offset to be placed on the right page.
-	 */
-	l->lower += (off + 1) * sizeof(indx_t);
-
-	/*
-	 * If splitting the page that the cursor was on, the cursor has to be
-	 * adjusted to point to the same record as before the split.  If the
-	 * cursor is at or past the skipped slot, the cursor is incremented by
-	 * one.  If the cursor is on the right page, it is decremented by the
-	 * number of records split to the left page.
-	 */
-	c = &t->bt_cursor;
-	if (F_ISSET(c, CURS_INIT) && c->pg.pgno == h->pgno) {
-		if (c->pg.index >= skip)
-			++c->pg.index;
-		if (c->pg.index < nxt)			/* Left page. */
-			c->pg.pgno = l->pgno;
-		else {					/* Right page. */
-			c->pg.pgno = r->pgno;
-			c->pg.index -= nxt;
-		}
-	}
-
-	/*
-	 * If the skipped index was on the left page, just return that page.
-	 * Otherwise, adjust the skip index to reflect the new position on
-	 * the right page.
-	 */
-	if (skip <= off) {
-		skip = MAX_PAGE_OFFSET;
-		rval = l;
-	} else {
-		rval = r;
-		*pskip -= nxt;
-	}
-
-	for (off = 0; nxt < top; ++off) {
-		if (skip == nxt) {
-			++off;
-			skip = MAX_PAGE_OFFSET;
-		}
-		switch (h->flags & P_TYPE) {
-		case P_BINTERNAL:
-			src = bi = GETBINTERNAL(h, nxt);
-			nbytes = NBINTERNAL(bi->ksize);
-			break;
-		case P_BLEAF:
-			src = bl = GETBLEAF(h, nxt);
-			nbytes = NBLEAF(bl);
-			break;
-		case P_RINTERNAL:
-			src = GETRINTERNAL(h, nxt);
-			nbytes = NRINTERNAL;
-			break;
-		case P_RLEAF:
-			src = rl = GETRLEAF(h, nxt);
-			nbytes = NRLEAF(rl);
-			break;
-		default:
-			abort();
-		}
-		++nxt;
-		r->linp[off] = r->upper -= nbytes;
-		memmove((char *)r + r->upper, src, nbytes);
-	}
-	r->lower += off * sizeof(indx_t);
-
-	/* If the key is being appended to the page, adjust the index. */
-	if (skip == top)
-		r->lower += sizeof(indx_t);
-
-	return (rval);
-}
-
-/*
- * BT_PRESERVE -- Mark a chain of pages as used by an internal node.
- *
- * Chains of indirect blocks pointed to by leaf nodes get reclaimed when the
- * record that references them gets deleted.  Chains pointed to by internal
- * pages never get deleted.  This routine marks a chain as pointed to by an
- * internal page.
- *
- * Parameters:
- *	t:	tree
- *	pg:	page number of first page in the chain.
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-static int
-bt_preserve(BTREE *t, pgno_t pg)
-{
-	PAGE *h;
-
-	if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-		return (RET_ERROR);
-	h->flags |= P_PRESERVE;
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
-
-/*
- * REC_TOTAL -- Return the number of recno entries below a page.
- *
- * Parameters:
- *	h:	page
- *
- * Returns:
- *	The number of recno entries below a page.
- *
- * XXX
- * These values could be set by the bt_psplit routine.  The problem is that the
- * entry has to be popped off of the stack etc. or the values have to be passed
- * all the way back to bt_split/bt_rroot and it's not very clean.
- */
-static recno_t
-rec_total(PAGE *h)
-{
-	recno_t recs;
-	indx_t nxt, top;
-
-	for (recs = 0, nxt = 0, top = NEXTINDEX(h); nxt < top; ++nxt)
-		recs += GETRINTERNAL(h, nxt)->nrecs;
-	return (recs);
-}
diff --git a/lib/libc_bsd/db/btree/bt_utils.c b/lib/libc_bsd/db/btree/bt_utils.c
deleted file mode 100644
index b894034..0000000
--- a/lib/libc_bsd/db/btree/bt_utils.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bt_utils.c	8.8 (Berkeley) 7/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/btree/bt_utils.c 189387 2009-03-05 00:57:01Z delphij $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "btree.h"
-
-/*
- * __bt_ret --
- *	Build return key/data pair.
- *
- * Parameters:
- *	t:	tree
- *	e:	key/data pair to be returned
- *	key:	user's key structure (NULL if not to be filled in)
- *	rkey:	memory area to hold key
- *	data:	user's data structure (NULL if not to be filled in)
- *	rdata:	memory area to hold data
- *       copy:	always copy the key/data item
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__bt_ret(BTREE *t, EPG *e, DBT *key, DBT *rkey, DBT *data, DBT *rdata, int copy)
-{
-	BLEAF *bl;
-	void *p;
-
-	bl = GETBLEAF(e->page, e->index);
-
-	/*
-	 * We must copy big keys/data to make them contigous.  Otherwise,
-	 * leave the page pinned and don't copy unless the user specified
-	 * concurrent access.
-	 */
-	if (key == NULL)
-		goto dataonly;
-
-	if (bl->flags & P_BIGKEY) {
-		if (__ovfl_get(t, bl->bytes,
-		    &key->size, &rkey->data, &rkey->size))
-			return (RET_ERROR);
-		key->data = rkey->data;
-	} else if (copy || F_ISSET(t, B_DB_LOCK)) {
-		if (bl->ksize > rkey->size) {
-			p = realloc(rkey->data, bl->ksize);
-			if (p == NULL)
-				return (RET_ERROR);
-			rkey->data = p;
-			rkey->size = bl->ksize;
-		}
-		memmove(rkey->data, bl->bytes, bl->ksize);
-		key->size = bl->ksize;
-		key->data = rkey->data;
-	} else {
-		key->size = bl->ksize;
-		key->data = bl->bytes;
-	}
-
-dataonly:
-	if (data == NULL)
-		return (RET_SUCCESS);
-
-	if (bl->flags & P_BIGDATA) {
-		if (__ovfl_get(t, bl->bytes + bl->ksize,
-		    &data->size, &rdata->data, &rdata->size))
-			return (RET_ERROR);
-		data->data = rdata->data;
-	} else if (copy || F_ISSET(t, B_DB_LOCK)) {
-		/* Use +1 in case the first record retrieved is 0 length. */
-		if (bl->dsize + 1 > rdata->size) {
-			p = realloc(rdata->data, bl->dsize + 1);
-			if (p == NULL)
-				return (RET_ERROR);
-			rdata->data = p;
-			rdata->size = bl->dsize + 1;
-		}
-		memmove(rdata->data, bl->bytes + bl->ksize, bl->dsize);
-		data->size = bl->dsize;
-		data->data = rdata->data;
-	} else {
-		data->size = bl->dsize;
-		data->data = bl->bytes + bl->ksize;
-	}
-
-	return (RET_SUCCESS);
-}
-
-/*
- * __BT_CMP -- Compare a key to a given record.
- *
- * Parameters:
- *	t:	tree
- *	k1:	DBT pointer of first arg to comparison
- *	e:	pointer to EPG for comparison
- *
- * Returns:
- *	< 0 if k1 is < record
- *	= 0 if k1 is = record
- *	> 0 if k1 is > record
- */
-int
-__bt_cmp(BTREE *t, const DBT *k1, EPG *e)
-{
-	BINTERNAL *bi;
-	BLEAF *bl;
-	DBT k2;
-	PAGE *h;
-	void *bigkey;
-
-	/*
-	 * The left-most key on internal pages, at any level of the tree, is
-	 * guaranteed by the following code to be less than any user key.
-	 * This saves us from having to update the leftmost key on an internal
-	 * page when the user inserts a new key in the tree smaller than
-	 * anything we've yet seen.
-	 */
-	h = e->page;
-	if (e->index == 0 && h->prevpg == P_INVALID && !(h->flags & P_BLEAF))
-		return (1);
-
-	bigkey = NULL;
-	if (h->flags & P_BLEAF) {
-		bl = GETBLEAF(h, e->index);
-		if (bl->flags & P_BIGKEY)
-			bigkey = bl->bytes;
-		else {
-			k2.data = bl->bytes;
-			k2.size = bl->ksize;
-		}
-	} else {
-		bi = GETBINTERNAL(h, e->index);
-		if (bi->flags & P_BIGKEY)
-			bigkey = bi->bytes;
-		else {
-			k2.data = bi->bytes;
-			k2.size = bi->ksize;
-		}
-	}
-
-	if (bigkey) {
-		if (__ovfl_get(t, bigkey,
-		    &k2.size, &t->bt_rdata.data, &t->bt_rdata.size))
-			return (RET_ERROR);
-		k2.data = t->bt_rdata.data;
-	}
-	return ((*t->bt_cmp)(k1, &k2));
-}
-
-/*
- * __BT_DEFCMP -- Default comparison routine.
- *
- * Parameters:
- *	a:	DBT #1
- *	b:	DBT #2
- *
- * Returns:
- *	< 0 if a is < b
- *	= 0 if a is = b
- *	> 0 if a is > b
- */
-int
-__bt_defcmp(const DBT *a, const DBT *b)
-{
-	size_t len;
-	u_char *p1, *p2;
-
-	/*
-	 * XXX
-	 * If a size_t doesn't fit in an int, this routine can lose.
-	 * What we need is an integral type which is guaranteed to be
-	 * larger than a size_t, and there is no such thing.
-	 */
-	len = MIN(a->size, b->size);
-	for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2)
-		if (*p1 != *p2)
-			return ((int)*p1 - (int)*p2);
-	return ((int)a->size - (int)b->size);
-}
-
-/*
- * __BT_DEFPFX -- Default prefix routine.
- *
- * Parameters:
- *	a:	DBT #1
- *	b:	DBT #2
- *
- * Returns:
- *	Number of bytes needed to distinguish b from a.
- */
-size_t
-__bt_defpfx(const DBT *a, const DBT *b)
-{
-	u_char *p1, *p2;
-	size_t cnt, len;
-
-	cnt = 1;
-	len = MIN(a->size, b->size);
-	for (p1 = a->data, p2 = b->data; len--; ++p1, ++p2, ++cnt)
-		if (*p1 != *p2)
-			return (cnt);
-
-	/* a->size must be <= b->size, or they wouldn't be in this order. */
-	return (a->size < b->size ? a->size + 1 : a->size);
-}
diff --git a/lib/libc_bsd/db/btree/btree.h b/lib/libc_bsd/db/btree/btree.h
deleted file mode 100644
index a8224fe..0000000
--- a/lib/libc_bsd/db/btree/btree.h
+++ /dev/null
@@ -1,380 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- *
- *	@(#)btree.h	8.11 (Berkeley) 8/17/94
- * $FreeBSD: releng/10.2/lib/libc/db/btree/btree.h 189327 2009-03-04 00:58:04Z delphij $
- */
-
-/* Macros to set/clear/test flags. */
-#define	F_SET(p, f)	(p)->flags |= (f)
-#define	F_CLR(p, f)	(p)->flags &= ~(f)
-#define	F_ISSET(p, f)	((p)->flags & (f))
-
-#include <mpool.h>
-
-#define	DEFMINKEYPAGE	(2)		/* Minimum keys per page */
-#define	MINCACHE	(5)		/* Minimum cached pages */
-#define	MINPSIZE	(512)		/* Minimum page size */
-
-/*
- * Page 0 of a btree file contains a copy of the meta-data.  This page is also
- * used as an out-of-band page, i.e. page pointers that point to nowhere point
- * to page 0.  Page 1 is the root of the btree.
- */
-#define	P_INVALID	 0		/* Invalid tree page number. */
-#define	P_META		 0		/* Tree metadata page number. */
-#define	P_ROOT		 1		/* Tree root page number. */
-
-/*
- * There are five page layouts in the btree: btree internal pages (BINTERNAL),
- * btree leaf pages (BLEAF), recno internal pages (RINTERNAL), recno leaf pages
- * (RLEAF) and overflow pages.  All five page types have a page header (PAGE).
- * This implementation requires that values within structures NOT be padded.
- * (ANSI C permits random padding.)  If your compiler pads randomly you'll have
- * to do some work to get this package to run.
- */
-typedef struct _page {
-	pgno_t	pgno;			/* this page's page number */
-	pgno_t	prevpg;			/* left sibling */
-	pgno_t	nextpg;			/* right sibling */
-
-#define	P_BINTERNAL	0x01		/* btree internal page */
-#define	P_BLEAF		0x02		/* leaf page */
-#define	P_OVERFLOW	0x04		/* overflow page */
-#define	P_RINTERNAL	0x08		/* recno internal page */
-#define	P_RLEAF		0x10		/* leaf page */
-#define P_TYPE		0x1f		/* type mask */
-#define	P_PRESERVE	0x20		/* never delete this chain of pages */
-	uint32_t flags;
-
-	indx_t	lower;			/* lower bound of free space on page */
-	indx_t	upper;			/* upper bound of free space on page */
-	indx_t	linp[1];		/* indx_t-aligned VAR. LENGTH DATA */
-} PAGE;
-
-/* First and next index. */
-#define	BTDATAOFF							\
-	(sizeof(pgno_t) + sizeof(pgno_t) + sizeof(pgno_t) +		\
-	    sizeof(uint32_t) + sizeof(indx_t) + sizeof(indx_t))
-#define	NEXTINDEX(p)	(((p)->lower - BTDATAOFF) / sizeof(indx_t))
-
-/*
- * For pages other than overflow pages, there is an array of offsets into the
- * rest of the page immediately following the page header.  Each offset is to
- * an item which is unique to the type of page.  The h_lower offset is just
- * past the last filled-in index.  The h_upper offset is the first item on the
- * page.  Offsets are from the beginning of the page.
- *
- * If an item is too big to store on a single page, a flag is set and the item
- * is a { page, size } pair such that the page is the first page of an overflow
- * chain with size bytes of item.  Overflow pages are simply bytes without any
- * external structure.
- *
- * The page number and size fields in the items are pgno_t-aligned so they can
- * be manipulated without copying.  (This presumes that 32 bit items can be
- * manipulated on this system.)
- */
-#define	LALIGN(n)	(((n) + sizeof(pgno_t) - 1) & ~(sizeof(pgno_t) - 1))
-#define	NOVFLSIZE	(sizeof(pgno_t) + sizeof(uint32_t))
-
-/*
- * For the btree internal pages, the item is a key.  BINTERNALs are {key, pgno}
- * pairs, such that the key compares less than or equal to all of the records
- * on that page.  For a tree without duplicate keys, an internal page with two
- * consecutive keys, a and b, will have all records greater than or equal to a
- * and less than b stored on the page associated with a.  Duplicate keys are
- * somewhat special and can cause duplicate internal and leaf page records and
- * some minor modifications of the above rule.
- */
-typedef struct _binternal {
-	uint32_t ksize;		/* key size */
-	pgno_t	pgno;			/* page number stored on */
-#define	P_BIGDATA	0x01		/* overflow data */
-#define	P_BIGKEY	0x02		/* overflow key */
-	u_char	flags;
-	char	bytes[1];		/* data */
-} BINTERNAL;
-
-/* Get the page's BINTERNAL structure at index indx. */
-#define	GETBINTERNAL(pg, indx)						\
-	((BINTERNAL *)((char *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define NBINTERNAL(len)							\
-	LALIGN(sizeof(uint32_t) + sizeof(pgno_t) + sizeof(u_char) + (len))
-
-/* Copy a BINTERNAL entry to the page. */
-#define	WR_BINTERNAL(p, size, pgno, flags) {				\
-	*(uint32_t *)p = size;						\
-	p += sizeof(uint32_t);						\
-	*(pgno_t *)p = pgno;						\
-	p += sizeof(pgno_t);						\
-	*(u_char *)p = flags;						\
-	p += sizeof(u_char);						\
-}
-
-/*
- * For the recno internal pages, the item is a page number with the number of
- * keys found on that page and below.
- */
-typedef struct _rinternal {
-	recno_t	nrecs;			/* number of records */
-	pgno_t	pgno;			/* page number stored below */
-} RINTERNAL;
-
-/* Get the page's RINTERNAL structure at index indx. */
-#define	GETRINTERNAL(pg, indx)						\
-	((RINTERNAL *)((char *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define NRINTERNAL							\
-	LALIGN(sizeof(recno_t) + sizeof(pgno_t))
-
-/* Copy a RINTERAL entry to the page. */
-#define	WR_RINTERNAL(p, nrecs, pgno) {					\
-	*(recno_t *)p = nrecs;						\
-	p += sizeof(recno_t);						\
-	*(pgno_t *)p = pgno;						\
-}
-
-/* For the btree leaf pages, the item is a key and data pair. */
-typedef struct _bleaf {
-	uint32_t	ksize;		/* size of key */
-	uint32_t	dsize;		/* size of data */
-	u_char	flags;			/* P_BIGDATA, P_BIGKEY */
-	char	bytes[1];		/* data */
-} BLEAF;
-
-/* Get the page's BLEAF structure at index indx. */
-#define	GETBLEAF(pg, indx)						\
-	((BLEAF *)((char *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define NBLEAF(p)	NBLEAFDBT((p)->ksize, (p)->dsize)
-
-/* Get the number of bytes in the user's key/data pair. */
-#define NBLEAFDBT(ksize, dsize)						\
-	LALIGN(sizeof(uint32_t) + sizeof(uint32_t) + sizeof(u_char) +	\
-	    (ksize) + (dsize))
-
-/* Copy a BLEAF entry to the page. */
-#define	WR_BLEAF(p, key, data, flags) {					\
-	*(uint32_t *)p = key->size;					\
-	p += sizeof(uint32_t);						\
-	*(uint32_t *)p = data->size;					\
-	p += sizeof(uint32_t);						\
-	*(u_char *)p = flags;						\
-	p += sizeof(u_char);						\
-	memmove(p, key->data, key->size);				\
-	p += key->size;							\
-	memmove(p, data->data, data->size);				\
-}
-
-/* For the recno leaf pages, the item is a data entry. */
-typedef struct _rleaf {
-	uint32_t	dsize;		/* size of data */
-	u_char	flags;			/* P_BIGDATA */
-	char	bytes[1];
-} RLEAF;
-
-/* Get the page's RLEAF structure at index indx. */
-#define	GETRLEAF(pg, indx)						\
-	((RLEAF *)((char *)(pg) + (pg)->linp[indx]))
-
-/* Get the number of bytes in the entry. */
-#define NRLEAF(p)	NRLEAFDBT((p)->dsize)
-
-/* Get the number of bytes from the user's data. */
-#define	NRLEAFDBT(dsize)						\
-	LALIGN(sizeof(uint32_t) + sizeof(u_char) + (dsize))
-
-/* Copy a RLEAF entry to the page. */
-#define	WR_RLEAF(p, data, flags) {					\
-	*(uint32_t *)p = data->size;					\
-	p += sizeof(uint32_t);						\
-	*(u_char *)p = flags;						\
-	p += sizeof(u_char);						\
-	memmove(p, data->data, data->size);				\
-}
-
-/*
- * A record in the tree is either a pointer to a page and an index in the page
- * or a page number and an index.  These structures are used as a cursor, stack
- * entry and search returns as well as to pass records to other routines.
- *
- * One comment about searches.  Internal page searches must find the largest
- * record less than key in the tree so that descents work.  Leaf page searches
- * must find the smallest record greater than key so that the returned index
- * is the record's correct position for insertion.
- */
-typedef struct _epgno {
-	pgno_t	pgno;			/* the page number */
-	indx_t	index;			/* the index on the page */
-} EPGNO;
-
-typedef struct _epg {
-	PAGE	*page;			/* the (pinned) page */
-	indx_t	 index;			/* the index on the page */
-} EPG;
-
-/*
- * About cursors.  The cursor (and the page that contained the key/data pair
- * that it referenced) can be deleted, which makes things a bit tricky.  If
- * there are no duplicates of the cursor key in the tree (i.e. B_NODUPS is set
- * or there simply aren't any duplicates of the key) we copy the key that it
- * referenced when it's deleted, and reacquire a new cursor key if the cursor
- * is used again.  If there are duplicates keys, we move to the next/previous
- * key, and set a flag so that we know what happened.  NOTE: if duplicate (to
- * the cursor) keys are added to the tree during this process, it is undefined
- * if they will be returned or not in a cursor scan.
- *
- * The flags determine the possible states of the cursor:
- *
- * CURS_INIT	The cursor references *something*.
- * CURS_ACQUIRE	The cursor was deleted, and a key has been saved so that
- *		we can reacquire the right position in the tree.
- * CURS_AFTER, CURS_BEFORE
- *		The cursor was deleted, and now references a key/data pair
- *		that has not yet been returned, either before or after the
- *		deleted key/data pair.
- * XXX
- * This structure is broken out so that we can eventually offer multiple
- * cursors as part of the DB interface.
- */
-typedef struct _cursor {
-	EPGNO	 pg;			/* B: Saved tree reference. */
-	DBT	 key;			/* B: Saved key, or key.data == NULL. */
-	recno_t	 rcursor;		/* R: recno cursor (1-based) */
-
-#define	CURS_ACQUIRE	0x01		/*  B: Cursor needs to be reacquired. */
-#define	CURS_AFTER	0x02		/*  B: Unreturned cursor after key. */
-#define	CURS_BEFORE	0x04		/*  B: Unreturned cursor before key. */
-#define	CURS_INIT	0x08		/* RB: Cursor initialized. */
-	u_int8_t flags;
-} CURSOR;
-
-/*
- * The metadata of the tree.  The nrecs field is used only by the RECNO code.
- * This is because the btree doesn't really need it and it requires that every
- * put or delete call modify the metadata.
- */
-typedef struct _btmeta {
-	uint32_t	magic;		/* magic number */
-	uint32_t	version;	/* version */
-	uint32_t	psize;		/* page size */
-	uint32_t	free;		/* page number of first free page */
-	uint32_t	nrecs;		/* R: number of records */
-
-#define	SAVEMETA	(B_NODUPS | R_RECNO)
-	uint32_t	flags;		/* bt_flags & SAVEMETA */
-} BTMETA;
-
-/* The in-memory btree/recno data structure. */
-typedef struct _btree {
-	MPOOL	 *bt_mp;		/* memory pool cookie */
-
-	DB	 *bt_dbp;		/* pointer to enclosing DB */
-
-	EPG	  bt_cur;		/* current (pinned) page */
-	PAGE	 *bt_pinned;		/* page pinned across calls */
-
-	CURSOR	  bt_cursor;		/* cursor */
-
-#define	BT_PUSH(t, p, i) {						\
-	t->bt_sp->pgno = p;						\
-	t->bt_sp->index = i;						\
-	++t->bt_sp;							\
-}
-#define	BT_POP(t)	(t->bt_sp == t->bt_stack ? NULL : --t->bt_sp)
-#define	BT_CLR(t)	(t->bt_sp = t->bt_stack)
-	EPGNO	  bt_stack[50];		/* stack of parent pages */
-	EPGNO	 *bt_sp;		/* current stack pointer */
-
-	DBT	  bt_rkey;		/* returned key */
-	DBT	  bt_rdata;		/* returned data */
-
-	int	  bt_fd;		/* tree file descriptor */
-
-	pgno_t	  bt_free;		/* next free page */
-	uint32_t bt_psize;		/* page size */
-	indx_t	  bt_ovflsize;		/* cut-off for key/data overflow */
-	int	  bt_lorder;		/* byte order */
-					/* sorted order */
-	enum { NOT, BACK, FORWARD } bt_order;
-	EPGNO	  bt_last;		/* last insert */
-
-					/* B: key comparison function */
-	int	(*bt_cmp)(const DBT *, const DBT *);
-					/* B: prefix comparison function */
-	size_t	(*bt_pfx)(const DBT *, const DBT *);
-					/* R: recno input function */
-	int	(*bt_irec)(struct _btree *, recno_t);
-
-	FILE	 *bt_rfp;		/* R: record FILE pointer */
-	int	  bt_rfd;		/* R: record file descriptor */
-
-	caddr_t	  bt_cmap;		/* R: current point in mapped space */
-	caddr_t	  bt_smap;		/* R: start of mapped space */
-	caddr_t   bt_emap;		/* R: end of mapped space */
-	size_t	  bt_msize;		/* R: size of mapped region. */
-
-	recno_t	  bt_nrecs;		/* R: number of records */
-	size_t	  bt_reclen;		/* R: fixed record length */
-	u_char	  bt_bval;		/* R: delimiting byte/pad character */
-
-/*
- * NB:
- * B_NODUPS and R_RECNO are stored on disk, and may not be changed.
- */
-#define	B_INMEM		0x00001		/* in-memory tree */
-#define	B_METADIRTY	0x00002		/* need to write metadata */
-#define	B_MODIFIED	0x00004		/* tree modified */
-#define	B_NEEDSWAP	0x00008		/* if byte order requires swapping */
-#define	B_RDONLY	0x00010		/* read-only tree */
-
-#define	B_NODUPS	0x00020		/* no duplicate keys permitted */
-#define	R_RECNO		0x00080		/* record oriented tree */
-
-#define	R_CLOSEFP	0x00040		/* opened a file pointer */
-#define	R_EOF		0x00100		/* end of input file reached. */
-#define	R_FIXLEN	0x00200		/* fixed length records */
-#define	R_MEMMAPPED	0x00400		/* memory mapped file. */
-#define	R_INMEM		0x00800		/* in-memory file */
-#define	R_MODIFIED	0x01000		/* modified file */
-#define	R_RDONLY	0x02000		/* read-only file */
-
-#define	B_DB_LOCK	0x04000		/* DB_LOCK specified. */
-#define	B_DB_SHMEM	0x08000		/* DB_SHMEM specified. */
-#define	B_DB_TXN	0x10000		/* DB_TXN specified. */
-	uint32_t flags;
-} BTREE;
-
-#include "extern.h"
diff --git a/lib/libc_bsd/db/btree/extern.h b/lib/libc_bsd/db/btree/extern.h
deleted file mode 100644
index dbabc2b..0000000
--- a/lib/libc_bsd/db/btree/extern.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)extern.h	8.10 (Berkeley) 7/20/94
- * $FreeBSD: releng/10.2/lib/libc/db/btree/extern.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-int	 __bt_close(DB *);
-int	 __bt_cmp(BTREE *, const DBT *, EPG *);
-int	 __bt_crsrdel(BTREE *, EPGNO *);
-int	 __bt_defcmp(const DBT *, const DBT *);
-size_t	 __bt_defpfx(const DBT *, const DBT *);
-int	 __bt_delete(const DB *, const DBT *, u_int);
-int	 __bt_dleaf(BTREE *, const DBT *, PAGE *, u_int);
-int	 __bt_fd(const DB *);
-int	 __bt_free(BTREE *, PAGE *);
-int	 __bt_get(const DB *, const DBT *, DBT *, u_int);
-PAGE	*__bt_new(BTREE *, pgno_t *);
-void	 __bt_pgin(void *, pgno_t, void *);
-void	 __bt_pgout(void *, pgno_t, void *);
-int	 __bt_push(BTREE *, pgno_t, int);
-int	 __bt_put(const DB *dbp, DBT *, const DBT *, u_int);
-int	 __bt_ret(BTREE *, EPG *, DBT *, DBT *, DBT *, DBT *, int);
-EPG	*__bt_search(BTREE *, const DBT *, int *);
-int	 __bt_seq(const DB *, DBT *, DBT *, u_int);
-void	 __bt_setcur(BTREE *, pgno_t, u_int);
-int	 __bt_split(BTREE *, PAGE *,
-	    const DBT *, const DBT *, int, size_t, uint32_t);
-int	 __bt_sync(const DB *, u_int);
-
-int	 __ovfl_delete(BTREE *, void *);
-int	 __ovfl_get(BTREE *, void *, size_t *, void **, size_t *);
-int	 __ovfl_put(BTREE *, const DBT *, pgno_t *);
-
-#ifdef DEBUG
-void	 __bt_dnpage(DB *, pgno_t);
-void	 __bt_dpage(PAGE *);
-void	 __bt_dump(DB *);
-#endif
-#ifdef STATISTICS
-void	 __bt_stat(DB *);
-#endif
diff --git a/lib/libc_bsd/db/changelog b/lib/libc_bsd/db/changelog
deleted file mode 100644
index 1540ca8..0000000
--- a/lib/libc_bsd/db/changelog
+++ /dev/null
@@ -1,103 +0,0 @@
-1.84 -> 1.85
-	recno:	#ifdef out use of mmap, it's not portable enough.
-
-1.83 -> 1.84	Thu Aug 18 15:46:07 EDT 1994
-	recno:	Rework fixed-length records so that closing and reopening
-		the file now works.  Pad short records on input.  Never do
-		signed comparison in recno input reading functions.
-
-1.82 -> 1.83	Tue Jul 26 15:33:44 EDT 1994
-	btree:	Rework cursor deletion code yet again; bugs with
-		deleting empty pages that only contained the cursor
-		record.
-
-1.81 -> 1.82	Sat Jul 16 11:01:50 EDT 1994
-	btree:	Fix bugs introduced by new cursor/deletion code.
-		Replace return kbuf/dbuf with real DBT's.
-
-1.80 -> 1.81
-	btree:	Fix bugs introduced by new cursor/deletion code.
-	all:	Add #defines for Purify.
-
-1.79 -> 1.80	Wed Jul 13 22:41:54 EDT 1994
-	btree	Change deletion to coalesce empty pages.  This is a major
-		change, cursors and duplicate pages all had to be reworked.
-		Return to a fixed stack.
-	recno:	Affected by cursor changes.  New cursor structures should
-		permit multiple cursors in the future.
-
-1.78 -> 1.79	Mon Jun 20 17:36:47 EDT 1994
-	all:	Minor cleanups of 1.78 for porting reasons; only
-		major change was inlining check of NULL pointer
-		so that __fix_realloc goes away.
-
-1.77 -> 1.78	Thu Jun 16 19:06:43 EDT 1994
-	all:	Move "standard" size typedef's into db.h.
-
-1.76 -> 1.77	Thu Jun 16 16:48:38 EDT 1994
-	hash:	Delete __init_ routine, has special meaning to OSF 2.0.
-
-1.74 -> 1.76
-	all:	Finish up the port to the Alpha.
-
-1.73 -> 1.74
-	recno:	Don't put the record if rec_search fails, in rec_rdelete.
-		Create fixed-length intermediate records past "end" of DB
-		correctly.
-		Realloc bug when reading in fixed records.
-	all:	First cut at port to Alpha (64-bit architecture) using
-		4.4BSD basic integral types typedef's.
-		Cast allocation pointers to shut up old compilers.
-		Rework PORT directory into OS/machine directories.
-
-1.72 -> 1.73
-	btree:	If enough duplicate records were inserted and then deleted
-		that internal pages had references to empty pages of the
-		duplicate keys, the search function ended up on the wrong
-		page.
-
-1.7  -> 1.72	12 Oct 1993
-	hash:	Support NET/2 hash formats.
-
-1.7  -> 1.71	16 Sep 1993
-	btree/recno:
-		Fix bug in internal search routines that caused
-		return of invalid pointers.
-
-1.6  -> 1.7	07 Sep 1993
-	hash:	Fixed big key overflow bugs.
-	test:	Portability hacks, rewrite test script, Makefile.
-	btree/recno:
-		Stop copying non-overflow key/data pairs.
-	PORT:	Break PORT directory up into per architecture/OS
-		subdirectories.
-
-1.5  -> 1.6	06 Jun 1993
-	hash:	In PAIRFITS, the first comparison should look at (P)[2].
-		The hash_realloc function was walking off the end of memory.
-		The overflow page number was wrong when bumping splitpoint.
-
-1.4  -> 1.5	23 May 1993
-	hash:	Set hash default fill factor dynamically.
-	recno:	Fixed bug in sorted page splits.
-		Add page size parameter support.
-		Allow recno to specify the name of the underlying btree;
-			used for vi recovery.
-	btree/recno:
-		Support 64K pages.
-	btree/hash/recno:
-		Provide access to an underlying file descriptor.
-		Change sync routines to take a flag argument, recno
-			uses this to sync out the underlying btree.
-
-1.3  -> 1.4	10 May 1993
-	recno:	Delete the R_CURSORLOG flag from the recno interface.
-		Zero-length record fix for non-mmap reads.
-		Try and make SIZE_T_MAX test in open portable.
-
-1.2  -> 1.3	01 May 1993
-	btree:	Ignore user byte-order setting when reading already
-		existing database.  Fixes to byte-order conversions.
-
-1.1  -> 1.2	15 Apr 1993
-		No bug fixes, only compatibility hacks.
diff --git a/lib/libc_bsd/db/db/Makefile.inc b/lib/libc_bsd/db/db/Makefile.inc
deleted file mode 100644
index 21cd9a9..0000000
--- a/lib/libc_bsd/db/db/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 107052 2002-11-18 09:50:57Z ru $
-
-.PATH: ${.CURDIR}/db/db
-
-SRCS+=	db.c
diff --git a/lib/libc_bsd/db/db/db.c b/lib/libc_bsd/db/db/db.c
deleted file mode 100644
index b92f44d..0000000
--- a/lib/libc_bsd/db/db/db.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)db.c	8.4 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/db/db.c 190497 2009-03-28 07:26:00Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stddef.h>
-#include <stdio.h>
-
-#include <db.h>
-
-static int __dberr(void);
-
-DB *
-dbopen(const char *fname, int flags, int mode, DBTYPE type, const void *openinfo)
-{
-
-#define	DB_FLAGS	(DB_LOCK | DB_SHMEM | DB_TXN)
-#define	USE_OPEN_FLAGS							\
-	(O_CREAT | O_EXCL | O_EXLOCK | O_NOFOLLOW | O_NONBLOCK | 	\
-	 O_RDONLY | O_RDWR | O_SHLOCK | O_SYNC | O_TRUNC)
-
-	if ((flags & ~(USE_OPEN_FLAGS | DB_FLAGS)) == 0)
-		switch (type) {
-		case DB_BTREE:
-			return (__bt_open(fname, flags & USE_OPEN_FLAGS,
-			    mode, openinfo, flags & DB_FLAGS));
-		case DB_HASH:
-			return (__hash_open(fname, flags & USE_OPEN_FLAGS,
-			    mode, openinfo, flags & DB_FLAGS));
-		case DB_RECNO:
-			return (__rec_open(fname, flags & USE_OPEN_FLAGS,
-			    mode, openinfo, flags & DB_FLAGS));
-		}
-	errno = EINVAL;
-	return (NULL);
-}
-
-static int
-__dberr(void)
-{
-	return (RET_ERROR);
-}
-
-/*
- * __DBPANIC -- Stop.
- *
- * Parameters:
- *	dbp:	pointer to the DB structure.
- */
-void
-__dbpanic(DB *dbp)
-{
-	/* The only thing that can succeed is a close. */
-	dbp->del = (int (*)(const struct __db *, const DBT*, u_int))__dberr;
-	dbp->fd = (int (*)(const struct __db *))__dberr;
-	dbp->get = (int (*)(const struct __db *, const DBT*, DBT *, u_int))__dberr;
-	dbp->put = (int (*)(const struct __db *, DBT *, const DBT *, u_int))__dberr;
-	dbp->seq = (int (*)(const struct __db *, DBT *, DBT *, u_int))__dberr;
-	dbp->sync = (int (*)(const struct __db *, u_int))__dberr;
-}
diff --git a/lib/libc_bsd/db/docs/hash.usenix.ps b/lib/libc_bsd/db/docs/hash.usenix.ps
deleted file mode 100644
index ff95802..0000000
--- a/lib/libc_bsd/db/docs/hash.usenix.ps
+++ /dev/null
@@ -1,12209 +0,0 @@
-%!PS-Adobe-1.0
-%%Creator: utopia:margo (& Seltzer,608-13E,8072,)
-%%Title: stdin (ditroff)
-%%CreationDate: Tue Dec 11 15:06:45 1990
-%%EndComments
-%	@(#)psdit.pro	1.3 4/15/88
-% lib/psdit.pro -- prolog for psdit (ditroff) files
-% Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved.
-% last edit: shore Sat Nov 23 20:28:03 1985
-% RCSID: $FreeBSD: releng/10.2/lib/libc/db/docs/hash.usenix.ps 50488 1999-08-28 05:11:36Z peter $
-
-% Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics,
-% 17 Feb, 87.
-
-/$DITroff 140 dict def $DITroff begin
-/fontnum 1 def /fontsize 10 def /fontheight 10 def /fontslant 0 def
-/xi{0 72 11 mul translate 72 resolution div dup neg scale 0 0 moveto
- /fontnum 1 def /fontsize 10 def /fontheight 10 def /fontslant 0 def F
- /pagesave save def}def
-/PB{save /psv exch def currentpoint translate 
- resolution 72 div dup neg scale 0 0 moveto}def
-/PE{psv restore}def
-/arctoobig 90 def /arctoosmall .05 def
-/m1 matrix def /m2 matrix def /m3 matrix def /oldmat matrix def
-/tan{dup sin exch cos div}def
-/point{resolution 72 div mul}def
-/dround	{transform round exch round exch itransform}def
-/xT{/devname exch def}def
-/xr{/mh exch def /my exch def /resolution exch def}def
-/xp{}def
-/xs{docsave restore end}def
-/xt{}def
-/xf{/fontname exch def /slotno exch def fontnames slotno get fontname eq not
- {fonts slotno fontname findfont put fontnames slotno fontname put}if}def
-/xH{/fontheight exch def F}def
-/xS{/fontslant exch def F}def
-/s{/fontsize exch def /fontheight fontsize def F}def
-/f{/fontnum exch def F}def
-/F{fontheight 0 le{/fontheight fontsize def}if
- fonts fontnum get fontsize point 0 0 fontheight point neg 0 0 m1 astore
- fontslant 0 ne{1 0 fontslant tan 1 0 0 m2 astore m3 concatmatrix}if
- makefont setfont .04 fontsize point mul 0 dround pop setlinewidth}def
-/X{exch currentpoint exch pop moveto show}def
-/N{3 1 roll moveto show}def
-/Y{exch currentpoint pop exch moveto show}def
-/S{show}def
-/ditpush{}def/ditpop{}def
-/AX{3 -1 roll currentpoint exch pop moveto 0 exch ashow}def
-/AN{4 2 roll moveto 0 exch ashow}def
-/AY{3 -1 roll currentpoint pop exch moveto 0 exch ashow}def
-/AS{0 exch ashow}def
-/MX{currentpoint exch pop moveto}def
-/MY{currentpoint pop exch moveto}def
-/MXY{moveto}def
-/cb{pop}def	% action on unknown char -- nothing for now
-/n{}def/w{}def
-/p{pop showpage pagesave restore /pagesave save def}def
-/Dt{/Dlinewidth exch def}def 1 Dt
-/Ds{/Ddash exch def}def -1 Ds
-/Di{/Dstipple exch def}def 1 Di
-/Dsetlinewidth{2 Dlinewidth mul setlinewidth}def
-/Dsetdash{Ddash 4 eq{[8 12]}{Ddash 16 eq{[32 36]}
- {Ddash 20 eq{[32 12 8 12]}{[]}ifelse}ifelse}ifelse 0 setdash}def
-/Dstroke{gsave Dsetlinewidth Dsetdash 1 setlinecap stroke grestore
- currentpoint newpath moveto}def
-/Dl{rlineto Dstroke}def
-/arcellipse{/diamv exch def /diamh exch def oldmat currentmatrix pop
- currentpoint translate 1 diamv diamh div scale /rad diamh 2 div def
- currentpoint exch rad add exch rad -180 180 arc oldmat setmatrix}def
-/Dc{dup arcellipse Dstroke}def
-/De{arcellipse Dstroke}def
-/Da{/endv exch def /endh exch def /centerv exch def /centerh exch def
- /cradius centerv centerv mul centerh centerh mul add sqrt def
- /eradius endv endv mul endh endh mul add sqrt def
- /endang endv endh atan def
- /startang centerv neg centerh neg atan def
- /sweep startang endang sub dup 0 lt{360 add}if def
- sweep arctoobig gt
- {/midang startang sweep 2 div sub def /midrad cradius eradius add 2 div def
-  /midh midang cos midrad mul def /midv midang sin midrad mul def
-  midh neg midv neg endh endv centerh centerv midh midv Da
-  Da}
- {sweep arctoosmall ge
-  {/controldelt 1 sweep 2 div cos sub 3 sweep 2 div sin mul div 4 mul def
-   centerv neg controldelt mul centerh controldelt mul
-   endv neg controldelt mul centerh add endh add
-   endh controldelt mul centerv add endv add
-   centerh endh add centerv endv add rcurveto Dstroke}
-  {centerh endh add centerv endv add rlineto Dstroke}
-  ifelse}
- ifelse}def
-/Dpatterns[
-[%cf[widthbits]
-[8<0000000000000010>]
-[8<0411040040114000>]
-[8<0204081020408001>]
-[8<0000103810000000>]
-[8<6699996666999966>]
-[8<0000800100001008>]
-[8<81c36666c3810000>]
-[8<0f0e0c0800000000>]
-[8<0000000000000010>]
-[8<0411040040114000>]
-[8<0204081020408001>]
-[8<0000001038100000>]
-[8<6699996666999966>]
-[8<0000800100001008>]
-[8<81c36666c3810000>]
-[8<0f0e0c0800000000>]
-[8<0042660000246600>]
-[8<0000990000990000>]
-[8<0804020180402010>]
-[8<2418814242811824>]
-[8<6699996666999966>]
-[8<8000000008000000>]
-[8<00001c3e363e1c00>]
-[8<0000000000000000>]
-[32<00000040000000c00000004000000040000000e0000000000000000000000000>]
-[32<00000000000060000000900000002000000040000000f0000000000000000000>]
-[32<000000000000000000e0000000100000006000000010000000e0000000000000>]
-[32<00000000000000002000000060000000a0000000f00000002000000000000000>]
-[32<0000000e0000000000000000000000000000000f000000080000000e00000001>]
-[32<0000090000000600000000000000000000000000000007000000080000000e00>]
-[32<00010000000200000004000000040000000000000000000000000000000f0000>]
-[32<0900000006000000090000000600000000000000000000000000000006000000>]]
-[%ug
-[8<0000020000000000>]
-[8<0000020000002000>]
-[8<0004020000002000>]
-[8<0004020000402000>]
-[8<0004060000402000>]
-[8<0004060000406000>]
-[8<0006060000406000>]
-[8<0006060000606000>]
-[8<00060e0000606000>]
-[8<00060e000060e000>]
-[8<00070e000060e000>]
-[8<00070e000070e000>]
-[8<00070e020070e000>]
-[8<00070e020070e020>]
-[8<04070e020070e020>]
-[8<04070e024070e020>]
-[8<04070e064070e020>]
-[8<04070e064070e060>]
-[8<06070e064070e060>]
-[8<06070e066070e060>]
-[8<06070f066070e060>]
-[8<06070f066070f060>]
-[8<060f0f066070f060>]
-[8<060f0f0660f0f060>]
-[8<060f0f0760f0f060>]
-[8<060f0f0760f0f070>]
-[8<0e0f0f0760f0f070>]
-[8<0e0f0f07e0f0f070>]
-[8<0e0f0f0fe0f0f070>]
-[8<0e0f0f0fe0f0f0f0>]
-[8<0f0f0f0fe0f0f0f0>]
-[8<0f0f0f0ff0f0f0f0>]
-[8<1f0f0f0ff0f0f0f0>]
-[8<1f0f0f0ff1f0f0f0>]
-[8<1f0f0f8ff1f0f0f0>]
-[8<1f0f0f8ff1f0f0f8>]
-[8<9f0f0f8ff1f0f0f8>]
-[8<9f0f0f8ff9f0f0f8>]
-[8<9f0f0f9ff9f0f0f8>]
-[8<9f0f0f9ff9f0f0f9>]
-[8<9f8f0f9ff9f0f0f9>]
-[8<9f8f0f9ff9f8f0f9>]
-[8<9f8f1f9ff9f8f0f9>]
-[8<9f8f1f9ff9f8f1f9>]
-[8<bf8f1f9ff9f8f1f9>]
-[8<bf8f1f9ffbf8f1f9>]
-[8<bf8f1fdffbf8f1f9>]
-[8<bf8f1fdffbf8f1fd>]
-[8<ff8f1fdffbf8f1fd>]
-[8<ff8f1fdffff8f1fd>]
-[8<ff8f1ffffff8f1fd>]
-[8<ff8f1ffffff8f1ff>]
-[8<ff9f1ffffff8f1ff>]
-[8<ff9f1ffffff9f1ff>]
-[8<ff9f9ffffff9f1ff>]
-[8<ff9f9ffffff9f9ff>]
-[8<ffbf9ffffff9f9ff>]
-[8<ffbf9ffffffbf9ff>]
-[8<ffbfdffffffbf9ff>]
-[8<ffbfdffffffbfdff>]
-[8<ffffdffffffbfdff>]
-[8<ffffdffffffffdff>]
-[8<fffffffffffffdff>]
-[8<ffffffffffffffff>]]
-[%mg
-[8<8000000000000000>]
-[8<0822080080228000>]
-[8<0204081020408001>]
-[8<40e0400000000000>]
-[8<66999966>]
-[8<8001000010080000>]
-[8<81c36666c3810000>]
-[8<f0e0c08000000000>]
-[16<07c00f801f003e007c00f800f001e003c007800f001f003e007c00f801f003e0>]
-[16<1f000f8007c003e001f000f8007c003e001f800fc007e003f001f8007c003e00>]
-[8<c3c300000000c3c3>]
-[16<0040008001000200040008001000200040008000000100020004000800100020>]
-[16<0040002000100008000400020001800040002000100008000400020001000080>]
-[16<1fc03fe07df0f8f8f07de03fc01f800fc01fe03ff07df8f87df03fe01fc00f80>]
-[8<80>]
-[8<8040201000000000>]
-[8<84cc000048cc0000>]
-[8<9900009900000000>]
-[8<08040201804020100800020180002010>]
-[8<2418814242811824>]
-[8<66999966>]
-[8<8000000008000000>]
-[8<70f8d8f870000000>]
-[8<0814224180402010>]
-[8<aa00440a11a04400>]
-[8<018245aa45820100>]
-[8<221c224180808041>]
-[8<88000000>]
-[8<0855800080550800>]
-[8<2844004482440044>]
-[8<0810204080412214>]
-[8<00>]]]def
-/Dfill{
- transform /maxy exch def /maxx exch def
- transform /miny exch def /minx exch def
- minx maxx gt{/minx maxx /maxx minx def def}if
- miny maxy gt{/miny maxy /maxy miny def def}if
- Dpatterns Dstipple 1 sub get exch 1 sub get
- aload pop /stip exch def /stipw exch def /stiph 128 def
- /imatrix[stipw 0 0 stiph 0 0]def
- /tmatrix[stipw 0 0 stiph 0 0]def
- /minx minx cvi stiph idiv stiph mul def
- /miny miny cvi stipw idiv stipw mul def
- gsave eoclip 0 setgray
- miny stiph maxy{
-  tmatrix exch 5 exch put
-  minx stipw maxx{
-   tmatrix exch 4 exch put tmatrix setmatrix
-   stipw stiph true imatrix {stip} imagemask
-  }for
- }for
- grestore
-}def
-/Dp{Dfill Dstroke}def
-/DP{Dfill currentpoint newpath moveto}def
-end
-
-/ditstart{$DITroff begin
- /nfonts 60 def			% NFONTS makedev/ditroff dependent!
- /fonts[nfonts{0}repeat]def
- /fontnames[nfonts{()}repeat]def
-/docsave save def
-}def
-
-% character outcalls
-/oc{
- /pswid exch def /cc exch def /name exch def
- /ditwid pswid fontsize mul resolution mul 72000 div def
- /ditsiz fontsize resolution mul 72 div def
- ocprocs name known{ocprocs name get exec}{name cb}ifelse
-}def
-/fractm [.65 0 0 .6 0 0] def
-/fraction{
- /fden exch def /fnum exch def gsave /cf currentfont def
- cf fractm makefont setfont 0 .3 dm 2 copy neg rmoveto
- fnum show rmoveto currentfont cf setfont(\244)show setfont fden show 
- grestore ditwid 0 rmoveto
-}def
-/oce{grestore ditwid 0 rmoveto}def
-/dm{ditsiz mul}def
-/ocprocs 50 dict def ocprocs begin
-(14){(1)(4)fraction}def
-(12){(1)(2)fraction}def
-(34){(3)(4)fraction}def
-(13){(1)(3)fraction}def
-(23){(2)(3)fraction}def
-(18){(1)(8)fraction}def
-(38){(3)(8)fraction}def
-(58){(5)(8)fraction}def
-(78){(7)(8)fraction}def
-(sr){gsave 0 .06 dm rmoveto(\326)show oce}def
-(is){gsave 0 .15 dm rmoveto(\362)show oce}def
-(->){gsave 0 .02 dm rmoveto(\256)show oce}def
-(<-){gsave 0 .02 dm rmoveto(\254)show oce}def
-(==){gsave 0 .05 dm rmoveto(\272)show oce}def
-(uc){gsave currentpoint 400 .009 dm mul add translate
-     8 -8 scale ucseal oce}def
-end
-
-% an attempt at a PostScript FONT to implement ditroff special chars
-% this will enable us to 
-%	cache the little buggers
-%	generate faster, more compact PS out of psdit
-%	confuse everyone (including myself)!
-50 dict dup begin
-/FontType 3 def
-/FontName /DIThacks def
-/FontMatrix [.001 0 0 .001 0 0] def
-/FontBBox [-260 -260 900 900] def% a lie but ...
-/Encoding 256 array def
-0 1 255{Encoding exch /.notdef put}for
-Encoding
- dup 8#040/space put %space
- dup 8#110/rc put %right ceil
- dup 8#111/lt put %left  top curl
- dup 8#112/bv put %bold vert
- dup 8#113/lk put %left  mid curl
- dup 8#114/lb put %left  bot curl
- dup 8#115/rt put %right top curl
- dup 8#116/rk put %right mid curl
- dup 8#117/rb put %right bot curl
- dup 8#120/rf put %right floor
- dup 8#121/lf put %left  floor
- dup 8#122/lc put %left  ceil
- dup 8#140/sq put %square
- dup 8#141/bx put %box
- dup 8#142/ci put %circle
- dup 8#143/br put %box rule
- dup 8#144/rn put %root extender
- dup 8#145/vr put %vertical rule
- dup 8#146/ob put %outline bullet
- dup 8#147/bu put %bullet
- dup 8#150/ru put %rule
- dup 8#151/ul put %underline
- pop
-/DITfd 100 dict def
-/BuildChar{0 begin
- /cc exch def /fd exch def
- /charname fd /Encoding get cc get def
- /charwid fd /Metrics get charname get def
- /charproc fd /CharProcs get charname get def
- charwid 0 fd /FontBBox get aload pop setcachedevice
- 2 setlinejoin 40 setlinewidth
- newpath 0 0 moveto gsave charproc grestore
- end}def
-/BuildChar load 0 DITfd put
-/CharProcs 50 dict def
-CharProcs begin
-/space{}def
-/.notdef{}def
-/ru{500 0 rls}def
-/rn{0 840 moveto 500 0 rls}def
-/vr{0 800 moveto 0 -770 rls}def
-/bv{0 800 moveto 0 -1000 rls}def
-/br{0 840 moveto 0 -1000 rls}def
-/ul{0 -140 moveto 500 0 rls}def
-/ob{200 250 rmoveto currentpoint newpath 200 0 360 arc closepath stroke}def
-/bu{200 250 rmoveto currentpoint newpath 200 0 360 arc closepath fill}def
-/sq{80 0 rmoveto currentpoint dround newpath moveto
-    640 0 rlineto 0 640 rlineto -640 0 rlineto closepath stroke}def
-/bx{80 0 rmoveto currentpoint dround newpath moveto
-    640 0 rlineto 0 640 rlineto -640 0 rlineto closepath fill}def
-/ci{500 360 rmoveto currentpoint newpath 333 0 360 arc
-    50 setlinewidth stroke}def
-
-/lt{0 -200 moveto 0 550 rlineto currx 800 2cx s4 add exch s4 a4p stroke}def
-/lb{0 800 moveto 0 -550 rlineto currx -200 2cx s4 add exch s4 a4p stroke}def
-/rt{0 -200 moveto 0 550 rlineto currx 800 2cx s4 sub exch s4 a4p stroke}def
-/rb{0 800 moveto 0 -500 rlineto currx -200 2cx s4 sub exch s4 a4p stroke}def
-/lk{0 800 moveto 0 300 -300 300 s4 arcto pop pop 1000 sub
-    0 300 4 2 roll s4 a4p 0 -200 lineto stroke}def
-/rk{0 800 moveto 0 300 s2 300 s4 arcto pop pop 1000 sub
-    0 300 4 2 roll s4 a4p 0 -200 lineto stroke}def
-/lf{0 800 moveto 0 -1000 rlineto s4 0 rls}def
-/rf{0 800 moveto 0 -1000 rlineto s4 neg 0 rls}def
-/lc{0 -200 moveto 0 1000 rlineto s4 0 rls}def
-/rc{0 -200 moveto 0 1000 rlineto s4 neg 0 rls}def
-end
-
-/Metrics 50 dict def Metrics begin
-/.notdef 0 def
-/space 500 def
-/ru 500 def
-/br 0 def
-/lt 416 def
-/lb 416 def
-/rt 416 def
-/rb 416 def
-/lk 416 def
-/rk 416 def
-/rc 416 def
-/lc 416 def
-/rf 416 def
-/lf 416 def
-/bv 416 def
-/ob 350 def
-/bu 350 def
-/ci 750 def
-/bx 750 def
-/sq 750 def
-/rn 500 def
-/ul 500 def
-/vr 0 def
-end
-
-DITfd begin
-/s2 500 def /s4 250 def /s3 333 def
-/a4p{arcto pop pop pop pop}def
-/2cx{2 copy exch}def
-/rls{rlineto stroke}def
-/currx{currentpoint pop}def
-/dround{transform round exch round exch itransform} def
-end
-end
-/DIThacks exch definefont pop
-ditstart
-(psc)xT
-576 1 1 xr
-1(Times-Roman)xf 1 f
-2(Times-Italic)xf 2 f
-3(Times-Bold)xf 3 f
-4(Times-BoldItalic)xf 4 f
-5(Helvetica)xf 5 f
-6(Helvetica-Bold)xf 6 f
-7(Courier)xf 7 f
-8(Courier-Bold)xf 8 f
-9(Symbol)xf 9 f
-10(DIThacks)xf 10 f
-10 s
-1 f
-xi
-%%EndProlog
-
-%%Page: 1 1
-10 s 10 xH 0 xS 1 f
-3 f
-22 s
-1249 626(A)N
-1420(N)X
-1547(ew)X
-1796(H)X
-1933(ashing)X
-2467(P)X
-2574(ackage)X
-3136(for)X
-3405(U)X
-3532(N)X
-3659(IX)X
-2 f
-20 s
-3855 562(1)N
-1 f
-12 s
-1607 779(Margo)N
-1887(Seltzer)X
-9 f
-2179(-)X
-1 f
-2256(University)X
-2686(of)X
-2790(California,)X
-3229(Berkeley)X
-2015 875(Ozan)N
-2242(Yigit)X
-9 f
-2464(-)X
-1 f
-2541(York)X
-2762(University)X
-3 f
-2331 1086(ABSTRACT)N
-1 f
-10 s
-1152 1222(UNIX)N
-1385(support)X
-1657(of)X
-1756(disk)X
-1921(oriented)X
-2216(hashing)X
-2497(was)X
-2654(originally)X
-2997(provided)X
-3314(by)X
-2 f
-3426(dbm)X
-1 f
-3595([ATT79])X
-3916(and)X
-1152 1310(subsequently)N
-1595(improved)X
-1927(upon)X
-2112(in)X
-2 f
-2199(ndbm)X
-1 f
-2402([BSD86].)X
-2735(In)X
-2826(AT&T)X
-3068(System)X
-3327(V,)X
-3429(in-memory)X
-3809(hashed)X
-1152 1398(storage)N
-1420(and)X
-1572(access)X
-1814(support)X
-2090(was)X
-2251(added)X
-2479(in)X
-2577(the)X
-2 f
-2711(hsearch)X
-1 f
-3000(library)X
-3249(routines)X
-3542([ATT85].)X
-3907(The)X
-1152 1486(result)N
-1367(is)X
-1457(a)X
-1530(system)X
-1789(with)X
-1968(two)X
-2125(incompatible)X
-2580(hashing)X
-2865(schemes,)X
-3193(each)X
-3377(with)X
-3555(its)X
-3666(own)X
-3840(set)X
-3965(of)X
-1152 1574(shortcomings.)N
-1152 1688(This)N
-1316(paper)X
-1517(presents)X
-1802(the)X
-1922(design)X
-2152(and)X
-2289(performance)X
-2717(characteristics)X
-3198(of)X
-3286(a)X
-3343(new)X
-3498(hashing)X
-3768(package)X
-1152 1776(providing)N
-1483(a)X
-1539(superset)X
-1822(of)X
-1909(the)X
-2027(functionality)X
-2456(provided)X
-2761(by)X
-2 f
-2861(dbm)X
-1 f
-3019(and)X
-2 f
-3155(hsearch)X
-1 f
-3409(.)X
-3469(The)X
-3614(new)X
-3768(package)X
-1152 1864(uses)N
-1322(linear)X
-1537(hashing)X
-1818(to)X
-1912(provide)X
-2189(ef\256cient)X
-2484(support)X
-2755(of)X
-2853(both)X
-3026(memory)X
-3324(based)X
-3538(and)X
-3685(disk)X
-3849(based)X
-1152 1952(hash)N
-1319(tables)X
-1526(with)X
-1688(performance)X
-2115(superior)X
-2398(to)X
-2480(both)X
-2 f
-2642(dbm)X
-1 f
-2800(and)X
-2 f
-2936(hsearch)X
-1 f
-3210(under)X
-3413(most)X
-3588(conditions.)X
-3 f
-1380 2128(Introduction)N
-1 f
-892 2260(Current)N
-1196(UNIX)X
-1456(systems)X
-1768(offer)X
-1984(two)X
-2163(forms)X
-2409(of)X
-720 2348(hashed)N
-973(data)X
-1137(access.)X
-2 f
-1413(Dbm)X
-1 f
-1599(and)X
-1745(its)X
-1850(derivatives)X
-2231(provide)X
-720 2436(keyed)N
-939(access)X
-1171(to)X
-1259(disk)X
-1418(resident)X
-1698(data)X
-1858(while)X
-2 f
-2062(hsearch)X
-1 f
-2342(pro-)X
-720 2524(vides)N
-929(access)X
-1175(for)X
-1309(memory)X
-1616(resident)X
-1910(data.)X
-2124(These)X
-2356(two)X
-720 2612(access)N
-979(methods)X
-1302(are)X
-1453(incompatible)X
-1923(in)X
-2037(that)X
-2209(memory)X
-720 2700(resident)N
-1011(hash)X
-1195(tables)X
-1419(may)X
-1593(not)X
-1731(be)X
-1843(stored)X
-2075(on)X
-2191(disk)X
-2360(and)X
-720 2788(disk)N
-884(resident)X
-1169(tables)X
-1387(cannot)X
-1632(be)X
-1739(read)X
-1909(into)X
-2063(memory)X
-2360(and)X
-720 2876(accessed)N
-1022(using)X
-1215(the)X
-1333(in-memory)X
-1709(routines.)X
-2 f
-892 2990(Dbm)N
-1 f
-1091(has)X
-1241(several)X
-1512(shortcomings.)X
-2026(Since)X
-2247(data)X
-2423(is)X
-720 3078(assumed)N
-1032(to)X
-1130(be)X
-1242(disk)X
-1411(resident,)X
-1721(each)X
-1905(access)X
-2146(requires)X
-2440(a)X
-720 3166(system)N
-963(call,)X
-1120(and)X
-1257(almost)X
-1491(certainly,)X
-1813(a)X
-1869(disk)X
-2022(operation.)X
-2365(For)X
-720 3254(extremely)N
-1072(large)X
-1264(databases,)X
-1623(where)X
-1851(caching)X
-2131(is)X
-2214(unlikely)X
-720 3342(to)N
-810(be)X
-914(effective,)X
-1244(this)X
-1386(is)X
-1466(acceptable,)X
-1853(however,)X
-2177(when)X
-2378(the)X
-720 3430(database)N
-1022(is)X
-1100(small)X
-1298(\(i.e.)X
-1447(the)X
-1569(password)X
-1896(\256le\),)X
-2069(performance)X
-720 3518(improvements)N
-1204(can)X
-1342(be)X
-1443(obtained)X
-1744(through)X
-2018(caching)X
-2293(pages)X
-720 3606(of)N
-818(the)X
-947(database)X
-1255(in)X
-1348(memory.)X
-1685(In)X
-1782(addition,)X
-2 f
-2094(dbm)X
-1 f
-2262(cannot)X
-720 3694(store)N
-902(data)X
-1062(items)X
-1261(whose)X
-1492(total)X
-1660(key)X
-1802(and)X
-1943(data)X
-2102(size)X
-2252(exceed)X
-720 3782(the)N
-850(page)X
-1034(size)X
-1191(of)X
-1290(the)X
-1420(hash)X
-1599(table.)X
-1827(Similarly,)X
-2176(if)X
-2257(two)X
-2409(or)X
-720 3870(more)N
-907(keys)X
-1076(produce)X
-1357(the)X
-1477(same)X
-1664(hash)X
-1833(value)X
-2029(and)X
-2166(their)X
-2334(total)X
-720 3958(size)N
-876(exceeds)X
-1162(the)X
-1291(page)X
-1474(size,)X
-1650(the)X
-1779(table)X
-1966(cannot)X
-2210(store)X
-2396(all)X
-720 4046(the)N
-838(colliding)X
-1142(keys.)X
-892 4160(The)N
-1050(in-memory)X
-2 f
-1439(hsearch)X
-1 f
-1725(routines)X
-2015(have)X
-2199(different)X
-720 4248(shortcomings.)N
-1219(First,)X
-1413(the)X
-1539(notion)X
-1771(of)X
-1865(a)X
-1928(single)X
-2146(hash)X
-2320(table)X
-720 4336(is)N
-807(embedded)X
-1171(in)X
-1266(the)X
-1397(interface,)X
-1732(preventing)X
-2108(an)X
-2217(applica-)X
-720 4424(tion)N
-902(from)X
-1116(accessing)X
-1482(multiple)X
-1806(tables)X
-2050(concurrently.)X
-720 4512(Secondly,)N
-1063(the)X
-1186(routine)X
-1438(to)X
-1525(create)X
-1743(a)X
-1804(hash)X
-1976(table)X
-2157(requires)X
-2440(a)X
-720 4600(parameter)N
-1066(which)X
-1286(declares)X
-1573(the)X
-1694(size)X
-1842(of)X
-1932(the)X
-2053(hash)X
-2223(table.)X
-2422(If)X
-720 4688(this)N
-856(size)X
-1001(is)X
-1074(set)X
-1183(too)X
-1305(low,)X
-1465(performance)X
-1892(degradation)X
-2291(or)X
-2378(the)X
-720 4776(inability)N
-1008(to)X
-1092(add)X
-1230(items)X
-1425(to)X
-1509(the)X
-1628(table)X
-1805(may)X
-1964(result.)X
-2223(In)X
-2311(addi-)X
-720 4864(tion,)N
-2 f
-910(hsearch)X
-1 f
-1210(requires)X
-1515(that)X
-1681(the)X
-1825(application)X
-2226(allocate)X
-720 4952(memory)N
-1037(for)X
-1181(the)X
-1329(key)X
-1495(and)X
-1661(data)X
-1845(items.)X
-2108(Lastly,)X
-2378(the)X
-2 f
-720 5040(hsearch)N
-1 f
-1013(routines)X
-1310(provide)X
-1594(no)X
-1713(interface)X
-2034(to)X
-2135(store)X
-2329(hash)X
-720 5128(tables)N
-927(on)X
-1027(disk.)X
-16 s
-720 5593 MXY
-864 0 Dl
-2 f
-8 s
-760 5648(1)N
-1 f
-9 s
-5673(UNIX)Y
-990(is)X
-1056(a)X
-1106(registered)X
-1408(trademark)X
-1718(of)X
-1796(AT&T.)X
-10 s
-2878 2128(The)N
-3032(goal)X
-3199(of)X
-3295(our)X
-3431(work)X
-3625(was)X
-3779(to)X
-3870(design)X
-4108(and)X
-4253(imple-)X
-2706 2216(ment)N
-2900(a)X
-2970(new)X
-3138(package)X
-3436(that)X
-3590(provides)X
-3899(a)X
-3968(superset)X
-4264(of)X
-4364(the)X
-2706 2304(functionality)N
-3144(of)X
-3240(both)X
-2 f
-3411(dbm)X
-1 f
-3578(and)X
-2 f
-3723(hsearch)X
-1 f
-3977(.)X
-4045(The)X
-4198(package)X
-2706 2392(had)N
-2871(to)X
-2982(overcome)X
-3348(the)X
-3495(interface)X
-3826(shortcomings)X
-4306(cited)X
-2706 2480(above)N
-2930(and)X
-3078(its)X
-3185(implementation)X
-3719(had)X
-3867(to)X
-3961(provide)X
-4238(perfor-)X
-2706 2568(mance)N
-2942(equal)X
-3142(or)X
-3235(superior)X
-3524(to)X
-3612(that)X
-3758(of)X
-3851(the)X
-3975(existing)X
-4253(imple-)X
-2706 2656(mentations.)N
-3152(In)X
-3274(order)X
-3498(to)X
-3614(provide)X
-3913(a)X
-4003(compact)X
-4329(disk)X
-2706 2744(representation,)N
-3224(graceful)X
-3531(table)X
-3729(growth,)X
-4018(and)X
-4176(expected)X
-2706 2832(constant)N
-3033(time)X
-3234(performance,)X
-3720(we)X
-3873(selected)X
-4191(Litwin's)X
-2706 2920(linear)N
-2923(hashing)X
-3206(algorithm)X
-3551([LAR88,)X
-3872(LIT80].)X
-4178(We)X
-4324(then)X
-2706 3008(enhanced)N
-3037(the)X
-3161(algorithm)X
-3498(to)X
-3586(handle)X
-3826(page)X
-4004(over\257ows)X
-4346(and)X
-2706 3096(large)N
-2900(key)X
-3049(handling)X
-3362(with)X
-3537(a)X
-3606(single)X
-3830(mechanism,)X
-4248(named)X
-2706 3184(buddy-in-waiting.)N
-3 f
-2975 3338(Existing)N
-3274(UNIX)X
-3499(Hashing)X
-3802(Techniques)X
-1 f
-2878 3470(Over)N
-3076(the)X
-3210(last)X
-3357(decade,)X
-3637(several)X
-3901(dynamic)X
-4213(hashing)X
-2706 3558(schemes)N
-3000(have)X
-3174(been)X
-3348(developed)X
-3700(for)X
-3816(the)X
-3936(UNIX)X
-4159(timeshar-)X
-2706 3646(ing)N
-2856(system,)X
-3146(starting)X
-3433(with)X
-3622(the)X
-3767(inclusion)X
-4107(of)X
-2 f
-4221(dbm)X
-1 f
-4359(,)X
-4426(a)X
-2706 3734(minimal)N
-3008(database)X
-3321(library)X
-3571(written)X
-3834(by)X
-3950(Ken)X
-4120(Thompson)X
-2706 3822([THOM90],)N
-3141(in)X
-3248(the)X
-3391(Seventh)X
-3694(Edition)X
-3974(UNIX)X
-4220(system.)X
-2706 3910(Since)N
-2916(then,)X
-3106(an)X
-3214(extended)X
-3536(version)X
-3804(of)X
-3903(the)X
-4032(same)X
-4228(library,)X
-2 f
-2706 3998(ndbm)N
-1 f
-2884(,)X
-2933(and)X
-3078(a)X
-3142(public-domain)X
-3637(clone)X
-3839(of)X
-3934(the)X
-4060(latter,)X
-2 f
-4273(sdbm)X
-1 f
-4442(,)X
-2706 4086(have)N
-2902(been)X
-3098(developed.)X
-3491(Another)X
-3797 0.1645(interface-compatible)AX
-2706 4174(library)N
-2 f
-2950(gdbm)X
-1 f
-3128(,)X
-3178(was)X
-3333(recently)X
-3622(made)X
-3826(available)X
-4145(as)X
-4241(part)X
-4395(of)X
-2706 4262(the)N
-2829(Free)X
-2997(Software)X
-3312(Foundation's)X
-3759(\(FSF\))X
-3970(software)X
-4271(distri-)X
-2706 4350(bution.)N
-2878 4464(All)N
-3017(of)X
-3121(these)X
-3323(implementations)X
-3893(are)X
-4029(based)X
-4248(on)X
-4364(the)X
-2706 4552(idea)N
-2871(of)X
-2969(revealing)X
-3299(just)X
-3445(enough)X
-3711(bits)X
-3856(of)X
-3953(a)X
-4019(hash)X
-4196(value)X
-4400(to)X
-2706 4640(locate)N
-2920(a)X
-2978(page)X
-3151(in)X
-3234(a)X
-3291(single)X
-3503(access.)X
-3770(While)X
-2 f
-3987(dbm/ndbm)X
-1 f
-4346(and)X
-2 f
-2706 4728(sdbm)N
-1 f
-2908(map)X
-3079(the)X
-3210(hash)X
-3390(value)X
-3597(directly)X
-3874(to)X
-3968(a)X
-4036(disk)X
-4201(address,)X
-2 f
-2706 4816(gdbm)N
-1 f
-2921(uses)X
-3096(the)X
-3231(hash)X
-3414(value)X
-3624(to)X
-3722(index)X
-3936(into)X
-4096(a)X
-2 f
-4168(directory)X
-1 f
-2706 4904([ENB88])N
-3020(containing)X
-3378(disk)X
-3531(addresses.)X
-2878 5018(The)N
-2 f
-3033(hsearch)X
-1 f
-3317(routines)X
-3605(in)X
-3697(System)X
-3962(V)X
-4049(are)X
-4177(designed)X
-2706 5106(to)N
-2804(provide)X
-3085(memory-resident)X
-3669(hash)X
-3852(tables.)X
-4115(Since)X
-4328(data)X
-2706 5194(access)N
-2948(does)X
-3131(not)X
-3269(require)X
-3533(disk)X
-3702(access,)X
-3964(simple)X
-4213(hashing)X
-2706 5282(schemes)N
-3010(which)X
-3238(may)X
-3408(require)X
-3667(multiple)X
-3964(probes)X
-4209(into)X
-4364(the)X
-2706 5370(table)N
-2889(are)X
-3015(used.)X
-3209(A)X
-3294(more)X
-3486(interesting)X
-3851(version)X
-4114(of)X
-2 f
-4208(hsearch)X
-1 f
-2706 5458(is)N
-2784(a)X
-2845(public)X
-3070(domain)X
-3335(library,)X
-2 f
-3594(dynahash)X
-1 f
-3901(,)X
-3945(that)X
-4089(implements)X
-2706 5546(Larson's)N
-3036(in-memory)X
-3440(adaptation)X
-3822([LAR88])X
-4164(of)X
-4279(linear)X
-2706 5634(hashing)N
-2975([LIT80].)X
-3 f
-720 5960(USENIX)N
-9 f
-1042(-)X
-3 f
-1106(Winter)X
-1371('91)X
-9 f
-1498(-)X
-3 f
-1562(Dallas,)X
-1815(TX)X
-1 f
-4424(1)X
-
-2 p
-%%Page: 2 2
-10 s 10 xH 0 xS 1 f
-3 f
-432 258(A)N
-510(New)X
-682(Hashing)X
-985(Package)X
-1290(for)X
-1413(UNIX)X
-3663(Seltzer)X
-3920(&)X
-4007(Yigit)X
-2 f
-1074 538(dbm)N
-1 f
-1232(and)X
-2 f
-1368(ndbm)X
-1 f
-604 670(The)N
-2 f
-760(dbm)X
-1 f
-928(and)X
-2 f
-1074(ndbm)X
-1 f
-1282(library)X
-1526(implementations)X
-2089(are)X
-432 758(based)N
-667(on)X
-799(the)X
-949(same)X
-1166(algorithm)X
-1529(by)X
-1661(Ken)X
-1846(Thompson)X
-432 846([THOM90,)N
-824(TOR88,)X
-1113(WAL84],)X
-1452(but)X
-1582(differ)X
-1789(in)X
-1879(their)X
-2054(pro-)X
-432 934(grammatic)N
-801(interfaces.)X
-1160(The)X
-1311(latter)X
-1502(is)X
-1581(a)X
-1643(modi\256ed)X
-1952(version)X
-432 1022(of)N
-533(the)X
-665(former)X
-918(which)X
-1148(adds)X
-1328(support)X
-1601(for)X
-1728(multiple)X
-2027(data-)X
-432 1110(bases)N
-634(to)X
-724(be)X
-828(open)X
-1011(concurrently.)X
-1484(The)X
-1636(discussion)X
-1996(of)X
-2090(the)X
-432 1198(algorithm)N
-774(that)X
-925(follows)X
-1196(is)X
-1280(applicable)X
-1640(to)X
-1732(both)X
-2 f
-1904(dbm)X
-1 f
-2072(and)X
-2 f
-432 1286(ndbm)N
-1 f
-610(.)X
-604 1400(The)N
-760(basic)X
-956(structure)X
-1268(of)X
-2 f
-1366(dbm)X
-1 f
-1535(calls)X
-1712(for)X
-1836(\256xed-sized)X
-432 1488(disk)N
-612(blocks)X
-868(\(buckets\))X
-1214(and)X
-1377(an)X
-2 f
-1499(access)X
-1 f
-1755(function)X
-2068(that)X
-432 1576(maps)N
-623(a)X
-681(key)X
-819(to)X
-902(a)X
-959(bucket.)X
-1234(The)X
-1380(interface)X
-1683(routines)X
-1962(use)X
-2090(the)X
-2 f
-432 1664(access)N
-1 f
-673(function)X
-970(to)X
-1062(obtain)X
-1292(the)X
-1420(appropriate)X
-1816(bucket)X
-2060(in)X
-2152(a)X
-432 1752(single)N
-643(disk)X
-796(access.)X
-604 1866(Within)N
-869(the)X
-2 f
-1010(access)X
-1 f
-1263(function,)X
-1593(a)X
-1672(bit-randomizing)X
-432 1954(hash)N
-610(function)X
-2 f
-8 s
-877 1929(2)N
-1 f
-10 s
-940 1954(is)N
-1024(used)X
-1202(to)X
-1294(convert)X
-1565(a)X
-1631(key)X
-1777(into)X
-1931(a)X
-1997(32-bit)X
-432 2042(hash)N
-605(value.)X
-825(Out)X
-971(of)X
-1064(these)X
-1254(32)X
-1359(bits,)X
-1519(only)X
-1686(as)X
-1778(many)X
-1981(bits)X
-2121(as)X
-432 2130(necessary)N
-773(are)X
-900(used)X
-1075(to)X
-1165(determine)X
-1514(the)X
-1639(particular)X
-1974(bucket)X
-432 2218(on)N
-533(which)X
-750(a)X
-807(key)X
-944(resides.)X
-1228(An)X
-1347(in-memory)X
-1724(bitmap)X
-1967(is)X
-2041(used)X
-432 2306(to)N
-533(determine)X
-893(how)X
-1070(many)X
-1287(bits)X
-1441(are)X
-1579(required.)X
-1905(Each)X
-2104(bit)X
-432 2394(indicates)N
-746(whether)X
-1033(its)X
-1136(associated)X
-1494(bucket)X
-1736(has)X
-1871(been)X
-2051(split)X
-432 2482(yet)N
-562(\(a)X
-657(0)X
-728(indicating)X
-1079(that)X
-1230(the)X
-1359(bucket)X
-1604(has)X
-1742(not)X
-1875(yet)X
-2004(split\).)X
-432 2570(The)N
-590(use)X
-730(of)X
-830(the)X
-961(hash)X
-1141(function)X
-1441(and)X
-1590(the)X
-1720(bitmap)X
-1974(is)X
-2059(best)X
-432 2658(described)N
-769(by)X
-878(stepping)X
-1177(through)X
-1454(database)X
-1759(creation)X
-2046(with)X
-432 2746(multiple)N
-718(invocations)X
-1107(of)X
-1194(a)X
-2 f
-1250(store)X
-1 f
-1430(operation.)X
-604 2860(Initially,)N
-906(the)X
-1033(hash)X
-1209(table)X
-1394(contains)X
-1690(a)X
-1755(single)X
-1974(bucket)X
-432 2948(\(bucket)N
-711(0\),)X
-836(the)X
-972(bit)X
-1094(map)X
-1270(contains)X
-1575(a)X
-1649(single)X
-1878(bit)X
-2000(\(bit)X
-2148(0)X
-432 3036(corresponding)N
-913(to)X
-997(bucket)X
-1233(0\),)X
-1342(and)X
-1480(0)X
-1542(bits)X
-1699(of)X
-1788(a)X
-1846(hash)X
-2014(value)X
-432 3124(are)N
-560(examined)X
-901(to)X
-992(determine)X
-1342(where)X
-1568(a)X
-1633(key)X
-1778(is)X
-1860(placed)X
-2099(\(in)X
-432 3212(bucket)N
-670(0\).)X
-801(When)X
-1017(bucket)X
-1255(0)X
-1319(is)X
-1396(full,)X
-1551(its)X
-1650(bit)X
-1758(in)X
-1844(the)X
-1966(bitmap)X
-432 3300(\(bit)N
-564(0\))X
-652(is)X
-726(set,)X
-856(and)X
-993(its)X
-1089(contents)X
-1377(are)X
-1497(split)X
-1655(between)X
-1943(buckets)X
-432 3388(0)N
-499(and)X
-641(1,)X
-727(by)X
-833(considering)X
-1233(the)X
-1357(0)X
-2 f
-7 s
-3356(th)Y
-10 s
-1 f
-1480 3388(bit)N
-1590(\(the)X
-1741(lowest)X
-1976(bit)X
-2086(not)X
-432 3476(previously)N
-800(examined\))X
-1169(of)X
-1266(the)X
-1393(hash)X
-1569(value)X
-1772(for)X
-1895(each)X
-2072(key)X
-432 3564(within)N
-668(the)X
-798(bucket.)X
-1064(Given)X
-1292(a)X
-1359(well-designed)X
-1840(hash)X
-2018(func-)X
-432 3652(tion,)N
-613(approximately)X
-1112(half)X
-1273(of)X
-1376(the)X
-1510(keys)X
-1693(will)X
-1853(have)X
-2041(hash)X
-432 3740(values)N
-666(with)X
-837(the)X
-964(0)X
-2 f
-7 s
-3708(th)Y
-10 s
-1 f
-1090 3740(bit)N
-1203(set.)X
-1341(All)X
-1471(such)X
-1646(keys)X
-1821(and)X
-1965(associ-)X
-432 3828(ated)N
-586(data)X
-740(are)X
-859(moved)X
-1097(to)X
-1179(bucket)X
-1413(1,)X
-1493(and)X
-1629(the)X
-1747(rest)X
-1883(remain)X
-2126(in)X
-432 3916(bucket)N
-666(0.)X
-604 4030(After)N
-804(this)X
-949(split,)X
-1135(the)X
-1262(\256le)X
-1393(now)X
-1560(contains)X
-1856(two)X
-2005(buck-)X
-432 4118(ets,)N
-562(and)X
-699(the)X
-818(bitmap)X
-1061(contains)X
-1349(three)X
-1530(bits:)X
-1687(the)X
-1805(0)X
-2 f
-7 s
-4086(th)Y
-10 s
-1 f
-1922 4118(bit)N
-2026(is)X
-2099(set)X
-432 4206(to)N
-525(indicate)X
-810(a)X
-876(bucket)X
-1120(0)X
-1190(split)X
-1357(when)X
-1561(no)X
-1671(bits)X
-1816(of)X
-1913(the)X
-2041(hash)X
-432 4294(value)N
-648(are)X
-789(considered,)X
-1199(and)X
-1357(two)X
-1519(more)X
-1726(unset)X
-1937(bits)X
-2094(for)X
-432 4382(buckets)N
-706(0)X
-775(and)X
-920(1.)X
-1029(The)X
-1183(placement)X
-1542(of)X
-1638(an)X
-1742(incoming)X
-2072(key)X
-432 4470(now)N
-604(requires)X
-897(examination)X
-1327(of)X
-1428(the)X
-1560(0)X
-2 f
-7 s
-4438(th)Y
-10 s
-1 f
-1691 4470(bit)N
-1809(of)X
-1910(the)X
-2041(hash)X
-432 4558(value,)N
-667(and)X
-824(the)X
-963(key)X
-1119(is)X
-1212(placed)X
-1462(either)X
-1685(in)X
-1787(bucket)X
-2041(0)X
-2121(or)X
-432 4646(bucket)N
-674(1.)X
-782(If)X
-864(either)X
-1075(bucket)X
-1317(0)X
-1385(or)X
-1480(bucket)X
-1722(1)X
-1790(\256lls)X
-1937(up,)X
-2064(it)X
-2135(is)X
-432 4734(split)N
-598(as)X
-693(before,)X
-947(its)X
-1050(bit)X
-1162(is)X
-1243(set)X
-1360(in)X
-1450(the)X
-1576(bitmap,)X
-1846(and)X
-1990(a)X
-2054(new)X
-432 4822(set)N
-541(of)X
-628(unset)X
-817(bits)X
-952(are)X
-1071(added)X
-1283(to)X
-1365(the)X
-1483(bitmap.)X
-604 4936(Each)N
-791(time)X
-959(we)X
-1079(consider)X
-1376(a)X
-1437(new)X
-1596(bit)X
-1705(\(bit)X
-1841(n\),)X
-1953(we)X
-2072(add)X
-432 5024(2)N
-2 f
-7 s
-4992(n)Y
-9 f
-509(+)X
-1 f
-540(1)X
-10 s
-595 5024(bits)N
-737(to)X
-826(the)X
-951(bitmap)X
-1199(and)X
-1341(obtain)X
-1567(2)X
-2 f
-7 s
-4992(n)Y
-9 f
-1644(+)X
-1 f
-1675(1)X
-10 s
-1729 5024(more)N
-1920(address-)X
-432 5112(able)N
-595(buckets)X
-869(in)X
-960(the)X
-1087(\256le.)X
-1258(As)X
-1376(a)X
-1441(result,)X
-1668(the)X
-1795(bitmap)X
-2045(con-)X
-432 5200(tains)N
-618(the)X
-751(previous)X
-1062(2)X
-2 f
-7 s
-5168(n)Y
-9 f
-1139(+)X
-1 f
-1170(1)X
-2 f
-10 s
-9 f
-5200(-)Y
-1 f
-1242(1)X
-1317(bits)X
-1467(\(1)X
-2 f
-9 f
-1534(+)X
-1 f
-1578(2)X
-2 f
-9 f
-(+)S
-1 f
-1662(4)X
-2 f
-9 f
-(+)S
-1 f
-1746(...)X
-2 f
-9 f
-(+)S
-1 f
-1850(2)X
-2 f
-7 s
-5168(n)Y
-10 s
-1 f
-1931 5200(\))N
-1992(which)X
-432 5288(trace)N
-649(the)X
-807(entire)X
-2 f
-1050(split)X
-1247(history)X
-1 f
-1529(of)X
-1656(the)X
-1813(addressable)X
-16 s
-432 5433 MXY
-864 0 Dl
-2 f
-8 s
-472 5488(2)N
-1 f
-9 s
-523 5513(This)N
-670(bit-randomizing)X
-1153(property)X
-1416(is)X
-1482(important)X
-1780(to)X
-1854(obtain)X
-2052(radi-)X
-432 5593(cally)N
-599(different)X
-874(hash)X
-1033(values)X
-1244(for)X
-1355(nearly)X
-1562(identical)X
-1836(keys,)X
-2012(which)X
-432 5673(in)N
-506(turn)X
-640(avoids)X
-846(clustering)X
-1148(of)X
-1226(such)X
-1376(keys)X
-1526(in)X
-1600(a)X
-1650(single)X
-1840(bucket.)X
-10 s
-2418 538(buckets.)N
-2590 652(Given)N
-2809(a)X
-2868(key)X
-3007(and)X
-3146(the)X
-3267(bitmap)X
-3512(created)X
-3768(by)X
-3871(this)X
-4009(algo-)X
-2418 740(rithm,)N
-2638(we)X
-2759(\256rst)X
-2910(examine)X
-3209(bit)X
-3320(0)X
-3386(of)X
-3479(the)X
-3603(bitmap)X
-3851(\(the)X
-4002(bit)X
-4112(to)X
-2418 828(consult)N
-2673(when)X
-2871(0)X
-2934(bits)X
-3072(of)X
-3162(the)X
-3283(hash)X
-3453(value)X
-3650(are)X
-3772(being)X
-3973(exam-)X
-2418 916(ined\).)N
-2631(If)X
-2713(it)X
-2785(is)X
-2866(set)X
-2982(\(indicating)X
-3356(that)X
-3503(the)X
-3628(bucket)X
-3869(split\),)X
-4080(we)X
-2418 1004(begin)N
-2617(considering)X
-3012(the)X
-3131(bits)X
-3267(of)X
-3355(the)X
-3473(32-bit)X
-3684(hash)X
-3851(value.)X
-4085(As)X
-2418 1092(bit)N
-2525(n)X
-2587(is)X
-2662(revealed,)X
-2977(a)X
-3035(mask)X
-3226(equal)X
-3422(to)X
-3506(2)X
-2 f
-7 s
-1060(n)Y
-9 f
-3583(+)X
-1 f
-3614(1)X
-2 f
-10 s
-9 f
-1092(-)Y
-1 f
-3686(1)X
-3748(will)X
-3894(yield)X
-4076(the)X
-2418 1180(current)N
-2675(bucket)X
-2918(address.)X
-3228(Adding)X
-3496(2)X
-2 f
-7 s
-1148(n)Y
-9 f
-3573(+)X
-1 f
-3604(1)X
-2 f
-10 s
-9 f
-1180(-)Y
-1 f
-3676(1)X
-3744(to)X
-3834(the)X
-3960(bucket)X
-2418 1268(address)N
-2701(identi\256es)X
-3035(which)X
-3272(bit)X
-3397(in)X
-3500(the)X
-3639(bitmap)X
-3902(must)X
-4098(be)X
-2418 1356(checked.)N
-2743(We)X
-2876(continue)X
-3173(revealing)X
-3493(bits)X
-3628(of)X
-3715(the)X
-3833(hash)X
-4000(value)X
-2418 1444(until)N
-2591(all)X
-2698(set)X
-2814(bits)X
-2955(in)X
-3043(the)X
-3167(bitmap)X
-3415(are)X
-3540(exhausted.)X
-3907(The)X
-4058(fol-)X
-2418 1532(lowing)N
-2682(algorithm,)X
-3055(a)X
-3133(simpli\256cation)X
-3614(of)X
-3723(the)X
-3863(algorithm)X
-2418 1620(due)N
-2565(to)X
-2658(Ken)X
-2823(Thompson)X
-3196([THOM90,)X
-3590(TOR88],)X
-3908(uses)X
-4076(the)X
-2418 1708(hash)N
-2625(value)X
-2839(and)X
-2995(the)X
-3133(bitmap)X
-3395(to)X
-3497(calculate)X
-3823(the)X
-3960(bucket)X
-2418 1796(address)N
-2679(as)X
-2766(discussed)X
-3093(above.)X
-0(Courier)xf 0 f
-1 f
-0 f
-8 s
-2418 2095(hash)N
-2608(=)X
-2684 -0.4038(calchash\(key\);)AX
-2418 2183(mask)N
-2608(=)X
-2684(0;)X
-2418 2271(while)N
-2646 -0.4018(\(isbitset\(\(hash)AX
-3254(&)X
-3330(mask\))X
-3558(+)X
-3634(mask\)\))X
-2706 2359(mask)N
-2896(=)X
-2972(\(mask)X
-3200(<<)X
-3314(1\))X
-3428(+)X
-3504(1;)X
-2418 2447(bucket)N
-2684(=)X
-2760(hash)X
-2950(&)X
-3026(mask;)X
-2 f
-10 s
-3211 2812(sdbm)N
-1 f
-2590 2944(The)N
-2 f
-2738(sdbm)X
-1 f
-2930(library)X
-3167(is)X
-3243(a)X
-3302(public-domain)X
-3791(clone)X
-3987(of)X
-4076(the)X
-2 f
-2418 3032(ndbm)N
-1 f
-2638(library,)X
-2914(developed)X
-3286(by)X
-3408(Ozan)X
-3620(Yigit)X
-3826(to)X
-3929(provide)X
-2 f
-2418 3120(ndbm)N
-1 f
-2596('s)X
-2692(functionality)X
-3139(under)X
-3359(some)X
-3565(versions)X
-3869(of)X
-3973(UNIX)X
-2418 3208(that)N
-2559(exclude)X
-2830(it)X
-2894(for)X
-3008(licensing)X
-3317(reasons)X
-3578([YIG89].)X
-3895(The)X
-4040(pro-)X
-2418 3296(grammer)N
-2735(interface,)X
-3064(and)X
-3207(the)X
-3332(basic)X
-3524(structure)X
-3832(of)X
-2 f
-3926(sdbm)X
-1 f
-4121(is)X
-2418 3384(identical)N
-2733(to)X
-2 f
-2834(ndbm)X
-1 f
-3051(but)X
-3192(internal)X
-3476(details)X
-3723(of)X
-3828(the)X
-2 f
-3964(access)X
-1 f
-2418 3472(function,)N
-2726(such)X
-2894(as)X
-2982(the)X
-3101(calculation)X
-3474(of)X
-3561(the)X
-3679(bucket)X
-3913(address,)X
-2418 3560(and)N
-2563(the)X
-2690(use)X
-2825(of)X
-2920(different)X
-3225(hash)X
-3400(functions)X
-3726(make)X
-3928(the)X
-4054(two)X
-2418 3648(incompatible)N
-2856(at)X
-2934(the)X
-3052(database)X
-3349(level.)X
-2590 3762(The)N
-2 f
-2740(sdbm)X
-1 f
-2934(library)X
-3173(is)X
-3251(based)X
-3458(on)X
-3562(a)X
-3622(simpli\256ed)X
-3965(imple-)X
-2418 3850(mentation)N
-2778(of)X
-2885(Larson's)X
-3206(1978)X
-2 f
-3406(dynamic)X
-3717(hashing)X
-1 f
-4009(algo-)X
-2418 3938(rithm)N
-2616(including)X
-2943(the)X
-2 f
-3066(re\256nements)X
-3461(and)X
-3605(variations)X
-1 f
-3953(of)X
-4044(sec-)X
-2418 4026(tion)N
-2562(5)X
-2622([LAR78].)X
-2956(Larson's)X
-3257(original)X
-3526(algorithm)X
-3857(calls)X
-4024(for)X
-4138(a)X
-2418 4114(forest)N
-2635(of)X
-2736(binary)X
-2975(hash)X
-3156(trees)X
-3341(that)X
-3494(are)X
-3626(accessed)X
-3941(by)X
-4054(two)X
-2418 4202(hash)N
-2586(functions.)X
-2925(The)X
-3071(\256rst)X
-3216(hash)X
-3384(function)X
-3672(selects)X
-3907(a)X
-3964(partic-)X
-2418 4290(ular)N
-2571(tree)X
-2720(within)X
-2952(the)X
-3078(forest.)X
-3309(The)X
-3462(second)X
-3713(hash)X
-3887(function,)X
-2418 4378(which)N
-2659(is)X
-2757(required)X
-3070(to)X
-3177(be)X
-3297(a)X
-3377(boolean)X
-3675(pseudo-random)X
-2418 4466(number)N
-2687(generator)X
-3015(that)X
-3159(is)X
-3236(seeded)X
-3479(by)X
-3583(the)X
-3705(key,)X
-3865(is)X
-3942(used)X
-4112(to)X
-2418 4554(traverse)N
-2733(the)X
-2890(tree)X
-3070(until)X
-3275(internal)X
-3579(\(split\))X
-3829(nodes)X
-4075(are)X
-2418 4642(exhausted)N
-2763(and)X
-2903(an)X
-3003(external)X
-3286(\(non-split\))X
-3648(node)X
-3827(is)X
-3903(reached.)X
-2418 4730(The)N
-2571(bucket)X
-2813(addresses)X
-3149(are)X
-3276(stored)X
-3500(directly)X
-3772(in)X
-3861(the)X
-3986(exter-)X
-2418 4818(nal)N
-2536(nodes.)X
-2590 4932(Larson's)N
-2903(re\256nements)X
-3309(are)X
-3440(based)X
-3655(on)X
-3767(the)X
-3897(observa-)X
-2418 5020(tion)N
-2570(that)X
-2718(the)X
-2844(nodes)X
-3059(can)X
-3199(be)X
-3303(represented)X
-3702(by)X
-3809(a)X
-3872(single)X
-4090(bit)X
-2418 5108(that)N
-2569(is)X
-2653(set)X
-2773(for)X
-2898(internal)X
-3174(nodes)X
-3392(and)X
-3539(not)X
-3672(set)X
-3791(for)X
-3915(external)X
-2418 5196(nodes,)N
-2652(resulting)X
-2959(in)X
-3048(a)X
-3111(radix)X
-3303(search)X
-3536(trie.)X
-3709(Figure)X
-3944(1)X
-4010(illus-)X
-2418 5284(trates)N
-2621(this.)X
-2804(Nodes)X
-3037(A)X
-3123(and)X
-3267(B)X
-3348(are)X
-3475(internal)X
-3748(\(split\))X
-3967(nodes,)X
-2418 5372(thus)N
-2573(having)X
-2813(no)X
-2915(bucket)X
-3151(addresses)X
-3480(associated)X
-3831(with)X
-3994(them.)X
-2418 5460(Instead,)N
-2693(the)X
-2814(external)X
-3096(nodes)X
-3306(\(C,)X
-3429(D,)X
-3530(and)X
-3669(E\))X
-3768(each)X
-3938(need)X
-4112(to)X
-2418 5548(refer)N
-2594(to)X
-2679(a)X
-2738(bucket)X
-2975(address.)X
-3279(These)X
-3494(bucket)X
-3731(addresses)X
-4062(can)X
-2418 5636(be)N
-2529(stored)X
-2760(in)X
-2857(the)X
-2990(trie)X
-3132(itself)X
-3327(where)X
-3559(the)X
-3691(subtries)X
-3974(would)X
-3 f
-432 5960(2)N
-2970(USENIX)X
-9 f
-3292(-)X
-3 f
-3356(Winter)X
-3621('91)X
-9 f
-3748(-)X
-3 f
-3812(Dallas,)X
-4065(TX)X
-
-3 p
-%%Page: 3 3
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-720 258(Seltzer)N
-977(&)X
-1064(Yigit)X
-3278(A)X
-3356(New)X
-3528(Hashing)X
-3831(Package)X
-4136(for)X
-4259(UNIX)X
-1 f
-720 538(live)N
-862(if)X
-933(they)X
-1092(existed)X
-1340([KNU68].)X
-1709(For)X
-1841(example,)X
-2154(if)X
-2224(nodes)X
-2432(F)X
-720 626(and)N
-858(G)X
-938(were)X
-1117(the)X
-1237(children)X
-1522(of)X
-1610(node)X
-1787(C,)X
-1881(the)X
-2000(bucket)X
-2235(address)X
-720 714(L00)N
-886(could)X
-1101(reside)X
-1330(in)X
-1429(the)X
-1563(bits)X
-1714(that)X
-1870(will)X
-2030(eventually)X
-2400(be)X
-720 802(used)N
-887(to)X
-969(store)X
-1145(nodes)X
-1352(F)X
-1416(and)X
-1552(G)X
-1630(and)X
-1766(all)X
-1866(their)X
-2033(children.)X
-10 f
-720 890 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-3 f
-1894 2247(L1)N
-784 1925(A)N
-1431(E)X
-1106 2247(D)N
-1428 1281(C)N
-1109 1603(B)N
-1884 1930(L01)N
-1879 1286(L00)N
-1221 1814(1)N
-903 2131(1)N
-1221 1402(0)N
-903 1714(0)N
-1 Dt
-1397 1821 MXY
--8 -32 Dl
--5 19 Dl
--20 6 Dl
-33 7 Dl
--187 -182 Dl
-1397 1322 MXY
--33 7 Dl
-20 6 Dl
-5 19 Dl
-8 -32 Dl
--187 182 Dl
-1069 1639 MXY
--32 7 Dl
-20 6 Dl
-5 19 Dl
-7 -32 Dl
--186 182 Dl
-1374 1891 MXY
-185 Dc
-1779 2133 MXY
-0 161 Dl
-322 0 Dl
-0 -161 Dl
--322 0 Dl
-1811 MY
-0 161 Dl
-322 0 Dl
-0 -161 Dl
--322 0 Dl
-1166 MY
-0 161 Dl
-322 0 Dl
-0 -161 Dl
--322 0 Dl
-1052 2213 MXY
-185 Dc
-1569 MY
-185 Dc
-720 1881 MXY
-185 Dc
-1779 2213 MXY
--28 -17 Dl
-10 17 Dl
--10 18 Dl
-28 -18 Dl
--543 0 Dl
-1769 1891 MXY
--28 -18 Dl
-10 18 Dl
--10 18 Dl
-28 -18 Dl
--201 0 Dl
-1364 1247 MXY
-185 Dc
-1769 MX
--28 -18 Dl
-10 18 Dl
--10 18 Dl
-28 -18 Dl
--201 0 Dl
-1064 2143 MXY
--7 -32 Dl
--5 19 Dl
--20 6 Dl
-32 7 Dl
--181 -181 Dl
-3 Dt
--1 Ds
-8 s
-720 2482(Figure)N
-925(1:)X
-1 f
-1002(Radix)X
-1179(search)X
-1365(trie)X
-1474(with)X
-1612(internal)X
-1831(nodes)X
-2004(A)X
-2074(and)X
-2189(B,)X
-2271(external)X
-720 2570(nodes)N
-891(C,)X
-972(D,)X
-1056(and)X
-1170(E,)X
-1247(and)X
-1361(bucket)X
-1553(addresses)X
-1819(stored)X
-1997(in)X
-2069(the)X
-2168(unused)X
-2370(por-)X
-720 2658(tion)N
-836(of)X
-905(the)X
-999(trie.)X
-10 s
-10 f
-720 2922 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-1 f
-892 3124(Further)N
-1153(simpli\256cations)X
-1647(of)X
-1738(the)X
-1860(above)X
-2076([YIG89])X
-2377(are)X
-720 3212(possible.)N
-1038(Using)X
-1265(a)X
-1337(single)X
-1564(radix)X
-1765(trie)X
-1908(to)X
-2006(avoid)X
-2219(the)X
-2352(\256rst)X
-720 3300(hash)N
-904(function,)X
-1227(replacing)X
-1562(the)X
-1696(pseudo-random)X
-2231(number)X
-720 3388(generator)N
-1052(with)X
-1222(a)X
-1286(well)X
-1452(designed,)X
-1785(bit-randomizing)X
-2329(hash)X
-720 3476(function,)N
-1053(and)X
-1215(using)X
-1434(the)X
-1578(portion)X
-1855(of)X
-1967(the)X
-2110(hash)X
-2302(value)X
-720 3564(exposed)N
-1021(during)X
-1268(the)X
-1404(trie)X
-1549(traversal)X
-1864(as)X
-1969(a)X
-2042(direct)X
-2262(bucket)X
-720 3652(address)N
-990(results)X
-1228(in)X
-1319(an)X
-2 f
-1424(access)X
-1 f
-1663(function)X
-1959(that)X
-2108(works)X
-2333(very)X
-720 3740(similar)N
-974(to)X
-1068(Thompson's)X
-1499(algorithm)X
-1841(above.)X
-2084(The)X
-2240(follow-)X
-720 3828(ing)N
-847(algorithm)X
-1183(uses)X
-1346(the)X
-1469(hash)X
-1641(value)X
-1840(to)X
-1927(traverse)X
-2206(a)X
-2266(linear-)X
-720 3916(ized)N
-874(radix)X
-1059(trie)X
-2 f
-8 s
-1166 3891(3)N
-1 f
-10 s
-1218 3916(starting)N
-1478(at)X
-1556(the)X
-1674(0)X
-2 f
-7 s
-3884(th)Y
-10 s
-1 f
-1791 3916(bit.)N
-0 f
-8 s
-720 4215(tbit)N
-910(=)X
-986(0;)X
-1296(/*)X
-1410(radix)X
-1638(trie)X
-1828(index)X
-2056(*/)X
-720 4303(hbit)N
-910(=)X
-986(0;)X
-1296(/*)X
-1410(hash)X
-1600(bit)X
-1752(index)X
-2056(*/)X
-720 4391(mask)N
-910(=)X
-986(0;)X
-720 4479(hash)N
-910(=)X
-986 -0.4038(calchash\(key\);)AX
-720 4655(for)N
-872(\(mask)X
-1100(=)X
-1176(0;)X
-910 4743 -0.4018(isbitset\(tbit\);)AN
-910 4831(mask)N
-1100(=)X
-1176(\(mask)X
-1404(<<)X
-1518(1\))X
-1632(+)X
-1708(1\))X
-1008 4919(if)N
-1122(\(hash)X
-1350(&)X
-1426(\(1)X
-1540(<<)X
-1654 -0.4219(hbit++\)\)\))AX
-1160 5007(/*)N
-1274(right)X
-1502(son)X
-1692(*/)X
-1160 5095(tbit)N
-1350(=)X
-1426(2)X
-1502(*)X
-1578(tbit)X
-1768(+)X
-1844(2;)X
-1008 5183(else)N
-1 f
-16 s
-720 5353 MXY
-864 0 Dl
-2 f
-8 s
-760 5408(3)N
-1 f
-9 s
-818 5433(A)N
-896(linearized)X
-1206(radix)X
-1380(trie)X
-1502(is)X
-1576(merely)X
-1802(an)X
-1895(array)X
-2068(representation)X
-720 5513(of)N
-800(the)X
-908(radix)X
-1076(search)X
-1280(trie)X
-1396(described)X
-1692(above.)X
-1920(The)X
-2052(children)X
-2308(of)X
-2388(the)X
-720 5593(node)N
-885(with)X
-1038(index)X
-1223(i)X
-1267(can)X
-1391(be)X
-1483(found)X
-1675(at)X
-1751(the)X
-1863(nodes)X
-2055(indexed)X
-2307(2*i+1)X
-720 5673(and)N
-842(2*i+2.)X
-0 f
-8 s
-3146 538(/*)N
-3260(left)X
-3450(son)X
-3678(*/)X
-3146 626(tbit)N
-3336(=)X
-3412(2)X
-3488(*)X
-3564(tbit)X
-3754(+)X
-3830(1;)X
-2706 802(bucket)N
-2972(=)X
-3048(hash)X
-3238(&)X
-3314(mask;)X
-2 f
-10 s
-3495 1167(gdbm)N
-1 f
-2878 1299(The)N
-3027(gdbm)X
-3233(\(GNU)X
-3458(data)X
-3616(base)X
-3783(manager\))X
-4111(library)X
-4349(is)X
-4426(a)X
-2706 1387(UNIX)N
-2933(database)X
-3236(manager)X
-3539(written)X
-3792(by)X
-3897(Philip)X
-4112(A.)X
-4215(Nelson,)X
-2706 1475(and)N
-2848(made)X
-3048(available)X
-3364(as)X
-3457(a)X
-3518(part)X
-3668(of)X
-3760(the)X
-3883(FSF)X
-4040(software)X
-4342(dis-)X
-2706 1563(tribution.)N
-3052(The)X
-3207(gdbm)X
-3419(library)X
-3663(provides)X
-3969(the)X
-4097(same)X
-4292(func-)X
-2706 1651(tionality)N
-3028(of)X
-3151(the)X
-2 f
-3304(dbm)X
-1 f
-3442(/)X
-2 f
-3464(ndbm)X
-1 f
-3697(libraries)X
-4015([NEL90])X
-4360(but)X
-2706 1739(attempts)N
-3018(to)X
-3121(avoid)X
-3340(some)X
-3550(of)X
-3658(their)X
-3846(shortcomings.)X
-4337(The)X
-2706 1827(gdbm)N
-2918(library)X
-3162(allows)X
-3401(for)X
-3525(arbitrary-length)X
-4059(data,)X
-4242(and)X
-4387(its)X
-2706 1915(database)N
-3027(is)X
-3124(a)X
-3203(singular,)X
-3524(non-sparse)X
-2 f
-8 s
-3872 1890(4)N
-1 f
-10 s
-3947 1915(\256le.)N
-4112(The)X
-4280(gdbm)X
-2706 2003(library)N
-2947(also)X
-3103(includes)X
-2 f
-3396(dbm)X
-1 f
-3560(and)X
-2 f
-3702(ndbm)X
-1 f
-3906(compatible)X
-4288(inter-)X
-2706 2091(faces.)N
-2878 2205(The)N
-3025(gdbm)X
-3229(library)X
-3465(is)X
-3540(based)X
-3745(on)X
-2 f
-3847(extensible)X
-4189(hashing)X
-1 f
-4442(,)X
-2706 2293(a)N
-2766(dynamic)X
-3066(hashing)X
-3339(algorithm)X
-3674(by)X
-3778(Fagin)X
-3984(et)X
-4066(al)X
-4148([FAG79].)X
-2706 2381(This)N
-2881(algorithm)X
-3225(differs)X
-3467(from)X
-3655(the)X
-3785(previously)X
-4155(discussed)X
-2706 2469(algorithms)N
-3069(in)X
-3152(that)X
-3293(it)X
-3358(uses)X
-3517(a)X
-2 f
-3574(directory)X
-1 f
-3889(that)X
-4030(is)X
-4103(a)X
-4159(collapsed)X
-2706 2557(representation)N
-3192([ENB88])X
-3517(of)X
-3615(the)X
-3744(radix)X
-3940(search)X
-4177(trie)X
-4315(used)X
-2706 2645(by)N
-2 f
-2806(sdbm)X
-1 f
-2975(.)X
-10 f
-2706 2733 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-3 f
-7 s
-3572 3761(L1)N
-1 Dt
-3485 3738 MXY
--20 -13 Dl
-7 13 Dl
--7 13 Dl
-20 -13 Dl
--400 0 Dl
-3180 3027 MXY
-136 Dc
-2706 3494 MXY
-136 Dc
-2950 3264 MXY
-136 Dc
-3738 MY
-136 Dc
-3485 2968 MXY
-0 118 Dl
-238 0 Dl
-0 -118 Dl
--238 0 Dl
-3442 MY
-0 119 Dl
-238 0 Dl
-0 -119 Dl
--238 0 Dl
-3679 MY
-0 119 Dl
-238 0 Dl
-0 -119 Dl
--238 0 Dl
-3187 3501 MXY
-136 Dc
-2963 3316 MXY
--24 5 Dl
-15 4 Dl
-4 15 Dl
-5 -24 Dl
--137 134 Dl
-3204 3083 MXY
--24 5 Dl
-15 4 Dl
-3 14 Dl
-6 -23 Dl
--137 133 Dl
-3204 3450 MXY
--6 -24 Dl
--3 14 Dl
--15 5 Dl
-24 5 Dl
--137 -134 Dl
-2842 3369(0)N
-3075 3139(0)N
-2842 3676(1)N
-3075 3443(1)N
-3562 3054(L00)N
-3565 3528(L01)N
-4197 2968 MXY
-0 118 Dl
-237 0 Dl
-0 -118 Dl
--237 0 Dl
-3205 MY
-0 119 Dl
-237 0 Dl
-0 -119 Dl
--237 0 Dl
-3561 MY
-0 118 Dl
-237 0 Dl
-0 -118 Dl
--237 0 Dl
-3960 2909 MXY
-0 237 Dl
-118 0 Dl
-0 -237 Dl
--118 0 Dl
-3146 MY
-0 237 Dl
-118 0 Dl
-0 -237 Dl
--118 0 Dl
-3383 MY
-0 237 Dl
-118 0 Dl
-0 -237 Dl
--118 0 Dl
-3620 MY
-0 237 Dl
-118 0 Dl
-0 -237 Dl
--118 0 Dl
-4197 3027 MXY
--21 -13 Dl
-8 13 Dl
--8 13 Dl
-21 -13 Dl
--119 0 Dl
-4197 3264 MXY
--21 -13 Dl
-8 13 Dl
--8 13 Dl
-21 -13 Dl
--119 0 Dl
-3501 MY
-59 0 Dl
-0 89 Dl
-4078 3738 MXY
-59 0 Dl
-0 -88 Dl
-4197 3590 MXY
--21 -13 Dl
-8 13 Dl
--8 13 Dl
-21 -13 Dl
--60 0 Dl
-4197 3650 MXY
--21 -13 Dl
-8 13 Dl
--8 13 Dl
-21 -13 Dl
--60 0 Dl
-3991 3050(00)N
-3991 3287(01)N
-3991 3524(10)N
-3991 3761(11)N
-4269 3050(L00)N
-4269 3287(L01)N
-4283 3643(L1)N
-3485 3501 MXY
--20 -13 Dl
-7 13 Dl
--7 13 Dl
-20 -13 Dl
--155 0 Dl
-3485 3027 MXY
--20 -13 Dl
-7 13 Dl
--7 13 Dl
-20 -13 Dl
--163 0 Dl
-2967 3687 MXY
--5 -24 Dl
--4 14 Dl
--15 4 Dl
-24 6 Dl
--141 -141 Dl
-3 Dt
--1 Ds
-8 s
-2706 4033(Figure)N
-2903(2:)X
-1 f
-2972(A)X
-3034(radix)X
-3181(search)X
-3359(trie)X
-3460(and)X
-3568(a)X
-3612(directory)X
-3858(representing)X
-4189(the)X
-4283(trie.)X
-10 s
-10 f
-2706 4209 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-1 f
-2878 4411(In)N
-2968(this)X
-3106(algorithm,)X
-3460(a)X
-3519(directory)X
-3832(consists)X
-4108(of)X
-4198(a)X
-4256(search)X
-2706 4499(trie)N
-2847(of)X
-2947(depth)X
-2 f
-3158(n)X
-1 f
-3211(,)X
-3264(containing)X
-3635(2)X
-2 f
-7 s
-4467(n)Y
-10 s
-1 f
-3749 4499(bucket)N
-3996(addresses)X
-4337(\(i.e.)X
-2706 4587(each)N
-2897(element)X
-3194(of)X
-3304(the)X
-3445(trie)X
-3594(is)X
-3689(a)X
-3767(bucket)X
-4023(address\).)X
-4373(To)X
-2706 4675(access)N
-2935(the)X
-3056(hash)X
-3226(table,)X
-3425(a)X
-3483(32-bit)X
-3696(hash)X
-3865(value)X
-4061(is)X
-4136(calculated)X
-2706 4763(and)N
-2 f
-2861(n)X
-1 f
-2953(bits)X
-3107(of)X
-3213(the)X
-3350(value)X
-3563(are)X
-3701(used)X
-3886(to)X
-3986(index)X
-4202(into)X
-4364(the)X
-2706 4851(directory)N
-3018(to)X
-3102(obtain)X
-3324(a)X
-3382(bucket)X
-3618(address.)X
-3921(It)X
-3992(is)X
-4067(important)X
-4400(to)X
-2706 4939(note)N
-2866(that)X
-3008(multiple)X
-3296(entries)X
-3532(of)X
-3620(this)X
-3756(directory)X
-4067(may)X
-4226(contain)X
-2706 5027(the)N
-2833(same)X
-3026(bucket)X
-3268(address)X
-3537(as)X
-3632(a)X
-3696(result)X
-3902(of)X
-3997(directory)X
-4315(dou-)X
-2706 5115(bling)N
-2903(during)X
-3145(bucket)X
-3392(splitting.)X
-3706(Figure)X
-3948(2)X
-4021(illustrates)X
-4364(the)X
-2706 5203(relationship)N
-3126(between)X
-3436(a)X
-3513(typical)X
-3772(\(skewed\))X
-4108(search)X
-4355(trie)X
-2706 5291(and)N
-2850(its)X
-2953(directory)X
-3271(representation.)X
-3774(The)X
-3927(formation)X
-4270(of)X
-4364(the)X
-2706 5379(directory)N
-3016(shown)X
-3245(in)X
-3327(the)X
-3445(\256gure)X
-3652(is)X
-3725(as)X
-3812(follows.)X
-16 s
-2706 5593 MXY
-864 0 Dl
-2 f
-8 s
-2746 5648(4)N
-1 f
-9 s
-2796 5673(It)N
-2858(does)X
-3008(not)X
-3118(contain)X
-3348(holes.)X
-3 f
-10 s
-720 5960(USENIX)N
-9 f
-1042(-)X
-3 f
-1106(Winter)X
-1371('91)X
-9 f
-1498(-)X
-3 f
-1562(Dallas,)X
-1815(TX)X
-4424(3)X
-
-4 p
-%%Page: 4 4
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-432 258(A)N
-510(New)X
-682(Hashing)X
-985(Package)X
-1290(for)X
-1413(UNIX)X
-3663(Seltzer)X
-3920(&)X
-4007(Yigit)X
-1 f
-604 538(Initially,)N
-937(there)X
-1158(is)X
-1271(one)X
-1446(slot)X
-1620(in)X
-1741(the)X
-1898(directory)X
-432 626(addressing)N
-802(a)X
-865(single)X
-1083(bucket.)X
-1364(The)X
-1515(depth)X
-1719(of)X
-1812(the)X
-1936(trie)X
-2069(is)X
-2148(0)X
-432 714(and)N
-577(0)X
-646(bits)X
-790(of)X
-886(each)X
-1063(hash)X
-1239(value)X
-1442(are)X
-1570(examined)X
-1910(to)X
-2000(deter-)X
-432 802(mine)N
-624(in)X
-718(which)X
-946(bucket)X
-1192(to)X
-1286(place)X
-1488(a)X
-1556(key;)X
-1726(all)X
-1837(keys)X
-2015(go)X
-2126(in)X
-432 890(bucket)N
-682(0.)X
-797(When)X
-1024(this)X
-1174(bucket)X
-1423(is)X
-1511(full,)X
-1677(its)X
-1787(contents)X
-2089(are)X
-432 978(divided)N
-698(between)X
-992(L0)X
-1107(and)X
-1249(L1)X
-1363(as)X
-1455(was)X
-1605(done)X
-1786(in)X
-1873(the)X
-1996(previ-)X
-432 1066(ously)N
-664(discussed)X
-1030(algorithms.)X
-1471(After)X
-1700(this)X
-1874(split,)X
-2090(the)X
-432 1154(address)N
-710(of)X
-814(the)X
-948(second)X
-1207(bucket)X
-1457(must)X
-1648(be)X
-1760(stored)X
-1992(in)X
-2090(the)X
-432 1242(directory.)N
-796(To)X
-939(accommodate)X
-1438(the)X
-1589(new)X
-1776(address,)X
-2090(the)X
-432 1330(directory)N
-752(is)X
-835(split)X
-2 f
-8 s
-972 1305(5)N
-1 f
-10 s
-1330(,)Y
-1054(by)X
-1163(doubling)X
-1476(it,)X
-1569(thus)X
-1731(increasing)X
-2090(the)X
-432 1418(depth)N
-630(of)X
-717(the)X
-835(directory)X
-1145(by)X
-1245(one.)X
-604 1532(After)N
-813(this)X
-967(split,)X
-1163(a)X
-1237(single)X
-1466(bit)X
-1588(of)X
-1693(the)X
-1829(hash)X
-2014(value)X
-432 1620(needs)N
-663(to)X
-773(be)X
-896(examined)X
-1255(to)X
-1364(decide)X
-1621(whether)X
-1927(the)X
-2072(key)X
-432 1708(belongs)N
-711(to)X
-803(L0)X
-922(or)X
-1019(L1.)X
-1158(Once)X
-1358(one)X
-1504(of)X
-1601(these)X
-1795(buckets)X
-2069(\256lls)X
-432 1796(\(L0)N
-578(for)X
-702(example\),)X
-1051(it)X
-1125(is)X
-1208(split)X
-1375(as)X
-1472(before,)X
-1728(and)X
-1873(the)X
-2000(direc-)X
-432 1884(tory)N
-585(is)X
-662(split)X
-823(again)X
-1021(to)X
-1107(make)X
-1305(room)X
-1498(for)X
-1615(the)X
-1736(address)X
-2000(of)X
-2090(the)X
-432 1972(third)N
-618(bucket.)X
-927(This)X
-1104(splitting)X
-1400(causes)X
-1645(the)X
-1778(addresses)X
-2121(of)X
-432 2060(the)N
-567(non-splitting)X
-1012(bucket)X
-1263(\(L1\))X
-1443(to)X
-1541(be)X
-1653(duplicated.)X
-2063(The)X
-432 2148(directory)N
-766(now)X
-948(has)X
-1099(four)X
-1277(entries,)X
-1555(a)X
-1635(depth)X
-1857(of)X
-1968(2,)X
-2072(and)X
-432 2236(indexes)N
-700(the)X
-821(buckets)X
-1089(L00,)X
-1261(L01)X
-1413(and)X
-1552(L1,)X
-1684(as)X
-1774(shown)X
-2006(in)X
-2090(the)X
-432 2324(Figure)N
-661(2.)X
-604 2438(The)N
-756(crucial)X
-1002(part)X
-1154(of)X
-1247(the)X
-1371(algorithm)X
-1708(is)X
-1787(the)X
-1911(observa-)X
-432 2526(tion)N
-580(that)X
-724(L1)X
-837(is)X
-914(addressed)X
-1255(twice)X
-1453(in)X
-1539(the)X
-1661(directory.)X
-1995(If)X
-2073(this)X
-432 2614(bucket)N
-679(were)X
-869(to)X
-964(split)X
-1134(now,)X
-1324(the)X
-1454(directory)X
-1776(already)X
-2045(con-)X
-432 2702(tains)N
-611(room)X
-808(to)X
-898(hold)X
-1067(the)X
-1192(address)X
-1460(of)X
-1554(the)X
-1679(new)X
-1840(bucket.)X
-2121(In)X
-432 2790(general,)N
-711(the)X
-831(relationship)X
-1231(between)X
-1521(the)X
-1641(directory)X
-1953(and)X
-2090(the)X
-432 2878(number)N
-704(of)X
-798(bucket)X
-1039(addresses)X
-1374(contained)X
-1713(therein)X
-1962(is)X
-2041(used)X
-432 2966(to)N
-517(decide)X
-750(when)X
-947(to)X
-1031(split)X
-1190(the)X
-1310(directory.)X
-1662(Each)X
-1845(bucket)X
-2081(has)X
-432 3054(a)N
-505(depth,)X
-740(\()X
-2 f
-767(n)X
-7 s
-3070(b)Y
-10 s
-1 f
-848 3054(\),)N
-932(associated)X
-1299(with)X
-1478(it)X
-1558(and)X
-1710(appears)X
-1992(in)X
-2090(the)X
-432 3142(directory)N
-744(exactly)X
-998(2)X
-2 f
-7 s
-3106(n)Y
-9 f
-1075(-)X
-2 f
-1106(n)X
-4 s
-3110(b)Y
-7 s
-1 f
-10 s
-1181 3142(times.)N
-1396(When)X
-1610(a)X
-1668(bucket)X
-1904(splits,)X
-2113(its)X
-432 3230(depth)N
-638(increases)X
-961(by)X
-1069(one.)X
-1253(The)X
-1406(directory)X
-1724(must)X
-1907(split)X
-2072(any)X
-432 3318(time)N
-602(a)X
-665(bucket's)X
-964(depth)X
-1169(exceeds)X
-1451(the)X
-1576(depth)X
-1781(of)X
-1875(the)X
-2000(direc-)X
-432 3406(tory.)N
-630(The)X
-784(following)X
-1123(code)X
-1303(fragment)X
-1621(helps)X
-1818(to)X
-1908(illustrate)X
-432 3494(the)N
-554(extendible)X
-912(hashing)X
-1185(algorithm)X
-1520([FAG79])X
-1838(for)X
-1955(access-)X
-432 3582(ing)N
-554(individual)X
-898(buckets)X
-1163(and)X
-1299(maintaining)X
-1701(the)X
-1819(directory.)X
-0 f
-8 s
-432 3881(hash)N
-622(=)X
-698 -0.4038(calchash\(key\);)AX
-432 3969(mask)N
-622(=)X
-698 -0.4018(maskvec[depth];)AX
-432 4145(bucket)N
-698(=)X
-774 -0.4038(directory[hash)AX
-1344(&)X
-1420(mask];)X
-432 4321(/*)N
-546(Key)X
-698 -0.4219(Insertion)AX
-1078(*/)X
-432 4409(if)N
-546 -0.4038(\(store\(bucket,)AX
-1116(key,)X
-1306(data\))X
-1534(==)X
-1648(FAIL\))X
-1876({)X
-720 4497(newbl)N
-948(=)X
-1024 -0.4167(getpage\(\);)AX
-720 4585 -0.4000(bucket->depth++;)AN
-720 4673 -0.4091(newbl->depth)AN
-1214(=)X
-1290 -0.4038(bucket->depth;)AX
-720 4761(if)N
-834 -0.4038(\(bucket->depth)AX
-1404(>)X
-1480(depth\))X
-1746({)X
-1008 4849(/*)N
-1122(double)X
-1388 -0.4219(directory)AX
-1768(*/)X
-1008 4937(depth++;)N
-1 f
-16 s
-432 5033 MXY
-864 0 Dl
-2 f
-8 s
-472 5088(5)N
-1 f
-9 s
-534 5113(This)N
-692(decision)X
-962(to)X
-1048(split)X
-1202(the)X
-1319(directory)X
-1608(is)X
-1685(based)X
-1878(on)X
-1979(a)X
-2040(com-)X
-432 5193(parison)N
-666(of)X
-748(the)X
-858(depth)X
-1040(of)X
-1121(the)X
-1230(page)X
-1387(being)X
-1568(split)X
-1713(and)X
-1838(the)X
-1947(depth)X
-2128(of)X
-432 5273(the)N
-543(trie.)X
-698(In)X
-781(Figure)X
-992(2,)X
-1069(the)X
-1180(depths)X
-1390(of)X
-1472(both)X
-1622(L00)X
-1760(and)X
-1886(L01)X
-2024(are)X
-2134(2,)X
-432 5353(whereas)N
-689(the)X
-798(depth)X
-979(of)X
-1060(L1)X
-1161(is)X
-1230(1.)X
-1323(Therefore,)X
-1646(if)X
-1710(L1)X
-1810(were)X
-1970(to)X
-2046(split,)X
-432 5433(the)N
-543(directory)X
-826(would)X
-1029(not)X
-1144(need)X
-1303(to)X
-1382(split.)X
-1565(In)X
-1648(reality,)X
-1872(a)X
-1926(bucket)X
-2140(is)X
-432 5513(allocated)N
-727(for)X
-846(the)X
-969(directory)X
-1264(at)X
-1351(the)X
-1474(time)X
-1637(of)X
-1732(\256le)X
-1858(creation)X
-2124(so)X
-432 5593(although)N
-707(the)X
-818(directory)X
-1100(splits)X
-1274(logically,)X
-1566(physical)X
-1828(splits)X
-2002(do)X
-2096(not)X
-432 5673(occur)N
-610(until)X
-760(the)X
-866(\256le)X
-976(becomes)X
-1246(quite)X
-1408(large.)X
-0 f
-8 s
-2994 538 -0.4219(directory)AN
-3374(=)X
-3450 -0.3971(double\(directory\);)AX
-2706 626(})N
-2706 714 -0.3958(splitbucket\(bucket,)AN
-3466(newbl\))X
-2706 802(...)N
-2418 890(})N
-2 f
-10 s
-3169 1255(hsearch)N
-1 f
-2590 1387(Since)N
-2 f
-2807(hsearch)X
-1 f
-3100(does)X
-3286(not)X
-3427(have)X
-3617(to)X
-3717(translate)X
-4027(hash)X
-2418 1475(values)N
-2659(into)X
-2819(disk)X
-2988(addresses,)X
-3352(it)X
-3432(can)X
-3579(use)X
-3721(much)X
-3934(simpler)X
-2418 1563(algorithms)N
-2808(than)X
-2994(those)X
-3211(de\256ned)X
-3495(above.)X
-3775(System)X
-4058(V's)X
-2 f
-2418 1651(hsearch)N
-1 f
-2708(constructs)X
-3069(a)X
-3141(\256xed-size)X
-3489(hash)X
-3671(table)X
-3862(\(speci\256ed)X
-2418 1739(by)N
-2519(the)X
-2637(user)X
-2791(at)X
-2869(table)X
-3045(creation\).)X
-3391(By)X
-3504(default,)X
-3767(a)X
-3823(multiplica-)X
-2418 1827(tive)N
-2570(hash)X
-2748(function)X
-3046(based)X
-3260(on)X
-3371(that)X
-3522(described)X
-3861(in)X
-3954(Knuth,)X
-2418 1915(Volume)N
-2710(3,)X
-2804(section)X
-3065(6.4)X
-3199([KNU68])X
-3541(is)X
-3628(used)X
-3809(to)X
-3905(obtain)X
-4138(a)X
-2418 2003(primary)N
-2694(bucket)X
-2930(address.)X
-3233(If)X
-3309(this)X
-3446(bucket)X
-3681(is)X
-3755(full,)X
-3907(a)X
-3964(secon-)X
-2418 2091(dary)N
-2593(multiplicative)X
-3069(hash)X
-3248(value)X
-3454(is)X
-3538(computed)X
-3885(to)X
-3978(de\256ne)X
-2418 2179(the)N
-2542(probe)X
-2751(interval.)X
-3062(The)X
-3213(probe)X
-3422(interval)X
-3693(is)X
-3772(added)X
-3989(to)X
-4076(the)X
-2418 2267(original)N
-2712(bucket)X
-2971(address)X
-3257(\(modulo)X
-3573(the)X
-3716(table)X
-3916(size\))X
-4112(to)X
-2418 2355(obtain)N
-2658(a)X
-2734(new)X
-2908(bucket)X
-3162(address.)X
-3483(This)X
-3665(process)X
-3946(repeats)X
-2418 2443(until)N
-2588(an)X
-2688(empty)X
-2911(bucket)X
-3148(is)X
-3224(found.)X
-3474(If)X
-3551(no)X
-3654(bucket)X
-3891(is)X
-3967(found,)X
-2418 2531(an)N
-2514(insertion)X
-2814(fails)X
-2972(with)X
-3134(a)X
-3190(``table)X
-3420(full'')X
-3605(condition.)X
-2590 2645(The)N
-2768(basic)X
-2986(algorithm)X
-3350(may)X
-3541(be)X
-3670(modi\256ed)X
-4006(by)X
-4138(a)X
-2418 2733(number)N
-2705(of)X
-2813(compile)X
-3112(time)X
-3295(options)X
-3571(available)X
-3902(to)X
-4005(those)X
-2418 2821(users)N
-2604(with)X
-2767(AT&T)X
-3006(source)X
-3237(code.)X
-3450(First,)X
-3637(the)X
-3756(package)X
-4040(pro-)X
-2418 2909(vides)N
-2638(two)X
-2809(options)X
-3094(for)X
-3238(hash)X
-3435(functions.)X
-3803(Users)X
-4036(may)X
-2418 2997(specify)N
-2690(their)X
-2877(own)X
-3055(hash)X
-3242(function)X
-3549(by)X
-3669(compiling)X
-4032(with)X
-2418 3085(``USCR'')N
-2757(de\256ned)X
-3016(and)X
-3155(declaring)X
-3477(and)X
-3616(de\256ning)X
-3901(the)X
-4022(vari-)X
-2418 3173(able)N
-2 f
-2578(hcompar)X
-1 f
-2863(,)X
-2909(a)X
-2971(function)X
-3263(taking)X
-3488(two)X
-3633(string)X
-3840(arguments)X
-2418 3261(and)N
-2560(returning)X
-2880(an)X
-2982(integer.)X
-3271(Users)X
-3480(may)X
-3643(also)X
-3797(request)X
-4054(that)X
-2418 3349(hash)N
-2587(values)X
-2814(be)X
-2912(computed)X
-3250(simply)X
-3489(by)X
-3590(taking)X
-3811(the)X
-3930(modulo)X
-2418 3437(of)N
-2521(key)X
-2673(\(using)X
-2909(division)X
-3201(rather)X
-3424(than)X
-3597(multiplication)X
-4080(for)X
-2418 3525(hash)N
-2589(value)X
-2787(calculation\).)X
-3230(If)X
-3308(this)X
-3447(technique)X
-3783(is)X
-3859(used,)X
-4049(col-)X
-2418 3613(lisions)N
-2651(are)X
-2775(resolved)X
-3072(by)X
-3176(scanning)X
-3485(sequentially)X
-3896(from)X
-4076(the)X
-2418 3701(selected)N
-2702(bucket)X
-2941(\(linear)X
-3176(probing\).)X
-3517(This)X
-3684(option)X
-3913(is)X
-3991(avail-)X
-2418 3789(able)N
-2572(by)X
-2672(de\256ning)X
-2954(the)X
-3072(variable)X
-3351(``DIV'')X
-3622(at)X
-3700(compile)X
-3978(time.)X
-2590 3903(A)N
-2720(second)X
-3015(option,)X
-3311(based)X
-3565(on)X
-3716(an)X
-3863(algorithm)X
-2418 3991(discovered)N
-2787(by)X
-2888(Richard)X
-3163(P.)X
-3248(Brent,)X
-3466(rearranges)X
-3822(the)X
-3940(table)X
-4116(at)X
-2418 4079(the)N
-2549(time)X
-2724(of)X
-2824(insertion)X
-3137(in)X
-3232(order)X
-3434(to)X
-3528(speed)X
-3743(up)X
-3855(retrievals.)X
-2418 4167(The)N
-2571(basic)X
-2764(idea)X
-2926(is)X
-3007(to)X
-3097(shorten)X
-3361(long)X
-3531(probe)X
-3741(sequences)X
-4094(by)X
-2418 4255(lengthening)N
-2833(short)X
-3030(probe)X
-3249(sequences.)X
-3651(Once)X
-3857(the)X
-3991(probe)X
-2418 4343(chain)N
-2613(has)X
-2741(exceeded)X
-3062(some)X
-3252(threshold)X
-3571(\(Brent)X
-3796(suggests)X
-4087(2\),)X
-2418 4431(we)N
-2541(attempt)X
-2809(to)X
-2899(shuf\257e)X
-3145(any)X
-3289(colliding)X
-3601(keys)X
-3776(\(keys)X
-3978(which)X
-2418 4519(appeared)N
-2734(in)X
-2821(the)X
-2944(probe)X
-3152(sequence)X
-3471(of)X
-3562(the)X
-3684(new)X
-3842(key\).)X
-4049(The)X
-2418 4607(details)N
-2652(of)X
-2744(this)X
-2884(key)X
-3025(shuf\257ing)X
-3333(can)X
-3469(be)X
-3569(found)X
-3780(in)X
-3866([KNU68])X
-2418 4695(and)N
-2576([BRE73].)X
-2946(This)X
-3129(algorithm)X
-3481(may)X
-3660(be)X
-3777(obtained)X
-4094(by)X
-2418 4783(de\256ning)N
-2700(the)X
-2818(variable)X
-3097(``BRENT'')X
-3487(at)X
-3565(compile)X
-3843(time.)X
-2590 4897(A)N
-2698(third)X
-2899(set)X
-3038(of)X
-3154(options,)X
-3458(obtained)X
-3783(by)X
-3912(de\256ning)X
-2418 4985(``CHAINED'',)N
-2943(use)X
-3086(linked)X
-3321(lists)X
-3484(to)X
-3581(resolve)X
-3848(collisions.)X
-2418 5073(Either)N
-2647(of)X
-2747(the)X
-2878(primary)X
-3164(hash)X
-3343(function)X
-3642(described)X
-3982(above)X
-2418 5161(may)N
-2584(be)X
-2688(used,)X
-2882(but)X
-3011(all)X
-3118(collisions)X
-3451(are)X
-3577(resolved)X
-3876(by)X
-3983(build-)X
-2418 5249(ing)N
-2554(a)X
-2623(linked)X
-2856(list)X
-2986(of)X
-3086(entries)X
-3333(from)X
-3522(the)X
-3653(primary)X
-3940(bucket.)X
-2418 5337(By)N
-2542(default,)X
-2816(new)X
-2981(entries)X
-3226(will)X
-3381(be)X
-3488(added)X
-3711(to)X
-3804(a)X
-3871(bucket)X
-4116(at)X
-2418 5425(the)N
-2541(beginning)X
-2886(of)X
-2978(the)X
-3101(bucket)X
-3339(chain.)X
-3577(However,)X
-3916(compile)X
-2418 5513(options)N
-2706(``SORTUP'')X
-3173(or)X
-3293(``SORTDOWN'')X
-3908(may)X
-4098(be)X
-2418 5601(speci\256ed)N
-2723(to)X
-2805(order)X
-2995(the)X
-3113(hash)X
-3280(chains)X
-3505(within)X
-3729(each)X
-3897(bucket.)X
-3 f
-432 5960(4)N
-2970(USENIX)X
-9 f
-3292(-)X
-3 f
-3356(Winter)X
-3621('91)X
-9 f
-3748(-)X
-3 f
-3812(Dallas,)X
-4065(TX)X
-
-5 p
-%%Page: 5 5
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-720 258(Seltzer)N
-977(&)X
-1064(Yigit)X
-3278(A)X
-3356(New)X
-3528(Hashing)X
-3831(Package)X
-4136(for)X
-4259(UNIX)X
-2 f
-1444 538(dynahash)N
-1 f
-892 670(The)N
-2 f
-1054(dynahash)X
-1 f
-1398(library,)X
-1669(written)X
-1932(by)X
-2048(Esmond)X
-2346(Pitt,)X
-720 758(implements)N
-1183(Larson's)X
-1554(linear)X
-1827(hashing)X
-2165(algorithm)X
-720 846([LAR88])N
-1097(with)X
-1302(an)X
-2 f
-1440(hsearch)X
-1 f
-1756(compatible)X
-2174(interface.)X
-720 934(Intuitively,)N
-1099(a)X
-1161(hash)X
-1334(table)X
-1516(begins)X
-1751(as)X
-1844(a)X
-1905(single)X
-2121(bucket)X
-2360(and)X
-720 1022(grows)N
-941(in)X
-1028(generations,)X
-1443(where)X
-1665(a)X
-1725(generation)X
-2088(corresponds)X
-720 1110(to)N
-815(a)X
-884(doubling)X
-1201(in)X
-1296(the)X
-1427(size)X
-1585(of)X
-1685(the)X
-1815(hash)X
-1994(table.)X
-2222(The)X
-2379(0)X
-2 f
-7 s
-1078(th)Y
-10 s
-1 f
-720 1198(generation)N
-1085(occurs)X
-1321(as)X
-1414(the)X
-1538(table)X
-1719(grows)X
-1940(from)X
-2121(one)X
-2262(bucket)X
-720 1286(to)N
-814(two.)X
-1006(In)X
-1105(the)X
-1235(next)X
-1405(generation)X
-1776(the)X
-1906(table)X
-2093(grows)X
-2320(from)X
-720 1374(two)N
-862(to)X
-946(four.)X
-1122(During)X
-1371(each)X
-1541(generation,)X
-1921(every)X
-2121(bucket)X
-2356(that)X
-720 1462(existed)N
-967(at)X
-1045(the)X
-1163(beginning)X
-1503(of)X
-1590(the)X
-1708(generation)X
-2067(is)X
-2140(split.)X
-892 1576(The)N
-1041(table)X
-1221(starts)X
-1414(as)X
-1505(a)X
-1565(single)X
-1780(bucket)X
-2018(\(numbered)X
-2389(0\),)X
-720 1664(the)N
-839(current)X
-1088(split)X
-1245(bucket)X
-1479(is)X
-1552(set)X
-1661(to)X
-1743(bucket)X
-1977(0,)X
-2057(and)X
-2193(the)X
-2311(max-)X
-720 1752(imum)N
-933(split)X
-1097(point)X
-1288(is)X
-1368(set)X
-1483(to)X
-1571(twice)X
-1771(the)X
-1895(current)X
-2149(split)X
-2312(point)X
-720 1840(\(0\).)N
-863(When)X
-1084(it)X
-1157(is)X
-1239(time)X
-1410(for)X
-1532(a)X
-1596(bucket)X
-1838(to)X
-1928(split,)X
-2113(the)X
-2239(keys)X
-2414(in)X
-720 1928(the)N
-872(current)X
-1154(split)X
-1345(bucket)X
-1612(are)X
-1764(divided)X
-2057(between)X
-2378(the)X
-720 2016(current)N
-981(split)X
-1151(bucket)X
-1397(and)X
-1545(a)X
-1613(new)X
-1779(bucket)X
-2025(whose)X
-2262(bucket)X
-720 2104(number)N
-1000(is)X
-1088(equal)X
-1297(to)X
-1394(1)X
-1469(+)X
-1549(current)X
-1812(split)X
-1984(bucket)X
-2232(+)X
-2311(max-)X
-720 2192(imum)N
-927(split)X
-1085(point.)X
-1310(We)X
-1442(can)X
-1574(determine)X
-1915(which)X
-2131(keys)X
-2298(move)X
-720 2280(to)N
-807(the)X
-929(new)X
-1087(bucket)X
-1325(by)X
-1429(examining)X
-1791(the)X
-2 f
-1913(n)X
-7 s
-1962 2248(th)N
-10 s
-1 f
-2043 2280(bit)N
-2151(of)X
-2242(a)X
-2302(key's)X
-720 2368(hash)N
-899(value)X
-1105(where)X
-1334(n)X
-1406(is)X
-1491(the)X
-1620(generation)X
-1990(number.)X
-2306(After)X
-720 2456(the)N
-846(bucket)X
-1088(at)X
-1174(the)X
-1300(maximum)X
-1651(split)X
-1815(point)X
-2006(has)X
-2140(been)X
-2319(split,)X
-720 2544(the)N
-839(generation)X
-1198(number)X
-1463(is)X
-1536(incremented,)X
-1973(the)X
-2091(current)X
-2339(split)X
-720 2632(point)N
-908(is)X
-985(set)X
-1098(back)X
-1274(to)X
-1360(zero,)X
-1543(and)X
-1683(the)X
-1805(maximum)X
-2152(split)X
-2312(point)X
-720 2720(is)N
-815(set)X
-946(to)X
-1050(the)X
-1190(number)X
-1477(of)X
-1586(the)X
-1725(last)X
-1877(bucket)X
-2132(in)X
-2235(the)X
-2374(\256le)X
-720 2808(\(which)N
-971(is)X
-1052(equal)X
-1253(to)X
-1342(twice)X
-1543(the)X
-1668(old)X
-1797(maximum)X
-2148(split)X
-2312(point)X
-720 2896(plus)N
-873(1\).)X
-892 3010(To)N
-1031(facilitate)X
-1361(locating)X
-1668(keys,)X
-1884(we)X
-2027(maintain)X
-2356(two)X
-720 3098(masks.)N
-989(The)X
-1143(low)X
-1291(mask)X
-1488(is)X
-1569(equal)X
-1771(to)X
-1861(the)X
-1987(maximum)X
-2339(split)X
-720 3186(bucket)N
-967(and)X
-1116(the)X
-1247(high)X
-1422(mask)X
-1624(is)X
-1710(equal)X
-1917(to)X
-2011(the)X
-2141(next)X
-2311(max-)X
-720 3274(imum)N
-931(split)X
-1093(bucket.)X
-1372(To)X
-1486(locate)X
-1703(a)X
-1764(speci\256c)X
-2033(key,)X
-2193(we)X
-2311(com-)X
-720 3362(pute)N
-881(a)X
-940(32-bit)X
-1154(hash)X
-1324(value)X
-1520(using)X
-1715(a)X
-1773(bit-randomizing)X
-2311(algo-)X
-720 3450(rithm)N
-932(such)X
-1118(as)X
-1224(the)X
-1361(one)X
-1516(described)X
-1862(in)X
-1962([LAR88].)X
-2334(This)X
-720 3538(hash)N
-893(value)X
-1093(is)X
-1172(then)X
-1336(masked)X
-1607(with)X
-1775(the)X
-1898(high)X
-2065(mask.)X
-2299(If)X
-2378(the)X
-720 3626(resulting)N
-1026(number)X
-1297(is)X
-1376(greater)X
-1626(than)X
-1790(the)X
-1913(maximum)X
-2262(bucket)X
-720 3714(in)N
-823(the)X
-962(table)X
-1159(\(current)X
-1455(split)X
-1633(bucket)X
-1888(+)X
-1974(maximum)X
-2339(split)X
-720 3802(point\),)N
-962(the)X
-1091(hash)X
-1269(value)X
-1474(is)X
-1558(masked)X
-1834(with)X
-2007(the)X
-2136(low)X
-2287(mask.)X
-720 3890(In)N
-825(either)X
-1046(case,)X
-1242(the)X
-1377(result)X
-1592(of)X
-1696(the)X
-1831(mask)X
-2037(is)X
-2127(the)X
-2262(bucket)X
-720 3978(number)N
-989(for)X
-1107(the)X
-1229(given)X
-1431(key.)X
-1611(The)X
-1759(algorithm)X
-2093(below)X
-2312(illus-)X
-720 4066(trates)N
-914(this)X
-1049(process.)X
-0 f
-8 s
-720 4365(h)N
-796(=)X
-872 -0.4038(calchash\(key\);)AX
-720 4453(bucket)N
-986(=)X
-1062(h)X
-1138(&)X
-1214 -0.4167(high_mask;)AX
-720 4541(if)N
-834(\()X
-910(bucket)X
-1176(>)X
-1252 -0.4167(max_bucket)AX
-1670(\))X
-1008 4629(bucket)N
-1274(=)X
-1350(h)X
-1426(&)X
-1502 -0.4219(low_mask;)AX
-720 4717 -0.4018(return\(bucket\);)AN
-1 f
-10 s
-892 5042(In)N
-1013(order)X
-1237(to)X
-1353(decide)X
-1617(when)X
-1845(to)X
-1961(split)X
-2152(a)X
-2242(bucket,)X
-2 f
-720 5130(dynahash)N
-1 f
-1050(uses)X
-2 f
-1210(controlled)X
-1561(splitting)X
-1 f
-1822(.)X
-1884(A)X
-1964(hash)X
-2133(table)X
-2311(has)X
-2440(a)X
-720 5218(\256ll)N
-837(factor)X
-1054(which)X
-1279(is)X
-1361(expressed)X
-1707(in)X
-1798(terms)X
-2004(of)X
-2099(the)X
-2225(average)X
-720 5306(number)N
-990(of)X
-1082(keys)X
-1253(in)X
-1339(each)X
-1511(bucket.)X
-1789(Each)X
-1974(time)X
-2140(the)X
-2262(table's)X
-720 5394(total)N
-885(number)X
-1153(of)X
-1243(keys)X
-1413(divided)X
-1676(by)X
-1778(its)X
-1875(number)X
-2142(of)X
-2231(buckets)X
-720 5482(exceeds)N
-995(this)X
-1130(\256ll)X
-1238(factor,)X
-1466(a)X
-1522(bucket)X
-1756(is)X
-1829(split.)X
-2878 538(Since)N
-3079(the)X
-2 f
-3200(hsearch)X
-1 f
-3477(create)X
-3693(interface)X
-3998(\()X
-2 f
-4025(hcreate)X
-1 f
-4266(\))X
-4315(calls)X
-2706 626(for)N
-2842(an)X
-2960(estimate)X
-3269(of)X
-3378(the)X
-3518(\256nal)X
-3702(size)X
-3869(of)X
-3978(the)X
-4118(hash)X
-4306(table)X
-2706 714(\()N
-2 f
-2733(nelem)X
-1 f
-2925(\),)X
-2 f
-3007(dynahash)X
-1 f
-3349(uses)X
-3522(this)X
-3672(information)X
-4085(to)X
-4182(initialize)X
-2706 802(the)N
-2848(table.)X
-3088(The)X
-3257(initial)X
-3486(number)X
-3774(of)X
-3884(buckets)X
-4172(is)X
-4268(set)X
-4400(to)X
-2 f
-2706 890(nelem)N
-1 f
-2926(rounded)X
-3217(to)X
-3306(the)X
-3431(next)X
-3596(higher)X
-3828(power)X
-4056(of)X
-4150(two.)X
-4337(The)X
-2706 978(current)N
-2958(split)X
-3118(point)X
-3305(is)X
-3381(set)X
-3493(to)X
-3578(0)X
-3641(and)X
-3780(the)X
-3901(maximum)X
-4248(bucket)X
-2706 1066(and)N
-2842(maximum)X
-3186(split)X
-3343(point)X
-3527(are)X
-3646(set)X
-3755(to)X
-3837(this)X
-3972(rounded)X
-4255(value.)X
-3 f
-3148 1220(The)N
-3301(New)X
-3473(Implementation)X
-1 f
-2878 1352(Our)N
-3042(implementation)X
-3583(is)X
-3675(also)X
-3842(based)X
-4063(on)X
-4181(Larson's)X
-2706 1440(linear)N
-2939(hashing)X
-3238([LAR88])X
-3582(algorithm)X
-3943(as)X
-4060(well)X
-4248(as)X
-4364(the)X
-2 f
-2706 1528(dynahash)N
-1 f
-3047(implementation.)X
-3623(The)X
-2 f
-3782(dbm)X
-1 f
-3954(family)X
-4197(of)X
-4297(algo-)X
-2706 1616(rithms)N
-2942(decide)X
-3184(dynamically)X
-3612(which)X
-3840(bucket)X
-4085(to)X
-4178(split)X
-4346(and)X
-2706 1704(when)N
-2914(to)X
-3010(split)X
-3180(it)X
-3257(\(when)X
-3491(it)X
-3568(over\257ows\))X
-3944(while)X
-2 f
-4155(dynahash)X
-1 f
-2706 1792(splits)N
-2933(in)X
-3054(a)X
-3149(prede\256ned)X
-3547(order)X
-3776(\(linearly\))X
-4134(and)X
-4309(at)X
-4426(a)X
-2706 1880(prede\256ned)N
-3116(time)X
-3328(\(when)X
-3599(the)X
-3767(table)X
-3993(\256ll)X
-4151(factor)X
-4409(is)X
-2706 1968(exceeded\).)N
-3121(We)X
-3280(use)X
-3434(a)X
-3517(hybrid)X
-3773(of)X
-3887(these)X
-4099(techniques.)X
-2706 2056(Splits)N
-2913(occur)X
-3118(in)X
-3206(the)X
-3330(prede\256ned)X
-3695(order)X
-3891(of)X
-3984(linear)X
-4193(hashing,)X
-2706 2144(but)N
-2845(the)X
-2980(time)X
-3159(at)X
-3253(which)X
-3485(pages)X
-3704(are)X
-3839(split)X
-4012(is)X
-4101(determined)X
-2706 2232(both)N
-2869(by)X
-2970(page)X
-3143(over\257ows)X
-3480(\()X
-2 f
-3507(uncontrolled)X
-3937(splitting)X
-1 f
-4198(\))X
-4246(and)X
-4382(by)X
-2706 2320(exceeding)N
-3052(the)X
-3170(\256ll)X
-3278(factor)X
-3486(\()X
-2 f
-3513(controlled)X
-3862(splitting)X
-1 f
-4123(\))X
-2878 2434(A)N
-2962(hash)X
-3135(table)X
-3317(is)X
-3395(parameterized)X
-3876(by)X
-3981(both)X
-4148(its)X
-4248(bucket)X
-2706 2522(size)N
-2904(\()X
-2 f
-2931(bsize)X
-1 f
-(\))S
-3191(and)X
-3380(\256ll)X
-3541(factor)X
-3801(\()X
-2 f
-3828(ffactor)X
-1 f
-4041(\).)X
-4180(Whereas)X
-2 f
-2706 2610(dynahash's)N
-1 f
-3095(buckets)X
-3364(can)X
-3500(be)X
-3599(represented)X
-3993(as)X
-4083(a)X
-4142(linked)X
-4365(list)X
-2706 2698(of)N
-2798(elements)X
-3108(in)X
-3195(memory,)X
-3507(our)X
-3639(package)X
-3928(needs)X
-4136(to)X
-4222(support)X
-2706 2786(disk)N
-2874(access,)X
-3135(and)X
-3286(must)X
-3476(represent)X
-3806(buckets)X
-4086(in)X
-4183(terms)X
-4395(of)X
-2706 2874(pages.)N
-2955(The)X
-2 f
-3106(bsize)X
-1 f
-3291(is)X
-3369(the)X
-3492(size)X
-3642(\(in)X
-3756(bytes\))X
-3977(of)X
-4069(these)X
-4259(pages.)X
-2706 2962(As)N
-2833(in)X
-2933(linear)X
-3154(hashing,)X
-3461(the)X
-3597(number)X
-3879(of)X
-3983(buckets)X
-4265(in)X
-4364(the)X
-2706 3050(table)N
-2906(is)X
-3003(equal)X
-3221(to)X
-3327(the)X
-3469(number)X
-3758(of)X
-3869(keys)X
-4060(in)X
-4165(the)X
-4306(table)X
-2706 3138(divided)N
-2988(by)X
-2 f
-3110(ffactor)X
-1 f
-3323(.)X
-2 f
-8 s
-3113(6)Y
-1 f
-10 s
-3417 3138(The)N
-3584(controlled)X
-3950(splitting)X
-4252(occurs)X
-2706 3226(each)N
-2878(time)X
-3044(the)X
-3166(number)X
-3435(of)X
-3526(keys)X
-3697(in)X
-3783(the)X
-3905(table)X
-4085(exceeds)X
-4364(the)X
-2706 3314(\256ll)N
-2814(factor)X
-3022(multiplied)X
-3370(by)X
-3470(the)X
-3588(number)X
-3853(of)X
-3940(buckets.)X
-2878 3428(Inserting)N
-3187(keys)X
-3358(and)X
-3498(splitting)X
-3783(buckets)X
-4051(is)X
-4127(performed)X
-2706 3516(precisely)N
-3018(as)X
-3107(described)X
-3437(previously)X
-3796(for)X
-2 f
-3911(dynahash)X
-1 f
-4218(.)X
-4279(How-)X
-2706 3604(ever,)N
-2897(since)X
-3094(buckets)X
-3371(are)X
-3502(now)X
-3671(comprised)X
-4036(of)X
-4134(pages,)X
-4368(we)X
-2706 3692(must)N
-2883(be)X
-2981(prepared)X
-3284(to)X
-3367(handle)X
-3602(cases)X
-3793(where)X
-4011(the)X
-4130(size)X
-4276(of)X
-4364(the)X
-2706 3780(keys)N
-2873(and)X
-3009(data)X
-3163(in)X
-3245(a)X
-3301(bucket)X
-3535(exceed)X
-3779(the)X
-3897(bucket)X
-4131(size.)X
-3 f
-3318 3934(Over\257ow)N
-3654(Pages)X
-1 f
-2878 4066(There)N
-3095(are)X
-3223(two)X
-3372(cases)X
-3571(where)X
-3797(a)X
-3862(key)X
-4007(may)X
-4174(not)X
-4305(\256t)X
-4400(in)X
-2706 4154(its)N
-2802(designated)X
-3166(bucket.)X
-3441(In)X
-3529(the)X
-3647(\256rst)X
-3791(case,)X
-3970(the)X
-4088(total)X
-4250(size)X
-4395(of)X
-2706 4242(the)N
-2833(key)X
-2978(and)X
-3123(data)X
-3286(may)X
-3453(exceed)X
-3706(the)X
-3833(bucket)X
-4076(size.)X
-4269(In)X
-4364(the)X
-2706 4330(second,)N
-3008(addition)X
-3328(of)X
-3453(a)X
-3547(new)X
-3739(key)X
-3913(could)X
-4149(cause)X
-4386(an)X
-2706 4418(over\257ow,)N
-3068(but)X
-3227(the)X
-3382(bucket)X
-3652(in)X
-3770(question)X
-4097(is)X
-4206(not)X
-4364(yet)X
-2706 4506(scheduled)N
-3049(to)X
-3133(be)X
-3230(split.)X
-3428(In)X
-3516(existing)X
-3790(implementations,)X
-4364(the)X
-2706 4594(second)N
-2953(case)X
-3115(never)X
-3317(arises)X
-3523(\(since)X
-3738(buckets)X
-4006(are)X
-4128(split)X
-4288(when)X
-2706 4682(they)N
-2871(over\257ow\))X
-3210(and)X
-3352(the)X
-3476(\256rst)X
-3626(case)X
-3791(is)X
-3870(not)X
-3998(handled)X
-4278(at)X
-4362(all.)X
-2706 4770(Although)N
-3036(large)X
-3225(key/data)X
-3525(pair)X
-3678(handling)X
-3986(is)X
-4066(dif\256cult)X
-4346(and)X
-2706 4858(expensive,)N
-3083(it)X
-3163(is)X
-3252(essential.)X
-3604(In)X
-3706(a)X
-3777(linear)X
-3995(hashed)X
-4253(imple-)X
-2706 4946(mentation,)N
-3087(over\257ow)X
-3413(pages)X
-3636(are)X
-3775(required)X
-4083(for)X
-4217(buckets)X
-2706 5034(which)N
-2935(over\257ow)X
-3253(before)X
-3492(they)X
-3662(are)X
-3793(split,)X
-3982(so)X
-4085(we)X
-4211(can)X
-4355(use)X
-2706 5122(the)N
-2833(same)X
-3027(mechanism)X
-3421(for)X
-3544(large)X
-3734(key/data)X
-4035(pairs)X
-4220(that)X
-4368(we)X
-2706 5210(use)N
-2837(for)X
-2955(over\257ow)X
-3264(pages.)X
-3511(Logically,)X
-3862(we)X
-3980(chain)X
-4177(over\257ow)X
-16 s
-2706 5353 MXY
-864 0 Dl
-2 f
-8 s
-2746 5408(6)N
-1 f
-9 s
-2801 5433(This)N
-2952(is)X
-3023(not)X
-3138(strictly)X
-3361(true.)X
-3532(The)X
-3667(\256le)X
-3782(does)X
-3937(not)X
-4052(contract)X
-4306(when)X
-2706 5513(keys)N
-2861(are)X
-2972(deleted,)X
-3221(so)X
-3308(the)X
-3419(number)X
-3662(of)X
-3744(buckets)X
-3986(is)X
-4056(actually)X
-4306(equal)X
-2706 5593(to)N
-2782(the)X
-2890(maximum)X
-3202(number)X
-3441(of)X
-3520(keys)X
-3671(ever)X
-3814(present)X
-4041(in)X
-4116(the)X
-4223(table)X
-4382(di-)X
-2706 5673(vided)N
-2884(by)X
-2974(the)X
-3080(\256ll)X
-3178(factor.)X
-3 f
-10 s
-720 5960(USENIX)N
-9 f
-1042(-)X
-3 f
-1106(Winter)X
-1371('91)X
-9 f
-1498(-)X
-3 f
-1562(Dallas,)X
-1815(TX)X
-4424(5)X
-
-6 p
-%%Page: 6 6
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-432 258(A)N
-510(New)X
-682(Hashing)X
-985(Package)X
-1290(for)X
-1413(UNIX)X
-3663(Seltzer)X
-3920(&)X
-4007(Yigit)X
-1 f
-432 538(pages)N
-639(to)X
-725(the)X
-847(buckets)X
-1116(\(also)X
-1296(called)X
-1512(primary)X
-1789(pages\).)X
-2062(In)X
-2152(a)X
-432 626(memory)N
-730(based)X
-943(representation,)X
-1448(over\257ow)X
-1763(pages)X
-1976(do)X
-2086(not)X
-432 714(pose)N
-628(any)X
-792(special)X
-1063(problems)X
-1409(because)X
-1712(we)X
-1854(can)X
-2014(chain)X
-432 802(over\257ow)N
-776(pages)X
-1017(to)X
-1137(primary)X
-1449(pages)X
-1690(using)X
-1921(memory)X
-432 890(pointers.)N
-776(However,)X
-1137(mapping)X
-1463(these)X
-1674(over\257ow)X
-2005(pages)X
-432 978(into)N
-584(a)X
-648(disk)X
-809(\256le)X
-939(is)X
-1019(more)X
-1211(of)X
-1305(a)X
-1368(challenge,)X
-1723(since)X
-1915(we)X
-2036(need)X
-432 1066(to)N
-547(be)X
-675(able)X
-861(to)X
-975(address)X
-1268(both)X
-1462(bucket)X
-1728(pages,)X
-1983(whose)X
-432 1154(numbers)N
-729(are)X
-849(growing)X
-1137(linearly,)X
-1422(and)X
-1558(some)X
-1747(indeterminate)X
-432 1242(number)N
-715(of)X
-820(over\257ow)X
-1143(pages)X
-1364(without)X
-1646(reorganizing)X
-2090(the)X
-432 1330(\256le.)N
-604 1444(One)N
-789(simple)X
-1053(solution)X
-1361(would)X
-1612(be)X
-1739(to)X
-1852(allocate)X
-2152(a)X
-432 1532(separate)N
-737(\256le)X
-880(for)X
-1015(over\257ow)X
-1341(pages.)X
-1604(The)X
-1769(disadvantage)X
-432 1620(with)N
-605(such)X
-783(a)X
-850(technique)X
-1193(is)X
-1276(that)X
-1426(it)X
-1500(requires)X
-1789(an)X
-1895(extra)X
-2086(\256le)X
-432 1708(descriptor,)N
-794(an)X
-891(extra)X
-1073(system)X
-1316(call)X
-1453(on)X
-1554(open)X
-1731(and)X
-1867(close,)X
-2072(and)X
-432 1796(logically)N
-739(associating)X
-1122(two)X
-1269(independent)X
-1687(\256les.)X
-1886(For)X
-2023(these)X
-432 1884(reasons,)N
-728(we)X
-857(wanted)X
-1123(to)X
-1219(map)X
-1391(both)X
-1567(primary)X
-1855(pages)X
-2072(and)X
-432 1972(over\257ow)N
-737(pages)X
-940(into)X
-1084(the)X
-1202(same)X
-1387(\256le)X
-1509(space.)X
-604 2086(The)N
-799(buddy-in-waiting)X
-1425(algorithm)X
-1806(provides)X
-2152(a)X
-432 2174(mechanism)N
-851(to)X
-966(support)X
-1259(multiple)X
-1578(pages)X
-1814(per)X
-1970(logical)X
-432 2262(bucket)N
-685(while)X
-902(retaining)X
-1226(the)X
-1362(simple)X
-1613(split)X
-1788(sequence)X
-2121(of)X
-432 2350(linear)N
-681(hashing.)X
-1015(Over\257ow)X
-1383(pages)X
-1631(are)X
-1795(preallocated)X
-432 2438(between)N
-781(generations)X
-1232(of)X
-1379(primary)X
-1713(pages.)X
-1996(These)X
-432 2526(over\257ow)N
-759(pages)X
-984(are)X
-1125(used)X
-1314(by)X
-1436(any)X
-1594(bucket)X
-1850(containing)X
-432 2614(more)N
-646(keys)X
-842(than)X
-1029(\256t)X
-1144(on)X
-1273(the)X
-1420(primary)X
-1723(page)X
-1924(and)X
-2089(are)X
-432 2702(reclaimed,)N
-808(if)X
-896(possible,)X
-1217(when)X
-1430(the)X
-1567(bucket)X
-1819(later)X
-2000(splits.)X
-432 2790(Figure)N
-687(3)X
-773(depicts)X
-1045(the)X
-1188(layout)X
-1433(of)X
-1545(primary)X
-1844(pages)X
-2072(and)X
-432 2878(over\257ow)N
-752(pages)X
-970(within)X
-1209(the)X
-1342(same)X
-1542(\256le.)X
-1699(Over\257ow)X
-2036(page)X
-432 2966(use)N
-586(information)X
-1011(is)X
-1111(recorded)X
-1440(in)X
-1548(bitmaps)X
-1847(which)X
-2089(are)X
-432 3054(themselves)N
-819(stored)X
-1046(on)X
-1157(over\257ow)X
-1472(pages.)X
-1725(The)X
-1880(addresses)X
-432 3142(of)N
-520(the)X
-639(bitmap)X
-882(pages)X
-1086(and)X
-1223(the)X
-1342(number)X
-1608(of)X
-1695(pages)X
-1898(allocated)X
-432 3230(at)N
-515(each)X
-688(split)X
-850(point)X
-1039(are)X
-1163(stored)X
-1384(in)X
-1470(the)X
-1592(\256le)X
-1718(header.)X
-1997(Using)X
-432 3318(this)N
-577(information,)X
-1005(both)X
-1177(over\257ow)X
-1492(addresses)X
-1829(and)X
-1974(bucket)X
-432 3406(addresses)N
-764(can)X
-900(be)X
-999(mapped)X
-1276(to)X
-1361(disk)X
-1517(addresses)X
-1848(by)X
-1951(the)X
-2072(fol-)X
-432 3494(lowing)N
-674(calculation:)X
-0 f
-8 s
-432 3793(int)N
-736(bucket;)X
-1192(/*)X
-1306(bucket)X
-1572(address)X
-1876(*/)X
-432 3881(u_short)N
-736(oaddr;)X
-1192(/*)X
-1306(OVERFLOW)X
-1648(address)X
-1952(*/)X
-432 3969(int)N
-736 -0.4125(nhdr_pages;)AX
-1192(/*)X
-1306(npages)X
-1572(in)X
-1686 -112.4062(\256le)AX
-1838(header)X
-2104(*/)X
-432 4057(int)N
-736 -0.4125(spares[32];)AX
-1192(/*)X
-1306(npages)X
-1572(at)X
-1686(each)X
-1876(split)X
-2104(*/)X
-432 4145(int)N
-736(log2\(\);)X
-1198(/*)X
-1312(ceil\(log)X
-1654(base)X
-1844(2\))X
-1958(*/)X
-432 4321(#DEFINE)N
-736 -0.3929(BUCKET_TO_PAGE\(bucket\))AX
-1610(\\)X
-584 4409(bucket)N
-850(+)X
-926 -0.4167(nhdr_pages)AX
-1344(+)X
-1420(\\)X
-584 4497 -0.3894(\(bucket?spares[logs2\(bucket)AN
-1648(+)X
-1724(1\)-1]:0\))X
-432 4673(#DEFINE)N
-736 -0.3947(OADDR_TO_PAGE\(oaddr\))AX
-1534(\\)X
-584 4761 -0.3984(BUCKET_TO_PAGE\(\(1)AN
-1268(<<)X
-1382 -0.4091(\(oaddr>>11\)\))AX
-1876(-)X
-1952(1\))X
-2066(+)X
-2142(\\)X
-584 4849(oaddr)N
-812(&)X
-888(0x7ff;)X
-1 f
-10 s
-604 5262(An)N
-728(over\257ow)X
-1039(page)X
-1217(is)X
-1295(addressed)X
-1637(by)X
-1742(its)X
-1842(split)X
-2004(point,)X
-432 5350(identifying)N
-858(the)X
-1031(generations)X
-1476(between)X
-1819(which)X
-2090(the)X
-432 5438(over\257ow)N
-740(page)X
-915(is)X
-991(allocated,)X
-1324(and)X
-1463(its)X
-1561(page)X
-1736(number,)X
-2023(iden-)X
-432 5526(tifying)N
-665(the)X
-783(particular)X
-1111(page)X
-1283(within)X
-1507(the)X
-1625(split)X
-1782(point.)X
-1986(In)X
-2073(this)X
-432 5614(implementation,)N
-983(offsets)X
-1225(within)X
-1457(pages)X
-1668(are)X
-1795(16)X
-1903(bits)X
-2046(long)X
-432 5702(\(limiting)N
-732(the)X
-851(maximum)X
-1196(page)X
-1368(size)X
-1513(to)X
-1595(32K\),)X
-1800(so)X
-1891(we)X
-2005(select)X
-2418 538(an)N
-2535(over\257ow)X
-2860(page)X
-3052(addressing)X
-3435(algorithm)X
-3786(that)X
-3946(can)X
-4098(be)X
-2418 626(expressed)N
-2760(in)X
-2847(16)X
-2952(bits)X
-3091(and)X
-3231(which)X
-3451(allows)X
-3684(quick)X
-3886(retrieval.)X
-2418 714(The)N
-2568(top)X
-2695(\256ve)X
-2840(bits)X
-2980(indicate)X
-3258(the)X
-3380(split)X
-3541(point)X
-3729(and)X
-3869(the)X
-3991(lower)X
-2418 802(eleven)N
-2650(indicate)X
-2926(the)X
-3046(page)X
-3220(number)X
-3487(within)X
-3713(the)X
-3832(split)X
-3990(point.)X
-2418 890(Since)N
-2633(\256ve)X
-2789(bits)X
-2940(are)X
-3075(reserved)X
-3384(for)X
-3514(the)X
-3648(split)X
-3821(point,)X
-4041(\256les)X
-2418 978(may)N
-2578(split)X
-2737(32)X
-2839(times)X
-3034(yielding)X
-3318(a)X
-3376(maximum)X
-3721(\256le)X
-3844(size)X
-3990(of)X
-4078(2)X
-7 s
-946(32)Y
-10 s
-2418 1066(buckets)N
-2698(and)X
-2849(32)X
-2 f
-(*)S
-1 f
-2982(2)X
-7 s
-1034(11)Y
-10 s
-3113 1066(over\257ow)N
-3433(pages.)X
-3691(The)X
-3850(maximum)X
-2418 1154(page)N
-2597(size)X
-2749(is)X
-2829(2)X
-7 s
-1122(15)Y
-10 s
-1154(,)Y
-2971(yielding)X
-3259(a)X
-3321(maximum)X
-3671(\256le)X
-3799(size)X
-3950(greater)X
-2418 1242(than)N
-2601(131,000)X
-2906(GB)X
-3061(\(on)X
-3212(\256le)X
-3358(systems)X
-3655(supporting)X
-4041(\256les)X
-2418 1330(larger)N
-2626(than)X
-2784(4GB\).)X
-10 f
-2418 1418 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-1 Dt
-4014 2275 MXY
-0 133 Dl
-3881 2275 MXY
-0 133 Dl
-3748 2275 MXY
-0 133 Dl
-3083 2275 MXY
-0 133 Dl
-5 s
-1 f
-3523 2475(2/3)N
-3390(2/2)X
-3257(2/1)X
-2859(1/2)X
-2726(1/1)X
-5 Dt
-3814 1743 MXY
-0 133 Dl
-3282 1743 MXY
-0 133 Dl
-3017 1743 MXY
-0 133 Dl
-2884 1743 MXY
-0 133 Dl
-1 Dt
-3681 1743 MXY
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-3548 MX
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-3415 MX
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-3282 MX
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-3150 MX
-0 133 Dl
-132 0 Dl
-0 -133 Dl
--132 0 Dl
-3017 MX
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-2884 MX
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-3 f
-8 s
-3017 2601(Over\257ow)N
-3285(Addresses)X
-3515 2833(Over\257ow)N
-3783(Pages)X
-2850(Buckets)X
-1 Di
-3349 2740 MXY
- 3349 2740 lineto
- 3482 2740 lineto
- 3482 2873 lineto
- 3349 2873 lineto
- 3349 2740 lineto
-closepath 3 3349 2740 3482 2873 Dp
-2684 MX
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-5 Dt
-4146 2275 MXY
-0 133 Dl
-3216 2275 MXY
-0 133 Dl
-2684 2275 MXY
-0 133 Dl
-2551 2275 MXY
-0 133 Dl
-1 f
-3798 1963(3)N
-3266 1980(2)N
-3001(1)X
-2868(0)X
-1 Dt
-2751 1743 MXY
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-3548 2275 MXY
--15 -22 Dl
-2 16 Dl
--13 11 Dl
-26 -5 Dl
--282 -117 Dl
-3432 2275 MXY
--10 -25 Dl
--2 16 Dl
--15 8 Dl
-27 1 Dl
--166 -117 Dl
-3282 2275 MXY
-12 -25 Dl
--14 10 Dl
--15 -6 Dl
-17 21 Dl
--16 -117 Dl
-2884 2275 MXY
-26 7 Dl
--12 -12 Dl
-3 -16 Dl
--17 21 Dl
-382 -117 Dl
-2751 2275 MXY
-25 9 Dl
--11 -12 Dl
-5 -17 Dl
--19 20 Dl
-515 -117 Dl
-3 f
-3070 2152(Over\257ow)N
-3338(Pages)X
-3482 2275 MXY
- 3482 2275 lineto
- 3615 2275 lineto
- 3615 2408 lineto
- 3482 2408 lineto
- 3482 2275 lineto
-closepath 3 3482 2275 3615 2408 Dp
-3349 MX
- 3349 2275 lineto
- 3482 2275 lineto
- 3482 2408 lineto
- 3349 2408 lineto
- 3349 2275 lineto
-closepath 3 3349 2275 3482 2408 Dp
-3216 MX
- 3216 2275 lineto
- 3349 2275 lineto
- 3349 2408 lineto
- 3216 2408 lineto
- 3216 2275 lineto
-closepath 3 3216 2275 3349 2408 Dp
-2817 MX
- 2817 2275 lineto
- 2950 2275 lineto
- 2950 2408 lineto
- 2817 2408 lineto
- 2817 2275 lineto
-closepath 3 2817 2275 2950 2408 Dp
-2684 MX
- 2684 2275 lineto
- 2817 2275 lineto
- 2817 2408 lineto
- 2684 2408 lineto
- 2684 2275 lineto
-closepath 3 2684 2275 2817 2408 Dp
-3615 MX
-0 133 Dl
-531 0 Dl
-0 -133 Dl
--531 0 Dl
-2950 MX
-0 133 Dl
-266 0 Dl
-0 -133 Dl
--266 0 Dl
-2551 MX
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-3798 1726 MXY
--21 -18 Dl
-6 16 Dl
--10 13 Dl
-25 -11 Dl
--599 -99 Dl
-3266 1726 MXY
--1 -27 Dl
--7 15 Dl
--17 1 Dl
-25 11 Dl
--67 -99 Dl
-3033 1726 MXY
-27 1 Dl
--14 -8 Dl
--1 -17 Dl
--12 24 Dl
-166 -99 Dl
-2900 1726 MXY
-27 7 Dl
--13 -11 Dl
-3 -17 Dl
--17 21 Dl
-299 -99 Dl
-3058 1621(Split)N
-3203(Points)X
-2418 2275 MXY
-0 133 Dl
-133 0 Dl
-0 -133 Dl
--133 0 Dl
-3 Dt
--1 Ds
-3137(Figure)Y
-2619(3:)X
-1 f
-2691(Split)X
-2832(points)X
-3008(occur)X
-3168(between)X
-3399(generations)X
-3712(and)X
-3823(are)X
-3919(numbered)X
-2418 3225(from)N
-2560(0.)X
-2642(In)X
-2713(this)X
-2824(\256gure)X
-2991(there)X
-3136(are)X
-3231(two)X
-3345(over\257ow)X
-3590(pages)X
-3753(allocated)X
-4000(at)X
-4063(split)X
-2418 3313(point)N
-2566(1)X
-2614(and)X
-2722(three)X
-2865(allocated)X
-3111(at)X
-3173(split)X
-3300(point)X
-3448(2.)X
-10 s
-10 f
-2418 3489 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-3 f
-2949 3731(Buffer)N
-3192(Management)X
-1 f
-2590 3863(The)N
-2744(hash)X
-2920(table)X
-3105(is)X
-3187(stored)X
-3412(in)X
-3502(memory)X
-3797(as)X
-3892(a)X
-3956(logical)X
-2418 3951(array)N
-2633(of)X
-2749(bucket)X
-3012(pointers.)X
-3359(Physically,)X
-3761(the)X
-3907(array)X
-4121(is)X
-2418 4039(arranged)N
-2728(in)X
-2818(segments)X
-3144(of)X
-3239(256)X
-3387(pointers.)X
-3713(Initially,)X
-4013(there)X
-2418 4127(is)N
-2530(space)X
-2767(to)X
-2887(allocate)X
-3195(256)X
-3373(segments.)X
-3769(Reallocation)X
-2418 4215(occurs)N
-2651(when)X
-2847(the)X
-2967(number)X
-3234(of)X
-3323(buckets)X
-3590(exceeds)X
-3867(32K)X
-4027(\(256)X
-2418 4303(*)N
-2508(256\).)X
-2745(Primary)X
-3053(pages)X
-3286(may)X
-3473(be)X
-3598(accessed)X
-3929(directly)X
-2418 4391(through)N
-2711(the)X
-2853(array)X
-3062(by)X
-3185(bucket)X
-3442(number)X
-3730(and)X
-3889(over\257ow)X
-2418 4479(pages)N
-2628(are)X
-2754 0.4028(referenced)AX
-3122(logically)X
-3429(by)X
-3536(their)X
-3710(over\257ow)X
-4022(page)X
-2418 4567(address.)N
-2726(For)X
-2864(small)X
-3063(hash)X
-3236(tables,)X
-3469(it)X
-3539(is)X
-3618(desirable)X
-3934(to)X
-4022(keep)X
-2418 4655(all)N
-2525(pages)X
-2735(in)X
-2823(main)X
-3009(memory)X
-3302(while)X
-3506(on)X
-3612(larger)X
-3826(tables,)X
-4059(this)X
-2418 4743(is)N
-2523(probably)X
-2860(impossible.)X
-3298(To)X
-3438(satisfy)X
-3698(both)X
-3891(of)X
-4009(these)X
-2418 4831(requirements,)N
-2900(the)X
-3041(package)X
-3348(includes)X
-3658(buffer)X
-3897(manage-)X
-2418 4919(ment)N
-2598(with)X
-2760(LRU)X
-2940(\(least)X
-3134(recently)X
-3413(used\))X
-3607(replacement.)X
-2590 5033(By)N
-2730(default,)X
-3020(the)X
-3165(package)X
-3475(allocates)X
-3802(up)X
-3928(to)X
-4036(64K)X
-2418 5121(bytes)N
-2616(of)X
-2712(buffered)X
-3014(pages.)X
-3246(All)X
-3377(pages)X
-3589(in)X
-3680(the)X
-3807(buffer)X
-4032(pool)X
-2418 5209(are)N
-2542(linked)X
-2766(in)X
-2852(LRU)X
-3036(order)X
-3230(to)X
-3316(facilitate)X
-3621(fast)X
-3761(replacement.)X
-2418 5297(Whereas)N
-2724(ef\256cient)X
-3011(access)X
-3241(to)X
-3327(primary)X
-3605(pages)X
-3812(is)X
-3889(provided)X
-2418 5385(by)N
-2521(the)X
-2642(bucket)X
-2879(array,)X
-3087(ef\256cient)X
-3372(access)X
-3600(to)X
-3684(over\257ow)X
-3991(pages)X
-2418 5473(is)N
-2501(provided)X
-2816(by)X
-2926(linking)X
-3182(over\257ow)X
-3497(page)X
-3679(buffers)X
-3936(to)X
-4027(their)X
-2418 5561(predecessor)N
-2827(page)X
-3008(\(either)X
-3247(the)X
-3374(primary)X
-3657(page)X
-3838(or)X
-3933(another)X
-2418 5649(over\257ow)N
-2742(page\).)X
-3000(This)X
-3181(means)X
-3425(that)X
-3584(an)X
-3699(over\257ow)X
-4022(page)X
-3 f
-432 5960(6)N
-2970(USENIX)X
-9 f
-3292(-)X
-3 f
-3356(Winter)X
-3621('91)X
-9 f
-3748(-)X
-3 f
-3812(Dallas,)X
-4065(TX)X
-
-7 p
-%%Page: 7 7
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-720 258(Seltzer)N
-977(&)X
-1064(Yigit)X
-3278(A)X
-3356(New)X
-3528(Hashing)X
-3831(Package)X
-4136(for)X
-4259(UNIX)X
-1 f
-720 538(cannot)N
-955(be)X
-1052(present)X
-1305(in)X
-1388(the)X
-1507(buffer)X
-1724(pool)X
-1886(if)X
-1955(its)X
-2050(primary)X
-2324(page)X
-720 626(is)N
-804(not)X
-937(present.)X
-1240(This)X
-1413(does)X
-1591(not)X
-1724(impact)X
-1972(performance)X
-2409(or)X
-720 714(functionality,)N
-1209(because)X
-1524(an)X
-1660(over\257ow)X
-2005(page)X
-2217(will)X
-2400(be)X
-720 802(accessed)N
-1048(only)X
-1236(after)X
-1430(its)X
-1550(predecessor)X
-1975(page)X
-2172(has)X
-2324(been)X
-720 890(accessed.)N
-1068(Figure)X
-1303(4)X
-1369(depicts)X
-1622(the)X
-1746(data)X
-1905(structures)X
-2242(used)X
-2414(to)X
-720 978(manage)N
-990(the)X
-1108(buffer)X
-1325(pool.)X
-892 1092(The)N
-1040(in-memory)X
-1419(bucket)X
-1656(array)X
-1845(contains)X
-2134(pointers)X
-2414(to)X
-720 1180(buffer)N
-975(header)X
-1248(structures)X
-1617(which)X
-1870(represent)X
-2222(primary)X
-720 1268(pages.)N
-968(Buffer)X
-1203(headers)X
-1474(contain)X
-1735(modi\256ed)X
-2043(bits,)X
-2202(the)X
-2324(page)X
-720 1356(address)N
-995(of)X
-1096(the)X
-1228(buffer,)X
-1479(a)X
-1548(pointer)X
-1808(to)X
-1903(the)X
-2034(actual)X
-2259(buffer,)X
-720 1444(and)N
-875(a)X
-950(pointer)X
-1216(to)X
-1317(the)X
-1454(buffer)X
-1690(header)X
-1944(for)X
-2077(an)X
-2191(over\257ow)X
-720 1532(page)N
-901(if)X
-979(it)X
-1052(exists,)X
-1283(in)X
-1374(addition)X
-1665(to)X
-1756(the)X
-1883(LRU)X
-2072(links.)X
-2296(If)X
-2378(the)X
-720 1620(buffer)N
-950(corresponding)X
-1442(to)X
-1537(a)X
-1606(particular)X
-1947(bucket)X
-2194(is)X
-2280(not)X
-2414(in)X
-720 1708(memory,)N
-1048(its)X
-1164(pointer)X
-1432(is)X
-1526(NULL.)X
-1801(In)X
-1909(effect,)X
-2154(pages)X
-2377(are)X
-720 1796(linked)N
-950(in)X
-1042(three)X
-1233(ways.)X
-1468(Using)X
-1689(the)X
-1817(buffer)X
-2043(headers,)X
-2338(they)X
-720 1884(are)N
-851(linked)X
-1083(physically)X
-1444(through)X
-1725(the)X
-1854(LRU)X
-2045(links)X
-2231(and)X
-2378(the)X
-720 1972(over\257ow)N
-1036(links.)X
-1241(Using)X
-1462(the)X
-1590(pages)X
-1803(themselves,)X
-2209(they)X
-2377(are)X
-720 2060(linked)N
-943(logically)X
-1246(through)X
-1518(the)X
-1639(over\257ow)X
-1946(addresses)X
-2276(on)X
-2378(the)X
-720 2148(page.)N
-948(Since)X
-1162(over\257ow)X
-1482(pages)X
-1700(are)X
-1834(accessed)X
-2151(only)X
-2328(after)X
-720 2236(their)N
-904(predecessor)X
-1321(pages,)X
-1560(they)X
-1734(are)X
-1869(removed)X
-2186(from)X
-2378(the)X
-720 2324(buffer)N
-937(pool)X
-1099(when)X
-1293(their)X
-1460(primary)X
-1734(is)X
-1807(removed.)X
-10 f
-720 2412 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-1 Dt
-2309 3177 MXY
-24 15 Dl
--8 -15 Dl
-8 -15 Dl
--24 15 Dl
-52 0 Dl
-789 3160 MXY
--35 0 Dl
-0 -156 Dl
-1607 0 Dl
-0 173 Dl
-789 3091 MXY
--24 -15 Dl
-9 15 Dl
--9 15 Dl
-24 -15 Dl
--69 0 Dl
-2309 3125 MXY
-104 0 Dl
-0 -155 Dl
--1693 0 Dl
-0 121 Dl
-927 3160 MXY
-24 15 Dl
--9 -15 Dl
-9 -15 Dl
--24 15 Dl
-553 0 Dl
-1618 3177 MXY
-8 27 Dl
-4 -17 Dl
-16 -6 Dl
--28 -4 Dl
-138 121 Dl
-1895 3315 MXY
-28 3 Dl
--15 -9 Dl
-1 -18 Dl
--14 24 Dl
-276 -138 Dl
-3108 MY
--28 -3 Dl
-15 10 Dl
--1 17 Dl
-14 -24 Dl
--276 138 Dl
-1756 3229 MXY
--8 -27 Dl
--3 17 Dl
--16 6 Dl
-27 4 Dl
--138 -121 Dl
-1480 MX
--24 -15 Dl
-9 15 Dl
--9 15 Dl
-24 -15 Dl
--553 0 Dl
-3 f
-5 s
-1083 3073(LRU)N
-1178(chain)X
-4 Ds
-1402 3851 MXY
- 1402 3851 lineto
- 1471 3851 lineto
- 1471 3920 lineto
- 1402 3920 lineto
- 1402 3851 lineto
-closepath 19 1402 3851 1471 3920 Dp
-1445 3747(Over\257ow)N
-1613(Address)X
-1549 3609 MXY
-0 69 Dl
-1756 MX
--23 -15 Dl
-8 15 Dl
--8 15 Dl
-23 -15 Dl
--207 0 Dl
--1 Ds
-3 Dt
-1756 3419 MXY
--6 -28 Dl
--4 17 Dl
--17 5 Dl
-27 6 Dl
--138 -138 Dl
-2240 3471 MXY
-15 -24 Dl
--15 9 Dl
--15 -9 Dl
-15 24 Dl
-0 -138 Dl
-1826 3609 MXY
-15 -24 Dl
--15 9 Dl
--16 -9 Dl
-16 24 Dl
-0 -138 Dl
-1549 MX
-15 -24 Dl
--15 9 Dl
--15 -9 Dl
-15 24 Dl
-0 -138 Dl
-858 3471 MXY
-15 -24 Dl
--15 9 Dl
--15 -9 Dl
-15 24 Dl
-0 -138 Dl
-2240 3056 MXY
-15 -24 Dl
--15 9 Dl
--15 -9 Dl
-15 24 Dl
-0 -138 Dl
-1549 3056 MXY
-15 -24 Dl
--15 9 Dl
--15 -9 Dl
-15 24 Dl
-0 -138 Dl
-858 3056 MXY
-15 -24 Dl
--15 9 Dl
--15 -9 Dl
-15 24 Dl
-0 -138 Dl
-1 Dt
-2171 3471 MXY
- 2171 3471 lineto
- 2448 3471 lineto
- 2448 3609 lineto
- 2171 3609 lineto
- 2171 3471 lineto
-closepath 19 2171 3471 2448 3609 Dp
-1756 3609 MXY
- 1756 3609 lineto
- 2033 3609 lineto
- 2033 3747 lineto
- 1756 3747 lineto
- 1756 3609 lineto
-closepath 3 1756 3609 2033 3747 Dp
-1480 3471 MXY
- 1480 3471 lineto
- 1756 3471 lineto
- 1756 3609 lineto
- 1480 3609 lineto
- 1480 3471 lineto
-closepath 19 1480 3471 1756 3609 Dp
-789 MX
- 789 3471 lineto
- 1065 3471 lineto
- 1065 3609 lineto
- 789 3609 lineto
- 789 3471 lineto
-closepath 19 789 3471 1065 3609 Dp
-962 3903(Buffer)N
-1083(Header)X
-849 3851 MXY
- 849 3851 lineto
- 918 3851 lineto
- 918 3920 lineto
- 849 3920 lineto
- 849 3851 lineto
-closepath 14 849 3851 918 3920 Dp
-1756 3194 MXY
- 1756 3194 lineto
- 1895 3194 lineto
- 1895 3471 lineto
- 1756 3471 lineto
- 1756 3194 lineto
-closepath 14 1756 3194 1895 3471 Dp
-2171 3056 MXY
- 2171 3056 lineto
- 2309 3056 lineto
- 2309 3333 lineto
- 2171 3333 lineto
- 2171 3056 lineto
-closepath 14 2171 3056 2309 3333 Dp
-1480 MX
- 1480 3056 lineto
- 1618 3056 lineto
- 1618 3333 lineto
- 1480 3333 lineto
- 1480 3056 lineto
-closepath 14 1480 3056 1618 3333 Dp
-789 MX
- 789 3056 lineto
- 927 3056 lineto
- 927 3333 lineto
- 789 3333 lineto
- 789 3056 lineto
-closepath 14 789 3056 927 3333 Dp
-2780 MY
-0 138 Dl
-138 0 Dl
-0 -138 Dl
--138 0 Dl
-927 MX
-0 138 Dl
-138 0 Dl
-0 -138 Dl
--138 0 Dl
-1065 MX
-0 138 Dl
-138 0 Dl
-0 -138 Dl
--138 0 Dl
-1203 MX
-0 138 Dl
-139 0 Dl
-0 -138 Dl
--139 0 Dl
-1342 MX
-0 138 Dl
-138 0 Dl
-0 -138 Dl
--138 0 Dl
-1480 MX
-0 138 Dl
-138 0 Dl
-0 -138 Dl
--138 0 Dl
-1618 MX
-0 138 Dl
-138 0 Dl
-0 -138 Dl
--138 0 Dl
-1756 MX
-0 138 Dl
-139 0 Dl
-0 -138 Dl
--139 0 Dl
-1895 MX
-0 138 Dl
-138 0 Dl
-0 -138 Dl
--138 0 Dl
-2033 MX
-0 138 Dl
-138 0 Dl
-0 -138 Dl
--138 0 Dl
-2171 MX
-0 138 Dl
-138 0 Dl
-0 -138 Dl
--138 0 Dl
-2309 MX
-0 138 Dl
-139 0 Dl
-0 -138 Dl
--139 0 Dl
-13 s
-1048 2720(In)N
-1173(Memory)X
-1580(Bucket)X
-1918(Array)X
-867 3584(B0)N
-1558(B5)X
-2223(B10)X
-1788 3722(O1/1)N
-5 s
-1515 3903(Primay)N
-1651(Buffer)X
-4 Ds
-1990 3851 MXY
- 1990 3851 lineto
- 2059 3851 lineto
- 2059 3920 lineto
- 1990 3920 lineto
- 1990 3851 lineto
-closepath 3 1990 3851 2059 3920 Dp
-2102 3903(Over\257ow)N
-2270(Buffer)X
-3 Dt
--1 Ds
-8 s
-720 4184(Figure)N
-922(4:)X
-1 f
-996(Three)X
-1164(primary)X
-1386(pages)X
-1551(\(B0,)X
-1683(B5,)X
-1794(B10\))X
-1942(are)X
-2039(accessed)X
-2281(directly)X
-720 4272(from)N
-862(the)X
-958(bucket)X
-1146(array.)X
-1326(The)X
-1443(one)X
-1553(over\257ow)X
-1798(page)X
-1935(\(O1/1\))X
-2122(is)X
-2182(linked)X
-2359(phy-)X
-720 4360(sically)N
-915(from)X
-1067(its)X
-1155(primary)X
-1384(page's)X
-1577(buffer)X
-1759(header)X
-1955(as)X
-2035(well)X
-2172(as)X
-2252(logically)X
-720 4448(from)N
-860(its)X
-937(predecessor)X
-1253(page)X
-1389(buffer)X
-1560(\(B5\).)X
-10 s
-10 f
-720 4624 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-3 f
-1191 4954(Table)N
-1406(Parameterization)X
-1 f
-892 5086(When)N
-1107(a)X
-1166(hash)X
-1336(table)X
-1515(is)X
-1590(created,)X
-1865(the)X
-1985(bucket)X
-2221(size,)X
-2388(\256ll)X
-720 5174(factor,)N
-953(initial)X
-1164(number)X
-1434(of)X
-1526(elements,)X
-1856(number)X
-2125(of)X
-2216(bytes)X
-2409(of)X
-720 5262(main)N
-919(memory)X
-1225(used)X
-1411(for)X
-1543(caching,)X
-1851(and)X
-2005(a)X
-2079(user-de\256ned)X
-720 5350(hash)N
-892(function)X
-1184(may)X
-1347(be)X
-1448(speci\256ed.)X
-1797(The)X
-1946(bucket)X
-2184(size)X
-2333(\(and)X
-720 5438(page)N
-906(size)X
-1064(for)X
-1191(over\257ow)X
-1509(pages\))X
-1752(defaults)X
-2039(to)X
-2134(256)X
-2287(bytes.)X
-720 5526(For)N
-858(tables)X
-1072(with)X
-1241(large)X
-1429(data)X
-1590(items,)X
-1810(it)X
-1881(may)X
-2046(be)X
-2149(preferable)X
-720 5614(to)N
-803(increase)X
-1088(the)X
-1207(page)X
-1380(size,)X
-1545(and,)X
-1701(conversely,)X
-2089(applications)X
-720 5702(storing)N
-1002(small)X
-1235(items)X
-1467(exclusively)X
-1891(in)X
-2012(memory)X
-2338(may)X
-2706 538(bene\256t)N
-2966(from)X
-3164(a)X
-3242(smaller)X
-3520(bucket)X
-3776(size.)X
-3983(A)X
-4082(bucket)X
-4337(size)X
-2706 626(smaller)N
-2962(than)X
-3120(64)X
-3220(bytes)X
-3409(is)X
-3482(not)X
-3604(recommended.)X
-2878 740(The)N
-3031(\256ll)X
-3147(factor)X
-3363(indicates)X
-3676(a)X
-3740(desired)X
-4000(density)X
-4258(within)X
-2706 828(the)N
-2833(hash)X
-3009(table.)X
-3234(It)X
-3312(is)X
-3394(an)X
-3499(approximation)X
-3995(of)X
-4091(the)X
-4217(number)X
-2706 916(of)N
-2815(keys)X
-3004(allowed)X
-3300(to)X
-3404(accumulate)X
-3811(in)X
-3914(any)X
-4071(one)X
-4228(bucket,)X
-2706 1004(determining)N
-3119(when)X
-3319(the)X
-3442(hash)X
-3614(table)X
-3795(grows.)X
-4056(Its)X
-4161(default)X
-4409(is)X
-2706 1092(eight.)N
-2953(If)X
-3054(the)X
-3199(user)X
-3380(knows)X
-3636(the)X
-3781(average)X
-4079(size)X
-4251(of)X
-4364(the)X
-2706 1180(key/data)N
-3008(pairs)X
-3194(being)X
-3402(stored)X
-3627(in)X
-3718(the)X
-3845(table,)X
-4050(near)X
-4218(optimal)X
-2706 1268(bucket)N
-2943(sizes)X
-3122(and)X
-3261(\256ll)X
-3372(factors)X
-3614(may)X
-3775(be)X
-3874(selected)X
-4155(by)X
-4257(apply-)X
-2706 1356(ing)N
-2828(the)X
-2946(equation:)X
-0 f
-8 s
-2706 1655(\(1\))N
-2994 -0.3938(\(\(average_pair_length)AX
-3830(+)X
-3906(4\))X
-4020(*)X
-3032 1743(ffactor\))N
-3374(>=)X
-3488(bsize)X
-1 f
-10 s
-2706 2042(For)N
-2859(highly)X
-3104(time)X
-3287(critical)X
-3551(applications,)X
-3999(experimenting)X
-2706 2130(with)N
-2919(different)X
-3266(bucket)X
-3550(sizes)X
-3776(and)X
-3962(\256ll)X
-4120(factors)X
-4409(is)X
-2706 2218(encouraged.)N
-2878 2332(Figures)N
-3144(5a,b,)X
-3326(and)X
-3468(c)X
-3530(illustrate)X
-3836(the)X
-3960(effects)X
-4200(of)X
-4292(vary-)X
-2706 2420(ing)N
-2841(page)X
-3026(sizes)X
-3215(and)X
-3363(\256ll)X
-3483(factors)X
-3734(for)X
-3860(the)X
-3990(same)X
-4187(data)X
-4353(set.)X
-2706 2508(The)N
-2864(data)X
-3031(set)X
-3152(consisted)X
-3482(of)X
-3581(24474)X
-3813(keys)X
-3992(taken)X
-4198(from)X
-4386(an)X
-2706 2596(online)N
-2931(dictionary.)X
-3301(The)X
-3451(data)X
-3609(value)X
-3807(for)X
-3925(each)X
-4097(key)X
-4237(was)X
-4386(an)X
-2706 2684(ASCII)N
-2938(string)X
-3143(for)X
-3260(an)X
-3359(integer)X
-3605(from)X
-3784(1)X
-3847(to)X
-3931(24474)X
-4153(inclusive.)X
-2706 2772(The)N
-2867(test)X
-3013(run)X
-3155(consisted)X
-3488(of)X
-3590(creating)X
-3884(a)X
-3955(new)X
-4124(hash)X
-4306(table)X
-2706 2860(\(where)N
-2966(the)X
-3100(ultimate)X
-3398(size)X
-3559(of)X
-3662(the)X
-3796(table)X
-3987(was)X
-4147(known)X
-4400(in)X
-2706 2948(advance\),)N
-3054(entering)X
-3354(each)X
-3539(key/data)X
-3848(pair)X
-4010(into)X
-4171(the)X
-4306(table)X
-2706 3036(and)N
-2849(then)X
-3014(retrieving)X
-3353(each)X
-3528(key/data)X
-3827(pair)X
-3979(from)X
-4162(the)X
-4286(table.)X
-2706 3124(Each)N
-2898(of)X
-2996(the)X
-3125(graphs)X
-3369(shows)X
-3599(the)X
-3727(timings)X
-3996(resulting)X
-4306(from)X
-2706 3212(varying)N
-2973(the)X
-3093(pagesize)X
-3392(from)X
-3570(128)X
-3712(bytes)X
-3903(to)X
-3986(1M)X
-4118(and)X
-4255(the)X
-4374(\256ll)X
-2706 3300(factor)N
-2929(from)X
-3120(1)X
-3195(to)X
-3292(128.)X
-3486(For)X
-3631(each)X
-3813(run,)X
-3974(the)X
-4106(buffer)X
-4337(size)X
-2706 3388(was)N
-2874(set)X
-3006(at)X
-3106(1M.)X
-3299(The)X
-3466(tests)X
-3650(were)X
-3849(all)X
-3971(run)X
-4120(on)X
-4242(an)X
-4360(HP)X
-2706 3476(9000/370)N
-3077(\(33.3)X
-3312(Mhz)X
-3527(MC68030\),)X
-3966(with)X
-4176(16M)X
-4395(of)X
-2706 3564(memory,)N
-3042(64K)X
-3228(physically)X
-3605(addressed)X
-3970(cache,)X
-4222(and)X
-4386(an)X
-2706 3652(HP7959S)N
-3055(disk)X
-3231(drive,)X
-3459(running)X
-3751(4.3BSD-Reno)X
-4244(single-)X
-2706 3740(user.)N
-2878 3854(Both)N
-3066(system)X
-3321(time)X
-3496(\(Figure)X
-3764(5a\))X
-3899(and)X
-4047(elapsed)X
-4320(time)X
-2706 3942(\(Figure)N
-2966(5b\))X
-3097(show)X
-3290(that)X
-3434(for)X
-3552(all)X
-3655(bucket)X
-3892(sizes,)X
-4091(the)X
-4212(greatest)X
-2706 4030(performance)N
-3137(gains)X
-3329(are)X
-3451(made)X
-3648(by)X
-3751(increasing)X
-4104(the)X
-4225(\256ll)X
-4336(fac-)X
-2706 4118(tor)N
-2822(until)X
-2995(equation)X
-3298(1)X
-3365(is)X
-3445(satis\256ed.)X
-3774(The)X
-3925(user)X
-4085(time)X
-4253(shown)X
-2706 4206(in)N
-2791(Figure)X
-3023(5c)X
-3122(gives)X
-3314(a)X
-3373(more)X
-3561(detailed)X
-3838(picture)X
-4083(of)X
-4172(how)X
-4332(per-)X
-2706 4294(formance)N
-3054(varies.)X
-3330(The)X
-3499(smaller)X
-3778(bucket)X
-4035(sizes)X
-4234(require)X
-2706 4382(fewer)N
-2921(keys)X
-3099(per)X
-3233(page)X
-3416(to)X
-3509(satisfy)X
-3749(equation)X
-4056(1)X
-4127(and)X
-4274(there-)X
-2706 4470(fore)N
-2860(incur)X
-3049(fewer)X
-3257(collisions.)X
-3607(However,)X
-3946(when)X
-4144(the)X
-4265(buffer)X
-2706 4558(pool)N
-2884(size)X
-3045(is)X
-3134(\256xed,)X
-3349(smaller)X
-3620(pages)X
-3838(imply)X
-4059(more)X
-4259(pages.)X
-2706 4646(An)N
-2830(increased)X
-3160(number)X
-3430(of)X
-3522(pages)X
-3730(means)X
-3960(more)X
-2 f
-4150(malloc\(3\))X
-1 f
-2706 4734(calls)N
-2879(and)X
-3021(more)X
-3212(overhead)X
-3533(in)X
-3621(the)X
-3745(hash)X
-3918(package's)X
-4265(buffer)X
-2706 4822(manager)N
-3003(to)X
-3085(manage)X
-3355(the)X
-3473(additional)X
-3813(pages.)X
-2878 4936(The)N
-3028(tradeoff)X
-3308(works)X
-3529(out)X
-3655(most)X
-3834(favorably)X
-4166(when)X
-4364(the)X
-2706 5024(page)N
-2886(size)X
-3039(is)X
-3120(256)X
-3268(and)X
-3412(the)X
-3538(\256ll)X
-3654(factor)X
-3870(is)X
-3950(8.)X
-4057(Similar)X
-4319(con-)X
-2706 5112(clusions)N
-3009(were)X
-3207(obtained)X
-3524(if)X
-3614(the)X
-3753(test)X
-3905(was)X
-4071(run)X
-4218(without)X
-2706 5200(knowing)N
-3007(the)X
-3126(\256nal)X
-3289(table)X
-3466(size)X
-3612(in)X
-3695(advance.)X
-4020(If)X
-4095(the)X
-4214(\256le)X
-4337(was)X
-2706 5288(closed)N
-2942(and)X
-3088(written)X
-3345(to)X
-3437(disk,)X
-3620(the)X
-3748(conclusions)X
-4156(were)X
-4343(still)X
-2706 5376(the)N
-2832(same.)X
-3065(However,)X
-3408(rereading)X
-3740(the)X
-3865(\256le)X
-3994(from)X
-4177(disk)X
-4337(was)X
-2706 5464(slightly)N
-2983(faster)X
-3199(if)X
-3285(a)X
-3358(larger)X
-3583(bucket)X
-3834(size)X
-3996(and)X
-4149(\256ll)X
-4274(factor)X
-2706 5552(were)N
-2898(used)X
-3079(\(1K)X
-3238(bucket)X
-3486(size)X
-3645(and)X
-3795(32)X
-3909(\256ll)X
-4031(factor\).)X
-4320(This)X
-2706 5640(follows)N
-2987(intuitively)X
-3356(from)X
-3553(the)X
-3691(improved)X
-4038(ef\256ciency)X
-4395(of)X
-3 f
-720 5960(USENIX)N
-9 f
-1042(-)X
-3 f
-1106(Winter)X
-1371('91)X
-9 f
-1498(-)X
-3 f
-1562(Dallas,)X
-1815(TX)X
-4424(7)X
-
-8 p
-%%Page: 8 8
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-432 258(A)N
-510(New)X
-682(Hashing)X
-985(Package)X
-1290(for)X
-1413(UNIX)X
-3663(Seltzer)X
-3920(&)X
-4007(Yigit)X
-1 f
-432 538(performing)N
-830(1K)X
-965(reads)X
-1172(from)X
-1365(the)X
-1500(disk)X
-1670(rather)X
-1894(than)X
-2068(256)X
-432 626(byte)N
-609(reads.)X
-857(In)X
-962(general,)X
-1257(performance)X
-1702(for)X
-1834(disk)X
-2005(based)X
-432 714(tables)N
-639(is)X
-712(best)X
-861(when)X
-1055(the)X
-1173(page)X
-1345(size)X
-1490(is)X
-1563(approximately)X
-2046(1K.)X
-10 f
-432 802 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-619 2380 MXY
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-629 2437 MXY
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-648 2504 MXY
--12 25 Dl
-24 0 Dl
--12 -25 Dl
-686 2515 MXY
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-762 2516 MXY
--12 24 Dl
-25 0 Dl
--13 -24 Dl
-916 2515 MXY
--13 24 Dl
-25 0 Dl
--12 -24 Dl
-1222 2516 MXY
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-1834 2515 MXY
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-1 Dt
-619 2392 MXY
-10 57 Dl
-19 67 Dl
-38 11 Dl
-76 1 Dl
-154 -1 Dl
-306 1 Dl
-612 -1 Dl
-8 s
-1 f
-1628 2522(128)N
-3 Dt
-607 2245 MXY
-24 Dc
-617 2375 MXY
-23 Dc
-635 2442 MXY
-24 Dc
-674 2525 MXY
-23 Dc
-750 2529 MXY
-24 Dc
-904 2527 MXY
-23 Dc
-1210 MX
-23 Dc
-1822 2528 MXY
-23 Dc
-20 Ds
-1 Dt
-619 2245 MXY
-10 130 Dl
-19 67 Dl
-38 83 Dl
-76 4 Dl
-154 -2 Dl
-306 0 Dl
-612 1 Dl
-678 2482(256)N
--1 Ds
-3 Dt
-619 2127 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-629 2191 MXY
-0 25 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-648 2334 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-686 2409 MXY
-0 25 Dl
-0 -13 Dl
-12 0 Dl
--24 0 Dl
-762 2516 MXY
-0 25 Dl
-0 -12 Dl
-13 0 Dl
--25 0 Dl
-916 2516 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--25 0 Dl
-1222 2515 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-1834 2515 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-5 Dt
-619 2139 MXY
-10 65 Dl
-19 142 Dl
-38 75 Dl
-76 108 Dl
-154 -1 Dl
-306 -1 Dl
-612 0 Dl
-694 2401(512)N
-3 Dt
-631 2064 MXY
--24 24 Dl
-12 -12 Dl
--12 -12 Dl
-24 24 Dl
-641 2077 MXY
--24 25 Dl
-12 -12 Dl
--12 -13 Dl
-24 25 Dl
-660 2132 MXY
--24 24 Dl
-12 -12 Dl
--12 -12 Dl
-24 24 Dl
-698 2292 MXY
--24 24 Dl
-12 -12 Dl
--12 -12 Dl
-24 24 Dl
-775 2382 MXY
--25 24 Dl
-12 -12 Dl
--12 -12 Dl
-25 24 Dl
-928 2516 MXY
--25 24 Dl
-13 -12 Dl
--13 -12 Dl
-25 24 Dl
-1234 2516 MXY
--24 25 Dl
-12 -12 Dl
--12 -13 Dl
-24 25 Dl
-1846 2516 MXY
--24 24 Dl
-12 -12 Dl
--12 -12 Dl
-24 24 Dl
-16 Ds
-1 Dt
-619 2076 MXY
-10 14 Dl
-19 54 Dl
-38 160 Dl
-76 90 Dl
-154 134 Dl
-306 1 Dl
-612 -1 Dl
-694 2257(1024)N
--1 Ds
-3 Dt
-619 1877 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-629 1855 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-648 1838 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-686 1860 MXY
-12 -25 Dl
--24 0 Dl
-12 25 Dl
-762 1923 MXY
-13 -24 Dl
--25 0 Dl
-12 24 Dl
-916 2087 MXY
-12 -24 Dl
--25 0 Dl
-13 24 Dl
-1222 2256 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-1834 2541 MXY
-12 -25 Dl
--24 0 Dl
-12 25 Dl
-619 1865 MXY
-10 -22 Dl
-19 -17 Dl
-38 21 Dl
-76 64 Dl
-154 164 Dl
-306 169 Dl
-612 285 Dl
-1645 2427(4096)N
-619 1243 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-629 1196 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-648 1146 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-686 1174 MXY
-0 25 Dl
-0 -13 Dl
-12 0 Dl
--24 0 Dl
-762 1249 MXY
-0 24 Dl
-0 -12 Dl
-13 0 Dl
--25 0 Dl
-916 1371 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--25 0 Dl
-1222 1680 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-1834 1999 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-619 1255 MXY
-10 -47 Dl
-19 -50 Dl
-38 28 Dl
-76 75 Dl
-154 122 Dl
-306 309 Dl
-612 319 Dl
-1741 1934(8192)N
-5 Dt
-609 2531 MXY
-1225 0 Dl
-609 MX
-0 -1553 Dl
-2531 MY
-0 16 Dl
-4 Ds
-1 Dt
-2531 MY
-0 -1553 Dl
-593 2625(0)N
--1 Ds
-5 Dt
-916 2531 MXY
-0 16 Dl
-4 Ds
-1 Dt
-2531 MY
-0 -1553 Dl
-884 2625(32)N
--1 Ds
-5 Dt
-1222 2531 MXY
-0 16 Dl
-4 Ds
-1 Dt
-2531 MY
-0 -1553 Dl
-1190 2625(64)N
--1 Ds
-5 Dt
-1528 2531 MXY
-0 16 Dl
-4 Ds
-1 Dt
-2531 MY
-0 -1553 Dl
-1496 2625(96)N
--1 Ds
-5 Dt
-1834 2531 MXY
-0 16 Dl
-4 Ds
-1 Dt
-2531 MY
-0 -1553 Dl
-1786 2625(128)N
--1 Ds
-5 Dt
-609 2531 MXY
--16 0 Dl
-4 Ds
-1 Dt
-609 MX
-1225 0 Dl
-545 2558(0)N
--1 Ds
-5 Dt
-609 2013 MXY
--16 0 Dl
-4 Ds
-1 Dt
-609 MX
-1225 0 Dl
-481 2040(100)N
--1 Ds
-5 Dt
-609 1496 MXY
--16 0 Dl
-4 Ds
-1 Dt
-609 MX
-1225 0 Dl
-481 1523(200)N
--1 Ds
-5 Dt
-609 978 MXY
--16 0 Dl
-4 Ds
-1 Dt
-609 MX
-1225 0 Dl
-481 1005(300)N
-1088 2724(Fill)N
-1194(Factor)X
-422 1611(S)N
-426 1667(e)N
-426 1724(c)N
-424 1780(o)N
-424 1837(n)N
-424 1893(d)N
-428 1949(s)N
-3 Dt
--1 Ds
-3 f
-432 2882(Figure)N
-636(5a:)X
-1 f
-744(System)X
-956(Time)X
-1113(for)X
-1209(dictionary)X
-1490(data)X
-1618(set)X
-1711(with)X
-1847(1M)X
-1958(of)X
-2033(buffer)X
-432 2970(space)N
-594(and)X
-707(varying)X
-923(bucket)X
-1114(sizes)X
-1259(and)X
-1372(\256ll)X
-1465(factors.)X
-1675(Each)X
-1823(line)X
-1940(is)X
-2004(labeled)X
-432 3058(with)N
-562(its)X
-639(bucket)X
-825(size.)X
-10 s
-10 f
-432 3234 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-8 s
-1 f
-428 4381(s)N
-424 4325(d)N
-424 4269(n)N
-424 4212(o)N
-426 4156(c)N
-426 4099(e)N
-422 4043(S)N
-1116 5156(Fill)N
-1222(Factor)X
-506 3437(3200)N
-4 Ds
-1 Dt
-666 3410 MXY
-1168 0 Dl
--1 Ds
-5 Dt
-666 MX
--16 0 Dl
-506 3825(2400)N
-4 Ds
-1 Dt
-666 3799 MXY
-1168 0 Dl
--1 Ds
-5 Dt
-666 MX
--16 0 Dl
-506 4214(1600)N
-4 Ds
-1 Dt
-666 4186 MXY
-1168 0 Dl
--1 Ds
-5 Dt
-666 MX
--16 0 Dl
-538 4602(800)N
-4 Ds
-1 Dt
-666 4575 MXY
-1168 0 Dl
--1 Ds
-5 Dt
-666 MX
--16 0 Dl
-602 4990(0)N
-4 Ds
-1 Dt
-666 4963 MXY
-1168 0 Dl
--1 Ds
-5 Dt
-666 MX
--16 0 Dl
-1786 5057(128)N
-4 Ds
-1 Dt
-1834 4963 MXY
-0 -1553 Dl
--1 Ds
-5 Dt
-4963 MY
-0 16 Dl
-1510 5057(96)N
-4 Ds
-1 Dt
-1542 4963 MXY
-0 -1553 Dl
--1 Ds
-5 Dt
-4963 MY
-0 16 Dl
-1218 5057(64)N
-4 Ds
-1 Dt
-1250 4963 MXY
-0 -1553 Dl
--1 Ds
-5 Dt
-4963 MY
-0 16 Dl
-926 5057(32)N
-4 Ds
-1 Dt
-958 4963 MXY
-0 -1553 Dl
--1 Ds
-5 Dt
-4963 MY
-0 16 Dl
-650 5057(0)N
-4 Ds
-1 Dt
-666 4963 MXY
-0 -1553 Dl
--1 Ds
-5 Dt
-4963 MY
-0 16 Dl
-4963 MY
-0 -1553 Dl
-4963 MY
-1168 0 Dl
-1741 4752(8192)N
-3 Dt
-675 3732 MXY
-9 -172 Dl
-18 -118 Dl
-37 128 Dl
-73 -121 Dl
-146 623 Dl
-292 497 Dl
-584 245 Dl
-4802 MY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-1250 4557 MXY
-0 25 Dl
-0 -13 Dl
-12 0 Dl
--24 0 Dl
-958 4060 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-812 3437 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-739 3558 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-702 3430 MXY
-0 25 Dl
-0 -13 Dl
-13 0 Dl
--25 0 Dl
-684 3548 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-675 3720 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-1637 4912(4096)N
-675 4307 MXY
-9 -58 Dl
-18 30 Dl
-37 89 Dl
-73 144 Dl
-146 235 Dl
-292 122 Dl
-584 89 Dl
-4970 MY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-1250 4881 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-958 4759 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-812 4524 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-739 4380 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-702 4291 MXY
-13 -24 Dl
--25 0 Dl
-12 24 Dl
-684 4261 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-675 4319 MXY
-12 -24 Dl
--24 0 Dl
-12 24 Dl
-734 4662(1024)N
-16 Ds
-1 Dt
-675 4352 MXY
-9 60 Dl
-18 134 Dl
-37 266 Dl
-73 117 Dl
-146 30 Dl
-292 0 Dl
-584 -1 Dl
--1 Ds
-3 Dt
-1846 4946 MXY
--24 24 Dl
-12 -12 Dl
--12 -12 Dl
-24 24 Dl
-1262 4946 MXY
--24 25 Dl
-12 -12 Dl
--12 -13 Dl
-24 25 Dl
-970 4947 MXY
--24 24 Dl
-12 -12 Dl
--12 -12 Dl
-24 24 Dl
-824 4917 MXY
--24 24 Dl
-12 -12 Dl
--12 -12 Dl
-24 24 Dl
-751 4800 MXY
--24 24 Dl
-12 -12 Dl
--12 -12 Dl
-24 24 Dl
-715 4534 MXY
--25 25 Dl
-12 -13 Dl
--12 -12 Dl
-25 25 Dl
-696 4400 MXY
--24 24 Dl
-12 -12 Dl
--12 -12 Dl
-24 24 Dl
-687 4339 MXY
--24 25 Dl
-12 -12 Dl
--12 -13 Dl
-24 25 Dl
-718 4792(512)N
-5 Dt
-675 4422 MXY
-9 137 Dl
-18 278 Dl
-37 105 Dl
-73 18 Dl
-146 -1 Dl
-292 0 Dl
-584 -1 Dl
-3 Dt
-4946 MY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-1250 4946 MXY
-0 25 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-958 4947 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-812 4948 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-739 4930 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-702 4824 MXY
-0 25 Dl
-0 -12 Dl
-13 0 Dl
--25 0 Dl
-684 4547 MXY
-0 24 Dl
-0 -12 Dl
-12 0 Dl
--24 0 Dl
-675 4410 MXY
-0 25 Dl
-0 -13 Dl
-12 0 Dl
--24 0 Dl
-750 4921(256)N
-20 Ds
-1 Dt
-675 4597 MXY
-9 246 Dl
-18 106 Dl
-37 10 Dl
-73 0 Dl
-146 0 Dl
-292 0 Dl
-584 -1 Dl
--1 Ds
-3 Dt
-1822 MX
-23 Dc
-1238 4959 MXY
-23 Dc
-946 MX
-23 Dc
-800 MX
-23 Dc
-727 MX
-23 Dc
-691 4949 MXY
-23 Dc
-672 4843 MXY
-24 Dc
-663 4597 MXY
-24 Dc
-1395 4961(128)N
-1 Dt
-675 4855 MXY
-9 93 Dl
-18 10 Dl
-37 1 Dl
-73 0 Dl
-146 -1 Dl
-292 0 Dl
-584 0 Dl
-3 Dt
-4946 MY
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-1250 MX
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-958 MX
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-812 MX
--12 25 Dl
-24 0 Dl
--12 -25 Dl
-739 4947 MXY
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-702 4946 MXY
--12 24 Dl
-25 0 Dl
--13 -24 Dl
-684 4936 MXY
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-675 4843 MXY
--12 24 Dl
-24 0 Dl
--12 -24 Dl
-3 Dt
--1 Ds
-3 f
-432 5314(Figure)N
-634(5b:)X
-1 f
-744(Elapsed)X
-967(Time)X
-1123(for)X
-1218(dictionary)X
-1498(data)X
-1625(set)X
-1717(with)X
-1851(1M)X
-1960(of)X
-2033(buffer)X
-432 5402(space)N
-593(and)X
-705(varying)X
-920(bucket)X
-1110(sizes)X
-1254(and)X
-1366(\256ll)X
-1457(factors.)X
-1681(Each)X
-1827(line)X
-1942(is)X
-2004(labeled)X
-432 5490(with)N
-562(its)X
-639(bucket)X
-825(size.)X
-10 s
-2590 538(If)N
-2677(an)X
-2785(approximation)X
-3284(of)X
-3383(the)X
-3513(number)X
-3790(of)X
-3889(elements)X
-2418 626(ultimately)N
-2773(to)X
-2866(be)X
-2973(stored)X
-3200(in)X
-3293(the)X
-3422(hash)X
-3599(table)X
-3785(is)X
-3868(known)X
-4116(at)X
-2418 714(the)N
-2564(time)X
-2754(of)X
-2869(creation,)X
-3196(the)X
-3342(hash)X
-3536(package)X
-3847(takes)X
-4059(this)X
-2418 802(number)N
-2688(as)X
-2779(a)X
-2839(parameter)X
-3185(and)X
-3325(uses)X
-3487(it)X
-3555(to)X
-3641(hash)X
-3812(entries)X
-4050(into)X
-2418 890(the)N
-2541(full)X
-2677(sized)X
-2867(table)X
-3048(rather)X
-3261(than)X
-3424(growing)X
-3716(the)X
-3838(table)X
-4018(from)X
-2418 978(a)N
-2477(single)X
-2691(bucket.)X
-2968(If)X
-3044(this)X
-3181(number)X
-3448(is)X
-3523(not)X
-3647(known,)X
-3907(the)X
-4027(hash)X
-2418 1066(table)N
-2632(starts)X
-2859(with)X
-3059(a)X
-3153(single)X
-3402(bucket)X
-3674(and)X
-3848(gracefully)X
-2418 1154(expands)N
-2707(as)X
-2800(elements)X
-3111(are)X
-3236(added,)X
-3474(although)X
-3780(a)X
-3842(slight)X
-4044(per-)X
-2418 1242(formance)N
-2747(degradation)X
-3151(may)X
-3313(be)X
-3413(noticed.)X
-3713(Figure)X
-3946(6)X
-4010(illus-)X
-2418 1330(trates)N
-2625(the)X
-2756(difference)X
-3116(in)X
-3211(performance)X
-3651(between)X
-3952(storing)X
-2418 1418(keys)N
-2588(in)X
-2673(a)X
-2732(\256le)X
-2857(when)X
-3054(the)X
-3174(ultimate)X
-3458(size)X
-3605(is)X
-3680(known)X
-3920(\(the)X
-4067(left)X
-2418 1506(bars)N
-2581(in)X
-2672(each)X
-2849(set\),)X
-3014(compared)X
-3360(to)X
-3450(building)X
-3744(the)X
-3870(\256le)X
-4000(when)X
-2418 1594(the)N
-2550(ultimate)X
-2846(size)X
-3005(is)X
-3091(unknown)X
-3422(\(the)X
-3580(right)X
-3764(bars)X
-3931(in)X
-4026(each)X
-2418 1682(set\).)N
-2609(Once)X
-2814(the)X
-2947(\256ll)X
-3069(factor)X
-3291(is)X
-3378(suf\256ciently)X
-3772(high)X
-3948(for)X
-4076(the)X
-2418 1770(page)N
-2596(size)X
-2747(\(8\),)X
-2887(growing)X
-3180(the)X
-3304(table)X
-3486(dynamically)X
-3908(does)X
-4081(lit-)X
-2418 1858(tle)N
-2518(to)X
-2600(degrade)X
-2875(performance.)X
-10 f
-2418 1946 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-9 s
-1 f
-2413 3238(s)N
-2409 3173(d)N
-2409 3108(n)N
-2409 3043(o)N
-2411 2979(c)N
-2411 2914(e)N
-2407 2849(S)N
-3143 4129(Fill)N
-3261(Factor)X
-2448 2152(15)N
-4 Ds
-1 Dt
-2557 2122 MXY
-1473 0 Dl
--1 Ds
-5 Dt
-2557 MX
--19 0 Dl
-2448 2747(10)N
-4 Ds
-1 Dt
-2557 2717 MXY
-1473 0 Dl
--1 Ds
-5 Dt
-2557 MX
--19 0 Dl
-2484 3343(5)N
-4 Ds
-1 Dt
-2557 3313 MXY
-1473 0 Dl
--1 Ds
-5 Dt
-2557 MX
--19 0 Dl
-2484 3938(0)N
-4 Ds
-1 Dt
-2557 3908 MXY
-1473 0 Dl
--1 Ds
-5 Dt
-2557 MX
--19 0 Dl
-3976 4015(128)N
-4 Ds
-1 Dt
-4030 3908 MXY
-0 -1786 Dl
--1 Ds
-5 Dt
-3908 MY
-0 19 Dl
-3626 4015(96)N
-4 Ds
-1 Dt
-3662 3908 MXY
-0 -1786 Dl
--1 Ds
-5 Dt
-3908 MY
-0 19 Dl
-3258 4015(64)N
-4 Ds
-1 Dt
-3294 3908 MXY
-0 -1786 Dl
--1 Ds
-5 Dt
-3908 MY
-0 19 Dl
-2889 4015(32)N
-4 Ds
-1 Dt
-2925 3908 MXY
-0 -1786 Dl
--1 Ds
-5 Dt
-3908 MY
-0 19 Dl
-2539 4015(0)N
-4 Ds
-1 Dt
-2557 3908 MXY
-0 -1786 Dl
--1 Ds
-5 Dt
-3908 MY
-0 19 Dl
-3908 MY
-0 -1786 Dl
-3908 MY
-1473 0 Dl
-4053 2378(8192)N
-3 Dt
-2569 2277 MXY
-11 0 Dl
-23 48 Dl
-46 -167 Dl
-92 35 Dl
-184 12 Dl
-369 143 Dl
-736 0 Dl
-2334 MY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-3294 2334 MXY
-0 28 Dl
-0 -14 Dl
-13 0 Dl
--27 0 Dl
-2925 2192 MXY
-0 27 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2741 2180 MXY
-0 27 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2649 2144 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2603 2311 MXY
-0 27 Dl
-0 -13 Dl
-14 0 Dl
--28 0 Dl
-2580 2263 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2569 2263 MXY
-0 28 Dl
-0 -14 Dl
-13 0 Dl
--27 0 Dl
-4053 2591(4096)N
-2569 2348 MXY
-11 -11 Dl
-23 -96 Dl
-46 71 Dl
-92 72 Dl
-184 226 Dl
-369 48 Dl
-736 -60 Dl
-2612 MY
-14 -28 Dl
--28 0 Dl
-14 28 Dl
-3294 2672 MXY
-13 -28 Dl
--27 0 Dl
-14 28 Dl
-2925 2624 MXY
-14 -28 Dl
--28 0 Dl
-14 28 Dl
-2741 2398 MXY
-14 -28 Dl
--28 0 Dl
-14 28 Dl
-2649 2326 MXY
-14 -27 Dl
--28 0 Dl
-14 27 Dl
-2603 2255 MXY
-14 -28 Dl
--28 0 Dl
-14 28 Dl
-2580 2350 MXY
-14 -27 Dl
--28 0 Dl
-14 27 Dl
-2569 2362 MXY
-13 -28 Dl
--27 0 Dl
-14 28 Dl
-4053 2681(1024)N
-16 Ds
-1 Dt
-2569 2300 MXY
-11 48 Dl
-23 96 Dl
-46 95 Dl
-92 274 Dl
-184 202 Dl
-369 -155 Dl
-736 -190 Dl
--1 Ds
-3 Dt
-4044 2656 MXY
--28 28 Dl
-14 -14 Dl
--14 -14 Dl
-28 28 Dl
-3307 2846 MXY
--27 28 Dl
-14 -14 Dl
--14 -14 Dl
-27 28 Dl
-2939 3001 MXY
--28 28 Dl
-14 -14 Dl
--14 -14 Dl
-28 28 Dl
-2755 2799 MXY
--28 28 Dl
-14 -14 Dl
--14 -14 Dl
-28 28 Dl
-2663 2525 MXY
--28 28 Dl
-14 -14 Dl
--14 -14 Dl
-28 28 Dl
-2617 2430 MXY
--28 28 Dl
-14 -14 Dl
--14 -14 Dl
-28 28 Dl
-2594 2334 MXY
--28 28 Dl
-14 -14 Dl
--14 -14 Dl
-28 28 Dl
-2582 2287 MXY
--27 27 Dl
-14 -14 Dl
--14 -13 Dl
-27 27 Dl
-4053 2851(512)N
-5 Dt
-2569 2372 MXY
-11 -24 Dl
-23 405 Dl
-46 83 Dl
-92 227 Dl
-184 -72 Dl
-369 -119 Dl
-736 -107 Dl
-3 Dt
-2751 MY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-3294 2858 MXY
-0 28 Dl
-0 -14 Dl
-13 0 Dl
--27 0 Dl
-2925 2977 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2741 3049 MXY
-0 27 Dl
-0 -13 Dl
-14 0 Dl
--28 0 Dl
-2649 2823 MXY
-0 27 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2603 2739 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2580 2334 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2569 2358 MXY
-0 28 Dl
-0 -14 Dl
-13 0 Dl
--27 0 Dl
-4053 2795(256)N
-20 Ds
-1 Dt
-2569 2456 MXY
-11 285 Dl
-23 95 Dl
-46 251 Dl
-92 -60 Dl
-184 -84 Dl
-369 -107 Dl
-736 -71 Dl
--1 Ds
-3 Dt
-4016 MX
-27 Dc
-3280 2836 MXY
-27 Dc
-2912 2943 MXY
-27 Dc
-2728 3027 MXY
-27 Dc
-2635 3087 MXY
-28 Dc
-2589 2836 MXY
-28 Dc
-2566 2741 MXY
-27 Dc
-2554 2456 MXY
-28 Dc
-4053 2741(128)N
-1 Dt
-2569 2729 MXY
-11 203 Dl
-23 131 Dl
-46 -60 Dl
-92 -119 Dl
-184 -60 Dl
-369 -83 Dl
-736 -12 Dl
-3 Dt
-2716 MY
--14 27 Dl
-28 0 Dl
--14 -27 Dl
-3294 2727 MXY
--14 28 Dl
-27 0 Dl
--13 -28 Dl
-2925 2811 MXY
--14 27 Dl
-28 0 Dl
--14 -27 Dl
-2741 2870 MXY
--14 28 Dl
-28 0 Dl
--14 -28 Dl
-2649 2989 MXY
--14 28 Dl
-28 0 Dl
--14 -28 Dl
-2603 3049 MXY
--14 27 Dl
-28 0 Dl
--14 -27 Dl
-2580 2918 MXY
--14 28 Dl
-28 0 Dl
--14 -28 Dl
-2569 2716 MXY
--14 27 Dl
-27 0 Dl
--13 -27 Dl
-3 Dt
--1 Ds
-3 f
-8 s
-2418 4286(Figure)N
-2628(5c:)X
-1 f
-2738(User)X
-2887(Time)X
-3051(for)X
-3154(dictionary)X
-3442(data)X
-3577(set)X
-3677(with)X
-3820(1M)X
-3938(of)X
-4019(buffer)X
-2418 4374(space)N
-2579(and)X
-2691(varying)X
-2906(bucket)X
-3096(sizes)X
-3240(and)X
-3352(\256ll)X
-3443(factors.)X
-3667(Each)X
-3813(line)X
-3928(is)X
-3990(labeled)X
-2418 4462(with)N
-2548(its)X
-2625(bucket)X
-2811(size.)X
-10 s
-10 f
-2418 4638 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-1 f
-2590 4840(Since)N
-2796(no)X
-2904(known)X
-3150(hash)X
-3325(function)X
-3620(performs)X
-3938(equally)X
-2418 4928(well)N
-2589(on)X
-2702(all)X
-2815(possible)X
-3110(data,)X
-3297(the)X
-3428(user)X
-3595(may)X
-3766(\256nd)X
-3923(that)X
-4076(the)X
-2418 5016(built-in)N
-2678(hash)X
-2849(function)X
-3140(does)X
-3311(poorly)X
-3544(on)X
-3648(a)X
-3708(particular)X
-4040(data)X
-2418 5104(set.)N
-2548(In)X
-2636(this)X
-2771(case,)X
-2950(a)X
-3006(hash)X
-3173(function,)X
-3480(taking)X
-3700(two)X
-3840(arguments)X
-2418 5192(\(a)N
-2507(pointer)X
-2760(to)X
-2848(a)X
-2910(byte)X
-3074(string)X
-3282(and)X
-3424(a)X
-3486(length\))X
-3739(and)X
-3880(returning)X
-2418 5280(an)N
-2517(unsigned)X
-2829(long)X
-2993(to)X
-3077(be)X
-3175(used)X
-3344(as)X
-3433(the)X
-3553(hash)X
-3722(value,)X
-3938(may)X
-4098(be)X
-2418 5368(speci\256ed)N
-2731(at)X
-2817(hash)X
-2992(table)X
-3176(creation)X
-3463(time.)X
-3673(When)X
-3893(an)X
-3996(exist-)X
-2418 5456(ing)N
-2570(hash)X
-2767(table)X
-2973(is)X
-3076(opened)X
-3358(and)X
-3524(a)X
-3609(hash)X
-3805(function)X
-4121(is)X
-2418 5544(speci\256ed,)N
-2752(the)X
-2879(hash)X
-3054(package)X
-3346(will)X
-3498(try)X
-3615(to)X
-3705(determine)X
-4054(that)X
-2418 5632(the)N
-2546(hash)X
-2723(function)X
-3020(supplied)X
-3321(is)X
-3404(the)X
-3532(one)X
-3678(with)X
-3850(which)X
-4076(the)X
-2418 5720(table)N
-2630(was)X
-2811(created.)X
-3139(There)X
-3382(are)X
-3536(a)X
-3627(variety)X
-3905(of)X
-4027(hash)X
-3 f
-432 5960(8)N
-2970(USENIX)X
-9 f
-3292(-)X
-3 f
-3356(Winter)X
-3621('91)X
-9 f
-3748(-)X
-3 f
-3812(Dallas,)X
-4065(TX)X
-
-9 p
-%%Page: 9 9
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-720 258(Seltzer)N
-977(&)X
-1064(Yigit)X
-3278(A)X
-3356(New)X
-3528(Hashing)X
-3831(Package)X
-4136(for)X
-4259(UNIX)X
-1 f
-720 538(functions)N
-1065(provided)X
-1397(with)X
-1586(the)X
-1731(package.)X
-2082(The)X
-2253(default)X
-720 626(function)N
-1014(for)X
-1135(the)X
-1260(package)X
-1551(is)X
-1631(the)X
-1755(one)X
-1897(which)X
-2119(offered)X
-2378(the)X
-720 714(best)N
-875(performance)X
-1308(in)X
-1396(terms)X
-1600(of)X
-1693(cycles)X
-1920(executed)X
-2232(per)X
-2360(call)X
-720 802(\(it)N
-827(did)X
-965(not)X
-1103(produce)X
-1398(the)X
-1531(fewest)X
-1776(collisions)X
-2117(although)X
-2432(it)X
-720 890(was)N
-866(within)X
-1091(a)X
-1148(small)X
-1341(percentage)X
-1710(of)X
-1797(the)X
-1915(function)X
-2202(that)X
-2342(pro-)X
-720 978(duced)N
-947(the)X
-1080(fewest)X
-1324(collisions\).)X
-1731(Again,)X
-1981(in)X
-2077(time)X
-2253(critical)X
-720 1066(applications,)N
-1152(users)X
-1342(are)X
-1466(encouraged)X
-1862(to)X
-1949(experiment)X
-2334(with)X
-720 1154(a)N
-783(variety)X
-1032(of)X
-1125(hash)X
-1298(functions)X
-1622(to)X
-1710(achieve)X
-1982(optimal)X
-2252(perfor-)X
-720 1242(mance.)N
-10 f
-720 1330 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-3 f
-7 s
-1038 2925(Full)N
-1149(size)X
-1251(table)X
-1384(\(left\))X
-1547 2718(Fill)N
-1643(Factor)X
-2268 2662(64)N
-1964(32)X
-1674(16)X
-1384(8)X
-1093(4)X
-4 Ds
-1 Dt
-900 2280 MXY
-1548 0 Dl
-900 1879 MXY
-1548 0 Dl
-900 1506 MXY
-1548 0 Dl
-1563 2902 MXY
-111 0 Dl
--1 Ds
-900 MX
-110 0 Dl
-1425 2828(System)N
-983(User)X
-1895 2778 MXY
- 1895 2778 lineto
- 1950 2778 lineto
- 1950 2833 lineto
- 1895 2833 lineto
- 1895 2778 lineto
-closepath 21 1895 2778 1950 2833 Dp
-1342 MX
- 1342 2778 lineto
- 1397 2778 lineto
- 1397 2833 lineto
- 1342 2833 lineto
- 1342 2778 lineto
-closepath 14 1342 2778 1397 2833 Dp
-900 MX
- 900 2778 lineto
- 955 2778 lineto
- 955 2833 lineto
- 900 2833 lineto
- 900 2778 lineto
-closepath 3 900 2778 955 2833 Dp
-5 Dt
-2283 2211 MXY
-96 0 Dl
-1992 MX
-97 0 Dl
-1702 MX
-97 0 Dl
-1411 2252 MXY
-97 0 Dl
-4 Ds
-1 Dt
-2283 2211 MXY
- 2283 2211 lineto
- 2379 2211 lineto
- 2379 2252 lineto
- 2283 2252 lineto
- 2283 2211 lineto
-closepath 14 2283 2211 2379 2252 Dp
-1992 MX
- 1992 2211 lineto
- 2089 2211 lineto
- 2089 2252 lineto
- 1992 2252 lineto
- 1992 2211 lineto
-closepath 14 1992 2211 2089 2252 Dp
-1702 MX
- 1702 2211 lineto
- 1799 2211 lineto
- 1799 2252 lineto
- 1702 2252 lineto
- 1702 2211 lineto
-closepath 14 1702 2211 1799 2252 Dp
-1411 2252 MXY
- 1411 2252 lineto
- 1508 2252 lineto
- 1508 2294 lineto
- 1411 2294 lineto
- 1411 2252 lineto
-closepath 14 1411 2252 1508 2294 Dp
-2283 MX
- 2283 2252 lineto
- 2379 2252 lineto
- 2379 2612 lineto
- 2283 2612 lineto
- 2283 2252 lineto
-closepath 3 2283 2252 2379 2612 Dp
-1992 MX
- 1992 2252 lineto
- 2089 2252 lineto
- 2089 2612 lineto
- 1992 2612 lineto
- 1992 2252 lineto
-closepath 3 1992 2252 2089 2612 Dp
-1702 MX
- 1702 2252 lineto
- 1799 2252 lineto
- 1799 2612 lineto
- 1702 2612 lineto
- 1702 2252 lineto
-closepath 3 1702 2252 1799 2612 Dp
-1411 2294 MXY
- 1411 2294 lineto
- 1508 2294 lineto
- 1508 2612 lineto
- 1411 2612 lineto
- 1411 2294 lineto
-closepath 3 1411 2294 1508 2612 Dp
--1 Ds
-2158 2238 MXY
- 2158 2238 lineto
- 2255 2238 lineto
- 2255 2252 lineto
- 2158 2252 lineto
- 2158 2238 lineto
-closepath 21 2158 2238 2255 2252 Dp
-1868 MX
- 1868 2238 lineto
- 1965 2238 lineto
- 1965 2280 lineto
- 1868 2280 lineto
- 1868 2238 lineto
-closepath 21 1868 2238 1965 2280 Dp
-1577 MX
- 1577 2238 lineto
- 1674 2238 lineto
- 1674 2308 lineto
- 1577 2308 lineto
- 1577 2238 lineto
-closepath 21 1577 2238 1674 2308 Dp
-1287 2308 MXY
- 1287 2308 lineto
- 1287 2280 lineto
- 1384 2280 lineto
- 1384 2308 lineto
- 1287 2308 lineto
-closepath 21 1287 2280 1384 2308 Dp
-2158 2280 MXY
- 2158 2280 lineto
- 2158 2252 lineto
- 2255 2252 lineto
- 2255 2280 lineto
- 2158 2280 lineto
-closepath 14 2158 2252 2255 2280 Dp
-1868 2308 MXY
- 1868 2308 lineto
- 1868 2280 lineto
- 1965 2280 lineto
- 1965 2308 lineto
- 1868 2308 lineto
-closepath 14 1868 2280 1965 2308 Dp
-1577 2335 MXY
- 1577 2335 lineto
- 1577 2308 lineto
- 1674 2308 lineto
- 1674 2335 lineto
- 1577 2335 lineto
-closepath 14 1577 2308 1674 2335 Dp
-1287 2363 MXY
- 1287 2363 lineto
- 1287 2308 lineto
- 1384 2308 lineto
- 1384 2363 lineto
- 1287 2363 lineto
-closepath 14 1287 2308 1384 2363 Dp
-2158 2280 MXY
- 2158 2280 lineto
- 2255 2280 lineto
- 2255 2612 lineto
- 2158 2612 lineto
- 2158 2280 lineto
-closepath 3 2158 2280 2255 2612 Dp
-1868 2308 MXY
- 1868 2308 lineto
- 1965 2308 lineto
- 1965 2612 lineto
- 1868 2612 lineto
- 1868 2308 lineto
-closepath 3 1868 2308 1965 2612 Dp
-1577 2335 MXY
- 1577 2335 lineto
- 1674 2335 lineto
- 1674 2612 lineto
- 1577 2612 lineto
- 1577 2335 lineto
-closepath 3 1577 2335 1674 2612 Dp
-1287 2363 MXY
- 1287 2363 lineto
- 1384 2363 lineto
- 1384 2612 lineto
- 1287 2612 lineto
- 1287 2363 lineto
-closepath 3 1287 2363 1384 2612 Dp
-4 Ds
-1121 2066 MXY
- 1121 2066 lineto
- 1218 2066 lineto
- 1224 2080 lineto
- 1127 2080 lineto
- 1121 2066 lineto
-closepath 21 1121 2066 1224 2080 Dp
-2080 MY
- 1121 2080 lineto
- 1218 2080 lineto
- 1218 2273 lineto
- 1121 2273 lineto
- 1121 2080 lineto
-closepath 14 1121 2080 1218 2273 Dp
-2273 MY
- 1121 2273 lineto
- 1218 2273 lineto
- 1218 2612 lineto
- 1121 2612 lineto
- 1121 2273 lineto
-closepath 3 1121 2273 1218 2612 Dp
--1 Ds
-997 1589 MXY
- 997 1589 lineto
- 1093 1589 lineto
- 1093 1644 lineto
- 997 1644 lineto
- 997 1589 lineto
-closepath 21 997 1589 1093 1644 Dp
-1644 MY
- 997 1644 lineto
- 1093 1644 lineto
- 1093 2280 lineto
- 997 2280 lineto
- 997 1644 lineto
-closepath 14 997 1644 1093 2280 Dp
-2280 MY
- 997 2280 lineto
- 1093 2280 lineto
- 1093 2612 lineto
- 997 2612 lineto
- 997 2280 lineto
-closepath 3 997 2280 1093 2612 Dp
-10 s
-719 2093(s)N
-712 2037(d)N
-712 1982(n)N
-714 1927(o)N
-716 1872(c)N
-716 1816(e)N
-712 1761(S)N
-804 2286(10)N
-804 1899(20)N
-804 1540(30)N
-3 Dt
-900 1506 MXY
-0 1106 Dl
-1548 0 Dl
-7 s
-1978 2828(Elapsed)N
-1701 2925(Dynamically)N
-2018(grown)X
-2184(table)X
-2317(\(right\))X
-3 Dt
--1 Ds
-8 s
-720 3180(Figure)N
-934(6:)X
-1 f
-1020(The)X
-1152(total)X
-1299(regions)X
-1520(indicate)X
-1755(the)X
-1865(difference)X
-2154(between)X
-2398(the)X
-720 3268(elapsed)N
-931(time)X
-1065(and)X
-1177(the)X
-1275(sum)X
-1402(of)X
-1475(the)X
-1573(system)X
-1771(and)X
-1883(user)X
-2008(time.)X
-2173(The)X
-2291(left)X
-2395(bar)X
-720 3356(of)N
-798(each)X
-939(set)X
-1035(depicts)X
-1241(the)X
-1344(timing)X
-1537(of)X
-1615(the)X
-1718(test)X
-1831(run)X
-1940(when)X
-2102(the)X
-2204(number)X
-2423(of)X
-720 3444(entries)N
-910(is)X
-973(known)X
-1167(in)X
-1237(advance.)X
-1496(The)X
-1614(right)X
-1754(bars)X
-1879(depict)X
-2054(the)X
-2151(timing)X
-2338(when)X
-720 3532(the)N
-814(\256le)X
-912(is)X
-971(grown)X
-1150(from)X
-1290(a)X
-1334(single)X
-1503(bucket.)X
-10 s
-10 f
-720 3708 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-1 f
-892 3910(Since)N
-1131(this)X
-1307(hashing)X
-1617(package)X
-1942(provides)X
-2279(buffer)X
-720 3998(management,)N
-1188(the)X
-1323(amount)X
-1600(of)X
-1704(space)X
-1920(allocated)X
-2247(for)X
-2378(the)X
-720 4086(buffer)N
-948(pool)X
-1121(may)X
-1290(be)X
-1397(speci\256ed)X
-1713(by)X
-1824(the)X
-1953(user.)X
-2157(Using)X
-2378(the)X
-720 4174(same)N
-910(data)X
-1069(set)X
-1183(and)X
-1324(test)X
-1459(procedure)X
-1805(as)X
-1896(used)X
-2067(to)X
-2153(derive)X
-2378(the)X
-720 4262(graphs)N
-962(in)X
-1052(Figures)X
-1320(5a-c,)X
-1507(Figure)X
-1744(7)X
-1812(shows)X
-2039(the)X
-2164(impact)X
-2409(of)X
-720 4350(varying)N
-997(the)X
-1126(size)X
-1282(of)X
-1380(the)X
-1509(buffer)X
-1737(pool.)X
-1950(The)X
-2106(bucket)X
-2351(size)X
-720 4438(was)N
-873(set)X
-989(to)X
-1078(256)X
-1225(bytes)X
-1421(and)X
-1564(the)X
-1689(\256ll)X
-1804(factor)X
-2019(was)X
-2171(set)X
-2287(to)X
-2376(16.)X
-720 4526(The)N
-869(buffer)X
-1090(pool)X
-1256(size)X
-1404(was)X
-1552(varied)X
-1776(from)X
-1955(0)X
-2018(\(the)X
-2166(minimum)X
-720 4614(number)N
-986(of)X
-1074(pages)X
-1277(required)X
-1565(to)X
-1647(be)X
-1743(buffered\))X
-2063(to)X
-2145(1M.)X
-2316(With)X
-720 4702(1M)N
-854(of)X
-944(buffer)X
-1164(space,)X
-1386(the)X
-1507(package)X
-1794(performed)X
-2151(no)X
-2253(I/O)X
-2382(for)X
-720 4790(this)N
-871(data)X
-1040(set.)X
-1204(As)X
-1328(Figure)X
-1572(7)X
-1647(illustrates,)X
-2013(increasing)X
-2378(the)X
-720 4878(buffer)N
-944(pool)X
-1113(size)X
-1265(can)X
-1404(have)X
-1583(a)X
-1646(dramatic)X
-1954(affect)X
-2165(on)X
-2271(result-)X
-720 4966(ing)N
-842(performance.)X
-2 f
-8 s
-1269 4941(7)N
-1 f
-16 s
-720 5353 MXY
-864 0 Dl
-2 f
-8 s
-760 5408(7)N
-1 f
-9 s
-826 5433(Some)N
-1024(allocators)X
-1338(are)X
-1460(extremely)X
-1782(inef\256cient)X
-2107(at)X
-2192(allocating)X
-720 5513(memory.)N
-1029(If)X
-1110(you)X
-1251(\256nd)X
-1396(that)X
-1536(applications)X
-1916(are)X
-2036(running)X
-2292(out)X
-2416(of)X
-720 5593(memory)N
-1005(before)X
-1234(you)X
-1386(think)X
-1578(they)X
-1746(should,)X
-2000(try)X
-2124(varying)X
-2388(the)X
-720 5673(pagesize)N
-986(to)X
-1060(get)X
-1166(better)X
-1348(utilization)X
-1658(from)X
-1816(the)X
-1922(memory)X
-2180(allocator.)X
-10 s
-2830 1975 MXY
-0 -28 Dl
-28 0 Dl
-0 28 Dl
--28 0 Dl
-2853 2004 MXY
-0 -27 Dl
-28 0 Dl
-0 27 Dl
--28 0 Dl
-2876 2016 MXY
-0 -27 Dl
-27 0 Dl
-0 27 Dl
--27 0 Dl
-2922 1998 MXY
-0 -27 Dl
-27 0 Dl
-0 27 Dl
--27 0 Dl
-2967 2025 MXY
-0 -28 Dl
-28 0 Dl
-0 28 Dl
--28 0 Dl
-3013 2031 MXY
-0 -28 Dl
-28 0 Dl
-0 28 Dl
--28 0 Dl
-3059 MX
-0 -28 Dl
-27 0 Dl
-0 28 Dl
--27 0 Dl
-3196 2052 MXY
-0 -28 Dl
-27 0 Dl
-0 28 Dl
--27 0 Dl
-3561 2102 MXY
-0 -28 Dl
-28 0 Dl
-0 28 Dl
--28 0 Dl
-4292 2105 MXY
-0 -28 Dl
-27 0 Dl
-0 28 Dl
--27 0 Dl
-4 Ds
-1 Dt
-2844 1961 MXY
-23 30 Dl
-23 12 Dl
-45 -18 Dl
-46 26 Dl
-46 6 Dl
-45 0 Dl
-137 21 Dl
-366 50 Dl
-730 3 Dl
-9 s
-4227 2158(User)N
--1 Ds
-3 Dt
-2830 1211 MXY
-27 Dc
-2853 1261 MXY
-27 Dc
-2876 1267 MXY
-27 Dc
-2921 1341 MXY
-27 Dc
-2967 1385 MXY
-27 Dc
-3013 1450 MXY
-27 Dc
-3059 1497 MXY
-27 Dc
-3196 1686 MXY
-27 Dc
-3561 2109 MXY
-27 Dc
-4292 2295 MXY
-27 Dc
-20 Ds
-1 Dt
-2844 1211 MXY
-23 50 Dl
-23 6 Dl
-45 74 Dl
-46 44 Dl
-46 65 Dl
-45 47 Dl
-137 189 Dl
-366 423 Dl
-730 186 Dl
-4181 2270(System)N
--1 Ds
-3 Dt
-2844 583 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2867 672 MXY
-0 27 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-2890 701 MXY
-0 28 Dl
-0 -14 Dl
-13 0 Dl
--27 0 Dl
-2935 819 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--27 0 Dl
-2981 849 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-3027 908 MXY
-0 27 Dl
-0 -13 Dl
-14 0 Dl
--28 0 Dl
-3072 1026 MXY
-0 27 Dl
-0 -13 Dl
-14 0 Dl
--27 0 Dl
-3209 1292 MXY
-0 27 Dl
-0 -14 Dl
-14 0 Dl
--27 0 Dl
-3575 1823 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--28 0 Dl
-4305 2059 MXY
-0 28 Dl
-0 -14 Dl
-14 0 Dl
--27 0 Dl
-5 Dt
-2844 597 MXY
-23 88 Dl
-23 30 Dl
-45 118 Dl
-46 30 Dl
-46 59 Dl
-45 118 Dl
-137 265 Dl
-366 532 Dl
-730 236 Dl
-4328 2103(Total)N
-2844 2310 MXY
-1461 0 Dl
-2844 MX
-0 -1772 Dl
-2310 MY
-0 18 Dl
-4 Ds
-1 Dt
-2310 MY
-0 -1772 Dl
-2826 2416(0)N
--1 Ds
-5 Dt
-3209 2310 MXY
-0 18 Dl
-4 Ds
-1 Dt
-2310 MY
-0 -1772 Dl
-3155 2416(256)N
--1 Ds
-5 Dt
-3575 2310 MXY
-0 18 Dl
-4 Ds
-1 Dt
-2310 MY
-0 -1772 Dl
-3521 2416(512)N
--1 Ds
-5 Dt
-3940 2310 MXY
-0 18 Dl
-4 Ds
-1 Dt
-2310 MY
-0 -1772 Dl
-3886 2416(768)N
--1 Ds
-5 Dt
-4305 2310 MXY
-0 18 Dl
-4 Ds
-1 Dt
-2310 MY
-0 -1772 Dl
-4233 2416(1024)N
--1 Ds
-5 Dt
-2844 2310 MXY
--18 0 Dl
-4 Ds
-1 Dt
-2844 MX
-1461 0 Dl
-2771 2340(0)N
--1 Ds
-5 Dt
-2844 2014 MXY
--18 0 Dl
-2844 1719 MXY
--18 0 Dl
-4 Ds
-1 Dt
-2844 MX
-1461 0 Dl
-2735 1749(20)N
--1 Ds
-5 Dt
-2844 1423 MXY
--18 0 Dl
-2844 1128 MXY
--18 0 Dl
-4 Ds
-1 Dt
-2844 MX
-1461 0 Dl
-2735 1158(40)N
--1 Ds
-5 Dt
-2844 833 MXY
--18 0 Dl
-2844 538 MXY
--18 0 Dl
-4 Ds
-1 Dt
-2844 MX
-1461 0 Dl
-2735 568(60)N
-3239 2529(Buffer)N
-3445(Pool)X
-3595(Size)X
-3737(\(in)X
-3835(K\))X
-2695 1259(S)N
-2699 1324(e)N
-2699 1388(c)N
-2697 1452(o)N
-2697 1517(n)N
-2697 1581(d)N
-2701 1645(s)N
-3 Dt
--1 Ds
-3 f
-8 s
-2706 2773(Figure)N
-2908(7:)X
-1 f
-2982(User)X
-3123(time)X
-3258(is)X
-3322(virtually)X
-3560(insensitive)X
-3854(to)X
-3924(the)X
-4022(amount)X
-4234(of)X
-4307(buffer)X
-2706 2861(pool)N
-2852(available,)X
-3130(however,)X
-3396(both)X
-3541(system)X
-3750(time)X
-3895(and)X
-4018(elapsed)X
-4240(time)X
-4385(are)X
-2706 2949(inversely)N
-2960(proportional)X
-3296(to)X
-3366(the)X
-3464(size)X
-3583(of)X
-3656(the)X
-3753(buffer)X
-3927(pool.)X
-4092(Even)X
-4242(for)X
-4335(large)X
-2706 3037(data)N
-2831(sets)X
-2946(where)X
-3120(one)X
-3230(expects)X
-3439(few)X
-3552(collisions,)X
-3832(specifying)X
-4116(a)X
-4162(large)X
-4307(buffer)X
-2706 3125(pool)N
-2836(dramatically)X
-3171(improves)X
-3425(performance.)X
-10 s
-10 f
-2706 3301 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-3 f
-3175 3543(Enhanced)N
-3536(Functionality)X
-1 f
-2878 3675(This)N
-3046(hashing)X
-3320(package)X
-3609(provides)X
-3910(a)X
-3971(set)X
-4085(of)X
-4177(compati-)X
-2706 3763(bility)N
-2895(routines)X
-3174(to)X
-3257(implement)X
-3620(the)X
-2 f
-3739(ndbm)X
-1 f
-3937(interface.)X
-4279(How-)X
-2706 3851(ever,)N
-2893(when)X
-3095(the)X
-3220(native)X
-3443(interface)X
-3752(is)X
-3832(used,)X
-4026(the)X
-4151(following)X
-2706 3939(additional)N
-3046(functionality)X
-3475(is)X
-3548(provided:)X
-10 f
-2798 4071(g)N
-1 f
-2946(Inserts)X
-3197(never)X
-3413(fail)X
-3556(because)X
-3847(too)X
-3985(many)X
-4199(keys)X
-2946 4159(hash)N
-3113(to)X
-3195(the)X
-3313(same)X
-3498(value.)X
-10 f
-2798 4247(g)N
-1 f
-2946(Inserts)X
-3187(never)X
-3393(fail)X
-3527(because)X
-3808(key)X
-3950(and/or)X
-4181(asso-)X
-2946 4335(ciated)N
-3158(data)X
-3312(is)X
-3385(too)X
-3507(large)X
-10 f
-2798 4423(g)N
-1 f
-2946(Hash)X
-3131(functions)X
-3449(may)X
-3607(be)X
-3703(user-speci\256ed.)X
-10 f
-2798 4511(g)N
-1 f
-2946(Multiple)X
-3268(pages)X
-3498(may)X
-3683(be)X
-3806(cached)X
-4077(in)X
-4186(main)X
-2946 4599(memory.)N
-2706 4731(It)N
-2801(also)X
-2976(provides)X
-3298(a)X
-3380(set)X
-3514(of)X
-3626(compatibility)X
-4097(routines)X
-4400(to)X
-2706 4819(implement)N
-3087(the)X
-2 f
-3224(hsearch)X
-1 f
-3516(interface.)X
-3876(Again,)X
-4130(the)X
-4266(native)X
-2706 4907(interface)N
-3008(offers)X
-3216(enhanced)X
-3540(functionality:)X
-10 f
-2798 5039(g)N
-1 f
-2946(Files)X
-3121(may)X
-3279(grow)X
-3464(beyond)X
-2 f
-3720(nelem)X
-1 f
-3932(elements.)X
-10 f
-2798 5127(g)N
-1 f
-2946(Multiple)X
-3247(hash)X
-3420(tables)X
-3632(may)X
-3795(be)X
-3896(accessed)X
-4203(con-)X
-2946 5215(currently.)N
-10 f
-2798 5303(g)N
-1 f
-2946(Hash)X
-3134(tables)X
-3344(may)X
-3505(be)X
-3604(stored)X
-3823(and)X
-3962(accessed)X
-4266(on)X
-2946 5391(disk.)N
-10 f
-2798 5479(g)N
-1 f
-2946(Hash)X
-3155(functions)X
-3497(may)X
-3679(be)X
-3799(user-speci\256ed)X
-4288(at)X
-2946 5567(runtime.)N
-3 f
-720 5960(USENIX)N
-9 f
-1042(-)X
-3 f
-1106(Winter)X
-1371('91)X
-9 f
-1498(-)X
-3 f
-1562(Dallas,)X
-1815(TX)X
-4424(9)X
-
-10 p
-%%Page: 10 10
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-432 258(A)N
-510(New)X
-682(Hashing)X
-985(Package)X
-1290(for)X
-1413(UNIX)X
-3663(Seltzer)X
-3920(&)X
-4007(Yigit)X
-459 538(Relative)N
-760(Performance)X
-1227(of)X
-1314(the)X
-1441(New)X
-1613(Implementation)X
-1 f
-604 670(The)N
-761(performance)X
-1200(testing)X
-1445(of)X
-1544(the)X
-1674(new)X
-1840(package)X
-2135(is)X
-432 758(divided)N
-711(into)X
-874(two)X
-1033(test)X
-1183(suites.)X
-1424(The)X
-1588(\256rst)X
-1751(suite)X
-1941(of)X
-2046(tests)X
-432 846(requires)N
-727(that)X
-882(the)X
-1015(tables)X
-1237(be)X
-1348(read)X
-1522(from)X
-1713(and)X
-1864(written)X
-2126(to)X
-432 934(disk.)N
-640(In)X
-742(these)X
-942(tests,)X
-1139(the)X
-1272(basis)X
-1467(for)X
-1595(comparison)X
-2003(is)X
-2090(the)X
-432 1022(4.3BSD-Reno)N
-908(version)X
-1169(of)X
-2 f
-1260(ndbm)X
-1 f
-1438(.)X
-1502(Based)X
-1722(on)X
-1826(the)X
-1948(designs)X
-432 1110(of)N
-2 f
-521(sdbm)X
-1 f
-712(and)X
-2 f
-850(gdbm)X
-1 f
-1028(,)X
-1070(they)X
-1230(are)X
-1351(expected)X
-1659(to)X
-1743(perform)X
-2024(simi-)X
-432 1198(larly)N
-605(to)X
-2 f
-693(ndbm)X
-1 f
-871(,)X
-917(and)X
-1059(we)X
-1179(do)X
-1285(not)X
-1413(show)X
-1608(their)X
-1781(performance)X
-432 1286(numbers.)N
-800(The)X
-977(second)X
-1252(suite)X
-1454(contains)X
-1772(the)X
-1921(memory)X
-432 1374(resident)N
-712(test)X
-849(which)X
-1071(does)X
-1243(not)X
-1370(require)X
-1623(that)X
-1768(the)X
-1891(\256les)X
-2049(ever)X
-432 1462(be)N
-533(written)X
-784(to)X
-870(disk,)X
-1047(only)X
-1213(that)X
-1357(hash)X
-1528(tables)X
-1739(may)X
-1901(be)X
-2001(mani-)X
-432 1550(pulated)N
-692(in)X
-778(main)X
-961(memory.)X
-1291(In)X
-1381(this)X
-1519(test,)X
-1673(we)X
-1790(compare)X
-2090(the)X
-432 1638(performance)N
-859(to)X
-941(that)X
-1081(of)X
-1168(the)X
-2 f
-1286(hsearch)X
-1 f
-1560(routines.)X
-604 1752(For)N
-760(both)X
-947(suites,)X
-1194(two)X
-1358(different)X
-1679(databases)X
-2031(were)X
-432 1840(used.)N
-656(The)X
-818(\256rst)X
-979(is)X
-1069(the)X
-1204(dictionary)X
-1566(database)X
-1880(described)X
-432 1928(previously.)N
-836(The)X
-987(second)X
-1236(was)X
-1386(constructed)X
-1781(from)X
-1962(a)X
-2023(pass-)X
-432 2016(word)N
-647(\256le)X
-799(with)X
-990(approximately)X
-1502(300)X
-1671(accounts.)X
-2041(Two)X
-432 2104(records)N
-700(were)X
-887(constructed)X
-1287(for)X
-1411(each)X
-1589(account.)X
-1909(The)X
-2064(\256rst)X
-432 2192(used)N
-604(the)X
-727(logname)X
-1028(as)X
-1120(the)X
-1243(key)X
-1384(and)X
-1525(the)X
-1648(remainder)X
-1999(of)X
-2090(the)X
-432 2280(password)N
-768(entry)X
-965(for)X
-1091(the)X
-1221(data.)X
-1427(The)X
-1584(second)X
-1839(was)X
-1996(keyed)X
-432 2368(by)N
-541(uid)X
-672(and)X
-817(contained)X
-1157(the)X
-1283(entire)X
-1494(password)X
-1825(entry)X
-2018(as)X
-2113(its)X
-432 2456(data)N
-589(\256eld.)X
-794(The)X
-942(tests)X
-1107(were)X
-1287(all)X
-1389(run)X
-1518(on)X
-1620(the)X
-1740(HP)X
-1864(9000)X
-2046(with)X
-432 2544(the)N
-574(same)X
-783(con\256guration)X
-1254(previously)X
-1636(described.)X
-2027(Each)X
-432 2632(test)N
-576(was)X
-734(run)X
-874(\256ve)X
-1027(times)X
-1232(and)X
-1380(the)X
-1510(timing)X
-1750(results)X
-1991(of)X
-2090(the)X
-432 2720(runs)N
-602(were)X
-791(averaged.)X
-1154(The)X
-1311(variance)X
-1616(across)X
-1849(the)X
-1979(5)X
-2050(runs)X
-432 2808(was)N
-591(approximately)X
-1088(1%)X
-1229(of)X
-1330(the)X
-1462(average)X
-1746(yielding)X
-2041(95%)X
-432 2896(con\256dence)N
-800(intervals)X
-1096(of)X
-1183(approximately)X
-1666(2%.)X
-3 f
-1021 3050(Disk)N
-1196(Based)X
-1420(Tests)X
-1 f
-604 3182(In)N
-693(these)X
-880(tests,)X
-1064(we)X
-1180(use)X
-1308(a)X
-1365(bucket)X
-1600(size)X
-1746(of)X
-1834(1024)X
-2015(and)X
-2152(a)X
-432 3270(\256ll)N
-540(factor)X
-748(of)X
-835(32.)X
-3 f
-432 3384(create)N
-663(test)X
-1 f
-547 3498(The)N
-703(keys)X
-881(are)X
-1011(entered)X
-1279(into)X
-1433(the)X
-1561(hash)X
-1738(table,)X
-1944(and)X
-2090(the)X
-547 3586(\256le)N
-669(is)X
-742(\257ushed)X
-993(to)X
-1075(disk.)X
-3 f
-432 3700(read)N
-608(test)X
-1 f
-547 3814(A)N
-640(lookup)X
-897(is)X
-984(performed)X
-1353(for)X
-1481(each)X
-1663(key)X
-1813(in)X
-1909(the)X
-2041(hash)X
-547 3902(table.)N
-3 f
-432 4016(verify)N
-653(test)X
-1 f
-547 4130(A)N
-640(lookup)X
-897(is)X
-984(performed)X
-1353(for)X
-1481(each)X
-1663(key)X
-1813(in)X
-1909(the)X
-2041(hash)X
-547 4218(table,)N
-759(and)X
-911(the)X
-1045(data)X
-1215(returned)X
-1519(is)X
-1608(compared)X
-1961(against)X
-547 4306(that)N
-687(originally)X
-1018(stored)X
-1234(in)X
-1316(the)X
-1434(hash)X
-1601(table.)X
-3 f
-432 4420(sequential)N
-798(retrieve)X
-1 f
-547 4534(All)N
-674(keys)X
-846(are)X
-970(retrieved)X
-1281(in)X
-1367(sequential)X
-1716(order)X
-1910(from)X
-2090(the)X
-547 4622(hash)N
-724(table.)X
-950(The)X
-2 f
-1105(ndbm)X
-1 f
-1313(interface)X
-1625(allows)X
-1863(sequential)X
-547 4710(retrieval)N
-848(of)X
-948(the)X
-1079(keys)X
-1259(from)X
-1448(the)X
-1578(database,)X
-1907(but)X
-2041(does)X
-547 4798(not)N
-701(return)X
-945(the)X
-1094(data)X
-1279(associated)X
-1660(with)X
-1853(each)X
-2052(key.)X
-547 4886(Therefore,)N
-929(we)X
-1067(compare)X
-1388(the)X
-1530(performance)X
-1980(of)X
-2090(the)X
-547 4974(new)N
-703(package)X
-989(to)X
-1073(two)X
-1215(different)X
-1514(runs)X
-1674(of)X
-2 f
-1763(ndbm)X
-1 f
-1941(.)X
-2002(In)X
-2090(the)X
-547 5062(\256rst)N
-697(case,)X
-2 f
-882(ndbm)X
-1 f
-1086(returns)X
-1335(only)X
-1503(the)X
-1627(keys)X
-1800(while)X
-2003(in)X
-2090(the)X
-547 5150(second,)N
-2 f
-823(ndbm)X
-1 f
-1034(returns)X
-1290(both)X
-1465(the)X
-1596(keys)X
-1776(and)X
-1924(the)X
-2054(data)X
-547 5238(\(requiring)N
-894(a)X
-956(second)X
-1204(call)X
-1345(to)X
-1432(the)X
-1555(library\).)X
-1861(There)X
-2074(is)X
-2152(a)X
-547 5326(single)N
-764(run)X
-897(for)X
-1017(the)X
-1141(new)X
-1300(library)X
-1539(since)X
-1729(it)X
-1798(returns)X
-2046(both)X
-547 5414(the)N
-665(key)X
-801(and)X
-937(the)X
-1055(data.)X
-3 f
-3014 538(In-Memory)N
-3431(Test)X
-1 f
-2590 670(This)N
-2757(test)X
-2892(uses)X
-3054(a)X
-3114(bucket)X
-3352(size)X
-3501(of)X
-3592(256)X
-3736(and)X
-3876(a)X
-3936(\256ll)X
-4048(fac-)X
-2418 758(tor)N
-2527(of)X
-2614(8.)X
-3 f
-2418 872(create/read)N
-2827(test)X
-1 f
-2533 986(In)N
-2627(this)X
-2769(test,)X
-2927(a)X
-2989(hash)X
-3162(table)X
-3344(is)X
-3423(created)X
-3682(by)X
-3788(inserting)X
-4094(all)X
-2533 1074(the)N
-2660(key/data)X
-2961(pairs.)X
-3186(Then)X
-3380(a)X
-3445(keyed)X
-3666(retrieval)X
-3963(is)X
-4044(per-)X
-2533 1162(formed)N
-2801(for)X
-2931(each)X
-3115(pair,)X
-3295(and)X
-3446(the)X
-3579(hash)X
-3761(table)X
-3952(is)X
-4040(des-)X
-2533 1250(troyed.)N
-3 f
-2938 1404(Performance)N
-3405(Results)X
-1 f
-2590 1536(Figures)N
-2866(8a)X
-2978(and)X
-3130(8b)X
-3246(show)X
-3451(the)X
-3585(user)X
-3755(time,)X
-3952(system)X
-2418 1624(time,)N
-2608(and)X
-2752(elapsed)X
-3021(time)X
-3191(for)X
-3312(each)X
-3487(test)X
-3625(for)X
-3746(both)X
-3915(the)X
-4040(new)X
-2418 1712(implementation)N
-2951(and)X
-3098(the)X
-3227(old)X
-3360(implementation)X
-3893(\()X
-2 f
-3920(hsearch)X
-1 f
-2418 1800(or)N
-2 f
-2528(ndbm)X
-1 f
-2706(,)X
-2769(whichever)X
-3147(is)X
-3243(appropriate\))X
-3678(as)X
-3787(well)X
-3967(as)X
-4076(the)X
-2418 1888(improvement.)N
-2929(The)X
-3098(improvement)X
-3569(is)X
-3666(expressed)X
-4027(as)X
-4138(a)X
-2418 1976(percentage)N
-2787(of)X
-2874(the)X
-2992(old)X
-3114(running)X
-3383(time:)X
-0 f
-8 s
-2418 2275(%)N
-2494(=)X
-2570(100)X
-2722(*)X
-2798 -0.4219(\(old_time)AX
-3178(-)X
-3254 -0.4219(new_time\))AX
-3634(/)X
-3710(old_time)X
-1 f
-10 s
-2590 2600(In)N
-2700(nearly)X
-2944(all)X
-3067(cases,)X
-3299(the)X
-3439(new)X
-3615(routines)X
-3915(perform)X
-2418 2688(better)N
-2628(than)X
-2793(the)X
-2918(old)X
-3047(routines)X
-3332(\(both)X
-2 f
-3527(hsearch)X
-1 f
-3807(and)X
-2 f
-3949(ndbm)X
-1 f
-4127(\).)X
-2418 2776(Although)N
-2755(the)X
-3 f
-2888(create)X
-1 f
-3134(tests)X
-3311(exhibit)X
-3567(superior)X
-3864(user)X
-4032(time)X
-2418 2864(performance,)N
-2869(the)X
-2991(test)X
-3126(time)X
-3292(is)X
-3369(dominated)X
-3731(by)X
-3834(the)X
-3955(cost)X
-4107(of)X
-2418 2952(writing)N
-2677(the)X
-2803(actual)X
-3023(\256le)X
-3153(to)X
-3243(disk.)X
-3444(For)X
-3583(the)X
-3709(large)X
-3897(database)X
-2418 3040(\(the)N
-2564(dictionary\),)X
-2957(this)X
-3093(completely)X
-3470(overwhelmed)X
-3927(the)X
-4045(sys-)X
-2418 3128(tem)N
-2570(time.)X
-2783(However,)X
-3129(for)X
-3254(the)X
-3383(small)X
-3587(data)X
-3752(base,)X
-3946(we)X
-4071(see)X
-2418 3216(that)N
-2569(differences)X
-2958(in)X
-3051(both)X
-3224(user)X
-3389(and)X
-3536(system)X
-3788(time)X
-3960(contri-)X
-2418 3304(bute)N
-2576(to)X
-2658(the)X
-2776(superior)X
-3059(performance)X
-3486(of)X
-3573(the)X
-3691(new)X
-3845(package.)X
-2590 3418(The)N
-3 f
-2764(read)X
-1 f
-2920(,)X
-3 f
-2989(verify)X
-1 f
-3190(,)X
-3259(and)X
-3 f
-3424(sequential)X
-1 f
-3818(results)X
-4075(are)X
-2418 3506(deceptive)N
-2758(for)X
-2883(the)X
-3012(small)X
-3216(database)X
-3524(since)X
-3720(the)X
-3849(entire)X
-4063(test)X
-2418 3594(ran)N
-2551(in)X
-2643(under)X
-2856(a)X
-2922(second.)X
-3215(However,)X
-3560(on)X
-3669(the)X
-3796(larger)X
-4013(data-)X
-2418 3682(base)N
-2590(the)X
-3 f
-2716(read)X
-1 f
-2900(and)X
-3 f
-3044(verify)X
-1 f
-3273(tests)X
-3443(bene\256t)X
-3689(from)X
-3873(the)X
-3999(cach-)X
-2418 3770(ing)N
-2546(of)X
-2639(buckets)X
-2910(in)X
-2998(the)X
-3122(new)X
-3282(package)X
-3571(to)X
-3658(improve)X
-3950(perfor-)X
-2418 3858(mance)N
-2666(by)X
-2784(over)X
-2965(80%.)X
-3169(Since)X
-3384(the)X
-3519(\256rst)X
-3 f
-3680(sequential)X
-1 f
-4063(test)X
-2418 3946(does)N
-2598(not)X
-2733(require)X
-2 f
-2994(ndbm)X
-1 f
-3205(to)X
-3299(return)X
-3523(the)X
-3653(data)X
-3819(values,)X
-4076(the)X
-2418 4034(user)N
-2573(time)X
-2735(is)X
-2808(lower)X
-3011(than)X
-3169(for)X
-3283(the)X
-3401(new)X
-3555(package.)X
-3879(However)X
-2418 4122(when)N
-2613(we)X
-2728(require)X
-2977(both)X
-3139(packages)X
-3454(to)X
-3536(return)X
-3748(data,)X
-3922(the)X
-4040(new)X
-2418 4210(package)N
-2702(excels)X
-2923(in)X
-3005(all)X
-3105(three)X
-3286(timings.)X
-2590 4324(The)N
-2773(small)X
-3003(database)X
-3337(runs)X
-3532(so)X
-3660(quickly)X
-3957(in)X
-4076(the)X
-2418 4412(memory-resident)N
-3000(case)X
-3173(that)X
-3326(the)X
-3457(results)X
-3699(are)X
-3831(uninterest-)X
-2418 4500(ing.)N
-2589(However,)X
-2933(for)X
-3056(the)X
-3183(larger)X
-3400(database)X
-3706(the)X
-3833(new)X
-3995(pack-)X
-2418 4588(age)N
-2567(pays)X
-2751(a)X
-2824(small)X
-3033(penalty)X
-3305(in)X
-3403(system)X
-3661(time)X
-3839(because)X
-4130(it)X
-2418 4676(limits)N
-2636(its)X
-2748(main)X
-2944(memory)X
-3247(utilization)X
-3607(and)X
-3759(swaps)X
-3991(pages)X
-2418 4764(out)N
-2550(to)X
-2642(temporary)X
-3002(storage)X
-3264(in)X
-3356(the)X
-3484(\256le)X
-3616(system)X
-3868(while)X
-4076(the)X
-2 f
-2418 4852(hsearch)N
-1 f
-2698(package)X
-2988(requires)X
-3273(that)X
-3419(the)X
-3543(application)X
-3924(allocate)X
-2418 4940(enough)N
-2692(space)X
-2909(for)X
-3041(all)X
-3159(key/data)X
-3468(pair.)X
-3670(However,)X
-4022(even)X
-2418 5028(with)N
-2600(the)X
-2738(system)X
-3000(time)X
-3182(penalty,)X
-3477(the)X
-3614(resulting)X
-3933(elapsed)X
-2418 5116(time)N
-2580(improves)X
-2898(by)X
-2998(over)X
-3161(50%.)X
-3 f
-432 5960(10)N
-2970(USENIX)X
-9 f
-3292(-)X
-3 f
-3356(Winter)X
-3621('91)X
-9 f
-3748(-)X
-3 f
-3812(Dallas,)X
-4065(TX)X
-
-11 p
-%%Page: 11 11
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-720 258(Seltzer)N
-977(&)X
-1064(Yigit)X
-3278(A)X
-3356(New)X
-3528(Hashing)X
-3831(Package)X
-4136(for)X
-4259(UNIX)X
-1 f
-10 f
-908 454(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2 f
-1379 546(hash)N
-1652(ndbm)X
-1950(%change)X
-1 f
-10 f
-908 550(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-948 642(CREATE)N
-10 f
-908 646(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-1125 738(user)N
-1424(6.4)X
-1671(12.2)X
-2073(48)X
-1157 826(sys)N
-1384(32.5)X
-1671(34.7)X
-2113(6)X
-3 f
-1006 914(elapsed)N
-10 f
-1310 922(c)N
-890(c)Y
-810(c)Y
-730(c)Y
-3 f
-1384 914(90.4)N
-10 f
-1581 922(c)N
-890(c)Y
-810(c)Y
-730(c)Y
-3 f
-1671 914(99.6)N
-10 f
-1883 922(c)N
-890(c)Y
-810(c)Y
-730(c)Y
-3 f
-2113 914(9)N
-1 f
-10 f
-908 910(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-908 926(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-948 1010(READ)N
-10 f
-908 1014(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-1125 1106(user)N
-1424(3.4)X
-1711(6.1)X
-2073(44)X
-1157 1194(sys)N
-1424(1.2)X
-1671(15.3)X
-2073(92)X
-3 f
-1006 1282(elapsed)N
-10 f
-1310 1290(c)N
-1258(c)Y
-1178(c)Y
-1098(c)Y
-3 f
-1424 1282(4.0)N
-10 f
-1581 1290(c)N
-1258(c)Y
-1178(c)Y
-1098(c)Y
-3 f
-1671 1282(21.2)N
-10 f
-1883 1290(c)N
-1258(c)Y
-1178(c)Y
-1098(c)Y
-3 f
-2073 1282(81)N
-1 f
-10 f
-908 1278(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-908 1294(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-948 1378(VERIFY)N
-10 f
-908 1382(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-1125 1474(user)N
-1424(3.5)X
-1711(6.3)X
-2073(44)X
-1157 1562(sys)N
-1424(1.2)X
-1671(15.3)X
-2073(92)X
-3 f
-1006 1650(elapsed)N
-10 f
-1310 1658(c)N
-1626(c)Y
-1546(c)Y
-1466(c)Y
-3 f
-1424 1650(4.0)N
-10 f
-1581 1658(c)N
-1626(c)Y
-1546(c)Y
-1466(c)Y
-3 f
-1671 1650(21.2)N
-10 f
-1883 1658(c)N
-1626(c)Y
-1546(c)Y
-1466(c)Y
-3 f
-2073 1650(81)N
-1 f
-10 f
-908 1646(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-908 1662(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-948 1746(SEQUENTIAL)N
-10 f
-908 1750(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-1125 1842(user)N
-1424(2.7)X
-1711(1.9)X
-2046(-42)X
-1157 1930(sys)N
-1424(0.7)X
-1711(3.9)X
-2073(82)X
-3 f
-1006 2018(elapsed)N
-10 f
-1310 2026(c)N
-1994(c)Y
-1914(c)Y
-1834(c)Y
-3 f
-1424 2018(3.0)N
-10 f
-1581 2026(c)N
-1994(c)Y
-1914(c)Y
-1834(c)Y
-3 f
-1711 2018(5.0)N
-10 f
-1883 2026(c)N
-1994(c)Y
-1914(c)Y
-1834(c)Y
-3 f
-2073 2018(40)N
-1 f
-10 f
-908 2014(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-908 2030(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-948 2114(SEQUENTIAL)N
-1467(\(with)X
-1656(data)X
-1810(retrieval\))X
-10 f
-908 2118(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-1125 2210(user)N
-1424(2.7)X
-1711(8.2)X
-2073(67)X
-1157 2298(sys)N
-1424(0.7)X
-1711(4.3)X
-2073(84)X
-3 f
-1006 2386(elapsed)N
-1424(3.0)X
-1671(12.0)X
-2073(75)X
-1 f
-10 f
-908 2390(i)N
-927(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-899 2394(c)N
-2378(c)Y
-2298(c)Y
-2218(c)Y
-2138(c)Y
-2058(c)Y
-1978(c)Y
-1898(c)Y
-1818(c)Y
-1738(c)Y
-1658(c)Y
-1578(c)Y
-1498(c)Y
-1418(c)Y
-1338(c)Y
-1258(c)Y
-1178(c)Y
-1098(c)Y
-1018(c)Y
-938(c)Y
-858(c)Y
-778(c)Y
-698(c)Y
-618(c)Y
-538(c)Y
-1310 2394(c)N
-2362(c)Y
-2282(c)Y
-2202(c)Y
-1581 2394(c)N
-2362(c)Y
-2282(c)Y
-2202(c)Y
-1883 2394(c)N
-2362(c)Y
-2282(c)Y
-2202(c)Y
-2278 2394(c)N
-2378(c)Y
-2298(c)Y
-2218(c)Y
-2138(c)Y
-2058(c)Y
-1978(c)Y
-1898(c)Y
-1818(c)Y
-1738(c)Y
-1658(c)Y
-1578(c)Y
-1498(c)Y
-1418(c)Y
-1338(c)Y
-1258(c)Y
-1178(c)Y
-1098(c)Y
-1018(c)Y
-938(c)Y
-858(c)Y
-778(c)Y
-698(c)Y
-618(c)Y
-538(c)Y
-905 2574(i)N
-930(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2 f
-1318 2666(hash)N
-1585(hsearch)X
-1953(%change)X
-1 f
-10 f
-905 2670(i)N
-930(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-945 2762(CREATE/READ)N
-10 f
-905 2766(i)N
-930(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-1064 2858(user)N
-1343(6.6)X
-1642(17.2)X
-2096(62)X
-1096 2946(sys)N
-1343(1.1)X
-1682(0.3)X
-2029(-266)X
-3 f
-945 3034(elapsed)N
-1343(7.8)X
-1642(17.0)X
-2096(54)X
-1 f
-10 f
-905 3038(i)N
-930(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-896 3050(c)N
-2978(c)Y
-2898(c)Y
-2818(c)Y
-2738(c)Y
-2658(c)Y
-1249 3034(c)N
-3010(c)Y
-2930(c)Y
-2850(c)Y
-1520 3034(c)N
-3010(c)Y
-2930(c)Y
-2850(c)Y
-1886 3034(c)N
-3010(c)Y
-2930(c)Y
-2850(c)Y
-2281 3050(c)N
-2978(c)Y
-2898(c)Y
-2818(c)Y
-2738(c)Y
-2658(c)Y
-3 f
-720 3174(Figure)N
-967(8a:)X
-1 f
-1094(Timing)X
-1349(results)X
-1578(for)X
-1692(the)X
-1810(dictionary)X
-2155(database.)X
-10 f
-720 3262 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-3 f
-1407 3504(Conclusion)N
-1 f
-892 3636(This)N
-1063(paper)X
-1271(has)X
-1407(presented)X
-1744(the)X
-1871(design,)X
-2129(implemen-)X
-720 3724(tation)N
-928(and)X
-1070(performance)X
-1503(of)X
-1596(a)X
-1658(new)X
-1818(hashing)X
-2093(package)X
-2382(for)X
-720 3812(UNIX.)N
-993(The)X
-1150(new)X
-1316(package)X
-1612(provides)X
-1919(a)X
-1986(superset)X
-2280(of)X
-2378(the)X
-720 3900(functionality)N
-1159(of)X
-1255(existing)X
-1537(hashing)X
-1815(packages)X
-2139(and)X
-2284(incor-)X
-720 3988(porates)N
-975(additional)X
-1318(features)X
-1596(such)X
-1766(as)X
-1855(large)X
-2038(key)X
-2176(handling,)X
-720 4076(user)N
-876(de\256ned)X
-1134(hash)X
-1302(functions,)X
-1641(multiple)X
-1928(hash)X
-2096(tables,)X
-2324(vari-)X
-720 4164(able)N
-894(sized)X
-1099(pages,)X
-1342(and)X
-1498(linear)X
-1721(hashing.)X
-2050(In)X
-2156(nearly)X
-2396(all)X
-720 4252(cases,)N
-954(the)X
-1096(new)X
-1274(package)X
-1582(provides)X
-1902(improved)X
-2252(perfor-)X
-720 4340(mance)N
-974(on)X
-1098(the)X
-1240(order)X
-1454(of)X
-1565(50-80%)X
-1863(for)X
-2001(the)X
-2142(workloads)X
-720 4428(shown.)N
-990(Applications)X
-1420(such)X
-1588(as)X
-1676(the)X
-1794(loader,)X
-2035(compiler,)X
-2360(and)X
-720 4516(mail,)N
-921(which)X
-1156(currently)X
-1485(implement)X
-1866(their)X
-2051(own)X
-2227(hashing)X
-720 4604(routines,)N
-1032(should)X
-1279(be)X
-1389(modi\256ed)X
-1706(to)X
-1801(use)X
-1941(the)X
-2072(generic)X
-2342(rou-)X
-720 4692(tines.)N
-892 4806(This)N
-1087(hashing)X
-1389(package)X
-1705(is)X
-1810(one)X
-1978(access)X
-2236(method)X
-720 4894(which)N
-953(is)X
-1043(part)X
-1205(of)X
-1309(a)X
-1382(generic)X
-1656(database)X
-1970(access)X
-2212(package)X
-720 4982(being)N
-955(developed)X
-1342(at)X
-1457(the)X
-1612(University)X
-2007(of)X
-2131(California,)X
-720 5070(Berkeley.)N
-1089(It)X
-1177(will)X
-1340(include)X
-1614(a)X
-1688(btree)X
-1887(access)X
-2131(method)X
-2409(as)X
-720 5158(well)N
-916(as)X
-1041(\256xed)X
-1259(and)X
-1433(variable)X
-1750(length)X
-2007(record)X
-2270(access)X
-720 5246(methods)N
-1024(in)X
-1119(addition)X
-1414(to)X
-1509(the)X
-1640(hashed)X
-1896(support)X
-2168(presented)X
-720 5334(here.)N
-948(All)X
-1099(of)X
-1215(the)X
-1361(access)X
-1615(methods)X
-1934(are)X
-2081(based)X
-2312(on)X
-2440(a)X
-720 5422(key/data)N
-1037(pair)X
-1207(interface)X
-1533(and)X
-1693(appear)X
-1952(identical)X
-2272(to)X
-2378(the)X
-720 5510(application)N
-1121(layer,)X
-1347(allowing)X
-1671(application)X
-2071(implementa-)X
-720 5598(tions)N
-906(to)X
-999(be)X
-1106(largely)X
-1360(independent)X
-1783(of)X
-1881(the)X
-2010(database)X
-2318(type.)X
-720 5686(The)N
-873(package)X
-1165(is)X
-1246(expected)X
-1560(to)X
-1650(be)X
-1754(an)X
-1858(integral)X
-2131(part)X
-2284(of)X
-2378(the)X
-2706 538(4.4BSD)N
-3006(system,)X
-3293(with)X
-3479(various)X
-3759(standard)X
-4075(applications)X
-2706 626(such)N
-2879(as)X
-2972(more\(1\),)X
-3277(sort\(1\))X
-3517(and)X
-3659(vi\(1\))X
-3841(based)X
-4050(on)X
-4156(it.)X
-4266(While)X
-2706 714(the)N
-2833(current)X
-3089(design)X
-3326(does)X
-3501(not)X
-3631(support)X
-3899(multi-user)X
-4256(access)X
-2706 802(or)N
-2804(transactions,)X
-3238(they)X
-3407(could)X
-3616(be)X
-3723(incorporated)X
-4159(relatively)X
-2706 890(easily.)N
-10 f
-2894 938(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2 f
-3365 1030(hash)N
-3638(ndbm)X
-3936(%change)X
-1 f
-10 f
-2894 1034(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2934 1126(CREATE)N
-10 f
-2894 1130(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-3111 1222(user)N
-3390(0.2)X
-3677(0.4)X
-4079(50)X
-3143 1310(sys)N
-3390(0.1)X
-3677(1.0)X
-4079(90)X
-3 f
-2992 1398(elapsed)N
-10 f
-3296 1406(c)N
-1374(c)Y
-1294(c)Y
-1214(c)Y
-3 f
-3390 1398(0)N
-10 f
-3567 1406(c)N
-1374(c)Y
-1294(c)Y
-1214(c)Y
-3 f
-3677 1398(3.2)N
-10 f
-3869 1406(c)N
-1374(c)Y
-1294(c)Y
-1214(c)Y
-3 f
-4039 1398(100)N
-1 f
-10 f
-2894 1394(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2894 1410(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2934 1494(READ)N
-10 f
-2894 1498(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-3111 1590(user)N
-3390(0.1)X
-3677(0.1)X
-4119(0)X
-3143 1678(sys)N
-3390(0.1)X
-3677(0.4)X
-4079(75)X
-3 f
-2992 1766(elapsed)N
-10 f
-3296 1774(c)N
-1742(c)Y
-1662(c)Y
-1582(c)Y
-3 f
-3390 1766(0.0)N
-10 f
-3567 1774(c)N
-1742(c)Y
-1662(c)Y
-1582(c)Y
-3 f
-3677 1766(0.0)N
-10 f
-3869 1774(c)N
-1742(c)Y
-1662(c)Y
-1582(c)Y
-3 f
-4119 1766(0)N
-1 f
-10 f
-2894 1762(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2894 1778(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2934 1862(VERIFY)N
-10 f
-2894 1866(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-3111 1958(user)N
-3390(0.1)X
-3677(0.2)X
-4079(50)X
-3143 2046(sys)N
-3390(0.1)X
-3677(0.3)X
-4079(67)X
-3 f
-2992 2134(elapsed)N
-10 f
-3296 2142(c)N
-2110(c)Y
-2030(c)Y
-1950(c)Y
-3 f
-3390 2134(0.0)N
-10 f
-3567 2142(c)N
-2110(c)Y
-2030(c)Y
-1950(c)Y
-3 f
-3677 2134(0.0)N
-10 f
-3869 2142(c)N
-2110(c)Y
-2030(c)Y
-1950(c)Y
-3 f
-4119 2134(0)N
-1 f
-10 f
-2894 2130(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2894 2146(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2934 2230(SEQUENTIAL)N
-10 f
-2894 2234(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-3111 2326(user)N
-3390(0.1)X
-3677(0.0)X
-4012(-100)X
-3143 2414(sys)N
-3390(0.1)X
-3677(0.1)X
-4119(0)X
-3 f
-2992 2502(elapsed)N
-10 f
-3296 2510(c)N
-2478(c)Y
-2398(c)Y
-2318(c)Y
-3 f
-3390 2502(0.0)N
-10 f
-3567 2510(c)N
-2478(c)Y
-2398(c)Y
-2318(c)Y
-3 f
-3677 2502(0.0)N
-10 f
-3869 2510(c)N
-2478(c)Y
-2398(c)Y
-2318(c)Y
-3 f
-4119 2502(0)N
-1 f
-10 f
-2894 2498(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2894 2514(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2934 2598(SEQUENTIAL)N
-3453(\(with)X
-3642(data)X
-3796(retrieval\))X
-10 f
-2894 2602(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-3111 2694(user)N
-3390(0.1)X
-3677(0.1)X
-4119(0)X
-3143 2782(sys)N
-3390(0.1)X
-3677(0.1)X
-4119(0)X
-3 f
-2992 2870(elapsed)N
-3390(0.0)X
-3677(0.0)X
-4119(0)X
-1 f
-10 f
-2894 2874(i)N
-2913(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2885 2878(c)N
-2862(c)Y
-2782(c)Y
-2702(c)Y
-2622(c)Y
-2542(c)Y
-2462(c)Y
-2382(c)Y
-2302(c)Y
-2222(c)Y
-2142(c)Y
-2062(c)Y
-1982(c)Y
-1902(c)Y
-1822(c)Y
-1742(c)Y
-1662(c)Y
-1582(c)Y
-1502(c)Y
-1422(c)Y
-1342(c)Y
-1262(c)Y
-1182(c)Y
-1102(c)Y
-1022(c)Y
-3296 2878(c)N
-2846(c)Y
-2766(c)Y
-2686(c)Y
-3567 2878(c)N
-2846(c)Y
-2766(c)Y
-2686(c)Y
-3869 2878(c)N
-2846(c)Y
-2766(c)Y
-2686(c)Y
-4264 2878(c)N
-2862(c)Y
-2782(c)Y
-2702(c)Y
-2622(c)Y
-2542(c)Y
-2462(c)Y
-2382(c)Y
-2302(c)Y
-2222(c)Y
-2142(c)Y
-2062(c)Y
-1982(c)Y
-1902(c)Y
-1822(c)Y
-1742(c)Y
-1662(c)Y
-1582(c)Y
-1502(c)Y
-1422(c)Y
-1342(c)Y
-1262(c)Y
-1182(c)Y
-1102(c)Y
-1022(c)Y
-2891 3058(i)N
-2916(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2 f
-3304 3150(hash)N
-3571(hsearch)X
-3939(%change)X
-1 f
-10 f
-2891 3154(i)N
-2916(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2931 3246(CREATE/READ)N
-10 f
-2891 3250(i)N
-2916(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-3050 3342(user)N
-3329(0.3)X
-3648(0.4)X
-4048(25)X
-3082 3430(sys)N
-3329(0.0)X
-3648(0.0)X
-4088(0)X
-3 f
-2931 3518(elapsed)N
-3329(0.0)X
-3648(0.0)X
-4088(0)X
-1 f
-10 f
-2891 3522(i)N
-2916(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2882 3534(c)N
-3462(c)Y
-3382(c)Y
-3302(c)Y
-3222(c)Y
-3142(c)Y
-3235 3518(c)N
-3494(c)Y
-3414(c)Y
-3334(c)Y
-3506 3518(c)N
-3494(c)Y
-3414(c)Y
-3334(c)Y
-3872 3518(c)N
-3494(c)Y
-3414(c)Y
-3334(c)Y
-4267 3534(c)N
-3462(c)Y
-3382(c)Y
-3302(c)Y
-3222(c)Y
-3142(c)Y
-3 f
-2706 3658(Figure)N
-2953(8b:)X
-1 f
-3084(Timing)X
-3339(results)X
-3568(for)X
-3682(the)X
-3800(password)X
-4123(database.)X
-10 f
-2706 3746 -0.0930(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)AN
-3 f
-3396 3988(References)N
-1 f
-2706 4120([ATT79])N
-3058(AT&T,)X
-3358(DBM\(3X\),)X
-2 f
-3773(Unix)X
-3990(Programmer's)X
-2878 4208(Manual,)N
-3194(Seventh)X
-3491(Edition,)X
-3793(Volume)X
-4085(1)X
-1 f
-(,)S
-4192(January,)X
-2878 4296(1979.)N
-2706 4472([ATT85])N
-3027(AT&T,)X
-3296(HSEARCH\(BA_LIB\),)X
-2 f
-4053(Unix)X
-4239(System)X
-2878 4560(User's)N
-3112(Manual,)X
-3401(System)X
-3644(V.3)X
-1 f
-3753(,)X
-3793(pp.)X
-3913(506-508,)X
-4220(1985.)X
-2706 4736([BRE73])N
-3025(Brent,)X
-3253(Richard)X
-3537(P.,)X
-3651(``Reducing)X
-4041(the)X
-4168(Retrieval)X
-2878 4824(Time)N
-3071(of)X
-3162(Scatter)X
-3409(Storage)X
-3678(Techniques'',)X
-2 f
-4146(Commun-)X
-2878 4912(ications)N
-3175(of)X
-3281(the)X
-3422(ACM)X
-1 f
-3591(,)X
-3654(Volume)X
-3955(16,)X
-4098(No.)X
-4259(2,)X
-4362(pp.)X
-2878 5000(105-109,)N
-3185(February,)X
-3515(1973.)X
-2706 5176([BSD86])N
-3055(NDBM\(3\),)X
-2 f
-3469(4.3BSD)X
-3775(Unix)X
-3990(Programmer's)X
-2878 5264(Manual)N
-3155(Reference)X
-3505(Guide)X
-1 f
-3701(,)X
-3749(University)X
-4114(of)X
-4208(Califor-)X
-2878 5352(nia,)N
-3016(Berkeley,)X
-3346(1986.)X
-2706 5528([ENB88])N
-3025(Enbody,)X
-3319(R.)X
-3417(J.,)X
-3533(Du,)X
-3676(H.)X
-3779(C.,)X
-3897(``Dynamic)X
-4270(Hash-)X
-2878 5616(ing)N
-3034(Schemes'',)X
-2 f
-3427(ACM)X
-3630(Computing)X
-4019(Surveys)X
-1 f
-4269(,)X
-4322(Vol.)X
-2878 5704(20,)N
-2998(No.)X
-3136(2,)X
-3216(pp.)X
-3336(85-113,)X
-3603(June)X
-3770(1988.)X
-3 f
-720 5960(USENIX)N
-9 f
-1042(-)X
-3 f
-1106(Winter)X
-1371('91)X
-9 f
-1498(-)X
-3 f
-1562(Dallas,)X
-1815(TX)X
-4384(11)X
-
-12 p
-%%Page: 12 12
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-432 258(A)N
-510(New)X
-682(Hashing)X
-985(Package)X
-1290(for)X
-1413(UNIX)X
-3663(Seltzer)X
-3920(&)X
-4007(Yigit)X
-1 f
-432 538([FAG79])N
-776(Ronald)X
-1057(Fagin,)X
-1308(Jurg)X
-1495(Nievergelt,)X
-1903(Nicholas)X
-604 626(Pippenger,)N
-1003(H.)X
-1135(Raymond)X
-1500(Strong,)X
-1787(``Extendible)X
-604 714(Hashing)N
-901(--)X
-985(A)X
-1073(Fast)X
-1236(Access)X
-1493(Method)X
-1771(for)X
-1894(Dynamic)X
-604 802(Files'',)N
-2 f
-855(ACM)X
-1046(Transactions)X
-1485(on)X
-1586(Database)X
-1914(Systems)X
-1 f
-2168(,)X
-604 890(Volume)N
-882(4,)X
-962(No.)X
-1100(3.,)X
-1200(September)X
-1563(1979,)X
-1763(pp)X
-1863(315-34)X
-432 1066([KNU68],)N
-802(Knuth,)X
-1064(D.E.,)X
-2 f
-1273(The)X
-1434(Art)X
-1577(of)X
-1680(Computer)X
-2041(Pro-)X
-604 1154(gramming)N
-971(Vol.)X
-1140(3:)X
-1245(Sorting)X
-1518(and)X
-1676(Searching)X
-1 f
-2001(,)X
-2058(sec-)X
-604 1242(tions)N
-779(6.3-6.4,)X
-1046(pp)X
-1146(481-550.)X
-432 1418([LAR78])N
-747(Larson,)X
-1011(Per-Ake,)X
-1319(``Dynamic)X
-1687(Hashing'',)X
-2 f
-2048(BIT)X
-1 f
-(,)S
-604 1506(Vol.)N
-764(18,)X
-884(1978,)X
-1084(pp.)X
-1204(184-201.)X
-432 1682([LAR88])N
-752(Larson,)X
-1021(Per-Ake,)X
-1335(``Dynamic)X
-1709(Hash)X
-1900(Tables'',)X
-2 f
-604 1770(Communications)N
-1183(of)X
-1281(the)X
-1415(ACM)X
-1 f
-1584(,)X
-1640(Volume)X
-1934(31,)X
-2070(No.)X
-604 1858(4.,)N
-704(April)X
-893(1988,)X
-1093(pp)X
-1193(446-457.)X
-432 2034([LIT80])N
-731(Witold,)X
-1013(Litwin,)X
-1286(``Linear)X
-1590(Hashing:)X
-1939(A)X
-2036(New)X
-604 2122(Tool)N
-786(for)X
-911(File)X
-1065(and)X
-1211(Table)X
-1424(Addressing'',)X
-2 f
-1893(Proceed-)X
-604 2210(ings)N
-761(of)X
-847(the)X
-969(6th)X
-1095(International)X
-1540(Conference)X
-1933(on)X
-2036(Very)X
-604 2298(Large)N
-815(Databases)X
-1 f
-1153(,)X
-1193(1980.)X
-432 2474([NEL90])N
-743(Nelson,)X
-1011(Philip)X
-1222(A.,)X
-2 f
-1341(Gdbm)X
-1558(1.4)X
-1679(source)X
-1913(distribu-)X
-604 2562(tion)N
-748(and)X
-888(README)X
-1 f
-1209(,)X
-1249(August)X
-1500(1990.)X
-432 2738([THOM90])N
-840(Ken)X
-1011(Thompson,)X
-1410(private)X
-1670(communication,)X
-604 2826(Nov.)N
-782(1990.)X
-432 3002([TOR87])N
-790(Torek,)X
-1066(C.,)X
-1222(``Re:)X
-1470(dbm.a)X
-1751(and)X
-1950(ndbm.a)X
-604 3090(archives'',)N
-2 f
-966(USENET)X
-1279(newsgroup)X
-1650(comp.unix)X
-1 f
-2002(1987.)X
-432 3266([TOR88])N
-760(Torek,)X
-1006(C.,)X
-1133(``Re:)X
-1351(questions)X
-1686(regarding)X
-2027(data-)X
-604 3354(bases)N
-826(created)X
-1106(with)X
-1295(dbm)X
-1484(and)X
-1647(ndbm)X
-1876(routines'')X
-2 f
-604 3442(USENET)N
-937(newsgroup)X
-1328(comp.unix.questions)X
-1 f
-1982(,)X
-2041(June)X
-604 3530(1988.)N
-432 3706([WAL84])N
-773(Wales,)X
-1018(R.,)X
-1135(``Discussion)X
-1564(of)X
-1655("dbm")X
-1887(data)X
-2045(base)X
-604 3794(system'',)N
-2 f
-973(USENET)X
-1339(newsgroup)X
-1762(unix.wizards)X
-1 f
-2168(,)X
-604 3882(January,)N
-894(1984.)X
-432 4058([YIG89])N
-751(Ozan)X
-963(S.)X
-1069(Yigit,)X
-1294(``How)X
-1545(to)X
-1648(Roll)X
-1826(Your)X
-2032(Own)X
-604 4146(Dbm/Ndbm'',)N
-2 f
-1087(unpublished)X
-1504(manuscript)X
-1 f
-(,)S
-1910(Toronto,)X
-604 4234(July,)N
-777(1989)X
-3 f
-432 5960(12)N
-2970(USENIX)X
-9 f
-3292(-)X
-3 f
-3356(Winter)X
-3621('91)X
-9 f
-3748(-)X
-3 f
-3812(Dallas,)X
-4065(TX)X
-
-13 p
-%%Page: 13 13
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-720 258(Seltzer)N
-977(&)X
-1064(Yigit)X
-3278(A)X
-3356(New)X
-3528(Hashing)X
-3831(Package)X
-4136(for)X
-4259(UNIX)X
-1 f
-720 538(Margo)N
-960(I.)X
-1033(Seltzer)X
-1282(is)X
-1361(a)X
-1423(Ph.D.)X
-1631(student)X
-1887(in)X
-1974(the)X
-2097(Department)X
-720 626(of)N
-823(Electrical)X
-1167(Engineering)X
-1595(and)X
-1747(Computer)X
-2102(Sciences)X
-2418(at)X
-720 714(the)N
-850(University)X
-1220(of)X
-1318(California,)X
-1694(Berkeley.)X
-2055(Her)X
-2207(research)X
-720 802(interests)N
-1017(include)X
-1283(\256le)X
-1415(systems,)X
-1718(databases,)X
-2076(and)X
-2221(transac-)X
-720 890(tion)N
-896(processing)X
-1291(systems.)X
-1636(She)X
-1807(spent)X
-2027(several)X
-2306(years)X
-720 978(working)N
-1026(at)X
-1123(startup)X
-1380(companies)X
-1762(designing)X
-2112(and)X
-2267(imple-)X
-720 1066(menting)N
-1048(\256le)X
-1216(systems)X
-1535(and)X
-1716(transaction)X
-2133(processing)X
-720 1154(software)N
-1026(and)X
-1170(designing)X
-1509(microprocessors.)X
-2103(Ms.)X
-2253(Seltzer)X
-720 1242(received)N
-1057(her)X
-1223(AB)X
-1397(in)X
-1522(Applied)X
-1843(Mathematics)X
-2320(from)X
-720 1330 0.1953(Harvard/Radcliffe)AN
-1325(College)X
-1594(in)X
-1676(1983.)X
-720 1444(In)N
-810(her)X
-936(spare)X
-1129(time,)X
-1313(Margo)X
-1549(can)X
-1683(usually)X
-1936(be)X
-2034(found)X
-2243(prepar-)X
-720 1532(ing)N
-868(massive)X
-1171(quantities)X
-1527(of)X
-1639(food)X
-1831(for)X
-1970(hungry)X
-2242(hoards,)X
-720 1620(studying)N
-1022(Japanese,)X
-1355(or)X
-1449(playing)X
-1716(soccer)X
-1948(with)X
-2116(an)X
-2218(exciting)X
-720 1708(Bay)N
-912(Area)X
-1132(Women's)X
-1507(Soccer)X
-1788(team,)X
-2026(the)X
-2186(Berkeley)X
-720 1796(Bruisers.)N
-720 1910(Ozan)N
-915(\()X
-3 f
-942(Oz)X
-1 f
-1040(\))X
-1092(Yigit)X
-1281(is)X
-1358(currently)X
-1672(a)X
-1732(software)X
-2033(engineer)X
-2334(with)X
-720 1998(the)N
-886(Communications)X
-1499(Research)X
-1861(and)X
-2044(Development)X
-720 2086(group,)N
-948(Computing)X
-1328(Services,)X
-1641(York)X
-1826(University.)X
-2224(His)X
-2355(for-)X
-720 2174(mative)N
-967(years)X
-1166(were)X
-1352(also)X
-1510(spent)X
-1708(at)X
-1795(York,)X
-2009(where)X
-2234(he)X
-2338(held)X
-720 2262(system)N
-985(programmer)X
-1425(and)X
-1583(administrator)X
-2052(positions)X
-2382(for)X
-720 2350(various)N
-995(mixtures)X
-1314(of)X
-1420(of)X
-1526(UNIX)X
-1765(systems)X
-2056(starting)X
-2334(with)X
-720 2438(Berkeley)N
-1031(4.1)X
-1151(in)X
-1233(1982,)X
-1433(while)X
-1631(at)X
-1709(the)X
-1827(same)X
-2012(time)X
-2174(obtaining)X
-720 2526(a)N
-776(degree)X
-1011(in)X
-1093(Computer)X
-1433(Science.)X
-720 2640(In)N
-813(his)X
-931(copious)X
-1205(free)X
-1356(time,)X
-1543(Oz)X
-1662(enjoys)X
-1896(working)X
-2188(on)X
-2293(what-)X
-720 2728(ever)N
-890(software)X
-1197(looks)X
-1400(interesting,)X
-1788(which)X
-2014(often)X
-2209(includes)X
-720 2816(language)N
-1044(interpreters,)X
-1464(preprocessors,)X
-1960(and)X
-2110(lately,)X
-2342(pro-)X
-720 2904(gram)N
-905(generators)X
-1260(and)X
-1396(expert)X
-1617(systems.)X
-720 3018(Oz)N
-836(has)X
-964(authored)X
-1266(several)X
-1515(public-domain)X
-2003(software)X
-2301(tools,)X
-720 3106(including)N
-1069(an)X
-1191(nroff-like)X
-1545(text)X
-1711(formatter)X
-2 f
-2056(proff)X
-1 f
-2257(that)X
-2423(is)X
-720 3194(apparently)N
-1083(still)X
-1226(used)X
-1397(in)X
-1483(some)X
-1676(basement)X
-2002(PCs.)X
-2173(His)X
-2307(latest)X
-720 3282(obsessions)N
-1143(include)X
-1460(the)X
-1639(incredible)X
-2040(programming)X
-720 3370(language)N
-1030(Scheme,)X
-1324(and)X
-1460(Chinese)X
-1738(Brush)X
-1949(painting.)X
-3 f
-720 5960(USENIX)N
-9 f
-1042(-)X
-3 f
-1106(Winter)X
-1371('91)X
-9 f
-1498(-)X
-3 f
-1562(Dallas,)X
-1815(TX)X
-4384(13)X
-
-14 p
-%%Page: 14 14
-0(Courier)xf 0 f
-10 s 10 xH 0 xS 0 f
-3 f
-432 5960(14)N
-2970(USENIX)X
-9 f
-3292(-)X
-3 f
-3356(Winter)X
-3621('91)X
-9 f
-3748(-)X
-3 f
-3812(Dallas,)X
-4065(TX)X
-
-14 p
-%%Trailer
-xt
-
-xs
diff --git a/lib/libc_bsd/db/docs/libtp.usenix.ps b/lib/libc_bsd/db/docs/libtp.usenix.ps
deleted file mode 100644
index 67bac27..0000000
--- a/lib/libc_bsd/db/docs/libtp.usenix.ps
+++ /dev/null
@@ -1,12340 +0,0 @@
-%!PS-Adobe-1.0
-%%Creator: utopia:margo (& Seltzer,608-13E,8072,)
-%%Title: stdin (ditroff)
-%%CreationDate: Thu Dec 12 15:32:11 1991
-%%EndComments
-%	@(#)psdit.pro	1.3 4/15/88
-% lib/psdit.pro -- prolog for psdit (ditroff) files
-% Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved.
-% last edit: shore Sat Nov 23 20:28:03 1985
-% RCSID: $FreeBSD: releng/10.2/lib/libc/db/docs/libtp.usenix.ps 50488 1999-08-28 05:11:36Z peter $
-
-% Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics,
-% 17 Feb, 87.
-
-/$DITroff 140 dict def $DITroff begin
-/fontnum 1 def /fontsize 10 def /fontheight 10 def /fontslant 0 def
-/xi{0 72 11 mul translate 72 resolution div dup neg scale 0 0 moveto
- /fontnum 1 def /fontsize 10 def /fontheight 10 def /fontslant 0 def F
- /pagesave save def}def
-/PB{save /psv exch def currentpoint translate 
- resolution 72 div dup neg scale 0 0 moveto}def
-/PE{psv restore}def
-/arctoobig 90 def /arctoosmall .05 def
-/m1 matrix def /m2 matrix def /m3 matrix def /oldmat matrix def
-/tan{dup sin exch cos div}def
-/point{resolution 72 div mul}def
-/dround	{transform round exch round exch itransform}def
-/xT{/devname exch def}def
-/xr{/mh exch def /my exch def /resolution exch def}def
-/xp{}def
-/xs{docsave restore end}def
-/xt{}def
-/xf{/fontname exch def /slotno exch def fontnames slotno get fontname eq not
- {fonts slotno fontname findfont put fontnames slotno fontname put}if}def
-/xH{/fontheight exch def F}def
-/xS{/fontslant exch def F}def
-/s{/fontsize exch def /fontheight fontsize def F}def
-/f{/fontnum exch def F}def
-/F{fontheight 0 le{/fontheight fontsize def}if
- fonts fontnum get fontsize point 0 0 fontheight point neg 0 0 m1 astore
- fontslant 0 ne{1 0 fontslant tan 1 0 0 m2 astore m3 concatmatrix}if
- makefont setfont .04 fontsize point mul 0 dround pop setlinewidth}def
-/X{exch currentpoint exch pop moveto show}def
-/N{3 1 roll moveto show}def
-/Y{exch currentpoint pop exch moveto show}def
-/S{show}def
-/ditpush{}def/ditpop{}def
-/AX{3 -1 roll currentpoint exch pop moveto 0 exch ashow}def
-/AN{4 2 roll moveto 0 exch ashow}def
-/AY{3 -1 roll currentpoint pop exch moveto 0 exch ashow}def
-/AS{0 exch ashow}def
-/MX{currentpoint exch pop moveto}def
-/MY{currentpoint pop exch moveto}def
-/MXY{moveto}def
-/cb{pop}def	% action on unknown char -- nothing for now
-/n{}def/w{}def
-/p{pop showpage pagesave restore /pagesave save def}def
-/Dt{/Dlinewidth exch def}def 1 Dt
-/Ds{/Ddash exch def}def -1 Ds
-/Di{/Dstipple exch def}def 1 Di
-/Dsetlinewidth{2 Dlinewidth mul setlinewidth}def
-/Dsetdash{Ddash 4 eq{[8 12]}{Ddash 16 eq{[32 36]}
- {Ddash 20 eq{[32 12 8 12]}{[]}ifelse}ifelse}ifelse 0 setdash}def
-/Dstroke{gsave Dsetlinewidth Dsetdash 1 setlinecap stroke grestore
- currentpoint newpath moveto}def
-/Dl{rlineto Dstroke}def
-/arcellipse{/diamv exch def /diamh exch def oldmat currentmatrix pop
- currentpoint translate 1 diamv diamh div scale /rad diamh 2 div def
- currentpoint exch rad add exch rad -180 180 arc oldmat setmatrix}def
-/Dc{dup arcellipse Dstroke}def
-/De{arcellipse Dstroke}def
-/Da{/endv exch def /endh exch def /centerv exch def /centerh exch def
- /cradius centerv centerv mul centerh centerh mul add sqrt def
- /eradius endv endv mul endh endh mul add sqrt def
- /endang endv endh atan def
- /startang centerv neg centerh neg atan def
- /sweep startang endang sub dup 0 lt{360 add}if def
- sweep arctoobig gt
- {/midang startang sweep 2 div sub def /midrad cradius eradius add 2 div def
-  /midh midang cos midrad mul def /midv midang sin midrad mul def
-  midh neg midv neg endh endv centerh centerv midh midv Da
-  Da}
- {sweep arctoosmall ge
-  {/controldelt 1 sweep 2 div cos sub 3 sweep 2 div sin mul div 4 mul def
-   centerv neg controldelt mul centerh controldelt mul
-   endv neg controldelt mul centerh add endh add
-   endh controldelt mul centerv add endv add
-   centerh endh add centerv endv add rcurveto Dstroke}
-  {centerh endh add centerv endv add rlineto Dstroke}
-  ifelse}
- ifelse}def
-/Dpatterns[
-[%cf[widthbits]
-[8<0000000000000010>]
-[8<0411040040114000>]
-[8<0204081020408001>]
-[8<0000103810000000>]
-[8<6699996666999966>]
-[8<0000800100001008>]
-[8<81c36666c3810000>]
-[8<0f0e0c0800000000>]
-[8<0000000000000010>]
-[8<0411040040114000>]
-[8<0204081020408001>]
-[8<0000001038100000>]
-[8<6699996666999966>]
-[8<0000800100001008>]
-[8<81c36666c3810000>]
-[8<0f0e0c0800000000>]
-[8<0042660000246600>]
-[8<0000990000990000>]
-[8<0804020180402010>]
-[8<2418814242811824>]
-[8<6699996666999966>]
-[8<8000000008000000>]
-[8<00001c3e363e1c00>]
-[8<0000000000000000>]
-[32<00000040000000c00000004000000040000000e0000000000000000000000000>]
-[32<00000000000060000000900000002000000040000000f0000000000000000000>]
-[32<000000000000000000e0000000100000006000000010000000e0000000000000>]
-[32<00000000000000002000000060000000a0000000f00000002000000000000000>]
-[32<0000000e0000000000000000000000000000000f000000080000000e00000001>]
-[32<0000090000000600000000000000000000000000000007000000080000000e00>]
-[32<00010000000200000004000000040000000000000000000000000000000f0000>]
-[32<0900000006000000090000000600000000000000000000000000000006000000>]]
-[%ug
-[8<0000020000000000>]
-[8<0000020000002000>]
-[8<0004020000002000>]
-[8<0004020000402000>]
-[8<0004060000402000>]
-[8<0004060000406000>]
-[8<0006060000406000>]
-[8<0006060000606000>]
-[8<00060e0000606000>]
-[8<00060e000060e000>]
-[8<00070e000060e000>]
-[8<00070e000070e000>]
-[8<00070e020070e000>]
-[8<00070e020070e020>]
-[8<04070e020070e020>]
-[8<04070e024070e020>]
-[8<04070e064070e020>]
-[8<04070e064070e060>]
-[8<06070e064070e060>]
-[8<06070e066070e060>]
-[8<06070f066070e060>]
-[8<06070f066070f060>]
-[8<060f0f066070f060>]
-[8<060f0f0660f0f060>]
-[8<060f0f0760f0f060>]
-[8<060f0f0760f0f070>]
-[8<0e0f0f0760f0f070>]
-[8<0e0f0f07e0f0f070>]
-[8<0e0f0f0fe0f0f070>]
-[8<0e0f0f0fe0f0f0f0>]
-[8<0f0f0f0fe0f0f0f0>]
-[8<0f0f0f0ff0f0f0f0>]
-[8<1f0f0f0ff0f0f0f0>]
-[8<1f0f0f0ff1f0f0f0>]
-[8<1f0f0f8ff1f0f0f0>]
-[8<1f0f0f8ff1f0f0f8>]
-[8<9f0f0f8ff1f0f0f8>]
-[8<9f0f0f8ff9f0f0f8>]
-[8<9f0f0f9ff9f0f0f8>]
-[8<9f0f0f9ff9f0f0f9>]
-[8<9f8f0f9ff9f0f0f9>]
-[8<9f8f0f9ff9f8f0f9>]
-[8<9f8f1f9ff9f8f0f9>]
-[8<9f8f1f9ff9f8f1f9>]
-[8<bf8f1f9ff9f8f1f9>]
-[8<bf8f1f9ffbf8f1f9>]
-[8<bf8f1fdffbf8f1f9>]
-[8<bf8f1fdffbf8f1fd>]
-[8<ff8f1fdffbf8f1fd>]
-[8<ff8f1fdffff8f1fd>]
-[8<ff8f1ffffff8f1fd>]
-[8<ff8f1ffffff8f1ff>]
-[8<ff9f1ffffff8f1ff>]
-[8<ff9f1ffffff9f1ff>]
-[8<ff9f9ffffff9f1ff>]
-[8<ff9f9ffffff9f9ff>]
-[8<ffbf9ffffff9f9ff>]
-[8<ffbf9ffffffbf9ff>]
-[8<ffbfdffffffbf9ff>]
-[8<ffbfdffffffbfdff>]
-[8<ffffdffffffbfdff>]
-[8<ffffdffffffffdff>]
-[8<fffffffffffffdff>]
-[8<ffffffffffffffff>]]
-[%mg
-[8<8000000000000000>]
-[8<0822080080228000>]
-[8<0204081020408001>]
-[8<40e0400000000000>]
-[8<66999966>]
-[8<8001000010080000>]
-[8<81c36666c3810000>]
-[8<f0e0c08000000000>]
-[16<07c00f801f003e007c00f800f001e003c007800f001f003e007c00f801f003e0>]
-[16<1f000f8007c003e001f000f8007c003e001f800fc007e003f001f8007c003e00>]
-[8<c3c300000000c3c3>]
-[16<0040008001000200040008001000200040008000000100020004000800100020>]
-[16<0040002000100008000400020001800040002000100008000400020001000080>]
-[16<1fc03fe07df0f8f8f07de03fc01f800fc01fe03ff07df8f87df03fe01fc00f80>]
-[8<80>]
-[8<8040201000000000>]
-[8<84cc000048cc0000>]
-[8<9900009900000000>]
-[8<08040201804020100800020180002010>]
-[8<2418814242811824>]
-[8<66999966>]
-[8<8000000008000000>]
-[8<70f8d8f870000000>]
-[8<0814224180402010>]
-[8<aa00440a11a04400>]
-[8<018245aa45820100>]
-[8<221c224180808041>]
-[8<88000000>]
-[8<0855800080550800>]
-[8<2844004482440044>]
-[8<0810204080412214>]
-[8<00>]]]def
-/Dfill{
- transform /maxy exch def /maxx exch def
- transform /miny exch def /minx exch def
- minx maxx gt{/minx maxx /maxx minx def def}if
- miny maxy gt{/miny maxy /maxy miny def def}if
- Dpatterns Dstipple 1 sub get exch 1 sub get
- aload pop /stip exch def /stipw exch def /stiph 128 def
- /imatrix[stipw 0 0 stiph 0 0]def
- /tmatrix[stipw 0 0 stiph 0 0]def
- /minx minx cvi stiph idiv stiph mul def
- /miny miny cvi stipw idiv stipw mul def
- gsave eoclip 0 setgray
- miny stiph maxy{
-  tmatrix exch 5 exch put
-  minx stipw maxx{
-   tmatrix exch 4 exch put tmatrix setmatrix
-   stipw stiph true imatrix {stip} imagemask
-  }for
- }for
- grestore
-}def
-/Dp{Dfill Dstroke}def
-/DP{Dfill currentpoint newpath moveto}def
-end
-
-/ditstart{$DITroff begin
- /nfonts 60 def			% NFONTS makedev/ditroff dependent!
- /fonts[nfonts{0}repeat]def
- /fontnames[nfonts{()}repeat]def
-/docsave save def
-}def
-
-% character outcalls
-/oc{
- /pswid exch def /cc exch def /name exch def
- /ditwid pswid fontsize mul resolution mul 72000 div def
- /ditsiz fontsize resolution mul 72 div def
- ocprocs name known{ocprocs name get exec}{name cb}ifelse
-}def
-/fractm [.65 0 0 .6 0 0] def
-/fraction{
- /fden exch def /fnum exch def gsave /cf currentfont def
- cf fractm makefont setfont 0 .3 dm 2 copy neg rmoveto
- fnum show rmoveto currentfont cf setfont(\244)show setfont fden show 
- grestore ditwid 0 rmoveto
-}def
-/oce{grestore ditwid 0 rmoveto}def
-/dm{ditsiz mul}def
-/ocprocs 50 dict def ocprocs begin
-(14){(1)(4)fraction}def
-(12){(1)(2)fraction}def
-(34){(3)(4)fraction}def
-(13){(1)(3)fraction}def
-(23){(2)(3)fraction}def
-(18){(1)(8)fraction}def
-(38){(3)(8)fraction}def
-(58){(5)(8)fraction}def
-(78){(7)(8)fraction}def
-(sr){gsave 0 .06 dm rmoveto(\326)show oce}def
-(is){gsave 0 .15 dm rmoveto(\362)show oce}def
-(->){gsave 0 .02 dm rmoveto(\256)show oce}def
-(<-){gsave 0 .02 dm rmoveto(\254)show oce}def
-(==){gsave 0 .05 dm rmoveto(\272)show oce}def
-(uc){gsave currentpoint 400 .009 dm mul add translate
-     8 -8 scale ucseal oce}def
-end
-
-% an attempt at a PostScript FONT to implement ditroff special chars
-% this will enable us to 
-%	cache the little buggers
-%	generate faster, more compact PS out of psdit
-%	confuse everyone (including myself)!
-50 dict dup begin
-/FontType 3 def
-/FontName /DIThacks def
-/FontMatrix [.001 0 0 .001 0 0] def
-/FontBBox [-260 -260 900 900] def% a lie but ...
-/Encoding 256 array def
-0 1 255{Encoding exch /.notdef put}for
-Encoding
- dup 8#040/space put %space
- dup 8#110/rc put %right ceil
- dup 8#111/lt put %left  top curl
- dup 8#112/bv put %bold vert
- dup 8#113/lk put %left  mid curl
- dup 8#114/lb put %left  bot curl
- dup 8#115/rt put %right top curl
- dup 8#116/rk put %right mid curl
- dup 8#117/rb put %right bot curl
- dup 8#120/rf put %right floor
- dup 8#121/lf put %left  floor
- dup 8#122/lc put %left  ceil
- dup 8#140/sq put %square
- dup 8#141/bx put %box
- dup 8#142/ci put %circle
- dup 8#143/br put %box rule
- dup 8#144/rn put %root extender
- dup 8#145/vr put %vertical rule
- dup 8#146/ob put %outline bullet
- dup 8#147/bu put %bullet
- dup 8#150/ru put %rule
- dup 8#151/ul put %underline
- pop
-/DITfd 100 dict def
-/BuildChar{0 begin
- /cc exch def /fd exch def
- /charname fd /Encoding get cc get def
- /charwid fd /Metrics get charname get def
- /charproc fd /CharProcs get charname get def
- charwid 0 fd /FontBBox get aload pop setcachedevice
- 2 setlinejoin 40 setlinewidth
- newpath 0 0 moveto gsave charproc grestore
- end}def
-/BuildChar load 0 DITfd put
-/CharProcs 50 dict def
-CharProcs begin
-/space{}def
-/.notdef{}def
-/ru{500 0 rls}def
-/rn{0 840 moveto 500 0 rls}def
-/vr{0 800 moveto 0 -770 rls}def
-/bv{0 800 moveto 0 -1000 rls}def
-/br{0 840 moveto 0 -1000 rls}def
-/ul{0 -140 moveto 500 0 rls}def
-/ob{200 250 rmoveto currentpoint newpath 200 0 360 arc closepath stroke}def
-/bu{200 250 rmoveto currentpoint newpath 200 0 360 arc closepath fill}def
-/sq{80 0 rmoveto currentpoint dround newpath moveto
-    640 0 rlineto 0 640 rlineto -640 0 rlineto closepath stroke}def
-/bx{80 0 rmoveto currentpoint dround newpath moveto
-    640 0 rlineto 0 640 rlineto -640 0 rlineto closepath fill}def
-/ci{500 360 rmoveto currentpoint newpath 333 0 360 arc
-    50 setlinewidth stroke}def
-
-/lt{0 -200 moveto 0 550 rlineto currx 800 2cx s4 add exch s4 a4p stroke}def
-/lb{0 800 moveto 0 -550 rlineto currx -200 2cx s4 add exch s4 a4p stroke}def
-/rt{0 -200 moveto 0 550 rlineto currx 800 2cx s4 sub exch s4 a4p stroke}def
-/rb{0 800 moveto 0 -500 rlineto currx -200 2cx s4 sub exch s4 a4p stroke}def
-/lk{0 800 moveto 0 300 -300 300 s4 arcto pop pop 1000 sub
-    0 300 4 2 roll s4 a4p 0 -200 lineto stroke}def
-/rk{0 800 moveto 0 300 s2 300 s4 arcto pop pop 1000 sub
-    0 300 4 2 roll s4 a4p 0 -200 lineto stroke}def
-/lf{0 800 moveto 0 -1000 rlineto s4 0 rls}def
-/rf{0 800 moveto 0 -1000 rlineto s4 neg 0 rls}def
-/lc{0 -200 moveto 0 1000 rlineto s4 0 rls}def
-/rc{0 -200 moveto 0 1000 rlineto s4 neg 0 rls}def
-end
-
-/Metrics 50 dict def Metrics begin
-/.notdef 0 def
-/space 500 def
-/ru 500 def
-/br 0 def
-/lt 416 def
-/lb 416 def
-/rt 416 def
-/rb 416 def
-/lk 416 def
-/rk 416 def
-/rc 416 def
-/lc 416 def
-/rf 416 def
-/lf 416 def
-/bv 416 def
-/ob 350 def
-/bu 350 def
-/ci 750 def
-/bx 750 def
-/sq 750 def
-/rn 500 def
-/ul 500 def
-/vr 0 def
-end
-
-DITfd begin
-/s2 500 def /s4 250 def /s3 333 def
-/a4p{arcto pop pop pop pop}def
-/2cx{2 copy exch}def
-/rls{rlineto stroke}def
-/currx{currentpoint pop}def
-/dround{transform round exch round exch itransform} def
-end
-end
-/DIThacks exch definefont pop
-ditstart
-(psc)xT
-576 1 1 xr
-1(Times-Roman)xf 1 f
-2(Times-Italic)xf 2 f
-3(Times-Bold)xf 3 f
-4(Times-BoldItalic)xf 4 f
-5(Helvetica)xf 5 f
-6(Helvetica-Bold)xf 6 f
-7(Courier)xf 7 f
-8(Courier-Bold)xf 8 f
-9(Symbol)xf 9 f
-10(DIThacks)xf 10 f
-10 s
-1 f
-xi
-%%EndProlog
-
-%%Page: 1 1
-10 s 10 xH 0 xS 1 f
-3 f
-14 s
-1205 1206(LIBTP:)N
-1633(Portable,)X
-2100(M)X
-2206(odular)X
-2551(Transactions)X
-3202(for)X
-3374(UNIX)X
-1 f
-11 s
-3661 1162(1)N
-2 f
-12 s
-2182 1398(Margo)N
-2467(Seltzer)X
-2171 1494(Michael)N
-2511(Olson)X
-1800 1590(University)N
-2225(of)X
-2324(California,)X
-2773(Berkeley)X
-3 f
-2277 1878(Abstract)N
-1 f
-10 s
-755 2001(Transactions)N
-1198(provide)X
-1475(a)X
-1543(useful)X
-1771(programming)X
-2239(paradigm)X
-2574(for)X
-2700(maintaining)X
-3114(logical)X
-3364(consistency,)X
-3790(arbitrating)X
-4156(con-)X
-555 2091(current)N
-808(access,)X
-1059(and)X
-1200(managing)X
-1540(recovery.)X
-1886(In)X
-1977(traditional)X
-2330(UNIX)X
-2555(systems,)X
-2852(the)X
-2974(only)X
-3140(easy)X
-3307(way)X
-3465(of)X
-3556(using)X
-3753(transactions)X
-4160(is)X
-4237(to)X
-555 2181(purchase)N
-876(a)X
-947(database)X
-1258(system.)X
-1554(Such)X
-1748(systems)X
-2035(are)X
-2168(often)X
-2367(slow,)X
-2572(costly,)X
-2817(and)X
-2967(may)X
-3139(not)X
-3275(provide)X
-3554(the)X
-3686(exact)X
-3890(functionality)X
-555 2271(desired.)N
-848(This)X
-1011(paper)X
-1210(presents)X
-1493(the)X
-1611(design,)X
-1860(implementation,)X
-2402(and)X
-2538(performance)X
-2965(of)X
-3052(LIBTP,)X
-3314(a)X
-3370(simple,)X
-3623(non-proprietary)X
-4147(tran-)X
-555 2361(saction)N
-809(library)X
-1050(using)X
-1249(the)X
-1373(4.4BSD)X
-1654(database)X
-1957(access)X
-2189(routines)X
-2473(\()X
-3 f
-2500(db)X
-1 f
-2588(\(3\)\).)X
-2775(On)X
-2899(a)X
-2961(conventional)X
-3401(transaction)X
-3779(processing)X
-4148(style)X
-555 2451(benchmark,)N
-959(its)X
-1061(performance)X
-1495(is)X
-1575(approximately)X
-2065(85%)X
-2239(that)X
-2386(of)X
-2480(the)X
-2604(database)X
-2907(access)X
-3139(routines)X
-3423(without)X
-3693(transaction)X
-4071(protec-)X
-555 2541(tion,)N
-725(200%)X
-938(that)X
-1084(of)X
-1177(using)X
-3 f
-1376(fsync)X
-1 f
-1554(\(2\))X
-1674(to)X
-1761(commit)X
-2030(modi\256cations)X
-2490(to)X
-2577(disk,)X
-2755(and)X
-2896(125%)X
-3108(that)X
-3253(of)X
-3345(a)X
-3406(commercial)X
-3810(relational)X
-4138(data-)X
-555 2631(base)N
-718(system.)X
-3 f
-555 2817(1.)N
-655(Introduction)X
-1 f
-755 2940(Transactions)N
-1186(are)X
-1306(used)X
-1474(in)X
-1557(database)X
-1855(systems)X
-2129(to)X
-2212(enable)X
-2443(concurrent)X
-2807(users)X
-2992(to)X
-3074(apply)X
-3272(multi-operation)X
-3790(updates)X
-4055(without)X
-555 3030(violating)N
-863(the)X
-985(integrity)X
-1280(of)X
-1371(the)X
-1493(database.)X
-1814(They)X
-2003(provide)X
-2271(the)X
-2392(properties)X
-2736(of)X
-2826(atomicity,)X
-3171(consistency,)X
-3588(isolation,)X
-3906(and)X
-4045(durabil-)X
-555 3120(ity.)N
-701(By)X
-816(atomicity,)X
-1160(we)X
-1276(mean)X
-1472(that)X
-1614(the)X
-1734(set)X
-1845(of)X
-1934(updates)X
-2200(comprising)X
-2581(a)X
-2638(transaction)X
-3011(must)X
-3187(be)X
-3284(applied)X
-3541(as)X
-3629(a)X
-3686(single)X
-3898(unit;)X
-4085(that)X
-4226(is,)X
-555 3210(they)N
-714(must)X
-890(either)X
-1094(all)X
-1195(be)X
-1292(applied)X
-1549(to)X
-1632(the)X
-1751(database)X
-2049(or)X
-2137(all)X
-2238(be)X
-2335(absent.)X
-2601(Consistency)X
-3013(requires)X
-3293(that)X
-3434(a)X
-3491(transaction)X
-3864(take)X
-4019(the)X
-4138(data-)X
-555 3300(base)N
-725(from)X
-908(one)X
-1051(logically)X
-1358(consistent)X
-1704(state)X
-1877(to)X
-1965(another.)X
-2272(The)X
-2423(property)X
-2721(of)X
-2814(isolation)X
-3115(requires)X
-3400(that)X
-3546(concurrent)X
-3916(transactions)X
-555 3390(yield)N
-750(results)X
-994(which)X
-1225(are)X
-1358(indistinguishable)X
-1938(from)X
-2128(the)X
-2260(results)X
-2503(which)X
-2733(would)X
-2967(be)X
-3077(obtained)X
-3387(by)X
-3501(running)X
-3784(the)X
-3916(transactions)X
-555 3480(sequentially.)N
-1002(Finally,)X
-1268(durability)X
-1599(requires)X
-1878(that)X
-2018(once)X
-2190(transactions)X
-2593(have)X
-2765(been)X
-2937(committed,)X
-3319(their)X
-3486(results)X
-3715(must)X
-3890(be)X
-3986(preserved)X
-555 3570(across)N
-776(system)X
-1018(failures)X
-1279([TPCB90].)X
-755 3693(Although)N
-1080(these)X
-1268(properties)X
-1612(are)X
-1734(most)X
-1912(frequently)X
-2265(discussed)X
-2595(in)X
-2680(the)X
-2801(context)X
-3060(of)X
-3150(databases,)X
-3501(they)X
-3661(are)X
-3782(useful)X
-4000(program-)X
-555 3783(ming)N
-750(paradigms)X
-1114(for)X
-1238(more)X
-1433(general)X
-1700(purpose)X
-1984(applications.)X
-2441(There)X
-2659(are)X
-2788(several)X
-3046(different)X
-3353(situations)X
-3689(where)X
-3916(transactions)X
-555 3873(can)N
-687(be)X
-783(used)X
-950(to)X
-1032(replace)X
-1285(current)X
-1533(ad-hoc)X
-1772(mechanisms.)X
-755 3996(One)N
-910(situation)X
-1206(is)X
-1280(when)X
-1475(multiple)X
-1762(\256les)X
-1916(or)X
-2004(parts)X
-2181(of)X
-2269(\256les)X
-2422(need)X
-2594(to)X
-2676(be)X
-2772(updated)X
-3046(in)X
-3128(an)X
-3224(atomic)X
-3462(fashion.)X
-3758(For)X
-3889(example,)X
-4201(the)X
-555 4086(traditional)N
-907(UNIX)X
-1131(\256le)X
-1256(system)X
-1501(uses)X
-1661(ordering)X
-1955(constraints)X
-2324(to)X
-2408(achieve)X
-2676(recoverability)X
-3144(in)X
-3228(the)X
-3348(face)X
-3505(of)X
-3594(crashes.)X
-3893(When)X
-4107(a)X
-4165(new)X
-555 4176(\256le)N
-678(is)X
-752(created,)X
-1026(its)X
-1122(inode)X
-1321(is)X
-1395(written)X
-1642(to)X
-1724(disk)X
-1877(before)X
-2103(the)X
-2221(new)X
-2375(\256le)X
-2497(is)X
-2570(added)X
-2782(to)X
-2864(the)X
-2982(directory)X
-3292(structure.)X
-3633(This)X
-3795(guarantees)X
-4159(that,)X
-555 4266(if)N
-627(the)X
-748(system)X
-993(crashes)X
-1253(between)X
-1544(the)X
-1665(two)X
-1808(I/O's,)X
-2016(the)X
-2137(directory)X
-2450(does)X
-2620(not)X
-2744(contain)X
-3002(a)X
-3060 0.4531(reference)AX
-3383(to)X
-3467(an)X
-3565(invalid)X
-3809(inode.)X
-4049(In)X
-4138(actu-)X
-555 4356(ality,)N
-741(the)X
-863(desired)X
-1119(effect)X
-1326(is)X
-1402(that)X
-1545(these)X
-1733(two)X
-1876(updates)X
-2144(have)X
-2319(the)X
-2440(transactional)X
-2873(property)X
-3168(of)X
-3258(atomicity)X
-3583(\(either)X
-3816(both)X
-3981(writes)X
-4200(are)X
-555 4446(visible)N
-790(or)X
-879(neither)X
-1124(is\).)X
-1266(Rather)X
-1501(than)X
-1660(building)X
-1947(special)X
-2191(purpose)X
-2466(recovery)X
-2769(mechanisms)X
-3186(into)X
-3331(the)X
-3450(\256le)X
-3573(system)X
-3816(or)X
-3904(related)X
-4144(tools)X
-555 4536(\()N
-2 f
-582(e.g.)X
-3 f
-726(fsck)X
-1 f
-864(\(8\)\),)X
-1033(one)X
-1177(could)X
-1383(use)X
-1518(general)X
-1783(purpose)X
-2064(transaction)X
-2443(recovery)X
-2752(protocols)X
-3077(after)X
-3252(system)X
-3501(failure.)X
-3778(Any)X
-3943(application)X
-555 4626(that)N
-705(needs)X
-918(to)X
-1010(keep)X
-1192(multiple,)X
-1508(related)X
-1757(\256les)X
-1920(\(or)X
-2044(directories\))X
-2440(consistent)X
-2790(should)X
-3032(do)X
-3141(so)X
-3241(using)X
-3443(transactions.)X
-3895(Source)X
-4147(code)X
-555 4716(control)N
-805(systems,)X
-1101(such)X
-1271(as)X
-1361(RCS)X
-1534(and)X
-1673(SCCS,)X
-1910(should)X
-2146(use)X
-2276(transaction)X
-2651(semantics)X
-2990(to)X
-3075(allow)X
-3276(the)X
-3397(``checking)X
-3764(in'')X
-3903(of)X
-3992(groups)X
-4232(of)X
-555 4806(related)N
-801(\256les.)X
-1001(In)X
-1095(this)X
-1237(way,)X
-1418(if)X
-1493(the)X
-1617 0.2841(``check-in'')AX
-2028(fails,)X
-2212(the)X
-2336(transaction)X
-2714(may)X
-2878(be)X
-2980(aborted,)X
-3267(backing)X
-3547(out)X
-3675(the)X
-3799(partial)X
-4030(``check-)X
-555 4896(in'')N
-691(leaving)X
-947(the)X
-1065(source)X
-1295(repository)X
-1640(in)X
-1722(a)X
-1778(consistent)X
-2118(state.)X
-755 5019(A)N
-842(second)X
-1094(situation)X
-1398(where)X
-1624(transactions)X
-2036(can)X
-2177(be)X
-2282(used)X
-2458(to)X
-2549(replace)X
-2811(current)X
-3068(ad-hoc)X
-3316(mechanisms)X
-3741(is)X
-3822(in)X
-3912(applications)X
-555 5109(where)N
-776(concurrent)X
-1144(updates)X
-1413(to)X
-1499(a)X
-1559(shared)X
-1793(\256le)X
-1919(are)X
-2042(desired,)X
-2318(but)X
-2444(there)X
-2629(is)X
-2706(logical)X
-2948(consistency)X
-3345(of)X
-3435(the)X
-3556(data)X
-3713(which)X
-3932(needs)X
-4138(to)X
-4223(be)X
-555 5199(preserved.)N
-928(For)X
-1059(example,)X
-1371(when)X
-1565(the)X
-1683(password)X
-2006(\256le)X
-2128(is)X
-2201(updated,)X
-2495(\256le)X
-2617(locking)X
-2877(is)X
-2950(used)X
-3117(to)X
-3199(disallow)X
-3490(concurrent)X
-3854(access.)X
-4120(Tran-)X
-555 5289(saction)N
-804(semantics)X
-1142(on)X
-1244(the)X
-1364(password)X
-1689(\256les)X
-1844(would)X
-2066(allow)X
-2266(concurrent)X
-2632(updates,)X
-2919(while)X
-3119(preserving)X
-3479(the)X
-3598(logical)X
-3837(consistency)X
-4232(of)X
-555 5379(the)N
-681(password)X
-1012(database.)X
-1357(Similarly,)X
-1702(UNIX)X
-1930(utilities)X
-2196(which)X
-2419(rewrite)X
-2674(\256les)X
-2834(face)X
-2996(a)X
-3059(potential)X
-3366(race)X
-3528(condition)X
-3857(between)X
-4152(their)X
-555 5469(rewriting)N
-871(a)X
-929(\256le)X
-1053(and)X
-1191(another)X
-1453(process)X
-1715(reading)X
-1977(the)X
-2096(\256le.)X
-2259(For)X
-2391(example,)X
-2704(the)X
-2823(compiler)X
-3129(\(more)X
-3342(precisely,)X
-3673(the)X
-3792(assembler\))X
-4161(may)X
-8 s
-10 f
-555 5541(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)N
-5 s
-1 f
-727 5619(1)N
-8 s
-763 5644(To)N
-850(appear)X
-1035(in)X
-1101(the)X
-2 f
-1195(Proceedings)X
-1530(of)X
-1596(the)X
-1690(1992)X
-1834(Winter)X
-2024(Usenix)X
-1 f
-2201(,)X
-2233(San)X
-2345(Francisco,)X
-2625(CA,)X
-2746(January)X
-2960(1992.)X
-
-2 p
-%%Page: 2 2
-8 s 8 xH 0 xS 1 f
-10 s
-3 f
-1 f
-555 630(have)N
-737(to)X
-829(rewrite)X
-1087(a)X
-1152(\256le)X
-1283(to)X
-1374(which)X
-1599(it)X
-1672(has)X
-1808(write)X
-2002(permission)X
-2382(in)X
-2473(a)X
-2538(directory)X
-2857(to)X
-2948(which)X
-3173(it)X
-3246(does)X
-3422(not)X
-3553(have)X
-3734(write)X
-3928(permission.)X
-555 720(While)N
-779(the)X
-904(``.o'')X
-1099(\256le)X
-1228(is)X
-1308(being)X
-1513(written,)X
-1787(another)X
-2055(utility)X
-2272(such)X
-2446(as)X
-3 f
-2540(nm)X
-1 f
-2651(\(1\))X
-2772(or)X
-3 f
-2866(ar)X
-1 f
-2942(\(1\))X
-3063(may)X
-3228(read)X
-3394(the)X
-3519(\256le)X
-3648(and)X
-3791(produce)X
-4077(invalid)X
-555 810(results)N
-790(since)X
-981(the)X
-1105(\256le)X
-1233(has)X
-1366(not)X
-1494(been)X
-1672(completely)X
-2054(written.)X
-2347(Currently,)X
-2700(some)X
-2895(utilities)X
-3160(use)X
-3293(special)X
-3542(purpose)X
-3821(code)X
-3998(to)X
-4085(handle)X
-555 900(such)N
-722(cases)X
-912(while)X
-1110(others)X
-1326(ignore)X
-1551(the)X
-1669(problem)X
-1956(and)X
-2092(force)X
-2278(users)X
-2463(to)X
-2545(live)X
-2685(with)X
-2847(the)X
-2965(consequences.)X
-755 1023(In)N
-845(this)X
-983(paper,)X
-1205(we)X
-1322(present)X
-1577(a)X
-1635(simple)X
-1870(library)X
-2106(which)X
-2324(provides)X
-2622(transaction)X
-2996(semantics)X
-3334(\(atomicity,)X
-3705(consistency,)X
-4121(isola-)X
-555 1113(tion,)N
-720(and)X
-857(durability\).)X
-1236(The)X
-1382(4.4BSD)X
-1658(database)X
-1956(access)X
-2182(methods)X
-2473(have)X
-2645(been)X
-2817(modi\256ed)X
-3121(to)X
-3203(use)X
-3330(this)X
-3465(library,)X
-3719(optionally)X
-4063(provid-)X
-555 1203(ing)N
-682(shared)X
-917(buffer)X
-1139(management)X
-1574(between)X
-1867(applications,)X
-2298(locking,)X
-2582(and)X
-2722(transaction)X
-3098(semantics.)X
-3478(Any)X
-3640(UNIX)X
-3865(program)X
-4161(may)X
-555 1293(transaction)N
-930(protect)X
-1176(its)X
-1274(data)X
-1430(by)X
-1532(requesting)X
-1888(transaction)X
-2262(protection)X
-2609(with)X
-2773(the)X
-3 f
-2893(db)X
-1 f
-2981(\(3\))X
-3097(library)X
-3333(or)X
-3422(by)X
-3524(adding)X
-3764(appropriate)X
-4152(calls)X
-555 1383(to)N
-646(the)X
-773(transaction)X
-1154(manager,)X
-1480(buffer)X
-1706(manager,)X
-2032(lock)X
-2199(manager,)X
-2525(and)X
-2670(log)X
-2801(manager.)X
-3147(The)X
-3301(library)X
-3543(routines)X
-3829(may)X
-3995(be)X
-4099(linked)X
-555 1473(into)N
-708(the)X
-834(host)X
-995(application)X
-1379(and)X
-1523(called)X
-1743(by)X
-1851(subroutine)X
-2217(interface,)X
-2547(or)X
-2642(they)X
-2808(may)X
-2974(reside)X
-3194(in)X
-3284(a)X
-3348(separate)X
-3640(server)X
-3865(process.)X
-4174(The)X
-555 1563(server)N
-772(architecture)X
-1172(provides)X
-1468(for)X
-1582(network)X
-1865(access)X
-2091(and)X
-2227(better)X
-2430(protection)X
-2775(mechanisms.)X
-3 f
-555 1749(2.)N
-655(Related)X
-938(Work)X
-1 f
-755 1872(There)N
-1000(has)X
-1164(been)X
-1373(much)X
-1608(discussion)X
-1998(in)X
-2117(recent)X
-2371(years)X
-2597(about)X
-2831(new)X
-3021(transaction)X
-3429(models)X
-3716(and)X
-3888(architectures)X
-555 1962 0.1172([SPEC88][NODI90][CHEN91][MOHA91].)AN
-2009(Much)X
-2220(of)X
-2310(this)X
-2448(work)X
-2636(focuses)X
-2900(on)X
-3003(new)X
-3160(ways)X
-3348(to)X
-3433(model)X
-3656(transactions)X
-4062(and)X
-4201(the)X
-555 2052(interactions)N
-953(between)X
-1245(them,)X
-1449(while)X
-1651(the)X
-1772(work)X
-1960(presented)X
-2291(here)X
-2453(focuses)X
-2717(on)X
-2820(the)X
-2941(implementation)X
-3466(and)X
-3605(performance)X
-4035(of)X
-4125(tradi-)X
-555 2142(tional)N
-757(transaction)X
-1129(techniques)X
-1492(\(write-ahead)X
-1919(logging)X
-2183(and)X
-2319(two-phase)X
-2669(locking\))X
-2956(on)X
-3056(a)X
-3112(standard)X
-3404(operating)X
-3727(system)X
-3969(\(UNIX\).)X
-755 2265(Such)N
-947(traditional)X
-1308(operating)X
-1643(systems)X
-1928(are)X
-2059(often)X
-2256(criticized)X
-2587(for)X
-2713(their)X
-2892(inability)X
-3190(to)X
-3283(perform)X
-3573(transaction)X
-3956(processing)X
-555 2355(adequately.)N
-971([STON81])X
-1342(cites)X
-1517(three)X
-1706(main)X
-1894(areas)X
-2088(of)X
-2183(inadequate)X
-2559(support:)X
-2849(buffer)X
-3074(management,)X
-3532(the)X
-3658(\256le)X
-3788(system,)X
-4058(and)X
-4201(the)X
-555 2445(process)N
-823(structure.)X
-1191(These)X
-1410(arguments)X
-1771(are)X
-1897(summarized)X
-2316(in)X
-2405(table)X
-2587(one.)X
-2769(Fortunately,)X
-3184(much)X
-3388(has)X
-3521(changed)X
-3815(since)X
-4006(1981.)X
-4232(In)X
-555 2535(the)N
-683(area)X
-848(of)X
-945(buffer)X
-1172(management,)X
-1632(most)X
-1817(UNIX)X
-2048(systems)X
-2331(provide)X
-2606(the)X
-2734(ability)X
-2968(to)X
-3060(memory)X
-3357(map)X
-3525(\256les,)X
-3708(thus)X
-3870(obviating)X
-4201(the)X
-555 2625(need)N
-734(for)X
-855(a)X
-918(copy)X
-1101(between)X
-1396(kernel)X
-1624(and)X
-1766(user)X
-1926(space.)X
-2171(If)X
-2251(a)X
-2313(database)X
-2616(system)X
-2864(is)X
-2943(going)X
-3151(to)X
-3239(use)X
-3372(the)X
-3496(\256le)X
-3624(system)X
-3872(buffer)X
-4095(cache,)X
-555 2715(then)N
-719(a)X
-781(system)X
-1029(call)X
-1171(is)X
-1250(required.)X
-1584(However,)X
-1924(if)X
-1998(buffering)X
-2322(is)X
-2400(provided)X
-2710(at)X
-2793(user)X
-2952(level)X
-3133(using)X
-3331(shared)X
-3566(memory,)X
-3878(as)X
-3970(in)X
-4057(LIBTP,)X
-555 2805(buffer)N
-776(management)X
-1210(is)X
-1287(only)X
-1452(as)X
-1542(slow)X
-1716(as)X
-1806(access)X
-2035(to)X
-2120(shared)X
-2353(memory)X
-2643(and)X
-2782(any)X
-2921(replacement)X
-3337(algorithm)X
-3671(may)X
-3832(be)X
-3931(used.)X
-4121(Since)X
-555 2895(multiple)N
-849(processes)X
-1185(can)X
-1325(access)X
-1559(the)X
-1685(shared)X
-1923(data,)X
-2105(prefetching)X
-2499(may)X
-2665(be)X
-2769(accomplished)X
-3238(by)X
-3346(separate)X
-3638(processes)X
-3973(or)X
-4067(threads)X
-555 2985(whose)N
-782(sole)X
-932(purpose)X
-1207(is)X
-1281(to)X
-1364(prefetch)X
-1649(pages)X
-1853(and)X
-1990(wait)X
-2149(on)X
-2250(them.)X
-2471(There)X
-2680(is)X
-2754(still)X
-2894(no)X
-2995(way)X
-3150(to)X
-3233(enforce)X
-3496(write)X
-3682(ordering)X
-3975(other)X
-4161(than)X
-555 3075(keeping)N
-829(pages)X
-1032(in)X
-1114(user)X
-1268(memory)X
-1555(and)X
-1691(using)X
-1884(the)X
-3 f
-2002(fsync)X
-1 f
-2180(\(3\))X
-2294(system)X
-2536(call)X
-2672(to)X
-2754(perform)X
-3033(synchronous)X
-3458(writes.)X
-755 3198(In)N
-845(the)X
-966(area)X
-1124(of)X
-1214(\256le)X
-1339(systems,)X
-1635(the)X
-1756(fast)X
-1895(\256le)X
-2020(system)X
-2265(\(FFS\))X
-2474([MCKU84])X
-2871(allows)X
-3103(allocation)X
-3442(in)X
-3527(units)X
-3704(up)X
-3806(to)X
-3890(64KBytes)X
-4232(as)X
-555 3288(opposed)N
-846(to)X
-932(the)X
-1054(4KByte)X
-1327(and)X
-1466(8KByte)X
-1738(\256gures)X
-1979(quoted)X
-2220(in)X
-2305([STON81].)X
-2711(The)X
-2859(measurements)X
-3341(in)X
-3426(this)X
-3564(paper)X
-3766(were)X
-3946(taken)X
-4143(from)X
-555 3378(an)N
-655(8KByte)X
-928(FFS,)X
-1104(but)X
-1230(as)X
-1320(LIBTP)X
-1565(runs)X
-1726(exclusively)X
-2114(in)X
-2199(user)X
-2356(space,)X
-2578(there)X
-2762(is)X
-2838(nothing)X
-3105(to)X
-3190(prevent)X
-3454(it)X
-3521(from)X
-3700(being)X
-3901(run)X
-4031(on)X
-4134(other)X
-555 3468(UNIX)N
-776(compatible)X
-1152(\256le)X
-1274(systems)X
-1547(\(e.g.)X
-1710(log-structured)X
-2180([ROSE91],)X
-2558(extent-based,)X
-3004(or)X
-3091(multi-block)X
-3484([SELT91]\).)X
-755 3591(Finally,)N
-1029(with)X
-1199(regard)X
-1433(to)X
-1523(the)X
-1648(process)X
-1916(structure,)X
-2244(neither)X
-2494(context)X
-2757(switch)X
-2993(time)X
-3162(nor)X
-3296(scheduling)X
-3670(around)X
-3920(semaphores)X
-555 3681(seems)N
-785(to)X
-881(affect)X
-1099(the)X
-1231(system)X
-1487(performance.)X
-1968(However,)X
-2317(the)X
-2449(implementation)X
-2984(of)X
-3084(semaphores)X
-3496(can)X
-3641(impact)X
-3892(performance)X
-555 3771(tremendously.)N
-1051(This)X
-1213(is)X
-1286(discussed)X
-1613(in)X
-1695(more)X
-1880(detail)X
-2078(in)X
-2160(section)X
-2407(4.3.)X
-755 3894(The)N
-908(Tuxedo)X
-1181(system)X
-1431(from)X
-1615(AT&T)X
-1861(is)X
-1941(a)X
-2004(transaction)X
-2383(manager)X
-2687(which)X
-2910(coordinates)X
-3307(distributed)X
-3676(transaction)X
-4055(commit)X
-555 3984(from)N
-738(a)X
-801(variety)X
-1051(of)X
-1145(different)X
-1449(local)X
-1632(transaction)X
-2011(managers.)X
-2386(At)X
-2493(this)X
-2634(time,)X
-2822(LIBTP)X
-3070(does)X
-3243(not)X
-3371(have)X
-3549(its)X
-3650(own)X
-3814(mechanism)X
-4205(for)X
-555 4074(distributed)N
-942(commit)X
-1231(processing,)X
-1639(but)X
-1786(could)X
-2009(be)X
-2130(used)X
-2322(as)X
-2434(a)X
-2515(local)X
-2716(transaction)X
-3113(agent)X
-3331(by)X
-3455(systems)X
-3752(such)X
-3943(as)X
-4054(Tuxedo)X
-555 4164([ANDR89].)N
-10 f
-863 4393(i)N
-870(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-903 4483(Buffer)N
-1133(Management)X
-10 f
-1672(g)X
-1 f
-1720(Data)X
-1892(must)X
-2067(be)X
-2163(copied)X
-2397(between)X
-2685(kernel)X
-2906(space)X
-3105(and)X
-3241(user)X
-3395(space.)X
-10 f
-1672 4573(g)N
-1 f
-1720(Buffer)X
-1950(pool)X
-2112(access)X
-2338(is)X
-2411(too)X
-2533(slow.)X
-10 f
-1672 4663(g)N
-1 f
-1720(There)X
-1928(is)X
-2001(no)X
-2101(way)X
-2255(to)X
-2337(request)X
-2589(prefetch.)X
-10 f
-1672 4753(g)N
-1 f
-1720(Replacement)X
-2159(is)X
-2232(usually)X
-2483(LRU)X
-2663(which)X
-2879(may)X
-3037(be)X
-3133(suboptimal)X
-3508(for)X
-3622(databases.)X
-10 f
-1672 4843(g)N
-1 f
-1720(There)X
-1928(is)X
-2001(no)X
-2101(way)X
-2255(to)X
-2337(guarantee)X
-2670(write)X
-2855(ordering.)X
-10 f
-863 4853(i)N
-870(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-903 4943(File)N
-1047(System)X
-10 f
-1672(g)X
-1 f
-1720(Allocation)X
-2078(is)X
-2151(done)X
-2327(in)X
-2409(small)X
-2602(blocks)X
-2831(\(usually)X
-3109(4K)X
-3227(or)X
-3314(8K\).)X
-10 f
-1672 5033(g)N
-1 f
-1720(Logical)X
-1985(organization)X
-2406(of)X
-2493(\256les)X
-2646(is)X
-2719(redundantly)X
-3122(expressed.)X
-10 f
-863 5043(i)N
-870(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-903 5133(Process)N
-1168(Structure)X
-10 f
-1672(g)X
-1 f
-1720(Context)X
-1993(switching)X
-2324(and)X
-2460(message)X
-2752(passing)X
-3012(are)X
-3131(too)X
-3253(slow.)X
-10 f
-1672 5223(g)N
-1 f
-1720(A)X
-1798(process)X
-2059(may)X
-2217(be)X
-2313(descheduled)X
-2730(while)X
-2928(holding)X
-3192(a)X
-3248(semaphore.)X
-10 f
-863 5233(i)N
-870(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-863(c)X
-5193(c)Y
-5113(c)Y
-5033(c)Y
-4953(c)Y
-4873(c)Y
-4793(c)Y
-4713(c)Y
-4633(c)Y
-4553(c)Y
-4473(c)Y
-3990 5233(c)N
-5193(c)Y
-5113(c)Y
-5033(c)Y
-4953(c)Y
-4873(c)Y
-4793(c)Y
-4713(c)Y
-4633(c)Y
-4553(c)Y
-4473(c)Y
-3 f
-1156 5446(Table)N
-1371(One:)X
-1560(Shortcomings)X
-2051(of)X
-2138(UNIX)X
-2363(transaction)X
-2770(support)X
-3056(cited)X
-3241(in)X
-3327([STON81].)X
-
-3 p
-%%Page: 3 3
-10 s 10 xH 0 xS 3 f
-1 f
-755 630(The)N
-901(transaction)X
-1274(architecture)X
-1675(presented)X
-2004(in)X
-2087([YOUN91])X
-2474(is)X
-2548(very)X
-2712(similar)X
-2955(to)X
-3038(that)X
-3179(implemented)X
-3618(in)X
-3701(the)X
-3820(LIBTP.)X
-4103(While)X
-555 720([YOUN91])N
-947(presents)X
-1236(a)X
-1298(model)X
-1524(for)X
-1644(providing)X
-1981(transaction)X
-2359(services,)X
-2663(this)X
-2803(paper)X
-3007(focuses)X
-3273(on)X
-3378(the)X
-3501(implementation)X
-4028(and)X
-4169(per-)X
-555 810(formance)N
-881(of)X
-970(a)X
-1028(particular)X
-1358(system.)X
-1642(In)X
-1731(addition,)X
-2034(we)X
-2149(provide)X
-2415(detailed)X
-2690(comparisons)X
-3116(with)X
-3279(alternative)X
-3639(solutions:)X
-3970(traditional)X
-555 900(UNIX)N
-776(services)X
-1055(and)X
-1191(commercial)X
-1590(database)X
-1887(management)X
-2317(systems.)X
-3 f
-555 1086(3.)N
-655(Architecture)X
-1 f
-755 1209(The)N
-906(library)X
-1146(is)X
-1224(designed)X
-1534(to)X
-1621(provide)X
-1891(well)X
-2054(de\256ned)X
-2315(interfaces)X
-2653(to)X
-2740(the)X
-2863(services)X
-3147(required)X
-3440(for)X
-3559(transaction)X
-3936(processing.)X
-555 1299(These)N
-777(services)X
-1066(are)X
-1195(recovery,)X
-1527(concurrency)X
-1955(control,)X
-2232(and)X
-2378(the)X
-2506(management)X
-2946(of)X
-3043(shared)X
-3283(data.)X
-3487(First)X
-3663(we)X
-3787(will)X
-3941(discuss)X
-4201(the)X
-555 1389(design)N
-795(tradeoffs)X
-1112(in)X
-1205(the)X
-1334(selection)X
-1650(of)X
-1748(recovery,)X
-2081(concurrency)X
-2510(control,)X
-2787(and)X
-2933(buffer)X
-3160(management)X
-3600(implementations,)X
-4183(and)X
-555 1479(then)N
-713(we)X
-827(will)X
-971(present)X
-1223(the)X
-1341(overall)X
-1584(library)X
-1818(architecture)X
-2218(and)X
-2354(module)X
-2614(descriptions.)X
-3 f
-555 1665(3.1.)N
-715(Design)X
-966(Tradeoffs)X
-1 f
-3 f
-555 1851(3.1.1.)N
-775(Crash)X
-1004(Recovery)X
-1 f
-755 1974(The)N
-909(recovery)X
-1220(protocol)X
-1516(is)X
-1598(responsible)X
-1992(for)X
-2115(providing)X
-2455(the)X
-2582(transaction)X
-2963(semantics)X
-3308(discussed)X
-3644(earlier.)X
-3919(There)X
-4136(are)X
-4263(a)X
-555 2064(wide)N
-739(range)X
-946(of)X
-1041(recovery)X
-1351(protocols)X
-1677(available)X
-1995([HAER83],)X
-2395(but)X
-2525(we)X
-2647(can)X
-2786(crudely)X
-3054(divide)X
-3281(them)X
-3468(into)X
-3619(two)X
-3766(main)X
-3953(categories.)X
-555 2154(The)N
-706(\256rst)X
-856(category)X
-1159(records)X
-1422(all)X
-1528(modi\256cations)X
-1989(to)X
-2077(the)X
-2201(database)X
-2504(in)X
-2592(a)X
-2653(separate)X
-2942(\256le,)X
-3089(and)X
-3230(uses)X
-3393(this)X
-3533(\256le)X
-3660(\(log\))X
-3841(to)X
-3928(back)X
-4105(out)X
-4232(or)X
-555 2244(reapply)N
-825(these)X
-1019(modi\256cations)X
-1483(if)X
-1561(a)X
-1626(transaction)X
-2007(aborts)X
-2232(or)X
-2328(the)X
-2455(system)X
-2706(crashes.)X
-3012(We)X
-3153(call)X
-3298(this)X
-3442(set)X
-3560(the)X
-3 f
-3687(logging)X
-3963(protocols)X
-1 f
-4279(.)X
-555 2334(The)N
-703(second)X
-949(category)X
-1249(avoids)X
-1481(the)X
-1602(use)X
-1732(of)X
-1822(a)X
-1881(log)X
-2006(by)X
-2109(carefully)X
-2418(controlling)X
-2792(when)X
-2989(data)X
-3146(are)X
-3268(written)X
-3518(to)X
-3603(disk.)X
-3799(We)X
-3934(call)X
-4073(this)X
-4210(set)X
-555 2424(the)N
-3 f
-673(non-logging)X
-1096(protocols)X
-1 f
-1412(.)X
-755 2547(Non-logging)N
-1185(protocols)X
-1504(hold)X
-1666(dirty)X
-1837(buffers)X
-2085(in)X
-2167(main)X
-2347(memory)X
-2634(or)X
-2721(temporary)X
-3071(\256les)X
-3224(until)X
-3390(commit)X
-3654(and)X
-3790(then)X
-3948(force)X
-4134(these)X
-555 2637(pages)N
-769(to)X
-862(disk)X
-1026(at)X
-1115(transaction)X
-1498(commit.)X
-1813(While)X
-2040(we)X
-2165(can)X
-2308(use)X
-2446(temporary)X
-2807(\256les)X
-2971(to)X
-3064(hold)X
-3237(dirty)X
-3418(pages)X
-3631(that)X
-3781(may)X
-3949(need)X
-4131(to)X
-4223(be)X
-555 2727(evicted)N
-810(from)X
-988(memory)X
-1277(during)X
-1508(a)X
-1566(long-running)X
-2006(transaction,)X
-2400(the)X
-2520(only)X
-2684(user-level)X
-3023(mechanism)X
-3410(to)X
-3494(force)X
-3682(pages)X
-3887(to)X
-3971(disk)X
-4126(is)X
-4201(the)X
-3 f
-555 2817(fsync)N
-1 f
-733(\(2\))X
-850(system)X
-1095(call.)X
-1274(Unfortunately,)X
-3 f
-1767(fsync)X
-1 f
-1945(\(2\))X
-2062(is)X
-2138(an)X
-2237(expensive)X
-2581(system)X
-2826(call)X
-2965(in)X
-3050(that)X
-3193(it)X
-3260(forces)X
-3480(all)X
-3583(pages)X
-3789(of)X
-3879(a)X
-3938(\256le)X
-4062(to)X
-4146(disk,)X
-555 2907(and)N
-691(transactions)X
-1094(that)X
-1234(manage)X
-1504(more)X
-1689(than)X
-1847(one)X
-1983(\256le)X
-2105(must)X
-2280(issue)X
-2460(one)X
-2596(call)X
-2732(per)X
-2855(\256le.)X
-755 3030(In)N
-853(addition,)X
-3 f
-1166(fsync)X
-1 f
-1344(\(2\))X
-1469(provides)X
-1776(no)X
-1887(way)X
-2051(to)X
-2143(control)X
-2400(the)X
-2528(order)X
-2728(in)X
-2820(which)X
-3046(dirty)X
-3227(pages)X
-3440(are)X
-3569(written)X
-3826(to)X
-3918(disk.)X
-4121(Since)X
-555 3120(non-logging)N
-976(protocols)X
-1304(must)X
-1489(sometimes)X
-1861(order)X
-2061(writes)X
-2287(carefully)X
-2603([SULL92],)X
-2987(they)X
-3155(are)X
-3284(dif\256cult)X
-3567(to)X
-3659(implement)X
-4030(on)X
-4139(Unix)X
-555 3210(systems.)N
-868(As)X
-977(a)X
-1033(result,)X
-1251(we)X
-1365(have)X
-1537(chosen)X
-1780(to)X
-1862(implement)X
-2224(a)X
-2280(logging)X
-2544(protocol.)X
-755 3333(Logging)N
-1050(protocols)X
-1372(may)X
-1534(be)X
-1634(categorized)X
-2029(based)X
-2236(on)X
-2340(how)X
-2502(information)X
-2904(is)X
-2981(logged)X
-3223(\(physically)X
-3602(or)X
-3692(logically\))X
-4022(and)X
-4161(how)X
-555 3423(much)N
-767(is)X
-854(logged)X
-1106(\(before)X
-1373(images,)X
-1654(after)X
-1836(images)X
-2097(or)X
-2198(both\).)X
-2441(In)X
-3 f
-2542(physical)X
-2855(logging)X
-1 f
-3103(,)X
-3157(images)X
-3417(of)X
-3517(complete)X
-3844(physical)X
-4144(units)X
-555 3513(\(pages)N
-786(or)X
-874(buffers\))X
-1150(are)X
-1270(recorded,)X
-1593(while)X
-1792(in)X
-3 f
-1875(logical)X
-2118(logging)X
-1 f
-2387(a)X
-2444(description)X
-2820(of)X
-2907(the)X
-3025(operation)X
-3348(is)X
-3421(recorded.)X
-3763(Therefore,)X
-4121(while)X
-555 3603(we)N
-675(may)X
-839(record)X
-1071(entire)X
-1280(pages)X
-1489(in)X
-1577(a)X
-1639(physical)X
-1932(log,)X
-2080(we)X
-2200(need)X
-2378(only)X
-2546(record)X
-2777(the)X
-2900(records)X
-3162(being)X
-3365(modi\256ed)X
-3674(in)X
-3761(a)X
-3822(logical)X
-4065(log.)X
-4232(In)X
-555 3693(fact,)N
-718(physical)X
-1006(logging)X
-1271(can)X
-1404(be)X
-1501(thought)X
-1766(of)X
-1854(as)X
-1942(a)X
-1999(special)X
-2243(case)X
-2403(of)X
-2491(logical)X
-2730(logging,)X
-3015(since)X
-3201(the)X
-3320 0.3125(``records'')AX
-3686(that)X
-3827(we)X
-3942(log)X
-4065(in)X
-4148(logi-)X
-555 3783(cal)N
-673(logging)X
-941(might)X
-1151(be)X
-1251(physical)X
-1542(pages.)X
-1789(Since)X
-1991(logical)X
-2233(logging)X
-2501(is)X
-2578(both)X
-2743(more)X
-2931(space-ef\256cient)X
-3423(and)X
-3562(more)X
-3750(general,)X
-4030(we)X
-4147(have)X
-555 3873(chosen)N
-798(it)X
-862(for)X
-976(our)X
-1103(logging)X
-1367(protocol.)X
-755 3996(In)N
-3 f
-843(before-image)X
-1315(logging)X
-1 f
-1563(,)X
-1604(we)X
-1719(log)X
-1842(a)X
-1899(copy)X
-2076(of)X
-2164(the)X
-2283(data)X
-2438(before)X
-2665(the)X
-2784(update,)X
-3039(while)X
-3238(in)X
-3 f
-3321(after-image)X
-3739(logging)X
-1 f
-3987(,)X
-4027(we)X
-4141(log)X
-4263(a)X
-555 4086(copy)N
-740(of)X
-836(the)X
-963(data)X
-1126(after)X
-1303(the)X
-1429(update.)X
-1711(If)X
-1793(we)X
-1915(log)X
-2045(only)X
-2215(before-images,)X
-2723(then)X
-2889(there)X
-3078(is)X
-3159(suf\256cient)X
-3485(information)X
-3891(in)X
-3981(the)X
-4107(log)X
-4237(to)X
-555 4176(allow)N
-761(us)X
-860(to)X
-3 f
-950(undo)X
-1 f
-1150(the)X
-1276(transaction)X
-1656(\(go)X
-1791(back)X
-1971(to)X
-2061(the)X
-2187(state)X
-2361(represented)X
-2759(by)X
-2866(the)X
-2991(before-image\).)X
-3514(However,)X
-3876(if)X
-3952(the)X
-4077(system)X
-555 4266(crashes)N
-814(and)X
-952(a)X
-1010(committed)X
-1374(transaction's)X
-1806(changes)X
-2087(have)X
-2261(not)X
-2385(reached)X
-2658(the)X
-2778(disk,)X
-2953(we)X
-3068(have)X
-3241(no)X
-3342(means)X
-3568(to)X
-3 f
-3651(redo)X
-1 f
-3828(the)X
-3947(transaction)X
-555 4356(\(reapply)N
-849(the)X
-973(updates\).)X
-1311(Therefore,)X
-1675(logging)X
-1945(only)X
-2113(before-images)X
-2599(necessitates)X
-3004(forcing)X
-3262(dirty)X
-3439(pages)X
-3648(at)X
-3732(commit)X
-4002(time.)X
-4210(As)X
-555 4446(mentioned)N
-913(above,)X
-1145(forcing)X
-1397(pages)X
-1600(at)X
-1678(commit)X
-1942(is)X
-2015(considered)X
-2383(too)X
-2505(costly.)X
-755 4569(If)N
-834(we)X
-953(log)X
-1080(only)X
-1247(after-images,)X
-1694(then)X
-1857(there)X
-2043(is)X
-2121(suf\256cient)X
-2444(information)X
-2847(in)X
-2934(the)X
-3057(log)X
-3184(to)X
-3271(allow)X
-3474(us)X
-3570(to)X
-3657(redo)X
-3825(the)X
-3947(transaction)X
-555 4659(\(go)N
-687(forward)X
-967(to)X
-1054(the)X
-1177(state)X
-1348(represented)X
-1743(by)X
-1847(the)X
-1969(after-image\),)X
-2411(but)X
-2537(we)X
-2655(do)X
-2759(not)X
-2885(have)X
-3061(the)X
-3183(information)X
-3585(required)X
-3877(to)X
-3963(undo)X
-4147(tran-)X
-555 4749(sactions)N
-845(which)X
-1073(aborted)X
-1346(after)X
-1526(dirty)X
-1709(pages)X
-1924(were)X
-2113(written)X
-2372(to)X
-2466(disk.)X
-2670(Therefore,)X
-3039(logging)X
-3314(only)X
-3487(after-images)X
-3920(necessitates)X
-555 4839(holding)N
-819(all)X
-919(dirty)X
-1090(buffers)X
-1338(in)X
-1420(main)X
-1600(memory)X
-1887(until)X
-2053(commit)X
-2317(or)X
-2404(writing)X
-2655(them)X
-2835(to)X
-2917(a)X
-2973(temporary)X
-3323(\256le.)X
-755 4962(Since)N
-956(neither)X
-1202(constraint)X
-1541(\(forcing)X
-1823(pages)X
-2029(on)X
-2132(commit)X
-2399(or)X
-2489(buffering)X
-2811(pages)X
-3016(until)X
-3184(commit\))X
-3477(was)X
-3624(feasible,)X
-3916(we)X
-4032(chose)X
-4237(to)X
-555 5052(log)N
-683(both)X
-851(before)X
-1083(and)X
-1225(after)X
-1399(images.)X
-1672(The)X
-1823(only)X
-1991(remaining)X
-2342(consideration)X
-2800(is)X
-2879(when)X
-3079(changes)X
-3363(get)X
-3486(written)X
-3738(to)X
-3825(disk.)X
-4023(Changes)X
-555 5142(affect)N
-764(both)X
-931(data)X
-1090(pages)X
-1298(and)X
-1438(the)X
-1560(log.)X
-1726(If)X
-1804(the)X
-1926(changed)X
-2218(data)X
-2376(page)X
-2552(is)X
-2629(written)X
-2880(before)X
-3110(the)X
-3232(log)X
-3358(page,)X
-3554(and)X
-3694(the)X
-3816(system)X
-4062(crashes)X
-555 5232(before)N
-787(the)X
-911(log)X
-1039(page)X
-1217(is)X
-1296(written,)X
-1569(the)X
-1693(log)X
-1820(will)X
-1969(contain)X
-2230(insuf\256cient)X
-2615(information)X
-3018(to)X
-3105(undo)X
-3290(the)X
-3413(change.)X
-3706(This)X
-3873(violates)X
-4147(tran-)X
-555 5322(saction)N
-803(semantics,)X
-1160(since)X
-1346(some)X
-1536(changed)X
-1825(data)X
-1980(pages)X
-2184(may)X
-2343(not)X
-2466(have)X
-2638(been)X
-2810(written,)X
-3077(and)X
-3213(the)X
-3331(database)X
-3628(cannot)X
-3862(be)X
-3958(restored)X
-4237(to)X
-555 5412(its)N
-650(pre-transaction)X
-1152(state.)X
-755 5535(The)N
-914(log)X
-1050(record)X
-1290(describing)X
-1658(an)X
-1768(update)X
-2016(must)X
-2205(be)X
-2315(written)X
-2576(to)X
-2672(stable)X
-2893(storage)X
-3159(before)X
-3398(the)X
-3529(modi\256ed)X
-3846(page.)X
-4071(This)X
-4246(is)X
-3 f
-555 5625(write-ahead)N
-992(logging)X
-1 f
-1240(.)X
-1307(If)X
-1388(log)X
-1517(records)X
-1781(are)X
-1907(safely)X
-2126(written)X
-2380(to)X
-2469(disk,)X
-2649(data)X
-2810(pages)X
-3020(may)X
-3185(be)X
-3288(written)X
-3542(at)X
-3627(any)X
-3770(time)X
-3939(afterwards.)X
-555 5715(This)N
-721(means)X
-950(that)X
-1094(the)X
-1216(only)X
-1382(\256le)X
-1508(that)X
-1652(ever)X
-1815(needs)X
-2022(to)X
-2108(be)X
-2208(forced)X
-2438(to)X
-2524(disk)X
-2681(is)X
-2758(the)X
-2880(log.)X
-3046(Since)X
-3248(the)X
-3370(log)X
-3495(is)X
-3571(append-only,)X
-4015(modi\256ed)X
-
-4 p
-%%Page: 4 4
-10 s 10 xH 0 xS 1 f
-3 f
-1 f
-555 630(pages)N
-760(always)X
-1005(appear)X
-1242(at)X
-1322(the)X
-1442(end)X
-1580(and)X
-1718(may)X
-1878(be)X
-1976(written)X
-2224(to)X
-2307(disk)X
-2461(ef\256ciently)X
-2807(in)X
-2890(any)X
-3027(\256le)X
-3150(system)X
-3393(that)X
-3534(favors)X
-3756(sequential)X
-4102(order-)X
-555 720(ing)N
-677(\()X
-2 f
-704(e.g.)X
-1 f
-820(,)X
-860(FFS,)X
-1032(log-structured)X
-1502(\256le)X
-1624(system,)X
-1886(or)X
-1973(an)X
-2069(extent-based)X
-2495(system\).)X
-3 f
-555 906(3.1.2.)N
-775(Concurrency)X
-1245(Control)X
-1 f
-755 1029(The)N
-918(concurrency)X
-1354(control)X
-1619(protocol)X
-1923(is)X
-2013(responsible)X
-2415(for)X
-2546(maintaining)X
-2965(consistency)X
-3376(in)X
-3475(the)X
-3610(presence)X
-3929(of)X
-4033(multiple)X
-555 1119(accesses.)N
-897(There)X
-1114(are)X
-1242(several)X
-1499(alternative)X
-1867(solutions)X
-2183(such)X
-2358(as)X
-2453(locking,)X
-2741(optimistic)X
-3088(concurrency)X
-3514(control)X
-3769([KUNG81],)X
-4183(and)X
-555 1209(timestamp)N
-912(ordering)X
-1208([BERN80].)X
-1619(Since)X
-1821(optimistic)X
-2164(methods)X
-2459(and)X
-2599(timestamp)X
-2956(ordering)X
-3252(are)X
-3374(generally)X
-3696(more)X
-3884(complex)X
-4183(and)X
-555 1299(restrict)N
-804(concurrency)X
-1228(without)X
-1498(eliminating)X
-1888(starvation)X
-2230(or)X
-2323(deadlocks,)X
-2690(we)X
-2810(chose)X
-3018(two-phase)X
-3373(locking)X
-3638(\(2PL\).)X
-3890(Strict)X
-4088(2PL)X
-4246(is)X
-555 1389(suboptimal)N
-935(for)X
-1054(certain)X
-1297(data)X
-1455(structures)X
-1791(such)X
-1962(as)X
-2053(B-trees)X
-2309(because)X
-2588(it)X
-2656(can)X
-2792(limit)X
-2966(concurrency,)X
-3408(so)X
-3503(we)X
-3621(use)X
-3752(a)X
-3812(special)X
-4059(locking)X
-555 1479(protocol)N
-842(based)X
-1045(on)X
-1145(one)X
-1281(described)X
-1609(in)X
-1691([LEHM81].)X
-755 1602(The)N
-901(B-tree)X
-1123(locking)X
-1384(protocol)X
-1672(we)X
-1787(implemented)X
-2226(releases)X
-2502(locks)X
-2691(at)X
-2769(internal)X
-3034(nodes)X
-3241(in)X
-3323(the)X
-3441(tree)X
-3582(as)X
-3669(it)X
-3733(descends.)X
-4083(A)X
-4161(lock)X
-555 1692(on)N
-658(an)X
-757(internal)X
-1025(page)X
-1200(is)X
-1276(always)X
-1522(released)X
-1808(before)X
-2036(a)X
-2094(lock)X
-2254(on)X
-2356(its)X
-2453(child)X
-2635(is)X
-2710(obtained)X
-3008(\(that)X
-3177(is,)X
-3272(locks)X
-3463(are)X
-3584(not)X
-3 f
-3708(coupled)X
-1 f
-3996([BAY77])X
-555 1782(during)N
-786(descent\).)X
-1116(When)X
-1330(a)X
-1388(leaf)X
-1531(\(or)X
-1647(internal\))X
-1941(page)X
-2115(is)X
-2190(split,)X
-2369(a)X
-2427(write)X
-2614(lock)X
-2774(is)X
-2849(acquired)X
-3148(on)X
-3250(the)X
-3370(parent)X
-3593(before)X
-3821(the)X
-3941(lock)X
-4100(on)X
-4201(the)X
-555 1872(just-split)N
-855(page)X
-1028(is)X
-1102(released)X
-1387(\(locks)X
-1604(are)X
-3 f
-1724(coupled)X
-1 f
-2011(during)X
-2241(ascent\).)X
-2530(Write)X
-2734(locks)X
-2924(on)X
-3025(internal)X
-3291(pages)X
-3495(are)X
-3615(released)X
-3899(immediately)X
-555 1962(after)N
-723(the)X
-841(page)X
-1013(is)X
-1086(updated,)X
-1380(but)X
-1502(locks)X
-1691(on)X
-1791(leaf)X
-1932(pages)X
-2135(are)X
-2254(held)X
-2412(until)X
-2578(the)X
-2696(end)X
-2832(of)X
-2919(the)X
-3037(transaction.)X
-755 2085(Since)N
-964(locks)X
-1164(are)X
-1294(released)X
-1589(during)X
-1828(descent,)X
-2119(the)X
-2247(structure)X
-2558(of)X
-2655(the)X
-2783(tree)X
-2934(may)X
-3102(change)X
-3360(above)X
-3582(a)X
-3648(node)X
-3834(being)X
-4042(used)X
-4219(by)X
-555 2175(some)N
-752(process.)X
-1061(If)X
-1143(that)X
-1291(process)X
-1560(must)X
-1743(later)X
-1914(ascend)X
-2161(the)X
-2287(tree)X
-2435(because)X
-2717(of)X
-2811(a)X
-2874(page)X
-3053(split,)X
-3237(any)X
-3380(such)X
-3554(change)X
-3809(must)X
-3991(not)X
-4120(cause)X
-555 2265(confusion.)N
-938(We)X
-1077(use)X
-1211(the)X
-1336(technique)X
-1675(described)X
-2010(in)X
-2099([LEHM81])X
-2487(which)X
-2710(exploits)X
-2989(the)X
-3113(ordering)X
-3411(of)X
-3504(data)X
-3664(on)X
-3770(a)X
-3832(B-tree)X
-4059(page)X
-4237(to)X
-555 2355(guarantee)N
-888(that)X
-1028(no)X
-1128(process)X
-1389(ever)X
-1548(gets)X
-1697(lost)X
-1832(as)X
-1919(a)X
-1975(result)X
-2173(of)X
-2260(internal)X
-2525(page)X
-2697(updates)X
-2962(made)X
-3156(by)X
-3256(other)X
-3441(processes.)X
-755 2478(If)N
-836(a)X
-899(transaction)X
-1278(that)X
-1425(updates)X
-1697(a)X
-1760(B-tree)X
-1988(aborts,)X
-2231(the)X
-2356(user-visible)X
-2757(changes)X
-3043(to)X
-3131(the)X
-3255(tree)X
-3402(must)X
-3583(be)X
-3685(rolled)X
-3898(back.)X
-4116(How-)X
-555 2568(ever,)N
-735(changes)X
-1015(to)X
-1097(the)X
-1215(internal)X
-1480(nodes)X
-1687(of)X
-1774(the)X
-1892(tree)X
-2033(need)X
-2205(not)X
-2327(be)X
-2423(rolled)X
-2630(back,)X
-2822(since)X
-3007(these)X
-3192(pages)X
-3395(contain)X
-3651(no)X
-3751(user-visible)X
-4145(data.)X
-555 2658(When)N
-771(rolling)X
-1008(back)X
-1184(a)X
-1244(transaction,)X
-1640(we)X
-1758(roll)X
-1893(back)X
-2069(all)X
-2173(leaf)X
-2318(page)X
-2494(updates,)X
-2783(but)X
-2909(no)X
-3013(internal)X
-3281(insertions)X
-3615(or)X
-3705(page)X
-3880(splits.)X
-4111(In)X
-4201(the)X
-555 2748(worst)N
-759(case,)X
-944(this)X
-1085(will)X
-1235(leave)X
-1431(a)X
-1493(leaf)X
-1640(page)X
-1818(less)X
-1964(than)X
-2128(half)X
-2279(full.)X
-2456(This)X
-2624(may)X
-2788(cause)X
-2993(poor)X
-3166(space)X
-3371(utilization,)X
-3741(but)X
-3869(does)X
-4042(not)X
-4170(lose)X
-555 2838(user)N
-709(data.)X
-755 2961(Holding)N
-1038(locks)X
-1228(on)X
-1329(leaf)X
-1471(pages)X
-1675(until)X
-1842(transaction)X
-2215(commit)X
-2480(guarantees)X
-2845(that)X
-2986(no)X
-3087(other)X
-3273(process)X
-3535(can)X
-3668(insert)X
-3866(or)X
-3953(delete)X
-4165(data)X
-555 3051(that)N
-711(has)X
-854(been)X
-1042(touched)X
-1332(by)X
-1448(this)X
-1598(process.)X
-1914(Rolling)X
-2188(back)X
-2375(insertions)X
-2721(and)X
-2872(deletions)X
-3196(on)X
-3311(leaf)X
-3467(pages)X
-3685(guarantees)X
-4064(that)X
-4219(no)X
-555 3141(aborted)N
-819(updates)X
-1087(are)X
-1209(ever)X
-1371(visible)X
-1607(to)X
-1692(other)X
-1880(transactions.)X
-2326(Leaving)X
-2612(page)X
-2787(splits)X
-2978(intact)X
-3179(permits)X
-3442(us)X
-3536(to)X
-3621(release)X
-3867(internal)X
-4134(write)X
-555 3231(locks)N
-744(early.)X
-965(Thus)X
-1145(transaction)X
-1517(semantics)X
-1853(are)X
-1972(preserved,)X
-2325(and)X
-2461(locks)X
-2650(are)X
-2769(held)X
-2927(for)X
-3041(shorter)X
-3284(periods.)X
-755 3354(The)N
-901(extra)X
-1083(complexity)X
-1464(introduced)X
-1828(by)X
-1929(this)X
-2065(locking)X
-2326(protocol)X
-2614(appears)X
-2881(substantial,)X
-3264(but)X
-3387(it)X
-3452(is)X
-3525(important)X
-3856(for)X
-3970(multi-user)X
-555 3444(execution.)N
-950(The)X
-1118(bene\256ts)X
-1410(of)X
-1520(non-two-phase)X
-2040(locking)X
-2323(on)X
-2446(B-trees)X
-2721(are)X
-2863(well)X
-3044(established)X
-3443(in)X
-3548(the)X
-3689(database)X
-4009(literature)X
-555 3534([BAY77],)N
-899([LEHM81].)X
-1320(If)X
-1394(a)X
-1450(process)X
-1711(held)X
-1869(locks)X
-2058(until)X
-2224(it)X
-2288(committed,)X
-2670(then)X
-2828(a)X
-2884(long-running)X
-3322(update)X
-3556(could)X
-3754(lock)X
-3912(out)X
-4034(all)X
-4134(other)X
-555 3624(transactions)N
-967(by)X
-1076(preventing)X
-1448(any)X
-1593(other)X
-1787(process)X
-2057(from)X
-2241(locking)X
-2509(the)X
-2635(root)X
-2792(page)X
-2972(of)X
-3067(the)X
-3193(tree.)X
-3382(The)X
-3535(B-tree)X
-3764(locking)X
-4032(protocol)X
-555 3714(described)N
-884(above)X
-1096(guarantees)X
-1460(that)X
-1600(locks)X
-1789(on)X
-1889(internal)X
-2154(pages)X
-2357(are)X
-2476(held)X
-2634(for)X
-2748(extremely)X
-3089(short)X
-3269(periods,)X
-3545(thereby)X
-3806(increasing)X
-4156(con-)X
-555 3804(currency.)N
-3 f
-555 3990(3.1.3.)N
-775(Management)X
-1245(of)X
-1332(Shared)X
-1596(Data)X
-1 f
-755 4113(Database)N
-1075(systems)X
-1353(permit)X
-1587(many)X
-1790(users)X
-1980(to)X
-2067(examine)X
-2364(and)X
-2505(update)X
-2744(the)X
-2866(same)X
-3055(data)X
-3213(concurrently.)X
-3683(In)X
-3774(order)X
-3968(to)X
-4054(provide)X
-555 4203(this)N
-702(concurrent)X
-1078(access)X
-1316(and)X
-1464(enforce)X
-1738(the)X
-1868(write-ahead)X
-2280(logging)X
-2556(protocol)X
-2855(described)X
-3195(in)X
-3289(section)X
-3548(3.1.1,)X
-3759(we)X
-3884(use)X
-4022(a)X
-4089(shared)X
-555 4293(memory)N
-848(buffer)X
-1071(manager.)X
-1414(Not)X
-1559(only)X
-1726(does)X
-1898(this)X
-2038(provide)X
-2308(the)X
-2431(guarantees)X
-2800(we)X
-2919(require,)X
-3192(but)X
-3319(a)X
-3380(user-level)X
-3722(buffer)X
-3944(manager)X
-4246(is)X
-555 4383(frequently)N
-916(faster)X
-1126(than)X
-1295(using)X
-1498(the)X
-1626(\256le)X
-1758(system)X
-2010(buffer)X
-2237(cache.)X
-2491(Reads)X
-2717(or)X
-2814(writes)X
-3040(involving)X
-3376(the)X
-3504(\256le)X
-3636(system)X
-3888(buffer)X
-4115(cache)X
-555 4473(often)N
-746(require)X
-1000(copying)X
-1284(data)X
-1444(between)X
-1738(user)X
-1898(and)X
-2040(kernel)X
-2266(space)X
-2470(while)X
-2673(a)X
-2734(user-level)X
-3076(buffer)X
-3298(manager)X
-3600(can)X
-3737(return)X
-3954(pointers)X
-4237(to)X
-555 4563(data)N
-709(pages)X
-912(directly.)X
-1217(Additionally,)X
-1661(if)X
-1730(more)X
-1915(than)X
-2073(one)X
-2209(process)X
-2470(uses)X
-2628(the)X
-2746(same)X
-2931(page,)X
-3123(then)X
-3281(fewer)X
-3485(copies)X
-3710(may)X
-3868(be)X
-3964(required.)X
-3 f
-555 4749(3.2.)N
-715(Module)X
-997(Architecture)X
-1 f
-755 4872(The)N
-913(preceding)X
-1262(sections)X
-1552(described)X
-1892(modules)X
-2195(for)X
-2321(managing)X
-2669(the)X
-2799(transaction)X
-3183(log,)X
-3337(locks,)X
-3558(and)X
-3706(a)X
-3774(cache)X
-3990(of)X
-4089(shared)X
-555 4962(buffers.)N
-847(In)X
-938(addition,)X
-1244(we)X
-1362(need)X
-1538(to)X
-1624(provide)X
-1893(functionality)X
-2326(for)X
-2444(transaction)X
-2 f
-2819(begin)X
-1 f
-2997(,)X
-2 f
-3040(commit)X
-1 f
-3276(,)X
-3319(and)X
-2 f
-3458(abort)X
-1 f
-3654(processing,)X
-4040(necessi-)X
-555 5052(tating)N
-769(a)X
-837(transaction)X
-1221(manager.)X
-1570(In)X
-1669(order)X
-1871(to)X
-1965(arbitrate)X
-2265(concurrent)X
-2641(access)X
-2879(to)X
-2973(locks)X
-3173(and)X
-3320(buffers,)X
-3599(we)X
-3724(include)X
-3991(a)X
-4058(process)X
-555 5142(management)N
-995(module)X
-1264(which)X
-1489(manages)X
-1799(a)X
-1864(collection)X
-2209(of)X
-2305(semaphores)X
-2713(used)X
-2889(to)X
-2980(block)X
-3187(and)X
-3332(release)X
-3585(processes.)X
-3962(Finally,)X
-4237(in)X
-555 5232(order)N
-752(to)X
-841(provide)X
-1113(a)X
-1176(simple,)X
-1436(standard)X
-1735(interface)X
-2044(we)X
-2165(have)X
-2344(modi\256ed)X
-2655(the)X
-2780(database)X
-3084(access)X
-3317(routines)X
-3602(\()X
-3 f
-3629(db)X
-1 f
-3717(\(3\)\).)X
-3904(For)X
-4041(the)X
-4165(pur-)X
-555 5322(poses)N
-758(of)X
-850(this)X
-990(paper)X
-1194(we)X
-1313(call)X
-1453(the)X
-1575(modi\256ed)X
-1883(package)X
-2171(the)X
-3 f
-2293(Record)X
-2567(Manager)X
-1 f
-2879(.)X
-2943(Figure)X
-3176(one)X
-3316(shows)X
-3540(the)X
-3662(main)X
-3846(interfaces)X
-4183(and)X
-555 5412(architecture)N
-955(of)X
-1042(LIBTP.)X
-
-5 p
-%%Page: 5 5
-10 s 10 xH 0 xS 1 f
-3 f
-1 f
-11 s
-1851 1520(log_commit)N
-2764 2077(buf_unpin)N
-2764 1987(buf_get)N
-3633 1408(buf_unpin)N
-3633 1319(buf_pin)N
-3633 1230(buf_get)N
-3 f
-17 s
-1163 960(Txn)N
-1430(M)X
-1559(anager)X
-2582(Record)X
-3040(M)X
-3169(anager)X
-1 Dt
-2363 726 MXY
-0 355 Dl
-1426 0 Dl
-0 -355 Dl
--1426 0 Dl
-3255 1616 MXY
-0 535 Dl
-534 0 Dl
-0 -535 Dl
--534 0 Dl
-2185 MX
-0 535 Dl
-535 0 Dl
-0 -535 Dl
--535 0 Dl
-1116 MX
-0 535 Dl
-534 0 Dl
-0 -535 Dl
--534 0 Dl
-726 MY
-0 355 Dl
-891 0 Dl
-0 -355 Dl
--891 0 Dl
-1 f
-11 s
-2207 1297(lock)N
-2564 1386(log)N
-865(unlock_all)X
-1851 1609(log_unroll)N
-1650 2508 MXY
-0 178 Dl
-1605 0 Dl
-0 -178 Dl
--1605 0 Dl
-1294 1616 MXY
-19 -30 Dl
--19 11 Dl
--20 -11 Dl
-20 30 Dl
-0 -535 Dl
-2319 2508 MXY
--22 -30 Dl
-4 23 Dl
--18 14 Dl
-36 -7 Dl
--936 -357 Dl
-3277 2455(sleep_on)N
-1405 1616 MXY
-36 4 Dl
--18 -13 Dl
-1 -22 Dl
--19 31 Dl
-1070 -535 Dl
-2631 2508 MXY
-36 6 Dl
--18 -14 Dl
-3 -22 Dl
--21 30 Dl
-891 -357 Dl
-1426 2455(sleep_on)N
-3255 1884 MXY
--31 -20 Dl
-11 20 Dl
--11 19 Dl
-31 -19 Dl
--535 0 Dl
-1554 2366(wake)N
-3277(wake)X
-2185 1884 MXY
--31 -20 Dl
-12 20 Dl
--12 19 Dl
-31 -19 Dl
--356 0 Dl
-0 -803 Dl
-3 f
-17 s
-1236 1851(Lock)N
-1118 2030(M)N
-1247(anager)X
-2339 1851(Log)N
-2187 2030(M)N
-2316(anager)X
-3333 1851(Buffer)N
-3257 2030(M)N
-3386(anager)X
-3522 1616 MXY
-20 -30 Dl
--20 11 Dl
--20 -11 Dl
-20 30 Dl
-0 -535 Dl
-1950 2654(Process)N
-2424(M)X
-2553(anager)X
-2542 1616 MXY
-19 -30 Dl
--19 11 Dl
--20 -11 Dl
-20 30 Dl
-0 -535 Dl
-1 f
-11 s
-2207 1364(unlock)N
-2452 2508 MXY
-20 -31 Dl
--20 11 Dl
--19 -11 Dl
-19 31 Dl
-0 -357 Dl
-2497 2322(sleep_on)N
-2497 2233(wake)N
-3 Dt
--1 Ds
-3 f
-10 s
-1790 2830(Figure)N
-2037(1:)X
-2144(Library)X
-2435(module)X
-2708(interfaces.)X
-1 f
-10 f
-555 3010(h)N
-579(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)X
-3 f
-555 3286(3.2.1.)N
-775(The)X
-928(Log)X
-1081(Manager)X
-1 f
-755 3409(The)N
-3 f
-907(Log)X
-1067(Manager)X
-1 f
-1406(enforces)X
-1706(the)X
-1831(write-ahead)X
-2238(logging)X
-2509(protocol.)X
-2843(Its)X
-2949(primitive)X
-3268(operations)X
-3628(are)X
-2 f
-3753(log)X
-1 f
-3855(,)X
-2 f
-3901(log_commit)X
-1 f
-4279(,)X
-2 f
-555 3499(log_read)N
-1 f
-844(,)X
-2 f
-889(log_roll)X
-1 f
-1171(and)X
-2 f
-1312(log_unroll)X
-1 f
-1649(.)X
-1714(The)X
-2 f
-1864(log)X
-1 f
-1991(call)X
-2132(performs)X
-2447(a)X
-2508(buffered)X
-2806(write)X
-2996(of)X
-3088(the)X
-3211(speci\256ed)X
-3520(log)X
-3646(record)X
-3876(and)X
-4016(returns)X
-4263(a)X
-555 3589(unique)N
-809(log)X
-947(sequence)X
-1278(number)X
-1559(\(LSN\).)X
-1840(This)X
-2017(LSN)X
-2203(may)X
-2376(then)X
-2549(be)X
-2660(used)X
-2842(to)X
-2939(retrieve)X
-3220(a)X
-3291(record)X
-3532(from)X
-3723(the)X
-3856(log)X
-3993(using)X
-4201(the)X
-2 f
-555 3679(log_read)N
-1 f
-865(call.)X
-1042(The)X
-2 f
-1188(log)X
-1 f
-1311(interface)X
-1614(knows)X
-1844(very)X
-2008(little)X
-2175(about)X
-2374(the)X
-2493(internal)X
-2759(format)X
-2993(of)X
-3080(the)X
-3198(log)X
-3320(records)X
-3577(it)X
-3641(receives.)X
-3965(Rather,)X
-4219(all)X
-555 3769(log)N
-681(records)X
-942(are)X
-1065 0.4028(referenced)AX
-1430(by)X
-1534(a)X
-1594(header)X
-1833(structure,)X
-2158(a)X
-2218(log)X
-2344(record)X
-2574(type,)X
-2756(and)X
-2896(a)X
-2956(character)X
-3276(buffer)X
-3497(containing)X
-3859(the)X
-3981(data)X
-4138(to)X
-4223(be)X
-555 3859(logged.)N
-834(The)X
-980(log)X
-1103(record)X
-1330(type)X
-1489(is)X
-1563(used)X
-1731(to)X
-1814(call)X
-1951(the)X
-2070(appropriate)X
-2457(redo)X
-2621(and)X
-2758(undo)X
-2939(routines)X
-3217(during)X
-2 f
-3446(abort)X
-1 f
-3639(and)X
-2 f
-3775(commit)X
-1 f
-4031(process-)X
-555 3949(ing.)N
-721(While)X
-941(we)X
-1059(have)X
-1235(used)X
-1406(the)X
-3 f
-1528(Log)X
-1684(Manager)X
-1 f
-2019(to)X
-2104(provide)X
-2372(before)X
-2601(and)X
-2740(after)X
-2911(image)X
-3130(logging,)X
-3417(it)X
-3484(may)X
-3645(also)X
-3797(be)X
-3896(used)X
-4066(for)X
-4183(any)X
-555 4039(of)N
-642(the)X
-760(logging)X
-1024(algorithms)X
-1386(discussed.)X
-755 4162(The)N
-2 f
-905(log_commit)X
-1 f
-1308(operation)X
-1636(behaves)X
-1920(exactly)X
-2177(like)X
-2322(the)X
-2 f
-2445(log)X
-1 f
-2572(operation)X
-2900(but)X
-3026(guarantees)X
-3394(that)X
-3538(the)X
-3660(log)X
-3786(has)X
-3917(been)X
-4093(forced)X
-555 4252(to)N
-643(disk)X
-802(before)X
-1034(returning.)X
-1394(A)X
-1478(discussion)X
-1837(of)X
-1930(our)X
-2063(commit)X
-2333(strategy)X
-2613(appears)X
-2884(in)X
-2971(the)X
-3094(implementation)X
-3621(section)X
-3873(\(section)X
-4152(4.2\).)X
-2 f
-555 4342(Log_unroll)N
-1 f
-935(reads)X
-1126(log)X
-1249(records)X
-1507(from)X
-1684(the)X
-1803(log,)X
-1946(following)X
-2278(backward)X
-2611(transaction)X
-2983(pointers)X
-3261(and)X
-3397(calling)X
-3635(the)X
-3753(appropriate)X
-4139(undo)X
-555 4432(routines)N
-839(to)X
-927(implement)X
-1295(transaction)X
-1673(abort.)X
-1904(In)X
-1997(a)X
-2059(similar)X
-2307(manner,)X
-2 f
-2594(log_roll)X
-1 f
-2877(reads)X
-3073(log)X
-3201(records)X
-3464(sequentially)X
-3877(forward,)X
-4178(cal-)X
-555 4522(ling)N
-699(the)X
-817(appropriate)X
-1203(redo)X
-1366(routines)X
-1644(to)X
-1726(recover)X
-1988(committed)X
-2350(transactions)X
-2753(after)X
-2921(a)X
-2977(system)X
-3219(crash.)X
-3 f
-555 4708(3.2.2.)N
-775(The)X
-928(Buffer)X
-1171(Manager)X
-1 f
-755 4831(The)N
-3 f
-912(Buffer)X
-1167(Manager)X
-1 f
-1511(uses)X
-1681(a)X
-1749(pool)X
-1923(of)X
-2022(shared)X
-2264(memory)X
-2563(to)X
-2657(provide)X
-2934(a)X
-3002(least-recently-used)X
-3641(\(LRU\))X
-3886(block)X
-4095(cache.)X
-555 4921(Although)N
-886(the)X
-1013(current)X
-1270(library)X
-1513(provides)X
-1818(an)X
-1923(LRU)X
-2112(cache,)X
-2345(it)X
-2418(would)X
-2647(be)X
-2752(simple)X
-2994(to)X
-3085(add)X
-3229(alternate)X
-3534(replacement)X
-3955(policies)X
-4232(as)X
-555 5011(suggested)N
-903(by)X
-1015([CHOU85])X
-1408(or)X
-1507(to)X
-1601(provide)X
-1878(multiple)X
-2176(buffer)X
-2405(pools)X
-2610(with)X
-2784(different)X
-3092(policies.)X
-3412(Transactions)X
-3853(request)X
-4116(pages)X
-555 5101(from)N
-736(the)X
-859(buffer)X
-1081(manager)X
-1383(and)X
-1524(keep)X
-1701(them)X
-3 f
-1886(pinned)X
-1 f
-2145(to)X
-2232(ensure)X
-2466(that)X
-2610(they)X
-2772(are)X
-2895(not)X
-3021(written)X
-3272(to)X
-3358(disk)X
-3515(while)X
-3717(they)X
-3879(are)X
-4002(in)X
-4088(a)X
-4148(logi-)X
-555 5191(cally)N
-732(inconsistent)X
-1135(state.)X
-1343(When)X
-1556(page)X
-1729(replacement)X
-2143(is)X
-2217(necessary,)X
-2571(the)X
-3 f
-2689(Buffer)X
-2932(Manager)X
-1 f
-3264(\256nds)X
-3439(an)X
-3535(unpinned)X
-3853(page)X
-4025(and)X
-4161(then)X
-555 5281(checks)N
-794(with)X
-956(the)X
-3 f
-1074(Log)X
-1227(Manager)X
-1 f
-1559(to)X
-1641(ensure)X
-1871(that)X
-2011(the)X
-2129(write-ahead)X
-2529(protocol)X
-2816(is)X
-2889(enforced.)X
-3 f
-555 5467(3.2.3.)N
-775(The)X
-928(Lock)X
-1121(Manager)X
-1 f
-755 5590(The)N
-3 f
-901(Lock)X
-1095(Manager)X
-1 f
-1428(supports)X
-1720(general)X
-1978(purpose)X
-2253(locking)X
-2514(\(single)X
-2753(writer,)X
-2986(multiple)X
-3273(readers\))X
-3553(which)X
-3769(is)X
-3842(currently)X
-4152(used)X
-555 5680(to)N
-638(provide)X
-904(two-phase)X
-1254(locking)X
-1514(and)X
-1650(high)X
-1812(concurrency)X
-2230(B-tree)X
-2451(locking.)X
-2751(However,)X
-3086(the)X
-3204(general)X
-3461(purpose)X
-3735(nature)X
-3956(of)X
-4043(the)X
-4161(lock)X
-
-6 p
-%%Page: 6 6
-10 s 10 xH 0 xS 1 f
-3 f
-1 f
-555 630(manager)N
-857(provides)X
-1158(the)X
-1281(ability)X
-1510(to)X
-1597(support)X
-1862(a)X
-1923(variety)X
-2171(of)X
-2263(locking)X
-2528(protocols.)X
-2890(Currently,)X
-3241(all)X
-3345(locks)X
-3538(are)X
-3661(issued)X
-3885(at)X
-3967(the)X
-4089(granu-)X
-555 720(larity)N
-747(of)X
-837(a)X
-896(page)X
-1071(\(the)X
-1219(size)X
-1367(of)X
-1457(a)X
-1516(buffer)X
-1736(in)X
-1821(the)X
-1942(buffer)X
-2161(pool\))X
-2352(which)X
-2570(is)X
-2645(identi\256ed)X
-2969(by)X
-3071(two)X
-3213(4-byte)X
-3440(integers)X
-3716(\(a)X
-3801(\256le)X
-3925(id)X
-4009(and)X
-4147(page)X
-555 810(number\).)N
-898(This)X
-1071(provides)X
-1378(the)X
-1507(necessary)X
-1851(information)X
-2259(to)X
-2351(extend)X
-2595(the)X
-3 f
-2723(Lock)X
-2926(Manager)X
-1 f
-3268(to)X
-3360(perform)X
-3649(hierarchical)X
-4059(locking)X
-555 900([GRAY76].)N
-982(The)X
-1133(current)X
-1387(implementation)X
-1915(does)X
-2088(not)X
-2216(support)X
-2482(locks)X
-2677(at)X
-2760(other)X
-2950(granularities)X
-3376(and)X
-3517(does)X
-3689(not)X
-3816(promote)X
-4108(locks;)X
-555 990(these)N
-740(are)X
-859(obvious)X
-1132(future)X
-1344(additions)X
-1657(to)X
-1739(the)X
-1857(system.)X
-755 1113(If)N
-831(an)X
-929(incoming)X
-1253(lock)X
-1413(request)X
-1667(cannot)X
-1903(be)X
-2001(granted,)X
-2284(the)X
-2404(requesting)X
-2760(process)X
-3023(is)X
-3098(queued)X
-3352(for)X
-3467(the)X
-3586(lock)X
-3745(and)X
-3882(descheduled.)X
-555 1203(When)N
-769(a)X
-827(lock)X
-987(is)X
-1062(released,)X
-1368(the)X
-1488(wait)X
-1647(queue)X
-1860(is)X
-1934(traversed)X
-2250(and)X
-2387(any)X
-2524(newly)X
-2741(compatible)X
-3118(locks)X
-3308(are)X
-3428(granted.)X
-3730(Locks)X
-3947(are)X
-4067(located)X
-555 1293(via)N
-680(a)X
-743(\256le)X
-872(and)X
-1015(page)X
-1194(hash)X
-1368(table)X
-1551(and)X
-1694(are)X
-1820(chained)X
-2097(both)X
-2266(by)X
-2373(object)X
-2595(and)X
-2737(by)X
-2843(transaction,)X
-3241(facilitating)X
-3614(rapid)X
-3805(traversal)X
-4108(of)X
-4201(the)X
-555 1383(lock)N
-713(table)X
-889(during)X
-1118(transaction)X
-1490(commit)X
-1754(and)X
-1890(abort.)X
-755 1506(The)N
-907(primary)X
-1188(interfaces)X
-1528(to)X
-1617(the)X
-1742(lock)X
-1907(manager)X
-2211(are)X
-2 f
-2337(lock)X
-1 f
-2471(,)X
-2 f
-2518(unlock)X
-1 f
-2732(,)X
-2779(and)X
-2 f
-2922(lock_unlock_all)X
-1 f
-3434(.)X
-2 f
-3500(Lock)X
-1 f
-3682(obtains)X
-3939(a)X
-4001(new)X
-4161(lock)X
-555 1596(for)N
-680(a)X
-747(speci\256c)X
-1023(object.)X
-1290(There)X
-1509(are)X
-1638(also)X
-1797(two)X
-1947(variants)X
-2231(of)X
-2328(the)X
-2 f
-2456(lock)X
-1 f
-2620(request,)X
-2 f
-2902(lock_upgrade)X
-1 f
-3373(and)X
-2 f
-3519(lock_downgrade)X
-1 f
-4053(,)X
-4103(which)X
-555 1686(allow)N
-755(the)X
-875(caller)X
-1076(to)X
-1160(atomically)X
-1519(trade)X
-1701(a)X
-1758(lock)X
-1917(of)X
-2005(one)X
-2142(type)X
-2301(for)X
-2416(a)X
-2473(lock)X
-2632(of)X
-2720(another.)X
-2 f
-3022(Unlock)X
-1 f
-3275(releases)X
-3551(a)X
-3608(speci\256c)X
-3874(mode)X
-4073(of)X
-4161(lock)X
-555 1776(on)N
-655(a)X
-711(speci\256c)X
-976(object.)X
-2 f
-1232(Lock_unlock_all)X
-1 f
-1786(releases)X
-2061(all)X
-2161(the)X
-2279(locks)X
-2468(associated)X
-2818(with)X
-2980(a)X
-3036(speci\256c)X
-3301(transaction.)X
-3 f
-555 1962(3.2.4.)N
-775(The)X
-928(Process)X
-1207(Manager)X
-1 f
-755 2085(The)N
-3 f
-900(Process)X
-1179(Manager)X
-1 f
-1511(acts)X
-1656(as)X
-1743(a)X
-1799(user-level)X
-2136(scheduler)X
-2464(to)X
-2546(make)X
-2740(processes)X
-3068(wait)X
-3226(on)X
-3326(unavailable)X
-3716(locks)X
-3905(and)X
-4041(pending)X
-555 2175(buffer)N
-778(cache)X
-988(I/O.)X
-1161(For)X
-1297(each)X
-1470(process,)X
-1756(a)X
-1817(semaphore)X
-2190(is)X
-2268(maintained)X
-2649(upon)X
-2834(which)X
-3055(that)X
-3200(process)X
-3466(waits)X
-3660(when)X
-3859(it)X
-3928(needs)X
-4136(to)X
-4223(be)X
-555 2265(descheduled.)N
-1014(When)X
-1228(a)X
-1286(process)X
-1549(needs)X
-1754(to)X
-1838(be)X
-1936(run,)X
-2084(its)X
-2180(semaphore)X
-2549(is)X
-2623(cleared,)X
-2897(and)X
-3034(the)X
-3153(operating)X
-3477(system)X
-3720(reschedules)X
-4116(it.)X
-4201(No)X
-555 2355(sophisticated)N
-1002(scheduling)X
-1378(algorithm)X
-1718(is)X
-1799(applied;)X
-2085(if)X
-2162(the)X
-2288(lock)X
-2454(for)X
-2576(which)X
-2800(a)X
-2864(process)X
-3133(was)X
-3286(waiting)X
-3554(becomes)X
-3863(available,)X
-4201(the)X
-555 2445(process)N
-824(is)X
-905(made)X
-1107(runnable.)X
-1456(It)X
-1533(would)X
-1761(have)X
-1941(been)X
-2121(possible)X
-2411(to)X
-2501(change)X
-2757(the)X
-2883(kernel's)X
-3170(process)X
-3439(scheduler)X
-3775(to)X
-3865(interact)X
-4134(more)X
-555 2535(ef\256ciently)N
-900(with)X
-1062(the)X
-1180(lock)X
-1338(manager,)X
-1655(but)X
-1777(doing)X
-1979(so)X
-2070(would)X
-2290(have)X
-2462(compromised)X
-2918(our)X
-3045(commitment)X
-3469(to)X
-3551(a)X
-3607(user-level)X
-3944(package.)X
-3 f
-555 2721(3.2.5.)N
-775(The)X
-928(Transaction)X
-1361(Manager)X
-1 f
-755 2844(The)N
-3 f
-901(Transaction)X
-1335(Manager)X
-1 f
-1668(provides)X
-1965(the)X
-2084(standard)X
-2377(interface)X
-2680(of)X
-2 f
-2768(txn_begin)X
-1 f
-3084(,)X
-2 f
-3125(txn_commit)X
-1 f
-3499(,)X
-3540(and)X
-2 f
-3676(txn_abort)X
-1 f
-3987(.)X
-4047(It)X
-4116(keeps)X
-555 2934(track)N
-742(of)X
-835(all)X
-941(active)X
-1159(transactions,)X
-1588(assigns)X
-1845(unique)X
-2089(transaction)X
-2467(identi\256ers,)X
-2833(and)X
-2974(directs)X
-3213(the)X
-3336(abort)X
-3526(and)X
-3667(commit)X
-3936(processing.)X
-555 3024(When)N
-772(a)X
-2 f
-833(txn_begin)X
-1 f
-1174(is)X
-1252(issued,)X
-1497(the)X
-3 f
-1620(Transaction)X
-2058(Manager)X
-1 f
-2395(assigns)X
-2651(the)X
-2773(next)X
-2935(available)X
-3249(transaction)X
-3625(identi\256er,)X
-3958(allocates)X
-4263(a)X
-555 3114(per-process)N
-948(transaction)X
-1322(structure)X
-1625(in)X
-1709(shared)X
-1941(memory,)X
-2249(increments)X
-2622(the)X
-2741(count)X
-2940(of)X
-3028(active)X
-3241(transactions,)X
-3665(and)X
-3802(returns)X
-4046(the)X
-4165(new)X
-555 3204(transaction)N
-937(identi\256er)X
-1256(to)X
-1348(the)X
-1476(calling)X
-1724(process.)X
-2034(The)X
-2188(in-memory)X
-2573(transaction)X
-2954(structure)X
-3264(contains)X
-3560(a)X
-3625(pointer)X
-3881(into)X
-4034(the)X
-4161(lock)X
-555 3294(table)N
-734(for)X
-851(locks)X
-1043(held)X
-1204(by)X
-1307(this)X
-1445(transaction,)X
-1840(the)X
-1961(last)X
-2095(log)X
-2220(sequence)X
-2538(number,)X
-2826(a)X
-2885(transaction)X
-3260(state)X
-3430(\()X
-2 f
-3457(idle)X
-1 f
-(,)S
-2 f
-3620(running)X
-1 f
-3873(,)X
-2 f
-3915(aborting)X
-1 f
-4190(,)X
-4232(or)X
-2 f
-555 3384(committing\))N
-1 f
-942(,)X
-982(an)X
-1078(error)X
-1255(code,)X
-1447(and)X
-1583(a)X
-1639(semaphore)X
-2007(identi\256er.)X
-755 3507(At)N
-859(commit,)X
-1147(the)X
-3 f
-1269(Transaction)X
-1706(Manager)X
-1 f
-2042(calls)X
-2 f
-2213(log_commit)X
-1 f
-2615(to)X
-2700(record)X
-2929(the)X
-3050(end)X
-3189(of)X
-3279(transaction)X
-3654(and)X
-3793(to)X
-3878(\257ush)X
-4056(the)X
-4177(log.)X
-555 3597(Then)N
-743(it)X
-810(directs)X
-1047(the)X
-3 f
-1168(Lock)X
-1364(Manager)X
-1 f
-1699(to)X
-1784(release)X
-2031(all)X
-2134(locks)X
-2325(associated)X
-2677(with)X
-2841(the)X
-2961(given)X
-3161(transaction.)X
-3575(If)X
-3651(a)X
-3709(transaction)X
-4083(aborts,)X
-555 3687(the)N
-3 f
-680(Transaction)X
-1120(Manager)X
-1 f
-1459(calls)X
-1633(on)X
-2 f
-1739(log_unroll)X
-1 f
-2102(to)X
-2190(read)X
-2355(the)X
-2479(transaction's)X
-2915(log)X
-3043(records)X
-3306(and)X
-3448(undo)X
-3634(any)X
-3776(modi\256cations)X
-4237(to)X
-555 3777(the)N
-673(database.)X
-1010(As)X
-1119(in)X
-1201(the)X
-1319(commit)X
-1583(case,)X
-1762(it)X
-1826(then)X
-1984(calls)X
-2 f
-2151(lock_unlock_all)X
-1 f
-2683(to)X
-2765(release)X
-3009(the)X
-3127(transaction's)X
-3557(locks.)X
-3 f
-555 3963(3.2.6.)N
-775(The)X
-928(Record)X
-1198(Manager)X
-1 f
-755 4086(The)N
-3 f
-919(Record)X
-1208(Manager)X
-1 f
-1559(supports)X
-1869(the)X
-2006(abstraction)X
-2397(of)X
-2503(reading)X
-2783(and)X
-2938(writing)X
-3208(records)X
-3484(to)X
-3585(a)X
-3660(database.)X
-3996(We)X
-4147(have)X
-555 4176(modi\256ed)N
-861(the)X
-981(the)X
-1101(database)X
-1399(access)X
-1626(routines)X
-3 f
-1905(db)X
-1 f
-1993(\(3\))X
-2108([BSD91])X
-2418(to)X
-2501(call)X
-2638(the)X
-2757(log,)X
-2900(lock,)X
-3079(and)X
-3216(buffer)X
-3434(managers.)X
-3803(In)X
-3891(order)X
-4082(to)X
-4165(pro-)X
-555 4266(vide)N
-718(functionality)X
-1152(to)X
-1239(perform)X
-1523(undo)X
-1708(and)X
-1849(redo,)X
-2037(the)X
-3 f
-2160(Record)X
-2434(Manager)X
-1 f
-2770(de\256nes)X
-3021(a)X
-3081(collection)X
-3421(of)X
-3512(log)X
-3638(record)X
-3868(types)X
-4061(and)X
-4201(the)X
-555 4356(associated)N
-920(undo)X
-1115(and)X
-1266(redo)X
-1444(routines.)X
-1777(The)X
-3 f
-1937(Log)X
-2105(Manager)X
-1 f
-2452(performs)X
-2777(a)X
-2848(table)X
-3039(lookup)X
-3296(on)X
-3411(the)X
-3543(record)X
-3783(type)X
-3955(to)X
-4051(call)X
-4201(the)X
-555 4446(appropriate)N
-951(routines.)X
-1299(For)X
-1440(example,)X
-1762(the)X
-1890(B-tree)X
-2121(access)X
-2356(method)X
-2625(requires)X
-2913(two)X
-3062(log)X
-3193(record)X
-3428(types:)X
-3648(insert)X
-3855(and)X
-4000(delete.)X
-4241(A)X
-555 4536(replace)N
-808(operation)X
-1131(is)X
-1204(implemented)X
-1642(as)X
-1729(a)X
-1785(delete)X
-1997(followed)X
-2302(by)X
-2402(an)X
-2498(insert)X
-2696(and)X
-2832(is)X
-2905(logged)X
-3143(accordingly.)X
-3 f
-555 4722(3.3.)N
-715(Application)X
-1134(Architectures)X
-1 f
-755 4845(The)N
-907(structure)X
-1215(of)X
-1309(LIBTP)X
-1558(allows)X
-1794(application)X
-2177(designers)X
-2507(to)X
-2596(trade)X
-2784(off)X
-2905(performance)X
-3339(and)X
-3481(protection.)X
-3872(Since)X
-4076(a)X
-4138(large)X
-555 4935(portion)N
-810(of)X
-901(LIBTP's)X
-1205(functionality)X
-1638(is)X
-1715(provided)X
-2024(by)X
-2128(managing)X
-2468(structures)X
-2804(in)X
-2889(shared)X
-3122(memory,)X
-3432(its)X
-3530(structures)X
-3865(are)X
-3987(subject)X
-4237(to)X
-555 5025(corruption)N
-926(by)X
-1043(applications)X
-1467(when)X
-1678(the)X
-1813(library)X
-2064(is)X
-2154(linked)X
-2391(directly)X
-2673(with)X
-2852(the)X
-2987(application.)X
-3420(For)X
-3568(this)X
-3720(reason,)X
-3987(LIBTP)X
-4246(is)X
-555 5115(designed)N
-864(to)X
-950(allow)X
-1152(compilation)X
-1558(into)X
-1706(a)X
-1766(separate)X
-2053(server)X
-2273(process)X
-2537(which)X
-2756(may)X
-2917(be)X
-3016(accessed)X
-3321(via)X
-3442(a)X
-3501(socket)X
-3729(interface.)X
-4094(In)X
-4184(this)X
-555 5205(way)N
-712(LIBTP's)X
-1015(data)X
-1172(structures)X
-1507(are)X
-1629(protected)X
-1951(from)X
-2130(application)X
-2509(code,)X
-2704(but)X
-2829(communication)X
-3349(overhead)X
-3666(is)X
-3741(increased.)X
-4107(When)X
-555 5295(applications)N
-975(are)X
-1107(trusted,)X
-1377(LIBTP)X
-1631(may)X
-1801(be)X
-1909(compiled)X
-2239(directly)X
-2516(into)X
-2672(the)X
-2802(application)X
-3190(providing)X
-3533(improved)X
-3872(performance.)X
-555 5385(Figures)N
-815(two)X
-955(and)X
-1091(three)X
-1272(show)X
-1461(the)X
-1579(two)X
-1719(alternate)X
-2016(application)X
-2392(architectures.)X
-755 5508(There)N
-964(are)X
-1084(potentially)X
-1447(two)X
-1588(modes)X
-1818(in)X
-1901(which)X
-2118(one)X
-2255(might)X
-2462(use)X
-2590(LIBTP)X
-2833(in)X
-2916(a)X
-2972(server)X
-3189(based)X
-3392(architecture.)X
-3832(In)X
-3919(the)X
-4037(\256rst,)X
-4201(the)X
-555 5598(server)N
-778(would)X
-1004(provide)X
-1275(the)X
-1399(capability)X
-1741(to)X
-1829(respond)X
-2109(to)X
-2197(requests)X
-2486(to)X
-2574(each)X
-2747(of)X
-2839(the)X
-2962(low)X
-3107(level)X
-3288(modules)X
-3584(\(lock,)X
-3794(log,)X
-3941(buffer,)X
-4183(and)X
-555 5688(transaction)N
-944(managers\).)X
-1356(Unfortunately,)X
-1863(the)X
-1998(performance)X
-2442(of)X
-2546(such)X
-2730(a)X
-2803(system)X
-3062(is)X
-3152(likely)X
-3371(to)X
-3470(be)X
-3583(blindingly)X
-3947(slow)X
-4134(since)X
-
-7 p
-%%Page: 7 7
-10 s 10 xH 0 xS 1 f
-3 f
-1 f
-1 Dt
-1864 1125 MXY
-15 -26 Dl
--15 10 Dl
--14 -10 Dl
-14 26 Dl
-0 -266 Dl
-1315 1125 MXY
-15 -26 Dl
--15 10 Dl
--14 -10 Dl
-14 26 Dl
-0 -266 Dl
-3 Dt
-1133 1125 MXY
-0 798 Dl
-931 0 Dl
-0 -798 Dl
--931 0 Dl
-1 Dt
-1266 1257 MXY
-0 133 Dl
-665 0 Dl
-0 -133 Dl
--665 0 Dl
-3 f
-8 s
-1513 1351(driver)N
-1502 1617(LIBTP)N
-1266 1390 MXY
-0 400 Dl
-665 0 Dl
-0 -400 Dl
--665 0 Dl
-3 Dt
-1133 726 MXY
-0 133 Dl
-931 0 Dl
-0 -133 Dl
--931 0 Dl
-1 f
-1029 1098(txn_abort)N
-964 1015(txn_commit)N
-1018 932(txn_begin)N
-1910 1015(db_ops)N
-3 f
-1308 820(Application)N
-1645(Program)X
-1398 1218(Server)N
-1594(Process)X
-1 f
-1390 986(socket)N
-1569(interface)X
-1 Dt
-1848 967 MXY
--23 -14 Dl
-8 14 Dl
--8 15 Dl
-23 -15 Dl
--50 0 Dl
-1324 MX
-23 15 Dl
--9 -15 Dl
-9 -14 Dl
--23 14 Dl
-50 0 Dl
-3 Dt
-2862 859 MXY
-0 1064 Dl
-932 0 Dl
-0 -1064 Dl
--932 0 Dl
-1 Dt
-3178 1390 MXY
-24 -12 Dl
--17 0 Dl
--8 -15 Dl
-1 27 Dl
-150 -265 Dl
-3494 1390 MXY
-0 -27 Dl
--8 15 Dl
--16 1 Dl
-24 11 Dl
--166 -265 Dl
-3 f
-3232 1617(LIBTP)N
-2995 1390 MXY
-0 400 Dl
-666 0 Dl
-0 -400 Dl
--666 0 Dl
-992 MY
-0 133 Dl
-666 0 Dl
-0 -133 Dl
--666 0 Dl
-3168 1086(Application)N
-1 f
-2939 1201(txn_begin)N
-2885 1284(txn_commit)N
-2950 1368(txn_abort)N
-3465 1284(db_ops)N
-3 f
-3155 766(Single)N
-3339(Process)X
-3 Dt
--1 Ds
-811 2100(Figure)N
-1023(2:)X
-1107(Server)X
-1318(Architecture.)X
-1 f
-1727(In)X
-1811(this)X
-1934(con\256guration,)X
-811 2190(the)N
-916(library)X
-1113(is)X
-1183(loaded)X
-1380(into)X
-1507(a)X
-1562(server)X
-1744(process)X
-1962(which)X
-2145(is)X
-2214(ac-)X
-811 2280(cessed)N
-993(via)X
-1087(a)X
-1131(socket)X
-1310(interface.)X
-3 f
-2563 2100(Figure)N
-2803(3:)X
-2914(Single)X
-3140(Process)X
-3403(Architecture.)X
-1 f
-3839(In)X
-3950(this)X
-2563 2190(con\256guration,)N
-2948(the)X
-3053(library)X
-3250(routines)X
-3483(are)X
-3587(loaded)X
-3784(as)X
-3864(part)X
-3990(of)X
-2563 2280(the)N
-2657(application)X
-2957(and)X
-3065(accessed)X
-3303(via)X
-3397(a)X
-3441(subroutine)X
-3727(interface.)X
-10 s
-10 f
-555 2403(h)N
-579(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)X
-1 f
-555 2679(modifying)N
-909(a)X
-966(piece)X
-1157(of)X
-1245(data)X
-1400(would)X
-1621(require)X
-1870(three)X
-2051(or)X
-2138(possibly)X
-2424(four)X
-2578(separate)X
-2862(communications:)X
-3433(one)X
-3569(to)X
-3651(lock)X
-3809(the)X
-3927(data,)X
-4101(one)X
-4237(to)X
-555 2769(obtain)N
-781(the)X
-905(data,)X
-1085(one)X
-1227(to)X
-1315(log)X
-1443(the)X
-1567(modi\256cation,)X
-2017(and)X
-2159(possibly)X
-2451(one)X
-2593(to)X
-2681(transmit)X
-2969(the)X
-3093(modi\256ed)X
-3403(data.)X
-3583(Figure)X
-3817(four)X
-3976(shows)X
-4201(the)X
-555 2859(relative)N
-826(performance)X
-1263(for)X
-1387(retrieving)X
-1728(a)X
-1793(single)X
-2013(record)X
-2248(using)X
-2450(the)X
-2577(record)X
-2812(level)X
-2997(call)X
-3142(versus)X
-3376(using)X
-3578(the)X
-3705(lower)X
-3917(level)X
-4102(buffer)X
-555 2949(management)N
-987(and)X
-1125(locking)X
-1387(calls.)X
-1616(The)X
-1763(2:1)X
-1887(ratio)X
-2056(observed)X
-2367(in)X
-2450(the)X
-2569(single)X
-2781(process)X
-3043(case)X
-3203(re\257ects)X
-3456(the)X
-3575(additional)X
-3916(overhead)X
-4232(of)X
-555 3039(parsing)N
-819(eight)X
-1006(commands)X
-1380(rather)X
-1595(than)X
-1760(one)X
-1903(while)X
-2108(the)X
-2233(3:1)X
-2362(ratio)X
-2536(observed)X
-2853(in)X
-2942(the)X
-3067(client/server)X
-3491(architecture)X
-3898(re\257ects)X
-4157(both)X
-555 3129(the)N
-679(parsing)X
-941(and)X
-1083(the)X
-1207(communication)X
-1731(overheard.)X
-2118(Although)X
-2445(there)X
-2631(may)X
-2794(be)X
-2895(applications)X
-3307(which)X
-3528(could)X
-3731(tolerate)X
-3997(such)X
-4169(per-)X
-555 3219(formance,)N
-904(it)X
-973(seems)X
-1194(far)X
-1309(more)X
-1499(feasible)X
-1774(to)X
-1861(support)X
-2126(a)X
-2187(higher)X
-2417(level)X
-2597(interface,)X
-2923(such)X
-3094(as)X
-3185(that)X
-3329(provided)X
-3638(by)X
-3742(a)X
-3802(query)X
-4009(language)X
-555 3309(\()N
-2 f
-582(e.g.)X
-1 f
-718(SQL)X
-889([SQL86]\).)X
-755 3432(Although)N
-1081(LIBTP)X
-1327(does)X
-1498(not)X
-1624(have)X
-1800(an)X
-1900(SQL)X
-2075(parser,)X
-2316(we)X
-2433(have)X
-2608(built)X
-2777(a)X
-2836(server)X
-3056(application)X
-3435(using)X
-3631(the)X
-3752(toolkit)X
-3983(command)X
-555 3522(language)N
-882(\(TCL\))X
-1124([OUST90].)X
-1544(The)X
-1706(server)X
-1940(supports)X
-2248(a)X
-2321(command)X
-2674(line)X
-2831(interface)X
-3150(similar)X
-3409(to)X
-3508(the)X
-3643(subroutine)X
-4017(interface)X
-555 3612(de\256ned)N
-811(in)X
-3 f
-893(db)X
-1 f
-981(\(3\).)X
-1135(Since)X
-1333(it)X
-1397(is)X
-1470(based)X
-1673(on)X
-1773(TCL,)X
-1964(it)X
-2028(provides)X
-2324(control)X
-2571(structures)X
-2903(as)X
-2990(well.)X
-3 f
-555 3798(4.)N
-655(Implementation)X
-1 f
-3 f
-555 3984(4.1.)N
-715(Locking)X
-1014(and)X
-1162(Deadlock)X
-1502(Detection)X
-1 f
-755 4107(LIBTP)N
-1007(uses)X
-1175(two-phase)X
-1535(locking)X
-1805(for)X
-1929(user)X
-2093(data.)X
-2297(Strictly)X
-2562(speaking,)X
-2897(the)X
-3024(two)X
-3173(phases)X
-3416(in)X
-3507(two-phase)X
-3866(locking)X
-4135(are)X
-4263(a)X
-3 f
-555 4197(grow)N
-1 f
-756(phase,)X
-986(during)X
-1221(which)X
-1443(locks)X
-1638(are)X
-1763(acquired,)X
-2086(and)X
-2228(a)X
-3 f
-2290(shrink)X
-1 f
-2537(phase,)X
-2766(during)X
-3001(which)X
-3223(locks)X
-3418(are)X
-3543(released.)X
-3873(No)X
-3997(lock)X
-4161(may)X
-555 4287(ever)N
-720(be)X
-822(acquired)X
-1124(during)X
-1358(the)X
-1481(shrink)X
-1706(phase.)X
-1954(The)X
-2104(grow)X
-2294(phase)X
-2502(lasts)X
-2669(until)X
-2840(the)X
-2963(\256rst)X
-3112(release,)X
-3381(which)X
-3602(marks)X
-3823(the)X
-3946(start)X
-4109(of)X
-4201(the)X
-555 4377(shrink)N
-780(phase.)X
-1028(In)X
-1120(practice,)X
-1420(the)X
-1543(grow)X
-1733(phase)X
-1941(lasts)X
-2108(for)X
-2227(the)X
-2350(duration)X
-2642(of)X
-2734(a)X
-2795(transaction)X
-3172(in)X
-3259(LIBTP)X
-3506(and)X
-3647(in)X
-3734(commercial)X
-4138(data-)X
-555 4467(base)N
-721(systems.)X
-1037(The)X
-1184(shrink)X
-1406(phase)X
-1611(takes)X
-1798(place)X
-1990(during)X
-2221(transaction)X
-2595(commit)X
-2861(or)X
-2950(abort.)X
-3177(This)X
-3341(means)X
-3568(that)X
-3710(locks)X
-3901(are)X
-4022(acquired)X
-555 4557(on)N
-655(demand)X
-929(during)X
-1158(the)X
-1276(lifetime)X
-1545(of)X
-1632(a)X
-1688(transaction,)X
-2080(and)X
-2216(held)X
-2374(until)X
-2540(commit)X
-2804(time,)X
-2986(at)X
-3064(which)X
-3280(point)X
-3464(all)X
-3564(locks)X
-3753(are)X
-3872(released.)X
-755 4680(If)N
-832(multiple)X
-1121(transactions)X
-1527(are)X
-1649(active)X
-1864(concurrently,)X
-2313(deadlocks)X
-2657(can)X
-2792(occur)X
-2994(and)X
-3133(must)X
-3311(be)X
-3410(detected)X
-3701(and)X
-3840(resolved.)X
-4174(The)X
-555 4770(lock)N
-715(table)X
-893(can)X
-1027(be)X
-1125(thought)X
-1391(of)X
-1480(as)X
-1569(a)X
-1627(representation)X
-2104(of)X
-2193(a)X
-2251(directed)X
-2532(graph.)X
-2777(The)X
-2924(nodes)X
-3133(in)X
-3216(the)X
-3335(graph)X
-3539(are)X
-3659(transactions.)X
-4103(Edges)X
-555 4860(represent)N
-878(the)X
-3 f
-1004(waits-for)X
-1 f
-1340(relation)X
-1613(between)X
-1909(transactions;)X
-2342(if)X
-2419(transaction)X
-2 f
-2799(A)X
-1 f
-2876(is)X
-2957(waiting)X
-3225(for)X
-3347(a)X
-3411(lock)X
-3577(held)X
-3743(by)X
-3851(transaction)X
-2 f
-4230(B)X
-1 f
-4279(,)X
-555 4950(then)N
-716(a)X
-775(directed)X
-1057(edge)X
-1232(exists)X
-1437(from)X
-2 f
-1616(A)X
-1 f
-1687(to)X
-2 f
-1771(B)X
-1 f
-1842(in)X
-1926(the)X
-2046(graph.)X
-2291(A)X
-2371(deadlock)X
-2683(exists)X
-2887(if)X
-2958(a)X
-3016(cycle)X
-3208(appears)X
-3476(in)X
-3560(the)X
-3680(graph.)X
-3925(By)X
-4040(conven-)X
-555 5040(tion,)N
-719(no)X
-819(transaction)X
-1191(ever)X
-1350(waits)X
-1539(for)X
-1653(a)X
-1709(lock)X
-1867(it)X
-1931(already)X
-2188(holds,)X
-2401(so)X
-2492(re\257exive)X
-2793(edges)X
-2996(are)X
-3115(impossible.)X
-755 5163(A)N
-836(distinguished)X
-1285(process)X
-1549(monitors)X
-1856(the)X
-1977(lock)X
-2138(table,)X
-2337(searching)X
-2668(for)X
-2785(cycles.)X
-3048(The)X
-3195(frequency)X
-3539(with)X
-3703(which)X
-3921(this)X
-4058(process)X
-555 5253(runs)N
-716(is)X
-792(user-settable;)X
-1243(for)X
-1360(the)X
-1481(multi-user)X
-1833(tests)X
-1998(discussed)X
-2328(in)X
-2413(section)X
-2663(5.1.2,)X
-2866(it)X
-2933(has)X
-3063(been)X
-3238(set)X
-3350(to)X
-3435(wake)X
-3628(up)X
-3731(every)X
-3932(second,)X
-4197(but)X
-555 5343(more)N
-742(sophisticated)X
-1182(schedules)X
-1516(are)X
-1636(certainly)X
-1938(possible.)X
-2261(When)X
-2474(a)X
-2531(cycle)X
-2722(is)X
-2796(detected,)X
-3105(one)X
-3242(of)X
-3330(the)X
-3449(transactions)X
-3853(in)X
-3936(the)X
-4055(cycle)X
-4246(is)X
-555 5433(nominated)N
-917(and)X
-1057(aborted.)X
-1362(When)X
-1578(the)X
-1700(transaction)X
-2076(aborts,)X
-2315(it)X
-2382(rolls)X
-2547(back)X
-2722(its)X
-2820(changes)X
-3102(and)X
-3241(releases)X
-3519(its)X
-3617(locks,)X
-3829(thereby)X
-4093(break-)X
-555 5523(ing)N
-677(the)X
-795(cycle)X
-985(in)X
-1067(the)X
-1185(graph.)X
-
-8 p
-%%Page: 8 8
-10 s 10 xH 0 xS 1 f
-3 f
-1 f
-4 Ds
-1 Dt
-1866 865 MXY
-1338 0 Dl
-1866 1031 MXY
-1338 0 Dl
-1866 1199 MXY
-1338 0 Dl
-1866 1366 MXY
-1338 0 Dl
-1866 1533 MXY
-1338 0 Dl
-1866 1701 MXY
-1338 0 Dl
--1 Ds
-5 Dt
-1866 1868 MXY
-1338 0 Dl
-1 Dt
-1 Di
-2981 MX
- 2981 1868 lineto
- 2981 1575 lineto
- 3092 1575 lineto
- 3092 1868 lineto
- 2981 1868 lineto
-closepath 21 2981 1575 3092 1868 Dp
-2646 MX
- 2646 1868 lineto
- 2646 949 lineto
- 2758 949 lineto
- 2758 1868 lineto
- 2646 1868 lineto
-closepath 14 2646 949 2758 1868 Dp
-2312 MX
- 2312 1868 lineto
- 2312 1701 lineto
- 2423 1701 lineto
- 2423 1868 lineto
- 2312 1868 lineto
-closepath 3 2312 1701 2423 1868 Dp
-1977 MX
- 1977 1868 lineto
- 1977 1512 lineto
- 2089 1512 lineto
- 2089 1868 lineto
- 1977 1868 lineto
-closepath 19 1977 1512 2089 1868 Dp
-3 f
-2640 2047(Client/Server)N
-1957(Single)X
-2185(Process)X
-7 s
-2957 1957(record)N
-2570(component)X
-2289(record)X
-1890(components)X
-1733 1724(.1)N
-1733 1556(.2)N
-1733 1389(.3)N
-1733 1222(.4)N
-1733 1055(.5)N
-1733 889(.6)N
-1590 726(Elapsed)N
-1794(Time)X
-1613 782(\(in)N
-1693(seconds\))X
-3 Dt
--1 Ds
-8 s
-555 2255(Figure)N
-756(4:)X
-829(Comparison)X
-1187(of)X
-1260(High)X
-1416(and)X
-1540(Low)X
-1681(Level)X
-1850(Interfaces.)X
-1 f
-2174(Elapsed)X
-2395(time)X
-2528(in)X
-2597(seconds)X
-2818(to)X
-2887(perform)X
-3111(a)X
-3158(single)X
-3330(record)X
-3511(retrieval)X
-3742(from)X
-3885(a)X
-3932(command)X
-4203(line)X
-555 2345(\(rather)N
-751(than)X
-888(a)X
-943(procedural)X
-1241(interface\))X
-1510(is)X
-1579(shown)X
-1772(on)X
-1862(the)X
-1966(y)X
-2024(axis.)X
-2185(The)X
-2310(``component'')X
-2704(numbers)X
-2950(re\257ect)X
-3135(the)X
-3239(timings)X
-3458(when)X
-3622(the)X
-3726(record)X
-3914(is)X
-3983(retrieved)X
-4235(by)X
-555 2435(separate)N
-785(calls)X
-924(to)X
-996(the)X
-1096(lock)X
-1228(manager)X
-1469(and)X
-1583(buffer)X
-1760(manager)X
-2001(while)X
-2165(the)X
-2264(``record'')X
-2531(timings)X
-2745(were)X
-2889(obtained)X
-3130(by)X
-3215(using)X
-3375(a)X
-3424(single)X
-3598(call)X
-3711(to)X
-3782(the)X
-3881(record)X
-4064(manager.)X
-555 2525(The)N
-674(2:1)X
-776(ratio)X
-913(observed)X
-1163(for)X
-1257(the)X
-1355(single)X
-1528(process)X
-1739(case)X
-1868(is)X
-1930(a)X
-1977(re\257ection)X
-2237(of)X
-2309(the)X
-2406(parsing)X
-2613(overhead)X
-2865(for)X
-2958(executing)X
-3225(eight)X
-3372(separate)X
-3599(commands)X
-3895(rather)X
-4062(than)X
-4191(one.)X
-555 2615(The)N
-673(additional)X
-948(factor)X
-1115(of)X
-1187(one)X
-1298(re\257ected)X
-1536(in)X
-1605(the)X
-1702(3:1)X
-1803(ratio)X
-1939(for)X
-2031(the)X
-2127(client/server)X
-2460(architecture)X
-2794(is)X
-2855(due)X
-2965(to)X
-3033(the)X
-3129(communication)X
-3545(overhead.)X
-3828(The)X
-3945(true)X
-4062(ratios)X
-4222(are)X
-555 2705(actually)N
-775(worse)X
-945(since)X
-1094(the)X
-1190(component)X
-1492(timings)X
-1703(do)X
-1785(not)X
-1884(re\257ect)X
-2060(the)X
-2155(search)X
-2334(times)X
-2490(within)X
-2671(each)X
-2804(page)X
-2941(or)X
-3011(the)X
-3106(time)X
-3237(required)X
-3466(to)X
-3533(transmit)X
-3760(the)X
-3855(page)X
-3992(between)X
-4221(the)X
-555 2795(two)N
-667(processes.)X
-10 s
-10 f
-555 2885(h)N
-579(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)X
-3 f
-555 3161(4.2.)N
-715(Group)X
-961(Commit)X
-1 f
-755 3284(Since)N
-959(the)X
-1083(log)X
-1211(must)X
-1392(be)X
-1494(\257ushed)X
-1751(to)X
-1839(disk)X
-1997(at)X
-2080(commit)X
-2349(time,)X
-2536(disk)X
-2694(bandwidth)X
-3057(fundamentally)X
-3545(limits)X
-3751(the)X
-3874(rate)X
-4020(at)X
-4103(which)X
-555 3374(transactions)N
-959(complete.)X
-1314(Since)X
-1513(most)X
-1688(transactions)X
-2091(write)X
-2276(only)X
-2438(a)X
-2494(few)X
-2635(small)X
-2828(records)X
-3085(to)X
-3167(the)X
-3285(log,)X
-3427(the)X
-3545(last)X
-3676(page)X
-3848(of)X
-3935(the)X
-4053(log)X
-4175(will)X
-555 3464(be)N
-658(\257ushed)X
-916(once)X
-1095(by)X
-1202(every)X
-1408(transaction)X
-1787(which)X
-2010(writes)X
-2233(to)X
-2322(it.)X
-2433(In)X
-2527(the)X
-2652(naive)X
-2853(implementation,)X
-3402(these)X
-3593(\257ushes)X
-3841(would)X
-4067(happen)X
-555 3554(serially.)N
-755 3677(LIBTP)N
-1008(uses)X
-3 f
-1177(group)X
-1412(commit)X
-1 f
-1702([DEWI84])X
-2077(in)X
-2170(order)X
-2371(to)X
-2464(amortize)X
-2775(the)X
-2903(cost)X
-3062(of)X
-3159(one)X
-3305(synchronous)X
-3740(disk)X
-3903(write)X
-4098(across)X
-555 3767(multiple)N
-851(transactions.)X
-1304(Group)X
-1539(commit)X
-1812(provides)X
-2117(a)X
-2182(way)X
-2345(for)X
-2468(a)X
-2533(group)X
-2749(of)X
-2845(transactions)X
-3257(to)X
-3348(commit)X
-3621(simultaneously.)X
-4174(The)X
-555 3857(\256rst)N
-709(several)X
-967(transactions)X
-1380(to)X
-1472(commit)X
-1745(write)X
-1939(their)X
-2115(changes)X
-2403(to)X
-2494(the)X
-2621(in-memory)X
-3006(log)X
-3137(page,)X
-3338(then)X
-3505(sleep)X
-3699(on)X
-3808(a)X
-3873(distinguished)X
-555 3947(semaphore.)N
-966(Later,)X
-1179(a)X
-1238(committing)X
-1629(transaction)X
-2004(\257ushes)X
-2249(the)X
-2370(page)X
-2545(to)X
-2630(disk,)X
-2805(and)X
-2943(wakes)X
-3166(up)X
-3268(all)X
-3370(its)X
-3467(sleeping)X
-3756(peers.)X
-3988(The)X
-4135(point)X
-555 4037(at)N
-635(which)X
-853(changes)X
-1134(are)X
-1255(actually)X
-1531(written)X
-1780(is)X
-1855(determined)X
-2238(by)X
-2340(three)X
-2523(thresholds.)X
-2914(The)X
-3061(\256rst)X
-3207(is)X
-3281(the)X
-2 f
-3400(group)X
-3612(threshold)X
-1 f
-3935(and)X
-4072(de\256nes)X
-555 4127(the)N
-674(minimum)X
-1005(number)X
-1271(of)X
-1359(transactions)X
-1763(which)X
-1979(must)X
-2154(be)X
-2250(active)X
-2462(in)X
-2544(the)X
-2662(system)X
-2904(before)X
-3130(transactions)X
-3533(are)X
-3652(forced)X
-3878(to)X
-3960(participate)X
-555 4217(in)N
-646(a)X
-711(group)X
-927(commit.)X
-1240(The)X
-1394(second)X
-1646(is)X
-1728(the)X
-2 f
-1855(wait)X
-2021(threshold)X
-1 f
-2352(which)X
-2577(is)X
-2658(expressed)X
-3003(as)X
-3098(the)X
-3224(percentage)X
-3601(of)X
-3696(active)X
-3916(transactions)X
-555 4307(waiting)N
-826(to)X
-919(be)X
-1026(committed.)X
-1439(The)X
-1595(last)X
-1737(is)X
-1821(the)X
-2 f
-1950(logdelay)X
-2257(threshold)X
-1 f
-2590(which)X
-2816(indicates)X
-3131(how)X
-3299(much)X
-3507(un\257ushed)X
-3848(log)X
-3980(should)X
-4223(be)X
-555 4397(allowed)N
-829(to)X
-911(accumulate)X
-1297(before)X
-1523(a)X
-1579(waiting)X
-1839(transaction's)X
-2289(commit)X
-2553(record)X
-2779(is)X
-2852(\257ushed.)X
-755 4520(Group)N
-981(commit)X
-1246(can)X
-1379(substantially)X
-1803(improve)X
-2090(performance)X
-2517(for)X
-2631(high-concurrency)X
-3218(environments.)X
-3714(If)X
-3788(only)X
-3950(a)X
-4006(few)X
-4147(tran-)X
-555 4610(sactions)N
-836(are)X
-957(running,)X
-1248(it)X
-1314(is)X
-1389(unlikely)X
-1673(to)X
-1757(improve)X
-2046(things)X
-2263(at)X
-2343(all.)X
-2485(The)X
-2632(crossover)X
-2962(point)X
-3148(is)X
-3223(the)X
-3343(point)X
-3529(at)X
-3609(which)X
-3827(the)X
-3947(transaction)X
-555 4700(commit)N
-823(rate)X
-968(is)X
-1045(limited)X
-1295(by)X
-1399(the)X
-1521(bandwidth)X
-1883(of)X
-1974(the)X
-2096(device)X
-2330(on)X
-2434(which)X
-2654(the)X
-2776(log)X
-2902(resides.)X
-3189(If)X
-3267(processes)X
-3599(are)X
-3722(trying)X
-3937(to)X
-4023(\257ush)X
-4201(the)X
-555 4790(log)N
-677(faster)X
-876(than)X
-1034(the)X
-1152(log)X
-1274(disk)X
-1427(can)X
-1559(accept)X
-1785(data,)X
-1959(then)X
-2117(group)X
-2324(commit)X
-2588(will)X
-2732(increase)X
-3016(the)X
-3134(commit)X
-3398(rate.)X
-3 f
-555 4976(4.3.)N
-715(Kernel)X
-971(Intervention)X
-1418(for)X
-1541(Synchronization)X
-1 f
-755 5099(Since)N
-954(LIBTP)X
-1197(uses)X
-1356(data)X
-1511(in)X
-1594(shared)X
-1825(memory)X
-2113(\()X
-2 f
-2140(e.g.)X
-1 f
-2277(the)X
-2395(lock)X
-2553(table)X
-2729(and)X
-2865(buffer)X
-3082(pool\))X
-3271(it)X
-3335(must)X
-3510(be)X
-3606(possible)X
-3888(for)X
-4002(a)X
-4058(process)X
-555 5189(to)N
-640(acquire)X
-900(exclusive)X
-1226(access)X
-1454(to)X
-1538(shared)X
-1770(data)X
-1926(in)X
-2010(order)X
-2202(to)X
-2286(prevent)X
-2549(corruption.)X
-2945(In)X
-3034(addition,)X
-3338(the)X
-3458(process)X
-3721(manager)X
-4020(must)X
-4197(put)X
-555 5279(processes)N
-886(to)X
-971(sleep)X
-1159(when)X
-1356(the)X
-1477(lock)X
-1638(or)X
-1728(buffer)X
-1948(they)X
-2109(request)X
-2364(is)X
-2440(in)X
-2525(use)X
-2655(by)X
-2758(some)X
-2950(other)X
-3138(process.)X
-3441(In)X
-3530(the)X
-3650(LIBTP)X
-3894(implementa-)X
-555 5385(tion)N
-705(under)X
-914(Ultrix)X
-1131(4.0)X
-7 s
-5353(2)Y
-10 s
-5385(,)Y
-1305(we)X
-1424(use)X
-1556(System)X
-1816(V)X
-1899(semaphores)X
-2303(to)X
-2390(provide)X
-2660(this)X
-2800(synchronization.)X
-3377(Semaphores)X
-3794(implemented)X
-4237(in)X
-555 5475(this)N
-701(fashion)X
-968(turn)X
-1128(out)X
-1261(to)X
-1354(be)X
-1461(an)X
-1568(expensive)X
-1920(choice)X
-2161(for)X
-2285(synchronization,)X
-2847(because)X
-3132(each)X
-3310(access)X
-3546(traps)X
-3732(to)X
-3824(the)X
-3952(kernel)X
-4183(and)X
-8 s
-10 f
-555 5547(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)N
-5 s
-1 f
-727 5625(2)N
-8 s
-763 5650(Ultrix)N
-932(and)X
-1040(DEC)X
-1184(are)X
-1277(trademarks)X
-1576(of)X
-1645(Digital)X
-1839(Equipment)X
-2136(Corporation.)X
-
-9 p
-%%Page: 9 9
-8 s 8 xH 0 xS 1 f
-10 s
-3 f
-1 f
-555 630(executes)N
-852(atomically)X
-1210(there.)X
-755 753(On)N
-878(architectures)X
-1314(that)X
-1459(support)X
-1724(atomic)X
-1967(test-and-set,)X
-2382(a)X
-2443(much)X
-2646(better)X
-2854(choice)X
-3089(would)X
-3314(be)X
-3415(to)X
-3502(attempt)X
-3767(to)X
-3854(obtain)X
-4079(a)X
-4139(spin-)X
-555 843(lock)N
-714(with)X
-877(a)X
-934(test-and-set,)X
-1345(and)X
-1482(issue)X
-1663(a)X
-1720(system)X
-1963(call)X
-2100(only)X
-2263(if)X
-2333(the)X
-2452(spinlock)X
-2744(is)X
-2818(unavailable.)X
-3249(Since)X
-3447(virtually)X
-3738(all)X
-3838(semaphores)X
-4237(in)X
-555 933(LIBTP)N
-801(are)X
-924(uncontested)X
-1330(and)X
-1469(are)X
-1591(held)X
-1752(for)X
-1869(very)X
-2035(short)X
-2218(periods)X
-2477(of)X
-2567(time,)X
-2752(this)X
-2890(would)X
-3113(improve)X
-3403(performance.)X
-3873(For)X
-4007(example,)X
-555 1023(processes)N
-885(must)X
-1062(acquire)X
-1321(exclusive)X
-1646(access)X
-1874(to)X
-1958(buffer)X
-2177(pool)X
-2341(metadata)X
-2653(in)X
-2737(order)X
-2929(to)X
-3013(\256nd)X
-3159(and)X
-3297(pin)X
-3421(a)X
-3479(buffer)X
-3698(in)X
-3781(shared)X
-4012(memory.)X
-555 1113(This)N
-721(semaphore)X
-1093(is)X
-1170(requested)X
-1502(most)X
-1681(frequently)X
-2034(in)X
-2119(LIBTP.)X
-2404(However,)X
-2742(once)X
-2917(it)X
-2984(is)X
-3060(acquired,)X
-3380(only)X
-3545(a)X
-3604(few)X
-3748(instructions)X
-4144(must)X
-555 1203(be)N
-656(executed)X
-966(before)X
-1196(it)X
-1264(is)X
-1341(released.)X
-1669(On)X
-1791(one)X
-1931(architecture)X
-2335(for)X
-2453(which)X
-2673(we)X
-2791(were)X
-2972(able)X
-3130(to)X
-3216(gather)X
-3441(detailed)X
-3719(pro\256ling)X
-4018(informa-)X
-555 1293(tion,)N
-729(the)X
-857(cost)X
-1015(of)X
-1111(the)X
-1238(semaphore)X
-1615(calls)X
-1791(accounted)X
-2146(for)X
-2269(25%)X
-2445(of)X
-2541(the)X
-2668(total)X
-2839(time)X
-3010(spent)X
-3208(updating)X
-3517(the)X
-3644(metadata.)X
-4003(This)X
-4174(was)X
-555 1383(fairly)N
-749(consistent)X
-1089(across)X
-1310(most)X
-1485(of)X
-1572(the)X
-1690(critical)X
-1933(sections.)X
-755 1506(In)N
-848(an)X
-950(attempt)X
-1216(to)X
-1304(quantify)X
-1597(the)X
-1720(overhead)X
-2040(of)X
-2132(kernel)X
-2358(synchronization,)X
-2915(we)X
-3034(ran)X
-3162(tests)X
-3329(on)X
-3434(a)X
-3495(version)X
-3756(of)X
-3848(4.3BSD-Reno)X
-555 1596(which)N
-786(had)X
-937(been)X
-1123(modi\256ed)X
-1441(to)X
-1537(support)X
-1811(binary)X
-2050(semaphore)X
-2432(facilities)X
-2742(similar)X
-2998(to)X
-3094(those)X
-3297(described)X
-3639(in)X
-3735([POSIX91].)X
-4174(The)X
-555 1686(hardware)N
-880(platform)X
-1181(consisted)X
-1504(of)X
-1595(an)X
-1695(HP300)X
-1941(\(33MHz)X
-2237(MC68030\))X
-2612(workstation)X
-3014(with)X
-3180(16MBytes)X
-3537(of)X
-3628(main)X
-3812(memory,)X
-4123(and)X
-4263(a)X
-555 1776(600MByte)N
-920(HP7959)X
-1205(SCSI)X
-1396(disk)X
-1552(\(17)X
-1682(ms)X
-1798(average)X
-2072(seek)X
-2237(time\).)X
-2468(We)X
-2602(ran)X
-2727(three)X
-2910(sets)X
-3052(of)X
-3141(comparisons)X
-3568(which)X
-3786(are)X
-3907(summarized)X
-555 1866(in)N
-645(\256gure)X
-860(\256ve.)X
-1028(In)X
-1123(each)X
-1299(comparison)X
-1701(we)X
-1823(ran)X
-1954(two)X
-2102(tests,)X
-2292(one)X
-2436(using)X
-2637(hardware)X
-2965(spinlocks)X
-3295(and)X
-3438(the)X
-3563(other)X
-3755(using)X
-3955(kernel)X
-4183(call)X
-555 1956(synchronization.)N
-1135(Since)X
-1341(the)X
-1467(test)X
-1606(was)X
-1758(run)X
-1892(single-user,)X
-2291(none)X
-2474(of)X
-2568(the)X
-2693(the)X
-2818(locks)X
-3014(were)X
-3198(contested.)X
-3568(In)X
-3662(the)X
-3787(\256rst)X
-3938(two)X
-4085(sets)X
-4232(of)X
-555 2046(tests,)N
-743(we)X
-863(ran)X
-992(the)X
-1116(full)X
-1253(transaction)X
-1631(processing)X
-2000(benchmark)X
-2383(described)X
-2717(in)X
-2805(section)X
-3058(5.1.)X
-3223(In)X
-3315(one)X
-3456(case)X
-3620(we)X
-3739(ran)X
-3867(with)X
-4034(both)X
-4201(the)X
-555 2136(database)N
-854(and)X
-992(log)X
-1116(on)X
-1218(the)X
-1338(same)X
-1525(disk)X
-1680(\(1)X
-1769(Disk\))X
-1969(and)X
-2107(in)X
-2191(the)X
-2311(second,)X
-2576(we)X
-2692(ran)X
-2817(with)X
-2981(the)X
-3101(database)X
-3400(and)X
-3538(log)X
-3661(on)X
-3762(separate)X
-4047(disks)X
-4232(\(2)X
-555 2226(Disk\).)N
-800(In)X
-894(the)X
-1019(last)X
-1157(test,)X
-1315(we)X
-1436(wanted)X
-1695(to)X
-1784(create)X
-2004(a)X
-2067(CPU)X
-2249(bound)X
-2476(environment,)X
-2928(so)X
-3026(we)X
-3146(used)X
-3319(a)X
-3381(database)X
-3684(small)X
-3883(enough)X
-4145(to)X
-4233(\256t)X
-555 2316(completely)N
-941(in)X
-1033(the)X
-1161(cache)X
-1375(and)X
-1521(issued)X
-1751(read-only)X
-2089(transactions.)X
-2541(The)X
-2695(results)X
-2933(in)X
-3024(\256gure)X
-3240(\256ve)X
-3389(express)X
-3659(the)X
-3786(kernel)X
-4016(call)X
-4161(syn-)X
-555 2406(chronization)N
-980(performance)X
-1411(as)X
-1502(a)X
-1562(percentage)X
-1935(of)X
-2026(the)X
-2148(spinlock)X
-2443(performance.)X
-2914(For)X
-3049(example,)X
-3365(in)X
-3451(the)X
-3573(1)X
-3637(disk)X
-3794(case,)X
-3977(the)X
-4098(kernel)X
-555 2496(call)N
-697(implementation)X
-1225(achieved)X
-1537(4.4)X
-1662(TPS)X
-1824(\(transactions)X
-2259(per)X
-2387(second\))X
-2662(while)X
-2865(the)X
-2988(semaphore)X
-3361(implementation)X
-3888(achieved)X
-4199(4.6)X
-555 2586(TPS,)N
-735(and)X
-874(the)X
-995(relative)X
-1259(performance)X
-1689(of)X
-1779(the)X
-1900(kernel)X
-2123(synchronization)X
-2657(is)X
-2732(96%)X
-2901(that)X
-3043(of)X
-3132(the)X
-3252(spinlock)X
-3545(\(100)X
-3714(*)X
-3776(4.4)X
-3898(/)X
-3942(4.6\).)X
-4111(There)X
-555 2676(are)N
-674(two)X
-814(striking)X
-1078(observations)X
-1503(from)X
-1679(these)X
-1864(results:)X
-10 f
-635 2799(g)N
-1 f
-755(even)X
-927(when)X
-1121(the)X
-1239(system)X
-1481(is)X
-1554(disk)X
-1707(bound,)X
-1947(the)X
-2065(CPU)X
-2240(cost)X
-2389(of)X
-2476(synchronization)X
-3008(is)X
-3081(noticeable,)X
-3451(and)X
-10 f
-635 2922(g)N
-1 f
-755(when)X
-949(we)X
-1063(are)X
-1182(CPU)X
-1357(bound,)X
-1597(the)X
-1715(difference)X
-2062(is)X
-2135(dramatic)X
-2436(\(67%\).)X
-3 f
-555 3108(4.4.)N
-715(Transaction)X
-1148(Protected)X
-1499(Access)X
-1747(Methods)X
-1 f
-755 3231(The)N
-903(B-tree)X
-1127(and)X
-1266(\256xed)X
-1449(length)X
-1671(recno)X
-1872(\(record)X
-2127(number\))X
-2421(access)X
-2649(methods)X
-2942(have)X
-3116(been)X
-3290(modi\256ed)X
-3596(to)X
-3680(provide)X
-3947(transaction)X
-555 3321(protection.)N
-941(Whereas)X
-1244(the)X
-1363(previously)X
-1722(published)X
-2054(interface)X
-2357(to)X
-2440(the)X
-2559(access)X
-2786(routines)X
-3065(had)X
-3202(separate)X
-3487(open)X
-3664(calls)X
-3832(for)X
-3946(each)X
-4114(of)X
-4201(the)X
-10 f
-555 3507(h)N
-579(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)X
-1 Dt
-2978 5036 MXY
- 2978 5036 lineto
- 2978 4662 lineto
- 3093 4662 lineto
- 3093 5036 lineto
- 2978 5036 lineto
-closepath 21 2978 4662 3093 5036 Dp
-2518 MX
- 2518 5036 lineto
- 2518 3960 lineto
- 2633 3960 lineto
- 2633 5036 lineto
- 2518 5036 lineto
-closepath 3 2518 3960 2633 5036 Dp
-2059 MX
- 2059 5036 lineto
- 2059 3946 lineto
- 2174 3946 lineto
- 2174 5036 lineto
- 2059 5036 lineto
-closepath 1 2059 3946 2174 5036 Dp
-3 f
-7 s
-2912 5141(Read-only)N
-1426 3767(of)N
-1487(Spinlock)X
-1710(Throughput)X
-1480 3710(Throughput)N
-1786(as)X
-1850(a)X
-1892(%)X
-11 s
-1670 4843(20)N
-1670 4614(40)N
-1670 4384(60)N
-1670 4155(80)N
-1648 3925(100)N
-7 s
-2041 5141(1)N
-2083(Disk)X
-2490(2)X
-2532(Disks)X
-5 Dt
-1829 5036 MXY
-1494 0 Dl
-4 Ds
-1 Dt
-1829 4806 MXY
-1494 0 Dl
-1829 4577 MXY
-1494 0 Dl
-1829 4347 MXY
-1494 0 Dl
-1829 4118 MXY
-1494 0 Dl
-1829 3888 MXY
-1494 0 Dl
-3 Dt
--1 Ds
-8 s
-555 5360(Figure)N
-753(5:)X
-823(Kernel)X
-1028(Overhead)X
-1315(for)X
-1413(System)X
-1625(Call)X
-1756(Synchronization.)X
-1 f
-2254(The)X
-2370(performance)X
-2708(of)X
-2778(the)X
-2873(kernel)X
-3049(call)X
-3158(synchronization)X
-3583(is)X
-3643(expressed)X
-3911(as)X
-3980(a)X
-4024(percentage)X
-555 5450(of)N
-625(the)X
-720(spinlock)X
-954(synchronization)X
-1379(performance.)X
-1749(In)X
-1819(disk)X
-1943(bound)X
-2120(cases)X
-2271(\(1)X
-2341(Disk)X
-2479(and)X
-2588(2)X
-2637(Disks\),)X
-2837(we)X
-2928(see)X
-3026(that)X
-3139(4-6%)X
-3294(of)X
-3364(the)X
-3459(performance)X
-3797(is)X
-3857(lost)X
-3966(due)X
-4074(to)X
-4140(kernel)X
-555 5540(calls)N
-688(while)X
-846(in)X
-912(the)X
-1006(CPU)X
-1147(bound)X
-1323(case,)X
-1464(we)X
-1554(have)X
-1690(lost)X
-1799(67%)X
-1932(of)X
-2001(the)X
-2095(performance)X
-2432(due)X
-2540(to)X
-2606(kernel)X
-2781(calls.)X
-
-10 p
-%%Page: 10 10
-8 s 8 xH 0 xS 1 f
-10 s
-3 f
-1 f
-555 630(access)N
-781(methods,)X
-1092(we)X
-1206(now)X
-1364(have)X
-1536(an)X
-1632(integrated)X
-1973(open)X
-2149(call)X
-2285(with)X
-2447(the)X
-2565(following)X
-2896(calling)X
-3134(conventions:)X
-7 f
-715 753(DB)N
-859(*dbopen)X
-1243(\(const)X
-1579(char)X
-1819(*file,)X
-2155(int)X
-2347(flags,)X
-2683(int)X
-2875(mode,)X
-3163(DBTYPE)X
-3499(type,)X
-1291 843(int)N
-1483(dbflags,)X
-1915(const)X
-2203(void)X
-2443(*openinfo\))X
-1 f
-555 966(where)N
-2 f
-774(\256le)X
-1 f
-894(is)X
-969(the)X
-1089(name)X
-1285(of)X
-1374(the)X
-1494(\256le)X
-1618(being)X
-1818(opened,)X
-2 f
-2092(\257ags)X
-1 f
-2265(and)X
-2 f
-2402(mode)X
-1 f
-2597(are)X
-2717(the)X
-2836(standard)X
-3129(arguments)X
-3484(to)X
-3 f
-3567(open)X
-1 f
-3731(\(2\),)X
-2 f
-3866(type)X
-1 f
-4021(is)X
-4095(one)X
-4232(of)X
-555 1056(the)N
-680(access)X
-913(method)X
-1180(types,)X
-2 f
-1396(db\257ags)X
-1 f
-1654(indicates)X
-1966(the)X
-2091(mode)X
-2296(of)X
-2390(the)X
-2515(buffer)X
-2739(pool)X
-2907(and)X
-3049(transaction)X
-3427(protection,)X
-3798(and)X
-2 f
-3940(openinfo)X
-1 f
-4246(is)X
-555 1146(the)N
-681(access)X
-915(method)X
-1183(speci\256c)X
-1456(information.)X
-1902(Currently,)X
-2257(the)X
-2383(possible)X
-2673(values)X
-2906(for)X
-2 f
-3028(db\257ags)X
-1 f
-3287(are)X
-3414(DB_SHARED)X
-3912(and)X
-4055(DB_TP)X
-555 1236(indicating)N
-895(that)X
-1035(buffers)X
-1283(should)X
-1516(be)X
-1612(kept)X
-1770(in)X
-1852(a)X
-1908(shared)X
-2138(buffer)X
-2355(pool)X
-2517(and)X
-2653(that)X
-2793(the)X
-2911(\256le)X
-3033(should)X
-3266(be)X
-3362(transaction)X
-3734(protected.)X
-755 1359(The)N
-900(modi\256cations)X
-1355(required)X
-1643(to)X
-1725(add)X
-1861(transaction)X
-2233(protection)X
-2578(to)X
-2660(an)X
-2756(access)X
-2982(method)X
-3242(are)X
-3361(quite)X
-3541(simple)X
-3774(and)X
-3910(localized.)X
-715 1482(1.)N
-795(Replace)X
-1074(\256le)X
-2 f
-1196(open)X
-1 f
-1372(with)X
-2 f
-1534(buf_open)X
-1 f
-1832(.)X
-715 1572(2.)N
-795(Replace)X
-1074(\256le)X
-2 f
-1196(read)X
-1 f
-1363(and)X
-2 f
-1499(write)X
-1 f
-1683(calls)X
-1850(with)X
-2012(buffer)X
-2229(manager)X
-2526(calls)X
-2693(\()X
-2 f
-2720(buf_get)X
-1 f
-(,)S
-2 f
-3000(buf_unpin)X
-1 f
-3324(\).)X
-715 1662(3.)N
-795(Precede)X
-1070(buffer)X
-1287(manager)X
-1584(calls)X
-1751(with)X
-1913(an)X
-2009(appropriate)X
-2395(\(read)X
-2581(or)X
-2668(write\))X
-2880(lock)X
-3038(call.)X
-715 1752(4.)N
-795(Before)X
-1034(updates,)X
-1319(issue)X
-1499(a)X
-1555(logging)X
-1819(operation.)X
-715 1842(5.)N
-795(After)X
-985(data)X
-1139(have)X
-1311(been)X
-1483(accessed,)X
-1805(release)X
-2049(the)X
-2167(buffer)X
-2384(manager)X
-2681(pin.)X
-715 1932(6.)N
-795(Provide)X
-1064(undo/redo)X
-1409(code)X
-1581(for)X
-1695(each)X
-1863(type)X
-2021(of)X
-2108(log)X
-2230(record)X
-2456(de\256ned.)X
-555 2071(The)N
-702(following)X
-1035(code)X
-1209(fragments)X
-1552(show)X
-1743(how)X
-1903(to)X
-1987(transaction)X
-2361(protect)X
-2606(several)X
-2856(updates)X
-3123(to)X
-3206(a)X
-3263(B-tree.)X
-7 s
-3484 2039(3)N
-10 s
-3533 2071(In)N
-3621(the)X
-3740(unprotected)X
-4140(case,)X
-555 2161(an)N
-652(open)X
-829(call)X
-966(is)X
-1040(followed)X
-1346(by)X
-1447(a)X
-1504(read)X
-1664(call)X
-1801(to)X
-1884(obtain)X
-2105(the)X
-2224(meta-data)X
-2562(for)X
-2677(the)X
-2796(B-tree.)X
-3058(Instead,)X
-3331(we)X
-3446(issue)X
-3627(an)X
-3724(open)X
-3901(to)X
-3984(the)X
-4102(buffer)X
-555 2251(manager)N
-852(to)X
-934(obtain)X
-1154(a)X
-1210(\256le)X
-1332(id)X
-1414(and)X
-1550(a)X
-1606(buffer)X
-1823(request)X
-2075(to)X
-2157(obtain)X
-2377(the)X
-2495(meta-data)X
-2832(as)X
-2919(shown)X
-3148(below.)X
-7 f
-715 2374(char)N
-955(*path;)X
-715 2464(int)N
-907(fid,)X
-1147(flags,)X
-1483(len,)X
-1723(mode;)X
-715 2644(/*)N
-859(Obtain)X
-1195(a)X
-1291(file)X
-1531(id)X
-1675(with)X
-1915(which)X
-2203(to)X
-2347(access)X
-2683(the)X
-2875(buffer)X
-3211(pool)X
-3451(*/)X
-715 2734(fid)N
-907(=)X
-1003(buf_open\(path,)X
-1723(flags,)X
-2059(mode\);)X
-715 2914(/*)N
-859(Read)X
-1099(the)X
-1291(meta)X
-1531(data)X
-1771(\(page)X
-2059(0\))X
-2203(for)X
-2395(the)X
-2587(B-tree)X
-2923(*/)X
-715 3004(if)N
-859(\(tp_lock\(fid,)X
-1531(0,)X
-1675(READ_LOCK\)\))X
-1003 3094(return)N
-1339(error;)X
-715 3184(meta_data_ptr)N
-1387(=)X
-1483(buf_get\(fid,)X
-2107(0,)X
-2251(BF_PIN,)X
-2635(&len\);)X
-1 f
-555 3307(The)N
-714(BF_PIN)X
-1014(argument)X
-1350(to)X
-2 f
-1445(buf_get)X
-1 f
-1718(indicates)X
-2036(that)X
-2189(we)X
-2316(wish)X
-2500(to)X
-2595(leave)X
-2798(this)X
-2946(page)X
-3131(pinned)X
-3382(in)X
-3477(memory)X
-3777(so)X
-3881(that)X
-4034(it)X
-4111(is)X
-4197(not)X
-555 3397(swapped)N
-862(out)X
-990(while)X
-1194(we)X
-1314(are)X
-1439(accessing)X
-1772(it.)X
-1881(The)X
-2031(last)X
-2167(argument)X
-2495(to)X
-2 f
-2582(buf_get)X
-1 f
-2847(returns)X
-3095(the)X
-3218(number)X
-3488(of)X
-3580(bytes)X
-3774(on)X
-3879(the)X
-4002(page)X
-4179(that)X
-555 3487(were)N
-732(valid)X
-912(so)X
-1003(that)X
-1143(the)X
-1261(access)X
-1487(method)X
-1747(may)X
-1905(initialize)X
-2205(the)X
-2323(page)X
-2495(if)X
-2564(necessary.)X
-755 3610(Next,)N
-955(consider)X
-1251(inserting)X
-1555(a)X
-1615(record)X
-1845(on)X
-1949(a)X
-2009(particular)X
-2341(page)X
-2517(of)X
-2608(a)X
-2668(B-tree.)X
-2932(In)X
-3022(the)X
-3143(unprotected)X
-3545(case,)X
-3727(we)X
-3844(read)X
-4006(the)X
-4127(page,)X
-555 3700(call)N
-2 f
-693(_bt_insertat)X
-1 f
-1079(,)X
-1121(and)X
-1258(write)X
-1444(the)X
-1563(page.)X
-1776(Instead,)X
-2049(we)X
-2164(lock)X
-2323(the)X
-2442(page,)X
-2635(request)X
-2888(the)X
-3007(buffer,)X
-3245(log)X
-3368(the)X
-3487(change,)X
-3756(modify)X
-4008(the)X
-4127(page,)X
-555 3790(and)N
-691(release)X
-935(the)X
-1053(buffer.)X
-7 f
-715 3913(int)N
-907(fid,)X
-1147(len,)X
-1387(pageno;)X
-1867(/*)X
-2011(Identifies)X
-2539(the)X
-2731(buffer)X
-3067(*/)X
-715 4003(int)N
-907(index;)X
-1867(/*)X
-2011(Location)X
-2443(at)X
-2587(which)X
-2875(to)X
-3019(insert)X
-3355(the)X
-3547(new)X
-3739(pair)X
-3979(*/)X
-715 4093(DBT)N
-907(*keyp,)X
-1243(*datap;)X
-1867(/*)X
-2011(Key/Data)X
-2443(pair)X
-2683(to)X
-2827(be)X
-2971(inserted)X
-3403(*/)X
-715 4183(DATUM)N
-1003(*d;)X
-1867(/*)X
-2011(Key/data)X
-2443(structure)X
-2923(to)X
-3067(insert)X
-3403(*/)X
-715 4363(/*)N
-859(Lock)X
-1099(and)X
-1291(request)X
-1675(the)X
-1867(buffer)X
-2203(*/)X
-715 4453(if)N
-859(\(tp_lock\(fid,)X
-1531(pageno,)X
-1915(WRITE_LOCK\)\))X
-1003 4543(return)N
-1339(error;)X
-715 4633(buffer_ptr)N
-1243(=)X
-1339(buf_get\(fid,)X
-1963(pageno,)X
-2347(BF_PIN,)X
-2731(&len\);)X
-715 4813(/*)N
-859(Log)X
-1051(and)X
-1243(perform)X
-1627(the)X
-1819(update)X
-2155(*/)X
-715 4903(log_insdel\(BTREE_INSERT,)N
-1915(fid,)X
-2155(pageno,)X
-2539(keyp,)X
-2827(datap\);)X
-715 4993(_bt_insertat\(buffer_ptr,)N
-1915(d,)X
-2059(index\);)X
-715 5083(buf_unpin\(buffer_ptr\);)N
-1 f
-555 5206(Succinctly,)N
-942(the)X
-1068(algorithm)X
-1407(for)X
-1529(turning)X
-1788(unprotected)X
-2195(code)X
-2375(into)X
-2527(protected)X
-2854(code)X
-3034(is)X
-3115(to)X
-3205(replace)X
-3466(read)X
-3633(operations)X
-3995(with)X
-2 f
-4165(lock)X
-1 f
-555 5296(and)N
-2 f
-691(buf_get)X
-1 f
-951(operations)X
-1305(and)X
-1441(write)X
-1626(operations)X
-1980(with)X
-2 f
-2142(log)X
-1 f
-2264(and)X
-2 f
-2400(buf_unpin)X
-1 f
-2744(operations.)X
-8 s
-10 f
-555 5458(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)N
-5 s
-1 f
-727 5536(3)N
-8 s
-766 5561(The)N
-884(following)X
-1152(code)X
-1291(fragments)X
-1565(are)X
-1661(examples,)X
-1937(but)X
-2038(do)X
-2120(not)X
-2220(de\256ne)X
-2394(the)X
-2490(\256nal)X
-2622(interface.)X
-2894(The)X
-3011(\256nal)X
-3143(interface)X
-3383(will)X
-3501(be)X
-3579(determined)X
-3884(after)X
-4018(LIBTP)X
-4214(has)X
-555 5633(been)N
-691(fully)X
-828(integrated)X
-1099(with)X
-1229(the)X
-1323(most)X
-1464(recent)X
-3 f
-1635(db)X
-1 f
-1707(\(3\))X
-1797(release)X
-1989(from)X
-2129(the)X
-2223(Computer)X
-2495(Systems)X
-2725(Research)X
-2974(Group)X
-3153(at)X
-3215(University)X
-3501(of)X
-3570(California,)X
-3861(Berkeley.)X
-
-11 p
-%%Page: 11 11
-8 s 8 xH 0 xS 1 f
-10 s
-3 f
-555 630(5.)N
-655(Performance)X
-1 f
-755 753(In)N
-845(this)X
-983(section,)X
-1253(we)X
-1370(present)X
-1625(the)X
-1746(results)X
-1978(of)X
-2067(two)X
-2209(very)X
-2374(different)X
-2673(benchmarks.)X
-3103(The)X
-3250(\256rst)X
-3396(is)X
-3471(an)X
-3569(online)X
-3791(transaction)X
-4165(pro-)X
-555 843(cessing)N
-824(benchmark,)X
-1234(similar)X
-1489(to)X
-1584(the)X
-1715(standard)X
-2020(TPCB,)X
-2272(but)X
-2407(has)X
-2547(been)X
-2732(adapted)X
-3015(to)X
-3110(run)X
-3250(in)X
-3345(a)X
-3414(desktop)X
-3696(environment.)X
-4174(The)X
-555 933(second)N
-798(emulates)X
-1103(a)X
-1159(computer-aided)X
-1683(design)X
-1912(environment)X
-2337(and)X
-2473(provides)X
-2769(more)X
-2954(complex)X
-3250(query)X
-3453(processing.)X
-3 f
-555 1119(5.1.)N
-715(Transaction)X
-1148(Processing)X
-1533(Benchmark)X
-1 f
-755 1242(For)N
-887(this)X
-1023(section,)X
-1291(all)X
-1392(performance)X
-1820(numbers)X
-2117(shown)X
-2346(except)X
-2576(for)X
-2690(the)X
-2808(commercial)X
-3207(database)X
-3504(system)X
-3746(were)X
-3923(obtained)X
-4219(on)X
-555 1332(a)N
-614(DECstation)X
-1009(5000/200)X
-1333(with)X
-1497(32MBytes)X
-1852(of)X
-1941(memory)X
-2230(running)X
-2501(Ultrix)X
-2714(V4.0,)X
-2914(accessing)X
-3244(a)X
-3302(DEC)X
-3484(RZ57)X
-3688(1GByte)X
-3959(disk)X
-4114(drive.)X
-555 1422(The)N
-720(commercial)X
-1139(relational)X
-1482(database)X
-1799(system)X
-2061(tests)X
-2242(were)X
-2438(run)X
-2584(on)X
-2703(a)X
-2778(comparable)X
-3192(machine,)X
-3523(a)X
-3598(Sparcstation)X
-4033(1+)X
-4157(with)X
-555 1512(32MBytes)N
-915(memory)X
-1209(and)X
-1352(a)X
-1415(1GByte)X
-1691(external)X
-1976(disk)X
-2135(drive.)X
-2366(The)X
-2517(database,)X
-2840(binaries)X
-3120(and)X
-3262(log)X
-3390(resided)X
-3648(on)X
-3754(the)X
-3878(same)X
-4069(device.)X
-555 1602(Reported)N
-869(times)X
-1062(are)X
-1181(the)X
-1299(means)X
-1524(of)X
-1611(\256ve)X
-1751(tests)X
-1913(and)X
-2049(have)X
-2221(standard)X
-2513(deviations)X
-2862(within)X
-3086(two)X
-3226(percent)X
-3483(of)X
-3570(the)X
-3688(mean.)X
-755 1725(The)N
-905(test)X
-1041(database)X
-1343(was)X
-1493(con\256gured)X
-1861(according)X
-2203(to)X
-2290(the)X
-2413(TPCB)X
-2637(scaling)X
-2889(rules)X
-3070(for)X
-3189(a)X
-3250(10)X
-3355(transaction)X
-3732(per)X
-3860(second)X
-4108(\(TPS\))X
-555 1815(system)N
-817(with)X
-999(1,000,000)X
-1359(account)X
-1649(records,)X
-1946(100)X
-2106(teller)X
-2311(records,)X
-2607(and)X
-2762(10)X
-2881(branch)X
-3139(records.)X
-3455(Where)X
-3709(TPS)X
-3885(numbers)X
-4200(are)X
-555 1905(reported,)N
-865(we)X
-981(are)X
-1102(running)X
-1373(a)X
-1431(modi\256ed)X
-1737(version)X
-1995(of)X
-2084(the)X
-2203(industry)X
-2486(standard)X
-2779(transaction)X
-3152(processing)X
-3516(benchmark,)X
-3914(TPCB.)X
-4174(The)X
-555 1995(TPCB)N
-780(benchmark)X
-1163(simulates)X
-1491(a)X
-1553(withdrawal)X
-1940(performed)X
-2301(by)X
-2407(a)X
-2469(hypothetical)X
-2891(teller)X
-3082(at)X
-3166(a)X
-3228(hypothetical)X
-3650(bank.)X
-3872(The)X
-4022(database)X
-555 2085(consists)N
-831(of)X
-921(relations)X
-1220(\(\256les\))X
-1430(for)X
-1547(accounts,)X
-1871(branches,)X
-2200(tellers,)X
-2439(and)X
-2578(history.)X
-2863(For)X
-2997(each)X
-3168(transaction,)X
-3563(the)X
-3684(account,)X
-3976(teller,)X
-4183(and)X
-555 2175(branch)N
-795(balances)X
-1093(must)X
-1269(be)X
-1366(updated)X
-1641(to)X
-1724(re\257ect)X
-1946(the)X
-2065(withdrawal)X
-2447(and)X
-2584(a)X
-2640(history)X
-2882(record)X
-3108(is)X
-3181(written)X
-3428(which)X
-3644(contains)X
-3931(the)X
-4049(account)X
-555 2265(id,)N
-657(branch)X
-896(id,)X
-998(teller)X
-1183(id,)X
-1285(and)X
-1421(the)X
-1539(amount)X
-1799(of)X
-1886(the)X
-2004(withdrawal)X
-2385([TPCB90].)X
-755 2388(Our)N
-914(implementation)X
-1450(of)X
-1551(the)X
-1683(benchmark)X
-2074(differs)X
-2317(from)X
-2506(the)X
-2637(speci\256cation)X
-3075(in)X
-3170(several)X
-3431(aspects.)X
-3736(The)X
-3894(speci\256cation)X
-555 2478(requires)N
-840(that)X
-985(the)X
-1108(database)X
-1410(keep)X
-1587(redundant)X
-1933(logs)X
-2091(on)X
-2196(different)X
-2498(devices,)X
-2784(but)X
-2911(we)X
-3030(use)X
-3162(a)X
-3223(single)X
-3439(log.)X
-3606(Furthermore,)X
-4052(all)X
-4157(tests)X
-555 2568(were)N
-734(run)X
-863(on)X
-965(a)X
-1023(single,)X
-1256(centralized)X
-1631(system)X
-1875(so)X
-1968(there)X
-2151(is)X
-2226(no)X
-2328(notion)X
-2553(of)X
-2641(remote)X
-2885(accesses.)X
-3219(Finally,)X
-3486(we)X
-3601(calculated)X
-3948(throughput)X
-555 2658(by)N
-662(dividing)X
-955(the)X
-1080(total)X
-1249(elapsed)X
-1517(time)X
-1686(by)X
-1793(the)X
-1918(number)X
-2190(of)X
-2284(transactions)X
-2694(processed)X
-3038(rather)X
-3253(than)X
-3418(by)X
-3525(computing)X
-3894(the)X
-4018(response)X
-555 2748(time)N
-717(for)X
-831(each)X
-999(transaction.)X
-755 2871(The)N
-912(performance)X
-1351(comparisons)X
-1788(focus)X
-1993(on)X
-2104(traditional)X
-2464(Unix)X
-2655(techniques)X
-3029(\(unprotected,)X
-3486(using)X
-3 f
-3690(\257ock)X
-1 f
-3854(\(2\))X
-3979(and)X
-4126(using)X
-3 f
-555 2961(fsync)N
-1 f
-733(\(2\)\))X
-884(and)X
-1030(a)X
-1096(commercial)X
-1504(relational)X
-1836(database)X
-2142(system.)X
-2433(Well-behaved)X
-2913(applications)X
-3329(using)X
-3 f
-3531(\257ock)X
-1 f
-3695(\(2\))X
-3818(are)X
-3946(guaranteed)X
-555 3051(that)N
-704(concurrent)X
-1077(processes')X
-1441(updates)X
-1715(do)X
-1824(not)X
-1955(interact)X
-2225(with)X
-2396(one)X
-2541(another,)X
-2831(but)X
-2962(no)X
-3070(guarantees)X
-3442(about)X
-3648(atomicity)X
-3978(are)X
-4105(made.)X
-555 3141(That)N
-731(is,)X
-833(if)X
-911(the)X
-1038(system)X
-1289(crashes)X
-1555(in)X
-1646(mid-transaction,)X
-2198(only)X
-2369(parts)X
-2554(of)X
-2649(that)X
-2797(transaction)X
-3177(will)X
-3329(be)X
-3433(re\257ected)X
-3738(in)X
-3828(the)X
-3954 0.3125(after-crash)AX
-555 3231(state)N
-725(of)X
-815(the)X
-936(database.)X
-1276(The)X
-1424(use)X
-1554(of)X
-3 f
-1643(fsync)X
-1 f
-1821(\(2\))X
-1937(at)X
-2017(transaction)X
-2391(commit)X
-2657(time)X
-2821(provides)X
-3119(guarantees)X
-3485(of)X
-3574(durability)X
-3907(after)X
-4077(system)X
-555 3321(failure.)N
-825(However,)X
-1160(there)X
-1341(is)X
-1414(no)X
-1514(mechanism)X
-1899(to)X
-1981(perform)X
-2260(transaction)X
-2632(abort.)X
-3 f
-555 3507(5.1.1.)N
-775(Single-User)X
-1191(Tests)X
-1 f
-755 3630(These)N
-978(tests)X
-1151(compare)X
-1459(LIBTP)X
-1712(in)X
-1804(a)X
-1870(variety)X
-2123(of)X
-2220(con\256gurations)X
-2708(to)X
-2800(traditional)X
-3159(UNIX)X
-3390(solutions)X
-3708(and)X
-3854(a)X
-3920(commercial)X
-555 3720(relational)N
-884(database)X
-1187(system)X
-1435(\(RDBMS\).)X
-1814(To)X
-1929(demonstrate)X
-2347(the)X
-2471(server)X
-2694(architecture)X
-3100(we)X
-3220(built)X
-3392(a)X
-3454(front)X
-3636(end)X
-3777(test)X
-3913(process)X
-4179(that)X
-555 3810(uses)N
-732(TCL)X
-922([OUST90])X
-1304(to)X
-1405(parse)X
-1614(database)X
-1930(access)X
-2175(commands)X
-2561(and)X
-2716(call)X
-2870(the)X
-3006(database)X
-3321(access)X
-3565(routines.)X
-3901(In)X
-4006(one)X
-4160(case)X
-555 3900(\(SERVER\),)N
-956(frontend)X
-1249(and)X
-1386(backend)X
-1675(processes)X
-2004(were)X
-2181(created)X
-2434(which)X
-2650(communicated)X
-3142(via)X
-3260(an)X
-3356(IP)X
-3447(socket.)X
-3712(In)X
-3799(the)X
-3917(second)X
-4160(case)X
-555 3990(\(TCL\),)N
-802(a)X
-860(single)X
-1073(process)X
-1336(read)X
-1497(queries)X
-1751(from)X
-1929(standard)X
-2223(input,)X
-2429(parsed)X
-2660(them,)X
-2861(and)X
-2998(called)X
-3211(the)X
-3330(database)X
-3628(access)X
-3855(routines.)X
-4174(The)X
-555 4080(performance)N
-987(difference)X
-1338(between)X
-1630(the)X
-1752(TCL)X
-1927(and)X
-2067(SERVER)X
-2397(tests)X
-2563(quanti\256es)X
-2898(the)X
-3020(communication)X
-3542(overhead)X
-3861(of)X
-3952(the)X
-4074(socket.)X
-555 4170(The)N
-732(RDBMS)X
-1063(implementation)X
-1617(used)X
-1816(embedded)X
-2198(SQL)X
-2401(in)X
-2515(C)X
-2620(with)X
-2814(stored)X
-3062(database)X
-3391(procedures.)X
-3835(Therefore,)X
-4224(its)X
-555 4260(con\256guration)N
-1003(is)X
-1076(a)X
-1132(hybrid)X
-1361(of)X
-1448(the)X
-1566(single)X
-1777(process)X
-2038(architecture)X
-2438(and)X
-2574(the)X
-2692(server)X
-2909(architecture.)X
-3349(The)X
-3494(graph)X
-3697(in)X
-3779(\256gure)X
-3986(six)X
-4099(shows)X
-555 4350(a)N
-611(comparison)X
-1005(of)X
-1092(the)X
-1210(following)X
-1541(six)X
-1654(con\256gurations:)X
-1126 4506(LIBTP)N
-1552(Uses)X
-1728(the)X
-1846(LIBTP)X
-2088(library)X
-2322(in)X
-2404(a)X
-2460(single)X
-2671(application.)X
-1126 4596(TCL)N
-1552(Uses)X
-1728(the)X
-1846(LIBTP)X
-2088(library)X
-2322(in)X
-2404(a)X
-2460(single)X
-2671(application,)X
-3067(requires)X
-3346(query)X
-3549(parsing.)X
-1126 4686(SERVER)N
-1552(Uses)X
-1728(the)X
-1846(LIBTP)X
-2088(library)X
-2322(in)X
-2404(a)X
-2460(server)X
-2677(con\256guration,)X
-3144(requires)X
-3423(query)X
-3626(parsing.)X
-1126 4776(NOTP)N
-1552(Uses)X
-1728(no)X
-1828(locking,)X
-2108(logging,)X
-2392(or)X
-2479(concurrency)X
-2897(control.)X
-1126 4866(FLOCK)N
-1552(Uses)X
-3 f
-1728(\257ock)X
-1 f
-1892(\(2\))X
-2006(for)X
-2120(concurrency)X
-2538(control)X
-2785(and)X
-2921(nothing)X
-3185(for)X
-3299(durability.)X
-1126 4956(FSYNC)N
-1552(Uses)X
-3 f
-1728(fsync)X
-1 f
-1906(\(2\))X
-2020(for)X
-2134(durability)X
-2465(and)X
-2601(nothing)X
-2865(for)X
-2979(concurrency)X
-3397(control.)X
-1126 5046(RDBMS)N
-1552(Uses)X
-1728(a)X
-1784(commercial)X
-2183(relational)X
-2506(database)X
-2803(system.)X
-755 5235(The)N
-902(results)X
-1133(show)X
-1324(that)X
-1466(LIBTP,)X
-1730(both)X
-1894(in)X
-1978(the)X
-2098(procedural)X
-2464(and)X
-2602(parsed)X
-2834(environments,)X
-3312(is)X
-3387(competitive)X
-3787(with)X
-3951(a)X
-4009(commer-)X
-555 5325(cial)N
-692(system)X
-935(\(comparing)X
-1326(LIBTP,)X
-1589(TCL,)X
-1781(and)X
-1917(RDBMS\).)X
-2263(Compared)X
-2617(to)X
-2699(existing)X
-2972(UNIX)X
-3193(solutions,)X
-3521(LIBTP)X
-3763(is)X
-3836(approximately)X
-555 5415(15%)N
-738(slower)X
-988(than)X
-1162(using)X
-3 f
-1371(\257ock)X
-1 f
-1535(\(2\))X
-1665(or)X
-1768(no)X
-1884(protection)X
-2245(but)X
-2383(over)X
-2562(80%)X
-2745(better)X
-2964(than)X
-3137(using)X
-3 f
-3345(fsync)X
-1 f
-3523(\(2\))X
-3652(\(comparing)X
-4057(LIBTP,)X
-555 5505(FLOCK,)N
-857(NOTP,)X
-1106(and)X
-1242(FSYNC\).)X
-
-12 p
-%%Page: 12 12
-10 s 10 xH 0 xS 1 f
-3 f
-8 s
-3500 2184(RDBMS)N
-1 Dt
-3553 2085 MXY
- 3553 2085 lineto
- 3676 2085 lineto
- 3676 1351 lineto
- 3553 1351 lineto
- 3553 2085 lineto
-closepath 16 3553 1351 3676 2085 Dp
-2018 2184(SERVER)N
-1720 1168 MXY
-0 917 Dl
-122 0 Dl
-0 -917 Dl
--122 0 Dl
-1715 2184(TCL)N
-2087 1534 MXY
- 2087 1534 lineto
- 2209 1534 lineto
- 2209 2085 lineto
- 2087 2085 lineto
- 2087 1534 lineto
-closepath 12 2087 1534 2209 2085 Dp
-3187 MX
- 3187 1534 lineto
- 3309 1534 lineto
- 3309 2085 lineto
- 3187 2085 lineto
- 3187 1534 lineto
-closepath 19 3187 1534 3309 2085 Dp
-3142 2184(FSYNC)N
-2425(NOTP)X
-2453 955 MXY
- 2453 955 lineto
- 2576 955 lineto
- 2576 2085 lineto
- 2453 2085 lineto
- 2453 955 lineto
-closepath 21 2453 955 2576 2085 Dp
-2820 1000 MXY
- 2820 1000 lineto
- 2942 1000 lineto
- 2942 2085 lineto
- 2820 2085 lineto
- 2820 1000 lineto
-closepath 14 2820 1000 2942 2085 Dp
-5 Dt
-1231 2085 MXY
-2567 0 Dl
-4 Ds
-1 Dt
-1231 1840 MXY
-2567 0 Dl
-1231 1596 MXY
-2567 0 Dl
-1231 1351 MXY
-2567 0 Dl
-1231 1108 MXY
-2567 0 Dl
-1231 863 MXY
-2567 0 Dl
-11 s
-1087 1877(2)N
-1087 1633(4)N
-1087 1388(6)N
-1087 1145(8)N
-1065 900(10)N
-1028 763(TPS)N
--1 Ds
-1353 2085 MXY
- 1353 2085 lineto
- 1353 1151 lineto
- 1476 1151 lineto
- 1476 2085 lineto
- 1353 2085 lineto
-closepath 3 1353 1151 1476 2085 Dp
-8 s
-1318 2184(LIBTP)N
-2767(FLOCK)X
-3 Dt
--1 Ds
-10 s
-1597 2399(Figure)N
-1844(6:)X
-1931(Single-User)X
-2347(Performance)X
-2814(Comparison.)X
-1 f
-10 f
-555 2579(h)N
-579(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)X
-3 f
-555 2855(5.1.2.)N
-775(Multi-User)X
-1174(Tests)X
-1 f
-755 2978(While)N
-975(the)X
-1097(single-user)X
-1473(tests)X
-1639(form)X
-1819(a)X
-1878(basis)X
-2061(for)X
-2178(comparing)X
-2544(LIBTP)X
-2789(to)X
-2874(other)X
-3062(systems,)X
-3358(our)X
-3488(goal)X
-3649(in)X
-3734(multi-user)X
-4086(testing)X
-555 3068(was)N
-714(to)X
-810(analyze)X
-1089(its)X
-1197(scalability.)X
-1579(To)X
-1701(this)X
-1849(end,)X
-2018(we)X
-2145(have)X
-2330(run)X
-2470(the)X
-2601(benchmark)X
-2991(in)X
-3086(three)X
-3280(modes,)X
-3542(the)X
-3673(normal)X
-3933(disk)X
-4099(bound)X
-555 3158(con\256guration)N
-1010(\(\256gure)X
-1252(seven\),)X
-1510(a)X
-1573(CPU)X
-1755(bound)X
-1982(con\256guration)X
-2436(\(\256gure)X
-2677(eight,)X
-2884(READ-ONLY\),)X
-3426(and)X
-3569(lock)X
-3734(contention)X
-4099(bound)X
-555 3248(\(\256gure)N
-796(eight,)X
-1003(NO_FSYNC\).)X
-1510(Since)X
-1715(the)X
-1840(normal)X
-2094(con\256guration)X
-2548(is)X
-2628(completely)X
-3011(disk)X
-3171(bound)X
-3398(\(each)X
-3600(transaction)X
-3978(requires)X
-4263(a)X
-555 3354(random)N
-823(read,)X
-1005(a)X
-1064(random)X
-1332(write,)X
-1540(and)X
-1679(a)X
-1738(sequential)X
-2086(write)X
-7 s
-2251 3322(4)N
-10 s
-3354(\))Y
-2329(we)X
-2446(expect)X
-2679(to)X
-2764(see)X
-2890(little)X
-3059(performance)X
-3489(improvement)X
-3939(as)X
-4028(the)X
-4148(mul-)X
-555 3444(tiprogramming)N
-1064(level)X
-1249(increases.)X
-1613(In)X
-1709(fact,)X
-1879(\256gure)X
-2095(seven)X
-2307(reveals)X
-2564(that)X
-2713(we)X
-2836(are)X
-2964(able)X
-3127(to)X
-3218(overlap)X
-3487(CPU)X
-3670(and)X
-3814(disk)X
-3975(utilization)X
-555 3534(slightly)N
-825(producing)X
-1181(approximately)X
-1674(a)X
-1740(10%)X
-1917(performance)X
-2354(improvement)X
-2811(with)X
-2983(two)X
-3133(processes.)X
-3511(After)X
-3711(that)X
-3861(point,)X
-4075(perfor-)X
-555 3624(mance)N
-785(drops)X
-983(off,)X
-1117(and)X
-1253(at)X
-1331(a)X
-1387(multi-programming)X
-2038(level)X
-2214(of)X
-2301(4,)X
-2381(we)X
-2495(are)X
-2614(performing)X
-2995(worse)X
-3207(than)X
-3365(in)X
-3447(the)X
-3565(single)X
-3776(process)X
-4037(case.)X
-755 3747(Similar)N
-1021(behavior)X
-1333(was)X
-1489(reported)X
-1787(on)X
-1897(the)X
-2025(commercial)X
-2434(relational)X
-2767(database)X
-3074(system)X
-3326(using)X
-3529(the)X
-3657(same)X
-3852(con\256guration.)X
-555 3837(The)N
-707(important)X
-1045(conclusion)X
-1419(to)X
-1508(draw)X
-1696(from)X
-1879(this)X
-2021(is)X
-2101(that)X
-2248(you)X
-2395(cannot)X
-2636(attain)X
-2841(good)X
-3028(multi-user)X
-3384(scaling)X
-3638(on)X
-3745(a)X
-3808(badly)X
-4013(balanced)X
-555 3927(system.)N
-839(If)X
-915(multi-user)X
-1266(performance)X
-1695(on)X
-1797(applications)X
-2205(of)X
-2293(this)X
-2429(sort)X
-2570(is)X
-2644(important,)X
-2996(one)X
-3133(must)X
-3309(have)X
-3482(a)X
-3539(separate)X
-3824(logging)X
-4089(device)X
-555 4017(and)N
-697(horizontally)X
-1110(partition)X
-1407(the)X
-1531(database)X
-1834(to)X
-1921(allow)X
-2124(a)X
-2185(suf\256ciently)X
-2570(high)X
-2737(degree)X
-2977(of)X
-3069(multiprogramming)X
-3698(that)X
-3843(group)X
-4055(commit)X
-555 4107(can)N
-687(amortize)X
-988(the)X
-1106(cost)X
-1255(of)X
-1342(log)X
-1464(\257ushing.)X
-755 4230(By)N
-871(using)X
-1067(a)X
-1126(very)X
-1292(small)X
-1488(database)X
-1788(\(one)X
-1954(that)X
-2097(can)X
-2232(be)X
-2331(entirely)X
-2599(cached)X
-2846(in)X
-2930(main)X
-3112(memory\))X
-3428(and)X
-3566(read-only)X
-3896(transactions,)X
-555 4320(we)N
-670(generated)X
-1004(a)X
-1061(CPU)X
-1236(bound)X
-1456(environment.)X
-1921(By)X
-2034(using)X
-2227(the)X
-2345(same)X
-2530(small)X
-2723(database,)X
-3040(the)X
-3158(complete)X
-3472(TPCB)X
-3691(transaction,)X
-4083(and)X
-4219(no)X
-3 f
-555 4410(fsync)N
-1 f
-733(\(2\))X
-862(on)X
-977(the)X
-1110(log)X
-1247(at)X
-1340(commit,)X
-1639(we)X
-1768(created)X
-2036(a)X
-2107(lock)X
-2280(contention)X
-2652(bound)X
-2886(environment.)X
-3365(The)X
-3524(small)X
-3731(database)X
-4042(used)X
-4223(an)X
-555 4500(account)N
-828(\256le)X
-953(containing)X
-1314(only)X
-1479(1000)X
-1662(records)X
-1922(rather)X
-2133(than)X
-2294(the)X
-2415(full)X
-2549(1,000,000)X
-2891(records)X
-3150(and)X
-3288(ran)X
-3413(enough)X
-3671(transactions)X
-4076(to)X
-4160(read)X
-555 4590(the)N
-677(entire)X
-883(database)X
-1183(into)X
-1330(the)X
-1451(buffer)X
-1671(pool)X
-1836(\(2000\))X
-2073(before)X
-2302(beginning)X
-2645(measurements.)X
-3147(The)X
-3295(read-only)X
-3626(transaction)X
-4001(consisted)X
-555 4680(of)N
-646(three)X
-831(database)X
-1132(reads)X
-1326(\(from)X
-1533(the)X
-1655(1000)X
-1839(record)X
-2069(account)X
-2343(\256le,)X
-2489(the)X
-2611(100)X
-2754(record)X
-2983(teller)X
-3171(\256le,)X
-3316(and)X
-3455(the)X
-3576(10)X
-3679(record)X
-3908(branch)X
-4150(\256le\).)X
-555 4770(Since)N
-759(no)X
-865(data)X
-1025(were)X
-1208(modi\256ed)X
-1518(and)X
-1660(no)X
-1766(history)X
-2014(records)X
-2277(were)X
-2460(written,)X
-2733(no)X
-2839(log)X
-2966(records)X
-3228(were)X
-3410(written.)X
-3702(For)X
-3838(the)X
-3961(contention)X
-555 4860(bound)N
-780(con\256guration,)X
-1252(we)X
-1371(used)X
-1543(the)X
-1666(normal)X
-1918(TPCB)X
-2142(transaction)X
-2519(\(against)X
-2798(the)X
-2920(small)X
-3117(database\))X
-3445(and)X
-3585(disabled)X
-3876(the)X
-3998(log)X
-4124(\257ush.)X
-555 4950(Figure)N
-784(eight)X
-964(shows)X
-1184(both)X
-1346(of)X
-1433(these)X
-1618(results.)X
-755 5073(The)N
-902(read-only)X
-1231(test)X
-1363(indicates)X
-1669(that)X
-1810(we)X
-1925(barely)X
-2147(scale)X
-2329(at)X
-2408(all)X
-2509(in)X
-2592(the)X
-2711(CPU)X
-2887(bound)X
-3108(case.)X
-3308(The)X
-3454(explanation)X
-3849(for)X
-3964(that)X
-4105(is)X
-4179(that)X
-555 5163(even)N
-735(with)X
-905(a)X
-969(single)X
-1188(process,)X
-1477(we)X
-1599(are)X
-1726(able)X
-1888(to)X
-1978(drive)X
-2171(the)X
-2297(CPU)X
-2480(utilization)X
-2832(to)X
-2922(96%.)X
-3137(As)X
-3254(a)X
-3317(result,)X
-3542(that)X
-3689(gives)X
-3885(us)X
-3983(very)X
-4153(little)X
-555 5253(room)N
-753(for)X
-876(improvement,)X
-1352(and)X
-1497(it)X
-1570(takes)X
-1764(a)X
-1829(multiprogramming)X
-2462(level)X
-2647(of)X
-2743(four)X
-2906(to)X
-2997(approach)X
-3321(100%)X
-3537(CPU)X
-3721(saturation.)X
-4106(In)X
-4201(the)X
-555 5343(case)N
-718(where)X
-939(we)X
-1057(do)X
-1161(perform)X
-1444(writes,)X
-1684(we)X
-1802(are)X
-1925(interested)X
-2261(in)X
-2347(detecting)X
-2665(when)X
-2863(lock)X
-3025(contention)X
-3387(becomes)X
-3691(a)X
-3750(dominant)X
-4075(perfor-)X
-555 5433(mance)N
-787(factor.)X
-1037(Contention)X
-1414(will)X
-1560(cause)X
-1761(two)X
-1903(phenomena;)X
-2317(we)X
-2433(will)X
-2579(see)X
-2704(transactions)X
-3109(queueing)X
-3425(behind)X
-3665(frequently)X
-4017(accessed)X
-555 5523(data,)N
-731(and)X
-869(we)X
-985(will)X
-1131(see)X
-1256(transaction)X
-1629(abort)X
-1815(rates)X
-1988(increasing)X
-2339(due)X
-2476(to)X
-2559(deadlock.)X
-2910(Given)X
-3127(that)X
-3268(the)X
-3387(branch)X
-3627(\256le)X
-3750(contains)X
-4038(only)X
-4201(ten)X
-8 s
-10 f
-555 5595(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)N
-5 s
-1 f
-727 5673(4)N
-8 s
-763 5698(Although)N
-1021(the)X
-1115(log)X
-1213(is)X
-1272(written)X
-1469(sequentially,)X
-1810(we)X
-1900(do)X
-1980(not)X
-2078(get)X
-2172(the)X
-2266(bene\256t)X
-2456(of)X
-2525(sequentiality)X
-2868(since)X
-3015(the)X
-3109(log)X
-3207(and)X
-3315(database)X
-3550(reside)X
-3718(on)X
-3798(the)X
-3892(same)X
-4039(disk.)X
-
-13 p
-%%Page: 13 13
-8 s 8 xH 0 xS 1 f
-10 s
-3 f
-1 f
-3187 2051 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3286 2028 MXY
-0 17 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3384 1926 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3483 1910 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3581 1910 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3680 1832 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3778 1909 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3877 1883 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3975 1679 MXY
-0 17 Dl
-0 -8 Dl
-9 0 Dl
--18 0 Dl
-4074 1487 MXY
-0 17 Dl
-0 -8 Dl
-9 0 Dl
--18 0 Dl
-5 Dt
-3187 2060 MXY
-99 -24 Dl
-98 -101 Dl
-99 -16 Dl
-98 0 Dl
-99 -78 Dl
-98 77 Dl
-99 -26 Dl
-98 -204 Dl
-99 -192 Dl
-3 f
-6 s
-4088 1516(SMALL)N
-3 Dt
-3187 2051 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3286 2051 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3384 2041 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3483 1990 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3581 1843 MXY
-0 17 Dl
-0 -8 Dl
-9 0 Dl
--18 0 Dl
-3680 1578 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3778 1496 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3877 1430 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-3975 1269 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-4074 1070 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-1 Dt
-3187 2060 MXY
-99 0 Dl
-98 -10 Dl
-99 -51 Dl
-98 -147 Dl
-99 -265 Dl
-98 -82 Dl
-99 -66 Dl
-98 -161 Dl
-99 -199 Dl
-4088 1099(LARGE)N
-5 Dt
-3089 2060 MXY
-985 0 Dl
-3089 MX
-0 -1174 Dl
-4 Ds
-1 Dt
-3581 2060 MXY
-0 -1174 Dl
-4074 2060 MXY
-0 -1174 Dl
-3089 1825 MXY
-985 0 Dl
-9 s
-2993 1855(25)N
-3089 1591 MXY
-985 0 Dl
-2993 1621(50)N
-3089 1356 MXY
-985 0 Dl
-2993 1386(75)N
-3089 1121 MXY
-985 0 Dl
-2957 1151(100)N
-3089 886 MXY
-985 0 Dl
-2957 916(125)N
-3281 2199(Multiprogramming)N
-3071 2152(0)N
-3569(5)X
-4038(10)X
-2859 787(Aborts)N
-3089(per)X
-3211(500)X
-2901 847(transactions)N
--1 Ds
-3 Dt
-2037 1342 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2125 1358 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2213 1341 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2301 1191 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2388 1124 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--17 0 Dl
-2476 1157 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2564 1157 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2652 1161 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2740 1153 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2828 1150 MXY
-0 18 Dl
-0 -9 Dl
-8 0 Dl
--17 0 Dl
-5 Dt
-2037 1351 MXY
-88 16 Dl
-88 -17 Dl
-88 -150 Dl
-87 -67 Dl
-88 33 Dl
-88 0 Dl
-88 4 Dl
-88 -8 Dl
-88 -3 Dl
-6 s
-2685 1234(READ-ONLY)N
-3 Dt
-2037 1464 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2125 1640 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2213 1854 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2301 1872 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2388 1871 MXY
-0 17 Dl
-0 -9 Dl
-9 0 Dl
--17 0 Dl
-2476 1933 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2564 1914 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2652 1903 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2740 1980 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-2828 2004 MXY
-0 18 Dl
-0 -9 Dl
-8 0 Dl
--17 0 Dl
-1 Dt
-2037 1473 MXY
-88 176 Dl
-88 214 Dl
-88 18 Dl
-87 -2 Dl
-88 63 Dl
-88 -19 Dl
-88 -11 Dl
-88 77 Dl
-88 24 Dl
-2759 1997(NO-FSYNC)N
-5 Dt
-1949 2060 MXY
-879 0 Dl
-1949 MX
-0 -1174 Dl
-4 Ds
-1 Dt
-2388 2060 MXY
-0 -1174 Dl
-2828 2060 MXY
-0 -1174 Dl
-1949 1825 MXY
-879 0 Dl
-9 s
-1842 1855(40)N
-1949 1591 MXY
-879 0 Dl
-1842 1621(80)N
-1949 1356 MXY
-879 0 Dl
-1806 1386(120)N
-1949 1121 MXY
-879 0 Dl
-1806 1151(160)N
-1949 886 MXY
-879 0 Dl
-1806 916(200)N
-2088 2199(Multiprogramming)N
-1844 863(in)N
-1922(TPS)X
-1761 792(Throughput)N
-1931 2121(0)N
-2370 2133(5)N
-2792(10)X
-6 s
-1679 1833(LIBTP)N
--1 Ds
-3 Dt
-837 1019 MXY
-0 17 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-929 878 MXY
-0 17 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-1021 939 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-1113 1043 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-1205 1314 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-1297 1567 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-1389 1665 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-1481 1699 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-1573 1828 MXY
-0 18 Dl
-0 -9 Dl
-9 0 Dl
--18 0 Dl
-1665 1804 MXY
-0 18 Dl
-0 -9 Dl
-8 0 Dl
--17 0 Dl
-5 Dt
-837 1027 MXY
-92 -141 Dl
-92 62 Dl
-92 104 Dl
-92 271 Dl
-92 253 Dl
-92 98 Dl
-92 34 Dl
-92 129 Dl
-92 -24 Dl
-745 2060 MXY
-920 0 Dl
-745 MX
-0 -1174 Dl
-4 Ds
-1 Dt
-1205 2060 MXY
-0 -1174 Dl
-1665 2060 MXY
-0 -1174 Dl
-745 1766 MXY
-920 0 Dl
-9 s
-673 1796(3)N
-745 1473 MXY
-920 0 Dl
-673 1503(5)N
-745 1180 MXY
-920 0 Dl
-673 1210(8)N
-745 886 MXY
-920 0 Dl
-637 916(10)N
-905 2199(Multiprogramming)N
-622 851(in)N
-700(TPS)X
-575 792(Throughput)N
-733 2152(0)N
-1196(5)X
-1629(10)X
-3 Dt
--1 Ds
-8 s
-655 2441(Figure)N
-872(7:)X
-960(Multi-user)X
-1286(Performance.)X
-1 f
-655 2531(Since)N
-825(the)X
-931(con\256guration)X
-1300(is)X
-1371(completely)X
-655 2621(disk)N
-790(bound,)X
-994(we)X
-1096(see)X
-1204(only)X
-1345(a)X
-1400(small)X
-1566(im-)X
-655 2711(provement)N
-964(by)X
-1064(adding)X
-1274(a)X
-1337(second)X
-1549(pro-)X
-655 2801(cess.)N
-849(Adding)X
-1081(any)X
-1213(more)X
-1383(concurrent)X
-655 2891(processes)N
-935(causes)X
-1137(performance)X
-1493(degra-)X
-655 2981(dation.)N
-3 f
-1927 2441(Figure)N
-2149(8:)X
-2243(Multi-user)X
-2574(Performance)X
-1927 2531(on)N
-2021(a)X
-2079(small)X
-2251(database.)X
-1 f
-2551(With)X
-2704(one)X
-2821(pro-)X
-1927 2621(cess,)N
-2075(we)X
-2174(are)X
-2276(driving)X
-2486(the)X
-2589(CPU)X
-2739(at)X
-2810(96%)X
-1927 2711(utilization)N
-2215(leaving)X
-2430(little)X
-2575(room)X
-2737(for)X
-2838(im-)X
-1927 2801(provement)N
-2238(as)X
-2328(the)X
-2443(multiprogramming)X
-1927 2891(level)N
-2091(increases.)X
-2396(In)X
-2489(the)X
-2607(NO-FSYNC)X
-1927 2981(case,)N
-2076(lock)X
-2209(contention)X
-2502(degrades)X
-2751(perfor-)X
-1927 3071(mance)N
-2117(as)X
-2194(soon)X
-2339(as)X
-2416(a)X
-2468(second)X
-2669(process)X
-2884(is)X
-1927 3161(added.)N
-3 f
-3199 2441(Figure)N
-3405(9:)X
-3482(Abort)X
-3669(rates)X
-3827(on)X
-3919(the)X
-4028(TPCB)X
-3199 2531(Benchmark.)N
-1 f
-3589(The)X
-3726(abort)X
-3895(rate)X
-4028(climbs)X
-3199 2621(more)N
-3366(quickly)X
-3594(for)X
-3704(the)X
-3818(large)X
-3980(database)X
-3199 2711(test)N
-3324(since)X
-3491(processes)X
-3771(are)X
-3884(descheduled)X
-3199 2801(more)N
-3409(frequently,)X
-3766(allowing)X
-4068(more)X
-3199 2891(processes)N
-3459(to)X
-3525(vie)X
-3619(for)X
-3709(the)X
-3803(same)X
-3950(locks.)X
-10 s
-10 f
-555 3284(h)N
-579(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)X
-1 f
-555 3560(records,)N
-835(we)X
-952(expect)X
-1185(contention)X
-1546(to)X
-1631(become)X
-1904(a)X
-1963(factor)X
-2174(quickly)X
-2437(and)X
-2576(the)X
-2697(NO-FSYNC)X
-3120(line)X
-3263(in)X
-3348(\256gure)X
-3557(eight)X
-3739(demonstrates)X
-4184(this)X
-555 3650(dramatically.)N
-1022(Each)X
-1209(additional)X
-1555(process)X
-1822(causes)X
-2058(both)X
-2226(more)X
-2417(waiting)X
-2682(and)X
-2823(more)X
-3013(deadlocking.)X
-3470(Figure)X
-3704(nine)X
-3867(shows)X
-4092(that)X
-4237(in)X
-555 3740(the)N
-681(small)X
-882(database)X
-1187(case)X
-1353(\(SMALL\),)X
-1725(waiting)X
-1992(is)X
-2072(the)X
-2197(dominant)X
-2526(cause)X
-2732(of)X
-2826(declining)X
-3151(performance)X
-3585(\(the)X
-3737(number)X
-4009(of)X
-4103(aborts)X
-555 3830(increases)N
-878(less)X
-1026(steeply)X
-1281(than)X
-1447(the)X
-1573(performance)X
-2008(drops)X
-2214(off)X
-2336(in)X
-2426(\256gure)X
-2641(eight\),)X
-2876(while)X
-3082(in)X
-3172(the)X
-3298(large)X
-3487(database)X
-3792(case)X
-3958(\(LARGE\),)X
-555 3920(deadlocking)N
-967(contributes)X
-1343(more)X
-1528(to)X
-1610(the)X
-1728(declining)X
-2046(performance.)X
-755 4043(Deadlocks)N
-1116(are)X
-1237(more)X
-1424(likely)X
-1628(to)X
-1712(occur)X
-1913(in)X
-1997(the)X
-2116(LARGE)X
-2404(test)X
-2536(than)X
-2695(in)X
-2778(the)X
-2897(SMALL)X
-3189(test)X
-3321(because)X
-3597(there)X
-3779(are)X
-3899(more)X
-4085(oppor-)X
-555 4133(tunities)N
-814(to)X
-900(wait.)X
-1082(In)X
-1173(the)X
-1295(SMALL)X
-1590(case,)X
-1773(processes)X
-2105(never)X
-2307(do)X
-2410(I/O)X
-2540(and)X
-2679(are)X
-2801(less)X
-2944(likely)X
-3149(to)X
-3234(be)X
-3333(descheduled)X
-3753(during)X
-3985(a)X
-4044(transac-)X
-555 4223(tion.)N
-740(In)X
-828(the)X
-947(LARGE)X
-1235(case,)X
-1415(processes)X
-1744(will)X
-1889(frequently)X
-2240(be)X
-2337(descheduled)X
-2755(since)X
-2941(they)X
-3100(have)X
-3273(to)X
-3356(perform)X
-3636(I/O.)X
-3804(This)X
-3967(provides)X
-4263(a)X
-555 4313(window)N
-837(where)X
-1058(a)X
-1118(second)X
-1365(process)X
-1630(can)X
-1766(request)X
-2022(locks)X
-2215(on)X
-2318(already)X
-2578(locked)X
-2815(pages,)X
-3041(thus)X
-3197(increasing)X
-3550(the)X
-3671(likelihood)X
-4018(of)X
-4108(build-)X
-555 4403(ing)N
-677(up)X
-777(long)X
-939(chains)X
-1164(of)X
-1251(waiting)X
-1511(processes.)X
-1879(Eventually,)X
-2266(this)X
-2401(leads)X
-2586(to)X
-2668(deadlock.)X
-3 f
-555 4589(5.2.)N
-715(The)X
-868(OO1)X
-1052(Benchmark)X
-1 f
-755 4712(The)N
-903(TPCB)X
-1125(benchmark)X
-1505(described)X
-1836(in)X
-1921(the)X
-2042(previous)X
-2341(section)X
-2591(measures)X
-2913(performance)X
-3343(under)X
-3549(a)X
-3608(conventional)X
-4044(transac-)X
-555 4802(tion)N
-706(processing)X
-1076(workload.)X
-1446(Other)X
-1656(application)X
-2039(domains,)X
-2357(such)X
-2531(as)X
-2625(computer-aided)X
-3156(design,)X
-3412(have)X
-3591(substantially)X
-4022(different)X
-555 4892(access)N
-786(patterns.)X
-1105(In)X
-1197(order)X
-1392(to)X
-1479(measure)X
-1772(the)X
-1895(performance)X
-2327(of)X
-2418(LIBTP)X
-2664(under)X
-2871(workloads)X
-3229(of)X
-3320(this)X
-3459(type,)X
-3641(we)X
-3759(implemented)X
-4201(the)X
-555 4982(OO1)N
-731(benchmark)X
-1108(described)X
-1436(in)X
-1518([CATT91].)X
-755 5105(The)N
-908(database)X
-1213(models)X
-1472(a)X
-1535(set)X
-1651(of)X
-1745(electronics)X
-2120(components)X
-2534(with)X
-2703(connections)X
-3113(among)X
-3358(them.)X
-3585(One)X
-3746(table)X
-3929(stores)X
-4143(parts)X
-555 5195(and)N
-696(another)X
-962(stores)X
-1174(connections.)X
-1622(There)X
-1835(are)X
-1959(three)X
-2145(connections)X
-2552(originating)X
-2927(at)X
-3009(any)X
-3149(given)X
-3351(part.)X
-3540(Ninety)X
-3782(percent)X
-4043(of)X
-4134(these)X
-555 5285(connections)N
-960(are)X
-1081(to)X
-1165(nearby)X
-1406(parts)X
-1584(\(those)X
-1802(with)X
-1966(nearby)X
-2 f
-2207(ids)X
-1 f
-2300(\))X
-2348(to)X
-2431(model)X
-2652(the)X
-2771(spatial)X
-3001(locality)X
-3262(often)X
-3448(exhibited)X
-3767(in)X
-3850(CAD)X
-4040(applica-)X
-555 5375(tions.)N
-779(Ten)X
-933(percent)X
-1198(of)X
-1293(the)X
-1419(connections)X
-1830(are)X
-1957(randomly)X
-2292(distributed)X
-2662(among)X
-2908(all)X
-3016(other)X
-3209(parts)X
-3393(in)X
-3483(the)X
-3609(database.)X
-3954(Every)X
-4174(part)X
-555 5465(appears)N
-829(exactly)X
-1089(three)X
-1278(times)X
-1479(in)X
-1569(the)X
-2 f
-1695(from)X
-1 f
-1874(\256eld)X
-2043(of)X
-2137(a)X
-2200(connection)X
-2579(record,)X
-2832(and)X
-2975(zero)X
-3141(or)X
-3235(more)X
-3427(times)X
-3627(in)X
-3716(the)X
-2 f
-3841(to)X
-1 f
-3930(\256eld.)X
-4139(Parts)X
-555 5555(have)N
-2 f
-727(x)X
-1 f
-783(and)X
-2 f
-919(y)X
-1 f
-975(locations)X
-1284(set)X
-1393(randomly)X
-1720(in)X
-1802(an)X
-1898(appropriate)X
-2284(range.)X
-
-14 p
-%%Page: 14 14
-10 s 10 xH 0 xS 1 f
-3 f
-1 f
-755 630(The)N
-900(intent)X
-1102(of)X
-1189(OO1)X
-1365(is)X
-1438(to)X
-1520(measure)X
-1808(the)X
-1926(overall)X
-2169(cost)X
-2318(of)X
-2405(a)X
-2461(query)X
-2664(mix)X
-2808(characteristic)X
-3257(of)X
-3344(engineering)X
-3743(database)X
-4040(applica-)X
-555 720(tions.)N
-770(There)X
-978(are)X
-1097(three)X
-1278(tests:)X
-10 f
-635 843(g)N
-2 f
-755(Lookup)X
-1 f
-1022(generates)X
-1353(1,000)X
-1560(random)X
-1832(part)X
-2 f
-1984(ids)X
-1 f
-2077(,)X
-2124(fetches)X
-2378(the)X
-2502(corresponding)X
-2987(parts)X
-3169(from)X
-3351(the)X
-3475(database,)X
-3798(and)X
-3940(calls)X
-4113(a)X
-4175(null)X
-755 933(procedure)N
-1097(in)X
-1179(the)X
-1297(host)X
-1450(programming)X
-1906(language)X
-2216(with)X
-2378(the)X
-2496(parts')X
-2 f
-2699(x)X
-1 f
-2755(and)X
-2 f
-2891(y)X
-1 f
-2947(positions.)X
-10 f
-635 1056(g)N
-2 f
-755(Traverse)X
-1 f
-1067(retrieves)X
-1371(a)X
-1434(random)X
-1706(part)X
-1858(from)X
-2041(the)X
-2166(database)X
-2470(and)X
-2613(follows)X
-2880(connections)X
-3290(from)X
-3473(it)X
-3544(to)X
-3632(other)X
-3823(parts.)X
-4045(Each)X
-4232(of)X
-755 1146(those)N
-947(parts)X
-1126(is)X
-1202(retrieved,)X
-1531(and)X
-1670(all)X
-1773(connections)X
-2179(from)X
-2358(it)X
-2424(followed.)X
-2771(This)X
-2935(procedure)X
-3279(is)X
-3354(repeated)X
-3649(depth-\256rst)X
-4000(for)X
-4116(seven)X
-755 1236(hops)N
-930(from)X
-1110(the)X
-1232(original)X
-1505(part,)X
-1674(for)X
-1792(a)X
-1852(total)X
-2018(of)X
-2109(3280)X
-2293(parts.)X
-2513(Backward)X
-2862(traversal)X
-3162(also)X
-3314(exists,)X
-3539(and)X
-3678(follows)X
-3941(all)X
-4044(connec-)X
-755 1326(tions)N
-930(into)X
-1074(a)X
-1130(given)X
-1328(part)X
-1473(to)X
-1555(their)X
-1722(origin.)X
-10 f
-635 1449(g)N
-2 f
-755(Insert)X
-1 f
-962(adds)X
-1129(100)X
-1269(new)X
-1423(parts)X
-1599(and)X
-1735(their)X
-1902(connections.)X
-755 1572(The)N
-913(benchmark)X
-1303(is)X
-1389(single-user,)X
-1794(but)X
-1929(multi-user)X
-2291(access)X
-2530(controls)X
-2821(\(locking)X
-3120(and)X
-3268(transaction)X
-3652(protection\))X
-4036(must)X
-4223(be)X
-555 1662(enforced.)N
-898(It)X
-968(is)X
-1042(designed)X
-1348(to)X
-1431(be)X
-1528(run)X
-1656(on)X
-1757(a)X
-1814(database)X
-2112(with)X
-2275(20,000)X
-2516(parts,)X
-2713(and)X
-2850(on)X
-2951(one)X
-3087(with)X
-3249(200,000)X
-3529(parts.)X
-3745(Because)X
-4033(we)X
-4147(have)X
-555 1752(insuf\256cient)N
-935(disk)X
-1088(space)X
-1287(for)X
-1401(the)X
-1519(larger)X
-1727(database,)X
-2044(we)X
-2158(report)X
-2370(results)X
-2599(only)X
-2761(for)X
-2875(the)X
-2993(20,000)X
-3233(part)X
-3378(database.)X
-3 f
-555 1938(5.2.1.)N
-775(Implementation)X
-1 f
-755 2061(The)N
-920(LIBTP)X
-1182(implementation)X
-1724(of)X
-1831(OO1)X
-2027(uses)X
-2205(the)X
-2342(TCL)X
-2532([OUST90])X
-2914(interface)X
-3235(described)X
-3582(earlier.)X
-3867(The)X
-4031(backend)X
-555 2151(accepts)N
-813(commands)X
-1181(over)X
-1345(an)X
-1442(IP)X
-1534(socket)X
-1760(and)X
-1897(performs)X
-2208(the)X
-2327(requested)X
-2656(database)X
-2954(actions.)X
-3242(The)X
-3387(frontend)X
-3679(opens)X
-3886(and)X
-4022(executes)X
-555 2241(a)N
-618(TCL)X
-796(script.)X
-1041(This)X
-1210(script)X
-1415(contains)X
-1709(database)X
-2013(accesses)X
-2313(interleaved)X
-2697(with)X
-2866(ordinary)X
-3165(program)X
-3463(control)X
-3716(statements.)X
-4120(Data-)X
-555 2331(base)N
-718(commands)X
-1085(are)X
-1204(submitted)X
-1539(to)X
-1621(the)X
-1739(backend)X
-2027(and)X
-2163(results)X
-2392(are)X
-2511(bound)X
-2731(to)X
-2813(program)X
-3105(variables.)X
-755 2454(The)N
-903(parts)X
-1082(table)X
-1261(was)X
-1409(stored)X
-1628(as)X
-1718(a)X
-1776(B-tree)X
-1999(indexed)X
-2275(by)X
-2 f
-2377(id)X
-1 f
-2439(.)X
-2501(The)X
-2648(connection)X
-3022(table)X
-3200(was)X
-3347(stored)X
-3565(as)X
-3654(a)X
-3712(set)X
-3823(of)X
-3912(\256xed-length)X
-555 2544(records)N
-824(using)X
-1029(the)X
-1159(4.4BSD)X
-1446(recno)X
-1657(access)X
-1895(method.)X
-2207(In)X
-2306(addition,)X
-2620(two)X
-2771(B-tree)X
-3003(indices)X
-3261(were)X
-3449(maintained)X
-3836(on)X
-3947(connection)X
-555 2634(table)N
-732(entries.)X
-1007(One)X
-1162(index)X
-1360(mapped)X
-1634(the)X
-2 f
-1752(from)X
-1 f
-1923(\256eld)X
-2085(to)X
-2167(a)X
-2223(connection)X
-2595(record)X
-2821(number,)X
-3106(and)X
-3242(the)X
-3360(other)X
-3545(mapped)X
-3819(the)X
-2 f
-3937(to)X
-1 f
-4019(\256eld)X
-4181(to)X
-4263(a)X
-555 2724(connection)N
-932(record)X
-1163(number.)X
-1473(These)X
-1690(indices)X
-1941(support)X
-2205(fast)X
-2345(lookups)X
-2622(on)X
-2726(connections)X
-3133(in)X
-3219(both)X
-3385(directions.)X
-3765(For)X
-3900(the)X
-4022(traversal)X
-555 2814(tests,)N
-743(the)X
-867(frontend)X
-1165(does)X
-1338(an)X
-1439(index)X
-1642(lookup)X
-1889(to)X
-1976(discover)X
-2273(the)X
-2396(connected)X
-2747(part's)X
-2 f
-2955(id)X
-1 f
-3017(,)X
-3062(and)X
-3203(then)X
-3366(does)X
-3538(another)X
-3804(lookup)X
-4051(to)X
-4138(fetch)X
-555 2904(the)N
-673(part)X
-818(itself.)X
-3 f
-555 3090(5.2.2.)N
-775(Performance)X
-1242(Measurements)X
-1766(for)X
-1889(OO1)X
-1 f
-755 3213(We)N
-888(compare)X
-1186(LIBTP's)X
-1487(OO1)X
-1664(performance)X
-2092(to)X
-2174(that)X
-2314(reported)X
-2602(in)X
-2684([CATT91].)X
-3087(Those)X
-3303(results)X
-3532(were)X
-3709(collected)X
-4019(on)X
-4119(a)X
-4175(Sun)X
-555 3303(3/280)N
-759(\(25)X
-888(MHz)X
-1075(MC68020\))X
-1448(with)X
-1612(16)X
-1714(MBytes)X
-1989(of)X
-2078(memory)X
-2367(and)X
-2505(two)X
-2647(Hitachi)X
-2904(892MByte)X
-3267(disks)X
-3452(\(15)X
-3580(ms)X
-3694(average)X
-3966(seek)X
-4130(time\))X
-555 3393(behind)N
-793(an)X
-889(SMD-4)X
-1149(controller.)X
-1521(Frontends)X
-1861(ran)X
-1984(on)X
-2084(an)X
-2180(8MByte)X
-2462(Sun)X
-2606(3/260.)X
-755 3516(In)N
-844(order)X
-1036(to)X
-1120(measure)X
-1410(performance)X
-1839(on)X
-1941(a)X
-1999(machine)X
-2293(of)X
-2382(roughly)X
-2653(equivalent)X
-3009(processor)X
-3339(power,)X
-3582(we)X
-3698(ran)X
-3822(one)X
-3959(set)X
-4069(of)X
-4157(tests)X
-555 3606(on)N
-666(a)X
-733(standalone)X
-1107(MC68030-based)X
-1671(HP300)X
-1923(\(33MHz)X
-2225(MC68030\).)X
-2646(The)X
-2801(database)X
-3108(was)X
-3263(stored)X
-3489(on)X
-3599(a)X
-3665(300MByte)X
-4037(HP7959)X
-555 3696(SCSI)N
-744(disk)X
-898(\(17)X
-1026(ms)X
-1139(average)X
-1410(seek)X
-1573(time\).)X
-1802(Since)X
-2000(this)X
-2135(machine)X
-2427(is)X
-2500(not)X
-2622(connected)X
-2968(to)X
-3050(a)X
-3106(network,)X
-3409(we)X
-3523(ran)X
-3646(local)X
-3822(tests)X
-3984(where)X
-4201(the)X
-555 3786(frontend)N
-855(and)X
-999(backend)X
-1295(run)X
-1430(on)X
-1538(the)X
-1664(same)X
-1856(machine.)X
-2195(We)X
-2334(compare)X
-2638(these)X
-2830(measurements)X
-3316(with)X
-3485(Cattell's)X
-3783(local)X
-3966(Sun)X
-4117(3/280)X
-555 3876(numbers.)N
-755 3999(Because)N
-1051(the)X
-1177(benchmark)X
-1562(requires)X
-1849(remote)X
-2100(access,)X
-2354(we)X
-2476(ran)X
-2607(another)X
-2876(set)X
-2993(of)X
-3088(tests)X
-3258(on)X
-3365(a)X
-3428(DECstation)X
-3828(5000/200)X
-4157(with)X
-555 4089(32M)N
-732(of)X
-825(memory)X
-1118(running)X
-1393(Ultrix)X
-1610(V4.0)X
-1794(and)X
-1936(a)X
-1998(DEC)X
-2184(1GByte)X
-2459(RZ57)X
-2666(SCSI)X
-2859(disk.)X
-3057(We)X
-3194(compare)X
-3496(the)X
-3619(local)X
-3800(performance)X
-4232(of)X
-555 4179(OO1)N
-734(on)X
-837(the)X
-958(DECstation)X
-1354(to)X
-1439(its)X
-1536(remote)X
-1781(performance.)X
-2250(For)X
-2383(the)X
-2503(remote)X
-2748(case,)X
-2929(we)X
-3045(ran)X
-3170(the)X
-3290(frontend)X
-3584(on)X
-3686(a)X
-3744(DECstation)X
-4139(3100)X
-555 4269(with)N
-717(16)X
-817(MBytes)X
-1090(of)X
-1177(main)X
-1357(memory.)X
-755 4392(The)N
-900(databases)X
-1228(tested)X
-1435(in)X
-1517([CATT91])X
-1880(are)X
-10 f
-635 4515(g)N
-1 f
-755(INDEX,)X
-1045(a)X
-1101(highly-optimized)X
-1672(access)X
-1898(method)X
-2158(package)X
-2442(developed)X
-2792(at)X
-2870(Sun)X
-3014(Microsystems.)X
-10 f
-635 4638(g)N
-1 f
-755(OODBMS,)X
-1137(a)X
-1193(beta)X
-1347(release)X
-1591(of)X
-1678(a)X
-1734(commercial)X
-2133(object-oriented)X
-2639(database)X
-2936(management)X
-3366(system.)X
-10 f
-635 4761(g)N
-1 f
-755(RDBMS,)X
-1076(a)X
-1133(UNIX-based)X
-1565(commercial)X
-1965(relational)X
-2289(data)X
-2444(manager)X
-2742(at)X
-2821(production)X
-3189(release.)X
-3474(The)X
-3620(OO1)X
-3797(implementation)X
-755 4851(used)N
-922(embedded)X
-1272(SQL)X
-1443(in)X
-1525(C.)X
-1638(Stored)X
-1867(procedures)X
-2240(were)X
-2417(de\256ned)X
-2673(to)X
-2755(reduce)X
-2990(client-server)X
-3412(traf\256c.)X
-755 4974(Table)N
-974(two)X
-1130(shows)X
-1366(the)X
-1500(measurements)X
-1995(from)X
-2187([CATT91])X
-2566(and)X
-2718(LIBTP)X
-2976(for)X
-3106(a)X
-3178(local)X
-3370(test)X
-3517(on)X
-3632(the)X
-3765(MC680x0-based)X
-555 5064(hardware.)N
-915(All)X
-1037(caches)X
-1272(are)X
-1391(cleared)X
-1644(before)X
-1870(each)X
-2038(test.)X
-2209(All)X
-2331(times)X
-2524(are)X
-2643(in)X
-2725(seconds.)X
-755 5187(Table)N
-960(two)X
-1102(shows)X
-1324(that)X
-1466(LIBTP)X
-1710(outperforms)X
-2123(the)X
-2242(commercial)X
-2642(relational)X
-2966(system,)X
-3229(but)X
-3352(is)X
-3426(slower)X
-3661(than)X
-3820(OODBMS)X
-4183(and)X
-555 5277(INDEX.)N
-872(Since)X
-1077(the)X
-1202(caches)X
-1444(were)X
-1628(cleared)X
-1888(at)X
-1973(the)X
-2098(start)X
-2263(of)X
-2356(each)X
-2530(test,)X
-2687(disk)X
-2846(throughput)X
-3223(is)X
-3302(critical)X
-3551(in)X
-3639(this)X
-3780(test.)X
-3957(The)X
-4108(single)X
-555 5367(SCSI)N
-749(HP)X
-877(drive)X
-1068(used)X
-1241(by)X
-1347(LIBTP)X
-1595(is)X
-1674(approximately)X
-2163(13%)X
-2336(slower)X
-2576(than)X
-2739(the)X
-2862(disks)X
-3051(used)X
-3223(in)X
-3310([CATT91])X
-3678(which)X
-3899(accounts)X
-4205(for)X
-555 5457(part)N
-700(of)X
-787(the)X
-905(difference.)X
-755 5580(OODBMS)N
-1118(and)X
-1255(INDEX)X
-1525(outperform)X
-1906(LIBTP)X
-2148(most)X
-2323(dramatically)X
-2744(on)X
-2844(traversal.)X
-3181(This)X
-3343(is)X
-3416(because)X
-3691(we)X
-3805(use)X
-3932(index)X
-4130(look-)X
-555 5670(ups)N
-689(to)X
-774(\256nd)X
-921(connections,)X
-1347(whereas)X
-1634(the)X
-1755(other)X
-1942(two)X
-2084(systems)X
-2359(use)X
-2488(a)X
-2546(link)X
-2692(access)X
-2920(method.)X
-3222(The)X
-3369(index)X
-3569(requires)X
-3850(us)X
-3943(to)X
-4027(examine)X
-
-15 p
-%%Page: 15 15
-10 s 10 xH 0 xS 1 f
-3 f
-1 f
-10 f
-555 679(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)N
-2 f
-606 769(Measure)N
-1 f
-1019(INDEX)X
-1389(OODBMS)X
-1851(RDBMS)X
-2250(LIBTP)X
-10 f
-555 771(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)N
-555 787(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)N
-1 f
-595 869(Lookup)N
-1114(5.4)X
-1490(12.9)X
-1950(27)X
-2291(27.2)X
-595 959(Traversal)N
-1074(13)X
-1530(9.8)X
-1950(90)X
-2291(47.3)X
-595 1049(Insert)N
-1114(7.4)X
-1530(1.5)X
-1950(22)X
-2331(9.7)X
-10 f
-555 1059(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)N
-555(c)X
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-959 1059(c)N
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-1329 1059(c)N
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-1791 1059(c)N
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-2190 1059(c)N
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-2512 1059(c)N
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-2618 679(i)N
-2629(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2 f
-2829 769(Measure)N
-3401(Cache)X
-3726(Local)X
-4028(Remote)X
-1 f
-10 f
-2618 771(i)N
-2629(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2618 787(i)N
-2629(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2658 869(Lookup)N
-3401(cold)X
-3747(15.7)X
-4078(20.6)X
-3401 959(warm)N
-3787(7.8)X
-4078(12.4)X
-10 f
-2618 969(i)N
-2629(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2658 1059(Forward)N
-2950(traversal)X
-3401(cold)X
-3747(28.4)X
-4078(52.6)X
-3401 1149(warm)N
-3747(23.5)X
-4078(47.4)X
-10 f
-2618 1159(i)N
-2629(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2658 1249(Backward)N
-3004(traversal)X
-3401(cold)X
-3747(24.2)X
-4078(47.4)X
-3401 1339(warm)N
-3747(24.3)X
-4078(47.6)X
-10 f
-2618 1349(i)N
-2629(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-1 f
-2658 1439(Insert)N
-3401(cold)X
-3787(7.5)X
-4078(10.3)X
-3401 1529(warm)N
-3787(6.7)X
-4078(10.9)X
-10 f
-2618 1539(i)N
-2629(iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii)X
-2618(c)X
-1479(c)Y
-1399(c)Y
-1319(c)Y
-1239(c)Y
-1159(c)Y
-1079(c)Y
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-3341 1539(c)N
-1479(c)Y
-1399(c)Y
-1319(c)Y
-1239(c)Y
-1159(c)Y
-1079(c)Y
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-3666 1539(c)N
-1479(c)Y
-1399(c)Y
-1319(c)Y
-1239(c)Y
-1159(c)Y
-1079(c)Y
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-3968 1539(c)N
-1479(c)Y
-1399(c)Y
-1319(c)Y
-1239(c)Y
-1159(c)Y
-1079(c)Y
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-4309 1539(c)N
-1479(c)Y
-1399(c)Y
-1319(c)Y
-1239(c)Y
-1159(c)Y
-1079(c)Y
-999(c)Y
-919(c)Y
-839(c)Y
-759(c)Y
-3 f
-587 1785(Table)N
-823(2:)X
-931(Local)X
-1163(MC680x0)X
-1538(Performance)X
-2026(of)X
-2133(Several)X
-587 1875(Systems)N
-883(on)X
-987(OO1.)X
-2667 1785(Table)N
-2909(3:)X
-3023(Local)X
-3260(vs.)X
-3397(Remote)X
-3707(Performance)X
-4200(of)X
-2667 1875(LIBTP)N
-2926(on)X
-3030(OO1.)X
-1 f
-10 f
-555 1998(h)N
-579(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)X
-1 f
-555 2274(two)N
-696(disk)X
-850(pages,)X
-1074(but)X
-1197(the)X
-1316(links)X
-1492(require)X
-1741(only)X
-1904(one,)X
-2061(regardless)X
-2408(of)X
-2496(database)X
-2794(size.)X
-2980(Cattell)X
-3214(reports)X
-3458(that)X
-3599(lookups)X
-3873(using)X
-4067(B-trees)X
-555 2364(instead)N
-808(of)X
-901(links)X
-1082(makes)X
-1313(traversal)X
-1616(take)X
-1776(twice)X
-1976(as)X
-2069(long)X
-2237(in)X
-2325(INDEX.)X
-2641(Adding)X
-2907(a)X
-2969(link)X
-3119(access)X
-3351(method)X
-3617(to)X
-3 f
-3704(db)X
-1 f
-3792(\(3\))X
-3911(or)X
-4003(using)X
-4201(the)X
-555 2454(existing)N
-828(hash)X
-995(method)X
-1255(would)X
-1475(apparently)X
-1834(be)X
-1930(a)X
-1986(good)X
-2166(idea.)X
-755 2577(Both)N
-936(OODBMS)X
-1304(and)X
-1446(INDEX)X
-1722(issue)X
-1908 0.1944(coarser-granularity)AX
-2545(locks)X
-2739(than)X
-2902(LIBTP.)X
-3189(This)X
-3356(limits)X
-3562(concurrency)X
-3985(for)X
-4104(multi-)X
-555 2667(user)N
-711(applications,)X
-1140(but)X
-1264(helps)X
-1455(single-user)X
-1829(applications.)X
-2278(In)X
-2367(addition,)X
-2671(the)X
-2791(fact)X
-2934(that)X
-3076(LIBTP)X
-3319(releases)X
-3595(B-tree)X
-3817(locks)X
-4007(early)X
-4189(is)X
-4263(a)X
-555 2757(drawback)N
-896(in)X
-986(OO1.)X
-1210(Since)X
-1416(there)X
-1605(is)X
-1686(no)X
-1793(concurrency)X
-2218(in)X
-2307(the)X
-2432(benchmark,)X
-2836(high-concurrency)X
-3430(strategies)X
-3760(only)X
-3929(show)X
-4125(up)X
-4232(as)X
-555 2847(increased)N
-882(locking)X
-1145(overhead.)X
-1503(Finally,)X
-1772(the)X
-1892(architecture)X
-2294(of)X
-2383(the)X
-2503(LIBTP)X
-2747(implementation)X
-3271(was)X
-3418(substantially)X
-3844(different)X
-4143(from)X
-555 2937(that)N
-702(of)X
-796(either)X
-1006(OODBMS)X
-1375(or)X
-1469(INDEX.)X
-1786(Both)X
-1968(of)X
-2062(those)X
-2258(systems)X
-2538(do)X
-2645(the)X
-2770(searches)X
-3070(in)X
-3159(the)X
-3284(user's)X
-3503(address)X
-3771(space,)X
-3997(and)X
-4139(issue)X
-555 3027(requests)N
-844(for)X
-964(pages)X
-1173(to)X
-1260(the)X
-1383(server)X
-1605(process.)X
-1911(Pages)X
-2123(are)X
-2247(cached)X
-2496(in)X
-2583(the)X
-2706(client,)X
-2929(and)X
-3070(many)X
-3273(queries)X
-3530(can)X
-3667(be)X
-3768(satis\256ed)X
-4055(without)X
-555 3117(contacting)N
-910(the)X
-1029(server)X
-1247(at)X
-1326(all.)X
-1467(LIBTP)X
-1710(submits)X
-1979(all)X
-2080(the)X
-2199(queries)X
-2452(to)X
-2535(the)X
-2653(server)X
-2870(process,)X
-3151(and)X
-3287(receives)X
-3571(database)X
-3868(records)X
-4125(back;)X
-555 3207(it)N
-619(does)X
-786(no)X
-886(client)X
-1084(caching.)X
-755 3330(The)N
-911(RDBMS)X
-1221(architecture)X
-1632(is)X
-1716(much)X
-1925(closer)X
-2148(to)X
-2241(that)X
-2392(of)X
-2490(LIBTP.)X
-2783(A)X
-2872(server)X
-3100(process)X
-3372(receives)X
-3667(queries)X
-3930(and)X
-4076(returns)X
-555 3420(results)N
-786(to)X
-870(a)X
-928(client.)X
-1168(The)X
-1315(timing)X
-1545(results)X
-1776(in)X
-1860(table)X
-2038(two)X
-2180(clearly)X
-2421(show)X
-2612(that)X
-2754(the)X
-2874(conventional)X
-3309(database)X
-3607(client/server)X
-4025(model)X
-4246(is)X
-555 3510(expensive.)N
-941(LIBTP)X
-1188(outperforms)X
-1605(the)X
-1728(RDBMS)X
-2032(on)X
-2136(traversal)X
-2437(and)X
-2577(insertion.)X
-2921(We)X
-3057(speculate)X
-3380(that)X
-3524(this)X
-3663(is)X
-3740(due)X
-3880(in)X
-3966(part)X
-4115(to)X
-4201(the)X
-555 3600(overhead)N
-870(of)X
-957(query)X
-1160(parsing,)X
-1436(optimization,)X
-1880(and)X
-2016(repeated)X
-2309(interpretation)X
-2761(of)X
-2848(the)X
-2966(plan)X
-3124(tree)X
-3265(in)X
-3347(the)X
-3465(RDBMS')X
-3791(query)X
-3994(executor.)X
-755 3723(Table)N
-962(three)X
-1147(shows)X
-1371(the)X
-1492(differences)X
-1873(between)X
-2164(local)X
-2343(and)X
-2482(remote)X
-2728(execution)X
-3063(of)X
-3153(LIBTP's)X
-3456(OO1)X
-3635(implementation)X
-4160(on)X
-4263(a)X
-555 3813(DECstation.)N
-989(We)X
-1122(measured)X
-1451(performance)X
-1879(with)X
-2042(a)X
-2099(populated)X
-2436(\(warm\))X
-2694(cache)X
-2899(and)X
-3036(an)X
-3133(empty)X
-3354(\(cold\))X
-3567(cache.)X
-3812(Reported)X
-4126(times)X
-555 3903(are)N
-681(the)X
-806(means)X
-1037(of)X
-1130(twenty)X
-1374(tests,)X
-1562(and)X
-1704(are)X
-1829(in)X
-1917(seconds.)X
-2237(Standard)X
-2548(deviations)X
-2903(were)X
-3086(within)X
-3316(seven)X
-3525(percent)X
-3788(of)X
-3881(the)X
-4005(mean)X
-4205(for)X
-555 3993(remote,)N
-818(and)X
-954(two)X
-1094(percent)X
-1351(of)X
-1438(the)X
-1556(mean)X
-1750(for)X
-1864(local.)X
-755 4116(The)N
-914(20ms)X
-1121(overhead)X
-1450(of)X
-1551(TCP/IP)X
-1824(on)X
-1938(an)X
-2048(Ethernet)X
-2354(entirely)X
-2633(accounts)X
-2948(for)X
-3076(the)X
-3207(difference)X
-3567(in)X
-3662(speed.)X
-3918(The)X
-4076(remote)X
-555 4206(traversal)N
-857(times)X
-1055(are)X
-1179(nearly)X
-1405(double)X
-1648(the)X
-1771(local)X
-1952(times)X
-2150(because)X
-2430(we)X
-2549(do)X
-2653(index)X
-2855(lookups)X
-3132(and)X
-3272(part)X
-3421(fetches)X
-3673(in)X
-3759(separate)X
-4047(queries.)X
-555 4296(It)N
-629(would)X
-854(make)X
-1053(sense)X
-1252(to)X
-1339(do)X
-1444(indexed)X
-1723(searches)X
-2021(on)X
-2126(the)X
-2248(server,)X
-2489(but)X
-2615(we)X
-2733(were)X
-2914(unwilling)X
-3244(to)X
-3330(hard-code)X
-3676(knowledge)X
-4052(of)X
-4143(OO1)X
-555 4386(indices)N
-803(into)X
-948(our)X
-1075(LIBTP)X
-1317(TCL)X
-1488(server.)X
-1745(Cold)X
-1920(and)X
-2056(warm)X
-2259(insertion)X
-2559(times)X
-2752(are)X
-2871(identical)X
-3167(since)X
-3352(insertions)X
-3683(do)X
-3783(not)X
-3905(bene\256t)X
-4143(from)X
-555 4476(caching.)N
-755 4599(One)N
-915(interesting)X
-1279(difference)X
-1632(shown)X
-1867(by)X
-1973(table)X
-2155(three)X
-2342(is)X
-2421(the)X
-2545(cost)X
-2700(of)X
-2793(forward)X
-3074(versus)X
-3305(backward)X
-3644(traversal.)X
-3987(When)X
-4205(we)X
-555 4689(built)N
-725(the)X
-847(database,)X
-1168(we)X
-1285(inserted)X
-1562(parts)X
-1741(in)X
-1826(part)X
-2 f
-1974(id)X
-1 f
-2059(order.)X
-2292(We)X
-2427(built)X
-2596(the)X
-2717(indices)X
-2967(at)X
-3048(the)X
-3169(same)X
-3357(time.)X
-3562(Therefore,)X
-3923(the)X
-4044(forward)X
-555 4779(index)N
-757(had)X
-897(keys)X
-1068(inserted)X
-1346(in)X
-1432(order,)X
-1646(while)X
-1848(the)X
-1970(backward)X
-2307(index)X
-2509(had)X
-2649(keys)X
-2820(inserted)X
-3098(more)X
-3286(randomly.)X
-3656(In-order)X
-3943(insertion)X
-4246(is)X
-555 4885(pessimal)N
-858(for)X
-975(B-tree)X
-1199(indices,)X
-1469(so)X
-1563(the)X
-1684(forward)X
-1962(index)X
-2163(is)X
-2239(much)X
-2440(larger)X
-2651(than)X
-2812(the)X
-2933(backward)X
-3269(one)X
-7 s
-3385 4853(5)N
-10 s
-4885(.)Y
-3476(This)X
-3640(larger)X
-3850(size)X
-3997(shows)X
-4219(up)X
-555 4975(as)N
-642(extra)X
-823(disk)X
-976(reads)X
-1166(in)X
-1248(the)X
-1366(cold)X
-1524(benchmark.)X
-3 f
-555 5161(6.)N
-655(Conclusions)X
-1 f
-755 5284(LIBTP)N
-1006(provides)X
-1311(the)X
-1438(basic)X
-1632(building)X
-1927(blocks)X
-2165(to)X
-2256(support)X
-2525(transaction)X
-2906(protection.)X
-3300(In)X
-3396(comparison)X
-3799(with)X
-3970(traditional)X
-555 5374(Unix)N
-746(libraries)X
-1040(and)X
-1187(commercial)X
-1597(systems,)X
-1900(it)X
-1974(offers)X
-2192(a)X
-2258(variety)X
-2511(of)X
-2608(tradeoffs.)X
-2964(Using)X
-3185(complete)X
-3509(transaction)X
-3891(protection)X
-4246(is)X
-555 5464(more)N
-747(complicated)X
-1166(than)X
-1331(simply)X
-1575(adding)X
-3 f
-1820(fsync)X
-1 f
-1998(\(2\))X
-2119(and)X
-3 f
-2262(\257ock)X
-1 f
-2426(\(2\))X
-2547(calls)X
-2721(to)X
-2810(code,)X
-3008(but)X
-3136(it)X
-3206(is)X
-3285(faster)X
-3490(in)X
-3578(some)X
-3773(cases)X
-3969(and)X
-4111(offers)X
-8 s
-10 f
-555 5536(hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh)N
-5 s
-1 f
-727 5614(5)N
-8 s
-763 5639(The)N
-878(next)X
-1004(release)X
-1196(of)X
-1265(the)X
-1359(4.4BSD)X
-1580(access)X
-1758(method)X
-1966(will)X
-2082(automatically)X
-2446(detect)X
-2614(and)X
-2722(compensate)X
-3039(for)X
-3129(in-order)X
-3350(insertion,)X
-3606(eliminating)X
-3914(this)X
-4023(problem.)X
-
-16 p
-%%Page: 16 16
-8 s 8 xH 0 xS 1 f
-10 s
-3 f
-1 f
-555 630(stricter)N
-801(guarantees)X
-1168(\(atomicity,)X
-1540(consistency,)X
-1957(isolation,)X
-2275(and)X
-2414(durability\).)X
-2815(If)X
-2892(the)X
-3013(data)X
-3170(to)X
-3255(be)X
-3354(protected)X
-3676(are)X
-3798(already)X
-4058(format-)X
-555 720(ted)N
-675(\()X
-2 f
-702(i.e.)X
-1 f
-821(use)X
-949(one)X
-1086(of)X
-1174(the)X
-1293(database)X
-1591(access)X
-1818(methods\),)X
-2157(then)X
-2316(adding)X
-2555(transaction)X
-2928(protection)X
-3274(requires)X
-3554(no)X
-3655(additional)X
-3996(complex-)X
-555 810(ity,)N
-679(but)X
-801(incurs)X
-1017(a)X
-1073(performance)X
-1500(penalty)X
-1756(of)X
-1843(approximately)X
-2326(15%.)X
-755 933(In)N
-844(comparison)X
-1240(with)X
-1404(commercial)X
-1805(database)X
-2104(systems,)X
-2399(the)X
-2519(tradeoffs)X
-2827(are)X
-2948(more)X
-3135(complex.)X
-3473(LIBTP)X
-3717(does)X
-3886(not)X
-4009(currently)X
-555 1023(support)N
-825(a)X
-891(standard)X
-1193(query)X
-1406(language.)X
-1766(The)X
-1921(TCL-based)X
-2312(server)X
-2539(process)X
-2810(allows)X
-3049(a)X
-3115(certain)X
-3364(ease)X
-3533(of)X
-3630(use)X
-3767(which)X
-3993(would)X
-4223(be)X
-555 1113(enhanced)N
-882(with)X
-1047(a)X
-1106(more)X
-1294(user-friendly)X
-1732(interface)X
-2037(\()X
-2 f
-2064(e.g.)X
-1 f
-2203(a)X
-2261(windows)X
-2572(based)X
-2777(query-by-form)X
-3272(application\),)X
-3697(for)X
-3813(which)X
-4031(we)X
-4147(have)X
-555 1203(a)N
-620(working)X
-916(prototype.)X
-1292(When)X
-1513(accesses)X
-1815(do)X
-1924(not)X
-2055(require)X
-2312(sophisticated)X
-2758(query)X
-2969(processing,)X
-3360(the)X
-3486(TCL)X
-3665(interface)X
-3975(is)X
-4056(an)X
-4160(ade-)X
-555 1293(quate)N
-756(solution.)X
-1080(What)X
-1281(LIBTP)X
-1529(fails)X
-1693(to)X
-1781(provide)X
-2052(in)X
-2140(functionality,)X
-2595(it)X
-2665(makes)X
-2896(up)X
-3002(for)X
-3122(in)X
-3210(performance)X
-3643(and)X
-3785(\257exibility.)X
-4161(Any)X
-555 1383(application)N
-931(may)X
-1089(make)X
-1283(use)X
-1410(of)X
-1497(its)X
-1592(record)X
-1818(interface)X
-2120(or)X
-2207(the)X
-2325(more)X
-2510(primitive)X
-2823(log,)X
-2965(lock,)X
-3143(and)X
-3279(buffer)X
-3496(calls.)X
-755 1506(Future)N
-987(work)X
-1175(will)X
-1322(focus)X
-1519(on)X
-1621(overcoming)X
-2026(some)X
-2217(of)X
-2306(the)X
-2426(areas)X
-2614(in)X
-2698(which)X
-2916(LIBTP)X
-3160(is)X
-3235(currently)X
-3547(de\256cient)X
-3845(and)X
-3983(extending)X
-555 1596(its)N
-652(transaction)X
-1026(model.)X
-1288(The)X
-1435(addition)X
-1719(of)X
-1808(an)X
-1905(SQL)X
-2077(parser)X
-2295(and)X
-2432(forms)X
-2640(front)X
-2817(end)X
-2954(will)X
-3099(improve)X
-3387(the)X
-3506(system's)X
-3807(ease)X
-3967(of)X
-4055(use)X
-4183(and)X
-555 1686(make)N
-750(it)X
-815(more)X
-1001(competitive)X
-1400(with)X
-1563(commercial)X
-1963(systems.)X
-2277(In)X
-2365(the)X
-2484(long)X
-2647(term,)X
-2835(we)X
-2950(would)X
-3170(like)X
-3310(to)X
-3392(add)X
-3528(generalized)X
-3919(hierarchical)X
-555 1776(locking,)N
-836(nested)X
-1062(transactions,)X
-1486(parallel)X
-1748(transactions,)X
-2171(passing)X
-2431(of)X
-2518(transactions)X
-2921(between)X
-3209(processes,)X
-3557(and)X
-3693(distributed)X
-4055(commit)X
-555 1866(handling.)N
-900(In)X
-992(the)X
-1115(short)X
-1300(term,)X
-1492(the)X
-1614(next)X
-1776(step)X
-1929(is)X
-2006(to)X
-2092(integrate)X
-2397(LIBTP)X
-2643(with)X
-2809(the)X
-2931(most)X
-3110(recent)X
-3331(release)X
-3579(of)X
-3670(the)X
-3792(database)X
-4093(access)X
-555 1956(routines)N
-833(and)X
-969(make)X
-1163(it)X
-1227(freely)X
-1435(available)X
-1745(via)X
-1863(anonymous)X
-2252(ftp.)X
-3 f
-555 2142(7.)N
-655(Acknowledgements)X
-1 f
-755 2265(We)N
-888(would)X
-1109(like)X
-1250(to)X
-1332(thank)X
-1530(John)X
-1701(Wilkes)X
-1948(and)X
-2084(Carl)X
-2242(Staelin)X
-2484(of)X
-2571(Hewlett-Packard)X
-3131(Laboratories)X
-3557(and)X
-3693(Jon)X
-3824(Krueger.)X
-4148(John)X
-555 2355(and)N
-694(Carl)X
-855(provided)X
-1162(us)X
-1255(with)X
-1419(an)X
-1517(extra)X
-1700(disk)X
-1855(for)X
-1971(the)X
-2091(HP)X
-2215(testbed)X
-2464(less)X
-2606(than)X
-2766(24)X
-2868(hours)X
-3068(after)X
-3238(we)X
-3354(requested)X
-3684(it.)X
-3770(Jon)X
-3903(spent)X
-4094(count-)X
-555 2445(less)N
-699(hours)X
-901(helping)X
-1164(us)X
-1258(understand)X
-1633(the)X
-1754(intricacies)X
-2107(of)X
-2197(commercial)X
-2599(database)X
-2899(products)X
-3198(and)X
-3337(their)X
-3507(behavior)X
-3811(under)X
-4017(a)X
-4076(variety)X
-555 2535(of)N
-642(system)X
-884(con\256gurations.)X
-3 f
-555 2721(8.)N
-655(References)X
-1 f
-555 2901([ANDR89])N
-942(Andrade,)X
-1265(J.,)X
-1361(Carges,)X
-1629(M.,)X
-1765(Kovach,)X
-2060(K.,)X
-2183(``Building)X
-2541(an)X
-2642(On-Line)X
-2939(Transaction)X
-3343(Processing)X
-3715(System)X
-3975(On)X
-4098(UNIX)X
-727 2991(System)N
-982(V'',)X
-2 f
-1134(CommUNIXations)X
-1 f
-1725(,)X
-1765 0.2188(November/December)AX
-2477(1989.)X
-555 3171([BAY77])N
-878(Bayer,)X
-1110(R.,)X
-1223(Schkolnick,)X
-1623(M.,)X
-1754(``Concurrency)X
-2243(of)X
-2330(Operations)X
-2702(on)X
-2802(B-Trees'',)X
-2 f
-3155(Acta)X
-3322(Informatica)X
-1 f
-3700(,)X
-3740(1977.)X
-555 3351([BERN80])N
-936(Bernstein,)X
-1297(P.,)X
-1415(Goodman,)X
-1785(N.,)X
-1917(``Timestamp)X
-2365(Based)X
-2595(Algorithms)X
-2992(for)X
-3119(Concurrency)X
-3567(Control)X
-3844(in)X
-3939(Distributed)X
-727 3441(Database)N
-1042(Systems'',)X
-2 f
-1402(Proceedings)X
-1823(6th)X
-1945(International)X
-2387(Conference)X
-2777(on)X
-2877(Very)X
-3049(Large)X
-3260(Data)X
-3440(Bases)X
-1 f
-3627(,)X
-3667(October)X
-3946(1980.)X
-555 3621([BSD91])N
-864(DB\(3\),)X
-2 f
-1109(4.4BSD)X
-1376(Unix)X
-1552(Programmer's)X
-2044(Manual)X
-2313(Reference)X
-2655(Guide)X
-1 f
-2851(,)X
-2891(University)X
-3249(of)X
-3336(California,)X
-3701(Berkeley,)X
-4031(1991.)X
-555 3801([CATT91])N
-923(Cattell,)X
-1181(R.G.G.,)X
-1455(``An)X
-1632(Engineering)X
-2049(Database)X
-2369(Benchmark'',)X
-2 f
-2838(The)X
-2983(Benchmark)X
-3373(Handbook)X
-3731(for)X
-3848(Database)X
-4179(and)X
-727 3891(Transaction)N
-1133(Processing)X
-1509(Systems)X
-1 f
-1763(,)X
-1803(J.)X
-1874(Gray,)X
-2075(editor,)X
-2302(Morgan)X
-2576(Kaufman)X
-2895(1991.)X
-555 4071([CHEN91])N
-929(Cheng,)X
-1180(E.,)X
-1291(Chang,)X
-1542(E.,)X
-1653(Klein,)X
-1872(J.,)X
-1964(Lee,)X
-2126(D.,)X
-2245(Lu,)X
-2375(E.,)X
-2485(Lutgardo,)X
-2820(A.,)X
-2939(Obermarck,)X
-3342(R.,)X
-3456(``An)X
-3629(Open)X
-3824(and)X
-3961(Extensible)X
-727 4161(Event-Based)N
-1157(Transaction)X
-1556(Manager'',)X
-2 f
-1936(Proceedings)X
-2357(1991)X
-2537(Summer)X
-2820(Usenix)X
-1 f
-3043(,)X
-3083(Nashville,)X
-3430(TN,)X
-3577(June)X
-3744(1991.)X
-555 4341([CHOU85])N
-943(Chou,)X
-1163(H.,)X
-1288(DeWitt,)X
-1570(D.,)X
-1694(``An)X
-1872(Evaluation)X
-2245(of)X
-2338(Buffer)X
-2574(Management)X
-3019(Strategies)X
-3361(for)X
-3481(Relational)X
-3836(Database)X
-4157(Sys-)X
-727 4431(tems'',)N
-2 f
-972(Proceedings)X
-1393(of)X
-1475(the)X
-1593(11th)X
-1755(International)X
-2197(Conference)X
-2587(on)X
-2687(Very)X
-2859(Large)X
-3070(Databases)X
-1 f
-3408(,)X
-3448(1985.)X
-555 4611([DEWI84])N
-925(DeWitt,)X
-1207(D.,)X
-1331(Katz,)X
-1529(R.,)X
-1648(Olken,)X
-1890(F.,)X
-2000(Shapiro,)X
-2295(L.,)X
-2410(Stonebraker,)X
-2843(M.,)X
-2979(Wood,)X
-3220(D.,)X
-3343(``Implementation)X
-3929(Techniques)X
-727 4701(for)N
-841(Main)X
-1030(Memory)X
-1326(Database)X
-1641(Systems'',)X
-2 f
-2001(Proceedings)X
-2422(of)X
-2504(SIGMOD)X
-1 f
-2812(,)X
-2852(pp.)X
-2972(1-8,)X
-3119(June)X
-3286(1984.)X
-555 4881([GRAY76])N
-944(Gray,)X
-1153(J.,)X
-1252(Lorie,)X
-1474(R.,)X
-1595(Putzolu,)X
-1887(F.,)X
-1999(and)X
-2143(Traiger,)X
-2428(I.,)X
-2522(``Granularity)X
-2973(of)X
-3067(locks)X
-3263(and)X
-3406(degrees)X
-3679(of)X
-3773(consistency)X
-4174(in)X
-4263(a)X
-727 4971(large)N
-909(shared)X
-1140(data)X
-1295(base'',)X
-2 f
-1533(Modeling)X
-1861(in)X
-1944(Data)X
-2125(Base)X
-2301(Management)X
-2740(Systems)X
-1 f
-2994(,)X
-3034(Elsevier)X
-3317(North)X
-3524(Holland,)X
-3822(New)X
-3994(York,)X
-4199(pp.)X
-727 5061(365-394.)N
-555 5241([HAER83])N
-931(Haerder,)X
-1235(T.)X
-1348(Reuter,)X
-1606(A.)X
-1728(``Principles)X
-2126(of)X
-2217(Transaction-Oriented)X
-2928(Database)X
-3246(Recovery'',)X
-2 f
-3651(Computing)X
-4029(Surveys)X
-1 f
-4279(,)X
-727 5331(15\(4\);)N
-943(237-318,)X
-1250(1983.)X
-555 5511([KUNG81])N
-943(Kung,)X
-1162(H.)X
-1261(T.,)X
-1371(Richardson,)X
-1777(J.,)X
-1869(``On)X
-2042(Optimistic)X
-2400(Methods)X
-2701(for)X
-2816(Concurrency)X
-3252(Control'',)X
-2 f
-3591(ACM)X
-3781(Transactions)X
-4219(on)X
-727 5601(Database)N
-1054(Systems)X
-1 f
-1328(6\(2\);)X
-1504(213-226,)X
-1811(1981.)X
-
-17 p
-%%Page: 17 17
-10 s 10 xH 0 xS 1 f
-3 f
-1 f
-555 630([LEHM81])N
-939(Lehman,)X
-1245(P.,)X
-1352(Yao,)X
-1529(S.,)X
-1636(``Ef\256cient)X
-1989(Locking)X
-2279(for)X
-2396(Concurrent)X
-2780(Operations)X
-3155(on)X
-3258(B-trees'',)X
-2 f
-3587(ACM)X
-3779(Transactions)X
-4219(on)X
-727 720(Database)N
-1054(Systems)X
-1 f
-1308(,)X
-1348(6\(4\),)X
-1522(December)X
-1873(1981.)X
-555 900([MOHA91])N
-964(Mohan,)X
-1241(C.,)X
-1364(Pirahesh,)X
-1690(H.,)X
-1818(``ARIES-RRH:)X
-2366(Restricted)X
-2721(Repeating)X
-3076(of)X
-3173(History)X
-3442(in)X
-3533(the)X
-3660(ARIES)X
-3920(Transaction)X
-727 990(Recovery)N
-1055(Method'',)X
-2 f
-1398(Proceedings)X
-1819(7th)X
-1941(International)X
-2383(Conference)X
-2773(on)X
-2873(Data)X
-3053(Engineering)X
-1 f
-3449(,)X
-3489(Kobe,)X
-3703(Japan,)X
-3926(April)X
-4115(1991.)X
-555 1170([NODI90])N
-914(Nodine,)X
-1194(M.,)X
-1328(Zdonik,)X
-1602(S.,)X
-1709(``Cooperative)X
-2178(Transaction)X
-2580(Hierarchies:)X
-2996(A)X
-3077(Transaction)X
-3479(Model)X
-3711(to)X
-3796(Support)X
-4072(Design)X
-727 1260(Applications'',)N
-2 f
-1242(Proceedings)X
-1675(16th)X
-1849(International)X
-2303(Conference)X
-2704(on)X
-2815(Very)X
-2998(Large)X
-3220(Data)X
-3411(Bases)X
-1 f
-3598(,)X
-3649(Brisbane,)X
-3985(Australia,)X
-727 1350(August)N
-978(1990.)X
-555 1530([OUST90])N
-923(Ousterhout,)X
-1324(J.,)X
-1420(``Tcl:)X
-1648(An)X
-1771(Embeddable)X
-2197(Command)X
-2555(Language'',)X
-2 f
-2971(Proceedings)X
-3396(1990)X
-3580(Winter)X
-3822(Usenix)X
-1 f
-4045(,)X
-4089(Wash-)X
-727 1620(ington,)N
-971(D.C.,)X
-1162(January)X
-1432(1990.)X
-555 1800([POSIX91])N
-955(``Unapproved)X
-1441(Draft)X
-1645(for)X
-1773(Realtime)X
-2096(Extension)X
-2450(for)X
-2578(Portable)X
-2879(Operating)X
-3234(Systems'',)X
-3608(Draft)X
-3812(11,)X
-3946(October)X
-4239(7,)X
-727 1890(1991,)N
-927(IEEE)X
-1121(Computer)X
-1461(Society.)X
-555 2070([ROSE91])N
-925(Rosenblum,)X
-1341(M.,)X
-1484(Ousterhout,)X
-1892(J.,)X
-1995(``The)X
-2206(Design)X
-2464(and)X
-2611(Implementation)X
-3149(of)X
-3247(a)X
-3314(Log-Structured)X
-3835(File)X
-3990(System'',)X
-2 f
-727 2160(Proceedings)N
-1148(of)X
-1230(the)X
-1348(13th)X
-1510(Symposium)X
-1895(on)X
-1995(Operating)X
-2344(Systems)X
-2618(Principles)X
-1 f
-2947(,)X
-2987(1991.)X
-555 2340([SELT91])N
-904(Seltzer,)X
-1171(M.,)X
-1306(Stonebraker,)X
-1738(M.,)X
-1873(``Read)X
-2116(Optimized)X
-2478(File)X
-2626(Systems:)X
-2938(A)X
-3020(Performance)X
-3454(Evaluation'',)X
-2 f
-3898(Proceedings)X
-727 2430(7th)N
-849(Annual)X
-1100(International)X
-1542(Conference)X
-1932(on)X
-2032(Data)X
-2212(Engineering)X
-1 f
-2608(,)X
-2648(Kobe,)X
-2862(Japan,)X
-3085(April)X
-3274(1991.)X
-555 2610([SPEC88])N
-907(Spector,)X
-1200(Rausch,)X
-1484(Bruell,)X
-1732(``Camelot:)X
-2107(A)X
-2192(Flexible,)X
-2501(Distributed)X
-2888(Transaction)X
-3294(Processing)X
-3668(System'',)X
-2 f
-4004(Proceed-)X
-727 2700(ings)N
-880(of)X
-962(Spring)X
-1195(COMPCON)X
-1606(1988)X
-1 f
-(,)S
-1806(February)X
-2116(1988.)X
-555 2880([SQL86])N
-862(American)X
-1201(National)X
-1499(Standards)X
-1836(Institute,)X
-2139(``Database)X
-2509(Language)X
-2847(SQL'',)X
-3093(ANSI)X
-3301(X3.135-1986)X
-3747(\(ISO)X
-3924(9075\),)X
-4152(May)X
-727 2970(1986.)N
-555 3150([STON81])N
-919(Stonebraker,)X
-1348(M.,)X
-1480(``Operating)X
-1876(System)X
-2132(Support)X
-2406(for)X
-2520(Database)X
-2835(Management'',)X
-2 f
-3348(Communications)X
-3910(of)X
-3992(the)X
-4110(ACM)X
-1 f
-4279(,)X
-727 3240(1981.)N
-555 3420([SULL92])N
-925(Sullivan,)X
-1247(M.,)X
-1394(Olson,)X
-1641(M.,)X
-1788(``An)X
-1976(Index)X
-2195(Implementation)X
-2737(Supporting)X
-3127(Fast)X
-3295(Recovery)X
-3638(for)X
-3767(the)X
-3900(POSTGRES)X
-727 3510(Storage)N
-1014(System'',)X
-1365(to)X
-1469(appear)X
-1726(in)X
-2 f
-1830(Proceedings)X
-2272(8th)X
-2415(Annual)X
-2687(International)X
-3150(Conference)X
-3561(on)X
-3682(Data)X
-3883(Engineering)X
-1 f
-4279(,)X
-727 3600(Tempe,)N
-990(Arizona,)X
-1289(February)X
-1599(1992.)X
-555 3780([TPCB90])N
-914(Transaction)X
-1319(Processing)X
-1692(Performance)X
-2129(Council,)X
-2428(``TPC)X
-2653(Benchmark)X
-3048(B'',)X
-3200(Standard)X
-3510(Speci\256cation,)X
-3973(Waterside)X
-727 3870(Associates,)N
-1110(Fremont,)X
-1421(CA.,)X
-1592(1990.)X
-555 4050([YOUN91])N
-947(Young,)X
-1211(M.)X
-1328(W.,)X
-1470(Thompson,)X
-1858(D.)X
-1962(S.,)X
-2072(Jaffe,)X
-2274(E.,)X
-2388(``A)X
-2525(Modular)X
-2826(Architecture)X
-3253(for)X
-3372(Distributed)X
-3757(Transaction)X
-4161(Pro-)X
-727 4140(cessing'',)N
-2 f
-1057(Proceedings)X
-1478(1991)X
-1658(Winter)X
-1896(Usenix)X
-1 f
-2119(,)X
-2159(Dallas,)X
-2404(TX,)X
-2551(January)X
-2821(1991.)X
-3 f
-755 4263(Margo)N
-1008(I.)X
-1080(Seltzer)X
-1 f
-1338(is)X
-1411(a)X
-1467(Ph.D.)X
-1669(student)X
-1920(in)X
-2002(the)X
-2120(Department)X
-2519(of)X
-2606(Electrical)X
-2934(Engineering)X
-3346(and)X
-3482(Computer)X
-3822(Sciences)X
-4123(at)X
-4201(the)X
-555 4353(University)N
-919(of)X
-1012(California,)X
-1383(Berkeley.)X
-1739(Her)X
-1886(research)X
-2181(interests)X
-2474(include)X
-2735(\256le)X
-2862(systems,)X
-3160(databases,)X
-3513(and)X
-3654(transaction)X
-4031(process-)X
-555 4443(ing)N
-686(systems.)X
-1008(She)X
-1157(spent)X
-1355(several)X
-1612(years)X
-1811(working)X
-2107(at)X
-2194(startup)X
-2441(companies)X
-2813(designing)X
-3153(and)X
-3298(implementing)X
-3771(\256le)X
-3902(systems)X
-4183(and)X
-555 4533(transaction)N
-929(processing)X
-1294(software)X
-1592(and)X
-1729(designing)X
-2061(microprocessors.)X
-2648(Ms.)X
-2791(Seltzer)X
-3035(received)X
-3329(her)X
-3453(AB)X
-3585(in)X
-3668(Applied)X
-3947(Mathemat-)X
-555 4623(ics)N
-664(from)X
-840 0.1953(Harvard/Radcliffe)AX
-1445(College)X
-1714(in)X
-1796(1983.)X
-755 4746(In)N
-845(her)X
-971(spare)X
-1163(time,)X
-1347(Margo)X
-1583(can)X
-1717(usually)X
-1970(be)X
-2068(found)X
-2277(preparing)X
-2607(massive)X
-2887(quantities)X
-3220(of)X
-3309(food)X
-3478(for)X
-3594(hungry)X
-3843(hordes,)X
-4099(study-)X
-555 4836(ing)N
-677(Japanese,)X
-1003(or)X
-1090(playing)X
-1350(soccer)X
-1576(with)X
-1738(an)X
-1834(exciting)X
-2112(Bay)X
-2261(Area)X
-2438(Women's)X
-2770(Soccer)X
-3009(team,)X
-3205(the)X
-3323(Berkeley)X
-3633(Bruisers.)X
-3 f
-755 5049(Michael)N
-1056(A.)X
-1159(Olson)X
-1 f
-1383(is)X
-1461(a)X
-1522(Master's)X
-1828(student)X
-2084(in)X
-2170(the)X
-2292(Department)X
-2695(of)X
-2786(Electrical)X
-3118(Engineering)X
-3534(and)X
-3674(Computer)X
-4018(Sciences)X
-555 5139(at)N
-645(the)X
-774(University)X
-1143(of)X
-1241(California,)X
-1617(Berkeley.)X
-1978(His)X
-2120(primary)X
-2405(interests)X
-2703(are)X
-2833(database)X
-3141(systems)X
-3425(and)X
-3572(mass)X
-3763(storage)X
-4026(systems.)X
-555 5229(Mike)N
-759(spent)X
-963(two)X
-1118(years)X
-1323(working)X
-1625(for)X
-1754(a)X
-1825(commercial)X
-2239(database)X
-2551(system)X
-2808(vendor)X
-3066(before)X
-3307(joining)X
-3567(the)X
-3699(Postgres)X
-4004(Research)X
-555 5319(Group)N
-780(at)X
-858(Berkeley)X
-1168(in)X
-1250(1988.)X
-1470(He)X
-1584(received)X
-1877(his)X
-1990(B.A.)X
-2161(in)X
-2243(Computer)X
-2583(Science)X
-2853(from)X
-3029(Berkeley)X
-3339(in)X
-3421(May)X
-3588(1991.)X
-755 5442(Mike)N
-945(only)X
-1108(recently)X
-1388(transferred)X
-1758(into)X
-1903(Sin)X
-2030(City,)X
-2208(but)X
-2330(is)X
-2403(rapidly)X
-2650(adopting)X
-2950(local)X
-3126(customs)X
-3408(and)X
-3544(coloration.)X
-3929(In)X
-4016(his)X
-4129(spare)X
-555 5532(time,)N
-742(he)X
-843(organizes)X
-1176(informal)X
-1477(Friday)X
-1711(afternoon)X
-2043(study)X
-2240(groups)X
-2482(to)X
-2568(discuss)X
-2823(recent)X
-3044(technical)X
-3358(and)X
-3498(economic)X
-3834(developments.)X
-555 5622(Among)N
-815(his)X
-928(hobbies)X
-1197(are)X
-1316(Charles)X
-1581(Dickens,)X
-1884(Red)X
-2033(Rock,)X
-2242(and)X
-2378(speaking)X
-2683(Dutch)X
-2899(to)X
-2981(anyone)X
-3233(who)X
-3391(will)X
-3535(permit)X
-3764(it.)X
-
-17 p
-%%Trailer
-xt
-
-xs
-
diff --git a/lib/libc_bsd/db/hash/Makefile.inc b/lib/libc_bsd/db/hash/Makefile.inc
deleted file mode 100644
index fa3035d..0000000
--- a/lib/libc_bsd/db/hash/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 107052 2002-11-18 09:50:57Z ru $
-
-.PATH: ${.CURDIR}/db/hash
-
-SRCS+=	hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \
-	hash_page.c ndbm.c
diff --git a/lib/libc_bsd/db/hash/README b/lib/libc_bsd/db/hash/README
deleted file mode 100644
index c946b5a..0000000
--- a/lib/libc_bsd/db/hash/README
+++ /dev/null
@@ -1,69 +0,0 @@
-#	@(#)README	8.1 (Berkeley) 6/4/93
-# $FreeBSD: releng/10.2/lib/libc/db/hash/README 190498 2009-03-28 07:31:02Z delphij $
-
-This package implements a superset of the hsearch and dbm/ndbm libraries.
-
-Test Programs:
-	All test programs which need key/data pairs expect them entered
-	with key and data on separate lines
-
-	tcreat3.c	
-		Takes 
-			bucketsize (bsize), 
-			fill factor (ffactor), and
-			initial number of elements (nelem).  
-		Creates a hash table named hashtest containing the 
-		keys/data pairs entered from standard in.
-	thash4.c
-		Takes
-			bucketsize (bsize), 
-			fill factor (ffactor), 
-			initial number of elements (nelem)
-			bytes of cache (ncached), and
-			file from which to read data  (fname)
-		Creates a table from the key/data pairs on standard in and
-		then does a read of each key/data in fname
-	tdel.c
-		Takes
-			bucketsize (bsize), and
-			fill factor (ffactor).
-			file from which to read data (fname)
-		Reads each key/data pair from fname and deletes the
-		key from the hash table hashtest
-	tseq.c
-		Reads the key/data pairs in the file hashtest and writes them
-		to standard out.
-	tread2.c
-		Takes
-			butes of cache (ncached).
-		Reads key/data pairs from standard in and looks them up
-		in the file hashtest.
-	tverify.c
-		Reads key/data pairs from standard in, looks them up
-		in the file hashtest, and verifies that the data is
-		correct.
-
-NOTES:
-
-The man page ../man/db.3 explains the interface to the hashing system.
-The file hash.ps is a postscript copy of a paper explaining
-the history, implementation, and performance of the hash package.
-
-"bugs" or idiosyncracies
-
-If you have a lot of overflows, it is possible to run out of overflow
-pages.  Currently, this will cause a message to be printed on stderr.
-Eventually, this will be indicated by a return error code.
-
-If you are using the ndbm interface and exit without flushing or closing the
-file, you may lose updates since the package buffers all writes.  Also,
-the db interface only creates a single database file.  To avoid overwriting
-the user's original file, the suffix ".db" is appended to the file name
-passed to dbm_open.  Additionally, if your code "knows" about the historic
-.dir and .pag files, it will break.  
-
-There is a fundamental difference between this package and the old hsearch.
-Hsearch requires the user to maintain the keys and data in the application's
-allocated memory while hash takes care of all storage management.  The down
-side is that the byte strings passed in the ENTRY structure must be null
-terminated (both the keys and the data).
diff --git a/lib/libc_bsd/db/hash/extern.h b/lib/libc_bsd/db/hash/extern.h
deleted file mode 100644
index 33bd882..0000000
--- a/lib/libc_bsd/db/hash/extern.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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.
- * 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.
- *
- *	@(#)extern.h	8.4 (Berkeley) 6/16/94
- * $FreeBSD: releng/10.2/lib/libc/db/hash/extern.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-BUFHEAD	*__add_ovflpage(HTAB *, BUFHEAD *);
-int	 __addel(HTAB *, BUFHEAD *, const DBT *, const DBT *);
-int	 __big_delete(HTAB *, BUFHEAD *);
-int	 __big_insert(HTAB *, BUFHEAD *, const DBT *, const DBT *);
-int	 __big_keydata(HTAB *, BUFHEAD *, DBT *, DBT *, int);
-int	 __big_return(HTAB *, BUFHEAD *, int, DBT *, int);
-int	 __big_split(HTAB *, BUFHEAD *, BUFHEAD *, BUFHEAD *,
-		int, uint32_t, SPLIT_RETURN *);
-int	 __buf_free(HTAB *, int, int);
-void	 __buf_init(HTAB *, int);
-uint32_t	 __call_hash(HTAB *, char *, int);
-int	 __delpair(HTAB *, BUFHEAD *, int);
-int	 __expand_table(HTAB *);
-int	 __find_bigpair(HTAB *, BUFHEAD *, int, char *, int);
-u_int16_t	 __find_last_page(HTAB *, BUFHEAD **);
-void	 __free_ovflpage(HTAB *, BUFHEAD *);
-BUFHEAD	*__get_buf(HTAB *, uint32_t, BUFHEAD *, int);
-int	 __get_page(HTAB *, char *, uint32_t, int, int, int);
-int	 __ibitmap(HTAB *, int, int, int);
-uint32_t	 __log2(uint32_t);
-int	 __put_page(HTAB *, char *, uint32_t, int, int);
-void	 __reclaim_buf(HTAB *, BUFHEAD *);
-int	 __split_page(HTAB *, uint32_t, uint32_t);
-
-/* Default hash routine. */
-extern uint32_t (*__default_hash)(const void *, size_t);
-
-#ifdef HASH_STATISTICS
-extern int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
-#endif
diff --git a/lib/libc_bsd/db/hash/hash.c b/lib/libc_bsd/db/hash/hash.c
deleted file mode 100644
index 8de411a..0000000
--- a/lib/libc_bsd/db/hash/hash.c
+++ /dev/null
@@ -1,964 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash.c	8.9 (Berkeley) 6/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/hash/hash.c 254222 2013-08-11 15:38:48Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef DEBUG
-#include <assert.h>
-#endif
-#include "un-namespace.h"
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static int   alloc_segs(HTAB *, int);
-static int   flush_meta(HTAB *);
-static int   hash_access(HTAB *, ACTION, DBT *, DBT *);
-static int   hash_close(DB *);
-static int   hash_delete(const DB *, const DBT *, uint32_t);
-static int   hash_fd(const DB *);
-static int   hash_get(const DB *, const DBT *, DBT *, uint32_t);
-static int   hash_put(const DB *, DBT *, const DBT *, uint32_t);
-static void *hash_realloc(SEGMENT **, int, int);
-static int   hash_seq(const DB *, DBT *, DBT *, uint32_t);
-static int   hash_sync(const DB *, uint32_t);
-static int   hdestroy(HTAB *);
-static HTAB *init_hash(HTAB *, const char *, const HASHINFO *);
-static int   init_htab(HTAB *, int);
-#if BYTE_ORDER == LITTLE_ENDIAN
-static void  swap_header(HTAB *);
-static void  swap_header_copy(HASHHDR *, HASHHDR *);
-#endif
-
-/* Fast arithmetic, relying on powers of 2, */
-#define MOD(x, y)		((x) & ((y) - 1))
-
-#define RETURN_ERROR(ERR, LOC)	{ save_errno = ERR; goto LOC; }
-
-/* Return values */
-#define	SUCCESS	 (0)
-#define	ERROR	(-1)
-#define	ABNORMAL (1)
-
-#ifdef HASH_STATISTICS
-int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
-#endif
-
-/************************** INTERFACE ROUTINES ***************************/
-/* OPEN/CLOSE */
-
-/* ARGSUSED */
-DB *
-__hash_open(const char *file, int flags, int mode,
-    const HASHINFO *info,	/* Special directives for create */
-    int dflags)
-{
-	HTAB *hashp;
-	struct stat statbuf;
-	DB *dbp;
-	int bpages, hdrsize, new_table, nsegs, save_errno;
-
-	if ((flags & O_ACCMODE) == O_WRONLY) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (!(hashp = (HTAB *)calloc(1, sizeof(HTAB))))
-		return (NULL);
-	hashp->fp = -1;
-
-	/*
-	 * Even if user wants write only, we need to be able to read
-	 * the actual file, so we need to open it read/write. But, the
-	 * field in the hashp structure needs to be accurate so that
-	 * we can check accesses.
-	 */
-	hashp->flags = flags;
-
-	if (file) {
-		if ((hashp->fp = _open(file, flags | O_CLOEXEC, mode)) == -1)
-			RETURN_ERROR(errno, error0);
-		new_table = _fstat(hashp->fp, &statbuf) == 0 &&
-		    statbuf.st_size == 0 && (flags & O_ACCMODE) != O_RDONLY;
-	} else
-		new_table = 1;
-
-	if (new_table) {
-		if (!(hashp = init_hash(hashp, file, info)))
-			RETURN_ERROR(errno, error1);
-	} else {
-		/* Table already exists */
-		if (info && info->hash)
-			hashp->hash = info->hash;
-		else
-			hashp->hash = __default_hash;
-
-		hdrsize = _read(hashp->fp, &hashp->hdr, sizeof(HASHHDR));
-#if BYTE_ORDER == LITTLE_ENDIAN
-		swap_header(hashp);
-#endif
-		if (hdrsize == -1)
-			RETURN_ERROR(errno, error1);
-		if (hdrsize != sizeof(HASHHDR))
-			RETURN_ERROR(EFTYPE, error1);
-		/* Verify file type, versions and hash function */
-		if (hashp->MAGIC != HASHMAGIC)
-			RETURN_ERROR(EFTYPE, error1);
-#define	OLDHASHVERSION	1
-		if (hashp->VERSION != HASHVERSION &&
-		    hashp->VERSION != OLDHASHVERSION)
-			RETURN_ERROR(EFTYPE, error1);
-		if ((int32_t)hashp->hash(CHARKEY, sizeof(CHARKEY)) != hashp->H_CHARKEY)
-			RETURN_ERROR(EFTYPE, error1);
-		/*
-		 * Figure out how many segments we need.  Max_Bucket is the
-		 * maximum bucket number, so the number of buckets is
-		 * max_bucket + 1.
-		 */
-		nsegs = (hashp->MAX_BUCKET + 1 + hashp->SGSIZE - 1) /
-			 hashp->SGSIZE;
-		if (alloc_segs(hashp, nsegs))
-			/*
-			 * If alloc_segs fails, table will have been destroyed
-			 * and errno will have been set.
-			 */
-			return (NULL);
-		/* Read in bitmaps */
-		bpages = (hashp->SPARES[hashp->OVFL_POINT] +
-		    (hashp->BSIZE << BYTE_SHIFT) - 1) >>
-		    (hashp->BSHIFT + BYTE_SHIFT);
-
-		hashp->nmaps = bpages;
-		(void)memset(&hashp->mapp[0], 0, bpages * sizeof(uint32_t *));
-	}
-
-	/* Initialize Buffer Manager */
-	if (info && info->cachesize)
-		__buf_init(hashp, info->cachesize);
-	else
-		__buf_init(hashp, DEF_BUFSIZE);
-
-	hashp->new_file = new_table;
-	hashp->save_file = file && (hashp->flags & O_RDWR);
-	hashp->cbucket = -1;
-	if (!(dbp = (DB *)malloc(sizeof(DB)))) {
-		save_errno = errno;
-		hdestroy(hashp);
-		errno = save_errno;
-		return (NULL);
-	}
-	dbp->internal = hashp;
-	dbp->close = hash_close;
-	dbp->del = hash_delete;
-	dbp->fd = hash_fd;
-	dbp->get = hash_get;
-	dbp->put = hash_put;
-	dbp->seq = hash_seq;
-	dbp->sync = hash_sync;
-	dbp->type = DB_HASH;
-
-#ifdef DEBUG
-	(void)fprintf(stderr,
-"%s\n%s%p\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%x\n%s%x\n%s%d\n%s%d\n",
-	    "init_htab:",
-	    "TABLE POINTER   ", hashp,
-	    "BUCKET SIZE     ", hashp->BSIZE,
-	    "BUCKET SHIFT    ", hashp->BSHIFT,
-	    "DIRECTORY SIZE  ", hashp->DSIZE,
-	    "SEGMENT SIZE    ", hashp->SGSIZE,
-	    "SEGMENT SHIFT   ", hashp->SSHIFT,
-	    "FILL FACTOR     ", hashp->FFACTOR,
-	    "MAX BUCKET      ", hashp->MAX_BUCKET,
-	    "OVFL POINT	     ", hashp->OVFL_POINT,
-	    "LAST FREED      ", hashp->LAST_FREED,
-	    "HIGH MASK       ", hashp->HIGH_MASK,
-	    "LOW  MASK       ", hashp->LOW_MASK,
-	    "NSEGS           ", hashp->nsegs,
-	    "NKEYS           ", hashp->NKEYS);
-#endif
-#ifdef HASH_STATISTICS
-	hash_overflows = hash_accesses = hash_collisions = hash_expansions = 0;
-#endif
-	return (dbp);
-
-error1:
-	if (hashp != NULL)
-		(void)_close(hashp->fp);
-
-error0:
-	free(hashp);
-	errno = save_errno;
-	return (NULL);
-}
-
-static int
-hash_close(DB *dbp)
-{
-	HTAB *hashp;
-	int retval;
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = (HTAB *)dbp->internal;
-	retval = hdestroy(hashp);
-	free(dbp);
-	return (retval);
-}
-
-static int
-hash_fd(const DB *dbp)
-{
-	HTAB *hashp;
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = (HTAB *)dbp->internal;
-	if (hashp->fp == -1) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (hashp->fp);
-}
-
-/************************** LOCAL CREATION ROUTINES **********************/
-static HTAB *
-init_hash(HTAB *hashp, const char *file, const HASHINFO *info)
-{
-	struct stat statbuf;
-	int nelem;
-
-	nelem = 1;
-	hashp->NKEYS = 0;
-	hashp->LORDER = BYTE_ORDER;
-	hashp->BSIZE = DEF_BUCKET_SIZE;
-	hashp->BSHIFT = DEF_BUCKET_SHIFT;
-	hashp->SGSIZE = DEF_SEGSIZE;
-	hashp->SSHIFT = DEF_SEGSIZE_SHIFT;
-	hashp->DSIZE = DEF_DIRSIZE;
-	hashp->FFACTOR = DEF_FFACTOR;
-	hashp->hash = __default_hash;
-	memset(hashp->SPARES, 0, sizeof(hashp->SPARES));
-	memset(hashp->BITMAPS, 0, sizeof (hashp->BITMAPS));
-
-	/* Fix bucket size to be optimal for file system */
-	if (file != NULL) {
-		if (stat(file, &statbuf))
-			return (NULL);
-		hashp->BSIZE = statbuf.st_blksize;
-		if (hashp->BSIZE > MAX_BSIZE)
-			hashp->BSIZE = MAX_BSIZE;
-		hashp->BSHIFT = __log2(hashp->BSIZE);
-	}
-
-	if (info) {
-		if (info->bsize) {
-			/* Round pagesize up to power of 2 */
-			hashp->BSHIFT = __log2(info->bsize);
-			hashp->BSIZE = 1 << hashp->BSHIFT;
-			if (hashp->BSIZE > MAX_BSIZE) {
-				errno = EINVAL;
-				return (NULL);
-			}
-		}
-		if (info->ffactor)
-			hashp->FFACTOR = info->ffactor;
-		if (info->hash)
-			hashp->hash = info->hash;
-		if (info->nelem)
-			nelem = info->nelem;
-		if (info->lorder) {
-			if (info->lorder != BIG_ENDIAN &&
-			    info->lorder != LITTLE_ENDIAN) {
-				errno = EINVAL;
-				return (NULL);
-			}
-			hashp->LORDER = info->lorder;
-		}
-	}
-	/* init_htab should destroy the table and set errno if it fails */
-	if (init_htab(hashp, nelem))
-		return (NULL);
-	else
-		return (hashp);
-}
-/*
- * This calls alloc_segs which may run out of memory.  Alloc_segs will destroy
- * the table and set errno, so we just pass the error information along.
- *
- * Returns 0 on No Error
- */
-static int
-init_htab(HTAB *hashp, int nelem)
-{
-	int nbuckets, nsegs, l2;
-
-	/*
-	 * Divide number of elements by the fill factor and determine a
-	 * desired number of buckets.  Allocate space for the next greater
-	 * power of two number of buckets.
-	 */
-	nelem = (nelem - 1) / hashp->FFACTOR + 1;
-
-	l2 = __log2(MAX(nelem, 2));
-	nbuckets = 1 << l2;
-
-	hashp->SPARES[l2] = l2 + 1;
-	hashp->SPARES[l2 + 1] = l2 + 1;
-	hashp->OVFL_POINT = l2;
-	hashp->LAST_FREED = 2;
-
-	/* First bitmap page is at: splitpoint l2 page offset 1 */
-	if (__ibitmap(hashp, OADDR_OF(l2, 1), l2 + 1, 0))
-		return (-1);
-
-	hashp->MAX_BUCKET = hashp->LOW_MASK = nbuckets - 1;
-	hashp->HIGH_MASK = (nbuckets << 1) - 1;
-	hashp->HDRPAGES = ((MAX(sizeof(HASHHDR), MINHDRSIZE) - 1) >>
-	    hashp->BSHIFT) + 1;
-
-	nsegs = (nbuckets - 1) / hashp->SGSIZE + 1;
-	nsegs = 1 << __log2(nsegs);
-
-	if (nsegs > hashp->DSIZE)
-		hashp->DSIZE = nsegs;
-	return (alloc_segs(hashp, nsegs));
-}
-
-/********************** DESTROY/CLOSE ROUTINES ************************/
-
-/*
- * Flushes any changes to the file if necessary and destroys the hashp
- * structure, freeing all allocated space.
- */
-static int
-hdestroy(HTAB *hashp)
-{
-	int i, save_errno;
-
-	save_errno = 0;
-
-#ifdef HASH_STATISTICS
-	(void)fprintf(stderr, "hdestroy: accesses %ld collisions %ld\n",
-	    hash_accesses, hash_collisions);
-	(void)fprintf(stderr, "hdestroy: expansions %ld\n",
-	    hash_expansions);
-	(void)fprintf(stderr, "hdestroy: overflows %ld\n",
-	    hash_overflows);
-	(void)fprintf(stderr, "keys %ld maxp %d segmentcount %d\n",
-	    hashp->NKEYS, hashp->MAX_BUCKET, hashp->nsegs);
-
-	for (i = 0; i < NCACHED; i++)
-		(void)fprintf(stderr,
-		    "spares[%d] = %d\n", i, hashp->SPARES[i]);
-#endif
-	/*
-	 * Call on buffer manager to free buffers, and if required,
-	 * write them to disk.
-	 */
-	if (__buf_free(hashp, 1, hashp->save_file))
-		save_errno = errno;
-	if (hashp->dir) {
-		free(*hashp->dir);	/* Free initial segments */
-		/* Free extra segments */
-		while (hashp->exsegs--)
-			free(hashp->dir[--hashp->nsegs]);
-		free(hashp->dir);
-	}
-	if (flush_meta(hashp) && !save_errno)
-		save_errno = errno;
-	/* Free Bigmaps */
-	for (i = 0; i < hashp->nmaps; i++)
-		if (hashp->mapp[i])
-			free(hashp->mapp[i]);
-	if (hashp->tmp_key)
-		free(hashp->tmp_key);
-	if (hashp->tmp_buf)
-		free(hashp->tmp_buf);
-
-	if (hashp->fp != -1)
-		(void)_close(hashp->fp);
-
-	free(hashp);
-
-	if (save_errno) {
-		errno = save_errno;
-		return (ERROR);
-	}
-	return (SUCCESS);
-}
-/*
- * Write modified pages to disk
- *
- * Returns:
- *	 0 == OK
- *	-1 ERROR
- */
-static int
-hash_sync(const DB *dbp, uint32_t flags)
-{
-	HTAB *hashp;
-
-	if (flags != 0) {
-		errno = EINVAL;
-		return (ERROR);
-	}
-
-	if (!dbp)
-		return (ERROR);
-
-	hashp = (HTAB *)dbp->internal;
-	if (!hashp->save_file)
-		return (0);
-	if (__buf_free(hashp, 0, 1) || flush_meta(hashp))
-		return (ERROR);
-	hashp->new_file = 0;
-	return (0);
-}
-
-/*
- * Returns:
- *	 0 == OK
- *	-1 indicates that errno should be set
- */
-static int
-flush_meta(HTAB *hashp)
-{
-	HASHHDR *whdrp;
-#if BYTE_ORDER == LITTLE_ENDIAN
-	HASHHDR whdr;
-#endif
-	int fp, i, wsize;
-
-	if (!hashp->save_file)
-		return (0);
-	hashp->MAGIC = HASHMAGIC;
-	hashp->VERSION = HASHVERSION;
-	hashp->H_CHARKEY = hashp->hash(CHARKEY, sizeof(CHARKEY));
-
-	fp = hashp->fp;
-	whdrp = &hashp->hdr;
-#if BYTE_ORDER == LITTLE_ENDIAN
-	whdrp = &whdr;
-	swap_header_copy(&hashp->hdr, whdrp);
-#endif
-	if ((wsize = pwrite(fp, whdrp, sizeof(HASHHDR), (off_t)0)) == -1)
-		return (-1);
-	else
-		if (wsize != sizeof(HASHHDR)) {
-			errno = EFTYPE;
-			hashp->error = errno;
-			return (-1);
-		}
-	for (i = 0; i < NCACHED; i++)
-		if (hashp->mapp[i])
-			if (__put_page(hashp, (char *)hashp->mapp[i],
-				hashp->BITMAPS[i], 0, 1))
-				return (-1);
-	return (0);
-}
-
-/*******************************SEARCH ROUTINES *****************************/
-/*
- * All the access routines return
- *
- * Returns:
- *	 0 on SUCCESS
- *	 1 to indicate an external ERROR (i.e. key not found, etc)
- *	-1 to indicate an internal ERROR (i.e. out of memory, etc)
- */
-static int
-hash_get(const DB *dbp, const DBT *key, DBT *data, uint32_t flag)
-{
-	HTAB *hashp;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-	return (hash_access(hashp, HASH_GET, (DBT *)key, data));
-}
-
-static int
-hash_put(const DB *dbp, DBT *key, const DBT *data, uint32_t flag)
-{
-	HTAB *hashp;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag && flag != R_NOOVERWRITE) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-		hashp->error = errno = EPERM;
-		return (ERROR);
-	}
-	return (hash_access(hashp, flag == R_NOOVERWRITE ?
-	    HASH_PUTNEW : HASH_PUT, (DBT *)key, (DBT *)data));
-}
-
-static int
-hash_delete(const DB *dbp, const DBT *key,
-    uint32_t flag)		/* Ignored */
-{
-	HTAB *hashp;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag && flag != R_CURSOR) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-	if ((hashp->flags & O_ACCMODE) == O_RDONLY) {
-		hashp->error = errno = EPERM;
-		return (ERROR);
-	}
-	return (hash_access(hashp, HASH_DELETE, (DBT *)key, NULL));
-}
-
-/*
- * Assume that hashp has been set in wrapper routine.
- */
-static int
-hash_access(HTAB *hashp, ACTION action, DBT *key, DBT *val)
-{
-	BUFHEAD *rbufp;
-	BUFHEAD *bufp, *save_bufp;
-	u_int16_t *bp;
-	int n, ndx, off, size;
-	char *kp;
-	u_int16_t pageno;
-
-#ifdef HASH_STATISTICS
-	hash_accesses++;
-#endif
-
-	off = hashp->BSIZE;
-	size = key->size;
-	kp = (char *)key->data;
-	rbufp = __get_buf(hashp, __call_hash(hashp, kp, size), NULL, 0);
-	if (!rbufp)
-		return (ERROR);
-	save_bufp = rbufp;
-
-	/* Pin the bucket chain */
-	rbufp->flags |= BUF_PIN;
-	for (bp = (u_int16_t *)rbufp->page, n = *bp++, ndx = 1; ndx < n;)
-		if (bp[1] >= REAL_KEY) {
-			/* Real key/data pair */
-			if (size == off - *bp &&
-			    memcmp(kp, rbufp->page + *bp, size) == 0)
-				goto found;
-			off = bp[1];
-#ifdef HASH_STATISTICS
-			hash_collisions++;
-#endif
-			bp += 2;
-			ndx += 2;
-		} else if (bp[1] == OVFLPAGE) {
-			rbufp = __get_buf(hashp, *bp, rbufp, 0);
-			if (!rbufp) {
-				save_bufp->flags &= ~BUF_PIN;
-				return (ERROR);
-			}
-			/* FOR LOOP INIT */
-			bp = (u_int16_t *)rbufp->page;
-			n = *bp++;
-			ndx = 1;
-			off = hashp->BSIZE;
-		} else if (bp[1] < REAL_KEY) {
-			if ((ndx =
-			    __find_bigpair(hashp, rbufp, ndx, kp, size)) > 0)
-				goto found;
-			if (ndx == -2) {
-				bufp = rbufp;
-				if (!(pageno =
-				    __find_last_page(hashp, &bufp))) {
-					ndx = 0;
-					rbufp = bufp;
-					break;	/* FOR */
-				}
-				rbufp = __get_buf(hashp, pageno, bufp, 0);
-				if (!rbufp) {
-					save_bufp->flags &= ~BUF_PIN;
-					return (ERROR);
-				}
-				/* FOR LOOP INIT */
-				bp = (u_int16_t *)rbufp->page;
-				n = *bp++;
-				ndx = 1;
-				off = hashp->BSIZE;
-			} else {
-				save_bufp->flags &= ~BUF_PIN;
-				return (ERROR);
-			}
-		}
-
-	/* Not found */
-	switch (action) {
-	case HASH_PUT:
-	case HASH_PUTNEW:
-		if (__addel(hashp, rbufp, key, val)) {
-			save_bufp->flags &= ~BUF_PIN;
-			return (ERROR);
-		} else {
-			save_bufp->flags &= ~BUF_PIN;
-			return (SUCCESS);
-		}
-	case HASH_GET:
-	case HASH_DELETE:
-	default:
-		save_bufp->flags &= ~BUF_PIN;
-		return (ABNORMAL);
-	}
-
-found:
-	switch (action) {
-	case HASH_PUTNEW:
-		save_bufp->flags &= ~BUF_PIN;
-		return (ABNORMAL);
-	case HASH_GET:
-		bp = (u_int16_t *)rbufp->page;
-		if (bp[ndx + 1] < REAL_KEY) {
-			if (__big_return(hashp, rbufp, ndx, val, 0))
-				return (ERROR);
-		} else {
-			val->data = (u_char *)rbufp->page + (int)bp[ndx + 1];
-			val->size = bp[ndx] - bp[ndx + 1];
-		}
-		break;
-	case HASH_PUT:
-		if ((__delpair(hashp, rbufp, ndx)) ||
-		    (__addel(hashp, rbufp, key, val))) {
-			save_bufp->flags &= ~BUF_PIN;
-			return (ERROR);
-		}
-		break;
-	case HASH_DELETE:
-		if (__delpair(hashp, rbufp, ndx))
-			return (ERROR);
-		break;
-	default:
-		abort();
-	}
-	save_bufp->flags &= ~BUF_PIN;
-	return (SUCCESS);
-}
-
-static int
-hash_seq(const DB *dbp, DBT *key, DBT *data, uint32_t flag)
-{
-	uint32_t bucket;
-	BUFHEAD *bufp;
-	HTAB *hashp;
-	u_int16_t *bp, ndx;
-
-	hashp = (HTAB *)dbp->internal;
-	if (flag && flag != R_FIRST && flag != R_NEXT) {
-		hashp->error = errno = EINVAL;
-		return (ERROR);
-	}
-#ifdef HASH_STATISTICS
-	hash_accesses++;
-#endif
-	if ((hashp->cbucket < 0) || (flag == R_FIRST)) {
-		hashp->cbucket = 0;
-		hashp->cndx = 1;
-		hashp->cpage = NULL;
-	}
-next_bucket:
-	for (bp = NULL; !bp || !bp[0]; ) {
-		if (!(bufp = hashp->cpage)) {
-			for (bucket = hashp->cbucket;
-			    bucket <= hashp->MAX_BUCKET;
-			    bucket++, hashp->cndx = 1) {
-				bufp = __get_buf(hashp, bucket, NULL, 0);
-				if (!bufp)
-					return (ERROR);
-				hashp->cpage = bufp;
-				bp = (u_int16_t *)bufp->page;
-				if (bp[0])
-					break;
-			}
-			hashp->cbucket = bucket;
-			if ((uint32_t)hashp->cbucket > hashp->MAX_BUCKET) {
-				hashp->cbucket = -1;
-				return (ABNORMAL);
-			}
-		} else {
-			bp = (u_int16_t *)hashp->cpage->page;
-			if (flag == R_NEXT || flag == 0) {
-				hashp->cndx += 2;
-				if (hashp->cndx > bp[0]) {
-					hashp->cpage = NULL;
-					hashp->cbucket++;
-					hashp->cndx = 1;
-					goto next_bucket;
-				}
-			}
-		}
-
-#ifdef DEBUG
-		assert(bp);
-		assert(bufp);
-#endif
-		while (bp[hashp->cndx + 1] == OVFLPAGE) {
-			bufp = hashp->cpage =
-			    __get_buf(hashp, bp[hashp->cndx], bufp, 0);
-			if (!bufp)
-				return (ERROR);
-			bp = (u_int16_t *)(bufp->page);
-			hashp->cndx = 1;
-		}
-		if (!bp[0]) {
-			hashp->cpage = NULL;
-			++hashp->cbucket;
-		}
-	}
-	ndx = hashp->cndx;
-	if (bp[ndx + 1] < REAL_KEY) {
-		if (__big_keydata(hashp, bufp, key, data, 1))
-			return (ERROR);
-	} else {
-		if (hashp->cpage == 0)
-			return (ERROR);
-		key->data = (u_char *)hashp->cpage->page + bp[ndx];
-		key->size = (ndx > 1 ? bp[ndx - 1] : hashp->BSIZE) - bp[ndx];
-		data->data = (u_char *)hashp->cpage->page + bp[ndx + 1];
-		data->size = bp[ndx] - bp[ndx + 1];
-	}
-	return (SUCCESS);
-}
-
-/********************************* UTILITIES ************************/
-
-/*
- * Returns:
- *	 0 ==> OK
- *	-1 ==> Error
- */
-int
-__expand_table(HTAB *hashp)
-{
-	uint32_t old_bucket, new_bucket;
-	int dirsize, new_segnum, spare_ndx;
-
-#ifdef HASH_STATISTICS
-	hash_expansions++;
-#endif
-	new_bucket = ++hashp->MAX_BUCKET;
-	old_bucket = (hashp->MAX_BUCKET & hashp->LOW_MASK);
-
-	new_segnum = new_bucket >> hashp->SSHIFT;
-
-	/* Check if we need a new segment */
-	if (new_segnum >= hashp->nsegs) {
-		/* Check if we need to expand directory */
-		if (new_segnum >= hashp->DSIZE) {
-			/* Reallocate directory */
-			dirsize = hashp->DSIZE * sizeof(SEGMENT *);
-			if (!hash_realloc(&hashp->dir, dirsize, dirsize << 1))
-				return (-1);
-			hashp->DSIZE = dirsize << 1;
-		}
-		if ((hashp->dir[new_segnum] =
-		    (SEGMENT)calloc(hashp->SGSIZE, sizeof(SEGMENT))) == NULL)
-			return (-1);
-		hashp->exsegs++;
-		hashp->nsegs++;
-	}
-	/*
-	 * If the split point is increasing (MAX_BUCKET's log base 2
-	 * * increases), we need to copy the current contents of the spare
-	 * split bucket to the next bucket.
-	 */
-	spare_ndx = __log2(hashp->MAX_BUCKET + 1);
-	if (spare_ndx > hashp->OVFL_POINT) {
-		hashp->SPARES[spare_ndx] = hashp->SPARES[hashp->OVFL_POINT];
-		hashp->OVFL_POINT = spare_ndx;
-	}
-
-	if (new_bucket > hashp->HIGH_MASK) {
-		/* Starting a new doubling */
-		hashp->LOW_MASK = hashp->HIGH_MASK;
-		hashp->HIGH_MASK = new_bucket | hashp->LOW_MASK;
-	}
-	/* Relocate records to the new bucket */
-	return (__split_page(hashp, old_bucket, new_bucket));
-}
-
-/*
- * If realloc guarantees that the pointer is not destroyed if the realloc
- * fails, then this routine can go away.
- */
-static void *
-hash_realloc(SEGMENT **p_ptr, int oldsize, int newsize)
-{
-	void *p;
-
-	if ( (p = malloc(newsize)) ) {
-		memmove(p, *p_ptr, oldsize);
-		memset((char *)p + oldsize, 0, newsize - oldsize);
-		free(*p_ptr);
-		*p_ptr = p;
-	}
-	return (p);
-}
-
-uint32_t
-__call_hash(HTAB *hashp, char *k, int len)
-{
-	unsigned int n, bucket;
-
-	n = hashp->hash(k, len);
-	bucket = n & hashp->HIGH_MASK;
-	if (bucket > hashp->MAX_BUCKET)
-		bucket = bucket & hashp->LOW_MASK;
-	return (bucket);
-}
-
-/*
- * Allocate segment table.  On error, destroy the table and set errno.
- *
- * Returns 0 on success
- */
-static int
-alloc_segs(HTAB *hashp, int nsegs)
-{
-	int i;
-	SEGMENT store;
-
-	int save_errno;
-
-	if ((hashp->dir =
-	    (SEGMENT *)calloc(hashp->DSIZE, sizeof(SEGMENT *))) == NULL) {
-		save_errno = errno;
-		(void)hdestroy(hashp);
-		errno = save_errno;
-		return (-1);
-	}
-	hashp->nsegs = nsegs;
-	if (nsegs == 0)
-		return (0);
-	/* Allocate segments */
-	if ((store = (SEGMENT)calloc(nsegs << hashp->SSHIFT,
-	    sizeof(SEGMENT))) == NULL) {
-		save_errno = errno;
-		(void)hdestroy(hashp);
-		errno = save_errno;
-		return (-1);
-	}
-	for (i = 0; i < nsegs; i++)
-		hashp->dir[i] = &store[i << hashp->SSHIFT];
-	return (0);
-}
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-/*
- * Hashp->hdr needs to be byteswapped.
- */
-static void
-swap_header_copy(HASHHDR *srcp, HASHHDR *destp)
-{
-	int i;
-
-	P_32_COPY(srcp->magic, destp->magic);
-	P_32_COPY(srcp->version, destp->version);
-	P_32_COPY(srcp->lorder, destp->lorder);
-	P_32_COPY(srcp->bsize, destp->bsize);
-	P_32_COPY(srcp->bshift, destp->bshift);
-	P_32_COPY(srcp->dsize, destp->dsize);
-	P_32_COPY(srcp->ssize, destp->ssize);
-	P_32_COPY(srcp->sshift, destp->sshift);
-	P_32_COPY(srcp->ovfl_point, destp->ovfl_point);
-	P_32_COPY(srcp->last_freed, destp->last_freed);
-	P_32_COPY(srcp->max_bucket, destp->max_bucket);
-	P_32_COPY(srcp->high_mask, destp->high_mask);
-	P_32_COPY(srcp->low_mask, destp->low_mask);
-	P_32_COPY(srcp->ffactor, destp->ffactor);
-	P_32_COPY(srcp->nkeys, destp->nkeys);
-	P_32_COPY(srcp->hdrpages, destp->hdrpages);
-	P_32_COPY(srcp->h_charkey, destp->h_charkey);
-	for (i = 0; i < NCACHED; i++) {
-		P_32_COPY(srcp->spares[i], destp->spares[i]);
-		P_16_COPY(srcp->bitmaps[i], destp->bitmaps[i]);
-	}
-}
-
-static void
-swap_header(HTAB *hashp)
-{
-	HASHHDR *hdrp;
-	int i;
-
-	hdrp = &hashp->hdr;
-
-	M_32_SWAP(hdrp->magic);
-	M_32_SWAP(hdrp->version);
-	M_32_SWAP(hdrp->lorder);
-	M_32_SWAP(hdrp->bsize);
-	M_32_SWAP(hdrp->bshift);
-	M_32_SWAP(hdrp->dsize);
-	M_32_SWAP(hdrp->ssize);
-	M_32_SWAP(hdrp->sshift);
-	M_32_SWAP(hdrp->ovfl_point);
-	M_32_SWAP(hdrp->last_freed);
-	M_32_SWAP(hdrp->max_bucket);
-	M_32_SWAP(hdrp->high_mask);
-	M_32_SWAP(hdrp->low_mask);
-	M_32_SWAP(hdrp->ffactor);
-	M_32_SWAP(hdrp->nkeys);
-	M_32_SWAP(hdrp->hdrpages);
-	M_32_SWAP(hdrp->h_charkey);
-	for (i = 0; i < NCACHED; i++) {
-		M_32_SWAP(hdrp->spares[i]);
-		M_16_SWAP(hdrp->bitmaps[i]);
-	}
-}
-#endif
diff --git a/lib/libc_bsd/db/hash/hash.h b/lib/libc_bsd/db/hash/hash.h
deleted file mode 100644
index ea5336e..0000000
--- a/lib/libc_bsd/db/hash/hash.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- *
- *	@(#)hash.h	8.3 (Berkeley) 5/31/94
- * $FreeBSD: releng/10.2/lib/libc/db/hash/hash.h 206178 2010-04-05 10:12:21Z avg $
- */
-
-/* Operations */
-typedef enum {
-	HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT
-} ACTION;
-
-/* Buffer Management structures */
-typedef struct _bufhead BUFHEAD;
-
-struct _bufhead {
-	BUFHEAD		*prev;		/* LRU links */
-	BUFHEAD		*next;		/* LRU links */
-	BUFHEAD		*ovfl;		/* Overflow page buffer header */
-	uint32_t	 addr;		/* Address of this page */
-	char		*page;		/* Actual page data */
-	char	 	flags;
-#define	BUF_MOD		0x0001
-#define BUF_DISK	0x0002
-#define	BUF_BUCKET	0x0004
-#define	BUF_PIN		0x0008
-};
-
-#define IS_BUCKET(X)	((X) & BUF_BUCKET)
-
-typedef BUFHEAD **SEGMENT;
-
-/* Hash Table Information */
-typedef struct hashhdr {		/* Disk resident portion */
-	int32_t		magic;		/* Magic NO for hash tables */
-	int32_t		version;	/* Version ID */
-	uint32_t	lorder;		/* Byte Order */
-	int32_t		bsize;		/* Bucket/Page Size */
-	int32_t		bshift;		/* Bucket shift */
-	int32_t		dsize;		/* Directory Size */
-	int32_t		ssize;		/* Segment Size */
-	int32_t		sshift;		/* Segment shift */
-	int32_t		ovfl_point;	/* Where overflow pages are being 
-					 * allocated */
-	int32_t		last_freed;	/* Last overflow page freed */
-	uint32_t	max_bucket;	/* ID of Maximum bucket in use */
-	uint32_t	high_mask;	/* Mask to modulo into entire table */
-	uint32_t	low_mask;	/* Mask to modulo into lower half of 
-					 * table */
-	uint32_t	ffactor;	/* Fill factor */
-	int32_t		nkeys;		/* Number of keys in hash table */
-	int32_t		hdrpages;	/* Size of table header */
-	int32_t		h_charkey;	/* value of hash(CHARKEY) */
-#define NCACHED	32			/* number of bit maps and spare 
-					 * points */
-	int32_t		spares[NCACHED];/* spare pages for overflow */
-	u_int16_t	bitmaps[NCACHED];	/* address of overflow page 
-						 * bitmaps */
-} HASHHDR;
-
-typedef struct htab	 {		/* Memory resident data structure */
-	HASHHDR 	hdr;		/* Header */
-	int		nsegs;		/* Number of allocated segments */
-	int		exsegs;		/* Number of extra allocated 
-					 * segments */
-	uint32_t			/* Hash function */
-	    (*hash)(const void *, size_t);
-	int		flags;		/* Flag values */
-	int		fp;		/* File pointer */
-	char		*tmp_buf;	/* Temporary Buffer for BIG data */
-	char		*tmp_key;	/* Temporary Buffer for BIG keys */
-	BUFHEAD 	*cpage;		/* Current page */
-	int		cbucket;	/* Current bucket */
-	int		cndx;		/* Index of next item on cpage */
-	int		error;		/* Error Number -- for DBM 
-					 * compatibility */
-	int		new_file;	/* Indicates if fd is backing store 
-					 * or no */
-	int		save_file;	/* Indicates whether we need to flush 
-					 * file at
-					 * exit */
-	uint32_t	*mapp[NCACHED];	/* Pointers to page maps */
-	int		nmaps;		/* Initial number of bitmaps */
-	int		nbufs;		/* Number of buffers left to 
-					 * allocate */
-	BUFHEAD 	bufhead;	/* Header of buffer lru list */
-	SEGMENT 	*dir;		/* Hash Bucket directory */
-} HTAB;
-
-/*
- * Constants
- */
-#define	MAX_BSIZE		32768		/* 2^15 but should be 65536 */
-#define MIN_BUFFERS		6
-#define MINHDRSIZE		512
-#define DEF_BUFSIZE		65536		/* 64 K */
-#define DEF_BUCKET_SIZE		4096
-#define DEF_BUCKET_SHIFT	12		/* log2(BUCKET) */
-#define DEF_SEGSIZE		256
-#define DEF_SEGSIZE_SHIFT	8		/* log2(SEGSIZE)	 */
-#define DEF_DIRSIZE		256
-#define DEF_FFACTOR		65536
-#define MIN_FFACTOR		4
-#define SPLTMAX			8
-#define CHARKEY			"%$sniglet^&"
-#define NUMKEY			1038583
-#define BYTE_SHIFT		3
-#define INT_TO_BYTE		2
-#define INT_BYTE_SHIFT		5
-#define ALL_SET			((uint32_t)0xFFFFFFFF)
-#define ALL_CLEAR		0
-
-#define PTROF(X)	((BUFHEAD *)((ptrdiff_t)(X)&~0x3))
-#define ISMOD(X)	((uint32_t)(ptrdiff_t)(X)&0x1)
-#define DOMOD(X)	((X) = (char *)((ptrdiff_t)(X)|0x1))
-#define ISDISK(X)	((uint32_t)(ptrdiff_t)(X)&0x2)
-#define DODISK(X)	((X) = (char *)((ptrdiff_t)(X)|0x2))
-
-#define BITS_PER_MAP	32
-
-/* Given the address of the beginning of a big map, clear/set the nth bit */
-#define CLRBIT(A, N)	((A)[(N)/BITS_PER_MAP] &= ~(1<<((N)%BITS_PER_MAP)))
-#define SETBIT(A, N)	((A)[(N)/BITS_PER_MAP] |= (1<<((N)%BITS_PER_MAP)))
-#define ISSET(A, N)	((A)[(N)/BITS_PER_MAP] & (1<<((N)%BITS_PER_MAP)))
-
-/* Overflow management */
-/*
- * Overflow page numbers are allocated per split point.  At each doubling of
- * the table, we can allocate extra pages.  So, an overflow page number has
- * the top 5 bits indicate which split point and the lower 11 bits indicate
- * which page at that split point is indicated (pages within split points are
- * numberered starting with 1).
- */
-
-#define SPLITSHIFT	11
-#define SPLITMASK	0x7FF
-#define SPLITNUM(N)	(((uint32_t)(N)) >> SPLITSHIFT)
-#define OPAGENUM(N)	((N) & SPLITMASK)
-#define	OADDR_OF(S,O)	((uint32_t)((uint32_t)(S) << SPLITSHIFT) + (O))
-
-#define BUCKET_TO_PAGE(B) \
-	(B) + hashp->HDRPAGES + ((B) ? hashp->SPARES[__log2((B)+1)-1] : 0)
-#define OADDR_TO_PAGE(B) 	\
-	BUCKET_TO_PAGE ( (1 << SPLITNUM((B))) -1 ) + OPAGENUM((B));
-
-/*
- * page.h contains a detailed description of the page format.
- *
- * Normally, keys and data are accessed from offset tables in the top of
- * each page which point to the beginning of the key and data.  There are
- * four flag values which may be stored in these offset tables which indicate
- * the following:
- *
- *
- * OVFLPAGE	Rather than a key data pair, this pair contains
- *		the address of an overflow page.  The format of
- *		the pair is:
- *		    OVERFLOW_PAGE_NUMBER OVFLPAGE
- *
- * PARTIAL_KEY	This must be the first key/data pair on a page
- *		and implies that page contains only a partial key.
- *		That is, the key is too big to fit on a single page
- *		so it starts on this page and continues on the next.
- *		The format of the page is:
- *		    KEY_OFF PARTIAL_KEY OVFL_PAGENO OVFLPAGE
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    PARTIAL_KEY -- 1
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- * FULL_KEY	This must be the first key/data pair on the page.  It
- *		is used in two cases.
- *
- *		Case 1:
- *		    There is a complete key on the page but no data
- *		    (because it wouldn't fit).  The next page contains
- *		    the data.
- *
- *		    Page format it:
- *		    KEY_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    FULL_KEY -- 2
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- *		Case 2:
- *		    This page contains no key, but part of a large
- *		    data field, which is continued on the next page.
- *
- *		    Page format it:
- *		    DATA_OFF FULL_KEY OVFL_PAGENO OVFL_PAGE
- *
- *		    KEY_OFF -- offset of the beginning of the data on
- *				this page
- *		    FULL_KEY -- 2
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- * FULL_KEY_DATA
- *		This must be the first key/data pair on the page.
- *		There are two cases:
- *
- *		Case 1:
- *		    This page contains a key and the beginning of the
- *		    data field, but the data field is continued on the
- *		    next page.
- *
- *		    Page format is:
- *		    KEY_OFF FULL_KEY_DATA OVFL_PAGENO DATA_OFF
- *
- *		    KEY_OFF -- offset of the beginning of the key
- *		    FULL_KEY_DATA -- 3
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    DATA_OFF -- offset of the beginning of the data
- *
- *		Case 2:
- *		    This page contains the last page of a big data pair.
- *		    There is no key, only the  tail end of the data
- *		    on this page.
- *
- *		    Page format is:
- *		    DATA_OFF FULL_KEY_DATA <OVFL_PAGENO> <OVFLPAGE>
- *
- *		    DATA_OFF -- offset of the beginning of the data on
- *				this page
- *		    FULL_KEY_DATA -- 3
- *		    OVFL_PAGENO - page number of the next overflow page
- *		    OVFLPAGE -- 0
- *
- *		    OVFL_PAGENO and OVFLPAGE are optional (they are
- *		    not present if there is no next page).
- */
-
-#define OVFLPAGE	0
-#define PARTIAL_KEY	1
-#define FULL_KEY	2
-#define FULL_KEY_DATA	3
-#define	REAL_KEY	4
-
-/* Short hands for accessing structure */
-#define BSIZE		hdr.bsize
-#define BSHIFT		hdr.bshift
-#define DSIZE		hdr.dsize
-#define SGSIZE		hdr.ssize
-#define SSHIFT		hdr.sshift
-#define LORDER		hdr.lorder
-#define OVFL_POINT	hdr.ovfl_point
-#define	LAST_FREED	hdr.last_freed
-#define MAX_BUCKET	hdr.max_bucket
-#define FFACTOR		hdr.ffactor
-#define HIGH_MASK	hdr.high_mask
-#define LOW_MASK	hdr.low_mask
-#define NKEYS		hdr.nkeys
-#define HDRPAGES	hdr.hdrpages
-#define SPARES		hdr.spares
-#define BITMAPS		hdr.bitmaps
-#define VERSION		hdr.version
-#define MAGIC		hdr.magic
-#define NEXT_FREE	hdr.next_free
-#define H_CHARKEY	hdr.h_charkey
diff --git a/lib/libc_bsd/db/hash/hash_bigkey.c b/lib/libc_bsd/db/hash/hash_bigkey.c
deleted file mode 100644
index 8a58c8b..0000000
--- a/lib/libc_bsd/db/hash/hash_bigkey.c
+++ /dev/null
@@ -1,646 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_bigkey.c	8.3 (Berkeley) 5/31/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/hash/hash_bigkey.c 190494 2009-03-28 06:47:05Z delphij $");
-
-/*
- * PACKAGE: hash
- * DESCRIPTION:
- *	Big key/data handling for the hashing package.
- *
- * ROUTINES:
- * External
- *	__big_keydata
- *	__big_split
- *	__big_insert
- *	__big_return
- *	__big_delete
- *	__find_last_page
- * Internal
- *	collect_key
- *	collect_data
- */
-
-#include <sys/param.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static int collect_key(HTAB *, BUFHEAD *, int, DBT *, int);
-static int collect_data(HTAB *, BUFHEAD *, int, int);
-
-/*
- * Big_insert
- *
- * You need to do an insert and the key/data pair is too big
- *
- * Returns:
- * 0 ==> OK
- *-1 ==> ERROR
- */
-int
-__big_insert(HTAB *hashp, BUFHEAD *bufp, const DBT *key, const DBT *val)
-{
-	u_int16_t *p;
-	int key_size, n;
-	unsigned int val_size;
-	u_int16_t space, move_bytes, off;
-	char *cp, *key_data, *val_data;
-
-	cp = bufp->page;		/* Character pointer of p. */
-	p = (u_int16_t *)cp;
-
-	key_data = (char *)key->data;
-	key_size = key->size;
-	val_data = (char *)val->data;
-	val_size = val->size;
-
-	/* First move the Key */
-	for (space = FREESPACE(p) - BIGOVERHEAD; key_size;
-	    space = FREESPACE(p) - BIGOVERHEAD) {
-		move_bytes = MIN(space, key_size);
-		off = OFFSET(p) - move_bytes;
-		memmove(cp + off, key_data, move_bytes);
-		key_size -= move_bytes;
-		key_data += move_bytes;
-		n = p[0];
-		p[++n] = off;
-		p[0] = ++n;
-		FREESPACE(p) = off - PAGE_META(n);
-		OFFSET(p) = off;
-		p[n] = PARTIAL_KEY;
-		bufp = __add_ovflpage(hashp, bufp);
-		if (!bufp)
-			return (-1);
-		n = p[0];
-		if (!key_size) {
-			space = FREESPACE(p);
-			if (space) {
-				move_bytes = MIN(space, val_size);
-				/*
-				 * If the data would fit exactly in the
-				 * remaining space, we must overflow it to the
-				 * next page; otherwise the invariant that the
-				 * data must end on a page with FREESPACE
-				 * non-zero would fail.
-				 */
-				if (space == val_size && val_size == val->size)
-					goto toolarge;
-				off = OFFSET(p) - move_bytes;
-				memmove(cp + off, val_data, move_bytes);
-				val_data += move_bytes;
-				val_size -= move_bytes;
-				p[n] = off;
-				p[n - 2] = FULL_KEY_DATA;
-				FREESPACE(p) = FREESPACE(p) - move_bytes;
-				OFFSET(p) = off;
-			} else {
-			toolarge:
-				p[n - 2] = FULL_KEY;
-			}
-		}
-		p = (u_int16_t *)bufp->page;
-		cp = bufp->page;
-		bufp->flags |= BUF_MOD;
-	}
-
-	/* Now move the data */
-	for (space = FREESPACE(p) - BIGOVERHEAD; val_size;
-	    space = FREESPACE(p) - BIGOVERHEAD) {
-		move_bytes = MIN(space, val_size);
-		/*
-		 * Here's the hack to make sure that if the data ends on the
-		 * same page as the key ends, FREESPACE is at least one.
-		 */
-		if (space == val_size && val_size == val->size)
-			move_bytes--;
-		off = OFFSET(p) - move_bytes;
-		memmove(cp + off, val_data, move_bytes);
-		val_size -= move_bytes;
-		val_data += move_bytes;
-		n = p[0];
-		p[++n] = off;
-		p[0] = ++n;
-		FREESPACE(p) = off - PAGE_META(n);
-		OFFSET(p) = off;
-		if (val_size) {
-			p[n] = FULL_KEY;
-			bufp = __add_ovflpage(hashp, bufp);
-			if (!bufp)
-				return (-1);
-			cp = bufp->page;
-			p = (u_int16_t *)cp;
-		} else
-			p[n] = FULL_KEY_DATA;
-		bufp->flags |= BUF_MOD;
-	}
-	return (0);
-}
-
-/*
- * Called when bufp's page  contains a partial key (index should be 1)
- *
- * All pages in the big key/data pair except bufp are freed.  We cannot
- * free bufp because the page pointing to it is lost and we can't get rid
- * of its pointer.
- *
- * Returns:
- * 0 => OK
- *-1 => ERROR
- */
-int
-__big_delete(HTAB *hashp, BUFHEAD *bufp)
-{
-	BUFHEAD *last_bfp, *rbufp;
-	u_int16_t *bp, pageno;
-	int key_done, n;
-
-	rbufp = bufp;
-	last_bfp = NULL;
-	bp = (u_int16_t *)bufp->page;
-	pageno = 0;
-	key_done = 0;
-
-	while (!key_done || (bp[2] != FULL_KEY_DATA)) {
-		if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA)
-			key_done = 1;
-
-		/*
-		 * If there is freespace left on a FULL_KEY_DATA page, then
-		 * the data is short and fits entirely on this page, and this
-		 * is the last page.
-		 */
-		if (bp[2] == FULL_KEY_DATA && FREESPACE(bp))
-			break;
-		pageno = bp[bp[0] - 1];
-		rbufp->flags |= BUF_MOD;
-		rbufp = __get_buf(hashp, pageno, rbufp, 0);
-		if (last_bfp)
-			__free_ovflpage(hashp, last_bfp);
-		last_bfp = rbufp;
-		if (!rbufp)
-			return (-1);		/* Error. */
-		bp = (u_int16_t *)rbufp->page;
-	}
-
-	/*
-	 * If we get here then rbufp points to the last page of the big
-	 * key/data pair.  Bufp points to the first one -- it should now be
-	 * empty pointing to the next page after this pair.  Can't free it
-	 * because we don't have the page pointing to it.
-	 */
-
-	/* This is information from the last page of the pair. */
-	n = bp[0];
-	pageno = bp[n - 1];
-
-	/* Now, bp is the first page of the pair. */
-	bp = (u_int16_t *)bufp->page;
-	if (n > 2) {
-		/* There is an overflow page. */
-		bp[1] = pageno;
-		bp[2] = OVFLPAGE;
-		bufp->ovfl = rbufp->ovfl;
-	} else
-		/* This is the last page. */
-		bufp->ovfl = NULL;
-	n -= 2;
-	bp[0] = n;
-	FREESPACE(bp) = hashp->BSIZE - PAGE_META(n);
-	OFFSET(bp) = hashp->BSIZE;
-
-	bufp->flags |= BUF_MOD;
-	if (rbufp)
-		__free_ovflpage(hashp, rbufp);
-	if (last_bfp && last_bfp != rbufp)
-		__free_ovflpage(hashp, last_bfp);
-
-	hashp->NKEYS--;
-	return (0);
-}
-/*
- * Returns:
- *  0 = key not found
- * -1 = get next overflow page
- * -2 means key not found and this is big key/data
- * -3 error
- */
-int
-__find_bigpair(HTAB *hashp, BUFHEAD *bufp, int ndx, char *key, int size)
-{
-	u_int16_t *bp;
-	char *p;
-	int ksize;
-	u_int16_t bytes;
-	char *kkey;
-
-	bp = (u_int16_t *)bufp->page;
-	p = bufp->page;
-	ksize = size;
-	kkey = key;
-
-	for (bytes = hashp->BSIZE - bp[ndx];
-	    bytes <= size && bp[ndx + 1] == PARTIAL_KEY;
-	    bytes = hashp->BSIZE - bp[ndx]) {
-		if (memcmp(p + bp[ndx], kkey, bytes))
-			return (-2);
-		kkey += bytes;
-		ksize -= bytes;
-		bufp = __get_buf(hashp, bp[ndx + 2], bufp, 0);
-		if (!bufp)
-			return (-3);
-		p = bufp->page;
-		bp = (u_int16_t *)p;
-		ndx = 1;
-	}
-
-	if (bytes != ksize || memcmp(p + bp[ndx], kkey, bytes)) {
-#ifdef HASH_STATISTICS
-		++hash_collisions;
-#endif
-		return (-2);
-	} else
-		return (ndx);
-}
-
-/*
- * Given the buffer pointer of the first overflow page of a big pair,
- * find the end of the big pair
- *
- * This will set bpp to the buffer header of the last page of the big pair.
- * It will return the pageno of the overflow page following the last page
- * of the pair; 0 if there isn't any (i.e. big pair is the last key in the
- * bucket)
- */
-u_int16_t
-__find_last_page(HTAB *hashp, BUFHEAD **bpp)
-{
-	BUFHEAD *bufp;
-	u_int16_t *bp, pageno;
-	int n;
-
-	bufp = *bpp;
-	bp = (u_int16_t *)bufp->page;
-	for (;;) {
-		n = bp[0];
-
-		/*
-		 * This is the last page if: the tag is FULL_KEY_DATA and
-		 * either only 2 entries OVFLPAGE marker is explicit there
-		 * is freespace on the page.
-		 */
-		if (bp[2] == FULL_KEY_DATA &&
-		    ((n == 2) || (bp[n] == OVFLPAGE) || (FREESPACE(bp))))
-			break;
-
-		pageno = bp[n - 1];
-		bufp = __get_buf(hashp, pageno, bufp, 0);
-		if (!bufp)
-			return (0);	/* Need to indicate an error! */
-		bp = (u_int16_t *)bufp->page;
-	}
-
-	*bpp = bufp;
-	if (bp[0] > 2)
-		return (bp[3]);
-	else
-		return (0);
-}
-
-/*
- * Return the data for the key/data pair that begins on this page at this
- * index (index should always be 1).
- */
-int
-__big_return(HTAB *hashp, BUFHEAD *bufp, int ndx, DBT *val, int set_current)
-{
-	BUFHEAD *save_p;
-	u_int16_t *bp, len, off, save_addr;
-	char *tp;
-
-	bp = (u_int16_t *)bufp->page;
-	while (bp[ndx + 1] == PARTIAL_KEY) {
-		bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!bufp)
-			return (-1);
-		bp = (u_int16_t *)bufp->page;
-		ndx = 1;
-	}
-
-	if (bp[ndx + 1] == FULL_KEY) {
-		bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!bufp)
-			return (-1);
-		bp = (u_int16_t *)bufp->page;
-		save_p = bufp;
-		save_addr = save_p->addr;
-		off = bp[1];
-		len = 0;
-	} else
-		if (!FREESPACE(bp)) {
-			/*
-			 * This is a hack.  We can't distinguish between
-			 * FULL_KEY_DATA that contains complete data or
-			 * incomplete data, so we require that if the data
-			 * is complete, there is at least 1 byte of free
-			 * space left.
-			 */
-			off = bp[bp[0]];
-			len = bp[1] - off;
-			save_p = bufp;
-			save_addr = bufp->addr;
-			bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-			if (!bufp)
-				return (-1);
-			bp = (u_int16_t *)bufp->page;
-		} else {
-			/* The data is all on one page. */
-			tp = (char *)bp;
-			off = bp[bp[0]];
-			val->data = (u_char *)tp + off;
-			val->size = bp[1] - off;
-			if (set_current) {
-				if (bp[0] == 2) {	/* No more buckets in
-							 * chain */
-					hashp->cpage = NULL;
-					hashp->cbucket++;
-					hashp->cndx = 1;
-				} else {
-					hashp->cpage = __get_buf(hashp,
-					    bp[bp[0] - 1], bufp, 0);
-					if (!hashp->cpage)
-						return (-1);
-					hashp->cndx = 1;
-					if (!((u_int16_t *)
-					    hashp->cpage->page)[0]) {
-						hashp->cbucket++;
-						hashp->cpage = NULL;
-					}
-				}
-			}
-			return (0);
-		}
-
-	val->size = (size_t)collect_data(hashp, bufp, (int)len, set_current);
-	if (val->size == (size_t)-1)
-		return (-1);
-	if (save_p->addr != save_addr) {
-		/* We are pretty short on buffers. */
-		errno = EINVAL;			/* OUT OF BUFFERS */
-		return (-1);
-	}
-	memmove(hashp->tmp_buf, (save_p->page) + off, len);
-	val->data = (u_char *)hashp->tmp_buf;
-	return (0);
-}
-/*
- * Count how big the total datasize is by recursing through the pages.  Then
- * allocate a buffer and copy the data as you recurse up.
- */
-static int
-collect_data(HTAB *hashp, BUFHEAD *bufp, int len, int set)
-{
-	u_int16_t *bp;
-	char *p;
-	BUFHEAD *xbp;
-	u_int16_t save_addr;
-	int mylen, totlen;
-
-	p = bufp->page;
-	bp = (u_int16_t *)p;
-	mylen = hashp->BSIZE - bp[1];
-	save_addr = bufp->addr;
-
-	if (bp[2] == FULL_KEY_DATA) {		/* End of Data */
-		totlen = len + mylen;
-		if (hashp->tmp_buf)
-			free(hashp->tmp_buf);
-		if ((hashp->tmp_buf = (char *)malloc(totlen)) == NULL)
-			return (-1);
-		if (set) {
-			hashp->cndx = 1;
-			if (bp[0] == 2) {	/* No more buckets in chain */
-				hashp->cpage = NULL;
-				hashp->cbucket++;
-			} else {
-				hashp->cpage =
-				    __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-				if (!hashp->cpage)
-					return (-1);
-				else if (!((u_int16_t *)hashp->cpage->page)[0]) {
-					hashp->cbucket++;
-					hashp->cpage = NULL;
-				}
-			}
-		}
-	} else {
-		xbp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!xbp || ((totlen =
-		    collect_data(hashp, xbp, len + mylen, set)) < 1))
-			return (-1);
-	}
-	if (bufp->addr != save_addr) {
-		errno = EINVAL;			/* Out of buffers. */
-		return (-1);
-	}
-	memmove(&hashp->tmp_buf[len], (bufp->page) + bp[1], mylen);
-	return (totlen);
-}
-
-/*
- * Fill in the key and data for this big pair.
- */
-int
-__big_keydata(HTAB *hashp, BUFHEAD *bufp, DBT *key, DBT *val, int set)
-{
-	key->size = (size_t)collect_key(hashp, bufp, 0, val, set);
-	if (key->size == (size_t)-1)
-		return (-1);
-	key->data = (u_char *)hashp->tmp_key;
-	return (0);
-}
-
-/*
- * Count how big the total key size is by recursing through the pages.  Then
- * collect the data, allocate a buffer and copy the key as you recurse up.
- */
-static int
-collect_key(HTAB *hashp, BUFHEAD *bufp, int len, DBT *val, int set)
-{
-	BUFHEAD *xbp;
-	char *p;
-	int mylen, totlen;
-	u_int16_t *bp, save_addr;
-
-	p = bufp->page;
-	bp = (u_int16_t *)p;
-	mylen = hashp->BSIZE - bp[1];
-
-	save_addr = bufp->addr;
-	totlen = len + mylen;
-	if (bp[2] == FULL_KEY || bp[2] == FULL_KEY_DATA) {    /* End of Key. */
-		if (hashp->tmp_key != NULL)
-			free(hashp->tmp_key);
-		if ((hashp->tmp_key = (char *)malloc(totlen)) == NULL)
-			return (-1);
-		if (__big_return(hashp, bufp, 1, val, set))
-			return (-1);
-	} else {
-		xbp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-		if (!xbp || ((totlen =
-		    collect_key(hashp, xbp, totlen, val, set)) < 1))
-			return (-1);
-	}
-	if (bufp->addr != save_addr) {
-		errno = EINVAL;		/* MIS -- OUT OF BUFFERS */
-		return (-1);
-	}
-	memmove(&hashp->tmp_key[len], (bufp->page) + bp[1], mylen);
-	return (totlen);
-}
-
-/*
- * Returns:
- *  0 => OK
- * -1 => error
- */
-int
-__big_split(HTAB *hashp,
-    BUFHEAD *op,	/* Pointer to where to put keys that go in old bucket */
-    BUFHEAD *np,	/* Pointer to new bucket page */
-    BUFHEAD *big_keyp,	/* Pointer to first page containing the big key/data */
-    int addr,		/* Address of big_keyp */
-    uint32_t obucket,	/* Old Bucket */
-    SPLIT_RETURN *ret)
-{
-	BUFHEAD *bp, *tmpp;
-	DBT key, val;
-	uint32_t change;
-	u_int16_t free_space, n, off, *tp;
-
-	bp = big_keyp;
-
-	/* Now figure out where the big key/data goes */
-	if (__big_keydata(hashp, big_keyp, &key, &val, 0))
-		return (-1);
-	change = (__call_hash(hashp, key.data, key.size) != obucket);
-
-	if ( (ret->next_addr = __find_last_page(hashp, &big_keyp)) ) {
-		if (!(ret->nextp =
-		    __get_buf(hashp, ret->next_addr, big_keyp, 0)))
-			return (-1);
-	} else
-		ret->nextp = NULL;
-
-	/* Now make one of np/op point to the big key/data pair */
-#ifdef DEBUG
-	assert(np->ovfl == NULL);
-#endif
-	if (change)
-		tmpp = np;
-	else
-		tmpp = op;
-
-	tmpp->flags |= BUF_MOD;
-#ifdef DEBUG1
-	(void)fprintf(stderr,
-	    "BIG_SPLIT: %d->ovfl was %d is now %d\n", tmpp->addr,
-	    (tmpp->ovfl ? tmpp->ovfl->addr : 0), (bp ? bp->addr : 0));
-#endif
-	tmpp->ovfl = bp;	/* one of op/np point to big_keyp */
-	tp = (u_int16_t *)tmpp->page;
-#ifdef DEBUG
-	assert(FREESPACE(tp) >= OVFLSIZE);
-#endif
-	n = tp[0];
-	off = OFFSET(tp);
-	free_space = FREESPACE(tp);
-	tp[++n] = (u_int16_t)addr;
-	tp[++n] = OVFLPAGE;
-	tp[0] = n;
-	OFFSET(tp) = off;
-	FREESPACE(tp) = free_space - OVFLSIZE;
-
-	/*
-	 * Finally, set the new and old return values. BIG_KEYP contains a
-	 * pointer to the last page of the big key_data pair. Make sure that
-	 * big_keyp has no following page (2 elements) or create an empty
-	 * following page.
-	 */
-
-	ret->newp = np;
-	ret->oldp = op;
-
-	tp = (u_int16_t *)big_keyp->page;
-	big_keyp->flags |= BUF_MOD;
-	if (tp[0] > 2) {
-		/*
-		 * There may be either one or two offsets on this page.  If
-		 * there is one, then the overflow page is linked on normally
-		 * and tp[4] is OVFLPAGE.  If there are two, tp[4] contains
-		 * the second offset and needs to get stuffed in after the
-		 * next overflow page is added.
-		 */
-		n = tp[4];
-		free_space = FREESPACE(tp);
-		off = OFFSET(tp);
-		tp[0] -= 2;
-		FREESPACE(tp) = free_space + OVFLSIZE;
-		OFFSET(tp) = off;
-		tmpp = __add_ovflpage(hashp, big_keyp);
-		if (!tmpp)
-			return (-1);
-		tp[4] = n;
-	} else
-		tmpp = big_keyp;
-
-	if (change)
-		ret->newp = tmpp;
-	else
-		ret->oldp = tmpp;
-	return (0);
-}
diff --git a/lib/libc_bsd/db/hash/hash_buf.c b/lib/libc_bsd/db/hash/hash_buf.c
deleted file mode 100644
index 350962b..0000000
--- a/lib/libc_bsd/db/hash/hash_buf.c
+++ /dev/null
@@ -1,358 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_buf.c	8.5 (Berkeley) 7/15/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/hash/hash_buf.c 190493 2009-03-28 06:40:48Z delphij $");
-
-/*
- * PACKAGE: hash
- *
- * DESCRIPTION:
- *	Contains buffer management
- *
- * ROUTINES:
- * External
- *	__buf_init
- *	__get_buf
- *	__buf_free
- *	__reclaim_buf
- * Internal
- *	newbuf
- */
-
-#include <sys/param.h>
-
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef DEBUG
-#include <assert.h>
-#endif
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static BUFHEAD *newbuf(HTAB *, uint32_t, BUFHEAD *);
-
-/* Unlink B from its place in the lru */
-#define BUF_REMOVE(B) { \
-	(B)->prev->next = (B)->next; \
-	(B)->next->prev = (B)->prev; \
-}
-
-/* Insert B after P */
-#define BUF_INSERT(B, P) { \
-	(B)->next = (P)->next; \
-	(B)->prev = (P); \
-	(P)->next = (B); \
-	(B)->next->prev = (B); \
-}
-
-#define	MRU	hashp->bufhead.next
-#define	LRU	hashp->bufhead.prev
-
-#define MRU_INSERT(B)	BUF_INSERT((B), &hashp->bufhead)
-#define LRU_INSERT(B)	BUF_INSERT((B), LRU)
-
-/*
- * We are looking for a buffer with address "addr".  If prev_bp is NULL, then
- * address is a bucket index.  If prev_bp is not NULL, then it points to the
- * page previous to an overflow page that we are trying to find.
- *
- * CAVEAT:  The buffer header accessed via prev_bp's ovfl field may no longer
- * be valid.  Therefore, you must always verify that its address matches the
- * address you are seeking.
- */
-BUFHEAD *
-__get_buf(HTAB *hashp, uint32_t addr,
-    BUFHEAD *prev_bp,	/* If prev_bp set, indicates a new overflow page. */
-    int newpage)
-{
-	BUFHEAD *bp;
-	uint32_t is_disk_mask;
-	int is_disk, segment_ndx;
-	SEGMENT segp;
-
-	is_disk = 0;
-	is_disk_mask = 0;
-	if (prev_bp) {
-		bp = prev_bp->ovfl;
-		if (!bp || (bp->addr != addr))
-			bp = NULL;
-		if (!newpage)
-			is_disk = BUF_DISK;
-	} else {
-		/* Grab buffer out of directory */
-		segment_ndx = addr & (hashp->SGSIZE - 1);
-
-		/* valid segment ensured by __call_hash() */
-		segp = hashp->dir[addr >> hashp->SSHIFT];
-#ifdef DEBUG
-		assert(segp != NULL);
-#endif
-		bp = PTROF(segp[segment_ndx]);
-		is_disk_mask = ISDISK(segp[segment_ndx]);
-		is_disk = is_disk_mask || !hashp->new_file;
-	}
-
-	if (!bp) {
-		bp = newbuf(hashp, addr, prev_bp);
-		if (!bp ||
-		    __get_page(hashp, bp->page, addr, !prev_bp, is_disk, 0))
-			return (NULL);
-		if (!prev_bp)
-			segp[segment_ndx] =
-			    (BUFHEAD *)((ptrdiff_t)bp | is_disk_mask);
-	} else {
-		BUF_REMOVE(bp);
-		MRU_INSERT(bp);
-	}
-	return (bp);
-}
-
-/*
- * We need a buffer for this page. Either allocate one, or evict a resident
- * one (if we have as many buffers as we're allowed) and put this one in.
- *
- * If newbuf finds an error (returning NULL), it also sets errno.
- */
-static BUFHEAD *
-newbuf(HTAB *hashp, uint32_t addr, BUFHEAD *prev_bp)
-{
-	BUFHEAD *bp;		/* The buffer we're going to use */
-	BUFHEAD *xbp;		/* Temp pointer */
-	BUFHEAD *next_xbp;
-	SEGMENT segp;
-	int segment_ndx;
-	u_int16_t oaddr, *shortp;
-
-	oaddr = 0;
-	bp = LRU;
-
-        /* It is bad to overwrite the page under the cursor. */
-        if (bp == hashp->cpage) {
-                BUF_REMOVE(bp);
-                MRU_INSERT(bp);
-                bp = LRU;
-        }
-
-	/* If prev_bp is part of bp overflow, create a new buffer. */
-	if (hashp->nbufs == 0 && prev_bp && bp->ovfl) {
-		BUFHEAD *ovfl;
-
-		for (ovfl = bp->ovfl; ovfl ; ovfl = ovfl->ovfl) {
-			if (ovfl == prev_bp) {
-				hashp->nbufs++;
-				break;
-			}
-		}
-	}
-
-	/*
-	 * If LRU buffer is pinned, the buffer pool is too small. We need to
-	 * allocate more buffers.
-	 */
-	if (hashp->nbufs || (bp->flags & BUF_PIN) || bp == hashp->cpage) {
-		/* Allocate a new one */
-		if ((bp = (BUFHEAD *)calloc(1, sizeof(BUFHEAD))) == NULL)
-			return (NULL);
-		if ((bp->page = (char *)calloc(1, hashp->BSIZE)) == NULL) {
-			free(bp);
-			return (NULL);
-		}
-		if (hashp->nbufs)
-			hashp->nbufs--;
-	} else {
-		/* Kick someone out */
-		BUF_REMOVE(bp);
-		/*
-		 * If this is an overflow page with addr 0, it's already been
-		 * flushed back in an overflow chain and initialized.
-		 */
-		if ((bp->addr != 0) || (bp->flags & BUF_BUCKET)) {
-			/*
-			 * Set oaddr before __put_page so that you get it
-			 * before bytes are swapped.
-			 */
-			shortp = (u_int16_t *)bp->page;
-			if (shortp[0])
-				oaddr = shortp[shortp[0] - 1];
-			if ((bp->flags & BUF_MOD) && __put_page(hashp, bp->page,
-			    bp->addr, (int)IS_BUCKET(bp->flags), 0))
-				return (NULL);
-			/*
-			 * Update the pointer to this page (i.e. invalidate it).
-			 *
-			 * If this is a new file (i.e. we created it at open
-			 * time), make sure that we mark pages which have been
-			 * written to disk so we retrieve them from disk later,
-			 * rather than allocating new pages.
-			 */
-			if (IS_BUCKET(bp->flags)) {
-				segment_ndx = bp->addr & (hashp->SGSIZE - 1);
-				segp = hashp->dir[bp->addr >> hashp->SSHIFT];
-#ifdef DEBUG
-				assert(segp != NULL);
-#endif
-
-				if (hashp->new_file &&
-				    ((bp->flags & BUF_MOD) ||
-				    ISDISK(segp[segment_ndx])))
-					segp[segment_ndx] = (BUFHEAD *)BUF_DISK;
-				else
-					segp[segment_ndx] = NULL;
-			}
-			/*
-			 * Since overflow pages can only be access by means of
-			 * their bucket, free overflow pages associated with
-			 * this bucket.
-			 */
-			for (xbp = bp; xbp->ovfl;) {
-				next_xbp = xbp->ovfl;
-				xbp->ovfl = 0;
-				xbp = next_xbp;
-
-				/* Check that ovfl pointer is up date. */
-				if (IS_BUCKET(xbp->flags) ||
-				    (oaddr != xbp->addr))
-					break;
-
-				shortp = (u_int16_t *)xbp->page;
-				if (shortp[0])
-					/* set before __put_page */
-					oaddr = shortp[shortp[0] - 1];
-				if ((xbp->flags & BUF_MOD) && __put_page(hashp,
-				    xbp->page, xbp->addr, 0, 0))
-					return (NULL);
-				xbp->addr = 0;
-				xbp->flags = 0;
-				BUF_REMOVE(xbp);
-				LRU_INSERT(xbp);
-			}
-		}
-	}
-
-	/* Now assign this buffer */
-	bp->addr = addr;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "NEWBUF1: %d->ovfl was %d is now %d\n",
-	    bp->addr, (bp->ovfl ? bp->ovfl->addr : 0), 0);
-#endif
-	bp->ovfl = NULL;
-	if (prev_bp) {
-		/*
-		 * If prev_bp is set, this is an overflow page, hook it in to
-		 * the buffer overflow links.
-		 */
-#ifdef DEBUG1
-		(void)fprintf(stderr, "NEWBUF2: %d->ovfl was %d is now %d\n",
-		    prev_bp->addr, (prev_bp->ovfl ? prev_bp->ovfl->addr : 0),
-		    (bp ? bp->addr : 0));
-#endif
-		prev_bp->ovfl = bp;
-		bp->flags = 0;
-	} else
-		bp->flags = BUF_BUCKET;
-	MRU_INSERT(bp);
-	return (bp);
-}
-
-void
-__buf_init(HTAB *hashp, int nbytes)
-{
-	BUFHEAD *bfp;
-	int npages;
-
-	bfp = &(hashp->bufhead);
-	npages = (nbytes + hashp->BSIZE - 1) >> hashp->BSHIFT;
-	npages = MAX(npages, MIN_BUFFERS);
-
-	hashp->nbufs = npages;
-	bfp->next = bfp;
-	bfp->prev = bfp;
-	/*
-	 * This space is calloc'd so these are already null.
-	 *
-	 * bfp->ovfl = NULL;
-	 * bfp->flags = 0;
-	 * bfp->page = NULL;
-	 * bfp->addr = 0;
-	 */
-}
-
-int
-__buf_free(HTAB *hashp, int do_free, int to_disk)
-{
-	BUFHEAD *bp;
-
-	/* Need to make sure that buffer manager has been initialized */
-	if (!LRU)
-		return (0);
-	for (bp = LRU; bp != &hashp->bufhead;) {
-		/* Check that the buffer is valid */
-		if (bp->addr || IS_BUCKET(bp->flags)) {
-			if (to_disk && (bp->flags & BUF_MOD) &&
-			    __put_page(hashp, bp->page,
-			    bp->addr, IS_BUCKET(bp->flags), 0))
-				return (-1);
-		}
-		/* Check if we are freeing stuff */
-		if (do_free) {
-			if (bp->page) {
-				(void)memset(bp->page, 0, hashp->BSIZE);
-				free(bp->page);
-			}
-			BUF_REMOVE(bp);
-			free(bp);
-			bp = LRU;
-		} else
-			bp = bp->prev;
-	}
-	return (0);
-}
-
-void
-__reclaim_buf(HTAB *hashp, BUFHEAD *bp)
-{
-	bp->ovfl = 0;
-	bp->addr = 0;
-	bp->flags = 0;
-	BUF_REMOVE(bp);
-	LRU_INSERT(bp);
-}
diff --git a/lib/libc_bsd/db/hash/hash_func.c b/lib/libc_bsd/db/hash/hash_func.c
deleted file mode 100644
index 3fee52c..0000000
--- a/lib/libc_bsd/db/hash/hash_func.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_func.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/hash/hash_func.c 190498 2009-03-28 07:31:02Z delphij $");
-
-#include <sys/types.h>
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-#ifdef notdef
-static uint32_t hash1(const void *, size_t) __unused;
-static uint32_t hash2(const void *, size_t) __unused;
-static uint32_t hash3(const void *, size_t) __unused;
-#endif
-static uint32_t hash4(const void *, size_t);
-
-/* Default hash function. */
-uint32_t (*__default_hash)(const void *, size_t) = hash4;
-
-#ifdef notdef
-/*
- * Assume that we've already split the bucket to which this key hashes,
- * calculate that bucket, and check that in fact we did already split it.
- *
- * EJB's original hsearch hash.
- */
-#define PRIME1		37
-#define PRIME2		1048583
-
-uint32_t
-hash1(const void *key, size_t len)
-{
-	uint32_t h;
-	u_int8_t *k;
-
-	h = 0;
-	k = (u_int8_t *)key;
-	/* Convert string to integer */
-	while (len--)
-		h = h * PRIME1 ^ (*k++ - ' ');
-	h %= PRIME2;
-	return (h);
-}
-
-/*
- * Phong Vo's linear congruential hash
- */
-#define dcharhash(h, c)	((h) = 0x63c63cd9*(h) + 0x9c39c33d + (c))
-
-uint32_t
-hash2(const void *key, size_t len)
-{
-	uint32_t h;
-	u_int8_t *e, c, *k;
-
-	k = (u_int8_t *)key;
-	e = k + len;
-	for (h = 0; k != e;) {
-		c = *k++;
-		if (!c && k > e)
-			break;
-		dcharhash(h, c);
-	}
-	return (h);
-}
-
-/*
- * This is INCREDIBLY ugly, but fast.  We break the string up into 8 byte
- * units.  On the first time through the loop we get the "leftover bytes"
- * (strlen % 8).  On every other iteration, we perform 8 HASHC's so we handle
- * all 8 bytes.  Essentially, this saves us 7 cmp & branch instructions.  If
- * this routine is heavily used enough, it's worth the ugly coding.
- *
- * Ozan Yigit's original sdbm hash.
- */
-uint32_t
-hash3(const void *key, size_t len)
-{
-	uint32_t n, loop;
-	u_int8_t *k;
-
-#define HASHC   n = *k++ + 65599 * n
-
-	n = 0;
-	k = (u_int8_t *)key;
-	if (len > 0) {
-		loop = (len + 8 - 1) >> 3;
-
-		switch (len & (8 - 1)) {
-		case 0:
-			do {	/* All fall throughs */
-				HASHC;
-		case 7:
-				HASHC;
-		case 6:
-				HASHC;
-		case 5:
-				HASHC;
-		case 4:
-				HASHC;
-		case 3:
-				HASHC;
-		case 2:
-				HASHC;
-		case 1:
-				HASHC;
-			} while (--loop);
-		}
-
-	}
-	return (n);
-}
-#endif /* notdef */
-
-/* Chris Torek's hash function. */
-uint32_t
-hash4(const void *key, size_t len)
-{
-	uint32_t h, loop;
-	const u_int8_t *k;
-
-#define HASH4a   h = (h << 5) - h + *k++;
-#define HASH4b   h = (h << 5) + h + *k++;
-#define HASH4 HASH4b
-
-	h = 0;
-	k = key;
-	if (len > 0) {
-		loop = (len + 8 - 1) >> 3;
-
-		switch (len & (8 - 1)) {
-		case 0:
-			do {	/* All fall throughs */
-				HASH4;
-		case 7:
-				HASH4;
-		case 6:
-				HASH4;
-		case 5:
-				HASH4;
-		case 4:
-				HASH4;
-		case 3:
-				HASH4;
-		case 2:
-				HASH4;
-		case 1:
-				HASH4;
-			} while (--loop);
-		}
-
-	}
-	return (h);
-}
diff --git a/lib/libc_bsd/db/hash/hash_log2.c b/lib/libc_bsd/db/hash/hash_log2.c
deleted file mode 100644
index d53a2cb..0000000
--- a/lib/libc_bsd/db/hash/hash_log2.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_log2.c	8.2 (Berkeley) 5/31/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/hash/hash_log2.c 190484 2009-03-28 05:45:29Z delphij $");
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-uint32_t
-__log2(uint32_t num)
-{
-	uint32_t i, limit;
-
-	limit = 1;
-	for (i = 0; limit < num; limit = limit << 1, i++);
-	return (i);
-}
diff --git a/lib/libc_bsd/db/hash/hash_page.c b/lib/libc_bsd/db/hash/hash_page.c
deleted file mode 100644
index ecdac2c..0000000
--- a/lib/libc_bsd/db/hash/hash_page.c
+++ /dev/null
@@ -1,935 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)hash_page.c	8.7 (Berkeley) 8/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/hash/hash_page.c 287872 2015-09-16 20:59:41Z delphij $");
-
-/*
- * PACKAGE:  hashing
- *
- * DESCRIPTION:
- *	Page manipulation for hashing package.
- *
- * ROUTINES:
- *
- * External
- *	__get_page
- *	__add_ovflpage
- * Internal
- *	overflow_page
- *	open_temp
- */
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#ifdef DEBUG
-#include <assert.h>
-#endif
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#include <db.h>
-#include "hash.h"
-#include "page.h"
-#include "extern.h"
-
-static uint32_t *fetch_bitmap(HTAB *, int);
-static uint32_t  first_free(uint32_t);
-static int	  open_temp(HTAB *);
-static u_int16_t  overflow_page(HTAB *);
-static void	  putpair(char *, const DBT *, const DBT *);
-static void	  squeeze_key(u_int16_t *, const DBT *, const DBT *);
-static int	  ugly_split(HTAB *, uint32_t, BUFHEAD *, BUFHEAD *, int, int);
-
-#define	PAGE_INIT(P) { \
-	((u_int16_t *)(P))[0] = 0; \
-	((u_int16_t *)(P))[1] = hashp->BSIZE - 3 * sizeof(u_int16_t); \
-	((u_int16_t *)(P))[2] = hashp->BSIZE; \
-}
-
-/*
- * This is called AFTER we have verified that there is room on the page for
- * the pair (PAIRFITS has returned true) so we go right ahead and start moving
- * stuff on.
- */
-static void
-putpair(char *p, const DBT *key, const DBT *val)
-{
-	u_int16_t *bp, n, off;
-
-	bp = (u_int16_t *)p;
-
-	/* Enter the key first. */
-	n = bp[0];
-
-	off = OFFSET(bp) - key->size;
-	memmove(p + off, key->data, key->size);
-	bp[++n] = off;
-
-	/* Now the data. */
-	off -= val->size;
-	memmove(p + off, val->data, val->size);
-	bp[++n] = off;
-
-	/* Adjust page info. */
-	bp[0] = n;
-	bp[n + 1] = off - ((n + 3) * sizeof(u_int16_t));
-	bp[n + 2] = off;
-}
-
-/*
- * Returns:
- *	 0 OK
- *	-1 error
- */
-int
-__delpair(HTAB *hashp, BUFHEAD *bufp, int ndx)
-{
-	u_int16_t *bp, newoff, pairlen;
-	int n;
-
-	bp = (u_int16_t *)bufp->page;
-	n = bp[0];
-
-	if (bp[ndx + 1] < REAL_KEY)
-		return (__big_delete(hashp, bufp));
-	if (ndx != 1)
-		newoff = bp[ndx - 1];
-	else
-		newoff = hashp->BSIZE;
-	pairlen = newoff - bp[ndx + 1];
-
-	if (ndx != (n - 1)) {
-		/* Hard Case -- need to shuffle keys */
-		int i;
-		char *src = bufp->page + (int)OFFSET(bp);
-		char *dst = src + (int)pairlen;
-		memmove(dst, src, bp[ndx + 1] - OFFSET(bp));
-
-		/* Now adjust the pointers */
-		for (i = ndx + 2; i <= n; i += 2) {
-			if (bp[i + 1] == OVFLPAGE) {
-				bp[i - 2] = bp[i];
-				bp[i - 1] = bp[i + 1];
-			} else {
-				bp[i - 2] = bp[i] + pairlen;
-				bp[i - 1] = bp[i + 1] + pairlen;
-			}
-		}
-		if (ndx == hashp->cndx) {
-			/*
-			 * We just removed pair we were "pointing" to.
-			 * By moving back the cndx we ensure subsequent
-			 * hash_seq() calls won't skip over any entries.
-			 */
-			hashp->cndx -= 2;
-		}
-	}
-	/* Finally adjust the page data */
-	bp[n] = OFFSET(bp) + pairlen;
-	bp[n - 1] = bp[n + 1] + pairlen + 2 * sizeof(u_int16_t);
-	bp[0] = n - 2;
-	hashp->NKEYS--;
-
-	bufp->flags |= BUF_MOD;
-	return (0);
-}
-/*
- * Returns:
- *	 0 ==> OK
- *	-1 ==> Error
- */
-int
-__split_page(HTAB *hashp, uint32_t obucket, uint32_t nbucket)
-{
-	BUFHEAD *new_bufp, *old_bufp;
-	u_int16_t *ino;
-	char *np;
-	DBT key, val;
-	int n, ndx, retval;
-	u_int16_t copyto, diff, off, moved;
-	char *op;
-
-	copyto = (u_int16_t)hashp->BSIZE;
-	off = (u_int16_t)hashp->BSIZE;
-	old_bufp = __get_buf(hashp, obucket, NULL, 0);
-	if (old_bufp == NULL)
-		return (-1);
-	new_bufp = __get_buf(hashp, nbucket, NULL, 0);
-	if (new_bufp == NULL)
-		return (-1);
-
-	old_bufp->flags |= (BUF_MOD | BUF_PIN);
-	new_bufp->flags |= (BUF_MOD | BUF_PIN);
-
-	ino = (u_int16_t *)(op = old_bufp->page);
-	np = new_bufp->page;
-
-	moved = 0;
-
-	for (n = 1, ndx = 1; n < ino[0]; n += 2) {
-		if (ino[n + 1] < REAL_KEY) {
-			retval = ugly_split(hashp, obucket, old_bufp, new_bufp,
-			    (int)copyto, (int)moved);
-			old_bufp->flags &= ~BUF_PIN;
-			new_bufp->flags &= ~BUF_PIN;
-			return (retval);
-
-		}
-		key.data = (u_char *)op + ino[n];
-		key.size = off - ino[n];
-
-		if (__call_hash(hashp, key.data, key.size) == obucket) {
-			/* Don't switch page */
-			diff = copyto - off;
-			if (diff) {
-				copyto = ino[n + 1] + diff;
-				memmove(op + copyto, op + ino[n + 1],
-				    off - ino[n + 1]);
-				ino[ndx] = copyto + ino[n] - ino[n + 1];
-				ino[ndx + 1] = copyto;
-			} else
-				copyto = ino[n + 1];
-			ndx += 2;
-		} else {
-			/* Switch page */
-			val.data = (u_char *)op + ino[n + 1];
-			val.size = ino[n] - ino[n + 1];
-			putpair(np, &key, &val);
-			moved += 2;
-		}
-
-		off = ino[n + 1];
-	}
-
-	/* Now clean up the page */
-	ino[0] -= moved;
-	FREESPACE(ino) = copyto - sizeof(u_int16_t) * (ino[0] + 3);
-	OFFSET(ino) = copyto;
-
-#ifdef DEBUG3
-	(void)fprintf(stderr, "split %d/%d\n",
-	    ((u_int16_t *)np)[0] / 2,
-	    ((u_int16_t *)op)[0] / 2);
-#endif
-	/* unpin both pages */
-	old_bufp->flags &= ~BUF_PIN;
-	new_bufp->flags &= ~BUF_PIN;
-	return (0);
-}
-
-/*
- * Called when we encounter an overflow or big key/data page during split
- * handling.  This is special cased since we have to begin checking whether
- * the key/data pairs fit on their respective pages and because we may need
- * overflow pages for both the old and new pages.
- *
- * The first page might be a page with regular key/data pairs in which case
- * we have a regular overflow condition and just need to go on to the next
- * page or it might be a big key/data pair in which case we need to fix the
- * big key/data pair.
- *
- * Returns:
- *	 0 ==> success
- *	-1 ==> failure
- */
-static int
-ugly_split(HTAB *hashp,
-    uint32_t obucket,	/* Same as __split_page. */
-    BUFHEAD *old_bufp,
-    BUFHEAD *new_bufp,
-    int copyto,		/* First byte on page which contains key/data values. */
-    int moved)		/* Number of pairs moved to new page. */
-{
-	BUFHEAD *bufp;	/* Buffer header for ino */
-	u_int16_t *ino;	/* Page keys come off of */
-	u_int16_t *np;	/* New page */
-	u_int16_t *op;	/* Page keys go on to if they aren't moving */
-
-	BUFHEAD *last_bfp;	/* Last buf header OVFL needing to be freed */
-	DBT key, val;
-	SPLIT_RETURN ret;
-	u_int16_t n, off, ov_addr, scopyto;
-	char *cino;		/* Character value of ino */
-
-	bufp = old_bufp;
-	ino = (u_int16_t *)old_bufp->page;
-	np = (u_int16_t *)new_bufp->page;
-	op = (u_int16_t *)old_bufp->page;
-	last_bfp = NULL;
-	scopyto = (u_int16_t)copyto;	/* ANSI */
-
-	n = ino[0] - 1;
-	while (n < ino[0]) {
-		if (ino[2] < REAL_KEY && ino[2] != OVFLPAGE) {
-			if (__big_split(hashp, old_bufp,
-			    new_bufp, bufp, bufp->addr, obucket, &ret))
-				return (-1);
-			old_bufp = ret.oldp;
-			if (!old_bufp)
-				return (-1);
-			op = (u_int16_t *)old_bufp->page;
-			new_bufp = ret.newp;
-			if (!new_bufp)
-				return (-1);
-			np = (u_int16_t *)new_bufp->page;
-			bufp = ret.nextp;
-			if (!bufp)
-				return (0);
-			cino = (char *)bufp->page;
-			ino = (u_int16_t *)cino;
-			last_bfp = ret.nextp;
-		} else if (ino[n + 1] == OVFLPAGE) {
-			ov_addr = ino[n];
-			/*
-			 * Fix up the old page -- the extra 2 are the fields
-			 * which contained the overflow information.
-			 */
-			ino[0] -= (moved + 2);
-			FREESPACE(ino) =
-			    scopyto - sizeof(u_int16_t) * (ino[0] + 3);
-			OFFSET(ino) = scopyto;
-
-			bufp = __get_buf(hashp, ov_addr, bufp, 0);
-			if (!bufp)
-				return (-1);
-
-			ino = (u_int16_t *)bufp->page;
-			n = 1;
-			scopyto = hashp->BSIZE;
-			moved = 0;
-
-			if (last_bfp)
-				__free_ovflpage(hashp, last_bfp);
-			last_bfp = bufp;
-		}
-		/* Move regular sized pairs of there are any */
-		off = hashp->BSIZE;
-		for (n = 1; (n < ino[0]) && (ino[n + 1] >= REAL_KEY); n += 2) {
-			cino = (char *)ino;
-			key.data = (u_char *)cino + ino[n];
-			key.size = off - ino[n];
-			val.data = (u_char *)cino + ino[n + 1];
-			val.size = ino[n] - ino[n + 1];
-			off = ino[n + 1];
-
-			if (__call_hash(hashp, key.data, key.size) == obucket) {
-				/* Keep on old page */
-				if (PAIRFITS(op, (&key), (&val)))
-					putpair((char *)op, &key, &val);
-				else {
-					old_bufp =
-					    __add_ovflpage(hashp, old_bufp);
-					if (!old_bufp)
-						return (-1);
-					op = (u_int16_t *)old_bufp->page;
-					putpair((char *)op, &key, &val);
-				}
-				old_bufp->flags |= BUF_MOD;
-			} else {
-				/* Move to new page */
-				if (PAIRFITS(np, (&key), (&val)))
-					putpair((char *)np, &key, &val);
-				else {
-					new_bufp =
-					    __add_ovflpage(hashp, new_bufp);
-					if (!new_bufp)
-						return (-1);
-					np = (u_int16_t *)new_bufp->page;
-					putpair((char *)np, &key, &val);
-				}
-				new_bufp->flags |= BUF_MOD;
-			}
-		}
-	}
-	if (last_bfp)
-		__free_ovflpage(hashp, last_bfp);
-	return (0);
-}
-
-/*
- * Add the given pair to the page
- *
- * Returns:
- *	0 ==> OK
- *	1 ==> failure
- */
-int
-__addel(HTAB *hashp, BUFHEAD *bufp, const DBT *key, const DBT *val)
-{
-	u_int16_t *bp, *sop;
-	int do_expand;
-
-	bp = (u_int16_t *)bufp->page;
-	do_expand = 0;
-	while (bp[0] && (bp[2] < REAL_KEY || bp[bp[0]] < REAL_KEY))
-		/* Exception case */
-		if (bp[2] == FULL_KEY_DATA && bp[0] == 2)
-			/* This is the last page of a big key/data pair
-			   and we need to add another page */
-			break;
-		else if (bp[2] < REAL_KEY && bp[bp[0]] != OVFLPAGE) {
-			bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-			if (!bufp)
-				return (-1);
-			bp = (u_int16_t *)bufp->page;
-		} else if (bp[bp[0]] != OVFLPAGE) {
-			/* Short key/data pairs, no more pages */
-			break;
-		} else {
-			/* Try to squeeze key on this page */
-			if (bp[2] >= REAL_KEY &&
-			    FREESPACE(bp) >= PAIRSIZE(key, val)) {
-				squeeze_key(bp, key, val);
-				goto stats;
-			} else {
-				bufp = __get_buf(hashp, bp[bp[0] - 1], bufp, 0);
-				if (!bufp)
-					return (-1);
-				bp = (u_int16_t *)bufp->page;
-			}
-		}
-
-	if (PAIRFITS(bp, key, val))
-		putpair(bufp->page, key, val);
-	else {
-		do_expand = 1;
-		bufp = __add_ovflpage(hashp, bufp);
-		if (!bufp)
-			return (-1);
-		sop = (u_int16_t *)bufp->page;
-
-		if (PAIRFITS(sop, key, val))
-			putpair((char *)sop, key, val);
-		else
-			if (__big_insert(hashp, bufp, key, val))
-				return (-1);
-	}
-stats:
-	bufp->flags |= BUF_MOD;
-	/*
-	 * If the average number of keys per bucket exceeds the fill factor,
-	 * expand the table.
-	 */
-	hashp->NKEYS++;
-	if (do_expand ||
-	    (hashp->NKEYS / (hashp->MAX_BUCKET + 1) > hashp->FFACTOR))
-		return (__expand_table(hashp));
-	return (0);
-}
-
-/*
- *
- * Returns:
- *	pointer on success
- *	NULL on error
- */
-BUFHEAD *
-__add_ovflpage(HTAB *hashp, BUFHEAD *bufp)
-{
-	u_int16_t *sp, ndx, ovfl_num;
-#ifdef DEBUG1
-	int tmp1, tmp2;
-#endif
-	sp = (u_int16_t *)bufp->page;
-
-	/* Check if we are dynamically determining the fill factor */
-	if (hashp->FFACTOR == DEF_FFACTOR) {
-		hashp->FFACTOR = sp[0] >> 1;
-		if (hashp->FFACTOR < MIN_FFACTOR)
-			hashp->FFACTOR = MIN_FFACTOR;
-	}
-	bufp->flags |= BUF_MOD;
-	ovfl_num = overflow_page(hashp);
-#ifdef DEBUG1
-	tmp1 = bufp->addr;
-	tmp2 = bufp->ovfl ? bufp->ovfl->addr : 0;
-#endif
-	if (!ovfl_num || !(bufp->ovfl = __get_buf(hashp, ovfl_num, bufp, 1)))
-		return (NULL);
-	bufp->ovfl->flags |= BUF_MOD;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "ADDOVFLPAGE: %d->ovfl was %d is now %d\n",
-	    tmp1, tmp2, bufp->ovfl->addr);
-#endif
-	ndx = sp[0];
-	/*
-	 * Since a pair is allocated on a page only if there's room to add
-	 * an overflow page, we know that the OVFL information will fit on
-	 * the page.
-	 */
-	sp[ndx + 4] = OFFSET(sp);
-	sp[ndx + 3] = FREESPACE(sp) - OVFLSIZE;
-	sp[ndx + 1] = ovfl_num;
-	sp[ndx + 2] = OVFLPAGE;
-	sp[0] = ndx + 2;
-#ifdef HASH_STATISTICS
-	hash_overflows++;
-#endif
-	return (bufp->ovfl);
-}
-
-/*
- * Returns:
- *	 0 indicates SUCCESS
- *	-1 indicates FAILURE
- */
-int
-__get_page(HTAB *hashp, char *p, uint32_t bucket, int is_bucket, int is_disk,
-    int is_bitmap)
-{
-	int fd, page, size, rsize;
-	u_int16_t *bp;
-
-	fd = hashp->fp;
-	size = hashp->BSIZE;
-
-	if ((fd == -1) || !is_disk) {
-		PAGE_INIT(p);
-		return (0);
-	}
-	if (is_bucket)
-		page = BUCKET_TO_PAGE(bucket);
-	else
-		page = OADDR_TO_PAGE(bucket);
-	if ((rsize = pread(fd, p, size, (off_t)page << hashp->BSHIFT)) == -1)
-		return (-1);
-	bp = (u_int16_t *)p;
-	if (!rsize)
-		bp[0] = 0;	/* We hit the EOF, so initialize a new page */
-	else
-		if (rsize != size) {
-			errno = EFTYPE;
-			return (-1);
-		}
-	if (!is_bitmap && !bp[0]) {
-		PAGE_INIT(p);
-	} else
-		if (hashp->LORDER != BYTE_ORDER) {
-			int i, max;
-
-			if (is_bitmap) {
-				max = hashp->BSIZE >> 2; /* divide by 4 */
-				for (i = 0; i < max; i++)
-					M_32_SWAP(((int *)p)[i]);
-			} else {
-				M_16_SWAP(bp[0]);
-				max = bp[0] + 2;
-				for (i = 1; i <= max; i++)
-					M_16_SWAP(bp[i]);
-			}
-		}
-	return (0);
-}
-
-/*
- * Write page p to disk
- *
- * Returns:
- *	 0 ==> OK
- *	-1 ==>failure
- */
-int
-__put_page(HTAB *hashp, char *p, uint32_t bucket, int is_bucket, int is_bitmap)
-{
-	int fd, page, size, wsize;
-
-	size = hashp->BSIZE;
-	if ((hashp->fp == -1) && open_temp(hashp))
-		return (-1);
-	fd = hashp->fp;
-
-	if (hashp->LORDER != BYTE_ORDER) {
-		int i, max;
-
-		if (is_bitmap) {
-			max = hashp->BSIZE >> 2;	/* divide by 4 */
-			for (i = 0; i < max; i++)
-				M_32_SWAP(((int *)p)[i]);
-		} else {
-			max = ((u_int16_t *)p)[0] + 2;
-			for (i = 0; i <= max; i++)
-				M_16_SWAP(((u_int16_t *)p)[i]);
-		}
-	}
-	if (is_bucket)
-		page = BUCKET_TO_PAGE(bucket);
-	else
-		page = OADDR_TO_PAGE(bucket);
-	if ((wsize = pwrite(fd, p, size, (off_t)page << hashp->BSHIFT)) == -1)
-		/* Errno is set */
-		return (-1);
-	if (wsize != size) {
-		errno = EFTYPE;
-		return (-1);
-	}
-	return (0);
-}
-
-#define BYTE_MASK	((1 << INT_BYTE_SHIFT) -1)
-/*
- * Initialize a new bitmap page.  Bitmap pages are left in memory
- * once they are read in.
- */
-int
-__ibitmap(HTAB *hashp, int pnum, int nbits, int ndx)
-{
-	uint32_t *ip;
-	int clearbytes, clearints;
-
-	if ((ip = (uint32_t *)malloc(hashp->BSIZE)) == NULL)
-		return (1);
-	hashp->nmaps++;
-	clearints = ((nbits - 1) >> INT_BYTE_SHIFT) + 1;
-	clearbytes = clearints << INT_TO_BYTE;
-	(void)memset((char *)ip, 0, clearbytes);
-	(void)memset(((char *)ip) + clearbytes, 0xFF,
-	    hashp->BSIZE - clearbytes);
-	ip[clearints - 1] = ALL_SET << (nbits & BYTE_MASK);
-	SETBIT(ip, 0);
-	hashp->BITMAPS[ndx] = (u_int16_t)pnum;
-	hashp->mapp[ndx] = ip;
-	return (0);
-}
-
-static uint32_t
-first_free(uint32_t map)
-{
-	uint32_t i, mask;
-
-	mask = 0x1;
-	for (i = 0; i < BITS_PER_MAP; i++) {
-		if (!(mask & map))
-			return (i);
-		mask = mask << 1;
-	}
-	return (i);
-}
-
-static u_int16_t
-overflow_page(HTAB *hashp)
-{
-	uint32_t *freep;
-	int max_free, offset, splitnum;
-	u_int16_t addr;
-	int bit, first_page, free_bit, free_page, i, in_use_bits, j;
-#ifdef DEBUG2
-	int tmp1, tmp2;
-#endif
-	splitnum = hashp->OVFL_POINT;
-	max_free = hashp->SPARES[splitnum];
-
-	free_page = (max_free - 1) >> (hashp->BSHIFT + BYTE_SHIFT);
-	free_bit = (max_free - 1) & ((hashp->BSIZE << BYTE_SHIFT) - 1);
-
-	/* Look through all the free maps to find the first free block */
-	first_page = hashp->LAST_FREED >>(hashp->BSHIFT + BYTE_SHIFT);
-	for ( i = first_page; i <= free_page; i++ ) {
-		if (!(freep = (uint32_t *)hashp->mapp[i]) &&
-		    !(freep = fetch_bitmap(hashp, i)))
-			return (0);
-		if (i == free_page)
-			in_use_bits = free_bit;
-		else
-			in_use_bits = (hashp->BSIZE << BYTE_SHIFT) - 1;
-
-		if (i == first_page) {
-			bit = hashp->LAST_FREED &
-			    ((hashp->BSIZE << BYTE_SHIFT) - 1);
-			j = bit / BITS_PER_MAP;
-			bit = bit & ~(BITS_PER_MAP - 1);
-		} else {
-			bit = 0;
-			j = 0;
-		}
-		for (; bit <= in_use_bits; j++, bit += BITS_PER_MAP)
-			if (freep[j] != ALL_SET)
-				goto found;
-	}
-
-	/* No Free Page Found */
-	hashp->LAST_FREED = hashp->SPARES[splitnum];
-	hashp->SPARES[splitnum]++;
-	offset = hashp->SPARES[splitnum] -
-	    (splitnum ? hashp->SPARES[splitnum - 1] : 0);
-
-#define	OVMSG	"HASH: Out of overflow pages.  Increase page size\n"
-	if (offset > SPLITMASK) {
-		if (++splitnum >= NCACHED) {
-			(void)_write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-			errno = EFBIG;
-			return (0);
-		}
-		hashp->OVFL_POINT = splitnum;
-		hashp->SPARES[splitnum] = hashp->SPARES[splitnum-1];
-		hashp->SPARES[splitnum-1]--;
-		offset = 1;
-	}
-
-	/* Check if we need to allocate a new bitmap page */
-	if (free_bit == (hashp->BSIZE << BYTE_SHIFT) - 1) {
-		free_page++;
-		if (free_page >= NCACHED) {
-			(void)_write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-			errno = EFBIG;
-			return (0);
-		}
-		/*
-		 * This is tricky.  The 1 indicates that you want the new page
-		 * allocated with 1 clear bit.  Actually, you are going to
-		 * allocate 2 pages from this map.  The first is going to be
-		 * the map page, the second is the overflow page we were
-		 * looking for.  The init_bitmap routine automatically, sets
-		 * the first bit of itself to indicate that the bitmap itself
-		 * is in use.  We would explicitly set the second bit, but
-		 * don't have to if we tell init_bitmap not to leave it clear
-		 * in the first place.
-		 */
-		if (__ibitmap(hashp,
-		    (int)OADDR_OF(splitnum, offset), 1, free_page))
-			return (0);
-		hashp->SPARES[splitnum]++;
-#ifdef DEBUG2
-		free_bit = 2;
-#endif
-		offset++;
-		if (offset > SPLITMASK) {
-			if (++splitnum >= NCACHED) {
-				(void)_write(STDERR_FILENO, OVMSG,
-				    sizeof(OVMSG) - 1);
-				errno = EFBIG;
-				return (0);
-			}
-			hashp->OVFL_POINT = splitnum;
-			hashp->SPARES[splitnum] = hashp->SPARES[splitnum-1];
-			hashp->SPARES[splitnum-1]--;
-			offset = 0;
-		}
-	} else {
-		/*
-		 * Free_bit addresses the last used bit.  Bump it to address
-		 * the first available bit.
-		 */
-		free_bit++;
-		SETBIT(freep, free_bit);
-	}
-
-	/* Calculate address of the new overflow page */
-	addr = OADDR_OF(splitnum, offset);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "OVERFLOW_PAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    addr, free_bit, free_page);
-#endif
-	return (addr);
-
-found:
-	bit = bit + first_free(freep[j]);
-	SETBIT(freep, bit);
-#ifdef DEBUG2
-	tmp1 = bit;
-	tmp2 = i;
-#endif
-	/*
-	 * Bits are addressed starting with 0, but overflow pages are addressed
-	 * beginning at 1. Bit is a bit addressnumber, so we need to increment
-	 * it to convert it to a page number.
-	 */
-	bit = 1 + bit + (i * (hashp->BSIZE << BYTE_SHIFT));
-	if (bit >= hashp->LAST_FREED)
-		hashp->LAST_FREED = bit - 1;
-
-	/* Calculate the split number for this page */
-	for (i = 0; (i < splitnum) && (bit > hashp->SPARES[i]); i++);
-	offset = (i ? bit - hashp->SPARES[i - 1] : bit);
-	if (offset >= SPLITMASK) {
-		(void)_write(STDERR_FILENO, OVMSG, sizeof(OVMSG) - 1);
-		errno = EFBIG;
-		return (0);	/* Out of overflow pages */
-	}
-	addr = OADDR_OF(i, offset);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "OVERFLOW_PAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    addr, tmp1, tmp2);
-#endif
-
-	/* Allocate and return the overflow page */
-	return (addr);
-}
-
-/*
- * Mark this overflow page as free.
- */
-void
-__free_ovflpage(HTAB *hashp, BUFHEAD *obufp)
-{
-	u_int16_t addr;
-	uint32_t *freep;
-	int bit_address, free_page, free_bit;
-	u_int16_t ndx;
-
-	addr = obufp->addr;
-#ifdef DEBUG1
-	(void)fprintf(stderr, "Freeing %d\n", addr);
-#endif
-	ndx = (((u_int16_t)addr) >> SPLITSHIFT);
-	bit_address =
-	    (ndx ? hashp->SPARES[ndx - 1] : 0) + (addr & SPLITMASK) - 1;
-	 if (bit_address < hashp->LAST_FREED)
-		hashp->LAST_FREED = bit_address;
-	free_page = (bit_address >> (hashp->BSHIFT + BYTE_SHIFT));
-	free_bit = bit_address & ((hashp->BSIZE << BYTE_SHIFT) - 1);
-
-	if (!(freep = hashp->mapp[free_page]))
-		freep = fetch_bitmap(hashp, free_page);
-#ifdef DEBUG
-	/*
-	 * This had better never happen.  It means we tried to read a bitmap
-	 * that has already had overflow pages allocated off it, and we
-	 * failed to read it from the file.
-	 */
-	if (!freep)
-		assert(0);
-#endif
-	CLRBIT(freep, free_bit);
-#ifdef DEBUG2
-	(void)fprintf(stderr, "FREE_OVFLPAGE: ADDR: %d BIT: %d PAGE %d\n",
-	    obufp->addr, free_bit, free_page);
-#endif
-	__reclaim_buf(hashp, obufp);
-}
-
-/*
- * Returns:
- *	 0 success
- *	-1 failure
- */
-static int
-open_temp(HTAB *hashp)
-{
-	sigset_t set, oset;
-	int len;
-	char *envtmp = NULL;
-	char path[MAXPATHLEN];
-
-	if (issetugid() == 0)
-		envtmp = getenv("TMPDIR");
-	len = snprintf(path,
-	    sizeof(path), "%s/_hash.XXXXXX", envtmp ? envtmp : "/tmp");
-	if (len < 0 || len >= (int)sizeof(path)) {
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-
-	/* Block signals; make sure file goes away at process exit. */
-	(void)sigfillset(&set);
-	(void)__libc_sigprocmask(SIG_BLOCK, &set, &oset);
-	if ((hashp->fp = mkostemp(path, O_CLOEXEC)) != -1)
-		(void)unlink(path);
-	(void)__libc_sigprocmask(SIG_SETMASK, &oset, (sigset_t *)NULL);
-	return (hashp->fp != -1 ? 0 : -1);
-}
-
-/*
- * We have to know that the key will fit, but the last entry on the page is
- * an overflow pair, so we need to shift things.
- */
-static void
-squeeze_key(u_int16_t *sp, const DBT *key, const DBT *val)
-{
-	char *p;
-	u_int16_t free_space, n, off, pageno;
-
-	p = (char *)sp;
-	n = sp[0];
-	free_space = FREESPACE(sp);
-	off = OFFSET(sp);
-
-	pageno = sp[n - 1];
-	off -= key->size;
-	sp[n - 1] = off;
-	memmove(p + off, key->data, key->size);
-	off -= val->size;
-	sp[n] = off;
-	memmove(p + off, val->data, val->size);
-	sp[0] = n + 2;
-	sp[n + 1] = pageno;
-	sp[n + 2] = OVFLPAGE;
-	FREESPACE(sp) = free_space - PAIRSIZE(key, val);
-	OFFSET(sp) = off;
-}
-
-static uint32_t *
-fetch_bitmap(HTAB *hashp, int ndx)
-{
-	if (ndx >= hashp->nmaps)
-		return (NULL);
-	if ((hashp->mapp[ndx] = (uint32_t *)malloc(hashp->BSIZE)) == NULL)
-		return (NULL);
-	if (__get_page(hashp,
-	    (char *)hashp->mapp[ndx], hashp->BITMAPS[ndx], 0, 1, 1)) {
-		free(hashp->mapp[ndx]);
-		return (NULL);
-	}
-	return (hashp->mapp[ndx]);
-}
-
-#ifdef DEBUG4
-int
-print_chain(int addr)
-{
-	BUFHEAD *bufp;
-	short *bp, oaddr;
-
-	(void)fprintf(stderr, "%d ", addr);
-	bufp = __get_buf(hashp, addr, NULL, 0);
-	bp = (short *)bufp->page;
-	while (bp[0] && ((bp[bp[0]] == OVFLPAGE) ||
-		((bp[0] > 2) && bp[2] < REAL_KEY))) {
-		oaddr = bp[bp[0] - 1];
-		(void)fprintf(stderr, "%d ", (int)oaddr);
-		bufp = __get_buf(hashp, (int)oaddr, bufp, 0);
-		bp = (short *)bufp->page;
-	}
-	(void)fprintf(stderr, "\n");
-}
-#endif
diff --git a/lib/libc_bsd/db/hash/ndbm.c b/lib/libc_bsd/db/hash/ndbm.c
deleted file mode 100644
index e932442..0000000
--- a/lib/libc_bsd/db/hash/ndbm.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ndbm.c	8.4 (Berkeley) 7/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/hash/ndbm.c 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * This package provides a dbm compatible interface to the new hashing
- * package described in db(3).
- */
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-#include <ndbm.h>
-#include "hash.h"
-
-/*
- * Returns:
- * 	*DBM on success
- *	 NULL on failure
- */
-extern DBM *
-dbm_open(file, flags, mode)
-	const char *file;
-	int flags, mode;
-{
-	HASHINFO info;
-	char path[MAXPATHLEN];
-
-	info.bsize = 4096;
-	info.ffactor = 40;
-	info.nelem = 1;
-	info.cachesize = 0;
-	info.hash = NULL;
-	info.lorder = 0;
-
-	if( strlen(file) >= sizeof(path) - strlen(DBM_SUFFIX)) {
-		errno = ENAMETOOLONG;
-		return(NULL);
-	}
-	(void)strcpy(path, file);
-	(void)strcat(path, DBM_SUFFIX);
-	return ((DBM *)__hash_open(path, flags, mode, &info, 0));
-}
-
-extern void
-dbm_close(db)
-	DBM *db;
-{
-	(void)(db->close)(db);
-}
-
-/*
- * Returns:
- *	DATUM on success
- *	NULL on failure
- */
-extern datum
-dbm_fetch(db, key)
-	DBM *db;
-	datum key;
-{
-	datum retdata;
-	int status;
-	DBT dbtkey, dbtretdata;
-
-	dbtkey.data = key.dptr;
-	dbtkey.size = key.dsize;
-	status = (db->get)(db, &dbtkey, &dbtretdata, 0);
-	if (status) {
-		dbtretdata.data = NULL;
-		dbtretdata.size = 0;
-	}
-	retdata.dptr = dbtretdata.data;
-	retdata.dsize = dbtretdata.size;
-	return (retdata);
-}
-
-/*
- * Returns:
- *	DATUM on success
- *	NULL on failure
- */
-extern datum
-dbm_firstkey(db)
-	DBM *db;
-{
-	int status;
-	datum retkey;
-	DBT dbtretkey, dbtretdata;
-
-	status = (db->seq)(db, &dbtretkey, &dbtretdata, R_FIRST);
-	if (status)
-		dbtretkey.data = NULL;
-	retkey.dptr = dbtretkey.data;
-	retkey.dsize = dbtretkey.size;
-	return (retkey);
-}
-
-/*
- * Returns:
- *	DATUM on success
- *	NULL on failure
- */
-extern datum
-dbm_nextkey(db)
-	DBM *db;
-{
-	int status;
-	datum retkey;
-	DBT dbtretkey, dbtretdata;
-
-	status = (db->seq)(db, &dbtretkey, &dbtretdata, R_NEXT);
-	if (status)
-		dbtretkey.data = NULL;
-	retkey.dptr = dbtretkey.data;
-	retkey.dsize = dbtretkey.size;
-	return (retkey);
-}
-
-/*
- * Returns:
- *	 0 on success
- *	<0 failure
- */
-extern int
-dbm_delete(db, key)
-	DBM *db;
-	datum key;
-{
-	int status;
-	DBT dbtkey;
-
-	dbtkey.data = key.dptr;
-	dbtkey.size = key.dsize;
-	status = (db->del)(db, &dbtkey, 0);
-	if (status)
-		return (-1);
-	else
-		return (0);
-}
-
-/*
- * Returns:
- *	 0 on success
- *	<0 failure
- *	 1 if DBM_INSERT and entry exists
- */
-extern int
-dbm_store(db, key, data, flags)
-	DBM *db;
-	datum key, data;
-	int flags;
-{
-	DBT dbtkey, dbtdata;
-
-	dbtkey.data = key.dptr;
-	dbtkey.size = key.dsize;
-	dbtdata.data = data.dptr;
-	dbtdata.size = data.dsize;
-	return ((db->put)(db, &dbtkey, &dbtdata,
-	    (flags == DBM_INSERT) ? R_NOOVERWRITE : 0));
-}
-
-extern int
-dbm_error(db)
-	DBM *db;
-{
-	HTAB *hp;
-
-	hp = (HTAB *)db->internal;
-	return (hp->error);
-}
-
-extern int
-dbm_clearerr(db)
-	DBM *db;
-{
-	HTAB *hp;
-
-	hp = (HTAB *)db->internal;
-	hp->error = 0;
-	return (0);
-}
-
-extern int
-dbm_dirfno(db)
-	DBM *db;
-{
-	return(((HTAB *)db->internal)->fp);
-}
diff --git a/lib/libc_bsd/db/hash/page.h b/lib/libc_bsd/db/hash/page.h
deleted file mode 100644
index 741d0c9..0000000
--- a/lib/libc_bsd/db/hash/page.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- *
- *	@(#)page.h	8.2 (Berkeley) 5/31/94
- * $FreeBSD: releng/10.2/lib/libc/db/hash/page.h 189327 2009-03-04 00:58:04Z delphij $
- */
-
-/*
- * Definitions for hashing page file format.
- */
-
-/*
- * routines dealing with a data page
- *
- * page format:
- *	+------------------------------+
- * p	| n | keyoff | datoff | keyoff |
- * 	+------------+--------+--------+
- *	| datoff | free  |  ptr  | --> |
- *	+--------+---------------------+
- *	|	 F R E E A R E A       |
- *	+--------------+---------------+
- *	|  <---- - - - | data	       |
- *	+--------+-----+----+----------+
- *	|  key   | data     | key      |
- *	+--------+----------+----------+
- *
- * Pointer to the free space is always:  p[p[0] + 2]
- * Amount of free space on the page is:  p[p[0] + 1]
- */
-
-/*
- * How many bytes required for this pair?
- *	2 shorts in the table at the top of the page + room for the
- *	key and room for the data
- *
- * We prohibit entering a pair on a page unless there is also room to append
- * an overflow page. The reason for this it that you can get in a situation
- * where a single key/data pair fits on a page, but you can't append an
- * overflow page and later you'd have to split the key/data and handle like
- * a big pair.
- * You might as well do this up front.
- */
-
-#define	PAIRSIZE(K,D)	(2*sizeof(u_int16_t) + (K)->size + (D)->size)
-#define BIGOVERHEAD	(4*sizeof(u_int16_t))
-#define KEYSIZE(K)	(4*sizeof(u_int16_t) + (K)->size);
-#define OVFLSIZE	(2*sizeof(u_int16_t))
-#define FREESPACE(P)	((P)[(P)[0]+1])
-#define	OFFSET(P)	((P)[(P)[0]+2])
-#define PAIRFITS(P,K,D) \
-	(((P)[2] >= REAL_KEY) && \
-	    (PAIRSIZE((K),(D)) + OVFLSIZE) <= FREESPACE((P)))
-#define PAGE_META(N)	(((N)+3) * sizeof(u_int16_t))
-
-typedef struct {
-	BUFHEAD *newp;
-	BUFHEAD *oldp;
-	BUFHEAD *nextp;
-	u_int16_t next_addr;
-}       SPLIT_RETURN;
diff --git a/lib/libc_bsd/db/man/Makefile.inc b/lib/libc_bsd/db/man/Makefile.inc
deleted file mode 100644
index a0200a7..0000000
--- a/lib/libc_bsd/db/man/Makefile.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 107052 2002-11-18 09:50:57Z ru $
-
-.PATH: ${.CURDIR}/db/man
-
-MAN+=	btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3
-
-MLINKS+= dbm.3 dbm_clearerr.3
-MLINKS+= dbm.3 dbm_close.3
-MLINKS+= dbm.3 dbm_delete.3
-MLINKS+= dbm.3 dbm_dirnfo.3
-MLINKS+= dbm.3 dbm_error.3
-MLINKS+= dbm.3 dbm_fetch.3
-MLINKS+= dbm.3 dbm_firstkey.3
-MLINKS+= dbm.3 dbm_nextkey.3
-MLINKS+= dbm.3 dbm_open.3
-MLINKS+= dbm.3 dbm_store.3
-MLINKS+= dbopen.3 db.3
diff --git a/lib/libc_bsd/db/man/btree.3 b/lib/libc_bsd/db/man/btree.3
deleted file mode 100644
index 16f4950..0000000
--- a/lib/libc_bsd/db/man/btree.3
+++ /dev/null
@@ -1,271 +0,0 @@
-.\" Copyright (c) 1990, 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.
-.\" 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.
-.\"
-.\"	@(#)btree.3	8.4 (Berkeley) 8/18/94
-.\" $FreeBSD: releng/10.2/lib/libc/db/man/btree.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd August 18, 1994
-.Dt BTREE 3
-.Os
-.Sh NAME
-.Nm btree
-.Nd "btree database access method"
-.Sh SYNOPSIS
-.In sys/types.h
-.In db.h
-.Sh DESCRIPTION
-The routine
-.Fn dbopen
-is the library interface to database files.
-One of the supported file formats is
-.Nm
-files.
-The general description of the database access methods is in
-.Xr dbopen 3 ,
-this manual page describes only the
-.Nm
-specific information.
-.Pp
-The
-.Nm
-data structure is a sorted, balanced tree structure storing
-associated key/data pairs.
-.Pp
-The
-.Nm
-access method specific data structure provided to
-.Fn dbopen
-is defined in the
-.In db.h
-include file as follows:
-.Bd -literal
-typedef struct {
-	u_long flags;
-	u_int cachesize;
-	int maxkeypage;
-	int minkeypage;
-	u_int psize;
-	int (*compare)(const DBT *key1, const DBT *key2);
-	size_t (*prefix)(const DBT *key1, const DBT *key2);
-	int lorder;
-} BTREEINFO;
-.Ed
-.Pp
-The elements of this structure are as follows:
-.Bl -tag -width indent
-.It Va flags
-The flag value is specified by
-.Em or Ns 'ing
-any of the following values:
-.Bl -tag -width indent
-.It Dv R_DUP
-Permit duplicate keys in the tree, i.e., permit insertion if the key to be
-inserted already exists in the tree.
-The default behavior, as described in
-.Xr dbopen 3 ,
-is to overwrite a matching key when inserting a new key or to fail if
-the
-.Dv R_NOOVERWRITE
-flag is specified.
-The
-.Dv R_DUP
-flag is overridden by the
-.Dv R_NOOVERWRITE
-flag, and if the
-.Dv R_NOOVERWRITE
-flag is specified, attempts to insert duplicate keys into
-the tree will fail.
-.Pp
-If the database contains duplicate keys, the order of retrieval of
-key/data pairs is undefined if the
-.Va get
-routine is used, however,
-.Va seq
-routine calls with the
-.Dv R_CURSOR
-flag set will always return the logical
-.Dq first
-of any group of duplicate keys.
-.El
-.It Va cachesize
-A suggested maximum size (in bytes) of the memory cache.
-This value is
-.Em only
-advisory, and the access method will allocate more memory rather than fail.
-Since every search examines the root page of the tree, caching the most
-recently used pages substantially improves access time.
-In addition, physical writes are delayed as long as possible, so a moderate
-cache can reduce the number of I/O operations significantly.
-Obviously, using a cache increases (but only increases) the likelihood of
-corruption or lost data if the system crashes while a tree is being modified.
-If
-.Va cachesize
-is 0 (no size is specified) a default cache is used.
-.It Va maxkeypage
-The maximum number of keys which will be stored on any single page.
-Not currently implemented.
-.\" The maximum number of keys which will be stored on any single page.
-.\" Because of the way the
-.\" .Nm
-.\" data structure works,
-.\" .Va maxkeypage
-.\" must always be greater than or equal to 2.
-.\" If
-.\" .Va maxkeypage
-.\" is 0 (no maximum number of keys is specified) the page fill factor is
-.\" made as large as possible (which is almost invariably what is wanted).
-.It Va minkeypage
-The minimum number of keys which will be stored on any single page.
-This value is used to determine which keys will be stored on overflow
-pages, i.e., if a key or data item is longer than the pagesize divided
-by the minkeypage value, it will be stored on overflow pages instead
-of in the page itself.
-If
-.Va minkeypage
-is 0 (no minimum number of keys is specified) a value of 2 is used.
-.It Va psize
-Page size is the size (in bytes) of the pages used for nodes in the tree.
-The minimum page size is 512 bytes and the maximum page size is 64K.
-If
-.Va psize
-is 0 (no page size is specified) a page size is chosen based on the
-underlying file system I/O block size.
-.It Va compare
-Compare is the key comparison function.
-It must return an integer less than, equal to, or greater than zero if the
-first key argument is considered to be respectively less than, equal to,
-or greater than the second key argument.
-The same comparison function must be used on a given tree every time it
-is opened.
-If
-.Va compare
-is
-.Dv NULL
-(no comparison function is specified), the keys are compared
-lexically, with shorter keys considered less than longer keys.
-.It Va prefix
-The
-.Va prefix
-element
-is the prefix comparison function.
-If specified, this routine must return the number of bytes of the second key
-argument which are necessary to determine that it is greater than the first
-key argument.
-If the keys are equal, the key length should be returned.
-Note, the usefulness of this routine is very data dependent, but, in some
-data sets can produce significantly reduced tree sizes and search times.
-If
-.Va prefix
-is
-.Dv NULL
-(no prefix function is specified),
-.Em and
-no comparison function is specified, a default lexical comparison routine
-is used.
-If
-.Va prefix
-is
-.Dv NULL
-and a comparison routine is specified, no prefix comparison is
-done.
-.It Va lorder
-The byte order for integers in the stored database metadata.
-The number should represent the order as an integer; for example,
-big endian order would be the number 4,321.
-If
-.Va lorder
-is 0 (no order is specified) the current host order is used.
-.El
-.Pp
-If the file already exists (and the
-.Dv O_TRUNC
-flag is not specified), the
-values specified for the
-.Va flags , lorder
-and
-.Va psize
-arguments
-are ignored
-in favor of the values used when the tree was created.
-.Pp
-Forward sequential scans of a tree are from the least key to the greatest.
-.Pp
-Space freed up by deleting key/data pairs from the tree is never reclaimed,
-although it is normally made available for reuse.
-This means that the
-.Nm
-storage structure is grow-only.
-The only solutions are to avoid excessive deletions, or to create a fresh
-tree periodically from a scan of an existing one.
-.Pp
-Searches, insertions, and deletions in a
-.Nm
-will all complete in
-O lg base N where base is the average fill factor.
-Often, inserting ordered data into
-.Nm Ns s
-results in a low fill factor.
-This implementation has been modified to make ordered insertion the best
-case, resulting in a much better than normal page fill factor.
-.Sh ERRORS
-The
-.Nm
-access method routines may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr dbopen 3 .
-.Sh SEE ALSO
-.Xr dbopen 3 ,
-.Xr hash 3 ,
-.Xr mpool 3 ,
-.Xr recno 3
-.Rs
-.%T "The Ubiquitous B-tree"
-.%A Douglas Comer
-.%J "ACM Comput. Surv. 11"
-.%N 2
-.%D June 1979
-.%P 121-138
-.Re
-.Rs
-.%A Bayer
-.%A Unterauer
-.%T "Prefix B-trees"
-.%J "ACM Transactions on Database Systems"
-.%N 1
-.%V Vol. 2
-.%D March 1977
-.%P 11-26
-.Re
-.Rs
-.%B "The Art of Computer Programming Vol. 3: Sorting and Searching"
-.%A D. E. Knuth
-.%D 1968
-.%P 471-480
-.Re
-.Sh BUGS
-Only big and little endian byte order is supported.
diff --git a/lib/libc_bsd/db/man/dbm.3 b/lib/libc_bsd/db/man/dbm.3
deleted file mode 100644
index 32695d2..0000000
--- a/lib/libc_bsd/db/man/dbm.3
+++ /dev/null
@@ -1,226 +0,0 @@
-.\" Copyright (c) 1999 Tim Singletary
-.\" No copyright is claimed.
-.\"
-.\" 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: releng/10.2/lib/libc/db/man/dbm.3 280394 2015-03-23 19:50:21Z pfg $
-.\"
-.Dd February 19, 2015
-.Dt DBM 3
-.Os
-.Sh NAME
-.Nm dbm_clearerr ,
-.Nm dbm_close ,
-.Nm dbm_delete ,
-.Nm dbm_dirfno ,
-.Nm dbm_error ,
-.Nm dbm_fetch ,
-.Nm dbm_firstkey ,
-.Nm dbm_nextkey ,
-.Nm dbm_open ,
-.Nm dbm_store
-.Nd database access functions
-.Sh SYNOPSIS
-.In fcntl.h
-.In ndbm.h
-.Ft DBM *
-.Fn dbm_open "const char *base" "int flags" "int mode"
-.Ft void
-.Fn dbm_close "DBM *db"
-.Ft int
-.Fn dbm_store "DBM *db" "datum key" "datum data" "int flags"
-.Ft datum
-.Fn dbm_fetch "DBM *db" "datum key"
-.Ft int
-.Fn dbm_delete "DBM *db" "datum key"
-.Ft datum
-.Fn dbm_firstkey "DBM *db"
-.Ft datum
-.Fn dbm_nextkey "DBM *db"
-.Ft int
-.Fn dbm_error "DBM *db"
-.Ft int
-.Fn dbm_clearerr "DBM *db"
-.Ft int
-.Fn dbm_dirfno "DBM *db"
-.Sh DESCRIPTION
-Database access functions.
-These functions are implemented using
-.Xr dbopen 3
-with a
-.Xr hash 3
-database.
-.Pp
-.Vt datum
-is declared in
-.In ndbm.h :
-.Bd -literal
-typedef struct {
-	char *dptr;
-	int dsize;
-} datum;
-.Ed
-.Pp
-The
-.Fn dbm_open base flags mode
-function
-opens or creates a database.
-The
-.Fa base
-argument
-is the basename of the file containing
-the database; the actual database has a
-.Pa .db
-suffix.
-I.e., if
-.Fa base
-is
-.Qq Li /home/me/mystuff
-then the actual database is in the file
-.Pa /home/me/mystuff.db .
-The
-.Fa flags
-and
-.Fa mode
-arguments
-are passed to
-.Xr open 2 .
-.Pq Dv O_RDWR | O_CREAT
-is a typical value for
-.Fa flags ;
-.Li 0660
-is a typical value for
-.Fa mode .
-.Dv O_WRONLY
-is not allowed in
-.Fa flags .
-The pointer returned by
-.Fn dbm_open
-identifies the database and is the
-.Fa db
-argument to the other functions.
-The
-.Fn dbm_open
-function
-returns
-.Dv NULL
-and sets
-.Va errno
-if there were any errors.
-.Pp
-The
-.Fn dbm_close db
-function
-closes the database.
-.Pp
-The
-.Fn dbm_store db key data flags
-function
-inserts or replaces an entry in the database.
-The
-.Fa flags
-argument
-is either
-.Dv DBM_INSERT
-or
-.Dv DBM_REPLACE .
-If
-.Fa flags
-is
-.Dv DBM_INSERT
-and the database already contains an entry for
-.Fa key ,
-that entry is not replaced.
-Otherwise the entry is replaced or inserted.
-The
-.Fn dbm_store
-function
-normally returns zero but returns 1 if the entry could not be
-inserted (because
-.Fa flags
-is
-.Dv DBM_INSERT ,
-and an entry with
-.Fa key
-already exists) or returns -1 and sets
-.Va errno
-if there were any errors.
-.Pp
-The
-.Fn dbm_fetch db key
-function
-returns
-.Dv NULL
-or the
-.Fa data
-corresponding to
-.Fa key .
-.Pp
-The
-.Fn dbm_delete db key
-function
-deletes the entry for
-.Fa key .
-The
-.Fn dbm_delete
-function
-normally returns zero or returns -1 and sets
-.Va errno
-if there were any errors.
-.Pp
-The
-.Fn dbm_firstkey db
-function
-returns the first key in the database.
-The
-.Fn dbm_nextkey db
-function
-returns subsequent keys.
-The
-.Fn db_firstkey
-function
-must be called before
-.Fn dbm_nextkey .
-The order in which keys are returned is unspecified and may appear
-random.
-The
-.Fn dbm_nextkey
-function
-returns
-.Dv NULL
-after all keys have been returned.
-.Pp
-The
-.Fn dbm_error db
-function
-returns the
-.Va errno
-value of the most recent error.
-The
-.Fn dbm_clearerr db
-function
-resets this value to 0 and returns 0.
-.Pp
-The
-.Fn dbm_dirfno db
-function
-returns the file descriptor to the database.
-.Sh SEE ALSO
-.Xr open 2 ,
-.Xr dbopen 3 ,
-.Xr hash 3
-.Sh STANDARDS
-These functions (except
-.Fn dbm_dirfno )
-are included in the
-.St -susv2 .
diff --git a/lib/libc_bsd/db/man/dbopen.3 b/lib/libc_bsd/db/man/dbopen.3
deleted file mode 100644
index 45710f4..0000000
--- a/lib/libc_bsd/db/man/dbopen.3
+++ /dev/null
@@ -1,546 +0,0 @@
-.\" Copyright (c) 1990, 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.
-.\" 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.
-.\"
-.\"	@(#)dbopen.3	8.5 (Berkeley) 1/2/94
-.\" $FreeBSD: releng/10.2/lib/libc/db/man/dbopen.3 212492 2010-09-12 14:04:05Z gjb $
-.\"
-.Dd September 10, 2010
-.Dt DBOPEN 3
-.Os
-.Sh NAME
-.Nm dbopen
-.Nd "database access methods"
-.Sh SYNOPSIS
-.In sys/types.h
-.In db.h
-.In fcntl.h
-.In limits.h
-.Ft DB *
-.Fn dbopen "const char *file" "int flags" "int mode" "DBTYPE type" "const void *openinfo"
-.Sh DESCRIPTION
-The
-.Fn dbopen
-function
-is the library interface to database files.
-The supported file formats are btree, hashed and UNIX file oriented.
-The btree format is a representation of a sorted, balanced tree structure.
-The hashed format is an extensible, dynamic hashing scheme.
-The flat-file format is a byte stream file with fixed or variable length
-records.
-The formats and file format specific information are described in detail
-in their respective manual pages
-.Xr btree 3 ,
-.Xr hash 3
-and
-.Xr recno 3 .
-.Pp
-The
-.Fn dbopen
-function
-opens
-.Fa file
-for reading and/or writing.
-Files never intended to be preserved on disk may be created by setting
-the
-.Fa file
-argument to
-.Dv NULL .
-.Pp
-The
-.Fa flags
-and
-.Fa mode
-arguments
-are as specified to the
-.Xr open 2
-routine, however, only the
-.Dv O_CREAT , O_EXCL , O_EXLOCK , O_NOFOLLOW , O_NONBLOCK ,
-.Dv O_RDONLY , O_RDWR , O_SHLOCK , O_SYNC
-and
-.Dv O_TRUNC
-flags are meaningful.
-(Note, opening a database file
-.Dv O_WRONLY
-is not possible.)
-.\"Three additional options may be specified by
-.\".Em or Ns 'ing
-.\"them into the
-.\".Fa flags
-.\"argument.
-.\".Bl -tag -width indent
-.\".It Dv DB_LOCK
-.\"Do the necessary locking in the database to support concurrent access.
-.\"If concurrent access is not needed or the database is read-only this
-.\"flag should not be set, as it tends to have an associated performance
-.\"penalty.
-.\".It Dv DB_SHMEM
-.\"Place the underlying memory pool used by the database in shared
-.\"memory.
-.\"Necessary for concurrent access.
-.\".It Dv DB_TXN
-.\"Support transactions in the database.
-.\"The
-.\".Dv DB_LOCK
-.\"and
-.\".Dv DB_SHMEM
-.\"flags must be set as well.
-.\".El
-.Pp
-The
-.Fa type
-argument is of type
-.Ft DBTYPE
-(as defined in the
-.In db.h
-include file) and
-may be set to
-.Dv DB_BTREE , DB_HASH
-or
-.Dv DB_RECNO .
-.Pp
-The
-.Fa openinfo
-argument is a pointer to an access method specific structure described
-in the access method's manual page.
-If
-.Fa openinfo
-is
-.Dv NULL ,
-each access method will use defaults appropriate for the system
-and the access method.
-.Pp
-The
-.Fn dbopen
-function
-returns a pointer to a
-.Ft DB
-structure on success and
-.Dv NULL
-on error.
-The
-.Ft DB
-structure is defined in the
-.In db.h
-include file, and contains at
-least the following fields:
-.Bd -literal
-typedef struct {
-	DBTYPE type;
-	int (*close)(DB *db);
-	int (*del)(const DB *db, const DBT *key, u_int flags);
-	int (*fd)(const DB *db);
-	int (*get)(const DB *db, const DBT *key, DBT *data, u_int flags);
-	int (*put)(const DB *db, DBT *key, const DBT *data,
-	     u_int flags);
-	int (*sync)(const DB *db, u_int flags);
-	int (*seq)(const DB *db, DBT *key, DBT *data, u_int flags);
-} DB;
-.Ed
-.Pp
-These elements describe a database type and a set of functions performing
-various actions.
-These functions take a pointer to a structure as returned by
-.Fn dbopen ,
-and sometimes one or more pointers to key/data structures and a flag value.
-.Bl -tag -width indent
-.It Va type
-The type of the underlying access method (and file format).
-.It Va close
-A pointer to a routine to flush any cached information to disk, free any
-allocated resources, and close the underlying file(s).
-Since key/data pairs may be cached in memory, failing to sync the file
-with a
-.Va close
-or
-.Va sync
-function may result in inconsistent or lost information.
-.Va close
-routines return -1 on error (setting
-.Va errno )
-and 0 on success.
-.It Va del
-A pointer to a routine to remove key/data pairs from the database.
-.Pp
-The
-.Fa flags
-argument
-may be set to the following value:
-.Bl -tag -width indent
-.It Dv R_CURSOR
-Delete the record referenced by the cursor.
-The cursor must have previously been initialized.
-.El
-.Pp
-.Va delete
-routines return -1 on error (setting
-.Va errno ) ,
-0 on success, and 1 if the specified
-.Fa key
-was not in the file.
-.It Va fd
-A pointer to a routine which returns a file descriptor representative
-of the underlying database.
-A file descriptor referencing the same file will be returned to all
-processes which call
-.Fn dbopen
-with the same
-.Fa file
-name.
-This file descriptor may be safely used as an argument to the
-.Xr fcntl 2
-and
-.Xr flock 2
-locking functions.
-The file descriptor is not necessarily associated with any of the
-underlying files used by the access method.
-No file descriptor is available for in memory databases.
-.Va \&Fd
-routines return -1 on error (setting
-.Va errno ) ,
-and the file descriptor on success.
-.It Va get
-A pointer to a routine which is the interface for keyed retrieval from
-the database.
-The address and length of the data associated with the specified
-.Fa key
-are returned in the structure referenced by
-.Fa data .
-.Va get
-routines return -1 on error (setting
-.Va errno ) ,
-0 on success, and 1 if the
-.Fa key
-was not in the file.
-.It Va put
-A pointer to a routine to store key/data pairs in the database.
-.Pp
-The
-.Fa flags
-argument
-may be set to one of the following values:
-.Bl -tag -width indent
-.It Dv R_CURSOR
-Replace the key/data pair referenced by the cursor.
-The cursor must have previously been initialized.
-.It Dv R_IAFTER
-Append the data immediately after the data referenced by
-.Fa key ,
-creating a new key/data pair.
-The record number of the appended key/data pair is returned in the
-.Fa key
-structure.
-(Applicable only to the
-.Dv DB_RECNO
-access method.)
-.It Dv R_IBEFORE
-Insert the data immediately before the data referenced by
-.Fa key ,
-creating a new key/data pair.
-The record number of the inserted key/data pair is returned in the
-.Fa key
-structure.
-(Applicable only to the
-.Dv DB_RECNO
-access method.)
-.It Dv R_NOOVERWRITE
-Enter the new key/data pair only if the key does not previously exist.
-.It Dv R_SETCURSOR
-Store the key/data pair, setting or initializing the position of the
-cursor to reference it.
-(Applicable only to the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access methods.)
-.El
-.Pp
-.Dv R_SETCURSOR
-is available only for the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access
-methods because it implies that the keys have an inherent order
-which does not change.
-.Pp
-.Dv R_IAFTER
-and
-.Dv R_IBEFORE
-are available only for the
-.Dv DB_RECNO
-access method because they each imply that the access method is able to
-create new keys.
-This is only true if the keys are ordered and independent, record numbers
-for example.
-.Pp
-The default behavior of the
-.Va put
-routines is to enter the new key/data pair, replacing any previously
-existing key.
-.Pp
-.Va put
-routines return -1 on error (setting
-.Va errno ) ,
-0 on success, and 1 if the
-.Dv R_NOOVERWRITE
-flag
-was set and the key already exists in the file.
-.It Va seq
-A pointer to a routine which is the interface for sequential
-retrieval from the database.
-The address and length of the key are returned in the structure
-referenced by
-.Fa key ,
-and the address and length of the data are returned in the
-structure referenced
-by
-.Fa data .
-.Pp
-Sequential key/data pair retrieval may begin at any time, and the
-position of the
-.Dq cursor
-is not affected by calls to the
-.Va del ,
-.Va get ,
-.Va put ,
-or
-.Va sync
-routines.
-Modifications to the database during a sequential scan will be reflected
-in the scan, i.e., records inserted behind the cursor will not be returned
-while records inserted in front of the cursor will be returned.
-.Pp
-The
-.Fa flags
-argument
-.Em must
-be set to one of the following values:
-.Bl -tag -width indent
-.It Dv R_CURSOR
-The data associated with the specified key is returned.
-This differs from the
-.Va get
-routines in that it sets or initializes the cursor to the location of
-the key as well.
-(Note, for the
-.Dv DB_BTREE
-access method, the returned key is not necessarily an
-exact match for the specified key.
-The returned key is the smallest key greater than or equal to the specified
-key, permitting partial key matches and range searches.)
-.It Dv R_FIRST
-The first key/data pair of the database is returned, and the cursor
-is set or initialized to reference it.
-.It Dv R_LAST
-The last key/data pair of the database is returned, and the cursor
-is set or initialized to reference it.
-(Applicable only to the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access methods.)
-.It Dv R_NEXT
-Retrieve the key/data pair immediately after the cursor.
-If the cursor is not yet set, this is the same as the
-.Dv R_FIRST
-flag.
-.It Dv R_PREV
-Retrieve the key/data pair immediately before the cursor.
-If the cursor is not yet set, this is the same as the
-.Dv R_LAST
-flag.
-(Applicable only to the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access methods.)
-.El
-.Pp
-.Dv R_LAST
-and
-.Dv R_PREV
-are available only for the
-.Dv DB_BTREE
-and
-.Dv DB_RECNO
-access methods because they each imply that the keys have an inherent
-order which does not change.
-.Pp
-.Va seq
-routines return -1 on error (setting
-.Va errno ) ,
-0 on success and 1 if there are no key/data pairs less than or greater
-than the specified or current key.
-If the
-.Dv DB_RECNO
-access method is being used, and if the database file
-is a character special file and no complete key/data pairs are currently
-available, the
-.Va seq
-routines return 2.
-.It Va sync
-A pointer to a routine to flush any cached information to disk.
-If the database is in memory only, the
-.Va sync
-routine has no effect and will always succeed.
-.Pp
-The
-.Fa flags
-argument may be set to the following value:
-.Bl -tag -width indent
-.It Dv R_RECNOSYNC
-If the
-.Dv DB_RECNO
-access method is being used, this flag causes
-the
-.Va sync
-routine to apply to the btree file which underlies the
-recno file, not the recno file itself.
-(See the
-.Va bfname
-field of the
-.Xr recno 3
-manual page for more information.)
-.El
-.Pp
-.Va sync
-routines return -1 on error (setting
-.Va errno )
-and 0 on success.
-.El
-.Sh "KEY/DATA PAIRS"
-Access to all file types is based on key/data pairs.
-Both keys and data are represented by the following data structure:
-.Bd -literal
-typedef struct {
-	void *data;
-	size_t size;
-} DBT;
-.Ed
-.Pp
-The elements of the
-.Ft DBT
-structure are defined as follows:
-.Bl -tag -width "data"
-.It Va data
-A pointer to a byte string.
-.It Va size
-The length of the byte string.
-.El
-.Pp
-Key and data byte strings may reference strings of essentially unlimited
-length although any two of them must fit into available memory at the same
-time.
-It should be noted that the access methods provide no guarantees about
-byte string alignment.
-.Sh ERRORS
-The
-.Fn dbopen
-routine may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr open 2
-and
-.Xr malloc 3
-or the following:
-.Bl -tag -width Er
-.It Bq Er EFTYPE
-A file is incorrectly formatted.
-.It Bq Er EINVAL
-An argument has been specified (hash function, pad byte etc.) that is
-incompatible with the current file specification or which is not
-meaningful for the function (for example, use of the cursor without
-prior initialization) or there is a mismatch between the version
-number of file and the software.
-.El
-.Pp
-The
-.Va close
-routines may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr close 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr free 3 ,
-or
-.Xr fsync 2 .
-.Pp
-The
-.Va del ,
-.Va get ,
-.Va put
-and
-.Va seq
-routines may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr free 3
-or
-.Xr malloc 3 .
-.Pp
-The
-.Va fd
-routines will fail and set
-.Va errno
-to
-.Er ENOENT
-for in memory databases.
-.Pp
-The
-.Va sync
-routines may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr fsync 2 .
-.Sh SEE ALSO
-.Xr btree 3 ,
-.Xr hash 3 ,
-.Xr mpool 3 ,
-.Xr recno 3
-.Rs
-.%T "LIBTP: Portable, Modular Transactions for UNIX"
-.%A Margo Seltzer
-.%A Michael Olson
-.%R "USENIX proceedings"
-.%D Winter 1992
-.Re
-.Sh BUGS
-The typedef
-.Ft DBT
-is a mnemonic for
-.Dq "data base thang" ,
-and was used
-because noone could think of a reasonable name that was not already used.
-.Pp
-The file descriptor interface is a kluge and will be deleted in a
-future version of the interface.
-.Pp
-None of the access methods provide any form of concurrent access,
-locking, or transactions.
diff --git a/lib/libc_bsd/db/man/hash.3 b/lib/libc_bsd/db/man/hash.3
deleted file mode 100644
index fe859c6..0000000
--- a/lib/libc_bsd/db/man/hash.3
+++ /dev/null
@@ -1,196 +0,0 @@
-.\" Copyright (c) 1990, 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.
-.\" 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.
-.\"
-.\"	@(#)hash.3	8.6 (Berkeley) 8/18/94
-.\" $FreeBSD: releng/10.2/lib/libc/db/man/hash.3 231564 2012-02-12 18:29:56Z ed $
-.\"
-.Dd August 18, 1994
-.Dt HASH 3
-.Os
-.Sh NAME
-.Nm hash
-.Nd "hash database access method"
-.Sh SYNOPSIS
-.In sys/types.h
-.In db.h
-.Sh DESCRIPTION
-The routine
-.Fn dbopen
-is the library interface to database files.
-One of the supported file formats is
-.Nm
-files.
-The general description of the database access methods is in
-.Xr dbopen 3 ,
-this manual page describes only the
-.Nm
-specific information.
-.Pp
-The
-.Nm
-data structure is an extensible, dynamic hashing scheme.
-.Pp
-The access method specific data structure provided to
-.Fn dbopen
-is defined in the
-.In db.h
-include file as follows:
-.Bd -literal
-typedef struct {
-	u_int bsize;
-	u_int ffactor;
-	u_int nelem;
-	u_int cachesize;
-	uint32_t (*hash)(const void *, size_t);
-	int lorder;
-} HASHINFO;
-.Ed
-.Pp
-The elements of this structure are as follows:
-.Bl -tag -width indent
-.It Va bsize
-The
-.Va bsize
-element
-defines the
-.Nm
-table bucket size, and is, by default, 4096 bytes.
-It may be preferable to increase the page size for disk-resident tables
-and tables with large data items.
-.It Va ffactor
-The
-.Va ffactor
-element
-indicates a desired density within the
-.Nm
-table.
-It is an approximation of the number of keys allowed to accumulate in any
-one bucket, determining when the
-.Nm
-table grows or shrinks.
-The default value is 8.
-.It Va nelem
-The
-.Va nelem
-element
-is an estimate of the final size of the
-.Nm
-table.
-If not set or set too low,
-.Nm
-tables will expand gracefully as keys
-are entered, although a slight performance degradation may be noticed.
-The default value is 1.
-.It Va cachesize
-A suggested maximum size, in bytes, of the memory cache.
-This value is
-.Em only
-advisory, and the access method will allocate more memory rather
-than fail.
-.It Va hash
-The
-.Va hash
-element
-is a user defined
-.Nm
-function.
-Since no
-.Nm
-function performs equally well on all possible data, the
-user may find that the built-in
-.Nm
-function does poorly on a particular
-data set.
-User specified
-.Nm
-functions must take two arguments (a pointer to a byte
-string and a length) and return a 32-bit quantity to be used as the
-.Nm
-value.
-.It Va lorder
-The byte order for integers in the stored database metadata.
-The number should represent the order as an integer; for example,
-big endian order would be the number 4,321.
-If
-.Va lorder
-is 0 (no order is specified) the current host order is used.
-If the file already exists, the specified value is ignored and the
-value specified when the tree was created is used.
-.El
-.Pp
-If the file already exists (and the
-.Dv O_TRUNC
-flag is not specified), the
-values specified for the
-.Va bsize , ffactor , lorder
-and
-.Va nelem
-arguments
-are
-ignored and the values specified when the tree was created are used.
-.Pp
-If a
-.Nm
-function is specified,
-.Fn hash_open
-will attempt to determine if the
-.Nm
-function specified is the same as
-the one with which the database was created, and will fail if it is not.
-.Pp
-Backward compatible interfaces to the older
-.Em dbm
-and
-.Em ndbm
-routines are provided, however these interfaces are not compatible with
-previous file formats.
-.Sh ERRORS
-The
-.Nm
-access method routines may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr dbopen 3 .
-.Sh SEE ALSO
-.Xr btree 3 ,
-.Xr dbopen 3 ,
-.Xr mpool 3 ,
-.Xr recno 3
-.Rs
-.%T "Dynamic Hash Tables"
-.%A Per-Ake Larson
-.%R "Communications of the ACM"
-.%D April 1988
-.Re
-.Rs
-.%T "A New Hash Package for UNIX"
-.%A Margo Seltzer
-.%R "USENIX Proceedings"
-.%D Winter 1991
-.Re
-.Sh BUGS
-Only big and little endian byte order is supported.
diff --git a/lib/libc_bsd/db/man/mpool.3 b/lib/libc_bsd/db/man/mpool.3
deleted file mode 100644
index d0abe2f..0000000
--- a/lib/libc_bsd/db/man/mpool.3
+++ /dev/null
@@ -1,254 +0,0 @@
-.\" Copyright (c) 1990, 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.
-.\" 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.
-.\"
-.\"	@(#)mpool.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/db/man/mpool.3 223214 2011-06-18 00:10:21Z delphij $
-.\"
-.Dd June 17, 2011
-.Dt MPOOL 3
-.Os
-.Sh NAME
-.Nm mpool
-.Nd "shared memory buffer pool"
-.Sh SYNOPSIS
-.In db.h
-.In mpool.h
-.Ft MPOOL *
-.Fn mpool_open "void *key" "int fd" "pgno_t pagesize" "pgno_t maxcache"
-.Ft void
-.Fo mpool_filter
-.Fa "MPOOL *mp"
-.Fa "void (*pgin)(void *, pgno_t, void *)"
-.Fa "void (*pgout)(void *, pgno_t, void *)"
-.Fa "void *pgcookie"
-.Fc
-.Ft void *
-.Fn mpool_new "MPOOL *mp" "pgno_t *pgnoaddr" "u_int flags"
-.Ft int
-.Fn mpool_delete "MPOOL *mp" "void *page"
-.Ft void *
-.Fn mpool_get "MPOOL *mp" "pgno_t pgno" "u_int flags"
-.Ft int
-.Fn mpool_put "MPOOL *mp" "void *pgaddr" "u_int flags"
-.Ft int
-.Fn mpool_sync "MPOOL *mp"
-.Ft int
-.Fn mpool_close "MPOOL *mp"
-.Sh DESCRIPTION
-The
-.Nm mpool
-library interface is intended to provide page oriented buffer management
-of files.
-.Pp
-The
-.Fn mpool_open
-function initializes a memory pool.
-The
-.Fa key
-argument is currently ignored.
-The
-.Fa fd
-argument is a file descriptor for the underlying file, which must be seekable.
-.Pp
-The
-.Fa pagesize
-argument is the size, in bytes, of the pages into which the file is broken up.
-The
-.Fa maxcache
-argument is the maximum number of pages from the underlying file to cache
-at any one time.
-This value is not relative to the number of processes which share a file's
-buffers, but will be the largest value specified by any of the processes
-sharing the file.
-.Pp
-The
-.Fn mpool_filter
-function is intended to make transparent input and output processing of the
-pages possible.
-If the
-.Fa pgin
-function is specified, it is called each time a buffer is read into the memory
-pool from the backing file.
-If the
-.Fa pgout
-function is specified, it is called each time a buffer is written into the
-backing file.
-Both functions are called with the
-.Fa pgcookie
-pointer, the page number and a pointer to the page to being read or written.
-.Pp
-The function
-.Fn mpool_new
-takes an
-.Dv MPOOL
-pointer, an address, and a set of flags as arguments.
-If a new page can be allocated, a pointer to the page is returned and
-the page number is stored into the
-.Fa pgnoaddr
-address.
-Otherwise,
-.Dv NULL
-is returned and
-.Va errno
-is set.
-The flags value is formed by
-.Tn OR Ns 'ing
-the following values:
-.Bl -tag -width Ds
-.It Dv MPOOL_PAGE_REQUEST
-Allocate a new page with a specific page number.
-.It Dv MPOOL_PAGE_NEXT
-Allocate a new page with the next page number.
-.El
-.Pp
-The function
-.Fn mpool_delete
-deletes the specified page from a pool and frees the page.
-It takes an
-.Dv MPOOL
-pointer and a page as arguments.
-The page must have been generated by
-.Fn mpool_new .
-.Pp
-The
-.Fn mpool_get
-function takes a
-.Ft MPOOL
-pointer and a page number as arguments.
-If the page exists, a pointer to the page is returned.
-Otherwise,
-.Dv NULL
-is returned and
-.Va errno
-is set.
-The
-.Fa flags
-argument is specified by
-.Em or Ns 'ing
-any of the following values:
-.Bl -tag -width indent
-.It Dv MPOOL_IGNOREPIN
-The page returned is not pinned;
-page will otherwise be pinned on return.
-.El
-.Pp
-The
-.Fn mpool_put
-function unpins the page referenced by
-.Fa pgaddr .
-The
-.Fa pgaddr
-argument
-must be an address previously returned by
-.Fn mpool_get
-or
-.Fn mpool_new .
-The
-.Fa flags
-argument is specified by
-.Em or Ns 'ing
-any of the following values:
-.Bl -tag -width indent
-.It Dv MPOOL_DIRTY
-The page has been modified and needs to be written to the backing file.
-.El
-.Pp
-The
-.Fn mpool_put
-function
-returns 0 on success and -1 if an error occurs.
-.Pp
-The
-.Fn mpool_sync
-function writes all modified pages associated with the
-.Ft MPOOL
-pointer to the
-backing file.
-The
-.Fn mpool_sync
-function
-returns 0 on success and -1 if an error occurs.
-.Pp
-The
-.Fn mpool_close
-function free's up any allocated memory associated with the memory pool
-cookie.
-Modified pages are
-.Em not
-written to the backing file.
-The
-.Fn mpool_close
-function
-returns 0 on success and -1 if an error occurs.
-.Sh ERRORS
-The
-.Fn mpool_open
-function may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr malloc 3 .
-.Pp
-The
-.Fn mpool_get
-function may fail and set
-.Va errno
-for the following:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The requested record does not exist.
-.El
-.Pp
-The
-.Fn mpool_new
-and
-.Fn mpool_get
-functions may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr read 2 ,
-.Xr write 2 ,
-and
-.Xr malloc 3 .
-.Pp
-The
-.Fn mpool_sync
-function may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr write 2 .
-.Pp
-The
-.Fn mpool_close
-function may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr free 3 .
-.Sh SEE ALSO
-.Xr btree 3 ,
-.Xr dbopen 3 ,
-.Xr hash 3 ,
-.Xr recno 3
diff --git a/lib/libc_bsd/db/man/recno.3 b/lib/libc_bsd/db/man/recno.3
deleted file mode 100644
index ef123e3..0000000
--- a/lib/libc_bsd/db/man/recno.3
+++ /dev/null
@@ -1,228 +0,0 @@
-.\" Copyright (c) 1990, 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.
-.\" 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.
-.\"
-.\"	@(#)recno.3	8.5 (Berkeley) 8/18/94
-.\" $FreeBSD: releng/10.2/lib/libc/db/man/recno.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd August 18, 1994
-.Dt RECNO 3
-.Os
-.Sh NAME
-.Nm recno
-.Nd "record number database access method"
-.Sh SYNOPSIS
-.In sys/types.h
-.In db.h
-.Sh DESCRIPTION
-The routine
-.Fn dbopen
-is the library interface to database files.
-One of the supported file formats is record number files.
-The general description of the database access methods is in
-.Xr dbopen 3 ,
-this manual page describes only the
-.Nm
-specific information.
-.Pp
-The record number data structure is either variable or fixed-length
-records stored in a flat-file format, accessed by the logical record
-number.
-The existence of record number five implies the existence of records
-one through four, and the deletion of record number one causes
-record number five to be renumbered to record number four, as well
-as the cursor, if positioned after record number one, to shift down
-one record.
-.Pp
-The
-.Nm
-access method specific data structure provided to
-.Fn dbopen
-is defined in the
-.In db.h
-include file as follows:
-.Bd -literal
-typedef struct {
-	u_long flags;
-	u_int cachesize;
-	u_int psize;
-	int lorder;
-	size_t reclen;
-	u_char bval;
-	char *bfname;
-} RECNOINFO;
-.Ed
-.Pp
-The elements of this structure are defined as follows:
-.Bl -tag -width indent
-.It Va flags
-The flag value is specified by
-.Em or Ns 'ing
-any of the following values:
-.Bl -tag -width indent
-.It Dv R_FIXEDLEN
-The records are fixed-length, not byte delimited.
-The structure element
-.Va reclen
-specifies the length of the record, and the structure element
-.Va bval
-is used as the pad character.
-Any records, inserted into the database, that are less than
-.Va reclen
-bytes long are automatically padded.
-.It Dv R_NOKEY
-In the interface specified by
-.Fn dbopen ,
-the sequential record retrieval fills in both the caller's key and
-data structures.
-If the
-.Dv R_NOKEY
-flag is specified, the
-.Em cursor
-routines are not required to fill in the key structure.
-This permits applications to retrieve records at the end of files without
-reading all of the intervening records.
-.It Dv R_SNAPSHOT
-This flag requires that a snapshot of the file be taken when
-.Fn dbopen
-is called, instead of permitting any unmodified records to be read from
-the original file.
-.El
-.It Va cachesize
-A suggested maximum size, in bytes, of the memory cache.
-This value is
-.Em only
-advisory, and the access method will allocate more memory rather than fail.
-If
-.Va cachesize
-is 0 (no size is specified) a default cache is used.
-.It Va psize
-The
-.Nm
-access method stores the in-memory copies of its records
-in a btree.
-This value is the size (in bytes) of the pages used for nodes in that tree.
-If
-.Va psize
-is 0 (no page size is specified) a page size is chosen based on the
-underlying file system I/O block size.
-See
-.Xr btree 3
-for more information.
-.It Va lorder
-The byte order for integers in the stored database metadata.
-The number should represent the order as an integer; for example,
-big endian order would be the number 4,321.
-If
-.Va lorder
-is 0 (no order is specified) the current host order is used.
-.It Va reclen
-The length of a fixed-length record.
-.It Va bval
-The delimiting byte to be used to mark the end of a record for
-variable-length records, and the pad character for fixed-length
-records.
-If no value is specified, newlines
-.Pq Dq \en
-are used to mark the end
-of variable-length records and fixed-length records are padded with
-spaces.
-.It Va bfname
-The
-.Nm
-access method stores the in-memory copies of its records
-in a btree.
-If
-.Va bfname
-is
-.No non\- Ns Dv NULL ,
-it specifies the name of the btree file,
-as if specified as the file name for a
-.Fn dbopen
-of a btree file.
-.El
-.Pp
-The data part of the key/data pair used by the
-.Nm
-access method
-is the same as other access methods.
-The key is different.
-The
-.Va data
-field of the key should be a pointer to a memory location of type
-.Ft recno_t ,
-as defined in the
-.In db.h
-include file.
-This type is normally the largest unsigned integral type available to
-the implementation.
-The
-.Va size
-field of the key should be the size of that type.
-.Pp
-Because there can be no meta-data associated with the underlying
-.Nm
-access method files, any changes made to the default values
-(e.g.\& fixed record length or byte separator value) must be explicitly
-specified each time the file is opened.
-.Pp
-In the interface specified by
-.Fn dbopen ,
-using the
-.Va put
-interface to create a new record will cause the creation of multiple,
-empty records if the record number is more than one greater than the
-largest record currently in the database.
-.Sh ERRORS
-The
-.Nm
-access method routines may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr dbopen 3
-or the following:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-An attempt was made to add a record to a fixed-length database that
-was too large to fit.
-.El
-.Sh SEE ALSO
-.Xr btree 3 ,
-.Xr dbopen 3 ,
-.Xr hash 3 ,
-.Xr mpool 3
-.Rs
-.%T "Document Processing in a Relational Database System"
-.%A Michael Stonebraker
-.%A Heidi Stettner
-.%A Joseph Kalash
-.%A Antonin Guttman
-.%A Nadene Lynn
-.%R "Memorandum No. UCB/ERL M82/32"
-.%D May 1982
-.Re
-.Sh BUGS
-Only big and little endian byte order is supported.
diff --git a/lib/libc_bsd/db/mpool/Makefile.inc b/lib/libc_bsd/db/mpool/Makefile.inc
deleted file mode 100644
index f437c8a..0000000
--- a/lib/libc_bsd/db/mpool/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 190498 2009-03-28 07:31:02Z delphij $
-
-.PATH: ${.CURDIR}/db/mpool
-
-SRCS+=	mpool.c mpool-compat.c
diff --git a/lib/libc_bsd/db/mpool/README b/lib/libc_bsd/db/mpool/README
deleted file mode 100644
index 0f01fbc..0000000
--- a/lib/libc_bsd/db/mpool/README
+++ /dev/null
@@ -1,7 +0,0 @@
-#	@(#)README	8.1 (Berkeley) 6/4/93
-
-These are the current memory pool routines.
-They aren't ready for prime time, yet, and
-the interface is expected to change.
-
---keith
diff --git a/lib/libc_bsd/db/mpool/mpool-compat.c b/lib/libc_bsd/db/mpool/mpool-compat.c
deleted file mode 100644
index f1a048d..0000000
--- a/lib/libc_bsd/db/mpool/mpool-compat.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2009 Xin LI <delphij@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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/mpool/mpool-compat.c 190498 2009-03-28 07:31:02Z delphij $");
-
-#include <db.h>
-#include <mpool.h>
-
-void *__mpool_new__44bsd(MPOOL *, pgno_t *);
-
-void *
-__mpool_new__44bsd(MPOOL *mp, pgno_t *pgnoaddr)
-{
-
-	return (mpool_new(mp, pgnoaddr, MPOOL_PAGE_NEXT));
-}
-
-__sym_compat(mpool_new, __mpool_new_44bsd, FBSD_1.0);
diff --git a/lib/libc_bsd/db/mpool/mpool.c b/lib/libc_bsd/db/mpool/mpool.c
deleted file mode 100644
index 09f56b5..0000000
--- a/lib/libc_bsd/db/mpool/mpool.c
+++ /dev/null
@@ -1,493 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mpool.c	8.7 (Berkeley) 11/2/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/mpool/mpool.c 194804 2009-06-24 01:15:10Z delphij $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-
-#define	__MPOOLINTERFACE_PRIVATE
-#include <mpool.h>
-
-static BKT *mpool_bkt(MPOOL *);
-static BKT *mpool_look(MPOOL *, pgno_t);
-static int  mpool_write(MPOOL *, BKT *);
-
-/*
- * mpool_open --
- *	Initialize a memory pool.
- */
-/* ARGSUSED */
-MPOOL *
-mpool_open(void *key, int fd, pgno_t pagesize, pgno_t maxcache)
-{
-	struct stat sb;
-	MPOOL *mp;
-	int entry;
-
-	/*
-	 * Get information about the file.
-	 *
-	 * XXX
-	 * We don't currently handle pipes, although we should.
-	 */
-	if (_fstat(fd, &sb))
-		return (NULL);
-	if (!S_ISREG(sb.st_mode)) {
-		errno = ESPIPE;
-		return (NULL);
-	}
-
-	/* Allocate and initialize the MPOOL cookie. */
-	if ((mp = (MPOOL *)calloc(1, sizeof(MPOOL))) == NULL)
-		return (NULL);
-	TAILQ_INIT(&mp->lqh);
-	for (entry = 0; entry < HASHSIZE; ++entry)
-		TAILQ_INIT(&mp->hqh[entry]);
-	mp->maxcache = maxcache;
-	mp->npages = sb.st_size / pagesize;
-	mp->pagesize = pagesize;
-	mp->fd = fd;
-	return (mp);
-}
-
-/*
- * mpool_filter --
- *	Initialize input/output filters.
- */
-void
-mpool_filter(MPOOL *mp, void (*pgin) (void *, pgno_t, void *),
-    void (*pgout) (void *, pgno_t, void *), void *pgcookie)
-{
-	mp->pgin = pgin;
-	mp->pgout = pgout;
-	mp->pgcookie = pgcookie;
-}
-	
-/*
- * mpool_new --
- *	Get a new page of memory.
- */
-void *
-mpool_new(MPOOL *mp, pgno_t *pgnoaddr, u_int flags)
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	if (mp->npages == MAX_PAGE_NUMBER) {
-		(void)fprintf(stderr, "mpool_new: page allocation overflow.\n");
-		abort();
-	}
-#ifdef STATISTICS
-	++mp->pagenew;
-#endif
-	/*
-	 * Get a BKT from the cache.  Assign a new page number, attach
-	 * it to the head of the hash chain, the tail of the lru chain,
-	 * and return.
-	 */
-	if ((bp = mpool_bkt(mp)) == NULL)
-		return (NULL);
-	if (flags == MPOOL_PAGE_REQUEST) {
-		mp->npages++;
-		bp->pgno = *pgnoaddr;
-	} else
-		bp->pgno = *pgnoaddr = mp->npages++;
-
-	bp->flags = MPOOL_PINNED | MPOOL_INUSE;
-
-	head = &mp->hqh[HASHKEY(bp->pgno)];
-	TAILQ_INSERT_HEAD(head, bp, hq);
-	TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-	return (bp->page);
-}
-
-int
-mpool_delete(MPOOL *mp, void *page)
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	bp = (BKT *)((char *)page - sizeof(BKT));
-
-#ifdef DEBUG
-	if (!(bp->flags & MPOOL_PINNED)) {
-		(void)fprintf(stderr,
-		    "mpool_delete: page %d not pinned\n", bp->pgno);
-		abort();
-	}
-#endif
-
-	/* Remove from the hash and lru queues. */
-	head = &mp->hqh[HASHKEY(bp->pgno)];
-	TAILQ_REMOVE(head, bp, hq);
-	TAILQ_REMOVE(&mp->lqh, bp, q);
-
-	free(bp);
-	mp->curcache--;
-	return (RET_SUCCESS);
-}	
-	
-/*
- * mpool_get
- *	Get a page.
- */
-/* ARGSUSED */
-void *
-mpool_get(MPOOL *mp, pgno_t pgno,
-    u_int flags)		/* XXX not used? */
-{
-	struct _hqh *head;
-	BKT *bp;
-	off_t off;
-	int nr;
-
-#ifdef STATISTICS
-	++mp->pageget;
-#endif
-
-	/* Check for a page that is cached. */
-	if ((bp = mpool_look(mp, pgno)) != NULL) {
-#ifdef DEBUG
-		if (!(flags & MPOOL_IGNOREPIN) && bp->flags & MPOOL_PINNED) {
-			(void)fprintf(stderr,
-			    "mpool_get: page %d already pinned\n", bp->pgno);
-			abort();
-		}
-#endif
-		/*
-		 * Move the page to the head of the hash chain and the tail
-		 * of the lru chain.
-		 */
-		head = &mp->hqh[HASHKEY(bp->pgno)];
-		TAILQ_REMOVE(head, bp, hq);
-		TAILQ_INSERT_HEAD(head, bp, hq);
-		TAILQ_REMOVE(&mp->lqh, bp, q);
-		TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-
-		/* Return a pinned page. */
-		bp->flags |= MPOOL_PINNED;
-		return (bp->page);
-	}
-
-	/* Get a page from the cache. */
-	if ((bp = mpool_bkt(mp)) == NULL)
-		return (NULL);
-
-	/* Read in the contents. */
-	off = mp->pagesize * pgno;
-	if ((nr = pread(mp->fd, bp->page, mp->pagesize, off)) != (ssize_t)mp->pagesize) {
-		switch (nr) {
-		case -1:
-			/* errno is set for us by pread(). */
-			free(bp);
-			mp->curcache--;
-			return (NULL);
-		case 0:
-			/*
-			 * A zero-length read means you need to create a
-			 * new page.
-			 */
-			memset(bp->page, 0, mp->pagesize);
-			break;
-		default:
-			/* A partial read is definitely bad. */
-			free(bp);
-			mp->curcache--;
-			errno = EINVAL;
-			return (NULL);
-		}
-	}
-#ifdef STATISTICS
-	++mp->pageread;
-#endif
-
-	/* Set the page number, pin the page. */
-	bp->pgno = pgno;
-	if (!(flags & MPOOL_IGNOREPIN))
-		bp->flags = MPOOL_PINNED;
-	bp->flags |= MPOOL_INUSE;
-
-	/*
-	 * Add the page to the head of the hash chain and the tail
-	 * of the lru chain.
-	 */
-	head = &mp->hqh[HASHKEY(bp->pgno)];
-	TAILQ_INSERT_HEAD(head, bp, hq);
-	TAILQ_INSERT_TAIL(&mp->lqh, bp, q);
-
-	/* Run through the user's filter. */
-	if (mp->pgin != NULL)
-		(mp->pgin)(mp->pgcookie, bp->pgno, bp->page);
-
-	return (bp->page);
-}
-
-/*
- * mpool_put
- *	Return a page.
- */
-/* ARGSUSED */
-int
-mpool_put(MPOOL *mp, void *page, u_int flags)
-{
-	BKT *bp;
-
-#ifdef STATISTICS
-	++mp->pageput;
-#endif
-	bp = (BKT *)((char *)page - sizeof(BKT));
-#ifdef DEBUG
-	if (!(bp->flags & MPOOL_PINNED)) {
-		(void)fprintf(stderr,
-		    "mpool_put: page %d not pinned\n", bp->pgno);
-		abort();
-	}
-#endif
-	bp->flags &= ~MPOOL_PINNED;
-	if (flags & MPOOL_DIRTY)
-		bp->flags |= flags & MPOOL_DIRTY;
-	return (RET_SUCCESS);
-}
-
-/*
- * mpool_close
- *	Close the buffer pool.
- */
-int
-mpool_close(MPOOL *mp)
-{
-	BKT *bp;
-
-	/* Free up any space allocated to the lru pages. */
-	while (!TAILQ_EMPTY(&mp->lqh)) {
-		bp = TAILQ_FIRST(&mp->lqh);
-		TAILQ_REMOVE(&mp->lqh, bp, q);
-		free(bp);
-	}
-
-	/* Free the MPOOL cookie. */
-	free(mp);
-	return (RET_SUCCESS);
-}
-
-/*
- * mpool_sync
- *	Sync the pool to disk.
- */
-int
-mpool_sync(MPOOL *mp)
-{
-	BKT *bp;
-
-	/* Walk the lru chain, flushing any dirty pages to disk. */
-	TAILQ_FOREACH(bp, &mp->lqh, q)
-		if (bp->flags & MPOOL_DIRTY &&
-		    mpool_write(mp, bp) == RET_ERROR)
-			return (RET_ERROR);
-
-	/* Sync the file descriptor. */
-	return (_fsync(mp->fd) ? RET_ERROR : RET_SUCCESS);
-}
-
-/*
- * mpool_bkt
- *	Get a page from the cache (or create one).
- */
-static BKT *
-mpool_bkt(MPOOL *mp)
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	/* If under the max cached, always create a new page. */
-	if (mp->curcache < mp->maxcache)
-		goto new;
-
-	/*
-	 * If the cache is max'd out, walk the lru list for a buffer we
-	 * can flush.  If we find one, write it (if necessary) and take it
-	 * off any lists.  If we don't find anything we grow the cache anyway.
-	 * The cache never shrinks.
-	 */
-	TAILQ_FOREACH(bp, &mp->lqh, q)
-		if (!(bp->flags & MPOOL_PINNED)) {
-			/* Flush if dirty. */
-			if (bp->flags & MPOOL_DIRTY &&
-			    mpool_write(mp, bp) == RET_ERROR)
-				return (NULL);
-#ifdef STATISTICS
-			++mp->pageflush;
-#endif
-			/* Remove from the hash and lru queues. */
-			head = &mp->hqh[HASHKEY(bp->pgno)];
-			TAILQ_REMOVE(head, bp, hq);
-			TAILQ_REMOVE(&mp->lqh, bp, q);
-#ifdef DEBUG
-			{ void *spage;
-				spage = bp->page;
-				memset(bp, 0xff, sizeof(BKT) + mp->pagesize);
-				bp->page = spage;
-			}
-#endif
-			bp->flags = 0;
-			return (bp);
-		}
-
-new:	if ((bp = (BKT *)calloc(1, sizeof(BKT) + mp->pagesize)) == NULL)
-		return (NULL);
-#ifdef STATISTICS
-	++mp->pagealloc;
-#endif
-	bp->page = (char *)bp + sizeof(BKT);
-	bp->flags = 0;
-	++mp->curcache;
-	return (bp);
-}
-
-/*
- * mpool_write
- *	Write a page to disk.
- */
-static int
-mpool_write(MPOOL *mp, BKT *bp)
-{
-	off_t off;
-
-#ifdef STATISTICS
-	++mp->pagewrite;
-#endif
-
-	/* Run through the user's filter. */
-	if (mp->pgout)
-		(mp->pgout)(mp->pgcookie, bp->pgno, bp->page);
-
-	off = mp->pagesize * bp->pgno;
-	if (pwrite(mp->fd, bp->page, mp->pagesize, off) != (ssize_t)mp->pagesize)
-		return (RET_ERROR);
-
-	/*
-	 * Re-run through the input filter since this page may soon be
-	 * accessed via the cache, and whatever the user's output filter
-	 * did may screw things up if we don't let the input filter
-	 * restore the in-core copy.
-	 */
-	if (mp->pgin)
-		(mp->pgin)(mp->pgcookie, bp->pgno, bp->page);
-
-	bp->flags &= ~MPOOL_DIRTY;
-	return (RET_SUCCESS);
-}
-
-/*
- * mpool_look
- *	Lookup a page in the cache.
- */
-static BKT *
-mpool_look(MPOOL *mp, pgno_t pgno)
-{
-	struct _hqh *head;
-	BKT *bp;
-
-	head = &mp->hqh[HASHKEY(pgno)];
-	TAILQ_FOREACH(bp, head, hq)
-		if ((bp->pgno == pgno) &&
-			((bp->flags & MPOOL_INUSE) == MPOOL_INUSE)) {
-#ifdef STATISTICS
-			++mp->cachehit;
-#endif
-			return (bp);
-		}
-#ifdef STATISTICS
-	++mp->cachemiss;
-#endif
-	return (NULL);
-}
-
-#ifdef STATISTICS
-/*
- * mpool_stat
- *	Print out cache statistics.
- */
-void
-mpool_stat(MPOOL *mp)
-{
-	BKT *bp;
-	int cnt;
-	char *sep;
-
-	(void)fprintf(stderr, "%lu pages in the file\n", mp->npages);
-	(void)fprintf(stderr,
-	    "page size %lu, cacheing %lu pages of %lu page max cache\n",
-	    mp->pagesize, mp->curcache, mp->maxcache);
-	(void)fprintf(stderr, "%lu page puts, %lu page gets, %lu page new\n",
-	    mp->pageput, mp->pageget, mp->pagenew);
-	(void)fprintf(stderr, "%lu page allocs, %lu page flushes\n",
-	    mp->pagealloc, mp->pageflush);
-	if (mp->cachehit + mp->cachemiss)
-		(void)fprintf(stderr,
-		    "%.0f%% cache hit rate (%lu hits, %lu misses)\n", 
-		    ((double)mp->cachehit / (mp->cachehit + mp->cachemiss))
-		    * 100, mp->cachehit, mp->cachemiss);
-	(void)fprintf(stderr, "%lu page reads, %lu page writes\n",
-	    mp->pageread, mp->pagewrite);
-
-	sep = "";
-	cnt = 0;
-	TAILQ_FOREACH(bp, &mp->lqh, q) {
-		(void)fprintf(stderr, "%s%d", sep, bp->pgno);
-		if (bp->flags & MPOOL_DIRTY)
-			(void)fprintf(stderr, "d");
-		if (bp->flags & MPOOL_PINNED)
-			(void)fprintf(stderr, "P");
-		if (++cnt == 10) {
-			sep = "\n";
-			cnt = 0;
-		} else
-			sep = ", ";
-			
-	}
-	(void)fprintf(stderr, "\n");
-}
-#endif
diff --git a/lib/libc_bsd/db/mpool/mpool.libtp b/lib/libc_bsd/db/mpool/mpool.libtp
deleted file mode 100644
index a9c3099..0000000
--- a/lib/libc_bsd/db/mpool/mpool.libtp
+++ /dev/null
@@ -1,746 +0,0 @@
-/******************************************************************************
-
-VERSION $FreeBSD: releng/10.2/lib/libc/db/mpool/mpool.libtp 50476 1999-08-28 00:22:10Z peter $
-PACKAGE: 	User Level Shared Memory Manager
-
-DESCRIPTION: 	
-	This package provides a buffer pool interface implemented as
-	a collection of file pages mapped into shared memory.
-
-	Based on Mark's buffer manager
-
-ROUTINES: 
-    External
-	buf_alloc
-	buf_flags
-	buf_get
-	buf_init
-	buf_last
-	buf_open
-	buf_pin
-	buf_sync
-	buf_unpin
-    Internal
-	bf_assign_buf
-	bf_fid_to_fd
-	bf_newbuf
-	bf_put_page
-	
-
-******************************************************************************/
-#include	<sys/types.h>
-#include	<assert.h>
-#include	<sys/file.h>
-#include	<sys/stat.h>
-#include	<stdio.h>
-#include	<errno.h>
-#include	"list.h"
-#include	"user.h"
-#include	"txn_sys.h"
-#include	"buf.h"
-#include	"semkeys.h"
-#include	"error.h"
-
-/*
-    we need to translate between some type of file id that the user 
-    process passes and a file descriptor.  For now, it's a nop.
-*/
-#define GET_MASTER      get_sem ( buf_spinlock )
-#define RELEASE_MASTER  release_sem ( buf_spinlock )
-
-#define	LRUID	*buf_lru
-#define	LRUP	(bufhdr_table+*buf_lru)
-#define	MRU	bufhdr_table[*buf_lru].lru.prev
-
-/* Global indicator that you have started reusing buffers */
-int	do_statistics = 0;
-/*
-    Process Statics (pointers into shared memory)
-*/
-static	BUF_T	*buf_table = 0;
-static	BUFHDR_T	*bufhdr_table;
-static	int	*buf_hash_table;
-static	int	*buf_lru;		/* LRU is the free list */
-static	int	buf_spinlock;
-static	FINFO_T	*buf_fids;
-static	int	*buf_sp;		/* Pointer to string free space */
-static	char	*buf_strings;
-
-/* Process Local FID->FD table */
-static	int	fds[NUM_FILE_ENTRIES];
-
-/* Static routines */
-static	BUFHDR_T	*bf_assign_buf();
-static	int		bf_fid_to_fd();
-static	BUFHDR_T	*bf_newbuf();
-static	int		bf_put_page();
-
-/*
-    Return  0 on success
-	    1 on failure
-*/
-extern int
-buf_init ( )
-{
-    ADDR_T	buf_region;
-    BUFHDR_T	*bhp;
-    int		i;
-    int		ref_count;
-    int		*spinlockp;
-
-    /*
-	Initialize Process local structures
-    */
-    for ( i = 0; i < NUM_FILE_ENTRIES; i++ ) {
-	fds[i] = -1;
-    }
-
-    buf_region = attach_region ( BUF_REGION_NAME, BUF_REGION_NUM,
-				 BUF_REGION_SIZE, &ref_count );
-    if ( !buf_region ) {
-	return (1);
-    }
-    error_log3 ( "Buf Region: ADDR: %d ID: %d SIZE: %d\n", buf_region,
-		    BUF_REGION_NUM, BUF_REGION_SIZE );
-
-    buf_table = (BUF_T *)buf_region;
-    bufhdr_table = (BUFHDR_T *)(buf_table + NUM_BUFS);
-    buf_hash_table = (int *)(bufhdr_table + NUM_BUFS);
-    buf_lru = buf_hash_table + NUMTABLE_ENTRIES;
-    spinlockp = buf_lru + 1;
-    buf_fids = (FINFO_T *)(spinlockp+1);
-    buf_sp = (int *)(buf_fids + NUM_FILE_ENTRIES);
-    buf_strings = (char *)(buf_sp + 1);
-
-    /* Create locking spinlock (gets creating holding the lock) */
-    buf_spinlock = create_sem ( BUF_SPIN_NAME, BUF_SPIN_NUM, ref_count <= 1 );
-    if ( buf_spinlock < 0 )  {
-	return(1);
-    }
-    if ( ref_count <= 1 ) {
-	*spinlockp = buf_spinlock;
-
-	/* Now initialize the buffer manager */
-
-	/* 1. Free list */
-	*buf_lru = 0;
-
-	/* 2. Buffer headers */
-	for ( i = 0, bhp = bufhdr_table; i < NUM_BUFS; bhp++, i++ ) {
-		bhp->lru.next = i+1;
-		bhp->lru.prev = i-1;
-		bhp->flags = 0;				/* All Flags off */
-		bhp->refcount = 0;
-		bhp->wait_proc = -1;			/* No sleepers */
-		LISTPE_INIT ( hash, bhp, i );		/* Hash chains */
-	}
-	bufhdr_table[0].lru.prev = NUM_BUFS-1;
-	bufhdr_table[NUM_BUFS-1].lru.next = 0;
-
-	/* 3. Hash Table */
-	for ( i = 0; i < NUMTABLE_ENTRIES; i++ ) {
-		buf_hash_table[i] = NUM_BUFS;
-	}
-
-	/* 4. File ID Table */
-	for ( i = 0; i < NUM_FILE_ENTRIES; i++ ) {
-		buf_fids[i].offset = -1;
-		buf_fids[i].npages = -1;
-		buf_fids[i].refcount = 0;
-	}
-
-	/* 5. Free String Pointer */
-	*buf_sp = (FILE_NAME_LEN*NUM_FILE_ENTRIES);
-	if (RELEASE_MASTER) {
-		return(1);
-	}
-	error_log0 ( "Initialized buffer region\n" );
-    } 
-    return (0);
-}
-
-extern	void
-buf_exit()
-{
-    int	ref;
-    int	i;
-
-    /* Flush Buffer Pool on Exit */
-    for ( i = 0; i < NUM_FILE_ENTRIES; i++ ) {
-	if ( fds[i] != -1 ) {
-		close ( fds[i] );
-	}
-    }
-    if ( buf_table ) {
-	detach_region ( buf_table, BUF_REGION_NUM, BUF_REGION_SIZE, &ref );
-    }
-    return;
-}
-
-/*
-	We need an empty buffer.  Find the LRU unpinned NON-Dirty page.
-*/
-static BUFHDR_T	*
-bf_newbuf()
-{
-    int		fd;
-    int		lruid;
-    int		nbytes;
-    int		ndx;
-    BUFHDR_T	*bhp;
-
-    lruid = LRUID;
-    for ( bhp = LRUP; 
-	  bhp->flags & (BUF_PINNED|BUF_IO_IN_PROGRESS); 
-	  bhp = LISTP_NEXTP (bufhdr_table, lru, bhp ) ) {
-
-	if ( bhp->lru.next == lruid ) {
-		/* OUT OF BUFFERS */
-		error_log1 ( "All buffers are pinned.  %s\n",
-				"Unable to grant buffer request" );
-		return(NULL);
-	}
-    }
-    /* BHP can be used */
-    if ( bhp->flags & BUF_DIRTY ) {
-	do_statistics = 1;
-	/* 
-	    MIS  Check for log flushed appropriately
-	*/
-	fd = bf_fid_to_fd(bhp->id.file_id);
-	if ( fd == -1 ) {
-	    error_log1 ("Invalid fid %d\n", bhp->id.file_id);
-	    return(NULL);
-	}
-	if ( bf_put_page(fd, bhp) < 0 ) {
-	    return(NULL);
-	}
-    }
-    /* Update Hash Pointers */
-    ndx = BUF_HASH ( bhp->id.file_id, bhp->id.obj_id );
-    LISTP_REMOVE(bufhdr_table, hash, bhp);
-    if ( buf_hash_table[ndx] == (bhp-bufhdr_table) ) {
-	if ( bhp->hash.next != (bhp-bufhdr_table) ) {
-		buf_hash_table[ndx] = bhp->hash.next;
-	} else {
-		buf_hash_table[ndx] = NUM_BUFS;
-	}
-    }
-    INIT_BUF(bhp); 
-
-    return(bhp);
-}
-/*
-    buf_alloc
-
-    Add a page to a file and return a buffer for it.
-
-*/
-ADDR_T
-buf_alloc ( fid, new_pageno )
-int	fid;
-int	*new_pageno;
-{
-	BUFHDR_T	*bhp;
-	int	fd;
-	int	len;
-	int	ndx;
-	OBJ_T	fobj;
-
-	if (GET_MASTER) {
-		return(NULL);
-	}
-	if ( buf_fids[fid].npages == -1 ) {
-	    /* initialize npages field */
-	    fd = bf_fid_to_fd ( fid );
-	}
-	assert (fid < NUM_FILE_ENTRIES);
-
-	*new_pageno = buf_fids[fid].npages;
-	if ( *new_pageno == -1 ) {
-	    RELEASE_MASTER;
-	    return ( NULL );
-	}
-	buf_fids[fid].npages++;
-	ndx = BUF_HASH ( fid, *new_pageno );
-	fobj.file_id = fid;
-	fobj.obj_id  = *new_pageno;
-	bhp = bf_assign_buf ( ndx, &fobj, BF_PIN|BF_DIRTY|BF_EMPTY, &len );
-	if ( RELEASE_MASTER ) {
-		/* Memory leak */
-		return(NULL);
-	}
-	if ( bhp ) {
-	    return ((ADDR_T)(buf_table+(bhp-bufhdr_table)));
-	} else {
-	    return ( NULL );
-	}
-}
-
-
-/*
-	Buffer Flags
-	BF_DIRTY		Mark page as dirty
-	BF_EMPTY		Don't initialize page, just get buffer
-	BF_PIN			Retrieve with pin 
-
-MIS
-Might want to add a flag that sets an LSN for this buffer is the
-DIRTY flag is set
-
-Eventually, you may want a flag that indicates the I/O and lock
-request should be shipped off together, but not for now.
-*/
-extern ADDR_T
-buf_get ( file_id, page_id, flags, len )
-int	file_id;
-int	page_id;
-u_long	flags;
-int	*len;		/* Number of bytes read into buffer */
-{
-	BUFHDR_T	*bhp;
-	int		bufid;
-	int		fd;
-	int		ndx;
-	int		next_bufid;
-	int		stat;
-	OBJ_T		fobj;	
-
-	ndx = BUF_HASH ( file_id, page_id );
-	fobj.file_id = (long) file_id;
-	fobj.obj_id = (long) page_id;
-	if ( GET_MASTER ) {
-		return(NULL);
-	}
-	/*
-		This could be a for loop, but we lose speed
-		by making all the cases general purpose so we
-		optimize for the no-collision case. 
-	*/
-	bufid = buf_hash_table[ndx]; 
-	if ( bufid < NUM_BUFS ) {
-	    for ( bhp = bufhdr_table+bufid; 
-		  !OBJ_EQ (bhp->id, fobj) || !(bhp->flags & BUF_VALID);
-		  bhp = LISTP_NEXTP ( bufhdr_table, hash, bhp ) ) {
-
-		if ( bhp->hash.next == bufid ) {
-		    goto not_found;
-		}
-	    }
-/* found */
-	    if ( flags & BF_PIN ) {
-		    bhp->flags |= BUF_PINNED;
-		    bhp->refcount++;
-#ifdef PIN_DEBUG
-	fprintf(stderr, "buf_get: %X PINNED (%d)\n", 
-			buf_table + (bhp-bufhdr_table), bhp->refcount);
-#endif
-	    }
-	    if ( flags & BF_DIRTY ) {
-		    bhp->flags |= BUF_DIRTY;
-	    }
-
-	    while ( bhp->flags & BUF_IO_IN_PROGRESS ) {
-		/* MIS -- eventually err check here */
-#ifdef DEBUG
-		printf("About to sleep on %d (me: %d\n)\n", bhp->wait_proc,
-			my_txnp - txn_table);
-#endif
-#ifdef WAIT_STATS
-		buf_waits++;
-#endif
-		stat = proc_sleep_on ( &(bhp->wait_proc), buf_spinlock );
-		if ( stat ) {
-			/* Memory leak */
-			return(NULL);
-		}
-		if (!( bhp->flags & BUF_IO_IN_PROGRESS) &&
-		    (!OBJ_EQ (bhp->id, fobj) || !(bhp->flags & BUF_VALID))) {
-			if (RELEASE_MASTER)
-				return(NULL);
-			return(buf_get ( file_id, page_id, flags, len ));
-		}
-	    }
-	    MAKE_MRU( bhp );
-	    *len = BUFSIZE;
-	} else {
-not_found:
-	    /* If you get here, the page isn't in the hash table */
-	    bhp = bf_assign_buf ( ndx, &fobj, flags, len );
-	}
-	/* Common code between found and not found */
-
-	if ( bhp && bhp->flags & BUF_NEWPAGE ) {
-	    *len = 0;
-	}
-	if (RELEASE_MASTER){
-		/* Memory leak */
-		return(NULL);
-	}
-	if ( bhp ) {
-	    return ((ADDR_T)(buf_table+(bhp-bufhdr_table)));
-	} else {
-	    return ( NULL );
-	}
-}
-
-/*
-	MIS - do I want to add file links to buffer pool?
-*/
-extern int
-buf_sync ( fid, close )
-int	fid;
-int	close;		/* should we dec refcount and possibly
-			   invalidate all the buffers */
-{
-    int	i;
-    int	fd;
-    int	invalidate;
-    BUFHDR_T	*bhp;
-
-    if ( (fd = bf_fid_to_fd ( fid )) < 0 ) {
-	return(1);
-    }
-    if (GET_MASTER) {
-	return(1);
-    }
-    invalidate = (buf_fids[fid].refcount == 1 && close);
-    if ( invalidate )
-	for ( bhp = bufhdr_table, i = 0; i < NUM_BUFS; bhp++, i++ ) {
-	    if (bhp->id.file_id == fid) {
-		if ((bhp->flags & BF_DIRTY) && (bf_put_page( fd, bhp ) < 0)) {
-			return(1);
-		}
-		bhp->id.file_id = -1;
-	    }
-	}
-    if (invalidate || close)
-	buf_fids[fid].refcount--;
-
-    if (RELEASE_MASTER) {
-	return(1);
-    }
-    return(0);
-
-
-}
-
-extern int
-buf_flags ( addr, set_flags, unset_flags )
-ADDR_T	addr;
-u_long	set_flags;
-u_long	unset_flags;
-{
-    int		bufid;
-    BUFHDR_T	*bhp;
-
-#ifdef PIN_DEBUG
-	fprintf(stderr, "buf_flags: %X setting %s%s%s%s%s releasing %s%s%s%s%s\n",
-	    addr, 
-	    set_flags&BUF_DIRTY ? "DIRTY " : "", 
-	    set_flags&BUF_VALID ? "VALID " : "", 
-	    set_flags&BUF_PINNED ? "PINNED " : "", 
-	    set_flags&BUF_IO_ERROR ? "IO_ERROR " : "", 
-	    set_flags&BUF_IO_IN_PROGRESS ? "IO_IN_PROG " : "", 
-	    set_flags&BUF_NEWPAGE ? "NEWPAGE " : "", 
-	    unset_flags&BUF_DIRTY ? "DIRTY " : "", 
-	    unset_flags&BUF_VALID ? "VALID " : "", 
-	    unset_flags&BUF_PINNED ? "PINNED " : "", 
-	    unset_flags&BUF_IO_ERROR ? "IO_ERROR " : "", 
-	    unset_flags&BUF_IO_IN_PROGRESS ? "IO_IN_PROG " : "", 
-	    unset_flags&BUF_NEWPAGE ? "NEWPAGE " : "" );
-#endif
-    if (!ADDR_OK(addr)) {
-	error_log1 ( "buf_pin: Invalid Buffer Address %x\n", addr );
-	return(1);
-    }
-    bufid = ((BUF_T *)addr) - buf_table;
-    assert ( bufid < NUM_BUFS);
-    bhp = &bufhdr_table[bufid];
-    if (GET_MASTER) {
-	return(1);
-    }
-    bhp->flags |= set_flags;
-    if ( set_flags & BUF_PINNED ) {
-	bhp->refcount++;
-    }
-    if ( set_flags & BUF_DIRTY ) {
-	unset_flags |= BUF_NEWPAGE;
-    }
-
-    if ( unset_flags & BUF_PINNED ) {
-	bhp->refcount--;
-	if ( bhp->refcount ) {
-		/* Turn off pin bit so it doesn't get unset */
-		unset_flags &= ~BUF_PINNED;
-	}
-    }
-    bhp->flags &= ~unset_flags;
-    MAKE_MRU(bhp);
-    if (RELEASE_MASTER) {
-	return(1);
-    }
-    return(0);
-}
-
-/*
-	Take a string name and produce an fid.
-
-	returns -1 on error
-
-	MIS -- this is a potential problem -- you keep actual names
-		here -- what if people run from different directories?
-*/
-extern	int
-buf_name_lookup ( fname )
-char	*fname;
-{
-    int	i;
-    int	fid;
-    int	ndx;
-
-    fid = -1;
-    if (GET_MASTER) {
-	    return(-1);
-    }
-    for ( i = 0; i < NUM_FILE_ENTRIES; i++ ) {
-	if ( buf_fids[i].offset == -1 ) {
-		fid = i;
-	} else {
-		if (!strcmp (fname, buf_strings+buf_fids[i].offset)) {
-			if (RELEASE_MASTER) {
-				return(-1);
-			}
-			buf_fids[i].refcount++;
-			return(i);
-		}
-	}
-    }
-    if ( fid == -1 ) {
-	error_log0 ( "No more file ID's\n" );
-    } else {
-	ndx = *buf_sp - strlen(fname) - 1;
-	if ( ndx < 0 ) {
-	    error_log0 ( "Out of string space\n" );
-	    fid = -1;
-	} else {
-	    *buf_sp = ndx;
-	    strcpy ( buf_strings+ndx, fname );
-	    buf_fids[fid].offset = ndx;
-	}
-	buf_fids[fid].refcount = 1;
-    }
-    if (RELEASE_MASTER) {
-	return(-1);
-    }
-    return(fid);
-}
-
-static	int
-bf_fid_to_fd ( fid ) 
-int	fid;
-{
-	struct stat sbuf;
-
-	assert ( (fid < NUM_FILE_ENTRIES) && (buf_fids[fid].offset != -1) );
-	if ( fds[fid] != -1 ) {
-	    return(fds[fid]);
-
-	}
-	fds[fid] = open ( buf_strings+buf_fids[fid].offset, O_RDWR|O_CREAT, 
-			  0666 );
-	if ( fds[fid] < 0 ) {
-	    error_log3 ( "Error Opening File %s FID: %d FD: %d.  Errno = %d\n", 
-			    buf_strings+buf_fids[fid].offset, fid, fds[fid], 
-			    errno );
-	    return(-1);
-	}
-	error_log3 ( "Opening File %s FID: %d FD: %d\n", 
-			buf_strings+buf_fids[fid].offset, fid, fds[fid] );
-	if ( buf_fids[fid].npages == -1 ) {
-		/* Initialize the npages field */
-		if ( fstat ( fds[fid], &sbuf ) ) {
-		    error_log3 ( "Error Fstating %s FID: %d.  Errno = %d\n", 
-				buf_strings+buf_fids[fid].offset, fid, errno );
-		} else {
-		    buf_fids[fid].npages = ( sbuf.st_size / BUFSIZE );
-		}
-	}
-
-	return ( fds[fid] );
-}
-
-static int
-bf_put_page ( fd, bhp ) 
-int	fd;
-BUFHDR_T	*bhp;
-{
-	int	nbytes;
-
-	assert ( (bhp-bufhdr_table) < NUM_BUFS );
-	if ( lseek ( fd, bhp->id.obj_id << BUFSHIFT, L_SET ) < 0 ) {
-	    return(-1);
-	}
-	bhp->flags |= BUF_IO_IN_PROGRESS;
-	if (RELEASE_MASTER) {
-	    return(-1);
-	}
-	nbytes = write(fd, buf_table[bhp-bufhdr_table], BUFSIZE);
-	if (GET_MASTER) {
-	    return(-2);
-	}
-	if ( nbytes < 0 ) {
-		error_log1 ("Write failed with error code %d\n", errno);
-		return(-1);
-	} else if ( nbytes != BUFSIZE ) {
-		error_log1 ("Short write: %d bytes of %d\n", nbytes, BUFSIZE );
-	}
-	bhp->flags &= ~(BUF_DIRTY|BUF_IO_IN_PROGRESS);
-	return (0);
-}
-
-static BUFHDR_T	*
-bf_assign_buf ( ndx, obj, flags, len )
-int	ndx;
-OBJ_T	*obj;
-u_long	flags;
-int	*len;		/* Number of bytes read */
-{
-    BUFHDR_T	*bhp;
-    int		fd;
-
-    assert ( obj->file_id < NUM_FILE_ENTRIES );
-    bhp = bf_newbuf();
-    if ( !bhp ) {
-	return(NULL);
-    }
-    OBJ_ASSIGN ( (*obj), bhp->id );
-    if ( buf_hash_table[ndx] >= NUM_BUFS ) {
-	buf_hash_table[ndx] = bhp-bufhdr_table;
-    } else {
-	LISTPE_INSERT ( bufhdr_table, hash, bhp, buf_hash_table[ndx] );
-    }
-
-    bhp->flags |= BUF_VALID;
-    if ( flags & BF_PIN ) {
-	bhp->flags |= BUF_PINNED;
-	bhp->refcount++;
-#ifdef PIN_DEBUG
-	fprintf(stderr, "bf_assign_buf: %X PINNED (%d)\n", 
-		buf_table + (bhp-bufhdr_table), bhp->refcount);
-#endif
-    }
-    fd = bf_fid_to_fd(obj->file_id);
-    if ( fd == -1 ) {
-	error_log1 ("Invalid fid %d\n", obj->file_id);
-	bhp->flags |= ~BUF_IO_ERROR;
-	return(NULL);
-    }
-    if ( obj->obj_id >= buf_fids[obj->file_id].npages) {
-	buf_fids[obj->file_id].npages = obj->obj_id+1;
-	*len = 0;
-    } else if ( flags & BF_EMPTY ) {
-	*len = 0;
-    } else {
-	bhp->flags |= BUF_IO_IN_PROGRESS;
-	if (RELEASE_MASTER) {
-		return(NULL);
-	}
-	if ( lseek ( fd, obj->obj_id << BUFSHIFT, L_SET ) < -1 ) {
-	    error_log2 ("Unable to perform seek on file: %d  to page %d",
-			obj->file_id, obj->obj_id );
-	    bhp->flags &= ~BUF_IO_IN_PROGRESS;
-	    bhp->flags |= ~BUF_IO_ERROR;
-	    return(NULL);
-	}
-	*len = read(fd, buf_table[bhp-bufhdr_table], BUFSIZE);
-	if ( *len < 0 ) {
-	    error_log2 ("Unable to perform read on file: %d  to page %d",
-			obj->file_id, obj->obj_id );
-	    bhp->flags &= ~BUF_IO_IN_PROGRESS;
-	    bhp->flags |= ~BUF_IO_ERROR;
-	    return(NULL);
-	} 
-	if (GET_MASTER) {
-		return(NULL);
-	}
-	bhp->flags &= ~BUF_IO_IN_PROGRESS;
-	if ( bhp->wait_proc != -1 ) {
-	    /* wake up waiter and anyone waiting on it */
-#ifdef DEBUG
-	    printf("Waking transaction %d due to completed I/O\n", 
-		bhp->wait_proc);
-#endif
-	    proc_wake_id ( bhp->wait_proc );
-	    bhp->wait_proc = -1;
-	}
-	MAKE_MRU(bhp);
-    }
-
-    if ( flags & BF_DIRTY ) {
-	bhp->flags |= BUF_DIRTY;
-    } else if ( *len < BUFSIZE ) {
-	bhp->flags |= BUF_NEWPAGE;
-    }
-    return ( bhp );
-}
-
-int
-buf_last ( fid )
-int	fid;
-{
-	int	val;
-
-	if (GET_MASTER) {
-		return(-1);
-	}
-	assert ( fid < NUM_FILE_ENTRIES );
-	if ( buf_fids[fid].npages == -1 ) {
-	    /* initialize npages field */
-	    (void) bf_fid_to_fd ( fid );
-	}
-	val = buf_fids[fid].npages;	
-	if ( val ) {
-		val--;			/* Convert to page number */
-	}
-	if (RELEASE_MASTER) {
-		return(-1);
-	}
-	return(val);
-}
-
-#ifdef DEBUG
-extern void
-buf_dump ( id, all )
-int	id;
-int	all;
-{
-	int i;
-	BUFHDR_T	*bhp;
-
-	printf ( "LRU + %d\n", *buf_lru );
-	if ( all ) {
-	    printf("ID\tFID\tPID\tLNEXT\tLPREV\tHNEXT\tHPREV\tSLEEP\tFLAG\tREFS\n");
-	    for ( bhp = bufhdr_table, i = 0; i < NUM_BUFS; bhp++, i++ ) {
-		    printf ( "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%x\t%d\n", i,
-			bhp->id.file_id, bhp->id.obj_id,
-			bhp->lru.next, bhp->lru.prev,
-			bhp->hash.next, bhp->hash.prev,
-			bhp->wait_proc, bhp->flags, bhp->refcount );
-	    }
-	} else {
-		if ( id >= NUM_BUFS ) {
-			printf ( "Buffer ID (%d) too high\n", id );
-			return;
-		}
-		bhp = bufhdr_table+id;
-		printf ( "%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%x\t%d\n", i,
-		    bhp->id.file_id, bhp->id.obj_id,
-		    bhp->lru.next, bhp->lru.prev,
-		    bhp->hash.next, bhp->hash.prev,
-		    bhp->wait_proc, bhp->flags, bhp->refcount );
-	}
-	return;
-}
-#endif
-
diff --git a/lib/libc_bsd/db/recno/Makefile.inc b/lib/libc_bsd/db/recno/Makefile.inc
deleted file mode 100644
index f4505e6..0000000
--- a/lib/libc_bsd/db/recno/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#       from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 107052 2002-11-18 09:50:57Z ru $
-
-.PATH: ${.CURDIR}/db/recno
-
-SRCS+=	rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \
-	rec_seq.c rec_utils.c
diff --git a/lib/libc_bsd/db/recno/extern.h b/lib/libc_bsd/db/recno/extern.h
deleted file mode 100644
index 6313247..0000000
--- a/lib/libc_bsd/db/recno/extern.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- *
- *	@(#)extern.h	8.3 (Berkeley) 6/4/94
- * $FreeBSD: releng/10.2/lib/libc/db/recno/extern.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-#include "../btree/extern.h"
-
-int	 __rec_close(DB *);
-int	 __rec_delete(const DB *, const DBT *, u_int);
-int	 __rec_dleaf(BTREE *, PAGE *, uint32_t);
-int	 __rec_fd(const DB *);
-int	 __rec_fmap(BTREE *, recno_t);
-int	 __rec_fout(BTREE *);
-int	 __rec_fpipe(BTREE *, recno_t);
-int	 __rec_get(const DB *, const DBT *, DBT *, u_int);
-int	 __rec_iput(BTREE *, recno_t, const DBT *, u_int);
-int	 __rec_put(const DB *dbp, DBT *, const DBT *, u_int);
-int	 __rec_ret(BTREE *, EPG *, recno_t, DBT *, DBT *);
-EPG	*__rec_search(BTREE *, recno_t, enum SRCHOP);
-int	 __rec_seq(const DB *, DBT *, DBT *, u_int);
-int	 __rec_sync(const DB *, u_int);
-int	 __rec_vmap(BTREE *, recno_t);
-int	 __rec_vout(BTREE *);
-int	 __rec_vpipe(BTREE *, recno_t);
diff --git a/lib/libc_bsd/db/recno/rec_close.c b/lib/libc_bsd/db/recno/rec_close.c
deleted file mode 100644
index ddf076c..0000000
--- a/lib/libc_bsd/db/recno/rec_close.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_close.c	8.6 (Berkeley) 8/18/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/recno/rec_close.c 190484 2009-03-28 05:45:29Z delphij $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/mman.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_CLOSE -- Close a recno tree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_close(DB *dbp)
-{
-	BTREE *t;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	if (__rec_sync(dbp, 0) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Committed to closing. */
-	status = RET_SUCCESS;
-	if (F_ISSET(t, R_MEMMAPPED) && munmap(t->bt_smap, t->bt_msize))
-		status = RET_ERROR;
-
-	if (!F_ISSET(t, R_INMEM)) {
-		if (F_ISSET(t, R_CLOSEFP)) {
-			if (fclose(t->bt_rfp))
-				status = RET_ERROR;
-		} else {
-			if (_close(t->bt_rfd))
-				status = RET_ERROR;
-		}
-	}
-
-	if (__bt_close(dbp) == RET_ERROR)
-		status = RET_ERROR;
-
-	return (status);
-}
-
-/*
- * __REC_SYNC -- sync the recno tree to disk.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__rec_sync(const DB *dbp, u_int flags)
-{
-	struct iovec iov[2];
-	BTREE *t;
-	DBT data, key;
-	off_t off;
-	recno_t scursor, trec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	if (flags == R_RECNOSYNC)
-		return (__bt_sync(dbp, 0));
-
-	if (F_ISSET(t, R_RDONLY | R_INMEM) || !F_ISSET(t, R_MODIFIED))
-		return (RET_SUCCESS);
-
-	/* Read any remaining records into the tree. */
-	if (!F_ISSET(t, R_EOF) && t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-		return (RET_ERROR);
-
-	/* Rewind the file descriptor. */
-	if (lseek(t->bt_rfd, (off_t)0, SEEK_SET) != 0)
-		return (RET_ERROR);
-
-	/* Save the cursor. */
-	scursor = t->bt_cursor.rcursor;
-
-	key.size = sizeof(recno_t);
-	key.data = &trec;
-
-	if (F_ISSET(t, R_FIXLEN)) {
-		/*
-		 * We assume that fixed length records are all fixed length.
-		 * Any that aren't are either EINVAL'd or corrected by the
-		 * record put code.
-		 */
-		status = (dbp->seq)(dbp, &key, &data, R_FIRST);
-		while (status == RET_SUCCESS) {
-			if (_write(t->bt_rfd, data.data, data.size) !=
-			    (ssize_t)data.size)
-				return (RET_ERROR);
-			status = (dbp->seq)(dbp, &key, &data, R_NEXT);
-		}
-	} else {
-		iov[1].iov_base = &t->bt_bval;
-		iov[1].iov_len = 1;
-
-		status = (dbp->seq)(dbp, &key, &data, R_FIRST);
-		while (status == RET_SUCCESS) {
-			iov[0].iov_base = data.data;
-			iov[0].iov_len = data.size;
-			if (_writev(t->bt_rfd, iov, 2) != (ssize_t)(data.size + 1))
-				return (RET_ERROR);
-			status = (dbp->seq)(dbp, &key, &data, R_NEXT);
-		}
-	}
-
-	/* Restore the cursor. */
-	t->bt_cursor.rcursor = scursor;
-
-	if (status == RET_ERROR)
-		return (RET_ERROR);
-	if ((off = lseek(t->bt_rfd, (off_t)0, SEEK_CUR)) == -1)
-		return (RET_ERROR);
-	if (ftruncate(t->bt_rfd, off))
-		return (RET_ERROR);
-	F_CLR(t, R_MODIFIED);
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc_bsd/db/recno/rec_delete.c b/lib/libc_bsd/db/recno/rec_delete.c
deleted file mode 100644
index 04903cb..0000000
--- a/lib/libc_bsd/db/recno/rec_delete.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_delete.c	8.7 (Berkeley) 7/14/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/recno/rec_delete.c 189292 2009-03-03 02:16:12Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-static int rec_rdelete(BTREE *, recno_t);
-
-/*
- * __REC_DELETE -- Delete the item(s) referenced by a key.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key to delete
- *	flags:	R_CURSOR if deleting what the cursor references
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-int
-__rec_delete(const DB *dbp, const DBT *key, u_int flags)
-{
-	BTREE *t;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	switch(flags) {
-	case 0:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		if (nrec > t->bt_nrecs)
-			return (RET_SPECIAL);
-		--nrec;
-		status = rec_rdelete(t, nrec);
-		break;
-	case R_CURSOR:
-		if (!F_ISSET(&t->bt_cursor, CURS_INIT))
-			goto einval;
-		if (t->bt_nrecs == 0)
-			return (RET_SPECIAL);
-		status = rec_rdelete(t, t->bt_cursor.rcursor - 1);
-		if (status == RET_SUCCESS)
-			--t->bt_cursor.rcursor;
-		break;
-	default:
-einval:		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (status == RET_SUCCESS)
-		F_SET(t, B_MODIFIED | R_MODIFIED);
-	return (status);
-}
-
-/*
- * REC_RDELETE -- Delete the data matching the specified key.
- *
- * Parameters:
- *	tree:	tree
- *	nrec:	record to delete
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-static int
-rec_rdelete(BTREE *t, recno_t nrec)
-{
-	EPG *e;
-	PAGE *h;
-	int status;
-
-	/* Find the record; __rec_search pins the page. */
-	if ((e = __rec_search(t, nrec, SDELETE)) == NULL)
-		return (RET_ERROR);
-
-	/* Delete the record. */
-	h = e->page;
-	status = __rec_dleaf(t, h, e->index);
-	if (status != RET_SUCCESS) {
-		mpool_put(t->bt_mp, h, 0);
-		return (status);
-	}
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_DLEAF -- Delete a single record from a recno leaf page.
- *
- * Parameters:
- *	t:	tree
- *	idx:	index on current page to delete
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__rec_dleaf(BTREE *t, PAGE *h, uint32_t idx)
-{
-	RLEAF *rl;
-	indx_t *ip, cnt, offset;
-	uint32_t nbytes;
-	char *from;
-	void *to;
-
-	/*
-	 * Delete a record from a recno leaf page.  Internal records are never
-	 * deleted from internal pages, regardless of the records that caused
-	 * them to be added being deleted.  Pages made empty by deletion are
-	 * not reclaimed.  They are, however, made available for reuse.
-	 *
-	 * Pack the remaining entries at the end of the page, shift the indices
-	 * down, overwriting the deleted record and its index.  If the record
-	 * uses overflow pages, make them available for reuse.
-	 */
-	to = rl = GETRLEAF(h, idx);
-	if (rl->flags & P_BIGDATA && __ovfl_delete(t, rl->bytes) == RET_ERROR)
-		return (RET_ERROR);
-	nbytes = NRLEAF(rl);
-
-	/*
-	 * Compress the key/data pairs.  Compress and adjust the [BR]LEAF
-	 * offsets.  Reset the headers.
-	 */
-	from = (char *)h + h->upper;
-	memmove(from + nbytes, from, (char *)to - from);
-	h->upper += nbytes;
-
-	offset = h->linp[idx];
-	for (cnt = &h->linp[idx] - (ip = &h->linp[0]); cnt--; ++ip)
-		if (ip[0] < offset)
-			ip[0] += nbytes;
-	for (cnt = &h->linp[NEXTINDEX(h)] - ip; --cnt; ++ip)
-		ip[0] = ip[1] < offset ? ip[1] + nbytes : ip[1];
-	h->lower -= sizeof(indx_t);
-	--t->bt_nrecs;
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc_bsd/db/recno/rec_get.c b/lib/libc_bsd/db/recno/rec_get.c
deleted file mode 100644
index 1d4e084..0000000
--- a/lib/libc_bsd/db/recno/rec_get.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_get.c	8.9 (Berkeley) 8/18/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/recno/rec_get.c 189387 2009-03-05 00:57:01Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_GET -- Get a record from the btree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key to find
- *	data:	data to return
- *	flag:	currently unused
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key not found.
- */
-int
-__rec_get(const DB *dbp, const DBT *key, DBT *data, u_int flags)
-{
-	BTREE *t;
-	EPG *e;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* Get currently doesn't take any flags, and keys of 0 are illegal. */
-	if (flags || (nrec = *(recno_t *)key->data) == 0) {
-		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	/*
-	 * If we haven't seen this record yet, try to find it in the
-	 * original file.
-	 */
-	if (nrec > t->bt_nrecs) {
-		if (F_ISSET(t, R_EOF | R_INMEM))
-			return (RET_SPECIAL);
-		if ((status = t->bt_irec(t, nrec)) != RET_SUCCESS)
-			return (status);
-	}
-
-	--nrec;
-	if ((e = __rec_search(t, nrec, SEARCH)) == NULL)
-		return (RET_ERROR);
-
-	status = __rec_ret(t, e, 0, NULL, data);
-	if (F_ISSET(t, B_DB_LOCK))
-		mpool_put(t->bt_mp, e->page, 0);
-	else
-		t->bt_pinned = e->page;
-	return (status);
-}
-
-/*
- * __REC_FPIPE -- Get fixed length records from a pipe.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_fpipe(BTREE *t, recno_t top)
-{
-	DBT data;
-	recno_t nrec;
-	size_t len;
-	int ch;
-	u_char *p;
-
-	if (t->bt_rdata.size < t->bt_reclen) {
-		t->bt_rdata.data = reallocf(t->bt_rdata.data, t->bt_reclen);
-		if (t->bt_rdata.data == NULL)
-			return (RET_ERROR);
-		t->bt_rdata.size = t->bt_reclen;
-	}
-	data.data = t->bt_rdata.data;
-	data.size = t->bt_reclen;
-
-	for (nrec = t->bt_nrecs; nrec < top;) {
-		len = t->bt_reclen;
-		for (p = t->bt_rdata.data;; *p++ = ch)
-			if ((ch = getc(t->bt_rfp)) == EOF || !--len) {
-				if (ch != EOF)
-					*p = ch;
-				if (len != 0)
-					memset(p, t->bt_bval, len);
-				if (__rec_iput(t,
-				    nrec, &data, 0) != RET_SUCCESS)
-					return (RET_ERROR);
-				++nrec;
-				break;
-			}
-		if (ch == EOF)
-			break;
-	}
-	if (nrec < top) {
-		F_SET(t, R_EOF);
-		return (RET_SPECIAL);
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_VPIPE -- Get variable length records from a pipe.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_vpipe(BTREE *t, recno_t top)
-{
-	DBT data;
-	recno_t nrec;
-	size_t len;
-	size_t sz;
-	int bval, ch;
-	u_char *p;
-
-	bval = t->bt_bval;
-	for (nrec = t->bt_nrecs; nrec < top; ++nrec) {
-		for (p = t->bt_rdata.data,
-		    sz = t->bt_rdata.size;; *p++ = ch, --sz) {
-			if ((ch = getc(t->bt_rfp)) == EOF || ch == bval) {
-				data.data = t->bt_rdata.data;
-				data.size = p - (u_char *)t->bt_rdata.data;
-				if (ch == EOF && data.size == 0)
-					break;
-				if (__rec_iput(t, nrec, &data, 0)
-				    != RET_SUCCESS)
-					return (RET_ERROR);
-				break;
-			}
-			if (sz == 0) {
-				len = p - (u_char *)t->bt_rdata.data;
-				t->bt_rdata.size += (sz = 256);
-				t->bt_rdata.data = reallocf(t->bt_rdata.data, t->bt_rdata.size);
-				if (t->bt_rdata.data == NULL)
-					return (RET_ERROR);
-				p = (u_char *)t->bt_rdata.data + len;
-			}
-		}
-		if (ch == EOF)
-			break;
-	}
-	if (nrec < top) {
-		F_SET(t, R_EOF);
-		return (RET_SPECIAL);
-	}
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_FMAP -- Get fixed length records from a file.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_fmap(BTREE *t, recno_t top)
-{
-	DBT data;
-	recno_t nrec;
-	u_char *sp, *ep, *p;
-	size_t len;
-
-	if (t->bt_rdata.size < t->bt_reclen) {
-		t->bt_rdata.data = reallocf(t->bt_rdata.data, t->bt_reclen);
-		if (t->bt_rdata.data == NULL)
-			return (RET_ERROR);
-		t->bt_rdata.size = t->bt_reclen;
-	}
-	data.data = t->bt_rdata.data;
-	data.size = t->bt_reclen;
-
-	sp = (u_char *)t->bt_cmap;
-	ep = (u_char *)t->bt_emap;
-	for (nrec = t->bt_nrecs; nrec < top; ++nrec) {
-		if (sp >= ep) {
-			F_SET(t, R_EOF);
-			return (RET_SPECIAL);
-		}
-		len = t->bt_reclen;
-		for (p = t->bt_rdata.data;
-		    sp < ep && len > 0; *p++ = *sp++, --len);
-		if (len != 0)
-			memset(p, t->bt_bval, len);
-		if (__rec_iput(t, nrec, &data, 0) != RET_SUCCESS)
-			return (RET_ERROR);
-	}
-	t->bt_cmap = (caddr_t)sp;
-	return (RET_SUCCESS);
-}
-
-/*
- * __REC_VMAP -- Get variable length records from a file.
- *
- * Parameters:
- *	t:	tree
- *	cnt:	records to read
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_vmap(BTREE *t, recno_t top)
-{
-	DBT data;
-	u_char *sp, *ep;
-	recno_t nrec;
-	int bval;
-
-	sp = (u_char *)t->bt_cmap;
-	ep = (u_char *)t->bt_emap;
-	bval = t->bt_bval;
-
-	for (nrec = t->bt_nrecs; nrec < top; ++nrec) {
-		if (sp >= ep) {
-			F_SET(t, R_EOF);
-			return (RET_SPECIAL);
-		}
-		for (data.data = sp; sp < ep && *sp != bval; ++sp);
-		data.size = sp - (u_char *)data.data;
-		if (__rec_iput(t, nrec, &data, 0) != RET_SUCCESS)
-			return (RET_ERROR);
-		++sp;
-	}
-	t->bt_cmap = (caddr_t)sp;
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc_bsd/db/recno/rec_open.c b/lib/libc_bsd/db/recno/rec_open.c
deleted file mode 100644
index d1b275b..0000000
--- a/lib/libc_bsd/db/recno/rec_open.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_open.c	8.10 (Berkeley) 9/1/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/recno/rec_open.c 189327 2009-03-04 00:58:04Z delphij $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-#include "recno.h"
-
-DB *
-__rec_open(const char *fname, int flags, int mode, const RECNOINFO *openinfo,
-    int dflags)
-{
-	BTREE *t;
-	BTREEINFO btopeninfo;
-	DB *dbp;
-	PAGE *h;
-	struct stat sb;
-	int rfd, sverrno;
-
-	/* Open the user's file -- if this fails, we're done. */
-	if (fname != NULL && (rfd = _open(fname, flags, mode)) < 0)
-		return (NULL);
-
-	/* Create a btree in memory (backed by disk). */
-	dbp = NULL;
-	if (openinfo) {
-		if (openinfo->flags & ~(R_FIXEDLEN | R_NOKEY | R_SNAPSHOT))
-			goto einval;
-		btopeninfo.flags = 0;
-		btopeninfo.cachesize = openinfo->cachesize;
-		btopeninfo.maxkeypage = 0;
-		btopeninfo.minkeypage = 0;
-		btopeninfo.psize = openinfo->psize;
-		btopeninfo.compare = NULL;
-		btopeninfo.prefix = NULL;
-		btopeninfo.lorder = openinfo->lorder;
-		dbp = __bt_open(openinfo->bfname,
-		    O_RDWR, S_IRUSR | S_IWUSR, &btopeninfo, dflags);
-	} else
-		dbp = __bt_open(NULL, O_RDWR, S_IRUSR | S_IWUSR, NULL, dflags);
-	if (dbp == NULL)
-		goto err;
-
-	/*
-	 * Some fields in the tree structure are recno specific.  Fill them
-	 * in and make the btree structure look like a recno structure.  We
-	 * don't change the bt_ovflsize value, it's close enough and slightly
-	 * bigger.
-	 */
-	t = dbp->internal;
-	if (openinfo) {
-		if (openinfo->flags & R_FIXEDLEN) {
-			F_SET(t, R_FIXLEN);
-			t->bt_reclen = openinfo->reclen;
-			if (t->bt_reclen == 0)
-				goto einval;
-		}
-		t->bt_bval = openinfo->bval;
-	} else
-		t->bt_bval = '\n';
-
-	F_SET(t, R_RECNO);
-	if (fname == NULL)
-		F_SET(t, R_EOF | R_INMEM);
-	else
-		t->bt_rfd = rfd;
-
-	if (fname != NULL) {
-		/*
-		 * In 4.4BSD, stat(2) returns true for ISSOCK on pipes.
-		 * Unfortunately, that's not portable, so we use lseek
-		 * and check the errno values.
-		 */
-		errno = 0;
-		if (lseek(rfd, (off_t)0, SEEK_CUR) == -1 && errno == ESPIPE) {
-			switch (flags & O_ACCMODE) {
-			case O_RDONLY:
-				F_SET(t, R_RDONLY);
-				break;
-			default:
-				goto einval;
-			}
-slow:			if ((t->bt_rfp = fdopen(rfd, "r")) == NULL)
-				goto err;
-			F_SET(t, R_CLOSEFP);
-			t->bt_irec =
-			    F_ISSET(t, R_FIXLEN) ? __rec_fpipe : __rec_vpipe;
-		} else {
-			switch (flags & O_ACCMODE) {
-			case O_RDONLY:
-				F_SET(t, R_RDONLY);
-				break;
-			case O_RDWR:
-				break;
-			default:
-				goto einval;
-			}
-
-			if (_fstat(rfd, &sb))
-				goto err;
-			/*
-			 * Kluge -- we'd like to test to see if the file is too
-			 * big to mmap.  Since, we don't know what size or type
-			 * off_t's or size_t's are, what the largest unsigned
-			 * integral type is, or what random insanity the local
-			 * C compiler will perpetrate, doing the comparison in
-			 * a portable way is flatly impossible.  Hope that mmap
-			 * fails if the file is too large.
-			 */
-			if (sb.st_size == 0)
-				F_SET(t, R_EOF);
-			else {
-#ifdef MMAP_NOT_AVAILABLE
-				/*
-				 * XXX
-				 * Mmap doesn't work correctly on many current
-				 * systems.  In particular, it can fail subtly,
-				 * with cache coherency problems.  Don't use it
-				 * for now.
-				 */
-				t->bt_msize = sb.st_size;
-				if ((t->bt_smap = mmap(NULL, t->bt_msize,
-				    PROT_READ, MAP_PRIVATE, rfd,
-				    (off_t)0)) == MAP_FAILED)
-					goto slow;
-				t->bt_cmap = t->bt_smap;
-				t->bt_emap = t->bt_smap + sb.st_size;
-				t->bt_irec = F_ISSET(t, R_FIXLEN) ?
-				    __rec_fmap : __rec_vmap;
-				F_SET(t, R_MEMMAPPED);
-#else
-				goto slow;
-#endif
-			}
-		}
-	}
-
-	/* Use the recno routines. */
-	dbp->close = __rec_close;
-	dbp->del = __rec_delete;
-	dbp->fd = __rec_fd;
-	dbp->get = __rec_get;
-	dbp->put = __rec_put;
-	dbp->seq = __rec_seq;
-	dbp->sync = __rec_sync;
-
-	/* If the root page was created, reset the flags. */
-	if ((h = mpool_get(t->bt_mp, P_ROOT, 0)) == NULL)
-		goto err;
-	if ((h->flags & P_TYPE) == P_BLEAF) {
-		F_CLR(h, P_TYPE);
-		F_SET(h, P_RLEAF);
-		mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-	} else
-		mpool_put(t->bt_mp, h, 0);
-
-	if (openinfo && openinfo->flags & R_SNAPSHOT &&
-	    !F_ISSET(t, R_EOF | R_INMEM) &&
-	    t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-		goto err;
-	return (dbp);
-
-einval:	errno = EINVAL;
-err:	sverrno = errno;
-	if (dbp != NULL)
-		(void)__bt_close(dbp);
-	if (fname != NULL)
-		(void)_close(rfd);
-	errno = sverrno;
-	return (NULL);
-}
-
-int
-__rec_fd(const DB *dbp)
-{
-	BTREE *t;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/* In-memory database can't have a file descriptor. */
-	if (F_ISSET(t, R_INMEM)) {
-		errno = ENOENT;
-		return (-1);
-	}
-	return (t->bt_rfd);
-}
diff --git a/lib/libc_bsd/db/recno/rec_put.c b/lib/libc_bsd/db/recno/rec_put.c
deleted file mode 100644
index 0e3a15c..0000000
--- a/lib/libc_bsd/db/recno/rec_put.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_put.c	8.7 (Berkeley) 8/18/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/recno/rec_put.c 190484 2009-03-28 05:45:29Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_PUT -- Add a recno item to the tree.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key
- *	data:	data
- *	flag:	R_CURSOR, R_IAFTER, R_IBEFORE, R_NOOVERWRITE
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS and RET_SPECIAL if the key is
- *	already in the tree and R_NOOVERWRITE specified.
- */
-int
-__rec_put(const DB *dbp, DBT *key, const DBT *data, u_int flags)
-{
-	BTREE *t;
-	DBT fdata, tdata;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	/*
-	 * If using fixed-length records, and the record is long, return
-	 * EINVAL.  If it's short, pad it out.  Use the record data return
-	 * memory, it's only short-term.
-	 */
-	if (F_ISSET(t, R_FIXLEN) && data->size != t->bt_reclen) {
-		if (data->size > t->bt_reclen)
-			goto einval;
-
-		if (t->bt_rdata.size < t->bt_reclen) {
-			t->bt_rdata.data = 
-			    reallocf(t->bt_rdata.data, t->bt_reclen);
-			if (t->bt_rdata.data == NULL)
-				return (RET_ERROR);
-			t->bt_rdata.size = t->bt_reclen;
-		}
-		memmove(t->bt_rdata.data, data->data, data->size);
-		memset((char *)t->bt_rdata.data + data->size,
-		    t->bt_bval, t->bt_reclen - data->size);
-		fdata.data = t->bt_rdata.data;
-		fdata.size = t->bt_reclen;
-	} else {
-		fdata.data = data->data;
-		fdata.size = data->size;
-	}
-
-	switch (flags) {
-	case R_CURSOR:
-		if (!F_ISSET(&t->bt_cursor, CURS_INIT))
-			goto einval;
-		nrec = t->bt_cursor.rcursor;
-		break;
-	case R_SETCURSOR:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		break;
-	case R_IAFTER:
-		if ((nrec = *(recno_t *)key->data) == 0) {
-			nrec = 1;
-			flags = R_IBEFORE;
-		}
-		break;
-	case 0:
-	case R_IBEFORE:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		break;
-	case R_NOOVERWRITE:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		if (nrec <= t->bt_nrecs)
-			return (RET_SPECIAL);
-		break;
-	default:
-einval:		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	/*
-	 * Make sure that records up to and including the put record are
-	 * already in the database.  If skipping records, create empty ones.
-	 */
-	if (nrec > t->bt_nrecs) {
-		if (!F_ISSET(t, R_EOF | R_INMEM) &&
-		    t->bt_irec(t, nrec) == RET_ERROR)
-			return (RET_ERROR);
-		if (nrec > t->bt_nrecs + 1) {
-			if (F_ISSET(t, R_FIXLEN)) {
-				if ((tdata.data =
-				    (void *)malloc(t->bt_reclen)) == NULL)
-					return (RET_ERROR);
-				tdata.size = t->bt_reclen;
-				memset(tdata.data, t->bt_bval, tdata.size);
-			} else {
-				tdata.data = NULL;
-				tdata.size = 0;
-			}
-			while (nrec > t->bt_nrecs + 1)
-				if (__rec_iput(t,
-				    t->bt_nrecs, &tdata, 0) != RET_SUCCESS)
-					return (RET_ERROR);
-			if (F_ISSET(t, R_FIXLEN))
-				free(tdata.data);
-		}
-	}
-
-	if ((status = __rec_iput(t, nrec - 1, &fdata, flags)) != RET_SUCCESS)
-		return (status);
-
-	switch (flags) {
-	case R_IAFTER:
-		nrec++;
-		break;
-	case R_SETCURSOR:
-		t->bt_cursor.rcursor = nrec;
-		break;
-	}
-
-	F_SET(t, R_MODIFIED);
-	return (__rec_ret(t, NULL, nrec, key, NULL));
-}
-
-/*
- * __REC_IPUT -- Add a recno item to the tree.
- *
- * Parameters:
- *	t:	tree
- *	nrec:	record number
- *	data:	data
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS
- */
-int
-__rec_iput(BTREE *t, recno_t nrec, const DBT *data, u_int flags)
-{
-	DBT tdata;
-	EPG *e;
-	PAGE *h;
-	indx_t idx, nxtindex;
-	pgno_t pg;
-	uint32_t nbytes;
-	int dflags, status;
-	char *dest, db[NOVFLSIZE];
-
-	/*
-	 * If the data won't fit on a page, store it on indirect pages.
-	 *
-	 * XXX
-	 * If the insert fails later on, these pages aren't recovered.
-	 */
-	if (data->size > t->bt_ovflsize) {
-		if (__ovfl_put(t, data, &pg) == RET_ERROR)
-			return (RET_ERROR);
-		tdata.data = db;
-		tdata.size = NOVFLSIZE;
-		*(pgno_t *)db = pg;
-		*(uint32_t *)(db + sizeof(pgno_t)) = data->size;
-		dflags = P_BIGDATA;
-		data = &tdata;
-	} else
-		dflags = 0;
-
-	/* __rec_search pins the returned page. */
-	if ((e = __rec_search(t, nrec,
-	    nrec > t->bt_nrecs || flags == R_IAFTER || flags == R_IBEFORE ?
-	    SINSERT : SEARCH)) == NULL)
-		return (RET_ERROR);
-
-	h = e->page;
-	idx = e->index;
-
-	/*
-	 * Add the specified key/data pair to the tree.  The R_IAFTER and
-	 * R_IBEFORE flags insert the key after/before the specified key.
-	 *
-	 * Pages are split as required.
-	 */
-	switch (flags) {
-	case R_IAFTER:
-		++idx;
-		break;
-	case R_IBEFORE:
-		break;
-	default:
-		if (nrec < t->bt_nrecs &&
-		    __rec_dleaf(t, h, idx) == RET_ERROR) {
-			mpool_put(t->bt_mp, h, 0);
-			return (RET_ERROR);
-		}
-		break;
-	}
-
-	/*
-	 * If not enough room, split the page.  The split code will insert
-	 * the key and data and unpin the current page.  If inserting into
-	 * the offset array, shift the pointers up.
-	 */
-	nbytes = NRLEAFDBT(data->size);
-	if ((uint32_t)(h->upper - h->lower) < nbytes + sizeof(indx_t)) {
-		status = __bt_split(t, h, NULL, data, dflags, nbytes, idx);
-		if (status == RET_SUCCESS)
-			++t->bt_nrecs;
-		return (status);
-	}
-
-	if (idx < (nxtindex = NEXTINDEX(h)))
-		memmove(h->linp + idx + 1, h->linp + idx,
-		    (nxtindex - idx) * sizeof(indx_t));
-	h->lower += sizeof(indx_t);
-
-	h->linp[idx] = h->upper -= nbytes;
-	dest = (char *)h + h->upper;
-	WR_RLEAF(dest, data, dflags);
-
-	++t->bt_nrecs;
-	F_SET(t, B_MODIFIED);
-	mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc_bsd/db/recno/rec_search.c b/lib/libc_bsd/db/recno/rec_search.c
deleted file mode 100644
index 4087667..0000000
--- a/lib/libc_bsd/db/recno/rec_search.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_search.c	8.4 (Berkeley) 7/14/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/recno/rec_search.c 189327 2009-03-04 00:58:04Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdio.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_SEARCH -- Search a btree for a key.
- *
- * Parameters:
- *	t:	tree to search
- *	recno:	key to find
- *	op:	search operation
- *
- * Returns:
- *	EPG for matching record, if any, or the EPG for the location of the
- *	key, if it were inserted into the tree.
- *
- * Returns:
- *	The EPG for matching record, if any, or the EPG for the location
- *	of the key, if it were inserted into the tree, is entered into
- *	the bt_cur field of the tree.  A pointer to the field is returned.
- */
-EPG *
-__rec_search(BTREE *t, recno_t recno, enum SRCHOP op)
-{
-	indx_t idx;
-	PAGE *h;
-	EPGNO *parent;
-	RINTERNAL *r;
-	pgno_t pg;
-	indx_t top;
-	recno_t total;
-	int sverrno;
-
-	BT_CLR(t);
-	for (pg = P_ROOT, total = 0;;) {
-		if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
-			goto err;
-		if (h->flags & P_RLEAF) {
-			t->bt_cur.page = h;
-			t->bt_cur.index = recno - total;
-			return (&t->bt_cur);
-		}
-		for (idx = 0, top = NEXTINDEX(h);;) {
-			r = GETRINTERNAL(h, idx);
-			if (++idx == top || total + r->nrecs > recno)
-				break;
-			total += r->nrecs;
-		}
-
-		BT_PUSH(t, pg, idx - 1);
-
-		pg = r->pgno;
-		switch (op) {
-		case SDELETE:
-			--GETRINTERNAL(h, (idx - 1))->nrecs;
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		case SINSERT:
-			++GETRINTERNAL(h, (idx - 1))->nrecs;
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-			break;
-		case SEARCH:
-			mpool_put(t->bt_mp, h, 0);
-			break;
-		}
-
-	}
-	/* Try and recover the tree. */
-err:	sverrno = errno;
-	if (op != SEARCH)
-		while  ((parent = BT_POP(t)) != NULL) {
-			if ((h = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL)
-				break;
-			if (op == SINSERT)
-				--GETRINTERNAL(h, parent->index)->nrecs;
-			else
-				++GETRINTERNAL(h, parent->index)->nrecs;
-			mpool_put(t->bt_mp, h, MPOOL_DIRTY);
-		}
-	errno = sverrno;
-	return (NULL);
-}
diff --git a/lib/libc_bsd/db/recno/rec_seq.c b/lib/libc_bsd/db/recno/rec_seq.c
deleted file mode 100644
index 3c32504..0000000
--- a/lib/libc_bsd/db/recno/rec_seq.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993, 1994
- *	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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-/* XXX use __SCCSID */
-static char sccsid[] __unused = "@(#)rec_seq.c	8.3 (Berkeley) 7/14/94";
-#endif /* not lint */
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/recno/rec_seq.c 189327 2009-03-04 00:58:04Z delphij $");
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __REC_SEQ -- Recno sequential scan interface.
- *
- * Parameters:
- *	dbp:	pointer to access method
- *	key:	key for positioning and return value
- *	data:	data return value
- *	flags:	R_CURSOR, R_FIRST, R_LAST, R_NEXT, R_PREV.
- *
- * Returns:
- *	RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
- */
-int
-__rec_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
-{
-	BTREE *t;
-	EPG *e;
-	recno_t nrec;
-	int status;
-
-	t = dbp->internal;
-
-	/* Toss any page pinned across calls. */
-	if (t->bt_pinned != NULL) {
-		mpool_put(t->bt_mp, t->bt_pinned, 0);
-		t->bt_pinned = NULL;
-	}
-
-	switch(flags) {
-	case R_CURSOR:
-		if ((nrec = *(recno_t *)key->data) == 0)
-			goto einval;
-		break;
-	case R_NEXT:
-		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
-			nrec = t->bt_cursor.rcursor + 1;
-			break;
-		}
-		/* FALLTHROUGH */
-	case R_FIRST:
-		nrec = 1;
-		break;
-	case R_PREV:
-		if (F_ISSET(&t->bt_cursor, CURS_INIT)) {
-			if ((nrec = t->bt_cursor.rcursor - 1) == 0)
-				return (RET_SPECIAL);
-			break;
-		}
-		/* FALLTHROUGH */
-	case R_LAST:
-		if (!F_ISSET(t, R_EOF | R_INMEM) &&
-		    t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
-			return (RET_ERROR);
-		nrec = t->bt_nrecs;
-		break;
-	default:
-einval:		errno = EINVAL;
-		return (RET_ERROR);
-	}
-
-	if (t->bt_nrecs == 0 || nrec > t->bt_nrecs) {
-		if (!F_ISSET(t, R_EOF | R_INMEM) &&
-		    (status = t->bt_irec(t, nrec)) != RET_SUCCESS)
-			return (status);
-		if (t->bt_nrecs == 0 || nrec > t->bt_nrecs)
-			return (RET_SPECIAL);
-	}
-
-	if ((e = __rec_search(t, nrec - 1, SEARCH)) == NULL)
-		return (RET_ERROR);
-
-	F_SET(&t->bt_cursor, CURS_INIT);
-	t->bt_cursor.rcursor = nrec;
-
-	status = __rec_ret(t, e, nrec, key, data);
-	if (F_ISSET(t, B_DB_LOCK))
-		mpool_put(t->bt_mp, e->page, 0);
-	else
-		t->bt_pinned = e->page;
-	return (status);
-}
diff --git a/lib/libc_bsd/db/recno/rec_utils.c b/lib/libc_bsd/db/recno/rec_utils.c
deleted file mode 100644
index c7be1f6..0000000
--- a/lib/libc_bsd/db/recno/rec_utils.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rec_utils.c	8.6 (Berkeley) 7/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/recno/rec_utils.c 189387 2009-03-05 00:57:01Z delphij $");
-
-#include <sys/param.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <db.h>
-#include "recno.h"
-
-/*
- * __rec_ret --
- *	Build return data.
- *
- * Parameters:
- *	t:	tree
- *	e:	key/data pair to be returned
- *   nrec:	record number
- *    key:	user's key structure
- *   data:	user's data structure
- *
- * Returns:
- *	RET_SUCCESS, RET_ERROR.
- */
-int
-__rec_ret(BTREE *t, EPG *e, recno_t nrec, DBT *key, DBT *data)
-{
-	RLEAF *rl;
-	void *p;
-
-	if (key == NULL)
-		goto dataonly;
-
-	/* We have to copy the key, it's not on the page. */
-	if (sizeof(recno_t) > t->bt_rkey.size) {
-		p = realloc(t->bt_rkey.data, sizeof(recno_t));
-		if (p == NULL)
-			return (RET_ERROR);
-		t->bt_rkey.data = p;
-		t->bt_rkey.size = sizeof(recno_t);
-	}
-	memmove(t->bt_rkey.data, &nrec, sizeof(recno_t));
-	key->size = sizeof(recno_t);
-	key->data = t->bt_rkey.data;
-
-dataonly:
-	if (data == NULL)
-		return (RET_SUCCESS);
-
-	/*
-	 * We must copy big keys/data to make them contigous.  Otherwise,
-	 * leave the page pinned and don't copy unless the user specified
-	 * concurrent access.
-	 */
-	rl = GETRLEAF(e->page, e->index);
-	if (rl->flags & P_BIGDATA) {
-		if (__ovfl_get(t, rl->bytes,
-		    &data->size, &t->bt_rdata.data, &t->bt_rdata.size))
-			return (RET_ERROR);
-		data->data = t->bt_rdata.data;
-	} else if (F_ISSET(t, B_DB_LOCK)) {
-		/* Use +1 in case the first record retrieved is 0 length. */
-		if (rl->dsize + 1 > t->bt_rdata.size) {
-			p = realloc(t->bt_rdata.data, rl->dsize + 1);
-			if (p == NULL)
-				return (RET_ERROR);
-			t->bt_rdata.data = p;
-			t->bt_rdata.size = rl->dsize + 1;
-		}
-		memmove(t->bt_rdata.data, rl->bytes, rl->dsize);
-		data->size = rl->dsize;
-		data->data = t->bt_rdata.data;
-	} else {
-		data->size = rl->dsize;
-		data->data = rl->bytes;
-	}
-	return (RET_SUCCESS);
-}
diff --git a/lib/libc_bsd/db/recno/recno.h b/lib/libc_bsd/db/recno/recno.h
deleted file mode 100644
index 8bd4d1d..0000000
--- a/lib/libc_bsd/db/recno/recno.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- *
- *	@(#)recno.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: releng/10.2/lib/libc/db/recno/recno.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-enum SRCHOP { SDELETE, SINSERT, SEARCH};	/* Rec_search operation. */
-
-#include "../btree/btree.h"
-#include "extern.h"
diff --git a/lib/libc_bsd/db/test/Makefile b/lib/libc_bsd/db/test/Makefile
deleted file mode 100644
index 289f402..0000000
--- a/lib/libc_bsd/db/test/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#	@(#)Makefile	8.15 (Berkeley) 7/28/94
-# $FreeBSD: releng/10.2/lib/libc/db/test/Makefile 81118 2001-08-03 21:45:54Z bde $
-
-PROG=	dbtest
-OBJS=	dbtest.o strerror.o
-
-# Uncomment the STAT line get hash and btree statistical use info.  This
-# also forces ld to load the btree debug functions for use by gdb, which
-# is useful.  The db library has to be compiled with -DSTATISTICS as well.
-INC=	-I${PORTDIR}/include -I${PORTDIR}
-OORG=	-g
-#STAT=	-DSTATISTICS
-CFLAGS+=-D__DBINTERFACE_PRIVATE -DDEBUG ${STAT} ${OORG} ${INC}
-
-dbtest: ${OBJS} ${PORTDIR}/libdb.a
-	${CC} -o ${.TARGET} ${OBJS} ${PORTDIR}/libdb.a
-
-strerror.o: ${PORTDIR}/clib/strerror.c
-	${CC} -c ${PORTDIR}/clib/strerror.c
-
-clean:
-	rm -f dbtest.core gmon.out ${OBJS} ${PROG} t1 t2 t3
-
-${OBJS}: Makefile
diff --git a/lib/libc_bsd/db/test/README b/lib/libc_bsd/db/test/README
deleted file mode 100644
index 0c0cd13..0000000
--- a/lib/libc_bsd/db/test/README
+++ /dev/null
@@ -1,74 +0,0 @@
-#	@(#)README	8.8 (Berkeley) 7/31/94
-
-To build this portably, try something like:
-
-    make PORTDIR="../PORT/MACH"
-
-where MACH is the machine, i.e. "sunos.4.1.1".
-
-To run the tests, enter "sh run.test".  If your system dictionary isn't
-in /usr/share/dict/words, edit run.test to reflect the correct place.
-
-Fairly large files (the command files) are built in this directory during
-the test runs, and even larger files (the database files) are created in
-"/var/tmp".  If the latter directory doesn't exist, set the environmental
-variable TMPDIR to a directory where the files can be built.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-The script file consists of lines with an initial character which is
-the command for that line, or an initial character indicating a key
-or data entry for a previous command.
-
-Legal command characters are as follows:
-
-c: compare a record
-	+ must be followed by [kK][dD]; the data value in the database
-	  associated with the specified key is compared to the specified
-	  data value.
-e: echo a string
-	+ writes out the rest of the line into the output file; if the
-	  last character is not a carriage-return, a newline is appended.
-f: set the flags for the next command
-	+ no value zero's the flags
-g: do a get command
-	+ must be followed by [kK]
-	+ writes out the retrieved data DBT.
-o [r]: dump [reverse]
-	+ dump the database out, if 'r' is set, in reverse order.
-p: do a put command
-	+ must be followed by [kK][dD]
-r: do a del command
-	+ must be followed by [kK] unless R_CURSOR flag set.
-S: sync the database
-s: do a seq command
-	+ must be followed by [kK] if R_CURSOR flag set.
-	+ writes out the retrieved data DBT.
-
-Legal key/data characters are as follows:
-
-D [file]: data file
-	+ set the current data value to the contents of the file
-d [data]:
-	+ set the current key value to the contents of the line.
-K [file]: key file
-	+ set the current key value to the contents of the file
-k [data]:
-	+ set the current key value to the contents of the line.
-
-Blank lines, lines with leading white space, and lines with leading
-hash marks (#) are ignored.
-
-Options to dbtest are as follows:
-
-	-d: Set the DB_LOCK flag.
-	-f: Use the file argument as the database file.
-	-i: Use the rest of the argument to set elements in the info
-	    structure.  If the type is btree, then "-i cachesize=10240"
-	    will set BTREEINFO.cachesize to 10240.
-	-o: The rest of the argument is the output file instead of
-	    using stdout.
-	-s: Don't delete the database file before opening it, i.e.
-	    use the database file from a previous run.
-
-Dbtest requires two arguments, the type of access "hash", "recno"
-or "btree", and the script name or "-" to indicate stdin.
diff --git a/lib/libc_bsd/db/test/btree.tests/main.c b/lib/libc_bsd/db/test/btree.tests/main.c
deleted file mode 100644
index 3a942b5..0000000
--- a/lib/libc_bsd/db/test/btree.tests/main.c
+++ /dev/null
@@ -1,763 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Olson.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/test/btree.tests/main.c 176380 2008-02-18 03:19:25Z kevlo $");
-
-#include <sys/param.h>
-#include <fcntl.h>
-#include <db.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include "btree.h"
-
-typedef struct cmd_table {
-	char *cmd;
-	int nargs;
-	int rconv;
-	void (*func)(DB *, char **);
-	char *usage, *descrip;
-} cmd_table;
-
-int stopstop;
-DB *globaldb;
-
-void append(DB *, char **);
-void bstat(DB *, char **);
-void cursor(DB *, char **);
-void delcur(DB *, char **);
-void delete(DB *, char **);
-void dump(DB *, char **);
-void first(DB *, char **);
-void get(DB *, char **);
-void help(DB *, char **);
-void iafter(DB *, char **);
-void ibefore(DB *, char **);
-void icursor(DB *, char **);
-void insert(DB *, char **);
-void keydata(DBT *, DBT *);
-void last(DB *, char **);
-void list(DB *, char **);
-void load(DB *, char **);
-void mstat(DB *, char **);
-void next(DB *, char **);
-int  parse(char *, char **, int);
-void previous(DB *, char **);
-void show(DB *, char **);
-void usage(void);
-void user(DB *);
-
-cmd_table commands[] = {
-	"?",	0, 0, help, "help", NULL,
-	"a",	2, 1, append, "append key def", "append key with data def",
-	"b",	0, 0, bstat, "bstat", "stat btree",
-	"c",	1, 1, cursor,  "cursor word", "move cursor to word",
-	"delc",	0, 0, delcur, "delcur", "delete key the cursor references",
-	"dele",	1, 1, delete, "delete word", "delete word",
-	"d",	0, 0, dump, "dump", "dump database",
-	"f",	0, 0, first, "first", "move cursor to first record",
-	"g",	1, 1, get, "get key", "locate key",
-	"h",	0, 0, help, "help", "print command summary",
-	"ia",	2, 1, iafter, "iafter key data", "insert data after key",
-	"ib",	2, 1, ibefore, "ibefore key data", "insert data before key",
-	"ic",	2, 1, icursor, "icursor key data", "replace cursor",
-	"in",	2, 1, insert, "insert key def", "insert key with data def",
-	"la",	0, 0, last, "last", "move cursor to last record",
-	"li",	1, 1, list, "list file", "list to a file",
-	"loa",	1, 0, load, "load file", NULL,
-	"loc",	1, 1, get, "get key", NULL,
-	"m",	0, 0, mstat, "mstat", "stat memory pool",
-	"n",	0, 0, next, "next", "move cursor forward one record",
-	"p",	0, 0, previous, "previous", "move cursor back one record",
-	"q",	0, 0, NULL, "quit", "quit",
-	"sh",	1, 0, show, "show page", "dump a page",
-	{ NULL },
-};
-
-int recno;					/* use record numbers */
-char *dict = "words";				/* default dictionary */
-char *progname;
-
-int
-main(argc, argv)
-	int argc;
-	char **argv;
-{
-	int c;
-	DB *db;
-	BTREEINFO b;
-
-	progname = *argv;
-
-	b.flags = 0;
-	b.cachesize = 0;
-	b.maxkeypage = 0;
-	b.minkeypage = 0;
-	b.psize = 0;
-	b.compare = NULL;
-	b.prefix = NULL;
-	b.lorder = 0;
-
-	while ((c = getopt(argc, argv, "bc:di:lp:ru")) != -1) {
-		switch (c) {
-		case 'b':
-			b.lorder = BIG_ENDIAN;
-			break;
-		case 'c':
-			b.cachesize = atoi(optarg);
-			break;
-		case 'd':
-			b.flags |= R_DUP;
-			break;
-		case 'i':
-			dict = optarg;
-			break;
-		case 'l':
-			b.lorder = LITTLE_ENDIAN;
-			break;
-		case 'p':
-			b.psize = atoi(optarg);
-			break;
-		case 'r':
-			recno = 1;
-			break;
-		case 'u':
-			b.flags = 0;
-			break;
-		default:
-			usage();
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	if (recno)
-		db = dbopen(*argv == NULL ? NULL : *argv, O_RDWR,
-		    0, DB_RECNO, NULL);
-	else
-		db = dbopen(*argv == NULL ? NULL : *argv, O_CREAT|O_RDWR,
-		    0600, DB_BTREE, &b);
-
-	if (db == NULL) {
-		(void)fprintf(stderr, "dbopen: %s\n", strerror(errno));
-		exit(1);
-	}
-	globaldb = db;
-	user(db);
-	exit(0);
-	/* NOTREACHED */
-}
-
-void
-user(db)
-	DB *db;
-{
-	FILE *ifp;
-	int argc, i, last;
-	char *lbuf, *argv[4], buf[512];
-
-	if ((ifp = fopen("/dev/tty", "r")) == NULL) {
-		(void)fprintf(stderr,
-		    "/dev/tty: %s\n", strerror(errno));
-		exit(1);
-	}
-	for (last = 0;;) {
-		(void)printf("> ");
-		(void)fflush(stdout);
-		if ((lbuf = fgets(&buf[0], 512, ifp)) == NULL)
-			break;
-		if (lbuf[0] == '\n') {
-			i = last;
-			goto uselast;
-		}
-		lbuf[strlen(lbuf) - 1] = '\0';
-
-		if (lbuf[0] == 'q')
-			break;
-
-		argc = parse(lbuf, &argv[0], 3);
-		if (argc == 0)
-			continue;
-
-		for (i = 0; commands[i].cmd != NULL; i++)
-			if (strncmp(commands[i].cmd, argv[0],
-			    strlen(commands[i].cmd)) == 0)
-				break;
-
-		if (commands[i].cmd == NULL) {
-			(void)fprintf(stderr,
-			    "%s: command unknown ('help' for help)\n", lbuf);
-			continue;
-		}
-
-		if (commands[i].nargs != argc - 1) {
-			(void)fprintf(stderr, "usage: %s\n", commands[i].usage);
-			continue;
-		}
-
-		if (recno && commands[i].rconv) {
-			static recno_t nlong;
-			nlong = atoi(argv[1]);
-			argv[1] = (char *)&nlong;
-		}
-uselast:	last = i;
-		(*commands[i].func)(db, argv);
-	}
-	if ((db->sync)(db) == RET_ERROR)
-		perror("dbsync");
-	else if ((db->close)(db) == RET_ERROR)
-		perror("dbclose");
-}
-
-int
-parse(lbuf, argv, maxargc)
-	char *lbuf, **argv;
-	int maxargc;
-{
-	int argc = 0;
-	char *c;
-
-	c = lbuf;
-	while (isspace(*c))
-		c++;
-	while (*c != '\0' && argc < maxargc) {
-		*argv++ = c;
-		argc++;
-		while (!isspace(*c) && *c != '\0') {
-			c++;
-		}
-		while (isspace(*c))
-			*c++ = '\0';
-	}
-	return (argc);
-}
-
-void
-append(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT key, data;
-	int status;
-
-	if (!recno) {
-		(void)fprintf(stderr,
-		    "append only available for recno db's.\n");
-		return;
-	}
-	key.data = argv[1];
-	key.size = sizeof(recno_t);
-	data.data = argv[2];
-	data.size = strlen(data.data);
-	status = (db->put)(db, &key, &data, R_APPEND);
-	switch (status) {
-	case RET_ERROR:
-		perror("append/put");
-		break;
-	case RET_SPECIAL:
-		(void)printf("%s (duplicate key)\n", argv[1]);
-		break;
-	case RET_SUCCESS:
-		break;
-	}
-}
-
-void
-cursor(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT data, key;
-	int status;
-
-	key.data = argv[1];
-	if (recno)
-		key.size = sizeof(recno_t);
-	else
-		key.size = strlen(argv[1]) + 1;
-	status = (*db->seq)(db, &key, &data, R_CURSOR);
-	switch (status) {
-	case RET_ERROR:
-		perror("cursor/seq");
-		break;
-	case RET_SPECIAL:
-		(void)printf("key not found\n");
-		break;
-	case RET_SUCCESS:
-		keydata(&key, &data);
-		break;
-	}
-}
-
-void
-delcur(db, argv)
-	DB *db;
-	char **argv;
-{
-	int status;
-
-	status = (*db->del)(db, NULL, R_CURSOR);
-
-	if (status == RET_ERROR)
-		perror("delcur/del");
-}
-
-void
-delete(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT key;
-	int status;
-
-	key.data = argv[1];
-	if (recno)
-		key.size = sizeof(recno_t);
-	else
-		key.size = strlen(argv[1]) + 1;
-
-	status = (*db->del)(db, &key, 0);
-	switch (status) {
-	case RET_ERROR:
-		perror("delete/del");
-		break;
-	case RET_SPECIAL:
-		(void)printf("key not found\n");
-		break;
-	case RET_SUCCESS:
-		break;
-	}
-}
-
-void
-dump(db, argv)
-	DB *db;
-	char **argv;
-{
-	__bt_dump(db);
-}
-
-void
-first(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT data, key;
-	int status;
-
-	status = (*db->seq)(db, &key, &data, R_FIRST);
-
-	switch (status) {
-	case RET_ERROR:
-		perror("first/seq");
-		break;
-	case RET_SPECIAL:
-		(void)printf("no more keys\n");
-		break;
-	case RET_SUCCESS:
-		keydata(&key, &data);
-		break;
-	}
-}
-
-void
-get(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT data, key;
-	int status;
-
-	key.data = argv[1];
-	if (recno)
-		key.size = sizeof(recno_t);
-	else
-		key.size = strlen(argv[1]) + 1;
-
-	status = (*db->get)(db, &key, &data, 0);
-
-	switch (status) {
-	case RET_ERROR:
-		perror("get/get");
-		break;
-	case RET_SPECIAL:
-		(void)printf("key not found\n");
-		break;
-	case RET_SUCCESS:
-		keydata(&key, &data);
-		break;
-	}
-}
-
-void
-help(db, argv)
-	DB *db;
-	char **argv;
-{
-	int i;
-
-	for (i = 0; commands[i].cmd; i++)
-		if (commands[i].descrip)
-			(void)printf("%s: %s\n",
-			    commands[i].usage, commands[i].descrip);
-}
-
-void
-iafter(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT key, data;
-	int status;
-
-	if (!recno) {
-		(void)fprintf(stderr,
-		    "iafter only available for recno db's.\n");
-		return;
-	}
-	key.data = argv[1];
-	key.size = sizeof(recno_t);
-	data.data = argv[2];
-	data.size = strlen(data.data);
-	status = (db->put)(db, &key, &data, R_IAFTER);
-	switch (status) {
-	case RET_ERROR:
-		perror("iafter/put");
-		break;
-	case RET_SPECIAL:
-		(void)printf("%s (duplicate key)\n", argv[1]);
-		break;
-	case RET_SUCCESS:
-		break;
-	}
-}
-
-void
-ibefore(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT key, data;
-	int status;
-
-	if (!recno) {
-		(void)fprintf(stderr,
-		    "ibefore only available for recno db's.\n");
-		return;
-	}
-	key.data = argv[1];
-	key.size = sizeof(recno_t);
-	data.data = argv[2];
-	data.size = strlen(data.data);
-	status = (db->put)(db, &key, &data, R_IBEFORE);
-	switch (status) {
-	case RET_ERROR:
-		perror("ibefore/put");
-		break;
-	case RET_SPECIAL:
-		(void)printf("%s (duplicate key)\n", argv[1]);
-		break;
-	case RET_SUCCESS:
-		break;
-	}
-}
-
-void
-icursor(db, argv)
-	DB *db;
-	char **argv;
-{
-	int status;
-	DBT data, key;
-
-	key.data = argv[1];
-	if (recno)
-		key.size = sizeof(recno_t);
-	else
-		key.size = strlen(argv[1]) + 1;
-	data.data = argv[2];
-	data.size = strlen(argv[2]) + 1;
-
-	status = (*db->put)(db, &key, &data, R_CURSOR);
-	switch (status) {
-	case RET_ERROR:
-		perror("icursor/put");
-		break;
-	case RET_SPECIAL:
-		(void)printf("%s (duplicate key)\n", argv[1]);
-		break;
-	case RET_SUCCESS:
-		break;
-	}
-}
-
-void
-insert(db, argv)
-	DB *db;
-	char **argv;
-{
-	int status;
-	DBT data, key;
-
-	key.data = argv[1];
-	if (recno)
-		key.size = sizeof(recno_t);
-	else
-		key.size = strlen(argv[1]) + 1;
-	data.data = argv[2];
-	data.size = strlen(argv[2]) + 1;
-
-	status = (*db->put)(db, &key, &data, R_NOOVERWRITE);
-	switch (status) {
-	case RET_ERROR:
-		perror("insert/put");
-		break;
-	case RET_SPECIAL:
-		(void)printf("%s (duplicate key)\n", argv[1]);
-		break;
-	case RET_SUCCESS:
-		break;
-	}
-}
-
-void
-last(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT data, key;
-	int status;
-
-	status = (*db->seq)(db, &key, &data, R_LAST);
-
-	switch (status) {
-	case RET_ERROR:
-		perror("last/seq");
-		break;
-	case RET_SPECIAL:
-		(void)printf("no more keys\n");
-		break;
-	case RET_SUCCESS:
-		keydata(&key, &data);
-		break;
-	}
-}
-
-void
-list(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT data, key;
-	FILE *fp;
-	int status;
-
-	if ((fp = fopen(argv[1], "w")) == NULL) {
-		(void)fprintf(stderr, "%s: %s\n", argv[1], strerror(errno));
-		return;
-	}
-	status = (*db->seq)(db, &key, &data, R_FIRST);
-	while (status == RET_SUCCESS) {
-		(void)fprintf(fp, "%s\n", key.data);
-		status = (*db->seq)(db, &key, &data, R_NEXT);
-	}
-	if (status == RET_ERROR)
-		perror("list/seq");
-}
-
-DB *BUGdb;
-void
-load(db, argv)
-	DB *db;
-	char **argv;
-{
-	char *p, *t;
-	FILE *fp;
-	DBT data, key;
-	recno_t cnt;
-	size_t len;
-	int status;
-	char *lp, buf[16 * 1024];
-
-	BUGdb = db;
-	if ((fp = fopen(argv[1], "r")) == NULL) {
-		(void)fprintf(stderr, "%s: %s\n", argv[1], strerror(errno));
-		return;
-	}
-	(void)printf("loading %s...\n", argv[1]);
-
-	for (cnt = 1; (lp = fgetline(fp, &len)) != NULL; ++cnt) {
-		if (recno) {
-			key.data = &cnt;
-			key.size = sizeof(recno_t);
-			data.data = lp;
-			data.size = len + 1;
-		} else {
-			key.data = lp;
-			key.size = len + 1;
-			for (p = lp + len - 1, t = buf; p >= lp; *t++ = *p--);
-			*t = '\0';
-			data.data = buf;
-			data.size = len + 1;
-		}
-
-		status = (*db->put)(db, &key, &data, R_NOOVERWRITE);
-		switch (status) {
-		case RET_ERROR:
-			perror("load/put");
-			exit(1);
-		case RET_SPECIAL:
-			if (recno)
-				(void)fprintf(stderr,
-				    "duplicate: %ld {%s}\n", cnt, data.data);
-			else
-				(void)fprintf(stderr,
-				    "duplicate: %ld {%s}\n", cnt, key.data);
-			exit(1);
-		case RET_SUCCESS:
-			break;
-		}
-	}
-	(void)fclose(fp);
-}
-
-void
-next(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT data, key;
-	int status;
-
-	status = (*db->seq)(db, &key, &data, R_NEXT);
-
-	switch (status) {
-	case RET_ERROR:
-		perror("next/seq");
-		break;
-	case RET_SPECIAL:
-		(void)printf("no more keys\n");
-		break;
-	case RET_SUCCESS:
-		keydata(&key, &data);
-		break;
-	}
-}
-
-void
-previous(db, argv)
-	DB *db;
-	char **argv;
-{
-	DBT data, key;
-	int status;
-
-	status = (*db->seq)(db, &key, &data, R_PREV);
-
-	switch (status) {
-	case RET_ERROR:
-		perror("previous/seq");
-		break;
-	case RET_SPECIAL:
-		(void)printf("no more keys\n");
-		break;
-	case RET_SUCCESS:
-		keydata(&key, &data);
-		break;
-	}
-}
-
-void
-show(db, argv)
-	DB *db;
-	char **argv;
-{
-	BTREE *t;
-	PAGE *h;
-	pgno_t pg;
-
-	pg = atoi(argv[1]);
-	t = db->internal;
-	if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL) {
-		(void)printf("getpage of %ld failed\n", pg);
-		return;
-	}
-	if (pg == 0)
-		__bt_dmpage(h);
-	else
-		__bt_dpage(h);
-	mpool_put(t->bt_mp, h, 0);
-}
-
-void
-bstat(db, argv)
-	DB *db;
-	char **argv;
-{
-	(void)printf("BTREE\n");
-	__bt_stat(db);
-}
-
-void
-mstat(db, argv)
-	DB *db;
-	char **argv;
-{
-	(void)printf("MPOOL\n");
-	mpool_stat(((BTREE *)db->internal)->bt_mp);
-}
-
-void
-keydata(key, data)
-	DBT *key, *data;
-{
-	if (!recno && key->size > 0)
-		(void)printf("%s/", key->data);
-	if (data->size > 0)
-		(void)printf("%s", data->data);
-	(void)printf("\n");
-}
-
-void
-usage()
-{
-	(void)fprintf(stderr,
-	    "usage: %s [-bdlu] [-c cache] [-i file] [-p page] [file]\n",
-	    progname);
-	exit (1);
-}
diff --git a/lib/libc_bsd/db/test/dbtest.c b/lib/libc_bsd/db/test/dbtest.c
deleted file mode 100644
index b545a4c..0000000
--- a/lib/libc_bsd/db/test/dbtest.c
+++ /dev/null
@@ -1,738 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994
- *	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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)dbtest.c	8.17 (Berkeley) 9/1/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/test/dbtest.c 176380 2008-02-18 03:19:25Z kevlo $");
-
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <db.h>
-
-enum S { COMMAND, COMPARE, GET, PUT, REMOVE, SEQ, SEQFLAG, KEY, DATA };
-
-void	 compare(DBT *, DBT *);
-DBTYPE	 dbtype(char *);
-void	 dump(DB *, int);
-void	 err(const char *, ...) __printflike(1, 2);
-void	 get(DB *, DBT *);
-void	 getdata(DB *, DBT *, DBT *);
-void	 put(DB *, DBT *, DBT *);
-void	 rem(DB *, DBT *);
-char	*sflags(int);
-void	 synk(DB *);
-void	*rfile(char *, size_t *);
-void	 seq(DB *, DBT *);
-u_int	 setflags(char *);
-void	*setinfo(DBTYPE, char *);
-void	 usage(void);
-void	*xmalloc(char *, size_t);
-
-DBTYPE type;				/* Database type. */
-void *infop;				/* Iflags. */
-u_long lineno;				/* Current line in test script. */
-u_int flags;				/* Current DB flags. */
-int ofd = STDOUT_FILENO;		/* Standard output fd. */
-
-DB *XXdbp;				/* Global for gdb. */
-int XXlineno;				/* Fast breakpoint for gdb. */
-
-int
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	extern int optind;
-	extern char *optarg;
-	enum S command, state;
-	DB *dbp;
-	DBT data, key, keydata;
-	size_t len;
-	int ch, oflags, sflag;
-	char *fname, *infoarg, *p, *t, buf[8 * 1024];
-
-	infoarg = NULL;
-	fname = NULL;
-	oflags = O_CREAT | O_RDWR;
-	sflag = 0;
-	while ((ch = getopt(argc, argv, "f:i:lo:s")) != -1)
-		switch (ch) {
-		case 'f':
-			fname = optarg;
-			break;
-		case 'i':
-			infoarg = optarg;
-			break;
-		case 'l':
-			oflags |= DB_LOCK;
-			break;
-		case 'o':
-			if ((ofd = open(optarg,
-			    O_WRONLY|O_CREAT|O_TRUNC, 0666)) < 0)
-				err("%s: %s", optarg, strerror(errno));
-			break;
-		case 's':
-			sflag = 1;
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	argc -= optind;
-	argv += optind;
-
-	if (argc != 2)
-		usage();
-
-	/* Set the type. */
-	type = dbtype(*argv++);
-
-	/* Open the descriptor file. */
-        if (strcmp(*argv, "-") && freopen(*argv, "r", stdin) == NULL)
-	    err("%s: %s", *argv, strerror(errno));
-
-	/* Set up the db structure as necessary. */
-	if (infoarg == NULL)
-		infop = NULL;
-	else
-		for (p = strtok(infoarg, ",\t "); p != NULL;
-		    p = strtok(0, ",\t "))
-			if (*p != '\0')
-				infop = setinfo(type, p);
-
-	/*
-	 * Open the DB.  Delete any preexisting copy, you almost never
-	 * want it around, and it often screws up tests.
-	 */
-	if (fname == NULL) {
-		p = getenv("TMPDIR");
-		if (p == NULL)
-			p = "/var/tmp";
-		(void)snprintf(buf, sizeof(buf), "%s/__dbtest", p);
-		fname = buf;
-		(void)unlink(buf);
-	} else  if (!sflag)
-		(void)unlink(fname);
-
-	if ((dbp = dbopen(fname,
-	    oflags, S_IRUSR | S_IWUSR, type, infop)) == NULL)
-		err("dbopen: %s", strerror(errno));
-	XXdbp = dbp;
-
-	state = COMMAND;
-	for (lineno = 1;
-	    (p = fgets(buf, sizeof(buf), stdin)) != NULL; ++lineno) {
-		/* Delete the newline, displaying the key/data is easier. */
-		if (ofd == STDOUT_FILENO && (t = strchr(p, '\n')) != NULL)
-			*t = '\0';
-		if ((len = strlen(buf)) == 0 || isspace(*p) || *p == '#')
-			continue;
-
-		/* Convenient gdb break point. */
-		if (XXlineno == lineno)
-			XXlineno = 1;
-		switch (*p) {
-		case 'c':			/* compare */
-			if (state != COMMAND)
-				err("line %lu: not expecting command", lineno);
-			state = KEY;
-			command = COMPARE;
-			break;
-		case 'e':			/* echo */
-			if (state != COMMAND)
-				err("line %lu: not expecting command", lineno);
-			/* Don't display the newline, if CR at EOL. */
-			if (p[len - 2] == '\r')
-				--len;
-			if (write(ofd, p + 1, len - 1) != len - 1 ||
-			    write(ofd, "\n", 1) != 1)
-				err("write: %s", strerror(errno));
-			break;
-		case 'g':			/* get */
-			if (state != COMMAND)
-				err("line %lu: not expecting command", lineno);
-			state = KEY;
-			command = GET;
-			break;
-		case 'p':			/* put */
-			if (state != COMMAND)
-				err("line %lu: not expecting command", lineno);
-			state = KEY;
-			command = PUT;
-			break;
-		case 'r':			/* remove */
-			if (state != COMMAND)
-				err("line %lu: not expecting command", lineno);
-                        if (flags == R_CURSOR) {
-				rem(dbp, &key);
-				state = COMMAND;
-                        } else {
-				state = KEY;
-				command = REMOVE;
-			}
-			break;
-		case 'S':			/* sync */
-			if (state != COMMAND)
-				err("line %lu: not expecting command", lineno);
-			synk(dbp);
-			state = COMMAND;
-			break;
-		case 's':			/* seq */
-			if (state != COMMAND)
-				err("line %lu: not expecting command", lineno);
-			if (flags == R_CURSOR) {
-				state = KEY;
-				command = SEQ;
-			} else
-				seq(dbp, &key);
-			break;
-		case 'f':
-			flags = setflags(p + 1);
-			break;
-		case 'D':			/* data file */
-			if (state != DATA)
-				err("line %lu: not expecting data", lineno);
-			data.data = rfile(p + 1, &data.size);
-			goto ldata;
-		case 'd':			/* data */
-			if (state != DATA)
-				err("line %lu: not expecting data", lineno);
-			data.data = xmalloc(p + 1, len - 1);
-			data.size = len - 1;
-ldata:			switch (command) {
-			case COMPARE:
-				compare(&keydata, &data);
-				break;
-			case PUT:
-				put(dbp, &key, &data);
-				break;
-			default:
-				err("line %lu: command doesn't take data",
-				    lineno);
-			}
-			if (type != DB_RECNO)
-				free(key.data);
-			free(data.data);
-			state = COMMAND;
-			break;
-		case 'K':			/* key file */
-			if (state != KEY)
-				err("line %lu: not expecting a key", lineno);
-			if (type == DB_RECNO)
-				err("line %lu: 'K' not available for recno",
-				    lineno);
-			key.data = rfile(p + 1, &key.size);
-			goto lkey;
-		case 'k':			/* key */
-			if (state != KEY)
-				err("line %lu: not expecting a key", lineno);
-			if (type == DB_RECNO) {
-				static recno_t recno;
-				recno = atoi(p + 1);
-				key.data = &recno;
-				key.size = sizeof(recno);
-			} else {
-				key.data = xmalloc(p + 1, len - 1);
-				key.size = len - 1;
-			}
-lkey:			switch (command) {
-			case COMPARE:
-				getdata(dbp, &key, &keydata);
-				state = DATA;
-				break;
-			case GET:
-				get(dbp, &key);
-				if (type != DB_RECNO)
-					free(key.data);
-				state = COMMAND;
-				break;
-			case PUT:
-				state = DATA;
-				break;
-			case REMOVE:
-				rem(dbp, &key);
-				if ((type != DB_RECNO) && (flags != R_CURSOR))
-					free(key.data);
-				state = COMMAND;
-				break;
-			case SEQ:
-				seq(dbp, &key);
-				if ((type != DB_RECNO) && (flags != R_CURSOR))
-					free(key.data);
-				state = COMMAND;
-				break;
-			default:
-				err("line %lu: command doesn't take a key",
-				    lineno);
-			}
-			break;
-		case 'o':
-			dump(dbp, p[1] == 'r');
-			break;
-		default:
-			err("line %lu: %s: unknown command character",
-			    lineno, p);
-		}
-	}
-#ifdef STATISTICS
-	/*
-	 * -l must be used (DB_LOCK must be set) for this to be
-	 * used, otherwise a page will be locked and it will fail.
-	 */
-	if (type == DB_BTREE && oflags & DB_LOCK)
-		__bt_stat(dbp);
-#endif
-	if (dbp->close(dbp))
-		err("db->close: %s", strerror(errno));
-	(void)close(ofd);
-	exit(0);
-}
-
-#define	NOOVERWRITE	"put failed, would overwrite key\n"
-
-void
-compare(db1, db2)
-	DBT *db1, *db2;
-{
-	size_t len;
-	u_char *p1, *p2;
-
-	if (db1->size != db2->size)
-		printf("compare failed: key->data len %lu != data len %lu\n",
-		    db1->size, db2->size);
-
-	len = MIN(db1->size, db2->size);
-	for (p1 = db1->data, p2 = db2->data; len--;)
-		if (*p1++ != *p2++) {
-			printf("compare failed at offset %d\n",
-			    p1 - (u_char *)db1->data);
-			break;
-		}
-}
-
-void
-get(dbp, kp)
-	DB *dbp;
-	DBT *kp;
-{
-	DBT data;
-
-	switch (dbp->get(dbp, kp, &data, flags)) {
-	case 0:
-		(void)write(ofd, data.data, data.size);
-		if (ofd == STDOUT_FILENO)
-			(void)write(ofd, "\n", 1);
-		break;
-	case -1:
-		err("line %lu: get: %s", lineno, strerror(errno));
-		/* NOTREACHED */
-	case 1:
-#define	NOSUCHKEY	"get failed, no such key\n"
-		if (ofd != STDOUT_FILENO)
-			(void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
-		else
-			(void)fprintf(stderr, "%d: %.*s: %s",
-			    lineno, MIN(kp->size, 20), kp->data, NOSUCHKEY);
-#undef	NOSUCHKEY
-		break;
-	}
-}
-
-void
-getdata(dbp, kp, dp)
-	DB *dbp;
-	DBT *kp, *dp;
-{
-	switch (dbp->get(dbp, kp, dp, flags)) {
-	case 0:
-		return;
-	case -1:
-		err("line %lu: getdata: %s", lineno, strerror(errno));
-		/* NOTREACHED */
-	case 1:
-		err("line %lu: getdata failed, no such key", lineno);
-		/* NOTREACHED */
-	}
-}
-
-void
-put(dbp, kp, dp)
-	DB *dbp;
-	DBT *kp, *dp;
-{
-	switch (dbp->put(dbp, kp, dp, flags)) {
-	case 0:
-		break;
-	case -1:
-		err("line %lu: put: %s", lineno, strerror(errno));
-		/* NOTREACHED */
-	case 1:
-		(void)write(ofd, NOOVERWRITE, sizeof(NOOVERWRITE) - 1);
-		break;
-	}
-}
-
-void
-rem(dbp, kp)
-	DB *dbp;
-	DBT *kp;
-{
-	switch (dbp->del(dbp, kp, flags)) {
-	case 0:
-		break;
-	case -1:
-		err("line %lu: rem: %s", lineno, strerror(errno));
-		/* NOTREACHED */
-	case 1:
-#define	NOSUCHKEY	"rem failed, no such key\n"
-		if (ofd != STDOUT_FILENO)
-			(void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
-		else if (flags != R_CURSOR)
-			(void)fprintf(stderr, "%d: %.*s: %s", 
-			    lineno, MIN(kp->size, 20), kp->data, NOSUCHKEY);
-		else
-			(void)fprintf(stderr,
-			    "%d: rem of cursor failed\n", lineno);
-#undef	NOSUCHKEY
-		break;
-	}
-}
-
-void
-synk(dbp)
-	DB *dbp;
-{
-	switch (dbp->sync(dbp, flags)) {
-	case 0:
-		break;
-	case -1:
-		err("line %lu: synk: %s", lineno, strerror(errno));
-		/* NOTREACHED */
-	}
-}
-
-void
-seq(dbp, kp)
-	DB *dbp;
-	DBT *kp;
-{
-	DBT data;
-
-	switch (dbp->seq(dbp, kp, &data, flags)) {
-	case 0:
-		(void)write(ofd, data.data, data.size);
-		if (ofd == STDOUT_FILENO)
-			(void)write(ofd, "\n", 1);
-		break;
-	case -1:
-		err("line %lu: seq: %s", lineno, strerror(errno));
-		/* NOTREACHED */
-	case 1:
-#define	NOSUCHKEY	"seq failed, no such key\n"
-		if (ofd != STDOUT_FILENO)
-			(void)write(ofd, NOSUCHKEY, sizeof(NOSUCHKEY) - 1);
-		else if (flags == R_CURSOR)
-			(void)fprintf(stderr, "%d: %.*s: %s", 
-			    lineno, MIN(kp->size, 20), kp->data, NOSUCHKEY);
-		else
-			(void)fprintf(stderr,
-			    "%d: seq (%s) failed\n", lineno, sflags(flags));
-#undef	NOSUCHKEY
-		break;
-	}
-}
-
-void
-dump(dbp, rev)
-	DB *dbp;
-	int rev;
-{
-	DBT key, data;
-	int flags, nflags;
-
-	if (rev) {
-		flags = R_LAST;
-		nflags = R_PREV;
-	} else {
-		flags = R_FIRST;
-		nflags = R_NEXT;
-	}
-	for (;; flags = nflags)
-		switch (dbp->seq(dbp, &key, &data, flags)) {
-		case 0:
-			(void)write(ofd, data.data, data.size);
-			if (ofd == STDOUT_FILENO)
-				(void)write(ofd, "\n", 1);
-			break;
-		case 1:
-			goto done;
-		case -1:
-			err("line %lu: (dump) seq: %s",
-			    lineno, strerror(errno));
-			/* NOTREACHED */
-		}
-done:	return;
-}
-	
-u_int
-setflags(s)
-	char *s;
-{
-	char *p, *index();
-
-	for (; isspace(*s); ++s);
-	if (*s == '\n' || *s == '\0')
-		return (0);
-	if ((p = index(s, '\n')) != NULL)
-		*p = '\0';
-	if (!strcmp(s, "R_CURSOR"))		return (R_CURSOR);
-	if (!strcmp(s, "R_FIRST"))		return (R_FIRST);
-	if (!strcmp(s, "R_IAFTER")) 		return (R_IAFTER);
-	if (!strcmp(s, "R_IBEFORE")) 		return (R_IBEFORE);
-	if (!strcmp(s, "R_LAST")) 		return (R_LAST);
-	if (!strcmp(s, "R_NEXT")) 		return (R_NEXT);
-	if (!strcmp(s, "R_NOOVERWRITE"))	return (R_NOOVERWRITE);
-	if (!strcmp(s, "R_PREV"))		return (R_PREV);
-	if (!strcmp(s, "R_SETCURSOR"))		return (R_SETCURSOR);
-
-	err("line %lu: %s: unknown flag", lineno, s);
-	/* NOTREACHED */
-}
-
-char *
-sflags(flags)
-	int flags;
-{
-	switch (flags) {
-	case R_CURSOR:		return ("R_CURSOR");
-	case R_FIRST:		return ("R_FIRST");
-	case R_IAFTER:		return ("R_IAFTER");
-	case R_IBEFORE:		return ("R_IBEFORE");
-	case R_LAST:		return ("R_LAST");
-	case R_NEXT:		return ("R_NEXT");
-	case R_NOOVERWRITE:	return ("R_NOOVERWRITE");
-	case R_PREV:		return ("R_PREV");
-	case R_SETCURSOR:	return ("R_SETCURSOR");
-	}
-
-	return ("UNKNOWN!");
-}
-	
-DBTYPE
-dbtype(s)
-	char *s;
-{
-	if (!strcmp(s, "btree"))
-		return (DB_BTREE);
-	if (!strcmp(s, "hash"))
-		return (DB_HASH);
-	if (!strcmp(s, "recno"))
-		return (DB_RECNO);
-	err("%s: unknown type (use btree, hash or recno)", s);
-	/* NOTREACHED */
-}
-
-void *
-setinfo(type, s)
-	DBTYPE type;
-	char *s;
-{
-	static BTREEINFO ib;
-	static HASHINFO ih;
-	static RECNOINFO rh;
-	char *eq, *index();
-
-	if ((eq = index(s, '=')) == NULL)
-		err("%s: illegal structure set statement", s);
-	*eq++ = '\0';
-	if (!isdigit(*eq))
-		err("%s: structure set statement must be a number", s);
-		
-	switch (type) {
-	case DB_BTREE:
-		if (!strcmp("flags", s)) {
-			ib.flags = atoi(eq);
-			return (&ib);
-		}
-		if (!strcmp("cachesize", s)) {
-			ib.cachesize = atoi(eq);
-			return (&ib);
-		}
-		if (!strcmp("maxkeypage", s)) {
-			ib.maxkeypage = atoi(eq);
-			return (&ib);
-		}
-		if (!strcmp("minkeypage", s)) {
-			ib.minkeypage = atoi(eq);
-			return (&ib);
-		}
-		if (!strcmp("lorder", s)) {
-			ib.lorder = atoi(eq);
-			return (&ib);
-		}
-		if (!strcmp("psize", s)) {
-			ib.psize = atoi(eq);
-			return (&ib);
-		}
-		break;
-	case DB_HASH:
-		if (!strcmp("bsize", s)) {
-			ih.bsize = atoi(eq);
-			return (&ih);
-		}
-		if (!strcmp("ffactor", s)) {
-			ih.ffactor = atoi(eq);
-			return (&ih);
-		}
-		if (!strcmp("nelem", s)) {
-			ih.nelem = atoi(eq);
-			return (&ih);
-		}
-		if (!strcmp("cachesize", s)) {
-			ih.cachesize = atoi(eq);
-			return (&ih);
-		}
-		if (!strcmp("lorder", s)) {
-			ih.lorder = atoi(eq);
-			return (&ih);
-		}
-		break;
-	case DB_RECNO:
-		if (!strcmp("flags", s)) {
-			rh.flags = atoi(eq);
-			return (&rh);
-		}
-		if (!strcmp("cachesize", s)) {
-			rh.cachesize = atoi(eq);
-			return (&rh);
-		}
-		if (!strcmp("lorder", s)) {
-			rh.lorder = atoi(eq);
-			return (&rh);
-		}
-		if (!strcmp("reclen", s)) {
-			rh.reclen = atoi(eq);
-			return (&rh);
-		}
-		if (!strcmp("bval", s)) {
-			rh.bval = atoi(eq);
-			return (&rh);
-		}
-		if (!strcmp("psize", s)) {
-			rh.psize = atoi(eq);
-			return (&rh);
-		}
-		break;
-	}
-	err("%s: unknown structure value", s);
-	/* NOTREACHED */
-}
-
-void *
-rfile(name, lenp)
-	char *name;
-	size_t *lenp;
-{
-	struct stat sb;
-	void *p;
-	int fd;
-	char *np, *index();
-
-	for (; isspace(*name); ++name);
-	if ((np = index(name, '\n')) != NULL)
-		*np = '\0';
-	if ((fd = open(name, O_RDONLY, 0)) < 0 ||
-	    fstat(fd, &sb))
-		err("%s: %s\n", name, strerror(errno));
-#ifdef NOT_PORTABLE
-	if (sb.st_size > (off_t)SIZE_T_MAX)
-		err("%s: %s\n", name, strerror(E2BIG));
-#endif
-	if ((p = (void *)malloc((u_int)sb.st_size)) == NULL)
-		err("%s", strerror(errno));
-	(void)read(fd, p, (int)sb.st_size);
-	*lenp = sb.st_size;
-	(void)close(fd);
-	return (p);
-}
-
-void *
-xmalloc(text, len)
-	char *text;
-	size_t len;
-{
-	void *p;
-
-	if ((p = (void *)malloc(len)) == NULL)
-		err("%s", strerror(errno));
-	memmove(p, text, len);
-	return (p);
-}
-
-void
-usage()
-{
-	(void)fprintf(stderr,
-	    "usage: dbtest [-l] [-f file] [-i info] [-o file] type script\n");
-	exit(1);
-}
-
-#include <stdarg.h>
-
-void
-err(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	(void)fprintf(stderr, "dbtest: ");
-	(void)vfprintf(stderr, fmt, ap);
-	va_end(ap);
-	(void)fprintf(stderr, "\n");
-	exit(1);
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/db/test/hash.tests/driver2.c b/lib/libc_bsd/db/test/hash.tests/driver2.c
deleted file mode 100644
index b04e944..0000000
--- a/lib/libc_bsd/db/test/hash.tests/driver2.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)driver2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/test/hash.tests/driver2.c 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * Test driver, to try to tackle the large ugly-split problem.
- */
-
-#include <sys/file.h>
-#include <stdio.h>
-#include "ndbm.h"
-
-int my_hash(key, len)
-	char	*key;
-	int	len;
-{
-	return(17);		/* So I'm cruel... */
-}
-
-main(argc, argv)
-	int	argc;
-{
-	DB	*db;
-	DBT	key, content;
-	char	keybuf[2049];
-	char	contentbuf[2049];
-	char	buf[256];
-	int	i;
-	HASHINFO	info;
-
-	info.bsize = 1024;
-	info.ffactor = 5;
-	info.nelem = 1;
-	info.cachesize = NULL;
-#ifdef HASH_ID_PROGRAM_SPECIFIED
-	info.hash_id = HASH_ID_PROGRAM_SPECIFIED;
-	info.hash_func = my_hash;
-#else
-	info.hash = my_hash;
-#endif
-	info.lorder = 0;
-	if (!(db = dbopen("bigtest", O_RDWR | O_CREAT, 0644, DB_HASH, &info))) {
-		sprintf(buf, "dbopen: failed on file bigtest");
-		perror(buf);
-		exit(1);
-	}
-	srandom(17);
-	key.data = keybuf;
-	content.data = contentbuf;
-	bzero(keybuf, sizeof(keybuf));
-	bzero(contentbuf, sizeof(contentbuf));
-	for (i=1; i <= 500; i++) {
-		key.size = 128 + (random()&1023);
-		content.size = 128 + (random()&1023);
-/*		printf("%d: Key size %d, data size %d\n", i, key.size,
-		       content.size); */
-		sprintf(keybuf, "Key #%d", i);
-		sprintf(contentbuf, "Contents #%d", i);
-		if ((db->put)(db, &key, &content, R_NOOVERWRITE)) {
-			sprintf(buf, "dbm_store #%d", i);
-			perror(buf);
-		}
-	}
-	if ((db->close)(db)) {
-		perror("closing hash file");
-		exit(1);
-	}
-	exit(0);
-}
-
-
-
diff --git a/lib/libc_bsd/db/test/hash.tests/makedb.sh b/lib/libc_bsd/db/test/hash.tests/makedb.sh
deleted file mode 100644
index f28e281..0000000
--- a/lib/libc_bsd/db/test/hash.tests/makedb.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-#	@(#)makedb.sh	8.1 (Berkeley) 6/4/93
-
-awk '{i++; print $0; print i;}' /usr/share/dict/words > WORDS
-ls /bin /usr/bin /usr/ucb /etc | egrep '^(...|....|.....|......)$' | \
-sort | uniq | \
-awk '{
-	printf "%s\n", $0
-	for (i = 0; i < 1000; i++)
-		printf "%s+", $0
-	printf "\n"
-}' > LONG.DATA
diff --git a/lib/libc_bsd/db/test/hash.tests/tcreat3.c b/lib/libc_bsd/db/test/hash.tests/tcreat3.c
deleted file mode 100644
index 38556d9..0000000
--- a/lib/libc_bsd/db/test/hash.tests/tcreat3.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tcreat3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/test/hash.tests/tcreat3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <db.h>
-
-#define INITIAL	25000
-#define MAXWORDS    25000	       /* # of elements in search table */
-
-char	wp1[8192];
-char	wp2[8192];
-main(argc, argv)
-char **argv;
-{
-	DBT item, key;
-	DB	*dbp;
-	HASHINFO ctl;
-	FILE *fp;
-	int	trash;
-
-	int i = 0;
-
-	argv++;
-	ctl.hash = NULL;
-	ctl.bsize = atoi(*argv++);
-	ctl.ffactor = atoi(*argv++);
-	ctl.nelem = atoi(*argv++);
-	ctl.lorder = 0;
-	if (!(dbp = dbopen( "hashtest",
-	    O_CREAT|O_TRUNC|O_RDWR, 0600, DB_HASH, &ctl))){
-		/* create table */
-		fprintf(stderr, "cannot create: hash table (size %d)\n",
-			INITIAL);
-		exit(1);
-	}
-
-	key.data = wp1;
-	item.data = wp2;
-	while ( fgets(wp1, 8192, stdin) &&
-		fgets(wp2, 8192, stdin) &&
-		i++ < MAXWORDS) {
-/*
-* put info in structure, and structure in the item
-*/
-		key.size = strlen(wp1);
-		item.size = strlen(wp2);
-
-/*
- * enter key/data pair into the table
- */
-		if ((dbp->put)(dbp, &key, &item, R_NOOVERWRITE) != NULL) {
-			fprintf(stderr, "cannot enter: key %s\n",
-				item.data);
-			exit(1);
-		}
-	}
-
-	(dbp->close)(dbp);
-	exit(0);
-}
diff --git a/lib/libc_bsd/db/test/hash.tests/tdel.c b/lib/libc_bsd/db/test/hash.tests/tdel.c
deleted file mode 100644
index b311eed..0000000
--- a/lib/libc_bsd/db/test/hash.tests/tdel.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tdel.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/test/hash.tests/tdel.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <db.h>
-#include <stdio.h>
-
-#define INITIAL	25000
-#define MAXWORDS    25000	       /* # of elements in search table */
-
-/* Usage: thash pagesize fillfactor file */
-char	wp1[8192];
-char	wp2[8192];
-main(argc, argv)
-char **argv;
-{
-	DBT item, key;
-	DB	*dbp;
-	HASHINFO ctl;
-	FILE *fp;
-	int	stat;
-
-	int i = 0;
-
-	argv++;
-	ctl.nelem = INITIAL;
-	ctl.hash = NULL;
-	ctl.bsize = atoi(*argv++);
-	ctl.ffactor = atoi(*argv++);
-	ctl.cachesize = 1024 * 1024;	/* 1 MEG */
-	ctl.lorder = 0;
-	argc -= 2;
-	if (!(dbp = dbopen( NULL, O_CREAT|O_RDWR, 0400, DB_HASH, &ctl))) {
-		/* create table */
-		fprintf(stderr, "cannot create: hash table size %d)\n",
-			INITIAL);
-		exit(1);
-	}
-
-	key.data = wp1;
-	item.data = wp2;
-	while ( fgets(wp1, 8192, stdin) &&
-		fgets(wp2, 8192, stdin) &&
-		i++ < MAXWORDS) {
-/*
-* put info in structure, and structure in the item
-*/
-		key.size = strlen(wp1);
-		item.size = strlen(wp2);
-
-/*
- * enter key/data pair into the table
- */
-		if ((dbp->put)(dbp, &key, &item, R_NOOVERWRITE) != NULL) {
-			fprintf(stderr, "cannot enter: key %s\n",
-				item.data);
-			exit(1);
-		}
-	}
-
-	if ( --argc ) {
-		fp = fopen ( argv[0], "r");
-		i = 0;
-		while ( fgets(wp1, 8192, fp) &&
-			fgets(wp2, 8192, fp) &&
-			i++ < MAXWORDS) {
-		    key.size = strlen(wp1);
-		    stat = (dbp->del)(dbp, &key, 0);
-		    if (stat) {
-			fprintf ( stderr, "Error retrieving %s\n", key.data );
-			exit(1);
-		    }
-		}
-		fclose(fp);
-	}
-	(dbp->close)(dbp);
-	exit(0);
-}
diff --git a/lib/libc_bsd/db/test/hash.tests/testit b/lib/libc_bsd/db/test/hash.tests/testit
deleted file mode 100644
index 039457a..0000000
--- a/lib/libc_bsd/db/test/hash.tests/testit
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/csh -f
-#
-#	@(#)testit	8.1 (Berkeley) 6/4/93
-#
-
-echo ""
-echo "PAGE FILL "
-set name=WORDS
-	set i = 256
-	foreach j ( 11 14 21 )
-	    thash4 $i $j 25000 65536 $name < $name
-	end
-	set i = 512
-	foreach j ( 21 28 43 )
-	    thash4 $i $j 25000 65536  $name < $name
-	end
-	set i = 1024
-	foreach j ( 43 57 85 )
-	    thash4 $i $j 25000 65536 $name < $name
-	end
-	set i = 2048
-	foreach j ( 85 114 171 )
-	    thash4 $i $j 25000 65536 $name < $name
-	end
-	set i = 4096
-	foreach j ( 171 228 341 )
-	    thash4 $i $j 25000 65536 $name < $name
-	end
-	set i = 8192
-	foreach j ( 341 455 683 )
-	    thash4 $i $j 25000 65536 $name < $name
-	end
-	echo "PAGE FILL "
-	set i = 256
-	foreach j ( 11 14 21 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 25000 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-	set i = 512
-	foreach j ( 21 28 43 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 25000 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-	set i = 1024
-	foreach j ( 43 57 85 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 25000 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-	set i = 2048
-	foreach j ( 85 114 171 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 25000 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-	set i = 4096
-	foreach j ( 171 228 341 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 25000 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-	set i = 8192
-	foreach j ( 341 455 683 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 25000 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-set name=LONG.DATA
-	set i = 1024
-	foreach j ( 1 2 4 )
-	    echo thash4 $i $j 600 65536 $name 
-	    thash4 $i $j 600 65536 $name < $name
-	end
-
-	set i = 2048
-	foreach j ( 1 2 4 )
-	    echo thash4 $i $j 600 65536 $name 
-	    thash4 $i $j 600 65536 $name < $name
-	end
-	set i = 4096
-	foreach j ( 1 2 4 )
-	    echo thash4 $i $j 600 65536 $name 
-	    thash4 $i $j 600 65536 $name < $name
-	end
-	set i = 8192
-	foreach j ( 2 4 8 )
-	    echo thash4 $i $j 600 65536 $name 
-	    thash4 $i $j 600 65536 $name < $name
-	end
-	echo "PAGE FILL "
-	set i = 1024
-	foreach j ( 1 2 4 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 600 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-	set i = 2048
-	foreach j ( 1 2 4 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 600 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-	set i = 4096
-	foreach j ( 1 2 4 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 600 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-	set i = 8192
-	foreach j ( 2 4 8 )
-	    echo "$i"_"$j"
-	    tcreat3 $i $j 600 $name < $name
-	    tread2 65536 < $name
-	    tverify $name < $name
-	    tseq > /dev/null
-	    tdel $i $j  $name < $name
-	end
-driver2
diff --git a/lib/libc_bsd/db/test/hash.tests/thash4.c b/lib/libc_bsd/db/test/hash.tests/thash4.c
deleted file mode 100644
index 98a746a..0000000
--- a/lib/libc_bsd/db/test/hash.tests/thash4.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)thash4.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/test/hash.tests/thash4.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/timeb.h>
-#include <stdio.h>
-#include <errno.h>
-#include <db.h>
-
-#define INITIAL	25000
-#define MAXWORDS    25000	       /* # of elements in search table */
-
-/* Usage: thash pagesize fillfactor file */
-char	wp1[8192];
-char	wp2[8192];
-main(argc, argv)
-char **argv;
-{
-	DBT item, key, res;
-	DB *dbp;
-	HASHINFO ctl;
-	FILE *fp;
-	int	stat;
-	time_t	t;
-
-	int i = 0;
-
-	argv++;
-	ctl.hash = NULL;
-	ctl.bsize = atoi(*argv++);
-	ctl.ffactor = atoi(*argv++);
-	ctl.nelem = atoi(*argv++);
-	ctl.cachesize = atoi(*argv++);
-	ctl.lorder = 0;
-	if (!(dbp = dbopen( NULL, O_CREAT|O_RDWR, 0400, DB_HASH, &ctl))) {
-		/* create table */
-		fprintf(stderr, "cannot create: hash table size %d)\n",
-			INITIAL);
-		fprintf(stderr, "\terrno: %d\n", errno);
-		exit(1);
-	}
-
-	key.data = wp1;
-	item.data = wp2;
-	while ( fgets(wp1, 8192, stdin) &&
-		fgets(wp2, 8192, stdin) &&
-		i++ < MAXWORDS) {
-/*
-* put info in structure, and structure in the item
-*/
-		key.size = strlen(wp1);
-		item.size = strlen(wp2);
-
-/*
- * enter key/data pair into the table
- */
-		if ((dbp->put)(dbp, &key, &item, R_NOOVERWRITE) != NULL) {
-			fprintf(stderr, "cannot enter: key %s\n",
-				item.data);
-			fprintf(stderr, "\terrno: %d\n", errno);
-			exit(1);
-		}
-	}
-
-	if ( --argc ) {
-		fp = fopen ( argv[0], "r");
-		i = 0;
-		while ( fgets(wp1, 256, fp) &&
-			fgets(wp2, 8192, fp) &&
-			i++ < MAXWORDS) {
-
-		    key.size = strlen(wp1);
-		    stat = (dbp->get)(dbp, &key, &res, 0);
-		    if (stat < 0 ) {
-			fprintf ( stderr, "Error retrieving %s\n", key.data );
-			fprintf(stderr, "\terrno: %d\n", errno);
-			exit(1);
-		    } else if ( stat > 0 ) {
-			fprintf ( stderr, "%s not found\n", key.data );
-			fprintf(stderr, "\terrno: %d\n", errno);
-			exit(1);
-		    }
-		}
-		fclose(fp);
-	}
-	dbp->close(dbp);
-	exit(0);
-}
diff --git a/lib/libc_bsd/db/test/hash.tests/tread2.c b/lib/libc_bsd/db/test/hash.tests/tread2.c
deleted file mode 100644
index c9c28b5..0000000
--- a/lib/libc_bsd/db/test/hash.tests/tread2.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tread2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/test/hash.tests/tread2.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <db.h>
-
-#define INITIAL	25000
-#define MAXWORDS    25000	       /* # of elements in search table */
-
-typedef struct {		       /* info to be stored */
-	int num, siz;
-} info;
-
-char	wp1[8192];
-char	wp2[8192];
-main(argc, argv)
-char **argv;
-{
-	DBT item, key, res;
-	DB	*dbp;
-	HASHINFO ctl;
-	int	stat;
-
-	int i = 0;
-
-	ctl.nelem = INITIAL;
-	ctl.hash = NULL;
-	ctl.bsize = 64;
-	ctl.ffactor = 1;
-	ctl.cachesize = atoi(*argv++);
-	ctl.lorder = 0;
-	if (!(dbp = dbopen( "hashtest", O_RDONLY, 0400, DB_HASH, &ctl))) {
-		/* create table */
-		fprintf(stderr, "cannot open: hash table\n" );
-		exit(1);
-	}
-
-	key.data = wp1;
-	item.data = wp2;
-	while ( fgets(wp1, 8192, stdin) &&
-		fgets(wp2, 8192, stdin) &&
-		i++ < MAXWORDS) {
-/*
-* put info in structure, and structure in the item
-*/
-		key.size = strlen(wp1);
-		item.size = strlen(wp2);
-
-		stat = (dbp->get)(dbp, &key, &res,0);
-		if (stat < 0) {
-		    fprintf ( stderr, "Error retrieving %s\n", key.data );
-		    exit(1);
-		} else if ( stat > 0 ) {
-		    fprintf ( stderr, "%s not found\n", key.data );
-		    exit(1);
-		}
-	}
-	(dbp->close)(dbp);
-	exit(0);
-}
diff --git a/lib/libc_bsd/db/test/hash.tests/tseq.c b/lib/libc_bsd/db/test/hash.tests/tseq.c
deleted file mode 100644
index d5f8cf0..0000000
--- a/lib/libc_bsd/db/test/hash.tests/tseq.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tseq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/test/hash.tests/tseq.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <db.h>
-
-#define INITIAL	25000
-#define MAXWORDS    25000	       /* # of elements in search table */
-
-
-char	wp[8192];
-char	cp[8192];
-main(argc, argv)
-char **argv;
-{
-	DBT item, key, res;
-	DB	*dbp;
-	FILE *fp;
-	int	stat;
-
-	if (!(dbp = dbopen( "hashtest", O_RDONLY, 0400, DB_HASH, NULL))) {
-		/* create table */
-		fprintf(stderr, "cannot open: hash table\n" );
-		exit(1);
-	}
-
-/*
-* put info in structure, and structure in the item
-*/
-	for ( stat = (dbp->seq) (dbp, &res, &item, 1 );
-	      stat == 0;
-	      stat = (dbp->seq) (dbp, &res, &item, 0 ) ) {
-
-	      bcopy ( res.data, wp, res.size );
-	      wp[res.size] = 0;
-	      bcopy ( item.data, cp, item.size );
-	      cp[item.size] = 0;
-
-	      printf ( "%s %s\n", wp, cp );
-	}
-	(dbp->close)(dbp);
-	exit(0);
-}
diff --git a/lib/libc_bsd/db/test/hash.tests/tverify.c b/lib/libc_bsd/db/test/hash.tests/tverify.c
deleted file mode 100644
index 1d595e3..0000000
--- a/lib/libc_bsd/db/test/hash.tests/tverify.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Margo Seltzer.
- *
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1991, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tverify.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/db/test/hash.tests/tverify.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <db.h>
-
-#define INITIAL	25000
-#define MAXWORDS    25000	       /* # of elements in search table */
-
-typedef struct {		       /* info to be stored */
-	int num, siz;
-} info;
-
-char	wp1[8192];
-char	wp2[8192];
-main(argc, argv)
-char **argv;
-{
-	DBT key, res;
-	DB	*dbp;
-	HASHINFO ctl;
-	int	trash;
-	int	stat;
-
-	int i = 0;
-
-	ctl.nelem = INITIAL;
-	ctl.hash = NULL;
-	ctl.bsize = 64;
-	ctl.ffactor = 1;
-	ctl.cachesize = 1024 * 1024;	/* 1 MEG */
-	ctl.lorder = 0;
-	if (!(dbp = dbopen( "hashtest", O_RDONLY, 0400, DB_HASH, &ctl))) {
-		/* create table */
-		fprintf(stderr, "cannot open: hash table\n" );
-		exit(1);
-	}
-
-	key.data = wp1;
-	while ( fgets(wp1, 8192, stdin) &&
-		fgets(wp2, 8192, stdin) &&
-		i++ < MAXWORDS) {
-/*
-* put info in structure, and structure in the item
-*/
-		key.size = strlen(wp1);
-
-		stat = (dbp->get)(dbp, &key, &res,0);
-		if (stat < 0) {
-		    fprintf ( stderr, "Error retrieving %s\n", key.data );
-		    exit(1);
-		} else if ( stat > 0 ) {
-		    fprintf ( stderr, "%s not found\n", key.data );
-		    exit(1);
-		}
-		if ( memcmp ( res.data, wp2, res.size ) ) {
-		    fprintf ( stderr, "data for %s is incorrect.  Data was %s.  Should have been %s\n", key.data, res.data, wp2 );
-		}
-	}
-	(dbp->close)(dbp);
-	exit(0);
-}
diff --git a/lib/libc_bsd/db/test/run.test b/lib/libc_bsd/db/test/run.test
deleted file mode 100644
index 52b74c3..0000000
--- a/lib/libc_bsd/db/test/run.test
+++ /dev/null
@@ -1,705 +0,0 @@
-#!/bin/sh -
-#
-#	@(#)run.test	8.10 (Berkeley) 7/26/94
-#
-
-# db regression tests
-main()
-{
-
-	PROG=./dbtest
-	TMP1=t1
-	TMP2=t2
-	TMP3=t3
-
-	if [ -f /usr/share/dict/words ]; then
-		DICT=/usr/share/dict/words
-	elif [ -f /usr/dict/words ]; then
-		DICT=/usr/dict/words
-	else
-		echo 'run.test: no dictionary'
-		exit 1
-	fi
-	
-	if [ $# -eq 0 ]; then
-		for t in 1 2 3 4 5 6 7 8 9 10 11 12 13 20; do
-			test$t
-		done
-	else
-		while [ $# -gt 0 ]
-			do case "$1" in
-			test*)
-				$1;;
-			[0-9]*)
-				test$1;;
-			btree)
-				for t in 1 2 3 7 8 9 10 12 13; do
-					test$t
-				done;;
-			hash)
-				for t in 1 2 3 8 13 20; do
-					test$t
-				done;;
-			recno)
-				for t in 1 2 3 4 5 6 7 10 11; do
-					test$t
-				done;;
-			*)
-				echo "run.test: unknown test $1"
-				echo "usage: run.test test# | type"
-				exit 1
-			esac
-			shift
-		done
-	fi
-	rm -f $TMP1 $TMP2 $TMP3
-	exit 0
-}
-
-# Take the first hundred entries in the dictionary, and make them
-# be key/data pairs.
-test1()
-{
-	echo "Test 1: btree, hash: small key, small data pairs"
-	sed 200q $DICT > $TMP1
-	for type in btree hash; do
-		rm -f $TMP2 $TMP3
-		for i in `sed 200q $DICT`; do
-			echo p
-			echo k$i
-			echo d$i
-			echo g
-			echo k$i
-		done > $TMP2
-		$PROG -o $TMP3 $type $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test1: type $type: failed"
-			exit 1
-		fi
-	done
-	echo "Test 1: recno: small key, small data pairs"
-	rm -f $TMP2 $TMP3
-	sed 200q $DICT |
-	awk '{ 
-		++i;
-		printf("p\nk%d\nd%s\ng\nk%d\n", i, $0, i);
-	}' > $TMP2
-	$PROG -o $TMP3 recno $TMP2
-	if (cmp -s $TMP1 $TMP3) ; then :
-	else
-		echo "test1: type recno: failed"
-		exit 1
-	fi
-}
-
-# Take the first 200 entries in the dictionary, and give them
-# each a medium size data entry.
-test2()
-{
-	echo "Test 2: btree, hash: small key, medium data pairs"
-	mdata=abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz
-	echo $mdata |
-	awk '{ for (i = 1; i < 201; ++i) print $0 }' > $TMP1
-	for type in hash btree; do
-		rm -f $TMP2 $TMP3
-		for i in `sed 200q $DICT`; do
-			echo p
-			echo k$i
-			echo d$mdata
-			echo g
-			echo k$i
-		done > $TMP2
-		$PROG -o $TMP3 $type $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test2: type $type: failed"
-			exit 1
-		fi
-	done
-	echo "Test 2: recno: small key, medium data pairs"
-	rm -f $TMP2 $TMP3
-	echo $mdata | 
-	awk '{  for (i = 1; i < 201; ++i)
-		printf("p\nk%d\nd%s\ng\nk%d\n", i, $0, i);
-	}' > $TMP2
-	$PROG -o $TMP3 recno $TMP2
-	if (cmp -s $TMP1 $TMP3) ; then :
-	else
-		echo "test2: type recno: failed"
-		exit 1
-	fi
-}
-
-# Insert the programs in /bin with their paths as their keys.
-test3()
-{
-	echo "Test 3: hash: small key, big data pairs"
-	rm -f $TMP1
-	(find /bin -type f -print | xargs cat) > $TMP1
-	for type in hash; do
-		rm -f $TMP2 $TMP3
-		for i in `find /bin -type f -print`; do
-			echo p
-			echo k$i
-			echo D$i
-			echo g
-			echo k$i
-		done > $TMP2
-		$PROG -o $TMP3 $type $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test3: $type: failed"
-			exit 1
-		fi
-	done
-	echo "Test 3: btree: small key, big data pairs"
-	for psize in 512 16384 65536; do
-		echo "    page size $psize"
-		for type in btree; do
-			rm -f $TMP2 $TMP3
-			for i in `find /bin -type f -print`; do
-				echo p
-				echo k$i
-				echo D$i
-				echo g
-				echo k$i
-			done > $TMP2
-			$PROG -i psize=$psize -o $TMP3 $type $TMP2
-			if (cmp -s $TMP1 $TMP3) ; then :
-			else
-				echo "test3: $type: page size $psize: failed"
-				exit 1
-			fi
-		done
-	done
-	echo "Test 3: recno: big data pairs"
-	rm -f $TMP2 $TMP3
-	find /bin -type f -print | 
-	awk '{
-		++i;
-		printf("p\nk%d\nD%s\ng\nk%d\n", i, $0, i);
-	}' > $TMP2
-	for psize in 512 16384 65536; do
-		echo "    page size $psize"
-		$PROG -i psize=$psize -o $TMP3 recno $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test3: recno: page size $psize: failed"
-			exit 1
-		fi
-	done
-}
-
-# Do random recno entries.
-test4()
-{
-	echo "Test 4: recno: random entries"
-	echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-	awk '{
-		for (i = 37; i <= 37 + 88 * 17; i += 17) {
-			if (i % 41)
-				s = substr($0, 1, i % 41);
-			else
-				s = substr($0, 1);
-			printf("input key %d: %s\n", i, s);
-		}
-		for (i = 1; i <= 15; ++i) {
-			if (i % 41)
-				s = substr($0, 1, i % 41);
-			else
-				s = substr($0, 1);
-			printf("input key %d: %s\n", i, s);
-		}
-		for (i = 19234; i <= 19234 + 61 * 27; i += 27) {
-			if (i % 41)
-				s = substr($0, 1, i % 41);
-			else
-				s = substr($0, 1);
-			printf("input key %d: %s\n", i, s);
-		}
-		exit
-	}' > $TMP1
-	rm -f $TMP2 $TMP3
-	cat $TMP1 |
-	awk 'BEGIN {
-			i = 37;
-			incr = 17;
-		}
-		{
-			printf("p\nk%d\nd%s\n", i, $0);
-			if (i == 19234 + 61 * 27)
-				exit;
-			if (i == 37 + 88 * 17) {
-				i = 1;
-				incr = 1;
-			} else if (i == 15) {
-				i = 19234;
-				incr = 27;
-			} else
-				i += incr;
-		}
-		END {
-			for (i = 37; i <= 37 + 88 * 17; i += 17)
-				printf("g\nk%d\n", i);
-			for (i = 1; i <= 15; ++i)
-				printf("g\nk%d\n", i);
-			for (i = 19234; i <= 19234 + 61 * 27; i += 27)
-				printf("g\nk%d\n", i);
-		}' > $TMP2
-	$PROG -o $TMP3 recno $TMP2
-	if (cmp -s $TMP1 $TMP3) ; then :
-	else
-		echo "test4: type recno: failed"
-		exit 1
-	fi
-}
-
-# Do reverse order recno entries.
-test5()
-{
-	echo "Test 5: recno: reverse order entries"
-	echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-	awk ' {
-		for (i = 1500; i; --i) {
-			if (i % 34)
-				s = substr($0, 1, i % 34);
-			else
-				s = substr($0, 1);
-			printf("input key %d: %s\n", i, s);
-		}
-		exit;
-	}' > $TMP1
-	rm -f $TMP2 $TMP3
-	cat $TMP1 |
-	awk 'BEGIN {
-			i = 1500;
-		}
-		{
-			printf("p\nk%d\nd%s\n", i, $0);
-			--i;
-		}
-		END {
-			for (i = 1500; i; --i) 
-				printf("g\nk%d\n", i);
-		}' > $TMP2
-	$PROG -o $TMP3 recno $TMP2
-	if (cmp -s $TMP1 $TMP3) ; then :
-	else
-		echo "test5: type recno: failed"
-		exit 1
-	fi
-}
-		
-# Do alternating order recno entries.
-test6()
-{
-	echo "Test 6: recno: alternating order entries"
-	echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-	awk ' {
-		for (i = 1; i < 1200; i += 2) {
-			if (i % 34)
-				s = substr($0, 1, i % 34);
-			else
-				s = substr($0, 1);
-			printf("input key %d: %s\n", i, s);
-		}
-		for (i = 2; i < 1200; i += 2) {
-			if (i % 34)
-				s = substr($0, 1, i % 34);
-			else
-				s = substr($0, 1);
-			printf("input key %d: %s\n", i, s);
-		}
-		exit;
-	}' > $TMP1
-	rm -f $TMP2 $TMP3
-	cat $TMP1 |
-	awk 'BEGIN {
-			i = 1;
-			even = 0;
-		}
-		{
-			printf("p\nk%d\nd%s\n", i, $0);
-			i += 2;
-			if (i >= 1200) {
-				if (even == 1)
-					exit;
-				even = 1;
-				i = 2;
-			}
-		}
-		END {
-			for (i = 1; i < 1200; ++i) 
-				printf("g\nk%d\n", i);
-		}' > $TMP2
-	$PROG -o $TMP3 recno $TMP2
-	sort -o $TMP1 $TMP1
-	sort -o $TMP3 $TMP3
-	if (cmp -s $TMP1 $TMP3) ; then :
-	else
-		echo "test6: type recno: failed"
-		exit 1
-	fi
-}
-
-# Delete cursor record
-test7()
-{
-	echo "Test 7: btree, recno: delete cursor record"
-	echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-	awk '{
-		for (i = 1; i <= 120; ++i)
-			printf("%05d: input key %d: %s\n", i, i, $0);
-		printf("%05d: input key %d: %s\n", 120, 120, $0);
-		printf("seq failed, no such key\n");
-		printf("%05d: input key %d: %s\n", 1, 1, $0);
-		printf("%05d: input key %d: %s\n", 2, 2, $0);
-		exit;
-	}' > $TMP1
-	rm -f $TMP2 $TMP3
-
-	for type in btree recno; do
-		cat $TMP1 |
-		awk '{
-			if (i == 120)
-				exit;
-			printf("p\nk%d\nd%s\n", ++i, $0);
-		}
-		END {
-			printf("fR_NEXT\n");
-			for (i = 1; i <= 120; ++i)
-				printf("s\n");
-			printf("fR_CURSOR\ns\nk120\n");
-			printf("r\n");
-			printf("fR_NEXT\ns\n");
-			printf("fR_CURSOR\ns\nk1\n");
-			printf("r\n");
-			printf("fR_FIRST\ns\n");
-		}' > $TMP2
-		$PROG -o $TMP3 recno $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test7: type $type: failed"
-			exit 1
-		fi
-	done
-}
-
-# Make sure that overflow pages are reused.
-test8()
-{
-	echo "Test 8: btree, hash: repeated small key, big data pairs"
-	rm -f $TMP1
-	echo "" | 
-	awk 'BEGIN {
-		for (i = 1; i <= 10; ++i) {
-			printf("p\nkkey1\nD/bin/sh\n");
-			printf("p\nkkey2\nD/bin/csh\n");
-			if (i % 8 == 0) {
-				printf("c\nkkey2\nD/bin/csh\n");
-				printf("c\nkkey1\nD/bin/sh\n");
-				printf("e\t%d of 10 (comparison)\n", i);
-			} else
-				printf("e\t%d of 10             \n", i);
-			printf("r\nkkey1\nr\nkkey2\n");
-		}
-	}' > $TMP1
-	$PROG btree $TMP1
-#	$PROG hash $TMP1
-	# No explicit test for success.
-}
-
-# Test btree duplicate keys
-test9()
-{
-	echo "Test 9: btree: duplicate keys"
-	echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-	awk '{
-		for (i = 1; i <= 543; ++i)
-			printf("%05d: input key %d: %s\n", i, i, $0);
-		exit;
-	}' > $TMP1
-	rm -f $TMP2 $TMP3
-
-	for type in btree; do
-		cat $TMP1 | 
-		awk '{
-			if (i++ % 2)
-				printf("p\nkduplicatekey\nd%s\n", $0);
-			else
-				printf("p\nkunique%dkey\nd%s\n", i, $0);
-		}
-		END {
-				printf("o\n");
-		}' > $TMP2
-		$PROG -iflags=1 -o $TMP3 $type $TMP2
-		sort -o $TMP3 $TMP3
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test9: type $type: failed"
-			exit 1
-		fi
-	done
-}
-
-# Test use of cursor flags without initialization
-test10()
-{
-	echo "Test 10: btree, recno: test cursor flag use"
-	echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-	awk '{
-		for (i = 1; i <= 20; ++i)
-			printf("%05d: input key %d: %s\n", i, i, $0);
-		exit;
-	}' > $TMP1
-	rm -f $TMP2 $TMP3
-
-	# Test that R_CURSOR doesn't succeed before cursor initialized
-	for type in btree recno; do
-		cat $TMP1 |
-		awk '{
-			if (i == 10)
-				exit;
-			printf("p\nk%d\nd%s\n", ++i, $0);
-		}
-		END {
-			printf("fR_CURSOR\nr\n");
-			printf("eR_CURSOR SHOULD HAVE FAILED\n");
-		}' > $TMP2
-		$PROG -o $TMP3 $type $TMP2 > /dev/null 2>&1
-		if [ -s $TMP3 ] ; then
-			echo "Test 10: delete: R_CURSOR SHOULD HAVE FAILED"
-			exit 1
-		fi
-	done
-	for type in btree recno; do
-		cat $TMP1 |
-		awk '{
-			if (i == 10)
-				exit;
-			printf("p\nk%d\nd%s\n", ++i, $0);
-		}
-		END {
-			printf("fR_CURSOR\np\nk1\ndsome data\n");
-			printf("eR_CURSOR SHOULD HAVE FAILED\n");
-		}' > $TMP2
-		$PROG -o $TMP3 $type $TMP2 > /dev/null 2>&1
-		if [ -s $TMP3 ] ; then
-			echo "Test 10: put: R_CURSOR SHOULD HAVE FAILED"
-			exit 1
-		fi
-	done
-}
-
-# Test insert in reverse order.
-test11()
-{
-	echo "Test 11: recno: reverse order insert"
-	echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-	awk '{
-		for (i = 1; i <= 779; ++i)
-			printf("%05d: input key %d: %s\n", i, i, $0);
-		exit;
-	}' > $TMP1
-	rm -f $TMP2 $TMP3
-
-	for type in recno; do
-		cat $TMP1 |
-		awk '{
-			if (i == 0) {
-				i = 1;
-				printf("p\nk1\nd%s\n", $0);
-				printf("%s\n", "fR_IBEFORE");
-			} else
-				printf("p\nk1\nd%s\n", $0);
-		}
-		END {
-				printf("or\n");
-		}' > $TMP2
-		$PROG -o $TMP3 $type $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test11: type $type: failed"
-			exit 1
-		fi
-	done
-}
-
-# Take the first 20000 entries in the dictionary, reverse them, and give
-# them each a small size data entry.  Use a small page size to make sure
-# the btree split code gets hammered.
-test12()
-{
-	echo "Test 12: btree: lots of keys, small page size"
-	mdata=abcdefghijklmnopqrstuvwxy
-	echo $mdata |
-	awk '{ for (i = 1; i < 20001; ++i) print $0 }' > $TMP1
-	for type in btree; do
-		rm -f $TMP2 $TMP3
-		for i in `sed 20000q $DICT | rev`; do
-			echo p
-			echo k$i
-			echo d$mdata
-			echo g
-			echo k$i
-		done > $TMP2
-		$PROG -i psize=512 -o $TMP3 $type $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test12: type $type: failed"
-			exit 1
-		fi
-	done
-}
-
-# Test different byte orders.
-test13()
-{
-	echo "Test 13: btree, hash: differing byte orders"
-	sed 50q $DICT > $TMP1
-	for order in 1234 4321; do
-		for type in btree hash; do
-			rm -f byte.file $TMP2 $TMP3
-			for i in `sed 50q $DICT`; do
-				echo p
-				echo k$i
-				echo d$i
-				echo g
-				echo k$i
-			done > $TMP2
-			$PROG -ilorder=$order -f byte.file -o $TMP3 $type $TMP2
-			if (cmp -s $TMP1 $TMP3) ; then :
-			else
-				echo "test13: $type/$order put failed"
-				exit 1
-			fi
-			for i in `sed 50q $DICT`; do
-				echo g
-				echo k$i
-			done > $TMP2
-			$PROG -s \
-			    -ilorder=$order -f byte.file -o $TMP3 $type $TMP2
-			if (cmp -s $TMP1 $TMP3) ; then :
-			else
-				echo "test13: $type/$order get failed"
-				exit 1
-			fi
-		done
-	done
-	rm -f byte.file
-}
-
-# Try a variety of bucketsizes and fill factors for hashing
-test20()
-{
-	echo\
-    "Test 20: hash: bucketsize, fill factor; nelem 25000 cachesize 65536"
-	echo "abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg" |
-	awk '{
-		for (i = 1; i <= 10000; ++i) {
-			if (i % 34)
-				s = substr($0, 1, i % 34);
-			else
-				s = substr($0, 1);
-			printf("%s\n", s);
-		}
-		exit;
-	}' > $TMP1
-	sed 10000q $DICT |
-	awk 'BEGIN {
-		ds="abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg abcdefg"
-	}
-	{
-		if (++i % 34)
-			s = substr(ds, 1, i % 34);
-		else
-			s = substr(ds, 1);
-		printf("p\nk%s\nd%s\n", $0, s);
-	}' > $TMP2
-	sed 10000q $DICT |
-	awk '{
-		++i;
-		printf("g\nk%s\n", $0);
-	}' >> $TMP2
-	bsize=256
-	for ffactor in 11 14 21; do
-		echo "    bucketsize $bsize, fill factor $ffactor"
-		$PROG -o$TMP3 \
-		    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-		    hash $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-			exit 1
-		fi
-	done
-	bsize=512
-	for ffactor in 21 28 43; do
-		echo "    bucketsize $bsize, fill factor $ffactor"
-		$PROG -o$TMP3 \
-		    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-		    hash $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-			exit 1
-		fi
-	done
-	bsize=1024
-	for ffactor in 43 57 85; do
-		echo "    bucketsize $bsize, fill factor $ffactor"
-		$PROG -o$TMP3 \
-		    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-		    hash $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-			exit 1
-		fi
-	done
-	bsize=2048
-	for ffactor in 85 114 171; do
-		echo "    bucketsize $bsize, fill factor $ffactor"
-		$PROG -o$TMP3 \
-		    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-		    hash $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-			exit 1
-		fi
-	done
-	bsize=4096
-	for ffactor in 171 228 341; do
-		echo "    bucketsize $bsize, fill factor $ffactor"
-		$PROG -o$TMP3 \
-		    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-		    hash $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-			exit 1
-		fi
-	done
-	bsize=8192
-	for ffactor in 341 455 683; do
-		echo "    bucketsize $bsize, fill factor $ffactor"
-		$PROG -o$TMP3 \
-		    -ibsize=$bsize,ffactor=$ffactor,nelem=25000,cachesize=65536\
-		    hash $TMP2
-		if (cmp -s $TMP1 $TMP3) ; then :
-		else
-			echo "test20: type hash:\
-bsize=$bsize ffactor=$ffactor nelem=25000 cachesize=65536 failed"
-			exit 1
-		fi
-	done
-}
-
-main $*
diff --git a/lib/libc_bsd/gdtoa/Makefile.inc b/lib/libc_bsd/gdtoa/Makefile.inc
deleted file mode 100644
index bd4ebdb..0000000
--- a/lib/libc_bsd/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Makefile.incl 178140 2008-04-12 03:11:36Z das $
-
-# netlib gdtoa sources
-.PATH: ${.CURDIR}/gdtoa
-
-MISRCS+=_hdtoa.c _hldtoa.c _ldtoa.c glue.c
-GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \
-	hd_init.c hexnan.c misc.c smisc.c \
-	strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c
-
-SYM_MAPS+=${.CURDIR}/gdtoa/Symbol.map
-
-CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa
-
-.for src in ${GDTOASRCS}
-MISRCS+=gdtoa_${src}
-CLEANFILES+=gdtoa_${src}
-gdtoa_${src}:
-	ln -sf ${.CURDIR}/../../contrib/gdtoa/${src} ${.TARGET}
-.endfor
diff --git a/lib/libc_bsd/gdtoa/Symbol.map b/lib/libc_bsd/gdtoa/Symbol.map
deleted file mode 100644
index 6b7675e..0000000
--- a/lib/libc_bsd/gdtoa/Symbol.map
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/gdtoa/Symbol.map 174681 2007-12-16 21:15:57Z das $
- */
-
-FBSD_1.0 {
-	/*
-	 * Standard functions from contrib/gdtoa
-	 */
-	strtod;
-	strtof;
-
-	/* FreeBSD additions */
-	strtold;
-};
-
-FBSDprivate_1.0 {
-	/* used in libm */
-	__hexnan_D2A;
-};
diff --git a/lib/libc_bsd/gdtoa/_hdtoa.c b/lib/libc_bsd/gdtoa/_hdtoa.c
deleted file mode 100644
index 618e767..0000000
--- a/lib/libc_bsd/gdtoa/_hdtoa.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * Copyright (c) 2004-2008 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gdtoa/_hdtoa.c 178154 2008-04-12 14:53:52Z das $");
-
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-
-#include "../stdio/floatio.h"
-#include "fpmath.h"
-#include "gdtoaimp.h"
-
-/* Strings values used by dtoa() */
-#define	INFSTR	"Infinity"
-#define	NANSTR	"NaN"
-
-#define	DBL_ADJ	(DBL_MAX_EXP - 2)
-#define	SIGFIGS	((DBL_MANT_DIG + 3) / 4 + 1)
-
-static const float one[] = { 1.0f, -1.0f };
-
-/*
- * This procedure converts a double-precision number in IEEE format
- * into a string of hexadecimal digits and an exponent of 2.  Its
- * behavior is bug-for-bug compatible with dtoa() in mode 2, with the
- * following exceptions:
- *
- * - An ndigits < 0 causes it to use as many digits as necessary to
- *   represent the number exactly.
- * - The additional xdigs argument should point to either the string
- *   "0123456789ABCDEF" or the string "0123456789abcdef", depending on
- *   which case is desired.
- * - This routine does not repeat dtoa's mistake of setting decpt
- *   to 9999 in the case of an infinity or NaN.  INT_MAX is used
- *   for this purpose instead.
- *
- * Note that the C99 standard does not specify what the leading digit
- * should be for non-zero numbers.  For instance, 0x1.3p3 is the same
- * as 0x2.6p2 is the same as 0x4.cp3.  This implementation always makes
- * the leading digit a 1. This ensures that the exponent printed is the
- * actual base-2 exponent, i.e., ilogb(d).
- *
- * Inputs:	d, xdigs, ndigits
- * Outputs:	decpt, sign, rve
- */
-char *
-__hdtoa(double d, const char *xdigs, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-	union IEEEd2bits u;
-	char *s, *s0;
-	int bufsize;
-	uint32_t manh, manl;
-
-	u.d = d;
-	*sign = u.bits.sign;
-
-	switch (fpclassify(d)) {
-	case FP_NORMAL:
-		*decpt = u.bits.exp - DBL_ADJ;
-		break;
-	case FP_ZERO:
-		*decpt = 1;
-		return (nrv_alloc("0", rve, 1));
-	case FP_SUBNORMAL:
-		u.d *= 0x1p514;
-		*decpt = u.bits.exp - (514 + DBL_ADJ);
-		break;
-	case FP_INFINITE:
-		*decpt = INT_MAX;
-		return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1));
-	default:	/* FP_NAN or unrecognized */
-		*decpt = INT_MAX;
-		return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1));
-	}
-
-	/* FP_NORMAL or FP_SUBNORMAL */
-
-	if (ndigits == 0)		/* dtoa() compatibility */
-		ndigits = 1;
-
-	/*
-	 * If ndigits < 0, we are expected to auto-size, so we allocate
-	 * enough space for all the digits.
-	 */
-	bufsize = (ndigits > 0) ? ndigits : SIGFIGS;
-	s0 = rv_alloc(bufsize);
-
-	/* Round to the desired number of digits. */
-	if (SIGFIGS > ndigits && ndigits > 0) {
-		float redux = one[u.bits.sign];
-		int offset = 4 * ndigits + DBL_MAX_EXP - 4 - DBL_MANT_DIG;
-		u.bits.exp = offset;
-		u.d += redux;
-		u.d -= redux;
-		*decpt += u.bits.exp - offset;
-	}
-
-	manh = u.bits.manh;
-	manl = u.bits.manl;
-	*s0 = '1';
-	for (s = s0 + 1; s < s0 + bufsize; s++) {
-		*s = xdigs[(manh >> (DBL_MANH_SIZE - 4)) & 0xf];
-		manh = (manh << 4) | (manl >> (DBL_MANL_SIZE - 4));
-		manl <<= 4;
-	}
-
-	/* If ndigits < 0, we are expected to auto-size the precision. */
-	if (ndigits < 0) {
-		for (ndigits = SIGFIGS; s0[ndigits - 1] == '0'; ndigits--)
-			;
-	}
-
-	s = s0 + ndigits;
-	*s = '\0';
-	if (rve != NULL)
-		*rve = s;
-	return (s0);
-}
diff --git a/lib/libc_bsd/gdtoa/_hldtoa.c b/lib/libc_bsd/gdtoa/_hldtoa.c
deleted file mode 100644
index 8aa7992..0000000
--- a/lib/libc_bsd/gdtoa/_hldtoa.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * Copyright (c) 2004-2008 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gdtoa/_hldtoa.c 178154 2008-04-12 14:53:52Z das $");
-
-#include <float.h>
-#include <limits.h>
-#include <math.h>
-#include <stdint.h>
-
-#ifdef __i386__
-#include <ieeefp.h>
-#endif
-
-#include "../stdio/floatio.h"
-#include "fpmath.h"
-#include "gdtoaimp.h"
-
-#if (LDBL_MANT_DIG > DBL_MANT_DIG)
-
-/* Strings values used by dtoa() */
-#define	INFSTR	"Infinity"
-#define	NANSTR	"NaN"
-
-#ifdef LDBL_IMPLICIT_NBIT
-#define	MANH_SIZE	LDBL_MANH_SIZE
-#else
-#define	MANH_SIZE	(LDBL_MANH_SIZE - 1)
-#endif
-
-#if MANH_SIZE > 32
-typedef uint64_t manh_t;
-#else
-typedef uint32_t manh_t;
-#endif
-
-#if LDBL_MANL_SIZE > 32
-typedef uint64_t manl_t;
-#else
-typedef uint32_t manl_t;
-#endif
-
-#define	LDBL_ADJ	(LDBL_MAX_EXP - 2)
-#define	SIGFIGS		((LDBL_MANT_DIG + 3) / 4 + 1)
-
-static const float one[] = { 1.0f, -1.0f };
-
-/*
- * This is the long double version of __hdtoa().
- */
-char *
-__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-	union IEEEl2bits u;
-	char *s, *s0;
-	manh_t manh;
-	manl_t manl;
-	int bufsize;
-#ifdef __i386__
-	fp_prec_t oldprec;
-#endif
-
-	u.e = e;
-	*sign = u.bits.sign;
-
-	switch (fpclassify(e)) {
-	case FP_NORMAL:
-		*decpt = u.bits.exp - LDBL_ADJ;
-		break;
-	case FP_ZERO:
-		*decpt = 1;
-		return (nrv_alloc("0", rve, 1));
-	case FP_SUBNORMAL:
-#ifdef __i386__
-		oldprec = fpsetprec(FP_PE);
-#endif
-		u.e *= 0x1p514L;
-		*decpt = u.bits.exp - (514 + LDBL_ADJ);
-#ifdef __i386__
-		fpsetprec(oldprec);
-#endif
-		break;
-	case FP_INFINITE:
-		*decpt = INT_MAX;
-		return (nrv_alloc(INFSTR, rve, sizeof(INFSTR) - 1));
-	default:	/* FP_NAN or unrecognized */
-		*decpt = INT_MAX;
-		return (nrv_alloc(NANSTR, rve, sizeof(NANSTR) - 1));
-	}
-
-	/* FP_NORMAL or FP_SUBNORMAL */
-
-	if (ndigits == 0)		/* dtoa() compatibility */
-		ndigits = 1;
-
-	/*
-	 * If ndigits < 0, we are expected to auto-size, so we allocate
-	 * enough space for all the digits.
-	 */
-	bufsize = (ndigits > 0) ? ndigits : SIGFIGS;
-	s0 = rv_alloc(bufsize);
-
-	/* Round to the desired number of digits. */
-	if (SIGFIGS > ndigits && ndigits > 0) {
-		float redux = one[u.bits.sign];
-		int offset = 4 * ndigits + LDBL_MAX_EXP - 4 - LDBL_MANT_DIG;
-#ifdef __i386__
-		oldprec = fpsetprec(FP_PE);
-#endif
-		u.bits.exp = offset;
-		u.e += redux;
-		u.e -= redux;
-		*decpt += u.bits.exp - offset;
-#ifdef __i386__
-		fpsetprec(oldprec);
-#endif
-	}
-
-	mask_nbit_l(u);
-	manh = u.bits.manh;
-	manl = u.bits.manl;	
-	*s0 = '1';
-	for (s = s0 + 1; s < s0 + bufsize; s++) {
-		*s = xdigs[(manh >> (MANH_SIZE - 4)) & 0xf];
-		manh = (manh << 4) | (manl >> (LDBL_MANL_SIZE - 4));
-		manl <<= 4;
-	}
-
-	/* If ndigits < 0, we are expected to auto-size the precision. */
-	if (ndigits < 0) {
-		for (ndigits = SIGFIGS; s0[ndigits - 1] == '0'; ndigits--)
-			;
-	}
-
-	s = s0 + ndigits;
-	*s = '\0';
-	if (rve != NULL)
-		*rve = s;
-	return (s0);
-}
-
-#else	/* (LDBL_MANT_DIG == DBL_MANT_DIG) */
-
-char *
-__hldtoa(long double e, const char *xdigs, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-
-	return (__hdtoa((double)e, xdigs, ndigits, decpt, sign, rve));
-}
-
-#endif	/* (LDBL_MANT_DIG == DBL_MANT_DIG) */
diff --git a/lib/libc_bsd/gdtoa/_ldtoa.c b/lib/libc_bsd/gdtoa/_ldtoa.c
deleted file mode 100644
index 32611b5..0000000
--- a/lib/libc_bsd/gdtoa/_ldtoa.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * Copyright (c) 2003 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gdtoa/_ldtoa.c 174488 2007-12-09 19:48:57Z das $");
-
-#include <float.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdlib.h>
-#include "fpmath.h"
-#include "gdtoaimp.h"
-
-/*
- * ldtoa() is a wrapper for gdtoa() that makes it smell like dtoa(),
- * except that the floating point argument is passed by reference.
- * When dtoa() is passed a NaN or infinity, it sets expt to 9999.
- * However, a long double could have a valid exponent of 9999, so we
- * use INT_MAX in ldtoa() instead.
- */
-char *
-__ldtoa(long double *ld, int mode, int ndigits, int *decpt, int *sign,
-    char **rve)
-{
-	FPI fpi = {
-		LDBL_MANT_DIG,			/* nbits */
-		LDBL_MIN_EXP - LDBL_MANT_DIG,	/* emin */
-		LDBL_MAX_EXP - LDBL_MANT_DIG,	/* emax */
-		FLT_ROUNDS,	       		/* rounding */
-#ifdef Sudden_Underflow	/* unused, but correct anyway */
-		1
-#else
-		0
-#endif
-	};
-	int be, kind;
-	char *ret;
-	union IEEEl2bits u;
-	uint32_t bits[(LDBL_MANT_DIG + 31) / 32];
-	void *vbits = bits;
-
-	u.e = *ld;
-
-	/*
-	 * gdtoa doesn't know anything about the sign of the number, so
-	 * if the number is negative, we need to swap rounding modes of
-	 * 2 (upwards) and 3 (downwards).
-	 */
-	*sign = u.bits.sign;
-	fpi.rounding ^= (fpi.rounding >> 1) & u.bits.sign;
-
-	be = u.bits.exp - (LDBL_MAX_EXP - 1) - (LDBL_MANT_DIG - 1);
-	LDBL_TO_ARRAY32(u, bits);
-
-	switch (fpclassify(u.e)) {
-	case FP_NORMAL:
-		kind = STRTOG_Normal;
-#ifdef	LDBL_IMPLICIT_NBIT
-		bits[LDBL_MANT_DIG / 32] |= 1 << ((LDBL_MANT_DIG - 1) % 32);
-#endif /* LDBL_IMPLICIT_NBIT */
-		break;
-	case FP_ZERO:
-		kind = STRTOG_Zero;
-		break;
-	case FP_SUBNORMAL:
-		kind = STRTOG_Denormal;
-		be++;
-		break;
-	case FP_INFINITE:
-		kind = STRTOG_Infinite;
-		break;
-	case FP_NAN:
-		kind = STRTOG_NaN;
-		break;
-	default:
-		abort();
-	}
-
-	ret = gdtoa(&fpi, be, vbits, &kind, mode, ndigits, decpt, rve);
-	if (*decpt == -32768)
-		*decpt = INT_MAX;
-	return ret;
-}
diff --git a/lib/libc_bsd/gdtoa/glue.c b/lib/libc_bsd/gdtoa/glue.c
deleted file mode 100644
index 81290c2..0000000
--- a/lib/libc_bsd/gdtoa/glue.c
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Machine-independent glue to integrate David Gay's gdtoa
- * package into libc.
- *
- * $FreeBSD: releng/10.2/lib/libc/gdtoa/glue.c 116652 2003-06-21 08:20:14Z das $
- */
-
-#include <pthread.h>
-
-pthread_mutex_t __gdtoa_locks[] = {
-	PTHREAD_MUTEX_INITIALIZER,
-	PTHREAD_MUTEX_INITIALIZER
-};
diff --git a/lib/libc_bsd/gdtoa/machdep_ldisQ.c b/lib/libc_bsd/gdtoa/machdep_ldisQ.c
deleted file mode 100644
index b379a28..0000000
--- a/lib/libc_bsd/gdtoa/machdep_ldisQ.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-/*
- * Machine-dependent glue to integrate David Gay's gdtoa
- * package into libc for architectures where a long double
- * uses quad precision, such as sparc64.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gdtoa/machdep_ldisQ.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <float.h>
-
-#include "gdtoaimp.h"
-
-long double
-strtold_l(const char * __restrict s, char ** __restrict sp, locale_t locale)
-{
-	long double result;
-
-	strtorQ_l(s, sp, FLT_ROUNDS, &result, locale);
-	return result;
-}
diff --git a/lib/libc_bsd/gdtoa/machdep_ldisd.c b/lib/libc_bsd/gdtoa/machdep_ldisd.c
deleted file mode 100644
index 26a83e8..0000000
--- a/lib/libc_bsd/gdtoa/machdep_ldisd.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-/*
- * Machine-dependent glue to integrate David Gay's gdtoa
- * package into libc for architectures where a long double
- * is the same as a double, such as the Alpha.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gdtoa/machdep_ldisd.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "gdtoaimp.h"
-#undef strtold_l
-
-long double
-strtold_l(const char * __restrict s, char ** __restrict sp, locale_t locale)
-{
-
-	return strtod_l(s, sp, locale);
-}
diff --git a/lib/libc_bsd/gdtoa/machdep_ldisx.c b/lib/libc_bsd/gdtoa/machdep_ldisx.c
deleted file mode 100644
index 503dc3c..0000000
--- a/lib/libc_bsd/gdtoa/machdep_ldisx.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2003 David Schultz <das@FreeBSD.ORG>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-/*
- * Machine-dependent glue to integrate David Gay's gdtoa
- * package into libc for architectures where a long double
- * is an IEEE extended precision number.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gdtoa/machdep_ldisx.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <float.h>
-
-#include "gdtoaimp.h"
-
-long double
-strtold_l(const char * __restrict s, char ** __restrict sp, locale_t locale)
-{
-	long double result;
-	FIX_LOCALE(locale);
-
-	strtorx_l(s, sp, FLT_ROUNDS, &result, locale);
-	return result;
-}
diff --git a/lib/libc_bsd/gen/Makefile.inc b/lib/libc_bsd/gen/Makefile.inc
deleted file mode 100644
index 8f1ded9..0000000
--- a/lib/libc_bsd/gen/Makefile.inc
+++ /dev/null
@@ -1,515 +0,0 @@
-#	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-Makefile.incl 277317 2015-01-18 11:54:20Z kib $
-
-# machine-independent gen sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/gen ${.CURDIR}/gen
-
-SRCS+=	__getosreldate.c \
-	__pthread_mutex_init_calloc_cb_stub.c \
-	__xuname.c \
-	_once_stub.c \
-	_pthread_stubs.c \
-	_rand48.c \
-	_spinlock_stub.c \
-	_thread_init.c \
-	alarm.c \
-	arc4random.c \
-	assert.c \
-	auxv.c \
-	basename.c \
-	cap_sandboxed.c \
-	check_utility_compat.c \
-	clock.c \
-	clock_getcpuclockid.c \
-	closedir.c \
-	confstr.c \
-	crypt.c \
-	ctermid.c \
-	daemon.c \
-	devname.c \
-	dirfd.c \
-	dirname.c \
-	disklabel.c \
-	dlfcn.c \
-	drand48.c \
-	dup3.c \
-	elf_utils.c \
-	erand48.c \
-	err.c \
-	errlst.c \
-	errno.c \
-	exec.c \
-	fdevname.c \
-	feature_present.c \
-	fmtcheck.c \
-	fmtmsg.c \
-	fnmatch.c \
-	fpclassify.c \
-	frexp.c \
-	fstab.c \
-	ftok.c \
-	fts.c \
-	fts-compat.c \
-	ftw.c \
-	getbootfile.c \
-	getbsize.c \
-	getcap.c \
-	getcwd.c \
-	getdomainname.c \
-	getgrent.c \
-	getgrouplist.c \
-	gethostname.c \
-	getloadavg.c \
-	getlogin.c \
-	getmntinfo.c \
-	getnetgrent.c \
-	getosreldate.c \
-	getpagesize.c \
-	getpagesizes.c \
-	getpeereid.c \
-	getprogname.c \
-	getpwent.c \
-	getttyent.c \
-	getusershell.c \
-	getutxent.c \
-	getvfsbyname.c \
-	glob.c \
-	initgroups.c \
-	isatty.c \
-	isinf.c \
-	isnan.c \
-	jrand48.c \
-	lcong48.c \
-	libc_dlopen.c \
-	lockf.c \
-	lrand48.c \
-	mrand48.c \
-	nftw.c \
-	nice.c \
-	nlist.c \
-	nrand48.c \
-	opendir.c \
-	pause.c \
-	pmadvise.c \
-	popen.c \
-	posix_spawn.c \
-	psignal.c \
-	pututxline.c \
-	pw_scan.c \
-	raise.c \
-	readdir.c \
-	readpassphrase.c \
-	rewinddir.c \
-	scandir.c \
-	seed48.c \
-	seekdir.c \
-	semctl.c \
-	setdomainname.c \
-	sethostname.c \
-	setjmperr.c \
-	setmode.c \
-	setproctitle.c \
-	setprogname.c \
-	siginterrupt.c \
-	siglist.c \
-	signal.c \
-	sigsetops.c \
-	sleep.c \
-	srand48.c \
-	statvfs.c \
-	stringlist.c \
-	strtofflags.c \
-	sysconf.c \
-	sysctl.c \
-	sysctlbyname.c \
-	sysctlnametomib.c \
-	syslog.c \
-	telldir.c \
-	termios.c \
-	time.c \
-	times.c \
-	timezone.c \
-	tls.c \
-	ttyname.c \
-	ttyslot.c \
-	ualarm.c \
-	ulimit.c \
-	uname.c \
-	unvis-compat.c \
-	usleep.c \
-	utime.c \
-	utxdb.c \
-	valloc.c \
-	wait.c \
-	wait3.c \
-	waitpid.c \
-	waitid.c \
-	wordexp.c
-
-.PATH: ${.CURDIR}/../../contrib/libc-pwcache
-SRCS+=	pwcache.c pwcache.h
-
-.PATH: ${.CURDIR}/../../contrib/libc-vis
-CFLAGS+=	-I${.CURDIR}/../../contrib/libc-vis
-SRCS+=	unvis.c vis.c
-
-MISRCS+=modf.c
-
-CANCELPOINTS_SRCS=sem.c sem_new.c
-.for src in ${CANCELPOINTS_SRCS}
-SRCS+=cancelpoints_${src}
-CLEANFILES+=cancelpoints_${src}
-cancelpoints_${src}:
-	ln -sf ${.CURDIR}/gen/${src} ${.TARGET}
-.endfor
-
-SYM_MAPS+=${.CURDIR}/gen/Symbol.map
-
-# machine-dependent gen sources
-Makefile.incl"
-
-MAN+=	alarm.3 \
-	arc4random.3 \
-	basename.3 \
-	cap_rights_get.3 \
-	cap_sandboxed.3 \
-	check_utility_compat.3 \
-	clock.3 \
-	clock_getcpuclockid.3 \
-	confstr.3 \
-	ctermid.3 \
-	daemon.3 \
-	devname.3 \
-	directory.3 \
-	dirname.3 \
-	dl_iterate_phdr.3 \
-	dladdr.3 \
-	dlinfo.3 \
-	dllockinit.3 \
-	dlopen.3 \
-	dup3.3 \
-	err.3 \
-	exec.3 \
-	feature_present.3 \
-	fmtcheck.3 \
-	fmtmsg.3 \
-	fnmatch.3 \
-	fpclassify.3 \
-	frexp.3 \
-	ftok.3 \
-	fts.3 \
-	ftw.3 \
-	getbootfile.3 \
-	getbsize.3 \
-	getcap.3 \
-	getcontext.3 \
-	getcwd.3 \
-	getdiskbyname.3 \
-	getdomainname.3 \
-	getfsent.3 \
-	getgrent.3 \
-	getgrouplist.3 \
-	gethostname.3 \
-	getloadavg.3 \
-	getmntinfo.3 \
-	getnetgrent.3 \
-	getosreldate.3 \
-	getpagesize.3 \
-	getpagesizes.3 \
-	getpass.3 \
-	getpeereid.3 \
-	getprogname.3 \
-	getpwent.3 \
-	getttyent.3 \
-	getusershell.3 \
-	getutxent.3 \
-	getvfsbyname.3 \
-	glob.3 \
-	initgroups.3 \
-	isgreater.3 \
-	ldexp.3 \
-	lockf.3 \
-	makecontext.3 \
-	modf.3 \
-	nice.3 \
-	nlist.3 \
-	pause.3 \
-	popen.3 \
-	posix_spawn.3 \
-	posix_spawn_file_actions_addopen.3 \
-	posix_spawn_file_actions_init.3 \
-	posix_spawnattr_getflags.3 \
-	posix_spawnattr_getpgroup.3 \
-	posix_spawnattr_getschedparam.3 \
-	posix_spawnattr_getschedpolicy.3 \
-	posix_spawnattr_init.3 \
-	posix_spawnattr_getsigdefault.3 \
-	posix_spawnattr_getsigmask.3 \
-	psignal.3 \
-	pwcache.3 \
-	raise.3 \
-	rand48.3 \
-	readpassphrase.3 \
-	rfork_thread.3 \
-	scandir.3 \
-	sem_destroy.3 \
-	sem_getvalue.3 \
-	sem_init.3 \
-	sem_open.3 \
-	sem_post.3 \
-	sem_timedwait.3 \
-	sem_wait.3 \
-	setjmp.3 \
-	setmode.3 \
-	setproctitle.3 \
-	siginterrupt.3 \
-	signal.3 \
-	sigsetops.3 \
-	sleep.3 \
-	statvfs.3 \
-	stringlist.3 \
-	strtofflags.3 \
-	sysconf.3 \
-	sysctl.3 \
-	syslog.3 \
-	tcgetpgrp.3 \
-	tcgetsid.3 \
-	tcsendbreak.3 \
-	tcsetattr.3 \
-	tcsetpgrp.3 \
-	tcsetsid.3 \
-	time.3 \
-	times.3 \
-	timezone.3 \
-	ttyname.3 \
-	tzset.3 \
-	ualarm.3 \
-	ucontext.3 \
-	ulimit.3 \
-	uname.3 \
-	unvis.3 \
-	usleep.3 \
-	utime.3 \
-	valloc.3 \
-	vis.3 \
-	wordexp.3
-
-MLINKS+=arc4random.3 arc4random_addrandom.3 \
-	arc4random.3 arc4random_stir.3 \
-	arc4random.3 arc4random_buf.3 \
-	arc4random.3 arc4random_uniform.3
-MLINKS+=basename.3 basename_r.3
-MLINKS+=ctermid.3 ctermid_r.3
-MLINKS+=devname.3 devname_r.3
-MLINKS+=devname.3 fdevname.3
-MLINKS+=devname.3 fdevname_r.3
-MLINKS+=directory.3 closedir.3 \
-	directory.3 dirfd.3 \
-	directory.3 fdclosedir.3 \
-	directory.3 fdopendir.3 \
-	directory.3 opendir.3 \
-	directory.3 readdir.3 \
-	directory.3 readdir_r.3 \
-	directory.3 rewinddir.3 \
-	directory.3 seekdir.3 \
-	directory.3 telldir.3
-MLINKS+=dlopen.3 fdlopen.3 \
-	dlopen.3 dlclose.3 \
-	dlopen.3 dlerror.3 \
-	dlopen.3 dlfunc.3 \
-	dlopen.3 dlsym.3
-MLINKS+=err.3 err_set_exit.3 \
-	err.3 err_set_file.3 \
-	err.3 errc.3 \
-	err.3 errx.3 \
-	err.3 verr.3 \
-	err.3 verrc.3 \
-	err.3 verrx.3 \
-	err.3 vwarn.3 \
-	err.3 vwarnc.3 \
-	err.3 vwarnx.3 \
-	err.3 warnc.3 \
-	err.3 warn.3 \
-	err.3 warnx.3
-MLINKS+=exec.3 execl.3 \
-	exec.3 execle.3 \
-	exec.3 execlp.3 \
-	exec.3 exect.3 \
-	exec.3 execv.3 \
-	exec.3 execvP.3 \
-	exec.3 execvp.3
-MLINKS+=fpclassify.3 finite.3 \
-	fpclassify.3 finitef.3 \
-	fpclassify.3 isfinite.3 \
-	fpclassify.3 isinf.3 \
-	fpclassify.3 isnan.3 \
-	fpclassify.3 isnormal.3
-MLINKS+=frexp.3 frexpf.3 \
-	frexp.3 frexpl.3
-MLINKS+=fts.3 fts_children.3 \
-	fts.3 fts_close.3 \
-	fts.3 fts_open.3 \
-	fts.3 fts_read.3 \
-	fts.3 fts_set.3 \
-	fts.3 fts_set_clientptr.3 \
-	fts.3 fts_get_clientptr.3 \
-	fts.3 fts_get_stream.3
-MLINKS+=ftw.3 nftw.3
-MLINKS+=getcap.3 cgetcap.3 \
-	getcap.3 cgetclose.3 \
-	getcap.3 cgetent.3 \
-	getcap.3 cgetfirst.3 \
-	getcap.3 cgetmatch.3 \
-	getcap.3 cgetnext.3 \
-	getcap.3 cgetnum.3 \
-	getcap.3 cgetset.3 \
-	getcap.3 cgetstr.3 \
-	getcap.3 cgetustr.3
-MLINKS+=getcwd.3 getwd.3
-MLINKS+=getcontext.3 getcontextx.3
-MLINKS+=getcontext.3 setcontext.3
-MLINKS+=getdomainname.3 setdomainname.3
-MLINKS+=getfsent.3 endfsent.3 \
-	getfsent.3 getfsfile.3 \
-	getfsent.3 getfsspec.3 \
-	getfsent.3 getfstype.3 \
-	getfsent.3 setfsent.3 \
-	getfsent.3 setfstab.3 \
-	getfsent.3 getfstab.3
-MLINKS+=getgrent.3 endgrent.3 \
-	getgrent.3 getgrgid.3 \
-	getgrent.3 getgrnam.3 \
-	getgrent.3 setgrent.3 \
-	getgrent.3 setgroupent.3 \
-	getgrent.3 getgrent_r.3 \
-	getgrent.3 getgrnam_r.3 \
-	getgrent.3 getgrgid_r.3
-MLINKS+=gethostname.3 sethostname.3
-MLINKS+=getnetgrent.3 endnetgrent.3 \
-	getnetgrent.3 innetgr.3 \
-	getnetgrent.3 setnetgrent.3
-MLINKS+=getprogname.3 setprogname.3
-MLINKS+=getpwent.3 endpwent.3 \
-	getpwent.3 getpwnam.3 \
-	getpwent.3 getpwuid.3 \
-	getpwent.3 setpassent.3 \
-	getpwent.3 setpwent.3 \
-	getpwent.3 setpwfile.3 \
-	getpwent.3 getpwent_r.3 \
-	getpwent.3 getpwnam_r.3 \
-	getpwent.3 getpwuid_r.3
-MLINKS+=getttyent.3 endttyent.3 \
-	getttyent.3 getttynam.3 \
-	getttyent.3 isdialuptty.3 \
-	getttyent.3 isnettty.3 \
-	getttyent.3 setttyent.3
-MLINKS+=getusershell.3 endusershell.3 \
-	getusershell.3 setusershell.3
-MLINKS+=getutxent.3 endutxent.3 \
-	getutxent.3 getutxid.3 \
-	getutxent.3 getutxline.3 \
-	getutxent.3 getutxuser.3 \
-	getutxent.3 pututxline.3 \
-	getutxent.3 setutxdb.3 \
-	getutxent.3 setutxent.3 \
-	getutxent.3 utmpx.3
-MLINKS+=glob.3 globfree.3
-MLINKS+=isgreater.3 isgreaterequal.3 \
-	isgreater.3 isless.3 \
-	isgreater.3 islessequal.3 \
-	isgreater.3 islessgreater.3 \
-	isgreater.3 isunordered.3
-MLINKS+=ldexp.3 ldexpf.3 \
-	ldexp.3 ldexpl.3
-MLINKS+=makecontext.3 swapcontext.3
-MLINKS+=modf.3 modff.3 \
-	modf.3 modfl.3
-MLINKS+=popen.3 pclose.3
-MLINKS+=posix_spawn.3 posix_spawnp.3 \
-	posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_addclose.3 \
-	posix_spawn_file_actions_addopen.3 posix_spawn_file_actions_adddup2.3 \
-	posix_spawn_file_actions_init.3 posix_spawn_file_actions_destroy.3 \
-	posix_spawnattr_getflags.3 posix_spawnattr_setflags.3 \
-	posix_spawnattr_getpgroup.3 posix_spawnattr_setpgroup.3 \
-	posix_spawnattr_getschedparam.3 posix_spawnattr_setschedparam.3 \
-	posix_spawnattr_getschedpolicy.3 posix_spawnattr_setschedpolicy.3 \
-	posix_spawnattr_getsigdefault.3 posix_spawnattr_setsigdefault.3 \
-	posix_spawnattr_getsigmask.3 posix_spawnattr_setsigmask.3 \
-	posix_spawnattr_init.3 posix_spawnattr_destroy.3
-MLINKS+=psignal.3 strsignal.3 \
-	psignal.3 sys_siglist.3 \
-	psignal.3 sys_signame.3
-MLINKS+=pwcache.3 group_from_gid.3 \
-	pwcache.3 user_from_uid.3
-MLINKS+=rand48.3 _rand48.3 \
-	rand48.3 drand48.3 \
-	rand48.3 erand48.3 \
-	rand48.3 jrand48.3 \
-	rand48.3 lcong48.3 \
-	rand48.3 lrand48.3 \
-	rand48.3 mrand48.3 \
-	rand48.3 nrand48.3 \
-	rand48.3 seed48.3 \
-	rand48.3 srand48.3
-MLINKS+=scandir.3 alphasort.3
-MLINKS+=sem_open.3 sem_close.3 \
-	sem_open.3 sem_unlink.3
-MLINKS+=sem_wait.3 sem_trywait.3
-MLINKS+=setjmp.3 _longjmp.3 \
-	setjmp.3 _setjmp.3 \
-	setjmp.3 longjmp.3 \
-	setjmp.3 longjmperr.3 \
-	setjmp.3 longjmperror.3 \
-	setjmp.3 siglongjmp.3 \
-	setjmp.3 sigsetjmp.3
-MLINKS+=setmode.3 getmode.3
-MLINKS+=sigsetops.3 sigaddset.3 \
-	sigsetops.3 sigdelset.3 \
-	sigsetops.3 sigemptyset.3 \
-	sigsetops.3 sigfillset.3 \
-	sigsetops.3 sigismember.3
-MLINKS+=statvfs.3 fstatvfs.3
-MLINKS+=stringlist.3 sl_add.3 \
-	stringlist.3 sl_find.3 \
-	stringlist.3 sl_free.3 \
-	stringlist.3 sl_init.3
-MLINKS+=strtofflags.3 fflagstostr.3
-MLINKS+=sysctl.3 sysctlbyname.3 \
-	sysctl.3 sysctlnametomib.3
-MLINKS+=syslog.3 closelog.3 \
-	syslog.3 openlog.3 \
-	syslog.3 setlogmask.3 \
-	syslog.3 vsyslog.3
-MLINKS+=tcsendbreak.3 tcdrain.3 \
-	tcsendbreak.3 tcflow.3 \
-	tcsendbreak.3 tcflush.3
-MLINKS+=tcsetattr.3 cfgetispeed.3 \
-	tcsetattr.3 cfgetospeed.3 \
-	tcsetattr.3 cfmakeraw.3 \
-	tcsetattr.3 cfmakesane.3 \
-	tcsetattr.3 cfsetispeed.3 \
-	tcsetattr.3 cfsetospeed.3 \
-	tcsetattr.3 cfsetspeed.3 \
-	tcsetattr.3 tcgetattr.3
-MLINKS+=ttyname.3 isatty.3 \
-	ttyname.3 ttyname_r.3
-MLINKS+=tzset.3 tzsetwall.3
-MLINKS+=unvis.3 strunvis.3 \
-	unvis.3 strunvisx.3
-MLINKS+=vis.3 nvis.3 \
-	vis.3 snvis.3 \
-	vis.3 strenvisx.3 \
-	vis.3 strnunvis.3 \
-	vis.3 strnunvisx.3 \
-	vis.3 strnvis.3 \
-	vis.3 strnvisx.3 \
-	vis.3 strsenvisx.3 \
-	vis.3 strsnvis.3 \
-	vis.3 strsnvisx.3 \
-	vis.3 strsvis.3 \
-	vis.3 strsvisx.3 \
-	vis.3 strvis.3 \
-	vis.3 strvisx.3 \
-	vis.3 svis.3
-
-MLINKS+=wordexp.3 wordfree.3
diff --git a/lib/libc_bsd/gen/Symbol.map b/lib/libc_bsd/gen/Symbol.map
deleted file mode 100644
index 7d8a019..0000000
--- a/lib/libc_bsd/gen/Symbol.map
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/gen/Symbol.map 277317 2015-01-18 11:54:20Z kib $
- */
-
-FBSD_1.0 {
-	__xuname;
-	pthread_atfork;
-	pthread_attr_destroy;
-	pthread_attr_getdetachstate;
-	pthread_attr_getguardsize;
-	pthread_attr_getinheritsched;
-	pthread_attr_getschedparam;
-	pthread_attr_getschedpolicy;
-	pthread_attr_getscope;
-	pthread_attr_getstackaddr;
-	pthread_attr_getstacksize;
-	pthread_attr_init;
-	pthread_attr_setdetachstate;
-	pthread_attr_setguardsize;
-	pthread_attr_setinheritsched;
-	pthread_attr_setschedparam;
-	pthread_attr_setschedpolicy;
-	pthread_attr_setscope;
-	pthread_attr_setstackaddr;
-	pthread_attr_setstacksize;
-	pthread_cancel;
-	pthread_cleanup_pop;
-	pthread_cleanup_push;
-	pthread_cond_broadcast;
-	pthread_cond_destroy;
-	pthread_cond_init;
-	pthread_cond_signal;
-	pthread_cond_timedwait;
-	pthread_cond_wait;
-	pthread_detach;
-	pthread_equal;
-	pthread_exit;
-	pthread_getspecific;
-	pthread_join;
-	pthread_key_create;
-	pthread_key_delete;
-	pthread_kill;
-	pthread_main_np;
-	pthread_mutex_destroy;
-	pthread_mutex_init;
-	pthread_mutex_lock;
-	pthread_mutex_trylock;
-	pthread_mutex_unlock;
-	pthread_mutexattr_destroy;
-	pthread_mutexattr_init;
-	pthread_mutexattr_settype;
-	pthread_once;
-	pthread_rwlock_destroy;
-	pthread_rwlock_init;
-	pthread_rwlock_rdlock;
-	pthread_rwlock_tryrdlock;
-	pthread_rwlock_trywrlock;
-	pthread_rwlock_unlock;
-	pthread_rwlock_wrlock;
-	pthread_self;
-	pthread_setcancelstate;
-	pthread_setcanceltype;
-	pthread_setspecific;
-	pthread_sigmask;
-	pthread_testcancel;
-	alarm;
-	arc4random;
-	arc4random_addrandom;
-	arc4random_stir;
-	__assert;
-	basename;
-	check_utility_compat;
-	clock;
-	closedir;
-	confstr;
-	encrypt;
-	des_setkey;
-	des_cipher;
-	setkey;
-	ctermid;
-	ctermid_r;
-	daemon;
-	devname;
-	devname_r;
-	dirname;
-	getdiskbyname;
-	dladdr;
-	dlclose;
-	dlerror;
-	dlfunc;
-	dllockinit;
-	dlopen;
-	dlsym;
-	dlvsym;
-	dlinfo;
-	dl_iterate_phdr;
-	drand48;
-	erand48;
-	err_set_file;
-	err_set_exit;
-	err;
-	verr;
-	errc;
-	verrc;
-	errx;
-	verrx;
-	warn;
-	vwarn;
-	warnc;
-	vwarnc;
-	warnx;
-	vwarnx;
-	sys_errlist;
-	sys_nerr;
-	errno;
-	execl;
-	execle;
-	execlp;
-	execv;
-	execvp;
-	execvP;
-	fmtcheck;
-	fmtmsg;
-	fnmatch;
-	__fpclassifyf;
-	__fpclassifyd;
-	__fpclassifyl;
-	frexp;
-	setfstab;
-	getfstab;
-	getfsent;
-	getfsspec;
-	getfsfile;
-	setfsent;
-	endfsent;
-	ftok;
-	ftw;
-	glob;
-	globfree;
-	getbootfile;
-	getbsize;
-	cgetset;
-	cgetcap;
-	cgetent;
-	cgetmatch;
-	cgetfirst;
-	cgetclose;
-	cgetnext;
-	cgetstr;
-	cgetustr;
-	cgetnum;
-	getcwd;
-	getdomainname;
-	setgrent;
-	setgroupent;
-	endgrent;
-	getgrent_r;
-	getgrnam_r;
-	getgrgid_r;
-	getgrnam;
-	getgrgid;
-	getgrent;
-	/*
-	 * Why are __gr_parse_entry() and __gr_match_entry() not static in
-	 * gen/getgrent.c?
-	 */
-	getgrouplist;
-	gethostname;
-	getloadavg;
-	getlogin;
-	getlogin_r;
-	getmntinfo;
-	setnetgrent;
-	getnetgrent;
-	endnetgrent;
-	innetgr;
-	getosreldate;
-	getpagesize;
-	getpeereid;
-	_getprogname;
-	getprogname;
-	setpwent;
-	setpassent;
-	endpwent;
-	getpwent_r;
-	getpwnam_r;
-	getpwuid_r;
-	getpwnam;
-	getpwuid;
-	getpwent;
-	getttynam;
-	getttyent;
-	setttyent;
-	endttyent;
-	isdialuptty;
-	isnettty;
-	getusershell;
-	endusershell;
-	setusershell;
-	getvfsbyname;
-	__isnan;
-	isnan;
-	__isnanf;
-	isnanf;
-	__isinf;
-	isinf;
-	__isinff;
-	__isinfl;
-	isatty;
-	initgroups;
-	jrand48;
-	lcong48;
-	ldexp;
-	lockf;
-	lrand48;
-	modf;
-	mrand48;
-	nftw;
-	nice;
-	nlist;
-	nrand48;
-	opendir;
-	pause;
-	posix_madvise;
-	popen;
-	pclose;
-	psignal;
-	raise;
-	readdir;
-	readdir_r;
-	readpassphrase;
-	getpass;
-	rewinddir;
-	scandir;
-	alphasort;
-	seed48;
-	seekdir;
-	user_from_uid;
-	group_from_gid;
-	setdomainname;
-	sethostname;
-	longjmperror;
-	getmode;
-	setmode;
-	setproctitle;
-	setprogname;
-	siginterrupt;
-	sys_signame;
-	sys_siglist;
-	sys_nsig;
-	signal;
-	sigaddset;
-	sigdelset;
-	sigemptyset;
-	sigfillset;
-	sigismember;
-	sleep;
-	srand48;
-	fstatvfs;
-	statvfs;
-	sl_init;
-	sl_add;
-	sl_free;
-	sl_find;
-	fflagstostr;
-	strtofflags;
-	sysconf;
-	sysctl;
-	sysctlbyname;
-	sysctlnametomib;
-	syslog;
-	vsyslog;
-	openlog;
-	closelog;
-	setlogmask;
-	ttyname_r;
-	ttyname;
-	timezone;
-	times;
-	time;
-	telldir;
-	tcgetattr;
-	tcsetattr;
-	tcsetpgrp;
-	tcgetpgrp;
-	cfgetospeed;
-	cfgetispeed;
-	cfsetospeed;
-	cfsetispeed;
-	cfsetspeed;
-	cfmakeraw;
-	tcsendbreak;
-	_init_tls;
-	__tls_get_addr;
-	tcdrain;
-	tcflush;
-	tcflow;
-	ualarm;
-	ulimit;
-	uname;
-	strunvis;
-	strunvisx;
-	usleep;
-	utime;
-	valloc;
-	vis;
-	strvis;
-	strvisx;
-	wait;
-	wait3;
-	waitpid;
-	wordexp;
-	wordfree;
-};
-
-FBSD_1.1 {
-	arc4random_buf;
-	arc4random_uniform;
-	fdevname;
-	fdevname_r;
-	fdopendir;
-	feature_present;
-	fts_children;
-	fts_close;
-	fts_get_clientptr;
-	fts_get_stream;
-	fts_open;
-	fts_read;
-	fts_set;
-	fts_set_clientptr;
-	posix_spawn;
-	posix_spawn_file_actions_addclose;
-	posix_spawn_file_actions_adddup2;
-	posix_spawn_file_actions_addopen;
-	posix_spawn_file_actions_destroy;
-	posix_spawn_file_actions_init;
-	posix_spawnattr_destroy;
-	posix_spawnattr_getflags;
-	posix_spawnattr_getpgroup;
-	posix_spawnattr_getschedparam;
-	posix_spawnattr_getschedpolicy;
-	posix_spawnattr_getsigdefault;
-	posix_spawnattr_getsigmask;
-	posix_spawnattr_init;
-	posix_spawnattr_setflags;
-	posix_spawnattr_setpgroup;
-	posix_spawnattr_setschedparam;
-	posix_spawnattr_setschedpolicy;
-	posix_spawnattr_setsigdefault;
-	posix_spawnattr_setsigmask;
-	posix_spawnp;
-	semctl;
-	tcgetsid;
-	tcsetsid;
-	__pthread_cleanup_pop_imp;
-	__pthread_cleanup_push_imp;
-};
-
-FBSD_1.2 {
-	basename_r;
-	cfmakesane;
-	endutxent;
-	getpagesizes;
-	getutxent;
-	getutxid;
-	getutxline;
-	getutxuser;
-	pututxline;
-	sem_close;
-	sem_destroy;
-	sem_getvalue;
-	sem_init;
-	sem_open;
-	sem_post;
-	sem_timedwait;
-	sem_trywait;
-	sem_unlink;
-	sem_wait;
-	setutxdb;
-	setutxent;
-};
-
-FBSD_1.3 {
-	clock_getcpuclockid;
-	dirfd;
-	dup3;
-	fdclosedir;
-	fdlopen;
-	__FreeBSD_libc_enter_restricted_mode;
-	getcontextx;
-	gid_from_group;
-	nvis;
-	pwcache_userdb;
-	pwcache_groupdb;
-	snvis;
-	strenvisx;
-	strnunvis;
-	strnunvisx;
-	strnvis;
-	strnvisx;
-	strsenvisx;
-	strsnvis;
-	strsnvisx;
-	strsvis;
-	strsvisx;
-	svis;
-	uid_from_user;
-	unvis;
-	waitid;
-};
-
-FBSDprivate_1.0 {
-	/* needed by thread libraries */
-	__thr_jtable;
-
-	_pthread_atfork;
-	_pthread_attr_destroy;
-	_pthread_attr_getdetachstate;
-	_pthread_attr_getguardsize;
-	_pthread_attr_getinheritsched;
-	_pthread_attr_getschedparam;
-	_pthread_attr_getschedpolicy;
-	_pthread_attr_getscope;
-	_pthread_attr_getstackaddr;
-	_pthread_attr_getstacksize;
-	_pthread_attr_init;
-	_pthread_attr_setdetachstate;
-	_pthread_attr_setguardsize;
-	_pthread_attr_setinheritsched;
-	_pthread_attr_setschedparam;
-	_pthread_attr_setschedpolicy;
-	_pthread_attr_setscope;
-	_pthread_attr_setstackaddr;
-	_pthread_attr_setstacksize;
-	_pthread_cancel;
-	_pthread_cancel_enter;
-	_pthread_cancel_leave;
-	_pthread_cleanup_pop;
-	_pthread_cleanup_push;
-	_pthread_cond_broadcast;
-	_pthread_cond_destroy;
-	_pthread_cond_init;
-	_pthread_cond_signal;
-	_pthread_cond_timedwait;
-	_pthread_cond_wait;
-	_pthread_detach;
-	_pthread_equal;
-	_pthread_exit;
-	_pthread_getspecific;
-	_pthread_join;
-	_pthread_key_create;
-	_pthread_key_delete;
-	_pthread_kill;
-	_pthread_main_np;
-	_pthread_mutex_destroy;
-	_pthread_mutex_init_calloc_cb;
-	_pthread_mutex_init;
-	_pthread_mutex_lock;
-	_pthread_mutex_trylock;
-	_pthread_mutex_unlock;
-	_pthread_mutexattr_destroy;
-	_pthread_mutexattr_init;
-	_pthread_mutexattr_settype;
-	_pthread_once;
-	_pthread_rwlock_destroy;
-	_pthread_rwlock_init;
-	_pthread_rwlock_rdlock;
-	_pthread_rwlock_tryrdlock;
-	_pthread_rwlock_trywrlock;
-	_pthread_rwlock_unlock;
-	_pthread_rwlock_wrlock;
-	_pthread_self;
-	_pthread_setcancelstate;
-	_pthread_setcanceltype;
-	_pthread_setspecific;
-	_pthread_sigmask;
-	_pthread_testcancel;
-	_spinlock;
-	_spinlock_debug;
-	_spinunlock;
-	_rtld_addr_phdr;
-	_rtld_atfork_pre;
-	_rtld_atfork_post;
-	_rtld_error;		/* for private use */
-	_rtld_get_stack_prot;
-	_rtld_is_dlopened;
-	_rtld_thread_init;	/* for private use */
-	__elf_phdr_match_addr;
-	_err;
-	_warn;
-	__fmtcheck;
-	/* __pw_match_entry; */
-	/* __pw_parse_entry; */
-	__fdnlist;	/* used by libkvm */
-	/* __aout_fdnlist; */
-	/* __elf_is_okay__; */
-	/* __elf_fdnlist; */
-	__opendir2;
-	__pause;
-	_pause;
-	__pw_scan;	/* Used by (at least) libutil */
-	__raise;
-	_raise;
-	__sleep;
-	_sleep;
-	_rtld_allocate_tls;
-	_rtld_free_tls;
-#if defined(i386)
-	___libc_tls_get_addr;	/* x86 only */
-#endif
-	__libc_tls_get_addr;
-	__tcdrain;
-	_tcdrain;
-	__usleep;
-	_usleep;
-	__wait;
-	_wait;
-	__waitpid;
-	_waitpid;
-
-	_libc_sem_init_compat;
-	_libc_sem_destroy_compat;
-	_libc_sem_open_compat;
-	_libc_sem_close_compat;
-	_libc_sem_unlink_compat;
-	_libc_sem_wait_compat;
-	_libc_sem_trywait_compat;
-	_libc_sem_timedwait_compat;
-	_libc_sem_post_compat;
-	_libc_sem_getvalue_compat;
-
-	__libc_tcdrain;
-
-	__elf_aux_vector;
-	__pthread_map_stacks_exec;
-	__fillcontextx;
-	__fillcontextx2;
-	__getcontextx_size;
-};
diff --git a/lib/libc_bsd/gen/__getosreldate.c b/lib/libc_bsd/gen/__getosreldate.c
deleted file mode 100644
index 59c4331..0000000
--- a/lib/libc_bsd/gen/__getosreldate.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2007 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/__getosreldate.c 211416 2010-08-17 09:13:26Z kib $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <errno.h>
-#include <link.h>
-#include "libc_private.h"
-
-int __getosreldate(void);
-
-/*
- * This is private to libc.  It is intended for wrapping syscall stubs in order
- * to avoid having to put SIGSYS signal handlers in place to test for presence
- * of new syscalls.  This caches the result in order to be as quick as possible.
- *
- * Use getosreldate(3) for public use as it respects the $OSVERSION environment
- * variable.
- */
-
-int
-__getosreldate(void)
-{
-	static int osreldate;
-	size_t len;
-	int oid[2];
-	int error, osrel;
-
-	if (osreldate != 0)
-		return (osreldate);
-
-	error = _elf_aux_info(AT_OSRELDATE, &osreldate, sizeof(osreldate));
-	if (error == 0 && osreldate != 0)
-		return (osreldate);
-
-	oid[0] = CTL_KERN;
-	oid[1] = KERN_OSRELDATE;
-	osrel = 0;
-	len = sizeof(osrel);
-	error = sysctl(oid, 2, &osrel, &len, NULL, 0);
-	if (error == 0 && osrel > 0 && len == sizeof(osrel))
-		osreldate = osrel;
-	return (osreldate);
-}
diff --git a/lib/libc_bsd/gen/__pthread_mutex_init_calloc_cb_stub.c b/lib/libc_bsd/gen/__pthread_mutex_init_calloc_cb_stub.c
deleted file mode 100644
index 0ddd847..0000000
--- a/lib/libc_bsd/gen/__pthread_mutex_init_calloc_cb_stub.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <pthread.h>
-#include "libc_private.h"
-
-int
-_pthread_mutex_init_calloc_cb_stub(pthread_mutex_t *mutex,
-    void *(calloc_cb)(size_t, size_t))
-{
-
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/__xuname.c b/lib/libc_bsd/gen/__xuname.c
deleted file mode 100644
index dd5d94f..0000000
--- a/lib/libc_bsd/gen/__xuname.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";*/
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/__xuname.c 184185 2008-10-22 21:56:57Z kib $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-int
-__xuname(int namesize, void *namebuf)
-{
-	int mib[2], rval;
-	size_t len;
-	char *p, *q;
-	int oerrno;
-
-	rval = 0;
-	q = (char *)namebuf;
-
-	mib[0] = CTL_KERN;
-
-	if ((p = getenv("UNAME_s")))
-		strlcpy(q, p, namesize);
-	else {
-		mib[1] = KERN_OSTYPE;
-		len = namesize;
-		oerrno = errno;
-		if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
-			if (errno == ENOMEM)
-				errno = oerrno;
-			else
-				rval = -1;
-		}
-		q[namesize - 1] = '\0';
-	}
-	q += namesize;
-
-	mib[1] = KERN_HOSTNAME;
-	len = namesize;
-	oerrno = errno;
-	if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
-		if (errno == ENOMEM)
-			errno = oerrno;
-		else
-			rval = -1;
-	}
-	q[namesize - 1] = '\0';
-	q += namesize;
-
-	if ((p = getenv("UNAME_r")))
-		strlcpy(q, p, namesize);
-	else {
-		mib[1] = KERN_OSRELEASE;
-		len = namesize;
-		oerrno = errno;
-		if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
-			if (errno == ENOMEM)
-				errno = oerrno;
-			else
-				rval = -1;
-		}
-		q[namesize - 1] = '\0';
-	}
-	q += namesize;
-
-	if ((p = getenv("UNAME_v")))
-		strlcpy(q, p, namesize);
-	else {
-
-		/*
-		 * The version may have newlines in it, turn them into
-		 * spaces.
-		 */
-		mib[1] = KERN_VERSION;
-		len = namesize;
-		oerrno = errno;
-		if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
-			if (errno == ENOMEM)
-				errno = oerrno;
-			else
-				rval = -1;
-		}
-		q[namesize - 1] = '\0';
-		for (p = q; len--; ++p) {
-			if (*p == '\n' || *p == '\t') {
-				if (len > 1)
-					*p = ' ';
-				else
-					*p = '\0';
-			}
-		}
-	}
-	q += namesize;
-
-	if ((p = getenv("UNAME_m")))
-		strlcpy(q, p, namesize);
-	else {
-		mib[0] = CTL_HW;
-		mib[1] = HW_MACHINE;
-		len = namesize;
-		oerrno = errno;
-		if (sysctl(mib, 2, q, &len, NULL, 0) == -1) {
-			if (errno == ENOMEM)
-				errno = oerrno;
-			else
-				rval = -1;
-		}
-		q[namesize - 1] = '\0';
-	}
-
-	return (rval);
-}
diff --git a/lib/libc_bsd/gen/_once_stub.c b/lib/libc_bsd/gen/_once_stub.c
deleted file mode 100644
index 495732c..0000000
--- a/lib/libc_bsd/gen/_once_stub.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2009 Hudson River Trading LLC
- * Written by: John H. Baldwin <jhb@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/_once_stub.c 283927 2015-06-02 19:20:39Z jhb $");
-
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-/* This implements pthread_once() for the single-threaded case. */
-static int
-_libc_once(pthread_once_t *once_control, void (*init_routine)(void))
-{
-
-	if (once_control->state == PTHREAD_DONE_INIT)
-		return (0);
-	init_routine();
-	once_control->state = PTHREAD_DONE_INIT;
-	return (0);
-}
-
-/*
- * This is the internal interface provided to libc.  It will use
- * pthread_once() from the threading library in a multi-threaded
- * process and _libc_once() for a single-threaded library.  Because
- * _libc_once() uses the same ABI for the values in the pthread_once_t
- * structure as the threading library, it is safe for a process to
- * switch from _libc_once() to pthread_once() when threading is
- * enabled.
- */
-int
-_once(pthread_once_t *once_control, void (*init_routine)(void))
-{
-
-	if (__isthreaded)
-		return (_pthread_once(once_control, init_routine));
-	return (_libc_once(once_control, init_routine));
-}
diff --git a/lib/libc_bsd/gen/_pthread_stubs.c b/lib/libc_bsd/gen/_pthread_stubs.c
deleted file mode 100644
index 32c5647..0000000
--- a/lib/libc_bsd/gen/_pthread_stubs.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/_pthread_stubs.c 228002 2011-11-26 16:49:25Z theraven $");
-
-#include <signal.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "libc_private.h"
-
-/*
- * Weak symbols: All libc internal usage of these functions should
- * use the weak symbol versions (_pthread_XXX).  If libpthread is
- * linked, it will override these functions with (non-weak) routines.
- * The _pthread_XXX functions are provided solely for internal libc
- * usage to avoid unwanted cancellation points and to differentiate
- * between application locks and libc locks (threads holding the
- * latter can't be allowed to exit/terminate).
- */
-
-/* Define a null pthread structure just to satisfy _pthread_self. */
-struct pthread {
-};
-
-static struct pthread	main_thread;
-
-static int		stub_main(void);
-static void 		*stub_null(void);
-static struct pthread	*stub_self(void);
-static int		stub_zero(void);
-static int		stub_fail(void);
-static int		stub_true(void);
-static void		stub_exit(void);
-
-#define	PJT_DUAL_ENTRY(entry)	\
-	(pthread_func_t)entry, (pthread_func_t)entry
-
-pthread_func_entry_t __thr_jtable[PJT_MAX] = {
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATFORK */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_DESTROY */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_GETDETACHSTATE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_GETGUARDSIZE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_GETINHERITSCHED */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_GETSCHEDPARAM */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_GETSCHEDPOLICY */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_GETSCOPE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_GETSTACKADDR */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_GETSTACKSIZE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_INIT */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_SETDETACHSTATE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_SETGUARDSIZE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_SETINHERITSCHED */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_SETSCHEDPARAM */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_SETSCHEDPOLICY */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_SETSCOPE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_SETSTACKADDR */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_ATTR_SETSTACKSIZE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_CANCEL */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_CLEANUP_POP */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_CLEANUP_PUSH */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_COND_BROADCAST */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_COND_DESTROY */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_COND_INIT */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_COND_SIGNAL */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_COND_TIMEDWAIT */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_COND_WAIT */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_DETACH */
-	{PJT_DUAL_ENTRY(stub_true)},    /* PJT_EQUAL */
-	{PJT_DUAL_ENTRY(stub_exit)},    /* PJT_EXIT */
-	{PJT_DUAL_ENTRY(stub_null)},    /* PJT_GETSPECIFIC */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_JOIN */
-	{PJT_DUAL_ENTRY(stub_fail)},    /* PJT_KEY_CREATE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_KEY_DELETE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_KILL */
-	{PJT_DUAL_ENTRY(stub_main)},    /* PJT_MAIN_NP */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_MUTEXATTR_DESTROY */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_MUTEXATTR_INIT */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_MUTEXATTR_SETTYPE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_MUTEX_DESTROY */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_MUTEX_INIT */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_MUTEX_LOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_MUTEX_TRYLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_MUTEX_UNLOCK */
-	{PJT_DUAL_ENTRY(stub_fail)},    /* PJT_ONCE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_RWLOCK_DESTROY */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_RWLOCK_INIT */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_RWLOCK_RDLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_RWLOCK_TRYRDLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_RWLOCK_TRYWRLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_RWLOCK_UNLOCK */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_RWLOCK_WRLOCK */
-	{PJT_DUAL_ENTRY(stub_self)},    /* PJT_SELF */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_SETCANCELSTATE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_SETCANCELTYPE */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_SETSPECIFIC */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_SIGMASK */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_TESTCANCEL */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_CLEANUP_POP_IMP */
-	{PJT_DUAL_ENTRY(stub_zero)},    /* PJT_CLEANUP_PUSH_IMP */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_CANCEL_ENTER */
-	{PJT_DUAL_ENTRY(stub_zero)},	/* PJT_CANCEL_LEAVE */
-};
-
-/*
- * Weak aliases for exported (pthread_*) and internal (_pthread_*) routines.
- */
-#define	WEAK_REF(sym, alias)	__weak_reference(sym, alias)
-
-#define	FUNC_TYPE(name)		__CONCAT(name, _func_t)
-#define	FUNC_INT(name)		__CONCAT(name, _int)
-#define	FUNC_EXP(name)		__CONCAT(name, _exp)
-
-#define	STUB_FUNC(name, idx, ret)				\
-	static ret FUNC_EXP(name)(void) __used;			\
-	static ret FUNC_INT(name)(void) __used;			\
-	WEAK_REF(FUNC_EXP(name), name);				\
-	WEAK_REF(FUNC_INT(name), __CONCAT(_, name));		\
-	typedef ret (*FUNC_TYPE(name))(void);			\
-	static ret FUNC_EXP(name)(void)				\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][0];	\
-		return (func());				\
-	}							\
-	static ret FUNC_INT(name)(void)				\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][1];	\
-		return (func());				\
-	}
-
-#define	STUB_FUNC1(name, idx, ret, p0_type)			\
-	static ret FUNC_EXP(name)(p0_type) __used;		\
-	static ret FUNC_INT(name)(p0_type) __used;		\
-	WEAK_REF(FUNC_EXP(name), name);				\
-	WEAK_REF(FUNC_INT(name), __CONCAT(_, name));		\
-	typedef ret (*FUNC_TYPE(name))(p0_type);		\
-	static ret FUNC_EXP(name)(p0_type p0)			\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][0];	\
-		return (func(p0));				\
-	}							\
-	static ret FUNC_INT(name)(p0_type p0)			\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][1];	\
-		return (func(p0));				\
-	}
-
-#define	STUB_FUNC2(name, idx, ret, p0_type, p1_type)		\
-	static ret FUNC_EXP(name)(p0_type, p1_type) __used;	\
-	static ret FUNC_INT(name)(p0_type, p1_type) __used;	\
-	WEAK_REF(FUNC_EXP(name), name);				\
-	WEAK_REF(FUNC_INT(name), __CONCAT(_, name));		\
-	typedef ret (*FUNC_TYPE(name))(p0_type, p1_type);	\
-	static ret FUNC_EXP(name)(p0_type p0, p1_type p1)	\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][0];	\
-		return (func(p0, p1));				\
-	}							\
-	static ret FUNC_INT(name)(p0_type p0, p1_type p1)	\
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][1];	\
-		return (func(p0, p1));				\
-	}
-
-#define	STUB_FUNC3(name, idx, ret, p0_type, p1_type, p2_type)	\
-	static ret FUNC_EXP(name)(p0_type, p1_type, p2_type) __used; \
-	static ret FUNC_INT(name)(p0_type, p1_type, p2_type) __used; \
-	WEAK_REF(FUNC_EXP(name), name);				\
-	WEAK_REF(FUNC_INT(name), __CONCAT(_, name));		\
-	typedef ret (*FUNC_TYPE(name))(p0_type, p1_type, p2_type); \
-	static ret FUNC_EXP(name)(p0_type p0, p1_type p1, p2_type p2) \
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][0];	\
-		return (func(p0, p1, p2));			\
-	}							\
-	static ret FUNC_INT(name)(p0_type p0, p1_type p1, p2_type p2) \
-	{							\
-		FUNC_TYPE(name) func;				\
-		func = (FUNC_TYPE(name))__thr_jtable[idx][1];	\
-		return (func(p0, p1, p2));			\
-	}
-
-STUB_FUNC1(pthread_cond_broadcast, PJT_COND_BROADCAST, int, void *)
-STUB_FUNC1(pthread_cond_destroy, PJT_COND_DESTROY, int, void *)
-STUB_FUNC2(pthread_cond_init,	PJT_COND_INIT, int, void *, void *)
-STUB_FUNC1(pthread_cond_signal,	PJT_COND_SIGNAL, int, void *)
-STUB_FUNC2(pthread_cond_wait,	PJT_COND_WAIT, int, void *, void *)
-STUB_FUNC1(pthread_getspecific,	PJT_GETSPECIFIC, void *, pthread_key_t)
-STUB_FUNC2(pthread_key_create,	PJT_KEY_CREATE, int, void *, void *)
-STUB_FUNC1(pthread_key_delete,	PJT_KEY_DELETE, int, pthread_key_t)
-STUB_FUNC(pthread_main_np,	PJT_MAIN_NP, int)
-STUB_FUNC1(pthread_mutex_destroy, PJT_MUTEX_DESTROY, int, void *)
-STUB_FUNC2(pthread_mutex_init,	PJT_MUTEX_INIT, int, void *, void *)
-STUB_FUNC1(pthread_mutex_lock,	PJT_MUTEX_LOCK, int, void *)
-STUB_FUNC1(pthread_mutex_trylock, PJT_MUTEX_TRYLOCK, int, void *)
-STUB_FUNC1(pthread_mutex_unlock, PJT_MUTEX_UNLOCK, int, void *)
-STUB_FUNC1(pthread_mutexattr_destroy, PJT_MUTEXATTR_DESTROY, int, void *)
-STUB_FUNC1(pthread_mutexattr_init, PJT_MUTEXATTR_INIT, int, void *)
-STUB_FUNC2(pthread_mutexattr_settype, PJT_MUTEXATTR_SETTYPE, int, void *, int)
-STUB_FUNC2(pthread_once, 	PJT_ONCE, int, void *, void *)
-STUB_FUNC1(pthread_rwlock_destroy, PJT_RWLOCK_DESTROY, int, void *)
-STUB_FUNC2(pthread_rwlock_init,	PJT_RWLOCK_INIT, int, void *, void *)
-STUB_FUNC1(pthread_rwlock_rdlock, PJT_RWLOCK_RDLOCK, int, void *)
-STUB_FUNC1(pthread_rwlock_tryrdlock, PJT_RWLOCK_TRYRDLOCK, int, void *)
-STUB_FUNC1(pthread_rwlock_trywrlock, PJT_RWLOCK_TRYWRLOCK, int, void *)
-STUB_FUNC1(pthread_rwlock_unlock, PJT_RWLOCK_UNLOCK, int, void *)
-STUB_FUNC1(pthread_rwlock_wrlock, PJT_RWLOCK_WRLOCK, int, void *)
-STUB_FUNC(pthread_self,		PJT_SELF, pthread_t)
-STUB_FUNC2(pthread_setspecific, PJT_SETSPECIFIC, int, pthread_key_t, void *)
-STUB_FUNC3(pthread_sigmask, PJT_SIGMASK, int, int, void *, void *)
-STUB_FUNC3(pthread_atfork, PJT_ATFORK, int, void *, void *, void*)
-STUB_FUNC1(pthread_attr_destroy, PJT_ATTR_DESTROY, int, void *);
-STUB_FUNC2(pthread_attr_getdetachstate, PJT_ATTR_GETDETACHSTATE, int, void *, void *)
-STUB_FUNC2(pthread_attr_getguardsize, PJT_ATTR_GETGUARDSIZE, int, void *, void *)
-STUB_FUNC2(pthread_attr_getstackaddr, PJT_ATTR_GETSTACKADDR, int, void *, void *)
-STUB_FUNC2(pthread_attr_getstacksize, PJT_ATTR_GETSTACKSIZE, int, void *, void *)
-STUB_FUNC2(pthread_attr_getinheritsched, PJT_ATTR_GETINHERITSCHED, int, void *, void *)
-STUB_FUNC2(pthread_attr_getschedparam, PJT_ATTR_GETSCHEDPARAM, int, void *, void *)
-STUB_FUNC2(pthread_attr_getschedpolicy, PJT_ATTR_GETSCHEDPOLICY, int, void *, void *)
-STUB_FUNC2(pthread_attr_getscope, PJT_ATTR_GETSCOPE, int, void *, void *)
-STUB_FUNC1(pthread_attr_init, PJT_ATTR_INIT, int, void *)
-STUB_FUNC2(pthread_attr_setdetachstate, PJT_ATTR_SETDETACHSTATE, int, void *, int)
-STUB_FUNC2(pthread_attr_setguardsize, PJT_ATTR_SETGUARDSIZE, int, void *, size_t)
-STUB_FUNC2(pthread_attr_setstackaddr, PJT_ATTR_SETSTACKADDR, int, void *, void *)
-STUB_FUNC2(pthread_attr_setstacksize, PJT_ATTR_SETSTACKSIZE, int, void *, size_t)
-STUB_FUNC2(pthread_attr_setinheritsched, PJT_ATTR_SETINHERITSCHED, int, void *, int)
-STUB_FUNC2(pthread_attr_setschedparam, PJT_ATTR_SETSCHEDPARAM, int, void *, void *)
-STUB_FUNC2(pthread_attr_setschedpolicy, PJT_ATTR_SETSCHEDPOLICY, int, void *, int)
-STUB_FUNC2(pthread_attr_setscope, PJT_ATTR_SETSCOPE, int, void *, int)
-STUB_FUNC1(pthread_cancel, PJT_CANCEL, int, void *)
-STUB_FUNC1(pthread_cleanup_pop, PJT_CLEANUP_POP, int, int)
-STUB_FUNC2(pthread_cleanup_push, PJT_CLEANUP_PUSH, void, void *, void *)
-STUB_FUNC3(pthread_cond_timedwait, PJT_COND_TIMEDWAIT, int, void *, void *, void *)
-STUB_FUNC1(pthread_detach, PJT_DETACH, int, void *)
-STUB_FUNC2(pthread_equal, PJT_EQUAL, int, void *, void *)
-STUB_FUNC1(pthread_exit, PJT_EXIT, void, void *)
-STUB_FUNC2(pthread_join, PJT_JOIN, int, void *, void *)
-STUB_FUNC2(pthread_kill, PJT_KILL, int, void *, int)
-STUB_FUNC2(pthread_setcancelstate, PJT_SETCANCELSTATE, int, int, void *)
-STUB_FUNC2(pthread_setcanceltype, PJT_SETCANCELTYPE, int, int, void *)
-STUB_FUNC(pthread_testcancel, PJT_TESTCANCEL, void)
-STUB_FUNC1(__pthread_cleanup_pop_imp, PJT_CLEANUP_POP_IMP, int, int)
-STUB_FUNC2(__pthread_cleanup_push_imp, PJT_CLEANUP_PUSH_IMP, void, void*, void *);
-STUB_FUNC1(_pthread_cancel_enter, PJT_CANCEL_ENTER, int, int)
-STUB_FUNC1(_pthread_cancel_leave, PJT_CANCEL_LEAVE, int, int)
-
-static int
-stub_zero(void)
-{
-	return (0);
-}
-
-static void *
-stub_null(void)
-{
-	return (NULL);
-}
-
-static struct pthread *
-stub_self(void)
-{
-	return (&main_thread);
-}
-
-static int
-stub_fail(void)
-{
-	return (ENOSYS);
-}
-
-static int
-stub_main(void)
-{
-	return (-1);
-}
-
-static int
-stub_true(void)
-{
-	return (1);
-}
-
-static void
-stub_exit(void)
-{
-	exit(0);
-}
diff --git a/lib/libc_bsd/gen/_rand48.c b/lib/libc_bsd/gen/_rand48.c
deleted file mode 100644
index 93814bd..0000000
--- a/lib/libc_bsd/gen/_rand48.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/_rand48.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include "rand48.h"
-
-unsigned short _rand48_seed[3] = {
-	RAND48_SEED_0,
-	RAND48_SEED_1,
-	RAND48_SEED_2
-};
-unsigned short _rand48_mult[3] = {
-	RAND48_MULT_0,
-	RAND48_MULT_1,
-	RAND48_MULT_2
-};
-unsigned short _rand48_add = RAND48_ADD;
-
-void
-_dorand48(unsigned short xseed[3])
-{
-	unsigned long accu;
-	unsigned short temp[2];
-
-	accu = (unsigned long) _rand48_mult[0] * (unsigned long) xseed[0] +
-	 (unsigned long) _rand48_add;
-	temp[0] = (unsigned short) accu;	/* lower 16 bits */
-	accu >>= sizeof(unsigned short) * 8;
-	accu += (unsigned long) _rand48_mult[0] * (unsigned long) xseed[1] +
-	 (unsigned long) _rand48_mult[1] * (unsigned long) xseed[0];
-	temp[1] = (unsigned short) accu;	/* middle 16 bits */
-	accu >>= sizeof(unsigned short) * 8;
-	accu += _rand48_mult[0] * xseed[2] + _rand48_mult[1] * xseed[1] + _rand48_mult[2] * xseed[0];
-	xseed[0] = temp[0];
-	xseed[1] = temp[1];
-	xseed[2] = (unsigned short) accu;
-}
diff --git a/lib/libc_bsd/gen/_spinlock_stub.c b/lib/libc_bsd/gen/_spinlock_stub.c
deleted file mode 100644
index 5b329f8..0000000
--- a/lib/libc_bsd/gen/_spinlock_stub.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/_spinlock_stub.c 279518 2015-03-02 09:15:50Z kib $");
-
-#include <stdio.h>
-
-#include "spinlock.h"
-#include "libc_private.h"
-
-long _atomic_lock_stub(volatile long *);
-void _spinlock_stub(spinlock_t *);
-void _spinunlock_stub(spinlock_t *);
-void _spinlock_debug_stub(spinlock_t *, char *, int);
-
-__weak_reference(_atomic_lock_stub, _atomic_lock);
-
-long
-_atomic_lock_stub(volatile long *lck __unused)
-{
-	return (0L);
-}
-
-__weak_reference(_spinlock, _spinlock_debug);
-#pragma weak _spinlock
-void
-_spinlock(spinlock_t *lck)
-{
-
-	((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinlock])
-	    (lck);
-
-}
-
-#pragma weak _spinunlock
-void
-_spinunlock(spinlock_t *lck)
-{
-
-	((void (*)(spinlock_t *lck))__libc_interposing[INTERPOS_spinunlock])
-	    (lck);
-
-}
-
-void
-__libc_spinlock_stub(spinlock_t *lck __unused)
-{
-}
-
-void
-__libc_spinunlock_stub(spinlock_t *lck __unused)
-{
-}
diff --git a/lib/libc_bsd/gen/_thread_init.c b/lib/libc_bsd/gen/_thread_init.c
deleted file mode 100644
index 96f35c8..0000000
--- a/lib/libc_bsd/gen/_thread_init.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/_thread_init.c 218824 2011-02-18 21:44:53Z nwhitehorn $");
-
-#include <sys/types.h>
-
-void _thread_init_stub(void);
-
-__weak_reference(_thread_init_stub, _thread_init);
-__weak_reference(_thread_autoinit_dummy_decl_stub,
-    _thread_autoinit_dummy_decl);
-
-int	_thread_autoinit_dummy_decl_stub = 0;
-
-void
-_thread_init_stub(void)
-{
-	/* This is just a stub; there is nothing to do. */
-}
diff --git a/lib/libc_bsd/gen/alarm.3 b/lib/libc_bsd/gen/alarm.3
deleted file mode 100644
index be2622f..0000000
--- a/lib/libc_bsd/gen/alarm.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)alarm.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/alarm.3 207735 2010-05-06 22:49:54Z jilles $
-.\"
-.Dd April 19, 1994
-.Dt ALARM 3
-.Os
-.Sh NAME
-.Nm alarm
-.Nd set signal timer alarm
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft unsigned int
-.Fn alarm "unsigned int seconds"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is made obsolete by
-.Xr setitimer 2 .
-.Ef
-.Pp
-The
-.Fn alarm
-function sets a timer to deliver the signal
-.Dv SIGALRM
-to the calling process after the specified number of
-.Fa seconds .
-If an alarm has already been set with
-.Fn alarm
-but has not been delivered, another call to
-.Fn alarm
-will supersede the prior call.
-The request
-.Fn alarm "0"
-voids the current
-alarm and the signal SIGALRM will not be delivered.
-.Pp
-Due to
-.Xr setitimer 2
-restriction the maximum number of
-.Fa seconds
-allowed is 100000000.
-.Sh RETURN VALUES
-The return value of
-.Fn alarm
-is the amount of time left on the timer from a previous call to
-.Fn alarm .
-If no alarm is currently set, the return value is 0.
-.Sh SEE ALSO
-.Xr setitimer 2 ,
-.Xr sigaction 2 ,
-.Xr sigsuspend 2 ,
-.Xr signal 3 ,
-.Xr sleep 3 ,
-.Xr ualarm 3 ,
-.Xr usleep 3
-.\" .Sh STANDARDS
-.\" The
-.\" .Fn alarm
-.\" function conforms to
-.\" .St -p1003.1-90 .
-.Sh HISTORY
-An
-.Fn alarm
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/gen/alarm.c b/lib/libc_bsd/gen/alarm.c
deleted file mode 100644
index ef13dab..0000000
--- a/lib/libc_bsd/gen/alarm.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)alarm.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/alarm.c 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * Backwards compatible alarm.
- */
-#include <sys/time.h>
-#include <unistd.h>
-
-unsigned int
-alarm(secs)
-	unsigned int secs;
-{
-	struct itimerval it, oitv;
-	struct itimerval *itp = &it;
-
-	timerclear(&itp->it_interval);
-	itp->it_value.tv_sec = secs;
-	itp->it_value.tv_usec = 0;
-	if (setitimer(ITIMER_REAL, itp, &oitv) < 0)
-		return (-1);
-	if (oitv.it_value.tv_usec)
-		oitv.it_value.tv_sec++;
-	return (oitv.it_value.tv_sec);
-}
diff --git a/lib/libc_bsd/gen/arc4random.3 b/lib/libc_bsd/gen/arc4random.3
deleted file mode 100644
index fe5ad5e..0000000
--- a/lib/libc_bsd/gen/arc4random.3
+++ /dev/null
@@ -1,127 +0,0 @@
-.\" $OpenBSD: arc4random.3,v 1.2 1997/04/27 22:40:25 angelos Exp $
-.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
-.\" 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 Niels Provos.
-.\" 4. 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 ``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 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.
-.\"
-.\" Manual page, using -mandoc macros
-.\" $FreeBSD: releng/10.2/lib/libc/gen/arc4random.3 231564 2012-02-12 18:29:56Z ed $
-.\"
-.Dd April 15, 1997
-.Dt ARC4RANDOM 3
-.Os
-.Sh NAME
-.Nm arc4random ,
-.Nm arc4random_buf ,
-.Nm arc4random_uniform ,
-.Nm arc4random_stir ,
-.Nm arc4random_addrandom
-.Nd arc4 random number generator
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft uint32_t
-.Fn arc4random "void"
-.Ft void
-.Fn arc4random_buf "void *buf" "size_t nbytes"
-.Ft uint32_t
-.Fn arc4random_uniform "uint32_t upper_bound"
-.Ft void
-.Fn arc4random_stir "void"
-.Ft void
-.Fn arc4random_addrandom "unsigned char *dat" "int datlen"
-.Sh DESCRIPTION
-The
-.Fn arc4random
-function uses the key stream generator employed by the
-arc4 cipher, which uses 8*8 8 bit S-Boxes.
-The S-Boxes
-can be in about
-.if t 2\u\s71700\s10\d
-.if n (2**1700)
-states.
-The
-.Fn arc4random
-function returns pseudo-random numbers in the range of 0 to
-.if t 2\u\s731\s10\d\(mi1,
-.if n (2**32)\(mi1,
-and therefore has twice the range of
-.Xr rand 3
-and
-.Xr random 3 .
-.Pp
-.Fn arc4random_buf
-function fills the region
-.Fa buf
-of length
-.Fa nbytes
-with ARC4-derived random data.
-.Pp
-.Fn arc4random_uniform
-will return a uniformly distributed random number less than
-.Fa upper_bound .
-.Fn arc4random_uniform
-is recommended over constructions like
-.Dq Li arc4random() % upper_bound
-as it avoids "modulo bias" when the upper bound is not a power of two.
-.Pp
-The
-.Fn arc4random_stir
-function reads data from
-.Pa /dev/urandom
-and uses it to permute the S-Boxes via
-.Fn arc4random_addrandom .
-.Pp
-There is no need to call
-.Fn arc4random_stir
-before using
-.Fn arc4random
-functions family, since
-they automatically initialize themselves.
-.Sh EXAMPLES
-The following produces a drop-in replacement for the traditional
-.Fn rand
-and
-.Fn random
-functions using
-.Fn arc4random :
-.Pp
-.Dl "#define foo4random() (arc4random() % ((unsigned)RAND_MAX + 1))"
-.Sh SEE ALSO
-.Xr rand 3 ,
-.Xr random 3 ,
-.Xr srandomdev 3
-.Sh HISTORY
-.Pa RC4
-has been designed by RSA Data Security, Inc.
-It was posted anonymously
-to the USENET and was confirmed to be equivalent by several sources who
-had access to the original cipher.
-Since
-.Pa RC4
-used to be a trade secret, the cipher is now referred to as
-.Pa ARC4 .
diff --git a/lib/libc_bsd/gen/arc4random.c b/lib/libc_bsd/gen/arc4random.c
deleted file mode 100644
index a1acf85..0000000
--- a/lib/libc_bsd/gen/arc4random.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*	$OpenBSD: arc4random.c,v 1.24 2013/06/11 16:59:50 deraadt Exp $	*/
-
-/*
- * Copyright (c) 1996, David Mazieres <dm@uun.org>
- * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Arc4 random number generator for OpenBSD.
- *
- * This code is derived from section 17.1 of Applied Cryptography,
- * second edition, which describes a stream cipher allegedly
- * compatible with RSA Labs "RC4" cipher (the actual description of
- * which is a trade secret).  The same algorithm is used as a stream
- * cipher called "arcfour" in Tatu Ylonen's ssh package.
- *
- * RC4 is a registered trademark of RSA Laboratories.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/arc4random.c 268962 2014-07-21 22:37:33Z pfg $");
-
-#include "namespace.h"
-#include <fcntl.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <pthread.h>
-
-#include "libc_private.h"
-#include "un-namespace.h"
-
-#ifdef __GNUC__
-#define inline __inline
-#else				/* !__GNUC__ */
-#define inline
-#endif				/* !__GNUC__ */
-
-struct arc4_stream {
-	u_int8_t i;
-	u_int8_t j;
-	u_int8_t s[256];
-};
-
-static pthread_mutex_t	arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-
-#define	RANDOMDEV	"/dev/random"
-#define	KEYSIZE		128
-#define	_ARC4_LOCK()						\
-	do {							\
-		if (__isthreaded)				\
-			_pthread_mutex_lock(&arc4random_mtx);	\
-	} while (0)
-
-#define	_ARC4_UNLOCK()						\
-	do {							\
-		if (__isthreaded)				\
-			_pthread_mutex_unlock(&arc4random_mtx);	\
-	} while (0)
-
-static int rs_initialized;
-static struct arc4_stream rs;
-static pid_t arc4_stir_pid;
-static int arc4_count;
-
-extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
-    void *newp, size_t newlen);
-
-static inline u_int8_t arc4_getbyte(void);
-static void arc4_stir(void);
-
-static inline void
-arc4_init(void)
-{
-	int     n;
-
-	for (n = 0; n < 256; n++)
-		rs.s[n] = n;
-	rs.i = 0;
-	rs.j = 0;
-}
-
-static inline void
-arc4_addrandom(u_char *dat, int datlen)
-{
-	int     n;
-	u_int8_t si;
-
-	rs.i--;
-	for (n = 0; n < 256; n++) {
-		rs.i = (rs.i + 1);
-		si = rs.s[rs.i];
-		rs.j = (rs.j + si + dat[n % datlen]);
-		rs.s[rs.i] = rs.s[rs.j];
-		rs.s[rs.j] = si;
-	}
-	rs.j = rs.i;
-}
-
-static size_t
-arc4_sysctl(u_char *buf, size_t size)
-{
-	int mib[2];
-	size_t len, done;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_ARND;
-	done = 0;
-
-	do {
-		len = size;
-		if (__sysctl(mib, 2, buf, &len, NULL, 0) == -1)
-			return (done);
-		done += len;
-		buf += len;
-		size -= len;
-	} while (size > 0);
-
-	return (done);
-}
-
-static void
-arc4_stir(void)
-{
-	int done, fd, i;
-	struct {
-		struct timeval	tv;
-		pid_t		pid;
-		u_char	 	rnd[KEYSIZE];
-	} rdat;
-
-	if (!rs_initialized) {
-		arc4_init();
-		rs_initialized = 1;
-	}
-	done = 0;
-	if (arc4_sysctl((u_char *)&rdat, KEYSIZE) == KEYSIZE)
-		done = 1;
-	if (!done) {
-		fd = _open(RANDOMDEV, O_RDONLY | O_CLOEXEC, 0);
-		if (fd >= 0) {
-			if (_read(fd, &rdat, KEYSIZE) == KEYSIZE)
-				done = 1;
-			(void)_close(fd);
-		}
-	}
-	if (!done) {
-		(void)gettimeofday(&rdat.tv, NULL);
-		rdat.pid = getpid();
-		/* We'll just take whatever was on the stack too... */
-	}
-
-	arc4_addrandom((u_char *)&rdat, KEYSIZE);
-
-	/*
-	 * Discard early keystream, as per recommendations in:
-	 * "(Not So) Random Shuffles of RC4" by Ilya Mironov.
-	 */
-	for (i = 0; i < 1024; i++)
-		(void)arc4_getbyte();
-	arc4_count = 1600000;
-}
-
-static void
-arc4_stir_if_needed(void)
-{
-	pid_t pid = getpid();
-
-	if (arc4_count <= 0 || !rs_initialized || arc4_stir_pid != pid) {
-		arc4_stir_pid = pid;
-		arc4_stir();
-	}
-}
-
-static inline u_int8_t
-arc4_getbyte(void)
-{
-	u_int8_t si, sj;
-
-	rs.i = (rs.i + 1);
-	si = rs.s[rs.i];
-	rs.j = (rs.j + si);
-	sj = rs.s[rs.j];
-	rs.s[rs.i] = sj;
-	rs.s[rs.j] = si;
-	return (rs.s[(si + sj) & 0xff]);
-}
-
-static inline uint32_t
-arc4_getword(void)
-{
-	uint32_t val;
-	val = arc4_getbyte() << 24;
-	val |= arc4_getbyte() << 16;
-	val |= arc4_getbyte() << 8;
-	val |= arc4_getbyte();
-	return val;
-}
-
-void
-arc4random_stir(void)
-{
-	_ARC4_LOCK();
-	arc4_stir();
-	_ARC4_UNLOCK();
-}
-
-void
-arc4random_addrandom(u_char *dat, int datlen)
-{
-	_ARC4_LOCK();
-	if (!rs_initialized)
-		arc4_stir();
-	arc4_addrandom(dat, datlen);
-	_ARC4_UNLOCK();
-}
-
-uint32_t
-arc4random(void)
-{
-	uint32_t val;
-	_ARC4_LOCK();
-	arc4_count -= 4;
-	arc4_stir_if_needed();
-	val = arc4_getword();
-	_ARC4_UNLOCK();
-	return val;
-}
-
-void
-arc4random_buf(void *_buf, size_t n)
-{
-	u_char *buf = (u_char *)_buf;
-	_ARC4_LOCK();
-	arc4_stir_if_needed();
-	while (n--) {
-		if (--arc4_count <= 0)
-			arc4_stir();
-		buf[n] = arc4_getbyte();
-	}
-	_ARC4_UNLOCK();
-}
-
-/*
- * Calculate a uniformly distributed random number less than upper_bound
- * avoiding "modulo bias".
- *
- * Uniformity is achieved by generating new random numbers until the one
- * returned is outside the range [0, 2**32 % upper_bound).  This
- * guarantees the selected random number will be inside
- * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound)
- * after reduction modulo upper_bound.
- */
-uint32_t
-arc4random_uniform(uint32_t upper_bound)
-{
-	uint32_t r, min;
-
-	if (upper_bound < 2)
-		return 0;
-
-	/* 2**32 % x == (2**32 - x) % x */
-	min = -upper_bound % upper_bound;
-	/*
-	 * This could theoretically loop forever but each retry has
-	 * p > 0.5 (worst case, usually far better) of selecting a
-	 * number inside the range we need, so it should rarely need
-	 * to re-roll.
-	 */
-	for (;;) {
-		r = arc4random();
-		if (r >= min)
-			break;
-	}
-
-	return r % upper_bound;
-}
-
-#if 0
-/*-------- Test code for i386 --------*/
-#include <stdio.h>
-#include <machine/pctr.h>
-int
-main(int argc, char **argv)
-{
-	const int iter = 1000000;
-	int     i;
-	pctrval v;
-
-	v = rdtsc();
-	for (i = 0; i < iter; i++)
-		arc4random();
-	v = rdtsc() - v;
-	v /= iter;
-
-	printf("%qd cycles\n", v);
-}
-#endif
diff --git a/lib/libc_bsd/gen/assert.c b/lib/libc_bsd/gen/assert.c
deleted file mode 100644
index 87e20a8..0000000
--- a/lib/libc_bsd/gen/assert.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1992, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)assert.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/assert.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void
-__assert(func, file, line, failedexpr)
-	const char *func, *file;
-	int line;
-	const char *failedexpr;
-{
-	if (func == NULL)
-		(void)fprintf(stderr,
-		     "Assertion failed: (%s), file %s, line %d.\n", failedexpr,
-		     file, line);
-	else
-		(void)fprintf(stderr,
-		     "Assertion failed: (%s), function %s, file %s, line %d.\n",
-		     failedexpr, func, file, line);
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/gen/auxv.c b/lib/libc_bsd/gen/auxv.c
deleted file mode 100644
index f0069c1..0000000
--- a/lib/libc_bsd/gen/auxv.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*-
- * Copyright 2010, 2012 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/auxv.c 239193 2012-08-11 12:07:24Z ed $");
-
-#include "namespace.h"
-#include <elf.h>
-#include <errno.h>
-#include <link.h>
-#include <pthread.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-extern char **environ;
-extern int _DYNAMIC;
-#pragma weak _DYNAMIC
-
-void *__elf_aux_vector;
-static pthread_once_t aux_vector_once = PTHREAD_ONCE_INIT;
-
-static void
-init_aux_vector_once(void)
-{
-	Elf_Addr *sp;
-
-	sp = (Elf_Addr *)environ;
-	while (*sp++ != 0)
-		;
-	__elf_aux_vector = (Elf_Auxinfo *)sp;
-}
-
-void
-__init_elf_aux_vector(void)
-{
-
-	if (&_DYNAMIC != NULL)
-		return;
-	_once(&aux_vector_once, init_aux_vector_once);
-}
-
-static pthread_once_t aux_once = PTHREAD_ONCE_INIT;
-static int pagesize, osreldate, canary_len, ncpus, pagesizes_len;
-static char *canary, *pagesizes;
-static void *timekeep;
-
-static void
-init_aux(void)
-{
-	Elf_Auxinfo *aux;
-
-	for (aux = __elf_aux_vector; aux->a_type != AT_NULL; aux++) {
-		switch (aux->a_type) {
-		case AT_CANARY:
-			canary = (char *)(aux->a_un.a_ptr);
-			break;
-
-		case AT_CANARYLEN:
-			canary_len = aux->a_un.a_val;
-			break;
-
-		case AT_PAGESIZES:
-			pagesizes = (char *)(aux->a_un.a_ptr);
-			break;
-
-		case AT_PAGESIZESLEN:
-			pagesizes_len = aux->a_un.a_val;
-			break;
-
-		case AT_PAGESZ:
-			pagesize = aux->a_un.a_val;
-			break;
-
-		case AT_OSRELDATE:
-			osreldate = aux->a_un.a_val;
-			break;
-
-		case AT_NCPUS:
-			ncpus = aux->a_un.a_val;
-			break;
-
-		case AT_TIMEKEEP:
-			timekeep = aux->a_un.a_ptr;
-			break;
-		}
-	}
-}
-
-int
-_elf_aux_info(int aux, void *buf, int buflen)
-{
-	int res;
-
-	__init_elf_aux_vector();
-	if (__elf_aux_vector == NULL)
-		return (ENOSYS);
-	_once(&aux_once, init_aux);
-
-	switch (aux) {
-	case AT_CANARY:
-		if (canary != NULL && canary_len >= buflen) {
-			memcpy(buf, canary, buflen);
-			memset(canary, 0, canary_len);
-			canary = NULL;
-			res = 0;
-		} else
-			res = ENOENT;
-		break;
-	case AT_PAGESIZES:
-		if (pagesizes != NULL && pagesizes_len >= buflen) {
-			memcpy(buf, pagesizes, buflen);
-			res = 0;
-		} else
-			res = ENOENT;
-		break;
-
-	case AT_PAGESZ:
-		if (buflen == sizeof(int)) {
-			if (pagesize != 0) {
-				*(int *)buf = pagesize;
-				res = 0;
-			} else
-				res = ENOENT;
-		} else
-			res = EINVAL;
-		break;
-	case AT_OSRELDATE:
-		if (buflen == sizeof(int)) {
-			if (osreldate != 0) {
-				*(int *)buf = osreldate;
-				res = 0;
-			} else
-				res = ENOENT;
-		} else
-			res = EINVAL;
-		break;
-	case AT_NCPUS:
-		if (buflen == sizeof(int)) {
-			if (ncpus != 0) {
-				*(int *)buf = ncpus;
-				res = 0;
-			} else
-				res = ENOENT;
-		} else
-			res = EINVAL;
-		break;
-	case AT_TIMEKEEP:
-		if (buflen == sizeof(void *)) {
-			if (timekeep != NULL) {
-				*(void **)buf = timekeep;
-				res = 0;
-			} else
-				res = ENOENT;
-		} else
-			res = EINVAL;
-		break;
-	default:
-		res = ENOENT;
-		break;
-	}
-	return (res);
-}
diff --git a/lib/libc_bsd/gen/basename.3 b/lib/libc_bsd/gen/basename.3
deleted file mode 100644
index 62de2a6..0000000
--- a/lib/libc_bsd/gen/basename.3
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" $OpenBSD: basename.3,v 1.20 2007/05/31 19:19:28 jmc Exp $
-.\"
-.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/basename.3 223216 2011-06-18 00:33:34Z delphij $
-.\"
-.Dd March 31, 2010
-.Dt BASENAME 3
-.Os
-.Sh NAME
-.Nm basename
-.Nd extract the base portion of a pathname
-.Sh SYNOPSIS
-.In libgen.h
-.Ft char *
-.Fn basename "const char *path"
-.Ft char *
-.Fn basename_r "const char *path" "char *bname"
-.Sh DESCRIPTION
-The
-.Fn basename
-function returns the last component from the pathname pointed to by
-.Fa path ,
-deleting any trailing
-.Sq \&/
-characters.
-If
-.Fa path
-consists entirely of
-.Sq \&/
-characters, a pointer to the string
-.Qq \&/
-is returned.
-If
-.Fa path
-is a null pointer or the empty string, a pointer to the string
-.Qq \&.
-is returned.
-.Pp
-The
-.Fn basename_r
-variation accepts a buffer of at least
-.Dv MAXPATHLEN
-bytes in which to store the resulting component.
-.Sh IMPLEMENTATION NOTES
-The
-.Fn basename
-function
-returns a pointer to internal storage space allocated on the first call
-that will be overwritten
-by subsequent calls.
-.Fn basename_r
-is therefore preferred for threaded applications.
-.Sh RETURN VALUES
-On successful completion,
-.Fn basename
-and
-.Fn basename_r
-return pointers to the last component of
-.Fa path .
-.Pp
-If they fail, a null pointer is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The following error codes may be set in
-.Va errno :
-.Bl -tag -width Er
-.It Bq Er ENAMETOOLONG
-The path component to be returned was larger than
-.Dv MAXPATHLEN .
-.El
-.Sh SEE ALSO
-.Xr basename 1 ,
-.Xr dirname 1 ,
-.Xr dirname 3
-.Sh STANDARDS
-The
-.Fn basename
-function conforms to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn basename
-function first appeared in
-.Ox 2.2
-and
-.Fx 4.2 .
-.Sh AUTHORS
-.An Todd C. Miller
-.Sh CAVEATS
-.Fn basename
-returns a pointer to internal static storage space that will be overwritten
-by subsequent calls.
-.Pp
-Other vendor implementations of
-.Fn basename
-may modify the contents of the string passed to
-.Fn basename ;
-this should be taken into account when writing code which calls this function
-if portability is desired.
diff --git a/lib/libc_bsd/gen/basename.c b/lib/libc_bsd/gen/basename.c
deleted file mode 100644
index 7d98e32..0000000
--- a/lib/libc_bsd/gen/basename.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$OpenBSD: basename.c,v 1.14 2005/08/08 08:05:33 espie Exp $	*/
-
-/*
- * Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/basename.c 223216 2011-06-18 00:33:34Z delphij $");
-
-#include <errno.h>
-#include <libgen.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-
-char *
-basename_r(const char *path, char *bname)
-{
-	const char *endp, *startp;
-	size_t len;
-
-	/* Empty or NULL string gets treated as "." */
-	if (path == NULL || *path == '\0') {
-		bname[0] = '.';
-		bname[1] = '\0';
-		return (bname);
-	}
-
-	/* Strip any trailing slashes */
-	endp = path + strlen(path) - 1;
-	while (endp > path && *endp == '/')
-		endp--;
-
-	/* All slashes becomes "/" */
-	if (endp == path && *endp == '/') {
-		bname[0] = '/';
-		bname[1] = '\0';
-		return (bname);
-	}
-
-	/* Find the start of the base */
-	startp = endp;
-	while (startp > path && *(startp - 1) != '/')
-		startp--;
-
-	len = endp - startp + 1;
-	if (len >= MAXPATHLEN) {
-		errno = ENAMETOOLONG;
-		return (NULL);
-	}
-	memcpy(bname, startp, len);
-	bname[len] = '\0';
-	return (bname);
-}
-
-char *
-basename(const char *path)
-{
-	static char *bname = NULL;
-
-	if (bname == NULL) {
-		bname = (char *)malloc(MAXPATHLEN);
-		if (bname == NULL)
-			return (NULL);
-	}
-	return (basename_r(path, bname));
-}
diff --git a/lib/libc_bsd/gen/cap_rights_get.3 b/lib/libc_bsd/gen/cap_rights_get.3
deleted file mode 100644
index 4fc2d56..0000000
--- a/lib/libc_bsd/gen/cap_rights_get.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\"
-.\" Copyright (c) 2013 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by Pawel Jakub Dawidek under sponsorship
-.\" from the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/cap_rights_get.3 280247 2015-03-19 11:24:07Z rwatson $
-.\"
-.Dd March 27, 2014
-.Dt CAP_RIGHTS_GET 3
-.Os
-.Sh NAME
-.Nm cap_rights_get
-.Nd obtain capability rights
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/capsicum.h
-.Ft int
-.Fn cap_rights_get "int fd" "cap_rights_t *rights"
-.Sh DESCRIPTION
-The
-.Nm cap_rights_get
-function allows to obtain current capability rights for the given descriptor.
-The function will fill the
-.Fa rights
-argument with all capability rights if they were not limited or capability
-rights configured during the last successful call of
-.Xr cap_rights_limit 2
-on the given descriptor.
-.Pp
-The
-.Fa rights
-argument can be inspected using
-.Xr cap_rights_init 3
-family of functions.
-.Pp
-The complete list of the capability rights can be found in the
-.Xr rights 4
-manual page.
-.Sh RETURN VALUES
-.Rv -std
-.Sh EXAMPLES
-The following example demonstrates how to limit file descriptor capability
-rights and how to obtain them.
-.Bd -literal
-cap_rights_t setrights, getrights;
-int fd;
-
-memset(&setrights, 0, sizeof(setrights));
-memset(&getrights, 0, sizeof(getrights));
-
-fd = open("/tmp/foo", O_RDONLY);
-if (fd < 0)
-	err(1, "open() failed");
-
-cap_rights_init(&setrights, CAP_FSTAT, CAP_READ);
-if (cap_rights_limit(fd, &setrights) < 0 && errno != ENOSYS)
-	err(1, "cap_rights_limit() failed");
-
-if (cap_rights_get(fd, &getrights) < 0 && errno != ENOSYS)
-	err(1, "cap_rights_get() failed");
-
-assert(memcmp(&setrights, &getrights, sizeof(setrights)) == 0);
-.Ed
-.Sh ERRORS
-.Fn cap_rights_get
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid active descriptor.
-.It Bq Er EFAULT
-The
-.Fa rights
-argument points at an invalid address.
-.El
-.Sh SEE ALSO
-.Xr cap_rights_limit 2 ,
-.Xr cap_rights_init 3 ,
-.Xr errno 2 ,
-.Xr open 2 ,
-.Xr assert 3 ,
-.Xr err 3 ,
-.Xr memcmp 3 ,
-.Xr memset 3 ,
-.Xr capsicum 4 ,
-.Xr rights 4
-.Sh HISTORY
-Support for capabilities and capabilities mode was developed as part of the
-.Tn TrustedBSD
-Project.
-.Sh AUTHORS
-This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
-under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc_bsd/gen/cap_sandboxed.3 b/lib/libc_bsd/gen/cap_sandboxed.3
deleted file mode 100644
index 95911e9..0000000
--- a/lib/libc_bsd/gen/cap_sandboxed.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\"
-.\" Copyright (c) 2012 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by Pawel Jakub Dawidek under sponsorship
-.\" from the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/cap_sandboxed.3 280247 2015-03-19 11:24:07Z rwatson $
-.\"
-.Dd March 27, 2014
-.Dt CAP_SANDBOXED 3
-.Os
-.Sh NAME
-.Nm cap_sandboxed
-.Nd Check if in a capability mode sandbox
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/capsicum.h
-.In stdbool.h
-.Ft bool
-.Fn cap_sandboxed "void"
-.Sh DESCRIPTION
-.Fn cap_sandboxed
-returns
-.Va true
-if the process is in a capability mode sandbox or
-.Va false
-if it is not.
-This function is a more handy alternative to the
-.Xr cap_getmode 2
-system call as it always succeeds, so there is no need for error checking.
-If the support for capability mode is not compiled into the kernel,
-.Fn cap_sandboxed
-will always return
-.Va false .
-.Sh RETURN VALUES
-Function
-.Fn cap_sandboxed
-is always successful and will return either
-.Va true
-or
-.Va false .
-.Sh SEE ALSO
-.Xr cap_enter 2 ,
-.Xr capsicum 4
-.Sh AUTHORS
-This function was implemented and manual page was written by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
-under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc_bsd/gen/cap_sandboxed.c b/lib/libc_bsd/gen/cap_sandboxed.c
deleted file mode 100644
index 8bc57a7..0000000
--- a/lib/libc_bsd/gen/cap_sandboxed.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2012 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Pawel Jakub Dawidek under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/cap_sandboxed.c 280250 2015-03-19 12:32:48Z rwatson $");
-
-#include <sys/capsicum.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdbool.h>
-
-bool
-cap_sandboxed(void)
-{
-	u_int mode;
-
-	if (cap_getmode(&mode) != 0) {
-		assert(errno == ENOSYS);
-		return (false);
-	}
-	assert(mode == 0 || mode == 1);
-	return (mode == 1);
-}
diff --git a/lib/libc_bsd/gen/check_utility_compat.3 b/lib/libc_bsd/gen/check_utility_compat.3
deleted file mode 100644
index 7260216..0000000
--- a/lib/libc_bsd/gen/check_utility_compat.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\"
-.\" Copyright 2002 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. 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: releng/10.2/lib/libc/gen/check_utility_compat.3 206622 2010-04-14 19:08:06Z uqs $
-.\"
-.Dd October 27, 2002
-.Dt CHECK_UTILITY_COMPAT 3
-.Os
-.Sh NAME
-.Nm check_utility_compat
-.Nd "determine whether a utility should be compatible"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn check_utility_compat "const char *utility"
-.Sh DESCRIPTION
-The
-.Fn check_utility_compat
-function checks whether
-.Fa utility
-should behave in a traditional
-.Pq Fx 4.7 Ns -compatible
-manner, or in accordance with
-.St -p1003.1-2001 .
-The configuration is given as a comma-separated list of utility names;
-if the list is present but empty, all supported utilities assume their
-most compatible mode.
-The
-.Fn check_utility_compat
-function first checks for an environment variable named
-.Ev _COMPAT_FreeBSD_4 .
-If that environment variable does not exist, then
-.Fn check_utility_compat
-will attempt to read the contents of a symbolic link named
-.Pa /etc/compat-FreeBSD-4-util .
-If no configuration is found, compatibility mode is disabled.
-.Sh RETURN VALUES
-The
-.Fn check_utility_compat
-function returns zero if
-.Fa utility
-should implement strict
-.St -p1003.1-2001
-behavior, and nonzero otherwise.
-.Sh FILES
-.Bl -tag -width ".Pa /etc/compat-FreeBSD-4-util"
-.It Pa /etc/compat-FreeBSD-4-util
-If present, a symbolic link whose expansion gives system-wide default settings
-for the
-.Fn check_utility_compat
-function.
-.El
-.Sh ERRORS
-No errors are detected.
-.Sh HISTORY
-The
-.Fn check_utility_compat
-function first appeared in
-.Fx 5.0 .
-.Sh AUTHORS
-This manual page was written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .
diff --git a/lib/libc_bsd/gen/check_utility_compat.c b/lib/libc_bsd/gen/check_utility_compat.c
deleted file mode 100644
index 5deb8ad..0000000
--- a/lib/libc_bsd/gen/check_utility_compat.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/check_utility_compat.c 244568 2012-12-21 22:20:59Z delphij $");
-
-/*
- * I din't use "namespace.h" here because none of the relevant utilities
- * are threaded, so I'm not concerned about cancellation points or other
- * niceties.
- */
-#include <sys/limits.h>
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define	_PATH_UTIL_COMPAT	"/etc/compat-FreeBSD-4-util"
-#define	_ENV_UTIL_COMPAT	"_COMPAT_FreeBSD_4"
-
-int
-check_utility_compat(const char *utility)
-{
-	char buf[PATH_MAX];
-	char *p, *bp;
-	int len;
-
-	if ((p = getenv(_ENV_UTIL_COMPAT)) != NULL) {
-		strlcpy(buf, p, sizeof buf);
-	} else {
-		if ((len = readlink(_PATH_UTIL_COMPAT, buf, sizeof(buf) - 1)) < 0)
-			return 0;
-		buf[len] = '\0';
-	}
-	if (buf[0] == '\0')
-		return 1;
-
-	bp = buf;
-	while ((p = strsep(&bp, ",")) != NULL) {
-		if (strcmp(p, utility) == 0)
-			return 1;
-	}
-	return 0;
-}
diff --git a/lib/libc_bsd/gen/clock.3 b/lib/libc_bsd/gen/clock.3
deleted file mode 100644
index 119181c..0000000
--- a/lib/libc_bsd/gen/clock.3
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)clock.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/clock.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt CLOCK 3
-.Os
-.Sh NAME
-.Nm clock
-.Nd determine processor time used
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft clock_t
-.Fn clock void
-.Sh DESCRIPTION
-The
-.Fn clock
-function
-determines the amount of processor time used since the invocation of the
-calling process, measured in
-.Dv CLOCKS_PER_SEC Ns s
-of a second.
-.Sh RETURN VALUES
-The
-.Fn clock
-function returns the amount of time used unless an error occurs, in which
-case the return value is \-1.
-.Sh SEE ALSO
-.Xr getrusage 2 ,
-.Xr clocks 7
-.Sh STANDARDS
-The
-.Fn clock
-function conforms to
-.St -isoC .
-However,
-.St -susv2
-requires
-.Dv CLOCKS_PER_SEC
-to be defined as one million.
-.Fx
-does not conform to this requirement;
-changing the value would introduce binary incompatibility
-and one million is still inadequate on modern processors.
diff --git a/lib/libc_bsd/gen/clock.c b/lib/libc_bsd/gen/clock.c
deleted file mode 100644
index c446418..0000000
--- a/lib/libc_bsd/gen/clock.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)clock.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/clock.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-/*
- * Convert usec to clock ticks; could do (usec * CLOCKS_PER_SEC) / 1000000,
- * but this would overflow if we switch to nanosec.
- */
-#define	CONVTCK(r)	((r).tv_sec * CLOCKS_PER_SEC \
-			 + (r).tv_usec / (1000000 / CLOCKS_PER_SEC))
-
-clock_t
-clock()
-{
-	struct rusage ru;
-
-	if (getrusage(RUSAGE_SELF, &ru))
-		return ((clock_t) -1);
-	return((clock_t)((CONVTCK(ru.ru_utime) + CONVTCK(ru.ru_stime))));
-}
diff --git a/lib/libc_bsd/gen/clock_getcpuclockid.3 b/lib/libc_bsd/gen/clock_getcpuclockid.3
deleted file mode 100644
index 8e8b96f..0000000
--- a/lib/libc_bsd/gen/clock_getcpuclockid.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" Copyright (c) 2012 David Xu <davidxu@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/clock_getcpuclockid.3 239499 2012-08-21 13:33:48Z joel $
-.\"
-.Dd August 21, 2012
-.Dt CLOCK_GETCPUCLOCKID 3
-.Os
-.Sh NAME
-.Nm clock_getcpuclockid
-.Nd access a process CPU-time clock
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft int
-.Fn clock_getcpuclockid "pid_t pid" "clockid_t *clock_id"
-.Sh DESCRIPTION
-The
-.Fn clock_getcpuclockid
-returns the clock ID of the CPU-time clock of the process specified by
-.Fa pid .
-If the process described by
-.Fa pid
-exists and the calling process has permission, the clock ID of this
-clock will be returned in
-.Fa clock_id .
-.Pp
-If
-.Fa pid
-is zero, the
-.Fn clock_getcpuclockid
-function returns the clock ID of the CPU-time clock of the process
-making the call, in
-.Fa clock_id .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn clock_getcpuclockid
-returns zero; otherwise, an error number is returned to indicate the
-error.
-.Sh ERRORS
-The clock_getcpuclockid() function will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The requesting process does not have permission to access the CPU-time
-clock for the process.
-.It Bq Er ESRCH
-No process can be found corresponding to the process specified by
-.Fa pid .
-.El
-.Sh SEE ALSO
-.Xr clock_gettime 2
-.Sh STANDARDS
-The
-.Fn clock_getcpuclockid
-function conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn clock_getcpuclockid
-function first appeared in
-.Fx 10.0 .
-.Sh AUTHORS
-.An David Xu Aq davidxu@FreeBSD.org
diff --git a/lib/libc_bsd/gen/clock_getcpuclockid.c b/lib/libc_bsd/gen/clock_getcpuclockid.c
deleted file mode 100644
index b9ee9ad..0000000
--- a/lib/libc_bsd/gen/clock_getcpuclockid.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2012 David Xu <davidxu@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.
- *
- * THIS SOFTWARE IS PROVIDED BY DANIEL EISCHEN 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/clock_getcpuclockid.c 239485 2012-08-21 09:17:13Z davidxu $");
-
-#include <errno.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/time.h>
-
-int
-clock_getcpuclockid(pid_t pid, clockid_t *clock_id)
-{
-	if (clock_getcpuclockid2(pid, CPUCLOCK_WHICH_PID, clock_id))
-		return (errno);
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/closedir.c b/lib/libc_bsd/gen/closedir.c
deleted file mode 100644
index aa952a0..0000000
--- a/lib/libc_bsd/gen/closedir.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)closedir.c	8.1 (Berkeley) 6/10/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/closedir.c 254499 2013-08-18 20:11:34Z pjd $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <dirent.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "gen-private.h"
-#include "telldir.h"
-
-/*
- * close a directory.
- */
-int
-fdclosedir(DIR *dirp)
-{
-	int fd;
-
-	if (__isthreaded)
-		_pthread_mutex_lock(&dirp->dd_lock);
-	fd = dirp->dd_fd;
-	dirp->dd_fd = -1;
-	dirp->dd_loc = 0;
-	free((void *)dirp->dd_buf);
-	_reclaim_telldir(dirp);
-	if (__isthreaded) {
-		_pthread_mutex_unlock(&dirp->dd_lock);
-		_pthread_mutex_destroy(&dirp->dd_lock);
-	}
-	free((void *)dirp);
-	return (fd);
-}
-
-int
-closedir(DIR *dirp)
-{
-
-	return (_close(fdclosedir(dirp)));
-}
diff --git a/lib/libc_bsd/gen/confstr.3 b/lib/libc_bsd/gen/confstr.3
deleted file mode 100644
index ca7cffd..0000000
--- a/lib/libc_bsd/gen/confstr.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"	@(#)confstr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/confstr.3 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd December 3, 2006
-.Dt CONFSTR 3
-.Os
-.Sh NAME
-.Nm confstr
-.Nd get string-valued configurable variables
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft size_t
-.Fn confstr "int name" "char *buf" "size_t len"
-.Sh DESCRIPTION
-This interface is specified by
-.St -p1003.1-2001 .
-A more flexible (but non-portable) interface is provided by
-.Xr sysctl 3 .
-.Pp
-The
-.Fn confstr
-function provides a method for applications to get configuration
-defined string values.
-Shell programmers needing access to these parameters should use the
-.Xr getconf 1
-utility.
-.Pp
-The
-.Fa name
-argument specifies the system variable to be queried.
-Symbolic constants for each name value are found in the include file
-.In unistd.h .
-The
-.Fa len
-argument specifies the size of the buffer referenced by the
-argument
-.Fa buf .
-If
-.Fa len
-is non-zero,
-.Fa buf
-is a non-null pointer, and
-.Fa name
-has a value, up to
-.Fa len
-\- 1 bytes of the value are copied into the buffer
-.Fa buf .
-The copied value is always null terminated.
-.Pp
-The available values are as follows:
-.Bl -tag -width 6n
-.It Li _CS_PATH
-Return a value for the
-.Ev PATH
-environment variable that finds all the standard utilities.
-.El
-.Sh RETURN VALUES
-If the call to
-.Fn confstr
-is not successful, 0 is returned and
-.Va errno
-is set appropriately.
-Otherwise, if the variable does not have a configuration defined value,
-0 is returned and
-.Va errno
-is not modified.
-Otherwise, the buffer size needed to hold the entire configuration-defined
-value is returned.
-If this size is greater than the argument
-.Fa len ,
-the string in
-.Fa buf
-was truncated.
-.Sh ERRORS
-The
-.Fn confstr
-function may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr malloc 3
-and
-.Xr sysctl 3 .
-.Pp
-In addition, the following errors may be reported:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa name
-argument is invalid.
-.El
-.Sh SEE ALSO
-.Xr getconf 1 ,
-.Xr pathconf 2 ,
-.Xr sysconf 3 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn confstr
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/gen/confstr.c b/lib/libc_bsd/gen/confstr.c
deleted file mode 100644
index 31775bc..0000000
--- a/lib/libc_bsd/gen/confstr.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * Copyright (c) 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)confstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/confstr.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <string.h>
-#include <unistd.h>
-
-
-size_t
-confstr(int name, char *buf, size_t len)
-{
-	const char *p;
-	const char UPE[] = "unsupported programming environment";
-
-	switch (name) {
-	case _CS_PATH:
-		p = _PATH_STDPATH;
-		goto docopy;
-
-		/*
-		 * POSIX/SUS ``Programming Environments'' stuff
-		 *
-		 * We don't support more than one programming environment
-		 * on any platform (yet), so we just return the empty
-		 * string for the environment we are compiled for,
-		 * and the string "unsupported programming environment"
-		 * for anything else.  (The Standard says that if these
-		 * values are used on a system which does not support
-		 * this environment -- determined via sysconf() -- then
-		 * the value we return is unspecified.  So, we return
-		 * something which will cause obvious breakage.)
-		 */
-	case _CS_POSIX_V6_ILP32_OFF32_CFLAGS:
-	case _CS_POSIX_V6_ILP32_OFF32_LDFLAGS:
-	case _CS_POSIX_V6_ILP32_OFF32_LIBS:
-	case _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS:
-	case _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS:
-	case _CS_POSIX_V6_LPBIG_OFFBIG_LIBS:
-		/*
-		 * These two environments are never supported.
-		 */
-		p = UPE;
-		goto docopy;
-
-	case _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS:
-	case _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS:
-	case _CS_POSIX_V6_ILP32_OFFBIG_LIBS:
-		if (sizeof(long) * CHAR_BIT == 32 &&
-		    sizeof(off_t) > sizeof(long))
-			p = "";
-		else
-			p = UPE;
-		goto docopy;
-
-	case _CS_POSIX_V6_LP64_OFF64_CFLAGS:
-	case _CS_POSIX_V6_LP64_OFF64_LDFLAGS:
-	case _CS_POSIX_V6_LP64_OFF64_LIBS:
-		if (sizeof(long) * CHAR_BIT >= 64 &&
-		    sizeof(void *) * CHAR_BIT >= 64 &&
-		    sizeof(int) * CHAR_BIT >= 32 &&
-		    sizeof(off_t) >= sizeof(long))
-			p = "";
-		else
-			p = UPE;
-		goto docopy;
-
-	case _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS:
-		/* XXX - should have more complete coverage */
-		if (sizeof(long) * CHAR_BIT >= 64)
-			p = "_POSIX_V6_LP64_OFF64";
-		else
-			p = "_POSIX_V6_ILP32_OFFBIG";
-		goto docopy;
-
-docopy:
-		if (len != 0 && buf != NULL)
-			strlcpy(buf, p, len);
-		return (strlen(p) + 1);
-
-	default:
-		errno = EINVAL;
-		return (0);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/gen/crypt.c b/lib/libc_bsd/gen/crypt.c
deleted file mode 100644
index e437cdd..0000000
--- a/lib/libc_bsd/gen/crypt.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Tom Truscott.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-/* from static char sccsid[] = "@(#)crypt.c	5.11 (Berkeley) 6/25/91"; */
-#endif /* LIBC_SCCS and not lint */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/crypt.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-/*
- * UNIX password, and DES, encryption.
- *
- * since this is non-exportable, this is just a dummy.  if you want real
- * encryption, make sure you've got libcrypt.a around.
- */
-
-__warn_references(des_setkey,
-	"WARNING!  des_setkey(3) not present in the system!");
-
-/* ARGSUSED */
-int
-des_setkey(const char *key __unused)
-{
-	fprintf(stderr, "WARNING!  des_setkey(3) not present in the system!\n");
-	return (0);
-}
-
-__warn_references(des_cipher,
-	"WARNING!  des_cipher(3) not present in the system!");
-
-/* ARGSUSED */
-int
-des_cipher(const char *in, char *out, long salt __unused, int num_iter __unused)
-{
-	fprintf(stderr, "WARNING!  des_cipher(3) not present in the system!\n");
-	bcopy(in, out, 8);
-	return (0);
-}
-
-__warn_references(setkey,
-	"WARNING!  setkey(3) not present in the system!");
-
-/* ARGSUSED */
-int
-setkey(const char *key __unused)
-{
-	fprintf(stderr, "WARNING!  setkey(3) not present in the system!\n");
-	return (0);
-}
-
-__warn_references(encrypt,
-	"WARNING!  encrypt(3) not present in the system!");
-
-/* ARGSUSED */
-int
-encrypt(char *block __unused, int flag __unused)
-{
-	fprintf(stderr, "WARNING!  encrypt(3) not present in the system!\n");
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/ctermid.3 b/lib/libc_bsd/gen/ctermid.3
deleted file mode 100644
index 0b698d6..0000000
--- a/lib/libc_bsd/gen/ctermid.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)ctermid.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/ctermid.3 225897 2011-10-01 12:19:48Z ed $
-.\"
-.Dd October 1, 2011
-.Dt CTERMID 3
-.Os
-.Sh NAME
-.Nm ctermid
-.Nd generate terminal pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft char *
-.Fn ctermid "char *buf"
-.Ft char *
-.Fn ctermid_r "char *buf"
-.Sh DESCRIPTION
-The
-.Fn ctermid
-function generates a string, that, when used as a pathname, refers to
-the current controlling terminal of the calling process.
-.Pp
-If
-.Fa buf
-is the
-.Dv NULL
-pointer, a pointer to a static area is returned.
-Otherwise, the pathname is copied into the memory referenced by
-.Fa buf .
-The argument
-.Fa buf
-is assumed to be at least
-.Dv L_ctermid
-(as defined in the include
-file
-.In stdio.h )
-bytes long.
-.Pp
-The
-.Fn ctermid_r
-function
-provides the same functionality as
-.Fn ctermid
-except that if
-.Fa buf
-is a
-.Dv NULL
-pointer,
-.Dv NULL
-is returned.
-.Pp
-If no suitable lookup of the controlling terminal name can be performed,
-this implementation returns
-.Ql /dev/tty .
-.Sh RETURN VALUES
-Upon successful completion, a
-.Pf non- Dv NULL
-pointer is returned.
-Otherwise, a
-.Dv NULL
-pointer is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The current implementation detects no error conditions.
-.Sh SEE ALSO
-.Xr ttyname 3
-.Sh STANDARDS
-The
-.Fn ctermid
-function conforms to
-.St -p1003.1-88 .
-.Sh BUGS
-By default the
-.Fn ctermid
-function
-writes all information to an internal static object.
-Subsequent calls to
-.Fn ctermid
-will modify the same object.
diff --git a/lib/libc_bsd/gen/ctermid.c b/lib/libc_bsd/gen/ctermid.c
deleted file mode 100644
index 045cfc6..0000000
--- a/lib/libc_bsd/gen/ctermid.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2011 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/ctermid.c 225897 2011-10-01 12:19:48Z ed $");
-
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <paths.h>
-#include <stdio.h>
-#include <string.h>
-
-#define	LEN_PATH_DEV	(sizeof(_PATH_DEV) - 1)
-
-char *
-ctermid(char *s)
-{
-	static char def[sizeof(_PATH_DEV) + SPECNAMELEN];
-	struct stat sb;
-	size_t dlen;
-	int sverrno;
-
-	if (s == NULL) {
-		s = def;
-		dlen = sizeof(def) - LEN_PATH_DEV;
-	} else
-		dlen = L_ctermid - LEN_PATH_DEV;
-	strcpy(s, _PATH_TTY);
-
-	/* Attempt to perform a lookup of the actual TTY pathname. */
-	sverrno = errno;
-	if (stat(_PATH_TTY, &sb) == 0 && S_ISCHR(sb.st_mode))
-		(void)sysctlbyname("kern.devname", s + LEN_PATH_DEV,
-		    &dlen, &sb.st_rdev, sizeof(sb.st_rdev));
-	errno = sverrno;
-	return (s);
-}
-
-char *
-ctermid_r(char *s)
-{
-
-	return (s != NULL ? ctermid(s) : NULL);
-}
diff --git a/lib/libc_bsd/gen/daemon.3 b/lib/libc_bsd/gen/daemon.3
deleted file mode 100644
index f431d42..0000000
--- a/lib/libc_bsd/gen/daemon.3
+++ /dev/null
@@ -1,112 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"	@(#)daemon.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/daemon.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 9, 1993
-.Dt DAEMON 3
-.Os
-.Sh NAME
-.Nm daemon
-.Nd run in the background
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn daemon "int nochdir" "int noclose"
-.Sh DESCRIPTION
-The
-.Fn daemon
-function is for programs wishing to detach themselves from the
-controlling terminal and run in the background as system daemons.
-.Pp
-Unless the argument
-.Fa nochdir
-is non-zero,
-.Fn daemon
-changes the current working directory to the root
-.Pq Pa / .
-.Pp
-Unless the argument
-.Fa noclose
-is non-zero,
-.Fn daemon
-will redirect standard input, standard output, and standard error to
-.Pa /dev/null .
-.Sh RETURN VALUES
-.Rv -std daemon
-.Sh ERRORS
-The
-.Fn daemon
-function may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr fork 2
-and
-.Xr setsid 2 .
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr setsid 2 ,
-.Xr sigaction 2
-.Sh HISTORY
-The
-.Fn daemon
-function first appeared in
-.Bx 4.4 .
-.Sh CAVEATS
-Unless the
-.Fa noclose
-argument is non-zero,
-.Fn daemon
-will close the first three file descriptors and redirect them to
-.Pa /dev/null .
-Normally, these correspond to standard input, standard output, and
-standard error.
-However, if any of those file descriptors refer to something else, they
-will still be closed, resulting in incorrect behavior of the calling program.
-This can happen if any of standard input, standard output, or standard
-error have been closed before the program was run.
-Programs using
-.Fn daemon
-should therefore either call
-.Fn daemon
-before opening any files or sockets, or verify that any file
-descriptors obtained have values greater than 2.
-.Pp
-The
-.Fn daemon
-function temporarily ignores
-.Dv SIGHUP
-while calling
-.Xr setsid 2
-to prevent a parent session group leader's calls to
-.Xr fork 2
-and then
-.Xr _exit 2
-from prematurely terminating the child process.
diff --git a/lib/libc_bsd/gen/daemon.c b/lib/libc_bsd/gen/daemon.c
deleted file mode 100644
index 8459b87..0000000
--- a/lib/libc_bsd/gen/daemon.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/daemon.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-int
-daemon(int nochdir, int noclose)
-{
-	struct sigaction osa, sa;
-	int fd;
-	pid_t newgrp;
-	int oerrno;
-	int osa_ok;
-
-	/* A SIGHUP may be thrown when the parent exits below. */
-	sigemptyset(&sa.sa_mask);
-	sa.sa_handler = SIG_IGN;
-	sa.sa_flags = 0;
-	osa_ok = __libc_sigaction(SIGHUP, &sa, &osa);
-
-	switch (fork()) {
-	case -1:
-		return (-1);
-	case 0:
-		break;
-	default:
-		/*
-		 * A fine point:  _exit(0), not exit(0), to avoid triggering
-		 * atexit(3) processing
-		 */
-		_exit(0);
-	}
-
-	newgrp = setsid();
-	oerrno = errno;
-	if (osa_ok != -1)
-		__libc_sigaction(SIGHUP, &osa, NULL);
-
-	if (newgrp == -1) {
-		errno = oerrno;
-		return (-1);
-	}
-
-	if (!nochdir)
-		(void)chdir("/");
-
-	if (!noclose && (fd = _open(_PATH_DEVNULL, O_RDWR, 0)) != -1) {
-		(void)_dup2(fd, STDIN_FILENO);
-		(void)_dup2(fd, STDOUT_FILENO);
-		(void)_dup2(fd, STDERR_FILENO);
-		if (fd > 2)
-			(void)_close(fd);
-	}
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/devname.3 b/lib/libc_bsd/gen/devname.3
deleted file mode 100644
index 20604ac..0000000
--- a/lib/libc_bsd/gen/devname.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"     @(#)devname.3	8.2 (Berkeley) 4/29/95
-.\" $FreeBSD: releng/10.2/lib/libc/gen/devname.3 188497 2009-02-11 20:24:59Z ed $
-.\"
-.Dd February 22, 2005
-.Dt DEVNAME 3
-.Os
-.Sh NAME
-.Nm devname
-.Nd "get device name"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.In stdlib.h
-.Ft char *
-.Fn devname "dev_t dev" "mode_t type"
-.Ft char *
-.Fn devname_r "dev_t dev" "mode_t type" "char *buf" "int len"
-.Ft char *
-.Fn fdevname "int fd"
-.Ft char *
-.Fn fdevname_r "int fd" "char *buf" "int len"
-.Sh DESCRIPTION
-The
-.Fn devname
-function returns a pointer to the name of the block or character
-device in
-.Pa /dev
-with a device number of
-.Fa dev ,
-and a file type matching the one encoded in
-.Fa type
-which must be one of
-.Dv S_IFBLK
-or
-.Dv S_IFCHR .
-To find the right name,
-.Fn devname
-asks the kernel via the
-.Va kern.devname
-sysctl.
-If it is unable to come up with a suitable name,
-it will format the information encapsulated in
-.Fa dev
-and
-.Fa type
-in a human-readable format.
-.Pp
-The
-.Fn fdevname
-and
-.Fn fdevname_r
-function obtains the device name directly from a file descriptor
-pointing to a character device.
-If it is unable to come up with a suitable name, these functions will
-return a NULL pointer.
-.Pp
-.Fn devname
-and
-.Fn fdevname
-return the name stored in a static buffer which will be overwritten
-on subsequent calls.
-.Fn devname_r
-and
-.Fn fdevname_r
-take a buffer and length as argument to avoid this problem.
-.Sh EXAMPLES
-.Bd -literal -compact
-int fd;
-struct stat buf;
-char *name;
-
-	fd = open("/dev/tun");
-	fstat(fd, &buf);
-	printf("devname is /dev/%s\en", devname(buf.st_rdev, S_IFCHR));
-	printf("fdevname is /dev/%s\en", fdevname(fd));
-.Ed
-.Sh SEE ALSO
-.Xr stat 2
-.Sh HISTORY
-The
-.Fn devname
-function appeared in
-.Bx 4.4 .
-The
-.Fn fdevname
-function appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/gen/devname.c b/lib/libc_bsd/gen/devname.c
deleted file mode 100644
index 27d2456..0000000
--- a/lib/libc_bsd/gen/devname.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)devname.c	8.2 (Berkeley) 4/29/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/devname.c 225847 2011-09-28 18:53:36Z ed $");
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-
-char *
-devname_r(dev_t dev, mode_t type, char *buf, int len)
-{
-	int i;
-	size_t j;
-
-	if (dev == NODEV || !(S_ISCHR(type) || S_ISBLK(dev))) {
-		strlcpy(buf, "#NODEV", len);
-		return (buf);
-	}
-
-	if (S_ISCHR(type)) {
-		j = len;
-		i = sysctlbyname("kern.devname", buf, &j, &dev, sizeof (dev));
-		if (i == 0)
-			return (buf);
-	}
-
-	/* Finally just format it */
-	snprintf(buf, len, "#%c:%#jx",
-	    S_ISCHR(type) ? 'C' : 'B', (uintmax_t)dev);
-	return (buf);
-}
-
-char *
-devname(dev_t dev, mode_t type)
-{
-	static char buf[SPECNAMELEN + 1];
-
-	return (devname_r(dev, type, buf, sizeof(buf)));
-}
diff --git a/lib/libc_bsd/gen/directory.3 b/lib/libc_bsd/gen/directory.3
deleted file mode 100644
index 9b0e850..0000000
--- a/lib/libc_bsd/gen/directory.3
+++ /dev/null
@@ -1,287 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)directory.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/directory.3 283914 2015-06-02 15:07:06Z jhb $
-.\"
-.Dd May 6, 2015
-.Dt DIRECTORY 3
-.Os
-.Sh NAME
-.Nm opendir ,
-.Nm fdopendir ,
-.Nm readdir ,
-.Nm readdir_r ,
-.Nm telldir ,
-.Nm seekdir ,
-.Nm rewinddir ,
-.Nm closedir ,
-.Nm fdclosedir ,
-.Nm dirfd
-.Nd directory operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In dirent.h
-.Ft DIR *
-.Fn opendir "const char *filename"
-.Ft DIR *
-.Fn fdopendir "int fd"
-.Ft struct dirent *
-.Fn readdir "DIR *dirp"
-.Ft int
-.Fn readdir_r "DIR *dirp" "struct dirent *entry" "struct dirent **result"
-.Ft long
-.Fn telldir "DIR *dirp"
-.Ft void
-.Fn seekdir "DIR *dirp" "long loc"
-.Ft void
-.Fn rewinddir "DIR *dirp"
-.Ft int
-.Fn closedir "DIR *dirp"
-.Ft int
-.Fn fdclosedir "DIR *dirp"
-.Ft int
-.Fn dirfd "DIR *dirp"
-.Sh DESCRIPTION
-The
-.Fn opendir
-function
-opens the directory named by
-.Fa filename ,
-associates a
-.Em directory stream
-with it
-and
-returns a pointer to be used to identify the
-.Em directory stream
-in subsequent operations.
-The pointer
-.Dv NULL
-is returned if
-.Fa filename
-cannot be accessed, or if it cannot
-.Xr malloc 3
-enough memory to hold the whole thing.
-.Pp
-The
-.Fn fdopendir
-function is equivalent to the
-.Fn opendir
-function except that the directory is specified by a file descriptor
-.Fa fd
-rather than by a name.
-The file offset associated with the file descriptor at the time of the call
-determines which entries are returned.
-.Pp
-Upon successful return from
-.Fn fdopendir ,
-the file descriptor is under the control of the system,
-and if any attempt is made to close the file descriptor,
-or to modify the state of the associated description other than by means
-of
-.Fn closedir ,
-.Fn readdir ,
-.Fn readdir_r ,
-or
-.Fn rewinddir ,
-the behavior is undefined.
-Upon calling
-.Fn closedir
-the file descriptor is closed.
-The
-.Dv FD_CLOEXEC
-flag is set on the file descriptor by a successful call to
-.Fn fdopendir .
-.Pp
-The
-.Fn readdir
-function
-returns a pointer to the next directory entry.
-It returns
-.Dv NULL
-upon reaching the end of the directory or on error.
-In the event of an error,
-.Va errno
-may be set to any of the values documented for the
-.Xr getdirentries 2
-system call.
-.Pp
-The
-.Fn readdir_r
-function
-provides the same functionality as
-.Fn readdir ,
-but the caller must provide a directory
-.Fa entry
-buffer to store the results in.
-If the read succeeds,
-.Fa result
-is pointed at the
-.Fa entry ;
-upon reaching the end of the directory
-.Fa result
-is set to
-.Dv NULL .
-The
-.Fn readdir_r
-function
-returns 0 on success or an error number to indicate failure.
-.Pp
-The
-.Fn telldir
-function
-returns a token representing the current location associated with the named
-.Em directory stream .
-Values returned by
-.Fn telldir
-are good only for the lifetime of the
-.Dv DIR
-pointer,
-.Fa dirp ,
-from which they are derived.
-If the directory is closed and then
-reopened, prior values returned by
-.Fn telldir
-will no longer be valid.
-Values returned by
-.Fn telldir
-are also invalidated by a call to
-.Fn rewinddir .
-.Pp
-The
-.Fn seekdir
-function
-sets the position of the next
-.Fn readdir
-operation on the
-.Em directory stream .
-The new position reverts to the one associated with the
-.Em directory stream
-when the
-.Fn telldir
-operation was performed.
-.Pp
-The
-.Fn rewinddir
-function
-resets the position of the named
-.Em directory stream
-to the beginning of the directory.
-.Pp
-The
-.Fn closedir
-function
-closes the named
-.Em directory stream
-and frees the structure associated with the
-.Fa dirp
-pointer,
-returning 0 on success.
-On failure, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Pp
-The
-.Fn fdclosedir
-function is equivalent to the
-.Fn closedir
-function except that this function returns directory file descriptor instead of
-closing it.
-.Pp
-The
-.Fn dirfd
-function
-returns the integer file descriptor associated with the named
-.Em directory stream ,
-see
-.Xr open 2 .
-.Pp
-Sample code which searches a directory for entry ``name'' is:
-.Bd -literal -offset indent
-dirp = opendir(".");
-if (dirp == NULL)
-	return (ERROR);
-len = strlen(name);
-while ((dp = readdir(dirp)) != NULL) {
-	if (dp->d_namlen == len && strcmp(dp->d_name, name) == 0) {
-		(void)closedir(dirp);
-		return (FOUND);
-	}
-}
-(void)closedir(dirp);
-return (NOT_FOUND);
-.Ed
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr lseek 2 ,
-.Xr open 2 ,
-.Xr read 2 ,
-.Xr dir 5
-.Sh HISTORY
-The
-.Fn opendir ,
-.Fn readdir ,
-.Fn telldir ,
-.Fn seekdir ,
-.Fn rewinddir ,
-.Fn closedir ,
-and
-.Fn dirfd
-functions appeared in
-.Bx 4.2 .
-The
-.Fn fdopendir
-function appeared in
-.Fx 8.0 .
-.Fn fdclosedir
-function appeared in
-.Fx 10.0 .
-.Sh BUGS
-The behaviour of
-.Fn telldir
-and
-.Fn seekdir
-is likely to be wrong if there are parallel unlinks happening
-and the directory is larger than one page.
-There is code to ensure that a
-.Fn seekdir
-to the location given by a 
-.Fn telldir
-immediately before the last 
-.Fn readdir
-will always set the correct location to return the same value as that last
-.Fn readdir
-performed.
-This is enough for some applications which want to "push back the last entry read" E.g. Samba. 
-Seeks back to any other location,
-other than the beginning of the directory,
-may result in unexpected behaviour if deletes are present.
-It is hoped that this situation will be resolved with changes to
-.Fn getdirentries
-and the VFS.
diff --git a/lib/libc_bsd/gen/dirfd.c b/lib/libc_bsd/gen/dirfd.c
deleted file mode 100644
index 891ca33..0000000
--- a/lib/libc_bsd/gen/dirfd.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2011 Gleb Kurtsou <gleb@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.
- *
- * 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: releng/10.2/lib/libc/gen/dirfd.c 235649 2012-05-19 14:30:49Z gleb $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/dirfd.c 235649 2012-05-19 14:30:49Z gleb $");
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <dirent.h>
-#include "un-namespace.h"
-
-#include "gen-private.h"
-
-int
-dirfd(DIR *dirp)
-{
-
-	return (_dirfd(dirp));
-}
diff --git a/lib/libc_bsd/gen/dirname.3 b/lib/libc_bsd/gen/dirname.3
deleted file mode 100644
index 3d8e734..0000000
--- a/lib/libc_bsd/gen/dirname.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" $OpenBSD: dirname.3,v 1.17 2007/05/31 19:19:28 jmc Exp $
-.\"
-.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/dirname.3 184578 2008-11-03 05:19:45Z delphij $
-.\"
-.Dd October 12, 2006
-.Dt DIRNAME 3
-.Os
-.Sh NAME
-.Nm dirname
-.Nd extract the directory part of a pathname
-.Sh SYNOPSIS
-.In libgen.h
-.Ft char *
-.Fn dirname "const char *path"
-.Sh DESCRIPTION
-The
-.Fn dirname
-function is the converse of
-.Xr basename 3 ;
-it returns a pointer to the parent directory of the pathname pointed to by
-.Fa path .
-Any trailing
-.Sq \&/
-characters are not counted as part of the directory
-name.
-If
-.Fa path
-is a null pointer, the empty string, or contains no
-.Sq \&/
-characters,
-.Fn dirname
-returns a pointer to the string
-.Qq \&. ,
-signifying the current directory.
-.Sh IMPLEMENTATION NOTES
-The
-.Fn dirname
-function
-returns a pointer to internal storage space allocated on the first call
-that will be overwritten
-by subsequent calls.
-.Pp
-Other vendor implementations of
-.Fn dirname
-may modify the contents of the string passed to
-.Fn dirname ;
-this should be taken into account when writing code which calls this function
-if portability is desired.
-.Sh RETURN VALUES
-On successful completion,
-.Fn dirname
-returns a pointer to the parent directory of
-.Fa path .
-.Pp
-If
-.Fn dirname
-fails, a null pointer is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The following error codes may be set in
-.Va errno :
-.Bl -tag -width Er
-.It Bq Er ENAMETOOLONG
-The path component to be returned was larger than
-.Dv MAXPATHLEN .
-.El
-.Sh SEE ALSO
-.Xr basename 1 ,
-.Xr dirname 1 ,
-.Xr basename 3
-.Sh STANDARDS
-The
-.Fn dirname
-function conforms to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn dirname
-function first appeared in
-.Ox 2.2
-and
-.Fx 4.2 .
-.Sh AUTHORS
-.An "Todd C. Miller"
diff --git a/lib/libc_bsd/gen/dirname.c b/lib/libc_bsd/gen/dirname.c
deleted file mode 100644
index b59835b..0000000
--- a/lib/libc_bsd/gen/dirname.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$OpenBSD: dirname.c,v 1.13 2005/08/08 08:05:33 espie Exp $	*/
-
-/*
- * Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/dirname.c 184578 2008-11-03 05:19:45Z delphij $");
-
-#include <errno.h>
-#include <libgen.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/param.h>
-
-char *
-dirname(const char *path)
-{
-	static char *dname = NULL;
-	size_t len;
-	const char *endp;
-
-	if (dname == NULL) {
-		dname = (char *)malloc(MAXPATHLEN);
-		if (dname == NULL)
-			return(NULL);
-	}
-
-	/* Empty or NULL string gets treated as "." */
-	if (path == NULL || *path == '\0') {
-		dname[0] = '.';
-		dname[1] = '\0';
-		return (dname);
-	}
-
-	/* Strip any trailing slashes */
-	endp = path + strlen(path) - 1;
-	while (endp > path && *endp == '/')
-		endp--;
-
-	/* Find the start of the dir */
-	while (endp > path && *endp != '/')
-		endp--;
-
-	/* Either the dir is "/" or there are no slashes */
-	if (endp == path) {
-		dname[0] = *endp == '/' ? '/' : '.';
-		dname[1] = '\0';
-		return (dname);
-	} else {
-		/* Move forward past the separating slashes */
-		do {
-			endp--;
-		} while (endp > path && *endp == '/');
-	}
-
-	len = endp - path + 1;
-	if (len >= MAXPATHLEN) {
-		errno = ENAMETOOLONG;
-		return (NULL);
-	}
-	memcpy(dname, path, len);
-	dname[len] = '\0';
-	return (dname);
-}
diff --git a/lib/libc_bsd/gen/disklabel.c b/lib/libc_bsd/gen/disklabel.c
deleted file mode 100644
index 0a47ed9..0000000
--- a/lib/libc_bsd/gen/disklabel.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 1983, 1987, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)disklabel.c	8.2 (Berkeley) 5/3/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/disklabel.c 279008 2015-02-19 16:17:44Z pfg $");
-
-#include <sys/param.h>
-#define DKTYPENAMES
-#define FSTYPENAMES
-#include <sys/disklabel.h>
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-static int
-gettype(char *t, const char **names)
-{
-	const char **nm;
-
-	for (nm = names; *nm; nm++)
-		if (strcasecmp(t, *nm) == 0)
-			return (nm - names);
-	if (isdigit((unsigned char)*t))
-		return (atoi(t));
-	return (0);
-}
-
-struct disklabel *
-getdiskbyname(const char *name)
-{
-	static struct	disklabel disk;
-	struct	disklabel *dp = &disk;
-	struct partition *pp;
-	char	*buf;
-	char  	*db_array[2] = { _PATH_DISKTAB, 0 };
-	char	*cp, *cq;	/* can't be register */
-	char	p, max, psize[3], pbsize[3],
-		pfsize[3], poffset[3], ptype[3];
-	uint32_t *dx;
-
-	if (cgetent(&buf, db_array, (char *) name) < 0)
-		return NULL;
-
-	bzero((char *)&disk, sizeof(disk));
-	/*
-	 * typename
-	 */
-	cq = dp->d_typename;
-	cp = buf;
-	while (cq < dp->d_typename + sizeof(dp->d_typename) - 1 &&
-	    (*cq = *cp) && *cq != '|' && *cq != ':')
-		cq++, cp++;
-	*cq = '\0';
-
-	if (cgetstr(buf, "ty", &cq) > 0) {
-		if (strcmp(cq, "removable") == 0)
-			dp->d_flags |= D_REMOVABLE;
-		else  if (cq && strcmp(cq, "simulated") == 0)
-			dp->d_flags |= D_RAMDISK;
-		free(cq);
-	}
-	if (cgetcap(buf, "sf", ':') != NULL)
-		dp->d_flags |= D_BADSECT;
-
-#define getnumdflt(field, dname, dflt) \
-        { long f; (field) = (cgetnum(buf, dname, &f) == -1) ? (dflt) : f; }
-
-	getnumdflt(dp->d_secsize, "se", DEV_BSIZE);
-	getnumdflt(dp->d_ntracks, "nt", 0);
-	getnumdflt(dp->d_nsectors, "ns", 0);
-	getnumdflt(dp->d_ncylinders, "nc", 0);
-
-	if (cgetstr(buf, "dt", &cq) > 0) {
-		dp->d_type = gettype(cq, dktypenames);
-		free(cq);
-	} else
-		getnumdflt(dp->d_type, "dt", 0);
-	getnumdflt(dp->d_secpercyl, "sc", dp->d_nsectors * dp->d_ntracks);
-	getnumdflt(dp->d_secperunit, "su", dp->d_secpercyl * dp->d_ncylinders);
-	getnumdflt(dp->d_rpm, "rm", 3600);
-	getnumdflt(dp->d_interleave, "il", 1);
-	getnumdflt(dp->d_trackskew, "sk", 0);
-	getnumdflt(dp->d_cylskew, "cs", 0);
-	getnumdflt(dp->d_headswitch, "hs", 0);
-	getnumdflt(dp->d_trkseek, "ts", 0);
-	getnumdflt(dp->d_bbsize, "bs", BBSIZE);
-	getnumdflt(dp->d_sbsize, "sb", 0);
-	strcpy(psize, "px");
-	strcpy(pbsize, "bx");
-	strcpy(pfsize, "fx");
-	strcpy(poffset, "ox");
-	strcpy(ptype, "tx");
-	max = 'a' - 1;
-	pp = &dp->d_partitions[0];
-	for (p = 'a'; p < 'a' + MAXPARTITIONS; p++, pp++) {
-		long l;
-		psize[1] = pbsize[1] = pfsize[1] = poffset[1] = ptype[1] = p;
-		if (cgetnum(buf, psize, &l) == -1)
-			pp->p_size = 0;
-		else {
-			pp->p_size = l;
-			cgetnum(buf, poffset, &l);
-			pp->p_offset = l;
-			getnumdflt(pp->p_fsize, pfsize, 0);
-			if (pp->p_fsize) {
-				long bsize;
-
-				if (cgetnum(buf, pbsize, &bsize) == 0)
-					pp->p_frag = bsize / pp->p_fsize;
-				else
-					pp->p_frag = 8;
-			}
-			getnumdflt(pp->p_fstype, ptype, 0);
-			if (pp->p_fstype == 0)
-				if (cgetstr(buf, ptype, &cq) >= 0) {
-					pp->p_fstype = gettype(cq, fstypenames);
-					free(cq);
-				}
-			max = p;
-		}
-	}
-	dp->d_npartitions = max + 1 - 'a';
-	(void)strcpy(psize, "dx");
-	dx = dp->d_drivedata;
-	for (p = '0'; p < '0' + NDDATA; p++, dx++) {
-		psize[1] = p;
-		getnumdflt(*dx, psize, 0);
-	}
-	dp->d_magic = DISKMAGIC;
-	dp->d_magic2 = DISKMAGIC;
-	free(buf);
-	return (dp);
-}
diff --git a/lib/libc_bsd/gen/dl_iterate_phdr.3 b/lib/libc_bsd/gen/dl_iterate_phdr.3
deleted file mode 100644
index 9c44cf8..0000000
--- a/lib/libc_bsd/gen/dl_iterate_phdr.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\" Copyright (c) 2005 Mark Kettenis
-.\" Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\"   $OpenBSD: dl_iterate_phdr.3,v 1.3 2007/05/31 19:19:48 jmc Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/gen/dl_iterate_phdr.3 274531 2014-11-14 21:52:31Z emaste $
-.Dd October 9, 2014
-.Dt DL_ITERATE_PHDR 3
-.Os
-.Sh NAME
-.Nm dl_iterate_phdr
-.Nd iterate over program headers
-.Sh LIBRARY
-For the dynamically linked binaries, the service is provided by
-.Xr ld-elf.so.1 1
-dynamic linker.
-Statically linked programs use an implementation of
-.Fn dl_iterate_phdr
-from libc.
-.Sh SYNOPSIS
-.In link.h
-.Ft int
-.Fn dl_iterate_phdr "int (*callback)(struct dl_phdr_info *, size_t, void *)" "void *data"
-.Sh DESCRIPTION
-The
-.Fn dl_iterate_phdr
-function iterates over all ELF objects loaded into a process's
-address space, calling
-.Fa callback
-for each object, passing it information about the object's
-program headers and the
-.Fa data
-argument.
-The iteration is aborted when all objects are passed, or when the next
-.Fa callback
-call returns non-zero value.
-The information about the program headers is passed in a structure
-that is defined as:
-.Bd -literal
-struct dl_phdr_info {
-	Elf_Addr	dlpi_addr;
-	const char	*dlpi_name;
-	const Elf_Phdr	*dlpi_phdr;
-	Elf_Half	dlpi_phnum;
-	unsigned long long int dlpi_adds;
-	unsigned long long int dlpi_subs;
-	size_t		dlpi_tls_modid;
-	void		*dlpi_tls_data;
-};
-.Ed
-.Pp
-The members of
-.Li struct dl_phdr_info
-have the following meaning:
-.Bl -tag -width dlpi_tls_modid
-.It Fa dlpi_addr
-The base address at which the object is mapped into the address
-space of the calling process.
-.It Fa dlpi_name
-The pathname of the ELF object.
-.It Fa dlpi_phdr
-A pointer to the object's program headers.
-.It Fa dlpi_phnum
-The number of program headers in the object.
-.It Fa dlpi_adds
-The counter of the object loads performed by the dynamic linker.
-.It Fa dlpi_subs
-The counter of the object unloads performed by the dynamic linker.
-.It Fa dlpi_tls_modid
-The TLS index of the object.
-.It Fa dlpi_tls_data
-A pointer to the initialization data for the object TLS segment.
-.El
-.Pp
-Future versions of
-.Fx
-might add more members to this structure.
-To make it possible for programs to check whether any new members have
-been added, the size of the structure is passed as an second argument to
-.Fa callback .
-.Pp
-The third argument to callback is the
-.Fa data
-value passed to the call to
-.Fn dl_iterate_phdr ,
-allowing the
-.Fa callback
-to have a context.
-.Sh RETURN VALUES
-The
-.Fn dl_iterate_phdr
-returns the value returned by the last
-.Fa callback
-call executed.
-.Sh SEE ALSO
-.Xr ld 1 ,
-.Xr ld-elf.so.1 1 ,
-.Xr dlopen 3 ,
-.Xr elf 5
-.Sh HISTORY
-The
-.Nm
-function first appeared in
-.Fx 7.0 .
diff --git a/lib/libc_bsd/gen/dladdr.3 b/lib/libc_bsd/gen/dladdr.3
deleted file mode 100644
index 1588f78..0000000
--- a/lib/libc_bsd/gen/dladdr.3
+++ /dev/null
@@ -1,133 +0,0 @@
-.\"
-.\" Copyright (c) 1998 John D. Polstra
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/dladdr.3 206622 2010-04-14 19:08:06Z uqs $
-.\"
-.Dd February 5, 1998
-.Dt DLADDR 3
-.Os
-.Sh NAME
-.Nm dladdr
-.Nd find the shared object containing a given address
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In dlfcn.h
-.Ft int
-.Fn dladdr "const void *addr" "Dl_info *info"
-.Sh DESCRIPTION
-The
-.Fn dladdr
-function
-queries the dynamic linker for information about the shared object
-containing the address
-.Fa addr .
-The information is returned in the structure specified by
-.Fa info .
-The structure contains at least the following members:
-.Bl -tag -width "XXXconst char *dli_fname"
-.It Li "const char *dli_fname"
-The pathname of the shared object containing the address.
-.It Li "void *dli_fbase"
-The base address at which the shared object is mapped into the
-address space of the calling process.
-.It Li "const char *dli_sname"
-The name of the nearest run-time symbol with a value less than or
-equal to
-.Fa addr .
-When possible, the symbol name is returned as it would appear in C
-source code.
-.Pp
-If no symbol with a suitable value is found, both this field and
-.Va dli_saddr
-are set to
-.Dv NULL .
-.It Li "void *dli_saddr"
-The value of the symbol returned in
-.Li dli_sname .
-.El
-.Pp
-The
-.Fn dladdr
-function
-is available only in dynamically linked programs.
-.Sh ERRORS
-If a mapped shared object containing
-.Fa addr
-cannot be found,
-.Fn dladdr
-returns 0.
-In that case, a message detailing the failure can be retrieved by
-calling
-.Fn dlerror .
-.Pp
-On success, a non-zero value is returned.
-.Sh SEE ALSO
-.Xr rtld 1 ,
-.Xr dlopen 3
-.Sh HISTORY
-The
-.Fn dladdr
-function first appeared in the Solaris operating system.
-.Sh BUGS
-This implementation is bug-compatible with the Solaris
-implementation.
-In particular, the following bugs are present:
-.Bl -bullet
-.It
-If
-.Fa addr
-lies in the main executable rather than in a shared library, the
-pathname returned in
-.Va dli_fname
-may not be correct.
-The pathname is taken directly from
-.Va argv[0]
-of the calling process.
-When executing a program specified by its
-full pathname, most shells set
-.Va argv[0]
-to the pathname.
-But this is not required of shells or guaranteed
-by the operating system.
-.It
-If
-.Fa addr
-is of the form
-.Va &func ,
-where
-.Va func
-is a global function, its value may be an unpleasant surprise.
-In
-dynamically linked programs, the address of a global function is
-considered to point to its program linkage table entry, rather than to
-the entry point of the function itself.
-This causes most global
-functions to appear to be defined within the main executable, rather
-than in the shared libraries where the actual code resides.
-.It
-Returning 0 as an indication of failure goes against long-standing
-Unix tradition.
-.El
diff --git a/lib/libc_bsd/gen/dlfcn.c b/lib/libc_bsd/gen/dlfcn.c
deleted file mode 100644
index 544b270..0000000
--- a/lib/libc_bsd/gen/dlfcn.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*-
- * Copyright (c) 1998 John D. Polstra
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/dlfcn.c 283597 2015-05-27 08:23:23Z kib $");
-
-/*
- * Linkage to services provided by the dynamic linker.
- */
-#include <sys/mman.h>
-#include <dlfcn.h>
-#include <link.h>
-#include <stddef.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-static char sorry[] = "Service unavailable";
-
-/*
- * For ELF, the dynamic linker directly resolves references to its
- * services to functions inside the dynamic linker itself.  These
- * weak-symbol stubs are necessary so that "ld" won't complain about
- * undefined symbols.  The stubs are executed only when the program is
- * linked statically, or when a given service isn't implemented in the
- * dynamic linker.  They must return an error if called, and they must
- * be weak symbols so that the dynamic linker can override them.
- */
-
-#pragma weak _rtld_error
-void
-_rtld_error(const char *fmt, ...)
-{
-}
-
-#pragma weak dladdr
-int
-dladdr(const void *addr, Dl_info *dlip)
-{
-	_rtld_error(sorry);
-	return 0;
-}
-
-#pragma weak dlclose
-int
-dlclose(void *handle)
-{
-	_rtld_error(sorry);
-	return -1;
-}
-
-#pragma weak dlerror
-char *
-dlerror(void)
-{
-	return sorry;
-}
-
-#pragma weak dllockinit
-void
-dllockinit(void *context,
-	   void *(*lock_create)(void *context),
-	   void (*rlock_acquire)(void *lock),
-	   void (*wlock_acquire)(void *lock),
-	   void (*lock_release)(void *lock),
-	   void (*lock_destroy)(void *lock),
-	   void (*context_destroy)(void *context))
-{
-	if (context_destroy != NULL)
-		context_destroy(context);
-}
-
-#pragma weak dlopen
-void *
-dlopen(const char *name, int mode)
-{
-	_rtld_error(sorry);
-	return NULL;
-}
-
-#pragma weak dlsym
-void *
-dlsym(void * __restrict handle, const char * __restrict name)
-{
-	_rtld_error(sorry);
-	return NULL;
-}
-
-#pragma weak dlfunc
-dlfunc_t
-dlfunc(void * __restrict handle, const char * __restrict name)
-{
-	_rtld_error(sorry);
-	return NULL;
-}
-
-#pragma weak dlvsym
-void *
-dlvsym(void * __restrict handle, const char * __restrict name,
-    const char * __restrict version)
-{
-	_rtld_error(sorry);
-	return NULL;
-}
-
-#pragma weak dlinfo
-int
-dlinfo(void * __restrict handle, int request, void * __restrict p)
-{
-	_rtld_error(sorry);
-	return 0;
-}
-
-#pragma weak _rtld_thread_init
-void
-_rtld_thread_init(void * li)
-{
-	_rtld_error(sorry);
-}
-
-static pthread_once_t dl_phdr_info_once = PTHREAD_ONCE_INIT;
-static struct dl_phdr_info phdr_info;
-
-static void
-dl_init_phdr_info(void)
-{
-	Elf_Auxinfo *auxp;
-	unsigned int i;
-
-	for (auxp = __elf_aux_vector; auxp->a_type != AT_NULL; auxp++) {
-		switch (auxp->a_type) {
-		case AT_BASE:
-			phdr_info.dlpi_addr = (Elf_Addr)auxp->a_un.a_ptr;
-			break;
-		case AT_EXECPATH:
-			phdr_info.dlpi_name = (const char *)auxp->a_un.a_ptr;
-			break;
-		case AT_PHDR:
-			phdr_info.dlpi_phdr =
-			    (const Elf_Phdr *)auxp->a_un.a_ptr;
-			break;
-		case AT_PHNUM:
-			phdr_info.dlpi_phnum = (Elf_Half)auxp->a_un.a_val;
-			break;
-		}
-	}
-	for (i = 0; i < phdr_info.dlpi_phnum; i++) {
-		if (phdr_info.dlpi_phdr[i].p_type == PT_TLS) {
-			phdr_info.dlpi_tls_modid = 1;
-			phdr_info.dlpi_tls_data =
-			    (void*)phdr_info.dlpi_phdr[i].p_vaddr;
-		}
-	}
-	phdr_info.dlpi_adds = 1;
-}
-
-#pragma weak dl_iterate_phdr
-int
-dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *),
-    void *data)
-{
-
-	__init_elf_aux_vector();
-	if (__elf_aux_vector == NULL)
-		return (1);
-	_once(&dl_phdr_info_once, dl_init_phdr_info);
-	return (callback(&phdr_info, sizeof(phdr_info), data));
-}
-
-#pragma weak fdlopen
-void *
-fdlopen(int fd, int mode)
-{
-
-	_rtld_error(sorry);
-	return NULL;
-}
-
-#pragma weak _rtld_atfork_pre
-void
-_rtld_atfork_pre(int *locks)
-{
-}
-
-#pragma weak _rtld_atfork_post
-void
-_rtld_atfork_post(int *locks)
-{
-}
-
-#pragma weak _rtld_addr_phdr
-int
-_rtld_addr_phdr(const void *addr, struct dl_phdr_info *phdr_info)
-{
-
-	return (0);
-}
-
-#pragma weak _rtld_get_stack_prot
-int
-_rtld_get_stack_prot(void)
-{
-
-	return (PROT_EXEC | PROT_READ | PROT_WRITE);
-}
-
-#pragma weak _rtld_is_dlopened
-int
-_rtld_is_dlopened(void *arg)
-{
-
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/dlinfo.3 b/lib/libc_bsd/gen/dlinfo.3
deleted file mode 100644
index d334d65..0000000
--- a/lib/libc_bsd/gen/dlinfo.3
+++ /dev/null
@@ -1,282 +0,0 @@
-.\"
-.\" Copyright (c) 2003 Alexey Zelkin <phantom@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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/dlinfo.3 206622 2010-04-14 19:08:06Z uqs $
-.\"
-.Dd February 14, 2003
-.Dt DLINFO 3
-.Os
-.Sh NAME
-.Nm dlinfo
-.Nd information about dynamically loaded object
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In link.h
-.In dlfcn.h
-.Ft int
-.Fn dlinfo "void * restrict handle" "int request" "void * restrict p"
-.Sh DESCRIPTION
-The
-.Fn dlinfo
-function provides information about dynamically loaded object.
-The action taken by
-.Fn dlinfo
-and exact meaning and type of
-.Fa p
-argument depend on value of the
-.Fa request
-argument provided by caller.
-.Pp
-The
-.Fa handle
-argument is either the value returned from the
-.Xr dlopen 3
-function call or special handle
-.Dv RTLD_SELF .
-If
-.Fa handle
-is the value returned from
-.Xr dlopen 3 ,
-the information returned by the
-.Fn dlinfo
-function pertains to the specified object.
-If handle is the special handle
-.Dv RTLD_SELF ,
-the information returned pertains to the caller itself.
-.Pp
-Possible values for the
-.Fa request
-argument are:
-.Bl -tag -width indent
-.It Dv RTLD_DI_LINKMAP
-Retrieve the
-.Vt Link_map
-.Pq Vt "struct link_map"
-structure pointer for the specified
-.Fa handle .
-On successful return, the
-.Fa p
-argument is filled with the pointer to the
-.Vt Link_map
-structure
-.Pq Fa "Link_map **p"
-describing a shared object specified by the
-.Fa handle
-argument.
-The
-.Vt Link_map
-structures are maintained as a doubly linked list by
-.Xr ld.so 1 ,
-in the same order as
-.Xr dlopen 3
-and
-.Xr dlclose 3
-are called.
-See
-.Sx EXAMPLES ,
-example 1.
-.Pp
-The
-.Vt Link_map
-structure is defined in
-.In link.h
-and has the following members:
-.Bd -literal -offset indent
-caddr_t         l_addr;    /* Base Address of library */
-const char      *l_name;   /* Absolute Path to Library */
-const void      *l_ld;     /* Pointer to .dynamic in memory */
-struct link_map *l_next,   /* linked list of mapped libs */
-                *l_prev;
-.Ed
-.Bl -tag -width ".Va l_addr"
-.It Va l_addr
-The base address of the object loaded into memory.
-.It Va l_name
-The full name of the loaded shared object.
-.It Va l_ld
-The address of the dynamic linking information segment
-.Pq Dv PT_DYNAMIC
-loaded into memory.
-.It Va l_next
-The next
-.Vt Link_map
-structure on the link-map list.
-.It Va l_prev
-The previous
-.Vt Link_map
-structure on the link-map list.
-.El
-.It Dv RTLD_DI_SERINFO
-Retrieve the library search paths associated with the given
-.Fa handle
-argument.
-The
-.Fa p
-argument should point to
-.Vt Dl_serinfo
-structure buffer
-.Pq Fa "Dl_serinfo *p" .
-The
-.Vt Dl_serinfo
-structure must be initialized first with the
-.Dv RTLD_DI_SERINFOSIZE
-request.
-.Pp
-The returned
-.Vt Dl_serinfo
-structure contains
-.Va dls_cnt
-.Vt Dl_serpath
-entries.
-Each entry's
-.Va dlp_name
-field points to the search path.
-The corresponding
-.Va dlp_info
-field contains one of more flags indicating the origin of the path (see the
-.Dv LA_SER_*
-flags defined in the
-.In link.h
-header file).
-See
-.Sx EXAMPLES ,
-example 2, for a usage example.
-.It Dv RTLD_DI_SERINFOSIZE
-Initialize a
-.Vt Dl_serinfo
-structure for use in a
-.Dv RTLD_DI_SERINFO
-request.
-Both the
-.Va dls_cnt
-and
-.Va dls_size
-fields are returned to indicate the number of search paths applicable
-to the handle, and the total size of a
-.Vt Dl_serinfo
-buffer required to hold
-.Va dls_cnt
-.Vt Dl_serpath
-entries and the associated search path strings.
-See
-.Sx EXAMPLES ,
-example 2, for a usage example.
-.It Va RTLD_DI_ORIGIN
-Retrieve the origin of the dynamic object associated with the handle.
-On successful return,
-.Fa p
-argument is filled with the
-.Vt char
-pointer
-.Pq Fa "char *p" .
-.El
-.Sh RETURN VALUES
-The
-.Fn dlinfo
-function returns 0 on success, or \-1 if an error occurred.
-Whenever an error has been detected, a message detailing it can
-be retrieved via a call to
-.Xr dlerror 3 .
-.Sh EXAMPLES
-Example 1: Using
-.Fn dlinfo
-to retrieve
-.Vt Link_map
-structure.
-.Pp
-The following example shows how dynamic library can detect the list
-of shared libraries loaded after caller's one.
-For simplicity, error checking has been omitted.
-.Bd -literal -offset indent
-Link_map *map;
-
-dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map);
-
-while (map != NULL) {
-	printf("%p: %s\\n", map->l_addr, map->l_name);
-	map = map->l_next;
-}
-.Ed
-.Pp
-Example 2: Using
-.Fn dlinfo
-to retrieve the library search paths.
-.Pp
-The following example shows how a dynamic object can inspect the library
-search paths that would be used to locate a simple filename with
-.Xr dlopen 3 .
-For simplicity, error checking has been omitted.
-.Bd -literal -offset indent
-Dl_serinfo	 _info, *info = &_info;
-Dl_serpath	*path;
-unsigned int	 cnt;
-
-/* determine search path count and required buffer size */
-dlinfo(RTLD_SELF, RTLD_DI_SERINFOSIZE, (void *)info);
-
-/* allocate new buffer and initialize */
-info = malloc(_info.dls_size);
-info->dls_size = _info.dls_size;
-info->dls_cnt = _info.dls_cnt;
-
-/* obtain sarch path information */
-dlinfo(RTLD_SELF, RTLD_DI_SERINFO, (void *)info);
-
-path = &info->dls_serpath[0];
-
-for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) {
-	(void) printf("%2d: %s\\n", cnt, path->dls_name);
-}
-.Ed
-.Sh SEE ALSO
-.Xr rtld 1 ,
-.Xr dladdr 3 ,
-.Xr dlopen 3 ,
-.Xr dlsym 3
-.Sh HISTORY
-The
-.Fn dlinfo
-function first appeared in the Solaris operating system.
-In
-.Fx ,
-it first appeared in
-.Fx 4.8 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Fx
-implementation of the
-.Fn dlinfo
-function was originally written by
-.An Alexey Zelkin
-.Aq phantom@FreeBSD.org
-and later extended and improved by
-.An Alexander Kabaev
-.Aq kan@FreeBSD.org .
-.Pp
-The manual page for this function was written by
-.An Alexey Zelkin
-.Aq phantom@FreeBSD.org .
diff --git a/lib/libc_bsd/gen/dllockinit.3 b/lib/libc_bsd/gen/dllockinit.3
deleted file mode 100644
index 3ae54c6..0000000
--- a/lib/libc_bsd/gen/dllockinit.3
+++ /dev/null
@@ -1,127 +0,0 @@
-.\"
-.\" Copyright (c) 1999, 2000 John D. Polstra
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/dllockinit.3 206622 2010-04-14 19:08:06Z uqs $
-.\"
-.Dd July 5, 2000
-.Dt DLLOCKINIT 3
-.Os
-.Sh NAME
-.Nm dllockinit
-.Nd register thread locking methods with the dynamic linker
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In dlfcn.h
-.Ft void
-.Fn dllockinit "void *context" "void *(*lock_create)(void *context)" "void (*rlock_acquire)(void *lock)" "void (*wlock_acquire)(void *lock)" "void (*lock_release)(void *lock)" "void (*lock_destroy)(void *lock)" "void (*context_destroy)(void *context)"
-.Sh DESCRIPTION
-.Bf Sy
-Due to enhancements in the dynamic linker, this interface is no longer
-needed.
-It is deprecated and will be removed from future releases.
-In current releases it still exists, but only as a stub which does nothing.
-.Ef
-.Pp
-Threads packages can call
-.Fn dllockinit
-at initialization time to register locking functions for the dynamic
-linker to use.
-This enables the dynamic linker to prevent multiple
-threads from entering its critical sections simultaneously.
-.Pp
-The
-.Fa context
-argument specifies an opaque context for creating locks.
-The
-dynamic linker will pass it to the
-.Fa lock_create
-function when creating the locks it needs.
-When the dynamic linker
-is permanently finished using the locking functions (e.g., if the
-program makes a subsequent call to
-.Fn dllockinit
-to register new locking functions) it will call
-.Fa context_destroy
-to destroy the context.
-.Pp
-The
-.Fa lock_create
-argument specifies a function for creating a read/write lock.
-It
-must return a pointer to the new lock.
-.Pp
-The
-.Fa rlock_acquire
-and
-.Fa wlock_acquire
-arguments specify functions which lock a lock for reading or
-writing, respectively.
-The
-.Fa lock_release
-argument specifies a function which unlocks a lock.
-Each of these
-functions is passed a pointer to the lock.
-.Pp
-The
-.Fa lock_destroy
-argument specifies a function to destroy a lock.
-It may be
-.Dv NULL
-if locks do not need to be destroyed.
-The
-.Fa context_destroy
-argument specifies a function to destroy the context.
-It may be
-.Dv NULL
-if the context does not need to be destroyed.
-.Pp
-Until
-.Fn dllockinit
-is called, the dynamic linker protects its critical sections using
-a default locking mechanism which works by blocking the
-.Dv SIGVTALRM ,
-.Dv SIGPROF ,
-and
-.Dv SIGALRM
-signals.
-This is sufficient for many application level threads
-packages, which typically use one of these signals to implement
-preemption.
-An application which has registered its own locking
-methods with
-.Fn dllockinit
-can restore the default locking by calling
-.Fn dllockinit
-with all arguments
-.Dv NULL .
-.Sh SEE ALSO
-.Xr rtld 1 ,
-.Xr signal 3
-.Sh HISTORY
-The
-.Fn dllockinit
-function first appeared in
-.Fx 4.0 .
diff --git a/lib/libc_bsd/gen/dlopen.3 b/lib/libc_bsd/gen/dlopen.3
deleted file mode 100644
index 901d752..0000000
--- a/lib/libc_bsd/gen/dlopen.3
+++ /dev/null
@@ -1,408 +0,0 @@
-.\" This source code is a product of Sun Microsystems, Inc. and is provided
-.\" for unrestricted use provided that this legend is included on all tape
-.\" media and as a part of the software program in whole or part.  Users
-.\" may copy or modify this source code without charge, but are not authorized
-.\" to license or distribute it to anyone else except as part of a product or
-.\" program developed by the user.
-.\"
-.\" THIS PROGRAM CONTAINS SOURCE CODE COPYRIGHTED BY SUN MICROSYSTEMS, INC.
-.\" SUN MICROSYSTEMS, INC., MAKES NO REPRESENTATIONS ABOUT THE SUITABLITY
-.\" OF SUCH SOURCE CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT
-.\" EXPRESS OR IMPLIED WARRANTY OF ANY KIND.  SUN MICROSYSTEMS, INC. DISCLAIMS
-.\" ALL WARRANTIES WITH REGARD TO SUCH SOURCE CODE, INCLUDING ALL IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  IN
-.\" NO EVENT SHALL SUN MICROSYSTEMS, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT,
-.\" INCIDENTAL, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
-.\" FROM USE OF SUCH SOURCE CODE, REGARDLESS OF THE THEORY OF LIABILITY.
-.\"
-.\" This source code is provided with no support and without any obligation on
-.\" the part of Sun Microsystems, Inc. to assist in its use, correction,
-.\" modification or enhancement.
-.\"
-.\" SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
-.\" INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY THIS
-.\" SOURCE CODE OR ANY PART THEREOF.
-.\"
-.\" Sun Microsystems, Inc.
-.\" 2550 Garcia Avenue
-.\" Mountain View, California 94043
-.\"
-.\" Copyright (c) 1991 Sun Microsystems, Inc.
-.\"
-.\" @(#) dlopen.3 1.6 90/01/31 SMI
-.\" $FreeBSD: releng/10.2/lib/libc/gen/dlopen.3 229768 2012-01-07 10:33:01Z kib $
-.\"
-.Dd December 21, 2011
-.Dt DLOPEN 3
-.Os
-.Sh NAME
-.Nm dlopen ,
-.Nm fdlopen ,
-.Nm dlsym ,
-.Nm dlfunc ,
-.Nm dlerror ,
-.Nm dlclose
-.Nd programmatic interface to the dynamic linker
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In dlfcn.h
-.Ft void *
-.Fn dlopen "const char *path" "int mode"
-.Ft void *
-.Fn fdlopen "int fd" "int mode"
-.Ft void *
-.Fn dlsym "void * restrict handle" "const char * restrict symbol"
-.Ft dlfunc_t
-.Fn dlfunc "void * restrict handle" "const char * restrict symbol"
-.Ft char *
-.Fn dlerror "void"
-.Ft int
-.Fn dlclose "void *handle"
-.Sh DESCRIPTION
-These functions provide a simple programmatic interface to the services of the
-dynamic linker.
-Operations are provided to add new shared objects to a
-program's address space, to obtain the address bindings of symbols
-defined by such
-objects, and to remove such objects when their use is no longer required.
-.Pp
-The
-.Fn dlopen
-function
-provides access to the shared object in
-.Fa path ,
-returning a descriptor that can be used for later
-references to the object in calls to
-.Fn dlsym
-and
-.Fn dlclose .
-If
-.Fa path
-was not in the address space prior to the call to
-.Fn dlopen ,
-it is placed in the address space.
-When an object is first loaded into the address space in this way, its
-function
-.Fn _init ,
-if any, is called by the dynamic linker.
-If
-.Fa path
-has already been placed in the address space in a previous call to
-.Fn dlopen ,
-it is not added a second time, although a reference count of
-.Fn dlopen
-operations on
-.Fa path
-is maintained.
-A null pointer supplied for
-.Fa path
-is interpreted as a reference to the main
-executable of the process.
-The
-.Fa mode
-argument
-controls the way in which external function references from the
-loaded object are bound to their referents.
-It must contain one of the following values, possibly ORed with
-additional flags which will be described subsequently:
-.Bl -tag -width RTLD_LAZYX
-.It Dv RTLD_LAZY
-Each external function reference is resolved when the function is first
-called.
-.It Dv RTLD_NOW
-All external function references are bound immediately by
-.Fn dlopen .
-.El
-.Pp
-.Dv RTLD_LAZY
-is normally preferred, for reasons of efficiency.
-However,
-.Dv RTLD_NOW
-is useful to ensure that any undefined symbols are discovered during the
-call to
-.Fn dlopen .
-.Pp
-One of the following flags may be ORed into the
-.Fa mode
-argument:
-.Bl -tag -width RTLD_NODELETE
-.It Dv RTLD_GLOBAL
-Symbols from this shared object and its directed acyclic graph (DAG)
-of needed objects will be available for resolving undefined references
-from all other shared objects.
-.It Dv RTLD_LOCAL
-Symbols in this shared object and its DAG of needed objects will be
-available for resolving undefined references only from other objects
-in the same DAG.
-This is the default, but it may be specified
-explicitly with this flag.
-.It Dv RTLD_TRACE
-When set, causes dynamic linker to exit after loading all objects
-needed by this shared object and printing a summary which includes
-the absolute pathnames of all objects, to standard output.
-With this flag
-.Fn dlopen
-will return to the caller only in the case of error.
-.It Dv RTLD_NODELETE
-Prevents unload of the loaded object on
-.Fn dlclose .
-The same behaviour may be requested by
-.Fl "z nodelete"
-option of the static linker
-.Xr ld 1 .
-.It Dv RTLD_NOLOAD
-Only return valid handle for the object if it is already loaded in
-the process address space, otherwise
-.Dv NULL
-is returned.
-Other mode flags may be specified, which will be applied for promotion
-for the found object.
-.El
-.Pp
-If
-.Fn dlopen
-fails, it returns a null pointer, and sets an error condition which may
-be interrogated with
-.Fn dlerror .
-.Pp
-The
-.Fn fdlopen
-function is similar to
-.Fn dlopen ,
-but it takes the file descriptor argument
-.Fa fd ,
-which is used for the file operations needed to load an object
-into the address space.
-The file descriptor
-.Fa fd
-is not closed by the function regardless a result of execution,
-but a duplicate of the file descriptor is.
-This may be important if a
-.Xr lockf 3
-lock is held on the passed descriptor.
-The
-.Fa fd
-argument -1 is interpreted as a reference to the main
-executable of the process, similar to
-.Va NULL
-value for the
-.Fa name
-argument to
-.Fn dlopen .
-The
-.Fn fdlopen
-function can be used by the code that needs to perform
-additional checks on the loaded objects, to prevent races with
-symlinking or renames.
-.Pp
-The
-.Fn dlsym
-function
-returns the address binding of the symbol described in the null-terminated
-character string
-.Fa symbol ,
-as it occurs in the shared object identified by
-.Fa handle .
-The symbols exported by objects added to the address space by
-.Fn dlopen
-can be accessed only through calls to
-.Fn dlsym .
-Such symbols do not supersede any definition of those symbols already present
-in the address space when the object is loaded, nor are they available to
-satisfy normal dynamic linking references.
-.Pp
-If
-.Fn dlsym
-is called with the special
-.Fa handle
-.Dv NULL ,
-it is interpreted as a reference to the executable or shared object
-from which the call
-is being made.
-Thus a shared object can reference its own symbols.
-.Pp
-If
-.Fn dlsym
-is called with the special
-.Fa handle
-.Dv RTLD_DEFAULT ,
-the search for the symbol follows the algorithm used for resolving
-undefined symbols when objects are loaded.
-The objects searched are
-as follows, in the given order:
-.Bl -enum
-.It
-The referencing object itself (or the object from which the call to
-.Fn dlsym
-is made), if that object was linked using the
-.Fl Wsymbolic
-option to
-.Xr ld 1 .
-.It
-All objects loaded at program start-up.
-.It
-All objects loaded via
-.Fn dlopen
-with the
-.Dv RTLD_GLOBAL
-flag set in the
-.Fa mode
-argument.
-.It
-All objects loaded via
-.Fn dlopen
-which are in needed-object DAGs that also contain the referencing object.
-.El
-.Pp
-If
-.Fn dlsym
-is called with the special
-.Fa handle
-.Dv RTLD_NEXT ,
-then the search for the symbol is limited to the shared objects
-which were loaded after the one issuing the call to
-.Fn dlsym .
-Thus, if the function is called from the main program, all
-the shared libraries are searched.
-If it is called from a shared library, all subsequent shared
-libraries are searched.
-.Dv RTLD_NEXT
-is useful for implementing wrappers around library functions.
-For example, a wrapper function
-.Fn getpid
-could access the
-.Dq real
-.Fn getpid
-with
-.Li dlsym(RTLD_NEXT, \&"getpid\&") .
-(Actually, the
-.Fn dlfunc
-interface, below, should be used, since
-.Fn getpid
-is a function and not a data object.)
-.Pp
-If
-.Fn dlsym
-is called with the special
-.Fa handle
-.Dv RTLD_SELF ,
-then the search for the symbol is limited to the shared object
-issuing the call to
-.Fn dlsym
-and those shared objects which were loaded after it.
-.Pp
-The
-.Fn dlsym
-function
-returns a null pointer if the symbol cannot be found, and sets an error
-condition which may be queried with
-.Fn dlerror .
-.Pp
-The
-.Fn dlfunc
-function
-implements all of the behavior of
-.Fn dlsym ,
-but has a return type which can be cast to a function pointer without
-triggering compiler diagnostics.
-(The
-.Fn dlsym
-function
-returns a data pointer; in the C standard, conversions between
-data and function pointer types are undefined.
-Some compilers and
-.Xr lint 1
-utilities warn about such casts.)
-The precise return type of
-.Fn dlfunc
-is unspecified; applications must cast it to an appropriate function pointer
-type.
-.Pp
-The
-.Fn dlerror
-function
-returns a null-terminated character string describing the last error that
-occurred during a call to
-.Fn dlopen ,
-.Fn dladdr ,
-.Fn dlinfo ,
-.Fn dlsym ,
-.Fn dlfunc ,
-or
-.Fn dlclose .
-If no such error has occurred,
-.Fn dlerror
-returns a null pointer.
-At each call to
-.Fn dlerror ,
-the error indication is reset.
-Thus in the case of two calls
-to
-.Fn dlerror ,
-where the second call follows the first immediately, the second call
-will always return a null pointer.
-.Pp
-The
-.Fn dlclose
-function
-deletes a reference to the shared object referenced by
-.Fa handle .
-If the reference count drops to 0, the object is removed from the
-address space, and
-.Fa handle
-is rendered invalid.
-Just before removing a shared object in this way, the dynamic linker
-calls the object's
-.Fn _fini
-function, if such a function is defined by the object.
-If
-.Fn dlclose
-is successful, it returns a value of 0.
-Otherwise it returns -1, and sets an error condition that can be
-interrogated with
-.Fn dlerror .
-.Pp
-The object-intrinsic functions
-.Fn _init
-and
-.Fn _fini
-are called with no arguments, and are not expected to return values.
-.Sh NOTES
-ELF executables need to be linked
-using the
-.Fl export-dynamic
-option to
-.Xr ld 1
-for symbols defined in the executable to become visible to
-.Fn dlsym .
-.Pp
-In previous implementations, it was necessary to prepend an underscore
-to all external symbols in order to gain symbol
-compatibility with object code compiled from the C language.
-This is
-still the case when using the (obsolete)
-.Fl aout
-option to the C language compiler.
-.Sh ERRORS
-The
-.Fn dlopen ,
-.Fn fdlopen ,
-.Fn dlsym ,
-and
-.Fn dlfunc
-functions
-return a null pointer in the event of errors.
-The
-.Fn dlclose
-function
-returns 0 on success, or -1 if an error occurred.
-Whenever an error has been detected, a message detailing it can be
-retrieved via a call to
-.Fn dlerror .
-.Sh SEE ALSO
-.Xr ld 1 ,
-.Xr rtld 1 ,
-.Xr dladdr 3 ,
-.Xr dlinfo 3 ,
-.Xr link 5
diff --git a/lib/libc_bsd/gen/drand48.c b/lib/libc_bsd/gen/drand48.c
deleted file mode 100644
index a02c7b5..0000000
--- a/lib/libc_bsd/gen/drand48.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/drand48.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-
-double
-drand48(void)
-{
-	return erand48(_rand48_seed);
-}
diff --git a/lib/libc_bsd/gen/dup3.3 b/lib/libc_bsd/gen/dup3.3
deleted file mode 100644
index facb4a8..0000000
--- a/lib/libc_bsd/gen/dup3.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\" Copyright (c) 2013 Jilles Tjoelker
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/dup3.3 254488 2013-08-18 13:25:18Z jilles $
-.\"
-.Dd August 16, 2013
-.Dt DUP3 3
-.Os
-.Sh NAME
-.Nm dup3
-.Nd duplicate an existing file descriptor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.In unistd.h
-.Ft int
-.Fn dup3 "int oldd" "int newd" "int flags"
-.Sh DESCRIPTION
-The
-.Fn dup3
-function
-duplicates an existing object descriptor
-while allowing the value of the new descriptor to be specified.
-.Pp
-The close-on-exec flag on the new file descriptor is determined by the
-.Dv O_CLOEXEC
-bit in
-.Fa flags .
-.Pp
-If
-.Fa oldd
-\*(Ne
-.Fa newd
-and
-.Fa flags
-== 0,
-the behavior is identical to
-.Li dup2(oldd, newd) .
-.Pp
-If
-.Fa oldd
-==
-.Fa newd ,
-then
-.Fn dup3
-fails, unlike
-.Xr dup2 2 .
-.Sh RETURN VALUES
-The value -1 is returned if an error occurs.
-The external variable
-.Va errno
-indicates the cause of the error.
-.Sh ERRORS
-The
-.Fn dup3
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa oldd
-argument is not a valid active descriptor or the
-.Fa newd
-argument is negative or exceeds the maximum allowable descriptor number
-.It Bq Er EINVAL
-The
-.Fa oldd
-argument is equal to the
-.Fa newd
-argument.
-.It Bq Er EINVAL
-The
-.Fa flags
-argument has bits set other than
-.Dv O_CLOEXEC .
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr close 2 ,
-.Xr dup2 2 ,
-.Xr fcntl 2 ,
-.Xr getdtablesize 2 ,
-.Xr open 2 ,
-.Xr pipe 2 ,
-.Xr socket 2 ,
-.Xr socketpair 2
-.Sh STANDARDS
-The
-.Fn dup3
-function does not conform to any standard.
-.Sh HISTORY
-The
-.Fn dup3
-function appeared in
-.Fx 10.0 .
diff --git a/lib/libc_bsd/gen/dup3.c b/lib/libc_bsd/gen/dup3.c
deleted file mode 100644
index db1e467..0000000
--- a/lib/libc_bsd/gen/dup3.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2012 Jukka A. Ukkonen
- * All rights reserved.
- *
- * This software was developed by Jukka Ukkonen for FreeBSD.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/dup3.c 254409 2013-08-16 13:10:30Z jilles $");
-
-#include "namespace.h"
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include "un-namespace.h"
-
-int
-__dup3(int oldfd, int newfd, int flags)
-{
-	int how;
-
-	if (oldfd == newfd) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (flags & ~O_CLOEXEC) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	how = (flags & O_CLOEXEC) ? F_DUP2FD_CLOEXEC : F_DUP2FD;
-
-	return (_fcntl(oldfd, how, newfd));
-}
-
-__weak_reference(__dup3, dup3);
-__weak_reference(__dup3, _dup3);
diff --git a/lib/libc_bsd/gen/elf_utils.c b/lib/libc_bsd/gen/elf_utils.c
deleted file mode 100644
index 1147164..0000000
--- a/lib/libc_bsd/gen/elf_utils.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2010 Konstantin Belousov <kib@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. Neither the name of the author nor the names of any co-contributors
- *    may 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: releng/10.2/lib/libc/gen/elf_utils.c 217154 2011-01-08 17:13:43Z kib $
- */
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/resource.h>
-#include <sys/sysctl.h>
-#include <link.h>
-#include <stddef.h>
-
-int
-__elf_phdr_match_addr(struct dl_phdr_info *phdr_info, void *addr)
-{
-	const Elf_Phdr *ph;
-	int i;
-
-	for (i = 0; i < phdr_info->dlpi_phnum; i++) {
-		ph = &phdr_info->dlpi_phdr[i];
-		if (ph->p_type != PT_LOAD || (ph->p_flags & PF_X) == 0)
-			continue;
-		if (phdr_info->dlpi_addr + ph->p_vaddr <= (uintptr_t)addr &&
-		    (uintptr_t)addr + sizeof(addr) < phdr_info->dlpi_addr +
-		    ph->p_vaddr + ph->p_memsz)
-			break;
-	}
-	return (i != phdr_info->dlpi_phnum);
-}
-
-#pragma weak __pthread_map_stacks_exec
-void
-__pthread_map_stacks_exec(void)
-{
-	int mib[2];
-	struct rlimit rlim;
-	u_long usrstack;
-	size_t len;
-	
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_USRSTACK;
-	len = sizeof(usrstack);
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), &usrstack, &len, NULL, 0)
-	    == -1)
-		return;
-	if (getrlimit(RLIMIT_STACK, &rlim) == -1)
-		return;
-	mprotect((void *)(uintptr_t)(usrstack - rlim.rlim_cur),
-	    rlim.rlim_cur, _rtld_get_stack_prot());
-}
-
diff --git a/lib/libc_bsd/gen/erand48.c b/lib/libc_bsd/gen/erand48.c
deleted file mode 100644
index e00fe16..0000000
--- a/lib/libc_bsd/gen/erand48.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/erand48.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include "rand48.h"
-
-double
-erand48(unsigned short xseed[3])
-{
-	_dorand48(xseed);
-	return ldexp((double) xseed[0], -48) +
-	       ldexp((double) xseed[1], -32) +
-	       ldexp((double) xseed[2], -16);
-}
diff --git a/lib/libc_bsd/gen/err.3 b/lib/libc_bsd/gen/err.3
deleted file mode 100644
index ae35449..0000000
--- a/lib/libc_bsd/gen/err.3
+++ /dev/null
@@ -1,245 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"	From: @(#)err.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/err.3 234714 2012-04-26 19:21:58Z eadler $
-.\"
-.Dd March 29, 2012
-.Dt ERR 3
-.Os
-.Sh NAME
-.Nm err ,
-.Nm verr ,
-.Nm errc ,
-.Nm verrc ,
-.Nm errx ,
-.Nm verrx ,
-.Nm warn ,
-.Nm vwarn ,
-.Nm warnc ,
-.Nm vwarnc ,
-.Nm warnx ,
-.Nm vwarnx ,
-.Nm err_set_exit ,
-.Nm err_set_file
-.Nd formatted error messages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In err.h
-.Ft void
-.Fn err "int eval" "const char *fmt" "..."
-.Ft void
-.Fn err_set_exit "void (*exitf)(int)"
-.Ft void
-.Fn err_set_file "void *vfp"
-.Ft void
-.Fn errc "int eval" "int code" "const char *fmt" "..."
-.Ft void
-.Fn errx "int eval" "const char *fmt" "..."
-.Ft void
-.Fn warn "const char *fmt" "..."
-.Ft void
-.Fn warnc "int code" "const char *fmt" "..."
-.Ft void
-.Fn warnx "const char *fmt" "..."
-.In stdarg.h
-.Ft void
-.Fn verr "int eval" "const char *fmt" "va_list args"
-.Ft void
-.Fn verrc "int eval" "int code" "const char *fmt" "va_list args"
-.Ft void
-.Fn verrx "int eval" "const char *fmt" "va_list args"
-.Ft void
-.Fn vwarn "const char *fmt" "va_list args"
-.Ft void
-.Fn vwarnc "int code" "const char *fmt" "va_list args"
-.Ft void
-.Fn vwarnx "const char *fmt" "va_list args"
-.Sh DESCRIPTION
-The
-.Fn err
-and
-.Fn warn
-family of functions display a formatted error message on the standard
-error output, or on another file specified using the
-.Fn err_set_file
-function.
-In all cases, the last component of the program name, a colon character,
-and a space are output.
-If the
-.Fa fmt
-argument is not NULL, the
-.Xr printf 3 Ns
--like formatted error message is output.
-The output is terminated by a newline character.
-.Pp
-The
-.Fn err ,
-.Fn errc ,
-.Fn verr ,
-.Fn verrc ,
-.Fn warn ,
-.Fn warnc ,
-.Fn vwarn ,
-and
-.Fn vwarnc
-functions append an error message obtained from
-.Xr strerror 3
-based on a supplied error code value or the global variable
-.Va errno ,
-preceded by another colon and space unless the
-.Fa fmt
-argument is
-.Dv NULL .
-.Pp
-In the case of the
-.Fn errc ,
-.Fn verrc ,
-.Fn warnc ,
-and
-.Fn vwarnc
-functions,
-the
-.Fa code
-argument is used to look up the error message.
-.Pp
-The
-.Fn err ,
-.Fn verr ,
-.Fn warn ,
-and
-.Fn vwarn
-functions use the global variable
-.Va errno
-to look up the error message.
-.Pp
-The
-.Fn errx
-and
-.Fn warnx
-functions do not append an error message.
-.Pp
-The
-.Fn err ,
-.Fn verr ,
-.Fn errc ,
-.Fn verrc ,
-.Fn errx ,
-and
-.Fn verrx
-functions do not return, but exit with the value of the argument
-.Fa eval .
-It is recommended that the standard values defined in
-.Xr sysexits 3
-be used for the value of
-.Fa eval .
-The
-.Fn err_set_exit
-function can be used to specify a function which is called before
-.Xr exit 3
-to perform any necessary cleanup; passing a null function pointer for
-.Va exitf
-resets the hook to do nothing.
-The
-.Fn err_set_file
-function sets the output stream used by the other functions.
-Its
-.Fa vfp
-argument must be either a pointer to an open stream
-(possibly already converted to void *)
-or a null pointer
-(in which case the output stream is set to standard error).
-.Sh EXAMPLES
-Display the current errno information string and exit:
-.Bd -literal -offset indent
-if ((p = malloc(size)) == NULL)
-	err(EX_OSERR, NULL);
-if ((fd = open(file_name, O_RDONLY, 0)) == -1)
-	err(EX_NOINPUT, "%s", file_name);
-.Ed
-.Pp
-Display an error message and exit:
-.Bd -literal -offset indent
-if (tm.tm_hour < START_TIME)
-	errx(EX_DATAERR, "too early, wait until %s",
-	    start_time_string);
-.Ed
-.Pp
-Warn of an error:
-.Bd -literal -offset indent
-if ((fd = open(raw_device, O_RDONLY, 0)) == -1)
-	warnx("%s: %s: trying the block device",
-	    raw_device, strerror(errno));
-if ((fd = open(block_device, O_RDONLY, 0)) == -1)
-	err(EX_OSFILE, "%s", block_device);
-.Ed
-.Pp
-Warn of an error without using the global variable
-.Va errno :
-.Bd -literal -offset indent
-error = my_function();	/* returns a value from <errno.h> */
-if (error != 0)
-	warnc(error, "my_function");
-.Ed
-.Sh SEE ALSO
-.Xr exit 3 ,
-.Xr fmtmsg 3 ,
-.Xr printf 3 ,
-.Xr strerror 3 ,
-.Xr sysexits 3
-.Sh STANDARDS
-The
-.Fn err
-and
-.Fn warn
-families of functions are
-.Bx
-extensions.
-As such they should not be used in truly portable code.
-Use
-.Fn strerror
-or similar functions instead.
-.Sh HISTORY
-The
-.Fn err
-and
-.Fn warn
-functions first appeared in
-.Bx 4.4 .
-The
-.Fn err_set_exit
-and
-.Fn err_set_file
-functions first appeared in
-.Fx 2.1 .
-The
-.Fn errc
-and
-.Fn warnc
-functions first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/gen/err.c b/lib/libc_bsd/gen/err.c
deleted file mode 100644
index f5b3d89..0000000
--- a/lib/libc_bsd/gen/err.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*-
- * Copyright (c) 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/err.c 177893 2008-04-03 20:36:44Z imp $");
-
-#include "namespace.h"
-#include <err.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-static FILE *err_file; /* file to use for error output */
-static void (*err_exit)(int);
-
-/*
- * This is declared to take a `void *' so that the caller is not required
- * to include <stdio.h> first.  However, it is really a `FILE *', and the
- * manual page documents it as such.
- */
-void
-err_set_file(void *fp)
-{
-	if (fp)
-		err_file = fp;
-	else
-		err_file = stderr;
-}
-
-void
-err_set_exit(void (*ef)(int))
-{
-	err_exit = ef;
-}
-
-__weak_reference(_err, err);
-
-void
-_err(int eval, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrc(eval, errno, fmt, ap);
-	va_end(ap);
-}
-
-void
-verr(eval, fmt, ap)
-	int eval;
-	const char *fmt;
-	va_list ap;
-{
-	verrc(eval, errno, fmt, ap);
-}
-
-void
-errc(int eval, int code, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrc(eval, code, fmt, ap);
-	va_end(ap);
-}
-
-void
-verrc(int eval, int code, const char *fmt, va_list ap)
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL) {
-		vfprintf(err_file, fmt, ap);
-		fprintf(err_file, ": ");
-	}
-	fprintf(err_file, "%s\n", strerror(code));
-	if (err_exit)
-		err_exit(eval);
-	exit(eval);
-}
-
-void
-errx(int eval, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	verrx(eval, fmt, ap);
-	va_end(ap);
-}
-
-void
-verrx(int eval, const char *fmt, va_list ap)
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL)
-		vfprintf(err_file, fmt, ap);
-	fprintf(err_file, "\n");
-	if (err_exit)
-		err_exit(eval);
-	exit(eval);
-}
-
-__weak_reference(_warn, warn);
-
-void
-_warn(const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnc(errno, fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarn(const char *fmt, va_list ap)
-{
-	vwarnc(errno, fmt, ap);
-}
-
-void
-warnc(int code, const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnc(code, fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarnc(int code, const char *fmt, va_list ap)
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL) {
-		vfprintf(err_file, fmt, ap);
-		fprintf(err_file, ": ");
-	}
-	fprintf(err_file, "%s\n", strerror(code));
-}
-
-void
-warnx(const char *fmt, ...)
-{
-	va_list ap;
-	va_start(ap, fmt);
-	vwarnx(fmt, ap);
-	va_end(ap);
-}
-
-void
-vwarnx(const char *fmt, va_list ap)
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL)
-		vfprintf(err_file, fmt, ap);
-	fprintf(err_file, "\n");
-}
diff --git a/lib/libc_bsd/gen/errlst.c b/lib/libc_bsd/gen/errlst.c
deleted file mode 100644
index 1140de7..0000000
--- a/lib/libc_bsd/gen/errlst.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 1982, 1985, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/errlst.c 255108 2013-08-31 22:32:42Z jilles $");
-
-#include <stdio.h>
-#include "errlst.h"
-
-const char *const sys_errlist[] = {
-	"No error: 0",				/*  0 - ENOERROR */
-	"Operation not permitted",		/*  1 - EPERM */
-	"No such file or directory",		/*  2 - ENOENT */
-	"No such process",			/*  3 - ESRCH */
-	"Interrupted system call",		/*  4 - EINTR */
-	"Input/output error",			/*  5 - EIO */
-	"Device not configured",		/*  6 - ENXIO */
-	"Argument list too long",		/*  7 - E2BIG */
-	"Exec format error",			/*  8 - ENOEXEC */
-	"Bad file descriptor",			/*  9 - EBADF */
-	"No child processes",			/* 10 - ECHILD */
-	"Resource deadlock avoided",		/* 11 - EDEADLK */
-	"Cannot allocate memory",		/* 12 - ENOMEM */
-	"Permission denied",			/* 13 - EACCES */
-	"Bad address",				/* 14 - EFAULT */
-	"Block device required",		/* 15 - ENOTBLK */
-	"Device busy",				/* 16 - EBUSY */
-	"File exists",				/* 17 - EEXIST */
-	"Cross-device link",			/* 18 - EXDEV */
-	"Operation not supported by device",	/* 19 - ENODEV */
-	"Not a directory",			/* 20 - ENOTDIR */
-	"Is a directory",			/* 21 - EISDIR */
-	"Invalid argument",			/* 22 - EINVAL */
-	"Too many open files in system",	/* 23 - ENFILE */
-	"Too many open files",			/* 24 - EMFILE */
-	"Inappropriate ioctl for device",	/* 25 - ENOTTY */
-	"Text file busy",			/* 26 - ETXTBSY */
-	"File too large",			/* 27 - EFBIG */
-	"No space left on device",		/* 28 - ENOSPC */
-	"Illegal seek",				/* 29 - ESPIPE */
-	"Read-only file system",		/* 30 - EROFS */
-	"Too many links",			/* 31 - EMLINK */
-	"Broken pipe",				/* 32 - EPIPE */
-
-/* math software */
-	"Numerical argument out of domain",	/* 33 - EDOM */
-	"Result too large",			/* 34 - ERANGE */
-
-/* non-blocking and interrupt i/o */
-	"Resource temporarily unavailable",	/* 35 - EAGAIN */
-						/* 35 - EWOULDBLOCK */
-	"Operation now in progress",		/* 36 - EINPROGRESS */
-	"Operation already in progress",	/* 37 - EALREADY */
-
-/* ipc/network software -- argument errors */
-	"Socket operation on non-socket",	/* 38 - ENOTSOCK */
-	"Destination address required",		/* 39 - EDESTADDRREQ */
-	"Message too long",			/* 40 - EMSGSIZE */
-	"Protocol wrong type for socket",	/* 41 - EPROTOTYPE */
-	"Protocol not available",		/* 42 - ENOPROTOOPT */
-	"Protocol not supported",		/* 43 - EPROTONOSUPPORT */
-	"Socket type not supported",		/* 44 - ESOCKTNOSUPPORT */
-	"Operation not supported",		/* 45 - EOPNOTSUPP */
-	"Protocol family not supported",	/* 46 - EPFNOSUPPORT */
-						/* 47 - EAFNOSUPPORT */
-	"Address family not supported by protocol family",
-	"Address already in use",		/* 48 - EADDRINUSE */
-	"Can't assign requested address",	/* 49 - EADDRNOTAVAIL */
-
-/* ipc/network software -- operational errors */
-	"Network is down",			/* 50 - ENETDOWN */
-	"Network is unreachable",		/* 51 - ENETUNREACH */
-	"Network dropped connection on reset",	/* 52 - ENETRESET */
-	"Software caused connection abort",	/* 53 - ECONNABORTED */
-	"Connection reset by peer",		/* 54 - ECONNRESET */
-	"No buffer space available",		/* 55 - ENOBUFS */
-	"Socket is already connected",		/* 56 - EISCONN */
-	"Socket is not connected",		/* 57 - ENOTCONN */
-	"Can't send after socket shutdown",	/* 58 - ESHUTDOWN */
-	"Too many references: can't splice",	/* 59 - ETOOMANYREFS */
-	"Operation timed out",			/* 60 - ETIMEDOUT */
-	"Connection refused",			/* 61 - ECONNREFUSED */
-
-	"Too many levels of symbolic links",	/* 62 - ELOOP */
-	"File name too long",			/* 63 - ENAMETOOLONG */
-
-/* should be rearranged */
-	"Host is down",				/* 64 - EHOSTDOWN */
-	"No route to host",			/* 65 - EHOSTUNREACH */
-	"Directory not empty",			/* 66 - ENOTEMPTY */
-
-/* quotas & mush */
-	"Too many processes",			/* 67 - EPROCLIM */
-	"Too many users",			/* 68 - EUSERS */
-	"Disc quota exceeded",			/* 69 - EDQUOT */
-
-/* Network File System */
-	"Stale NFS file handle",		/* 70 - ESTALE */
-	"Too many levels of remote in path",	/* 71 - EREMOTE */
-	"RPC struct is bad",			/* 72 - EBADRPC */
-	"RPC version wrong",			/* 73 - ERPCMISMATCH */
-	"RPC prog. not avail",			/* 74 - EPROGUNAVAIL */
-	"Program version wrong",		/* 75 - EPROGMISMATCH */
-	"Bad procedure for program",		/* 76 - EPROCUNAVAIL */
-
-	"No locks available",			/* 77 - ENOLCK */
-	"Function not implemented",		/* 78 - ENOSYS */
-	"Inappropriate file type or format",	/* 79 - EFTYPE */
-	"Authentication error",			/* 80 - EAUTH */
-	"Need authenticator",			/* 81 - ENEEDAUTH */
-	"Identifier removed",			/* 82 - EIDRM */
-	"No message of desired type",		/* 83 - ENOMSG */
-	"Value too large to be stored in data type", /* 84 - EOVERFLOW */
-	"Operation canceled",			/* 85 - ECANCELED */
-	"Illegal byte sequence",		/* 86 - EILSEQ */
-	"Attribute not found",			/* 87 - ENOATTR */
-
-/* General */
-	"Programming error",			/* 88 - EDOOFUS */
-
-	"Bad message",				/* 89 - EBADMSG */
-	"Multihop attempted",			/* 90 - EMULTIHOP */
-	"Link has been severed",		/* 91 - ENOLINK */
-	"Protocol error",			/* 92 - EPROTO */
-	"Capabilities insufficient",		/* 93 - ENOTCAPABLE */
-	"Not permitted in capability mode",	/* 94 - ECAPMODE */
-	"State not recoverable",		/* 95 - ENOTRECOVERABLE */
-	"Previous owner died",			/* 96 - EOWNERDEAD */
-};
-const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);
-
-#ifdef PIC
-__strong_reference(sys_errlist, __hidden_sys_errlist);
-__strong_reference(sys_nerr, __hidden_sys_nerr);
-#endif
diff --git a/lib/libc_bsd/gen/errno.c b/lib/libc_bsd/gen/errno.c
deleted file mode 100644
index 4407fa4..0000000
--- a/lib/libc_bsd/gen/errno.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * Copyright (c) 2002 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/errno.c 104704 2002-10-09 08:04:24Z peter $");
-
-int errno;
diff --git a/lib/libc_bsd/gen/exec.3 b/lib/libc_bsd/gen/exec.3
deleted file mode 100644
index c1b52ba..0000000
--- a/lib/libc_bsd/gen/exec.3
+++ /dev/null
@@ -1,321 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)exec.3	8.3 (Berkeley) 1/24/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/exec.3 179947 2008-06-23 05:22:06Z ed $
-.\"
-.Dd January 24, 1994
-.Dt EXEC 3
-.Os
-.Sh NAME
-.Nm execl ,
-.Nm execlp ,
-.Nm execle ,
-.Nm exect ,
-.Nm execv ,
-.Nm execvp ,
-.Nm execvP
-.Nd execute a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Vt extern char **environ ;
-.Ft int
-.Fn execl "const char *path" "const char *arg" ... /* "(char *)0" */
-.Ft int
-.Fn execlp "const char *file" "const char *arg" ... /* "(char *)0" */
-.Ft int
-.Fo execle
-.Fa "const char *path" "const char *arg" ...
-.Fa /*
-.Bk -words
-.Fa "(char *)0" "char *const envp[]" */
-.Ek
-.Fc
-.Ft int
-.Fn exect "const char *path" "char *const argv[]" "char *const envp[]"
-.Ft int
-.Fn execv "const char *path" "char *const argv[]"
-.Ft int
-.Fn execvp "const char *file" "char *const argv[]"
-.Ft int
-.Fn execvP "const char *file" "const char *search_path" "char *const argv[]"
-.Sh DESCRIPTION
-The
-.Nm exec
-family of functions replaces the current process image with a
-new process image.
-The functions described in this manual page are front-ends for the function
-.Xr execve 2 .
-(See the manual page for
-.Xr execve 2
-for detailed information about the replacement of the current process.)
-.Pp
-The initial argument for these functions is the pathname of a file which
-is to be executed.
-.Pp
-The
-.Fa "const char *arg"
-and subsequent ellipses in the
-.Fn execl ,
-.Fn execlp ,
-and
-.Fn execle
-functions can be thought of as
-.Em arg0 ,
-.Em arg1 ,
-\&...,
-.Em argn .
-Together they describe a list of one or more pointers to null-terminated
-strings that represent the argument list available to the executed program.
-The first argument, by convention, should point to the file name associated
-with the file being executed.
-The list of arguments
-.Em must
-be terminated by a
-.Dv NULL
-pointer.
-.Pp
-The
-.Fn exect ,
-.Fn execv ,
-.Fn execvp ,
-and
-.Fn execvP
-functions provide an array of pointers to null-terminated strings that
-represent the argument list available to the new program.
-The first argument, by convention, should point to the file name associated
-with the file being executed.
-The array of pointers
-.Sy must
-be terminated by a
-.Dv NULL
-pointer.
-.Pp
-The
-.Fn execle
-and
-.Fn exect
-functions also specify the environment of the executed process by following
-the
-.Dv NULL
-pointer that terminates the list of arguments in the argument list
-or the pointer to the argv array with an additional argument.
-This additional argument is an array of pointers to null-terminated strings
-and
-.Em must
-be terminated by a
-.Dv NULL
-pointer.
-The other functions take the environment for the new process image from the
-external variable
-.Va environ
-in the current process.
-.Pp
-Some of these functions have special semantics.
-.Pp
-The functions
-.Fn execlp ,
-.Fn execvp ,
-and
-.Fn execvP
-will duplicate the actions of the shell in searching for an executable file
-if the specified file name does not contain a slash
-.Dq Li /
-character.
-For
-.Fn execlp
-and
-.Fn execvp ,
-search path is the path specified in the environment by
-.Dq Ev PATH
-variable.
-If this variable is not specified,
-the default path is set according to the
-.Dv _PATH_DEFPATH
-definition in
-.In paths.h ,
-which is set to
-.Dq Ev /usr/bin:/bin .
-For
-.Fn execvP ,
-the search path is specified as an argument to the function.
-In addition, certain errors are treated specially.
-.Pp
-If an error is ambiguous (for simplicity, we shall consider all
-errors except
-.Er ENOEXEC
-as being ambiguous here, although only the critical error
-.Er EACCES
-is really ambiguous),
-then these functions will act as if they stat the file to determine
-whether the file exists and has suitable execute permissions.
-If it does, they will return immediately with the global variable
-.Va errno
-restored to the value set by
-.Fn execve .
-Otherwise, the search will be continued.
-If the search completes without performing a successful
-.Fn execve
-or terminating due to an error,
-these functions will return with the global variable
-.Va errno
-set to
-.Er EACCES
-or
-.Er ENOENT
-according to whether at least one file with suitable execute permissions
-was found.
-.Pp
-If the header of a file is not recognized (the attempted
-.Fn execve
-returned
-.Er ENOEXEC ) ,
-these functions will execute the shell with the path of
-the file as its first argument.
-(If this attempt fails, no further searching is done.)
-.Pp
-The function
-.Fn exect
-executes a file with the program tracing facilities enabled (see
-.Xr ptrace 2 ) .
-.Sh RETURN VALUES
-If any of the
-.Fn exec
-functions returns, an error will have occurred.
-The return value is \-1, and the global variable
-.Va errno
-will be set to indicate the error.
-.Sh FILES
-.Bl -tag -width /bin/sh -compact
-.It Pa /bin/sh
-The shell.
-.El
-.Sh COMPATIBILITY
-Historically, the default path for the
-.Fn execlp
-and
-.Fn execvp
-functions was
-.Dq Pa :/bin:/usr/bin .
-This was changed to place the current directory last to enhance system
-security.
-.Pp
-The behavior of
-.Fn execlp
-and
-.Fn execvp
-when errors occur while attempting to execute the file is not quite historic
-practice, and has not traditionally been documented and is not specified
-by the
-.Tn POSIX
-standard.
-.Pp
-Traditionally, the functions
-.Fn execlp
-and
-.Fn execvp
-ignored all errors except for the ones described above and
-.Er ETXTBSY ,
-upon which they retried after sleeping for several seconds, and
-.Er ENOMEM
-and
-.Er E2BIG ,
-upon which they returned.
-They now return for
-.Er ETXTBSY ,
-and determine existence and executability more carefully.
-In particular,
-.Er EACCES
-for inaccessible directories in the path prefix is no longer
-confused with
-.Er EACCES
-for files with unsuitable execute permissions.
-In
-.Bx 4.4 ,
-they returned upon all errors except
-.Er EACCES ,
-.Er ENOENT ,
-.Er ENOEXEC
-and
-.Er ETXTBSY .
-This was inferior to the traditional error handling,
-since it breaks the ignoring of errors for path prefixes
-and only improves the handling of the unusual ambiguous error
-.Er EFAULT
-and the unusual error
-.Er EIO .
-The behaviour was changed to match the behaviour of
-.Xr sh 1 .
-.Sh ERRORS
-The
-.Fn execl ,
-.Fn execle ,
-.Fn execlp ,
-.Fn execvp
-and
-.Fn execvP
-functions
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr execve 2
-and
-.Xr malloc 3 .
-.Pp
-The
-.Fn exect
-and
-.Fn execv
-functions
-may fail and set
-.Va errno
-for any of the errors specified for the library function
-.Xr execve 2 .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr execve 2 ,
-.Xr fork 2 ,
-.Xr ktrace 2 ,
-.Xr ptrace 2 ,
-.Xr environ 7
-.Sh STANDARDS
-The
-.Fn execl ,
-.Fn execv ,
-.Fn execle ,
-.Fn execlp
-and
-.Fn execvp
-functions
-conform to
-.St -p1003.1-88 .
-The
-.Fn execvP
-function first appeared in
-.Fx 5.2 .
diff --git a/lib/libc_bsd/gen/exec.c b/lib/libc_bsd/gen/exec.c
deleted file mode 100644
index 4285e61..0000000
--- a/lib/libc_bsd/gen/exec.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/exec.c 229403 2012-01-03 18:51:58Z ed $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <paths.h>
-
-#include <stdarg.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-extern char **environ;
-
-int
-execl(const char *name, const char *arg, ...)
-{
-	va_list ap;
-	const char **argv;
-	int n;
-
-	va_start(ap, arg);
-	n = 1;
-	while (va_arg(ap, char *) != NULL)
-		n++;
-	va_end(ap);
-	argv = alloca((n + 1) * sizeof(*argv));
-	if (argv == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	va_start(ap, arg);
-	n = 1;
-	argv[0] = arg;
-	while ((argv[n] = va_arg(ap, char *)) != NULL)
-		n++;
-	va_end(ap);
-	return (_execve(name, __DECONST(char **, argv), environ));
-}
-
-int
-execle(const char *name, const char *arg, ...)
-{
-	va_list ap;
-	const char **argv;
-	char **envp;
-	int n;
-
-	va_start(ap, arg);
-	n = 1;
-	while (va_arg(ap, char *) != NULL)
-		n++;
-	va_end(ap);
-	argv = alloca((n + 1) * sizeof(*argv));
-	if (argv == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	va_start(ap, arg);
-	n = 1;
-	argv[0] = arg;
-	while ((argv[n] = va_arg(ap, char *)) != NULL)
-		n++;
-	envp = va_arg(ap, char **);
-	va_end(ap);
-	return (_execve(name, __DECONST(char **, argv), envp));
-}
-
-int
-execlp(const char *name, const char *arg, ...)
-{
-	va_list ap;
-	const char **argv;
-	int n;
-
-	va_start(ap, arg);
-	n = 1;
-	while (va_arg(ap, char *) != NULL)
-		n++;
-	va_end(ap);
-	argv = alloca((n + 1) * sizeof(*argv));
-	if (argv == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	va_start(ap, arg);
-	n = 1;
-	argv[0] = arg;
-	while ((argv[n] = va_arg(ap, char *)) != NULL)
-		n++;
-	va_end(ap);
-	return (execvp(name, __DECONST(char **, argv)));
-}
-
-int
-execv(name, argv)
-	const char *name;
-	char * const *argv;
-{
-	(void)_execve(name, argv, environ);
-	return (-1);
-}
-
-int
-execvp(const char *name, char * const *argv)
-{
-	return (_execvpe(name, argv, environ));
-}
-
-static int
-execvPe(const char *name, const char *path, char * const *argv,
-    char * const *envp)
-{
-	const char **memp;
-	size_t cnt, lp, ln;
-	int eacces, save_errno;
-	char *cur, buf[MAXPATHLEN];
-	const char *p, *bp;
-	struct stat sb;
-
-	eacces = 0;
-
-	/* If it's an absolute or relative path name, it's easy. */
-	if (strchr(name, '/')) {
-		bp = name;
-		cur = NULL;
-		goto retry;
-	}
-	bp = buf;
-
-	/* If it's an empty path name, fail in the usual POSIX way. */
-	if (*name == '\0') {
-		errno = ENOENT;
-		return (-1);
-	}
-
-	cur = alloca(strlen(path) + 1);
-	if (cur == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	strcpy(cur, path);
-	while ((p = strsep(&cur, ":")) != NULL) {
-		/*
-		 * It's a SHELL path -- double, leading and trailing colons
-		 * mean the current directory.
-		 */
-		if (*p == '\0') {
-			p = ".";
-			lp = 1;
-		} else
-			lp = strlen(p);
-		ln = strlen(name);
-
-		/*
-		 * If the path is too long complain.  This is a possible
-		 * security issue; given a way to make the path too long
-		 * the user may execute the wrong program.
-		 */
-		if (lp + ln + 2 > sizeof(buf)) {
-			(void)_write(STDERR_FILENO, "execvP: ", 8);
-			(void)_write(STDERR_FILENO, p, lp);
-			(void)_write(STDERR_FILENO, ": path too long\n",
-			    16);
-			continue;
-		}
-		bcopy(p, buf, lp);
-		buf[lp] = '/';
-		bcopy(name, buf + lp + 1, ln);
-		buf[lp + ln + 1] = '\0';
-
-retry:		(void)_execve(bp, argv, envp);
-		switch (errno) {
-		case E2BIG:
-			goto done;
-		case ELOOP:
-		case ENAMETOOLONG:
-		case ENOENT:
-			break;
-		case ENOEXEC:
-			for (cnt = 0; argv[cnt]; ++cnt)
-				;
-			memp = alloca((cnt + 2) * sizeof(char *));
-			if (memp == NULL) {
-				/* errno = ENOMEM; XXX override ENOEXEC? */
-				goto done;
-			}
-			memp[0] = "sh";
-			memp[1] = bp;
-			bcopy(argv + 1, memp + 2, cnt * sizeof(char *));
- 			(void)_execve(_PATH_BSHELL,
-			    __DECONST(char **, memp), envp);
-			goto done;
-		case ENOMEM:
-			goto done;
-		case ENOTDIR:
-			break;
-		case ETXTBSY:
-			/*
-			 * We used to retry here, but sh(1) doesn't.
-			 */
-			goto done;
-		default:
-			/*
-			 * EACCES may be for an inaccessible directory or
-			 * a non-executable file.  Call stat() to decide
-			 * which.  This also handles ambiguities for EFAULT
-			 * and EIO, and undocumented errors like ESTALE.
-			 * We hope that the race for a stat() is unimportant.
-			 */
-			save_errno = errno;
-			if (stat(bp, &sb) != 0)
-				break;
-			if (save_errno == EACCES) {
-				eacces = 1;
-				continue;
-			}
-			errno = save_errno;
-			goto done;
-		}
-	}
-	if (eacces)
-		errno = EACCES;
-	else
-		errno = ENOENT;
-done:
-	return (-1);
-}
-
-int
-execvP(const char *name, const char *path, char * const argv[])
-{
-	return execvPe(name, path, argv, environ);
-}
-
-int
-_execvpe(const char *name, char * const argv[], char * const envp[])
-{
-	const char *path;
-
-	/* Get the path we're searching. */
-	if ((path = getenv("PATH")) == NULL)
-		path = _PATH_DEFPATH;
-
-	return (execvPe(name, path, argv, envp));
-}
diff --git a/lib/libc_bsd/gen/fdevname.c b/lib/libc_bsd/gen/fdevname.c
deleted file mode 100644
index df32ca4..0000000
--- a/lib/libc_bsd/gen/fdevname.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2009 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/fdevname.c 200133 2009-12-05 18:51:44Z ed $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-char *
-fdevname_r(int fd, char *buf, int len)
-{
-	struct fiodgname_arg fgn;
-
-	fgn.buf = buf;
-	fgn.len = len;
-
-	if (_ioctl(fd, FIODGNAME, &fgn) == -1)
-		return (NULL);
-	return (buf);
-}
-
-char *
-fdevname(int fd)
-{
-	static char buf[SPECNAMELEN + 1];
-
-	return (fdevname_r(fd, buf, sizeof(buf)));
-}
diff --git a/lib/libc_bsd/gen/feature_present.3 b/lib/libc_bsd/gen/feature_present.3
deleted file mode 100644
index bb659ad..0000000
--- a/lib/libc_bsd/gen/feature_present.3
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" Copyright (c) 2008 Yahoo!, Inc.
-.\" All rights reserved.
-.\" Written by: John Baldwin <jhb@FreeBSD.org>
-.\"
-.\" 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. Neither the name of the author nor the names of any co-contributors
-.\"    may 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: releng/10.2/lib/libc/gen/feature_present.3 222286 2011-05-25 14:13:53Z ru $
-.\"
-.Dd January 8, 2008
-.Dt FEATURE_PRESENT 3
-.Os
-.Sh NAME
-.Nm feature_present
-.Nd query presence of a kernel feature
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn feature_present "const char *feature"
-.Sh DESCRIPTION
-The
-.Fn feature_present
-function provides a method for an application to determine if a specific
-kernel feature is present in the currently running kernel.
-The
-.Fa feature
-argument specifies the name of the feature to check.
-The
-.Fn feature_present
-function will return 1 if the specified feature is present,
-otherwise it will return 0.
-If the
-.Fn feature_present
-function is not able to determine the presence of
-.Fa feature
-due to an internal error it will return 0.
-.Sh RETURN VALUES
-If
-.Fa feature
-is present then 1 is returned;
-otherwise 0 is returned.
-.Sh SEE ALSO
-.Xr sysconf 3 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn feature_present
-function first appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/gen/feature_present.c b/lib/libc_bsd/gen/feature_present.c
deleted file mode 100644
index 64e4fb3..0000000
--- a/lib/libc_bsd/gen/feature_present.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 2008 Yahoo!, Inc.
- * All rights reserved.
- * Written by: John Baldwin <jhb@FreeBSD.org>
- *
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/feature_present.c 175220 2008-01-10 22:11:21Z jhb $");
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-/*
- * Returns true if the named feature is present in the currently
- * running kernel.  A feature's presence is indicated by an integer
- * sysctl node called kern.feature.<feature> that is non-zero.
- */
-int
-feature_present(const char *feature)
-{
-	char *mib;
-	size_t len;
-	int i;
-
-	if (asprintf(&mib, "kern.features.%s", feature) < 0)
-		return (0);
-	len = sizeof(i);
-	if (sysctlbyname(mib, &i, &len, NULL, 0) < 0) {
-		free(mib);
-		return (0);
-	}
-	free(mib);
-	if (len != sizeof(i))
-		return (0);
-	return (i != 0);
-}
diff --git a/lib/libc_bsd/gen/fmtcheck.3 b/lib/libc_bsd/gen/fmtcheck.3
deleted file mode 100644
index 6572056..0000000
--- a/lib/libc_bsd/gen/fmtcheck.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file was contributed to The NetBSD Foundation by Allen Briggs.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libc/gen/fmtcheck.3 208027 2010-05-13 12:07:55Z uqs $
-.Dd October 16, 2002
-.Dt FMTCHECK 3
-.Os
-.Sh NAME
-.Nm fmtcheck
-.Nd sanitizes user-supplied
-.Xr printf 3 Ns -style
-format string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft const char *
-.Fn fmtcheck "const char *fmt_suspect" "const char *fmt_default"
-.Sh DESCRIPTION
-The
-.Fn fmtcheck
-scans
-.Fa fmt_suspect
-and
-.Fa fmt_default
-to determine if
-.Fa fmt_suspect
-will consume the same argument types as
-.Fa fmt_default
-and to ensure that
-.Fa fmt_suspect
-is a valid format string.
-.Pp
-The
-.Xr printf 3
-family of functions cannot verify the types of arguments that they are
-passed at run-time.
-In some cases, like
-.Xr catgets 3 ,
-it is useful or necessary to use a user-supplied format string with no
-guarantee that the format string matches the specified arguments.
-.Pp
-The
-.Fn fmtcheck
-was designed to be used in these cases, as in:
-.Bd -literal -offset indent
-printf(fmtcheck(user_format, standard_format), arg1, arg2);
-.Ed
-.Pp
-In the check, field widths, fillers, precisions, etc.\& are ignored (unless
-the field width or precision is an asterisk
-.Ql *
-instead of a digit string).
-Also, any text other than the format specifiers
-is completely ignored.
-.Sh RETURN VALUES
-If
-.Fa fmt_suspect
-is a valid format and consumes the same argument types as
-.Fa fmt_default ,
-then the
-.Fn fmtcheck
-will return
-.Fa fmt_suspect .
-Otherwise, it will return
-.Fa fmt_default .
-.Sh SEE ALSO
-.Xr printf 3
-.Sh BUGS
-The
-.Fn fmtcheck
-function does not recognize positional parameters.
-.Sh SECURITY CONSIDERATIONS
-Note that the formats may be quite different as long as they accept the
-same arguments.
-For example,
-.Qq Li "%p %o %30s %#llx %-10.*e %n"
-is compatible with
-.Qq Li "This number %lu %d%% and string %s has %qd numbers and %.*g floats (%n)" .
-However,
-.Qq Li %o
-is not equivalent to
-.Qq Li %lx
-because
-the first requires an integer and the second requires a long.
diff --git a/lib/libc_bsd/gen/fmtcheck.c b/lib/libc_bsd/gen/fmtcheck.c
deleted file mode 100644
index fa7760f..0000000
--- a/lib/libc_bsd/gen/fmtcheck.c
+++ /dev/null
@@ -1,325 +0,0 @@
-/*	$NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $	*/
-
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code was contributed to The NetBSD Foundation by Allen Briggs.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/fmtcheck.c 194800 2009-06-23 23:52:12Z delphij $");
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-__weak_reference(__fmtcheck, fmtcheck);
-
-enum __e_fmtcheck_types {
-	FMTCHECK_START,
-	FMTCHECK_SHORT,
-	FMTCHECK_INT,
-	FMTCHECK_WINTT,
-	FMTCHECK_LONG,
-	FMTCHECK_QUAD,
-	FMTCHECK_INTMAXT,
-	FMTCHECK_PTRDIFFT,
-	FMTCHECK_SIZET,
-	FMTCHECK_CHARPOINTER,
-	FMTCHECK_SHORTPOINTER,
-	FMTCHECK_INTPOINTER,
-	FMTCHECK_LONGPOINTER,
-	FMTCHECK_QUADPOINTER,
-	FMTCHECK_INTMAXTPOINTER,
-	FMTCHECK_PTRDIFFTPOINTER,
-	FMTCHECK_SIZETPOINTER,
-#ifndef NO_FLOATING_POINT
-	FMTCHECK_DOUBLE,
-	FMTCHECK_LONGDOUBLE,
-#endif
-	FMTCHECK_STRING,
-	FMTCHECK_WSTRING,
-	FMTCHECK_WIDTH,
-	FMTCHECK_PRECISION,
-	FMTCHECK_DONE,
-	FMTCHECK_UNKNOWN
-};
-typedef enum __e_fmtcheck_types EFT;
-
-enum e_modifier {
-	MOD_NONE,
-	MOD_CHAR,
-	MOD_SHORT,
-	MOD_LONG,
-	MOD_QUAD,
-	MOD_INTMAXT,
-	MOD_LONGDOUBLE,
-	MOD_PTRDIFFT,
-	MOD_SIZET,
-};
-
-#define RETURN(pf,f,r) do { \
-			*(pf) = (f); \
-			return r; \
-		       } /*NOTREACHED*/ /*CONSTCOND*/ while (0)
-
-static EFT
-get_next_format_from_precision(const char **pf)
-{
-	enum e_modifier	modifier;
-	const char	*f;
-
-	f = *pf;
-	switch (*f) {
-	case 'h':
-		f++;
-		if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
-		if (*f == 'h') {
-			f++;
-			modifier = MOD_CHAR;
-		} else {
-			modifier = MOD_SHORT;
-		}
-		break;
-	case 'j':
-		f++;
-		modifier = MOD_INTMAXT;
-		break;
-	case 'l':
-		f++;
-		if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
-		if (*f == 'l') {
-			f++;
-			modifier = MOD_QUAD;
-		} else {
-			modifier = MOD_LONG;
-		}
-		break;
-	case 'q':
-		f++;
-		modifier = MOD_QUAD;
-		break;
-	case 't':
-		f++;
-		modifier = MOD_PTRDIFFT;
-		break;
-	case 'z':
-		f++;
-		modifier = MOD_SIZET;
-		break;
-	case 'L':
-		f++;
-		modifier = MOD_LONGDOUBLE;
-		break;
-	default:
-		modifier = MOD_NONE;
-		break;
-	}
-	if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
-	if (strchr("diouxX", *f)) {
-		switch (modifier) {
-		case MOD_LONG:
-			RETURN(pf,f,FMTCHECK_LONG);
-		case MOD_QUAD:
-			RETURN(pf,f,FMTCHECK_QUAD);
-		case MOD_INTMAXT:
-			RETURN(pf,f,FMTCHECK_INTMAXT);
-		case MOD_PTRDIFFT:
-			RETURN(pf,f,FMTCHECK_PTRDIFFT);
-		case MOD_SIZET:
-			RETURN(pf,f,FMTCHECK_SIZET);
-		case MOD_CHAR:
-		case MOD_SHORT:
-		case MOD_NONE:
-			RETURN(pf,f,FMTCHECK_INT);
-		default:
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		}
-	}
-	if (*f == 'n') {
-		switch (modifier) {
-		case MOD_CHAR:
-			RETURN(pf,f,FMTCHECK_CHARPOINTER);
-		case MOD_SHORT:
-			RETURN(pf,f,FMTCHECK_SHORTPOINTER);
-		case MOD_LONG:
-			RETURN(pf,f,FMTCHECK_LONGPOINTER);
-		case MOD_QUAD:
-			RETURN(pf,f,FMTCHECK_QUADPOINTER);
-		case MOD_INTMAXT:
-			RETURN(pf,f,FMTCHECK_INTMAXTPOINTER);
-		case MOD_PTRDIFFT:
-			RETURN(pf,f,FMTCHECK_PTRDIFFTPOINTER);
-		case MOD_SIZET:
-			RETURN(pf,f,FMTCHECK_SIZETPOINTER);
-		case MOD_NONE:
-			RETURN(pf,f,FMTCHECK_INTPOINTER);
-		default:
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		}
-	}
-	if (strchr("DOU", *f)) {
-		if (modifier != MOD_NONE)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		RETURN(pf,f,FMTCHECK_LONG);
-	}
-#ifndef NO_FLOATING_POINT
-	if (strchr("aAeEfFgG", *f)) {
-		switch (modifier) {
-		case MOD_LONGDOUBLE:
-			RETURN(pf,f,FMTCHECK_LONGDOUBLE);
-		case MOD_LONG:
-		case MOD_NONE:
-			RETURN(pf,f,FMTCHECK_DOUBLE);
-		default:
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		}
-	}
-#endif
-	if (*f == 'c') {
-		switch (modifier) {
-		case MOD_LONG:
-			RETURN(pf,f,FMTCHECK_WINTT);
-		case MOD_NONE:
-			RETURN(pf,f,FMTCHECK_INT);
-		default:
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		}
-	}
-	if (*f == 'C') {
-		if (modifier != MOD_NONE)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		RETURN(pf,f,FMTCHECK_WINTT);
-	}
-	if (*f == 's') {
-		switch (modifier) {
-		case MOD_LONG:
-			RETURN(pf,f,FMTCHECK_WSTRING);
-		case MOD_NONE:
-			RETURN(pf,f,FMTCHECK_STRING);
-		default:
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		}
-	}
-	if (*f == 'S') {
-		if (modifier != MOD_NONE)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		RETURN(pf,f,FMTCHECK_WSTRING);
-	}
-	if (*f == 'p') {
-		if (modifier != MOD_NONE)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		RETURN(pf,f,FMTCHECK_LONG);
-	}
-	RETURN(pf,f,FMTCHECK_UNKNOWN);
-	/*NOTREACHED*/
-}
-
-static EFT
-get_next_format_from_width(const char **pf)
-{
-	const char	*f;
-
-	f = *pf;
-	if (*f == '.') {
-		f++;
-		if (*f == '*') {
-			RETURN(pf,f,FMTCHECK_PRECISION);
-		}
-		/* eat any precision (empty is allowed) */
-		while (isdigit(*f)) f++;
-		if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
-	}
-	RETURN(pf,f,get_next_format_from_precision(pf));
-	/*NOTREACHED*/
-}
-
-static EFT
-get_next_format(const char **pf, EFT eft)
-{
-	int		infmt;
-	const char	*f;
-
-	if (eft == FMTCHECK_WIDTH) {
-		(*pf)++;
-		return get_next_format_from_width(pf);
-	} else if (eft == FMTCHECK_PRECISION) {
-		(*pf)++;
-		return get_next_format_from_precision(pf);
-	}
-
-	f = *pf;
-	infmt = 0;
-	while (!infmt) {
-		f = strchr(f, '%');
-		if (f == NULL)
-			RETURN(pf,f,FMTCHECK_DONE);
-		f++;
-		if (!*f)
-			RETURN(pf,f,FMTCHECK_UNKNOWN);
-		if (*f != '%')
-			infmt = 1;
-		else
-			f++;
-	}
-
-	/* Eat any of the flags */
-	while (*f && (strchr("#'0- +", *f)))
-		f++;
-
-	if (*f == '*') {
-		RETURN(pf,f,FMTCHECK_WIDTH);
-	}
-	/* eat any width */
-	while (isdigit(*f)) f++;
-	if (!*f) {
-		RETURN(pf,f,FMTCHECK_UNKNOWN);
-	}
-
-	RETURN(pf,f,get_next_format_from_width(pf));
-	/*NOTREACHED*/
-}
-
-const char *
-__fmtcheck(const char *f1, const char *f2)
-{
-	const char	*f1p, *f2p;
-	EFT		f1t, f2t;
-
-	if (!f1) return f2;
-	
-	f1p = f1;
-	f1t = FMTCHECK_START;
-	f2p = f2;
-	f2t = FMTCHECK_START;
-	while ((f1t = get_next_format(&f1p, f1t)) != FMTCHECK_DONE) {
-		if (f1t == FMTCHECK_UNKNOWN)
-			return f2;
-		f2t = get_next_format(&f2p, f2t);
-		if (f1t != f2t)
-			return f2;
-	}
-	return f1;
-}
diff --git a/lib/libc_bsd/gen/fmtmsg.3 b/lib/libc_bsd/gen/fmtmsg.3
deleted file mode 100644
index 364a403..0000000
--- a/lib/libc_bsd/gen/fmtmsg.3
+++ /dev/null
@@ -1,260 +0,0 @@
-.\"
-.\" Copyright (c) 2002 Mike Barcroft <mike@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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/fmtmsg.3 107619 2002-12-04 18:57:46Z ru $
-.\"
-.Dd August 5, 2002
-.Dt FMTMSG 3
-.Os
-.Sh NAME
-.Nm fmtmsg
-.Nd display a detailed diagnostic message
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fmtmsg.h
-.Ft int
-.Fo fmtmsg
-.Fa "long classification" "const char *label" "int severity"
-.Fa "const char *text" "const char *action" "const char *tag"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn fmtmsg
-function displays a detailed diagnostic message, based on
-the supplied arguments, to
-.Dv stderr
-and/or the system console.
-.Pp
-The
-.Fa classification
-argument is the bitwise inclusive
-.Tn OR
-of zero or one of the manifest constants from
-each of the classification groups below.
-The Output classification group is an exception since both
-.Dv MM_PRINT
-and
-.Dv MM_CONSOLE
-may be specified.
-.Bl -tag -width indent
-.It Output
-.Bl -tag -width ".Dv MM_CONSOLE"
-.It Dv MM_PRINT
-Output should take place on
-.Dv stderr .
-.It Dv MM_CONSOLE
-Output should take place on the system console.
-.El
-.It "Source of Condition (Major)"
-.Bl -tag -width ".Dv MM_CONSOLE"
-.It Dv MM_HARD
-The source of the condition is hardware related.
-.It Dv MM_SOFT
-The source of the condition is software related.
-.It Dv MM_FIRM
-The source of the condition is firmware related.
-.El
-.It "Source of Condition (Minor)"
-.Bl -tag -width ".Dv MM_CONSOLE"
-.It Dv MM_APPL
-The condition was detected at the application level.
-.It Dv MM_UTIL
-The condition was detected at the utility level.
-.It Dv MM_OPSYS
-The condition was detected at the operating system level.
-.El
-.It Status
-.Bl -tag -width ".Dv MM_CONSOLE"
-.It Dv MM_RECOVER
-The application can recover from the condition.
-.It Dv MM_NRECOV
-The application is unable to recover from the condition.
-.El
-.El
-.Pp
-Alternatively, the
-.Dv MM_NULLMC
-manifest constant may be used to specify no classification.
-.Pp
-The
-.Fa label
-argument indicates the source of the message.
-It is made up of two fields separated by a colon
-.Pq Ql \&: .
-The first field can be up to 10 bytes,
-and the second field can be up to 14 bytes.
-The
-.Dv MM_NULLLBL
-manifest constant may be used to specify no label.
-.Pp
-The
-.Fa severity
-argument identifies the importance of the condition.
-One of the following manifest constants should be used for this argument.
-.Bl -tag -offset indent -width ".Dv MM_WARNING"
-.It Dv MM_HALT
-The application has confronted a serious fault and is halting.
-.It Dv MM_ERROR
-The application has detected a fault.
-.It Dv MM_WARNING
-The application has detected an unusual condition,
-that could be indicative of a problem.
-.It Dv MM_INFO
-The application is providing information about a non-error condition.
-.It Dv MM_NOSEV
-No severity level supplied.
-.El
-.Pp
-The
-.Fa text
-argument details the error condition that caused the message.
-There is no limit on the size of this character string.
-The
-.Dv MM_NULLTXT
-manifest constant may be used to specify no text.
-.Pp
-The
-.Fa action
-argument details how the error-recovery process should begin.
-Upon output,
-.Fn fmtmsg
-will prefix
-.Qq Li "TO FIX:"
-to the beginning of the
-.Fa action
-argument.
-The
-.Dv MM_NULLACT
-manifest constant may be used to specify no action.
-.Pp
-The
-.Fa tag
-argument should reference online documentation for the message.
-This usually includes the
-.Fa label
-and a unique identifying number.
-An example tag is
-.Qq Li BSD:ls:168 .
-The
-.Dv MM_NULLTAG
-manifest constant may be used to specify no tag.
-.Sh RETURN VALUES
-The
-.Fn fmtmsg
-function returns
-.Dv MM_OK
-upon success,
-.Dv MM_NOMSG
-to indicate output to
-.Dv stderr
-failed,
-.Dv MM_NOCON
-to indicate output to the system console failed, or
-.Dv MM_NOTOK
-to indicate output to
-.Dv stderr
-and the system console failed.
-.Sh ENVIRONMENT
-The
-.Ev MSGVERB
-(message verbosity)
-environment variable specifies which arguments to
-.Fn fmtmsg
-will be output to
-.Dv stderr ,
-and in which order.
-.Ev MSGVERB
-should be a colon
-.Pq Ql \&:
-separated list of identifiers.
-Valid identifiers include:
-.Li label , severity , text , action ,
-and
-.Li tag .
-If invalid identifiers are specified or incorrectly separated,
-the default message verbosity and ordering will be used.
-The default ordering is equivalent to a
-.Ev MSGVERB
-with a value of
-.Qq Li label:severity:text:action:tag .
-.Sh EXAMPLES
-The code:
-.Bd -literal -offset indent
-fmtmsg(MM_UTIL | MM_PRINT, "BSD:ls", MM_ERROR,
-    "illegal option -- z", "refer to manual", "BSD:ls:001");
-.Ed
-.Pp
-will output:
-.Bd -literal -offset indent
-BSD:ls: ERROR: illegal option -- z
-TO FIX: refer to manual BSD:ls:001
-.Ed
-.Pp
-to
-.Dv stderr .
-.Pp
-The same code, with
-.Ev MSGVERB
-set to
-.Qq Li "text:severity:action:tag" ,
-produces:
-.Bd -literal -offset indent
-illegal option -- z: ERROR
-TO FIX: refer to manual BSD:ls:001
-.Ed
-.Sh SEE ALSO
-.Xr err 3 ,
-.Xr exit 3 ,
-.Xr strerror 3
-.Sh STANDARDS
-The
-.Fn fmtmsg
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn fmtmsg
-function first appeared in
-.Fx 5.0 .
-.Sh BUGS
-Specifying
-.Dv MM_NULLMC
-for the
-.Fa classification
-argument makes little sense, since without an output specified,
-.Fn fmtmsg
-is unable to do anything useful.
-.Pp
-In order for
-.Fn fmtmsg
-to output to the system console, the effective
-user must have appropriate permission to write to
-.Pa /dev/console .
-This means that on most systems
-.Fn fmtmsg
-will return
-.Dv MM_NOCON
-unless the effective user is root.
diff --git a/lib/libc_bsd/gen/fmtmsg.c b/lib/libc_bsd/gen/fmtmsg.c
deleted file mode 100644
index aa174d5..0000000
--- a/lib/libc_bsd/gen/fmtmsg.c
+++ /dev/null
@@ -1,220 +0,0 @@
-/*-
- * Copyright (c) 2002 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/fmtmsg.c 244092 2012-12-10 17:56:51Z jilles $");
-
-#include <fmtmsg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* Default value for MSGVERB. */
-#define	DFLT_MSGVERB	"label:severity:text:action:tag"
-
-/* Maximum valid size for a MSGVERB. */
-#define	MAX_MSGVERB	sizeof(DFLT_MSGVERB)
-
-static char	*printfmt(char *, long, const char *, int, const char *,
-		    const char *, const char *);
-static char	*nextcomp(const char *);
-static const char
-		*sevinfo(int);
-static int	 validmsgverb(const char *);
-
-int
-fmtmsg(long class, const char *label, int sev, const char *text,
-    const char *action, const char *tag)
-{
-	FILE *fp;
-	char *env, *msgverb, *output;
-
-	if (class & MM_PRINT) {
-		if ((env = getenv("MSGVERB")) != NULL && *env != '\0' &&
-		    strlen(env) <= strlen(DFLT_MSGVERB)) {
-			if ((msgverb = strdup(env)) == NULL)
-				return (MM_NOTOK);
-			else if (validmsgverb(msgverb) == 0) {
-				free(msgverb);
-				goto def;
-			}
-		} else {
-def:
-			if ((msgverb = strdup(DFLT_MSGVERB)) == NULL)
-				return (MM_NOTOK);
-		}
-		output = printfmt(msgverb, class, label, sev, text, action,
-		    tag);
-		if (output == NULL) {
-			free(msgverb);
-			return (MM_NOTOK);
-		}
-		if (*output != '\0')
-			fprintf(stderr, "%s", output);
-		free(msgverb);
-		free(output);
-	}
-	if (class & MM_CONSOLE) {
-		output = printfmt(DFLT_MSGVERB, class, label, sev, text,
-		    action, tag);
-		if (output == NULL)
-			return (MM_NOCON);
-		if (*output != '\0') {
-			if ((fp = fopen("/dev/console", "ae")) == NULL) {
-				free(output);
-				return (MM_NOCON);
-			}
-			fprintf(fp, "%s", output);
-			fclose(fp);
-		}
-		free(output);
-	}
-	return (MM_OK);
-}
-
-#define INSERT_COLON							\
-	if (*output != '\0')						\
-		strlcat(output, ": ", size)
-#define INSERT_NEWLINE							\
-	if (*output != '\0')						\
-		strlcat(output, "\n", size)
-#define INSERT_SPACE							\
-	if (*output != '\0')						\
-		strlcat(output, " ", size)
-
-/*
- * Returns NULL on memory allocation failure, otherwise returns a pointer to
- * a newly malloc()'d output buffer.
- */
-static char *
-printfmt(char *msgverb, long class, const char *label, int sev,
-    const char *text, const char *act, const char *tag)
-{
-	size_t size;
-	char *comp, *output;
-	const char *sevname;
-
-	size = 32;
-	if (label != MM_NULLLBL)
-		size += strlen(label);
-	if ((sevname = sevinfo(sev)) != NULL)
-		size += strlen(sevname);
-	if (text != MM_NULLTXT)
-		size += strlen(text);
-	if (act != MM_NULLACT)
-		size += strlen(act);
-	if (tag != MM_NULLTAG)
-		size += strlen(tag);
-
-	if ((output = malloc(size)) == NULL)
-		return (NULL);
-	*output = '\0';
-	while ((comp = nextcomp(msgverb)) != NULL) {
-		if (strcmp(comp, "label") == 0 && label != MM_NULLLBL) {
-			INSERT_COLON;
-			strlcat(output, label, size);
-		} else if (strcmp(comp, "severity") == 0 && sevname != NULL) {
-			INSERT_COLON;
-			strlcat(output, sevinfo(sev), size);
-		} else if (strcmp(comp, "text") == 0 && text != MM_NULLTXT) {
-			INSERT_COLON;
-			strlcat(output, text, size);
-		} else if (strcmp(comp, "action") == 0 && act != MM_NULLACT) {
-			INSERT_NEWLINE;
-			strlcat(output, "TO FIX: ", size);
-			strlcat(output, act, size);
-		} else if (strcmp(comp, "tag") == 0 && tag != MM_NULLTAG) {
-			INSERT_SPACE;
-			strlcat(output, tag, size);
-		}
-	}
-	INSERT_NEWLINE;
-	return (output);
-}
-
-/*
- * Returns a component of a colon delimited string.  NULL is returned to
- * indicate that there are no remaining components.  This function must be
- * called until it returns NULL in order for the local state to be cleared.
- */
-static char *
-nextcomp(const char *msgverb)
-{
-	static char lmsgverb[MAX_MSGVERB], *state;
-	char *retval;
-	
-	if (*lmsgverb == '\0') {
-		strlcpy(lmsgverb, msgverb, sizeof(lmsgverb));
-		retval = strtok_r(lmsgverb, ":", &state);
-	} else {
-		retval = strtok_r(NULL, ":", &state);
-	}
-	if (retval == NULL)
-		*lmsgverb = '\0';
-	return (retval);
-}
-
-static const char *
-sevinfo(int sev)
-{
-
-	switch (sev) {
-	case MM_HALT:
-		return ("HALT");
-	case MM_ERROR:
-		return ("ERROR");
-	case MM_WARNING:
-		return ("WARNING");
-	case MM_INFO:
-		return ("INFO");
-	default:
-		return (NULL);
-	}
-}
-
-/*
- * Returns 1 if the msgverb list is valid, otherwise 0.
- */
-static int
-validmsgverb(const char *msgverb)
-{
-	const char *validlist = "label\0severity\0text\0action\0tag\0";
-	char *msgcomp;
-	size_t len1, len2;
-	const char *p;
-	int equality;
-
-	equality = 0;
-	while ((msgcomp = nextcomp(msgverb)) != NULL) {
-		equality--;
-		len1 = strlen(msgcomp);
-		for (p = validlist; (len2 = strlen(p)) != 0; p += len2 + 1) {
-			if (len1 == len2 && memcmp(msgcomp, p, len1) == 0)
-				equality++;
-		}
-	}
-	return (!equality);
-}
diff --git a/lib/libc_bsd/gen/fnmatch.3 b/lib/libc_bsd/gen/fnmatch.3
deleted file mode 100644
index 4a3bf86..0000000
--- a/lib/libc_bsd/gen/fnmatch.3
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Guido van Rossum.
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fnmatch.3	8.3 (Berkeley) 4/28/95
-.\" $FreeBSD: releng/10.2/lib/libc/gen/fnmatch.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd July 18, 2004
-.Dt FNMATCH 3
-.Os
-.Sh NAME
-.Nm fnmatch
-.Nd test whether a filename or pathname matches a shell-style pattern
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fnmatch.h
-.Ft int
-.Fn fnmatch "const char *pattern" "const char *string" "int flags"
-.Sh DESCRIPTION
-The
-.Fn fnmatch
-function
-matches patterns according to the rules used by the shell.
-It checks the string specified by the
-.Fa string
-argument to see if it matches the pattern specified by the
-.Fa pattern
-argument.
-.Pp
-The
-.Fa flags
-argument modifies the interpretation of
-.Fa pattern
-and
-.Fa string .
-The value of
-.Fa flags
-is the bitwise inclusive
-.Tn OR
-of any of the following
-constants, which are defined in the include file
-.In fnmatch.h .
-.Bl -tag -width FNM_PATHNAME
-.It Dv FNM_NOESCAPE
-Normally, every occurrence of a backslash
-.Pq Ql \e
-followed by a character in
-.Fa pattern
-is replaced by that character.
-This is done to negate any special meaning for the character.
-If the
-.Dv FNM_NOESCAPE
-flag is set, a backslash character is treated as an ordinary character.
-.It Dv FNM_PATHNAME
-Slash characters in
-.Fa string
-must be explicitly matched by slashes in
-.Fa pattern .
-If this flag is not set, then slashes are treated as regular characters.
-.It Dv FNM_PERIOD
-Leading periods in
-.Fa string
-must be explicitly matched by periods in
-.Fa pattern .
-If this flag is not set, then leading periods are treated as regular
-characters.
-The definition of
-.Dq leading
-is related to the specification of
-.Dv FNM_PATHNAME .
-A period is always
-.Dq leading
-if it is the first character in
-.Fa string .
-Additionally, if
-.Dv FNM_PATHNAME
-is set,
-a period is
-leading
-if it immediately follows a slash.
-.It Dv FNM_LEADING_DIR
-Ignore
-.Dq Li /*
-rest after successful
-.Fa pattern
-matching.
-.It Dv FNM_CASEFOLD
-Ignore case distinctions in both the
-.Fa pattern
-and the
-.Fa string .
-.El
-.Sh RETURN VALUES
-The
-.Fn fnmatch
-function returns zero if
-.Fa string
-matches the pattern specified by
-.Fa pattern ,
-otherwise, it returns the value
-.Dv FNM_NOMATCH .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr glob 3 ,
-.Xr regex 3
-.Sh STANDARDS
-The current implementation of the
-.Fn fnmatch
-function
-.Em does not
-conform to
-.St -p1003.2 .
-Collating symbol expressions, equivalence class expressions and
-character class expressions are not supported.
-.Sh HISTORY
-The
-.Fn fnmatch
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The pattern
-.Ql *
-matches the empty string, even if
-.Dv FNM_PATHNAME
-is specified.
diff --git a/lib/libc_bsd/gen/fnmatch.c b/lib/libc_bsd/gen/fnmatch.c
deleted file mode 100644
index 6b635e0..0000000
--- a/lib/libc_bsd/gen/fnmatch.c
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fnmatch.c	8.2 (Berkeley) 4/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/fnmatch.c 254091 2013-08-08 09:04:02Z ache $");
-
-/*
- * Function fnmatch() as specified in POSIX 1003.2-1992, section B.6.
- * Compares a filename or pathname to a pattern.
- */
-
-/*
- * Some notes on multibyte character support:
- * 1. Patterns with illegal byte sequences match nothing.
- * 2. Illegal byte sequences in the "string" argument are handled by treating
- *    them as single-byte characters with a value of the first byte of the
- *    sequence cast to wchar_t.
- * 3. Multibyte conversion state objects (mbstate_t) are passed around and
- *    used for most, but not all, conversions. Further work will be required
- *    to support state-dependent encodings.
- */
-
-#include <fnmatch.h>
-#include <limits.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "collate.h"
-
-#define	EOS	'\0'
-
-#define RANGE_MATCH     1
-#define RANGE_NOMATCH   0
-#define RANGE_ERROR     (-1)
-
-static int rangematch(const char *, wchar_t, int, char **, mbstate_t *);
-static int fnmatch1(const char *, const char *, const char *, int, mbstate_t,
-		mbstate_t);
-
-int
-fnmatch(pattern, string, flags)
-	const char *pattern, *string;
-	int flags;
-{
-	static const mbstate_t initial;
-
-	return (fnmatch1(pattern, string, string, flags, initial, initial));
-}
-
-static int
-fnmatch1(pattern, string, stringstart, flags, patmbs, strmbs)
-	const char *pattern, *string, *stringstart;
-	int flags;
-	mbstate_t patmbs, strmbs;
-{
-	char *newp;
-	char c;
-	wchar_t pc, sc;
-	size_t pclen, sclen;
-
-	for (;;) {
-		pclen = mbrtowc(&pc, pattern, MB_LEN_MAX, &patmbs);
-		if (pclen == (size_t)-1 || pclen == (size_t)-2)
-			return (FNM_NOMATCH);
-		pattern += pclen;
-		sclen = mbrtowc(&sc, string, MB_LEN_MAX, &strmbs);
-		if (sclen == (size_t)-1 || sclen == (size_t)-2) {
-			sc = (unsigned char)*string;
-			sclen = 1;
-			memset(&strmbs, 0, sizeof(strmbs));
-		}
-		switch (pc) {
-		case EOS:
-			if ((flags & FNM_LEADING_DIR) && sc == '/')
-				return (0);
-			return (sc == EOS ? 0 : FNM_NOMATCH);
-		case '?':
-			if (sc == EOS)
-				return (FNM_NOMATCH);
-			if (sc == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (sc == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-			string += sclen;
-			break;
-		case '*':
-			c = *pattern;
-			/* Collapse multiple stars. */
-			while (c == '*')
-				c = *++pattern;
-
-			if (sc == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			/* Optimize for pattern with * at end or before /. */
-			if (c == EOS)
-				if (flags & FNM_PATHNAME)
-					return ((flags & FNM_LEADING_DIR) ||
-					    strchr(string, '/') == NULL ?
-					    0 : FNM_NOMATCH);
-				else
-					return (0);
-			else if (c == '/' && flags & FNM_PATHNAME) {
-				if ((string = strchr(string, '/')) == NULL)
-					return (FNM_NOMATCH);
-				break;
-			}
-
-			/* General case, use recursion. */
-			while (sc != EOS) {
-				if (!fnmatch1(pattern, string, stringstart,
-				    flags, patmbs, strmbs))
-					return (0);
-				sclen = mbrtowc(&sc, string, MB_LEN_MAX,
-				    &strmbs);
-				if (sclen == (size_t)-1 ||
-				    sclen == (size_t)-2) {
-					sc = (unsigned char)*string;
-					sclen = 1;
-					memset(&strmbs, 0, sizeof(strmbs));
-				}
-				if (sc == '/' && flags & FNM_PATHNAME)
-					break;
-				string += sclen;
-			}
-			return (FNM_NOMATCH);
-		case '[':
-			if (sc == EOS)
-				return (FNM_NOMATCH);
-			if (sc == '/' && (flags & FNM_PATHNAME))
-				return (FNM_NOMATCH);
-			if (sc == '.' && (flags & FNM_PERIOD) &&
-			    (string == stringstart ||
-			    ((flags & FNM_PATHNAME) && *(string - 1) == '/')))
-				return (FNM_NOMATCH);
-
-			switch (rangematch(pattern, sc, flags, &newp,
-			    &patmbs)) {
-			case RANGE_ERROR:
-				goto norm;
-			case RANGE_MATCH:
-				pattern = newp;
-				break;
-			case RANGE_NOMATCH:
-				return (FNM_NOMATCH);
-			}
-			string += sclen;
-			break;
-		case '\\':
-			if (!(flags & FNM_NOESCAPE)) {
-				pclen = mbrtowc(&pc, pattern, MB_LEN_MAX,
-				    &patmbs);
-				if (pclen == (size_t)-1 || pclen == (size_t)-2)
-					return (FNM_NOMATCH);
-				pattern += pclen;
-			}
-			/* FALLTHROUGH */
-		default:
-		norm:
-			if (pc == sc)
-				;
-			else if ((flags & FNM_CASEFOLD) &&
-				 (towlower(pc) == towlower(sc)))
-				;
-			else
-				return (FNM_NOMATCH);
-			string += sclen;
-			break;
-		}
-	}
-	/* NOTREACHED */
-}
-
-static int
-rangematch(pattern, test, flags, newp, patmbs)
-	const char *pattern;
-	wchar_t test;
-	int flags;
-	char **newp;
-	mbstate_t *patmbs;
-{
-	int negate, ok;
-	wchar_t c, c2;
-	size_t pclen;
-	const char *origpat;
-	struct xlocale_collate *table =
-		(struct xlocale_collate*)__get_locale()->components[XLC_COLLATE];
-
-	/*
-	 * A bracket expression starting with an unquoted circumflex
-	 * character produces unspecified results (IEEE 1003.2-1992,
-	 * 3.13.2).  This implementation treats it like '!', for
-	 * consistency with the regular expression syntax.
-	 * J.T. Conklin (conklin@ngai.kaleida.com)
-	 */
-	if ( (negate = (*pattern == '!' || *pattern == '^')) )
-		++pattern;
-
-	if (flags & FNM_CASEFOLD)
-		test = towlower(test);
-
-	/*
-	 * A right bracket shall lose its special meaning and represent
-	 * itself in a bracket expression if it occurs first in the list.
-	 * -- POSIX.2 2.8.3.2
-	 */
-	ok = 0;
-	origpat = pattern;
-	for (;;) {
-		if (*pattern == ']' && pattern > origpat) {
-			pattern++;
-			break;
-		} else if (*pattern == '\0') {
-			return (RANGE_ERROR);
-		} else if (*pattern == '/' && (flags & FNM_PATHNAME)) {
-			return (RANGE_NOMATCH);
-		} else if (*pattern == '\\' && !(flags & FNM_NOESCAPE))
-			pattern++;
-		pclen = mbrtowc(&c, pattern, MB_LEN_MAX, patmbs);
-		if (pclen == (size_t)-1 || pclen == (size_t)-2)
-			return (RANGE_NOMATCH);
-		pattern += pclen;
-
-		if (flags & FNM_CASEFOLD)
-			c = towlower(c);
-
-		if (*pattern == '-' && *(pattern + 1) != EOS &&
-		    *(pattern + 1) != ']') {
-			if (*++pattern == '\\' && !(flags & FNM_NOESCAPE))
-				if (*pattern != EOS)
-					pattern++;
-			pclen = mbrtowc(&c2, pattern, MB_LEN_MAX, patmbs);
-			if (pclen == (size_t)-1 || pclen == (size_t)-2)
-				return (RANGE_NOMATCH);
-			pattern += pclen;
-			if (c2 == EOS)
-				return (RANGE_ERROR);
-
-			if (flags & FNM_CASEFOLD)
-				c2 = towlower(c2);
-
-			if (table->__collate_load_error ?
-			    c <= test && test <= c2 :
-			       __collate_range_cmp(table, c, test) <= 0
-			    && __collate_range_cmp(table, test, c2) <= 0
-			   )
-				ok = 1;
-		} else if (c == test)
-			ok = 1;
-	}
-
-	*newp = (char *)pattern;
-	return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH);
-}
diff --git a/lib/libc_bsd/gen/fpclassify.3 b/lib/libc_bsd/gen/fpclassify.3
deleted file mode 100644
index c7f8ec8..0000000
--- a/lib/libc_bsd/gen/fpclassify.3
+++ /dev/null
@@ -1,133 +0,0 @@
-.\" Copyright (c) 2003 Mike Barcroft <mike@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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/fpclassify.3 140890 2005-01-27 05:46:17Z das $
-.\"
-.Dd January 26, 2005
-.Dt FPCLASSIFY 3
-.Os
-.Sh NAME
-.Nm fpclassify , isfinite , isinf , isnan , isnormal
-.Nd "classify a floating-point number"
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn fpclassify "real-floating x"
-.Ft int
-.Fn isfinite "real-floating x"
-.Ft int
-.Fn isinf "real-floating x"
-.Ft int
-.Fn isnan "real-floating x"
-.Ft int
-.Fn isnormal "real-floating x"
-.Sh DESCRIPTION
-The
-.Fn fpclassify
-macro takes an argument of
-.Fa x
-and returns one of the following manifest constants.
-.Bl -tag -width ".Dv FP_SUBNORMAL"
-.It Dv FP_INFINITE
-Indicates that
-.Fa x
-is an infinite number.
-.It Dv FP_NAN
-Indicates that
-.Fa x
-is not a number (NaN).
-.It Dv FP_NORMAL
-Indicates that
-.Fa x
-is a normalized number.
-.It Dv FP_SUBNORMAL
-Indicates that
-.Fa x
-is a denormalized number.
-.It Dv FP_ZERO
-Indicates that
-.Fa x
-is zero (0 or \-0).
-.El
-.Pp
-The
-.Fn isfinite
-macro returns a non-zero value if and only if its argument has
-a finite (zero, subnormal, or normal) value.
-The
-.Fn isinf ,
-.Fn isnan ,
-and
-.Fn isnormal
-macros return non-zero if and only if
-.Fa x
-is an infinity, NaN,
-or a non-zero normalized number, respectively.
-.Pp
-The symbol
-.Fn isnanf
-is provided as an alias to
-.Fn isnan
-for compatibility, and its use is deprecated.
-Similarly,
-.Fn finite
-and
-.Fn finitef
-are deprecated versions of
-.Fn isfinite .
-.Sh SEE ALSO
-.Xr isgreater 3 ,
-.Xr math 3 ,
-.Xr signbit 3
-.Sh STANDARDS
-The
-.Fn fpclassify ,
-.Fn isfinite ,
-.Fn isinf ,
-.Fn isnan ,
-and
-.Fn isnormal
-macros conform to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn fpclassify ,
-.Fn isfinite ,
-.Fn isinf ,
-.Fn isnan ,
-and
-.Fn isnormal
-macros were added in
-.Fx 5.1 .
-.Bx 3
-introduced
-.Fn isinf
-and
-.Fn isnan
-functions, which accepted
-.Vt double
-arguments; these have been superseded by the macros
-described above.
diff --git a/lib/libc_bsd/gen/fpclassify.c b/lib/libc_bsd/gen/fpclassify.c
deleted file mode 100644
index 3d04b33..0000000
--- a/lib/libc_bsd/gen/fpclassify.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2002, 2003 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/gen/fpclassify.c 141379 2005-02-06 03:23:31Z das $
- */
-
-#include <sys/endian.h>
-
-#include <math.h>
-#include <stdint.h>
-
-#include "fpmath.h"
-
-int
-__fpclassifyf(float f)
-{
-	union IEEEf2bits u;
-
-	u.f = f;
-	if (u.bits.exp == 0) {
-		if (u.bits.man == 0)
-			return (FP_ZERO);
-		return (FP_SUBNORMAL);
-	}
-	if (u.bits.exp == 255) {
-		if (u.bits.man == 0)
-			return (FP_INFINITE);
-		return (FP_NAN);
-	}
-	return (FP_NORMAL);
-}
-
-int
-__fpclassifyd(double d)
-{
-	union IEEEd2bits u;
-
-	u.d = d;
-	if (u.bits.exp == 0) {
-		if ((u.bits.manl | u.bits.manh) == 0)
-			return (FP_ZERO);
-		return (FP_SUBNORMAL);
-	}
-	if (u.bits.exp == 2047) {
-		if ((u.bits.manl | u.bits.manh) == 0)
-			return (FP_INFINITE);
-		return (FP_NAN);
-	}
-	return (FP_NORMAL);
-}
-
-int
-__fpclassifyl(long double e)
-{
-	union IEEEl2bits u;
-
-	u.e = e;
-	if (u.bits.exp == 0) {
-		if ((u.bits.manl | u.bits.manh) == 0)
-			return (FP_ZERO);
-		return (FP_SUBNORMAL);
-	}
-	mask_nbit_l(u);		/* Mask normalization bit if applicable. */
-	if (u.bits.exp == 32767) {
-		if ((u.bits.manl | u.bits.manh) == 0)
-			return (FP_INFINITE);
-		return (FP_NAN);
-	}
-	return (FP_NORMAL);
-}
diff --git a/lib/libc_bsd/gen/frexp.3 b/lib/libc_bsd/gen/frexp.3
deleted file mode 100644
index 6bcad2e..0000000
--- a/lib/libc_bsd/gen/frexp.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)frexp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/frexp.3 206616 2010-04-14 18:29:34Z uqs $
-.\"
-.Dd March 4, 2005
-.Dt FREXP 3
-.Os
-.Sh NAME
-.Nm frexp ,
-.Nm frexpf ,
-.Nm frexpl
-.Nd convert floating-point number to fractional and integral components
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn frexp "double value" "int *exp"
-.Ft float
-.Fn frexpf "float value" "int *exp"
-.Ft long double
-.Fn frexpl "long double value" "int *exp"
-.Sh DESCRIPTION
-The
-.Fn frexp ,
-.Fn frexpf
-and
-.Fn frexpl
-functions break a floating-point number into a normalized
-fraction and an integral power of 2.
-They store the integer in the
-.Vt int
-object pointed to by
-.Fa exp .
-.Sh RETURN VALUES
-These functions return the value
-.Va x ,
-such that
-.Va x
-is a
-.Vt double
-with magnitude in the interval
-.Eo [ 1/2 , 1 Ec )
-or zero, and
-.Fa value
-equals
-.Va x
-times 2 raised to the power
-.Fa *exp .
-If
-.Fa value
-is zero, both parts of the result are zero.
-.Sh SEE ALSO
-.Xr ldexp 3 ,
-.Xr math 3 ,
-.Xr modf 3
-.Sh STANDARDS
-The
-.Fn frexp ,
-.Fn frexpf ,
-and
-.Fn frexpl
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/gen/frexp.c b/lib/libc_bsd/gen/frexp.c
deleted file mode 100644
index 71710bd..0000000
--- a/lib/libc_bsd/gen/frexp.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2004 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/gen/frexp.c 132366 2004-07-18 21:23:39Z das $
- */
-
-#include <math.h>
-
-#include "fpmath.h"
-
-double
-frexp(double d, int *ex)
-{
-	union IEEEd2bits u;
-
-	u.d = d;
-	switch (u.bits.exp) {
-	case 0:		/* 0 or subnormal */
-		if ((u.bits.manl | u.bits.manh) == 0) {
-			*ex = 0;
-		} else {
-			u.d *= 0x1.0p514;
-			*ex = u.bits.exp - 1536;
-			u.bits.exp = 1022;
-		}
-		break;
-	case 2047:	/* infinity or NaN; value of *ex is unspecified */
-		break;
-	default:	/* normal */
-		*ex = u.bits.exp - 1022;
-		u.bits.exp = 1022;
-		break;
-	}
-	return (u.d);
-}
diff --git a/lib/libc_bsd/gen/fstab.c b/lib/libc_bsd/gen/fstab.c
deleted file mode 100644
index 6f5d41e..0000000
--- a/lib/libc_bsd/gen/fstab.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright (c) 1980, 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fstab.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/fstab.c 243865 2012-12-04 16:54:43Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fstab.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <vis.h>
-#include "un-namespace.h"
-
-static FILE *_fs_fp;
-static struct fstab _fs_fstab;
-static int LineNo = 0;
-static char *path_fstab;
-static char fstab_path[PATH_MAX];
-static int fsp_set = 0;
-
-static void error(int);
-static void fixfsfile(void);
-static int fstabscan(void);
-
-void
-setfstab(const char *file)
-{
-
-	if (file == NULL) {
-		path_fstab = _PATH_FSTAB;
-	} else {
-		strncpy(fstab_path, file, PATH_MAX);
-		fstab_path[PATH_MAX - 1] = '\0';
-		path_fstab = fstab_path;
-	}
-	fsp_set = 1;
-
-	return;
-}
-
-const char *
-getfstab(void)
-{
-
-	if (fsp_set)
-		return (path_fstab);
-	else
-		return (_PATH_FSTAB);
-}
-
-static void
-fixfsfile(void)
-{
-	static char buf[sizeof(_PATH_DEV) + MNAMELEN];
-	struct stat sb;
-	struct statfs sf;
-
-	if (_fs_fstab.fs_file != NULL && strcmp(_fs_fstab.fs_file, "/") != 0)
-		return;
-	if (statfs("/", &sf) != 0)
-		return;
-	if (sf.f_mntfromname[0] == '/')
-		buf[0] = '\0';
-	else
-		strcpy(buf, _PATH_DEV);
-	strcat(buf, sf.f_mntfromname);
-	if (stat(buf, &sb) != 0 ||
-	    (!S_ISBLK(sb.st_mode) && !S_ISCHR(sb.st_mode)))
-		return;
-	_fs_fstab.fs_spec = buf;
-}
-
-static int
-fstabscan(void)
-{
-	char *cp, *p;
-#define	MAXLINELENGTH	1024
-	static char line[MAXLINELENGTH];
-	char subline[MAXLINELENGTH];
-	int typexx;
-
-	for (;;) {
-
-		if (!(p = fgets(line, sizeof(line), _fs_fp)))
-			return (0);
-/* OLD_STYLE_FSTAB */
-		++LineNo;
-		if (*line == '#' || *line == '\n')
-			continue;
-		if (!strpbrk(p, " \t")) {
-			_fs_fstab.fs_spec = strsep(&p, ":\n");
-			_fs_fstab.fs_file = strsep(&p, ":\n");
-			fixfsfile();
-			_fs_fstab.fs_type = strsep(&p, ":\n");
-			if (_fs_fstab.fs_type) {
-				if (!strcmp(_fs_fstab.fs_type, FSTAB_XX))
-					continue;
-				_fs_fstab.fs_mntops = _fs_fstab.fs_type;
-				_fs_fstab.fs_vfstype =
-				    strcmp(_fs_fstab.fs_type, FSTAB_SW) ?
-				    "ufs" : "swap";
-				if ((cp = strsep(&p, ":\n")) != NULL) {
-					_fs_fstab.fs_freq = atoi(cp);
-					if ((cp = strsep(&p, ":\n")) != NULL) {
-						_fs_fstab.fs_passno = atoi(cp);
-						return (1);
-					}
-				}
-			}
-			goto bad;
-		}
-/* OLD_STYLE_FSTAB */
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		_fs_fstab.fs_spec = cp;
-		if (_fs_fstab.fs_spec == NULL || *_fs_fstab.fs_spec == '#')
-			continue;
-		if (strunvis(_fs_fstab.fs_spec, _fs_fstab.fs_spec) < 0)
-			goto bad;
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		_fs_fstab.fs_file = cp;
-		if (_fs_fstab.fs_file == NULL)
-			goto bad;
-		if (strunvis(_fs_fstab.fs_file, _fs_fstab.fs_file) < 0)
-			goto bad;
-		fixfsfile();
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		_fs_fstab.fs_vfstype = cp;
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		_fs_fstab.fs_mntops = cp;
-		if (_fs_fstab.fs_mntops == NULL)
-			goto bad;
-		_fs_fstab.fs_freq = 0;
-		_fs_fstab.fs_passno = 0;
-		while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-			;
-		if (cp != NULL) {
-			_fs_fstab.fs_freq = atoi(cp);
-			while ((cp = strsep(&p, " \t\n")) != NULL && *cp == '\0')
-				;
-			if (cp != NULL)
-				_fs_fstab.fs_passno = atoi(cp);
-		}
-		strcpy(subline, _fs_fstab.fs_mntops);
-		p = subline;
-		for (typexx = 0, cp = strsep(&p, ","); cp;
-		     cp = strsep(&p, ",")) {
-			if (strlen(cp) != 2)
-				continue;
-			if (!strcmp(cp, FSTAB_RW)) {
-				_fs_fstab.fs_type = FSTAB_RW;
-				break;
-			}
-			if (!strcmp(cp, FSTAB_RQ)) {
-				_fs_fstab.fs_type = FSTAB_RQ;
-				break;
-			}
-			if (!strcmp(cp, FSTAB_RO)) {
-				_fs_fstab.fs_type = FSTAB_RO;
-				break;
-			}
-			if (!strcmp(cp, FSTAB_SW)) {
-				_fs_fstab.fs_type = FSTAB_SW;
-				break;
-			}
-			if (!strcmp(cp, FSTAB_XX)) {
-				_fs_fstab.fs_type = FSTAB_XX;
-				typexx++;
-				break;
-			}
-		}
-		if (typexx)
-			continue;
-		if (cp != NULL)
-			return (1);
-
-bad:		/* no way to distinguish between EOF and syntax error */
-		error(EFTYPE);
-	}
-	/* NOTREACHED */
-}
-
-struct fstab *
-getfsent(void)
-{
-
-	if ((!_fs_fp && !setfsent()) || !fstabscan())
-		return (NULL);
-	return (&_fs_fstab);
-}
-
-struct fstab *
-getfsspec(const char *name)
-{
-
-	if (setfsent())
-		while (fstabscan())
-			if (!strcmp(_fs_fstab.fs_spec, name))
-				return (&_fs_fstab);
-	return (NULL);
-}
-
-struct fstab *
-getfsfile(const char *name)
-{
-
-	if (setfsent())
-		while (fstabscan())
-			if (!strcmp(_fs_fstab.fs_file, name))
-				return (&_fs_fstab);
-	return (NULL);
-}
-
-int
-setfsent(void)
-{
-	if (_fs_fp) {
-		rewind(_fs_fp);
-		LineNo = 0;
-		return (1);
-	}
-	if (fsp_set == 0) {
-		if (issetugid())
-			setfstab(NULL);
-		else
-			setfstab(getenv("PATH_FSTAB"));
-	}
-	if ((_fs_fp = fopen(path_fstab, "re")) != NULL) {
-		LineNo = 0;
-		return (1);
-	}
-	error(errno);
-	return (0);
-}
-
-void
-endfsent(void)
-{
-
-	if (_fs_fp) {
-		(void)fclose(_fs_fp);
-		_fs_fp = NULL;
-	}
-
-	fsp_set = 0;
-}
-
-static void
-error(int err)
-{
-	char *p;
-	char num[30];
-
-	(void)_write(STDERR_FILENO, "fstab: ", 7);
-	(void)_write(STDERR_FILENO, path_fstab, strlen(path_fstab));
-	(void)_write(STDERR_FILENO, ":", 1);
-	sprintf(num, "%d: ", LineNo);
-	(void)_write(STDERR_FILENO, num, strlen(num));
-	p = strerror(err);
-	(void)_write(STDERR_FILENO, p, strlen(p));
-	(void)_write(STDERR_FILENO, "\n", 1);
-}
diff --git a/lib/libc_bsd/gen/ftok.3 b/lib/libc_bsd/gen/ftok.3
deleted file mode 100644
index 2aaaec8..0000000
--- a/lib/libc_bsd/gen/ftok.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
-.\" 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 ``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 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: releng/10.2/lib/libc/gen/ftok.3 206622 2010-04-14 19:08:06Z uqs $
-.Dd July 9, 2009
-.Dt FTOK 3
-.Os
-.Sh NAME
-.Nm ftok
-.Nd create IPC identifier from path name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.Ft key_t
-.Fn ftok "const char *path" "int id"
-.Sh DESCRIPTION
-The
-.Fn ftok
-function attempts to create a unique key suitable for use with the
-.Xr msgget 2 ,
-.Xr semget 2
-and
-.Xr shmget 2
-functions given the
-.Fa path
-of an existing file and a user-selectable
-.Fa id .
-.Pp
-The specified
-.Fa path
-must specify an existing file that is accessible to the calling process
-or the call will fail.
-Also, note that links to files will return the
-same key, given the same
-.Fa id .
-.Sh RETURN VALUES
-The
-.Fn ftok
-function will return -1 if
-.Fa path
-does not exist or if it cannot be accessed by the calling process.
-.Sh SEE ALSO
-.Xr semget 2 ,
-.Xr shmget 2 ,
-.Xr msgget 2
-.Sh HISTORY
-The
-.Fn ftok
-function originates with System V and is typically used by programs
-that use the System V IPC routines.
-.Sh AUTHORS
-.An Thorsten Lockert Aq tholo@sigmasoft.com
-.Sh BUGS
-The returned key is computed based on the device minor number and inode of the
-specified
-.Fa path
-in combination with the lower 8 bits of the given
-.Fa id .
-Thus it is quite possible for the routine to return duplicate keys.
diff --git a/lib/libc_bsd/gen/ftok.c b/lib/libc_bsd/gen/ftok.c
deleted file mode 100644
index 3e3c828..0000000
--- a/lib/libc_bsd/gen/ftok.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1994 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/ftok.c 129926 2004-06-01 06:53:07Z tjr $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ipc.h>
-
-key_t
-ftok(path, id)
-	const char *path;
-	int id;
-{
-	struct stat st;
-
-	if (stat(path, &st) < 0)
-		return (key_t)-1;
-
-	return (key_t) (id << 24 | (st.st_dev & 0xff) << 16 | (st.st_ino & 0xffff));
-}
diff --git a/lib/libc_bsd/gen/fts-compat.c b/lib/libc_bsd/gen/fts-compat.c
deleted file mode 100644
index 83516ab..0000000
--- a/lib/libc_bsd/gen/fts-compat.c
+++ /dev/null
@@ -1,1246 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- * 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.
- *
- * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/fts-compat.c 241010 2012-09-27 22:05:54Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "fts-compat.h"
-#include "un-namespace.h"
-
-#include "gen-private.h"
-
-FTSENT	*__fts_children_44bsd(FTS *, int);
-int	 __fts_close_44bsd(FTS *);
-void	*__fts_get_clientptr_44bsd(FTS *);
-FTS	*__fts_get_stream_44bsd(FTSENT *);
-FTS	*__fts_open_44bsd(char * const *, int,
-	    int (*)(const FTSENT * const *, const FTSENT * const *));
-FTSENT	*__fts_read_44bsd(FTS *);
-int	 __fts_set_44bsd(FTS *, FTSENT *, int);
-void	 __fts_set_clientptr_44bsd(FTS *, void *);
-
-static FTSENT	*fts_alloc(FTS *, char *, int);
-static FTSENT	*fts_build(FTS *, int);
-static void	 fts_lfree(FTSENT *);
-static void	 fts_load(FTS *, FTSENT *);
-static size_t	 fts_maxarglen(char * const *);
-static void	 fts_padjust(FTS *, FTSENT *);
-static int	 fts_palloc(FTS *, size_t);
-static FTSENT	*fts_sort(FTS *, FTSENT *, int);
-static u_short	 fts_stat(FTS *, FTSENT *, int);
-static int	 fts_safe_changedir(FTS *, FTSENT *, int, char *);
-static int	 fts_ufslinks(FTS *, const FTSENT *);
-
-#define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-
-#define	CLR(opt)	(sp->fts_options &= ~(opt))
-#define	ISSET(opt)	(sp->fts_options & (opt))
-#define	SET(opt)	(sp->fts_options |= (opt))
-
-#define	FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && fchdir(fd))
-
-/* fts_build flags */
-#define	BCHILD		1		/* fts_children */
-#define	BNAMES		2		/* fts_children, names only */
-#define	BREAD		3		/* fts_read */
-
-/*
- * Internal representation of an FTS, including extra implementation
- * details.  The FTS returned from fts_open points to this structure's
- * ftsp_fts member (and can be cast to an _fts_private as required)
- */
-struct _fts_private {
-	FTS		ftsp_fts;
-	struct statfs	ftsp_statfs;
-	dev_t		ftsp_dev;
-	int		ftsp_linksreliable;
-};
-
-/*
- * The "FTS_NOSTAT" option can avoid a lot of calls to stat(2) if it
- * knows that a directory could not possibly have subdirectories.  This
- * is decided by looking at the link count: a subdirectory would
- * increment its parent's link count by virtue of its own ".." entry.
- * This assumption only holds for UFS-like filesystems that implement
- * links and directories this way, so we must punt for others.
- */
-
-static const char *ufslike_filesystems[] = {
-	"ufs",
-	"zfs",
-	"nfs",
-	"nfs4",
-	"ext2fs",
-	0
-};
-
-FTS *
-__fts_open_44bsd(argv, options, compar)
-	char * const *argv;
-	int options;
-	int (*compar)(const FTSENT * const *, const FTSENT * const *);
-{
-	struct _fts_private *priv;
-	FTS *sp;
-	FTSENT *p, *root;
-	int nitems;
-	FTSENT *parent, *tmp;
-	int len;
-
-	/* Options check. */
-	if (options & ~FTS_OPTIONMASK) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Allocate/initialize the stream. */
-	if ((priv = malloc(sizeof(*priv))) == NULL)
-		return (NULL);
-	memset(priv, 0, sizeof(*priv));
-	sp = &priv->ftsp_fts;
-	sp->fts_compar = compar;
-	sp->fts_options = options;
-
-	/* Shush, GCC. */
-	tmp = NULL;
-
-	/* Logical walks turn on NOCHDIR; symbolic links are too hard. */
-	if (ISSET(FTS_LOGICAL))
-		SET(FTS_NOCHDIR);
-
-	/*
-	 * Start out with 1K of path space, and enough, in any case,
-	 * to hold the user's paths.
-	 */
-	if (fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN)))
-		goto mem1;
-
-	/* Allocate/initialize root's parent. */
-	if ((parent = fts_alloc(sp, "", 0)) == NULL)
-		goto mem2;
-	parent->fts_level = FTS_ROOTPARENTLEVEL;
-
-	/* Allocate/initialize root(s). */
-	for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
-		/* Don't allow zero-length paths. */
-		if ((len = strlen(*argv)) == 0) {
-			errno = ENOENT;
-			goto mem3;
-		}
-
-		p = fts_alloc(sp, *argv, len);
-		p->fts_level = FTS_ROOTLEVEL;
-		p->fts_parent = parent;
-		p->fts_accpath = p->fts_name;
-		p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW));
-
-		/* Command-line "." and ".." are real directories. */
-		if (p->fts_info == FTS_DOT)
-			p->fts_info = FTS_D;
-
-		/*
-		 * If comparison routine supplied, traverse in sorted
-		 * order; otherwise traverse in the order specified.
-		 */
-		if (compar) {
-			p->fts_link = root;
-			root = p;
-		} else {
-			p->fts_link = NULL;
-			if (root == NULL)
-				tmp = root = p;
-			else {
-				tmp->fts_link = p;
-				tmp = p;
-			}
-		}
-	}
-	if (compar && nitems > 1)
-		root = fts_sort(sp, root, nitems);
-
-	/*
-	 * Allocate a dummy pointer and make fts_read think that we've just
-	 * finished the node before the root(s); set p->fts_info to FTS_INIT
-	 * so that everything about the "current" node is ignored.
-	 */
-	if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL)
-		goto mem3;
-	sp->fts_cur->fts_link = root;
-	sp->fts_cur->fts_info = FTS_INIT;
-
-	/*
-	 * If using chdir(2), grab a file descriptor pointing to dot to ensure
-	 * that we can get back here; this could be avoided for some paths,
-	 * but almost certainly not worth the effort.  Slashes, symbolic links,
-	 * and ".." are all fairly nasty problems.  Note, if we can't get the
-	 * descriptor we run anyway, just more slowly.
-	 */
-	if (!ISSET(FTS_NOCHDIR) &&
-	    (sp->fts_rfd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0)
-		SET(FTS_NOCHDIR);
-
-	return (sp);
-
-mem3:	fts_lfree(root);
-	free(parent);
-mem2:	free(sp->fts_path);
-mem1:	free(sp);
-	return (NULL);
-}
-
-static void
-fts_load(sp, p)
-	FTS *sp;
-	FTSENT *p;
-{
-	int len;
-	char *cp;
-
-	/*
-	 * Load the stream structure for the next traversal.  Since we don't
-	 * actually enter the directory until after the preorder visit, set
-	 * the fts_accpath field specially so the chdir gets done to the right
-	 * place and the user can access the first node.  From fts_open it's
-	 * known that the path will fit.
-	 */
-	len = p->fts_pathlen = p->fts_namelen;
-	memmove(sp->fts_path, p->fts_name, len + 1);
-	if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
-		len = strlen(++cp);
-		memmove(p->fts_name, cp, len + 1);
-		p->fts_namelen = len;
-	}
-	p->fts_accpath = p->fts_path = sp->fts_path;
-	sp->fts_dev = p->fts_dev;
-}
-
-int
-__fts_close_44bsd(sp)
-	FTS *sp;
-{
-	FTSENT *freep, *p;
-	int saved_errno;
-
-	/*
-	 * This still works if we haven't read anything -- the dummy structure
-	 * points to the root list, so we step through to the end of the root
-	 * list which has a valid parent pointer.
-	 */
-	if (sp->fts_cur) {
-		for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) {
-			freep = p;
-			p = p->fts_link != NULL ? p->fts_link : p->fts_parent;
-			free(freep);
-		}
-		free(p);
-	}
-
-	/* Free up child linked list, sort array, path buffer. */
-	if (sp->fts_child)
-		fts_lfree(sp->fts_child);
-	if (sp->fts_array)
-		free(sp->fts_array);
-	free(sp->fts_path);
-
-	/* Return to original directory, save errno if necessary. */
-	if (!ISSET(FTS_NOCHDIR)) {
-		saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
-		(void)_close(sp->fts_rfd);
-
-		/* Set errno and return. */
-		if (saved_errno != 0) {
-			/* Free up the stream pointer. */
-			free(sp);
-			errno = saved_errno;
-			return (-1);
-		}
-	}
-
-	/* Free up the stream pointer. */
-	free(sp);
-	return (0);
-}
-
-/*
- * Special case of "/" at the end of the path so that slashes aren't
- * appended which would cause paths to be written as "....//foo".
- */
-#define	NAPPEND(p)							\
-	(p->fts_path[p->fts_pathlen - 1] == '/'				\
-	    ? p->fts_pathlen - 1 : p->fts_pathlen)
-
-FTSENT *
-__fts_read_44bsd(sp)
-	FTS *sp;
-{
-	FTSENT *p, *tmp;
-	int instr;
-	char *t;
-	int saved_errno;
-
-	/* If finished or unrecoverable error, return NULL. */
-	if (sp->fts_cur == NULL || ISSET(FTS_STOP))
-		return (NULL);
-
-	/* Set current node pointer. */
-	p = sp->fts_cur;
-
-	/* Save and zero out user instructions. */
-	instr = p->fts_instr;
-	p->fts_instr = FTS_NOINSTR;
-
-	/* Any type of file may be re-visited; re-stat and re-turn. */
-	if (instr == FTS_AGAIN) {
-		p->fts_info = fts_stat(sp, p, 0);
-		return (p);
-	}
-
-	/*
-	 * Following a symlink -- SLNONE test allows application to see
-	 * SLNONE and recover.  If indirecting through a symlink, have
-	 * keep a pointer to current location.  If unable to get that
-	 * pointer, follow fails.
-	 */
-	if (instr == FTS_FOLLOW &&
-	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
-		p->fts_info = fts_stat(sp, p, 1);
-		if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-			if ((p->fts_symfd = _open(".", O_RDONLY | O_CLOEXEC,
-			    0)) < 0) {
-				p->fts_errno = errno;
-				p->fts_info = FTS_ERR;
-			} else
-				p->fts_flags |= FTS_SYMFOLLOW;
-		}
-		return (p);
-	}
-
-	/* Directory in pre-order. */
-	if (p->fts_info == FTS_D) {
-		/* If skipped or crossed mount point, do post-order visit. */
-		if (instr == FTS_SKIP ||
-		    (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
-			if (p->fts_flags & FTS_SYMFOLLOW)
-				(void)_close(p->fts_symfd);
-			if (sp->fts_child) {
-				fts_lfree(sp->fts_child);
-				sp->fts_child = NULL;
-			}
-			p->fts_info = FTS_DP;
-			return (p);
-		}
-
-		/* Rebuild if only read the names and now traversing. */
-		if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) {
-			CLR(FTS_NAMEONLY);
-			fts_lfree(sp->fts_child);
-			sp->fts_child = NULL;
-		}
-
-		/*
-		 * Cd to the subdirectory.
-		 *
-		 * If have already read and now fail to chdir, whack the list
-		 * to make the names come out right, and set the parent errno
-		 * so the application will eventually get an error condition.
-		 * Set the FTS_DONTCHDIR flag so that when we logically change
-		 * directories back to the parent we don't do a chdir.
-		 *
-		 * If haven't read do so.  If the read fails, fts_build sets
-		 * FTS_STOP or the fts_info field of the node.
-		 */
-		if (sp->fts_child != NULL) {
-			if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
-				p->fts_errno = errno;
-				p->fts_flags |= FTS_DONTCHDIR;
-				for (p = sp->fts_child; p != NULL;
-				    p = p->fts_link)
-					p->fts_accpath =
-					    p->fts_parent->fts_accpath;
-			}
-		} else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) {
-			if (ISSET(FTS_STOP))
-				return (NULL);
-			return (p);
-		}
-		p = sp->fts_child;
-		sp->fts_child = NULL;
-		goto name;
-	}
-
-	/* Move to the next node on this level. */
-next:	tmp = p;
-	if ((p = p->fts_link) != NULL) {
-		free(tmp);
-
-		/*
-		 * If reached the top, return to the original directory (or
-		 * the root of the tree), and load the paths for the next root.
-		 */
-		if (p->fts_level == FTS_ROOTLEVEL) {
-			if (FCHDIR(sp, sp->fts_rfd)) {
-				SET(FTS_STOP);
-				return (NULL);
-			}
-			fts_load(sp, p);
-			return (sp->fts_cur = p);
-		}
-
-		/*
-		 * User may have called fts_set on the node.  If skipped,
-		 * ignore.  If followed, get a file descriptor so we can
-		 * get back if necessary.
-		 */
-		if (p->fts_instr == FTS_SKIP)
-			goto next;
-		if (p->fts_instr == FTS_FOLLOW) {
-			p->fts_info = fts_stat(sp, p, 1);
-			if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-				if ((p->fts_symfd =
-				    _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0) {
-					p->fts_errno = errno;
-					p->fts_info = FTS_ERR;
-				} else
-					p->fts_flags |= FTS_SYMFOLLOW;
-			}
-			p->fts_instr = FTS_NOINSTR;
-		}
-
-name:		t = sp->fts_path + NAPPEND(p->fts_parent);
-		*t++ = '/';
-		memmove(t, p->fts_name, p->fts_namelen + 1);
-		return (sp->fts_cur = p);
-	}
-
-	/* Move up to the parent node. */
-	p = tmp->fts_parent;
-	free(tmp);
-
-	if (p->fts_level == FTS_ROOTPARENTLEVEL) {
-		/*
-		 * Done; free everything up and set errno to 0 so the user
-		 * can distinguish between error and EOF.
-		 */
-		free(p);
-		errno = 0;
-		return (sp->fts_cur = NULL);
-	}
-
-	/* NUL terminate the pathname. */
-	sp->fts_path[p->fts_pathlen] = '\0';
-
-	/*
-	 * Return to the parent directory.  If at a root node or came through
-	 * a symlink, go back through the file descriptor.  Otherwise, cd up
-	 * one directory.
-	 */
-	if (p->fts_level == FTS_ROOTLEVEL) {
-		if (FCHDIR(sp, sp->fts_rfd)) {
-			SET(FTS_STOP);
-			return (NULL);
-		}
-	} else if (p->fts_flags & FTS_SYMFOLLOW) {
-		if (FCHDIR(sp, p->fts_symfd)) {
-			saved_errno = errno;
-			(void)_close(p->fts_symfd);
-			errno = saved_errno;
-			SET(FTS_STOP);
-			return (NULL);
-		}
-		(void)_close(p->fts_symfd);
-	} else if (!(p->fts_flags & FTS_DONTCHDIR) &&
-	    fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
-		SET(FTS_STOP);
-		return (NULL);
-	}
-	p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
-	return (sp->fts_cur = p);
-}
-
-/*
- * Fts_set takes the stream as an argument although it's not used in this
- * implementation; it would be necessary if anyone wanted to add global
- * semantics to fts using fts_set.  An error return is allowed for similar
- * reasons.
- */
-/* ARGSUSED */
-int
-__fts_set_44bsd(sp, p, instr)
-	FTS *sp;
-	FTSENT *p;
-	int instr;
-{
-	if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
-	    instr != FTS_NOINSTR && instr != FTS_SKIP) {
-		errno = EINVAL;
-		return (1);
-	}
-	p->fts_instr = instr;
-	return (0);
-}
-
-FTSENT *
-__fts_children_44bsd(sp, instr)
-	FTS *sp;
-	int instr;
-{
-	FTSENT *p;
-	int fd;
-
-	if (instr != 0 && instr != FTS_NAMEONLY) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Set current node pointer. */
-	p = sp->fts_cur;
-
-	/*
-	 * Errno set to 0 so user can distinguish empty directory from
-	 * an error.
-	 */
-	errno = 0;
-
-	/* Fatal errors stop here. */
-	if (ISSET(FTS_STOP))
-		return (NULL);
-
-	/* Return logical hierarchy of user's arguments. */
-	if (p->fts_info == FTS_INIT)
-		return (p->fts_link);
-
-	/*
-	 * If not a directory being visited in pre-order, stop here.  Could
-	 * allow FTS_DNR, assuming the user has fixed the problem, but the
-	 * same effect is available with FTS_AGAIN.
-	 */
-	if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */)
-		return (NULL);
-
-	/* Free up any previous child list. */
-	if (sp->fts_child != NULL)
-		fts_lfree(sp->fts_child);
-
-	if (instr == FTS_NAMEONLY) {
-		SET(FTS_NAMEONLY);
-		instr = BNAMES;
-	} else
-		instr = BCHILD;
-
-	/*
-	 * If using chdir on a relative path and called BEFORE fts_read does
-	 * its chdir to the root of a traversal, we can lose -- we need to
-	 * chdir into the subdirectory, and we don't know where the current
-	 * directory is, so we can't get back so that the upcoming chdir by
-	 * fts_read will work.
-	 */
-	if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
-	    ISSET(FTS_NOCHDIR))
-		return (sp->fts_child = fts_build(sp, instr));
-
-	if ((fd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0)
-		return (NULL);
-	sp->fts_child = fts_build(sp, instr);
-	if (fchdir(fd))
-		return (NULL);
-	(void)_close(fd);
-	return (sp->fts_child);
-}
-
-#ifndef fts_get_clientptr
-#error "fts_get_clientptr not defined"
-#endif
-
-void *
-(__fts_get_clientptr_44bsd)(FTS *sp)
-{
-
-	return (fts_get_clientptr(sp));
-}
-
-#ifndef fts_get_stream
-#error "fts_get_stream not defined"
-#endif
-
-FTS *
-(__fts_get_stream_44bsd)(FTSENT *p)
-{
-	return (fts_get_stream(p));
-}
-
-void
-__fts_set_clientptr_44bsd(FTS *sp, void *clientptr)
-{
-
-	sp->fts_clientptr = clientptr;
-}
-
-/*
- * This is the tricky part -- do not casually change *anything* in here.  The
- * idea is to build the linked list of entries that are used by fts_children
- * and fts_read.  There are lots of special cases.
- *
- * The real slowdown in walking the tree is the stat calls.  If FTS_NOSTAT is
- * set and it's a physical walk (so that symbolic links can't be directories),
- * we can do things quickly.  First, if it's a 4.4BSD file system, the type
- * of the file is in the directory entry.  Otherwise, we assume that the number
- * of subdirectories in a node is equal to the number of links to the parent.
- * The former skips all stat calls.  The latter skips stat calls in any leaf
- * directories and for any files after the subdirectories in the directory have
- * been found, cutting the stat calls by about 2/3.
- */
-static FTSENT *
-fts_build(sp, type)
-	FTS *sp;
-	int type;
-{
-	struct dirent *dp;
-	FTSENT *p, *head;
-	int nitems;
-	FTSENT *cur, *tail;
-	DIR *dirp;
-	void *oldaddr;
-	size_t dnamlen;
-	int cderrno, descend, len, level, maxlen, nlinks, oflag, saved_errno,
-	    nostat, doadjust;
-	char *cp;
-
-	/* Set current node pointer. */
-	cur = sp->fts_cur;
-
-	/*
-	 * Open the directory for reading.  If this fails, we're done.
-	 * If being called from fts_read, set the fts_info field.
-	 */
-#ifdef FTS_WHITEOUT
-	if (ISSET(FTS_WHITEOUT))
-		oflag = DTF_NODUP | DTF_REWIND;
-	else
-		oflag = DTF_HIDEW | DTF_NODUP | DTF_REWIND;
-#else
-#define __opendir2(path, flag) opendir(path)
-#endif
-	if ((dirp = __opendir2(cur->fts_accpath, oflag)) == NULL) {
-		if (type == BREAD) {
-			cur->fts_info = FTS_DNR;
-			cur->fts_errno = errno;
-		}
-		return (NULL);
-	}
-
-	/*
-	 * Nlinks is the number of possible entries of type directory in the
-	 * directory if we're cheating on stat calls, 0 if we're not doing
-	 * any stat calls at all, -1 if we're doing stats on everything.
-	 */
-	if (type == BNAMES) {
-		nlinks = 0;
-		/* Be quiet about nostat, GCC. */
-		nostat = 0;
-	} else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
-		if (fts_ufslinks(sp, cur))
-			nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
-		else
-			nlinks = -1;
-		nostat = 1;
-	} else {
-		nlinks = -1;
-		nostat = 0;
-	}
-
-#ifdef notdef
-	(void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink);
-	(void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n",
-	    ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT));
-#endif
-	/*
-	 * If we're going to need to stat anything or we want to descend
-	 * and stay in the directory, chdir.  If this fails we keep going,
-	 * but set a flag so we don't chdir after the post-order visit.
-	 * We won't be able to stat anything, but we can still return the
-	 * names themselves.  Note, that since fts_read won't be able to
-	 * chdir into the directory, it will have to return different path
-	 * names than before, i.e. "a/b" instead of "b".  Since the node
-	 * has already been visited in pre-order, have to wait until the
-	 * post-order visit to return the error.  There is a special case
-	 * here, if there was nothing to stat then it's not an error to
-	 * not be able to stat.  This is all fairly nasty.  If a program
-	 * needed sorted entries or stat information, they had better be
-	 * checking FTS_NS on the returned nodes.
-	 */
-	cderrno = 0;
-	if (nlinks || type == BREAD) {
-		if (fts_safe_changedir(sp, cur, _dirfd(dirp), NULL)) {
-			if (nlinks && type == BREAD)
-				cur->fts_errno = errno;
-			cur->fts_flags |= FTS_DONTCHDIR;
-			descend = 0;
-			cderrno = errno;
-		} else
-			descend = 1;
-	} else
-		descend = 0;
-
-	/*
-	 * Figure out the max file name length that can be stored in the
-	 * current path -- the inner loop allocates more path as necessary.
-	 * We really wouldn't have to do the maxlen calculations here, we
-	 * could do them in fts_read before returning the path, but it's a
-	 * lot easier here since the length is part of the dirent structure.
-	 *
-	 * If not changing directories set a pointer so that can just append
-	 * each new name into the path.
-	 */
-	len = NAPPEND(cur);
-	if (ISSET(FTS_NOCHDIR)) {
-		cp = sp->fts_path + len;
-		*cp++ = '/';
-	} else {
-		/* GCC, you're too verbose. */
-		cp = NULL;
-	}
-	len++;
-	maxlen = sp->fts_pathlen - len;
-
-	level = cur->fts_level + 1;
-
-	/* Read the directory, attaching each entry to the `link' pointer. */
-	doadjust = 0;
-	for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) {
-		dnamlen = dp->d_namlen;
-		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
-			continue;
-
-		if ((p = fts_alloc(sp, dp->d_name, (int)dnamlen)) == NULL)
-			goto mem1;
-		if (dnamlen >= maxlen) {	/* include space for NUL */
-			oldaddr = sp->fts_path;
-			if (fts_palloc(sp, dnamlen + len + 1)) {
-				/*
-				 * No more memory for path or structures.  Save
-				 * errno, free up the current structure and the
-				 * structures already allocated.
-				 */
-mem1:				saved_errno = errno;
-				if (p)
-					free(p);
-				fts_lfree(head);
-				(void)closedir(dirp);
-				cur->fts_info = FTS_ERR;
-				SET(FTS_STOP);
-				errno = saved_errno;
-				return (NULL);
-			}
-			/* Did realloc() change the pointer? */
-			if (oldaddr != sp->fts_path) {
-				doadjust = 1;
-				if (ISSET(FTS_NOCHDIR))
-					cp = sp->fts_path + len;
-			}
-			maxlen = sp->fts_pathlen - len;
-		}
-
-		if (len + dnamlen >= USHRT_MAX) {
-			/*
-			 * In an FTSENT, fts_pathlen is a u_short so it is
-			 * possible to wraparound here.  If we do, free up
-			 * the current structure and the structures already
-			 * allocated, then error out with ENAMETOOLONG.
-			 */
-			free(p);
-			fts_lfree(head);
-			(void)closedir(dirp);
-			cur->fts_info = FTS_ERR;
-			SET(FTS_STOP);
-			errno = ENAMETOOLONG;
-			return (NULL);
-		}
-		p->fts_level = level;
-		p->fts_parent = sp->fts_cur;
-		p->fts_pathlen = len + dnamlen;
-
-#ifdef FTS_WHITEOUT
-		if (dp->d_type == DT_WHT)
-			p->fts_flags |= FTS_ISW;
-#endif
-
-		if (cderrno) {
-			if (nlinks) {
-				p->fts_info = FTS_NS;
-				p->fts_errno = cderrno;
-			} else
-				p->fts_info = FTS_NSOK;
-			p->fts_accpath = cur->fts_accpath;
-		} else if (nlinks == 0
-#ifdef DT_DIR
-		    || (nostat &&
-		    dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
-#endif
-		    ) {
-			p->fts_accpath =
-			    ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
-			p->fts_info = FTS_NSOK;
-		} else {
-			/* Build a file name for fts_stat to stat. */
-			if (ISSET(FTS_NOCHDIR)) {
-				p->fts_accpath = p->fts_path;
-				memmove(cp, p->fts_name, p->fts_namelen + 1);
-			} else
-				p->fts_accpath = p->fts_name;
-			/* Stat it. */
-			p->fts_info = fts_stat(sp, p, 0);
-
-			/* Decrement link count if applicable. */
-			if (nlinks > 0 && (p->fts_info == FTS_D ||
-			    p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
-				--nlinks;
-		}
-
-		/* We walk in directory order so "ls -f" doesn't get upset. */
-		p->fts_link = NULL;
-		if (head == NULL)
-			head = tail = p;
-		else {
-			tail->fts_link = p;
-			tail = p;
-		}
-		++nitems;
-	}
-	if (dirp)
-		(void)closedir(dirp);
-
-	/*
-	 * If realloc() changed the address of the path, adjust the
-	 * addresses for the rest of the tree and the dir list.
-	 */
-	if (doadjust)
-		fts_padjust(sp, head);
-
-	/*
-	 * If not changing directories, reset the path back to original
-	 * state.
-	 */
-	if (ISSET(FTS_NOCHDIR)) {
-		if (len == sp->fts_pathlen || nitems == 0)
-			--cp;
-		*cp = '\0';
-	}
-
-	/*
-	 * If descended after called from fts_children or after called from
-	 * fts_read and nothing found, get back.  At the root level we use
-	 * the saved fd; if one of fts_open()'s arguments is a relative path
-	 * to an empty directory, we wind up here with no other way back.  If
-	 * can't get back, we're done.
-	 */
-	if (descend && (type == BCHILD || !nitems) &&
-	    (cur->fts_level == FTS_ROOTLEVEL ?
-	    FCHDIR(sp, sp->fts_rfd) :
-	    fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
-		cur->fts_info = FTS_ERR;
-		SET(FTS_STOP);
-		return (NULL);
-	}
-
-	/* If didn't find anything, return NULL. */
-	if (!nitems) {
-		if (type == BREAD)
-			cur->fts_info = FTS_DP;
-		return (NULL);
-	}
-
-	/* Sort the entries. */
-	if (sp->fts_compar && nitems > 1)
-		head = fts_sort(sp, head, nitems);
-	return (head);
-}
-
-static u_short
-fts_stat(sp, p, follow)
-	FTS *sp;
-	FTSENT *p;
-	int follow;
-{
-	FTSENT *t;
-	dev_t dev;
-	ino_t ino;
-	struct stat *sbp, sb;
-	int saved_errno;
-
-	/* If user needs stat info, stat buffer already allocated. */
-	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
-
-#ifdef FTS_WHITEOUT
-	/* Check for whiteout. */
-	if (p->fts_flags & FTS_ISW) {
-		if (sbp != &sb) {
-			memset(sbp, '\0', sizeof(*sbp));
-			sbp->st_mode = S_IFWHT;
-		}
-		return (FTS_W);
-	}
-#endif
-
-	/*
-	 * If doing a logical walk, or application requested FTS_FOLLOW, do
-	 * a stat(2).  If that fails, check for a non-existent symlink.  If
-	 * fail, set the errno from the stat call.
-	 */
-	if (ISSET(FTS_LOGICAL) || follow) {
-		if (stat(p->fts_accpath, sbp)) {
-			saved_errno = errno;
-			if (!lstat(p->fts_accpath, sbp)) {
-				errno = 0;
-				return (FTS_SLNONE);
-			}
-			p->fts_errno = saved_errno;
-			goto err;
-		}
-	} else if (lstat(p->fts_accpath, sbp)) {
-		p->fts_errno = errno;
-err:		memset(sbp, 0, sizeof(struct stat));
-		return (FTS_NS);
-	}
-
-	if (S_ISDIR(sbp->st_mode)) {
-		/*
-		 * Set the device/inode.  Used to find cycles and check for
-		 * crossing mount points.  Also remember the link count, used
-		 * in fts_build to limit the number of stat calls.  It is
-		 * understood that these fields are only referenced if fts_info
-		 * is set to FTS_D.
-		 */
-		dev = p->fts_dev = sbp->st_dev;
-		ino = p->fts_ino = sbp->st_ino;
-		p->fts_nlink = sbp->st_nlink;
-
-		if (ISDOT(p->fts_name))
-			return (FTS_DOT);
-
-		/*
-		 * Cycle detection is done by brute force when the directory
-		 * is first encountered.  If the tree gets deep enough or the
-		 * number of symbolic links to directories is high enough,
-		 * something faster might be worthwhile.
-		 */
-		for (t = p->fts_parent;
-		    t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
-			if (ino == t->fts_ino && dev == t->fts_dev) {
-				p->fts_cycle = t;
-				return (FTS_DC);
-			}
-		return (FTS_D);
-	}
-	if (S_ISLNK(sbp->st_mode))
-		return (FTS_SL);
-	if (S_ISREG(sbp->st_mode))
-		return (FTS_F);
-	return (FTS_DEFAULT);
-}
-
-/*
- * The comparison function takes pointers to pointers to FTSENT structures.
- * Qsort wants a comparison function that takes pointers to void.
- * (Both with appropriate levels of const-poisoning, of course!)
- * Use a trampoline function to deal with the difference.
- */
-static int
-fts_compar(const void *a, const void *b)
-{
-	FTS *parent;
-
-	parent = (*(const FTSENT * const *)a)->fts_fts;
-	return (*parent->fts_compar)(a, b);
-}
-
-static FTSENT *
-fts_sort(sp, head, nitems)
-	FTS *sp;
-	FTSENT *head;
-	int nitems;
-{
-	FTSENT **ap, *p;
-
-	/*
-	 * Construct an array of pointers to the structures and call qsort(3).
-	 * Reassemble the array in the order returned by qsort.  If unable to
-	 * sort for memory reasons, return the directory entries in their
-	 * current order.  Allocate enough space for the current needs plus
-	 * 40 so don't realloc one entry at a time.
-	 */
-	if (nitems > sp->fts_nitems) {
-		sp->fts_nitems = nitems + 40;
-		if ((sp->fts_array = reallocf(sp->fts_array,
-		    sp->fts_nitems * sizeof(FTSENT *))) == NULL) {
-			sp->fts_nitems = 0;
-			return (head);
-		}
-	}
-	for (ap = sp->fts_array, p = head; p; p = p->fts_link)
-		*ap++ = p;
-	qsort(sp->fts_array, nitems, sizeof(FTSENT *), fts_compar);
-	for (head = *(ap = sp->fts_array); --nitems; ++ap)
-		ap[0]->fts_link = ap[1];
-	ap[0]->fts_link = NULL;
-	return (head);
-}
-
-static FTSENT *
-fts_alloc(sp, name, namelen)
-	FTS *sp;
-	char *name;
-	int namelen;
-{
-	FTSENT *p;
-	size_t len;
-
-	struct ftsent_withstat {
-		FTSENT	ent;
-		struct	stat statbuf;
-	};
-
-	/*
-	 * The file name is a variable length array and no stat structure is
-	 * necessary if the user has set the nostat bit.  Allocate the FTSENT
-	 * structure, the file name and the stat structure in one chunk, but
-	 * be careful that the stat structure is reasonably aligned.
-	 */
-	if (ISSET(FTS_NOSTAT))
-		len = sizeof(FTSENT) + namelen + 1;
-	else
-		len = sizeof(struct ftsent_withstat) + namelen + 1;
-
-	if ((p = malloc(len)) == NULL)
-		return (NULL);
-
-	if (ISSET(FTS_NOSTAT)) {
-		p->fts_name = (char *)(p + 1);
-		p->fts_statp = NULL;
-	} else {
-		p->fts_name = (char *)((struct ftsent_withstat *)p + 1);
-		p->fts_statp = &((struct ftsent_withstat *)p)->statbuf;
-	}
-
-	/* Copy the name and guarantee NUL termination. */
-	memcpy(p->fts_name, name, namelen);
-	p->fts_name[namelen] = '\0';
-	p->fts_namelen = namelen;
-	p->fts_path = sp->fts_path;
-	p->fts_errno = 0;
-	p->fts_flags = 0;
-	p->fts_instr = FTS_NOINSTR;
-	p->fts_number = 0;
-	p->fts_pointer = NULL;
-	p->fts_fts = sp;
-	return (p);
-}
-
-static void
-fts_lfree(head)
-	FTSENT *head;
-{
-	FTSENT *p;
-
-	/* Free a linked list of structures. */
-	while ((p = head)) {
-		head = head->fts_link;
-		free(p);
-	}
-}
-
-/*
- * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
- * Most systems will allow creation of paths much longer than MAXPATHLEN, even
- * though the kernel won't resolve them.  Add the size (not just what's needed)
- * plus 256 bytes so don't realloc the path 2 bytes at a time.
- */
-static int
-fts_palloc(sp, more)
-	FTS *sp;
-	size_t more;
-{
-
-	sp->fts_pathlen += more + 256;
-	/*
-	 * Check for possible wraparound.  In an FTS, fts_pathlen is
-	 * a signed int but in an FTSENT it is an unsigned short.
-	 * We limit fts_pathlen to USHRT_MAX to be safe in both cases.
-	 */
-	if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) {
-		if (sp->fts_path)
-			free(sp->fts_path);
-		sp->fts_path = NULL;
-		errno = ENAMETOOLONG;
-		return (1);
-	}
-	sp->fts_path = reallocf(sp->fts_path, sp->fts_pathlen);
-	return (sp->fts_path == NULL);
-}
-
-/*
- * When the path is realloc'd, have to fix all of the pointers in structures
- * already returned.
- */
-static void
-fts_padjust(sp, head)
-	FTS *sp;
-	FTSENT *head;
-{
-	FTSENT *p;
-	char *addr = sp->fts_path;
-
-#define	ADJUST(p) do {							\
-	if ((p)->fts_accpath != (p)->fts_name) {			\
-		(p)->fts_accpath =					\
-		    (char *)addr + ((p)->fts_accpath - (p)->fts_path);	\
-	}								\
-	(p)->fts_path = addr;						\
-} while (0)
-	/* Adjust the current set of children. */
-	for (p = sp->fts_child; p; p = p->fts_link)
-		ADJUST(p);
-
-	/* Adjust the rest of the tree, including the current level. */
-	for (p = head; p->fts_level >= FTS_ROOTLEVEL;) {
-		ADJUST(p);
-		p = p->fts_link ? p->fts_link : p->fts_parent;
-	}
-}
-
-static size_t
-fts_maxarglen(argv)
-	char * const *argv;
-{
-	size_t len, max;
-
-	for (max = 0; *argv; ++argv)
-		if ((len = strlen(*argv)) > max)
-			max = len;
-	return (max + 1);
-}
-
-/*
- * Change to dir specified by fd or p->fts_accpath without getting
- * tricked by someone changing the world out from underneath us.
- * Assumes p->fts_dev and p->fts_ino are filled in.
- */
-static int
-fts_safe_changedir(sp, p, fd, path)
-	FTS *sp;
-	FTSENT *p;
-	int fd;
-	char *path;
-{
-	int ret, oerrno, newfd;
-	struct stat sb;
-
-	newfd = fd;
-	if (ISSET(FTS_NOCHDIR))
-		return (0);
-	if (fd < 0 && (newfd = _open(path, O_RDONLY | O_CLOEXEC, 0)) < 0)
-		return (-1);
-	if (_fstat(newfd, &sb)) {
-		ret = -1;
-		goto bail;
-	}
-	if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) {
-		errno = ENOENT;		/* disinformation */
-		ret = -1;
-		goto bail;
-	}
-	ret = fchdir(newfd);
-bail:
-	oerrno = errno;
-	if (fd < 0)
-		(void)_close(newfd);
-	errno = oerrno;
-	return (ret);
-}
-
-/*
- * Check if the filesystem for "ent" has UFS-style links.
- */
-static int
-fts_ufslinks(FTS *sp, const FTSENT *ent)
-{
-	struct _fts_private *priv;
-	const char **cpp;
-
-	priv = (struct _fts_private *)sp;
-	/*
-	 * If this node's device is different from the previous, grab
-	 * the filesystem information, and decide on the reliability
-	 * of the link information from this filesystem for stat(2)
-	 * avoidance.
-	 */
-	if (priv->ftsp_dev != ent->fts_dev) {
-		if (statfs(ent->fts_path, &priv->ftsp_statfs) != -1) {
-			priv->ftsp_dev = ent->fts_dev;
-			priv->ftsp_linksreliable = 0;
-			for (cpp = ufslike_filesystems; *cpp; cpp++) {
-				if (strcmp(priv->ftsp_statfs.f_fstypename,
-				    *cpp) == 0) {
-					priv->ftsp_linksreliable = 1;
-					break;
-				}
-			}
-		} else {
-			priv->ftsp_linksreliable = 0;
-		}
-	}
-	return (priv->ftsp_linksreliable);
-}
-
-__sym_compat(fts_open, __fts_open_44bsd, FBSD_1.0);
-__sym_compat(fts_close, __fts_close_44bsd, FBSD_1.0);
-__sym_compat(fts_read, __fts_read_44bsd, FBSD_1.0);
-__sym_compat(fts_set, __fts_set_44bsd, FBSD_1.0);
-__sym_compat(fts_children, __fts_children_44bsd, FBSD_1.0);
-__sym_compat(fts_get_clientptr, __fts_get_clientptr_44bsd, FBSD_1.0);
-__sym_compat(fts_get_stream, __fts_get_stream_44bsd, FBSD_1.0);
-__sym_compat(fts_set_clientptr, __fts_set_clientptr_44bsd, FBSD_1.0);
diff --git a/lib/libc_bsd/gen/fts-compat.h b/lib/libc_bsd/gen/fts-compat.h
deleted file mode 100644
index e9490e3..0000000
--- a/lib/libc_bsd/gen/fts-compat.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1989, 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. 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.
- *
- *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD: releng/10.2/lib/libc/gen/fts-compat.h 251071 2013-05-28 21:05:06Z emaste $
- */
-
-#ifndef	_FTS_H_
-#define	_FTS_H_
-
-typedef struct {
-	struct _ftsent *fts_cur;	/* current node */
-	struct _ftsent *fts_child;	/* linked list of children */
-	struct _ftsent **fts_array;	/* sort array */
-	dev_t fts_dev;			/* starting device # */
-	char *fts_path;			/* path for this descent */
-	int fts_rfd;			/* fd for root */
-	int fts_pathlen;		/* sizeof(path) */
-	int fts_nitems;			/* elements in the sort array */
-	int (*fts_compar)		/* compare function */
-	    (const struct _ftsent * const *, const struct _ftsent * const *);
-
-#define	FTS_COMFOLLOW	0x001		/* follow command line symlinks */
-#define	FTS_LOGICAL	0x002		/* logical walk */
-#define	FTS_NOCHDIR	0x004		/* don't change directories */
-#define	FTS_NOSTAT	0x008		/* don't get stat info */
-#define	FTS_PHYSICAL	0x010		/* physical walk */
-#define	FTS_SEEDOT	0x020		/* return dot and dot-dot */
-#define	FTS_XDEV	0x040		/* don't cross devices */
-#define	FTS_WHITEOUT	0x080		/* return whiteout information */
-#define	FTS_OPTIONMASK	0x0ff		/* valid user option mask */
-
-#define	FTS_NAMEONLY	0x100		/* (private) child names only */
-#define	FTS_STOP	0x200		/* (private) unrecoverable error */
-	int fts_options;		/* fts_open options, global flags */
-	void *fts_clientptr;		/* thunk for sort function */
-} FTS;
-
-typedef struct _ftsent {
-	struct _ftsent *fts_cycle;	/* cycle node */
-	struct _ftsent *fts_parent;	/* parent directory */
-	struct _ftsent *fts_link;	/* next file in directory */
-	union {
-		struct {
-			long __fts_number;	/* local numeric value */
-			void *__fts_pointer;	/* local address value */
-		} __struct_ftsent;
-		int64_t __fts_bignum;
-	} __union_ftsent;
-#define	fts_number	__union_ftsent.__struct_ftsent.__fts_number
-#define	fts_pointer	__union_ftsent.__struct_ftsent.__fts_pointer
-#define	fts_bignum	__union_ftsent.__fts_bignum
-	char *fts_accpath;		/* access path */
-	char *fts_path;			/* root path */
-	int fts_errno;			/* errno for this node */
-	int fts_symfd;			/* fd for symlink */
-	u_short fts_pathlen;		/* strlen(fts_path) */
-	u_short fts_namelen;		/* strlen(fts_name) */
-
-	ino_t fts_ino;			/* inode */
-	dev_t fts_dev;			/* device */
-	nlink_t fts_nlink;		/* link count */
-
-#define	FTS_ROOTPARENTLEVEL	-1
-#define	FTS_ROOTLEVEL		 0
-	short fts_level;		/* depth (-1 to N) */
-
-#define	FTS_D		 1		/* preorder directory */
-#define	FTS_DC		 2		/* directory that causes cycles */
-#define	FTS_DEFAULT	 3		/* none of the above */
-#define	FTS_DNR		 4		/* unreadable directory */
-#define	FTS_DOT		 5		/* dot or dot-dot */
-#define	FTS_DP		 6		/* postorder directory */
-#define	FTS_ERR		 7		/* error; errno is set */
-#define	FTS_F		 8		/* regular file */
-#define	FTS_INIT	 9		/* initialized only */
-#define	FTS_NS		10		/* stat(2) failed */
-#define	FTS_NSOK	11		/* no stat(2) requested */
-#define	FTS_SL		12		/* symbolic link */
-#define	FTS_SLNONE	13		/* symbolic link without target */
-#define	FTS_W		14		/* whiteout object */
-	u_short fts_info;		/* user flags for FTSENT structure */
-
-#define	FTS_DONTCHDIR	 0x01		/* don't chdir .. to the parent */
-#define	FTS_SYMFOLLOW	 0x02		/* followed a symlink to get here */
-#define	FTS_ISW		 0x04		/* this is a whiteout object */
-	u_short fts_flags;		/* private flags for FTSENT structure */
-
-#define	FTS_AGAIN	 1		/* read node again */
-#define	FTS_FOLLOW	 2		/* follow symbolic link */
-#define	FTS_NOINSTR	 3		/* no instructions */
-#define	FTS_SKIP	 4		/* discard node */
-	u_short fts_instr;		/* fts_set() instructions */
-
-	struct stat *fts_statp;		/* stat(2) information */
-	char *fts_name;			/* file name */
-	FTS *fts_fts;			/* back pointer to main FTS */
-} FTSENT;
-
-#define	 fts_get_clientptr(fts)	((fts)->fts_clientptr)
-#define	 fts_get_stream(ftsent)	((ftsent)->fts_fts)
-
-#endif /* !_FTS_H_ */
diff --git a/lib/libc_bsd/gen/fts.3 b/lib/libc_bsd/gen/fts.3
deleted file mode 100644
index 827b1ce..0000000
--- a/lib/libc_bsd/gen/fts.3
+++ /dev/null
@@ -1,811 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993, 1994
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)fts.3	8.5 (Berkeley) 4/16/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/fts.3 250888 2013-05-21 21:39:18Z ed $
-.\"
-.Dd May 21, 2013
-.Dt FTS 3
-.Os
-.Sh NAME
-.Nm fts
-.Nd traverse a file hierarchy
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fts.h
-.Ft FTS *
-.Fn fts_open "char * const *path_argv" "int options" "int (*compar)(const FTSENT * const *, const FTSENT * const *)"
-.Ft FTSENT *
-.Fn fts_read "FTS *ftsp"
-.Ft FTSENT *
-.Fn fts_children "FTS *ftsp" "int options"
-.Ft int
-.Fn fts_set "FTS *ftsp" "FTSENT *f" "int options"
-.Ft void
-.Fn fts_set_clientptr "FTS *ftsp" "void *clientdata"
-.Ft void *
-.Fn fts_get_clientptr "FTS *ftsp"
-.Ft FTS *
-.Fn fts_get_stream "FTSENT *f"
-.Ft int
-.Fn fts_close "FTS *ftsp"
-.Sh DESCRIPTION
-The
-.Nm
-functions are provided for traversing
-.Ux
-file hierarchies.
-A simple overview is that the
-.Fn fts_open
-function returns a
-.Dq handle
-on a file hierarchy, which is then supplied to
-the other
-.Nm
-functions.
-The function
-.Fn fts_read
-returns a pointer to a structure describing one of the files in the file
-hierarchy.
-The function
-.Fn fts_children
-returns a pointer to a linked list of structures, each of which describes
-one of the files contained in a directory in the hierarchy.
-In general, directories are visited two distinguishable times; in pre-order
-(before any of their descendants are visited) and in post-order (after all
-of their descendants have been visited).
-Files are visited once.
-It is possible to walk the hierarchy
-.Dq logically
-(ignoring symbolic links)
-or physically (visiting symbolic links), order the walk of the hierarchy or
-prune and/or re-visit portions of the hierarchy.
-.Pp
-Two structures are defined (and typedef'd) in the include file
-.In fts.h .
-The first is
-.Vt FTS ,
-the structure that represents the file hierarchy itself.
-The second is
-.Vt FTSENT ,
-the structure that represents a file in the file
-hierarchy.
-Normally, an
-.Vt FTSENT
-structure is returned for every file in the file
-hierarchy.
-In this manual page,
-.Dq file
-and
-.Dq Vt FTSENT No structure
-are generally
-interchangeable.
-.Pp
-The
-.Vt FTS
-structure contains space for a single pointer, which may be used to
-store application data or per-hierarchy state.
-The
-.Fn fts_set_clientptr
-and
-.Fn fts_get_clientptr
-functions may be used to set and retrieve this pointer.
-This is likely to be useful only when accessed from the sort
-comparison function, which can determine the original
-.Vt FTS
-stream of its arguments using the
-.Fn fts_get_stream
-function.
-The two
-.Li get
-functions are also available as macros of the same name.
-.Pp
-The
-.Vt FTSENT
-structure contains at least the following fields, which are
-described in greater detail below:
-.Bd -literal
-typedef struct _ftsent {
-	int fts_info;			/* status for FTSENT structure */
-	char *fts_accpath;		/* access path */
-	char *fts_path;			/* root path */
-	size_t fts_pathlen;		/* strlen(fts_path) */
-	char *fts_name;			/* file name */
-	size_t fts_namelen;		/* strlen(fts_name) */
-	long fts_level;			/* depth (\-1 to N) */
-	int fts_errno;			/* file errno */
-	long long fts_number;		/* local numeric value */
-	void *fts_pointer;		/* local address value */
-	struct ftsent *fts_parent;	/* parent directory */
-	struct ftsent *fts_link;	/* next file structure */
-	struct ftsent *fts_cycle;	/* cycle structure */
-	struct stat *fts_statp;		/* stat(2) information */
-} FTSENT;
-.Ed
-.Pp
-These fields are defined as follows:
-.Bl -tag -width "fts_namelen"
-.It Fa fts_info
-One of the following values describing the returned
-.Vt FTSENT
-structure and
-the file it represents.
-With the exception of directories without errors
-.Pq Dv FTS_D ,
-all of these
-entries are terminal, that is, they will not be revisited, nor will any
-of their descendants be visited.
-.Bl  -tag -width FTS_DEFAULT
-.It Dv FTS_D
-A directory being visited in pre-order.
-.It Dv FTS_DC
-A directory that causes a cycle in the tree.
-(The
-.Fa fts_cycle
-field of the
-.Vt FTSENT
-structure will be filled in as well.)
-.It Dv FTS_DEFAULT
-Any
-.Vt FTSENT
-structure that represents a file type not explicitly described
-by one of the other
-.Fa fts_info
-values.
-.It Dv FTS_DNR
-A directory which cannot be read.
-This is an error return, and the
-.Fa fts_errno
-field will be set to indicate what caused the error.
-.It Dv FTS_DOT
-A file named
-.Ql .\&
-or
-.Ql ..\&
-which was not specified as a file name to
-.Fn fts_open
-(see
-.Dv FTS_SEEDOT ) .
-.It Dv FTS_DP
-A directory being visited in post-order.
-The contents of the
-.Vt FTSENT
-structure will be unchanged from when
-the directory was visited in pre-order, except for the
-.Fa fts_info
-field.
-.It Dv FTS_ERR
-This is an error return, and the
-.Fa fts_errno
-field will be set to indicate what caused the error.
-.It Dv FTS_F
-A regular file.
-.It Dv FTS_NS
-A file for which no
-.Xr stat 2
-information was available.
-The contents of the
-.Fa fts_statp
-field are undefined.
-This is an error return, and the
-.Fa fts_errno
-field will be set to indicate what caused the error.
-.It Dv FTS_NSOK
-A file for which no
-.Xr stat 2
-information was requested.
-The contents of the
-.Fa fts_statp
-field are undefined.
-.It Dv FTS_SL
-A symbolic link.
-.It Dv FTS_SLNONE
-A symbolic link with a non-existent target.
-The contents of the
-.Fa fts_statp
-field reference the file characteristic information for the symbolic link
-itself.
-.El
-.It Fa fts_accpath
-A path for accessing the file from the current directory.
-.It Fa fts_path
-The path for the file relative to the root of the traversal.
-This path contains the path specified to
-.Fn fts_open
-as a prefix.
-.It Fa fts_pathlen
-The length of the string referenced by
-.Fa fts_path .
-.It Fa fts_name
-The name of the file.
-.It Fa fts_namelen
-The length of the string referenced by
-.Fa fts_name .
-.It Fa fts_level
-The depth of the traversal, numbered from \-1 to N, where this file
-was found.
-The
-.Vt FTSENT
-structure representing the parent of the starting point (or root)
-of the traversal is numbered
-.Dv FTS_ROOTPARENTLEVEL
-(\-1), and the
-.Vt FTSENT
-structure for the root
-itself is numbered
-.Dv FTS_ROOTLEVEL
-(0).
-.It Fa fts_errno
-Upon return of a
-.Vt FTSENT
-structure from the
-.Fn fts_children
-or
-.Fn fts_read
-functions, with its
-.Fa fts_info
-field set to
-.Dv FTS_DNR ,
-.Dv FTS_ERR
-or
-.Dv FTS_NS ,
-the
-.Fa fts_errno
-field contains the value of the external variable
-.Va errno
-specifying the cause of the error.
-Otherwise, the contents of the
-.Fa fts_errno
-field are undefined.
-.It Fa fts_number
-This field is provided for the use of the application program and is
-not modified by the
-.Nm
-functions.
-It is initialized to 0.
-.It Fa fts_pointer
-This field is provided for the use of the application program and is
-not modified by the
-.Nm
-functions.
-It is initialized to
-.Dv NULL .
-.It Fa fts_parent
-A pointer to the
-.Vt FTSENT
-structure referencing the file in the hierarchy
-immediately above the current file, i.e., the directory of which this
-file is a member.
-A parent structure for the initial entry point is provided as well,
-however, only the
-.Fa fts_level ,
-.Fa fts_bignum ,
-.Fa fts_number
-and
-.Fa fts_pointer
-fields are guaranteed to be initialized.
-.It Fa fts_link
-Upon return from the
-.Fn fts_children
-function, the
-.Fa fts_link
-field points to the next structure in the NULL-terminated linked list of
-directory members.
-Otherwise, the contents of the
-.Fa fts_link
-field are undefined.
-.It Fa fts_cycle
-If a directory causes a cycle in the hierarchy (see
-.Dv FTS_DC ) ,
-either because
-of a hard link between two directories, or a symbolic link pointing to a
-directory, the
-.Fa fts_cycle
-field of the structure will point to the
-.Vt FTSENT
-structure in the hierarchy that references the same file as the current
-.Vt FTSENT
-structure.
-Otherwise, the contents of the
-.Fa fts_cycle
-field are undefined.
-.It Fa fts_statp
-A pointer to
-.Xr stat 2
-information for the file.
-.El
-.Pp
-A single buffer is used for all of the paths of all of the files in the
-file hierarchy.
-Therefore, the
-.Fa fts_path
-and
-.Fa fts_accpath
-fields are guaranteed to be
-.Dv NUL Ns -terminated
-.Em only
-for the file most recently returned by
-.Fn fts_read .
-To use these fields to reference any files represented by other
-.Vt FTSENT
-structures will require that the path buffer be modified using the
-information contained in that
-.Vt FTSENT
-structure's
-.Fa fts_pathlen
-field.
-Any such modifications should be undone before further calls to
-.Fn fts_read
-are attempted.
-The
-.Fa fts_name
-field is always
-.Dv NUL Ns -terminated .
-.Pp
-Note that the use of
-.Fa fts_bignum
-is mutually exclusive with the use of
-.Fa fts_number
-or
-.Fa fts_pointer .
-.Sh FTS_OPEN
-The
-.Fn fts_open
-function takes a pointer to an array of character pointers naming one
-or more paths which make up a logical file hierarchy to be traversed.
-The array must be terminated by a
-.Dv NULL
-pointer.
-.Pp
-There are
-a number of options, at least one of which (either
-.Dv FTS_LOGICAL
-or
-.Dv FTS_PHYSICAL )
-must be specified.
-The options are selected by
-.Em or Ns 'ing
-the following values:
-.Bl -tag -width "FTS_PHYSICAL"
-.It Dv FTS_COMFOLLOW
-This option causes any symbolic link specified as a root path to be
-followed immediately whether or not
-.Dv FTS_LOGICAL
-is also specified.
-.It Dv FTS_LOGICAL
-This option causes the
-.Nm
-routines to return
-.Vt FTSENT
-structures for the targets of symbolic links
-instead of the symbolic links themselves.
-If this option is set, the only symbolic links for which
-.Vt FTSENT
-structures
-are returned to the application are those referencing non-existent files.
-Either
-.Dv FTS_LOGICAL
-or
-.Dv FTS_PHYSICAL
-.Em must
-be provided to the
-.Fn fts_open
-function.
-.It Dv FTS_NOCHDIR
-To allow descending to arbitrary depths
-(independent of
-.Brq Dv PATH_MAX )
-and improve performance, the
-.Nm
-functions change directories as they walk the file hierarchy.
-This has the side-effect that an application cannot rely on being
-in any particular directory during the traversal.
-The
-.Dv FTS_NOCHDIR
-option turns off this feature, and the
-.Nm
-functions will not change the current directory.
-Note that applications should not themselves change their current directory
-and try to access files unless
-.Dv FTS_NOCHDIR
-is specified and absolute
-pathnames were provided as arguments to
-.Fn fts_open .
-.It Dv FTS_NOSTAT
-By default, returned
-.Vt FTSENT
-structures reference file characteristic information (the
-.Fa statp
-field) for each file visited.
-This option relaxes that requirement as a performance optimization,
-allowing the
-.Nm
-functions to set the
-.Fa fts_info
-field to
-.Dv FTS_NSOK
-and leave the contents of the
-.Fa statp
-field undefined.
-.It Dv FTS_PHYSICAL
-This option causes the
-.Nm
-routines to return
-.Vt FTSENT
-structures for symbolic links themselves instead
-of the target files they point to.
-If this option is set,
-.Vt FTSENT
-structures for all symbolic links in the
-hierarchy are returned to the application.
-Either
-.Dv FTS_LOGICAL
-or
-.Dv FTS_PHYSICAL
-.Em must
-be provided to the
-.Fn fts_open
-function.
-.It Dv FTS_SEEDOT
-By default, unless they are specified as path arguments to
-.Fn fts_open ,
-any files named
-.Ql .\&
-or
-.Ql ..\&
-encountered in the file hierarchy are ignored.
-This option causes the
-.Nm
-routines to return
-.Vt FTSENT
-structures for them.
-.It Dv FTS_XDEV
-This option prevents
-.Nm
-from descending into directories that have a different device number
-than the file from which the descent began.
-.El
-.Pp
-The argument
-.Fn compar
-specifies a user-defined function which may be used to order the traversal
-of the hierarchy.
-It
-takes two pointers to pointers to
-.Vt FTSENT
-structures as arguments and
-should return a negative value, zero, or a positive value to indicate
-if the file referenced by its first argument comes before, in any order
-with respect to, or after, the file referenced by its second argument.
-The
-.Fa fts_accpath ,
-.Fa fts_path
-and
-.Fa fts_pathlen
-fields of the
-.Vt FTSENT
-structures may
-.Em never
-be used in this comparison.
-If the
-.Fa fts_info
-field is set to
-.Dv FTS_NS
-or
-.Dv FTS_NSOK ,
-the
-.Fa fts_statp
-field may not either.
-If the
-.Fn compar
-argument is
-.Dv NULL ,
-the directory traversal order is in the order listed in
-.Fa path_argv
-for the root paths, and in the order listed in the directory for
-everything else.
-.Sh FTS_READ
-The
-.Fn fts_read
-function returns a pointer to an
-.Vt FTSENT
-structure describing a file in
-the hierarchy.
-Directories (that are readable and do not cause cycles) are visited at
-least twice, once in pre-order and once in post-order.
-All other files are visited at least once.
-(Hard links between directories that do not cause cycles or symbolic
-links to symbolic links may cause files to be visited more than once,
-or directories more than twice.)
-.Pp
-If all the members of the hierarchy have been returned,
-.Fn fts_read
-returns
-.Dv NULL
-and sets the external variable
-.Va errno
-to 0.
-If an error unrelated to a file in the hierarchy occurs,
-.Fn fts_read
-returns
-.Dv NULL
-and sets
-.Va errno
-appropriately.
-If an error related to a returned file occurs, a pointer to an
-.Vt FTSENT
-structure is returned, and
-.Va errno
-may or may not have been set (see
-.Fa fts_info ) .
-.Pp
-The
-.Vt FTSENT
-structures returned by
-.Fn fts_read
-may be overwritten after a call to
-.Fn fts_close
-on the same file hierarchy stream, or, after a call to
-.Fn fts_read
-on the same file hierarchy stream unless they represent a file of type
-directory, in which case they will not be overwritten until after a call to
-.Fn fts_read
-after the
-.Vt FTSENT
-structure has been returned by the function
-.Fn fts_read
-in post-order.
-.Sh FTS_CHILDREN
-The
-.Fn fts_children
-function returns a pointer to an
-.Vt FTSENT
-structure describing the first entry in a NULL-terminated linked list of
-the files in the directory represented by the
-.Vt FTSENT
-structure most recently returned by
-.Fn fts_read .
-The list is linked through the
-.Fa fts_link
-field of the
-.Vt FTSENT
-structure, and is ordered by the user-specified comparison function, if any.
-Repeated calls to
-.Fn fts_children
-will recreate this linked list.
-.Pp
-As a special case, if
-.Fn fts_read
-has not yet been called for a hierarchy,
-.Fn fts_children
-will return a pointer to the files in the logical directory specified to
-.Fn fts_open ,
-i.e., the arguments specified to
-.Fn fts_open .
-Otherwise, if the
-.Vt FTSENT
-structure most recently returned by
-.Fn fts_read
-is not a directory being visited in pre-order,
-or the directory does not contain any files,
-.Fn fts_children
-returns
-.Dv NULL
-and sets
-.Va errno
-to zero.
-If an error occurs,
-.Fn fts_children
-returns
-.Dv NULL
-and sets
-.Va errno
-appropriately.
-.Pp
-The
-.Vt FTSENT
-structures returned by
-.Fn fts_children
-may be overwritten after a call to
-.Fn fts_children ,
-.Fn fts_close
-or
-.Fn fts_read
-on the same file hierarchy stream.
-.Pp
-.Em Option
-may be set to the following value:
-.Bl -tag -width FTS_NAMEONLY
-.It Dv FTS_NAMEONLY
-Only the names of the files are needed.
-The contents of all the fields in the returned linked list of structures
-are undefined with the exception of the
-.Fa fts_name
-and
-.Fa fts_namelen
-fields.
-.El
-.Sh FTS_SET
-The function
-.Fn fts_set
-allows the user application to determine further processing for the
-file
-.Fa f
-of the stream
-.Fa ftsp .
-The
-.Fn fts_set
-function
-returns 0 on success, and \-1 if an error occurs.
-.Em Option
-must be set to one of the following values:
-.Bl -tag -width FTS_PHYSICAL
-.It Dv FTS_AGAIN
-Re-visit the file; any file type may be re-visited.
-The next call to
-.Fn fts_read
-will return the referenced file.
-The
-.Fa fts_stat
-and
-.Fa fts_info
-fields of the structure will be reinitialized at that time,
-but no other fields will have been changed.
-This option is meaningful only for the most recently returned
-file from
-.Fn fts_read .
-Normal use is for post-order directory visits, where it causes the
-directory to be re-visited (in both pre and post-order) as well as all
-of its descendants.
-.It Dv FTS_FOLLOW
-The referenced file must be a symbolic link.
-If the referenced file is the one most recently returned by
-.Fn fts_read ,
-the next call to
-.Fn fts_read
-returns the file with the
-.Fa fts_info
-and
-.Fa fts_statp
-fields reinitialized to reflect the target of the symbolic link instead
-of the symbolic link itself.
-If the file is one of those most recently returned by
-.Fn fts_children ,
-the
-.Fa fts_info
-and
-.Fa fts_statp
-fields of the structure, when returned by
-.Fn fts_read ,
-will reflect the target of the symbolic link instead of the symbolic link
-itself.
-In either case, if the target of the symbolic link does not exist the
-fields of the returned structure will be unchanged and the
-.Fa fts_info
-field will be set to
-.Dv FTS_SLNONE .
-.Pp
-If the target of the link is a directory, the pre-order return, followed
-by the return of all of its descendants, followed by a post-order return,
-is done.
-.It Dv FTS_SKIP
-No descendants of this file are visited.
-The file may be one of those most recently returned by either
-.Fn fts_children
-or
-.Fn fts_read .
-.El
-.Sh FTS_CLOSE
-The
-.Fn fts_close
-function closes a file hierarchy stream
-.Fa ftsp
-and restores the current directory to the directory from which
-.Fn fts_open
-was called to open
-.Fa ftsp .
-The
-.Fn fts_close
-function
-returns 0 on success, and \-1 if an error occurs.
-.Sh ERRORS
-The function
-.Fn fts_open
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr open 2
-and
-.Xr malloc 3 .
-.Pp
-The function
-.Fn fts_close
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr chdir 2
-and
-.Xr close 2 .
-.Pp
-The functions
-.Fn fts_read
-and
-.Fn fts_children
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr chdir 2 ,
-.Xr malloc 3 ,
-.Xr opendir 3 ,
-.Xr readdir 3
-and
-.Xr stat 2 .
-.Pp
-In addition,
-.Fn fts_children ,
-.Fn fts_open
-and
-.Fn fts_set
-may fail and set
-.Va errno
-as follows:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The options were invalid, or the list were empty.
-.El
-.Sh SEE ALSO
-.Xr find 1 ,
-.Xr chdir 2 ,
-.Xr stat 2 ,
-.Xr ftw 3 ,
-.Xr qsort 3
-.Sh HISTORY
-The
-.Nm
-interface was first introduced in
-.Bx 4.4 .
-The
-.Fn fts_get_clientptr ,
-.Fn fts_get_stream ,
-and
-.Fn fts_set_clientptr
-functions were introduced in
-.Fx 5.0 ,
-principally to provide for alternative interfaces to the
-.Nm
-functionality using different data structures.
-.Sh BUGS
-The
-.Fn fts_open
-function will automatically set the
-.Dv FTS_NOCHDIR
-option if the
-.Dv FTS_LOGICAL
-option is provided, or if it cannot
-.Xr open 2
-the current directory.
diff --git a/lib/libc_bsd/gen/fts.c b/lib/libc_bsd/gen/fts.c
deleted file mode 100644
index e9ab7e1..0000000
--- a/lib/libc_bsd/gen/fts.c
+++ /dev/null
@@ -1,1183 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- * 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.
- *
- * $OpenBSD: fts.c,v 1.22 1999/10/03 19:22:22 millert Exp $
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/fts.c 281741 2015-04-19 13:28:32Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <fts.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "gen-private.h"
-
-static FTSENT	*fts_alloc(FTS *, char *, size_t);
-static FTSENT	*fts_build(FTS *, int);
-static void	 fts_lfree(FTSENT *);
-static void	 fts_load(FTS *, FTSENT *);
-static size_t	 fts_maxarglen(char * const *);
-static void	 fts_padjust(FTS *, FTSENT *);
-static int	 fts_palloc(FTS *, size_t);
-static FTSENT	*fts_sort(FTS *, FTSENT *, size_t);
-static int	 fts_stat(FTS *, FTSENT *, int, int);
-static int	 fts_safe_changedir(FTS *, FTSENT *, int, char *);
-static int	 fts_ufslinks(FTS *, const FTSENT *);
-
-#define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-
-#define	CLR(opt)	(sp->fts_options &= ~(opt))
-#define	ISSET(opt)	(sp->fts_options & (opt))
-#define	SET(opt)	(sp->fts_options |= (opt))
-
-#define	FCHDIR(sp, fd)	(!ISSET(FTS_NOCHDIR) && fchdir(fd))
-
-/* fts_build flags */
-#define	BCHILD		1		/* fts_children */
-#define	BNAMES		2		/* fts_children, names only */
-#define	BREAD		3		/* fts_read */
-
-/*
- * Internal representation of an FTS, including extra implementation
- * details.  The FTS returned from fts_open points to this structure's
- * ftsp_fts member (and can be cast to an _fts_private as required)
- */
-struct _fts_private {
-	FTS		ftsp_fts;
-	struct statfs	ftsp_statfs;
-	dev_t		ftsp_dev;
-	int		ftsp_linksreliable;
-};
-
-/*
- * The "FTS_NOSTAT" option can avoid a lot of calls to stat(2) if it
- * knows that a directory could not possibly have subdirectories.  This
- * is decided by looking at the link count: a subdirectory would
- * increment its parent's link count by virtue of its own ".." entry.
- * This assumption only holds for UFS-like filesystems that implement
- * links and directories this way, so we must punt for others.
- */
-
-static const char *ufslike_filesystems[] = {
-	"ufs",
-	"zfs",
-	"nfs",
-	"nfs4",
-	"ext2fs",
-	0
-};
-
-FTS *
-fts_open(argv, options, compar)
-	char * const *argv;
-	int options;
-	int (*compar)(const FTSENT * const *, const FTSENT * const *);
-{
-	struct _fts_private *priv;
-	FTS *sp;
-	FTSENT *p, *root;
-	FTSENT *parent, *tmp;
-	size_t len, nitems;
-
-	/* Options check. */
-	if (options & ~FTS_OPTIONMASK) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* fts_open() requires at least one path */
-	if (*argv == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Allocate/initialize the stream. */
-	if ((priv = calloc(1, sizeof(*priv))) == NULL)
-		return (NULL);
-	sp = &priv->ftsp_fts;
-	sp->fts_compar = compar;
-	sp->fts_options = options;
-
-	/* Shush, GCC. */
-	tmp = NULL;
-
-	/* Logical walks turn on NOCHDIR; symbolic links are too hard. */
-	if (ISSET(FTS_LOGICAL))
-		SET(FTS_NOCHDIR);
-
-	/*
-	 * Start out with 1K of path space, and enough, in any case,
-	 * to hold the user's paths.
-	 */
-	if (fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN)))
-		goto mem1;
-
-	/* Allocate/initialize root's parent. */
-	if ((parent = fts_alloc(sp, "", 0)) == NULL)
-		goto mem2;
-	parent->fts_level = FTS_ROOTPARENTLEVEL;
-
-	/* Allocate/initialize root(s). */
-	for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
-		len = strlen(*argv);
-
-		p = fts_alloc(sp, *argv, len);
-		p->fts_level = FTS_ROOTLEVEL;
-		p->fts_parent = parent;
-		p->fts_accpath = p->fts_name;
-		p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW), -1);
-
-		/* Command-line "." and ".." are real directories. */
-		if (p->fts_info == FTS_DOT)
-			p->fts_info = FTS_D;
-
-		/*
-		 * If comparison routine supplied, traverse in sorted
-		 * order; otherwise traverse in the order specified.
-		 */
-		if (compar) {
-			p->fts_link = root;
-			root = p;
-		} else {
-			p->fts_link = NULL;
-			if (root == NULL)
-				tmp = root = p;
-			else {
-				tmp->fts_link = p;
-				tmp = p;
-			}
-		}
-	}
-	if (compar && nitems > 1)
-		root = fts_sort(sp, root, nitems);
-
-	/*
-	 * Allocate a dummy pointer and make fts_read think that we've just
-	 * finished the node before the root(s); set p->fts_info to FTS_INIT
-	 * so that everything about the "current" node is ignored.
-	 */
-	if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL)
-		goto mem3;
-	sp->fts_cur->fts_link = root;
-	sp->fts_cur->fts_info = FTS_INIT;
-
-	/*
-	 * If using chdir(2), grab a file descriptor pointing to dot to ensure
-	 * that we can get back here; this could be avoided for some paths,
-	 * but almost certainly not worth the effort.  Slashes, symbolic links,
-	 * and ".." are all fairly nasty problems.  Note, if we can't get the
-	 * descriptor we run anyway, just more slowly.
-	 */
-	if (!ISSET(FTS_NOCHDIR) &&
-	    (sp->fts_rfd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0)
-		SET(FTS_NOCHDIR);
-
-	return (sp);
-
-mem3:	fts_lfree(root);
-	free(parent);
-mem2:	free(sp->fts_path);
-mem1:	free(sp);
-	return (NULL);
-}
-
-static void
-fts_load(FTS *sp, FTSENT *p)
-{
-	size_t len;
-	char *cp;
-
-	/*
-	 * Load the stream structure for the next traversal.  Since we don't
-	 * actually enter the directory until after the preorder visit, set
-	 * the fts_accpath field specially so the chdir gets done to the right
-	 * place and the user can access the first node.  From fts_open it's
-	 * known that the path will fit.
-	 */
-	len = p->fts_pathlen = p->fts_namelen;
-	memmove(sp->fts_path, p->fts_name, len + 1);
-	if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
-		len = strlen(++cp);
-		memmove(p->fts_name, cp, len + 1);
-		p->fts_namelen = len;
-	}
-	p->fts_accpath = p->fts_path = sp->fts_path;
-	sp->fts_dev = p->fts_dev;
-}
-
-int
-fts_close(FTS *sp)
-{
-	FTSENT *freep, *p;
-	int saved_errno;
-
-	/*
-	 * This still works if we haven't read anything -- the dummy structure
-	 * points to the root list, so we step through to the end of the root
-	 * list which has a valid parent pointer.
-	 */
-	if (sp->fts_cur) {
-		for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) {
-			freep = p;
-			p = p->fts_link != NULL ? p->fts_link : p->fts_parent;
-			free(freep);
-		}
-		free(p);
-	}
-
-	/* Free up child linked list, sort array, path buffer. */
-	if (sp->fts_child)
-		fts_lfree(sp->fts_child);
-	if (sp->fts_array)
-		free(sp->fts_array);
-	free(sp->fts_path);
-
-	/* Return to original directory, save errno if necessary. */
-	if (!ISSET(FTS_NOCHDIR)) {
-		saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
-		(void)_close(sp->fts_rfd);
-
-		/* Set errno and return. */
-		if (saved_errno != 0) {
-			/* Free up the stream pointer. */
-			free(sp);
-			errno = saved_errno;
-			return (-1);
-		}
-	}
-
-	/* Free up the stream pointer. */
-	free(sp);
-	return (0);
-}
-
-/*
- * Special case of "/" at the end of the path so that slashes aren't
- * appended which would cause paths to be written as "....//foo".
- */
-#define	NAPPEND(p)							\
-	(p->fts_path[p->fts_pathlen - 1] == '/'				\
-	    ? p->fts_pathlen - 1 : p->fts_pathlen)
-
-FTSENT *
-fts_read(FTS *sp)
-{
-	FTSENT *p, *tmp;
-	int instr;
-	char *t;
-	int saved_errno;
-
-	/* If finished or unrecoverable error, return NULL. */
-	if (sp->fts_cur == NULL || ISSET(FTS_STOP))
-		return (NULL);
-
-	/* Set current node pointer. */
-	p = sp->fts_cur;
-
-	/* Save and zero out user instructions. */
-	instr = p->fts_instr;
-	p->fts_instr = FTS_NOINSTR;
-
-	/* Any type of file may be re-visited; re-stat and re-turn. */
-	if (instr == FTS_AGAIN) {
-		p->fts_info = fts_stat(sp, p, 0, -1);
-		return (p);
-	}
-
-	/*
-	 * Following a symlink -- SLNONE test allows application to see
-	 * SLNONE and recover.  If indirecting through a symlink, have
-	 * keep a pointer to current location.  If unable to get that
-	 * pointer, follow fails.
-	 */
-	if (instr == FTS_FOLLOW &&
-	    (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
-		p->fts_info = fts_stat(sp, p, 1, -1);
-		if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-			if ((p->fts_symfd = _open(".", O_RDONLY | O_CLOEXEC,
-			    0)) < 0) {
-				p->fts_errno = errno;
-				p->fts_info = FTS_ERR;
-			} else
-				p->fts_flags |= FTS_SYMFOLLOW;
-		}
-		return (p);
-	}
-
-	/* Directory in pre-order. */
-	if (p->fts_info == FTS_D) {
-		/* If skipped or crossed mount point, do post-order visit. */
-		if (instr == FTS_SKIP ||
-		    (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
-			if (p->fts_flags & FTS_SYMFOLLOW)
-				(void)_close(p->fts_symfd);
-			if (sp->fts_child) {
-				fts_lfree(sp->fts_child);
-				sp->fts_child = NULL;
-			}
-			p->fts_info = FTS_DP;
-			return (p);
-		}
-
-		/* Rebuild if only read the names and now traversing. */
-		if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) {
-			CLR(FTS_NAMEONLY);
-			fts_lfree(sp->fts_child);
-			sp->fts_child = NULL;
-		}
-
-		/*
-		 * Cd to the subdirectory.
-		 *
-		 * If have already read and now fail to chdir, whack the list
-		 * to make the names come out right, and set the parent errno
-		 * so the application will eventually get an error condition.
-		 * Set the FTS_DONTCHDIR flag so that when we logically change
-		 * directories back to the parent we don't do a chdir.
-		 *
-		 * If haven't read do so.  If the read fails, fts_build sets
-		 * FTS_STOP or the fts_info field of the node.
-		 */
-		if (sp->fts_child != NULL) {
-			if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
-				p->fts_errno = errno;
-				p->fts_flags |= FTS_DONTCHDIR;
-				for (p = sp->fts_child; p != NULL;
-				    p = p->fts_link)
-					p->fts_accpath =
-					    p->fts_parent->fts_accpath;
-			}
-		} else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) {
-			if (ISSET(FTS_STOP))
-				return (NULL);
-			return (p);
-		}
-		p = sp->fts_child;
-		sp->fts_child = NULL;
-		goto name;
-	}
-
-	/* Move to the next node on this level. */
-next:	tmp = p;
-	if ((p = p->fts_link) != NULL) {
-		/*
-		 * If reached the top, return to the original directory (or
-		 * the root of the tree), and load the paths for the next root.
-		 */
-		if (p->fts_level == FTS_ROOTLEVEL) {
-			if (FCHDIR(sp, sp->fts_rfd)) {
-				SET(FTS_STOP);
-				return (NULL);
-			}
-			free(tmp);
-			fts_load(sp, p);
-			return (sp->fts_cur = p);
-		}
-
-		/*
-		 * User may have called fts_set on the node.  If skipped,
-		 * ignore.  If followed, get a file descriptor so we can
-		 * get back if necessary.
-		 */
-		if (p->fts_instr == FTS_SKIP) {
-			free(tmp);
-			goto next;
-		}
-		if (p->fts_instr == FTS_FOLLOW) {
-			p->fts_info = fts_stat(sp, p, 1, -1);
-			if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-				if ((p->fts_symfd =
-				    _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0) {
-					p->fts_errno = errno;
-					p->fts_info = FTS_ERR;
-				} else
-					p->fts_flags |= FTS_SYMFOLLOW;
-			}
-			p->fts_instr = FTS_NOINSTR;
-		}
-
-		free(tmp);
-
-name:		t = sp->fts_path + NAPPEND(p->fts_parent);
-		*t++ = '/';
-		memmove(t, p->fts_name, p->fts_namelen + 1);
-		return (sp->fts_cur = p);
-	}
-
-	/* Move up to the parent node. */
-	p = tmp->fts_parent;
-
-	if (p->fts_level == FTS_ROOTPARENTLEVEL) {
-		/*
-		 * Done; free everything up and set errno to 0 so the user
-		 * can distinguish between error and EOF.
-		 */
-		free(tmp);
-		free(p);
-		errno = 0;
-		return (sp->fts_cur = NULL);
-	}
-
-	/* NUL terminate the pathname. */
-	sp->fts_path[p->fts_pathlen] = '\0';
-
-	/*
-	 * Return to the parent directory.  If at a root node or came through
-	 * a symlink, go back through the file descriptor.  Otherwise, cd up
-	 * one directory.
-	 */
-	if (p->fts_level == FTS_ROOTLEVEL) {
-		if (FCHDIR(sp, sp->fts_rfd)) {
-			SET(FTS_STOP);
-			return (NULL);
-		}
-	} else if (p->fts_flags & FTS_SYMFOLLOW) {
-		if (FCHDIR(sp, p->fts_symfd)) {
-			saved_errno = errno;
-			(void)_close(p->fts_symfd);
-			errno = saved_errno;
-			SET(FTS_STOP);
-			return (NULL);
-		}
-		(void)_close(p->fts_symfd);
-	} else if (!(p->fts_flags & FTS_DONTCHDIR) &&
-	    fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
-		SET(FTS_STOP);
-		return (NULL);
-	}
-	free(tmp);
-	p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
-	return (sp->fts_cur = p);
-}
-
-/*
- * Fts_set takes the stream as an argument although it's not used in this
- * implementation; it would be necessary if anyone wanted to add global
- * semantics to fts using fts_set.  An error return is allowed for similar
- * reasons.
- */
-/* ARGSUSED */
-int
-fts_set(FTS *sp, FTSENT *p, int instr)
-{
-	if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
-	    instr != FTS_NOINSTR && instr != FTS_SKIP) {
-		errno = EINVAL;
-		return (1);
-	}
-	p->fts_instr = instr;
-	return (0);
-}
-
-FTSENT *
-fts_children(FTS *sp, int instr)
-{
-	FTSENT *p;
-	int fd;
-
-	if (instr != 0 && instr != FTS_NAMEONLY) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Set current node pointer. */
-	p = sp->fts_cur;
-
-	/*
-	 * Errno set to 0 so user can distinguish empty directory from
-	 * an error.
-	 */
-	errno = 0;
-
-	/* Fatal errors stop here. */
-	if (ISSET(FTS_STOP))
-		return (NULL);
-
-	/* Return logical hierarchy of user's arguments. */
-	if (p->fts_info == FTS_INIT)
-		return (p->fts_link);
-
-	/*
-	 * If not a directory being visited in pre-order, stop here.  Could
-	 * allow FTS_DNR, assuming the user has fixed the problem, but the
-	 * same effect is available with FTS_AGAIN.
-	 */
-	if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */)
-		return (NULL);
-
-	/* Free up any previous child list. */
-	if (sp->fts_child != NULL)
-		fts_lfree(sp->fts_child);
-
-	if (instr == FTS_NAMEONLY) {
-		SET(FTS_NAMEONLY);
-		instr = BNAMES;
-	} else
-		instr = BCHILD;
-
-	/*
-	 * If using chdir on a relative path and called BEFORE fts_read does
-	 * its chdir to the root of a traversal, we can lose -- we need to
-	 * chdir into the subdirectory, and we don't know where the current
-	 * directory is, so we can't get back so that the upcoming chdir by
-	 * fts_read will work.
-	 */
-	if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' ||
-	    ISSET(FTS_NOCHDIR))
-		return (sp->fts_child = fts_build(sp, instr));
-
-	if ((fd = _open(".", O_RDONLY | O_CLOEXEC, 0)) < 0)
-		return (NULL);
-	sp->fts_child = fts_build(sp, instr);
-	if (fchdir(fd)) {
-		(void)_close(fd);
-		return (NULL);
-	}
-	(void)_close(fd);
-	return (sp->fts_child);
-}
-
-#ifndef fts_get_clientptr
-#error "fts_get_clientptr not defined"
-#endif
-
-void *
-(fts_get_clientptr)(FTS *sp)
-{
-
-	return (fts_get_clientptr(sp));
-}
-
-#ifndef fts_get_stream
-#error "fts_get_stream not defined"
-#endif
-
-FTS *
-(fts_get_stream)(FTSENT *p)
-{
-	return (fts_get_stream(p));
-}
-
-void
-fts_set_clientptr(FTS *sp, void *clientptr)
-{
-
-	sp->fts_clientptr = clientptr;
-}
-
-/*
- * This is the tricky part -- do not casually change *anything* in here.  The
- * idea is to build the linked list of entries that are used by fts_children
- * and fts_read.  There are lots of special cases.
- *
- * The real slowdown in walking the tree is the stat calls.  If FTS_NOSTAT is
- * set and it's a physical walk (so that symbolic links can't be directories),
- * we can do things quickly.  First, if it's a 4.4BSD file system, the type
- * of the file is in the directory entry.  Otherwise, we assume that the number
- * of subdirectories in a node is equal to the number of links to the parent.
- * The former skips all stat calls.  The latter skips stat calls in any leaf
- * directories and for any files after the subdirectories in the directory have
- * been found, cutting the stat calls by about 2/3.
- */
-static FTSENT *
-fts_build(FTS *sp, int type)
-{
-	struct dirent *dp;
-	FTSENT *p, *head;
-	FTSENT *cur, *tail;
-	DIR *dirp;
-	void *oldaddr;
-	char *cp;
-	int cderrno, descend, oflag, saved_errno, nostat, doadjust;
-	long level;
-	long nlinks;	/* has to be signed because -1 is a magic value */
-	size_t dnamlen, len, maxlen, nitems;
-
-	/* Set current node pointer. */
-	cur = sp->fts_cur;
-
-	/*
-	 * Open the directory for reading.  If this fails, we're done.
-	 * If being called from fts_read, set the fts_info field.
-	 */
-#ifdef FTS_WHITEOUT
-	if (ISSET(FTS_WHITEOUT))
-		oflag = DTF_NODUP | DTF_REWIND;
-	else
-		oflag = DTF_HIDEW | DTF_NODUP | DTF_REWIND;
-#else
-#define __opendir2(path, flag) opendir(path)
-#endif
-	if ((dirp = __opendir2(cur->fts_accpath, oflag)) == NULL) {
-		if (type == BREAD) {
-			cur->fts_info = FTS_DNR;
-			cur->fts_errno = errno;
-		}
-		return (NULL);
-	}
-
-	/*
-	 * Nlinks is the number of possible entries of type directory in the
-	 * directory if we're cheating on stat calls, 0 if we're not doing
-	 * any stat calls at all, -1 if we're doing stats on everything.
-	 */
-	if (type == BNAMES) {
-		nlinks = 0;
-		/* Be quiet about nostat, GCC. */
-		nostat = 0;
-	} else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) {
-		if (fts_ufslinks(sp, cur))
-			nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2);
-		else
-			nlinks = -1;
-		nostat = 1;
-	} else {
-		nlinks = -1;
-		nostat = 0;
-	}
-
-#ifdef notdef
-	(void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink);
-	(void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n",
-	    ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT));
-#endif
-	/*
-	 * If we're going to need to stat anything or we want to descend
-	 * and stay in the directory, chdir.  If this fails we keep going,
-	 * but set a flag so we don't chdir after the post-order visit.
-	 * We won't be able to stat anything, but we can still return the
-	 * names themselves.  Note, that since fts_read won't be able to
-	 * chdir into the directory, it will have to return different path
-	 * names than before, i.e. "a/b" instead of "b".  Since the node
-	 * has already been visited in pre-order, have to wait until the
-	 * post-order visit to return the error.  There is a special case
-	 * here, if there was nothing to stat then it's not an error to
-	 * not be able to stat.  This is all fairly nasty.  If a program
-	 * needed sorted entries or stat information, they had better be
-	 * checking FTS_NS on the returned nodes.
-	 */
-	cderrno = 0;
-	if (nlinks || type == BREAD) {
-		if (fts_safe_changedir(sp, cur, _dirfd(dirp), NULL)) {
-			if (nlinks && type == BREAD)
-				cur->fts_errno = errno;
-			cur->fts_flags |= FTS_DONTCHDIR;
-			descend = 0;
-			cderrno = errno;
-		} else
-			descend = 1;
-	} else
-		descend = 0;
-
-	/*
-	 * Figure out the max file name length that can be stored in the
-	 * current path -- the inner loop allocates more path as necessary.
-	 * We really wouldn't have to do the maxlen calculations here, we
-	 * could do them in fts_read before returning the path, but it's a
-	 * lot easier here since the length is part of the dirent structure.
-	 *
-	 * If not changing directories set a pointer so that can just append
-	 * each new name into the path.
-	 */
-	len = NAPPEND(cur);
-	if (ISSET(FTS_NOCHDIR)) {
-		cp = sp->fts_path + len;
-		*cp++ = '/';
-	} else {
-		/* GCC, you're too verbose. */
-		cp = NULL;
-	}
-	len++;
-	maxlen = sp->fts_pathlen - len;
-
-	level = cur->fts_level + 1;
-
-	/* Read the directory, attaching each entry to the `link' pointer. */
-	doadjust = 0;
-	for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) {
-		dnamlen = dp->d_namlen;
-		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
-			continue;
-
-		if ((p = fts_alloc(sp, dp->d_name, dnamlen)) == NULL)
-			goto mem1;
-		if (dnamlen >= maxlen) {	/* include space for NUL */
-			oldaddr = sp->fts_path;
-			if (fts_palloc(sp, dnamlen + len + 1)) {
-				/*
-				 * No more memory for path or structures.  Save
-				 * errno, free up the current structure and the
-				 * structures already allocated.
-				 */
-mem1:				saved_errno = errno;
-				if (p)
-					free(p);
-				fts_lfree(head);
-				(void)closedir(dirp);
-				cur->fts_info = FTS_ERR;
-				SET(FTS_STOP);
-				errno = saved_errno;
-				return (NULL);
-			}
-			/* Did realloc() change the pointer? */
-			if (oldaddr != sp->fts_path) {
-				doadjust = 1;
-				if (ISSET(FTS_NOCHDIR))
-					cp = sp->fts_path + len;
-			}
-			maxlen = sp->fts_pathlen - len;
-		}
-
-		p->fts_level = level;
-		p->fts_parent = sp->fts_cur;
-		p->fts_pathlen = len + dnamlen;
-
-#ifdef FTS_WHITEOUT
-		if (dp->d_type == DT_WHT)
-			p->fts_flags |= FTS_ISW;
-#endif
-
-		if (cderrno) {
-			if (nlinks) {
-				p->fts_info = FTS_NS;
-				p->fts_errno = cderrno;
-			} else
-				p->fts_info = FTS_NSOK;
-			p->fts_accpath = cur->fts_accpath;
-		} else if (nlinks == 0
-#ifdef DT_DIR
-		    || (nostat &&
-		    dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
-#endif
-		    ) {
-			p->fts_accpath =
-			    ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
-			p->fts_info = FTS_NSOK;
-		} else {
-			/* Build a file name for fts_stat to stat. */
-			if (ISSET(FTS_NOCHDIR)) {
-				p->fts_accpath = p->fts_path;
-				memmove(cp, p->fts_name, p->fts_namelen + 1);
-				p->fts_info = fts_stat(sp, p, 0, _dirfd(dirp));
-			} else {
-				p->fts_accpath = p->fts_name;
-				p->fts_info = fts_stat(sp, p, 0, -1);
-			}
-
-			/* Decrement link count if applicable. */
-			if (nlinks > 0 && (p->fts_info == FTS_D ||
-			    p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
-				--nlinks;
-		}
-
-		/* We walk in directory order so "ls -f" doesn't get upset. */
-		p->fts_link = NULL;
-		if (head == NULL)
-			head = tail = p;
-		else {
-			tail->fts_link = p;
-			tail = p;
-		}
-		++nitems;
-	}
-	if (dirp)
-		(void)closedir(dirp);
-
-	/*
-	 * If realloc() changed the address of the path, adjust the
-	 * addresses for the rest of the tree and the dir list.
-	 */
-	if (doadjust)
-		fts_padjust(sp, head);
-
-	/*
-	 * If not changing directories, reset the path back to original
-	 * state.
-	 */
-	if (ISSET(FTS_NOCHDIR))
-		sp->fts_path[cur->fts_pathlen] = '\0';
-
-	/*
-	 * If descended after called from fts_children or after called from
-	 * fts_read and nothing found, get back.  At the root level we use
-	 * the saved fd; if one of fts_open()'s arguments is a relative path
-	 * to an empty directory, we wind up here with no other way back.  If
-	 * can't get back, we're done.
-	 */
-	if (descend && (type == BCHILD || !nitems) &&
-	    (cur->fts_level == FTS_ROOTLEVEL ?
-	    FCHDIR(sp, sp->fts_rfd) :
-	    fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
-		cur->fts_info = FTS_ERR;
-		SET(FTS_STOP);
-		return (NULL);
-	}
-
-	/* If didn't find anything, return NULL. */
-	if (!nitems) {
-		if (type == BREAD)
-			cur->fts_info = FTS_DP;
-		return (NULL);
-	}
-
-	/* Sort the entries. */
-	if (sp->fts_compar && nitems > 1)
-		head = fts_sort(sp, head, nitems);
-	return (head);
-}
-
-static int
-fts_stat(FTS *sp, FTSENT *p, int follow, int dfd)
-{
-	FTSENT *t;
-	dev_t dev;
-	ino_t ino;
-	struct stat *sbp, sb;
-	int saved_errno;
-	const char *path;
-
-	if (dfd == -1)
-		path = p->fts_accpath, dfd = AT_FDCWD;
-	else
-		path = p->fts_name;
-
-	/* If user needs stat info, stat buffer already allocated. */
-	sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp;
-
-#ifdef FTS_WHITEOUT
-	/* Check for whiteout. */
-	if (p->fts_flags & FTS_ISW) {
-		if (sbp != &sb) {
-			memset(sbp, '\0', sizeof(*sbp));
-			sbp->st_mode = S_IFWHT;
-		}
-		return (FTS_W);
-	}
-#endif
-
-	/*
-	 * If doing a logical walk, or application requested FTS_FOLLOW, do
-	 * a stat(2).  If that fails, check for a non-existent symlink.  If
-	 * fail, set the errno from the stat call.
-	 */
-	if (ISSET(FTS_LOGICAL) || follow) {
-		if (fstatat(dfd, path, sbp, 0)) {
-			saved_errno = errno;
-			if (fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) {
-				p->fts_errno = saved_errno;
-				goto err;
-			}
-			errno = 0;
-			if (S_ISLNK(sbp->st_mode))
-				return (FTS_SLNONE);
-		}
-	} else if (fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) {
-		p->fts_errno = errno;
-err:		memset(sbp, 0, sizeof(struct stat));
-		return (FTS_NS);
-	}
-
-	if (S_ISDIR(sbp->st_mode)) {
-		/*
-		 * Set the device/inode.  Used to find cycles and check for
-		 * crossing mount points.  Also remember the link count, used
-		 * in fts_build to limit the number of stat calls.  It is
-		 * understood that these fields are only referenced if fts_info
-		 * is set to FTS_D.
-		 */
-		dev = p->fts_dev = sbp->st_dev;
-		ino = p->fts_ino = sbp->st_ino;
-		p->fts_nlink = sbp->st_nlink;
-
-		if (ISDOT(p->fts_name))
-			return (FTS_DOT);
-
-		/*
-		 * Cycle detection is done by brute force when the directory
-		 * is first encountered.  If the tree gets deep enough or the
-		 * number of symbolic links to directories is high enough,
-		 * something faster might be worthwhile.
-		 */
-		for (t = p->fts_parent;
-		    t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
-			if (ino == t->fts_ino && dev == t->fts_dev) {
-				p->fts_cycle = t;
-				return (FTS_DC);
-			}
-		return (FTS_D);
-	}
-	if (S_ISLNK(sbp->st_mode))
-		return (FTS_SL);
-	if (S_ISREG(sbp->st_mode))
-		return (FTS_F);
-	return (FTS_DEFAULT);
-}
-
-/*
- * The comparison function takes pointers to pointers to FTSENT structures.
- * Qsort wants a comparison function that takes pointers to void.
- * (Both with appropriate levels of const-poisoning, of course!)
- * Use a trampoline function to deal with the difference.
- */
-static int
-fts_compar(const void *a, const void *b)
-{
-	FTS *parent;
-
-	parent = (*(const FTSENT * const *)a)->fts_fts;
-	return (*parent->fts_compar)(a, b);
-}
-
-static FTSENT *
-fts_sort(FTS *sp, FTSENT *head, size_t nitems)
-{
-	FTSENT **ap, *p;
-
-	/*
-	 * Construct an array of pointers to the structures and call qsort(3).
-	 * Reassemble the array in the order returned by qsort.  If unable to
-	 * sort for memory reasons, return the directory entries in their
-	 * current order.  Allocate enough space for the current needs plus
-	 * 40 so don't realloc one entry at a time.
-	 */
-	if (nitems > sp->fts_nitems) {
-		sp->fts_nitems = nitems + 40;
-		if ((sp->fts_array = reallocf(sp->fts_array,
-		    sp->fts_nitems * sizeof(FTSENT *))) == NULL) {
-			sp->fts_nitems = 0;
-			return (head);
-		}
-	}
-	for (ap = sp->fts_array, p = head; p; p = p->fts_link)
-		*ap++ = p;
-	qsort(sp->fts_array, nitems, sizeof(FTSENT *), fts_compar);
-	for (head = *(ap = sp->fts_array); --nitems; ++ap)
-		ap[0]->fts_link = ap[1];
-	ap[0]->fts_link = NULL;
-	return (head);
-}
-
-static FTSENT *
-fts_alloc(FTS *sp, char *name, size_t namelen)
-{
-	FTSENT *p;
-	size_t len;
-
-	struct ftsent_withstat {
-		FTSENT	ent;
-		struct	stat statbuf;
-	};
-
-	/*
-	 * The file name is a variable length array and no stat structure is
-	 * necessary if the user has set the nostat bit.  Allocate the FTSENT
-	 * structure, the file name and the stat structure in one chunk, but
-	 * be careful that the stat structure is reasonably aligned.
-	 */
-	if (ISSET(FTS_NOSTAT))
-		len = sizeof(FTSENT) + namelen + 1;
-	else
-		len = sizeof(struct ftsent_withstat) + namelen + 1;
-
-	if ((p = malloc(len)) == NULL)
-		return (NULL);
-
-	if (ISSET(FTS_NOSTAT)) {
-		p->fts_name = (char *)(p + 1);
-		p->fts_statp = NULL;
-	} else {
-		p->fts_name = (char *)((struct ftsent_withstat *)p + 1);
-		p->fts_statp = &((struct ftsent_withstat *)p)->statbuf;
-	}
-
-	/* Copy the name and guarantee NUL termination. */
-	memcpy(p->fts_name, name, namelen);
-	p->fts_name[namelen] = '\0';
-	p->fts_namelen = namelen;
-	p->fts_path = sp->fts_path;
-	p->fts_errno = 0;
-	p->fts_flags = 0;
-	p->fts_instr = FTS_NOINSTR;
-	p->fts_number = 0;
-	p->fts_pointer = NULL;
-	p->fts_fts = sp;
-	return (p);
-}
-
-static void
-fts_lfree(FTSENT *head)
-{
-	FTSENT *p;
-
-	/* Free a linked list of structures. */
-	while ((p = head)) {
-		head = head->fts_link;
-		free(p);
-	}
-}
-
-/*
- * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
- * Most systems will allow creation of paths much longer than MAXPATHLEN, even
- * though the kernel won't resolve them.  Add the size (not just what's needed)
- * plus 256 bytes so don't realloc the path 2 bytes at a time.
- */
-static int
-fts_palloc(FTS *sp, size_t more)
-{
-
-	sp->fts_pathlen += more + 256;
-	sp->fts_path = reallocf(sp->fts_path, sp->fts_pathlen);
-	return (sp->fts_path == NULL);
-}
-
-/*
- * When the path is realloc'd, have to fix all of the pointers in structures
- * already returned.
- */
-static void
-fts_padjust(FTS *sp, FTSENT *head)
-{
-	FTSENT *p;
-	char *addr = sp->fts_path;
-
-#define	ADJUST(p) do {							\
-	if ((p)->fts_accpath != (p)->fts_name) {			\
-		(p)->fts_accpath =					\
-		    (char *)addr + ((p)->fts_accpath - (p)->fts_path);	\
-	}								\
-	(p)->fts_path = addr;						\
-} while (0)
-	/* Adjust the current set of children. */
-	for (p = sp->fts_child; p; p = p->fts_link)
-		ADJUST(p);
-
-	/* Adjust the rest of the tree, including the current level. */
-	for (p = head; p->fts_level >= FTS_ROOTLEVEL;) {
-		ADJUST(p);
-		p = p->fts_link ? p->fts_link : p->fts_parent;
-	}
-}
-
-static size_t
-fts_maxarglen(argv)
-	char * const *argv;
-{
-	size_t len, max;
-
-	for (max = 0; *argv; ++argv)
-		if ((len = strlen(*argv)) > max)
-			max = len;
-	return (max + 1);
-}
-
-/*
- * Change to dir specified by fd or p->fts_accpath without getting
- * tricked by someone changing the world out from underneath us.
- * Assumes p->fts_dev and p->fts_ino are filled in.
- */
-static int
-fts_safe_changedir(FTS *sp, FTSENT *p, int fd, char *path)
-{
-	int ret, oerrno, newfd;
-	struct stat sb;
-
-	newfd = fd;
-	if (ISSET(FTS_NOCHDIR))
-		return (0);
-	if (fd < 0 && (newfd = _open(path, O_RDONLY | O_DIRECTORY |
-	    O_CLOEXEC, 0)) < 0)
-		return (-1);
-	if (_fstat(newfd, &sb)) {
-		ret = -1;
-		goto bail;
-	}
-	if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) {
-		errno = ENOENT;		/* disinformation */
-		ret = -1;
-		goto bail;
-	}
-	ret = fchdir(newfd);
-bail:
-	oerrno = errno;
-	if (fd < 0)
-		(void)_close(newfd);
-	errno = oerrno;
-	return (ret);
-}
-
-/*
- * Check if the filesystem for "ent" has UFS-style links.
- */
-static int
-fts_ufslinks(FTS *sp, const FTSENT *ent)
-{
-	struct _fts_private *priv;
-	const char **cpp;
-
-	priv = (struct _fts_private *)sp;
-	/*
-	 * If this node's device is different from the previous, grab
-	 * the filesystem information, and decide on the reliability
-	 * of the link information from this filesystem for stat(2)
-	 * avoidance.
-	 */
-	if (priv->ftsp_dev != ent->fts_dev) {
-		if (statfs(ent->fts_path, &priv->ftsp_statfs) != -1) {
-			priv->ftsp_dev = ent->fts_dev;
-			priv->ftsp_linksreliable = 0;
-			for (cpp = ufslike_filesystems; *cpp; cpp++) {
-				if (strcmp(priv->ftsp_statfs.f_fstypename,
-				    *cpp) == 0) {
-					priv->ftsp_linksreliable = 1;
-					break;
-				}
-			}
-		} else {
-			priv->ftsp_linksreliable = 0;
-		}
-	}
-	return (priv->ftsp_linksreliable);
-}
diff --git a/lib/libc_bsd/gen/ftw.3 b/lib/libc_bsd/gen/ftw.3
deleted file mode 100644
index c058791..0000000
--- a/lib/libc_bsd/gen/ftw.3
+++ /dev/null
@@ -1,216 +0,0 @@
-.\"	$OpenBSD: ftw.3,v 1.5 2004/01/25 14:48:32 jmc Exp $
-.\"
-.\" Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" Sponsored in part by the Defense Advanced Research Projects
-.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
-.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/ftw.3 152714 2005-11-23 15:41:36Z ru $
-.\"
-.Dd July 5, 2004
-.Dt FTW 3
-.Os
-.Sh NAME
-.Nm ftw , nftw
-.Nd traverse (walk) a file tree
-.Sh SYNOPSIS
-.In ftw.h
-.Ft int
-.Fo ftw
-.Fa "const char *path"
-.Fa "int \*[lp]*fn\*[rp]\*[lp]const char *, const struct stat *, int\*[rp]"
-.Fa "int maxfds"
-.Fc
-.Ft int
-.Fo nftw
-.Fa "const char *path"
-.Fa "int \*[lp]*fn\*[rp]\*[lp]const char *, const struct stat *, int, struct FTW *\*[rp]"
-.Fa "int maxfds"
-.Fa "int flags"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn ftw
-and
-.Fn nftw
-functions traverse (walk) the directory hierarchy rooted in
-.Fa path .
-For each object in the hierarchy, these functions call the function
-pointed to by
-.Fa fn .
-The
-.Fn ftw
-function passes this function a pointer to a
-.Dv NUL Ns
--terminated string containing
-the name of the object, a pointer to a
-.Vt stat
-structure corresponding to the
-object, and an integer flag.
-The
-.Fn nftw
-function passes the aforementioned arguments plus a pointer to a
-.Vt FTW
-structure as defined by
-.In ftw.h
-(shown below):
-.Bd -literal
-struct FTW {
-    int base;	/* offset of basename into pathname */
-    int level;	/* directory depth relative to starting point */
-};
-.Ed
-.Pp
-Possible values for the flag passed to
-.Fa fn
-are:
-.Bl -tag -width ".Dv FTW_DNR"
-.It Dv FTW_F
-A regular file.
-.It Dv FTW_D
-A directory being visited in pre-order.
-.It Dv FTW_DNR
-A directory which cannot be read.
-The directory will not be descended into.
-.It Dv FTW_DP
-A directory being visited in post-order
-.Fn ( nftw
-only).
-.It Dv FTW_NS
-A file for which no
-.Xr stat 2
-information was available.
-The contents of the
-.Vt stat
-structure are undefined.
-.It Dv FTW_SL
-A symbolic link.
-.It Dv FTW_SLN
-A symbolic link with a non-existent target
-.Fn ( nftw
-only).
-.El
-.Pp
-The
-.Fn ftw
-function traverses the tree in pre-order.
-That is, it processes the directory before the directory's contents.
-.Pp
-The
-.Fa maxfds
-argument specifies the maximum number of file descriptors
-to keep open while traversing the tree.
-It has no effect in this implementation.
-.Pp
-The
-.Fn nftw
-function has an additional
-.Fa flags
-argument with the following possible values:
-.Bl -tag -width ".Dv FTW_MOUNT"
-.It Dv FTW_PHYS
-Physical walk, do not follow symbolic links.
-.It Dv FTW_MOUNT
-The walk will not cross a mount point.
-.It FTW_DEPTH
-Process directories in post-order.
-Contents of a directory are visited before the directory itself.
-By default,
-.Fn nftw
-traverses the tree in pre-order.
-.It FTW_CHDIR
-Change to a directory before reading it.
-By default,
-.Fn nftw
-will change its starting directory.
-The current working directory will be restored to its original value before
-.Fn nftw
-returns.
-.El
-.Sh RETURN VALUES
-If the tree was traversed successfully, the
-.Fn ftw
-and
-.Fn nftw
-functions return 0.
-If the function pointed to by
-.Fa fn
-returns a non-zero value,
-.Fn ftw
-and
-.Fn nftw
-will stop processing the tree and return the value from
-.Fa fn .
-Both functions return \-1 if an error is detected.
-.Sh ERRORS
-The
-.Fn ftw
-and
-.Fn nftw
-functions may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr close 2 ,
-.Xr open 2 ,
-.Xr stat 2 ,
-.Xr malloc 3 ,
-.Xr opendir 3
-and
-.Xr readdir 3 .
-If the
-.Dv FTW_CHDIR
-flag is set, the
-.Fn nftw
-function may fail and set
-.Va errno
-for any of the errors specified for
-.Xr chdir 2 .
-In addition, either function may fail and set
-.Va errno
-as follows:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa maxfds
-argument is less than 1.
-.El
-.Sh SEE ALSO
-.Xr chdir 2 ,
-.Xr close 2 ,
-.Xr open 2 ,
-.Xr stat 2 ,
-.Xr fts 3 ,
-.Xr malloc 3 ,
-.Xr opendir 3 ,
-.Xr readdir 3
-.Sh STANDARDS
-The
-.Fn ftw
-and
-.Fn nftw
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-These functions first appeared in
-.At V.3 .
-Their first
-.Fx
-appearance was in
-.Fx 5.3 .
-.Sh BUGS
-The
-.Fa maxfds
-argument is currently ignored.
diff --git a/lib/libc_bsd/gen/ftw.c b/lib/libc_bsd/gen/ftw.c
deleted file mode 100644
index 8f5dd0e..0000000
--- a/lib/libc_bsd/gen/ftw.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	$OpenBSD: ftw.c,v 1.5 2005/08/08 08:05:34 espie Exp $	*/
-
-/*
- * Copyright (c) 2003, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/ftw.c 239151 2012-08-09 15:11:38Z jilles $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fts.h>
-#include <ftw.h>
-
-int
-ftw(const char *path, int (*fn)(const char *, const struct stat *, int),
-    int nfds)
-{
-	char * const paths[2] = { (char *)path, NULL };
-	FTSENT *cur;
-	FTS *ftsp;
-	int error = 0, fnflag, sverrno;
-
-	/* XXX - nfds is currently unused */
-	if (nfds < 1) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ftsp = fts_open(paths, FTS_LOGICAL | FTS_COMFOLLOW | FTS_NOCHDIR, NULL);
-	if (ftsp == NULL)
-		return (-1);
-	while ((cur = fts_read(ftsp)) != NULL) {
-		switch (cur->fts_info) {
-		case FTS_D:
-			fnflag = FTW_D;
-			break;
-		case FTS_DNR:
-			fnflag = FTW_DNR;
-			break;
-		case FTS_DP:
-			/* we only visit in preorder */
-			continue;
-		case FTS_F:
-		case FTS_DEFAULT:
-			fnflag = FTW_F;
-			break;
-		case FTS_NS:
-		case FTS_NSOK:
-		case FTS_SLNONE:
-			fnflag = FTW_NS;
-			break;
-		case FTS_SL:
-			fnflag = FTW_SL;
-			break;
-		case FTS_DC:
-			errno = ELOOP;
-			/* FALLTHROUGH */
-		default:
-			error = -1;
-			goto done;
-		}
-		error = fn(cur->fts_path, cur->fts_statp, fnflag);
-		if (error != 0)
-			break;
-	}
-done:
-	sverrno = errno;
-	if (fts_close(ftsp) != 0 && error == 0)
-		error = -1;
-	else
-		errno = sverrno;
-	return (error);
-}
diff --git a/lib/libc_bsd/gen/gen-private.h b/lib/libc_bsd/gen/gen-private.h
deleted file mode 100644
index ab6a2ad..0000000
--- a/lib/libc_bsd/gen/gen-private.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1989, 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. 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/gen/gen-private.h 270002 2014-08-14 20:20:21Z jhb $
- */
-
-#ifndef _GEN_PRIVATE_H_
-#define	_GEN_PRIVATE_H_
-
-struct _telldir;		/* see telldir.h */
-struct pthread_mutex;
-
-/*
- * Structure describing an open directory.
- *
- * NOTE. Change structure layout with care, at least dd_fd field has to
- * remain unchanged to guarantee backward compatibility.
- */
-struct _dirdesc {
-	int	dd_fd;		/* file descriptor associated with directory */
-	long	dd_loc;		/* offset in current buffer */
-	long	dd_size;	/* amount of data returned by getdirentries */
-	char	*dd_buf;	/* data buffer */
-	int	dd_len;		/* size of data buffer */
-	long	dd_seek;	/* magic cookie returned by getdirentries */
-	int	dd_flags;	/* flags for readdir */
-	struct pthread_mutex	*dd_lock;	/* lock */
-	struct _telldir *dd_td;	/* telldir position recording */
-};
-
-#define	_dirfd(dirp)	((dirp)->dd_fd)
-
-#endif /* !_GEN_PRIVATE_H_ */
diff --git a/lib/libc_bsd/gen/getbootfile.3 b/lib/libc_bsd/gen/getbootfile.3
deleted file mode 100644
index b29607d..0000000
--- a/lib/libc_bsd/gen/getbootfile.3
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getbootfile.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd September 23, 1994
-.Dt GETBOOTFILE 3
-.Os
-.Sh NAME
-.Nm getbootfile
-.Nd get kernel boot file name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In paths.h
-.Ft const char *
-.Fn getbootfile void
-.Sh DESCRIPTION
-The
-.Fn getbootfile
-function retrieves the full pathname of the file from which the
-current kernel was loaded, and returns a static pointer to the name.
-A read/write interface to this information is available via the
-.Xr sysctl 3
-MIB variable
-.Dq Li kern.bootfile .
-.Sh RETURN VALUES
-If the call succeeds a string giving the pathname is returned.
-If it
-fails, a null pointer is returned and an error code is
-placed in the global location
-.Va errno .
-.Sh SEE ALSO
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn getbootfile
-function appeared in
-.Fx 2.0 .
-.Sh BUGS
-If the boot blocks have not been modified to pass this information into
-the kernel at boot time, the static string
-.Dq Pa /boot/kernel/kernel
-is returned instead of the real boot file.
diff --git a/lib/libc_bsd/gen/getbootfile.c b/lib/libc_bsd/gen/getbootfile.c
deleted file mode 100644
index 1bb3e3e..0000000
--- a/lib/libc_bsd/gen/getbootfile.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getbootfile.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <paths.h>
-
-const char *
-getbootfile(void)
-{
-	static char name[MAXPATHLEN];
-	size_t size = sizeof name;
-	int mib[2];
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_BOOTFILE;
-	if (sysctl(mib, 2, name, &size, NULL, 0) == -1)
-		return ("/boot/kernel/kernel");
-	return (name);
-}
diff --git a/lib/libc_bsd/gen/getbsize.3 b/lib/libc_bsd/gen/getbsize.3
deleted file mode 100644
index 5e87a9c..0000000
--- a/lib/libc_bsd/gen/getbsize.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"     @(#)getbsize.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getbsize.3 243146 2012-11-16 12:03:50Z joel $
-.\"
-.Dd November 16, 2012
-.Dt GETBSIZE 3
-.Os
-.Sh NAME
-.Nm getbsize
-.Nd get preferred block size
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft char *
-.Fn getbsize "int *headerlenp" "long *blocksizep"
-.Sh DESCRIPTION
-The
-.Fn getbsize
-function returns a preferred block size for reporting by system utilities
-.Xr df 1 ,
-.Xr du 1 ,
-.Xr ls 1
-and
-.Xr systat 1 ,
-based on the value of the
-.Ev BLOCKSIZE
-environment variable.
-.Ev BLOCKSIZE
-may be specified directly in bytes, or in multiples of a kilobyte by
-specifying a number followed by ``K'' or ``k'', in multiples of a
-megabyte by specifying a number followed by ``M'' or ``m'' or in
-multiples of a gigabyte by specifying a number followed by ``G'' or
-``g''.
-Multiples must be integers.
-.Pp
-Valid values of
-.Ev BLOCKSIZE
-are 512 bytes to 1 gigabyte.
-Sizes less than 512 bytes are rounded up to 512 bytes, and sizes
-greater than 1 GB are rounded down to 1 GB.
-In each case
-.Fn getbsize
-produces a warning message.
-.Pp
-The
-.Fn getbsize
-function returns a pointer to a null-terminated string describing
-the block size, something like
-.Dq 1K-blocks .
-The memory referenced by
-.Fa headerlenp
-is filled in with the length of the string (not including the
-terminating null).
-The memory referenced by
-.Fa blocksizep
-is filled in with block size, in bytes.
-.Sh SEE ALSO
-.Xr df 1 ,
-.Xr du 1 ,
-.Xr ls 1 ,
-.Xr systat 1 ,
-.Xr environ 7
-.Sh HISTORY
-The
-.Fn getbsize
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/gen/getbsize.c b/lib/libc_bsd/gen/getbsize.c
deleted file mode 100644
index 4dfc7d3..0000000
--- a/lib/libc_bsd/gen/getbsize.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getbsize.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getbsize.c 181280 2008-08-04 06:53:13Z cperciva $");
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-getbsize(headerlenp, blocksizep)
-	int *headerlenp;
-	long *blocksizep;
-{
-	static char header[20];
-	long n, max, mul, blocksize;
-	char *ep, *p;
-	const char *form;
-
-#define	KB	(1024L)
-#define	MB	(1024L * 1024L)
-#define	GB	(1024L * 1024L * 1024L)
-#define	MAXB	GB		/* No tera, peta, nor exa. */
-	form = "";
-	if ((p = getenv("BLOCKSIZE")) != NULL && *p != '\0') {
-		if ((n = strtol(p, &ep, 10)) < 0)
-			goto underflow;
-		if (n == 0)
-			n = 1;
-		if (*ep && ep[1])
-			goto fmterr;
-		switch (*ep) {
-		case 'G': case 'g':
-			form = "G";
-			max = MAXB / GB;
-			mul = GB;
-			break;
-		case 'K': case 'k':
-			form = "K";
-			max = MAXB / KB;
-			mul = KB;
-			break;
-		case 'M': case 'm':
-			form = "M";
-			max = MAXB / MB;
-			mul = MB;
-			break;
-		case '\0':
-			max = MAXB;
-			mul = 1;
-			break;
-		default:
-fmterr:			warnx("%s: unknown blocksize", p);
-			n = 512;
-			max = MAXB;
-			mul = 1;
-			break;
-		}
-		if (n > max) {
-			warnx("maximum blocksize is %ldG", MAXB / GB);
-			n = max;
-		}
-		if ((blocksize = n * mul) < 512) {
-underflow:		warnx("minimum blocksize is 512");
-			form = "";
-			blocksize = n = 512;
-		}
-	} else
-		blocksize = n = 512;
-
-	(void)snprintf(header, sizeof(header), "%ld%s-blocks", n, form);
-	*headerlenp = strlen(header);
-	*blocksizep = blocksize;
-	return (header);
-}
diff --git a/lib/libc_bsd/gen/getcap.3 b/lib/libc_bsd/gen/getcap.3
deleted file mode 100644
index 3358b21..0000000
--- a/lib/libc_bsd/gen/getcap.3
+++ /dev/null
@@ -1,568 +0,0 @@
-.\" Copyright (c) 1992, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Casey Leedom of Lawrence Livermore National Laboratory.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)getcap.3	8.4 (Berkeley) 5/13/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getcap.3 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd March 22, 2002
-.Dt GETCAP 3
-.Os
-.Sh NAME
-.Nm cgetent ,
-.Nm cgetset ,
-.Nm cgetmatch ,
-.Nm cgetcap ,
-.Nm cgetnum ,
-.Nm cgetstr ,
-.Nm cgetustr ,
-.Nm cgetfirst ,
-.Nm cgetnext ,
-.Nm cgetclose
-.Nd capability database access routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn cgetent "char **buf" "char **db_array" "const char *name"
-.Ft int
-.Fn cgetset "const char *ent"
-.Ft int
-.Fn cgetmatch "const char *buf" "const char *name"
-.Ft char *
-.Fn cgetcap "char *buf" "const char *cap" "int type"
-.Ft int
-.Fn cgetnum "char *buf" "const char *cap" "long *num"
-.Ft int
-.Fn cgetstr "char *buf" "const char *cap" "char **str"
-.Ft int
-.Fn cgetustr "char *buf" "const char *cap" "char **str"
-.Ft int
-.Fn cgetfirst "char **buf" "char **db_array"
-.Ft int
-.Fn cgetnext "char **buf" "char **db_array"
-.Ft int
-.Fn cgetclose "void"
-.Sh DESCRIPTION
-The
-.Fn cgetent
-function extracts the capability
-.Fa name
-from the database specified by the
-.Dv NULL
-terminated file array
-.Fa db_array
-and returns a pointer to a
-.Xr malloc 3 Ns \&'d
-copy of it in
-.Fa buf .
-The
-.Fn cgetent
-function will first look for files ending in
-.Pa .db
-(see
-.Xr cap_mkdb 1 )
-before accessing the ASCII file.
-The
-.Fa buf
-argument
-must be retained through all subsequent calls to
-.Fn cgetmatch ,
-.Fn cgetcap ,
-.Fn cgetnum ,
-.Fn cgetstr ,
-and
-.Fn cgetustr ,
-but may then be
-.Xr free 3 Ns \&'d .
-On success 0 is returned, 1 if the returned
-record contains an unresolved
-.Ic tc
-expansion,
-\-1 if the requested record could not be found,
-\-2 if a system error was encountered (could not open/read a file, etc.) also
-setting
-.Va errno ,
-and \-3 if a potential reference loop is detected (see
-.Ic tc=
-comments below).
-.Pp
-The
-.Fn cgetset
-function enables the addition of a character buffer containing a single capability
-record entry
-to the capability database.
-Conceptually, the entry is added as the first ``file'' in the database, and
-is therefore searched first on the call to
-.Fn cgetent .
-The entry is passed in
-.Fa ent .
-If
-.Fa ent
-is
-.Dv NULL ,
-the current entry is removed from the database.
-A call to
-.Fn cgetset
-must precede the database traversal.
-It must be called before the
-.Fn cgetent
-call.
-If a sequential access is being performed (see below), it must be called
-before the first sequential access call
-.Fn ( cgetfirst
-or
-.Fn cgetnext ) ,
-or be directly preceded by a
-.Fn cgetclose
-call.
-On success 0 is returned and \-1 on failure.
-.Pp
-The
-.Fn cgetmatch
-function will return 0 if
-.Fa name
-is one of the names of the capability record
-.Fa buf ,
-\-1 if
-not.
-.Pp
-The
-.Fn cgetcap
-function searches the capability record
-.Fa buf
-for the capability
-.Fa cap
-with type
-.Fa type .
-A
-.Fa type
-is specified using any single character.
-If a colon (`:') is used, an
-untyped capability will be searched for (see below for explanation of
-types).
-A pointer to the value of
-.Fa cap
-in
-.Fa buf
-is returned on success,
-.Dv NULL
-if the requested capability could not be
-found.
-The end of the capability value is signaled by a `:' or
-.Tn ASCII
-.Dv NUL
-(see below for capability database syntax).
-.Pp
-The
-.Fn cgetnum
-function retrieves the value of the numeric capability
-.Fa cap
-from the capability record pointed to by
-.Fa buf .
-The numeric value is returned in the
-.Ft long
-pointed to by
-.Fa num .
-0 is returned on success, \-1 if the requested numeric capability could not
-be found.
-.Pp
-The
-.Fn cgetstr
-function retrieves the value of the string capability
-.Fa cap
-from the capability record pointed to by
-.Fa buf .
-A pointer to a decoded,
-.Dv NUL
-terminated,
-.Xr malloc 3 Ns \&'d
-copy of the string is returned in the
-.Ft char *
-pointed to by
-.Fa str .
-The number of characters in the decoded string not including the trailing
-.Dv NUL
-is returned on success, \-1 if the requested string capability could not
-be found, \-2 if a system error was encountered (storage allocation
-failure).
-.Pp
-The
-.Fn cgetustr
-function is identical to
-.Fn cgetstr
-except that it does not expand special characters, but rather returns each
-character of the capability string literally.
-.Pp
-The
-.Fn cgetfirst
-and
-.Fn cgetnext
-functions comprise a function group that provides for sequential
-access of the
-.Dv NULL
-pointer terminated array of file names,
-.Fa db_array .
-The
-.Fn cgetfirst
-function returns the first record in the database and resets the access
-to the first record.
-The
-.Fn cgetnext
-function returns the next record in the database with respect to the
-record returned by the previous
-.Fn cgetfirst
-or
-.Fn cgetnext
-call.
-If there is no such previous call, the first record in the database is
-returned.
-Each record is returned in a
-.Xr malloc 3 Ns \&'d
-copy pointed to by
-.Fa buf .
-.Ic Tc
-expansion is done (see
-.Ic tc=
-comments below).
-Upon completion of the database 0 is returned, 1 is returned upon successful
-return of record with possibly more remaining (we have not reached the end of
-the database yet), 2 is returned if the record contains an unresolved
-.Ic tc
-expansion, \-1 is returned if a system error occurred, and \-2
-is returned if a potential reference loop is detected (see
-.Ic tc=
-comments below).
-Upon completion of database (0 return) the database is closed.
-.Pp
-The
-.Fn cgetclose
-function closes the sequential access and frees any memory and file descriptors
-being used.
-Note that it does not erase the buffer pushed by a call to
-.Fn cgetset .
-.Sh CAPABILITY DATABASE SYNTAX
-Capability databases are normally
-.Tn ASCII
-and may be edited with standard
-text editors.
-Blank lines and lines beginning with a `#' are comments
-and are ignored.
-Lines ending with a `\|\e' indicate that the next line
-is a continuation of the current line; the `\|\e' and following newline
-are ignored.
-Long lines are usually continued onto several physical
-lines by ending each line except the last with a `\|\e'.
-.Pp
-Capability databases consist of a series of records, one per logical
-line.
-Each record contains a variable number of `:'-separated fields
-(capabilities).
-Empty fields consisting entirely of white space
-characters (spaces and tabs) are ignored.
-.Pp
-The first capability of each record specifies its names, separated by `|'
-characters.
-These names are used to reference records in the database.
-By convention, the last name is usually a comment and is not intended as
-a lookup tag.
-For example, the
-.Em vt100
-record from the
-.Xr termcap 5
-database begins:
-.Pp
-.Dl "d0\||\|vt100\||\|vt100-am\||\|vt100am\||\|dec vt100:"
-.Pp
-giving four names that can be used to access the record.
-.Pp
-The remaining non-empty capabilities describe a set of (name, value)
-bindings, consisting of a names optionally followed by a typed value:
-.Pp
-.Bl -tag -width "nameTvalue" -compact
-.It name
-typeless [boolean] capability
-.Em name No "is present [true]"
-.It name Ns Em \&T Ns value
-capability
-.Pq Em name , \&T
-has value
-.Em value
-.It name@
-no capability
-.Em name No exists
-.It name Ns Em T Ns \&@
-capability
-.Pq Em name , T
-does not exist
-.El
-.Pp
-Names consist of one or more characters.
-Names may contain any character
-except `:', but it is usually best to restrict them to the printable
-characters and avoid use of graphics like `#', `=', `%', `@', etc.
-Types
-are single characters used to separate capability names from their
-associated typed values.
-Types may be any character except a `:'.
-Typically, graphics like `#', `=', `%', etc.\& are used.
-Values may be any
-number of characters and may contain any character except `:'.
-.Sh CAPABILITY DATABASE SEMANTICS
-Capability records describe a set of (name, value) bindings.
-Names may
-have multiple values bound to them.
-Different values for a name are
-distinguished by their
-.Fa types .
-The
-.Fn cgetcap
-function will return a pointer to a value of a name given the capability
-name and the type of the value.
-.Pp
-The types `#' and `=' are conventionally used to denote numeric and
-string typed values, but no restriction on those types is enforced.
-The
-functions
-.Fn cgetnum
-and
-.Fn cgetstr
-can be used to implement the traditional syntax and semantics of `#'
-and `='.
-Typeless capabilities are typically used to denote boolean objects with
-presence or absence indicating truth and false values respectively.
-This interpretation is conveniently represented by:
-.Pp
-.Dl "(getcap(buf, name, ':') != NULL)"
-.Pp
-A special capability,
-.Ic tc= name ,
-is used to indicate that the record specified by
-.Fa name
-should be substituted for the
-.Ic tc
-capability.
-.Ic Tc
-capabilities may interpolate records which also contain
-.Ic tc
-capabilities and more than one
-.Ic tc
-capability may be used in a record.
-A
-.Ic tc
-expansion scope (i.e., where the argument is searched for) contains the
-file in which the
-.Ic tc
-is declared and all subsequent files in the file array.
-.Pp
-When a database is searched for a capability record, the first matching
-record in the search is returned.
-When a record is scanned for a
-capability, the first matching capability is returned; the capability
-.Ic :nameT@:
-will hide any following definition of a value of type
-.Em T
-for
-.Fa name ;
-and the capability
-.Ic :name@:
-will prevent any following values of
-.Fa name
-from being seen.
-.Pp
-These features combined with
-.Ic tc
-capabilities can be used to generate variations of other databases and
-records by either adding new capabilities, overriding definitions with new
-definitions, or hiding following definitions via `@' capabilities.
-.Sh EXAMPLES
-.Bd -unfilled -offset indent
-example\||\|an example of binding multiple values to names:\e
-	:foo%bar:foo^blah:foo@:\e
-	:abc%xyz:abc^frap:abc$@:\e
-	:tc=more:
-.Ed
-.Pp
-The capability foo has two values bound to it (bar of type `%' and blah of
-type `^') and any other value bindings are hidden.
-The capability abc
-also has two values bound but only a value of type `$' is prevented from
-being defined in the capability record more.
-.Bd -unfilled -offset indent
-file1:
- 	new\||\|new_record\||\|a modification of "old":\e
-		:fript=bar:who-cares@:tc=old:blah:tc=extensions:
-file2:
-	old\||\|old_record\||\|an old database record:\e
-		:fript=foo:who-cares:glork#200:
-.Ed
-.Pp
-The records are extracted by calling
-.Fn cgetent
-with file1 preceding file2.
-In the capability record new in file1, fript=bar overrides the definition
-of fript=foo interpolated from the capability record old in file2,
-who-cares@ prevents the definition of any who-cares definitions in old
-from being seen, glork#200 is inherited from old, and blah and anything
-defined by the record extensions is added to those definitions in old.
-Note that the position of the fript=bar and who-cares@ definitions before
-tc=old is important here.
-If they were after, the definitions in old
-would take precedence.
-.Sh CGETNUM AND CGETSTR SYNTAX AND SEMANTICS
-Two types are predefined by
-.Fn cgetnum
-and
-.Fn cgetstr :
-.Pp
-.Bl -tag -width "nameXnumber" -compact
-.It Em name Ns \&# Ns Em number
-numeric capability
-.Em name
-has value
-.Em number
-.It Em name Ns = Ns Em string
-string capability
-.Em name
-has value
-.Em string
-.It Em name Ns \&#@
-the numeric capability
-.Em name
-does not exist
-.It Em name Ns \&=@
-the string capability
-.Em name
-does not exist
-.El
-.Pp
-Numeric capability values may be given in one of three numeric bases.
-If the number starts with either
-.Ql 0x
-or
-.Ql 0X
-it is interpreted as a hexadecimal number (both upper and lower case a-f
-may be used to denote the extended hexadecimal digits).
-Otherwise, if the number starts with a
-.Ql 0
-it is interpreted as an octal number.
-Otherwise the number is interpreted as a decimal number.
-.Pp
-String capability values may contain any character.
-Non-printable
-.Dv ASCII
-codes, new lines, and colons may be conveniently represented by the use
-of escape sequences:
-.Bl -column "\e\|X,X\e\|X" "(ASCII octal nnn)"
-^X	('X' & 037)	control-X
-\e\|b, \e\|B	(ASCII 010)	backspace
-\e\|t, \e\|T	(ASCII 011)	tab
-\e\|n, \e\|N	(ASCII 012)	line feed (newline)
-\e\|f, \e\|F	(ASCII 014)	form feed
-\e\|r, \e\|R	(ASCII 015)	carriage return
-\e\|e, \e\|E	(ASCII 027)	escape
-\e\|c, \e\|C	(:)	colon
-\e\|\e	(\e\|)	back slash
-\e\|^	(^)	caret
-\e\|nnn	(ASCII octal nnn)
-.El
-.Pp
-A `\|\e' may be followed by up to three octal digits directly specifies
-the numeric code for a character.
-The use of
-.Tn ASCII
-.Dv NUL Ns s ,
-while easily
-encoded, causes all sorts of problems and must be used with care since
-.Dv NUL Ns s
-are typically used to denote the end of strings; many applications
-use `\e\|200' to represent a
-.Dv NUL .
-.Sh DIAGNOSTICS
-The
-.Fn cgetent ,
-.Fn cgetset ,
-.Fn cgetmatch ,
-.Fn cgetnum ,
-.Fn cgetstr ,
-.Fn cgetustr ,
-.Fn cgetfirst ,
-and
-.Fn cgetnext
-functions
-return a value greater than or equal to 0 on success and a value less
-than 0 on failure.
-The
-.Fn cgetcap
-function returns a character pointer on success and a
-.Dv NULL
-on failure.
-.Pp
-The
-.Fn cgetent ,
-and
-.Fn cgetset
-functions may fail and set
-.Va errno
-for any of the errors specified for the library functions:
-.Xr fopen 3 ,
-.Xr fclose 3 ,
-.Xr open 2 ,
-and
-.Xr close 2 .
-.Pp
-The
-.Fn cgetent ,
-.Fn cgetset ,
-.Fn cgetstr ,
-and
-.Fn cgetustr
-functions
-may fail and set
-.Va errno
-as follows:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-No memory to allocate.
-.El
-.Sh SEE ALSO
-.Xr cap_mkdb 1 ,
-.Xr malloc 3
-.Sh BUGS
-Colons (`:') cannot be used in names, types, or values.
-.Pp
-There are no checks for
-.Ic tc Ns = Ns Ic name
-loops in
-.Fn cgetent .
-.Pp
-The buffer added to the database by a call to
-.Fn cgetset
-is not unique to the database but is rather prepended to any database used.
diff --git a/lib/libc_bsd/gen/getcap.c b/lib/libc_bsd/gen/getcap.c
deleted file mode 100644
index 720efa0..0000000
--- a/lib/libc_bsd/gen/getcap.c
+++ /dev/null
@@ -1,1055 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Casey Leedom of Lawrence Livermore National Laboratory.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getcap.c	8.3 (Berkeley) 3/25/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getcap.c 244092 2012-12-10 17:56:51Z jilles $");
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <db.h>
-
-#define	BFRAG		1024
-#define	BSIZE		1024
-#define	ESC		('[' & 037)	/* ASCII ESC */
-#define	MAX_RECURSION	32		/* maximum getent recursion */
-#define	SFRAG		100		/* cgetstr mallocs in SFRAG chunks */
-
-#define RECOK	(char)0
-#define TCERR	(char)1
-#define	SHADOW	(char)2
-
-static size_t	 topreclen;	/* toprec length */
-static char	*toprec;	/* Additional record specified by cgetset() */
-static int	 gottoprec;	/* Flag indicating retrieval of toprecord */
-
-static int	cdbget(DB *, char **, const char *);
-static int 	getent(char **, u_int *, char **, int, const char *, int, char *);
-static int	nfcmp(char *, char *);
-
-/*
- * Cgetset() allows the addition of a user specified buffer to be added
- * to the database array, in effect "pushing" the buffer on top of the
- * virtual database. 0 is returned on success, -1 on failure.
- */
-int
-cgetset(const char *ent)
-{
-	if (ent == NULL) {
-		if (toprec)
-			free(toprec);
-                toprec = NULL;
-                topreclen = 0;
-                return (0);
-        }
-        topreclen = strlen(ent);
-        if ((toprec = malloc (topreclen + 1)) == NULL) {
-		errno = ENOMEM;
-                return (-1);
-	}
-	gottoprec = 0;
-        (void)strcpy(toprec, ent);
-        return (0);
-}
-
-/*
- * Cgetcap searches the capability record buf for the capability cap with
- * type `type'.  A pointer to the value of cap is returned on success, NULL
- * if the requested capability couldn't be found.
- *
- * Specifying a type of ':' means that nothing should follow cap (:cap:).
- * In this case a pointer to the terminating ':' or NUL will be returned if
- * cap is found.
- *
- * If (cap, '@') or (cap, terminator, '@') is found before (cap, terminator)
- * return NULL.
- */
-char *
-cgetcap(char *buf, const char *cap, int type)
-{
-	char *bp;
-	const char *cp;
-
-	bp = buf;
-	for (;;) {
-		/*
-		 * Skip past the current capability field - it's either the
-		 * name field if this is the first time through the loop, or
-		 * the remainder of a field whose name failed to match cap.
-		 */
-		for (;;)
-			if (*bp == '\0')
-				return (NULL);
-			else
-				if (*bp++ == ':')
-					break;
-
-		/*
-		 * Try to match (cap, type) in buf.
-		 */
-		for (cp = cap; *cp == *bp && *bp != '\0'; cp++, bp++)
-			continue;
-		if (*cp != '\0')
-			continue;
-		if (*bp == '@')
-			return (NULL);
-		if (type == ':') {
-			if (*bp != '\0' && *bp != ':')
-				continue;
-			return(bp);
-		}
-		if (*bp != type)
-			continue;
-		bp++;
-		return (*bp == '@' ? NULL : bp);
-	}
-	/* NOTREACHED */
-}
-
-/*
- * Cgetent extracts the capability record name from the NULL terminated file
- * array db_array and returns a pointer to a malloc'd copy of it in buf.
- * Buf must be retained through all subsequent calls to cgetcap, cgetnum,
- * cgetflag, and cgetstr, but may then be free'd.  0 is returned on success,
- * -1 if the requested record couldn't be found, -2 if a system error was
- * encountered (couldn't open/read a file, etc.), and -3 if a potential
- * reference loop is detected.
- */
-int
-cgetent(char **buf, char **db_array, const char *name)
-{
-	u_int dummy;
-
-	return (getent(buf, &dummy, db_array, -1, name, 0, NULL));
-}
-
-/*
- * Getent implements the functions of cgetent.  If fd is non-negative,
- * *db_array has already been opened and fd is the open file descriptor.  We
- * do this to save time and avoid using up file descriptors for tc=
- * recursions.
- *
- * Getent returns the same success/failure codes as cgetent.  On success, a
- * pointer to a malloc'ed capability record with all tc= capabilities fully
- * expanded and its length (not including trailing ASCII NUL) are left in
- * *cap and *len.
- *
- * Basic algorithm:
- *	+ Allocate memory incrementally as needed in chunks of size BFRAG
- *	  for capability buffer.
- *	+ Recurse for each tc=name and interpolate result.  Stop when all
- *	  names interpolated, a name can't be found, or depth exceeds
- *	  MAX_RECURSION.
- */
-static int
-getent(char **cap, u_int *len, char **db_array, int fd, const char *name,
-    int depth, char *nfield)
-{
-	DB *capdbp;
-	char *r_end, *rp, **db_p;
-	int myfd, eof, foundit, retval;
-	char *record, *cbuf;
-	int tc_not_resolved;
-	char pbuf[_POSIX_PATH_MAX];
-
-	/*
-	 * Return with ``loop detected'' error if we've recursed more than
-	 * MAX_RECURSION times.
-	 */
-	if (depth > MAX_RECURSION)
-		return (-3);
-
-	/*
-	 * Check if we have a top record from cgetset().
-         */
-	if (depth == 0 && toprec != NULL && cgetmatch(toprec, name) == 0) {
-		if ((record = malloc (topreclen + BFRAG)) == NULL) {
-			errno = ENOMEM;
-			return (-2);
-		}
-		(void)strcpy(record, toprec);
-		myfd = 0;
-		db_p = db_array;
-		rp = record + topreclen + 1;
-		r_end = rp + BFRAG;
-		goto tc_exp;
-	}
-	/*
-	 * Allocate first chunk of memory.
-	 */
-	if ((record = malloc(BFRAG)) == NULL) {
-		errno = ENOMEM;
-		return (-2);
-	}
-	r_end = record + BFRAG;
-	foundit = 0;
-	/*
-	 * Loop through database array until finding the record.
-	 */
-
-	for (db_p = db_array; *db_p != NULL; db_p++) {
-		eof = 0;
-
-		/*
-		 * Open database if not already open.
-		 */
-
-		if (fd >= 0) {
-			(void)lseek(fd, (off_t)0, SEEK_SET);
-			myfd = 0;
-		} else {
-			(void)snprintf(pbuf, sizeof(pbuf), "%s.db", *db_p);
-			if ((capdbp = dbopen(pbuf, O_RDONLY, 0, DB_HASH, 0))
-			     != NULL) {
-				free(record);
-				retval = cdbget(capdbp, &record, name);
-				if (retval < 0) {
-					/* no record available */
-					(void)capdbp->close(capdbp);
-					return (retval);
-				}
-				/* save the data; close frees it */
-				cbuf = strdup(record);
-				if (capdbp->close(capdbp) < 0) {
-					free(cbuf);
-					return (-2);
-				}
-				if (cbuf == NULL) {
-					errno = ENOMEM;
-					return (-2);
-				}
-				*len = strlen(cbuf);
-				*cap = cbuf;
-				return (retval);
-			} else {
-				fd = _open(*db_p, O_RDONLY | O_CLOEXEC, 0);
-				if (fd < 0)
-					continue;
-				myfd = 1;
-			}
-		}
-		/*
-		 * Find the requested capability record ...
-		 */
-		{
-		char buf[BUFSIZ];
-		char *b_end, *bp;
-		int c;
-
-		/*
-		 * Loop invariants:
-		 *	There is always room for one more character in record.
-		 *	R_end always points just past end of record.
-		 *	Rp always points just past last character in record.
-		 *	B_end always points just past last character in buf.
-		 *	Bp always points at next character in buf.
-		 */
-		b_end = buf;
-		bp = buf;
-		for (;;) {
-
-			/*
-			 * Read in a line implementing (\, newline)
-			 * line continuation.
-			 */
-			rp = record;
-			for (;;) {
-				if (bp >= b_end) {
-					int n;
-
-					n = _read(fd, buf, sizeof(buf));
-					if (n <= 0) {
-						if (myfd)
-							(void)_close(fd);
-						if (n < 0) {
-							free(record);
-							return (-2);
-						} else {
-							fd = -1;
-							eof = 1;
-							break;
-						}
-					}
-					b_end = buf+n;
-					bp = buf;
-				}
-
-				c = *bp++;
-				if (c == '\n') {
-					if (rp > record && *(rp-1) == '\\') {
-						rp--;
-						continue;
-					} else
-						break;
-				}
-				*rp++ = c;
-
-				/*
-				 * Enforce loop invariant: if no room
-				 * left in record buffer, try to get
-				 * some more.
-				 */
-				if (rp >= r_end) {
-					u_int pos;
-					size_t newsize;
-
-					pos = rp - record;
-					newsize = r_end - record + BFRAG;
-					record = reallocf(record, newsize);
-					if (record == NULL) {
-						errno = ENOMEM;
-						if (myfd)
-							(void)_close(fd);
-						return (-2);
-					}
-					r_end = record + newsize;
-					rp = record + pos;
-				}
-			}
-				/* loop invariant let's us do this */
-			*rp++ = '\0';
-
-			/*
-			 * If encountered eof check next file.
-			 */
-			if (eof)
-				break;
-
-			/*
-			 * Toss blank lines and comments.
-			 */
-			if (*record == '\0' || *record == '#')
-				continue;
-
-			/*
-			 * See if this is the record we want ...
-			 */
-			if (cgetmatch(record, name) == 0) {
-				if (nfield == NULL || !nfcmp(nfield, record)) {
-					foundit = 1;
-					break;	/* found it! */
-				}
-			}
-		}
-	}
-		if (foundit)
-			break;
-	}
-
-	if (!foundit) {
-		free(record);
-		return (-1);
-	}
-
-	/*
-	 * Got the capability record, but now we have to expand all tc=name
-	 * references in it ...
-	 */
-tc_exp:	{
-		char *newicap, *s;
-		int newilen;
-		u_int ilen;
-		int diff, iret, tclen;
-		char *icap, *scan, *tc, *tcstart, *tcend;
-
-		/*
-		 * Loop invariants:
-		 *	There is room for one more character in record.
-		 *	R_end points just past end of record.
-		 *	Rp points just past last character in record.
-		 *	Scan points at remainder of record that needs to be
-		 *	scanned for tc=name constructs.
-		 */
-		scan = record;
-		tc_not_resolved = 0;
-		for (;;) {
-			if ((tc = cgetcap(scan, "tc", '=')) == NULL)
-				break;
-
-			/*
-			 * Find end of tc=name and stomp on the trailing `:'
-			 * (if present) so we can use it to call ourselves.
-			 */
-			s = tc;
-			for (;;)
-				if (*s == '\0')
-					break;
-				else
-					if (*s++ == ':') {
-						*(s - 1) = '\0';
-						break;
-					}
-			tcstart = tc - 3;
-			tclen = s - tcstart;
-			tcend = s;
-
-			iret = getent(&icap, &ilen, db_p, fd, tc, depth+1,
-				      NULL);
-			newicap = icap;		/* Put into a register. */
-			newilen = ilen;
-			if (iret != 0) {
-				/* an error */
-				if (iret < -1) {
-					if (myfd)
-						(void)_close(fd);
-					free(record);
-					return (iret);
-				}
-				if (iret == 1)
-					tc_not_resolved = 1;
-				/* couldn't resolve tc */
-				if (iret == -1) {
-					*(s - 1) = ':';
-					scan = s - 1;
-					tc_not_resolved = 1;
-					continue;
-
-				}
-			}
-			/* not interested in name field of tc'ed record */
-			s = newicap;
-			for (;;)
-				if (*s == '\0')
-					break;
-				else
-					if (*s++ == ':')
-						break;
-			newilen -= s - newicap;
-			newicap = s;
-
-			/* make sure interpolated record is `:'-terminated */
-			s += newilen;
-			if (*(s-1) != ':') {
-				*s = ':';	/* overwrite NUL with : */
-				newilen++;
-			}
-
-			/*
-			 * Make sure there's enough room to insert the
-			 * new record.
-			 */
-			diff = newilen - tclen;
-			if (diff >= r_end - rp) {
-				u_int pos, tcpos, tcposend;
-				size_t newsize;
-
-				pos = rp - record;
-				newsize = r_end - record + diff + BFRAG;
-				tcpos = tcstart - record;
-				tcposend = tcend - record;
-				record = reallocf(record, newsize);
-				if (record == NULL) {
-					errno = ENOMEM;
-					if (myfd)
-						(void)_close(fd);
-					free(icap);
-					return (-2);
-				}
-				r_end = record + newsize;
-				rp = record + pos;
-				tcstart = record + tcpos;
-				tcend = record + tcposend;
-			}
-
-			/*
-			 * Insert tc'ed record into our record.
-			 */
-			s = tcstart + newilen;
-			bcopy(tcend, s, rp - tcend);
-			bcopy(newicap, tcstart, newilen);
-			rp += diff;
-			free(icap);
-
-			/*
-			 * Start scan on `:' so next cgetcap works properly
-			 * (cgetcap always skips first field).
-			 */
-			scan = s-1;
-		}
-
-	}
-	/*
-	 * Close file (if we opened it), give back any extra memory, and
-	 * return capability, length and success.
-	 */
-	if (myfd)
-		(void)_close(fd);
-	*len = rp - record - 1;	/* don't count NUL */
-	if (r_end > rp)
-		if ((record =
-		     reallocf(record, (size_t)(rp - record))) == NULL) {
-			errno = ENOMEM;
-			return (-2);
-		}
-
-	*cap = record;
-	if (tc_not_resolved)
-		return (1);
-	return (0);
-}
-
-static int
-cdbget(DB *capdbp, char **bp, const char *name)
-{
-	DBT key, data;
-	char *namebuf;
-
-	namebuf = strdup(name);
-	if (namebuf == NULL)
-		return (-2);
-	key.data = namebuf;
-	key.size = strlen(namebuf);
-
-	for (;;) {
-		/* Get the reference. */
-		switch(capdbp->get(capdbp, &key, &data, 0)) {
-		case -1:
-			free(namebuf);
-			return (-2);
-		case 1:
-			free(namebuf);
-			return (-1);
-		}
-
-		/* If not an index to another record, leave. */
-		if (((char *)data.data)[0] != SHADOW)
-			break;
-
-		key.data = (char *)data.data + 1;
-		key.size = data.size - 1;
-	}
-
-	*bp = (char *)data.data + 1;
-	free(namebuf);
-	return (((char *)(data.data))[0] == TCERR ? 1 : 0);
-}
-
-/*
- * Cgetmatch will return 0 if name is one of the names of the capability
- * record buf, -1 if not.
- */
-int
-cgetmatch(const char *buf, const char *name)
-{
-	const char *np, *bp;
-
-	if (name == NULL || *name == '\0')
-		return -1;
-
-	/*
-	 * Start search at beginning of record.
-	 */
-	bp = buf;
-	for (;;) {
-		/*
-		 * Try to match a record name.
-		 */
-		np = name;
-		for (;;)
-			if (*np == '\0')
-				if (*bp == '|' || *bp == ':' || *bp == '\0')
-					return (0);
-				else
-					break;
-			else
-				if (*bp++ != *np++)
-					break;
-
-		/*
-		 * Match failed, skip to next name in record.
-		 */
-		bp--;	/* a '|' or ':' may have stopped the match */
-		for (;;)
-			if (*bp == '\0' || *bp == ':')
-				return (-1);	/* match failed totally */
-			else
-				if (*bp++ == '|')
-					break;	/* found next name */
-	}
-}
-
-
-
-
-
-int
-cgetfirst(char **buf, char **db_array)
-{
-	(void)cgetclose();
-	return (cgetnext(buf, db_array));
-}
-
-static FILE *pfp;
-static int slash;
-static char **dbp;
-
-int
-cgetclose(void)
-{
-	if (pfp != NULL) {
-		(void)fclose(pfp);
-		pfp = NULL;
-	}
-	dbp = NULL;
-	gottoprec = 0;
-	slash = 0;
-	return(0);
-}
-
-/*
- * Cgetnext() gets either the first or next entry in the logical database
- * specified by db_array.  It returns 0 upon completion of the database, 1
- * upon returning an entry with more remaining, and -1 if an error occurs.
- */
-int
-cgetnext(char **bp, char **db_array)
-{
-	size_t len;
-	int done, hadreaderr, savederrno, status;
-	char *cp, *line, *rp, *np, buf[BSIZE], nbuf[BSIZE];
-	u_int dummy;
-
-	if (dbp == NULL)
-		dbp = db_array;
-
-	if (pfp == NULL && (pfp = fopen(*dbp, "re")) == NULL) {
-		(void)cgetclose();
-		return (-1);
-	}
-	for (;;) {
-		if (toprec && !gottoprec) {
-			gottoprec = 1;
-			line = toprec;
-		} else {
-			line = fgetln(pfp, &len);
-			if (line == NULL && pfp) {
-				hadreaderr = ferror(pfp);
-				if (hadreaderr)
-					savederrno = errno;
-				fclose(pfp);
-				pfp = NULL;
-				if (hadreaderr) {
-					cgetclose();
-					errno = savederrno;
-					return (-1);
-				} else {
-					if (*++dbp == NULL) {
-						(void)cgetclose();
-						return (0);
-					} else if ((pfp =
-					    fopen(*dbp, "re")) == NULL) {
-						(void)cgetclose();
-						return (-1);
-					} else
-						continue;
-				}
-			} else
-				line[len - 1] = '\0';
-			if (len == 1) {
-				slash = 0;
-				continue;
-			}
-			if (isspace((unsigned char)*line) ||
-			    *line == ':' || *line == '#' || slash) {
-				if (line[len - 2] == '\\')
-					slash = 1;
-				else
-					slash = 0;
-				continue;
-			}
-			if (line[len - 2] == '\\')
-				slash = 1;
-			else
-				slash = 0;
-		}
-
-
-		/*
-		 * Line points to a name line.
-		 */
-		done = 0;
-		np = nbuf;
-		for (;;) {
-			for (cp = line; *cp != '\0'; cp++) {
-				if (*cp == ':') {
-					*np++ = ':';
-					done = 1;
-					break;
-				}
-				if (*cp == '\\')
-					break;
-				*np++ = *cp;
-			}
-			if (done) {
-				*np = '\0';
-				break;
-			} else { /* name field extends beyond the line */
-				line = fgetln(pfp, &len);
-				if (line == NULL && pfp) {
-					/* Name extends beyond the EOF! */
-					hadreaderr = ferror(pfp);
-					if (hadreaderr)
-						savederrno = errno;
-					fclose(pfp);
-					pfp = NULL;
-					if (hadreaderr) {
-						cgetclose();
-						errno = savederrno;
-						return (-1);
-					} else {
-						cgetclose();
-						return (-1);
-					}
-				} else
-					line[len - 1] = '\0';
-			}
-		}
-		rp = buf;
-		for(cp = nbuf; *cp != '\0'; cp++)
-			if (*cp == '|' || *cp == ':')
-				break;
-			else
-				*rp++ = *cp;
-
-		*rp = '\0';
-		/*
-		 * XXX
-		 * Last argument of getent here should be nbuf if we want true
-		 * sequential access in the case of duplicates.
-		 * With NULL, getent will return the first entry found
-		 * rather than the duplicate entry record.  This is a
-		 * matter of semantics that should be resolved.
-		 */
-		status = getent(bp, &dummy, db_array, -1, buf, 0, NULL);
-		if (status == -2 || status == -3)
-			(void)cgetclose();
-
-		return (status + 1);
-	}
-	/* NOTREACHED */
-}
-
-/*
- * Cgetstr retrieves the value of the string capability cap from the
- * capability record pointed to by buf.  A pointer to a decoded, NUL
- * terminated, malloc'd copy of the string is returned in the char *
- * pointed to by str.  The length of the string not including the trailing
- * NUL is returned on success, -1 if the requested string capability
- * couldn't be found, -2 if a system error was encountered (storage
- * allocation failure).
- */
-int
-cgetstr(char *buf, const char *cap, char **str)
-{
-	u_int m_room;
-	char *bp, *mp;
-	int len;
-	char *mem;
-
-	/*
-	 * Find string capability cap
-	 */
-	bp = cgetcap(buf, cap, '=');
-	if (bp == NULL)
-		return (-1);
-
-	/*
-	 * Conversion / storage allocation loop ...  Allocate memory in
-	 * chunks SFRAG in size.
-	 */
-	if ((mem = malloc(SFRAG)) == NULL) {
-		errno = ENOMEM;
-		return (-2);	/* couldn't even allocate the first fragment */
-	}
-	m_room = SFRAG;
-	mp = mem;
-
-	while (*bp != ':' && *bp != '\0') {
-		/*
-		 * Loop invariants:
-		 *	There is always room for one more character in mem.
-		 *	Mp always points just past last character in mem.
-		 *	Bp always points at next character in buf.
-		 */
-		if (*bp == '^') {
-			bp++;
-			if (*bp == ':' || *bp == '\0')
-				break;	/* drop unfinished escape */
-			if (*bp == '?') {
-				*mp++ = '\177';
-				bp++;
-			} else
-				*mp++ = *bp++ & 037;
-		} else if (*bp == '\\') {
-			bp++;
-			if (*bp == ':' || *bp == '\0')
-				break;	/* drop unfinished escape */
-			if ('0' <= *bp && *bp <= '7') {
-				int n, i;
-
-				n = 0;
-				i = 3;	/* maximum of three octal digits */
-				do {
-					n = n * 8 + (*bp++ - '0');
-				} while (--i && '0' <= *bp && *bp <= '7');
-				*mp++ = n;
-			}
-			else switch (*bp++) {
-				case 'b': case 'B':
-					*mp++ = '\b';
-					break;
-				case 't': case 'T':
-					*mp++ = '\t';
-					break;
-				case 'n': case 'N':
-					*mp++ = '\n';
-					break;
-				case 'f': case 'F':
-					*mp++ = '\f';
-					break;
-				case 'r': case 'R':
-					*mp++ = '\r';
-					break;
-				case 'e': case 'E':
-					*mp++ = ESC;
-					break;
-				case 'c': case 'C':
-					*mp++ = ':';
-					break;
-				default:
-					/*
-					 * Catches '\', '^', and
-					 *  everything else.
-					 */
-					*mp++ = *(bp-1);
-					break;
-			}
-		} else
-			*mp++ = *bp++;
-		m_room--;
-
-		/*
-		 * Enforce loop invariant: if no room left in current
-		 * buffer, try to get some more.
-		 */
-		if (m_room == 0) {
-			size_t size = mp - mem;
-
-			if ((mem = reallocf(mem, size + SFRAG)) == NULL)
-				return (-2);
-			m_room = SFRAG;
-			mp = mem + size;
-		}
-	}
-	*mp++ = '\0';	/* loop invariant let's us do this */
-	m_room--;
-	len = mp - mem - 1;
-
-	/*
-	 * Give back any extra memory and return value and success.
-	 */
-	if (m_room != 0)
-		if ((mem = reallocf(mem, (size_t)(mp - mem))) == NULL)
-			return (-2);
-	*str = mem;
-	return (len);
-}
-
-/*
- * Cgetustr retrieves the value of the string capability cap from the
- * capability record pointed to by buf.  The difference between cgetustr()
- * and cgetstr() is that cgetustr does not decode escapes but rather treats
- * all characters literally.  A pointer to a  NUL terminated malloc'd
- * copy of the string is returned in the char pointed to by str.  The
- * length of the string not including the trailing NUL is returned on success,
- * -1 if the requested string capability couldn't be found, -2 if a system
- * error was encountered (storage allocation failure).
- */
-int
-cgetustr(char *buf, const char *cap, char **str)
-{
-	u_int m_room;
-	char *bp, *mp;
-	int len;
-	char *mem;
-
-	/*
-	 * Find string capability cap
-	 */
-	if ((bp = cgetcap(buf, cap, '=')) == NULL)
-		return (-1);
-
-	/*
-	 * Conversion / storage allocation loop ...  Allocate memory in
-	 * chunks SFRAG in size.
-	 */
-	if ((mem = malloc(SFRAG)) == NULL) {
-		errno = ENOMEM;
-		return (-2);	/* couldn't even allocate the first fragment */
-	}
-	m_room = SFRAG;
-	mp = mem;
-
-	while (*bp != ':' && *bp != '\0') {
-		/*
-		 * Loop invariants:
-		 *	There is always room for one more character in mem.
-		 *	Mp always points just past last character in mem.
-		 *	Bp always points at next character in buf.
-		 */
-		*mp++ = *bp++;
-		m_room--;
-
-		/*
-		 * Enforce loop invariant: if no room left in current
-		 * buffer, try to get some more.
-		 */
-		if (m_room == 0) {
-			size_t size = mp - mem;
-
-			if ((mem = reallocf(mem, size + SFRAG)) == NULL)
-				return (-2);
-			m_room = SFRAG;
-			mp = mem + size;
-		}
-	}
-	*mp++ = '\0';	/* loop invariant let's us do this */
-	m_room--;
-	len = mp - mem - 1;
-
-	/*
-	 * Give back any extra memory and return value and success.
-	 */
-	if (m_room != 0)
-		if ((mem = reallocf(mem, (size_t)(mp - mem))) == NULL)
-			return (-2);
-	*str = mem;
-	return (len);
-}
-
-/*
- * Cgetnum retrieves the value of the numeric capability cap from the
- * capability record pointed to by buf.  The numeric value is returned in
- * the long pointed to by num.  0 is returned on success, -1 if the requested
- * numeric capability couldn't be found.
- */
-int
-cgetnum(char *buf, const char *cap, long *num)
-{
-	long n;
-	int base, digit;
-	char *bp;
-
-	/*
-	 * Find numeric capability cap
-	 */
-	bp = cgetcap(buf, cap, '#');
-	if (bp == NULL)
-		return (-1);
-
-	/*
-	 * Look at value and determine numeric base:
-	 *	0x... or 0X...	hexadecimal,
-	 * else	0...		octal,
-	 * else			decimal.
-	 */
-	if (*bp == '0') {
-		bp++;
-		if (*bp == 'x' || *bp == 'X') {
-			bp++;
-			base = 16;
-		} else
-			base = 8;
-	} else
-		base = 10;
-
-	/*
-	 * Conversion loop ...
-	 */
-	n = 0;
-	for (;;) {
-		if ('0' <= *bp && *bp <= '9')
-			digit = *bp - '0';
-		else if ('a' <= *bp && *bp <= 'f')
-			digit = 10 + *bp - 'a';
-		else if ('A' <= *bp && *bp <= 'F')
-			digit = 10 + *bp - 'A';
-		else
-			break;
-
-		if (digit >= base)
-			break;
-
-		n = n * base + digit;
-		bp++;
-	}
-
-	/*
-	 * Return value and success.
-	 */
-	*num = n;
-	return (0);
-}
-
-
-/*
- * Compare name field of record.
- */
-static int
-nfcmp(char *nf, char *rec)
-{
-	char *cp, tmp;
-	int ret;
-
-	for (cp = rec; *cp != ':'; cp++)
-		;
-
-	tmp = *(cp + 1);
-	*(cp + 1) = '\0';
-	ret = strcmp(nf, rec);
-	*(cp + 1) = tmp;
-
-	return (ret);
-}
diff --git a/lib/libc_bsd/gen/getcontext.3 b/lib/libc_bsd/gen/getcontext.3
deleted file mode 100644
index a48da67..0000000
--- a/lib/libc_bsd/gen/getcontext.3
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" Copyright (c) 2002 Packet Design, LLC.
-.\" All rights reserved.
-.\"
-.\" Subject to the following obligations and disclaimer of warranty,
-.\" use and redistribution of this software, in source or object code
-.\" forms, with or without modifications are expressly permitted by
-.\" Packet Design; provided, however, that:
-.\"
-.\"    (i)  Any and all reproductions of the source or object code
-.\"         must include the copyright notice above and the following
-.\"         disclaimer of warranties; and
-.\"    (ii) No rights are granted, in any manner or form, to use
-.\"         Packet Design trademarks, including the mark "PACKET DESIGN"
-.\"         on advertising, endorsements, or otherwise except as such
-.\"         appears in the above copyright notice or in the software.
-.\"
-.\" THIS SOFTWARE IS BEING PROVIDED BY PACKET DESIGN "AS IS", AND
-.\" TO THE MAXIMUM EXTENT PERMITTED BY LAW, PACKET DESIGN MAKES NO
-.\" REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING
-.\" THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-.\" OR NON-INFRINGEMENT.  PACKET DESIGN DOES NOT WARRANT, GUARANTEE,
-.\" OR MAKE ANY REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS
-.\" OF THE USE OF THIS SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY,
-.\" RELIABILITY OR OTHERWISE.  IN NO EVENT SHALL PACKET DESIGN BE
-.\" LIABLE FOR ANY DAMAGES RESULTING FROM OR ARISING OUT OF ANY USE
-.\" OF THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE, OR CONSEQUENTIAL
-.\" DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF
-.\" USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 PACKET DESIGN IS ADVISED OF
-.\" THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getcontext.3 248250 2013-03-13 18:18:16Z pluknet $
-.\"
-.Dd March 13, 2013
-.Dt GETCONTEXT 3
-.Os
-.Sh NAME
-.Nm getcontext , getcontextx , setcontext
-.Nd get and set user thread context
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ucontext.h
-.Ft int
-.Fn getcontext "ucontext_t *ucp"
-.Ft ucontext_t *
-.Fn getcontextx "void"
-.Ft int
-.Fn setcontext "const ucontext_t *ucp"
-.Sh DESCRIPTION
-The
-.Fn getcontext
-function
-saves the current thread's execution context in the structure pointed to by
-.Fa ucp .
-This saved context may then later be restored by calling
-.Fn setcontext .
-.Pp
-The
-.Fn getcontextx
-function saves the current execution context in the newly allocated structure
-.Vt ucontext_t ,
-which is returned on success.
-If architecture defines additional CPU states that can be stored in extended
-blocks referenced from the
-.Vt ucontext_t ,
-the memory for them may be allocated and their context also stored.
-Memory returned by
-.Fn getcontextx
-function shall be freed using
-.Fn free 3 .
-.Pp
-The
-.Fn setcontext
-function
-makes a previously saved thread context the current thread context, i.e.,
-the current context is lost and
-.Fn setcontext
-does not return.
-Instead, execution continues in the context specified by
-.Fa ucp ,
-which must have been previously initialized by a call to
-.Fn getcontext ,
-.Xr makecontext 3 ,
-or by being passed as an argument to a signal handler (see
-.Xr sigaction 2 ) .
-.Pp
-If
-.Fa ucp
-was initialized by
-.Fn getcontext ,
-then execution continues as if the original
-.Fn getcontext
-call had just returned (again).
-.Pp
-If
-.Fa ucp
-was initialized by
-.Xr makecontext 3 ,
-execution continues with the invocation of the function specified to
-.Xr makecontext 3 .
-When that function returns,
-.Fa "ucp->uc_link"
-determines what happens next:
-if
-.Fa "ucp->uc_link"
-is
-.Dv NULL ,
-the process exits;
-otherwise,
-.Fn setcontext "ucp->uc_link"
-is implicitly invoked.
-.Pp
-If
-.Fa ucp
-was initialized by the invocation of a signal handler, execution continues
-at the point the thread was interrupted by the signal.
-.Sh RETURN VALUES
-If successful,
-.Fn getcontext
-returns zero and
-.Fn setcontext
-does not return; otherwise \-1 is returned.
-The
-.Fn getcontextx
-returns pointer to the allocated and initialized context on success, and
-.Va NULL
-on failure.
-.Sh ERRORS
-No errors are defined for
-.Fn getcontext
-or
-.Fn setcontext .
-The
-.Fn getcontextx
-may return the following errors in
-.Va errno :
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-No memory was available to allocate for the context or some extended state.
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigaltstack 2 ,
-.Xr makecontext 3 ,
-.Xr ucontext 3
diff --git a/lib/libc_bsd/gen/getcwd.3 b/lib/libc_bsd/gen/getcwd.3
deleted file mode 100644
index 15f07aa..0000000
--- a/lib/libc_bsd/gen/getcwd.3
+++ /dev/null
@@ -1,162 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getcwd.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getcwd.3 206760 2010-04-17 15:52:50Z jilles $
-.\"
-.Dd April 17, 2010
-.Dt GETCWD 3
-.Os
-.Sh NAME
-.Nm getcwd ,
-.Nm getwd
-.Nd get working directory pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn getcwd "char *buf" "size_t size"
-.Ft char *
-.Fn getwd "char *buf"
-.Sh DESCRIPTION
-The
-.Fn getcwd
-function copies the absolute pathname of the current working directory
-into the memory referenced by
-.Fa buf
-and returns a pointer to
-.Fa buf .
-The
-.Fa size
-argument is the size, in bytes, of the array referenced by
-.Fa buf .
-.Pp
-If
-.Fa buf
-is
-.Dv NULL ,
-space is allocated as necessary to store the pathname.
-This space may later be
-.Xr free 3 Ns 'd .
-.Pp
-The function
-.Fn getwd
-is a compatibility routine which calls
-.Fn getcwd
-with its
-.Fa buf
-argument and a size of
-.Dv MAXPATHLEN
-(as defined in the include
-file
-.In sys/param.h ) .
-Obviously,
-.Fa buf
-should be at least
-.Dv MAXPATHLEN
-bytes in length.
-.Pp
-These routines have traditionally been used by programs to save the
-name of a working directory for the purpose of returning to it.
-A much faster and less error-prone method of accomplishing this is to
-open the current directory
-.Pq Ql .\&
-and use the
-.Xr fchdir 2
-function to return.
-.Sh RETURN VALUES
-Upon successful completion, a pointer to the pathname is returned.
-Otherwise a
-.Dv NULL
-pointer is returned and the global variable
-.Va errno
-is set to indicate the error.
-In addition,
-.Fn getwd
-copies the error message associated with
-.Va errno
-into the memory referenced by
-.Fa buf .
-.Sh ERRORS
-The
-.Fn getcwd
-function
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa size
-argument is zero.
-.It Bq Er ENOENT
-A component of the pathname no longer exists.
-.It Bq Er ENOMEM
-Insufficient memory is available.
-.It Bq Er ERANGE
-The
-.Fa size
-argument is greater than zero but smaller than the length of the pathname
-plus 1.
-.El
-.Pp
-The
-.Fn getcwd
-function
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Read or search permission was denied for a component of the pathname.
-This is only checked in limited cases, depending on implementation details.
-.El
-.Sh SEE ALSO
-.Xr chdir 2 ,
-.Xr fchdir 2 ,
-.Xr malloc 3 ,
-.Xr strerror 3
-.Sh STANDARDS
-The
-.Fn getcwd
-function
-conforms to
-.St -p1003.1-90 .
-The ability to specify a
-.Dv NULL
-pointer and have
-.Fn getcwd
-allocate memory as necessary is an extension.
-.Sh HISTORY
-The
-.Fn getwd
-function appeared in
-.Bx 4.0 .
-.Sh BUGS
-The
-.Fn getwd
-function
-does not do sufficient error checking and is not able to return very
-long, but valid, paths.
-It is provided for compatibility.
diff --git a/lib/libc_bsd/gen/getcwd.c b/lib/libc_bsd/gen/getcwd.c
deleted file mode 100644
index 0bcd435..0000000
--- a/lib/libc_bsd/gen/getcwd.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 1989, 1991, 1993, 1995
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getcwd.c	8.5 (Berkeley) 2/7/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getcwd.c 241046 2012-09-29 11:54:34Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "gen-private.h"
-
-#define	ISDOT(dp) \
-	(dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \
-	    (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
-
-extern int __getcwd(char *, size_t);
-
-char *
-getcwd(pt, size)
-	char *pt;
-	size_t size;
-{
-	struct dirent *dp;
-	DIR *dir = NULL;
-	dev_t dev;
-	ino_t ino;
-	int first;
-	char *bpt;
-	struct stat s;
-	dev_t root_dev;
-	ino_t root_ino;
-	size_t ptsize;
-	int save_errno;
-	char *ept, c;
-	int fd;
-
-	/*
-	 * If no buffer specified by the user, allocate one as necessary.
-	 * If a buffer is specified, the size has to be non-zero.  The path
-	 * is built from the end of the buffer backwards.
-	 */
-	if (pt) {
-		ptsize = 0;
-		if (!size) {
-			errno = EINVAL;
-			return (NULL);
-		}
-		if (size == 1) {
-			errno = ERANGE;
-			return (NULL);
-		}
-		ept = pt + size;
-	} else {
-		if ((pt = malloc(ptsize = PATH_MAX)) == NULL)
-			return (NULL);
-		ept = pt + ptsize;
-	}
-	if (__getcwd(pt, ept - pt) == 0) {
-		if (*pt != '/') {
-			bpt = pt;
-			ept = pt + strlen(pt) - 1;
-			while (bpt < ept) {
-				c = *bpt;
-				*bpt++ = *ept;
-				*ept-- = c;
-			}
-		}
-		return (pt);
-	}
-	bpt = ept - 1;
-	*bpt = '\0';
-
-	/* Save root values, so know when to stop. */
-	if (stat("/", &s))
-		goto err;
-	root_dev = s.st_dev;
-	root_ino = s.st_ino;
-
-	errno = 0;			/* XXX readdir has no error return. */
-
-	for (first = 1;; first = 0) {
-		/* Stat the current level. */
-		if (dir != NULL ? _fstat(_dirfd(dir), &s) : lstat(".", &s))
-			goto err;
-
-		/* Save current node values. */
-		ino = s.st_ino;
-		dev = s.st_dev;
-
-		/* Check for reaching root. */
-		if (root_dev == dev && root_ino == ino) {
-			*--bpt = '/';
-			/*
-			 * It's unclear that it's a requirement to copy the
-			 * path to the beginning of the buffer, but it's always
-			 * been that way and stuff would probably break.
-			 */
-			bcopy(bpt, pt, ept - bpt);
-			if (dir)
-				(void) closedir(dir);
-			return (pt);
-		}
-
-		/* Open and stat parent directory. */
-		fd = _openat(dir != NULL ? _dirfd(dir) : AT_FDCWD,
-				"..", O_RDONLY | O_CLOEXEC);
-		if (fd == -1)
-			goto err;
-		if (dir)
-			(void) closedir(dir);
-		if (!(dir = fdopendir(fd)) || _fstat(_dirfd(dir), &s)) {
-			_close(fd);
-			goto err;
-		}
-
-		/*
-		 * If it's a mount point, have to stat each element because
-		 * the inode number in the directory is for the entry in the
-		 * parent directory, not the inode number of the mounted file.
-		 */
-		save_errno = 0;
-		if (s.st_dev == dev) {
-			for (;;) {
-				if (!(dp = readdir(dir)))
-					goto notfound;
-				if (dp->d_fileno == ino)
-					break;
-			}
-		} else
-			for (;;) {
-				if (!(dp = readdir(dir)))
-					goto notfound;
-				if (ISDOT(dp))
-					continue;
-
-				/* Save the first error for later. */
-				if (fstatat(_dirfd(dir), dp->d_name, &s,
-				    AT_SYMLINK_NOFOLLOW)) {
-					if (!save_errno)
-						save_errno = errno;
-					errno = 0;
-					continue;
-				}
-				if (s.st_dev == dev && s.st_ino == ino)
-					break;
-			}
-
-		/*
-		 * Check for length of the current name, preceding slash,
-		 * leading slash.
-		 */
-		while (bpt - pt < dp->d_namlen + (first ? 1 : 2)) {
-			size_t len, off;
-
-			if (!ptsize) {
-				errno = ERANGE;
-				goto err;
-			}
-			off = bpt - pt;
-			len = ept - bpt;
-			if ((pt = reallocf(pt, ptsize *= 2)) == NULL)
-				goto err;
-			bpt = pt + off;
-			ept = pt + ptsize;
-			bcopy(bpt, ept - len, len);
-			bpt = ept - len;
-		}
-		if (!first)
-			*--bpt = '/';
-		bpt -= dp->d_namlen;
-		bcopy(dp->d_name, bpt, dp->d_namlen);
-	}
-
-notfound:
-	/*
-	 * If readdir set errno, use it, not any saved error; otherwise,
-	 * didn't find the current directory in its parent directory, set
-	 * errno to ENOENT.
-	 */
-	if (!errno)
-		errno = save_errno ? save_errno : ENOENT;
-	/* FALLTHROUGH */
-err:
-	save_errno = errno;
-
-	if (ptsize)
-		free(pt);
-	if (dir)
-		(void) closedir(dir);
-
-	errno = save_errno;
-	return (NULL);
-}
diff --git a/lib/libc_bsd/gen/getdiskbyname.3 b/lib/libc_bsd/gen/getdiskbyname.3
deleted file mode 100644
index d141d0c..0000000
--- a/lib/libc_bsd/gen/getdiskbyname.3
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getdiskbyname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getdiskbyname.3 220617 2011-04-14 08:53:04Z pluknet $
-.\"
-.Dd June 4, 1993
-.Dt GETDISKBYNAME 3
-.Os
-.Sh NAME
-.Nm getdiskbyname
-.Nd get generic disk description by its name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/disklabel.h
-.Ft struct disklabel *
-.Fn getdiskbyname "const char *name"
-.Sh DESCRIPTION
-The
-.Fn getdiskbyname
-function
-takes a disk name (e.g.\&
-.Ql rm03 )
-and returns a prototype disk label
-describing its geometry information and the standard
-disk partition tables.
-All information is obtained from
-the
-.Xr disktab 5
-file.
-.Sh SEE ALSO
-.Xr disktab 5 ,
-.Xr disklabel 8
-.Sh HISTORY
-The
-.Fn getdiskbyname
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libc_bsd/gen/getdomainname.3 b/lib/libc_bsd/gen/getdomainname.3
deleted file mode 100644
index 560fa9b..0000000
--- a/lib/libc_bsd/gen/getdomainname.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getdomainname.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd May 6, 1994
-.Dt GETDOMAINNAME 3
-.Os
-.Sh NAME
-.Nm getdomainname ,
-.Nm setdomainname
-.Nd get/set the NIS domain name of current host
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getdomainname "char *name" "int namelen"
-.Ft int
-.Fn setdomainname "const char *name" "int namelen"
-.Sh DESCRIPTION
-The
-.Fn getdomainname
-function
-returns the standard NIS domain name for the current host, as
-previously set by
-.Fn setdomainname .
-The
-.Fa namelen
-argument
-specifies the size of the
-.Fa name
-array.
-The returned name is null-terminated unless insufficient
-space is provided.
-.Pp
-The
-.Fn setdomainname
-function
-sets the NIS domain name of the host machine to be
-.Fa name ,
-which has length
-.Fa namelen .
-This call is restricted to the super-user and
-is normally used only when the system is bootstrapped.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The following errors may be returned by these calls:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa name
-or
-.Fa namelen
-argument gave an
-invalid address.
-.It Bq Er EPERM
-The caller tried to set the hostname and was not the super-user.
-.El
-.Sh SEE ALSO
-.Xr gethostid 3 ,
-.Xr gethostname 3 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn getdomainname
-function appeared in
-.Bx 4.2 .
-.Sh BUGS
-Domain names are limited to
-.Dv MAXHOSTNAMELEN
-(from
-.In sys/param.h )
-characters, currently 256.
diff --git a/lib/libc_bsd/gen/getdomainname.c b/lib/libc_bsd/gen/getdomainname.c
deleted file mode 100644
index b71d1cd..0000000
--- a/lib/libc_bsd/gen/getdomainname.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getdomainname.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <unistd.h>
-
-int
-getdomainname(name, namelen)
-	char *name;
-	int namelen;
-{
-	int mib[2];
-	size_t size;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_NISDOMAINNAME;
-	size = namelen;
-	if (sysctl(mib, 2, name, &size, NULL, 0) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/getfsent.3 b/lib/libc_bsd/gen/getfsent.3
deleted file mode 100644
index 1b66cf1..0000000
--- a/lib/libc_bsd/gen/getfsent.3
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getfsent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getfsent.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 7, 2003
-.Dt GETFSENT 3
-.Os
-.Sh NAME
-.Nm getfsent ,
-.Nm getfsspec ,
-.Nm getfsfile ,
-.Nm setfsent ,
-.Nm endfsent
-.Nd get file system descriptor file entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fstab.h
-.Ft "struct fstab *"
-.Fn getfsent void
-.Ft "struct fstab *"
-.Fn getfsspec "const char *spec"
-.Ft "struct fstab *"
-.Fn getfsfile "const char *file"
-.Ft int
-.Fn setfsent void
-.Ft void
-.Fn endfsent void
-.Ft void
-.Fn setfstab "const char *file"
-.Ft "const char *"
-.Fn getfstab void
-.Sh DESCRIPTION
-The
-.Fn getfsent ,
-.Fn getfsspec ,
-and
-.Fn getfsfile
-functions
-each return a pointer to an object with the following structure
-containing the broken-out fields of a line in the file system
-description file,
-.In fstab.h .
-.Bd -literal -offset indent
-struct fstab {
-	char	*fs_spec;	/* block special device name */
-	char	*fs_file;	/* file system path prefix */
-	char	*fs_vfstype;	/* File system type, ufs, nfs */
-	char	*fs_mntops;	/* Mount options ala -o */
-	char	*fs_type;	/* FSTAB_* from fs_mntops */
-	int	fs_freq;	/* dump frequency, in days */
-	int	fs_passno;	/* pass number on parallel fsck */
-};
-.Ed
-.Pp
-The fields have meanings described in
-.Xr fstab 5 .
-.Pp
-The
-.Fn setfsent
-function
-opens the file (closing any previously opened file) or rewinds it
-if it is already open.
-.Pp
-The
-.Fn endfsent
-function
-closes the file.
-.Pp
-The
-.Fn setfstab
-function sets the file to be used by subsequent operations.
-The value set by
-.Fn setfstab
-does not persist across calls to
-.Fn endfsent .
-.Pp
-The
-.Fn getfstab
-function returns the name of the file that will be used.
-.Pp
-The
-.Fn getfsspec
-and
-.Fn getfsfile
-functions
-search the entire file (opening it if necessary) for a matching special
-file name or file system file name.
-.Pp
-For programs wishing to read the entire database,
-.Fn getfsent
-reads the next entry (opening the file if necessary).
-.Pp
-All entries in the file with a type field equivalent to
-.Dv FSTAB_XX
-are ignored.
-.Sh RETURN VALUES
-The
-.Fn getfsent ,
-.Fn getfsspec ,
-and
-.Fn getfsfile
-functions
-return a
-.Dv NULL
-pointer on
-.Dv EOF
-or error.
-The
-.Fn setfsent
-function
-returns 0 on failure, 1 on success.
-The
-.Fn endfsent
-function
-returns nothing.
-.Sh ENVIRONMENT
-.Bl -tag -width ".Ev PATH_FSTAB"
-.It Ev PATH_FSTAB
-If the environment variable
-.Ev PATH_FSTAB
-is set, all operations are performed against the specified file.
-.Ev PATH_FSTAB
-will not be honored if the process environment or memory address space is
-considered
-.Dq tainted .
-(See
-.Xr issetugid 2
-for more information.)
-.El
-.Sh FILES
-.Bl -tag -width /etc/fstab -compact
-.It Pa /etc/fstab
-.El
-.Sh SEE ALSO
-.Xr fstab 5
-.Sh HISTORY
-The
-.Fn getfsent
-function appeared in
-.Bx 4.0 ;
-the
-.Fn endfsent ,
-.Fn getfsfile ,
-.Fn getfsspec ,
-and
-.Fn setfsent
-functions appeared in
-.Bx 4.3 ;
-the
-.Fn setfstab
-and
-.Fn getfstab
-functions appeared in
-.Fx 5.1 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
diff --git a/lib/libc_bsd/gen/getgrent.3 b/lib/libc_bsd/gen/getgrent.3
deleted file mode 100644
index b8efb1e..0000000
--- a/lib/libc_bsd/gen/getgrent.3
+++ /dev/null
@@ -1,287 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)getgrent.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getgrent.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 16, 2003
-.Dt GETGRENT 3
-.Os
-.Sh NAME
-.Nm getgrent ,
-.Nm getgrent_r ,
-.Nm getgrnam ,
-.Nm getgrnam_r ,
-.Nm getgrgid ,
-.Nm getgrgid_r ,
-.Nm setgroupent ,
-.Nm setgrent ,
-.Nm endgrent
-.Nd group database operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In grp.h
-.Ft struct group *
-.Fn getgrent void
-.Ft int
-.Fn getgrent_r "struct group *grp" "char *buffer" "size_t bufsize" "struct group **result"
-.Ft struct group *
-.Fn getgrnam "const char *name"
-.Ft int
-.Fn getgrnam_r "const char *name" "struct group *grp" "char *buffer" "size_t bufsize" "struct group **result"
-.Ft struct group *
-.Fn getgrgid "gid_t gid"
-.Ft int
-.Fn getgrgid_r "gid_t gid" "struct group *grp" "char *buffer" "size_t bufsize" "struct group **result"
-.Ft int
-.Fn setgroupent "int stayopen"
-.Ft int
-.Fn setgrent void
-.Ft void
-.Fn endgrent void
-.Sh DESCRIPTION
-These functions operate on the group database file
-.Pa /etc/group
-which is described
-in
-.Xr group 5 .
-Each line of the database is defined by the structure
-.Vt group
-found in the include
-file
-.In grp.h :
-.Bd -literal -offset indent
-struct group {
-	char	*gr_name;	/* group name */
-	char	*gr_passwd;	/* group password */
-	gid_t	gr_gid;		/* group id */
-	char	**gr_mem;	/* group members */
-};
-.Ed
-.Pp
-The functions
-.Fn getgrnam
-and
-.Fn getgrgid
-search the group database for the given group name pointed to by
-.Fa name
-or the group id pointed to by
-.Fa gid ,
-respectively, returning the first one encountered.
-Identical group
-names or group gids may result in undefined behavior.
-.Pp
-The
-.Fn getgrent
-function
-sequentially reads the group database and is intended for programs
-that wish to step through the complete list of groups.
-.Pp
-The functions
-.Fn getgrent_r ,
-.Fn getgrnam_r ,
-and
-.Fn getgrgid_r
-are thread-safe versions of
-.Fn getgrent ,
-.Fn getgrnam ,
-and
-.Fn getgrgid ,
-respectively.
-The caller must provide storage for the results of the search in
-the
-.Fa grp ,
-.Fa buffer ,
-.Fa bufsize ,
-and
-.Fa result
-arguments.
-When these functions are successful, the
-.Fa grp
-argument will be filled-in, and a pointer to that argument will be
-stored in
-.Fa result .
-If an entry is not found or an error occurs,
-.Fa result
-will be set to
-.Dv NULL .
-.Pp
-These functions will open the group file for reading, if necessary.
-.Pp
-The
-.Fn setgroupent
-function
-opens the file, or rewinds it if it is already open.
-If
-.Fa stayopen
-is non-zero, file descriptors are left open, significantly speeding
-functions subsequent calls.
-This functionality is unnecessary for
-.Fn getgrent
-as it does not close its file descriptors by default.
-It should also
-be noted that it is dangerous for long-running programs to use this
-functionality as the group file may be updated.
-.Pp
-The
-.Fn setgrent
-function
-is identical to
-.Fn setgroupent
-with an argument of zero.
-.Pp
-The
-.Fn endgrent
-function
-closes any open files.
-.Sh RETURN VALUES
-The functions
-.Fn getgrent ,
-.Fn getgrnam ,
-and
-.Fn getgrgid ,
-return a pointer to a group structure on success or
-.Dv NULL
-if the entry is not found or if an error occurs.
-If an error does occur,
-.Va errno
-will be set.
-Note that programs must explicitly set
-.Va errno
-to zero before calling any of these functions if they need to
-distinguish between a non-existent entry and an error.
-The functions
-.Fn getgrent_r ,
-.Fn getgrnam_r ,
-and
-.Fn getgrgid_r
-return 0 if no error occurred, or an error number to indicate failure.
-It is not an error if a matching entry is not found.
-(Thus, if
-.Fa result
-is set to
-.Dv NULL
-and the return value is 0, no matching entry exists.)
-.Pp
-The functions
-.Fn setgroupent
-and
-.Fn setgrent
-return the value 1 if successful, otherwise the value
-0 is returned.
-The functions
-.Fn endgrent
-and
-.Fn setgrfile
-have no return value.
-.Sh FILES
-.Bl -tag -width /etc/group -compact
-.It Pa /etc/group
-group database file
-.El
-.Sh COMPATIBILITY
-The historic function
-.Fn setgrfile ,
-which allowed the specification of alternate password databases, has
-been deprecated and is no longer available.
-.Sh SEE ALSO
-.Xr getpwent 3 ,
-.Xr group 5 ,
-.Xr nsswitch.conf 5 ,
-.Xr yp 8
-.Sh STANDARDS
-The
-.Fn getgrent ,
-.Fn getgrnam ,
-.Fn getgrnam_r ,
-.Fn getgrgid ,
-.Fn getgrgid_r
-and
-.Fn endgrent
-functions conform to
-.St -p1003.1-96 .
-The
-.Fn setgrent
-function differs from that standard in that its return type is
-.Vt int
-rather than
-.Vt void .
-.Sh HISTORY
-The functions
-.Fn endgrent ,
-.Fn getgrent ,
-.Fn getgrnam ,
-.Fn getgrgid ,
-and
-.Fn setgrent
-appeared in
-.At v7 .
-The functions
-.Fn setgrfile
-and
-.Fn setgroupent
-appeared in
-.Bx 4.3 Reno .
-The functions
-.Fn getgrent_r ,
-.Fn getgrnam_r ,
-and
-.Fn getgrgid_r
-appeared in
-.Fx 5.1 .
-.Sh BUGS
-The functions
-.Fn getgrent ,
-.Fn getgrnam ,
-.Fn getgrgid ,
-.Fn setgroupent
-and
-.Fn setgrent
-leave their results in an internal static object and return
-a pointer to that object.
-Subsequent calls to
-the same function
-will modify the same object.
-.Pp
-The functions
-.Fn getgrent ,
-.Fn getgrent_r ,
-.Fn endgrent ,
-.Fn setgroupent ,
-and
-.Fn setgrent
-are fairly useless in a networked environment and should be
-avoided, if possible.
-The
-.Fn getgrent
-and
-.Fn getgrent_r
-functions
-make no attempt to suppress duplicate information if multiple
-sources are specified in
-.Xr nsswitch.conf 5 .
diff --git a/lib/libc_bsd/gen/getgrent.c b/lib/libc_bsd/gen/getgrent.c
deleted file mode 100644
index 11c6be3..0000000
--- a/lib/libc_bsd/gen/getgrent.c
+++ /dev/null
@@ -1,1554 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- *
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getgrent.c 244092 2012-12-10 17:56:51Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-#include <grp.h>
-#include <nsswitch.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "nss_tls.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-
-enum constants {
-	GRP_STORAGE_INITIAL	= 1 << 10, /* 1 KByte */
-	GRP_STORAGE_MAX		= 1 << 20, /* 1 MByte */
-	SETGRENT		= 1,
-	ENDGRENT		= 2,
-	HESIOD_NAME_MAX		= 256,
-};
-
-static const ns_src defaultsrc[] = {
-	{ NSSRC_COMPAT, NS_SUCCESS },
-	{ NULL, 0 }
-};
-
-int	 __gr_match_entry(const char *, size_t, enum nss_lookup_type,
-	    const char *, gid_t);
-int	 __gr_parse_entry(char *, size_t, struct group *, char *, size_t,
-	    int *);
-
-static	int	 is_comment_line(const char *, size_t);
-
-union key {
-	const char	*name;
-	gid_t		 gid;
-};
-static	struct group *getgr(int (*)(union key, struct group *, char *, size_t,
-		    struct group **), union key);
-static	int	 wrap_getgrnam_r(union key, struct group *, char *, size_t,
-		    struct group **);
-static	int	 wrap_getgrgid_r(union key, struct group *, char *, size_t,
-		    struct group **);
-static	int	 wrap_getgrent_r(union key, struct group *, char *, size_t,
-		    struct group **);
-
-struct files_state {
-	FILE	*fp;
-	int	 stayopen;
-};
-static	void	 files_endstate(void *);
-NSS_TLS_HANDLING(files);
-static	int	 files_setgrent(void *, void *, va_list);
-static	int	 files_group(void *, void *, va_list);
-
-
-#ifdef HESIOD
-struct dns_state {
-	long	counter;
-};
-static	void	 dns_endstate(void *);
-NSS_TLS_HANDLING(dns);
-static	int	 dns_setgrent(void *, void *, va_list);
-static	int	 dns_group(void *, void *, va_list);
-#endif
-
-
-#ifdef YP
-struct nis_state {
-	char	 domain[MAXHOSTNAMELEN];
-	int	 done;
-	char	*key;
-	int	 keylen;
-};
-static	void	 nis_endstate(void *);
-NSS_TLS_HANDLING(nis);
-static	int	 nis_setgrent(void *, void *, va_list);
-static	int	 nis_group(void *, void *, va_list);
-#endif
-
-struct compat_state {
-	FILE	*fp;
-	int	 stayopen;
-	char	*name;
-	enum _compat {
-		COMPAT_MODE_OFF = 0,
-		COMPAT_MODE_ALL,
-		COMPAT_MODE_NAME
-	}	 compat;
-};
-static	void	 compat_endstate(void *);
-NSS_TLS_HANDLING(compat);
-static	int	 compat_setgrent(void *, void *, va_list);
-static	int	 compat_group(void *, void *, va_list);
-
-static	int	gr_addgid(gid_t, gid_t *, int, int *);
-static	int	getgroupmembership_fallback(void *, void *, va_list);
-
-#ifdef NS_CACHING
-static	int	 grp_id_func(char *, size_t *, va_list, void *);
-static	int	 grp_marshal_func(char *, size_t *, void *, va_list, void *);
-static	int	 grp_unmarshal_func(char *, size_t, void *, va_list, void *);
-
-static int
-grp_id_func(char *buffer, size_t *buffer_size, va_list ap, void *cache_mdata)
-{
-	char	*name;
-	gid_t	gid;
-
-	size_t	desired_size, size;
-	int	res = NS_UNAVAIL;
-	enum nss_lookup_type lookup_type;
-
-
-	lookup_type = (enum nss_lookup_type)cache_mdata;
-	switch (lookup_type) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		size = strlen(name);
-		desired_size = sizeof(enum nss_lookup_type) + size + 1;
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), name, size + 1);
-
-		res = NS_SUCCESS;
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		desired_size = sizeof(enum nss_lookup_type) + sizeof(gid_t);
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), &gid,
-		    sizeof(gid_t));
-
-		res = NS_SUCCESS;
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-fin:
-	*buffer_size = desired_size;
-	return (res);
-}
-
-static int
-grp_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	gid_t gid;
-	struct group *grp;
-	char *orig_buf;
-	size_t orig_buf_size;
-
-	struct group new_grp;
-	size_t desired_size, size, mem_size;
-	char *p, **mem;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	grp = va_arg(ap, struct group *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-
-	desired_size = _ALIGNBYTES + sizeof(struct group) + sizeof(char *);
-
-	if (grp->gr_name != NULL)
-		desired_size += strlen(grp->gr_name) + 1;
-	if (grp->gr_passwd != NULL)
-		desired_size += strlen(grp->gr_passwd) + 1;
-
-	if (grp->gr_mem != NULL) {
-		mem_size = 0;
-		for (mem = grp->gr_mem; *mem; ++mem) {
-			desired_size += strlen(*mem) + 1;
-			++mem_size;
-		}
-
-		desired_size += _ALIGNBYTES + (mem_size + 1) * sizeof(char *);
-	}
-
-	if (desired_size > *buffer_size) {
-		/* this assignment is here for future use */
-		*buffer_size = desired_size;
-		return (NS_RETURN);
-	}
-
-	memcpy(&new_grp, grp, sizeof(struct group));
-	memset(buffer, 0, desired_size);
-
-	*buffer_size = desired_size;
-	p = buffer + sizeof(struct group) + sizeof(char *);
-	memcpy(buffer + sizeof(struct group), &p, sizeof(char *));
-	p = (char *)_ALIGN(p);
-
-	if (new_grp.gr_name != NULL) {
-		size = strlen(new_grp.gr_name);
-		memcpy(p, new_grp.gr_name, size);
-		new_grp.gr_name = p;
-		p += size + 1;
-	}
-
-	if (new_grp.gr_passwd != NULL) {
-		size = strlen(new_grp.gr_passwd);
-		memcpy(p, new_grp.gr_passwd, size);
-		new_grp.gr_passwd = p;
-		p += size + 1;
-	}
-
-	if (new_grp.gr_mem != NULL) {
-		p = (char *)_ALIGN(p);
-		memcpy(p, new_grp.gr_mem, sizeof(char *) * mem_size);
-		new_grp.gr_mem = (char **)p;
-		p += sizeof(char *) * (mem_size + 1);
-
-		for (mem = new_grp.gr_mem; *mem; ++mem) {
-			size = strlen(*mem);
-			memcpy(p, *mem, size);
-			*mem = p;
-			p += size + 1;
-		}
-	}
-
-	memcpy(buffer, &new_grp, sizeof(struct group));
-	return (NS_SUCCESS);
-}
-
-static int
-grp_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	gid_t gid;
-	struct group *grp;
-	char *orig_buf;
-	size_t orig_buf_size;
-	int *ret_errno;
-
-	char *p;
-	char **mem;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	grp = va_arg(ap, struct group *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-	ret_errno = va_arg(ap, int *);
-
-	if (orig_buf_size <
-	    buffer_size - sizeof(struct group) - sizeof(char *)) {
-		*ret_errno = ERANGE;
-		return (NS_RETURN);
-	}
-
-	memcpy(grp, buffer, sizeof(struct group));
-	memcpy(&p, buffer + sizeof(struct group), sizeof(char *));
-
-	orig_buf = (char *)_ALIGN(orig_buf);
-	memcpy(orig_buf, buffer + sizeof(struct group) + sizeof(char *) +
-	    _ALIGN(p) - (size_t)p,
-	    buffer_size - sizeof(struct group) - sizeof(char *) -
-	    _ALIGN(p) + (size_t)p);
-	p = (char *)_ALIGN(p);
-
-	NS_APPLY_OFFSET(grp->gr_name, orig_buf, p, char *);
-	NS_APPLY_OFFSET(grp->gr_passwd, orig_buf, p, char *);
-	if (grp->gr_mem != NULL) {
-		NS_APPLY_OFFSET(grp->gr_mem, orig_buf, p, char **);
-
-		for (mem = grp->gr_mem; *mem; ++mem)
-			NS_APPLY_OFFSET(*mem, orig_buf, p, char *);
-	}
-
-	if (retval != NULL)
-		*((struct group **)retval) = grp;
-
-	return (NS_SUCCESS);
-}
-
-NSS_MP_CACHE_HANDLING(group);
-#endif /* NS_CACHING */
-
-#ifdef NS_CACHING
-static const nss_cache_info setgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-	group, (void *)nss_lt_all,
-	NULL, NULL);
-#endif
-
-static const ns_dtab setgrent_dtab[] = {
-	{ NSSRC_FILES, files_setgrent, (void *)SETGRENT },
-#ifdef HESIOD
-	{ NSSRC_DNS, dns_setgrent, (void *)SETGRENT },
-#endif
-#ifdef YP
-	{ NSSRC_NIS, nis_setgrent, (void *)SETGRENT },
-#endif
-	{ NSSRC_COMPAT, compat_setgrent, (void *)SETGRENT },
-#ifdef NS_CACHING
-	NS_CACHE_CB(&setgrent_cache_info)
-#endif
-	{ NULL, NULL, NULL }
-};
-
-#ifdef NS_CACHING
-static const nss_cache_info endgrent_cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-	group, (void *)nss_lt_all,
-	NULL, NULL);
-#endif
-
-static const ns_dtab endgrent_dtab[] = {
-	{ NSSRC_FILES, files_setgrent, (void *)ENDGRENT },
-#ifdef HESIOD
-	{ NSSRC_DNS, dns_setgrent, (void *)ENDGRENT },
-#endif
-#ifdef YP
-	{ NSSRC_NIS, nis_setgrent, (void *)ENDGRENT },
-#endif
-	{ NSSRC_COMPAT, compat_setgrent, (void *)ENDGRENT },
-#ifdef NS_CACHING
-	NS_CACHE_CB(&endgrent_cache_info)
-#endif
-	{ NULL, NULL, NULL }
-};
-
-#ifdef NS_CACHING
-static const nss_cache_info getgrent_r_cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-	group, (void *)nss_lt_all,
-	grp_marshal_func, grp_unmarshal_func);
-#endif
-
-static const ns_dtab getgrent_r_dtab[] = {
-	{ NSSRC_FILES, files_group, (void *)nss_lt_all },
-#ifdef HESIOD
-	{ NSSRC_DNS, dns_group, (void *)nss_lt_all },
-#endif
-#ifdef YP
-	{ NSSRC_NIS, nis_group, (void *)nss_lt_all },
-#endif
-	{ NSSRC_COMPAT, compat_group, (void *)nss_lt_all },
-#ifdef NS_CACHING
-	NS_CACHE_CB(&getgrent_r_cache_info)
-#endif
-	{ NULL, NULL, NULL }
-};
-
-static int
-gr_addgid(gid_t gid, gid_t *groups, int maxgrp, int *grpcnt)
-{
-	int     ret, dupc;
-
-	for (dupc = 0; dupc < MIN(maxgrp, *grpcnt); dupc++) {
-		if (groups[dupc] == gid)
-			return 1;
-	}
-
-	ret = 1;
-	if (*grpcnt < maxgrp)
-		groups[*grpcnt] = gid;
-	else
-		ret = 0;
-
-	(*grpcnt)++;
-
-	return ret;
-}
-
-static int
-getgroupmembership_fallback(void *retval, void *mdata, va_list ap)
-{
-	const ns_src src[] = {
-		{ mdata, NS_SUCCESS },
-		{ NULL, 0}
-	};
-	struct group	grp;
-	struct group	*grp_p;
-	char		*buf;
-	size_t		bufsize;
-	const char	*uname;
-	gid_t		*groups;
-	gid_t		agroup;
-	int 		maxgrp, *grpcnt;
-	int		i, rv, ret_errno;
-
-	/*
-	 * As this is a fallback method, only provided src
-	 * list will be respected during methods search.
-	 */
-	assert(src[0].name != NULL);
-
-	uname = va_arg(ap, const char *);
-	agroup = va_arg(ap, gid_t);
-	groups = va_arg(ap, gid_t *);
-	maxgrp = va_arg(ap, int);
-	grpcnt = va_arg(ap, int *); 
-
-	rv = NS_UNAVAIL;
-
-	buf = malloc(GRP_STORAGE_INITIAL);
-	if (buf == NULL)
-		goto out;
-
-	bufsize = GRP_STORAGE_INITIAL;
-
-	gr_addgid(agroup, groups, maxgrp, grpcnt);
-
-	_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", src, 0);
-	for (;;) {
-		do {
-			ret_errno = 0;
-			grp_p = NULL;
-			rv = _nsdispatch(&grp_p, getgrent_r_dtab, NSDB_GROUP,
-			    "getgrent_r", src, &grp, buf, bufsize, &ret_errno);
-
-			if (grp_p == NULL && ret_errno == ERANGE) {
-				free(buf);
-				if ((bufsize << 1) > GRP_STORAGE_MAX) {
-					buf = NULL;
-					errno = ERANGE;
-					goto out;
-				}
-
-				bufsize <<= 1;
-				buf = malloc(bufsize);
-				if (buf == NULL) {
-					goto out;
-				}
-			}
-		} while (grp_p == NULL && ret_errno == ERANGE);
-
-		if (ret_errno != 0) {
-			errno = ret_errno;
-			goto out;
-		}
-
-		if (grp_p == NULL)
-			break;
-
-		for (i = 0; grp.gr_mem[i]; i++) {
-			if (strcmp(grp.gr_mem[i], uname) == 0)
-			    gr_addgid(grp.gr_gid, groups, maxgrp, grpcnt);
-		}
-	}
-
-	_nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", src);
-out:
-	free(buf);
-	return (rv);
-}
-
-/* XXX IEEE Std 1003.1, 2003 specifies `void setgrent(void)' */
-int				
-setgrent(void)
-{
-	(void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc, 0);
-	return (1);
-}
-
-
-int
-setgroupent(int stayopen)
-{
-	(void)_nsdispatch(NULL, setgrent_dtab, NSDB_GROUP, "setgrent", defaultsrc,
-	    stayopen);
-	return (1);
-}
-
-
-void
-endgrent(void)
-{
-	(void)_nsdispatch(NULL, endgrent_dtab, NSDB_GROUP, "endgrent", defaultsrc);
-}
-
-
-int
-getgrent_r(struct group *grp, char *buffer, size_t bufsize,
-    struct group **result)
-{
-	int	rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, getgrent_r_dtab, NSDB_GROUP, "getgrent_r", defaultsrc,
-	    grp, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-int
-getgrnam_r(const char *name, struct group *grp, char *buffer, size_t bufsize,
-    struct group **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-    		NS_COMMON_CACHE_INFO_INITIALIZER(
-		group, (void *)nss_lt_name,
-		grp_id_func, grp_marshal_func, grp_unmarshal_func);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_group, (void *)nss_lt_name },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_group, (void *)nss_lt_name },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_group, (void *)nss_lt_name },
-#endif
-		{ NSSRC_COMPAT, compat_group, (void *)nss_lt_name },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrnam_r", defaultsrc,
-	    name, grp, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-int
-getgrgid_r(gid_t gid, struct group *grp, char *buffer, size_t bufsize,
-    struct group **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-    		NS_COMMON_CACHE_INFO_INITIALIZER(
-		group, (void *)nss_lt_id,
-		grp_id_func, grp_marshal_func, grp_unmarshal_func);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_group, (void *)nss_lt_id },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_group, (void *)nss_lt_id },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_group, (void *)nss_lt_id },
-#endif
-		{ NSSRC_COMPAT, compat_group, (void *)nss_lt_id },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_GROUP, "getgrgid_r", defaultsrc,
-	    gid, grp, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-
-int
-__getgroupmembership(const char *uname, gid_t agroup, gid_t *groups,
-	int maxgrp, int *grpcnt)
-{
-	static const ns_dtab dtab[] = {
-		NS_FALLBACK_CB(getgroupmembership_fallback)
-		{ NULL, NULL, NULL }
-	};
-	int rv;
-
-	assert(uname != NULL);
-	/* groups may be NULL if just sizing when invoked with maxgrp = 0 */
-	assert(grpcnt != NULL);
-
-	*grpcnt = 0;
-	rv = _nsdispatch(NULL, dtab, NSDB_GROUP, "getgroupmembership",
-	    defaultsrc, uname, agroup, groups, maxgrp, grpcnt);
-
-	/* too many groups found? */
-	return (*grpcnt > maxgrp ? -1 : 0);
-}
-
-
-static struct group	 grp;
-static char		*grp_storage;
-static size_t		 grp_storage_size;
-
-static struct group *
-getgr(int (*fn)(union key, struct group *, char *, size_t, struct group **),
-    union key key)
-{
-	int		 rv;
-	struct group	*res;
-
-	if (grp_storage == NULL) {
-		grp_storage = malloc(GRP_STORAGE_INITIAL);
-		if (grp_storage == NULL)
-			return (NULL);
-		grp_storage_size = GRP_STORAGE_INITIAL;
-	}
-	do {
-		rv = fn(key, &grp, grp_storage, grp_storage_size, &res);
-		if (res == NULL && rv == ERANGE) {
-			free(grp_storage);
-			if ((grp_storage_size << 1) > GRP_STORAGE_MAX) {
-				grp_storage = NULL;
-				errno = ERANGE;
-				return (NULL);
-			}
-			grp_storage_size <<= 1;
-			grp_storage = malloc(grp_storage_size);
-			if (grp_storage == NULL)
-				return (NULL);
-		}
-	} while (res == NULL && rv == ERANGE);
-	if (rv != 0)
-		errno = rv;
-	return (res);
-}
-
-
-static int
-wrap_getgrnam_r(union key key, struct group *grp, char *buffer, size_t bufsize,
-    struct group **res)
-{
-	return (getgrnam_r(key.name, grp, buffer, bufsize, res));
-}
-
-
-static int
-wrap_getgrgid_r(union key key, struct group *grp, char *buffer, size_t bufsize,
-    struct group **res)
-{
-	return (getgrgid_r(key.gid, grp, buffer, bufsize, res));
-}
-
-
-static int
-wrap_getgrent_r(union key key __unused, struct group *grp, char *buffer,
-    size_t bufsize, struct group **res)
-{
-	return (getgrent_r(grp, buffer, bufsize, res));
-}
-
-
-struct group *
-getgrnam(const char *name)
-{
-	union key key;
-
-	key.name = name;
-	return (getgr(wrap_getgrnam_r, key));
-}
-
-
-struct group *
-getgrgid(gid_t gid)
-{
-	union key key;
-
-	key.gid = gid;
-	return (getgr(wrap_getgrgid_r, key));
-}
-
-
-struct group *
-getgrent(void)
-{
-	union key key;
-
-	key.gid = 0; /* not used */
-	return (getgr(wrap_getgrent_r, key));
-}
-
-
-static int
-is_comment_line(const char *s, size_t n)
-{
-	const char	*eom;
-
-	eom = &s[n];
-
-	for (; s < eom; s++)
-		if (*s == '#' || !isspace((unsigned char)*s))
-			break;
-	return (*s == '#' || s == eom);
-}
-
-
-/*
- * files backend
- */
-static void
-files_endstate(void *p)
-{
-
-	if (p == NULL)
-		return;
-	if (((struct files_state *)p)->fp != NULL)
-		fclose(((struct files_state *)p)->fp);
-	free(p);
-}
-
-
-static int
-files_setgrent(void *retval, void *mdata, va_list ap)
-{
-	struct files_state *st;
-	int		 rv, stayopen;
-
-	rv = files_getstate(&st);
-	if (rv != 0) 
-		return (NS_UNAVAIL);
-	switch ((enum constants)mdata) {
-	case SETGRENT:
-		stayopen = va_arg(ap, int);
-		if (st->fp != NULL)
-			rewind(st->fp);
-		else if (stayopen)
-			st->fp = fopen(_PATH_GROUP, "re");
-		break;
-	case ENDGRENT:
-		if (st->fp != NULL) {
-			fclose(st->fp);
-			st->fp = NULL;
-		}
-		break;
-	default:
-		break;
-	}
-	return (NS_UNAVAIL);
-}
-
-
-static int
-files_group(void *retval, void *mdata, va_list ap)
-{
-	struct files_state	*st;
-	enum nss_lookup_type	 how;
-	const char		*name, *line;
-	struct group		*grp;
-	gid_t			 gid;
-	char			*buffer;
-	size_t			 bufsize, linesize;
-	off_t			 pos;
-	int			 rv, stayopen, *errnop;
-
-	name = NULL;
-	gid = (gid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		return (NS_NOTFOUND);
-	}
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	*errnop = files_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (st->fp == NULL &&
-	    ((st->fp = fopen(_PATH_GROUP, "re")) == NULL)) {
-		*errnop = errno;
-		return (NS_UNAVAIL);
-	}
-	if (how == nss_lt_all)
-		stayopen = 1;
-	else {
-		rewind(st->fp);
-		stayopen = st->stayopen;
-	}
-	rv = NS_NOTFOUND;
-	pos = ftello(st->fp);
-	while ((line = fgetln(st->fp, &linesize)) != NULL) {
-		if (line[linesize-1] == '\n')
-			linesize--;
-		rv = __gr_match_entry(line, linesize, how, name, gid);
-		if (rv != NS_SUCCESS)
-			continue;
-		/* We need room at least for the line, a string NUL
-		 * terminator, alignment padding, and one (char *)
-		 * pointer for the member list terminator.
-		 */
-		if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-		memcpy(buffer, line, linesize);
-		buffer[linesize] = '\0';
-		rv = __gr_parse_entry(buffer, linesize, grp, 
-		    &buffer[linesize + 1], bufsize - linesize - 1, errnop);
-		if (rv & NS_TERMINATE)
-			break;
-		pos = ftello(st->fp);
-	}
-	if (!stayopen && st->fp != NULL) {
-		fclose(st->fp);
-		st->fp = NULL;
-	}
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct group **)retval = grp;
-	else if (rv == NS_RETURN && *errnop == ERANGE && st->fp != NULL)
-		fseeko(st->fp, pos, SEEK_SET);
-	return (rv);
-}
-
-
-#ifdef HESIOD
-/*
- * dns backend
- */
-static void
-dns_endstate(void *p)
-{
-
-	free(p);
-}
-
-
-static int
-dns_setgrent(void *retval, void *cb_data, va_list ap)
-{
-	struct dns_state	*st;
-	int			 rv;
-
-	rv = dns_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	st->counter = 0;
-	return (NS_UNAVAIL);
-}
-
-
-static int
-dns_group(void *retval, void *mdata, va_list ap)
-{
-	char			 buf[HESIOD_NAME_MAX];
-	struct dns_state	*st;
-	struct group		*grp;
-	const char		*name, *label;
-	void			*ctx;
-	char			*buffer, **hes;
-	size_t			 bufsize, adjsize, linesize;
-	gid_t			 gid;
-	enum nss_lookup_type	 how;
-	int			 rv, *errnop;
-
-	ctx = NULL;
-	hes = NULL;
-	name = NULL;
-	gid = (gid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
-	case nss_lt_all:
-		break;
-	}
-	grp     = va_arg(ap, struct group *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop  = va_arg(ap, int *);
-	*errnop = dns_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (hesiod_init(&ctx) != 0) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	do {
-		rv = NS_NOTFOUND;
-		switch (how) {
-		case nss_lt_name:
-			label = name;
-			break;
-		case nss_lt_id:
-			if (snprintf(buf, sizeof(buf), "%lu",
-			    (unsigned long)gid) >= sizeof(buf))
-				goto fin;
-			label = buf;
-			break;
-		case nss_lt_all:
-			if (st->counter < 0)
-				goto fin;
-			if (snprintf(buf, sizeof(buf), "group-%ld",
-			    st->counter++) >= sizeof(buf))
-				goto fin;
-			label = buf;
-			break;
-		}
-		hes = hesiod_resolve(ctx, label,
-		    how == nss_lt_id ? "gid" : "group");
-		if ((how == nss_lt_id && hes == NULL &&
-		    (hes = hesiod_resolve(ctx, buf, "group")) == NULL) ||
-		    hes == NULL) {
-			if (how == nss_lt_all)
-				st->counter = -1;
-			if (errno != ENOENT)
-				*errnop = errno;
-			goto fin;
-		}
-		rv = __gr_match_entry(hes[0], strlen(hes[0]), how, name, gid);
-		if (rv != NS_SUCCESS) {
-			hesiod_free_list(ctx, hes);
-			hes = NULL;
-			continue;
-		}
-		/* We need room at least for the line, a string NUL
-		 * terminator, alignment padding, and one (char *)
-		 * pointer for the member list terminator.
-		 */
-		adjsize = bufsize - _ALIGNBYTES - sizeof(char *);
-		linesize = strlcpy(buffer, hes[0], adjsize);
-		if (linesize >= adjsize) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			goto fin;
-		}
-		hesiod_free_list(ctx, hes);
-		hes = NULL;
-		rv = __gr_parse_entry(buffer, linesize, grp,
-		    &buffer[linesize + 1], bufsize - linesize - 1, errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (hes != NULL)
-		hesiod_free_list(ctx, hes);
-	if (ctx != NULL)
-		hesiod_end(ctx);
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct group **)retval = grp;
-	return (rv);
-}
-#endif /* HESIOD */
-
-
-#ifdef YP
-/*
- * nis backend
- */
-static void
-nis_endstate(void *p)
-{
-
-	if (p == NULL)
-		return;
-	free(((struct nis_state *)p)->key);
-	free(p);
-}
-
-
-static int
-nis_setgrent(void *retval, void *cb_data, va_list ap)
-{
-	struct nis_state	*st;
-	int			 rv;
-
-	rv = nis_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	st->done = 0;
-	free(st->key);
-	st->key = NULL;
-	return (NS_UNAVAIL);
-}
-
-
-static int
-nis_group(void *retval, void *mdata, va_list ap)
-{
-	char		 *map;
-	struct nis_state *st;
-	struct group	*grp;
-	const char	*name;
-	char		*buffer, *key, *result;
-	size_t		 bufsize;
-	gid_t		 gid;
-	enum nss_lookup_type how;
-	int		*errnop, keylen, resultlen, rv;
-	
-	name = NULL;
-	gid = (gid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		map = "group.byname";
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		map = "group.bygid";
-		break;
-	case nss_lt_all:
-		map = "group.byname";
-		break;
-	}
-	grp     = va_arg(ap, struct group *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop  = va_arg(ap, int *);
-	*errnop = nis_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (st->domain[0] == '\0') {
-		if (getdomainname(st->domain, sizeof(st->domain)) != 0) {
-			*errnop = errno;
-			return (NS_UNAVAIL);
-		}
-	}
-	result = NULL;
-	do {
-		rv = NS_NOTFOUND;
-		switch (how) {
-		case nss_lt_name:
-			if (strlcpy(buffer, name, bufsize) >= bufsize)
-				goto erange;
-			break;
-		case nss_lt_id:
-			if (snprintf(buffer, bufsize, "%lu",
-			    (unsigned long)gid) >= bufsize)
-				goto erange;
-			break;
-		case nss_lt_all:
-			if (st->done)
-				goto fin;
-			break;
-		}
-		result = NULL;
-		if (how == nss_lt_all) {
-			if (st->key == NULL)
-				rv = yp_first(st->domain, map, &st->key,
-				    &st->keylen, &result, &resultlen);
-			else {
-				key = st->key;
-				keylen = st->keylen;
-				st->key = NULL;
-				rv = yp_next(st->domain, map, key, keylen,
-				    &st->key, &st->keylen, &result,
-				    &resultlen);
-				free(key);
-			}
-			if (rv != 0) {
-				free(result);
-				free(st->key);
-				st->key = NULL;
-				if (rv == YPERR_NOMORE) {
-					st->done = 1;
-					rv = NS_NOTFOUND;
-				} else
-					rv = NS_UNAVAIL;
-				goto fin;
-			}
-		} else {
-			rv = yp_match(st->domain, map, buffer, strlen(buffer),
-			    &result, &resultlen);
-			if (rv == YPERR_KEY) {
-				rv = NS_NOTFOUND;
-				continue;
-			} else if (rv != 0) {
-				free(result);
-				rv = NS_UNAVAIL;
-				continue;
-			}
-		}
-		/* We need room at least for the line, a string NUL
-		 * terminator, alignment padding, and one (char *)
-		 * pointer for the member list terminator.
-		 */
-		if (resultlen >= bufsize - _ALIGNBYTES - sizeof(char *))
-			goto erange;
-		memcpy(buffer, result, resultlen);
-		buffer[resultlen] = '\0';
-		free(result);
-		rv = __gr_match_entry(buffer, resultlen, how, name, gid);
-		if (rv == NS_SUCCESS)
-			rv = __gr_parse_entry(buffer, resultlen, grp,
-			    &buffer[resultlen+1], bufsize - resultlen - 1,
-			    errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct group **)retval = grp;
-	return (rv);	
-erange:
-	*errnop = ERANGE;
-	return (NS_RETURN);
-}
-#endif /* YP */
-
-
-
-/*
- * compat backend
- */
-static void
-compat_endstate(void *p)
-{
-	struct compat_state *st;
-
-	if (p == NULL)
-		return;
-	st = (struct compat_state *)p;
-	free(st->name);
-	if (st->fp != NULL)
-		fclose(st->fp);
-	free(p);
-}
-
-
-static int
-compat_setgrent(void *retval, void *mdata, va_list ap)
-{
-	static const ns_src compatsrc[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab dtab[] = {
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setgrent, NULL },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setgrent, NULL },
-#endif
-		{ NULL, NULL, NULL }
-	};
-	struct compat_state *st;
-	int		 rv, stayopen;
-
-#define set_setent(x, y) do {	 				\
-	int i;							\
-								\
-	for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++)	\
-		x[i].mdata = (void *)y;				\
-} while (0)
-
-	rv = compat_getstate(&st);
-	if (rv != 0) 
-		return (NS_UNAVAIL);
-	switch ((enum constants)mdata) {
-	case SETGRENT:
-		stayopen = va_arg(ap, int);
-		if (st->fp != NULL)
-			rewind(st->fp);
-		else if (stayopen)
-			st->fp = fopen(_PATH_GROUP, "re");
-		set_setent(dtab, mdata);
-		(void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "setgrent",
-		    compatsrc, 0);
-		break;
-	case ENDGRENT:
-		if (st->fp != NULL) {
-			fclose(st->fp);
-			st->fp = NULL;
-		}
-		set_setent(dtab, mdata);
-		(void)_nsdispatch(NULL, dtab, NSDB_GROUP_COMPAT, "endgrent",
-		    compatsrc, 0);
-		break;
-	default:
-		break;
-	}
-	st->compat = COMPAT_MODE_OFF;
-	free(st->name);
-	st->name = NULL;
-	return (NS_UNAVAIL);
-#undef set_setent
-}
-
-
-static int
-compat_group(void *retval, void *mdata, va_list ap)
-{
-	static const ns_src compatsrc[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab dtab[] = {
-#ifdef YP
-		{ NSSRC_NIS, nis_group, NULL },
-#endif
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_group, NULL },
-#endif
-		{ NULL, NULL, NULL }
-	};
-	struct compat_state	*st;
-	enum nss_lookup_type	 how;
-	const char		*name, *line;
-	struct group		*grp;
-	gid_t			 gid;
-	char			*buffer, *p;
-	void			*discard;
-	size_t			 bufsize, linesize;
-	off_t			 pos;
-	int			 rv, stayopen, *errnop;
-
-#define set_lookup_type(x, y) do { 				\
-	int i;							\
-								\
-	for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++)	\
-		x[i].mdata = (void *)y;				\
-} while (0)
-
-	name = NULL;
-	gid = (gid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		gid = va_arg(ap, gid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		return (NS_NOTFOUND);
-	}
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	*errnop = compat_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (st->fp == NULL &&
-	    ((st->fp = fopen(_PATH_GROUP, "re")) == NULL)) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	if (how == nss_lt_all)
-		stayopen = 1;
-	else {
-		rewind(st->fp);
-		stayopen = st->stayopen;
-	}
-docompat:
-	switch (st->compat) {
-	case COMPAT_MODE_ALL:
-		set_lookup_type(dtab, how);
-		switch (how) {
-		case nss_lt_all:
-			rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT,
-			    "getgrent_r", compatsrc, grp, buffer, bufsize,
-			    errnop);
-			break;
-		case nss_lt_id:
-			rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT,
-			    "getgrgid_r", compatsrc, gid, grp, buffer, bufsize,
-			    errnop);
-			break;
-		case nss_lt_name:
-			rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT,
-			    "getgrnam_r", compatsrc, name, grp, buffer,
-			    bufsize, errnop);
-			break;
-		}
-		if (rv & NS_TERMINATE)
-			goto fin;
-		st->compat = COMPAT_MODE_OFF;
-		break;
-	case COMPAT_MODE_NAME:
-		set_lookup_type(dtab, nss_lt_name);
-		rv = _nsdispatch(&discard, dtab, NSDB_GROUP_COMPAT,
-		    "getgrnam_r", compatsrc, st->name, grp, buffer, bufsize,
-		    errnop);
-		switch (rv) {
-		case NS_SUCCESS:
-			switch (how) {
-			case nss_lt_name:
-				if (strcmp(name, grp->gr_name) != 0)
-					rv = NS_NOTFOUND;
-				break;
-			case nss_lt_id:
-				if (gid != grp->gr_gid)
-					rv = NS_NOTFOUND;
-				break;
-			default:
-				break;
-			}
-			break;
-		case NS_RETURN:
-			goto fin;
-		default:
-			break;
-		}
-		free(st->name);
-		st->name = NULL;
-		st->compat = COMPAT_MODE_OFF;
-		if (rv == NS_SUCCESS)
-			goto fin;
-		break;
-	default:
-		break;
-	}
-	rv = NS_NOTFOUND;
-	pos = ftello(st->fp);
-	while ((line = fgetln(st->fp, &linesize)) != NULL) {
-		if (line[linesize-1] == '\n')
-			linesize--;
-		if (linesize > 2 && line[0] == '+') {
-			p = memchr(&line[1], ':', linesize);
-			if (p == NULL || p == &line[1])
-				st->compat = COMPAT_MODE_ALL;
-			else {
-				st->name = malloc(p - line);
-				if (st->name == NULL) {
-					syslog(LOG_ERR,
-					 "getgrent memory allocation failure");
-					*errnop = ENOMEM;
-					rv = NS_UNAVAIL;
-					break;
-				}
-				memcpy(st->name, &line[1], p - line - 1);
-				st->name[p - line - 1] = '\0';
-				st->compat = COMPAT_MODE_NAME;
-			}
-			goto docompat;
-		} 
-		rv = __gr_match_entry(line, linesize, how, name, gid);
-		if (rv != NS_SUCCESS)
-			continue;
-		/* We need room at least for the line, a string NUL
-		 * terminator, alignment padding, and one (char *)
-		 * pointer for the member list terminator.
-		 */
-		if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-		memcpy(buffer, line, linesize);
-		buffer[linesize] = '\0';
-		rv = __gr_parse_entry(buffer, linesize, grp, 
-		    &buffer[linesize + 1], bufsize - linesize - 1, errnop);
-		if (rv & NS_TERMINATE)
-			break;
-		pos = ftello(st->fp);
-	}
-fin:
-	if (!stayopen && st->fp != NULL) {
-		fclose(st->fp);
-		st->fp = NULL;
-	}
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct group **)retval = grp;
-	else if (rv == NS_RETURN && *errnop == ERANGE && st->fp != NULL)
-		fseeko(st->fp, pos, SEEK_SET);
-	return (rv);
-#undef set_lookup_type
-}
-
-
-/*
- * common group line matching and parsing
- */
-int
-__gr_match_entry(const char *line, size_t linesize, enum nss_lookup_type how,
-    const char *name, gid_t gid)
-{
-	size_t		 namesize;
-	const char	*p, *eol;
-	char		*q;
-	unsigned long	 n;
-	int		 i, needed;
-
-	if (linesize == 0 || is_comment_line(line, linesize))
-		return (NS_NOTFOUND);
-	switch (how) {
-	case nss_lt_name:	needed = 1; break;
-	case nss_lt_id:		needed = 2; break;
-	default:		needed = 2; break;
-	}
-	eol = &line[linesize];
-	for (p = line, i = 0; i < needed && p < eol; p++)
-		if (*p == ':')
-			i++;
-	if (i < needed)
-		return (NS_NOTFOUND);
-	switch (how) {
-	case nss_lt_name:
-		namesize = strlen(name);
-		if (namesize + 1 == (size_t)(p - line) &&
-		    memcmp(line, name, namesize) == 0)
-			return (NS_SUCCESS);
-		break;
-	case nss_lt_id:
-		n = strtoul(p, &q, 10);
-		if (q < eol && *q == ':' && gid == (gid_t)n)
-			return (NS_SUCCESS);
-		break;
-	case nss_lt_all:
-		return (NS_SUCCESS);
-	default:
-		break;
-	}
-	return (NS_NOTFOUND);
-}
-
-
-int
-__gr_parse_entry(char *line, size_t linesize, struct group *grp, char *membuf,
-    size_t membufsize, int *errnop)
-{
-	char	       *s_gid, *s_mem, *p, **members;
-	unsigned long	n;
-	int		maxmembers;
-
-	memset(grp, 0, sizeof(*grp));
-	members = (char **)_ALIGN(membuf);
-	membufsize -= (char *)members - membuf;
-	maxmembers = membufsize / sizeof(*members);
-	if (maxmembers <= 0 ||
-	    (grp->gr_name = strsep(&line, ":")) == NULL ||
-	    grp->gr_name[0] == '\0' ||
-	    (grp->gr_passwd = strsep(&line, ":")) == NULL ||
-	    (s_gid = strsep(&line, ":")) == NULL ||
-	    s_gid[0] == '\0')
-		return (NS_NOTFOUND);
-	s_mem = line;
-	n = strtoul(s_gid, &s_gid, 10);
-	if (s_gid[0] != '\0')
-		return (NS_NOTFOUND);
-	grp->gr_gid = (gid_t)n;
-	grp->gr_mem = members;
-	while (maxmembers > 1 && s_mem != NULL) {
-		p = strsep(&s_mem, ",");
-		if (p != NULL && *p != '\0') {
-			*members++ = p;
-			maxmembers--;
-		}
-	}
-	*members = NULL;
-	if (s_mem == NULL)
-		return (NS_SUCCESS);
-	else {
-		*errnop = ERANGE;
-		return (NS_RETURN);
-	}
-}
-
-
diff --git a/lib/libc_bsd/gen/getgrouplist.3 b/lib/libc_bsd/gen/getgrouplist.3
deleted file mode 100644
index 809622c..0000000
--- a/lib/libc_bsd/gen/getgrouplist.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getgrouplist.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getgrouplist.3 231945 2012-02-20 20:46:27Z pjd $
-.\"
-.Dd February 20, 2012
-.Dt GETGROUPLIST 3
-.Os
-.Sh NAME
-.Nm getgrouplist
-.Nd calculate group access list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getgrouplist "const char *name" "gid_t basegid" "gid_t *groups" "int *ngroups"
-.Sh DESCRIPTION
-The
-.Fn getgrouplist
-function reads through the group file and calculates
-the group access list for the user specified in
-.Fa name .
-The
-.Fa basegid
-is automatically included in the groups list.
-Typically this value is given as
-the group number from the password file.
-.Pp
-The resulting group list is returned in the array pointed to by
-.Fa groups .
-The caller specifies the size of the
-.Fa groups
-array in the integer pointed to by
-.Fa ngroups ;
-the actual number of groups found is returned in
-.Fa ngroups .
-.Sh RETURN VALUES
-The
-.Fn getgrouplist
-function
-returns 0 on success and \-1 if the size of the group list is too small to
-hold all the user's groups.
-Here, the group array will be filled with as many groups as will fit.
-.Sh FILES
-.Bl -tag -width /etc/group -compact
-.It Pa /etc/group
-group membership list
-.El
-.Sh SEE ALSO
-.Xr setgroups 2 ,
-.Xr initgroups 3
-.Sh HISTORY
-The
-.Fn getgrouplist
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The
-.Fn getgrouplist
-function
-uses the routines based on
-.Xr getgrent 3 .
-If the invoking program uses any of these routines,
-the group structure will
-be overwritten in the call to
-.Fn getgrouplist .
diff --git a/lib/libc_bsd/gen/getgrouplist.c b/lib/libc_bsd/gen/getgrouplist.c
deleted file mode 100644
index 902bf09..0000000
--- a/lib/libc_bsd/gen/getgrouplist.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1991, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getgrouplist.c	8.2 (Berkeley) 12/8/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getgrouplist.c 174547 2007-12-12 10:08:03Z bushman $");
-
-/*
- * get credential
- */
-#include <sys/types.h>
-
-#include <grp.h>
-#include <string.h>
-#include <unistd.h>
-
-extern int __getgroupmembership(const char *, gid_t, gid_t *, int, int *);
-
-int
-getgrouplist(const char *uname, gid_t agroup, gid_t *groups, int *grpcnt)
-{
-	return __getgroupmembership(uname, agroup, groups, *grpcnt, grpcnt);
-}
-
diff --git a/lib/libc_bsd/gen/gethostname.3 b/lib/libc_bsd/gen/gethostname.3
deleted file mode 100644
index f987f8a..0000000
--- a/lib/libc_bsd/gen/gethostname.3
+++ /dev/null
@@ -1,131 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)gethostname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/gethostname.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd August 18, 2003
-.Dt GETHOSTNAME 3
-.Os
-.Sh NAME
-.Nm gethostname ,
-.Nm sethostname
-.Nd get/set name of current host
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn gethostname "char *name" "size_t namelen"
-.Ft int
-.Fn sethostname "const char *name" "int namelen"
-.Sh DESCRIPTION
-The
-.Fn gethostname
-function
-returns the standard host name for the current processor, as
-previously set by
-.Fn sethostname .
-The
-.Fa namelen
-argument
-specifies the size of the
-.Fa name
-array.
-The returned name is null-terminated unless insufficient space is provided.
-.Pp
-The
-.Fn sethostname
-function
-sets the name of the host machine to be
-.Fa name ,
-which has length
-.Fa namelen .
-This call is restricted to the super-user and
-is normally used only when the system is bootstrapped.
-.Pp
-Host names are limited to
-.Brq Dv HOST_NAME_MAX
-characters, not including the trailing null, currently 255.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The following errors may be returned by these calls:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa name
-or
-.Fa namelen
-argument gave an
-invalid address.
-.It Bq Er ENAMETOOLONG
-The current host name is longer than
-.Fa namelen .
-(For
-.Fn gethostname
-only.)
-.It Bq Er EPERM
-The caller tried to set the host name and was not the super-user.
-.El
-.Sh SEE ALSO
-.Xr sysconf 3 ,
-.Xr sysctl 3
-.Sh STANDARDS
-The
-.Fn gethostname
-function conforms to
-.St -p1003.1-2001 .
-Callers should be aware that
-.Brq Dv HOST_NAME_MAX
-may be variable or infinite, but is guaranteed to be no less than
-.Brq Dv _POSIX_HOST_NAME_MAX .
-On older systems, this limit was defined in the non-standard header
-.In sys/param.h
-as
-.Dv MAXHOSTNAMELEN ,
-and counted the terminating null.
-The
-.Fn sethostname
-function and the error returns for
-.Fn gethostname
-are not standardized.
-.Sh HISTORY
-The
-.Fn gethostname
-function appeared in
-.Bx 4.2 .
-The
-.Fa namelen
-argument to
-.Fn gethostname
-was changed to
-.Vt size_t
-in
-.Fx 5.2
-for alignment with
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/gen/gethostname.c b/lib/libc_bsd/gen/gethostname.c
deleted file mode 100644
index d1e1823..0000000
--- a/lib/libc_bsd/gen/gethostname.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/gethostname.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-int
-gethostname(name, namelen)
-	char *name;
-	size_t namelen;
-{
-	int mib[2];
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTNAME;
-	if (sysctl(mib, 2, name, &namelen, NULL, 0) == -1) {
-		if (errno == ENOMEM)
-			errno = ENAMETOOLONG;
-		return (-1);
-	}
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/getloadavg.3 b/lib/libc_bsd/gen/getloadavg.3
deleted file mode 100644
index 282dcc4..0000000
--- a/lib/libc_bsd/gen/getloadavg.3
+++ /dev/null
@@ -1,65 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getloadavg.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getloadavg.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt GETLOADAVG 3
-.Os
-.Sh NAME
-.Nm getloadavg
-.Nd get system load averages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn getloadavg "double loadavg[]" "int nelem"
-.Sh DESCRIPTION
-The
-.Fn getloadavg
-function returns the number of processes in the system run queue
-averaged over various periods of time.
-Up to
-.Fa nelem
-samples are retrieved and assigned to successive elements of
-.Fa loadavg Ns Bq .
-The system imposes a maximum of 3 samples, representing averages
-over the last 1, 5, and 15 minutes, respectively.
-.Sh DIAGNOSTICS
-If the load average was unobtainable, \-1 is returned; otherwise,
-the number of samples actually retrieved is returned.
-.Sh SEE ALSO
-.Xr uptime 1 ,
-.Xr kvm_getloadavg 3 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn getloadavg
-function appeared in
-.Bx 4.3 Reno .
diff --git a/lib/libc_bsd/gen/getloadavg.c b/lib/libc_bsd/gen/getloadavg.c
deleted file mode 100644
index 54a3703..0000000
--- a/lib/libc_bsd/gen/getloadavg.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getloadavg.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getloadavg.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/sysctl.h>
-#include <vm/vm_param.h>
-
-#include <stdlib.h>
-
-/*
- * getloadavg() -- Get system load averages.
- *
- * Put `nelem' samples into `loadavg' array.
- * Return number of samples retrieved, or -1 on error.
- */
-int
-getloadavg(loadavg, nelem)
-	double loadavg[];
-	int nelem;
-{
-	struct loadavg loadinfo;
-	int i, mib[2];
-	size_t size;
-
-	mib[0] = CTL_VM;
-	mib[1] = VM_LOADAVG;
-	size = sizeof(loadinfo);
-	if (sysctl(mib, 2, &loadinfo, &size, NULL, 0) < 0)
-		return (-1);
-
-	nelem = MIN(nelem, sizeof(loadinfo.ldavg) / sizeof(fixpt_t));
-	for (i = 0; i < nelem; i++)
-		loadavg[i] = (double) loadinfo.ldavg[i] / loadinfo.fscale;
-	return (nelem);
-}
diff --git a/lib/libc_bsd/gen/getlogin.c b/lib/libc_bsd/gen/getlogin.c
deleted file mode 100644
index 2219afd..0000000
--- a/lib/libc_bsd/gen/getlogin.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getlogin.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getlogin.c 269453 2014-08-03 01:51:48Z marcel $");
-
-#include <sys/param.h>
-#include <errno.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "namespace.h"
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-#define	THREAD_LOCK()	if (__isthreaded) _pthread_mutex_lock(&logname_mutex)
-#define	THREAD_UNLOCK()	if (__isthreaded) _pthread_mutex_unlock(&logname_mutex)
-
-extern int		_getlogin(char *, int);
-
-int			_logname_valid __hidden; /* known to setlogin() */
-static pthread_mutex_t	logname_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static char *
-getlogin_basic(int *status)
-{
-	static char logname[MAXLOGNAME];
-
-	if (_logname_valid == 0) {
-		if (_getlogin(logname, sizeof(logname)) < 0) {
-			*status = errno;
-			return (NULL);
-		}
-		_logname_valid = 1;
-	}
-	*status = 0;
-	return (*logname ? logname : NULL);
-}
-
-char *
-getlogin(void)
-{
-	char	*result;
-	int	status;
-
-	THREAD_LOCK();
-	result = getlogin_basic(&status);
-	THREAD_UNLOCK();
-	return (result);
-}
-
-int
-getlogin_r(char *logname, int namelen)
-{
-	char	*result;
-	int	len;
-	int	status;
-
-	if (namelen < 1)
-		return (ERANGE);
-	logname[0] = '\0';
-
-	THREAD_LOCK();
-	result = getlogin_basic(&status);
-	if (status == 0 && result != NULL) {
-		len = strlen(result) + 1;
-		if (len > namelen)
-			status = ERANGE;
-		else
-			strncpy(logname, result, len);
-	}
-	THREAD_UNLOCK();
-	return (status);
-}
diff --git a/lib/libc_bsd/gen/getmntinfo.3 b/lib/libc_bsd/gen/getmntinfo.3
deleted file mode 100644
index 71f9d36..0000000
--- a/lib/libc_bsd/gen/getmntinfo.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getmntinfo.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getmntinfo.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 9, 1993
-.Dt GETMNTINFO 3
-.Os
-.Sh NAME
-.Nm getmntinfo
-.Nd get information about mounted file systems
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/ucred.h
-.In sys/mount.h
-.Ft int
-.Fn getmntinfo "struct statfs **mntbufp" "int flags"
-.Sh DESCRIPTION
-The
-.Fn getmntinfo
-function
-returns an array of
-.Fn statfs
-structures describing each currently mounted file system (see
-.Xr statfs 2 ) .
-.Pp
-The
-.Fn getmntinfo
-function
-passes its
-.Fa flags
-argument transparently to
-.Xr getfsstat 2 .
-.Sh RETURN VALUES
-On successful completion,
-.Fn getmntinfo
-returns a count of the number of elements in the array.
-The pointer to the array is stored into
-.Fa mntbufp .
-.Pp
-If an error occurs, zero is returned and the external variable
-.Va errno
-is set to indicate the error.
-Although the pointer
-.Fa mntbufp
-will be unmodified, any information previously returned by
-.Fn getmntinfo
-will be lost.
-.Sh ERRORS
-The
-.Fn getmntinfo
-function
-may fail and set errno for any of the errors specified for the library
-routines
-.Xr getfsstat 2
-or
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr getfsstat 2 ,
-.Xr mount 2 ,
-.Xr statfs 2 ,
-.Xr mount 8
-.Sh HISTORY
-The
-.Fn getmntinfo
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The
-.Fn getmntinfo
-function writes the array of structures to an internal static object
-and returns
-a pointer to that object.
-Subsequent calls to
-.Fn getmntinfo
-will modify the same object.
-.Pp
-The memory allocated by
-.Fn getmntinfo
-cannot be
-.Xr free 3 Ns 'd
-by the application.
diff --git a/lib/libc_bsd/gen/getmntinfo.c b/lib/libc_bsd/gen/getmntinfo.c
deleted file mode 100644
index fecc2cf..0000000
--- a/lib/libc_bsd/gen/getmntinfo.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getmntinfo.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getmntinfo.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-#include <stdlib.h>
-
-/*
- * Return information about mounted filesystems.
- */
-int
-getmntinfo(mntbufp, flags)
-	struct statfs **mntbufp;
-	int flags;
-{
-	static struct statfs *mntbuf;
-	static int mntsize;
-	static long bufsize;
-
-	if (mntsize <= 0 && (mntsize = getfsstat(0, 0, MNT_NOWAIT)) < 0)
-		return (0);
-	if (bufsize > 0 && (mntsize = getfsstat(mntbuf, bufsize, flags)) < 0)
-		return (0);
-	while (bufsize <= mntsize * sizeof(struct statfs)) {
-		if (mntbuf)
-			free(mntbuf);
-		bufsize = (mntsize + 1) * sizeof(struct statfs);
-		if ((mntbuf = (struct statfs *)malloc(bufsize)) == 0)
-			return (0);
-		if ((mntsize = getfsstat(mntbuf, bufsize, flags)) < 0)
-			return (0);
-	}
-	*mntbufp = mntbuf;
-	return (mntsize);
-}
diff --git a/lib/libc_bsd/gen/getnetgrent.3 b/lib/libc_bsd/gen/getnetgrent.3
deleted file mode 100644
index 0f8034b..0000000
--- a/lib/libc_bsd/gen/getnetgrent.3
+++ /dev/null
@@ -1,131 +0,0 @@
-.\" Copyright (c) 1992, 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.
-.\" 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.
-.\"
-.\"     @(#)getnetgrent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getnetgrent.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt GETNETGRENT 3
-.Os
-.Sh NAME
-.Nm getnetgrent ,
-.Nm innetgr ,
-.Nm setnetgrent ,
-.Nm endnetgrent
-.Nd netgroup database operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft int
-.Fn getnetgrent "char **host" "char **user" "char **domain"
-.Ft int
-.Fn innetgr "const char *netgroup" "const char *host" "const char *user" "const char *domain"
-.Ft void
-.Fn setnetgrent "const char *netgroup"
-.Ft void
-.Fn endnetgrent void
-.Sh DESCRIPTION
-These functions operate on the netgroup database file
-.Pa /etc/netgroup
-which is described
-in
-.Xr netgroup 5 .
-The database defines a set of netgroups, each made up of one or more triples:
-.Bd -literal -offset indent
-(host, user, domain)
-.Ed
-that defines a combination of host, user and domain.
-Any of the three fields may be specified as ``wildcards'' that match any
-string.
-.Pp
-The function
-.Fn getnetgrent
-sets the three pointer arguments to the strings of the next member of the
-current netgroup.
-If any of the string pointers are
-.Sy (char *)0
-that field is considered a wildcard.
-.Pp
-The functions
-.Fn setnetgrent
-and
-.Fn endnetgrent
-set the current netgroup and terminate the current netgroup respectively.
-If
-.Fn setnetgrent
-is called with a different netgroup than the previous call, an implicit
-.Fn endnetgrent
-is implied.
-The
-.Fn setnetgrent
-function
-also sets the offset to the first member of the netgroup.
-.Pp
-The function
-.Fn innetgr
-searches for a match of all fields within the specified group.
-If any of the
-.Sy host ,
-.Sy user ,
-or
-.Sy domain
-arguments are
-.Sy (char *)0
-those fields will match any string value in the netgroup member.
-.Sh RETURN VALUES
-The function
-.Fn getnetgrent
-returns 0 for ``no more netgroup members'' and 1 otherwise.
-The function
-.Fn innetgr
-returns 1 for a successful match and 0 otherwise.
-The functions
-.Fn setnetgrent
-and
-.Fn endnetgrent
-have no return value.
-.Sh FILES
-.Bl -tag -width /etc/netgroup -compact
-.It Pa /etc/netgroup
-netgroup database file
-.El
-.Sh COMPATIBILITY
-The netgroup members have three string fields to maintain compatibility
-with other vendor implementations, however it is not obvious what use the
-.Sy domain
-string has within
-.Bx .
-.Sh SEE ALSO
-.Xr netgroup 5
-.Sh BUGS
-The function
-.Fn getnetgrent
-returns pointers to dynamically allocated data areas that are freed when
-the function
-.Fn endnetgrent
-is called.
diff --git a/lib/libc_bsd/gen/getnetgrent.c b/lib/libc_bsd/gen/getnetgrent.c
deleted file mode 100644
index e2f9ec5..0000000
--- a/lib/libc_bsd/gen/getnetgrent.c
+++ /dev/null
@@ -1,658 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Rick Macklem at The University of Guelph.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetgrent.c	8.2 (Berkeley) 4/27/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getnetgrent.c 244092 2012-12-10 17:56:51Z jilles $");
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifdef YP
-/*
- * Notes:
- * We want to be able to use NIS netgroups properly while retaining
- * the ability to use a local /etc/netgroup file. Unfortunately, you
- * can't really do both at the same time - at least, not efficiently.
- * NetBSD deals with this problem by creating a netgroup database
- * using Berkeley DB (just like the password database) that allows
- * for lookups using netgroup, netgroup.byuser or netgroup.byhost
- * searches. This is a neat idea, but I don't have time to implement
- * something like that now. (I think ultimately it would be nice
- * if we DB-fied the group and netgroup stuff all in one shot, but
- * for now I'm satisfied just to have something that works well
- * without requiring massive code changes.)
- * 
- * Therefore, to still permit the use of the local file and maintain
- * optimum NIS performance, we allow for the following conditions:
- *
- * - If /etc/netgroup does not exist and NIS is turned on, we use
- *   NIS netgroups only.
- *
- * - If /etc/netgroup exists but is empty, we use NIS netgroups
- *   only.
- *
- * - If /etc/netgroup exists and contains _only_ a '+', we use
- *   NIS netgroups only.
- *
- * - If /etc/netgroup exists, contains locally defined netgroups
- *   and a '+', we use a mixture of NIS and the local entries.
- *   This method should return the same NIS data as just using
- *   NIS alone, but it will be slower if the NIS netgroup database
- *   is large (innetgr() in particular will suffer since extra
- *   processing has to be done in order to determine memberships
- *   using just the raw netgroup data).
- *
- * - If /etc/netgroup exists and contains only locally defined
- *   netgroup entries, we use just those local entries and ignore
- *   NIS (this is the original, pre-NIS behavior).
- */
-
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/errno.h>
-static char *_netgr_yp_domain;
-int _use_only_yp;
-static int _netgr_yp_enabled;
-static int _yp_innetgr;
-#endif
-
-#ifndef _PATH_NETGROUP
-#define _PATH_NETGROUP "/etc/netgroup"
-#endif
-
-/*
- * Static Variables and functions used by setnetgrent(), getnetgrent() and
- * endnetgrent().
- * There are two linked lists:
- * - linelist is just used by setnetgrent() to parse the net group file via.
- *   parse_netgrp()
- * - netgrp is the list of entries for the current netgroup
- */
-struct linelist {
-	struct linelist	*l_next;	/* Chain ptr. */
-	int		l_parsed;	/* Flag for cycles */
-	char		*l_groupname;	/* Name of netgroup */
-	char		*l_line;	/* Netgroup entrie(s) to be parsed */
-};
-
-struct netgrp {
-	struct netgrp	*ng_next;	/* Chain ptr */
-	char		*ng_str[3];	/* Field pointers, see below */
-};
-#define NG_HOST		0	/* Host name */
-#define NG_USER		1	/* User name */
-#define NG_DOM		2	/* and Domain name */
-
-static struct linelist	*linehead = (struct linelist *)0;
-static struct netgrp	*nextgrp = (struct netgrp *)0;
-static struct {
-	struct netgrp	*gr;
-	char		*grname;
-} grouphead = {
-	(struct netgrp *)0,
-	(char *)0,
-};
-static FILE *netf = (FILE *)0;
-
-static int parse_netgrp(const char *);
-static struct linelist *read_for_group(const char *);
-void setnetgrent(const char *);
-void endnetgrent(void);
-int getnetgrent(char **, char **, char **);
-int innetgr(const char *, const char *, const char *, const char *);
-
-#define	LINSIZ	1024	/* Length of netgroup file line */
-
-/*
- * setnetgrent()
- * Parse the netgroup file looking for the netgroup and build the list
- * of netgrp structures. Let parse_netgrp() and read_for_group() do
- * most of the work.
- */
-void
-setnetgrent(const char *group)
-{
-#ifdef YP
-	struct stat _yp_statp;
-	char _yp_plus;
-#endif
-
-	/* Sanity check */
-
-	if (group == NULL || !strlen(group))
-		return;
-
-	if (grouphead.gr == NULL || strcmp(group, grouphead.grname)) {
-		endnetgrent();
-#ifdef YP
-		/* Presumed guilty until proven innocent. */
-		_use_only_yp = 0;
-		/*
-		 * If /etc/netgroup doesn't exist or is empty,
-		 * use NIS exclusively.
-		 */
-		if (((stat(_PATH_NETGROUP, &_yp_statp) < 0) &&
-		    errno == ENOENT) || _yp_statp.st_size == 0)
-			_use_only_yp = _netgr_yp_enabled = 1;
-		if ((netf = fopen(_PATH_NETGROUP,"re")) != NULL ||_use_only_yp){
-		/*
-		 * Icky: grab the first character of the netgroup file
-		 * and turn on NIS if it's a '+'. rewind the stream
-		 * afterwards so we don't goof up read_for_group() later.
-		 */
-			if (netf) {
-				fscanf(netf, "%c", &_yp_plus);
-				rewind(netf);
-				if (_yp_plus == '+')
-					_use_only_yp = _netgr_yp_enabled = 1;
-			}
-		/*
-		 * If we were called specifically for an innetgr()
-		 * lookup and we're in NIS-only mode, short-circuit
-		 * parse_netgroup() and cut directly to the chase.
-		 */
-			if (_use_only_yp && _yp_innetgr) {
-				/* dohw! */
-				if (netf != NULL)
-					fclose(netf);
-				return;
-			}
-#else
-		if ((netf = fopen(_PATH_NETGROUP, "re"))) {
-#endif
-			if (parse_netgrp(group))
-				endnetgrent();
-			else {
-				grouphead.grname = strdup(group);
-			}
-			if (netf)
-				fclose(netf);
-		}
-	}
-	nextgrp = grouphead.gr;
-}
-
-/*
- * Get the next netgroup off the list.
- */
-int
-getnetgrent(char **hostp, char **userp, char **domp)
-{
-#ifdef YP
-	_yp_innetgr = 0;
-#endif
-
-	if (nextgrp) {
-		*hostp = nextgrp->ng_str[NG_HOST];
-		*userp = nextgrp->ng_str[NG_USER];
-		*domp = nextgrp->ng_str[NG_DOM];
-		nextgrp = nextgrp->ng_next;
-		return (1);
-	}
-	return (0);
-}
-
-/*
- * endnetgrent() - cleanup
- */
-void
-endnetgrent(void)
-{
-	struct linelist *lp, *olp;
-	struct netgrp *gp, *ogp;
-
-	lp = linehead;
-	while (lp) {
-		olp = lp;
-		lp = lp->l_next;
-		free(olp->l_groupname);
-		free(olp->l_line);
-		free(olp);
-	}
-	linehead = NULL;
-	if (grouphead.grname) {
-		free(grouphead.grname);
-		grouphead.grname = NULL;
-	}
-	gp = grouphead.gr;
-	while (gp) {
-		ogp = gp;
-		gp = gp->ng_next;
-		free(ogp->ng_str[NG_HOST]);
-		free(ogp->ng_str[NG_USER]);
-		free(ogp->ng_str[NG_DOM]);
-		free(ogp);
-	}
-	grouphead.gr = NULL;
-	nextgrp = NULL;
-#ifdef YP
-	_netgr_yp_enabled = 0;
-#endif
-}
-
-#ifdef YP
-static int
-_listmatch(const char *list, const char *group, int len)
-{
-	const char *ptr = list;
-	const char *cptr;
-	int glen = strlen(group);
-
-	/* skip possible leading whitespace */
-	while (isspace((unsigned char)*ptr))
-		ptr++;
-
-	while (ptr < list + len) {
-		cptr = ptr;
-		while(*ptr != ','  && *ptr != '\0' && !isspace((unsigned char)*ptr))
-			ptr++;
-		if (strncmp(cptr, group, glen) == 0 && glen == (ptr - cptr))
-			return (1);
-		while (*ptr == ','  || isspace((unsigned char)*ptr))
-			ptr++;
-	}
-
-	return (0);
-}
-
-static int
-_revnetgr_lookup(char* lookupdom, char* map, const char* str,
-		 const char* dom, const char* group)
-{
-	int y, rv, rot;
-	char key[MAXHOSTNAMELEN];
-	char *result;
-	int resultlen;
-
-	for (rot = 0; ; rot++) {
-		switch (rot) {
-		case 0:
-			snprintf(key, MAXHOSTNAMELEN, "%s.%s", str,
-			    dom ? dom : lookupdom);
-			break;
-		case 1:
-			snprintf(key, MAXHOSTNAMELEN, "%s.*", str);
-			break;
-		case 2:
-			snprintf(key, MAXHOSTNAMELEN, "*.%s",
-			    dom ? dom : lookupdom);
-			break;
-		case 3:
-			snprintf(key, MAXHOSTNAMELEN, "*.*");
-			break;
-		default:
-			return (0);
-		}
-		y = yp_match(lookupdom, map, key, strlen(key), &result,
-		    &resultlen);
-		if (y == 0) {
-			rv = _listmatch(result, group, resultlen);
-			free(result);
-			if (rv)
-				return (1);
-		} else if (y != YPERR_KEY) {
-			/*
-			 * If we get an error other than 'no
-			 * such key in map' then something is
-			 * wrong and we should stop the search.
-			 */
-			return (-1);
-		}
-	}
-}
-#endif
-
-/*
- * Search for a match in a netgroup.
- */
-int
-innetgr(const char *group, const char *host, const char *user, const char *dom)
-{
-	char *hst, *usr, *dm;
-	/* Sanity check */
-	
-	if (group == NULL || !strlen(group))
-		return (0);
-
-#ifdef YP
-	_yp_innetgr = 1;
-#endif
-	setnetgrent(group);
-#ifdef YP
-	_yp_innetgr = 0;
-	/*
-	 * If we're in NIS-only mode, do the search using
-	 * NIS 'reverse netgroup' lookups.
-	 * 
-	 * What happens with 'reverse netgroup' lookups:
-	 * 
-	 * 1) try 'reverse netgroup' lookup
-	 *    1.a) if host is specified and user is null:
-	 *         look in netgroup.byhost
-	 *         (try host.domain, host.*, *.domain or *.*)
-	 *         if found, return yes
-	 *    1.b) if user is specified and host is null:
-	 *         look in netgroup.byuser
-	 *         (try host.domain, host.*, *.domain or *.*)
-	 *         if found, return yes
-	 *    1.c) if both host and user are specified,
-	 *         don't do 'reverse netgroup' lookup.  It won't work.
-	 *    1.d) if neither host ane user are specified (why?!?)
-	 *         don't do 'reverse netgroup' lookup either.
-	 * 2) if domain is specified and 'reverse lookup' is done:
-	 *    'reverse lookup' was authoritative.  bye bye.
-	 * 3) otherwise, too bad, try it the slow way.
-	 */
-	if (_use_only_yp && (host == NULL) != (user == NULL)) {
-		int ret;
-		if(yp_get_default_domain(&_netgr_yp_domain))
-			return (0);
-		ret = _revnetgr_lookup(_netgr_yp_domain, 
-				      host?"netgroup.byhost":"netgroup.byuser",
-				      host?host:user, dom, group);
-		if (ret == 1)
-			return (1);
-		else if (ret == 0 && dom != NULL)
-			return (0);
-	}
-
-	setnetgrent(group);
-#endif /* YP */
-
-	while (getnetgrent(&hst, &usr, &dm))
-		if ((host == NULL || hst == NULL || !strcmp(host, hst)) &&
-		    (user == NULL || usr == NULL || !strcmp(user, usr)) &&
-		    ( dom == NULL ||  dm == NULL || !strcmp(dom, dm))) {
-			endnetgrent();
-			return (1);
-		}
-	endnetgrent();
-	return (0);
-}
-
-/*
- * Parse the netgroup file setting up the linked lists.
- */
-static int
-parse_netgrp(const char *group)
-{
-	struct netgrp *grp;
-	struct linelist *lp = linehead;
-	char **ng;
-	char *epos, *gpos, *pos, *spos;
-	int freepos, len, strpos;
-#ifdef DEBUG
-	int fields;
-#endif
-
-	/*
-	 * First, see if the line has already been read in.
-	 */
-	while (lp) {
-		if (!strcmp(group, lp->l_groupname))
-			break;
-		lp = lp->l_next;
-	}
-	if (lp == NULL && (lp = read_for_group(group)) == NULL)
-		return (1);
-	if (lp->l_parsed) {
-#ifdef DEBUG
-		/*
-		 * This error message is largely superflous since the
-		 * code handles the error condition sucessfully, and
-		 * spewing it out from inside libc can actually hose
-		 * certain programs.
-		 */
-		fprintf(stderr, "Cycle in netgroup %s\n", lp->l_groupname);
-#endif
-		return (1);
-	} else
-		lp->l_parsed = 1;
-	pos = lp->l_line;
-	/* Watch for null pointer dereferences, dammit! */
-	while (pos != NULL && *pos != '\0') {
-		if (*pos == '(') {
-			grp = malloc(sizeof(*grp));
-			if (grp == NULL)
-				return (1);
-			ng = grp->ng_str;
-			bzero(grp, sizeof(*grp));
-			pos++;
-			gpos = strsep(&pos, ")");
-#ifdef DEBUG
-			fields = 0;
-#endif
-			for (strpos = 0; strpos < 3; strpos++) {
-				if ((spos = strsep(&gpos, ",")) == NULL) {
-					/*
-					 * All other systems I've tested
-					 * return NULL for empty netgroup
-					 * fields. It's up to user programs
-					 * to handle the NULLs appropriately.
-					 */
-					ng[strpos] = NULL;
-					continue;
-				}
-#ifdef DEBUG
-				fields++;
-#endif
-				while (*spos == ' ' || *spos == '\t')
-					spos++;
-				if ((epos = strpbrk(spos, " \t"))) {
-					*epos = '\0';
-					len = epos - spos;
-				} else
-					len = strlen(spos);
-				if (len <= 0)
-					continue;
-				ng[strpos] = malloc(len + 1);
-				if (ng[strpos] == NULL) {
-					for (freepos = 0; freepos < strpos;
-					    freepos++)
-						free(ng[freepos]);
-					free(grp);
-					return (1);
-				}
-				bcopy(spos, ng[strpos], len + 1);
-			}
-			grp->ng_next = grouphead.gr;
-			grouphead.gr = grp;
-#ifdef DEBUG
-			/*
-			 * Note: on other platforms, malformed netgroup
-			 * entries are not normally flagged. While we
-			 * can catch bad entries and report them, we should
-			 * stay silent by default for compatibility's sake.
-			 */
-			if (fields < 3) {
-				fprintf(stderr,
-				"Bad entry (%s%s%s%s%s) in netgroup \"%s\"\n",
-				    ng[NG_HOST] == NULL ? "" : ng[NG_HOST],
-				    ng[NG_USER] == NULL ? "" : ",",
-				    ng[NG_USER] == NULL ? "" : ng[NG_USER],
-				    ng[NG_DOM] == NULL ? "" : ",",
-				    ng[NG_DOM] == NULL ? "" : ng[NG_DOM],
-				    lp->l_groupname);
-#endif
-		} else {
-			spos = strsep(&pos, ", \t");
-			if (parse_netgrp(spos))
-				continue;
-		}
-		if (pos == NULL)
-			break;
-		while (*pos == ' ' || *pos == ',' || *pos == '\t')
-			pos++;
-	}
-	return (0);
-}
-
-/*
- * Read the netgroup file and save lines until the line for the netgroup
- * is found. Return 1 if eof is encountered.
- */
-static struct linelist *
-read_for_group(const char *group)
-{
-	char *linep, *olinep, *pos, *spos;
-	int len, olen;
-	int cont;
-	struct linelist *lp;
-	char line[LINSIZ + 2];
-#ifdef YP
-	char *result;
-	int resultlen;
-	linep = NULL;
-
-	while (_netgr_yp_enabled || fgets(line, LINSIZ, netf) != NULL) {
-		if (_netgr_yp_enabled) {
-			if(!_netgr_yp_domain)
-				if(yp_get_default_domain(&_netgr_yp_domain))
-					continue;
-			if (yp_match(_netgr_yp_domain, "netgroup", group,
-			    strlen(group), &result, &resultlen)) {
-				free(result);
-				if (_use_only_yp)
-					return ((struct linelist *)0);
-				else {
-					_netgr_yp_enabled = 0;
-					continue;
-				}
-			}
-			snprintf(line, LINSIZ, "%s %s", group, result);
-			free(result);
-		}
-#else
-	linep = NULL;
-	while (fgets(line, LINSIZ, netf) != NULL) {
-#endif
-		pos = (char *)&line;
-#ifdef YP
-		if (*pos == '+') {
-			_netgr_yp_enabled = 1;
-			continue;
-		}
-#endif
-		if (*pos == '#')
-			continue;
-		while (*pos == ' ' || *pos == '\t')
-			pos++;
-		spos = pos;
-		while (*pos != ' ' && *pos != '\t' && *pos != '\n' &&
-			*pos != '\0')
-			pos++;
-		len = pos - spos;
-		while (*pos == ' ' || *pos == '\t')
-			pos++;
-		if (*pos != '\n' && *pos != '\0') {
-			lp = (struct linelist *)malloc(sizeof (*lp));
-			if (lp == NULL) 
-				return (NULL);
-			lp->l_parsed = 0;
-			lp->l_groupname = (char *)malloc(len + 1);
-			if (lp->l_groupname == NULL) {
-				free(lp);
-				return (NULL);
-			}
-			bcopy(spos, lp->l_groupname, len);
-			*(lp->l_groupname + len) = '\0';
-			len = strlen(pos);
-			olen = 0;
-
-			/*
-			 * Loop around handling line continuations.
-			 */
-			do {
-				if (*(pos + len - 1) == '\n')
-					len--;
-				if (*(pos + len - 1) == '\\') {
-					len--;
-					cont = 1;
-				} else
-					cont = 0;
-				if (len > 0) {
-					linep = malloc(olen + len + 1);
-					if (linep == NULL) {
-						free(lp->l_groupname);
-						free(lp);
-						return (NULL);
-					}
-					if (olen > 0) {
-						bcopy(olinep, linep, olen);
-						free(olinep);
-					}
-					bcopy(pos, linep + olen, len);
-					olen += len;
-					*(linep + olen) = '\0';
-					olinep = linep;
-				}
-				if (cont) {
-					if (fgets(line, LINSIZ, netf)) {
-						pos = line;
-						len = strlen(pos);
-					} else
-						cont = 0;
-				}
-			} while (cont);
-			lp->l_line = linep;
-			lp->l_next = linehead;
-			linehead = lp;
-
-			/*
-			 * If this is the one we wanted, we are done.
-			 */
-			if (!strcmp(lp->l_groupname, group))
-				return (lp);
-		}
-	}
-#ifdef YP
-	/*
-	 * Yucky. The recursive nature of this whole mess might require
-	 * us to make more than one pass through the netgroup file.
-	 * This might be best left outside the #ifdef YP, but YP is
-	 * defined by default anyway, so I'll leave it like this
-	 * until I know better.
-	 */
-	rewind(netf);
-#endif
-	return (NULL);
-}
diff --git a/lib/libc_bsd/gen/getosreldate.3 b/lib/libc_bsd/gen/getosreldate.3
deleted file mode 100644
index b897078..0000000
--- a/lib/libc_bsd/gen/getosreldate.3
+++ /dev/null
@@ -1,86 +0,0 @@
-.\" Copyright (c) 2002 The FreeBSD Project.
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/getosreldate.3 183495 2008-09-30 11:25:55Z kib $
-.\"
-.Dd September 30, 2008
-.Dt GETOSRELDATE 3
-.Os
-.Sh NAME
-.Nm getosreldate
-.Nd get the value of
-.Dv __FreeBSD_version
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getosreldate void
-.Sh DESCRIPTION
-The
-.Fn getosreldate
-function returns an integer showing the version of the
-currently running
-.Fx
-kernel.
-Definitions of the values can be found in
-.%B "The Porter's Handbook"
-which is usually installed at
-.Pa /usr/share/doc/en_US.ISO8859-1/books/porters-handbook/ .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn getosreldate
-returns the value requested;
-otherwise the value \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ENVIRONMENT
-.Bl -tag -width ".Ev OSVERSION"
-.It Ev OSVERSION
-If the environment variable
-.Ev OSVERSION
-is set, it will override the
-.Fn getosreldate
-return value.
-.El
-.Sh EXAMPLES
-An example can be found in
-.Pa /usr/share/examples/FreeBSD_version .
-.Sh ERRORS
-The
-.Fn getosreldate
-function may fail and set
-.Va errno
-for any of the errors specified for the library function
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Rs
-.%B "The Porter's Handbook"
-.%O /usr/share/doc/en_US.ISO8859-1/books/porters\-handbook/
-.Re
-.Sh HISTORY
-The
-.Fn getosreldate
-function appeared in
-.Fx 2.0 .
diff --git a/lib/libc_bsd/gen/getosreldate.c b/lib/libc_bsd/gen/getosreldate.c
deleted file mode 100644
index 9e046b0..0000000
--- a/lib/libc_bsd/gen/getosreldate.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostid.c	8.1 (Berkeley) 6/2/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getosreldate.c 228492 2011-12-14 08:35:08Z ru $");
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-
-int
-getosreldate(void)
-{
-	int mib[2];
-	size_t size;
-	int value;
-	char *temp;
-
-	if ((temp = getenv("OSVERSION"))) {
-		value = atoi(temp);
-		return (value);
-	}
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_OSRELDATE;
-	size = sizeof value;
-	if (sysctl(mib, 2, &value, &size, NULL, 0) == -1)
-		return (-1);
-	return (value);
-}
diff --git a/lib/libc_bsd/gen/getpagesize.3 b/lib/libc_bsd/gen/getpagesize.3
deleted file mode 100644
index 3f87244..0000000
--- a/lib/libc_bsd/gen/getpagesize.3
+++ /dev/null
@@ -1,61 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getpagesize.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getpagesize.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt GETPAGESIZE 3
-.Os
-.Sh NAME
-.Nm getpagesize
-.Nd get system page size
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getpagesize void
-.Sh DESCRIPTION
-The
-.Fn getpagesize
-function
-returns the number of bytes in a page.
-Page granularity is the granularity of many of the memory
-management calls.
-.Pp
-The page size is a system
-page size and may not be the same as the underlying
-hardware page size.
-.Sh SEE ALSO
-.Xr pagesize 1 ,
-.Xr sbrk 2
-.Sh HISTORY
-The
-.Fn getpagesize
-function appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/gen/getpagesize.c b/lib/libc_bsd/gen/getpagesize.c
deleted file mode 100644
index 0bee0ff..0000000
--- a/lib/libc_bsd/gen/getpagesize.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getpagesize.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getpagesize.c 211416 2010-08-17 09:13:26Z kib $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <link.h>
-#include <unistd.h>
-
-#include "libc_private.h"
-
-/*
- * This is unlikely to change over the running time of any
- * program, so we cache the result to save some syscalls.
- *
- * NB: This function may be called from malloc(3) at initialization
- * NB: so must not result in a malloc(3) related call!
- */
-
-int
-getpagesize()
-{
-	int mib[2]; 
-	static int value;
-	size_t size;
-	int error;
-
-	if (value != 0)
-		return (value);
-
-	error = _elf_aux_info(AT_PAGESZ, &value, sizeof(value));
-	if (error == 0 && value != 0)
-		return (value);
-
-	mib[0] = CTL_HW;
-	mib[1] = HW_PAGESIZE;
-	size = sizeof value;
-	if (sysctl(mib, 2, &value, &size, NULL, 0) == -1)
-		return (-1);
-
-	return (value);
-}
diff --git a/lib/libc_bsd/gen/getpagesizes.3 b/lib/libc_bsd/gen/getpagesizes.3
deleted file mode 100644
index 7eaeeb6..0000000
--- a/lib/libc_bsd/gen/getpagesizes.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/getpagesizes.3 233648 2012-03-29 05:02:12Z eadler $
-.\"
-.Dd September 21, 2009
-.Dt GETPAGESIZES 3
-.Os
-.Sh NAME
-.Nm getpagesizes
-.Nd "get system page sizes"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn getpagesizes "size_t pagesize[]" "int nelem"
-.Sh DESCRIPTION
-The
-.Fn getpagesizes
-function retrieves page size information from the system.
-When it is called with
-.Fa pagesize
-specified as
-.Dv NULL
-and
-.Fa nelem
-specified as 0, it returns the number of distinct page sizes that are
-supported by the system.
-Otherwise, it assigns up to
-.Fa nelem
-of the system-supported page sizes to consecutive elements of the
-array referenced by
-.Fa pagesize .
-These page sizes are expressed in bytes.
-In this case,
-.Fn getpagesizes
-returns the number of such page sizes that it assigned to the array.
-.Sh RETURN VALUES
-If successful, the
-.Fn getpagesizes
-function returns either the number of page sizes that are supported by
-the system or the number of supported page sizes that it assigned to
-the array referenced by
-.Fa pagesize .
-Otherwise, it returns the value\~\-1 and sets
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn getpagesizes
-function will succeed unless:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa pagesize
-argument is
-.Dv NULL
-and the
-.Fa nelem
-argument is non-zero.
-.It Bq Er EINVAL
-The
-.Fa nelem
-argument is less than zero.
-.El
-.Sh SEE ALSO
-.Xr getpagesize 3
-.Sh HISTORY
-The
-.Fn getpagesizes
-function first appeared in Solaris 9.
-This manual page was written in conjunction with a new but compatible
-implementation that was first released in
-.Fx 7.3 .
-.Sh AUTHORS
-This manual page was written by
-.An Alan L. Cox Aq alc@cs.rice.edu .
diff --git a/lib/libc_bsd/gen/getpagesizes.c b/lib/libc_bsd/gen/getpagesizes.c
deleted file mode 100644
index 05e9c2e..0000000
--- a/lib/libc_bsd/gen/getpagesizes.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 2009 Alan L. Cox <alc@cs.rice.edu>
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getpagesizes.c 211416 2010-08-17 09:13:26Z kib $");
-
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <link.h>
-
-#include "libc_private.h"
-
-/*
- * Retrieves page size information from the system.  Specifically, returns the
- * number of distinct page sizes that are supported by the system, if
- * "pagesize" is NULL and "nelem" is 0.  Otherwise, assigns up to "nelem" of
- * the system-supported page sizes to consecutive elements of the array
- * referenced by "pagesize", and returns the number of such page sizes that it
- * assigned to the array.  These page sizes are expressed in bytes.
- *
- * The implementation of this function does not directly or indirectly call
- * malloc(3) or any other dynamic memory allocator that may itself call this
- * function.
- */
-int
-getpagesizes(size_t pagesize[], int nelem)
-{
-	static u_long ps[MAXPAGESIZES];
-	static int nops;
-	size_t size;
-	int error, i;
-
-	if (nelem < 0 || (nelem > 0 && pagesize == NULL)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	/* Cache the result of the sysctl(2). */
-	if (nops == 0) {
-		error = _elf_aux_info(AT_PAGESIZES, ps, sizeof(ps));
-		size = sizeof(ps);
-		if (error != 0 || ps[0] == 0) {
-			if (sysctlbyname("hw.pagesizes", ps, &size, NULL, 0)
-			    == -1)
-				return (-1);
-		}
-		/* Count the number of page sizes that are supported. */
-		nops = size / sizeof(ps[0]);
-		while (nops > 0 && ps[nops - 1] == 0)
-			nops--;
-	}
-	if (pagesize == NULL)
-		return (nops);
-	/* Return up to "nelem" page sizes from the cached result. */
-	if (nelem > nops)
-		nelem = nops;
-	for (i = 0; i < nelem; i++)
-		pagesize[i] = ps[i];
-	return (nelem);
-}
diff --git a/lib/libc_bsd/gen/getpass.3 b/lib/libc_bsd/gen/getpass.3
deleted file mode 100644
index 9699ce3..0000000
--- a/lib/libc_bsd/gen/getpass.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getpass.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getpass.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt GETPASS 3
-.Os
-.Sh NAME
-.Nm getpass
-.Nd get a password
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In pwd.h
-.In unistd.h
-.Ft char *
-.Fn getpass "const char *prompt"
-.Sh DESCRIPTION
-The
-.Fn getpass
-function displays a prompt to, and reads in a password from,
-.Pa /dev/tty .
-If this file is not accessible,
-.Fn getpass
-displays the prompt on the standard error output and reads from the standard
-input.
-.Pp
-The password may be up to _PASSWORD_LEN (currently 128)
-characters in length.
-Any additional
-characters and the terminating newline character are discarded.
-.Pp
-The
-.Fn getpass
-function turns off character echoing while reading the password.
-.Sh RETURN VALUES
-The
-.Fn getpass
-function returns a pointer to the null terminated password.
-.Sh FILES
-.Bl -tag -width /dev/tty -compact
-.It Pa /dev/tty
-.El
-.Sh SEE ALSO
-.Xr crypt 3 ,
-.Xr readpassphrase 3
-.Sh HISTORY
-A
-.Fn getpass
-function appeared in
-.At v7 .
-.Sh BUGS
-The
-.Fn getpass
-function leaves its result in an internal static object and returns
-a pointer to that object.
-Subsequent calls to
-.Fn getpass
-will modify the same object.
-.Pp
-The calling process should zero the password as soon as possible to
-avoid leaving the cleartext password visible in the process's address
-space.
-.Pp
-Upon receipt of a SIGTSTP, the input buffer will be flushed, so any
-partially typed password must be retyped when the process
-continues.
diff --git a/lib/libc_bsd/gen/getpeereid.3 b/lib/libc_bsd/gen/getpeereid.3
deleted file mode 100644
index 9439916..0000000
--- a/lib/libc_bsd/gen/getpeereid.3
+++ /dev/null
@@ -1,137 +0,0 @@
-.\"
-.\" Copyright (c) 2001 Dima Dorfman.
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/getpeereid.3 108030 2002-12-18 10:13:54Z ru $
-.\"
-.Dd July 15, 2001
-.Dt GETPEEREID 3
-.Os
-.Sh NAME
-.Nm getpeereid
-.Nd get the effective credentials of a UNIX-domain peer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft int
-.Fn getpeereid "int s" "uid_t *euid" "gid_t *egid"
-.Sh DESCRIPTION
-The
-.Fn getpeereid
-function returns the effective user and group IDs of the
-peer connected to a
-.Ux Ns -domain
-socket.
-The argument
-.Fa s
-must be a
-.Ux Ns -domain
-socket
-.Pq Xr unix 4
-of type
-.Dv SOCK_STREAM
-on which either
-.Xr connect 2
-or
-.Xr listen 2
-have been called.
-The effective used ID is placed in
-.Fa euid ,
-and the effective group ID in
-.Fa egid .
-.Pp
-The credentials returned to the
-.Xr listen 2
-caller are those of its peer at the time it called
-.Xr connect 2 ;
-the credentials returned to the
-.Xr connect 2
-caller are those of its peer at the time it called
-.Xr listen 2 .
-This mechanism is reliable; there is no way for either side to influence
-the credentials returned to its peer except by calling the appropriate
-system call (i.e., either
-.Xr connect 2
-or
-.Xr listen 2 )
-under different effective credentials.
-.Pp
-One common use of this routine is for a
-.Ux Ns -domain
-server
-to verify the credentials of its client.
-Likewise, the client can verify the credentials of the server.
-.Sh IMPLEMENTATION NOTES
-On
-.Fx ,
-.Fn getpeereid
-is implemented in terms of the
-.Dv LOCAL_PEERCRED
-.Xr unix 4
-socket option.
-.Sh RETURN VALUES
-.Rv -std getpeereid
-.Sh ERRORS
-The
-.Fn getpeereid
-function
-fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.It Bq Er ENOTCONN
-The argument
-.Fa s
-does not refer to a socket on which
-.Xr connect 2
-or
-.Xr listen 2
-have been called.
-.It Bq Er EINVAL
-The argument
-.Fa s
-does not refer to a socket of type
-.Dv SOCK_STREAM ,
-or the kernel returned invalid data.
-.El
-.Sh SEE ALSO
-.Xr connect 2 ,
-.Xr getpeername 2 ,
-.Xr getsockname 2 ,
-.Xr getsockopt 2 ,
-.Xr listen 2 ,
-.Xr unix 4
-.Sh HISTORY
-The
-.Fn getpeereid
-function appeared in
-.Fx 4.6 .
diff --git a/lib/libc_bsd/gen/getpeereid.c b/lib/libc_bsd/gen/getpeereid.c
deleted file mode 100644
index 41849b6..0000000
--- a/lib/libc_bsd/gen/getpeereid.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2001 Dima Dorfman.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getpeereid.c 107929 2002-12-16 13:42:13Z maxim $");
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/ucred.h>
-#include <sys/un.h>
-
-#include <errno.h>
-#include <unistd.h>
-
-int
-getpeereid(int s, uid_t *euid, gid_t *egid)
-{
-	struct xucred xuc;
-	socklen_t xuclen;
-	int error;
-
-	xuclen = sizeof(xuc);
-	error = getsockopt(s, 0, LOCAL_PEERCRED, &xuc, &xuclen);
-	if (error != 0)
-		return (error);
-	if (xuc.cr_version != XUCRED_VERSION)
-		return (EINVAL);
-	*euid = xuc.cr_uid;
-	*egid = xuc.cr_gid;
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/getprogname.3 b/lib/libc_bsd/gen/getprogname.3
deleted file mode 100644
index dd26ddb..0000000
--- a/lib/libc_bsd/gen/getprogname.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"
-.\" Copyright (c) 2001 Christopher G. Demetriou
-.\" 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 for the
-.\"          NetBSD Project.  See http://www.netbsd.org/ for
-.\"          information about NetBSD.
-.\" 4. 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 ``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 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: releng/10.2/lib/libc/gen/getprogname.3 84306 2001-10-01 16:09:29Z ru $
-.\"
-.Dd May 1, 2001
-.Dt GETPROGNAME 3
-.Os
-.Sh NAME
-.Nm getprogname ,
-.Nm setprogname
-.Nd get or set the program name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft const char *
-.Fn getprogname "void"
-.Ft void
-.Fn setprogname "const char *progname"
-.Sh DESCRIPTION
-The
-.Fn getprogname
-and
-.Fn setprogname
-functions manipulate the name of the current program.
-They are used by error-reporting routines to produce
-consistent output.
-.Pp
-The
-.Fn getprogname
-function returns the name of the program.
-If the name has not been set yet, it will return
-.Dv NULL .
-.Pp
-The
-.Fn setprogname
-function sets the name of the program to be the last component of the
-.Fa progname
-argument.
-Since a pointer to the given string is kept as the program name,
-it should not be modified for the rest of the program's lifetime.
-.Pp
-In
-.Fx ,
-the name of the program is set by the start-up code that is run before
-.Fn main ;
-thus,
-running
-.Fn setprogname
-is not necessary.
-Programs that desire maximum portability should still call it;
-on another operating system,
-these functions may be implemented in a portability library.
-Calling
-.Fn setprogname
-allows the aforementioned library to learn the program name without
-modifications to the start-up code.
-.Sh SEE ALSO
-.Xr err 3 ,
-.Xr setproctitle 3
-.Sh HISTORY
-These functions first appeared in
-.Nx 1.6 ,
-and made their way into
-.Fx 4.4 .
diff --git a/lib/libc_bsd/gen/getprogname.c b/lib/libc_bsd/gen/getprogname.c
deleted file mode 100644
index 6ed038a..0000000
--- a/lib/libc_bsd/gen/getprogname.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getprogname.c 93399 2002-03-29 22:43:43Z markm $");
-
-#include "namespace.h"
-#include <stdlib.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-__weak_reference(_getprogname, getprogname);
-
-const char *
-_getprogname(void)
-{
-
-	return (__progname);
-}
diff --git a/lib/libc_bsd/gen/getpwent.3 b/lib/libc_bsd/gen/getpwent.3
deleted file mode 100644
index a596f6c..0000000
--- a/lib/libc_bsd/gen/getpwent.3
+++ /dev/null
@@ -1,315 +0,0 @@
-.\" Copyright (c) 1988, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)getpwent.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getpwent.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 16, 2003
-.Dt GETPWENT 3
-.Os
-.Sh NAME
-.Nm getpwent ,
-.Nm getpwent_r ,
-.Nm getpwnam ,
-.Nm getpwnam_r ,
-.Nm getpwuid ,
-.Nm getpwuid_r ,
-.Nm setpassent ,
-.Nm setpwent ,
-.Nm endpwent
-.Nd password database operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In pwd.h
-.Ft struct passwd *
-.Fn getpwent void
-.Ft int
-.Fn getpwent_r "struct passwd *pwd" "char *buffer" "size_t bufsize" "struct passwd **result"
-.Ft struct passwd *
-.Fn getpwnam "const char *login"
-.Ft int
-.Fn getpwnam_r "const char *name" "struct passwd *pwd" "char *buffer" "size_t bufsize" "struct passwd **result"
-.Ft struct passwd *
-.Fn getpwuid "uid_t uid"
-.Ft int
-.Fn getpwuid_r "uid_t uid" "struct passwd *pwd" "char *buffer" "size_t bufsize" "struct passwd **result"
-.Ft int
-.Fn setpassent "int stayopen"
-.Ft void
-.Fn setpwent void
-.Ft void
-.Fn endpwent void
-.Sh DESCRIPTION
-These functions
-operate on the password database file
-which is described
-in
-.Xr passwd 5 .
-Each entry in the database is defined by the structure
-.Vt passwd
-found in the include
-file
-.In pwd.h :
-.Bd -literal -offset indent
-struct passwd {
-	char	*pw_name;	/* user name */
-	char	*pw_passwd;	/* encrypted password */
-	uid_t	pw_uid;		/* user uid */
-	gid_t	pw_gid;		/* user gid */
-	time_t	pw_change;	/* password change time */
-	char	*pw_class;	/* user access class */
-	char	*pw_gecos;	/* Honeywell login info */
-	char	*pw_dir;	/* home directory */
-	char	*pw_shell;	/* default shell */
-	time_t	pw_expire;	/* account expiration */
-	int	pw_fields;	/* internal: fields filled in */
-};
-.Ed
-.Pp
-The functions
-.Fn getpwnam
-and
-.Fn getpwuid
-search the password database for the given login name or user uid,
-respectively, always returning the first one encountered.
-.Pp
-The
-.Fn getpwent
-function
-sequentially reads the password database and is intended for programs
-that wish to process the complete list of users.
-.Pp
-The functions
-.Fn getpwent_r ,
-.Fn getpwnam_r ,
-and
-.Fn getpwuid_r
-are thread-safe versions of
-.Fn getpwent ,
-.Fn getpwnam ,
-and
-.Fn getpwuid ,
-respectively.
-The caller must provide storage for the results of the search in
-the
-.Fa pwd ,
-.Fa buffer ,
-.Fa bufsize ,
-and
-.Fa result
-arguments.
-When these functions are successful, the
-.Fa pwd
-argument will be filled-in, and a pointer to that argument will be
-stored in
-.Fa result .
-If an entry is not found or an error occurs,
-.Fa result
-will be set to
-.Dv NULL .
-.Pp
-The
-.Fn setpassent
-function
-accomplishes two purposes.
-First, it causes
-.Fn getpwent
-to ``rewind'' to the beginning of the database.
-Additionally, if
-.Fa stayopen
-is non-zero, file descriptors are left open, significantly speeding
-up subsequent accesses for all of the routines.
-(This latter functionality is unnecessary for
-.Fn getpwent
-as it does not close its file descriptors by default.)
-.Pp
-It is dangerous for long-running programs to keep the file descriptors
-open as the database will become out of date if it is updated while the
-program is running.
-.Pp
-The
-.Fn setpwent
-function
-is identical to
-.Fn setpassent
-with an argument of zero.
-.Pp
-The
-.Fn endpwent
-function
-closes any open files.
-.Pp
-These routines have been written to ``shadow'' the password file, e.g.\&
-allow only certain programs to have access to the encrypted password.
-If the process which calls them has an effective uid of 0, the encrypted
-password will be returned, otherwise, the password field of the returned
-structure will point to the string
-.Ql * .
-.Sh RETURN VALUES
-The functions
-.Fn getpwent ,
-.Fn getpwnam ,
-and
-.Fn getpwuid
-return a valid pointer to a passwd structure on success
-or
-.Dv NULL
-if the entry is not found or if an error occurs.
-If an error does occur,
-.Va errno
-will be set.
-Note that programs must explicitly set
-.Va errno
-to zero before calling any of these functions if they need to
-distinguish between a non-existent entry and an error.
-The functions
-.Fn getpwent_r ,
-.Fn getpwnam_r ,
-and
-.Fn getpwuid_r
-return 0 if no error occurred, or an error number to indicate failure.
-It is not an error if a matching entry is not found.
-(Thus, if
-.Fa result
-is
-.Dv NULL
-and the return value is 0, no matching entry exists.)
-.Pp
-The
-.Fn setpassent
-function returns 0 on failure and 1 on success.
-The
-.Fn endpwent
-and
-.Fn setpwent
-functions
-have no return value.
-.Sh FILES
-.Bl -tag -width /etc/master.passwd -compact
-.It Pa /etc/pwd.db
-The insecure password database file
-.It Pa /etc/spwd.db
-The secure password database file
-.It Pa /etc/master.passwd
-The current password file
-.It Pa /etc/passwd
-A Version 7 format password file
-.El
-.Sh COMPATIBILITY
-The historic function
-.Xr setpwfile 3 ,
-which allowed the specification of alternate password databases,
-has been deprecated and is no longer available.
-.Sh ERRORS
-These routines may fail for any of the errors specified in
-.Xr open 2 ,
-.Xr dbopen 3 ,
-.Xr socket 2 ,
-and
-.Xr connect 2 ,
-in addition to the following:
-.Bl -tag -width Er
-.It Bq Er ERANGE
-The buffer specified by the
-.Fa buffer
-and
-.Fa bufsize
-arguments was insufficiently sized to store the result.
-The caller should retry with a larger buffer.
-.El
-.Sh SEE ALSO
-.Xr getlogin 2 ,
-.Xr getgrent 3 ,
-.Xr nsswitch.conf 5 ,
-.Xr passwd 5 ,
-.Xr pwd_mkdb 8 ,
-.Xr vipw 8 ,
-.Xr yp 8
-.Sh STANDARDS
-The
-.Fn getpwent ,
-.Fn getpwnam ,
-.Fn getpwnam_r ,
-.Fn getpwuid ,
-.Fn getpwuid_r ,
-.Fn setpwent ,
-and
-.Fn endpwent
-functions conform to
-.St -p1003.1-96 .
-.Sh HISTORY
-The
-.Fn getpwent ,
-.Fn getpwnam ,
-.Fn getpwuid ,
-.Fn setpwent ,
-and
-.Fn endpwent
-functions appeared in
-.At v7 .
-The
-.Fn setpassent
-function appeared in
-.Bx 4.3 Reno .
-The
-.Fn getpwent_r ,
-.Fn getpwnam_r ,
-and
-.Fn getpwuid_r
-functions appeared in
-.Fx 5.1 .
-.Sh BUGS
-The functions
-.Fn getpwent ,
-.Fn getpwnam ,
-and
-.Fn getpwuid ,
-leave their results in an internal static object and return
-a pointer to that object.
-Subsequent calls to
-the same function
-will modify the same object.
-.Pp
-The functions
-.Fn getpwent ,
-.Fn getpwent_r ,
-.Fn endpwent ,
-.Fn setpassent ,
-and
-.Fn setpwent
-are fairly useless in a networked environment and should be
-avoided, if possible.
-The
-.Fn getpwent
-and
-.Fn getpwent_r
-functions
-make no attempt to suppress duplicate information if multiple
-sources are specified in
-.Xr nsswitch.conf 5 .
diff --git a/lib/libc_bsd/gen/getpwent.c b/lib/libc_bsd/gen/getpwent.c
deleted file mode 100644
index c1f9b82..0000000
--- a/lib/libc_bsd/gen/getpwent.c
+++ /dev/null
@@ -1,2009 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- *
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getpwent.c 158115 2006-04-28 12:03:38Z ume $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <arpa/inet.h>
-#include <errno.h>
-#include <fcntl.h>
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-#include <netdb.h>
-#include <nsswitch.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include <pwd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include <db.h>
-#include "libc_private.h"
-#include "pw_scan.h"
-#include "nss_tls.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-
-#ifndef CTASSERT
-#define CTASSERT(x)		_CTASSERT(x, __LINE__)
-#define _CTASSERT(x, y)		__CTASSERT(x, y)
-#define __CTASSERT(x, y)	typedef char __assert_ ## y [(x) ? 1 : -1]
-#endif
-
-/* Counter as stored in /etc/pwd.db */
-typedef	int		pwkeynum;
-
-CTASSERT(MAXLOGNAME > sizeof(uid_t));
-CTASSERT(MAXLOGNAME > sizeof(pwkeynum));
-
-enum constants {
-	PWD_STORAGE_INITIAL	= 1 << 10, /* 1 KByte */
-	PWD_STORAGE_MAX		= 1 << 20, /* 1 MByte */
-	SETPWENT		= 1,
-	ENDPWENT		= 2,
-	HESIOD_NAME_MAX		= 256
-};
-
-static const ns_src defaultsrc[] = {
-	{ NSSRC_COMPAT, NS_SUCCESS },
-	{ NULL, 0 }
-};
-
-int	__pw_match_entry(const char *, size_t, enum nss_lookup_type,
-	    const char *, uid_t);
-int	__pw_parse_entry(char *, size_t, struct passwd *, int, int *errnop);
-
-static	void	 pwd_init(struct passwd *);
-
-union key {
-	const char	*name;
-	uid_t		 uid;
-};
-
-static	struct passwd *getpw(int (*fn)(union key, struct passwd *, char *,
-		    size_t, struct passwd **), union key);
-static	int	 wrap_getpwnam_r(union key, struct passwd *, char *,
-		    size_t, struct passwd **);
-static	int	 wrap_getpwuid_r(union key, struct passwd *, char *, size_t,
-		    struct passwd **);
-static	int	 wrap_getpwent_r(union key, struct passwd *, char *, size_t,
-		    struct passwd **);
-
-static	int	 pwdb_match_entry_v3(char *, size_t, enum nss_lookup_type,
-		    const char *, uid_t);
-static	int	 pwdb_parse_entry_v3(char *, size_t, struct passwd *, int *);
-static	int	 pwdb_match_entry_v4(char *, size_t, enum nss_lookup_type,
-		    const char *, uid_t);
-static	int	 pwdb_parse_entry_v4(char *, size_t, struct passwd *, int *);
-
-
-struct {
-	int	(*match)(char *, size_t, enum nss_lookup_type, const char *,
-		    uid_t);
-	int	(*parse)(char *, size_t, struct passwd *, int *);
-} pwdb_versions[] = {
-	{ NULL, NULL },					/* version 0 */
-	{ NULL, NULL },					/* version 1 */
-	{ NULL, NULL },					/* version 2 */
-	{ pwdb_match_entry_v3, pwdb_parse_entry_v3 },	/* version 3 */
-	{ pwdb_match_entry_v4, pwdb_parse_entry_v4 },	/* version 4 */
-};
-
-
-struct files_state {
-	DB		*db;
-	pwkeynum	 keynum;
-	int		 stayopen;
-	int		 version;
-};
-static	void	files_endstate(void *);
-NSS_TLS_HANDLING(files);
-static	DB	*pwdbopen(int *);
-static	void	 files_endstate(void *);
-static	int	 files_setpwent(void *, void *, va_list);
-static	int	 files_passwd(void *, void *, va_list);
-
-
-#ifdef HESIOD
-struct dns_state {
-	long	counter;
-};
-static	void	dns_endstate(void *);
-NSS_TLS_HANDLING(dns);
-static	int	 dns_setpwent(void *, void *, va_list);
-static	int	 dns_passwd(void *, void *, va_list);
-#endif
-
-
-#ifdef YP
-struct nis_state {
-	char	 domain[MAXHOSTNAMELEN];
-	int	 done;
-	char	*key;
-	int	 keylen;
-};
-static	void	 nis_endstate(void *);
-NSS_TLS_HANDLING(nis);
-static	int	 nis_setpwent(void *, void *, va_list);
-static	int	 nis_passwd(void *, void *, va_list);
-static	int	 nis_map(char *, enum nss_lookup_type, char *, size_t, int *);
-static	int	 nis_adjunct(char *, const char *, char *, size_t);
-#endif
-
-
-struct compat_state {
-	DB		*db;
-	pwkeynum	 keynum;
-	int		 stayopen;
-	int		 version;
-	DB		*exclude;
-	struct passwd	 template;
-	char		*name;
-	enum _compat {
-		COMPAT_MODE_OFF = 0,
-		COMPAT_MODE_ALL,
-		COMPAT_MODE_NAME,
-		COMPAT_MODE_NETGROUP
-	}		 compat;
-};
-static	void	 compat_endstate(void *);
-NSS_TLS_HANDLING(compat);
-static	int	 compat_setpwent(void *, void *, va_list);
-static	int	 compat_passwd(void *, void *, va_list);
-static	void	 compat_clear_template(struct passwd *);
-static	int	 compat_set_template(struct passwd *, struct passwd *);
-static	int	 compat_use_template(struct passwd *, struct passwd *, char *,
-		    size_t);
-static	int	 compat_redispatch(struct compat_state *, enum nss_lookup_type,
-		    enum nss_lookup_type, const char *, const char *, uid_t,
-		    struct passwd *, char *, size_t, int *);
-
-#ifdef NS_CACHING
-static	int	 pwd_id_func(char *, size_t *, va_list ap, void *);
-static	int	 pwd_marshal_func(char *, size_t *, void *, va_list, void *);
-static	int	 pwd_unmarshal_func(char *, size_t, void *, va_list, void *);
-
-static int
-pwd_id_func(char *buffer, size_t *buffer_size, va_list ap, void *cache_mdata)
-{
-	char	*name;
-	uid_t	uid;
-	size_t	size, desired_size;
-	int	res = NS_UNAVAIL;
-	enum nss_lookup_type lookup_type;
-
-	lookup_type = (enum nss_lookup_type)cache_mdata;
-	switch (lookup_type) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		size = strlen(name);
-		desired_size = sizeof(enum nss_lookup_type) + size + 1;
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), name, size + 1);
-
-		res = NS_SUCCESS;
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		desired_size = sizeof(enum nss_lookup_type) + sizeof(uid_t);
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), &uid,
-		    sizeof(uid_t));
-
-		res = NS_SUCCESS;
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-fin:
-	*buffer_size = desired_size;
-	return (res);
-}
-
-static int
-pwd_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	uid_t uid;
-	struct passwd *pwd;
-	char *orig_buf;
-	size_t orig_buf_size;
-
-	struct passwd new_pwd;
-	size_t desired_size, size;
-	char *p;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	pwd = va_arg(ap, struct passwd *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-
-	desired_size = sizeof(struct passwd) + sizeof(char *) +
-	    strlen(pwd->pw_name) + 1;
-	if (pwd->pw_passwd != NULL)
-		desired_size += strlen(pwd->pw_passwd) + 1;
-	if (pwd->pw_class != NULL)
-		desired_size += strlen(pwd->pw_class) + 1;
-	if (pwd->pw_gecos != NULL)
-		desired_size += strlen(pwd->pw_gecos) + 1;
-	if (pwd->pw_dir != NULL)
-		desired_size += strlen(pwd->pw_dir) + 1;
-	if (pwd->pw_shell != NULL)
-		desired_size += strlen(pwd->pw_shell) + 1;
-
-	if (*buffer_size < desired_size) {
-		/* this assignment is here for future use */
-		*buffer_size = desired_size;
-		return (NS_RETURN);
-	}
-
-	memcpy(&new_pwd, pwd, sizeof(struct passwd));
-	memset(buffer, 0, desired_size);
-
-	*buffer_size = desired_size;
-	p = buffer + sizeof(struct passwd) + sizeof(char *);
-	memcpy(buffer + sizeof(struct passwd), &p, sizeof(char *));
-
-	if (new_pwd.pw_name != NULL) {
-		size = strlen(new_pwd.pw_name);
-		memcpy(p, new_pwd.pw_name, size);
-		new_pwd.pw_name = p;
-		p += size + 1;
-	}
-
-	if (new_pwd.pw_passwd != NULL) {
-		size = strlen(new_pwd.pw_passwd);
-		memcpy(p, new_pwd.pw_passwd, size);
-		new_pwd.pw_passwd = p;
-		p += size + 1;
-	}
-
-	if (new_pwd.pw_class != NULL) {
-		size = strlen(new_pwd.pw_class);
-		memcpy(p, new_pwd.pw_class, size);
-		new_pwd.pw_class = p;
-		p += size + 1;
-	}
-
-	if (new_pwd.pw_gecos != NULL) {
-		size = strlen(new_pwd.pw_gecos);
-		memcpy(p, new_pwd.pw_gecos, size);
-		new_pwd.pw_gecos = p;
-		p += size + 1;
-	}
-
-	if (new_pwd.pw_dir != NULL) {
-		size = strlen(new_pwd.pw_dir);
-		memcpy(p, new_pwd.pw_dir, size);
-		new_pwd.pw_dir = p;
-		p += size + 1;
-	}
-
-	if (new_pwd.pw_shell != NULL) {
-		size = strlen(new_pwd.pw_shell);
-		memcpy(p, new_pwd.pw_shell, size);
-		new_pwd.pw_shell = p;
-		p += size + 1;
-	}
-
-	memcpy(buffer, &new_pwd, sizeof(struct passwd));
-	return (NS_SUCCESS);
-}
-
-static int
-pwd_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	uid_t uid;
-	struct passwd *pwd;
-	char *orig_buf;
-	size_t orig_buf_size;
-	int *ret_errno;
-
-	char *p;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	pwd = va_arg(ap, struct passwd *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-	ret_errno = va_arg(ap, int *);
-
-	if (orig_buf_size <
-	    buffer_size - sizeof(struct passwd) - sizeof(char *)) {
-		*ret_errno = ERANGE;
-		return (NS_RETURN);
-	}
-
-	memcpy(pwd, buffer, sizeof(struct passwd));
-	memcpy(&p, buffer + sizeof(struct passwd), sizeof(char *));
-	memcpy(orig_buf, buffer + sizeof(struct passwd) + sizeof(char *),
-	    buffer_size - sizeof(struct passwd) - sizeof(char *));
-
-	NS_APPLY_OFFSET(pwd->pw_name, orig_buf, p, char *);
-	NS_APPLY_OFFSET(pwd->pw_passwd, orig_buf, p, char *);
-	NS_APPLY_OFFSET(pwd->pw_class, orig_buf, p, char *);
-	NS_APPLY_OFFSET(pwd->pw_gecos, orig_buf, p, char *);
-	NS_APPLY_OFFSET(pwd->pw_dir, orig_buf, p, char *);
-	NS_APPLY_OFFSET(pwd->pw_shell, orig_buf, p, char *);
-
-	if (retval != NULL)
-		*((struct passwd **)retval) = pwd;
-
-	return (NS_SUCCESS);
-}
-
-NSS_MP_CACHE_HANDLING(passwd);
-#endif /* NS_CACHING */
-
-void
-setpwent(void)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		passwd, (void *)nss_lt_all,
-		NULL, NULL);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setpwent, (void *)SETPWENT },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setpwent, (void *)SETPWENT },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setpwent, (void *)SETPWENT },
-#endif
-		{ NSSRC_COMPAT, compat_setpwent, (void *)SETPWENT },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	(void)_nsdispatch(NULL, dtab, NSDB_PASSWD, "setpwent", defaultsrc, 0);
-}
-
-
-int
-setpassent(int stayopen)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		passwd, (void *)nss_lt_all,
-		NULL, NULL);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setpwent, (void *)SETPWENT },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setpwent, (void *)SETPWENT },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setpwent, (void *)SETPWENT },
-#endif
-		{ NSSRC_COMPAT, compat_setpwent, (void *)SETPWENT },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	(void)_nsdispatch(NULL, dtab, NSDB_PASSWD, "setpwent", defaultsrc,
-	    stayopen);
-	return (1);
-}
-
-
-void
-endpwent(void)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		passwd, (void *)nss_lt_all,
-		NULL, NULL);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setpwent, (void *)ENDPWENT },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setpwent, (void *)ENDPWENT },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_setpwent, (void *)ENDPWENT },
-#endif
-		{ NSSRC_COMPAT, compat_setpwent, (void *)ENDPWENT },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	(void)_nsdispatch(NULL, dtab, NSDB_PASSWD, "endpwent", defaultsrc);
-}
-
-
-int
-getpwent_r(struct passwd *pwd, char *buffer, size_t bufsize,
-    struct passwd **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		passwd, (void *)nss_lt_all,
-		pwd_marshal_func, pwd_unmarshal_func);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_passwd, (void *)nss_lt_all },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_passwd, (void *)nss_lt_all },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_passwd, (void *)nss_lt_all },
-#endif
-		{ NSSRC_COMPAT, compat_passwd, (void *)nss_lt_all },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	pwd_init(pwd);
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_PASSWD, "getpwent_r", defaultsrc,
-	    pwd, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-int
-getpwnam_r(const char *name, struct passwd *pwd, char *buffer, size_t bufsize,
-    struct passwd **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-    		NS_COMMON_CACHE_INFO_INITIALIZER(
-		passwd, (void *)nss_lt_name,
-		pwd_id_func, pwd_marshal_func, pwd_unmarshal_func);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_passwd, (void *)nss_lt_name },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_passwd, (void *)nss_lt_name },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_passwd, (void *)nss_lt_name },
-#endif
-		{ NSSRC_COMPAT, compat_passwd, (void *)nss_lt_name },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	pwd_init(pwd);
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_PASSWD, "getpwnam_r", defaultsrc,
-	    name, pwd, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-int
-getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize,
-    struct passwd **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-    		NS_COMMON_CACHE_INFO_INITIALIZER(
-		passwd, (void *)nss_lt_id,
-		pwd_id_func, pwd_marshal_func, pwd_unmarshal_func);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_passwd, (void *)nss_lt_id },
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_passwd, (void *)nss_lt_id },
-#endif
-#ifdef YP
-		{ NSSRC_NIS, nis_passwd, (void *)nss_lt_id },
-#endif
-		{ NSSRC_COMPAT, compat_passwd, (void *)nss_lt_id },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	pwd_init(pwd);
-	ret_errno = 0;
-	*result = NULL;
-	rv = _nsdispatch(result, dtab, NSDB_PASSWD, "getpwuid_r", defaultsrc,
-	    uid, pwd, buffer, bufsize, &ret_errno);
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-
-static void
-pwd_init(struct passwd *pwd)
-{
-	static char nul[] = "";
-
-	memset(pwd, 0, sizeof(*pwd));
-	pwd->pw_uid = (uid_t)-1;  /* Considered least likely to lead to */
-	pwd->pw_gid = (gid_t)-1;  /* a security issue.                  */
-	pwd->pw_name = nul;
-	pwd->pw_passwd = nul;
-	pwd->pw_class = nul;
-	pwd->pw_gecos = nul;
-	pwd->pw_dir = nul;
-	pwd->pw_shell = nul;
-}
-
-
-static struct passwd	 pwd;
-static char		*pwd_storage;
-static size_t		 pwd_storage_size;
-
-
-static struct passwd *
-getpw(int (*fn)(union key, struct passwd *, char *, size_t, struct passwd **),
-    union key key)
-{
-	int		 rv;
-	struct passwd	*res;
-
-	if (pwd_storage == NULL) {
-		pwd_storage = malloc(PWD_STORAGE_INITIAL);
-		if (pwd_storage == NULL)
-			return (NULL);
-		pwd_storage_size = PWD_STORAGE_INITIAL;
-	}
-	do {
-		rv = fn(key, &pwd, pwd_storage, pwd_storage_size, &res);
-		if (res == NULL && rv == ERANGE) {
-			free(pwd_storage);
-			if ((pwd_storage_size << 1) > PWD_STORAGE_MAX) {
-				pwd_storage = NULL;
-				errno = ERANGE;
-				return (NULL);
-			}
-			pwd_storage_size <<= 1;
-			pwd_storage = malloc(pwd_storage_size);
-			if (pwd_storage == NULL)
-				return (NULL);
-		}
-	} while (res == NULL && rv == ERANGE);
-	if (rv != 0)
-		errno = rv;
-	return (res);
-}
-
-
-static int
-wrap_getpwnam_r(union key key, struct passwd *pwd, char *buffer,
-    size_t bufsize, struct passwd **res)
-{
-	return (getpwnam_r(key.name, pwd, buffer, bufsize, res));
-}
-
-
-static int
-wrap_getpwuid_r(union key key, struct passwd *pwd, char *buffer,
-    size_t bufsize, struct passwd **res)
-{
-	return (getpwuid_r(key.uid, pwd, buffer, bufsize, res));
-}
-
-
-static int
-wrap_getpwent_r(union key key __unused, struct passwd *pwd, char *buffer,
-    size_t bufsize, struct passwd **res)
-{
-	return (getpwent_r(pwd, buffer, bufsize, res));
-}
-
-
-struct passwd *
-getpwnam(const char *name)
-{
-	union key key;
-
-	key.name = name;
-	return (getpw(wrap_getpwnam_r, key));
-}
-
-
-struct passwd *
-getpwuid(uid_t uid)
-{
-	union key key;
-
-	key.uid = uid;
-	return (getpw(wrap_getpwuid_r, key));
-}
-
-
-struct passwd *
-getpwent(void)
-{
-	union key key;
-
-	key.uid = 0; /* not used */
-	return (getpw(wrap_getpwent_r, key));
-}
-
-
-/*
- * files backend
- */
-static DB *
-pwdbopen(int *version)
-{
-	DB	*res;
-	DBT	 key, entry;
-	int	 rv;
-
-	if (geteuid() != 0 ||
-	    (res = dbopen(_PATH_SMP_DB, O_RDONLY, 0, DB_HASH, NULL)) == NULL)
-		res = dbopen(_PATH_MP_DB, O_RDONLY, 0, DB_HASH, NULL);
-	if (res == NULL)
-		return (NULL);
-	key.data = _PWD_VERSION_KEY;
-	key.size = strlen(_PWD_VERSION_KEY);
-	rv = res->get(res, &key, &entry, 0);
-	if (rv == 0)
-		*version = *(unsigned char *)entry.data;
-	else
-		*version = 3;
-	if (*version < 3 ||
-	    *version >= sizeof(pwdb_versions)/sizeof(pwdb_versions[0])) {
-		syslog(LOG_CRIT, "Unsupported password database version %d",
-		    *version);
-		res->close(res);
-		res = NULL;
-	}
-	return (res);
-}
-
-
-static void
-files_endstate(void *p)
-{
-	DB	*db;
-
-	if (p == NULL)
-		return;
-	db = ((struct files_state *)p)->db;
-	if (db != NULL)
-		db->close(db);
-	free(p);
-}
-
-
-static int
-files_setpwent(void *retval, void *mdata, va_list ap)
-{
-	struct files_state	*st;
-	int			 rv, stayopen;
-
-	rv = files_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	switch ((enum constants)mdata) {
-	case SETPWENT:
-		stayopen = va_arg(ap, int);
-		st->keynum = 0;
-		if (stayopen)
-			st->db = pwdbopen(&st->version);
-		st->stayopen = stayopen;
-		break;
-	case ENDPWENT:
-		if (st->db != NULL) {
-			(void)st->db->close(st->db);
-			st->db = NULL;
-		}
-		break;
-	default:
-		break;
-	}
-	return (NS_UNAVAIL);
-}
-
-
-static int
-files_passwd(void *retval, void *mdata, va_list ap)
-{
-	char			 keybuf[MAXLOGNAME + 1];
-	DBT			 key, entry;
-	struct files_state	*st;
-	enum nss_lookup_type	 how;
-	const char		*name;
-	struct passwd		*pwd;
-	char			*buffer;
-	size_t			 bufsize, namesize;
-	uid_t			 uid;
-	uint32_t		 store;
-	int			 rv, stayopen, *errnop;
-
-	name = NULL;
-	uid = (uid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		keybuf[0] = _PW_KEYBYNAME;
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		keybuf[0] = _PW_KEYBYUID;
-		break;
-	case nss_lt_all:
-		keybuf[0] = _PW_KEYBYNUM;
-		break;
-	default:
-		rv = NS_NOTFOUND;
-		goto fin;
-	}
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	*errnop = files_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (how == nss_lt_all && st->keynum < 0) {
-		rv = NS_NOTFOUND;
-		goto fin;
-	}
-	if (st->db == NULL &&
-	    (st->db = pwdbopen(&st->version)) == NULL) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	if (how == nss_lt_all)
-		stayopen = 1;
-	else
-		stayopen = st->stayopen;
-	key.data = keybuf;
-	do {
-		switch (how) {
-		case nss_lt_name:
-			/* MAXLOGNAME includes NUL byte, but we do not
-			 * include the NUL byte in the key.
-			 */
-			namesize = strlcpy(&keybuf[1], name, sizeof(keybuf)-1);
-			if (namesize >= sizeof(keybuf)-1) {
-				*errnop = EINVAL;
-				rv = NS_NOTFOUND;
-				goto fin;
-			}
-			key.size = namesize + 1;
-			break;
-		case nss_lt_id:
-			if (st->version < _PWD_CURRENT_VERSION) {
-				memcpy(&keybuf[1], &uid, sizeof(uid));
-				key.size = sizeof(uid) + 1;
-			} else {
-				store = htonl(uid);
-				memcpy(&keybuf[1], &store, sizeof(store));
-				key.size = sizeof(store) + 1;
-			}
-			break;
-		case nss_lt_all:
-			st->keynum++;
-			if (st->version < _PWD_CURRENT_VERSION) {
-				memcpy(&keybuf[1], &st->keynum,
-				    sizeof(st->keynum));
-				key.size = sizeof(st->keynum) + 1;
-			} else {
-				store = htonl(st->keynum);
-				memcpy(&keybuf[1], &store, sizeof(store));
-				key.size = sizeof(store) + 1;
-			}
-			break;
-		}
-		keybuf[0] = _PW_VERSIONED(keybuf[0], st->version);
-		rv = st->db->get(st->db, &key, &entry, 0);
-		if (rv < 0 || rv > 1) { /* should never return > 1 */
-			*errnop = errno;
-			rv = NS_UNAVAIL;
-			goto fin;
-		} else if (rv == 1) {
-			if (how == nss_lt_all)
-				st->keynum = -1;
-			rv = NS_NOTFOUND;
-			goto fin;
-		}
-		rv = pwdb_versions[st->version].match(entry.data, entry.size,
-		    how, name, uid);
-		if (rv != NS_SUCCESS)
-			continue;
-		if (entry.size > bufsize) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-		memcpy(buffer, entry.data, entry.size);
-		rv = pwdb_versions[st->version].parse(buffer, entry.size, pwd,
-		    errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (!stayopen && st->db != NULL) {
-		(void)st->db->close(st->db);
-		st->db = NULL;
-	}
-	if (rv == NS_SUCCESS) {
-		pwd->pw_fields &= ~_PWF_SOURCE;
-		pwd->pw_fields |= _PWF_FILES;
-		if (retval != NULL)
-			*(struct passwd **)retval = pwd;
-	}
-	return (rv);
-}
-
-
-static int
-pwdb_match_entry_v3(char *entry, size_t entrysize, enum nss_lookup_type how,
-    const char *name, uid_t uid)
-{
-	const char	*p, *eom;
-	uid_t		 uid2;
-
-	eom = &entry[entrysize];
-	for (p = entry; p < eom; p++)
-		if (*p == '\0')
-			break;
-	if (*p != '\0')
-		return (NS_NOTFOUND);
-	if (how == nss_lt_all)
-		return (NS_SUCCESS);
-	if (how == nss_lt_name)
-		return (strcmp(name, entry) == 0 ? NS_SUCCESS : NS_NOTFOUND);
-	for (p++; p < eom; p++)
-		if (*p == '\0')
-			break;
-	if (*p != '\0' || (++p) + sizeof(uid) >= eom)
-		return (NS_NOTFOUND);
-	memcpy(&uid2, p, sizeof(uid2));
-	return (uid == uid2 ? NS_SUCCESS : NS_NOTFOUND);
-}
-
-
-static int
-pwdb_parse_entry_v3(char *buffer, size_t bufsize, struct passwd *pwd,
-    int *errnop)
-{
-	char		*p, *eom;
-	int32_t		 pw_change, pw_expire;
-
-	/* THIS CODE MUST MATCH THAT IN pwd_mkdb. */
-	p = buffer;
-	eom = &buffer[bufsize];
-#define STRING(field)	do {			\
-		(field) = p;			\
-		while (p < eom && *p != '\0')	\
-			p++;			\
-		if (p >= eom)			\
-			return (NS_NOTFOUND);	\
-		p++;				\
-	} while (0)
-#define SCALAR(field)	do {				\
-		if (p + sizeof(field) > eom)		\
-			return (NS_NOTFOUND);		\
-		memcpy(&(field), p, sizeof(field));	\
-		p += sizeof(field);			\
-	} while (0)
-	STRING(pwd->pw_name);
-	STRING(pwd->pw_passwd);
-	SCALAR(pwd->pw_uid);
-	SCALAR(pwd->pw_gid);
-	SCALAR(pw_change);
-	STRING(pwd->pw_class);
-	STRING(pwd->pw_gecos);
-	STRING(pwd->pw_dir);
-	STRING(pwd->pw_shell);
-	SCALAR(pw_expire);
-	SCALAR(pwd->pw_fields);
-#undef STRING
-#undef SCALAR
-	pwd->pw_change = pw_change;
-	pwd->pw_expire = pw_expire;
-	return (NS_SUCCESS);
-}
-
-
-static int
-pwdb_match_entry_v4(char *entry, size_t entrysize, enum nss_lookup_type how,
-    const char *name, uid_t uid)
-{
-	const char	*p, *eom;
-	uint32_t	 uid2;
-
-	eom = &entry[entrysize];
-	for (p = entry; p < eom; p++)
-		if (*p == '\0')
-			break;
-	if (*p != '\0')
-		return (NS_NOTFOUND);
-	if (how == nss_lt_all)
-		return (NS_SUCCESS);
-	if (how == nss_lt_name)
-		return (strcmp(name, entry) == 0 ? NS_SUCCESS : NS_NOTFOUND);
-	for (p++; p < eom; p++)
-		if (*p == '\0')
-			break;
-	if (*p != '\0' || (++p) + sizeof(uid) >= eom)
-		return (NS_NOTFOUND);
-	memcpy(&uid2, p, sizeof(uid2));
-	uid2 = ntohl(uid2);
-	return (uid == (uid_t)uid2 ? NS_SUCCESS : NS_NOTFOUND);
-}
-
-
-static int
-pwdb_parse_entry_v4(char *buffer, size_t bufsize, struct passwd *pwd,
-    int *errnop)
-{
-	char		*p, *eom;
-	uint32_t	 n;
-
-	/* THIS CODE MUST MATCH THAT IN pwd_mkdb. */
-	p = buffer;
-	eom = &buffer[bufsize];
-#define STRING(field)	do {			\
-		(field) = p;			\
-		while (p < eom && *p != '\0')	\
-			p++;			\
-		if (p >= eom)			\
-			return (NS_NOTFOUND);	\
-		p++;				\
-	} while (0)
-#define SCALAR(field)	do {				\
-		if (p + sizeof(n) > eom)		\
-			return (NS_NOTFOUND);		\
-		memcpy(&n, p, sizeof(n));		\
-		(field) = ntohl(n);			\
-		p += sizeof(n);				\
-	} while (0)
-	STRING(pwd->pw_name);
-	STRING(pwd->pw_passwd);
-	SCALAR(pwd->pw_uid);
-	SCALAR(pwd->pw_gid);
-	SCALAR(pwd->pw_change);
-	STRING(pwd->pw_class);
-	STRING(pwd->pw_gecos);
-	STRING(pwd->pw_dir);
-	STRING(pwd->pw_shell);
-	SCALAR(pwd->pw_expire);
-	SCALAR(pwd->pw_fields);
-#undef STRING
-#undef SCALAR
-	return (NS_SUCCESS);
-}
-
-
-#ifdef HESIOD
-/*
- * dns backend
- */
-static void
-dns_endstate(void *p)
-{
-	free(p);
-}
-
-
-static int
-dns_setpwent(void *retval, void *mdata, va_list ap)
-{
-	struct dns_state	*st;
-	int			 rv;
-
-	rv = dns_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	st->counter = 0;
-	return (NS_UNAVAIL);
-}
-
-
-static int
-dns_passwd(void *retval, void *mdata, va_list ap)
-{
-	char			 buf[HESIOD_NAME_MAX];
-	struct dns_state	*st;
-	struct passwd		*pwd;
-	const char		*name, *label;
-	void			*ctx;
-	char			*buffer, **hes;
-	size_t			 bufsize, linesize;
-	uid_t			 uid;
-	enum nss_lookup_type	 how;
-	int			 rv, *errnop;
-
-	ctx = NULL;
-	hes = NULL;
-	name = NULL;
-	uid = (uid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
-	case nss_lt_all:
-		break;
-	}
-	pwd     = va_arg(ap, struct passwd *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop  = va_arg(ap, int *);
-	*errnop = dns_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (hesiod_init(&ctx) != 0) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	do {
-		rv = NS_NOTFOUND;
-		switch (how) {
-		case nss_lt_name:
-			label = name;
-			break;
-		case nss_lt_id:
-			if (snprintf(buf, sizeof(buf), "%lu",
-			    (unsigned long)uid) >= sizeof(buf))
-				goto fin;
-			label = buf;
-			break;
-		case nss_lt_all:
-			if (st->counter < 0)
-				goto fin;
-			if (snprintf(buf, sizeof(buf), "passwd-%ld",
-			    st->counter++) >= sizeof(buf))
-				goto fin;
-			label = buf;
-			break;
-		}
-		hes = hesiod_resolve(ctx, label,
-		    how == nss_lt_id ? "uid" : "passwd");
-		if (hes == NULL) {
-			if (how == nss_lt_all)
-				st->counter = -1;
-			if (errno != ENOENT)
-				*errnop = errno;
-			goto fin;
-		}
-		rv = __pw_match_entry(hes[0], strlen(hes[0]), how, name, uid);
-		if (rv != NS_SUCCESS) {
-			hesiod_free_list(ctx, hes);
-			hes = NULL;
-			continue;
-		}
-		linesize = strlcpy(buffer, hes[0], bufsize);
-		if (linesize >= bufsize) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			continue;
-		}
-		hesiod_free_list(ctx, hes);
-		hes = NULL;
-		rv = __pw_parse_entry(buffer, bufsize, pwd, 0, errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (hes != NULL)
-		hesiod_free_list(ctx, hes);
-	if (ctx != NULL)
-		hesiod_end(ctx);
-	if (rv == NS_SUCCESS) {
-		pwd->pw_fields &= ~_PWF_SOURCE;
-		pwd->pw_fields |= _PWF_HESIOD;
-		if (retval != NULL)
-			*(struct passwd **)retval = pwd;
-	}
-	return (rv);
-}
-#endif /* HESIOD */
-
-
-#ifdef YP
-/*
- * nis backend
- */
-static void
-nis_endstate(void *p)
-{
-	free(((struct nis_state *)p)->key);
-	free(p);
-}
-
-/*
- * Test for the presence of special FreeBSD-specific master.passwd.by*
- * maps. We do this using yp_order(). If it fails, then either the server
- * doesn't have the map, or the YPPROC_ORDER procedure isn't supported by
- * the server (Sun NIS+ servers in YP compat mode behave this way). If
- * the master.passwd.by* maps don't exist, then let the lookup routine try
- * the regular passwd.by* maps instead. If the lookup routine fails, it
- * can return an error as needed.
- */
-static int
-nis_map(char *domain, enum nss_lookup_type how, char *buffer, size_t bufsize,
-    int *master)
-{
-	int	rv, order;
-
-	*master = 0;
-	if (geteuid() == 0) {
-		if (snprintf(buffer, bufsize, "master.passwd.by%s",
-		    (how == nss_lt_id) ? "uid" : "name") >= bufsize)
-			return (NS_UNAVAIL);
-		rv = yp_order(domain, buffer, &order);
-		if (rv == 0) {
-			*master = 1;
-			return (NS_SUCCESS);
-		}
-	}
-
-	if (snprintf(buffer, bufsize, "passwd.by%s",
-	    (how == nss_lt_id) ? "uid" : "name") >= bufsize)
-		return (NS_UNAVAIL);
-
-	return (NS_SUCCESS);
-}
-
-
-static int
-nis_adjunct(char *domain, const char *name, char *buffer, size_t bufsize)
-{
-	int	 rv;
-	char	*result, *p, *q, *eor;
-	int	 resultlen;
-
-	result = NULL;
-	rv = yp_match(domain, "passwd.adjunct.byname", name, strlen(name),
-	    &result, &resultlen);
-	if (rv != 0)
-		rv = 1;
-	else {
-		eor = &result[resultlen];
-		p = memchr(result, ':', eor - result);
-		if (p != NULL && ++p < eor &&
-		    (q = memchr(p, ':', eor - p)) != NULL) {
-			if (q - p >= bufsize)
-				rv = -1;
-			else {
-				memcpy(buffer, p, q - p);
-				buffer[q - p] ='\0';
-			}
-		} else
-			rv = 1;
-	}
-	free(result);
-	return (rv);
-}
-
-
-static int
-nis_setpwent(void *retval, void *mdata, va_list ap)
-{
-	struct nis_state	*st;
-	int			 rv;
-
-	rv = nis_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	st->done = 0;
-	free(st->key);
-	st->key = NULL;
-	return (NS_UNAVAIL);
-}
-
-
-static int
-nis_passwd(void *retval, void *mdata, va_list ap)
-{
-	char		 map[YPMAXMAP];
-	struct nis_state *st;
-	struct passwd	*pwd;
-	const char	*name;
-	char		*buffer, *key, *result;
-	size_t		 bufsize;
-	uid_t		 uid;
-	enum nss_lookup_type how;
-	int		*errnop, keylen, resultlen, rv, master;
-
-	name = NULL;
-	uid = (uid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
-	case nss_lt_all:
-		break;
-	}
-	pwd     = va_arg(ap, struct passwd *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop  = va_arg(ap, int *);
-	*errnop = nis_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (st->domain[0] == '\0') {
-		if (getdomainname(st->domain, sizeof(st->domain)) != 0) {
-			*errnop = errno;
-			return (NS_UNAVAIL);
-		}
-	}
-	rv = nis_map(st->domain, how, map, sizeof(map), &master);
-	if (rv != NS_SUCCESS)
-		return (rv);
-	result = NULL;
-	do {
-		rv = NS_NOTFOUND;
-		switch (how) {
-		case nss_lt_name:
-			if (strlcpy(buffer, name, bufsize) >= bufsize)
-				goto erange;
-			break;
-		case nss_lt_id:
-			if (snprintf(buffer, bufsize, "%lu",
-			    (unsigned long)uid) >= bufsize)
-				goto erange;
-			break;
-		case nss_lt_all:
-			if (st->done)
-				goto fin;
-			break;
-		}
-		result = NULL;
-		if (how == nss_lt_all) {
-			if (st->key == NULL)
-				rv = yp_first(st->domain, map, &st->key,
-				    &st->keylen, &result, &resultlen);
-			else {
-				key = st->key;
-				keylen = st->keylen;
-				st->key = NULL;
-				rv = yp_next(st->domain, map, key, keylen,
-				    &st->key, &st->keylen, &result,
-				    &resultlen);
-				free(key);
-			}
-			if (rv != 0) {
-				free(result);
-				free(st->key);
-				st->key = NULL;
-				if (rv == YPERR_NOMORE)
-					st->done = 1;
-				else
-					rv = NS_UNAVAIL;
-				goto fin;
-			}
-		} else {
-			rv = yp_match(st->domain, map, buffer, strlen(buffer),
-			    &result, &resultlen);
-			if (rv == YPERR_KEY) {
-				rv = NS_NOTFOUND;
-				continue;
-			} else if (rv != 0) {
-				free(result);
-				rv = NS_UNAVAIL;
-				continue;
-			}
-		}
-		if (resultlen >= bufsize)
-			goto erange;
-		memcpy(buffer, result, resultlen);
-		buffer[resultlen] = '\0';
-		free(result);
-		rv = __pw_match_entry(buffer, resultlen, how, name, uid);
-		if (rv == NS_SUCCESS)
-			rv = __pw_parse_entry(buffer, resultlen, pwd, master,
-			    errnop);
-	} while (how == nss_lt_all && !(rv & NS_TERMINATE));
-fin:
-	if (rv == NS_SUCCESS) {
-		if (strstr(pwd->pw_passwd, "##") != NULL) {
-			rv = nis_adjunct(st->domain, pwd->pw_name,
-			    &buffer[resultlen+1], bufsize-resultlen-1);
-			if (rv < 0)
-				goto erange;
-			else if (rv == 0)
-				pwd->pw_passwd = &buffer[resultlen+1];
-		}
-		pwd->pw_fields &= ~_PWF_SOURCE;
-		pwd->pw_fields |= _PWF_NIS;
-		if (retval != NULL)
-			*(struct passwd **)retval = pwd;
-		rv = NS_SUCCESS;
-	}
-	return (rv);
-erange:
-	*errnop = ERANGE;
-	return (NS_RETURN);
-}
-#endif /* YP */
-
-
-/*
- * compat backend
- */
-static void
-compat_clear_template(struct passwd *template)
-{
-
-	free(template->pw_passwd);
-	free(template->pw_gecos);
-	free(template->pw_dir);
-	free(template->pw_shell);
-	memset(template, 0, sizeof(*template));
-}
-
-
-static int
-compat_set_template(struct passwd *src, struct passwd *template)
-{
-
-	compat_clear_template(template);
-#ifdef PW_OVERRIDE_PASSWD
-	if ((src->pw_fields & _PWF_PASSWD) &&
-	    (template->pw_passwd = strdup(src->pw_passwd)) == NULL)
-		goto enomem;
-#endif
-	if (src->pw_fields & _PWF_UID)
-		template->pw_uid = src->pw_uid;
-	if (src->pw_fields & _PWF_GID)
-		template->pw_gid = src->pw_gid;
-	if ((src->pw_fields & _PWF_GECOS) &&
-	    (template->pw_gecos = strdup(src->pw_gecos)) == NULL)
-		goto enomem;
-	if ((src->pw_fields & _PWF_DIR) &&
-	    (template->pw_dir = strdup(src->pw_dir)) == NULL)
-		goto enomem;
-	if ((src->pw_fields & _PWF_SHELL) &&
-	    (template->pw_shell = strdup(src->pw_shell)) == NULL)
-		goto enomem;
-	template->pw_fields = src->pw_fields;
-	return (0);
-enomem:
-	syslog(LOG_ERR, "getpwent memory allocation failure");
-	return (-1);
-}
-
-
-static int
-compat_use_template(struct passwd *pwd, struct passwd *template, char *buffer,
-    size_t bufsize)
-{
-	struct passwd hold;
-	char	*copy, *p, *q, *eob;
-	size_t	 n;
-
-	/* We cannot know the layout of the password fields in `buffer',
-	 * so we have to copy everything.
-	 */
-	if (template->pw_fields == 0) /* nothing to fill-in */
-		return (0);
-	n = 0;
-	n += pwd->pw_name != NULL ? strlen(pwd->pw_name) + 1 : 0;
-	n += pwd->pw_passwd != NULL ? strlen(pwd->pw_passwd) + 1 : 0;
-	n += pwd->pw_class != NULL ? strlen(pwd->pw_class) + 1 : 0;
-	n += pwd->pw_gecos != NULL ? strlen(pwd->pw_gecos) + 1 : 0;
-	n += pwd->pw_dir != NULL ? strlen(pwd->pw_dir) + 1 : 0;
-	n += pwd->pw_shell != NULL ? strlen(pwd->pw_shell) + 1 : 0;
-	copy = malloc(n);
-	if (copy == NULL) {
-		syslog(LOG_ERR, "getpwent memory allocation failure");
-		return (ENOMEM);
-	}
-	p = copy;
-	eob = &copy[n];
-#define COPY(field) do {				\
-	if (pwd->field == NULL)				\
-		hold.field = NULL;			\
-	else {						\
-		hold.field = p;				\
-		p += strlcpy(p, pwd->field, eob-p) + 1;	\
-	}						\
-} while (0)
-	COPY(pw_name);
-	COPY(pw_passwd);
-	COPY(pw_class);
-	COPY(pw_gecos);
-	COPY(pw_dir);
-	COPY(pw_shell);
-#undef COPY
-	p = buffer;
-	eob = &buffer[bufsize];
-#define COPY(field, flag) do {						 \
-	q = (template->pw_fields & flag) ? template->field : hold.field; \
-	if (q == NULL)							 \
-		pwd->field = NULL;					 \
-	else {								 \
-		pwd->field = p;						 \
-		if ((n = strlcpy(p, q, eob-p)) >= eob-p) {		 \
-			free(copy);					 \
-			return (ERANGE);				 \
-		}							 \
-		p += n + 1;						 \
-	}								 \
-} while (0)
-	COPY(pw_name, 0);
-#ifdef PW_OVERRIDE_PASSWD
-	COPY(pw_passwd, _PWF_PASSWD);
-#else
-	COPY(pw_passwd, 0);
-#endif
-	COPY(pw_class, 0);
-	COPY(pw_gecos, _PWF_GECOS);
-	COPY(pw_dir, _PWF_DIR);
-	COPY(pw_shell, _PWF_SHELL);
-#undef COPY
-#define COPY(field, flag) do {			\
-	if (template->pw_fields & flag)		\
-		pwd->field = template->field;	\
-} while (0)
-	COPY(pw_uid, _PWF_UID);
-	COPY(pw_gid, _PWF_GID);
-#undef COPY
-	free(copy);
-	return (0);
-}
-
-
-static int
-compat_exclude(const char *name, DB **db)
-{
-	DBT	key, data;
-
-	if (*db == NULL &&
-	    (*db = dbopen(NULL, O_RDWR, 600, DB_HASH, 0)) == NULL)
-		return (errno);
-	key.size = strlen(name);
-	key.data = (char *)name;
-	data.size = 0;
-	data.data = NULL;
-
-	if ((*db)->put(*db, &key, &data, 0) == -1)
-		return (errno);
-	return (0);
-}
-
-
-static int
-compat_is_excluded(const char *name, DB *db)
-{
-	DBT	key, data;
-
-	if (db == NULL)
-		return (0);
-	key.size = strlen(name);
-	key.data = (char *)name;
-	return (db->get(db, &key, &data, 0) == 0);
-}
-
-
-static int
-compat_redispatch(struct compat_state *st, enum nss_lookup_type how,
-    enum nss_lookup_type lookup_how, const char *name, const char *lookup_name,
-    uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize, int *errnop)
-{
-	static const ns_src compatsrc[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab dtab[] = {
-#ifdef YP
-		{ NSSRC_NIS, nis_passwd, NULL },
-#endif
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_passwd, NULL },
-#endif
-		{ NULL, NULL, NULL }
-	};
-	void		*discard;
-	int		 rv, e, i;
-
-	for (i = 0; i < sizeof(dtab)/sizeof(dtab[0]) - 1; i++)
-		dtab[i].mdata = (void *)lookup_how;
-more:
-	pwd_init(pwd);
-	switch (lookup_how) {
-	case nss_lt_all:
-		rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT,
-		    "getpwent_r", compatsrc, pwd, buffer, bufsize,
-		    errnop);
-		break;
-	case nss_lt_id:
-		rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT,
-		    "getpwuid_r", compatsrc, uid, pwd, buffer,
-		    bufsize, errnop);
-		break;
-	case nss_lt_name:
-		rv = _nsdispatch(&discard, dtab, NSDB_PASSWD_COMPAT,
-		    "getpwnam_r", compatsrc, lookup_name, pwd, buffer,
-		    bufsize, errnop);
-		break;
-	default:
-		return (NS_UNAVAIL);
-	}
-	if (rv != NS_SUCCESS)
-		return (rv);
-	if (compat_is_excluded(pwd->pw_name, st->exclude)) {
-		if (how == nss_lt_all)
-			goto more;
-		return (NS_NOTFOUND);
-	}
-	e = compat_use_template(pwd, &st->template, buffer, bufsize);
-	if (e != 0) {
-		*errnop = e;
-		if (e == ERANGE)
-			return (NS_RETURN);
-		else
-			return (NS_UNAVAIL);
-	}
-	switch (how) {
-	case nss_lt_name:
-		if (strcmp(name, pwd->pw_name) != 0)
-			return (NS_NOTFOUND);
-		break;
-	case nss_lt_id:
-		if (uid != pwd->pw_uid)
-			return (NS_NOTFOUND);
-		break;
-	default:
-		break;
-	}
-	return (NS_SUCCESS);
-}
-
-
-static void
-compat_endstate(void *p)
-{
-	struct compat_state *st;
-
-	if (p == NULL)
-		return;
-	st = (struct compat_state *)p;
-	if (st->db != NULL)
-		st->db->close(st->db);
-	if (st->exclude != NULL)
-		st->exclude->close(st->exclude);
-	compat_clear_template(&st->template);
-	free(p);
-}
-
-
-static int
-compat_setpwent(void *retval, void *mdata, va_list ap)
-{
-	static const ns_src compatsrc[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab dtab[] = {
-#ifdef YP
-		{ NSSRC_NIS, nis_setpwent, NULL },
-#endif
-#ifdef HESIOD
-		{ NSSRC_DNS, dns_setpwent, NULL },
-#endif
-		{ NULL, NULL, NULL }
-	};
-	struct compat_state	*st;
-	int			 rv, stayopen;
-
-#define set_setent(x, y) do {	 				\
-	int i;							\
-								\
-	for (i = 0; i < (sizeof(x)/sizeof(x[0])) - 1; i++)	\
-		x[i].mdata = (void *)y;				\
-} while (0)
-
-	rv = compat_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-	switch ((enum constants)mdata) {
-	case SETPWENT:
-		stayopen = va_arg(ap, int);
-		st->keynum = 0;
-		if (stayopen)
-			st->db = pwdbopen(&st->version);
-		st->stayopen = stayopen;
-		set_setent(dtab, mdata);
-		(void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "setpwent",
-		    compatsrc, 0);
-		break;
-	case ENDPWENT:
-		if (st->db != NULL) {
-			(void)st->db->close(st->db);
-			st->db = NULL;
-		}
-		set_setent(dtab, mdata);
-		(void)_nsdispatch(NULL, dtab, NSDB_PASSWD_COMPAT, "endpwent",
-		    compatsrc, 0);
-		break;
-	default:
-		break;
-	}
-	return (NS_UNAVAIL);
-#undef set_setent
-}
-
-
-static int
-compat_passwd(void *retval, void *mdata, va_list ap)
-{
-	char			 keybuf[MAXLOGNAME + 1];
-	DBT			 key, entry;
-	struct compat_state	*st;
-	enum nss_lookup_type	 how;
-	const char		*name;
-	struct passwd		*pwd;
-	char			*buffer, *pw_name;
-	char			*host, *user, *domain;
-	size_t			 bufsize;
-	uid_t			 uid;
-	uint32_t		 store;
-	int			 rv, from_compat, stayopen, *errnop;
-
-	from_compat = 0;
-	name = NULL;
-	uid = (uid_t)-1;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, const char *);
-		break;
-	case nss_lt_id:
-		uid = va_arg(ap, uid_t);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		rv = NS_NOTFOUND;
-		goto fin;
-	}
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	*errnop = compat_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-	if (how == nss_lt_all && st->keynum < 0) {
-		rv = NS_NOTFOUND;
-		goto fin;
-	}
-	if (st->db == NULL &&
-	    (st->db = pwdbopen(&st->version)) == NULL) {
-		*errnop = errno;
-		rv = NS_UNAVAIL;
-		goto fin;
-	}
-	if (how == nss_lt_all) {
-		if (st->keynum < 0) {
-			rv = NS_NOTFOUND;
-			goto fin;
-		}
-		stayopen = 1;
-	} else {
-		st->keynum = 0;
-		stayopen = st->stayopen;
-	}
-docompat:
-	rv = NS_NOTFOUND;
-	switch (st->compat) {
-	case COMPAT_MODE_ALL:
-		rv = compat_redispatch(st, how, how, name, name, uid, pwd,
-		    buffer, bufsize, errnop);
-		if (rv != NS_SUCCESS)
-			st->compat = COMPAT_MODE_OFF;
-		break;
-	case COMPAT_MODE_NETGROUP:
-		/* XXX getnetgrent is not thread-safe. */
-		do {
-			rv = getnetgrent(&host, &user, &domain);
-			if (rv == 0) {
-				endnetgrent();
-				st->compat = COMPAT_MODE_OFF;
-				rv = NS_NOTFOUND;
-				continue;
-			} else if (user == NULL || user[0] == '\0')
-				continue;
-			rv = compat_redispatch(st, how, nss_lt_name, name,
-			    user, uid, pwd, buffer, bufsize, errnop);
-		} while (st->compat == COMPAT_MODE_NETGROUP &&
-		    !(rv & NS_TERMINATE));
-		break;
-	case COMPAT_MODE_NAME:
-		rv = compat_redispatch(st, how, nss_lt_name, name, st->name,
-		    uid, pwd, buffer, bufsize, errnop);
-		free(st->name);
-		st->name = NULL;
-		st->compat = COMPAT_MODE_OFF;
-		break;
-	default:
-		break;
-	}
-	if (rv & NS_TERMINATE) {
-		from_compat = 1;
-		goto fin;
-	}
-	key.data = keybuf;
-	rv = NS_NOTFOUND;
-	while (st->keynum >= 0) {
-		st->keynum++;
-		if (st->version < _PWD_CURRENT_VERSION) {
-			memcpy(&keybuf[1], &st->keynum, sizeof(st->keynum));
-			key.size = sizeof(st->keynum) + 1;
-		} else {
-			store = htonl(st->keynum);
-			memcpy(&keybuf[1], &store, sizeof(store));
-			key.size = sizeof(store) + 1;
-		}
-		keybuf[0] = _PW_VERSIONED(_PW_KEYBYNUM, st->version);
-		rv = st->db->get(st->db, &key, &entry, 0);
-		if (rv < 0 || rv > 1) { /* should never return > 1 */
-			*errnop = errno;
-			rv = NS_UNAVAIL;
-			goto fin;
-		} else if (rv == 1) {
-			st->keynum = -1;
-			rv = NS_NOTFOUND;
-			goto fin;
-		}
-		pw_name = (char *)entry.data;
-		switch (pw_name[0]) {
-		case '+':
-			switch (pw_name[1]) {
-			case '\0':
-				st->compat = COMPAT_MODE_ALL;
-				break;
-			case '@':
-				setnetgrent(&pw_name[2]);
-				st->compat = COMPAT_MODE_NETGROUP;
-				break;
-			default:
-				st->name = strdup(&pw_name[1]);
-				if (st->name == NULL) {
-					syslog(LOG_ERR,
-					 "getpwent memory allocation failure");
-					*errnop = ENOMEM;
-					rv = NS_UNAVAIL;
-					break;
-				}
-				st->compat = COMPAT_MODE_NAME;
-			}
-			if (entry.size > bufsize) {
-				*errnop = ERANGE;
-				rv = NS_RETURN;
-				goto fin;
-			}
-			memcpy(buffer, entry.data, entry.size);
-			rv = pwdb_versions[st->version].parse(buffer,
-			    entry.size, pwd, errnop);
-			if (rv != NS_SUCCESS)
-				;
-			else if (compat_set_template(pwd, &st->template) < 0) {
-				*errnop = ENOMEM;
-				rv = NS_UNAVAIL;
-				goto fin;
-			}
-			goto docompat;
-		case '-':
-			switch (pw_name[1]) {
-			case '\0':
-				/* XXX Maybe syslog warning */
-				continue;
-			case '@':
-				setnetgrent(&pw_name[2]);
-				while (getnetgrent(&host, &user, &domain) !=
-				    0) {
-					if (user != NULL && user[0] != '\0')
-						compat_exclude(user,
-						    &st->exclude);
-				}
-				endnetgrent();
-				continue;
-			default:
-				compat_exclude(&pw_name[1], &st->exclude);
-				continue;
-			}
-			break;
-		default:
-			break;
-		}
-		if (compat_is_excluded((char *)entry.data, st->exclude))
-			continue;
-		rv = pwdb_versions[st->version].match(entry.data, entry.size,
-		    how, name, uid);
-		if (rv == NS_RETURN)
-			break;
-		else if (rv != NS_SUCCESS)
-			continue;
-		if (entry.size > bufsize) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-		memcpy(buffer, entry.data, entry.size);
-		rv = pwdb_versions[st->version].parse(buffer, entry.size, pwd,
-		    errnop);
-		if (rv & NS_TERMINATE)
-			break;
-	}
-fin:
-	if (!stayopen && st->db != NULL) {
-		(void)st->db->close(st->db);
-		st->db = NULL;
-	}
-	if (rv == NS_SUCCESS) {
-		if (!from_compat) {
-			pwd->pw_fields &= ~_PWF_SOURCE;
-			pwd->pw_fields |= _PWF_FILES;
-		}
-		if (retval != NULL)
-			*(struct passwd **)retval = pwd;
-	}
-	return (rv);
-}
-
-
-/*
- * common passwd line matching and parsing
- */
-int
-__pw_match_entry(const char *entry, size_t entrysize, enum nss_lookup_type how,
-    const char *name, uid_t uid)
-{
-	const char	*p, *eom;
-	char		*q;
-	size_t		 len;
-	unsigned long	 m;
-
-	eom = entry + entrysize;
-	for (p = entry; p < eom; p++)
-		if (*p == ':')
-			break;
-	if (*p != ':')
-		return (NS_NOTFOUND);
-	if (how == nss_lt_all)
-		return (NS_SUCCESS);
-	if (how == nss_lt_name) {
-		len = strlen(name);
-		if (len == (p - entry) && memcmp(name, entry, len) == 0)
-			return (NS_SUCCESS);
-		else
-			return (NS_NOTFOUND);
-	}
-	for (p++; p < eom; p++)
-		if (*p == ':')
-			break;
-	if (*p != ':')
-		return (NS_NOTFOUND);
-	m = strtoul(++p, &q, 10);
-	if (q[0] != ':' || (uid_t)m != uid)
-		return (NS_NOTFOUND);
-	else
-		return (NS_SUCCESS);
-}
-
-
-/* XXX buffer must be NUL-terminated.  errnop is not set correctly. */
-int
-__pw_parse_entry(char *buffer, size_t bufsize __unused, struct passwd *pwd,
-    int master, int *errnop __unused)
-{
-
-	if (__pw_scan(buffer, pwd, master ? _PWSCAN_MASTER : 0) == 0)
-		return (NS_NOTFOUND);
-	else
-		return (NS_SUCCESS);
-}
diff --git a/lib/libc_bsd/gen/getttyent.3 b/lib/libc_bsd/gen/getttyent.3
deleted file mode 100644
index 83bffb1..0000000
--- a/lib/libc_bsd/gen/getttyent.3
+++ /dev/null
@@ -1,208 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getttyent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getttyent.3 202275 2010-01-14 05:37:43Z ed $
-.\"
-.Dd November 17, 1996
-.Dt GETTTYENT 3
-.Os
-.Sh NAME
-.Nm getttyent ,
-.Nm getttynam ,
-.Nm setttyent ,
-.Nm endttyent ,
-.Nm isdialuptty ,
-.Nm isnettty
-.Nd
-.Xr ttys 5
-file routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ttyent.h
-.Ft struct ttyent *
-.Fn getttyent void
-.Ft struct ttyent *
-.Fn getttynam "const char *name"
-.Ft int
-.Fn setttyent void
-.Ft int
-.Fn endttyent void
-.Ft int
-.Fn isdialuptty "const char *name"
-.Ft int
-.Fn isnettty "const char *name"
-.Sh DESCRIPTION
-The
-.Fn getttyent ,
-and
-.Fn getttynam
-functions
-each return a pointer to an object, with the following structure,
-containing the broken-out fields of a line from the tty description
-file.
-.Bd -literal
-struct ttyent {
-	char	*ty_name;	/* terminal device name */
-	char	*ty_getty;	/* command to execute, usually getty */
-	char	*ty_type;	/* terminal type for termcap */
-#define	TTY_ON		0x01	/* enable logins (start ty_getty program) */
-#define	TTY_SECURE	0x02	/* allow uid of 0 to login */
-#define	TTY_DIALUP	0x04	/* is a dialup tty */
-#define	TTY_NETWORK	0x08	/* is a network tty */
-	int	ty_status;	/* status flags */
-	char	*ty_window;	/* command to start up window manager */
-	char	*ty_comment;	/* comment field */
-	char	*ty_group;	/* tty group name */
-};
-.Ed
-.Pp
-The fields are as follows:
-.Bl -tag -width ty_comment
-.It Fa ty_name
-The name of the character-special file.
-.It Fa ty_getty
-The name of the command invoked by
-.Xr init 8
-to initialize tty line characteristics.
-.It Fa ty_type
-The name of the default terminal type connected to this tty line.
-.It Fa ty_status
-A mask of bit fields which indicate various actions allowed on this
-tty line.
-The possible flags are as follows:
-.Bl -tag -width TTY_NETWORK
-.It Dv TTY_ON
-Enables logins (i.e.,
-.Xr init 8
-will start the command referenced by
-.Fa ty_getty
-on this entry).
-.It Dv TTY_SECURE
-Allow users with a uid of 0 to login on this terminal.
-.It Dv TTY_DIALUP
-Identifies a tty as a dialin line.
-If this flag is set, then
-.Fn isdialuptty
-will return a non-zero value.
-.It Dv TTY_NETWORK
-Identifies a tty used for network connections.
-If this flag is set, then
-.Fn isnettty
-will return a non-zero value.
-.El
-.It Fa ty_window
-The command to execute for a window system associated with the line.
-.It Fa ty_group
-A group name to which the tty belongs.
-If no group is specified in the ttys description file,
-then the tty is placed in an anonymous group called "none".
-.It Fa ty_comment
-Any trailing comment field, with any leading hash marks (``#'') or
-whitespace removed.
-.El
-.Pp
-If any of the fields pointing to character strings are unspecified,
-they are returned as null pointers.
-The field
-.Fa ty_status
-will be zero if no flag values are specified.
-.Pp
-See
-.Xr ttys 5
-for a more complete discussion of the meaning and usage of the
-fields.
-.Pp
-The
-.Fn getttyent
-function
-reads the next line from the ttys file, opening the file if necessary.
-The
-.Fn setttyent
-function
-rewinds the file if open, or opens the file if it is unopened.
-The
-.Fn endttyent
-function
-closes any open files.
-.Pp
-The
-.Fn getttynam
-function
-searches from the beginning of the file until a matching
-.Fa name
-is found
-(or until
-.Dv EOF
-is encountered).
-.Sh RETURN VALUES
-The routines
-.Fn getttyent
-and
-.Fn getttynam
-return a null pointer on
-.Dv EOF
-or error.
-The
-.Fn setttyent
-function
-and
-.Fn endttyent
-return 0 on failure and 1 on success.
-.Pp
-The routines
-.Fn isdialuptty
-and
-.Fn isnettty
-return non-zero if the dialup or network flag is set for the
-tty entry relating to the tty named by the argument, and
-zero otherwise.
-.Sh FILES
-.Bl -tag -width /etc/ttys -compact
-.It Pa /etc/ttys
-.El
-.Sh SEE ALSO
-.Xr login 1 ,
-.Xr gettytab 5 ,
-.Xr termcap 5 ,
-.Xr ttys 5 ,
-.Xr getty 8 ,
-.Xr init 8
-.Sh HISTORY
-The
-.Fn getttyent ,
-.Fn getttynam ,
-.Fn setttyent ,
-and
-.Fn endttyent
-functions appeared in
-.Bx 4.3 .
-.Sh BUGS
-These functions use static data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
diff --git a/lib/libc_bsd/gen/getttyent.c b/lib/libc_bsd/gen/getttyent.c
deleted file mode 100644
index 8d4f01f..0000000
--- a/lib/libc_bsd/gen/getttyent.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getttyent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getttyent.c 267236 2014-06-08 17:50:07Z nwhitehorn $");
-
-#include <ttyent.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-
-static char zapchar;
-static FILE *tf;
-static size_t lbsize;
-static char *line;
-
-#define	MALLOCCHUNK	100
-
-static char *skip(char *);
-static char *value(char *);
-
-struct ttyent *
-getttynam(const char *tty)
-{
-	struct ttyent *t;
-
-	if (strncmp(tty, "/dev/", 5) == 0)
-		tty += 5;
-	setttyent();
-	while ( (t = getttyent()) )
-		if (!strcmp(tty, t->ty_name))
-			break;
-	endttyent();
-	return (t);
-}
-
-static int
-auto_tty_status(const char *ty_name)
-{
-	size_t len;
-	char *buf, *cons, *nextcons;
-
-	/* Check if this is an enabled kernel console line */
-	buf = NULL;
-	if (sysctlbyname("kern.console", NULL, &len, NULL, 0) == -1)
-		return (0); /* Errors mean don't enable */
-	buf = malloc(len);
-	if (sysctlbyname("kern.console", buf, &len, NULL, 0) == -1)
-		goto done;
-
-	if ((cons = strchr(buf, '/')) == NULL)
-		goto done;
-	*cons = '\0';
-	nextcons = buf;
-	while ((cons = strsep(&nextcons, ",")) != NULL && strlen(cons) != 0) {
-		if (strcmp(cons, ty_name) == 0) {
-			free(buf);
-			return (TTY_ON);
-		}
-	}
-
-done:
-	free(buf);
-	return (0);
-}
-
-struct ttyent *
-getttyent(void)
-{
-	static struct ttyent tty;
-	char *p;
-	int c;
-	size_t i;
-
-	if (!tf && !setttyent())
-		return (NULL);
-	for (;;) {
-		if (!fgets(p = line, lbsize, tf))
-			return (NULL);
-		/* extend buffer if line was too big, and retry */
-		while (!strchr(p, '\n') && !feof(tf)) {
-			i = strlen(p);
-			lbsize += MALLOCCHUNK;
-			if ((p = realloc(line, lbsize)) == NULL) {
-				(void)endttyent();
-				return (NULL);
-			}
-			line = p;
-			if (!fgets(&line[i], lbsize - i, tf))
-				return (NULL);
-		}
-		while (isspace((unsigned char)*p))
-			++p;
-		if (*p && *p != '#')
-			break;
-	}
-
-#define scmp(e) !strncmp(p, e, sizeof(e) - 1) && isspace((unsigned char)p[sizeof(e) - 1])
-#define	vcmp(e)	!strncmp(p, e, sizeof(e) - 1) && p[sizeof(e) - 1] == '='
-
-	zapchar = 0;
-	tty.ty_name = p;
-	tty.ty_status = 0;
-	tty.ty_window = NULL;
-	tty.ty_group  = _TTYS_NOGROUP;
-
-	p = skip(p);
-	if (!*(tty.ty_getty = p))
-		tty.ty_getty = tty.ty_type = NULL;
-	else {
-		p = skip(p);
-		if (!*(tty.ty_type = p))
-			tty.ty_type = NULL;
-		else {
-			/* compatibility kludge: handle network/dialup specially */
-			if (scmp(_TTYS_DIALUP))
-				tty.ty_status |= TTY_DIALUP;
-			else if (scmp(_TTYS_NETWORK))
-				tty.ty_status |= TTY_NETWORK;
-			p = skip(p);
-		}
-	}
-
-	for (; *p; p = skip(p)) {
-		if (scmp(_TTYS_OFF))
-			tty.ty_status &= ~TTY_ON;
-		else if (scmp(_TTYS_ON))
-			tty.ty_status |= TTY_ON;
-		else if (scmp(_TTYS_ONIFCONSOLE))
-			tty.ty_status |= auto_tty_status(tty.ty_name);
-		else if (scmp(_TTYS_SECURE))
-			tty.ty_status |= TTY_SECURE;
-		else if (scmp(_TTYS_INSECURE))
-			tty.ty_status &= ~TTY_SECURE;
-		else if (scmp(_TTYS_DIALUP))
-			tty.ty_status |= TTY_DIALUP;
-		else if (scmp(_TTYS_NETWORK))
-			tty.ty_status |= TTY_NETWORK;
-		else if (vcmp(_TTYS_WINDOW))
-			tty.ty_window = value(p);
-		else if (vcmp(_TTYS_GROUP))
-			tty.ty_group = value(p);
-		else
-			break;
-	}
-
-	if (zapchar == '#' || *p == '#')
-		while ((c = *++p) == ' ' || c == '\t')
-			;
-	tty.ty_comment = p;
-	if (*p == 0)
-		tty.ty_comment = 0;
-	if ((p = strchr(p, '\n')))
-		*p = '\0';
-	return (&tty);
-}
-
-#define	QUOTED	1
-
-/*
- * Skip over the current field, removing quotes, and return a pointer to
- * the next field.
- */
-static char *
-skip(char *p)
-{
-	char *t;
-	int c, q;
-
-	for (q = 0, t = p; (c = *p) != '\0'; p++) {
-		if (c == '"') {
-			q ^= QUOTED;	/* obscure, but nice */
-			continue;
-		}
-		if (q == QUOTED && *p == '\\' && *(p+1) == '"')
-			p++;
-		*t++ = *p;
-		if (q == QUOTED)
-			continue;
-		if (c == '#') {
-			zapchar = c;
-			*p = 0;
-			break;
-		}
-		if (c == '\t' || c == ' ' || c == '\n') {
-			zapchar = c;
-			*p++ = 0;
-			while ((c = *p) == '\t' || c == ' ' || c == '\n')
-				p++;
-			break;
-		}
-	}
-	*--t = '\0';
-	return (p);
-}
-
-static char *
-value(char *p)
-{
-
-	return ((p = strchr(p, '=')) ? ++p : NULL);
-}
-
-int
-setttyent(void)
-{
-
-	if (line == NULL) {
-		if ((line = malloc(MALLOCCHUNK)) == NULL)
-			return (0);
-		lbsize = MALLOCCHUNK;
-	}
-	if (tf) {
-		rewind(tf);
-		return (1);
-	} else if ( (tf = fopen(_PATH_TTYS, "re")) )
-		return (1);
-	return (0);
-}
-
-int
-endttyent(void)
-{
-	int rval;
-
-	/*
-         * NB: Don't free `line' because getttynam()
-	 * may still be referencing it
-	 */
-	if (tf) {
-		rval = (fclose(tf) != EOF);
-		tf = NULL;
-		return (rval);
-	}
-	return (1);
-}
-
-static int
-isttystat(const char *tty, int flag)
-{
-	struct ttyent *t;
-
-	return ((t = getttynam(tty)) == NULL) ? 0 : !!(t->ty_status & flag);
-}
-
-
-int
-isdialuptty(const char *tty)
-{
-
-	return isttystat(tty, TTY_DIALUP);
-}
-
-int
-isnettty(const char *tty)
-{
-
-	return isttystat(tty, TTY_NETWORK);
-}
diff --git a/lib/libc_bsd/gen/getusershell.3 b/lib/libc_bsd/gen/getusershell.3
deleted file mode 100644
index 63b5593..0000000
--- a/lib/libc_bsd/gen/getusershell.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\"	$NetBSD: getusershell.3,v 1.6 1999/03/22 19:44:42 garbled Exp $
-.\"
-.\" Copyright (c) 1985, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getusershell.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getusershell.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd January 16, 1999
-.Dt GETUSERSHELL 3
-.Os
-.Sh NAME
-.Nm getusershell ,
-.Nm setusershell ,
-.Nm endusershell
-.Nd get valid user shells
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn getusershell void
-.Ft void
-.Fn setusershell void
-.Ft void
-.Fn endusershell void
-.Sh DESCRIPTION
-The
-.Fn getusershell
-function
-returns a pointer to a valid user shell as defined by the
-system manager in the shells database as described in
-.Xr shells 5 .
-If the shells database is not available,
-.Fn getusershell
-behaves as if
-.Pa /bin/sh
-and
-.Pa /bin/csh
-were listed.
-.Pp
-The
-.Fn getusershell
-function
-reads the next
-line (opening the file if necessary);
-.Fn setusershell
-rewinds the file;
-.Fn endusershell
-closes it.
-.Sh FILES
-.Bl -tag -width /etc/shells -compact
-.It Pa /etc/shells
-.El
-.Sh DIAGNOSTICS
-The routine
-.Fn getusershell
-returns a null pointer (0) on
-.Dv EOF .
-.Sh SEE ALSO
-.Xr nsswitch.conf 5 ,
-.Xr shells 5
-.Sh HISTORY
-The
-.Fn getusershell
-function appeared in
-.Bx 4.3 .
-.Sh BUGS
-The
-.Fn getusershell
-function leaves its result in an internal static object and returns
-a pointer to that object.
-Subsequent calls to
-.Fn getusershell
-will modify the same object.
diff --git a/lib/libc_bsd/gen/getusershell.c b/lib/libc_bsd/gen/getusershell.c
deleted file mode 100644
index 6acbcaa..0000000
--- a/lib/libc_bsd/gen/getusershell.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getusershell.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-/*	$NetBSD: getusershell.c,v 1.17 1999/01/25 01:09:34 lukem Exp $	*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getusershell.c 244092 2012-12-10 17:56:51Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/file.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <nsswitch.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stringlist.h>
-#include <unistd.h>
-
-#ifdef HESIOD
-#include <hesiod.h>
-#endif
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/ypclnt.h>
-#include <rpcsvc/yp_prot.h>
-#endif
-#include "un-namespace.h"
-
-static const char *const *curshell;
-static StringList	 *sl;
-
-static const char *const *initshells(void);
-
-/*
- * Get a list of shells from "shells" nsswitch database
- */
-char *
-getusershell(void)
-{
-	char *ret;
-
-	if (curshell == NULL)
-		curshell = initshells();
-	/*LINTED*/
-	ret = (char *)*curshell;
-	if (ret != NULL)
-		curshell++;
-	return (ret);
-}
-
-void
-endusershell(void)
-{
-	if (sl) {
-		sl_free(sl, 1);
-		sl = NULL;
-	}
-	curshell = NULL;
-}
-
-void
-setusershell(void)
-{
-
-	curshell = initshells();
-}
-
-
-static int	_local_initshells(void *, void *, va_list);
-
-/*ARGSUSED*/
-static int
-_local_initshells(rv, cb_data, ap)
-	void	*rv;
-	void	*cb_data;
-	va_list	 ap;
-{
-	char	*sp, *cp;
-	FILE	*fp;
-	char	 line[MAXPATHLEN + 2];
-
-	if (sl)
-		sl_free(sl, 1);
-	sl = sl_init();
-
-	if ((fp = fopen(_PATH_SHELLS, "re")) == NULL)
-		return NS_UNAVAIL;
-
-	cp = line;
-	while (fgets(cp, MAXPATHLEN + 1, fp) != NULL) {
-		while (*cp != '#' && *cp != '/' && *cp != '\0')
-			cp++;
-		if (*cp == '#' || *cp == '\0')
-			continue;
-		sp = cp;
-		while (!isspace(*cp) && *cp != '#' && *cp != '\0')
-			cp++;
-		*cp++ = '\0';
-		sl_add(sl, strdup(sp));
-	}
-	(void)fclose(fp);
-	return NS_SUCCESS;
-}
-
-#ifdef HESIOD
-static int	_dns_initshells(void *, void *, va_list);
-
-/*ARGSUSED*/
-static int
-_dns_initshells(rv, cb_data, ap)
-	void	*rv;
-	void	*cb_data;
-	va_list	 ap;
-{
-	char	  shellname[] = "shells-XXXXX";
-	int	  hsindex, hpi, r;
-	char	**hp;
-	void	 *context;
-
-	if (sl)
-		sl_free(sl, 1);
-	sl = sl_init();
-	r = NS_UNAVAIL;
-	if (hesiod_init(&context) == -1)
-		return (r);
-
-	for (hsindex = 0; ; hsindex++) {
-		snprintf(shellname, sizeof(shellname)-1, "shells-%d", hsindex);
-		hp = hesiod_resolve(context, shellname, "shells");
-		if (hp == NULL) {
-			if (errno == ENOENT) {
-				if (hsindex == 0)
-					r = NS_NOTFOUND;
-				else
-					r = NS_SUCCESS;
-			}
-			break;
-		} else {
-			for (hpi = 0; hp[hpi]; hpi++)
-				sl_add(sl, hp[hpi]);
-			free(hp);
-		}
-	}
-	hesiod_end(context);
-	return (r);
-}
-#endif /* HESIOD */
-
-#ifdef YP
-static int	_nis_initshells(void *, void *, va_list);
-
-/*ARGSUSED*/
-static int
-_nis_initshells(rv, cb_data, ap)
-	void	*rv;
-	void	*cb_data;
-	va_list	 ap;
-{
-	static char *ypdomain;
-	char	*key, *data;
-	char	*lastkey;
-	int	 keylen, datalen;
-	int	 r;
-
-	if (sl)
-		sl_free(sl, 1);
-	sl = sl_init();
-
-	if (ypdomain == NULL) {
-		switch (yp_get_default_domain(&ypdomain)) {
-		case 0:
-			break;
-		case YPERR_RESRC:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	}
-
-	/*
-	 * `key' and `data' point to strings dynamically allocated by
-	 * the yp_... functions.
-	 * `data' is directly put into the stringlist of shells.
-	 */
-	key = data = NULL;
-	if (yp_first(ypdomain, "shells", &key, &keylen, &data, &datalen))
-		return NS_UNAVAIL;
-	do {
-		data[datalen] = '\0';		/* clear trailing \n */
-		sl_add(sl, data);
-
-		lastkey = key;
-		r = yp_next(ypdomain, "shells", lastkey, keylen,
-		    &key, &keylen, &data, &datalen);
-		free(lastkey);
-	} while (r == 0);
-	
-	if (r == YPERR_NOMORE) {
-		/*
-		 * `data' and `key' ought to be NULL - do not try to free them.
-		 */
-		return NS_SUCCESS;
-	}
-
-	return NS_UNAVAIL;
-}
-#endif /* YP */
-
-static const char *const *
-initshells()
-{
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_local_initshells, NULL)
-		NS_DNS_CB(_dns_initshells, NULL)
-		NS_NIS_CB(_nis_initshells, NULL)
-		{ 0 }
-	};
-	if (sl)
-		sl_free(sl, 1);
-	sl = sl_init();
-
-	if (_nsdispatch(NULL, dtab, NSDB_SHELLS, "initshells", __nsdefaultsrc)
-	    != NS_SUCCESS) {
-		if (sl)
-			sl_free(sl, 1);
-		sl = sl_init();
-		/*
-		 * Local shells should NOT be added here.  They should be
-		 * added in /etc/shells.
-		 */
-		sl_add(sl, strdup(_PATH_BSHELL));
-		sl_add(sl, strdup(_PATH_CSHELL));
-	}
-	sl_add(sl, NULL);
-
-	return (const char *const *)(sl->sl_str);
-}
diff --git a/lib/libc_bsd/gen/getutxent.3 b/lib/libc_bsd/gen/getutxent.3
deleted file mode 100644
index 2b547ca..0000000
--- a/lib/libc_bsd/gen/getutxent.3
+++ /dev/null
@@ -1,478 +0,0 @@
-.\" Copyright (c) 2010 Ed Schouten <ed@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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/getutxent.3 231530 2012-02-11 20:28:42Z ed $
-.\"
-.Dd October 27, 2011
-.Dt GETUTXENT 3
-.Os
-.Sh NAME
-.Nm endutxent ,
-.Nm getutxent ,
-.Nm getutxid ,
-.Nm getutxline ,
-.Nm getutxuser ,
-.Nm pututxline ,
-.Nm setutxdb ,
-.Nm setutxent
-.Nd user accounting database functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In utmpx.h
-.Ft void
-.Fn endutxent "void"
-.Ft struct utmpx *
-.Fn getutxent "void"
-.Ft struct utmpx *
-.Fn getutxid "const struct utmpx *id"
-.Ft struct utmpx *
-.Fn getutxline "const struct utmpx *line"
-.Ft struct utmpx *
-.Fn getutxuser "const char *user"
-.Ft struct utmpx *
-.Fn pututxline "const struct utmpx *utmpx"
-.Ft int
-.Fn setutxdb "int type" "const char *file"
-.Ft void
-.Fn setutxent "void"
-.Sh DESCRIPTION
-These functions operate on the user accounting database which stores
-records of various system activities, such as user login and logouts,
-but also system startups and shutdowns and modifications to the system's
-clock.
-The system stores these records in three databases, each having a
-different purpose:
-.Bl -tag -width indent
-.It Pa /var/run/utx.active
-Log of currently active user login sessions.
-This file is similar to the traditional
-.Pa utmp
-file.
-This file only contains process related entries, such as user login and
-logout records.
-.It Pa /var/log/utx.lastlogin
-Log of last user login entries per user.
-This file is similar to the traditional
-.Pa lastlog
-file.
-This file only contains user login records for users who have at least
-logged in once.
-.It Pa /var/log/utx.log
-Log of all entries, sorted by date of addition.
-This file is similar to the traditional
-.Pa wtmp
-file.
-This file may contain any type of record described below.
-.El
-.Pp
-Each entry in these databases is defined by the structure
-.Vt utmpx
-found in the include file
-.In utmpx.h :
-.Bd -literal -offset indent
-struct utmpx {
-	short           ut_type;    /* Type of entry. */
-	struct timeval  ut_tv;      /* Time entry was made. */
-	char            ut_id[];    /* Record identifier. */
-	pid_t           ut_pid;     /* Process ID. */
-	char            ut_user[];  /* User login name. */
-	char            ut_line[];  /* Device name. */
-	char            ut_host[];  /* Remote hostname. */
-};
-.Ed
-.Pp
-The
-.Fa ut_type
-field indicates the type of the log entry, which can have one of the
-following values:
-.Bl -tag -width LOGIN_PROCESS
-.It Dv EMPTY
-No valid user accounting information.
-.It Dv BOOT_TIME
-Identifies time of system boot.
-.It Dv SHUTDOWN_TIME
-Identifies time of system shutdown.
-.It Dv OLD_TIME
-Identifies time when system clock changed.
-.It Dv NEW_TIME
-Identifies time after system clock changed.
-.It Dv USER_PROCESS
-Identifies a process.
-.It Dv INIT_PROCESS
-Identifies a process spawned by the init process.
-.It Dv LOGIN_PROCESS
-Identifies the session leader of a logged-in user.
-.It Dv DEAD_PROCESS
-Identifies a session leader who has exited.
-.El
-.Pp
-Entries of type
-.Dv INIT_PROCESS
-and
-.Dv LOGIN_PROCESS
-are not processed by this implementation.
-.Pp
-Other fields inside the structure are:
-.Bl -tag -width ut_user
-.It Fa ut_tv
-The time the event occurred.
-This field is used for all types of entries, except
-.Dv EMPTY .
-.It Fa ut_id
-An identifier that is used to refer to the entry.
-This identifier can be used to remove or replace a login entry by
-writing a new entry to the database containing the same value for
-.Fa ut_id .
-This field is only applicable to entries of type
-.Dv USER_PROCESS ,
-.Dv INIT_PROCESS ,
-.Dv LOGIN_PROCESS
-and
-.Dv DEAD_PROCESS .
-.It Fa ut_pid
-The process identifier of the session leader of the login session.
-This field is only applicable to entries of type
-.Dv USER_PROCESS ,
-.Dv INIT_PROCESS ,
-.Dv LOGIN_PROCESS
-and
-.Dv DEAD_PROCESS .
-.It Fa ut_user
-The user login name corresponding with the login session.
-This field is only applicable to entries of type
-.Dv USER_PROCESS
-and
-.Dv INIT_PROCESS .
-For
-.Dv INIT_PROCESS
-entries this entry typically contains the name of the login process.
-.It Fa ut_line
-The name of the TTY character device, without the leading
-.Pa /dev/
-prefix, corresponding with the device used to facilitate the user login
-session.
-If no TTY character device is used, this field is left blank.
-This field is only applicable to entries of type
-.Dv USER_PROCESS
-and
-.Dv LOGIN_PROCESS .
-.It Fa ut_host
-The network hostname of the remote system, connecting to perform a user
-login.
-If the user login session is not performed across a network, this field
-is left blank.
-This field is only applicable to entries of type
-.Dv USER_PROCESS .
-.El
-.Pp
-This implementation guarantees all inapplicable fields are discarded.
-The
-.Fa ut_user ,
-.Fa ut_line
-and
-.Fa ut_host
-fields of the structure returned by the library functions are also
-guaranteed to be null-terminated in this implementation.
-.Pp
-The
-.Fn getutxent
-function can be used to read the next entry from the user accounting
-database.
-.Pp
-The
-.Fn getutxid
-function searches for the next entry in the database of which the
-behaviour is based on the
-.Fa ut_type
-field of
-.Fa id .
-If
-.Fa ut_type
-has a value of
-.Dv BOOT_TIME ,
-.Dv SHUTDOWN_TIME ,
-.Dv OLD_TIME
-or
-.Dv NEW_TIME ,
-it will return the next entry whose
-.Fa ut_type
-has an equal value.
-If
-.Fa ut_type
-has a value of
-.Dv USER_PROCESS ,
-.Dv INIT_PROCESS ,
-.Dv LOGIN_PROCESS
-or
-.Dv DEAD_PROCESS ,
-it will return the next entry whose
-.Fa ut_type
-has one of the previously mentioned values and whose
-.Fa ut_id
-is equal.
-.Pp
-The
-.Fn getutxline
-function searches for the next entry in the database whose
-.Fa ut_type
-has a value of
-.Dv USER_PROCESS
-or
-.Dv LOGIN_PROCESS
-and whose
-.Fa ut_line
-is equal to the same field in
-.Fa line .
-.Pp
-The
-.Fn getutxuser
-function searches for the next entry in the database whose
-.Fa ut_type
-has a value of
-.Dv USER_PROCESS
-and whose
-.Fa ut_user
-is equal to
-.Fa user .
-.Pp
-The previously mentioned functions will automatically try to open the
-user accounting database if not already done so.
-The
-.Fn setutxdb
-and
-.Fn setutxent
-functions allow the database to be opened manually, causing the offset
-within the user accounting database to be rewound.
-The
-.Fn endutxent
-function closes the database.
-.Pp
-The
-.Fn setutxent
-database always opens the active sessions database.
-The
-.Fn setutxdb
-function opens the database identified by
-.Fa type ,
-whose value is either
-.Dv UTXDB_ACTIVE ,
-.Dv UTXDB_LASTLOGIN
-or
-.Dv UTXDB_LOG .
-It will open a custom file with filename
-.Fa file
-instead of the system-default if
-.Fa file
-is not null.
-Care must be taken that when using a custom filename,
-.Fa type
-still has to match with the actual format, since each database may use
-its own file format.
-.Pp
-The
-.Fn pututxline
-function writes record
-.Fa utmpx
-to the system-default user accounting databases.
-The value of
-.Fa ut_type
-determines which databases are modified.
-.Pp
-Entries of type
-.Dv SHUTDOWN_TIME ,
-.Dv OLD_TIME
-and
-.Dv NEW_TIME
-will only be written to
-.Pa /var/log/utx.log .
-.Pp
-Entries of type
-.Dv USER_PROCESS
-will also be written to
-.Pa /var/run/utx.active
-and
-.Pa /var/log/utx.lastlogin .
-.Pp
-Entries of type
-.Dv DEAD_PROCESS
-will only be written to
-.Pa /var/log/utx.log
-and
-.Pa /var/run/utx.active
-if a corresponding
-.Dv USER_PROCESS ,
-.Dv INIT_PROCESS
-or
-.Dv LOGIN_PROCESS
-entry whose
-.Fa ut_id
-is equal has been found in the latter.
-.Pp
-In addition, entries of type
-.Dv BOOT_TIME
-and
-.Dv SHUTDOWN_TIME
-will cause all existing entries in
-.Pa /var/run/utx.active
-to be discarded.
-.Pp
-All entries whose type has not been mentioned previously, are discarded
-by this implementation of
-.Fn pututxline .
-This implementation also ignores the value of
-.Fa ut_tv .
-.Sh RETURN VALUES
-The
-.Fn getutxent ,
-.Fn getutxid ,
-.Fn getutxline ,
-and
-.Fn getutxuser
-functions return a pointer to an
-.Vt utmpx
-structure that matches the mentioned constraints on success or
-.Dv NULL
-when reaching the end-of-file or when an error occurs.
-.Pp
-The
-.Fn pututxline
-function returns a pointer to an
-.Vt utmpx
-structure containing a copy of the structure written to disk upon
-success.
-It returns
-.Dv NULL
-when the provided
-.Vt utmpx
-is invalid, or
-.Fa ut_type
-has a value of
-.Dv DEAD_PROCESS
-and an entry with an identifier with a value equal to the field
-.Fa ut_id
-was not found; the global variable
-.Va errno
-is set to indicate the error.
-.Pp
-The
-.Fn setutxdb
-function returns 0 if the user accounting database was opened
-successfully.
-Otherwise, -1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-In addition to the error conditions described in
-.Xr open 2 ,
-.Xr fdopen 3 ,
-.Xr fopen 3 ,
-.Xr fseek 3 ,
-the
-.Fn pututxline
-function can generate the following errors:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-The value of
-.Fa ut_type
-is DEAD_PROCESS, and the process entry could not be found.
-.It Bq Er EINVAL
-The value of
-.Fa ut_type
-is not supported by this implementation.
-.El
-In addition to the error conditions described in
-.Xr fopen 3 ,
-the
-.Fn setutxdb
-function can generate the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa type
-argument contains a value not supported by this implementation.
-.It Bq Er EFTYPE
-The file format is invalid.
-.El
-.Sh SEE ALSO
-.Xr last 1 ,
-.Xr write 1 ,
-.Xr getpid 2 ,
-.Xr gettimeofday 2 ,
-.Xr tty 4 ,
-.Xr ac 8 ,
-.Xr newsyslog 8 ,
-.Xr utx 8
-.Sh STANDARDS
-The
-.Fn endutxent ,
-.Fn getutxent ,
-.Fn getutxid ,
-.Fn getutxline
-and
-.Fn setutxent
-functions are expected to conform to
-.St -p1003.1-2008 .
-.Pp
-The
-.Fn pututxline
-function deviates from the standard by writing its records to multiple
-database files, depending on its
-.Fa ut_type .
-This prevents the need for special utility functions to update the other
-databases, such as the
-.Fn updlastlogx
-and
-.Fn updwtmpx
-functions which are available in other implementations.
-It also tries to replace
-.Dv DEAD_PROCESS
-entries in the active sessions database when storing
-.Dv USER_PROCESS
-entries and no entry with the same value for
-.Fa ut_id
-has been found.
-The standard always requires a new entry to be allocated, which could
-cause an unbounded growth of the database.
-.Pp
-The
-.Fn getutxuser
-and
-.Fn setutxdb
-functions,
-the
-.Fa ut_host
-field of the
-.Vt utmpx
-structure and
-.Dv SHUTDOWN_TIME
-are extensions.
-.Sh HISTORY
-These functions appeared in
-.Fx 9.0 .
-They replaced the
-.In utmp.h
-interface.
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/getutxent.c b/lib/libc_bsd/gen/getutxent.c
deleted file mode 100644
index 64778ea..0000000
--- a/lib/libc_bsd/gen/getutxent.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*-
- * Copyright (c) 2010 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getutxent.c 257320 2013-10-29 09:23:51Z glebius $");
-
-#include "namespace.h"
-#include <sys/endian.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <utmpx.h>
-#include "utxdb.h"
-#include "un-namespace.h"
-
-#ifdef __NO_TLS
-static FILE *uf = NULL;
-static int udb;
-#else
-static _Thread_local FILE *uf = NULL;
-static _Thread_local int udb;
-#endif
-
-int
-setutxdb(int db, const char *file)
-{
-	struct stat sb;
-
-	switch (db) {
-	case UTXDB_ACTIVE:
-		if (file == NULL)
-			file = _PATH_UTX_ACTIVE;
-		break;
-	case UTXDB_LASTLOGIN:
-		if (file == NULL)
-			file = _PATH_UTX_LASTLOGIN;
-		break;
-	case UTXDB_LOG:
-		if (file == NULL)
-			file = _PATH_UTX_LOG;
-		break;
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (uf != NULL)
-		fclose(uf);
-	uf = fopen(file, "re");
-	if (uf == NULL)
-		return (-1);
-
-	if (db != UTXDB_LOG) {
-		/* Safety check: never use broken files. */
-		if (_fstat(fileno(uf), &sb) != -1 &&
-		    sb.st_size % sizeof(struct futx) != 0) {
-			fclose(uf);
-			uf = NULL;
-			errno = EFTYPE;
-			return (-1);
-		}
-		/* Prevent reading of partial records. */
-		(void)setvbuf(uf, NULL, _IOFBF,
-		    rounddown(BUFSIZ, sizeof(struct futx)));
-	}
-
-	udb = db;
-	return (0);
-}
-
-void
-setutxent(void)
-{
-
-	setutxdb(UTXDB_ACTIVE, NULL);
-}
-
-void
-endutxent(void)
-{
-
-	if (uf != NULL) {
-		fclose(uf);
-		uf = NULL;
-	}
-}
-
-static int
-getfutxent(struct futx *fu)
-{
-
-	if (uf == NULL)
-		setutxent();
-	if (uf == NULL)
-		return (-1);
-
-	if (udb == UTXDB_LOG) {
-		uint16_t len;
-
-retry:
-		if (fread(&len, sizeof(len), 1, uf) != 1)
-			return (-1);
-		len = be16toh(len);
-		if (len == 0) {
-			/*
-			 * XXX: Though zero-size records are valid in theory,
-			 * they can never occur in practice. Zero-size records
-			 * indicate file corruption. Seek one byte forward, to
-			 * see if we can find a record there.
-			 */
-			ungetc('\0', uf);
-			goto retry;
-		}
-		if (len > sizeof *fu) {
-			/* Forward compatibility. */
-			if (fread(fu, sizeof(*fu), 1, uf) != 1)
-				return (-1);
-			fseek(uf, len - sizeof(*fu), SEEK_CUR);
-		} else {
-			/* Partial record. */
-			memset(fu, 0, sizeof(*fu));
-			if (fread(fu, len, 1, uf) != 1)
-				return (-1);
-		}
-	} else {
-		if (fread(fu, sizeof(*fu), 1, uf) != 1)
-			return (-1);
-	}
-	return (0);
-}
-
-struct utmpx *
-getutxent(void)
-{
-	struct futx fu;
-
-	if (getfutxent(&fu) != 0)
-		return (NULL);
-	return (futx_to_utx(&fu));
-}
-
-struct utmpx *
-getutxid(const struct utmpx *id)
-{
-	struct futx fu;
-
-	for (;;) {
-		if (getfutxent(&fu) != 0)
-			return (NULL);
-
-		switch (fu.fu_type) {
-		case USER_PROCESS:
-		case INIT_PROCESS:
-		case LOGIN_PROCESS:
-		case DEAD_PROCESS:
-			switch (id->ut_type) {
-			case USER_PROCESS:
-			case INIT_PROCESS:
-			case LOGIN_PROCESS:
-			case DEAD_PROCESS:
-				if (memcmp(fu.fu_id, id->ut_id,
-				    MIN(sizeof(fu.fu_id), sizeof(id->ut_id))) ==
-				    0)
-					goto found;
-			}
-			break;
-		default:
-			if (fu.fu_type == id->ut_type)
-				goto found;
-			break;
-		}
-	}
-
-found:
-	return (futx_to_utx(&fu));
-}
-
-struct utmpx *
-getutxline(const struct utmpx *line)
-{
-	struct futx fu;
-
-	for (;;) {
-		if (getfutxent(&fu) != 0)
-			return (NULL);
-
-		switch (fu.fu_type) {
-		case USER_PROCESS:
-		case LOGIN_PROCESS:
-			if (strncmp(fu.fu_line, line->ut_line,
-			    MIN(sizeof(fu.fu_line), sizeof(line->ut_line))) ==
-			    0)
-				goto found;
-			break;
-		}
-	}
-
-found:
-	return (futx_to_utx(&fu));
-}
-
-struct utmpx *
-getutxuser(const char *user)
-{
-	struct futx fu;
-
-	for (;;) {
-		if (getfutxent(&fu) != 0)
-			return (NULL);
-
-		switch (fu.fu_type) {
-		case USER_PROCESS:
-			if (strncmp(fu.fu_user, user, sizeof(fu.fu_user)) == 0)
-				goto found;
-			break;
-		}
-	}
-
-found:
-	return (futx_to_utx(&fu));
-}
diff --git a/lib/libc_bsd/gen/getvfsbyname.3 b/lib/libc_bsd/gen/getvfsbyname.3
deleted file mode 100644
index ceae445..0000000
--- a/lib/libc_bsd/gen/getvfsbyname.3
+++ /dev/null
@@ -1,122 +0,0 @@
-.\" Copyright (c) 1995
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)kvm_getvfsbyname.3	8.3 (Berkeley) 5/4/95
-.\" $FreeBSD: releng/10.2/lib/libc/gen/getvfsbyname.3 185029 2008-11-17 20:49:29Z pjd $
-.\"
-.Dd April 5, 2007
-.Dt GETVFSBYNAME 3
-.Os
-.Sh NAME
-.Nm getvfsbyname
-.Nd get information about a file system
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/mount.h
-.Ft int
-.Fn getvfsbyname "const char *name" "struct xvfsconf *vfc"
-.Sh DESCRIPTION
-The
-.Fn getvfsbyname
-function provides access to information about a
-file system module that is configured in the kernel.
-If successful,
-the requested file system
-.Fa xvfsconf
-is returned in the location pointed to by
-.Fa vfc .
-The fields in a
-.Dq Li struct xvfsconf
-are defined as follows:
-.Pp
-.Bl -tag -compact -width vfc_refcount
-.It vfc_name
-the name of the file system
-.It vfc_typenum
-the file system type number assigned by the kernel
-.It vfc_refcount
-the number of active mount points using the file system
-.It vfc_flags
-flag bits, as described below
-.El
-.Pp
-The flags are defined as follows:
-.Pp
-.Bl -tag -width VFCF_DELEGADMIN -compact
-.It Dv VFCF_STATIC
-statically compiled into kernel
-.It Dv VFCF_NETWORK
-may get data over the network
-.It Dv VFCF_READONLY
-writes are not implemented
-.It Dv VFCF_SYNTHETIC
-data does not represent real files
-.It Dv VFCF_LOOPBACK
-aliases some other mounted FS
-.It Dv VFCF_UNICODE
-stores file names as Unicode
-.It Dv VFCF_JAIL
-can be mounted from within a jail if
-.Va security.jail.mount_allowed
-sysctl is set to
-.Dv 1
-.It Dv VFCF_DELEGADMIN
-supports delegated administration if
-.Va vfs.usermount
-sysctl is set to
-.Dv 1
-.El
-.Sh RETURN VALUES
-.Rv -std getvfsbyname
-.Sh ERRORS
-The following errors may be reported:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa vfc
-argument
-points to an invalid address.
-.It Bq Er ENOENT
-The
-.Fa name
-argument
-specifies a file system that is unknown or not configured in the kernel.
-.El
-.Sh SEE ALSO
-.Xr jail 2 ,
-.Xr mount 2 ,
-.Xr sysctl 3 ,
-.Xr jail 8 ,
-.Xr mount 8 ,
-.Xr sysctl 8
-.Sh HISTORY
-A variant of the
-.Fn getvfsbyname
-function first appeared in
-.Fx 2.0 .
diff --git a/lib/libc_bsd/gen/getvfsbyname.c b/lib/libc_bsd/gen/getvfsbyname.c
deleted file mode 100644
index 55ba5cc..0000000
--- a/lib/libc_bsd/gen/getvfsbyname.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 1995
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)kvm_getvfsbyname.c	8.1 (Berkeley) 4/3/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/getvfsbyname.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/sysctl.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Given a filesystem name, determine if it is resident in the kernel,
- * and if it is resident, return its xvfsconf structure.
- */
-int
-getvfsbyname(fsname, vfcp)
-	const char *fsname;
-	struct xvfsconf *vfcp;
-{
-	struct xvfsconf *xvfsp;
-	size_t buflen;
-	int cnt, i;
-
-	if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0)
-		return (-1);
-	xvfsp = malloc(buflen);
-	if (xvfsp == NULL)
-		return (-1);
-	if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) {
-		free(xvfsp);
-		return (-1);
-	}
-	cnt = buflen / sizeof(struct xvfsconf);
-	for (i = 0; i < cnt; i++) {
-		if (strcmp(fsname, xvfsp[i].vfc_name) == 0) {
-			memcpy(vfcp, xvfsp + i, sizeof(struct xvfsconf));
-			free(xvfsp);
-			return (0);
-		}
-	}
-	free(xvfsp);
-	errno = ENOENT;
-	return (-1);
-}
diff --git a/lib/libc_bsd/gen/glob.3 b/lib/libc_bsd/gen/glob.3
deleted file mode 100644
index 0adbf6c..0000000
--- a/lib/libc_bsd/gen/glob.3
+++ /dev/null
@@ -1,471 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Guido van Rossum.
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)glob.3	8.3 (Berkeley) 4/16/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/glob.3 228754 2011-12-20 22:56:13Z eadler $
-.\"
-.Dd December 20, 2011
-.Dt GLOB 3
-.Os
-.Sh NAME
-.Nm glob ,
-.Nm globfree
-.Nd generate pathnames matching a pattern
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In glob.h
-.Ft int
-.Fn glob "const char * restrict pattern" "int flags" "int (*errfunc)(const char *, int)" "glob_t * restrict pglob"
-.Ft void
-.Fn globfree "glob_t *pglob"
-.Sh DESCRIPTION
-The
-.Fn glob
-function
-is a pathname generator that implements the rules for file name pattern
-matching used by the shell.
-.Pp
-The include file
-.In glob.h
-defines the structure type
-.Fa glob_t ,
-which contains at least the following fields:
-.Bd -literal
-typedef struct {
-	size_t gl_pathc;	/* count of total paths so far */
-	size_t gl_matchc;	/* count of paths matching pattern */
-	size_t gl_offs;		/* reserved at beginning of gl_pathv */
-	int gl_flags;		/* returned flags */
-	char **gl_pathv;	/* list of paths matching pattern */
-} glob_t;
-.Ed
-.Pp
-The argument
-.Fa pattern
-is a pointer to a pathname pattern to be expanded.
-The
-.Fn glob
-argument
-matches all accessible pathnames against the pattern and creates
-a list of the pathnames that match.
-In order to have access to a pathname,
-.Fn glob
-requires search permission on every component of a path except the last
-and read permission on each directory of any filename component of
-.Fa pattern
-that contains any of the special characters
-.Ql * ,
-.Ql ?\&
-or
-.Ql \&[ .
-.Pp
-The
-.Fn glob
-argument
-stores the number of matched pathnames into the
-.Fa gl_pathc
-field, and a pointer to a list of pointers to pathnames into the
-.Fa gl_pathv
-field.
-The first pointer after the last pathname is
-.Dv NULL .
-If the pattern does not match any pathnames, the returned number of
-matched paths is set to zero.
-.Pp
-It is the caller's responsibility to create the structure pointed to by
-.Fa pglob .
-The
-.Fn glob
-function allocates other space as needed, including the memory pointed
-to by
-.Fa gl_pathv .
-.Pp
-The argument
-.Fa flags
-is used to modify the behavior of
-.Fn glob .
-The value of
-.Fa flags
-is the bitwise inclusive
-.Tn OR
-of any of the following
-values defined in
-.In glob.h :
-.Bl -tag -width GLOB_ALTDIRFUNC
-.It Dv GLOB_APPEND
-Append pathnames generated to the ones from a previous call (or calls)
-to
-.Fn glob .
-The value of
-.Fa gl_pathc
-will be the total matches found by this call and the previous call(s).
-The pathnames are appended to, not merged with the pathnames returned by
-the previous call(s).
-Between calls, the caller must not change the setting of the
-.Dv GLOB_DOOFFS
-flag, nor change the value of
-.Fa gl_offs
-when
-.Dv GLOB_DOOFFS
-is set, nor (obviously) call
-.Fn globfree
-for
-.Fa pglob .
-.It Dv GLOB_DOOFFS
-Make use of the
-.Fa gl_offs
-field.
-If this flag is set,
-.Fa gl_offs
-is used to specify how many
-.Dv NULL
-pointers to prepend to the beginning
-of the
-.Fa gl_pathv
-field.
-In other words,
-.Fa gl_pathv
-will point to
-.Fa gl_offs
-.Dv NULL
-pointers,
-followed by
-.Fa gl_pathc
-pathname pointers, followed by a
-.Dv NULL
-pointer.
-.It Dv GLOB_ERR
-Causes
-.Fn glob
-to return when it encounters a directory that it cannot open or read.
-Ordinarily,
-.Fn glob
-continues to find matches.
-.It Dv GLOB_MARK
-Each pathname that is a directory that matches
-.Fa pattern
-has a slash
-appended.
-.It Dv GLOB_NOCHECK
-If
-.Fa pattern
-does not match any pathname, then
-.Fn glob
-returns a list
-consisting of only
-.Fa pattern ,
-with the number of total pathnames set to 1, and the number of matched
-pathnames set to 0.
-The effect of backslash escaping is present in the pattern returned.
-.It Dv GLOB_NOESCAPE
-By default, a backslash
-.Pq Ql \e
-character is used to escape the following character in the pattern,
-avoiding any special interpretation of the character.
-If
-.Dv GLOB_NOESCAPE
-is set, backslash escaping is disabled.
-.It Dv GLOB_NOSORT
-By default, the pathnames are sorted in ascending
-.Tn ASCII
-order;
-this flag prevents that sorting (speeding up
-.Fn glob ) .
-.El
-.Pp
-The following values may also be included in
-.Fa flags ,
-however, they are non-standard extensions to
-.St -p1003.2 .
-.Bl -tag -width GLOB_ALTDIRFUNC
-.It Dv GLOB_ALTDIRFUNC
-The following additional fields in the pglob structure have been
-initialized with alternate functions for glob to use to open, read,
-and close directories and to get stat information on names found
-in those directories.
-.Bd -literal
-void *(*gl_opendir)(const char * name);
-struct dirent *(*gl_readdir)(void *);
-void (*gl_closedir)(void *);
-int (*gl_lstat)(const char *name, struct stat *st);
-int (*gl_stat)(const char *name, struct stat *st);
-.Ed
-.Pp
-This extension is provided to allow programs such as
-.Xr restore 8
-to provide globbing from directories stored on tape.
-.It Dv GLOB_BRACE
-Pre-process the pattern string to expand
-.Ql {pat,pat,...}
-strings like
-.Xr csh 1 .
-The pattern
-.Ql {}
-is left unexpanded for historical reasons (and
-.Xr csh 1
-does the same thing to
-ease typing
-of
-.Xr find 1
-patterns).
-.It Dv GLOB_MAGCHAR
-Set by the
-.Fn glob
-function if the pattern included globbing characters.
-See the description of the usage of the
-.Fa gl_matchc
-structure member for more details.
-.It Dv GLOB_NOMAGIC
-Is the same as
-.Dv GLOB_NOCHECK
-but it only appends the
-.Fa pattern
-if it does not contain any of the special characters ``*'', ``?'' or ``[''.
-.Dv GLOB_NOMAGIC
-is provided to simplify implementing the historic
-.Xr csh 1
-globbing behavior and should probably not be used anywhere else.
-.It Dv GLOB_TILDE
-Expand patterns that start with
-.Ql ~
-to user name home directories.
-.It Dv GLOB_LIMIT
-Limit the total number of returned pathnames to the value provided in
-.Fa gl_matchc
-(default
-.Dv ARG_MAX ) .
-This option should be set for programs
-that can be coerced into a denial of service attack
-via patterns that expand to a very large number of matches,
-such as a long string of
-.Ql */../*/.. .
-.El
-.Pp
-If, during the search, a directory is encountered that cannot be opened
-or read and
-.Fa errfunc
-is
-.Pf non- Dv NULL ,
-.Fn glob
-calls
-.Fa \*(lp*errfunc\*(rp Ns ( Fa path , errno ) .
-This may be unintuitive: a pattern like
-.Ql */Makefile
-will try to
-.Xr stat 2
-.Ql foo/Makefile
-even if
-.Ql foo
-is not a directory, resulting in a
-call to
-.Fa errfunc .
-The error routine can suppress this action by testing for
-.Er ENOENT
-and
-.Er ENOTDIR ;
-however, the
-.Dv GLOB_ERR
-flag will still cause an immediate
-return when this happens.
-.Pp
-If
-.Fa errfunc
-returns non-zero,
-.Fn glob
-stops the scan and returns
-.Dv GLOB_ABORTED
-after setting
-.Fa gl_pathc
-and
-.Fa gl_pathv
-to reflect any paths already matched.
-This also happens if an error is encountered and
-.Dv GLOB_ERR
-is set in
-.Fa flags ,
-regardless of the return value of
-.Fa errfunc ,
-if called.
-If
-.Dv GLOB_ERR
-is not set and either
-.Fa errfunc
-is
-.Dv NULL
-or
-.Fa errfunc
-returns zero, the error is ignored.
-.Pp
-The
-.Fn globfree
-function frees any space associated with
-.Fa pglob
-from a previous call(s) to
-.Fn glob .
-.Sh RETURN VALUES
-On successful completion,
-.Fn glob
-returns zero.
-In addition the fields of
-.Fa pglob
-contain the values described below:
-.Bl -tag -width GLOB_NOCHECK
-.It Fa gl_pathc
-contains the total number of matched pathnames so far.
-This includes other matches from previous invocations of
-.Fn glob
-if
-.Dv GLOB_APPEND
-was specified.
-.It Fa gl_matchc
-contains the number of matched pathnames in the current invocation of
-.Fn glob .
-.It Fa gl_flags
-contains a copy of the
-.Fa flags
-argument with the bit
-.Dv GLOB_MAGCHAR
-set if
-.Fa pattern
-contained any of the special characters ``*'', ``?'' or ``['', cleared
-if not.
-.It Fa gl_pathv
-contains a pointer to a
-.Dv NULL Ns -terminated
-list of matched pathnames.
-However, if
-.Fa gl_pathc
-is zero, the contents of
-.Fa gl_pathv
-are undefined.
-.El
-.Pp
-If
-.Fn glob
-terminates due to an error, it sets errno and returns one of the
-following non-zero constants, which are defined in the include
-file
-.In glob.h :
-.Bl -tag -width GLOB_NOCHECK
-.It Dv GLOB_NOSPACE
-An attempt to allocate memory failed, or if
-.Fa errno
-was 0
-.Dv GLOB_LIMIT
-was specified in the flags and
-.Fa pglob\->gl_matchc
-or more patterns were matched.
-.It Dv GLOB_ABORTED
-The scan was stopped because an error was encountered and either
-.Dv GLOB_ERR
-was set or
-.Fa \*(lp*errfunc\*(rp\*(lp\*(rp
-returned non-zero.
-.It Dv GLOB_NOMATCH
-The pattern did not match a pathname and
-.Dv GLOB_NOCHECK
-was not set.
-.El
-.Pp
-The arguments
-.Fa pglob\->gl_pathc
-and
-.Fa pglob\->gl_pathv
-are still set as specified above.
-.Sh EXAMPLES
-A rough equivalent of
-.Ql "ls -l *.c *.h"
-can be obtained with the
-following code:
-.Bd -literal -offset indent
-glob_t g;
-
-g.gl_offs = 2;
-glob("*.c", GLOB_DOOFFS, NULL, &g);
-glob("*.h", GLOB_DOOFFS | GLOB_APPEND, NULL, &g);
-g.gl_pathv[0] = "ls";
-g.gl_pathv[1] = "-l";
-execvp("ls", g.gl_pathv);
-.Ed
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr fnmatch 3 ,
-.Xr regex 3
-.Sh STANDARDS
-The current implementation of the
-.Fn glob
-function
-.Em does not
-conform to
-.St -p1003.2 .
-Collating symbol expressions, equivalence class expressions and
-character class expressions are not supported.
-.Pp
-The flags
-.Dv GLOB_ALTDIRFUNC ,
-.Dv GLOB_BRACE ,
-.Dv GLOB_LIMIT ,
-.Dv GLOB_MAGCHAR ,
-.Dv GLOB_NOMAGIC ,
-and
-.Dv GLOB_TILDE ,
-and the fields
-.Fa gl_matchc
-and
-.Fa gl_flags
-are extensions to the
-.Tn POSIX
-standard and
-should not be used by applications striving for strict
-conformance.
-.Sh HISTORY
-The
-.Fn glob
-and
-.Fn globfree
-functions first appeared in
-.Bx 4.4 .
-.Sh BUGS
-Patterns longer than
-.Dv MAXPATHLEN
-may cause unchecked errors.
-.Pp
-The
-.Fn glob
-argument
-may fail and set errno for any of the errors specified for the
-library routines
-.Xr stat 2 ,
-.Xr closedir 3 ,
-.Xr opendir 3 ,
-.Xr readdir 3 ,
-.Xr malloc 3 ,
-and
-.Xr free 3 .
diff --git a/lib/libc_bsd/gen/glob.c b/lib/libc_bsd/gen/glob.c
deleted file mode 100644
index 219cad3..0000000
--- a/lib/libc_bsd/gen/glob.c
+++ /dev/null
@@ -1,969 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Guido van Rossum.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)glob.c	8.3 (Berkeley) 10/13/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/glob.c 249381 2013-04-11 20:15:37Z emaste $");
-
-/*
- * glob(3) -- a superset of the one defined in POSIX 1003.2.
- *
- * The [!...] convention to negate a range is supported (SysV, Posix, ksh).
- *
- * Optional extra services, controlled by flags not defined by POSIX:
- *
- * GLOB_QUOTE:
- *	Escaping convention: \ inhibits any special meaning the following
- *	character might have (except \ at end of string is retained).
- * GLOB_MAGCHAR:
- *	Set in gl_flags if pattern contained a globbing character.
- * GLOB_NOMAGIC:
- *	Same as GLOB_NOCHECK, but it will only append pattern if it did
- *	not contain any magic characters.  [Used in csh style globbing]
- * GLOB_ALTDIRFUNC:
- *	Use alternately specified directory access functions.
- * GLOB_TILDE:
- *	expand ~user/foo to the /home/dir/of/user/foo
- * GLOB_BRACE:
- *	expand {1,2}{a,b} to 1a 1b 2a 2b
- * gl_matchc:
- *	Number of matches in the current invocation of glob.
- */
-
-/*
- * Some notes on multibyte character support:
- * 1. Patterns with illegal byte sequences match nothing - even if
- *    GLOB_NOCHECK is specified.
- * 2. Illegal byte sequences in filenames are handled by treating them as
- *    single-byte characters with a value of the first byte of the sequence
- *    cast to wchar_t.
- * 3. State-dependent encodings are not currently supported.
- */
-
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <dirent.h>
-#include <errno.h>
-#include <glob.h>
-#include <limits.h>
-#include <pwd.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <wchar.h>
-
-#include "collate.h"
-
-/*
- * glob(3) expansion limits. Stop the expansion if any of these limits
- * is reached. This caps the runtime in the face of DoS attacks. See
- * also CVE-2010-2632
- */
-#define	GLOB_LIMIT_BRACE	128	/* number of brace calls */
-#define	GLOB_LIMIT_PATH		65536	/* number of path elements */
-#define	GLOB_LIMIT_READDIR	16384	/* number of readdirs */
-#define	GLOB_LIMIT_STAT		1024	/* number of stat system calls */
-#define	GLOB_LIMIT_STRING	ARG_MAX	/* maximum total size for paths */
-
-struct glob_limit {
-	size_t	l_brace_cnt;
-	size_t	l_path_lim;
-	size_t	l_readdir_cnt;	
-	size_t	l_stat_cnt;	
-	size_t	l_string_cnt;
-};
-
-#define	DOLLAR		'$'
-#define	DOT		'.'
-#define	EOS		'\0'
-#define	LBRACKET	'['
-#define	NOT		'!'
-#define	QUESTION	'?'
-#define	QUOTE		'\\'
-#define	RANGE		'-'
-#define	RBRACKET	']'
-#define	SEP		'/'
-#define	STAR		'*'
-#define	TILDE		'~'
-#define	UNDERSCORE	'_'
-#define	LBRACE		'{'
-#define	RBRACE		'}'
-#define	SLASH		'/'
-#define	COMMA		','
-
-#ifndef DEBUG
-
-#define	M_QUOTE		0x8000000000ULL
-#define	M_PROTECT	0x4000000000ULL
-#define	M_MASK		0xffffffffffULL
-#define	M_CHAR		0x00ffffffffULL
-
-typedef uint_fast64_t Char;
-
-#else
-
-#define	M_QUOTE		0x80
-#define	M_PROTECT	0x40
-#define	M_MASK		0xff
-#define	M_CHAR		0x7f
-
-typedef char Char;
-
-#endif
-
-
-#define	CHAR(c)		((Char)((c)&M_CHAR))
-#define	META(c)		((Char)((c)|M_QUOTE))
-#define	M_ALL		META('*')
-#define	M_END		META(']')
-#define	M_NOT		META('!')
-#define	M_ONE		META('?')
-#define	M_RNG		META('-')
-#define	M_SET		META('[')
-#define	ismeta(c)	(((c)&M_QUOTE) != 0)
-
-
-static int	 compare(const void *, const void *);
-static int	 g_Ctoc(const Char *, char *, size_t);
-static int	 g_lstat(Char *, struct stat *, glob_t *);
-static DIR	*g_opendir(Char *, glob_t *);
-static const Char *g_strchr(const Char *, wchar_t);
-#ifdef notdef
-static Char	*g_strcat(Char *, const Char *);
-#endif
-static int	 g_stat(Char *, struct stat *, glob_t *);
-static int	 glob0(const Char *, glob_t *, struct glob_limit *);
-static int	 glob1(Char *, glob_t *, struct glob_limit *);
-static int	 glob2(Char *, Char *, Char *, Char *, glob_t *,
-    struct glob_limit *);
-static int	 glob3(Char *, Char *, Char *, Char *, Char *, glob_t *,
-    struct glob_limit *);
-static int	 globextend(const Char *, glob_t *, struct glob_limit *);
-static const Char *
-		 globtilde(const Char *, Char *, size_t, glob_t *);
-static int	 globexp1(const Char *, glob_t *, struct glob_limit *);
-static int	 globexp2(const Char *, const Char *, glob_t *, int *,
-    struct glob_limit *);
-static int	 match(Char *, Char *, Char *);
-#ifdef DEBUG
-static void	 qprintf(const char *, Char *);
-#endif
-
-int
-glob(const char * __restrict pattern, int flags,
-	 int (*errfunc)(const char *, int), glob_t * __restrict pglob)
-{
-	struct glob_limit limit = { 0, 0, 0, 0, 0 };
-	const char *patnext;
-	Char *bufnext, *bufend, patbuf[MAXPATHLEN], prot;
-	mbstate_t mbs;
-	wchar_t wc;
-	size_t clen;
-
-	patnext = pattern;
-	if (!(flags & GLOB_APPEND)) {
-		pglob->gl_pathc = 0;
-		pglob->gl_pathv = NULL;
-		if (!(flags & GLOB_DOOFFS))
-			pglob->gl_offs = 0;
-	}
-	if (flags & GLOB_LIMIT) {
-		limit.l_path_lim = pglob->gl_matchc;
-		if (limit.l_path_lim == 0)
-			limit.l_path_lim = GLOB_LIMIT_PATH;
-	}
-	pglob->gl_flags = flags & ~GLOB_MAGCHAR;
-	pglob->gl_errfunc = errfunc;
-	pglob->gl_matchc = 0;
-
-	bufnext = patbuf;
-	bufend = bufnext + MAXPATHLEN - 1;
-	if (flags & GLOB_NOESCAPE) {
-		memset(&mbs, 0, sizeof(mbs));
-		while (bufend - bufnext >= MB_CUR_MAX) {
-			clen = mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs);
-			if (clen == (size_t)-1 || clen == (size_t)-2)
-				return (GLOB_NOMATCH);
-			else if (clen == 0)
-				break;
-			*bufnext++ = wc;
-			patnext += clen;
-		}
-	} else {
-		/* Protect the quoted characters. */
-		memset(&mbs, 0, sizeof(mbs));
-		while (bufend - bufnext >= MB_CUR_MAX) {
-			if (*patnext == QUOTE) {
-				if (*++patnext == EOS) {
-					*bufnext++ = QUOTE | M_PROTECT;
-					continue;
-				}
-				prot = M_PROTECT;
-			} else
-				prot = 0;
-			clen = mbrtowc(&wc, patnext, MB_LEN_MAX, &mbs);
-			if (clen == (size_t)-1 || clen == (size_t)-2)
-				return (GLOB_NOMATCH);
-			else if (clen == 0)
-				break;
-			*bufnext++ = wc | prot;
-			patnext += clen;
-		}
-	}
-	*bufnext = EOS;
-
-	if (flags & GLOB_BRACE)
-	    return (globexp1(patbuf, pglob, &limit));
-	else
-	    return (glob0(patbuf, pglob, &limit));
-}
-
-/*
- * Expand recursively a glob {} pattern. When there is no more expansion
- * invoke the standard globbing routine to glob the rest of the magic
- * characters
- */
-static int
-globexp1(const Char *pattern, glob_t *pglob, struct glob_limit *limit)
-{
-	const Char* ptr = pattern;
-	int rv;
-
-	if ((pglob->gl_flags & GLOB_LIMIT) &&
-	    limit->l_brace_cnt++ >= GLOB_LIMIT_BRACE) {
-		errno = 0;
-		return (GLOB_NOSPACE);
-	}
-
-	/* Protect a single {}, for find(1), like csh */
-	if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS)
-		return glob0(pattern, pglob, limit);
-
-	while ((ptr = g_strchr(ptr, LBRACE)) != NULL)
-		if (!globexp2(ptr, pattern, pglob, &rv, limit))
-			return rv;
-
-	return glob0(pattern, pglob, limit);
-}
-
-
-/*
- * Recursive brace globbing helper. Tries to expand a single brace.
- * If it succeeds then it invokes globexp1 with the new pattern.
- * If it fails then it tries to glob the rest of the pattern and returns.
- */
-static int
-globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv,
-    struct glob_limit *limit)
-{
-	int     i;
-	Char   *lm, *ls;
-	const Char *pe, *pm, *pm1, *pl;
-	Char    patbuf[MAXPATHLEN];
-
-	/* copy part up to the brace */
-	for (lm = patbuf, pm = pattern; pm != ptr; *lm++ = *pm++)
-		continue;
-	*lm = EOS;
-	ls = lm;
-
-	/* Find the balanced brace */
-	for (i = 0, pe = ++ptr; *pe; pe++)
-		if (*pe == LBRACKET) {
-			/* Ignore everything between [] */
-			for (pm = pe++; *pe != RBRACKET && *pe != EOS; pe++)
-				continue;
-			if (*pe == EOS) {
-				/*
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pe = pm;
-			}
-		}
-		else if (*pe == LBRACE)
-			i++;
-		else if (*pe == RBRACE) {
-			if (i == 0)
-				break;
-			i--;
-		}
-
-	/* Non matching braces; just glob the pattern */
-	if (i != 0 || *pe == EOS) {
-		*rv = glob0(patbuf, pglob, limit);
-		return (0);
-	}
-
-	for (i = 0, pl = pm = ptr; pm <= pe; pm++)
-		switch (*pm) {
-		case LBRACKET:
-			/* Ignore everything between [] */
-			for (pm1 = pm++; *pm != RBRACKET && *pm != EOS; pm++)
-				continue;
-			if (*pm == EOS) {
-				/*
-				 * We could not find a matching RBRACKET.
-				 * Ignore and just look for RBRACE
-				 */
-				pm = pm1;
-			}
-			break;
-
-		case LBRACE:
-			i++;
-			break;
-
-		case RBRACE:
-			if (i) {
-			    i--;
-			    break;
-			}
-			/* FALLTHROUGH */
-		case COMMA:
-			if (i && *pm == COMMA)
-				break;
-			else {
-				/* Append the current string */
-				for (lm = ls; (pl < pm); *lm++ = *pl++)
-					continue;
-				/*
-				 * Append the rest of the pattern after the
-				 * closing brace
-				 */
-				for (pl = pe + 1; (*lm++ = *pl++) != EOS;)
-					continue;
-
-				/* Expand the current pattern */
-#ifdef DEBUG
-				qprintf("globexp2:", patbuf);
-#endif
-				*rv = globexp1(patbuf, pglob, limit);
-
-				/* move after the comma, to the next string */
-				pl = pm + 1;
-			}
-			break;
-
-		default:
-			break;
-		}
-	*rv = 0;
-	return (0);
-}
-
-
-
-/*
- * expand tilde from the passwd file.
- */
-static const Char *
-globtilde(const Char *pattern, Char *patbuf, size_t patbuf_len, glob_t *pglob)
-{
-	struct passwd *pwd;
-	char *h;
-	const Char *p;
-	Char *b, *eb;
-
-	if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE))
-		return (pattern);
-
-	/* 
-	 * Copy up to the end of the string or / 
-	 */
-	eb = &patbuf[patbuf_len - 1];
-	for (p = pattern + 1, h = (char *) patbuf;
-	    h < (char *)eb && *p && *p != SLASH; *h++ = *p++)
-		continue;
-
-	*h = EOS;
-
-	if (((char *) patbuf)[0] == EOS) {
-		/*
-		 * handle a plain ~ or ~/ by expanding $HOME first (iff
-		 * we're not running setuid or setgid) and then trying
-		 * the password file
-		 */
-		if (issetugid() != 0 ||
-		    (h = getenv("HOME")) == NULL) {
-			if (((h = getlogin()) != NULL &&
-			     (pwd = getpwnam(h)) != NULL) ||
-			    (pwd = getpwuid(getuid())) != NULL)
-				h = pwd->pw_dir;
-			else
-				return (pattern);
-		}
-	}
-	else {
-		/*
-		 * Expand a ~user
-		 */
-		if ((pwd = getpwnam((char*) patbuf)) == NULL)
-			return (pattern);
-		else
-			h = pwd->pw_dir;
-	}
-
-	/* Copy the home directory */
-	for (b = patbuf; b < eb && *h; *b++ = *h++)
-		continue;
-
-	/* Append the rest of the pattern */
-	while (b < eb && (*b++ = *p++) != EOS)
-		continue;
-	*b = EOS;
-
-	return (patbuf);
-}
-
-
-/*
- * The main glob() routine: compiles the pattern (optionally processing
- * quotes), calls glob1() to do the real pattern matching, and finally
- * sorts the list (unless unsorted operation is requested).  Returns 0
- * if things went well, nonzero if errors occurred.
- */
-static int
-glob0(const Char *pattern, glob_t *pglob, struct glob_limit *limit)
-{
-	const Char *qpatnext;
-	int err;
-	size_t oldpathc;
-	Char *bufnext, c, patbuf[MAXPATHLEN];
-
-	qpatnext = globtilde(pattern, patbuf, MAXPATHLEN, pglob);
-	oldpathc = pglob->gl_pathc;
-	bufnext = patbuf;
-
-	/* We don't need to check for buffer overflow any more. */
-	while ((c = *qpatnext++) != EOS) {
-		switch (c) {
-		case LBRACKET:
-			c = *qpatnext;
-			if (c == NOT)
-				++qpatnext;
-			if (*qpatnext == EOS ||
-			    g_strchr(qpatnext+1, RBRACKET) == NULL) {
-				*bufnext++ = LBRACKET;
-				if (c == NOT)
-					--qpatnext;
-				break;
-			}
-			*bufnext++ = M_SET;
-			if (c == NOT)
-				*bufnext++ = M_NOT;
-			c = *qpatnext++;
-			do {
-				*bufnext++ = CHAR(c);
-				if (*qpatnext == RANGE &&
-				    (c = qpatnext[1]) != RBRACKET) {
-					*bufnext++ = M_RNG;
-					*bufnext++ = CHAR(c);
-					qpatnext += 2;
-				}
-			} while ((c = *qpatnext++) != RBRACKET);
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_END;
-			break;
-		case QUESTION:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			*bufnext++ = M_ONE;
-			break;
-		case STAR:
-			pglob->gl_flags |= GLOB_MAGCHAR;
-			/* collapse adjacent stars to one,
-			 * to avoid exponential behavior
-			 */
-			if (bufnext == patbuf || bufnext[-1] != M_ALL)
-			    *bufnext++ = M_ALL;
-			break;
-		default:
-			*bufnext++ = CHAR(c);
-			break;
-		}
-	}
-	*bufnext = EOS;
-#ifdef DEBUG
-	qprintf("glob0:", patbuf);
-#endif
-
-	if ((err = glob1(patbuf, pglob, limit)) != 0)
-		return(err);
-
-	/*
-	 * If there was no match we are going to append the pattern
-	 * if GLOB_NOCHECK was specified or if GLOB_NOMAGIC was specified
-	 * and the pattern did not contain any magic characters
-	 * GLOB_NOMAGIC is there just for compatibility with csh.
-	 */
-	if (pglob->gl_pathc == oldpathc) {
-		if (((pglob->gl_flags & GLOB_NOCHECK) ||
-		    ((pglob->gl_flags & GLOB_NOMAGIC) &&
-			!(pglob->gl_flags & GLOB_MAGCHAR))))
-			return (globextend(pattern, pglob, limit));
-		else
-			return (GLOB_NOMATCH);
-	}
-	if (!(pglob->gl_flags & GLOB_NOSORT))
-		qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc,
-		    pglob->gl_pathc - oldpathc, sizeof(char *), compare);
-	return (0);
-}
-
-static int
-compare(const void *p, const void *q)
-{
-	return (strcmp(*(char **)p, *(char **)q));
-}
-
-static int
-glob1(Char *pattern, glob_t *pglob, struct glob_limit *limit)
-{
-	Char pathbuf[MAXPATHLEN];
-
-	/* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */
-	if (*pattern == EOS)
-		return (0);
-	return (glob2(pathbuf, pathbuf, pathbuf + MAXPATHLEN - 1,
-	    pattern, pglob, limit));
-}
-
-/*
- * The functions glob2 and glob3 are mutually recursive; there is one level
- * of recursion for each segment in the pattern that contains one or more
- * meta characters.
- */
-static int
-glob2(Char *pathbuf, Char *pathend, Char *pathend_last, Char *pattern,
-      glob_t *pglob, struct glob_limit *limit)
-{
-	struct stat sb;
-	Char *p, *q;
-	int anymeta;
-
-	/*
-	 * Loop over pattern segments until end of pattern or until
-	 * segment with meta character found.
-	 */
-	for (anymeta = 0;;) {
-		if (*pattern == EOS) {		/* End of pattern? */
-			*pathend = EOS;
-			if (g_lstat(pathbuf, &sb, pglob))
-				return (0);
-
-			if ((pglob->gl_flags & GLOB_LIMIT) &&
-			    limit->l_stat_cnt++ >= GLOB_LIMIT_STAT) {
-				errno = 0;
-				if (pathend + 1 > pathend_last)
-					return (GLOB_ABORTED);
-				*pathend++ = SEP;
-				*pathend = EOS;
-				return (GLOB_NOSPACE);
-			}
-			if (((pglob->gl_flags & GLOB_MARK) &&
-			    pathend[-1] != SEP) && (S_ISDIR(sb.st_mode)
-			    || (S_ISLNK(sb.st_mode) &&
-			    (g_stat(pathbuf, &sb, pglob) == 0) &&
-			    S_ISDIR(sb.st_mode)))) {
-				if (pathend + 1 > pathend_last)
-					return (GLOB_ABORTED);
-				*pathend++ = SEP;
-				*pathend = EOS;
-			}
-			++pglob->gl_matchc;
-			return (globextend(pathbuf, pglob, limit));
-		}
-
-		/* Find end of next segment, copy tentatively to pathend. */
-		q = pathend;
-		p = pattern;
-		while (*p != EOS && *p != SEP) {
-			if (ismeta(*p))
-				anymeta = 1;
-			if (q + 1 > pathend_last)
-				return (GLOB_ABORTED);
-			*q++ = *p++;
-		}
-
-		if (!anymeta) {		/* No expansion, do next segment. */
-			pathend = q;
-			pattern = p;
-			while (*pattern == SEP) {
-				if (pathend + 1 > pathend_last)
-					return (GLOB_ABORTED);
-				*pathend++ = *pattern++;
-			}
-		} else			/* Need expansion, recurse. */
-			return (glob3(pathbuf, pathend, pathend_last, pattern,
-			    p, pglob, limit));
-	}
-	/* NOTREACHED */
-}
-
-static int
-glob3(Char *pathbuf, Char *pathend, Char *pathend_last,
-      Char *pattern, Char *restpattern,
-      glob_t *pglob, struct glob_limit *limit)
-{
-	struct dirent *dp;
-	DIR *dirp;
-	int err;
-	char buf[MAXPATHLEN];
-
-	/*
-	 * The readdirfunc declaration can't be prototyped, because it is
-	 * assigned, below, to two functions which are prototyped in glob.h
-	 * and dirent.h as taking pointers to differently typed opaque
-	 * structures.
-	 */
-	struct dirent *(*readdirfunc)();
-
-	if (pathend > pathend_last)
-		return (GLOB_ABORTED);
-	*pathend = EOS;
-	errno = 0;
-
-	if ((dirp = g_opendir(pathbuf, pglob)) == NULL) {
-		/* TODO: don't call for ENOENT or ENOTDIR? */
-		if (pglob->gl_errfunc) {
-			if (g_Ctoc(pathbuf, buf, sizeof(buf)))
-				return (GLOB_ABORTED);
-			if (pglob->gl_errfunc(buf, errno) ||
-			    pglob->gl_flags & GLOB_ERR)
-				return (GLOB_ABORTED);
-		}
-		return (0);
-	}
-
-	err = 0;
-
-	/* Search directory for matching names. */
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		readdirfunc = pglob->gl_readdir;
-	else
-		readdirfunc = readdir;
-	while ((dp = (*readdirfunc)(dirp))) {
-		char *sc;
-		Char *dc;
-		wchar_t wc;
-		size_t clen;
-		mbstate_t mbs;
-
-		if ((pglob->gl_flags & GLOB_LIMIT) &&
-		    limit->l_readdir_cnt++ >= GLOB_LIMIT_READDIR) {
-			errno = 0;
-			if (pathend + 1 > pathend_last)
-				err = GLOB_ABORTED;
-			else {
-				*pathend++ = SEP;
-				*pathend = EOS;
-				err = GLOB_NOSPACE;
-			}
-			break;
-		}
-
-		/* Initial DOT must be matched literally. */
-		if (dp->d_name[0] == DOT && *pattern != DOT)
-			continue;
-		memset(&mbs, 0, sizeof(mbs));
-		dc = pathend;
-		sc = dp->d_name;
-		while (dc < pathend_last) {
-			clen = mbrtowc(&wc, sc, MB_LEN_MAX, &mbs);
-			if (clen == (size_t)-1 || clen == (size_t)-2) {
-				wc = *sc;
-				clen = 1;
-				memset(&mbs, 0, sizeof(mbs));
-			}
-			if ((*dc++ = wc) == EOS)
-				break;
-			sc += clen;
-		}
-		if (!match(pathend, pattern, restpattern)) {
-			*pathend = EOS;
-			continue;
-		}
-		err = glob2(pathbuf, --dc, pathend_last, restpattern,
-		    pglob, limit);
-		if (err)
-			break;
-	}
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		(*pglob->gl_closedir)(dirp);
-	else
-		closedir(dirp);
-	return (err);
-}
-
-
-/*
- * Extend the gl_pathv member of a glob_t structure to accommodate a new item,
- * add the new item, and update gl_pathc.
- *
- * This assumes the BSD realloc, which only copies the block when its size
- * crosses a power-of-two boundary; for v7 realloc, this would cause quadratic
- * behavior.
- *
- * Return 0 if new item added, error code if memory couldn't be allocated.
- *
- * Invariant of the glob_t structure:
- *	Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and
- *	gl_pathv points to (gl_offs + gl_pathc + 1) items.
- */
-static int
-globextend(const Char *path, glob_t *pglob, struct glob_limit *limit)
-{
-	char **pathv;
-	size_t i, newsize, len;
-	char *copy;
-	const Char *p;
-
-	if ((pglob->gl_flags & GLOB_LIMIT) &&
-	    pglob->gl_matchc > limit->l_path_lim) {
-		errno = 0;
-		return (GLOB_NOSPACE);
-	}
-
-	newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs);
-	/* realloc(NULL, newsize) is equivalent to malloc(newsize). */
-	pathv = realloc((void *)pglob->gl_pathv, newsize);
-	if (pathv == NULL)
-		return (GLOB_NOSPACE);
-
-	if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) {
-		/* first time around -- clear initial gl_offs items */
-		pathv += pglob->gl_offs;
-		for (i = pglob->gl_offs + 1; --i > 0; )
-			*--pathv = NULL;
-	}
-	pglob->gl_pathv = pathv;
-
-	for (p = path; *p++;)
-		continue;
-	len = MB_CUR_MAX * (size_t)(p - path);	/* XXX overallocation */
-	limit->l_string_cnt += len;
-	if ((pglob->gl_flags & GLOB_LIMIT) &&
-	    limit->l_string_cnt >= GLOB_LIMIT_STRING) {
-		errno = 0;
-		return (GLOB_NOSPACE);
-	}
-	if ((copy = malloc(len)) != NULL) {
-		if (g_Ctoc(path, copy, len)) {
-			free(copy);
-			return (GLOB_NOSPACE);
-		}
-		pathv[pglob->gl_offs + pglob->gl_pathc++] = copy;
-	}
-	pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
-	return (copy == NULL ? GLOB_NOSPACE : 0);
-}
-
-/*
- * pattern matching function for filenames.  Each occurrence of the *
- * pattern causes a recursion level.
- */
-static int
-match(Char *name, Char *pat, Char *patend)
-{
-	int ok, negate_range;
-	Char c, k;
-	struct xlocale_collate *table =
-		(struct xlocale_collate*)__get_locale()->components[XLC_COLLATE];
-
-	while (pat < patend) {
-		c = *pat++;
-		switch (c & M_MASK) {
-		case M_ALL:
-			if (pat == patend)
-				return (1);
-			do
-			    if (match(name, pat, patend))
-				    return (1);
-			while (*name++ != EOS);
-			return (0);
-		case M_ONE:
-			if (*name++ == EOS)
-				return (0);
-			break;
-		case M_SET:
-			ok = 0;
-			if ((k = *name++) == EOS)
-				return (0);
-			if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS)
-				++pat;
-			while (((c = *pat++) & M_MASK) != M_END)
-				if ((*pat & M_MASK) == M_RNG) {
-					if (table->__collate_load_error ?
-					    CHAR(c) <= CHAR(k) && CHAR(k) <= CHAR(pat[1]) :
-					       __collate_range_cmp(table, CHAR(c), CHAR(k)) <= 0
-					    && __collate_range_cmp(table, CHAR(k), CHAR(pat[1])) <= 0
-					   )
-						ok = 1;
-					pat += 2;
-				} else if (c == k)
-					ok = 1;
-			if (ok == negate_range)
-				return (0);
-			break;
-		default:
-			if (*name++ != c)
-				return (0);
-			break;
-		}
-	}
-	return (*name == EOS);
-}
-
-/* Free allocated data belonging to a glob_t structure. */
-void
-globfree(glob_t *pglob)
-{
-	size_t i;
-	char **pp;
-
-	if (pglob->gl_pathv != NULL) {
-		pp = pglob->gl_pathv + pglob->gl_offs;
-		for (i = pglob->gl_pathc; i--; ++pp)
-			if (*pp)
-				free(*pp);
-		free(pglob->gl_pathv);
-		pglob->gl_pathv = NULL;
-	}
-}
-
-static DIR *
-g_opendir(Char *str, glob_t *pglob)
-{
-	char buf[MAXPATHLEN];
-
-	if (!*str)
-		strcpy(buf, ".");
-	else {
-		if (g_Ctoc(str, buf, sizeof(buf)))
-			return (NULL);
-	}
-
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return ((*pglob->gl_opendir)(buf));
-
-	return (opendir(buf));
-}
-
-static int
-g_lstat(Char *fn, struct stat *sb, glob_t *pglob)
-{
-	char buf[MAXPATHLEN];
-
-	if (g_Ctoc(fn, buf, sizeof(buf))) {
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return((*pglob->gl_lstat)(buf, sb));
-	return (lstat(buf, sb));
-}
-
-static int
-g_stat(Char *fn, struct stat *sb, glob_t *pglob)
-{
-	char buf[MAXPATHLEN];
-
-	if (g_Ctoc(fn, buf, sizeof(buf))) {
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
-		return ((*pglob->gl_stat)(buf, sb));
-	return (stat(buf, sb));
-}
-
-static const Char *
-g_strchr(const Char *str, wchar_t ch)
-{
-
-	do {
-		if (*str == ch)
-			return (str);
-	} while (*str++);
-	return (NULL);
-}
-
-static int
-g_Ctoc(const Char *str, char *buf, size_t len)
-{
-	mbstate_t mbs;
-	size_t clen;
-
-	memset(&mbs, 0, sizeof(mbs));
-	while (len >= MB_CUR_MAX) {
-		clen = wcrtomb(buf, *str, &mbs);
-		if (clen == (size_t)-1)
-			return (1);
-		if (*str == L'\0')
-			return (0);
-		str++;
-		buf += clen;
-		len -= clen;
-	}
-	return (1);
-}
-
-#ifdef DEBUG
-static void
-qprintf(const char *str, Char *s)
-{
-	Char *p;
-
-	(void)printf("%s:\n", str);
-	for (p = s; *p; p++)
-		(void)printf("%c", CHAR(*p));
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", *p & M_PROTECT ? '"' : ' ');
-	(void)printf("\n");
-	for (p = s; *p; p++)
-		(void)printf("%c", ismeta(*p) ? '_' : ' ');
-	(void)printf("\n");
-}
-#endif
diff --git a/lib/libc_bsd/gen/initgroups.3 b/lib/libc_bsd/gen/initgroups.3
deleted file mode 100644
index 4710a4c..0000000
--- a/lib/libc_bsd/gen/initgroups.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)initgroups.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/initgroups.3 194494 2009-06-19 15:58:24Z brooks $
-.\"
-.Dd June 4, 1993
-.Dt INITGROUPS 3
-.Os
-.Sh NAME
-.Nm initgroups
-.Nd initialize group access list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn initgroups "const char *name" "gid_t basegid"
-.Sh DESCRIPTION
-The
-.Fn initgroups
-function
-uses the
-.Xr getgrouplist 3
-function to calculate the group access list for the user
-specified in
-.Fa name .
-This group list is then setup for the current process using
-.Xr setgroups 2 .
-The
-.Fa basegid
-is automatically included in the groups list.
-Typically this value is given as
-the group number from the password file.
-.Sh RETURN VALUES
-.Rv -std initgroups
-.Sh ERRORS
-The
-.Fn initgroups
-function may fail and set
-.Va errno
-for any of the errors specified for the library function
-.Xr setgroups 2 .
-It may also return:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-The
-.Fn initgroups
-function was unable to allocate temporary storage.
-.El
-.Sh SEE ALSO
-.Xr setgroups 2 ,
-.Xr getgrouplist 3
-.Sh HISTORY
-The
-.Fn initgroups
-function appeared in
-.Bx 4.2 .
-.Sh BUGS
-The
-.Fn getgrouplist
-function called by
-.Fn initgroups
-uses the routines based on
-.Xr getgrent 3 .
-If the invoking program uses any of these routines,
-the group structure will
-be overwritten in the call to
-.Fn initgroups .
diff --git a/lib/libc_bsd/gen/initgroups.c b/lib/libc_bsd/gen/initgroups.c
deleted file mode 100644
index a387673..0000000
--- a/lib/libc_bsd/gen/initgroups.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)initgroups.c	8.1 (Berkeley) 6/4/93";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/initgroups.c 194494 2009-06-19 15:58:24Z brooks $");
-
-#include <sys/param.h>
-
-#include "namespace.h"
-#include <err.h>
-#include "un-namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-int
-initgroups(uname, agroup)
-	const char *uname;
-	gid_t agroup;
-{
-	int ngroups, ret;
-	long ngroups_max;
-	gid_t *groups;
-
-	/*
-	 * Provide space for one group more than possible to allow
-	 * setgroups to fail and set errno.
-	 */
-	ngroups_max = sysconf(_SC_NGROUPS_MAX) + 2;
-	if ((groups = malloc(sizeof(*groups) * ngroups_max)) == NULL)
-		return (ENOMEM);
-
-	ngroups = (int)ngroups_max;
-	getgrouplist(uname, agroup, groups, &ngroups);
-	ret = setgroups(ngroups, groups);
-	free(groups);
-	return (ret);
-}
diff --git a/lib/libc_bsd/gen/isatty.c b/lib/libc_bsd/gen/isatty.c
deleted file mode 100644
index b0c04cc..0000000
--- a/lib/libc_bsd/gen/isatty.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)isatty.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/isatty.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <termios.h>
-#include <unistd.h>
-
-int
-isatty(fd)
-	int fd;
-{
-	int retval;
-	struct termios t;
-
-	retval = (tcgetattr(fd, &t) != -1);
-	return(retval);
-}
diff --git a/lib/libc_bsd/gen/isgreater.3 b/lib/libc_bsd/gen/isgreater.3
deleted file mode 100644
index 9542e4d..0000000
--- a/lib/libc_bsd/gen/isgreater.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" Copyright (c) 2003 David Schultz <das@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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/isgreater.3 208291 2010-05-19 08:57:53Z uqs $
-.\"
-.Dd February 12, 2003
-.Dt ISGREATER 3
-.Os
-.Sh NAME
-.Nm isgreater , isgreaterequal , isless , islessequal ,
-.Nm islessgreater , isunordered
-.Nd "compare two floating-point numbers"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In math.h
-.Ft int
-.Fn isgreater "real-floating x" "real-floating y"
-.Ft int
-.Fn isgreaterequal "real-floating x" "real-floating y"
-.Ft int
-.Fn isless "real-floating x" "real-floating y"
-.Ft int
-.Fn islessequal "real-floating x" "real-floating y"
-.Ft int
-.Fn islessgreater "real-floating x" "real-floating y"
-.Ft int
-.Fn isunordered "real-floating x" "real-floating y"
-.Sh DESCRIPTION
-Each of the macros
-.Fn isgreater ,
-.Fn isgreaterequal ,
-.Fn isless ,
-.Fn islessequal ,
-and
-.Fn islessgreater
-take arguments
-.Fa x
-and
-.Fa y
-and return a non-zero value if and only if its nominal
-relation on
-.Fa x
-and
-.Fa y
-is true.
-These macros always return zero if either
-argument is not a number (NaN), but unlike the corresponding C
-operators, they never raise a floating point exception.
-.Pp
-The
-.Fn isunordered
-macro takes arguments
-.Fa x
-and
-.Fa y
-and returns non-zero if and only if neither
-.Fa x
-nor
-.Fa y
-are NaNs.
-For any pair of floating-point values, one
-of the relationships (less, greater, equal, unordered) holds.
-.Sh SEE ALSO
-.Xr fpclassify 3 ,
-.Xr math 3 ,
-.Xr signbit 3
-.Sh STANDARDS
-The
-.Fn isgreater ,
-.Fn isgreaterequal ,
-.Fn isless ,
-.Fn islessequal ,
-.Fn islessgreater ,
-and
-.Fn isunordered
-macros conform to
-.St -isoC-99 .
-.Sh HISTORY
-The relational macros described above first appeared in
-.Fx 5.1 .
diff --git a/lib/libc_bsd/gen/isinf.c b/lib/libc_bsd/gen/isinf.c
deleted file mode 100644
index 7323667..0000000
--- a/lib/libc_bsd/gen/isinf.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2004 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/gen/isinf.c 131898 2004-07-10 15:52:26Z marcel $
- */
-
-#include <math.h>
-
-#include "fpmath.h"
-
-/*
- * XXX These routines belong in libm, but they must remain in libc for
- *     binary compat until we can bump libm's major version number.
- */
-
-__weak_reference(__isinf, isinf);
-
-int
-__isinf(double d)
-{
-	union IEEEd2bits u;
-
-	u.d = d;
-	return (u.bits.exp == 2047 && u.bits.manl == 0 && u.bits.manh == 0);
-}
-
-int
-__isinff(float f)
-{
-	union IEEEf2bits u;
-
-	u.f = f;
-	return (u.bits.exp == 255 && u.bits.man == 0);
-}
-
-int
-__isinfl(long double e)
-{
-	union IEEEl2bits u;
-
-	u.e = e;
-	mask_nbit_l(u);
-#ifndef __alpha__
-	return (u.bits.exp == 32767 && u.bits.manl == 0 && u.bits.manh == 0);
-#else
-	return (u.bits.exp == 2047 && u.bits.manl == 0 && u.bits.manh == 0);
-#endif
-}
diff --git a/lib/libc_bsd/gen/isnan.c b/lib/libc_bsd/gen/isnan.c
deleted file mode 100644
index da27c9d..0000000
--- a/lib/libc_bsd/gen/isnan.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2004 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/gen/isnan.c 242894 2012-11-11 13:28:04Z dim $
- */
-
-#include <math.h>
-
-#include "fpmath.h"
-
-/*
- * XXX These routines belong in libm, but they must remain in libc for
- *     binary compat until we can bump libm's major version number.
- *
- * Note this only applies to the dynamic versions of libm and libc, so
- * for the static and profiled versions we stub out the definitions.
- * Otherwise you cannot link statically to libm and libc at the same
- * time, when calling both functions.
- */
-
-#ifdef PIC
-__weak_reference(__isnan, isnan);
-__weak_reference(__isnanf, isnanf);
-
-int
-__isnan(double d)
-{
-	union IEEEd2bits u;
-
-	u.d = d;
-	return (u.bits.exp == 2047 && (u.bits.manl != 0 || u.bits.manh != 0));
-}
-
-int
-__isnanf(float f)
-{
-	union IEEEf2bits u;
-
-	u.f = f;
-	return (u.bits.exp == 255 && u.bits.man != 0);
-}
-#endif /* PIC */
diff --git a/lib/libc_bsd/gen/jrand48.c b/lib/libc_bsd/gen/jrand48.c
deleted file mode 100644
index c8e3880..0000000
--- a/lib/libc_bsd/gen/jrand48.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/jrand48.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include "rand48.h"
-
-long
-jrand48(unsigned short xseed[3])
-{
-	_dorand48(xseed);
-	return ((long) xseed[2] << 16) + (long) xseed[1];
-}
diff --git a/lib/libc_bsd/gen/lcong48.c b/lib/libc_bsd/gen/lcong48.c
deleted file mode 100644
index 37cd762..0000000
--- a/lib/libc_bsd/gen/lcong48.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/lcong48.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-extern unsigned short _rand48_mult[3];
-extern unsigned short _rand48_add;
-
-void
-lcong48(unsigned short p[7])
-{
-	_rand48_seed[0] = p[0];
-	_rand48_seed[1] = p[1];
-	_rand48_seed[2] = p[2];
-	_rand48_mult[0] = p[3];
-	_rand48_mult[1] = p[4];
-	_rand48_mult[2] = p[5];
-	_rand48_add = p[6];
-}
diff --git a/lib/libc_bsd/gen/ldexp.3 b/lib/libc_bsd/gen/ldexp.3
deleted file mode 100644
index a0119e2..0000000
--- a/lib/libc_bsd/gen/ldexp.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)ldexp.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/ldexp.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd March 4, 2005
-.Dt LDEXP 3
-.Os
-.Sh NAME
-.Nm ldexp ,
-.Nm ldexpf ,
-.Nm ldexpl
-.Nd multiply floating-point number by integral power of 2
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn ldexp "double x" "int exp"
-.Ft float
-.Fn ldexpf "float x" "int exp"
-.Ft long double
-.Fn ldexpl "long double x" "int exp"
-.Sh DESCRIPTION
-The
-.Fn ldexp ,
-.Fn ldexpf ,
-and
-.Fn ldexpl
-functions multiply a floating-point number by an integral
-power of 2.
-.Sh RETURN VALUES
-These functions return the value of
-.Fa x
-times 2 raised to the power
-.Fa exp .
-.Sh SEE ALSO
-.Xr frexp 3 ,
-.Xr math 3 ,
-.Xr modf 3
-.Sh STANDARDS
-The
-.Fn ldexp ,
-.Fn ldexpf ,
-and
-.Fn ldexpl
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/gen/ldexp.c b/lib/libc_bsd/gen/ldexp.c
deleted file mode 100644
index e6da2e3..0000000
--- a/lib/libc_bsd/gen/ldexp.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/* @(#)s_scalbn.c 5.1 93/09/24 */
-/* @(#)fdlibm.h 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/ldexp.c 140607 2005-01-22 06:03:40Z das $");
-
-#include <sys/types.h>
-#include <machine/endian.h>
-#include <math.h>
-
-/* Bit fiddling routines copied from msun/src/math_private.h,v 1.15 */
-
-#if BYTE_ORDER == BIG_ENDIAN
-
-typedef union
-{
-  double value;
-  struct
-  {
-    uint32_t msw;
-    uint32_t lsw;
-  } parts;
-} ieee_double_shape_type;
-
-#endif
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-
-typedef union
-{
-  double value;
-  struct
-  {
-    uint32_t lsw;
-    uint32_t msw;
-  } parts;
-} ieee_double_shape_type;
-
-#endif
-
-/* Get two 32 bit ints from a double.  */
-
-#define EXTRACT_WORDS(ix0,ix1,d)				\
-do {								\
-  ieee_double_shape_type ew_u;					\
-  ew_u.value = (d);						\
-  (ix0) = ew_u.parts.msw;					\
-  (ix1) = ew_u.parts.lsw;					\
-} while (0)
-
-/* Get the more significant 32 bit int from a double.  */
-
-#define GET_HIGH_WORD(i,d)					\
-do {								\
-  ieee_double_shape_type gh_u;					\
-  gh_u.value = (d);						\
-  (i) = gh_u.parts.msw;						\
-} while (0)
-
-/* Set the more significant 32 bits of a double from an int.  */
-
-#define SET_HIGH_WORD(d,v)					\
-do {								\
-  ieee_double_shape_type sh_u;					\
-  sh_u.value = (d);						\
-  sh_u.parts.msw = (v);						\
-  (d) = sh_u.value;						\
-} while (0)
-
-
-static const double
-two54   =  1.80143985094819840000e+16, /* 0x43500000, 0x00000000 */
-twom54  =  5.55111512312578270212e-17, /* 0x3C900000, 0x00000000 */
-huge   = 1.0e+300,
-tiny   = 1.0e-300;
-
-static double
-_copysign(double x, double y)
-{
-	uint32_t hx,hy;
-	GET_HIGH_WORD(hx,x);
-	GET_HIGH_WORD(hy,y);
-	SET_HIGH_WORD(x,(hx&0x7fffffff)|(hy&0x80000000));
-	return x;
-}
-
-double
-ldexp(double x, int n)
-{
-	int32_t k,hx,lx;
-	EXTRACT_WORDS(hx,lx,x);
-        k = (hx&0x7ff00000)>>20;		/* extract exponent */
-        if (k==0) {				/* 0 or subnormal x */
-            if ((lx|(hx&0x7fffffff))==0) return x; /* +-0 */
-	    x *= two54;
-	    GET_HIGH_WORD(hx,x);
-	    k = ((hx&0x7ff00000)>>20) - 54;
-            if (n< -50000) return tiny*x; 	/*underflow*/
-	    }
-        if (k==0x7ff) return x+x;		/* NaN or Inf */
-        k = k+n;
-        if (k >  0x7fe) return huge*_copysign(huge,x); /* overflow  */
-        if (k > 0) 				/* normal result */
-	    {SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20)); return x;}
-        if (k <= -54) {
-            if (n > 50000) 	/* in case integer overflow in n+k */
-		return huge*_copysign(huge,x);	/*overflow*/
-	    else return tiny*_copysign(tiny,x); 	/*underflow*/
-	}
-        k += 54;				/* subnormal result */
-	SET_HIGH_WORD(x,(hx&0x800fffff)|(k<<20));
-        return x*twom54;
-}
diff --git a/lib/libc_bsd/gen/libc_dlopen.c b/lib/libc_bsd/gen/libc_dlopen.c
deleted file mode 100644
index 3e24abe..0000000
--- a/lib/libc_bsd/gen/libc_dlopen.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2011 Xin Li <delphij@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.
- *
- * 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: releng/10.2/lib/libc/gen/libc_dlopen.c 228843 2011-12-23 15:00:37Z cperciva $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/libc_dlopen.c 228843 2011-12-23 15:00:37Z cperciva $");
-
-#include <dlfcn.h>
-#include <stddef.h>
-#include <unistd.h>
-
-#include "libc_private.h"
-
-/*
- * Whether we want to restrict dlopen()s.
- */
-static int __libc_restricted_mode = 0;
-
-void *
-libc_dlopen(const char *path, int mode)
-{
-
-	if (__libc_restricted_mode) {
-		_rtld_error("Service unavailable -- libc in restricted mode");
-		return (NULL);
-	} else
-		return (dlopen(path, mode));
-}
-
-void
-__FreeBSD_libc_enter_restricted_mode(void)
-{
-
-	__libc_restricted_mode = 1;
-	return;
-}
-
diff --git a/lib/libc_bsd/gen/lockf.3 b/lib/libc_bsd/gen/lockf.3
deleted file mode 100644
index d95cffb..0000000
--- a/lib/libc_bsd/gen/lockf.3
+++ /dev/null
@@ -1,266 +0,0 @@
-.\" $NetBSD: lockf.3,v 1.10 2008/04/30 13:10:50 martin Exp $
-.\"
-.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Klaus Klein and S.P. Zeidler.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libc/gen/lockf.3 255486 2013-09-12 00:53:38Z bdrewery $
-.\"
-.Dd September 11, 2013
-.Dt LOCKF 3
-.Os
-.Sh NAME
-.Nm lockf
-.Nd record locking on files
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn lockf "int fd" "int function" "off_t size"
-.Sh DESCRIPTION
-The
-.Fn lockf
-function allows sections of a file to be locked with advisory-mode locks.
-Calls to
-.Fn lockf
-from other processes which attempt to lock the locked file section will
-either return an error value or block until the section becomes unlocked.
-All the locks for a process are removed when the process terminates.
-.Pp
-The argument
-.Fa fd
-is an open file descriptor.
-The file descriptor must have been opened either for write-only
-.Dv ( O_WRONLY )
-or read/write
-.Dv ( O_RDWR )
-operation.
-.Pp
-The
-.Fa function
-argument is a control value which specifies the action to be taken.
-The permissible values for
-.Fa function
-are as follows:
-.Bl -tag -width F_ULOCKXX -compact -offset indent
-.It Sy Function
-.Sy Description
-.It Dv F_ULOCK
-unlock locked sections
-.It Dv F_LOCK
-lock a section for exclusive use
-.It Dv F_TLOCK
-test and lock a section for exclusive use
-.It Dv F_TEST
-test a section for locks by other processes
-.El
-.Pp
-.Dv F_ULOCK
-removes locks from a section of the file;
-.Dv F_LOCK
-and
-.Dv F_TLOCK
-both lock a section of a file if the section is available;
-.Dv F_TEST
-detects if a lock by another process is present on the specified section.
-.Pp
-The
-.Fa size
-argument is the number of contiguous bytes to be locked or
-unlocked.
-The section to be locked or unlocked starts at the current
-offset in the file and extends forward for a positive size or backward
-for a negative size (the preceding bytes up to but not including the
-current offset).
-However, it is not permitted to lock a section that
-starts or extends before the beginning of the file.
-If
-.Fa size
-is 0, the section from the current offset through the largest possible
-file offset is locked (that is, from the current offset through the
-present or any future end-of-file).
-.Pp
-The sections locked with
-.Dv F_LOCK
-or
-.Dv F_TLOCK
-may, in whole or in part, contain or be contained by a previously
-locked section for the same process.
-When this occurs, or if adjacent
-locked sections would occur, the sections are combined into a single
-locked section.
-If the request would cause the number of locks to
-exceed a system-imposed limit, the request will fail.
-.Pp
-.Dv F_LOCK
-and
-.Dv F_TLOCK
-requests differ only by the action taken if the section is not
-available.
-.Dv F_LOCK
-blocks the calling process until the section is available.
-.Dv F_TLOCK
-makes the function fail if the section is already locked by another
-process.
-.Pp
-File locks are released on first close by the locking process of any
-file descriptor for the file.
-.Pp
-.Dv F_ULOCK
-requests release (wholly or in part) one or more locked sections
-controlled by the process.
-Locked sections will be unlocked starting
-at the current file offset through
-.Fa size
-bytes or to the end of file if size is 0.
-When all of a locked section
-is not released (that is, when the beginning or end of the area to be
-unlocked falls within a locked section), the remaining portions of
-that section are still locked by the process.
-Releasing the center
-portion of a locked section will cause the remaining locked beginning
-and end portions to become two separate locked sections.
-If the
-request would cause the number of locks in the system to exceed a
-system-imposed limit, the request will fail.
-.Pp
-An
-.Dv F_ULOCK
-request in which size is non-zero and the offset of the last byte of
-the requested section is the maximum value for an object of type
-off_t, when the process has an existing lock in which size is 0 and
-which includes the last byte of the requested section, will be treated
-as a request to unlock from the start of the requested section with a
-size equal to 0.
-Otherwise an
-.Dv F_ULOCK
-request will attempt to unlock only the requested section.
-.Pp
-A potential for deadlock occurs if a process controlling a locked
-region is put to sleep by attempting to lock the locked region of
-another process.
-This implementation detects that sleeping until a
-locked region is unlocked would cause a deadlock and fails with an
-.Er EDEADLK
-error.
-.Pp
-The
-.Fn lockf ,
-.Xr fcntl 2 ,
-and
-.Xr flock 2
-locks are compatible.
-Processes using different locking interfaces can cooperate
-over the same file safely.
-However, only one of such interfaces should be used within
-the same process.
-If a file is locked by a process through
-.Xr flock 2 ,
-any record within the file will be seen as locked
-from the viewpoint of another process using
-.Xr fcntl 2
-or
-.Fn lockf ,
-and vice versa.
-.Pp
-Blocking on a section is interrupted by any signal.
-.Sh RETURN VALUES
-.Rv -std lockf
-In the case of a failure, existing locks are not changed.
-.Sh ERRORS
-The
-.Fn lockf
-function
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The argument
-.Fa function
-is
-.Dv F_TLOCK
-or
-.Dv F_TEST
-and the section is already locked by another process.
-.It Bq Er EBADF
-The argument
-.Fa fd
-is not a valid open file descriptor.
-.Pp
-The argument
-.Fa function
-is
-.Dv F_LOCK
-or
-.Dv F_TLOCK ,
-and
-.Fa fd
-is not a valid file descriptor open for writing.
-.It Bq Er EDEADLK
-The argument
-.Fa function
-is
-.Dv F_LOCK
-and a deadlock is detected.
-.It Bq Er EINTR
-The argument
-.Fa function
-is F_LOCK
-and
-.Fn lockf
-was interrupted by the delivery of a signal.
-.It Bq Er EINVAL
-The argument
-.Fa function
-is not one of
-.Dv F_ULOCK ,
-.Dv F_LOCK ,
-.Dv F_TLOCK
-or
-.Dv F_TEST .
-.Pp
-The argument
-.Fa fd
-refers to a file that does not support locking.
-.It Bq Er ENOLCK
-The argument
-.Fa function
-is
-.Dv F_ULOCK ,
-.Dv F_LOCK
-or
-.Dv F_TLOCK ,
-and satisfying the lock or unlock request would result in the number
-of locked regions in the system exceeding a system-imposed limit.
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr flock 2
-.Sh STANDARDS
-The
-.Fn lockf
-function conforms to
-.St -xpg4.2 .
diff --git a/lib/libc_bsd/gen/lockf.c b/lib/libc_bsd/gen/lockf.c
deleted file mode 100644
index 04d34da..0000000
--- a/lib/libc_bsd/gen/lockf.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*	$NetBSD: lockf.c,v 1.3 2008/04/28 20:22:59 martin Exp $	*/
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/lockf.c 189328 2009-03-04 01:01:26Z delphij $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-int
-lockf(int filedes, int function, off_t size)
-{
-	struct flock fl;
-	int cmd;
-
-	fl.l_start = 0;
-	fl.l_len = size;
-	fl.l_whence = SEEK_CUR;
-
-	switch (function) {
-	case F_ULOCK:
-		cmd = F_SETLK;
-		fl.l_type = F_UNLCK;
-		break;
-	case F_LOCK:
-		cmd = F_SETLKW;
-		fl.l_type = F_WRLCK;
-		break;
-	case F_TLOCK:
-		cmd = F_SETLK;
-		fl.l_type = F_WRLCK;
-		break;
-	case F_TEST:
-		fl.l_type = F_WRLCK;
-		if (_fcntl(filedes, F_GETLK, &fl) == -1)
-			return (-1);
-		if (fl.l_type == F_UNLCK || (fl.l_sysid == 0 && fl.l_pid == getpid()))
-			return (0);
-		errno = EAGAIN;
-		return (-1);
-		/* NOTREACHED */
-	default:
-		errno = EINVAL;
-		return (-1);
-		/* NOTREACHED */
-	}
-
-	return (_fcntl(filedes, cmd, &fl));
-}
diff --git a/lib/libc_bsd/gen/lrand48.c b/lib/libc_bsd/gen/lrand48.c
deleted file mode 100644
index 3808d40..0000000
--- a/lib/libc_bsd/gen/lrand48.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/lrand48.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-
-long
-lrand48(void)
-{
-	_dorand48(_rand48_seed);
-	return ((long) _rand48_seed[2] << 15) + ((long) _rand48_seed[1] >> 1);
-}
diff --git a/lib/libc_bsd/gen/makecontext.3 b/lib/libc_bsd/gen/makecontext.3
deleted file mode 100644
index 62a4bcb..0000000
--- a/lib/libc_bsd/gen/makecontext.3
+++ /dev/null
@@ -1,120 +0,0 @@
-.\" Copyright (c) 2002 Packet Design, LLC.
-.\" All rights reserved.
-.\"
-.\" Subject to the following obligations and disclaimer of warranty,
-.\" use and redistribution of this software, in source or object code
-.\" forms, with or without modifications are expressly permitted by
-.\" Packet Design; provided, however, that:
-.\"
-.\"    (i)  Any and all reproductions of the source or object code
-.\"         must include the copyright notice above and the following
-.\"         disclaimer of warranties; and
-.\"    (ii) No rights are granted, in any manner or form, to use
-.\"         Packet Design trademarks, including the mark "PACKET DESIGN"
-.\"         on advertising, endorsements, or otherwise except as such
-.\"         appears in the above copyright notice or in the software.
-.\"
-.\" THIS SOFTWARE IS BEING PROVIDED BY PACKET DESIGN "AS IS", AND
-.\" TO THE MAXIMUM EXTENT PERMITTED BY LAW, PACKET DESIGN MAKES NO
-.\" REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING
-.\" THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-.\" OR NON-INFRINGEMENT.  PACKET DESIGN DOES NOT WARRANT, GUARANTEE,
-.\" OR MAKE ANY REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS
-.\" OF THE USE OF THIS SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY,
-.\" RELIABILITY OR OTHERWISE.  IN NO EVENT SHALL PACKET DESIGN BE
-.\" LIABLE FOR ANY DAMAGES RESULTING FROM OR ARISING OUT OF ANY USE
-.\" OF THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE, OR CONSEQUENTIAL
-.\" DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF
-.\" USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 PACKET DESIGN IS ADVISED OF
-.\" THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/makecontext.3 108087 2002-12-19 09:40:28Z ru $
-.\"
-.Dd September 10, 2002
-.Dt MAKECONTEXT 3
-.Os
-.Sh NAME
-.Nm makecontext , swapcontext
-.Nd modify and exchange user thread contexts
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ucontext.h
-.Ft void
-.Fo makecontext
-.Fa "ucontext_t *ucp"
-.Fa "void \*[lp]*func\*[rp]\*[lp]void\*[rp]"
-.Fa "int argc" ...
-.Fc
-.Ft int
-.Fn swapcontext "ucontext_t *oucp" "const ucontext_t *ucp"
-.Sh DESCRIPTION
-The
-.Fn makecontext
-function
-modifies the user thread context pointed to by
-.Fa ucp ,
-which must have previously been initialized by a call to
-.Xr getcontext 3
-and had a stack allocated for it.
-The context is modified so that it will continue execution by invoking
-.Fn func
-with the arguments provided.
-The
-.Fa argc
-argument
-must be equal to the number of additional arguments provided to
-.Fn makecontext
-and also equal to the number of arguments to
-.Fn func ,
-or else the behavior is undefined.
-.Pp
-The
-.Fa "ucp->uc_link"
-argument
-must be initialized before calling
-.Fn makecontext
-and determines the action to take when
-.Fn func
-returns:
-if equal to
-.Dv NULL ,
-the process exits;
-otherwise,
-.Fn setcontext "ucp->uc_link"
-is implicitly invoked.
-.Pp
-The
-.Fn swapcontext
-function
-saves the current thread context in
-.Fa "*oucp"
-and makes
-.Fa "*ucp"
-the currently active context.
-.Sh RETURN VALUES
-If successful,
-.Fn swapcontext
-returns zero;
-otherwise \-1 is returned and the global variable
-.Va errno
-is set appropriately.
-.Sh ERRORS
-The
-.Fn swapcontext
-function
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-There is not enough stack space in
-.Fa ucp
-to complete the operation.
-.El
-.Sh SEE ALSO
-.Xr setcontext 3 ,
-.Xr ucontext 3
diff --git a/lib/libc_bsd/gen/modf.3 b/lib/libc_bsd/gen/modf.3
deleted file mode 100644
index c76a348..0000000
--- a/lib/libc_bsd/gen/modf.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)modf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/modf.3 177710 2008-03-29 16:19:35Z das $
-.\"
-.Dd March 29, 2008
-.Dt MODF 3
-.Os
-.Sh NAME
-.Nm modf ,
-.Nm modff ,
-.Nm modfl
-.Nd extract signed integral and fractional values from floating-point number
-.Sh LIBRARY
-.Lb libm
-.Sh SYNOPSIS
-.In math.h
-.Ft double
-.Fn modf "double value" "double *iptr"
-.Ft float
-.Fn modff "float value" "float *iptr"
-.Ft long double
-.Fn modfl "long double value" "long double *iptr"
-.Sh DESCRIPTION
-The
-.Fn modf ,
-.Fn modff ,
-and
-.Fn modfl
-functions break the argument
-.Fa value
-into integral and fractional parts, each of which has the
-same sign as the argument.
-It stores the integral part as a
-floating point number
-in the object pointed to by
-.Fa iptr .
-.Sh RETURN VALUES
-These functions return the signed fractional part of
-.Fa value .
-.Sh SEE ALSO
-.Xr frexp 3 ,
-.Xr ldexp 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn modf ,
-.Fn modff ,
-and
-.Fn modfl
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/gen/modf.c b/lib/libc_bsd/gen/modf.c
deleted file mode 100644
index a6d6db8..0000000
--- a/lib/libc_bsd/gen/modf.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* @(#)s_modf.c 5.1 93/09/24 */
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/modf.c 226606 2011-10-21 06:40:36Z das $");
-
-/*
- * modf(double x, double *iptr)
- * return fraction part of x, and return x's integral part in *iptr.
- * Method:
- *	Bit twiddling.
- *
- * Exception:
- *	No exception.
- */
-
-#include <sys/types.h>
-#include <machine/endian.h>
-#include <math.h>
-
-/* Bit fiddling routines copied from msun/src/math_private.h,v 1.15 */
-
-#if BYTE_ORDER == BIG_ENDIAN
-
-typedef union
-{
-  double value;
-  struct
-  {
-    uint32_t msw;
-    uint32_t lsw;
-  } parts;
-} ieee_double_shape_type;
-
-#endif
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-
-typedef union
-{
-  double value;
-  struct
-  {
-    uint32_t lsw;
-    uint32_t msw;
-  } parts;
-} ieee_double_shape_type;
-
-#endif
-
-/* Get two 32 bit ints from a double.  */
-
-#define EXTRACT_WORDS(ix0,ix1,d)				\
-do {								\
-  ieee_double_shape_type ew_u;					\
-  ew_u.value = (d);						\
-  (ix0) = ew_u.parts.msw;					\
-  (ix1) = ew_u.parts.lsw;					\
-} while (0)
-
-/* Get the more significant 32 bit int from a double.  */
-
-#define GET_HIGH_WORD(i,d)					\
-do {								\
-  ieee_double_shape_type gh_u;					\
-  gh_u.value = (d);						\
-  (i) = gh_u.parts.msw;						\
-} while (0)
-
-/* Set a double from two 32 bit ints.  */
-
-#define INSERT_WORDS(d,ix0,ix1)					\
-do {								\
-  ieee_double_shape_type iw_u;					\
-  iw_u.parts.msw = (ix0);					\
-  iw_u.parts.lsw = (ix1);					\
-  (d) = iw_u.value;						\
-} while (0)
-
-static const double one = 1.0;
-
-double
-modf(double x, double *iptr)
-{
-	int32_t i0,i1,j0;
-	uint32_t i;
-	EXTRACT_WORDS(i0,i1,x);
-	j0 = ((i0>>20)&0x7ff)-0x3ff;	/* exponent of x */
-	if(j0<20) {			/* integer part in high x */
-	    if(j0<0) {			/* |x|<1 */
-	        INSERT_WORDS(*iptr,i0&0x80000000,0);	/* *iptr = +-0 */
-		return x;
-	    } else {
-		i = (0x000fffff)>>j0;
-		if(((i0&i)|i1)==0) {		/* x is integral */
-		    uint32_t high;
-		    *iptr = x;
-		    GET_HIGH_WORD(high,x);
-		    INSERT_WORDS(x,high&0x80000000,0);	/* return +-0 */
-		    return x;
-		} else {
-		    INSERT_WORDS(*iptr,i0&(~i),0);
-		    return x - *iptr;
-		}
-	    }
-	} else if (j0>51) {		/* no fraction part */
-	    uint32_t high;
-	    if (j0 == 0x400) {		/* inf/NaN */
-		*iptr = x;
-		return 0.0 / x;
-	    }
-	    *iptr = x*one;
-	    GET_HIGH_WORD(high,x);
-	    INSERT_WORDS(x,high&0x80000000,0);	/* return +-0 */
-	    return x;
-	} else {			/* fraction part in low x */
-	    i = ((uint32_t)(0xffffffff))>>(j0-20);
-	    if((i1&i)==0) { 		/* x is integral */
-	        uint32_t high;
-		*iptr = x;
-		GET_HIGH_WORD(high,x);
-		INSERT_WORDS(x,high&0x80000000,0);	/* return +-0 */
-		return x;
-	    } else {
-	        INSERT_WORDS(*iptr,i0,i1&(~i));
-		return x - *iptr;
-	    }
-	}
-}
diff --git a/lib/libc_bsd/gen/mrand48.c b/lib/libc_bsd/gen/mrand48.c
deleted file mode 100644
index 84d1669..0000000
--- a/lib/libc_bsd/gen/mrand48.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/mrand48.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-
-long
-mrand48(void)
-{
-	_dorand48(_rand48_seed);
-	return ((long) _rand48_seed[2] << 16) + (long) _rand48_seed[1];
-}
diff --git a/lib/libc_bsd/gen/nftw.c b/lib/libc_bsd/gen/nftw.c
deleted file mode 100644
index 2149baa..0000000
--- a/lib/libc_bsd/gen/nftw.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*	$OpenBSD: nftw.c,v 1.7 2006/03/31 19:41:44 millert Exp $	*/
-
-/*
- * Copyright (c) 2003, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/nftw.c 239160 2012-08-09 22:05:40Z jilles $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fts.h>
-#include <ftw.h>
-
-int
-nftw(const char *path, int (*fn)(const char *, const struct stat *, int,
-     struct FTW *), int nfds, int ftwflags)
-{
-	char * const paths[2] = { (char *)path, NULL };
-	struct FTW ftw;
-	FTSENT *cur;
-	FTS *ftsp;
-	int error = 0, ftsflags, fnflag, postorder, sverrno;
-
-	/* XXX - nfds is currently unused */
-	if (nfds < 1) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ftsflags = FTS_COMFOLLOW;
-	if (!(ftwflags & FTW_CHDIR))
-		ftsflags |= FTS_NOCHDIR;
-	if (ftwflags & FTW_MOUNT)
-		ftsflags |= FTS_XDEV;
-	if (ftwflags & FTW_PHYS)
-		ftsflags |= FTS_PHYSICAL;
-	else
-		ftsflags |= FTS_LOGICAL;
-	postorder = (ftwflags & FTW_DEPTH) != 0;
-	ftsp = fts_open(paths, ftsflags, NULL);
-	if (ftsp == NULL)
-		return (-1);
-	while ((cur = fts_read(ftsp)) != NULL) {
-		switch (cur->fts_info) {
-		case FTS_D:
-			if (postorder)
-				continue;
-			fnflag = FTW_D;
-			break;
-		case FTS_DC:
-			continue;
-		case FTS_DNR:
-			fnflag = FTW_DNR;
-			break;
-		case FTS_DP:
-			if (!postorder)
-				continue;
-			fnflag = FTW_DP;
-			break;
-		case FTS_F:
-		case FTS_DEFAULT:
-			fnflag = FTW_F;
-			break;
-		case FTS_NS:
-		case FTS_NSOK:
-			fnflag = FTW_NS;
-			break;
-		case FTS_SL:
-			fnflag = FTW_SL;
-			break;
-		case FTS_SLNONE:
-			fnflag = FTW_SLN;
-			break;
-		default:
-			error = -1;
-			goto done;
-		}
-		ftw.base = cur->fts_pathlen - cur->fts_namelen;
-		ftw.level = cur->fts_level;
-		error = fn(cur->fts_path, cur->fts_statp, fnflag, &ftw);
-		if (error != 0)
-			break;
-	}
-done:
-	sverrno = errno;
-	if (fts_close(ftsp) != 0 && error == 0)
-		error = -1;
-	else
-		errno = sverrno;
-	return (error);
-}
diff --git a/lib/libc_bsd/gen/nice.3 b/lib/libc_bsd/gen/nice.3
deleted file mode 100644
index 464a3d6..0000000
--- a/lib/libc_bsd/gen/nice.3
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)nice.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/nice.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt NICE 3
-.Os
-.Sh NAME
-.Nm nice
-.Nd set program scheduling priority
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn nice "int incr"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr setpriority 2 .
-.Ef
-.Pp
-The
-.Fn nice
-function obtains the scheduling priority of the process
-from the system and sets it to the priority value specified in
-.Fa incr .
-The priority is a value in the range -20 to 20.
-The default priority is 0; lower priorities cause more favorable scheduling.
-Only the super-user may lower priorities.
-.Pp
-Children inherit the priority of their parent processes via
-.Xr fork 2 .
-.Sh SEE ALSO
-.Xr nice 1 ,
-.Xr fork 2 ,
-.Xr setpriority 2 ,
-.Xr renice 8
-.Sh HISTORY
-A
-.Fn nice
-syscall appeared in
-.At v6 .
diff --git a/lib/libc_bsd/gen/nice.c b/lib/libc_bsd/gen/nice.c
deleted file mode 100644
index b8c543d..0000000
--- a/lib/libc_bsd/gen/nice.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)nice.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/nice.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <errno.h>
-#include <unistd.h>
-
-/*
- * Backwards compatible nice.
- */
-int
-nice(incr)
-	int incr;
-{
-	int prio;
-
-	errno = 0;
-	prio = getpriority(PRIO_PROCESS, 0);
-	if (prio == -1 && errno)
-		return (-1);
-	return (setpriority(PRIO_PROCESS, 0, prio + incr));
-}
diff --git a/lib/libc_bsd/gen/nlist.3 b/lib/libc_bsd/gen/nlist.3
deleted file mode 100644
index 265c3c4..0000000
--- a/lib/libc_bsd/gen/nlist.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)nlist.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/nlist.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 19, 1994
-.Dt NLIST 3
-.Os
-.Sh NAME
-.Nm nlist
-.Nd retrieve symbol table name list from an executable file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nlist.h
-.Ft int
-.Fn nlist "const char *filename" "struct nlist *nl"
-.Sh DESCRIPTION
-The
-.Fn nlist
-function
-retrieves name list entries from the symbol table of an
-executable file (see
-.Xr a.out 5 ) .
-The argument
-.Fa \&nl
-is set to reference the
-beginning of the list.
-The list is preened of binary and invalid data;
-if an entry in the
-name list is valid, the
-.Fa n_type
-and
-.Fa n_value
-for the entry are copied into the list
-referenced by
-.Fa \&nl .
-No other data is copied.
-The last entry in the list is always
-.Dv NULL .
-.Sh RETURN VALUES
-The number of invalid entries is returned if successful; otherwise,
-if the file
-.Fa filename
-does not exist or is not executable, the returned value is \-1.
-.Sh SEE ALSO
-.Xr a.out 5
-.Sh HISTORY
-A
-.Fn nlist
-function appeared in
-.At v6 .
diff --git a/lib/libc_bsd/gen/nlist.c b/lib/libc_bsd/gen/nlist.c
deleted file mode 100644
index e865cb1..0000000
--- a/lib/libc_bsd/gen/nlist.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/nlist.c 241046 2012-09-29 11:54:34Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <a.out.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#define _NLIST_DO_AOUT
-#define _NLIST_DO_ELF
-
-#ifdef _NLIST_DO_ELF
-#include <machine/elf.h>
-#include <elf-hints.h>
-#endif
-
-int __fdnlist(int, struct nlist *);
-int __aout_fdnlist(int, struct nlist *);
-int __elf_fdnlist(int, struct nlist *);
-
-int
-nlist(name, list)
-	const char *name;
-	struct nlist *list;
-{
-	int fd, n;
-
-	fd = _open(name, O_RDONLY | O_CLOEXEC, 0);
-	if (fd < 0)
-		return (-1);
-	n = __fdnlist(fd, list);
-	(void)_close(fd);
-	return (n);
-}
-
-static struct nlist_handlers {
-	int	(*fn)(int fd, struct nlist *list);
-} nlist_fn[] = {
-#ifdef _NLIST_DO_AOUT
-	{ __aout_fdnlist },
-#endif
-#ifdef _NLIST_DO_ELF
-	{ __elf_fdnlist },
-#endif
-};
-
-int
-__fdnlist(fd, list)
-	int fd;
-	struct nlist *list;
-{
-	int n = -1, i;
-
-	for (i = 0; i < sizeof(nlist_fn) / sizeof(nlist_fn[0]); i++) {
-		n = (nlist_fn[i].fn)(fd, list);
-		if (n != -1)
-			break;
-	}
-	return (n);
-}
-
-#define	ISLAST(p)	(p->n_un.n_name == 0 || p->n_un.n_name[0] == 0)
-
-#ifdef _NLIST_DO_AOUT
-int
-__aout_fdnlist(fd, list)
-	int fd;
-	struct nlist *list;
-{
-	struct nlist *p, *symtab;
-	caddr_t strtab, a_out_mmap;
-	off_t stroff, symoff;
-	u_long symsize;
-	int nent;
-	struct exec * exec;
-	struct stat st;
-
-	/* check that file is at least as large as struct exec! */
-	if ((_fstat(fd, &st) < 0) || (st.st_size < sizeof(struct exec)))
-		return (-1);
-
-	/* Check for files too large to mmap. */
-	if (st.st_size > SIZE_T_MAX) {
-		errno = EFBIG;
-		return (-1);
-	}
-
-	/*
-	 * Map the whole a.out file into our address space.
-	 * We then find the string table withing this area.
-	 * We do not just mmap the string table, as it probably
-	 * does not start at a page boundary - we save ourselves a
-	 * lot of nastiness by mmapping the whole file.
-	 *
-	 * This gives us an easy way to randomly access all the strings,
-	 * without making the memory allocation permanent as with
-	 * malloc/free (i.e., munmap will return it to the system).
-	 */
-	a_out_mmap = mmap(NULL, (size_t)st.st_size, PROT_READ, MAP_PRIVATE, fd, (off_t)0);
-	if (a_out_mmap == MAP_FAILED)
-		return (-1);
-
-	exec = (struct exec *)a_out_mmap;
-	if (N_BADMAG(*exec)) {
-		munmap(a_out_mmap, (size_t)st.st_size);
-		return (-1);
-	}
-
-	symoff = N_SYMOFF(*exec);
-	symsize = exec->a_syms;
-	stroff = symoff + symsize;
-
-	/* find the string table in our mmapped area */
-	strtab = a_out_mmap + stroff;
-	symtab = (struct nlist *)(a_out_mmap + symoff);
-
-	/*
-	 * clean out any left-over information for all valid entries.
-	 * Type and value defined to be 0 if not found; historical
-	 * versions cleared other and desc as well.  Also figure out
-	 * the largest string length so don't read any more of the
-	 * string table than we have to.
-	 *
-	 * XXX clearing anything other than n_type and n_value violates
-	 * the semantics given in the man page.
-	 */
-	nent = 0;
-	for (p = list; !ISLAST(p); ++p) {
-		p->n_type = 0;
-		p->n_other = 0;
-		p->n_desc = 0;
-		p->n_value = 0;
-		++nent;
-	}
-
-	while (symsize > 0) {
-		int soff;
-
-		symsize-= sizeof(struct nlist);
-		soff = symtab->n_un.n_strx;
-
-
-		if (soff != 0 && (symtab->n_type & N_STAB) == 0)
-			for (p = list; !ISLAST(p); p++)
-				if (!strcmp(&strtab[soff], p->n_un.n_name)) {
-					p->n_value = symtab->n_value;
-					p->n_type = symtab->n_type;
-					p->n_desc = symtab->n_desc;
-					p->n_other = symtab->n_other;
-					if (--nent <= 0)
-						break;
-				}
-		symtab++;
-	}
-	munmap(a_out_mmap, (size_t)st.st_size);
-	return (nent);
-}
-#endif
-
-#ifdef _NLIST_DO_ELF
-static void elf_sym_to_nlist(struct nlist *, Elf_Sym *, Elf_Shdr *, int);
-
-/*
- * __elf_is_okay__ - Determine if ehdr really
- * is ELF and valid for the target platform.
- *
- * WARNING:  This is NOT an ELF ABI function and
- * as such its use should be restricted.
- */
-int
-__elf_is_okay__(Elf_Ehdr *ehdr)
-{
-	int retval = 0;
-	/*
-	 * We need to check magic, class size, endianess,
-	 * and version before we look at the rest of the
-	 * Elf_Ehdr structure.  These few elements are
-	 * represented in a machine independant fashion.
-	 */
-	if (IS_ELF(*ehdr) &&
-	    ehdr->e_ident[EI_CLASS] == ELF_TARG_CLASS &&
-	    ehdr->e_ident[EI_DATA] == ELF_TARG_DATA &&
-	    ehdr->e_ident[EI_VERSION] == ELF_TARG_VER) {
-
-		/* Now check the machine dependant header */
-		if (ehdr->e_machine == ELF_TARG_MACH &&
-		    ehdr->e_version == ELF_TARG_VER)
-			retval = 1;
-	}
-	return retval;
-}
-
-int
-__elf_fdnlist(fd, list)
-	int fd;
-	struct nlist *list;
-{
-	struct nlist *p;
-	Elf_Off symoff = 0, symstroff = 0;
-	Elf_Size symsize = 0, symstrsize = 0;
-	Elf_Ssize cc, i;
-	int nent = -1;
-	int errsave;
-	Elf_Sym sbuf[1024];
-	Elf_Sym *s;
-	Elf_Ehdr ehdr;
-	char *strtab = NULL;
-	Elf_Shdr *shdr = NULL;
-	Elf_Size shdr_size;
-	void *base;
-	struct stat st;
-
-	/* Make sure obj is OK */
-	if (lseek(fd, (off_t)0, SEEK_SET) == -1 ||
-	    _read(fd, &ehdr, sizeof(Elf_Ehdr)) != sizeof(Elf_Ehdr) ||
-	    !__elf_is_okay__(&ehdr) ||
-	    _fstat(fd, &st) < 0)
-		return (-1);
-
-	/* calculate section header table size */
-	shdr_size = ehdr.e_shentsize * ehdr.e_shnum;
-
-	/* Make sure it's not too big to mmap */
-	if (shdr_size > SIZE_T_MAX) {
-		errno = EFBIG;
-		return (-1);
-	}
-
-	/* mmap section header table */
-	base = mmap(NULL, (size_t)shdr_size, PROT_READ, 0, fd,
-	    (off_t)ehdr.e_shoff);
-	if (base == MAP_FAILED)
-		return (-1);
-	shdr = (Elf_Shdr *)base;
-
-	/*
-	 * Find the symbol table entry and it's corresponding
-	 * string table entry.	Version 1.1 of the ABI states
-	 * that there is only one symbol table but that this
-	 * could change in the future.
-	 */
-	for (i = 0; i < ehdr.e_shnum; i++) {
-		if (shdr[i].sh_type == SHT_SYMTAB) {
-			symoff = shdr[i].sh_offset;
-			symsize = shdr[i].sh_size;
-			symstroff = shdr[shdr[i].sh_link].sh_offset;
-			symstrsize = shdr[shdr[i].sh_link].sh_size;
-			break;
-		}
-	}
-
-	/* Check for files too large to mmap. */
-	if (symstrsize > SIZE_T_MAX) {
-		errno = EFBIG;
-		goto done;
-	}
-	/*
-	 * Map string table into our address space.  This gives us
-	 * an easy way to randomly access all the strings, without
-	 * making the memory allocation permanent as with malloc/free
-	 * (i.e., munmap will return it to the system).
-	 */
-	base = mmap(NULL, (size_t)symstrsize, PROT_READ, 0, fd,
-	    (off_t)symstroff);
-	if (base == MAP_FAILED)
-		goto done;
-	strtab = (char *)base;
-
-	/*
-	 * clean out any left-over information for all valid entries.
-	 * Type and value defined to be 0 if not found; historical
-	 * versions cleared other and desc as well.  Also figure out
-	 * the largest string length so don't read any more of the
-	 * string table than we have to.
-	 *
-	 * XXX clearing anything other than n_type and n_value violates
-	 * the semantics given in the man page.
-	 */
-	nent = 0;
-	for (p = list; !ISLAST(p); ++p) {
-		p->n_type = 0;
-		p->n_other = 0;
-		p->n_desc = 0;
-		p->n_value = 0;
-		++nent;
-	}
-
-	/* Don't process any further if object is stripped. */
-	if (symoff == 0)
-		goto done;
-		
-	if (lseek(fd, (off_t) symoff, SEEK_SET) == -1) {
-		nent = -1;
-		goto done;
-	}
-
-	while (symsize > 0 && nent > 0) {
-		cc = MIN(symsize, sizeof(sbuf));
-		if (_read(fd, sbuf, cc) != cc)
-			break;
-		symsize -= cc;
-		for (s = sbuf; cc > 0 && nent > 0; ++s, cc -= sizeof(*s)) {
-			char *name;
-			struct nlist *p;
-
-			name = strtab + s->st_name;
-			if (name[0] == '\0')
-				continue;
-			for (p = list; !ISLAST(p); p++) {
-				if ((p->n_un.n_name[0] == '_' &&
-				    strcmp(name, p->n_un.n_name+1) == 0)
-				    || strcmp(name, p->n_un.n_name) == 0) {
-					elf_sym_to_nlist(p, s, shdr,
-					    ehdr.e_shnum);
-					if (--nent <= 0)
-						break;
-				}
-			}
-		}
-	}
-  done:
-	errsave = errno;
-	if (strtab != NULL)
-		munmap(strtab, symstrsize);
-	if (shdr != NULL)
-		munmap(shdr, shdr_size);
-	errno = errsave;
-	return (nent);
-}
-
-/*
- * Convert an Elf_Sym into an nlist structure.  This fills in only the
- * n_value and n_type members.
- */
-static void
-elf_sym_to_nlist(nl, s, shdr, shnum)
-	struct nlist *nl;
-	Elf_Sym *s;
-	Elf_Shdr *shdr;
-	int shnum;
-{
-	nl->n_value = s->st_value;
-
-	switch (s->st_shndx) {
-	case SHN_UNDEF:
-	case SHN_COMMON:
-		nl->n_type = N_UNDF;
-		break;
-	case SHN_ABS:
-		nl->n_type = ELF_ST_TYPE(s->st_info) == STT_FILE ?
-		    N_FN : N_ABS;
-		break;
-	default:
-		if (s->st_shndx >= shnum)
-			nl->n_type = N_UNDF;
-		else {
-			Elf_Shdr *sh = shdr + s->st_shndx;
-
-			nl->n_type = sh->sh_type == SHT_PROGBITS ?
-			    (sh->sh_flags & SHF_WRITE ? N_DATA : N_TEXT) :
-			    (sh->sh_type == SHT_NOBITS ? N_BSS : N_UNDF);
-		}
-		break;
-	}
-
-	if (ELF_ST_BIND(s->st_info) == STB_GLOBAL ||
-	    ELF_ST_BIND(s->st_info) == STB_WEAK)
-		nl->n_type |= N_EXT;
-}
-#endif /* _NLIST_DO_ELF */
diff --git a/lib/libc_bsd/gen/nrand48.c b/lib/libc_bsd/gen/nrand48.c
deleted file mode 100644
index 68c2125..0000000
--- a/lib/libc_bsd/gen/nrand48.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/nrand48.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include "rand48.h"
-
-long
-nrand48(unsigned short xseed[3])
-{
-	_dorand48(xseed);
-	return ((long) xseed[2] << 15) + ((long) xseed[1] >> 1);
-}
diff --git a/lib/libc_bsd/gen/opendir.c b/lib/libc_bsd/gen/opendir.c
deleted file mode 100644
index 212a5a6..0000000
--- a/lib/libc_bsd/gen/opendir.c
+++ /dev/null
@@ -1,360 +0,0 @@
-/*-
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)opendir.c	8.8 (Berkeley) 5/1/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/opendir.c 270002 2014-08-14 20:20:21Z jhb $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "gen-private.h"
-#include "telldir.h"
-
-static DIR * __opendir_common(int, int, bool);
-
-/*
- * Open a directory.
- */
-DIR *
-opendir(const char *name)
-{
-
-	return (__opendir2(name, DTF_HIDEW|DTF_NODUP));
-}
-
-/*
- * Open a directory with existing file descriptor.
- */
-DIR *
-fdopendir(int fd)
-{
-
-	if (_fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
-		return (NULL);
-	return (__opendir_common(fd, DTF_HIDEW|DTF_NODUP, true));
-}
-
-DIR *
-__opendir2(const char *name, int flags)
-{
-	int fd;
-	DIR *dir;
-	int saved_errno;
-
-	if ((flags & (__DTF_READALL | __DTF_SKIPREAD)) != 0)
-		return (NULL);
-	if ((fd = _open(name,
-	    O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC)) == -1)
-		return (NULL);
-
-	dir = __opendir_common(fd, flags, false);
-	if (dir == NULL) {
-		saved_errno = errno;
-		_close(fd);
-		errno = saved_errno;
-	}
-	return (dir);
-}
-
-static int
-opendir_compar(const void *p1, const void *p2)
-{
-
-	return (strcmp((*(const struct dirent **)p1)->d_name,
-	    (*(const struct dirent **)p2)->d_name));
-}
-
-/*
- * For a directory at the top of a unionfs stack, the entire directory's
- * contents are read and cached locally until the next call to rewinddir().
- * For the fdopendir() case, the initial seek position must be preserved.
- * For rewinddir(), the full directory should always be re-read from the
- * beginning.
- *
- * If an error occurs, the existing buffer and state of 'dirp' is left
- * unchanged.
- */
-bool
-_filldir(DIR *dirp, bool use_current_pos)
-{
-	struct dirent **dpv;
-	char *buf, *ddptr, *ddeptr;
-	off_t pos;
-	int fd2, incr, len, n, saved_errno, space;
-	
-	len = 0;
-	space = 0;
-	buf = NULL;
-	ddptr = NULL;
-
-	/*
-	 * Use the system page size if that is a multiple of DIRBLKSIZ.
-	 * Hopefully this can be a big win someday by allowing page
-	 * trades to user space to be done by _getdirentries().
-	 */
-	incr = getpagesize();
-	if ((incr % DIRBLKSIZ) != 0) 
-		incr = DIRBLKSIZ;
-
-	/*
-	 * The strategy here is to read all the directory
-	 * entries into a buffer, sort the buffer, and
-	 * remove duplicate entries by setting the inode
-	 * number to zero.
-	 *
-	 * We reopen the directory because _getdirentries()
-	 * on a MNT_UNION mount modifies the open directory,
-	 * making it refer to the lower directory after the
-	 * upper directory's entries are exhausted.
-	 * This would otherwise break software that uses
-	 * the directory descriptor for fchdir or *at
-	 * functions, such as fts.c.
-	 */
-	if ((fd2 = _openat(dirp->dd_fd, ".", O_RDONLY | O_CLOEXEC)) == -1)
-		return (false);
-
-	if (use_current_pos) {
-		pos = lseek(dirp->dd_fd, 0, SEEK_CUR);
-		if (pos == -1 || lseek(fd2, pos, SEEK_SET) == -1) {
-			saved_errno = errno;
-			_close(fd2);
-			errno = saved_errno;
-			return (false);
-		}
-	}
-
-	do {
-		/*
-		 * Always make at least DIRBLKSIZ bytes
-		 * available to _getdirentries
-		 */
-		if (space < DIRBLKSIZ) {
-			space += incr;
-			len += incr;
-			buf = reallocf(buf, len);
-			if (buf == NULL) {
-				saved_errno = errno;
-				_close(fd2);
-				errno = saved_errno;
-				return (false);
-			}
-			ddptr = buf + (len - space);
-		}
-
-		n = _getdirentries(fd2, ddptr, space, &dirp->dd_seek);
-		if (n > 0) {
-			ddptr += n;
-			space -= n;
-		}
-		if (n < 0) {
-			saved_errno = errno;
-			_close(fd2);
-			errno = saved_errno;
-			return (false);
-		}
-	} while (n > 0);
-	_close(fd2);
-
-	ddeptr = ddptr;
-
-	/*
-	 * There is now a buffer full of (possibly) duplicate
-	 * names.
-	 */
-	dirp->dd_buf = buf;
-
-	/*
-	 * Go round this loop twice...
-	 *
-	 * Scan through the buffer, counting entries.
-	 * On the second pass, save pointers to each one.
-	 * Then sort the pointers and remove duplicate names.
-	 */
-	for (dpv = 0;;) {
-		n = 0;
-		ddptr = buf;
-		while (ddptr < ddeptr) {
-			struct dirent *dp;
-
-			dp = (struct dirent *) ddptr;
-			if ((long)dp & 03L)
-				break;
-			if ((dp->d_reclen <= 0) ||
-			    (dp->d_reclen > (ddeptr + 1 - ddptr)))
-				break;
-			ddptr += dp->d_reclen;
-			if (dp->d_fileno) {
-				if (dpv)
-					dpv[n] = dp;
-				n++;
-			}
-		}
-
-		if (dpv) {
-			struct dirent *xp;
-
-			/*
-			 * This sort must be stable.
-			 */
-			mergesort(dpv, n, sizeof(*dpv), opendir_compar);
-
-			dpv[n] = NULL;
-			xp = NULL;
-
-			/*
-			 * Scan through the buffer in sort order,
-			 * zapping the inode number of any
-			 * duplicate names.
-			 */
-			for (n = 0; dpv[n]; n++) {
-				struct dirent *dp = dpv[n];
-
-				if ((xp == NULL) ||
-				    strcmp(dp->d_name, xp->d_name)) {
-					xp = dp;
-				} else {
-					dp->d_fileno = 0;
-				}
-				if (dp->d_type == DT_WHT &&
-				    (dirp->dd_flags & DTF_HIDEW))
-					dp->d_fileno = 0;
-			}
-
-			free(dpv);
-			break;
-		} else {
-			dpv = malloc((n+1) * sizeof(struct dirent *));
-			if (dpv == NULL)
-				break;
-		}
-	}
-
-	dirp->dd_len = len;
-	dirp->dd_size = ddptr - dirp->dd_buf;
-	return (true);
-}
-
-
-/*
- * Common routine for opendir(3), __opendir2(3) and fdopendir(3).
- */
-static DIR *
-__opendir_common(int fd, int flags, bool use_current_pos)
-{
-	DIR *dirp;
-	int incr;
-	int saved_errno;
-	int unionstack;
-
-	if ((dirp = malloc(sizeof(DIR) + sizeof(struct _telldir))) == NULL)
-		return (NULL);
-
-	dirp->dd_buf = NULL;
-	dirp->dd_fd = fd;
-	dirp->dd_flags = flags;
-	dirp->dd_loc = 0;
-	dirp->dd_lock = NULL;
-	dirp->dd_td = (struct _telldir *)((char *)dirp + sizeof(DIR));
-	LIST_INIT(&dirp->dd_td->td_locq);
-	dirp->dd_td->td_loccnt = 0;
-
-	/*
-	 * Use the system page size if that is a multiple of DIRBLKSIZ.
-	 * Hopefully this can be a big win someday by allowing page
-	 * trades to user space to be done by _getdirentries().
-	 */
-	incr = getpagesize();
-	if ((incr % DIRBLKSIZ) != 0) 
-		incr = DIRBLKSIZ;
-
-	/*
-	 * Determine whether this directory is the top of a union stack.
-	 */
-	if (flags & DTF_NODUP) {
-		struct statfs sfb;
-
-		if (_fstatfs(fd, &sfb) < 0)
-			goto fail;
-		unionstack = !strcmp(sfb.f_fstypename, "unionfs")
-		    || (sfb.f_flags & MNT_UNION);
-	} else {
-		unionstack = 0;
-	}
-
-	if (unionstack) {
-		if (!_filldir(dirp, use_current_pos))
-			goto fail;
-		dirp->dd_flags |= __DTF_READALL;
-	} else {
-		dirp->dd_len = incr;
-		dirp->dd_buf = malloc(dirp->dd_len);
-		if (dirp->dd_buf == NULL)
-			goto fail;
-		if (use_current_pos) {
-			/*
-			 * Read the first batch of directory entries
-			 * to prime dd_seek.  This also checks if the
-			 * fd passed to fdopendir() is a directory.
-			 */
-			dirp->dd_size = _getdirentries(dirp->dd_fd,
-			    dirp->dd_buf, dirp->dd_len, &dirp->dd_seek);
-			if (dirp->dd_size < 0) {
-				if (errno == EINVAL)
-					errno = ENOTDIR;
-				goto fail;
-			}
-			dirp->dd_flags |= __DTF_SKIPREAD;
-		} else {
-			dirp->dd_size = 0;
-			dirp->dd_seek = 0;
-		}
-	}
-
-	return (dirp);
-
-fail:
-	saved_errno = errno;
-	free(dirp->dd_buf);
-	free(dirp);
-	errno = saved_errno;
-	return (NULL);
-}
diff --git a/lib/libc_bsd/gen/pause.3 b/lib/libc_bsd/gen/pause.3
deleted file mode 100644
index 0b13f72..0000000
--- a/lib/libc_bsd/gen/pause.3
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)pause.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/pause.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt PAUSE 3
-.Os
-.Sh NAME
-.Nm pause
-.Nd stop until signal
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn pause void
-.Sh DESCRIPTION
-.Sy Pause is made obsolete by
-.Xr sigsuspend 2 .
-.Pp
-The
-.Fn pause
-function
-forces a process to pause until
-a signal is received from either the
-.Xr kill 2
-function
-or an interval timer.
-(See
-.Xr setitimer 2 . )
-Upon termination of a signal handler started during a
-.Fn pause ,
-the
-.Fn pause
-call will return.
-.Sh RETURN VALUES
-Always returns \-1.
-.Sh ERRORS
-The
-.Fn pause
-function
-always returns:
-.Bl -tag -width Er
-.It Bq Er EINTR
-The call was interrupted.
-.El
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr select 2 ,
-.Xr sigsuspend 2
-.Sh HISTORY
-A
-.Fn pause
-syscall
-appeared in
-.At v6 .
diff --git a/lib/libc_bsd/gen/pause.c b/lib/libc_bsd/gen/pause.c
deleted file mode 100644
index df74b16..0000000
--- a/lib/libc_bsd/gen/pause.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)pause.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/pause.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <signal.h>
-#include <unistd.h>
-
-#include "libc_private.h"
-
-/*
- * Backwards compatible pause.
- */
-int
-__pause(void)
-{
-	sigset_t oset;
-
-	if (sigprocmask(SIG_BLOCK, NULL, &oset) == -1)
-		return (-1);
-	return (sigsuspend(&oset));
-}
-
-__weak_reference(__pause, pause);
-__weak_reference(__pause, _pause);
diff --git a/lib/libc_bsd/gen/pmadvise.c b/lib/libc_bsd/gen/pmadvise.c
deleted file mode 100644
index 4515180..0000000
--- a/lib/libc_bsd/gen/pmadvise.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * The contents of this file are in the public domain.
- * Written by Garrett A. Wollman, 2000-10-07.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/pmadvise.c 261560 2014-02-06 19:47:17Z kib $");
-
-#include <sys/mman.h>
-#include <errno.h>
-
-int
-posix_madvise(void *address, size_t size, int how)
-{
-	int ret, saved_errno;
-
-	saved_errno = errno;
-	if (madvise(address, size, how) == -1) {
-		ret = errno;
-		errno = saved_errno;
-	} else {
-		ret = 0;
-	}
-	return (ret);
-}
diff --git a/lib/libc_bsd/gen/popen.3 b/lib/libc_bsd/gen/popen.3
deleted file mode 100644
index 68c8f0f..0000000
--- a/lib/libc_bsd/gen/popen.3
+++ /dev/null
@@ -1,202 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)popen.3	8.2 (Berkeley) 5/3/95
-.\" $FreeBSD: releng/10.2/lib/libc/gen/popen.3 250827 2013-05-20 17:31:18Z jilles $
-.\"
-.Dd May 20, 2013
-.Dt POPEN 3
-.Os
-.Sh NAME
-.Nm popen ,
-.Nm pclose
-.Nd process
-.Tn I/O
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn popen "const char *command" "const char *type"
-.Ft int
-.Fn pclose "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn popen
-function
-.Dq opens
-a process by creating a bidirectional pipe
-forking,
-and invoking the shell.
-Any streams opened by previous
-.Fn popen
-calls in the parent process are closed in the new child process.
-Historically,
-.Fn popen
-was implemented with a unidirectional pipe;
-hence many implementations of
-.Fn popen
-only allow the
-.Fa type
-argument to specify reading or writing, not both.
-Since
-.Fn popen
-is now implemented using a bidirectional pipe, the
-.Fa type
-argument may request a bidirectional data flow.
-The
-.Fa type
-argument is a pointer to a null-terminated string
-which must be
-.Ql r
-for reading,
-.Ql w
-for writing, or
-.Ql r+
-for reading and writing.
-.Pp
-A letter
-.Ql e
-may be appended to that to request that the underlying file descriptor
-be set close-on-exec.
-.Pp
-The
-.Fa command
-argument is a pointer to a null-terminated string
-containing a shell command line.
-This command is passed to
-.Pa /bin/sh
-using the
-.Fl c
-flag; interpretation, if any, is performed by the shell.
-.Pp
-The return value from
-.Fn popen
-is a normal standard
-.Tn I/O
-stream in all respects
-save that it must be closed with
-.Fn pclose
-rather than
-.Fn fclose .
-Writing to such a stream
-writes to the standard input of the command;
-the command's standard output is the same as that of the process that called
-.Fn popen ,
-unless this is altered by the command itself.
-Conversely, reading from a
-.Dq popened
-stream reads the command's standard output, and
-the command's standard input is the same as that of the process that called
-.Fn popen .
-.Pp
-Note that output
-.Fn popen
-streams are fully buffered by default.
-.Pp
-The
-.Fn pclose
-function waits for the associated process to terminate
-and returns the exit status of the command
-as returned by
-.Xr wait4 2 .
-.Sh RETURN VALUES
-The
-.Fn popen
-function returns
-.Dv NULL
-if the
-.Xr fork 2
-or
-.Xr pipe 2
-calls fail,
-or if it cannot allocate memory.
-.Pp
-The
-.Fn pclose
-function
-returns \-1 if
-.Fa stream
-is not associated with a
-.Dq popened
-command, if
-.Fa stream
-already
-.Dq pclosed ,
-or if
-.Xr wait4 2
-returns an error.
-.Sh ERRORS
-The
-.Fn popen
-function does not reliably set
-.Va errno .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr fork 2 ,
-.Xr pipe 2 ,
-.Xr wait4 2 ,
-.Xr fclose 3 ,
-.Xr fflush 3 ,
-.Xr fopen 3 ,
-.Xr stdio 3 ,
-.Xr system 3
-.Sh HISTORY
-A
-.Fn popen
-and a
-.Fn pclose
-function appeared in
-.At v7 .
-.Pp
-Bidirectional functionality was added in
-.Fx 2.2.6 .
-.Sh BUGS
-Since the standard input of a command opened for reading
-shares its seek offset with the process that called
-.Fn popen ,
-if the original process has done a buffered read,
-the command's input position may not be as expected.
-Similarly, the output from a command opened for writing
-may become intermingled with that of the original process.
-The latter can be avoided by calling
-.Xr fflush 3
-before
-.Fn popen .
-.Pp
-Failure to execute the shell
-is indistinguishable from the shell's failure to execute command,
-or an immediate exit of the command.
-The only hint is an exit status of 127.
-.Pp
-The
-.Fn popen
-function
-always calls
-.Xr sh 1 ,
-never calls
-.Xr csh 1 .
diff --git a/lib/libc_bsd/gen/popen.c b/lib/libc_bsd/gen/popen.c
deleted file mode 100644
index 4f339a5..0000000
--- a/lib/libc_bsd/gen/popen.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software written by Ken Arnold and
- * published in UNIX Review, Vol. 6, No. 8.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)popen.c	8.3 (Berkeley) 5/3/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/popen.c 250827 2013-05-20 17:31:18Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <sys/wait.h>
-
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <paths.h>
-#include <pthread.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-extern char **environ;
-
-struct pid {
-	SLIST_ENTRY(pid) next;
-	FILE *fp;
-	pid_t pid;
-};
-static SLIST_HEAD(, pid) pidlist = SLIST_HEAD_INITIALIZER(pidlist);
-static pthread_mutex_t pidlist_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define	THREAD_LOCK()	if (__isthreaded) _pthread_mutex_lock(&pidlist_mutex)
-#define	THREAD_UNLOCK()	if (__isthreaded) _pthread_mutex_unlock(&pidlist_mutex)
-
-FILE *
-popen(command, type)
-	const char *command, *type;
-{
-	struct pid *cur;
-	FILE *iop;
-	int pdes[2], pid, twoway, cloexec;
-	char *argv[4];
-	struct pid *p;
-
-	cloexec = strchr(type, 'e') != NULL;
-	/*
-	 * Lite2 introduced two-way popen() pipes using _socketpair().
-	 * FreeBSD's pipe() is bidirectional, so we use that.
-	 */
-	if (strchr(type, '+')) {
-		twoway = 1;
-		type = "r+";
-	} else  {
-		twoway = 0;
-		if ((*type != 'r' && *type != 'w') ||
-		    (type[1] && (type[1] != 'e' || type[2])))
-			return (NULL);
-	}
-	if ((cloexec ? pipe2(pdes, O_CLOEXEC) : pipe(pdes)) < 0)
-		return (NULL);
-
-	if ((cur = malloc(sizeof(struct pid))) == NULL) {
-		(void)_close(pdes[0]);
-		(void)_close(pdes[1]);
-		return (NULL);
-	}
-
-	argv[0] = "sh";
-	argv[1] = "-c";
-	argv[2] = (char *)command;
-	argv[3] = NULL;
-
-	THREAD_LOCK();
-	switch (pid = vfork()) {
-	case -1:			/* Error. */
-		THREAD_UNLOCK();
-		(void)_close(pdes[0]);
-		(void)_close(pdes[1]);
-		free(cur);
-		return (NULL);
-		/* NOTREACHED */
-	case 0:				/* Child. */
-		if (*type == 'r') {
-			/*
-			 * The _dup2() to STDIN_FILENO is repeated to avoid
-			 * writing to pdes[1], which might corrupt the
-			 * parent's copy.  This isn't good enough in
-			 * general, since the _exit() is no return, so
-			 * the compiler is free to corrupt all the local
-			 * variables.
-			 */
-			if (!cloexec)
-				(void)_close(pdes[0]);
-			if (pdes[1] != STDOUT_FILENO) {
-				(void)_dup2(pdes[1], STDOUT_FILENO);
-				if (!cloexec)
-					(void)_close(pdes[1]);
-				if (twoway)
-					(void)_dup2(STDOUT_FILENO, STDIN_FILENO);
-			} else if (twoway && (pdes[1] != STDIN_FILENO)) {
-				(void)_dup2(pdes[1], STDIN_FILENO);
-				if (cloexec)
-					(void)_fcntl(pdes[1], F_SETFD, 0);
-			} else if (cloexec)
-				(void)_fcntl(pdes[1], F_SETFD, 0);
-		} else {
-			if (pdes[0] != STDIN_FILENO) {
-				(void)_dup2(pdes[0], STDIN_FILENO);
-				if (!cloexec)
-					(void)_close(pdes[0]);
-			} else if (cloexec)
-				(void)_fcntl(pdes[0], F_SETFD, 0);
-			if (!cloexec)
-				(void)_close(pdes[1]);
-		}
-		SLIST_FOREACH(p, &pidlist, next)
-			(void)_close(fileno(p->fp));
-		_execve(_PATH_BSHELL, argv, environ);
-		_exit(127);
-		/* NOTREACHED */
-	}
-	THREAD_UNLOCK();
-
-	/* Parent; assume fdopen can't fail. */
-	if (*type == 'r') {
-		iop = fdopen(pdes[0], type);
-		(void)_close(pdes[1]);
-	} else {
-		iop = fdopen(pdes[1], type);
-		(void)_close(pdes[0]);
-	}
-
-	/* Link into list of file descriptors. */
-	cur->fp = iop;
-	cur->pid = pid;
-	THREAD_LOCK();
-	SLIST_INSERT_HEAD(&pidlist, cur, next);
-	THREAD_UNLOCK();
-
-	return (iop);
-}
-
-/*
- * pclose --
- *	Pclose returns -1 if stream is not associated with a `popened' command,
- *	if already `pclosed', or waitpid returns an error.
- */
-int
-pclose(iop)
-	FILE *iop;
-{
-	struct pid *cur, *last = NULL;
-	int pstat;
-	pid_t pid;
-
-	/*
-	 * Find the appropriate file pointer and remove it from the list.
-	 */
-	THREAD_LOCK();
-	SLIST_FOREACH(cur, &pidlist, next) {
-		if (cur->fp == iop)
-			break;
-		last = cur;
-	}
-	if (cur == NULL) {
-		THREAD_UNLOCK();
-		return (-1);
-	}
-	if (last == NULL)
-		SLIST_REMOVE_HEAD(&pidlist, next);
-	else
-		SLIST_REMOVE_AFTER(last, next);
-	THREAD_UNLOCK();
-
-	(void)fclose(iop);
-
-	do {
-		pid = _wait4(cur->pid, &pstat, 0, (struct rusage *)0);
-	} while (pid == -1 && errno == EINTR);
-
-	free(cur);
-
-	return (pid == -1 ? -1 : pstat);
-}
diff --git a/lib/libc_bsd/gen/posix_spawn.3 b/lib/libc_bsd/gen/posix_spawn.3
deleted file mode 100644
index d9d78cb..0000000
--- a/lib/libc_bsd/gen/posix_spawn.3
+++ /dev/null
@@ -1,460 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawn.3 223576 2011-06-26 18:27:17Z ed $
-.\"
-.Dd June 17, 2011
-.Dt POSIX_SPAWN 3
-.Os
-.Sh NAME
-.Nm posix_spawn ,
-.Nm posix_spawnp
-.Nd "spawn a process"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawn "pid_t *restrict pid" "const char *restrict path" "const posix_spawn_file_actions_t *file_actions" "const posix_spawnattr_t *restrict attrp" "char *const argv[restrict]" "char *const envp[restrict]"
-.Ft int
-.Fn posix_spawnp "pid_t *restrict pid" "const char *restrict file" "const posix_spawn_file_actions_t *file_actions" "const posix_spawnattr_t *restrict attrp" "char *const argv[restrict]" "char *const envp[restrict]"
-.Sh DESCRIPTION
-The
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-functions create a new process (child process) from the specified
-process image.
-The new process image is constructed from a regular executable
-file called the new process image file.
-.Pp
-When a C program is executed as the result of this call, it is
-entered as a C-language function call as follows:
-.Bd -literal -offset indent
-int main(int argc, char *argv[]);
-.Ed
-.Pp
-where
-.Fa argc
-is the argument count and
-.Fa argv
-is an array of character pointers to the arguments themselves.
-In addition, the variable:
-.Bd -literal -offset indent
-extern char **environ;
-.Ed
-.Pp
-points to an array of character pointers to
-the environment strings.
-.Pp
-The argument
-.Fa argv
-is an array of character pointers to null-terminated
-strings.
-The last member of this array is a null pointer and is not counted
-in
-.Fa argc .
-These strings constitute the argument list available to the new process
-image.
-The value in
-.Fa argv Ns [0]
-should point to
-a filename that is associated with the process image being started by
-the
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-function.
-.Pp
-The argument
-.Fa envp
-is an array of character pointers to null-terminated strings.
-These strings constitute the environment for the new process image.
-The environment array is terminated by a null pointer.
-.Pp
-The
-.Fa path
-argument to
-.Fn posix_spawn
-is a pathname that identifies the new process image file to execute.
-.Pp
-The
-.Fa file
-parameter to
-.Fn posix_spawnp
-is used to construct a pathname that identifies the new process
-image file.
-If the file parameter contains a slash character, the file parameter
-is used as the pathname for the new process image file.
-Otherwise, the path prefix for this file is obtained by a search
-of the directories passed as the environment variable
-.Dq Ev PATH .
-If this variable is not specified,
-the default path is set according to the
-.Dv _PATH_DEFPATH
-definition in
-.In paths.h ,
-which is set to
-.Dq Ev /usr/bin:/bin .
-.Pp
-If
-.Fa file_actions
-is a null pointer, then file descriptors open in the
-calling process remain open in the child process, except for those
-whose close-on-exec flag
-.Dv FD_CLOEXEC
-is set (see
-.Fn fcntl ) .
-For those
-file descriptors that remain open, all attributes of the corresponding
-open file descriptions, including file locks (see
-.Fn fcntl ) ,
-remain unchanged.
-.Pp
-If
-.Fa file_actions
-is not NULL, then the file descriptors open in the child process are
-those open in the calling process as modified by the spawn file
-actions object pointed to by
-.Fa file_actions
-and the
-.Dv FD_CLOEXEC
-flag of each remaining open file descriptor after the spawn file actions
-have been processed.
-The effective order of processing the spawn file actions are:
-.Bl -enum
-.It
-The set of open file descriptors for the child process initially
-are the same set as is open for the calling process.
-All attributes of the corresponding open file descriptions, including
-file locks (see
-.Fn fcntl ) ,
-remain unchanged.
-.It
-The signal mask, signal default actions, and the effective user and
-group IDs for the child process are changed as specified in the
-attributes object referenced by
-.Fa attrp .
-.It
-The file actions specified by the spawn file actions object are
-performed in the order in which they were added to the spawn file
-actions object.
-.It
-Any file descriptor that has its
-.Dv FD_CLOEXEC
-flag set (see
-.Fn fcntl )
-is closed.
-.El
-.Pp
-The
-.Vt posix_spawnattr_t
-spawn attributes object type is defined in
-.In spawn.h .
-It contains the attributes defined below.
-.Pp
-If the
-.Dv POSIX_SPAWN_SETPGROUP
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-and the spawn-pgroup attribute of the same object is non-zero, then the
-child's process group is as specified in the spawn-pgroup
-attribute of the object referenced by
-.Fa attrp .
-.Pp
-As a special case, if the
-.Dv POSIX_SPAWN_SETPGROUP
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-and the spawn-pgroup attribute of the same object is set to zero, then
-the child is in a new process group with a process group ID equal
-to its process ID.
-.Pp
-If the
-.Dv POSIX_SPAWN_SETPGROUP
-flag is not set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-the new child process inherits the parent's process group.
-.Pp
-If the
-.Dv POSIX_SPAWN_SETSCHEDPARAM
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-but
-.Dv POSIX_SPAWN_SETSCHEDULER
-is not set, the new process image initially has the scheduling
-policy of the calling process with the scheduling parameters specified
-in the spawn-schedparam attribute of the object referenced by
-.Fa attrp .
-.Pp
-If the
-.Dv POSIX_SPAWN_SETSCHEDULER
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp
-(regardless of the setting of the
-.Dv POSIX_SPAWN_SETSCHEDPARAM
-flag), the new process image initially has the scheduling policy
-specified in the spawn-schedpolicy attribute of the object referenced by
-.Fa attrp
-and the scheduling parameters specified in the spawn-schedparam
-attribute of the same object.
-.Pp
-The
-.Dv POSIX_SPAWN_RESETIDS
-flag in the spawn-flags attribute of the object referenced by
-.Fa attrp
-governs the effective user ID of the child process.
-If this flag is not set, the child process inherits the parent
-process' effective user ID.
-If this flag is set, the child process' effective user ID is reset
-to the parent's real user ID.
-In either case, if the set-user-ID mode bit of the new process image
-file is set, the effective user ID of the child process becomes
-that file's owner ID before the new process image begins execution.
-.Pp
-The
-.Dv POSIX_SPAWN_RESETIDS
-flag in the spawn-flags attribute of the object referenced by
-.Fa attrp
-also governs the effective group ID of the child process.
-If this flag is not set, the child process inherits the parent
-process' effective group ID.
-If this flag is set, the child process' effective group ID is
-reset to the parent's real group ID.
-In either case, if the set-group-ID mode bit of the new process image
-file is set, the effective group ID of the child process becomes
-that file's group ID before the new process image begins execution.
-.Pp
-If the
-.Dv POSIX_SPAWN_SETSIGMASK
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-the child process initially has the signal mask specified in the
-spawn-sigmask attribute of the object referenced by
-.Fa attrp .
-.Pp
-If the
-.Dv POSIX_SPAWN_SETSIGDEF
-flag is set in the spawn-flags attribute of the object referenced by
-.Fa attrp ,
-the signals specified in the spawn-sigdefault attribute of the same
-object is set to their default actions in the child process.
-Signals set to the default action in the parent process is set to
-the default action in the child process.
-.Pp
-Signals set to be caught by the calling process is set to the
-default action in the child process.
-.Pp
-Signals set to be ignored by the calling process image is set to
-be ignored by the child process, unless otherwise specified by the
-.Dv POSIX_SPAWN_SETSIGDEF
-flag being set in the spawn-flags attribute of the object referenced by
-.Fa attrp
-and the signals being indicated in the spawn-sigdefault attribute
-of the object referenced by
-.Fa attrp .
-.Pp
-If the value of the
-.Fa attrp
-pointer is NULL, then the default values are used.
-.Pp
-All process attributes, other than those influenced by the attributes
-set in the object referenced by
-.Fa attrp
-as specified above or by the file descriptor manipulations specified in
-.Fa file_actions ,
-appear in the new process image as though
-.Fn vfork
-had been called to create a child process and then
-.Fn execve
-had been called by the child process to execute the new process image.
-.Pp
-The implementation uses vfork(), thus the fork handlers are not run when
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-is called.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-return the process ID of the child process to the parent process,
-in the variable pointed to by a non-NULL
-.Fa pid
-argument, and return zero as the function return value.
-Otherwise, no child process is created, no value is stored into
-the variable pointed to by
-.Fa pid ,
-and an error number is returned as the function return value to
-indicate the error.
-If the
-.Fa pid
-argument is a null pointer, the process ID of the child is not returned
-to the caller.
-.Sh ERRORS
-.Bl -enum
-.It
-If
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-fail for any of the reasons that would cause
-.Fn vfork
-or one of the
-.Nm exec
-to fail, an error value is returned as described by
-.Fn vfork
-and
-.Nm exec ,
-respectively (or, if the error occurs after the calling process successfully
-returns, the child process exits with exit status 127).
-.It
-If
-.Nm POSIX_SPAWN_SETPGROUP
-is set in the spawn-flags attribute of the object referenced by attrp, and
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-fails while changing the child's process group, an error value is returned as
-described by
-.Fn setpgid
-(or, if the error occurs after the calling process successfully returns,
-the child process exits with exit status 127).
-.It
-If
-.Nm POSIX_SPAWN_SETSCHEDPARAM
-is set and
-.Nm POSIX_SPAWN_SETSCHEDULER
-is not set in the spawn-flags attribute of the object referenced by attrp, then
-if
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-fails for any of the reasons that would cause
-.Fn sched_setparam
-to fail, an error value is returned as described by
-.Fn sched_setparam
-(or, if the error occurs after the calling process successfully returns, the
-child process exits with exit status 127).
-.It
-If
-.Nm POSIX_SPAWN_SETSCHEDULER
-is set in the spawn-flags attribute of the object referenced by attrp, and if
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-fails for any of the reasons that would cause
-.Fn sched_setscheduler
-to fail, an error value is returned as described by
-.Fn sched_setscheduler
-(or, if the error occurs after the calling process successfully returns,
-the child process exits with exit status 127).
-.It
-If the
-.Fa file_actions
-argument is not NULL, and specifies any dup2 or open actions to be
-performed, and if
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-fails for any of the reasons that would cause
-.Fn dup2
-or
-.Fn open
-to fail, an error value is returned as described by
-.Fn dup2
-and
-.Fn open ,
-respectively (or, if the error occurs after the calling process successfully
-returns, the child process exits with exit status 127). An open file action
-may, by itself, result in any of the errors described by
-.Fn dup2 ,
-in addition to those described by
-.Fn open .
-This implementation ignores any errors from
-.Fn close ,
-including trying to close a descriptor that is not open.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr dup2 2 ,
-.Xr execve 2 ,
-.Xr fcntl 2 ,
-.Xr open 2 ,
-.Xr posix_spawn_file_actions_addclose 3 ,
-.Xr posix_spawn_file_actions_adddup2 3 ,
-.Xr posix_spawn_file_actions_addopen 3 ,
-.Xr posix_spawn_file_actions_destroy 3 ,
-.Xr posix_spawn_file_actions_init 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_getflags 3 ,
-.Xr posix_spawnattr_getpgroup 3 ,
-.Xr posix_spawnattr_getschedparam 3 ,
-.Xr posix_spawnattr_getschedpolicy 3 ,
-.Xr posix_spawnattr_getsigdefault 3 ,
-.Xr posix_spawnattr_getsigmask 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setflags 3 ,
-.Xr posix_spawnattr_setpgroup 3 ,
-.Xr posix_spawnattr_setschedparam 3 ,
-.Xr posix_spawnattr_setschedpolicy 3 ,
-.Xr posix_spawnattr_setsigdefault 3 ,
-.Xr posix_spawnattr_setsigmask 3 ,
-.Xr sched_setparam 2 ,
-.Xr sched_setscheduler 2 ,
-.Xr setpgid 2 ,
-.Xr vfork 2
-.Sh STANDARDS
-The
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-functions conform to
-.St -p1003.1-2001 ,
-except that they ignore all errors from
-.Fn close .
-A future update of the Standard is expected to require that these functions
-not fail because a file descriptor to be closed (via
-.Fn posix_spawn_file_actions_addclose )
-is not open.
-.Sh HISTORY
-The
-.Fn posix_spawn
-and
-.Fn posix_spawnp
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/posix_spawn.c b/lib/libc_bsd/gen/posix_spawn.c
deleted file mode 100644
index 5886a6b..0000000
--- a/lib/libc_bsd/gen/posix_spawn.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/posix_spawn.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <sys/queue.h>
-#include <sys/wait.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <sched.h>
-#include <spawn.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-extern char **environ;
-
-struct __posix_spawnattr {
-	short			sa_flags;
-	pid_t			sa_pgroup;
-	struct sched_param	sa_schedparam;
-	int			sa_schedpolicy;
-	sigset_t		sa_sigdefault;
-	sigset_t		sa_sigmask;
-};
-
-struct __posix_spawn_file_actions {
-	STAILQ_HEAD(, __posix_spawn_file_actions_entry) fa_list;
-};
-
-typedef struct __posix_spawn_file_actions_entry {
-	STAILQ_ENTRY(__posix_spawn_file_actions_entry) fae_list;
-	enum { FAE_OPEN, FAE_DUP2, FAE_CLOSE } fae_action;
-
-	int fae_fildes;
-	union {
-		struct {
-			char *path;
-#define fae_path	fae_data.open.path
-			int oflag;
-#define fae_oflag	fae_data.open.oflag
-			mode_t mode;
-#define fae_mode	fae_data.open.mode
-		} open;
-		struct {
-			int newfildes;
-#define fae_newfildes	fae_data.dup2.newfildes
-		} dup2;
-	} fae_data;
-} posix_spawn_file_actions_entry_t;
-
-/*
- * Spawn routines
- */
-
-static int
-process_spawnattr(const posix_spawnattr_t sa)
-{
-	struct sigaction sigact = { .sa_flags = 0, .sa_handler = SIG_DFL };
-	int i;
-
-	/*
-	 * POSIX doesn't really describe in which order everything
-	 * should be set. We'll just set them in the order in which they
-	 * are mentioned.
-	 */
-
-	/* Set process group */
-	if (sa->sa_flags & POSIX_SPAWN_SETPGROUP) {
-		if (setpgid(0, sa->sa_pgroup) != 0)
-			return (errno);
-	}
-
-	/* Set scheduler policy */
-	if (sa->sa_flags & POSIX_SPAWN_SETSCHEDULER) {
-		if (sched_setscheduler(0, sa->sa_schedpolicy,
-		    &sa->sa_schedparam) != 0)
-			return (errno);
-	} else if (sa->sa_flags & POSIX_SPAWN_SETSCHEDPARAM) {
-		if (sched_setparam(0, &sa->sa_schedparam) != 0)
-			return (errno);
-	}
-
-	/* Reset user ID's */
-	if (sa->sa_flags & POSIX_SPAWN_RESETIDS) {
-		if (setegid(getgid()) != 0)
-			return (errno);
-		if (seteuid(getuid()) != 0)
-			return (errno);
-	}
-
-	/*
-	 * Set signal masks/defaults.
-	 * Use unwrapped syscall, libthr is in undefined state after vfork().
-	 */
-	if (sa->sa_flags & POSIX_SPAWN_SETSIGMASK) {
-		__sys_sigprocmask(SIG_SETMASK, &sa->sa_sigmask, NULL);
-	}
-
-	if (sa->sa_flags & POSIX_SPAWN_SETSIGDEF) {
-		for (i = 1; i <= _SIG_MAXSIG; i++) {
-			if (sigismember(&sa->sa_sigdefault, i))
-				if (__sys_sigaction(i, &sigact, NULL) != 0)
-					return (errno);
-		}
-	}
-
-	return (0);
-}
-
-static int
-process_file_actions_entry(posix_spawn_file_actions_entry_t *fae)
-{
-	int fd;
-
-	switch (fae->fae_action) {
-	case FAE_OPEN:
-		/* Perform an open(), make it use the right fd */
-		fd = _open(fae->fae_path, fae->fae_oflag, fae->fae_mode);
-		if (fd < 0)
-			return (errno);
-		if (fd != fae->fae_fildes) {
-			if (_dup2(fd, fae->fae_fildes) == -1)
-				return (errno);
-			if (_close(fd) != 0) {
-				if (errno == EBADF)
-					return (EBADF);
-			}
-		}
-		if (_fcntl(fae->fae_fildes, F_SETFD, 0) == -1)
-			return (errno);
-		break;
-	case FAE_DUP2:
-		/* Perform a dup2() */
-		if (_dup2(fae->fae_fildes, fae->fae_newfildes) == -1)
-			return (errno);
-		if (_fcntl(fae->fae_newfildes, F_SETFD, 0) == -1)
-			return (errno);
-		break;
-	case FAE_CLOSE:
-		/* Perform a close(), do not fail if already closed */
-		(void)_close(fae->fae_fildes);
-		break;
-	}
-	return (0);
-}
-
-static int
-process_file_actions(const posix_spawn_file_actions_t fa)
-{
-	posix_spawn_file_actions_entry_t *fae;
-	int error;
-
-	/* Replay all file descriptor modifications */
-	STAILQ_FOREACH(fae, &fa->fa_list, fae_list) {
-		error = process_file_actions_entry(fae);
-		if (error)
-			return (error);
-	}
-	return (0);
-}
-
-static int
-do_posix_spawn(pid_t *pid, const char *path,
-    const posix_spawn_file_actions_t *fa,
-    const posix_spawnattr_t *sa,
-    char * const argv[], char * const envp[], int use_env_path)
-{
-	pid_t p;
-	volatile int error = 0;
-
-	p = vfork();
-	switch (p) {
-	case -1:
-		return (errno);
-	case 0:
-		if (sa != NULL) {
-			error = process_spawnattr(*sa);
-			if (error)
-				_exit(127);
-		}
-		if (fa != NULL) {
-			error = process_file_actions(*fa);
-			if (error)
-				_exit(127);
-		}
-		if (use_env_path)
-			_execvpe(path, argv, envp != NULL ? envp : environ);
-		else
-			_execve(path, argv, envp != NULL ? envp : environ);
-		error = errno;
-		_exit(127);
-	default:
-		if (error != 0)
-			_waitpid(p, NULL, WNOHANG);
-		else if (pid != NULL)
-			*pid = p;
-		return (error);
-	}
-}
-
-int
-posix_spawn(pid_t *pid, const char *path,
-    const posix_spawn_file_actions_t *fa,
-    const posix_spawnattr_t *sa,
-    char * const argv[], char * const envp[])
-{
-	return do_posix_spawn(pid, path, fa, sa, argv, envp, 0);
-}
-
-int
-posix_spawnp(pid_t *pid, const char *path,
-    const posix_spawn_file_actions_t *fa,
-    const posix_spawnattr_t *sa,
-    char * const argv[], char * const envp[])
-{
-	return do_posix_spawn(pid, path, fa, sa, argv, envp, 1);
-}
-
-/*
- * File descriptor actions
- */
-
-int
-posix_spawn_file_actions_init(posix_spawn_file_actions_t *ret)
-{
-	posix_spawn_file_actions_t fa;
-
-	fa = malloc(sizeof(struct __posix_spawn_file_actions));
-	if (fa == NULL)
-		return (-1);
-
-	STAILQ_INIT(&fa->fa_list);
-	*ret = fa;
-	return (0);
-}
-
-int
-posix_spawn_file_actions_destroy(posix_spawn_file_actions_t *fa)
-{
-	posix_spawn_file_actions_entry_t *fae;
-
-	while ((fae = STAILQ_FIRST(&(*fa)->fa_list)) != NULL) {
-		/* Remove file action entry from the queue */
-		STAILQ_REMOVE_HEAD(&(*fa)->fa_list, fae_list);
-
-		/* Deallocate file action entry */
-		if (fae->fae_action == FAE_OPEN)
-			free(fae->fae_path);
-		free(fae);
-	}
-
-	free(*fa);
-	return (0);
-}
-
-int
-posix_spawn_file_actions_addopen(posix_spawn_file_actions_t * __restrict fa,
-    int fildes, const char * __restrict path, int oflag, mode_t mode)
-{
-	posix_spawn_file_actions_entry_t *fae;
-	int error;
-
-	if (fildes < 0)
-		return (EBADF);
-
-	/* Allocate object */
-	fae = malloc(sizeof(posix_spawn_file_actions_entry_t));
-	if (fae == NULL)
-		return (errno);
-
-	/* Set values and store in queue */
-	fae->fae_action = FAE_OPEN;
-	fae->fae_path = strdup(path);
-	if (fae->fae_path == NULL) {
-		error = errno;
-		free(fae);
-		return (error);
-	}
-	fae->fae_fildes = fildes;
-	fae->fae_oflag = oflag;
-	fae->fae_mode = mode;
-
-	STAILQ_INSERT_TAIL(&(*fa)->fa_list, fae, fae_list);
-	return (0);
-}
-
-int
-posix_spawn_file_actions_adddup2(posix_spawn_file_actions_t *fa,
-    int fildes, int newfildes)
-{
-	posix_spawn_file_actions_entry_t *fae;
-
-	if (fildes < 0 || newfildes < 0)
-		return (EBADF);
-
-	/* Allocate object */
-	fae = malloc(sizeof(posix_spawn_file_actions_entry_t));
-	if (fae == NULL)
-		return (errno);
-
-	/* Set values and store in queue */
-	fae->fae_action = FAE_DUP2;
-	fae->fae_fildes = fildes;
-	fae->fae_newfildes = newfildes;
-
-	STAILQ_INSERT_TAIL(&(*fa)->fa_list, fae, fae_list);
-	return (0);
-}
-
-int
-posix_spawn_file_actions_addclose(posix_spawn_file_actions_t *fa,
-    int fildes)
-{
-	posix_spawn_file_actions_entry_t *fae;
-
-	if (fildes < 0)
-		return (EBADF);
-
-	/* Allocate object */
-	fae = malloc(sizeof(posix_spawn_file_actions_entry_t));
-	if (fae == NULL)
-		return (errno);
-
-	/* Set values and store in queue */
-	fae->fae_action = FAE_CLOSE;
-	fae->fae_fildes = fildes;
-
-	STAILQ_INSERT_TAIL(&(*fa)->fa_list, fae, fae_list);
-	return (0);
-}
-
-/*
- * Spawn attributes
- */
-
-int
-posix_spawnattr_init(posix_spawnattr_t *ret)
-{
-	posix_spawnattr_t sa;
-
-	sa = calloc(1, sizeof(struct __posix_spawnattr));
-	if (sa == NULL)
-		return (errno);
-
-	/* Set defaults as specified by POSIX, cleared above */
-	*ret = sa;
-	return (0);
-}
-
-int
-posix_spawnattr_destroy(posix_spawnattr_t *sa)
-{
-	free(*sa);
-	return (0);
-}
-
-int
-posix_spawnattr_getflags(const posix_spawnattr_t * __restrict sa,
-    short * __restrict flags)
-{
-	*flags = (*sa)->sa_flags;
-	return (0);
-}
-
-int
-posix_spawnattr_getpgroup(const posix_spawnattr_t * __restrict sa,
-    pid_t * __restrict pgroup)
-{
-	*pgroup = (*sa)->sa_pgroup;
-	return (0);
-}
-
-int
-posix_spawnattr_getschedparam(const posix_spawnattr_t * __restrict sa,
-    struct sched_param * __restrict schedparam)
-{
-	*schedparam = (*sa)->sa_schedparam;
-	return (0);
-}
-
-int
-posix_spawnattr_getschedpolicy(const posix_spawnattr_t * __restrict sa,
-    int * __restrict schedpolicy)
-{
-	*schedpolicy = (*sa)->sa_schedpolicy;
-	return (0);
-}
-
-int
-posix_spawnattr_getsigdefault(const posix_spawnattr_t * __restrict sa,
-    sigset_t * __restrict sigdefault)
-{
-	*sigdefault = (*sa)->sa_sigdefault;
-	return (0);
-}
-
-int
-posix_spawnattr_getsigmask(const posix_spawnattr_t * __restrict sa,
-    sigset_t * __restrict sigmask)
-{
-	*sigmask = (*sa)->sa_sigmask;
-	return (0);
-}
-
-int
-posix_spawnattr_setflags(posix_spawnattr_t *sa, short flags)
-{
-	(*sa)->sa_flags = flags;
-	return (0);
-}
-
-int
-posix_spawnattr_setpgroup(posix_spawnattr_t *sa, pid_t pgroup)
-{
-	(*sa)->sa_pgroup = pgroup;
-	return (0);
-}
-
-int
-posix_spawnattr_setschedparam(posix_spawnattr_t * __restrict sa,
-    const struct sched_param * __restrict schedparam)
-{
-	(*sa)->sa_schedparam = *schedparam;
-	return (0);
-}
-
-int
-posix_spawnattr_setschedpolicy(posix_spawnattr_t *sa, int schedpolicy)
-{
-	(*sa)->sa_schedpolicy = schedpolicy;
-	return (0);
-}
-
-int
-posix_spawnattr_setsigdefault(posix_spawnattr_t * __restrict sa,
-    const sigset_t * __restrict sigdefault)
-{
-	(*sa)->sa_sigdefault = *sigdefault;
-	return (0);
-}
-
-int
-posix_spawnattr_setsigmask(posix_spawnattr_t * __restrict sa,
-    const sigset_t * __restrict sigmask)
-{
-	(*sa)->sa_sigmask = *sigmask;
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/posix_spawn_file_actions_addopen.3 b/lib/libc_bsd/gen/posix_spawn_file_actions_addopen.3
deleted file mode 100644
index ebdfad4..0000000
--- a/lib/libc_bsd/gen/posix_spawn_file_actions_addopen.3
+++ /dev/null
@@ -1,203 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawn_file_actions_addopen.3 250554 2013-05-12 05:54:58Z pluknet $
-.\"
-.Dd May 9, 2013
-.Dt POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 3
-.Os
-.Sh NAME
-.Nm posix_spawn_file_actions_addopen ,
-.Nm posix_spawn_file_actions_adddup2 ,
-.Nm posix_spawn_file_actions_addclose
-.Nd "add open, dup2 or close action to spawn file actions object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawn_file_actions_addopen "posix_spawn_file_actions_t * file_actions" "int fildes" "const char *restrict path" "int oflag" "mode_t mode"
-.Ft int
-.Fn posix_spawn_file_actions_adddup2 "posix_spawn_file_actions_t * file_actions" "int fildes" "int newfildes"
-.Ft int
-.Fn posix_spawn_file_actions_addclose "posix_spawn_file_actions_t * file_actions" "int fildes"
-.Sh DESCRIPTION
-These functions add an open, dup2 or close action to a spawn
-file actions object.
-.Pp
-A spawn file actions object is of type
-.Vt posix_spawn_file_actions_t
-(defined in
-.In spawn.h )
-and is used to specify a series of actions to be performed by a
-.Fn posix_spawn
-or
-.Fn posix_spawnp
-operation in order to arrive at the set of open file descriptors for the
-child process given the set of open file descriptors of the parent.
-.Pp
-A spawn file actions object, when passed to
-.Fn posix_spawn
-or
-.Fn posix_spawnp ,
-specify how the set of open file descriptors in the calling
-process is transformed into a set of potentially open file descriptors
-for the spawned process.
-This transformation is as if the specified sequence of actions was
-performed exactly once, in the context of the spawned process (prior to
-execution of the new process image), in the order in which the actions
-were added to the object; additionally, when the new process image is
-executed, any file descriptor (from this new set) which has its
-.Dv FD_CLOEXEC
-flag set is closed (see
-.Fn posix_spawn ) .
-.Pp
-The
-.Fn posix_spawn_file_actions_addopen
-function adds an open action to the object referenced by
-.Fa file_actions
-that causes the file named by
-.Fa path
-to be opened (as if
-.Bd -literal -offset indent
-open(path, oflag, mode)
-.Ed
-.Pp
-had been called, and the returned file descriptor, if not
-.Fa fildes ,
-had been changed to
-.Fa fildes )
-when a new process is spawned using this file actions object.
-If
-.Fa fildes
-was already an open file descriptor, it is closed before the new
-file is opened.
-.Pp
-The string described by
-.Fa path
-is copied by the
-.Fn posix_spawn_file_actions_addopen
-function.
-.Pp
-The
-.Fn posix_spawn_file_actions_adddup2
-function adds a dup2 action to the object referenced by
-.Fa file_actions
-that causes the file descriptor
-.Fa fildes
-to be duplicated as
-.Fa newfildes
-(as if
-.Bd -literal -offset indent
-dup2(fildes, newfildes)
-.Ed
-.Pp
-had been called) when a new process is spawned using this file actions object,
-except that the
-.Dv FD_CLOEXEC
-flag for
-.Fa newfildes
-is cleared even if
-.Fa fildes
-is equal to
-.Fa newfildes .
-The difference from
-.Fn dup2
-is useful for passing a particular file descriptor
-to a particular child process.
-.Pp
-The
-.Fn posix_spawn_file_actions_addclose
-function adds a close action to the object referenced by
-.Fa file_actions
-that causes the file descriptor
-.Fa fildes
-to be closed (as if
-.Bd -literal -offset indent
-close(fildes)
-.Ed
-.Pp
-had been called) when a new process is spawned using this file actions
-object.
-.Sh RETURN VALUES
-Upon successful completion, these functions return zero;
-otherwise, an error number is returned to indicate the error.
-.Sh ERRORS
-These
-functions fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The value specified by
-.Fa fildes
-or
-.Fa newfildes
-is negative.
-.It Bq Er ENOMEM
-Insufficient memory exists to add to the spawn file actions object.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr dup2 2 ,
-.Xr open 2 ,
-.Xr posix_spawn 3 ,
-.Xr posix_spawn_file_actions_destroy 3 ,
-.Xr posix_spawn_file_actions_init 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawn_file_actions_addopen ,
-.Fn posix_spawn_file_actions_adddup2
-and
-.Fn posix_spawn_file_actions_addclose
-functions conform to
-.St -p1003.1-2001 ,
-with the exception of the behavior of
-.Fn posix_spawn_file_actions_adddup2
-if
-.Fa fildes
-is equal to
-.Fa newfildes
-(clearing
-.Dv FD_CLOEXEC ) .
-A future update of the Standard is expected to require this behavior.
-.Sh HISTORY
-The
-.Fn posix_spawn_file_actions_addopen ,
-.Fn posix_spawn_file_actions_adddup2
-and
-.Fn posix_spawn_file_actions_addclose
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/posix_spawn_file_actions_init.3 b/lib/libc_bsd/gen/posix_spawn_file_actions_init.3
deleted file mode 100644
index d27a648..0000000
--- a/lib/libc_bsd/gen/posix_spawn_file_actions_init.3
+++ /dev/null
@@ -1,104 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawn_file_actions_init.3 198788 2009-11-02 12:35:38Z brueffer $
-.\"
-.Dd March 24, 2008
-.Dt POSIX_SPAWN_FILE_ACTIONS_INIT 3
-.Os
-.Sh NAME
-.Nm posix_spawn_file_actions_init ,
-.Nm posix_spawn_file_actions_destroy
-.Nd "initialize and destroy spawn file actions object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawn_file_actions_init "posix_spawn_file_actions_t * file_actions"
-.Ft int
-.Fn posix_spawn_file_actions_destroy "posix_spawn_file_actions_t * file_actions"
-.Sh DESCRIPTION
-The
-.Fn posix_spawn_file_actions_init
-function initialize the object referenced by
-.Fn file_actions
-to contain no file actions for
-.Fn posix_spawn
-or
-.Fn posix_spawnp .
-Initializing an already initialized spawn file actions object may cause
-memory to be leaked.
-.Pp
-The
-.Fn posix_spawn_file_actions_destroy
-function destroy the object referenced by
-.Fa file_actions ;
-the object becomes, in effect, uninitialized.
-A destroyed spawn file actions object can be reinitialized using
-.Fn posix_spawn_file_actions_init .
-The object should not be used after it has been destroyed.
-.Sh RETURN VALUES
-Upon successful completion, these functions return zero;
-otherwise, an error number is returned to indicate the error.
-.Sh ERRORS
-The
-.Fn posix_spawn_file_actions_init
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory exists to initialize the spawn file actions object.
-.El
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawn_file_actions_addclose 3 ,
-.Xr posix_spawn_file_actions_adddup2 3 ,
-.Xr posix_spawn_file_actions_addopen 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawn_file_actions_init
-and
-.Fn posix_spawn_file_actions_destroy
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawn_file_actions_init
-and
-.Fn posix_spawn_file_actions_destroy
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/posix_spawnattr_getflags.3 b/lib/libc_bsd/gen/posix_spawnattr_getflags.3
deleted file mode 100644
index 9031c6e..0000000
--- a/lib/libc_bsd/gen/posix_spawnattr_getflags.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawnattr_getflags.3 236438 2012-06-02 08:47:26Z joel $
-.\"
-.Dd March 24, 2008
-.Dt POSIX_SPAWNATTR_GETFLAGS 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getflags ,
-.Nm posix_spawnattr_setflags
-.Nd "get and set the spawn-flags attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getflags "const posix_spawnattr_t *restrict attr" "short *restrict flags"
-.Ft int
-.Fn posix_spawnattr_setflags "posix_spawnattr_t *attr" "short flags"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getflags
-function obtains the value of the spawn-flags attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setflags
-function sets the spawn-flags attribute in an initialized
-attributes object referenced by
-.Fa attr .
-.Pp
-The spawn-flags attribute is used to indicate which process attributes
-are to be changed in the new process image when invoking
-.Fn posix_spawn
-or
-.Fn posix_spawnp .
-It is the bitwise-inclusive OR of zero or more of the following flags
-(see
-.Fn posix_spawn ) :
-.Bl -tag -width "POSIX_SPAWN_SETSCHEDPARAM" -offset indent
-.It Dv POSIX_SPAWN_RESETIDS
-.It Dv POSIX_SPAWN_SETPGROUP
-.It Dv POSIX_SPAWN_SETSIGDEF
-.It Dv POSIX_SPAWN_SETSIGMASK
-.It Dv POSIX_SPAWN_SETSCHEDPARAM
-.It Dv POSIX_SPAWN_SETSCHEDULER
-.El
-.Pp
-These flags are defined in
-.In spawn.h .
-The default value of this attribute is as if no flags were set.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getflags
-and
-.Fn posix_spawnattr_setflags
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getflags
-and
-.Fn posix_spawnattr_setflags
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getflags
-and
-.Fn posix_spawnattr_setflags
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/posix_spawnattr_getpgroup.3 b/lib/libc_bsd/gen/posix_spawnattr_getpgroup.3
deleted file mode 100644
index 22844d9..0000000
--- a/lib/libc_bsd/gen/posix_spawnattr_getpgroup.3
+++ /dev/null
@@ -1,96 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawnattr_getpgroup.3 198788 2009-11-02 12:35:38Z brueffer $
-.\"
-.Dd March 24, 2008
-.Dt POSIX_SPAWNATTR_GETPGROUP 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getpgroup ,
-.Nm posix_spawnattr_setpgroup
-.Nd "get and set the spawn-pgroup attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getpgroup "const posix_spawnattr_t *restrict attr" "pid_t *restrict pgroup"
-.Ft int
-.Fn posix_spawnattr_setpgroup "posix_spawnattr_t *attr" "pid_t pgroup"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getpgroup
-function obtains the value of the spawn-pgroup attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setpgroup
-function sets the spawn-pgroup attribute in an initialized
-attributes object referenced by
-.Fa attr .
-.Pp
-The spawn-pgroup attribute represents the process group to be joined by
-the new process image in a spawn operation (if
-.Dv POSIX_SPAWN_SETPGROUP
-is set in the spawn-flags attribute).
-The default value of this attribute is zero.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getpgroup
-and
-.Fn posix_spawnattr_setpgroup
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getpgroup
-and
-.Fn posix_spawnattr_setpgroup
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getpgroup
-and
-.Fn posix_spawnattr_setpgroup
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/posix_spawnattr_getschedparam.3 b/lib/libc_bsd/gen/posix_spawnattr_getschedparam.3
deleted file mode 100644
index 586f341..0000000
--- a/lib/libc_bsd/gen/posix_spawnattr_getschedparam.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawnattr_getschedparam.3 198788 2009-11-02 12:35:38Z brueffer $
-.\"
-.Dd March 24, 2008
-.Dt POSIX_SPAWNATTR_GETSCHEDPARAM 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getschedparam ,
-.Nm posix_spawnattr_setschedparam
-.Nd "get and set the spawn-schedparam attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getschedparam "const posix_spawnattr_t *restrict attr" "struct sched_param *restrict schedparam"
-.Ft int
-.Fn posix_spawnattr_setschedparam "posix_spawnattr_t *attr" "const struct sched_param *restrict schedparam"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getschedparam
-function obtains the value of the spawn-schedparam attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setschedparam
-function sets the spawn-schedparam attribute in an initialized attributes
-object referenced by
-.Fa attr .
-.Pp
-The spawn-schedparam attribute represents the scheduling parameters to
-be assigned to the new process image in a spawn operation (if
-.Dv POSIX_SPAWN_SETSCHEDULER
-or
-.Dv POSIX_SPAWN_SETSCHEDPARAM
-is set in the spawn-flags attribute).
-The default value of this attribute is unspecified.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getschedparam
-and
-.Fn posix_spawnattr_setschedparam
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_getschedpolicy 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setschedpolicy 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getschedparam
-and
-.Fn posix_spawnattr_setschedparam
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getschedparam
-and
-.Fn posix_spawnattr_setschedparam
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/posix_spawnattr_getschedpolicy.3 b/lib/libc_bsd/gen/posix_spawnattr_getschedpolicy.3
deleted file mode 100644
index f6d66eb..0000000
--- a/lib/libc_bsd/gen/posix_spawnattr_getschedpolicy.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawnattr_getschedpolicy.3 198788 2009-11-02 12:35:38Z brueffer $
-.\"
-.Dd March 24, 2008
-.Dt POSIX_SPAWNATTR_GETSCHEDPOLICY 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getschedpolicy ,
-.Nm posix_spawnattr_setschedpolicy
-.Nd "get and set the spawn-schedpolicy attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getschedpolicy "const posix_spawnattr_t *restrict attr" "int *restrict schedpolicy"
-.Ft int
-.Fn posix_spawnattr_setschedpolicy "posix_spawnattr_t *attr" "int schedpolicy"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getschedpolicy
-function obtains the value of the spawn-schedpolicy attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setschedpolicy
-function sets the spawn-schedpolicy attribute in an initialized attributes
-object referenced by
-.Fa attr .
-.Pp
-The spawn-schedpolicy attribute represents the scheduling policy to
-be assigned to the new process image in a spawn operation (if
-.Dv POSIX_SPAWN_SETSCHEDULER
-is set in the spawn-flags attribute).
-The default value of this attribute is unspecified.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getschedpolicy
-and
-.Fn posix_spawnattr_setschedpolicy
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_getschedparam 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setschedparam 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getschedpolicy
-and
-.Fn posix_spawnattr_setschedpolicy
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getschedpolicy
-and
-.Fn posix_spawnattr_setschedpolicy
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/posix_spawnattr_getsigdefault.3 b/lib/libc_bsd/gen/posix_spawnattr_getsigdefault.3
deleted file mode 100644
index 0231fbd..0000000
--- a/lib/libc_bsd/gen/posix_spawnattr_getsigdefault.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawnattr_getsigdefault.3 198788 2009-11-02 12:35:38Z brueffer $
-.\"
-.Dd March 24, 2008
-.Dt POSIX_SPAWNATTR_GETSIGDEFAULT 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getsigdefault ,
-.Nm posix_spawnattr_setsigdefault
-.Nd "get and set the spawn-sigdefault attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getsigdefault "const posix_spawnattr_t *restrict attr" "sigset_t *restrict sigdefault"
-.Ft int
-.Fn posix_spawnattr_setsigdefault "posix_spawnattr_t *attr" "const sigset_t *restrict sigdefault"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getsigdefault
-function obtains the value of the spawn-sigdefault attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setsigdefault
-function sets the spawn-sigdefault attribute in an initialized attributes
-object referenced by
-.Fa attr .
-.Pp
-The spawn-sigdefault attribute represents the set of signals to be forced to
-default signal handling in the new process image (if
-.Dv POSIX_SPAWN_SETSIGDEF
-is set in the spawn-flags attribute) by a spawn operation.
-The default value of this attribute is an empty signal set.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getsigdefault
-and
-.Fn posix_spawnattr_setsigdefault
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_getsigmask 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setsigmask 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getsigdefault
-and
-.Fn posix_spawnattr_setsigdefault
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getsigdefault
-and
-.Fn posix_spawnattr_setsigdefault
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/posix_spawnattr_getsigmask.3 b/lib/libc_bsd/gen/posix_spawnattr_getsigmask.3
deleted file mode 100644
index 5c00025..0000000
--- a/lib/libc_bsd/gen/posix_spawnattr_getsigmask.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawnattr_getsigmask.3 198788 2009-11-02 12:35:38Z brueffer $
-.\"
-.Dd March 24, 2008
-.Dt POSIX_SPAWNATTR_GETSIGMASK 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_getsigmask ,
-.Nm posix_spawnattr_setsigmask
-.Nd "get and set the spawn-sigmask attribute of a spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_getsigmask "const posix_spawnattr_t *restrict attr" "sigset_t *restrict sigmask"
-.Ft int
-.Fn posix_spawnattr_setsigmask "posix_spawnattr_t *attr" "const sigset_t *restrict sigmask"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_getsigmask
-function obtains the value of the spawn-sigmask attribute from the
-attributes object referenced by
-.Fa attr .
-.Pp
-The
-.Fn posix_spawnattr_setsigmask
-function sets the spawn-sigmask attribute in an initialized attributes
-object referenced by
-.Fa attr .
-.Pp
-The spawn-sigmask attribute represents the signal mask in effect in the
-new process image of a spawn operation (if
-.Dv POSIX_SPAWN_SETSIGMASK
-is set in the spawn-flags attribute).
-The default value of this attribute is unspecified.
-.Sh RETURN VALUES
-The
-.Fn posix_spawnattr_getsigmask
-and
-.Fn posix_spawnattr_setsigmask
-functions return zero.
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnattr_destroy 3 ,
-.Xr posix_spawnattr_getsigmask 3 ,
-.Xr posix_spawnattr_init 3 ,
-.Xr posix_spawnattr_setsigmask 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_getsigmask
-and
-.Fn posix_spawnattr_setsigmask
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_getsigmask
-and
-.Fn posix_spawnattr_setsigmask
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/posix_spawnattr_init.3 b/lib/libc_bsd/gen/posix_spawnattr_init.3
deleted file mode 100644
index a597a74..0000000
--- a/lib/libc_bsd/gen/posix_spawnattr_init.3
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/posix_spawnattr_init.3 198788 2009-11-02 12:35:38Z brueffer $
-.\"
-.Dd March 24, 2008
-.Dt POSIX_SPAWNATTR_INIT 3
-.Os
-.Sh NAME
-.Nm posix_spawnattr_init ,
-.Nm posix_spawnattr_destroy
-.Nd "initialize and destroy spawn attributes object"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In spawn.h
-.Ft int
-.Fn posix_spawnattr_init "posix_spawnattr_t * attr"
-.Ft int
-.Fn posix_spawnattr_destroy "posix_spawnattr_t * attr"
-.Sh DESCRIPTION
-The
-.Fn posix_spawnattr_init
-function initializes a spawn attributes object
-.Fa attr
-with the default value for all of the individual attributes used by the
-implementation.
-Initializing an already initialized spawn attributes object may cause
-memory to be leaked.
-.Pp
-The
-.Fn posix_spawnattr_destroy
-function destroys a spawn attributes object.
-A destroyed
-.Fa attr
-attributes object can be reinitialized using
-.Fn posix_spawnattr_init .
-The object should not be used after it has been destroyed.
-.Pp
-A spawn attributes object is of type
-.Vt posix_spawnattr_t
-(defined in
-.In spawn.h )
-and is used to specify the inheritance of process attributes across a
-spawn operation.
-.Pp
-The resulting spawn attributes object (possibly modified by setting
-individual attribute values), is used to modify the behavior of
-.Fn posix_spawn
-or
-.Fn posix_spawnp .
-After a spawn attributes object has been used to spawn a process by a
-call to a
-.Fn posix_spawn
-or
-.Fn posix_spawnp ,
-any function affecting the attributes object (including destruction)
-will not affect any process that has been spawned in this way.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn posix_spawnattr_init
-and
-.Fn posix_spawnattr_destroy
-return zero;
-otherwise, an error number is returned to indicate the error.
-.Sh ERRORS
-The
-.Fn posix_spawnattr_init
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory exists to initialize the spawn file actions object.
-.El
-.Sh SEE ALSO
-.Xr posix_spawn 3 ,
-.Xr posix_spawnp 3
-.Sh STANDARDS
-The
-.Fn posix_spawnattr_init
-and
-.Fn posix_spawnattr_destroy
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_spawnattr_init
-and
-.Fn posix_spawnattr_destroy
-functions first appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/gen/psignal.3 b/lib/libc_bsd/gen/psignal.3
deleted file mode 100644
index e6599e8..0000000
--- a/lib/libc_bsd/gen/psignal.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)psignal.3	8.2 (Berkeley) 2/27/95
-.\" $FreeBSD: releng/10.2/lib/libc/gen/psignal.3 233510 2012-03-26 15:18:14Z joel $
-.\"
-.Dd February 4, 2011
-.Dt PSIGNAL 3
-.Os
-.Sh NAME
-.Nm psignal ,
-.Nm strsignal ,
-.Nm sys_siglist ,
-.Nm sys_signame
-.Nd system signal messages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft void
-.Fn psignal "unsigned sig" "const char *s"
-.Vt extern const char * const sys_siglist[] ;
-.Vt extern const char * const sys_signame[] ;
-.In string.h
-.Ft "char *"
-.Fn strsignal "int sig"
-.Sh DESCRIPTION
-The
-.Fn psignal
-and
-.Fn strsignal
-functions locate the descriptive message
-string for a signal number.
-.Pp
-The
-.Fn strsignal
-function accepts a signal number argument
-.Fa sig
-and returns a pointer to the corresponding message string.
-.Pp
-The
-.Fn psignal
-function accepts a signal number argument
-.Fa sig
-and writes it to the standard error.
-If the argument
-.Fa s
-is
-.Pf non- Dv NULL
-and does not point to the null character,
-.Fa s
-is written to the standard error file descriptor
-prior to the message string,
-immediately followed by a colon and a space.
-If the signal number is not recognized
-.Pq Xr sigaction 2 ,
-the string
-.Dq "Unknown signal"
-is produced.
-.Pp
-The message strings can be accessed directly
-through the external array
-.Va sys_siglist ,
-indexed by recognized signal numbers.
-The external array
-.Va sys_signame
-is used similarly and
-contains short, upper-case abbreviations for signals
-which are useful for recognizing signal names
-in user input.
-The defined variable
-.Dv NSIG
-contains a count of the strings in
-.Va sys_siglist
-and
-.Va sys_signame .
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr perror 3 ,
-.Xr strerror 3
-.Sh HISTORY
-The
-.Fn psignal
-function appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/gen/psignal.c b/lib/libc_bsd/gen/psignal.c
deleted file mode 100644
index 64d4877..0000000
--- a/lib/libc_bsd/gen/psignal.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)psignal.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/psignal.c 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * Print the name of the signal indicated
- * along with the supplied message.
- */
-#include "namespace.h"
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-void
-psignal(sig, s)
-	unsigned int sig;
-	const char *s;
-{
-	const char *c;
-
-	if (sig < NSIG)
-		c = sys_siglist[sig];
-	else
-		c = "Unknown signal";
-	if (s != NULL && *s != '\0') {
-		(void)_write(STDERR_FILENO, s, strlen(s));
-		(void)_write(STDERR_FILENO, ": ", 2);
-	}
-	(void)_write(STDERR_FILENO, c, strlen(c));
-	(void)_write(STDERR_FILENO, "\n", 1);
-}
diff --git a/lib/libc_bsd/gen/pututxline.c b/lib/libc_bsd/gen/pututxline.c
deleted file mode 100644
index c68390e..0000000
--- a/lib/libc_bsd/gen/pututxline.c
+++ /dev/null
@@ -1,335 +0,0 @@
-/*-
- * Copyright (c) 2010 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/pututxline.c 249593 2013-04-17 21:08:15Z jilles $");
-
-#include "namespace.h"
-#include <sys/endian.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <utmpx.h>
-#include "utxdb.h"
-#include "un-namespace.h"
-
-static FILE *
-futx_open(const char *file)
-{
-	FILE *fp;
-	struct stat sb;
-	int fd;
-
-	fd = _open(file, O_CREAT|O_RDWR|O_EXLOCK|O_CLOEXEC, 0644);
-	if (fd < 0)
-		return (NULL);
-
-	/* Safety check: never use broken files. */
-	if (_fstat(fd, &sb) != -1 && sb.st_size % sizeof(struct futx) != 0) {
-		_close(fd);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	fp = fdopen(fd, "r+");
-	if (fp == NULL) {
-		_close(fd);
-		return (NULL);
-	}
-	return (fp);
-}
-
-static int
-utx_active_add(const struct futx *fu)
-{
-	FILE *fp;
-	struct futx fe;
-	off_t partial;
-	int error, ret;
-
-	partial = -1;
-	ret = 0;
-
-	/*
-	 * Register user login sessions.  Overwrite entries of sessions
-	 * that have already been terminated.
-	 */
-	fp = futx_open(_PATH_UTX_ACTIVE);
-	if (fp == NULL)
-		return (-1);
-	while (fread(&fe, sizeof(fe), 1, fp) == 1) {
-		switch (fe.fu_type) {
-		case BOOT_TIME:
-			/* Leave these intact. */
-			break;
-		case USER_PROCESS:
-		case INIT_PROCESS:
-		case LOGIN_PROCESS:
-		case DEAD_PROCESS:
-			/* Overwrite when ut_id matches. */
-			if (memcmp(fu->fu_id, fe.fu_id, sizeof(fe.fu_id)) ==
-			    0) {
-				ret = fseeko(fp, -(off_t)sizeof(fe), SEEK_CUR);
-				goto exact;
-			}
-			if (fe.fu_type != DEAD_PROCESS)
-				break;
-			/* FALLTHROUGH */
-		default:
-			/* Allow us to overwrite unused records. */
-			if (partial == -1) {
-				partial = ftello(fp);
-				/*
-				 * Distinguish errors from valid values so we
-				 * don't overwrite good data by accident.
-				 */
-				if (partial != -1)
-					partial -= (off_t)sizeof(fe);
-			}
-			break;
-		}
-	}
-
-	/*
-	 * No exact match found.  Use the partial match.  If no partial
-	 * match was found, just append a new record.
-	 */
-	if (partial != -1)
-		ret = fseeko(fp, partial, SEEK_SET);
-exact:
-	if (ret == -1)
-		error = errno;
-	else if (fwrite(fu, sizeof(*fu), 1, fp) < 1)
-		error = errno;
-	else
-		error = 0;
-	fclose(fp);
-	if (error != 0)
-		errno = error;
-	return (error == 0 ? 0 : 1);
-}
-
-static int
-utx_active_remove(struct futx *fu)
-{
-	FILE *fp;
-	struct futx fe;
-	int error, ret;
-
-	/*
-	 * Remove user login sessions, having the same ut_id.
-	 */
-	fp = futx_open(_PATH_UTX_ACTIVE);
-	if (fp == NULL)
-		return (-1);
-	error = ESRCH;
-	ret = -1;
-	while (fread(&fe, sizeof(fe), 1, fp) == 1 && ret != 0)
-		switch (fe.fu_type) {
-		case USER_PROCESS:
-		case INIT_PROCESS:
-		case LOGIN_PROCESS:
-			if (memcmp(fu->fu_id, fe.fu_id, sizeof(fe.fu_id)) != 0)
-				continue;
-
-			/* Terminate session. */
-			if (fseeko(fp, -(off_t)sizeof(fe), SEEK_CUR) == -1)
-				error = errno;
-			else if (fwrite(fu, sizeof(*fu), 1, fp) < 1)
-				error = errno;
-			else
-				ret = 0;
-
-		}
-
-	fclose(fp);
-	if (ret != 0)
-		errno = error;
-	return (ret);
-}
-
-static void
-utx_active_init(const struct futx *fu)
-{
-	int fd;
-
-	/* Initialize utx.active with a single BOOT_TIME record. */
-	fd = _open(_PATH_UTX_ACTIVE, O_CREAT|O_RDWR|O_TRUNC, 0644);
-	if (fd < 0)
-		return;
-	_write(fd, fu, sizeof(*fu));
-	_close(fd);
-}
-
-static void
-utx_active_purge(void)
-{
-
-	truncate(_PATH_UTX_ACTIVE, 0);
-}
-
-static int
-utx_lastlogin_add(const struct futx *fu)
-{
-	struct futx fe;
-	FILE *fp;
-	int error, ret;
-
-	ret = 0;
-
-	/*
-	 * Write an entry to lastlogin.  Overwrite the entry if the
-	 * current user already has an entry.  If not, append a new
-	 * entry.
-	 */
-	fp = futx_open(_PATH_UTX_LASTLOGIN);
-	if (fp == NULL)
-		return (-1);
-	while (fread(&fe, sizeof fe, 1, fp) == 1) {
-		if (strncmp(fu->fu_user, fe.fu_user, sizeof fe.fu_user) != 0)
-			continue;
-
-		/* Found a previous lastlogin entry for this user. */
-		ret = fseeko(fp, -(off_t)sizeof fe, SEEK_CUR);
-		break;
-	}
-	if (ret == -1)
-		error = errno;
-	else if (fwrite(fu, sizeof *fu, 1, fp) < 1) {
-		error = errno;
-		ret = -1;
-	}
-	fclose(fp);
-	if (ret == -1)
-		errno = error;
-	return (ret);
-}
-
-static void
-utx_lastlogin_upgrade(void)
-{
-	struct stat sb;
-	int fd;
-
-	fd = _open(_PATH_UTX_LASTLOGIN, O_RDWR|O_CLOEXEC, 0644);
-	if (fd < 0)
-		return;
-
-	/*
-	 * Truncate broken lastlogin files.  In the future we should
-	 * check for older versions of the file format here and try to
-	 * upgrade it.
-	 */
-	if (_fstat(fd, &sb) != -1 && sb.st_size % sizeof(struct futx) != 0)
-		ftruncate(fd, 0);
-	_close(fd);
-}
-
-static int
-utx_log_add(const struct futx *fu)
-{
-	struct iovec vec[2];
-	int error, fd;
-	uint16_t l;
-
-	/*
-	 * Append an entry to the log file.  We only need to append
-	 * records to this file, so to conserve space, trim any trailing
-	 * zero-bytes.  Prepend a length field, indicating the length of
-	 * the record, excluding the length field itself.
-	 */
-	for (l = sizeof(*fu); l > 0 && ((const char *)fu)[l - 1] == '\0'; l--) ;
-	vec[0].iov_base = &l;
-	vec[0].iov_len = sizeof(l);
-	vec[1].iov_base = __DECONST(void *, fu);
-	vec[1].iov_len = l;
-	l = htobe16(l);
-
-	fd = _open(_PATH_UTX_LOG, O_CREAT|O_WRONLY|O_APPEND|O_CLOEXEC, 0644);
-	if (fd < 0)
-		return (-1);
-	if (_writev(fd, vec, 2) == -1)
-		error = errno;
-	else
-		error = 0;
-	_close(fd);
-	if (error != 0)
-		errno = error;
-	return (error == 0 ? 0 : 1);
-}
-
-struct utmpx *
-pututxline(const struct utmpx *utmpx)
-{
-	struct futx fu;
-	int bad;
-
-	bad = 0;
-
-	utx_to_futx(utmpx, &fu);
-
-	switch (fu.fu_type) {
-	case BOOT_TIME:
-		utx_active_init(&fu);
-		utx_lastlogin_upgrade();
-		break;
-	case SHUTDOWN_TIME:
-		utx_active_purge();
-		break;
-	case OLD_TIME:
-	case NEW_TIME:
-		break;
-	case USER_PROCESS:
-		bad |= utx_active_add(&fu);
-		bad |= utx_lastlogin_add(&fu);
-		break;
-#if 0 /* XXX: Are these records of any use to us? */
-	case INIT_PROCESS:
-	case LOGIN_PROCESS:
-		bad |= utx_active_add(&fu);
-		break;
-#endif
-	case DEAD_PROCESS:
-		/*
-		 * In case writing a logout entry fails, never attempt
-		 * to write it to utx.log.  The logout entry's ut_id
-		 * might be invalid.
-		 */
-		if (utx_active_remove(&fu) != 0)
-			return (NULL);
-		break;
-	default:
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	bad |= utx_log_add(&fu);
-	return (bad ? NULL : futx_to_utx(&fu));
-}
diff --git a/lib/libc_bsd/gen/pw_scan.c b/lib/libc_bsd/gen/pw_scan.c
deleted file mode 100644
index 8c69381..0000000
--- a/lib/libc_bsd/gen/pw_scan.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)pw_scan.c	8.3 (Berkeley) 4/2/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/pw_scan.c 195827 2009-07-22 20:46:17Z kensmith $");
-
-/*
- * This module is used to "verify" password entries by chpass(1) and
- * pwd_mkdb(8).
- */
-
-#include <sys/param.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "pw_scan.h"
-
-/*
- * Some software assumes that IDs are short.  We should emit warnings
- * for id's which cannot be stored in a short, but we are more liberal
- * by default, warning for IDs greater than USHRT_MAX.
- *
- * If pw_big_ids_warning is -1 on entry to pw_scan(), it will be set based
- * on the existence of PW_SCAN_BIG_IDS in the environment.
- *
- * It is believed all baseline system software that can not handle the
- * normal ID sizes is now gone so pw_big_ids_warning is disabled for now.
- * But the code has been left in place in case end-users want to re-enable
- * it and/or for the next time the ID sizes get bigger but pieces of the
- * system lag behind.
- */
-static int	pw_big_ids_warning = 0;
-
-int
-__pw_scan(char *bp, struct passwd *pw, int flags)
-{
-	uid_t id;
-	int root;
-	char *ep, *p, *sh;
-	unsigned long temp;
-
-	if (pw_big_ids_warning == -1)
-		pw_big_ids_warning = getenv("PW_SCAN_BIG_IDS") == NULL ? 1 : 0;
-
-	pw->pw_fields = 0;
-	if (!(pw->pw_name = strsep(&bp, ":")))		/* login */
-		goto fmt;
-	root = !strcmp(pw->pw_name, "root");
-	if (pw->pw_name[0] && (pw->pw_name[0] != '+' || pw->pw_name[1] == '\0'))
-		pw->pw_fields |= _PWF_NAME;
-
-	if (!(pw->pw_passwd = strsep(&bp, ":")))	/* passwd */
-		goto fmt;
-	if (pw->pw_passwd[0])
-		pw->pw_fields |= _PWF_PASSWD;
-
-	if (!(p = strsep(&bp, ":")))			/* uid */
-		goto fmt;
-	if (p[0])
-		pw->pw_fields |= _PWF_UID;
-	else {
-		if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') {
-			if (flags & _PWSCAN_WARN)
-				warnx("no uid for user %s", pw->pw_name);
-			return (0);
-		}
-	}
-	errno = 0;
-	temp = strtoul(p, &ep, 10);
-	if ((temp == ULONG_MAX && errno == ERANGE) || temp > UID_MAX) {
-		if (flags & _PWSCAN_WARN)
-			warnx("%s > max uid value (%u)", p, UID_MAX);
-		return (0);
-	}
-	id = temp;
-	if (*ep != '\0') {
-		if (flags & _PWSCAN_WARN)
-			warnx("%s uid is incorrect", p);
-		return (0);
-	}
-	if (root && id) {
-		if (flags & _PWSCAN_WARN)
-			warnx("root uid should be 0");
-		return (0);
-	}
-	if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) {
-		warnx("%s > recommended max uid value (%u)", p, USHRT_MAX);
-		/*return (0);*/ /* THIS SHOULD NOT BE FATAL! */
-	}
-	pw->pw_uid = id;
-
-	if (!(p = strsep(&bp, ":")))			/* gid */
-		goto fmt;
-	if (p[0])
-		pw->pw_fields |= _PWF_GID;
-	else {
-		if (pw->pw_name[0] != '+' && pw->pw_name[0] != '-') {
-			if (flags & _PWSCAN_WARN)
-				warnx("no gid for user %s", pw->pw_name);
-			return (0);
-		}
-	}
-	errno = 0;
-	temp = strtoul(p, &ep, 10);
-	if ((temp == ULONG_MAX && errno == ERANGE) || temp > GID_MAX) {
-		if (flags & _PWSCAN_WARN)
-			warnx("%s > max gid value (%u)", p, GID_MAX);
-		return (0);
-	}
-	id = temp;
-	if (*ep != '\0') {
-		if (flags & _PWSCAN_WARN)
-			warnx("%s gid is incorrect", p);
-		return (0);
-	}
-	if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) {
-		warnx("%s > recommended max gid value (%u)", p, USHRT_MAX);
-		/* return (0); This should not be fatal! */
-	}
-	pw->pw_gid = id;
-
-	if (flags & _PWSCAN_MASTER ) {
-		if (!(pw->pw_class = strsep(&bp, ":")))	/* class */
-			goto fmt;
-		if (pw->pw_class[0])
-			pw->pw_fields |= _PWF_CLASS;
-		
-		if (!(p = strsep(&bp, ":")))		/* change */
-			goto fmt;
-		if (p[0])
-			pw->pw_fields |= _PWF_CHANGE;
-		pw->pw_change = atol(p);
-		
-		if (!(p = strsep(&bp, ":")))		/* expire */
-			goto fmt;
-		if (p[0])
-			pw->pw_fields |= _PWF_EXPIRE;
-		pw->pw_expire = atol(p);
-	}
-	if (!(pw->pw_gecos = strsep(&bp, ":")))		/* gecos */
-		goto fmt;
-	if (pw->pw_gecos[0])
-		pw->pw_fields |= _PWF_GECOS;
-
-	if (!(pw->pw_dir = strsep(&bp, ":")))		/* directory */
-		goto fmt;
-	if (pw->pw_dir[0])
-		pw->pw_fields |= _PWF_DIR;
-
-	if (!(pw->pw_shell = strsep(&bp, ":")))		/* shell */
-		goto fmt;
-
-	p = pw->pw_shell;
-	if (root && *p) {				/* empty == /bin/sh */
-		for (setusershell();;) {
-			if (!(sh = getusershell())) {
-				if (flags & _PWSCAN_WARN)
-					warnx("warning, unknown root shell");
-				break;
-			}
-			if (!strcmp(p, sh))
-				break;
-		}
-		endusershell();
-	}
-	if (p[0])
-		pw->pw_fields |= _PWF_SHELL;
-
-	if ((p = strsep(&bp, ":"))) {			/* too many */
-fmt:		
-		if (flags & _PWSCAN_WARN)
-			warnx("corrupted entry");
-		return (0);
-	}
-	return (1);
-}
diff --git a/lib/libc_bsd/gen/pw_scan.h b/lib/libc_bsd/gen/pw_scan.h
deleted file mode 100644
index ac02f9e..0000000
--- a/lib/libc_bsd/gen/pw_scan.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	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.
- * 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.
- *
- *	@(#)pw_scan.h	8.1 (Berkeley) 4/1/94
- * $FreeBSD: releng/10.2/lib/libc/gen/pw_scan.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-#define _PWSCAN_MASTER 0x01
-#define _PWSCAN_WARN   0x02
-
-extern int	__pw_scan(char *, struct passwd *, int);
diff --git a/lib/libc_bsd/gen/raise.3 b/lib/libc_bsd/gen/raise.3
deleted file mode 100644
index 57e20ed..0000000
--- a/lib/libc_bsd/gen/raise.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)raise.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/raise.3 207749 2010-05-07 17:20:15Z jilles $
-.\"
-.Dd May 7, 2010
-.Dt RAISE 3
-.Os
-.Sh NAME
-.Nm raise
-.Nd send a signal to the current thread
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn raise "int sig"
-.Sh DESCRIPTION
-The
-.Fn raise
-function sends the signal
-.Fa sig
-to the current thread.
-.Sh RETURN VALUES
-.Rv -std raise
-.Sh ERRORS
-The
-.Fn raise
-function
-may fail and set
-.Va errno
-for any of the errors specified for the
-library functions
-.Xr getpid 2
-and
-.Xr kill 2 .
-.Sh SEE ALSO
-.Xr kill 2
-.Sh STANDARDS
-The
-.Fn raise
-function
-conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/gen/raise.c b/lib/libc_bsd/gen/raise.c
deleted file mode 100644
index 78f23f4..0000000
--- a/lib/libc_bsd/gen/raise.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)raise.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/raise.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <signal.h>
-#include <unistd.h>
-
-#include "libc_private.h"
-
-__weak_reference(__raise, raise);
-__weak_reference(__raise, _raise);
-
-int
-__raise(int s)
-{
-	long id;
-
-	if (__sys_thr_self(&id) == -1)
-		return (-1);
-	return (__sys_thr_kill(id, s));
-}
diff --git a/lib/libc_bsd/gen/rand48.3 b/lib/libc_bsd/gen/rand48.3
deleted file mode 100644
index dd42adf..0000000
--- a/lib/libc_bsd/gen/rand48.3
+++ /dev/null
@@ -1,190 +0,0 @@
-.\" Copyright (c) 1993 Martin Birgmeier
-.\" All rights reserved.
-.\"
-.\" You may redistribute unmodified or modified versions of this source
-.\" code provided that the above copyright notice and this and the
-.\" following conditions are retained.
-.\"
-.\" This software is provided ``as is'', and comes with no warranties
-.\" of any kind. I shall in no event be liable for anything that happens
-.\" to anyone/anything when using this software.
-.\"
-.\"     @(#)rand48.3 V1.0 MB 8 Oct 1993
-.\" $FreeBSD: releng/10.2/lib/libc/gen/rand48.3 240361 2012-09-11 12:55:15Z des $
-.\"
-.Dd September 4, 2012
-.Dt RAND48 3
-.Os
-.Sh NAME
-.Nm drand48 ,
-.Nm erand48 ,
-.Nm lrand48 ,
-.Nm nrand48 ,
-.Nm mrand48 ,
-.Nm jrand48 ,
-.Nm srand48 ,
-.Nm seed48 ,
-.Nm lcong48
-.Nd pseudo random number generators and initialization routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft double
-.Fn drand48 void
-.Ft double
-.Fn erand48 "unsigned short xseed[3]"
-.Ft long
-.Fn lrand48 void
-.Ft long
-.Fn nrand48 "unsigned short xseed[3]"
-.Ft long
-.Fn mrand48 void
-.Ft long
-.Fn jrand48 "unsigned short xseed[3]"
-.Ft void
-.Fn srand48 "long seed"
-.Ft "unsigned short *"
-.Fn seed48 "unsigned short xseed[3]"
-.Ft void
-.Fn lcong48 "unsigned short p[7]"
-.Sh DESCRIPTION
-.Bf -symbolic
-The functions described in this manual page are not cryptographically
-secure.
-Cryptographic applications should use
-.Xr arc4random 3
-instead.
-.Ef
-.Pp
-The
-.Fn rand48
-family of functions generates pseudo-random numbers using a linear
-congruential algorithm working on integers 48 bits in size.
-The
-particular formula employed is
-r(n+1) = (a * r(n) + c) mod m
-where the default values are
-for the multiplicand a = 0x5deece66d = 25214903917 and
-the addend c = 0xb = 11.
-The modulo is always fixed at m = 2 ** 48.
-r(n) is called the seed of the random number generator.
-.Pp
-For all the six generator routines described next, the first
-computational step is to perform a single iteration of the algorithm.
-.Pp
-The
-.Fn drand48
-and
-.Fn erand48
-functions
-return values of type double.
-The full 48 bits of r(n+1) are
-loaded into the mantissa of the returned value, with the exponent set
-such that the values produced lie in the interval [0.0, 1.0).
-.Pp
-The
-.Fn lrand48
-and
-.Fn nrand48
-functions
-return values of type long in the range
-[0, 2**31-1].
-The high-order (31) bits of
-r(n+1) are loaded into the lower bits of the returned value, with
-the topmost (sign) bit set to zero.
-.Pp
-The
-.Fn mrand48
-and
-.Fn jrand48
-functions
-return values of type long in the range
-[-2**31, 2**31-1].
-The high-order (32) bits of
-r(n+1) are loaded into the returned value.
-.Pp
-The
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48
-functions
-use an internal buffer to store r(n).
-For these functions
-the initial value of r(0) = 0x1234abcd330e = 20017429951246.
-.Pp
-On the other hand,
-.Fn erand48 ,
-.Fn nrand48 ,
-and
-.Fn jrand48
-use a user-supplied buffer to store the seed r(n),
-which consists of an array of 3 shorts, where the zeroth member
-holds the least significant bits.
-.Pp
-All functions share the same multiplicand and addend.
-.Pp
-The
-.Fn srand48
-function
-is used to initialize the internal buffer r(n) of
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48
-such that the 32 bits of the seed value are copied into the upper 32 bits
-of r(n), with the lower 16 bits of r(n) arbitrarily being set to 0x330e.
-Additionally, the constant multiplicand and addend of the algorithm are
-reset to the default values given above.
-.Pp
-The
-.Fn seed48
-function
-also initializes the internal buffer r(n) of
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48 ,
-but here all 48 bits of the seed can be specified in an array of 3 shorts,
-where the zeroth member specifies the lowest bits.
-Again,
-the constant multiplicand and addend of the algorithm are
-reset to the default values given above.
-The
-.Fn seed48
-function
-returns a pointer to an array of 3 shorts which contains the old seed.
-This array is statically allocated, thus its contents are lost after
-each new call to
-.Fn seed48 .
-.Pp
-Finally,
-.Fn lcong48
-allows full control over the multiplicand and addend used in
-.Fn drand48 ,
-.Fn erand48 ,
-.Fn lrand48 ,
-.Fn nrand48 ,
-.Fn mrand48 ,
-and
-.Fn jrand48 ,
-and the seed used in
-.Fn drand48 ,
-.Fn lrand48 ,
-and
-.Fn mrand48 .
-An array of 7 shorts is passed as argument; the first three shorts are
-used to initialize the seed; the second three are used to initialize the
-multiplicand; and the last short is used to initialize the addend.
-It is thus not possible to use values greater than 0xffff as the addend.
-.Pp
-Note that all three methods of seeding the random number generator
-always also set the multiplicand and addend for any of the six
-generator calls.
-.Sh SEE ALSO
-.Xr arc4random 3 ,
-.Xr rand 3 ,
-.Xr random 3
-.Sh AUTHORS
-.An Martin Birgmeier
diff --git a/lib/libc_bsd/gen/rand48.h b/lib/libc_bsd/gen/rand48.h
deleted file mode 100644
index 98693ae..0000000
--- a/lib/libc_bsd/gen/rand48.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- *
- * $FreeBSD: releng/10.2/lib/libc/gen/rand48.h 90045 2002-02-01 01:32:19Z obrien $
- */
-
-#ifndef _RAND48_H_
-#define _RAND48_H_
-
-#include <math.h>
-#include <stdlib.h>
-
-void		_dorand48(unsigned short[3]);
-
-#define	RAND48_SEED_0	(0x330e)
-#define	RAND48_SEED_1	(0xabcd)
-#define	RAND48_SEED_2	(0x1234)
-#define	RAND48_MULT_0	(0xe66d)
-#define	RAND48_MULT_1	(0xdeec)
-#define	RAND48_MULT_2	(0x0005)
-#define	RAND48_ADD	(0x000b)
-
-#endif /* _RAND48_H_ */
diff --git a/lib/libc_bsd/gen/readdir.c b/lib/libc_bsd/gen/readdir.c
deleted file mode 100644
index 25d270c..0000000
--- a/lib/libc_bsd/gen/readdir.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/readdir.c 282979 2015-05-15 15:49:24Z julian $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <dirent.h>
-#include <errno.h>
-#include <string.h>
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "gen-private.h"
-#include "telldir.h"
-
-/*
- * get next entry in a directory.
- */
-struct dirent *
-_readdir_unlocked(dirp, skip)
-	DIR *dirp;
-	int skip;
-{
-	struct dirent *dp;
-	long initial_seek;
-	long initial_loc = 0;
-
-	for (;;) {
-		if (dirp->dd_loc >= dirp->dd_size) {
-			if (dirp->dd_flags & __DTF_READALL)
-				return (NULL);
-			initial_loc = dirp->dd_loc;
-			dirp->dd_flags &= ~__DTF_SKIPREAD;
-			dirp->dd_loc = 0;
-		}
-		if (dirp->dd_loc == 0 &&
-		    !(dirp->dd_flags & (__DTF_READALL | __DTF_SKIPREAD))) {
-			initial_seek = dirp->dd_seek;
-			dirp->dd_size = _getdirentries(dirp->dd_fd,
-			    dirp->dd_buf, dirp->dd_len, &dirp->dd_seek);
-			if (dirp->dd_size <= 0)
-				return (NULL);
-			_fixtelldir(dirp, initial_seek, initial_loc);
-		}
-		dirp->dd_flags &= ~__DTF_SKIPREAD;
-		dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
-		if ((long)dp & 03L)	/* bogus pointer check */
-			return (NULL);
-		if (dp->d_reclen <= 0 ||
-		    dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
-			return (NULL);
-		dirp->dd_loc += dp->d_reclen;
-		if (dp->d_ino == 0 && skip)
-			continue;
-		if (dp->d_type == DT_WHT && (dirp->dd_flags & DTF_HIDEW))
-			continue;
-		return (dp);
-	}
-}
-
-struct dirent *
-readdir(dirp)
-	DIR *dirp;
-{
-	struct dirent	*dp;
-
-	if (__isthreaded) {
-		_pthread_mutex_lock(&dirp->dd_lock);
-		dp = _readdir_unlocked(dirp, 1);
-		_pthread_mutex_unlock(&dirp->dd_lock);
-	}
-	else
-		dp = _readdir_unlocked(dirp, 1);
-	return (dp);
-}
-
-int
-readdir_r(dirp, entry, result)
-	DIR *dirp;
-	struct dirent *entry;
-	struct dirent **result;
-{
-	struct dirent *dp;
-	int saved_errno;
-
-	saved_errno = errno;
-	errno = 0;
-	if (__isthreaded) {
-		_pthread_mutex_lock(&dirp->dd_lock);
-		if ((dp = _readdir_unlocked(dirp, 1)) != NULL)
-			memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
-		_pthread_mutex_unlock(&dirp->dd_lock);
-	}
-	else if ((dp = _readdir_unlocked(dirp, 1)) != NULL)
-		memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
-
-	if (errno != 0) {
-		if (dp == NULL)
-			return (errno);
-	} else
-		errno = saved_errno;
-
-	if (dp != NULL)
-		*result = entry;
-	else
-		*result = NULL;
-
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/readpassphrase.3 b/lib/libc_bsd/gen/readpassphrase.3
deleted file mode 100644
index 7f5e99f..0000000
--- a/lib/libc_bsd/gen/readpassphrase.3
+++ /dev/null
@@ -1,181 +0,0 @@
-.\"	$OpenBSD: readpassphrase.3,v 1.17 2007/05/31 19:19:28 jmc Exp $
-.\"
-.\" Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" Sponsored in part by the Defense Advanced Research Projects
-.\" Agency (DARPA) and Air Force Research Laboratory, Air Force
-.\" Materiel Command, USAF, under agreement number F39502-99-1-0512.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/readpassphrase.3 215236 2010-11-13 10:38:06Z delphij $
-.\"
-.Dd May 31, 2007
-.Dt READPASSPHRASE 3
-.Os
-.Sh NAME
-.Nm readpassphrase
-.Nd get a passphrase from the user
-.Sh SYNOPSIS
-.In readpassphrase.h
-.Ft "char *"
-.Fn readpassphrase "const char *prompt" "char *buf" "size_t bufsiz" "int flags"
-.Sh DESCRIPTION
-The
-.Fn readpassphrase
-function displays a prompt to, and reads in a passphrase from,
-.Pa /dev/tty .
-If this file is inaccessible
-and the
-.Dv RPP_REQUIRE_TTY
-flag is not set,
-.Fn readpassphrase
-displays the prompt on the standard error output and reads from the standard
-input.
-In this case it is generally not possible to turn off echo.
-.Pp
-Up to
-.Fa bufsiz
-\- 1 characters (one is for the
-.Dv NUL )
-are read into the provided buffer
-.Fa buf .
-Any additional
-characters and the terminating newline (or return) character are discarded.
-.Pp
-The
-.Fn readpassphrase
-function
-takes the following optional
-.Fa flags :
-.Pp
-.Bl -tag -width ".Dv RPP_REQUIRE_TTY" -compact
-.It Dv RPP_ECHO_OFF
-turn off echo (default behavior)
-.It Dv RPP_ECHO_ON
-leave echo on
-.It Dv RPP_REQUIRE_TTY
-fail if there is no tty
-.It Dv RPP_FORCELOWER
-force input to lower case
-.It Dv RPP_FORCEUPPER
-force input to upper case
-.It Dv RPP_SEVENBIT
-strip the high bit from input
-.It Dv RPP_STDIN
-force read of passphrase from stdin
-.El
-.Pp
-The calling process should zero the passphrase as soon as possible to
-avoid leaving the cleartext passphrase visible in the process's address
-space.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn readpassphrase
-returns a pointer to the NUL-terminated passphrase.
-If an error is encountered, the terminal state is restored and
-a
-.Dv NULL
-pointer is returned.
-.Sh FILES
-.Bl -tag -width ".Pa /dev/tty" -compact
-.It Pa /dev/tty
-.El
-.Sh EXAMPLES
-The following code fragment will read a passphrase from
-.Pa /dev/tty
-into the buffer
-.Fa passbuf .
-.Bd -literal -offset indent
-char passbuf[1024];
-
-\&...
-
-if (readpassphrase("Response: ", passbuf, sizeof(passbuf),
-    RPP_REQUIRE_TTY) == NULL)
-	errx(1, "unable to read passphrase");
-
-if (compare(transform(passbuf), epass) != 0)
-	errx(1, "bad passphrase");
-
-\&...
-
-memset(passbuf, 0, sizeof(passbuf));
-.Ed
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINTR
-The
-.Fn readpassphrase
-function was interrupted by a signal.
-.It Bq Er EINVAL
-The
-.Ar bufsiz
-argument was zero.
-.It Bq Er EIO
-The process is a member of a background process attempting to read
-from its controlling terminal, the process is ignoring or blocking
-the
-.Dv SIGTTIN
-signal, or the process group is orphaned.
-.It Bq Er EMFILE
-The process has already reached its limit for open file descriptors.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er ENOTTY
-There is no controlling terminal and the
-.Dv RPP_REQUIRE_TTY
-flag was specified.
-.El
-.Sh SIGNALS
-The
-.Fn readpassphrase
-function
-will catch the following signals:
-.Bd -literal -offset indent
-SIGALRM		SIGHUP		SIGINT
-SIGPIPE		SIGQUIT		SIGTERM
-SIGTSTP		SIGTTIN		SIGTTOU
-.Ed
-.Pp
-When one of the above signals is intercepted, terminal echo will
-be restored if it had previously been turned off.
-If a signal handler was installed for the signal when
-.Fn readpassphrase
-was called, that handler is then executed.
-If no handler was previously installed for the signal then the
-default action is taken as per
-.Xr sigaction 2 .
-.Pp
-The
-.Dv SIGTSTP , SIGTTIN
-and
-.Dv SIGTTOU
-signals (stop signals generated from keyboard or due to terminal I/O
-from a background process) are treated specially.
-When the process is resumed after it has been stopped,
-.Fn readpassphrase
-will reprint the prompt and the user may then enter a passphrase.
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr getpass 3
-.Sh STANDARDS
-The
-.Fn readpassphrase
-function is an
-extension and should not be used if portability is desired.
-.Sh HISTORY
-The
-.Fn readpassphrase
-function first appeared in
-.Ox 2.9 .
diff --git a/lib/libc_bsd/gen/readpassphrase.c b/lib/libc_bsd/gen/readpassphrase.c
deleted file mode 100644
index 04fe858..0000000
--- a/lib/libc_bsd/gen/readpassphrase.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*	$OpenBSD: readpassphrase.c,v 1.24 2013/11/24 23:51:29 deraadt Exp $	*/
-
-/*
- * Copyright (c) 2000-2002, 2007, 2010
- *	Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/readpassphrase.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <pwd.h>
-#include <signal.h>
-#include <string.h>
-#include <termios.h>
-#include <unistd.h>
-#include <readpassphrase.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-static volatile sig_atomic_t signo[NSIG];
-
-static void handler(int);
-
-char *
-readpassphrase(const char *prompt, char *buf, size_t bufsiz, int flags)
-{
-	ssize_t nr;
-	int input, output, save_errno, i, need_restart;
-	char ch, *p, *end;
-	struct termios term, oterm;
-	struct sigaction sa, savealrm, saveint, savehup, savequit, saveterm;
-	struct sigaction savetstp, savettin, savettou, savepipe;
-
-	/* I suppose we could alloc on demand in this case (XXX). */
-	if (bufsiz == 0) {
-		errno = EINVAL;
-		return(NULL);
-	}
-
-restart:
-	for (i = 0; i < NSIG; i++)
-		signo[i] = 0;
-	nr = -1;
-	save_errno = 0;
-	need_restart = 0;
-	/*
-	 * Read and write to /dev/tty if available.  If not, read from
-	 * stdin and write to stderr unless a tty is required.
-	 */
-	if ((flags & RPP_STDIN) ||
-	    (input = output = _open(_PATH_TTY, O_RDWR | O_CLOEXEC)) == -1) {
-		if (flags & RPP_REQUIRE_TTY) {
-			errno = ENOTTY;
-			return(NULL);
-		}
-		input = STDIN_FILENO;
-		output = STDERR_FILENO;
-	}
-
-	/*
-	 * Turn off echo if possible.
-	 * If we are using a tty but are not the foreground pgrp this will
-	 * generate SIGTTOU, so do it *before* installing the signal handlers.
-	 */
-	if (input != STDIN_FILENO && tcgetattr(input, &oterm) == 0) {
-		memcpy(&term, &oterm, sizeof(term));
-		if (!(flags & RPP_ECHO_ON))
-			term.c_lflag &= ~(ECHO | ECHONL);
-		if (term.c_cc[VSTATUS] != _POSIX_VDISABLE)
-			term.c_cc[VSTATUS] = _POSIX_VDISABLE;
-		(void)tcsetattr(input, TCSAFLUSH|TCSASOFT, &term);
-	} else {
-		memset(&term, 0, sizeof(term));
-		term.c_lflag |= ECHO;
-		memset(&oterm, 0, sizeof(oterm));
-		oterm.c_lflag |= ECHO;
-	}
-
-	/*
-	 * Catch signals that would otherwise cause the user to end
-	 * up with echo turned off in the shell.  Don't worry about
-	 * things like SIGXCPU and SIGVTALRM for now.
-	 */
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;		/* don't restart system calls */
-	sa.sa_handler = handler;
-	(void)__libc_sigaction(SIGALRM, &sa, &savealrm);
-	(void)__libc_sigaction(SIGHUP, &sa, &savehup);
-	(void)__libc_sigaction(SIGINT, &sa, &saveint);
-	(void)__libc_sigaction(SIGPIPE, &sa, &savepipe);
-	(void)__libc_sigaction(SIGQUIT, &sa, &savequit);
-	(void)__libc_sigaction(SIGTERM, &sa, &saveterm);
-	(void)__libc_sigaction(SIGTSTP, &sa, &savetstp);
-	(void)__libc_sigaction(SIGTTIN, &sa, &savettin);
-	(void)__libc_sigaction(SIGTTOU, &sa, &savettou);
-
-	if (!(flags & RPP_STDIN))
-		(void)_write(output, prompt, strlen(prompt));
-	end = buf + bufsiz - 1;
-	p = buf;
-	while ((nr = _read(input, &ch, 1)) == 1 && ch != '\n' && ch != '\r') {
-		if (p < end) {
-			if ((flags & RPP_SEVENBIT))
-				ch &= 0x7f;
-			if (isalpha((unsigned char)ch)) {
-				if ((flags & RPP_FORCELOWER))
-					ch = (char)tolower((unsigned char)ch);
-				if ((flags & RPP_FORCEUPPER))
-					ch = (char)toupper((unsigned char)ch);
-			}
-			*p++ = ch;
-		}
-	}
-	*p = '\0';
-	save_errno = errno;
-	if (!(term.c_lflag & ECHO))
-		(void)_write(output, "\n", 1);
-
-	/* Restore old terminal settings and signals. */
-	if (memcmp(&term, &oterm, sizeof(term)) != 0) {
-		while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 &&
-		    errno == EINTR && !signo[SIGTTOU])
-			continue;
-	}
-	(void)__libc_sigaction(SIGALRM, &savealrm, NULL);
-	(void)__libc_sigaction(SIGHUP, &savehup, NULL);
-	(void)__libc_sigaction(SIGINT, &saveint, NULL);
-	(void)__libc_sigaction(SIGQUIT, &savequit, NULL);
-	(void)__libc_sigaction(SIGPIPE, &savepipe, NULL);
-	(void)__libc_sigaction(SIGTERM, &saveterm, NULL);
-	(void)__libc_sigaction(SIGTSTP, &savetstp, NULL);
-	(void)__libc_sigaction(SIGTTIN, &savettin, NULL);
-	(void)__libc_sigaction(SIGTTOU, &savettou, NULL);
-	if (input != STDIN_FILENO)
-		(void)_close(input);
-
-	/*
-	 * If we were interrupted by a signal, resend it to ourselves
-	 * now that we have restored the signal handlers.
-	 */
-	for (i = 0; i < NSIG; i++) {
-		if (signo[i]) {
-			kill(getpid(), i);
-			switch (i) {
-			case SIGTSTP:
-			case SIGTTIN:
-			case SIGTTOU:
-				need_restart = 1;
-			}
-		}
-	}
-	if (need_restart)
-		goto restart;
-
-	if (save_errno)
-		errno = save_errno;
-	return(nr == -1 ? NULL : buf);
-}
-
-char *
-getpass(const char *prompt)
-{
-	static char buf[_PASSWORD_LEN + 1];
-
-	if (readpassphrase(prompt, buf, sizeof(buf), RPP_ECHO_OFF) == NULL)
-		buf[0] = '\0';
-	return(buf);
-}
-
-static void handler(int s)
-{
-
-	signo[s] = 1;
-}
diff --git a/lib/libc_bsd/gen/rewinddir.c b/lib/libc_bsd/gen/rewinddir.c
deleted file mode 100644
index cffb4b5..0000000
--- a/lib/libc_bsd/gen/rewinddir.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rewinddir.c	8.1 (Berkeley) 6/8/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/rewinddir.c 282979 2015-05-15 15:49:24Z julian $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <dirent.h>
-#include <pthread.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "gen-private.h"
-#include "telldir.h"
-
-void
-rewinddir(dirp)
-	DIR *dirp;
-{
-
-	if (__isthreaded)
-		_pthread_mutex_lock(&dirp->dd_lock);
-	dirp->dd_flags &= ~__DTF_SKIPREAD; /* current contents are invalid */
-	if (dirp->dd_flags & __DTF_READALL)
-		_filldir(dirp, false);
-	else {
-		(void) lseek(dirp->dd_fd, 0, SEEK_SET);
-		dirp->dd_seek = 0;
-	}
-	dirp->dd_loc = 0;
-	_reclaim_telldir(dirp);
-	if (__isthreaded)
-		_pthread_mutex_unlock(&dirp->dd_lock);
-}
diff --git a/lib/libc_bsd/gen/rfork_thread.3 b/lib/libc_bsd/gen/rfork_thread.3
deleted file mode 100644
index 775d1c9..0000000
--- a/lib/libc_bsd/gen/rfork_thread.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\"
-.\" Copyright (c) 2000 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/rfork_thread.3 218385 2011-02-06 23:26:14Z jilles $
-.\"
-.Dd February 6, 2011
-.Dt RFORK_THREAD 3
-.Os
-.Sh NAME
-.Nm rfork_thread
-.Nd create a rfork-based process thread
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn rfork_thread "int flags" "void *stack" "int (*func)(void *arg)" "void *arg"
-.Sh DESCRIPTION
-.Bf -symbolic
-The
-.Fn rfork_thread
-function has been deprecated in favor of
-.Xr pthread_create 3 .
-.Ef
-.Pp
-The
-.Fn rfork_thread
-function
-is a helper function for
-.Xr rfork 2 .
-It arranges for a new process to be created and the child process will
-call the specified function with the specified argument, while running on
-the supplied stack.
-.Pp
-Using this function should avoid the need to implement complex stack
-swap code.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn rfork_thread
-returns the process ID of the child process to the parent process.
-Otherwise, a value of -1 is returned
-to the parent process, no child process is created, and the global
-variable
-.Va errno
-is set to indicate the error.
-.Pp
-The child process context is not aware of a return from the
-.Fn rfork_thread
-function as it begins executing directly with the supplied function.
-.Sh ERRORS
-See
-.Xr rfork 2
-for error return codes.
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr intro 2 ,
-.Xr minherit 2 ,
-.Xr rfork 2 ,
-.Xr vfork 2 ,
-.Xr pthread_create 3
-.Sh HISTORY
-The
-.Fn rfork_thread
-function first appeared in
-.Fx 4.3 .
diff --git a/lib/libc_bsd/gen/scandir.3 b/lib/libc_bsd/gen/scandir.3
deleted file mode 100644
index 827bd15..0000000
--- a/lib/libc_bsd/gen/scandir.3
+++ /dev/null
@@ -1,106 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)scandir.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/scandir.3 208734 2010-06-02 10:20:38Z uqs $
-.\"
-.Dd January 3, 2010
-.Dt SCANDIR 3
-.Os
-.Sh NAME
-.Nm scandir ,
-.Nm alphasort
-.Nd scan a directory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In dirent.h
-.Ft int
-.Fn scandir "const char *dirname" "struct dirent ***namelist" "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" "int \*(lp*compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp"
-.Ft int
-.Fn alphasort "const struct dirent **d1" "const struct dirent **d2"
-.Sh DESCRIPTION
-The
-.Fn scandir
-function
-reads the directory
-.Fa dirname
-and builds an array of pointers to directory
-entries using
-.Xr malloc 3 .
-It returns the number of entries in the array.
-A pointer to the array of directory entries is stored in the location
-referenced by
-.Fa namelist .
-.Pp
-The
-.Fa select
-argument is a pointer to a user supplied subroutine which is called by
-.Fn scandir
-to select which entries are to be included in the array.
-The select routine is passed a
-pointer to a directory entry and should return a non-zero
-value if the directory entry is to be included in the array.
-If
-.Fa select
-is null, then all the directory entries will be included.
-.Pp
-The
-.Fa compar
-argument is a pointer to a user supplied subroutine which is passed to
-.Xr qsort 3
-to sort the completed array.
-If this pointer is null, the array is not sorted.
-.Pp
-The
-.Fn alphasort
-function
-is a routine which can be used for the
-.Fa compar
-argument to sort the array alphabetically using
-.Xr strcoll 3 .
-.Pp
-The memory allocated for the array can be deallocated with
-.Xr free 3 ,
-by freeing each pointer in the array and then the array itself.
-.Sh DIAGNOSTICS
-Returns \-1 if the directory cannot be opened for reading or if
-.Xr malloc 3
-cannot allocate enough memory to hold all the data structures.
-.Sh SEE ALSO
-.Xr directory 3 ,
-.Xr malloc 3 ,
-.Xr qsort 3 ,
-.Xr dir 5 ,
-.Xr strcoll 3
-.Sh HISTORY
-The
-.Fn scandir
-and
-.Fn alphasort
-functions appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/gen/scandir.c b/lib/libc_bsd/gen/scandir.c
deleted file mode 100644
index 0364a89..0000000
--- a/lib/libc_bsd/gen/scandir.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)scandir.c	8.3 (Berkeley) 1/2/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/scandir.c 202693 2010-01-20 11:59:46Z ache $");
-
-/*
- * Scan the directory dirname calling select to make a list of selected
- * directory entries then sort using qsort and compare routine dcomp.
- * Returns the number of entries and a pointer to a list of pointers to
- * struct dirent (through namelist). Returns -1 if there were any errors.
- */
-
-#include "namespace.h"
-#include <dirent.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-static int alphasort_thunk(void *thunk, const void *p1, const void *p2);
-
-/*
- * The DIRSIZ macro is the minimum record length which will hold the directory
- * entry.  This requires the amount of space in struct dirent without the
- * d_name field, plus enough space for the name and a terminating nul byte
- * (dp->d_namlen + 1), rounded up to a 4 byte boundary.
- */
-#undef DIRSIZ
-#define DIRSIZ(dp)							\
-	((sizeof(struct dirent) - sizeof(dp)->d_name) +			\
-	    (((dp)->d_namlen + 1 + 3) &~ 3))
-
-int
-scandir(const char *dirname, struct dirent ***namelist,
-    int (*select)(const struct dirent *), int (*dcomp)(const struct dirent **,
-	const struct dirent **))
-{
-	struct dirent *d, *p, **names = NULL;
-	size_t nitems = 0;
-	long arraysz;
-	DIR *dirp;
-
-	if ((dirp = opendir(dirname)) == NULL)
-		return(-1);
-
-	arraysz = 32;	/* initial estimate of the array size */
-	names = (struct dirent **)malloc(arraysz * sizeof(struct dirent *));
-	if (names == NULL)
-		goto fail;
-
-	while ((d = readdir(dirp)) != NULL) {
-		if (select != NULL && !(*select)(d))
-			continue;	/* just selected names */
-		/*
-		 * Make a minimum size copy of the data
-		 */
-		p = (struct dirent *)malloc(DIRSIZ(d));
-		if (p == NULL)
-			goto fail;
-		p->d_fileno = d->d_fileno;
-		p->d_type = d->d_type;
-		p->d_reclen = d->d_reclen;
-		p->d_namlen = d->d_namlen;
-		bcopy(d->d_name, p->d_name, p->d_namlen + 1);
-		/*
-		 * Check to make sure the array has space left and
-		 * realloc the maximum size.
-		 */
-		if (nitems >= arraysz) {
-			struct dirent **names2;
-
-			names2 = (struct dirent **)realloc((char *)names,
-				(arraysz * 2) * sizeof(struct dirent *));
-			if (names2 == NULL) {
-				free(p);
-				goto fail;
-			}
-			names = names2;
-			arraysz *= 2;
-		}
-		names[nitems++] = p;
-	}
-	closedir(dirp);
-	if (nitems && dcomp != NULL)
-		qsort_r(names, nitems, sizeof(struct dirent *),
-		    &dcomp, alphasort_thunk);
-	*namelist = names;
-	return (nitems);
-
-fail:
-	while (nitems > 0)
-		free(names[--nitems]);
-	free(names);
-	closedir(dirp);
-	return (-1);
-}
-
-/*
- * Alphabetic order comparison routine for those who want it.
- * POSIX 2008 requires that alphasort() uses strcoll().
- */
-int
-alphasort(const struct dirent **d1, const struct dirent **d2)
-{
-
-	return (strcoll((*d1)->d_name, (*d2)->d_name));
-}
-
-static int
-alphasort_thunk(void *thunk, const void *p1, const void *p2)
-{
-	int (*dc)(const struct dirent **, const struct dirent **);
-
-	dc = *(int (**)(const struct dirent **, const struct dirent **))thunk;
-	return (dc((const struct dirent **)p1, (const struct dirent **)p2));
-}
diff --git a/lib/libc_bsd/gen/seed48.c b/lib/libc_bsd/gen/seed48.c
deleted file mode 100644
index f153b5f..0000000
--- a/lib/libc_bsd/gen/seed48.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/seed48.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-extern unsigned short _rand48_mult[3];
-extern unsigned short _rand48_add;
-
-unsigned short *
-seed48(unsigned short xseed[3])
-{
-	static unsigned short sseed[3];
-
-	sseed[0] = _rand48_seed[0];
-	sseed[1] = _rand48_seed[1];
-	sseed[2] = _rand48_seed[2];
-	_rand48_seed[0] = xseed[0];
-	_rand48_seed[1] = xseed[1];
-	_rand48_seed[2] = xseed[2];
-	_rand48_mult[0] = RAND48_MULT_0;
-	_rand48_mult[1] = RAND48_MULT_1;
-	_rand48_mult[2] = RAND48_MULT_2;
-	_rand48_add = RAND48_ADD;
-	return sseed;
-}
diff --git a/lib/libc_bsd/gen/seekdir.c b/lib/libc_bsd/gen/seekdir.c
deleted file mode 100644
index 2f3486c..0000000
--- a/lib/libc_bsd/gen/seekdir.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)seekdir.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/seekdir.c 235647 2012-05-19 12:44:27Z gleb $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <dirent.h>
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "gen-private.h"
-#include "telldir.h"
-
-/*
- * Seek to an entry in a directory.
- * _seekdir is in telldir.c so that it can share opaque data structures.
- */
-void
-seekdir(dirp, loc)
-	DIR *dirp;
-	long loc;
-{
-	if (__isthreaded)
-		_pthread_mutex_lock(&dirp->dd_lock);
-	_seekdir(dirp, loc);
-	if (__isthreaded)
-		_pthread_mutex_unlock(&dirp->dd_lock);
-}
diff --git a/lib/libc_bsd/gen/sem.c b/lib/libc_bsd/gen/sem.c
deleted file mode 100644
index bf2472a..0000000
--- a/lib/libc_bsd/gen/sem.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * Copyright (C) 2010 David Xu <davidxu@freebsd.org>.
- * Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/gen/sem.c 232144 2012-02-25 02:12:17Z davidxu $
- */
-
-/*
- * Some notes about this implementation.
- *
- * This is mostly a simple implementation of POSIX semaphores that
- * does not need threading.  Any semaphore created is a kernel-based
- * semaphore regardless of the pshared attribute.  This is necessary
- * because libc's stub for pthread_cond_wait() doesn't really wait,
- * and it is not worth the effort impose this behavior on libc.
- *
- * All functions here are designed to be thread-safe so that a
- * threads library need not provide wrappers except to make
- * sem_wait() and sem_timedwait() cancellation points or to
- * provide a faster userland implementation for non-pshared
- * semaphores.
- *
- * Also, this implementation of semaphores cannot really support
- * real pshared semaphores.  The sem_t is an allocated object
- * and can't be seen by other processes when placed in shared
- * memory.  It should work across forks as long as the semaphore
- * is created before any forks.
- *
- * The function sem_init() should be overridden by a threads
- * library if it wants to provide a different userland version
- * of semaphores.  The functions sem_wait() and sem_timedwait()
- * need to be wrapped to provide cancellation points.  The function
- * sem_post() may need to be wrapped to be signal-safe.
- */
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <machine/atomic.h>
-#include <errno.h>
-#include <sys/umtx.h>
-#include <sys/_semaphore.h>
-#include <limits.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <time.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-/*
- * Old semaphore definitions.
- */
-struct sem {
-#define SEM_MAGIC       ((uint32_t) 0x09fa4012)
-        uint32_t       magic;
-        pthread_mutex_t lock;
-        pthread_cond_t  gtzero;
-        uint32_t       count;
-        uint32_t       nwaiters;
-#define SEM_USER        (NULL)
-        semid_t         semid;  /* semaphore id if kernel (shared) semaphore */
-        int             syssem; /* 1 if kernel (shared) semaphore */
-        LIST_ENTRY(sem) entry;
-        struct sem      **backpointer;
-};
-
-typedef struct sem* sem_t;
-
-#define SEM_FAILED     ((sem_t *)0)
-#define SEM_VALUE_MAX  __INT_MAX
-
-#define SYM_FB10(sym)                   __CONCAT(sym, _fb10)
-#define WEAK_REF(sym, alias)            __weak_reference(sym, alias)
-#define SYM_COMPAT(sym, impl, ver)      __sym_compat(sym, impl, ver)
- 
-#define FB10_COMPAT(func, sym)                          \
-        WEAK_REF(func, SYM_FB10(sym));                  \
-        SYM_COMPAT(sym, SYM_FB10(sym), FBSD_1.0)
-
-static sem_t sem_alloc(unsigned int value, semid_t semid, int system_sem);
-static void  sem_free(sem_t sem);
-
-static LIST_HEAD(, sem) named_sems = LIST_HEAD_INITIALIZER(named_sems);
-static pthread_mutex_t named_sems_mtx = PTHREAD_MUTEX_INITIALIZER;
-
-FB10_COMPAT(_libc_sem_init_compat, sem_init);
-FB10_COMPAT(_libc_sem_destroy_compat, sem_destroy);
-FB10_COMPAT(_libc_sem_open_compat, sem_open);
-FB10_COMPAT(_libc_sem_close_compat, sem_close);
-FB10_COMPAT(_libc_sem_unlink_compat, sem_unlink);
-FB10_COMPAT(_libc_sem_wait_compat, sem_wait);
-FB10_COMPAT(_libc_sem_trywait_compat, sem_trywait);
-FB10_COMPAT(_libc_sem_timedwait_compat, sem_timedwait);
-FB10_COMPAT(_libc_sem_post_compat, sem_post);
-FB10_COMPAT(_libc_sem_getvalue_compat, sem_getvalue);
-
-static inline int
-sem_check_validity(sem_t *sem)
-{
-
-	if ((sem != NULL) && ((*sem)->magic == SEM_MAGIC))
-		return (0);
-	else {
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-static void
-sem_free(sem_t sem)
-{
-
-	sem->magic = 0;
-	free(sem);
-}
-
-static sem_t
-sem_alloc(unsigned int value, semid_t semid, int system_sem)
-{
-	sem_t sem;
-
-	if (value > SEM_VALUE_MAX) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	sem = (sem_t)malloc(sizeof(struct sem));
-	if (sem == NULL) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-
-	sem->count = (uint32_t)value;
-	sem->nwaiters = 0;
-	sem->magic = SEM_MAGIC;
-	sem->semid = semid;
-	sem->syssem = system_sem;
-	return (sem);
-}
-
-int
-_libc_sem_init_compat(sem_t *sem, int pshared, unsigned int value)
-{
-	semid_t semid;
-
-	/*
-	 * We always have to create the kernel semaphore if the
-	 * threads library isn't present since libc's version of
-	 * pthread_cond_wait() is just a stub that doesn't really
-	 * wait.
-	 */
-	semid = (semid_t)SEM_USER;
-	if ((pshared != 0) && ksem_init(&semid, value) != 0)
-		return (-1);
-
-	*sem = sem_alloc(value, semid, pshared);
-	if ((*sem) == NULL) {
-		if (pshared != 0)
-			ksem_destroy(semid);
-		return (-1);
-	}
-	return (0);
-}
-
-int
-_libc_sem_destroy_compat(sem_t *sem)
-{
-	int retval;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	/*
-	 * If this is a system semaphore let the kernel track it otherwise
-	 * make sure there are no waiters.
-	 */
-	if ((*sem)->syssem != 0)
-		retval = ksem_destroy((*sem)->semid);
-	else if ((*sem)->nwaiters > 0) {
-		errno = EBUSY;
-		retval = -1;
-	}
-	else {
-		retval = 0;
-		(*sem)->magic = 0;
-	}
-
-	if (retval == 0)
-		sem_free(*sem);
-	return (retval);
-}
-
-sem_t *
-_libc_sem_open_compat(const char *name, int oflag, ...)
-{
-	sem_t *sem;
-	sem_t s;
-	semid_t semid;
-	mode_t mode;
-	unsigned int value;
-
-	mode = 0;
-	value = 0;
-
-	if ((oflag & O_CREAT) != 0) {
-		va_list ap;
-
-		va_start(ap, oflag);
-		mode = va_arg(ap, int);
-		value = va_arg(ap, unsigned int);
-		va_end(ap);
-	}
-	/*
-	 * we can be lazy and let the kernel handle the "oflag",
-	 * we'll just merge duplicate IDs into our list.
-	 */
-	if (ksem_open(&semid, name, oflag, mode, value) == -1)
-		return (SEM_FAILED);
-	/*
-	 * search for a duplicate ID, we must return the same sem_t *
-	 * if we locate one.
-	 */
-	_pthread_mutex_lock(&named_sems_mtx);
-	LIST_FOREACH(s, &named_sems, entry) {
-		if (s->semid == semid) {
-			sem = s->backpointer;
-			_pthread_mutex_unlock(&named_sems_mtx);
-			return (sem);
-		}
-	}
-	sem = (sem_t *)malloc(sizeof(*sem));
-	if (sem == NULL)
-		goto err;
-	*sem = sem_alloc(value, semid, 1);
-	if ((*sem) == NULL)
-		goto err;
-	LIST_INSERT_HEAD(&named_sems, *sem, entry);
-	(*sem)->backpointer = sem;
-	_pthread_mutex_unlock(&named_sems_mtx);
-	return (sem);
-err:
-	_pthread_mutex_unlock(&named_sems_mtx);
-	ksem_close(semid);
-	if (sem != NULL) {
-		if (*sem != NULL)
-			sem_free(*sem);
-		else
-			errno = ENOSPC;
-		free(sem);
-	} else {
-		errno = ENOSPC;
-	}
-	return (SEM_FAILED);
-}
-
-int
-_libc_sem_close_compat(sem_t *sem)
-{
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if ((*sem)->syssem == 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	_pthread_mutex_lock(&named_sems_mtx);
-	if (ksem_close((*sem)->semid) != 0) {
-		_pthread_mutex_unlock(&named_sems_mtx);
-		return (-1);
-	}
-	LIST_REMOVE((*sem), entry);
-	_pthread_mutex_unlock(&named_sems_mtx);
-	sem_free(*sem);
-	*sem = NULL;
-	free(sem);
-	return (0);
-}
-
-int
-_libc_sem_unlink_compat(const char *name)
-{
-
-	return (ksem_unlink(name));
-}
-
-static int
-_umtx_wait_uint(volatile unsigned *mtx, unsigned id, const struct timespec *abstime)
-{
-	struct _umtx_time *tm_p, timeout;
-	size_t tm_size;
-
-	if (abstime == NULL) {
-		tm_p = NULL;
-		tm_size = 0;
-	} else {
-		timeout._clockid = CLOCK_REALTIME;
-		timeout._flags = UMTX_ABSTIME;
-		timeout._timeout = *abstime;
-		tm_p = &timeout;
-		tm_size = sizeof(timeout);
-	}
-	return _umtx_op(__DEVOLATILE(void *, mtx),
-		UMTX_OP_WAIT_UINT_PRIVATE, id, 
-		(void *)tm_size, __DECONST(void*, tm_p));
-}
-
-static int
-_umtx_wake(volatile void *mtx)
-{
-	return _umtx_op(__DEVOLATILE(void *, mtx), UMTX_OP_WAKE_PRIVATE,
-			1, NULL, NULL);
-}
-
-#define TIMESPEC_SUB(dst, src, val)                             \
-        do {                                                    \
-                (dst)->tv_sec = (src)->tv_sec - (val)->tv_sec;  \
-                (dst)->tv_nsec = (src)->tv_nsec - (val)->tv_nsec; \
-                if ((dst)->tv_nsec < 0) {                       \
-                        (dst)->tv_sec--;                        \
-                        (dst)->tv_nsec += 1000000000;           \
-                }                                               \
-        } while (0)
-
-
-static void
-sem_cancel_handler(void *arg)
-{
-	sem_t *sem = arg;
-
-	atomic_add_int(&(*sem)->nwaiters, -1);
-	if ((*sem)->nwaiters && (*sem)->count)
-		_umtx_wake(&(*sem)->count);
-}
-
-int
-_libc_sem_timedwait_compat(sem_t * __restrict sem,
-	const struct timespec * __restrict abstime)
-{
-	int val, retval;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if ((*sem)->syssem != 0) {
-		_pthread_cancel_enter(1);
-		retval = ksem_wait((*sem)->semid); /* XXX no timeout */
-		_pthread_cancel_leave(retval == -1);
-		return (retval);
-	}
-
-	retval = 0;
-	_pthread_testcancel();
-	for (;;) {
-		while ((val = (*sem)->count) > 0) {
-			if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1))
-				return (0);
-		}
-		if (retval) {
-			_pthread_testcancel();
-			break;
-		}
-		if (abstime) {
-			if (abstime->tv_nsec >= 1000000000 || abstime->tv_nsec < 0) {
-				errno = EINVAL;
-				return (-1);
-			}
-		}
-		atomic_add_int(&(*sem)->nwaiters, 1);
-		pthread_cleanup_push(sem_cancel_handler, sem);
-		_pthread_cancel_enter(1);
-		retval = _umtx_wait_uint(&(*sem)->count, 0, abstime);
-		_pthread_cancel_leave(0);
-		pthread_cleanup_pop(0);
-		atomic_add_int(&(*sem)->nwaiters, -1);
-	}
-	return (retval);
-}
-
-int
-_libc_sem_wait_compat(sem_t *sem)
-{
-	return _libc_sem_timedwait_compat(sem, NULL);
-}
-
-int
-_libc_sem_trywait_compat(sem_t *sem)
-{
-	int val;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if ((*sem)->syssem != 0)
- 		return ksem_trywait((*sem)->semid);
-
-	while ((val = (*sem)->count) > 0) {
-		if (atomic_cmpset_acq_int(&(*sem)->count, val, val - 1))
-			return (0);
-	}
-	errno = EAGAIN;
-	return (-1);
-}
-
-int
-_libc_sem_post_compat(sem_t *sem)
-{
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if ((*sem)->syssem != 0)
-		return ksem_post((*sem)->semid);
-
-	atomic_add_rel_int(&(*sem)->count, 1);
-	rmb();
-	if ((*sem)->nwaiters)
-		return _umtx_wake(&(*sem)->count);
-	return (0);
-}
-
-int
-_libc_sem_getvalue_compat(sem_t * __restrict sem, int * __restrict sval)
-{
-	int retval;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if ((*sem)->syssem != 0)
-		retval = ksem_getvalue((*sem)->semid, sval);
-	else {
-		*sval = (int)(*sem)->count;
-		retval = 0;
-	}
-	return (retval);
-}
diff --git a/lib/libc_bsd/gen/sem_destroy.3 b/lib/libc_bsd/gen/sem_destroy.3
deleted file mode 100644
index 1e2b46c..0000000
--- a/lib/libc_bsd/gen/sem_destroy.3
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/gen/sem_destroy.3 131465 2004-07-02 16:45:56Z ru $
-.\"
-.Dd February 15, 2000
-.Dt SEM_DESTROY 3
-.Os
-.Sh NAME
-.Nm sem_destroy
-.Nd destroy an unnamed semaphore
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In semaphore.h
-.Ft int
-.Fn sem_destroy "sem_t *sem"
-.Sh DESCRIPTION
-The
-.Fn sem_destroy
-function destroys the unnamed semaphore pointed to by
-.Fa sem .
-After a successful call to
-.Fn sem_destroy ,
-.Fa sem
-is unusable until re-initialized by another call to
-.Xr sem_init 3 .
-.Sh RETURN VALUES
-.Rv -std sem_destroy
-.Sh ERRORS
-The
-.Fn sem_destroy
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sem
-argument
-points to an invalid semaphore.
-.It Bq Er EBUSY
-There are currently threads blocked on the semaphore that
-.Fa sem
-points to.
-.El
-.Sh SEE ALSO
-.Xr sem_init 3 ,
-.Xr sem 4
-.Sh STANDARDS
-The
-.Fn sem_destroy
-function conforms to
-.St -p1003.1-96 .
-.Pp
-.Tn POSIX
-does not define the behavior of
-.Fn sem_destroy
-if called while there are threads blocked on
-.Fa sem ,
-but this implementation is guaranteed to return \-1 and set
-.Va errno
-to
-.Er EBUSY
-if there are threads blocked on
-.Fa sem .
diff --git a/lib/libc_bsd/gen/sem_getvalue.3 b/lib/libc_bsd/gen/sem_getvalue.3
deleted file mode 100644
index a629dcc..0000000
--- a/lib/libc_bsd/gen/sem_getvalue.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/gen/sem_getvalue.3 131465 2004-07-02 16:45:56Z ru $
-.\"
-.Dd February 15, 2000
-.Dt SEM_GETVALUE 3
-.Os
-.Sh NAME
-.Nm sem_getvalue
-.Nd get the value of a semaphore
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In semaphore.h
-.Ft int
-.Fn sem_getvalue "sem_t * restrict sem" "int * restrict sval"
-.Sh DESCRIPTION
-The
-.Fn sem_getvalue
-function sets the variable pointed to by
-.Fa sval
-to the current value of the semaphore pointed to by
-.Fa sem ,
-as of the time that the call to
-.Fn sem_getvalue
-is actually run.
-.Sh RETURN VALUES
-.Rv -std sem_getvalue
-.Sh ERRORS
-The
-.Fn sem_getvalue
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sem
-argument
-points to an invalid semaphore.
-.El
-.Sh SEE ALSO
-.Xr sem_post 3 ,
-.Xr sem_trywait 3 ,
-.Xr sem_wait 3 ,
-.Xr sem 4
-.Sh STANDARDS
-The
-.Fn sem_getvalue
-function conforms to
-.St -p1003.1-96 .
-.Pp
-The value of the semaphore is never negative, even if there are threads blocked
-on the semaphore.
-.Tn POSIX
-is somewhat ambiguous in its wording with regard to
-what the value of the semaphore should be if there are blocked waiting threads,
-but this behavior is conformant, given the wording of the specification.
diff --git a/lib/libc_bsd/gen/sem_init.3 b/lib/libc_bsd/gen/sem_init.3
deleted file mode 100644
index 3edac44..0000000
--- a/lib/libc_bsd/gen/sem_init.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/gen/sem_init.3 202133 2010-01-12 01:30:05Z davidxu $
-.\"
-.Dd January 9, 2010
-.Dt SEM_INIT 3
-.Os
-.Sh NAME
-.Nm sem_init
-.Nd initialize an unnamed semaphore
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In semaphore.h
-.Ft int
-.Fn sem_init "sem_t *sem" "int pshared" "unsigned int value"
-.Sh DESCRIPTION
-The
-.Fn sem_init
-function initializes the unnamed semaphore pointed to by
-.Fa sem
-to have the value
-.Fa value .
-.Pp
-A non-zero value for
-.Fa pshared
-specifies a shared semaphore that can be used by multiple processes,
-the semaphore should be located in shared memory region (see
-.Xr mmap 2 ,
-.Xr shm_open 2 ,
-and
-.Xr shmget 2 ) ,
-any process having read and write access to address
-.Fa sem
-can perform semaphore operations on
-.Fa sem .
-.Pp
-Following a successful call to
-.Fn sem_init ,
-.Fa sem
-can be used as an argument in subsequent calls to
-.Xr sem_wait 3 ,
-.Xr sem_trywait 3 ,
-.Xr sem_post 3 ,
-and
-.Xr sem_destroy 3 .
-The
-.Fa sem
-argument is no longer valid after a successful call to
-.Xr sem_destroy 3 .
-.Sh RETURN VALUES
-.Rv -std sem_init
-.Sh ERRORS
-The
-.Fn sem_init
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa value
-argument exceeds
-.Dv SEM_VALUE_MAX .
-.It Bq Er ENOSPC
-Memory allocation error.
-.El
-.Sh SEE ALSO
-.Xr sem_destroy 3 ,
-.Xr sem_getvalue 3 ,
-.Xr sem_post 3 ,
-.Xr sem_trywait 3 ,
-.Xr sem_wait 3 ,
-.Xr sem 4
-.Sh STANDARDS
-The
-.Fn sem_init
-function conforms to
-.St -p1003.1-96 .
diff --git a/lib/libc_bsd/gen/sem_new.c b/lib/libc_bsd/gen/sem_new.c
deleted file mode 100644
index e6789a2..0000000
--- a/lib/libc_bsd/gen/sem_new.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (C) 2010 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/gen/sem_new.c 278410 2015-02-08 21:58:25Z jilles $
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <machine/atomic.h>
-#include <sys/umtx.h>
-#include <limits.h>
-#include <fcntl.h>
-#include <pthread.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <semaphore.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-__weak_reference(_sem_close, sem_close);
-__weak_reference(_sem_destroy, sem_destroy);
-__weak_reference(_sem_getvalue, sem_getvalue);
-__weak_reference(_sem_init, sem_init);
-__weak_reference(_sem_open, sem_open);
-__weak_reference(_sem_post, sem_post);
-__weak_reference(_sem_timedwait, sem_timedwait);
-__weak_reference(_sem_trywait, sem_trywait);
-__weak_reference(_sem_unlink, sem_unlink);
-__weak_reference(_sem_wait, sem_wait);
-
-#define SEM_PREFIX	"/tmp/SEMD"
-#define SEM_MAGIC	((uint32_t)0x73656d31)
-
-struct sem_nameinfo {
-	int open_count;
-	char *name;
-	dev_t dev;
-	ino_t ino;
-	sem_t *sem;
-	LIST_ENTRY(sem_nameinfo) next;
-};
-
-static pthread_once_t once = PTHREAD_ONCE_INIT;
-static pthread_mutex_t sem_llock;
-static LIST_HEAD(,sem_nameinfo) sem_list = LIST_HEAD_INITIALIZER(sem_list);
-
-static void
-sem_prefork()
-{
-	
-	_pthread_mutex_lock(&sem_llock);
-}
-
-static void
-sem_postfork()
-{
-	_pthread_mutex_unlock(&sem_llock);
-}
-
-static void
-sem_child_postfork()
-{
-	_pthread_mutex_unlock(&sem_llock);
-}
-
-static void
-sem_module_init(void)
-{
-	pthread_mutexattr_t ma;
-
-	_pthread_mutexattr_init(&ma);
-	_pthread_mutexattr_settype(&ma,  PTHREAD_MUTEX_RECURSIVE);
-	_pthread_mutex_init(&sem_llock, &ma);
-	_pthread_mutexattr_destroy(&ma);
-	_pthread_atfork(sem_prefork, sem_postfork, sem_child_postfork);
-}
-
-static inline int
-sem_check_validity(sem_t *sem)
-{
-
-	if (sem->_magic == SEM_MAGIC)
-		return (0);
-	else {
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-int
-_sem_init(sem_t *sem, int pshared, unsigned int value)
-{
-
-	if (value > SEM_VALUE_MAX) {
-		errno = EINVAL;
-		return (-1);
-	}
- 
-	bzero(sem, sizeof(sem_t));
-	sem->_magic = SEM_MAGIC;
-	sem->_kern._count = (uint32_t)value;
-	sem->_kern._has_waiters = 0;
-	sem->_kern._flags = pshared ? USYNC_PROCESS_SHARED : 0;
-	return (0);
-}
-
-sem_t *
-_sem_open(const char *name, int flags, ...)
-{
-	char path[PATH_MAX];
-
-	struct stat sb;
-	va_list ap;
-	struct sem_nameinfo *ni = NULL;
-	sem_t *sem = NULL;
-	int fd = -1, mode, len, errsave;
-	int value = 0;
-
-	if (name[0] != '/') {
-		errno = EINVAL;
-		return (SEM_FAILED);
-	}
-	name++;
-	strcpy(path, SEM_PREFIX);
-	if (strlcat(path, name, sizeof(path)) >= sizeof(path)) {
-		errno = ENAMETOOLONG;
-		return (SEM_FAILED);
-	}
-	if (flags & ~(O_CREAT|O_EXCL)) {
-		errno = EINVAL;
-		return (SEM_FAILED);
-	}
-	if ((flags & O_CREAT) != 0) {
-		va_start(ap, flags);
-		mode = va_arg(ap, int);
-		value = va_arg(ap, int);
-		va_end(ap);
-	}
-	fd = -1;
-	_pthread_once(&once, sem_module_init);
-
-	_pthread_mutex_lock(&sem_llock);
-	LIST_FOREACH(ni, &sem_list, next) {
-		if (ni->name != NULL && strcmp(name, ni->name) == 0) {
-			fd = _open(path, flags | O_RDWR | O_CLOEXEC |
-			    O_EXLOCK, mode);
-			if (fd == -1 || _fstat(fd, &sb) == -1)
-				goto error;
-			if ((flags & (O_CREAT | O_EXCL)) == (O_CREAT |
-			    O_EXCL) || ni->dev != sb.st_dev ||
-			    ni->ino != sb.st_ino) {
-				ni->name = NULL;
-				ni = NULL;
-				break;
-			}
-			ni->open_count++;
-			sem = ni->sem;
-			_pthread_mutex_unlock(&sem_llock);
-			_close(fd);
-			return (sem);
-		}
-	}
-
-	len = sizeof(*ni) + strlen(name) + 1;
-	ni = (struct sem_nameinfo *)malloc(len);
-	if (ni == NULL) {
-		errno = ENOSPC;
-		goto error;
-	}
-
-	ni->name = (char *)(ni+1);
-	strcpy(ni->name, name);
-
-	if (fd == -1) {
-		fd = _open(path, flags | O_RDWR | O_CLOEXEC | O_EXLOCK, mode);
-		if (fd == -1 || _fstat(fd, &sb) == -1)
-			goto error;
-	}
-	if (sb.st_size < sizeof(sem_t)) {
-		sem_t tmp;
-
-		tmp._magic = SEM_MAGIC;
-		tmp._kern._has_waiters = 0;
-		tmp._kern._count = value;
-		tmp._kern._flags = USYNC_PROCESS_SHARED | SEM_NAMED;
-		if (_write(fd, &tmp, sizeof(tmp)) != sizeof(tmp))
-			goto error;
-	}
-	flock(fd, LOCK_UN);
-	sem = (sem_t *)mmap(NULL, sizeof(sem_t), PROT_READ|PROT_WRITE,
-		MAP_SHARED|MAP_NOSYNC, fd, 0);
-	if (sem == MAP_FAILED) {
-		sem = NULL;
-		if (errno == ENOMEM)
-			errno = ENOSPC;
-		goto error;
-	}
-	if (sem->_magic != SEM_MAGIC) {
-		errno = EINVAL;
-		goto error;
-	}
-	ni->open_count = 1;
-	ni->sem = sem;
-	ni->dev = sb.st_dev;
-	ni->ino = sb.st_ino;
-	LIST_INSERT_HEAD(&sem_list, ni, next);
-	_close(fd);
-	_pthread_mutex_unlock(&sem_llock);
-	return (sem);
-
-error:
-	errsave = errno;
-	if (fd != -1)
-		_close(fd);
-	if (sem != NULL)
-		munmap(sem, sizeof(sem_t));
-	free(ni);
-	_pthread_mutex_unlock(&sem_llock);
-	errno = errsave;
-	return (SEM_FAILED);
-}
-
-int
-_sem_close(sem_t *sem)
-{
-	struct sem_nameinfo *ni;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if (!(sem->_kern._flags & SEM_NAMED)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	_pthread_once(&once, sem_module_init);
-
-	_pthread_mutex_lock(&sem_llock);
-	LIST_FOREACH(ni, &sem_list, next) {
-		if (sem == ni->sem) {
-			if (--ni->open_count > 0) {
-				_pthread_mutex_unlock(&sem_llock);
-				return (0);
-			}
-			else
-				break;
-		}
-	}
-
-	if (ni) {
-		LIST_REMOVE(ni, next);
-		_pthread_mutex_unlock(&sem_llock);
-		munmap(sem, sizeof(*sem));
-		free(ni);
-		return (0);
-	}
-	_pthread_mutex_unlock(&sem_llock);
-	errno = EINVAL;
-	return (-1);
-}
-
-int
-_sem_unlink(const char *name)
-{
-	char path[PATH_MAX];
-
-	if (name[0] != '/') {
-		errno = ENOENT;
-		return -1;
-	}
-	name++;
-	strcpy(path, SEM_PREFIX);
-	if (strlcat(path, name, sizeof(path)) >= sizeof(path)) {
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-
-	return (unlink(path));
-}
-
-int
-_sem_destroy(sem_t *sem)
-{
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	if (sem->_kern._flags & SEM_NAMED) {
-		errno = EINVAL;
-		return (-1);
-	}
-	sem->_magic = 0;
-	return (0);
-}
-
-int
-_sem_getvalue(sem_t * __restrict sem, int * __restrict sval)
-{
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	*sval = (int)sem->_kern._count;
-	return (0);
-}
-
-static __inline int
-usem_wake(struct _usem *sem)
-{
-	return _umtx_op(sem, UMTX_OP_SEM_WAKE, 0, NULL, NULL);
-}
-
-static __inline int
-usem_wait(struct _usem *sem, const struct timespec *abstime)
-{
-	struct _umtx_time *tm_p, timeout;
-	size_t tm_size;
-
-	if (abstime == NULL) {
-		tm_p = NULL;
-		tm_size = 0;
-	} else {
-		timeout._clockid = CLOCK_REALTIME;
-		timeout._flags = UMTX_ABSTIME;
-		timeout._timeout = *abstime;
-		tm_p = &timeout;
-		tm_size = sizeof(timeout);
-	}
-	return _umtx_op(sem, UMTX_OP_SEM_WAIT, 0, 
-		    (void *)tm_size, __DECONST(void*, tm_p));
-}
-
-int
-_sem_trywait(sem_t *sem)
-{
-	int val;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	while ((val = sem->_kern._count) > 0) {
-		if (atomic_cmpset_acq_int(&sem->_kern._count, val, val - 1))
-			return (0);
-	}
-	errno = EAGAIN;
-	return (-1);
-}
-
-int
-_sem_timedwait(sem_t * __restrict sem,
-	const struct timespec * __restrict abstime)
-{
-	int val, retval;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	retval = 0;
-	_pthread_testcancel();
-	for (;;) {
-		while ((val = sem->_kern._count) > 0) {
-			if (atomic_cmpset_acq_int(&sem->_kern._count, val, val - 1))
-				return (0);
-		}
-
-		if (retval) {
-			_pthread_testcancel();
-			break;
-		}
-
-		/*
-		 * The timeout argument is only supposed to
-		 * be checked if the thread would have blocked.
-		 */
-		if (abstime != NULL) {
-			if (abstime->tv_nsec >= 1000000000 || abstime->tv_nsec < 0) {
-				errno = EINVAL;
-				return (-1);
-			}
-		}
-		_pthread_cancel_enter(1);
-		retval = usem_wait(&sem->_kern, abstime);
-		_pthread_cancel_leave(0);
-	}
-	return (retval);
-}
-
-int
-_sem_wait(sem_t *sem)
-{
-	return _sem_timedwait(sem, NULL);
-}
-
-/*
- * POSIX:
- * The sem_post() interface is reentrant with respect to signals and may be
- * invoked from a signal-catching function. 
- * The implementation does not use lock, so it should be safe.
- */
-int
-_sem_post(sem_t *sem)
-{
-	unsigned int count;
-
-	if (sem_check_validity(sem) != 0)
-		return (-1);
-
-	do {
-		count = sem->_kern._count;
-		if (count + 1 > SEM_VALUE_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-	} while(!atomic_cmpset_rel_int(&sem->_kern._count, count, count+1));
-	(void)usem_wake(&sem->_kern);
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/sem_open.3 b/lib/libc_bsd/gen/sem_open.3
deleted file mode 100644
index 7364c04..0000000
--- a/lib/libc_bsd/gen/sem_open.3
+++ /dev/null
@@ -1,225 +0,0 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/gen/sem_open.3 202133 2010-01-12 01:30:05Z davidxu $
-.\"
-.Dd January 9, 2010
-.Dt SEM_OPEN 3
-.Os
-.Sh NAME
-.Nm sem_open ,
-.Nm sem_close ,
-.Nm sem_unlink
-.Nd named semaphore operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In semaphore.h
-.Ft "sem_t *"
-.Fn sem_open "const char *name" "int oflag" ...
-.Ft int
-.Fn sem_close "sem_t *sem"
-.Ft int
-.Fn sem_unlink "const char *name"
-.Sh DESCRIPTION
-The
-.Fn sem_open
-function creates or opens the named semaphore specified by
-.Fa name .
-The returned semaphore may be used in subsequent calls to
-.Xr sem_getvalue 3 ,
-.Xr sem_wait 3 ,
-.Xr sem_trywait 3 ,
-.Xr sem_post 3 ,
-and
-.Fn sem_close .
-.Pp
-This implementation places strict requirements on the value of
-.Fa name :
-it must begin with a slash
-.Pq Ql /
-and contain no other slash characters.
-.Pp
-The following bits may be set in the
-.Fa oflag
-argument:
-.Bl -tag -width ".Dv O_CREAT"
-.It Dv O_CREAT
-Create the semaphore if it does not already exist.
-.Pp
-The third argument to the call to
-.Fn sem_open
-must be of type
-.Vt mode_t
-and specifies the mode for the semaphore.
-Only the
-.Dv S_IWUSR , S_IWGRP ,
-and
-.Dv S_IWOTH
-bits are examined;
-it is not possible to grant only
-.Dq read
-permission on a semaphore.
-The mode is modified according to the process's file creation
-mask; see
-.Xr umask 2 .
-.Pp
-The fourth argument must be an
-.Vt "unsigned int"
-and specifies the initial value for the semaphore,
-and must be no greater than
-.Dv SEM_VALUE_MAX .
-.It Dv O_EXCL
-Create the semaphore if it does not exist.
-If the semaphore already exists,
-.Fn sem_open
-will fail.
-This flag is ignored unless
-.Dv O_CREAT
-is also specified.
-.El
-.Pp
-The
-.Fn sem_close
-function closes a named semaphore that was opened by a call to
-.Fn sem_open .
-.Pp
-The
-.Fn sem_unlink
-function removes the semaphore named
-.Fa name .
-Resources allocated to the semaphore are only deallocated when all
-processes that have the semaphore open close it.
-.Sh RETURN VALUES
-If successful,
-the
-.Fn sem_open
-function returns the address of the opened semaphore.
-If the same
-.Fa name
-argument is given to multiple calls to
-.Fn sem_open
-by the same process without an intervening call to
-.Fn sem_close ,
-the same address is returned each time.
-If the semaphore cannot be opened,
-.Fn sem_open
-returns
-.Dv SEM_FAILED
-and the global variable
-.Va errno
-is set to indicate the error.
-.Pp
-.Rv -std sem_close sem_unlink
-.Sh ERRORS
-The
-.Fn sem_open
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The semaphore exists and the permissions specified by
-.Fa oflag
-at the time it was created deny access to this process.
-.It Bq Er EACCES
-The semaphore does not exist, but permission to create it is denied.
-.It Bq Er EEXIST
-.Dv O_CREAT
-and
-.Dv O_EXCL
-are set but the semaphore already exists.
-.It Bq Er EINTR
-The call was interrupted by a signal.
-.It Bq Er EINVAL
-The
-.Fn sem_open
-operation is not supported for the given
-.Fa name .
-.It Bq Er EINVAL
-The
-.Fa value
-argument is greater than
-.Dv SEM_VALUE_MAX .
-.\"FreeBSD never returns EMFILE
-.\".It Bq Er EMFILE
-.\"Too many semaphores are in use by this process.
-.It Bq Er ENAMETOOLONG
-The
-.Fa name
-argument is too long.
-.It Bq Er ENFILE
-The system limit on semaphores has been reached.
-.It Bq Er ENOENT
-.Dv O_CREAT
-is not set but the named semaphore does not exist.
-.It Bq Er ENOSPC
-There is not enough space to create the semaphore.
-.El
-.Pp
-The
-.Fn sem_close
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sem
-argument is not a valid semaphore.
-.El
-.Pp
-The
-.Fn sem_unlink
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Permission is denied to unlink the semaphore.
-.It Bq Er ENAMETOOLONG
-The specified
-.Fa name
-is too long.
-.It Bq Er ENOENT
-The named semaphore does not exist.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr open 2 ,
-.Xr umask 2 ,
-.Xr unlink 2 ,
-.Xr sem_getvalue 3 ,
-.Xr sem_post 3 ,
-.Xr sem_trywait 3 ,
-.Xr sem_wait 3 ,
-.Xr sem 4
-.Sh STANDARDS
-The
-.Fn sem_open ,
-.Fn sem_close ,
-and
-.Fn sem_unlink
-functions conform to
-.St -p1003.1-96 .
-.Sh HISTORY
-Support for named semaphores first appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/gen/sem_post.3 b/lib/libc_bsd/gen/sem_post.3
deleted file mode 100644
index f59985f..0000000
--- a/lib/libc_bsd/gen/sem_post.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/gen/sem_post.3 278410 2015-02-08 21:58:25Z jilles $
-.\"
-.Dd January 28, 2015
-.Dt SEM_POST 3
-.Os
-.Sh NAME
-.Nm sem_post
-.Nd increment (unlock) a semaphore
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In semaphore.h
-.Ft int
-.Fn sem_post "sem_t *sem"
-.Sh DESCRIPTION
-The
-.Fn sem_post
-function increments (unlocks) the semaphore pointed to by
-.Fa sem .
-If there are threads blocked on the semaphore when
-.Fn sem_post
-is called, then the highest priority thread that has been blocked the longest on
-the semaphore will be allowed to return from
-.Fn sem_wait .
-.Pp
-The
-.Fn sem_post
-function is signal-reentrant and may be called within signal handlers.
-.Sh RETURN VALUES
-.Rv -std sem_post
-.Sh ERRORS
-The
-.Fn sem_post
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sem
-argument
-points to an invalid semaphore.
-.It Bq Er EOVERFLOW
-The semaphore value would exceed
-.Dv SEM_VALUE_MAX .
-.El
-.Sh SEE ALSO
-.Xr sem_getvalue 3 ,
-.Xr sem_trywait 3 ,
-.Xr sem_wait 3 ,
-.Xr sem 4
-.Sh STANDARDS
-The
-.Fn sem_post
-function conforms to
-.St -p1003.1-96 .
diff --git a/lib/libc_bsd/gen/sem_timedwait.3 b/lib/libc_bsd/gen/sem_timedwait.3
deleted file mode 100644
index 6cf2e50..0000000
--- a/lib/libc_bsd/gen/sem_timedwait.3
+++ /dev/null
@@ -1,120 +0,0 @@
-.\" Copyright (c) 2008, David Xu <davidxu@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/sem_timedwait.3 208291 2010-05-19 08:57:53Z uqs $
-.\"
-.Dd March 3, 2008
-.Dt SEM_TIMEDWAIT 3
-.Os
-.Sh NAME
-.Nm sem_timedwait
-.Nd "lock a semaphore"
-.Sh LIBRARY
-.Lb libpthread
-.Sh SYNOPSIS
-.In semaphore.h
-.Ft int
-.Fn sem_timedwait "sem_t *sem" "const struct timespec *abs_timeout"
-.Sh DESCRIPTION
-The
-.Fn sem_timedwait
-function locks the semaphore referenced by
-.Fa sem ,
-as in the
-.Xr sem_wait 3
-function.
-However, if the semaphore cannot be locked without waiting for
-another process or thread to unlock the semaphore by performing
-a
-.Xr sem_post 3
-function, this wait will be terminated when the specified timeout expires.
-.Pp
-The timeout will expire when the absolute time specified by
-.Fa abs_timeout
-passes, as measured by the clock on which timeouts are based (that is,
-when the value of that clock equals or exceeds
-.Fa abs_timeout ) ,
-or if the
-absolute time specified by
-.Fa abs_timeout
-has already been passed at the time of the call.
-.Pp
-Note that the timeout is based on the
-.Dv CLOCK_REALTIME
-clock.
-.Pp
-The validity of the
-.Fa abs_timeout
-is not checked if the semaphore can be locked immediately.
-.Sh RETURN VALUES
-The
-.Fn sem_timedwait
-function returns zero if the calling process successfully performed the
-semaphore lock operation on the semaphore designated by
-.Fa sem .
-If the call was unsuccessful, the state of the semaphore is unchanged,
-and the function returns a value of \-1 and sets the global variable
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn sem_timedwait
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sem
-argument does not refer to a valid semaphore, or the process or thread would
-have blocked, and the
-.Fa abs_timeout
-parameter specified a nanoseconds field value less than zero or greater than
-or equal to 1000 million.
-.It Bq Er ETIMEDOUT
-The semaphore could not be locked before the specified timeout expired.
-.It Bq Er EINTR
-A signal interrupted this function.
-.El
-.Sh SEE ALSO
-.Xr sem_post 3 ,
-.Xr sem_trywait 3 ,
-.Xr sem_wait 3 ,
-.Xr sem 4
-.Sh STANDARDS
-The
-.Fn sem_timedwait
-function conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-The function first appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/gen/sem_wait.3 b/lib/libc_bsd/gen/sem_wait.3
deleted file mode 100644
index 555cd8e..0000000
--- a/lib/libc_bsd/gen/sem_wait.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/gen/sem_wait.3 249567 2013-04-16 20:31:15Z joel $
-.\"
-.Dd April 16, 2013
-.Dt SEM_WAIT 3
-.Os
-.Sh NAME
-.Nm sem_wait ,
-.Nm sem_trywait
-.Nd decrement (lock) a semaphore
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In semaphore.h
-.Ft int
-.Fn sem_wait "sem_t *sem"
-.Ft int
-.Fn sem_trywait "sem_t *sem"
-.Sh DESCRIPTION
-The
-.Fn sem_wait
-function decrements (locks) the semaphore pointed to by
-.Fa sem ,
-but blocks if the value of
-.Fa sem
-is zero, until the value is non-zero and the value can be decremented.
-.Pp
-The
-.Fn sem_trywait
-function decrements (locks) the semaphore pointed to by
-.Fa sem
-only if the value is non-zero.
-Otherwise, the semaphore is not decremented and
-an error is returned.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn sem_wait
-and
-.Fn sem_trywait
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sem
-argument
-points to an invalid semaphore.
-.El
-.Pp
-Additionally,
-.Fn sem_wait
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINTR
-A signal interrupted this function.
-.El
-Additionally,
-.Fn sem_trywait
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The semaphore value was zero, and thus could not be decremented.
-.El
-.Sh SEE ALSO
-.Xr sem_getvalue 3 ,
-.Xr sem_post 3 ,
-.Xr sem_timedwait 3 ,
-.Xr sem 4
-.Sh STANDARDS
-The
-.Fn sem_wait
-and
-.Fn sem_trywait
-functions conform to
-.St -p1003.1-96 .
diff --git a/lib/libc_bsd/gen/semctl.c b/lib/libc_bsd/gen/semctl.c
deleted file mode 100644
index 33fca73..0000000
--- a/lib/libc_bsd/gen/semctl.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 2002 Doug Rabson
- * 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.
- *
- * 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.
- *
- */
-
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/semctl.c 194910 2009-06-24 21:10:52Z jhb $");
-
-#define _WANT_SEMUN_OLD
-
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-int	__semctl(int semid, int semnum, int cmd, union semun *arg);
-int	freebsd7___semctl(int semid, int semnum, int cmd, union semun_old *arg);
-
-int
-semctl(int semid, int semnum, int cmd, ...)
-{
-	va_list ap;
-	union semun semun;
-	union semun *semun_ptr;
-
-	va_start(ap, cmd);
-	if (cmd == IPC_SET || cmd == IPC_STAT || cmd == GETALL
-	    || cmd == SETVAL || cmd == SETALL) {
-		semun = va_arg(ap, union semun);
-		semun_ptr = &semun;
-	} else {
-		semun_ptr = NULL;
-	}
-	va_end(ap);
-
-	return (__semctl(semid, semnum, cmd, semun_ptr));
-}
-
-int
-freebsd7_semctl(int semid, int semnum, int cmd, ...)
-{
-	va_list ap;
-	union semun_old semun;
-	union semun_old *semun_ptr;
-
-	va_start(ap, cmd);
-	if (cmd == IPC_SET || cmd == IPC_STAT || cmd == GETALL
-	    || cmd == SETVAL || cmd == SETALL) {
-		semun = va_arg(ap, union semun_old);
-		semun_ptr = &semun;
-	} else {
-		semun_ptr = NULL;
-	}
-	va_end(ap);
-
-	return (freebsd7___semctl(semid, semnum, cmd, semun_ptr));
-}
-
-__sym_compat(semctl, freebsd7_semctl, FBSD_1.0);
diff --git a/lib/libc_bsd/gen/setdomainname.c b/lib/libc_bsd/gen/setdomainname.c
deleted file mode 100644
index 94ddfd1..0000000
--- a/lib/libc_bsd/gen/setdomainname.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/setdomainname.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <unistd.h>
-
-int
-setdomainname(const char *name, int namelen)
-{
-	int mib[2];
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_NISDOMAINNAME;
-	if (sysctl(mib, 2, NULL, NULL, (void *)name, namelen) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/sethostname.c b/lib/libc_bsd/gen/sethostname.c
deleted file mode 100644
index f337580..0000000
--- a/lib/libc_bsd/gen/sethostname.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sethostname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/sethostname.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <unistd.h>
-
-int
-sethostname(const char *name, int namelen)
-{
-	int mib[2];
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_HOSTNAME;
-	if (sysctl(mib, 2, NULL, NULL, (void *)name, namelen) == -1)
-		return (-1);
-	return (0);
-}
diff --git a/lib/libc_bsd/gen/setjmp.3 b/lib/libc_bsd/gen/setjmp.3
deleted file mode 100644
index 5a25d05..0000000
--- a/lib/libc_bsd/gen/setjmp.3
+++ /dev/null
@@ -1,172 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)setjmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/setjmp.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt SETJMP 3
-.Os
-.Sh NAME
-.Nm sigsetjmp ,
-.Nm siglongjmp ,
-.Nm setjmp ,
-.Nm longjmp ,
-.Nm _setjmp ,
-.Nm _longjmp ,
-.Nm longjmperror
-.Nd non-local jumps
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In setjmp.h
-.Ft int
-.Fn sigsetjmp "sigjmp_buf env" "int savemask"
-.Ft void
-.Fn siglongjmp "sigjmp_buf env" "int val"
-.Ft int
-.Fn setjmp "jmp_buf env"
-.Ft void
-.Fn longjmp "jmp_buf env" "int val"
-.Ft int
-.Fn _setjmp "jmp_buf env"
-.Ft void
-.Fn _longjmp "jmp_buf env" "int val"
-.Ft void
-.Fn longjmperror void
-.Sh DESCRIPTION
-The
-.Fn sigsetjmp ,
-.Fn setjmp ,
-and
-.Fn _setjmp
-functions save their calling environment in
-.Fa env .
-Each of these functions returns 0.
-.Pp
-The corresponding
-.Fn longjmp
-functions restore the environment saved by their most recent respective
-invocations
-of the
-.Fn setjmp
-function.
-They then return so that program execution continues as if the corresponding
-invocation of the
-.Fn setjmp
-call had just returned the value specified by
-.Fa val ,
-instead of 0.
-.Pp
-Pairs of calls may be intermixed, i.e., both
-.Fn sigsetjmp
-and
-.Fn siglongjmp
-and
-.Fn setjmp
-and
-.Fn longjmp
-combinations may be used in the same program, however, individual
-calls may not, e.g.\& the
-.Fa env
-argument to
-.Fn setjmp
-may not be passed to
-.Fn siglongjmp .
-.Pp
-The
-.Fn longjmp
-routines may not be called after the routine which called the
-.Fn setjmp
-routines returns.
-.Pp
-All accessible objects have values as of the time
-.Fn longjmp
-routine was called, except that the values of objects of automatic storage
-invocation duration that do not have the
-.Vt volatile
-type and have been changed between the
-.Fn setjmp
-invocation and
-.Fn longjmp
-call are indeterminate.
-.Pp
-The
-.Fn setjmp Ns / Ns Fn longjmp
-pairs save and restore the signal mask while
-.Fn _setjmp Ns / Ns Fn _longjmp
-pairs save and restore only the register set and the stack.
-(See
-.Fn sigprocmask 2 . )
-.Pp
-The
-.Fn sigsetjmp Ns / Ns Fn siglongjmp
-function
-pairs save and restore the signal mask if the argument
-.Fa savemask
-is non-zero, otherwise only the register set and the stack are saved.
-.Sh ERRORS
-If the contents of the
-.Fa env
-are corrupted, or correspond to an environment that has already returned,
-the
-.Fn longjmp
-routine calls the routine
-.Fn longjmperror 3 .
-If
-.Fn longjmperror
-returns the program is aborted (see
-.Xr abort 3 ) .
-The default version of
-.Fn longjmperror
-prints the message
-.Dq Li longjmp botch
-to standard error and returns.
-User programs wishing to exit more gracefully should write their own
-versions of
-.Fn longjmperror .
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigaltstack 2 ,
-.Xr signal 3
-.Sh STANDARDS
-The
-.Fn setjmp
-and
-.Fn longjmp
-functions conform to
-.St -isoC .
-The
-.Fn sigsetjmp
-and
-.Fn siglongjmp
-functions conform to
-.St -p1003.1-88 .
diff --git a/lib/libc_bsd/gen/setjmperr.c b/lib/libc_bsd/gen/setjmperr.c
deleted file mode 100644
index 0ac212c..0000000
--- a/lib/libc_bsd/gen/setjmperr.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1980, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setjmperr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/setjmperr.c 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * This routine is called from longjmp() when an error occurs.
- * Programs that wish to exit gracefully from this error may
- * write their own versions.
- * If this routine returns, the program is aborted.
- */
-
-#include "namespace.h"
-#include <setjmp.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-void
-longjmperror()
-{
-#define	ERRMSG	"longjmp botch.\n"
-	(void)_write(STDERR_FILENO, ERRMSG, sizeof(ERRMSG) - 1);
-}
diff --git a/lib/libc_bsd/gen/setmode.3 b/lib/libc_bsd/gen/setmode.3
deleted file mode 100644
index 3a7a160..0000000
--- a/lib/libc_bsd/gen/setmode.3
+++ /dev/null
@@ -1,127 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)setmode.3	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD: releng/10.2/lib/libc/gen/setmode.3 280392 2015-03-23 19:44:18Z pfg $
-.\"
-.Dd February 22, 2015
-.Dt SETMODE 3
-.Os
-.Sh NAME
-.Nm getmode ,
-.Nm setmode
-.Nd modify mode bits
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft mode_t
-.Fn getmode "const void *set" "mode_t mode"
-.Ft void *
-.Fn setmode "const char *mode_str"
-.Sh DESCRIPTION
-The
-.Fn getmode
-function
-returns a copy of the file permission bits
-.Fa mode
-as altered by the values pointed to by
-.Fa set .
-While only the mode bits are altered, other parts of the file mode
-may be examined.
-.Pp
-The
-.Fn setmode
-function
-takes an absolute (octal) or symbolic value, as described in
-.Xr chmod 1 ,
-as an argument
-and returns a pointer to mode values to be supplied to
-.Fn getmode .
-Because some of the symbolic values are relative to the file
-creation mask,
-.Fn setmode
-may call
-.Xr umask 2 .
-If this occurs, the file creation mask will be restored before
-.Fn setmode
-returns.
-If the calling program changes the value of its file creation mask
-after calling
-.Fn setmode ,
-.Fn setmode
-must be called again if
-.Fn getmode
-is to modify future file modes correctly.
-.Pp
-If the mode passed to
-.Fn setmode
-is invalid or if memory cannot be allocated for the return value,
-.Fn setmode
-returns
-.Dv NULL .
-.Pp
-The value returned from
-.Fn setmode
-is obtained from
-.Fn malloc
-and should be returned to the system with
-.Fn free
-when the program is done with it, generally after a call to
-.Fn getmode .
-.Sh ERRORS
-The
-.Fn setmode
-function
-may fail and set errno for any of the errors specified for the library
-routine
-.Xr malloc 3
-or
-.Xr strtol 3 .
-In addition,
-.Fn setmode
-will fail and set
-.Va errno
-to:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa mode
-argument does not represent a valid mode.
-.El
-.Sh SEE ALSO
-.Xr chmod 1 ,
-.Xr stat 2 ,
-.Xr umask 2 ,
-.Xr malloc 3
-.Sh HISTORY
-The
-.Fn getmode
-and
-.Fn setmode
-functions first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/gen/setmode.c b/lib/libc_bsd/gen/setmode.c
deleted file mode 100644
index b3dac44..0000000
--- a/lib/libc_bsd/gen/setmode.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Copyright (c) 1989, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Dave Borman at Cray Research, Inc.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setmode.c	8.2 (Berkeley) 3/25/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/setmode.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <signal.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef SETMODE_DEBUG
-#include <stdio.h>
-#endif
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#define	SET_LEN	6		/* initial # of bitcmd struct to malloc */
-#define	SET_LEN_INCR 4		/* # of bitcmd structs to add as needed */
-
-typedef struct bitcmd {
-	char	cmd;
-	char	cmd2;
-	mode_t	bits;
-} BITCMD;
-
-#define	CMD2_CLR	0x01
-#define	CMD2_SET	0x02
-#define	CMD2_GBITS	0x04
-#define	CMD2_OBITS	0x08
-#define	CMD2_UBITS	0x10
-
-static BITCMD	*addcmd(BITCMD *, mode_t, mode_t, mode_t, mode_t);
-static void	 compress_mode(BITCMD *);
-#ifdef SETMODE_DEBUG
-static void	 dumpmode(BITCMD *);
-#endif
-
-/*
- * Given the old mode and an array of bitcmd structures, apply the operations
- * described in the bitcmd structures to the old mode, and return the new mode.
- * Note that there is no '=' command; a strict assignment is just a '-' (clear
- * bits) followed by a '+' (set bits).
- */
-mode_t
-getmode(const void *bbox, mode_t omode)
-{
-	const BITCMD *set;
-	mode_t clrval, newmode, value;
-
-	set = (const BITCMD *)bbox;
-	newmode = omode;
-	for (value = 0;; set++)
-		switch(set->cmd) {
-		/*
-		 * When copying the user, group or other bits around, we "know"
-		 * where the bits are in the mode so that we can do shifts to
-		 * copy them around.  If we don't use shifts, it gets real
-		 * grundgy with lots of single bit checks and bit sets.
-		 */
-		case 'u':
-			value = (newmode & S_IRWXU) >> 6;
-			goto common;
-
-		case 'g':
-			value = (newmode & S_IRWXG) >> 3;
-			goto common;
-
-		case 'o':
-			value = newmode & S_IRWXO;
-common:			if (set->cmd2 & CMD2_CLR) {
-				clrval =
-				    (set->cmd2 & CMD2_SET) ?  S_IRWXO : value;
-				if (set->cmd2 & CMD2_UBITS)
-					newmode &= ~((clrval<<6) & set->bits);
-				if (set->cmd2 & CMD2_GBITS)
-					newmode &= ~((clrval<<3) & set->bits);
-				if (set->cmd2 & CMD2_OBITS)
-					newmode &= ~(clrval & set->bits);
-			}
-			if (set->cmd2 & CMD2_SET) {
-				if (set->cmd2 & CMD2_UBITS)
-					newmode |= (value<<6) & set->bits;
-				if (set->cmd2 & CMD2_GBITS)
-					newmode |= (value<<3) & set->bits;
-				if (set->cmd2 & CMD2_OBITS)
-					newmode |= value & set->bits;
-			}
-			break;
-
-		case '+':
-			newmode |= set->bits;
-			break;
-
-		case '-':
-			newmode &= ~set->bits;
-			break;
-
-		case 'X':
-			if (omode & (S_IFDIR|S_IXUSR|S_IXGRP|S_IXOTH))
-				newmode |= set->bits;
-			break;
-
-		case '\0':
-		default:
-#ifdef SETMODE_DEBUG
-			(void)printf("getmode:%04o -> %04o\n", omode, newmode);
-#endif
-			return (newmode);
-		}
-}
-
-#define	ADDCMD(a, b, c, d)						\
-	if (set >= endset) {						\
-		BITCMD *newset;						\
-		setlen += SET_LEN_INCR;					\
-		newset = realloc(saveset, sizeof(BITCMD) * setlen);	\
-		if (newset == NULL)					\
-			goto out;					\
-		set = newset + (set - saveset);				\
-		saveset = newset;					\
-		endset = newset + (setlen - 2);				\
-	}								\
-	set = addcmd(set, (mode_t)(a), (mode_t)(b), (mode_t)(c), (d))
-
-#define	STANDARD_BITS	(S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO)
-
-void *
-setmode(const char *p)
-{
-	int serrno;
-	char op, *ep;
-	BITCMD *set, *saveset, *endset;
-	sigset_t sigset, sigoset;
-	mode_t mask, perm, permXbits, who;
-	long perml;
-	int equalopdone;
-	int setlen;
-
-	if (!*p) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/*
-	 * Get a copy of the mask for the permissions that are mask relative.
-	 * Flip the bits, we want what's not set.  Since it's possible that
-	 * the caller is opening files inside a signal handler, protect them
-	 * as best we can.
-	 */
-	sigfillset(&sigset);
-	(void)__libc_sigprocmask(SIG_BLOCK, &sigset, &sigoset);
-	(void)umask(mask = umask(0));
-	mask = ~mask;
-	(void)__libc_sigprocmask(SIG_SETMASK, &sigoset, NULL);
-
-	setlen = SET_LEN + 2;
-
-	if ((set = malloc((u_int)(sizeof(BITCMD) * setlen))) == NULL)
-		return (NULL);
-	saveset = set;
-	endset = set + (setlen - 2);
-
-	/*
-	 * If an absolute number, get it and return; disallow non-octal digits
-	 * or illegal bits.
-	 */
-	if (isdigit((unsigned char)*p)) {
-		errno = 0;
-		perml = strtol(p, &ep, 8);
-		if (*ep) {
-			errno = EINVAL;
-			goto out;
-		}
-		if (errno == ERANGE && (perml == LONG_MAX || perml == LONG_MIN))
-			goto out;
-		if (perml & ~(STANDARD_BITS|S_ISTXT)) {
-			errno = EINVAL;
-			goto out;
-		}
-		perm = (mode_t)perml;
-		ADDCMD('=', (STANDARD_BITS|S_ISTXT), perm, mask);
-		set->cmd = 0;
-		return (saveset);
-	}
-
-	/*
-	 * Build list of structures to set/clear/copy bits as described by
-	 * each clause of the symbolic mode.
-	 */
-	equalopdone = 0;
-	for (;;) {
-		/* First, find out which bits might be modified. */
-		for (who = 0;; ++p) {
-			switch (*p) {
-			case 'a':
-				who |= STANDARD_BITS;
-				break;
-			case 'u':
-				who |= S_ISUID|S_IRWXU;
-				break;
-			case 'g':
-				who |= S_ISGID|S_IRWXG;
-				break;
-			case 'o':
-				who |= S_IRWXO;
-				break;
-			default:
-				goto getop;
-			}
-		}
-
-getop:		if ((op = *p++) != '+' && op != '-' && op != '=') {
-			errno = EINVAL;
-			goto out;
-		}
-		if (op == '=')
-			equalopdone = 0;
-
-		who &= ~S_ISTXT;
-		for (perm = 0, permXbits = 0;; ++p) {
-			switch (*p) {
-			case 'r':
-				perm |= S_IRUSR|S_IRGRP|S_IROTH;
-				break;
-			case 's':
-				/* If only "other" bits ignore set-id. */
-				if (!who || who & ~S_IRWXO)
-					perm |= S_ISUID|S_ISGID;
-				break;
-			case 't':
-				/* If only "other" bits ignore sticky. */
-				if (!who || who & ~S_IRWXO) {
-					who |= S_ISTXT;
-					perm |= S_ISTXT;
-				}
-				break;
-			case 'w':
-				perm |= S_IWUSR|S_IWGRP|S_IWOTH;
-				break;
-			case 'X':
-				permXbits = S_IXUSR|S_IXGRP|S_IXOTH;
-				break;
-			case 'x':
-				perm |= S_IXUSR|S_IXGRP|S_IXOTH;
-				break;
-			case 'u':
-			case 'g':
-			case 'o':
-				/*
-				 * When ever we hit 'u', 'g', or 'o', we have
-				 * to flush out any partial mode that we have,
-				 * and then do the copying of the mode bits.
-				 */
-				if (perm) {
-					ADDCMD(op, who, perm, mask);
-					perm = 0;
-				}
-				if (op == '=')
-					equalopdone = 1;
-				if (op == '+' && permXbits) {
-					ADDCMD('X', who, permXbits, mask);
-					permXbits = 0;
-				}
-				ADDCMD(*p, who, op, mask);
-				break;
-
-			default:
-				/*
-				 * Add any permissions that we haven't already
-				 * done.
-				 */
-				if (perm || (op == '=' && !equalopdone)) {
-					if (op == '=')
-						equalopdone = 1;
-					ADDCMD(op, who, perm, mask);
-					perm = 0;
-				}
-				if (permXbits) {
-					ADDCMD('X', who, permXbits, mask);
-					permXbits = 0;
-				}
-				goto apply;
-			}
-		}
-
-apply:		if (!*p)
-			break;
-		if (*p != ',')
-			goto getop;
-		++p;
-	}
-	set->cmd = 0;
-#ifdef SETMODE_DEBUG
-	(void)printf("Before compress_mode()\n");
-	dumpmode(saveset);
-#endif
-	compress_mode(saveset);
-#ifdef SETMODE_DEBUG
-	(void)printf("After compress_mode()\n");
-	dumpmode(saveset);
-#endif
-	return (saveset);
-out:
-	serrno = errno;
-	free(saveset);
-	errno = serrno;
-	return NULL;
-}
-
-static BITCMD *
-addcmd(BITCMD *set, mode_t op, mode_t who, mode_t oparg, mode_t mask)
-{
-	switch (op) {
-	case '=':
-		set->cmd = '-';
-		set->bits = who ? who : STANDARD_BITS;
-		set++;
-
-		op = '+';
-		/* FALLTHROUGH */
-	case '+':
-	case '-':
-	case 'X':
-		set->cmd = op;
-		set->bits = (who ? who : mask) & oparg;
-		break;
-
-	case 'u':
-	case 'g':
-	case 'o':
-		set->cmd = op;
-		if (who) {
-			set->cmd2 = ((who & S_IRUSR) ? CMD2_UBITS : 0) |
-				    ((who & S_IRGRP) ? CMD2_GBITS : 0) |
-				    ((who & S_IROTH) ? CMD2_OBITS : 0);
-			set->bits = (mode_t)~0;
-		} else {
-			set->cmd2 = CMD2_UBITS | CMD2_GBITS | CMD2_OBITS;
-			set->bits = mask;
-		}
-
-		if (oparg == '+')
-			set->cmd2 |= CMD2_SET;
-		else if (oparg == '-')
-			set->cmd2 |= CMD2_CLR;
-		else if (oparg == '=')
-			set->cmd2 |= CMD2_SET|CMD2_CLR;
-		break;
-	}
-	return (set + 1);
-}
-
-#ifdef SETMODE_DEBUG
-static void
-dumpmode(BITCMD *set)
-{
-	for (; set->cmd; ++set)
-		(void)printf("cmd: '%c' bits %04o%s%s%s%s%s%s\n",
-		    set->cmd, set->bits, set->cmd2 ? " cmd2:" : "",
-		    set->cmd2 & CMD2_CLR ? " CLR" : "",
-		    set->cmd2 & CMD2_SET ? " SET" : "",
-		    set->cmd2 & CMD2_UBITS ? " UBITS" : "",
-		    set->cmd2 & CMD2_GBITS ? " GBITS" : "",
-		    set->cmd2 & CMD2_OBITS ? " OBITS" : "");
-}
-#endif
-
-/*
- * Given an array of bitcmd structures, compress by compacting consecutive
- * '+', '-' and 'X' commands into at most 3 commands, one of each.  The 'u',
- * 'g' and 'o' commands continue to be separate.  They could probably be
- * compacted, but it's not worth the effort.
- */
-static void
-compress_mode(BITCMD *set)
-{
-	BITCMD *nset;
-	int setbits, clrbits, Xbits, op;
-
-	for (nset = set;;) {
-		/* Copy over any 'u', 'g' and 'o' commands. */
-		while ((op = nset->cmd) != '+' && op != '-' && op != 'X') {
-			*set++ = *nset++;
-			if (!op)
-				return;
-		}
-
-		for (setbits = clrbits = Xbits = 0;; nset++) {
-			if ((op = nset->cmd) == '-') {
-				clrbits |= nset->bits;
-				setbits &= ~nset->bits;
-				Xbits &= ~nset->bits;
-			} else if (op == '+') {
-				setbits |= nset->bits;
-				clrbits &= ~nset->bits;
-				Xbits &= ~nset->bits;
-			} else if (op == 'X')
-				Xbits |= nset->bits & ~setbits;
-			else
-				break;
-		}
-		if (clrbits) {
-			set->cmd = '-';
-			set->cmd2 = 0;
-			set->bits = clrbits;
-			set++;
-		}
-		if (setbits) {
-			set->cmd = '+';
-			set->cmd2 = 0;
-			set->bits = setbits;
-			set++;
-		}
-		if (Xbits) {
-			set->cmd = 'X';
-			set->cmd2 = 0;
-			set->bits = Xbits;
-			set++;
-		}
-	}
-}
diff --git a/lib/libc_bsd/gen/setproctitle.3 b/lib/libc_bsd/gen/setproctitle.3
deleted file mode 100644
index a403b91..0000000
--- a/lib/libc_bsd/gen/setproctitle.3
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" Copyright (c) 1995 Peter Wemm <peter@FreeBSD.org>
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, is permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice immediately at the beginning of the file, without modification,
-.\"    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. This work was done expressly for inclusion into FreeBSD.  Other use
-.\"    is permitted provided this notation is included.
-.\" 4. Absolutely no warranty of function or purpose is made by the author
-.\"    Peter Wemm.
-.\" 5. Modifications may be freely made to this file providing the above
-.\"    conditions are met.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/setproctitle.3 208291 2010-05-19 08:57:53Z uqs $
-.\"
-.\" The following requests are required for all man pages.
-.Dd December 16, 1995
-.Dt SETPROCTITLE 3
-.Os
-.Sh NAME
-.Nm setproctitle
-.Nd set process title
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft void
-.Fn setproctitle "const char *fmt" "..."
-.Sh DESCRIPTION
-The
-.Fn setproctitle
-library routine sets the process title that appears on the
-.Xr ps 1
-command.
-.Pp
-The title is set from the executable's name, followed by the
-result of a
-.Xr printf 3
-style expansion of the arguments as specified by the
-.Va fmt
-argument.
-If the
-.Va fmt
-argument begins with a
-.Dq -
-character, the executable's name is skipped.
-.Pp
-If
-.Va fmt
-is NULL, the process title is restored.
-.Sh EXAMPLES
-To set the title on a daemon to indicate its activity:
-.Bd -literal -offset indent
-setproctitle("talking to %s", inet_ntoa(addr));
-.Ed
-.Sh SEE ALSO
-.Xr ps 1 ,
-.Xr w 1 ,
-.Xr kvm 3 ,
-.Xr kvm_getargv 3 ,
-.Xr printf 3
-.Sh STANDARDS
-The
-.Fn setproctitle
-function
-is implicitly non-standard.
-Other methods of causing the
-.Xr ps 1
-command line to change, including copying over the argv[0] string are
-also implicitly non-portable.
-It is preferable to use an operating system
-supplied
-.Fn setproctitle
-if present.
-.Pp
-Unfortunately, it is possible that there are other calling conventions
-to other versions of
-.Fn setproctitle ,
-although none have been found by the author as yet.
-This is believed to be
-the predominant convention.
-.Pp
-It is thought that the implementation is compatible with other systems,
-including
-.Nx
-and
-.Bsx .
-.Sh HISTORY
-The
-.Fn setproctitle
-function
-first appeared in
-.Fx 2.2 .
-Other operating systems have
-similar functions.
-.Sh AUTHORS
-.An -nosplit
-.An Peter Wemm Aq peter@FreeBSD.org
-stole the idea from the
-.Sy "Sendmail 8.7.3"
-source code by
-.An Eric Allman Aq eric@sendmail.org .
-.Sh BUGS
-Never pass a string with user-supplied data as a format without using
-.Ql %s .
-An attacker can put format specifiers in the string to mangle your stack,
-leading to a possible security hole.
-This holds true even if the string was built using a function like
-.Fn snprintf ,
-as the resulting string may still contain user-supplied conversion specifiers
-for later interpolation by
-.Fn setproctitle .
-.Pp
-Always use the proper secure idiom:
-.Pp
-.Dl setproctitle("%s", string);
diff --git a/lib/libc_bsd/gen/setproctitle.c b/lib/libc_bsd/gen/setproctitle.c
deleted file mode 100644
index 6260bd3..0000000
--- a/lib/libc_bsd/gen/setproctitle.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 1995 Peter Wemm <peter@freebsd.org>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, is permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice immediately at the beginning of the file, without modification,
- *    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. Absolutely no warranty of function or purpose is made by the author
- *    Peter Wemm.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/setproctitle.c 282409 2015-05-04 08:05:13Z kib $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/exec.h>
-#include <sys/sysctl.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-/*
- * Older FreeBSD 2.0, 2.1 and 2.2 had different ps_strings structures and
- * in different locations.
- * 1: old_ps_strings at the very top of the stack.
- * 2: old_ps_strings at SPARE_USRSPACE below the top of the stack.
- * 3: ps_strings at the very top of the stack.
- * We only support a kernel providing #3 style ps_strings.
- *
- * For historical purposes, a definition of the old ps_strings structure
- * and location is preserved below:
-struct old_ps_strings {
-	char	*old_ps_argvstr;
-	int	old_ps_nargvstr;
-	char	*old_ps_envstr;
-	int	old_ps_nenvstr;
-};
-#define	OLD_PS_STRINGS ((struct old_ps_strings *) \
-	(USRSTACK - SPARE_USRSPACE - sizeof(struct old_ps_strings)))
- */
-
-#include <stdarg.h>
-
-#define SPT_BUFSIZE 2048	/* from other parts of sendmail */
-
-void
-setproctitle(const char *fmt, ...)
-{
-	static struct ps_strings *ps_strings;
-	static char *buf = NULL;
-	static char *obuf = NULL;
-	static char **oargv, *kbuf;
-	static int oargc = -1;
-	static char *nargv[2] = { NULL, NULL };
-	char **nargvp;
-	int nargc;
-	int i;
-	va_list ap;
-	size_t len;
-	unsigned long ul_ps_strings;
-	int oid[4];
-
-	if (buf == NULL) {
-		buf = malloc(SPT_BUFSIZE);
-		if (buf == NULL) 
-			return;
-		nargv[0] = buf;
-	}
-
-	if (obuf == NULL ) {
-		obuf = malloc(SPT_BUFSIZE);
-		if (obuf == NULL)
-			return;
-		*obuf = '\0';
-	}
-
-	va_start(ap, fmt);
-
-	if (fmt) {
-		buf[SPT_BUFSIZE - 1] = '\0';
-
-		if (fmt[0] == '-') {
-			/* skip program name prefix */
-			fmt++;
-			len = 0;
-		} else {
-			/* print program name heading for grep */
-			(void)snprintf(buf, SPT_BUFSIZE, "%s: ", _getprogname());
-			len = strlen(buf);
-		}
-
-		/* print the argument string */
-		(void) vsnprintf(buf + len, SPT_BUFSIZE - len, fmt, ap);
-
-		nargvp = nargv;
-		nargc = 1;
-		kbuf = buf;
-	} else if (*obuf != '\0') {
-  		/* Idea from NetBSD - reset the title on fmt == NULL */
-		nargvp = oargv;
-		nargc = oargc;
-		kbuf = obuf;
-	} else
-		/* Nothing to restore */
-		return;
-
-	va_end(ap);
-
-	/* Set the title into the kernel cached command line */
-	oid[0] = CTL_KERN;
-	oid[1] = KERN_PROC;
-	oid[2] = KERN_PROC_ARGS;
-	oid[3] = getpid();
-	sysctl(oid, 4, 0, 0, kbuf, strlen(kbuf) + 1);
-
-	if (ps_strings == NULL) {
-		len = sizeof(ul_ps_strings);
-		if (sysctlbyname("kern.ps_strings", &ul_ps_strings, &len, NULL,
-		    0) == -1)
-			ul_ps_strings = PS_STRINGS;
-		ps_strings = (struct ps_strings *)ul_ps_strings;
-	}
-
-	/*
-	 * PS_STRINGS points to zeroed memory on a style #2 kernel.
-	 * Should not happen.
-	 */
-	if (ps_strings->ps_argvstr == NULL)
-		return;
-
-	/* style #3 */
-	if (oargc == -1) {
-		/* Record our original args */
-		oargc = ps_strings->ps_nargvstr;
-		oargv = ps_strings->ps_argvstr;
-		for (i = len = 0; i < oargc; i++) {
-			/*
-			 * The program may have scribbled into its
-			 * argv array, e.g., to remove some arguments.
-			 * If that has happened, break out before
-			 * trying to call strlen on a NULL pointer.
-			 */
-			if (oargv[i] == NULL) {
-				oargc = i;
-				break;
-			}
-			snprintf(obuf + len, SPT_BUFSIZE - len, "%s%s",
-			    len != 0 ? " " : "", oargv[i]);
-			if (len != 0)
-				len++;
-			len += strlen(oargv[i]);
-			if (len >= SPT_BUFSIZE)
-				break;
-		}
-	}
-	ps_strings->ps_nargvstr = nargc;
-	ps_strings->ps_argvstr = nargvp;
-}
diff --git a/lib/libc_bsd/gen/setprogname.c b/lib/libc_bsd/gen/setprogname.c
deleted file mode 100644
index c19dbc7..0000000
--- a/lib/libc_bsd/gen/setprogname.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/setprogname.c 93399 2002-03-29 22:43:43Z markm $");
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "libc_private.h"
-
-void
-setprogname(const char *progname)
-{
-	const char *p;
-
-	p = strrchr(progname, '/');
-	if (p != NULL)
-		__progname = p + 1;
-	else
-		__progname = progname;
-}
diff --git a/lib/libc_bsd/gen/siginterrupt.3 b/lib/libc_bsd/gen/siginterrupt.3
deleted file mode 100644
index efd82db..0000000
--- a/lib/libc_bsd/gen/siginterrupt.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\" Copyright (c) 1985, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)siginterrupt.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/siginterrupt.3 207735 2010-05-06 22:49:54Z jilles $
-.\"
-.Dd June 4, 1993
-.Dt SIGINTERRUPT 3
-.Os
-.Sh NAME
-.Nm siginterrupt
-.Nd allow signals to interrupt system calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn siginterrupt "int sig" "int flag"
-.Sh DESCRIPTION
-The
-.Fn siginterrupt
-function
-is used to change the system call restart
-behavior when a system call is interrupted by the specified signal.
-If the flag is false (0), then system calls will be restarted if
-they are interrupted by the specified signal
-and no data has been transferred yet.
-System call restart has been the default behavior since
-.Bx 4.2 ,
-and is the default behaviour for
-.Xr signal 3
-on
-.Fx .
-.Pp
-If the flag is true (1),
-then restarting of system calls is disabled.
-If a system call is interrupted by the specified signal
-and no data has been transferred,
-the system call will return \-1 with the global variable
-.Va errno
-set to
-.Er EINTR .
-Interrupted system calls that have started transferring
-data will return the amount of data actually transferred.
-System call interrupt is the signal behavior found on
-.Bx 4.1
-and
-.At V
-systems.
-.Pp
-Note that the new
-.Bx 4.2
-signal handling semantics are not
-altered in any other way.
-Most notably, signal handlers always remain installed until
-explicitly changed by a subsequent
-.Xr sigaction 2
-call, and the signal mask operates as documented in
-.Xr sigaction 2 .
-Programs may switch between restartable and interruptible
-system call operation as often as desired in the execution of a program.
-.Pp
-Issuing a
-.Fn siginterrupt 3
-call during the execution of a signal handler will cause
-the new action to take place on the next signal to be caught.
-.Sh NOTES
-This library routine uses an extension of the
-.Xr sigaction 2
-system call that is not available in
-.Bx 4.2 ,
-hence it should not be used if backward compatibility is needed.
-.Sh RETURN VALUES
-.Rv -std siginterrupt
-.Sh ERRORS
-The
-.Fn siginterrupt
-call fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sig
-argument
-is not a valid signal number.
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr signal 3
-.Sh HISTORY
-The
-.Fn siginterrupt
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libc_bsd/gen/siginterrupt.c b/lib/libc_bsd/gen/siginterrupt.c
deleted file mode 100644
index 94b25de..0000000
--- a/lib/libc_bsd/gen/siginterrupt.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)siginterrupt.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/siginterrupt.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <signal.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-/*
- * Set signal state to prevent restart of system calls
- * after an instance of the indicated signal.
- */
-int
-siginterrupt(int sig, int flag)
-{
-	extern sigset_t _sigintr __hidden;
-	struct sigaction sa;
-	int ret;
-
-	if ((ret = __libc_sigaction(sig, (struct sigaction *)0, &sa)) < 0)
-		return (ret);
-	if (flag) {
-		sigaddset(&_sigintr, sig);
-		sa.sa_flags &= ~SA_RESTART;
-	} else {
-		sigdelset(&_sigintr, sig);
-		sa.sa_flags |= SA_RESTART;
-	}
-	return (__libc_sigaction(sig, &sa, (struct sigaction *)0));
-}
diff --git a/lib/libc_bsd/gen/siglist.c b/lib/libc_bsd/gen/siglist.c
deleted file mode 100644
index cfc3bf7..0000000
--- a/lib/libc_bsd/gen/siglist.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)siglist.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/siglist.c 218285 2011-02-04 16:40:50Z jilles $");
-
-#include <signal.h>
-
-const char *const sys_signame[NSIG] = {
-	"Signal 0",
-	"HUP",				/* SIGHUP */
-	"INT",				/* SIGINT */
-	"QUIT",				/* SIGQUIT */
-	"ILL",				/* SIGILL */
-	"TRAP",				/* SIGTRAP */
-	"ABRT",				/* SIGABRT */
-	"EMT",				/* SIGEMT */
-	"FPE",				/* SIGFPE */
-	"KILL",				/* SIGKILL */
-	"BUS",				/* SIGBUS */
-	"SEGV",				/* SIGSEGV */
-	"SYS",				/* SIGSYS */
-	"PIPE",				/* SIGPIPE */
-	"ALRM",				/* SIGALRM */
-	"TERM",				/* SIGTERM */
-	"URG",				/* SIGURG */
-	"STOP",				/* SIGSTOP */
-	"TSTP",				/* SIGTSTP */
-	"CONT",				/* SIGCONT */
-	"CHLD",				/* SIGCHLD */
-	"TTIN",				/* SIGTTIN */
-	"TTOU",				/* SIGTTOU */
-	"IO",				/* SIGIO */
-	"XCPU",				/* SIGXCPU */
-	"XFSZ",				/* SIGXFSZ */
-	"VTALRM",			/* SIGVTALRM */
-	"PROF",				/* SIGPROF */
-	"WINCH",			/* SIGWINCH */
-	"INFO",				/* SIGINFO */
-	"USR1",				/* SIGUSR1 */
-	"USR2"				/* SIGUSR2 */
-};
-
-const char *const sys_siglist[NSIG] = {
-	"Signal 0",
-	"Hangup",			/* SIGHUP */
-	"Interrupt",			/* SIGINT */
-	"Quit",				/* SIGQUIT */
-	"Illegal instruction",		/* SIGILL */
-	"Trace/BPT trap",		/* SIGTRAP */
-	"Abort trap",			/* SIGABRT */
-	"EMT trap",			/* SIGEMT */
-	"Floating point exception",	/* SIGFPE */
-	"Killed",			/* SIGKILL */
-	"Bus error",			/* SIGBUS */
-	"Segmentation fault",		/* SIGSEGV */
-	"Bad system call",		/* SIGSYS */
-	"Broken pipe",			/* SIGPIPE */
-	"Alarm clock",			/* SIGALRM */
-	"Terminated",			/* SIGTERM */
-	"Urgent I/O condition",		/* SIGURG */
-	"Suspended (signal)",		/* SIGSTOP */
-	"Suspended",			/* SIGTSTP */
-	"Continued",			/* SIGCONT */
-	"Child exited",			/* SIGCHLD */
-	"Stopped (tty input)",		/* SIGTTIN */
-	"Stopped (tty output)",		/* SIGTTOU */
-	"I/O possible",			/* SIGIO */
-	"Cputime limit exceeded",	/* SIGXCPU */
-	"Filesize limit exceeded",	/* SIGXFSZ */
-	"Virtual timer expired",	/* SIGVTALRM */
-	"Profiling timer expired",	/* SIGPROF */
-	"Window size changes",		/* SIGWINCH */
-	"Information request",		/* SIGINFO */
-	"User defined signal 1",	/* SIGUSR1 */
-	"User defined signal 2"		/* SIGUSR2 */
-};
-const int sys_nsig = sizeof(sys_siglist) / sizeof(sys_siglist[0]);
diff --git a/lib/libc_bsd/gen/signal.3 b/lib/libc_bsd/gen/signal.3
deleted file mode 100644
index c7207fd..0000000
--- a/lib/libc_bsd/gen/signal.3
+++ /dev/null
@@ -1,272 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)signal.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/signal.3 255171 2013-09-03 08:19:06Z rwatson $
-.\"
-.Dd June 7, 2004
-.Dt SIGNAL 3
-.Os
-.Sh NAME
-.Nm signal
-.Nd simplified software signal facilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.\" The following is Quite Ugly, but syntactically correct.
-.\" Don't try to fix it.
-.Ft void
-.Fn \*(lp*signal "int sig" "void \*(lp*func\*(rp\*(lpint\*(rp\*(rp\*(rp\*(lpint"
-.Pp
-or in
-.Fx Ap s
-equivalent but easier to read typedef'd version:
-.Ft typedef "void \*(lp*sig_t\*(rp \*(lpint\*(rp" ;
-.Pp
-.Ft sig_t
-.Fn signal "int sig" "sig_t func"
-.Sh DESCRIPTION
-This
-.Fn signal
-facility
-is a simplified interface to the more general
-.Xr sigaction 2
-facility.
-.Pp
-Signals allow the manipulation of a process from outside its
-domain as well as allowing the process to manipulate itself or
-copies of itself (children).
-There are two general types of signals:
-those that cause termination of a process and those that do not.
-Signals which cause termination of a program might result from
-an irrecoverable error or might be the result of a user at a terminal
-typing the `interrupt' character.
-Signals are used when a process is stopped because it wishes to access
-its control terminal while in the background (see
-.Xr tty 4 ) .
-Signals are optionally generated
-when a process resumes after being stopped,
-when the status of child processes changes,
-or when input is ready at the control terminal.
-Most signals result in the termination of the process receiving them
-if no action
-is taken; some signals instead cause the process receiving them
-to be stopped, or are simply discarded if the process has not
-requested otherwise.
-Except for the
-.Dv SIGKILL
-and
-.Dv SIGSTOP
-signals, the
-.Fn signal
-function allows for a signal to be caught, to be ignored, or to generate
-an interrupt.
-These signals are defined in the file
-.In signal.h :
-.Bl -column No ".Dv SIGVTALRM" "create core image"
-.It Sy "Num" Ta Sy "Name" Ta Sy "Default Action" Ta Sy "Description"
-.It 1 Ta Dv SIGHUP Ta "terminate process" Ta "terminal line hangup"
-.It 2 Ta Dv SIGINT Ta "terminate process" Ta "interrupt program"
-.It 3 Ta Dv SIGQUIT Ta "create core image" Ta "quit program"
-.It 4 Ta Dv SIGILL Ta "create core image" Ta "illegal instruction"
-.It 5 Ta Dv SIGTRAP Ta "create core image" Ta "trace trap"
-.It 6 Ta Dv SIGABRT Ta "create core image" Ta "abort program"
-(formerly
-.Dv SIGIOT )
-.It 7 Ta Dv SIGEMT Ta "create core image" Ta "emulate instruction executed"
-.It 8 Ta Dv SIGFPE Ta "create core image" Ta "floating-point exception"
-.It 9 Ta Dv SIGKILL Ta "terminate process" Ta "kill program"
-.It 10 Ta Dv SIGBUS Ta "create core image" Ta "bus error"
-.It 11 Ta Dv SIGSEGV Ta "create core image" Ta "segmentation violation"
-.It 12 Ta Dv SIGSYS Ta "create core image" Ta "non-existent system call invoked"
-.It 13 Ta Dv SIGPIPE Ta "terminate process" Ta "write on a pipe with no reader"
-.It 14 Ta Dv SIGALRM Ta "terminate process" Ta "real-time timer expired"
-.It 15 Ta Dv SIGTERM Ta "terminate process" Ta "software termination signal"
-.It 16 Ta Dv SIGURG Ta "discard signal" Ta "urgent condition present on socket"
-.It 17 Ta Dv SIGSTOP Ta "stop process" Ta "stop (cannot be caught or ignored)"
-.It 18 Ta Dv SIGTSTP Ta "stop process" Ta "stop signal generated from keyboard"
-.It 19 Ta Dv SIGCONT Ta "discard signal" Ta "continue after stop"
-.It 20 Ta Dv SIGCHLD Ta "discard signal" Ta "child status has changed"
-.It 21 Ta Dv SIGTTIN Ta "stop process" Ta "background read attempted from"
-control terminal
-.It 22 Ta Dv SIGTTOU Ta "stop process" Ta "background write attempted to"
-control terminal
-.It 23 Ta Dv SIGIO Ta "discard signal" Ta Tn "I/O"
-is possible on a descriptor (see
-.Xr fcntl 2 )
-.It 24 Ta Dv SIGXCPU Ta "terminate process" Ta "cpu time limit exceeded (see"
-.Xr setrlimit 2 )
-.It 25 Ta Dv SIGXFSZ Ta "terminate process" Ta "file size limit exceeded (see"
-.Xr setrlimit 2 )
-.It 26 Ta Dv SIGVTALRM Ta "terminate process" Ta "virtual time alarm (see"
-.Xr setitimer 2 )
-.It 27 Ta Dv SIGPROF Ta "terminate process" Ta "profiling timer alarm (see"
-.Xr setitimer 2 )
-.It 28 Ta Dv SIGWINCH Ta "discard signal" Ta "Window size change"
-.It 29 Ta Dv SIGINFO Ta "discard signal" Ta "status request from keyboard"
-.It 30 Ta Dv SIGUSR1 Ta "terminate process" Ta "User defined signal 1"
-.It 31 Ta Dv SIGUSR2 Ta "terminate process" Ta "User defined signal 2"
-.It 32 Ta Dv SIGTHR Ta "terminate process" Ta "thread interrupt"
-.It 33 Ta Dv SIGLIBRT Ta "terminate process" Ta "real-time library interrupt"
-.El
-.Pp
-The
-.Fa sig
-argument specifies which signal was received.
-The
-.Fa func
-procedure allows a user to choose the action upon receipt of a signal.
-To set the default action of the signal to occur as listed above,
-.Fa func
-should be
-.Dv SIG_DFL .
-A
-.Dv SIG_DFL
-resets the default action.
-To ignore the signal
-.Fa func
-should be
-.Dv SIG_IGN .
-This will cause subsequent instances of the signal to be ignored
-and pending instances to be discarded.
-If
-.Dv SIG_IGN
-is not used,
-further occurrences of the signal are
-automatically blocked and
-.Fa func
-is called.
-.Pp
-The handled signal is unblocked when the
-function returns and
-the process continues from where it left off when the signal occurred.
-.Bf -symbolic
-Unlike previous signal facilities, the handler
-func() remains installed after a signal has been delivered.
-.Ef
-.Pp
-For some system calls, if a signal is caught while the call is
-executing and the call is prematurely terminated,
-the call is automatically restarted.
-Any handler installed with
-.Xr signal 3
-will have the
-.Dv SA_RESTART
-flag set, meaning that any restartable system call will not return on
-receipt of a signal.
-The affected system calls include
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr sendto 2 ,
-.Xr recvfrom 2 ,
-.Xr sendmsg 2
-and
-.Xr recvmsg 2
-on a communications channel or a low speed device
-and during a
-.Xr ioctl 2
-or
-.Xr wait 2 .
-However, calls that have already committed are not restarted,
-but instead return a partial success (for example, a short read count).
-These semantics could be changed with
-.Xr siginterrupt 3 .
-.Pp
-When a process which has installed signal handlers forks,
-the child process inherits the signals.
-All caught signals may be reset to their default action by a call
-to the
-.Xr execve 2
-function;
-ignored signals remain ignored.
-.Pp
-If a process explicitly specifies
-.Dv SIG_IGN
-as the action for the signal
-.Dv SIGCHLD ,
-the system will not create zombie processes when children
-of the calling process exit.
-As a consequence, the system will discard the exit status
-from the child processes.
-If the calling process subsequently issues a call to
-.Xr wait 2
-or equivalent, it will block until all of the calling process's
-children terminate, and then return a value of \-1 with
-.Va errno
-set to
-.Er ECHILD .
-.Pp
-See
-.Xr sigaction 2
-for a list of functions
-that are considered safe for use in signal handlers.
-.Sh RETURN VALUES
-The previous action is returned on a successful call.
-Otherwise, SIG_ERR is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn signal
-function
-will fail and no action will take place if one of the
-following occur:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sig
-argument
-is not a valid signal number.
-.It Bq Er EINVAL
-An attempt is made to ignore or supply a handler for
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-.El
-.Sh SEE ALSO
-.Xr kill 1 ,
-.Xr kill 2 ,
-.Xr ptrace 2 ,
-.Xr sigaction 2 ,
-.Xr sigaltstack 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr wait 2 ,
-.Xr fpsetmask 3 ,
-.Xr setjmp 3 ,
-.Xr siginterrupt 3 ,
-.Xr tty 4
-.Sh HISTORY
-The
-.Nm
-facility appeared in
-.Bx 4.0 .
-The option to avoid the creation of child zombies through ignoring
-.Dv SIGCHLD
-appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/gen/signal.c b/lib/libc_bsd/gen/signal.c
deleted file mode 100644
index 6527f2a..0000000
--- a/lib/libc_bsd/gen/signal.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)signal.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/signal.c 287872 2015-09-16 20:59:41Z delphij $");
-
-/*
- * Almost backwards compatible signal.
- */
-#include "namespace.h"
-#include <signal.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-sigset_t _sigintr __hidden;	/* shared with siginterrupt */
-
-sig_t
-signal(int s, sig_t a)
-{
-	struct sigaction sa, osa;
-
-	sa.sa_handler = a;
-	sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	if (!sigismember(&_sigintr, s))
-		sa.sa_flags |= SA_RESTART;
-	if (__libc_sigaction(s, &sa, &osa) < 0)
-		return (SIG_ERR);
-	return (osa.sa_handler);
-}
diff --git a/lib/libc_bsd/gen/sigsetops.3 b/lib/libc_bsd/gen/sigsetops.3
deleted file mode 100644
index c294616..0000000
--- a/lib/libc_bsd/gen/sigsetops.3
+++ /dev/null
@@ -1,117 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)sigsetops.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/sigsetops.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd December 16, 2004
-.Dt SIGSETOPS 3
-.Os
-.Sh NAME
-.Nm sigemptyset ,
-.Nm sigfillset ,
-.Nm sigaddset ,
-.Nm sigdelset ,
-.Nm sigismember
-.Nd manipulate signal sets
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigemptyset "sigset_t *set"
-.Ft int
-.Fn sigfillset "sigset_t *set"
-.Ft int
-.Fn sigaddset "sigset_t *set" "int signo"
-.Ft int
-.Fn sigdelset "sigset_t *set" "int signo"
-.Ft int
-.Fn sigismember "const sigset_t *set" "int signo"
-.Sh DESCRIPTION
-These functions manipulate signal sets stored in a
-.Fa sigset_t .
-Either
-.Fn sigemptyset
-or
-.Fn sigfillset
-must be called for every object of type
-.Fa sigset_t
-before any other use of the object.
-.Pp
-The
-.Fn sigemptyset
-function initializes a signal set to be empty.
-.Pp
-The
-.Fn sigfillset
-function initializes a signal set to contain all signals.
-.Pp
-The
-.Fn sigaddset
-function adds the specified signal
-.Fa signo
-to the signal set.
-.Pp
-The
-.Fn sigdelset
-function deletes the specified signal
-.Fa signo
-from the signal set.
-.Pp
-The
-.Fn sigismember
-function returns whether a specified signal
-.Fa signo
-is contained in the signal set.
-.Sh RETURN VALUES
-The
-.Fn sigismember
-function returns 1
-if the signal is a member of the set,
-0 otherwise.
-The other functions return 0 upon success.
-A \-1 return value
-indicates an error occurred and the global variable
-.Va errno
-is set to indicate the reason.
-.Sh ERRORS
-These functions could fail if one of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-.Fa signo
-has an invalid value.
-.El
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigpending 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2
-.Sh STANDARDS
-These functions are defined by
-.St -p1003.1-88 .
diff --git a/lib/libc_bsd/gen/sigsetops.c b/lib/libc_bsd/gen/sigsetops.c
deleted file mode 100644
index f6cc536..0000000
--- a/lib/libc_bsd/gen/sigsetops.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- * 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.
- *
- *	@(#)sigsetops.c	8.1 (Berkeley) 6/4/93
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sigsetops.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/sigsetops.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <errno.h>
-#include <signal.h>
-
-int
-sigaddset(set, signo)
-	sigset_t *set;
-	int signo;
-{
-
-	if (signo <= 0 || signo > _SIG_MAXSIG) {
-		errno = EINVAL;
-		return (-1);
-	}
-	set->__bits[_SIG_WORD(signo)] |= _SIG_BIT(signo);
-	return (0);
-}
-
-int
-sigdelset(set, signo)
-	sigset_t *set;
-	int signo;
-{
-
-	if (signo <= 0 || signo > _SIG_MAXSIG) {
-		errno = EINVAL;
-		return (-1);
-	}
-	set->__bits[_SIG_WORD(signo)] &= ~_SIG_BIT(signo);
-	return (0);
-}
-
-int
-sigemptyset(set)
-	sigset_t *set;
-{
-	int i;
-
-	for (i = 0; i < _SIG_WORDS; i++)
-		set->__bits[i] = 0;
-	return (0);
-}
-
-int
-sigfillset(set)
-	sigset_t *set;
-{
-	int i;
-
-	for (i = 0; i < _SIG_WORDS; i++)
-		set->__bits[i] = ~0U;
-	return (0);
-}
-
-int
-sigismember(set, signo)
-	const sigset_t *set;
-	int signo;
-{
-
-	if (signo <= 0 || signo > _SIG_MAXSIG) {
-		errno = EINVAL;
-		return (-1);
-	}
-	return ((set->__bits[_SIG_WORD(signo)] & _SIG_BIT(signo)) ? 1 : 0);
-}
diff --git a/lib/libc_bsd/gen/sleep.3 b/lib/libc_bsd/gen/sleep.3
deleted file mode 100644
index 38292fb..0000000
--- a/lib/libc_bsd/gen/sleep.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" Copyright (c) 1986, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/sleep.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd February 13, 1998
-.Dt SLEEP 3
-.Os
-.Sh NAME
-.Nm sleep
-.Nd suspend process execution for an interval measured in seconds
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft unsigned int
-.Fn sleep "unsigned int seconds"
-.Sh DESCRIPTION
-The
-.Fn sleep
-function suspends execution of the calling process until either
-.Fa seconds
-seconds have elapsed or a signal is delivered to the process and its
-action is to invoke a signal-catching function or to terminate the
-process.
-System activity may lengthen the sleep by an indeterminate amount.
-.Pp
-This function is implemented using
-.Xr nanosleep 2
-by pausing for
-.Fa seconds
-seconds or until a signal occurs.
-Consequently, in this implementation,
-sleeping has no effect on the state of process timers,
-and there is no special handling for SIGALRM.
-.Sh RETURN VALUES
-If the
-.Fn sleep
-function returns because the requested time has elapsed, the value
-returned will be zero.
-If the
-.Fn sleep
-function returns due to the delivery of a signal, the value returned
-will be the unslept amount (the requested time minus the time actually
-slept) in seconds.
-.Sh SEE ALSO
-.Xr nanosleep 2 ,
-.Xr usleep 3
-.Sh STANDARDS
-The
-.Fn sleep
-function conforms to
-.St -p1003.1-90 .
-.Sh HISTORY
-A
-.Fn sleep
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/gen/sleep.c b/lib/libc_bsd/gen/sleep.c
deleted file mode 100644
index 4e78ebc..0000000
--- a/lib/libc_bsd/gen/sleep.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sleep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/sleep.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <time.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-unsigned int
-__sleep(unsigned int seconds)
-{
-	struct timespec time_to_sleep;
-	struct timespec time_remaining;
-
-	/*
-	 * Avoid overflow when `seconds' is huge.  This assumes that
-	 * the maximum value for a time_t is >= INT_MAX.
-	 */
-	if (seconds > INT_MAX)
-		return (seconds - INT_MAX + __sleep(INT_MAX));
-
-	time_to_sleep.tv_sec = seconds;
-	time_to_sleep.tv_nsec = 0;
-	if (((int (*)(const struct timespec *, struct timespec *))
-	    __libc_interposing[INTERPOS_nanosleep])(
-	    &time_to_sleep, &time_remaining) != -1)
-		return (0);
-	if (errno != EINTR)
-		return (seconds);		/* best guess */
-	return (time_remaining.tv_sec +
-	    (time_remaining.tv_nsec != 0)); /* round up */
-}
-
-__weak_reference(__sleep, sleep);
-__weak_reference(__sleep, _sleep);
diff --git a/lib/libc_bsd/gen/srand48.c b/lib/libc_bsd/gen/srand48.c
deleted file mode 100644
index fd369a0..0000000
--- a/lib/libc_bsd/gen/srand48.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 1993 Martin Birgmeier
- * All rights reserved.
- *
- * You may redistribute unmodified or modified versions of this source
- * code provided that the above copyright notice and this and the
- * following conditions are retained.
- *
- * This software is provided ``as is'', and comes with no warranties
- * of any kind. I shall in no event be liable for anything that happens
- * to anyone/anything when using this software.
- */
-
-#include "rand48.h"
-
-extern unsigned short _rand48_seed[3];
-extern unsigned short _rand48_mult[3];
-extern unsigned short _rand48_add;
-
-void
-srand48(long seed)
-{
-	_rand48_seed[0] = RAND48_SEED_0;
-	_rand48_seed[1] = (unsigned short) seed;
-	_rand48_seed[2] = (unsigned short) (seed >> 16);
-	_rand48_mult[0] = RAND48_MULT_0;
-	_rand48_mult[1] = RAND48_MULT_1;
-	_rand48_mult[2] = RAND48_MULT_2;
-	_rand48_add = RAND48_ADD;
-}
diff --git a/lib/libc_bsd/gen/statvfs.3 b/lib/libc_bsd/gen/statvfs.3
deleted file mode 100644
index 9dea194..0000000
--- a/lib/libc_bsd/gen/statvfs.3
+++ /dev/null
@@ -1,187 +0,0 @@
-.\"
-.\" Copyright 2002 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. 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: releng/10.2/lib/libc/gen/statvfs.3 116021 2003-06-08 10:01:52Z charnier $
-.\"
-.Dd July 13, 2002
-.Dt STATVFS 3
-.Os
-.Sh NAME
-.Nm statvfs ,
-.Nm fstatvfs
-.Nd retrieve file system information
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/statvfs.h
-.Ft int
-.Fn statvfs "const char * restrict path" "struct statvfs * restrict buf"
-.Ft int
-.Fn fstatvfs "int fd" "struct statvfs *buf"
-.Sh DESCRIPTION
-The
-.Fn statvfs
-and
-.Fn fstatvfs
-functions fill the structure pointed to by
-.Fa buf
-with garbage.
-This garbage will occasionally bear resemblance to file system
-statistics, but portable applications must not depend on this.
-Applications must pass a pathname or file descriptor which refers to a
-file on the file system in which they are interested.
-.Pp
-The
-.Vt statvfs
-structure contains the following members:
-.Bl -tag -offset indent -width ".Va f_namemax"
-.It Va f_namemax
-The maximum length in bytes of a file name on this file system.
-Applications should use
-.Xr pathconf 2
-instead.
-.It Va f_fsid
-Not meaningful in this implementation.
-.It Va f_frsize
-The size in bytes of the minimum unit of allocation on this
-file system.
-(This corresponds to the
-.Va f_bsize
-member of
-.Vt "struct statfs" . )
-.It Va f_bsize
-The preferred length of I/O requests for files on this file system.
-(Corresponds to the
-.Va f_iosize
-member of
-.Vt "struct statfs" . )
-.It Va f_flag
-Flags describing mount options for this file system; see below.
-.El
-.Pp
-In addition, there are three members of type
-.Vt fsfilcnt_t ,
-which represent counts of file serial numbers
-.Em ( i.e. ,
-inodes); these are named
-.Va f_files , f_favail ,
-and
-.Va f_ffree ,
-and represent the number of file serial numbers which exist in total,
-are available to unprivileged processes, and are available to
-privileged processes, respectively.
-Likewise, the members
-.Va f_blocks , f_bavail ,
-and
-.Va f_bfree
-(all of type
-.Vt fsblkcnt_t )
-represent the respective allocation-block counts.
-.Pp
-There are two flags defined for the
-.Va f_flag
-member:
-.Bl -tag -offset indent -width ".Dv ST_NOSUID"
-.It Dv ST_RDONLY
-The file system is mounted read-only.
-.It Dv ST_NOSUID
-The semantics of the
-.Dv S_ISUID
-and
-.Dv S_ISGID
-file mode bits
-are not supported by, or are disabled on, this file system.
-.El
-.Sh IMPLEMENTATION NOTES
-The
-.Fn statvfs
-and
-.Fn fstatvfs
-functions are implemented as wrappers around the
-.Fn statfs
-and
-.Fn fstatfs
-functions, respectively.
-Not all the information provided by those functions is made available
-through this interface.
-.Sh RETURN VALUES
-.Rv -std statvfs fstatvfs
-.Sh ERRORS
-The
-.Fn statvfs
-and
-.Fn fstatvfs
-functions may fail for any of the reasons documented for
-.Xr statfs 2
-or
-.Xr fstatfs 2
-and
-.Xr pathconf 2
-or
-.Xr fpathconf 2 ,
-respectively.
-In addition,
-.Fn statvfs
-and
-.Fn fstatvfs
-functions may also fail for the following reason:
-.Bl -tag -width Er
-.It Bq Er EOVERFLOW
-One or more of the file system statistics has a value which cannot be
-represented by the data types used in
-.Vt "struct statvfs" .
-.El
-.Sh SEE ALSO
-.Xr pathconf 2 ,
-.Xr statfs 2
-.Sh STANDARDS
-The
-.Fn statvfs
-and
-.Fn fstatvfs
-functions conform to
-.St -p1003.1-2001 .
-As standardized, portable applications cannot depend on these functions
-returning any valid information at all.
-This implementation attempts to provide as much useful information as
-is provided by the underlying file system, subject to the limitations
-of the specified data types.
-.Sh HISTORY
-The
-.Fn statvfs
-and
-.Fn fstatvfs
-functions first appeared in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn statvfs
-and
-.Fn fstatvfs
-functions and this manual page were written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .
diff --git a/lib/libc_bsd/gen/statvfs.c b/lib/libc_bsd/gen/statvfs.c
deleted file mode 100644
index 64d13dc..0000000
--- a/lib/libc_bsd/gen/statvfs.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2002 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/statvfs.c 103012 2002-09-06 11:24:06Z tjr $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/statvfs.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-static int	sfs2svfs(const struct statfs *from, struct statvfs *to);
-
-int
-fstatvfs(int fd, struct statvfs *result)
-{
-	struct statfs sfs;
-	int rv;
-	long pcval;
-
-	rv = _fstatfs(fd, &sfs);
-	if (rv != 0)
-		return (rv);
-
-	rv = sfs2svfs(&sfs, result);
-	if (rv != 0)
-		return (rv);
-
-	/*
-	 * Whether pathconf's -1 return means error or unlimited does not
-	 * make any difference in this best-effort implementation.
-	 */
-	pcval = _fpathconf(fd, _PC_NAME_MAX);
-	if (pcval == -1)
-		result->f_namemax = ~0UL;
-	else
-		result->f_namemax = (unsigned long)pcval;
-	return (0);
-}
-
-int
-statvfs(const char * __restrict path, struct statvfs * __restrict result)
-{
-	struct statfs sfs;
-	int rv;
-	long pcval;
-
-	rv = statfs(path, &sfs);
-	if (rv != 0)
-		return (rv);
-
-	sfs2svfs(&sfs, result);
-
-	/*
-	 * Whether pathconf's -1 return means error or unlimited does not
-	 * make any difference in this best-effort implementation.
-	 */
-	pcval = pathconf(path, _PC_NAME_MAX);
-	if (pcval == -1)
-		result->f_namemax = ~0UL;
-	else
-		result->f_namemax = (unsigned long)pcval;
-	return (0);
-}
-
-static int
-sfs2svfs(const struct statfs *from, struct statvfs *to)
-{
-	static const struct statvfs zvfs;
-
-	*to = zvfs;
-
-	if (from->f_flags & MNT_RDONLY)
-		to->f_flag |= ST_RDONLY;
-	if (from->f_flags & MNT_NOSUID)
-		to->f_flag |= ST_NOSUID;
-
-	/* XXX should we clamp negative values? */
-#define COPY(field) \
-	do { \
-		to->field = from->field; \
-		if (from->field != to->field) { \
-			errno = EOVERFLOW; \
-			return (-1); \
-		} \
-	} while(0)
-
-	COPY(f_bavail);
-	COPY(f_bfree);
-	COPY(f_blocks);
-	COPY(f_ffree);
-	COPY(f_files);
-	to->f_bsize = from->f_iosize;
-	to->f_frsize = from->f_bsize;
-	to->f_favail = to->f_ffree;
-	return (0);
-}
-								 
-#ifdef MAIN
-#include <err.h>
-#include <stdint.h>
-#include <stdio.h>
-
-int
-main(int argc, char **argv)
-{
-	struct statvfs buf;
-
-	if (statvfs(argv[1], &buf) < 0)
-		err(1, "statvfs");
-
-#define SHOW(field) \
-	printf(#field ": %ju\n", (uintmax_t)buf.field)
-
-	SHOW(f_bavail);
-	SHOW(f_bfree);
-	SHOW(f_blocks);
-	SHOW(f_favail);
-	SHOW(f_ffree);
-	SHOW(f_files);
-	SHOW(f_bsize);
-	SHOW(f_frsize);
-	SHOW(f_namemax);
-	printf("f_flag: %lx\n", (unsigned long)buf.f_flag);
-
-	return 0;
-}
-
-#endif /* MAIN */
diff --git a/lib/libc_bsd/gen/stringlist.3 b/lib/libc_bsd/gen/stringlist.3
deleted file mode 100644
index fd6ce3e..0000000
--- a/lib/libc_bsd/gen/stringlist.3
+++ /dev/null
@@ -1,127 +0,0 @@
-.\"	$NetBSD: stringlist.3,v 1.5 1999/03/22 19:44:46 garbled Exp $
-.\"
-.\" Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This file was contributed to The NetBSD Foundation by Luke Mewburn.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/stringlist.3 249802 2013-04-23 13:03:03Z eadler $
-.\"
-.Dd November 28, 1999
-.Dt STRINGLIST 3
-.Os
-.Sh NAME
-.Nm stringlist ,
-.Nm sl_init ,
-.Nm sl_add ,
-.Nm sl_free ,
-.Nm sl_find
-.Nd stringlist manipulation functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stringlist.h
-.Ft StringList *
-.Fn sl_init
-.Ft int
-.Fn sl_add "StringList *sl" "char *item"
-.Ft void
-.Fn sl_free "StringList *sl" "int freeall"
-.Ft char *
-.Fn sl_find "StringList *sl" "const char *item"
-.Sh DESCRIPTION
-The
-.Nm
-functions manipulate stringlists, which are lists of
-strings that extend automatically if necessary.
-.Pp
-The
-.Vt StringList
-structure has the following definition:
-.Bd -literal -offset indent
-typedef struct _stringlist {
-	char	**sl_str;
-	size_t	  sl_max;
-	size_t	  sl_cur;
-} StringList;
-.Ed
-.Bl -tag -width "sl_str" -offset indent
-.It Va sl_str
-a pointer to the base of the array containing the list.
-.It Va sl_max
-the size of
-.Va sl_str .
-.It Va sl_cur
-the offset in
-.Va sl_str
-of the current element.
-.El
-.Pp
-The following stringlist manipulation functions are available:
-.Bl -tag -width "sl_init()"
-.It Fn sl_init
-Create a stringlist.
-Returns a pointer to a
-.Vt StringList ,
-or
-.Dv NULL
-in case of failure.
-.It Fn sl_free
-Releases memory occupied by
-.Fa sl
-and the
-.Fa sl->sl_str
-array.
-If
-.Fa freeall
-is non-zero, then each of the items within
-.Fa sl->sl_str
-is released as well.
-.It Fn sl_add
-Add
-.Fa item
-to
-.Fa sl->sl_str
-at
-.Fa sl->sl_cur ,
-extending the size of
-.Fa sl->sl_str .
-Returns zero upon success, \-1 upon failure.
-.It Fn sl_find
-Find
-.Fa item
-in
-.Fa sl ,
-returning NULL if it is not found.
-.El
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3
-.Sh HISTORY
-The
-.Nm
-functions appeared in
-.Fx 2.2.6
-and
-.Nx 1.3 .
diff --git a/lib/libc_bsd/gen/stringlist.c b/lib/libc_bsd/gen/stringlist.c
deleted file mode 100644
index 00cd681..0000000
--- a/lib/libc_bsd/gen/stringlist.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 1994 Christos Zoulas
- * 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.
- * 4. 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 ``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 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$NetBSD: stringlist.c,v 1.2 1997/01/17 07:26:20 lukem Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/stringlist.c 249802 2013-04-23 13:03:03Z eadler $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include <err.h>
-#include <stdlib.h>
-#include <stringlist.h>
-#include "un-namespace.h"
-
-#define _SL_CHUNKSIZE	20
-
-/*
- * sl_init(): Initialize a string list
- */
-StringList *
-sl_init(void)
-{
-	StringList *sl;
-
-	sl = malloc(sizeof(StringList));
-	if (sl == NULL)
-		_err(1, "stringlist: %m");
-
-	sl->sl_cur = 0;
-	sl->sl_max = _SL_CHUNKSIZE;
-	sl->sl_str = malloc(sl->sl_max * sizeof(char *));
-	if (sl->sl_str == NULL)
-		_err(1, "stringlist: %m");
-	return sl;
-}
-
-
-/*
- * sl_add(): Add an item to the string list
- */
-int
-sl_add(StringList *sl, char *name)
-{
-	if (sl->sl_cur == sl->sl_max - 1) {
-		sl->sl_max += _SL_CHUNKSIZE;
-		sl->sl_str = reallocf(sl->sl_str, sl->sl_max * sizeof(char *));
-		if (sl->sl_str == NULL)
-			return (-1);
-	}
-	sl->sl_str[sl->sl_cur++] = name;
-	return (0);
-}
-
-
-/*
- * sl_free(): Free a stringlist
- */
-void
-sl_free(StringList *sl, int all)
-{
-	size_t i;
-
-	if (sl == NULL)
-		return;
-	if (sl->sl_str) {
-		if (all)
-			for (i = 0; i < sl->sl_cur; i++)
-				free(sl->sl_str[i]);
-		free(sl->sl_str);
-	}
-	free(sl);
-}
-
-
-/*
- * sl_find(): Find a name in the string list
- */
-char *
-sl_find(StringList *sl, const char *name)
-{
-	size_t i;
-
-	for (i = 0; i < sl->sl_cur; i++)
-		if (strcmp(sl->sl_str[i], name) == 0)
-			return sl->sl_str[i];
-
-	return NULL;
-}
diff --git a/lib/libc_bsd/gen/strtofflags.3 b/lib/libc_bsd/gen/strtofflags.3
deleted file mode 100644
index 223d136..0000000
--- a/lib/libc_bsd/gen/strtofflags.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)setmode.3	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD: releng/10.2/lib/libc/gen/strtofflags.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd January 1, 2000
-.Dt STRTOFFLAGS 3
-.Os
-.Sh NAME
-.Nm fflagstostr ,
-.Nm strtofflags
-.Nd convert between file flag bits and their string names
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn fflagstostr "u_long flags"
-.Ft int
-.Fn strtofflags "char **stringp" "u_long *setp" "u_long *clrp"
-.Sh DESCRIPTION
-The
-.Fn fflagstostr
-function returns a comma separated string of the file flags represented by
-.Fa flags .
-If no flags are set a zero length string is returned.
-.Pp
-If memory cannot be allocated for the return value,
-.Fn fflagstostr
-returns
-.Dv NULL .
-.Pp
-The value returned from
-.Fn fflagstostr
-is obtained from
-.Fn malloc
-and should be returned to the system with
-.Fn free
-when the program is done with it.
-.Pp
-The
-.Fn strtofflags
-function takes a string of file flags, as described in
-.Xr chflags 1 ,
-parses it, and returns the 'set' flags and 'clear' flags
-such as would be given as arguments to
-.Xr chflags 2 .
-On success
-.Fn strtofflags
-returns 0, otherwise it returns non-zero and
-.Fa stringp
-is left pointing to the offending token.
-.Sh ERRORS
-The
-.Fn fflagstostr
-function
-may fail and set errno for any of the errors specified for the library
-routine
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr chflags 1 ,
-.Xr chflags 2 ,
-.Xr malloc 3
-.Sh HISTORY
-The
-.Fn fflagstostr
-and
-.Fn strtofflags
-functions first appeared in
-.Fx 4.0 .
diff --git a/lib/libc_bsd/gen/strtofflags.c b/lib/libc_bsd/gen/strtofflags.c
deleted file mode 100644
index 06159e4..0000000
--- a/lib/libc_bsd/gen/strtofflags.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*-
- * Copyright (c) 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)stat_flags.c	8.1 (Berkeley) 5/31/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/strtofflags.c 254627 2013-08-21 23:04:48Z ken $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define longestflaglen	12
-static struct {
-	char name[longestflaglen + 1];
-	char invert;
-	u_long flag;
-} const mapping[] = {
-	/* shorter names per flag first, all prefixed by "no" */
-	{ "nosappnd",		0, SF_APPEND	},
-	{ "nosappend",		0, SF_APPEND	},
-	{ "noarch",		0, SF_ARCHIVED	},
-	{ "noarchived",		0, SF_ARCHIVED	},
-	{ "noschg",		0, SF_IMMUTABLE	},
-	{ "noschange",		0, SF_IMMUTABLE	},
-	{ "nosimmutable",	0, SF_IMMUTABLE	},
-	{ "nosunlnk",		0, SF_NOUNLINK	},
-	{ "nosunlink",		0, SF_NOUNLINK	},
-#ifdef SF_SNAPSHOT
-	{ "nosnapshot",		0, SF_SNAPSHOT	},
-#endif
-	{ "nouappnd",		0, UF_APPEND	},
-	{ "nouappend",		0, UF_APPEND	},
-	{ "nouarch", 		0, UF_ARCHIVE	},
-	{ "nouarchive",		0, UF_ARCHIVE	},
-	{ "nohidden",		0, UF_HIDDEN	},
-	{ "nouhidden",		0, UF_HIDDEN	},
-	{ "nouchg",		0, UF_IMMUTABLE	},
-	{ "nouchange",		0, UF_IMMUTABLE	},
-	{ "nouimmutable",	0, UF_IMMUTABLE	},
-	{ "nodump",		1, UF_NODUMP	},
-	{ "nouunlnk",		0, UF_NOUNLINK	},
-	{ "nouunlink",		0, UF_NOUNLINK	},
-	{ "nooffline",		0, UF_OFFLINE	},
-	{ "nouoffline",		0, UF_OFFLINE	},
-	{ "noopaque",		0, UF_OPAQUE	},
-	{ "nordonly",		0, UF_READONLY	},
-	{ "nourdonly",		0, UF_READONLY	},
-	{ "noreadonly",		0, UF_READONLY	},
-	{ "noureadonly",	0, UF_READONLY	},
-	{ "noreparse",		0, UF_REPARSE	},
-	{ "noureparse",		0, UF_REPARSE	},
-	{ "nosparse",		0, UF_SPARSE	},
-	{ "nousparse",		0, UF_SPARSE	},
-	{ "nosystem",		0, UF_SYSTEM	},
-	{ "nousystem",		0, UF_SYSTEM	}
-};
-#define nmappings	(sizeof(mapping) / sizeof(mapping[0]))
-
-/*
- * fflagstostr --
- *	Convert file flags to a comma-separated string.  If no flags
- *	are set, return the empty string.
- */
-char *
-fflagstostr(flags)
-	u_long flags;
-{
-	char *string;
-	const char *sp;
-	char *dp;
-	u_long setflags;
-	int i;
-
-	if ((string = (char *)malloc(nmappings * (longestflaglen + 1))) == NULL)
-		return (NULL);
-
-	setflags = flags;
-	dp = string;
-	for (i = 0; i < nmappings; i++) {
-		if (setflags & mapping[i].flag) {
-			if (dp > string)
-				*dp++ = ',';
-			for (sp = mapping[i].invert ? mapping[i].name :
-			    mapping[i].name + 2; *sp; *dp++ = *sp++) ;
-			setflags &= ~mapping[i].flag;
-		}
-	}
-	*dp = '\0';
-	return (string);
-}
-
-/*
- * strtofflags --
- *	Take string of arguments and return file flags.  Return 0 on
- *	success, 1 on failure.  On failure, stringp is set to point
- *	to the offending token.
- */
-int
-strtofflags(stringp, setp, clrp)
-	char **stringp;
-	u_long *setp, *clrp;
-{
-	char *string, *p;
-	int i;
-
-	if (setp)
-		*setp = 0;
-	if (clrp)
-		*clrp = 0;
-	string = *stringp;
-	while ((p = strsep(&string, "\t ,")) != NULL) {
-		*stringp = p;
-		if (*p == '\0')
-			continue;
-		for (i = 0; i < nmappings; i++) {
-			if (strcmp(p, mapping[i].name + 2) == 0) {
-				if (mapping[i].invert) {
-					if (clrp)
-						*clrp |= mapping[i].flag;
-				} else {
-					if (setp)
-						*setp |= mapping[i].flag;
-				}
-				break;
-			} else if (strcmp(p, mapping[i].name) == 0) {
-				if (mapping[i].invert) {
-					if (setp)
-						*setp |= mapping[i].flag;
-				} else {
-					if (clrp)
-						*clrp |= mapping[i].flag;
-				}
-				break;
-			}
-		}
-		if (i == nmappings)
-			return 1;
-	}
-	return 0;
-}
diff --git a/lib/libc_bsd/gen/sysconf.3 b/lib/libc_bsd/gen/sysconf.3
deleted file mode 100644
index 5a3cc60..0000000
--- a/lib/libc_bsd/gen/sysconf.3
+++ /dev/null
@@ -1,276 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"	@(#)sysconf.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/sysconf.3 249956 2013-04-26 21:43:42Z jilles $
-.\"
-.Dd April 26, 2013
-.Dt SYSCONF 3
-.Os
-.Sh NAME
-.Nm sysconf
-.Nd get configurable system variables
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft long
-.Fn sysconf "int name"
-.Sh DESCRIPTION
-This interface is defined by
-.St -p1003.1-88 .
-A far more complete interface is available using
-.Xr sysctl 3 .
-.Pp
-The
-.Fn sysconf
-function provides a method for applications to determine the current
-value of a configurable system limit or option variable.
-The
-.Fa name
-argument specifies the system variable to be queried.
-Symbolic constants for each name value are found in the include file
-.In unistd.h .
-Shell programmers who need access to these parameters should use the
-.Xr getconf 1
-utility.
-.Pp
-The available values are as follows:
-.Bl -tag -width 6n
-.It Li _SC_ARG_MAX
-The maximum bytes of argument to
-.Xr execve 2 .
-.It Li _SC_CHILD_MAX
-The maximum number of simultaneous processes per user id.
-.It Li _SC_CLK_TCK
-The frequency of the statistics clock in ticks per second.
-.It Li _SC_IOV_MAX
-The maximum number of elements in the I/O vector used by
-.Xr readv 2 ,
-.Xr writev 2 ,
-.Xr recvmsg 2 ,
-and
-.Xr sendmsg 2 .
-.It Li _SC_NGROUPS_MAX
-The maximum number of supplemental groups.
-.It Li _SC_NPROCESSORS_CONF
-The number of processors configured.
-.It Li _SC_NPROCESSORS_ONLN
-The number of processors currently online.
-.It Li _SC_OPEN_MAX
-One more than the maximum value the system may assign to a new file descriptor.
-.It Li _SC_PAGESIZE
-The size of a system page in bytes.
-.It Li _SC_PAGE_SIZE
-Equivalent to
-.Li _SC_PAGESIZE .
-.It Li _SC_STREAM_MAX
-The minimum maximum number of streams that a process may have open
-at any one time.
-.It Li _SC_TZNAME_MAX
-The minimum maximum number of types supported for the name of a
-timezone.
-.It Li _SC_JOB_CONTROL
-Return 1 if job control is available on this system, otherwise \-1.
-.It Li _SC_SAVED_IDS
-Returns 1 if saved set-group and saved set-user ID is available,
-otherwise \-1.
-.It Li _SC_VERSION
-The version of
-.St -p1003.1
-with which the system
-attempts to comply.
-.It Li _SC_BC_BASE_MAX
-The maximum ibase/obase values in the
-.Xr bc 1
-utility.
-.It Li _SC_BC_DIM_MAX
-The maximum array size in the
-.Xr bc 1
-utility.
-.It Li _SC_BC_SCALE_MAX
-The maximum scale value in the
-.Xr bc 1
-utility.
-.It Li _SC_BC_STRING_MAX
-The maximum string length in the
-.Xr bc 1
-utility.
-.It Li _SC_COLL_WEIGHTS_MAX
-The maximum number of weights that can be assigned to any entry of
-the LC_COLLATE order keyword in the locale definition file.
-.It Li _SC_EXPR_NEST_MAX
-The maximum number of expressions that can be nested within
-parenthesis by the
-.Xr expr 1
-utility.
-.It Li _SC_LINE_MAX
-The maximum length in bytes of a text-processing utility's input
-line.
-.It Li _SC_RE_DUP_MAX
-The maximum number of repeated occurrences of a regular expression
-permitted when using interval notation.
-.It Li _SC_2_VERSION
-The version of
-.St -p1003.2
-with which the system attempts to comply.
-.It Li _SC_2_C_BIND
-Return 1 if the system's C-language development facilities support the
-C-Language Bindings Option, otherwise \-1.
-.It Li _SC_2_C_DEV
-Return 1 if the system supports the C-Language Development Utilities Option,
-otherwise \-1.
-.It Li _SC_2_CHAR_TERM
-Return 1 if the system supports at least one terminal type capable of
-all operations described in
-.St -p1003.2 ,
-otherwise \-1.
-.It Li _SC_2_FORT_DEV
-Return 1 if the system supports the FORTRAN Development Utilities Option,
-otherwise \-1.
-.It Li _SC_2_FORT_RUN
-Return 1 if the system supports the FORTRAN Runtime Utilities Option,
-otherwise \-1.
-.It Li _SC_2_LOCALEDEF
-Return 1 if the system supports the creation of locales, otherwise \-1.
-.It Li _SC_2_SW_DEV
-Return 1 if the system supports the Software Development Utilities Option,
-otherwise \-1.
-.It Li _SC_2_UPE
-Return 1 if the system supports the User Portability Utilities Option,
-otherwise \-1.
-.It Li _SC_AIO_LISTIO_MAX
-Maximum number of I/O operations in a single list I/O call supported.
-.It Li _SC_AIO_MAX
-Maximum number of outstanding asynchronous I/O operations supported.
-.It Li _SC_AIO_PRIO_DELTA_MAX
-The maximum amount by which a process can decrease its asynchronous I/O
-priority level from its own scheduling priority.
-.It Li _SC_DELAYTIMER_MAX
-Maximum number of timer expiration overruns.
-.It Li _SC_MQ_OPEN_MAX
-The maximum number of open message queue descriptors a process may hold.
-.It Li _SC_RTSIG_MAX
-Maximum number of realtime signals reserved for application use.
-.It Li _SC_SEM_NSEMS_MAX
-Maximum number of semaphores that a process may have.
-.It Li _SC_SEM_VALUE_MAX
-The maximum value a semaphore may have.
-.It Li _SC_SIGQUEUE_MAX
-Maximum number of queued signals that a process may send and have pending at
-the receiver(s) at any time.
-.It Li _SC_TIMER_MAX
-Maximum number of timers per process supported.
-.It Li _SC_GETGR_R_SIZE_MAX
-Suggested initial value for the size of the group entry buffer.
-.It Li _SC_GETPW_R_SIZE_MAX
-Suggested initial value for the size of the password entry buffer.
-.It Li _SC_HOST_NAME_MAX
-Maximum length of a host name (not including the terminating null) as
-returned from the
-.Fn gethostname
-function.
-.It Li _SC_LOGIN_NAME_MAX
-Maximum length of a login name.
-.It Li _SC_THREAD_STACK_MIN
-Minimum size in bytes of thread stack storage.
-.It Li _SC_THREAD_THREADS_MAX
-Maximum number of threads that can be created per process.
-.It Li _SC_TTY_NAME_MAX
-Maximum length of terminal device name.
-.It Li _SC_SYMLOOP_MAX
-Maximum number of symbolic links that can be reliably traversed in the
-resolution of a pathname in the absence of a loop.
-.It Li _SC_ATEXIT_MAX
-Maximum number of functions that may be registered with
-.Fn atexit .
-.It Li _SC_XOPEN_VERSION
-An integer value greater than or equal to 4,
-indicating the version of the X/Open Portability Guide to which this
-system conforms.
-.It Li _SC_XOPEN_XCU_VERSION
-An integer value indicating the version of the XCU Specification to which
-this system conforms.
-.El
-.Pp
-These values also exist, but may not be standard:
-.Bl -tag -width 6n
-.It Li _SC_CPUSET_SIZE
-Size of the kernel cpuset.
-.It Li _SC_PHYS_PAGES
-The number of pages of physical memory.
-Note that it is possible that the product of this value and the value of
-.Li _SC_PAGESIZE
-will overflow a
-.Vt long
-in some configurations on a 32bit machine.
-.El
-.Sh RETURN VALUES
-If the call to
-.Fn sysconf
-is not successful, \-1 is returned and
-.Va errno
-is set appropriately.
-Otherwise, if the variable is associated with functionality that is not
-supported, \-1 is returned and
-.Va errno
-is not modified.
-Otherwise, the current variable value is returned.
-.Sh ERRORS
-The
-.Fn sysconf
-function may fail and set
-.Va errno
-for any of the errors specified for the library function
-.Xr sysctl 3 .
-In addition, the following error may be reported:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa name
-argument is invalid.
-.El
-.Sh SEE ALSO
-.Xr getconf 1 ,
-.Xr pathconf 2 ,
-.Xr confstr 3 ,
-.Xr sysctl 3
-.Sh STANDARDS
-Except for the fact that values returned by
-.Fn sysconf
-may change over the lifetime of the calling process,
-this function conforms to
-.St -p1003.1-88 .
-.Sh HISTORY
-The
-.Fn sysconf
-function first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The value for _SC_STREAM_MAX is a minimum maximum, and required to be
-the same as ANSI C's FOPEN_MAX, so the returned value is a ridiculously
-small and misleading number.
diff --git a/lib/libc_bsd/gen/sysconf.c b/lib/libc_bsd/gen/sysconf.c
deleted file mode 100644
index 6d37ae9..0000000
--- a/lib/libc_bsd/gen/sysconf.c
+++ /dev/null
@@ -1,623 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Sean Eric Fagan of Cygnus Support.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sysconf.c	8.2 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/sysconf.c 268741 2014-07-16 08:52:44Z kib $");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/sysctl.h>
-#include <sys/resource.h>
-#include <sys/socket.h>
-
-#include <elf.h>
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <pthread.h>		/* we just need the limits */
-#include <time.h>
-#include <unistd.h>
-
-#include "../stdlib/atexit.h"
-#include "tzfile.h"		/* from ../../../contrib/tzcode/stdtime */
-#include "libc_private.h"
-
-#define	_PATH_ZONEINFO	TZDIR	/* from tzfile.h */
-
-/*
- * sysconf --
- *	get configurable system variables.
- *
- * XXX
- * POSIX 1003.1 (ISO/IEC 9945-1, 4.8.1.3) states that the variable values
- * not change during the lifetime of the calling process.  This would seem
- * to require that any change to system limits kill all running processes.
- * A workaround might be to cache the values when they are first retrieved
- * and then simply return the cached value on subsequent calls.  This is
- * less useful than returning up-to-date values, however.
- */
-long
-sysconf(name)
-	int name;
-{
-	struct rlimit rl;
-	size_t len;
-	int mib[2], sverrno, value;
-	long lvalue, defaultresult;
-	const char *path;
-
-	defaultresult = -1;
-
-	switch (name) {
-	case _SC_ARG_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_ARGMAX;
-		break;
-	case _SC_CHILD_MAX:
-		if (getrlimit(RLIMIT_NPROC, &rl) != 0)
-			return (-1);
-		if (rl.rlim_cur == RLIM_INFINITY)
-			return (-1);
-		if (rl.rlim_cur > LONG_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		return ((long)rl.rlim_cur);
-	case _SC_CLK_TCK:
-		return (CLK_TCK);
-	case _SC_NGROUPS_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_NGROUPS;
-		break;
-	case _SC_OPEN_MAX:
-		if (getrlimit(RLIMIT_NOFILE, &rl) != 0)
-			return (-1);
-		if (rl.rlim_cur == RLIM_INFINITY)
-			return (-1);
-		if (rl.rlim_cur > LONG_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		return ((long)rl.rlim_cur);
-	case _SC_STREAM_MAX:
-		if (getrlimit(RLIMIT_NOFILE, &rl) != 0)
-			return (-1);
-		if (rl.rlim_cur == RLIM_INFINITY)
-			return (-1);
-		if (rl.rlim_cur > LONG_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		/*
-		 * struct __sFILE currently has a limitation that
-		 * file descriptors must fit in a signed short.
-		 * This doesn't precisely capture the letter of POSIX
-		 * but approximates the spirit.
-		 */
-		if (rl.rlim_cur > SHRT_MAX)
-			return (SHRT_MAX);
-
-		return ((long)rl.rlim_cur);
-	case _SC_JOB_CONTROL:
-		return (_POSIX_JOB_CONTROL);
-	case _SC_SAVED_IDS:
-		/* XXX - must be 1 */
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_SAVED_IDS;
-		goto yesno;
-	case _SC_VERSION:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_POSIX1;
-		break;
-	case _SC_BC_BASE_MAX:
-		return (BC_BASE_MAX);
-	case _SC_BC_DIM_MAX:
-		return (BC_DIM_MAX);
-	case _SC_BC_SCALE_MAX:
-		return (BC_SCALE_MAX);
-	case _SC_BC_STRING_MAX:
-		return (BC_STRING_MAX);
-	case _SC_COLL_WEIGHTS_MAX:
-		return (COLL_WEIGHTS_MAX);
-	case _SC_EXPR_NEST_MAX:
-		return (EXPR_NEST_MAX);
-	case _SC_LINE_MAX:
-		return (LINE_MAX);
-	case _SC_RE_DUP_MAX:
-		return (RE_DUP_MAX);
-	case _SC_2_VERSION:
-		/*
-		 * This is something of a lie, but it would be silly at
-		 * this point to try to deduce this from the contents
-		 * of the filesystem.
-		 */
-		return (_POSIX2_VERSION);
-	case _SC_2_C_BIND:
-		return (_POSIX2_C_BIND);
-	case _SC_2_C_DEV:
-		return (_POSIX2_C_DEV);
-	case _SC_2_CHAR_TERM:
-		return (_POSIX2_CHAR_TERM);
-	case _SC_2_FORT_DEV:
-		return (_POSIX2_FORT_DEV);
-	case _SC_2_FORT_RUN:
-		return (_POSIX2_FORT_RUN);
-	case _SC_2_LOCALEDEF:
-		return (_POSIX2_LOCALEDEF);
-	case _SC_2_SW_DEV:
-		return (_POSIX2_SW_DEV);
-	case _SC_2_UPE:
-		return (_POSIX2_UPE);
-	case _SC_TZNAME_MAX:
-		path = _PATH_ZONEINFO;
-do_NAME_MAX:
-		sverrno = errno;
-		errno = 0;
-		lvalue = pathconf(path, _PC_NAME_MAX);
-		if (lvalue == -1 && errno != 0)
-			return (-1);
-		errno = sverrno;
-		return (lvalue);
-
-	case _SC_ASYNCHRONOUS_IO:
-#if _POSIX_ASYNCHRONOUS_IO == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_ASYNCHRONOUS_IO;
-		break;
-#else
-		return (_POSIX_ASYNCHRONOUS_IO);
-#endif
-	case _SC_MAPPED_FILES:
-		return (_POSIX_MAPPED_FILES);
-	case _SC_MEMLOCK:
-		return (_POSIX_MEMLOCK);
-	case _SC_MEMLOCK_RANGE:
-		return (_POSIX_MEMLOCK_RANGE);
-	case _SC_MEMORY_PROTECTION:
-		return (_POSIX_MEMORY_PROTECTION);
-	case _SC_MESSAGE_PASSING:
-#if _POSIX_MESSAGE_PASSING == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_MESSAGE_PASSING;
-		goto yesno;
-#else
-		return (_POSIX_MESSAGE_PASSING);
-#endif
-	case _SC_PRIORITIZED_IO:
-#if _POSIX_PRIORITIZED_IO == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_PRIORITIZED_IO;
-		goto yesno;
-#else
-		return (_POSIX_PRIORITIZED_IO);
-#endif
-	case _SC_PRIORITY_SCHEDULING:
-#if _POSIX_PRIORITY_SCHEDULING == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_PRIORITY_SCHEDULING;
-		goto yesno;
-#else
-		return (_POSIX_PRIORITY_SCHEDULING);
-#endif
-	case _SC_REALTIME_SIGNALS:
-#if _POSIX_REALTIME_SIGNALS == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_REALTIME_SIGNALS;
-		goto yesno;
-#else
-		return (_POSIX_REALTIME_SIGNALS);
-#endif
-	case _SC_SEMAPHORES:
-#if _POSIX_SEMAPHORES == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SEMAPHORES;
-		goto yesno;
-#else
-		return (_POSIX_SEMAPHORES);
-#endif
-	case _SC_FSYNC:
-		return (_POSIX_FSYNC);
-
-	case _SC_SHARED_MEMORY_OBJECTS:
-		return (_POSIX_SHARED_MEMORY_OBJECTS);
-	case _SC_SYNCHRONIZED_IO:
-#if _POSIX_SYNCHRONIZED_IO == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SYNCHRONIZED_IO;
-		goto yesno;
-#else
-		return (_POSIX_SYNCHRONIZED_IO);
-#endif
-	case _SC_TIMERS:
-#if _POSIX_TIMERS == 0
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_TIMERS;
-		goto yesno;
-#else
-		return (_POSIX_TIMERS);
-#endif
-	case _SC_AIO_LISTIO_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_AIO_LISTIO_MAX;
-		break;
-	case _SC_AIO_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_AIO_MAX;
-		break;
-	case _SC_AIO_PRIO_DELTA_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_AIO_PRIO_DELTA_MAX;
-		break;
-	case _SC_DELAYTIMER_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_DELAYTIMER_MAX;
-		goto yesno;
-	case _SC_MQ_OPEN_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_MQ_OPEN_MAX;
-		goto yesno;
-	case _SC_PAGESIZE:
-		defaultresult = getpagesize();
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_PAGESIZE;
-		goto yesno;
-	case _SC_RTSIG_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_RTSIG_MAX;
-		goto yesno;
-	case _SC_SEM_NSEMS_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SEM_NSEMS_MAX;
-		goto yesno;
-	case _SC_SEM_VALUE_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SEM_VALUE_MAX;
-		goto yesno;
-	case _SC_SIGQUEUE_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_SIGQUEUE_MAX;
-		goto yesno;
-	case _SC_TIMER_MAX:
-		mib[0] = CTL_P1003_1B;
-		mib[1] = CTL_P1003_1B_TIMER_MAX;
-yesno:
-		len = sizeof(value);
-		if (sysctl(mib, 2, &value, &len, NULL, 0) == -1)
-			return (-1);
-		if (value == 0)
-			return (defaultresult);
-		return ((long)value);
-
-	case _SC_2_PBS:
-	case _SC_2_PBS_ACCOUNTING:
-	case _SC_2_PBS_CHECKPOINT:
-	case _SC_2_PBS_LOCATE:
-	case _SC_2_PBS_MESSAGE:
-	case _SC_2_PBS_TRACK:
-#if _POSIX2_PBS == 0
-#error "don't know how to determine _SC_2_PBS"
-		/*
-		 * This probably requires digging through the filesystem
-		 * to see if the appropriate package has been installed.
-		 * Since we don't currently support this option at all,
-		 * it's not worth the effort to write the code now.
-		 * Figuring out which of the sub-options are supported
-		 * would be even more difficult, so it's probably easier
-		 * to always say ``no''.
-		 */
-#else
-		return (_POSIX2_PBS);
-#endif
-	case _SC_ADVISORY_INFO:
-#if _POSIX_ADVISORY_INFO == 0
-#error "_POSIX_ADVISORY_INFO"
-#else
-		return (_POSIX_ADVISORY_INFO);
-#endif
-	case _SC_BARRIERS:
-#if _POSIX_BARRIERS == 0
-#error "_POSIX_BARRIERS"
-#else
-		return (_POSIX_BARRIERS);
-#endif
-	case _SC_CLOCK_SELECTION:
-#if _POSIX_CLOCK_SELECTION == 0
-#error "_POSIX_CLOCK_SELECTION"
-#else
-		return (_POSIX_CLOCK_SELECTION);
-#endif
-	case _SC_CPUTIME:
-		return (_POSIX_CPUTIME);
-#ifdef notdef
-	case _SC_FILE_LOCKING:
-		/*
-		 * XXX - The standard doesn't tell us how to define
-		 * _POSIX_FILE_LOCKING, so we can't answer this one.
-		 */
-#endif
-
-	/*
-	 * SUSv4tc1 says the following about _SC_GETGR_R_SIZE_MAX and
-	 * _SC_GETPW_R_SIZE_MAX:
-	 * Note that sysconf(_SC_GETGR_R_SIZE_MAX) may return -1 if
-	 * there is no hard limit on the size of the buffer needed to
-	 * store all the groups returned.
-	 */
-	case _SC_GETGR_R_SIZE_MAX:
-	case _SC_GETPW_R_SIZE_MAX:
-		return (-1);
-	case _SC_HOST_NAME_MAX:
-		return (MAXHOSTNAMELEN - 1); /* does not include \0 */
-	case _SC_LOGIN_NAME_MAX:
-		return (MAXLOGNAME);
-	case _SC_MONOTONIC_CLOCK:
-#if _POSIX_MONOTONIC_CLOCK == 0
-#error "_POSIX_MONOTONIC_CLOCK"
-#else
-		return (_POSIX_MONOTONIC_CLOCK);
-#endif
-#if _POSIX_MESSAGE_PASSING > -1
-	case _SC_MQ_PRIO_MAX:
-		return (MQ_PRIO_MAX);
-#endif
-	case _SC_READER_WRITER_LOCKS:
-		return (_POSIX_READER_WRITER_LOCKS);
-	case _SC_REGEXP:
-		return (_POSIX_REGEXP);
-	case _SC_SHELL:
-		return (_POSIX_SHELL);
-	case _SC_SPAWN:
-		return (_POSIX_SPAWN);
-	case _SC_SPIN_LOCKS:
-		return (_POSIX_SPIN_LOCKS);
-	case _SC_SPORADIC_SERVER:
-#if _POSIX_SPORADIC_SERVER == 0
-#error "_POSIX_SPORADIC_SERVER"
-#else
-		return (_POSIX_SPORADIC_SERVER);
-#endif
-	case _SC_THREAD_ATTR_STACKADDR:
-		return (_POSIX_THREAD_ATTR_STACKADDR);
-	case _SC_THREAD_ATTR_STACKSIZE:
-		return (_POSIX_THREAD_ATTR_STACKSIZE);
-	case _SC_THREAD_CPUTIME:
-		return (_POSIX_THREAD_CPUTIME);
-	case _SC_THREAD_DESTRUCTOR_ITERATIONS:
-		return (PTHREAD_DESTRUCTOR_ITERATIONS);
-	case _SC_THREAD_KEYS_MAX:
-		return (PTHREAD_KEYS_MAX);
-	case _SC_THREAD_PRIO_INHERIT:
-		return (_POSIX_THREAD_PRIO_INHERIT);
-	case _SC_THREAD_PRIO_PROTECT:
-		return (_POSIX_THREAD_PRIO_PROTECT);
-	case _SC_THREAD_PRIORITY_SCHEDULING:
-		return (_POSIX_THREAD_PRIORITY_SCHEDULING);
-	case _SC_THREAD_PROCESS_SHARED:
-		return (_POSIX_THREAD_PROCESS_SHARED);
-	case _SC_THREAD_SAFE_FUNCTIONS:
-		return (_POSIX_THREAD_SAFE_FUNCTIONS);
-	case _SC_THREAD_STACK_MIN:
-		return (PTHREAD_STACK_MIN);
-	case _SC_THREAD_THREADS_MAX:
-		return (PTHREAD_THREADS_MAX); /* XXX wrong type! */
-	case _SC_TIMEOUTS:
-		return (_POSIX_TIMEOUTS);
-	case _SC_THREADS:
-		return (_POSIX_THREADS);
-	case _SC_TRACE:
-#if _POSIX_TRACE == 0
-#error "_POSIX_TRACE"
-		/* While you're implementing this, also do the ones below. */
-#else
-		return (_POSIX_TRACE);
-#endif
-#if _POSIX_TRACE > -1
-	case _SC_TRACE_EVENT_FILTER:
-		return (_POSIX_TRACE_EVENT_FILTER);
-	case _SC_TRACE_INHERIT:
-		return (_POSIX_TRACE_INHERIT);
-	case _SC_TRACE_LOG:
-		return (_POSIX_TRACE_LOG);
-#endif
-	case _SC_TTY_NAME_MAX:
-		path = _PATH_DEV;
-		goto do_NAME_MAX;
-	case _SC_TYPED_MEMORY_OBJECTS:
-#if _POSIX_TYPED_MEMORY_OBJECTS == 0
-#error "_POSIX_TYPED_MEMORY_OBJECTS"
-#else
-		return (_POSIX_TYPED_MEMORY_OBJECTS);
-#endif
-	case _SC_V6_ILP32_OFF32:
-#if _V6_ILP32_OFF32 == 0
-		if (sizeof(int) * CHAR_BIT == 32 &&
-		    sizeof(int) == sizeof(long) &&
-		    sizeof(long) == sizeof(void *) &&
-		    sizeof(void *) == sizeof(off_t))
-			return 1;
-		else
-			return -1;
-#else
-		return (_V6_ILP32_OFF32);
-#endif
-	case _SC_V6_ILP32_OFFBIG:
-#if _V6_ILP32_OFFBIG == 0
-		if (sizeof(int) * CHAR_BIT == 32 &&
-		    sizeof(int) == sizeof(long) &&
-		    sizeof(long) == sizeof(void *) &&
-		    sizeof(off_t) * CHAR_BIT >= 64)
-			return 1;
-		else
-			return -1;
-#else
-		return (_V6_ILP32_OFFBIG);
-#endif
-	case _SC_V6_LP64_OFF64:
-#if _V6_LP64_OFF64 == 0
-		if (sizeof(int) * CHAR_BIT == 32 &&
-		    sizeof(long) * CHAR_BIT == 64 &&
-		    sizeof(long) == sizeof(void *) &&
-		    sizeof(void *) == sizeof(off_t))
-			return 1;
-		else
-			return -1;
-#else
-		return (_V6_LP64_OFF64);
-#endif
-	case _SC_V6_LPBIG_OFFBIG:
-#if _V6_LPBIG_OFFBIG == 0
-		if (sizeof(int) * CHAR_BIT >= 32 &&
-		    sizeof(long) * CHAR_BIT >= 64 &&
-		    sizeof(void *) * CHAR_BIT >= 64 &&
-		    sizeof(off_t) * CHAR_BIT >= 64)
-			return 1;
-		else
-			return -1;
-#else
-		return (_V6_LPBIG_OFFBIG);
-#endif
-	case _SC_ATEXIT_MAX:
-		return (ATEXIT_SIZE);
-	case _SC_IOV_MAX:
-		mib[0] = CTL_KERN;
-		mib[1] = KERN_IOV_MAX;
-		break;
-	case _SC_XOPEN_CRYPT:
-		return (_XOPEN_CRYPT);
-	case _SC_XOPEN_ENH_I18N:
-		return (_XOPEN_ENH_I18N);
-	case _SC_XOPEN_LEGACY:
-		return (_XOPEN_LEGACY);
-	case _SC_XOPEN_REALTIME:
-#if _XOPEN_REALTIME == 0
-		sverrno = errno;
-		value = sysconf(_SC_ASYNCHRONOUS_IO) > 0 &&
-			sysconf(_SC_MEMLOCK) > 0 &&
-			sysconf(_SC_MEMLOCK_RANGE) > 0 &&
-			sysconf(_SC_MESSAGE_PASSING) > 0 &&
-			sysconf(_SC_PRIORITY_SCHEDULING) > 0 &&
-			sysconf(_SC_REALTIME_SIGNALS) > 0 &&
-			sysconf(_SC_SEMAPHORES) > 0 &&
-			sysconf(_SC_SHARED_MEMORY_OBJECTS) > 0 &&
-			sysconf(_SC_SYNCHRONIZED_IO) > 0 &&
-			sysconf(_SC_TIMERS) > 0;
-		errno = sverrno;
-		if (value)
-			return (200112L);
-		else
-			return (-1);
-#else
-		return (_XOPEN_REALTIME);
-#endif
-	case _SC_XOPEN_REALTIME_THREADS:
-#if _XOPEN_REALTIME_THREADS == 0
-#error "_XOPEN_REALTIME_THREADS"
-#else
-		return (_XOPEN_REALTIME_THREADS);
-#endif
-	case _SC_XOPEN_SHM:
-		len = sizeof(lvalue);
-		sverrno = errno;
-		if (sysctlbyname("kern.ipc.shmmin", &lvalue, &len, NULL,
-		    0) == -1) {
-			errno = sverrno;
-			return (-1);
-		}
-		errno = sverrno;
-		return (1);
-	case _SC_XOPEN_STREAMS:
-		return (_XOPEN_STREAMS);
-	case _SC_XOPEN_UNIX:
-		return (_XOPEN_UNIX);
-#ifdef _XOPEN_VERSION
-	case _SC_XOPEN_VERSION:
-		return (_XOPEN_VERSION);
-#endif
-#ifdef _XOPEN_XCU_VERSION
-	case _SC_XOPEN_XCU_VERSION:
-		return (_XOPEN_XCU_VERSION);
-#endif
-	case _SC_SYMLOOP_MAX:
-		return (MAXSYMLINKS);
-	case _SC_RAW_SOCKETS:
-		return (_POSIX_RAW_SOCKETS);
-	case _SC_IPV6:
-#if _POSIX_IPV6 == 0
-		sverrno = errno;
-		value = socket(PF_INET6, SOCK_DGRAM, 0);
-		errno = sverrno;
-		if (value >= 0) {
-			close(value);
-			return (200112L);
-		} else
-			return (0);
-#else
-		return (_POSIX_IPV6);
-#endif
-
-	case _SC_NPROCESSORS_CONF:
-	case _SC_NPROCESSORS_ONLN:
-		if (_elf_aux_info(AT_NCPUS, &value, sizeof(value)) == 0)
-			return ((long)value);
-		mib[0] = CTL_HW;
-		mib[1] = HW_NCPU;
-		break;
-
-#ifdef _SC_PHYS_PAGES
-	case _SC_PHYS_PAGES:
-		len = sizeof(lvalue);
-		if (sysctlbyname("hw.availpages", &lvalue, &len, NULL, 0) == -1)
-			return (-1);
-		return (lvalue);
-#endif
-
-#ifdef _SC_CPUSET_SIZE
-	case _SC_CPUSET_SIZE:
-		len = sizeof(value);
-		if (sysctlbyname("kern.sched.cpusetsize", &value, &len, NULL,
-		    0) == -1)
-			return (-1);
-		return ((long)value);
-#endif
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	len = sizeof(value);
-	if (sysctl(mib, 2, &value, &len, NULL, 0) == -1)
-		value = -1;
-	return ((long)value);
-}
diff --git a/lib/libc_bsd/gen/sysctl.3 b/lib/libc_bsd/gen/sysctl.3
deleted file mode 100644
index c98548c..0000000
--- a/lib/libc_bsd/gen/sysctl.3
+++ /dev/null
@@ -1,870 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"	@(#)sysctl.3	8.4 (Berkeley) 5/9/95
-.\" $FreeBSD: releng/10.2/lib/libc/gen/sysctl.3 253662 2013-07-26 02:00:06Z zont $
-.\"
-.Dd May 17, 2013
-.Dt SYSCTL 3
-.Os
-.Sh NAME
-.Nm sysctl ,
-.Nm sysctlbyname ,
-.Nm sysctlnametomib
-.Nd get or set system information
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/sysctl.h
-.Ft int
-.Fn sysctl "const int *name" "u_int namelen" "void *oldp" "size_t *oldlenp" "const void *newp" "size_t newlen"
-.Ft int
-.Fn sysctlbyname "const char *name" "void *oldp" "size_t *oldlenp" "const void *newp" "size_t newlen"
-.Ft int
-.Fn sysctlnametomib "const char *name" "int *mibp" "size_t *sizep"
-.Sh DESCRIPTION
-The
-.Fn sysctl
-function retrieves system information and allows processes with
-appropriate privileges to set system information.
-The information available from
-.Fn sysctl
-consists of integers, strings, and tables.
-Information may be retrieved and set from the command interface
-using the
-.Xr sysctl 8
-utility.
-.Pp
-Unless explicitly noted below,
-.Fn sysctl
-returns a consistent snapshot of the data requested.
-Consistency is obtained by locking the destination
-buffer into memory so that the data may be copied out without blocking.
-Calls to
-.Fn sysctl
-are serialized to avoid deadlock.
-.Pp
-The state is described using a ``Management Information Base'' (MIB)
-style name, listed in
-.Fa name ,
-which is a
-.Fa namelen
-length array of integers.
-.Pp
-The
-.Fn sysctlbyname
-function accepts an ASCII representation of the name and internally
-looks up the integer name vector.
-Apart from that, it behaves the same
-as the standard
-.Fn sysctl
-function.
-.Pp
-The information is copied into the buffer specified by
-.Fa oldp .
-The size of the buffer is given by the location specified by
-.Fa oldlenp
-before the call,
-and that location gives the amount of data copied after a successful call
-and after a call that returns with the error code
-.Er ENOMEM .
-If the amount of data available is greater
-than the size of the buffer supplied,
-the call supplies as much data as fits in the buffer provided
-and returns with the error code
-.Er ENOMEM .
-If the old value is not desired,
-.Fa oldp
-and
-.Fa oldlenp
-should be set to NULL.
-.Pp
-The size of the available data can be determined by calling
-.Fn sysctl
-with the
-.Dv NULL
-argument for
-.Fa oldp .
-The size of the available data will be returned in the location pointed to by
-.Fa oldlenp .
-For some operations, the amount of space may change often.
-For these operations,
-the system attempts to round up so that the returned size is
-large enough for a call to return the data shortly thereafter.
-.Pp
-To set a new value,
-.Fa newp
-is set to point to a buffer of length
-.Fa newlen
-from which the requested value is to be taken.
-If a new value is not to be set,
-.Fa newp
-should be set to NULL and
-.Fa newlen
-set to 0.
-.Pp
-The
-.Fn sysctlnametomib
-function accepts an ASCII representation of the name,
-looks up the integer name vector,
-and returns the numeric representation in the mib array pointed to by
-.Fa mibp .
-The number of elements in the mib array is given by the location specified by
-.Fa sizep
-before the call,
-and that location gives the number of entries copied after a successful call.
-The resulting
-.Fa mib
-and
-.Fa size
-may be used in subsequent
-.Fn sysctl
-calls to get the data associated with the requested ASCII name.
-This interface is intended for use by applications that want to
-repeatedly request the same variable (the
-.Fn sysctl
-function runs in about a third the time as the same request made via the
-.Fn sysctlbyname
-function).
-The
-.Fn sysctlnametomib
-function is also useful for fetching mib prefixes and then adding
-a final component.
-For example, to fetch process information
-for processes with pid's less than 100:
-.Pp
-.Bd -literal -offset indent -compact
-int i, mib[4];
-size_t len;
-struct kinfo_proc kp;
-
-/* Fill out the first three components of the mib */
-len = 4;
-sysctlnametomib("kern.proc.pid", mib, &len);
-
-/* Fetch and print entries for pid's < 100 */
-for (i = 0; i < 100; i++) {
-	mib[3] = i;
-	len = sizeof(kp);
-	if (sysctl(mib, 4, &kp, &len, NULL, 0) == -1)
-		perror("sysctl");
-	else if (len > 0)
-		printkproc(&kp);
-}
-.Ed
-.Pp
-The top level names are defined with a CTL_ prefix in
-.In sys/sysctl.h ,
-and are as follows.
-The next and subsequent levels down are found in the include files
-listed here, and described in separate sections below.
-.Bl -column CTLXMACHDEPXXX "Next level namesXXXXXX" -offset indent
-.It Sy "Name	Next level names	Description"
-.It "CTL_DEBUG	sys/sysctl.h	Debugging"
-.It "CTL_VFS	sys/mount.h	File system"
-.It "CTL_HW	sys/sysctl.h	Generic CPU, I/O"
-.It "CTL_KERN	sys/sysctl.h	High kernel limits"
-.It "CTL_MACHDEP	sys/sysctl.h	Machine dependent"
-.It "CTL_NET	sys/socket.h	Networking"
-.It "CTL_USER	sys/sysctl.h	User-level"
-.It "CTL_VM	vm/vm_param.h	Virtual memory"
-.El
-.Pp
-For example, the following retrieves the maximum number of processes allowed
-in the system:
-.Pp
-.Bd -literal -offset indent -compact
-int mib[2], maxproc;
-size_t len;
-
-mib[0] = CTL_KERN;
-mib[1] = KERN_MAXPROC;
-len = sizeof(maxproc);
-sysctl(mib, 2, &maxproc, &len, NULL, 0);
-.Ed
-.Pp
-To retrieve the standard search path for the system utilities:
-.Pp
-.Bd -literal -offset indent -compact
-int mib[2];
-size_t len;
-char *p;
-
-mib[0] = CTL_USER;
-mib[1] = USER_CS_PATH;
-sysctl(mib, 2, NULL, &len, NULL, 0);
-p = malloc(len);
-sysctl(mib, 2, p, &len, NULL, 0);
-.Ed
-.Ss CTL_DEBUG
-The debugging variables vary from system to system.
-A debugging variable may be added or deleted without need to recompile
-.Fn sysctl
-to know about it.
-Each time it runs,
-.Fn sysctl
-gets the list of debugging variables from the kernel and
-displays their current values.
-The system defines twenty
-.Pq Vt "struct ctldebug"
-variables named
-.Va debug0
-through
-.Va debug19 .
-They are declared as separate variables so that they can be
-individually initialized at the location of their associated variable.
-The loader prevents multiple use of the same variable by issuing errors
-if a variable is initialized in more than one place.
-For example, to export the variable
-.Va dospecialcheck
-as a debugging variable, the following declaration would be used:
-.Pp
-.Bd -literal -offset indent -compact
-int dospecialcheck = 1;
-struct ctldebug debug5 = { "dospecialcheck", &dospecialcheck };
-.Ed
-.Ss CTL_VFS
-A distinguished second level name, VFS_GENERIC,
-is used to get general information about all file systems.
-One of its third level identifiers is VFS_MAXTYPENUM
-that gives the highest valid file system type number.
-Its other third level identifier is VFS_CONF that
-returns configuration information about the file system
-type given as a fourth level identifier (see
-.Xr getvfsbyname 3
-as an example of its use).
-The remaining second level identifiers are the
-file system type number returned by a
-.Xr statfs 2
-call or from VFS_CONF.
-The third level identifiers available for each file system
-are given in the header file that defines the mount
-argument structure for that file system.
-.Ss CTL_HW
-The string and integer information available for the CTL_HW level
-is detailed below.
-The changeable column shows whether a process with appropriate
-privilege may change the value.
-.Bl -column "Second level nameXXXXXX" integerXXX -offset indent
-.It Sy "Second level name	Type	Changeable"
-.It "HW_MACHINE	string	no"
-.It "HW_MODEL	string	no"
-.It "HW_NCPU	integer	no"
-.It "HW_BYTEORDER	integer	no"
-.It "HW_PHYSMEM	integer	no"
-.It "HW_USERMEM	integer	no"
-.It "HW_PAGESIZE	integer	no"
-.\".It "HW_DISKNAMES	integer	no"
-.\".It "HW_DISKSTATS	integer	no"
-.It "HW_FLOATINGPT	integer	no"
-.It "HW_MACHINE_ARCH	string	no"
-.It "HW_REALMEM	integer	no"
-.El
-.Bl -tag -width 6n
-.It Li HW_MACHINE
-The machine class.
-.It Li HW_MODEL
-The machine model
-.It Li HW_NCPU
-The number of cpus.
-.It Li HW_BYTEORDER
-The byteorder (4,321, or 1,234).
-.It Li HW_PHYSMEM
-The bytes of physical memory.
-.It Li HW_USERMEM
-The bytes of non-kernel memory.
-.It Li HW_PAGESIZE
-The software page size.
-.\".It Fa HW_DISKNAMES
-.\".It Fa HW_DISKSTATS
-.It Li HW_FLOATINGPT
-Nonzero if the floating point support is in hardware.
-.It Li HW_MACHINE_ARCH
-The machine dependent architecture type.
-.It Li HW_REALMEM
-The bytes of real memory.
-.El
-.Ss CTL_KERN
-The string and integer information available for the CTL_KERN level
-is detailed below.
-The changeable column shows whether a process with appropriate
-privilege may change the value.
-The types of data currently available are process information,
-system vnodes, the open file entries, routing table entries,
-virtual memory statistics, load average history, and clock rate
-information.
-.Bl -column "KERNXMAXFILESPERPROCXXX" "struct clockrateXXX" -offset indent
-.It Sy "Second level name	Type	Changeable"
-.It "KERN_ARGMAX	integer	no"
-.It "KERN_BOOTFILE	string	yes"
-.It "KERN_BOOTTIME	struct timeval	no"
-.It "KERN_CLOCKRATE	struct clockinfo	no"
-.It "KERN_FILE	struct xfile	no"
-.It "KERN_HOSTID	integer	yes"
-.It "KERN_HOSTUUID	string	yes"
-.It "KERN_HOSTNAME	string	yes"
-.It "KERN_JOB_CONTROL	integer	no"
-.It "KERN_MAXFILES	integer	yes"
-.It "KERN_MAXFILESPERPROC	integer	yes"
-.It "KERN_MAXPROC	integer	no"
-.It "KERN_MAXPROCPERUID	integer	yes"
-.It "KERN_MAXVNODES	integer	yes"
-.It "KERN_NGROUPS	integer	no"
-.It "KERN_NISDOMAINNAME	string	yes"
-.It "KERN_OSRELDATE	integer	no"
-.It "KERN_OSRELEASE	string	no"
-.It "KERN_OSREV	integer	no"
-.It "KERN_OSTYPE	string	no"
-.It "KERN_POSIX1	integer	no"
-.It "KERN_PROC	node	not applicable"
-.It "KERN_PROF	node	not applicable"
-.It "KERN_QUANTUM	integer	yes"
-.It "KERN_SAVED_IDS	integer	no"
-.It "KERN_SECURELVL	integer	raise only"
-.It "KERN_UPDATEINTERVAL	integer	no"
-.It "KERN_VERSION	string	no"
-.It "KERN_VNODE	struct xvnode	no"
-.El
-.Bl -tag -width 6n
-.It Li KERN_ARGMAX
-The maximum bytes of argument to
-.Xr execve 2 .
-.It Li KERN_BOOTFILE
-The full pathname of the file from which the kernel was loaded.
-.It Li KERN_BOOTTIME
-A
-.Va struct timeval
-structure is returned.
-This structure contains the time that the system was booted.
-.It Li KERN_CLOCKRATE
-A
-.Va struct clockinfo
-structure is returned.
-This structure contains the clock, statistics clock and profiling clock
-frequencies, the number of micro-seconds per hz tick and the skew rate.
-.It Li KERN_FILE
-Return the entire file table.
-The returned data consists of an array of
-.Va struct xfile ,
-whose size depends on the current number of such objects in the system.
-.It Li KERN_HOSTID
-Get or set the host ID.
-.It Li KERN_HOSTUUID
-Get or set the host's universally unique identifier (UUID).
-.It Li KERN_HOSTNAME
-Get or set the hostname.
-.It Li KERN_JOB_CONTROL
-Return 1 if job control is available on this system, otherwise 0.
-.It Li KERN_MAXFILES
-The maximum number of files that may be open in the system.
-.It Li KERN_MAXFILESPERPROC
-The maximum number of files that may be open for a single process.
-This limit only applies to processes with an effective uid of nonzero
-at the time of the open request.
-Files that have already been opened are not affected if the limit
-or the effective uid is changed.
-.It Li KERN_MAXPROC
-The maximum number of concurrent processes the system will allow.
-.It Li KERN_MAXPROCPERUID
-The maximum number of concurrent processes the system will allow
-for a single effective uid.
-This limit only applies to processes with an effective uid of nonzero
-at the time of a fork request.
-Processes that have already been started are not affected if the limit
-is changed.
-.It Li KERN_MAXVNODES
-The maximum number of vnodes available on the system.
-.It Li KERN_NGROUPS
-The maximum number of supplemental groups.
-.It Li KERN_NISDOMAINNAME
-The name of the current YP/NIS domain.
-.It Li KERN_OSRELDATE
-The kernel release version in the format
-.Ar M Ns Ar mm Ns Ar R Ns Ar xx ,
-where
-.Ar M
-is the major version,
-.Ar mm
-is the two digit minor version,
-.Ar R
-is 0 if release branch, otherwise 1,
-and
-.Ar xx
-is updated when the available APIs change.
-.Pp
-The userland release version is available from
-.In osreldate.h ;
-parse this file if you need to get the release version of
-the currently installed userland.
-.It Li KERN_OSRELEASE
-The system release string.
-.It Li KERN_OSREV
-The system revision string.
-.It Li KERN_OSTYPE
-The system type string.
-.It Li KERN_POSIX1
-The version of
-.St -p1003.1
-with which the system
-attempts to comply.
-.It Li KERN_PROC
-Return selected information about specific running processes.
-.Pp
-For the following names, an array of
-.Va struct kinfo_proc
-structures is returned,
-whose size depends on the current number of such objects in the system.
-.Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
-.It "Third level name	Fourth level is:"
-.It "KERN_PROC_ALL	None"
-.It "KERN_PROC_PID	A process ID"
-.It "KERN_PROC_PGRP	A process group"
-.It "KERN_PROC_TTY	A tty device"
-.It "KERN_PROC_UID	A user ID"
-.It "KERN_PROC_RUID	A real user ID"
-.El
-.Pp
-If the third level name is
-.Dv KERN_PROC_ARGS
-then the command line argument
-array is returned in a flattened form, i.e., zero-terminated arguments
-follow each other.
-The total size of array is returned.
-It is also possible for a process to set its own process title this way.
-If the third level name is
-.Dv KERN_PROC_PATHNAME ,
-the path of the
-process' text file is stored.
-For
-.Dv KERN_PROC_PATHNAME ,
-a process ID of
-.Li \-1
-implies the current process.
-.Bl -column "Third level nameXXXXXX" "Fourth level is:XXXXXX" -offset indent
-.It Sy "Third level name	Fourth level is:"
-.It Dv KERN_PROC_ARGS Ta "A process ID"
-.It Dv KERN_PROC_PATHNAME Ta "A process ID"
-.El
-.It Li KERN_PROF
-Return profiling information about the kernel.
-If the kernel is not compiled for profiling,
-attempts to retrieve any of the KERN_PROF values will
-fail with
-.Er ENOENT .
-The third level names for the string and integer profiling information
-is detailed below.
-The changeable column shows whether a process with appropriate
-privilege may change the value.
-.Bl -column "GPROFXGMONPARAMXXX" "struct gmonparamXXX" -offset indent
-.It Sy "Third level name	Type	Changeable"
-.It "GPROF_STATE	integer	yes"
-.It "GPROF_COUNT	u_short[\|]	yes"
-.It "GPROF_FROMS	u_short[\|]	yes"
-.It "GPROF_TOS	struct tostruct	yes"
-.It "GPROF_GMONPARAM	struct gmonparam	no"
-.El
-.Pp
-The variables are as follows:
-.Bl -tag -width 6n
-.It Li GPROF_STATE
-Returns GMON_PROF_ON or GMON_PROF_OFF to show that profiling
-is running or stopped.
-.It Li GPROF_COUNT
-Array of statistical program counter counts.
-.It Li GPROF_FROMS
-Array indexed by program counter of call-from points.
-.It Li GPROF_TOS
-Array of
-.Va struct tostruct
-describing destination of calls and their counts.
-.It Li GPROF_GMONPARAM
-Structure giving the sizes of the above arrays.
-.El
-.It Li KERN_QUANTUM
-The maximum period of time, in microseconds, for which a process is allowed
-to run without being preempted if other processes are in the run queue.
-.It Li KERN_SAVED_IDS
-Returns 1 if saved set-group and saved set-user ID is available.
-.It Li KERN_SECURELVL
-The system security level.
-This level may be raised by processes with appropriate privilege.
-It may not be lowered.
-.It Li KERN_VERSION
-The system version string.
-.It Li KERN_VNODE
-Return the entire vnode table.
-Note, the vnode table is not necessarily a consistent snapshot of
-the system.
-The returned data consists of an array whose size depends on the
-current number of such objects in the system.
-Each element of the array consists of a
-.Va struct xvnode .
-.El
-.Ss CTL_NET
-The string and integer information available for the CTL_NET level
-is detailed below.
-The changeable column shows whether a process with appropriate
-privilege may change the value.
-.Bl -column "Second level nameXXXXXX" "routing messagesXXX" -offset indent
-.It Sy "Second level name	Type	Changeable"
-.It "PF_ROUTE	routing messages	no"
-.It "PF_INET	IPv4 values	yes"
-.It "PF_INET6	IPv6 values	yes"
-.El
-.Bl -tag -width 6n
-.It Li PF_ROUTE
-Return the entire routing table or a subset of it.
-The data is returned as a sequence of routing messages (see
-.Xr route 4
-for the header file, format and meaning).
-The length of each message is contained in the message header.
-.Pp
-The third level name is a protocol number, which is currently always 0.
-The fourth level name is an address family, which may be set to 0 to
-select all address families.
-The fifth, sixth, and seventh level names are as follows:
-.Bl -column -offset indent "Fifth level      Sixth level" "Seventh level"
-.It Sy "Fifth level      Sixth level" Ta Sy "Seventh level"
-.It "NET_RT_FLAGS     rtflags" Ta "None"
-.It "NET_RT_DUMP      None" Ta "None or fib number"
-.It "NET_RT_IFLIST    0 or if_index" Ta None
-.It "NET_RT_IFMALIST  0 or if_index" Ta None
-.It "NET_RT_IFLISTL   0 or if_index" Ta None
-.El
-.Pp
-The
-.Dv NET_RT_IFMALIST
-name returns information about multicast group memberships on all interfaces
-if 0 is specified, or for the interface specified by
-.Va if_index .
-.Pp
-The
-.Dv NET_RT_IFLISTL
-is like
-.Dv NET_RT_IFLIST ,
-just returning message header structs with additional fields allowing the
-interface to be extended without breaking binary compatibility.
-The
-.Dv NET_RT_IFLISTL
-uses 'l' versions of the message header structures:
-.Va struct if_msghdrl
-and
-.Va struct ifa_msghdrl .
-.It Li PF_INET
-Get or set various global information about the IPv4
-(Internet Protocol version 4).
-The third level name is the protocol.
-The fourth level name is the variable name.
-The currently defined protocols and names are:
-.Bl -column ProtocolXX VariableXX TypeXX ChangeableXX
-.It Sy "Protocol	Variable	Type	Changeable"
-.It "icmp	bmcastecho	integer	yes"
-.It "icmp	maskrepl	integer	yes"
-.It "ip	forwarding	integer	yes"
-.It "ip	redirect	integer	yes"
-.It "ip	ttl	integer	yes"
-.It "udp	checksum	integer	yes"
-.El
-.Pp
-The variables are as follows:
-.Bl -tag -width 6n
-.It Li icmp.bmcastecho
-Returns 1 if an ICMP echo request to a broadcast or multicast address is
-to be answered.
-.It Li icmp.maskrepl
-Returns 1 if ICMP network mask requests are to be answered.
-.It Li ip.forwarding
-Returns 1 when IP forwarding is enabled for the host,
-meaning that the host is acting as a router.
-.It Li ip.redirect
-Returns 1 when ICMP redirects may be sent by the host.
-This option is ignored unless the host is routing IP packets,
-and should normally be enabled on all systems.
-.It Li ip.ttl
-The maximum time-to-live (hop count) value for an IP packet sourced by
-the system.
-This value applies to normal transport protocols, not to ICMP.
-.It Li udp.checksum
-Returns 1 when UDP checksums are being computed and checked.
-Disabling UDP checksums is strongly discouraged.
-.Pp
-For variables net.inet.*.ipsec, please refer to
-.Xr ipsec 4 .
-.El
-.It Li PF_INET6
-Get or set various global information about the IPv6
-(Internet Protocol version 6).
-The third level name is the protocol.
-The fourth level name is the variable name.
-.Pp
-For variables net.inet6.* please refer to
-.Xr inet6 4 .
-For variables net.inet6.*.ipsec6, please refer to
-.Xr ipsec 4 .
-.El
-.Ss CTL_USER
-The string and integer information available for the CTL_USER level
-is detailed below.
-The changeable column shows whether a process with appropriate
-privilege may change the value.
-.Bl -column "USER_COLL_WEIGHTS_MAXXXX" "integerXXX" -offset indent
-.It Sy "Second level name	Type	Changeable"
-.It "USER_BC_BASE_MAX	integer	no"
-.It "USER_BC_DIM_MAX	integer	no"
-.It "USER_BC_SCALE_MAX	integer	no"
-.It "USER_BC_STRING_MAX	integer	no"
-.It "USER_COLL_WEIGHTS_MAX	integer	no"
-.It "USER_CS_PATH	string	no"
-.It "USER_EXPR_NEST_MAX	integer	no"
-.It "USER_LINE_MAX	integer	no"
-.It "USER_POSIX2_CHAR_TERM	integer	no"
-.It "USER_POSIX2_C_BIND	integer	no"
-.It "USER_POSIX2_C_DEV	integer	no"
-.It "USER_POSIX2_FORT_DEV	integer	no"
-.It "USER_POSIX2_FORT_RUN	integer	no"
-.It "USER_POSIX2_LOCALEDEF	integer	no"
-.It "USER_POSIX2_SW_DEV	integer	no"
-.It "USER_POSIX2_UPE	integer	no"
-.It "USER_POSIX2_VERSION	integer	no"
-.It "USER_RE_DUP_MAX	integer	no"
-.It "USER_STREAM_MAX	integer	no"
-.It "USER_TZNAME_MAX	integer	no"
-.El
-.Bl -tag -width 6n
-.It Li USER_BC_BASE_MAX
-The maximum ibase/obase values in the
-.Xr bc 1
-utility.
-.It Li USER_BC_DIM_MAX
-The maximum array size in the
-.Xr bc 1
-utility.
-.It Li USER_BC_SCALE_MAX
-The maximum scale value in the
-.Xr bc 1
-utility.
-.It Li USER_BC_STRING_MAX
-The maximum string length in the
-.Xr bc 1
-utility.
-.It Li USER_COLL_WEIGHTS_MAX
-The maximum number of weights that can be assigned to any entry of
-the LC_COLLATE order keyword in the locale definition file.
-.It Li USER_CS_PATH
-Return a value for the
-.Ev PATH
-environment variable that finds all the standard utilities.
-.It Li USER_EXPR_NEST_MAX
-The maximum number of expressions that can be nested within
-parenthesis by the
-.Xr expr 1
-utility.
-.It Li USER_LINE_MAX
-The maximum length in bytes of a text-processing utility's input
-line.
-.It Li USER_POSIX2_CHAR_TERM
-Return 1 if the system supports at least one terminal type capable of
-all operations described in
-.St -p1003.2 ,
-otherwise 0.
-.It Li USER_POSIX2_C_BIND
-Return 1 if the system's C-language development facilities support the
-C-Language Bindings Option, otherwise 0.
-.It Li USER_POSIX2_C_DEV
-Return 1 if the system supports the C-Language Development Utilities Option,
-otherwise 0.
-.It Li USER_POSIX2_FORT_DEV
-Return 1 if the system supports the FORTRAN Development Utilities Option,
-otherwise 0.
-.It Li USER_POSIX2_FORT_RUN
-Return 1 if the system supports the FORTRAN Runtime Utilities Option,
-otherwise 0.
-.It Li USER_POSIX2_LOCALEDEF
-Return 1 if the system supports the creation of locales, otherwise 0.
-.It Li USER_POSIX2_SW_DEV
-Return 1 if the system supports the Software Development Utilities Option,
-otherwise 0.
-.It Li USER_POSIX2_UPE
-Return 1 if the system supports the User Portability Utilities Option,
-otherwise 0.
-.It Li USER_POSIX2_VERSION
-The version of
-.St -p1003.2
-with which the system attempts to comply.
-.It Li USER_RE_DUP_MAX
-The maximum number of repeated occurrences of a regular expression
-permitted when using interval notation.
-.It Li USER_STREAM_MAX
-The minimum maximum number of streams that a process may have open
-at any one time.
-.It Li USER_TZNAME_MAX
-The minimum maximum number of types supported for the name of a
-timezone.
-.El
-.Ss CTL_VM
-The string and integer information available for the CTL_VM level
-is detailed below.
-The changeable column shows whether a process with appropriate
-privilege may change the value.
-.Bl -column "Second level nameXXXXXX" "struct loadavgXXX" -offset indent
-.It Sy "Second level name	Type	Changeable"
-.It "VM_LOADAVG	struct loadavg	no"
-.It "VM_TOTAL	struct vmtotal	no"
-.It "VM_SWAPPING_ENABLED	integer	maybe"
-.It "VM_V_CACHE_MAX	integer	yes"
-.It "VM_V_CACHE_MIN	integer	yes"
-.It "VM_V_FREE_MIN	integer	yes"
-.It "VM_V_FREE_RESERVED	integer	yes"
-.It "VM_V_FREE_TARGET	integer	yes"
-.It "VM_V_INACTIVE_TARGET	integer	yes"
-.It "VM_V_PAGEOUT_FREE_MIN	integer	yes"
-.El
-.Bl -tag -width 6n
-.It Li VM_LOADAVG
-Return the load average history.
-The returned data consists of a
-.Va struct loadavg .
-.It Li VM_TOTAL
-Return the system wide virtual memory statistics.
-The returned data consists of a
-.Va struct vmtotal .
-.It Li VM_SWAPPING_ENABLED
-1 if process swapping is enabled or 0 if disabled.
-This variable is
-permanently set to 0 if the kernel was built with swapping disabled.
-.It Li VM_V_CACHE_MAX
-Maximum desired size of the cache queue.
-.It Li VM_V_CACHE_MIN
-Minimum desired size of the cache queue.
-If the cache queue size
-falls very far below this value, the pageout daemon is awakened.
-.It Li VM_V_FREE_MIN
-Minimum amount of memory (cache memory plus free memory)
-required to be available before a process waiting on memory will be
-awakened.
-.It Li VM_V_FREE_RESERVED
-Processes will awaken the pageout daemon and wait for memory if the
-number of free and cached pages drops below this value.
-.It Li VM_V_FREE_TARGET
-The total amount of free memory (including cache memory) that the
-pageout daemon tries to maintain.
-.It Li VM_V_INACTIVE_TARGET
-The desired number of inactive pages that the pageout daemon should
-achieve when it runs.
-Inactive pages can be quickly inserted into
-process address space when needed.
-.It Li VM_V_PAGEOUT_FREE_MIN
-If the amount of free and cache memory falls below this value, the
-pageout daemon will enter "memory conserving mode" to avoid deadlock.
-.El
-.Sh RETURN VALUES
-.Rv -std
-.Sh FILES
-.Bl -tag -width <netinet/icmpXvar.h> -compact
-.It In sys/sysctl.h
-definitions for top level identifiers, second level kernel and hardware
-identifiers, and user level identifiers
-.It In sys/socket.h
-definitions for second level network identifiers
-.It In sys/gmon.h
-definitions for third level profiling identifiers
-.It In vm/vm_param.h
-definitions for second level virtual memory identifiers
-.It In netinet/in.h
-definitions for third level IPv4/IPv6 identifiers and
-fourth level IPv4/v6 identifiers
-.It In netinet/icmp_var.h
-definitions for fourth level ICMP identifiers
-.It In netinet/icmp6.h
-definitions for fourth level ICMPv6 identifiers
-.It In netinet/udp_var.h
-definitions for fourth level UDP identifiers
-.El
-.Sh ERRORS
-The following errors may be reported:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The buffer
-.Fa name ,
-.Fa oldp ,
-.Fa newp ,
-or length pointer
-.Fa oldlenp
-contains an invalid address.
-.It Bq Er EINVAL
-The
-.Fa name
-array is less than two or greater than CTL_MAXNAME.
-.It Bq Er EINVAL
-A non-null
-.Fa newp
-is given and its specified length in
-.Fa newlen
-is too large or too small.
-.It Bq Er ENOMEM
-The length pointed to by
-.Fa oldlenp
-is too short to hold the requested value.
-.It Bq Er ENOMEM
-The smaller of either the length pointed to by
-.Fa oldlenp
-or the estimated size of the returned data exceeds the
-system limit on locked memory.
-.It Bq Er ENOMEM
-Locking the buffer
-.Fa oldp ,
-or a portion of the buffer if the estimated size of the data
-to be returned is smaller,
-would cause the process to exceed its per-process locked memory limit.
-.It Bq Er ENOTDIR
-The
-.Fa name
-array specifies an intermediate rather than terminal name.
-.It Bq Er EISDIR
-The
-.Fa name
-array specifies a terminal name, but the actual name is not terminal.
-.It Bq Er ENOENT
-The
-.Fa name
-array specifies a value that is unknown.
-.It Bq Er EPERM
-An attempt is made to set a read-only value.
-.It Bq Er EPERM
-A process without appropriate privilege attempts to set a value.
-.El
-.Sh SEE ALSO
-.Xr confstr 3 ,
-.Xr kvm 3 ,
-.Xr sysconf 3 ,
-.Xr sysctl 8
-.Sh HISTORY
-The
-.Fn sysctl
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/gen/sysctl.c b/lib/libc_bsd/gen/sysctl.c
deleted file mode 100644
index 6a25e5a..0000000
--- a/lib/libc_bsd/gen/sysctl.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*-
- * Copyright (c) 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sysctl.c	8.2 (Berkeley) 1/4/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/sysctl.c 285604 2015-07-15 16:55:56Z pkelsey $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-
-extern int __sysctl(const int *name, u_int namelen, void *oldp,
-    size_t *oldlenp, const void *newp, size_t newlen);
-
-int
-sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp,
-    const void *newp, size_t newlen)
-{
-	int retval;
-	size_t orig_oldlen;
-
-	orig_oldlen = oldlenp ? *oldlenp : 0;
-	retval = __sysctl(name, namelen, oldp, oldlenp, newp, newlen);
-	/*
-	 * All valid names under CTL_USER have a dummy entry in the sysctl
-	 * tree (to support name lookups and enumerations) with an
-	 * empty/zero value, and the true value is supplied by this routine.
-	 * For all such names, __sysctl() is used solely to validate the
-	 * name.
-	 *
-	 * Return here unless there was a successful lookup for a CTL_USER
-	 * name.
-	 */
-	if (retval || name[0] != CTL_USER)
-		return (retval);
-
-	if (newp != NULL) {
-		errno = EPERM;
-		return (-1);
-	}
-	if (namelen != 2) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	switch (name[1]) {
-	case USER_CS_PATH:
-		if (oldp && orig_oldlen < sizeof(_PATH_STDPATH)) {
-			errno = ENOMEM;
-			return -1;
-		}
-		*oldlenp = sizeof(_PATH_STDPATH);
-		if (oldp != NULL)
-			memmove(oldp, _PATH_STDPATH, sizeof(_PATH_STDPATH));
-		return (0);
-	}
-
-	if (oldp && *oldlenp < sizeof(int)) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	*oldlenp = sizeof(int);
-	if (oldp == NULL)
-		return (0);
-
-	switch (name[1]) {
-	case USER_BC_BASE_MAX:
-		*(int *)oldp = BC_BASE_MAX;
-		return (0);
-	case USER_BC_DIM_MAX:
-		*(int *)oldp = BC_DIM_MAX;
-		return (0);
-	case USER_BC_SCALE_MAX:
-		*(int *)oldp = BC_SCALE_MAX;
-		return (0);
-	case USER_BC_STRING_MAX:
-		*(int *)oldp = BC_STRING_MAX;
-		return (0);
-	case USER_COLL_WEIGHTS_MAX:
-		*(int *)oldp = COLL_WEIGHTS_MAX;
-		return (0);
-	case USER_EXPR_NEST_MAX:
-		*(int *)oldp = EXPR_NEST_MAX;
-		return (0);
-	case USER_LINE_MAX:
-		*(int *)oldp = LINE_MAX;
-		return (0);
-	case USER_RE_DUP_MAX:
-		*(int *)oldp = RE_DUP_MAX;
-		return (0);
-	case USER_POSIX2_VERSION:
-		*(int *)oldp = _POSIX2_VERSION;
-		return (0);
-	case USER_POSIX2_C_BIND:
-#ifdef POSIX2_C_BIND
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_C_DEV:
-#ifdef	POSIX2_C_DEV
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_CHAR_TERM:
-#ifdef	POSIX2_CHAR_TERM
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_FORT_DEV:
-#ifdef	POSIX2_FORT_DEV
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_FORT_RUN:
-#ifdef	POSIX2_FORT_RUN
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_LOCALEDEF:
-#ifdef	POSIX2_LOCALEDEF
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_SW_DEV:
-#ifdef	POSIX2_SW_DEV
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_POSIX2_UPE:
-#ifdef	POSIX2_UPE
-		*(int *)oldp = 1;
-#else
-		*(int *)oldp = 0;
-#endif
-		return (0);
-	case USER_STREAM_MAX:
-		*(int *)oldp = FOPEN_MAX;
-		return (0);
-	case USER_TZNAME_MAX:
-		*(int *)oldp = NAME_MAX;
-		return (0);
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/gen/sysctlbyname.c b/lib/libc_bsd/gen/sysctlbyname.c
deleted file mode 100644
index dcee4ce..0000000
--- a/lib/libc_bsd/gen/sysctlbyname.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/sysctlbyname.c 244153 2012-12-12 15:27:33Z pjd $");
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-
-int
-sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
-    const void *newp, size_t newlen)
-{
-	int real_oid[CTL_MAXNAME+2];
-	size_t oidlen;
-
-	oidlen = sizeof(real_oid) / sizeof(int);
-	if (sysctlnametomib(name, real_oid, &oidlen) < 0)
-		return (-1);
-	return (sysctl(real_oid, oidlen, oldp, oldlenp, newp, newlen));
-}
diff --git a/lib/libc_bsd/gen/sysctlnametomib.c b/lib/libc_bsd/gen/sysctlnametomib.c
deleted file mode 100644
index 8846c9b..0000000
--- a/lib/libc_bsd/gen/sysctlnametomib.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2001 The FreeBSD Project. 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``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 FREEBSD PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/sysctlnametomib.c 204170 2010-02-21 13:57:02Z ed $");
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <string.h>
-
-/*
- * This function uses a presently undocumented interface to the kernel
- * to walk the tree and get the type so it can print the value.
- * This interface is under work and consideration, and should probably
- * be killed with a big axe by the first person who can find the time.
- * (be aware though, that the proper interface isn't as obvious as it
- * may seem, there are various conflicting requirements.
- */
-int
-sysctlnametomib(const char *name, int *mibp, size_t *sizep)
-{
-	int oid[2];
-	int error;
-
-	oid[0] = 0;
-	oid[1] = 3;
-
-	*sizep *= sizeof(int);
-	error = sysctl(oid, 2, mibp, sizep, name, strlen(name));
-	*sizep /= sizeof(int);
-	return (error);
-}
diff --git a/lib/libc_bsd/gen/syslog.3 b/lib/libc_bsd/gen/syslog.3
deleted file mode 100644
index 6b8c4a8..0000000
--- a/lib/libc_bsd/gen/syslog.3
+++ /dev/null
@@ -1,295 +0,0 @@
-.\" Copyright (c) 1985, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)syslog.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/syslog.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd December 30, 2004
-.Dt SYSLOG 3
-.Os
-.Sh NAME
-.Nm syslog ,
-.Nm vsyslog ,
-.Nm openlog ,
-.Nm closelog ,
-.Nm setlogmask
-.Nd control system log
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In syslog.h
-.In stdarg.h
-.Ft void
-.Fn syslog "int priority" "const char *message" "..."
-.Ft void
-.Fn vsyslog "int priority" "const char *message" "va_list args"
-.Ft void
-.Fn openlog "const char *ident" "int logopt" "int facility"
-.Ft void
-.Fn closelog void
-.Ft int
-.Fn setlogmask "int maskpri"
-.Sh DESCRIPTION
-The
-.Fn syslog
-function
-writes
-.Fa message
-to the system message logger.
-The message is then written to the system console, log files,
-logged-in users, or forwarded to other machines as appropriate.
-(See
-.Xr syslogd 8 . )
-.Pp
-The message is identical to a
-.Xr printf 3
-format string, except that
-.Ql %m
-is replaced by the current error
-message.
-(As denoted by the global variable
-.Va errno ;
-see
-.Xr strerror 3 . )
-A trailing newline is added if none is present.
-.Pp
-The
-.Fn vsyslog
-function
-is an alternate form in which the arguments have already been captured
-using the variable-length argument facilities of
-.Xr stdarg 3 .
-.Pp
-The message is tagged with
-.Fa priority .
-Priorities are encoded as a
-.Fa facility
-and a
-.Em level .
-The facility describes the part of the system
-generating the message.
-The level is selected from the following
-.Em ordered
-(high to low) list:
-.Bl -tag -width LOG_AUTHPRIV
-.It Dv LOG_EMERG
-A panic condition.
-This is normally broadcast to all users.
-.It Dv LOG_ALERT
-A condition that should be corrected immediately, such as a corrupted
-system database.
-.It Dv LOG_CRIT
-Critical conditions, e.g., hard device errors.
-.It Dv LOG_ERR
-Errors.
-.It Dv LOG_WARNING
-Warning messages.
-.It Dv LOG_NOTICE
-Conditions that are not error conditions,
-but should possibly be handled specially.
-.It Dv LOG_INFO
-Informational messages.
-.It Dv LOG_DEBUG
-Messages that contain information
-normally of use only when debugging a program.
-.El
-.Pp
-The
-.Fn openlog
-function
-provides for more specialized processing of the messages sent
-by
-.Fn syslog
-and
-.Fn vsyslog .
-The
-.Fa ident
-argument
-is a string that will be prepended to every message.
-The
-.Fa logopt
-argument
-is a bit field specifying logging options, which is formed by
-.Tn OR Ns 'ing
-one or more of the following values:
-.Bl -tag -width LOG_AUTHPRIV
-.It Dv LOG_CONS
-If
-.Fn syslog
-cannot pass the message to
-.Xr syslogd 8
-it will attempt to write the message to the console
-.Pq Dq Pa /dev/console .
-.It Dv LOG_NDELAY
-Open the connection to
-.Xr syslogd 8
-immediately.
-Normally the open is delayed until the first message is logged.
-Useful for programs that need to manage the order in which file
-descriptors are allocated.
-.It Dv LOG_PERROR
-Write the message to standard error output as well to the system log.
-.It Dv LOG_PID
-Log the process id with each message: useful for identifying
-instantiations of daemons.
-.El
-.Pp
-The
-.Fa facility
-argument encodes a default facility to be assigned to all messages
-that do not have an explicit facility encoded:
-.Bl -tag -width LOG_AUTHPRIV
-.It Dv LOG_AUTH
-The authorization system:
-.Xr login 1 ,
-.Xr su 1 ,
-.Xr getty 8 ,
-etc.
-.It Dv LOG_AUTHPRIV
-The same as
-.Dv LOG_AUTH ,
-but logged to a file readable only by
-selected individuals.
-.It Dv LOG_CONSOLE
-Messages written to
-.Pa /dev/console
-by the kernel console output driver.
-.It Dv LOG_CRON
-The cron daemon:
-.Xr cron 8 .
-.It Dv LOG_DAEMON
-System daemons, such as
-.Xr routed 8 ,
-that are not provided for explicitly by other facilities.
-.It Dv LOG_FTP
-The file transfer protocol daemons:
-.Xr ftpd 8 ,
-.Xr tftpd 8 .
-.It Dv LOG_KERN
-Messages generated by the kernel.
-These cannot be generated by any user processes.
-.It Dv LOG_LPR
-The line printer spooling system:
-.Xr lpr 1 ,
-.Xr lpc 8 ,
-.Xr lpd 8 ,
-etc.
-.It Dv LOG_MAIL
-The mail system.
-.It Dv LOG_NEWS
-The network news system.
-.It Dv LOG_NTP
-The network time protocol system.
-.It Dv LOG_SECURITY
-Security subsystems, such as
-.Xr ipfw 4 .
-.It Dv LOG_SYSLOG
-Messages generated internally by
-.Xr syslogd 8 .
-.It Dv LOG_USER
-Messages generated by random user processes.
-This is the default facility identifier if none is specified.
-.It Dv LOG_UUCP
-The uucp system.
-.It Dv LOG_LOCAL0
-Reserved for local use.
-Similarly for
-.Dv LOG_LOCAL1
-through
-.Dv LOG_LOCAL7 .
-.El
-.Pp
-The
-.Fn closelog
-function
-can be used to close the log file.
-.Pp
-The
-.Fn setlogmask
-function
-sets the log priority mask to
-.Fa maskpri
-and returns the previous mask.
-Calls to
-.Fn syslog
-with a priority not set in
-.Fa maskpri
-are rejected.
-The mask for an individual priority
-.Fa pri
-is calculated by the macro
-.Fn LOG_MASK pri ;
-the mask for all priorities up to and including
-.Fa toppri
-is given by the macro
-.Fn LOG_UPTO toppri ; .
-The default allows all priorities to be logged.
-.Sh RETURN VALUES
-The routines
-.Fn closelog ,
-.Fn openlog ,
-.Fn syslog
-and
-.Fn vsyslog
-return no value.
-.Pp
-The routine
-.Fn setlogmask
-always returns the previous log mask level.
-.Sh EXAMPLES
-.Bd -literal -offset indent -compact
-syslog(LOG_ALERT, "who: internal error 23");
-
-openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_FTP);
-
-setlogmask(LOG_UPTO(LOG_ERR));
-
-syslog(LOG_INFO, "Connection from host %d", CallingHost);
-
-syslog(LOG_INFO|LOG_LOCAL2, "foobar error: %m");
-.Ed
-.Sh SEE ALSO
-.Xr logger 1 ,
-.Xr syslogd 8
-.Sh HISTORY
-These
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-Never pass a string with user-supplied data as a format without using
-.Ql %s .
-An attacker can put format specifiers in the string to mangle your stack,
-leading to a possible security hole.
-This holds true even if the string was built using a function like
-.Fn snprintf ,
-as the resulting string may still contain user-supplied conversion specifiers
-for later interpolation by
-.Fn syslog .
-.Pp
-Always use the proper secure idiom:
-.Pp
-.Dl syslog("%s", string);
diff --git a/lib/libc_bsd/gen/syslog.c b/lib/libc_bsd/gen/syslog.c
deleted file mode 100644
index 646c09e..0000000
--- a/lib/libc_bsd/gen/syslog.c
+++ /dev/null
@@ -1,457 +0,0 @@
-/*
- * Copyright (c) 1983, 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)syslog.c	8.5 (Berkeley) 4/29/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/syslog.c 275626 2014-12-09 00:47:02Z delphij $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <netdb.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <stdarg.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-static int	LogFile = -1;		/* fd for log */
-static int	status;			/* connection status */
-static int	opened;			/* have done openlog() */
-static int	LogStat = 0;		/* status bits, set by openlog() */
-static const char *LogTag = NULL;	/* string to tag the entry with */
-static int	LogFacility = LOG_USER;	/* default facility code */
-static int	LogMask = 0xff;		/* mask of priorities to be logged */
-static pthread_mutex_t	syslog_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define	THREAD_LOCK()							\
-	do { 								\
-		if (__isthreaded) _pthread_mutex_lock(&syslog_mutex);	\
-	} while(0)
-#define	THREAD_UNLOCK()							\
-	do {								\
-		if (__isthreaded) _pthread_mutex_unlock(&syslog_mutex);	\
-	} while(0)
-
-static void	disconnectlog(void); /* disconnect from syslogd */
-static void	connectlog(void);	/* (re)connect to syslogd */
-static void	openlog_unlocked(const char *, int, int);
-
-enum {
-	NOCONN = 0,
-	CONNDEF,
-	CONNPRIV,
-};
-
-/*
- * Format of the magic cookie passed through the stdio hook
- */
-struct bufcookie {
-	char	*base;	/* start of buffer */
-	int	left;
-};
-
-/*
- * stdio write hook for writing to a static string buffer
- * XXX: Maybe one day, dynamically allocate it so that the line length
- *      is `unlimited'.
- */
-static int
-writehook(void *cookie, const char *buf, int len)
-{
-	struct bufcookie *h;	/* private `handle' */
-
-	h = (struct bufcookie *)cookie;
-	if (len > h->left) {
-		/* clip in case of wraparound */
-		len = h->left;
-	}
-	if (len > 0) {
-		(void)memcpy(h->base, buf, len); /* `write' it. */
-		h->base += len;
-		h->left -= len;
-	}
-	return len;
-}
-
-/*
- * syslog, vsyslog --
- *	print message on log file; output is intended for syslogd(8).
- */
-void
-syslog(int pri, const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vsyslog(pri, fmt, ap);
-	va_end(ap);
-}
-
-void
-vsyslog(int pri, const char *fmt, va_list ap)
-{
-	int cnt;
-	char ch, *p;
-	time_t now;
-	int fd, saved_errno;
-	char *stdp, tbuf[2048], fmt_cpy[1024], timbuf[26], errstr[64];
-	FILE *fp, *fmt_fp;
-	struct bufcookie tbuf_cookie;
-	struct bufcookie fmt_cookie;
-
-#define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
-	/* Check for invalid bits. */
-	if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) {
-		syslog(INTERNALLOG,
-		    "syslog: unknown facility/priority: %x", pri);
-		pri &= LOG_PRIMASK|LOG_FACMASK;
-	}
-
-	saved_errno = errno;
-
-	THREAD_LOCK();
-
-	/* Check priority against setlogmask values. */
-	if (!(LOG_MASK(LOG_PRI(pri)) & LogMask)) {
-		THREAD_UNLOCK();
-		return;
-	}
-
-	/* Set default facility if none specified. */
-	if ((pri & LOG_FACMASK) == 0)
-		pri |= LogFacility;
-
-	/* Create the primary stdio hook */
-	tbuf_cookie.base = tbuf;
-	tbuf_cookie.left = sizeof(tbuf);
-	fp = fwopen(&tbuf_cookie, writehook);
-	if (fp == NULL) {
-		THREAD_UNLOCK();
-		return;
-	}
-
-	/* Build the message. */
-	(void)time(&now);
-	(void)fprintf(fp, "<%d>", pri);
-	(void)fprintf(fp, "%.15s ", ctime_r(&now, timbuf) + 4);
-	if (LogStat & LOG_PERROR) {
-		/* Transfer to string buffer */
-		(void)fflush(fp);
-		stdp = tbuf + (sizeof(tbuf) - tbuf_cookie.left);
-	}
-	if (LogTag == NULL)
-		LogTag = _getprogname();
-	if (LogTag != NULL)
-		(void)fprintf(fp, "%s", LogTag);
-	if (LogStat & LOG_PID)
-		(void)fprintf(fp, "[%d]", getpid());
-	if (LogTag != NULL) {
-		(void)fprintf(fp, ": ");
-	}
-
-	/* Check to see if we can skip expanding the %m */
-	if (strstr(fmt, "%m")) {
-
-		/* Create the second stdio hook */
-		fmt_cookie.base = fmt_cpy;
-		fmt_cookie.left = sizeof(fmt_cpy) - 1;
-		fmt_fp = fwopen(&fmt_cookie, writehook);
-		if (fmt_fp == NULL) {
-			fclose(fp);
-			THREAD_UNLOCK();
-			return;
-		}
-
-		/*
-		 * Substitute error message for %m.  Be careful not to
-		 * molest an escaped percent "%%m".  We want to pass it
-		 * on untouched as the format is later parsed by vfprintf.
-		 */
-		for ( ; (ch = *fmt); ++fmt) {
-			if (ch == '%' && fmt[1] == 'm') {
-				++fmt;
-				strerror_r(saved_errno, errstr, sizeof(errstr));
-				fputs(errstr, fmt_fp);
-			} else if (ch == '%' && fmt[1] == '%') {
-				++fmt;
-				fputc(ch, fmt_fp);
-				fputc(ch, fmt_fp);
-			} else {
-				fputc(ch, fmt_fp);
-			}
-		}
-
-		/* Null terminate if room */
-		fputc(0, fmt_fp);
-		fclose(fmt_fp);
-
-		/* Guarantee null termination */
-		fmt_cpy[sizeof(fmt_cpy) - 1] = '\0';
-
-		fmt = fmt_cpy;
-	}
-
-	(void)vfprintf(fp, fmt, ap);
-	(void)fclose(fp);
-
-	cnt = sizeof(tbuf) - tbuf_cookie.left;
-
-	/* Remove a trailing newline */
-	if (tbuf[cnt - 1] == '\n')
-		cnt--;
-
-	/* Output to stderr if requested. */
-	if (LogStat & LOG_PERROR) {
-		struct iovec iov[2];
-		struct iovec *v = iov;
-
-		v->iov_base = stdp;
-		v->iov_len = cnt - (stdp - tbuf);
-		++v;
-		v->iov_base = "\n";
-		v->iov_len = 1;
-		(void)_writev(STDERR_FILENO, iov, 2);
-	}
-
-	/* Get connected, output the message to the local logger. */
-	if (!opened)
-		openlog_unlocked(LogTag, LogStat | LOG_NDELAY, 0);
-	connectlog();
-
-	/*
-	 * If the send() fails, there are two likely scenarios: 
-	 *  1) syslogd was restarted
-	 *  2) /var/run/log is out of socket buffer space, which
-	 *     in most cases means local DoS.
-	 * If the error does not indicate a full buffer, we address
-	 * case #1 by attempting to reconnect to /var/run/log[priv]
-	 * and resending the message once.
-	 *
-	 * If we are working with a privileged socket, the retry
-	 * attempts end there, because we don't want to freeze a
-	 * critical application like su(1) or sshd(8).
-	 *
-	 * Otherwise, we address case #2 by repeatedly retrying the
-	 * send() to give syslogd a chance to empty its socket buffer.
-	 */
-
-	if (send(LogFile, tbuf, cnt, 0) < 0) {
-		if (errno != ENOBUFS) {
-			/*
-			 * Scenario 1: syslogd was restarted
-			 * reconnect and resend once
-			 */
-			disconnectlog();
-			connectlog();
-			if (send(LogFile, tbuf, cnt, 0) >= 0) {
-				THREAD_UNLOCK();
-				return;
-			}
-			/*
-			 * if the resend failed, fall through to
-			 * possible scenario 2
-			 */
-		}
-		while (errno == ENOBUFS) {
-			/*
-			 * Scenario 2: out of socket buffer space
-			 * possible DoS, fail fast on a privileged
-			 * socket
-			 */
-			if (status == CONNPRIV)
-				break;
-			_usleep(1);
-			if (send(LogFile, tbuf, cnt, 0) >= 0) {
-				THREAD_UNLOCK();
-				return;
-			}
-		}
-	} else {
-		THREAD_UNLOCK();
-		return;
-	}
-
-	/*
-	 * Output the message to the console; try not to block
-	 * as a blocking console should not stop other processes.
-	 * Make sure the error reported is the one from the syslogd failure.
-	 */
-	if (LogStat & LOG_CONS &&
-	    (fd = _open(_PATH_CONSOLE, O_WRONLY|O_NONBLOCK|O_CLOEXEC, 0)) >=
-	    0) {
-		struct iovec iov[2];
-		struct iovec *v = iov;
-
-		p = strchr(tbuf, '>') + 1;
-		v->iov_base = p;
-		v->iov_len = cnt - (p - tbuf);
-		++v;
-		v->iov_base = "\r\n";
-		v->iov_len = 2;
-		(void)_writev(fd, iov, 2);
-		(void)_close(fd);
-	}
-
-	THREAD_UNLOCK();
-}
-
-/* Should be called with mutex acquired */
-static void
-disconnectlog(void)
-{
-	/*
-	 * If the user closed the FD and opened another in the same slot,
-	 * that's their problem.  They should close it before calling on
-	 * system services.
-	 */
-	if (LogFile != -1) {
-		_close(LogFile);
-		LogFile = -1;
-	}
-	status = NOCONN;			/* retry connect */
-}
-
-/* Should be called with mutex acquired */
-static void
-connectlog(void)
-{
-	struct sockaddr_un SyslogAddr;	/* AF_UNIX address of local logger */
-
-	if (LogFile == -1) {
-		if ((LogFile = _socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
-			return;
-		(void)_fcntl(LogFile, F_SETFD, FD_CLOEXEC);
-	}
-	if (LogFile != -1 && status == NOCONN) {
-		SyslogAddr.sun_len = sizeof(SyslogAddr);
-		SyslogAddr.sun_family = AF_UNIX;
-
-		/*
-		 * First try privileged socket. If no success,
-		 * then try default socket.
-		 */
-		(void)strncpy(SyslogAddr.sun_path, _PATH_LOG_PRIV,
-		    sizeof SyslogAddr.sun_path);
-		if (_connect(LogFile, (struct sockaddr *)&SyslogAddr,
-		    sizeof(SyslogAddr)) != -1)
-			status = CONNPRIV;
-
-		if (status == NOCONN) {
-			(void)strncpy(SyslogAddr.sun_path, _PATH_LOG,
-			    sizeof SyslogAddr.sun_path);
-			if (_connect(LogFile, (struct sockaddr *)&SyslogAddr,
-			    sizeof(SyslogAddr)) != -1)
-				status = CONNDEF;
-		}
-
-		if (status == NOCONN) {
-			/*
-			 * Try the old "/dev/log" path, for backward
-			 * compatibility.
-			 */
-			(void)strncpy(SyslogAddr.sun_path, _PATH_OLDLOG,
-			    sizeof SyslogAddr.sun_path);
-			if (_connect(LogFile, (struct sockaddr *)&SyslogAddr,
-			    sizeof(SyslogAddr)) != -1)
-				status = CONNDEF;
-		}
-
-		if (status == NOCONN) {
-			(void)_close(LogFile);
-			LogFile = -1;
-		}
-	}
-}
-
-static void
-openlog_unlocked(const char *ident, int logstat, int logfac)
-{
-	if (ident != NULL)
-		LogTag = ident;
-	LogStat = logstat;
-	if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0)
-		LogFacility = logfac;
-
-	if (LogStat & LOG_NDELAY)	/* open immediately */
-		connectlog();
-
-	opened = 1;	/* ident and facility has been set */
-}
-
-void
-openlog(const char *ident, int logstat, int logfac)
-{
-	THREAD_LOCK();
-	openlog_unlocked(ident, logstat, logfac);
-	THREAD_UNLOCK();
-}
-
-
-void
-closelog(void)
-{
-	THREAD_LOCK();
-	if (LogFile != -1) {
-		(void)_close(LogFile);
-		LogFile = -1;
-	}
-	LogTag = NULL;
-	status = NOCONN;
-	THREAD_UNLOCK();
-}
-
-/* setlogmask -- set the log mask level */
-int
-setlogmask(int pmask)
-{
-	int omask;
-
-	THREAD_LOCK();
-	omask = LogMask;
-	if (pmask != 0)
-		LogMask = pmask;
-	THREAD_UNLOCK();
-	return (omask);
-}
diff --git a/lib/libc_bsd/gen/tcgetpgrp.3 b/lib/libc_bsd/gen/tcgetpgrp.3
deleted file mode 100644
index 7a2d67f..0000000
--- a/lib/libc_bsd/gen/tcgetpgrp.3
+++ /dev/null
@@ -1,78 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)tcgetpgrp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/tcgetpgrp.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt TCGETPGRP 3
-.Os
-.Sh NAME
-.Nm tcgetpgrp
-.Nd get foreground process group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft pid_t
-.Fn tcgetpgrp "int fd"
-.Sh DESCRIPTION
-The
-.Fn tcgetpgrp
-function returns the value of the process group ID of the foreground
-process group associated with the terminal device.
-If there is no foreground process group,
-.Fn tcgetpgrp
-returns an invalid process ID.
-.Sh ERRORS
-If an error occurs,
-.Fn tcgetpgrp
-returns -1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er ENOTTY
-The calling process does not have a controlling terminal or the
-underlying terminal device represented by
-.Fa fd
-is not the controlling terminal.
-.El
-.Sh SEE ALSO
-.Xr setpgid 2 ,
-.Xr setsid 2 ,
-.Xr tcsetpgrp 3
-.Sh STANDARDS
-The
-.Fn tcgetpgrp
-function is expected to be compliant with the
-.St -p1003.1-88
-specification.
diff --git a/lib/libc_bsd/gen/tcgetsid.3 b/lib/libc_bsd/gen/tcgetsid.3
deleted file mode 100644
index 2c3eb14..0000000
--- a/lib/libc_bsd/gen/tcgetsid.3
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" Copyright (c) 2008 David Xu <davidxu@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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/tcgetsid.3 208291 2010-05-19 08:57:53Z uqs $
-.\"
-.Dd April 15, 2008
-.Dt TCGETSID 3
-.Os
-.Sh NAME
-.Nm tcgetsid
-.Nd get session ID associated with a controlling terminal
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In termios.h
-.Ft pid_t
-.Fn tcgetsid "int fd"
-.Sh DESCRIPTION
-The
-.Fn tcgetsid
-function returns the process group ID of the session leader for a
-controlling terminal specified by
-.Fa fd .
-.Sh ERRORS
-If an error occurs,
-.Fn tcgetsid
-returns -1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er ENOTTY
-The calling process does not have a controlling terminal or the
-underlying terminal device represented by
-.Fa fd
-is not the controlling terminal.
-.El
-.Sh SEE ALSO
-.Xr getsid 2 ,
-.Xr setsid 2 ,
-.Xr tcgetpgrp 3 ,
-.Xr tcsetsid 3
-.Sh STANDARDS
-The
-.Fn tcgetsid
-function conforms to
-.St -xpg4.2 .
diff --git a/lib/libc_bsd/gen/tcsendbreak.3 b/lib/libc_bsd/gen/tcsendbreak.3
deleted file mode 100644
index d5cc4df..0000000
--- a/lib/libc_bsd/gen/tcsendbreak.3
+++ /dev/null
@@ -1,153 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)tcsendbreak.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/tcsendbreak.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt TCSENDBREAK 3
-.Os
-.Sh NAME
-.Nm tcsendbreak ,
-.Nm tcdrain ,
-.Nm tcflush ,
-.Nm tcflow
-.Nd line control functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In termios.h
-.Ft int
-.Fn tcdrain "int fd"
-.Ft int
-.Fn tcflow "int fd" "int action"
-.Ft int
-.Fn tcflush "int fd" "int action"
-.Ft int
-.Fn tcsendbreak "int fd" "int len"
-.Sh DESCRIPTION
-The
-.Fn tcdrain
-function waits until all output written to the terminal referenced by
-.Fa fd
-has been transmitted to the terminal.
-.Pp
-The
-.Fn tcflow
-function suspends transmission of data to or the reception of data from
-the terminal referenced by
-.Fa fd
-depending on the value of
-.Fa action .
-The value of
-.Fa action
-must be one of the following:
-.Bl -tag -width "TCIOFF"
-.It Fa TCOOFF
-Suspend output.
-.It Fa TCOON
-Restart suspended output.
-.It Fa TCIOFF
-Transmit a STOP character, which is intended to cause the terminal to stop
-transmitting data to the system.
-(See the description of IXOFF in the
-.Ql Input Modes
-section of
-.Xr termios 4 ) .
-.It Fa TCION
-Transmit a START character, which is intended to cause the terminal to start
-transmitting data to the system.
-(See the description of IXOFF in the
-.Ql Input Modes
-section of
-.Xr termios 4 ) .
-.El
-.Pp
-The
-.Fn tcflush
-function discards any data written to the terminal referenced by
-.Fa fd
-which has not been transmitted to the terminal, or any data received
-from the terminal but not yet read, depending on the value of
-.Fa action .
-The value of
-.Fa action
-must be one of the following:
-.Bl -tag -width "TCIOFLUSH"
-.It Fa TCIFLUSH
-Flush data received but not read.
-.It Fa TCOFLUSH
-Flush data written but not transmitted.
-.It Fa TCIOFLUSH
-Flush both data received but not read and data written but not transmitted.
-.El
-.Pp
-The
-.Fn tcsendbreak
-function transmits a continuous stream of zero-valued bits for four-tenths
-of a second to the terminal referenced by
-.Fa fd .
-The
-.Fa len
-argument is ignored in this implementation.
-.Sh RETURN VALUES
-Upon successful completion, all of these functions return a value of zero.
-.Sh ERRORS
-If any error occurs, a value of -1 is returned and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-The
-.Fa action
-argument is not a proper value.
-.It Bq Er ENOTTY
-The file associated with
-.Fa fd
-is not a terminal.
-.It Bq Er EINTR
-A signal interrupted the
-.Fn tcdrain
-function.
-.El
-.Sh SEE ALSO
-.Xr tcsetattr 3 ,
-.Xr termios 4
-.Sh STANDARDS
-The
-.Fn tcsendbreak ,
-.Fn tcdrain ,
-.Fn tcflush
-and
-.Fn tcflow
-functions are expected to be compliant with the
-.St -p1003.1-88
-specification.
diff --git a/lib/libc_bsd/gen/tcsetattr.3 b/lib/libc_bsd/gen/tcsetattr.3
deleted file mode 100644
index 0042205..0000000
--- a/lib/libc_bsd/gen/tcsetattr.3
+++ /dev/null
@@ -1,340 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)tcsetattr.3	8.3 (Berkeley) 1/2/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/tcsetattr.3 214680 2010-11-02 17:00:56Z ed $
-.\"
-.Dd January 2, 1994
-.Dt TCSETATTR 3
-.Os
-.Sh NAME
-.Nm cfgetispeed ,
-.Nm cfsetispeed ,
-.Nm cfgetospeed ,
-.Nm cfsetospeed ,
-.Nm cfsetspeed ,
-.Nm cfmakeraw ,
-.Nm cfmakesane ,
-.Nm tcgetattr ,
-.Nm tcsetattr
-.Nd manipulating the termios structure
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In termios.h
-.Ft speed_t
-.Fn cfgetispeed "const struct termios *t"
-.Ft int
-.Fn cfsetispeed "struct termios *t" "speed_t speed"
-.Ft speed_t
-.Fn cfgetospeed "const struct termios *t"
-.Ft int
-.Fn cfsetospeed "struct termios *t" "speed_t speed"
-.Ft int
-.Fn cfsetspeed "struct termios *t" "speed_t speed"
-.Ft void
-.Fn cfmakeraw "struct termios *t"
-.Ft void
-.Fn cfmakesane "struct termios *t"
-.Ft int
-.Fn tcgetattr "int fd" "struct termios *t"
-.Ft int
-.Fn tcsetattr "int fd" "int action" "const struct termios *t"
-.Sh DESCRIPTION
-The
-.Fn cfmakeraw ,
-.Fn cfmakesane ,
-.Fn tcgetattr
-and
-.Fn tcsetattr
-functions are provided for getting and setting the termios structure.
-.Pp
-The
-.Fn cfgetispeed ,
-.Fn cfsetispeed ,
-.Fn cfgetospeed ,
-.Fn cfsetospeed
-and
-.Fn cfsetspeed
-functions are provided for getting and setting the baud rate values in
-the termios structure.
-The effects of the functions on the terminal as described below
-do not become effective, nor are all errors detected, until the
-.Fn tcsetattr
-function is called.
-Certain values for baud rates set in the termios structure and passed to
-.Fn tcsetattr
-have special meanings.
-These are discussed in the portion of the manual page that describes the
-.Fn tcsetattr
-function.
-.Sh GETTING AND SETTING THE BAUD RATE
-The input and output baud rates are found in the termios structure.
-The unsigned integer
-.Li speed_t
-is typedef'd in the include file
-.In termios.h .
-The value of the integer corresponds directly to the baud rate being
-represented, however, the following symbolic values are defined.
-.Bd -literal
-#define B0	0
-#define B50	50
-#define B75	75
-#define B110	110
-#define B134	134
-#define B150	150
-#define B200	200
-#define B300	300
-#define B600	600
-#define B1200	1200
-#define	B1800	1800
-#define B2400	2400
-#define B4800	4800
-#define B9600	9600
-#define B19200	19200
-#define B38400	38400
-#ifndef _POSIX_SOURCE
-#define EXTA	19200
-#define EXTB	38400
-#endif  /*_POSIX_SOURCE */
-.Ed
-.Pp
-The
-.Fn cfgetispeed
-function returns the input baud rate in the termios structure referenced by
-.Fa tp .
-.Pp
-The
-.Fn cfsetispeed
-function sets the input baud rate in the termios structure referenced by
-.Fa tp
-to
-.Fa speed .
-.Pp
-The
-.Fn cfgetospeed
-function returns the output baud rate in the termios structure referenced by
-.Fa tp .
-.Pp
-The
-.Fn cfsetospeed
-function sets the output baud rate in the termios structure referenced by
-.Fa tp
-to
-.Fa speed .
-.Pp
-The
-.Fn cfsetspeed
-function sets both the input and output baud rate in the termios structure
-referenced by
-.Fa tp
-to
-.Fa speed .
-.Pp
-Upon successful completion, the functions
-.Fn cfsetispeed ,
-.Fn cfsetospeed ,
-and
-.Fn cfsetspeed
-return a value of 0.
-Otherwise, a value of -1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh GETTING AND SETTING THE TERMIOS STATE
-This section describes the functions that are used to control the general
-terminal interface.
-Unless otherwise noted for a specific command, these functions are restricted
-from use by background processes.
-Attempts to perform these operations shall cause the process group to be sent
-a SIGTTOU signal.
-If the calling process is blocking or ignoring SIGTTOU signals, the process
-is allowed to perform the operation and the SIGTTOU signal is not sent.
-.Pp
-In all the functions, although
-.Fa fd
-is an open file descriptor, the functions affect the underlying terminal
-file, not just the open file description associated with the particular
-file descriptor.
-.Pp
-The
-.Fn cfmakeraw
-function sets the flags stored in the termios structure to a state disabling
-all input and output processing, giving a
-.Dq raw I/O path ,
-while the
-.Fn cfmakesane
-function sets them to a state similar to those of a newly created
-terminal device.
-It should be noted that there is no function to reverse this effect.
-This is because there are a variety of processing options that could be
-re-enabled and the correct method is for an application to snapshot the
-current terminal state using the function
-.Fn tcgetattr ,
-setting raw or sane mode with
-.Fn cfmakeraw
-or
-.Fn cfmakesane
-and the subsequent
-.Fn tcsetattr ,
-and then using another
-.Fn tcsetattr
-with the saved state to revert to the previous terminal state.
-.Pp
-The
-.Fn tcgetattr
-function copies the parameters associated with the terminal referenced
-by
-.Fa fd
-in the termios structure referenced by
-.Fa tp .
-This function is allowed from a background process, however, the terminal
-attributes may be subsequently changed by a foreground process.
-.Pp
-The
-.Fn tcsetattr
-function sets the parameters associated with the terminal from the
-termios structure referenced by
-.Fa tp .
-The
-.Fa action
-argument is created by
-.Em or Ns 'ing
-the following values, as specified in the include file
-.In termios.h .
-.Bl -tag -width "TCSADRAIN"
-.It Fa TCSANOW
-The change occurs immediately.
-.It Fa TCSADRAIN
-The change occurs after all output written to
-.Fa fd
-has been transmitted to the terminal.
-This value of
-.Fa action
-should be used when changing parameters that affect output.
-.It Fa TCSAFLUSH
-The change occurs after all output written to
-.Fa fd
-has been transmitted to the terminal.
-Additionally, any input that has been received but not read is discarded.
-.It Fa TCSASOFT
-If this value is
-.Em or Ns 'ed
-into the
-.Fa action
-value, the values of the
-.Va c_cflag ,
-.Va c_ispeed ,
-and
-.Va c_ospeed
-fields are ignored.
-.El
-.Pp
-The 0 baud rate is used to terminate the connection.
-If 0 is specified as the output speed to the function
-.Fn tcsetattr ,
-modem control will no longer be asserted on the terminal, disconnecting
-the terminal.
-.Pp
-If zero is specified as the input speed to the function
-.Fn tcsetattr ,
-the input baud rate will be set to the same value as that specified by
-the output baud rate.
-.Pp
-If
-.Fn tcsetattr
-is unable to make any of the requested changes, it returns -1 and
-sets errno.
-Otherwise, it makes all of the requested changes it can.
-If the specified input and output baud rates differ and are a combination
-that is not supported, neither baud rate is changed.
-.Pp
-Upon successful completion, the functions
-.Fn tcgetattr
-and
-.Fn tcsetattr
-return a value of 0.
-Otherwise, they
-return -1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument to
-.Fn tcgetattr
-or
-.Fn tcsetattr
-was not a valid file descriptor.
-.It Bq Er EINTR
-The
-.Fn tcsetattr
-function was interrupted by a signal.
-.It Bq Er EINVAL
-The
-.Fa action
-argument to the
-.Fn tcsetattr
-function was not valid, or an attempt was made to change an attribute
-represented in the termios structure to an unsupported value.
-.It Bq Er ENOTTY
-The file associated with the
-.Fa fd
-argument to
-.Fn tcgetattr
-or
-.Fn tcsetattr
-is not a terminal.
-.El
-.Sh SEE ALSO
-.Xr tcsendbreak 3 ,
-.Xr termios 4
-.Sh STANDARDS
-The
-.Fn cfgetispeed ,
-.Fn cfsetispeed ,
-.Fn cfgetospeed ,
-.Fn cfsetospeed ,
-.Fn tcgetattr
-and
-.Fn tcsetattr
-functions are expected to be compliant with the
-.St -p1003.1-88
-specification.
-The
-.Fn cfmakeraw ,
-.Fn cfmakesane
-and
-.Fn cfsetspeed
-functions,
-as well as the
-.Li TCSASOFT
-option to the
-.Fn tcsetattr
-function are extensions to the
-.St -p1003.1-88
-specification.
diff --git a/lib/libc_bsd/gen/tcsetpgrp.3 b/lib/libc_bsd/gen/tcsetpgrp.3
deleted file mode 100644
index 92310cf..0000000
--- a/lib/libc_bsd/gen/tcsetpgrp.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)tcsetpgrp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/tcsetpgrp.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt TCSETPGRP 3
-.Os
-.Sh NAME
-.Nm tcsetpgrp
-.Nd set foreground process group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft int
-.Fn tcsetpgrp "int fd" "pid_t pgrp_id"
-.Sh DESCRIPTION
-If the process has a controlling terminal, the
-.Fn tcsetpgrp
-function sets the foreground process group ID associated with the
-terminal device to
-.Fa pgrp_id .
-The terminal device associated with
-.Fa fd
-must be the controlling terminal of the calling process and the
-controlling terminal must be currently associated with the session
-of the calling process.
-The value of
-.Fa pgrp_id
-must be the same as the process group ID of a process in the same
-session as the calling process.
-.Sh RETURN VALUES
-.Rv -std tcsetpgrp
-.Sh ERRORS
-The
-.Fn tcsetpgrp
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-An invalid value of
-.Fa pgrp_id
-was specified.
-.It Bq Er ENOTTY
-The calling process does not have a controlling terminal, or the file
-represented by
-.Fa fd
-is not the controlling terminal, or the controlling terminal is no
-longer associated with the session of the calling process.
-.It Bq Er EPERM
-The
-.Fa pgrp_id
-argument does not match the process group ID of a process in the same
-session as the calling process.
-.El
-.Sh SEE ALSO
-.Xr setpgid 2 ,
-.Xr setsid 2 ,
-.Xr tcgetpgrp 3
-.Sh STANDARDS
-The
-.Fn tcsetpgrp
-function is expected to be compliant with the
-.St -p1003.1-88
-specification.
diff --git a/lib/libc_bsd/gen/tcsetsid.3 b/lib/libc_bsd/gen/tcsetsid.3
deleted file mode 100644
index 207d6a6..0000000
--- a/lib/libc_bsd/gen/tcsetsid.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" Copyright (c) 2009 Ed Schouten <ed@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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/tcsetsid.3 191882 2009-05-07 13:49:48Z ed $
-.\"
-.Dd May 4, 2009
-.Dt TCSETSID 3
-.Os
-.Sh NAME
-.Nm tcsetsid
-.Nd set session ID associated with a controlling terminal
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In termios.h
-.Ft int
-.Fn tcsetsid "int fd" "pid_t pid"
-.Sh DESCRIPTION
-The
-.Fn tcsetsid
-function sets associates a session identified by
-.Fa pid
-with a controlling terminal specified by
-.Fa fd .
-.Pp
-This implementation only allows the controlling terminal to be changed
-by the session leader itself.
-This implies that
-.Fa pid
-always has to be equal to the process ID.
-.Pp
-It is unsupported to associate with a terminal that already has an
-associated session.
-Conversely, it is also unsupported to associate to a terminal when
-the session is already associated with a different terminal.
-.Sh ERRORS
-If an error occurs,
-.Fn tcsetsid
-returns -1 and the global variable
-.Va errno
-is set to indicate the error, as follows:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er ENOTTY
-The file descriptor represented by
-.Fa fd
-is not a terminal.
-.It Bq Er EINVAL
-The
-.Fa pid
-argument is not equal to the session ID of the calling process.
-.It Bq Er EPERM
-The calling process is not a session leader.
-.It Bq Er EPERM
-The session already has an associated terminal or the terminal already
-has an associated session.
-.El
-.Sh SEE ALSO
-.Xr getsid 2 ,
-.Xr setsid 2 ,
-.Xr tcgetpgrp 3 ,
-.Xr tcgetsid 3
-.Sh HISTORY
-A
-.Fn tcsetsid
-function first appeared in QNX.
-It does not comply to any standard.
diff --git a/lib/libc_bsd/gen/telldir.c b/lib/libc_bsd/gen/telldir.c
deleted file mode 100644
index fc7dbc1..0000000
--- a/lib/libc_bsd/gen/telldir.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)telldir.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/telldir.c 282979 2015-05-15 15:49:24Z julian $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/queue.h>
-#include <dirent.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "gen-private.h"
-#include "telldir.h"
-
-/*
- * return a pointer into a directory
- */
-long
-telldir(dirp)
-	DIR *dirp;
-{
-	struct ddloc *lp;
-	long idx;
-
-	if (__isthreaded)
-		_pthread_mutex_lock(&dirp->dd_lock);
-	LIST_FOREACH(lp, &dirp->dd_td->td_locq, loc_lqe) {
-		if (lp->loc_seek == dirp->dd_seek &&
-		    lp->loc_loc == dirp->dd_loc)
-			break;
-	}
-	if (lp == NULL) {
-		lp = malloc(sizeof(struct ddloc));
-		if (lp == NULL) {
-			if (__isthreaded)
-				_pthread_mutex_unlock(&dirp->dd_lock);
-			return (-1);
-		}
-		lp->loc_index = dirp->dd_td->td_loccnt++;
-		lp->loc_seek = dirp->dd_seek;
-		lp->loc_loc = dirp->dd_loc;
-		LIST_INSERT_HEAD(&dirp->dd_td->td_locq, lp, loc_lqe);
-	}
-	idx = lp->loc_index;
-	if (__isthreaded)
-		_pthread_mutex_unlock(&dirp->dd_lock);
-	return (idx);
-}
-
-/*
- * seek to an entry in a directory.
- * Only values returned by "telldir" should be passed to seekdir.
- */
-void
-_seekdir(dirp, loc)
-	DIR *dirp;
-	long loc;
-{
-	struct ddloc *lp;
-	struct dirent *dp;
-
-	LIST_FOREACH(lp, &dirp->dd_td->td_locq, loc_lqe) {
-		if (lp->loc_index == loc)
-			break;
-	}
-	if (lp == NULL)
-		return;
-	if (lp->loc_loc == dirp->dd_loc && lp->loc_seek == dirp->dd_seek)
-		return;
-
-	/* If it's within the same chunk of data, don't bother reloading. */
-	if (lp->loc_seek == dirp->dd_seek) {
-		/*
-		 * If we go back to 0 don't make the next readdir
-		 * trigger a call to getdirentries().
-		 */
-		if (lp->loc_loc == 0)
-			dirp->dd_flags |= __DTF_SKIPREAD;
-		dirp->dd_loc = lp->loc_loc;
-		return;
-	}
-	(void) lseek(dirp->dd_fd, (off_t)lp->loc_seek, SEEK_SET);
-	dirp->dd_seek = lp->loc_seek;
-	dirp->dd_loc = 0;
-	dirp->dd_flags &= ~__DTF_SKIPREAD; /* current contents are invalid */
-	while (dirp->dd_loc < lp->loc_loc) {
-		dp = _readdir_unlocked(dirp, 0);
-		if (dp == NULL)
-			break;
-	}
-}
-
-/*
- * After readdir returns the last entry in a block, a call to telldir
- * returns a location that is after the end of that last entry.
- * However, that location doesn't refer to a valid directory entry.
- * Ideally, the call to telldir would return a location that refers to
- * the first entry in the next block.  That location is not known
- * until the next block is read, so readdir calls this function after
- * fetching a new block to fix any such telldir locations.
- */
-void
-_fixtelldir(DIR *dirp, long oldseek, long oldloc)
-{
-	struct ddloc *lp;
-
-	lp = LIST_FIRST(&dirp->dd_td->td_locq);
-	if (lp != NULL) {
-		if (lp->loc_loc == oldloc &&
-		    lp->loc_seek == oldseek) {
-			lp->loc_seek = dirp->dd_seek;
-			lp->loc_loc = dirp->dd_loc;
-		}
-	}
-}
-
-/*
- * Reclaim memory for telldir cookies which weren't used.
- */
-void
-_reclaim_telldir(dirp)
-	DIR *dirp;
-{
-	struct ddloc *lp;
-	struct ddloc *templp;
-
-	lp = LIST_FIRST(&dirp->dd_td->td_locq);
-	while (lp != NULL) {
-		templp = lp;
-		lp = LIST_NEXT(lp, loc_lqe);
-		free(templp);
-	}
-	LIST_INIT(&dirp->dd_td->td_locq);
-}
diff --git a/lib/libc_bsd/gen/telldir.h b/lib/libc_bsd/gen/telldir.h
deleted file mode 100644
index 3bcd227..0000000
--- a/lib/libc_bsd/gen/telldir.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2000
- * 	Daniel Eischen.  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. 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/gen/telldir.h 282979 2015-05-15 15:49:24Z julian $
- */
-
-#ifndef _TELLDIR_H_
-#define	_TELLDIR_H_
-
-#include <sys/queue.h>
-#include <stdbool.h>
-
-/*
- * One of these structures is malloced to describe the current directory
- * position each time telldir is called. It records the current magic
- * cookie returned by getdirentries and the offset within the buffer
- * associated with that return value.
- */
-struct ddloc {
-	LIST_ENTRY(ddloc) loc_lqe; /* entry in list */
-	long	loc_index;	/* key associated with structure */
-	long	loc_seek;	/* magic cookie returned by getdirentries */
-	long	loc_loc;	/* offset of entry in buffer */
-};
-
-/*
- * One of these structures is malloced for each DIR to record telldir
- * positions.
- */
-struct _telldir {
-	LIST_HEAD(, ddloc) td_locq; /* list of locations */
-	long	td_loccnt;	/* index of entry for sequential readdir's */
-};
-
-bool		_filldir(DIR *, bool);
-struct dirent	*_readdir_unlocked(DIR *, int);
-void 		_reclaim_telldir(DIR *);
-void 		_seekdir(DIR *, long);
-void		_fixtelldir(DIR *dirp, long oldseek, long oldloc);
-
-#endif
diff --git a/lib/libc_bsd/gen/termios.c b/lib/libc_bsd/gen/termios.c
deleted file mode 100644
index f0a9147..0000000
--- a/lib/libc_bsd/gen/termios.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)termios.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/termios.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-
-#include <errno.h>
-#include <string.h>
-#define	TTYDEFCHARS
-#include <termios.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-int
-tcgetattr(int fd, struct termios *t)
-{
-
-	return (_ioctl(fd, TIOCGETA, t));
-}
-
-int
-tcsetattr(int fd, int opt, const struct termios *t)
-{
-	struct termios localterm;
-
-	if (opt & TCSASOFT) {
-		localterm = *t;
-		localterm.c_cflag |= CIGNORE;
-		t = &localterm;
-	}
-	switch (opt & ~TCSASOFT) {
-	case TCSANOW:
-		return (_ioctl(fd, TIOCSETA, t));
-	case TCSADRAIN:
-		return (_ioctl(fd, TIOCSETAW, t));
-	case TCSAFLUSH:
-		return (_ioctl(fd, TIOCSETAF, t));
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-int
-tcsetpgrp(int fd, pid_t pgrp)
-{
-	int s;
-
-	s = pgrp;
-	return (_ioctl(fd, TIOCSPGRP, &s));
-}
-
-pid_t
-tcgetpgrp(int fd)
-{
-	int s;
-
-	if (_ioctl(fd, TIOCGPGRP, &s) < 0)
-		return ((pid_t)-1);
-
-	return ((pid_t)s);
-}
-
-pid_t
-tcgetsid(int fd)
-{
-	int s;
-
-	if (_ioctl(fd, TIOCGSID, &s) < 0)
-		return ((pid_t)-1);
-
-	return ((pid_t)s);
-}
-
-int
-tcsetsid(int fd, pid_t pid)
-{
-
-	if (pid != getsid(0)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	return (_ioctl(fd, TIOCSCTTY, NULL));
-}
-
-speed_t
-cfgetospeed(const struct termios *t)
-{
-
-	return (t->c_ospeed);
-}
-
-speed_t
-cfgetispeed(const struct termios *t)
-{
-
-	return (t->c_ispeed);
-}
-
-int
-cfsetospeed(struct termios *t, speed_t speed)
-{
-
-	t->c_ospeed = speed;
-	return (0);
-}
-
-int
-cfsetispeed(struct termios *t, speed_t speed)
-{
-
-	t->c_ispeed = speed;
-	return (0);
-}
-
-int
-cfsetspeed(struct termios *t, speed_t speed)
-{
-
-	t->c_ispeed = t->c_ospeed = speed;
-	return (0);
-}
-
-/*
- * Make a pre-existing termios structure into "raw" mode: character-at-a-time
- * mode with no characters interpreted, 8-bit data path.
- */
-void
-cfmakeraw(struct termios *t)
-{
-
-	t->c_iflag &= ~(IMAXBEL|IXOFF|INPCK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON|IGNPAR);
-	t->c_iflag |= IGNBRK;
-	t->c_oflag &= ~OPOST;
-	t->c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN|NOFLSH|TOSTOP|PENDIN);
-	t->c_cflag &= ~(CSIZE|PARENB);
-	t->c_cflag |= CS8|CREAD;
-	t->c_cc[VMIN] = 1;
-	t->c_cc[VTIME] = 0;
-}
-
-/*
- * Obtain a termios structure which is similar to the one provided by
- * the kernel.
- */
-void
-cfmakesane(struct termios *t)
-{
-
-	t->c_cflag = TTYDEF_CFLAG;
-	t->c_iflag = TTYDEF_IFLAG;
-	t->c_lflag = TTYDEF_LFLAG;
-	t->c_oflag = TTYDEF_OFLAG;
-	t->c_ispeed = TTYDEF_SPEED;
-	t->c_ospeed = TTYDEF_SPEED;
-	memcpy(&t->c_cc, ttydefchars, sizeof ttydefchars);
-}
-
-int
-tcsendbreak(int fd, int len __unused)
-{
-	struct timeval sleepytime;
-
-	sleepytime.tv_sec = 0;
-	sleepytime.tv_usec = 400000;
-	if (_ioctl(fd, TIOCSBRK, 0) == -1)
-		return (-1);
-	(void)_select(0, 0, 0, 0, &sleepytime);
-	if (_ioctl(fd, TIOCCBRK, 0) == -1)
-		return (-1);
-	return (0);
-}
-
-int
-__libc_tcdrain(int fd)
-{
-
-	return (_ioctl(fd, TIOCDRAIN, 0));
-}
-
-#pragma weak tcdrain
-int
-tcdrain(int fd)
-{
-
-	return (((int (*)(int))
-	    __libc_interposing[INTERPOS_tcdrain])(fd));
-}
-
-__weak_reference(__libc_tcdrain, __tcdrain);
-__weak_reference(__libc_tcdrain, _tcdrain);
-
-int
-tcflush(int fd, int which)
-{
-	int com;
-
-	switch (which) {
-	case TCIFLUSH:
-		com = FREAD;
-		break;
-	case TCOFLUSH:
-		com = FWRITE;
-		break;
-	case TCIOFLUSH:
-		com = FREAD | FWRITE;
-		break;
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	return (_ioctl(fd, TIOCFLUSH, &com));
-}
-
-int
-tcflow(int fd, int action)
-{
-	struct termios term;
-	u_char c;
-
-	switch (action) {
-	case TCOOFF:
-		return (_ioctl(fd, TIOCSTOP, 0));
-	case TCOON:
-		return (_ioctl(fd, TIOCSTART, 0));
-	case TCION:
-	case TCIOFF:
-		if (tcgetattr(fd, &term) == -1)
-			return (-1);
-		c = term.c_cc[action == TCIOFF ? VSTOP : VSTART];
-		if (c != _POSIX_VDISABLE && _write(fd, &c, sizeof(c)) == -1)
-			return (-1);
-		return (0);
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/gen/time.3 b/lib/libc_bsd/gen/time.3
deleted file mode 100644
index 66b0fbb..0000000
--- a/lib/libc_bsd/gen/time.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)time.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/time.3 201201 2009-12-29 14:29:08Z kib $
-.\"
-.Dd July 18, 2003
-.Dt TIME 3
-.Os
-.Sh NAME
-.Nm time
-.Nd get time of day
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft time_t
-.Fn time "time_t *tloc"
-.Sh DESCRIPTION
-The
-.Fn time
-function
-returns the value of time in seconds since 0 hours, 0 minutes,
-0 seconds, January 1, 1970, Coordinated Universal Time.
-If an error occurs,
-.Fn time
-returns the value
-.Po Vt time_t Pc Ns \-1 .
-.Pp
-The return value is also stored in
-.No \&* Ns Va tloc ,
-provided that
-.Va tloc
-is non-null.
-.Sh ERRORS
-The
-.Fn time
-function may fail for any of the reasons described in
-.Xr gettimeofday 2 .
-.Sh SEE ALSO
-.Xr clock_gettime 2 ,
-.Xr gettimeofday 2 ,
-.Xr ctime 3
-.Sh STANDARDS
-The
-.Nm
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-A
-.Fn time
-function appeared in
-.At v6 .
-.Sh BUGS
-Neither
-.St -isoC-99
-nor
-.St -p1003.1-2001
-requires
-.Fn time
-to set
-.Va errno
-on failure; thus, it is impossible for an application to distinguish
-the valid time value \-1 (representing the last UTC second of 1969)
-from the error return value.
-.Pp
-Systems conforming to earlier versions of the C and
-.Tn POSIX
-standards (including older versions of
-.Fx )
-did not set
-.No \&* Ns Va tloc
-in the error case.
diff --git a/lib/libc_bsd/gen/time.c b/lib/libc_bsd/gen/time.c
deleted file mode 100644
index 0690d25..0000000
--- a/lib/libc_bsd/gen/time.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/time.c 201194 2009-12-29 12:47:47Z kib $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-time_t
-time(time_t *t)
-{
-	struct timespec tt;
-	time_t retval;
-
-	if (clock_gettime(CLOCK_SECOND, &tt) < 0)
-		retval = -1;
-	else
-		retval = tt.tv_sec;
-	if (t != NULL)
-		*t = retval;
-	return (retval);
-}
diff --git a/lib/libc_bsd/gen/times.3 b/lib/libc_bsd/gen/times.3
deleted file mode 100644
index 235de0d..0000000
--- a/lib/libc_bsd/gen/times.3
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)times.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/times.3 185519 2008-12-01 15:27:00Z keramida $
-.\"
-.Dd December 1, 2008
-.Dt TIMES 3
-.Os
-.Sh NAME
-.Nm times
-.Nd process times
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/times.h
-.Ft clock_t
-.Fn times "struct tms *tp"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr getrusage 2
-and
-.Xr gettimeofday 2 .
-.Ef
-.Pp
-The
-.Fn times
-function returns the value of time in
-.Dv CLK_TCK Ns 's
-of a second since the system startup time.
-The current value of
-.Dv CLK_TCK ,
-the frequency of the statistics clock in ticks per second, may be
-obtained through the
-.Xr sysconf 3
-interface.
-.Pp
-It also fills in the structure pointed to by
-.Fa tp
-with time-accounting information.
-.Pp
-The
-.Vt tms
-structure is defined as follows:
-.Bd -literal -offset indent
-struct tms {
-	clock_t tms_utime;
-	clock_t tms_stime;
-	clock_t tms_cutime;
-	clock_t tms_cstime;
-};
-.Ed
-.Pp
-The elements of this structure are defined as follows:
-.Bl -tag -width ".Va tms_cutime"
-.It Va tms_utime
-The
-.Tn CPU
-time charged for the execution of user instructions.
-.It Va tms_stime
-The
-.Tn CPU
-time charged for execution by the system on behalf of
-the process.
-.It Va tms_cutime
-The sum of the
-.Va tms_utime Ns s
-and
-.Va tms_cutime Ns s
-of the child processes.
-.It Va tms_cstime
-The sum of the
-.Fa tms_stime Ns s
-and
-.Fa tms_cstime Ns s
-of the child processes.
-.El
-.Pp
-All times are in
-.Dv CLK_TCK Ns 's
-of a second.
-.Pp
-The times of a terminated child process are included in the
-.Va tms_cutime
-and
-.Va tms_cstime
-elements of the parent when one of the
-.Xr wait 2
-functions returns the process ID of the terminated child to the parent.
-If an error occurs,
-.Fn times
-returns the value
-.Pq Po Vt clock_t Pc Ns \-1 ,
-and sets
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn times
-function
-may fail and set the global variable
-.Va errno
-for any of the errors specified for the library
-routines
-.Xr getrusage 2
-and
-.Xr gettimeofday 2 .
-.Sh SEE ALSO
-.Xr time 1 ,
-.Xr getrusage 2 ,
-.Xr gettimeofday 2 ,
-.Xr wait 2 ,
-.Xr sysconf 3 ,
-.Xr clocks 7
-.Sh STANDARDS
-The
-.Fn times
-function
-conforms to
-.St -p1003.1-88 .
diff --git a/lib/libc_bsd/gen/times.c b/lib/libc_bsd/gen/times.c
deleted file mode 100644
index 731d16d..0000000
--- a/lib/libc_bsd/gen/times.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)times.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/times.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/resource.h>
-
-/*
- * Convert usec to clock ticks; could do (usec * CLK_TCK) / 1000000,
- * but this would overflow if we switch to nanosec.
- */
-#define	CONVTCK(r)	(r.tv_sec * CLK_TCK + r.tv_usec / (1000000 / CLK_TCK))
-
-clock_t
-times(tp)
-	struct tms *tp;
-{
-	struct rusage ru;
-	struct timespec t;
-	clock_t c;
-
-	if (getrusage(RUSAGE_SELF, &ru) < 0)
-		return ((clock_t)-1);
-	tp->tms_utime = CONVTCK(ru.ru_utime);
-	tp->tms_stime = CONVTCK(ru.ru_stime);
-	if (getrusage(RUSAGE_CHILDREN, &ru) < 0)
-		return ((clock_t)-1);
-	tp->tms_cutime = CONVTCK(ru.ru_utime);
-	tp->tms_cstime = CONVTCK(ru.ru_stime);
-	if (clock_gettime(CLOCK_MONOTONIC, &t))
-		return ((clock_t)-1);
-	c = t.tv_sec * CLK_TCK + t.tv_nsec / (1000000000 / CLK_TCK);
-	return (c);
-}
diff --git a/lib/libc_bsd/gen/timezone.3 b/lib/libc_bsd/gen/timezone.3
deleted file mode 100644
index 24fc12b..0000000
--- a/lib/libc_bsd/gen/timezone.3
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)timezone.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/timezone.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 19, 1994
-.Dt TIMEZONE 3
-.Os
-.Sh NAME
-.Nm timezone
-.Nd return the timezone abbreviation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.Ft char *
-.Fn timezone "int zone" "int dst"
-.Sh DESCRIPTION
-.Bf Sy
-This interface is for compatibility only; it is impossible to reliably
-map timezone's arguments to a time zone abbreviation.
-See
-.Xr ctime 3 .
-.Ef
-.Pp
-The
-.Fn timezone
-function returns a pointer to a time zone abbreviation for the specified
-.Fa zone
-and
-.Fa dst
-values.
-The
-.Fa zone
-argument
-is the number of minutes west of GMT and
-.Fa dst
-is non-zero if daylight savings time is in effect.
-.Sh SEE ALSO
-.Xr ctime 3
-.Sh HISTORY
-A
-.Fn timezone
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/gen/timezone.c b/lib/libc_bsd/gen/timezone.c
deleted file mode 100644
index 8f0f9e1..0000000
--- a/lib/libc_bsd/gen/timezone.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)timezone.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/timezone.c 229403 2012-01-03 18:51:58Z ed $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#define TZ_MAX_CHARS 255
-
-char *_tztab(int, int);
-
-/*
- * timezone --
- *	The arguments are the number of minutes of time you are westward
- *	from Greenwich and whether DST is in effect.  It returns a string
- *	giving the name of the local timezone.  Should be replaced, in the
- *	application code, by a call to localtime.
- */
-
-static char	czone[TZ_MAX_CHARS];		/* space for zone name */
-
-char *
-timezone(int zone, int dst)
-{
-	char	*beg,
-			*end;
-
-	if ( (beg = getenv("TZNAME")) ) {	/* set in environment */
-		if ((end = strchr(beg, ','))) {	/* "PST,PDT" */
-			if (dst)
-				return(++end);
-			*end = '\0';
-			(void)strncpy(czone,beg,sizeof(czone) - 1);
-			czone[sizeof(czone) - 1] = '\0';
-			*end = ',';
-			return(czone);
-		}
-		return(beg);
-	}
-	return(_tztab(zone,dst));	/* default: table or created zone */
-}
-
-static struct zone {
-	int	offset;
-	char	*stdzone;
-	char	*dlzone;
-} zonetab[] = {
-	{-1*60,	"MET",	"MET DST"},	/* Middle European */
-	{-2*60,	"EET",	"EET DST"},	/* Eastern European */
-	{4*60,	"AST",	"ADT"},		/* Atlantic */
-	{5*60,	"EST",	"EDT"},		/* Eastern */
-	{6*60,	"CST",	"CDT"},		/* Central */
-	{7*60,	"MST",	"MDT"},		/* Mountain */
-	{8*60,	"PST",	"PDT"},		/* Pacific */
-#ifdef notdef
-	/* there's no way to distinguish this from WET */
-	{0,	"GMT",	0},		/* Greenwich */
-#endif
-	{0*60,	"WET",	"WET DST"},	/* Western European */
-	{-10*60,"EST",	"EST"},		/* Aust: Eastern */
-     {-10*60+30,"CST",	"CST"},		/* Aust: Central */
-	{-8*60,	"WST",	0},		/* Aust: Western */
-	{-1}
-};
-
-/*
- * _tztab --
- *	check static tables or create a new zone name; broken out so that
- *	we can make a guess as to what the zone is if the standard tables
- *	aren't in place in /etc.  DO NOT USE THIS ROUTINE OUTSIDE OF THE
- *	STANDARD LIBRARY.
- */
-char *
-_tztab(int zone, int dst)
-{
-	struct zone	*zp;
-	char	sign;
-
-	for (zp = zonetab; zp->offset != -1;++zp)	/* static tables */
-		if (zp->offset == zone) {
-			if (dst && zp->dlzone)
-				return(zp->dlzone);
-			if (!dst && zp->stdzone)
-				return(zp->stdzone);
-		}
-
-	if (zone < 0) {					/* create one */
-		zone = -zone;
-		sign = '+';
-	}
-	else
-		sign = '-';
-	(void)snprintf(czone, sizeof(czone),
-	    "GMT%c%d:%02d",sign,zone / 60,zone % 60);
-	return(czone);
-}
diff --git a/lib/libc_bsd/gen/tls.c b/lib/libc_bsd/gen/tls.c
deleted file mode 100644
index 516d64b..0000000
--- a/lib/libc_bsd/gen/tls.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/gen/tls.c 234569 2012-04-22 08:49:13Z jasone $
- */
-
-/*
- * Define stubs for TLS internals so that programs and libraries can
- * link. These functions will be replaced by functional versions at
- * runtime from ld-elf.so.1.
- */
-
-#include <sys/cdefs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <elf.h>
-
-#include "libc_private.h"
-
-/* Provided by jemalloc to avoid bootstrapping issues. */
-void	*__jemalloc_a0malloc(size_t size);
-void	*__jemalloc_a0calloc(size_t num, size_t size);
-void	__jemalloc_a0free(void *ptr);
-
-__weak_reference(__libc_allocate_tls, _rtld_allocate_tls);
-__weak_reference(__libc_free_tls, _rtld_free_tls);
-
-#ifdef __i386__
-
-__weak_reference(___libc_tls_get_addr, ___tls_get_addr);
-__attribute__((__regparm__(1))) void * ___libc_tls_get_addr(void *);
-
-#endif
-
-void * __libc_tls_get_addr(void *);
-__weak_reference(__libc_tls_get_addr, __tls_get_addr);
-
-void *_rtld_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign);
-void _rtld_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
-void *__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign);
-void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
-
-#if defined(__ia64__) || defined(__amd64__)
-#define TLS_TCB_ALIGN 16
-#elif defined(__powerpc__) || defined(__i386__) || defined(__arm__) || \
-    defined(__sparc64__) || defined(__mips__)
-#define TLS_TCB_ALIGN sizeof(void *)
-#else
-#error TLS_TCB_ALIGN undefined for target architecture
-#endif
-
-#if defined(__arm__) || defined(__ia64__) || defined(__mips__) || \
-    defined(__powerpc__)
-#define TLS_VARIANT_I
-#endif
-#if defined(__i386__) || defined(__amd64__) || defined(__sparc64__)
-#define TLS_VARIANT_II
-#endif
-
-#ifndef PIC
-
-#define round(size, align) \
-	(((size) + (align) - 1) & ~((align) - 1))
-
-static size_t tls_static_space;
-static size_t tls_init_size;
-static void *tls_init;
-#endif
-
-#ifdef __i386__
-
-/* GNU ABI */
-
-__attribute__((__regparm__(1)))
-void *
-___libc_tls_get_addr(void *ti __unused)
-{
-	return (0);
-}
-
-#endif
-
-void *
-__libc_tls_get_addr(void *ti __unused)
-{
-	return (0);
-}
-
-#ifndef PIC
-
-#ifdef TLS_VARIANT_I
-
-#define	TLS_TCB_SIZE	(2 * sizeof(void *))
-
-/*
- * Free Static TLS using the Variant I method.
- */
-void
-__libc_free_tls(void *tcb, size_t tcbsize, size_t tcbalign __unused)
-{
-	Elf_Addr *dtv;
-	Elf_Addr **tls;
-
-	tls = (Elf_Addr **)((Elf_Addr)tcb + tcbsize - TLS_TCB_SIZE);
-	dtv = tls[0];
-	__jemalloc_a0free(dtv);
-	__jemalloc_a0free(tcb);
-}
-
-/*
- * Allocate Static TLS using the Variant I method.
- */
-void *
-__libc_allocate_tls(void *oldtcb, size_t tcbsize, size_t tcbalign __unused)
-{
-	Elf_Addr *dtv;
-	Elf_Addr **tls;
-	char *tcb;
-
-	if (oldtcb != NULL && tcbsize == TLS_TCB_SIZE)
-		return (oldtcb);
-
-	tcb = __jemalloc_a0calloc(1, tls_static_space + tcbsize - TLS_TCB_SIZE);
-	tls = (Elf_Addr **)(tcb + tcbsize - TLS_TCB_SIZE);
-
-	if (oldtcb != NULL) {
-		memcpy(tls, oldtcb, tls_static_space);
-		__jemalloc_a0free(oldtcb);
-
-		/* Adjust the DTV. */
-		dtv = tls[0];
-		dtv[2] = (Elf_Addr)tls + TLS_TCB_SIZE;
-	} else {
-		dtv = __jemalloc_a0malloc(3 * sizeof(Elf_Addr));
-		tls[0] = dtv;
-		dtv[0] = 1;
-		dtv[1] = 1;
-		dtv[2] = (Elf_Addr)tls + TLS_TCB_SIZE;
-
-		if (tls_init_size > 0)
-			memcpy((void*)dtv[2], tls_init, tls_init_size);
-		if (tls_static_space > tls_init_size)
-			memset((void*)(dtv[2] + tls_init_size), 0,
-			    tls_static_space - tls_init_size);
-	}
-
-	return(tcb); 
-}
-
-#endif
-
-#ifdef TLS_VARIANT_II
-
-#define	TLS_TCB_SIZE	(3 * sizeof(Elf_Addr))
-
-/*
- * Free Static TLS using the Variant II method.
- */
-void
-__libc_free_tls(void *tcb, size_t tcbsize __unused, size_t tcbalign)
-{
-	size_t size;
-	Elf_Addr* dtv;
-	Elf_Addr tlsstart, tlsend;
-
-	/*
-	 * Figure out the size of the initial TLS block so that we can
-	 * find stuff which ___tls_get_addr() allocated dynamically.
-	 */
-	size = round(tls_static_space, tcbalign);
-
-	dtv = ((Elf_Addr**)tcb)[1];
-	tlsend = (Elf_Addr) tcb;
-	tlsstart = tlsend - size;
-	__jemalloc_a0free((void*) tlsstart);
-	__jemalloc_a0free(dtv);
-}
-
-/*
- * Allocate Static TLS using the Variant II method.
- */
-void *
-__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign)
-{
-	size_t size;
-	char *tls;
-	Elf_Addr *dtv;
-	Elf_Addr segbase, oldsegbase;
-
-	size = round(tls_static_space, tcbalign);
-
-	if (tcbsize < 2 * sizeof(Elf_Addr))
-		tcbsize = 2 * sizeof(Elf_Addr);
-	tls = __jemalloc_a0calloc(1, size + tcbsize);
-	dtv = __jemalloc_a0malloc(3 * sizeof(Elf_Addr));
-
-	segbase = (Elf_Addr)(tls + size);
-	((Elf_Addr*)segbase)[0] = segbase;
-	((Elf_Addr*)segbase)[1] = (Elf_Addr) dtv;
-
-	dtv[0] = 1;
-	dtv[1] = 1;
-	dtv[2] = segbase - tls_static_space;
-
-	if (oldtls) {
-		/*
-		 * Copy the static TLS block over whole.
-		 */
-		oldsegbase = (Elf_Addr) oldtls;
-		memcpy((void *)(segbase - tls_static_space),
-		    (const void *)(oldsegbase - tls_static_space),
-		    tls_static_space);
-
-		/*
-		 * We assume that this block was the one we created with
-		 * allocate_initial_tls().
-		 */
-		_rtld_free_tls(oldtls, 2*sizeof(Elf_Addr), sizeof(Elf_Addr));
-	} else {
-		memcpy((void *)(segbase - tls_static_space),
-		    tls_init, tls_init_size);
-		memset((void *)(segbase - tls_static_space + tls_init_size),
-		    0, tls_static_space - tls_init_size);
-	}
-
-	return (void*) segbase;
-}
-
-#endif /* TLS_VARIANT_II */
-
-#else
-
-void *
-__libc_allocate_tls(void *oldtls __unused, size_t tcbsize __unused,
-	size_t tcbalign __unused)
-{
-	return (0);
-}
-
-void
-__libc_free_tls(void *tcb __unused, size_t tcbsize __unused,
-	size_t tcbalign __unused)
-{
-}
-
-#endif /* PIC */
-
-extern char **environ;
-
-void
-_init_tls()
-{
-#ifndef PIC
-	Elf_Addr *sp;
-	Elf_Auxinfo *aux, *auxp;
-	Elf_Phdr *phdr;
-	size_t phent, phnum;
-	int i;
-	void *tls;
-
-	sp = (Elf_Addr *) environ;
-	while (*sp++ != 0)
-		;
-	aux = (Elf_Auxinfo *) sp;
-	phdr = 0;
-	phent = phnum = 0;
-	for (auxp = aux; auxp->a_type != AT_NULL; auxp++) {
-		switch (auxp->a_type) {
-		case AT_PHDR:
-			phdr = auxp->a_un.a_ptr;
-			break;
-
-		case AT_PHENT:
-			phent = auxp->a_un.a_val;
-			break;
-
-		case AT_PHNUM:
-			phnum = auxp->a_un.a_val;
-			break;
-		}
-	}
-	if (phdr == 0 || phent != sizeof(Elf_Phdr) || phnum == 0)
-		return;
-
-	for (i = 0; (unsigned) i < phnum; i++) {
-		if (phdr[i].p_type == PT_TLS) {
-			tls_static_space = round(phdr[i].p_memsz,
-			    phdr[i].p_align);
-			tls_init_size = phdr[i].p_filesz;
-			tls_init = (void*) phdr[i].p_vaddr;
-		}
-	}
-
-#ifdef TLS_VARIANT_I
-	/*
-	 * tls_static_space should include space for TLS structure
-	 */
-	tls_static_space += TLS_TCB_SIZE;
-#endif
-
-	tls = _rtld_allocate_tls(NULL, TLS_TCB_SIZE, TLS_TCB_ALIGN);
-
-	_set_tp(tls);
-#endif
-}
diff --git a/lib/libc_bsd/gen/ttyname.3 b/lib/libc_bsd/gen/ttyname.3
deleted file mode 100644
index 7ec1ad6..0000000
--- a/lib/libc_bsd/gen/ttyname.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)ttyname.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/ttyname.3 278417 2015-02-08 22:29:06Z jilles $
-.\"
-.Dd July 18, 2014
-.Dt TTYNAME 3
-.Os
-.Sh NAME
-.Nm ttyname ,
-.Nm ttyname_r ,
-.Nm isatty
-.Nd get name of associated terminal (tty) from file descriptor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn ttyname "int fd"
-.Ft int
-.Fn ttyname_r "int fd" "char *buf" "size_t len"
-.Ft int
-.Fn isatty "int fd"
-.Sh DESCRIPTION
-These functions operate on file descriptors for terminal type devices.
-.Pp
-The
-.Fn isatty
-function
-determines if the file descriptor
-.Fa fd
-refers to a valid
-terminal type device.
-.Pp
-The
-.Fn ttyname
-function
-gets the related device name of
-a file descriptor for which
-.Fn isatty
-is true.
-.Pp
-The
-.Fn ttyname
-function
-returns the name stored in a static buffer which will be overwritten
-on subsequent calls.
-The
-.Fn ttyname_r
-function
-takes a buffer and length as arguments to avoid this problem.
-.Sh RETURN VALUES
-The
-.Fn isatty
-function returns 1 if
-.Fa fd
-refers to a terminal type device;
-otherwise, it returns 0 and may set
-.Va errno
-to indicate the error.
-The
-.Fn ttyname
-function
-returns the null terminated name if the device is found and
-.Fn isatty
-is true; otherwise
-a
-.Dv NULL
-pointer is returned.
-The
-.Fn ttyname_r
-function returns 0 if successful.
-Otherwise an error number is returned.
-.Sh ERRORS
-These functions may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid file descriptor.
-.It Bq Er ENOTTY
-The file associated with
-.Fa fd
-is not a terminal.
-.El
-.Pp
-Additionally,
-.Fn ttyname_r
-may fail if:
-.Bl -tag -width Er
-.It Bq Er ERANGE
-The
-.Fa bufsize
-argument
-is smaller than the length of the string to be returned.
-.El
-.Sh SEE ALSO
-.Xr fdevname 3 ,
-.Xr ptsname 3 ,
-.Xr tcgetattr 3 ,
-.Xr tty 4
-.Sh HISTORY
-The
-.Fn isatty
-and
-.Fn ttyname
-functions
-appeared in
-.At v7 .
-The
-.Fn ttyname_r
-function
-appeared in
-.Fx 6.0 .
diff --git a/lib/libc_bsd/gen/ttyname.c b/lib/libc_bsd/gen/ttyname.c
deleted file mode 100644
index 0947a61..0000000
--- a/lib/libc_bsd/gen/ttyname.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ttyname.c	8.2 (Berkeley) 1/27/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/ttyname.c 278413 2015-02-08 22:24:03Z jilles $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/filio.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <stdlib.h>
-#include <termios.h>
-#include <unistd.h>
-#include <string.h>
-#include <paths.h>
-#include <errno.h>
-#include "reentrant.h"
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-static char ttyname_buf[sizeof(_PATH_DEV) + MAXNAMLEN];
-
-static once_t		ttyname_init_once = ONCE_INITIALIZER;
-static thread_key_t	ttyname_key;
-static int		ttyname_keycreated = 0;
-
-int
-ttyname_r(int fd, char *buf, size_t len)
-{
-	size_t used;
-
-	*buf = '\0';
-
-	/* Must be a terminal. */
-	if (!isatty(fd))
-		return (errno);
-	/* Must have enough room */
-	if (len <= sizeof(_PATH_DEV))
-		return (ERANGE);
-
-	strcpy(buf, _PATH_DEV);
-	used = strlen(buf);
-	if (fdevname_r(fd, buf + used, len - used) == NULL)
-		return (errno == EINVAL ? ERANGE : errno);
-	return (0);
-}
-
-static void
-ttyname_keycreate(void)
-{
-	ttyname_keycreated = (thr_keycreate(&ttyname_key, free) == 0);
-}
-
-char *
-ttyname(int fd)
-{
-	char	*buf;
-
-	if (thr_main() != 0)
-		buf = ttyname_buf;
-	else {
-		if (thr_once(&ttyname_init_once, ttyname_keycreate) != 0 ||
-		    !ttyname_keycreated)
-			return (NULL);
-		if ((buf = thr_getspecific(ttyname_key)) == NULL) {
-			if ((buf = malloc(sizeof ttyname_buf)) == NULL)
-				return (NULL);
-			if (thr_setspecific(ttyname_key, buf) != 0) {
-				free(buf);
-				return (NULL);
-			}
-		}
-	}
-
-	if (ttyname_r(fd, buf, sizeof ttyname_buf) != 0)
-		return (NULL);
-	return (buf);
-}
diff --git a/lib/libc_bsd/gen/ttyslot.c b/lib/libc_bsd/gen/ttyslot.c
deleted file mode 100644
index ae1171d..0000000
--- a/lib/libc_bsd/gen/ttyslot.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ttyslot.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/ttyslot.c 202487 2010-01-17 15:43:14Z ed $");
-
-int
-__ttyslot(void)
-{
-
-	return (0);
-}
-
-__sym_compat(ttyslot, __ttyslot, FBSD_1.0);
diff --git a/lib/libc_bsd/gen/tzset.3 b/lib/libc_bsd/gen/tzset.3
deleted file mode 100644
index a6120c6..0000000
--- a/lib/libc_bsd/gen/tzset.3
+++ /dev/null
@@ -1,338 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Arthur Olson.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)tzset.3	8.2 (Berkeley) 11/17/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/tzset.3 199405 2009-11-17 16:29:39Z obrien $
-.\"
-.Dd November 17, 1993
-.Dt TZSET 3
-.Os
-.Sh NAME
-.Nm tzset ,
-.Nm tzsetwall
-.Nd initialize time conversion information
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft void
-.Fn tzset void
-.Ft void
-.Fn tzsetwall void
-.Sh DESCRIPTION
-The
-.Fn tzset
-function
-initializes time conversion information used by the library routine
-.Xr localtime 3 .
-The environment variable
-.Ev TZ
-specifies how this is done.
-.Pp
-If
-.Ev TZ
-does not appear in the environment, the best available approximation to
-local wall clock time, as specified by the
-.Xr tzfile 5 Ns -format
-file
-.Pa /etc/localtime
-is used.
-.Pp
-If
-.Ev TZ
-appears in the environment but its value is a null string, Coordinated
-Universal Time
-.Pq Tn UTC
-is used (without leap second correction).
-.Pp
-If
-.Ev TZ
-appears in the environment and its value begins with a colon
-.Pq Ql \&: ,
-the rest of its value is used as a pathname of a
-.Xr tzfile 5 Ns -format
-file from which to read the time conversion information.
-If the first character of the pathname is a slash
-.Pq Ql /
-it is used as
-an absolute pathname; otherwise, it is used as a pathname relative to
-the system time conversion information directory.
-.Pp
-If its value does not begin with a colon, it is first used as the pathname
-of a file (as described above) from which to read the time conversion
-information.
-If that file cannot be read, the value is then interpreted as a direct
-specification (the format is described below) of the time conversion
-information.
-.Pp
-If the
-.Ev TZ
-environment variable does not specify a
-.Xr tzfile 5 Ns -format
-file and cannot be interpreted as a direct specification,
-.Tn UTC
-is used.
-.Pp
-The
-.Fn tzsetwall
-function
-sets things up so that
-.Xr localtime 3
-returns the best available approximation of local wall clock time.
-.Sh SPECIFICATION FORMAT
-When
-.Ev TZ
-is used directly as a specification of the time conversion information,
-it must have the following syntax (spaces inserted for clarity):
-.Bd -ragged -offset indent
-.Em std offset
-.Bo
-.Em dst
-.Bq Em offset
-.Bq , Em rule
-.Bc
-.Ed
-.Pp
-Where:
-.Bl -tag -width std_and_dst -offset indent
-.It Em std No and Em dst
-Three or more bytes that are the designation for the standard
-.Pq Em std
-or summer
-.Pq Em dst
-time zone.
-Only
-.Em std
-is required; if
-.Em dst
-is missing, then summer time does not apply in this locale.
-Upper and lowercase letters are explicitly allowed.
-Any characters
-except a leading colon
-.Pq Ql \&: ,
-digits, comma
-.Pq Ql \&, ,
-minus
-.Pq Ql \- ,
-plus
-.Pq Ql + ,
-and
-.Tn ASCII
-.Dv NUL
-are allowed.
-.It Em offset
-Indicates the value one must add to the local time to arrive at
-Coordinated Universal Time.
-The
-.Em offset
-has the form:
-.Bd -ragged -offset indent
-.Sm off
-.Em hh Bo
-.Em : mm
-.Bq Em : ss
-.Bc
-.Sm on
-.Ed
-.Pp
-The minutes
-.Pq Em mm
-and seconds
-.Pq Em ss
-are optional.
-The hour
-.Pq Em hh
-is required and may be a single digit.
-The
-.Em offset
-following
-.Em std
-is required.
-If no
-.Em offset
-follows
-.Em dst ,
-summer time is assumed to be one hour ahead of standard time.
-One or
-more digits may be used; the value is always interpreted as a decimal
-number.
-The hour must be between zero and 24, and the minutes (and
-seconds) \(em if present \(em between zero and 59.
-If preceded by a
-.Pq Ql \-
-the time zone shall be east of the Prime Meridian; otherwise it shall be
-west (which may be indicated by an optional preceding
-.Pq Ql + ) .
-.It Em rule
-Indicates when to change to and back from summer time.
-The
-.Em rule
-has the form:
-.Bd -ragged -offset indent
-.Em date/time,date/time
-.Ed
-.Pp
-where the first
-.Em date
-describes when the change from standard to summer time occurs and the
-second
-.Em date
-describes when the change back happens.
-Each
-.Em time
-field describes when, in current local time, the change to the other
-time is made.
-.Pp
-The format of
-.Em date
-is one of the following:
-.Bl -tag -width "M.m.n.d"
-.It Sy J Em n
-The Julian day
-.Em n
-(1 \*(Le
-.Em n
-\*(Le 365).
-Leap days are not counted; that is, in all years \(em including leap
-years \(em February 28 is day 59 and March 1 is day 60.
-It is
-impossible to explicitly refer to the occasional February 29.
-.It Em n
-The zero-based Julian day
-(0 \*(Le
-.Em n
-\*(Le 365 ) .
-Leap days are counted, and it is possible to refer to February 29.
-.It Sy M Em m.n.d
-The
-.Em d Ns 'th
-day (0 \*(Le
-.Em d
-\*(Le 6)
-of week
-.Em n
-of month
-.Em m
-of the year
-(1 \*(Le
-.Em n
-\*(Le 5),
-(1 \*(Le
-.Em m
-\*(Le 12),
-where week 5 means
-.Do
-the last
-.Em d
-day in month
-.Em m
-.Dc
-which may occur in either the fourth or the fifth week).
-Week 1 is the
-first week in which the
-.Em d Ns 'th
-day occurs.
-Day zero is Sunday.
-.Pp
-The
-.Em time
-has the same format as
-.Em offset
-except that no leading sign
-.Pq Ql \-
-or
-.Pq Ql +
-is allowed.
-The default, if
-.Em time
-is not given, is
-.Sy 02:00:00 .
-.El
-.Pp
-If no
-.Em rule
-is present in the
-.Ev TZ
-specification, the rules specified
-by the
-.Xr tzfile 5 Ns -format
-file
-.Em posixrules
-in the system time conversion information directory are used, with the
-standard and summer time offsets from
-.Tn UTC
-replaced by those specified by
-the
-.Em offset
-values in
-.Ev TZ .
-.El
-.Pp
-For compatibility with System V Release 3.1, a semicolon
-.Pq Ql \&;
-may be used to separate the
-.Em rule
-from the rest of the specification.
-.Sh FILES
-.Bl -tag -width /usr/share/zoneinfo/posixrules -compact
-.It Pa /etc/localtime
-local time zone file
-.It Pa /usr/share/zoneinfo
-time zone directory
-.It Pa /usr/share/zoneinfo/posixrules
-rules for
-.Tn POSIX Ns -style
-.Tn TZ Ns 's
-.It Pa /usr/share/zoneinfo/Etc/GMT
-for
-.Tn UTC
-leap seconds
-.El
-.Pp
-If the file
-.Pa /usr/share/zoneinfo/UTC
-does not exist,
-.Tn UTC
-leap seconds are loaded from
-.Pa /usr/share/zoneinfo/posixrules .
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr gettimeofday 2 ,
-.Xr ctime 3 ,
-.Xr getenv 3 ,
-.Xr time 3 ,
-.Xr tzfile 5
-.Sh HISTORY
-The
-.Fn tzset
-and
-.Fn tzsetwall
-functions first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/gen/ualarm.3 b/lib/libc_bsd/gen/ualarm.3
deleted file mode 100644
index e69221d..0000000
--- a/lib/libc_bsd/gen/ualarm.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" Copyright (c) 1986, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)ualarm.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/ualarm.3 207735 2010-05-06 22:49:54Z jilles $
-.\"
-.Dd April 19, 1994
-.Dt UALARM 3
-.Os
-.Sh NAME
-.Nm ualarm
-.Nd schedule signal after specified time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft useconds_t
-.Fn ualarm "useconds_t microseconds" "useconds_t interval"
-.Sh DESCRIPTION
-.Bf -symbolic
-This is a simplified interface to
-.Xr setitimer 2 .
-.Ef
-.Pp
-The
-.Fn ualarm
-function
-waits a count of
-.Fa microseconds
-before asserting the terminating signal
-.Dv SIGALRM .
-System activity or time used in processing the call may cause a slight
-delay.
-.Pp
-If the
-.Fa interval
-argument is non-zero, the
-.Dv SIGALRM
-signal will be sent
-to the process every
-.Fa interval
-microseconds after the timer expires (e.g.\& after
-.Fa microseconds
-number of microseconds have passed).
-.Pp
-Due to
-.Xr setitimer 2
-restriction the maximum number of
-.Fa microseconds
-and
-.Fa interval
-is limited to 100000000000000
-(in case this value fits in the unsigned integer).
-.Sh RETURN VALUES
-When the signal has successfully been caught,
-.Fn ualarm
-returns the amount of time left on the clock.
-.Sh NOTES
-A microsecond is 0.000001 seconds.
-.Sh SEE ALSO
-.Xr getitimer 2 ,
-.Xr setitimer 2 ,
-.Xr sigaction 2 ,
-.Xr sigsuspend 2 ,
-.Xr alarm 3 ,
-.Xr signal 3 ,
-.Xr sleep 3 ,
-.Xr usleep 3
-.Sh HISTORY
-The
-.Fn ualarm
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libc_bsd/gen/ualarm.c b/lib/libc_bsd/gen/ualarm.c
deleted file mode 100644
index a0b28a2..0000000
--- a/lib/libc_bsd/gen/ualarm.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ualarm.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/ualarm.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/time.h>
-#include <unistd.h>
-
-#define	USPS	1000000		/* # of microseconds in a second */
-
-/*
- * Generate a SIGALRM signal in ``usecs'' microseconds.
- * If ``reload'' is non-zero, keep generating SIGALRM
- * every ``reload'' microseconds after the first signal.
- */
-useconds_t
-ualarm(usecs, reload)
-	useconds_t usecs;
-	useconds_t reload;
-{
-	struct itimerval new, old;
-
-	new.it_interval.tv_usec = reload % USPS;
-	new.it_interval.tv_sec = reload / USPS;
-
-	new.it_value.tv_usec = usecs % USPS;
-	new.it_value.tv_sec = usecs / USPS;
-
-	if (setitimer(ITIMER_REAL, &new, &old) == 0)
-		return (old.it_value.tv_sec * USPS + old.it_value.tv_usec);
-	/* else */
-		return (-1);
-}
diff --git a/lib/libc_bsd/gen/ucontext.3 b/lib/libc_bsd/gen/ucontext.3
deleted file mode 100644
index 2fe56ee..0000000
--- a/lib/libc_bsd/gen/ucontext.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright (c) 2002 Packet Design, LLC.
-.\" All rights reserved.
-.\"
-.\" Subject to the following obligations and disclaimer of warranty,
-.\" use and redistribution of this software, in source or object code
-.\" forms, with or without modifications are expressly permitted by
-.\" Packet Design; provided, however, that:
-.\"
-.\"    (i)  Any and all reproductions of the source or object code
-.\"         must include the copyright notice above and the following
-.\"         disclaimer of warranties; and
-.\"    (ii) No rights are granted, in any manner or form, to use
-.\"         Packet Design trademarks, including the mark "PACKET DESIGN"
-.\"         on advertising, endorsements, or otherwise except as such
-.\"         appears in the above copyright notice or in the software.
-.\"
-.\" THIS SOFTWARE IS BEING PROVIDED BY PACKET DESIGN "AS IS", AND
-.\" TO THE MAXIMUM EXTENT PERMITTED BY LAW, PACKET DESIGN MAKES NO
-.\" REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING
-.\" THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-.\" OR NON-INFRINGEMENT.  PACKET DESIGN DOES NOT WARRANT, GUARANTEE,
-.\" OR MAKE ANY REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS
-.\" OF THE USE OF THIS SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY,
-.\" RELIABILITY OR OTHERWISE.  IN NO EVENT SHALL PACKET DESIGN BE
-.\" LIABLE FOR ANY DAMAGES RESULTING FROM OR ARISING OUT OF ANY USE
-.\" OF THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE, OR CONSEQUENTIAL
-.\" DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF
-.\" USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 PACKET DESIGN IS ADVISED OF
-.\" THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/ucontext.3 230429 2012-01-21 18:00:28Z kib $
-.\"
-.Dd September 10, 2002
-.Dt UCONTEXT 3
-.Os
-.Sh NAME
-.Nm ucontext
-.Nd user thread context
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ucontext.h
-.Sh DESCRIPTION
-The
-.Vt ucontext_t
-type is a structure type suitable for holding the context for a user
-thread of execution.
-A thread's context includes its stack, saved registers, and list of
-blocked signals.
-.Pp
-The
-.Vt ucontext_t
-structure contains at least these fields:
-.Pp
-.Bl -tag -width ".Va mcontext_t\ \ uc_mcontext" -offset 3n -compact
-.It Va "ucontext_t *uc_link"
-context to assume when this one returns
-.It Va "sigset_t uc_sigmask"
-signals being blocked
-.It Va "stack_t uc_stack"
-stack area
-.It Va "mcontext_t uc_mcontext"
-saved registers
-.El
-.Pp
-The
-.Va uc_link
-field points to the context to resume when this context's entry point
-function returns.
-If
-.Va uc_link
-is equal to
-.Dv NULL ,
-then the process exits when this context returns.
-.Pp
-The
-.Va uc_mcontext
-field is machine-dependent and should be treated as opaque by
-portable applications.
-.Pp
-The following functions are defined to manipulate
-.Vt ucontext_t
-structures:
-.Pp
-.Bl -item -offset 3n -compact
-.It
-.Ft int
-.Fn getcontext "ucontext_t *" ;
-.It
-.Ft "ucontext_t *"
-.Fn getcontextx "void" ;
-.It
-.Ft int
-.Fn setcontext "const ucontext_t *" ;
-.It
-.Ft void
-.Fn makecontext "ucontext_t *" "void \*[lp]*\*[rp]\*[lp]void\*[rp]" int ... ;
-.It
-.Ft int
-.Fn swapcontext "ucontext_t *" "const ucontext_t *" ;
-.El
-.Sh SEE ALSO
-.Xr sigaltstack 2 ,
-.Xr getcontext 3 ,
-.Xr getcontextx 3 ,
-.Xr makecontext 3
diff --git a/lib/libc_bsd/gen/ulimit.3 b/lib/libc_bsd/gen/ulimit.3
deleted file mode 100644
index 12c4e5f..0000000
--- a/lib/libc_bsd/gen/ulimit.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" Copyright (c) 2002 Kyle Martin.  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.
-.\"
-.\" 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 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/gen/ulimit.3 108637 2003-01-04 01:11:49Z tjr $
-.\"
-.Dd January 4, 2003
-.Dt ULIMIT 3
-.Os
-.Sh NAME
-.Nm ulimit
-.Nd get and set process limits
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ulimit.h
-.Ft long
-.Fn ulimit "int cmd" "..."
-.Sh DESCRIPTION
-The
-.Fn ulimit
-function will get and set process limits.
-Currently this is limited to the maximum file size.
-The
-.Fa cmd
-argument is one of the following:
-.Bl -tag -width ".Dv UL_GETFSIZE"
-.It Dv UL_GETFSIZE
-will return the maximum file size in units of 512 blocks of
-the current process.
-.It Dv UL_SETFSIZE
-will attempt to set the maximum file size of the current
-process and its children with the second argument expressed as a long.
-.El
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn ulimit
-returns the value requested;
-otherwise the value \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn ulimit
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The command specified was invalid.
-.It Bq Er EPERM
-The limit specified to
-.Fn ulimit
-would have raised the maximum limit value,
-and the caller is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr getrlimit 2
-.Sh STANDARDS
-The
-.Fn ulimit
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn ulimit
-function first appeared in
-.Fx 5.0 .
-.Sh BUGS
-The
-.Fn ulimit
-function provides limited precision for
-setting and retrieving process limits.
-If there is a need for greater precision than the
-type
-.Vt long
-provides, the
-.Xr getrlimit 2
-and
-.Xr setrlimit 2
-functions should be considered.
diff --git a/lib/libc_bsd/gen/ulimit.c b/lib/libc_bsd/gen/ulimit.c
deleted file mode 100644
index 4d01e51..0000000
--- a/lib/libc_bsd/gen/ulimit.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2002 Kyle Martin <mkm@ieee.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.
- *
- * 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: releng/10.2/lib/libc/gen/ulimit.c 279129 2015-02-22 01:31:28Z pfg $
- */
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <ulimit.h>
-
-long
-ulimit(int cmd, ...)
-{
-	struct rlimit limit;
-	va_list ap;
-	rlim_t arg;
-
-	if (cmd == UL_GETFSIZE) {
-		if (getrlimit(RLIMIT_FSIZE, &limit) == -1)
-			return (-1);
-		limit.rlim_cur /= 512;
-		if (limit.rlim_cur > LONG_MAX)
-			return (LONG_MAX);
-		return ((long)limit.rlim_cur);
-	} else if (cmd == UL_SETFSIZE) {
-		va_start(ap, cmd);
-		arg = va_arg(ap, long);
-		va_end(ap);
-		if (arg < 0)
-			arg = LONG_MAX;
-		if (arg > RLIM_INFINITY / 512)
-			arg = RLIM_INFINITY / 512;
-		limit.rlim_max = limit.rlim_cur = arg * 512;
-
-		/* The setrlimit() function sets errno to EPERM if needed. */
-		if (setrlimit(RLIMIT_FSIZE, &limit) == -1)
-			return (-1);
-		return ((long)arg);
-	} else {
-		errno = EINVAL;
-		return (-1);
-	}
-}
diff --git a/lib/libc_bsd/gen/uname.3 b/lib/libc_bsd/gen/uname.3
deleted file mode 100644
index e47246f..0000000
--- a/lib/libc_bsd/gen/uname.3
+++ /dev/null
@@ -1,117 +0,0 @@
-.\" Copyright (c) 1994
-.\"	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.
-.\" 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.
-.\"
-.\"	@(#)uname.3	8.1 (Berkeley) 1/4/94
-.\" $FreeBSD: releng/10.2/lib/libc/gen/uname.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd December 2, 2005
-.Dt UNAME 3
-.Os
-.Sh NAME
-.Nm uname
-.Nd get system identification
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/utsname.h
-.Ft int
-.Fn uname "struct utsname *name"
-.Sh DESCRIPTION
-The
-.Fn uname
-function stores
-.Dv NUL Ns -terminated
-strings of information identifying
-the current system into the structure referenced by
-.Fa name .
-.Pp
-The
-.Vt utsname
-structure is defined in the
-.In sys/utsname.h
-header file, and contains the following members:
-.Bl -tag -width nodenameXXXX -offset indent
-.It sysname
-Name of the operating system implementation.
-.It nodename
-Network name of this machine.
-.It release
-Release level of the operating system.
-.It version
-Version level of the operating system.
-.It machine
-Machine hardware platform.
-.El
-.Sh RETURN VALUES
-.Rv -std uname
-.Sh ENVIRONMENT
-.Bl -tag -width ".Ev UNAME_s"
-.It Ev UNAME_s
-If the environment variable
-.Ev UNAME_s
-is set, it will override the
-.Va sysname
-member.
-.It Ev UNAME_r
-If the environment variable
-.Ev UNAME_r
-is set, it will override the
-.Va release
-member.
-.It Ev UNAME_v
-If the environment variable
-.Ev UNAME_v
-is set, it will override the
-.Va version
-member.
-.It Ev UNAME_m
-If the environment variable
-.Ev UNAME_m
-is set, it will override the
-.Va machine
-member.
-.El
-.Sh ERRORS
-The
-.Fn uname
-function may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr uname 1 ,
-.Xr sysctl 3
-.Sh STANDARDS
-The
-.Fn uname
-function conforms to
-.St -p1003.1-88 .
-.Sh HISTORY
-The
-.Fn uname
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/gen/uname.c b/lib/libc_bsd/gen/uname.c
deleted file mode 100644
index a5f3b33..0000000
--- a/lib/libc_bsd/gen/uname.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "From: @(#)uname.c	8.1 (Berkeley) 1/4/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/uname.c 202661 2010-01-19 23:07:12Z ed $");
-
-#define uname wrapped_uname
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/utsname.h>
-#include <errno.h>
-#undef uname
-
-int
-uname(struct utsname *name)
-{
-	return __xuname(32, name);
-}
diff --git a/lib/libc_bsd/gen/unvis-compat.c b/lib/libc_bsd/gen/unvis-compat.c
deleted file mode 100644
index 0892228..0000000
--- a/lib/libc_bsd/gen/unvis-compat.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2012 SRI International
- * All rights reserved.
- *
- * This software was developed by SRI International and the University of
- * Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
- * ("CTSRD"), as part of the DARPA CRASH research programme.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/gen/unvis-compat.c 244401 2012-12-18 16:37:24Z brooks $
- */
-
-#include <vis.h>
-
-#define	_UNVIS_END	1
-
-int
-__unvis_44bsd(char *cp, int c, int *astate, int flag)
-{
-
-	if (flag & _UNVIS_END)
-		flag = (flag & ~_UNVIS_END) ^ UNVIS_END;
-	return unvis(cp, c, astate, flag);
-}
-
-__sym_compat(unvis, __vis_44bsd, FBSD_1.0);
diff --git a/lib/libc_bsd/gen/usleep.3 b/lib/libc_bsd/gen/usleep.3
deleted file mode 100644
index efc9eea..0000000
--- a/lib/libc_bsd/gen/usleep.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" Copyright (c) 1986, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)usleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/usleep.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd February 13, 1998
-.Dt USLEEP 3
-.Os
-.Sh NAME
-.Nm usleep
-.Nd suspend process execution for an interval measured in microseconds
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn usleep "useconds_t microseconds"
-.Sh DESCRIPTION
-The
-.Fn usleep
-function suspends execution of the calling process until either
-.Fa microseconds
-microseconds have elapsed or a signal is delivered to the process and its
-action is to invoke a signal-catching function or to terminate the
-process.
-System activity may lengthen the sleep by an indeterminate amount.
-.Pp
-This function is implemented using
-.Xr nanosleep 2
-by pausing for
-.Fa microseconds
-microseconds or until a signal occurs.
-Consequently, in this implementation,
-sleeping has no effect on the state of process timers,
-and there is no special handling for SIGALRM.
-.Sh RETURN VALUES
-.Rv -std usleep
-.Sh ERRORS
-The
-.Fn usleep
-function
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINTR
-A signal was delivered to the process and its
-action was to invoke a signal-catching function.
-.El
-.Sh SEE ALSO
-.Xr nanosleep 2 ,
-.Xr sleep 3
-.Sh HISTORY
-The
-.Fn usleep
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libc_bsd/gen/usleep.c b/lib/libc_bsd/gen/usleep.c
deleted file mode 100644
index 9f6a98a..0000000
--- a/lib/libc_bsd/gen/usleep.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)usleep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/usleep.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include "namespace.h"
-#include <time.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-int
-__usleep(useconds_t useconds)
-{
-	struct timespec time_to_sleep;
-
-	time_to_sleep.tv_nsec = (useconds % 1000000) * 1000;
-	time_to_sleep.tv_sec = useconds / 1000000;
-	return (((int (*)(const struct timespec *, struct timespec *))
-	    __libc_interposing[INTERPOS_nanosleep])(&time_to_sleep, NULL));
-}
-
-__weak_reference(__usleep, usleep);
-__weak_reference(__usleep, _usleep);
diff --git a/lib/libc_bsd/gen/utime.3 b/lib/libc_bsd/gen/utime.3
deleted file mode 100644
index 4d0b740..0000000
--- a/lib/libc_bsd/gen/utime.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)utime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/utime.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt UTIME 3
-.Os
-.Sh NAME
-.Nm utime
-.Nd set file times
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In utime.h
-.Ft int
-.Fn utime "const char *file" "const struct utimbuf *timep"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr utimes 2 .
-.Ef
-.Pp
-The
-.Fn utime
-function sets the access and modification times of the named file from
-the
-.Va actime
-and
-.Va modtime
-fields of the
-.Vt "struct utimbuf"
-pointed at by
-.Fa timep .
-.Pp
-If the times are specified (the
-.Fa timep
-argument is
-.Pf non- Dv NULL )
-the caller must be the owner of the file or be the super-user.
-.Pp
-If the times are not specified (the
-.Fa timep
-argument is
-.Dv NULL )
-the caller must be the owner of the file, have permission to write
-the file, or be the super-user.
-.Sh ERRORS
-The
-.Fn utime
-function may fail and set
-.Va errno
-for any of the errors specified for the library function
-.Xr utimes 2 .
-.Sh SEE ALSO
-.Xr stat 2 ,
-.Xr utimes 2
-.Sh STANDARDS
-The
-.Fn utime
-function conforms to
-.St -p1003.1-88 .
-.Sh HISTORY
-A
-.Fn utime
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/gen/utime.c b/lib/libc_bsd/gen/utime.c
deleted file mode 100644
index 982b458..0000000
--- a/lib/libc_bsd/gen/utime.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)utime.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/utime.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/time.h>
-
-#include <utime.h>
-
-int
-utime(path, times)
-	const char *path;
-	const struct utimbuf *times;
-{
-	struct timeval tv[2], *tvp;
-
-	if (times) {
-		tv[0].tv_sec = times->actime;
-		tv[1].tv_sec = times->modtime;
-		tv[0].tv_usec = tv[1].tv_usec = 0;
-		tvp = tv;
-	} else
-		tvp = NULL;
-	return (utimes(path, tvp));
-}
diff --git a/lib/libc_bsd/gen/utxdb.c b/lib/libc_bsd/gen/utxdb.c
deleted file mode 100644
index 27d439a..0000000
--- a/lib/libc_bsd/gen/utxdb.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * Copyright (c) 2010 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/utxdb.c 233345 2012-03-23 08:26:31Z ed $");
-
-#include "namespace.h"
-#include <sys/endian.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <utmpx.h>
-#include "utxdb.h"
-#include "un-namespace.h"
-
-#define	UTOF_STRING(ut, fu, field) do { \
-	strncpy((fu)->fu_ ## field, (ut)->ut_ ## field,		\
-	    MIN(sizeof (fu)->fu_ ## field, sizeof (ut)->ut_ ## field));	\
-} while (0)
-#define	UTOF_ID(ut, fu) do { \
-	memcpy((fu)->fu_id, (ut)->ut_id,				\
-	    MIN(sizeof (fu)->fu_id, sizeof (ut)->ut_id));		\
-} while (0)
-#define	UTOF_PID(ut, fu) do { \
-	(fu)->fu_pid = htobe32((ut)->ut_pid);				\
-} while (0)
-#define	UTOF_TYPE(ut, fu) do { \
-	(fu)->fu_type = (ut)->ut_type;					\
-} while (0)
-#define	UTOF_TV(fu) do { \
-	struct timeval tv;						\
-	gettimeofday(&tv, NULL);					\
-	(fu)->fu_tv = htobe64((uint64_t)tv.tv_sec * 1000000 +		\
-	    (uint64_t)tv.tv_usec);					\
-} while (0)
-
-void
-utx_to_futx(const struct utmpx *ut, struct futx *fu)
-{
-
-	memset(fu, 0, sizeof *fu);
-
-	switch (ut->ut_type) {
-	case BOOT_TIME:
-	case OLD_TIME:
-	case NEW_TIME:
-	/* Extension: shutdown time. */
-	case SHUTDOWN_TIME:
-		break;
-	case USER_PROCESS:
-		UTOF_ID(ut, fu);
-		UTOF_STRING(ut, fu, user);
-		UTOF_STRING(ut, fu, line);
-		/* Extension: host name. */
-		UTOF_STRING(ut, fu, host);
-		UTOF_PID(ut, fu);
-		break;
-	case INIT_PROCESS:
-		UTOF_ID(ut, fu);
-		UTOF_PID(ut, fu);
-		break;
-	case LOGIN_PROCESS:
-		UTOF_ID(ut, fu);
-		UTOF_STRING(ut, fu, user);
-		UTOF_STRING(ut, fu, line);
-		UTOF_PID(ut, fu);
-		break;
-	case DEAD_PROCESS:
-		UTOF_ID(ut, fu);
-		UTOF_PID(ut, fu);
-		break;
-	default:
-		fu->fu_type = EMPTY;
-		return;
-	}
-
-	UTOF_TYPE(ut, fu);
-	UTOF_TV(fu);
-}
-
-#define	FTOU_STRING(fu, ut, field) do { \
-	strncpy((ut)->ut_ ## field, (fu)->fu_ ## field,		\
-	    MIN(sizeof (ut)->ut_ ## field - 1, sizeof (fu)->fu_ ## field)); \
-} while (0)
-#define	FTOU_ID(fu, ut) do { \
-	memcpy((ut)->ut_id, (fu)->fu_id,				\
-	    MIN(sizeof (ut)->ut_id, sizeof (fu)->fu_id));		\
-} while (0)
-#define	FTOU_PID(fu, ut) do { \
-	(ut)->ut_pid = be32toh((fu)->fu_pid);				\
-} while (0)
-#define	FTOU_TYPE(fu, ut) do { \
-	(ut)->ut_type = (fu)->fu_type;					\
-} while (0)
-#define	FTOU_TV(fu, ut) do { \
-	uint64_t t;							\
-	t = be64toh((fu)->fu_tv);					\
-	(ut)->ut_tv.tv_sec = t / 1000000;				\
-	(ut)->ut_tv.tv_usec = t % 1000000;				\
-} while (0)
-
-struct utmpx *
-futx_to_utx(const struct futx *fu)
-{
-#ifdef __NO_TLS
-	static struct utmpx *ut;
-#else
-	static _Thread_local struct utmpx *ut;
-#endif
-
-	if (ut == NULL) {
-		ut = calloc(1, sizeof *ut);
-		if (ut == NULL)
-			return (NULL);
-	} else
-		memset(ut, 0, sizeof *ut);
-
-	switch (fu->fu_type) {
-	case BOOT_TIME:
-	case OLD_TIME:
-	case NEW_TIME:
-	/* Extension: shutdown time. */
-	case SHUTDOWN_TIME:
-		break;
-	case USER_PROCESS:
-		FTOU_ID(fu, ut);
-		FTOU_STRING(fu, ut, user);
-		FTOU_STRING(fu, ut, line);
-		/* Extension: host name. */
-		FTOU_STRING(fu, ut, host);
-		FTOU_PID(fu, ut);
-		break;
-	case INIT_PROCESS:
-		FTOU_ID(fu, ut);
-		FTOU_PID(fu, ut);
-		break;
-	case LOGIN_PROCESS:
-		FTOU_ID(fu, ut);
-		FTOU_STRING(fu, ut, user);
-		FTOU_STRING(fu, ut, line);
-		FTOU_PID(fu, ut);
-		break;
-	case DEAD_PROCESS:
-		FTOU_ID(fu, ut);
-		FTOU_PID(fu, ut);
-		break;
-	default:
-		ut->ut_type = EMPTY;
-		return (ut);
-	}
-
-	FTOU_TYPE(fu, ut);
-	FTOU_TV(fu, ut);
-	return (ut);
-}
diff --git a/lib/libc_bsd/gen/utxdb.h b/lib/libc_bsd/gen/utxdb.h
deleted file mode 100644
index a07978d..0000000
--- a/lib/libc_bsd/gen/utxdb.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2010 Ed Schouten <ed@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.
- *
- * 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: releng/10.2/lib/libc/gen/utxdb.h 202530 2010-01-17 21:40:05Z ed $
- */
-
-#ifndef _UTXDB_H_
-#define	_UTXDB_H_
-
-#include <stdint.h>
-
-#define	_PATH_UTX_ACTIVE	"/var/run/utx.active"
-#define	_PATH_UTX_LASTLOGIN	"/var/log/utx.lastlogin"
-#define	_PATH_UTX_LOG		"/var/log/utx.log"
-
-/*
- * Entries in struct futx are ordered by how often they are used.  In
- * utx.log only entries will be written until the last non-zero byte,
- * which means we want to put the hostname at the end. Most primitive
- * records only store a ut_type and ut_tv, which means we want to store
- * those at the front.
- */
-
-struct utmpx;
-
-struct futx {
-	uint8_t		fu_type;
-	uint64_t	fu_tv;
-	char		fu_id[8];
-	uint32_t	fu_pid;
-	char		fu_user[32];
-	char		fu_line[16];
-	char		fu_host[128];
-} __packed;
-
-void	utx_to_futx(const struct utmpx *, struct futx *);
-struct utmpx *futx_to_utx(const struct futx *);
-
-#endif /* !_UTXDB_H_ */
diff --git a/lib/libc_bsd/gen/valloc.3 b/lib/libc_bsd/gen/valloc.3
deleted file mode 100644
index f8397a3..0000000
--- a/lib/libc_bsd/gen/valloc.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)valloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gen/valloc.3 173182 2007-10-30 15:26:20Z keramida $
-.\"
-.Dd October 30, 2007
-.Dt VALLOC 3
-.Os
-.Sh NAME
-.Nm valloc
-.Nd aligned memory allocation function
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void *
-.Fn valloc "size_t size"
-.Sh DESCRIPTION
-The
-.Fn valloc
-function is obsoleted by
-.Xr posix_memalign 3 ,
-which can be used to request page-aligned allocations.
-.Pp
-The
-.Fn valloc
-function
-allocates
-.Fa size
-bytes aligned on a page boundary.
-.Sh RETURN VALUES
-The
-.Fn valloc
-function returns
-a pointer to the allocated space if successful; otherwise
-a null pointer is returned.
-.Sh SEE ALSO
-.Xr posix_memalign 3
-.Sh HISTORY
-The
-.Fn valloc
-function appeared in
-.Bx 3.0 .
-.Pp
-The
-.Fn valloc
-function correctly allocated memory that could be deallocated via
-.Fn free
-starting in
-.Fx 7.0 .
diff --git a/lib/libc_bsd/gen/valloc.c b/lib/libc_bsd/gen/valloc.c
deleted file mode 100644
index 840ab5a..0000000
--- a/lib/libc_bsd/gen/valloc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1980, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)valloc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/valloc.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <stdlib.h>
-#include <unistd.h>
-
-void *
-valloc(size_t i)
-{
-	void	*ret;
-
-	if (posix_memalign(&ret, getpagesize(), i) != 0)
-		ret = NULL;
-
-	return ret;
-}
diff --git a/lib/libc_bsd/gen/wait.c b/lib/libc_bsd/gen/wait.c
deleted file mode 100644
index f4632cf..0000000
--- a/lib/libc_bsd/gen/wait.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wait.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/wait.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-pid_t
-__wait(int *istat)
-{
-
-	return (((pid_t (*)(pid_t, int *, int, struct rusage *))
-	    __libc_interposing[INTERPOS_wait4])(WAIT_ANY, istat, 0, NULL));
-}
-
-__weak_reference(__wait, wait);
-__weak_reference(__wait, _wait);
diff --git a/lib/libc_bsd/gen/wait3.c b/lib/libc_bsd/gen/wait3.c
deleted file mode 100644
index a8d2a65..0000000
--- a/lib/libc_bsd/gen/wait3.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wait3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/wait3.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-pid_t
-__wait3(int *istat, int options, struct rusage *rup)
-{
-
-	return (((pid_t (*)(pid_t, int *, int, struct rusage *))
-	    __libc_interposing[INTERPOS_wait4])(WAIT_ANY, istat, options, rup));
-}
-
-__weak_reference(__wait3, wait3);
diff --git a/lib/libc_bsd/gen/waitid.c b/lib/libc_bsd/gen/waitid.c
deleted file mode 100644
index 9abbffa..0000000
--- a/lib/libc_bsd/gen/waitid.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2012 Jukka A. Ukkonen
- * All rights reserved.
- *
- * This software was developed by Jukka Ukkonen for FreeBSD.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/waitid.c 281981 2015-04-25 08:14:08Z kib $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <stddef.h>
-#include <string.h>
-#include <signal.h>
-#include <errno.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-int
-__waitid(idtype_t idtype, id_t id, siginfo_t *info, int flags)
-{
-	int status;
-	pid_t ret;
-
-	ret = ((pid_t (*)(idtype_t, id_t, int *, int, struct __wrusage *,
-	    siginfo_t *))__libc_interposing[INTERPOS_wait6])(idtype, id,
-	    &status, flags, NULL, info);
-
-	/*
-	 * According to SUSv4, waitid() shall not return a PID when a
-	 * process is found, but only 0.  If a process was actually
-	 * found, siginfo_t fields si_signo and si_pid will be
-	 * non-zero.  In case WNOHANG was set in the flags and no
-	 * process was found those fields are set to zero using
-	 * memset() below.
-	 */
-	if (ret == 0 && info != NULL)
-		memset(info, 0, sizeof(*info));
-	else if (ret > 0)
-		ret = 0;
-	return (ret);
-}
-
-__weak_reference(__waitid, waitid);
-__weak_reference(__waitid, _waitid);
diff --git a/lib/libc_bsd/gen/waitpid.c b/lib/libc_bsd/gen/waitpid.c
deleted file mode 100644
index 6d75a8e..0000000
--- a/lib/libc_bsd/gen/waitpid.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)waitpid.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/waitpid.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-pid_t
-__waitpid(pid_t pid, int *istat, int options)
-{
-
-	return (((pid_t (*)(pid_t, int *, int, struct rusage *))
-	    __libc_interposing[INTERPOS_wait4])(pid, istat, options, NULL));
-}
-
-__weak_reference(__waitpid, waitpid);
-__weak_reference(__waitpid, _waitpid);
diff --git a/lib/libc_bsd/gen/wordexp.3 b/lib/libc_bsd/gen/wordexp.3
deleted file mode 100644
index b96579c..0000000
--- a/lib/libc_bsd/gen/wordexp.3
+++ /dev/null
@@ -1,206 +0,0 @@
-.\"
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/gen/wordexp.3 157852 2006-04-18 21:37:24Z ceri $
-.\"
-.Dd July 29, 2004
-.Dt WORDEXP 3
-.Os
-.Sh NAME
-.Nm wordexp
-.Nd "perform shell-style word expansions"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wordexp.h
-.Ft int
-.Fn wordexp "const char * restrict words" "wordexp_t * restrict we" "int flags"
-.Ft void
-.Fn wordfree "wordexp_t *we"
-.Sh DESCRIPTION
-The
-.Fn wordexp
-function performs shell-style word expansion on
-.Fa words
-and places the list of words into the
-.Va we_wordv
-member of
-.Fa we ,
-and the number of words into
-.Va we_wordc .
-.Pp
-The
-.Fa flags
-argument is the bitwise inclusive OR of any of the following constants:
-.Bl -tag -width ".Dv WRDE_SHOWERR"
-.It Dv WRDE_APPEND
-Append the words to those generated by a previous call to
-.Fn wordexp .
-.It Dv WRDE_DOOFFS
-As many
-.Dv NULL
-pointers as are specified by the
-.Va we_offs
-member of
-.Fa we
-are added to the front of
-.Va we_wordv .
-.It Dv WRDE_NOCMD
-Disallow command substitution in
-.Fa words .
-See the note in
-.Sx BUGS
-before using this.
-.It Dv WRDE_REUSE
-The
-.Fa we
-argument was passed to a previous successful call to
-.Fn wordexp
-but has not been passed to
-.Fn wordfree .
-The implementation may reuse the space allocated to it.
-.It Dv WRDE_SHOWERR
-Do not redirect shell error messages to
-.Pa /dev/null .
-.It Dv WRDE_UNDEF
-Report error on an attempt to expand an undefined shell variable.
-.El
-.Pp
-The
-.Vt wordexp_t
-structure is defined in
-.In wordexp.h
-as:
-.Bd -literal -offset indent
-typedef struct {
-	size_t	we_wordc;	/* count of words matched */
-	char	**we_wordv;	/* pointer to list of words */
-	size_t	we_offs;	/* slots to reserve in we_wordv */
-} wordexp_t;
-.Ed
-.Pp
-The
-.Fn wordfree
-function frees the memory allocated by
-.Fn wordexp .
-.Sh IMPLEMENTATION NOTES
-The
-.Fn wordexp
-function is implemented as a wrapper around the undocumented
-.Ic wordexp
-shell built-in command.
-.Sh RETURN VALUES
-The
-.Fn wordexp
-function returns zero if successful, otherwise it returns one of the following
-error codes:
-.Bl -tag -width ".Dv WRDE_NOSPACE"
-.It Dv WRDE_BADCHAR
-The
-.Fa words
-argument contains one of the following unquoted characters:
-.Aq newline ,
-.Ql | ,
-.Ql & ,
-.Ql \&; ,
-.Ql < ,
-.Ql > ,
-.Ql \&( ,
-.Ql \&) ,
-.Ql { ,
-.Ql } .
-.It Dv WRDE_BADVAL
-An attempt was made to expand an undefined shell variable and
-.Dv WRDE_UNDEF
-is set in
-.Fa flags .
-.It Dv WRDE_CMDSUB
-An attempt was made to use command substitution and
-.Dv WRDE_NOCMD
-is set in
-.Fa flags .
-.It Dv WRDE_NOSPACE
-Not enough memory to store the result.
-.It Dv WRDE_SYNTAX
-Shell syntax error in
-.Fa words .
-.El
-.Pp
-The
-.Fn wordfree
-function returns no value.
-.Sh ENVIRONMENT
-.Bl -tag -width ".Ev IFS"
-.It Ev IFS
-Field separator.
-.El
-.Sh EXAMPLES
-Invoke the editor on all
-.Pa .c
-files in the current directory
-and
-.Pa /etc/motd
-(error checking omitted):
-.Bd -literal -offset indent
-wordexp_t we;
-
-wordexp("${EDITOR:-vi} *.c /etc/motd", &we, 0);
-execvp(we.we_wordv[0], we.we_wordv);
-.Ed
-.Sh DIAGNOSTICS
-Diagnostic messages from the shell are written to the standard error output
-if
-.Dv WRDE_SHOWERR
-is set in
-.Fa flags .
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr fnmatch 3 ,
-.Xr glob 3 ,
-.Xr popen 3 ,
-.Xr system 3
-.Sh STANDARDS
-The
-.Fn wordexp
-and
-.Fn wordfree
-functions conform to
-.St -p1003.1-2001 .
-.Sh BUGS
-Do not pass untrusted user data to
-.Fn wordexp ,
-regardless of whether the
-.Dv WRDE_NOCMD
-flag is set.
-The
-.Fn wordexp
-function attempts to detect input that would cause commands to be
-executed before passing it to the shell
-but it does not use the same parser so it may be fooled.
-.Pp
-The current
-.Fn wordexp
-implementation does not recognize multibyte characters, since the
-shell (which it invokes to perform expansions) does not.
diff --git a/lib/libc_bsd/gen/wordexp.c b/lib/libc_bsd/gen/wordexp.c
deleted file mode 100644
index d772691..0000000
--- a/lib/libc_bsd/gen/wordexp.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include "namespace.h"
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <paths.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <wordexp.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gen/wordexp.c 287872 2015-09-16 20:59:41Z delphij $");
-
-static int	we_askshell(const char *, wordexp_t *, int);
-static int	we_check(const char *, int);
-
-/*
- * wordexp --
- *	Perform shell word expansion on `words' and place the resulting list
- *	of words in `we'. See wordexp(3).
- *
- *	Specified by IEEE Std. 1003.1-2001.
- */
-int
-wordexp(const char * __restrict words, wordexp_t * __restrict we, int flags)
-{
-	int error;
-
-	if (flags & WRDE_REUSE)
-		wordfree(we);
-	if ((flags & WRDE_APPEND) == 0) {
-		we->we_wordc = 0;
-		we->we_wordv = NULL;
-		we->we_strings = NULL;
-		we->we_nbytes = 0;
-	}
-	if ((error = we_check(words, flags)) != 0) {
-		wordfree(we);
-		return (error);
-	}
-	if ((error = we_askshell(words, we, flags)) != 0) {
-		wordfree(we);
-		return (error);
-	}
-	return (0);
-}
-
-static size_t
-we_read_fully(int fd, char *buffer, size_t len)
-{
-	size_t done;
-	ssize_t nread;
-
-	done = 0;
-	do {
-		nread = _read(fd, buffer + done, len - done);
-		if (nread == -1 && errno == EINTR)
-			continue;
-		if (nread <= 0)
-			break;
-		done += nread;
-	} while (done != len);
-	return done;
-}
-
-/*
- * we_askshell --
- *	Use the `wordexp' /bin/sh builtin function to do most of the work
- *	in expanding the word string. This function is complicated by
- *	memory management.
- */
-static int
-we_askshell(const char *words, wordexp_t *we, int flags)
-{
-	int pdes[2];			/* Pipe to child */
-	char bbuf[9];			/* Buffer for byte count */
-	char wbuf[9];			/* Buffer for word count */
-	long nwords, nbytes;		/* Number of words, bytes from child */
-	long i;				/* Handy integer */
-	size_t sofs;			/* Offset into we->we_strings */
-	size_t vofs;			/* Offset into we->we_wordv */
-	pid_t pid;			/* Process ID of child */
-	pid_t wpid;			/* waitpid return value */
-	int status;			/* Child exit status */
-	int error;			/* Our return value */
-	int serrno;			/* errno to return */
-	char *np, *p;			/* Handy pointers */
-	char *nstrings;			/* Temporary for realloc() */
-	char **nwv;			/* Temporary for realloc() */
-	sigset_t newsigblock, oldsigblock;
-	const char *ifs;
-
-	serrno = errno;
-	ifs = getenv("IFS");
-
-	if (pipe2(pdes, O_CLOEXEC) < 0)
-		return (WRDE_NOSPACE);	/* XXX */
-	(void)sigemptyset(&newsigblock);
-	(void)sigaddset(&newsigblock, SIGCHLD);
-	(void)__libc_sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
-	if ((pid = fork()) < 0) {
-		serrno = errno;
-		_close(pdes[0]);
-		_close(pdes[1]);
-		(void)__libc_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-		errno = serrno;
-		return (WRDE_NOSPACE);	/* XXX */
-	}
-	else if (pid == 0) {
-		/*
-		 * We are the child; just get /bin/sh to run the wordexp
-		 * builtin on `words'.
-		 */
-		(void)__libc_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-		if ((pdes[1] != STDOUT_FILENO ?
-		    _dup2(pdes[1], STDOUT_FILENO) :
-		    _fcntl(pdes[1], F_SETFD, 0)) < 0)
-			_exit(1);
-		execl(_PATH_BSHELL, "sh", flags & WRDE_UNDEF ? "-u" : "+u",
-		    "-c", "IFS=$1;eval \"$2\";eval \"wordexp $3\"", "",
-		    ifs != NULL ? ifs : " \t\n",
-		    flags & WRDE_SHOWERR ? "" : "exec 2>/dev/null", words,
-		    (char *)NULL);
-		_exit(1);
-	}
-
-	/*
-	 * We are the parent; read the output of the shell wordexp function,
-	 * which is a 32-bit hexadecimal word count, a 32-bit hexadecimal
-	 * byte count (not including terminating null bytes), followed by
-	 * the expanded words separated by nulls.
-	 */
-	_close(pdes[1]);
-	if (we_read_fully(pdes[0], wbuf, 8) != 8 ||
-			we_read_fully(pdes[0], bbuf, 8) != 8) {
-		error = flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX;
-		serrno = errno;
-		goto cleanup;
-	}
-	wbuf[8] = bbuf[8] = '\0';
-	nwords = strtol(wbuf, NULL, 16);
-	nbytes = strtol(bbuf, NULL, 16) + nwords;
-
-	/*
-	 * Allocate or reallocate (when flags & WRDE_APPEND) the word vector
-	 * and string storage buffers for the expanded words we're about to
-	 * read from the child.
-	 */
-	sofs = we->we_nbytes;
-	vofs = we->we_wordc;
-	if ((flags & (WRDE_DOOFFS|WRDE_APPEND)) == (WRDE_DOOFFS|WRDE_APPEND))
-		vofs += we->we_offs;
-	we->we_wordc += nwords;
-	we->we_nbytes += nbytes;
-	if ((nwv = realloc(we->we_wordv, (we->we_wordc + 1 +
-	    (flags & WRDE_DOOFFS ?  we->we_offs : 0)) *
-	    sizeof(char *))) == NULL) {
-		error = WRDE_NOSPACE;
-		goto cleanup;
-	}
-	we->we_wordv = nwv;
-	if ((nstrings = realloc(we->we_strings, we->we_nbytes)) == NULL) {
-		error = WRDE_NOSPACE;
-		goto cleanup;
-	}
-	for (i = 0; i < vofs; i++)
-		if (we->we_wordv[i] != NULL)
-			we->we_wordv[i] += nstrings - we->we_strings;
-	we->we_strings = nstrings;
-
-	if (we_read_fully(pdes[0], we->we_strings + sofs, nbytes) != nbytes) {
-		error = flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX;
-		serrno = errno;
-		goto cleanup;
-	}
-
-	error = 0;
-cleanup:
-	_close(pdes[0]);
-	do
-		wpid = _waitpid(pid, &status, 0);
-	while (wpid < 0 && errno == EINTR);
-	(void)__libc_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-	if (error != 0) {
-		errno = serrno;
-		return (error);
-	}
-	if (wpid < 0 || !WIFEXITED(status) || WEXITSTATUS(status) != 0)
-		return (flags & WRDE_UNDEF ? WRDE_BADVAL : WRDE_SYNTAX);
-
-	/*
-	 * Break the null-terminated expanded word strings out into
-	 * the vector.
-	 */
-	if (vofs == 0 && flags & WRDE_DOOFFS)
-		while (vofs < we->we_offs)
-			we->we_wordv[vofs++] = NULL;
-	p = we->we_strings + sofs;
-	while (nwords-- != 0) {
-		we->we_wordv[vofs++] = p;
-		if ((np = memchr(p, '\0', nbytes)) == NULL)
-			return (WRDE_NOSPACE);	/* XXX */
-		nbytes -= np - p + 1;
-		p = np + 1;
-	}
-	we->we_wordv[vofs] = NULL;
-
-	return (0);
-}
-
-/*
- * we_check --
- *	Check that the string contains none of the following unquoted
- *	special characters: <newline> |&;<>(){}
- *	or command substitutions when WRDE_NOCMD is set in flags.
- */
-static int
-we_check(const char *words, int flags)
-{
-	char c;
-	int dquote, level, quote, squote;
-
-	quote = squote = dquote = 0;
-	while ((c = *words++) != '\0') {
-		switch (c) {
-		case '\\':
-			if (squote == 0)
-				quote ^= 1;
-			continue;
-		case '\'':
-			if (quote + dquote == 0)
-				squote ^= 1;
-			break;
-		case '"':
-			if (quote + squote == 0)
-				dquote ^= 1;
-			break;
-		case '`':
-			if (quote + squote == 0 && flags & WRDE_NOCMD)
-				return (WRDE_CMDSUB);
-			while ((c = *words++) != '\0' && c != '`')
-				if (c == '\\' && (c = *words++) == '\0')
-					break;
-			if (c == '\0')
-				return (WRDE_SYNTAX);
-			break;
-		case '|': case '&': case ';': case '<': case '>':
-		case '{': case '}': case '(': case ')': case '\n':
-			if (quote + squote + dquote == 0)
-				return (WRDE_BADCHAR);
-			break;
-		case '$':
-			if ((c = *words++) == '\0')
-				break;
-			else if (quote + squote == 0 && c == '(') {
-				if (flags & WRDE_NOCMD && *words != '(')
-					return (WRDE_CMDSUB);
-				level = 1;
-				while ((c = *words++) != '\0') {
-					if (c == '\\') {
-						if ((c = *words++) == '\0')
-							break;
-					} else if (c == '(')
-						level++;
-					else if (c == ')' && --level == 0)
-						break;
-				}
-				if (c == '\0' || level != 0)
-					return (WRDE_SYNTAX);
-			} else if (quote + squote == 0 && c == '{') {
-				level = 1;
-				while ((c = *words++) != '\0') {
-					if (c == '\\') {
-						if ((c = *words++) == '\0')
-							break;
-					} else if (c == '{')
-						level++;
-					else if (c == '}' && --level == 0)
-						break;
-				}
-				if (c == '\0' || level != 0)
-					return (WRDE_SYNTAX);
-			} else
-				--words;
-			break;
-		default:
-			break;
-		}
-		quote = 0;
-	}
-	if (quote + squote + dquote != 0)
-		return (WRDE_SYNTAX);
-
-	return (0);
-}
-
-/*
- * wordfree --
- *	Free the result of wordexp(). See wordexp(3).
- *
- *	Specified by IEEE Std. 1003.1-2001.
- */
-void
-wordfree(wordexp_t *we)
-{
-
-	if (we == NULL)
-		return;
-	free(we->we_wordv);
-	free(we->we_strings);
-	we->we_wordv = NULL;
-	we->we_strings = NULL;
-	we->we_nbytes = 0;
-	we->we_wordc = 0;
-}
diff --git a/lib/libc_bsd/gmon/Makefile.inc b/lib/libc_bsd/gmon/Makefile.inc
deleted file mode 100644
index 1bca8ce..0000000
--- a/lib/libc_bsd/gmon/Makefile.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 163739 2006-10-28 13:34:35Z bde $
-
-# gmon sources
-.PATH: ${.CURDIR}/gmon
-
-SRCS+=	gmon.c mcount.c
-
-SYM_MAPS+=${.CURDIR}/gmon/Symbol.map
-
-MAN+=	moncontrol.3
-
-MLINKS+=moncontrol.3 monstartup.3
-
-# mcount cannot be compiled with profiling
-mcount.po: mcount.o
-	cp mcount.o mcount.po
diff --git a/lib/libc_bsd/gmon/Symbol.map b/lib/libc_bsd/gmon/Symbol.map
deleted file mode 100644
index 9effa86..0000000
--- a/lib/libc_bsd/gmon/Symbol.map
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/gmon/Symbol.map 169525 2007-05-13 14:16:55Z deischen $
- */
-
-FBSD_1.0 {
-	_mcleanup;
-	monstartup;
-	moncontrol;
-	mexitcount;
-};
-
-FBSDprivate_1.0 {
-	_gmonparam;
-};
diff --git a/lib/libc_bsd/gmon/gmon.c b/lib/libc_bsd/gmon/gmon.c
deleted file mode 100644
index 79c40e2..0000000
--- a/lib/libc_bsd/gmon/gmon.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*-
- * Copyright (c) 1983, 1992, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gmon.c	8.1 (Berkeley) 6/4/93";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gmon/gmon.c 254301 2013-08-13 21:45:48Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/gmon.h>
-#include <sys/sysctl.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) || (defined(__powerpc__) && !defined(__powerpc64__))
-extern char *minbrk __asm (".minbrk");
-#elif defined(__powerpc64__)
-extern char *minbrk __asm ("_minbrk");
-#else
-extern char *minbrk __asm ("minbrk");
-#endif
-
-struct gmonparam _gmonparam = { GMON_PROF_OFF };
-
-static int	s_scale;
-/* See profil(2) where this is described (incorrectly). */
-#define	SCALE_SHIFT	16
-
-#define ERR(s) _write(2, s, sizeof(s))
-
-void	moncontrol(int);
-static int hertz(void);
-
-void
-monstartup(lowpc, highpc)
-	u_long lowpc;
-	u_long highpc;
-{
-	int o;
-	char *cp;
-	struct gmonparam *p = &_gmonparam;
-
-	/*
-	 * round lowpc and highpc to multiples of the density we're using
-	 * so the rest of the scaling (here and in gprof) stays in ints.
-	 */
-	p->lowpc = ROUNDDOWN(lowpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->highpc = ROUNDUP(highpc, HISTFRACTION * sizeof(HISTCOUNTER));
-	p->textsize = p->highpc - p->lowpc;
-	p->kcountsize = p->textsize / HISTFRACTION;
-	p->hashfraction = HASHFRACTION;
-	p->fromssize = p->textsize / HASHFRACTION;
-	p->tolimit = p->textsize * ARCDENSITY / 100;
-	if (p->tolimit < MINARCS)
-		p->tolimit = MINARCS;
-	else if (p->tolimit > MAXARCS)
-		p->tolimit = MAXARCS;
-	p->tossize = p->tolimit * sizeof(struct tostruct);
-
-	cp = sbrk(p->kcountsize + p->fromssize + p->tossize);
-	if (cp == (char *)-1) {
-		ERR("monstartup: out of memory\n");
-		return;
-	}
-#ifdef notdef
-	bzero(cp, p->kcountsize + p->fromssize + p->tossize);
-#endif
-	p->tos = (struct tostruct *)cp;
-	cp += p->tossize;
-	p->kcount = (u_short *)cp;
-	cp += p->kcountsize;
-	p->froms = (u_short *)cp;
-
-	minbrk = sbrk(0);
-	p->tos[0].link = 0;
-
-	o = p->highpc - p->lowpc;
-	s_scale = (p->kcountsize < o) ?
-	    ((uintmax_t)p->kcountsize << SCALE_SHIFT) / o : (1 << SCALE_SHIFT);
-	moncontrol(1);
-}
-
-void
-_mcleanup(void)
-{
-	int fd;
-	int fromindex;
-	int endfrom;
-	u_long frompc;
-	int toindex;
-	struct rawarc rawarc;
-	struct gmonparam *p = &_gmonparam;
-	struct gmonhdr gmonhdr, *hdr;
-	struct clockinfo clockinfo;
-	char outname[128];
-	int mib[2];
-	size_t size;
-#ifdef DEBUG
-	int log, len;
-	char buf[200];
-#endif
-
-	if (p->state == GMON_PROF_ERROR)
-		ERR("_mcleanup: tos overflow\n");
-
-	size = sizeof(clockinfo);
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_CLOCKRATE;
-	if (sysctl(mib, 2, &clockinfo, &size, NULL, 0) < 0) {
-		/*
-		 * Best guess
-		 */
-		clockinfo.profhz = hertz();
-	} else if (clockinfo.profhz == 0) {
-		if (clockinfo.hz != 0)
-			clockinfo.profhz = clockinfo.hz;
-		else
-			clockinfo.profhz = hertz();
-	}
-
-	moncontrol(0);
-	if (getenv("PROFIL_USE_PID"))
-		snprintf(outname, sizeof(outname), "%s.%d.gmon",
-		    _getprogname(), getpid());
-	else
-		snprintf(outname, sizeof(outname), "%s.gmon", _getprogname());
-
-	fd = _open(outname, O_CREAT|O_TRUNC|O_WRONLY|O_CLOEXEC, 0666);
-	if (fd < 0) {
-		_warn("_mcleanup: %s", outname);
-		return;
-	}
-#ifdef DEBUG
-	log = _open("gmon.log", O_CREAT|O_TRUNC|O_WRONLY|O_CLOEXEC, 0664);
-	if (log < 0) {
-		_warn("_mcleanup: gmon.log");
-		return;
-	}
-	len = sprintf(buf, "[mcleanup1] kcount 0x%p ssiz %lu\n",
-	    p->kcount, p->kcountsize);
-	_write(log, buf, len);
-#endif
-	hdr = (struct gmonhdr *)&gmonhdr;
-	bzero(hdr, sizeof(*hdr));
-	hdr->lpc = p->lowpc;
-	hdr->hpc = p->highpc;
-	hdr->ncnt = p->kcountsize + sizeof(gmonhdr);
-	hdr->version = GMONVERSION;
-	hdr->profrate = clockinfo.profhz;
-	_write(fd, (char *)hdr, sizeof *hdr);
-	_write(fd, p->kcount, p->kcountsize);
-	endfrom = p->fromssize / sizeof(*p->froms);
-	for (fromindex = 0; fromindex < endfrom; fromindex++) {
-		if (p->froms[fromindex] == 0)
-			continue;
-
-		frompc = p->lowpc;
-		frompc += fromindex * p->hashfraction * sizeof(*p->froms);
-		for (toindex = p->froms[fromindex]; toindex != 0;
-		     toindex = p->tos[toindex].link) {
-#ifdef DEBUG
-			len = sprintf(buf,
-			"[mcleanup2] frompc 0x%lx selfpc 0x%lx count %lu\n" ,
-				frompc, p->tos[toindex].selfpc,
-				p->tos[toindex].count);
-			_write(log, buf, len);
-#endif
-			rawarc.raw_frompc = frompc;
-			rawarc.raw_selfpc = p->tos[toindex].selfpc;
-			rawarc.raw_count = p->tos[toindex].count;
-			_write(fd, &rawarc, sizeof rawarc);
-		}
-	}
-	_close(fd);
-}
-
-/*
- * Control profiling
- *	profiling is what mcount checks to see if
- *	all the data structures are ready.
- */
-void
-moncontrol(mode)
-	int mode;
-{
-	struct gmonparam *p = &_gmonparam;
-
-	if (mode) {
-		/* start */
-		profil((char *)p->kcount, p->kcountsize, p->lowpc, s_scale);
-		p->state = GMON_PROF_ON;
-	} else {
-		/* stop */
-		profil((char *)0, 0, 0, 0);
-		p->state = GMON_PROF_OFF;
-	}
-}
-
-/*
- * discover the tick frequency of the machine
- * if something goes wrong, we return 0, an impossible hertz.
- */
-static int
-hertz()
-{
-	struct itimerval tim;
-
-	tim.it_interval.tv_sec = 0;
-	tim.it_interval.tv_usec = 1;
-	tim.it_value.tv_sec = 0;
-	tim.it_value.tv_usec = 0;
-	setitimer(ITIMER_REAL, &tim, 0);
-	setitimer(ITIMER_REAL, 0, &tim);
-	if (tim.it_interval.tv_usec < 2)
-		return(0);
-	return (1000000 / tim.it_interval.tv_usec);
-}
diff --git a/lib/libc_bsd/gmon/mcount.c b/lib/libc_bsd/gmon/mcount.c
deleted file mode 100644
index 787940e..0000000
--- a/lib/libc_bsd/gmon/mcount.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/*-
- * Copyright (c) 1983, 1992, 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.
- * 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.
- */
-
-#if !defined(_KERNEL) && defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mcount.c	8.1 (Berkeley) 6/4/93";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/gmon/mcount.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/param.h>
-#include <sys/gmon.h>
-#ifdef _KERNEL
-#include <sys/systm.h>
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-void	bintr(void);
-void	btrap(void);
-void	eintr(void);
-void	user(void);
-#endif
-#include <machine/atomic.h>
-
-/*
- * mcount is called on entry to each function compiled with the profiling
- * switch set.  _mcount(), which is declared in a machine-dependent way
- * with _MCOUNT_DECL, does the actual work and is either inlined into a
- * C routine or called by an assembly stub.  In any case, this magic is
- * taken care of by the MCOUNT definition in <machine/profile.h>.
- *
- * _mcount updates data structures that represent traversals of the
- * program's call graph edges.  frompc and selfpc are the return
- * address and function address that represents the given call graph edge.
- *
- * Note: the original BSD code used the same variable (frompcindex) for
- * both frompcindex and frompc.  Any reasonable, modern compiler will
- * perform this optimization.
- */
-/* _mcount; may be static, inline, etc */
-_MCOUNT_DECL(uintfptr_t frompc, uintfptr_t selfpc)
-{
-#ifdef GUPROF
-	u_int delta;
-#endif
-	fptrdiff_t frompci;
-	u_short *frompcindex;
-	struct tostruct *top, *prevtop;
-	struct gmonparam *p;
-	long toindex;
-#ifdef _KERNEL
-	MCOUNT_DECL(s)
-#endif
-
-	p = &_gmonparam;
-#ifndef GUPROF			/* XXX */
-	/*
-	 * check that we are profiling
-	 * and that we aren't recursively invoked.
-	 */
-	if (p->state != GMON_PROF_ON)
-		return;
-#endif
-#ifdef _KERNEL
-	MCOUNT_ENTER(s);
-#else
-	if (!atomic_cmpset_acq_int(&p->state, GMON_PROF_ON, GMON_PROF_BUSY))
-		return;
-#endif
-	frompci = frompc - p->lowpc;
-
-#ifdef _KERNEL
-	/*
-	 * When we are called from an exception handler, frompci may be
-	 * for a user address.  Convert such frompci's to the index of
-	 * user() to merge all user counts.
-	 */
-	if (frompci >= p->textsize) {
-		if (frompci + p->lowpc
-		    >= (uintfptr_t)(VM_MAXUSER_ADDRESS + UPAGES * PAGE_SIZE))
-			goto done;
-		frompci = (uintfptr_t)user - p->lowpc;
-		if (frompci >= p->textsize)
-		    goto done;
-	}
-#endif
-
-#ifdef GUPROF
-	if (p->state != GMON_PROF_HIRES)
-		goto skip_guprof_stuff;
-	/*
-	 * Look at the clock and add the count of clock cycles since the
-	 * clock was last looked at to a counter for frompc.  This
-	 * solidifies the count for the function containing frompc and
-	 * effectively starts another clock for the current function.
-	 * The count for the new clock will be solidified when another
-	 * function call is made or the function returns.
-	 *
-	 * We use the usual sampling counters since they can be located
-	 * efficiently.  4-byte counters are usually necessary.
-	 *
-	 * There are many complications for subtracting the profiling
-	 * overheads from the counts for normal functions and adding
-	 * them to the counts for mcount(), mexitcount() and cputime().
-	 * We attempt to handle fractional cycles, but the overheads
-	 * are usually underestimated because they are calibrated for
-	 * a simpler than usual setup.
-	 */
-	delta = cputime() - p->mcount_overhead;
-	p->cputime_overhead_resid += p->cputime_overhead_frac;
-	p->mcount_overhead_resid += p->mcount_overhead_frac;
-	if ((int)delta < 0)
-		*p->mcount_count += delta + p->mcount_overhead
-				    - p->cputime_overhead;
-	else if (delta != 0) {
-		if (p->cputime_overhead_resid >= CALIB_SCALE) {
-			p->cputime_overhead_resid -= CALIB_SCALE;
-			++*p->cputime_count;
-			--delta;
-		}
-		if (delta != 0) {
-			if (p->mcount_overhead_resid >= CALIB_SCALE) {
-				p->mcount_overhead_resid -= CALIB_SCALE;
-				++*p->mcount_count;
-				--delta;
-			}
-			KCOUNT(p, frompci) += delta;
-		}
-		*p->mcount_count += p->mcount_overhead_sub;
-	}
-	*p->cputime_count += p->cputime_overhead;
-skip_guprof_stuff:
-#endif /* GUPROF */
-
-#ifdef _KERNEL
-	/*
-	 * When we are called from an exception handler, frompc is faked
-	 * to be for where the exception occurred.  We've just solidified
-	 * the count for there.  Now convert frompci to the index of btrap()
-	 * for trap handlers and bintr() for interrupt handlers to make
-	 * exceptions appear in the call graph as calls from btrap() and
-	 * bintr() instead of calls from all over.
-	 */
-	if ((uintfptr_t)selfpc >= (uintfptr_t)btrap
-	    && (uintfptr_t)selfpc < (uintfptr_t)eintr) {
-		if ((uintfptr_t)selfpc >= (uintfptr_t)bintr)
-			frompci = (uintfptr_t)bintr - p->lowpc;
-		else
-			frompci = (uintfptr_t)btrap - p->lowpc;
-	}
-#endif
-
-	/*
-	 * check that frompc is a reasonable pc value.
-	 * for example:	signal catchers get called from the stack,
-	 *		not from text space.  too bad.
-	 */
-	if (frompci >= p->textsize)
-		goto done;
-
-	frompcindex = &p->froms[frompci / (p->hashfraction * sizeof(*p->froms))];
-	toindex = *frompcindex;
-	if (toindex == 0) {
-		/*
-		 *	first time traversing this arc
-		 */
-		toindex = ++p->tos[0].link;
-		if (toindex >= p->tolimit)
-			/* halt further profiling */
-			goto overflow;
-
-		*frompcindex = toindex;
-		top = &p->tos[toindex];
-		top->selfpc = selfpc;
-		top->count = 1;
-		top->link = 0;
-		goto done;
-	}
-	top = &p->tos[toindex];
-	if (top->selfpc == selfpc) {
-		/*
-		 * arc at front of chain; usual case.
-		 */
-		top->count++;
-		goto done;
-	}
-	/*
-	 * have to go looking down chain for it.
-	 * top points to what we are looking at,
-	 * prevtop points to previous top.
-	 * we know it is not at the head of the chain.
-	 */
-	for (; /* goto done */; ) {
-		if (top->link == 0) {
-			/*
-			 * top is end of the chain and none of the chain
-			 * had top->selfpc == selfpc.
-			 * so we allocate a new tostruct
-			 * and link it to the head of the chain.
-			 */
-			toindex = ++p->tos[0].link;
-			if (toindex >= p->tolimit)
-				goto overflow;
-
-			top = &p->tos[toindex];
-			top->selfpc = selfpc;
-			top->count = 1;
-			top->link = *frompcindex;
-			*frompcindex = toindex;
-			goto done;
-		}
-		/*
-		 * otherwise, check the next arc on the chain.
-		 */
-		prevtop = top;
-		top = &p->tos[top->link];
-		if (top->selfpc == selfpc) {
-			/*
-			 * there it is.
-			 * increment its count
-			 * move it to the head of the chain.
-			 */
-			top->count++;
-			toindex = prevtop->link;
-			prevtop->link = top->link;
-			top->link = *frompcindex;
-			*frompcindex = toindex;
-			goto done;
-		}
-
-	}
-done:
-#ifdef _KERNEL
-	MCOUNT_EXIT(s);
-#else
-	atomic_store_rel_int(&p->state, GMON_PROF_ON);
-#endif
-	return;
-overflow:
-	atomic_store_rel_int(&p->state, GMON_PROF_ERROR);
-#ifdef _KERNEL
-	MCOUNT_EXIT(s);
-#endif
-	return;
-}
-
-/*
- * Actual definition of mcount function.  Defined in <machine/profile.h>,
- * which is included by <sys/gmon.h>.
- */
-MCOUNT
-
-#ifdef GUPROF
-void
-mexitcount(selfpc)
-	uintfptr_t selfpc;
-{
-	struct gmonparam *p;
-	uintfptr_t selfpcdiff;
-
-	p = &_gmonparam;
-	selfpcdiff = selfpc - (uintfptr_t)p->lowpc;
-	if (selfpcdiff < p->textsize) {
-		u_int delta;
-
-		/*
-		 * Solidify the count for the current function.
-		 */
-		delta = cputime() - p->mexitcount_overhead;
-		p->cputime_overhead_resid += p->cputime_overhead_frac;
-		p->mexitcount_overhead_resid += p->mexitcount_overhead_frac;
-		if ((int)delta < 0)
-			*p->mexitcount_count += delta + p->mexitcount_overhead
-						- p->cputime_overhead;
-		else if (delta != 0) {
-			if (p->cputime_overhead_resid >= CALIB_SCALE) {
-				p->cputime_overhead_resid -= CALIB_SCALE;
-				++*p->cputime_count;
-				--delta;
-			}
-			if (delta != 0) {
-				if (p->mexitcount_overhead_resid
-				    >= CALIB_SCALE) {
-					p->mexitcount_overhead_resid
-					    -= CALIB_SCALE;
-					++*p->mexitcount_count;
-					--delta;
-				}
-				KCOUNT(p, selfpcdiff) += delta;
-			}
-			*p->mexitcount_count += p->mexitcount_overhead_sub;
-		}
-		*p->cputime_count += p->cputime_overhead;
-	}
-}
-#endif /* GUPROF */
diff --git a/lib/libc_bsd/gmon/moncontrol.3 b/lib/libc_bsd/gmon/moncontrol.3
deleted file mode 100644
index 12d9322..0000000
--- a/lib/libc_bsd/gmon/moncontrol.3
+++ /dev/null
@@ -1,117 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1992, 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.
-.\" 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.
-.\"
-.\"	@(#)moncontrol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/gmon/moncontrol.3 235327 2012-05-12 07:52:45Z joel $
-.\"
-.Dd June 14, 2004
-.Dt MONCONTROL 3
-.Os
-.Sh NAME
-.Nm moncontrol ,
-.Nm monstartup
-.Nd control execution profile
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/gmon.h
-.Ft void
-.Fn moncontrol "int mode"
-.Ft void
-.Fn monstartup "u_long lowpc" "u_long highpc"
-.Sh DESCRIPTION
-An executable program compiled using the
-.Fl pg
-option to
-.Xr cc 1
-automatically includes calls to collect statistics for the
-.Xr gprof 1
-call-graph execution profiler.
-In typical operation, profiling begins at program startup
-and ends when the program calls exit.
-When the program exits, the profiling data are written to the file
-.Ar progname Ns Pa .gmon ,
-where progname is the name of the program, then
-.Xr gprof 1
-can be used to examine the results.
-.Pp
-The
-.Fn moncontrol
-function
-selectively controls profiling within a program.
-When the program starts, profiling begins.
-To stop the collection of histogram ticks and call counts use
-.Fn moncontrol 0 ;
-to resume the collection of histogram ticks and call counts use
-.Fn moncontrol 1 .
-This feature allows the cost of particular operations to be measured.
-Note that an output file will be produced on program exit
-regardless of the state of
-.Fn moncontrol .
-.Pp
-Programs that are not loaded with
-.Fl pg
-may selectively collect profiling statistics by calling
-.Fn monstartup
-with the range of addresses to be profiled.
-The
-.Fa lowpc
-and
-.Fa highpc
-arguments
-specify the address range that is to be sampled;
-the lowest address sampled is that of
-.Fa lowpc
-and the highest is just below
-.Fa highpc .
-Only functions in that range that have been compiled with the
-.Fl pg
-option to
-.Xr cc 1
-will appear in the call graph part of the output;
-however, all functions in that address range will
-have their execution time measured.
-Profiling begins on return from
-.Fn monstartup .
-.Sh ENVIRONMENT
-The following environment variables affect the execution of
-.Nm :
-.Bl -tag -width ".Ev PROFIL_USE_PID"
-.It PROFIL_USE_PID
-If set, the pid of the process is inserted into the filename.
-.El
-.Sh FILES
-.Bl -tag -width progname.gmon -compact
-.It Pa progname.gmon
-execution data file
-.El
-.Sh SEE ALSO
-.Xr cc 1 ,
-.Xr gprof 1 ,
-.Xr profil 2 ,
-.Xr clocks 7
diff --git a/lib/libc_bsd/i386/Makefile.inc b/lib/libc_bsd/i386/Makefile.inc
deleted file mode 100644
index 09aed1d..0000000
--- a/lib/libc_bsd/i386/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.incl 174204 2007-12-03 07:17:33Z das $
-
-# Long double is 80 bits
-GDTOASRCS+=strtorx.c
-MDSRCS+=machdep_ldisx.c
-SYM_MAPS+=${.CURDIR}/i386/Symbol.map
diff --git a/lib/libc_bsd/i386/SYS.h b/lib/libc_bsd/i386/SYS.h
deleted file mode 100644
index 0f33cf5..0000000
--- a/lib/libc_bsd/i386/SYS.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- * $FreeBSD: releng/10.2/lib/libc/i386/SYS.h 240152 2012-09-05 21:41:05Z jilles $
- */
-
-#include <sys/syscall.h>
-#include <machine/asm.h>
-
-#define	SYSCALL(x)	ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(x);					\
-			.set CNAME(x),CNAME(__CONCAT(__sys_,x));	\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL;		\
- 			jb HIDENAME(cerror)
-
-#define	RSYSCALL(x)	SYSCALL(x); ret; END(__CONCAT(__sys_,x))
-
-#define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL;		\
- 			jb HIDENAME(cerror); ret; \
-			END(__CONCAT(__sys_,x))
-
-/* gas messes up offset -- although we don't currently need it, do for BCS */
-#define	LCALL(x,y)	.byte 0x9a ; .long y; .word x
-
-#define KERNCALL	int $0x80
diff --git a/lib/libc_bsd/i386/Symbol.map b/lib/libc_bsd/i386/Symbol.map
deleted file mode 100644
index c533a19..0000000
--- a/lib/libc_bsd/i386/Symbol.map
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/i386/Symbol.map 240152 2012-09-05 21:41:05Z jilles $
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSD_1.0 {
-	/* PSEUDO syscalls */
-	_exit;
-
-	.mcount;
-	_setjmp;
-	_longjmp;
-	alloca;
-	fabs;
-	__flt_rounds;
-	__nan;
-	__infinity;
-	makecontext;
-	rfork_thread;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
-	htonl;
-	htons;
-	ntohl;
-	ntohs;
-	vfork;
-	brk;
-	exect;
-	i386_clr_watch;
-	i386_get_fsbase;
-	i386_get_gsbase;
-	i386_get_ioperm;
-	i386_get_ldt;
-	i386_set_fsbase;
-	i386_set_gsbase;
-	i386_set_ioperm;
-	i386_set_ldt;
-	i386_set_watch;
-	i386_vm86;
-	sbrk;
-	___tls_get_addr;
-};
-
-FBSDprivate_1.0 {
-	/* PSEUDO syscalls */
-	__sys_getlogin;
-	_getlogin;
-	__sys_exit;
-
-	_set_tp;
-	___longjmp;
-	__makecontext;
-	__longjmp;
-	__signalcontext;
-	signalcontext;
-	__siglongjmp;
-	__sys_vfork;
-	_vfork;
-	_end;
-	_brk;
-	.curbrk;
-	.minbrk;
-};
diff --git a/lib/libc_bsd/i386/_fpmath.h b/lib/libc_bsd/i386/_fpmath.h
deleted file mode 100644
index efa32cf..0000000
--- a/lib/libc_bsd/i386/_fpmath.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/i386/_fpmath.h 175402 2008-01-17 16:39:07Z bde $
- */
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-		unsigned int	manl	:32;
-		unsigned int	manh	:32;
-		unsigned int	exp	:15;
-		unsigned int	sign	:1;
-		unsigned int	junk	:16;
-	} bits;
-	struct {
-		unsigned long long man	:64;
-		unsigned int 	expsign	:16;
-		unsigned int	junk	:16;
-	} xbits;
-};
-
-#define	LDBL_NBIT	0x80000000
-#define	mask_nbit_l(u)	((u).bits.manh &= ~LDBL_NBIT)
-
-#define	LDBL_MANH_SIZE	32
-#define	LDBL_MANL_SIZE	32
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)(u).bits.manh;		\
-} while (0)
diff --git a/lib/libc_bsd/i386/arith.h b/lib/libc_bsd/i386/arith.h
deleted file mode 100644
index 7104ddb..0000000
--- a/lib/libc_bsd/i386/arith.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD: releng/10.2/lib/libc/i386/arith.h 114839 2003-05-08 13:50:44Z das $
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-
-#define IEEE_8087
-#define Arith_Kind_ASL 1
diff --git a/lib/libc_bsd/i386/gd_qnan.h b/lib/libc_bsd/i386/gd_qnan.h
deleted file mode 100644
index e8d36a1..0000000
--- a/lib/libc_bsd/i386/gd_qnan.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * This file can be generated by compiling and running contrib/gdtoa/qnan.c
- * on the target architecture after arith.h has been generated.
- *
- * $FreeBSD: releng/10.2/lib/libc/i386/gd_qnan.h 174680 2007-12-16 21:15:09Z das $
- */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
-#define ld_QNAN0 0x0
-#define ld_QNAN1 0xc0000000
-#define ld_QNAN2 0x7fff
-#define ld_QNAN3 0x0
-#define ldus_QNAN0 0x0
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0xc000
-#define ldus_QNAN4 0x7fff
diff --git a/lib/libc_bsd/i386/gen/Makefile.inc b/lib/libc_bsd/i386/gen/Makefile.inc
deleted file mode 100644
index b277347..0000000
--- a/lib/libc_bsd/i386/gen/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 230429 2012-01-21 18:00:28Z kib $
-
-SRCS+=	_ctx_start.S _setjmp.S _set_tp.c fabs.S \
-	flt_rounds.c getcontextx.c infinity.c ldexp.c makecontext.c \
-	rfork_thread.S setjmp.S signalcontext.c sigsetjmp.S
diff --git a/lib/libc_bsd/i386/gen/_ctx_start.S b/lib/libc_bsd/i386/gen/_ctx_start.S
deleted file mode 100644
index d84cb06..0000000
--- a/lib/libc_bsd/i386/gen/_ctx_start.S
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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. Neither the name of the author 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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/_ctx_start.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * _ctx_start((void *func)(int arg1, ..., argn),
- *            int arg1, ..., argn, ucontext_t *ucp)
- *
- * 0(%esp)		- func
- * 4(%esp)		- arg1
- * 8(%esp)		- arg2
- * ...
- * (4*n)(%esp)		- argn
- * (4*(n + 1))(%esp)	- ucp, %ebp setup to point here (base of stack)
- */
-ENTRY(_ctx_start)
-	popl	%eax		/* get start function */
-	call	*%eax		/* call start function */
-	PIC_PROLOGUE
-	movl	%esi, %esp	/*
-				 * setup stack for completion routine;
-				 * ucp is now at top of stack
-				 */
-	call	PIC_PLT(_ctx_done)	/* should never return */
-	call	PIC_PLT(abort)		/* fubar */
-	ret
-END(_ctx_start)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/gen/_set_tp.c b/lib/libc_bsd/i386/gen/_set_tp.c
deleted file mode 100644
index 520315a..0000000
--- a/lib/libc_bsd/i386/gen/_set_tp.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/i386/gen/_set_tp.c 150065 2005-09-12 19:52:42Z stefanf $
- */
-
-#include <string.h>
-#include <stdint.h>
-#include <machine/sysarch.h>
-
-#include "libc_private.h"
-
-void
-_set_tp(void *tp)
-{
-
-	i386_set_gsbase(tp);
-}
diff --git a/lib/libc_bsd/i386/gen/_setjmp.S b/lib/libc_bsd/i386/gen/_setjmp.S
deleted file mode 100644
index ff40fb4..0000000
--- a/lib/libc_bsd/i386/gen/_setjmp.S
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)_setjmp.s	5.1 (Berkeley) 4/23/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/_setjmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	_setjmp(a)
- * by restoring registers from the environment 'a'.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	movl	4(%esp),%eax
-	movl	0(%esp),%edx
-	movl	%edx, 0(%eax)		/* rta */
-	movl	%ebx, 4(%eax)
-	movl	%esp, 8(%eax)
-	movl	%ebp,12(%eax)
-	movl	%esi,16(%eax)
-	movl	%edi,20(%eax)
-	fnstcw	24(%eax)
-	xorl	%eax,%eax
-	ret
-END(_setjmp)
-
-	.weak	CNAME(_longjmp)
-	.set	CNAME(_longjmp),CNAME(___longjmp)
-ENTRY(___longjmp)
-	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	fldcw	24(%edx)
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret
-END(___longjmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/gen/fabs.S b/lib/libc_bsd/i386/gen/fabs.S
deleted file mode 100644
index 2585262..0000000
--- a/lib/libc_bsd/i386/gen/fabs.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)fabs.s	5.2 (Berkeley) 12/17/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/fabs.S 217106 2011-01-07 16:08:40Z kib $");
-
-ENTRY(fabs)
-	fldl	4(%esp)
-	fabs
-	ret
-END(fabs)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/gen/flt_rounds.c b/lib/libc_bsd/i386/gen/flt_rounds.c
deleted file mode 100644
index 55a0a05..0000000
--- a/lib/libc_bsd/i386/gen/flt_rounds.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/flt_rounds.c 132383 2004-07-19 08:17:25Z das $");
-
-#include <float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	3,	/* round to zero */
-	2,	/* round to negative infinity */
-	0	/* round to positive infinity */
-};
-
-int
-__flt_rounds(void)
-{
-	int x;
-
-	__asm("fnstcw %0" : "=m" (x));
-        return (map[(x >> 10) & 0x03]);
-}
diff --git a/lib/libc_bsd/i386/gen/getcontextx.c b/lib/libc_bsd/i386/gen/getcontextx.c
deleted file mode 100644
index d41af02..0000000
--- a/lib/libc_bsd/i386/gen/getcontextx.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2011 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/getcontextx.c 251047 2013-05-28 04:54:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <machine/npx.h>
-#include <machine/specialreg.h>
-#include <machine/sysarch.h>
-
-static int xstate_sz = -1;
-
-int
-__getcontextx_size(void)
-{
-	u_int p[4];
-	int cpuid_supported;
-
-	if (xstate_sz == -1) {
-		__asm __volatile(
-		    "	pushfl\n"
-		    "	popl	%%eax\n"
-		    "	movl    %%eax,%%ecx\n"
-		    "	xorl    $0x200000,%%eax\n"
-		    "	pushl	%%eax\n"
-		    "	popfl\n"
-		    "	pushfl\n"
-		    "	popl    %%eax\n"
-		    "	xorl    %%eax,%%ecx\n"
-		    "	je	1f\n"
-		    "	movl	$1,%0\n"
-		    "	jmp	2f\n"
-		    "1:	movl	$0,%0\n"
-		    "2:\n"
-		    : "=r" (cpuid_supported) : : "eax", "ecx");
-		if (cpuid_supported) {
-			__asm __volatile(
-			    "	pushl	%%ebx\n"
-			    "	cpuid\n"
-			    "	movl	%%ebx,%1\n"
-			    "	popl	%%ebx\n"
-			    : "=a" (p[0]), "=r" (p[1]), "=c" (p[2]), "=d" (p[3])
-			    :  "0" (0x1));
-			if ((p[2] & CPUID2_OSXSAVE) != 0) {
-				__asm __volatile(
-				    "	pushl	%%ebx\n"
-				    "	cpuid\n"
-				    "	movl	%%ebx,%1\n"
-				    "	popl	%%ebx\n"
-				    : "=a" (p[0]), "=r" (p[1]), "=c" (p[2]),
-					"=d" (p[3])
-				    :  "0" (0xd), "2" (0x0));
-				xstate_sz = p[1] - sizeof(struct savexmm);
-			} else
-				xstate_sz = 0;
-		} else
-			xstate_sz = 0;
-	}
-
-	return (sizeof(ucontext_t) + xstate_sz);
-}
-
-int
-__fillcontextx2(char *ctx)
-{
-	struct i386_get_xfpustate xfpu;
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	if (xstate_sz != 0) {
-		xfpu.addr = (char *)(ucp + 1);
-		xfpu.len = xstate_sz;
-		if (sysarch(I386_GET_XFPUSTATE, &xfpu) == -1)
-			return (-1);
-		ucp->uc_mcontext.mc_xfpustate = (__register_t)xfpu.addr;
-		ucp->uc_mcontext.mc_xfpustate_len = xstate_sz;
-		ucp->uc_mcontext.mc_flags |= _MC_HASFPXSTATE;
-	} else {
-		ucp->uc_mcontext.mc_xfpustate = 0;
-		ucp->uc_mcontext.mc_xfpustate_len = 0;
-	}
-	return (0);
-}
-
-int
-__fillcontextx(char *ctx)
-{
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	if (getcontext(ucp) == -1)
-		return (-1);
-	__fillcontextx2(ctx);
-	return (0);
-}
-
-__weak_reference(__getcontextx, getcontextx);
-
-ucontext_t *
-__getcontextx(void)
-{
-	char *ctx;
-	int error;
-
-	ctx = malloc(__getcontextx_size());
-	if (ctx == NULL)
-		return (NULL);
-	if (__fillcontextx(ctx) == -1) {
-		error = errno;
-		free(ctx);
-		errno = error;
-		return (NULL);
-	}
-	return ((ucontext_t *)ctx);
-}
diff --git a/lib/libc_bsd/i386/gen/infinity.c b/lib/libc_bsd/i386/gen/infinity.c
deleted file mode 100644
index c58b1fa..0000000
--- a/lib/libc_bsd/i386/gen/infinity.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * infinity.c
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/infinity.c 110566 2003-02-08 20:37:55Z mike $");
-
-#include <math.h>
-
-/* bytes for +Infinity on a 387 */
-const union __infinity_un __infinity = { { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f } };
-
-/* bytes for NaN */
-const union __nan_un __nan = { { 0, 0, 0xc0, 0xff } };
diff --git a/lib/libc_bsd/i386/gen/makecontext.c b/lib/libc_bsd/i386/gen/makecontext.c
deleted file mode 100644
index 31875fd..0000000
--- a/lib/libc_bsd/i386/gen/makecontext.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel M. Eischen <deischen@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. Neither the name of the author 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/makecontext.c 138403 2004-12-05 21:22:08Z deischen $");
-
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/ucontext.h>
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Prototypes */
-extern void _ctx_start(ucontext_t *, int argc, ...);
-
-
-__weak_reference(__makecontext, makecontext);
-
-void
-_ctx_done (ucontext_t *ucp)
-{
-	if (ucp->uc_link == NULL)
-		exit(0);
-	else {
-		/*
-		 * Since this context has finished, don't allow it
-		 * to be restarted without being reinitialized (via
-		 * setcontext or swapcontext).
-		 */
-		ucp->uc_mcontext.mc_len = 0;
-
-		/* Set context to next one in link */
-		/* XXX - what to do for error, abort? */
-		setcontext((const ucontext_t *)ucp->uc_link);
-		abort();	/* should never get here */
-	}
-}
-
-void
-__makecontext(ucontext_t *ucp, void (*start)(void), int argc, ...)
-{
-	va_list		ap;
-	char		*stack_top;
-	intptr_t	*argp;
-	int		i;
-
-	if (ucp == NULL)
-		return;
-	else if ((ucp->uc_stack.ss_sp == NULL) ||
-	    (ucp->uc_stack.ss_size < MINSIGSTKSZ)) {
-		/*
-		 * This should really return -1 with errno set to ENOMEM
-		 * or something, but the spec says that makecontext is
-		 * a void function.   At least make sure that the context
-		 * isn't valid so it can't be used without an error.
-		 */
-		ucp->uc_mcontext.mc_len = 0;
-	}
-	/* XXX - Do we want to sanity check argc? */
-	else if ((argc < 0) || (argc > NCARGS)) {
-		ucp->uc_mcontext.mc_len = 0;
-	}
-	/* Make sure the context is valid. */
-	else if (ucp->uc_mcontext.mc_len == sizeof(mcontext_t)) {
-		/*
-		 * Arrange the stack as follows:
-		 *
-		 *	_ctx_start()	- context start wrapper
-		 *	start()		- user start routine
-		 * 	arg1            - first argument, aligned(16)
-		 *	...
-		 *	argn
-		 *	ucp		- this context, %ebp points here
-		 *
-		 * When the context is started, control will return to
-		 * the context start wrapper which will pop the user
-		 * start routine from the top of the stack.  After that,
-		 * the top of the stack will be setup with all arguments
-		 * necessary for calling the start routine.  When the
-		 * start routine returns, the context wrapper then sets
-		 * the stack pointer to %ebp which was setup to point to
-		 * the base of the stack (and where ucp is stored).  It
-		 * will then call _ctx_done() to swap in the next context
-		 * (uc_link != 0) or exit the program (uc_link == 0).
-		 */
-		stack_top = (char *)(ucp->uc_stack.ss_sp +
-		    ucp->uc_stack.ss_size - sizeof(intptr_t));
-
-		/*
-		 * Adjust top of stack to allow for 3 pointers (return
-		 * address, _ctx_start, and ucp) and argc arguments.
-		 * We allow the arguments to be pointers also.  The first
-		 * argument to the user function must be properly aligned.
-		 */
-		stack_top = stack_top - (sizeof(intptr_t) * (1 + argc));
-		stack_top = (char *)((unsigned)stack_top & ~15);
-		stack_top = stack_top - (2 * sizeof(intptr_t));
-		argp = (intptr_t *)stack_top;
-
-		/*
-		 * Setup the top of the stack with the user start routine
-		 * followed by all of its aguments and the pointer to the
-		 * ucontext.  We need to leave a spare spot at the top of
-		 * the stack because setcontext will move eip to the top
-		 * of the stack before returning.
-		 */
-		*argp = (intptr_t)_ctx_start;  /* overwritten with same value */
-		argp++;
-		*argp = (intptr_t)start;
-		argp++;
-
-		/* Add all the arguments: */
-		va_start(ap, argc);
-		for (i = 0; i < argc; i++) {
-			*argp = va_arg(ap, intptr_t);
-			argp++;
-		}
-		va_end(ap);
-
-		/* The ucontext is placed at the bottom of the stack. */
-		*argp = (intptr_t)ucp;
-
-		/*
-		 * Set the machine context to point to the top of the
-		 * stack and the program counter to the context start
-		 * wrapper.  Note that setcontext() pushes the return
-		 * address onto the top of the stack, so allow for this
-		 * by adjusting the stack downward 1 slot.  Also set
-		 * %esi to point to the base of the stack where ucp
-		 * is stored.
-		 */
-		ucp->uc_mcontext.mc_esi = (int)argp;
-		ucp->uc_mcontext.mc_ebp = 0;
-		ucp->uc_mcontext.mc_esp = (int)stack_top + sizeof(caddr_t);
-		ucp->uc_mcontext.mc_eip = (int)_ctx_start;
-	}
-}
diff --git a/lib/libc_bsd/i386/gen/rfork_thread.S b/lib/libc_bsd/i386/gen/rfork_thread.S
deleted file mode 100644
index 80a726c..0000000
--- a/lib/libc_bsd/i386/gen/rfork_thread.S
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * Copyright (c) 2000 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/rfork_thread.S 240152 2012-09-05 21:41:05Z jilles $");
-
-/*
- * With thanks to John Dyson for the original version of this.
- */
-
-#include <SYS.h>
-
-/*
- *                8      12          16         20
- * rfork_thread(flags, stack_addr, start_fnc, start_arg);
- *
- * flags:		Flags to rfork system call.  See rfork(2).
- * stack_addr:		Top of stack for thread.
- * start_fnc:		Address of thread function to call in child.
- * start_arg:		Argument to pass to the thread function in child.
- */
-
-ENTRY(rfork_thread)
-	pushl	%ebp
-	movl	%esp, %ebp
-	pushl	%esi
-
-	/*
-	 * Push thread info onto the new thread's stack
-	 */
-	movl	12(%ebp), %esi	# get stack addr
-
-	subl	$4, %esi
-	movl	20(%ebp), %eax	# get start argument
-	movl	%eax, (%esi)
-
-	subl	$4, %esi
-	movl	16(%ebp), %eax	# get start thread address
-	movl	%eax, (%esi)
-
-	/*
-	 * Prepare and execute the thread creation syscall
-	 */
-	pushl	8(%ebp)
-	pushl	$0
-	movl	$SYS_rfork, %eax
-	KERNCALL
-	jb 	2f
-
-	/*
-	 * Check to see if we are in the parent or child
-	 */
-	cmpl	$0, %edx
-	jnz	1f
-	addl	$8, %esp
-	popl	%esi
-	movl	%ebp, %esp
-	popl	%ebp
-	ret
-	.p2align 2
-
-	/*
-	 * If we are in the child (new thread), then
-	 * set-up the call to the internal subroutine.  If it
-	 * returns, then call __exit.
-	 */
-1:
-	movl	%esi,%esp
-	popl	%eax 
-	call	*%eax
-	addl	$4, %esp
-
-	/*
-	 * Exit system call
-	 */
-	pushl	%eax
-	pushl	$0
-#ifdef SYS_exit
-	movl	$SYS_exit, %eax
-#else
-	movl	$SYS_sys_exit, %eax
-#endif
-	KERNCALL
-
-	/*
-	 * Branch here if the thread creation fails:
-	 */
-2:
-	addl	$8, %esp
-	popl	%esi
-	movl	%ebp, %esp
-	popl	%ebp
-	jmp	HIDENAME(cerror)
-END(rfork_thread)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/gen/setjmp.S b/lib/libc_bsd/i386/gen/setjmp.S
deleted file mode 100644
index aa3cb79..0000000
--- a/lib/libc_bsd/i386/gen/setjmp.S
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/setjmp.S 287872 2015-09-16 20:59:41Z delphij $");
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from the last call to
- *	setjmp(a)
- * by restoring registers from the environment 'a'.
- * The previous signal state is restored.
- */
-
-#include "SYS.h"
-
-ENTRY(setjmp)
-	movl	4(%esp),%ecx
-	leal	28(%ecx), %eax
-	pushl	%eax			/* (sigset_t*)oset */
-	pushl	$0			/* (sigset_t*)set  */
-	pushl	$1			/* SIG_BLOCK       */
-	call	__libc_sigprocmask
-	addl	$12,%esp
-	movl	4(%esp),%ecx
-	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-	fnstcw	24(%ecx)
-	xorl	%eax,%eax
-	ret
-END(setjmp)
-
-	.weak CNAME(longjmp)
-	.set CNAME(longjmp),CNAME(__longjmp)
-ENTRY(__longjmp)
-	movl	4(%esp),%edx
-	pushl	$0			/* (sigset_t*)oset */
-	leal	28(%edx), %eax
-	pushl	%eax			/* (sigset_t*)set  */
-	pushl	$3			/* SIG_SETMASK     */
-	call	__libc_sigprocmask
-	addl	$12,%esp
-	movl	4(%esp),%edx
-	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	fldcw	24(%edx)
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret
-END(__longjmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/gen/signalcontext.c b/lib/libc_bsd/i386/gen/signalcontext.c
deleted file mode 100644
index a0f96f3..0000000
--- a/lib/libc_bsd/i386/gen/signalcontext.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2002 Jonathan Mini <mini@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/signalcontext.c 131501 2004-07-02 23:20:05Z davidxu $");
-
-#include <sys/param.h>
-#include <sys/ucontext.h>
-#include <machine/psl.h>
-#include <machine/sigframe.h>
-#include <signal.h>
-#include <strings.h>
-
-__weak_reference(__signalcontext, signalcontext);
-
-extern void _ctx_start(ucontext_t *, int argc, ...);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	register_t *p;
-	struct sigframe *sfp;
-
-	/*-
-	 * Set up stack.
-	 * (n = sizeof(int))
-	 * 2n+sizeof(struct sigframe)	ucp
-	 * 2n				struct sigframe
-	 * 1n				&func
-	 * 0n				&_ctx_start
-	 */
-	p = (register_t *)(void *)(intptr_t)ucp->uc_mcontext.mc_esp;
-	*--p = (register_t)(intptr_t)ucp;
-	p = (register_t *)((u_register_t)p & ~0xF);  /* Align to 16 bytes. */
-	p = (register_t *)((u_register_t)p - sizeof(struct sigframe));
-	sfp = (struct sigframe *)p;
-	bzero(sfp, sizeof(struct sigframe));
-	sfp->sf_signum = sig;
-	sfp->sf_siginfo = (register_t)(intptr_t)&sfp->sf_si;
-	sfp->sf_ucontext = (register_t)(intptr_t)&sfp->sf_uc;
-	sfp->sf_ahu.sf_action = (__siginfohandler_t *)func;
-	bcopy(ucp, &sfp->sf_uc, sizeof(ucontext_t));
-	sfp->sf_si.si_signo = sig;
-	*--p = (register_t)(intptr_t)func;
-
-	/*
-	 * Set up ucontext_t.
-	 */
-	ucp->uc_mcontext.mc_esi = ucp->uc_mcontext.mc_esp - sizeof(int);
-	ucp->uc_mcontext.mc_esp = (register_t)(intptr_t)p;
-	ucp->uc_mcontext.mc_eip = (register_t)(intptr_t)_ctx_start;
-	ucp->uc_mcontext.mc_eflags &= ~PSL_T;
-	ucp->uc_link = &sfp->sf_uc;
-	sigdelset(&ucp->uc_sigmask, sig);
-	return (0);
-}
diff --git a/lib/libc_bsd/i386/gen/sigsetjmp.S b/lib/libc_bsd/i386/gen/sigsetjmp.S
deleted file mode 100644
index 69d61ff..0000000
--- a/lib/libc_bsd/i386/gen/sigsetjmp.S
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	@(#)setjmp.s	5.1 (Berkeley) 4/23/90"
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.text
-	.asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/gen/sigsetjmp.S 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "SYS.h"
-
-/*-
- * TODO:
- *	Rename sigsetjmp to __sigsetjmp and siglongjmp to __siglongjmp,
- *	remove the other *jmp functions and define everything in terms
- *	of the renamed functions.  This requires compiler support for
- *	the renamed functions (introduced in gcc-2.5.3; previous versions
- *	only supported *jmp with 0 or 1 leading underscores).
- *
- *	Restore _all_ the registers and the signal mask atomically.  Can
- *	use sigreturn() if sigreturn() works.
- */
-
-ENTRY(sigsetjmp)
-	movl	8(%esp),%eax
-	movl	4(%esp),%ecx
-	movl	%eax,44(%ecx)
-	testl	%eax,%eax
-	jz	2f
-	leal	28(%ecx), %eax
-	pushl	%eax			/* (sigset_t*)oset */
-	pushl	$0			/* (sigset_t*)set  */
-	pushl	$1			/* SIG_BLOCK       */
-	call	__libc_sigprocmask
-	addl	$12,%esp
-	movl	4(%esp),%ecx
-2:	movl	0(%esp),%edx
-	movl	%edx, 0(%ecx)
-	movl	%ebx, 4(%ecx)
-	movl	%esp, 8(%ecx)
-	movl	%ebp,12(%ecx)
-	movl	%esi,16(%ecx)
-	movl	%edi,20(%ecx)
-	fnstcw	24(%ecx)
-	xorl	%eax,%eax
-	ret
-END(sigsetjmp)
-
-	.weak CNAME(siglongjmp);
-	.set CNAME(siglongjmp),CNAME(__siglongjmp)
-ENTRY(__siglongjmp)
-	movl	4(%esp),%edx
-	cmpl	$0,44(%edx)
-	jz	2f
-	pushl	$0			/* (sigset_t*)oset */
-	leal	28(%edx), %eax
-	pushl	%eax			/* (sigset_t*)set  */
-	pushl	$3			/* SIG_SETMASK     */
-	call	__libc_sigprocmask
-	addl	$12,%esp
-	movl	4(%esp),%edx
-2:	movl	8(%esp),%eax
-	movl	0(%edx),%ecx
-	movl	4(%edx),%ebx
-	movl	8(%edx),%esp
-	movl	12(%edx),%ebp
-	movl	16(%edx),%esi
-	movl	20(%edx),%edi
-	fninit
-	fldcw	24(%edx)
-	testl	%eax,%eax
-	jnz	1f
-	incl	%eax
-1:	movl	%ecx,0(%esp)
-	ret
-END(__siglongjmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/stdlib/Makefile.inc b/lib/libc_bsd/i386/stdlib/Makefile.inc
deleted file mode 100644
index 32e6b0b..0000000
--- a/lib/libc_bsd/i386/stdlib/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 194688 2009-06-23 09:04:59Z ed $
-
-MDSRCS+=div.S ldiv.S
diff --git a/lib/libc_bsd/i386/stdlib/div.S b/lib/libc_bsd/i386/stdlib/div.S
deleted file mode 100644
index b2e27be..0000000
--- a/lib/libc_bsd/i386/stdlib/div.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/stdlib/div.S 217106 2011-01-07 16:08:40Z kib $");
-
-ENTRY(div)
-        movl    4(%esp),%eax
-        movl    8(%esp),%ecx
-        cdq
-        idiv    %ecx
-        ret
-END(div)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/stdlib/ldiv.S b/lib/libc_bsd/i386/stdlib/ldiv.S
deleted file mode 100644
index 304097c..0000000
--- a/lib/libc_bsd/i386/stdlib/ldiv.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/stdlib/ldiv.S 217106 2011-01-07 16:08:40Z kib $");
-
-ENTRY(ldiv)
-        movl    4(%esp),%eax
-        movl    8(%esp),%ecx
-        cdq
-        idiv    %ecx
-        ret
-END(ldiv)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/Makefile.inc b/lib/libc_bsd/i386/string/Makefile.inc
deleted file mode 100644
index 00b602a..0000000
--- a/lib/libc_bsd/i386/string/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 229368 2012-01-03 07:14:01Z ed $
-
-MDSRCS+=bcmp.S bcopy.S bzero.S ffs.S memchr.S memcmp.S memcpy.S memmove.S \
-	memset.S strcat.S strchr.S strcmp.S strcpy.S strncmp.S strrchr.S \
-	swab.S wcschr.S wcscmp.S wcslen.S wmemchr.S
diff --git a/lib/libc_bsd/i386/string/bcmp.S b/lib/libc_bsd/i386/string/bcmp.S
deleted file mode 100644
index c7a92de..0000000
--- a/lib/libc_bsd/i386/string/bcmp.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/bcmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * bcmp (void *b1, void *b2, size_t len)
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(bcmp)
-	pushl	%edi
-	pushl	%esi
-	movl	12(%esp),%edi
-	movl	16(%esp),%esi
-	cld				/* set compare direction forward */
-
-	movl	20(%esp),%ecx		/* compare by words */
-	shrl	$2,%ecx
-	repe
-	cmpsl
-	jne	L1
-
-	movl	20(%esp),%ecx		/* compare remainder by bytes */
-	andl	$3,%ecx
-	repe
-	cmpsb
-L1:
-	setne	%al
-	movsbl	%al,%eax
-	popl	%esi
-	popl	%edi
-	ret
-END(bcmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/bcopy.S b/lib/libc_bsd/i386/string/bcopy.S
deleted file mode 100644
index 561b5a4..0000000
--- a/lib/libc_bsd/i386/string/bcopy.S
+++ /dev/null
@@ -1,110 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from locore.s.
- *
- * 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.
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/bcopy.S 217106 2011-01-07 16:08:40Z kib $");
-
-#if 0
-	RCSID("$NetBSD: bcopy.S,v 1.6 1996/11/12 00:50:06 jtc Exp $")
-#endif
-
-	/*
-	 * (ov)bcopy (src,dst,cnt)
-	 *  ws@tools.de     (Wolfgang Solfrank, TooLs GmbH) +49-228-985800
-	 */
-
-#ifdef MEMCOPY
-ENTRY(memcpy)
-#else
-#ifdef MEMMOVE
-ENTRY(memmove)
-#else
-ENTRY(bcopy)
-#endif
-#endif
-	pushl	%esi
-	pushl	%edi
-#if defined(MEMCOPY) || defined(MEMMOVE)
-	movl	12(%esp),%edi
-	movl	16(%esp),%esi
-	movl	%edi,%eax
-#else
-	movl	12(%esp),%esi
-	movl	16(%esp),%edi
-#endif
-	movl	20(%esp),%ecx
-	movl	%edi,%edx
-	subl	%esi,%edx
-	cmpl	%ecx,%edx	/* overlapping? */
-	jb	1f
-	cld			/* nope, copy forwards. */
-	movl	%ecx,%edx
-	shrl	$2,%ecx		/* copy by words */
-	rep
-	movsl
-	movl	%edx,%ecx
-	andl	$3,%ecx		/* any bytes left? */
-	rep
-	movsb
-	popl	%edi
-	popl	%esi
-	ret
-1:
-	addl	%ecx,%edi	/* copy backwards. */
-	addl	%ecx,%esi
-	std
-	movl	%ecx,%edx
-	andl	$3,%ecx		/* any fractional bytes? */
-	decl	%edi
-	decl	%esi
-	rep
-	movsb
-	movl	%edx,%ecx	/* copy remainder by words */
-	shrl	$2,%ecx
-	subl	$3,%esi
-	subl	$3,%edi
-	rep
-	movsl
-	popl	%edi
-	popl	%esi
-	cld
-	ret
-#ifdef MEMCOPY
-END(memcpy)
-#else
-#ifdef MEMMOVE
-END(memmove)
-#else
-END(bcopy)
-#endif
-#endif
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/bzero.S b/lib/libc_bsd/i386/string/bzero.S
deleted file mode 100644
index 98f916d..0000000
--- a/lib/libc_bsd/i386/string/bzero.S
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/bzero.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * bzero (void *b, size_t len)
- *	write len zero bytes to the string b.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(bzero)
-	pushl	%edi
-	pushl	%ebx
-	movl	12(%esp),%edi
-	movl	16(%esp),%ecx
-
-	cld				/* set fill direction forward */
-	xorl	%eax,%eax		/* set fill data to 0 */
-
-	/*
-	 * if the string is too short, it's really not worth the overhead
-	 * of aligning to word boundries, etc.  So we jump to a plain 
-	 * unaligned set.
-	 */
-	cmpl	$0x0f,%ecx
-	jle	L1
-
-	movl	%edi,%edx		/* compute misalignment */
-	negl	%edx
-	andl	$3,%edx
-	movl	%ecx,%ebx
-	subl	%edx,%ebx
-
-	movl	%edx,%ecx		/* zero until word aligned */
-	rep
-	stosb
-
-	movl	%ebx,%ecx		/* zero by words */
-	shrl	$2,%ecx
-	rep
-	stosl
-
-	movl	%ebx,%ecx
-	andl	$3,%ecx			/* zero remainder by bytes */
-L1:	rep
-	stosb
-
-	popl	%ebx
-	popl	%edi
-	ret
-END(bzero)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/ffs.S b/lib/libc_bsd/i386/string/ffs.S
deleted file mode 100644
index 155c95f..0000000
--- a/lib/libc_bsd/i386/string/ffs.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/ffs.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * ffs(value)
- *	finds the first bit set in value and returns the index of 
- *	that bit.  Bits are numbered starting from 1, starting at the
- *	rightmost bit.  A return value of 0 means that the argument
- *	was zero.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(ffs)
-	bsfl	4(%esp),%eax
-	jz	L1	 		/* ZF is set if all bits are 0 */
-	incl	%eax			/* bits numbered from 1, not 0 */
-	ret
-
-	.align 2
-L1:	xorl	%eax,%eax		/* clear result */
-	ret
-END(ffs)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/memchr.S b/lib/libc_bsd/i386/string/memchr.S
deleted file mode 100644
index e891bae..0000000
--- a/lib/libc_bsd/i386/string/memchr.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/memchr.S 249582 2013-04-17 11:40:10Z gabor $");
-
-/*
- * memchr (b, c, len)
- *	locates the first occurrence of c in string b.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(memchr)
-	pushl	%edi
-	movl	8(%esp),%edi		/* string address */
-	movl	12(%esp),%eax		/* set character to search for */
-	movl	16(%esp),%ecx		/* set length of search */
-	testl	%esp,%esp		/* clear Z flag, for len == 0 */
-	cld				/* set search forward */
-	repne				/* search! */
-	scasb
-	jnz	L1			/* scan failed, return null */
-	leal	-1(%edi),%eax		/* adjust result of scan */
-	popl	%edi
-	ret
-	.align 2,0x90
-L1:	xorl	%eax,%eax
-	popl	%edi
-	ret
-END(memchr)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/memcmp.S b/lib/libc_bsd/i386/string/memcmp.S
deleted file mode 100644
index 0eb9e46..0000000
--- a/lib/libc_bsd/i386/string/memcmp.S
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/memcmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * memcmp (void *b1, void *b2, size_t len)
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(memcmp)
-	pushl	%edi
-	pushl	%esi
-	movl	12(%esp),%edi
-	movl	16(%esp),%esi
-	cld				/* set compare direction forward */
-
-	movl	20(%esp),%ecx		/* compare by words */
-	shrl	$2,%ecx
-	repe
-	cmpsl
-	jne	L5			/* do we match so far? */
-
-	movl	20(%esp),%ecx		/* compare remainder by bytes */
-	andl	$3,%ecx
-	repe
-	cmpsb
-	jne	L6			/* do we match? */
-
-	xorl	%eax,%eax		/* we match, return zero	*/
-	popl	%esi
-	popl	%edi
-	ret
-
-L5:	movl	$4,%ecx			/* We know that one of the next	*/
-	subl	%ecx,%edi		/* four pairs of bytes do not	*/
-	subl	%ecx,%esi		/* match.			*/
-	repe
-	cmpsb
-L6:	movzbl  -1(%edi),%eax		/* Perform unsigned comparison	*/
-        movzbl  -1(%esi),%edx
-        subl    %edx,%eax
-	popl	%esi
-	popl	%edi
-	ret
-END(memcmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/memcpy.S b/lib/libc_bsd/i386/string/memcpy.S
deleted file mode 100644
index 5f435df..0000000
--- a/lib/libc_bsd/i386/string/memcpy.S
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/memcpy.S 218303 2011-02-04 21:04:00Z kib $");
-
-#define MEMCOPY
-#include "bcopy.S"
diff --git a/lib/libc_bsd/i386/string/memmove.S b/lib/libc_bsd/i386/string/memmove.S
deleted file mode 100644
index 30c6f06..0000000
--- a/lib/libc_bsd/i386/string/memmove.S
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/memmove.S 218303 2011-02-04 21:04:00Z kib $");
-
-#define MEMMOVE
-#include "bcopy.S"
diff --git a/lib/libc_bsd/i386/string/memset.S b/lib/libc_bsd/i386/string/memset.S
deleted file mode 100644
index 1e6529f..0000000
--- a/lib/libc_bsd/i386/string/memset.S
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/memset.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * memset(void *b, int c, size_t len)
- *	write len bytes of value c (converted to an unsigned char) to 
- *	the string b.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(memset)
-	pushl	%edi
-	pushl	%ebx
-	movl	12(%esp),%edi
-	movzbl	16(%esp),%eax		/* unsigned char, zero extend */
-	movl	20(%esp),%ecx
-	pushl	%edi			/* push address of buffer */
-
-	cld				/* set fill direction forward */
-
-	/*
-	 * if the string is too short, it's really not worth the overhead
-	 * of aligning to word boundries, etc.  So we jump to a plain
-	 * unaligned set.
-	 */
-	cmpl	$0x0f,%ecx
-	jle	L1
-
-	movb	%al,%ah			/* copy char to all bytes in word */
-	movl	%eax,%edx
-	sall	$16,%eax
-	orl	%edx,%eax
-
-	movl	%edi,%edx		/* compute misalignment */
-	negl	%edx
-	andl	$3,%edx
-	movl	%ecx,%ebx
-	subl	%edx,%ebx
-
-	movl	%edx,%ecx		/* set until word aligned */
-	rep
-	stosb
-
-	movl	%ebx,%ecx
-	shrl	$2,%ecx			/* set by words */
-	rep
-	stosl
-
-	movl	%ebx,%ecx		/* set remainder by bytes */
-	andl	$3,%ecx
-L1:	rep
-	stosb
-
-	popl	%eax			/* pop address of buffer */
-	popl	%ebx
-	popl	%edi
-	ret
-END(memset)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/strcat.S b/lib/libc_bsd/i386/string/strcat.S
deleted file mode 100644
index 3258e54..0000000
--- a/lib/libc_bsd/i386/string/strcat.S
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/strcat.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * strcat(s, append)
- *	append a copy of the null-terminated string "append" to the end
- *	of the null-terminated string s, then add a terminating `\0'.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-/*
- * I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- */
-
-ENTRY(strcat)
-	pushl	%edi			/* save edi */
-	movl	8(%esp),%edi		/* dst address */
-	movl	12(%esp),%edx		/* src address */
-	pushl	%edi			/* push destination address */
-
-	cld				/* set search forward */
-	xorl	%eax,%eax		/* set search for null terminator */
-	movl	$-1,%ecx		/* set search for lots of characters */
-	repne				/* search! */
-	scasb
-
-	leal	-1(%edi),%ecx		/* correct dst address */
-
-	.align 2,0x90
-L1:	movb	(%edx),%al		/* unroll loop, but not too much */
-	movb	%al,(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	1(%edx),%al
-	movb	%al,1(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	2(%edx),%al
-	movb	%al,2(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	3(%edx),%al
-	movb	%al,3(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	4(%edx),%al
-	movb	%al,4(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	5(%edx),%al
-	movb	%al,5(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	6(%edx),%al
-	movb	%al,6(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	7(%edx),%al
-	movb	%al,7(%ecx)
-	addl	$8,%edx
-	addl	$8,%ecx
-	testb	%al,%al
-	jne	L1
-L2:	popl	%eax			/* pop destination address */
-	popl	%edi			/* restore edi */
-	ret
-END(strcat)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/strchr.S b/lib/libc_bsd/i386/string/strchr.S
deleted file mode 100644
index 33df0ff..0000000
--- a/lib/libc_bsd/i386/string/strchr.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/strchr.S 249582 2013-04-17 11:40:10Z gabor $");
-
-/*
- * strchr(s, c)
- *	return a pointer to the first occurrence of the character c in
- *	string s, or NULL if c does not occur in the string.
- *
- * %edx - pointer iterating through string
- * %eax - pointer to first occurrence of 'c'
- * %cl  - character we're comparing against
- * %bl  - character at %edx
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(strchr)
-	pushl	%ebx
-	movl	8(%esp),%eax
-	movb	12(%esp),%cl
-	.align 2,0x90
-L1:
-	movb	(%eax),%bl
-	cmpb	%bl,%cl			/* found char??? */
-	je 	L2
-	incl	%eax
-	testb	%bl,%bl			/* null terminator??? */
-	jne	L1
-	xorl	%eax,%eax
-L2:
-	popl	%ebx
-	ret
-END(strchr)
-
-WEAK_ALIAS(index, strchr)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/strcmp.S b/lib/libc_bsd/i386/string/strcmp.S
deleted file mode 100644
index cea9686..0000000
--- a/lib/libc_bsd/i386/string/strcmp.S
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/strcmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * strcmp(s1, s2)
- *	return an integer greater than, equal to, or less than 0, 
- *	according as string s1 is greater than, equal to, or less
- *	than the string s2.  
- *
- * %eax - pointer to s1
- * %edx - pointer to s2
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-/*
- * I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- */
-
-ENTRY(strcmp)
-	movl	0x04(%esp),%eax	
-	movl	0x08(%esp),%edx	
-	jmp	L2			/* Jump into the loop! */
-
-	.align	2,0x90
-L1:	incl	%eax
-	incl	%edx			
-L2:	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	jne	L3
-	incl	%eax
-	incl	%edx
-	movb	(%eax),%cl
-	testb	%cl,%cl
-	je	L3
-	cmpb	%cl,(%edx)
-	je	L1
-	.align 2, 0x90
-L3:     movzbl  (%eax),%eax             /* unsigned comparison */
-	movzbl  (%edx),%edx
-	subl	%edx,%eax
-	ret
-END(strcmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/strcpy.S b/lib/libc_bsd/i386/string/strcpy.S
deleted file mode 100644
index dc725c7..0000000
--- a/lib/libc_bsd/i386/string/strcpy.S
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/strcpy.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * strcpy (dst, src)
- *	copy the string src to dst.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-/*
- * I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- */
-
-ENTRY(strcpy)
-	movl	4(%esp),%ecx		/* dst address */
-	movl	8(%esp),%edx		/* src address */
-	pushl	%ecx			/* push dst address */
-
-	.align 2,0x90
-L1:	movb	(%edx),%al		/* unroll loop, but not too much */
-	movb	%al,(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	1(%edx),%al
-	movb	%al,1(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	2(%edx),%al
-	movb	%al,2(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	3(%edx),%al
-	movb	%al,3(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	4(%edx),%al
-	movb	%al,4(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	5(%edx),%al
-	movb	%al,5(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	6(%edx),%al
-	movb	%al,6(%ecx)
-	testb	%al,%al
-	je	L2
-	movb	7(%edx),%al
-	movb	%al,7(%ecx)
-	addl	$8,%edx
-	addl	$8,%ecx
-	testb	%al,%al
-	jne	L1
-L2:	popl	%eax			/* pop dst address */
-	ret
-END(strcpy)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/strncmp.S b/lib/libc_bsd/i386/string/strncmp.S
deleted file mode 100644
index 58f608e..0000000
--- a/lib/libc_bsd/i386/string/strncmp.S
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 1993,94 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/strncmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * strncmp(s1, s2, n)
- *	return an integer greater than, equal to, or less than 0,
- *	according as the first n characters of string s1 is greater
- *	than, equal to, or less than the string s2.
- *
- * %eax - pointer to s1
- * %ecx - pointer to s2
- * %edx - length
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-/*
- * I've unrolled the loop eight times: large enough to make a
- * significant difference, and small enough not to totally trash the
- * cache.
- *
- * TODO: change all the jz's back to je for consistency.
- */
-
-ENTRY(strncmp)
-	pushl	%ebx
-	movl	8(%esp),%eax
-	movl	12(%esp),%ecx
-	movl	16(%esp),%edx
-	testl	%edx,%edx
-	jmp	L2			/* Jump into the loop! */
-
-	.align 2,0x90
-L1:	incl	%eax
-	incl	%ecx
-	decl	%edx
-L2:	jz	L4			/* strings are equal */
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-/*
- * XXX it might be best to move the next 4 instructions to the end of the
- * unrolled part of the loop.  The unrolled part would then be
- *	movb n(%eax),%bl; testb %bl, %bl; je L3; cmpb n(%ecx); jne L3
- * or maybe better
- *	movb n(%eax),%bl; cmpb n(%ecx); jne L3; testb %bl,%bl; je return_0
- * for n = 0, 1, ..., 8.  The end of the loop would be
- *	L1: addl $8,%eax; addl $8,%ecx; subl $8,%edx; cmpl $8,%edx; jae Lx
- * where residual counts of 0 to 7 are handled at Lx.  However, this would
- * be slower for short strings.  Cache effects are probably not so
- * important because we are only handling a byte at a time.
- */
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	jne	L3
-
-	incl	%eax
-	incl	%ecx
-	decl	%edx
-	jz	L4
-	movb	(%eax),%bl
-	testb	%bl,%bl
-	jz	L3
-	cmpb	%bl,(%ecx)
-	je	L1
-
-	.align 2,0x90
-L3:	movzbl	(%eax),%eax		/* unsigned comparison */
-	movzbl	(%ecx),%ecx
-	subl	%ecx,%eax
-	popl	%ebx
-	ret
-	.align 2,0x90
-L4:	xorl	%eax,%eax
-	popl	%ebx
-	ret
-END(strncmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/strrchr.S b/lib/libc_bsd/i386/string/strrchr.S
deleted file mode 100644
index fda5f88..0000000
--- a/lib/libc_bsd/i386/string/strrchr.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1993 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/strrchr.S 249582 2013-04-17 11:40:10Z gabor $");
-
-/*
- * strrchr(s, c)
- *	return a pointer to the last occurrence of the character c in
- *	string s, or NULL if c does not occur in the string.
- *
- * %edx - pointer iterating through string
- * %eax - pointer to last occurrence of 'c'
- * %cl  - character we're comparing against
- * %bl  - character at %edx
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(strrchr)
-	pushl	%ebx
-	movl	8(%esp),%edx
-	movb	12(%esp),%cl
-	xorl	%eax,%eax		/* init pointer to null */
-	.align 2,0x90
-L1:
-	movb	(%edx),%bl
-	cmpb	%bl,%cl
-	jne	L2
-	movl	%edx,%eax
-L2:	
-	incl	%edx
-	testb	%bl,%bl			/* null terminator??? */
-	jne	L1
-	popl	%ebx
-	ret
-END(strrchr)
-
-WEAK_ALIAS(rindex, strrchr)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/swab.S b/lib/libc_bsd/i386/string/swab.S
deleted file mode 100644
index 13dc6ab..0000000
--- a/lib/libc_bsd/i386/string/swab.S
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 1993,94 Winning Strategies, Inc.
- * 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 Winning Strategies, Inc.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/swab.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * void
- * swab (const void *src, void *dst, size_t len)
- *	copy len bytes from src to dst, swapping adjacent bytes
- *
- * On the i486, this code is negligibly faster than the code generated
- * by gcc at about half the size.  If my i386 databook is correct, it
- * should be considerably faster than the gcc code on an i386.
- *
- * Written by:
- *	J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc.
- */
-
-ENTRY(swab)
-	pushl	%esi
-	pushl	%edi
-	movl	12(%esp),%esi
-	movl	16(%esp),%edi
-	movl	20(%esp),%ecx
-
-	cld				# set direction forward
-
-	shrl	$1,%ecx
-	testl	$7,%ecx			# copy first group of 1 to 7 words
-	jz	L2			# while swaping alternate bytes.
-	.align	2,0x90
-L1:	lodsw
-	rorw	$8,%ax
-	stosw
-	decl	%ecx
-	testl	$7,%ecx
-	jnz	L1
-
-L2:	shrl	$3,%ecx			# copy remainder 8 words at a time
-	jz	L4			# while swapping alternate bytes.
-	.align	2,0x90
-L3:	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	lodsw
-	rorw	$8,%ax
-	stosw
-	decl	%ecx
-	jnz	L3
-
-L4:	popl	%edi
-	popl	%esi
-	ret
-END(swab)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/wcschr.S b/lib/libc_bsd/i386/string/wcschr.S
deleted file mode 100644
index ec810fc..0000000
--- a/lib/libc_bsd/i386/string/wcschr.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/wcschr.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * wchar_t *
- * wcschr(const wchar_t *s, wchar_t c) --
- *	Return pointer to first occurrence of the character `c' in the wide
- *	character string `s', or NULL if not found.
- */
-ENTRY(wcschr)
-	movl	4(%esp),%ecx		/* String */
-	movl	8(%esp),%eax		/* Character */
-	pushl	%ebx
-.p2align 4,0x90
-L1:	movl	(%ecx),%ebx
-	cmpl	%eax,%ebx
-	je	found0
-	testl	%ebx,%ebx
-	jz	no
-	movl	4(%ecx),%ebx
-	cmpl	%eax,%ebx
-	je	found1
-	testl	%ebx,%ebx
-	jz	no
-	movl	8(%ecx),%ebx
-	cmpl	%eax,%ebx
-	je	found2
-	testl	%ebx,%ebx
-	jz	no
-	movl	12(%ecx),%ebx
-	cmpl	%eax,%ebx
-	je	found3
-	testl	%ebx,%ebx
-	jz	no
-	leal	16(%ecx),%ecx
-	jmp	L1
-.p2align 2,0x90
-found3:	leal	4(%ecx),%ecx
-.p2align 2,0x90
-found2:	leal	4(%ecx),%ecx
-.p2align 2,0x90
-found1:	leal	4(%ecx),%ecx
-.p2align 2,0x90
-found0: popl	%ebx
-	movl	%ecx,%eax
-	ret
-.p2align 2,0x90
-no:	popl	%ebx
-	xorl	%eax,%eax
-	ret
-END(wcschr)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/wcscmp.S b/lib/libc_bsd/i386/string/wcscmp.S
deleted file mode 100644
index a3382aa..0000000
--- a/lib/libc_bsd/i386/string/wcscmp.S
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/wcscmp.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * int
- * wcscmp(const wchar_t *s1, const wchar_t *s2) --
- *	Return an integer greater than, equal to, or less than 0, when
- *	the string s1 is greater than, equal to, or less than the string s2.
- */
-ENTRY(wcscmp)
-	pushl	%edi
-	pushl	%esi
-	movl	12(%esp),%edi		/* s1 */
-	movl	16(%esp),%esi		/* s2 */
-.p2align 4,0x90
-top:	movl	(%edi),%eax
-	cmpl	%eax,(%esi)
-	jne	no0
-	testl	%eax,%eax
-	jz	same
-	movl	4(%edi),%eax
-	cmpl	%eax,4(%esi)
-	jne	no4
-	testl	%eax,%eax
-	jz	same
-	movl	8(%edi),%eax
-	cmpl	%eax,8(%esi)
-	jne	no8
-	testl	%eax,%eax
-	jz	same
-	movl	12(%edi),%eax
-	cmpl	%eax,12(%esi)
-	jne	no12
-	leal	16(%edi),%edi
-	leal	16(%esi),%esi
-	testl	%eax,%eax
-	jnz	top
-.p2align 2,0x90
-same:	xorl	%eax,%eax
-	popl	%esi
-	popl	%edi
-	ret
-.p2align 2,0x90
-no12:	leal	4(%esi),%esi
-.p2align 2,0x90
-no8:	leal	4(%esi),%esi
-.p2align 2,0x90
-no4:	leal	4(%esi),%esi
-.p2align 2,0x90
-no0:	subl	(%esi),%eax
-	popl	%esi
-	popl	%edi
-	ret
-END(wcscmp)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/wcslen.S b/lib/libc_bsd/i386/string/wcslen.S
deleted file mode 100644
index 8d051e4..0000000
--- a/lib/libc_bsd/i386/string/wcslen.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/wcslen.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * size_t
- * wcslen(const wchar_t *s) --
- *	Find the length of a wide character string.
- */
-ENTRY(wcslen)
-	movl	4(%esp),%ecx		/* String */
-	pushl	%ebx
-	xorl	%ebx,%ebx
-	xorl	%eax,%eax
-.p2align 4,0x90
-L1:	cmpl	%ebx,(%ecx)
-	jz	found0
-	cmpl	%ebx,4(%ecx)
-	jz	found1
-	cmpl	%ebx,8(%ecx)
-	jz	found2
-	cmpl	%ebx,12(%ecx)
-	jz	found3
-	cmpl	%ebx,16(%ecx)
-	jz	found4
-	cmpl	%ebx,20(%ecx)
-	jz	found5
-	cmpl	%ebx,24(%ecx)
-	jz	found6
-	cmpl	%ebx,28(%ecx)
-	jz	found7
-	leal	32(%ecx),%ecx
-	addl	$8,%eax
-	jmp	L1
-found7:	incl	%eax
-found6:	incl	%eax
-found5:	incl	%eax
-found4:	incl	%eax
-found3:	incl	%eax
-found2:	incl	%eax
-found1:	incl	%eax
-found0:	popl	%ebx
-	ret
-END(wcslen)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/string/wmemchr.S b/lib/libc_bsd/i386/string/wmemchr.S
deleted file mode 100644
index 4bdc632..0000000
--- a/lib/libc_bsd/i386/string/wmemchr.S
+++ /dev/null
@@ -1,108 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/string/wmemchr.S 217106 2011-01-07 16:08:40Z kib $");
-
-/*
- * wchar_t *
- * wmemchr(const wchar_t *buf, wchar_t c, size_t n) --
- *	Search the wide character array `buf', which has length `n',
- *	the character `c', return a pointer to it if found, or NULL on
- *	failure.
- */
-ENTRY(wmemchr)
-	pushl	%edi
-	pushl	%ebx
-	movl	12(%esp),%edi		/* Buffer */
-	movl	16(%esp),%eax		/* Wide character */
-	movl	20(%esp),%ecx		/* Length of buffer */
-
-	/*
-	 * Search in chunks of 8 wide characters (32 bytes).
-	 */
-	movl	%ecx,%ebx
-	shrl	$3,%ecx
-	jz	small
-.p2align 4,0x90
-bigloop:cmpl	%eax,(%edi)
-	je	found
-	cmpl	%eax,4(%edi)
-	je	found4
-	cmpl	%eax,8(%edi)
-	je	found8
-	cmpl	%eax,12(%edi)
-	je	found12
-	cmpl	%eax,16(%edi)
-	je	found16
-	cmpl	%eax,20(%edi)
-	je	found20
-	cmpl	%eax,24(%edi)
-	je	found24
-	cmpl	%eax,28(%edi)
-	je	found28
-	leal	32(%edi),%edi
-	decl	%ecx
-	jnz	bigloop
-	jmp	small
-found:	movl	%edi,%eax
-	popl	%ebx
-	popl	%edi
-	ret
-found4:	leal	4(%edi),%edi
-	jmp	found
-found8:	leal	8(%edi),%edi
-	jmp	found
-found12:leal	12(%edi),%edi
-	jmp	found
-found16:leal	16(%edi),%edi
-	jmp	found
-found20:leal	20(%edi),%edi
-	jmp	found
-found24:leal	24(%edi),%edi
-	jmp	found
-found28:leal	28(%edi),%edi
-	jmp	found
-
-	/*
-	 * Search remaining part of string.
-	 */
-small:	movl	%ebx,%ecx
-	andl	$7,%ecx
-	jz	no
-.p2align 2,0x90
-smltop:	cmpl	%eax,(%edi)
-	je	found
-	leal	4(%edi),%edi
-	decl	%ecx
-	jnz	smltop
-no:	xorl	%eax,%eax
-	popl	%ebx
-	popl	%edi
-	ret
-END(wmemchr)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/Makefile.inc b/lib/libc_bsd/i386/sys/Makefile.inc
deleted file mode 100644
index 52c6339..0000000
--- a/lib/libc_bsd/i386/sys/Makefile.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-#	from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp
-Makefile.incl 237434 2012-06-22 07:13:30Z kib $
-
-.if !defined(COMPAT_32BIT)
-SRCS+=	i386_clr_watch.c i386_set_watch.c i386_vm86.c
-.endif
-SRCS+=	i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \
-	i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c \
-	__vdso_gettc.c
-
-MDASM=	Ovfork.S brk.S cerror.S exect.S getcontext.S pipe.S ptrace.S \
-	reboot.S sbrk.S setlogin.S sigreturn.S syscall.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
-
-MAN+=	i386_get_ioperm.2 i386_get_ldt.2 i386_vm86.2
-MAN+=	i386_set_watch.3
-
-MLINKS+=i386_get_ioperm.2 i386_set_ioperm.2
-MLINKS+=i386_get_ldt.2 i386_set_ldt.2
-MLINKS+=i386_set_watch.3 i386_clr_watch.3
diff --git a/lib/libc_bsd/i386/sys/Ovfork.S b/lib/libc_bsd/i386/sys/Ovfork.S
deleted file mode 100644
index 90138b1..0000000
--- a/lib/libc_bsd/i386/sys/Ovfork.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)Ovfork.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/Ovfork.S 240152 2012-09-05 21:41:05Z jilles $");
-
-#include "SYS.h"
-
-	.weak	_vfork
-	.set	_vfork,__sys_vfork
-	.weak	vfork
-	.set	vfork,__sys_vfork
-ENTRY(__sys_vfork)
-	popl	%ecx		/* my rta into ecx */
-	mov	$SYS_vfork,%eax
-	KERNCALL
-	jb	1f
-	jmp	*%ecx
-1:
-	pushl	%ecx
-	jmp     HIDENAME(cerror)
-END(__sys_vfork)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/__vdso_gettc.c b/lib/libc_bsd/i386/sys/__vdso_gettc.c
deleted file mode 100644
index eb9b6d3..0000000
--- a/lib/libc_bsd/i386/sys/__vdso_gettc.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/__vdso_gettc.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/elf.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <machine/cpufunc.h>
-#include "libc_private.h"
-
-static u_int
-__vdso_gettc_low(const struct vdso_timehands *th)
-{
-	uint32_t rv;
-
-	__asm __volatile("rdtsc; shrd %%cl, %%edx, %0"
-	    : "=a" (rv) : "c" (th->th_x86_shift) : "edx");
-	return (rv);
-}
-
-#pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
-{
-
-	return (th->th_x86_shift > 0 ? __vdso_gettc_low(th) : rdtsc32());
-}
-
-#pragma weak __vdso_gettimekeep
-int
-__vdso_gettimekeep(struct vdso_timekeep **tk)
-{
-
-	return (_elf_aux_info(AT_TIMEKEEP, tk, sizeof(*tk)));
-}
diff --git a/lib/libc_bsd/i386/sys/brk.S b/lib/libc_bsd/i386/sys/brk.S
deleted file mode 100644
index f904766..0000000
--- a/lib/libc_bsd/i386/sys/brk.S
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)brk.s	5.2 (Berkeley) 12/17/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/brk.S 240152 2012-09-05 21:41:05Z jilles $");
-
-#include "SYS.h"
-
-	.globl	HIDENAME(curbrk)
-	.globl	HIDENAME(minbrk)
-ENTRY(_brk)
-	jmp	ok
-END(_brk)
-
-ENTRY(brk)
-#ifdef PIC
-	movl	4(%esp),%eax
-	PIC_PROLOGUE
-	movl	PIC_GOT(HIDENAME(curbrk)),%edx	# set up GOT addressing
-	movl	PIC_GOT(HIDENAME(minbrk)),%ecx	#
-	PIC_EPILOGUE
-	cmpl	%eax,(%ecx)
-	jbe	ok
-	movl	(%ecx),%eax
-	movl	%eax,4(%esp)
-ok:
-	mov	$SYS_break,%eax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	movl	4(%esp),%eax
-	movl	%eax,(%edx)
-	movl	$0,%eax
-	ret
-
-#else
-
-	movl	4(%esp),%eax
-	cmpl	%eax,HIDENAME(minbrk)
-	jbe	ok
-	movl	HIDENAME(minbrk),%eax
-	movl	%eax,4(%esp)
-ok:
-	mov	$SYS_break,%eax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	movl	4(%esp),%eax
-	movl	%eax,HIDENAME(curbrk)
-	movl	$0,%eax
-	ret
-#endif
-END(brk)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/cerror.S b/lib/libc_bsd/i386/sys/cerror.S
deleted file mode 100644
index e4fd7ef..0000000
--- a/lib/libc_bsd/i386/sys/cerror.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)cerror.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/cerror.S 240152 2012-09-05 21:41:05Z jilles $");
-
-#include "SYS.h"
-
-	.globl HIDENAME(cerror)
-
-	/*
-	 * The __error() function is thread aware. For non-threaded
-	 * programs and the initial threaded in threaded programs,
-	 * it returns a pointer to the global errno variable.
-	 */
-	.globl	CNAME(__error)
-	.type	CNAME(__error),@function
-HIDENAME(cerror):
-#ifdef PIC
-	PIC_PROLOGUE
-	pushl	%eax
-	call	PIC_PLT(CNAME(__error))
-	popl	%ecx
-	PIC_EPILOGUE
-#else
-	pushl	%eax
-	call	CNAME(__error)
-	popl	%ecx
-#endif
-	movl	%ecx,(%eax)
-	movl	$-1,%eax
-	movl	$-1,%edx
-	ret
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/exect.S b/lib/libc_bsd/i386/sys/exect.S
deleted file mode 100644
index feb3f88..0000000
--- a/lib/libc_bsd/i386/sys/exect.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)exect.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/exect.S 240152 2012-09-05 21:41:05Z jilles $");
-
-#include "SYS.h"
-#include <machine/psl.h>
-
-ENTRY(exect)
-	mov	$SYS_execve,%eax
-	pushf
-	popl	%edx
-	orl	$ PSL_T,%edx
-	pushl	%edx
-	popf
-	KERNCALL
-	jmp	HIDENAME(cerror)	/* exect(file, argv, env); */
-END(exect)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/getcontext.S b/lib/libc_bsd/i386/sys/getcontext.S
deleted file mode 100644
index 0ded837..0000000
--- a/lib/libc_bsd/i386/sys/getcontext.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2003 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/getcontext.S 240152 2012-09-05 21:41:05Z jilles $");
-
-#include <SYS.h>
-
-/*
- * This has to be magic to handle the multiple returns.
- * Otherwise, the setcontext() syscall will return here and we'll
- * pop off the return address and go to the *setcontext* call.
- */
-	.weak	_getcontext
-	.set	_getcontext,__sys_getcontext
-	.weak	getcontext
-	.set	getcontext,__sys_getcontext
-ENTRY(__sys_getcontext)
-	movl	(%esp),%ecx	/* save getcontext return address */
-	mov	$SYS_getcontext,%eax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	addl	$4,%esp		/* remove stale (setcontext) return address */
-	jmp	*%ecx		/* restore return address */
-END(__sys_getcontext)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/i386_clr_watch.c b/lib/libc_bsd/i386/sys/i386_clr_watch.c
deleted file mode 100644
index 50085ad..0000000
--- a/lib/libc_bsd/i386/sys/i386_clr_watch.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2000  Brian S. Dean <bsd@bsdhome.com>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY BRIAN S. DEAN ``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 BRIAN S. DEAN 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_clr_watch.c 105604 2002-10-21 03:47:22Z sam $");
-
-#include <machine/reg.h>
-#include <machine/sysarch.h>
-
-int
-i386_clr_watch(int watchnum, struct dbreg * d)
-{
-
-	if (watchnum < 0 || watchnum >= 4)
-		return -1;
-
-	DBREG_DRX(d,7) = DBREG_DRX(d,7) & ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
-        DBREG_DRX(d,watchnum) = 0;
-
-	return 0;
-}
diff --git a/lib/libc_bsd/i386/sys/i386_get_fsbase.c b/lib/libc_bsd/i386/sys/i386_get_fsbase.c
deleted file mode 100644
index 30e85c1..0000000
--- a/lib/libc_bsd/i386/sys/i386_get_fsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2005 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_get_fsbase.c 145036 2005-04-14 00:01:35Z peter $");
-
-#include <machine/sysarch.h>
-
-int
-i386_get_fsbase(void **addr)
-{
-
-	return (sysarch(I386_GET_FSBASE, addr));
-}
diff --git a/lib/libc_bsd/i386/sys/i386_get_gsbase.c b/lib/libc_bsd/i386/sys/i386_get_gsbase.c
deleted file mode 100644
index 51edc95..0000000
--- a/lib/libc_bsd/i386/sys/i386_get_gsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2005 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_get_gsbase.c 145036 2005-04-14 00:01:35Z peter $");
-
-#include <machine/sysarch.h>
-
-int
-i386_get_gsbase(void **addr)
-{
-
-	return (sysarch(I386_GET_GSBASE, addr));
-}
diff --git a/lib/libc_bsd/i386/sys/i386_get_ioperm.2 b/lib/libc_bsd/i386/sys/i386_get_ioperm.2
deleted file mode 100644
index 93de79e..0000000
--- a/lib/libc_bsd/i386/sys/i386_get_ioperm.2
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 1998 Jonathan Lemon
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/i386/sys/i386_get_ioperm.2 233520 2012-03-26 19:23:57Z joel $
-.\"
-.Dd July 27, 1998
-.Dt I386_GET_IOPERM 2
-.Os
-.Sh NAME
-.Nm i386_get_ioperm ,
-.Nm i386_set_ioperm
-.Nd manage per-process access to the i386 I/O port space
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In machine/sysarch.h
-.Ft int
-.Fn i386_get_ioperm "unsigned int start" "unsigned int *length" "int *enable"
-.Ft int
-.Fn i386_set_ioperm "unsigned int start" "unsigned int length" "int enable"
-.Sh DESCRIPTION
-The
-.Fn i386_get_ioperm
-system call
-will return the permission for the process' I/O port space in the
-.Fa *enable
-argument.
-The port range starts at
-.Fa start
-and the number of contiguous entries will be returned in
-.Fa *length .
-.Pp
-The
-.Fn i386_set_ioperm
-system call
-will set access to a range of I/O ports described by the
-.Fa start
-and
-.Fa length
-arguments to the state specified by the
-.Fa enable
-argument.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn i386_get_ioperm
-and
-.Fn i386_set_ioperm
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-An invalid range was specified by the
-.Fa start
-or
-.Fa length
-arguments.
-.It Bq Er EPERM
-The caller of i386_set_ioperm was not the superuser.
-.El
-.Sh SEE ALSO
-.Xr io 4
-.Sh AUTHORS
-This man page was written by
-.An Jonathan Lemon .
diff --git a/lib/libc_bsd/i386/sys/i386_get_ioperm.c b/lib/libc_bsd/i386/sys/i386_get_ioperm.c
deleted file mode 100644
index 3d5a0e4..0000000
--- a/lib/libc_bsd/i386/sys/i386_get_ioperm.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1998 Jonathan Lemon
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_get_ioperm.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <machine/sysarch.h>
-
-int
-i386_get_ioperm(unsigned int start, unsigned int *length, int *enable)
-{
-	struct i386_ioperm_args p;
-	int error;
-
-	p.start = start;
-	p.length = *length;
-	p.enable = *enable;
-
-	error = sysarch(I386_GET_IOPERM, &p);
-
-	*length = p.length;
-	*enable = p.enable;
-
-	return (error);
-}
diff --git a/lib/libc_bsd/i386/sys/i386_get_ldt.2 b/lib/libc_bsd/i386/sys/i386_get_ldt.2
deleted file mode 100644
index 3dfaf11..0000000
--- a/lib/libc_bsd/i386/sys/i386_get_ldt.2
+++ /dev/null
@@ -1,139 +0,0 @@
-.\" Copyright (c) 1980, 1991 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.
-.\" 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.
-.\"
-.\"     from: @(#)fork.2	6.5 (Berkeley) 3/10/91
-.\" $FreeBSD: releng/10.2/lib/libc/i386/sys/i386_get_ldt.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd October 14, 2006
-.Dt I386_GET_LDT 2
-.Os
-.Sh NAME
-.Nm i386_get_ldt ,
-.Nm i386_set_ldt
-.Nd manage i386 per-process Local Descriptor Table entries
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In machine/segments.h
-.In machine/sysarch.h
-.Ft int
-.Fn i386_get_ldt "int start_sel" "union descriptor *descs" "int num_sels"
-.Ft int
-.Fn i386_set_ldt "int start_sel" "union descriptor *descs" "int num_sels"
-.Sh DESCRIPTION
-The
-.Fn i386_get_ldt
-system call
-returns a list of the i386 descriptors in the current process'
-LDT.
-The
-.Fn i386_set_ldt
-system call
-sets a list of i386 descriptors in the current process'
-LDT.
-For both routines,
-.Fa start_sel
-specifies the index of the selector in the LDT at which to begin and
-.Fa descs
-points to an array of
-.Fa num_sels
-descriptors to be set or returned.
-.Pp
-Each entry in the
-.Fa descs
-array can be either a segment_descriptor or gate_descriptor and are defined in
-.In i386/segments.h .
-These structures are defined by the architecture
-as disjoint bit-fields, so care must be taken in constructing them.
-.Pp
-If
-.Fa start_sel
-is
-.Em LDT_AUTO_ALLOC ,
-.Fa num_sels
-is 1 and the descriptor pointed to by
-.Fa descs
-is legal, then
-.Fn i386_set_ldt
-will allocate a descriptor and return its
-selector number.
-.Pp
-If
-.Fa num_descs
-is 1,
-.Fa start_sels
-is valid, and
-.Fa descs
-is NULL, then
-.Fn i386_set_ldt
-will free that descriptor
-(making it available to be reallocated again later).
-.Pp
-If
-.Fa num_descs
-is 0,
-.Fa start_sels
-is 0 and
-.Fa descs
-is NULL then, as a special case,
-.Fn i386_set_ldt
-will free all descriptors.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn i386_get_ldt
-returns the number of descriptors currently in the LDT.
-The
-.Fn i386_set_ldt
-system call
-returns the first selector set on success.
-If the kernel allocated a descriptor in the LDT,
-the allocated index is returned.
-Otherwise, a value of -1 is returned and the global
-variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn i386_get_ldt
-and
-.Fn i386_set_ldt
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-An inappropriate value was used for
-.Fa start_sel
-or
-.Fa num_sels .
-.It Bq Er EACCES
-The caller attempted to use a descriptor that would
-circumvent protection or cause a failure.
-.El
-.Sh SEE ALSO
-i386 Microprocessor Programmer's Reference Manual, Intel
-.Sh WARNING
-You can really hose your process using this.
diff --git a/lib/libc_bsd/i386/sys/i386_get_ldt.c b/lib/libc_bsd/i386/sys/i386_get_ldt.c
deleted file mode 100644
index 080c17a..0000000
--- a/lib/libc_bsd/i386/sys/i386_get_ldt.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (c) 1993 John Brezak
- *  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 `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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_get_ldt.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <sys/cdefs.h>
-#include <machine/segments.h>
-#include <machine/sysarch.h>
-
-int
-i386_get_ldt(int start, union descriptor *descs, int num)
-{
-	struct i386_ldt_args p;
-
-	p.start = start;
-	p.descs = descs;
-	p.num   = num;
-
-	return sysarch(I386_GET_LDT, &p);
-}
diff --git a/lib/libc_bsd/i386/sys/i386_set_fsbase.c b/lib/libc_bsd/i386/sys/i386_set_fsbase.c
deleted file mode 100644
index 3202f1e..0000000
--- a/lib/libc_bsd/i386/sys/i386_set_fsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2005 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_set_fsbase.c 145036 2005-04-14 00:01:35Z peter $");
-
-#include <machine/sysarch.h>
-
-int
-i386_set_fsbase(void *addr)
-{
-
-	return (sysarch(I386_SET_FSBASE, &addr));
-}
diff --git a/lib/libc_bsd/i386/sys/i386_set_gsbase.c b/lib/libc_bsd/i386/sys/i386_set_gsbase.c
deleted file mode 100644
index 894fb18..0000000
--- a/lib/libc_bsd/i386/sys/i386_set_gsbase.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2005 Peter Wemm
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_set_gsbase.c 145036 2005-04-14 00:01:35Z peter $");
-
-#include <machine/sysarch.h>
-
-int
-i386_set_gsbase(void *addr)
-{
-
-	return (sysarch(I386_SET_GSBASE, &addr));
-}
diff --git a/lib/libc_bsd/i386/sys/i386_set_ioperm.c b/lib/libc_bsd/i386/sys/i386_set_ioperm.c
deleted file mode 100644
index a879929..0000000
--- a/lib/libc_bsd/i386/sys/i386_set_ioperm.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 1998 Jonathan Lemon
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_set_ioperm.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <machine/sysarch.h>
-
-int
-i386_set_ioperm(unsigned int start, unsigned int length, int enable)
-{
-	struct i386_ioperm_args p;
-
-	p.start = start;
-	p.length = length;
-	p.enable = enable;
-
-	return (sysarch(I386_SET_IOPERM, &p));
-}
diff --git a/lib/libc_bsd/i386/sys/i386_set_ldt.c b/lib/libc_bsd/i386/sys/i386_set_ldt.c
deleted file mode 100644
index 764df0c..0000000
--- a/lib/libc_bsd/i386/sys/i386_set_ldt.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *  Copyright (c) 1993 John Brezak
- *  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 `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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_set_ldt.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <sys/cdefs.h>
-#include <machine/segments.h>
-#include <machine/sysarch.h>
-
-int
-i386_set_ldt(int start, union descriptor *descs, int num)
-{
-	struct i386_ldt_args p;
-
-	p.start = start;
-	p.descs = descs;
-	p.num   = num;
-
-	return sysarch(I386_SET_LDT, &p);
-}
diff --git a/lib/libc_bsd/i386/sys/i386_set_watch.3 b/lib/libc_bsd/i386/sys/i386_set_watch.3
deleted file mode 100644
index 08c7696..0000000
--- a/lib/libc_bsd/i386/sys/i386_set_watch.3
+++ /dev/null
@@ -1,118 +0,0 @@
-.\" Copyright (c) 2000 Brian S. Dean
-.\" All rights reserved.
-.\"
-.\" This man-page is based on a similar man-page by Jonathan Lemon
-.\" which is copyrighted under the following conditions:
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/i386/sys/i386_set_watch.3 233520 2012-03-26 19:23:57Z joel $
-.\"
-.Dd August 24, 2000
-.Dt I386_SET_WATCH 3
-.Os
-.Sh NAME
-.Nm i386_clr_watch ,
-.Nm i386_set_watch
-.Nd manage i386 debug register values
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In machine/reg.h
-.In machine/sysarch.h
-.Ft int
-.Fn i386_clr_watch "int watchnum" "struct dbreg *d"
-.Ft int
-.Fn i386_set_watch "int watchnum" "unsigned int watchaddr" "int size" "int access" "struct dbreg *d"
-.Sh DESCRIPTION
-The
-.Fn i386_clr_watch
-function
-will disable the indicated watch point within the specified debug
-register set.
-.Pp
-The
-.Fn i386_set_watch
-function
-will set up the specified debug registers as indicated by the
-arguments.
-The
-.Fa watchnum
-argument specifies which watch register is used, 0, 1, 2, 3, or \-1.
-If
-.Fa watchnum
-is \-1, a free watch register is found and used.
-If there are no free
-watch registers, an error code of \-1 is returned.
-The
-.Fa watchaddr
-argument
-specifies the watch address,
-.Fa size
-specifies the size in bytes of the area to be watched (1, 2, or 4 bytes),
-and
-.Fa access
-specifies the type of watch point:
-.Pp
-.Bd -literal -offset indent -compact
-DBREG_DR7_EXEC	  An execution breakpoint.
-DBREG_DR7_WRONLY  Break only when the watch area is written to.
-DBREG_DR7_RDWR	  Break when the watch area is read from or written
-                  to.
-.Ed
-.Pp
-Note that these functions do not actually set or clear breakpoints;
-they manipulate the indicated debug register set.
-You must use
-.Xr ptrace 2
-to retrieve and install the debug register values for a process.
-.Sh RETURN VALUES
-On success, the
-.Fn i386_clr_watch
-function returns 0.
-On error, \-1 returned which indicates that
-.Fa watchnum
-is invalid (not in the range of 0-3).
-If the specified watchnum was already disabled, no error is returned.
-.Pp
-On success, the
-.Fn i386_set_watch
-function returns the
-.Fa watchnum
-argument, or the watchnum actually used in the case where the specified
-.Fa watchnum
-was \-1.
-On error, the
-.Fn i386_set_watch
-function returns \-1 indicating that the watchpoint could not established
-because either no more watchpoints are available, or
-.Fa watchnum ,
-.Fa size ,
-or
-.Fa access
-is invalid.
-.Sh SEE ALSO
-.Xr ptrace 2 ,
-.Xr procfs 5
-.Sh AUTHORS
-This man page was written by
-.An Brian S. Dean .
diff --git a/lib/libc_bsd/i386/sys/i386_set_watch.c b/lib/libc_bsd/i386/sys/i386_set_watch.c
deleted file mode 100644
index a6a790f..0000000
--- a/lib/libc_bsd/i386/sys/i386_set_watch.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2000  Brian S. Dean <bsd@bsdhome.com>
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY BRIAN S. DEAN ``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 BRIAN S. DEAN 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_set_watch.c 105604 2002-10-21 03:47:22Z sam $");
-
-#include <machine/reg.h>
-#include <machine/sysarch.h>
-
-int
-i386_set_watch(int watchnum, unsigned int watchaddr, int size,
-               int access, struct dbreg * d)
-{
-	int i;
-	unsigned int mask;
-
-	if (watchnum == -1) {
-		for (i = 0, mask = 0x3; i < 4; i++, mask <<= 2)
-			if ((DBREG_DRX(d,7) & mask) == 0)
-				break;
-		if (i < 4)
-			watchnum = i;
-		else
-			return -1;
-	}
-
-	switch (access) {
-	case DBREG_DR7_EXEC:
-		size = 1; /* size must be 1 for an execution breakpoint */
-		/* fall through */
-	case DBREG_DR7_WRONLY:
-	case DBREG_DR7_RDWR:
-		break;
-	default : return -1; break;
-	}
-
-	/*
-	 * we can watch a 1, 2, or 4 byte sized location
-	 */
-	switch (size) {
-	case 1  : mask = 0x00; break;
-	case 2  : mask = 0x01 << 2; break;
-	case 4  : mask = 0x03 << 2; break;
-	default : return -1; break;
-	}
-
-	mask |= access;
-
-	/* clear the bits we are about to affect */
-	DBREG_DRX(d,7) &= ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
-
-	/* set drN register to the address, N=watchnum */
-	DBREG_DRX(d,watchnum) = watchaddr;
-
-	/* enable the watchpoint */
-	DBREG_DRX(d,7) |= (0x2 << (watchnum*2)) | (mask << (watchnum*4+16));
-
-	return watchnum;
-}
diff --git a/lib/libc_bsd/i386/sys/i386_vm86.2 b/lib/libc_bsd/i386/sys/i386_vm86.2
deleted file mode 100644
index 1999245..0000000
--- a/lib/libc_bsd/i386/sys/i386_vm86.2
+++ /dev/null
@@ -1,141 +0,0 @@
-.\" Copyright (c) 1998 Jonathan Lemon
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/i386/sys/i386_vm86.2 233520 2012-03-26 19:23:57Z joel $
-.\"
-.Dd July 27, 1998
-.Dt I386_VM86 2
-.Os
-.Sh NAME
-.Nm i386_vm86
-.Nd control vm86-related functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In machine/sysarch.h
-.In machine/vm86.h
-.Ft int
-.Fn i386_vm86 "int function" "void *data"
-.Sh DESCRIPTION
-The
-.Fn i386_vm86
-system call
-is used to call various vm86 related functions.
-The
-.Fa function
-argument
-can be one of the following values:
-.Bl -tag -offset indent -width VM86_SET_VME
-.It Dv VM86_INIT
-This will initialize the kernel's vm86 parameter area for the
-process, and permit the process to make vm86 calls.
-The
-.Fa data
-argument
-points to the following structure:
-.Bd -literal
-struct vm86_init_args {
-        int     debug;
-        int     cpu_type;
-        u_char  int_map[32];
-};
-.Ed
-.Pp
-The
-.Fa debug
-argument
-is used to turn on debugging code.
-The
-.Fa cpu_type
-argument
-controls the type of CPU being emulated, and is currently unimplemented.
-The
-.Fa int_map
-argument
-is a bitmap which determines whether vm86 interrupts should be handled
-in vm86 mode, or reflected back to the process.
-If the
-.Em Nth
-bit is set, the interrupt will be reflected to the process, otherwise
-it will be dispatched by the vm86 interrupt table.
-.It Dv VM86_INTCALL
-This allows calls to be made to vm86 interrupt handlers by the process.
-It effectively simulates an INT instruction.
-.Fa data
-should point to the following structure:
-.Bd -literal
-struct vm86_intcall_args {
-	int	intnum;
-	struct	vm86frame vmf;
-};
-.Ed
-.Pp
-.Fa intnum
-specifies the operand of INT for the simulated call.
-A value of 0x10, for example, would often be used to call into the VGA BIOS.
-.Fa vmf
-is used to initialize CPU registers according to the calling convention for
-the interrupt handler.
-.It Dv VM86_GET_VME
-This is used to retrieve the current state of the Pentium(r) processor's
-VME (Virtual-8086 Mode Extensions) flag, which is bit 0 of CR4.
-.Fa data
-should be initialized to point to the following:
-.Bd -literal
-struct vm86_vme_args {
-	int	state;			/* status */
-};
-.Ed
-.Pp
-.Fa state
-will contain the state of the VME flag on return.
-.\" .It Dv VM86_SET_VME
-.El
-.Pp
-vm86 mode is entered by calling
-.Xr sigreturn 2
-with the correct machine context for vm86, and with the
-.Dv PSL_VM
-bit set.
-Control returns to the process upon delivery of a signal.
-.Sh RETURN VALUES
-.Rv -std i386_vm86
-.Sh ERRORS
-The
-.Fn i386_vm86
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The kernel does not have vm86 support, or an invalid function was specified.
-.It Bq Er ENOMEM
-There is not enough memory to initialize the kernel data structures.
-.El
-.Sh AUTHORS
-.An -nosplit
-This man page was written by
-.An Jonathan Lemon ,
-and updated by
-.An Bruce M Simpson .
diff --git a/lib/libc_bsd/i386/sys/i386_vm86.c b/lib/libc_bsd/i386/sys/i386_vm86.c
deleted file mode 100644
index f5ef1a1..0000000
--- a/lib/libc_bsd/i386/sys/i386_vm86.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 1998 Jonathan Lemon
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/i386_vm86.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <machine/sysarch.h>
-
-int
-i386_vm86(int fcn, void *data)
-{
-	struct i386_vm86_args p;
-
-	p.sub_op = fcn;
-	p.sub_args = (char *)data;
-
-	return (sysarch(I386_VM86, &p));
-}
diff --git a/lib/libc_bsd/i386/sys/pipe.S b/lib/libc_bsd/i386/sys/pipe.S
deleted file mode 100644
index 17be50e..0000000
--- a/lib/libc_bsd/i386/sys/pipe.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)pipe.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/pipe.S 217106 2011-01-07 16:08:40Z kib $");
-
-#include "SYS.h"
-
-SYSCALL(pipe)
-	movl	4(%esp),%ecx
-	movl	%eax,(%ecx)
-	movl	%edx,4(%ecx)
-	movl	$0,%eax
-	ret
-END(__sys_pipe)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/ptrace.S b/lib/libc_bsd/i386/sys/ptrace.S
deleted file mode 100644
index 1c65356..0000000
--- a/lib/libc_bsd/i386/sys/ptrace.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)ptrace.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/ptrace.S 240152 2012-09-05 21:41:05Z jilles $");
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-	xorl	%eax,%eax
-#ifdef PIC
-        PIC_PROLOGUE
-        movl    PIC_GOT(CNAME(errno)),%edx
-        movl    %eax,(%edx)
-        PIC_EPILOGUE
-#else
-        movl    %eax,CNAME(errno)
-#endif
-	mov	$SYS_ptrace,%eax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	ret
-END(ptrace)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/reboot.S b/lib/libc_bsd/i386/sys/reboot.S
deleted file mode 100644
index dd8a71e..0000000
--- a/lib/libc_bsd/i386/sys/reboot.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)reboot.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/reboot.S 217106 2011-01-07 16:08:40Z kib $");
-
-#include "SYS.h"
-
-SYSCALL(reboot)
-	iret
-END(__sys_reboot)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/sbrk.S b/lib/libc_bsd/i386/sys/sbrk.S
deleted file mode 100644
index f887d27..0000000
--- a/lib/libc_bsd/i386/sys/sbrk.S
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)sbrk.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/sbrk.S 240152 2012-09-05 21:41:05Z jilles $");
-
-#include "SYS.h"
-
-	.globl	CNAME(_end)
-	.globl	HIDENAME(minbrk)
-	.globl	HIDENAME(curbrk)
-
-	.data
-HIDENAME(minbrk):	.long	CNAME(_end)
-HIDENAME(curbrk):	.long	CNAME(_end)
-	.text
-
-ENTRY(sbrk)
-#ifdef PIC
-	movl	4(%esp),%ecx
-	PIC_PROLOGUE
-	movl	PIC_GOT(HIDENAME(curbrk)),%edx
-	movl	(%edx),%eax
-	PIC_EPILOGUE
-	testl	%ecx,%ecx
-	jz	back
-	addl	%eax,4(%esp)
-	mov	$SYS_break,%eax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	PIC_PROLOGUE
-	movl	PIC_GOT(HIDENAME(curbrk)),%edx
-	movl	(%edx),%eax
-	addl	%ecx,(%edx)
-	PIC_EPILOGUE
-back:
-	ret
-
-#else /* !PIC */
-
-	movl	4(%esp),%ecx
-	movl	HIDENAME(curbrk),%eax
-	testl	%ecx,%ecx
-	jz	back
-	addl	%eax,4(%esp)
-	mov	$SYS_break,%eax
-	KERNCALL
-	jb	HIDENAME(cerror)
-	movl	HIDENAME(curbrk),%eax
-	addl	%ecx,HIDENAME(curbrk)
-back:
-	ret
-#endif /* PIC */
-END(sbrk)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/setlogin.S b/lib/libc_bsd/i386/sys/setlogin.S
deleted file mode 100644
index 1550aa4..0000000
--- a/lib/libc_bsd/i386/sys/setlogin.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)setlogin.s	5.2 (Berkeley) 4/12/91"
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/setlogin.S 254463 2013-08-17 19:24:58Z jilles $");
-
-#include "SYS.h"
-
-.globl	CNAME(_logname_valid)		/* in _getlogin() */
-
-SYSCALL(setlogin)
-	PIC_PROLOGUE
-	movl	$0,PIC_GOTOFF(CNAME(_logname_valid))
-	PIC_EPILOGUE
-	ret				/* setlogin(name) */
-END(__sys_setlogin)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/sigreturn.S b/lib/libc_bsd/i386/sys/sigreturn.S
deleted file mode 100644
index 1757371..0000000
--- a/lib/libc_bsd/i386/sys/sigreturn.S
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)sigreturn.s	5.2 (Berkeley) 12/17/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/sigreturn.S 217106 2011-01-07 16:08:40Z kib $");
-
-#include "SYS.h"
-
-/*
- * NOTE: If the profiling ENTRY() code ever changes any registers, they
- * must be saved.   On FreeBSD, this is not the case.
- */
-
-RSYSCALL(sigreturn)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/i386/sys/syscall.S b/lib/libc_bsd/i386/sys/syscall.S
deleted file mode 100644
index c3a627b..0000000
--- a/lib/libc_bsd/i386/sys/syscall.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)syscall.s	5.1 (Berkeley) 4/23/90"
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/i386/sys/syscall.S 240152 2012-09-05 21:41:05Z jilles $");
-
-#include "SYS.h"
-
-ENTRY(syscall)
-	pop	%ecx	/* rta */
-	pop	%eax	/* syscall number */
-	push	%ecx
-	KERNCALL
-	push	%ecx	/* need to push a word to keep stack frame intact
-			   upon return; the word must be the return address. */
-	jb	HIDENAME(cerror)
-	ret
-END(syscall)
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/ia64/Makefile.inc b/lib/libc_bsd/ia64/Makefile.inc
deleted file mode 100644
index 8c7957a..0000000
--- a/lib/libc_bsd/ia64/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.incl 174204 2007-12-03 07:17:33Z das $
-#
-# Machine dependent definitions for the ia64 architecture.
-#
-
-# Long double is 80 bits
-GDTOASRCS+=strtorx.c
-MDSRCS+=machdep_ldisx.c
-SYM_MAPS+=${.CURDIR}/ia64/Symbol.map
diff --git a/lib/libc_bsd/ia64/SYS.h b/lib/libc_bsd/ia64/SYS.h
deleted file mode 100644
index 4b2da5c..0000000
--- a/lib/libc_bsd/ia64/SYS.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.5 1997/05/02 18:15:15 kleink Exp $ */
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- *
- * $FreeBSD: releng/10.2/lib/libc/ia64/SYS.h 171217 2007-07-04 23:18:38Z peter $
- */
-
-#include <machine/asm.h>
-#include <sys/syscall.h>
-
-#define	CALLSYS_ERROR(name)					\
-	CALLSYS_NOERROR(name);					\
-	cmp.ne	p6,p0=r0,r10;					\
-(p6)	br.cond.sptk.few .cerror
-
-
-#define	SYSCALL(name)						\
-ENTRY(__sys_ ## name,0);		/* XXX # of args? */	\
-	WEAK_ALIAS(name, __sys_ ## name);			\
-	WEAK_ALIAS(_ ## name, __sys_ ## name);			\
-	CALLSYS_ERROR(name)
-
-#define	SYSCALL_NOERROR(name)					\
-ENTRY(__sys_ ## name,0);		/* XXX # of args? */	\
-	WEAK_ALIAS(name, __sys_ ## name);			\
-	WEAK_ALIAS(_ ## name, __sys_ ## name);			\
-	CALLSYS_NOERROR(name)
-
-#define RSYSCALL(name)						\
-	SYSCALL(name);						\
-	br.ret.sptk.few rp;					\
-END(__sys_ ## name)
-
-#define	PSEUDO(name)						\
-ENTRY(__sys_ ## name,0);	/* XXX # of args? */		\
-	WEAK_ALIAS(_ ## name, __sys_ ## name);			\
-	CALLSYS_ERROR(name);					\
-	br.ret.sptk.few rp;					\
-END(__sys_ ## name);
diff --git a/lib/libc_bsd/ia64/Symbol.map b/lib/libc_bsd/ia64/Symbol.map
deleted file mode 100644
index e06278d..0000000
--- a/lib/libc_bsd/ia64/Symbol.map
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/ia64/Symbol.map 226606 2011-10-21 06:40:36Z das $
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSD_1.0 {
-	/* PSEUDO syscalls */
-	_exit;
-
-	mcount;
-	_setjmp;
-	_longjmp;
-	fabs;
-	__flt_rounds;
-	fpgetmask;
-	fpgetround;
-	fpsetmask;
-	fpsetround;
-	__infinity;
-	__nan;
-	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
-	htonl;
-	htons;
-	ntohl;
-	ntohs;
-	vfork;
-	brk;
-	exect;
-	sbrk;
-};
-
-FBSDprivate_1.0 {
-	/* PSEUDO syscalls */
-	__sys_getlogin;
-	_getlogin;
-	__sys_exit;
-
-	_set_tp;
-	__divdf3;
-	__divdi3;
-	__divsf3;
-	__divsi3;
-	__moddi3;
-	__modsi3;
-	__udivdi3;
-	__udivsi3;
-	__umoddi3;
-	__umodsi3;
-	_mcount;
-	___longjmp;
-	__makecontext;
-	__longjmp;
-	signalcontext;
-	__signalcontext;
-	__siglongjmp;
-	_Unwind_FindTableEntry;
-	__sys_vfork;
-	_vfork;
-	_end;
-	minbrk;
-	.cerror;
-	curbrk;
-};
diff --git a/lib/libc_bsd/ia64/_fpmath.h b/lib/libc_bsd/ia64/_fpmath.h
deleted file mode 100644
index cdc7c39..0000000
--- a/lib/libc_bsd/ia64/_fpmath.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*-
- * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2002, 2003 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/ia64/_fpmath.h 175402 2008-01-17 16:39:07Z bde $
- */
-
-#include <sys/endian.h>
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-		unsigned int	manl	:32;
-		unsigned int	manh	:32;
-		unsigned int	exp	:15;
-		unsigned int	sign	:1;
-		unsigned long	junk	:48;
-#else /* _BIG_ENDIAN */
-		unsigned long	junk	:48;
-		unsigned int	sign	:1;
-		unsigned int	exp	:15;
-		unsigned int	manh	:32;
-		unsigned int	manl	:32;
-#endif
-	} bits;
-	struct {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-		unsigned long	man	:64;
-		unsigned int	expsign	:16;
-		unsigned long	junk	:48;
-#else /* _BIG_ENDIAN */
-		unsigned long	junk	:48;
-		unsigned int	expsign	:16;
-		unsigned long	man	:64;
-#endif
-	} xbits;
-};
-
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#define	LDBL_NBIT	0x80000000
-#define	mask_nbit_l(u)	((u).bits.manh &= ~LDBL_NBIT)
-#else /* _BIG_ENDIAN */
-/*
- * XXX This doesn't look right.  Very few machines have a different
- *     endianness for integers and floating-point, and in nextafterl()
- *     we assume that none do.  If you have an environment for testing
- *     this, please let me know. --das
- */
-#define	LDBL_NBIT	0x80
-#define	mask_nbit_l(u)	((u).bits.manh &= ~LDBL_NBIT)
-#endif
-
-#define	LDBL_MANH_SIZE	32
-#define	LDBL_MANL_SIZE	32
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)(u).bits.manh;		\
-} while (0)
diff --git a/lib/libc_bsd/ia64/arith.h b/lib/libc_bsd/ia64/arith.h
deleted file mode 100644
index 64b37f0..0000000
--- a/lib/libc_bsd/ia64/arith.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD: releng/10.2/lib/libc/ia64/arith.h 114839 2003-05-08 13:50:44Z das $
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-
-#include <machine/endian.h>
-
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-
-#define IEEE_8087
-#define Arith_Kind_ASL 1
-#define Long int
-#define Intcast (int)(long)
-#define Double_Align
-#define X64_bit_pointers
-
-#else /* _BYTE_ORDER == _LITTLE_ENDIAN */
-
-#define IEEE_MC68k
-#define Arith_Kind_ASL 2
-#define Long int
-#define Intcast (int)(long)
-#define Double_Align
-#define X64_bit_pointers
-#ifdef gcc_bug	/* XXX Why does arithchk report sudden underflow here? */
-#define Sudden_Underflow
-#endif
-
-#endif
diff --git a/lib/libc_bsd/ia64/gd_qnan.h b/lib/libc_bsd/ia64/gd_qnan.h
deleted file mode 100644
index f4afec7..0000000
--- a/lib/libc_bsd/ia64/gd_qnan.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * This file can be generated by compiling and running contrib/gdtoa/qnan.c
- * on the target architecture after arith.h has been generated.
- *
- * $FreeBSD: releng/10.2/lib/libc/ia64/gd_qnan.h 174680 2007-12-16 21:15:09Z das $
- */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
-#define ld_QNAN0 0x0
-#define ld_QNAN1 0xc0000000
-#define ld_QNAN2 0x7fff
-#define ld_QNAN3 0x0
-#define ldus_QNAN0 0x0
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0xc000
-#define ldus_QNAN4 0x7fff
diff --git a/lib/libc_bsd/ia64/gen/Makefile.inc b/lib/libc_bsd/ia64/gen/Makefile.inc
deleted file mode 100644
index 0b12ce2..0000000
--- a/lib/libc_bsd/ia64/gen/Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile.incl 230429 2012-01-21 18:00:28Z kib $
-
-SRCS+=	__divdf3.S __divdi3.S __divsf3.S __divsi3.S __moddi3.S __modsi3.S \
-	__udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S _mcount.S _set_tp.c \
-	_setjmp.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c fpsetmask.c \
-	fpsetround.c getcontextx.c infinity.c ldexp.c makecontext.c setjmp.S \
-	signalcontext.c sigsetjmp.S
-
-# The following may go away if function _Unwind_FindTableEntry()
-# will be part of GCC.
-SRCS+=	unwind.c
diff --git a/lib/libc_bsd/ia64/gen/__divdf3.S b/lib/libc_bsd/ia64/gen/__divdf3.S
deleted file mode 100644
index e613fff..0000000
--- a/lib/libc_bsd/ia64/gen/__divdf3.S
+++ /dev/null
@@ -1,142 +0,0 @@
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__divdf3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-  .section .text
-
-ENTRY(__divdf3, 0)
-{ .mfi
-  // a is in f8
-  // b is in f9
-
-  // predicate registers used: p6
-  // floating-point registers used: f6, f7, f8, f9, f10, f11
-
-  // load a, the first argument, in f6
-  nop.m 0
-  mov f6=f8
-  nop.i 0
-} { .mfi
-  // load b, the second argument, in f7
-  nop.m 0
-  mov f7=f9
-  nop.i 0;;
-} { .mfi
-
-  // BEGIN DOUBLE PRECISION LATENCY-OPTIMIZED DIVIDE ALGORITHM
-
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s0 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f9
-  (p6) fma.s1 f9=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f10
-  (p6) fnma.s1 f10=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f9
-  (p6) fma.s1 f9=f10,f9,f9
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f10,f10,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f10,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f9,f9
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // e2 = e1 * e1 in f10
-  (p6) fma.s1 f10=f11,f11,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (10)
-  // q3 = q2 + e2 * q2 in f9
-  (p6) fma.d.s1 f9=f10,f9,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (11)
-  // y3 = y2 + e2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (12)
-  // r0 = a - b * q3 in f6
-  (p6) fnma.d.s1 f6=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (13)
-  // q4 = q3 + r0 * y3 in f8
-  (p6) fma.d.s0 f8=f6,f8,f9
-  nop.i 0;;
-
-  // END DOUBLE PRECISION LATENCY-OPTIMIZED DIVIDE ALGORITHM
-
-} { .mib
-  nop.m 0
-  nop.i 0
-  // return
-  br.ret.sptk b0;;
-}
-
-END(__divdf3)
-
diff --git a/lib/libc_bsd/ia64/gen/__divdi3.S b/lib/libc_bsd/ia64/gen/__divdi3.S
deleted file mode 100644
index 484bb27..0000000
--- a/lib/libc_bsd/ia64/gen/__divdi3.S
+++ /dev/null
@@ -1,143 +0,0 @@
-.file "__divdi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__divdi3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-.section .text
-.proc __divdi3#
-.align 32
-.global __divdi3#
-.align 32
-
-// 64-bit signed integer divide
-
-__divdi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mmi
-
-  // 64-BIT SIGNED INTEGER DIVIDE BEGINS HERE
-
-  setf.sig f8=r32
-  setf.sig f9=r33
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  fcvt.xf f6=f8
-  nop.b 0
-} { .mfb
-  nop.m 0
-  fcvt.xf f7=f9
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  // Step (11)
-  // q = trunc (q3)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.b 0;;
-} { .mmi
-  // quotient will be in r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 64-BIT SIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __divdi3
diff --git a/lib/libc_bsd/ia64/gen/__divsf3.S b/lib/libc_bsd/ia64/gen/__divsf3.S
deleted file mode 100644
index 14fc6c0..0000000
--- a/lib/libc_bsd/ia64/gen/__divsf3.S
+++ /dev/null
@@ -1,116 +0,0 @@
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__divsf3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-ENTRY(__divsf3, 0)
-{ .mfi
-  // a is in f8
-  // b is in f9
-
-  // general registers used: r31, r32, r33, r34
-  // predicate registers used: p6
-  // floating-point registers used: f6, f7, f8
-
-  nop.m 0
-  // load a, the first argument, in f6
-  mov f6=f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // load b, the second argument, in f7
-  mov f7=f9
-  nop.i 0;;
-} { .mfi
-
-  // BEGIN SINGLE PRECISION LATENCY-OPTIMIZED DIVIDE ALGORITHM
-
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s0 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f6
-  (p6) fma.s1 f6=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f7
-  (p6) fnma.s1 f7=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f6
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f7
-  (p6) fma.s1 f7=f7,f7,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // q2 = q1 + e1 * q1 in f6
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // e2 = e1 * e1 in f7
-  (p6) fma.s1 f7=f7,f7,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // q3 = q2 + e2 * q2 in f6
-  (p6) fma.d.s1 f6=f7,f6,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // q3' = q3 in f8
-  (p6) fma.s.s0 f8=f6,f1,f0
-  nop.i 0;;
-
-  // END SINGLE PRECISION LATENCY-OPTIMIZED DIVIDE ALGORITHM
-
-} { .mmb
-  nop.m 0
-  nop.m 0
-  // return
-  br.ret.sptk b0;;
-}
-
-END(__divsf3)
diff --git a/lib/libc_bsd/ia64/gen/__divsi3.S b/lib/libc_bsd/ia64/gen/__divsi3.S
deleted file mode 100644
index ac64bc6..0000000
--- a/lib/libc_bsd/ia64/gen/__divsi3.S
+++ /dev/null
@@ -1,125 +0,0 @@
-.file "__divsi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__divsi3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-.section .text
-
-// 32-bit signed integer divide
-
-.proc __divsi3#
-.align 32
-.global __divsi3#
-.align 32
-
-__divsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT SIGNED INTEGER DIVIDE BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit signed integer dividend
-  //    r33 - 32-bit signed integer divisor
-  //    r8 - 32-bit signed integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9
-  // predicate registers used: p6
-
-  sxt4 r32=r32
-  sxt4 r33=r33;;
-} { .mmb
-  setf.sig f6=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  fcvt.xf f6=f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f6=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f7=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f7=f7,f7,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f7,f6,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mmi
-  // quotient will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT SIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __divsi3
diff --git a/lib/libc_bsd/ia64/gen/__moddi3.S b/lib/libc_bsd/ia64/gen/__moddi3.S
deleted file mode 100644
index 3da3137..0000000
--- a/lib/libc_bsd/ia64/gen/__moddi3.S
+++ /dev/null
@@ -1,160 +0,0 @@
-.file "__moddi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__moddi3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-.section .text
-
-// 64-bit signed integer remainder
-
-.proc __moddi3#
-.align 32
-.global __moddi3#
-.align 32
-
-__moddi3:
-
-{ .mii
-  alloc r31=ar.pfs,3,0,0,0
-  nop.i 0
-  nop.i 0
-} { .mmb
-
-  // 64-BIT SIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 64-bit signed integer dividend
-  //    r33 - 64-bit signed integer divisor
-  //    r8 - 64-bit signed integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
-  // predicate registers used: p6
-
-  setf.sig f12=r32  // holds an in integer form
-  setf.sig f7=r33
-  nop.b 0
-} { .mlx
-  nop.m 0
-  //movl r2=0x8000000000000000;;
-  movl r2=0xffffffffffffffff;;
-} { .mfi
-  // get the 2's complement of b
-  sub r33=r0,r33
-  fcvt.xf f6=f12
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  setf.sig f7=r33
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (11) q = trunc(q3)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (12) r = a + (-b) * q
-  xma.l f8=f8,f7,f12
-  nop.i 0;;
-}  { .mib
-  getf.sig r8=f8
-  nop.i 0
-  nop.b 0
-} 
-
-  // 64-BIT SIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mib
-  nop.m 0
-  nop.i 0
-  br.ret.sptk b0;;
-}
-
-.endp __moddi3
diff --git a/lib/libc_bsd/ia64/gen/__modsi3.S b/lib/libc_bsd/ia64/gen/__modsi3.S
deleted file mode 100644
index 7491549..0000000
--- a/lib/libc_bsd/ia64/gen/__modsi3.S
+++ /dev/null
@@ -1,132 +0,0 @@
-.file "__modsi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__modsi3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-.section .text
-
-// 32-bit signed integer remainder
-
-.proc __modsi3#
-.align 32
-.global __modsi3#
-.align 32
-
-__modsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT SIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit signed integer dividend
-  //    r33 - 32-bit signed integer divisor
-  //    r8 - 32-bit signed integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9, f10, f11
-  // predicate registers used: p6
-
-  sxt4 r32=r32
-  sxt4 r33=r33;;
-} { .mmb
-  setf.sig f11=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  // get 2's complement of b
-  sub r33=r0,r33
-  fcvt.xf f6=f11
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f8=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  // 2's complement of b
-  setf.sig f7=r33
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f10=f8,f10,f10
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f8=f8,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f8,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fx.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (8) r = a + (-b) * q
-  xma.l f8=f8,f7,f11
-  nop.i 0;;
-}  { .mmi
-  // remainder will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT SIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __modsi3
diff --git a/lib/libc_bsd/ia64/gen/__udivdi3.S b/lib/libc_bsd/ia64/gen/__udivdi3.S
deleted file mode 100644
index d7959fe..0000000
--- a/lib/libc_bsd/ia64/gen/__udivdi3.S
+++ /dev/null
@@ -1,144 +0,0 @@
-.file "__udivdi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__udivdi3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-.section .text
-.proc __udivdi3#
-.align 32
-.global __udivdi3#
-.align 32
-
-// 64-bit unsigned integer divide
-
-__udivdi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-}
-
-{ .mmi
-
-  // 64-BIT UNSIGNED INTEGER DIVIDE BEGINS HERE
-
-  setf.sig f8=r32
-  setf.sig f9=r33
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  fma.s1 f6=f8,f1,f0
-  nop.b 0
-} { .mfb
-  nop.m 0
-  fma.s1 f7=f9,f1,f0
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfb
-  nop.m 0
-  // (11) q = trunc(q3)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.b 0;;
-} { .mmi
-  // quotient will be in r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 64-BIT UNSIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __udivdi3
diff --git a/lib/libc_bsd/ia64/gen/__udivsi3.S b/lib/libc_bsd/ia64/gen/__udivsi3.S
deleted file mode 100644
index 7a297c3..0000000
--- a/lib/libc_bsd/ia64/gen/__udivsi3.S
+++ /dev/null
@@ -1,125 +0,0 @@
-.file "__udivsi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__udivsi3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-.section .text
-
-// 32-bit unsigned integer divide
-
-.proc __udivsi3#
-.align 32
-.global __udivsi3#
-.align 32
-
-__udivsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT UNSIGNED INTEGER DIVIDE BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit unsigned integer dividend
-  //    r33 - 32-bit unsigned integer divisor
-  //    r8 - 32-bit unsigned integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9
-  // predicate registers used: p6
-
-  zxt4 r32=r32
-  zxt4 r33=r33;;
-} { .mmb
-  setf.sig f6=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  fcvt.xf f6=f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f6=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f7=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f6=f7,f6,f6
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f7=f7,f7,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f7,f6,f6
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.i 0;;
-} { .mmi
-  // quotient will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT UNSIGNED INTEGER DIVIDE ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __udivsi3
diff --git a/lib/libc_bsd/ia64/gen/__umoddi3.S b/lib/libc_bsd/ia64/gen/__umoddi3.S
deleted file mode 100644
index a69c97e..0000000
--- a/lib/libc_bsd/ia64/gen/__umoddi3.S
+++ /dev/null
@@ -1,156 +0,0 @@
-.file "__umoddi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__umoddi3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-.section .text
-
-  // 64-bit unsigned integer remainder
-
-.proc __umoddi3#
-.align 32
-.global __umoddi3#
-.align 32
-
-__umoddi3:
-
-{ .mii
-  alloc r31=ar.pfs,3,0,0,0
-  nop.i 0
-  nop.i 0
-} { .mmb
-
-  // 64-BIT UNSIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 64-bit unsigned integer dividend
-  //    r33 - 64-bit unsigned integer divisor
-  //    r8 - 64-bit unsigned integer result
-  // floating-point registers used: f6, f7, f8, f9, f10, f11, f12
-  // predicate registers used: p6
-
-  setf.sig f12=r32  // holds an in integer form
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  // get 2's complement of b
-  sub r33=r0,r33
-  fcvt.xuf.s1 f6=f12
-  nop.i 0
-} { .mfi
-  nop.m 0
-  fcvt.xuf.s1 f7=f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (1)
-  // y0 = 1 / b in f8
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (2)
-  // q0 = a * y0 in f10
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (3)
-  // e0 = 1 - b * y0 in f9
-  (p6) fnma.s1 f9=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (4)
-  // q1 = q0 + e0 * q0 in f10
-  (p6) fma.s1 f10=f9,f10,f10
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // Step (5)
-  // e1 = e0 * e0 in f11
-  (p6) fma.s1 f11=f9,f9,f0
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (6)
-  // y1 = y0 + e0 * y0 in f8
-  (p6) fma.s1 f8=f9,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (7)
-  // q2 = q1 + e1 * q1 in f9
-  (p6) fma.s1 f9=f11,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (8)
-  // y2 = y1 + e1 * y1 in f8
-  (p6) fma.s1 f8=f11,f8,f8
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // Step (9)
-  // r2 = a - b * q2 in f10
-  (p6) fnma.s1 f10=f7,f9,f6
-  nop.i 0;;
-} { .mfi
-  // f7=-b
-  setf.sig f7=r33
-  // Step (10)
-  // q3 = q2 + r2 * y2 in f8
-  (p6) fma.s1 f8=f10,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (11) q = trunc(q3)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (12) r = a + (-b) * q
-  xma.l f8=f8,f7,f12
-  nop.i 0;;
-}  { .mib
-  getf.sig r8=f8
-  nop.i 0
-  nop.b 0
-}
-
-  // 64-BIT UNSIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mib
-  nop.m 0
-  nop.i 0
-  br.ret.sptk b0;;
-}
-
-.endp __umoddi3
diff --git a/lib/libc_bsd/ia64/gen/__umodsi3.S b/lib/libc_bsd/ia64/gen/__umodsi3.S
deleted file mode 100644
index 5aa5ae3..0000000
--- a/lib/libc_bsd/ia64/gen/__umodsi3.S
+++ /dev/null
@@ -1,132 +0,0 @@
-.file "__umodsi3.s"
-
-//  
-// Copyright (c) 2000, Intel Corporation
-// All rights reserved.
-//
-// Contributed 2/15/2000 by Marius Cornea, John Harrison, Cristina Iordache, 
-// Ted Kubaska, Bob Norin, and Shane Story of the Computational Software Lab, 
-// Intel Corporation.
-//
-// WARRANTY DISCLAIMER
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 INTEL OR ITS 
-// 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.
-//
-// Intel Corporation is the author of this code, and requests that all
-// problem reports or change requests be submitted to it directly at
-// http://developer.intel.com/opensource.
-//
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/__umodsi3.S 111777 2003-03-03 01:09:46Z obrien $");
-
-.section .text
-
-// 32-bit unsigned integer remainder
-
-.proc __umodsi3#
-.align 32
-.global __umodsi3#
-.align 32
-
-__umodsi3:
-
-{ .mii
-  alloc r31=ar.pfs,2,0,0,0
-  nop.i 0
-  nop.i 0;;
-} { .mii
-  nop.m 0
-
-  // 32-BIT UNSIGNED INTEGER REMAINDER BEGINS HERE
-
-  // general register used:
-  //    r32 - 32-bit unsigned integer dividend
-  //    r33 - 32-bit unsigned integer divisor
-  //    r8 - 32-bit unsigned integer result
-  //    r2 - scratch register
-  // floating-point registers used: f6, f7, f8, f9, f10, f11
-  // predicate registers used: p6
-
-  zxt4 r32=r32
-  zxt4 r33=r33;;
-} { .mmb
-  setf.sig f11=r32
-  setf.sig f7=r33
-  nop.b 0;;
-} { .mfi
-  nop.m 0
-  fcvt.xf f6=f11
-  nop.i 0
-} { .mfi
-  // get 2's complement of b
-  sub r33=r0,r33
-  fcvt.xf f7=f7
-  mov r2 = 0x0ffdd;;
-} { .mfi
-  setf.exp f9 = r2
-  // (1) y0
-  frcpa.s1 f8,p6=f6,f7
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (2) q0 = a * y0
-  (p6) fma.s1 f10=f6,f8,f0
-  nop.i 0
-} { .mfi
-  nop.m 0
-  // (3) e0 = 1 - b * y0
-  (p6) fnma.s1 f8=f7,f8,f1
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (4) q1 = q0 + e0 * q0
-  (p6) fma.s1 f10=f8,f10,f10
-  nop.i 0
-} { .mfi
-  // get 2's complement of b
-  setf.sig f7=r33
-  // (5) e1 = e0 * e0 + 2^-34
-  (p6) fma.s1 f8=f8,f8,f9
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (6) q2 = q1 + e1 * q1
-  (p6) fma.s1 f8=f8,f10,f10
-  nop.i 0;;
-} { .mfi
-  nop.m 0
-  // (7) q = trunc(q2)
-  fcvt.fxu.trunc.s1 f8=f8
-  nop.i 0;;
-}  { .mfi
-  nop.m 0
-  // (8) r = a + (-b) * q
-  xma.l f8=f8,f7,f11
-  nop.i 0;;
-}  { .mmi
-  // remainder will be in the least significant 32 bits of r8 (if b != 0)
-  getf.sig r8=f8
-  nop.m 0
-  nop.i 0;;
-}
-
-  // 32-BIT UNSIGNED INTEGER REMAINDER ENDS HERE
-
-{ .mmb
-  nop.m 0
-  nop.m 0
-  br.ret.sptk b0;;
-}
-
-.endp __umodsi3
diff --git a/lib/libc_bsd/ia64/gen/_mcount.S b/lib/libc_bsd/ia64/gen/_mcount.S
deleted file mode 100644
index c1e67a4..0000000
--- a/lib/libc_bsd/ia64/gen/_mcount.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2004 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/_mcount.S 134287 2004-08-25 07:42:34Z marcel $");
-
-	.text
-
-/*
- * Important registers:
- *	r8	structure return address
- *	r15	static link (nested routines)
- *	rp	our return address
- *	in0	caller's ar.pfs
- *	in1	caller's gp
- *	in2	caller's rp
- *	in3	GOT entry
- *	ar.pfs	our pfs
- */
-ENTRY_NOPROFILE(_mcount, 4)
-	alloc		loc0 = ar.pfs, 4, 4, 2, 0
-	mov		loc1 = r8
-	mov		loc2 = rp
-	mov		loc3 = r15
-	;;
-	mov		out0 = in2
-	mov		out1 = rp
-	br.call.sptk	rp = __mcount
-	;;
-1:
-	mov		gp = in1
-	mov		r14 = ip
-	mov		b7 = loc2
-	;;
-	add		r14 = 2f - 1b, r14
-	mov		ar.pfs = loc0
-	mov		rp = in2
-	;;
-	mov		r15 = loc3
-	mov		b7 = r14
-	mov		b6 = loc2
-	mov		r8 = loc1
-	mov		r14 = in0
-	br.ret.sptk	b7
-	;;
-2:
-	mov		ar.pfs = r14
-	br.sptk		b6
-	;;
-END(_mcount)
-
-WEAK_ALIAS(mcount, _mcount)
diff --git a/lib/libc_bsd/ia64/gen/_set_tp.c b/lib/libc_bsd/ia64/gen/_set_tp.c
deleted file mode 100644
index 5601918..0000000
--- a/lib/libc_bsd/ia64/gen/_set_tp.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/ia64/gen/_set_tp.c 161728 2006-08-30 00:39:07Z marcel $
- */
-
-void
-_set_tp(void *tpval)
-{
-
-	__asm __volatile("mov r13 = %0" :: "r"(tpval));
-}
diff --git a/lib/libc_bsd/ia64/gen/_setjmp.S b/lib/libc_bsd/ia64/gen/_setjmp.S
deleted file mode 100644
index 5f4d40a..0000000
--- a/lib/libc_bsd/ia64/gen/_setjmp.S
+++ /dev/null
@@ -1,310 +0,0 @@
-//
-// Copyright (c) 1999, 2000
-// Intel Corporation.
-// 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 Intel Corporation and
-//    its contributors.
-// 
-// 4. Neither the name of Intel Corporation or its contributors may be
-//    used to endorse or promote products derived from this software
-//    without specific prior written permission.
-// 
-// THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION 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 INTEL CORPORATION 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.
-// 
-//
-
-//
-// Module Name:
-//
-//  setjmp.s
-//
-// Abstract:
-//
-//  Contains an implementation of setjmp and longjmp for the
-//  IA-64 architecture.
-
-    .file   "setjmp.s"
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/_setjmp.S 118034 2003-07-25 22:36:48Z marcel $");
-
-#define     LOCORE
-#include    <machine/setjmp.h>
-
-// int _setjmp(struct jmp_buffer *)
-//
-//  Setup a non-local goto.
-//
-// Description:
-//
-//  SetJump stores the current register set in the area pointed to
-//  by "save".  It returns zero.  Subsequent calls to "LongJump" will
-//  restore the registers and return non-zero to the same location.
-//
-// On entry, r32 contains the pointer to the jmp_buffer
-//
-
-ENTRY(_setjmp, 1)
-    add     r10 = J_PREDS, r32  // skip Unats & pfs save area
-    add     r11 = J_BSP, r32
-    //
-    //  save immediate context
-    //
-    mov     r2 = ar.bsp         // save backing store pointer
-    mov     r3 = pr             // save predicates
-    flushrs
-    ;;
-    //
-    // save user Unat register
-    //
-    mov     r16 = ar.lc         // save loop count register
-    mov     r14 = ar.unat       // save user Unat register
-
-    st8     [r10] = r3, J_LC-J_PREDS
-    st8     [r11] = r2, J_R4-J_BSP
-    ;;
-    st8     [r10] = r16, J_R5-J_LC
-    st8     [r32] = r14, J_NATS // Note: Unat at the 
-                                // beginning of the save area
-    mov     r15 = ar.pfs
-    ;;
-    //
-    //  save preserved general registers & NaT's
-    //
-    .mem.offset 0,0
-    st8.spill   [r11] = r4, J_R6-J_R4
-    .mem.offset 8,0
-    st8.spill   [r10] = r5, J_R7-J_R5
-    ;;
-    .mem.offset 16,0
-    st8.spill   [r11] = r6, J_SP-J_R6
-    .mem.offset 24,0
-    st8.spill   [r10] = r7, J_F3-J_R7 
-    ;;
-    st8.spill   [r11] = sp, J_F2-J_SP
-    mov	    r16 = ar.rsc
-    ;;
-    //
-    // save spilled Unat and pfs registers
-    //
-    mov     r2 = ar.unat        // save Unat register after spill
-    mov	ar.rsc = r0
-    ;;
-    st8     [r32] = r2, J_PFS-J_NATS    // save unat for spilled regs
-    mov     r17 = ar.rnat
-    ;;
-    st8     [r32] = r15, J_RNAT-J_PFS	// save pfs
-    mov	    ar.rsc = r16
-    //
-    //  save floating registers 
-    //
-    stf.spill   [r11] = f2, J_F4-J_F2
-    stf.spill   [r10] = f3, J_F5-J_F3 
-    ;;
-    stf.spill   [r11] = f4, J_F16-J_F4
-    stf.spill   [r10] = f5, J_F17-J_F5 
-    ;;
-    stf.spill   [r11] = f16, J_F18-J_F16
-    stf.spill   [r10] = f17, J_F19-J_F17 
-    ;;
-    stf.spill   [r11] = f18, J_F20-J_F18
-    stf.spill   [r10] = f19, J_F21-J_F19 
-    ;;
-    stf.spill   [r11] = f20, J_F22-J_F20
-    stf.spill   [r10] = f21, J_F23-J_F21 
-    ;;
-    stf.spill   [r11] = f22, J_F24-J_F22
-    stf.spill   [r10] = f23, J_F25-J_F23 
-    ;;
-    stf.spill   [r11] = f24, J_F26-J_F24
-    stf.spill   [r10] = f25, J_F27-J_F25 
-    ;;
-    stf.spill   [r11] = f26, J_F28-J_F26
-    stf.spill   [r10] = f27, J_F29-J_F27 
-    ;;
-    stf.spill   [r11] = f28, J_F30-J_F28
-    stf.spill   [r10] = f29, J_F31-J_F29 
-    ;;
-    stf.spill   [r11] = f30, J_FPSR-J_F30
-    stf.spill   [r10] = f31, J_B0-J_F31     // size of f31 + fpsr
-    ;;
-    st8     [r32] = r17
-    //
-    // save FPSR register & branch registers
-    //
-    mov     r2 = ar.fpsr    // save fpsr register
-    mov     r3 = b0 
-    ;;
-    st8     [r11] = r2, J_B1-J_FPSR
-    st8     [r10] = r3, J_B2-J_B0
-    mov     r2 = b1
-    mov     r3 = b2 
-    ;;
-    st8     [r11] = r2, J_B3-J_B1
-    st8     [r10] = r3, J_B4-J_B2
-    mov     r2 = b3
-    mov     r3 = b4 
-    ;;
-    st8     [r11] = r2, J_B5-J_B3
-    st8     [r10] = r3
-    mov     r2 = b5 
-    ;;
-    st8     [r11] = r2
-    ;;
-    //
-    // return
-    //
-    mov     r8 = r0         // return 0 from setjmp
-    mov     ar.unat = r14   // restore unat
-    br.ret.sptk b0
-
-END(_setjmp)
-
-
-//
-// void _longjmp(struct jmp_buffer *, int val)
-//
-//  Perform a non-local goto.
-//
-// Description:
-//
-//  LongJump initializes the register set to the values saved by a
-//  previous 'SetJump' and jumps to the return location saved by that
-//  'SetJump'.  This has the effect of unwinding the stack and returning
-//  for a second time to the 'SetJump'.
-//
-
-	WEAK_ALIAS(_longjmp,___longjmp)
-ENTRY(___longjmp, 2)
-    mov     r14 = ar.rsc        // get user RSC conf
-    mov     r8 = r33            // return value
-    add     r10 = J_PFS, r32    // get address of pfs
-    ;;
-    mov     ar.rsc = r0
-    add     r11 = J_NATS, r32
-    add     r17 = J_RNAT, r32
-    ;;
-    ld8     r15 = [r10], J_BSP-J_PFS    // get pfs
-    ld8     r2 = [r11], J_LC-J_NATS     // get unat for spilled regs
-    mov     r31 = r32
-    ;;
-    loadrs
-    mov     ar.unat = r2
-    cmp.eq  p6,p0=0,r8			// Return value 0?
-    ;;
-    ld8     r16 = [r10], J_PREDS-J_BSP  // get backing store pointer
-    ld8     r17 = [r17]			// ar.rnat
-    mov     ar.pfs = r15
-    ;;
-    mov     ar.bspstore = r16
-(p6) add    r8 = 1, r0
-    ;;
-    mov     ar.rnat = r17
-    mov     ar.rsc = r14        // restore RSC conf
-
-    ld8     r3 = [r11], J_R4-J_LC       // get lc register
-    ld8     r2 = [r10], J_R5-J_PREDS    // get predicates
-    ;;
-    mov     pr = r2, -1
-    mov     ar.lc = r3
-    //
-    //  restore preserved general registers & NaT's
-    //
-    ld8.fill    r4 = [r11], J_R6-J_R4
-    ;;
-    ld8.fill    r5 = [r10], J_R7-J_R5 
-    ld8.fill    r6 = [r11], J_SP-J_R6
-    ;;
-    ld8.fill    r7 = [r10], J_F2-J_R7
-    ld8.fill    sp = [r11], J_F3-J_SP
-    ;;
-    //
-    //  restore floating registers 
-    //
-    ldf.fill    f2 = [r10], J_F4-J_F2
-    ldf.fill    f3 = [r11], J_F5-J_F3 
-    ;;
-    ldf.fill    f4 = [r10], J_F16-J_F4
-    ldf.fill    f5 = [r11], J_F17-J_F5 
-    ;;
-    ldf.fill    f16 = [r10], J_F18-J_F16
-    ldf.fill    f17 = [r11], J_F19-J_F17
-    ;;
-    ldf.fill    f18 = [r10], J_F20-J_F18
-    ldf.fill    f19 = [r11], J_F21-J_F19
-    ;;
-    ldf.fill    f20 = [r10], J_F22-J_F20
-    ldf.fill    f21 = [r11], J_F23-J_F21
-    ;;
-    ldf.fill    f22 = [r10], J_F24-J_F22
-    ldf.fill    f23 = [r11], J_F25-J_F23 
-    ;;
-    ldf.fill    f24 = [r10], J_F26-J_F24
-    ldf.fill    f25 = [r11], J_F27-J_F25
-    ;;
-    ldf.fill    f26 = [r10], J_F28-J_F26
-    ldf.fill    f27 = [r11], J_F29-J_F27
-    ;;
-    ldf.fill    f28 = [r10], J_F30-J_F28
-    ldf.fill    f29 = [r11], J_F31-J_F29 
-    ;;
-    ldf.fill    f30 = [r10], J_FPSR-J_F30
-    ldf.fill    f31 = [r11], J_B0-J_F31 ;;
-
-    //
-    // restore branch registers and fpsr
-    //
-    ld8     r16 = [r10], J_B1-J_FPSR    // get fpsr
-    ld8     r17 = [r11], J_B2-J_B0      // get return pointer
-    ;;
-    mov     ar.fpsr = r16
-    mov     b0 = r17
-    ld8     r2 = [r10], J_B3-J_B1
-    ld8     r3 = [r11], J_B4-J_B2
-    ;;
-    mov     b1 = r2
-    mov     b2 = r3
-    ld8     r2 = [r10], J_B5-J_B3
-    ld8     r3 = [r11]
-    ;;
-    mov     b3 = r2
-    mov     b4 = r3
-    ld8     r2 = [r10]
-    ld8     r21 = [r31]         // get user unat
-    ;;
-    mov     b5 = r2
-    mov     ar.unat = r21
-
-    //
-    // invalidate ALAT
-    //
-    invala ;;
-
-    br.ret.sptk b0
-
-END(___longjmp)
diff --git a/lib/libc_bsd/ia64/gen/fabs.S b/lib/libc_bsd/ia64/gen/fabs.S
deleted file mode 100644
index 5f54b30..0000000
--- a/lib/libc_bsd/ia64/gen/fabs.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/fabs.S 111777 2003-03-03 01:09:46Z obrien $");
-
-ENTRY(fabs, 1)
-	fabs	fret0=farg0
-	br.ret.sptk.few rp
-END(fabs)
diff --git a/lib/libc_bsd/ia64/gen/flt_rounds.c b/lib/libc_bsd/ia64/gen/flt_rounds.c
deleted file mode 100644
index a1e3cbb..0000000
--- a/lib/libc_bsd/ia64/gen/flt_rounds.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/flt_rounds.c 132383 2004-07-19 08:17:25Z das $");
-
-#include <float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	3,	/* round to zero */
-	2,	/* round to negative infinity */
-	0	/* round to positive infinity */
-};
-
-int
-__flt_rounds(void)
-{
-	int x;
-
-	__asm("mov %0=ar.fpsr" : "=r" (x));
-        return (map[(x >> 10) & 0x03]);
-}
diff --git a/lib/libc_bsd/ia64/gen/fpgetmask.c b/lib/libc_bsd/ia64/gen/fpgetmask.c
deleted file mode 100644
index d71b273..0000000
--- a/lib/libc_bsd/ia64/gen/fpgetmask.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2001 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/fpgetmask.c 121332 2003-10-22 09:00:07Z marcel $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_except_t
-fpgetmask(void)
-{
-	u_int64_t fpsr;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r" (fpsr));
-	return (~fpsr & 0x3d);
-}
diff --git a/lib/libc_bsd/ia64/gen/fpgetround.c b/lib/libc_bsd/ia64/gen/fpgetround.c
deleted file mode 100644
index 4cdeba8..0000000
--- a/lib/libc_bsd/ia64/gen/fpgetround.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/lib/libc/ia64/gen/fpgetround.c 109096 2003-01-11 07:24:54Z marcel $
- */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_rnd_t
-fpgetround(void)
-{
-	uint64_t fpsr;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r"(fpsr));
-	return ((fp_rnd_t)((fpsr >> 10) & 3));
-}
diff --git a/lib/libc_bsd/ia64/gen/fpsetmask.c b/lib/libc_bsd/ia64/gen/fpsetmask.c
deleted file mode 100644
index 4f1999f..0000000
--- a/lib/libc_bsd/ia64/gen/fpsetmask.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c) 2001 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/fpsetmask.c 121332 2003-10-22 09:00:07Z marcel $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_except_t
-fpsetmask(fp_except_t mask)
-{
-	u_int64_t fpsr;
-	u_int64_t oldmask;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r" (fpsr));
-	oldmask = ~fpsr & 0x3d;
-	fpsr = (fpsr & ~0x3d) | (~mask & 0x3d);
-	__asm __volatile("mov ar.fpsr=%0" :: "r" (fpsr));
-	return (oldmask);
-}
diff --git a/lib/libc_bsd/ia64/gen/fpsetround.c b/lib/libc_bsd/ia64/gen/fpsetround.c
deleted file mode 100644
index e7c4477..0000000
--- a/lib/libc_bsd/ia64/gen/fpsetround.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/lib/libc/ia64/gen/fpsetround.c 109096 2003-01-11 07:24:54Z marcel $
- */
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-fp_rnd_t
-fpsetround(fp_rnd_t rnd)
-{
-	uint64_t fpsr;
-	fp_rnd_t prev;
-
-	__asm __volatile("mov %0=ar.fpsr" : "=r"(fpsr));
-	prev = (fp_rnd_t)((fpsr >> 10) & 3);
-	fpsr = (fpsr & ~0xC00ULL) | ((unsigned int)rnd << 10);
-	__asm __volatile("mov ar.fpsr=%0" :: "r"(fpsr));
-	return (prev);
-}
diff --git a/lib/libc_bsd/ia64/gen/getcontextx.c b/lib/libc_bsd/ia64/gen/getcontextx.c
deleted file mode 100644
index b9d5b09..0000000
--- a/lib/libc_bsd/ia64/gen/getcontextx.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/getcontextx.c 251047 2013-05-28 04:54:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stdlib.h>
-
-int
-__getcontextx_size(void)
-{
-
-	return (sizeof(ucontext_t));
-}
-
-int
-__fillcontextx2(char *ctx)
-{
-
-	return (0);
-}
-
-int
-__fillcontextx(char *ctx)
-{
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	return (getcontext(ucp));
-}
-
-__weak_reference(__getcontextx, getcontextx);
-
-ucontext_t *
-__getcontextx(void)
-{
-	char *ctx;
-	int error;
-
-	ctx = malloc(__getcontextx_size());
-	if (ctx == NULL)
-		return (NULL);
-	if (__fillcontextx(ctx) == -1) {
-		error = errno;
-		free(ctx);
-		errno = error;
-		return (NULL);
-	}
-	return ((ucontext_t *)ctx);
-}
diff --git a/lib/libc_bsd/ia64/gen/infinity.c b/lib/libc_bsd/ia64/gen/infinity.c
deleted file mode 100644
index 2e75a8a..0000000
--- a/lib/libc_bsd/ia64/gen/infinity.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: infinity.c,v 1.1 1995/02/10 17:50:23 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/infinity.c 111555 2003-02-26 16:04:34Z mike $");
-
-#include <sys/endian.h>
-#include <math.h>
-
-/* bytes for +Infinity on an ia64 (IEEE double format) */
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-const union __infinity_un __infinity = { { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f } };
-#else /* _BIG_ENDIAN */
-const union __infinity_un __infinity = { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } };
-#endif
-
-/* bytes for NaN */
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-const union __nan_un __nan = { { 0, 0, 0xc0, 0xff } };
-#else /* _BIG_ENDIAN */
-const union __nan_un __nan = { { 0xff, 0xc0, 0, 0 } };
-#endif
diff --git a/lib/libc_bsd/ia64/gen/makecontext.c b/lib/libc_bsd/ia64/gen/makecontext.c
deleted file mode 100644
index 0e9aa73..0000000
--- a/lib/libc_bsd/ia64/gen/makecontext.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/makecontext.c 124191 2004-01-06 19:40:28Z nectar $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <machine/fpu.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-struct fdesc {
-	uint64_t ip;
-	uint64_t gp;
-};
-
-typedef void (*func_t)(uint64_t, uint64_t, uint64_t, uint64_t, uint64_t,
-    uint64_t, uint64_t, uint64_t);
-
-static __inline uint64_t *
-spill(uint64_t *bsp, uint64_t arg)
-{
-	*bsp++ = arg;
-	if (((intptr_t)bsp & 0x1ff) == 0x1f8)
-		*bsp++ = 0;
-	return (bsp);
-}
-
-static void
-ctx_wrapper(ucontext_t *ucp, func_t func, uint64_t *args)
-{
-
-	(*func)(args[0], args[1], args[2], args[3], args[4], args[5], args[6],
-	    args[7]);
-	if (ucp->uc_link == NULL)
-		exit(0);
-	setcontext((const ucontext_t *)ucp->uc_link);
-	/* should never get here */
-	abort();
-	/* NOTREACHED */
-}
-
-__weak_reference(__makecontext, makecontext);
-
-void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	uint64_t *args, *bsp;
-	va_list ap;
-	int i;
-
-	/*
-	 * Drop the ball completely if something's not right. We only
-	 * support general registers as arguments and not more than 8
-	 * of them. Things get hairy if we need to support FP registers
-	 * (alignment issues) or more than 8 arguments (stack based).
-	 */
-	if (argc < 0 || argc > 8 || ucp == NULL ||
-	    ucp->uc_stack.ss_sp == NULL || (ucp->uc_stack.ss_size & 15) ||
-	    ((intptr_t)ucp->uc_stack.ss_sp & 15) ||
-	    ucp->uc_stack.ss_size < MINSIGSTKSZ)
-		abort();
-
-	/*
-	 * Copy the arguments of function 'func' onto the (memory) stack.
-	 * Always take up space for 8 arguments.
-	 */
-	va_start(ap, argc);
-	args = (uint64_t*)(ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size) - 8;
-	i = 0;
-	while (i < argc)
-		args[i++] = va_arg(ap, uint64_t);
-	while (i < 8)
-		args[i++] = 0;
-	va_end(ap);
-
-	/*
-	 * Push (spill) the arguments of the context wrapper onto the register
-	 * stack. They get loaded by the RSE on a context switch.
-	 */
-	bsp = (uint64_t*)ucp->uc_stack.ss_sp;
-	bsp = spill(bsp, (intptr_t)ucp);
-	bsp = spill(bsp, (intptr_t)func);
-	bsp = spill(bsp, (intptr_t)args);
-
-	/*
-	 * Setup the MD portion of the context.
-	 */
-	memset(&ucp->uc_mcontext, 0, sizeof(ucp->uc_mcontext));
-	ucp->uc_mcontext.mc_special.sp = (intptr_t)args - 16;
-	ucp->uc_mcontext.mc_special.bspstore = (intptr_t)bsp;
-	ucp->uc_mcontext.mc_special.pfs = (3 << 7) | 3;
-	ucp->uc_mcontext.mc_special.rsc = 0xf;
-	ucp->uc_mcontext.mc_special.rp = ((struct fdesc*)ctx_wrapper)->ip;
-	ucp->uc_mcontext.mc_special.gp = ((struct fdesc*)ctx_wrapper)->gp;
-	ucp->uc_mcontext.mc_special.fpsr = IA64_FPSR_DEFAULT;
-}
diff --git a/lib/libc_bsd/ia64/gen/setjmp.S b/lib/libc_bsd/ia64/gen/setjmp.S
deleted file mode 100644
index 75b2de1..0000000
--- a/lib/libc_bsd/ia64/gen/setjmp.S
+++ /dev/null
@@ -1,82 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.3 1997/12/05 02:06:27 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/setjmp.S 111894 2003-03-05 03:30:54Z marcel $");
-
-#define     LOCORE
-#include    <machine/setjmp.h>
-
-/*
- * C library -- setjmp, longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	setjmp(a)
- * by restoring registers from the stack,
- * and the previous signal state.
- */
-
-ENTRY(setjmp, 1)
-	alloc	loc0=ar.pfs,1,2,3,0
-	mov	loc1=rp
-	;;
-	mov	out0=1				// how = SIG_BLOCK
-	mov	out1=0				// set = NULL
-	add	out2=J_SIGSET,in0		// oset = &jb[J_SIGSET]
-	br.call.sptk.few rp=__sys_sigprocmask
-	;;
-	mov	rp=loc1
-	mov	r14=loc0
-	;;
-	alloc	r15=ar.pfs,1,0,0,0		// drop register frame
-	;;
-	mov	ar.pfs=r14			// restore ar.pfs
-	br.sptk.many _setjmp			// finish saving state
-END(setjmp)
-
-	WEAK_ALIAS(longjmp,__longjmp)
-ENTRY(__longjmp, 2)
-	alloc	loc0=ar.pfs,2,2,3,0
-	mov	loc1=rp
-	;; 
-	mov	out0=3				// how = SIG_SETMASK
-	add	out1=J_SIGSET,in0		// set = &jb[J_SIGSET]
-	mov	out2=0				// oset = NULL
-	br.call.sptk.few rp=__sys_sigprocmask
-	;;
-	mov	rp=loc1
-	mov	r14=loc0
-	;;
-	alloc	r15=ar.pfs,2,0,0,0		// drop register frame
-	;;
-	mov	ar.pfs=r14			// restore ar.pfs
-	br.sptk.many _longjmp			// finish restoring state
-END(__longjmp)
diff --git a/lib/libc_bsd/ia64/gen/signalcontext.c b/lib/libc_bsd/ia64/gen/signalcontext.c
deleted file mode 100644
index 06b7529..0000000
--- a/lib/libc_bsd/ia64/gen/signalcontext.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/signalcontext.c 124191 2004-01-06 19:40:28Z nectar $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <machine/fpu.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-
-struct fdesc {
-	uint64_t ip;
-	uint64_t gp;
-};
-
-typedef void (*handler_t)(uint64_t, uint64_t, uint64_t);
-
-static __inline uint64_t *
-spill(uint64_t *bsp, uint64_t arg)
-{
-	*bsp++ = arg;
-	if (((intptr_t)bsp & 0x1ff) == 0x1f8)
-		*bsp++ = 0;
-	return (bsp);
-}
-
-static void
-ctx_wrapper(ucontext_t *ucp, handler_t func, uint64_t *args)
-{
-
-	(*func)(args[0], args[1], args[2]);
-	if (ucp->uc_link == NULL)
-		exit(0);
-	setcontext((const ucontext_t *)ucp->uc_link);
-	/* should never get here */
-	abort();
-	/* NOTREACHED */
-}
-
-__weak_reference(__signalcontext, signalcontext);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	uint64_t *args, *bsp;
-	siginfo_t *sig_si;
-	ucontext_t *sig_uc;
-	uint64_t sp;
-
-	/* Bail out if we don't have a valid ucontext pointer. */
-	if (ucp == NULL)
-		abort();
-
-	/*
-	 * Build a signal frame and copy the arguments of signal handler
-	 * 'func' onto the (memory) stack. We only need 3 arguments, but
-	 * we create room for 4 so that we are 16-byte aligned.
-	 */
-	sp = (ucp->uc_mcontext.mc_special.sp - sizeof(ucontext_t)) & ~15UL;
-	sig_uc = (ucontext_t*)sp;
-	bcopy(ucp, sig_uc, sizeof(*sig_uc));
-	sp = (sp - sizeof(siginfo_t)) & ~15UL;
-	sig_si = (siginfo_t*)sp;
-	bzero(sig_si, sizeof(*sig_si));
-	sig_si->si_signo = sig;
-	sp -= 4 * sizeof(uint64_t);
-	args = (uint64_t*)sp;
-	args[0] = sig;
-	args[1] = (intptr_t)sig_si;
-	args[2] = (intptr_t)sig_uc;
-
-	/*
-	 * Push (spill) the arguments of the context wrapper onto the register
-	 * stack. They get loaded by the RSE on a context switch.
-	 */
-	bsp = (uint64_t*)ucp->uc_mcontext.mc_special.bspstore;
-	bsp = spill(bsp, (intptr_t)ucp);
-	bsp = spill(bsp, (intptr_t)func);
-	bsp = spill(bsp, (intptr_t)args);
-
-	/*
-	 * Setup the ucontext of the signal handler.
-	 */
-	memset(&ucp->uc_mcontext, 0, sizeof(ucp->uc_mcontext));
-	ucp->uc_link = sig_uc;
-	sigdelset(&ucp->uc_sigmask, sig);
-	ucp->uc_mcontext.mc_special.sp = (intptr_t)args - 16;
-	ucp->uc_mcontext.mc_special.bspstore = (intptr_t)bsp;
-	ucp->uc_mcontext.mc_special.pfs = (3 << 7) | 3;
-	ucp->uc_mcontext.mc_special.rsc = 0xf;
-	ucp->uc_mcontext.mc_special.rp = ((struct fdesc*)ctx_wrapper)->ip;
-	ucp->uc_mcontext.mc_special.gp = ((struct fdesc*)ctx_wrapper)->gp;
-	ucp->uc_mcontext.mc_special.fpsr = IA64_FPSR_DEFAULT;
-	return (0);
-}
diff --git a/lib/libc_bsd/ia64/gen/sigsetjmp.S b/lib/libc_bsd/ia64/gen/sigsetjmp.S
deleted file mode 100644
index 83bf858..0000000
--- a/lib/libc_bsd/ia64/gen/sigsetjmp.S
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.2 1996/10/17 03:08:07 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/gen/sigsetjmp.S 111777 2003-03-03 01:09:46Z obrien $");
-
-#define LOCORE
-#include <machine/setjmp.h>
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	siglongjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	sigsetjmp(a, mask)
- * by restoring registers from the stack.
- * If `mask' is non-zero, the previous signal
- * state will be restored.
- */
-
-ENTRY(sigsetjmp, 2)
-	add	r14=J_SIGMASK,in0		// place to save mask
-	cmp.ne	p6,p7=0,in1			// save signal state?
-	;;
-	st8	[r14]=in1			// save mask value
-(p6)	br.cond.dptk.many setjmp
-(p7)	br.cond.dpnt.many _setjmp		
-END(sigsetjmp)
-
-	WEAK_ALIAS(siglongjmp,__siglongjmp)
-ENTRY(__siglongjmp, 2)
-	add	r14=J_SIGMASK,in0		// address of mask value
-	;;
-	ld8	r14=[r14]
-	;;
-	cmp.ne	p6,p7=0,r14			// did we save signals?
-(p6)	br.cond.dptk.many longjmp
-(p7)	br.cond.dpnt.many _longjmp		
-END(__siglongjmp)
diff --git a/lib/libc_bsd/ia64/gen/unwind.c b/lib/libc_bsd/ia64/gen/unwind.c
deleted file mode 100644
index cdb3dcb..0000000
--- a/lib/libc_bsd/ia64/gen/unwind.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2002 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/lib/libc/ia64/gen/unwind.c 122298 2003-11-08 05:29:49Z marcel $
- */
-
-#include <sys/types.h>
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <stdlib.h>
-
-#include <machine/elf.h>
-
-#ifndef PT_IA_64_UNWIND
-#define PT_IA_64_UNWIND         0x70000001
-#endif
-
-#define	SANITY	0
-
-struct ia64_unwind_entry
-{
-	Elf64_Addr start;
-	Elf64_Addr end;
-	Elf64_Addr descr;
-};
-
-struct ia64_unwind_entry *
-_Unwind_FindTableEntry(const void *pc, unsigned long *pseg, unsigned long *pgp)
-{
-	Dl_info info;
-	Elf_Dyn *dyn;
-	Elf_Ehdr *ehdr;
-	Elf_Phdr *phdr;
-	char *p, *p_top;
-	struct ia64_unwind_entry *unw, *res;
-	register unsigned long gp __asm__("gp");	/* XXX assumes gcc */
-	unsigned long reloc, vaddr;
-	size_t l, m, r;
-
-	if (!dladdr(pc, &info))
-		return NULL;
-
-	ehdr = (Elf_Ehdr*)info.dli_fbase;
-
-#if SANITY
-	assert(IS_ELF(*ehdr));
-	assert(ehdr->e_ident[EI_CLASS] == ELFCLASS64);
-	assert(ehdr->e_ident[EI_DATA] == ELFDATA2LSB);
-	assert(ehdr->e_machine == EM_IA_64);
-#endif
-
-	reloc = (ehdr->e_type == ET_DYN) ? (uintptr_t)info.dli_fbase : 0;
-	*pgp = gp;
-	*pseg = 0UL;
-	res = NULL;
-
-	p = (char*)info.dli_fbase + ehdr->e_phoff;
-	p_top = p + ehdr->e_phnum * ehdr->e_phentsize;
-	while (p < p_top) {
-		phdr = (Elf_Phdr*)p;
-		vaddr = phdr->p_vaddr + reloc;
-
-		switch (phdr->p_type) {
-		case PT_DYNAMIC:
-			dyn = (Elf_Dyn*)vaddr;
-			while (dyn->d_tag != DT_NULL) {
-				if (dyn->d_tag == DT_PLTGOT) {
-					*pgp = dyn->d_un.d_ptr + reloc;
-					break;
-				}
-				dyn++;
-			}
-			break;
-		case PT_LOAD:
-			if (pc >= (void*)vaddr &&
-			    pc < (void*)(vaddr + phdr->p_memsz))
-				*pseg = vaddr;
-			break;
-		case PT_IA_64_UNWIND:
-#if SANITY
-			assert(*pseg != 0UL);
-			assert(res == NULL);
-#endif
-			unw = (struct ia64_unwind_entry*)vaddr;
-			l = 0;
-			r = phdr->p_memsz / sizeof(struct ia64_unwind_entry);
-			while (l < r) {
-				m = (l + r) >> 1;
-				res = unw + m;
-				if (pc < (void*)(res->start + *pseg))
-					r = m;
-				else if (pc >= (void*)(res->end + *pseg))
-					l = m + 1;
-				else
-					break;	/* found */
-			}
-			if (l >= r)
-				res = NULL;
-			break;
-		}
-
-		p += ehdr->e_phentsize;
-	}
-
-	return res;
-}
diff --git a/lib/libc_bsd/ia64/string/Makefile.inc b/lib/libc_bsd/ia64/string/Makefile.inc
deleted file mode 100644
index 5fdab0f..0000000
--- a/lib/libc_bsd/ia64/string/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile.incl 67117 2000-10-14 17:01:12Z dfr $
-
-MDSRCS+=	bcopy.S bzero.S ffs.S memcpy.S memmove.S
diff --git a/lib/libc_bsd/ia64/string/bcopy.S b/lib/libc_bsd/ia64/string/bcopy.S
deleted file mode 100644
index 1aa0e7d..0000000
--- a/lib/libc_bsd/ia64/string/bcopy.S
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/string/bcopy.S 125669 2004-02-10 20:45:28Z cperciva $");
-
-/*
- * Not the fastest bcopy in the world.
- */
-ENTRY(bcopy, 3)
-
-	cmp.le	p6,p0=in2,r0			// bail if len <= 0
-(p6)	br.ret.spnt.few rp
-
-	sub	r14=in1,in0 ;;			// check for overlap
-	cmp.ltu	p6,p0=r14,in2			// dst-src < len
-(p6)	br.cond.spnt.few 5f
-
-	extr.u	r14=in0,0,3			// src & 7
-	extr.u	r15=in1,0,3 ;;			// dst & 7
-	cmp.eq	p6,p0=r14,r15			// different alignment?
-(p6)	br.cond.spnt.few 2f			// branch if same alignment
-
-1:	ld1	r14=[in0],1 ;;			// copy bytewise
-	st1	[in1]=r14,1
-	add	in2=-1,in2 ;;			// len--
-	cmp.ne	p6,p0=r0,in2
-(p6)	br.cond.dptk.few 1b			// loop
-	br.ret.sptk.few rp			// done
-
-2:	cmp.eq	p6,p0=r14,r0			// aligned?
-(p6)	br.cond.sptk.few 4f
-
-3:	ld1	r14=[in0],1 ;;			// copy bytewise
-	st1	[in1]=r14,1
-	extr.u	r15=in0,0,3			// src & 7
-	add	in2=-1,in2 ;;			// len--
-	cmp.eq	p6,p0=r0,in2			// done?
-	cmp.eq	p7,p0=r0,r15 ;;			// aligned now?
-(p6)	br.ret.spnt.few rp			// return if done
-(p7)	br.cond.spnt.few 4f			// go to main copy
-	br.cond.sptk.few 3b			// more bytes to copy
-
-	// At this point, in2 is non-zero
-
-4:	mov	r14=8 ;;
-	cmp.ltu	p6,p0=in2,r14 ;;		// len < 8?
-(p6)	br.cond.spnt.few 1b			// byte copy the end
-	ld8	r15=[in0],8 ;;			// copy word
-	st8	[in1]=r15,8
-	add	in2=-8,in2 ;;			// len -= 8
-	cmp.ne	p6,p0=r0,in2			// done?
-(p6)	br.cond.spnt.few 4b			// again
-
-	br.ret.sptk.few rp			// return
-
-	// Don't bother optimising overlap case
-
-5:	add	in0=in0,in2
-	add	in1=in1,in2 ;;
-	add	in0=-1,in0
-	add	in1=-1,in1 ;;
-
-6:	ld1	r14=[in0],-1 ;;
-	st1	[in1]=r14,-1
-	add	in2=-1,in2 ;;
-	cmp.ne	p6,p0=r0,in2
-(p6)	br.cond.spnt.few 6b
-
-	br.ret.sptk.few rp
-
-END(bcopy)
diff --git a/lib/libc_bsd/ia64/string/bzero.S b/lib/libc_bsd/ia64/string/bzero.S
deleted file mode 100644
index 76908c4..0000000
--- a/lib/libc_bsd/ia64/string/bzero.S
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/string/bzero.S 125669 2004-02-10 20:45:28Z cperciva $");
-
-ENTRY(bzero, 2)
-	
-	cmp.le	p6,p0=in1,r0			// bail if len <= 0
-(p6)	br.ret.spnt.few rp
-	;; 
-	mov	r14=ar.lc			// save ar.lc
-
-	cmp.ltu	p6,p0=17,in1			// check for small
-(p6)	br.dptk.few 3f	
-
-1:	add	r15=-1,in1 ;;
-	mov	ar.lc=r15 ;;
-2:	st1	[in0]=r0,1			// zero one byte
-	br.cloop.sptk.few 2b			// loop
-
-	;;
-	mov	ar.lc=r14			// done
-	br.ret.sptk.few rp
-
-	// Zero up to 8byte alignment
-	
-3:	tbit.nz	p6,p0=in0,0 ;;
-(p6)	st1	[in0]=r0,1
-(p6)	add	in1=-1,in1 ;;
-
-	tbit.nz	p6,p0=in0,1 ;;
-(p6)	st2	[in0]=r0,2
-(p6)	add	in1=-2,in1 ;;
-
-	tbit.nz	p6,p0=in0,2 ;;
-(p6)	st4	[in0]=r0,4
-(p6)	add	in1=-4,in1
-
-	;;
-	shr.u	r15=in1,3			// word count
-	extr.u	in1=in1,0,3 ;;			// trailing bytes
-	cmp.eq	p6,p0=r15,r0			// check for zero
-	cmp.ne	p7,p0=in1,r0
-(p6)	br.dpnt.few 1b				// zero last bytes
-
-	add	r15=-1,r15 ;;
-	mov	ar.lc=r15 ;;
-4:	st8	[in0]=r0,8
-	br.cloop.sptk.few 4b 
-
-(p7)	br.dpnt.few 1b				// zero last bytes
-
-	;;
-	mov	ar.lc=r14			// done
-	br.ret.sptk.few rp
-
-END(bzero)
diff --git a/lib/libc_bsd/ia64/string/ffs.S b/lib/libc_bsd/ia64/string/ffs.S
deleted file mode 100644
index b1917f2..0000000
--- a/lib/libc_bsd/ia64/string/ffs.S
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: ffs.S,v 1.3 1996/10/17 03:08:13 cgd Exp $	*/
-
-/*
- * Copyright (c) 1995 Christopher G. Demetriou
- * 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 Christopher G. Demetriou
- *	for the NetBSD Project.
- * 4. 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 ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/string/ffs.S 111777 2003-03-03 01:09:46Z obrien $");
-
-ENTRY(ffs, 1)
-	sxt4	r14=in0 ;;
-	cmp.eq	p6,p0=r14,r0
-(p6)	br.dpnt.few Lallzero
-	
-	/*
-	 * Initialize return value (ret0), and set up r15 so that it
-	 * contains the mask with only the lowest bit set.
-	 */
-	sub	r15=r0,r14
-	mov	ret0=1 ;;
-	and	r15=r14,r15 ;;
-
-	extr.u	r16=r15,0,8 ;;
-	cmp.ne	p6,p0=r0,r16
-(p6)	br.dptk.few Ldo8
-
-	/*
-	 * If lower 16 bits empty, add 16 to result and use upper 16.
-	 */
-	extr.u	r16=r15,0,16 ;;
-	cmp.ne	p6,p0=r0,r16
-(p6)	br.dptk.few Ldo16
-	extr.u	r15=r15,16,16
-	add	ret0=16,ret0 ;;
-	
-Ldo16:
-	/*
-	 * If lower 8 bits empty, add 8 to result and use upper 8.
-	 */
-	extr.u	r16=r15,0,8 ;;
-	cmp.ne	p6,p0=r0,r16
-(p6)	br.dptk.few Ldo8
-	extr.u	r15=r15,8,24
-	add	ret0=8,ret0 ;;
-
-Ldo8:
-	and	r16=0x0f,r15		/* lower 4 of 8 empty? */
-	and	r17=0x33,r15		/* lower 2 of each 4 empty? */
-	and	r18=0x55,r15 ;;		/* lower 1 of each 2 empty? */
-	cmp.ne	p6,p0=r16,r0
-	cmp.ne	p7,p0=r17,r0
-	cmp.ne	p8,p0=r18,r0
-
-	/* If lower 4 bits empty, add 4 to result. */
-(p6)	br.dptk.few Ldo4
-	add	ret0=4,ret0 ;;
-
-Ldo4:	/* If lower 2 bits of each 4 empty, add 2 to result. */
-(p7)	br.dptk.few Ldo2
-	add	ret0=2,ret0 ;;
-
-Ldo2:	/* If lower bit of each 2 empty, add 1 to result. */
-(p8)	br.dptk.few Ldone
-	add	ret0=1,ret0
-
-Ldone:
-	br.ret.sptk.few rp
-
-Lallzero:
-	mov	ret0=0
-	br.ret.sptk.few rp
-END(ffs)
diff --git a/lib/libc_bsd/ia64/string/memcpy.S b/lib/libc_bsd/ia64/string/memcpy.S
deleted file mode 100644
index 0dd0ff3..0000000
--- a/lib/libc_bsd/ia64/string/memcpy.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/string/memcpy.S 134739 2004-09-04 00:04:58Z marcel $");
-
-ENTRY(memcpy,3)
-	mov	r8 = in0
-	mov	in0 = in1
-	;;
-	mov	in1 = r8
-	br.sptk.few bcopy
-END(memcpy)
diff --git a/lib/libc_bsd/ia64/string/memmove.S b/lib/libc_bsd/ia64/string/memmove.S
deleted file mode 100644
index 00404a5..0000000
--- a/lib/libc_bsd/ia64/string/memmove.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/string/memmove.S 134743 2004-09-04 00:23:15Z marcel $");
-
-ENTRY(memmove,3)
-	mov	r8 = in0
-	mov	in0 = in1
-	;;
-	mov	in1 = r8
-	br.sptk.few bcopy
-END(memmove)
diff --git a/lib/libc_bsd/ia64/sys/Makefile.inc b/lib/libc_bsd/ia64/sys/Makefile.inc
deleted file mode 100644
index ff84f1a..0000000
--- a/lib/libc_bsd/ia64/sys/Makefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-Makefile.incl 246117 2013-01-30 12:48:16Z kib $
-
-SRCS+=	__vdso_gettc.c
-
-MDASM+=	Ovfork.S brk.S cerror.S exect.S fork.S getcontext.S pipe.S ptrace.S \
-	sbrk.S setlogin.S sigreturn.S swapcontext.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o vfork.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
diff --git a/lib/libc_bsd/ia64/sys/Ovfork.S b/lib/libc_bsd/ia64/sys/Ovfork.S
deleted file mode 100644
index a9b00fb..0000000
--- a/lib/libc_bsd/ia64/sys/Ovfork.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/Ovfork.S 118330 2003-08-01 22:17:12Z marcel $");
-
-#include "SYS.h"
-
-SYSCALL(vfork)
-	cmp.ne	p7,p0=ret1,r0		/* ret1!=0 for child */
-	;;
-(p7)	mov	ret0=r0
-	br.ret.sptk.few rp
-END(__sys_vfork)
diff --git a/lib/libc_bsd/ia64/sys/__vdso_gettc.c b/lib/libc_bsd/ia64/sys/__vdso_gettc.c
deleted file mode 100644
index 9862377..0000000
--- a/lib/libc_bsd/ia64/sys/__vdso_gettc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2013 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/__vdso_gettc.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-
-#pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
-{
-
-	return (0);
-}
-
-#pragma weak __vdso_gettimekeep
-int
-__vdso_gettimekeep(struct vdso_timekeep **tk)
-{
-
-	return (ENOSYS);
-}
diff --git a/lib/libc_bsd/ia64/sys/brk.S b/lib/libc_bsd/ia64/sys/brk.S
deleted file mode 100644
index 820356f..0000000
--- a/lib/libc_bsd/ia64/sys/brk.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: brk.S,v 1.4 1996/10/17 03:08:15 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/brk.S 115084 2003-05-16 21:26:42Z marcel $");
-
-#include "SYS.h"
-
-	.globl	_end
-IMPORT(curbrk, 8)
-
-	.data
-EXPORT(minbrk)
-	.quad	_end
-
-	.text
-ENTRY(brk, 1)
-	add	r14=@ltoff(minbrk),gp ;;
-	ld8	r14=[r14] ;;
-	ld8	r14=[r14] ;;
-	cmp.ltu	p6,p0=r32,r14 ;;
-(p6)	mov	r32=r14 ;;
-	st8	[sp]=r32
-	CALLSYS_ERROR(break)
-	ld8	r15=[sp]
-	add	r14=@ltoff(curbrk),gp ;;
-	ld8	r14=[r14] ;;
-	st8	[r14]=r15
-	mov	ret0=0
-	br.ret.sptk.few rp
-END(brk)
diff --git a/lib/libc_bsd/ia64/sys/cerror.S b/lib/libc_bsd/ia64/sys/cerror.S
deleted file mode 100644
index 82663e1..0000000
--- a/lib/libc_bsd/ia64/sys/cerror.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/cerror.S 111777 2003-03-03 01:09:46Z obrien $");
-
-
-ENTRY(.cerror, 0)
-	alloc	loc0=ar.pfs,0,3,1,0
-	;;
-	mov	loc1=rp
-	mov	loc2=ret0
-	mov	out0=ret0
-	;;
-	br.call.sptk.few rp=__error
-	st4	[ret0]=loc2
-	;;
-	mov	ret0=-1
-	mov	ar.pfs=loc0
-	mov	rp=loc1
-	;;
-	br.ret.sptk.few rp
-END(.cerror)
diff --git a/lib/libc_bsd/ia64/sys/exect.S b/lib/libc_bsd/ia64/sys/exect.S
deleted file mode 100644
index 63677c9..0000000
--- a/lib/libc_bsd/ia64/sys/exect.S
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: exect.S,v 1.2 1996/10/17 03:08:18 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/exect.S 111777 2003-03-03 01:09:46Z obrien $");
-
-#include "SYS.h"
-
-ENTRY(exect, 3)
-	CALLSYS_ERROR(execve)
-	br.ret.sptk.few rp
-END(exect)
diff --git a/lib/libc_bsd/ia64/sys/fork.S b/lib/libc_bsd/ia64/sys/fork.S
deleted file mode 100644
index e709a87..0000000
--- a/lib/libc_bsd/ia64/sys/fork.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2000 Doug Rabson
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/fork.S 118330 2003-08-01 22:17:12Z marcel $");
-
-#include "SYS.h"
-
-SYSCALL(fork)
-	cmp.ne	p7,p0=ret1,r0		/* ret1!=0 for child */
-	;;
-(p7)	mov	ret0=r0
-	br.ret.sptk.few rp
-END(__sys_fork)
diff --git a/lib/libc_bsd/ia64/sys/getcontext.S b/lib/libc_bsd/ia64/sys/getcontext.S
deleted file mode 100644
index e16c277..0000000
--- a/lib/libc_bsd/ia64/sys/getcontext.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/getcontext.S 118332 2003-08-02 00:49:36Z marcel $");
-
-#include "SYS.h"
-
-ENTRY(__sys_getcontext,2)
-	WEAK_ALIAS(getcontext, __sys_getcontext)
-	WEAK_ALIAS(_getcontext, __sys_getcontext)
-	flushrs
-	;;
-	CALLSYS_ERROR(getcontext)
-	br.ret.sptk.few rp
-END(__sys_getcontext)
diff --git a/lib/libc_bsd/ia64/sys/pipe.S b/lib/libc_bsd/ia64/sys/pipe.S
deleted file mode 100644
index e56dbf0..0000000
--- a/lib/libc_bsd/ia64/sys/pipe.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.1 1995/02/10 17:50:35 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/pipe.S 115084 2003-05-16 21:26:42Z marcel $");
-
-#include "SYS.h"
-
-ENTRY(__sys_pipe, 1)
-	WEAK_ALIAS(pipe, __sys_pipe)
-	WEAK_ALIAS(_pipe, __sys_pipe)
-	st8		[sp]=r32
-	CALLSYS_ERROR(pipe)
-	ld8		r14=[sp]
-	;;
-	st4		[r14]=ret0,4
-	;;
-	st4		[r14]=ret1
-	mov		ret0=0
-	br.ret.sptk.few rp
-END(__sys_pipe)
diff --git a/lib/libc_bsd/ia64/sys/ptrace.S b/lib/libc_bsd/ia64/sys/ptrace.S
deleted file mode 100644
index 4d68377..0000000
--- a/lib/libc_bsd/ia64/sys/ptrace.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.4 1996/11/08 00:51:24 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/ptrace.S 111777 2003-03-03 01:09:46Z obrien $");
-
-#include "SYS.h"
-
-ENTRY(ptrace, 4)
-	add	r14=@ltoff(errno),gp ;;
-	ld8	r14=[r14] ;;
-	st4	[r14]=r0
-	CALLSYS_ERROR(ptrace)
-	br.ret.sptk.few rp
-END(ptrace)
diff --git a/lib/libc_bsd/ia64/sys/sbrk.S b/lib/libc_bsd/ia64/sys/sbrk.S
deleted file mode 100644
index 586f430..0000000
--- a/lib/libc_bsd/ia64/sys/sbrk.S
+++ /dev/null
@@ -1,63 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.4 1996/10/17 03:08:20 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/sbrk.S 115084 2003-05-16 21:26:42Z marcel $");
-
-#include "SYS.h"
-
-	.globl	_end
-
-	.data
-EXPORT(curbrk)
-	.quad	_end
-
-	.text
-ENTRY(sbrk, 1)
-	add	r14 = @ltoff(curbrk), gp
-	;;
-	ld8	r14 = [r14]
-	cmp.eq	p6, p0 = r32, r0
-	;;
-	ld8	ret0 = [r14]
-(p6)	br.ret.sptk.few	rp
-	;;
-	add	r32 = ret0, r32
-	;;
-	st8	[sp] = r32
-	CALLSYS_ERROR(break)
-	ld8	r15 = [sp]
-	add	r14 = @ltoff(curbrk), gp
-	;;
-	ld8	r14 = [r14]
-	;;
-	ld8	ret0 = [r14]
-	st8	[r14] = r15
-	br.ret.sptk.few	rp
-END(sbrk)
diff --git a/lib/libc_bsd/ia64/sys/setlogin.S b/lib/libc_bsd/ia64/sys/setlogin.S
deleted file mode 100644
index b716079..0000000
--- a/lib/libc_bsd/ia64/sys/setlogin.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*	$NetBSD: setlogin.S,v 1.1 1995/02/10 17:50:39 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/setlogin.S 118330 2003-08-01 22:17:12Z marcel $");
-
-#include "SYS.h"
-
-IMPORT(_logname_valid, 4)			/* in getlogin() */
-
-SYSCALL(setlogin)
-	add	r14=@ltoff(_logname_valid),gp ;;
-	ld8	r14=[r14] ;;
-	st4	[r14]=r0			/* clear it */
-	br.ret.sptk.few rp
-END(__sys_setlogin)
diff --git a/lib/libc_bsd/ia64/sys/sigreturn.S b/lib/libc_bsd/ia64/sys/sigreturn.S
deleted file mode 100644
index d3fe8eb..0000000
--- a/lib/libc_bsd/ia64/sys/sigreturn.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*	$NetBSD: sigreturn.S,v 1.1 1995/02/10 17:50:42 cgd Exp $	*/
-
-/*
- * Copyright (c) 1994, 1995 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/sigreturn.S 111777 2003-03-03 01:09:46Z obrien $");
-
-#include "SYS.h"
-
-/*
- * We must preserve the state of the registers as the user has set them up.
- * However, that doesn't involve any special work on the ia64.
- * (XXX PROFILING)
- */
-
-RSYSCALL(sigreturn)
diff --git a/lib/libc_bsd/ia64/sys/swapcontext.S b/lib/libc_bsd/ia64/sys/swapcontext.S
deleted file mode 100644
index 6367ca5..0000000
--- a/lib/libc_bsd/ia64/sys/swapcontext.S
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2003 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/ia64/sys/swapcontext.S 118332 2003-08-02 00:49:36Z marcel $");
-
-#include "SYS.h"
-
-ENTRY(__sys_swapcontext,2)
-	WEAK_ALIAS(swapcontext, __sys_swapcontext)
-	WEAK_ALIAS(_swapcontext, __sys_swapcontext)
-	flushrs
-	;;
-	CALLSYS_ERROR(swapcontext)
-	br.ret.sptk.few rp
-END(__sys_swapcontext)
diff --git a/lib/libc_bsd/iconv/Makefile.inc b/lib/libc_bsd/iconv/Makefile.inc
deleted file mode 100644
index 7c8daf9..0000000
--- a/lib/libc_bsd/iconv/Makefile.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-Makefile.incl 258750 2013-11-29 19:44:30Z gjb $
-
-# iconv sources
-.PATH: ${.CURDIR}/iconv
-
-MAN+=	iconv.3 iconvctl.3 iconv_canonicalize.3 iconvlist.3 __iconv_get_list.3
-MLINKS+= iconv.3 iconv_open.3 \
-	iconv.3 iconv_open_into.3 \
-	iconv.3 iconv_close.3 \
-	iconv.3 __iconv.3 \
-	__iconv_get_list.3 __iconv_free_list.3
-SRCS+=	citrus_bcs.c citrus_bcs_strtol.c citrus_bcs_strtoul.c \
-	citrus_csmapper.c citrus_db.c citrus_db_factory.c citrus_db_hash.c \
-	citrus_esdb.c citrus_hash.c citrus_iconv.c citrus_lookup.c \
-	citrus_lookup_factory.c citrus_mapper.c citrus_memstream.c \
-	citrus_mmap.c citrus_module.c citrus_none.c citrus_pivot_factory.c \
-	citrus_prop.c citrus_stdenc.c bsd_iconv.c iconv_compat.c
-SYM_MAPS+= ${.CURDIR}/iconv/Symbol.map
-
-.if ${MK_ICONV} == yes
-.include "${.CURDIR}/../libc_nonshared/Makefile.iconv"
-.endif
diff --git a/lib/libc_bsd/iconv/Symbol.map b/lib/libc_bsd/iconv/Symbol.map
deleted file mode 100644
index 5dfc9d2..0000000
--- a/lib/libc_bsd/iconv/Symbol.map
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/iconv/Symbol.map 258398 2013-11-20 20:24:59Z peter $
- */
-
-FBSD_1.3 {
-	__bsd___iconv;
-	__bsd___iconv_free_list;
-	__bsd___iconv_get_list;
-	__bsd_iconv;
-	__bsd_iconv_canonicalize;
-	__bsd_iconv_close;
-	__bsd_iconv_open;
-	__bsd_iconv_open_into;
-	__bsd_iconv_set_relocation_prefix;
-	__bsd_iconvctl;
-	__bsd_iconvlist;
-};
-
-FBSDprivate_1.0 {
-	_citrus_bcs_convert_to_lower;
-	_citrus_bcs_convert_to_upper;
-	_citrus_bcs_isalnum;
-	_citrus_bcs_isalpha;
-	_citrus_bcs_isblank;
-	_citrus_bcs_isdigit;
-	_citrus_bcs_iseol;
-	_citrus_bcs_islower;
-	_citrus_bcs_isspace;
-	_citrus_bcs_isupper;
-	_citrus_bcs_isxdigit;
-	_citrus_bcs_skip_nonws;
-	_citrus_bcs_skip_nonws_len;
-	_citrus_bcs_skip_ws;
-	_citrus_bcs_skip_ws_len;
-	_citrus_bcs_strcasecmp;
-	_citrus_bcs_strncasecmp;
-	_citrus_bcs_strtol;
-	_citrus_bcs_strtoul;
-	_citrus_bcs_tolower;
-	_citrus_bcs_toupper;
-	_citrus_bcs_trunc_rws_len;
-	_citrus_bcs_trunc_ws_len;
-	_citrus_csmapper_open;
-	_citrus_csmapper_close;
-	_citrus_db_factory_add_by_string;
-	_citrus_db_factory_add_string_by_string;
-	_citrus_db_factory_add32_by_string;
-	_citrus_db_factory_calc_size;
-	_citrus_db_factory_create;
-	_citrus_db_factory_serialize;
-	_citrus_db_hash_std;
-	_citrus_db_close;
-	_citrus_db_get_entry;
-	_citrus_db_get_number_of_entries;
-	_citrus_db_lookup;
-	_citrus_db_lookup_by_string;
-	_citrus_db_lookup8_by_string;
-	_citrus_db_lookup16_by_string;
-	_citrus_db_lookup_string_by_string;
-	_citrus_db_open;
-	_citrus_esdb_close;
-	_citrus_esdb_open;
-	_citrus_lookup_factory_convert;
-	_citrus_map_file;
-	_citrus_mapper_close;
-	_citrus_mapper_convert;
-	_citrus_mapper_create_area;
-	_citrus_mapper_get_dst_max;
-	_citrus_mapper_get_src_max;
-	_citrus_mapper_get_state_size;
-	_citrus_mapper_init_state;
-	_citrus_mapper_open;
-	_citrus_mapper_open_direct;
-	_citrus_mapper_set_persistent;
-	_citrus_memory_stream_bind;
-	_citrus_memory_stream_chr;
-	_citrus_memory_stream_getc;
-	_citrus_memory_stream_getln;
-	_citrus_memory_stream_getln_region;
-	_citrus_memory_stream_getregion;
-	_citrus_memory_stream_iseof;
-	_citrus_memory_stream_matchline;
-	_citrus_memory_stream_peek;
-	_citrus_memory_stream_remainder;
-	_citrus_memory_stream_rewind;
-	_citrus_memory_stream_seek;
-	_citrus_memory_stream_skip_ws;
-	_citrus_memory_stream_tell;
-	_citrus_memory_stream_ungetc;
-	_citrus_pivot_factory_convert;
-	_citrus_prop_object_init;
-	_citrus_prop_object_uninit;
-	_citrus_prop_parse_variable;
-	_citrus_prop_read_bool;
-	_citrus_prop_read_character;
-	_citrus_prop_read_character_common;
-	_citrus_prop_read_element;
-	_citrus_prop_read_num;
-	_citrus_prop_read_str;
-	_citrus_prop_read_symbol;
-	_citrus_stdenc_close;
-	_citrus_stdenc_open;
-	_citrus_unmap_file;
-};
diff --git a/lib/libc_bsd/iconv/__iconv.c b/lib/libc_bsd/iconv/__iconv.c
deleted file mode 100644
index b7f8a7b..0000000
--- a/lib/libc_bsd/iconv/__iconv.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/__iconv.c 282275 2015-04-30 16:08:47Z tijl $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-size_t
-__iconv(iconv_t a, char **b, size_t *c, char **d,
-     size_t *e, __uint32_t f, size_t *g)
-{
-	return __bsd___iconv(a, b, c, d, e, f, g);
-}
diff --git a/lib/libc_bsd/iconv/__iconv_free_list.c b/lib/libc_bsd/iconv/__iconv_free_list.c
deleted file mode 100644
index b77ae2f..0000000
--- a/lib/libc_bsd/iconv/__iconv_free_list.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/__iconv_free_list.c 258750 2013-11-29 19:44:30Z gjb $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-void
-__iconv_free_list(char **a, size_t b)
-{
-	__bsd___iconv_free_list(a, b);
-}
diff --git a/lib/libc_bsd/iconv/__iconv_get_list.3 b/lib/libc_bsd/iconv/__iconv_get_list.3
deleted file mode 100644
index 4042499..0000000
--- a/lib/libc_bsd/iconv/__iconv_get_list.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" Copyright (c) 2009 Gabor Kovesdan <gabor@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/iconv/__iconv_get_list.3 219019 2011-02-25 00:04:39Z gabor $
-.\"
-.Dd October 20, 2009
-.Dt __ICONV_GET_LIST 3
-.Os
-.Sh NAME
-.Nm __iconv_get_list
-.Nm __iconv_free_list
-.Nd retrieving a list of character encodings supported by
-.Xr iconv 3
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In iconv.h
-.Ft int
-.Fn __iconv_get_list "char ***names" "size_t count" "bool paired"
-.Ft void
-.Fn __iconv_free_list "char **names" "size_t count"
-.Sh DESCRIPTION
-The
-.Fn __iconv_get_list
-function obtains a list of character encodings that are supported by the
-.Xr iconv 3
-call.
-The list of the encoding names will be stored in
-.Fa names
-and the number of the entries is stored in
-.Fa count .
-If the
-.Fa paired
-variable is true, the list will be arranged into
-canonical/alias name pairs.
-.Pp
-The
-.Fn __iconv_free_list
-function is to free the allocated memory during the call of
-.Fn __iconv_get_list .
-.Sh RETURN VALUES
-Upon successful completion
-.Fn __iconv_get_list
-returns 0 and set the
-.Fa names
-and
-.Fa count
-arguments.
-Otherwise, \-1 is returned and errno is set to indicate the error.
-.Sh SEE ALSO
-.Xr iconv 3 ,
-.Xr iconvlist 3
-.Sh STANDARDS
-The
-.Nm __iconv_get_list
-and
-.Nm __iconv_free_list
-functions are non-standard interfaces, which appeared in
-the implementation of the Citrus Project.
-The iconv implementation of the Citrus Project was adopted in
-.Fx 9 .
-.Sh AUTHORS
-This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
diff --git a/lib/libc_bsd/iconv/__iconv_get_list.c b/lib/libc_bsd/iconv/__iconv_get_list.c
deleted file mode 100644
index 52a98b9..0000000
--- a/lib/libc_bsd/iconv/__iconv_get_list.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/__iconv_get_list.c 258750 2013-11-29 19:44:30Z gjb $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-int
-__iconv_get_list(char ***a, size_t *b, __iconv_bool c)
-{
-	return __bsd___iconv_get_list(a, b, c);
-}
diff --git a/lib/libc_bsd/iconv/_strtol.h b/lib/libc_bsd/iconv/_strtol.h
deleted file mode 100644
index d684365..0000000
--- a/lib/libc_bsd/iconv/_strtol.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/_strtol.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: _strtol.h,v 1.2 2009/05/20 22:03:29 christos Exp $ */
-
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- * Original version ID:
- * NetBSD: src/lib/libc/locale/_wcstol.h,v 1.2 2003/08/07 16:43:03 agc Exp
- */
-
-/*
- * function template for strtol, strtoll and strtoimax.
- *
- * parameters:
- *	_FUNCNAME : function name
- *      __INT     : return type
- *      __INT_MIN : lower limit of the return type
- *      __INT_MAX : upper limit of the return type
- */
-
-__INT
-_FUNCNAME(const char *nptr, char **endptr, int base)
-{
-	const char *s;
-	__INT acc, cutoff;
-	unsigned char c;
-	int any, cutlim, i, neg;
-
-	/* check base value */
-	if (base && (base < 2 || base > 36)) {
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-		errno = EINVAL;
-		if (endptr != NULL)
-			/* LINTED interface specification */
-			*endptr = __DECONST(void *, nptr);
-		return (0);
-#else
-		panic("%s: invalid base %d", __func__, base);
-#endif
-	}
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace(c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = (c == '0' ? 8 : 10);
-
-	/*
-	 * Compute the cutoff value between legal numbers and illegal
-	 * numbers.  That is the largest legal value, divided by the
-	 * base.  An input number that is greater than this value, if
-	 * followed by a legal input character, is too big.  One that
-	 * is equal to this value may be valid or not; the limit
-	 * between valid and invalid numbers is then based on the last
-	 * digit.  For instance, if the range for longs is
-	 * [-2147483648..2147483647] and the input base is 10,
-	 * cutoff will be set to 214748364 and cutlim to either
-	 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
-	 * a value > 214748364, or equal but the next digit is > 7 (or 8),
-	 * the number is too big, and we will return a range error.
-	 *
-	 * Set any if any `digits' consumed; make it negative to indicate
-	 * overflow.
-	 */
-	cutoff = (neg ? __INT_MIN : __INT_MAX);
-	cutlim = (int)(cutoff % base);
-	cutoff /= base;
-	if (neg) {
-		if (cutlim > 0) {
-			cutlim -= base;
-			cutoff += 1;
-		}
-		cutlim = -cutlim;
-	}
-	for (acc = 0, any = 0;; c = *s++) {
-		if (isdigit(c))
-			i = c - '0';
-		else if (isalpha(c))
-			i = c - (isupper(c) ? 'A' - 10 : 'a' - 10);
-		else
-			break;
-		if (i >= base)
-			break;
-		if (any < 0)
-			continue;
-		if (neg) {
-			if (acc < cutoff || (acc == cutoff && i > cutlim)) {
-				acc = __INT_MIN;
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-				any = -1;
-				errno = ERANGE;
-#else
-				any = 0;
-				break;
-#endif
-			} else {
-				any = 1;
-				acc *= base;
-				acc -= i;
-			}
-		} else {
-			if (acc > cutoff || (acc == cutoff && i > cutlim)) {
-				acc = __INT_MAX;
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-				any = -1;
-				errno = ERANGE;
-#else
-				any = 0;
-				break;
-#endif
-			} else {
-				any = 1;
-				acc *= base;
-				acc += i;
-			}
-		}
-	}
-	if (endptr != NULL)
-		/* LINTED interface specification */
-		*endptr = __DECONST(void *, any ? s - 1 : nptr);
-	return(acc);
-}
diff --git a/lib/libc_bsd/iconv/_strtoul.h b/lib/libc_bsd/iconv/_strtoul.h
deleted file mode 100644
index d04a49f..0000000
--- a/lib/libc_bsd/iconv/_strtoul.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/_strtoul.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: _strtoul.h,v 1.1 2008/08/20 12:42:26 joerg Exp $ */
-
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- * Original version ID:
- * NetBSD: src/lib/libc/locale/_wcstoul.h,v 1.2 2003/08/07 16:43:03 agc Exp
- */
-
-/*
- * function template for strtoul, strtoull and strtoumax.
- *
- * parameters:
- *	_FUNCNAME  : function name
- *      __UINT     : return type
- *      __UINT_MAX : upper limit of the return type
- */
-
-__UINT
-_FUNCNAME(const char *nptr, char **endptr, int base)
-{
-	const char *s;
-	__UINT acc, cutoff;
-	unsigned char c;
-	int any, cutlim, i, neg;
-
-	/* check base value */
-	if (base && (base < 2 || base > 36)) {
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-		errno = EINVAL;
-		return (0);
-#else
-		panic("%s: invalid base %d", __func__, base);
-#endif
-	}
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace(c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = (c == '0' ? 8 : 10);
-
-	/*
-	 * See strtol for comments as to the logic used.
-	 */
-	cutoff = __UINT_MAX / (__UINT)base;
-	cutlim = (int)(__UINT_MAX % (__UINT)base);
-	for (acc = 0, any = 0;; c = *s++) {
-		if (isdigit(c))
-			i = c - '0';
-		else if (isalpha(c))
-			i = c - (isupper(c) ? 'A' - 10 : 'a' - 10);
-		else
-			break;
-		if (i >= base)
-			break;
-		if (any < 0)
-			continue;
-		if (acc > cutoff || (acc == cutoff && i > cutlim)) {
-			acc = __UINT_MAX;
-#if !defined(_KERNEL) && !defined(_STANDALONE)
-			any = -1;
-			errno = ERANGE;
-#else
-			any = 0;
-			break;
-#endif
-		} else {
-			any = 1;
-			acc *= (__UINT)base;
-			acc += i;
-		}
-	}
-	if (neg && any > 0)
-		acc = -acc;
-	if (endptr != NULL)
-		/* LINTED interface specification */
-		*endptr = __DECONST(void *, any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc_bsd/iconv/bsd_iconv.c b/lib/libc_bsd/iconv/bsd_iconv.c
deleted file mode 100644
index abfd792..0000000
--- a/lib/libc_bsd/iconv/bsd_iconv.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/bsd_iconv.c 282275 2015-04-30 16:08:47Z tijl $ */
-/* $NetBSD: iconv.c,v 1.11 2009/03/03 16:22:33 explorer Exp $ */
-
-/*-
- * Copyright (c) 2003 Citrus Project,
- * Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/queue.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <iconv.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_esdb.h"
-#include "citrus_hash.h"
-#include "citrus_iconv.h"
-
-#include "iconv-internal.h"
-
-#define ISBADF(_h_)	(!(_h_) || (_h_) == (iconv_t)-1)
-
-static iconv_t
-__bsd___iconv_open(const char *out, const char *in, struct _citrus_iconv *handle)
-{
-	const char *out_slashes;
-	char *out_noslashes;
-	int ret;
-
-	/*
-	 * Remove anything following a //, as these are options (like
-	 * //ignore, //translate, etc) and we just don't handle them.
-	 * This is for compatibility with software that uses these
-	 * blindly.
-	 */
-	out_slashes = strstr(out, "//");
-	if (out_slashes != NULL) {
-		out_noslashes = strndup(out, out_slashes - out);
-		if (out_noslashes == NULL) {
-			errno = ENOMEM;
-			return ((iconv_t)-1);
-		}
-		ret = _citrus_iconv_open(&handle, in, out_noslashes);
-		free(out_noslashes);
-	} else {
-		ret = _citrus_iconv_open(&handle, in, out);
-	}
-
-	if (ret) {
-		errno = ret == ENOENT ? EINVAL : ret;
-		return ((iconv_t)-1);
-	}
-
-	handle->cv_shared->ci_discard_ilseq = strcasestr(out, "//IGNORE");
-	handle->cv_shared->ci_ilseq_invalid = false;
-	handle->cv_shared->ci_hooks = NULL;
-
-	return ((iconv_t)(void *)handle);
-}
-
-iconv_t
-__bsd_iconv_open(const char *out, const char *in)
-{
-
-	return (__bsd___iconv_open(out, in, NULL));
-}
-
-int
-__bsd_iconv_open_into(const char *out, const char *in, iconv_allocation_t *ptr)
-{
-	struct _citrus_iconv *handle;
-
-	handle = (struct _citrus_iconv *)ptr;
-	return ((__bsd___iconv_open(out, in, handle) == (iconv_t)-1) ? -1 : 0);
-}
-
-int
-__bsd_iconv_close(iconv_t handle)
-{
-
-	if (ISBADF(handle)) {
-		errno = EBADF;
-		return (-1);
-	}
-
-	_citrus_iconv_close((struct _citrus_iconv *)(void *)handle);
-
-	return (0);
-}
-
-size_t
-__bsd_iconv(iconv_t handle, char **in, size_t *szin, char **out, size_t *szout)
-{
-	size_t ret;
-	int err;
-
-	if (ISBADF(handle)) {
-		errno = EBADF;
-		return ((size_t)-1);
-	}
-
-	err = _citrus_iconv_convert((struct _citrus_iconv *)(void *)handle,
-	    in, szin, out, szout, 0, &ret);
-	if (err) {
-		errno = err;
-		ret = (size_t)-1;
-	}
-
-	return (ret);
-}
-
-size_t
-__bsd___iconv(iconv_t handle, char **in, size_t *szin, char **out,
-    size_t *szout, uint32_t flags, size_t *invalids)
-{
-	size_t ret;
-	int err;
-
-	if (ISBADF(handle)) {
-		errno = EBADF;
-		return ((size_t)-1);
-	}
-
-	err = _citrus_iconv_convert((struct _citrus_iconv *)(void *)handle,
-	    in, szin, out, szout, flags, &ret);
-	if (invalids)
-		*invalids = ret;
-	if (err) {
-		errno = err;
-		ret = (size_t)-1;
-	}
-
-	return (ret);
-}
-
-int
-__bsd___iconv_get_list(char ***rlist, size_t *rsz, bool sorted)
-{
-	int ret;
-
-	ret = _citrus_esdb_get_list(rlist, rsz, sorted);
-	if (ret) {
-		errno = ret;
-		return (-1);
-	}
-
-	return (0);
-}
-
-void
-__bsd___iconv_free_list(char **list, size_t sz)
-{
-
-	_citrus_esdb_free_list(list, sz);
-}
-
-/*
- * GNU-compatibile non-standard interfaces.
- */
-static int
-qsort_helper(const void *first, const void *second)
-{
-	const char * const *s1;
-	const char * const *s2;
-
-	s1 = first;
-	s2 = second;
-	return (strcmp(*s1, *s2));
-}
-
-void
-__bsd_iconvlist(int (*do_one) (unsigned int, const char * const *,
-    void *), void *data)
-{
-	char **list, **names;
-	const char * const *np;
-	char *curitem, *curkey, *slashpos;
-	size_t sz;
-	unsigned int i, j;
-
-	i = 0;
-
-	if (__bsd___iconv_get_list(&list, &sz, true))
-		list = NULL;
-	qsort((void *)list, sz, sizeof(char *), qsort_helper);
-	while (i < sz) {
-		j = 0;
-		slashpos = strchr(list[i], '/');
-		curkey = (char *)malloc(slashpos - list[i] + 2);
-		names = (char **)malloc(sz * sizeof(char *));
-		if ((curkey == NULL) || (names == NULL)) {
-			__bsd___iconv_free_list(list, sz);
-			return;
-		}
-		strlcpy(curkey, list[i], slashpos - list[i] + 1);
-		names[j++] = curkey;
-		for (; (i < sz) && (memcmp(curkey, list[i], strlen(curkey)) == 0); i++) {
-			slashpos = strchr(list[i], '/');
-			curitem = (char *)malloc(strlen(slashpos) + 1);
-			if (curitem == NULL) {
-				__bsd___iconv_free_list(list, sz);
-				return;
-			}
-			strlcpy(curitem, &slashpos[1], strlen(slashpos) + 1);
-			if (strcmp(curkey, curitem) == 0) {
-				continue;
-			}
-			names[j++] = curitem;
-		}
-		np = (const char * const *)names;
-		do_one(j, np, data);
-		free(names);
-	}
-
-	__bsd___iconv_free_list(list, sz);
-}
-
-__inline const char *
-__bsd_iconv_canonicalize(const char *name)
-{
-
-	return (_citrus_iconv_canonicalize(name));
-}
-
-int
-__bsd_iconvctl(iconv_t cd, int request, void *argument)
-{
-	struct _citrus_iconv *cv;
-	struct iconv_hooks *hooks;
-	const char *convname;
-	char src[PATH_MAX], *dst;
-	int *i;
-
-	cv = (struct _citrus_iconv *)(void *)cd;
-	hooks = (struct iconv_hooks *)argument;
-	i = (int *)argument;
-
-	if (ISBADF(cd)) {
-		errno = EBADF;
-		return (-1);
-	}
-
-	switch (request) {
-	case ICONV_TRIVIALP:
-		convname = cv->cv_shared->ci_convname;
-		dst = strchr(convname, '/');
-
-		strlcpy(src, convname, dst - convname + 1);
-		dst++;
-		if ((convname == NULL) || (src == NULL) || (dst == NULL))
-			return (-1);
-		*i = strcmp(src, dst) == 0 ? 1 : 0;
-		return (0);
-	case ICONV_GET_TRANSLITERATE:
-		*i = 1;
-		return (0);
-	case ICONV_SET_TRANSLITERATE:
-		return  ((*i == 1) ? 0 : -1);
-	case ICONV_GET_DISCARD_ILSEQ:
-		*i = cv->cv_shared->ci_discard_ilseq ? 1 : 0;
-		return (0);
-	case ICONV_SET_DISCARD_ILSEQ:
-		cv->cv_shared->ci_discard_ilseq = *i;
-		return (0);
-	case ICONV_SET_HOOKS:
-		cv->cv_shared->ci_hooks = hooks;
-		return (0);
-	case ICONV_SET_FALLBACKS:
-		errno = EOPNOTSUPP;
-		return (-1);
-	case ICONV_GET_ILSEQ_INVALID:
-		*i = cv->cv_shared->ci_ilseq_invalid ? 1 : 0;
-		return (0);
-	case ICONV_SET_ILSEQ_INVALID:
-		cv->cv_shared->ci_ilseq_invalid = *i;
-		return (0);
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-void
-__bsd_iconv_set_relocation_prefix(const char *orig_prefix __unused,
-    const char *curr_prefix __unused)
-{
-
-}
diff --git a/lib/libc_bsd/iconv/citrus_aliasname_local.h b/lib/libc_bsd/iconv/citrus_aliasname_local.h
deleted file mode 100644
index 0444f90..0000000
--- a/lib/libc_bsd/iconv/citrus_aliasname_local.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_aliasname_local.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_aliasname_local.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_ALIASNAME_LOCAL_H_
-#define _CITRUS_ALIASNAME_LOCAL_H_
-
-static __inline const char *
-__unaliasname(const char *dbname, const char *alias,
-    void *buf, size_t bufsize)
-{
-
-	return (_lookup_simple(dbname, alias,
-	    buf, bufsize, _LOOKUP_CASE_SENSITIVE));
-}
-
-static __inline int
-__isforcemapping(const char *name)
-{
-
-	return (_bcs_strcasecmp("/force", name));
-}
-
-#endif /*_CITRUS_ALIASNAME_LOCAL_H_*/
diff --git a/lib/libc_bsd/iconv/citrus_bcs.c b/lib/libc_bsd/iconv/citrus_bcs.c
deleted file mode 100644
index a7ca399..0000000
--- a/lib/libc_bsd/iconv/citrus_bcs.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_bcs.c 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_bcs.c,v 1.5 2005/05/14 17:55:42 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-
-/*
- * case insensitive comparison between two C strings.
- */
-int
-_citrus_bcs_strcasecmp(const char * __restrict str1,
-    const char * __restrict str2)
-{
-	int c1, c2;
-
-	c1 = c2 = 1;
-
-	while (c1 && c2 && c1 == c2) {
-		c1 = _bcs_toupper(*str1++);
-		c2 = _bcs_toupper(*str2++);
-	}
-
-	return ((c1 == c2) ? 0 : ((c1 > c2) ? 1 : -1));
-}
-
-/*
- * case insensitive comparison between two C strings with limitation of length.
- */
-int
-_citrus_bcs_strncasecmp(const char * __restrict str1,
-    const char * __restrict str2, size_t sz)
-{
-	int c1, c2;
-
-	c1 = c2 = 1;
-
-	while (c1 && c2 && c1 == c2 && sz != 0) {
-		c1 = _bcs_toupper(*str1++);
-		c2 = _bcs_toupper(*str2++);
-		sz--;
-	}
-
-	return ((c1 == c2) ? 0 : ((c1 > c2) ? 1 : -1));
-}
-
-/*
- * skip white space characters.
- */
-const char *
-_citrus_bcs_skip_ws(const char *p)
-{
-
-	while (*p && _bcs_isspace(*p))
-		p++;
-
-	return (p);
-}
-
-/*
- * skip non white space characters.
- */
-const char *
-_citrus_bcs_skip_nonws(const char *p)
-{
-
-	while (*p && !_bcs_isspace(*p))
-		p++;
-
-	return (p);
-}
-
-/*
- * skip white space characters with limitation of length.
- */
-const char *
-_citrus_bcs_skip_ws_len(const char * __restrict p, size_t * __restrict len)
-{
-
-	while (*p && *len > 0 && _bcs_isspace(*p)) {
-		p++;
-		(*len)--;
-	}
-
-	return (p);
-}
-
-/*
- * skip non white space characters with limitation of length.
- */
-const char *
-_citrus_bcs_skip_nonws_len(const char * __restrict p, size_t * __restrict len)
-{
-
-	while (*p && *len > 0 && !_bcs_isspace(*p)) {
-		p++;
-		(*len)--;
-	}
-
-	return (p);
-}
-
-/*
- * truncate trailing white space characters.
- */
-void
-_citrus_bcs_trunc_rws_len(const char * __restrict p, size_t * __restrict len)
-{
-
-	while (*len > 0 && _bcs_isspace(p[*len - 1]))
-		(*len)--;
-}
-
-/*
- * destructive transliterate to lowercase.
- */
-void
-_citrus_bcs_convert_to_lower(char *s)
-{
-
-	while (*s) {
-		*s = _bcs_tolower(*s);
-		s++;
-	}
-}
-
-/*
- * destructive transliterate to uppercase.
- */
-void
-_citrus_bcs_convert_to_upper(char *s)
-{
-
-	while (*s) {
-		*s = _bcs_toupper(*s);
-		s++;
-	}
-}
diff --git a/lib/libc_bsd/iconv/citrus_bcs.h b/lib/libc_bsd/iconv/citrus_bcs.h
deleted file mode 100644
index 0b0d7ef..0000000
--- a/lib/libc_bsd/iconv/citrus_bcs.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_bcs.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_bcs.h,v 1.6 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/types.h>
-
-#ifndef _CITRUS_BCS_H_
-#define _CITRUS_BCS_H_
-
-/*
- * predicate/conversion for basic character set.
- *
- * `Basic character set' is a term defined in the ISO C standard.
- * Citrus bcs is, if anything, close to `portable character set'
- * defined in the POSIX.
- */
-
-#define _CITRUS_BCS_PRED(_name_, _cond_) \
-static __inline int _citrus_bcs_##_name_(uint8_t c) { return (_cond_); }
-
-/*
- * predicates.
- * Unlike predicates defined in ctype.h, these do not accept EOF.
- */
-_CITRUS_BCS_PRED(isblank, c == ' ' || c == '\t')
-_CITRUS_BCS_PRED(iseol, c == '\n' || c == '\r')
-_CITRUS_BCS_PRED(isspace, _citrus_bcs_isblank(c) || _citrus_bcs_iseol(c) ||
-    c == '\f' || c == '\v')
-_CITRUS_BCS_PRED(isdigit, c >= '0' && c <= '9')
-_CITRUS_BCS_PRED(isupper, c >= 'A' && c <= 'Z')
-_CITRUS_BCS_PRED(islower, c >= 'a' && c <= 'z')
-_CITRUS_BCS_PRED(isalpha, _citrus_bcs_isupper(c) || _citrus_bcs_islower(c))
-_CITRUS_BCS_PRED(isalnum, _citrus_bcs_isdigit(c) || _citrus_bcs_isalpha(c))
-_CITRUS_BCS_PRED(isxdigit, _citrus_bcs_isdigit(c) ||
-    (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-
-/*
- * transliterate between uppercase and lowercase.
- * Unlike transliterator defined in ctype.h, these do not accept EOF.
- */
-static __inline uint8_t
-_citrus_bcs_toupper(uint8_t c)
-{
-
-	return (_citrus_bcs_islower(c) ? (c - 'a' + 'A') : c);
-}
-
-static __inline uint8_t
-_citrus_bcs_tolower(uint8_t c)
-{
-
-	return (_citrus_bcs_isupper(c) ? (c - 'A' + 'a') : c);
-}
-
-__BEGIN_DECLS
-int		 _citrus_bcs_strcasecmp(const char * __restrict,
-		    const char * __restrict);
-int		 _citrus_bcs_strncasecmp(const char * __restrict,
-		    const char * __restrict, size_t);
-const char	*_citrus_bcs_skip_ws(const char * __restrict);
-const char	*_citrus_bcs_skip_nonws(const char * __restrict);
-const char	*_citrus_bcs_skip_ws_len(const char * __restrict,
-		    size_t * __restrict);
-const char	*_citrus_bcs_skip_nonws_len(const char * __restrict,
-		    size_t * __restrict);
-void		 _citrus_bcs_trunc_rws_len(const char * __restrict,
-		    size_t * __restrict);
-void		 _citrus_bcs_convert_to_lower(char *);
-void		 _citrus_bcs_convert_to_upper(char *);
-
-long int	 _citrus_bcs_strtol(const char * __restrict,
-		    char ** __restrict, int);
-unsigned long	 _citrus_bcs_strtoul(const char * __restrict,
-		    char ** __restrict, int);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_bcs_strtol.c b/lib/libc_bsd/iconv/citrus_bcs_strtol.c
deleted file mode 100644
index 86042f8..0000000
--- a/lib/libc_bsd/iconv/citrus_bcs_strtol.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_bcs_strtol.c 264497 2014-04-15 09:49:44Z tijl $ */
-/* $NetBSD: citrus_bcs_strtol.c,v 1.4 2013/04/26 21:20:47 joerg Exp $ */
-
-/*-
- * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
- * Copyright (c) 2003, 2008 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-
-#define	_FUNCNAME	_bcs_strtol
-#define	__INT		long int
-
-#undef isspace
-#define isspace(c)	_bcs_isspace(c)
-
-#undef isdigit
-#define isdigit(c)	_bcs_isdigit(c)
-
-#undef isalpha
-#define isalpha(c)	_bcs_isalpha(c)
-
-#undef isupper
-#define isupper(c)	_bcs_isupper(c)
-
-#include "_strtol.h"
diff --git a/lib/libc_bsd/iconv/citrus_bcs_strtoul.c b/lib/libc_bsd/iconv/citrus_bcs_strtoul.c
deleted file mode 100644
index d69d600..0000000
--- a/lib/libc_bsd/iconv/citrus_bcs_strtoul.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_bcs_strtoul.c 264497 2014-04-15 09:49:44Z tijl $ */
-/* $NetBSD: citrus_bcs_strtoul.c,v 1.5 2013/04/26 21:20:48 joerg Exp $ */
-
-/*-
- * Copyright (c) 2005 The DragonFly Project.  All rights reserved.
- * Copyright (c) 2003, 2008 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-
-#define	_FUNCNAME	_bcs_strtoul
-#define	__UINT		unsigned long int
-
-#undef isspace
-#define isspace(c)	_bcs_isspace(c)
-
-#undef isdigit
-#define isdigit(c)	_bcs_isdigit(c)
-
-#undef isalpha
-#define isalpha(c)	_bcs_isalpha(c)
-
-#undef isupper
-#define isupper(c)	_bcs_isupper(c)
-
-#include "_strtoul.h"
diff --git a/lib/libc_bsd/iconv/citrus_csmapper.c b/lib/libc_bsd/iconv/citrus_csmapper.c
deleted file mode 100644
index c860c76..0000000
--- a/lib/libc_bsd/iconv/citrus_csmapper.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_csmapper.c 264497 2014-04-15 09:49:44Z tijl $ */
-/*	$NetBSD: citrus_csmapper.c,v 1.11 2011/11/20 07:43:52 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/endian.h>
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_lock.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_module.h"
-#include "citrus_hash.h"
-#include "citrus_mapper.h"
-#include "citrus_csmapper.h"
-#include "citrus_pivot_file.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_lookup.h"
-
-static struct _citrus_mapper_area	*maparea = NULL;
-
-static pthread_rwlock_t			ma_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-#define CS_ALIAS	_PATH_CSMAPPER "/charset.alias"
-#define CS_PIVOT	_PATH_CSMAPPER "/charset.pivot"
-
-
-/* ---------------------------------------------------------------------- */
-
-static int
-get32(struct _region *r, uint32_t *rval)
-{
-
-	if (_region_size(r) != 4)
-		return (EFTYPE);
-
-	memcpy(rval, _region_head(r), (size_t)4);
-	*rval = be32toh(*rval);
-
-	return (0);
-}
-
-static int
-open_subdb(struct _citrus_db **subdb, struct _citrus_db *db, const char *src)
-{
-	struct _region r;
-	int ret;
-
-	ret = _db_lookup_by_s(db, src, &r, NULL);
-	if (ret)
-		return (ret);
-	ret = _db_open(subdb, &r, _CITRUS_PIVOT_SUB_MAGIC, _db_hash_std, NULL);
-	if (ret)
-		return (ret);
-
-	return (0);
-}
-
-
-#define NO_SUCH_FILE	EOPNOTSUPP
-static int
-find_best_pivot_pvdb(const char *src, const char *dst, char *pivot,
-    size_t pvlen, unsigned long *rnorm)
-{
-	struct _citrus_db *db1, *db2, *db3;
-	struct _region fr, r1, r2;
-	char buf[LINE_MAX];
-	uint32_t val32;
-	unsigned long norm;
-	int i, num, ret;
-
-	ret = _map_file(&fr, CS_PIVOT ".pvdb");
-	if (ret) {
-		if (ret == ENOENT)
-			ret = NO_SUCH_FILE;
-		return (ret);
-	}
-	ret = _db_open(&db1, &fr, _CITRUS_PIVOT_MAGIC, _db_hash_std, NULL);
-	if (ret)
-		goto quit1;
-	ret = open_subdb(&db2, db1, src);
-	if (ret)
-		goto quit2;
-
-	num = _db_get_num_entries(db2);
-	*rnorm = ULONG_MAX;
-	for (i = 0; i < num; i++) {
-		/* iterate each pivot */
-		ret = _db_get_entry(db2, i, &r1, &r2);
-		if (ret)
-			goto quit3;
-		/* r1:pivot name, r2:norm among src and pivot */
-		ret = get32(&r2, &val32);
-		if (ret)
-			goto quit3;
-		norm = val32;
-		snprintf(buf, sizeof(buf), "%.*s",
-			 (int)_region_size(&r1), (char *)_region_head(&r1));
-		/* buf: pivot name */
-		ret = open_subdb(&db3, db1, buf);
-		if (ret)
-			goto quit3;
-		if (_db_lookup_by_s(db3, dst, &r2, NULL) != 0)
-			/* don't break the loop, test all src/dst pairs. */
-			goto quit4;
-		/* r2: norm among pivot and dst */
-		ret = get32(&r2, &val32);
-		if (ret)
-			goto quit4;
-		norm += val32;
-		/* judge minimum norm */
-		if (norm < *rnorm) {
-			*rnorm = norm;
-			strlcpy(pivot, buf, pvlen);
-		}
-quit4:
-		_db_close(db3);
-		if (ret)
-			goto quit3;
-	}
-quit3:
-	_db_close(db2);
-quit2:
-	_db_close(db1);
-quit1:
-	_unmap_file(&fr);
-	if (ret)
-		return (ret);
-
-	if (*rnorm == ULONG_MAX)
-		return (ENOENT);
-
-	return (0);
-}
-
-/* ---------------------------------------------------------------------- */
-
-struct zone {
-	const char *begin, *end;
-};
-
-struct parse_arg {
-	char dst[PATH_MAX];
-	unsigned long norm;
-};
-
-static int
-parse_line(struct parse_arg *pa, struct _region *r)
-{
-	struct zone z1, z2;
-	char buf[20];
-	size_t len;
-
-	len = _region_size(r);
-	z1.begin = _bcs_skip_ws_len(_region_head(r), &len);
-	if (len == 0)
-		return (EFTYPE);
-	z1.end = _bcs_skip_nonws_len(z1.begin, &len);
-	if (len == 0)
-		return (EFTYPE);
-	z2.begin = _bcs_skip_ws_len(z1.end, &len);
-	if (len == 0)
-		return (EFTYPE);
-	z2.end = _bcs_skip_nonws_len(z2.begin, &len);
-
-	/* z1 : dst name, z2 : norm */
-	snprintf(pa->dst, sizeof(pa->dst),
-	    "%.*s", (int)(z1.end-z1.begin), z1.begin);
-	snprintf(buf, sizeof(buf),
-	    "%.*s", (int)(z2.end-z2.begin), z2.begin);
-	pa->norm = _bcs_strtoul(buf, NULL, 0);
-
-	return (0);
-}
-
-static int
-find_dst(struct parse_arg *pasrc, const char *dst)
-{
-	struct _lookup *cl;
-	struct parse_arg padst;
-	struct _region data;
-	int ret;
-
-	ret = _lookup_seq_open(&cl, CS_PIVOT, _LOOKUP_CASE_IGNORE);
-	if (ret)
-		return (ret);
-
-	ret = _lookup_seq_lookup(cl, pasrc->dst, &data);
-	while (ret == 0) {
-		ret = parse_line(&padst, &data);
-		if (ret)
-			break;
-		if (strcmp(dst, padst.dst) == 0) {
-			pasrc->norm += padst.norm;
-			break;
-		}
-		ret = _lookup_seq_next(cl, NULL, &data);
-	}
-	_lookup_seq_close(cl);
-
-	return (ret);
-}
-
-static int
-find_best_pivot_lookup(const char *src, const char *dst, char *pivot,
-    size_t pvlen, unsigned long *rnorm)
-{
-	struct _lookup *cl;
-	struct _region data;
-	struct parse_arg pa;
-	char pivot_min[PATH_MAX];
-	unsigned long norm_min;
-	int ret;
-
-	ret = _lookup_seq_open(&cl, CS_PIVOT, _LOOKUP_CASE_IGNORE);
-	if (ret)
-		return (ret);
-
-	norm_min = ULONG_MAX;
-
-	/* find pivot code */
-	ret = _lookup_seq_lookup(cl, src, &data);
-	while (ret == 0) {
-		ret = parse_line(&pa, &data);
-		if (ret)
-			break;
-		ret = find_dst(&pa, dst);
-		if (ret)
-			break;
-		if (pa.norm < norm_min) {
-			norm_min = pa.norm;
-			strlcpy(pivot_min, pa.dst, sizeof(pivot_min));
-		}
-		ret = _lookup_seq_next(cl, NULL, &data);
-	}
-	_lookup_seq_close(cl);
-
-	if (ret != ENOENT)
-		return (ret);
-	if (norm_min == ULONG_MAX)
-		return (ENOENT);
-	strlcpy(pivot, pivot_min, pvlen);
-	if (rnorm)
-		*rnorm = norm_min;
-
-	return (0);
-}
-
-static int
-find_best_pivot(const char *src, const char *dst, char *pivot, size_t pvlen,
-    unsigned long *rnorm)
-{
-	int ret;
-
-	ret = find_best_pivot_pvdb(src, dst, pivot, pvlen, rnorm);
-	if (ret == NO_SUCH_FILE)
-		ret = find_best_pivot_lookup(src, dst, pivot, pvlen, rnorm);
-
-	return (ret);
-}
-
-static __inline int
-open_serial_mapper(struct _citrus_mapper_area *__restrict ma,
-    struct _citrus_mapper * __restrict * __restrict rcm,
-    const char *src, const char *pivot, const char *dst)
-{
-	char buf[PATH_MAX];
-
-	snprintf(buf, sizeof(buf), "%s/%s,%s/%s", src, pivot, pivot, dst);
-
-	return (_mapper_open_direct(ma, rcm, "mapper_serial", buf));
-}
-
-static struct _citrus_csmapper *csm_none = NULL;
-static int
-get_none(struct _citrus_mapper_area *__restrict ma,
-    struct _citrus_csmapper *__restrict *__restrict rcsm)
-{
-	int ret;
-
-	WLOCK(&ma_lock);
-	if (csm_none) {
-		*rcsm = csm_none;
-		ret = 0;
-		goto quit;
-	}
-
-	ret = _mapper_open_direct(ma, &csm_none, "mapper_none", "");
-	if (ret)
-		goto quit;
-	_mapper_set_persistent(csm_none);
-
-	*rcsm = csm_none;
-	ret = 0;
-quit:
-	UNLOCK(&ma_lock);
-	return (ret);
-}
-
-int
-_citrus_csmapper_open(struct _citrus_csmapper * __restrict * __restrict rcsm,
-    const char * __restrict src, const char * __restrict dst, uint32_t flags,
-    unsigned long *rnorm)
-{
-	const char *realsrc, *realdst;
-	char buf1[PATH_MAX], buf2[PATH_MAX], key[PATH_MAX], pivot[PATH_MAX];
-	unsigned long norm;
-	int ret;
-
-	norm = 0;
-
-	ret = _citrus_mapper_create_area(&maparea, _PATH_CSMAPPER);
-	if (ret)
-		return (ret);
-
-	realsrc = _lookup_alias(CS_ALIAS, src, buf1, sizeof(buf1),
-	    _LOOKUP_CASE_IGNORE);
-	realdst = _lookup_alias(CS_ALIAS, dst, buf2, sizeof(buf2),
-	    _LOOKUP_CASE_IGNORE);
-	if (!strcmp(realsrc, realdst)) {
-		ret = get_none(maparea, rcsm);
-		if (ret == 0 && rnorm != NULL)
-			*rnorm = 0;
-		return (ret);
-	}
-
-	snprintf(key, sizeof(key), "%s/%s", realsrc, realdst);
-
-	ret = _mapper_open(maparea, rcsm, key);
-	if (ret == 0) {
-		if (rnorm != NULL)
-			*rnorm = 0;
-		return (0);
-	}
-	if (ret != ENOENT || (flags & _CSMAPPER_F_PREVENT_PIVOT)!=0)
-		return (ret);
-
-	ret = find_best_pivot(realsrc, realdst, pivot, sizeof(pivot), &norm);
-	if (ret)
-		return (ret);
-
-	ret = open_serial_mapper(maparea, rcsm, realsrc, pivot, realdst);
-	if (ret == 0 && rnorm != NULL)
-		*rnorm = norm;
-
-	return (ret);
-}
diff --git a/lib/libc_bsd/iconv/citrus_csmapper.h b/lib/libc_bsd/iconv/citrus_csmapper.h
deleted file mode 100644
index c7402ab..0000000
--- a/lib/libc_bsd/iconv/citrus_csmapper.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_csmapper.h 264497 2014-04-15 09:49:44Z tijl $ */
-/*	$NetBSD: citrus_csmapper.h,v 1.3 2013/06/24 17:28:35 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_CSMAPPER_H_
-#define _CITRUS_CSMAPPER_H_
-
-#define _citrus_csmapper		_citrus_mapper
-#define _citrus_csmapper_close		_citrus_mapper_close
-#define _citrus_csmapper_convert	_citrus_mapper_convert
-#define _citrus_csmapper_init_state	_citrus_mapper_init_state
-#define _citrus_csmapper_get_state_size	_citrus_mapper_get_state_size
-#define _citrus_csmapper_get_src_max	_citrus_mapper_get_src_max
-#define _citrus_csmapper_get_dst_max	_citrus_mapper_get_dst_max
-
-#define _CITRUS_CSMAPPER_F_PREVENT_PIVOT	0x00000001
-__BEGIN_DECLS
-int	 _citrus_csmapper_open(struct _citrus_csmapper *__restrict *__restrict,
-	    const char *__restrict, const char *__restrict, uint32_t,
-	    unsigned long *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_db.c b/lib/libc_bsd/iconv/citrus_db.c
deleted file mode 100644
index 8d46f4e..0000000
--- a/lib/libc_bsd/iconv/citrus_db.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_db.c 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_db.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/endian.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_db.h"
-#include "citrus_db_factory.h"
-#include "citrus_db_file.h"
-
-struct _citrus_db {
-	struct _region		 db_region;
-	_citrus_db_hash_func_t	 db_hashfunc;
-	void			*db_hashfunc_closure;
-};
-
-int
-_citrus_db_open(struct _citrus_db **rdb, struct _region *r, const char *magic,
-    _citrus_db_hash_func_t hashfunc, void *hashfunc_closure)
-{
-	struct _citrus_db *db;
-	struct _citrus_db_header_x *dhx;
-	struct _memstream ms;
-
-	_memstream_bind(&ms, r);
-
-	/* sanity check */
-	dhx = _memstream_getregion(&ms, NULL, sizeof(*dhx));
-	if (dhx == NULL)
-		return (EFTYPE);
-	if (strncmp(dhx->dhx_magic, magic, _CITRUS_DB_MAGIC_SIZE) != 0)
-		return (EFTYPE);
-	if (_memstream_seek(&ms, be32toh(dhx->dhx_entry_offset), SEEK_SET))
-		return (EFTYPE);
-
-	if (be32toh(dhx->dhx_num_entries)*_CITRUS_DB_ENTRY_SIZE >
-	    _memstream_remainder(&ms))
-		return (EFTYPE);
-
-	db = malloc(sizeof(*db));
-	if (db == NULL)
-		return (errno);
-	db->db_region = *r;
-	db->db_hashfunc = hashfunc;
-	db->db_hashfunc_closure = hashfunc_closure;
-	*rdb = db;
-
-	return (0);
-}
-
-void
-_citrus_db_close(struct _citrus_db *db)
-{
-
-	free(db);
-}
-
-int
-_citrus_db_lookup(struct _citrus_db *db, struct _citrus_region *key,
-    struct _citrus_region *data, struct _citrus_db_locator *dl)
-{
-	struct _citrus_db_entry_x *dex;
-	struct _citrus_db_header_x *dhx;
-	struct _citrus_region r;
-	struct _memstream ms;
-	uint32_t hashval, num_entries;
-	size_t offset;
-
-	_memstream_bind(&ms, &db->db_region);
-
-	dhx = _memstream_getregion(&ms, NULL, sizeof(*dhx));
-	num_entries = be32toh(dhx->dhx_num_entries);
-	if (num_entries == 0)
-		return (ENOENT);
-
-	if (dl != NULL && dl->dl_offset>0) {
-		hashval = dl->dl_hashval;
-		offset = dl->dl_offset;
-		if (offset >= _region_size(&db->db_region))
-			return (ENOENT);
-	} else {
-		hashval = db->db_hashfunc(key)%num_entries;
-		offset = be32toh(dhx->dhx_entry_offset) +
-		    hashval * _CITRUS_DB_ENTRY_SIZE;
-		if (dl)
-			dl->dl_hashval = hashval;
-	}
-	do {
-		/* seek to the next entry */
-		if (_citrus_memory_stream_seek(&ms, offset, SEEK_SET))
-			return (EFTYPE);
-		/* get the entry record */
-		dex = _memstream_getregion(&ms, NULL, _CITRUS_DB_ENTRY_SIZE);
-		if (dex == NULL)
-			return (EFTYPE);
-
-		/* jump to next entry having the same hash value. */
-		offset = be32toh(dex->dex_next_offset);
-
-		/* save the current position */
-		if (dl) {
-			dl->dl_offset = offset;
-			if (offset == 0)
-				dl->dl_offset = _region_size(&db->db_region);
-		}
-
-		/* compare hash value. */
-		if (be32toh(dex->dex_hash_value) != hashval)
-			/* not found */
-			break;
-		/* compare key length */
-		if (be32toh(dex->dex_key_size) == _region_size(key)) {
-			/* seek to the head of the key. */
-			if (_memstream_seek(&ms, be32toh(dex->dex_key_offset),
-			    SEEK_SET))
-				return (EFTYPE);
-			/* get the region of the key */
-			if (_memstream_getregion(&ms, &r,
-			    _region_size(key)) == NULL)
-				return (EFTYPE);
-			/* compare key byte stream */
-			if (memcmp(_region_head(&r), _region_head(key),
-			    _region_size(key)) == 0) {
-				/* match */
-				if (_memstream_seek(
-				    &ms, be32toh(dex->dex_data_offset),
-				    SEEK_SET))
-					return (EFTYPE);
-				if (_memstream_getregion(
-				    &ms, data,
-				    be32toh(dex->dex_data_size)) == NULL)
-					return (EFTYPE);
-				return (0);
-			}
-		}
-	} while (offset != 0);
-
-	return (ENOENT);
-}
-
-int
-_citrus_db_lookup_by_string(struct _citrus_db *db, const char *key,
-    struct _citrus_region *data, struct _citrus_db_locator *dl)
-{
-	struct _region r;
-
-	_region_init(&r, __DECONST(void *, key), strlen(key));
-
-	return (_citrus_db_lookup(db, &r, data, dl));
-}
-
-int
-_citrus_db_lookup8_by_string(struct _citrus_db *db, const char *key,
-    uint8_t *rval, struct _citrus_db_locator *dl)
-{
-	struct _region r;
-	int ret;
-
-	ret = _citrus_db_lookup_by_string(db, key, &r, dl);
-	if (ret)
-		return (ret);
-
-	if (_region_size(&r) != 1)
-		return (EFTYPE);
-
-	if (rval)
-		memcpy(rval, _region_head(&r), 1);
-
-	return (0);
-}
-
-int
-_citrus_db_lookup16_by_string(struct _citrus_db *db, const char *key,
-    uint16_t *rval, struct _citrus_db_locator *dl)
-{
-	struct _region r;
-	int ret;
-	uint16_t val;
-
-	ret = _citrus_db_lookup_by_string(db, key, &r, dl);
-	if (ret)
-		return (ret);
-
-	if (_region_size(&r) != 2)
-		return (EFTYPE);
-
-	if (rval) {
-		memcpy(&val, _region_head(&r), 2);
-		*rval = be16toh(val);
-	}
-
-	return (0);
-}
-
-int
-_citrus_db_lookup32_by_string(struct _citrus_db *db, const char *key,
-    uint32_t *rval, struct _citrus_db_locator *dl)
-{
-	struct _region r;
-	uint32_t val;
-	int ret;
-
-	ret = _citrus_db_lookup_by_string(db, key, &r, dl);
-	if (ret)
-		return (ret);
-
-	if (_region_size(&r) != 4)
-		return (EFTYPE);
-
-	if (rval) {
-		memcpy(&val, _region_head(&r), 4);
-		*rval = be32toh(val);
-	}
-
-	return (0);
-}
-
-int
-_citrus_db_lookup_string_by_string(struct _citrus_db *db, const char *key,
-    const char **rdata, struct _citrus_db_locator *dl)
-{
-	struct _region r;
-	int ret;
-
-	ret = _citrus_db_lookup_by_string(db, key, &r, dl);
-	if (ret)
-		return (ret);
-
-	/* check whether the string is null terminated */
-	if (_region_size(&r) == 0)
-		return (EFTYPE);
-	if (*((const char*)_region_head(&r)+_region_size(&r)-1) != '\0')
-		return (EFTYPE);
-
-	if (rdata)
-		*rdata = _region_head(&r);
-
-	return (0);
-}
-
-int
-_citrus_db_get_number_of_entries(struct _citrus_db *db)
-{
-	struct _citrus_db_header_x *dhx;
-	struct _memstream ms;
-
-	_memstream_bind(&ms, &db->db_region);
-
-	dhx = _memstream_getregion(&ms, NULL, sizeof(*dhx));
-	return ((int)be32toh(dhx->dhx_num_entries));
-}
-
-int
-_citrus_db_get_entry(struct _citrus_db *db, int idx, struct _region *key,
-    struct _region *data)
-{
-	struct _citrus_db_entry_x *dex;
-	struct _citrus_db_header_x *dhx;
-	struct _memstream ms;
-	uint32_t num_entries;
-	size_t offset;
-
-	_memstream_bind(&ms, &db->db_region);
-
-	dhx = _memstream_getregion(&ms, NULL, sizeof(*dhx));
-	num_entries = be32toh(dhx->dhx_num_entries);
-	if (idx < 0 || (uint32_t)idx >= num_entries)
-		return (EINVAL);
-
-	/* seek to the next entry */
-	offset = be32toh(dhx->dhx_entry_offset) + idx * _CITRUS_DB_ENTRY_SIZE;
-	if (_citrus_memory_stream_seek(&ms, offset, SEEK_SET))
-		return (EFTYPE);
-	/* get the entry record */
-	dex = _memstream_getregion(&ms, NULL, _CITRUS_DB_ENTRY_SIZE);
-	if (dex == NULL)
-		return (EFTYPE);
-	/* seek to the head of the key. */
-	if (_memstream_seek(&ms, be32toh(dex->dex_key_offset), SEEK_SET))
-		return (EFTYPE);
-	/* get the region of the key. */
-	if (_memstream_getregion(&ms, key, be32toh(dex->dex_key_size))==NULL)
-		return (EFTYPE);
-	/* seek to the head of the data. */
-	if (_memstream_seek(&ms, be32toh(dex->dex_data_offset), SEEK_SET))
-		return (EFTYPE);
-	/* get the region of the data. */
-	if (_memstream_getregion(&ms, data, be32toh(dex->dex_data_size))==NULL)
-		return (EFTYPE);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/iconv/citrus_db.h b/lib/libc_bsd/iconv/citrus_db.h
deleted file mode 100644
index d713afe..0000000
--- a/lib/libc_bsd/iconv/citrus_db.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_db.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_db.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_DB_H_
-#define _CITRUS_DB_H_
-
-#include "citrus_db_factory.h"
-
-struct _citrus_db;
-struct _citrus_db_locator {
-	uint32_t	dl_hashval;
-	size_t		dl_offset;
-};
-
-__BEGIN_DECLS
-int	 _citrus_db_open(struct _citrus_db **, struct _citrus_region *,
-	    const char *, _citrus_db_hash_func_t, void *);
-void	 _citrus_db_close(struct _citrus_db *);
-int	 _citrus_db_lookup(struct _citrus_db *, struct _citrus_region *,
-	    struct _citrus_region *, struct _citrus_db_locator *);
-int	 _citrus_db_lookup_by_string(struct _citrus_db *, const char *,
-	    struct _citrus_region *, struct _citrus_db_locator *);
-int	 _citrus_db_lookup8_by_string(struct _citrus_db *, const char *,
-	    uint8_t *, struct _citrus_db_locator *);
-int	 _citrus_db_lookup16_by_string(struct _citrus_db *, const char *,
-	    uint16_t *, struct _citrus_db_locator *);
-int	 _citrus_db_lookup32_by_string(struct _citrus_db *, const char *,
-	    uint32_t *, struct _citrus_db_locator *);
-int	 _citrus_db_lookup_string_by_string(struct _citrus_db *, const char *,
-	    const char **, struct _citrus_db_locator *);
-int	 _citrus_db_get_number_of_entries(struct _citrus_db *);
-int	 _citrus_db_get_entry(struct _citrus_db *, int,
-	    struct _citrus_region *, struct _citrus_region *);
-__END_DECLS
-
-static __inline void
-_citrus_db_locator_init(struct _citrus_db_locator *dl)
-{
-
-	dl->dl_hashval = 0;
-	dl->dl_offset = 0;
-}
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_db_factory.c b/lib/libc_bsd/iconv/citrus_db_factory.c
deleted file mode 100644
index 752fadb..0000000
--- a/lib/libc_bsd/iconv/citrus_db_factory.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_db_factory.c 267665 2014-06-20 07:32:03Z tijl $ */
-/*	$NetBSD: citrus_db_factory.c,v 1.10 2013/09/14 13:05:51 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include <arpa/inet.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_db_file.h"
-#include "citrus_db_factory.h"
-
-struct _citrus_db_factory_entry {
-	STAILQ_ENTRY(_citrus_db_factory_entry)	 de_entry;
-	struct _citrus_db_factory_entry		*de_next;
-	uint32_t				 de_hashvalue;
-	struct _region				 de_key;
-	int					 de_key_free;
-	struct _region				 de_data;
-	int					 de_data_free;
-	int					de_idx;
-};
-
-struct _citrus_db_factory {
-	size_t					 df_num_entries;
-	STAILQ_HEAD(, _citrus_db_factory_entry)	 df_entries;
-	size_t					 df_total_key_size;
-	size_t					 df_total_data_size;
-	uint32_t (*df_hashfunc)(struct _citrus_region *);
-	void					*df_hashfunc_closure;
-};
-
-#define DB_ALIGN 16
-
-int
-_citrus_db_factory_create(struct _citrus_db_factory **rdf,
-    _citrus_db_hash_func_t hashfunc, void *hashfunc_closure)
-{
-	struct _citrus_db_factory *df;
-
-	df = malloc(sizeof(*df));
-	if (df == NULL)
-		return (errno);
-	df->df_num_entries = 0;
-	df->df_total_key_size = df->df_total_data_size = 0;
-	STAILQ_INIT(&df->df_entries);
-	df->df_hashfunc = hashfunc;
-	df->df_hashfunc_closure = hashfunc_closure;
-
-	*rdf = df;
-
-	return (0);
-}
-
-void
-_citrus_db_factory_free(struct _citrus_db_factory *df)
-{
-	struct _citrus_db_factory_entry *de;
-
-	while ((de = STAILQ_FIRST(&df->df_entries)) != NULL) {
-		STAILQ_REMOVE_HEAD(&df->df_entries, de_entry);
-		if (de->de_key_free)
-			free(_region_head(&de->de_key));
-		if (de->de_data_free)
-			free(_region_head(&de->de_data));
-		free(de);
-	}
-	free(df);
-}
-
-static __inline size_t
-ceilto(size_t sz)
-{
-	return ((sz + DB_ALIGN - 1) & ~(DB_ALIGN - 1));
-}
-
-int
-_citrus_db_factory_add(struct _citrus_db_factory *df, struct _region *key,
-    int keyfree, struct _region *data, int datafree)
-{
-	struct _citrus_db_factory_entry *de;
-
-	de = malloc(sizeof(*de));
-	if (de == NULL)
-		return (-1);
-
-	de->de_hashvalue = df->df_hashfunc(key);
-	de->de_key = *key;
-	de->de_key_free = keyfree;
-	de->de_data = *data;
-	de->de_data_free = datafree;
-	de->de_idx = -1;
-
-	STAILQ_INSERT_TAIL(&df->df_entries, de, de_entry);
-	df->df_total_key_size += _region_size(key);
-	df->df_total_data_size += ceilto(_region_size(data));
-	df->df_num_entries++;
-
-	return (0);
-
-}
-
-int
-_citrus_db_factory_add_by_string(struct _citrus_db_factory *df,
-    const char *key, struct _citrus_region *data, int datafree)
-{
-	struct _region r;
-	char *tmp;
-
-	tmp = strdup(key);
-	if (tmp == NULL)
-		return (errno);
-	_region_init(&r, tmp, strlen(key));
-	return _citrus_db_factory_add(df, &r, 1, data, datafree);
-}
-
-int
-_citrus_db_factory_add8_by_string(struct _citrus_db_factory *df,
-    const char *key, uint8_t val)
-{
-	struct _region r;
-	uint8_t *p;
-
-	p = malloc(sizeof(*p));
-	if (p == NULL)
-		return (errno);
-	*p = val;
-	_region_init(&r, p, 1);
-	return (_citrus_db_factory_add_by_string(df, key, &r, 1));
-}
-
-int
-_citrus_db_factory_add16_by_string(struct _citrus_db_factory *df,
-    const char *key, uint16_t val)
-{
-	struct _region r;
-	uint16_t *p;
-
-	p = malloc(sizeof(*p));
-	if (p == NULL)
-		return (errno);
-	*p = htons(val);
-	_region_init(&r, p, 2);
-	return (_citrus_db_factory_add_by_string(df, key, &r, 1));
-}
-
-int
-_citrus_db_factory_add32_by_string(struct _citrus_db_factory *df,
-    const char *key, uint32_t val)
-{
-	struct _region r;
-	uint32_t *p;
-
-	p = malloc(sizeof(*p));
-	if (p == NULL)
-		return (errno);
-	*p = htonl(val);
-	_region_init(&r, p, 4);
-	return (_citrus_db_factory_add_by_string(df, key, &r, 1));
-}
-
-int
-_citrus_db_factory_add_string_by_string(struct _citrus_db_factory *df,
-    const char *key, const char *data)
-{
-	char *p;
-	struct _region r;
-
-	p = strdup(data);
-	if (p == NULL)
-		return (errno);
-	_region_init(&r, p, strlen(p) + 1);
-	return (_citrus_db_factory_add_by_string(df, key, &r, 1));
-}
-
-size_t
-_citrus_db_factory_calc_size(struct _citrus_db_factory *df)
-{
-	size_t sz;
-
-	sz = ceilto(_CITRUS_DB_HEADER_SIZE);
-	sz += ceilto(_CITRUS_DB_ENTRY_SIZE * df->df_num_entries);
-	sz += ceilto(df->df_total_key_size);
-	sz += df->df_total_data_size;
-
-	return (sz);
-}
-
-static __inline void
-put8(struct _region *r, size_t *rofs, uint8_t val)
-{
-
-	*(uint8_t *)_region_offset(r, *rofs) = val;
-	*rofs += 1;
-}
-
-static __inline void
-put32(struct _region *r, size_t *rofs, uint32_t val)
-{
-
-	val = htonl(val);
-	memcpy(_region_offset(r, *rofs), &val, 4);
-	*rofs += 4;
-}
-
-static __inline void
-putpad(struct _region *r, size_t *rofs)
-{
-	size_t i;
-
-	for (i = ceilto(*rofs) - *rofs; i > 0; i--)
-		put8(r, rofs, 0);
-}
-
-static __inline void
-dump_header(struct _region *r, const char *magic, size_t *rofs,
-    size_t num_entries)
-{
-
-	while (*rofs<_CITRUS_DB_MAGIC_SIZE)
-		put8(r, rofs, *magic++);
-	put32(r, rofs, num_entries);
-	put32(r, rofs, _CITRUS_DB_HEADER_SIZE);
-}
-
-int
-_citrus_db_factory_serialize(struct _citrus_db_factory *df, const char *magic,
-    struct _region *r)
-{
-	struct _citrus_db_factory_entry *de, **depp, *det;
-	size_t dataofs, i, keyofs, nextofs, ofs;
-
-	ofs = 0;
-	/* check whether more than 0 entries exist */
-	if (df->df_num_entries == 0) {
-		dump_header(r, magic, &ofs, 0);
-		return (0);
-	}
-	/* allocate hash table */
-	depp = calloc(df->df_num_entries, sizeof(*depp));
-	if (depp == NULL)
-		return (-1);
-
-	/* step1: store the entries which are not conflicting */
-	STAILQ_FOREACH(de, &df->df_entries, de_entry) {
-		de->de_hashvalue %= df->df_num_entries;
-		de->de_idx = -1;
-		de->de_next = NULL;
-		if (depp[de->de_hashvalue] == NULL) {
-			depp[de->de_hashvalue] = de;
-			de->de_idx = (int)de->de_hashvalue;
-		}
-	}
-
-	/* step2: resolve conflicts */
-	i = 0;
-	STAILQ_FOREACH(de, &df->df_entries, de_entry) {
-		if (de->de_idx == -1) {
-			det = depp[de->de_hashvalue];
-			while (det->de_next != NULL)
-				det = det->de_next;
-			det->de_next = de;
-			while (depp[i] != NULL)
-				i++;
-			depp[i] = de;
-			de->de_idx = (int)i;
-		}
-	}
-
-	keyofs = _CITRUS_DB_HEADER_SIZE +
-	    ceilto(df->df_num_entries*_CITRUS_DB_ENTRY_SIZE);
-	dataofs = keyofs + ceilto(df->df_total_key_size);
-
-	/* dump header */
-	dump_header(r, magic, &ofs, df->df_num_entries);
-
-	/* dump entries */
-	for (i = 0; i < df->df_num_entries; i++) {
-		de = depp[i];
-		nextofs = 0;
-		if (de->de_next) {
-			nextofs = _CITRUS_DB_HEADER_SIZE +
-			    de->de_next->de_idx * _CITRUS_DB_ENTRY_SIZE;
-		}
-		put32(r, &ofs, de->de_hashvalue);
-		put32(r, &ofs, nextofs);
-		put32(r, &ofs, keyofs);
-		put32(r, &ofs, _region_size(&de->de_key));
-		put32(r, &ofs, dataofs);
-		put32(r, &ofs, _region_size(&de->de_data));
-		memcpy(_region_offset(r, keyofs),
-		    _region_head(&de->de_key), _region_size(&de->de_key));
-		keyofs += _region_size(&de->de_key);
-		memcpy(_region_offset(r, dataofs),
-		    _region_head(&de->de_data), _region_size(&de->de_data));
-		dataofs += _region_size(&de->de_data);
-		putpad(r, &dataofs);
-	}
-	putpad(r, &ofs);
-	putpad(r, &keyofs);
-	free(depp);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/iconv/citrus_db_factory.h b/lib/libc_bsd/iconv/citrus_db_factory.h
deleted file mode 100644
index 4e52eae..0000000
--- a/lib/libc_bsd/iconv/citrus_db_factory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_db_factory.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_db_factory.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_DB_FACTORY_H_
-#define _CITRUS_DB_FACTORY_H_
-
-struct _citrus_db_factory;
-typedef uint32_t (*_citrus_db_hash_func_t)(struct _citrus_region *);
-
-__BEGIN_DECLS
-int	 _citrus_db_factory_create(struct _citrus_db_factory **,
-	    _citrus_db_hash_func_t, void *);
-void	 _citrus_db_factory_free(struct _citrus_db_factory *);
-int	 _citrus_db_factory_add(struct _citrus_db_factory *,
-	    struct _citrus_region *, int, struct _citrus_region *, int);
-int	 _citrus_db_factory_add_by_string(struct _citrus_db_factory *,
-	    const char *, struct _citrus_region *, int);
-int	 _citrus_db_factory_add8_by_string(struct _citrus_db_factory *,
-	    const char *, uint8_t);
-int	 _citrus_db_factory_add16_by_string(struct _citrus_db_factory *,
-	    const char *, uint16_t);
-int	 _citrus_db_factory_add32_by_string(struct _citrus_db_factory *,
-	    const char *, uint32_t);
-int	 _citrus_db_factory_add_string_by_string(struct _citrus_db_factory *,
-	    const char *, const char *);
-size_t	 _citrus_db_factory_calc_size(struct _citrus_db_factory *);
-int	 _citrus_db_factory_serialize(struct _citrus_db_factory *,
-	    const char *, struct _citrus_region *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_db_file.h b/lib/libc_bsd/iconv/citrus_db_file.h
deleted file mode 100644
index 3068311..0000000
--- a/lib/libc_bsd/iconv/citrus_db_file.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_db_file.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_db_file.h,v 1.4 2008/02/10 05:58:22 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_DB_FILE_H_
-#define _CITRUS_DB_FILE_H_
-
-/*
- * db format:
- *  +---
- *  | header
- *  |  - magic
- *  |  - num entries
- *  +---
- *  | entry directory
- *  |  +------------
- *  |  | entry0
- *  |  |  - hash value
- *  |  |  - next entry
- *  |  |  - key offset
- *  |  |  - key len
- *  |  |  - data offset
- *  |  |  - data size
- *  |  |---
- *  |  | entry1
- *  |  | ..
- *  |  | entryN
- *  |  +---
- *  +---
- *  | key table
- *  |  - key0
- *  |   ...
- *  |  - keyN
- *  +---
- *  | data table
- *  |  - data0
- *  |   ...
- *  |  - dataN
- *  +---
- */
-
-#define _CITRUS_DB_MAGIC_SIZE	8
-#define _CITRUS_DB_HEADER_SIZE	16
-struct _citrus_db_header_x {
-	char		dhx_magic[_CITRUS_DB_MAGIC_SIZE];
-	uint32_t	dhx_num_entries;
-	uint32_t	dhx_entry_offset;
-} __packed;
-
-struct _citrus_db_entry_x {
-	uint32_t	dex_hash_value;
-	uint32_t	dex_next_offset;
-	uint32_t	dex_key_offset;
-	uint32_t	dex_key_size;
-	uint32_t	dex_data_offset;
-	uint32_t	dex_data_size;
-} __packed;
-#define _CITRUS_DB_ENTRY_SIZE	24
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_db_hash.c b/lib/libc_bsd/iconv/citrus_db_hash.c
deleted file mode 100644
index 2c8c5a7..0000000
--- a/lib/libc_bsd/iconv/citrus_db_hash.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_db_hash.c 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_db_hash.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_db_hash.h"
-
-uint32_t
-_citrus_db_hash_std(struct _region *r)
-{
-	const uint8_t *p;
-	uint32_t hash, tmp;
-	size_t i;
-
-	hash = 0;
-	p = _region_head(r);
-
-	for (i = _region_size(r); i > 0; i--) {
-		hash <<= 4;
-		hash += _bcs_tolower(*p);
-		tmp = hash & 0xF0000000;
-		if (tmp != 0) {
-			hash ^= tmp;
-			hash ^= tmp >> 24;
-		}
-		p++;
-	}
-	return (hash);
-}
diff --git a/lib/libc_bsd/iconv/citrus_db_hash.h b/lib/libc_bsd/iconv/citrus_db_hash.h
deleted file mode 100644
index 9a79f6c..0000000
--- a/lib/libc_bsd/iconv/citrus_db_hash.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_db_hash.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_db_hash.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_DB_HASH_H_
-#define _CITRUS_DB_HASH_H_
-
-__BEGIN_DECLS
-uint32_t	 _citrus_db_hash_std(struct _citrus_region *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_esdb.c b/lib/libc_bsd/iconv/citrus_esdb.c
deleted file mode 100644
index df376fc..0000000
--- a/lib/libc_bsd/iconv/citrus_esdb.c
+++ /dev/null
@@ -1,374 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_esdb.c 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_esdb.c,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_lookup.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_esdb.h"
-#include "citrus_esdb_file.h"
-
-#define ESDB_DIR	"esdb.dir"
-#define ESDB_ALIAS	"esdb.alias"
-
-/*
- * _citrus_esdb_alias:
- *	resolve encoding scheme name aliases.
- */
-const char *
-_citrus_esdb_alias(const char *esname, char *buf, size_t bufsize)
-{
-
-	return (_lookup_alias(_PATH_ESDB "/" ESDB_ALIAS, esname, buf, bufsize,
-	    _LOOKUP_CASE_IGNORE));
-}
-
-
-/*
- * conv_esdb:
- *	external representation -> local structure.
- */
-static int
-conv_esdb(struct _citrus_esdb *esdb, struct _region *fr)
-{
-	struct _citrus_db *db;
-	const char *str;
-	char buf[100];
-	uint32_t csid, i, num_charsets, tmp, version;
-	int ret;
-
-	/* open db */
-	ret = _db_open(&db, fr, _CITRUS_ESDB_MAGIC, &_db_hash_std, NULL);
-	if (ret)
-		goto err0;
-
-	/* check version */
-	ret = _db_lookup32_by_s(db, _CITRUS_ESDB_SYM_VERSION, &version, NULL);
-	if (ret)
-		goto err1;
-	switch (version) {
-	case 0x00000001:
-		/* current version */
-		/* initial version */
-		break;
-	default:
-		ret = EFTYPE;
-		goto err1;
-	}
-
-	/* get encoding/variable */
-	ret = _db_lookupstr_by_s(db, _CITRUS_ESDB_SYM_ENCODING, &str, NULL);
-	if (ret)
-		goto err1;
-	esdb->db_encname = strdup(str);
-	if (esdb->db_encname == NULL) {
-		ret = errno;
-		goto err1;
-	}
-
-	esdb->db_len_variable = 0;
-	esdb->db_variable = NULL;
-	ret = _db_lookupstr_by_s(db, _CITRUS_ESDB_SYM_VARIABLE, &str, NULL);
-	if (ret == 0) {
-		esdb->db_len_variable = strlen(str) + 1;
-		esdb->db_variable = strdup(str);
-		if (esdb->db_variable == NULL) {
-			ret = errno;
-			goto err2;
-		}
-	} else if (ret != ENOENT)
-		goto err2;
-
-	/* get number of charsets */
-	ret = _db_lookup32_by_s(db, _CITRUS_ESDB_SYM_NUM_CHARSETS,
-	    &num_charsets, NULL);
-	if (ret)
-		goto err3;
-	esdb->db_num_charsets = num_charsets;
-
-	/* get invalid character */
-	ret = _db_lookup32_by_s(db, _CITRUS_ESDB_SYM_INVALID, &tmp, NULL);
-	if (ret == 0) {
-		esdb->db_use_invalid = 1;
-		esdb->db_invalid = tmp;
-	} else if (ret == ENOENT)
-		esdb->db_use_invalid = 0;
-	else
-		goto err3;
-
-	/* get charsets */
-	esdb->db_charsets = malloc(num_charsets * sizeof(*esdb->db_charsets));
-	if (esdb->db_charsets == NULL) {
-		ret = errno;
-		goto err3;
-	}
-	for (i = 0; i < num_charsets; i++) {
-		snprintf(buf, sizeof(buf),
-		    _CITRUS_ESDB_SYM_CSID_PREFIX "%d", i);
-		ret = _db_lookup32_by_s(db, buf, &csid, NULL);
-		if (ret)
-			goto err4;
-		esdb->db_charsets[i].ec_csid = csid;
-
-		snprintf(buf, sizeof(buf),
-		    _CITRUS_ESDB_SYM_CSNAME_PREFIX "%d", i);
-		ret = _db_lookupstr_by_s(db, buf, &str, NULL);
-		if (ret)
-			goto err4;
-		esdb->db_charsets[i].ec_csname = strdup(str);
-		if (esdb->db_charsets[i].ec_csname == NULL) {
-			ret = errno;
-			goto err4;
-		}
-	}
-
-	_db_close(db);
-	return (0);
-
-err4:
-	for (; i > 0; i--)
-		free(esdb->db_charsets[i - 1].ec_csname);
-	free(esdb->db_charsets);
-err3:
-	free(esdb->db_variable);
-err2:
-	free(esdb->db_encname);
-err1:
-	_db_close(db);
-	if (ret == ENOENT)
-		ret = EFTYPE;
-err0:
-	return (ret);
-}
-
-/*
- * _citrus_esdb_open:
- *	open an ESDB file.
- */
-int
-_citrus_esdb_open(struct _citrus_esdb *db, const char *esname)
-{
-	struct _region fr;
-	const char *realname, *encfile;
-	char buf1[PATH_MAX], buf2[PATH_MAX], path[PATH_MAX];
-	int ret;
-
-	snprintf(path, sizeof(path), "%s/%s", _PATH_ESDB, ESDB_ALIAS);
-	realname = _lookup_alias(path, esname, buf1, sizeof(buf1),
-	    _LOOKUP_CASE_IGNORE);
-
-	snprintf(path, sizeof(path), "%s/%s", _PATH_ESDB, ESDB_DIR);
-	encfile = _lookup_simple(path, realname, buf2, sizeof(buf2),
-	    _LOOKUP_CASE_IGNORE);
-	if (encfile == NULL)
-		return (ENOENT);
-
-	/* open file */
-	snprintf(path, sizeof(path), "%s/%s", _PATH_ESDB, encfile);
-	ret = _map_file(&fr, path);
-	if (ret)
-		return (ret);
-
-	ret = conv_esdb(db, &fr);
-
-	_unmap_file(&fr);
-
-	return (ret);
-}
-
-/*
- * _citrus_esdb_close:
- *	free an ESDB.
- */
-void
-_citrus_esdb_close(struct _citrus_esdb *db)
-{
-
-	for (int i = 0; i < db->db_num_charsets; i++)
-		free(db->db_charsets[i].ec_csname);
-	db->db_num_charsets = 0;
-	free(db->db_charsets); db->db_charsets = NULL;
-	free(db->db_encname); db->db_encname = NULL;
-	db->db_len_variable = 0;
-	free(db->db_variable); db->db_variable = NULL;
-}
-
-/*
- * _citrus_esdb_free_list:
- *	free the list.
- */
-void
-_citrus_esdb_free_list(char **list, size_t num)
-{
-
-	for (size_t i = 0; i < num; i++)
-		free(list[i]);
-	free(list);
-}
-
-/*
- * _citrus_esdb_get_list:
- *	get esdb entries.
- */
-int
-_citrus_esdb_get_list(char ***rlist, size_t *rnum, bool sorted)
-{
-	struct _citrus_lookup *cla, *cld;
-	struct _region key, data;
-	char **list, **q;
-	char buf[PATH_MAX];
-	size_t num;
-	int ret;
-
-	num = 0;
-
-	ret = _lookup_seq_open(&cla, _PATH_ESDB "/" ESDB_ALIAS,
-	    _LOOKUP_CASE_IGNORE);
-	if (ret)
-		goto quit0;
-
-	ret = _lookup_seq_open(&cld, _PATH_ESDB "/" ESDB_DIR,
-	    _LOOKUP_CASE_IGNORE);
-	if (ret)
-		goto quit1;
-
-	/* count number of entries */
-	num = _lookup_get_num_entries(cla) + _lookup_get_num_entries(cld);
-
-	_lookup_seq_rewind(cla);
-	_lookup_seq_rewind(cld);
-
-	/* allocate list pointer space */
-	list = malloc(num * sizeof(char *));
-	num = 0;
-	if (list == NULL) {
-		ret = errno;
-		goto quit3;
-	}
-
-	/* get alias entries */
-	while ((ret = _lookup_seq_next(cla, &key, &data)) == 0) {
-		if (sorted)
-			snprintf(buf, sizeof(buf), "%.*s/%.*s",
-			    (int)_region_size(&data),
-			    (const char *)_region_head(&data),
-			    (int)_region_size(&key),
-			    (const char *)_region_head(&key));
-		else
-			snprintf(buf, sizeof(buf), "%.*s/%.*s",
-			    (int)_region_size(&data),
-			    (const char *)_region_head(&data),
-			    (int)_region_size(&key),
-			    (const char *)_region_head(&key));
-		_bcs_convert_to_upper(buf);
-		list[num] = strdup(buf);
-		if (list[num] == NULL) {
-			ret = errno;
-			goto quit3;
-		}
-		num++;
-	}
-	if (ret != ENOENT)
-		goto quit3;
-	/* get dir entries */
-	while ((ret = _lookup_seq_next(cld, &key, &data)) == 0) {
-		if (!sorted)
-			snprintf(buf, sizeof(buf), "%.*s",
-			    (int)_region_size(&key),
-			    (const char *)_region_head(&key));
-		else {
-			/* check duplicated entry */
-			char *p;
-			char buf1[PATH_MAX];
-
-			snprintf(buf1, sizeof(buf1), "%.*s",
-			    (int)_region_size(&data),
-			    (const char *)_region_head(&data));
-			if ((p = strchr(buf1, '/')) != NULL)
-				memcpy(buf1, p + 1, strlen(p) - 1);
-			if ((p = strstr(buf1, ".esdb")) != NULL)
-				*p = '\0';
-			snprintf(buf, sizeof(buf), "%s/%.*s", buf1,
-			    (int)_region_size(&key),
-			    (const char *)_region_head(&key));
-		}
-		_bcs_convert_to_upper(buf);
-		ret = _lookup_seq_lookup(cla, buf, NULL);
-		if (ret) {
-			if (ret != ENOENT)
-				goto quit3;
-			/* not duplicated */
-			list[num] = strdup(buf);
-			if (list[num] == NULL) {
-				ret = errno;
-				goto quit3;
-			}
-			num++;
-		}
-	}
-	if (ret != ENOENT)
-		goto quit3;
-
-	ret = 0;
-	/* XXX: why reallocing the list space posteriorly?
-	    shouldn't be done earlier? */
-	q = realloc(list, num * sizeof(char *));
-	if (!q) {
-		ret = ENOMEM;
-		goto quit3;
-	}
-	list = q;
-	*rlist = list;
-	*rnum = num;
-quit3:
-	if (ret)
-		_citrus_esdb_free_list(list, num);
-	_lookup_seq_close(cld);
-quit1:
-	_lookup_seq_close(cla);
-quit0:
-	return (ret);
-}
diff --git a/lib/libc_bsd/iconv/citrus_esdb.h b/lib/libc_bsd/iconv/citrus_esdb.h
deleted file mode 100644
index 8f572ff..0000000
--- a/lib/libc_bsd/iconv/citrus_esdb.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_esdb.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_esdb.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_ESDB_H_
-#define _CITRUS_ESDB_H_
-
-#include "citrus_types.h"
-
-struct _citrus_esdb_charset {
-	_citrus_csid_t			 ec_csid;
-	char				*ec_csname;
-};
-
-struct _citrus_esdb {
-	char				*db_encname;
-	void				*db_variable;
-	size_t				 db_len_variable;
-	int				 db_num_charsets;
-	struct	_citrus_esdb_charset	*db_charsets;
-	int				 db_use_invalid;
-	_citrus_wc_t			 db_invalid;
-};
-
-__BEGIN_DECLS
-const char	*_citrus_esdb_alias(const char *, char *, size_t);
-int		 _citrus_esdb_open(struct _citrus_esdb *, const char *);
-void		 _citrus_esdb_close(struct _citrus_esdb *);
-void		 _citrus_esdb_free_list(char **, size_t);
-int		 _citrus_esdb_get_list(char ***, size_t *, bool);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_esdb_file.h b/lib/libc_bsd/iconv/citrus_esdb_file.h
deleted file mode 100644
index 9182e7c..0000000
--- a/lib/libc_bsd/iconv/citrus_esdb_file.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_esdb_file.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_esdb_file.h,v 1.1 2003/06/25 09:51:32 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_ESDB_FILE_H_
-#define _CITRUS_ESDB_FILE_H_
-
-#define _CITRUS_ESDB_MAGIC	"ESDB\0\0\0\0"
-
-#define _CITRUS_ESDB_SYM_VERSION	"version"
-#define _CITRUS_ESDB_SYM_ENCODING	"encoding"
-#define _CITRUS_ESDB_SYM_VARIABLE	"variable"
-#define _CITRUS_ESDB_SYM_NUM_CHARSETS	"num_charsets"
-#define _CITRUS_ESDB_SYM_INVALID	"invalid"
-#define _CITRUS_ESDB_SYM_CSNAME_PREFIX	"csname_"
-#define _CITRUS_ESDB_SYM_CSID_PREFIX	"csid_"
-
-#define _CITRUS_ESDB_VERSION 0x00000001
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_fix_grouping.h b/lib/libc_bsd/iconv/citrus_fix_grouping.h
deleted file mode 100644
index a69bdc3..0000000
--- a/lib/libc_bsd/iconv/citrus_fix_grouping.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_fix_grouping.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_fix_grouping.h,v 1.2 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2008 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_FIX_GROUPING_H_
-#define _CITRUS_FIX_GROUPING_H_
-
-#define _CITRUS_LC_GROUPING_VALUE_MIN		0
-#define _CITRUS_LC_GROUPING_VALUE_MAX		126
-#define _CITRUS_LC_GROUPING_VALUE_NO_FUTHER	127
-
-#if CHAR_MAX != _CITRUS_LC_GROUPING_VALUE_NO_FUTHER
-static __inline void
-_citrus_fixup_char_max_md(char *grouping)
-{
-	char *p;
-
-	for (p = grouping; *p != '\0'; ++p)
-		if (*p == _CITRUS_LC_GROUPING_VALUE_NO_FUTHER)
-			*p = (char)CHAR_MAX;
-}
-#define _CITRUS_FIXUP_CHAR_MAX_MD(grouping) \
-    _citrus_fixup_char_max_md(__DECONST(void *, grouping))
-#else
-#define _CITRUS_FIXUP_CHAR_MAX_MD(grouping)	/* nothing to do */
-#endif
-
-#endif /*_CITRUS_FIX_GROUPING_H_*/
diff --git a/lib/libc_bsd/iconv/citrus_hash.c b/lib/libc_bsd/iconv/citrus_hash.c
deleted file mode 100644
index e7607ab..0000000
--- a/lib/libc_bsd/iconv/citrus_hash.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_hash.c 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_hash.c,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_region.h"
-#include "citrus_hash.h"
-#include "citrus_db_hash.h"
-
-int
-_citrus_string_hash_func(const char *key, int hashsize)
-{
-	struct _region r;
-
-	_region_init(&r, __DECONST(void *, key), strlen(key));
-
-	return ((int)(_db_hash_std(&r) % (uint32_t)hashsize));
-}
diff --git a/lib/libc_bsd/iconv/citrus_hash.h b/lib/libc_bsd/iconv/citrus_hash.h
deleted file mode 100644
index cb8133e..0000000
--- a/lib/libc_bsd/iconv/citrus_hash.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_hash.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_hash.h,v 1.3 2004/01/02 21:49:35 itojun Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_HASH_H_
-#define _CITRUS_HASH_H_
-
-#define _CITRUS_HASH_ENTRY(type) LIST_ENTRY(type)
-#define _CITRUS_HASH_HEAD(headname, type, hashsize)	\
-struct headname {					\
-	LIST_HEAD(, type)	chh_table[hashsize];	\
-}
-#define _CITRUS_HASH_INIT(head, hashsize)			\
-do {								\
-	int _ch_loop;						\
-								\
-	for (_ch_loop = 0; _ch_loop < hashsize; _ch_loop++)	\
-		LIST_INIT(&(head)->chh_table[_ch_loop]);	\
-} while (0)
-#define _CITRUS_HASH_REMOVE(elm, field)	LIST_REMOVE(elm, field)
-#define _CITRUS_HASH_INSERT(head, elm, field, hashval)		\
-    LIST_INSERT_HEAD(&(head)->chh_table[hashval], elm, field)
-#define _CITRUS_HASH_SEARCH(head, elm, field, matchfunc, key, hashval)	\
-do {									\
-	LIST_FOREACH((elm), &(head)->chh_table[hashval], field)		\
-		if (matchfunc((elm), key) == 0)				\
-			break;						\
-} while (0)
-
-__BEGIN_DECLS
-int	 _citrus_string_hash_func(const char *, int);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_iconv.c b/lib/libc_bsd/iconv/citrus_iconv.c
deleted file mode 100644
index 840d9bc..0000000
--- a/lib/libc_bsd/iconv/citrus_iconv.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_iconv.c 267665 2014-06-20 07:32:03Z tijl $ */
-/*	$NetBSD: citrus_iconv.c,v 1.10 2011/11/19 18:34:21 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/queue.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <iconv.h>
-#include <langinfo.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_esdb.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_module.h"
-#include "citrus_lock.h"
-#include "citrus_lookup.h"
-#include "citrus_hash.h"
-#include "citrus_iconv.h"
-
-#define _CITRUS_ICONV_DIR	"iconv.dir"
-#define _CITRUS_ICONV_ALIAS	"iconv.alias"
-
-#define CI_HASH_SIZE 101
-#define CI_INITIAL_MAX_REUSE	5
-#define CI_ENV_MAX_REUSE	"ICONV_MAX_REUSE"
-
-static bool			 isinit = false;
-static int			 shared_max_reuse, shared_num_unused;
-static _CITRUS_HASH_HEAD(, _citrus_iconv_shared, CI_HASH_SIZE) shared_pool;
-static TAILQ_HEAD(, _citrus_iconv_shared) shared_unused;
-
-static pthread_rwlock_t		 ci_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-static __inline void
-init_cache(void)
-{
-
-	WLOCK(&ci_lock);
-	if (!isinit) {
-		_CITRUS_HASH_INIT(&shared_pool, CI_HASH_SIZE);
-		TAILQ_INIT(&shared_unused);
-		shared_max_reuse = -1;
-		if (!issetugid() && getenv(CI_ENV_MAX_REUSE))
-			shared_max_reuse = atoi(getenv(CI_ENV_MAX_REUSE));
-		if (shared_max_reuse < 0)
-			shared_max_reuse = CI_INITIAL_MAX_REUSE;
-		isinit = true;
-	}
-	UNLOCK(&ci_lock);
-}
-
-static __inline void
-close_shared(struct _citrus_iconv_shared *ci)
-{
-
-	if (ci) {
-		if (ci->ci_module) {
-			if (ci->ci_ops) {
-				if (ci->ci_closure)
-					(*ci->ci_ops->io_uninit_shared)(ci);
-				free(ci->ci_ops);
-			}
-			_citrus_unload_module(ci->ci_module);
-		}
-		free(ci);
-	}
-}
-
-static __inline int
-open_shared(struct _citrus_iconv_shared * __restrict * __restrict rci,
-    const char * __restrict convname, const char * __restrict src,
-    const char * __restrict dst)
-{
-	struct _citrus_iconv_shared *ci;
-	_citrus_iconv_getops_t getops;
-	const char *module;
-	size_t len_convname;
-	int ret;
-
-#ifdef INCOMPATIBLE_WITH_GNU_ICONV
-	/*
-	 * Sadly, the gnu tools expect iconv to actually parse the
-	 * byte stream and don't allow for a pass-through when
-	 * the (src,dest) encodings are the same.
-	 * See gettext-0.18.3+ NEWS:
-	 *   msgfmt now checks PO file headers more strictly with less
-	 *   false-positives.
-	 * NetBSD don't do this either.
-	 */
-	module = (strcmp(src, dst) != 0) ? "iconv_std" : "iconv_none";
-#else
-	module = "iconv_std";
-#endif
-
-	/* initialize iconv handle */
-	len_convname = strlen(convname);
-	ci = malloc(sizeof(*ci) + len_convname + 1);
-	if (!ci) {
-		ret = errno;
-		goto err;
-	}
-	ci->ci_module = NULL;
-	ci->ci_ops = NULL;
-	ci->ci_closure = NULL;
-	ci->ci_convname = (void *)&ci[1];
-	memcpy(ci->ci_convname, convname, len_convname + 1);
-
-	/* load module */
-	ret = _citrus_load_module(&ci->ci_module, module);
-	if (ret)
-		goto err;
-
-	/* get operators */
-	getops = (_citrus_iconv_getops_t)_citrus_find_getops(ci->ci_module,
-	    module, "iconv");
-	if (!getops) {
-		ret = EOPNOTSUPP;
-		goto err;
-	}
-	ci->ci_ops = malloc(sizeof(*ci->ci_ops));
-	if (!ci->ci_ops) {
-		ret = errno;
-		goto err;
-	}
-	ret = (*getops)(ci->ci_ops);
-	if (ret)
-		goto err;
-
-	if (ci->ci_ops->io_init_shared == NULL ||
-	    ci->ci_ops->io_uninit_shared == NULL ||
-	    ci->ci_ops->io_init_context == NULL ||
-	    ci->ci_ops->io_uninit_context == NULL ||
-	    ci->ci_ops->io_convert == NULL) {
-		ret = EINVAL;
-		goto err;
-	}
-
-	/* initialize the converter */
-	ret = (*ci->ci_ops->io_init_shared)(ci, src, dst);
-	if (ret)
-		goto err;
-
-	*rci = ci;
-
-	return (0);
-err:
-	close_shared(ci);
-	return (ret);
-}
-
-static __inline int
-hash_func(const char *key)
-{
-
-	return (_string_hash_func(key, CI_HASH_SIZE));
-}
-
-static __inline int
-match_func(struct _citrus_iconv_shared * __restrict ci,
-    const char * __restrict key)
-{
-
-	return (strcmp(ci->ci_convname, key));
-}
-
-static int
-get_shared(struct _citrus_iconv_shared * __restrict * __restrict rci,
-    const char *src, const char *dst)
-{
-	struct _citrus_iconv_shared * ci;
-	char convname[PATH_MAX];
-	int hashval, ret = 0;
-
-	snprintf(convname, sizeof(convname), "%s/%s", src, dst);
-
-	WLOCK(&ci_lock);
-
-	/* lookup alread existing entry */
-	hashval = hash_func(convname);
-	_CITRUS_HASH_SEARCH(&shared_pool, ci, ci_hash_entry, match_func,
-	    convname, hashval);
-	if (ci != NULL) {
-		/* found */
-		if (ci->ci_used_count == 0) {
-			TAILQ_REMOVE(&shared_unused, ci, ci_tailq_entry);
-			shared_num_unused--;
-		}
-		ci->ci_used_count++;
-		*rci = ci;
-		goto quit;
-	}
-
-	/* create new entry */
-	ret = open_shared(&ci, convname, src, dst);
-	if (ret)
-		goto quit;
-
-	_CITRUS_HASH_INSERT(&shared_pool, ci, ci_hash_entry, hashval);
-	ci->ci_used_count = 1;
-	*rci = ci;
-
-quit:
-	UNLOCK(&ci_lock);
-
-	return (ret);
-}
-
-static void
-release_shared(struct _citrus_iconv_shared * __restrict ci)
-{
-
-	WLOCK(&ci_lock);
-	ci->ci_used_count--;
-	if (ci->ci_used_count == 0) {
-		/* put it into unused list */
-		shared_num_unused++;
-		TAILQ_INSERT_TAIL(&shared_unused, ci, ci_tailq_entry);
-		/* flood out */
-		while (shared_num_unused > shared_max_reuse) {
-			ci = TAILQ_FIRST(&shared_unused);
-			TAILQ_REMOVE(&shared_unused, ci, ci_tailq_entry);
-			_CITRUS_HASH_REMOVE(ci, ci_hash_entry);
-			shared_num_unused--;
-			close_shared(ci);
-		}
-	}
-
-	UNLOCK(&ci_lock);
-}
-
-/*
- * _citrus_iconv_open:
- *	open a converter for the specified in/out codes.
- */
-int
-_citrus_iconv_open(struct _citrus_iconv * __restrict * __restrict rcv,
-    const char * __restrict src, const char * __restrict dst)
-{
-	struct _citrus_iconv *cv = NULL;
-	struct _citrus_iconv_shared *ci = NULL;
-	char realdst[PATH_MAX], realsrc[PATH_MAX];
-	char buf[PATH_MAX], path[PATH_MAX];
-	int ret;
-
-	init_cache();
-
-	/* GNU behaviour, using locale encoding if "" or "char" is specified */
-	if ((strcmp(src, "") == 0) || (strcmp(src, "char") == 0))
-		src = nl_langinfo(CODESET);
-	if ((strcmp(dst, "") == 0) || (strcmp(dst, "char") == 0))
-		dst = nl_langinfo(CODESET);
-
-	/* resolve codeset name aliases */
-	strlcpy(realsrc, _lookup_alias(path, src, buf, (size_t)PATH_MAX,
-	    _LOOKUP_CASE_IGNORE), (size_t)PATH_MAX);
-	strlcpy(realdst, _lookup_alias(path, dst, buf, (size_t)PATH_MAX,
-	    _LOOKUP_CASE_IGNORE), (size_t)PATH_MAX);
-
-	/* sanity check */
-	if (strchr(realsrc, '/') != NULL || strchr(realdst, '/'))
-		return (EINVAL);
-
-	/* get shared record */
-	ret = get_shared(&ci, realsrc, realdst);
-	if (ret)
-		return (ret);
-
-	/* create/init context */
-	if (*rcv == NULL) {
-		cv = malloc(sizeof(*cv));
-		if (cv == NULL) {
-			ret = errno;
-			release_shared(ci);
-			return (ret);
-		}
-		*rcv = cv;
-	}
-	(*rcv)->cv_shared = ci;
-	ret = (*ci->ci_ops->io_init_context)(*rcv);
-	if (ret) {
-		release_shared(ci);
-		free(cv);
-		return (ret);
-	}
-	return (0);
-}
-
-/*
- * _citrus_iconv_close:
- *	close the specified converter.
- */
-void
-_citrus_iconv_close(struct _citrus_iconv *cv)
-{
-
-	if (cv) {
-		(*cv->cv_shared->ci_ops->io_uninit_context)(cv);
-		release_shared(cv->cv_shared);
-		free(cv);
-	}
-}
-
-const char
-*_citrus_iconv_canonicalize(const char *name)
-{
-	char *buf;
-
-	if ((buf = calloc((size_t)PATH_MAX, sizeof(*buf))) == NULL)
-		return (NULL);
-	_citrus_esdb_alias(name, buf, (size_t)PATH_MAX);
-	return (buf);
-}
diff --git a/lib/libc_bsd/iconv/citrus_iconv.h b/lib/libc_bsd/iconv/citrus_iconv.h
deleted file mode 100644
index bf37852..0000000
--- a/lib/libc_bsd/iconv/citrus_iconv.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_iconv.h 282275 2015-04-30 16:08:47Z tijl $ */
-/* $NetBSD: citrus_iconv.h,v 1.5 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_ICONV_H_
-#define _CITRUS_ICONV_H_
-
-struct _citrus_iconv_shared;
-struct _citrus_iconv_ops;
-struct _citrus_iconv;
-
-__BEGIN_DECLS
-int		 _citrus_iconv_open(struct _citrus_iconv * __restrict * __restrict,
-		    const char * __restrict, const char * __restrict);
-void		 _citrus_iconv_close(struct _citrus_iconv *);
-const char	*_citrus_iconv_canonicalize(const char *);
-__END_DECLS
-
-
-#include "citrus_iconv_local.h"
-
-#define _CITRUS_ICONV_F_HIDE_INVALID	0x0001
-
-/*
- * _citrus_iconv_convert:
- *	convert a string.
- */
-static __inline int
-_citrus_iconv_convert(struct _citrus_iconv * __restrict cv,
-    char * __restrict * __restrict in, size_t * __restrict inbytes,
-    char * __restrict * __restrict out, size_t * __restrict outbytes,
-    uint32_t flags, size_t * __restrict nresults)
-{
-
-	return (*cv->cv_shared->ci_ops->io_convert)(cv, in, inbytes, out,
-	    outbytes, flags, nresults);
-}
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_iconv_local.h b/lib/libc_bsd/iconv/citrus_iconv_local.h
deleted file mode 100644
index 0abbad1..0000000
--- a/lib/libc_bsd/iconv/citrus_iconv_local.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_iconv_local.h 282275 2015-04-30 16:08:47Z tijl $ */
-/* $NetBSD: citrus_iconv_local.h,v 1.3 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_ICONV_LOCAL_H_
-#define _CITRUS_ICONV_LOCAL_H_
-
-#include <iconv.h>
-#include <stdbool.h>
-
-#define _CITRUS_ICONV_GETOPS_FUNC_BASE(_n_)				\
-    int _n_(struct _citrus_iconv_ops *)
-#define _CITRUS_ICONV_GETOPS_FUNC(_n_)					\
-    _CITRUS_ICONV_GETOPS_FUNC_BASE(_citrus_##_n_##_iconv_getops)
-
-#define _CITRUS_ICONV_DECLS(_m_)					\
-static int	 _citrus_##_m_##_iconv_init_shared			\
-		    (struct _citrus_iconv_shared * __restrict,		\
-	 	    const char * __restrict, const char * __restrict);	\
-static void	 _citrus_##_m_##_iconv_uninit_shared			\
-		    (struct _citrus_iconv_shared *);			\
-static int	 _citrus_##_m_##_iconv_convert				\
-		    (struct _citrus_iconv * __restrict,			\
-		    char * __restrict * __restrict,			\
-		    size_t * __restrict,				\
-		    char * __restrict * __restrict,			\
-		    size_t * __restrict outbytes,			\
-	 	    uint32_t, size_t * __restrict);			\
-static int	 _citrus_##_m_##_iconv_init_context			\
-		    (struct _citrus_iconv *);				\
-static void	 _citrus_##_m_##_iconv_uninit_context			\
-		    (struct _citrus_iconv *)
-
-
-#define _CITRUS_ICONV_DEF_OPS(_m_)					\
-extern struct _citrus_iconv_ops _citrus_##_m_##_iconv_ops;		\
-struct _citrus_iconv_ops _citrus_##_m_##_iconv_ops = {			\
-	/* io_init_shared */	&_citrus_##_m_##_iconv_init_shared,	\
-	/* io_uninit_shared */	&_citrus_##_m_##_iconv_uninit_shared,	\
-	/* io_init_context */	&_citrus_##_m_##_iconv_init_context,	\
-	/* io_uninit_context */	&_citrus_##_m_##_iconv_uninit_context,	\
-	/* io_convert */	&_citrus_##_m_##_iconv_convert		\
-}
-
-typedef _CITRUS_ICONV_GETOPS_FUNC_BASE((*_citrus_iconv_getops_t));
-typedef	int (*_citrus_iconv_init_shared_t)
-    (struct _citrus_iconv_shared * __restrict,
-    const char * __restrict, const char * __restrict);
-typedef void (*_citrus_iconv_uninit_shared_t)
-    (struct _citrus_iconv_shared *);
-typedef int (*_citrus_iconv_convert_t)
-    (struct _citrus_iconv * __restrict,
-    char *__restrict* __restrict, size_t * __restrict,
-    char * __restrict * __restrict, size_t * __restrict, uint32_t,
-    size_t * __restrict);
-typedef int (*_citrus_iconv_init_context_t)(struct _citrus_iconv *);
-typedef void (*_citrus_iconv_uninit_context_t)(struct _citrus_iconv *);
-
-struct _citrus_iconv_ops {
-	_citrus_iconv_init_shared_t	io_init_shared;
-	_citrus_iconv_uninit_shared_t	io_uninit_shared;
-	_citrus_iconv_init_context_t	io_init_context;
-	_citrus_iconv_uninit_context_t	io_uninit_context;
-	_citrus_iconv_convert_t		io_convert;
-};
-
-struct _citrus_iconv_shared {
-	struct _citrus_iconv_ops			*ci_ops;
-	void						*ci_closure;
-	_CITRUS_HASH_ENTRY(_citrus_iconv_shared)	 ci_hash_entry;
-	TAILQ_ENTRY(_citrus_iconv_shared)		 ci_tailq_entry;
-	_citrus_module_t				 ci_module;
-	unsigned int					 ci_used_count;
-	char						*ci_convname;
-	bool						 ci_discard_ilseq;
-	struct iconv_hooks				*ci_hooks;
-	bool						 ci_ilseq_invalid;
-};
-
-struct _citrus_iconv {
-	struct _citrus_iconv_shared			*cv_shared;
-	void						*cv_closure;
-};
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_lock.h b/lib/libc_bsd/iconv/citrus_lock.h
deleted file mode 100644
index 5bf388b..0000000
--- a/lib/libc_bsd/iconv/citrus_lock.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_lock.h 252584 2013-07-03 18:35:21Z peter $ */
-/*-
- * Copyright (C) 2010 Gabor Kovesdan <gabor@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.
- *
- * 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.
- */
-
-#include <pthread.h>
-
-#define WLOCK(lock)	if (__isthreaded)		\
-			    pthread_rwlock_wrlock(lock);
-#define UNLOCK(lock)	if (__isthreaded)		\
-			    pthread_rwlock_unlock(lock);
diff --git a/lib/libc_bsd/iconv/citrus_lookup.c b/lib/libc_bsd/iconv/citrus_lookup.c
deleted file mode 100644
index 34134e6..0000000
--- a/lib/libc_bsd/iconv/citrus_lookup.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_lookup.c 264497 2014-04-15 09:49:44Z tijl $ */
-/*	$NetBSD: citrus_lookup.c,v 1.7 2012/05/04 16:45:05 joerg Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_mmap.h"
-#include "citrus_db.h"
-#include "citrus_db_hash.h"
-#include "citrus_lookup.h"
-#include "citrus_lookup_file.h"
-
-struct _citrus_lookup {
-	union {
-		struct {
-			struct _citrus_db *db;
-			struct _citrus_region file;
-			int num, idx;
-			struct _db_locator locator;
-		} db;
-		struct {
-			struct _region r;
-			struct _memstream ms;
-		} plain;
-	} u;
-#define cl_db		u.db.db
-#define cl_dbidx	u.db.idx
-#define cl_dbfile	u.db.file
-#define cl_dbnum	u.db.num
-#define cl_dblocator	u.db.locator
-#define cl_plainr	u.plain.r
-#define cl_plainms	u.plain.ms
-	int cl_ignore_case;
-	int cl_rewind;
-	char *cl_key;
-	size_t cl_keylen;
-	int (*cl_next)(struct _citrus_lookup *, struct _region *,
-		       struct _region *);
-	int (*cl_lookup)(struct _citrus_lookup *, const char *,
-			 struct _region *);
-	int (*cl_num_entries)(struct _citrus_lookup *);
-	void (*cl_close)(struct _citrus_lookup *);
-};
-
-static int
-seq_get_num_entries_db(struct _citrus_lookup *cl)
-{
-
-	return (cl->cl_dbnum);
-}
-
-static int
-seq_next_db(struct _citrus_lookup *cl, struct _region *key,
-    struct _region *data)
-{
-
-	if (cl->cl_key) {
-		if (key)
-			_region_init(key, cl->cl_key, cl->cl_keylen);
-		return (_db_lookup_by_s(cl->cl_db, cl->cl_key, data,
-		    &cl->cl_dblocator));
-	}
-
-	if (cl->cl_rewind) {
-		cl->cl_dbidx = 0;
-	}
-	cl->cl_rewind = 0;
-	if (cl->cl_dbidx >= cl->cl_dbnum)
-		return (ENOENT);
-
-	return (_db_get_entry(cl->cl_db, cl->cl_dbidx++, key, data));
-}
-
-static int
-seq_lookup_db(struct _citrus_lookup *cl, const char *key, struct _region *data)
-{
-
-	cl->cl_rewind = 0;
-	free(cl->cl_key);
-	cl->cl_key = strdup(key);
-	if (cl->cl_ignore_case)
-		_bcs_convert_to_lower(cl->cl_key);
-	cl->cl_keylen = strlen(cl->cl_key);
-	_db_locator_init(&cl->cl_dblocator);
-	return (_db_lookup_by_s(cl->cl_db, cl->cl_key, data,
-	    &cl->cl_dblocator));
-}
-
-static void
-seq_close_db(struct _citrus_lookup *cl)
-{
-
-	_db_close(cl->cl_db);
-	_unmap_file(&cl->cl_dbfile);
-}
-
-static int
-seq_open_db(struct _citrus_lookup *cl, const char *name)
-{
-	struct _region r;
-	char path[PATH_MAX];
-	int ret;
-
-	snprintf(path, sizeof(path), "%s.db", name);
-	ret = _map_file(&r, path);
-	if (ret)
-		return (ret);
-
-	ret = _db_open(&cl->cl_db, &r, _CITRUS_LOOKUP_MAGIC,
-	    _db_hash_std, NULL);
-	if (ret) {
-		_unmap_file(&r);
-		return (ret);
-	}
-
-	cl->cl_dbfile = r;
-	cl->cl_dbnum = _db_get_num_entries(cl->cl_db);
-	cl->cl_dbidx = 0;
-	cl->cl_rewind = 1;
-	cl->cl_lookup = &seq_lookup_db;
-	cl->cl_next = &seq_next_db;
-	cl->cl_num_entries = &seq_get_num_entries_db;
-	cl->cl_close = &seq_close_db;
-
-	return (0);
-}
-
-#define T_COMM '#'
-static int
-seq_next_plain(struct _citrus_lookup *cl, struct _region *key,
-	       struct _region *data)
-{
-	const char *p, *q;
-	size_t len;
-
-	if (cl->cl_rewind)
-		_memstream_bind(&cl->cl_plainms, &cl->cl_plainr);
-	cl->cl_rewind = 0;
-
-retry:
-	p = _memstream_getln(&cl->cl_plainms, &len);
-	if (p == NULL)
-		return (ENOENT);
-	/* ignore comment */
-	q = memchr(p, T_COMM, len);
-	if (q) {
-		len = q - p;
-	}
-	/* ignore trailing spaces */
-	_bcs_trunc_rws_len(p, &len);
-	p = _bcs_skip_ws_len(p, &len);
-	q = _bcs_skip_nonws_len(p, &len);
-	if (p == q)
-		goto retry;
-	if (cl->cl_key && ((size_t)(q - p) != cl->cl_keylen ||
-	    memcmp(p, cl->cl_key, (size_t)(q - p)) != 0))
-		goto retry;
-
-	/* found a entry */
-	if (key)
-		_region_init(key, __DECONST(void *, p), (size_t)(q - p));
-	p = _bcs_skip_ws_len(q, &len);
-	if (data)
-		_region_init(data, len ? __DECONST(void *, p) : NULL, len);
-
-	return (0);
-}
-
-static int
-seq_get_num_entries_plain(struct _citrus_lookup *cl)
-{
-	int num;
-
-	num = 0;
-	while (seq_next_plain(cl, NULL, NULL) == 0)
-		num++;
-
-	return (num);
-}
-
-static int
-seq_lookup_plain(struct _citrus_lookup *cl, const char *key,
-    struct _region *data)
-{
-	size_t len;
-	const char *p;
-
-	cl->cl_rewind = 0;
-	free(cl->cl_key);
-	cl->cl_key = strdup(key);
-	if (cl->cl_ignore_case)
-		_bcs_convert_to_lower(cl->cl_key);
-	cl->cl_keylen = strlen(cl->cl_key);
-	_memstream_bind(&cl->cl_plainms, &cl->cl_plainr);
-	p = _memstream_matchline(&cl->cl_plainms, cl->cl_key, &len, 0);
-	if (p == NULL)
-		return (ENOENT);
-	if (data)
-		_region_init(data, __DECONST(void *, p), len);
-
-	return (0);
-}
-
-static void
-seq_close_plain(struct _citrus_lookup *cl)
-{
-
-	_unmap_file(&cl->cl_plainr);
-}
-
-static int
-seq_open_plain(struct _citrus_lookup *cl, const char *name)
-{
-	int ret;
-
-	/* open read stream */
-	ret = _map_file(&cl->cl_plainr, name);
-	if (ret)
-		return (ret);
-
-	cl->cl_rewind = 1;
-	cl->cl_next = &seq_next_plain;
-	cl->cl_lookup = &seq_lookup_plain;
-	cl->cl_num_entries = &seq_get_num_entries_plain;
-	cl->cl_close = &seq_close_plain;
-
-	return (0);
-}
-
-int
-_citrus_lookup_seq_open(struct _citrus_lookup **rcl, const char *name,
-    int ignore_case)
-{
-	int ret;
-	struct _citrus_lookup *cl;
-
-	cl = malloc(sizeof(*cl));
-	if (cl == NULL)
-		return (errno);
-
-	cl->cl_key = NULL;
-	cl->cl_keylen = 0;
-	cl->cl_ignore_case = ignore_case;
-	ret = seq_open_db(cl, name);
-	if (ret == ENOENT)
-		ret = seq_open_plain(cl, name);
-	if (!ret)
-		*rcl = cl;
-	else
-		free(cl);
-
-	return (ret);
-}
-
-void
-_citrus_lookup_seq_rewind(struct _citrus_lookup *cl)
-{
-
-	cl->cl_rewind = 1;
-	free(cl->cl_key);
-	cl->cl_key = NULL;
-	cl->cl_keylen = 0;
-}
-
-int
-_citrus_lookup_seq_next(struct _citrus_lookup *cl,
-    struct _region *key, struct _region *data)
-{
-
-	return ((*cl->cl_next)(cl, key, data));
-}
-
-int
-_citrus_lookup_seq_lookup(struct _citrus_lookup *cl, const char *key,
-    struct _region *data)
-{
-
-	return ((*cl->cl_lookup)(cl, key, data));
-}
-
-int
-_citrus_lookup_get_number_of_entries(struct _citrus_lookup *cl)
-{
-
-	return ((*cl->cl_num_entries)(cl));
-}
-
-void
-_citrus_lookup_seq_close(struct _citrus_lookup *cl)
-{
-
-	free(cl->cl_key);
-	(*cl->cl_close)(cl);
-	free(cl);
-}
-
-char *
-_citrus_lookup_simple(const char *name, const char *key,
-    char *linebuf, size_t linebufsize, int ignore_case)
-{
-	struct _citrus_lookup *cl;
-	struct _region data;
-	int ret;
-
-	ret = _citrus_lookup_seq_open(&cl, name, ignore_case);
-	if (ret)
-		return (NULL);
-
-	ret = _citrus_lookup_seq_lookup(cl, key, &data);
-	if (ret) {
-		_citrus_lookup_seq_close(cl);
-		return (NULL);
-	}
-
-	snprintf(linebuf, linebufsize, "%.*s", (int)_region_size(&data),
-	    (const char *)_region_head(&data));
-
-	_citrus_lookup_seq_close(cl);
-
-	return (linebuf);
-}
diff --git a/lib/libc_bsd/iconv/citrus_lookup.h b/lib/libc_bsd/iconv/citrus_lookup.h
deleted file mode 100644
index 365ebc1..0000000
--- a/lib/libc_bsd/iconv/citrus_lookup.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_lookup.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_lookup.h,v 1.2 2004/07/21 14:16:34 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_LOOKUP_H_
-#define _CITRUS_LOOKUP_H_
-
-#define _CITRUS_LOOKUP_CASE_SENSITIVE	0
-#define _CITRUS_LOOKUP_CASE_IGNORE	1
-
-struct _citrus_lookup;
-__BEGIN_DECLS
-char		*_citrus_lookup_simple(const char *, const char *, char *,
-		    size_t, int);
-int		 _citrus_lookup_seq_open(struct _citrus_lookup **,
-		    const char *, int);
-void		 _citrus_lookup_seq_rewind(struct _citrus_lookup *);
-int		 _citrus_lookup_seq_next(struct _citrus_lookup *,
-			    struct _region *, struct _region *);
-int		 _citrus_lookup_seq_lookup(struct _citrus_lookup *,
-		    const char *, struct _region *);
-int		 _citrus_lookup_get_number_of_entries(struct _citrus_lookup *);
-void		 _citrus_lookup_seq_close(struct _citrus_lookup *);
-__END_DECLS
-
-static __inline const char *
-_citrus_lookup_alias(const char *path, const char *key, char *buf, size_t n,
-    int ignore_case)
-{
-	const char *ret;
-
-	ret = _citrus_lookup_simple(path, key, buf, n, ignore_case);
-	if (ret == NULL)
-		ret = key;
-
-	return (ret);
-}
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_lookup_factory.c b/lib/libc_bsd/iconv/citrus_lookup_factory.c
deleted file mode 100644
index 15c4e51..0000000
--- a/lib/libc_bsd/iconv/citrus_lookup_factory.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_lookup_factory.c 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_lookup_factory.c,v 1.4 2003/10/27 00:12:42 lukem Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_bcs.h"
-#include "citrus_db_factory.h"
-#include "citrus_db_hash.h"
-#include "citrus_lookup_factory.h"
-#include "citrus_lookup_file.h"
-
-#define T_COMM '#'
-static int
-convert_line(struct _citrus_db_factory *df, const char *line, size_t len)
-{
-	const char *p;
-	char data[LINE_MAX], key[LINE_MAX];
-
-	/* cut off trailing comment */
-	p = memchr(line, T_COMM, len);
-	if (p)
-		len = p - line;
-
-	/* key */
-	line = _bcs_skip_ws_len(line, &len);
-	if (len == 0)
-		return (0);
-	p = _bcs_skip_nonws_len(line, &len);
-	if (p == line)
-		return (0);
-	snprintf(key, sizeof(key), "%.*s", (int)(p-line), line);
-	_bcs_convert_to_lower(key);
-
-	/* data */
-	line = _bcs_skip_ws_len(p, &len);
-	_bcs_trunc_rws_len(line, &len);
-	snprintf(data, sizeof(data), "%.*s", (int)len, line);
-
-	return (_db_factory_addstr_by_s(df, key, data));
-}
-
-static int
-dump_db(struct _citrus_db_factory *df, struct _region *r)
-{
-	void *ptr;
-	size_t size;
-
-	size = _db_factory_calc_size(df);
-	ptr = malloc(size);
-	if (ptr == NULL)
-		return (errno);
-	_region_init(r, ptr, size);
-
-	return (_db_factory_serialize(df, _CITRUS_LOOKUP_MAGIC, r));
-}
-
-int
-_citrus_lookup_factory_convert(FILE *out, FILE *in)
-{
-	struct _citrus_db_factory *df;
-	struct _region r;
-	char *line;
-	size_t size;
-	int ret;
-
-	ret = _db_factory_create(&df, &_db_hash_std, NULL);
-	if (ret)
-		return (ret);
-
-	while ((line = fgetln(in, &size)) != NULL)
-		if ((ret = convert_line(df, line, size))) {
-			_db_factory_free(df);
-			return (ret);
-		}
-
-	ret = dump_db(df, &r);
-	_db_factory_free(df);
-	if (ret)
-		return (ret);
-
-	if (fwrite(_region_head(&r), _region_size(&r), 1, out) != 1)
-		return (errno);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/iconv/citrus_lookup_factory.h b/lib/libc_bsd/iconv/citrus_lookup_factory.h
deleted file mode 100644
index 99d4cc8..0000000
--- a/lib/libc_bsd/iconv/citrus_lookup_factory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_lookup_factory.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_lookup_factory.h,v 1.1 2003/06/25 09:51:35 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_LOOKUP_FACTORY_H_
-#define _CITRUS_LOOKUP_FACTORY_H_
-
-__BEGIN_DECLS
-int	 _citrus_lookup_factory_convert(FILE *, FILE *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_lookup_file.h b/lib/libc_bsd/iconv/citrus_lookup_file.h
deleted file mode 100644
index 1382901..0000000
--- a/lib/libc_bsd/iconv/citrus_lookup_file.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_lookup_file.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_lookup_file.h,v 1.1 2003/06/25 09:51:36 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_LOOKUP_FILE_H_
-#define _CITRUS_LOOKUP_FILE_H_
-
-#define _CITRUS_LOOKUP_MAGIC	"LOOKUP\0\0"
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_mapper.c b/lib/libc_bsd/iconv/citrus_mapper.c
deleted file mode 100644
index 374f89e..0000000
--- a/lib/libc_bsd/iconv/citrus_mapper.c
+++ /dev/null
@@ -1,405 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_mapper.c 264497 2014-04-15 09:49:44Z tijl $ */
-/*	$NetBSD: citrus_mapper.c,v 1.10 2012/06/08 07:49:42 martin Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_region.h"
-#include "citrus_lock.h"
-#include "citrus_memstream.h"
-#include "citrus_bcs.h"
-#include "citrus_mmap.h"
-#include "citrus_module.h"
-#include "citrus_hash.h"
-#include "citrus_mapper.h"
-
-#define _CITRUS_MAPPER_DIR	"mapper.dir"
-
-#define CM_HASH_SIZE 101
-#define REFCOUNT_PERSISTENT	-1
-
-static pthread_rwlock_t		cm_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-struct _citrus_mapper_area {
-	_CITRUS_HASH_HEAD(, _citrus_mapper, CM_HASH_SIZE)	 ma_cache;
-	char							*ma_dir;
-};
-
-/*
- * _citrus_mapper_create_area:
- *	create mapper area
- */
-
-int
-_citrus_mapper_create_area(
-    struct _citrus_mapper_area *__restrict *__restrict rma,
-    const char *__restrict area)
-{
-	struct _citrus_mapper_area *ma;
-	struct stat st;
-	char path[PATH_MAX];
-	int ret;
-
-	WLOCK(&cm_lock);
-
-	if (*rma != NULL) {
-		ret = 0;
-		goto quit;
-	}
-
-	snprintf(path, (size_t)PATH_MAX, "%s/%s", area, _CITRUS_MAPPER_DIR);
-
-	ret = stat(path, &st);
-	if (ret)
-		goto quit;
-
-	ma = malloc(sizeof(*ma));
-	if (ma == NULL) {
-		ret = errno;
-		goto quit;
-	}
-	ma->ma_dir = strdup(area);
-	if (ma->ma_dir == NULL) {
-		ret = errno;
-		free(ma);
-		goto quit;
-	}
-	_CITRUS_HASH_INIT(&ma->ma_cache, CM_HASH_SIZE);
-
-	*rma = ma;
-	ret = 0;
-quit:
-	UNLOCK(&cm_lock);
-
-	return (ret);
-}
-
-
-/*
- * lookup_mapper_entry:
- *	lookup mapper.dir entry in the specified directory.
- *
- * line format of iconv.dir file:
- *	mapper	module	arg
- * mapper : mapper name.
- * module : mapper module name.
- * arg    : argument for the module (generally, description file name)
- */
-
-static int
-lookup_mapper_entry(const char *dir, const char *mapname, void *linebuf,
-    size_t linebufsize, const char **module, const char **variable)
-{
-	struct _region r;
-	struct _memstream ms;
-	const char *cp, *cq;
-	char *p;
-	char path[PATH_MAX];
-	size_t len;
-	int ret;
-
-	/* create mapper.dir path */
-	snprintf(path, (size_t)PATH_MAX, "%s/%s", dir, _CITRUS_MAPPER_DIR);
-
-	/* open read stream */
-	ret = _map_file(&r, path);
-	if (ret)
-		return (ret);
-
-	_memstream_bind(&ms, &r);
-
-	/* search the line matching to the map name */
-	cp = _memstream_matchline(&ms, mapname, &len, 0);
-	if (!cp) {
-		ret = ENOENT;
-		goto quit;
-	}
-	if (!len || len > linebufsize - 1) {
-		ret = EINVAL;
-		goto quit;
-	}
-
-	p = linebuf;
-	/* get module name */
-	*module = p;
-	cq = _bcs_skip_nonws_len(cp, &len);
-	strlcpy(p, cp, (size_t)(cq - cp + 1));
-	p += cq - cp + 1;
-
-	/* get variable */
-	*variable = p;
-	cp = _bcs_skip_ws_len(cq, &len);
-	strlcpy(p, cp, len + 1);
-
-	ret = 0;
-
-quit:
-	_unmap_file(&r);
-	return (ret);
-}
-
-/*
- * mapper_close:
- *	simply close a mapper. (without handling hash)
- */
-static void
-mapper_close(struct _citrus_mapper *cm)
-{
-	if (cm->cm_module) {
-		if (cm->cm_ops) {
-			if (cm->cm_closure)
-				(*cm->cm_ops->mo_uninit)(cm);
-			free(cm->cm_ops);
-		}
-		_citrus_unload_module(cm->cm_module);
-	}
-	free(cm->cm_traits);
-	free(cm);
-}
-
-/*
- * mapper_open:
- *	simply open a mapper. (without handling hash)
- */
-static int
-mapper_open(struct _citrus_mapper_area *__restrict ma,
-    struct _citrus_mapper * __restrict * __restrict rcm,
-    const char * __restrict module,
-    const char * __restrict variable)
-{
-	struct _citrus_mapper *cm;
-	_citrus_mapper_getops_t getops;
-	int ret;
-
-	/* initialize mapper handle */
-	cm = malloc(sizeof(*cm));
-	if (!cm)
-		return (errno);
-
-	cm->cm_module = NULL;
-	cm->cm_ops = NULL;
-	cm->cm_closure = NULL;
-	cm->cm_traits = NULL;
-	cm->cm_refcount = 0;
-	cm->cm_key = NULL;
-
-	/* load module */
-	ret = _citrus_load_module(&cm->cm_module, module);
-	if (ret)
-		goto err;
-
-	/* get operators */
-	getops = (_citrus_mapper_getops_t)
-	    _citrus_find_getops(cm->cm_module, module, "mapper");
-	if (!getops) {
-		ret = EOPNOTSUPP;
-		goto err;
-	}
-	cm->cm_ops = malloc(sizeof(*cm->cm_ops));
-	if (!cm->cm_ops) {
-		ret = errno;
-		goto err;
-	}
-	ret = (*getops)(cm->cm_ops);
-	if (ret)
-		goto err;
-
-	if (!cm->cm_ops->mo_init ||
-	    !cm->cm_ops->mo_uninit ||
-	    !cm->cm_ops->mo_convert ||
-	    !cm->cm_ops->mo_init_state) {
-		ret = EINVAL;
-		goto err;
-	}
-
-	/* allocate traits structure */
-	cm->cm_traits = malloc(sizeof(*cm->cm_traits));
-	if (cm->cm_traits == NULL) {
-		ret = errno;
-		goto err;
-	}
-	/* initialize the mapper */
-	ret = (*cm->cm_ops->mo_init)(ma, cm, ma->ma_dir,
-	    (const void *)variable, strlen(variable) + 1,
-	    cm->cm_traits, sizeof(*cm->cm_traits));
-	if (ret)
-		goto err;
-
-	*rcm = cm;
-
-	return (0);
-
-err:
-	mapper_close(cm);
-	return (ret);
-}
-
-/*
- * _citrus_mapper_open_direct:
- *	open a mapper.
- */
-int
-_citrus_mapper_open_direct(struct _citrus_mapper_area *__restrict ma,
-    struct _citrus_mapper * __restrict * __restrict rcm,
-    const char * __restrict module, const char * __restrict variable)
-{
-
-	return (mapper_open(ma, rcm, module, variable));
-}
-
-/*
- * hash_func
- */
-static __inline int
-hash_func(const char *key)
-{
-
-	return (_string_hash_func(key, CM_HASH_SIZE));
-}
-
-/*
- * match_func
- */
-static __inline int
-match_func(struct _citrus_mapper *cm, const char *key)
-{
-
-	return (strcmp(cm->cm_key, key));
-}
-
-/*
- * _citrus_mapper_open:
- *	open a mapper with looking up "mapper.dir".
- */
-int
-_citrus_mapper_open(struct _citrus_mapper_area *__restrict ma,
-    struct _citrus_mapper * __restrict * __restrict rcm,
-    const char * __restrict mapname)
-{
-	struct _citrus_mapper *cm;
-	char linebuf[PATH_MAX];
-	const char *module, *variable;
-	int hashval, ret;
-
-	variable = NULL;
-
-	WLOCK(&cm_lock);
-
-	/* search in the cache */
-	hashval = hash_func(mapname);
-	_CITRUS_HASH_SEARCH(&ma->ma_cache, cm, cm_entry, match_func, mapname,
-	    hashval);
-	if (cm) {
-		/* found */
-		cm->cm_refcount++;
-		*rcm = cm;
-		ret = 0;
-		goto quit;
-	}
-
-	/* search mapper entry */
-	ret = lookup_mapper_entry(ma->ma_dir, mapname, linebuf,
-	    (size_t)PATH_MAX, &module, &variable);
-	if (ret)
-		goto quit;
-
-	/* open mapper */
-	UNLOCK(&cm_lock);
-	ret = mapper_open(ma, &cm, module, variable);
-	WLOCK(&cm_lock);
-	if (ret)
-		goto quit;
-	cm->cm_key = strdup(mapname);
-	if (cm->cm_key == NULL) {
-		ret = errno;
-		_mapper_close(cm);
-		goto quit;	
-	}
-
-	/* insert to the cache */
-	cm->cm_refcount = 1;
-	_CITRUS_HASH_INSERT(&ma->ma_cache, cm, cm_entry, hashval);
-
-	*rcm = cm;
-	ret = 0;
-quit:
-	UNLOCK(&cm_lock);
-
-	return (ret);
-}
-
-/*
- * _citrus_mapper_close:
- *	close the specified mapper.
- */
-void
-_citrus_mapper_close(struct _citrus_mapper *cm)
-{
-
-	if (cm) {
-		WLOCK(&cm_lock);
-		if (cm->cm_refcount == REFCOUNT_PERSISTENT)
-			goto quit;
-		if (cm->cm_refcount > 0) {
-			if (--cm->cm_refcount > 0)
-				goto quit;
-			_CITRUS_HASH_REMOVE(cm, cm_entry);
-			free(cm->cm_key);
-		}
-		UNLOCK(&cm_lock);
-		mapper_close(cm);
-		return;
-quit:
-		UNLOCK(&cm_lock);
-	}
-}
-
-/*
- * _citrus_mapper_set_persistent:
- *	set persistent count.
- */
-void
-_citrus_mapper_set_persistent(struct _citrus_mapper * __restrict cm)
-{
-
-	WLOCK(&cm_lock);
-	cm->cm_refcount = REFCOUNT_PERSISTENT;
-	UNLOCK(&cm_lock);
-}
diff --git a/lib/libc_bsd/iconv/citrus_mapper.h b/lib/libc_bsd/iconv/citrus_mapper.h
deleted file mode 100644
index 0694964..0000000
--- a/lib/libc_bsd/iconv/citrus_mapper.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_mapper.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_mapper.h,v 1.3 2003/07/12 15:39:19 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_MAPPER_H_
-#define _CITRUS_MAPPER_H_
-
-struct _citrus_mapper_area;
-struct _citrus_mapper;
-struct _citrus_mapper_ops;
-struct _citrus_mapper_traits;
-
-__BEGIN_DECLS
-int	 _citrus_mapper_create_area(
-	    struct _citrus_mapper_area *__restrict *__restrict,
-	    const char *__restrict);
-int	 _citrus_mapper_open(struct _citrus_mapper_area *__restrict,
-	    struct _citrus_mapper *__restrict *__restrict,
-	    const char *__restrict);
-int	 _citrus_mapper_open_direct(
-	    struct _citrus_mapper_area *__restrict,
-	    struct _citrus_mapper *__restrict *__restrict,
-	    const char *__restrict, const char *__restrict);
-void	 _citrus_mapper_close(struct _citrus_mapper *);
-void	 _citrus_mapper_set_persistent(struct _citrus_mapper * __restrict);
-__END_DECLS
-
-#include "citrus_mapper_local.h"
-
-/* return values of _citrus_mapper_convert */
-#define _CITRUS_MAPPER_CONVERT_SUCCESS		(0)
-#define _CITRUS_MAPPER_CONVERT_NONIDENTICAL	(1)
-#define _CITRUS_MAPPER_CONVERT_SRC_MORE		(2)
-#define _CITRUS_MAPPER_CONVERT_DST_MORE		(3)
-#define _CITRUS_MAPPER_CONVERT_ILSEQ		(4)
-#define _CITRUS_MAPPER_CONVERT_FATAL		(5)
-
-/*
- * _citrus_mapper_convert:
- *	convert an index.
- *	- if the converter supports M:1 converter, the function may return
- *	  _CITRUS_MAPPER_CONVERT_SRC_MORE and the storage pointed by dst
- *	  may be unchanged in this case, although the internal status of
- *	  the mapper is affected.
- *	- if the converter supports 1:N converter, the function may return
- *	  _CITRUS_MAPPER_CONVERT_DST_MORE. In this case, the contiguous
- *	  call of this function ignores src and changes the storage pointed
- *	  by dst.
- *	- if the converter supports M:N converter, the function may behave
- *	  the combination of the above.
- *
- */
-static __inline int
-_citrus_mapper_convert(struct _citrus_mapper * __restrict cm,
-    _citrus_index_t * __restrict dst, _citrus_index_t src,
-    void * __restrict ps)
-{
-
-	return ((*cm->cm_ops->mo_convert)(cm, dst, src, ps));
-}
-
-/*
- * _citrus_mapper_init_state:
- *	initialize the state.
- */
-static __inline void
-_citrus_mapper_init_state(struct _citrus_mapper * __restrict cm)
-{
-
-	(*cm->cm_ops->mo_init_state)();
-}
-
-/*
- * _citrus_mapper_get_state_size:
- *	get the size of state storage.
- */
-static __inline size_t
-_citrus_mapper_get_state_size(struct _citrus_mapper * __restrict cm)
-{
-
-	return (cm->cm_traits->mt_state_size);
-}
-
-/*
- * _citrus_mapper_get_src_max:
- *	get the maximum number of suspended sources.
- */
-static __inline size_t
-_citrus_mapper_get_src_max(struct _citrus_mapper * __restrict cm)
-{
-
-	return (cm->cm_traits->mt_src_max);
-}
-
-/*
- * _citrus_mapper_get_dst_max:
- *	get the maximum number of suspended destinations.
- */
-static __inline size_t
-_citrus_mapper_get_dst_max(struct _citrus_mapper * __restrict cm)
-{
-
-	return (cm->cm_traits->mt_dst_max);
-}
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_mapper_local.h b/lib/libc_bsd/iconv/citrus_mapper_local.h
deleted file mode 100644
index a753f00..0000000
--- a/lib/libc_bsd/iconv/citrus_mapper_local.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_mapper_local.h 250938 2013-05-23 18:07:01Z ed $ */
-/* $NetBSD: citrus_mapper_local.h,v 1.2 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_MAPPER_LOCAL_H_
-#define _CITRUS_MAPPER_LOCAL_H_
-
-#define _CITRUS_MAPPER_GETOPS_FUNC_BASE(_n_)				\
-int _n_(struct _citrus_mapper_ops *)
-#define _CITRUS_MAPPER_GETOPS_FUNC(_n_)					\
-_CITRUS_MAPPER_GETOPS_FUNC_BASE(_citrus_##_n_##_mapper_getops)
-
-#define _CITRUS_MAPPER_DECLS(_m_)					\
-static int	 _citrus_##_m_##_mapper_init				\
-		    (struct _citrus_mapper_area *__restrict,		\
-		    struct _citrus_mapper * __restrict,			\
-		    const char * __restrict, const void * __restrict,	\
-		    size_t, struct _citrus_mapper_traits * __restrict,	\
-		    size_t);						\
-static void	 _citrus_##_m_##_mapper_uninit(				\
-		    struct _citrus_mapper *);				\
-static int	 _citrus_##_m_##_mapper_convert				\
-		    (struct _citrus_mapper * __restrict,		\
-		    _citrus_index_t * __restrict, _citrus_index_t,	\
-		    void * __restrict);					\
-static void	 _citrus_##_m_##_mapper_init_state			\
-		    (void);
-
-#define _CITRUS_MAPPER_DEF_OPS(_m_)					\
-extern struct _citrus_mapper_ops _citrus_##_m_##_mapper_ops;		\
-struct _citrus_mapper_ops _citrus_##_m_##_mapper_ops = {		\
-	/* mo_init */		&_citrus_##_m_##_mapper_init,		\
-	/* mo_uninit */		&_citrus_##_m_##_mapper_uninit,		\
-	/* mo_convert */	&_citrus_##_m_##_mapper_convert,	\
-	/* mo_init_state */	&_citrus_##_m_##_mapper_init_state	\
-}
-
-typedef _CITRUS_MAPPER_GETOPS_FUNC_BASE((*_citrus_mapper_getops_t));
-typedef	int (*_citrus_mapper_init_t)(
-    struct _citrus_mapper_area *__restrict,
-    struct _citrus_mapper *__restrict, const char *__restrict,
-    const void *__restrict, size_t,
-    struct _citrus_mapper_traits * __restrict, size_t);
-typedef void (*_citrus_mapper_uninit_t)(struct _citrus_mapper *);
-typedef int (*_citrus_mapper_convert_t)(struct _citrus_mapper * __restrict,
-    _citrus_index_t * __restrict, _citrus_index_t, void * __restrict);
-typedef void (*_citrus_mapper_init_state_t)(void);
-
-struct _citrus_mapper_ops {
-	_citrus_mapper_init_t			 mo_init;
-	_citrus_mapper_uninit_t			 mo_uninit;
-	_citrus_mapper_convert_t		 mo_convert;
-	_citrus_mapper_init_state_t		 mo_init_state;
-};
-
-struct _citrus_mapper_traits {
-	/* version 0x00000001 */
-	size_t					 mt_state_size;
-	size_t					 mt_src_max;
-	size_t					 mt_dst_max;
-};
-
-struct _citrus_mapper {
-	struct _citrus_mapper_ops		*cm_ops;
-	void					*cm_closure;
-	_citrus_module_t			 cm_module;
-	struct _citrus_mapper_traits		*cm_traits;
-	_CITRUS_HASH_ENTRY(_citrus_mapper)	 cm_entry;
-	int					 cm_refcount;
-	char					*cm_key;
-};
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_memstream.c b/lib/libc_bsd/iconv/citrus_memstream.c
deleted file mode 100644
index b9a13d8..0000000
--- a/lib/libc_bsd/iconv/citrus_memstream.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_memstream.c 264497 2014-04-15 09:49:44Z tijl $ */
-/*	$NetBSD: citrus_memstream.c,v 1.5 2012/03/13 21:13:31 christos Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_bcs.h"
-
-const char *
-_citrus_memory_stream_getln(struct _citrus_memory_stream * __restrict ms,
-    size_t * __restrict rlen)
-{
-	const uint8_t *h, *p;
-	size_t i, ret;
-
-	if (ms->ms_pos>=_region_size(&ms->ms_region))
-		return (NULL);
-
-	h = p = (uint8_t *)_region_offset(&ms->ms_region, ms->ms_pos);
-	ret = 0;
-	for (i = _region_size(&ms->ms_region) - ms->ms_pos; i > 0; i--) {
-		ret++;
-		if (_bcs_iseol(*p))
-			break;
-		p++;
-	}
-
-	ms->ms_pos += ret;
-	*rlen = ret;
-	return ((const char *)h);
-}
-
-#define T_COMM	'#'
-
-const char *
-_citrus_memory_stream_matchline(struct _citrus_memory_stream * __restrict ms,
-    const char * __restrict key, size_t * __restrict rlen, int iscasesensitive)
-{
-	const char *p, *q;
-	size_t keylen, len;
-
-	keylen = strlen(key);
-	for(;;) {
-		p = _citrus_memory_stream_getln(ms, &len);
-		if (p == NULL)
-			return (NULL);
-
-		/* ignore comment */
-		q = memchr(p, T_COMM, len);
-		if (q) {
-			len = q - p;
-		}
-		/* ignore trailing white space and newline */
-		_bcs_trunc_rws_len(p, &len);
-		if (len == 0)
-			continue; /* ignore null line */
-
-		/* skip white spaces at the head of the line */
-		p = _bcs_skip_ws_len(p, &len);
-		q = _bcs_skip_nonws_len(p, &len);
-
-		if ((size_t)(q - p) == keylen) {
-			if (iscasesensitive) {
-				if (memcmp(key, p, keylen) == 0)
-					break; /* match */
-			} else {
-				if (_bcs_strncasecmp(key, p, keylen) == 0)
-					break; /* match */
-			}
-		}
-	}
-
-	p = _bcs_skip_ws_len(q, &len);
-	*rlen = len;
-
-	return (p);
-}
-
-void *
-_citrus_memory_stream_chr(struct _citrus_memory_stream *ms,
-    struct _citrus_region *r, char ch)
-{
-	void *chr, *head;
-	size_t sz;
-
-	if (ms->ms_pos >= _region_size(&ms->ms_region))
-		return (NULL);
-
-	head = _region_offset(&ms->ms_region, ms->ms_pos);
-	chr = memchr(head, ch, _memstream_remainder(ms));
-	if (chr == NULL) {
-		_region_init(r, head, _memstream_remainder(ms));
-		ms->ms_pos = _region_size(&ms->ms_region);
-		return (NULL);
-	}
-	sz = (char *)chr - (char *)head;
-
-	_region_init(r, head, sz);
-	ms->ms_pos += sz + 1;
-
-	return (chr);
-}
-
-void
-_citrus_memory_stream_skip_ws(struct _citrus_memory_stream *ms)
-{
-	int ch;
-
-	while ((ch = _memstream_peek(ms)) != EOF) {
-		if (!_bcs_isspace(ch))
-			break;
-		_memstream_getc(ms);
-	}
-}
diff --git a/lib/libc_bsd/iconv/citrus_memstream.h b/lib/libc_bsd/iconv/citrus_memstream.h
deleted file mode 100644
index 6e882fe..0000000
--- a/lib/libc_bsd/iconv/citrus_memstream.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_memstream.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_memstream.h,v 1.3 2005/05/14 17:55:42 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- *
- */
-
-#ifndef _CITRUS_MEMSTREAM_H_
-#define _CITRUS_MEMSTREAM_H_
-
-struct _citrus_memory_stream {
-	struct _citrus_region	ms_region;
-	size_t			ms_pos;
-};
-
-__BEGIN_DECLS
-const char	*_citrus_memory_stream_getln(
-		    struct _citrus_memory_stream * __restrict,
-		    size_t * __restrict);
-const char	*_citrus_memory_stream_matchline(
-		    struct _citrus_memory_stream * __restrict,
-		    const char * __restrict, size_t * __restrict, int);
-void		*_citrus_memory_stream_chr(struct _citrus_memory_stream *,
-		    struct _citrus_region *, char);
-void		_citrus_memory_stream_skip_ws(struct _citrus_memory_stream *);
-__END_DECLS
-
-static __inline int
-_citrus_memory_stream_iseof(struct _citrus_memory_stream *ms)
-{
-
-	return (ms->ms_pos >= _citrus_region_size(&ms->ms_region));
-}
-
-static __inline void
-_citrus_memory_stream_bind(struct _citrus_memory_stream * __restrict ms,
-    const struct _citrus_region * __restrict r)
-{
-
-	ms->ms_region = *r;
-	ms->ms_pos = 0;
-}
-
-static __inline void
-_citrus_memory_stream_bind_ptr(struct _citrus_memory_stream * __restrict ms,
-    void *ptr, size_t sz)
-{
-	struct _citrus_region r;
-
-	_citrus_region_init(&r, ptr, sz);
-	_citrus_memory_stream_bind(ms, &r);
-}
-
-static __inline void
-_citrus_memory_stream_rewind(struct _citrus_memory_stream *ms)
-{
-
-	ms->ms_pos = 0;
-}
-
-static __inline size_t
-_citrus_memory_stream_tell(struct _citrus_memory_stream *ms)
-{
-
-	return (ms->ms_pos);
-}
-
-static __inline size_t
-_citrus_memory_stream_remainder(struct _citrus_memory_stream *ms)
-{
-	size_t sz;
-
-	sz = _citrus_region_size(&ms->ms_region);
-	if (ms->ms_pos>sz)
-		return (0);
-	return (sz-ms->ms_pos);
-}
-
-static __inline int
-_citrus_memory_stream_seek(struct _citrus_memory_stream *ms, size_t pos, int w)
-{
-	size_t sz;
-
-	sz = _citrus_region_size(&ms->ms_region);
-
-	switch (w) {
-	case SEEK_SET:
-		if (pos >= sz)
-			return (-1);
-		ms->ms_pos = pos;
-		break;
-	case SEEK_CUR:
-		pos += (ssize_t)ms->ms_pos;
-		if (pos >= sz)
-			return (-1);
-		ms->ms_pos = pos;
-		break;
-	case SEEK_END:
-		if (sz < pos)
-			return (-1);
-		ms->ms_pos = sz - pos;
-		break;
-	}
-	return (0);
-}
-
-static __inline int
-_citrus_memory_stream_getc(struct _citrus_memory_stream *ms)
-{
-
-	if (_citrus_memory_stream_iseof(ms))
-		return (EOF);
-	return (_citrus_region_peek8(&ms->ms_region, ms->ms_pos++));
-}
-
-static __inline void
-_citrus_memory_stream_ungetc(struct _citrus_memory_stream *ms, int ch)
-{
-
-	if (ch != EOF && ms->ms_pos > 0)
-		ms->ms_pos--;
-}
-
-static __inline int
-_citrus_memory_stream_peek(struct _citrus_memory_stream *ms)
-{
-
-	if (_citrus_memory_stream_iseof(ms))
-		return (EOF);
-	return (_citrus_region_peek8(&ms->ms_region, ms->ms_pos));
-}
-
-static __inline void *
-_citrus_memory_stream_getregion(struct _citrus_memory_stream *ms,
-    struct _citrus_region *r, size_t sz)
-{
-	void *ret;
-
-	if (ms->ms_pos + sz > _citrus_region_size(&ms->ms_region))
-		return (NULL);
-
-	ret = _citrus_region_offset(&ms->ms_region, ms->ms_pos);
-	ms->ms_pos += sz;
-	if (r)
-		_citrus_region_init(r, ret, sz);
-
-	return (ret);
-}
-
-static __inline int
-_citrus_memory_stream_get8(struct _citrus_memory_stream *ms, uint8_t *rval)
-{
-
-	if (ms->ms_pos + 1 > _citrus_region_size(&ms->ms_region))
-		return (-1);
-
-	*rval = _citrus_region_peek8(&ms->ms_region, ms->ms_pos);
-	ms->ms_pos += 2;
-
-	return (0);
-}
-
-static __inline int
-_citrus_memory_stream_get16(struct _citrus_memory_stream *ms, uint16_t *rval)
-{
-
-	if (ms->ms_pos + 2 > _citrus_region_size(&ms->ms_region))
-		return (-1);
-
-	*rval = _citrus_region_peek16(&ms->ms_region, ms->ms_pos);
-	ms->ms_pos += 2;
-
-	return (0);
-}
-
-static __inline int
-_citrus_memory_stream_get32(struct _citrus_memory_stream *ms, uint32_t *rval)
-{
-
-	if (ms->ms_pos + 4 > _citrus_region_size(&ms->ms_region))
-		return (-1);
-
-	*rval = _citrus_region_peek32(&ms->ms_region, ms->ms_pos);
-	ms->ms_pos += 4;
-
-	return (0);
-}
-
-static __inline int
-_citrus_memory_stream_getln_region(struct _citrus_memory_stream *ms,
-    struct _citrus_region *r)
-{
-	const char *ptr;
-	size_t sz;
-
-	ptr = _citrus_memory_stream_getln(ms, &sz);
-	if (ptr)
-		_citrus_region_init(r, __DECONST(void *, ptr), sz);
-
-	return (ptr == NULL);
-}
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_mmap.c b/lib/libc_bsd/iconv/citrus_mmap.c
deleted file mode 100644
index d7082cf..0000000
--- a/lib/libc_bsd/iconv/citrus_mmap.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_mmap.c 264497 2014-04-15 09:49:44Z tijl $ */
-/*	$NetBSD: citrus_mmap.c,v 1.4 2011/10/15 23:00:01 christos Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_mmap.h"
-
-int
-_citrus_map_file(struct _citrus_region * __restrict r,
-    const char * __restrict path)
-{
-	struct stat st;
-	void *head;
-	int fd, ret;
-
-	ret = 0;
-
-	_region_init(r, NULL, 0);
-
-	if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1)
-		return (errno);
-
-	if (fstat(fd, &st)  == -1) {
-		ret = errno;
-		goto error;
-	}
-	if (!S_ISREG(st.st_mode)) {
-		ret = EOPNOTSUPP;
-		goto error;
-	}
-
-	head = mmap(NULL, (size_t)st.st_size, PROT_READ, MAP_FILE|MAP_PRIVATE,
-	    fd, (off_t)0);
-	if (head == MAP_FAILED) {
-		ret = errno;
-		goto error;
-	}
-	_region_init(r, head, (size_t)st.st_size);
-
-error:
-	(void)close(fd);
-	return (ret);
-}
-
-void
-_citrus_unmap_file(struct _citrus_region *r)
-{
-
-	if (_region_head(r) != NULL) {
-		(void)munmap(_region_head(r), _region_size(r));
-		_region_init(r, NULL, 0);
-	}
-}
diff --git a/lib/libc_bsd/iconv/citrus_mmap.h b/lib/libc_bsd/iconv/citrus_mmap.h
deleted file mode 100644
index 14fb7b7..0000000
--- a/lib/libc_bsd/iconv/citrus_mmap.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_mmap.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_mmap.h,v 1.1 2003/06/25 09:51:38 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- *
- */
-
-#ifndef _CITRUS_MMAP_H_
-#define _CITRUS_MMAP_H_
-
-__BEGIN_DECLS
-int	 _citrus_map_file(struct _citrus_region * __restrict,
-	    const char * __restrict);
-void	 _citrus_unmap_file(struct _citrus_region *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_module.c b/lib/libc_bsd/iconv/citrus_module.c
deleted file mode 100644
index 6099fa1..0000000
--- a/lib/libc_bsd/iconv/citrus_module.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_module.c 228843 2011-12-23 15:00:37Z cperciva $ */
-/* $NetBSD: citrus_module.c,v 1.9 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)1999, 2000, 2001, 2002 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Paul Kranenburg.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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. 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <dirent.h>
-#include <dlfcn.h>
-#include <errno.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#define	I18NMODULE_MAJOR	4
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_module.h"
-#include "libc_private.h"
-
-static int		 _getdewey(int[], char *);
-static int		 _cmpndewey(int[], int, int[], int);
-static const char	*_findshlib(char *, int *, int *);
-
-static const char *_pathI18nModule = NULL;
-
-/* from libexec/ld.aout_so/shlib.c */
-#undef major
-#undef minor
-#define MAXDEWEY	3	/*ELF*/
-
-static int
-_getdewey(int dewey[], char *cp)
-{
-	int i, n;
-
-	for (n = 0, i = 0; i < MAXDEWEY; i++) {
-		if (*cp == '\0')
-			break;
-
-		if (*cp == '.') cp++;
-		if (*cp < '0' || '9' < *cp)
-			return (0);
-
-		dewey[n++] = (int)_bcs_strtol(cp, &cp, 10);
-	}
-
-	return (n);
-}
-
-/*
- * Compare two dewey arrays.
- * Return -1 if `d1' represents a smaller value than `d2'.
- * Return  1 if `d1' represents a greater value than `d2'.
- * Return  0 if equal.
- */
-static int
-_cmpndewey(int d1[], int n1, int d2[], int n2)
-{
-	int i;
-
-	for (i = 0; i < n1 && i < n2; i++) {
-		if (d1[i] < d2[i])
-			return (-1);
-		if (d1[i] > d2[i])
-			return (1);
-	}
-
-	if (n1 == n2)
-		return (0);
-
-	if (i == n1)
-		return (-1);
-
-	if (i == n2)
-		return (1);
-
-	/* cannot happen */
-	return (0);
-}
-
-static const char *
-_findshlib(char *name, int *majorp, int *minorp)
-{
-	char *lname;
-	const char *search_dirs[1];
-	static char path[PATH_MAX];
-	int dewey[MAXDEWEY], tmp[MAXDEWEY];
-	int i, len, major, minor, ndewey, n_search_dirs;
-
-	n_search_dirs = 1;
-	major = *majorp;
-	minor = *minorp;
-	path[0] = '\0';
-	search_dirs[0] = _pathI18nModule;
-	len = strlen(name);
-	lname = name;
-
-	ndewey = 0;
-
-	for (i = 0; i < n_search_dirs; i++) {
-		struct dirent *dp;
-		DIR *dd = opendir(search_dirs[i]);
-		int found_dot_a = 0, found_dot_so = 0;
-
-		if (dd == NULL)
-			break;
-
-		while ((dp = readdir(dd)) != NULL) {
-			int n;
-
-			if (dp->d_namlen < len + 4)
-				continue;
-			if (strncmp(dp->d_name, lname, (size_t)len) != 0)
-				continue;
-			if (strncmp(dp->d_name+len, ".so.", 4) != 0)
-				continue;
-
-			if ((n = _getdewey(tmp, dp->d_name+len+4)) == 0)
-				continue;
-
-			if (major != -1 && found_dot_a)
-				found_dot_a = 0;
-
-			/* XXX should verify the library is a.out/ELF? */
-
-			if (major == -1 && minor == -1)
-				goto compare_version;
-			else if (major != -1 && minor == -1) {
-				if (tmp[0] == major)
-					goto compare_version;
-			} else if (major != -1 && minor != -1) {
-				if (tmp[0] == major) {
-					if (n == 1 || tmp[1] >= minor)
-						goto compare_version;
-				}
-			}
-
-			/* else, this file does not qualify */
-			continue;
-
-		compare_version:
-			if (_cmpndewey(tmp, n, dewey, ndewey) <= 0)
-				continue;
-
-			/* We have a better version */
-			found_dot_so = 1;
-			snprintf(path, sizeof(path), "%s/%s", search_dirs[i],
-			    dp->d_name);
-			found_dot_a = 0;
-			bcopy(tmp, dewey, sizeof(dewey));
-			ndewey = n;
-			*majorp = dewey[0];
-			*minorp = dewey[1];
-		}
-		closedir(dd);
-
-		if (found_dot_a || found_dot_so)
-			/*
-			 * There's a lib in this dir; take it.
-			 */
-			return (path[0] ? path : NULL);
-	}
-
-	return (path[0] ? path : NULL);
-}
-
-void *
-_citrus_find_getops(_citrus_module_t handle, const char *modname,
-    const char *ifname)
-{
-	char name[PATH_MAX];
-	void *p;
-
-	snprintf(name, sizeof(name), "_citrus_%s_%s_getops",
-	    modname, ifname);
-	p = dlsym((void *)handle, name);
-	return (p);
-}
-
-int
-_citrus_load_module(_citrus_module_t *rhandle, const char *encname)
-{
-	const char *p;
-	char path[PATH_MAX];
-	void *handle;
-	int maj, min;
-
-	if (_pathI18nModule == NULL) {
-		p = getenv("PATH_I18NMODULE");
-		if (p != NULL && !issetugid()) {
-			_pathI18nModule = strdup(p);
-			if (_pathI18nModule == NULL)
-				return (ENOMEM);
-		} else
-			_pathI18nModule = _PATH_I18NMODULE;
-	}
-
-	(void)snprintf(path, sizeof(path), "lib%s", encname);
-	maj = I18NMODULE_MAJOR;
-	min = -1;
-	p = _findshlib(path, &maj, &min);
-	if (!p)
-		return (EINVAL);
-	handle = libc_dlopen(p, RTLD_LAZY);
-	if (!handle) {
-		printf("%s", dlerror());
-		return (EINVAL);
-	}
-
-	*rhandle = (_citrus_module_t)handle;
-
-	return (0);
-}
-
-void
-_citrus_unload_module(_citrus_module_t handle)
-{
-
-	if (handle)
-		dlclose((void *)handle);
-}
diff --git a/lib/libc_bsd/iconv/citrus_module.h b/lib/libc_bsd/iconv/citrus_module.h
deleted file mode 100644
index 993b3a7..0000000
--- a/lib/libc_bsd/iconv/citrus_module.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_module.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_module.h,v 1.1 2002/03/17 22:14:20 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * 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.
- *
- * 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.
- *
- */
-
-#ifndef _CITRUS_MODULE_H_
-#define _CITRUS_MODULE_H_
-
-#define MATCH(x, act)						\
-do {								\
-	if (lenvar >= (sizeof(#x)-1) &&				\
-	    _bcs_strncasecmp(p, #x, sizeof(#x)-1) == 0) {	\
-		act;						\
-		lenvar -= sizeof(#x)-1;				\
-		p += sizeof(#x)-1;				\
-	}							\
-} while (0)
-
-typedef struct _citrus_module_rec *_citrus_module_t;
-
-__BEGIN_DECLS
-void	*_citrus_find_getops(_citrus_module_t __restrict,
-	    const char * __restrict, const char * __restrict);
-int	 _citrus_load_module(_citrus_module_t * __restrict,
-	    const char * __restrict);
-void	 _citrus_unload_module(_citrus_module_t);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_namespace.h b/lib/libc_bsd/iconv/citrus_namespace.h
deleted file mode 100644
index 0c36089..0000000
--- a/lib/libc_bsd/iconv/citrus_namespace.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_namespace.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_namespace.h,v 1.8 2009/01/11 02:46:24 christos Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include "citrus_bcs.h"
-
-#ifndef _CITRUS_NAMESPACE_H_
-#define _CITRUS_NAMESPACE_H_
-
-/* citrus_alias */
-#ifndef _CITRUS_ALIAS_NO_NAMESPACE
-#define _alias_lookup		_citrus_alias_lookup
-#endif /* _CITRUS_ALIAS_NO_NAMESPACE */
-
-/* citrus_bcs */
-#ifndef _CITRUS_BCS_NO_NAMESPACE
-#define _bcs_isalnum		_citrus_bcs_isalnum
-#define _bcs_isalpha		_citrus_bcs_isalpha
-#define _bcs_isblank		_citrus_bcs_isblank
-#define _bcs_isdigit		_citrus_bcs_isdigit
-#define _bcs_islower		_citrus_bcs_islower
-#define _bcs_iseol		_citrus_bcs_iseol
-#define _bcs_isspace		_citrus_bcs_isspace
-#define _bcs_isupper		_citrus_bcs_isupper
-#define _bcs_isxdigit		_citrus_bcs_isxdigit
-#define _bcs_skip_nonws		_citrus_bcs_skip_nonws
-#define _bcs_skip_nonws_len	_citrus_bcs_skip_nonws_len
-#define _bcs_skip_ws		_citrus_bcs_skip_ws
-#define _bcs_skip_ws_len	_citrus_bcs_skip_ws_len
-#define _bcs_strcasecmp		_citrus_bcs_strcasecmp
-#define _bcs_strncasecmp	_citrus_bcs_strncasecmp
-#define _bcs_tolower		_citrus_bcs_tolower
-#define _bcs_toupper		_citrus_bcs_toupper
-#define _bcs_trunc_rws_len	_citrus_bcs_trunc_rws_len
-#define _bcs_convert_to_lower	_citrus_bcs_convert_to_lower
-#define _bcs_convert_to_upper	_citrus_bcs_convert_to_upper
-#define _bcs_strtol		_citrus_bcs_strtol
-#define _bcs_strtoul		_citrus_bcs_strtoul
-#endif /* _CITRUS_BCS_NO_NAMESPACE */
-
-/* citrus_csmapper */
-#ifndef _CITRUS_CSMAPPER_NO_NAMESPACE
-#define _csmapper		_citrus_csmapper
-#define _csmapper_open		_citrus_csmapper_open
-#define _csmapper_close		_citrus_csmapper_close
-#define _csmapper_convert	_citrus_csmapper_convert
-#define _csmapper_init_state	_citrus_csmapper_init_state
-#define _csmapper_get_state_size _citrus_csmapper_get_state_size
-#define _csmapper_get_src_max	_citrus_csmapper_get_src_max
-#define _csmapper_get_dst_max	_citrus_csmapper_get_dst_max
-#define _CSMAPPER_F_PREVENT_PIVOT _CITRUS_CSMAPPER_F_PREVENT_PIVOT
-#endif /* _CITRUS_CSMAPPER_NO_NAMESPACE */
-
-/* citrus_db */
-#ifndef _CITRUS_DB_NO_NAMESPACE
-#define _db_open		_citrus_db_open
-#define _db_close		_citrus_db_close
-#define _db_lookup		_citrus_db_lookup
-#define _db_lookup_by_s		_citrus_db_lookup_by_string
-#define _db_lookup8_by_s	_citrus_db_lookup8_by_string
-#define _db_lookup16_by_s	_citrus_db_lookup16_by_string
-#define _db_lookup32_by_s	_citrus_db_lookup32_by_string
-#define _db_lookupstr_by_s	_citrus_db_lookup_string_by_string
-#define _db_hash_std		_citrus_db_hash_std
-#define _db_get_num_entries	_citrus_db_get_number_of_entries
-#define _db_get_entry		_citrus_db_get_entry
-#define _db_locator		_citrus_db_locator
-#define _db_locator_init	_citrus_db_locator_init
-#endif /* _CITRUS_DB_NO_NAMESPACE */
-
-/* citrus_db_factory */
-#ifndef _CITRUS_DB_FACTORY_NO_NAMESPACE
-#define _db_factory		_citrus_db_factory
-#define _db_factory_create	_citrus_db_factory_create
-#define _db_factory_free	_citrus_db_factory_free
-#define _db_factory_add		_citrus_db_factory_add
-#define _db_factory_add_by_s	_citrus_db_factory_add_by_string
-#define _db_factory_add8_by_s	_citrus_db_factory_add8_by_string
-#define _db_factory_add16_by_s	_citrus_db_factory_add16_by_string
-#define _db_factory_add32_by_s	_citrus_db_factory_add32_by_string
-#define _db_factory_addstr_by_s	_citrus_db_factory_add_string_by_string
-#define _db_factory_calc_size	_citrus_db_factory_calc_size
-#define _db_factory_serialize	_citrus_db_factory_serialize
-#endif /* _CITRUS_DB_FACTORY_NO_NAMESPACE */
-
-/* citrus_lookup */
-#ifndef _CITRUS_DB_NO_NAMESPACE
-#define _LOOKUP_CASE_SENSITIVE	_CITRUS_LOOKUP_CASE_SENSITIVE
-#define _LOOKUP_CASE_IGNORE	_CITRUS_LOOKUP_CASE_IGNORE
-#define _lookup			_citrus_lookup
-#define _lookup_simple		_citrus_lookup_simple
-#define _lookup_alias		_citrus_lookup_alias
-#define _lookup_seq_open	_citrus_lookup_seq_open
-#define _lookup_seq_rewind	_citrus_lookup_seq_rewind
-#define _lookup_seq_next	_citrus_lookup_seq_next
-#define _lookup_seq_lookup	_citrus_lookup_seq_lookup
-#define _lookup_get_num_entries	_citrus_lookup_get_number_of_entries
-#define _lookup_seq_close	_citrus_lookup_seq_close
-#define _lookup_factory_convert	_citrus_lookup_factory_convert
-#endif /* _CITRUS_DB_NO_NAMESPACE */
-
-/* citrus_esdb */
-#ifndef _CITRUS_ESDB_NO_NAMESPACE
-#define _esdb			_citrus_esdb
-#define _esdb_charset		_citrus_esdb_charset
-#define _esdb_open		_citrus_esdb_open
-#define _esdb_close		_citrus_esdb_close
-#define _esdb_get_list		_citrus_esdb_get_list
-#define _esdb_free_list		_citrus_esdb_free_list
-#endif /* _CITRUS_ESDB_NO_NAMESPACE */
-
-/* citrus_hash */
-#ifndef _CITRUS_HASH_NO_NAMESPACE
-#define _citrus_string_hash_func _string_hash_func
-#endif /* _CITRUS_HASH_NO_NAMESPACE */
-
-/* citrus_mapper */
-#ifndef _CITRUS_MAPPER_NO_NAMESPACE
-#define _mapper			_citrus_mapper
-#define _mapper_ops		_citrus_mapper_ops
-#define _mapper_traits		_citrus_mapper_traits
-#define _mapper_open		_citrus_mapper_open
-#define _mapper_open_direct	_citrus_mapper_open_direct
-#define _mapper_close		_citrus_mapper_close
-#define _MAPPER_CONVERT_SUCCESS	_CITRUS_MAPPER_CONVERT_SUCCESS
-#define _MAPPER_CONVERT_NONIDENTICAL _CITRUS_MAPPER_CONVERT_NONIDENTICAL
-#define _MAPPER_CONVERT_SRC_MORE _CITRUS_MAPPER_CONVERT_SRC_MORE
-#define _MAPPER_CONVERT_DST_MORE _CITRUS_MAPPER_CONVERT_DST_MORE
-#define _MAPPER_CONVERT_ILSEQ	_CITRUS_MAPPER_CONVERT_ILSEQ
-#define _MAPPER_CONVERT_FATAL	_CITRUS_MAPPER_CONVERT_FATAL
-#define _mapper_convert		_citrus_mapper_convert
-#define _mapper_init_state	_citrus_mapper_init_state
-#define _mapper_get_state_size	_citrus_mapper_get_state_size
-#define _mapper_get_src_max	_citrus_mapper_get_src_max
-#define _mapper_get_dst_max	_citrus_mapper_get_dst_max
-#define _mapper_set_persistent	_citrus_mapper_set_persistent
-#endif /* _CITRUS_MAPPER_NO_NAMESPACE */
-
-/* citrus_memstream */
-#ifndef _CITRUS_MEMSTREAM_NO_NAMESPACE
-#define _memstream		_citrus_memory_stream
-#define _memstream_getln	_citrus_memory_stream_getln
-#define _memstream_matchline	_citrus_memory_stream_matchline
-#define _memstream_chr		_citrus_memory_stream_chr
-#define _memstream_skip_ws	_citrus_memory_stream_skip_ws
-#define _memstream_iseof	_citrus_memory_stream_iseof
-#define _memstream_bind		_citrus_memory_stream_bind
-#define _memstream_bind_ptr	_citrus_memory_stream_bind_ptr
-#define _memstream_seek		_citrus_memory_stream_seek
-#define _memstream_rewind	_citrus_memory_stream_rewind
-#define _memstream_tell		_citrus_memory_stream_tell
-#define _memstream_remainder	_citrus_memory_stream_remainder
-#define _memstream_getc		_citrus_memory_stream_getc
-#define _memstream_ungetc	_citrus_memory_stream_ungetc
-#define _memstream_peek		_citrus_memory_stream_peek
-#define _memstream_getregion	_citrus_memory_stream_getregion
-#define _memstream_getln_region	_citrus_memory_stream_getln_region
-#endif /* _CITRUS_MEMSTREAM_NO_NAMESPACE */
-
-/* citrus_mmap */
-#ifndef _CITRUS_MMAP_NO_NAMESPACE
-#define _map_file		_citrus_map_file
-#define _unmap_file		_citrus_unmap_file
-#endif /* _CITRUS_MMAP_NO_NAMESPACE */
-
-#ifndef _CITRUS_PIVOT_NO_NAMESPACE
-#define _pivot_factory_convert	_citrus_pivot_factory_convert
-#endif /* _CITRUS_PIVOT_NO_NAMESPACE */
-
-/* citrus_region.h */
-#ifndef _CITRUS_REGION_NO_NAMESPACE
-#define _region			_citrus_region
-#define _region_init		_citrus_region_init
-#define _region_head		_citrus_region_head
-#define _region_size		_citrus_region_size
-#define _region_check		_citrus_region_check
-#define _region_offset		_citrus_region_offset
-#define _region_peek8		_citrus_region_peek8
-#define _region_peek16		_citrus_region_peek16
-#define _region_peek32		_citrus_region_peek32
-#define _region_get_subregion	_citrus_region_get_subregion
-#endif /* _CITRUS_REGION_NO_NAMESPACE */
-
-/* citrus_stdenc.h */
-#ifndef _CITRUS_STDENC_NO_NAMESPACE
-#define _stdenc			_citrus_stdenc
-#define _stdenc_ops		_citrus_stdenc_ops
-#define _stdenc_traits		_citrus_stdenc_traits
-#define _stdenc_state_desc	_citrus_stdenc_state_desc
-#define _stdenc_open		_citrus_stdenc_open
-#define _stdenc_close		_citrus_stdenc_close
-#define _stdenc_init_state	_citrus_stdenc_init_state
-#define _stdenc_mbtocs		_citrus_stdenc_mbtocs
-#define _stdenc_cstomb		_citrus_stdenc_cstomb
-#define _stdenc_mbtowc		_citrus_stdenc_mbtowc
-#define _stdenc_wctomb		_citrus_stdenc_wctomb
-#define _stdenc_put_state_reset	_citrus_stdenc_put_state_reset
-#define _stdenc_get_state_size	_citrus_stdenc_get_state_size
-#define _stdenc_get_mb_cur_max	_citrus_stdenc_get_mb_cur_max
-#define _stdenc_get_state_desc	_citrus_stdenc_get_state_desc
-#define _STDENC_SDID_GENERIC	_CITRUS_STDENC_SDID_GENERIC
-#define _STDENC_SDGEN_UNKNOWN	_CITRUS_STDENC_SDGEN_UNKNOWN
-#define _STDENC_SDGEN_INITIAL	_CITRUS_STDENC_SDGEN_INITIAL
-#define _STDENC_SDGEN_STABLE	_CITRUS_STDENC_SDGEN_STABLE
-#define _STDENC_SDGEN_INCOMPLETE_CHAR _CITRUS_STDENC_SDGEN_INCOMPLETE_CHAR
-#define _STDENC_SDGEN_INCOMPLETE_SHIFT _CITRUS_STDENC_SDGEN_INCOMPLETE_SHIFT
-#endif /* _CITRUS_STDENC_NO_NAMESPACE */
-
-/* citrus_types.h */
-#ifndef _CITRUS_TYPES_NO_NAMESPACE
-#define _index_t		_citrus_index_t
-#define _csid_t			_citrus_csid_t
-#define _wc_t			_citrus_wc_t
-#endif /* _CITRUS_TYPES_NO_NAMESPACE */
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_none.c b/lib/libc_bsd/iconv/citrus_none.c
deleted file mode 100644
index bce97d1..0000000
--- a/lib/libc_bsd/iconv/citrus_none.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_none.c 282275 2015-04-30 16:08:47Z tijl $ */
-/* $NetBSD: citrus_none.c,v 1.18 2008/06/14 16:01:07 tnozaki Exp $ */
-
-/*-
- * Copyright (c) 2002 Citrus Project,
- * Copyright (c) 2010 Gabor Kovesdan <gabor@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <iconv.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_none.h"
-#include "citrus_stdenc.h"
-
-_CITRUS_STDENC_DECLS(NONE);
-_CITRUS_STDENC_DEF_OPS(NONE);
-struct _citrus_stdenc_traits _citrus_NONE_stdenc_traits = {
-	0,	/* et_state_size */
-	1,	/* mb_cur_max */
-};
-
-static int
-_citrus_NONE_stdenc_init(struct _citrus_stdenc * __restrict ce,
-    const void *var __unused, size_t lenvar __unused,
-    struct _citrus_stdenc_traits * __restrict et)
-{
-
-	et->et_state_size = 0;
-	et->et_mb_cur_max = 1;
-
-	ce->ce_closure = NULL;
-
-	return (0);
-}
-
-static void
-_citrus_NONE_stdenc_uninit(struct _citrus_stdenc *ce __unused)
-{
-
-}
-
-static int
-_citrus_NONE_stdenc_init_state(struct _citrus_stdenc * __restrict ce __unused,
-    void * __restrict ps __unused)
-{
-
-	return (0);
-}
-
-static int
-_citrus_NONE_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce __unused,
-    _csid_t *csid, _index_t *idx, char **s, size_t n,
-    void *ps __unused, size_t *nresult, struct iconv_hooks *hooks)
-{
-
-	if (n < 1) {
-		*nresult = (size_t)-2;
-		return (0);
-	}
-
-	*csid = 0;
-	*idx = (_index_t)(unsigned char)*(*s)++;
-	*nresult = *idx == 0 ? 0 : 1;
-
-	if ((hooks != NULL) && (hooks->uc_hook != NULL))
-		hooks->uc_hook((unsigned int)*idx, hooks->data);
-
-	return (0);
-}
-
-static int
-_citrus_NONE_stdenc_cstomb(struct _citrus_stdenc * __restrict ce __unused,
-    char *s, size_t n, _csid_t csid, _index_t idx, void *ps __unused,
-    size_t *nresult, struct iconv_hooks *hooks __unused)
-{
-
-	if (csid == _CITRUS_CSID_INVALID) {
-		*nresult = 0;
-		return (0);
-	}
-	if (csid != 0)
-		return (EILSEQ);
-
-	if ((idx & 0x000000FF) == idx) {
-		if (n < 1) {
-			*nresult = (size_t)-1;
-			return (E2BIG);
-		}
-		*s = (char)idx;
-		*nresult = 1;
-	} else if ((idx & 0x0000FFFF) == idx) {
-		if (n < 2) {
-			*nresult = (size_t)-1;
-			return (E2BIG);
-		}
-		s[0] = (char)idx;
-		/* XXX: might be endian dependent */
-		s[1] = (char)(idx >> 8);
-		*nresult = 2;
-	} else if ((idx & 0x00FFFFFF) == idx) {
-		if (n < 3) {
-			*nresult = (size_t)-1;
-			return (E2BIG);
-		}
-		s[0] = (char)idx;
-		/* XXX: might be endian dependent */
-		s[1] = (char)(idx >> 8);
-		s[2] = (char)(idx >> 16);
-		*nresult = 3;
-	} else {
-		if (n < 3) {
-			*nresult = (size_t)-1;
-			return (E2BIG);
-		}
-		s[0] = (char)idx;
-		/* XXX: might be endian dependent */
-		s[1] = (char)(idx >> 8);
-		s[2] = (char)(idx >> 16);
-		s[3] = (char)(idx >> 24);
-		*nresult = 4;
-	}
-		
-	return (0);
-}
-
-static int
-_citrus_NONE_stdenc_mbtowc(struct _citrus_stdenc * __restrict ce __unused,
-    _wc_t * __restrict pwc, char ** __restrict s, size_t n,
-    void * __restrict pspriv __unused, size_t * __restrict nresult,
-    struct iconv_hooks *hooks)
-{
-
-	if (s == NULL) {
-		*nresult = 0;
-		return (0);
-	}
-	if (n == 0) {
-		*nresult = (size_t)-2;
-		return (0);
-	}
-
-	if (pwc != NULL)
-		*pwc = (_wc_t)(unsigned char) **s;
-
-	*nresult = *s == '\0' ? 0 : 1;
-
-	if ((hooks != NULL) && (hooks->wc_hook != NULL))
-		hooks->wc_hook(*pwc, hooks->data);
-
-	return (0);
-}
-
-static int
-_citrus_NONE_stdenc_wctomb(struct _citrus_stdenc * __restrict ce __unused,
-    char * __restrict s, size_t n, _wc_t wc,
-    void * __restrict pspriv __unused, size_t * __restrict nresult,
-    struct iconv_hooks *hooks __unused)
-{
-
-	if ((wc & ~0xFFU) != 0) {
-		*nresult = (size_t)-1;
-		return (EILSEQ);
-	}
-	if (n == 0) {
-		*nresult = (size_t)-1;
-		return (E2BIG);
-	}
-
-	*nresult = 1;
-	if (s != NULL && n > 0)
-		*s = (char)wc;
-
-	return (0);
-}
-
-static int
-_citrus_NONE_stdenc_put_state_reset(struct _citrus_stdenc * __restrict ce __unused,
-    char * __restrict s __unused, size_t n __unused,
-    void * __restrict pspriv __unused, size_t * __restrict nresult)
-{
-
-	*nresult = 0;
-
-	return (0);
-}
-
-static int
-_citrus_NONE_stdenc_get_state_desc(struct _stdenc * __restrict ce __unused,
-    void * __restrict ps __unused, int id,
-    struct _stdenc_state_desc * __restrict d)
-{
-	int ret = 0;
-
-	switch (id) {
-	case _STDENC_SDID_GENERIC:
-		d->u.generic.state = _STDENC_SDGEN_INITIAL;
-		break;
-	default:
-		ret = EOPNOTSUPP;
-	}
-
-	return (ret);
-}
diff --git a/lib/libc_bsd/iconv/citrus_none.h b/lib/libc_bsd/iconv/citrus_none.h
deleted file mode 100644
index 1d86cda..0000000
--- a/lib/libc_bsd/iconv/citrus_none.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_none.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_none.h,v 1.3 2003/06/25 09:51:38 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2002 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_NONE_H_
-#define _CITRUS_NONE_H_
-
-extern struct _citrus_stdenc_ops	 _citrus_NONE_stdenc_ops;
-extern struct _citrus_stdenc_traits	 _citrus_NONE_stdenc_traits;
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_pivot_factory.c b/lib/libc_bsd/iconv/citrus_pivot_factory.c
deleted file mode 100644
index 12a96a3..0000000
--- a/lib/libc_bsd/iconv/citrus_pivot_factory.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_pivot_factory.c 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_pivot_factory.c,v 1.7 2009/04/12 14:20:19 lukem Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#include <sys/queue.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_region.h"
-#include "citrus_bcs.h"
-#include "citrus_db_factory.h"
-#include "citrus_db_hash.h"
-#include "citrus_pivot_file.h"
-#include "citrus_pivot_factory.h"
-
-struct src_entry {
-	char				*se_name;
-	struct _citrus_db_factory	*se_df;
-	STAILQ_ENTRY(src_entry)		 se_entry;
-};
-STAILQ_HEAD(src_head, src_entry);
-
-static int
-find_src(struct src_head *sh, struct src_entry **rse, const char *name)
-{
-	int ret;
-	struct src_entry *se;
-
-	STAILQ_FOREACH(se, sh, se_entry) {
-		if (_bcs_strcasecmp(se->se_name, name) == 0) {
-			*rse = se;
-			return (0);
-		}
-	}
-	se = malloc(sizeof(*se));
-	if (se == NULL)
-		return (errno);
-	se->se_name = strdup(name);
-	if (se->se_name == NULL) {
-		ret = errno;
-		free(se);
-		return (ret);
-	}
-	ret = _db_factory_create(&se->se_df, &_db_hash_std, NULL);
-	if (ret) {
-		free(se->se_name);
-		free(se);
-		return (ret);
-	}
-	STAILQ_INSERT_TAIL(sh, se, se_entry);
-	*rse = se;
-
-	return (0);
-}
-
-static void
-free_src(struct src_head *sh)
-{
-	struct src_entry *se;
-
-	while ((se = STAILQ_FIRST(sh)) != NULL) {
-		STAILQ_REMOVE_HEAD(sh, se_entry);
-		_db_factory_free(se->se_df);
-		free(se->se_name);
-		free(se);
-	}
-}
-
-
-#define T_COMM '#'
-static int
-convert_line(struct src_head *sh, const char *line, size_t len)
-{
-	struct src_entry *se;
-	const char *p;
-	char key1[LINE_MAX], key2[LINE_MAX], data[LINE_MAX];
-	char *ep;
-	uint32_t val;
-	int ret;
-
-	se = NULL;
-
-	/* cut off trailing comment */
-	p = memchr(line, T_COMM, len);
-	if (p)
-		len = p - line;
-
-	/* key1 */
-	line = _bcs_skip_ws_len(line, &len);
-	if (len == 0)
-		return (0);
-	p = _bcs_skip_nonws_len(line, &len);
-	if (p == line)
-		return (0);
-	snprintf(key1, sizeof(key1), "%.*s", (int)(p - line), line);
-
-	/* key2 */
-	line = _bcs_skip_ws_len(p, &len);
-	if (len == 0)
-		return (0);
-	p = _bcs_skip_nonws_len(line, &len);
-	if (p == line)
-		return (0);
-	snprintf(key2, sizeof(key2), "%.*s", (int)(p - line), line);
-
-	/* data */
-	line = _bcs_skip_ws_len(p, &len);
-	_bcs_trunc_rws_len(line, &len);
-	snprintf(data, sizeof(data), "%.*s", (int)len, line);
-	val = strtoul(data, &ep, 0);
-	if (*ep != '\0')
-		return (EFTYPE);
-
-	/* insert to DB */
-	ret = find_src(sh, &se, key1);
-	if (ret)
-		return (ret);
-
-	return (_db_factory_add32_by_s(se->se_df, key2, val));
-}
-
-static int
-dump_db(struct src_head *sh, struct _region *r)
-{
-	struct _db_factory *df;
-	struct src_entry *se;
-	struct _region subr;
-	void *ptr;
-	size_t size;
-	int ret;
-
-	ret = _db_factory_create(&df, &_db_hash_std, NULL);
-	if (ret)
-		return (ret);
-
-	STAILQ_FOREACH(se, sh, se_entry) {
-		size = _db_factory_calc_size(se->se_df);
-		ptr = malloc(size);
-		if (ptr == NULL)
-			goto quit;
-		_region_init(&subr, ptr, size);
-		ret = _db_factory_serialize(se->se_df, _CITRUS_PIVOT_SUB_MAGIC,
-		    &subr);
-		if (ret)
-			goto quit;
-		ret = _db_factory_add_by_s(df, se->se_name, &subr, 1);
-		if (ret)
-			goto quit;
-	}
-
-	size = _db_factory_calc_size(df);
-	ptr = malloc(size);
-	if (ptr == NULL)
-		goto quit;
-	_region_init(r, ptr, size);
-
-	ret = _db_factory_serialize(df, _CITRUS_PIVOT_MAGIC, r);
-	ptr = NULL;
-
-quit:
-	free(ptr);
-	_db_factory_free(df);
-	return (ret);
-}
-
-int
-_citrus_pivot_factory_convert(FILE *out, FILE *in)
-{
-	struct src_head sh;
-	struct _region r;
-	char *line;
-	size_t size;
-	int ret;
-
-	STAILQ_INIT(&sh);
-
-	while ((line = fgetln(in, &size)) != NULL)
-		if ((ret = convert_line(&sh, line, size))) {
-			free_src(&sh);
-			return (ret);
-		}
-
-	ret = dump_db(&sh, &r);
-	free_src(&sh);
-	if (ret)
-		return (ret);
-
-	if (fwrite(_region_head(&r), _region_size(&r), 1, out) != 1)
-		return (errno);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/iconv/citrus_pivot_factory.h b/lib/libc_bsd/iconv/citrus_pivot_factory.h
deleted file mode 100644
index 3a98f5d..0000000
--- a/lib/libc_bsd/iconv/citrus_pivot_factory.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_pivot_factory.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_pivot_factory.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_PIVOT_FACTORY_H_
-#define _CITRUS_PIVOT_FACTORY_H_
-
-__BEGIN_DECLS
-int	 _citrus_pivot_factory_convert(FILE *, FILE *);
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_pivot_file.h b/lib/libc_bsd/iconv/citrus_pivot_file.h
deleted file mode 100644
index af08aa5..0000000
--- a/lib/libc_bsd/iconv/citrus_pivot_file.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_pivot_file.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_pivot_file.h,v 1.1 2003/06/25 09:51:39 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#ifndef _CITRUS_PIVOT_FILE_H_
-#define _CITRUS_PIVOT_FILE_H_
-
-#define _CITRUS_PIVOT_MAGIC	"CSPIVOT\0"
-#define _CITRUS_PIVOT_SUB_MAGIC	"CSPIVSUB"
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_prop.c b/lib/libc_bsd/iconv/citrus_prop.c
deleted file mode 100644
index 86799ae..0000000
--- a/lib/libc_bsd/iconv/citrus_prop.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_prop.c 264497 2014-04-15 09:49:44Z tijl $ */
-/* $NetBSD: citrus_prop.c,v 1.4 2011/03/30 08:22:01 jruoho Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_bcs.h"
-#include "citrus_region.h"
-#include "citrus_memstream.h"
-#include "citrus_prop.h"
-
-typedef struct {
-	_citrus_prop_type_t type;
-	union {
-		const char *str;
-		int chr;
-		bool boolean;
-		uint64_t num;
-	} u;
-} _citrus_prop_object_t;
-
-static __inline void
-_citrus_prop_object_init(_citrus_prop_object_t *obj, _citrus_prop_type_t type)
-{
-
-	obj->type = type;
-	memset(&obj->u, 0, sizeof(obj->u));
-}
-
-static __inline void
-_citrus_prop_object_uninit(_citrus_prop_object_t *obj)
-{
-
-	if (obj->type == _CITRUS_PROP_STR)
-		free(__DECONST(void *, obj->u.str));
-}
-
-static const char *xdigit = "0123456789ABCDEF";
-
-#define _CITRUS_PROP_READ_UINT_COMMON(_func_, _type_, _max_)		\
-static int								\
-_citrus_prop_read_##_func_##_common(struct _memstream * __restrict ms,	\
-    _type_ * __restrict result, int base)				\
-{									\
-	_type_ acc, cutoff;						\
-	int ch, cutlim, n;						\
-	char *p;							\
-									\
-	acc = (_type_)0;						\
-	cutoff = _max_ / base;						\
-	cutlim = _max_ % base;						\
-	for (;;) {							\
-		ch = _memstream_getc(ms);				\
-		p = strchr(xdigit, _bcs_toupper(ch));			\
-		if (p == NULL || (n = (p - xdigit)) >= base)		\
-			break;						\
-		if (acc > cutoff || (acc == cutoff && n > cutlim))	\
-			break;						\
-		acc *= base;						\
-		acc += n;						\
-	}								\
-	_memstream_ungetc(ms, ch);					\
-	*result = acc;							\
-	return (0);							\
-}
-_CITRUS_PROP_READ_UINT_COMMON(chr, int, UCHAR_MAX)
-_CITRUS_PROP_READ_UINT_COMMON(num, uint64_t, UINT64_MAX)
-#undef _CITRUS_PROP_READ_UINT_COMMON
-
-#define _CITRUS_PROP_READ_INT(_func_, _type_)			\
-static int							\
-_citrus_prop_read_##_func_(struct _memstream * __restrict ms,	\
-    _citrus_prop_object_t * __restrict obj)			\
-{								\
-	int base, ch, neg;					\
-								\
-	_memstream_skip_ws(ms);					\
-	ch = _memstream_getc(ms);				\
-	neg = 0;						\
-	switch (ch) {						\
-	case '-':						\
-		neg = 1;					\
-	case '+':						\
-		ch = _memstream_getc(ms);			\
-	}							\
-	base = 10;						\
-	if (ch == '0') {					\
-		base -= 2;					\
-		ch = _memstream_getc(ms);			\
-		if (ch == 'x' || ch == 'X') {			\
-			ch = _memstream_getc(ms);		\
-			if (_bcs_isxdigit(ch) == 0) {		\
-				_memstream_ungetc(ms, ch);	\
-				obj->u._func_ = 0;		\
-				return (0);			\
-			}					\
-			base += 8;				\
-		}						\
-	} else if (_bcs_isdigit(ch) == 0)			\
-		return (EINVAL);				\
-	_memstream_ungetc(ms, ch);				\
-	return (_citrus_prop_read_##_func_##_common		\
-	    (ms, &obj->u._func_, base));			\
-}
-_CITRUS_PROP_READ_INT(chr, int)
-_CITRUS_PROP_READ_INT(num, uint64_t)
-#undef _CITRUS_PROP_READ_INT
-
-static int
-_citrus_prop_read_character_common(struct _memstream * __restrict ms,
-    int * __restrict result)
-{
-	int base, ch;
-
-	ch = _memstream_getc(ms);
-	if (ch != '\\')
-		*result = ch;
-	else {
-		ch = _memstream_getc(ms);
-		base = 16;
-		switch (ch) {
-		case 'a':
-			*result = '\a';
-			break;
-		case 'b':
-			*result = '\b';
-			break;
-		case 'f':
-			*result = '\f';
-			break;
-		case 'n':
-			*result = '\n';
-			break;
-		case 'r':
-			*result = '\r';
-			break;
-		case 't':
-			*result = '\t';
-			break;
-		case 'v':
-			*result = '\v';
-			break;
-		case '0': case '1': case '2': case '3':
-		case '4': case '5': case '6': case '7':
-			_memstream_ungetc(ms, ch);
-			base -= 8;
-			/*FALLTHROUGH*/
-		case 'x':
-			return (_citrus_prop_read_chr_common(ms, result, base));
-			/*NOTREACHED*/
-		default:
-			/* unknown escape */
-			*result = ch;
-		}
-	}
-	return (0);
-}
-
-static int
-_citrus_prop_read_character(struct _memstream * __restrict ms,
-    _citrus_prop_object_t * __restrict obj)
-{
-	int ch, errnum;
-
-	_memstream_skip_ws(ms);
-	ch = _memstream_getc(ms);
-	if (ch != '\'') {
-		_memstream_ungetc(ms, ch);
-		return (_citrus_prop_read_chr(ms, obj));
-	}
-	errnum = _citrus_prop_read_character_common(ms, &ch);
-	if (errnum != 0)
-		return (errnum);
-	obj->u.chr = ch;
-	ch = _memstream_getc(ms);
-	if (ch != '\'')
-		return (EINVAL);
-	return (0);
-}
-
-static int
-_citrus_prop_read_bool(struct _memstream * __restrict ms,
-    _citrus_prop_object_t * __restrict obj)
-{
-
-	_memstream_skip_ws(ms);
-	switch (_bcs_tolower(_memstream_getc(ms))) {
-	case 't':
-		if (_bcs_tolower(_memstream_getc(ms)) == 'r' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 'u' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 'e') {
-			obj->u.boolean = true;
-			return (0);
-		}
-		break;
-	case 'f':
-		if (_bcs_tolower(_memstream_getc(ms)) == 'a' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 'l' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 's' &&
-		    _bcs_tolower(_memstream_getc(ms)) == 'e') {
-			obj->u.boolean = false;
-			return (0);
-		}
-	}
-	return (EINVAL);
-}
-
-static int
-_citrus_prop_read_str(struct _memstream * __restrict ms,
-    _citrus_prop_object_t * __restrict obj)
-{
-	int ch, errnum, quot;
-	char *s, *t;
-#define _CITRUS_PROP_STR_BUFSIZ	512
-	size_t m, n;
-
-	m = _CITRUS_PROP_STR_BUFSIZ;
-	s = malloc(m);
-	if (s == NULL)
-		return (ENOMEM);
-	n = 0;
-	_memstream_skip_ws(ms);
-	quot = _memstream_getc(ms);
-	switch (quot) {
-	case EOF:
-		goto done;
-		/*NOTREACHED*/
-	case '\\':
-		_memstream_ungetc(ms, quot);
-		quot = EOF;
-		/*FALLTHROUGH*/
-	case '\"': case '\'':
-		break;
-	default:
-		s[n] = quot;
-		++n, --m;
-		quot = EOF;
-	}
-	for (;;) {
-		if (m < 1) {
-			m = _CITRUS_PROP_STR_BUFSIZ;
-			t = realloc(s, n + m);
-			if (t == NULL) {
-				free(s);
-				return (ENOMEM);
-			}
-			s = t;
-		}
-		ch = _memstream_getc(ms);
-		if (quot == ch || (quot == EOF &&
-		    (ch == ';' || _bcs_isspace(ch)))) {
-done:
-			s[n] = '\0';
-			obj->u.str = (const char *)s;
-			return (0);
-		}
-		_memstream_ungetc(ms, ch);
-		errnum = _citrus_prop_read_character_common(ms, &ch);
-		if (errnum != 0)
-			return (errnum);
-		s[n] = ch;
-		++n, --m;
-	}
-	free(s);
-	return (EINVAL);
-#undef _CITRUS_PROP_STR_BUFSIZ
-}
-
-typedef int (*_citrus_prop_read_type_t)(struct _memstream * __restrict,
-    _citrus_prop_object_t * __restrict);
-
-static const _citrus_prop_read_type_t readers[] = {
-	_citrus_prop_read_bool,
-	_citrus_prop_read_str,
-	_citrus_prop_read_character,
-	_citrus_prop_read_num,
-};
-
-static __inline int
-_citrus_prop_read_symbol(struct _memstream * __restrict ms,
-    char * __restrict s, size_t n)
-{
-	int ch;
-	size_t m;
-
-	for (m = 0; m < n; ++m) {
-		ch = _memstream_getc(ms);
-		if (ch != '_' && _bcs_isalnum(ch) == 0)
-			goto name_found;
-		s[m] = ch;
-	}
-	ch = _memstream_getc(ms);
-	if (ch == '_' || _bcs_isalnum(ch) != 0)
-		return (EINVAL);
-
-name_found:
-	_memstream_ungetc(ms, ch);
-	s[m] = '\0';
-
-	return (0);
-}
-
-static int
-_citrus_prop_parse_element(struct _memstream * __restrict ms,
-    const _citrus_prop_hint_t * __restrict hints, void * __restrict context)
-{
-	int ch, errnum;
-#define _CITRUS_PROP_HINT_NAME_LEN_MAX	255
-	char name[_CITRUS_PROP_HINT_NAME_LEN_MAX + 1];
-	const _citrus_prop_hint_t *hint;
-	_citrus_prop_object_t ostart, oend;
-
-	errnum = _citrus_prop_read_symbol(ms, name, sizeof(name));
-	if (errnum != 0)
-		return (errnum);
-	for (hint = hints; hint->name != NULL; ++hint)
-		if (_citrus_bcs_strcasecmp(name, hint->name) == 0)
-			goto hint_found;
-	return (EINVAL);
-
-hint_found:
-	_memstream_skip_ws(ms);
-	ch = _memstream_getc(ms);
-	if (ch != '=' && ch != ':')
-		_memstream_ungetc(ms, ch);
-	do {
-		_citrus_prop_object_init(&ostart, hint->type);
-		_citrus_prop_object_init(&oend, hint->type);
-		errnum = (*readers[hint->type])(ms, &ostart);
-		if (errnum != 0)
-			return (errnum);
-		_memstream_skip_ws(ms);
-		ch = _memstream_getc(ms);
-		switch (hint->type) {
-		case _CITRUS_PROP_BOOL:
-			/*FALLTHROUGH*/
-		case _CITRUS_PROP_STR:
-			break;
-		default:
-			if (ch != '-')
-				break;
-			errnum = (*readers[hint->type])(ms, &oend);
-			if (errnum != 0)
-				return (errnum);
-			_memstream_skip_ws(ms);
-			ch = _memstream_getc(ms);
-		}
-#define CALL0(_func_)					\
-do {							\
-	errnum = (*hint->cb._func_.func)(context,	\
-	    hint->name,	ostart.u._func_);		\
-} while (0)
-#define CALL1(_func_)					\
-do {							\
-	errnum = (*hint->cb._func_.func)(context,	\
-	    hint->name,	ostart.u._func_, oend.u._func_);\
-} while (0)
-		switch (hint->type) {
-		case _CITRUS_PROP_BOOL:
-			CALL0(boolean);
-			break;
-		case _CITRUS_PROP_STR:
-			CALL0(str);
-			break;
-		case _CITRUS_PROP_CHR:
-			CALL1(chr);
-			break;
-		case _CITRUS_PROP_NUM:
-			CALL1(num);
-			break;
-		default:
-			abort();
-			/*NOTREACHED*/
-		}
-#undef CALL0
-#undef CALL1
-		_citrus_prop_object_uninit(&ostart);
-		_citrus_prop_object_uninit(&oend);
-		if (errnum != 0)
-			return (errnum);
-	} while (ch == ',');
-	if (ch != ';')
-		_memstream_ungetc(ms, ch);
-	return (0);
-}
-
-int
-_citrus_prop_parse_variable(const _citrus_prop_hint_t * __restrict hints,
-    void * __restrict context, const void *var, size_t lenvar)
-{
-	struct _memstream ms;
-	int ch, errnum;
-
-	_memstream_bind_ptr(&ms, __DECONST(void *, var), lenvar);
-	for (;;) {
-		_memstream_skip_ws(&ms);
-		ch = _memstream_getc(&ms);
-		if (ch == EOF || ch == '\0')
-			break;
-		_memstream_ungetc(&ms, ch);
-		errnum = _citrus_prop_parse_element(&ms, hints, context);
-		if (errnum != 0)
-			return (errnum);
-	}
-	return (0);
-}
diff --git a/lib/libc_bsd/iconv/citrus_prop.h b/lib/libc_bsd/iconv/citrus_prop.h
deleted file mode 100644
index 00f4dc8..0000000
--- a/lib/libc_bsd/iconv/citrus_prop.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_prop.h 264497 2014-04-15 09:49:44Z tijl $ */
-/* $NetBSD: citrus_prop.h,v 1.5 2011/05/23 14:52:32 joerg Exp $ */
-
-/*-
- * Copyright (c)2006 Citrus Project,
- * 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.
- *
- * 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.
- *
- */
-
-#ifndef _CITRUS_PROP_H_
-#define _CITRUS_PROP_H_
-
-typedef enum {
-	_CITRUS_PROP_BOOL = 0,
-	_CITRUS_PROP_STR  = 1,
-	_CITRUS_PROP_CHR  = 2,
-	_CITRUS_PROP_NUM  = 3,
-} _citrus_prop_type_t;
-
-typedef struct _citrus_prop_hint_t _citrus_prop_hint_t;
-
-#define _CITRUS_PROP_CB0_T(_func_, _type_) \
-typedef int (*_citrus_prop_##_func_##_cb_func_t) \
-    (void * __restrict, const char *, _type_); \
-typedef struct { \
-	_citrus_prop_##_func_##_cb_func_t func; \
-} _citrus_prop_##_func_##_cb_t;
-_CITRUS_PROP_CB0_T(boolean, int)
-_CITRUS_PROP_CB0_T(str, const char *)
-#undef _CITRUS_PROP_CB0_T
-
-#define _CITRUS_PROP_CB1_T(_func_, _type_) \
-typedef int (*_citrus_prop_##_func_##_cb_func_t) \
-    (void * __restrict, const char *, _type_, _type_); \
-typedef struct { \
-	_citrus_prop_##_func_##_cb_func_t func; \
-} _citrus_prop_##_func_##_cb_t;
-_CITRUS_PROP_CB1_T(chr, int)
-_CITRUS_PROP_CB1_T(num, uint64_t)
-#undef _CITRUS_PROP_CB1_T
-
-struct _citrus_prop_hint_t {
-	const char *name;
-	_citrus_prop_type_t type;
-#define _CITRUS_PROP_CB_T_OPS(_name_) \
-	_citrus_prop_##_name_##_cb_t _name_
-	union {
-		_CITRUS_PROP_CB_T_OPS(boolean);
-		_CITRUS_PROP_CB_T_OPS(str);
-		_CITRUS_PROP_CB_T_OPS(chr);
-		_CITRUS_PROP_CB_T_OPS(num);
-	} cb;
-};
-
-#define _CITRUS_PROP_HINT_BOOL(name, cb) \
-    { name, _CITRUS_PROP_BOOL, { .boolean = { cb } } }
-#define _CITRUS_PROP_HINT_STR(name, cb) \
-    { name, _CITRUS_PROP_STR, { .str = { cb } } }
-#define _CITRUS_PROP_HINT_CHR(name, cb) \
-    { name, _CITRUS_PROP_CHR, { .chr = { cb } } }
-#define _CITRUS_PROP_HINT_NUM(name, cb) \
-    { name, _CITRUS_PROP_NUM, { .num = { cb } } }
-#define _CITRUS_PROP_HINT_END \
-    { .name = NULL }
-
-__BEGIN_DECLS
-int	 _citrus_prop_parse_variable(const _citrus_prop_hint_t * __restrict,
-	    void * __restrict, const void *, size_t);
-__END_DECLS
-
-#endif /* !_CITRUS_PROP_H_ */
diff --git a/lib/libc_bsd/iconv/citrus_region.h b/lib/libc_bsd/iconv/citrus_region.h
deleted file mode 100644
index f09c57e..0000000
--- a/lib/libc_bsd/iconv/citrus_region.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_region.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_region.h,v 1.7 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- *
- */
-
-#ifndef _CITRUS_REGION_H_
-#define _CITRUS_REGION_H_
-
-#include <sys/types.h>
-
-struct _citrus_region {
-	void	*r_head;
-	size_t	 r_size;
-};
-
-static __inline void
-_citrus_region_init(struct _citrus_region *r, void *h, size_t sz)
-{
-
-	r->r_head = h;
-	r->r_size = sz;
-}
-
-static __inline void *
-_citrus_region_head(const struct _citrus_region *r)
-{
-
-	return (r->r_head);
-}
-
-static __inline size_t
-_citrus_region_size(const struct _citrus_region *r)
-{
-
-	return (r->r_size);
-}
-
-static __inline int
-_citrus_region_check(const struct _citrus_region *r, size_t ofs, size_t sz)
-{
-
-	return (r->r_size >= ofs + sz ? 0 : -1);
-}
-
-static __inline void *
-_citrus_region_offset(const struct _citrus_region *r, size_t pos)
-{
-
-	return ((void *)((uint8_t *)r->r_head + pos));
-}
-
-static __inline uint8_t
-_citrus_region_peek8(const struct _citrus_region *r, size_t pos)
-{
-
-	return (*(uint8_t *)_citrus_region_offset(r, pos));
-}
-
-static __inline uint16_t
-_citrus_region_peek16(const struct _citrus_region *r, size_t pos)
-{
-	uint16_t val;
-
-	memcpy(&val, _citrus_region_offset(r, pos), (size_t)2);
-	return (val);
-}
-
-static __inline uint32_t
-_citrus_region_peek32(const struct _citrus_region *r, size_t pos)
-{
-	uint32_t val;
-
-	memcpy(&val, _citrus_region_offset(r, pos), (size_t)4);
-	return (val);
-}
-
-static __inline int
-_citrus_region_get_subregion(struct _citrus_region *subr,
-    const struct _citrus_region *r, size_t ofs, size_t sz)
-{
-
-	if (_citrus_region_check(r, ofs, sz))
-		return (-1);
-	_citrus_region_init(subr, _citrus_region_offset(r, ofs), sz);
-	return (0);
-}
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_stdenc.c b/lib/libc_bsd/iconv/citrus_stdenc.c
deleted file mode 100644
index 91cf15b..0000000
--- a/lib/libc_bsd/iconv/citrus_stdenc.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_stdenc.c 264497 2014-04-15 09:49:44Z tijl $ */
-/*	$NetBSD: citrus_stdenc.c,v 1.4 2011/11/19 18:39:58 tnozaki Exp $	*/
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_namespace.h"
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_none.h"
-#include "citrus_stdenc.h"
-
-struct _citrus_stdenc _citrus_stdenc_default = {
-	&_citrus_NONE_stdenc_ops,	/* ce_ops */
-	NULL,				/* ce_closure */
-	NULL,				/* ce_module */
-	&_citrus_NONE_stdenc_traits,	/* ce_traits */
-};
-
-int
-_citrus_stdenc_open(struct _citrus_stdenc * __restrict * __restrict rce,
-    char const * __restrict encname, const void * __restrict variable,
-    size_t lenvar)
-{
-	struct _citrus_stdenc *ce;
-	_citrus_module_t handle;
-	_citrus_stdenc_getops_t getops;
-	int ret;
-
-	if (!strcmp(encname, _CITRUS_DEFAULT_STDENC_NAME)) {
-		*rce = &_citrus_stdenc_default;
-		return (0);
-	}
-	ce = malloc(sizeof(*ce));
-	if (ce == NULL) {
-		ret = errno;
-		goto bad;
-	}
-	ce->ce_ops = NULL;
-	ce->ce_closure = NULL;
-	ce->ce_module = NULL;
-	ce->ce_traits = NULL;
-
-	ret = _citrus_load_module(&handle, encname);
-	if (ret)
-		goto bad;
-
-	ce->ce_module = handle;
-
-	getops = (_citrus_stdenc_getops_t)_citrus_find_getops(ce->ce_module,
-	    encname, "stdenc");
-	if (getops == NULL) {
-		ret = EINVAL;
-		goto bad;
-	}
-
-	ce->ce_ops = (struct _citrus_stdenc_ops *)malloc(sizeof(*ce->ce_ops));
-	if (ce->ce_ops == NULL) {
-		ret = errno;
-		goto bad;
-	}
-
-	ret = (*getops)(ce->ce_ops, sizeof(*ce->ce_ops));
-	if (ret)
-		goto bad;
-
-	/* validation check */
-	if (ce->ce_ops->eo_init == NULL ||
-	    ce->ce_ops->eo_uninit == NULL ||
-	    ce->ce_ops->eo_init_state == NULL ||
-	    ce->ce_ops->eo_mbtocs == NULL ||
-	    ce->ce_ops->eo_cstomb == NULL ||
-	    ce->ce_ops->eo_mbtowc == NULL ||
-	    ce->ce_ops->eo_wctomb == NULL ||
-	    ce->ce_ops->eo_get_state_desc == NULL) {
-		ret = EINVAL;
-		goto bad;
-	}
-
-	/* allocate traits */
-	ce->ce_traits = malloc(sizeof(*ce->ce_traits));
-	if (ce->ce_traits == NULL) {
-		ret = errno;
-		goto bad;
-	}
-	/* init and get closure */
-	ret = (*ce->ce_ops->eo_init)(ce, variable, lenvar, ce->ce_traits);
-	if (ret)
-		goto bad;
-
-	*rce = ce;
-
-	return (0);
-
-bad:
-	_citrus_stdenc_close(ce);
-	return (ret);
-}
-
-void
-_citrus_stdenc_close(struct _citrus_stdenc *ce)
-{
-
-	if (ce == &_citrus_stdenc_default)
-		return;
-
-	if (ce->ce_module) {
-		if (ce->ce_ops) {
-			if (ce->ce_closure && ce->ce_ops->eo_uninit)
-				(*ce->ce_ops->eo_uninit)(ce);
-			free(ce->ce_ops);
-		}
-		free(ce->ce_traits);
-		_citrus_unload_module(ce->ce_module);
-	}
-	free(ce);
-}
diff --git a/lib/libc_bsd/iconv/citrus_stdenc.h b/lib/libc_bsd/iconv/citrus_stdenc.h
deleted file mode 100644
index 527b62a..0000000
--- a/lib/libc_bsd/iconv/citrus_stdenc.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_stdenc.h 282275 2015-04-30 16:08:47Z tijl $ */
-/* $NetBSD: citrus_stdenc.h,v 1.4 2005/10/29 18:02:04 tshiozak Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- *
- */
-
-#ifndef _CITRUS_STDENC_H_
-#define _CITRUS_STDENC_H_
-
-struct _citrus_stdenc;
-struct _citrus_stdenc_ops;
-struct _citrus_stdenc_traits;
-
-#define _CITRUS_STDENC_SDID_GENERIC		0
-struct _citrus_stdenc_state_desc
-{
-	union {
-		struct {
-			int	state;
-#define _CITRUS_STDENC_SDGEN_UNKNOWN		0
-#define _CITRUS_STDENC_SDGEN_INITIAL		1
-#define _CITRUS_STDENC_SDGEN_STABLE		2
-#define _CITRUS_STDENC_SDGEN_INCOMPLETE_CHAR	3
-#define _CITRUS_STDENC_SDGEN_INCOMPLETE_SHIFT	4
-		} generic;
-	} u;
-};
-
-#include "citrus_stdenc_local.h"
-
-__BEGIN_DECLS
-int	 _citrus_stdenc_open(struct _citrus_stdenc * __restrict * __restrict,
-	    char const * __restrict, const void * __restrict, size_t);
-void	 _citrus_stdenc_close(struct _citrus_stdenc *);
-__END_DECLS
-
-static __inline int
-_citrus_stdenc_init_state(struct _citrus_stdenc * __restrict ce,
-    void * __restrict ps)
-{
-
-	return ((*ce->ce_ops->eo_init_state)(ce, ps));
-}
-
-static __inline int
-_citrus_stdenc_mbtocs(struct _citrus_stdenc * __restrict ce,
-    _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx,
-    char ** __restrict s, size_t n, void * __restrict ps,
-    size_t * __restrict nresult, struct iconv_hooks *hooks)
-{
-
-	return ((*ce->ce_ops->eo_mbtocs)(ce, csid, idx, s, n, ps, nresult,
-	    hooks));
-}
-
-static __inline int
-_citrus_stdenc_cstomb(struct _citrus_stdenc * __restrict ce,
-    char * __restrict s, size_t n, _citrus_csid_t csid, _citrus_index_t idx,
-    void * __restrict ps, size_t * __restrict nresult,
-    struct iconv_hooks *hooks)
-{
-
-	return ((*ce->ce_ops->eo_cstomb)(ce, s, n, csid, idx, ps, nresult,
-	    hooks));
-}
-
-static __inline int
-_citrus_stdenc_wctomb(struct _citrus_stdenc * __restrict ce,
-    char * __restrict s, size_t n, _citrus_wc_t wc, void * __restrict ps,
-    size_t * __restrict nresult, struct iconv_hooks *hooks)
-{
-
-	return ((*ce->ce_ops->eo_wctomb)(ce, s, n, wc, ps, nresult, hooks));
-}
-
-static __inline int
-_citrus_stdenc_put_state_reset(struct _citrus_stdenc * __restrict ce,
-    char * __restrict s, size_t n, void * __restrict ps,
-    size_t * __restrict nresult)
-{
-
-	return ((*ce->ce_ops->eo_put_state_reset)(ce, s, n, ps, nresult));
-}
-
-static __inline size_t
-_citrus_stdenc_get_state_size(struct _citrus_stdenc *ce)
-{
-
-	return (ce->ce_traits->et_state_size);
-}
-
-static __inline int
-_citrus_stdenc_get_state_desc(struct _citrus_stdenc * __restrict ce,
-    void * __restrict ps, int id,
-    struct _citrus_stdenc_state_desc * __restrict d)
-{
-
-	return ((*ce->ce_ops->eo_get_state_desc)(ce, ps, id, d));
-}
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_stdenc_local.h b/lib/libc_bsd/iconv/citrus_stdenc_local.h
deleted file mode 100644
index 3237525..0000000
--- a/lib/libc_bsd/iconv/citrus_stdenc_local.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_stdenc_local.h 282275 2015-04-30 16:08:47Z tijl $ */
-/* $NetBSD: citrus_stdenc_local.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- *
- */
-
-#ifndef _CITRUS_STDENC_LOCAL_H_
-#define _CITRUS_STDENC_LOCAL_H_
-
-#include <iconv.h>
-
-#include "citrus_module.h"
-
-#define _CITRUS_STDENC_GETOPS_FUNC_BASE(n)			\
-   int n(struct _citrus_stdenc_ops *, size_t)
-#define _CITRUS_STDENC_GETOPS_FUNC(_e_)					\
-   _CITRUS_STDENC_GETOPS_FUNC_BASE(_citrus_##_e_##_stdenc_getops)
-typedef _CITRUS_STDENC_GETOPS_FUNC_BASE((*_citrus_stdenc_getops_t));
-
-
-#define _CITRUS_STDENC_DECLS(_e_)					\
-static int	 _citrus_##_e_##_stdenc_init				\
-		    (struct _citrus_stdenc * __restrict,		\
-		    const void * __restrict, size_t,			\
-		    struct _citrus_stdenc_traits * __restrict);		\
-static void	 _citrus_##_e_##_stdenc_uninit(struct _citrus_stdenc *);\
-static int	 _citrus_##_e_##_stdenc_init_state			\
-		    (struct _citrus_stdenc * __restrict,		\
-		    void * __restrict);					\
-static int	 _citrus_##_e_##_stdenc_mbtocs				\
-		    (struct _citrus_stdenc * __restrict,		\
-		    _citrus_csid_t * __restrict,			\
-		    _citrus_index_t * __restrict,			\
-		    char ** __restrict, size_t,				\
-		    void * __restrict, size_t * __restrict,		\
-		    struct iconv_hooks *);				\
-static int	 _citrus_##_e_##_stdenc_cstomb				\
-		    (struct _citrus_stdenc * __restrict,		\
-		    char * __restrict, size_t, _citrus_csid_t,		\
-		    _citrus_index_t, void * __restrict,			\
-		    size_t * __restrict, struct iconv_hooks *);		\
-static int	 _citrus_##_e_##_stdenc_mbtowc				\
-		    (struct _citrus_stdenc * __restrict,		\
-		    _citrus_wc_t * __restrict,				\
-		    char ** __restrict, size_t,				\
-		    void * __restrict, size_t * __restrict,		\
-		    struct iconv_hooks *);				\
-static int	 _citrus_##_e_##_stdenc_wctomb				\
-		    (struct _citrus_stdenc * __restrict,		\
-		    char * __restrict, size_t, _citrus_wc_t,		\
-		    void * __restrict, size_t * __restrict,		\
-		    struct iconv_hooks *);				\
-static int	 _citrus_##_e_##_stdenc_put_state_reset			\
-		    (struct _citrus_stdenc * __restrict,		\
-		    char * __restrict, size_t, void * __restrict,	\
-		    size_t * __restrict);				\
-static int	 _citrus_##_e_##_stdenc_get_state_desc			\
-		    (struct _citrus_stdenc * __restrict,		\
-		    void * __restrict, int,				\
-		    struct _citrus_stdenc_state_desc * __restrict)
-
-#define _CITRUS_STDENC_DEF_OPS(_e_)					\
-extern struct _citrus_stdenc_ops _citrus_##_e_##_stdenc_ops;		\
-struct _citrus_stdenc_ops _citrus_##_e_##_stdenc_ops = {		\
-	/* eo_init */		&_citrus_##_e_##_stdenc_init,		\
-	/* eo_uninit */		&_citrus_##_e_##_stdenc_uninit,		\
-	/* eo_init_state */	&_citrus_##_e_##_stdenc_init_state,	\
-	/* eo_mbtocs */		&_citrus_##_e_##_stdenc_mbtocs,		\
-	/* eo_cstomb */		&_citrus_##_e_##_stdenc_cstomb,		\
-	/* eo_mbtowc */		&_citrus_##_e_##_stdenc_mbtowc,		\
-	/* eo_wctomb */		&_citrus_##_e_##_stdenc_wctomb,		\
-	/* eo_put_state_reset */&_citrus_##_e_##_stdenc_put_state_reset,\
-	/* eo_get_state_desc */	&_citrus_##_e_##_stdenc_get_state_desc	\
-}
-
-typedef int (*_citrus_stdenc_init_t)
-    (struct _citrus_stdenc * __reatrict, const void * __restrict , size_t,
-    struct _citrus_stdenc_traits * __restrict);
-typedef void (*_citrus_stdenc_uninit_t)(struct _citrus_stdenc * __restrict);
-typedef int (*_citrus_stdenc_init_state_t)
-    (struct _citrus_stdenc * __restrict, void * __restrict);
-typedef int (*_citrus_stdenc_mbtocs_t)
-    (struct _citrus_stdenc * __restrict,
-    _citrus_csid_t * __restrict, _citrus_index_t * __restrict,
-    char ** __restrict, size_t,
-    void * __restrict, size_t * __restrict,
-    struct iconv_hooks *);
-typedef int (*_citrus_stdenc_cstomb_t)
-    (struct _citrus_stdenc *__restrict, char * __restrict, size_t,
-    _citrus_csid_t, _citrus_index_t, void * __restrict,
-    size_t * __restrict, struct iconv_hooks *);
-typedef int (*_citrus_stdenc_mbtowc_t)
-    (struct _citrus_stdenc * __restrict,
-    _citrus_wc_t * __restrict,
-    char ** __restrict, size_t,
-    void * __restrict, size_t * __restrict,
-    struct iconv_hooks *);
-typedef int (*_citrus_stdenc_wctomb_t)
-    (struct _citrus_stdenc *__restrict, char * __restrict, size_t,
-    _citrus_wc_t, void * __restrict, size_t * __restrict,
-    struct iconv_hooks *);
-typedef int (*_citrus_stdenc_put_state_reset_t)
-    (struct _citrus_stdenc *__restrict, char * __restrict, size_t,
-    void * __restrict, size_t * __restrict);
-typedef int (*_citrus_stdenc_get_state_desc_t)
-    (struct _citrus_stdenc * __restrict, void * __restrict, int,
-    struct _citrus_stdenc_state_desc * __restrict);
-
-struct _citrus_stdenc_ops {
-	_citrus_stdenc_init_t		eo_init;
-	_citrus_stdenc_uninit_t		eo_uninit;
-	_citrus_stdenc_init_state_t	eo_init_state;
-	_citrus_stdenc_mbtocs_t		eo_mbtocs;
-	_citrus_stdenc_cstomb_t		eo_cstomb;
-	_citrus_stdenc_mbtowc_t		eo_mbtowc;
-	_citrus_stdenc_wctomb_t		eo_wctomb;
-	_citrus_stdenc_put_state_reset_t eo_put_state_reset;
-	/* version 0x00000002 */
-	_citrus_stdenc_get_state_desc_t	eo_get_state_desc;
-};
-
-struct _citrus_stdenc_traits {
-	/* version 0x00000001 */
-	size_t				 et_state_size;
-	size_t				 et_mb_cur_max;
-};
-
-struct _citrus_stdenc {
-	/* version 0x00000001 */
-	struct _citrus_stdenc_ops	*ce_ops;
-	void				*ce_closure;
-	_citrus_module_t		 ce_module;
-	struct _citrus_stdenc_traits	*ce_traits;
-};
-
-#define _CITRUS_DEFAULT_STDENC_NAME		"NONE"
-
-#endif
diff --git a/lib/libc_bsd/iconv/citrus_stdenc_template.h b/lib/libc_bsd/iconv/citrus_stdenc_template.h
deleted file mode 100644
index c9c7c5a..0000000
--- a/lib/libc_bsd/iconv/citrus_stdenc_template.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_stdenc_template.h 282275 2015-04-30 16:08:47Z tijl $ */
-/* $NetBSD: citrus_stdenc_template.h,v 1.4 2008/02/09 14:56:20 junyoung Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <iconv.h>
-
-/*
- * CAUTION: THIS IS NOT STANDALONE FILE
- *
- * function templates of iconv standard encoding handler for each encodings.
- *
- */
-
-/*
- * macros
- */
-
-#undef _TO_EI
-#undef _CE_TO_EI
-#undef _TO_STATE
-#define _TO_EI(_cl_)	((_ENCODING_INFO*)(_cl_))
-#define _CE_TO_EI(_ce_)	(_TO_EI((_ce_)->ce_closure))
-#define _TO_STATE(_ps_)	((_ENCODING_STATE*)(_ps_))
-
-/* ----------------------------------------------------------------------
- * templates for public functions
- */
-
-int
-_FUNCNAME(stdenc_getops)(struct _citrus_stdenc_ops *ops,
-    size_t lenops __unused)
-{
-
-	memcpy(ops, &_FUNCNAME(stdenc_ops), sizeof(_FUNCNAME(stdenc_ops)));
-
-	return (0);
-}
-
-static int
-_FUNCNAME(stdenc_init)(struct _citrus_stdenc * __restrict ce,
-    const void * __restrict var, size_t lenvar,
-    struct _citrus_stdenc_traits * __restrict et)
-{
-	_ENCODING_INFO *ei;
-	int ret;
-
-	ei = NULL;
-	if (sizeof(_ENCODING_INFO) > 0) {
-		ei = calloc(1, sizeof(_ENCODING_INFO));
-		if (ei == NULL)
-			return (errno);
-	}
-
-	ret = _FUNCNAME(encoding_module_init)(ei, var, lenvar);
-	if (ret) {
-		free((void *)ei);
-		return (ret);
-	}
-
-	ce->ce_closure = ei;
-	et->et_state_size = sizeof(_ENCODING_STATE);
-	et->et_mb_cur_max = _ENCODING_MB_CUR_MAX(_CE_TO_EI(ce));
-
-	return (0);
-}
-
-static void
-_FUNCNAME(stdenc_uninit)(struct _citrus_stdenc * __restrict ce)
-{
-
-	if (ce) {
-		_FUNCNAME(encoding_module_uninit)(_CE_TO_EI(ce));
-		free(ce->ce_closure);
-	}
-}
-
-static int
-_FUNCNAME(stdenc_init_state)(struct _citrus_stdenc * __restrict ce,
-    void * __restrict ps)
-{
-
-	_FUNCNAME(init_state)(_CE_TO_EI(ce), _TO_STATE(ps));
-
-	return (0);
-}
-
-static int
-_FUNCNAME(stdenc_mbtocs)(struct _citrus_stdenc * __restrict ce,
-    _citrus_csid_t * __restrict csid, _citrus_index_t * __restrict idx,
-    char ** __restrict s, size_t n, void * __restrict ps,
-    size_t * __restrict nresult, struct iconv_hooks *hooks)
-{
-	wchar_t wc;
-	int ret;
-
-	ret = _FUNCNAME(mbrtowc_priv)(_CE_TO_EI(ce), &wc, s, n,
-	    _TO_STATE(ps), nresult);
-
-	if ((ret == 0) && *nresult != (size_t)-2)
-		ret = _FUNCNAME(stdenc_wctocs)(_CE_TO_EI(ce), csid, idx, wc);
-
-	if ((ret == 0) && (hooks != NULL) && (hooks->uc_hook != NULL))
-		hooks->uc_hook((unsigned int)*idx, hooks->data);
-	return (ret);
-}
-
-static int
-_FUNCNAME(stdenc_cstomb)(struct _citrus_stdenc * __restrict ce,
-    char * __restrict s, size_t n, _citrus_csid_t csid, _citrus_index_t idx,
-    void * __restrict ps, size_t * __restrict nresult,
-    struct iconv_hooks *hooks __unused)
-{
-	wchar_t wc;
-	int ret;
-
-	wc = ret = 0;
-
-	if (csid != _CITRUS_CSID_INVALID)
-		ret = _FUNCNAME(stdenc_cstowc)(_CE_TO_EI(ce), &wc, csid, idx);
-
-	if (ret == 0)
-		ret = _FUNCNAME(wcrtomb_priv)(_CE_TO_EI(ce), s, n, wc,
-		    _TO_STATE(ps), nresult);
-	return (ret);
-}
-
-static int
-_FUNCNAME(stdenc_mbtowc)(struct _citrus_stdenc * __restrict ce,
-    _citrus_wc_t * __restrict wc, char ** __restrict s, size_t n,
-    void * __restrict ps, size_t * __restrict nresult,
-    struct iconv_hooks *hooks)
-{
-	int ret;
-
-	ret = _FUNCNAME(mbrtowc_priv)(_CE_TO_EI(ce), wc, s, n,
-	    _TO_STATE(ps), nresult);
-	if ((ret == 0) && (hooks != NULL) && (hooks->wc_hook != NULL))
-		hooks->wc_hook(*wc, hooks->data);
-	return (ret);
-}
-
-static int
-_FUNCNAME(stdenc_wctomb)(struct _citrus_stdenc * __restrict ce,
-    char * __restrict s, size_t n, _citrus_wc_t wc, void * __restrict ps,
-    size_t * __restrict nresult, struct iconv_hooks *hooks __unused)
-{
-	int ret;
-
-	ret = _FUNCNAME(wcrtomb_priv)(_CE_TO_EI(ce), s, n, wc, _TO_STATE(ps),
-	    nresult);
-	return (ret);
-}
-
-static int
-_FUNCNAME(stdenc_put_state_reset)(struct _citrus_stdenc * __restrict ce __unused,
-    char * __restrict s __unused, size_t n __unused,
-    void * __restrict ps __unused, size_t * __restrict nresult)
-{
-
-#if _ENCODING_IS_STATE_DEPENDENT
-	return ((_FUNCNAME(put_state_reset)(_CE_TO_EI(ce), s, n, _TO_STATE(ps),
-	    nresult)));
-#else
-	*nresult = 0;
-	return (0);
-#endif
-}
-
-static int
-_FUNCNAME(stdenc_get_state_desc)(struct _citrus_stdenc * __restrict ce,
-    void * __restrict ps, int id,
-    struct _citrus_stdenc_state_desc * __restrict d)
-{
-	int ret;
-
-	switch (id) {
-	case _STDENC_SDID_GENERIC:
-		ret = _FUNCNAME(stdenc_get_state_desc_generic)(
-		    _CE_TO_EI(ce), _TO_STATE(ps), &d->u.generic.state);
-		break;
-	default:
-		ret = EOPNOTSUPP;
-	}
-
-	return (ret);
-}
diff --git a/lib/libc_bsd/iconv/citrus_types.h b/lib/libc_bsd/iconv/citrus_types.h
deleted file mode 100644
index 9aca560..0000000
--- a/lib/libc_bsd/iconv/citrus_types.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/iconv/citrus_types.h 219019 2011-02-25 00:04:39Z gabor $ */
-/* $NetBSD: citrus_types.h,v 1.3 2003/10/27 00:12:42 lukem Exp $ */
-
-/*-
- * Copyright (c)2003 Citrus Project,
- * 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.
- *
- * 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.
- */
-
-#include <sys/types.h>
-
-#ifndef _CITRUS_TYPES_H_
-#define _CITRUS_TYPES_H_
-
-typedef uint32_t		_citrus_wc_t;
-typedef uint32_t		_citrus_index_t;
-typedef uint32_t		_citrus_csid_t;
-#define _CITRUS_CSID_INVALID	((_citrus_csid_t)-1)
-
-#endif
diff --git a/lib/libc_bsd/iconv/iconv-internal.h b/lib/libc_bsd/iconv/iconv-internal.h
deleted file mode 100644
index c461a6d..0000000
--- a/lib/libc_bsd/iconv/iconv-internal.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconv-internal.h 282275 2015-04-30 16:08:47Z tijl $
- */
-
-/*
- * Interal prototypes for our back-end functions.
- */
-size_t	__bsd___iconv(iconv_t, char **, size_t *, char **,
-		size_t *, __uint32_t, size_t *);
-void	__bsd___iconv_free_list(char **, size_t);
-int	__bsd___iconv_get_list(char ***, size_t *, __iconv_bool);
-size_t	__bsd_iconv(iconv_t, char ** __restrict,
-		    size_t * __restrict, char ** __restrict,
-		    size_t * __restrict);
-const char *__bsd_iconv_canonicalize(const char *);
-int	__bsd_iconv_close(iconv_t);
-iconv_t	__bsd_iconv_open(const char *, const char *);
-int	__bsd_iconv_open_into(const char *, const char *, iconv_allocation_t *);
-void	__bsd_iconv_set_relocation_prefix(const char *, const char *);
-int	__bsd_iconvctl(iconv_t, int, void *);
-void	__bsd_iconvlist(int (*) (unsigned int, const char * const *, void *), void *);
diff --git a/lib/libc_bsd/iconv/iconv.3 b/lib/libc_bsd/iconv/iconv.3
deleted file mode 100644
index efaa2e8..0000000
--- a/lib/libc_bsd/iconv/iconv.3
+++ /dev/null
@@ -1,305 +0,0 @@
-.\" $FreeBSD: releng/10.2/lib/libc/iconv/iconv.3 282275 2015-04-30 16:08:47Z tijl $
-.\" $NetBSD: iconv.3,v 1.12 2004/08/02 13:38:21 tshiozak Exp $
-.\"
-.\" Copyright (c) 2003 Citrus Project,
-.\" Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@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.
-.\"
-.\" 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.
-.\"
-.Dd June 16, 2010
-.Dt ICONV 3
-.Os
-.Sh NAME
-.Nm iconv_open ,
-.Nm iconv_open_into ,
-.Nm iconv_close ,
-.Nm iconv
-.Nd codeset conversion functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In iconv.h
-.Ft iconv_t
-.Fn iconv_open "const char *dstname" "const char *srcname"
-.Ft int
-.Fn iconv_open_into "const char *dstname" "const char *srcname" "iconv_allocation_t *ptr"
-.Ft int
-.Fn iconv_close "iconv_t cd"
-.Ft size_t
-.Fn iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft"
-.Ft size_t
-.Fn __iconv "iconv_t cd" "char ** restrict src" "size_t * restrict srcleft" "char ** restrict dst" "size_t * restrict dstleft" "uint32_t flags" "size_t * invalids"
-.Sh DESCRIPTION
-The
-.Fn iconv_open
-function opens a converter from the codeset
-.Fa srcname
-to the codeset
-.Fa dstname
-and returns its descriptor.
-The arguments
-.Fa srcname
-and
-.Fa dstname
-accept "" and "char", which refer to the current locale encoding.
-.Pp
-The
-.Fn iconv_open_into
-creates a conversion descriptor on a preallocated space.
-The
-.Ft iconv_allocation_t
-is used as a spaceholder type when allocating such space.
-The
-.Fa dstname
-and
-.Fa srcname
-arguments are the same as in the case of
-.Fn iconv_open .
-The
-.Fa ptr
-argument is a pointer of
-.Ft iconv_allocation_t
-to the preallocated space.
-.Pp
-The
-.Fn iconv_close
-function closes the specified converter
-.Fa cd .
-.Pp
-The
-.Fn iconv
-function converts the string in the buffer
-.Fa *src
-of length
-.Fa *srcleft
-bytes and stores the converted string in the buffer
-.Fa *dst
-of size
-.Fa *dstleft
-bytes.
-After calling
-.Fn iconv ,
-the values pointed to by
-.Fa src ,
-.Fa srcleft ,
-.Fa dst ,
-and
-.Fa dstleft
-are updated as follows:
-.Bl -tag -width 01234567
-.It *src
-Pointer to the byte just after the last character fetched.
-.It *srcleft
-Number of remaining bytes in the source buffer.
-.It *dst
-Pointer to the byte just after the last character stored.
-.It *dstleft
-Number of remainder bytes in the destination buffer.
-.El
-.Pp
-If the string pointed to by
-.Fa *src
-contains a byte sequence which is not a valid character in the source
-codeset, the conversion stops just after the last successful conversion.
-If the output buffer is too small to store the converted
-character, the conversion also stops in the same way.
-In these cases, the values pointed to by
-.Fa src ,
-.Fa srcleft ,
-.Fa dst ,
-and
-.Fa dstleft
-are updated to the state just after the last successful conversion.
-.Pp
-If the string pointed to by
-.Fa *src
-contains a character which is valid under the source codeset but
-can not be converted to the destination codeset,
-the character is replaced by an
-.Dq invalid character
-which depends on the destination codeset, e.g.,
-.Sq \&? ,
-and the conversion is continued.
-.Fn iconv
-returns the number of such
-.Dq invalid conversions .
-.Pp
-There are two special cases of
-.Fn iconv :
-.Bl -tag -width 0123
-.It "src == NULL || *src == NULL"
-If the source and/or destination codesets are stateful,
-.Fn iconv
-places these into their initial state.
-.Pp
-If both
-.Fa dst
-and
-.Fa *dst
-are
-.No non- Ns Dv NULL ,
-.Fn iconv
-stores the shift sequence for the destination switching to the initial state
-in the buffer pointed to by
-.Fa *dst .
-The buffer size is specified by the value pointed to by
-.Fa dstleft
-as above.
-.Fn iconv
-will fail if the buffer is too small to store the shift sequence.
-.Pp
-On the other hand,
-.Fa dst
-or
-.Fa *dst
-may be
-.Dv NULL .
-In this case, the shift sequence for the destination switching
-to the initial state is discarded.
-.Pp
-.El
-The
-.Fn __iconv
-function works just like
-.Fn iconv
-but if
-.Fn iconv
-fails, the invalid character count is lost there.
-This is a not bug rather a limitation of
-.St -p1003.1-2008 ,
-so
-.Fn __iconv
-is provided as an alternative but non-standard interface.
-It also has a flags argument, where currently the following
-flags can be passed:
-.Bl -tag -width 0123
-.It __ICONV_F_HIDE_INVALID
-Skip invalid characters, instead of returning with an error.
-.El
-.Sh RETURN VALUES
-Upon successful completion of
-.Fn iconv_open ,
-it returns a conversion descriptor.
-Otherwise,
-.Fn iconv_open
-returns (iconv_t)\-1 and sets errno to indicate the error.
-.Pp
-Upon successful completion of
-.Fn iconv_open_into ,
-it returns 0.
-Otherwise,
-.Fn iconv_open_into
-returns \-1, and sets errno to indicate the error.
-.Pp
-Upon successful completion of
-.Fn iconv_close ,
-it returns 0.
-Otherwise,
-.Fn iconv_close
-returns \-1 and sets errno to indicate the error.
-.Pp
-Upon successful completion of
-.Fn iconv ,
-it returns the number of
-.Dq invalid
-conversions.
-Otherwise,
-.Fn iconv
-returns (size_t)\-1 and sets errno to indicate the error.
-.Sh ERRORS
-The
-.Fn iconv_open
-function may cause an error in the following cases:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Memory is exhausted.
-.It Bq Er EINVAL
-There is no converter specified by
-.Fa srcname
-and
-.Fa dstname .
-.El
-The
-.Fn iconv_open_into
-function may cause an error in the following cases:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-There is no converter specified by
-.Fa srcname
-and
-.Fa dstname .
-.El
-.Pp
-The
-.Fn iconv_close
-function may cause an error in the following case:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The conversion descriptor specified by
-.Fa cd
-is invalid.
-.El
-.Pp
-The
-.Fn iconv
-function may cause an error in the following cases:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The conversion descriptor specified by
-.Fa cd
-is invalid.
-.It Bq Er EILSEQ
-The string pointed to by
-.Fa *src
-contains a byte sequence which does not describe a valid character of
-the source codeset.
-.It Bq Er E2BIG
-The output buffer pointed to by
-.Fa *dst
-is too small to store the result string.
-.It Bq Er EINVAL
-The string pointed to by
-.Fa *src
-terminates with an incomplete character or shift sequence.
-.El
-.Sh SEE ALSO
-.Xr iconv 1 ,
-.Xr mkcsmapper 1 ,
-.Xr mkesdb 1
-.Sh STANDARDS
-The
-.Fn iconv_open ,
-.Fn iconv_close ,
-and
-.Fn iconv
-functions conform to
-.St -p1003.1-2008 .
-.Pp
-The
-.Fn iconv_open_into
-function is a GNU-specific extension and it is not part of any standard,
-thus its use may break portability.
-The
-.Fn __iconv
-function is an own extension and it is not part of any standard,
-thus its use may break portability.
diff --git a/lib/libc_bsd/iconv/iconv.c b/lib/libc_bsd/iconv/iconv.c
deleted file mode 100644
index 07eecbc..0000000
--- a/lib/libc_bsd/iconv/iconv.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconv.c 282275 2015-04-30 16:08:47Z tijl $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-size_t
-iconv(iconv_t a, char ** __restrict b,
-      size_t * __restrict c, char ** __restrict d,
-      size_t * __restrict e)
-{
-	return __bsd_iconv(a, b, c, d, e);
-}
diff --git a/lib/libc_bsd/iconv/iconv_canonicalize.3 b/lib/libc_bsd/iconv/iconv_canonicalize.3
deleted file mode 100644
index 68d8702..0000000
--- a/lib/libc_bsd/iconv/iconv_canonicalize.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" Copyright (c) 2009 Gabor Kovesdan <gabor@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/iconv/iconv_canonicalize.3 219019 2011-02-25 00:04:39Z gabor $
-.\"
-.Dd October 20, 2009
-.Dt ICONV_CANONICALIZE 3
-.Os
-.Sh NAME
-.Nm iconv_canonicalize
-.Nd resolving character encoding names to canonical form
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In iconv.h
-.Ft const char *
-.Fn iconv_canonicalize "const char *name"
-.Sh DESCRIPTION
-The
-.Fn iconv_canonicalize
-function resolves the character encoding name specified by the
-.Fa name
-argument to its canonical form.
-.Sh RETURN VALUES
-Upon successful completion
-.Fn iconv_canonicalize ,
-returns the canonical name of the given encoding.
-If the specified name is already a canonical name, the same
-value is returned.
-If the specified name is not an existing character encoding
-name, NULL is returned.
-.Sh SEE ALSO
-.Xr iconv 3
-.Sh STANDARDS
-The
-.Nm
-function is a non-standard extension, which appeared in
-the GNU implementation and was adopted in
-.Fx 9
-for compatibility's sake.
-.Sh AUTHORS
-This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
diff --git a/lib/libc_bsd/iconv/iconv_canonicalize.c b/lib/libc_bsd/iconv/iconv_canonicalize.c
deleted file mode 100644
index ccb02a8..0000000
--- a/lib/libc_bsd/iconv/iconv_canonicalize.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconv_canonicalize.c 258750 2013-11-29 19:44:30Z gjb $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-const char *
-iconv_canonicalize(const char *a)
-{
-	return __bsd_iconv_canonicalize(a);
-}
diff --git a/lib/libc_bsd/iconv/iconv_close.c b/lib/libc_bsd/iconv/iconv_close.c
deleted file mode 100644
index 267e4b5..0000000
--- a/lib/libc_bsd/iconv/iconv_close.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconv_close.c 258750 2013-11-29 19:44:30Z gjb $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-int
-iconv_close(iconv_t a)
-{
-	return __bsd_iconv_close(a);
-}
diff --git a/lib/libc_bsd/iconv/iconv_compat.c b/lib/libc_bsd/iconv/iconv_compat.c
deleted file mode 100644
index 7f22478..0000000
--- a/lib/libc_bsd/iconv/iconv_compat.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconv_compat.c 282275 2015-04-30 16:08:47Z tijl $
- */
-
-/*
- * These are ABI implementations for when the raw iconv_* symbol
- * space was exposed via libc.so.7 in its early life.  This is
- * a transition aide, these wrappers will not normally ever be
- * executed except via __sym_compat() references.
- */
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-size_t
-__iconv_compat(iconv_t a, char ** b, size_t * c, char ** d,
-     size_t * e, __uint32_t f, size_t *g)
-{
-	return __bsd___iconv(a, b, c, d, e, f, g);
-}
-
-void
-__iconv_free_list_compat(char ** a, size_t b)
-{
-	__bsd___iconv_free_list(a, b);
-}
-
-int
-__iconv_get_list_compat(char ***a, size_t *b, __iconv_bool c)
-{
-	return __bsd___iconv_get_list(a, b, c);
-}
-
-size_t
-iconv_compat(iconv_t a, char ** __restrict b,
-      size_t * __restrict c, char ** __restrict d,
-      size_t * __restrict e)
-{
-	return __bsd_iconv(a, b, c, d, e);
-}
-
-const char *
-iconv_canonicalize_compat(const char *a)
-{
-	return __bsd_iconv_canonicalize(a);
-}
-
-int
-iconv_close_compat(iconv_t a)
-{
-	return __bsd_iconv_close(a);
-}
-
-iconv_t
-iconv_open_compat(const char *a, const char *b)
-{
-	return __bsd_iconv_open(a, b);
-}
-
-int
-iconv_open_into_compat(const char *a, const char *b, iconv_allocation_t *c)
-{
-	return __bsd_iconv_open_into(a, b, c);
-}
-
-void
-iconv_set_relocation_prefix_compat(const char *a, const char *b)
-{
-	return __bsd_iconv_set_relocation_prefix(a, b);
-}
-
-int
-iconvctl_compat(iconv_t a, int b, void *c)
-{
-	return __bsd_iconvctl(a, b, c);
-}
-
-void
-iconvlist_compat(int (*a) (unsigned int, const char * const *, void *), void *b)
-{
-	return __bsd_iconvlist(a, b);
-}
-
-int _iconv_version_compat = 0x0108;	/* Magic - not used */
-
-__sym_compat(__iconv, __iconv_compat, FBSD_1.2);
-__sym_compat(__iconv_free_list, __iconv_free_list_compat, FBSD_1.2);
-__sym_compat(__iconv_get_list, __iconv_get_list_compat, FBSD_1.2);
-__sym_compat(_iconv_version, _iconv_version_compat, FBSD_1.3);
-__sym_compat(iconv, iconv_compat, FBSD_1.3);
-__sym_compat(iconv_canonicalize, iconv_canonicalize_compat, FBSD_1.2);
-__sym_compat(iconv_close, iconv_close_compat, FBSD_1.3);
-__sym_compat(iconv_open, iconv_open_compat, FBSD_1.3);
-__sym_compat(iconv_open_into, iconv_open_into_compat, FBSD_1.3);
-__sym_compat(iconv_set_relocation_prefix, iconv_set_relocation_prefix_compat, FBSD_1.3);
-__sym_compat(iconvctl, iconvctl_compat, FBSD_1.3);
-__sym_compat(iconvlist, iconvlist_compat, FBSD_1.3);
diff --git a/lib/libc_bsd/iconv/iconv_open.c b/lib/libc_bsd/iconv/iconv_open.c
deleted file mode 100644
index 29f1e0b..0000000
--- a/lib/libc_bsd/iconv/iconv_open.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconv_open.c 258750 2013-11-29 19:44:30Z gjb $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-iconv_t
-iconv_open(const char *a, const char *b)
-{
-	return __bsd_iconv_open(a, b);
-}
diff --git a/lib/libc_bsd/iconv/iconv_open_into.c b/lib/libc_bsd/iconv/iconv_open_into.c
deleted file mode 100644
index a4fae90..0000000
--- a/lib/libc_bsd/iconv/iconv_open_into.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconv_open_into.c 258750 2013-11-29 19:44:30Z gjb $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-int
-iconv_open_into(const char *a, const char *b, iconv_allocation_t *c)
-{
-	return __bsd_iconv_open_into(a, b, c);
-}
diff --git a/lib/libc_bsd/iconv/iconv_set_relocation_prefix.c b/lib/libc_bsd/iconv/iconv_set_relocation_prefix.c
deleted file mode 100644
index 86f7754..0000000
--- a/lib/libc_bsd/iconv/iconv_set_relocation_prefix.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconv_set_relocation_prefix.c 258750 2013-11-29 19:44:30Z gjb $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-void
-iconv_set_relocation_prefix(const char *a, const char *b)
-{
-	return __bsd_iconv_set_relocation_prefix(a, b);
-}
diff --git a/lib/libc_bsd/iconv/iconvctl.3 b/lib/libc_bsd/iconv/iconvctl.3
deleted file mode 100644
index 2c88a0a..0000000
--- a/lib/libc_bsd/iconv/iconvctl.3
+++ /dev/null
@@ -1,189 +0,0 @@
-.\" Copyright (c) 2009 Gabor Kovesdan <gabor@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/iconv/iconvctl.3 258750 2013-11-29 19:44:30Z gjb $
-.\"
-.Dd November 25, 2009
-.Dt ICONVCTL 3
-.Os
-.Sh NAME
-.Nm iconvctl
-.Nd controlling and diagnostical facility for
-.Xr iconv 3
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In iconv.h
-.Ft int
-.Fn iconvctl "iconv_t cd" "int request" "void *argument"
-.Sh DESCRIPTION
-The
-.Fn iconvctl
-function can retrieve or set specific conversion
-setting from the
-.Fa cd
-conversion descriptor.
-The
-.Fa request
-parameter specifies the operation to accomplish and
-.Fa argument
-is an operation-specific argument.
-.Pp
-The possible operations are the following:
-.Bl -tag -width indent
-.It ICONV_TRIVIALP
-In this case
-.Fa argument
-is an
-.Ft int *
-variable, which is set to 1 if the encoding is trivial one, i.e.
-the input and output encodings are the same.
-Otherwise, the variable will be 0.
-.It ICONV_GET_TRANSLITERATE
-Determines if transliteration is enabled.
-The answer is stored in
-.Fa argument ,
-which is of
-.Ft int * .
-It will be set to 1 if this feature is enabled or set to 0 otherwise.
-.It ICONV_SET_TRANSLITERATE
-Enables transliteration if
-.Fa argument ,
-which is of
-.Ft int *
-set to 1 or disables it if
-.Fa argument
-is set to 0.
-.It ICONV_GET_DISCARD_ILSEQ
-Determines if illegal sequences are discarded or not.
-The answer is stored in
-.Fa argument ,
-which is of
-.Ft int * .
-It will be set to 1 if this feature is enabled or set to 0 otherwise.
-.It ICONV_SET_DISCARD_ILSEQ
-Sets whether illegal sequences are discarded or not.
-.Fa argument ,
-which is of
-.Ft int *
-set to 1 or disables it if
-.Fa argument
-is set to 0.
-.It ICONV_SET_HOOKS
-Sets callback functions, which will be called back after successful
-conversions.
-The callback functions are stored in a
-.Ft struct iconv_hooks
-variable, which is passed to
-.Nm
-via
-.Fa argument
-by its address.
-.It ICONV_GET_ILSEQ_INVALID
-Determines if a character in the input buffer that is valid,
-but for which an identical character does not exist in the target
-codeset returns
-.Er EILSEQ
-or not.
-The answer is stored in
-.Fa argument ,
-which is of
-.Ft int * .
-It will be set to 1 if this feature is enabled or set to 0 otherwise.
-.It ICONV_SET_ILSEQ_INVALID
-Sets whether a character in the input buffer that is valid,
-but for which an identical character does not exist in the target
-codeset returns
-.Er EILSEQ
-or not.
-If
-.Fa argument ,
-which is of
-.Ft int *
-is set to 1 it will be enabled,
-and if
-.Fa argument
-is set to 0 it will be disabled.
-.El
-.\" XXX: fallbacks are unimplemented and trying to set them will always
-.\"      return EOPNOTSUPP but definitions are provided for source-level
-.\"      compatibility.
-.\".It ICONV_SET_FALLBACKS
-.\"Sets callback functions, which will be called back after failed
-.\"conversions.
-.\"The callback functions are stored in a
-.\".Ft struct iconv_fallbacks
-.\"variable, which is passed to
-.\".Nm
-.\"via
-.\".Fa argument
-.\"by its address.
-.Sh RETURN VALUES
-Upon successful completion
-.Fn iconvctl ,
-returns 0.
-Otherwise, \-1 is returned and errno is set to
-specify the kind of error.
-.Sh ERRORS
-The
-.Fn iconvctl
-function may cause an error in the following cases:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Unknown or unimplemented operation.
-.It Bq Er EBADF
-The conversion descriptor specified by
-.Fa cd
-is invalid.
-.El
-.Sh SEE ALSO
-.Xr iconv 1 ,
-.Xr iconv 3
-.Sh STANDARDS
-The
-.Nm
-facility is a non-standard extension, which appeared in
-the GNU implementation and was adopted in
-.Fx 9
-for compatibility's sake.
-.Sh AUTHORS
-This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
-.Sh BUGS
-Transliteration is enabled in this implementation by default, so it
-is impossible by design to turn it off.
-Accordingly, trying to turn it off will always fail and \-1 will be
-returned.
-Getting the transliteration state will always succeed and indicate
-that it is turned on, though.
diff --git a/lib/libc_bsd/iconv/iconvctl.c b/lib/libc_bsd/iconv/iconvctl.c
deleted file mode 100644
index 910232d..0000000
--- a/lib/libc_bsd/iconv/iconvctl.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconvctl.c 258750 2013-11-29 19:44:30Z gjb $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-int
-iconvctl(iconv_t a, int b, void *c)
-{
-	return __bsd_iconvctl(a, b, c);
-}
diff --git a/lib/libc_bsd/iconv/iconvlist.3 b/lib/libc_bsd/iconv/iconvlist.3
deleted file mode 100644
index 2fb21e8..0000000
--- a/lib/libc_bsd/iconv/iconvlist.3
+++ /dev/null
@@ -1,93 +0,0 @@
-.\" Copyright (c) 2009 Gabor Kovesdan <gabor@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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/iconv/iconvlist.3 233625 2012-03-28 19:20:28Z joel $
-.\"
-.Dd October 20, 2009
-.Dt ICONVLIST 3
-.Os
-.Sh NAME
-.Nm iconvlist
-.Nd retrieving a list of character encodings supported by
-.Xr iconv 3
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In iconv.h
-.Ft void
-.Fo iconvlist
-.Fa "int \*[lp]*do_one\*[rp]\*[lp]unsigned int *count, const char * const *names, void *arg\*[rp]"
-.Fa "void *arg"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn iconvlist
-function obtains a list of character encodings that are supported by the
-.Xr iconv 3
-call.
-The
-.Fn do_one
-callback function will be called, where the
-.Fa count
-argument will be set to the number of the encoding names found, the
-.Fa names
-argument will be the list of the supported encoding names and the
-.Fa arg
-argument will be the \"outer\"
-.Fa arg
-argument of the
-.Fn iconvlist
-function.
-This argument can be used to interchange custom data between the caller of
-.Fn iconvlist
-and the callback function.
-.Pp
-If an error occurs,
-.Fa names
-will be NULL when calling
-.Fn do_one .
-.Sh SEE ALSO
-.Xr iconv 3 ,
-.Xr __iconv_get_list 3 ,
-.Xr __iconv_free_list 3
-.Sh STANDARDS
-The
-.Nm
-function is a non-standard extension, which appeared in
-the GNU implementation and was adopted in
-.Fx 9
-for compatibility's sake.
-.Sh AUTHORS
-This manual page was written by
-.An Gabor Kovesdan Aq gabor@FreeBSD.org .
diff --git a/lib/libc_bsd/iconv/iconvlist.c b/lib/libc_bsd/iconv/iconvlist.c
deleted file mode 100644
index 654254b..0000000
--- a/lib/libc_bsd/iconv/iconvlist.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * Copyright (c) 2013 Peter Wemm
- * 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.
- *
- * 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: releng/10.2/lib/libc/iconv/iconvlist.c 258750 2013-11-29 19:44:30Z gjb $
- */
-
-#include <sys/types.h>
-#include <iconv.h>
-#include "iconv-internal.h"
-
-void
-iconvlist(int (*a) (unsigned int, const char * const *, void *), void *b)
-{
-	return __bsd_iconvlist(a, b);
-}
diff --git a/lib/libc_bsd/include/compat.h b/lib/libc_bsd/include/compat.h
deleted file mode 100644
index 2e0fa48..0000000
--- a/lib/libc_bsd/include/compat.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2009 Hudson River Trading LLC
- * Written by: John H. Baldwin <jhb@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.
- *
- * 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: releng/10.2/lib/libc/include/compat.h 283927 2015-06-02 19:20:39Z jhb $
- */
-
-/*
- * This file defines compatiblity symbol versions for old system calls.  It
- * is included in all generated system call files.
- */
-
-#ifndef __LIBC_COMPAT_H__
-#define	__LIBC_COMPAT_H__
-
-#define	__sym_compat(sym,impl,verid)	\
-	.symver impl, sym@verid
-
-__sym_compat(__semctl, freebsd7___semctl, FBSD_1.0);
-__sym_compat(msgctl, freebsd7_msgctl, FBSD_1.0);
-__sym_compat(shmctl, freebsd7_shmctl, FBSD_1.0);
-
-#undef __sym_compat
-
-#define	__weak_reference(sym,alias)	\
-	.weak	alias;.equ	alias,sym
-
-#ifndef SYSCALL_COMPAT
-__weak_reference(__sys_fcntl,__fcntl_compat)
-#endif
-
-#undef __weak_reference
-
-#endif	/* __LIBC_COMPAT_H__ */
-
diff --git a/lib/libc_bsd/include/errlst.h b/lib/libc_bsd/include/errlst.h
deleted file mode 100644
index 16287ac..0000000
--- a/lib/libc_bsd/include/errlst.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2013 Jilles Tjoelker
- * 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.
- *
- * 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: releng/10.2/lib/libc/include/errlst.h 255108 2013-08-31 22:32:42Z jilles $
- */
-
-#ifndef __ERRLST_H__
-#define __ERRLST_H__
-
-#include <sys/cdefs.h>
-
-#ifdef PIC
-/* If the main executable imports these, do not use its copy from libc.so. */
-extern const char *const __hidden_sys_errlist[] __hidden;
-extern const int __hidden_sys_nerr __hidden;
-#else
-#define __hidden_sys_errlist sys_errlist
-#define __hidden_sys_nerr sys_nerr
-#endif
-
-#endif /* __ERRLST_H__ */
diff --git a/lib/libc_bsd/include/fpmath.h b/lib/libc_bsd/include/fpmath.h
deleted file mode 100644
index 5bc6115..0000000
--- a/lib/libc_bsd/include/fpmath.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2002 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/include/fpmath.h 186461 2008-12-23 22:20:59Z marcel $
- */
-
-#include <sys/endian.h>
-#include "_fpmath.h"
-
-#ifndef _IEEE_WORD_ORDER
-#define	_IEEE_WORD_ORDER	_BYTE_ORDER
-#endif
-
-union IEEEf2bits {
-	float	f;
-	struct {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-		unsigned int	man	:23;
-		unsigned int	exp	:8;
-		unsigned int	sign	:1;
-#else /* _BIG_ENDIAN */
-		unsigned int	sign	:1;
-		unsigned int	exp	:8;
-		unsigned int	man	:23;
-#endif
-	} bits;
-};
-
-#define	DBL_MANH_SIZE	20
-#define	DBL_MANL_SIZE	32
-
-union IEEEd2bits {
-	double	d;
-	struct {
-#if _BYTE_ORDER == _LITTLE_ENDIAN
-#if _IEEE_WORD_ORDER == _LITTLE_ENDIAN
-		unsigned int	manl	:32;
-#endif
-		unsigned int	manh	:20;
-		unsigned int	exp	:11;
-		unsigned int	sign	:1;
-#if _IEEE_WORD_ORDER == _BIG_ENDIAN
-		unsigned int	manl	:32;
-#endif
-#else /* _BIG_ENDIAN */
-		unsigned int	sign	:1;
-		unsigned int	exp	:11;
-		unsigned int	manh	:20;
-		unsigned int	manl	:32;
-#endif
-	} bits;
-};
diff --git a/lib/libc_bsd/include/isc/eventlib.h b/lib/libc_bsd/include/isc/eventlib.h
deleted file mode 100644
index a4cfdf9..0000000
--- a/lib/libc_bsd/include/isc/eventlib.h
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1995-1999, 2001, 2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* eventlib.h - exported interfaces for eventlib
- * vix 09sep95 [initial]
- *
- * $Id: eventlib.h,v 1.7 2008/11/14 02:36:51 marka Exp $
- */
-
-#ifndef _EVENTLIB_H
-#define _EVENTLIB_H
-
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <sys/time.h>
-#include <stdio.h>
-
-#include <isc/platform.h>
-
-#ifndef __P
-# define __EVENTLIB_P_DEFINED
-# ifdef __STDC__
-#  define __P(x) x
-# else
-#  define __P(x) ()
-# endif
-#endif
-
-/* In the absence of branded types... */
-typedef struct { void *opaque; } evConnID;
-typedef struct { void *opaque; } evFileID;
-typedef struct { void *opaque; } evStreamID;
-typedef struct { void *opaque; } evTimerID;
-typedef struct { void *opaque; } evWaitID;
-typedef struct { void *opaque; } evContext;
-typedef struct { void *opaque; } evEvent;
-
-#define	evInitID(id) ((id)->opaque = NULL)
-#define	evTestID(id) ((id).opaque != NULL)
-
-typedef void (*evConnFunc)__P((evContext, void *, int, const void *, int,
-			       const void *, int));
-typedef void (*evFileFunc)__P((evContext, void *, int, int));
-typedef	void (*evStreamFunc)__P((evContext, void *, int, int));
-typedef void (*evTimerFunc)__P((evContext, void *,
-				struct timespec, struct timespec));
-typedef	void (*evWaitFunc)__P((evContext, void *, const void *));
-
-typedef	struct { unsigned char mask[256/8]; } evByteMask;
-#define	EV_BYTEMASK_BYTE(b) ((b) / 8)
-#define	EV_BYTEMASK_MASK(b) (1 << ((b) % 8))
-#define	EV_BYTEMASK_SET(bm, b) \
-	((bm).mask[EV_BYTEMASK_BYTE(b)] |= EV_BYTEMASK_MASK(b))
-#define	EV_BYTEMASK_CLR(bm, b) \
-	((bm).mask[EV_BYTEMASK_BYTE(b)] &= ~EV_BYTEMASK_MASK(b))
-#define	EV_BYTEMASK_TST(bm, b) \
-	((bm).mask[EV_BYTEMASK_BYTE(b)] & EV_BYTEMASK_MASK(b))
-
-#define	EV_POLL		1
-#define	EV_WAIT		2
-#define	EV_NULL		4
-
-#define	EV_READ		1
-#define	EV_WRITE	2
-#define	EV_EXCEPT	4
-
-#define EV_WASNONBLOCKING 8	/* Internal library use. */
-
-/* eventlib.c */
-#define evCreate	__evCreate
-#define evSetDebug	__evSetDebug
-#define evDestroy	__evDestroy
-#define evGetNext	__evGetNext
-#define evDispatch	__evDispatch
-#define evDrop		__evDrop
-#define evMainLoop	__evMainLoop
-#define evHighestFD	__evHighestFD
-#define evGetOption	__evGetOption
-#define evSetOption	__evSetOption
-
-int  evCreate __P((evContext *));
-void evSetDebug __P((evContext, int, FILE *));
-int  evDestroy __P((evContext));
-int  evGetNext __P((evContext, evEvent *, int));
-int  evDispatch __P((evContext, evEvent));
-void evDrop __P((evContext, evEvent));
-int  evMainLoop __P((evContext));
-int  evHighestFD __P((evContext));
-int  evGetOption __P((evContext *, const char *, int *));
-int  evSetOption __P((evContext *, const char *, int));
-
-/* ev_connects.c */
-#define evListen	__evListen
-#define evConnect	__evConnect
-#define evCancelConn	__evCancelConn
-#define evHold		__evHold
-#define evUnhold	__evUnhold
-#define evTryAccept	__evTryAccept
-
-int evListen __P((evContext, int, int, evConnFunc, void *, evConnID *));
-int evConnect __P((evContext, int, const void *, int,
-		   evConnFunc, void *, evConnID *));
-int evCancelConn __P((evContext, evConnID));
-int evHold __P((evContext, evConnID));
-int evUnhold __P((evContext, evConnID));
-int evTryAccept __P((evContext, evConnID, int *));
-
-/* ev_files.c */
-#define evSelectFD	__evSelectFD
-#define evDeselectFD	__evDeselectFD
-
-int evSelectFD __P((evContext, int, int, evFileFunc, void *, evFileID *));
-int evDeselectFD __P((evContext, evFileID));
-
-/* ev_streams.c */
-#define evConsIovec	__evConsIovec
-#define evWrite		__evWrite
-#define evRead		__evRead
-#define evTimeRW	__evTimeRW
-#define evUntimeRW	__evUntimeRW
-#define	evCancelRW	__evCancelRW
-
-struct iovec evConsIovec __P((void *, size_t));
-int evWrite __P((evContext, int, const struct iovec *, int,
-		 evStreamFunc func, void *, evStreamID *));
-int evRead __P((evContext, int, const struct iovec *, int,
-		evStreamFunc func, void *, evStreamID *));
-int evTimeRW __P((evContext, evStreamID, evTimerID timer));
-int evUntimeRW __P((evContext, evStreamID));
-int evCancelRW __P((evContext, evStreamID));
-
-/* ev_timers.c */
-#define evConsTime	__evConsTime
-#define evAddTime	__evAddTime
-#define evSubTime	__evSubTime
-#define evCmpTime	__evCmpTime
-#define	evTimeSpec	__evTimeSpec
-#define	evTimeVal	__evTimeVal
-
-#define evNowTime		__evNowTime
-#define evUTCTime		__evUTCTime
-#define evLastEventTime		__evLastEventTime
-#define evSetTimer		__evSetTimer
-#define evClearTimer		__evClearTimer
-#define evConfigTimer		__evConfigTimer
-#define evResetTimer		__evResetTimer
-#define evSetIdleTimer		__evSetIdleTimer
-#define evClearIdleTimer	__evClearIdleTimer
-#define evResetIdleTimer	__evResetIdleTimer
-#define evTouchIdleTimer	__evTouchIdleTimer
-
-struct timespec evConsTime __P((time_t sec, long nsec));
-struct timespec evAddTime __P((struct timespec, struct timespec));
-struct timespec evSubTime __P((struct timespec, struct timespec));
-struct timespec evNowTime __P((void));
-struct timespec evUTCTime __P((void));
-struct timespec evLastEventTime __P((evContext));
-struct timespec evTimeSpec __P((struct timeval));
-struct timeval evTimeVal __P((struct timespec));
-int evCmpTime __P((struct timespec, struct timespec));
-int evSetTimer __P((evContext, evTimerFunc, void *, struct timespec,
-		    struct timespec, evTimerID *));
-int evClearTimer __P((evContext, evTimerID));
-int evConfigTimer __P((evContext, evTimerID, const char *param,
-		      int value));
-int evResetTimer __P((evContext, evTimerID, evTimerFunc, void *,
-		      struct timespec, struct timespec));
-int evSetIdleTimer __P((evContext, evTimerFunc, void *, struct timespec,
-			evTimerID *));
-int evClearIdleTimer __P((evContext, evTimerID));
-int evResetIdleTimer __P((evContext, evTimerID, evTimerFunc, void *,
-			  struct timespec));
-int evTouchIdleTimer __P((evContext, evTimerID));
-
-/* ev_waits.c */
-#define evWaitFor	__evWaitFor
-#define evDo		__evDo
-#define evUnwait	__evUnwait
-#define evDefer		__evDefer
-
-int evWaitFor __P((evContext, const void *, evWaitFunc, void *, evWaitID *));
-int evDo __P((evContext, const void *));
-int evUnwait __P((evContext, evWaitID));
-int evDefer __P((evContext, evWaitFunc, void *));
-
-#ifdef __EVENTLIB_P_DEFINED
-# undef __P
-#endif
-
-#endif /*_EVENTLIB_H*/
-
-/*! \file */
diff --git a/lib/libc_bsd/include/isc/list.h b/lib/libc_bsd/include/isc/list.h
deleted file mode 100644
index 6d0f8e1..0000000
--- a/lib/libc_bsd/include/isc/list.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1997,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $FreeBSD: releng/10.2/lib/libc/include/isc/list.h 270838 2014-08-30 10:16:25Z ume $ */
-
-#ifndef LIST_H
-#define LIST_H 1
-#ifdef _LIBC
-#include <assert.h>
-#define INSIST(cond)	assert(cond)
-#else
-#include <isc/assertions.h>
-#endif
-
-#define LIST(type) struct { type *head, *tail; }
-#define INIT_LIST(list) \
-	do { (list).head = NULL; (list).tail = NULL; } while (0)
-
-#define LINK(type) struct { type *prev, *next; }
-#define INIT_LINK_TYPE(elt, link, type) \
-	do { \
-		(elt)->link.prev = (type *)(-1); \
-		(elt)->link.next = (type *)(-1); \
-	} while (0)
-#define INIT_LINK(elt, link) \
-	INIT_LINK_TYPE(elt, link, void)
-#define LINKED(elt, link) ((void *)((elt)->link.prev) != (void *)(-1) && \
-			   (void *)((elt)->link.next) != (void *)(-1))
-
-#define HEAD(list) ((list).head)
-#define TAIL(list) ((list).tail)
-#define EMPTY(list) ((list).head == NULL)
-
-#define PREPEND(list, elt, link) \
-	do { \
-		INSIST(!LINKED(elt, link));\
-		if ((list).head != NULL) \
-			(list).head->link.prev = (elt); \
-		else \
-			(list).tail = (elt); \
-		(elt)->link.prev = NULL; \
-		(elt)->link.next = (list).head; \
-		(list).head = (elt); \
-	} while (0)
-
-#define APPEND(list, elt, link) \
-	do { \
-		INSIST(!LINKED(elt, link));\
-		if ((list).tail != NULL) \
-			(list).tail->link.next = (elt); \
-		else \
-			(list).head = (elt); \
-		(elt)->link.prev = (list).tail; \
-		(elt)->link.next = NULL; \
-		(list).tail = (elt); \
-	} while (0)
-
-#define UNLINK_TYPE(list, elt, link, type) \
-	do { \
-		INSIST(LINKED(elt, link));\
-		if ((elt)->link.next != NULL) \
-			(elt)->link.next->link.prev = (elt)->link.prev; \
-		else { \
-			INSIST((list).tail == (elt)); \
-			(list).tail = (elt)->link.prev; \
-		} \
-		if ((elt)->link.prev != NULL) \
-			(elt)->link.prev->link.next = (elt)->link.next; \
-		else { \
-			INSIST((list).head == (elt)); \
-			(list).head = (elt)->link.next; \
-		} \
-		INIT_LINK_TYPE(elt, link, type); \
-	} while (0)
-#define UNLINK(list, elt, link) \
-	UNLINK_TYPE(list, elt, link, void)
-
-#define PREV(elt, link) ((elt)->link.prev)
-#define NEXT(elt, link) ((elt)->link.next)
-
-#define INSERT_BEFORE(list, before, elt, link) \
-	do { \
-		INSIST(!LINKED(elt, link));\
-		if ((before)->link.prev == NULL) \
-			PREPEND(list, elt, link); \
-		else { \
-			(elt)->link.prev = (before)->link.prev; \
-			(before)->link.prev = (elt); \
-			(elt)->link.prev->link.next = (elt); \
-			(elt)->link.next = (before); \
-		} \
-	} while (0)
-
-#define INSERT_AFTER(list, after, elt, link) \
-	do { \
-		INSIST(!LINKED(elt, link));\
-		if ((after)->link.next == NULL) \
-			APPEND(list, elt, link); \
-		else { \
-			(elt)->link.next = (after)->link.next; \
-			(after)->link.next = (elt); \
-			(elt)->link.next->link.prev = (elt); \
-			(elt)->link.prev = (after); \
-		} \
-	} while (0)
-
-#define ENQUEUE(list, elt, link) APPEND(list, elt, link)
-#define DEQUEUE(list, elt, link) UNLINK(list, elt, link)
-
-#endif /* LIST_H */
-/*! \file */
diff --git a/lib/libc_bsd/include/isc/platform.h b/lib/libc_bsd/include/isc/platform.h
deleted file mode 100644
index 4bb9e21..0000000
--- a/lib/libc_bsd/include/isc/platform.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* $Id: platform.h.in,v 1.2.6.2 2008/01/23 02:15:02 tbox Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/include/isc/platform.h 186090 2008-12-14 19:39:53Z ume $ */
-
-/*! \file */
-
-#ifndef ISC_PLATFORM_H
-#define ISC_PLATFORM_H
-
-/*
- * Define if the OS does not define struct timespec.
- */
-#undef ISC_PLATFORM_NEEDTIMESPEC
-#ifdef ISC_PLATFORM_NEEDTIMESPEC
-#include <time.h>               /* For time_t */
-struct timespec {
-	time_t  tv_sec;         /* seconds */
-	long    tv_nsec;        /* nanoseconds */
-};
-#endif
-
-#endif
diff --git a/lib/libc_bsd/include/libc_private.h b/lib/libc_bsd/include/libc_private.h
deleted file mode 100644
index 6aaa76e..0000000
--- a/lib/libc_bsd/include/libc_private.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/include/libc_private.h 287872 2015-09-16 20:59:41Z delphij $
- *
- * Private definitions for libc, libc_r and libpthread.
- *
- */
-
-#ifndef _LIBC_PRIVATE_H_
-#define _LIBC_PRIVATE_H_
-#include <sys/_types.h>
-#include <sys/_pthreadtypes.h>
-
-/*
- * This global flag is non-zero when a process has created one
- * or more threads. It is used to avoid calling locking functions
- * when they are not required.
- */
-extern int	__isthreaded;
-
-/*
- * Elf_Auxinfo *__elf_aux_vector, the pointer to the ELF aux vector
- * provided by kernel. Either set for us by rtld, or found at runtime
- * on stack for static binaries.
- *
- * Type is void to avoid polluting whole libc with ELF types.
- */
-extern void	*__elf_aux_vector;
-
-/*
- * libc should use libc_dlopen internally, which respects a global
- * flag where loading of new shared objects can be restricted.
- */
-void *libc_dlopen(const char *, int);
-
-/*
- * For dynamic linker.
- */
-void _rtld_error(const char *fmt, ...);
-
-/*
- * File lock contention is difficult to diagnose without knowing
- * where locks were set. Allow a debug library to be built which
- * records the source file and line number of each lock call.
- */
-#ifdef	_FLOCK_DEBUG
-#define _FLOCKFILE(x)	_flockfile_debug(x, __FILE__, __LINE__)
-#else
-#define _FLOCKFILE(x)	_flockfile(x)
-#endif
-
-/*
- * Macros for locking and unlocking FILEs. These test if the
- * process is threaded to avoid locking when not required.
- */
-#define	FLOCKFILE(fp)		if (__isthreaded) _FLOCKFILE(fp)
-#define	FUNLOCKFILE(fp)		if (__isthreaded) _funlockfile(fp)
-
-struct _spinlock;
-extern struct _spinlock __stdio_thread_lock __hidden;
-#define STDIO_THREAD_LOCK()				\
-do {							\
-	if (__isthreaded)				\
-		_SPINLOCK(&__stdio_thread_lock);	\
-} while (0)
-#define STDIO_THREAD_UNLOCK()				\
-do {							\
-	if (__isthreaded)				\
-		_SPINUNLOCK(&__stdio_thread_lock);	\
-} while (0)
-
-void		__libc_spinlock_stub(struct _spinlock *);
-void		__libc_spinunlock_stub(struct _spinlock *);
-
-/*
- * Indexes into the pthread jump table.
- *
- * Warning! If you change this type, you must also change the threads
- * libraries that reference it (libc_r, libpthread).
- */
-typedef enum {
-	PJT_ATFORK,
-	PJT_ATTR_DESTROY,
-	PJT_ATTR_GETDETACHSTATE,
-	PJT_ATTR_GETGUARDSIZE,
-	PJT_ATTR_GETINHERITSCHED,
-	PJT_ATTR_GETSCHEDPARAM,
-	PJT_ATTR_GETSCHEDPOLICY,
-	PJT_ATTR_GETSCOPE,
-	PJT_ATTR_GETSTACKADDR,
-	PJT_ATTR_GETSTACKSIZE,
-	PJT_ATTR_INIT,
-	PJT_ATTR_SETDETACHSTATE,
-	PJT_ATTR_SETGUARDSIZE,
-	PJT_ATTR_SETINHERITSCHED,
-	PJT_ATTR_SETSCHEDPARAM,
-	PJT_ATTR_SETSCHEDPOLICY,
-	PJT_ATTR_SETSCOPE,
-	PJT_ATTR_SETSTACKADDR,
-	PJT_ATTR_SETSTACKSIZE,
-	PJT_CANCEL,
-	PJT_CLEANUP_POP,
-	PJT_CLEANUP_PUSH,
-	PJT_COND_BROADCAST,
-	PJT_COND_DESTROY,
-	PJT_COND_INIT,
-	PJT_COND_SIGNAL,
-	PJT_COND_TIMEDWAIT,
-	PJT_COND_WAIT,
-	PJT_DETACH,
-	PJT_EQUAL,
-	PJT_EXIT,
-	PJT_GETSPECIFIC,
-	PJT_JOIN,
-	PJT_KEY_CREATE,
-	PJT_KEY_DELETE,
-	PJT_KILL,
-	PJT_MAIN_NP,
-	PJT_MUTEXATTR_DESTROY,
-	PJT_MUTEXATTR_INIT,
-	PJT_MUTEXATTR_SETTYPE,
-	PJT_MUTEX_DESTROY,
-	PJT_MUTEX_INIT,
-	PJT_MUTEX_LOCK,
-	PJT_MUTEX_TRYLOCK,
-	PJT_MUTEX_UNLOCK,
-	PJT_ONCE,
-	PJT_RWLOCK_DESTROY,
-	PJT_RWLOCK_INIT,
-	PJT_RWLOCK_RDLOCK,
-	PJT_RWLOCK_TRYRDLOCK,
-	PJT_RWLOCK_TRYWRLOCK,
-	PJT_RWLOCK_UNLOCK,
-	PJT_RWLOCK_WRLOCK,
-	PJT_SELF,
-	PJT_SETCANCELSTATE,
-	PJT_SETCANCELTYPE,
-	PJT_SETSPECIFIC,
-	PJT_SIGMASK,
-	PJT_TESTCANCEL,
-	PJT_CLEANUP_POP_IMP,
-	PJT_CLEANUP_PUSH_IMP,
-	PJT_CANCEL_ENTER,
-	PJT_CANCEL_LEAVE,
-	PJT_MAX
-} pjt_index_t;
-
-typedef int (*pthread_func_t)(void);
-typedef pthread_func_t pthread_func_entry_t[2];
-
-extern pthread_func_entry_t __thr_jtable[];
-
-void	__set_error_selector(int *(*arg)(void));
-int	_pthread_mutex_init_calloc_cb_stub(pthread_mutex_t *mutex,
-	    void *(calloc_cb)(__size_t, __size_t));
-
-typedef int (*interpos_func_t)(void);
-interpos_func_t *__libc_interposing_slot(int interposno);
-extern interpos_func_t __libc_interposing[] __hidden;
-
-enum {
-	INTERPOS_accept,
-	INTERPOS_accept4,
-	INTERPOS_aio_suspend,
-	INTERPOS_close,
-	INTERPOS_connect,
-	INTERPOS_fcntl,
-	INTERPOS_fsync,
-	INTERPOS_fork,
-	INTERPOS_msync,
-	INTERPOS_nanosleep,
-	INTERPOS_openat,
-	INTERPOS_poll,
-	INTERPOS_pselect,
-	INTERPOS_recvfrom,
-	INTERPOS_recvmsg,
-	INTERPOS_select,
-	INTERPOS_sendmsg,
-	INTERPOS_sendto,
-	INTERPOS_setcontext,
-	INTERPOS_sigaction,
-	INTERPOS_sigprocmask,
-	INTERPOS_sigsuspend,
-	INTERPOS_sigwait,
-	INTERPOS_sigtimedwait,
-	INTERPOS_sigwaitinfo,
-	INTERPOS_swapcontext,
-	INTERPOS_system,
-	INTERPOS_tcdrain,
-	INTERPOS_read,
-	INTERPOS_readv,
-	INTERPOS_wait4,
-	INTERPOS_write,
-	INTERPOS_writev,
-	INTERPOS__pthread_mutex_init_calloc_cb,
-	INTERPOS_spinlock,
-	INTERPOS_spinunlock,
-	INTERPOS_kevent,
-	INTERPOS_wait6,
-	INTERPOS_ppoll,
-	INTERPOS_MAX
-};
-
-/*
- * yplib internal interfaces
- */
-#ifdef YP
-int _yp_check(char **);
-#endif
-
-/*
- * Initialise TLS for static programs
- */
-void _init_tls(void);
-
-/*
- * Provides pthread_once()-like functionality for both single-threaded
- * and multi-threaded applications.
- */
-int _once(pthread_once_t *, void (*)(void));
-
-/*
- * Set the TLS thread pointer
- */
-void _set_tp(void *tp);
-
-/*
- * This is a pointer in the C run-time startup code. It is used
- * by getprogname() and setprogname().
- */
-extern const char *__progname;
-
-/*
- * This function is used by the threading libraries to notify malloc that a
- * thread is exiting.
- */
-void _malloc_thread_cleanup(void);
-
-/*
- * These functions are used by the threading libraries in order to protect
- * malloc across fork().
- */
-void _malloc_prefork(void);
-void _malloc_postfork(void);
-
-void _malloc_first_thread(void);
-
-/*
- * Function to clean up streams, called from abort() and exit().
- */
-extern void (*__cleanup)(void) __hidden;
-
-/*
- * Get kern.osreldate to detect ABI revisions.  Explicitly
- * ignores value of $OSVERSION and caches result.  Prototypes
- * for the wrapped "new" pad-less syscalls are here for now.
- */
-int __getosreldate(void);
-#include <sys/_types.h>
-#include <sys/_sigset.h>
-
-/* With pad */
-__off_t	__sys_freebsd6_lseek(int, int, __off_t, int);
-int	__sys_freebsd6_ftruncate(int, int, __off_t);
-int	__sys_freebsd6_truncate(const char *, int, __off_t);
-__ssize_t __sys_freebsd6_pread(int, void *, __size_t, int, __off_t);
-__ssize_t __sys_freebsd6_pwrite(int, const void *, __size_t, int, __off_t);
-void *	__sys_freebsd6_mmap(void *, __size_t, int, int, int, int, __off_t);
-
-struct aiocb;
-struct fd_set;
-struct iovec;
-struct kevent;
-struct msghdr;
-struct pollfd;
-struct rusage;
-struct sigaction;
-struct sockaddr;
-struct timespec;
-struct timeval;
-struct timezone;
-struct __siginfo;
-struct __ucontext;
-struct __wrusage;
-enum idtype;
-int		__sys_aio_suspend(const struct aiocb * const[], int,
-		    const struct timespec *);
-int		__sys_accept(int, struct sockaddr *, __socklen_t *);
-int		__sys_accept4(int, struct sockaddr *, __socklen_t *, int);
-int		__sys_clock_gettime(__clockid_t, struct timespec *ts);
-int		__sys_close(int);
-int		__sys_connect(int, const struct sockaddr *, __socklen_t);
-int		__sys_fcntl(int, int, ...);
-int		__sys_fsync(int);
-__pid_t		__sys_fork(void);
-int		__sys_ftruncate(int, __off_t);
-int		__sys_gettimeofday(struct timeval *, struct timezone *);
-int		__sys_kevent(int, const struct kevent *, int, struct kevent *,
-		    int, const struct timespec *);
-__off_t		__sys_lseek(int, __off_t, int);
-void	       *__sys_mmap(void *, __size_t, int, int, int, __off_t);
-int		__sys_msync(void *, __size_t, int);
-int		__sys_nanosleep(const struct timespec *, struct timespec *);
-int		__sys_open(const char *, int, ...);
-int		__sys_openat(int, const char *, int, ...);
-int		__sys_pselect(int, struct fd_set *, struct fd_set *,
-		    struct fd_set *, const struct timespec *,
-		    const __sigset_t *);
-int		__sys_poll(struct pollfd *, unsigned, int);
-int		__sys_ppoll(struct pollfd *, unsigned, const struct timespec *,
-		    const __sigset_t *);
-__ssize_t	__sys_pread(int, void *, __size_t, __off_t);
-__ssize_t	__sys_pwrite(int, const void *, __size_t, __off_t);
-__ssize_t	__sys_read(int, void *, __size_t);
-__ssize_t	__sys_readv(int, const struct iovec *, int);
-__ssize_t	__sys_recv(int, void *, __size_t, int);
-__ssize_t	__sys_recvfrom(int, void *, __size_t, int, struct sockaddr *,
-		    __socklen_t *);
-__ssize_t	__sys_recvmsg(int, struct msghdr *, int);
-int		__sys_select(int, struct fd_set *, struct fd_set *,
-		    struct fd_set *, struct timeval *);
-__ssize_t	__sys_sendmsg(int, const struct msghdr *, int);
-__ssize_t	__sys_sendto(int, const void *, __size_t, int,
-		    const struct sockaddr *, __socklen_t);
-int		__sys_setcontext(const struct __ucontext *);
-int		__sys_sigaction(int, const struct sigaction *,
-		    struct sigaction *);
-int		__sys_sigprocmask(int, const __sigset_t *, __sigset_t *);
-int		__sys_sigsuspend(const __sigset_t *);
-int		__sys_sigtimedwait(const __sigset_t *, struct __siginfo *,
-		    const struct timespec *);
-int		__sys_sigwait(const __sigset_t *, int *);
-int		__sys_sigwaitinfo(const __sigset_t *, struct __siginfo *);
-int		__sys_swapcontext(struct __ucontext *,
-		    const struct __ucontext *);
-int		__sys_thr_kill(long, int);
-int		__sys_thr_self(long *);
-int		__sys_truncate(const char *, __off_t);
-__pid_t		__sys_wait4(__pid_t, int *, int, struct rusage *);
-__pid_t		__sys_wait6(enum idtype, __id_t, int *, int,
-		    struct __wrusage *, struct __siginfo *);
-__ssize_t	__sys_write(int, const void *, __size_t);
-__ssize_t	__sys_writev(int, const struct iovec *, int);
-
-int		__libc_sigaction(int, const struct sigaction *,
-		    struct sigaction *) __hidden;
-int		__libc_sigprocmask(int, const __sigset_t *, __sigset_t *)
-		    __hidden;
-int		__libc_sigsuspend(const __sigset_t *) __hidden;
-int		__libc_sigwait(const __sigset_t * __restrict,
-		    int * restrict sig);
-int		__libc_system(const char *);
-int		__libc_tcdrain(int);
-int		__fcntl_compat(int fd, int cmd, ...);
-
-/* execve() with PATH processing to implement posix_spawnp() */
-int _execvpe(const char *, char * const *, char * const *);
-
-int _elf_aux_info(int aux, void *buf, int buflen);
-struct dl_phdr_info;
-int __elf_phdr_match_addr(struct dl_phdr_info *, void *);
-void __init_elf_aux_vector(void);
-
-void	_pthread_cancel_enter(int);
-void	_pthread_cancel_leave(int);
-
-#endif /* _LIBC_PRIVATE_H_ */
diff --git a/lib/libc_bsd/include/namespace.h b/lib/libc_bsd/include/namespace.h
deleted file mode 100644
index 0a0652c..0000000
--- a/lib/libc_bsd/include/namespace.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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.
- *
- * 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 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/include/namespace.h 242960 2012-11-13 12:55:52Z kib $
- */
-
-#ifndef _NAMESPACE_H_
-#define _NAMESPACE_H_
-
-/*
- * Adjust names so that headers declare "hidden" names.
- *
- * README: When modifying this file don't forget to make the appropriate
- *         changes in un-namespace.h!!!
- */
-
-/*
- * ISO C (C90) section.  Most names in libc aren't in ISO C, so they
- * should be here.  Most aren't here...
- */
-#define		err				_err
-#define		warn				_warn
-#define		nsdispatch			_nsdispatch
-
-/*
- * Prototypes for syscalls/functions that need to be overridden
- * in libc_r/libpthread.
- */
-#define		accept				_accept
-#define		__acl_aclcheck_fd		___acl_aclcheck_fd
-#define		__acl_delete_fd			___acl_delete_fd
-#define		__acl_get_fd			___acl_get_fd
-#define		__acl_set_fd			___acl_set_fd
-#define		bind				_bind
-#define		__cap_get_fd			___cap_get_fd
-#define		__cap_set_fd			___cap_set_fd
-#define		close				_close
-#define		connect				_connect
-#define		dup				_dup
-#define		dup2				_dup2
-#define		execve				_execve
-#define		fcntl				_fcntl
-/*#define		flock				_flock */
-#define		flockfile			_flockfile
-#define		fpathconf			_fpathconf
-#define		fstat				_fstat
-#define		fstatfs				_fstatfs
-#define		fsync				_fsync
-#define		funlockfile			_funlockfile
-#define		getdirentries			_getdirentries
-#define		getlogin			_getlogin
-#define		getpeername			_getpeername
-#define		getprogname			_getprogname
-#define		getsockname			_getsockname
-#define		getsockopt			_getsockopt
-#define		ioctl				_ioctl
-/* #define		kevent				_kevent */
-#define		listen				_listen
-#define		nanosleep			_nanosleep
-#define		open				_open
-#define		openat				_openat
-#define		poll				_poll
-#define		pthread_atfork			_pthread_atfork
-#define		pthread_attr_destroy		_pthread_attr_destroy
-#define		pthread_attr_get_np		_pthread_attr_get_np
-#define		pthread_attr_getaffinity_np	_pthread_attr_getaffinity_np
-#define		pthread_attr_getdetachstate	_pthread_attr_getdetachstate
-#define		pthread_attr_getguardsize	_pthread_attr_getguardsize
-#define		pthread_attr_getinheritsched	_pthread_attr_getinheritsched
-#define		pthread_attr_getschedparam	_pthread_attr_getschedparam
-#define		pthread_attr_getschedpolicy	_pthread_attr_getschedpolicy
-#define		pthread_attr_getscope		_pthread_attr_getscope
-#define		pthread_attr_getstack		_pthread_attr_getstack
-#define		pthread_attr_getstackaddr	_pthread_attr_getstackaddr
-#define		pthread_attr_getstacksize	_pthread_attr_getstacksize
-#define		pthread_attr_init		_pthread_attr_init
-#define		pthread_attr_setaffinity_np	_pthread_attr_setaffinity_np
-#define		pthread_attr_setcreatesuspend_np _pthread_attr_setcreatesuspend_np
-#define		pthread_attr_setdetachstate	_pthread_attr_setdetachstate
-#define		pthread_attr_setguardsize	_pthread_attr_setguardsize
-#define		pthread_attr_setinheritsched	_pthread_attr_setinheritsched
-#define		pthread_attr_setschedparam	_pthread_attr_setschedparam
-#define		pthread_attr_setschedpolicy	_pthread_attr_setschedpolicy
-#define		pthread_attr_setscope		_pthread_attr_setscope
-#define		pthread_attr_setstack		_pthread_attr_setstack
-#define		pthread_attr_setstackaddr	_pthread_attr_setstackaddr
-#define		pthread_attr_setstacksize	_pthread_attr_setstacksize
-#define		pthread_barrier_destroy		_pthread_barrier_destroy
-#define		pthread_barrier_init		_pthread_barrier_init
-#define		pthread_barrier_wait		_pthread_barrier_wait
-#define		pthread_barrierattr_destroy	_pthread_barrierattr_destroy
-#define		pthread_barrierattr_getpshared	_pthread_barrierattr_getpshared
-#define		pthread_barrierattr_init	_pthread_barrierattr_init
-#define		pthread_barrierattr_setpshared	_pthread_barrierattr_setpshared
-#define		pthread_cancel			_pthread_cancel
-#define		pthread_cond_broadcast		_pthread_cond_broadcast
-#define		pthread_cond_destroy		_pthread_cond_destroy
-#define		pthread_cond_init		_pthread_cond_init
-#define		pthread_cond_signal		_pthread_cond_signal
-#define		pthread_cond_timedwait		_pthread_cond_timedwait
-#define		pthread_cond_wait		_pthread_cond_wait
-#define		pthread_condattr_destroy	_pthread_condattr_destroy
-#define		pthread_condattr_getclock	_pthread_condattr_getclock
-#define		pthread_condattr_getpshared	_pthread_condattr_getpshared
-#define		pthread_condattr_init		_pthread_condattr_init
-#define		pthread_condattr_setclock	_pthread_condattr_setclock
-#define		pthread_condattr_setpshared	_pthread_condattr_setpshared
-#define		pthread_create			_pthread_create
-#define		pthread_detach			_pthread_detach
-#define		pthread_equal			_pthread_equal
-#define		pthread_exit			_pthread_exit
-#define		pthread_getaffinity_np		_pthread_getaffinity_np
-#define		pthread_getconcurrency		_pthread_getconcurrency
-#define		pthread_getcpuclockid		_pthread_getcpuclockid
-#define		pthread_getprio			_pthread_getprio
-#define		pthread_getschedparam		_pthread_getschedparam
-#define		pthread_getspecific		_pthread_getspecific
-#define		pthread_getthreadid_np		_pthread_getthreadid_np
-#define		pthread_join			_pthread_join
-#define		pthread_key_create		_pthread_key_create
-#define		pthread_key_delete		_pthread_key_delete
-#define		pthread_kill			_pthread_kill
-#define		pthread_main_np			_pthread_main_np
-#define		pthread_multi_np		_pthread_multi_np
-#define		pthread_mutex_destroy		_pthread_mutex_destroy
-#define		pthread_mutex_getprioceiling	_pthread_mutex_getprioceiling
-#define		pthread_mutex_init		_pthread_mutex_init
-#define		pthread_mutex_isowned_np	_pthread_mutex_isowned_np
-#define		pthread_mutex_lock		_pthread_mutex_lock
-#define		pthread_mutex_setprioceiling	_pthread_mutex_setprioceiling
-#define		pthread_mutex_timedlock		_pthread_mutex_timedlock
-#define		pthread_mutex_trylock		_pthread_mutex_trylock
-#define		pthread_mutex_unlock		_pthread_mutex_unlock
-#define		pthread_mutexattr_destroy	_pthread_mutexattr_destroy
-#define		pthread_mutexattr_getkind_np	_pthread_mutexattr_getkind_np
-#define		pthread_mutexattr_getprioceiling _pthread_mutexattr_getprioceiling
-#define		pthread_mutexattr_getprotocol	_pthread_mutexattr_getprotocol
-#define		pthread_mutexattr_getpshared	_pthread_mutexattr_getpshared
-#define		pthread_mutexattr_gettype	_pthread_mutexattr_gettype
-#define		pthread_mutexattr_init		_pthread_mutexattr_init
-#define		pthread_mutexattr_setkind_np	_pthread_mutexattr_setkind_np
-#define		pthread_mutexattr_setprioceiling _pthread_mutexattr_setprioceiling
-#define		pthread_mutexattr_setprotocol	_pthread_mutexattr_setprotocol
-#define		pthread_mutexattr_setpshared	_pthread_mutexattr_setpshared
-#define		pthread_mutexattr_settype	_pthread_mutexattr_settype
-#define		pthread_once			_pthread_once
-#define		pthread_resume_all_np		_pthread_resume_all_np
-#define		pthread_resume_np		_pthread_resume_np
-#define		pthread_rwlock_destroy		_pthread_rwlock_destroy
-#define		pthread_rwlock_init		_pthread_rwlock_init
-#define		pthread_rwlock_rdlock		_pthread_rwlock_rdlock
-#define		pthread_rwlock_timedrdlock	_pthread_rwlock_timedrdlock
-#define		pthread_rwlock_timedwrlock	_pthread_rwlock_timedwrlock
-#define		pthread_rwlock_tryrdlock	_pthread_rwlock_tryrdlock
-#define		pthread_rwlock_trywrlock	_pthread_rwlock_trywrlock
-#define		pthread_rwlock_unlock		_pthread_rwlock_unlock
-#define		pthread_rwlock_wrlock		_pthread_rwlock_wrlock
-#define		pthread_rwlockattr_destroy	_pthread_rwlockattr_destroy
-#define		pthread_rwlockattr_getpshared	_pthread_rwlockattr_getpshared
-#define		pthread_rwlockattr_init		_pthread_rwlockattr_init
-#define		pthread_rwlockattr_setpshared	_pthread_rwlockattr_setpshared
-#define		pthread_self			_pthread_self
-#define		pthread_set_name_np		_pthread_set_name_np
-#define		pthread_setaffinity_np		_pthread_setaffinity_np
-#define		pthread_setcancelstate		_pthread_setcancelstate
-#define		pthread_setcanceltype		_pthread_setcanceltype
-#define		pthread_setconcurrency		_pthread_setconcurrency
-#define		pthread_setprio			_pthread_setprio
-#define		pthread_setschedparam		_pthread_setschedparam
-#define		pthread_setspecific		_pthread_setspecific
-#define		pthread_sigmask			_pthread_sigmask
-#define		pthread_single_np		_pthread_single_np
-#define		pthread_spin_destroy		_pthread_spin_destroy
-#define		pthread_spin_init		_pthread_spin_init
-#define		pthread_spin_lock		_pthread_spin_lock
-#define		pthread_spin_trylock		_pthread_spin_trylock
-#define		pthread_spin_unlock		_pthread_spin_unlock
-#define		pthread_suspend_all_np		_pthread_suspend_all_np
-#define		pthread_suspend_np		_pthread_suspend_np
-#define		pthread_switch_add_np		_pthread_switch_add_np
-#define		pthread_switch_delete_np	_pthread_switch_delete_np
-#define		pthread_testcancel		_pthread_testcancel
-#define		pthread_timedjoin_np		_pthread_timedjoin_np
-#define		pthread_yield			_pthread_yield
-#define		read				_read
-#define		readv				_readv
-#define		recvfrom			_recvfrom
-#define		recvmsg				_recvmsg
-#define		select				_select
-#define		sem_close			_sem_close
-#define		sem_destroy			_sem_destroy
-#define		sem_getvalue			_sem_getvalue
-#define		sem_init			_sem_init
-#define		sem_open			_sem_open
-#define		sem_post			_sem_post
-#define		sem_timedwait			_sem_timedwait
-#define		sem_trywait			_sem_trywait
-#define		sem_unlink			_sem_unlink
-#define		sem_wait			_sem_wait
-#define		sendmsg				_sendmsg
-#define		sendto				_sendto
-#define		setsockopt			_setsockopt
-/*#define		sigaction			_sigaction*/
-#define		sigprocmask			_sigprocmask
-#define		sigsuspend			_sigsuspend
-#define		socket				_socket
-#define		socketpair			_socketpair
-#define		usleep				_usleep
-#define		wait4				_wait4
-#define		wait6				_wait6
-#define		waitpid				_waitpid
-#define		write				_write
-#define		writev				_writev
-
-
-/*
- * Other hidden syscalls/functions that libc_r needs to override
- * but are not used internally by libc.
- *
- * XXX - When modifying libc to use one of the following, remove
- * the prototype from below and place it in the list above.
- */
-#if 0
-#define		creat				_creat
-#define		fchflags			_fchflags
-#define		fchmod				_fchmod
-#define		ftrylockfile			_ftrylockfile
-#define		msync				_msync
-#define		nfssvc				_nfssvc
-#define		pause				_pause
-#define		sched_yield			_sched_yield
-#define		sendfile			_sendfile
-#define		shutdown			_shutdown
-#define		sigaltstack			_sigaltstack
-#define		sigpending			_sigpending
-#define		sigreturn			_sigreturn
-#define		sigsetmask			_sigsetmask
-#define		sleep				_sleep
-#define		system				_system
-#define		tcdrain				_tcdrain
-#define		wait				_wait
-#endif
-
-#endif /* _NAMESPACE_H_ */
diff --git a/lib/libc_bsd/include/nscache.h b/lib/libc_bsd/include/nscache.h
deleted file mode 100644
index 7bbd629..0000000
--- a/lib/libc_bsd/include/nscache.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/*-
- * Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
- * 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.
- *
- * 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: releng/10.2/lib/libc/include/nscache.h 158115 2006-04-28 12:03:38Z ume $
- */
-
-#ifndef __NS_CACHE_H__
-#define __NS_CACHE_H__
-
-#include "nscachedcli.h"
-
-typedef int (*nss_cache_id_func_t)(char *, size_t *, va_list, void *);
-typedef int (*nss_cache_marshal_func_t)(char *, size_t *, void *, va_list,
-	void *);
-typedef int (*nss_cache_unmarshal_func_t)(char *, size_t, void *, va_list,
-	void *);
-
-typedef	void (*nss_set_mp_ws_func_t)(cached_mp_write_session);
-typedef	cached_mp_write_session	(*nss_get_mp_ws_func_t)(void);
-
-typedef void (*nss_set_mp_rs_func_t)(cached_mp_read_session);
-typedef cached_mp_read_session	(*nss_get_mp_rs_func_t)(void);
-
-typedef struct _nss_cache_info {
-	char	*entry_name;
-	void	*mdata;
-
-	/*
-	 * These 3 functions should be implemented specifically for each
-	 * nsswitch database.
-	 */
-	nss_cache_id_func_t id_func;	/* marshals the request parameters */
-	nss_cache_marshal_func_t marshal_func;	   /* marshals response */
-	nss_cache_unmarshal_func_t unmarshal_func; /* unmarshals response */
-
-	/*
-	 * These 4 functions should be generated with NSS_MP_CACHE_HANDLING
-	 * macro.
-	 */
-	nss_set_mp_ws_func_t set_mp_ws_func; /* sets current write session */
-	nss_get_mp_ws_func_t get_mp_ws_func; /* gets current write session */
-
-	nss_set_mp_rs_func_t set_mp_rs_func; /* sets current read session */
-	nss_get_mp_rs_func_t get_mp_rs_func; /* gets current read session */
-} nss_cache_info;
-
-/*
- * NSS_MP_CACHE_HANDLING implements the set_mp_ws, get_mp_ws, set_mp_rs,
- * get_mp_rs functions, that are used in _nss_cache_info. It uses
- * NSS_TLS_HANDLING macro to organize thread local storage.
- */
-#define NSS_MP_CACHE_HANDLING(name)					\
-struct name##_mp_state {						\
-	cached_mp_write_session	mp_write_session;			\
-	cached_mp_read_session	mp_read_session;			\
-};									\
-									\
-static void								\
-name##_mp_endstate(void *s) {						\
-	struct name##_mp_state	*mp_state;				\
-									\
-	mp_state = (struct name##_mp_state *)s;				\
-	if (mp_state->mp_write_session != INVALID_CACHED_MP_WRITE_SESSION)\
-		__abandon_cached_mp_write_session(mp_state->mp_write_session);\
-									\
-	if (mp_state->mp_read_session != INVALID_CACHED_MP_READ_SESSION)\
-		__close_cached_mp_read_session(mp_state->mp_read_session);\
-}									\
-NSS_TLS_HANDLING(name##_mp);						\
-									\
-static void								\
-name##_set_mp_ws(cached_mp_write_session ws)				\
-{									\
-	struct name##_mp_state	*mp_state;				\
-	int	res;							\
-									\
-	res = name##_mp_getstate(&mp_state);				\
-	if (res != 0)							\
-		return;							\
-									\
-	mp_state->mp_write_session = ws;				\
-}									\
-									\
-static cached_mp_write_session						\
-name##_get_mp_ws(void)							\
-{									\
-	struct name##_mp_state	*mp_state;				\
-	int	res;							\
-									\
-	res = name##_mp_getstate(&mp_state);				\
-	if (res != 0)							\
-		return (INVALID_CACHED_MP_WRITE_SESSION);		\
-									\
-	return (mp_state->mp_write_session);				\
-}									\
-									\
-static void								\
-name##_set_mp_rs(cached_mp_read_session rs)				\
-{									\
-	struct name##_mp_state	*mp_state;				\
-	int	res;							\
-									\
-	res = name##_mp_getstate(&mp_state);				\
-	if (res != 0)							\
-		return;							\
-									\
-	mp_state->mp_read_session = rs;					\
-}									\
-									\
-static cached_mp_read_session						\
-name##_get_mp_rs(void)							\
-{									\
-	struct name##_mp_state	*mp_state;				\
-	int	res;							\
-									\
-	res = name##_mp_getstate(&mp_state);				\
-	if (res != 0)							\
-		return (INVALID_CACHED_MP_READ_SESSION);		\
-									\
-	return (mp_state->mp_read_session);				\
-}
-
-/*
- * These macros should be used to initialize _nss_cache_info structure. For
- * multipart queries in setXXXent and getXXXent functions mf and uf
- * (marshal function and unmarshal function) should be both NULL.
- */
-#define NS_COMMON_CACHE_INFO_INITIALIZER(name, mdata, if, mf, uf)	\
-	{#name, mdata, if, mf, uf, NULL, NULL, NULL, NULL}
-#define NS_MP_CACHE_INFO_INITIALIZER(name, mdata, mf, uf)		\
-	{#name, mdata, NULL, mf, uf, name##_set_mp_ws, name##_get_mp_ws,\
-		name##_set_mp_rs, name##_get_mp_rs }
-
-/*
- * Analog of other XXX_CB macros. Has the pointer to _nss_cache_info
- * structure as the only argument.
- */
-#define NS_CACHE_CB(cinfo) {NSSRC_CACHE, __nss_cache_handler, (void *)(cinfo) },
-
-/* args are: current pointer, current buffer, initial buffer, pointer type */
-#define NS_APPLY_OFFSET(cp, cb, ib, p_type)				\
-	if ((cp) != NULL)						\
-		(cp) = (p_type)((char *)(cb) + (size_t)(cp) - (size_t)(ib))
-/*
- * Gets new pointer from the marshalled buffer by uisng initial address
- * and initial buffer address
- */
-#define NS_GET_NEWP(cp, cb, ib)						\
-	((char *)(cb) + (size_t)(cp) - (size_t)(ib))
-
-typedef struct _nss_cache_data {
-	char	*key;
-	size_t	key_size;
-
-	nss_cache_info const	*info;
-} nss_cache_data;
-
-__BEGIN_DECLS
-/* dummy function, which is needed to make nss_method_lookup happy */
-extern	int	__nss_cache_handler(void *, void *, va_list);
-
-#ifdef _NS_PRIVATE
-extern	int	__nss_common_cache_read(void *, void *, va_list);
-extern	int	__nss_common_cache_write(void *, void *, va_list);
-extern	int	__nss_common_cache_write_negative(void *);
-
-extern	int	__nss_mp_cache_read(void *, void *, va_list);
-extern	int	__nss_mp_cache_write(void *, void *, va_list);
-extern	int	__nss_mp_cache_write_submit(void *, void *, va_list);
-extern	int	__nss_mp_cache_end(void *, void *, va_list);
-#endif /* _NS_PRIVATE */
-
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/include/nscachedcli.h b/lib/libc_bsd/include/nscachedcli.h
deleted file mode 100644
index c609155..0000000
--- a/lib/libc_bsd/include/nscachedcli.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * Copyright (c) 2004 Michael Bushkov <bushman@rsu.ru>
- * 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.
- *
- * 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: releng/10.2/lib/libc/include/nscachedcli.h 158115 2006-04-28 12:03:38Z ume $
- */
-
-#ifndef __NS_CACHED_CLI_H__
-#define __NS_CACHED_CLI_H__
-
-/*
- * This file contains API for working with caching daemon
- */
-
-enum comm_element_t {
-	CET_UNDEFINED = 0,
-	CET_WRITE_REQUEST = 1,
-	CET_WRITE_RESPONSE = 2,
-	CET_READ_REQUEST = 3,
-	CET_READ_RESPONSE = 4,
-	CET_TRANSFORM_REQUEST = 5,
-	CET_TRANSFORM_RESPONSE = 6,
-	CET_MP_WRITE_SESSION_REQUEST = 7,
-	CET_MP_WRITE_SESSION_RESPONSE = 8,
-	CET_MP_WRITE_SESSION_WRITE_REQUEST = 9,
-	CET_MP_WRITE_SESSION_WRITE_RESPONSE = 10,
-	CET_MP_WRITE_SESSION_CLOSE_NOTIFICATION = 11,
-	CET_MP_WRITE_SESSION_ABANDON_NOTIFICATION = 12,
-	CET_MP_READ_SESSION_REQUEST = 13,
-	CET_MP_READ_SESSION_RESPONSE = 14,
-	CET_MP_READ_SESSION_READ_REQUEST = 15,
-	CET_MP_READ_SESSION_READ_RESPONSE = 16,
-	CET_MP_READ_SESSION_CLOSE_NOTIFICATION = 17
-};
-
-struct cached_connection_params {
-	char	*socket_path;
-	struct	timeval	timeout;
-};
-
-struct cached_connection_ {
-	int	sockfd;
-	int	read_queue;
-	int	write_queue;
-
-	int	mp_flag;	/* shows if the connection is used for
-				 * multipart operations */
-};
-
-/* simple abstractions for not to write "struct" every time */
-typedef struct cached_connection_	*cached_connection;
-typedef struct cached_connection_	*cached_mp_write_session;
-typedef struct cached_connection_	*cached_mp_read_session;
-
-#define	INVALID_CACHED_CONNECTION	(NULL)
-#define	INVALID_CACHED_MP_WRITE_SESSION	(NULL)
-#define	INVALID_CACHED_MP_READ_SESSION	(NULL)
-
-__BEGIN_DECLS
-
-/* initialization/destruction routines */
-extern	cached_connection __open_cached_connection(
-	struct cached_connection_params const *);
-extern	void __close_cached_connection(cached_connection);
-
-/* simple read/write operations */
-extern	int __cached_write(cached_connection, const char *, const char *,
-	size_t, const char *, size_t);
-extern	int __cached_read(cached_connection, const char *, const char *,
-	size_t, char *, size_t *);
-
-/* multipart read/write operations */
-extern	cached_mp_write_session __open_cached_mp_write_session(
-	struct cached_connection_params const *, const char *);
-extern	int __cached_mp_write(cached_mp_write_session, const char *, size_t);
-extern	int __abandon_cached_mp_write_session(cached_mp_write_session);
-extern	int __close_cached_mp_write_session(cached_mp_write_session);
-
-extern	cached_mp_read_session __open_cached_mp_read_session(
-	struct cached_connection_params const *, const char *);
-extern	int __cached_mp_read(cached_mp_read_session, char *, size_t *);
-extern	int __close_cached_mp_read_session(cached_mp_read_session);
-
-__END_DECLS
-
-#endif
diff --git a/lib/libc_bsd/include/nss_tls.h b/lib/libc_bsd/include/nss_tls.h
deleted file mode 100644
index f32e8fe..0000000
--- a/lib/libc_bsd/include/nss_tls.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/include/nss_tls.h 192976 2009-05-28 15:02:21Z zml $
- *
- * Macros which generate thread local storage handling code in NSS modules.
- */
-#ifndef _NSS_TLS_H_
-#define _NSS_TLS_H_
-
-#define NSS_TLS_HANDLING(name)					\
-static pthread_key_t name##_state_key;				\
-static	void	 name##_keyinit(void);				\
-static	int	 name##_getstate(struct name##_state **);	\
-\
-static void								\
-name##_keyinit(void)							\
-{									\
-	(void)_pthread_key_create(&name##_state_key, name##_endstate);	\
-}									\
-\
-static int							\
-name##_getstate(struct name##_state **p)			\
-{								\
-	static struct name##_state st;				\
-	static pthread_once_t	keyinit = PTHREAD_ONCE_INIT;	\
-	int			rv;				\
-								\
-	if (!__isthreaded || _pthread_main_np() != 0) {		\
-		*p = &st;					\
-		return (0);					\
-	}							\
-	rv = _pthread_once(&keyinit, name##_keyinit);		\
-	if (rv != 0)						\
-		return (rv);					\
-	*p = _pthread_getspecific(name##_state_key);		\
-	if (*p != NULL)						\
-		return (0);					\
-	*p = calloc(1, sizeof(**p));				\
-	if (*p == NULL)						\
-		return (ENOMEM);				\
-	rv = _pthread_setspecific(name##_state_key, *p);	\
-	if (rv != 0) {						\
-		free(*p);					\
-		*p = NULL;					\
-	}							\
-	return (rv);						\
-}								\
-/* allow the macro invocation to end with a semicolon */	\
-struct _clashproof_bmVjdGFy
-
-#endif /* _NSS_TLS_H_ */
diff --git a/lib/libc_bsd/include/port_after.h b/lib/libc_bsd/include/port_after.h
deleted file mode 100644
index eb85844..0000000
--- a/lib/libc_bsd/include/port_after.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/include/port_after.h 156964 2006-03-21 18:31:24Z ume $ */
-
-#ifndef _PORT_AFTER_H_
-#define _PORT_AFTER_H_
-
-#define HAVE_SA_LEN		1
-#define HAS_INET6_STRUCTS	1
-#define HAVE_SIN6_SCOPE_ID	1
-#define HAVE_TIME_R		1
-
-#endif /* _PORT_AFTER_H_ */
diff --git a/lib/libc_bsd/include/port_before.h b/lib/libc_bsd/include/port_before.h
deleted file mode 100644
index bb10c02..0000000
--- a/lib/libc_bsd/include/port_before.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/include/port_before.h 270838 2014-08-30 10:16:25Z ume $ */
-
-#ifndef _PORT_BEFORE_H_
-#define _PORT_BEFORE_H_
-
-#define _LIBC		1
-#define DO_PTHREADS	1
-#define USE_KQUEUE	1
-#define HAVE_MD5	1
-
-#define ISC_SOCKLEN_T	socklen_t
-#define ISC_FORMAT_PRINTF(fmt, args) \
-	__attribute__((__format__(__printf__, fmt, args)))
-#define DE_CONST(konst, var) \
-        do { \
-                union { const void *k; void *v; } _u; \
-                _u.k = konst; \
-                var = _u.v; \
-        } while (0)
-
-#define UNUSED(x) (void)(x)
-
-#endif /* _PORT_BEFORE_H_ */
diff --git a/lib/libc_bsd/include/reentrant.h b/lib/libc_bsd/include/reentrant.h
deleted file mode 100644
index 5744608..0000000
--- a/lib/libc_bsd/include/reentrant.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 1997,98 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by J.T. Conklin.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libc/include/reentrant.h 204588 2010-03-02 17:20:04Z joel $
- */
-
-/*
- * Requirements:
- * 
- * 1. The thread safe mechanism should be lightweight so the library can
- *    be used by non-threaded applications without unreasonable overhead.
- * 
- * 2. There should be no dependency on a thread engine for non-threaded
- *    applications.
- * 
- * 3. There should be no dependency on any particular thread engine.
- * 
- * 4. The library should be able to be compiled without support for thread
- *    safety.
- * 
- * 
- * Rationale:
- * 
- * One approach for thread safety is to provide discrete versions of the
- * library: one thread safe, the other not.  The disadvantage of this is
- * that libc is rather large, and two copies of a library which are 99%+
- * identical is not an efficent use of resources.
- * 
- * Another approach is to provide a single thread safe library.  However,
- * it should not add significant run time or code size overhead to non-
- * threaded applications.
- * 
- * Since the NetBSD C library is used in other projects, it should be
- * easy to replace the mutual exclusion primitives with ones provided by
- * another system.  Similarly, it should also be easy to remove all
- * support for thread safety completely if the target environment does
- * not support threads.
- * 
- * 
- * Implementation Details:
- * 
- * The mutex primitives used by the library (mutex_t, mutex_lock, etc.)
- * are macros which expand to the cooresponding primitives provided by
- * the thread engine or to nothing.  The latter is used so that code is
- * not unreasonably cluttered with #ifdefs when all thread safe support
- * is removed.
- * 
- * The mutex macros can be directly mapped to the mutex primitives from
- * pthreads, however it should be reasonably easy to wrap another mutex
- * implementation so it presents a similar interface.
- * 
- * Stub implementations of the mutex functions are provided with *weak*
- * linkage.  These functions simply return success.  When linked with a
- * thread library (i.e. -lpthread), the functions will override the
- * stubs.
- */
-
-#include <pthread.h>
-#include <pthread_np.h>
-#include "libc_private.h"
-
-#define mutex_t			pthread_mutex_t
-#define cond_t			pthread_cond_t
-#define rwlock_t		pthread_rwlock_t
-#define once_t			pthread_once_t
-
-#define thread_key_t		pthread_key_t
-#define MUTEX_INITIALIZER	PTHREAD_MUTEX_INITIALIZER
-#define RWLOCK_INITIALIZER	PTHREAD_RWLOCK_INITIALIZER
-#define ONCE_INITIALIZER	PTHREAD_ONCE_INIT
-
-#define mutex_init(m, a)	_pthread_mutex_init(m, a)
-#define mutex_lock(m)		if (__isthreaded) \
-				_pthread_mutex_lock(m)
-#define mutex_unlock(m)		if (__isthreaded) \
-				_pthread_mutex_unlock(m)
-#define mutex_trylock(m)	(__isthreaded ? 0 : _pthread_mutex_trylock(m))
-
-#define cond_init(c, a, p)	_pthread_cond_init(c, a)
-#define cond_signal(m)		if (__isthreaded) \
-				_pthread_cond_signal(m)
-#define cond_broadcast(m)	if (__isthreaded) \
-				_pthread_cond_broadcast(m)
-#define cond_wait(c, m)		if (__isthreaded) \
-				_pthread_cond_wait(c, m)
-
-#define rwlock_init(l, a)	_pthread_rwlock_init(l, a)
-#define rwlock_rdlock(l)	if (__isthreaded) \
-				_pthread_rwlock_rdlock(l)
-#define rwlock_wrlock(l)	if (__isthreaded) \
-				_pthread_rwlock_wrlock(l)
-#define rwlock_unlock(l)	if (__isthreaded) \
-				_pthread_rwlock_unlock(l)
-
-#define thr_keycreate(k, d)	_pthread_key_create(k, d)
-#define thr_setspecific(k, p)	_pthread_setspecific(k, p)
-#define thr_getspecific(k)	_pthread_getspecific(k)
-#define thr_sigsetmask(f, n, o)	_pthread_sigmask(f, n, o)
-
-#define thr_once(o, i)		_pthread_once(o, i)
-#define thr_self()		_pthread_self()
-#define thr_exit(x)		_pthread_exit(x)
-#define thr_main()		_pthread_main_np()
diff --git a/lib/libc_bsd/include/resolv_mt.h b/lib/libc_bsd/include/resolv_mt.h
deleted file mode 100644
index 27963a1..0000000
--- a/lib/libc_bsd/include/resolv_mt.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _RESOLV_MT_H
-#define _RESOLV_MT_H
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-/* Access functions for the libresolv private interface */
-
-int	__res_enable_mt(void);
-int	__res_disable_mt(void);
-
-/* Per-thread context */
-
-typedef struct {
-int	no_hosts_fallback_private;
-int	retry_save;
-int	retry_private;
-char	inet_nsap_ntoa_tmpbuf[255*3];
-char	sym_ntos_unname[20];
-char	sym_ntop_unname[20];
-char	p_option_nbuf[40];
-char	p_time_nbuf[40];
-char	precsize_ntoa_retbuf[sizeof "90000000.00"];
-char	loc_ntoa_tmpbuf[sizeof
-"1000 60 60.000 N 1000 60 60.000 W -12345678.00m 90000000.00m 90000000.00m 90000000.00m"];
-char	p_secstodate_output[15];
-} mtctxres_t;
-
-/* Thread-specific data (TSD) */
-
-mtctxres_t	*___mtctxres(void);
-#define mtctxres	(___mtctxres())
-
-/* Various static data that should be TSD */
-
-#define sym_ntos_unname		(mtctxres->sym_ntos_unname)
-#define sym_ntop_unname		(mtctxres->sym_ntop_unname)
-#define inet_nsap_ntoa_tmpbuf	(mtctxres->inet_nsap_ntoa_tmpbuf)
-#define p_option_nbuf		(mtctxres->p_option_nbuf)
-#define p_time_nbuf		(mtctxres->p_time_nbuf)
-#define precsize_ntoa_retbuf	(mtctxres->precsize_ntoa_retbuf)
-#define loc_ntoa_tmpbuf		(mtctxres->loc_ntoa_tmpbuf)
-#define p_secstodate_output	(mtctxres->p_secstodate_output)
-
-#endif /* _RESOLV_MT_H */
diff --git a/lib/libc_bsd/include/spinlock.h b/lib/libc_bsd/include/spinlock.h
deleted file mode 100644
index 75b7485..0000000
--- a/lib/libc_bsd/include/spinlock.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/include/spinlock.h 165968 2007-01-12 07:31:30Z imp $
- *
- * Lock definitions used in both libc and libpthread.
- *
- */
-
-#ifndef _SPINLOCK_H_
-#define _SPINLOCK_H_
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/*
- * Lock structure with room for debugging information.
- */
-struct _spinlock {
-	volatile long	access_lock;
-	volatile long	lock_owner;
-	volatile char	*fname;
-	volatile int	lineno;
-};
-typedef struct _spinlock spinlock_t;
-
-#define	_SPINLOCK_INITIALIZER	{ 0, 0, 0, 0 }
-
-#define _SPINUNLOCK(_lck)	_spinunlock(_lck);
-#ifdef	_LOCK_DEBUG
-#define	_SPINLOCK(_lck)		_spinlock_debug(_lck, __FILE__, __LINE__)
-#else
-#define	_SPINLOCK(_lck)		_spinlock(_lck)
-#endif
-
-/*
- * Thread function prototype definitions:
- */
-__BEGIN_DECLS
-long	_atomic_lock(volatile long *);
-void	_spinlock(spinlock_t *);
-void	_spinunlock(spinlock_t *);
-void	_spinlock_debug(spinlock_t *, char *, int);
-__END_DECLS
-
-#endif /* _SPINLOCK_H_ */
diff --git a/lib/libc_bsd/include/un-namespace.h b/lib/libc_bsd/include/un-namespace.h
deleted file mode 100644
index b5890b8..0000000
--- a/lib/libc_bsd/include/un-namespace.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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.
- *
- * 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 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/include/un-namespace.h 242960 2012-11-13 12:55:52Z kib $
- */
-
-#ifndef _UN_NAMESPACE_H_
-#define _UN_NAMESPACE_H_
-
-#undef		accept
-#undef		__acl_aclcheck_fd
-#undef		__acl_delete_fd
-#undef		__acl_get_fd
-#undef		__acl_set_fd
-#undef		bind
-#undef		__cap_get_fd
-#undef		__cap_set_fd
-#undef		close
-#undef		connect
-#undef		dup
-#undef		dup2
-#undef		execve
-#undef		fcntl
-#undef		flock
-#undef		flockfile
-#undef		fpathconf
-#undef		fstat
-#undef		fstatfs
-#undef		fsync
-#undef		funlockfile
-#undef		getdirentries
-#undef		getlogin
-#undef		getpeername
-#undef		getprogname
-#undef		getsockname
-#undef		getsockopt
-#undef		ioctl
-#undef		kevent
-#undef		listen
-#undef		nanosleep
-#undef		open
-#undef		openat
-#undef		poll
-#undef		pthread_atfork
-#undef		pthread_attr_destroy
-#undef		pthread_attr_get_np
-#undef		pthread_attr_getaffinity_np
-#undef		pthread_attr_getdetachstate
-#undef		pthread_attr_getguardsize
-#undef		pthread_attr_getinheritsched
-#undef		pthread_attr_getschedparam
-#undef		pthread_attr_getschedpolicy
-#undef		pthread_attr_getscope
-#undef		pthread_attr_getstack
-#undef		pthread_attr_getstackaddr
-#undef		pthread_attr_getstacksize
-#undef		pthread_attr_init
-#undef		pthread_attr_setaffinity_np
-#undef		pthread_attr_setcreatesuspend_np
-#undef		pthread_attr_setdetachstate
-#undef		pthread_attr_setguardsize
-#undef		pthread_attr_setinheritsched
-#undef		pthread_attr_setschedparam
-#undef		pthread_attr_setschedpolicy
-#undef		pthread_attr_setscope
-#undef		pthread_attr_setstack
-#undef		pthread_attr_setstackaddr
-#undef		pthread_attr_setstacksize
-#undef		pthread_barrier_destroy
-#undef		pthread_barrier_init
-#undef		pthread_barrier_wait
-#undef		pthread_barrierattr_destroy
-#undef		pthread_barrierattr_getpshared
-#undef		pthread_barrierattr_init
-#undef		pthread_barrierattr_setpshared
-#undef		pthread_cancel
-#undef		pthread_cond_broadcast
-#undef		pthread_cond_destroy
-#undef		pthread_cond_init
-#undef		pthread_cond_signal
-#undef		pthread_cond_timedwait
-#undef		pthread_cond_wait
-#undef		pthread_condattr_destroy
-#undef		pthread_condattr_getclock
-#undef		pthread_condattr_getpshared
-#undef		pthread_condattr_init
-#undef		pthread_condattr_setclock
-#undef		pthread_condattr_setpshared
-#undef		pthread_create
-#undef		pthread_detach
-#undef		pthread_equal
-#undef		pthread_exit
-#undef		pthread_getaffinity_np
-#undef		pthread_getconcurrency
-#undef		pthread_getcpuclockid
-#undef		pthread_getprio
-#undef		pthread_getschedparam
-#undef		pthread_getspecific
-#undef		pthread_getthreadid_np
-#undef		pthread_join
-#undef		pthread_key_create
-#undef		pthread_key_delete
-#undef		pthread_kill
-#undef		pthread_main_np
-#undef		pthread_multi_np
-#undef		pthread_mutex_destroy
-#undef		pthread_mutex_getprioceiling
-#undef		pthread_mutex_init
-#undef		pthread_mutex_isowned_np
-#undef		pthread_mutex_lock
-#undef		pthread_mutex_setprioceiling
-#undef		pthread_mutex_timedlock
-#undef		pthread_mutex_trylock
-#undef		pthread_mutex_unlock
-#undef		pthread_mutexattr_destroy
-#undef		pthread_mutexattr_getkind_np
-#undef		pthread_mutexattr_getprioceiling
-#undef		pthread_mutexattr_getprotocol
-#undef		pthread_mutexattr_getpshared
-#undef		pthread_mutexattr_gettype
-#undef		pthread_mutexattr_init
-#undef		pthread_mutexattr_setkind_np
-#undef		pthread_mutexattr_setprioceiling
-#undef		pthread_mutexattr_setprotocol
-#undef		pthread_mutexattr_setpshared
-#undef		pthread_mutexattr_settype
-#undef		pthread_once
-#undef		pthread_resume_all_np
-#undef		pthread_resume_np
-#undef		pthread_rwlock_destroy
-#undef		pthread_rwlock_init
-#undef		pthread_rwlock_rdlock
-#undef		pthread_rwlock_timedrdlock
-#undef		pthread_rwlock_timedwrlock
-#undef		pthread_rwlock_tryrdlock
-#undef		pthread_rwlock_trywrlock
-#undef		pthread_rwlock_unlock
-#undef		pthread_rwlock_wrlock
-#undef		pthread_rwlockattr_destroy
-#undef		pthread_rwlockattr_getpshared
-#undef		pthread_rwlockattr_init
-#undef		pthread_rwlockattr_setpshared
-#undef		pthread_self
-#undef		pthread_set_name_np
-#undef		pthread_setaffinity_np
-#undef		pthread_setcancelstate
-#undef		pthread_setcanceltype
-#undef		pthread_setconcurrency
-#undef		pthread_setprio
-#undef		pthread_setschedparam
-#undef		pthread_setspecific
-#undef		pthread_sigmask
-#undef		pthread_single_np
-#undef		pthread_spin_destroy
-#undef		pthread_spin_init
-#undef		pthread_spin_lock
-#undef		pthread_spin_trylock
-#undef		pthread_spin_unlock
-#undef		pthread_suspend_all_np
-#undef		pthread_suspend_np
-#undef		pthread_switch_add_np
-#undef		pthread_switch_delete_np
-#undef		pthread_testcancel
-#undef		pthread_timedjoin_np
-#undef		pthread_yield
-#undef		read
-#undef		readv
-#undef		recvfrom
-#undef		recvmsg
-#undef		select
-#undef		sem_close
-#undef		sem_destroy
-#undef		sem_getvalue
-#undef		sem_init
-#undef		sem_open
-#undef		sem_post
-#undef		sem_timedwait
-#undef		sem_trywait
-#undef		sem_unlink
-#undef		sem_wait
-#undef		sendmsg
-#undef		sendto
-#undef		setsockopt
-#undef		sigaction
-#undef		sigprocmask
-#undef		sigsuspend
-#undef		socket
-#undef		socketpair
-#undef		usleep
-#undef		wait4
-#undef		wait6
-#undef		waitpid
-#undef		write
-#undef		writev
-
-#if 0
-#undef		creat
-#undef		fchflags
-#undef		fchmod
-#undef		ftrylockfile
-#undef		msync
-#undef		nfssvc
-#undef		pause
-#undef		sched_yield
-#undef		sendfile
-#undef		shutdown
-#undef		sigaltstack
-#undef		sigpending
-#undef		sigreturn
-#undef		sigsetmask
-#undef		sleep
-#undef		system
-#undef		tcdrain
-#undef		wait
-#endif	/* 0 */
-
-#ifdef _SIGNAL_H_
-int     	_sigaction(int, const struct sigaction *, struct sigaction *);
-#endif
-
-#ifdef _SYS_EVENT_H_
-int		_kevent(int, const struct kevent *, int, struct kevent *,
-		    int, const struct timespec *);
-#endif
-
-#ifdef _SYS_FCNTL_H_
-int		_flock(int, int);
-#endif
-
-#undef		err
-#undef		warn
-#undef		nsdispatch
-
-#endif	/* _UN_NAMESPACE_H_ */
diff --git a/lib/libc_bsd/inet/Makefile.inc b/lib/libc_bsd/inet/Makefile.inc
deleted file mode 100644
index b85e1cc..0000000
--- a/lib/libc_bsd/inet/Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile.incl 157049 2006-03-23 16:55:13Z des $
-
-# inet sources
-.PATH: ${.CURDIR}/inet
-
-SRCS+=	inet_addr.c inet_cidr_ntop.c inet_cidr_pton.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 nsap_addr.c
-
-SYM_MAPS+= ${.CURDIR}/inet/Symbol.map
diff --git a/lib/libc_bsd/inet/Symbol.map b/lib/libc_bsd/inet/Symbol.map
deleted file mode 100644
index 298c1e1..0000000
--- a/lib/libc_bsd/inet/Symbol.map
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/inet/Symbol.map 170548 2007-06-11 07:21:21Z delphij $
- */
-
-FBSD_1.0 {
-	__inet_addr;
-	__inet_aton;
-	inet_addr;
-	inet_aton;
-	__inet_cidr_ntop;
-	__inet_cidr_pton;
-	__inet_lnaof;
-	inet_lnaof;
-	__inet_makeaddr;
-	inet_makeaddr;
-	__inet_net_ntop;
-	inet_net_ntop;
-	__inet_net_pton;
-	inet_net_pton;
-	__inet_neta;
-	inet_neta;
-	__inet_netof;
-	inet_netof;
-	__inet_network;
-	inet_network;
-	__inet_ntoa;
-	inet_ntoa;
-	__inet_ntoa_r;
-	inet_ntoa_r;
-	__inet_ntop;
-	inet_ntop;
-	__inet_pton;
-	inet_pton;
-	__inet_nsap_addr;
-	__inet_nsap_ntoa;
-	inet_nsap_addr;
-	inet_nsap_ntoa;
-};
diff --git a/lib/libc_bsd/inet/inet_addr.c b/lib/libc_bsd/inet/inet_addr.c
deleted file mode 100644
index 8ad00b7..0000000
--- a/lib/libc_bsd/inet/inet_addr.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 1983, 1990, 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.
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static const char rcsid[] = "$Id: inet_addr.c,v 1.5 2005/04/27 04:56:19 sra Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_addr.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <ctype.h>
-
-#include "port_after.h"
-
-/*%
- * Ascii internet address interpretation routine.
- * The value returned is in network order.
- */
-in_addr_t		/* XXX should be struct in_addr :( */
-inet_addr(const char *cp) {
-	struct in_addr val;
-
-	if (inet_aton(cp, &val))
-		return (val.s_addr);
-	return (INADDR_NONE);
-}
-
-/*%
- * Check whether "cp" is a valid ascii representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
- */
-int
-inet_aton(const char *cp, struct in_addr *addr) {
-	u_long val;
-	int base, n;
-	char c;
-	u_int8_t parts[4];
-	u_int8_t *pp = parts;
-	int digit;
-
-	c = *cp;
-	for (;;) {
-		/*
-		 * Collect number up to ``.''.
-		 * Values are specified as for C:
-		 * 0x=hex, 0=octal, isdigit=decimal.
-		 */
-		if (!isdigit((unsigned char)c))
-			return (0);
-		val = 0; base = 10; digit = 0;
-		if (c == '0') {
-			c = *++cp;
-			if (c == 'x' || c == 'X')
-				base = 16, c = *++cp;
-			else {
-				base = 8;
-				digit = 1 ;
-			}
-		}
-		for (;;) {
-			if (isascii(c) && isdigit((unsigned char)c)) {
-				if (base == 8 && (c == '8' || c == '9'))
-					return (0);
-				val = (val * base) + (c - '0');
-				c = *++cp;
-				digit = 1;
-			} else if (base == 16 && isascii(c) && 
-				   isxdigit((unsigned char)c)) {
-				val = (val << 4) |
-					(c + 10 - (islower((unsigned char)c) ? 'a' : 'A'));
-				c = *++cp;
-				digit = 1;
-			} else
-				break;
-		}
-		if (c == '.') {
-			/*
-			 * Internet format:
-			 *	a.b.c.d
-			 *	a.b.c	(with c treated as 16 bits)
-			 *	a.b	(with b treated as 24 bits)
-			 */
-			if (pp >= parts + 3 || val > 0xffU)
-				return (0);
-			*pp++ = val;
-			c = *++cp;
-		} else
-			break;
-	}
-	/*
-	 * Check for trailing characters.
-	 */
-	if (c != '\0' && (!isascii(c) || !isspace((unsigned char)c)))
-		return (0);
-	/*
-	 * Did we get a valid digit?
-	 */
-	if (!digit)
-		return (0);
-	/*
-	 * Concoct the address according to
-	 * the number of parts specified.
-	 */
-	n = pp - parts + 1;
-	switch (n) {
-	case 1:				/*%< a -- 32 bits */
-		break;
-
-	case 2:				/*%< a.b -- 8.24 bits */
-		if (val > 0xffffffU)
-			return (0);
-		val |= parts[0] << 24;
-		break;
-
-	case 3:				/*%< a.b.c -- 8.8.16 bits */
-		if (val > 0xffffU)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16);
-		break;
-
-	case 4:				/*%< a.b.c.d -- 8.8.8.8 bits */
-		if (val > 0xffU)
-			return (0);
-		val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-		break;
-	}
-	if (addr != NULL)
-		addr->s_addr = htonl(val);
-	return (1);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_addr
-__weak_reference(__inet_addr, inet_addr);
-#undef inet_aton
-__weak_reference(__inet_aton, inet_aton);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_cidr_ntop.c b/lib/libc_bsd/inet/inet_cidr_ntop.c
deleted file mode 100644
index 64f9782..0000000
--- a/lib/libc_bsd/inet/inet_cidr_ntop.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1998,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.7 2006/10/11 02:18:18 marka Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_cidr_ntop.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static char *
-inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size);
-static char *
-inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size);
-
-/*%
- * char *
- * inet_cidr_ntop(af, src, bits, dst, size)
- *	convert network address from network to presentation format.
- *	"src"'s size is determined from its "af".
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	192.5.5.1/28 has a nonzero host part, which means it isn't a network
- *	as called for by inet_net_ntop() but it can be a host address with
- *	an included netmask.
- * author:
- *	Paul Vixie (ISC), October 1998
- */
-char *
-inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size) {
-	switch (af) {
-	case AF_INET:
-		return (inet_cidr_ntop_ipv4(src, bits, dst, size));
-	case AF_INET6:
-		return (inet_cidr_ntop_ipv6(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-static int
-decoct(const u_char *src, int bytes, char *dst, size_t size) {
-	char *odst = dst;
-	char *t;
-	int b;
-
-	for (b = 1; b <= bytes; b++) {
-		if (size < sizeof "255.")
-			return (0);
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b != bytes) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-	return (dst - odst);
-}
-
-/*%
- * static char *
- * inet_cidr_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network address from network to presentation format.
- *	"src"'s size is determined from its "af".
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), October 1998
- */
-static char *
-inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size) {
-	char *odst = dst;
-	size_t len = 4;
-	size_t b;
-	size_t bytes;
-
-	if ((bits < -1) || (bits > 32)) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/* Find number of significant bytes in address. */
-	if (bits == -1)
-		len = 4;
-	else
-		for (len = 1, b = 1 ; b < 4U; b++)
-			if (*(src + b))
-				len = b + 1;
-
-	/* Format whole octets plus nonzero trailing octets. */
-	bytes = (((bits <= 0) ? 1 : bits) + 7) / 8;
-	if (len > bytes)
-		bytes = len;
-	b = decoct(src, bytes, dst, size);
-	if (b == 0U)
-		goto emsgsize;
-	dst += b;
-	size -= b;
-
-	if (bits != -1) {
-		/* Format CIDR /width. */
-		if (size < sizeof "/32")
-			goto emsgsize;
-		dst += SPRINTF((dst, "/%u", bits));
-	}
-
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
- 
-static char *
-inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) {
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255/128"];
-	char *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	if ((bits < -1) || (bits > 128)) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	best.len = 0;
-	cur.base = -1;
-	cur.len = 0;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 && (best.len == 6 ||
-		    (best.len == 7 && words[7] != 0x0001) ||
-		    (best.len == 5 && words[5] == 0xffff))) {
-			int n;
-
-			if (src[15] || bits == -1 || bits > 120)
-				n = 4;
-			else if (src[14] || bits > 112)
-				n = 3;
-			else
-				n = 2;
-			n = decoct(src+12, n, tp, sizeof tmp - (tp - tmp));
-			if (n == 0) {
-				errno = EMSGSIZE;
-				return (NULL);
-			}
-			tp += strlen(tp);
-			break;
-		}
-		tp += SPRINTF((tp, "%x", words[i]));
-	}
-
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) == 
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp = '\0';
-
-	if (bits != -1)
-		tp += SPRINTF((tp, "/%u", bits));
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((size_t)(tp - tmp) > size) {
-		errno = EMSGSIZE;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_cidr_pton.c b/lib/libc_bsd/inet/inet_cidr_pton.c
deleted file mode 100644
index 34ec15c..0000000
--- a/lib/libc_bsd/inet/inet_cidr_pton.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1998,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.6 2005/04/27 04:56:19 sra Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_cidr_pton.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static int	inet_cidr_pton_ipv4 __P((const char *src, u_char *dst,
-					 int *bits, int ipv6));
-static int	inet_cidr_pton_ipv6 __P((const char *src, u_char *dst,
-					 int *bits));
-
-static int	getbits(const char *, int ipv6);
-
-/*%
- * int
- * inet_cidr_pton(af, src, dst, *bits)
- *	convert network address from presentation to network format.
- *	accepts inet_pton()'s input for this "af" plus trailing "/CIDR".
- *	"dst" is assumed large enough for its "af".  "bits" is set to the
- *	/CIDR prefix length, which can have defaults (like /32 for IPv4).
- * return:
- *	-1 if an error occurred (inspect errno; ENOENT means bad format).
- *	0 if successful conversion occurred.
- * note:
- *	192.5.5.1/28 has a nonzero host part, which means it isn't a network
- *	as called for by inet_net_pton() but it can be a host address with
- *	an included netmask.
- * author:
- *	Paul Vixie (ISC), October 1998
- */
-int
-inet_cidr_pton(int af, const char *src, void *dst, int *bits) {
-	switch (af) {
-	case AF_INET:
-		return (inet_cidr_pton_ipv4(src, dst, bits, 0));
-	case AF_INET6:
-		return (inet_cidr_pton_ipv6(src, dst, bits));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
-
-static const char digits[] = "0123456789";
-
-static int
-inet_cidr_pton_ipv4(const char *src, u_char *dst, int *pbits, int ipv6) {
-	const u_char *odst = dst;
-	int n, ch, tmp, bits;
-	size_t size = 4;
-
-	/* Get the mantissa. */
-	while (ch = *src++, (isascii(ch) && isdigit(ch))) {
-		tmp = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			assert(n >= 0 && n <= 9);
-			tmp *= 10;
-			tmp += n;
-			if (tmp > 255)
-				goto enoent;
-		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
-		if (size-- == 0U)
-			goto emsgsize;
-		*dst++ = (u_char) tmp;
-		if (ch == '\0' || ch == '/')
-			break;
-		if (ch != '.')
-			goto enoent;
-	}
-
-	/* Get the prefix length if any. */
-	bits = -1;
-	if (ch == '/' && dst > odst) {
-		bits = getbits(src, ipv6);
-		if (bits == -2)
-			goto enoent;
-	} else if (ch != '\0')
-		goto enoent;
-
-	/* Prefix length can default to /32 only if all four octets spec'd. */
-	if (bits == -1) {
-		if (dst - odst == 4)
-			bits = ipv6 ? 128 : 32;
-		else
-			goto enoent;
-	}
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-
-	/* If prefix length overspecifies mantissa, life is bad. */
-	if (((bits - (ipv6 ? 96 : 0)) / 8) > (dst - odst))
-		goto enoent;
-
-	/* Extend address to four octets. */
-	while (size-- > 0U)
-		*dst++ = 0;
-
-	*pbits = bits;
-	return (0);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-static int
-inet_cidr_pton_ipv6(const char *src, u_char *dst, int *pbits) {
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-	int bits;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	bits = -1;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (val > 0xffff)
-				return (0);
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			} else if (*src == '\0') {
-				return (0);
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_cidr_pton_ipv4(curtok, tp, &bits, 1) == 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			break;	/*%< '\\0' was seen by inet_pton4(). */
-		}
-		if (ch == '/') {
-			bits = getbits(src, 1);
-			if (bits == -2)
-				goto enoent;
-			break;
-		}
-		goto enoent;
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			goto emsgsize;
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		if (tp == endp)
-			goto enoent;
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-
-	*pbits = bits;
-	return (0);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-static int
-getbits(const char *src, int ipv6) {
-	int bits = 0;
-	char *cp, ch;
-	
-	if (*src == '\0')			/*%< syntax */
-		return (-2);
-	do {
-		ch = *src++;
-		cp = strchr(digits, ch);
-		if (cp == NULL)			/*%< syntax */
-			return (-2);
-		bits *= 10;
-		bits += cp - digits;
-		if (bits == 0 && *src != '\0')	/*%< no leading zeros */
-			return (-2);
-		if (bits > (ipv6 ? 128 : 32))	/*%< range error */
-			return (-2);
-	} while (*src != '\0');
-
-	return (bits);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_lnaof.c b/lib/libc_bsd/inet/inet_lnaof.c
deleted file mode 100644
index f2291cf..0000000
--- a/lib/libc_bsd/inet/inet_lnaof.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_lnaof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_lnaof.c 170244 2007-06-03 17:20:27Z ume $");
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "port_after.h"
-
-/*%
- * Return the local network address portion of an
- * internet address; handles class a/b/c network
- * number formats.
- */
-in_addr_t
-inet_lnaof(in)
-	struct in_addr in;
-{
-	in_addr_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return ((i)&IN_CLASSA_HOST);
-	else if (IN_CLASSB(i))
-		return ((i)&IN_CLASSB_HOST);
-	else
-		return ((i)&IN_CLASSC_HOST);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_lnaof
-__weak_reference(__inet_lnaof, inet_lnaof);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_makeaddr.c b/lib/libc_bsd/inet/inet_makeaddr.c
deleted file mode 100644
index 29ef521..0000000
--- a/lib/libc_bsd/inet/inet_makeaddr.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_makeaddr.c 170244 2007-06-03 17:20:27Z ume $");
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "port_after.h"
-
-/*%
- * Formulate an Internet address from network + host.  Used in
- * building addresses stored in the ifnet structure.
- */
-struct in_addr
-inet_makeaddr(net, host)
-	in_addr_t net, host;
-{
-	struct in_addr a;
-
-	if (net < 128U)
-		a.s_addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST);
-	else if (net < 65536U)
-		a.s_addr = (net << IN_CLASSB_NSHIFT) | (host & IN_CLASSB_HOST);
-	else if (net < 16777216L)
-		a.s_addr = (net << IN_CLASSC_NSHIFT) | (host & IN_CLASSC_HOST);
-	else
-		a.s_addr = net | host;
-	a.s_addr = htonl(a.s_addr);
-	return (a);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_makeaddr
-__weak_reference(__inet_makeaddr, inet_makeaddr);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_net_ntop.c b/lib/libc_bsd/inet/inet_net_ntop.c
deleted file mode 100644
index bb270fc..0000000
--- a/lib/libc_bsd/inet/inet_net_ntop.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.5 2006/06/20 02:50:14 marka Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_net_ntop.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-static char *	inet_net_ntop_ipv4(const u_char *src, int bits, char *dst,
-		    size_t size);
-static char *	inet_net_ntop_ipv6(const u_char *src, int bits, char *dst,
-		    size_t size);
-
-/*%
- * char *
- * inet_net_ntop(af, src, bits, dst, size)
- *	convert network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_net_ntop(af, src, bits, dst, size)
-	int af;
-	const void *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_net_ntop_ipv4(src, bits, dst, size));
-	case AF_INET6:
-		return (inet_net_ntop_ipv6(src, bits, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-}
-
-/*%
- * static char *
- * inet_net_ntop_ipv4(src, bits, dst, size)
- *	convert IPv4 network number from network to presentation format.
- *	generates CIDR style result always.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-static char *
-inet_net_ntop_ipv4(src, bits, dst, size)
-	const u_char *src;
-	int bits;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *t;
-	u_int m;
-	int b;
-
-	if (bits < 0 || bits > 32) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (bits == 0) {
-		if (size < sizeof "0")
-			goto emsgsize;
-		*dst++ = '0';
-		size--;
-		*dst = '\0';
-	}
-
-	/* Format whole octets. */
-	for (b = bits / 8; b > 0; b--) {
-		if (size <= sizeof "255.")
-			goto emsgsize;
-		t = dst;
-		dst += SPRINTF((dst, "%u", *src++));
-		if (b > 1) {
-			*dst++ = '.';
-			*dst = '\0';
-		}
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format partial octet. */
-	b = bits % 8;
-	if (b > 0) {
-		if (size <= sizeof ".255")
-			goto emsgsize;
-		t = dst;
-		if (dst != odst)
-			*dst++ = '.';
-		m = ((1 << b) - 1) << (8 - b);
-		dst += SPRINTF((dst, "%u", *src & m));
-		size -= (size_t)(dst - t);
-	}
-
-	/* Format CIDR /width. */
-	if (size <= sizeof "/32")
-		goto emsgsize;
-	dst += SPRINTF((dst, "/%u", bits));
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
-
-/*%
- * static char *
- * inet_net_ntop_ipv6(src, bits, fakebits, dst, size)
- *	convert IPv6 network number from network to presentation format.
- *	generates CIDR style result always. Picks the shortest representation
- *	unless the IP is really IPv4.
- *	always prints specified number of bits (bits).
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Vadim Kogan (UCB), June 2001
- *  Original version (IPv4) by Paul Vixie (ISC), July 1996
- */
-
-static char *
-inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) {
-	u_int	m;
-	int	b;
-	int	p;
-	int	zero_s, zero_l, tmp_zero_s, tmp_zero_l;
-	int	i;
-	int	is_ipv4 = 0;
-	unsigned char inbuf[16];
-	char outbuf[sizeof("xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:255.255.255.255/128")];
-	char	*cp;
-	int	words;
-	u_char	*s;
-
-	if (bits < 0 || bits > 128) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	cp = outbuf;
-
-	if (bits == 0) {
-		*cp++ = ':';
-		*cp++ = ':';
-		*cp = '\0';
-	} else {
-		/* Copy src to private buffer.  Zero host part. */
-		p = (bits + 7) / 8;
-		memcpy(inbuf, src, p);
-		memset(inbuf + p, 0, 16 - p);
-		b = bits % 8;
-		if (b != 0) {
-			m = ~0 << (8 - b);
-			inbuf[p-1] &= m;
-		}
-
-		s = inbuf;
-
-		/* how many words need to be displayed in output */
-		words = (bits + 15) / 16;
-		if (words == 1)
-			words = 2;
-
-		/* Find the longest substring of zero's */
-		zero_s = zero_l = tmp_zero_s = tmp_zero_l = 0;
-		for (i = 0; i < (words * 2); i += 2) {
-			if ((s[i] | s[i+1]) == 0) {
-				if (tmp_zero_l == 0)
-					tmp_zero_s = i / 2;
-				tmp_zero_l++;
-			} else {
-				if (tmp_zero_l && zero_l < tmp_zero_l) {
-					zero_s = tmp_zero_s;
-					zero_l = tmp_zero_l;
-					tmp_zero_l = 0;
-				}
-			}
-		}
-
-		if (tmp_zero_l && zero_l < tmp_zero_l) {
-			zero_s = tmp_zero_s;
-			zero_l = tmp_zero_l;
-		}
-
-		if (zero_l != words && zero_s == 0 && ((zero_l == 6) ||
-		    ((zero_l == 5 && s[10] == 0xff && s[11] == 0xff) ||
-		    ((zero_l == 7 && s[14] != 0 && s[15] != 1)))))
-			is_ipv4 = 1;
-
-		/* Format whole words. */
-		for (p = 0; p < words; p++) {
-			if (zero_l != 0 && p >= zero_s && p < zero_s + zero_l) {
-				/* Time to skip some zeros */
-				if (p == zero_s)
-					*cp++ = ':';
-				if (p == words - 1)
-					*cp++ = ':';
-				s++;
-				s++;
-				continue;
-			}
-
-			if (is_ipv4 && p > 5 ) {
-				*cp++ = (p == 6) ? ':' : '.';
-				cp += SPRINTF((cp, "%u", *s++));
-				/* we can potentially drop the last octet */
-				if (p != 7 || bits > 120) {
-					*cp++ = '.';
-					cp += SPRINTF((cp, "%u", *s++));
-				}
-			} else {
-				if (cp != outbuf)
-					*cp++ = ':';
-				cp += SPRINTF((cp, "%x", *s * 256 + s[1]));
-				s += 2;
-			}
-		}
-	}
-	/* Format CIDR /width. */
-	sprintf(cp, "/%u", bits);
-	if (strlen(outbuf) + 1 > size)
-		goto emsgsize;
-	strcpy(dst, outbuf);
-
-	return (dst);
-
-emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_net_ntop
-__weak_reference(__inet_net_ntop, inet_net_ntop);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_net_pton.c b/lib/libc_bsd/inet/inet_net_pton.c
deleted file mode 100644
index f65678d..0000000
--- a/lib/libc_bsd/inet/inet_net_pton.c
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1996, 1998, 1999, 2001, 2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.10 2008/11/14 02:36:51 marka Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_net_pton.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/*%
- * static int
- * inet_net_pton_ipv4(src, dst, size)
- *	convert IPv4 network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not an IPv4 network specification.
- * note:
- *	network byte order assumed.  this means 192.5.5.240/28 has
- *	0b11110000 in its fourth octet.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-static int
-inet_net_pton_ipv4(const char *src, u_char *dst, size_t size) {
-	static const char xdigits[] = "0123456789abcdef";
-	static const char digits[] = "0123456789";
-	int n, ch, tmp = 0, dirty, bits;
-	const u_char *odst = dst;
-
-	ch = *src++;
-	if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
-	    && isascii((unsigned char)(src[1]))
-	    && isxdigit((unsigned char)(src[1]))) {
-		/* Hexadecimal: Eat nybble string. */
-		if (size <= 0U)
-			goto emsgsize;
-		dirty = 0;
-		src++;	/*%< skip x or X. */
-		while ((ch = *src++) != '\0' && isascii(ch) && isxdigit(ch)) {
-			if (isupper(ch))
-				ch = tolower(ch);
-			n = strchr(xdigits, ch) - xdigits;
-			assert(n >= 0 && n <= 15);
-			if (dirty == 0)
-				tmp = n;
-			else
-				tmp = (tmp << 4) | n;
-			if (++dirty == 2) {
-				if (size-- <= 0U)
-					goto emsgsize;
-				*dst++ = (u_char) tmp;
-				dirty = 0;
-			}
-		}
-		if (dirty) {  /*%< Odd trailing nybble? */
-			if (size-- <= 0U)
-				goto emsgsize;
-			*dst++ = (u_char) (tmp << 4);
-		}
-	} else if (isascii(ch) && isdigit(ch)) {
-		/* Decimal: eat dotted digit string. */
-		for (;;) {
-			tmp = 0;
-			do {
-				n = strchr(digits, ch) - digits;
-				assert(n >= 0 && n <= 9);
-				tmp *= 10;
-				tmp += n;
-				if (tmp > 255)
-					goto enoent;
-			} while ((ch = *src++) != '\0' &&
-				 isascii(ch) && isdigit(ch));
-			if (size-- <= 0U)
-				goto emsgsize;
-			*dst++ = (u_char) tmp;
-			if (ch == '\0' || ch == '/')
-				break;
-			if (ch != '.')
-				goto enoent;
-			ch = *src++;
-			if (!isascii(ch) || !isdigit(ch))
-				goto enoent;
-		}
-	} else
-		goto enoent;
-
-	bits = -1;
-	if (ch == '/' && isascii((unsigned char)(src[0])) &&
-	    isdigit((unsigned char)(src[0])) && dst > odst) {
-		/* CIDR width specifier.  Nothing can follow it. */
-		ch = *src++;	/*%< Skip over the /. */
-		bits = 0;
-		do {
-			n = strchr(digits, ch) - digits;
-			assert(n >= 0 && n <= 9);
-			bits *= 10;
-			bits += n;
-			if (bits > 32)
-				goto enoent;
-		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
-		if (ch != '\0')
-			goto enoent;
-	}
-
-	/* Firey death and destruction unless we prefetched EOS. */
-	if (ch != '\0')
-		goto enoent;
-
-	/* If nothing was written to the destination, we found no address. */
-	if (dst == odst)
-		goto enoent;
-	/* If no CIDR spec was given, infer width from net class. */
-	if (bits == -1) {
-		if (*odst >= 240)	/*%< Class E */
-			bits = 32;
-		else if (*odst >= 224)	/*%< Class D */
-			bits = 8;
-		else if (*odst >= 192)	/*%< Class C */
-			bits = 24;
-		else if (*odst >= 128)	/*%< Class B */
-			bits = 16;
-		else			/*%< Class A */
-			bits = 8;
-		/* If imputed mask is narrower than specified octets, widen. */
-		if (bits < ((dst - odst) * 8))
-			bits = (dst - odst) * 8;
-		/*
-		 * If there are no additional bits specified for a class D
-		 * address adjust bits to 4.
-		 */
-		if (bits == 8 && *odst == 224)
-			bits = 4;
-	}
-	/* Extend network to cover the actual mask. */
-	while (bits > ((dst - odst) * 8)) {
-		if (size-- <= 0U)
-			goto emsgsize;
-		*dst++ = '\0';
-	}
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-static int
-getbits(const char *src, int *bitsp) {
-	static const char digits[] = "0123456789";
-	int n;
-	int val;
-	char ch;
-
-	val = 0;
-	n = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		pch = strchr(digits, ch);
-		if (pch != NULL) {
-			if (n++ != 0 && val == 0)	/*%< no leading zeros */
-				return (0);
-			val *= 10;
-			val += (pch - digits);
-			if (val > 128)			/*%< range */
-				return (0);
-			continue;
-		}
-		return (0);
-	}
-	if (n == 0)
-		return (0);
-	*bitsp = val;
-	return (1);
-}
-
-static int
-getv4(const char *src, u_char *dst, int *bitsp) {
-	static const char digits[] = "0123456789";
-	u_char *odst = dst;
-	int n;
-	u_int val;
-	char ch;
-
-	val = 0;
-	n = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		pch = strchr(digits, ch);
-		if (pch != NULL) {
-			if (n++ != 0 && val == 0)	/*%< no leading zeros */
-				return (0);
-			val *= 10;
-			val += (pch - digits);
-			if (val > 255)			/*%< range */
-				return (0);
-			continue;
-		}
-		if (ch == '.' || ch == '/') {
-			if (dst - odst > 3)		/*%< too many octets? */
-				return (0);
-			*dst++ = val;
-			if (ch == '/')
-				return (getbits(src, bitsp));
-			val = 0;
-			n = 0;
-			continue;
-		}
-		return (0);
-	}
-	if (n == 0)
-		return (0);
-	if (dst - odst > 3)		/*%< too many octets? */
-		return (0);
-	*dst++ = val;
-	return (1);
-}
-
-static int
-inet_net_pton_ipv6(const char *src, u_char *dst, size_t size) {
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, saw_xdigit;
-	u_int val;
-	int digits;
-	int bits;
-	size_t bytes;
-	int words;
-	int ipv4;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			goto enoent;
-	curtok = src;
-	saw_xdigit = 0;
-	val = 0;
-	digits = 0;
-	bits = -1;
-	ipv4 = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (++digits > 4)
-				goto enoent;
-			saw_xdigit = 1;
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!saw_xdigit) {
-				if (colonp)
-					goto enoent;
-				colonp = tp;
-				continue;
-			} else if (*src == '\0')
-				goto enoent;
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			saw_xdigit = 0;
-			digits = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		     getv4(curtok, tp, &bits) > 0) {
-			tp += NS_INADDRSZ;
-			saw_xdigit = 0;
-			ipv4 = 1;
-			break;	/*%< '\\0' was seen by inet_pton4(). */
-		}
-		if (ch == '/' && getbits(src, &bits) > 0)
-			break;
-		goto enoent;
-	}
-	if (saw_xdigit) {
-		if (tp + NS_INT16SZ > endp)
-			goto enoent;
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (bits == -1)
-		bits = 128;
-
-	words = (bits + 15) / 16;
-	if (words < 2)
-		words = 2;
-	if (ipv4)
-		words = 8;
-	endp =  tmp + 2 * words;
-
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		if (tp == endp)
-			goto enoent;
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		goto enoent;
-
-	bytes = (bits + 7) / 8;
-	if (bytes > size)
-		goto emsgsize;
-	memcpy(dst, tmp, bytes);
-	return (bits);
-
- enoent:
-	errno = ENOENT;
-	return (-1);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (-1);
-}
-
-/*%
- * int
- * inet_net_pton(af, src, dst, size)
- *	convert network number from presentation to network format.
- *	accepts hex octets, hex strings, decimal octets, and /CIDR.
- *	"size" is in bytes and describes "dst".
- * return:
- *	number of bits, either imputed classfully or specified with /CIDR,
- *	or -1 if some failure occurred (check errno).  ENOENT means it was
- *	not a valid network specification.
- * author:
- *	Paul Vixie (ISC), June 1996
- */
-int
-inet_net_pton(int af, const char *src, void *dst, size_t size) {
-	switch (af) {
-	case AF_INET:
-		return (inet_net_pton_ipv4(src, dst, size));
-	case AF_INET6:
-		return (inet_net_pton_ipv6(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_net_pton
-__weak_reference(__inet_net_pton, inet_net_pton);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_neta.c b/lib/libc_bsd/inet/inet_neta.c
deleted file mode 100644
index 27173ed..0000000
--- a/lib/libc_bsd/inet/inet_neta.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_neta.c,v 1.3 2005/04/27 04:56:20 sra Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_neta.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/*%
- * char *
- * inet_neta(src, dst, size)
- *	format an in_addr_t network number into presentation format.
- * return:
- *	pointer to dst, or NULL if an error occurred (check errno).
- * note:
- *	format of ``src'' is as for inet_network().
- * author:
- *	Paul Vixie (ISC), July 1996
- */
-char *
-inet_neta(src, dst, size)
-	in_addr_t src;
-	char *dst;
-	size_t size;
-{
-	char *odst = dst;
-	char *tp;
-
-	while (src & 0xffffffff) {
-		u_char b = (src & 0xff000000) >> 24;
-
-		src <<= 8;
-		if (b) {
-			if (size < sizeof "255.")
-				goto emsgsize;
-			tp = dst;
-			dst += SPRINTF((dst, "%u", b));
-			if (src != 0L) {
-				*dst++ = '.';
-				*dst = '\0';
-			}
-			size -= (size_t)(dst - tp);
-		}
-	}
-	if (dst == odst) {
-		if (size < sizeof "0.0.0.0")
-			goto emsgsize;
-		strcpy(dst, "0.0.0.0");
-	}
-	return (odst);
-
- emsgsize:
-	errno = EMSGSIZE;
-	return (NULL);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_neta
-__weak_reference(__inet_neta, inet_neta);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_netof.c b/lib/libc_bsd/inet/inet_netof.c
deleted file mode 100644
index e1e9b91..0000000
--- a/lib/libc_bsd/inet/inet_netof.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_netof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_netof.c 170244 2007-06-03 17:20:27Z ume $");
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include "port_after.h"
-
-/*%
- * Return the network number from an internet
- * address; handles class a/b/c network #'s.
- */
-in_addr_t
-inet_netof(in)
-	struct in_addr in;
-{
-	in_addr_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (((i)&IN_CLASSA_NET) >> IN_CLASSA_NSHIFT);
-	else if (IN_CLASSB(i))
-		return (((i)&IN_CLASSB_NET) >> IN_CLASSB_NSHIFT);
-	else
-		return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_netof
-__weak_reference(__inet_netof, inet_netof);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_network.c b/lib/libc_bsd/inet/inet_network.c
deleted file mode 100644
index 55b5d11..0000000
--- a/lib/libc_bsd/inet/inet_network.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_network.c 175330 2008-01-14 22:56:05Z cperciva $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <ctype.h>
-
-#include "port_after.h"
-
-/*%
- * Internet network address interpretation routine.
- * The library routines call this routine to interpret
- * network numbers.
- */
-in_addr_t
-inet_network(cp)
-	const char *cp;
-{
-	in_addr_t val, base, n;
-	char c;
-	in_addr_t parts[4], *pp = parts;
-	int i, digit;
-
-again:
-	val = 0; base = 10; digit = 0;
-	if (*cp == '0')
-		digit = 1, base = 8, cp++;
-	if (*cp == 'x' || *cp == 'X')
-		base = 16, cp++;
-	while ((c = *cp) != 0) {
-		if (isdigit((unsigned char)c)) {
-			if (base == 8U && (c == '8' || c == '9'))
-				return (INADDR_NONE);
-			val = (val * base) + (c - '0');
-			cp++;
-			digit = 1;
-			continue;
-		}
-		if (base == 16U && isxdigit((unsigned char)c)) {
-			val = (val << 4) +
-			      (c + 10 - (islower((unsigned char)c) ? 'a' : 'A'));
-			cp++;
-			digit = 1;
-			continue;
-		}
-		break;
-	}
-	if (!digit)
-		return (INADDR_NONE);
-	if (pp >= parts + 4 || val > 0xffU)
-		return (INADDR_NONE);
-	if (*cp == '.') {
-		*pp++ = val, cp++;
-		goto again;
-	}
-	if (*cp && !isspace(*cp&0xff))
-		return (INADDR_NONE);
-	*pp++ = val;
-	n = pp - parts;
-	if (n > 4U)
-		return (INADDR_NONE);
-	for (val = 0, i = 0; i < n; i++) {
-		val <<= 8;
-		val |= parts[i] & 0xff;
-	}
-	return (val);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_network
-__weak_reference(__inet_network, inet_network);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_ntoa.c b/lib/libc_bsd/inet/inet_ntoa.c
deleted file mode 100644
index fbde1ca..0000000
--- a/lib/libc_bsd/inet/inet_ntoa.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)inet_ntoa.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: inet_ntoa.c,v 1.2 2005/04/27 04:56:21 sra Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_ntoa.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include "port_after.h"
-
-/*%
- * Convert network-format internet address
- * to base 256 d.d.d.d representation.
- */
-/*const*/ char *
-inet_ntoa(struct in_addr in) {
-	static char ret[18];
-
-	strcpy(ret, "[inet_ntoa error]");
-	(void) inet_ntop(AF_INET, &in, ret, sizeof ret);
-	return (ret);
-}
-
-char *
-inet_ntoa_r(struct in_addr in, char *buf, socklen_t size)
-{
-
-	(void) inet_ntop(AF_INET, &in, buf, size);
-	return (buf);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_ntoa
-__weak_reference(__inet_ntoa, inet_ntoa);
-__weak_reference(__inet_ntoa_r, inet_ntoa_r);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_ntop.c b/lib/libc_bsd/inet/inet_ntop.c
deleted file mode 100644
index 237325d..0000000
--- a/lib/libc_bsd/inet/inet_ntop.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_ntop.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "port_after.h"
-
-/*%
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static const char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
-static const char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
-
-/* char *
- * inet_ntop(af, src, dst, size)
- *	convert a network format address to presentation format.
- * return:
- *	pointer to presentation format address (`dst'), or NULL (see errno).
- * author:
- *	Paul Vixie, 1996.
- */
-const char *
-inet_ntop(int af, const void * __restrict src, char * __restrict dst,
-    socklen_t size)
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_ntop4(src, dst, size));
-	case AF_INET6:
-		return (inet_ntop6(src, dst, size));
-	default:
-		errno = EAFNOSUPPORT;
-		return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-/* const char *
- * inet_ntop4(src, dst, size)
- *	format an IPv4 address
- * return:
- *	`dst' (as a const)
- * notes:
- *	(1) uses no statics
- *	(2) takes a u_char* not an in_addr as input
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop4(const u_char *src, char *dst, socklen_t size)
-{
-	static const char fmt[] = "%u.%u.%u.%u";
-	char tmp[sizeof "255.255.255.255"];
-	int l;
-
-	l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]);
-	if (l <= 0 || (socklen_t) l >= size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strlcpy(dst, tmp, size);
-	return (dst);
-}
-
-/* const char *
- * inet_ntop6(src, dst, size)
- *	convert IPv6 binary address into presentation (printable) format
- * author:
- *	Paul Vixie, 1996.
- */
-static const char *
-inet_ntop6(const u_char *src, char *dst, socklen_t size)
-{
-	/*
-	 * Note that int32_t and int16_t need only be "at least" large enough
-	 * to contain a value of the specified size.  On some systems, like
-	 * Crays, there is no such thing as an integer variable with 16 bits.
-	 * Keep this in mind if you think this function should have been coded
-	 * to use pointer overlays.  All the world's not a VAX.
-	 */
-	char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-	struct { int base, len; } best, cur;
-	u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-	int i;
-
-	/*
-	 * Preprocess:
-	 *	Copy the input (bytewise) array into a wordwise array.
-	 *	Find the longest run of 0x00's in src[] for :: shorthanding.
-	 */
-	memset(words, '\0', sizeof words);
-	for (i = 0; i < NS_IN6ADDRSZ; i++)
-		words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-	best.base = -1;
-	best.len = 0;
-	cur.base = -1;
-	cur.len = 0;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		if (words[i] == 0) {
-			if (cur.base == -1)
-				cur.base = i, cur.len = 1;
-			else
-				cur.len++;
-		} else {
-			if (cur.base != -1) {
-				if (best.base == -1 || cur.len > best.len)
-					best = cur;
-				cur.base = -1;
-			}
-		}
-	}
-	if (cur.base != -1) {
-		if (best.base == -1 || cur.len > best.len)
-			best = cur;
-	}
-	if (best.base != -1 && best.len < 2)
-		best.base = -1;
-
-	/*
-	 * Format the result.
-	 */
-	tp = tmp;
-	for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-		/* Are we inside the best run of 0x00's? */
-		if (best.base != -1 && i >= best.base &&
-		    i < (best.base + best.len)) {
-			if (i == best.base)
-				*tp++ = ':';
-			continue;
-		}
-		/* Are we following an initial run of 0x00s or any real hex? */
-		if (i != 0)
-			*tp++ = ':';
-		/* Is this address an encapsulated IPv4? */
-		if (i == 6 && best.base == 0 && (best.len == 6 ||
-		    (best.len == 7 && words[7] != 0x0001) ||
-		    (best.len == 5 && words[5] == 0xffff))) {
-			if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
-				return (NULL);
-			tp += strlen(tp);
-			break;
-		}
-		tp += sprintf(tp, "%x", words[i]);
-	}
-	/* Was it a trailing run of 0x00's? */
-	if (best.base != -1 && (best.base + best.len) == 
-	    (NS_IN6ADDRSZ / NS_INT16SZ))
-		*tp++ = ':';
-	*tp++ = '\0';
-
-	/*
-	 * Check for overflow, copy, and we're done.
-	 */
-	if ((socklen_t)(tp - tmp) > size) {
-		errno = ENOSPC;
-		return (NULL);
-	}
-	strcpy(dst, tmp);
-	return (dst);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_ntop
-__weak_reference(__inet_ntop, inet_ntop);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/inet_pton.c b/lib/libc_bsd/inet/inet_pton.c
deleted file mode 100644
index 17cda1f..0000000
--- a/lib/libc_bsd/inet/inet_pton.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_pton.c,v 1.5 2005/07/28 06:51:47 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/inet_pton.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <string.h>
-#include <errno.h>
-#include "port_after.h"
-
-/*%
- * WARNING: Don't even consider trying to compile this on a system where
- * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
- */
-
-static int	inet_pton4(const char *src, u_char *dst);
-static int	inet_pton6(const char *src, u_char *dst);
-
-/* int
- * inet_pton(af, src, dst)
- *	convert from presentation format (which usually means ASCII printable)
- *	to network format (which is usually some kind of binary format).
- * return:
- *	1 if the address was valid for the specified address family
- *	0 if the address wasn't valid (`dst' is untouched in this case)
- *	-1 if some other error occurred (`dst' is untouched in this case, too)
- * author:
- *	Paul Vixie, 1996.
- */
-int
-inet_pton(int af, const char * __restrict src, void * __restrict dst)
-{
-	switch (af) {
-	case AF_INET:
-		return (inet_pton4(src, dst));
-	case AF_INET6:
-		return (inet_pton6(src, dst));
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-	/* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst)
- *	like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *	1 if `src' is a valid dotted quad, else 0.
- * notice:
- *	does not touch `dst' unless it's returning 1.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton4(const char *src, u_char *dst)
-{
-	static const char digits[] = "0123456789";
-	int saw_digit, octets, ch;
-	u_char tmp[NS_INADDRSZ], *tp;
-
-	saw_digit = 0;
-	octets = 0;
-	*(tp = tmp) = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr(digits, ch)) != NULL) {
-			u_int new = *tp * 10 + (pch - digits);
-
-			if (saw_digit && *tp == 0)
-				return (0);
-			if (new > 255)
-				return (0);
-			*tp = new;
-			if (!saw_digit) {
-				if (++octets > 4)
-					return (0);
-				saw_digit = 1;
-			}
-		} else if (ch == '.' && saw_digit) {
-			if (octets == 4)
-				return (0);
-			*++tp = 0;
-			saw_digit = 0;
-		} else
-			return (0);
-	}
-	if (octets < 4)
-		return (0);
-	memcpy(dst, tmp, NS_INADDRSZ);
-	return (1);
-}
-
-/* int
- * inet_pton6(src, dst)
- *	convert presentation level address to network order binary form.
- * return:
- *	1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *	(1) does not touch `dst' unless it's returning 1.
- *	(2) :: in a full address is silently ignored.
- * credit:
- *	inspired by Mark Andrews.
- * author:
- *	Paul Vixie, 1996.
- */
-static int
-inet_pton6(const char *src, u_char *dst)
-{
-	static const char xdigits_l[] = "0123456789abcdef",
-			  xdigits_u[] = "0123456789ABCDEF";
-	u_char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
-	const char *xdigits, *curtok;
-	int ch, seen_xdigits;
-	u_int val;
-
-	memset((tp = tmp), '\0', NS_IN6ADDRSZ);
-	endp = tp + NS_IN6ADDRSZ;
-	colonp = NULL;
-	/* Leading :: requires some special handling. */
-	if (*src == ':')
-		if (*++src != ':')
-			return (0);
-	curtok = src;
-	seen_xdigits = 0;
-	val = 0;
-	while ((ch = *src++) != '\0') {
-		const char *pch;
-
-		if ((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-			pch = strchr((xdigits = xdigits_u), ch);
-		if (pch != NULL) {
-			val <<= 4;
-			val |= (pch - xdigits);
-			if (++seen_xdigits > 4)
-				return (0);
-			continue;
-		}
-		if (ch == ':') {
-			curtok = src;
-			if (!seen_xdigits) {
-				if (colonp)
-					return (0);
-				colonp = tp;
-				continue;
-			} else if (*src == '\0') {
-				return (0);
-			}
-			if (tp + NS_INT16SZ > endp)
-				return (0);
-			*tp++ = (u_char) (val >> 8) & 0xff;
-			*tp++ = (u_char) val & 0xff;
-			seen_xdigits = 0;
-			val = 0;
-			continue;
-		}
-		if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
-		    inet_pton4(curtok, tp) > 0) {
-			tp += NS_INADDRSZ;
-			seen_xdigits = 0;
-			break;	/*%< '\\0' was seen by inet_pton4(). */
-		}
-		return (0);
-	}
-	if (seen_xdigits) {
-		if (tp + NS_INT16SZ > endp)
-			return (0);
-		*tp++ = (u_char) (val >> 8) & 0xff;
-		*tp++ = (u_char) val & 0xff;
-	}
-	if (colonp != NULL) {
-		/*
-		 * Since some memmove()'s erroneously fail to handle
-		 * overlapping regions, we'll do the shift by hand.
-		 */
-		const int n = tp - colonp;
-		int i;
-
-		if (tp == endp)
-			return (0);
-		for (i = 1; i <= n; i++) {
-			endp[- i] = colonp[n - i];
-			colonp[n - i] = 0;
-		}
-		tp = endp;
-	}
-	if (tp != endp)
-		return (0);
-	memcpy(dst, tmp, NS_IN6ADDRSZ);
-	return (1);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_pton
-__weak_reference(__inet_pton, inet_pton);
-
-/*! \file */
diff --git a/lib/libc_bsd/inet/nsap_addr.c b/lib/libc_bsd/inet/nsap_addr.c
deleted file mode 100644
index a14aad6..0000000
--- a/lib/libc_bsd/inet/nsap_addr.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: nsap_addr.c,v 1.5 2005/07/28 06:51:48 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/inet/nsap_addr.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <resolv_mt.h>
-
-#include "port_after.h"
-
-static char
-xtob(int c) {
-	return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
-}
-
-u_int
-inet_nsap_addr(const char *ascii, u_char *binary, int maxlen) {
-	u_char c, nib;
-	u_int len = 0;
-
-	if (ascii[0] != '0' || (ascii[1] != 'x' && ascii[1] != 'X'))
-		return (0);
-	ascii += 2;
-
-	while ((c = *ascii++) != '\0' && len < (u_int)maxlen) {
-		if (c == '.' || c == '+' || c == '/')
-			continue;
-		if (!isascii(c))
-			return (0);
-		if (islower(c))
-			c = toupper(c);
-		if (isxdigit(c)) {
-			nib = xtob(c);
-			c = *ascii++;
-			if (c != '\0') {
-				c = toupper(c);
-				if (isxdigit(c)) {
-					*binary++ = (nib << 4) | xtob(c);
-					len++;
-				} else
-					return (0);
-			}
-			else
-				return (0);
-		}
-		else
-			return (0);
-	}
-	return (len);
-}
-
-char *
-inet_nsap_ntoa(int binlen, const u_char *binary, char *ascii) {
-	int nib;
-	int i;
-	char *tmpbuf = inet_nsap_ntoa_tmpbuf;
-	char *start;
-
-	if (ascii)
-		start = ascii;
-	else {
-		ascii = tmpbuf;
-		start = tmpbuf;
-	}
-
-	*ascii++ = '0';
-	*ascii++ = 'x';
-
-	if (binlen > 255)
-		binlen = 255;
-
-	for (i = 0; i < binlen; i++) {
-		nib = *binary >> 4;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		nib = *binary++ & 0x0f;
-		*ascii++ = nib + (nib < 10 ? '0' : '7');
-		if (((i % 2) == 0 && (i + 1) < binlen))
-			*ascii++ = '.';
-	}
-	*ascii = '\0';
-	return (start);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <arpa/inet.h>.
- */
-#undef inet_nsap_addr
-__weak_reference(__inet_nsap_addr, inet_nsap_addr);
-#undef inet_nsap_ntoa
-__weak_reference(__inet_nsap_ntoa, inet_nsap_ntoa);
-
-/*! \file */
diff --git a/lib/libc_bsd/isc/Makefile.inc b/lib/libc_bsd/isc/Makefile.inc
deleted file mode 100644
index f5ef9fa..0000000
--- a/lib/libc_bsd/isc/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.incl 156956 2006-03-21 15:37:16Z ume $
-
-# isc sources
-.PATH: ${.CURDIR}/isc
-
-SRCS+=	ev_streams.c ev_timers.c
diff --git a/lib/libc_bsd/isc/ev_streams.c b/lib/libc_bsd/isc/ev_streams.c
deleted file mode 100644
index dff6561..0000000
--- a/lib/libc_bsd/isc/ev_streams.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* ev_streams.c - implement asynch stream file IO for the eventlib
- * vix 04mar96 [initial]
- */
-
-#if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/isc/ev_streams.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-#ifndef _LIBC
-#include "fd_setsize.h"
-#endif
-
-#include <sys/types.h>
-#include <sys/uio.h>
-
-#include <errno.h>
-
-#include <isc/eventlib.h>
-#ifndef _LIBC
-#include <isc/assertions.h>
-#endif
-#include "eventlib_p.h"
-
-#include "port_after.h"
-
-#ifndef _LIBC
-static int	copyvec(evStream *str, const struct iovec *iov, int iocnt);
-static void	consume(evStream *str, size_t bytes);
-static void	done(evContext opaqueCtx, evStream *str);
-static void	writable(evContext opaqueCtx, void *uap, int fd, int evmask);
-static void	readable(evContext opaqueCtx, void *uap, int fd, int evmask);
-#endif
-
-struct iovec
-evConsIovec(void *buf, size_t cnt) {
-	struct iovec ret;
-
-	memset(&ret, 0xf5, sizeof ret);
-	ret.iov_base = buf;
-	ret.iov_len = cnt;
-	return (ret);
-}
-
-#ifndef _LIBC
-int
-evWrite(evContext opaqueCtx, int fd, const struct iovec *iov, int iocnt,
-	evStreamFunc func, void *uap, evStreamID *id)
-{
-	evContext_p *ctx = opaqueCtx.opaque;
-	evStream *new;
-	int save;
-
-	OKNEW(new);
-	new->func = func;
-	new->uap = uap;
-	new->fd = fd;
-	new->flags = 0;
-	if (evSelectFD(opaqueCtx, fd, EV_WRITE, writable, new, &new->file) < 0)
-		goto free;
-	if (copyvec(new, iov, iocnt) < 0)
-		goto free;
-	new->prevDone = NULL;
-	new->nextDone = NULL;
-	if (ctx->streams != NULL)
-		ctx->streams->prev = new;
-	new->prev = NULL;
-	new->next = ctx->streams;
-	ctx->streams = new;
-	if (id != NULL)
-		id->opaque = new;
-	return (0);
- free:
-	save = errno;
-	FREE(new);
-	errno = save;
-	return (-1);
-}
-
-int
-evRead(evContext opaqueCtx, int fd, const struct iovec *iov, int iocnt,
-       evStreamFunc func, void *uap, evStreamID *id)
-{
-	evContext_p *ctx = opaqueCtx.opaque;
-	evStream *new;
-	int save;
-
-	OKNEW(new);
-	new->func = func;
-	new->uap = uap;
-	new->fd = fd;
-	new->flags = 0;
-	if (evSelectFD(opaqueCtx, fd, EV_READ, readable, new, &new->file) < 0)
-		goto free;
-	if (copyvec(new, iov, iocnt) < 0)
-		goto free;
-	new->prevDone = NULL;
-	new->nextDone = NULL;
-	if (ctx->streams != NULL)
-		ctx->streams->prev = new;
-	new->prev = NULL;
-	new->next = ctx->streams;
-	ctx->streams = new;
-	if (id)
-		id->opaque = new;
-	return (0);
- free:
-	save = errno;
-	FREE(new);
-	errno = save;
-	return (-1);
-}
-
-int
-evTimeRW(evContext opaqueCtx, evStreamID id, evTimerID timer) /*ARGSUSED*/ {
-	evStream *str = id.opaque;
-
-	UNUSED(opaqueCtx);
-
-	str->timer = timer;
-	str->flags |= EV_STR_TIMEROK;
-	return (0);
-}
-
-int
-evUntimeRW(evContext opaqueCtx, evStreamID id) /*ARGSUSED*/ {
-	evStream *str = id.opaque;
-
-	UNUSED(opaqueCtx);
-
-	str->flags &= ~EV_STR_TIMEROK;
-	return (0);
-}
-
-int
-evCancelRW(evContext opaqueCtx, evStreamID id) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evStream *old = id.opaque;
-
-	/*
-	 * The streams list is doubly threaded.  First, there's ctx->streams
-	 * that's used by evDestroy() to find and cancel all streams.  Second,
-	 * there's ctx->strDone (head) and ctx->strLast (tail) which thread
-	 * through the potentially smaller number of "IO completed" streams,
-	 * used in evGetNext() to avoid scanning the entire list.
-	 */
-
-	/* Unlink from ctx->streams. */
-	if (old->prev != NULL)
-		old->prev->next = old->next;
-	else
-		ctx->streams = old->next;
-	if (old->next != NULL)
-		old->next->prev = old->prev;
-
-	/*
-	 * If 'old' is on the ctx->strDone list, remove it.  Update
-	 * ctx->strLast if necessary.
-	 */
-	if (old->prevDone == NULL && old->nextDone == NULL) {
-		/*
-		 * Either 'old' is the only item on the done list, or it's
-		 * not on the done list.  If the former, then we unlink it
-		 * from the list.  If the latter, we leave the list alone.
-		 */
-		if (ctx->strDone == old) {
-			ctx->strDone = NULL;
-			ctx->strLast = NULL;
-		}
-	} else {
-		if (old->prevDone != NULL)
-			old->prevDone->nextDone = old->nextDone;
-		else
-			ctx->strDone = old->nextDone;
-		if (old->nextDone != NULL)
-			old->nextDone->prevDone = old->prevDone;
-		else
-			ctx->strLast = old->prevDone;
-	}
-
-	/* Deallocate the stream. */
-	if (old->file.opaque)
-		evDeselectFD(opaqueCtx, old->file);
-	memput(old->iovOrig, sizeof (struct iovec) * old->iovOrigCount);
-	FREE(old);
-	return (0);
-}
-
-/* Copy a scatter/gather vector and initialize a stream handler's IO. */
-static int
-copyvec(evStream *str, const struct iovec *iov, int iocnt) {
-	int i;
-
-	str->iovOrig = (struct iovec *)memget(sizeof(struct iovec) * iocnt);
-	if (str->iovOrig == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	str->ioTotal = 0;
-	for (i = 0; i < iocnt; i++) {
-		str->iovOrig[i] = iov[i];
-		str->ioTotal += iov[i].iov_len;
-	}
-	str->iovOrigCount = iocnt;
-	str->iovCur = str->iovOrig;
-	str->iovCurCount = str->iovOrigCount;
-	str->ioDone = 0;
-	return (0);
-}
-
-/* Pull off or truncate lead iovec(s). */
-static void
-consume(evStream *str, size_t bytes) {
-	while (bytes > 0U) {
-		if (bytes < (size_t)str->iovCur->iov_len) {
-			str->iovCur->iov_len -= bytes;
-			str->iovCur->iov_base = (void *)
-				((u_char *)str->iovCur->iov_base + bytes);
-			str->ioDone += bytes;
-			bytes = 0;
-		} else {
-			bytes -= str->iovCur->iov_len;
-			str->ioDone += str->iovCur->iov_len;
-			str->iovCur++;
-			str->iovCurCount--;
-		}
-	}
-}
-
-/* Add a stream to Done list and deselect the FD. */
-static void
-done(evContext opaqueCtx, evStream *str) {
-	evContext_p *ctx = opaqueCtx.opaque;
-
-	if (ctx->strLast != NULL) {
-		str->prevDone = ctx->strLast;
-		ctx->strLast->nextDone = str;
-		ctx->strLast = str;
-	} else {
-		INSIST(ctx->strDone == NULL);
-		ctx->strDone = ctx->strLast = str;
-	}
-	evDeselectFD(opaqueCtx, str->file);
-	str->file.opaque = NULL;
-	/* evDrop() will call evCancelRW() on us. */
-}
-
-/* Dribble out some bytes on the stream.  (Called by evDispatch().) */
-static void
-writable(evContext opaqueCtx, void *uap, int fd, int evmask) {
-	evStream *str = uap;
-	int bytes;
-
-	UNUSED(evmask);
-
-	bytes = writev(fd, str->iovCur, str->iovCurCount);
-	if (bytes > 0) {
-		if ((str->flags & EV_STR_TIMEROK) != 0)
-			evTouchIdleTimer(opaqueCtx, str->timer);
-		consume(str, bytes);
-	} else {
-		if (bytes < 0 && errno != EINTR) {
-			str->ioDone = -1;
-			str->ioErrno = errno;
-		}
-	}
-	if (str->ioDone == -1 || str->ioDone == str->ioTotal)
-		done(opaqueCtx, str);
-}
-
-/* Scoop up some bytes from the stream.  (Called by evDispatch().) */
-static void
-readable(evContext opaqueCtx, void *uap, int fd, int evmask) {
-	evStream *str = uap;
-	int bytes;
-
-	UNUSED(evmask);
-
-	bytes = readv(fd, str->iovCur, str->iovCurCount);
-	if (bytes > 0) {
-		if ((str->flags & EV_STR_TIMEROK) != 0)
-			evTouchIdleTimer(opaqueCtx, str->timer);
-		consume(str, bytes);
-	} else {
-		if (bytes == 0)
-			str->ioDone = 0;
-		else {
-			if (errno != EINTR) {
-				str->ioDone = -1;
-				str->ioErrno = errno;
-			}
-		}
-	}
-	if (str->ioDone <= 0 || str->ioDone == str->ioTotal)
-		done(opaqueCtx, str);
-}
-#endif
-
-/*! \file */
diff --git a/lib/libc_bsd/isc/ev_timers.c b/lib/libc_bsd/isc/ev_timers.c
deleted file mode 100644
index de3cd13..0000000
--- a/lib/libc_bsd/isc/ev_timers.c
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/* ev_timers.c - implement timers for the eventlib
- * vix 09sep95 [initial]
- */
-
-#if !defined(LINT) && !defined(CODECENTER)
-static const char rcsid[] = "$Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/isc/ev_timers.c 270838 2014-08-30 10:16:25Z ume $");
-
-/* Import. */
-
-#include "port_before.h"
-#ifndef _LIBC
-#include "fd_setsize.h"
-#endif
-
-#include <errno.h>
-
-#ifndef _LIBC
-#include <isc/assertions.h>
-#endif
-#include <isc/eventlib.h>
-#include "eventlib_p.h"
-
-#include "port_after.h"
-
-/* Constants. */
-
-#define	MILLION 1000000
-#define BILLION 1000000000
-
-/* Forward. */
-
-#ifdef _LIBC
-static int	__evOptMonoTime;
-#else
-static int due_sooner(void *, void *);
-static void set_index(void *, int);
-static void free_timer(void *, void *);
-static void print_timer(void *, void *);
-static void idle_timeout(evContext, void *, struct timespec, struct timespec);
-
-/* Private type. */
-
-typedef struct {
-	evTimerFunc	func;
-	void *		uap;
-	struct timespec	lastTouched;
-	struct timespec	max_idle;
-	evTimer *	timer;
-} idle_timer;
-#endif
-
-/* Public. */
-
-struct timespec
-evConsTime(time_t sec, long nsec) {
-	struct timespec x;
-
-	x.tv_sec = sec;
-	x.tv_nsec = nsec;
-	return (x);
-}
-
-struct timespec
-evAddTime(struct timespec addend1, struct timespec addend2) {
-	struct timespec x;
-
-	x.tv_sec = addend1.tv_sec + addend2.tv_sec;
-	x.tv_nsec = addend1.tv_nsec + addend2.tv_nsec;
-	if (x.tv_nsec >= BILLION) {
-		x.tv_sec++;
-		x.tv_nsec -= BILLION;
-	}
-	return (x);
-}
-
-struct timespec
-evSubTime(struct timespec minuend, struct timespec subtrahend) {
-	struct timespec x;
-
-	x.tv_sec = minuend.tv_sec - subtrahend.tv_sec;
-	if (minuend.tv_nsec >= subtrahend.tv_nsec)
-		x.tv_nsec = minuend.tv_nsec - subtrahend.tv_nsec;
-	else {
-		x.tv_nsec = BILLION - subtrahend.tv_nsec + minuend.tv_nsec;
-		x.tv_sec--;
-	}
-	return (x);
-}
-
-int
-evCmpTime(struct timespec a, struct timespec b) {
-	long x = a.tv_sec - b.tv_sec;
-
-	if (x == 0L)
-		x = a.tv_nsec - b.tv_nsec;
-	return (x < 0L ? (-1) : x > 0L ? (1) : (0));
-}
-
-struct timespec
-evNowTime() {
-	struct timeval now;
-#ifdef CLOCK_REALTIME
-	struct timespec tsnow;
-	int m = CLOCK_REALTIME;
-
-#ifdef CLOCK_MONOTONIC
-	if (__evOptMonoTime)
-		m = CLOCK_MONOTONIC;
-#endif
-	if (clock_gettime(m, &tsnow) == 0)
-		return (tsnow);
-#endif
-	if (gettimeofday(&now, NULL) < 0)
-		return (evConsTime(0, 0));
-	return (evTimeSpec(now));
-}
-
-struct timespec
-evUTCTime() {
-	struct timeval now;
-#ifdef CLOCK_REALTIME
-	struct timespec tsnow;
-	if (clock_gettime(CLOCK_REALTIME, &tsnow) == 0)
-		return (tsnow);
-#endif
-	if (gettimeofday(&now, NULL) < 0)
-		return (evConsTime(0, 0));
-	return (evTimeSpec(now));
-}
-
-#ifndef _LIBC
-struct timespec
-evLastEventTime(evContext opaqueCtx) {
-	evContext_p *ctx = opaqueCtx.opaque;
-
-	return (ctx->lastEventTime);
-}
-#endif
-
-struct timespec
-evTimeSpec(struct timeval tv) {
-	struct timespec ts;
-
-	ts.tv_sec = tv.tv_sec;
-	ts.tv_nsec = tv.tv_usec * 1000;
-	return (ts);
-}
-
-#if !defined(USE_KQUEUE) || !defined(_LIBC)
-struct timeval
-evTimeVal(struct timespec ts) {
-	struct timeval tv;
-
-	tv.tv_sec = ts.tv_sec;
-	tv.tv_usec = ts.tv_nsec / 1000;
-	return (tv);
-}
-#endif
-
-#ifndef _LIBC
-int
-evSetTimer(evContext opaqueCtx,
-	   evTimerFunc func,
-	   void *uap,
-	   struct timespec due,
-	   struct timespec inter,
-	   evTimerID *opaqueID
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *id;
-
-	evPrintf(ctx, 1,
-"evSetTimer(ctx %p, func %p, uap %p, due %ld.%09ld, inter %ld.%09ld)\n",
-		 ctx, func, uap,
-		 (long)due.tv_sec, due.tv_nsec,
-		 (long)inter.tv_sec, inter.tv_nsec);
-
-#ifdef __hpux
-	/*
-	 * tv_sec and tv_nsec are unsigned.
-	 */
-	if (due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#else
-	if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#endif
-
-	/* due={0,0} is a magic cookie meaning "now." */
-	if (due.tv_sec == (time_t)0 && due.tv_nsec == 0L)
-		due = evNowTime();
-
-	/* Allocate and fill. */
-	OKNEW(id);
-	id->func = func;
-	id->uap = uap;
-	id->due = due;
-	id->inter = inter;
-
-	if (heap_insert(ctx->timers, id) < 0)
-		return (-1);
-
-	/* Remember the ID if the caller provided us a place for it. */
-	if (opaqueID)
-		opaqueID->opaque = id;
-
-	if (ctx->debug > 7) {
-		evPrintf(ctx, 7, "timers after evSetTimer:\n");
-		(void) heap_for_each(ctx->timers, print_timer, (void *)ctx);
-	}
-
-	return (0);
-}
-
-int
-evClearTimer(evContext opaqueCtx, evTimerID id) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *del = id.opaque;
-
-	if (ctx->cur != NULL &&
-	    ctx->cur->type == Timer &&
-	    ctx->cur->u.timer.this == del) {
-		evPrintf(ctx, 8, "deferring delete of timer (executing)\n");
-		/*
-		 * Setting the interval to zero ensures that evDrop() will
-		 * clean up the timer.
-		 */
-		del->inter = evConsTime(0, 0);
-		return (0);
-	}
-
-	if (heap_element(ctx->timers, del->index) != del)
-		EV_ERR(ENOENT);
-
-	if (heap_delete(ctx->timers, del->index) < 0)
-		return (-1);
-	FREE(del);
-
-	if (ctx->debug > 7) {
-		evPrintf(ctx, 7, "timers after evClearTimer:\n");
-		(void) heap_for_each(ctx->timers, print_timer, (void *)ctx);
-	}
-
-	return (0);
-}
-
-int
-evConfigTimer(evContext opaqueCtx,
-	     evTimerID id,
-	     const char *param,
-	     int value
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *timer = id.opaque;
-	int result=0;
-
-	UNUSED(value);
-
-	if (heap_element(ctx->timers, timer->index) != timer)
-		EV_ERR(ENOENT);
-
-	if (strcmp(param, "rate") == 0)
-		timer->mode |= EV_TMR_RATE;
-	else if (strcmp(param, "interval") == 0)
-		timer->mode &= ~EV_TMR_RATE;
-	else
-		EV_ERR(EINVAL);
-
-	return (result);
-}
-
-int
-evResetTimer(evContext opaqueCtx,
-	     evTimerID id,
-	     evTimerFunc func,
-	     void *uap,
-	     struct timespec due,
-	     struct timespec inter
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *timer = id.opaque;
-	struct timespec old_due;
-	int result=0;
-
-	if (heap_element(ctx->timers, timer->index) != timer)
-		EV_ERR(ENOENT);
-
-#ifdef __hpux
-	/*
-	 * tv_sec and tv_nsec are unsigned.
-	 */
-	if (due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#else
-	if (due.tv_sec < 0 || due.tv_nsec < 0 || due.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-
-	if (inter.tv_sec < 0 || inter.tv_nsec < 0 || inter.tv_nsec >= BILLION)
-		EV_ERR(EINVAL);
-#endif
-
-	old_due = timer->due;
-
-	timer->func = func;
-	timer->uap = uap;
-	timer->due = due;
-	timer->inter = inter;
-
-	switch (evCmpTime(due, old_due)) {
-	case -1:
-		result = heap_increased(ctx->timers, timer->index);
-		break;
-	case 0:
-		result = 0;
-		break;
-	case 1:
-		result = heap_decreased(ctx->timers, timer->index);
-		break;
-	}
-
-	if (ctx->debug > 7) {
-		evPrintf(ctx, 7, "timers after evResetTimer:\n");
-		(void) heap_for_each(ctx->timers, print_timer, (void *)ctx);
-	}
-
-	return (result);
-}
-
-int
-evSetIdleTimer(evContext opaqueCtx,
-		evTimerFunc func,
-		void *uap,
-		struct timespec max_idle,
-		evTimerID *opaqueID
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	idle_timer *tt;
-
-	/* Allocate and fill. */
-	OKNEW(tt);
-	tt->func = func;
-	tt->uap = uap;
-	tt->lastTouched = ctx->lastEventTime;
-	tt->max_idle = max_idle;
-
-	if (evSetTimer(opaqueCtx, idle_timeout, tt,
-		       evAddTime(ctx->lastEventTime, max_idle),
-		       max_idle, opaqueID) < 0) {
-		FREE(tt);
-		return (-1);
-	}
-
-	tt->timer = opaqueID->opaque;
-
-	return (0);
-}
-
-int
-evClearIdleTimer(evContext opaqueCtx, evTimerID id) {
-	evTimer *del = id.opaque;
-	idle_timer *tt = del->uap;
-
-	FREE(tt);
-	return (evClearTimer(opaqueCtx, id));
-}
-
-int
-evResetIdleTimer(evContext opaqueCtx,
-		 evTimerID opaqueID,
-		 evTimerFunc func,
-		 void *uap,
-		 struct timespec max_idle
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *timer = opaqueID.opaque;
-	idle_timer *tt = timer->uap;
-
-	tt->func = func;
-	tt->uap = uap;
-	tt->lastTouched = ctx->lastEventTime;
-	tt->max_idle = max_idle;
-
-	return (evResetTimer(opaqueCtx, opaqueID, idle_timeout, tt,
-			     evAddTime(ctx->lastEventTime, max_idle),
-			     max_idle));
-}
-
-int
-evTouchIdleTimer(evContext opaqueCtx, evTimerID id) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	evTimer *t = id.opaque;
-	idle_timer *tt = t->uap;
-
-	tt->lastTouched = ctx->lastEventTime;
-
-	return (0);
-}
-
-/* Public to the rest of eventlib. */
-
-heap_context
-evCreateTimers(const evContext_p *ctx) {
-
-	UNUSED(ctx);
-
-	return (heap_new(due_sooner, set_index, 2048));
-}
-
-void
-evDestroyTimers(const evContext_p *ctx) {
-	(void) heap_for_each(ctx->timers, free_timer, NULL);
-	(void) heap_free(ctx->timers);
-}
-
-/* Private. */
-
-static int
-due_sooner(void *a, void *b) {
-	evTimer *a_timer, *b_timer;
-
-	a_timer = a;
-	b_timer = b;
-	return (evCmpTime(a_timer->due, b_timer->due) < 0);
-}
-
-static void
-set_index(void *what, int index) {
-	evTimer *timer;
-
-	timer = what;
-	timer->index = index;
-}
-
-static void
-free_timer(void *what, void *uap) {
-	evTimer *t = what;
-
-	UNUSED(uap);
-
-	FREE(t);
-}
-
-static void
-print_timer(void *what, void *uap) {
-	evTimer *cur = what;
-	evContext_p *ctx = uap;
-
-	cur = what;
-	evPrintf(ctx, 7,
-	    "  func %p, uap %p, due %ld.%09ld, inter %ld.%09ld\n",
-		 cur->func, cur->uap,
-		 (long)cur->due.tv_sec, cur->due.tv_nsec,
-		 (long)cur->inter.tv_sec, cur->inter.tv_nsec);
-}
-
-static void
-idle_timeout(evContext opaqueCtx,
-	     void *uap,
-	     struct timespec due,
-	     struct timespec inter
-) {
-	evContext_p *ctx = opaqueCtx.opaque;
-	idle_timer *this = uap;
-	struct timespec idle;
-
-	UNUSED(due);
-	UNUSED(inter);
-	
-	idle = evSubTime(ctx->lastEventTime, this->lastTouched);
-	if (evCmpTime(idle, this->max_idle) >= 0) {
-		(this->func)(opaqueCtx, this->uap, this->timer->due,
-			     this->max_idle);
-		/*
-		 * Setting the interval to zero will cause the timer to
-		 * be cleaned up in evDrop().
-		 */
-		this->timer->inter = evConsTime(0, 0);
-		FREE(this);
-	} else {
-		/* evDrop() will reschedule the timer. */
-		this->timer->inter = evSubTime(this->max_idle, idle);
-	}
-}
-#endif
-
-/*! \file */
diff --git a/lib/libc_bsd/isc/eventlib_p.h b/lib/libc_bsd/isc/eventlib_p.h
deleted file mode 100644
index 1225a41..0000000
--- a/lib/libc_bsd/isc/eventlib_p.h
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * Copyright (c) 2005 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*! \file 
- * \brief private interfaces for eventlib
- * \author vix 09sep95 [initial]
- *
- * $Id: eventlib_p.h,v 1.9 2006/03/09 23:57:56 marka Exp $
- * $FreeBSD: releng/10.2/lib/libc/isc/eventlib_p.h 270838 2014-08-30 10:16:25Z ume $
- */
-
-#ifndef _EVENTLIB_P_H
-#define _EVENTLIB_P_H
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <sys/un.h>
-
-#define EVENTLIB_DEBUG 1
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef _LIBC
-#include <isc/list.h>
-#include <isc/heap.h>
-#include <isc/memcluster.h>
-#endif
-
-#define	EV_MASK_ALL	(EV_READ | EV_WRITE | EV_EXCEPT)
-#define EV_ERR(e)		return (errno = (e), -1)
-#define OK(x)		if ((x) < 0) EV_ERR(errno); else (void)NULL
-#define OKFREE(x, y)	if ((x) < 0) { FREE((y)); EV_ERR(errno); } \
-			else (void)NULL
-
-#define	NEW(p)		if (((p) = memget(sizeof *(p))) != NULL) \
-				FILL(p); \
-			else \
-				(void)NULL;
-#define OKNEW(p)	if (!((p) = memget(sizeof *(p)))) { \
-				errno = ENOMEM; \
-				return (-1); \
-			} else \
-				FILL(p)
-#define FREE(p)		memput((p), sizeof *(p))
-
-#if EVENTLIB_DEBUG
-#define FILL(p)		memset((p), 0xF5, sizeof *(p))
-#else
-#define FILL(p)
-#endif
-
-#ifdef USE_POLL
-#ifdef HAVE_STROPTS_H
-#include <stropts.h>
-#endif
-#include <poll.h>
-#endif /* USE_POLL */
-
-typedef struct evConn {
-	evConnFunc	func;
-	void *		uap;
-	int		fd;
-	int		flags;
-#define EV_CONN_LISTEN		0x0001		/*%< Connection is a listener. */
-#define EV_CONN_SELECTED	0x0002		/*%< evSelectFD(conn->file). */
-#define EV_CONN_BLOCK		0x0004		/*%< Listener fd was blocking. */
-	evFileID	file;
-	struct evConn *	prev;
-	struct evConn *	next;
-} evConn;
-
-#ifndef _LIBC
-typedef struct evAccept {
-	int		fd;
-	union {
-		struct sockaddr		sa;
-		struct sockaddr_in	in;
-#ifndef NO_SOCKADDR_UN
-		struct sockaddr_un	un;
-#endif
-	}		la;
-	ISC_SOCKLEN_T	lalen;
-	union {
-		struct sockaddr		sa;
-		struct sockaddr_in	in;
-#ifndef NO_SOCKADDR_UN
-		struct sockaddr_un	un;
-#endif
-	}		ra;
-	ISC_SOCKLEN_T	ralen;
-	int		ioErrno;
-	evConn *	conn;
-	LINK(struct evAccept) link;
-} evAccept;
-
-typedef struct evFile {
-	evFileFunc	func;
-	void *		uap;
-	int		fd;
-	int		eventmask;
-	int		preemptive;
-	struct evFile *	prev;
-	struct evFile *	next;
-	struct evFile *	fdprev;
-	struct evFile *	fdnext;
-} evFile;
-
-typedef struct evStream {
-	evStreamFunc	func;
-	void *		uap;
-	evFileID	file;
-	evTimerID	timer;
-	int		flags;
-#define EV_STR_TIMEROK	0x0001	/*%< IFF timer valid. */
-	int		fd;
-	struct iovec *	iovOrig;
-	int		iovOrigCount;
-	struct iovec *	iovCur;
-	int		iovCurCount;
-	int		ioTotal;
-	int		ioDone;
-	int		ioErrno;
-	struct evStream	*prevDone, *nextDone;
-	struct evStream	*prev, *next;
-} evStream;
-
-typedef struct evTimer {
-	evTimerFunc	func;
-	void *		uap;
-	struct timespec	due, inter;
-	int		index;
-	int		mode;
-#define EV_TMR_RATE	1
-} evTimer;
-
-typedef struct evWait {
-	evWaitFunc	func;
-	void *		uap;
-	const void *	tag;
-	struct evWait *	next;
-} evWait;
-
-typedef struct evWaitList {
-	evWait *		first;
-	evWait *		last;
-	struct evWaitList *	prev;
-	struct evWaitList *	next;
-} evWaitList;
-
-typedef struct evEvent_p {
-	enum {  Accept, File, Stream, Timer, Wait, Free, Null  } type;
-	union {
-		struct {  evAccept *this;  }			accept;
-		struct {  evFile *this; int eventmask;  }	file;
-		struct {  evStream *this;  }			stream;
-		struct {  evTimer *this;  }			timer;
-		struct {  evWait *this;  }			wait;
-		struct {  struct evEvent_p *next;  }		free;
-		struct {  const void *placeholder;  }		null;
-	} u;
-} evEvent_p;
-#endif
-
-#ifdef USE_POLL
-typedef struct { 
-	void		*ctx;	/* pointer to the evContext_p   */ 
-	uint32_t	type;	/* READ, WRITE, EXCEPT, nonblk  */ 
-	uint32_t	result;	/* 1 => revents, 0 => events    */ 
-} __evEmulMask; 
-
-#define emulMaskInit(ctx, field, ev, lastnext) \
-	ctx->field.ctx = ctx; \
-	ctx->field.type = ev; \
-	ctx->field.result = lastnext; 
-  
-extern short	*__fd_eventfield(int fd, __evEmulMask *maskp); 
-extern short	__poll_event(__evEmulMask *maskp); 
-extern void		__fd_clr(int fd, __evEmulMask *maskp); 
-extern void		__fd_set(int fd, __evEmulMask *maskp); 
-
-#undef  FD_ZERO 
-#define FD_ZERO(maskp) 
-  
-#undef  FD_SET 
-#define FD_SET(fd, maskp) \
-	__fd_set(fd, maskp) 
-
-#undef  FD_CLR 
-#define FD_CLR(fd, maskp) \
-	__fd_clr(fd, maskp) 
-
-#undef  FD_ISSET 
-#define FD_ISSET(fd, maskp) \
-	((*__fd_eventfield(fd, maskp) & __poll_event(maskp)) != 0) 
-
-#endif /* USE_POLL */
-
-#ifndef _LIBC
-typedef struct {
-	/* Global. */
-	const evEvent_p	*cur;
-	/* Debugging. */
-	int		debug;
-	FILE		*output;
-	/* Connections. */
-	evConn		*conns;
-	LIST(evAccept)	accepts;
-	/* Files. */
-	evFile		*files, *fdNext;
-#ifndef USE_POLL
-	fd_set		rdLast, rdNext;
-	fd_set		wrLast, wrNext;
-	fd_set		exLast, exNext;
-	fd_set		nonblockBefore;
-	int		fdMax, fdCount, highestFD;
-	evFile		*fdTable[FD_SETSIZE];
-#else
-	struct pollfd	*pollfds;	/* Allocated as needed  */ 
-	evFile		**fdTable;	/* Ditto                */ 
-	int		maxnfds;	/* # elements in above  */ 
-	int		firstfd;	/* First active fd      */ 
-	int		fdMax;		/* Last active fd       */ 
-	int		fdCount;	/* # fd:s with I/O      */ 
-	int		highestFD;	/* max fd allowed by OS */ 
-	__evEmulMask	rdLast, rdNext; 
-	__evEmulMask	wrLast, wrNext; 
-	__evEmulMask	exLast, exNext; 
-	__evEmulMask	nonblockBefore; 
-#endif /* USE_POLL */
-#ifdef EVENTLIB_TIME_CHECKS
-	struct timespec	lastSelectTime;
-	int		lastFdCount;
-#endif
-	/* Streams. */
-	evStream	*streams;
-	evStream	*strDone, *strLast;
-	/* Timers. */
-	struct timespec	lastEventTime;
-	heap_context	timers;
-	/* Waits. */
-	evWaitList	*waitLists;
-	evWaitList	waitDone;
-} evContext_p;
-
-/* eventlib.c */
-#define evPrintf __evPrintf
-void evPrintf(const evContext_p *ctx, int level, const char *fmt, ...)
-     ISC_FORMAT_PRINTF(3, 4);
-
-#ifdef USE_POLL
-extern int evPollfdRealloc(evContext_p *ctx, int pollfd_chunk_size, int fd);
-#endif /* USE_POLL */
-
-/* ev_timers.c */
-#define evCreateTimers __evCreateTimers
-heap_context evCreateTimers(const evContext_p *);
-#define evDestroyTimers __evDestroyTimers
-void evDestroyTimers(const evContext_p *);
-
-/* ev_waits.c */
-#define evFreeWait __evFreeWait
-evWait *evFreeWait(evContext_p *ctx, evWait *old);
-#endif
-
-/* Global options */
-#ifndef _LIBC
-extern int	__evOptMonoTime;
-#endif
-
-#endif /*_EVENTLIB_P_H*/
diff --git a/lib/libc_bsd/libc.ldscript b/lib/libc_bsd/libc.ldscript
deleted file mode 100644
index 062b034..0000000
--- a/lib/libc_bsd/libc.ldscript
+++ /dev/null
@@ -1,2 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/libc.ldscript 258398 2013-11-20 20:24:59Z peter $ */
-GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a @@LIBDIR@@/libssp_nonshared.a )
diff --git a/lib/libc_bsd/locale/DESIGN.xlocale b/lib/libc_bsd/locale/DESIGN.xlocale
deleted file mode 100644
index f863860..0000000
--- a/lib/libc_bsd/locale/DESIGN.xlocale
+++ /dev/null
@@ -1,159 +0,0 @@
-$FreeBSD: releng/10.2/lib/libc/locale/DESIGN.xlocale 227753 2011-11-20 14:45:42Z theraven $
-
-Design of xlocale
-=================
-
-The xlocale APIs come from Darwin, although a subset is now part of POSIX 2008.
-They fall into two broad categories:
-
-- Manipulation of per-thread locales (POSIX)
-- Locale-aware functions taking an explicit locale argument (Darwin)
-
-This document describes the implementation of these APIs for FreeBSD.
-
-Goals
------
-
-The overall goal of this implementation is to be compatible with the Darwin
-version.  Additionally, it should include minimal changes to the existing
-locale code.  A lot of the existing locale code originates with 4BSD or earlier
-and has had over a decade of testing.  Replacing this code, unless absolutely
-necessary, gives us the potential for more bugs without much benefit.
-
-With this in mind, various libc-private functions have been modified to take a
-locale_t parameter.  This causes a compiler error if they are accidentally
-called without a locale.  This approach was taken, rather than adding _l
-variants of these functions, to make it harder for accidental uses of the
-global-locale versions to slip in.
-
-Locale Objects
---------------
-
-A locale is encapsulated in a `locale_t`, which is an opaque type: a pointer to
-a `struct _xlocale`.  The name `_xlocale` is unfortunate, as it does not fit
-well with existing conventions, but is used because this is the name the Darwin
-implementation gives to this structure and so may be used by existing (bad) code.
-
-This structure should include all of the information corresponding to a locale.
-A locale_t is almost immutable after creation.  There are no functions that modify it,
-and it can therefore be used without locking.  It is the responsibility of the
-caller to ensure that a locale is not deallocated during a call that uses it.
-
-Each locale contains a number of components, one for each of the categories
-supported by `setlocale()`.  These are likewise immutable after creation.  This
-differs from the Darwin implementation, which includes a deprecated
-`setinvalidrune()` function that can modify the rune locale.
-
-The exception to these mutability rules is a set of `mbstate_t` flags stored
-with each locale.  These are used by various functions that previously had a
-static local `mbstate_t` variable.  
-
-The components are reference counted, and so can be aliased between locale
-objects.  This makes copying locales very cheap.
-
-The Global Locale
------------------
-
-All locales and locale components are reference counted.  The global locale,
-however, is special.  It, and all of its components, are static and so no
-malloc() memory is required when using a single locale.
-
-This means that threads using the global locale are subject to the same
-constraints as with the pre-xlocale libc.  Calls to any locale-aware functions
-in threads using the global locale, while modifying the global locale, have
-undefined behaviour.
-
-Because of this, we have to ensure that we always copy the components of the
-global locale, rather than alias them.  
-
-It would be cleaner to simply remove the special treatment of the global locale
-and have a locale_t lazily allocated for the global context.  This would cost a
-little more `malloc()` memory, so is not done in the initial version.
-
-Caching
--------
-
-The existing locale implementation included several ad-hoc caching layers.
-None of these were thread safe.  Caching is only really of use for supporting
-the pattern where the locale is briefly changed to something and then changed
-back.
-
-The current xlocale implementation removes the caching entirely.  This pattern
-is not one that should be encouraged.  If you need to make some calls with a
-modified locale, then you should use the _l suffix versions of the calls,
-rather than switch the global locale.  If you do need to temporarily switch the
-locale and then switch it back, `uselocale()` provides a way of doing this very
-easily: It returns the old locale, which can then be passed to a subsequent
-call to `uselocale()` to restore it, without the need to load any locale data
-from the disk.
-
-If, in the future, it is determined that caching is beneficial, it can be added
-quite easily in xlocale.c.  Given, however, that any locale-aware call is going
-to be a preparation for presenting data to the user, and so is invariably going
-to be part of an I/O operation, this seems like a case of premature
-optimisation.
-
-localeconv
-----------
-
-The `localeconv()` function is an exception to the immutable-after-creation
-rule.  In the classic implementation, this function returns a pointer to some
-global storage, which is initialised with the data from the current locale.
-This is not possible in a multithreaded environment, with multiple locales.  
-
-Instead, each locale contains a `struct lconv` that is lazily initialised on
-calls to `localeconv()`.  This is not protected by any locking, however this is
-still safe on any machine where word-sized stores are atomic: two concurrent
-calls will write the same data into the structure.
-
-Explicit Locale Calls
----------------------
-
-A large number of functions have been modified to take an explicit `locale_t`
-parameter.  The old APIs are then reimplemented with a call to `__get_locale()`
-to supply the `locale_t` parameter.  This is in line with the Darwin public
-APIs, but also simplifies the modifications to these functions.  The
-`__get_locale()` function is now the only way to access the current locale
-within libc.  All of the old globals have gone, so there is now a linker error
-if any functions attempt to use them.  
-
-The ctype.h functions are a little different.  These are not implemented in
-terms of their locale-aware versions, for performance reasons.  Each of these
-is implemented as a short inline function.
-
-Differences to Darwin APIs
---------------------------
-
-`strtoq_l()` and `strtouq_l() `are not provided.  These are extensions to
-deprecated functions - we should not be encouraging people to use deprecated
-interfaces.
-
-Locale Placeholders
--------------------
-
-The pointer values 0 and -1 have special meanings as `locale_t` values.  Any
-public function that accepts a `locale_t` parameter must use the `FIX_LOCALE()`
-macro on it before using it.  For efficiency, this can be emitted in functions
-which *only* use their locale parameter as an argument to another public
-function, as the callee will do the `FIX_LOCALE()` itself.
-
-Potential Improvements
-----------------------
-
-Currently, the current rune set is accessed via a function call.  This makes it
-fairly expensive to use any of the ctype.h functions.  We could improve this
-quite a lot by storing the rune locale data in a __thread-qualified variable.
-
-Several of the existing FreeBSD locale-aware functions appear to be wrong.  For
-example, most of the `strto*()` family should probably use `digittoint_l()`,
-but instead they assume ASCII.  These will break if using a character encoding
-that does not put numbers and the letters A-F in the same location as ASCII.
-Some functions, like `strcoll()` only work on single-byte encodings.  No
-attempt has been made to fix existing limitations in the libc functions other
-than to add support for xlocale.
-
-Intuitively, setting a thread-local locale should ensure that all locale-aware
-functions can be used safely from that thread.  In fact, this is not the case
-in either this implementation or the Darwin one.  You must call `duplocale()`
-or `newlocale()` before calling `uselocale()`.  This is a bit ugly, and it
-would be better if libc ensure that every thread had its own locale object.
diff --git a/lib/libc_bsd/locale/Makefile.inc b/lib/libc_bsd/locale/Makefile.inc
deleted file mode 100644
index 74107e0..0000000
--- a/lib/libc_bsd/locale/Makefile.inc
+++ /dev/null
@@ -1,89 +0,0 @@
-#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 251314 2013-06-03 17:17:56Z ed $
-
-# locale sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/locale ${.CURDIR}/locale
-
-SRCS+=	ascii.c big5.c btowc.c collate.c collcmp.c euc.c fix_grouping.c \
-	gb18030.c gb2312.c gbk.c ctype.c isctype.c iswctype.c \
-	ldpart.c lmessages.c lmonetary.c lnumeric.c localeconv.c mblen.c \
-	mbrlen.c \
-	mbrtowc.c mbsinit.c mbsnrtowcs.c \
-	mbsrtowcs.c mbtowc.c mbstowcs.c \
-	mskanji.c nextwctype.c nl_langinfo.c nomacros.c none.c rpmatch.c \
-	rune.c \
-	runetype.c setlocale.c setrunelocale.c \
-	table.c \
-	tolower.c toupper.c utf8.c wcrtomb.c wcsnrtombs.c \
-	wcsrtombs.c wcsftime.c \
-	wcstof.c wcstod.c \
-	wcstoimax.c wcstol.c wcstold.c wcstoll.c \
-	wcstombs.c \
-	wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \
-	wcwidth.c\
-	xlocale.c
-
-.if ${MK_ICONV} != "no"
-SRCS+=	c16rtomb_iconv.c c32rtomb_iconv.c mbrtoc16_iconv.c mbrtoc32_iconv.c
-.else
-SRCS+=	c16rtomb.c c32rtomb.c mbrtoc16.c mbrtoc32.c
-.endif
-
-SYM_MAPS+=${.CURDIR}/locale/Symbol.map
-
-MAN+=	btowc.3 \
-	ctype_l.3 \
-	ctype.3 digittoint.3 isalnum.3 isalpha.3 isascii.3 isblank.3 iscntrl.3 \
-	isdigit.3 isgraph.3 isideogram.3 islower.3 isphonogram.3 isprint.3 \
-	ispunct.3 isrune.3 isspace.3 isspecial.3 \
-	isupper.3 iswalnum.3 iswalnum_l.3 isxdigit.3 \
-	localeconv.3 mblen.3 mbrlen.3 \
-	mbrtowc.3 \
-	mbsinit.3 \
-	mbsrtowcs.3 mbstowcs.3 mbtowc.3 multibyte.3 \
-	nextwctype.3 nl_langinfo.3 rpmatch.3 \
-	setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 towupper.3 \
-	wcsftime.3 \
-	wcrtomb.3 \
-	wcsrtombs.3 wcstod.3 wcstol.3 wcstombs.3 wctomb.3 \
-	wctrans.3 wctype.3 wcwidth.3 \
-	duplocale.3 freelocale.3 newlocale.3 querylocale.3 uselocale.3 xlocale.3
-
-MAN+=	big5.5 euc.5 gb18030.5 gb2312.5 gbk.5 mskanji.5 utf8.5
-
-MLINKS+=btowc.3 wctob.3
-MLINKS+=isdigit.3 isnumber.3
-MLINKS+=isgraph.3 isgraph_l.3
-MLINKS+=islower.3 islower_l.3
-MLINKS+=ispunct.3 ispunct_l.3
-MLINKS+=isspace.3 isspace_l.3
-MLINKS+=nl_langinfo.3 nl_langinfo_l.3
-MLINKS+=iswalnum.3 iswalpha.3 iswalnum.3 iswascii.3 iswalnum.3 iswblank.3 \
-	iswalnum.3 iswcntrl.3 iswalnum.3 iswdigit.3 iswalnum.3 iswgraph.3 \
-	iswalnum.3 iswhexnumber.3 \
-	iswalnum.3 iswideogram.3 iswalnum.3 iswlower.3 iswalnum.3 iswnumber.3 \
-	iswalnum.3 iswphonogram.3 iswalnum.3 iswprint.3 iswalnum.3 iswpunct.3 \
-	iswalnum.3 iswrune.3 iswalnum.3 iswspace.3 iswalnum.3 iswspecial.3 \
-	iswalnum.3 iswupper.3 iswalnum.3 iswxdigit.3
-MLINKS+=iswalnum_l.3 iswalpha_l.3 iswalnum_l.3 iswcntrl_l.3 \
-	iswalnum_l.3 iswctype_l.3 iswalnum_l.3 iswdigit_l.3 \
-	iswalnum_l.3 iswgraph_l.3 iswalnum_l.3 iswlower_l.3 \
-	iswalnum_l.3 iswprint_l.3 iswalnum_l.3 iswpunct_l.3 \
-	iswalnum_l.3 iswspace_l.3 iswalnum_l.3 iswupper_l.3 \
-	iswalnum_l.3 iswxdigit_l.3 iswalnum_l.3 towlower_l.3 \
-	iswalnum_l.3 towupper_l.3 iswalnum_l.3 wctype_l.3 \
-	iswalnum_l.3 iswblank_l.3 iswalnum_l.3 iswhexnumber_l.3 \
-	iswalnum_l.3 iswideogram_l.3 iswalnum_l.3 iswnumber_l.3 \
-	iswalnum_l.3 iswphonogram_l.3 iswalnum_l.3 iswrune_l.3 \
-	iswalnum_l.3 iswspecial_l.3 iswalnum_l.3 nextwctype_l.3 \
-	iswalnum_l.3 towctrans_l.3 iswalnum_l.3 wctrans_l.3
-MLINKS+=isxdigit.3 ishexnumber.3
-MLINKS+=mbrtowc.3 mbrtoc16.3 mbrtowc.3 mbrtoc32.3
-MLINKS+=mbsrtowcs.3 mbsnrtowcs.3
-MLINKS+=wcrtomb.3 c16rtomb.3 wcrtomb.3 c32rtomb.3
-MLINKS+=wcsrtombs.3 wcsnrtombs.3
-MLINKS+=wcstod.3 wcstof.3 wcstod.3 wcstold.3
-MLINKS+=wcstol.3 wcstoul.3 wcstol.3 wcstoll.3 wcstol.3 wcstoull.3 \
-	wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3
-MLINKS+=wctrans.3 towctrans.3
-MLINKS+=wctype.3 iswctype.3
diff --git a/lib/libc_bsd/locale/Symbol.map b/lib/libc_bsd/locale/Symbol.map
deleted file mode 100644
index c1971d9..0000000
--- a/lib/libc_bsd/locale/Symbol.map
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/locale/Symbol.map 250883 2013-05-21 19:59:37Z ed $
- */
-
-FBSD_1.0 {
-	btowc;
-	digittoint;
-	isalnum;
-	isalpha;
-	isascii;
-	isblank;
-	iscntrl;
-	isdigit;
-	isgraph;
-	ishexnumber;
-	isideogram;
-	islower;
-	isnumber;
-	isphonogram;
-	isprint;
-	ispunct;
-	isrune;
-	isspace;
-	isspecial;
-	isupper;
-	isxdigit;
-	toascii;
-	tolower;
-	toupper;
-	iswalnum;
-	iswalpha;
-	iswascii;
-	iswblank;
-	iswcntrl;
-	iswdigit;
-	iswgraph;
-	iswhexnumber;
-	iswideogram;
-	iswlower;
-	iswnumber;
-	iswphonogram;
-	iswprint;
-	iswpunct;
-	iswrune;
-	iswspace;
-	iswspecial;
-	iswupper;
-	iswxdigit;
-	towlower;
-	towupper;
-	localeconv;
-	mblen;
-	mbrlen;
-	mbrtowc;
-	mbsinit;
-	mbsnrtowcs;
-	mbsrtowcs;
-	mbstowcs;
-	mbtowc;
-	nextwctype;
-	nl_langinfo;
-	__maskrune;
-	__sbmaskrune;
-	__istype;
-	__sbistype;
-	__isctype;
-	__toupper;
-	__sbtoupper;
-	__tolower;
-	__sbtolower;
-	__wcwidth;
-	__mb_cur_max;
-	__mb_sb_limit;
-	rpmatch;
-	___runetype;
-	setlocale;
-	_DefaultRuneLocale;
-	_CurrentRuneLocale;
-	___tolower;
-	___toupper;
-	wcrtomb;
-	wcsftime;
-	wcsnrtombs;
-	wcsrtombs;
-	wcstod;
-	wcstof;
-	wcstoimax;
-	wcstol;
-	wcstold;
-	wcstoll;
-	wcstombs;
-	wcstoul;
-	wcstoull;
-	wcstoumax;
-	wctob;
-	wctomb;
-	towctrans;
-	wctrans;
-	iswctype;
-	wctype;
-	wcwidth;
-};
-
-FBSD_1.3 {
-	newlocale;
-	duplocale;
-	freelocale;
-	querylocale;
-	uselocale;
-	__getCurrentRuneLocale;
-	btowc_l;
-	localeconv_l;
-	mblen_l;
-	mbrlen_l;
-	mbrtowc_l;
-	mbsinit_l;
-	mbsnrtowcs_l;
-	mbsrtowcs_l;
-	mbstowcs_l;
-	mbtowc_l;
-	nl_langinfo_l;
-	strcoll_l;
-	strfmon_l;
-	strftime_l;
-	strptime_l;
-	strxfrm_l;
-	wcrtomb_l;
-	wcscoll_l;
-	wcsnrtombs_l;
-	wcsrtombs_l;
-	wcstombs_l;
-	wcsxfrm_l;
-	wctob_l;
-	wctomb_l;
-	___tolower_l;
-	___toupper_l;
-	___runetype_l;
-	digittoint_l;
-	isalnum_l;
-	isalpha_l;
-	isblank_l;
-	iscntrl_l;
-	isdigit_l;
-	isgraph_l;
-	ishexnumber_l;
-	isideogram_l;
-	islower_l;
-	isnumber_l;
-	isphonogram_l;
-	isprint_l;
-	ispunct_l;
-	isrune_l;
-	isspace_l;
-	isspecial_l;
-	isupper_l;
-	isxdigit_l;
-	tolower_l;
-	toupper_l;
-	iswalnum_l;
-	iswalpha_l;
-	iswblank_l;
-	iswcntrl_l;
-	iswdigit_l;
-	iswgraph_l;
-	iswhexnumber_l;
-	iswideogram_l;
-	iswlower_l;
-	iswnumber_l;
-	iswphonogram_l;
-	iswprint_l;
-	iswpunct_l;
-	iswrune_l;
-	iswspace_l;
-	iswspecial_l;
-	iswupper_l;
-	iswxdigit_l;
-	towlower_l;
-	towupper_l;
-	iswctype_l;
-	wctype_l;
-	nextwctype_l;
-	___mb_cur_max;
-	___mb_cur_max_l;
-	towctrans_l;
-	wctrans_l;
-	wcsftime_l;
-	wcstod_l;
-	wcstof_l;
-	wcstoimax_l;
-	wcstol_l;
-	wcstold_l;
-	wcstoll_l;
-	wcstoul_l;
-	wcstoull_l;
-	wcstoumax_l;
-	__sbistype_l;
-	__maskrune_l;
-	__sbmaskrune_l;
-	__istype_l;
-	__runes_for_locale;
-	_ThreadRuneLocale;
-	c16rtomb;
-	c16rtomb_l;
-	c32rtomb;
-	c32rtomb_l;
-	mbrtoc16;
-	mbrtoc16_l;
-	mbrtoc32;
-	mbrtoc32_l;
-};
-
-FBSDprivate_1.0 {
-	_PathLocale;
-	__detect_path_locale;
-	__collate_load_error;
-	__collate_range_cmp;
-};
diff --git a/lib/libc_bsd/locale/ascii.c b/lib/libc_bsd/locale/ascii.c
deleted file mode 100644
index 625745b..0000000
--- a/lib/libc_bsd/locale/ascii.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/ascii.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <limits.h>
-#include <runetype.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_ascii_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_ascii_mbsinit(const mbstate_t *);
-static size_t	_ascii_mbsnrtowcs(wchar_t * __restrict dst,
-		    const char ** __restrict src, size_t nms, size_t len,
-		    mbstate_t * __restrict ps __unused);
-static size_t	_ascii_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-static size_t	_ascii_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-		    size_t, size_t, mbstate_t * __restrict);
-
-int
-_ascii_init(struct xlocale_ctype *l,_RuneLocale *rl)
-{
-
-	l->__mbrtowc = _ascii_mbrtowc;
-	l->__mbsinit = _ascii_mbsinit;
-	l->__mbsnrtowcs = _ascii_mbsnrtowcs;
-	l->__wcrtomb = _ascii_wcrtomb;
-	l->__wcsnrtombs = _ascii_wcsnrtombs;
-	l->runes = rl;
-	l->__mb_cur_max = 1;
-	l->__mb_sb_limit = 128;
-	return(0);
-}
-
-static int
-_ascii_mbsinit(const mbstate_t *ps __unused)
-{
-
-	/*
-	 * Encoding is not state dependent - we are always in the
-	 * initial state.
-	 */
-	return (1);
-}
-
-static size_t
-_ascii_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps __unused)
-{
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (0);
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-	if (*s & 0x80) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	if (pwc != NULL)
-		*pwc = (unsigned char)*s;
-	return (*s == '\0' ? 0 : 1);
-}
-
-static size_t
-_ascii_wcrtomb(char * __restrict s, wchar_t wc,
-    mbstate_t * __restrict ps __unused)
-{
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc < 0 || wc > 127) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	*s = (unsigned char)wc;
-	return (1);
-}
-
-static size_t
-_ascii_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps __unused)
-{
-	const char *s;
-	size_t nchr;
-
-	if (dst == NULL) {
-		for (s = *src; nms > 0 && *s != '\0'; s++, nms--) {
-			if (*s & 0x80) {
-				errno = EILSEQ;
-				return ((size_t)-1);
-			}
-		}
-		return (s - *src);
-	}
-
-	s = *src;
-	nchr = 0;
-	while (len-- > 0 && nms-- > 0) {
-		if (*s & 0x80) {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		if ((*dst++ = (unsigned char)*s++) == L'\0') {
-			*src = NULL;
-			return (nchr);
-		}
-		nchr++;
-	}
-	*src = s;
-	return (nchr);
-}
-
-static size_t
-_ascii_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
-    size_t nwc, size_t len, mbstate_t * __restrict ps __unused)
-{
-	const wchar_t *s;
-	size_t nchr;
-
-	if (dst == NULL) {
-		for (s = *src; nwc > 0 && *s != L'\0'; s++, nwc--) {
-			if (*s < 0 || *s > 127) {
-				errno = EILSEQ;
-				return ((size_t)-1);
-			}
-		}
-		return (s - *src);
-	}
-
-	s = *src;
-	nchr = 0;
-	while (len-- > 0 && nwc-- > 0) {
-		if (*s < 0 || *s > 127) {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		if ((*dst++ = *s++) == '\0') {
-			*src = NULL;
-			return (nchr);
-		}
-		nchr++;
-	}
-	*src = s;
-	return (nchr);
-}
-
diff --git a/lib/libc_bsd/locale/big5.5 b/lib/libc_bsd/locale/big5.5
deleted file mode 100644
index e7911fb..0000000
--- a/lib/libc_bsd/locale/big5.5
+++ /dev/null
@@ -1,51 +0,0 @@
-.\" Copyright (c) 2002, 2003 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/big5.5 131608 2004-07-05 06:39:03Z ru $
-.\"
-.Dd August 7, 2003
-.Dt BIG5 5
-.Os
-.Sh NAME
-.Nm big5
-.Nd
-.Dq "Big Five"
-encoding for Traditional Chinese text
-.Sh SYNOPSIS
-.Nm ENCODING
-.Qq BIG5
-.Sh DESCRIPTION
-.Dq Big Five
-is the de facto standard for encoding Traditional Chinese text.
-Each character is represented by either one or two bytes.
-Characters from the
-.Tn ASCII
-character set are represented as single bytes in the range 0x00 - 0x7F.
-Traditional Chinese characters are represented by two bytes:
-the first in the range 0xA1 - 0xFE, the second in the range
-0x40 - 0xFE.
-.Sh SEE ALSO
-.Xr euc 5 ,
-.Xr gb18030 5 ,
-.Xr utf8 5
diff --git a/lib/libc_bsd/locale/big5.c b/lib/libc_bsd/locale/big5.c
deleted file mode 100644
index da549c3..0000000
--- a/lib/libc_bsd/locale/big5.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)big5.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/big5.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <sys/types.h>
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-extern int __mb_sb_limit;
-
-static size_t	_BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_BIG5_mbsinit(const mbstate_t *);
-static size_t	_BIG5_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	wchar_t	ch;
-} _BIG5State;
-
-int
-_BIG5_init(struct xlocale_ctype *l, _RuneLocale *rl)
-{
-
-	l->__mbrtowc = _BIG5_mbrtowc;
-	l->__wcrtomb = _BIG5_wcrtomb;
-	l->__mbsinit = _BIG5_mbsinit;
-	l->runes = rl;
-	l->__mb_cur_max = 2;
-	l->__mb_sb_limit = 128;
-	return (0);
-}
-
-static int
-_BIG5_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _BIG5State *)ps)->ch == 0);
-}
-
-static __inline int
-_big5_check(u_int c)
-{
-
-	c &= 0xff;
-	return ((c >= 0xa1 && c <= 0xfe) ? 2 : 1);
-}
-
-static size_t
-_BIG5_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_BIG5State *bs;
-	wchar_t wc;
-	size_t len;
-
-	bs = (_BIG5State *)ps;
-
-	if ((bs->ch & ~0xFF) != 0) {
-		/* Bad conversion state. */
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	if (bs->ch != 0) {
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (bs->ch << 8) | (*s & 0xFF);
-		if (pwc != NULL)
-			*pwc = wc;
-		bs->ch = 0;
-		return (1);
-	}
-
-	len = (size_t)_big5_check(*s);
-	wc = *s++ & 0xff;
-	if (len == 2) {
-		if (n < 2) {
-			/* Incomplete multibyte sequence */
-			bs->ch = wc;
-			return ((size_t)-2);
-		}
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (wc << 8) | (*s++ & 0xff);
-		if (pwc != NULL)
-			*pwc = wc;
-                return (2);
-	} else {
-		if (pwc != NULL)
-			*pwc = wc;
-		return (wc == L'\0' ? 0 : 1);
-	}
-}
-
-static size_t
-_BIG5_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_BIG5State *bs;
-
-	bs = (_BIG5State *)ps;
-
-	if (bs->ch != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc & 0x8000) {
-		*s++ = (wc >> 8) & 0xff;
-		*s = wc & 0xff;
-		return (2);
-	}
-	*s = wc & 0xff;
-	return (1);
-}
diff --git a/lib/libc_bsd/locale/btowc.3 b/lib/libc_bsd/locale/btowc.3
deleted file mode 100644
index 05641ff..0000000
--- a/lib/libc_bsd/locale/btowc.3
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/btowc.3 248803 2013-03-27 21:31:40Z jilles $
-.\"
-.Dd February 13, 2012
-.Dt BTOWC 3
-.Os
-.Sh NAME
-.Nm btowc ,
-.Nm wctob
-.Nd "convert between wide and single-byte characters"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wint_t
-.Fn btowc "int c"
-.Ft int
-.Fn wctob "wint_t c"
-.In wchar.h
-.In xlocale.h
-.Ft wint_t
-.Fn btowc_l "int c" "locale_t loc"
-.Ft int
-.Fn wctob_l "wint_t c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn btowc
-function converts a single-byte character into a corresponding wide character.
-If the character is
-.Dv EOF
-or not valid in the initial shift state,
-.Fn btowc
-returns
-.Dv WEOF .
-.Pp
-The
-.Fn wctob
-function converts a wide character into a corresponding single-byte character.
-If the wide character is
-.Dv WEOF
-or not able to be represented as a single byte in the initial shift state,
-.Fn wctob
-returns
-.Dv EOF .
-.Pp
-The _l-suffixed versions take an explicit locale argument, while the
-non-suffixed versions use the current global or per-thread locale.
-.Sh SEE ALSO
-.Xr mbrtowc 3 ,
-.Xr multibyte 3 ,
-.Xr wcrtomb 3
-.Sh STANDARDS
-The
-.Fn btowc
-and
-.Fn wctob
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn btowc
-and
-.Fn wctob
-functions first appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/locale/btowc.c b/lib/libc_bsd/locale/btowc.c
deleted file mode 100644
index 8049f6f..0000000
--- a/lib/libc_bsd/locale/btowc.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/btowc.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdio.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-wint_t
-btowc_l(int c, locale_t l)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs = initial;
-	char cc;
-	wchar_t wc;
-	FIX_LOCALE(l);
-
-	if (c == EOF)
-		return (WEOF);
-	/*
-	 * We expect mbrtowc() to return 0 or 1, hence the check for n > 1
-	 * which detects error return values as well as "impossible" byte
-	 * counts.
-	 */
-	cc = (char)c;
-	if (XLOCALE_CTYPE(l)->__mbrtowc(&wc, &cc, 1, &mbs) > 1)
-		return (WEOF);
-	return (wc);
-}
-wint_t
-btowc(int c)
-{
-	return btowc_l(c, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/c16rtomb.c b/lib/libc_bsd/locale/c16rtomb.c
deleted file mode 100644
index d1f4d82..0000000
--- a/lib/libc_bsd/locale/c16rtomb.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 2013 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/c16rtomb.c 250883 2013-05-21 19:59:37Z ed $");
-
-#include <errno.h>
-#include <uchar.h>
-#include "xlocale_private.h"
-
-typedef struct {
-	char16_t	lead_surrogate;
-	mbstate_t	c32_mbstate;
-} _Char16State;
-
-size_t
-c16rtomb_l(char * __restrict s, char16_t c16, mbstate_t * __restrict ps,
-    locale_t locale)
-{
-	_Char16State *cs;
-	char32_t c32;
-
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->c16rtomb;
-	cs = (_Char16State *)ps;
-
-	/* If s is a null pointer, the value of parameter c16 is ignored. */
-	if (s == NULL) {
-		c32 = 0;
-	} else if (cs->lead_surrogate >= 0xd800 &&
-	    cs->lead_surrogate <= 0xdbff) {
-		/* We should see a trail surrogate now. */
-		if (c16 < 0xdc00 || c16 > 0xdfff) {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		c32 = 0x10000 + ((cs->lead_surrogate & 0x3ff) << 10 |
-		    (c16 & 0x3ff));
-	} else if (c16 >= 0xd800 && c16 <= 0xdbff) {
-		/* Store lead surrogate for next invocation. */
-		cs->lead_surrogate = c16;
-		return (0);
-	} else {
-		/* Regular character. */
-		c32 = c16;
-	}
-	cs->lead_surrogate = 0;
-
-	return (c32rtomb_l(s, c32, &cs->c32_mbstate, locale));
-}
-
-size_t
-c16rtomb(char * __restrict s, char16_t c16, mbstate_t * __restrict ps)
-{
-
-	return (c16rtomb_l(s, c16, ps, __get_locale()));
-}
diff --git a/lib/libc_bsd/locale/c16rtomb_iconv.c b/lib/libc_bsd/locale/c16rtomb_iconv.c
deleted file mode 100644
index f89c8f1..0000000
--- a/lib/libc_bsd/locale/c16rtomb_iconv.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/locale/c16rtomb_iconv.c 251314 2013-06-03 17:17:56Z ed $ */
-#define	charXX_t	char16_t
-#define	cXXrtomb	c16rtomb
-#define	cXXrtomb_l	c16rtomb_l
-#define	SRCBUF_LEN	2
-#define	UTF_XX_INTERNAL	"UTF-16-INTERNAL"
-
-#include "cXXrtomb_iconv.h"
diff --git a/lib/libc_bsd/locale/c32rtomb.c b/lib/libc_bsd/locale/c32rtomb.c
deleted file mode 100644
index 74fd77d..0000000
--- a/lib/libc_bsd/locale/c32rtomb.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2013 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/c32rtomb.c 250883 2013-05-21 19:59:37Z ed $");
-
-#include <errno.h>
-#include <uchar.h>
-#include <wchar.h>
-#include "xlocale_private.h"
-
-size_t
-c32rtomb_l(char * __restrict s, char32_t c32, mbstate_t * __restrict ps,
-    locale_t locale)
-{
-
-	/* Unicode Standard 5.0, D90: ill-formed characters. */
-	if ((c32 >= 0xd800 && c32 <= 0xdfff) || c32 > 0x10ffff) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->c32rtomb;
-
-	/* Assume wchar_t uses UTF-32. */
-	return (wcrtomb_l(s, c32, ps, locale));
-}
-
-size_t
-c32rtomb(char * __restrict s, char32_t c32, mbstate_t * __restrict ps)
-{
-
-	return (c32rtomb_l(s, c32, ps, __get_locale()));
-}
diff --git a/lib/libc_bsd/locale/c32rtomb_iconv.c b/lib/libc_bsd/locale/c32rtomb_iconv.c
deleted file mode 100644
index f709409..0000000
--- a/lib/libc_bsd/locale/c32rtomb_iconv.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/locale/c32rtomb_iconv.c 251314 2013-06-03 17:17:56Z ed $ */
-#define	charXX_t	char32_t
-#define	cXXrtomb	c32rtomb
-#define	cXXrtomb_l	c32rtomb_l
-#define	SRCBUF_LEN	1
-#define	UTF_XX_INTERNAL	"UTF-32-INTERNAL"
-
-#include "cXXrtomb_iconv.h"
diff --git a/lib/libc_bsd/locale/cXXrtomb_iconv.h b/lib/libc_bsd/locale/cXXrtomb_iconv.h
deleted file mode 100644
index 93fbca4..0000000
--- a/lib/libc_bsd/locale/cXXrtomb_iconv.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 2013 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/cXXrtomb_iconv.h 282275 2015-04-30 16:08:47Z tijl $");
-
-#include <sys/queue.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <langinfo.h>
-#include <uchar.h>
-
-#include "../iconv/citrus_hash.h"
-#include "../iconv/citrus_module.h"
-#include "../iconv/citrus_iconv.h"
-#include "xlocale_private.h"
-
-typedef struct {
-	bool			initialized;
-	struct _citrus_iconv	iconv;
-	union {
-		charXX_t	widechar[SRCBUF_LEN];
-		char		bytes[sizeof(charXX_t) * SRCBUF_LEN];
-	} srcbuf;
-	size_t			srcbuf_len;
-} _ConversionState;
-_Static_assert(sizeof(_ConversionState) <= sizeof(mbstate_t),
-    "Size of _ConversionState must not exceed mbstate_t's size.");
-
-size_t
-cXXrtomb_l(char * __restrict s, charXX_t c, mbstate_t * __restrict ps,
-    locale_t locale)
-{
-	_ConversionState *cs;
-	struct _citrus_iconv *handle;
-	char *src, *dst;
-	size_t srcleft, dstleft, invlen;
-	int err;
-
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->cXXrtomb;
-	cs = (_ConversionState *)ps;
-	handle = &cs->iconv;
-
-	/* Reinitialize mbstate_t. */
-	if (s == NULL || !cs->initialized) {
-		if (_citrus_iconv_open(&handle, UTF_XX_INTERNAL,
-		    nl_langinfo_l(CODESET, locale)) != 0) {
-			cs->initialized = false;
-			errno = EINVAL;
-			return (-1);
-		}
-		handle->cv_shared->ci_discard_ilseq = true;
-		handle->cv_shared->ci_hooks = NULL;
-		cs->srcbuf_len = 0;
-		cs->initialized = true;
-		if (s == NULL)
-			return (1);
-	}
-
-	assert(cs->srcbuf_len < sizeof(cs->srcbuf.widechar) / sizeof(charXX_t));
-	cs->srcbuf.widechar[cs->srcbuf_len++] = c;
-
-	/* Perform conversion. */
-	src = cs->srcbuf.bytes;
-	srcleft = cs->srcbuf_len * sizeof(charXX_t);
-	dst = s;
-	dstleft = MB_CUR_MAX_L(locale);
-	err = _citrus_iconv_convert(handle, &src, &srcleft, &dst, &dstleft,
-	    0, &invlen);
-
-	/* Character is part of a surrogate pair. We need more input. */
-	if (err == EINVAL)
-		return (0);
-	cs->srcbuf_len = 0;
-	
-	/* Illegal sequence. */
-	if (dst == s) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	return (dst - s);
-}
-
-size_t
-cXXrtomb(char * __restrict s, charXX_t c, mbstate_t * __restrict ps)
-{
-
-	return (cXXrtomb_l(s, c, ps, __get_locale()));
-}
diff --git a/lib/libc_bsd/locale/collate.c b/lib/libc_bsd/locale/collate.c
deleted file mode 100644
index fc476e0..0000000
--- a/lib/libc_bsd/locale/collate.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/collate.c 244126 2012-12-11 22:52:56Z jilles $");
-
-#include "namespace.h"
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sysexits.h>
-#include "un-namespace.h"
-
-#include "collate.h"
-#include "setlocale.h"
-#include "ldpart.h"
-
-#include "libc_private.h"
-
-/*
- * To avoid modifying the original (single-threaded) code too much, we'll just
- * define the old globals as fields inside the table.
- *
- * We also modify the collation table test functions to search the thread-local
- * table first and the global table second.  
- */
-#define __collate_substitute_nontrivial (table->__collate_substitute_nontrivial)
-#define __collate_substitute_table_ptr (table->__collate_substitute_table_ptr)
-#define __collate_char_pri_table_ptr (table->__collate_char_pri_table_ptr)
-#define __collate_chain_pri_table (table->__collate_chain_pri_table)
-int __collate_load_error;
-
-
-struct xlocale_collate __xlocale_global_collate = {
-	{{0}, "C"}, 1, 0
-};
-
- struct xlocale_collate __xlocale_C_collate = {
-	{{0}, "C"}, 1, 0
-};
-
-void __collate_err(int ex, const char *f) __dead2;
-
-int
-__collate_load_tables_l(const char *encoding, struct xlocale_collate *table);
-
-static void
-destruct_collate(void *t)
-{
-	struct xlocale_collate *table = t;
-	if (__collate_chain_pri_table) {
-		free(__collate_chain_pri_table);
-	}
-	free(t);
-}
-
-void *
-__collate_load(const char *encoding, locale_t unused)
-{
-	if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) {
-		return &__xlocale_C_collate;
-	}
-	struct xlocale_collate *table = calloc(sizeof(struct xlocale_collate), 1);
-	table->header.header.destructor = destruct_collate;
-	// FIXME: Make sure that _LDP_CACHE is never returned.  We should be doing
-	// the caching outside of this section
-	if (__collate_load_tables_l(encoding, table) != _LDP_LOADED) {
-		xlocale_release(table);
-		return NULL;
-	}
-	return table;
-}
-
-/**
- * Load the collation tables for the specified encoding into the global table.
- */
-int
-__collate_load_tables(const char *encoding)
-{
-	int ret = __collate_load_tables_l(encoding, &__xlocale_global_collate);
-	__collate_load_error = __xlocale_global_collate.__collate_load_error;
-	return ret;
-}
-
-int
-__collate_load_tables_l(const char *encoding, struct xlocale_collate *table)
-{
-	FILE *fp;
-	int i, saverr, chains;
-	uint32_t u32;
-	char strbuf[STR_LEN], buf[PATH_MAX];
-	void *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table;
-
-	/* 'encoding' must be already checked. */
-	if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) {
-		table->__collate_load_error = 1;
-		return (_LDP_CACHE);
-	}
-
-	/* 'PathLocale' must be already set & checked. */
-	/* Range checking not needed, encoding has fixed size */
-	(void)strcpy(buf, _PathLocale);
-	(void)strcat(buf, "/");
-	(void)strcat(buf, encoding);
-	(void)strcat(buf, "/LC_COLLATE");
-	if ((fp = fopen(buf, "re")) == NULL)
-		return (_LDP_ERROR);
-
-	if (fread(strbuf, sizeof(strbuf), 1, fp) != 1) {
-		saverr = errno;
-		(void)fclose(fp);
-		errno = saverr;
-		return (_LDP_ERROR);
-	}
-	chains = -1;
-	if (strcmp(strbuf, COLLATE_VERSION) == 0)
-		chains = 0;
-	else if (strcmp(strbuf, COLLATE_VERSION1_2) == 0)
-		chains = 1;
-	if (chains < 0) {
-		(void)fclose(fp);
-		errno = EFTYPE;
-		return (_LDP_ERROR);
-	}
-	if (chains) {
-		if (fread(&u32, sizeof(u32), 1, fp) != 1) {
-			saverr = errno;
-			(void)fclose(fp);
-			errno = saverr;
-			return (_LDP_ERROR);
-		}
-		if ((chains = (int)ntohl(u32)) < 1) {
-			(void)fclose(fp);
-			errno = EFTYPE;
-			return (_LDP_ERROR);
-		}
-	} else
-		chains = TABLE_SIZE;
-
-	if ((TMP_substitute_table =
-	     malloc(sizeof(__collate_substitute_table))) == NULL) {
-		saverr = errno;
-		(void)fclose(fp);
-		errno = saverr;
-		return (_LDP_ERROR);
-	}
-	if ((TMP_char_pri_table =
-	     malloc(sizeof(__collate_char_pri_table))) == NULL) {
-		saverr = errno;
-		free(TMP_substitute_table);
-		(void)fclose(fp);
-		errno = saverr;
-		return (_LDP_ERROR);
-	}
-	if ((TMP_chain_pri_table =
-	     malloc(sizeof(*__collate_chain_pri_table) * chains)) == NULL) {
-		saverr = errno;
-		free(TMP_substitute_table);
-		free(TMP_char_pri_table);
-		(void)fclose(fp);
-		errno = saverr;
-		return (_LDP_ERROR);
-	}
-
-#define FREAD(a, b, c, d) \
-{ \
-	if (fread(a, b, c, d) != c) { \
-		saverr = errno; \
-		free(TMP_substitute_table); \
-		free(TMP_char_pri_table); \
-		free(TMP_chain_pri_table); \
-		(void)fclose(d); \
-		errno = saverr; \
-		return (_LDP_ERROR); \
-	} \
-}
-
-	FREAD(TMP_substitute_table, sizeof(__collate_substitute_table), 1, fp);
-	FREAD(TMP_char_pri_table, sizeof(__collate_char_pri_table), 1, fp);
-	FREAD(TMP_chain_pri_table,
-	      sizeof(*__collate_chain_pri_table), chains, fp);
-	(void)fclose(fp);
-
-	if (__collate_substitute_table_ptr != NULL)
-		free(__collate_substitute_table_ptr);
-	__collate_substitute_table_ptr = TMP_substitute_table;
-	if (__collate_char_pri_table_ptr != NULL)
-		free(__collate_char_pri_table_ptr);
-	__collate_char_pri_table_ptr = TMP_char_pri_table;
-	for (i = 0; i < UCHAR_MAX + 1; i++) {
-		__collate_char_pri_table[i].prim =
-		    ntohl(__collate_char_pri_table[i].prim);
-		__collate_char_pri_table[i].sec =
-		    ntohl(__collate_char_pri_table[i].sec);
-	}
-	if (__collate_chain_pri_table != NULL)
-		free(__collate_chain_pri_table);
-	__collate_chain_pri_table = TMP_chain_pri_table;
-	for (i = 0; i < chains; i++) {
-		__collate_chain_pri_table[i].prim =
-		    ntohl(__collate_chain_pri_table[i].prim);
-		__collate_chain_pri_table[i].sec =
-		    ntohl(__collate_chain_pri_table[i].sec);
-	}
-	__collate_substitute_nontrivial = 0;
-	for (i = 0; i < UCHAR_MAX + 1; i++) {
-		if (__collate_substitute_table[i][0] != i ||
-		    __collate_substitute_table[i][1] != 0) {
-			__collate_substitute_nontrivial = 1;
-			break;
-		}
-	}
-	table->__collate_load_error = 0;
-
-	return (_LDP_LOADED);
-}
-
-u_char *
-__collate_substitute(struct xlocale_collate *table, const u_char *s)
-{
-	int dest_len, len, nlen;
-	int delta = strlen(s);
-	u_char *dest_str = NULL;
-
-	if (s == NULL || *s == '\0')
-		return (__collate_strdup(""));
-	delta += delta / 8;
-	dest_str = malloc(dest_len = delta);
-	if (dest_str == NULL)
-		__collate_err(EX_OSERR, __func__);
-	len = 0;
-	while (*s) {
-		nlen = len + strlen(__collate_substitute_table[*s]);
-		if (dest_len <= nlen) {
-			dest_str = reallocf(dest_str, dest_len = nlen + delta);
-			if (dest_str == NULL)
-				__collate_err(EX_OSERR, __func__);
-		}
-		(void)strcpy(dest_str + len, __collate_substitute_table[*s++]);
-		len = nlen;
-	}
-	return (dest_str);
-}
-
-void
-__collate_lookup(struct xlocale_collate *table, const u_char *t, int *len, int *prim, int *sec)
-{
-	struct __collate_st_chain_pri *p2;
-
-	*len = 1;
-	*prim = *sec = 0;
-	for (p2 = __collate_chain_pri_table; p2->str[0] != '\0'; p2++) {
-		if (*t == p2->str[0] &&
-		    strncmp(t, p2->str, strlen(p2->str)) == 0) {
-			*len = strlen(p2->str);
-			*prim = p2->prim;
-			*sec = p2->sec;
-			return;
-		}
-	}
-	*prim = __collate_char_pri_table[*t].prim;
-	*sec = __collate_char_pri_table[*t].sec;
-}
-
-u_char *
-__collate_strdup(u_char *s)
-{
-	u_char *t = strdup(s);
-
-	if (t == NULL)
-		__collate_err(EX_OSERR, __func__);
-	return (t);
-}
-
-void
-__collate_err(int ex, const char *f)
-{
-	const char *s;
-	int serrno = errno;
-
-	s = _getprogname();
-	_write(STDERR_FILENO, s, strlen(s));
-	_write(STDERR_FILENO, ": ", 2);
-	s = f;
-	_write(STDERR_FILENO, s, strlen(s));
-	_write(STDERR_FILENO, ": ", 2);
-	s = strerror(serrno);
-	_write(STDERR_FILENO, s, strlen(s));
-	_write(STDERR_FILENO, "\n", 1);
-	exit(ex);
-}
-
-#ifdef COLLATE_DEBUG
-void
-__collate_print_tables()
-{
-	int i;
-	struct __collate_st_chain_pri *p2;
-
-	printf("Substitute table:\n");
-	for (i = 0; i < UCHAR_MAX + 1; i++)
-	    if (i != *__collate_substitute_table[i])
-		printf("\t'%c' --> \"%s\"\n", i,
-		       __collate_substitute_table[i]);
-	printf("Chain priority table:\n");
-	for (p2 = __collate_chain_pri_table; p2->str[0] != '\0'; p2++)
-		printf("\t\"%s\" : %d %d\n", p2->str, p2->prim, p2->sec);
-	printf("Char priority table:\n");
-	for (i = 0; i < UCHAR_MAX + 1; i++)
-		printf("\t'%c' : %d %d\n", i, __collate_char_pri_table[i].prim,
-		       __collate_char_pri_table[i].sec);
-}
-#endif
diff --git a/lib/libc_bsd/locale/collate.h b/lib/libc_bsd/locale/collate.h
deleted file mode 100644
index 87b9ac3..0000000
--- a/lib/libc_bsd/locale/collate.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/lib/libc/locale/collate.h 227753 2011-11-20 14:45:42Z theraven $
- */
-
-#ifndef _COLLATE_H_
-#define	_COLLATE_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <limits.h>
-#include "xlocale_private.h"
-
-#define STR_LEN 10
-#define TABLE_SIZE 100
-#define COLLATE_VERSION    "1.0\n"
-#define COLLATE_VERSION1_2 "1.2\n"
-
-struct __collate_st_char_pri {
-	int prim, sec;
-};
-struct __collate_st_chain_pri {
-	u_char str[STR_LEN];
-	int prim, sec;
-};
-
-#define __collate_substitute_table (*__collate_substitute_table_ptr)
-#define __collate_char_pri_table (*__collate_char_pri_table_ptr)
-
-struct xlocale_collate {
-	struct xlocale_component header;
-	int __collate_load_error;
-	int __collate_substitute_nontrivial;
-
-	u_char (*__collate_substitute_table_ptr)[UCHAR_MAX + 1][STR_LEN];
-	struct __collate_st_char_pri (*__collate_char_pri_table_ptr)[UCHAR_MAX + 1];
-	struct __collate_st_chain_pri *__collate_chain_pri_table;
-};
-
-
-__BEGIN_DECLS
-u_char	*__collate_strdup(u_char *);
-u_char	*__collate_substitute(struct xlocale_collate *, const u_char *);
-int	__collate_load_tables(const char *);
-void	__collate_lookup(struct xlocale_collate *, const u_char *, int *, int *, int *);
-int	__collate_range_cmp(struct xlocale_collate *, int, int);
-#ifdef COLLATE_DEBUG
-void	__collate_print_tables(void);
-#endif
-__END_DECLS
-
-#endif /* !_COLLATE_H_ */
diff --git a/lib/libc_bsd/locale/collcmp.c b/lib/libc_bsd/locale/collcmp.c
deleted file mode 100644
index 57a9459..0000000
--- a/lib/libc_bsd/locale/collcmp.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 1996 by Andrey A. Chernov, Moscow, Russia.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/collcmp.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <string.h>
-#include <xlocale.h>
-#include "collate.h"
-
-/*
- * Compare two characters using collate
- */
-
-int __collate_range_cmp(struct xlocale_collate *table, int c1, int c2)
-{
-	static char s1[2], s2[2];
-
-	s1[0] = c1;
-	s2[0] = c2;
-	struct _xlocale l = {{0}};
-	l.components[XLC_COLLATE] = (struct xlocale_component *)table;
-	return (strcoll_l(s1, s2, &l));
-}
diff --git a/lib/libc_bsd/locale/ctype.3 b/lib/libc_bsd/locale/ctype.3
deleted file mode 100644
index 324b63f..0000000
--- a/lib/libc_bsd/locale/ctype.3
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)ctype.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/ctype.3 233648 2012-03-29 05:02:12Z eadler $
-.\"
-.Dd March 30, 2004
-.Dt CTYPE 3
-.Os
-.Sh NAME
-.Nm digittoint ,
-.Nm isalnum ,
-.Nm isalpha ,
-.Nm isascii ,
-.Nm isblank ,
-.Nm iscntrl ,
-.Nm isdigit ,
-.Nm isgraph ,
-.Nm ishexnumber ,
-.Nm isideogram ,
-.Nm islower ,
-.Nm isnumber ,
-.Nm isphonogram ,
-.Nm isprint ,
-.Nm ispunct ,
-.Nm isrune ,
-.Nm isspace ,
-.Nm isspecial ,
-.Nm isupper ,
-.Nm isxdigit ,
-.Nm toascii ,
-.Nm tolower ,
-.Nm toupper
-.Nd character classification functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn digittoint "int c"
-.Ft int
-.Fn isalnum "int c"
-.Ft int
-.Fn isalpha "int c"
-.Ft int
-.Fn isascii "int c"
-.Ft int
-.Fn iscntrl "int c"
-.Ft int
-.Fn isdigit "int c"
-.Ft int
-.Fn isgraph "int c"
-.Ft int
-.Fn ishexnumber "int c"
-.Ft int
-.Fn isideogram "int c"
-.Ft int
-.Fn islower "int c"
-.Ft int
-.Fn isnumber "int c"
-.Ft int
-.Fn isphonogram "int c"
-.Ft int
-.Fn isspecial "int c"
-.Ft int
-.Fn isprint "int c"
-.Ft int
-.Fn ispunct "int c"
-.Ft int
-.Fn isrune "int c"
-.Ft int
-.Fn isspace "int c"
-.Ft int
-.Fn isupper "int c"
-.Ft int
-.Fn isxdigit "int c"
-.Ft int
-.Fn toascii "int c"
-.Ft int
-.Fn tolower "int c"
-.Ft int
-.Fn toupper "int c"
-.Sh DESCRIPTION
-The above functions perform character tests and conversions on the integer
-.Fa c .
-They are available as macros, defined in the include file
-.In ctype.h ,
-or as true functions in the C library.
-See the specific manual pages for more information.
-.Sh SEE ALSO
-.Xr digittoint 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr isideogram 3 ,
-.Xr islower 3 ,
-.Xr isphonogram 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isrune 3 ,
-.Xr isspace 3 ,
-.Xr isspecial 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr toascii 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr wctype 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-These functions, except for
-.Fn digittoint ,
-.Fn isascii ,
-.Fn ishexnumber ,
-.Fn isideogram ,
-.Fn isnumber ,
-.Fn isphonogram ,
-.Fn isrune ,
-.Fn isspecial
-and
-.Fn toascii ,
-conform to
-.St -isoC .
diff --git a/lib/libc_bsd/locale/ctype.c b/lib/libc_bsd/locale/ctype.c
deleted file mode 100644
index 37d1e5c..0000000
--- a/lib/libc_bsd/locale/ctype.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*-
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/locale/ctype.c 227753 2011-11-20 14:45:42Z theraven $
- */
-#define _XLOCALE_INLINE
-#include <ctype.h>
-#include <wctype.h>
-#include <xlocale.h>
diff --git a/lib/libc_bsd/locale/ctype_l.3 b/lib/libc_bsd/locale/ctype_l.3
deleted file mode 100644
index 548ec0a..0000000
--- a/lib/libc_bsd/locale/ctype_l.3
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" Copyright (c) 2011 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by David Chisnall under sponsorship from
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/locale/ctype_l.3 237939 2012-07-01 22:18:20Z jilles $
-.\"
-.Dd March 6, 2012
-.Dt CTYPE_L 3
-.Os
-.Sh NAME
-.Nm digittoint_l ,
-.Nm isalnum_l ,
-.Nm isalpha_l ,
-.Nm isascii_l ,
-.Nm isblank_l ,
-.Nm iscntrl_l ,
-.Nm isdigit_l ,
-.Nm isgraph_l ,
-.Nm ishexnumber_l ,
-.Nm isideogram_l ,
-.Nm islower_l ,
-.Nm isnumber_l ,
-.Nm isphonogram_l ,
-.Nm isprint_l ,
-.Nm ispunct_l ,
-.Nm isrune_l ,
-.Nm isspace_l ,
-.Nm isspecial_l ,
-.Nm isupper_l ,
-.Nm isxdigit_l ,
-.Nm tolower_l ,
-.Nm toupper_l
-.Nd character classification functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn digittoint_l "int c" "locale_t loc"
-.Ft int
-.Fn isalnum_l "int c" "locale_t loc"
-.Ft int
-.Fn isalpha_l "int c" "locale_t loc"
-.Ft int
-.Fn isascii_l "int c" "locale_t loc"
-.Ft int
-.Fn iscntrl_l "int c" "locale_t loc"
-.Ft int
-.Fn isdigit_l "int c" "locale_t loc"
-.Ft int
-.Fn isgraph_l "int c" "locale_t loc"
-.Ft int
-.Fn ishexnumber_l "int c" "locale_t loc"
-.Ft int
-.Fn isideogram_l "int c" "locale_t loc"
-.Ft int
-.Fn islower_l "int c" "locale_t loc"
-.Ft int
-.Fn isnumber_l "int c" "locale_t loc"
-.Ft int
-.Fn isphonogram_l "int c" "locale_t loc"
-.Ft int
-.Fn isspecial_l "int c" "locale_t loc"
-.Ft int
-.Fn isprint_l "int c" "locale_t loc"
-.Ft int
-.Fn ispunct_l "int c" "locale_t loc"
-.Ft int
-.Fn isrune_l "int c" "locale_t loc"
-.Ft int
-.Fn isspace_l "int c" "locale_t loc"
-.Ft int
-.Fn isupper_l "int c" "locale_t loc"
-.Ft int
-.Fn isxdigit_l "int c" "locale_t loc"
-.Ft int
-.Fn tolower_l "int c" "locale_t loc"
-.Ft int
-.Fn toupper_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The above functions perform character tests and conversions on the integer
-.Fa c
-in the locale
-.Fa loc .
-They behave in the same way as the versions without the _l suffix, but use the
-specified locale rather than the global or per-thread locale.
-.In ctype.h ,
-or as true functions in the C library.
-See the specific manual pages for more information.
-.Sh SEE ALSO
-.Xr digittoint 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr isideogram 3 ,
-.Xr islower 3 ,
-.Xr isphonogram 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isrune 3 ,
-.Xr isspace 3 ,
-.Xr isspecial 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr wctype 3 ,
-.Xr xlocale 3
-.Sh STANDARDS
-These functions conform to
-.St -p1003.1-2008 ,
-except for
-.Fn digittoint_l ,
-.Fn isascii_l ,
-.Fn ishexnumber_l ,
-.Fn isideogram_l ,
-.Fn isnumber_l ,
-.Fn isphonogram_l ,
-.Fn isrune_l
-and
-.Fn isspecial_l
-which are
-.Fx
-extensions.
diff --git a/lib/libc_bsd/locale/digittoint.3 b/lib/libc_bsd/locale/digittoint.3
deleted file mode 100644
index dce8ba6..0000000
--- a/lib/libc_bsd/locale/digittoint.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"	@(#)digittoint.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/digittoint.3 233648 2012-03-29 05:02:12Z eadler $
-.\"
-.Dd April 6, 2001
-.Dt DIGITTOINT 3
-.Os
-.Sh NAME
-.Nm digittoint
-.Nd convert a numeric character to its integer value
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn digittoint "int c"
-.Ft int
-.Fn digittoint_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn digittoint
-function converts a numeric character to its corresponding integer value.
-The character can be any decimal digit or hexadecimal digit.
-With hexadecimal characters, the case of the values does not matter.
-.Pp
-The
-.Fn digittoint_l
-function takes an explicit locale argument, whereas the
-.Fn digittoint
-function use the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn digittoint
-function always returns an integer from the range of 0 to 15.
-If the given character was not a digit as defined by
-.Xr isxdigit 3 ,
-the function will return 0.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isdigit 3 ,
-.Xr isxdigit 3,
-.Xr xlocale 3
diff --git a/lib/libc_bsd/locale/duplocale.3 b/lib/libc_bsd/locale/duplocale.3
deleted file mode 100644
index ee45d00..0000000
--- a/lib/libc_bsd/locale/duplocale.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\" Copyright (c) 2011 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by David Chisnall under sponsorship from
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/locale/duplocale.3 250244 2013-05-04 17:06:47Z pluknet $
-.\"
-.Dd September 17, 2011
-.Dt DUPLOCALE 3
-.Os
-.Sh NAME
-.Nm duplocale
-.Nd duplicate an locale
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In xlocale.h
-.Ft locale_t
-.Fn duplocale "locale_t locale"
-.Sh DESCRIPTION
-Duplicates an existing
-.Fa locale_t
-returning a new
-.Fa locale_t
-that refers to the same locale values but has an independent internal state.
-Various functions, such as
-.Xr mblen 3
-require a persistent state.
-These functions formerly used static variables and calls to them from multiple
-threads had undefined behavior.
-They now use fields in the
-.Fa locale_t
-associated with the current thread by
-.Xr uselocale 3 .
-These calls are therefore only thread safe on threads with a unique per-thread
-locale.
-The locale returned by this call must be freed with
-.Xr freelocale 3 .
-.Sh SEE ALSO
-.Xr freelocale 3 ,
-.Xr localeconv 3 ,
-.Xr newlocale 3 ,
-.Xr querylocale 3 ,
-.Xr uselocale 3 ,
-.Xr xlocale 3
-.Sh STANDARDS
-This function conforms to
-.St -p1003.1-2008 .
-.Sh BUGS
-Ideally,
-.Xr uselocale 3
-should make a copy of the
-.Fa locale_t
-implicitly to ensure thread safety,
-and a copy of the global locale should be installed lazily on each thread.
-The FreeBSD implementation does not do this,
-for compatibility with Darwin.
diff --git a/lib/libc_bsd/locale/euc.5 b/lib/libc_bsd/locale/euc.5
deleted file mode 100644
index a6ce719..0000000
--- a/lib/libc_bsd/locale/euc.5
+++ /dev/null
@@ -1,134 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Paul Borman at Krystal Technologies.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)euc.4	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/euc.5 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd November 8, 2003
-.Dt EUC 5
-.Os
-.Sh NAME
-.Nm euc
-.Nd EUC encoding of wide characters
-.Sh SYNOPSIS
-.Nm ENCODING
-.Qq EUC
-.Pp
-.Nm VARIABLE
-.Ar len1
-.Ar mask1
-.Ar len2
-.Ar mask2
-.Ar len3
-.Ar mask3
-.Ar len4
-.Ar mask4
-.Ar mask
-.Sh DESCRIPTION
-.\"The
-.\".Nm EUC
-.\"encoding is provided for compatibility with
-.\".Ux
-.\"based systems.
-.\"See
-.\".Xr mklocale 1
-.\"for a complete description of the
-.\".Ev LC_CTYPE
-.\"source file format.
-.\".Pp
-.Nm EUC
-implements a system of 4 multibyte codesets.
-A multibyte character in the first codeset consists of
-.Ar len1
-bytes starting with a byte in the range of 0x00 to 0x7f.
-To allow use of
-.Tn ASCII ,
-.Ar len1
-is always 1.
-A multibyte character in the second codeset consists of
-.Ar len2
-bytes starting with a byte in the range of 0x80-0xff excluding 0x8e and 0x8f.
-A multibyte character in the third codeset consists of
-.Ar len3
-bytes starting with the byte 0x8e.
-A multibyte character in the fourth codeset consists of
-.Ar len4
-bytes starting with the byte 0x8f.
-.Pp
-The
-.Vt wchar_t
-encoding of
-.Nm EUC
-multibyte characters is dependent on the
-.Ar len
-and
-.Ar mask
-arguments.
-First, the bytes are moved into a
-.Vt wchar_t
-as follows:
-.Bd -literal
-byte0 << ((\fIlen\fPN-1) * 8) | byte1 << ((\fIlen\fPN-2) * 8) | ... | byte\fIlen\fPN-1
-.Ed
-.Pp
-The result is then ANDed with
-.Ar ~mask
-and ORed with
-.Ar maskN .
-Codesets 2 and 3 are special in that the leading byte (0x8e or 0x8f) is
-first removed and the
-.Ar lenN
-argument is reduced by 1.
-.Pp
-For example, the
-.Li ja_JP.eucJP
-locale has the following
-.Va VARIABLE
-line:
-.Bd -literal
-VARIABLE	1 0x0000 2 0x8080 2 0x0080 3 0x8000 0x8080
-.Ed
-.Pp
-Codeset 1 consists of the values 0x0000 - 0x007f.
-.Pp
-Codeset 2 consists of the values who have the bits 0x8080 set.
-.Pp
-Codeset 3 consists of the values 0x0080 - 0x00ff.
-.Pp
-Codeset 4 consists of the values 0x8000 - 0xff7f excluding the values
-which have the 0x0080 bit set.
-.Pp
-Notice that the global
-.Ar mask
-is set to 0x8080, this implies that from those 2 bits the codeset can
-be determined.
-.Sh SEE ALSO
-.Xr mklocale 1 ,
-.Xr setlocale 3
diff --git a/lib/libc_bsd/locale/euc.c b/lib/libc_bsd/locale/euc.c
deleted file mode 100644
index 8a81103..0000000
--- a/lib/libc_bsd/locale/euc.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)euc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/param.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/euc.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <limits.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-extern int __mb_sb_limit;
-
-static size_t	_EUC_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_EUC_mbsinit(const mbstate_t *);
-static size_t	_EUC_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	int	count[4];
-	wchar_t	bits[4];
-	wchar_t	mask;
-} _EucInfo;
-
-typedef struct {
-	wchar_t	ch;
-	int	set;
-	int	want;
-} _EucState;
-
-int
-_EUC_init(struct xlocale_ctype *l, _RuneLocale *rl)
-{
-	_EucInfo *ei;
-	int x, new__mb_cur_max;
-	char *v, *e;
-
-	if (rl->__variable == NULL)
-		return (EFTYPE);
-
-	v = (char *)rl->__variable;
-
-	while (*v == ' ' || *v == '\t')
-		++v;
-
-	if ((ei = malloc(sizeof(_EucInfo))) == NULL)
-		return (errno == 0 ? ENOMEM : errno);
-
-	new__mb_cur_max = 0;
-	for (x = 0; x < 4; ++x) {
-		ei->count[x] = (int)strtol(v, &e, 0);
-		if (v == e || !(v = e)) {
-			free(ei);
-			return (EFTYPE);
-		}
-		if (new__mb_cur_max < ei->count[x])
-			new__mb_cur_max = ei->count[x];
-		while (*v == ' ' || *v == '\t')
-			++v;
-		ei->bits[x] = (int)strtol(v, &e, 0);
-		if (v == e || !(v = e)) {
-			free(ei);
-			return (EFTYPE);
-		}
-		while (*v == ' ' || *v == '\t')
-			++v;
-	}
-	ei->mask = (int)strtol(v, &e, 0);
-	if (v == e || !(v = e)) {
-		free(ei);
-		return (EFTYPE);
-	}
-	rl->__variable = ei;
-	rl->__variable_len = sizeof(_EucInfo);
-	l->runes = rl;
-	l->__mb_cur_max = new__mb_cur_max;
-	l->__mbrtowc = _EUC_mbrtowc;
-	l->__wcrtomb = _EUC_wcrtomb;
-	l->__mbsinit = _EUC_mbsinit;
-	l->__mb_sb_limit = 256;
-	return (0);
-}
-
-static int
-_EUC_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _EucState *)ps)->want == 0);
-}
-
-#define	CEI	((_EucInfo *)(_CurrentRuneLocale->__variable))
-
-#define	_SS2	0x008e
-#define	_SS3	0x008f
-
-#define	GR_BITS	0x80808080 /* XXX: to be fixed */
-
-static __inline int
-_euc_set(u_int c)
-{
-
-	c &= 0xff;
-	return ((c & 0x80) ? c == _SS3 ? 3 : c == _SS2 ? 2 : 1 : 0);
-}
-
-static size_t
-_EUC_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_EucState *es;
-	int i, set, want;
-	wchar_t wc;
-	const char *os;
-
-	es = (_EucState *)ps;
-
-	if (es->want < 0 || es->want > MB_CUR_MAX || es->set < 0 ||
-	    es->set > 3) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	os = s;
-
-	if (es->want == 0) {
-		want = CEI->count[set = _euc_set(*s)];
-		if (set == 2 || set == 3) {
-			--want;
-			if (--n == 0) {
-				/* Incomplete multibyte sequence */
-				es->set = set;
-				es->want = want;
-				es->ch = 0;
-				return ((size_t)-2);
-			}
-			++s;
-			if (*s == '\0') {
-				errno = EILSEQ;
-				return ((size_t)-1);
-			}
-		}
-		wc = (unsigned char)*s++;
-	} else {
-		set = es->set;
-		want = es->want;
-		wc = es->ch;
-	}
-	for (i = (es->want == 0) ? 1 : 0; i < MIN(want, n); i++) {
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (wc << 8) | (unsigned char)*s++;
-	}
-	if (i < want) {
-		/* Incomplete multibyte sequence */
-		es->set = set;
-		es->want = want - i;
-		es->ch = wc;
-		return ((size_t)-2);
-	}
-	wc = (wc & ~CEI->mask) | CEI->bits[set];
-	if (pwc != NULL)
-		*pwc = wc;
-	es->want = 0;
-	return (wc == L'\0' ? 0 : s - os);
-}
-
-static size_t
-_EUC_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_EucState *es;
-	wchar_t m, nm;
-	int i, len;
-
-	es = (_EucState *)ps;
-
-	if (es->want != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-
-	m = wc & CEI->mask;
-	nm = wc & ~m;
-
-	if (m == CEI->bits[1]) {
-CodeSet1:
-		/* Codeset 1: The first byte must have 0x80 in it. */
-		i = len = CEI->count[1];
-		while (i-- > 0)
-			*s++ = (nm >> (i << 3)) | 0x80;
-	} else {
-		if (m == CEI->bits[0])
-			i = len = CEI->count[0];
-		else if (m == CEI->bits[2]) {
-			i = len = CEI->count[2];
-			*s++ = _SS2;
-			--i;
-			/* SS2 designates G2 into GR */
-			nm |= GR_BITS;
-		} else if (m == CEI->bits[3]) {
-			i = len = CEI->count[3];
-			*s++ = _SS3;
-			--i;
-			/* SS3 designates G3 into GR */
-			nm |= GR_BITS;
-		} else
-			goto CodeSet1;	/* Bletch */
-		while (i-- > 0)
-			*s++ = (nm >> (i << 3)) & 0xff;
-	}
-	return (len);
-}
diff --git a/lib/libc_bsd/locale/fix_grouping.c b/lib/libc_bsd/locale/fix_grouping.c
deleted file mode 100644
index 783af20..0000000
--- a/lib/libc_bsd/locale/fix_grouping.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2001 Alexey Zelkin <phantom@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/fix_grouping.c 116875 2003-06-26 10:46:16Z phantom $");
-
-#include <ctype.h>
-#include <limits.h>
-#include <stddef.h>
-
-static const char nogrouping[] = { CHAR_MAX, '\0' };
-
-/*
- * Internal helper used to convert grouping sequences from string
- * representation into POSIX specified form, i.e.
- *
- * "3;3;-1" -> "\003\003\177\000"
- */
-
-const char *
-__fix_locale_grouping_str(const char *str)
-{
-	char *src, *dst;
-	char n;
-
-	if (str == NULL || *str == '\0') {
-		return nogrouping;
-	}
-
-	for (src = (char*)str, dst = (char*)str; *src != '\0'; src++) {
-
-		/* input string examples: "3;3", "3;2;-1" */
-		if (*src == ';')
-			continue;
-	
-		if (*src == '-' && *(src+1) == '1') {
-			*dst++ = CHAR_MAX;
-			src++;
-			continue;
-		}
-
-		if (!isdigit((unsigned char)*src)) {
-			/* broken grouping string */
-			return nogrouping;
-		}
-
-		/* assume all numbers <= 99 */
-		n = *src - '0';
-		if (isdigit((unsigned char)*(src+1))) {
-			src++;
-			n *= 10;
-			n += *src - '0';
-		}
-
-		*dst = n;
-		/* NOTE: assume all input started with "0" as 'no grouping' */
-		if (*dst == '\0')
-			return (dst == (char*)str) ? nogrouping : str;
-		dst++;
-	}
-	*dst = '\0';
-	return str;
-}
diff --git a/lib/libc_bsd/locale/freelocale.3 b/lib/libc_bsd/locale/freelocale.3
deleted file mode 100644
index 995781d..0000000
--- a/lib/libc_bsd/locale/freelocale.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" Copyright (c) 2011 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by David Chisnall under sponsorship from
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/locale/freelocale.3 250245 2013-05-04 17:21:44Z pluknet $
-.Dd September 17, 2011
-.Dt FREELOCALE 3
-.Os
-.Sh NAME
-.Nm freelocale
-.Nd Frees a locale created with
-.Xr duplocale 3
-or
-.Xr newlocale 3
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In xlocale.h
-.Ft int
-.Fn freelocale "locale_t locale"
-.Sh DESCRIPTION
-Frees a
-.Fa locale_t .
-This relinquishes any resources held exclusively by this locale.
-Note that locales share reference-counted components,
-so a call to this function is not guaranteed to free all of the components.
-.Sh RETURN VALUES
-Returns 0 on success or -1 on error.
-.Sh SEE ALSO
-.Xr duplocale 3 ,
-.Xr localeconv 3 ,
-.Xr newlocale 3 ,
-.Xr querylocale 3 ,
-.Xr uselocale 3 ,
-.Xr xlocale 3
-.Sh STANDARDS
-The
-.Fn freelocale
-function
-differs from
-.St -p1003.1-2008
-in that its return type is
-.Vt int
-rather than
-.Vt void .
diff --git a/lib/libc_bsd/locale/gb18030.5 b/lib/libc_bsd/locale/gb18030.5
deleted file mode 100644
index b88b965..0000000
--- a/lib/libc_bsd/locale/gb18030.5
+++ /dev/null
@@ -1,78 +0,0 @@
-.\" Copyright (c) 2002, 2003 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/gb18030.5 131608 2004-07-05 06:39:03Z ru $
-.\"
-.Dd August 10, 2003
-.Dt GB18030 5
-.Os
-.Sh NAME
-.Nm gb18030
-.Nd "GB 18030 encoding method for Chinese text"
-.Sh SYNOPSIS
-.Nm ENCODING
-.Qq GB18030
-.Sh DESCRIPTION
-The
-.Nm GB18030
-encoding implements GB 18030-2000, a PRC national standard for the encoding of
-Chinese characters.
-It is a superset of the older GB\ 2312-1980 and GBK encodings,
-and incorporates Unicode's Unihan Extension A completely.
-It also provides code space for all Unicode 3.0 code points.
-.Pp
-Multibyte characters in the
-.Nm GB18030
-encoding can be one byte, two bytes, or
-four bytes long.
-There are a total of over 1.5 million code positions.
-.Pp
-.No GB\ 11383-1981 Pq Tn ASCII
-characters are represented by single bytes in the range 0x00 to 0x7F.
-.Pp
-Chinese characters are represented as either two bytes or four bytes.
-Characters that are represented by two bytes begin with a byte in the range
-0x81-0xFE and end with a byte either in the range 0x40-0x7E or 0x80-0xFE.
-.Pp
-Characters that are represented by four bytes begin with a byte in the range
-0x81-0xFE, have a second byte in the range 0x30-0x39, a third byte in the range
-0x81-0xFE and a fourth byte in the range 0x30-0x39.
-.Sh SEE ALSO
-.Xr euc 5 ,
-.Xr gb2312 5 ,
-.Xr gbk 5 ,
-.Xr utf8 5
-.Rs
-.%T "Chinese National Standard GB 18030-2000: Information Technology -- Chinese ideograms coded character set for information interchange -- Extension for the basic set"
-.%D "March 2000"
-.Re
-.Rs
-.%Q "The Unicode Consortium"
-.%T "The Unicode Standard, Version 3.0"
-.%D "2000"
-.Re
-.Sh STANDARDS
-The
-.Nm GB18030
-encoding is believed to be compatible with GB 18030-2000.
diff --git a/lib/libc_bsd/locale/gb18030.c b/lib/libc_bsd/locale/gb18030.c
deleted file mode 100644
index a4be173..0000000
--- a/lib/libc_bsd/locale/gb18030.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-/*
- * PRC National Standard GB 18030-2000 encoding of Chinese text.
- *
- * See gb18030(5) for details.
- */
-
-#include <sys/param.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/gb18030.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_GB18030_mbsinit(const mbstate_t *);
-static size_t	_GB18030_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	int	count;
-	u_char	bytes[4];
-} _GB18030State;
-
-int
-_GB18030_init(struct xlocale_ctype *l, _RuneLocale *rl)
-{
-
-	l->__mbrtowc = _GB18030_mbrtowc;
-	l->__wcrtomb = _GB18030_wcrtomb;
-	l->__mbsinit = _GB18030_mbsinit;
-	l->runes = rl;
-	l->__mb_cur_max = 4;
-	l->__mb_sb_limit = 128;
-
-	return (0);
-}
-
-static int
-_GB18030_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _GB18030State *)ps)->count == 0);
-}
-
-static size_t
-_GB18030_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
-    size_t n, mbstate_t * __restrict ps)
-{
-	_GB18030State *gs;
-	wchar_t wch;
-	int ch, len, ocount;
-	size_t ncopy;
-
-	gs = (_GB18030State *)ps;
-
-	if (gs->count < 0 || gs->count > sizeof(gs->bytes)) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	ncopy = MIN(MIN(n, MB_CUR_MAX), sizeof(gs->bytes) - gs->count);
-	memcpy(gs->bytes + gs->count, s, ncopy);
-	ocount = gs->count;
-	gs->count += ncopy;
-	s = (char *)gs->bytes;
-	n = gs->count;
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	/*
-	 * Single byte:		[00-7f]
-	 * Two byte:		[81-fe][40-7e,80-fe]
-	 * Four byte:		[81-fe][30-39][81-fe][30-39]
-	 */
-	ch = (unsigned char)*s++;
-	if (ch <= 0x7f) {
-		len = 1;
-		wch = ch;
-	} else if (ch >= 0x81 && ch <= 0xfe) {
-		wch = ch;
-		if (n < 2)
-			return ((size_t)-2);
-		ch = (unsigned char)*s++;
-		if ((ch >= 0x40 && ch <= 0x7e) || (ch >= 0x80 && ch <= 0xfe)) {
-			wch = (wch << 8) | ch;
-			len = 2;
-		} else if (ch >= 0x30 && ch <= 0x39) {
-			/*
-			 * Strip high bit off the wide character we will
-			 * eventually output so that it is positive when
-			 * cast to wint_t on 32-bit twos-complement machines.
-			 */
-			wch = ((wch & 0x7f) << 8) | ch;
-			if (n < 3)
-				return ((size_t)-2);
-			ch = (unsigned char)*s++;
-			if (ch < 0x81 || ch > 0xfe)
-				goto ilseq;
-			wch = (wch << 8) | ch;
-			if (n < 4)
-				return ((size_t)-2);
-			ch = (unsigned char)*s++;
-			if (ch < 0x30 || ch > 0x39)
-				goto ilseq;
-			wch = (wch << 8) | ch;
-			len = 4;
-		} else
-			goto ilseq;
-	} else
-		goto ilseq;
-
-	if (pwc != NULL)
-		*pwc = wch;
-	gs->count = 0;
-	return (wch == L'\0' ? 0 : len - ocount);
-ilseq:
-	errno = EILSEQ;
-	return ((size_t)-1);
-}
-
-static size_t
-_GB18030_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_GB18030State *gs;
-	size_t len;
-	int c;
-
-	gs = (_GB18030State *)ps;
-
-	if (gs->count != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if ((wc & ~0x7fffffff) != 0)
-		goto ilseq;
-	if (wc & 0x7f000000) {
-		/* Replace high bit that mbrtowc() removed. */
-		wc |= 0x80000000;
-		c = (wc >> 24) & 0xff;
-		if (c < 0x81 || c > 0xfe)
-			goto ilseq;
-		*s++ = c;
-		c = (wc >> 16) & 0xff;
-		if (c < 0x30 || c > 0x39)
-			goto ilseq;
-		*s++ = c;
-		c = (wc >> 8) & 0xff;
-		if (c < 0x81 || c > 0xfe)
-			goto ilseq;
-		*s++ = c;
-		c = wc & 0xff;
-		if (c < 0x30 || c > 0x39)
-			goto ilseq;
-		*s++ = c;
-		len = 4;
-	} else if (wc & 0x00ff0000)
-		goto ilseq;
-	else if (wc & 0x0000ff00) {
-		c = (wc >> 8) & 0xff;
-		if (c < 0x81 || c > 0xfe)
-			goto ilseq;
-		*s++ = c;
-		c = wc & 0xff;
-		if (c < 0x40 || c == 0x7f || c == 0xff)
-			goto ilseq;
-		*s++ = c;
-		len = 2;
-	} else if (wc <= 0x7f) {
-		*s++ = wc;
-		len = 1;
-	} else
-		goto ilseq;
-
-	return (len);
-ilseq:
-	errno = EILSEQ;
-	return ((size_t)-1);
-}
diff --git a/lib/libc_bsd/locale/gb2312.5 b/lib/libc_bsd/locale/gb2312.5
deleted file mode 100644
index c2b7732..0000000
--- a/lib/libc_bsd/locale/gb2312.5
+++ /dev/null
@@ -1,57 +0,0 @@
-.\" Copyright (c) 2003 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/gb2312.5 131608 2004-07-05 06:39:03Z ru $
-.\"
-.Dd November 7, 2003
-.Dt GB2312 5
-.Os
-.Sh NAME
-.Nm gb2312
-.Nd "GB2312 encoding method for Chinese text"
-.Sh SYNOPSIS
-.Nm ENCODING
-.Qq GB2312
-.Sh DESCRIPTION
-The
-.Nm GB2312
-encoding implements GB\ 2312-1980, a PRC national standard
-for the encoding of simplified Chinese characters.
-.Pp
-Multibyte characters in the GB2312
-encoding can be one byte or two bytes long.
-.No GB\ 11383-1981 Pq Tn ASCII
-characters are represented by single bytes in the range 0x00 to 0x7F.
-Simplified Chinese characters are represented by two bytes, both in
-the range 0xA1-0xFE.
-.Sh SEE ALSO
-.Xr euc 5 ,
-.Xr gb18030 5 ,
-.Xr gbk 5
-.Sh STANDARDS
-The
-.Nm GB2312
-encoding is believed to be compatible with GB\ 2312-1980.
-This standard has been superseded by GB\ 18030-2000, but is still
-in wide use.
diff --git a/lib/libc_bsd/locale/gb2312.c b/lib/libc_bsd/locale/gb2312.c
deleted file mode 100644
index b392cd4..0000000
--- a/lib/libc_bsd/locale/gb2312.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 2003 David Xu <davidxu@freebsd.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/param.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/gb2312.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_GB2312_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_GB2312_mbsinit(const mbstate_t *);
-static size_t	_GB2312_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	int	count;
-	u_char	bytes[2];
-} _GB2312State;
-
-int
-_GB2312_init(struct xlocale_ctype *l, _RuneLocale *rl)
-{
-
-	l->runes = rl;
-	l->__mbrtowc = _GB2312_mbrtowc;
-	l->__wcrtomb = _GB2312_wcrtomb;
-	l->__mbsinit = _GB2312_mbsinit;
-	l->__mb_cur_max = 2;
-	l->__mb_sb_limit = 128;
-	return (0);
-}
-
-static int
-_GB2312_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _GB2312State *)ps)->count == 0);
-}
-
-static __inline int
-_GB2312_check(const char *str, size_t n)
-{
-	const u_char *s = (const u_char *)str;
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return (-2);
-	if (s[0] >= 0xa1 && s[0] <= 0xfe) {
-		if (n < 2)
-			/* Incomplete multibyte sequence */
-			return (-2);
-		if (s[1] < 0xa1 || s[1] > 0xfe)
-			/* Invalid multibyte sequence */
-			return (-1);
-		return (2);
-	} else if (s[0] & 0x80) {
-		/* Invalid multibyte sequence */
-		return (-1);
-	} 
-	return (1);
-}
-
-static size_t
-_GB2312_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_GB2312State *gs;
-	wchar_t wc;
-	int i, len, ocount;
-	size_t ncopy;
-
-	gs = (_GB2312State *)ps;
-
-	if (gs->count < 0 || gs->count > sizeof(gs->bytes)) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	ncopy = MIN(MIN(n, MB_CUR_MAX), sizeof(gs->bytes) - gs->count);
-	memcpy(gs->bytes + gs->count, s, ncopy);
-	ocount = gs->count;
-	gs->count += ncopy;
-	s = (char *)gs->bytes;
-	n = gs->count;
-
-	if ((len = _GB2312_check(s, n)) < 0)
-		return ((size_t)len);
-	wc = 0;
-	i = len;
-	while (i-- > 0)
-		wc = (wc << 8) | (unsigned char)*s++;
-	if (pwc != NULL)
-		*pwc = wc;
-	gs->count = 0;
-	return (wc == L'\0' ? 0 : len - ocount);
-}
-
-static size_t
-_GB2312_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_GB2312State *gs;
-
-	gs = (_GB2312State *)ps;
-
-	if (gs->count != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc & 0x8000) {
-		*s++ = (wc >> 8) & 0xff;
-		*s = wc & 0xff;
-		return (2);
-	}
-	*s = wc & 0xff;
-	return (1);
-}
diff --git a/lib/libc_bsd/locale/gbk.5 b/lib/libc_bsd/locale/gbk.5
deleted file mode 100644
index 4af7607..0000000
--- a/lib/libc_bsd/locale/gbk.5
+++ /dev/null
@@ -1,63 +0,0 @@
-.\" Copyright (c) 2003 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/gbk.5 131608 2004-07-05 06:39:03Z ru $
-.\"
-.Dd August 10, 2003
-.Dt GBK 5
-.Os
-.Sh NAME
-.Nm gbk
-.Nd "Guojia biaozhun kuozhan (GBK) encoding method for Chinese text"
-.Sh SYNOPSIS
-.Nm ENCODING
-.Qq GBK
-.Sh DESCRIPTION
-GBK is a backwards-compatible extension of the GB\ 2312-1980 encoding
-method for Chinese text, which adds the characters defined in the
-Unified Han portion of the Unicode 2.1 standard.
-.Pp
-Multibyte characters in the GBK
-encoding can be one byte or two bytes long.
-.No GB\ 11383-1981 Pq Tn ASCII
-characters are represented by single bytes in the range 0x00 to 0x7F.
-Chinese characters are represented by two bytes, beginning with a byte in
-the range 0x80-0xFE and ending with a byte in the range 0x40-0xFE.
-.Sh SEE ALSO
-.Xr euc 5 ,
-.Xr gb18030 5 ,
-.Xr gb2312 5 ,
-.Xr utf8 5
-.Rs
-.%Q "The Unicode Consortium"
-.%T "The Unicode Standard, Version 2.1"
-.%D "1999"
-.Re
-.Rs
-.%T "Chinese National Standard GB 18030-2000: Information Technology -- Chinese ideograms coded character set for information interchange -- Extension for the basic set"
-.%D "March 2000"
-.Re
-.Sh STANDARDS
-GBK is not a standard, but has been superseded by
-GB\ 18030-2000.
diff --git a/lib/libc_bsd/locale/gbk.c b/lib/libc_bsd/locale/gbk.c
deleted file mode 100644
index b1a38f1..0000000
--- a/lib/libc_bsd/locale/gbk.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/gbk.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <sys/types.h>
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-extern int __mb_sb_limit;
-
-static size_t	_GBK_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_GBK_mbsinit(const mbstate_t *);
-static size_t	_GBK_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	wchar_t	ch;
-} _GBKState;
-
-int
-_GBK_init(struct xlocale_ctype *l, _RuneLocale *rl)
-{
-
-	l->__mbrtowc = _GBK_mbrtowc;
-	l->__wcrtomb = _GBK_wcrtomb;
-	l->__mbsinit = _GBK_mbsinit;
-	l->runes = rl;
-	l->__mb_cur_max = 2;
-	l->__mb_sb_limit = 128;
-	return (0);
-}
-
-static int
-_GBK_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _GBKState *)ps)->ch == 0);
-}
-
-static __inline int
-_gbk_check(u_int c)
-{
-
-	c &= 0xff;
-	return ((c >= 0x81 && c <= 0xfe) ? 2 : 1);
-}
-
-static size_t
-_GBK_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_GBKState *gs;
-	wchar_t wc;
-	size_t len;
-
-	gs = (_GBKState *)ps;
-
-	if ((gs->ch & ~0xFF) != 0) {
-		/* Bad conversion state. */
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	if (gs->ch != 0) {
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (gs->ch << 8) | (*s & 0xFF);
-		if (pwc != NULL)
-			*pwc = wc;
-		gs->ch = 0;
-		return (1);
-	}
-
-	len = (size_t)_gbk_check(*s);
-	wc = *s++ & 0xff;
-	if (len == 2) {
-		if (n < 2) {
-			/* Incomplete multibyte sequence */
-			gs->ch = wc;
-			return ((size_t)-2);
-		}
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (wc << 8) | (*s++ & 0xff);
-		if (pwc != NULL)
-			*pwc = wc;
-                return (2);
-	} else {
-		if (pwc != NULL)
-			*pwc = wc;
-		return (wc == L'\0' ? 0 : 1);
-	}
-}
-
-static size_t
-_GBK_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_GBKState *gs;
-
-	gs = (_GBKState *)ps;
-
-	if (gs->ch != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc & 0x8000) {
-		*s++ = (wc >> 8) & 0xff;
-		*s = wc & 0xff;
-		return (2);
-	}
-	*s = wc & 0xff;
-	return (1);
-}
diff --git a/lib/libc_bsd/locale/isalnum.3 b/lib/libc_bsd/locale/isalnum.3
deleted file mode 100644
index 707646d..0000000
--- a/lib/libc_bsd/locale/isalnum.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)isalnum.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isalnum.3 233992 2012-04-07 09:05:30Z joel $
-.\"
-.Dd July 17, 2005
-.Dt ISALNUM 3
-.Os
-.Sh NAME
-.Nm isalnum
-.Nd alphanumeric character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isalnum "int c"
-.Ft int
-.Fn isalnum_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn isalnum
-function tests for any character for which
-.Xr isalpha 3
-or
-.Xr isdigit 3
-is true.
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-In the ASCII character set, this includes the following characters
-(with their numeric values shown in octal):
-.Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It "\&060\ ``0''" Ta "061\ ``1''" Ta "062\ ``2''" Ta "063\ ``3''" Ta "064\ ``4''"
-.It "\&065\ ``5''" Ta "066\ ``6''" Ta "067\ ``7''" Ta "070\ ``8''" Ta "071\ ``9''"
-.It "\&101\ ``A''" Ta "102\ ``B''" Ta "103\ ``C''" Ta "104\ ``D''" Ta "105\ ``E''"
-.It "\&106\ ``F''" Ta "107\ ``G''" Ta "110\ ``H''" Ta "111\ ``I''" Ta "112\ ``J''"
-.It "\&113\ ``K''" Ta "114\ ``L''" Ta "115\ ``M''" Ta "116\ ``N''" Ta "117\ ``O''"
-.It "\&120\ ``P''" Ta "121\ ``Q''" Ta "122\ ``R''" Ta "123\ ``S''" Ta "124\ ``T''"
-.It "\&125\ ``U''" Ta "126\ ``V''" Ta "127\ ``W''" Ta "130\ ``X''" Ta "131\ ``Y''"
-.It "\&132\ ``Z''" Ta "141\ ``a''" Ta "142\ ``b''" Ta "143\ ``c''" Ta "144\ ``d''"
-.It "\&145\ ``e''" Ta "146\ ``f''" Ta "147\ ``g''" Ta "150\ ``h''" Ta "151\ ``i''"
-.It "\&152\ ``j''" Ta "153\ ``k''" Ta "154\ ``l''" Ta "155\ ``m''" Ta "156\ ``n''"
-.It "\&157\ ``o''" Ta "160\ ``p''" Ta "161\ ``q''" Ta "162\ ``r''" Ta "163\ ``s''"
-.It "\&164\ ``t''" Ta "165\ ``u''" Ta "166\ ``v''" Ta "167\ ``w''" Ta "170\ ``x''"
-.It "\&171\ ``y''" Ta "172\ ``z''" Ta \& Ta \& Ta \&
-.El
-.Pp
-The
-.Fn isalnum_l
-function takes an explicit locale argument, whereas the
-.Fn isalnum
-function uses the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn isalnum
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswalnum
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isalpha 3 ,
-.Xr isdigit 3 ,
-.Xr iswalnum 3 ,
-.Xr xlocale 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isalnum
-function conforms to
-.St -isoC .
-The
-.Fn isalnum_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/isalpha.3 b/lib/libc_bsd/locale/isalpha.3
deleted file mode 100644
index 0c5ad3b..0000000
--- a/lib/libc_bsd/locale/isalpha.3
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)isalpha.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isalpha.3 233992 2012-04-07 09:05:30Z joel $
-.\"
-.Dd July 17, 2005
-.Dt ISALPHA 3
-.Os
-.Sh NAME
-.Nm isalpha
-.Nd alphabetic character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isalpha "int c"
-.Ft int
-.Fn isalpha_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn isalpha
-function tests for any character for which
-.Xr isupper 3
-or
-.Xr islower 3
-is true.
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-In the ASCII character set, this includes the following characters
-(with their numeric values shown in octal):
-.Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It "\&101\ ``A''" Ta "102\ ``B''" Ta "103\ ``C''" Ta "104\ ``D''" Ta "105\ ``E''"
-.It "\&106\ ``F''" Ta "107\ ``G''" Ta "110\ ``H''" Ta "111\ ``I''" Ta "112\ ``J''"
-.It "\&113\ ``K''" Ta "114\ ``L''" Ta "115\ ``M''" Ta "116\ ``N''" Ta "117\ ``O''"
-.It "\&120\ ``P''" Ta "121\ ``Q''" Ta "122\ ``R''" Ta "123\ ``S''" Ta "124\ ``T''"
-.It "\&125\ ``U''" Ta "126\ ``V''" Ta "127\ ``W''" Ta "130\ ``X''" Ta "131\ ``Y''"
-.It "\&132\ ``Z''" Ta "141\ ``a''" Ta "142\ ``b''" Ta "143\ ``c''" Ta "144\ ``d''"
-.It "\&145\ ``e''" Ta "146\ ``f''" Ta "147\ ``g''" Ta "150\ ``h''" Ta "151\ ``i''"
-.It "\&152\ ``j''" Ta "153\ ``k''" Ta "154\ ``l''" Ta "155\ ``m''" Ta "156\ ``n''"
-.It "\&157\ ``o''" Ta "160\ ``p''" Ta "161\ ``q''" Ta "162\ ``r''" Ta "163\ ``s''"
-.It "\&164\ ``t''" Ta "165\ ``u''" Ta "166\ ``v''" Ta "167\ ``w''" Ta "170\ ``x''"
-.It "\&171\ ``y''" Ta "172\ ``z''" Ta \& Ta \& Ta \&
-.El
-.Pp
-The
-.Fn isalpha_l
-function takes an explicit locale argument, whereas the
-.Fn isalpha
-function uses the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn isalpha
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswalpha
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr islower 3 ,
-.Xr isupper 3 ,
-.Xr iswalpha 3 ,
-.Xr xlocale 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isalpha
-function conforms to
-.St -isoC .
-The
-.Fn isalpha_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/isascii.3 b/lib/libc_bsd/locale/isascii.3
deleted file mode 100644
index 453d752..0000000
--- a/lib/libc_bsd/locale/isascii.3
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)isascii.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isascii.3 196820 2009-09-04 07:44:58Z des $
-.\"
-.Dd October 6, 2002
-.Dt ISASCII 3
-.Os
-.Sh NAME
-.Nm isascii
-.Nd test for ASCII character
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isascii "int c"
-.Sh DESCRIPTION
-The
-.Fn isascii
-function tests for an
-.Tn ASCII
-character, which is any character
-between 0 and octal 0177 inclusive.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswascii 3 ,
-.Xr ascii 7
diff --git a/lib/libc_bsd/locale/isblank.3 b/lib/libc_bsd/locale/isblank.3
deleted file mode 100644
index 6371351..0000000
--- a/lib/libc_bsd/locale/isblank.3
+++ /dev/null
@@ -1,96 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)isblank.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isblank.3 248803 2013-03-27 21:31:40Z jilles $
-.\"
-.Dd July 17, 2005
-.Dt ISBLANK 3
-.Os
-.Sh NAME
-.Nm isblank
-.Nd space or tab character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isblank "int c"
-.Ft int
-.Fn isblank_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn isblank
-function tests for a space or tab character.
-For any locale, this includes the following standard characters:
-.Bl -column XXXX
-.It Do \et Dc Ta Dq " "
-.El
-.Pp
-In the "C" locale, a successful
-.Fn isblank
-test is limited to these characters only.
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-The
-.Fn isblank_l
-function takes an explicit locale argument, whereas the
-.Fn isblank
-function uses the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn isblank
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswblank
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswblank 3 ,
-.Xr xlocale 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isblank
-function
-conforms to
-.St -isoC-99 .
-The
-.Fn isblank_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/iscntrl.3 b/lib/libc_bsd/locale/iscntrl.3
deleted file mode 100644
index b5a9696..0000000
--- a/lib/libc_bsd/locale/iscntrl.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)iscntrl.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/iscntrl.3 233992 2012-04-07 09:05:30Z joel $
-.\"
-.Dd July 17, 2005
-.Dt ISCNTRL 3
-.Os
-.Sh NAME
-.Nm iscntrl
-.Nd control character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn iscntrl "int c"
-.Ft int
-.Fn iscntrl_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn iscntrl
-function tests for any control character.
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-In the ASCII character set, this includes the following characters
-(with their numeric values shown in octal):
-.Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It "\&000\ NUL" Ta "001\ SOH" Ta "002\ STX" Ta "003\ ETX" Ta "004\ EOT"
-.It "\&005\ ENQ" Ta "006\ ACK" Ta "007\ BEL" Ta "010\ BS" Ta "011\ HT"
-.It "\&012\ NL" Ta "013\ VT" Ta "014\ NP" Ta "015\ CR" Ta "016\ SO"
-.It "\&017\ SI" Ta "020\ DLE" Ta "021\ DC1" Ta "022\ DC2" Ta "023\ DC3"
-.It "\&024\ DC4" Ta "025\ NAK" Ta "026\ SYN" Ta "027\ ETB" Ta "030\ CAN"
-.It "\&031\ EM" Ta "032\ SUB" Ta "033\ ESC" Ta "034\ FS" Ta "035\ GS"
-.It "\&036\ RS" Ta "037\ US" Ta "177\ DEL" Ta \& Ta \&
-.El
-.Pp
-The
-.Fn iscntrl_l
-function takes an explicit locale argument, whereas the
-.Fn iscntrl
-function uses the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn iscntrl
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswcntrl
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswcntrl 3 ,
-.Xr xlocale 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn iscntrl
-function conforms to
-.St -isoC .
-The
-.Fn iscntrl_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/isctype.c b/lib/libc_bsd/locale/isctype.c
deleted file mode 100644
index 3a317ef..0000000
--- a/lib/libc_bsd/locale/isctype.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)isctype.c	8.3 (Berkeley) 2/24/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/isctype.c 172619 2007-10-13 16:28:22Z ache $");
-
-#include <ctype.h>
-
-#undef digittoint
-int
-digittoint(c)
-	int c;
-{
-	return (__sbmaskrune(c, 0xFF));
-}
-
-#undef isalnum
-int
-isalnum(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_A|_CTYPE_D));
-}
-
-#undef isalpha
-int
-isalpha(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_A));
-}
-
-#undef isascii
-int
-isascii(c)
-	int c;
-{
-	return ((c & ~0x7F) == 0);
-}
-
-#undef isblank
-int
-isblank(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_B));
-}
-
-#undef iscntrl
-int
-iscntrl(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_C));
-}
-
-#undef isdigit
-int
-isdigit(c)
-	int c;
-{
-	return (__isctype(c, _CTYPE_D));
-}
-
-#undef isgraph
-int
-isgraph(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_G));
-}
-
-#undef ishexnumber 
-int
-ishexnumber(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_X));
-}
-
-#undef isideogram
-int
-isideogram(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_I));
-}
-
-#undef islower
-int
-islower(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_L));
-}
-
-#undef isnumber
-int
-isnumber(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_D));
-}
-
-#undef isphonogram	
-int
-isphonogram(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_Q));
-}
-
-#undef isprint
-int
-isprint(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_R));
-}
-
-#undef ispunct
-int
-ispunct(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_P));
-}
-
-#undef isrune
-int
-isrune(c)
-	int c;
-{
-	return (__sbistype(c, 0xFFFFFF00L));
-}
-
-#undef isspace
-int
-isspace(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_S));
-}
-
-#undef isspecial
-int
-isspecial(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_T));
-}
-
-#undef isupper
-int
-isupper(c)
-	int c;
-{
-	return (__sbistype(c, _CTYPE_U));
-}
-
-#undef isxdigit
-int
-isxdigit(c)
-	int c;
-{
-	return (__isctype(c, _CTYPE_X));
-}
-
-#undef toascii
-int
-toascii(c)
-	int c;
-{
-	return (c & 0x7F);
-}
-
-#undef tolower
-int
-tolower(c)
-	int c;
-{
-	return (__sbtolower(c));
-}
-
-#undef toupper
-int
-toupper(c)
-	int c;
-{
-	return (__sbtoupper(c));
-}
-
diff --git a/lib/libc_bsd/locale/isdigit.3 b/lib/libc_bsd/locale/isdigit.3
deleted file mode 100644
index 573838f..0000000
--- a/lib/libc_bsd/locale/isdigit.3
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)isdigit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isdigit.3 233992 2012-04-07 09:05:30Z joel $
-.\"
-.Dd May 4, 2007
-.Dt ISDIGIT 3
-.Os
-.Sh NAME
-.Nm isdigit, isnumber
-.Nd decimal-digit character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isdigit "int c"
-.Ft int
-.Fn isnumber "int c"
-.Ft int
-.Fn isdigit_l "int c" "locale_t loc"
-.Ft int
-.Fn isnumber_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn isdigit
-function tests for a decimal digit character.
-Regardless of locale, this includes the following characters only:
-.Bl -column \&``0''______ \&``0''______ \&``0''______ \&``0''______ \&``0''______
-.It "\&``0''" Ta "``1''" Ta "``2''" Ta "``3''" Ta "``4''"
-.It "\&``5''" Ta "``6''" Ta "``7''" Ta "``8''" Ta "``9''"
-.El
-.Pp
-The
-.Fn isnumber
-function behaves similarly to
-.Fn isdigit ,
-but may recognize additional characters, depending on the current locale
-setting.
-.Pp
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-The _l-suffixed versions take an explicit locale argument, whereas the
-non-suffixed versions use the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn isdigit
-and
-.Fn isnumber
-functions return zero if the character tests false and
-return non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswdigit
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswdigit 3 ,
-.Xr multibyte 3 ,
-.Xr xlocale 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isdigit
-function conforms to
-.St -isoC .
-The
-.Fn isdigit_l
-function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn isnumber
-function appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/locale/isgraph.3 b/lib/libc_bsd/locale/isgraph.3
deleted file mode 100644
index 88a12e4..0000000
--- a/lib/libc_bsd/locale/isgraph.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)isgraph.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isgraph.3 238919 2012-07-30 20:56:19Z issyl0 $
-.\"
-.Dd July 30, 2012
-.Dt ISGRAPH 3
-.Os
-.Sh NAME
-.Nm isgraph
-.Nd printing character test (space character exclusive)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isgraph "int c"
-.Ft int
-.Fn isgraph_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn isgraph
-function tests for any printing character except space
-.Pq Ql "\~"
-and other
-locale-specific space-like characters.
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-In the ASCII character set, this includes the following characters
-(with their numeric values shown in octal):
-.Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It "\&041\ ``!''" Ta "042\ ``""''" Ta "043\ ``#''" Ta "044\ ``$''" Ta "045\ ``%''"
-.It "\&046\ ``&''" Ta "047\ ``'''" Ta "050\ ``(''" Ta "051\ ``)''" Ta "052\ ``*''"
-.It "\&053\ ``+''" Ta "054\ ``,''" Ta "055\ ``-''" Ta "056\ ``.''" Ta "057\ ``/''"
-.It "\&060\ ``0''" Ta "061\ ``1''" Ta "062\ ``2''" Ta "063\ ``3''" Ta "064\ ``4''"
-.It "\&065\ ``5''" Ta "066\ ``6''" Ta "067\ ``7''" Ta "070\ ``8''" Ta "071\ ``9''"
-.It "\&072\ ``:''" Ta "073\ ``;''" Ta "074\ ``<''" Ta "075\ ``=''" Ta "076\ ``>''"
-.It "\&077\ ``?''" Ta "100\ ``@''" Ta "101\ ``A''" Ta "102\ ``B''" Ta "103\ ``C''"
-.It "\&104\ ``D''" Ta "105\ ``E''" Ta "106\ ``F''" Ta "107\ ``G''" Ta "110\ ``H''"
-.It "\&111\ ``I''" Ta "112\ ``J''" Ta "113\ ``K''" Ta "114\ ``L''" Ta "115\ ``M''"
-.It "\&116\ ``N''" Ta "117\ ``O''" Ta "120\ ``P''" Ta "121\ ``Q''" Ta "122\ ``R''"
-.It "\&123\ ``S''" Ta "124\ ``T''" Ta "125\ ``U''" Ta "126\ ``V''" Ta "127\ ``W''"
-.It "\&130\ ``X''" Ta "131\ ``Y''" Ta "132\ ``Z''" Ta "133\ ``[''" Ta "134\ ``\e\|''"
-.It "\&135\ ``]''" Ta "136\ ``^''" Ta "137\ ``_''" Ta "140\ ```''" Ta "141\ ``a''"
-.It "\&142\ ``b''" Ta "143\ ``c''" Ta "144\ ``d''" Ta "145\ ``e''" Ta "146\ ``f''"
-.It "\&147\ ``g''" Ta "150\ ``h''" Ta "151\ ``i''" Ta "152\ ``j''" Ta "153\ ``k''"
-.It "\&154\ ``l''" Ta "155\ ``m''" Ta "156\ ``n''" Ta "157\ ``o''" Ta "160\ ``p''"
-.It "\&161\ ``q''" Ta "162\ ``r''" Ta "163\ ``s''" Ta "164\ ``t''" Ta "165\ ``u''"
-.It "\&166\ ``v''" Ta "167\ ``w''" Ta "170\ ``x''" Ta "171\ ``y''" Ta "172\ ``z''"
-.It "\&173\ ``{''" Ta "174\ ``|''" Ta "175\ ``}''" Ta "176\ ``~''" Ta \&
-.El
-.Pp
-The
-.Fn isgraph_l
-function takes an explicit locale argument, whereas the
-.Fn isgraph
-function uses the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn isgraph
-and
-.Fn isgraph_l
-functions return zero if the character tests false and
-return non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswgraph
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswgraph 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isgraph
-function conforms to
-.St -isoC .
-The
-.Fn isgraph_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/isideogram.3 b/lib/libc_bsd/locale/isideogram.3
deleted file mode 100644
index 87be742..0000000
--- a/lib/libc_bsd/locale/isideogram.3
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"
-.\" Copyright (c) 2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/isideogram.3 196820 2009-09-04 07:44:58Z des $
-.\"
-.Dd March 30, 2004
-.Dt ISIDEOGRAM 3
-.Os
-.Sh NAME
-.Nm isideogram
-.Nd ideographic character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isideogram "int c"
-.Sh DESCRIPTION
-The
-.Fn isideogram
-function tests for an ideographic character.
-.Sh RETURN VALUES
-The
-.Fn isideogram
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isphonogram 3 ,
-.Xr iswideogram 3
-.Sh HISTORY
-The
-.Fn isideogram
-function appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/locale/islower.3 b/lib/libc_bsd/locale/islower.3
deleted file mode 100644
index 817dac8..0000000
--- a/lib/libc_bsd/locale/islower.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)islower.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/islower.3 238920 2012-07-30 21:02:44Z joel $
-.\"
-.Dd July 30, 2012
-.Dt ISLOWER 3
-.Os
-.Sh NAME
-.Nm islower
-.Nd lower-case character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn islower "int c"
-.Ft int
-.Fn islower_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn islower
-function tests for any lower-case letters.
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-In the ASCII character set, this includes the following characters
-(with their numeric values shown in octal):
-.Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It "\&141\ ``a''" Ta "142\ ``b''" Ta "143\ ``c''" Ta "144\ ``d''" Ta "145\ ``e''"
-.It "\&146\ ``f''" Ta "147\ ``g''" Ta "150\ ``h''" Ta "151\ ``i''" Ta "152\ ``j''"
-.It "\&153\ ``k''" Ta "154\ ``l''" Ta "155\ ``m''" Ta "156\ ``n''" Ta "157\ ``o''"
-.It "\&160\ ``p''" Ta "161\ ``q''" Ta "162\ ``r''" Ta "163\ ``s''" Ta "164\ ``t''"
-.It "\&165\ ``u''" Ta "166\ ``v''" Ta "167\ ``w''" Ta "170\ ``x''" Ta "171\ ``y''"
-.It "\&172\ ``z''" Ta \& Ta \& Ta \& Ta \&
-.El
-The
-.Fn islower_l
-function takes an explicit locale argument, whereas the
-.Fn islower
-function uses the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn islower
-and
-.Fn islower_l
-functions return zero if the character tests false and
-return non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswlower
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswlower 3 ,
-.Xr tolower 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn islower
-function conforms to
-.St -isoC .
-The
-.Fn islower_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/isphonogram.3 b/lib/libc_bsd/locale/isphonogram.3
deleted file mode 100644
index 5eda8fc..0000000
--- a/lib/libc_bsd/locale/isphonogram.3
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"
-.\" Copyright (c) 2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/isphonogram.3 196820 2009-09-04 07:44:58Z des $
-.\"
-.Dd March 30, 2004
-.Dt ISPHONOGRAM 3
-.Os
-.Sh NAME
-.Nm isphonogram
-.Nd phonographic character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isphonogram "int c"
-.Sh DESCRIPTION
-The
-.Fn isphonogram
-function tests for a phonographic character.
-.Sh RETURN VALUES
-The
-.Fn isphonogram
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isideogram 3 ,
-.Xr iswphonogram 3
-.Sh HISTORY
-The
-.Fn isphonogram
-function appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/locale/isprint.3 b/lib/libc_bsd/locale/isprint.3
deleted file mode 100644
index 96946ae..0000000
--- a/lib/libc_bsd/locale/isprint.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)isprint.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isprint.3 233992 2012-04-07 09:05:30Z joel $
-.\"
-.Dd July 17, 2005
-.Dt ISPRINT 3
-.Os
-.Sh NAME
-.Nm isprint
-.Nd printing character test (space character inclusive)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isprint "int c"
-.Sh DESCRIPTION
-The
-.Fn isprint
-function tests for any printing character, including space
-.Pq Ql "\ " .
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-In the ASCII character set, this includes the following characters
-(with their numeric values shown in octal):
-.Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It "\&040\ sp" Ta "041\ ``!''" Ta "042\ ``""''" Ta "043\ ``#''" Ta "044\ ``$''"
-.It "\&045\ ``%''" Ta "046\ ``&''" Ta "047\ ``'''" Ta "050\ ``(''" Ta "051\ ``)''"
-.It "\&052\ ``*''" Ta "053\ ``+''" Ta "054\ ``,''" Ta "055\ ``-''" Ta "056\ ``.''"
-.It "\&057\ ``/''" Ta "060\ ``0''" Ta "061\ ``1''" Ta "062\ ``2''" Ta "063\ ``3''"
-.It "\&064\ ``4''" Ta "065\ ``5''" Ta "066\ ``6''" Ta "067\ ``7''" Ta "070\ ``8''"
-.It "\&071\ ``9''" Ta "072\ ``:''" Ta "073\ ``;''" Ta "074\ ``<''" Ta "075\ ``=''"
-.It "\&076\ ``>''" Ta "077\ ``?''" Ta "100\ ``@''" Ta "101\ ``A''" Ta "102\ ``B''"
-.It "\&103\ ``C''" Ta "104\ ``D''" Ta "105\ ``E''" Ta "106\ ``F''" Ta "107\ ``G''"
-.It "\&110\ ``H''" Ta "111\ ``I''" Ta "112\ ``J''" Ta "113\ ``K''" Ta "114\ ``L''"
-.It "\&115\ ``M''" Ta "116\ ``N''" Ta "117\ ``O''" Ta "120\ ``P''" Ta "121\ ``Q''"
-.It "\&122\ ``R''" Ta "123\ ``S''" Ta "124\ ``T''" Ta "125\ ``U''" Ta "126\ ``V''"
-.It "\&127\ ``W''" Ta "130\ ``X''" Ta "131\ ``Y''" Ta "132\ ``Z''" Ta "133\ ``[''"
-.It "\&134\ ``\e\|''" Ta "135\ ``]''" Ta "136\ ``^''" Ta "137\ ``_''" Ta "140\ ```''"
-.It "\&141\ ``a''" Ta "142\ ``b''" Ta "143\ ``c''" Ta "144\ ``d''" Ta "145\ ``e''"
-.It "\&146\ ``f''" Ta "147\ ``g''" Ta "150\ ``h''" Ta "151\ ``i''" Ta "152\ ``j''"
-.It "\&153\ ``k''" Ta "154\ ``l''" Ta "155\ ``m''" Ta "156\ ``n''" Ta "157\ ``o''"
-.It "\&160\ ``p''" Ta "161\ ``q''" Ta "162\ ``r''" Ta "163\ ``s''" Ta "164\ ``t''"
-.It "\&165\ ``u''" Ta "166\ ``v''" Ta "167\ ``w''" Ta "170\ ``x''" Ta "171\ ``y''"
-.It "\&172\ ``z''" Ta "173\ ``{''" Ta "174\ ``|''" Ta "175\ ``}''" Ta "176\ ``~''"
-.El
-.Sh RETURN VALUES
-The
-.Fn isprint
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswprint
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswprint 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isprint
-function conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/locale/ispunct.3 b/lib/libc_bsd/locale/ispunct.3
deleted file mode 100644
index d3b6b41..0000000
--- a/lib/libc_bsd/locale/ispunct.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)ispunct.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/ispunct.3 238919 2012-07-30 20:56:19Z issyl0 $
-.\"
-.Dd July 30, 2012
-.Dt ISPUNCT 3
-.Os
-.Sh NAME
-.Nm ispunct
-.Nd punctuation character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn ispunct "int c"
-.Ft int
-.Fn ispunct_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn ispunct
-function tests for any printing character except for space
-.Pq Ql "\ "
-or a
-character for which
-.Xr isalnum 3
-is true.
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-In the ASCII character set, this includes the following characters
-(with their numeric values shown in octal):
-.Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It "\&041\ ``!''" Ta "042\ ``""''" Ta "043\ ``#''" Ta "044\ ``$''" Ta "045\ ``%''"
-.It "\&046\ ``&''" Ta "047\ ``'''" Ta "050\ ``(''" Ta "051\ ``)''" Ta "052\ ``*''"
-.It "\&053\ ``+''" Ta "054\ ``,''" Ta "055\ ``-''" Ta "056\ ``.''" Ta "057\ ``/''"
-.It "\&072\ ``:''" Ta "073\ ``;''" Ta "074\ ``<''" Ta "075\ ``=''" Ta "076\ ``>''"
-.It "\&077\ ``?''" Ta "100\ ``@''" Ta "133\ ``[''" Ta "134\ ``\e\|''" Ta "135\ ``]''"
-.It "\&136\ ``^''" Ta "137\ ``_''" Ta "140\ ```''" Ta "173\ ``{''" Ta "174\ ``|''"
-.It "\&175\ ``}''" Ta "176\ ``~''" Ta \& Ta \& Ta \&
-.El
-.Pp
-The
-.Fn ispunct_l
-function takes an explicit locale argument, whereas the
-.Fn ispunct
-function uses the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn ispunct
-and
-.Fn ispunct_l
-functions return zero if the character tests false and
-return non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswpunct
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswpunct 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn ispunct
-function conforms to
-.St -isoC .
-The
-.Fn ispunct_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/isrune.3 b/lib/libc_bsd/locale/isrune.3
deleted file mode 100644
index 1f45695..0000000
--- a/lib/libc_bsd/locale/isrune.3
+++ /dev/null
@@ -1,63 +0,0 @@
-.\"
-.\" Copyright (c) 2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/isrune.3 196820 2009-09-04 07:44:58Z des $
-.\"
-.Dd March 30, 2004
-.Dt ISRUNE 3
-.Os
-.Sh NAME
-.Nm isrune
-.Nd valid character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isrune "int c"
-.Sh DESCRIPTION
-The
-.Fn isrune
-function tests for any character that is valid in the current
-character set.
-In the
-.Tn ASCII
-character set, this is equivalent to
-.Fn isascii .
-.Sh RETURN VALUES
-The
-.Fn isrune
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isascii 3 ,
-.Xr iswrune 3 ,
-.Xr ascii 7
-.Sh HISTORY
-The
-.Fn isrune
-function appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/locale/isspace.3 b/lib/libc_bsd/locale/isspace.3
deleted file mode 100644
index 05177f1..0000000
--- a/lib/libc_bsd/locale/isspace.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)isspace.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isspace.3 238919 2012-07-30 20:56:19Z issyl0 $
-.\"
-.Dd July 30, 2012
-.Dt ISSPACE 3
-.Os
-.Sh NAME
-.Nm isspace
-.Nd white-space character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isspace "int c"
-.Ft int
-.Fn isspace_l "int c" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn isspace
-function tests for white-space characters.
-For any locale, this includes the following standard characters:
-.Bl -column \&`\et''___ \&``\et''___ \&``\et''___ \&``\et''___ \&``\et''___ \&``\et''___
-.It "\&``\et''" Ta "``\en''" Ta "``\ev''" Ta "``\ef''" Ta "``\er''" Ta "`` ''"
-.El
-.Pp
-In the "C" locale,
-.Fn isspace
-returns non-zero for these characters only.
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-The
-.Fn isspace_l
-function takes an explicit locale argument, whereas the
-.Fn isspace
-function uses the current global or per-thread locale.
-.Sh RETURN VALUES
-The
-.Fn isspace
-and
-.Fn isspace_l
-functions return zero if the character tests false and
-return non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswspace
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswspace 3 ,
-.Xr multibyte 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isspace
-function conforms to
-.St -isoC .
-The
-.Fn isspace_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/isspecial.3 b/lib/libc_bsd/locale/isspecial.3
deleted file mode 100644
index 42214d5..0000000
--- a/lib/libc_bsd/locale/isspecial.3
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"
-.\" Copyright (c) 2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/isspecial.3 196820 2009-09-04 07:44:58Z des $
-.\"
-.Dd March 30, 2004
-.Dt ISSPECIAL 3
-.Os
-.Sh NAME
-.Nm isspecial
-.Nd special character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isspecial "int c"
-.Sh DESCRIPTION
-The
-.Fn isspecial
-function tests for a special character.
-.Sh RETURN VALUES
-The
-.Fn isspecial
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswspecial 3
-.Sh HISTORY
-The
-.Fn isspecial
-function appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/locale/isupper.3 b/lib/libc_bsd/locale/isupper.3
deleted file mode 100644
index 7875118..0000000
--- a/lib/libc_bsd/locale/isupper.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)isupper.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isupper.3 233992 2012-04-07 09:05:30Z joel $
-.\"
-.Dd July 17, 2005
-.Dt ISUPPER 3
-.Os
-.Sh NAME
-.Nm isupper
-.Nd upper-case character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isupper "int c"
-.Sh DESCRIPTION
-The
-.Fn isupper
-function tests for any upper-case letter.
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Pp
-In the ASCII character set, this includes the following characters
-(with their numeric values shown in octal):
-.Bl -column \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__ \&000_``0''__
-.It "\&101\ ``A''" Ta "102\ ``B''" Ta "103\ ``C''" Ta "104\ ``D''" Ta "105\ ``E''"
-.It "\&106\ ``F''" Ta "107\ ``G''" Ta "110\ ``H''" Ta "111\ ``I''" Ta "112\ ``J''"
-.It "\&113\ ``K''" Ta "114\ ``L''" Ta "115\ ``M''" Ta "116\ ``N''" Ta "117\ ``O''"
-.It "\&120\ ``P''" Ta "121\ ``Q''" Ta "122\ ``R''" Ta "123\ ``S''" Ta "124\ ``T''"
-.It "\&125\ ``U''" Ta "126\ ``V''" Ta "127\ ``W''" Ta "130\ ``X''" Ta "131\ ``Y''"
-.It "\&132\ ``Z''" Ta \& Ta \& Ta \& Ta \&
-.El
-.Sh RETURN VALUES
-The
-.Fn isupper
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswupper
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswupper 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isupper
-function conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/locale/iswalnum.3 b/lib/libc_bsd/locale/iswalnum.3
deleted file mode 100644
index e61098a..0000000
--- a/lib/libc_bsd/locale/iswalnum.3
+++ /dev/null
@@ -1,158 +0,0 @@
-.\"	$NetBSD: iswalnum.3,v 1.5 2002/07/10 14:46:10 yamt Exp $
-.\"
-.\" Copyright (c) 1991 The Regents of the University of California.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)isalnum.3	5.2 (Berkeley) 6/29/91
-.\" $FreeBSD: releng/10.2/lib/libc/locale/iswalnum.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd October 3, 2002
-.Dt ISWALNUM 3
-.Os
-.Sh NAME
-.Nm iswalnum ,
-.Nm iswalpha ,
-.Nm iswascii ,
-.Nm iswblank ,
-.Nm iswcntrl ,
-.Nm iswdigit ,
-.Nm iswgraph ,
-.Nm iswhexnumber ,
-.Nm iswideogram ,
-.Nm iswlower ,
-.Nm iswnumber ,
-.Nm iswphonogram ,
-.Nm iswprint ,
-.Nm iswpunct ,
-.Nm iswrune ,
-.Nm iswspace ,
-.Nm iswspecial ,
-.Nm iswupper ,
-.Nm iswxdigit
-.Nd wide character classification utilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wctype.h
-.Ft int
-.Fn iswalnum "wint_t wc"
-.Ft int
-.Fn iswalpha "wint_t wc"
-.Ft int
-.Fn iswascii "wint_t wc"
-.Ft int
-.Fn iswblank "wint_t wc"
-.Ft int
-.Fn iswcntrl "wint_t wc"
-.Ft int
-.Fn iswdigit "wint_t wc"
-.Ft int
-.Fn iswgraph "wint_t wc"
-.Ft int
-.Fn iswhexnumber "wint_t wc"
-.Ft int
-.Fn iswideogram "wint_t wc"
-.Ft int
-.Fn iswlower "wint_t wc"
-.Ft int
-.Fn iswnumber "wint_t wc"
-.Ft int
-.Fn iswphonogram "wint_t wc"
-.Ft int
-.Fn iswprint "wint_t wc"
-.Ft int
-.Fn iswpunct "wint_t wc"
-.Ft int
-.Fn iswrune "wint_t wc"
-.Ft int
-.Fn iswspace "wint_t wc"
-.Ft int
-.Fn iswspecial "wint_t wc"
-.Ft int
-.Fn iswupper "wint_t wc"
-.Ft int
-.Fn iswxdigit "wint_t wc"
-.Sh DESCRIPTION
-The above functions are character classification utility functions,
-for use with wide characters
-.Vt ( wchar_t
-or
-.Vt wint_t ) .
-See the description for the similarly-named single byte classification
-functions (like
-.Xr isalnum 3 ) ,
-for details.
-.Sh RETURN VALUES
-The functions return zero if the character tests false and
-return non-zero if the character tests true.
-.Sh SEE ALSO
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr isblank 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr ishexnumber 3 ,
-.Xr isideogram 3 ,
-.Xr islower 3 ,
-.Xr isnumber 3 ,
-.Xr isphonogram 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isrune 3 ,
-.Xr isspace 3 ,
-.Xr isspecial 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr wctype 3
-.Sh STANDARDS
-These functions conform to
-.St -p1003.1-2001 ,
-except
-.Fn iswascii ,
-.Fn iswhexnumber ,
-.Fn iswideogram ,
-.Fn iswnumber ,
-.Fn iswphonogram ,
-.Fn iswrune
-and
-.Fn iswspecial ,
-which are
-.Fx
-extensions.
-.Sh CAVEATS
-The result of these functions is undefined unless
-the argument is
-.Dv WEOF
-or a valid
-.Vt wchar_t
-value for the current locale.
diff --git a/lib/libc_bsd/locale/iswalnum_l.3 b/lib/libc_bsd/locale/iswalnum_l.3
deleted file mode 100644
index 8a35346..0000000
--- a/lib/libc_bsd/locale/iswalnum_l.3
+++ /dev/null
@@ -1,168 +0,0 @@
-.\" Copyright (c) 2012 Isabell Long <issyl0@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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/iswalnum_l.3 238808 2012-07-26 14:46:19Z joel $
-.\"
-.Dd July 25, 2012
-.Dt ISWALNUM_L 3
-.Os
-.Sh NAME
-.Nm iswalnum_l ,
-.Nm iswalpha_l ,
-.Nm iswcntrl_l ,
-.Nm iswctype_l ,
-.Nm iswdigit_l ,
-.Nm iswgraph_l ,
-.Nm iswlower_l ,
-.Nm iswprint_l ,
-.Nm iswpunct_l ,
-.Nm iswspace_l ,
-.Nm iswupper_l ,
-.Nm iswxdigit_l ,
-.Nm towlower_l ,
-.Nm towupper_l ,
-.Nm wctype_l ,
-.Nm iswblank_l ,
-.Nm iswhexnumber_l ,
-.Nm iswideogram_l ,
-.Nm iswnumber_l ,
-.Nm iswphonogram_l ,
-.Nm iswrune_l ,
-.Nm iswspecial_l ,
-.Nm nextwctype_l ,
-.Nm towctrans_l ,
-.Nm wctrans_l
-.Nd wide character classification utilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wctype.h
-.Ft int
-.Fn iswalnum_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswalpha_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswcntrl_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswctype_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswdigit_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswgraph_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswlower_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswprint_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswpunct_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswspace_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswupper_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswxdigit_l "wint_t wc" "locale_t loc"
-.Ft wint_t
-.Fn towlower_l "wint_t wc" "locale_t loc"
-.Ft wint_t
-.Fn towupper_l "wint_t wc" "locale_t loc"
-.Ft wctype_t
-.Fn wctype_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswblank_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswhexnumber_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswideogram_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswnumber_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswphonogram_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswrune_l "wint_t wc" "locale_t loc"
-.Ft int
-.Fn iswspecial_l "wint_t wc" "locale_t loc"
-.Ft wint_t
-.Fn nextwctype_l "wint_t wc" "locale_t loc"
-.Ft wint_t
-.Fn towctrans_l "wint_t wc" "wctrans_t" "locale_t loc"
-.Ft wctrans_t
-.Fn wctrans_l "const char *" "locale_t loc"
-.Sh DESCRIPTION
-The above functions are character classification utility functions,
-for use with wide characters
-.Vt ( wchar_t
-or
-.Vt wint_t )
-in the locale
-.Fa loc .
-They behave in the same way as the versions without the _l suffix, but use
-the specified locale rather than the global or per-thread locale.
-These functions may be implemented as inline functions in
-.In wctype.h
-and as functions in the C library.
-See the specific manual pages for more information.
-.Sh RETURN VALUES
-These functions return the same things as their non-locale versions.
-If the locale is invalid, their behaviors are undefined.
-.Sh SEE ALSO
-.Xr iswalnum 3 ,
-.Xr iswalpha 3 ,
-.Xr iswblank 3 ,
-.Xr iswcntrl 3 ,
-.Xr iswctype 3 ,
-.Xr iswdigit 3 ,
-.Xr iswgraph 3 ,
-.Xr iswhexnumber 3 ,
-.Xr iswideogram 3 ,
-.Xr iswlower 3 ,
-.Xr iswnumber 3 ,
-.Xr iswphonogram 3 ,
-.Xr iswprint 3 ,
-.Xr iswpunct 3 ,
-.Xr iswrune 3 ,
-.Xr iswspace 3 ,
-.Xr iswspecial 3 ,
-.Xr iswupper 3 ,
-.Xr iswxdigit 3 ,
-.Xr nextwctype 3 ,
-.Xr towctrans 3 ,
-.Xr towlower 3 ,
-.Xr towupper 3 ,
-.Xr wctrans 3 ,
-.Xr wctype 3
-.Sh STANDARDS
-These functions conform to
-.St -p1003.1-2008 ,
-except for
-.Fn iswascii_l ,
-.Fn iswhexnumber_l ,
-.Fn iswideogram_l ,
-.Fn iswphonogram_l ,
-.Fn iswrune_l ,
-.Fn iswspecial_l
-and
-.Fn nextwctype_l
-which are
-.Fx
-extensions.
diff --git a/lib/libc_bsd/locale/iswctype.c b/lib/libc_bsd/locale/iswctype.c
deleted file mode 100644
index 85702e8..0000000
--- a/lib/libc_bsd/locale/iswctype.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/iswctype.c 172909 2007-10-23 17:39:28Z ache $");
-
-#include <wctype.h>
-
-#undef iswalnum
-int
-iswalnum(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_A|_CTYPE_D));
-}
-
-#undef iswalpha
-int
-iswalpha(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_A));
-}
-
-#undef iswascii
-int
-iswascii(wc)
-	wint_t wc;
-{
-	return ((wc & ~0x7F) == 0);
-}
-
-#undef iswblank
-int
-iswblank(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_B));
-}
-
-#undef iswcntrl
-int
-iswcntrl(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_C));
-}
-
-#undef iswdigit
-int
-iswdigit(wc)
-	wint_t wc;
-{
-	return (__isctype(wc, _CTYPE_D));
-}
-
-#undef iswgraph
-int
-iswgraph(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_G));
-}
-
-#undef iswhexnumber 
-int
-iswhexnumber(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_X));
-}
-
-#undef iswideogram
-int
-iswideogram(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_I));
-}
-
-#undef iswlower
-int
-iswlower(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_L));
-}
-
-#undef iswnumber
-int
-iswnumber(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_D));
-}
-
-#undef iswphonogram	
-int
-iswphonogram(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_Q));
-}
-
-#undef iswprint
-int
-iswprint(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_R));
-}
-
-#undef iswpunct
-int
-iswpunct(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_P));
-}
-
-#undef iswrune
-int
-iswrune(wc)
-	wint_t wc;
-{
-	return (__istype(wc, 0xFFFFFF00L));
-}
-
-#undef iswspace
-int
-iswspace(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_S));
-}
-
-#undef iswspecial
-int
-iswspecial(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_T));
-}
-
-#undef iswupper
-int
-iswupper(wc)
-	wint_t wc;
-{
-	return (__istype(wc, _CTYPE_U));
-}
-
-#undef iswxdigit
-int
-iswxdigit(wc)
-	wint_t wc;
-{
-	return (__isctype(wc, _CTYPE_X));
-}
-
-#undef towlower
-wint_t
-towlower(wc)
-	wint_t wc;
-{
-        return (__tolower(wc));
-}
-
-#undef towupper
-wint_t
-towupper(wc)
-	wint_t wc;
-{
-        return (__toupper(wc));
-}
-
diff --git a/lib/libc_bsd/locale/isxdigit.3 b/lib/libc_bsd/locale/isxdigit.3
deleted file mode 100644
index 0c854eb..0000000
--- a/lib/libc_bsd/locale/isxdigit.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)isxdigit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/isxdigit.3 233992 2012-04-07 09:05:30Z joel $
-.\"
-.Dd July 17, 2005
-.Dt ISXDIGIT 3
-.Os
-.Sh NAME
-.Nm isxdigit, ishexnumber
-.Nd hexadecimal-digit character test
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn isxdigit "int c"
-.Ft int
-.Fn ishexnumber "int c"
-.Sh DESCRIPTION
-The
-.Fn isxdigit
-function tests for any hexadecimal-digit character.
-Regardless of locale, this includes the following characters only:
-.Bl -column \&``0''______ \&``0''______ \&``0''______ \&``0''______ \&``0''______
-.It "\&``0''" Ta "``1''" Ta "``2''" Ta "``3''" Ta "``4''"
-.It "\&``5''" Ta "``6''" Ta "``7''" Ta "``8''" Ta "``9''"
-.It "\&``A''" Ta "``B''" Ta "``C''" Ta "``D''" Ta "``E''"
-.It "\&``F''" Ta "``a''" Ta "``b''" Ta "``c''" Ta "``d''"
-.It "\&``e''" Ta "``f''" Ta \& Ta \& Ta \&
-.El
-.Pp
-The
-.Fn ishexnumber
-function behaves similarly to
-.Fn isxdigit ,
-but may recognize additional characters,
-depending on the current locale setting.
-.Pp
-The value of the argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Sh RETURN VALUES
-The
-.Fn isxdigit
-function returns zero if the character tests false and
-returns non-zero if the character tests true.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn iswxdigit
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr iswxdigit 3 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Fn isxdigit
-function conforms to
-.St -isoC .
-.Sh HISTORY
-The
-.Fn ishexnumber
-function appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/locale/ldpart.c b/lib/libc_bsd/locale/ldpart.c
deleted file mode 100644
index 863f74b..0000000
--- a/lib/libc_bsd/locale/ldpart.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/ldpart.c 241046 2012-09-29 11:54:34Z jilles $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "ldpart.h"
-#include "setlocale.h"
-
-static int split_lines(char *, const char *);
-
-int
-__part_load_locale(const char *name,
-		int *using_locale,
-		char **locale_buf,
-		const char *category_filename,
-		int locale_buf_size_max,
-		int locale_buf_size_min,
-		const char **dst_localebuf)
-{
-	int		saverr, fd, i, num_lines;
-	char		*lbuf, *p;
-	const char	*plim;
-	char		filename[PATH_MAX];
-	struct stat	st;
-	size_t		namesize, bufsize;
-
-	/* 'name' must be already checked. */
-	if (strcmp(name, "C") == 0 || strcmp(name, "POSIX") == 0) {
-		*using_locale = 0;
-		return (_LDP_CACHE);
-	}
-
-	/*
-	 * If the locale name is the same as our cache, use the cache.
-	 */
-	if (*locale_buf != NULL && strcmp(name, *locale_buf) == 0) {
-		*using_locale = 1;
-		return (_LDP_CACHE);
-	}
-
-	/*
-	 * Slurp the locale file into the cache.
-	 */
-	namesize = strlen(name) + 1;
-
-	/* 'PathLocale' must be already set & checked. */
-
-	/* Range checking not needed, 'name' size is limited */
-	strcpy(filename, _PathLocale);
-	strcat(filename, "/");
-	strcat(filename, name);
-	strcat(filename, "/");
-	strcat(filename, category_filename);
-	if ((fd = _open(filename, O_RDONLY | O_CLOEXEC)) < 0)
-		return (_LDP_ERROR);
-	if (_fstat(fd, &st) != 0)
-		goto bad_locale;
-	if (st.st_size <= 0) {
-		errno = EFTYPE;
-		goto bad_locale;
-	}
-	bufsize = namesize + st.st_size;
-	if ((lbuf = malloc(bufsize)) == NULL) {
-		errno = ENOMEM;
-		goto bad_locale;
-	}
-	(void)strcpy(lbuf, name);
-	p = lbuf + namesize;
-	plim = p + st.st_size;
-	if (_read(fd, p, (size_t) st.st_size) != st.st_size)
-		goto bad_lbuf;
-	/*
-	 * Parse the locale file into localebuf.
-	 */
-	if (plim[-1] != '\n') {
-		errno = EFTYPE;
-		goto bad_lbuf;
-	}
-	num_lines = split_lines(p, plim);
-	if (num_lines >= locale_buf_size_max)
-		num_lines = locale_buf_size_max;
-	else if (num_lines >= locale_buf_size_min)
-		num_lines = locale_buf_size_min;
-	else {
-		errno = EFTYPE;
-		goto bad_lbuf;
-	}
-	(void)_close(fd);
-	/*
-	 * Record the successful parse in the cache.
-	 */
-	if (*locale_buf != NULL)
-		free(*locale_buf);
-	*locale_buf = lbuf;
-	for (p = *locale_buf, i = 0; i < num_lines; i++)
-		dst_localebuf[i] = (p += strlen(p) + 1);
-	for (i = num_lines; i < locale_buf_size_max; i++)
-		dst_localebuf[i] = NULL;
-	*using_locale = 1;
-
-	return (_LDP_LOADED);
-
-bad_lbuf:
-	saverr = errno;
-	free(lbuf);
-	errno = saverr;
-bad_locale:
-	saverr = errno;
-	(void)_close(fd);
-	errno = saverr;
-
-	return (_LDP_ERROR);
-}
-
-static int
-split_lines(char *p, const char *plim)
-{
-	int i;
-
-	i = 0;
-	while (p < plim) {
-		if (*p == '\n') {
-			*p = '\0';
-			i++;
-		}
-		p++;
-	}
-	return (i);
-}
-
diff --git a/lib/libc_bsd/locale/ldpart.h b/lib/libc_bsd/locale/ldpart.h
deleted file mode 100644
index 410fc1b..0000000
--- a/lib/libc_bsd/locale/ldpart.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@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.
- *
- * 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: releng/10.2/lib/libc/locale/ldpart.h 116274 2003-06-13 00:14:07Z jkh $
- */
-
-#ifndef _LDPART_H_
-#define	_LDPART_H_
-
-#define _LDP_LOADED 0
-#define _LDP_ERROR  (-1)
-#define _LDP_CACHE  1
-
-int	__part_load_locale(const char *, int*, char **, const char *,
-		    int, int, const char **);
-
-#endif /* !_LDPART_H_ */
diff --git a/lib/libc_bsd/locale/lmessages.c b/lib/libc_bsd/locale/lmessages.c
deleted file mode 100644
index 506723b..0000000
--- a/lib/libc_bsd/locale/lmessages.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/lmessages.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stddef.h>
-
-#include "ldpart.h"
-#include "lmessages.h"
-
-#define LCMESSAGES_SIZE_FULL (sizeof(struct lc_messages_T) / sizeof(char *))
-#define LCMESSAGES_SIZE_MIN \
-		(offsetof(struct lc_messages_T, yesstr) / sizeof(char *))
-
-struct xlocale_messages {
-	struct xlocale_component header;
-	char *buffer;
-	struct lc_messages_T locale;
-};
-
-struct xlocale_messages __xlocale_global_messages;
-
-static char empty[] = "";
-
-static const struct lc_messages_T _C_messages_locale = {
-	"^[yY]" ,	/* yesexpr */
-	"^[nN]" ,	/* noexpr */
-	"yes" , 	/* yesstr */
-	"no"		/* nostr */
-};
-
-static void destruct_messages(void *v)
-{
-	struct xlocale_messages *l = v;
-	if (l->buffer)
-		free(l->buffer);
-	free(l);
-}
-
-static int
-messages_load_locale(struct xlocale_messages *loc, int *using_locale, const char *name)
-{
-	int ret;
-	struct lc_messages_T *l = &loc->locale;
-
-	ret = __part_load_locale(name, using_locale,
-		  &loc->buffer, "LC_MESSAGES",
-		  LCMESSAGES_SIZE_FULL, LCMESSAGES_SIZE_MIN,
-		  (const char **)l);
-	if (ret == _LDP_LOADED) {
-		if (l->yesstr == NULL)
-			l->yesstr = empty;
-		if (l->nostr == NULL)
-			l->nostr = empty;
-	}
-	return (ret);
-}
-int
-__messages_load_locale(const char *name)
-{
-	return messages_load_locale(&__xlocale_global_messages,
-			&__xlocale_global_locale.using_messages_locale, name);
-}
-void *
-__messages_load(const char *name, locale_t l)
-{
-	struct xlocale_messages *new = calloc(sizeof(struct xlocale_messages), 1);
-	new->header.header.destructor = destruct_messages;
-	if (messages_load_locale(new, &l->using_messages_locale, name) == _LDP_ERROR) {
-		xlocale_release(new);
-		return NULL;
-	}
-	return new;
-}
-
-struct lc_messages_T *
-__get_current_messages_locale(locale_t loc)
-{
-	return (loc->using_messages_locale
-		? &((struct xlocale_messages *)loc->components[XLC_MESSAGES])->locale
-		: (struct lc_messages_T *)&_C_messages_locale);
-}
-
-#ifdef LOCALE_DEBUG
-void
-msgdebug() {
-printf(	"yesexpr = %s\n"
-	"noexpr = %s\n"
-	"yesstr = %s\n"
-	"nostr = %s\n",
-	_messages_locale.yesexpr,
-	_messages_locale.noexpr,
-	_messages_locale.yesstr,
-	_messages_locale.nostr
-);
-}
-#endif /* LOCALE_DEBUG */
diff --git a/lib/libc_bsd/locale/lmessages.h b/lib/libc_bsd/locale/lmessages.h
deleted file mode 100644
index 620abdd..0000000
--- a/lib/libc_bsd/locale/lmessages.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/locale/lmessages.h 227753 2011-11-20 14:45:42Z theraven $
- */
-
-#ifndef _LMESSAGES_H_
-#define	_LMESSAGES_H_
-
-#include "xlocale_private.h"
-
-struct	lc_messages_T {
-	const char	*yesexpr;
-	const char	*noexpr;
-	const char	*yesstr;
-	const char	*nostr;
-};
-
-struct lc_messages_T *__get_current_messages_locale(locale_t);
-int	__messages_load_locale(const char *);
-
-#endif /* !_LMESSAGES_H_ */
diff --git a/lib/libc_bsd/locale/lmonetary.c b/lib/libc_bsd/locale/lmonetary.c
deleted file mode 100644
index faf73b3..0000000
--- a/lib/libc_bsd/locale/lmonetary.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/lmonetary.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <limits.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include "ldpart.h"
-#include "lmonetary.h"
-
-extern const char * __fix_locale_grouping_str(const char *);
-
-#define LCMONETARY_SIZE_FULL (sizeof(struct lc_monetary_T) / sizeof(char *))
-#define LCMONETARY_SIZE_MIN \
-		(offsetof(struct lc_monetary_T, int_p_cs_precedes) / \
-		    sizeof(char *))
-
-static char	empty[] = "";
-static char	numempty[] = { CHAR_MAX, '\0'};
-
-static const struct lc_monetary_T _C_monetary_locale = {
-	empty,		/* int_curr_symbol */
-	empty,		/* currency_symbol */
-	empty,		/* mon_decimal_point */
-	empty,		/* mon_thousands_sep */
-	numempty,	/* mon_grouping */
-	empty,		/* positive_sign */
-	empty,		/* negative_sign */
-	numempty,	/* int_frac_digits */
-	numempty,	/* frac_digits */
-	numempty,	/* p_cs_precedes */
-	numempty,	/* p_sep_by_space */
-	numempty,	/* n_cs_precedes */
-	numempty,	/* n_sep_by_space */
-	numempty,	/* p_sign_posn */
-	numempty,	/* n_sign_posn */
-	numempty,	/* int_p_cs_precedes */
-	numempty,	/* int_n_cs_precedes */
-	numempty,	/* int_p_sep_by_space */
-	numempty,	/* int_n_sep_by_space */
-	numempty,	/* int_p_sign_posn */
-	numempty	/* int_n_sign_posn */
-};
-
-struct xlocale_monetary __xlocale_global_monetary;
-
-static char
-cnv(const char *str)
-{
-	int i = strtol(str, NULL, 10);
-
-	if (i == -1)
-		i = CHAR_MAX;
-	return ((char)i);
-}
-
-static void
-destruct_monetary(void *v)
-{
-	struct xlocale_monetary *l = v;
-	if (l->buffer)
-		free(l->buffer);
-	free(l);
-}
-
-static int
-monetary_load_locale_l(struct xlocale_monetary *loc, int *using_locale,
-		int *changed, const char *name)
-{
-	int ret;
-	struct lc_monetary_T *l = &loc->locale;
-
-	ret = __part_load_locale(name, using_locale,
-		&loc->buffer, "LC_MONETARY",
-		LCMONETARY_SIZE_FULL, LCMONETARY_SIZE_MIN,
-		(const char **)l);
-	if (ret != _LDP_ERROR)
-		*changed = 1;
-	if (ret == _LDP_LOADED) {
-		l->mon_grouping =
-		     __fix_locale_grouping_str(l->mon_grouping);
-
-#define M_ASSIGN_CHAR(NAME) (((char *)l->NAME)[0] = \
-			     cnv(l->NAME))
-
-		M_ASSIGN_CHAR(int_frac_digits);
-		M_ASSIGN_CHAR(frac_digits);
-		M_ASSIGN_CHAR(p_cs_precedes);
-		M_ASSIGN_CHAR(p_sep_by_space);
-		M_ASSIGN_CHAR(n_cs_precedes);
-		M_ASSIGN_CHAR(n_sep_by_space);
-		M_ASSIGN_CHAR(p_sign_posn);
-		M_ASSIGN_CHAR(n_sign_posn);
-
-		/*
-		 * The six additional C99 international monetary formatting
-		 * parameters default to the national parameters when
-		 * reading FreeBSD LC_MONETARY data files.
-		 */
-#define	M_ASSIGN_ICHAR(NAME)						\
-		do {							\
-			if (l->int_##NAME == NULL)	\
-				l->int_##NAME =		\
-				    l->NAME;		\
-			else						\
-				M_ASSIGN_CHAR(int_##NAME);		\
-		} while (0)
-
-		M_ASSIGN_ICHAR(p_cs_precedes);
-		M_ASSIGN_ICHAR(n_cs_precedes);
-		M_ASSIGN_ICHAR(p_sep_by_space);
-		M_ASSIGN_ICHAR(n_sep_by_space);
-		M_ASSIGN_ICHAR(p_sign_posn);
-		M_ASSIGN_ICHAR(n_sign_posn);
-	}
-	return (ret);
-}
-int
-__monetary_load_locale(const char *name)
-{
-	return monetary_load_locale_l(&__xlocale_global_monetary,
-			&__xlocale_global_locale.using_monetary_locale,
-			&__xlocale_global_locale.monetary_locale_changed, name);
-}
-void* __monetary_load(const char *name, locale_t l)
-{
-	struct xlocale_monetary *new = calloc(sizeof(struct xlocale_monetary), 1);
-	new->header.header.destructor = destruct_monetary;
-	if (monetary_load_locale_l(new, &l->using_monetary_locale,
-				&l->monetary_locale_changed, name) == _LDP_ERROR)
-	{
-		xlocale_release(new);
-		return NULL;
-	}
-	return new;
-}
-
-
-struct lc_monetary_T *
-__get_current_monetary_locale(locale_t loc)
-{
-	return (loc->using_monetary_locale
-		? &((struct xlocale_monetary*)loc->components[XLC_MONETARY])->locale
-		: (struct lc_monetary_T *)&_C_monetary_locale);
-}
-
-#ifdef LOCALE_DEBUG
-void
-monetdebug() {
-printf(	"int_curr_symbol = %s\n"
-	"currency_symbol = %s\n"
-	"mon_decimal_point = %s\n"
-	"mon_thousands_sep = %s\n"
-	"mon_grouping = %s\n"
-	"positive_sign = %s\n"
-	"negative_sign = %s\n"
-	"int_frac_digits = %d\n"
-	"frac_digits = %d\n"
-	"p_cs_precedes = %d\n"
-	"p_sep_by_space = %d\n"
-	"n_cs_precedes = %d\n"
-	"n_sep_by_space = %d\n"
-	"p_sign_posn = %d\n"
-	"n_sign_posn = %d\n",
-	"int_p_cs_precedes = %d\n"
-	"int_p_sep_by_space = %d\n"
-	"int_n_cs_precedes = %d\n"
-	"int_n_sep_by_space = %d\n"
-	"int_p_sign_posn = %d\n"
-	"int_n_sign_posn = %d\n",
-	_monetary_locale.int_curr_symbol,
-	_monetary_locale.currency_symbol,
-	_monetary_locale.mon_decimal_point,
-	_monetary_locale.mon_thousands_sep,
-	_monetary_locale.mon_grouping,
-	_monetary_locale.positive_sign,
-	_monetary_locale.negative_sign,
-	_monetary_locale.int_frac_digits[0],
-	_monetary_locale.frac_digits[0],
-	_monetary_locale.p_cs_precedes[0],
-	_monetary_locale.p_sep_by_space[0],
-	_monetary_locale.n_cs_precedes[0],
-	_monetary_locale.n_sep_by_space[0],
-	_monetary_locale.p_sign_posn[0],
-	_monetary_locale.n_sign_posn[0],
-	_monetary_locale.int_p_cs_precedes[0],
-	_monetary_locale.int_p_sep_by_space[0],
-	_monetary_locale.int_n_cs_precedes[0],
-	_monetary_locale.int_n_sep_by_space[0],
-	_monetary_locale.int_p_sign_posn[0],
-	_monetary_locale.int_n_sign_posn[0]
-);
-}
-#endif /* LOCALE_DEBUG */
diff --git a/lib/libc_bsd/locale/lmonetary.h b/lib/libc_bsd/locale/lmonetary.h
deleted file mode 100644
index 5cd5c6e..0000000
--- a/lib/libc_bsd/locale/lmonetary.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/locale/lmonetary.h 227753 2011-11-20 14:45:42Z theraven $
- */
-
-#ifndef _LMONETARY_H_
-#define	_LMONETARY_H_
-#include "xlocale_private.h"
-
-struct lc_monetary_T {
-	const char	*int_curr_symbol;
-	const char	*currency_symbol;
-	const char	*mon_decimal_point;
-	const char	*mon_thousands_sep;
-	const char	*mon_grouping;
-	const char	*positive_sign;
-	const char	*negative_sign;
-	const char	*int_frac_digits;
-	const char	*frac_digits;
-	const char	*p_cs_precedes;
-	const char	*p_sep_by_space;
-	const char	*n_cs_precedes;
-	const char	*n_sep_by_space;
-	const char	*p_sign_posn;
-	const char	*n_sign_posn;
-	const char	*int_p_cs_precedes;
-	const char	*int_n_cs_precedes;
-	const char	*int_p_sep_by_space;
-	const char	*int_n_sep_by_space;
-	const char	*int_p_sign_posn;
-	const char	*int_n_sign_posn;
-};
-struct xlocale_monetary {
-	struct xlocale_component header;
-	char *buffer;
-	struct lc_monetary_T locale;
-};
-
-struct lc_monetary_T *__get_current_monetary_locale(locale_t loc);
-int	__monetary_load_locale(const char *);
-
-#endif /* !_LMONETARY_H_ */
diff --git a/lib/libc_bsd/locale/lnumeric.c b/lib/libc_bsd/locale/lnumeric.c
deleted file mode 100644
index 1fc7fa9..0000000
--- a/lib/libc_bsd/locale/lnumeric.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/lnumeric.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <limits.h>
-
-#include "ldpart.h"
-#include "lnumeric.h"
-
-extern const char *__fix_locale_grouping_str(const char *);
-
-#define LCNUMERIC_SIZE (sizeof(struct lc_numeric_T) / sizeof(char *))
-
-static char	numempty[] = { CHAR_MAX, '\0' };
-
-static const struct lc_numeric_T _C_numeric_locale = {
-	".",     	/* decimal_point */
-	"",     	/* thousands_sep */
-	numempty	/* grouping */
-};
-
-static void
-destruct_numeric(void *v)
-{
-	struct xlocale_numeric *l = v;
-	if (l->buffer)
-		free(l->buffer);
-	free(l);
-}
-
-struct xlocale_numeric __xlocale_global_numeric;
-
-static int
-numeric_load_locale(struct xlocale_numeric *loc, int *using_locale, int *changed,
-		const char *name)
-{
-	int ret;
-	struct lc_numeric_T *l = &loc->locale;
-
-	ret = __part_load_locale(name, using_locale,
-		&loc->buffer, "LC_NUMERIC",
-		LCNUMERIC_SIZE, LCNUMERIC_SIZE,
-		(const char**)l);
-	if (ret != _LDP_ERROR)
-		*changed= 1;
-	if (ret == _LDP_LOADED) {
-		/* Can't be empty according to C99 */
-		if (*l->decimal_point == '\0')
-			l->decimal_point =
-			    _C_numeric_locale.decimal_point;
-		l->grouping =
-		    __fix_locale_grouping_str(l->grouping);
-	}
-	return (ret);
-}
-
-int
-__numeric_load_locale(const char *name)
-{
-	return numeric_load_locale(&__xlocale_global_numeric,
-			&__xlocale_global_locale.using_numeric_locale,
-			&__xlocale_global_locale.numeric_locale_changed, name);
-}
-void *
-__numeric_load(const char *name, locale_t l)
-{
-	struct xlocale_numeric *new = calloc(sizeof(struct xlocale_numeric), 1);
-	new->header.header.destructor = destruct_numeric;
-	if (numeric_load_locale(new, &l->using_numeric_locale,
-				&l->numeric_locale_changed, name) == _LDP_ERROR)
-	{
-		xlocale_release(new);
-		return NULL;
-	}
-	return new;
-}
-
-struct lc_numeric_T *
-__get_current_numeric_locale(locale_t loc)
-{
-	return (loc->using_numeric_locale
-		? &((struct xlocale_numeric *)loc->components[XLC_NUMERIC])->locale
-		: (struct lc_numeric_T *)&_C_numeric_locale);
-}
-
-#ifdef LOCALE_DEBUG
-void
-numericdebug(void) {
-printf(	"decimal_point = %s\n"
-	"thousands_sep = %s\n"
-	"grouping = %s\n",
-	_numeric_locale.decimal_point,
-	_numeric_locale.thousands_sep,
-	_numeric_locale.grouping
-);
-}
-#endif /* LOCALE_DEBUG */
diff --git a/lib/libc_bsd/locale/lnumeric.h b/lib/libc_bsd/locale/lnumeric.h
deleted file mode 100644
index fe3935e..0000000
--- a/lib/libc_bsd/locale/lnumeric.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2000, 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/locale/lnumeric.h 227753 2011-11-20 14:45:42Z theraven $
- */
-
-#ifndef _LNUMERIC_H_
-#define	_LNUMERIC_H_
-#include "xlocale_private.h"
-
-struct lc_numeric_T {
-	const char	*decimal_point;
-	const char	*thousands_sep;
-	const char	*grouping;
-};
-struct xlocale_numeric {
-	struct xlocale_component header;
-	char *buffer;
-	struct lc_numeric_T locale;
-};
-
-struct lc_numeric_T *__get_current_numeric_locale(locale_t loc);
-int	__numeric_load_locale(const char *);
-
-#endif /* !_LNUMERIC_H_ */
diff --git a/lib/libc_bsd/locale/localeconv.3 b/lib/libc_bsd/locale/localeconv.3
deleted file mode 100644
index 390becc..0000000
--- a/lib/libc_bsd/locale/localeconv.3
+++ /dev/null
@@ -1,237 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\" From @(#)setlocale.3	8.1 (Berkeley) 6/9/93
-.\" From FreeBSD: src/lib/libc/locale/setlocale.3,v 1.28 2003/11/15 02:26:04 tjr Exp
-.\" $FreeBSD: releng/10.2/lib/libc/locale/localeconv.3 228199 2011-12-02 11:55:09Z obrien $
-.\"
-.Dd November 21, 2003
-.Dt LOCALECONV 3
-.Os
-.Sh NAME
-.Nm localeconv
-.Nd natural language formatting for C
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In locale.h
-.Ft struct lconv *
-.Fn localeconv "void"
-.In xlocale.h
-.Ft struct lconv *
-.Fn localeconv_l "locale_t locale"
-.Sh DESCRIPTION
-The
-.Fn localeconv
-function returns a pointer to a structure
-which provides parameters for formatting numbers,
-especially currency values:
-.Bd -literal -offset indent
-struct lconv {
-	char	*decimal_point;
-	char	*thousands_sep;
-	char	*grouping;
-	char	*int_curr_symbol;
-	char	*currency_symbol;
-	char	*mon_decimal_point;
-	char	*mon_thousands_sep;
-	char	*mon_grouping;
-	char	*positive_sign;
-	char	*negative_sign;
-	char	int_frac_digits;
-	char	frac_digits;
-	char	p_cs_precedes;
-	char	p_sep_by_space;
-	char	n_cs_precedes;
-	char	n_sep_by_space;
-	char	p_sign_posn;
-	char	n_sign_posn;
-	char	int_p_cs_precedes;
-	char	int_n_cs_precedes;
-	char	int_p_sep_by_space;
-	char	int_n_sep_by_space;
-	char	int_p_sign_posn;
-	char	int_n_sign_posn;
-};
-.Ed
-.Pp
-The individual fields have the following meanings:
-.Bl -tag -width mon_decimal_point
-.It Va decimal_point
-The decimal point character, except for currency values,
-cannot be an empty string.
-.It Va thousands_sep
-The separator between groups of digits
-before the decimal point, except for currency values.
-.It Va grouping
-The sizes of the groups of digits, except for currency values.
-This is a pointer to a vector of integers, each of size
-.Vt char ,
-representing group size from low order digit groups
-to high order (right to left).
-The list may be terminated with 0 or
-.Dv CHAR_MAX .
-If the list is terminated with 0,
-the last group size before the 0 is repeated to account for all the digits.
-If the list is terminated with
-.Dv CHAR_MAX ,
-no more grouping is performed.
-.It Va int_curr_symbol
-The standardized international currency symbol.
-.It Va currency_symbol
-The local currency symbol.
-.It Va mon_decimal_point
-The decimal point character for currency values.
-.It Va mon_thousands_sep
-The separator for digit groups in currency values.
-.It Va mon_grouping
-Like
-.Va grouping
-but for currency values.
-.It Va positive_sign
-The character used to denote nonnegative currency values,
-usually the empty string.
-.It Va negative_sign
-The character used to denote negative currency values,
-usually a minus sign.
-.It Va int_frac_digits
-The number of digits after the decimal point
-in an international-style currency value.
-.It Va frac_digits
-The number of digits after the decimal point
-in the local style for currency values.
-.It Va p_cs_precedes
-1 if the currency symbol precedes the currency value
-for nonnegative values, 0 if it follows.
-.It Va p_sep_by_space
-1 if a space is inserted between the currency symbol
-and the currency value for nonnegative values, 0 otherwise.
-.It Va n_cs_precedes
-Like
-.Va p_cs_precedes
-but for negative values.
-.It Va n_sep_by_space
-Like
-.Va p_sep_by_space
-but for negative values.
-.It Va p_sign_posn
-The location of the
-.Va positive_sign
-with respect to a nonnegative quantity and the
-.Va currency_symbol ,
-coded as follows:
-.Pp
-.Bl -tag -width 3n -compact
-.It Li 0
-Parentheses around the entire string.
-.It Li 1
-Before the string.
-.It Li 2
-After the string.
-.It Li 3
-Just before
-.Va currency_symbol .
-.It Li 4
-Just after
-.Va currency_symbol .
-.El
-.It Va n_sign_posn
-Like
-.Va p_sign_posn
-but for negative currency values.
-.It Va int_p_cs_precedes
-Same as
-.Va p_cs_precedes ,
-but for internationally formatted monetary quantities.
-.It Va int_n_cs_precedes
-Same as
-.Va n_cs_precedes ,
-but for internationally formatted monetary quantities.
-.It Va int_p_sep_by_space
-Same as
-.Va p_sep_by_space ,
-but for internationally formatted monetary quantities.
-.It Va int_n_sep_by_space
-Same as
-.Va n_sep_by_space ,
-but for internationally formatted monetary quantities.
-.It Va int_p_sign_posn
-Same as
-.Va p_sign_posn ,
-but for internationally formatted monetary quantities.
-.It Va int_n_sign_posn
-Same as
-.Va n_sign_posn ,
-but for internationally formatted monetary quantities.
-.El
-.Pp
-Unless mentioned above,
-an empty string as a value for a field
-indicates a zero length result or
-a value that is not in the current locale.
-A
-.Dv CHAR_MAX
-result similarly denotes an unavailable value.
-.Pp
-The
-.Fn localeconv_l
-function takes an explicit locale parameter.  For more information, see
-.Xr xlocale 3 .
-.Sh RETURN VALUES
-The
-.Fn localeconv
-function returns a pointer to a static object
-which may be altered by later calls to
-.Xr setlocale 3
-or
-.Fn localeconv .
-The return value for
-.Fn localeconv_l
-is stored with the locale.
-It will remain valid until a subsequent call to
-.Xr freelocale 3 .
-If a thread-local locale is in effect then the return value from
-.Fn localeconv
-will remain valid until the locale is destroyed.
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr strfmon 3
-.Sh STANDARDS
-The
-.Fn localeconv
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn localeconv
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/locale/localeconv.c b/lib/libc_bsd/locale/localeconv.c
deleted file mode 100644
index ba0f3ff..0000000
--- a/lib/libc_bsd/locale/localeconv.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)localeconv.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/localeconv.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <locale.h>
-
-#include "lmonetary.h"
-#include "lnumeric.h"
-
-/* 
- * The localeconv() function constructs a struct lconv from the current
- * monetary and numeric locales.
- *
- * Because localeconv() may be called many times (especially by library
- * routines like printf() & strtod()), the approprate members of the 
- * lconv structure are computed only when the monetary or numeric 
- * locale has been changed.
- */
-
-/*
- * Return the current locale conversion.
- */
-struct lconv *
-localeconv_l(locale_t loc)
-{
-	FIX_LOCALE(loc);
-    struct lconv *ret = &loc->lconv;
-
-    if (loc->monetary_locale_changed) {
-	/* LC_MONETARY part */
-        struct lc_monetary_T * mptr; 
-
-#define M_ASSIGN_STR(NAME) (ret->NAME = (char*)mptr->NAME)
-#define M_ASSIGN_CHAR(NAME) (ret->NAME = mptr->NAME[0])
-
-	mptr = __get_current_monetary_locale(loc);
-	M_ASSIGN_STR(int_curr_symbol);
-	M_ASSIGN_STR(currency_symbol);
-	M_ASSIGN_STR(mon_decimal_point);
-	M_ASSIGN_STR(mon_thousands_sep);
-	M_ASSIGN_STR(mon_grouping);
-	M_ASSIGN_STR(positive_sign);
-	M_ASSIGN_STR(negative_sign);
-	M_ASSIGN_CHAR(int_frac_digits);
-	M_ASSIGN_CHAR(frac_digits);
-	M_ASSIGN_CHAR(p_cs_precedes);
-	M_ASSIGN_CHAR(p_sep_by_space);
-	M_ASSIGN_CHAR(n_cs_precedes);
-	M_ASSIGN_CHAR(n_sep_by_space);
-	M_ASSIGN_CHAR(p_sign_posn);
-	M_ASSIGN_CHAR(n_sign_posn);
-	M_ASSIGN_CHAR(int_p_cs_precedes);
-	M_ASSIGN_CHAR(int_n_cs_precedes);
-	M_ASSIGN_CHAR(int_p_sep_by_space);
-	M_ASSIGN_CHAR(int_n_sep_by_space);
-	M_ASSIGN_CHAR(int_p_sign_posn);
-	M_ASSIGN_CHAR(int_n_sign_posn);
-	loc->monetary_locale_changed = 0;
-    }
-
-    if (loc->numeric_locale_changed) {
-	/* LC_NUMERIC part */
-        struct lc_numeric_T * nptr; 
-
-#define N_ASSIGN_STR(NAME) (ret->NAME = (char*)nptr->NAME)
-
-	nptr = __get_current_numeric_locale(loc);
-	N_ASSIGN_STR(decimal_point);
-	N_ASSIGN_STR(thousands_sep);
-	N_ASSIGN_STR(grouping);
-	loc->numeric_locale_changed = 0;
-    }
-
-    return ret;
-}
-struct lconv *
-localeconv(void)
-{
-	return localeconv_l(__get_locale());
-}
diff --git a/lib/libc_bsd/locale/mblen.3 b/lib/libc_bsd/locale/mblen.3
deleted file mode 100644
index 7b19912..0000000
--- a/lib/libc_bsd/locale/mblen.3
+++ /dev/null
@@ -1,106 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley of BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
-.\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD: releng/10.2/lib/libc/locale/mblen.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 11, 2004
-.Dt MBLEN 3
-.Os
-.Sh NAME
-.Nm mblen
-.Nd get number of bytes in a character
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn mblen "const char *mbchar" "size_t nbytes"
-.Sh DESCRIPTION
-The
-.Fn mblen
-function computes the length in bytes
-of a multibyte character
-.Fa mbchar
-according to the current conversion state.
-Up to
-.Fa nbytes
-bytes are examined.
-.Pp
-A call with a null
-.Fa mbchar
-pointer returns nonzero if the current locale requires shift states,
-zero otherwise;
-if shift states are required, the shift state is reset to the initial state.
-.Sh RETURN VALUES
-If
-.Fa mbchar
-is
-.Dv NULL ,
-the
-.Fn mblen
-function returns nonzero if shift states are supported,
-zero otherwise.
-.Pp
-Otherwise, if
-.Fa mbchar
-is not a null pointer,
-.Fn mblen
-either returns 0 if
-.Fa mbchar
-represents the null wide character, or returns
-the number of bytes processed in
-.Fa mbchar ,
-or returns \-1 if no multibyte character
-could be recognized or converted.
-In this case,
-.Fn mblen Ns 's
-internal conversion state is undefined.
-.Sh ERRORS
-The
-.Fn mblen
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid multibyte sequence was detected.
-.It Bq Er EINVAL
-The internal conversion state is not valid.
-.El
-.Sh SEE ALSO
-.Xr mbrlen 3 ,
-.Xr mbtowc 3 ,
-.Xr multibyte 3
-.Sh STANDARDS
-The
-.Fn mblen
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/mblen.c b/lib/libc_bsd/locale/mblen.c
deleted file mode 100644
index 1fa1fed..0000000
--- a/lib/libc_bsd/locale/mblen.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mblen.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-mblen_l(const char *s, size_t n, locale_t locale)
-{
-	static const mbstate_t initial;
-	size_t rval;
-	FIX_LOCALE(locale);
-
-	if (s == NULL) {
-		/* No support for state dependent encodings. */
-		locale->mblen = initial;
-		return (0);
-	}
-	rval = XLOCALE_CTYPE(locale)->__mbrtowc(NULL, s, n, &locale->mblen);
-	if (rval == (size_t)-1 || rval == (size_t)-2)
-		return (-1);
-	return ((int)rval);
-}
-
-int
-mblen(const char *s, size_t n)
-{
-	return mblen_l(s, n, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/mblocal.h b/lib/libc_bsd/locale/mblocal.h
deleted file mode 100644
index 85c5228..0000000
--- a/lib/libc_bsd/locale/mblocal.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/locale/mblocal.h 227753 2011-11-20 14:45:42Z theraven $
- */
-
-#ifndef _MBLOCAL_H_
-#define	_MBLOCAL_H_
-
-#include <runetype.h>
-#include "xlocale_private.h"
-
-
-/*
- * Conversion function pointers for current encoding.
- */
-struct xlocale_ctype {
-	struct xlocale_component header;
-	_RuneLocale *runes;
-	size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
-		size_t, mbstate_t * __restrict);
-	int (*__mbsinit)(const mbstate_t *);
-	size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict,
-		size_t, size_t, mbstate_t * __restrict);
-	size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
-	size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
-		size_t, size_t, mbstate_t * __restrict);
-	int __mb_cur_max;
-	int __mb_sb_limit;
-};
-#define XLOCALE_CTYPE(x) ((struct xlocale_ctype*)(x)->components[XLC_CTYPE])
-extern struct xlocale_ctype __xlocale_global_ctype;
-
-/*
- * Rune initialization function prototypes.
- */
-int	_none_init(struct xlocale_ctype *, _RuneLocale *);
-int	_ascii_init(struct xlocale_ctype *, _RuneLocale *);
-int	_UTF8_init(struct xlocale_ctype *, _RuneLocale *);
-int	_EUC_init(struct xlocale_ctype *, _RuneLocale *);
-int	_GB18030_init(struct xlocale_ctype *, _RuneLocale *);
-int	_GB2312_init(struct xlocale_ctype *, _RuneLocale *);
-int	_GBK_init(struct xlocale_ctype *, _RuneLocale *);
-int	_BIG5_init(struct xlocale_ctype *, _RuneLocale *);
-int	_MSKanji_init(struct xlocale_ctype *, _RuneLocale *);
-
-extern size_t __mbsnrtowcs_std(wchar_t * __restrict, const char ** __restrict,
-	size_t, size_t, mbstate_t * __restrict);
-extern size_t __wcsnrtombs_std(char * __restrict, const wchar_t ** __restrict,
-	size_t, size_t, mbstate_t * __restrict);
-
-#endif	/* _MBLOCAL_H_ */
diff --git a/lib/libc_bsd/locale/mbrlen.3 b/lib/libc_bsd/locale/mbrlen.3
deleted file mode 100644
index ea5528a..0000000
--- a/lib/libc_bsd/locale/mbrlen.3
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/mbrlen.3 131360 2004-06-30 19:32:41Z ru $
-.\"
-.Dd April 7, 2004
-.Dt MBRLEN 3
-.Os
-.Sh NAME
-.Nm mbrlen
-.Nd "get number of bytes in a character (restartable)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn mbrlen "const char * restrict s" "size_t n" "mbstate_t * restrict ps"
-.Sh DESCRIPTION
-The
-.Fn mbrlen
-function inspects at most
-.Fa n
-bytes pointed to by
-.Fa s
-to determine the number of bytes needed to complete the next
-multibyte character.
-.Pp
-The
-.Vt mbstate_t
-argument,
-.Fa ps ,
-is used to keep track of the shift state.
-If it is
-.Dv NULL ,
-.Fn mbrlen
-uses an internal, static
-.Vt mbstate_t
-object, which is initialized to the initial conversion state
-at program startup.
-.Pp
-It is equivalent to:
-.Pp
-.Dl "mbrtowc(NULL, s, n, ps);"
-.Pp
-Except that when
-.Fa ps
-is a
-.Dv NULL
-pointer,
-.Fn mbrlen
-uses its own static, internal
-.Vt mbstate_t
-object to keep track of the shift state.
-.Sh RETURN VALUES
-The
-.Fn mbrlen
-functions returns:
-.Bl -tag -width indent
-.It 0
-The next
-.Fa n
-or fewer bytes
-represent the null wide character
-.Pq Li "L'\e0'" .
-.It >0
-The next
-.Fa n
-or fewer bytes
-represent a valid character,
-.Fn mbrlen
-returns the number of bytes used to complete the multibyte character.
-.It Po Vt size_t Pc Ns \-2
-The next
-.Fa n
-contribute to, but do not complete, a valid multibyte character sequence,
-and all
-.Fa n
-bytes have been processed.
-.It Po Vt size_t Pc Ns \-1
-An encoding error has occurred.
-The next
-.Fa n
-or fewer bytes do not contribute to a valid multibyte character.
-.El
-.Sh EXAMPLES
-A function that calculates the number of characters in a multibyte
-character string:
-.Bd -literal -offset indent
-size_t
-nchars(const char *s)
-{
-	size_t charlen, chars;
-	mbstate_t mbs;
-
-	chars = 0;
-	memset(&mbs, 0, sizeof(mbs));
-	while ((charlen = mbrlen(s, MB_CUR_MAX, &mbs)) != 0 &&
-	    charlen != (size_t)-1 && charlen != (size_t)-2) {
-		s += charlen;
-		chars++;
-	}
-
-	return (chars);
-}
-.Ed
-.Sh ERRORS
-The
-.Fn mbrlen
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid multibyte sequence was detected.
-.It Bq Er EINVAL
-The conversion state is invalid.
-.El
-.Sh SEE ALSO
-.Xr mblen 3 ,
-.Xr mbrtowc 3 ,
-.Xr multibyte 3
-.Sh STANDARDS
-The
-.Fn mbrlen
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/mbrlen.c b/lib/libc_bsd/locale/mbrlen.c
deleted file mode 100644
index 2edc2ee..0000000
--- a/lib/libc_bsd/locale/mbrlen.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbrlen.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbrlen_l(const char * __restrict s, size_t n, mbstate_t * __restrict ps, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->mbrlen;
-	return (XLOCALE_CTYPE(locale)->__mbrtowc(NULL, s, n, ps));
-}
-
-size_t
-mbrlen(const char * __restrict s, size_t n, mbstate_t * __restrict ps)
-{
-	return mbrlen_l(s, n, ps, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/mbrtoc16.c b/lib/libc_bsd/locale/mbrtoc16.c
deleted file mode 100644
index 0219d4b..0000000
--- a/lib/libc_bsd/locale/mbrtoc16.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 2013 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbrtoc16.c 250883 2013-05-21 19:59:37Z ed $");
-
-#include <uchar.h>
-#include "xlocale_private.h"
-
-typedef struct {
-	char16_t	trail_surrogate;
-	mbstate_t	c32_mbstate;
-} _Char16State;
-
-size_t
-mbrtoc16_l(char16_t * __restrict pc16, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps, locale_t locale)
-{
-	_Char16State *cs;
-	char32_t c32;
-	ssize_t len;
-
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->mbrtoc16;
-	cs = (_Char16State *)ps;
-
-	/*
-	 * Call straight into mbrtoc32_l() if we don't need to return a
-	 * character value. According to the spec, if s is a null
-	 * pointer, the value of parameter pc16 is also ignored.
-	 */
-	if (pc16 == NULL || s == NULL) {
-		cs->trail_surrogate = 0;
-		return (mbrtoc32_l(NULL, s, n, &cs->c32_mbstate, locale));
-	}
-
-	/* Return the trail surrogate from the previous invocation. */
-	if (cs->trail_surrogate >= 0xdc00 && cs->trail_surrogate <= 0xdfff) {
-		*pc16 = cs->trail_surrogate;
-		cs->trail_surrogate = 0;
-		return ((size_t)-3);
-	}
-
-	len = mbrtoc32_l(&c32, s, n, &cs->c32_mbstate, locale);
-	if (len >= 0) {
-		if (c32 < 0x10000) {
-			/* Fits in one UTF-16 character. */
-			*pc16 = c32;
-		} else {
-			/* Split up in a surrogate pair. */
-			c32 -= 0x10000;
-			*pc16 = 0xd800 | (c32 >> 10);
-			cs->trail_surrogate = 0xdc00 | (c32 & 0x3ff);
-		}
-	}
-	return (len);
-}
-
-size_t
-mbrtoc16(char16_t * __restrict pc16, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-
-	return (mbrtoc16_l(pc16, s, n, ps, __get_locale()));
-}
diff --git a/lib/libc_bsd/locale/mbrtoc16_iconv.c b/lib/libc_bsd/locale/mbrtoc16_iconv.c
deleted file mode 100644
index 7152873..0000000
--- a/lib/libc_bsd/locale/mbrtoc16_iconv.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/locale/mbrtoc16_iconv.c 251314 2013-06-03 17:17:56Z ed $ */
-#define	charXX_t	char16_t
-#define	mbrtocXX	mbrtoc16
-#define	mbrtocXX_l	mbrtoc16_l
-#define	DSTBUF_LEN	2
-#define	UTF_XX_INTERNAL	"UTF-16-INTERNAL"
-
-#include "mbrtocXX_iconv.h"
diff --git a/lib/libc_bsd/locale/mbrtoc32.c b/lib/libc_bsd/locale/mbrtoc32.c
deleted file mode 100644
index 09210a4..0000000
--- a/lib/libc_bsd/locale/mbrtoc32.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2013 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbrtoc32.c 250883 2013-05-21 19:59:37Z ed $");
-
-#include <uchar.h>
-#include <wchar.h>
-#include "xlocale_private.h"
-
-size_t
-mbrtoc32_l(char32_t * __restrict pc32, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps, locale_t locale)
-{
-
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->mbrtoc32;
-
-	/* Assume wchar_t uses UTF-32. */
-	return (mbrtowc_l(pc32, s, n, ps, locale));
-}
-
-size_t
-mbrtoc32(char32_t * __restrict pc32, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-
-	return (mbrtoc32_l(pc32, s, n, ps, __get_locale()));
-}
diff --git a/lib/libc_bsd/locale/mbrtoc32_iconv.c b/lib/libc_bsd/locale/mbrtoc32_iconv.c
deleted file mode 100644
index 6dcfe4c..0000000
--- a/lib/libc_bsd/locale/mbrtoc32_iconv.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/locale/mbrtoc32_iconv.c 251314 2013-06-03 17:17:56Z ed $ */
-#define	charXX_t	char32_t
-#define	mbrtocXX	mbrtoc32
-#define	mbrtocXX_l	mbrtoc32_l
-#define	DSTBUF_LEN	1
-#define	UTF_XX_INTERNAL	"UTF-32-INTERNAL"
-
-#include "mbrtocXX_iconv.h"
diff --git a/lib/libc_bsd/locale/mbrtocXX_iconv.h b/lib/libc_bsd/locale/mbrtocXX_iconv.h
deleted file mode 100644
index 61df8fe..0000000
--- a/lib/libc_bsd/locale/mbrtocXX_iconv.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * Copyright (c) 2013 Ed Schouten <ed@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbrtocXX_iconv.h 282275 2015-04-30 16:08:47Z tijl $");
-
-#include <sys/queue.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <langinfo.h>
-#include <limits.h>
-#include <string.h>
-#include <uchar.h>
-
-#include "../iconv/citrus_hash.h"
-#include "../iconv/citrus_module.h"
-#include "../iconv/citrus_iconv.h"
-#include "xlocale_private.h"
-
-typedef struct {
-	bool			initialized;
-	struct _citrus_iconv	iconv;
-	char			srcbuf[MB_LEN_MAX];
-	size_t			srcbuf_len;
-	union {
-		charXX_t	widechar[DSTBUF_LEN];
-		char		bytes[sizeof(charXX_t) * DSTBUF_LEN];
-	} dstbuf;
-	size_t			dstbuf_len;
-} _ConversionState;
-_Static_assert(sizeof(_ConversionState) <= sizeof(mbstate_t),
-    "Size of _ConversionState must not exceed mbstate_t's size.");
-
-size_t
-mbrtocXX_l(charXX_t * __restrict pc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps, locale_t locale)
-{
-	_ConversionState *cs;
-	struct _citrus_iconv *handle;
-	size_t i, retval;
-	charXX_t retchar;
-
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->mbrtocXX;
-	cs = (_ConversionState *)ps;
-	handle = &cs->iconv;
-
-	/* Reinitialize mbstate_t. */
-	if (s == NULL || !cs->initialized) {
-		if (_citrus_iconv_open(&handle,
-		    nl_langinfo_l(CODESET, locale), UTF_XX_INTERNAL) != 0) {
-			cs->initialized = false;
-			errno = EINVAL;
-			return (-1);
-		}
-		handle->cv_shared->ci_discard_ilseq = true;
-		handle->cv_shared->ci_hooks = NULL;
-		cs->srcbuf_len = cs->dstbuf_len = 0;
-		cs->initialized = true;
-		if (s == NULL)
-			return (0);
-	}
-
-	/* See if we still have characters left from the previous invocation. */
-	if (cs->dstbuf_len > 0) {
-		retval = (size_t)-3;
-		goto return_char;
-	}
-
-	/* Fill up the read buffer as far as possible. */
-	if (n > sizeof(cs->srcbuf) - cs->srcbuf_len)
-		n = sizeof(cs->srcbuf) - cs->srcbuf_len;
-	memcpy(cs->srcbuf + cs->srcbuf_len, s, n);
-
-	/* Convert as few characters to the dst buffer as possible. */
-	for (i = 0; ; i++) {
-		char *src, *dst;
-		size_t srcleft, dstleft, invlen;
-		int err;
-
-		src = cs->srcbuf;
-		srcleft = cs->srcbuf_len + n;
-		dst = cs->dstbuf.bytes;
-		dstleft = i * sizeof(charXX_t);
-		assert(srcleft <= sizeof(cs->srcbuf) &&
-		    dstleft <= sizeof(cs->dstbuf.bytes));
-		err = _citrus_iconv_convert(handle, &src, &srcleft,
-		    &dst, &dstleft, 0, &invlen);
-		cs->dstbuf_len = (dst - cs->dstbuf.bytes) / sizeof(charXX_t);
-
-		/* Got new character(s). Return the first. */
-		if (cs->dstbuf_len > 0) {
-			assert(src - cs->srcbuf > cs->srcbuf_len);
-			retval = src - cs->srcbuf - cs->srcbuf_len;
-			cs->srcbuf_len = 0;
-			goto return_char;
-		}
-
-		/* Increase dst buffer size, to obtain the surrogate pair. */
-		if (err == E2BIG)
-			continue;
-
-		/* Illegal sequence. */
-		if (invlen > 0) {
-			cs->srcbuf_len = 0;
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-
-		/* Save unprocessed remainder for the next invocation. */
-		memmove(cs->srcbuf, src, srcleft);
-		cs->srcbuf_len = srcleft;
-		return ((size_t)-2);
-	}
-
-return_char:
-	retchar = cs->dstbuf.widechar[0];
-	memmove(&cs->dstbuf.widechar[0], &cs->dstbuf.widechar[1],
-	    --cs->dstbuf_len * sizeof(charXX_t));
-	if (pc != NULL)
-		*pc = retchar;
-	if (retchar == 0)
-		return (0);
-	return (retval);
-}
-
-size_t
-mbrtocXX(charXX_t * __restrict pc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-
-	return (mbrtocXX_l(pc, s, n, ps, __get_locale()));
-}
diff --git a/lib/libc_bsd/locale/mbrtowc.3 b/lib/libc_bsd/locale/mbrtowc.3
deleted file mode 100644
index f66525d..0000000
--- a/lib/libc_bsd/locale/mbrtowc.3
+++ /dev/null
@@ -1,179 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/mbrtowc.3 250883 2013-05-21 19:59:37Z ed $
-.\"
-.Dd May 21, 2013
-.Dt MBRTOWC 3
-.Os
-.Sh NAME
-.Nm mbrtowc ,
-.Nm mbrtoc16 ,
-.Nm mbrtoc32
-.Nd "convert a character to a wide-character code (restartable)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fo mbrtowc
-.Fa "wchar_t * restrict pc" "const char * restrict s" "size_t n"
-.Fa "mbstate_t * restrict ps"
-.Fc
-.In uchar.h
-.Ft size_t
-.Fo mbrtoc16
-.Fa "char16_t * restrict pc" "const char * restrict s" "size_t n"
-.Fa "mbstate_t * restrict ps"
-.Fc
-.Ft size_t
-.Fo mbrtoc32
-.Fa "char32_t * restrict pc" "const char * restrict s" "size_t n"
-.Fa "mbstate_t * restrict ps"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn mbrtowc ,
-.Fn mbrtoc16
-and
-.Fn mbrtoc32
-functions inspect at most
-.Fa n
-bytes pointed to by
-.Fa s
-to determine the number of bytes needed to complete the next multibyte
-character.
-If a character can be completed, and
-.Fa pc
-is not
-.Dv NULL ,
-the wide character which is represented by
-.Fa s
-is stored in the
-.Vt wchar_t ,
-.Vt char16_t
-or
-.Vt char32_t
-it points to.
-.Pp
-If
-.Fa s
-is
-.Dv NULL ,
-these functions behave as if
-.Fa pc
-was
-.Dv NULL ,
-.Fa s
-was an empty string
-.Pq Qq
-and
-.Fa n
-was 1.
-.Pp
-The
-.Vt mbstate_t
-argument,
-.Fa ps ,
-is used to keep track of the shift state.
-If it is
-.Dv NULL ,
-these functions use an internal, static
-.Vt mbstate_t
-object, which is initialized to the initial conversion state
-at program startup.
-.Pp
-As a single
-.Vt char16_t
-is not large enough to represent certain multibyte characters, the
-.Fn mbrtoc16
-function may need to be invoked multiple times to convert a single
-multibyte character sequence.
-.Sh RETURN VALUES
-The
-.Fn mbrtowc ,
-.Fn mbrtoc16
-and
-.Fn mbrtoc32
-functions return:
-.Bl -tag -width indent
-.It 0
-The next
-.Fa n
-or fewer bytes
-represent the null wide character
-.Pq Li "L'\e0'" .
-.It >0
-The next
-.Fa n
-or fewer bytes represent a valid character, these functions
-return the number of bytes used to complete the multibyte character.
-.It Po Vt size_t Pc Ns \-1
-An encoding error has occurred.
-The next
-.Fa n
-or fewer bytes do not contribute to a valid multibyte character.
-.It Po Vt size_t Pc Ns \-2
-The next
-.Fa n
-contribute to, but do not complete, a valid multibyte character sequence,
-and all
-.Fa n
-bytes have been processed.
-.El
-.Pp
-The
-.Fn mbrtoc16
-function also returns:
-.Bl -tag -width indent
-.It Po Vt size_t Pc Ns \-3
-The next character resulting from a previous call has been stored.
-No bytes from the input have been consumed.
-.El
-.Sh ERRORS
-The
-.Fn mbrtowc ,
-.Fn mbrtoc16
-and
-.Fn mbrtoc32
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid multibyte sequence was detected.
-.It Bq Er EINVAL
-The conversion state is invalid.
-.El
-.Sh SEE ALSO
-.Xr mbtowc 3 ,
-.Xr multibyte 3 ,
-.Xr setlocale 3 ,
-.Xr wcrtomb 3
-.Sh STANDARDS
-The
-.Fn mbrtowc ,
-.Fn mbrtoc16
-and
-.Fn mbrtoc32
-functions conform to
-.St -isoC-2011 .
diff --git a/lib/libc_bsd/locale/mbrtowc.c b/lib/libc_bsd/locale/mbrtowc.c
deleted file mode 100644
index 8f6fc11..0000000
--- a/lib/libc_bsd/locale/mbrtowc.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbrtowc.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbrtowc_l(wchar_t * __restrict pwc, const char * __restrict s,
-    size_t n, mbstate_t * __restrict ps, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->mbrtowc;
-	return (XLOCALE_CTYPE(locale)->__mbrtowc(pwc, s, n, ps));
-}
-
-size_t
-mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
-    size_t n, mbstate_t * __restrict ps)
-{
-	return mbrtowc_l(pwc, s, n, ps, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/mbsinit.3 b/lib/libc_bsd/locale/mbsinit.3
deleted file mode 100644
index dc74fa6..0000000
--- a/lib/libc_bsd/locale/mbsinit.3
+++ /dev/null
@@ -1,67 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/mbsinit.3 128032 2004-04-08 09:59:02Z tjr $
-.\"
-.Dd April 8, 2004
-.Dt MBSINIT 3
-.Os
-.Sh NAME
-.Nm mbsinit
-.Nd "determine conversion object status"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn mbsinit "const mbstate_t *ps"
-.Sh DESCRIPTION
-The
-.Fn mbsinit
-function determines whether the
-.Vt mbstate_t
-object pointed to by
-.Fa ps
-describes an initial conversion state.
-.Sh RETURN VALUES
-The
-.Fn mbsinit
-function returns non-zero if
-.Fa ps
-is
-.Dv NULL
-or describes an initial conversion state,
-otherwise it returns zero.
-.Sh SEE ALSO
-.Xr mbrlen 3 ,
-.Xr mbrtowc 3 ,
-.Xr mbsrtowcs 3 ,
-.Xr multibyte 3 ,
-.Xr wcrtomb 3 ,
-.Xr wcsrtombs 3
-.Sh STANDARDS
-The
-.Fn mbsinit
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/mbsinit.c b/lib/libc_bsd/locale/mbsinit.c
deleted file mode 100644
index 6dd4c30..0000000
--- a/lib/libc_bsd/locale/mbsinit.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbsinit.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-mbsinit_l(const mbstate_t *ps, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	return (XLOCALE_CTYPE(locale)->__mbsinit(ps));
-}
-int
-mbsinit(const mbstate_t *ps)
-{
-	return mbsinit_l(ps, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/mbsnrtowcs.c b/lib/libc_bsd/locale/mbsnrtowcs.c
deleted file mode 100644
index a26aa6a..0000000
--- a/lib/libc_bsd/locale/mbsnrtowcs.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbsnrtowcs.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbsnrtowcs_l(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->mbsnrtowcs;
-	return (XLOCALE_CTYPE(locale)->__mbsnrtowcs(dst, src, nms, len, ps));
-}
-size_t
-mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps)
-{
-	return mbsnrtowcs_l(dst, src, nms, len, ps, __get_locale());
-}
-
-size_t
-__mbsnrtowcs_std(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps)
-{
-	const char *s;
-	size_t nchr;
-	wchar_t wc;
-	size_t nb;
-	struct xlocale_ctype *ct = XLOCALE_CTYPE(__get_locale());
-
-	s = *src;
-	nchr = 0;
-
-	if (dst == NULL) {
-		for (;;) {
-			if ((nb = ct->__mbrtowc(&wc, s, nms, ps)) == (size_t)-1)
-				/* Invalid sequence - mbrtowc() sets errno. */
-				return ((size_t)-1);
-			else if (nb == 0 || nb == (size_t)-2)
-				return (nchr);
-			s += nb;
-			nms -= nb;
-			nchr++;
-		}
-		/*NOTREACHED*/
-	}
-
-	while (len-- > 0) {
-		if ((nb = ct->__mbrtowc(dst, s, nms, ps)) == (size_t)-1) {
-			*src = s;
-			return ((size_t)-1);
-		} else if (nb == (size_t)-2) {
-			*src = s + nms;
-			return (nchr);
-		} else if (nb == 0) {
-			*src = NULL;
-			return (nchr);
-		}
-		s += nb;
-		nms -= nb;
-		nchr++;
-		dst++;
-	}
-	*src = s;
-	return (nchr);
-}
diff --git a/lib/libc_bsd/locale/mbsrtowcs.3 b/lib/libc_bsd/locale/mbsrtowcs.3
deleted file mode 100644
index 2c18188..0000000
--- a/lib/libc_bsd/locale/mbsrtowcs.3
+++ /dev/null
@@ -1,135 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/mbsrtowcs.3 140081 2005-01-11 20:50:51Z ru $
-.Dd July 21, 2004
-.Dt MBSRTOWCS 3
-.Os
-.Sh NAME
-.Nm mbsrtowcs ,
-.Nm mbsnrtowcs
-.Nd "convert a character string to a wide-character string (restartable)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fo mbsrtowcs
-.Fa "wchar_t * restrict dst" "const char ** restrict src" "size_t len"
-.Fa "mbstate_t * restrict ps"
-.Fc
-.Ft size_t
-.Fo mbsnrtowcs
-.Fa "wchar_t * restrict dst" "const char ** restrict src" "size_t nms"
-.Fa "size_t len" "mbstate_t * restrict ps"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn mbsrtowcs
-function converts a sequence of multibyte characters pointed to indirectly by
-.Fa src
-into a sequence of corresponding wide characters and stores at most
-.Fa len
-of them in the
-.Vt wchar_t
-array pointed to by
-.Fa dst ,
-until it encounters a terminating null character
-.Pq Li '\e0' .
-.Pp
-If
-.Fa dst
-is
-.Dv NULL ,
-no characters are stored.
-.Pp
-If
-.Fa dst
-is not
-.Dv NULL ,
-the pointer pointed to by
-.Fa src
-is updated to point to the character after the one that conversion stopped at.
-If conversion stops because a null character is encountered,
-.Fa *src
-is set to
-.Dv NULL .
-.Pp
-The
-.Vt mbstate_t
-argument,
-.Fa ps ,
-is used to keep track of the shift state.
-If it is
-.Dv NULL ,
-.Fn mbsrtowcs
-uses an internal, static
-.Vt mbstate_t
-object, which is initialized to the initial conversion state
-at program startup.
-.Pp
-The
-.Fn mbsnrtowcs
-function behaves identically to
-.Fn mbsrtowcs ,
-except that conversion stops after reading at most
-.Fa nms
-bytes from the buffer pointed to by
-.Fa src .
-.Sh RETURN VALUES
-The
-.Fn mbsrtowcs
-and
-.Fn mbsnrtowcs
-functions return the number of wide characters stored in
-the array pointed to by
-.Fa dst
-if successful, otherwise it returns
-.Po Vt size_t Pc Ns \-1 .
-.Sh ERRORS
-The
-.Fn mbsrtowcs
-and
-.Fn mbsnrtowcs
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid multibyte character sequence was encountered.
-.It Bq Er EINVAL
-The conversion state is invalid.
-.El
-.Sh SEE ALSO
-.Xr mbrtowc 3 ,
-.Xr mbstowcs 3 ,
-.Xr multibyte 3 ,
-.Xr wcsrtombs 3
-.Sh STANDARDS
-The
-.Fn mbsrtowcs
-function conforms to
-.St -isoC-99 .
-.Pp
-The
-.Fn mbsnrtowcs
-function is an extension to the standard.
diff --git a/lib/libc_bsd/locale/mbsrtowcs.c b/lib/libc_bsd/locale/mbsrtowcs.c
deleted file mode 100644
index 10a2680..0000000
--- a/lib/libc_bsd/locale/mbsrtowcs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbsrtowcs.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbsrtowcs_l(wchar_t * __restrict dst, const char ** __restrict src, size_t len,
-    mbstate_t * __restrict ps, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->mbsrtowcs;
-	return (XLOCALE_CTYPE(locale)->__mbsnrtowcs(dst, src, SIZE_T_MAX, len, ps));
-}
-size_t
-mbsrtowcs(wchar_t * __restrict dst, const char ** __restrict src, size_t len,
-    mbstate_t * __restrict ps)
-{
-	return mbsrtowcs_l(dst, src, len, ps, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/mbstowcs.3 b/lib/libc_bsd/locale/mbstowcs.3
deleted file mode 100644
index 556eca5..0000000
--- a/lib/libc_bsd/locale/mbstowcs.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley of BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
-.\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD: releng/10.2/lib/libc/locale/mbstowcs.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 8, 2004
-.Dt MBSTOWCS 3
-.Os
-.Sh NAME
-.Nm mbstowcs
-.Nd convert a character string to a wide-character string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft size_t
-.Fo mbstowcs
-.Fa "wchar_t * restrict wcstring" "const char * restrict mbstring"
-.Fa "size_t nwchars"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn mbstowcs
-function converts a multibyte character string
-.Fa mbstring
-beginning in the initial conversion state
-into a wide character string
-.Fa wcstring .
-No more than
-.Fa nwchars
-wide characters are stored.
-A terminating null wide character is appended if there is room.
-.Sh RETURN VALUES
-The
-.Fn mbstowcs
-function returns the number of wide characters converted,
-not counting any terminating null wide character, or \-1
-if an invalid multibyte character was encountered.
-.Sh ERRORS
-The
-.Fn mbstowcs
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid multibyte sequence was detected.
-.It Bq Er EINVAL
-The conversion state is invalid.
-.El
-.Sh SEE ALSO
-.Xr mbsrtowcs 3 ,
-.Xr mbtowc 3 ,
-.Xr multibyte 3
-.Sh STANDARDS
-The
-.Fn mbstowcs
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/mbstowcs.c b/lib/libc_bsd/locale/mbstowcs.c
deleted file mode 100644
index 879c636..0000000
--- a/lib/libc_bsd/locale/mbstowcs.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbstowcs.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-mbstowcs_l(wchar_t * __restrict pwcs, const char * __restrict s, size_t n, locale_t locale)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	const char *sp;
-	FIX_LOCALE(locale);
-
-	mbs = initial;
-	sp = s;
-	return (XLOCALE_CTYPE(locale)->__mbsnrtowcs(pwcs, &sp, SIZE_T_MAX, n, &mbs));
-}
-size_t
-mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n)
-{
-	return mbstowcs_l(pwcs, s, n, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/mbtowc.3 b/lib/libc_bsd/locale/mbtowc.3
deleted file mode 100644
index d56a309..0000000
--- a/lib/libc_bsd/locale/mbtowc.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley of BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
-.\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD: releng/10.2/lib/libc/locale/mbtowc.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 11, 2004
-.Dt MBTOWC 3
-.Os
-.Sh NAME
-.Nm mbtowc
-.Nd convert a character to a wide-character code
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fo mbtowc
-.Fa "wchar_t * restrict wcharp" "const char * restrict mbchar"
-.Fa "size_t nbytes"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn mbtowc
-function converts a multibyte character
-.Fa mbchar
-into a wide character according to the current conversion state,
-and stores the result
-in the object pointed to by
-.Fa wcharp .
-Up to
-.Fa nbytes
-bytes are examined.
-.Pp
-A call with a null
-.Fa mbchar
-pointer returns nonzero if the current encoding requires shift states,
-zero otherwise;
-if shift states are required, the shift state is reset to the initial state.
-.Sh RETURN VALUES
-If
-.Fa mbchar
-is
-.Dv NULL ,
-the
-.Fn mbtowc
-function returns nonzero if shift states are supported,
-zero otherwise.
-.Pp
-Otherwise, if
-.Fa mbchar
-is not a null pointer,
-.Fn mbtowc
-either returns 0 if
-.Fa mbchar
-represents the null wide character, or returns
-the number of bytes processed in
-.Fa mbchar ,
-or returns \-1 if no multibyte character
-could be recognized or converted.
-In this case,
-.Fn mbtowc Ns 's
-internal conversion state is undefined.
-.Sh ERRORS
-The
-.Fn mbtowc
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid multibyte sequence was detected.
-.It Bq Er EINVAL
-The internal conversion state is invalid.
-.El
-.Sh SEE ALSO
-.Xr btowc 3 ,
-.Xr mblen 3 ,
-.Xr mbrtowc 3 ,
-.Xr mbstowcs 3 ,
-.Xr multibyte 3 ,
-.Xr wctomb 3
-.Sh STANDARDS
-The
-.Fn mbtowc
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/mbtowc.c b/lib/libc_bsd/locale/mbtowc.c
deleted file mode 100644
index b5bfda0..0000000
--- a/lib/libc_bsd/locale/mbtowc.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mbtowc.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-mbtowc_l(wchar_t * __restrict pwc, const char * __restrict s, size_t n, locale_t locale)
-{
-	static const mbstate_t initial;
-	size_t rval;
-	FIX_LOCALE(locale);
-
-	if (s == NULL) {
-		/* No support for state dependent encodings. */
-		locale->mbtowc = initial;
-		return (0);
-	}
-	rval = XLOCALE_CTYPE(locale)->__mbrtowc(pwc, s, n, &locale->mbtowc);
-	if (rval == (size_t)-1 || rval == (size_t)-2)
-		return (-1);
-	return ((int)rval);
-}
-int
-mbtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n)
-{
-	return mbtowc_l(pwc, s, n, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/mskanji.5 b/lib/libc_bsd/locale/mskanji.5
deleted file mode 100644
index 1c0a292..0000000
--- a/lib/libc_bsd/locale/mskanji.5
+++ /dev/null
@@ -1,70 +0,0 @@
-.\" Copyright (c) 2002, 2003 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/mskanji.5 131608 2004-07-05 06:39:03Z ru $
-.\"
-.Dd August 7, 2003
-.Dt MSKANJI 5
-.Os
-.Sh NAME
-.Nm mskanji
-.Nd "Shift-JIS (MS Kanji) encoding for Japanese text"
-.Sh SYNOPSIS
-.Nm ENCODING
-.Qq MSKanji
-.Sh DESCRIPTION
-Shift-JIS, also known as MS Kanji or SJIS, is an encoding system for
-Japanese characters, developed by Microsoft Corporation.
-It encodes the characters from the
-.Tn JIS
-X 0201 (ASCII/JIS-Roman) and
-.Tn JIS
-X 0208 (Japanese) character sets as sequences of either one or two bytes.
-.Pp
-Characters from the
-.Tn ASCII Ns
-/JIS-Roman character set are encoded as single bytes between 0x00 and 0x7F
-(ASCII) or 0xA1 and 0xDF (Half-width katakana).
-.Pp
-Characters from the
-.Tn JIS
-X 0208 character set are encoded as two bytes.
-The first ranges from
-0x81 - 0x9F, 0xE0 - 0xEA, 0xED - 0xEE (not
-.Tn JIS :
-.Tn NEC Ns - Ns
-selected
-.Tn IBM
-extended characters),
-0xF0 - 0xF9 (not
-.Tn JIS :
-user defined),
-or 0xFA - 0xFC (not
-.Tn JIS :
-.Tn IBM
-extended characters).
-The second byte ranges from 0x40 - 0xFC, excluding 0x7F (delete).
-.Sh SEE ALSO
-.Xr euc 5 ,
-.Xr utf8 5
diff --git a/lib/libc_bsd/locale/mskanji.c b/lib/libc_bsd/locale/mskanji.c
deleted file mode 100644
index f5eb7c6..0000000
--- a/lib/libc_bsd/locale/mskanji.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- *
- *    ja_JP.SJIS locale table for BSD4.4/rune
- *    version 1.0
- *    (C) Sin'ichiro MIYATANI / Phase One, Inc
- *    May 12, 1995
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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 Phase One, Inc.
- * 4. The name of Phase One, Inc. 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.  
- */  
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mskanji.c	1.0 (Phase One) 5/5/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/mskanji.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <sys/types.h>
-#include <errno.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-extern int __mb_sb_limit;
-
-static size_t	_MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_MSKanji_mbsinit(const mbstate_t *);
-static size_t	_MSKanji_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-
-typedef struct {
-	wchar_t	ch;
-} _MSKanjiState;
-
-int
-_MSKanji_init(struct xlocale_ctype *l, _RuneLocale *rl)
-{
-
-	l->__mbrtowc = _MSKanji_mbrtowc;
-	l->__wcrtomb = _MSKanji_wcrtomb;
-	l->__mbsinit = _MSKanji_mbsinit;
-	l->runes = rl;
-	l->__mb_cur_max = 2;
-	l->__mb_sb_limit = 256;
-	return (0);
-}
-
-static int
-_MSKanji_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _MSKanjiState *)ps)->ch == 0);
-}
-
-static size_t
-_MSKanji_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_MSKanjiState *ms;
-	wchar_t wc;
-
-	ms = (_MSKanjiState *)ps;
-
-	if ((ms->ch & ~0xFF) != 0) {
-		/* Bad conversion state. */
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	if (ms->ch != 0) {
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (ms->ch << 8) | (*s & 0xFF);
-		if (pwc != NULL)
-			*pwc = wc;
-		ms->ch = 0;
-		return (1);
-	}
-	wc = *s++ & 0xff;
-	if ((wc > 0x80 && wc < 0xa0) || (wc >= 0xe0 && wc < 0xfd)) {
-		if (n < 2) {
-			/* Incomplete multibyte sequence */
-			ms->ch = wc;
-			return ((size_t)-2);
-		}
-		if (*s == '\0') {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wc = (wc << 8) | (*s++ & 0xff);
-		if (pwc != NULL)
-			*pwc = wc;
-		return (2);
-	} else {
-		if (pwc != NULL)
-			*pwc = wc;
-		return (wc == L'\0' ? 0 : 1);
-	}
-}
-
-static size_t
-_MSKanji_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_MSKanjiState *ms;
-	int len, i;
-
-	ms = (_MSKanjiState *)ps;
-
-	if (ms->ch != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	len = (wc > 0x100) ? 2 : 1;
-	for (i = len; i-- > 0; )
-		*s++ = wc >> (i << 3);
-	return (len);
-}
diff --git a/lib/libc_bsd/locale/multibyte.3 b/lib/libc_bsd/locale/multibyte.3
deleted file mode 100644
index 9282afd..0000000
--- a/lib/libc_bsd/locale/multibyte.3
+++ /dev/null
@@ -1,142 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley of BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)multibyte.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/multibyte.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 8, 2004
-.Dt MULTIBYTE 3
-.Os
-.Sh NAME
-.Nm multibyte
-.Nd multibyte and wide character manipulation functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In limits.h
-.In stdlib.h
-.In wchar.h
-.Sh DESCRIPTION
-The basic elements of some written natural languages, such as Chinese,
-cannot be represented uniquely with single C
-.Vt char Ns s .
-The C standard supports two different ways of dealing with
-extended natural language encodings:
-wide characters and
-multibyte characters.
-Wide characters are an internal representation
-which allows each basic element to map
-to a single object of type
-.Vt wchar_t .
-Multibyte characters are used for input and output
-and code each basic element as a sequence of C
-.Vt char Ns s .
-Individual basic elements may map into one or more
-(up to
-.Dv MB_LEN_MAX )
-bytes in a multibyte character.
-.Pp
-The current locale
-.Pq Xr setlocale 3
-governs the interpretation of wide and multibyte characters.
-The locale category
-.Dv LC_CTYPE
-specifically controls this interpretation.
-The
-.Vt wchar_t
-type is wide enough to hold the largest value
-in the wide character representations for all locales.
-.Pp
-Multibyte strings may contain
-.Sq shift
-indicators to switch to and from
-particular modes within the given representation.
-If explicit bytes are used to signal shifting,
-these are not recognized as separate characters
-but are lumped with a neighboring character.
-There is always a distinguished
-.Sq initial
-shift state.
-Some functions (e.g.,
-.Xr mblen 3 ,
-.Xr mbtowc 3
-and
-.Xr wctomb 3 )
-maintain static shift state internally, whereas
-others store it in an
-.Vt mbstate_t
-object passed by the caller.
-Shift states are undefined after a call to
-.Xr setlocale 3
-with the
-.Dv LC_CTYPE
-or
-.Dv LC_ALL
-categories.
-.Pp
-For convenience in processing,
-the wide character with value 0
-(the null wide character)
-is recognized as the wide character string terminator,
-and the character with value 0
-(the null byte)
-is recognized as the multibyte character string terminator.
-Null bytes are not permitted within multibyte characters.
-.Pp
-The C library provides the following functions for dealing with
-multibyte characters:
-.Bl -column "Description"
-.It Sy "Function	Description"
-.It Xr mblen 3 Ta "get number of bytes in a character"
-.It Xr mbrlen 3 Ta "get number of bytes in a character (restartable)"
-.It Xr mbrtowc 3 Ta "convert a character to a wide-character code (restartable)"
-.It Xr mbsrtowcs 3 Ta "convert a character string to a wide-character string (restartable)"
-.It Xr mbstowcs 3 Ta "convert a character string to a wide-character string"
-.It Xr mbtowc 3 Ta "convert a character to a wide-character code"
-.It Xr wcrtomb 3 Ta "convert a wide-character code to a character (restartable)"
-.It Xr wcstombs 3 Ta "convert a wide-character string to a character string"
-.It Xr wcsrtombs 3 Ta "convert a wide-character string to a character string (restartable)"
-.It Xr wctomb 3 Ta "convert a wide-character code to a character"
-.El
-.Sh SEE ALSO
-.Xr mklocale 1 ,
-.Xr setlocale 3 ,
-.Xr stdio 3 ,
-.Xr big5 5 ,
-.Xr euc 5 ,
-.Xr gb18030 5 ,
-.Xr gb2312 5 ,
-.Xr gbk 5 ,
-.Xr mskanji 5 ,
-.Xr utf8 5
-.Sh STANDARDS
-These functions conform to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/newlocale.3 b/lib/libc_bsd/locale/newlocale.3
deleted file mode 100644
index 2e5f7ad..0000000
--- a/lib/libc_bsd/locale/newlocale.3
+++ /dev/null
@@ -1,112 +0,0 @@
-.\" Copyright (c) 2011 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by David Chisnall under sponsorship from
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/locale/newlocale.3 250244 2013-05-04 17:06:47Z pluknet $
-.Dd September 17, 2011
-.Dt NEWLOCALE 3
-.Os
-.Sh NAME
-.Nm newlocale
-.Nd Creates a new locale
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In xlocale
-.Ft locale_t
-.Fn newlocale "int mask" "const char * locale" "locale_t base"
-.Sh DESCRIPTION
-Creates a new locale, inheriting some properties from an existing locale.
-The
-.Fa mask
-defines the components that the new locale will have set to the locale with the
-name specified in the
-.Fa locale
-parameter.
-Any other components will be inherited from
-.Fa base .
-The
-.Fa mask
-is either
-.Fa LC_ALL_MASK ,
-indicating all possible locale components,
-or the logical OR of some combination of the following:
-.Bl -tag -width "LC_MESSAGES_MASK" -offset indent
-.It LC_COLLATE_MASK
-The locale for string collation routines.
-This controls alphabetic ordering in
-.Xr strcoll 3
-and
-.Xr strxfrm 3 .
-.It LC_CTYPE_MASK
-The locale for the
-.Xr ctype 3
-and
-.Xr multibyte 3
-functions.
-This controls recognition of upper and lower case, alphabetic or
-non-alphabetic characters, and so on.
-.It LC_MESSAGES_MASK
-Set a locale for message catalogs, see
-.Xr catopen 3
-function.
-.It LC_MONETARY_MASK
-Set a locale for formatting monetary values; this affects
-the
-.Xr localeconv 3
-function.
-.It LC_NUMERIC_MASK
-Set a locale for formatting numbers.
-This controls the formatting of decimal points in input and output of floating
-point numbers in functions such as
-.Xr printf 3
-and
-.Xr scanf 3 ,
-as well as values returned by
-.Xr localeconv 3 .
-.It LC_TIME_MASK
-Set a locale for formatting dates and times using the
-.Xr strftime 3
-function.
-.El
-This function uses the same rules for loading locale components as
-.Xr setlocale 3 .
-.Sh RETURN VALUES
-Returns a new, valid,
-.Fa locale_t
-or NULL if an error occurs.
-You must free the returned locale with
-.Xr freelocale 3 .
-.Sh SEE ALSO
-.Xr duplocale 3 ,
-.Xr freelocale 3 ,
-.Xr localeconv 3 ,
-.Xr querylocale 3 ,
-.Xr uselocale 3 ,
-.Xr xlocale 3
-.Sh STANDARDS
-This function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/nextwctype.3 b/lib/libc_bsd/locale/nextwctype.3
deleted file mode 100644
index dea962a..0000000
--- a/lib/libc_bsd/locale/nextwctype.3
+++ /dev/null
@@ -1,67 +0,0 @@
-.\"
-.\" Copyright (c) 2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/nextwctype.3 148232 2005-07-21 10:27:45Z tjr $
-.\"
-.Dd July 21, 2005
-.Dt NEXTWCTYPE 3
-.Os
-.Sh NAME
-.Nm nextwctype
-.Nd "iterate through character classes"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wctype.h
-.Ft wint_t
-.Fn nextwctype "wint_t ch" "wctype_t wct"
-.Sh DESCRIPTION
-The
-.Fn nextwctype
-function determines the next character after
-.Fa ch
-that is a member of character class
-.Fa wct .
-If
-.Fa ch
-is \-1, the search begins at the first member of
-.Fa wct .
-.Sh RETURN VALUES
-The
-.Fn nextwctype
-function returns the next character, or \-1 if there are no more.
-.Sh COMPATIBILITY
-This function is a non-standard
-.Fx
-extension and should not be used where the standard
-.Fn iswctype
-function would suffice.
-.Sh SEE ALSO
-.Xr wctype 3
-.Sh HISTORY
-The
-.Fn nextwctype
-function appeared in
-.Fx 5.4 .
diff --git a/lib/libc_bsd/locale/nextwctype.c b/lib/libc_bsd/locale/nextwctype.c
deleted file mode 100644
index 639fcf2..0000000
--- a/lib/libc_bsd/locale/nextwctype.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/nextwctype.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <runetype.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "mblocal.h"
-
-wint_t
-nextwctype_l(wint_t wc, wctype_t wct, locale_t locale)
-{
-	size_t lim;
-	FIX_LOCALE(locale);
-	_RuneLocale *runes = XLOCALE_CTYPE(locale)->runes;
-	_RuneRange *rr = &runes->__runetype_ext;
-	_RuneEntry *base, *re;
-	int noinc;
-
-	noinc = 0;
-	if (wc < _CACHED_RUNES) {
-		wc++;
-		while (wc < _CACHED_RUNES) {
-			if (runes->__runetype[wc] & wct)
-				return (wc);
-			wc++;
-		}
-		wc--;
-	}
-	if (rr->__ranges != NULL && wc < rr->__ranges[0].__min) {
-		wc = rr->__ranges[0].__min;
-		noinc = 1;
-	}
-
-	/* Binary search -- see bsearch.c for explanation. */
-	base = rr->__ranges;
-	for (lim = rr->__nranges; lim != 0; lim >>= 1) {
-		re = base + (lim >> 1);
-		if (re->__min <= wc && wc <= re->__max)
-			goto found;
-		else if (wc > re->__max) {
-			base = re + 1;
-			lim--;
-		}
-	}
-	return (-1);
-found:
-	if (!noinc)
-		wc++;
-	if (re->__min <= wc && wc <= re->__max) {
-		if (re->__types != NULL) {
-			for (; wc <= re->__max; wc++)
-				if (re->__types[wc - re->__min] & wct)
-					return (wc);
-		} else if (re->__map & wct)
-			return (wc);
-	}
-	while (++re < rr->__ranges + rr->__nranges) {
-		wc = re->__min;
-		if (re->__types != NULL) {
-			for (; wc <= re->__max; wc++)
-				if (re->__types[wc - re->__min] & wct)
-					return (wc);
-		} else if (re->__map & wct)
-			return (wc);
-	}
-	return (-1);
-}
-wint_t
-nextwctype(wint_t wc, wctype_t wct)
-{
-	return nextwctype_l(wc, wct, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/nl_langinfo.3 b/lib/libc_bsd/locale/nl_langinfo.3
deleted file mode 100644
index 3dfbee2..0000000
--- a/lib/libc_bsd/locale/nl_langinfo.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" Copyright (c) 2001 Alexey Zelkin <phantom@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.
-.\"
-.\" 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 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/locale/nl_langinfo.3 238919 2012-07-30 20:56:19Z issyl0 $
-.\"
-.Dd July 30, 2012
-.Dt NL_LANGINFO 3
-.Os
-.Sh NAME
-.Nm nl_langinfo
-.Nd language information
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In langinfo.h
-.Ft char *
-.Fn nl_langinfo "nl_item item"
-.Ft char *
-.Fn nl_langinfo_l "nl_item item" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn nl_langinfo
-function returns a pointer to a string containing information relevant to
-the particular language or cultural area defined in the program or thread's
-locale, or in the case of
-.Fn nl_langinfo_l ,
-the locale passed as the second argument.
-The manifest constant names and values of
-.Fa item
-are defined in
-.In langinfo.h .
-.Pp
-Calls to
-.Fn setlocale
-with a category corresponding to the category of
-.Fa item ,
-or to the
-category
-.Dv LC_ALL ,
-may overwrite the buffer pointed to by the return value.
-.Sh RETURN VALUES
-In a locale where langinfo data is not defined,
-.Fn nl_langinfo
-returns a pointer to the corresponding string in the
-.Tn POSIX
-locale.
-.Fn nl_langinfo_l
-returns the same values as
-.Fn nl_langinfo .
-In all locales,
-.Fn nl_langinfo
-returns a pointer to an empty string if
-.Fa item
-contains an invalid setting.
-.Sh EXAMPLES
-For example:
-.Pp
-.Dl nl_langinfo(ABDAY_1)
-.Pp
-would return a pointer to the string
-.Qq Li Dom
-if the identified language was
-Portuguese, and
-.Qq Li Sun
-if the identified language was English.
-.Sh SEE ALSO
-.Xr setlocale 3
-.Sh STANDARDS
-The
-.Fn nl_langinfo
-function conforms to
-.St -susv2 .
-The
-.Fn nl_langinfo_l
-function conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn nl_langinfo
-function first appeared in
-.Fx 4.6 .
diff --git a/lib/libc_bsd/locale/nl_langinfo.c b/lib/libc_bsd/locale/nl_langinfo.c
deleted file mode 100644
index 9909fd0..0000000
--- a/lib/libc_bsd/locale/nl_langinfo.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*-
- * Copyright (c) 2001, 2003 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/nl_langinfo.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <langinfo.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "lnumeric.h"
-#include "lmessages.h"
-#include "lmonetary.h"
-#include "../stdtime/timelocal.h"
-
-#define _REL(BASE) ((int)item-BASE)
-
-char *
-nl_langinfo_l(nl_item item, locale_t loc)
-{
-   char *ret, *cs;
-   const char *s;
-   FIX_LOCALE(loc);
-
-   switch (item) {
-	case CODESET:
-		ret = "";
-		if ((s = querylocale(LC_CTYPE_MASK, loc)) != NULL) {
-			if ((cs = strchr(s, '.')) != NULL)
-				ret = cs + 1;
-			else if (strcmp(s, "C") == 0 ||
-				 strcmp(s, "POSIX") == 0)
-				ret = "US-ASCII";
-		}
-		break;
-	case D_T_FMT:
-		ret = (char *) __get_current_time_locale(loc)->c_fmt;
-		break;
-	case D_FMT:
-		ret = (char *) __get_current_time_locale(loc)->x_fmt;
-		break;
-	case T_FMT:
-		ret = (char *) __get_current_time_locale(loc)->X_fmt;
-		break;
-	case T_FMT_AMPM:
-		ret = (char *) __get_current_time_locale(loc)->ampm_fmt;
-		break;
-	case AM_STR:
-		ret = (char *) __get_current_time_locale(loc)->am;
-		break;
-	case PM_STR:
-		ret = (char *) __get_current_time_locale(loc)->pm;
-		break;
-	case DAY_1: case DAY_2: case DAY_3:
-	case DAY_4: case DAY_5: case DAY_6: case DAY_7:
-		ret = (char*) __get_current_time_locale(loc)->weekday[_REL(DAY_1)];
-		break;
-	case ABDAY_1: case ABDAY_2: case ABDAY_3:
-	case ABDAY_4: case ABDAY_5: case ABDAY_6: case ABDAY_7:
-		ret = (char*) __get_current_time_locale(loc)->wday[_REL(ABDAY_1)];
-		break;
-	case MON_1: case MON_2: case MON_3: case MON_4:
-	case MON_5: case MON_6: case MON_7: case MON_8:
-	case MON_9: case MON_10: case MON_11: case MON_12:
-		ret = (char*) __get_current_time_locale(loc)->month[_REL(MON_1)];
-		break;
-	case ABMON_1: case ABMON_2: case ABMON_3: case ABMON_4:
-	case ABMON_5: case ABMON_6: case ABMON_7: case ABMON_8:
-	case ABMON_9: case ABMON_10: case ABMON_11: case ABMON_12:
-		ret = (char*) __get_current_time_locale(loc)->mon[_REL(ABMON_1)];
-		break;
-	case ALTMON_1: case ALTMON_2: case ALTMON_3: case ALTMON_4:
-	case ALTMON_5: case ALTMON_6: case ALTMON_7: case ALTMON_8:
-	case ALTMON_9: case ALTMON_10: case ALTMON_11: case ALTMON_12:
-		ret = (char*)
-		    __get_current_time_locale(loc)->alt_month[_REL(ALTMON_1)];
-		break;
-	case ERA:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ERA_D_FMT:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ERA_D_T_FMT:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ERA_T_FMT:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case ALT_DIGITS:
-		/* XXX: need to be implemented  */
-		ret = "";
-		break;
-	case RADIXCHAR:
-		ret = (char*) __get_current_numeric_locale(loc)->decimal_point;
-		break;
-	case THOUSEP:
-		ret = (char*) __get_current_numeric_locale(loc)->thousands_sep;
-		break;
-	case YESEXPR:
-		ret = (char*) __get_current_messages_locale(loc)->yesexpr;
-		break;
-	case NOEXPR:
-		ret = (char*) __get_current_messages_locale(loc)->noexpr;
-		break;
-	/*
-	 * YESSTR and NOSTR items marked with LEGACY are available, but not
-	 * recomended by SUSv2 to be used in portable applications since
-	 * they're subject to remove in future specification editions.
-	 */
-	case YESSTR:            /* LEGACY  */
-		ret = (char*) __get_current_messages_locale(loc)->yesstr;
-		break;
-	case NOSTR:             /* LEGACY  */
-		ret = (char*) __get_current_messages_locale(loc)->nostr;
-		break;
-	/*
-	 * SUSv2 special formatted currency string 
-	 */
-	case CRNCYSTR:
-		ret = "";
-		cs = (char*) __get_current_monetary_locale(loc)->currency_symbol;
-		if (*cs != '\0') {
-			char pos = localeconv_l(loc)->p_cs_precedes;
-
-			if (pos == localeconv_l(loc)->n_cs_precedes) {
-				char psn = '\0';
-
-				if (pos == CHAR_MAX) {
-					if (strcmp(cs, __get_current_monetary_locale(loc)->mon_decimal_point) == 0)
-						psn = '.';
-				} else
-					psn = pos ? '-' : '+';
-				if (psn != '\0') {
-					int clen = strlen(cs);
-
-					if ((loc->csym = reallocf(loc->csym, clen + 2)) != NULL) {
-						*loc->csym = psn;
-						strcpy(loc->csym + 1, cs);
-						ret = loc->csym;
-					}
-				}
-			}
-		}
-		break;
-	case D_MD_ORDER:        /* FreeBSD local extension */
-		ret = (char *) __get_current_time_locale(loc)->md_order;
-		break;
-	default:
-		ret = "";
-   }
-   return (ret);
-}
-
-char *
-nl_langinfo(nl_item item)
-{
-	return nl_langinfo_l(item, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/nomacros.c b/lib/libc_bsd/locale/nomacros.c
deleted file mode 100644
index 6c9af1e..0000000
--- a/lib/libc_bsd/locale/nomacros.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/nomacros.c 232626 2012-03-06 21:56:30Z dim $");
-
-/*
- * Tell <ctype.h> to generate extern versions of all its inline
- * functions.  The extern versions get called if the system doesn't
- * support inlines or the user defines _DONT_USE_CTYPE_INLINE_
- * before including <ctype.h>.
- */
-#define _EXTERNALIZE_CTYPE_INLINES_
-
-/*
- * Also make sure <runetype.h> does not generate an inline definition
- * of __getCurrentRuneLocale().
- */
-#define __RUNETYPE_INTERNAL
-
-#include <ctype.h>
diff --git a/lib/libc_bsd/locale/none.c b/lib/libc_bsd/locale/none.c
deleted file mode 100644
index 66283f0..0000000
--- a/lib/libc_bsd/locale/none.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)none.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/none.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <limits.h>
-#include <runetype.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-static size_t	_none_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_none_mbsinit(const mbstate_t *);
-static size_t	_none_mbsnrtowcs(wchar_t * __restrict dst,
-		    const char ** __restrict src, size_t nms, size_t len,
-		    mbstate_t * __restrict ps __unused);
-static size_t	_none_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-static size_t	_none_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-		    size_t, size_t, mbstate_t * __restrict);
-
-/* setup defaults */
-
-int __mb_cur_max = 1;
-int __mb_sb_limit = 256; /* Expected to be <= _CACHED_RUNES */
-
-int
-_none_init(struct xlocale_ctype *l, _RuneLocale *rl)
-{
-
-	l->__mbrtowc = _none_mbrtowc;
-	l->__mbsinit = _none_mbsinit;
-	l->__mbsnrtowcs = _none_mbsnrtowcs;
-	l->__wcrtomb = _none_wcrtomb;
-	l->__wcsnrtombs = _none_wcsnrtombs;
-	l->runes = rl;
-	l->__mb_cur_max = 1;
-	l->__mb_sb_limit = 256;
-	return(0);
-}
-
-static int
-_none_mbsinit(const mbstate_t *ps __unused)
-{
-
-	/*
-	 * Encoding is not state dependent - we are always in the
-	 * initial state.
-	 */
-	return (1);
-}
-
-static size_t
-_none_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps __unused)
-{
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (0);
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-	if (pwc != NULL)
-		*pwc = (unsigned char)*s;
-	return (*s == '\0' ? 0 : 1);
-}
-
-static size_t
-_none_wcrtomb(char * __restrict s, wchar_t wc,
-    mbstate_t * __restrict ps __unused)
-{
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc < 0 || wc > UCHAR_MAX) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	*s = (unsigned char)wc;
-	return (1);
-}
-
-static size_t
-_none_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps __unused)
-{
-	const char *s;
-	size_t nchr;
-
-	if (dst == NULL) {
-		s = memchr(*src, '\0', nms);
-		return (s != NULL ? s - *src : nms);
-	}
-
-	s = *src;
-	nchr = 0;
-	while (len-- > 0 && nms-- > 0) {
-		if ((*dst++ = (unsigned char)*s++) == L'\0') {
-			*src = NULL;
-			return (nchr);
-		}
-		nchr++;
-	}
-	*src = s;
-	return (nchr);
-}
-
-static size_t
-_none_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
-    size_t nwc, size_t len, mbstate_t * __restrict ps __unused)
-{
-	const wchar_t *s;
-	size_t nchr;
-
-	if (dst == NULL) {
-		for (s = *src; nwc > 0 && *s != L'\0'; s++, nwc--) {
-			if (*s < 0 || *s > UCHAR_MAX) {
-				errno = EILSEQ;
-				return ((size_t)-1);
-			}
-		}
-		return (s - *src);
-	}
-
-	s = *src;
-	nchr = 0;
-	while (len-- > 0 && nwc-- > 0) {
-		if (*s < 0 || *s > UCHAR_MAX) {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		if ((*dst++ = *s++) == '\0') {
-			*src = NULL;
-			return (nchr);
-		}
-		nchr++;
-	}
-	*src = s;
-	return (nchr);
-}
-
-/* setup defaults */
-
-size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t,
-    mbstate_t * __restrict) = _none_mbrtowc;
-int (*__mbsinit)(const mbstate_t *) = _none_mbsinit;
-size_t (*__mbsnrtowcs)(wchar_t * __restrict, const char ** __restrict,
-    size_t, size_t, mbstate_t * __restrict) = _none_mbsnrtowcs;
-size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict) =
-    _none_wcrtomb;
-size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
-    size_t, size_t, mbstate_t * __restrict) = _none_wcsnrtombs;
-
-struct xlocale_ctype __xlocale_global_ctype = {
-	{{0}, "C"},
-	(_RuneLocale*)&_DefaultRuneLocale,
-	_none_mbrtowc,
-	_none_mbsinit,
-	_none_mbsnrtowcs,
-	_none_wcrtomb,
-	_none_wcsnrtombs,
-	1, /* __mb_cur_max, */
-	256 /* __mb_sb_limit */
-};
-
-const struct xlocale_ctype __xlocale_C_ctype = {
-	{{0}, "C"},
-	(_RuneLocale*)&_DefaultRuneLocale,
-	_none_mbrtowc,
-	_none_mbsinit,
-	_none_mbsnrtowcs,
-	_none_wcrtomb,
-	_none_wcsnrtombs,
-	1, /* __mb_cur_max, */
-	256 /* __mb_sb_limit */
-};
diff --git a/lib/libc_bsd/locale/querylocale.3 b/lib/libc_bsd/locale/querylocale.3
deleted file mode 100644
index 374286d..0000000
--- a/lib/libc_bsd/locale/querylocale.3
+++ /dev/null
@@ -1,54 +0,0 @@
-.\" Copyright (c) 2011 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by David Chisnall under sponsorship from
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/locale/querylocale.3 250209 2013-05-03 12:42:43Z pluknet $
-.\"
-.Dd May 3, 2013
-.Dt QUERYLOCALE 3
-.Os
-.Sh NAME
-.Nm querylocale
-.Nd Look up the locale name for a specified category
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In xlocale.h
-.Ft const char *
-.Fn querylocale "int mask" "locale_t locale"
-.Sh DESCRIPTION
-Returns the name of the locale for the category specified by
-.Fa mask .
-This possible values for the mask are the same as those in
-.Xr newlocale 3 .
-If more than one bit in the mask is set, the returned value is undefined.
-.Sh SEE ALSO
-.Xr duplocale 3 ,
-.Xr freelocale 3 ,
-.Xr localeconv 3 ,
-.Xr newlocale 3 ,
-.Xr uselocale 3 ,
-.Xr xlocale 3
diff --git a/lib/libc_bsd/locale/rpmatch.3 b/lib/libc_bsd/locale/rpmatch.3
deleted file mode 100644
index 3542050..0000000
--- a/lib/libc_bsd/locale/rpmatch.3
+++ /dev/null
@@ -1,66 +0,0 @@
-.\"
-.\" Copyright (c) 2005 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/rpmatch.3 148234 2005-07-21 10:53:27Z tjr $
-.\"
-.Dd July 21, 2005
-.Dt RPMATCH 3
-.Os
-.Sh NAME
-.Nm rpmatch
-.Nd "determine whether the response to a question is affirmative or negative"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn rpmatch "const char *response"
-.Sh DESCRIPTION
-The
-.Fn rpmatch
-function determines whether the
-.Fa response
-argument is an affirmative or negative response to a question
-according to the current locale.
-.Sh RETURN VALUES
-The
-.Fn rpmatch
-functions returns:
-.Bl -tag -width indent
-.It 1
-The response is affirmative.
-.It 0
-The response is negative.
-.It \&-1
-The response is not recognized.
-.El
-.Sh SEE ALSO
-.Xr nl_langinfo 3 ,
-.Xr setlocale 3
-.Sh HISTORY
-The
-.Fn rpmatch
-function appeared in
-.Fx 6.0 .
diff --git a/lib/libc_bsd/locale/rpmatch.c b/lib/libc_bsd/locale/rpmatch.c
deleted file mode 100644
index 9f04bf0..0000000
--- a/lib/libc_bsd/locale/rpmatch.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2004-2005 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/rpmatch.c 139922 2005-01-09 03:55:13Z tjr $");
-
-#include <langinfo.h>
-#include <regex.h>
-#include <stdlib.h>
-
-int
-rpmatch(const char *response)
-{
-	regex_t yes, no;
-	int ret;
-
-	if (regcomp(&yes, nl_langinfo(YESEXPR), REG_EXTENDED|REG_NOSUB) != 0)
-		return (-1);
-	if (regcomp(&no, nl_langinfo(NOEXPR), REG_EXTENDED|REG_NOSUB) != 0) {
-		regfree(&yes);
-		return (-1);
-	}
-	if (regexec(&yes, response, 0, NULL, 0) == 0)
-		ret = 1;
-	else if (regexec(&no, response, 0, NULL, 0) == 0)
-		ret = 0;
-	else
-		ret = -1;
-	regfree(&yes);
-	regfree(&no);
-	return (ret);
-}
diff --git a/lib/libc_bsd/locale/rune.c b/lib/libc_bsd/locale/rune.c
deleted file mode 100644
index 4970d0e..0000000
--- a/lib/libc_bsd/locale/rune.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rune.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/rune.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "namespace.h"
-#include <arpa/inet.h>
-#include <errno.h>
-#include <runetype.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include "un-namespace.h"
-
-#include "runefile.h"
-
-_RuneLocale *_Read_RuneMagi(FILE *);
-
-_RuneLocale *
-_Read_RuneMagi(FILE *fp)
-{
-	char *fdata, *data;
-	void *lastp;
-	_FileRuneLocale *frl;
-	_RuneLocale *rl;
-	_FileRuneEntry *frr;
-	_RuneEntry *rr;
-	struct stat sb;
-	int x, saverr;
-	void *variable;
-	_FileRuneEntry *runetype_ext_ranges;
-	_FileRuneEntry *maplower_ext_ranges;
-	_FileRuneEntry *mapupper_ext_ranges;
-	int runetype_ext_len = 0;
-
-	if (_fstat(fileno(fp), &sb) < 0)
-		return (NULL);
-
-	if ((size_t)sb.st_size < sizeof(_FileRuneLocale)) {
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	if ((fdata = malloc(sb.st_size)) == NULL)
-		return (NULL);
-
-	errno = 0;
-	rewind(fp); /* Someone might have read the magic number once already */
-	if (errno) {
-		saverr = errno;
-		free(fdata);
-		errno = saverr;
-		return (NULL);
-	}
-
-	if (fread(fdata, sb.st_size, 1, fp) != 1) {
-		saverr = errno;
-		free(fdata);
-		errno = saverr;
-		return (NULL);
-	}
-
-	frl = (_FileRuneLocale *)fdata;
-	lastp = fdata + sb.st_size;
-
-	variable = frl + 1;
-
-	if (memcmp(frl->magic, _FILE_RUNE_MAGIC_1, sizeof(frl->magic))) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	frl->variable_len = ntohl(frl->variable_len);
-	frl->runetype_ext_nranges = ntohl(frl->runetype_ext_nranges);
-	frl->maplower_ext_nranges = ntohl(frl->maplower_ext_nranges);
-	frl->mapupper_ext_nranges = ntohl(frl->mapupper_ext_nranges);
-
-	for (x = 0; x < _CACHED_RUNES; ++x) {
-		frl->runetype[x] = ntohl(frl->runetype[x]);
-		frl->maplower[x] = ntohl(frl->maplower[x]);
-		frl->mapupper[x] = ntohl(frl->mapupper[x]);
-	}
-
-	runetype_ext_ranges = (_FileRuneEntry *)variable;
-	variable = runetype_ext_ranges + frl->runetype_ext_nranges;
-	if (variable > lastp) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	maplower_ext_ranges = (_FileRuneEntry *)variable;
-	variable = maplower_ext_ranges + frl->maplower_ext_nranges;
-	if (variable > lastp) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	mapupper_ext_ranges = (_FileRuneEntry *)variable;
-	variable = mapupper_ext_ranges + frl->mapupper_ext_nranges;
-	if (variable > lastp) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	frr = runetype_ext_ranges;
-	for (x = 0; x < frl->runetype_ext_nranges; ++x) {
-		uint32_t *types;
-
-		frr[x].min = ntohl(frr[x].min);
-		frr[x].max = ntohl(frr[x].max);
-		frr[x].map = ntohl(frr[x].map);
-		if (frr[x].map == 0) {
-			int len = frr[x].max - frr[x].min + 1;
-			types = variable;
-			variable = types + len;
-			runetype_ext_len += len;
-			if (variable > lastp) {
-				free(fdata);
-				errno = EFTYPE;
-				return (NULL);
-			}
-			while (len-- > 0)
-				types[len] = ntohl(types[len]);
-		}
-	}
-
-	frr = maplower_ext_ranges;
-	for (x = 0; x < frl->maplower_ext_nranges; ++x) {
-		frr[x].min = ntohl(frr[x].min);
-		frr[x].max = ntohl(frr[x].max);
-		frr[x].map = ntohl(frr[x].map);
-	}
-
-	frr = mapupper_ext_ranges;
-	for (x = 0; x < frl->mapupper_ext_nranges; ++x) {
-		frr[x].min = ntohl(frr[x].min);
-		frr[x].max = ntohl(frr[x].max);
-		frr[x].map = ntohl(frr[x].map);
-	}
-	if ((char *)variable + frl->variable_len > (char *)lastp) {
-		free(fdata);
-		errno = EFTYPE;
-		return (NULL);
-	}
-
-	/*
-	 * Convert from disk format to host format.
-	 */
-	data = malloc(sizeof(_RuneLocale) +
-	    (frl->runetype_ext_nranges + frl->maplower_ext_nranges +
-	    frl->mapupper_ext_nranges) * sizeof(_RuneEntry) +
-	    runetype_ext_len * sizeof(*rr->__types) +
-	    frl->variable_len);
-	if (data == NULL) {
-		saverr = errno;
-		free(fdata);
-		errno = saverr;
-		return (NULL);
-	}
-
-	rl = (_RuneLocale *)data;
-	rl->__variable = rl + 1;
-
-	memcpy(rl->__magic, _RUNE_MAGIC_1, sizeof(rl->__magic));
-	memcpy(rl->__encoding, frl->encoding, sizeof(rl->__encoding));
-	rl->__invalid_rune = 0;
-
-	rl->__variable_len = frl->variable_len;
-	rl->__runetype_ext.__nranges = frl->runetype_ext_nranges;
-	rl->__maplower_ext.__nranges = frl->maplower_ext_nranges;
-	rl->__mapupper_ext.__nranges = frl->mapupper_ext_nranges;
-
-	for (x = 0; x < _CACHED_RUNES; ++x) {
-		rl->__runetype[x] = frl->runetype[x];
-		rl->__maplower[x] = frl->maplower[x];
-		rl->__mapupper[x] = frl->mapupper[x];
-	}
-
-	rl->__runetype_ext.__ranges = (_RuneEntry *)rl->__variable;
-	rl->__variable = rl->__runetype_ext.__ranges +
-	    rl->__runetype_ext.__nranges;
-
-	rl->__maplower_ext.__ranges = (_RuneEntry *)rl->__variable;
-	rl->__variable = rl->__maplower_ext.__ranges +
-	    rl->__maplower_ext.__nranges;
-
-	rl->__mapupper_ext.__ranges = (_RuneEntry *)rl->__variable;
-	rl->__variable = rl->__mapupper_ext.__ranges +
-	    rl->__mapupper_ext.__nranges;
-
-	variable = mapupper_ext_ranges + frl->mapupper_ext_nranges;
-	frr = runetype_ext_ranges;
-	rr = rl->__runetype_ext.__ranges;
-	for (x = 0; x < rl->__runetype_ext.__nranges; ++x) {
-		uint32_t *types;
-
-		rr[x].__min = frr[x].min;
-		rr[x].__max = frr[x].max;
-		rr[x].__map = frr[x].map;
-		if (rr[x].__map == 0) {
-			int len = rr[x].__max - rr[x].__min + 1;
-			types = variable;
-			variable = types + len;
-			rr[x].__types = rl->__variable;
-			rl->__variable = rr[x].__types + len;
-			while (len-- > 0)
-				rr[x].__types[len] = types[len];
-		} else
-			rr[x].__types = NULL;
-	}
-
-	frr = maplower_ext_ranges;
-	rr = rl->__maplower_ext.__ranges;
-	for (x = 0; x < rl->__maplower_ext.__nranges; ++x) {
-		rr[x].__min = frr[x].min;
-		rr[x].__max = frr[x].max;
-		rr[x].__map = frr[x].map;
-	}
-
-	frr = mapupper_ext_ranges;
-	rr = rl->__mapupper_ext.__ranges;
-	for (x = 0; x < rl->__mapupper_ext.__nranges; ++x) {
-		rr[x].__min = frr[x].min;
-		rr[x].__max = frr[x].max;
-		rr[x].__map = frr[x].map;
-	}
-
-	memcpy(rl->__variable, variable, rl->__variable_len);
-	free(fdata);
-
-	/*
-	 * Go out and zero pointers that should be zero.
-	 */
-	if (!rl->__variable_len)
-		rl->__variable = NULL;
-
-	if (!rl->__runetype_ext.__nranges)
-		rl->__runetype_ext.__ranges = NULL;
-
-	if (!rl->__maplower_ext.__nranges)
-		rl->__maplower_ext.__ranges = NULL;
-
-	if (!rl->__mapupper_ext.__nranges)
-		rl->__mapupper_ext.__ranges = NULL;
-
-	return (rl);
-}
diff --git a/lib/libc_bsd/locale/runefile.h b/lib/libc_bsd/locale/runefile.h
deleted file mode 100644
index 9f276d1..0000000
--- a/lib/libc_bsd/locale/runefile.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 2005 Ruslan Ermilov
- * 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.
- *
- * 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: releng/10.2/lib/libc/locale/runefile.h 146261 2005-05-16 09:32:41Z ru $
- */
-
-#ifndef _RUNEFILE_H_
-#define	_RUNEFILE_H_
-
-#include <sys/types.h>
-
-#ifndef _CACHED_RUNES
-#define	_CACHED_RUNES	(1 << 8)
-#endif
-
-typedef struct {
-	int32_t		min;
-	int32_t		max;
-	int32_t		map;
-} _FileRuneEntry;
-
-typedef struct {
-	char		magic[8];
-	char		encoding[32];
-
-	uint32_t	runetype[_CACHED_RUNES];
-	int32_t		maplower[_CACHED_RUNES];
-	int32_t		mapupper[_CACHED_RUNES];
-
-	int32_t		runetype_ext_nranges;
-	int32_t		maplower_ext_nranges;
-	int32_t		mapupper_ext_nranges;
-
-	int32_t		variable_len;
-} _FileRuneLocale;
-
-#define	_FILE_RUNE_MAGIC_1	"RuneMag1"
-
-#endif	/* !_RUNEFILE_H_ */
diff --git a/lib/libc_bsd/locale/runetype.c b/lib/libc_bsd/locale/runetype.c
deleted file mode 100644
index 654f6c1..0000000
--- a/lib/libc_bsd/locale/runetype.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/runetype.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <ctype.h>
-#include <stdio.h>
-#include <runetype.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-unsigned long
-___runetype_l(__ct_rune_t c, locale_t locale)
-{
-	size_t lim;
-	FIX_LOCALE(locale);
-	_RuneRange *rr = &(XLOCALE_CTYPE(locale)->runes->__runetype_ext);
-	_RuneEntry *base, *re;
-
-	if (c < 0 || c == EOF)
-		return(0L);
-
-	/* Binary search -- see bsearch.c for explanation. */
-	base = rr->__ranges;
-	for (lim = rr->__nranges; lim != 0; lim >>= 1) {
-		re = base + (lim >> 1);
-		if (re->__min <= c && c <= re->__max) {
-			if (re->__types)
-			    return(re->__types[c - re->__min]);
-			else
-			    return(re->__map);
-		} else if (c > re->__max) {
-			base = re + 1;
-			lim--;
-		}
-	}
-
-	return(0L);
-}
-unsigned long
-___runetype(__ct_rune_t c)
-{
-	return ___runetype_l(c, __get_locale());
-}
-
-int ___mb_cur_max(void)
-{
-	return XLOCALE_CTYPE(__get_locale())->__mb_cur_max;
-}
-int ___mb_cur_max_l(locale_t locale)
-{
-	FIX_LOCALE(locale);
-	return XLOCALE_CTYPE(locale)->__mb_cur_max;
-}
diff --git a/lib/libc_bsd/locale/setlocale.3 b/lib/libc_bsd/locale/setlocale.3
deleted file mode 100644
index 9c1dc91..0000000
--- a/lib/libc_bsd/locale/setlocale.3
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)setlocale.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/setlocale.3 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd November 21, 2003
-.Dt SETLOCALE 3
-.Os
-.Sh NAME
-.Nm setlocale
-.Nd natural language formatting for C
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In locale.h
-.Ft char *
-.Fn setlocale "int category" "const char *locale"
-.Sh DESCRIPTION
-The
-.Fn setlocale
-function sets the C library's notion
-of natural language formatting style
-for particular sets of routines.
-Each such style is called a
-.Sq locale
-and is invoked using an appropriate name passed as a C string.
-.Pp
-The
-.Fn setlocale
-function recognizes several categories of routines.
-These are the categories and the sets of routines they select:
-.Bl -tag -width LC_MONETARY
-.It Dv LC_ALL
-Set the entire locale generically.
-.It Dv LC_COLLATE
-Set a locale for string collation routines.
-This controls alphabetic ordering in
-.Fn strcoll
-and
-.Fn strxfrm .
-.It Dv LC_CTYPE
-Set a locale for the
-.Xr ctype 3
-and
-.Xr multibyte 3
-functions.
-This controls recognition of upper and lower case,
-alphabetic or non-alphabetic characters,
-and so on.
-.It Dv LC_MESSAGES
-Set a locale for message catalogs, see
-.Xr catopen 3
-function.
-.It Dv LC_MONETARY
-Set a locale for formatting monetary values;
-this affects the
-.Fn localeconv
-function.
-.It Dv LC_NUMERIC
-Set a locale for formatting numbers.
-This controls the formatting of decimal points
-in input and output of floating point numbers
-in functions such as
-.Fn printf
-and
-.Fn scanf ,
-as well as values returned by
-.Fn localeconv .
-.It Dv LC_TIME
-Set a locale for formatting dates and times using the
-.Fn strftime
-function.
-.El
-.Pp
-Only three locales are defined by default,
-the empty string
-.Li \&"\|"
-which denotes the native environment, and the
-.Li \&"C"
-and
-.Li \&"POSIX"
-locales, which denote the C language environment.
-A
-.Fa locale
-argument of
-.Dv NULL
-causes
-.Fn setlocale
-to return the current locale.
-By default, C programs start in the
-.Li \&"C"
-locale.
-The only function in the library that sets the locale is
-.Fn setlocale ;
-the locale is never changed as a side effect of some other routine.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn setlocale
-returns the string associated with the specified
-.Fa category
-for the requested
-.Fa locale .
-The
-.Fn setlocale
-function returns
-.Dv NULL
-and fails to change the locale
-if the given combination of
-.Fa category
-and
-.Fa locale
-makes no sense.
-.Sh FILES
-.Bl -tag -width /usr/share/locale/locale/category -compact
-.It Pa $PATH_LOCALE/ Ns Em locale/category
-.It Pa /usr/share/locale/ Ns Em locale/category
-locale file for the locale
-.Em locale
-and the category
-.Em category .
-.El
-.Sh ERRORS
-No errors are defined.
-.Sh SEE ALSO
-.Xr colldef 1 ,
-.Xr mklocale 1 ,
-.Xr catopen 3 ,
-.Xr ctype 3 ,
-.Xr localeconv 3 ,
-.Xr multibyte 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3 ,
-.Xr euc 5 ,
-.Xr utf8 5 ,
-.Xr environ 7
-.Sh STANDARDS
-The
-.Fn setlocale
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn setlocale
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/locale/setlocale.c b/lib/libc_bsd/locale/setlocale.c
deleted file mode 100644
index f76b3a8..0000000
--- a/lib/libc_bsd/locale/setlocale.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*
- * Copyright (c) 1996 - 2002 FreeBSD Project
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setlocale.c	8.1 (Berkeley) 7/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/setlocale.c 228921 2011-12-27 23:28:01Z jilles $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <paths.h>	/* for _PATH_LOCALE */
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "collate.h"
-#include "lmonetary.h"	/* for __monetary_load_locale() */
-#include "lnumeric.h"	/* for __numeric_load_locale() */
-#include "lmessages.h"	/* for __messages_load_locale() */
-#include "setlocale.h"
-#include "ldpart.h"
-#include "../stdtime/timelocal.h" /* for __time_load_locale() */
-
-/*
- * Category names for getenv()
- */
-static const char categories[_LC_LAST][12] = {
-    "LC_ALL",
-    "LC_COLLATE",
-    "LC_CTYPE",
-    "LC_MONETARY",
-    "LC_NUMERIC",
-    "LC_TIME",
-    "LC_MESSAGES",
-};
-
-/*
- * Current locales for each category
- */
-static char current_categories[_LC_LAST][ENCODING_LEN + 1] = {
-    "C",
-    "C",
-    "C",
-    "C",
-    "C",
-    "C",
-    "C",
-};
-
-/*
- * Path to locale storage directory
- */
-char	*_PathLocale;
-
-/*
- * The locales we are going to try and load
- */
-static char new_categories[_LC_LAST][ENCODING_LEN + 1];
-static char saved_categories[_LC_LAST][ENCODING_LEN + 1];
-
-static char current_locale_string[_LC_LAST * (ENCODING_LEN + 1/*"/"*/ + 1)];
-
-static char	*currentlocale(void);
-static char	*loadlocale(int);
-const char *__get_locale_env(int);
-
-char *
-setlocale(category, locale)
-	int category;
-	const char *locale;
-{
-	int i, j, len, saverr;
-        const char *env, *r;
-
-	if (category < LC_ALL || category >= _LC_LAST) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (locale == NULL)
-		return (category != LC_ALL ?
-		    current_categories[category] : currentlocale());
-
-	/*
-	 * Default to the current locale for everything.
-	 */
-	for (i = 1; i < _LC_LAST; ++i)
-		(void)strcpy(new_categories[i], current_categories[i]);
-
-	/*
-	 * Now go fill up new_categories from the locale argument
-	 */
-	if (!*locale) {
-		if (category == LC_ALL) {
-			for (i = 1; i < _LC_LAST; ++i) {
-				env = __get_locale_env(i);
-				if (strlen(env) > ENCODING_LEN) {
-					errno = EINVAL;
-					return (NULL);
-				}
-				(void)strcpy(new_categories[i], env);
-			}
-		} else {
-			env = __get_locale_env(category);
-			if (strlen(env) > ENCODING_LEN) {
-				errno = EINVAL;
-				return (NULL);
-			}
-			(void)strcpy(new_categories[category], env);
-		}
-	} else if (category != LC_ALL) {
-		if (strlen(locale) > ENCODING_LEN) {
-			errno = EINVAL;
-			return (NULL);
-		}
-		(void)strcpy(new_categories[category], locale);
-	} else {
-		if ((r = strchr(locale, '/')) == NULL) {
-			if (strlen(locale) > ENCODING_LEN) {
-				errno = EINVAL;
-				return (NULL);
-			}
-			for (i = 1; i < _LC_LAST; ++i)
-				(void)strcpy(new_categories[i], locale);
-		} else {
-			for (i = 1; r[1] == '/'; ++r)
-				;
-			if (!r[1]) {
-				errno = EINVAL;
-				return (NULL);	/* Hmm, just slashes... */
-			}
-			do {
-				if (i == _LC_LAST)
-					break;  /* Too many slashes... */
-				if ((len = r - locale) > ENCODING_LEN) {
-					errno = EINVAL;
-					return (NULL);
-				}
-				(void)strlcpy(new_categories[i], locale,
-					      len + 1);
-				i++;
-				while (*r == '/')
-					r++;
-				locale = r;
-				while (*r && *r != '/')
-					r++;
-			} while (*locale);
-			while (i < _LC_LAST) {
-				(void)strcpy(new_categories[i],
-					     new_categories[i-1]);
-				i++;
-			}
-		}
-	}
-
-	if (category != LC_ALL)
-		return (loadlocale(category));
-
-	for (i = 1; i < _LC_LAST; ++i) {
-		(void)strcpy(saved_categories[i], current_categories[i]);
-		if (loadlocale(i) == NULL) {
-			saverr = errno;
-			for (j = 1; j < i; j++) {
-				(void)strcpy(new_categories[j],
-					     saved_categories[j]);
-				if (loadlocale(j) == NULL) {
-					(void)strcpy(new_categories[j], "C");
-					(void)loadlocale(j);
-				}
-			}
-			errno = saverr;
-			return (NULL);
-		}
-	}
-	return (currentlocale());
-}
-
-static char *
-currentlocale()
-{
-	int i;
-
-	(void)strcpy(current_locale_string, current_categories[1]);
-
-	for (i = 2; i < _LC_LAST; ++i)
-		if (strcmp(current_categories[1], current_categories[i])) {
-			for (i = 2; i < _LC_LAST; ++i) {
-				(void)strcat(current_locale_string, "/");
-				(void)strcat(current_locale_string,
-					     current_categories[i]);
-			}
-			break;
-		}
-	return (current_locale_string);
-}
-
-static char *
-loadlocale(category)
-	int category;
-{
-	char *new = new_categories[category];
-	char *old = current_categories[category];
-	int (*func)(const char *);
-	int saved_errno;
-
-	if ((new[0] == '.' &&
-	     (new[1] == '\0' || (new[1] == '.' && new[2] == '\0'))) ||
-	    strchr(new, '/') != NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	saved_errno = errno;
-	errno = __detect_path_locale();
-	if (errno != 0)
-		return (NULL);
-	errno = saved_errno;
-
-	switch (category) {
-	case LC_CTYPE:
-		func = __wrap_setrunelocale;
-		break;
-	case LC_COLLATE:
-		func = __collate_load_tables;
-		break;
-	case LC_TIME:
-		func = __time_load_locale;
-		break;
-	case LC_NUMERIC:
-		func = __numeric_load_locale;
-		break;
-	case LC_MONETARY:
-		func = __monetary_load_locale;
-		break;
-	case LC_MESSAGES:
-		func = __messages_load_locale;
-		break;
-	default:
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if (strcmp(new, old) == 0)
-		return (old);
-
-	if (func(new) != _LDP_ERROR) {
-		(void)strcpy(old, new);
-		(void)strcpy(__xlocale_global_locale.components[category-1]->locale, new);
-		return (old);
-	}
-
-	return (NULL);
-}
-
-const char *
-__get_locale_env(category)
-        int category;
-{
-        const char *env;
-
-        /* 1. check LC_ALL. */
-        env = getenv(categories[0]);
-
-        /* 2. check LC_* */
-	if (env == NULL || !*env)
-                env = getenv(categories[category]);
-
-        /* 3. check LANG */
-	if (env == NULL || !*env)
-                env = getenv("LANG");
-
-        /* 4. if none is set, fall to "C" */
-	if (env == NULL || !*env)
-                env = "C";
-
-	return (env);
-}
-
-/*
- * Detect locale storage location and store its value to _PathLocale variable
- */
-int
-__detect_path_locale(void)
-{
-	if (_PathLocale == NULL) {
-		char *p = getenv("PATH_LOCALE");
-
-		if (p != NULL && !issetugid()) {
-			if (strlen(p) + 1/*"/"*/ + ENCODING_LEN +
-			    1/*"/"*/ + CATEGORY_LEN >= PATH_MAX)
-				return (ENAMETOOLONG);
-			_PathLocale = strdup(p);
-			if (_PathLocale == NULL)
-				return (errno == 0 ? ENOMEM : errno);
-		} else
-			_PathLocale = _PATH_LOCALE;
-	}
-	return (0);
-}
-
diff --git a/lib/libc_bsd/locale/setlocale.h b/lib/libc_bsd/locale/setlocale.h
deleted file mode 100644
index d922fc4..0000000
--- a/lib/libc_bsd/locale/setlocale.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (C) 1997 by Andrey A. Chernov, Moscow, Russia.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- *
- * $FreeBSD: releng/10.2/lib/libc/locale/setlocale.h 117270 2003-07-06 02:03:37Z ache $
- */
-
-#ifndef _SETLOCALE_H_
-#define	_SETLOCALE_H_
-
-#define ENCODING_LEN 31
-#define CATEGORY_LEN 11
-
-extern char *_PathLocale;
-
-int	__detect_path_locale(void);
-int	__wrap_setrunelocale(const char *);
-
-#endif /* !_SETLOCALE_H_ */
diff --git a/lib/libc_bsd/locale/setrunelocale.c b/lib/libc_bsd/locale/setrunelocale.c
deleted file mode 100644
index a534f64..0000000
--- a/lib/libc_bsd/locale/setrunelocale.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/setrunelocale.c 284524 2015-06-17 19:12:18Z delphij $");
-
-#define __RUNETYPE_INTERNAL 1
-
-#include <runetype.h>
-#include <errno.h>
-#include <limits.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <wchar.h>
-#include "ldpart.h"
-#include "mblocal.h"
-#include "setlocale.h"
-
-#undef _CurrentRuneLocale
-extern _RuneLocale const *_CurrentRuneLocale;
-#ifndef __NO_TLS
-/*
- * A cached version of the runes for this thread.  Used by ctype.h
- */
-_Thread_local const _RuneLocale *_ThreadRuneLocale;
-#endif
-
-extern int __mb_sb_limit;
-
-extern _RuneLocale	*_Read_RuneMagi(FILE *);
-
-static int		__setrunelocale(struct xlocale_ctype *l, const char *);
-
-#define __collate_substitute_nontrivial (table->__collate_substitute_nontrivial)
-#define __collate_substitute_table_ptr (table->__collate_substitute_table_ptr)
-#define __collate_char_pri_table_ptr (table->__collate_char_pri_table_ptr)
-#define __collate_chain_pri_table (table->__collate_chain_pri_table)
-
-
-static void
-destruct_ctype(void *v)
-{
-	struct xlocale_ctype *l = v;
-
-	if (strcmp(l->runes->__encoding, "EUC") == 0)
-		free(l->runes->__variable);
-	if (&_DefaultRuneLocale != l->runes) 
-		free(l->runes);
-	free(l);
-}
-
-const _RuneLocale *
-__getCurrentRuneLocale(void)
-{
-
-	return XLOCALE_CTYPE(__get_locale())->runes;
-}
-
-static void
-free_runes(_RuneLocale *rl)
-{
-
-	/* FIXME: The "EUC" check here is a hideous abstraction violation. */
-	if ((rl != &_DefaultRuneLocale) && (rl)) {
-		if (strcmp(rl->__encoding, "EUC") == 0) {
-			free(rl->__variable);
-		}
-		free(rl);
-	}
-}
-
-static int
-__setrunelocale(struct xlocale_ctype *l, const char *encoding)
-{
-	FILE *fp;
-	char name[PATH_MAX];
-	_RuneLocale *rl;
-	int saverr, ret;
-	struct xlocale_ctype saved = *l;
-
-	/*
-	 * The "C" and "POSIX" locale are always here.
-	 */
-	if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) {
-		free_runes(saved.runes);
-		(void) _none_init(l, (_RuneLocale*)&_DefaultRuneLocale);
-		return (0);
-	}
-
-	/* Range checking not needed, encoding length already checked before */
-	(void) strcpy(name, _PathLocale);
-	(void) strcat(name, "/");
-	(void) strcat(name, encoding);
-	(void) strcat(name, "/LC_CTYPE");
-
-	if ((fp = fopen(name, "re")) == NULL)
-		return (errno == 0 ? ENOENT : errno);
-
-	if ((rl = _Read_RuneMagi(fp)) == NULL) {
-		saverr = (errno == 0 ? EFTYPE : errno);
-		(void)fclose(fp);
-		return (saverr);
-	}
-	(void)fclose(fp);
-
-	l->__mbrtowc = NULL;
-	l->__mbsinit = NULL;
-	l->__mbsnrtowcs = __mbsnrtowcs_std;
-	l->__wcrtomb = NULL;
-	l->__wcsnrtombs = __wcsnrtombs_std;
-
-	rl->__sputrune = NULL;
-	rl->__sgetrune = NULL;
-	if (strcmp(rl->__encoding, "NONE") == 0)
-		ret = _none_init(l, rl);
-	else if (strcmp(rl->__encoding, "ASCII") == 0)
-		ret = _ascii_init(l, rl);
-	else if (strcmp(rl->__encoding, "UTF-8") == 0)
-		ret = _UTF8_init(l, rl);
-	else if (strcmp(rl->__encoding, "EUC") == 0)
-		ret = _EUC_init(l, rl);
-	else if (strcmp(rl->__encoding, "GB18030") == 0)
- 		ret = _GB18030_init(l, rl);
-	else if (strcmp(rl->__encoding, "GB2312") == 0)
-		ret = _GB2312_init(l, rl);
-	else if (strcmp(rl->__encoding, "GBK") == 0)
-		ret = _GBK_init(l, rl);
-	else if (strcmp(rl->__encoding, "BIG5") == 0)
-		ret = _BIG5_init(l, rl);
-	else if (strcmp(rl->__encoding, "MSKanji") == 0)
-		ret = _MSKanji_init(l, rl);
-	else
-		ret = EFTYPE;
-
-	if (ret == 0) {
-		/* Free the old runes if it exists. */
-		free_runes(saved.runes);
-	} else {
-		/* Restore the saved version if this failed. */
-		memcpy(l, &saved, sizeof(struct xlocale_ctype));
-		free(rl);
-	}
-
-	return (ret);
-}
-
-int
-__wrap_setrunelocale(const char *locale)
-{
-	int ret = __setrunelocale(&__xlocale_global_ctype, locale);
-
-	if (ret != 0) {
-		errno = ret;
-		return (_LDP_ERROR);
-	}
-	__mb_cur_max = __xlocale_global_ctype.__mb_cur_max;
-	__mb_sb_limit = __xlocale_global_ctype.__mb_sb_limit;
-	_CurrentRuneLocale = __xlocale_global_ctype.runes;
-	return (_LDP_LOADED);
-}
-
-#ifndef __NO_TLS
-void
-__set_thread_rune_locale(locale_t loc)
-{
-
-	if (loc == NULL) {
-		_ThreadRuneLocale = &_DefaultRuneLocale;
-	} else if (loc == LC_GLOBAL_LOCALE) {
-		_ThreadRuneLocale = 0;
-	} else {
-		_ThreadRuneLocale = XLOCALE_CTYPE(loc)->runes;
-	}
-}
-#endif
-
-void *
-__ctype_load(const char *locale, locale_t unused)
-{
-	struct xlocale_ctype *l = calloc(sizeof(struct xlocale_ctype), 1);
-
-	l->header.header.destructor = destruct_ctype;
-	if (__setrunelocale(l, locale))
-	{
-		free(l);
-		return NULL;
-	}
-	return l;
-}
diff --git a/lib/libc_bsd/locale/table.c b/lib/libc_bsd/locale/table.c
deleted file mode 100644
index 8cb8251..0000000
--- a/lib/libc_bsd/locale/table.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/27/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/table.c 232498 2012-03-04 15:31:13Z theraven $");
-
-#include <ctype.h>
-#include <runetype.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-const _RuneLocale _DefaultRuneLocale = {
-    _RUNE_MAGIC_1,
-    "NONE",
-    NULL,
-    NULL,
-    0xFFFD,
-
-    {	/*00*/	_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*08*/	_CTYPE_C,
-		_CTYPE_C|_CTYPE_S|_CTYPE_B,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*10*/	_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*18*/	_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*20*/	_CTYPE_S|_CTYPE_B|_CTYPE_R,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*28*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*30*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|0,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|1,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|2,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|3,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|4,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|5,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|6,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|7,
-	/*38*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|8,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|9,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*40*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*48*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*50*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*58*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*60*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*68*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*70*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*78*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_C,
-    },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-    },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-    },
-};
-
-#undef _CurrentRuneLocale
-const _RuneLocale *_CurrentRuneLocale = &_DefaultRuneLocale;
-
-_RuneLocale *
-__runes_for_locale(locale_t locale, int *mb_sb_limit)
-{
-	FIX_LOCALE(locale);
-	struct xlocale_ctype *c = XLOCALE_CTYPE(locale);
-	*mb_sb_limit = c->__mb_sb_limit;
-	return c->runes;
-}
diff --git a/lib/libc_bsd/locale/toascii.3 b/lib/libc_bsd/locale/toascii.3
deleted file mode 100644
index 3254aa1..0000000
--- a/lib/libc_bsd/locale/toascii.3
+++ /dev/null
@@ -1,69 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"	@(#)toascii.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/toascii.3 196820 2009-09-04 07:44:58Z des $
-.\"
-.Dd June 4, 1993
-.Dt TOASCII 3
-.Os
-.Sh NAME
-.Nm toascii
-.Nd convert a byte to 7-bit ASCII
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn toascii "int c"
-.Sh DESCRIPTION
-The
-.Fn toascii
-function strips all but the low 7 bits from a letter,
-including parity or other marker bits.
-.Sh RETURN VALUES
-The
-.Fn toascii
-function always returns a valid ASCII character.
-.Sh SEE ALSO
-.Xr digittoint 3 ,
-.Xr isalnum 3 ,
-.Xr isalpha 3 ,
-.Xr isascii 3 ,
-.Xr iscntrl 3 ,
-.Xr isdigit 3 ,
-.Xr isgraph 3 ,
-.Xr islower 3 ,
-.Xr isprint 3 ,
-.Xr ispunct 3 ,
-.Xr isspace 3 ,
-.Xr isupper 3 ,
-.Xr isxdigit 3 ,
-.Xr stdio 3 ,
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr ascii 7
diff --git a/lib/libc_bsd/locale/tolower.3 b/lib/libc_bsd/locale/tolower.3
deleted file mode 100644
index d6b79d4..0000000
--- a/lib/libc_bsd/locale/tolower.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)tolower.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/tolower.3 210468 2010-07-25 13:32:19Z bcr $
-.\"
-.Dd July 25, 2010
-.Dt TOLOWER 3
-.Os
-.Sh NAME
-.Nm tolower
-.Nd upper case to lower case letter conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn tolower "int c"
-.Sh DESCRIPTION
-The
-.Fn tolower
-function converts an upper-case letter to the corresponding lower-case
-letter.
-The argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Sh RETURN VALUES
-If the argument is an upper-case letter, the
-.Fn tolower
-function returns the corresponding lower-case letter if there is
-one; otherwise, the argument is returned unchanged.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn towlower
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr islower 3 ,
-.Xr towlower 3
-.Sh STANDARDS
-The
-.Fn tolower
-function conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/locale/tolower.c b/lib/libc_bsd/locale/tolower.c
deleted file mode 100644
index 4e46670..0000000
--- a/lib/libc_bsd/locale/tolower.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/tolower.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <ctype.h>
-#include <stdio.h>
-#include <runetype.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-__ct_rune_t
-___tolower_l(c, l)
-	__ct_rune_t c;
-	locale_t l;
-{
-	size_t lim;
-	FIX_LOCALE(l);
-	_RuneRange *rr = &XLOCALE_CTYPE(l)->runes->__maplower_ext;
-	_RuneEntry *base, *re;
-
-	if (c < 0 || c == EOF)
-		return(c);
-
-	/* Binary search -- see bsearch.c for explanation. */
-	base = rr->__ranges;
-	for (lim = rr->__nranges; lim != 0; lim >>= 1) {
-		re = base + (lim >> 1);
-		if (re->__min <= c && c <= re->__max)
-			return (re->__map + c - re->__min);
-		else if (c > re->__max) {
-			base = re + 1;
-			lim--;
-		}
-	}
-
-	return(c);
-}
-__ct_rune_t
-___tolower(c)
-	__ct_rune_t c;
-{
-	return ___tolower_l(c, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/toupper.3 b/lib/libc_bsd/locale/toupper.3
deleted file mode 100644
index 2bf8b47..0000000
--- a/lib/libc_bsd/locale/toupper.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)toupper.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/toupper.3 210468 2010-07-25 13:32:19Z bcr $
-.\"
-.Dd July 25, 2010
-.Dt TOUPPER 3
-.Os
-.Sh NAME
-.Nm toupper
-.Nd lower case to upper case letter conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In ctype.h
-.Ft int
-.Fn toupper "int c"
-.Sh DESCRIPTION
-The
-.Fn toupper
-function converts a lower-case letter to the corresponding
-upper-case letter.
-The argument must be representable as an
-.Vt "unsigned char"
-or the value of
-.Dv EOF .
-.Sh RETURN VALUES
-If the argument is a lower-case letter, the
-.Fn toupper
-function returns the corresponding upper-case letter if there is
-one; otherwise, the argument is returned unchanged.
-.Sh COMPATIBILITY
-The
-.Bx 4.4
-extension of accepting arguments outside of the range of the
-.Vt "unsigned char"
-type in locales with large character sets is considered obsolete
-and may not be supported in future releases.
-The
-.Fn towupper
-function should be used instead.
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr isupper 3 ,
-.Xr towupper 3
-.Sh STANDARDS
-The
-.Fn toupper
-function conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/locale/toupper.c b/lib/libc_bsd/locale/toupper.c
deleted file mode 100644
index 4c8ffd6..0000000
--- a/lib/libc_bsd/locale/toupper.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/toupper.c 235239 2012-05-10 20:03:34Z dim $");
-
-#include <ctype.h>
-#include <stdio.h>
-#include <runetype.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-__ct_rune_t
-___toupper_l(c, l)
-	__ct_rune_t c;
-	locale_t l;
-{
-	size_t lim;
-	FIX_LOCALE(l);
-	_RuneRange *rr = &XLOCALE_CTYPE(l)->runes->__mapupper_ext;
-	_RuneEntry *base, *re;
-
-	if (c < 0 || c == EOF)
-		return(c);
-
-	/* Binary search -- see bsearch.c for explanation. */
-	base = rr->__ranges;
-	for (lim = rr->__nranges; lim != 0; lim >>= 1) {
-		re = base + (lim >> 1);
-		if (re->__min <= c && c <= re->__max)
-		{
-			return (re->__map + c - re->__min);
-		}
-		else if (c > re->__max) {
-			base = re + 1;
-			lim--;
-		}
-	}
-
-	return(c);
-}
-__ct_rune_t
-___toupper(c)
-	__ct_rune_t c;
-{
-	return ___toupper_l(c, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/towlower.3 b/lib/libc_bsd/locale/towlower.3
deleted file mode 100644
index c581ede..0000000
--- a/lib/libc_bsd/locale/towlower.3
+++ /dev/null
@@ -1,66 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)tolower.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/towlower.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd October 3, 2002
-.Dt TOWLOWER 3
-.Os
-.Sh NAME
-.Nm towlower
-.Nd "upper case to lower case letter conversion (wide character version)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wctype.h
-.Ft wint_t
-.Fn towlower "wint_t wc"
-.Sh DESCRIPTION
-The
-.Fn towlower
-function converts an upper-case letter to the corresponding lower-case
-letter.
-.Sh RETURN VALUES
-If the argument is an upper-case letter, the
-.Fn towlower
-function returns the corresponding lower-case letter if there is
-one; otherwise the argument is returned unchanged.
-.Sh SEE ALSO
-.Xr iswlower 3 ,
-.Xr tolower 3 ,
-.Xr towupper 3 ,
-.Xr wctrans 3
-.Sh STANDARDS
-The
-.Fn towlower
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/towupper.3 b/lib/libc_bsd/locale/towupper.3
deleted file mode 100644
index 35d894e..0000000
--- a/lib/libc_bsd/locale/towupper.3
+++ /dev/null
@@ -1,66 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)toupper.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/towupper.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd October 3, 2002
-.Dt TOWUPPER 3
-.Os
-.Sh NAME
-.Nm towupper
-.Nd "lower case to upper case letter conversion (wide character version)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wctype.h
-.Ft wint_t
-.Fn towupper "wint_t wc"
-.Sh DESCRIPTION
-The
-.Fn towupper
-function converts a lower-case letter to the corresponding
-upper-case letter.
-.Sh RETURN VALUES
-If the argument is a lower-case letter, the
-.Fn towupper
-function returns the corresponding upper-case letter if there is
-one; otherwise the argument is returned unchanged.
-.Sh SEE ALSO
-.Xr iswupper 3 ,
-.Xr toupper 3 ,
-.Xr towlower 3 ,
-.Xr wctrans 3
-.Sh STANDARDS
-The
-.Fn towupper
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/uselocale.3 b/lib/libc_bsd/locale/uselocale.3
deleted file mode 100644
index a5158b1..0000000
--- a/lib/libc_bsd/locale/uselocale.3
+++ /dev/null
@@ -1,60 +0,0 @@
-.\" Copyright (c) 2011 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by David Chisnall under sponsorship from
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/locale/uselocale.3 250244 2013-05-04 17:06:47Z pluknet $
-.\"
-.Dd September 17, 2011
-.Dt USELOCALE 3
-.Os
-.Sh NAME
-.Nm uselocale
-.Nd Sets a thread-local locale
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In xlocale.h
-.Ft locale_t
-.Fn uselocale "locale_t locale"
-.Sh DESCRIPTION
-Specifies the locale for this thread to use.
-Specifying
-.Fa LC_GLOBAL_LOCALE
-disables the per-thread locale,
-while NULL returns the current locale without setting a new one.
-.Sh RETURN VALUES
-Returns the previous locale,
-or LC_GLOBAL_LOCALE if this thread has no locale associated with it.
-.Sh SEE ALSO
-.Xr duplocale 3 ,
-.Xr freelocale 3 ,
-.Xr localeconv 3 ,
-.Xr newlocale 3 ,
-.Xr querylocale 3 ,
-.Xr xlocale 3
-.Sh STANDARDS
-This function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/locale/utf8.5 b/lib/libc_bsd/locale/utf8.5
deleted file mode 100644
index ee99b63..0000000
--- a/lib/libc_bsd/locale/utf8.5
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Paul Borman at Krystal Technologies.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)utf2.4	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/locale/utf8.5 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 7, 2004
-.Dt UTF8 5
-.Os
-.Sh NAME
-.Nm utf8
-.Nd "UTF-8, a transformation format of ISO 10646"
-.Sh SYNOPSIS
-.Nm ENCODING
-.Qq UTF-8
-.Sh DESCRIPTION
-The
-.Nm UTF-8
-encoding represents UCS-4 characters as a sequence of octets, using
-between 1 and 6 for each character.
-It is backwards compatible with
-.Tn ASCII ,
-so 0x00-0x7f refer to the
-.Tn ASCII
-character set.
-The multibyte encoding of
-.No non- Ns Tn ASCII
-characters
-consist entirely of bytes whose high order bit is set.
-The actual
-encoding is represented by the following table:
-.Bd -literal
-[0x00000000 - 0x0000007f] [00000000.0bbbbbbb] -> 0bbbbbbb
-[0x00000080 - 0x000007ff] [00000bbb.bbbbbbbb] -> 110bbbbb, 10bbbbbb
-[0x00000800 - 0x0000ffff] [bbbbbbbb.bbbbbbbb] ->
-	1110bbbb, 10bbbbbb, 10bbbbbb
-[0x00010000 - 0x001fffff] [00000000.000bbbbb.bbbbbbbb.bbbbbbbb] ->
-	11110bbb, 10bbbbbb, 10bbbbbb, 10bbbbbb
-[0x00200000 - 0x03ffffff] [000000bb.bbbbbbbb.bbbbbbbb.bbbbbbbb] ->
-	111110bb, 10bbbbbb, 10bbbbbb, 10bbbbbb, 10bbbbbb
-[0x04000000 - 0x7fffffff] [0bbbbbbb.bbbbbbbb.bbbbbbbb.bbbbbbbb] ->
-	1111110b, 10bbbbbb, 10bbbbbb, 10bbbbbb, 10bbbbbb, 10bbbbbb
-.Ed
-.Pp
-If more than a single representation of a value exists (for example,
-0x00; 0xC0 0x80; 0xE0 0x80 0x80) the shortest representation is always
-used.
-Longer ones are detected as an error as they pose a potential
-security risk, and destroy the 1:1 character:octet sequence mapping.
-.Sh SEE ALSO
-.Xr euc 5
-.Rs
-.%A "Rob Pike"
-.%A "Ken Thompson"
-.%T "Hello World"
-.%J "Proceedings of the Winter 1993 USENIX Technical Conference"
-.%Q "USENIX Association"
-.%D "January 1993"
-.Re
-.Rs
-.%A "F. Yergeau"
-.%T "UTF-8, a transformation format of ISO 10646"
-.%O "RFC 2279"
-.%D "January 1998"
-.Re
-.Rs
-.%Q "The Unicode Consortium"
-.%T "The Unicode Standard, Version 3.0"
-.%D "2000"
-.%O "as amended by the Unicode Standard Annex #27: Unicode 3.1 and by the Unicode Standard Annex #28: Unicode 3.2"
-.Re
-.Sh STANDARDS
-The
-.Nm
-encoding is compatible with RFC 2279 and Unicode 3.2.
diff --git a/lib/libc_bsd/locale/utf8.c b/lib/libc_bsd/locale/utf8.c
deleted file mode 100644
index c1a52a5..0000000
--- a/lib/libc_bsd/locale/utf8.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/*-
- * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
- * Copyright (c) 2002-2004 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/param.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/utf8.c 268571 2014-07-12 17:39:13Z pfg $");
-
-#include <errno.h>
-#include <limits.h>
-#include <runetype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-extern int __mb_sb_limit;
-
-static size_t	_UTF8_mbrtowc(wchar_t * __restrict, const char * __restrict,
-		    size_t, mbstate_t * __restrict);
-static int	_UTF8_mbsinit(const mbstate_t *);
-static size_t	_UTF8_mbsnrtowcs(wchar_t * __restrict,
-		    const char ** __restrict, size_t, size_t,
-		    mbstate_t * __restrict);
-static size_t	_UTF8_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict);
-static size_t	_UTF8_wcsnrtombs(char * __restrict, const wchar_t ** __restrict,
-		    size_t, size_t, mbstate_t * __restrict);
-
-typedef struct {
-	wchar_t	ch;
-	int	want;
-	wchar_t	lbound;
-} _UTF8State;
-
-int
-_UTF8_init(struct xlocale_ctype *l, _RuneLocale *rl)
-{
-
-	l->__mbrtowc = _UTF8_mbrtowc;
-	l->__wcrtomb = _UTF8_wcrtomb;
-	l->__mbsinit = _UTF8_mbsinit;
-	l->__mbsnrtowcs = _UTF8_mbsnrtowcs;
-	l->__wcsnrtombs = _UTF8_wcsnrtombs;
-	l->runes = rl;
-	l->__mb_cur_max = 6;
-	/*
-	 * UCS-4 encoding used as the internal representation, so
-	 * slots 0x0080-0x00FF are occuped and must be excluded
-	 * from the single byte ctype by setting the limit.
-	 */
-	l->__mb_sb_limit = 128;
-
-	return (0);
-}
-
-static int
-_UTF8_mbsinit(const mbstate_t *ps)
-{
-
-	return (ps == NULL || ((const _UTF8State *)ps)->want == 0);
-}
-
-static size_t
-_UTF8_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps)
-{
-	_UTF8State *us;
-	int ch, i, mask, want;
-	wchar_t lbound, wch;
-
-	us = (_UTF8State *)ps;
-
-	if (us->want < 0 || us->want > 6) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL) {
-		s = "";
-		n = 1;
-		pwc = NULL;
-	}
-
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-
-	if (us->want == 0) {
-		/*
-		 * Determine the number of octets that make up this character
-		 * from the first octet, and a mask that extracts the
-		 * interesting bits of the first octet. We already know
-		 * the character is at least two bytes long.
-		 *
-		 * We also specify a lower bound for the character code to
-		 * detect redundant, non-"shortest form" encodings. For
-		 * example, the sequence C0 80 is _not_ a legal representation
-		 * of the null character. This enforces a 1-to-1 mapping
-		 * between character codes and their multibyte representations.
-		 */
-		ch = (unsigned char)*s;
-		if ((ch & 0x80) == 0) {
-			/* Fast path for plain ASCII characters. */
-			if (pwc != NULL)
-				*pwc = ch;
-			return (ch != '\0' ? 1 : 0);
-		}
-		if ((ch & 0xe0) == 0xc0) {
-			mask = 0x1f;
-			want = 2;
-			lbound = 0x80;
-		} else if ((ch & 0xf0) == 0xe0) {
-			mask = 0x0f;
-			want = 3;
-			lbound = 0x800;
-		} else if ((ch & 0xf8) == 0xf0) {
-			mask = 0x07;
-			want = 4;
-			lbound = 0x10000;
-		} else if ((ch & 0xfc) == 0xf8) {
-			mask = 0x03;
-			want = 5;
-			lbound = 0x200000;
-		} else if ((ch & 0xfe) == 0xfc) {
-			mask = 0x01;
-			want = 6;
-			lbound = 0x4000000;
-		} else {
-			/*
-			 * Malformed input; input is not UTF-8.
-			 */
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-	} else {
-		want = us->want;
-		lbound = us->lbound;
-	}
-
-	/*
-	 * Decode the octet sequence representing the character in chunks
-	 * of 6 bits, most significant first.
-	 */
-	if (us->want == 0)
-		wch = (unsigned char)*s++ & mask;
-	else
-		wch = us->ch;
-	for (i = (us->want == 0) ? 1 : 0; i < MIN(want, n); i++) {
-		if ((*s & 0xc0) != 0x80) {
-			/*
-			 * Malformed input; bad characters in the middle
-			 * of a character.
-			 */
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		wch <<= 6;
-		wch |= *s++ & 0x3f;
-	}
-	if (i < want) {
-		/* Incomplete multibyte sequence. */
-		us->want = want - i;
-		us->lbound = lbound;
-		us->ch = wch;
-		return ((size_t)-2);
-	}
-	if (wch < lbound) {
-		/*
-		 * Malformed input; redundant encoding.
-		 */
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	if (wch >= 0xd800 && wch <= 0xdfff) {
-		/*
-		 * Malformed input; invalid code points.
-		 */
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	if (pwc != NULL)
-		*pwc = wch;
-	us->want = 0;
-	return (wch == L'\0' ? 0 : want);
-}
-
-static size_t
-_UTF8_mbsnrtowcs(wchar_t * __restrict dst, const char ** __restrict src,
-    size_t nms, size_t len, mbstate_t * __restrict ps)
-{
-	_UTF8State *us;
-	const char *s;
-	size_t nchr;
-	wchar_t wc;
-	size_t nb;
-
-	us = (_UTF8State *)ps;
-
-	s = *src;
-	nchr = 0;
-
-	if (dst == NULL) {
-		/*
-		 * The fast path in the loop below is not safe if an ASCII
-		 * character appears as anything but the first byte of a
-		 * multibyte sequence. Check now to avoid doing it in the loop.
-		 */
-		if (nms > 0 && us->want > 0 && (signed char)*s > 0) {
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-		for (;;) {
-			if (nms > 0 && (signed char)*s > 0)
-				/*
-				 * Fast path for plain ASCII characters
-				 * excluding NUL.
-				 */
-				nb = 1;
-			else if ((nb = _UTF8_mbrtowc(&wc, s, nms, ps)) ==
-			    (size_t)-1)
-				/* Invalid sequence - mbrtowc() sets errno. */
-				return ((size_t)-1);
-			else if (nb == 0 || nb == (size_t)-2)
-				return (nchr);
-			s += nb;
-			nms -= nb;
-			nchr++;
-		}
-		/*NOTREACHED*/
-	}
-
-	/*
-	 * The fast path in the loop below is not safe if an ASCII
-	 * character appears as anything but the first byte of a
-	 * multibyte sequence. Check now to avoid doing it in the loop.
-	 */
-	if (nms > 0 && len > 0 && us->want > 0 && (signed char)*s > 0) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	while (len-- > 0) {
-		if (nms > 0 && (signed char)*s > 0) {
-			/*
-			 * Fast path for plain ASCII characters
-			 * excluding NUL.
-			 */
-			*dst = (wchar_t)*s;
-			nb = 1;
-		} else if ((nb = _UTF8_mbrtowc(dst, s, nms, ps)) ==
-		    (size_t)-1) {
-			*src = s;
-			return ((size_t)-1);
-		} else if (nb == (size_t)-2) {
-			*src = s + nms;
-			return (nchr);
-		} else if (nb == 0) {
-			*src = NULL;
-			return (nchr);
-		}
-		s += nb;
-		nms -= nb;
-		nchr++;
-		dst++;
-	}
-	*src = s;
-	return (nchr);
-}
-
-static size_t
-_UTF8_wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	_UTF8State *us;
-	unsigned char lead;
-	int i, len;
-
-	us = (_UTF8State *)ps;
-
-	if (us->want != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-
-	/*
-	 * Determine the number of octets needed to represent this character.
-	 * We always output the shortest sequence possible. Also specify the
-	 * first few bits of the first octet, which contains the information
-	 * about the sequence length.
-	 */
-	if ((wc & ~0x7f) == 0) {
-		/* Fast path for plain ASCII characters. */
-		*s = (char)wc;
-		return (1);
-	} else if ((wc & ~0x7ff) == 0) {
-		lead = 0xc0;
-		len = 2;
-	} else if ((wc & ~0xffff) == 0) {
-		lead = 0xe0;
-		len = 3;
-	} else if ((wc & ~0x1fffff) == 0) {
-		lead = 0xf0;
-		len = 4;
-	} else if ((wc & ~0x3ffffff) == 0) {
-		lead = 0xf8;
-		len = 5;
-	} else if ((wc & ~0x7fffffff) == 0) {
-		lead = 0xfc;
-		len = 6;
-	} else {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-
-	/*
-	 * Output the octets representing the character in chunks
-	 * of 6 bits, least significant last. The first octet is
-	 * a special case because it contains the sequence length
-	 * information.
-	 */
-	for (i = len - 1; i > 0; i--) {
-		s[i] = (wc & 0x3f) | 0x80;
-		wc >>= 6;
-	}
-	*s = (wc & 0xff) | lead;
-
-	return (len);
-}
-
-static size_t
-_UTF8_wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src,
-    size_t nwc, size_t len, mbstate_t * __restrict ps)
-{
-	_UTF8State *us;
-	char buf[MB_LEN_MAX];
-	const wchar_t *s;
-	size_t nbytes;
-	size_t nb;
-
-	us = (_UTF8State *)ps;
-
-	if (us->want != 0) {
-		errno = EINVAL;
-		return ((size_t)-1);
-	}
-
-	s = *src;
-	nbytes = 0;
-
-	if (dst == NULL) {
-		while (nwc-- > 0) {
-			if (0 <= *s && *s < 0x80)
-				/* Fast path for plain ASCII characters. */
-				nb = 1;
-			else if ((nb = _UTF8_wcrtomb(buf, *s, ps)) ==
-			    (size_t)-1)
-				/* Invalid character - wcrtomb() sets errno. */
-				return ((size_t)-1);
-			if (*s == L'\0')
-				return (nbytes + nb - 1);
-			s++;
-			nbytes += nb;
-		}
-		return (nbytes);
-	}
-
-	while (len > 0 && nwc-- > 0) {
-		if (0 <= *s && *s < 0x80) {
-			/* Fast path for plain ASCII characters. */
-			nb = 1;
-			*dst = *s;
-		} else if (len > (size_t)MB_CUR_MAX) {
-			/* Enough space to translate in-place. */
-			if ((nb = _UTF8_wcrtomb(dst, *s, ps)) == (size_t)-1) {
-				*src = s;
-				return ((size_t)-1);
-			}
-		} else {
-			/*
-			 * May not be enough space; use temp. buffer.
-			 */
-			if ((nb = _UTF8_wcrtomb(buf, *s, ps)) == (size_t)-1) {
-				*src = s;
-				return ((size_t)-1);
-			}
-			if (nb > (int)len)
-				/* MB sequence for character won't fit. */
-				break;
-			memcpy(dst, buf, nb);
-		}
-		if (*s == L'\0') {
-			*src = NULL;
-			return (nbytes + nb - 1);
-		}
-		s++;
-		dst += nb;
-		len -= nb;
-		nbytes += nb;
-	}
-	*src = s;
-	return (nbytes);
-}
diff --git a/lib/libc_bsd/locale/wcrtomb.3 b/lib/libc_bsd/locale/wcrtomb.3
deleted file mode 100644
index 3e7a390..0000000
--- a/lib/libc_bsd/locale/wcrtomb.3
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/wcrtomb.3 250883 2013-05-21 19:59:37Z ed $
-.\"
-.Dd May 21, 2013
-.Dt WCRTOMB 3
-.Os
-.Sh NAME
-.Nm wcrtomb ,
-.Nm c16rtomb ,
-.Nm c32rtomb
-.Nd "convert a wide-character code to a character (restartable)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn wcrtomb "char * restrict s" "wchar_t c" "mbstate_t * restrict ps"
-.In uchar.h
-.Ft size_t
-.Fn c16rtomb "char * restrict s" "char16_t c" "mbstate_t * restrict ps"
-.Ft size_t
-.Fn c32rtomb "char * restrict s" "char32_t c" "mbstate_t * restrict ps"
-.Sh DESCRIPTION
-The
-.Fn wcrtomb ,
-.Fn c16rtomb
-and
-.Fn c32rtomb
-functions store a multibyte sequence representing the
-wide character
-.Fa c ,
-including any necessary shift sequences, to the
-character array
-.Fa s ,
-storing a maximum of
-.Dv MB_CUR_MAX
-bytes.
-.Pp
-If
-.Fa s
-is
-.Dv NULL ,
-these functions behave as if
-.Fa s
-pointed to an internal buffer and
-.Fa c
-was a null wide character (L'\e0').
-.Pp
-The
-.Ft mbstate_t
-argument,
-.Fa ps ,
-is used to keep track of the shift state.
-If it is
-.Dv NULL ,
-these functions use an internal, static
-.Vt mbstate_t
-object, which is initialized to the initial conversion state
-at program startup.
-.Pp
-As certain multibyte characters may only be represented by a series of
-16-bit characters, the
-.Fn c16rtomb
-may need to invoked multiple times before a multibyte sequence is
-returned.
-.Sh RETURN VALUES
-These functions return the length (in bytes) of the multibyte sequence
-needed to represent
-.Fa c ,
-or
-.Po Vt size_t Pc Ns \-1
-if
-.Fa c
-is not a valid wide character code.
-.Sh ERRORS
-The
-.Fn wcrtomb ,
-.Fn c16rtomb
-and
-.Fn c32rtomb
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid wide character code was specified.
-.It Bq Er EINVAL
-The conversion state is invalid.
-.El
-.Sh SEE ALSO
-.Xr mbrtowc 3 ,
-.Xr multibyte 3 ,
-.Xr setlocale 3 ,
-.Xr wctomb 3
-.Sh STANDARDS
-The
-.Fn wcrtomb ,
-.Fn c16rtomb
-and
-.Fn c32rtomb
-functions conform to
-.St -isoC-2011 .
diff --git a/lib/libc_bsd/locale/wcrtomb.c b/lib/libc_bsd/locale/wcrtomb.c
deleted file mode 100644
index a615e13..0000000
--- a/lib/libc_bsd/locale/wcrtomb.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcrtomb.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-wcrtomb_l(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps,
-		locale_t locale)
-{
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->wcrtomb;
-	return (XLOCALE_CTYPE(locale)->__wcrtomb(s, wc, ps));
-}
-
-size_t
-wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-	return wcrtomb_l(s, wc, ps, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcsftime.3 b/lib/libc_bsd/locale/wcsftime.3
deleted file mode 100644
index 2f14653..0000000
--- a/lib/libc_bsd/locale/wcsftime.3
+++ /dev/null
@@ -1,66 +0,0 @@
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/wcsftime.3 107392 2002-11-29 17:35:09Z ru $
-.\"
-.Dd September 8, 2002
-.Dt WCSFTIME 3
-.Os
-.Sh NAME
-.Nm wcsftime
-.Nd "convert date and time to a wide-character string"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fo wcsftime
-.Fa "wchar_t * restrict wcs" "size_t maxsize"
-.Fa "const wchar_t * restrict format" "const struct tm * restrict timeptr"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn wcsftime
-function is equivalent to the
-.Fn strftime
-function except for the types of its arguments.
-Refer to
-.Xr strftime 3
-for a detailed description.
-.Sh COMPATIBILITY
-Some early implementations of
-.Fn wcsftime
-had a
-.Fa format
-argument with type
-.Vt "const char *"
-instead of
-.Vt "const wchar_t *" .
-.Sh SEE ALSO
-.Xr strftime 3
-.Sh STANDARDS
-The
-.Fn wcsftime
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/wcsftime.c b/lib/libc_bsd/locale/wcsftime.c
deleted file mode 100644
index 66470ac..0000000
--- a/lib/libc_bsd/locale/wcsftime.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcsftime.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <time.h>
-#include <wchar.h>
-#include "xlocale_private.h"
-
-/*
- * Convert date and time to a wide-character string.
- *
- * This is the wide-character counterpart of strftime(). So that we do not
- * have to duplicate the code of strftime(), we convert the format string to
- * multibyte, call strftime(), then convert the result back into wide
- * characters.
- *
- * This technique loses in the presence of stateful multibyte encoding if any
- * of the conversions in the format string change conversion state. When
- * stateful encoding is implemented, we will need to reset the state between
- * format specifications in the format string.
- */
-size_t
-wcsftime_l(wchar_t * __restrict wcs, size_t maxsize,
-	const wchar_t * __restrict format, const struct tm * __restrict timeptr,
-	locale_t locale)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char *dst, *sformat;
-	const char *dstp;
-	const wchar_t *formatp;
-	size_t n, sflen;
-	int sverrno;
-	FIX_LOCALE(locale);
-
-	sformat = dst = NULL;
-
-	/*
-	 * Convert the supplied format string to a multibyte representation
-	 * for strftime(), which only handles single-byte characters.
-	 */
-	mbs = initial;
-	formatp = format;
-	sflen = wcsrtombs_l(NULL, &formatp, 0, &mbs, locale);
-	if (sflen == (size_t)-1)
-		goto error;
-	if ((sformat = malloc(sflen + 1)) == NULL)
-		goto error;
-	mbs = initial;
-	wcsrtombs_l(sformat, &formatp, sflen + 1, &mbs, locale);
-
-	/*
-	 * Allocate memory for longest multibyte sequence that will fit
-	 * into the caller's buffer and call strftime() to fill it.
-	 * Then, copy and convert the result back into wide characters in
-	 * the caller's buffer.
-	 */
-	if (SIZE_T_MAX / MB_CUR_MAX <= maxsize) {
-		/* maxsize is prepostorously large - avoid int. overflow. */
-		errno = EINVAL;
-		goto error;
-	}
-	if ((dst = malloc(maxsize * MB_CUR_MAX)) == NULL)
-		goto error;
-	if (strftime_l(dst, maxsize, sformat, timeptr, locale) == 0)
-		goto error;
-	dstp = dst;
-	mbs = initial;
-	n = mbsrtowcs_l(wcs, &dstp, maxsize, &mbs, locale);
-	if (n == (size_t)-2 || n == (size_t)-1 || dstp != NULL)
-		goto error;
-
-	free(sformat);
-	free(dst);
-	return (n);
-
-error:
-	sverrno = errno;
-	free(sformat);
-	free(dst);
-	errno = sverrno;
-	return (0);
-}
-size_t
-wcsftime(wchar_t * __restrict wcs, size_t maxsize,
-	const wchar_t * __restrict format, const struct tm * __restrict timeptr)
-{
-	return wcsftime_l(wcs, maxsize, format, timeptr, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcsnrtombs.c b/lib/libc_bsd/locale/wcsnrtombs.c
deleted file mode 100644
index 5893f60..0000000
--- a/lib/libc_bsd/locale/wcsnrtombs.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcsnrtombs.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-wcsnrtombs_l(char * __restrict dst, const wchar_t ** __restrict src, size_t nwc,
-    size_t len, mbstate_t * __restrict ps, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->wcsnrtombs;
-	return (XLOCALE_CTYPE(locale)->__wcsnrtombs(dst, src, nwc, len, ps));
-}
-size_t
-wcsnrtombs(char * __restrict dst, const wchar_t ** __restrict src, size_t nwc,
-    size_t len, mbstate_t * __restrict ps)
-{
-	return wcsnrtombs_l(dst, src, nwc, len, ps, __get_locale());
-}
-
-
-size_t
-__wcsnrtombs_std(char * __restrict dst, const wchar_t ** __restrict src,
-    size_t nwc, size_t len, mbstate_t * __restrict ps)
-{
-	mbstate_t mbsbak;
-	char buf[MB_LEN_MAX];
-	const wchar_t *s;
-	size_t nbytes;
-	size_t nb;
-	struct xlocale_ctype *l = XLOCALE_CTYPE(__get_locale());
-
-	s = *src;
-	nbytes = 0;
-
-	if (dst == NULL) {
-		while (nwc-- > 0) {
-			if ((nb = l->__wcrtomb(buf, *s, ps)) == (size_t)-1)
-				/* Invalid character - wcrtomb() sets errno. */
-				return ((size_t)-1);
-			else if (*s == L'\0')
-				return (nbytes + nb - 1);
-			s++;
-			nbytes += nb;
-		}
-		return (nbytes);
-	}
-
-	while (len > 0 && nwc-- > 0) {
-		if (len > (size_t)MB_CUR_MAX) {
-			/* Enough space to translate in-place. */
-			if ((nb = l->__wcrtomb(dst, *s, ps)) == (size_t)-1) {
-				*src = s;
-				return ((size_t)-1);
-			}
-		} else {
-			/*
-			 * May not be enough space; use temp. buffer.
-			 *
-			 * We need to save a copy of the conversion state
-			 * here so we can restore it if the multibyte
-			 * character is too long for the buffer.
-			 */
-			mbsbak = *ps;
-			if ((nb = l->__wcrtomb(buf, *s, ps)) == (size_t)-1) {
-				*src = s;
-				return ((size_t)-1);
-			}
-			if (nb > (int)len) {
-				/* MB sequence for character won't fit. */
-				*ps = mbsbak;
-				break;
-			}
-			memcpy(dst, buf, nb);
-		}
-		if (*s == L'\0') {
-			*src = NULL;
-			return (nbytes + nb - 1);
-		}
-		s++;
-		dst += nb;
-		len -= nb;
-		nbytes += nb;
-	}
-	*src = s;
-	return (nbytes);
-}
diff --git a/lib/libc_bsd/locale/wcsrtombs.3 b/lib/libc_bsd/locale/wcsrtombs.3
deleted file mode 100644
index 54489c0..0000000
--- a/lib/libc_bsd/locale/wcsrtombs.3
+++ /dev/null
@@ -1,134 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/wcsrtombs.3 132497 2004-07-21 10:54:57Z tjr $
-.\"
-.Dd July 21, 2004
-.Dt WCSRTOMBS 3
-.Os
-.Sh NAME
-.Nm wcsrtombs ,
-.Nm wcsnrtombs
-.Nd "convert a wide-character string to a character string (restartable)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fo wcsrtombs
-.Fa "char * restrict dst" "const wchar_t ** restrict src"
-.Fa "size_t len" "mbstate_t * restrict ps"
-.Fc
-.Ft size_t
-.Fo wcsnrtombs
-.Fa "char * restrict dst" "const wchar_t ** restrict src" "size_t nwc"
-.Fa "size_t len" "mbstate_t * restrict ps"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn wcsrtombs
-function converts a string of wide characters indirectly pointed to by
-.Fa src
-to a corresponding multibyte character string stored in the array
-pointed to by
-.Fa dst .
-No more than
-.Fa len
-bytes are written to
-.Fa dst .
-.Pp
-If
-.Fa dst
-is
-.Dv NULL ,
-no characters are stored.
-.Pp
-If
-.Fa dst
-is not
-.Dv NULL ,
-the pointer pointed to by
-.Fa src
-is updated to point to the character after the one that conversion stopped at.
-If conversion stops because a null character is encountered,
-.Fa *src
-is set to
-.Dv NULL .
-.Pp
-The
-.Vt mbstate_t
-argument,
-.Fa ps ,
-is used to keep track of the shift state.
-If it is
-.Dv NULL ,
-.Fn wcsrtombs
-uses an internal, static
-.Vt mbstate_t
-object, which is initialized to the initial conversion state
-at program startup.
-.Pp
-The
-.Fn wcsnrtombs
-function behaves identically to
-.Fn wcsrtombs ,
-except that conversion stops after reading at most
-.Fa nwc
-characters from the buffer pointed to by
-.Fa src .
-.Sh RETURN VALUES
-The
-.Fn wcsrtombs
-and
-.Fn wcsnrtombs
-functions return the number of bytes stored in
-the array pointed to by
-.Fa dst
-(not including any terminating null), if successful, otherwise it returns
-.Po Vt size_t Pc Ns \-1 .
-.Sh ERRORS
-The
-.Fn wcsrtombs
-and
-.Fn wcsnrtombs
-functions will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid wide character was encountered.
-.It Bq Er EINVAL
-The conversion state is invalid.
-.El
-.Sh SEE ALSO
-.Xr mbsrtowcs 3 ,
-.Xr wcrtomb 3 ,
-.Xr wcstombs 3
-.Sh STANDARDS
-The
-.Fn wcsrtombs
-function conforms to
-.St -isoC-99 .
-.Pp
-The
-.Fn wcsnrtombs
-function is an extension to the standard.
diff --git a/lib/libc_bsd/locale/wcsrtombs.c b/lib/libc_bsd/locale/wcsrtombs.c
deleted file mode 100644
index 129ab02..0000000
--- a/lib/libc_bsd/locale/wcsrtombs.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcsrtombs.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-wcsrtombs_l(char * __restrict dst, const wchar_t ** __restrict src, size_t len,
-    mbstate_t * __restrict ps, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	if (ps == NULL)
-		ps = &locale->wcsrtombs;
-	return (XLOCALE_CTYPE(locale)->__wcsnrtombs(dst, src, SIZE_T_MAX, len, ps));
-}
-
-size_t
-wcsrtombs(char * __restrict dst, const wchar_t ** __restrict src, size_t len,
-    mbstate_t * __restrict ps)
-{
-	return wcsrtombs_l(dst, src, len, ps, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcstod.3 b/lib/libc_bsd/locale/wcstod.3
deleted file mode 100644
index ef0ef76..0000000
--- a/lib/libc_bsd/locale/wcstod.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" Copyright (c) 2002, 2003 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/wcstod.3 115225 2003-05-22 13:02:28Z ru $
-.\"
-.Dd February 22, 2003
-.Dt WCSTOD 3
-.Os
-.Sh NAME
-.Nm wcstof ,
-.Nm wcstod ,
-.Nm wcstold
-.Nd convert string to
-.Vt float , double
-or
-.Vt "long double"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft float
-.Fn wcstof "const wchar_t * restrict nptr" "wchar_t ** restrict endptr"
-.Ft "long double"
-.Fn wcstold "const wchar_t * restrict nptr" "wchar_t ** restrict endptr"
-.Ft double
-.Fn wcstod "const wchar_t * restrict nptr" "wchar_t ** restrict endptr"
-.Sh DESCRIPTION
-The
-.Fn wcstof ,
-.Fn wcstod
-and
-.Fn wcstold
-functions are the wide-character versions of the
-.Fn strtof ,
-.Fn strtod
-and
-.Fn strtold
-functions.
-Refer to
-.Xr strtod 3
-for details.
-.Sh SEE ALSO
-.Xr strtod 3 ,
-.Xr wcstol 3
-.Sh STANDARDS
-The
-.Fn wcstof ,
-.Fn wcstod
-and
-.Fn wcstold
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/wcstod.c b/lib/libc_bsd/locale/wcstod.c
deleted file mode 100644
index 295838e..0000000
--- a/lib/libc_bsd/locale/wcstod.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstod.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a string to a double-precision number.
- *
- * This is the wide-character counterpart of strtod(). So that we do not
- * have to duplicate the code of strtod() here, we convert the supplied
- * wide character string to multibyte and call strtod() on the result.
- * This assumes that the multibyte encoding is compatible with ASCII
- * for at least the digits, radix character and letters.
- */
-double
-wcstod_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-		locale_t locale)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	double val;
-	char *buf, *end;
-	const wchar_t *wcp = nptr;
-	size_t len;
-	size_t spaces = 0;
-	FIX_LOCALE(locale);
-
-	while (iswspace_l(*wcp, locale)) {
-		wcp++;
-		spaces++;
-	}
-
-	/*
-	 * Convert the supplied numeric wide char. string to multibyte.
-	 *
-	 * We could attempt to find the end of the numeric portion of the
-	 * wide char. string to avoid converting unneeded characters but
-	 * choose not to bother; optimising the uncommon case where
-	 * the input string contains a lot of text after the number
-	 * duplicates a lot of strtod()'s functionality and slows down the
-	 * most common cases.
-	 */
-	mbs = initial;
-	if ((len = wcsrtombs_l(NULL, &wcp, 0, &mbs, locale)) == (size_t)-1) {
-		if (endptr != NULL)
-			*endptr = (wchar_t *)nptr;
-		return (0.0);
-	}
-	if ((buf = malloc(len + 1)) == NULL)
-		return (0.0);
-	mbs = initial;
-	wcsrtombs_l(buf, &wcp, len + 1, &mbs, locale);
-
-	/* Let strtod() do most of the work for us. */
-	val = strtod_l(buf, &end, locale);
-
-	/*
-	 * We only know where the number ended in the _multibyte_
-	 * representation of the string. If the caller wants to know
-	 * where it ended, count multibyte characters to find the
-	 * corresponding position in the wide char string.
-	 */
-	if (endptr != NULL) {
-		/* XXX Assume each wide char is one byte. */
-		*endptr = (wchar_t *)nptr + (end - buf);
-		if (buf != end)
-			*endptr += spaces;
-	}
-
-
-	free(buf);
-
-	return (val);
-}
-double
-wcstod(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
-{
-	return wcstod_l(nptr, endptr, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcstof.c b/lib/libc_bsd/locale/wcstof.c
deleted file mode 100644
index d882f3f..0000000
--- a/lib/libc_bsd/locale/wcstof.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstof.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-/*
- * See wcstod() for comments as to the logic used.
- */
-float
-wcstof_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-		locale_t locale)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	float val;
-	char *buf, *end;
-	const wchar_t *wcp;
-	size_t len;
-	FIX_LOCALE(locale);
-
-	while (iswspace_l(*nptr, locale))
-		nptr++;
-
-	wcp = nptr;
-	mbs = initial;
-	if ((len = wcsrtombs_l(NULL, &wcp, 0, &mbs, locale)) == (size_t)-1) {
-		if (endptr != NULL)
-			*endptr = (wchar_t *)nptr;
-		return (0.0);
-	}
-	if ((buf = malloc(len + 1)) == NULL)
-		return (0.0);
-	mbs = initial;
-	wcsrtombs_l(buf, &wcp, len + 1, &mbs, locale);
-
-	val = strtof_l(buf, &end, locale);
-
-	if (endptr != NULL)
-		*endptr = (wchar_t *)nptr + (end - buf);
-
-	free(buf);
-
-	return (val);
-}
-float
-wcstof(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
-{
-	return wcstof_l(nptr, endptr, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcstoimax.c b/lib/libc_bsd/locale/wcstoimax.c
deleted file mode 100644
index 7e9556c..0000000
--- a/lib/libc_bsd/locale/wcstoimax.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "from @(#)strtol.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoimax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstoimax.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a wide character string to an intmax_t integer.
- */
-intmax_t
-wcstoimax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-    int base, locale_t locale)
-{
-	const wchar_t *s;
-	uintmax_t acc;
-	wchar_t c;
-	uintmax_t cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * See strtoimax for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace_l(c, locale));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = neg ? (uintmax_t)-(INTMAX_MIN + INTMAX_MAX) + INTMAX_MAX
-	    : INTMAX_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit_l(c, locale))
-			c = digittoint_l(c, locale);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? INTMAX_MIN : INTMAX_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
-intmax_t
-wcstoimax(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-    int base)
-{
-	return wcstoimax_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcstol.3 b/lib/libc_bsd/locale/wcstol.3
deleted file mode 100644
index 9a7be38..0000000
--- a/lib/libc_bsd/locale/wcstol.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/wcstol.3 107392 2002-11-29 17:35:09Z ru $
-.\"
-.Dd September 7, 2002
-.Dt WCSTOL 3
-.Os
-.Sh NAME
-.Nm wcstol , wcstoul ,
-.Nm wcstoll , wcstoull ,
-.Nm wcstoimax , wcstoumax
-.Nd "convert a wide character string value to a"
-.Vt long ,
-.Vt "unsigned long" ,
-.Vt "long long" ,
-.Vt "unsigned long long" ,
-.Vt intmax_t
-or
-.Vt uintmax_t
-integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft long
-.Fn wcstol "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Ft "unsigned long"
-.Fn wcstoul "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Ft "long long"
-.Fn wcstoll "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Ft "unsigned long long"
-.Fn wcstoull "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.In inttypes.h
-.Ft intmax_t
-.Fn wcstoimax "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Ft uintmax_t
-.Fn wcstoumax "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base"
-.Sh DESCRIPTION
-The
-.Fn wcstol ,
-.Fn wcstoul ,
-.Fn wcstoll ,
-.Fn wcstoull ,
-.Fn wcstoimax
-and
-.Fn wcstoumax
-functions are wide-character versions of the
-.Fn strtol ,
-.Fn strtoul ,
-.Fn strtoll ,
-.Fn strtoull ,
-.Fn strtoimax
-and
-.Fn strtoumax
-functions, respectively.
-Refer to their manual pages (for example
-.Xr strtol 3 )
-for details.
-.Sh SEE ALSO
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn wcstol ,
-.Fn wcstoul ,
-.Fn wcstoll ,
-.Fn wcstoull ,
-.Fn wcstoimax
-and
-.Fn wcstoumax
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/wcstol.c b/lib/libc_bsd/locale/wcstol.c
deleted file mode 100644
index e22da7e..0000000
--- a/lib/libc_bsd/locale/wcstol.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstol.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a string to a long integer.
- */
-long
-wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int
-		base, locale_t locale)
-{
-	const wchar_t *s;
-	unsigned long acc;
-	wchar_t c;
-	unsigned long cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * See strtol for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace_l(c, locale));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = neg ? (unsigned long)-(LONG_MIN + LONG_MAX) + LONG_MAX
-	    : LONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit_l(c, locale))
-			c = digittoint_l(c, locale);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LONG_MIN : LONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
-long
-wcstol(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
-{
-	return wcstol_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcstold.c b/lib/libc_bsd/locale/wcstold.c
deleted file mode 100644
index 0d4c5f0..0000000
--- a/lib/libc_bsd/locale/wcstold.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstold.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-/*
- * See wcstod() for comments as to the logic used.
- */
-long double
-wcstold_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-		locale_t locale)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	long double val;
-	char *buf, *end;
-	const wchar_t *wcp = nptr;
-	size_t len;
-	size_t spaces = 0;
-	FIX_LOCALE(locale);
-
-	while (iswspace_l(*wcp, locale)) {
-		wcp++;
-		spaces++;
-	}
-
-	wcp = nptr;
-	mbs = initial;
-	if ((len = wcsrtombs_l(NULL, &wcp, 0, &mbs, locale)) == (size_t)-1) {
-		if (endptr != NULL)
-			*endptr = (wchar_t *)nptr;
-		return (0.0);
-	}
-	if ((buf = malloc(len + 1)) == NULL)
-		return (0.0);
-	mbs = initial;
-	wcsrtombs_l(buf, &wcp, len + 1, &mbs, locale);
-
-	val = strtold_l(buf, &end, locale);
-
-	if (endptr != NULL) {
-		/* XXX Assume each wide char is one byte. */
-		*endptr = (wchar_t *)nptr + (end - buf);
-		if (buf != end)
-			*endptr += spaces;
-	}
-
-	free(buf);
-
-	return (val);
-}
-long double
-wcstold(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr)
-{
-	return wcstold_l(nptr, endptr, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcstoll.c b/lib/libc_bsd/locale/wcstoll.c
deleted file mode 100644
index ff96102..0000000
--- a/lib/libc_bsd/locale/wcstoll.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoll.c,v 1.19 2002/09/06 11:23:59 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstoll.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a wide character string to a long long integer.
- */
-long long
-wcstoll_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-		int base, locale_t locale)
-{
-	const wchar_t *s;
-	unsigned long long acc;
-	wchar_t c;
-	unsigned long long cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * See strtoll for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace_l(c, locale));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = neg ? (unsigned long long)-(LLONG_MIN + LLONG_MAX) + LLONG_MAX
-	    : LLONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit_l(c, locale))
-			c = digittoint_l(c, locale);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LLONG_MIN : LLONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
-long long
-wcstoll(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
-{
-	return wcstoll_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcstombs.3 b/lib/libc_bsd/locale/wcstombs.3
deleted file mode 100644
index f267e6c..0000000
--- a/lib/libc_bsd/locale/wcstombs.3
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley of BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
-.\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD: releng/10.2/lib/libc/locale/wcstombs.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 8, 2004
-.Dt WCSTOMBS 3
-.Os
-.Sh NAME
-.Nm wcstombs
-.Nd convert a wide-character string to a character string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft size_t
-.Fo wcstombs
-.Fa "char * restrict mbstring" "const wchar_t * restrict wcstring"
-.Fa "size_t nbytes"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn wcstombs
-function converts a wide character string
-.Fa wcstring
-into a multibyte character string,
-.Fa mbstring ,
-beginning in the initial conversion state.
-Up to
-.Fa nbytes
-bytes are stored in
-.Fa mbstring .
-Partial multibyte characters at the end of the string are not stored.
-The multibyte character string is null terminated if there is room.
-.Sh RETURN VALUES
-The
-.Fn wcstombs
-function returns the number of bytes converted
-(not including any terminating null), if successful, otherwise it returns
-.Po Vt size_t Pc Ns \-1 .
-.Sh ERRORS
-The
-.Fn wcstombs
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid wide character was encountered.
-.It Bq Er EINVAL
-The conversion state is invalid.
-.El
-.Sh SEE ALSO
-.Xr mbstowcs 3 ,
-.Xr multibyte 3 ,
-.Xr wcsrtombs 3 ,
-.Xr wctomb 3
-.Sh STANDARDS
-The
-.Fn wcstombs
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/wcstombs.c b/lib/libc_bsd/locale/wcstombs.c
deleted file mode 100644
index 6d9c1eb..0000000
--- a/lib/libc_bsd/locale/wcstombs.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstombs.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-size_t
-wcstombs_l(char * __restrict s, const wchar_t * __restrict pwcs, size_t n,
-		locale_t locale)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	const wchar_t *pwcsp;
-	FIX_LOCALE(locale);
-
-	mbs = initial;
-	pwcsp = pwcs;
-	return (XLOCALE_CTYPE(locale)->__wcsnrtombs(s, &pwcsp, SIZE_T_MAX, n, &mbs));
-}
-size_t
-wcstombs(char * __restrict s, const wchar_t * __restrict pwcs, size_t n)
-{
-	return wcstombs_l(s, pwcs, n, __get_locale());
-}
-
diff --git a/lib/libc_bsd/locale/wcstoul.c b/lib/libc_bsd/locale/wcstoul.c
deleted file mode 100644
index e216bc9..0000000
--- a/lib/libc_bsd/locale/wcstoul.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstoul.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a wide character string to an unsigned long integer.
- */
-unsigned long
-wcstoul_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-		int base, locale_t locale)
-{
-	const wchar_t *s;
-	unsigned long acc;
-	wchar_t c;
-	unsigned long cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * See strtol for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace_l(c, locale));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = ULONG_MAX / base;
-	cutlim = ULONG_MAX % base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit_l(c, locale))
-			c = digittoint_l(c, locale);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = ULONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
-unsigned long
-wcstoul(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int base)
-{
-	return wcstoul_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcstoull.c b/lib/libc_bsd/locale/wcstoull.c
deleted file mode 100644
index 4ee2170..0000000
--- a/lib/libc_bsd/locale/wcstoull.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoull.c,v 1.18 2002/09/06 11:23:59 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstoull.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a wide character string to an unsigned long long integer.
- */
-unsigned long long
-wcstoull_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-    int base, locale_t locale)
-{
-	const wchar_t *s;
-	unsigned long long acc;
-	wchar_t c;
-	unsigned long long cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * See strtoull for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace_l(c, locale));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = ULLONG_MAX / base;
-	cutlim = ULLONG_MAX % base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit_l(c, locale))
-			c = digittoint_l(c, locale);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = ULLONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
-unsigned long long
-wcstoull(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-    int base)
-{
-	return wcstoull_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wcstoumax.c b/lib/libc_bsd/locale/wcstoumax.c
deleted file mode 100644
index c6f52be..0000000
--- a/lib/libc_bsd/locale/wcstoumax.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "from @(#)strtoul.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdlib/strtoumax.c,v 1.8 2002/09/06 11:23:59 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcstoumax.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a wide character string to a uintmax_t integer.
- */
-uintmax_t
-wcstoumax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-    int base, locale_t locale)
-{
-	const wchar_t *s;
-	uintmax_t acc;
-	wchar_t c;
-	uintmax_t cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * See strtoimax for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (iswspace_l(c, locale));
-	if (c == L'-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == L'+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == L'0' && (*s == L'x' || *s == L'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == L'0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = UINTMAX_MAX / base;
-	cutlim = UINTMAX_MAX % base;
-	for ( ; ; c = *s++) {
-#ifdef notyet
-		if (iswdigit_l(c, locale))
-			c = digittoint_l(c, locale);
-		else
-#endif
-		if (c >= L'0' && c <= L'9')
-			c -= L'0';
-		else if (c >= L'A' && c <= L'Z')
-			c -= L'A' - 10;
-		else if (c >= L'a' && c <= L'z')
-			c -= L'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = UINTMAX_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (wchar_t *)(any ? s - 1 : nptr);
-	return (acc);
-}
-uintmax_t
-wcstoumax(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr,
-    int base)
-{
-	return wcstoumax_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wctob.c b/lib/libc_bsd/locale/wctob.c
deleted file mode 100644
index e408f83..0000000
--- a/lib/libc_bsd/locale/wctob.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wctob.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <limits.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-wctob_l(wint_t c, locale_t locale)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs = initial;
-	char buf[MB_LEN_MAX];
-	FIX_LOCALE(locale);
-
-	if (c == WEOF || XLOCALE_CTYPE(locale)->__wcrtomb(buf, c, &mbs) != 1)
-		return (EOF);
-	return ((unsigned char)*buf);
-}
-int
-wctob(wint_t c)
-{
-	return wctob_l(c, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wctomb.3 b/lib/libc_bsd/locale/wctomb.3
deleted file mode 100644
index c9a117d..0000000
--- a/lib/libc_bsd/locale/wctomb.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" Copyright (c) 2002-2004 Tim J. Robbins. All rights reserved.
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley of BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\" From @(#)multibyte.3	8.1 (Berkeley) 6/4/93
-.\" From FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp
-.\" $FreeBSD: releng/10.2/lib/libc/locale/wctomb.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 8, 2004
-.Dt WCTOMB 3
-.Os
-.Sh NAME
-.Nm wctomb
-.Nd convert a wide-character code to a character
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn wctomb "char *mbchar" "wchar_t wchar"
-.Sh DESCRIPTION
-The
-.Fn wctomb
-function converts a wide character
-.Fa wchar
-into a multibyte character and stores
-the result in
-.Fa mbchar .
-The object pointed to by
-.Fa mbchar
-must be large enough to accommodate the multibyte character, which
-may be up to
-.Dv MB_LEN_MAX
-bytes.
-.Pp
-A call with a null
-.Fa mbchar
-pointer returns nonzero if the current locale requires shift states,
-zero otherwise;
-if shift states are required, the shift state is reset to the initial state.
-.Sh RETURN VALUES
-If
-.Fa mbchar
-is
-.Dv NULL ,
-the
-.Fn wctomb
-function returns nonzero if shift states are supported,
-zero otherwise.
-If
-.Fa mbchar
-is valid,
-.Fn wctomb
-returns
-the number of bytes processed in
-.Fa mbchar ,
-or \-1 if no multibyte character
-could be recognized or converted.
-In this case,
-.Fn wctomb Ns 's
-internal conversion state is undefined.
-.Sh ERRORS
-The
-.Fn wctomb
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid multibyte sequence was detected.
-.It Bq Er EINVAL
-The internal conversion state is invalid.
-.El
-.Sh SEE ALSO
-.Xr mbtowc 3 ,
-.Xr wcrtomb 3 ,
-.Xr wcstombs 3 ,
-.Xr wctob 3
-.Sh STANDARDS
-The
-.Fn wctomb
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/locale/wctomb.c b/lib/libc_bsd/locale/wctomb.c
deleted file mode 100644
index c2645cc..0000000
--- a/lib/libc_bsd/locale/wctomb.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wctomb.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdlib.h>
-#include <wchar.h>
-#include "mblocal.h"
-
-int
-wctomb_l(char *s, wchar_t wchar, locale_t locale)
-{
-	static const mbstate_t initial;
-	size_t rval;
-	FIX_LOCALE(locale);
-
-	if (s == NULL) {
-		/* No support for state dependent encodings. */
-		locale->wctomb = initial;
-		return (0);
-	}
-	if ((rval = XLOCALE_CTYPE(locale)->__wcrtomb(s, wchar, &locale->wctomb)) == (size_t)-1)
-		return (-1);
-	return ((int)rval);
-}
-int
-wctomb(char *s, wchar_t wchar)
-{
-	return wctomb_l(s, wchar, __get_locale());
-}
diff --git a/lib/libc_bsd/locale/wctrans.3 b/lib/libc_bsd/locale/wctrans.3
deleted file mode 100644
index 3ec4dfe..0000000
--- a/lib/libc_bsd/locale/wctrans.3
+++ /dev/null
@@ -1,122 +0,0 @@
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/wctrans.3 107392 2002-11-29 17:35:09Z ru $
-.\"
-.Dd October 3, 2002
-.Dt WCTRANS 3
-.Os
-.Sh NAME
-.Nm towctrans , wctrans
-.Nd "wide character mapping functions"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wctype.h
-.Ft wint_t
-.Fn towctrans "wint_t wc" "wctrans_t desc"
-.Ft wctrans_t
-.Fn wctrans "const char *charclass"
-.Sh DESCRIPTION
-The
-.Fn wctrans
-function returns a value of type
-.Vt wctrans_t
-which represents the requested wide character mapping operation and
-may be used as the second argument for calls to
-.Fn towctrans .
-.Pp
-The following character mapping names are recognised:
-.Bl -column -offset indent ".Li tolower" ".Li toupper"
-.It Li "tolower	toupper"
-.El
-.Pp
-The
-.Fn towctrans
-function transliterates the wide character
-.Fa wc
-according to the mapping described by
-.Fa desc .
-.Sh RETURN VALUES
-The
-.Fn towctrans
-function returns the transliterated character if successful, otherwise
-it returns the character unchanged and sets
-.Va errno .
-.Pp
-The
-.Fn wctrans
-function returns non-zero if successful, otherwise it returns zero
-and sets
-.Va errno .
-.Sh EXAMPLES
-Reimplement
-.Fn towupper
-in terms of
-.Fn towctrans
-and
-.Fn wctrans :
-.Bd -literal -offset indent
-wint_t
-mytowupper(wint_t wc)
-{
-	return (towctrans(wc, wctrans("toupper")));
-}
-.Ed
-.Sh ERRORS
-The
-.Fn towctrans
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The supplied
-.Fa desc
-argument is invalid.
-.El
-.Pp
-The
-.Fn wctrans
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The requested mapping name is invalid.
-.El
-.Sh SEE ALSO
-.Xr tolower 3 ,
-.Xr toupper 3 ,
-.Xr wctype 3
-.Sh STANDARDS
-The
-.Fn towctrans
-and
-.Fn wctrans
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn towctrans
-and
-.Fn wctrans
-functions first appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/locale/wctrans.c b/lib/libc_bsd/locale/wctrans.c
deleted file mode 100644
index 07a5014..0000000
--- a/lib/libc_bsd/locale/wctrans.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wctrans.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <string.h>
-#include <wctype.h>
-#include "xlocale_private.h"
-
-enum {
-	_WCT_ERROR	= 0,
-	_WCT_TOLOWER	= 1,
-	_WCT_TOUPPER	= 2
-};
-
-wint_t
-towctrans_l(wint_t wc, wctrans_t desc, locale_t locale)
-{
-	switch (desc) {
-	case _WCT_TOLOWER:
-		wc = towlower_l(wc, locale);
-		break;
-	case _WCT_TOUPPER:
-		wc = towupper_l(wc, locale);
-		break;
-	case _WCT_ERROR:
-	default:
-		errno = EINVAL;
-		break;
-	}
-
-	return (wc);
-}
-wint_t
-towctrans(wint_t wc, wctrans_t desc)
-{
-	return towctrans_l(wc, desc, __get_locale());
-}
-
-/*
- * wctrans() calls this will a 0 locale.  If this is ever modified to actually
- * use the locale, wctrans() must be modified to call __get_locale().
- */
-wctrans_t
-wctrans_l(const char *charclass, locale_t locale)
-{
-	struct {
-		const char	*name;
-		wctrans_t	 trans;
-	} ccls[] = {
-		{ "tolower",	_WCT_TOLOWER },
-		{ "toupper",	_WCT_TOUPPER },
-		{ NULL,		_WCT_ERROR },		/* Default */
-	};
-	int i;
-
-	i = 0;
-	while (ccls[i].name != NULL && strcmp(ccls[i].name, charclass) != 0)
-		i++;
-
-	if (ccls[i].trans == _WCT_ERROR)
-		errno = EINVAL;
-	return (ccls[i].trans);
-}
-
-wctrans_t
-wctrans(const char *charclass)
-{
-	return wctrans_l(charclass, 0);
-}
-
diff --git a/lib/libc_bsd/locale/wctype.3 b/lib/libc_bsd/locale/wctype.3
deleted file mode 100644
index f81ac06..0000000
--- a/lib/libc_bsd/locale/wctype.3
+++ /dev/null
@@ -1,119 +0,0 @@
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/wctype.3 163314 2006-10-13 16:11:12Z ru $
-.\"
-.Dd March 27, 2004
-.Dt WCTYPE 3
-.Os
-.Sh NAME
-.Nm iswctype , wctype
-.Nd "wide character class functions"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wctype.h
-.Ft int
-.Fn iswctype "wint_t wc" "wctype_t charclass"
-.Ft wctype_t
-.Fn wctype "const char *property"
-.Sh DESCRIPTION
-The
-.Fn wctype
-function returns a value of type
-.Vt wctype_t
-which represents the requested wide character class and
-may be used as the second argument for calls to
-.Fn iswctype .
-.Pp
-The following character class names are recognised:
-.Bl -column -offset indent ".Li alnum" ".Li cntrl" ".Li ideogram" ".Li print" ".Li space"
-.It Li "alnum	cntrl	ideogram	print	space	xdigit"
-.It Li "alpha	digit	lower	punct	special"
-.It Li "blank	graph	phonogram	rune	upper"
-.El
-.Pp
-The
-.Fn iswctype
-function checks whether the wide character
-.Fa wc
-is in the character class
-.Fa charclass .
-.Sh RETURN VALUES
-The
-.Fn iswctype
-function returns non-zero if and only if
-.Fa wc
-has the property described by
-.Fa charclass ,
-or
-.Fa charclass
-is zero.
-.Pp
-The
-.Fn wctype
-function returns 0 if
-.Fa property
-is invalid, otherwise it returns a value of type
-.Vt wctype_t
-that can be used in subsequent calls to
-.Fn iswctype .
-.Sh EXAMPLES
-Reimplement
-.Xr iswalpha 3
-in terms of
-.Fn iswctype
-and
-.Fn wctype :
-.Bd -literal -offset indent
-int
-myiswalpha(wint_t wc)
-{
-	return (iswctype(wc, wctype("alpha")));
-}
-.Ed
-.Sh SEE ALSO
-.Xr ctype 3 ,
-.Xr nextwctype 3
-.Sh STANDARDS
-The
-.Fn iswctype
-and
-.Fn wctype
-functions conform to
-.St -p1003.1-2001 .
-The
-.Dq Li ideogram ,
-.Dq Li phonogram ,
-.Dq Li special ,
-and
-.Dq Li rune
-character classes are extensions.
-.Sh HISTORY
-The
-.Fn iswctype
-and
-.Fn wctype
-functions first appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/locale/wctype.c b/lib/libc_bsd/locale/wctype.c
deleted file mode 100644
index 5e29373..0000000
--- a/lib/libc_bsd/locale/wctype.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wctype.c 228269 2011-12-05 00:00:47Z jilles $");
-
-#include <ctype.h>
-#include <string.h>
-#include <wctype.h>
-#include <xlocale.h>
-
-#undef iswctype
-int
-iswctype(wint_t wc, wctype_t charclass)
-{
-	return (__istype(wc, charclass));
-}
-int
-iswctype_l(wint_t wc, wctype_t charclass, locale_t locale)
-{
-	return __istype_l(wc, charclass, locale);
-}
-
-/*
- * IMPORTANT: The 0 in the call to this function in wctype() must be changed to
- * __get_locale() if wctype_l() is ever modified to actually use the locale
- * parameter.
- */
-wctype_t
-wctype_l(const char *property, locale_t locale)
-{
-	const char *propnames = 
-		"alnum\0"
-		"alpha\0"
-		"blank\0"
-		"cntrl\0"
-		"digit\0"
-		"graph\0"
-		"lower\0"
-		"print\0"
-		"punct\0"
-		"space\0"
-		"upper\0"
-		"xdigit\0"
-		"ideogram\0"	/* BSD extension */
-		"special\0"	/* BSD extension */
-		"phonogram\0"	/* BSD extension */
-		"rune\0";	/* BSD extension */
-	static const wctype_t propmasks[] = {
-		_CTYPE_A|_CTYPE_D,
-		_CTYPE_A,
-		_CTYPE_B,
-		_CTYPE_C,
-		_CTYPE_D,
-		_CTYPE_G,
-		_CTYPE_L,
-		_CTYPE_R,
-		_CTYPE_P,
-		_CTYPE_S,
-		_CTYPE_U,
-		_CTYPE_X,
-		_CTYPE_I,
-		_CTYPE_T,
-		_CTYPE_Q,
-		0xFFFFFF00L
-	};
-	size_t len1, len2;
-	const char *p;
-	const wctype_t *q;
-
-	len1 = strlen(property);
-	q = propmasks;
-	for (p = propnames; (len2 = strlen(p)) != 0; p += len2 + 1) {
-		if (len1 == len2 && memcmp(property, p, len1) == 0)
-			return (*q);
-		q++;
-	}
-
-	return (0UL);
-}
-
-wctype_t wctype(const char *property)
-{
-	return wctype_l(property, 0);
-}
diff --git a/lib/libc_bsd/locale/wcwidth.3 b/lib/libc_bsd/locale/wcwidth.3
deleted file mode 100644
index 8b78433..0000000
--- a/lib/libc_bsd/locale/wcwidth.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/locale/wcwidth.3 133915 2004-08-17 04:56:03Z trhodes $
-.\"
-.Dd August 17, 2004
-.Dt WCWIDTH 3
-.Os
-.Sh NAME
-.Nm wcwidth
-.Nd "number of column positions of a wide-character code"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wcwidth "wchar_t wc"
-.Sh DESCRIPTION
-The
-.Fn wcwidth
-function determines the number of column positions required to
-display the wide character
-.Fa wc .
-.Sh RETURN VALUES
-The
-.Fn wcwidth
-function returns 0 if the
-.Fa wc
-argument is a null wide character (L'\e0'),
-\-1 if
-.Fa wc
-is not printable,
-otherwise it returns the number of column positions the
-character occupies.
-.Sh EXAMPLES
-This code fragment reads text from standard input and
-breaks lines that are more than 20 column positions wide,
-similar to the
-.Xr fold 1
-utility:
-.Bd -literal -offset indent
-wint_t ch;
-int column, w;
-
-column = 0;
-while ((ch = getwchar()) != WEOF) {
-	w = wcwidth(ch);
-	if (w > 0 && column + w >= 20) {
-		putwchar(L'\en');
-		column = 0;
-	}
-	putwchar(ch);
-	if (ch == L'\en')
-		column = 0;
-	else if (w > 0)
-		column += w;
-}
-.Ed
-.Sh SEE ALSO
-.Xr iswprint 3 ,
-.Xr wcswidth 3
-.Sh STANDARDS
-The
-.Fn wcwidth
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/locale/wcwidth.c b/lib/libc_bsd/locale/wcwidth.c
deleted file mode 100644
index 72ecb39..0000000
--- a/lib/libc_bsd/locale/wcwidth.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/locale/wcwidth.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <wchar.h>
-#include <wctype.h>
-#include <xlocale.h>
-
-#undef wcwidth
-
-int
-wcwidth(wchar_t wc)
-{
-	return (__wcwidth(wc));
-}
-int
-wcwidth_l(wchar_t wc, locale_t locale)
-{
-	return (__wcwidth_l(wc, locale));
-}
diff --git a/lib/libc_bsd/locale/xlocale.3 b/lib/libc_bsd/locale/xlocale.3
deleted file mode 100644
index e43ab41..0000000
--- a/lib/libc_bsd/locale/xlocale.3
+++ /dev/null
@@ -1,280 +0,0 @@
-.\" Copyright (c) 2011 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by David Chisnall under sponsorship from
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/locale/xlocale.3 250244 2013-05-04 17:06:47Z pluknet $
-.\"
-.Dd September 17, 2011
-.Dt XLOCALE 3
-.Os
-.Sh NAME
-.Nm xlocale
-.Nd Thread-safe extended locale support
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In xlocale.h
-.Sh DESCRIPTION
-The extended locale support includes a set of functions for setting
-thread-local locales,
-as well convenience functions for performing locale-aware
-calls with a specified locale.
-.Pp
-The core of the xlocale API is the
-.Fa locale_t
-type.
-This is an opaque type encapsulating a locale.
-Instances of this can be either set as the locale for a specific thread or
-passed directly to the
-.Fa _l
-suffixed variants of various standard C functions.
-Two special
-.Fa locale_t
-values are available:
-.Bl -bullet -offset indent
-.It
-NULL refers to the current locale for the thread,
-or to the global locale if no locale has been set for this thread.
-.It
-LC_GLOBAL_LOCALE refers to the global locale.
-.El
-.Pp
-The global locale is the locale set with the
-.Xr setlocale 3
-function.
-.Sh SEE ALSO
-.Xr duplocale 3 ,
-.Xr freelocale 3 ,
-.Xr localeconv 3 ,
-.Xr newlocale 3 ,
-.Xr querylocale 3 ,
-.Xr uselocale 3 ,
-.Sh CONVENIENCE FUNCTIONS
-The xlocale API includes a number of
-.Fa _l
-suffixed convenience functions.
-These are variants of standard C functions
-that have been modified to take an explicit
-.Fa locale_t
-parameter as the final argument or, in the case of variadic functions,
-as an additional argument directly before the format string.
-Each of these functions accepts either NULL or LC_GLOBAL_LOCALE.
-In these functions, NULL refers to the C locale,
-rather than the thread's current locale.
-If you wish to use the thread's current locale,
-then use the unsuffixed version of the function.
-.Pp
-These functions are exposed by including
-.In xlocale.h
-.Em after
-including the relevant headers for the standard variant.
-For example, the
-.Xr strtol_l 3
-function is exposed by including
-.In xlocale.h
-after
-.In stdlib.h ,
-which defines
-.Xr strtol 3 .
-.Pp
-For reference,
-a complete list of the locale-aware functions that are available in this form,
-along with the headers that expose them, is provided here:
-.Bl -tag -width "<monetary.h> "
-.It In wctype.h
-.Xr iswalnum_l 3 ,
-.Xr iswalpha_l 3 ,
-.Xr iswcntrl_l 3 ,
-.Xr iswctype_l 3 ,
-.Xr iswdigit_l 3 ,
-.Xr iswgraph_l 3 ,
-.Xr iswlower_l 3 ,
-.Xr iswprint_l 3 ,
-.Xr iswpunct_l 3 ,
-.Xr iswspace_l 3 ,
-.Xr iswupper_l 3 ,
-.Xr iswxdigit_l 3 ,
-.Xr towlower_l 3 ,
-.Xr towupper_l 3 ,
-.Xr wctype_l 3 ,
-.It In ctype.h
-.Xr digittoint_l 3 ,
-.Xr isalnum_l 3 ,
-.Xr isalpha_l 3 ,
-.Xr isblank_l 3 ,
-.Xr iscntrl_l 3 ,
-.Xr isdigit_l 3 ,
-.Xr isgraph_l 3 ,
-.Xr ishexnumber_l 3 ,
-.Xr isideogram_l 3 ,
-.Xr islower_l 3 ,
-.Xr isnumber_l 3 ,
-.Xr isphonogram_l 3 ,
-.Xr isprint_l 3 ,
-.Xr ispunct_l 3 ,
-.Xr isrune_l 3 ,
-.Xr isspace_l 3 ,
-.Xr isspecial_l 3 ,
-.Xr isupper_l 3 ,
-.Xr isxdigit_l 3 ,
-.Xr tolower_l 3 ,
-.Xr toupper_l 3
-.It In inttypes.h
-.Xr strtoimax_l 3 ,
-.Xr strtoumax_l 3 ,
-.Xr wcstoimax_l 3 ,
-.Xr wcstoumax_l 3
-.It In langinfo.h
-.Xr nl_langinfo_l 3
-.It In monetary.h
-.Xr strfmon_l 3
-.It In stdio.h
-.Xr asprintf_l 3 ,
-.Xr fprintf_l 3 ,
-.Xr fscanf_l 3 ,
-.Xr printf_l 3 ,
-.Xr scanf_l 3 ,
-.Xr snprintf_l 3 ,
-.Xr sprintf_l 3 ,
-.Xr sscanf_l 3 ,
-.Xr vasprintf_l 3 ,
-.Xr vfprintf_l 3 ,
-.Xr vfscanf_l 3 ,
-.Xr vprintf_l 3 ,
-.Xr vscanf_l 3 ,
-.Xr vsnprintf_l 3 ,
-.Xr vsprintf_l 3 ,
-.Xr vsscanf_l 3
-.It In stdlib.h
-.Xr atof_l 3 ,
-.Xr atoi_l 3 ,
-.Xr atol_l 3 ,
-.Xr atoll_l 3 ,
-.Xr mblen_l 3 ,
-.Xr mbstowcs_l 3 ,
-.Xr mbtowc_l 3 ,
-.Xr strtod_l 3 ,
-.Xr strtof_l 3 ,
-.Xr strtol_l 3 ,
-.Xr strtold_l 3 ,
-.Xr strtoll_l 3 ,
-.Xr strtoq_l 3 ,
-.Xr strtoul_l 3 ,
-.Xr strtoull_l 3 ,
-.Xr strtouq_l 3 ,
-.Xr wcstombs_l 3 ,
-.Xr wctomb_l 3
-.It In string.h
-.Xr strcoll_l 3 ,
-.Xr strxfrm_l 3 ,
-.Xr strcasecmp_l 3 ,
-.Xr strcasestr_l 3 ,
-.Xr strncasecmp_l 3
-.It In time.h
-.Xr strftime_l 3
-.Xr strptime_l 3
-.It In wchar.h
-.Xr btowc_l 3 ,
-.Xr fgetwc_l 3 ,
-.Xr fgetws_l 3 ,
-.Xr fputwc_l 3 ,
-.Xr fputws_l 3 ,
-.Xr fwprintf_l 3 ,
-.Xr fwscanf_l 3 ,
-.Xr getwc_l 3 ,
-.Xr getwchar_l 3 ,
-.Xr mbrlen_l 3 ,
-.Xr mbrtowc_l 3 ,
-.Xr mbsinit_l 3 ,
-.Xr mbsnrtowcs_l 3 ,
-.Xr mbsrtowcs_l 3 ,
-.Xr putwc_l 3 ,
-.Xr putwchar_l 3 ,
-.Xr swprintf_l 3 ,
-.Xr swscanf_l 3 ,
-.Xr ungetwc_l 3 ,
-.Xr vfwprintf_l 3 ,
-.Xr vfwscanf_l 3 ,
-.Xr vswprintf_l 3 ,
-.Xr vswscanf_l 3 ,
-.Xr vwprintf_l 3 ,
-.Xr vwscanf_l 3 ,
-.Xr wcrtomb_l 3 ,
-.Xr wcscoll_l 3 ,
-.Xr wcsftime_l 3 ,
-.Xr wcsnrtombs_l 3 ,
-.Xr wcsrtombs_l 3 ,
-.Xr wcstod_l 3 ,
-.Xr wcstof_l 3 ,
-.Xr wcstol_l 3 ,
-.Xr wcstold_l 3 ,
-.Xr wcstoll_l 3 ,
-.Xr wcstoul_l 3 ,
-.Xr wcstoull_l 3 ,
-.Xr wcswidth_l 3 ,
-.Xr wcsxfrm_l 3 ,
-.Xr wctob_l 3 ,
-.Xr wcwidth_l 3 ,
-.Xr wprintf_l 3 ,
-.Xr wscanf_l 3
-.It In wctype.h
-.Xr iswblank_l 3 ,
-.Xr iswhexnumber_l 3 ,
-.Xr iswideogram_l 3 ,
-.Xr iswnumber_l 3 ,
-.Xr iswphonogram_l 3 ,
-.Xr iswrune_l 3 ,
-.Xr iswspecial_l 3 ,
-.Xr nextwctype_l 3 ,
-.Xr towctrans_l 3 ,
-.Xr wctrans_l 3
-.It In xlocale.h
-.Xr localeconv_l 3
-.El
-.Sh STANDARDS
-The functions
-conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The xlocale APIs first appeared in Darwin 8.0.
-This implementation was written by David Chisnall,
-under sponsorship from the FreeBSD Foundation and first appeared in
-.Fx 9.1 .
-.Sh CAVEATS
-The
-.Xr setlocale 3
-function, and others in the family, refer to the global locale.
-Other functions that depend on the locale, however,
-will take the thread-local locale if one has been set.
-This means that the idiom of setting the locale using
-.Xr setlocale 3 ,
-calling a locale-dependent function,
-and then restoring the locale will not
-have the expected behavior if the current thread has had a locale set using
-.Xr uselocale 3 .
-You should avoid this idiom and prefer to use the
-.Fa _l
-suffixed versions instead.
diff --git a/lib/libc_bsd/locale/xlocale.c b/lib/libc_bsd/locale/xlocale.c
deleted file mode 100644
index c5a1c53..0000000
--- a/lib/libc_bsd/locale/xlocale.c
+++ /dev/null
@@ -1,369 +0,0 @@
-/*-
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/locale/xlocale.c 284524 2015-06-17 19:12:18Z delphij $
- */
-
-#include <pthread.h>
-#include <stdio.h>
-#include <string.h>
-#include <runetype.h>
-#include "libc_private.h"
-#include "xlocale_private.h"
-
-/**
- * Each locale loader declares a global component.  This is used by setlocale()
- * and also by xlocale with LC_GLOBAL_LOCALE..
- */
-extern struct xlocale_component __xlocale_global_collate;
-extern struct xlocale_component __xlocale_global_ctype;
-extern struct xlocale_component __xlocale_global_monetary;
-extern struct xlocale_component __xlocale_global_numeric;
-extern struct xlocale_component __xlocale_global_time;
-extern struct xlocale_component __xlocale_global_messages;
-/*
- * And another version for the statically-allocated C locale.  We only have
- * components for the parts that are expected to be sensible.
- */
-extern struct xlocale_component __xlocale_C_collate;
-extern struct xlocale_component __xlocale_C_ctype;
-
-#ifndef __NO_TLS
-/*
- * The locale for this thread.
- */
-_Thread_local locale_t __thread_locale;
-#endif
-/*
- * Flag indicating that one or more per-thread locales exist.
- */
-int __has_thread_locale;
-/*
- * Private functions in setlocale.c.
- */
-const char *
-__get_locale_env(int category);
-int
-__detect_path_locale(void);
-
-struct _xlocale __xlocale_global_locale = {
-	{0},
-	{
-		&__xlocale_global_collate,
-		&__xlocale_global_ctype,
-		&__xlocale_global_monetary,
-		&__xlocale_global_numeric,
-		&__xlocale_global_time,
-		&__xlocale_global_messages
-	},
-	1,
-	0,
-	1,
-	0
-};
-
-struct _xlocale __xlocale_C_locale = {
-	{0},
-	{
-		&__xlocale_C_collate,
-		&__xlocale_C_ctype,
-		0, 0, 0, 0
-	},
-	1,
-	0,
-	1,
-	0
-};
-
-static void*(*constructors[])(const char*, locale_t) =
-{
-	__collate_load,
-	__ctype_load,
-	__monetary_load,
-	__numeric_load,
-	__time_load,
-	__messages_load
-};
-
-static pthread_key_t locale_info_key;
-static int fake_tls;
-static locale_t thread_local_locale;
-
-static void init_key(void)
-{
-
-	pthread_key_create(&locale_info_key, xlocale_release);
-	pthread_setspecific(locale_info_key, (void*)42);
-	if (pthread_getspecific(locale_info_key) == (void*)42) {
-		pthread_setspecific(locale_info_key, 0);
-	} else {
-		fake_tls = 1;
-	}
-	/* At least one per-thread locale has now been set. */
-	__has_thread_locale = 1;
-	__detect_path_locale();
-}
-
-static pthread_once_t once_control = PTHREAD_ONCE_INIT;
-
-static locale_t
-get_thread_locale(void)
-{
-
-	_once(&once_control, init_key);
-	
-	return (fake_tls ? thread_local_locale :
-		pthread_getspecific(locale_info_key));
-}
-
-#ifdef __NO_TLS
-locale_t
-__get_locale(void)
-{
-	locale_t l = get_thread_locale();
-	return (l ? l : &__xlocale_global_locale);
-
-}
-#endif
-
-static void
-set_thread_locale(locale_t loc)
-{
-	locale_t l = (loc == LC_GLOBAL_LOCALE) ? 0 : loc;
-
-	_once(&once_control, init_key);
-	
-	if (NULL != l) {
-		xlocale_retain((struct xlocale_refcounted*)l);
-	}
-	locale_t old = pthread_getspecific(locale_info_key);
-	if ((NULL != old) && (l != old)) {
-		xlocale_release((struct xlocale_refcounted*)old);
-	}
-	if (fake_tls) {
-		thread_local_locale = l;
-	} else {
-		pthread_setspecific(locale_info_key, l);
-	}
-#ifndef __NO_TLS
-	__thread_locale = l;
-	__set_thread_rune_locale(loc);
-#endif
-}
-
-/**
- * Clean up a locale, once its reference count reaches zero.  This function is
- * called by xlocale_release(), it should not be called directly.
- */
-static void
-destruct_locale(void *l)
-{
-	locale_t loc = l;
-
-	for (int type=0 ; type<XLC_LAST ; type++) {
-		if (loc->components[type]) {
-			xlocale_release(loc->components[type]);
-		}
-	}
-	if (loc->csym) {
-		free(loc->csym);
-	}
-	free(l);
-}
-
-/**
- * Allocates a new, uninitialised, locale.
- */
-static locale_t
-alloc_locale(void)
-{
-	locale_t new = calloc(sizeof(struct _xlocale), 1);
-
-	new->header.destructor = destruct_locale;
-	new->monetary_locale_changed = 1;
-	new->numeric_locale_changed = 1;
-	return (new);
-}
-static void
-copyflags(locale_t new, locale_t old)
-{
-	new->using_monetary_locale = old->using_monetary_locale;
-	new->using_numeric_locale = old->using_numeric_locale;
-	new->using_time_locale = old->using_time_locale;
-	new->using_messages_locale = old->using_messages_locale;
-}
-
-static int dupcomponent(int type, locale_t base, locale_t new) 
-{
-	/* Always copy from the global locale, since it has mutable components.
-	 */
-	struct xlocale_component *src = base->components[type];
-
-	if (&__xlocale_global_locale == base) {
-		new->components[type] = constructors[type](src->locale, new);
-		if (new->components[type]) {
-			strncpy(new->components[type]->locale, src->locale,
-			    ENCODING_LEN);
-		}
-	} else if (base->components[type]) {
-		new->components[type] = xlocale_retain(base->components[type]);
-	} else {
-		/* If the component was NULL, return success - if base is a
-		 * valid locale then the flag indicating that this isn't
-		 * present should be set.  If it isn't a valid locale, then
-		 * we're stuck anyway. */
-		return 1;
-	}
-	return (0 != new->components[type]);
-}
-
-/*
- * Public interfaces.  These are the five public functions described by the
- * xlocale interface.  
- */
-
-locale_t newlocale(int mask, const char *locale, locale_t base)
-{
-	int type;
-	const char *realLocale = locale;
-	int useenv = 0;
-	int success = 1;
-
-	_once(&once_control, init_key);
-
-	locale_t new = alloc_locale();
-	if (NULL == new) {
-		return (NULL);
-	}
-
-	FIX_LOCALE(base);
-	copyflags(new, base);
-
-	if (NULL == locale) {
-		realLocale = "C";
-	} else if ('\0' == locale[0]) {
-		useenv = 1;
-	}
-
-	for (type=0 ; type<XLC_LAST ; type++) {
-		if (mask & 1) {
-			if (useenv) {
-				realLocale = __get_locale_env(type);
-			}
-			new->components[type] =
-			     constructors[type](realLocale, new);
-			if (new->components[type]) {
-				strncpy(new->components[type]->locale,
-				     realLocale, ENCODING_LEN);
-			} else {
-				success = 0;
-				break;
-			}
-		} else {
-			if (!dupcomponent(type, base, new)) {
-				success = 0;
-				break;
-			}
-		}
-		mask >>= 1;
-	}
-	if (0 == success) {
-		xlocale_release(new);
-		new = NULL;
-	}
-
-	return (new);
-}
-
-locale_t duplocale(locale_t base)
-{
-	locale_t new = alloc_locale();
-	int type;
-
-	_once(&once_control, init_key);
-
-	if (NULL == new) {
-		return (NULL);
-	}
-	
-	FIX_LOCALE(base);
-	copyflags(new, base);
-
-	for (type=0 ; type<XLC_LAST ; type++) {
-		dupcomponent(type, base, new);
-	}
-
-	return (new);
-}
-
-/*
- * Free a locale_t.  This is quite a poorly named function.  It actually
- * disclaims a reference to a locale_t, rather than freeing it.  
- */
-int
-freelocale(locale_t loc)
-{
-	/* Fail if we're passed something that isn't a locale. */
-	if ((NULL == loc) || (LC_GLOBAL_LOCALE == loc)) {
-		return (-1);
-	}
-	/* If we're passed the global locale, pretend that we freed it but don't
-	 * actually do anything. */
-	if (&__xlocale_global_locale == loc) {
-		return (0);
-	}
-	xlocale_release(loc);
-	return (0);
-}
-
-/*
- * Returns the name of the locale for a particular component of a locale_t.
- */
-const char *querylocale(int mask, locale_t loc)
-{
-	int type = ffs(mask) - 1;
-	FIX_LOCALE(loc);
-	if (type >= XLC_LAST)
-		return (NULL);
-	if (loc->components[type])
-		return (loc->components[type]->locale);
-	return ("C");
-}
-
-/*
- * Installs the specified locale_t as this thread's locale.
- */
-locale_t uselocale(locale_t loc)
-{
-	locale_t old = get_thread_locale();
-	if (NULL != loc) {
-		set_thread_locale(loc);
-	}
-	return (old ? old : LC_GLOBAL_LOCALE);
-}
-
diff --git a/lib/libc_bsd/locale/xlocale_private.h b/lib/libc_bsd/locale/xlocale_private.h
deleted file mode 100644
index 49661a5..0000000
--- a/lib/libc_bsd/locale/xlocale_private.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/*-
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by David Chisnall under sponsorship from
- * the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/locale/xlocale_private.h 250883 2013-05-21 19:59:37Z ed $
- */
-
-#ifndef _XLOCALE_PRIVATE__H_
-#define _XLOCALE_PRIVATE__H_
-
-#include <xlocale.h>
-#include <locale.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <machine/atomic.h>
-#include "setlocale.h"
-
-enum {
-	XLC_COLLATE = 0,
-	XLC_CTYPE,
-	XLC_MONETARY,
-	XLC_NUMERIC,
-	XLC_TIME,
-	XLC_MESSAGES,
-	XLC_LAST
-};
-
-
-/**
- * Header used for objects that are reference counted.  Objects may optionally
- * have a destructor associated, which is responsible for destroying the
- * structure.  Global / static versions of the structure should have no
- * destructor set - they can then have their reference counts manipulated as
- * normal, but will not do anything with them.
- *
- * The header stores a retain count - objects are assumed to have a reference
- * count of 1 when they are created, but the retain count is 0.  When the
- * retain count is less than 0, they are freed.
- */
-struct xlocale_refcounted {
-	/** Number of references to this component.  */
-	long retain_count;
-	/** Function used to destroy this component, if one is required*/
-	void(*destructor)(void*);
-};
-/**
- * Header for a locale component.  All locale components must begin with this
- * header.
- */
-struct xlocale_component {
-	struct xlocale_refcounted header;
-	/** Name of the locale used for this component. */
-	char locale[ENCODING_LEN+1];
-};
-
-/**
- * xlocale structure, stores per-thread locale information.  
- */
-struct _xlocale {
-	struct xlocale_refcounted header;
-	/** Components for the locale.  */
-	struct xlocale_component *components[XLC_LAST];
-	/** Flag indicating if components[XLC_MONETARY] has changed since the
-	 * last call to localeconv_l() with this locale. */
-	int monetary_locale_changed;
-	/** Flag indicating whether this locale is actually using a locale for
-	 * LC_MONETARY (1), or if it should use the C default instead (0). */
-	int using_monetary_locale;
-	/** Flag indicating if components[XLC_NUMERIC] has changed since the
-	 * last call to localeconv_l() with this locale. */
-	int numeric_locale_changed;
-	/** Flag indicating whether this locale is actually using a locale for
-	 * LC_NUMERIC (1), or if it should use the C default instead (0). */
-	int using_numeric_locale;
-	/** Flag indicating whether this locale is actually using a locale for
-	 * LC_TIME (1), or if it should use the C default instead (0). */
-	int using_time_locale;
-	/** Flag indicating whether this locale is actually using a locale for
-	 * LC_MESSAGES (1), or if it should use the C default instead (0). */
-	int using_messages_locale;
-	/** The structure to be returned from localeconv_l() for this locale. */
-	struct lconv lconv;
-	/** Persistent state used by mblen() calls. */
-	__mbstate_t mblen;
-	/** Persistent state used by mbrlen() calls. */
-	__mbstate_t mbrlen;
-	/** Persistent state used by mbrtoc16() calls. */
-	__mbstate_t mbrtoc16;
-	/** Persistent state used by mbrtoc32() calls. */
-	__mbstate_t mbrtoc32;
-	/** Persistent state used by mbrtowc() calls. */
-	__mbstate_t mbrtowc;
-	/** Persistent state used by mbsnrtowcs() calls. */
-	__mbstate_t mbsnrtowcs;
-	/** Persistent state used by mbsrtowcs() calls. */
-	__mbstate_t mbsrtowcs;
-	/** Persistent state used by mbtowc() calls. */
-	__mbstate_t mbtowc;
-	/** Persistent state used by c16rtomb() calls. */
-	__mbstate_t c16rtomb;
-	/** Persistent state used by c32rtomb() calls. */
-	__mbstate_t c32rtomb;
-	/** Persistent state used by wcrtomb() calls. */
-	__mbstate_t wcrtomb;
-	/** Persistent state used by wcsnrtombs() calls. */
-	__mbstate_t wcsnrtombs;
-	/** Persistent state used by wcsrtombs() calls. */
-	__mbstate_t wcsrtombs;
-	/** Persistent state used by wctomb() calls. */
-	__mbstate_t wctomb;
-	/** Buffer used by nl_langinfo_l() */
-	char *csym;
-};
-
-/**
- * Increments the reference count of a reference-counted structure.
- */
-__attribute__((unused)) static void*
-xlocale_retain(void *val)
-{
-	struct xlocale_refcounted *obj = val;
-	atomic_add_long(&(obj->retain_count), 1);
-	return (val);
-}
-/**
- * Decrements the reference count of a reference-counted structure, freeing it
- * if this is the last reference, calling its destructor if it has one.
- */
-__attribute__((unused)) static void
-xlocale_release(void *val)
-{
-	struct xlocale_refcounted *obj = val;
-	long count = atomic_fetchadd_long(&(obj->retain_count), -1) - 1;
-	if (count < 0) {
-		if (0 != obj->destructor) {
-			obj->destructor(obj);
-		}
-	}
-}
-
-/**
- * Load functions.  Each takes the name of a locale and a pointer to the data
- * to be initialised as arguments.  Two special values are allowed for the 
- */
-extern void* __collate_load(const char*, locale_t);
-extern void* __ctype_load(const char*, locale_t);
-extern void* __messages_load(const char*, locale_t);
-extern void* __monetary_load(const char*, locale_t);
-extern void* __numeric_load(const char*, locale_t);
-extern void* __time_load(const char*, locale_t);
-
-extern struct _xlocale __xlocale_global_locale;
-extern struct _xlocale __xlocale_C_locale;
-
-/**
- * Caches the rune table in TLS for fast access.
- */
-void __set_thread_rune_locale(locale_t loc);
-/**
- * Flag indicating whether a per-thread locale has been set.  If no per-thread
- * locale has ever been set, then we always use the global locale.
- */
-extern int __has_thread_locale;
-#ifndef __NO_TLS
-/**
- * The per-thread locale.  Avoids the need to use pthread lookup functions when
- * getting the per-thread locale.
- */
-extern _Thread_local locale_t __thread_locale;
-
-/**
- * Returns the current locale for this thread, or the global locale if none is
- * set.  The caller does not have to free the locale.  The return value from
- * this call is not guaranteed to remain valid after the locale changes.  As
- * such, this should only be called within libc functions.
- */
-static inline locale_t __get_locale(void)
-{
-
-	if (!__has_thread_locale) {
-		return (&__xlocale_global_locale);
-	}
-	return (__thread_locale ? __thread_locale : &__xlocale_global_locale);
-}
-#else
-locale_t __get_locale(void);
-#endif
-
-/**
- * Two magic values are allowed for locale_t objects.  NULL and -1.  This
- * function maps those to the real locales that they represent.
- */
-static inline locale_t get_real_locale(locale_t locale)
-{
-	switch ((intptr_t)locale) {
-		case 0: return (&__xlocale_C_locale);
-		case -1: return (&__xlocale_global_locale);
-		default: return (locale);
-	}
-}
-
-/**
- * Replace a placeholder locale with the real global or thread-local locale_t.
- */
-#define FIX_LOCALE(l) (l = get_real_locale(l))
-
-#endif
diff --git a/lib/libc_bsd/md/Makefile.inc b/lib/libc_bsd/md/Makefile.inc
deleted file mode 100644
index 55c4b9a..0000000
--- a/lib/libc_bsd/md/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.incl 270837 2014-08-30 09:55:38Z ume $
-
-.PATH: ${.CURDIR}/../libmd
-
-SRCS+=	md5c.c
diff --git a/lib/libc_bsd/mips/Makefile.inc b/lib/libc_bsd/mips/Makefile.inc
deleted file mode 100644
index dd6e234..0000000
--- a/lib/libc_bsd/mips/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.7 2005/09/17 11:49:39 tsutsui Exp $
-Makefile.incl 209233 2010-06-16 14:13:36Z jchandra $
-
-CFLAGS+=-DSOFTFLOAT
-
-MDSRCS+= machdep_ldisd.c
-SYM_MAPS+= ${.CURDIR}/mips/Symbol.map
diff --git a/lib/libc_bsd/mips/SYS.h b/lib/libc_bsd/mips/SYS.h
deleted file mode 100644
index 01a3187..0000000
--- a/lib/libc_bsd/mips/SYS.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*	$NetBSD: SYS.h,v 1.19 2009/12/14 01:07:41 matt Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/mips/SYS.h 214260 2010-10-24 05:22:07Z jchandra $ */
-
-/*-
- * Copyright (c) 1996 Jonathan Stone
- * 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 Jonathan Stone for
- *      the NetBSD Project.
- * 4. 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 ``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 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.
- */
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- *
- *	from: @(#)SYS.h	8.1 (Berkeley) 6/4/93
- */
-
-#include <sys/syscall.h>
-
-#include <machine/asm.h>
-
-/*
- * If compiling for shared libs, Emit sysV ABI PIC segment pseudo-ops.
- *
- * i)  Emit .abicalls before .LEAF entrypoint, and .cpload/.cprestore after.
- * ii) Do interprocedure jumps indirectly via t9, with the side-effect of
- *     preserving the callee's entry address in t9.
- */
-#ifdef __ABICALLS__
-	.abicalls
-# if defined(__mips_o32) || defined(__mips_o64)
-#  define PIC_PROLOGUE(x)	SETUP_GP
-#  define PIC_TAILCALL(l)	PTR_LA t9, _C_LABEL(l); jr t9
-#  define PIC_RETURN()		j ra
-# else
-#  define PIC_PROLOGUE(x)	SETUP_GP64(t3, x)
-#  define PIC_TAILCALL(l)	PTR_LA t9, _C_LABEL(l); RESTORE_GP64; jr t9
-#  define PIC_RETURN()		RESTORE_GP64; j ra
-# endif
-#else
-# define PIC_PROLOGUE(x)
-# define PIC_TAILCALL(l)	j  _C_LABEL(l)
-# define PIC_RETURN()		j ra
-#endif /* __ABICALLS__ */
-
-# define SYSTRAP(x)	li v0,SYS_ ## x; syscall;
-
-/*
- * Do a syscall that cannot fail (sync, get{p,u,g,eu,eg)id)
- */
-#define RSYSCALL_NOERROR(x)						\
-	PSEUDO_NOERROR(x)
-
-/*
- * Do a normal syscall.
- */
-#define RSYSCALL(x)							\
-	PSEUDO(x)
-
-/*
- * Do a renamed or pseudo syscall (e.g., _exit()), where the entrypoint
- * and syscall name are not the same.
- */
-#define PSEUDO_NOERROR(x)						\
-LEAF(__sys_ ## x);							\
-	.weak _C_LABEL(x);						\
-	_C_LABEL(x) = _C_LABEL(__CONCAT(__sys_,x));			\
-	.weak _C_LABEL(__CONCAT(_,x));					\
-	_C_LABEL(__CONCAT(_,x)) = _C_LABEL(__CONCAT(__sys_,x));		\
-	SYSTRAP(x);							\
-	j ra;								\
-	END(__sys_ ## x)
-
-#define PSEUDO(x)							\
-LEAF(__sys_ ## x);							\
-	.weak _C_LABEL(x);						\
-	_C_LABEL(x) = _C_LABEL(__CONCAT(__sys_,x));			\
-	.weak _C_LABEL(__CONCAT(_,x));					\
-	_C_LABEL(__CONCAT(_,x)) = _C_LABEL(__CONCAT(__sys_,x));		\
-	PIC_PROLOGUE(__sys_ ## x);					\
-	SYSTRAP(x);							\
-	bne a3,zero,err;						\
-	PIC_RETURN();							\
-err:									\
-	PIC_TAILCALL(__cerror);						\
-END(__sys_ ## x)
diff --git a/lib/libc_bsd/mips/Symbol.map b/lib/libc_bsd/mips/Symbol.map
deleted file mode 100644
index c4f056f..0000000
--- a/lib/libc_bsd/mips/Symbol.map
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/mips/Symbol.map 226606 2011-10-21 06:40:36Z das $
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSD_1.0 {
-	/* PSEUDO syscalls */
-	_exit;
-
-	_setjmp;
-	_longjmp;
-	alloca;
-	fabs;
-	__infinity;
-	__nan;
-	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
-	htonl;
-	htons;
-	ntohl;
-	ntohs;
-	vfork;
-	brk;
-	cerror;		/* XXX - Should this be .cerror (see sys/cerror.S)? */
-	sbrk;
-};
-
-FBSDprivate_1.0 {
-	/* PSEUDO syscalls */
-	__sys_getlogin;
-	_getlogin;
-	__sys_exit;
-
-	_set_tp;
-	___longjmp;
-	__umodsi3;
-	__modsi3;
-	__udivsi3;
-	__divsi3;
-	__makecontext;
-	__longjmp;
-	signalcontext;
-	_signalcontext;
-	__siglongjmp;
-	__sys_vfork;
-	_vfork;
-	_end;
-	__curbrk;
-	minbrk;
-	_brk;
-	_sbrk;
-
-	/* softfloat */
-	__addsf3;
-	__adddf3;
-	__subsf3;
-	__subdf3;
-	__mulsf3;
-	__muldf3;
-	__divsf3;
-	__divdf3;
-	__floatsisf;
-	__floatsidf;
-	__fixsfsi;
-	__fixdfsi;
-	__fixunssfsi;
-	__fixunsdfsi;
-	__extendsfdf2;
-	__truncdfsf2;
-};
diff --git a/lib/libc_bsd/mips/_fpmath.h b/lib/libc_bsd/mips/_fpmath.h
deleted file mode 100644
index ae93e07..0000000
--- a/lib/libc_bsd/mips/_fpmath.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/mips/_fpmath.h 178580 2008-04-26 12:08:02Z imp $
- */
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-#ifndef __MIPSEB__
-		unsigned int	manl	:32;
-		unsigned int	manh	:20;
-		unsigned int	exp	:11;
-		unsigned int	sign	:1;
-#else
-		unsigned int		sign	:1;
-		unsigned int		exp	:11;
-		unsigned int		manh	:20;
-		unsigned int		manl	:32;
-#endif
-	} bits;
-};
-
-#define	LDBL_NBIT	0
-#define	mask_nbit_l(u)	((void)0)
-#define	LDBL_IMPLICIT_NBIT
-
-#define	LDBL_MANH_SIZE	20
-#define	LDBL_MANL_SIZE	32
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)(u).bits.manh;		\
-} while(0)
diff --git a/lib/libc_bsd/mips/arith.h b/lib/libc_bsd/mips/arith.h
deleted file mode 100644
index c1cb21f..0000000
--- a/lib/libc_bsd/mips/arith.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD: releng/10.2/lib/libc/mips/arith.h 178580 2008-04-26 12:08:02Z imp $
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-#include <machine/endian.h>
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IEEE_MC68k
-#define Arith_Kind_ASL 2
-#define Double_Align
-#else
-/* TODO: Generate these values on a LE machine */
-/* Current values were stolen from ia64 except the
- * Xpointer define.
- */
-#define IEEE_8087
-#define Arith_Kind_ASL 1
-#define Long int
-#define Intcast (int)(long)
-#define Double_Align
-#endif
diff --git a/lib/libc_bsd/mips/gd_qnan.h b/lib/libc_bsd/mips/gd_qnan.h
deleted file mode 100644
index 3c3cce7..0000000
--- a/lib/libc_bsd/mips/gd_qnan.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * This file can be generated by compiling and running contrib/gdtoa/qnan.c
- * on the target architecture after arith.h has been generated.
- *
- * $FreeBSD: releng/10.2/lib/libc/mips/gd_qnan.h 178580 2008-04-26 12:08:02Z imp $
- */
-
-
-#include <machine/endian.h>
-
-#if BYTE_ORDER == BIG_ENDIAN
-/* These values were gained on a running
- * Octeon in Big Endian order. They were gotten
- * by running ./qnan after arithchk was ran and
- * got us the proper values for arith.h.
- */
-#define f_QNAN 0x7f900000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
-#define ld_QNAN0 0x7ff80000
-#define ld_QNAN1 0x0
-#define ld_QNAN2 0x0
-#define ld_QNAN3 0x0
-#define ldus_QNAN0 0x7ff8
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0x0
-#define ldus_QNAN4 0x0
-#else
-/* FIX FIX, need to run this on a Little Endian
- * machine and get the proper values, these here
- * were stolen fromn i386/gd_qnan.h
- */
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x0
-#define d_QNAN1 0x7ff80000
-#define ld_QNAN0 0x0
-#define ld_QNAN1 0xc0000000
-#define ld_QNAN2 0x7fff
-#define ld_QNAN3 0x0
-#define ldus_QNAN0 0x0
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0xc000
-#define ldus_QNAN4 0x7fff
-#endif
diff --git a/lib/libc_bsd/mips/gdtoa/Makefile.inc b/lib/libc_bsd/mips/gdtoa/Makefile.inc
deleted file mode 100644
index e0ff766..0000000
--- a/lib/libc_bsd/mips/gdtoa/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.1 2006/03/15 17:35:18 kleink Exp $
-Makefile.incl 178580 2008-04-26 12:08:02Z imp $
-
-SRCS+=	strtof.c
diff --git a/lib/libc_bsd/mips/gdtoa/arith.h b/lib/libc_bsd/mips/gdtoa/arith.h
deleted file mode 100644
index a1e34a2..0000000
--- a/lib/libc_bsd/mips/gdtoa/arith.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* $NetBSD: arith.h,v 1.1 2006/01/25 15:33:28 kleink Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/mips/gdtoa/arith.h 178580 2008-04-26 12:08:02Z imp $ */
-
-#include <machine/endian.h>
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define IEEE_BIG_ENDIAN
-#else
-#define IEEE_LITTLE_ENDIAN
-#endif
diff --git a/lib/libc_bsd/mips/gen/Makefile.inc b/lib/libc_bsd/mips/gen/Makefile.inc
deleted file mode 100644
index 9043be9..0000000
--- a/lib/libc_bsd/mips/gen/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.27 2005/10/07 17:16:40 tsutsui Exp $
-Makefile.incl 230429 2012-01-21 18:00:28Z kib $
-
-SRCS+=	infinity.c fabs.c ldexp.c
-
-# SRCS+=	flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
-#	fpsetround.c fpsetsticky.c
-
-SRCS+=	_ctx_start.S _set_tp.c _setjmp.S getcontextx.c makecontext.c \
-	setjmp.S signalcontext.c sigsetjmp.S
diff --git a/lib/libc_bsd/mips/gen/_ctx_start.S b/lib/libc_bsd/mips/gen/_ctx_start.S
deleted file mode 100644
index 5a195c2..0000000
--- a/lib/libc_bsd/mips/gen/_ctx_start.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2010 Juli Mallett.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/_ctx_start.S 209233 2010-06-16 14:13:36Z jchandra $");
-
-/*
- * XXX gp?
- */
-ENTRY(_ctx_start)
-	jalr	t9
-
-	move	a0, s0
-	PTR_LA	t9, _ctx_done
-	jalr	t9
-
-	break	0
-END(_ctx_start)
diff --git a/lib/libc_bsd/mips/gen/_set_tp.c b/lib/libc_bsd/mips/gen/_set_tp.c
deleted file mode 100644
index 31f0c10..0000000
--- a/lib/libc_bsd/mips/gen/_set_tp.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/mips/gen/_set_tp.c 232581 2012-03-06 03:30:09Z gonzo $
- */
-
-#include <string.h>
-#include <stdint.h>
-
-#include <machine/sysarch.h>
-
-void
-_set_tp(void *tp)
-{
-
-	sysarch(MIPS_SET_TLS, tp);
-}
diff --git a/lib/libc_bsd/mips/gen/_setjmp.S b/lib/libc_bsd/mips/gen/_setjmp.S
deleted file mode 100644
index 502216c..0000000
--- a/lib/libc_bsd/mips/gen/_setjmp.S
+++ /dev/null
@@ -1,201 +0,0 @@
-/*	$NetBSD: _setjmp.S,v 1.20.34.5 2010/02/03 23:46:47 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/_setjmp.S 277537 2015-01-22 21:17:58Z brooks $");
-#include <machine/regnum.h>
-
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)_setjmp.s	8.1 (Berkeley) 6/4/93")
-#else
-	RCSID("$NetBSD: _setjmp.S,v 1.20.34.5 2010/02/03 23:46:47 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	_setjmp(a)
- * by restoring registers from the stack,
- * The previous signal state is NOT restored.
- */
-
-	.set	noreorder
-
-LEAF(_setjmp)
-	REG_PROLOGUE
-	REG_LI	v0, _JB_MAGIC__SETJMP		# sigcontext magic number
-	REG_S	v0, (_JB_MAGIC  * SZREG)(a0)
-	REG_S	ra, (_JB_REG_RA * SZREG)(a0)
-	/*
-	 * From "MIPSpro N32 ABI Handbook", Table 2-1:
-	 * Registers s0..s7 are callee-saved.
-	 * The sp register is callee-saved.
-	 * The fp (or s8) register is callee-saved.
-	 * The gp register is callee-saved (for n32/n64).
-	 */
-	REG_S	s0, (_JB_REG_S0 * SZREG)(a0)
-	REG_S	s1, (_JB_REG_S1 * SZREG)(a0)
-	REG_S	s2, (_JB_REG_S2 * SZREG)(a0)
-	REG_S	s3, (_JB_REG_S3 * SZREG)(a0)
-	REG_S	s4, (_JB_REG_S4 * SZREG)(a0)
-	REG_S	s5, (_JB_REG_S5 * SZREG)(a0)
-	REG_S	s6, (_JB_REG_S6 * SZREG)(a0)
-	REG_S	s7, (_JB_REG_S7 * SZREG)(a0)
-	REG_S	sp, (_JB_REG_SP * SZREG)(a0)
-	REG_S	s8, (_JB_REG_S8 * SZREG)(a0)
-#if defined(__mips_n32) || defined(__mips_n64)
-	REG_S	gp, (_JB_REG_GP * SZREG)(a0)	# newabi gp is callee-saved
-#endif
-	/*
-	 * From "MIPSpro N32 ABI Handbook", Table 2-1:
-	 * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved.
-	 * In N64, FP registers F24 .. F31 are callee-saved.
-	 * In O32, FP registers F20 .. F23 are callee-saved.
-	 */
-#ifndef SOFTFLOAT
-	cfc1	v0, $31				# too bad can't check if FP used
-#if defined(__mips_n64) || defined(__mips_n32)
-	FP_S	$f30, (_JB_FPREG_F30 * SZREG)(a0)
-	FP_S	$f28, (_JB_FPREG_F28 * SZREG)(a0)
-	FP_S	$f26, (_JB_FPREG_F26 * SZREG)(a0)
-	FP_S	$f24, (_JB_FPREG_F24 * SZREG)(a0)
-#endif
-#if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64)
-	FP_S	$f22, (_JB_FPREG_F22 * SZREG)(a0)
-	FP_S	$f20, (_JB_FPREG_F20 * SZREG)(a0)
-#endif
-#if defined(__mips_o32) || defined(__mips_o64)
-	FP_S	$f21, (_JB_FPREG_F21 * SZREG)(a0)
-	FP_S	$f23, (_JB_FPREG_F23 * SZREG)(a0)
-#endif
-#if defined(__mips_n64)
-	FP_S	$f25, (_JB_FPREG_F25 * SZREG)(a0)
-	FP_S	$f27, (_JB_FPREG_F27 * SZREG)(a0)
-	FP_S	$f29, (_JB_FPREG_F29 * SZREG)(a0)
-	FP_S	$f31, (_JB_FPREG_F31 * SZREG)(a0)
-#endif
-	INT_S	v0, (_JB_FPREG_FCSR * SZREG)(a0)
-#endif /* ! SOFTFLOAT */
-	REG_EPILOGUE
-
-	j	ra
-	move	v0, zero
-END(_setjmp)
-
-LEAF(_longjmp)
-	PIC_PROLOGUE(_longjmp)
-	PTR_SUBU	sp, sp, CALLFRAME_SIZ
-	SAVE_GP(CALLFRAME_GP)
-
-	REG_PROLOGUE
-	REG_L		v0, (_JB_MAGIC  * SZREG)(a0)	# get magic number
-	REG_L		ra, (_JB_REG_RA * SZREG)(a0)
-	REG_LI		t0, _JB_MAGIC__SETJMP
-	bne		v0, t0, botch		# jump if error
-	PTR_ADDU	sp, sp, CALLFRAME_SIZ	# does not matter, sanity
-	/*
-	 * From "MIPSpro N32 ABI Handbook", Table 2-1:
-	 * Registers s0..s7 are callee-saved.
-	 * The sp register is callee-saved.
-	 * The fp (or s8) register is callee-saved.
-	 * The gp register is callee-saved (for n32/n64).
-	 */
-	REG_L		s0, (_JB_REG_S0 * SZREG)(a0)
-	REG_L		s1, (_JB_REG_S1 * SZREG)(a0)
-	REG_L		s2, (_JB_REG_S2 * SZREG)(a0)
-	REG_L		s3, (_JB_REG_S3 * SZREG)(a0)
-	REG_L		s4, (_JB_REG_S4 * SZREG)(a0)
-	REG_L		s5, (_JB_REG_S5 * SZREG)(a0)
-	REG_L		s6, (_JB_REG_S6 * SZREG)(a0)
-	REG_L		s7, (_JB_REG_S7 * SZREG)(a0)
-	REG_L		sp, (_JB_REG_SP * SZREG)(a0)
-	REG_L		s8, (_JB_REG_S8 * SZREG)(a0)
-#if defined(__mips_n32) || defined(__mips_n64)
-	REG_L		gp, (_JB_REG_GP * SZREG)(a0)
-#endif
-#ifndef SOFTFLOAT
-	# get fpu status
-	INT_L		v0, (_JB_FPREG_FCSR * SZREG)(a0)
-	ctc1		v0, $31
-	/*
-	 * From "MIPSpro N32 ABI Handbook", Table 2-1:
-	 * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved.
-	 * In N64, FP registers F24 .. F31 are callee-saved.
-	 * In O32, FP registers F20 .. F23 are callee-saved.
-	 */
-#if defined(__mips_n64) || defined(__mips_n32)
-	FP_L	$f30, (_JB_FPREG_F30 * SZREG)(a0)
-	FP_L	$f28, (_JB_FPREG_F28 * SZREG)(a0)
-	FP_L	$f26, (_JB_FPREG_F26 * SZREG)(a0)
-	FP_L	$f24, (_JB_FPREG_F24 * SZREG)(a0)
-#endif
-#if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64)
-	FP_L	$f22, (_JB_FPREG_F22 * SZREG)(a0)
-	FP_L	$f20, (_JB_FPREG_F20 * SZREG)(a0)
-#endif
-#if defined(__mips_o32) || defined(__mips_o64)
-	FP_L	$f21, (_JB_FPREG_F21 * SZREG)(a0)
-	FP_L	$f23, (_JB_FPREG_F23 * SZREG)(a0)
-#endif
-#if defined(__mips_n64)
-	FP_L	$f25, (_JB_FPREG_F25 * SZREG)(a0)
-	FP_L	$f27, (_JB_FPREG_F27 * SZREG)(a0)
-	FP_L	$f29, (_JB_FPREG_F29 * SZREG)(a0)
-	FP_L	$f31, (_JB_FPREG_F31 * SZREG)(a0)
-#endif
-#endif	/* ! SOFTFLOAT */
-
-	REG_EPILOGUE
-	move	v0, a1			# get return value in 1st arg
-	j	ra
-	nop
-
-botch:
-	/*
-	 * We know we aren't returning so we don't care about restoring
-	 * our caller's GP.
-	 */
-	PTR_LA	t9, _C_LABEL(longjmperror)
-	jalr	t9
-	nop
-
-	PIC_TAILCALL(abort)
-END(_longjmp)
diff --git a/lib/libc_bsd/mips/gen/fabs.S b/lib/libc_bsd/mips/gen/fabs.S
deleted file mode 100644
index 6e1e883..0000000
--- a/lib/libc_bsd/mips/gen/fabs.S
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $	*/
-
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/fabs.S 178580 2008-04-26 12:08:02Z imp $");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)fabs.s	8.1 (Berkeley) 2/16/94")
-	ASMSTR("$NetBSD: fabs.S,v 1.7 2003/08/07 16:42:15 agc Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-	.set	noreorder
-
-/*
- * fabs(x)
- *	double x;
- *
- * Return absolute value of x.
- */
-LEAF(fabs)
-	j	ra
-	abs.d	$f0, $f12		# compute absolute value of x
-END(fabs)
diff --git a/lib/libc_bsd/mips/gen/fabs.c b/lib/libc_bsd/mips/gen/fabs.c
deleted file mode 100644
index 475665c..0000000
--- a/lib/libc_bsd/mips/gen/fabs.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: fabs.c,v 1.2 2002/05/26 11:48:01 wiz Exp $	*/
-
-/*
- * Copyright (c) 1996 Mark Brinicombe
- *
- * 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 Mark Brinicombe
- * 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 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.
- */
-
-/*
- * fabs(x) returns the absolute value of x.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/fabs.c 178580 2008-04-26 12:08:02Z imp $");
-
-double
-fabs(double x)
-{
-	if (x < 0)
-		x = -x;
-	return(x);
-}
diff --git a/lib/libc_bsd/mips/gen/flt_rounds.c b/lib/libc_bsd/mips/gen/flt_rounds.c
deleted file mode 100644
index 53d3ae4..0000000
--- a/lib/libc_bsd/mips/gen/flt_rounds.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.5 2005/12/24 23:10:08 perry Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/flt_rounds.c 178580 2008-04-26 12:08:02Z imp $");
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: flt_rounds.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include <machine/float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds()
-{
-	int x;
-
-	__asm("cfc1 %0,$31" : "=r" (x));
-	return map[x & 0x03];
-}
diff --git a/lib/libc_bsd/mips/gen/getcontextx.c b/lib/libc_bsd/mips/gen/getcontextx.c
deleted file mode 100644
index 941113d..0000000
--- a/lib/libc_bsd/mips/gen/getcontextx.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/getcontextx.c 251047 2013-05-28 04:54:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stdlib.h>
-
-int
-__getcontextx_size(void)
-{
-
-	return (sizeof(ucontext_t));
-}
-
-int
-__fillcontextx2(char *ctx)
-{
-
-	return (0);
-}
-
-int
-__fillcontextx(char *ctx)
-{
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	return (getcontext(ucp));
-}
-
-__weak_reference(__getcontextx, getcontextx);
-
-ucontext_t *
-__getcontextx(void)
-{
-	char *ctx;
-	int error;
-
-	ctx = malloc(__getcontextx_size());
-	if (ctx == NULL)
-		return (NULL);
-	if (__fillcontextx(ctx) == -1) {
-		error = errno;
-		free(ctx);
-		errno = error;
-		return (NULL);
-	}
-	return ((ucontext_t *)ctx);
-}
diff --git a/lib/libc_bsd/mips/gen/hardfloat/fpgetmask.c b/lib/libc_bsd/mips/gen/hardfloat/fpgetmask.c
deleted file mode 100644
index da7eca1..0000000
--- a/lib/libc_bsd/mips/gen/hardfloat/fpgetmask.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.5 2005/12/24 23:10:08 perry Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/hardfloat/fpgetmask.c 201856 2010-01-08 23:50:39Z imp $");
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetmask.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-fp_except_t
-fpgetmask()
-{
-	int x;
-
-	__asm("cfc1 %0,$31" : "=r" (x));
-	return (x >> 7) & 0x1f;
-}
diff --git a/lib/libc_bsd/mips/gen/hardfloat/fpgetround.c b/lib/libc_bsd/mips/gen/hardfloat/fpgetround.c
deleted file mode 100644
index cf76d80..0000000
--- a/lib/libc_bsd/mips/gen/hardfloat/fpgetround.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.5 2005/12/24 23:10:08 perry Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/hardfloat/fpgetround.c 201856 2010-01-08 23:50:39Z imp $");
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetround.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd_t
-fpgetround()
-{
-	int x;
-
-	__asm("cfc1 %0,$31" : "=r" (x));
-	return x & 0x03;
-}
diff --git a/lib/libc_bsd/mips/gen/hardfloat/fpgetsticky.c b/lib/libc_bsd/mips/gen/hardfloat/fpgetsticky.c
deleted file mode 100644
index 2370438..0000000
--- a/lib/libc_bsd/mips/gen/hardfloat/fpgetsticky.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.5 2005/12/24 23:10:08 perry Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/hardfloat/fpgetsticky.c 201856 2010-01-08 23:50:39Z imp $");
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpgetsticky.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except_t
-fpgetsticky()
-{
-	int x;
-
-	__asm("cfc1 %0,$31" : "=r" (x));
-	return (x >> 2) & 0x1f;
-}
diff --git a/lib/libc_bsd/mips/gen/hardfloat/fpsetmask.c b/lib/libc_bsd/mips/gen/hardfloat/fpsetmask.c
deleted file mode 100644
index d59d242..0000000
--- a/lib/libc_bsd/mips/gen/hardfloat/fpsetmask.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.5 2005/12/24 23:10:08 perry Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/hardfloat/fpsetmask.c 201856 2010-01-08 23:50:39Z imp $");
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetmask.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-fp_except_t
-fpsetmask(mask)
-	fp_except_t mask;
-{
-	fp_except_t old;
-	fp_except_t new;
-
-	__asm("cfc1 %0,$31" : "=r" (old));
-
-	new = old;
-	new &= ~(0x1f << 7); 
-	new |= ((mask & 0x1f) << 7);
-
-	__asm("ctc1 %0,$31" : : "r" (new));
-
-	return (old >> 7) & 0x1f;
-}
diff --git a/lib/libc_bsd/mips/gen/hardfloat/fpsetround.c b/lib/libc_bsd/mips/gen/hardfloat/fpsetround.c
deleted file mode 100644
index c3ade54..0000000
--- a/lib/libc_bsd/mips/gen/hardfloat/fpsetround.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.5 2005/12/24 23:10:08 perry Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/hardfloat/fpsetround.c 201856 2010-01-08 23:50:39Z imp $");
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetround.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd_t
-fpsetround(fp_rnd_t rnd_dir)
-{
-	fp_rnd_t old;
-	fp_rnd_t new;
-
-	__asm("cfc1 %0,$31" : "=r" (old));
-
-	new = old;
-	new &= ~0x03;
-	new |= (rnd_dir & 0x03);
-
-	__asm("ctc1 %0,$31" : : "r" (new));
-
-	return old & 0x03;
-}
diff --git a/lib/libc_bsd/mips/gen/hardfloat/fpsetsticky.c b/lib/libc_bsd/mips/gen/hardfloat/fpsetsticky.c
deleted file mode 100644
index 1d41379..0000000
--- a/lib/libc_bsd/mips/gen/hardfloat/fpsetsticky.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*	$NetBSD: fpsetsticky.c,v 1.5 2005/12/24 23:10:08 perry Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 11, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/hardfloat/fpsetsticky.c 201856 2010-01-08 23:50:39Z imp $");
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fpsetsticky.c,v 1.5 2005/12/24 23:10:08 perry Exp $");
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(sticky)
-	fp_except sticky;
-{
-	fp_except old;
-	fp_except new;
-
-	__asm("cfc1 %0,$31" : "=r" (old));
-
-	new = old;
-	new &= ~(0x1f << 2); 
-	new |= ((sticky & 0x1f) << 2);
-
-	__asm("ctc1 %0,$31" : : "r" (new));
-
-	return (old >> 2) & 0x1f;
-}
diff --git a/lib/libc_bsd/mips/gen/infinity.c b/lib/libc_bsd/mips/gen/infinity.c
deleted file mode 100644
index c36e82d..0000000
--- a/lib/libc_bsd/mips/gen/infinity.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * infinity.c
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/infinity.c 178580 2008-04-26 12:08:02Z imp $");
-
-#include <math.h>
-
-/* bytes for +Infinity on a 387 */
-const union __infinity_un __infinity = { 
-#if BYTE_ORDER == BIG_ENDIAN
-	{ 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
-#else
-	{ 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }
-#endif
-};
-
-/* bytes for NaN */
-const union __nan_un __nan = {
-#if BYTE_ORDER == BIG_ENDIAN
-	{0x7f, 0xa0, 0, 0}
-#else
-	{ 0, 0, 0xa0, 0x7f }
-#endif
-};
diff --git a/lib/libc_bsd/mips/gen/ldexp.S b/lib/libc_bsd/mips/gen/ldexp.S
deleted file mode 100644
index 8fefde4..0000000
--- a/lib/libc_bsd/mips/gen/ldexp.S
+++ /dev/null
@@ -1,219 +0,0 @@
-/*	$NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/ldexp.S 178580 2008-04-26 12:08:02Z imp $");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)ldexp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: ldexp.S,v 1.8 2003/08/07 16:42:15 agc Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-#define DEXP_INF	0x7ff
-#define DEXP_BIAS	1023
-#define DEXP_MIN	-1022
-#define DEXP_MAX	1023
-#define DFRAC_BITS	52
-#define DIMPL_ONE	0x00100000
-#define DLEAD_ZEROS	31 - 20
-#define STICKYBIT	1
-#define GUARDBIT	0x80000000
-#define DSIGNAL_NAN	0x00040000
-#define DQUIET_NAN0	0x0007ffff
-#define DQUIET_NAN1	0xffffffff
-
-/*
- * double ldexp(x, N)
- *	double x; int N;
- *
- * Return x * (2**N), for integer values N.
- */
-LEAF(ldexp)
-	mfc1	v1, $f13		# get MSW of x
-	mfc1	t3, $f12		# get LSW of x
-	sll	t1, v1, 1		# get x exponent
-	srl	t1, t1, 32 - 11
-	beq	t1, DEXP_INF, 9f	# is it a NAN or infinity?
-	beq	t1, zero, 1f		# zero or denormalized number?
-	addu	t1, t1, a2		# scale exponent
-	sll	v0, a2, 20		# position N for addition
-	bge	t1, DEXP_INF, 8f	# overflow?
-	addu	v0, v0, v1		# multiply by (2**N)
-	ble	t1, zero, 4f		# underflow?
-	mtc1	v0, $f1			# save MSW of result
-	mtc1	t3, $f0			# save LSW of result
-	j	ra
-1:
-	sll	t2, v1, 32 - 20		# get x fraction
-	srl	t2, t2, 32 - 20
-	srl	t0, v1, 31		# get x sign
-	bne	t2, zero, 1f
-	beq	t3, zero, 9f		# result is zero
-1:
-/*
- * Find out how many leading zero bits are in t2,t3 and put in t9.
- */
-	move	v0, t2
-	move	t9, zero
-	bne	t2, zero, 1f
-	move	v0, t3
-	addu	t9, 32
-1:
-	srl	ta0, v0, 16
-	bne	ta0, zero, 1f
-	addu	t9, 16
-	sll	v0, 16
-1:
-	srl	ta0, v0, 24
-	bne	ta0, zero, 1f
-	addu	t9, 8
-	sll	v0, 8
-1:
-	srl	ta0, v0, 28
-	bne	ta0, zero, 1f
-	addu	t9, 4
-	sll	v0, 4
-1:
-	srl	ta0, v0, 30
-	bne	ta0, zero, 1f
-	addu	t9, 2
-	sll	v0, 2
-1:
-	srl	ta0, v0, 31
-	bne	ta0, zero, 1f
-	addu	t9, 1
-/*
- * Now shift t2,t3 the correct number of bits.
- */
-1:
-	subu	t9, t9, DLEAD_ZEROS	# dont count normal leading zeros
-	li	t1, DEXP_MIN + DEXP_BIAS
-	subu	t1, t1, t9		# adjust exponent
-	addu	t1, t1, a2		# scale exponent
-	li	v0, 32
-	blt	t9, v0, 1f
-	subu	t9, t9, v0		# shift fraction left >= 32 bits
-	sll	t2, t3, t9
-	move	t3, zero
-	b	2f
-1:
-	subu	v0, v0, t9		# shift fraction left < 32 bits
-	sll	t2, t2, t9
-	srl	ta0, t3, v0
-	or	t2, t2, ta0
-	sll	t3, t3, t9
-2:
-	bge	t1, DEXP_INF, 8f	# overflow?
-	ble	t1, zero, 4f		# underflow?
-	sll	t2, t2, 32 - 20		# clear implied one bit
-	srl	t2, t2, 32 - 20
-3:
-	sll	t1, t1, 31 - 11		# reposition exponent
-	sll	t0, t0, 31		# reposition sign
-	or	t0, t0, t1		# put result back together
-	or	t0, t0, t2
-	mtc1	t0, $f1			# save MSW of result
-	mtc1	t3, $f0			# save LSW of result
-	j	ra
-4:
-	li	v0, 0x80000000
-	ble	t1, -52, 7f		# is result too small for denorm?
-	sll	t2, v1, 31 - 20		# clear exponent, extract fraction
-	or	t2, t2, v0		# set implied one bit
-	blt	t1, -30, 2f		# will all bits in t3 be shifted out?
-	srl	t2, t2, 31 - 20		# shift fraction back to normal position
-	subu	t1, t1, 1
-	sll	ta0, t2, t1		# shift right t2,t3 based on exponent
-	srl	t8, t3, t1		# save bits shifted out
-	negu	t1
-	srl	t3, t3, t1
-	or	t3, t3, ta0
-	srl	t2, t2, t1
-	bge	t8, zero, 1f		# does result need to be rounded?
-	addu	t3, t3, 1		# round result
-	sltu	ta0, t3, 1
-	sll	t8, t8, 1
-	addu	t2, t2, ta0
-	bne	t8, zero, 1f		# round result to nearest
-	and	t3, t3, ~1
-1:
-	mtc1	t3, $f0			# save denormalized result (LSW)
-	mtc1	t2, $f1			# save denormalized result (MSW)
-	bge	v1, zero, 1f		# should result be negative?
-	neg.d	$f0, $f0		# negate result
-1:
-	j	ra
-2:
-	mtc1	zero, $f1		# exponent and upper fraction
-	addu	t1, t1, 20		# compute amount to shift right by
-	sll	t8, t2, t1		# save bits shifted out
-	negu	t1
-	srl	t3, t2, t1
-	bge	t8, zero, 1f		# does result need to be rounded?
-	addu	t3, t3, 1		# round result
-	sltu	ta0, t3, 1
-	sll	t8, t8, 1
-	mtc1	ta0, $f1			# exponent and upper fraction
-	bne	t8, zero, 1f		# round result to nearest
-	and	t3, t3, ~1
-1:
-	mtc1	t3, $f0
-	bge	v1, zero, 1f		# is result negative?
-	neg.d	$f0, $f0		# negate result
-1:
-	j	ra
-7:
-	mtc1	zero, $f0		# result is zero
-	mtc1	zero, $f1
-	beq	t0, zero, 1f		# is result positive?
-	neg.d	$f0, $f0		# negate result
-1:
-	j	ra
-8:
-	li	t1, 0x7ff00000		# result is infinity (MSW)
-	mtc1	t1, $f1	
-	mtc1	zero, $f0		# result is infinity (LSW)
-	bge	v1, zero, 1f		# should result be negative infinity?
-	neg.d	$f0, $f0		# result is negative infinity
-1:
-	add.d	$f0, $f0		# cause overflow faults if enabled
-	j	ra
-9:
-	mov.d	$f0, $f12		# yes, result is just x
-	j	ra
-END(ldexp)
diff --git a/lib/libc_bsd/mips/gen/longjmp.c b/lib/libc_bsd/mips/gen/longjmp.c
deleted file mode 100644
index e4c300f..0000000
--- a/lib/libc_bsd/mips/gen/longjmp.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*	$NetBSD: longjmp.c,v 1.1 2005/09/17 11:49:39 tsutsui Exp $	*/
-
-/*-
- * Copyright (c) 2003 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christian Limpach and Matt Thomas.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/longjmp.c 251091 2013-05-29 01:54:10Z emaste $");
-#include "namespace.h"
-#include <sys/types.h>
-#include <ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <machine/regnum.h>
-
-void
-__longjmp14(jmp_buf env, int val)
-{
-	struct sigcontext *sc = (void *)env;
-	ucontext_t uc;
-
-	/* Ensure non-zero SP and sigcontext magic number is present */
-	if (sc->sc_regs[_R_SP] == 0 || sc->sc_regs[_R_ZERO] != 0xACEDBADE)
-		goto err;
-
-	/* Ensure non-zero return value */
-	if (val == 0)
-		val = 1;
-
-	/*
-	 * Set _UC_{SET,CLR}STACK according to SS_ONSTACK.
-	 *
-	 * Restore the signal mask with sigprocmask() instead of _UC_SIGMASK,
-	 * since libpthread may want to interpose on signal handling.
-	 */
-	uc.uc_flags = _UC_CPU | (sc->sc_onstack ? _UC_SETSTACK : _UC_CLRSTACK);
-
-	sigprocmask(SIG_SETMASK, &sc->sc_mask, NULL);
-
-	/* Clear uc_link */
-	uc.uc_link = 0;
-
-	/* Save return value in context */
-	uc.uc_mcontext.__gregs[_R_V0] = val;
-
-	/* Copy saved registers */
-	uc.uc_mcontext.__gregs[_REG_S0] = sc->sc_regs[_R_S0];
-	uc.uc_mcontext.__gregs[_REG_S1] = sc->sc_regs[_R_S1];
-	uc.uc_mcontext.__gregs[_REG_S2] = sc->sc_regs[_R_S2];
-	uc.uc_mcontext.__gregs[_REG_S3] = sc->sc_regs[_R_S3];
-	uc.uc_mcontext.__gregs[_REG_S4] = sc->sc_regs[_R_S4];
-	uc.uc_mcontext.__gregs[_REG_S5] = sc->sc_regs[_R_S5];
-	uc.uc_mcontext.__gregs[_REG_S6] = sc->sc_regs[_R_S6];
-	uc.uc_mcontext.__gregs[_REG_S7] = sc->sc_regs[_R_S7];
-	uc.uc_mcontext.__gregs[_REG_S8] = sc->sc_regs[_R_S8];
-	uc.uc_mcontext.__gregs[_REG_SP] = sc->sc_regs[_R_SP];
-	uc.uc_mcontext.__gregs[_REG_RA] = sc->sc_regs[_R_RA];
-	uc.uc_mcontext.__gregs[_REG_EPC] = sc->sc_pc;
-
-	/* Copy FP state */
-	if (sc->sc_fpused) {
-		/* FP saved regs are $f20 .. $f31 */
-		memcpy(&uc.uc_mcontext.__fpregs.__fp_r.__fp_regs[20],
-		    &sc->sc_fpregs[20], 32 - 20);
-		uc.uc_mcontext.__fpregs.__fp_csr =
-		    sc->sc_fpregs[_R_FSR - _FPBASE];
-		/* XXX sc_fp_control */
-		uc.uc_flags |= _UC_FPU;
-	}
-
-	setcontext(&uc);
- err:
-	longjmperror();
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/mips/gen/makecontext.c b/lib/libc_bsd/mips/gen/makecontext.c
deleted file mode 100644
index b95e38d..0000000
--- a/lib/libc_bsd/mips/gen/makecontext.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*	$NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Klaus Klein.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/makecontext.c 209233 2010-06-16 14:13:36Z jchandra $");
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: makecontext.c,v 1.5 2009/12/14 01:07:42 matt Exp $");
-#endif
-
-#include <sys/param.h>
-#include <machine/regnum.h>
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <ucontext.h>
-
-__weak_reference(__makecontext, makecontext);
-
-void _ctx_done(ucontext_t *);
-void _ctx_start(void);
-
-void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
-{
-	mcontext_t *mc;
-	register_t *sp;
-	int i;
-	va_list ap;
-
-	/*
-	 * XXX/juli
-	 * We need an mc_len or mc_flags like other architectures
-	 * so that we can mark a context as invalid.  Store it in
-	 * mc->mc_regs[ZERO] perhaps?
-	 */
-	if (argc < 0 || argc > 6 || ucp == NULL ||
-	    ucp->uc_stack.ss_sp == NULL ||
-	    ucp->uc_stack.ss_size < MINSIGSTKSZ)
-		return;
-	mc = &ucp->uc_mcontext;
-
-	sp  = (register_t *)
-	    ((uintptr_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size);
-#if defined(__mips_o32) || defined(__mips_o64)
-	sp -= (argc >= 4 ? argc : 4);	/* Make room for >=4 arguments. */
-	sp  = (register_t *)
-	    ((uintptr_t)sp & ~0x7);	/* Align on double-word boundary. */
-#elif defined(__mips_n32) || defined(__mips_n64)
-	sp -= (argc > 8 ? argc - 8 : 0); /* Make room for > 8 arguments. */
-	sp  = (register_t *)
-	    ((uintptr_t)sp & ~0xf);	/* Align on quad-word boundary. */
-#endif
-
-	mc->mc_regs[SP] = (intptr_t)sp;
-	mc->mc_regs[S0] = (intptr_t)ucp;
-	mc->mc_regs[T9] = (intptr_t)func;
-	mc->mc_pc = (intptr_t)_ctx_start;
-
-	/* Construct argument list. */
-	va_start(ap, argc);
-#if defined(__mips_o32) || defined(__mips_o64)
-	/* Up to the first four arguments are passed in $a0-3. */
-	for (i = 0; i < argc && i < 4; i++)
-		/* LINTED register_t is safe */
-		mc->mc_regs[A0 + i] = va_arg(ap, register_t);
-	/* Pass remaining arguments on the stack above the $a0-3 gap. */
-	sp += i;
-#endif
-#if defined(__mips_n32) || defined(__mips_n64)
-	/* Up to the first 8 arguments are passed in $a0-7. */
-	for (i = 0; i < argc && i < 8; i++)
-		/* LINTED register_t is safe */
-		mc->mc_regs[A0 + i] = va_arg(ap, register_t);
-	/* Pass remaining arguments on the stack above the $a0-3 gap. */
-#endif
-	/* Pass remaining arguments on the stack above the $a0-3 gap. */
-	for (; i < argc; i++)
-		/* LINTED uintptr_t is safe */
-		*sp++ = va_arg(ap, register_t);
-	va_end(ap);
-}
-
-void
-_ctx_done(ucontext_t *ucp)
-{
-
-	if (ucp->uc_link == NULL)
-		exit(0);
-	else {
-		setcontext((const ucontext_t *)ucp->uc_link);
-		abort();
-	}
-}
diff --git a/lib/libc_bsd/mips/gen/setjmp.S b/lib/libc_bsd/mips/gen/setjmp.S
deleted file mode 100644
index 9914359..0000000
--- a/lib/libc_bsd/mips/gen/setjmp.S
+++ /dev/null
@@ -1,238 +0,0 @@
-/*	$NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/setjmp.S 277537 2015-01-22 21:17:58Z brooks $");
-#include <machine/regnum.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: setjmp.S,v 1.17 2005/09/17 11:49:39 tsutsui Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-/*
- * C library -- setjmp, longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	setjmp(a)
- * by restoring registers from the stack,
- * and a struct sigcontext, see <signal.h>
- */
-
-#define SETJMP_FRAME_SIZE	(CALLFRAME_SIZ + (SZREG * 2))
-
-
-NESTED(setjmp, SETJMP_FRAME_SIZE, ra)
-	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	SETUP_GP
-	PTR_SUBU sp, sp, SETJMP_FRAME_SIZE	# allocate stack frame
-	SAVE_GP(CALLFRAME_GP)
-	SETUP_GP64(CALLFRAME_GP, setjmp)
-
-	REG_S	ra, CALLFRAME_RA(sp)		# save RA
-	REG_S	a0, CALLFRAME_SIZ(sp)		# store env
-
-	/* Get the signal mask. */
-	PTR_ADDU a2, a0, _JB_SIGMASK * SZREG	# &oenv
-	li	a0, 1				# SIG_SETBLOCK
-	move	a1, zero			# &env == 0
-	PTR_LA	t9, _C_LABEL(sigprocmask)	# get current signal mask
-	jalr	t9
-
-	RESTORE_GP64
-	REG_L	a0, CALLFRAME_SIZ(sp)		# restore env pointer
-	REG_L	ra, CALLFRAME_RA(sp)		# restore RA
-	PTR_ADDU sp, sp, SETJMP_FRAME_SIZE	# pop stack frame
-
-	REG_LI	v0, _JB_MAGIC_SETJMP
-	REG_S	v0, (_JB_MAGIC  * SZREG)(a0)
-	REG_S	ra, (_JB_REG_RA * SZREG)(a0)
-	/*
-	 * From "MIPSpro N32 ABI Handbook", Table 2-1:
-	 * Registers s0..s7 are callee-saved.
-	 * The sp register is callee-saved.
-	 * The fp (or s8) register is callee-saved.
-	 * The gp register is callee-saved (for n32/n64).
-	 */
-	REG_S	s0, (_JB_REG_S0 * SZREG)(a0)
-	REG_S	s1, (_JB_REG_S1 * SZREG)(a0)
-	REG_S	s2, (_JB_REG_S2 * SZREG)(a0)
-	REG_S	s3, (_JB_REG_S3 * SZREG)(a0)
-	REG_S	s4, (_JB_REG_S4 * SZREG)(a0)
-	REG_S	s5, (_JB_REG_S5 * SZREG)(a0)
-	REG_S	s6, (_JB_REG_S6 * SZREG)(a0)
-	REG_S	s7, (_JB_REG_S7 * SZREG)(a0)
-	REG_S	sp, (_JB_REG_SP * SZREG)(a0)
-	REG_S	s8, (_JB_REG_S8 * SZREG)(a0)
-#if defined(__mips_n32) || defined(__mips_n64)
-	REG_S	gp, (_JB_REG_GP * SZREG)(a0)
-#endif
-#ifndef SOFTFLOAT
-	/*
-	 * From "MIPSpro N32 ABI Handbook", Table 2-1:
-	 * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved.
-	 * In N64, FP registers F24 .. F31 are callee-saved.
-	 * In O32, FP registers F20 .. F23 are callee-saved.
-	 */
-	cfc1	v0, $31
-	INT_S	v0, (_JB_FPREG_FCSR * SZREG)(a0)
-#if defined(__mips_o32) || defined(__mips_o64) || defined(__mips_n32)
-	FP_S	$f20, (_JB_FPREG_F20 * SZREG)(a0)
-	FP_S	$f22, (_JB_FPREG_F22 * SZREG)(a0)
-#endif
-#if defined(__mips_o32) || defined(__mips_o64)
-	FP_S	$f21, (_JB_FPREG_F21 * SZREG)(a0)
-	FP_S	$f23, (_JB_FPREG_F23 * SZREG)(a0)
-#endif
-#if defined(__mips_n32) || defined(__mips_n64)
-	FP_S	$f24, (_JB_FPREG_F24 * SZREG)(a0)
-	FP_S	$f26, (_JB_FPREG_F26 * SZREG)(a0)
-	FP_S	$f28, (_JB_FPREG_F28 * SZREG)(a0)
-	FP_S	$f30, (_JB_FPREG_F30 * SZREG)(a0)
-#endif
-#if defined(__mips_n64)
-	FP_S	$f25, (_JB_FPREG_F25 * SZREG)(a0)
-	FP_S	$f27, (_JB_FPREG_F27 * SZREG)(a0)
-	FP_S	$f29, (_JB_FPREG_F29 * SZREG)(a0)
-	FP_S	$f31, (_JB_FPREG_F31 * SZREG)(a0)
-#endif
-#endif	/* ! SOFTFLOAT */
-
-	move	v0, zero
-	jr	ra
-END(setjmp)
-
-#define LONGJMP_FRAME_SIZE	(CALLFRAME_SIZ + (SZREG * 2))
-
-NESTED(longjmp, LONGJMP_FRAME_SIZE, ra)
-	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	PIC_PROLOGUE(longjmp)
-	PTR_SUBU sp, sp, LONGJMP_FRAME_SIZE	# allocate stack frame
-	SAVE_GP(CALLFRAME_GP)
-
-	REG_S	ra, CALLFRAME_RA(sp)		# save RA
-	REG_L	v0, (_JB_MAGIC  * SZREG)(a0)
-	REG_LI	t0, _JB_MAGIC_SETJMP
-	bne	v0, t0, botch		# jump if error
-	nop
-
-	REG_S	a0, CALLFRAME_SIZ(sp)		# save env
-	REG_S	a1, (CALLFRAME_SIZ + SZREG)(sp)	# save return value
-
-	# set sigmask
-	PTR_ADDU a1, a0, _JB_SIGMASK * SZREG	# &set
-	move	a2, zero			# &oset == NULL
-	li	a0, 3				# SIG_SETMASK
-	PTR_LA	t9,_C_LABEL(sigprocmask)	# set current signal mask
-	jal	t9
-	nop
-
-	REG_L	a0, CALLFRAME_SIZ(sp)		# restore env
-	REG_L	a1, (CALLFRAME_SIZ + SZREG)(sp)	# restore return value
-
-	REG_L	ra, (_JB_REG_RA * SZREG)(a0)
-	/*
-	 * From "MIPSpro N32 ABI Handbook", Table 2-1:
-	 * Registers s0..s7 are callee-saved.
-	 * The sp register is callee-saved.
-	 * The fp (or s8) register is callee-saved.
-	 * The gp register is callee-saved (for n32/n64).
-	 */
-	REG_L	s0, (_JB_REG_S0 * SZREG)(a0)
-	REG_L	s1, (_JB_REG_S1 * SZREG)(a0)
-	REG_L	s2, (_JB_REG_S2 * SZREG)(a0)
-	REG_L	s3, (_JB_REG_S3 * SZREG)(a0)
-	REG_L	s4, (_JB_REG_S4 * SZREG)(a0)
-	REG_L	s5, (_JB_REG_S5 * SZREG)(a0)
-	REG_L	s6, (_JB_REG_S6 * SZREG)(a0)
-	REG_L	s7, (_JB_REG_S7 * SZREG)(a0)
-	REG_L	sp, (_JB_REG_SP * SZREG)(a0)
-	REG_L	s8, (_JB_REG_S8 * SZREG)(a0)
-#if defined(__mips_n32) || defined(__mips_n64)
-	REG_L	gp, (_JB_REG_GP * SZREG)(a0)
-#endif
-#ifndef SOFTFLOAT
-	/*
-	 * From "MIPSpro N32 ABI Handbook", Table 2-1:
-	 * In N32, FP registers F20, F22, F24, F26, F28, F30 are callee-saved.
-	 * In N64, FP registers F23 .. F31 are callee-saved.
-	 * In O32, FP registers F20 .. F23 are callee-saved.
-	 */
-        INT_L           v0, (_JB_FPREG_FCSR * SZREG)(a0)
-        ctc1            v0, $31
-#if defined(__mips_n64) || defined(__mips_n32)
-	FP_L	$f30, (_JB_FPREG_F30 * SZREG)(a0)
-	FP_L	$f28, (_JB_FPREG_F28 * SZREG)(a0)
-	FP_L	$f26, (_JB_FPREG_F26 * SZREG)(a0)
-	FP_L	$f24, (_JB_FPREG_F24 * SZREG)(a0)
-#endif
-#if defined(__mips_n32) || defined(__mips_o32) || defined(__mips_o64)
-	FP_L	$f22, (_JB_FPREG_F22 * SZREG)(a0)
-	FP_L	$f20, (_JB_FPREG_F20 * SZREG)(a0)
-#endif
-#if defined(__mips_o32) || defined(__mips_o64)
-	FP_L	$f21, (_JB_FPREG_F21 * SZREG)(a0)
-	FP_L	$f23, (_JB_FPREG_F23 * SZREG)(a0)
-#endif
-#if defined(__mips_n64)
-	FP_L	$f25, (_JB_FPREG_F25 * SZREG)(a0)
-	FP_L	$f27, (_JB_FPREG_F27 * SZREG)(a0)
-	FP_L	$f29, (_JB_FPREG_F29 * SZREG)(a0)
-	FP_L	$f31, (_JB_FPREG_F31 * SZREG)(a0)
-#endif
-#endif	/* ! SOFTFLOAT */
-
-	move	v0, a1
-	j	ra
-	nop
-
-botch:
-	/*
-	 * We know we aren't returning so we don't care about restoring
-	 * our caller's GP.
-	 */
-	PTR_LA	t9, _C_LABEL(longjmperror)
-	jalr	t9
-	nop
-
-	PIC_TAILCALL(abort)
-END(longjmp)
diff --git a/lib/libc_bsd/mips/gen/signalcontext.c b/lib/libc_bsd/mips/gen/signalcontext.c
deleted file mode 100644
index 3dd7406..0000000
--- a/lib/libc_bsd/mips/gen/signalcontext.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2004 Olivier Houchard
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/signalcontext.c 178580 2008-04-26 12:08:02Z imp $");
-
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/ucontext.h>
-
-#include <machine/frame.h>
-#include <machine/sigframe.h>
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <strings.h>
-#include <signal.h>
-
-__weak_reference(__signalcontext, signalcontext);
-
-extern void _ctx_start(void);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	/* XXXMIPS: Implement me */
-	return (0);
-}
diff --git a/lib/libc_bsd/mips/gen/sigsetjmp.S b/lib/libc_bsd/mips/gen/sigsetjmp.S
deleted file mode 100644
index ef3351a..0000000
--- a/lib/libc_bsd/mips/gen/sigsetjmp.S
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993, 1995,
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Havard Eidnes.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/gen/sigsetjmp.S 282143 2015-04-28 12:52:08Z emaste $");
-#include <machine/regnum.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)setjmp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: sigsetjmp.S,v 1.8 2005/09/17 11:49:39 tsutsui Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#include "SYS.h"
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *	siglongjmp(a,v)
- * will generate a "return(v)" from
- * the last call to
- *	sigsetjmp(a, savemask)
- * by restoring registers from the stack,
- * and dependent on savemask restores the
- * signal mask.
- */
-
-LEAF(sigsetjmp)
-	PIC_PROLOGUE(sigsetjmp)
-
-	bne	a1, zero, 1f			# do saving of signal mask?
-	PIC_TAILCALL(_setjmp)
-
-1:	PIC_TAILCALL(setjmp)
-END(sigsetjmp)
-
-LEAF(siglongjmp)
-	PIC_PROLOGUE(siglongjmp)
-	REG_L	t0, (_JB_MAGIC  * SZREG)(a0)
-	REG_LI	t1, _JB_MAGIC__SETJMP
-	bne	t0, t1, 1f			# setjmp or _setjmp magic?
-	PIC_TAILCALL(_longjmp)
-1:	PIC_TAILCALL(longjmp)
-END(siglongjmp)
diff --git a/lib/libc_bsd/mips/net/Makefile.inc b/lib/libc_bsd/mips/net/Makefile.inc
deleted file mode 100644
index b5e866d..0000000
--- a/lib/libc_bsd/mips/net/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.3 2003/08/01 17:03:51 lukem Exp $
-Makefile.incl 178580 2008-04-26 12:08:02Z imp $
-
-SRCS+= htonl.S ntohl.S htons.S ntohs.S 
diff --git a/lib/libc_bsd/mips/net/htonl.S b/lib/libc_bsd/mips/net/htonl.S
deleted file mode 100644
index f8996d4..0000000
--- a/lib/libc_bsd/mips/net/htonl.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: byte_swap_4.S,v 1.2 2006/02/08 21:52:36 simonb Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/net/htonl.S 251091 2013-05-29 01:54:10Z emaste $");
-
-LEAF(htonl)                            # a0 = 0x11223344, return 0x44332211
-#ifdef __MIPSEB__
-	move	v0, a0
-#else
-        srl     v1, a0, 24              # v1 = 0x00000011
-        sll     v0, a0, 24              # v0 = 0x44000000
-        or      v0, v0, v1
-        and     v1, a0, 0xff00
-        sll     v1, v1, 8               # v1 = 0x00330000
-        or      v0, v0, v1
-        srl     v1, a0, 8
-        and     v1, v1, 0xff00          # v1 = 0x00002200
-        or      v0, v0, v1
-#endif
-        j       ra
-END(htonl)
diff --git a/lib/libc_bsd/mips/net/htons.S b/lib/libc_bsd/mips/net/htons.S
deleted file mode 100644
index fa0de5b..0000000
--- a/lib/libc_bsd/mips/net/htons.S
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: byte_swap_2.S,v 1.2 2006/02/08 21:52:36 simonb Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/net/htons.S 251091 2013-05-29 01:54:10Z emaste $");
-
-LEAF(htons)
-#ifdef __MIPSEB__
-        move    v0, a0
-#else
-	srl	v0, a0, 8
-	and	v0, v0, 0xff
-	sll	v1, a0, 8
-	and	v1, v1, 0xff00
-	or	v0, v0, v1
-#endif
-	j	ra
-END(htons)
diff --git a/lib/libc_bsd/mips/net/ntohl.S b/lib/libc_bsd/mips/net/ntohl.S
deleted file mode 100644
index 5b25462..0000000
--- a/lib/libc_bsd/mips/net/ntohl.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: byte_swap_4.S,v 1.2 2006/02/08 21:52:36 simonb Exp $	*/
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <machine/asm.h>
-
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/net/ntohl.S 251091 2013-05-29 01:54:10Z emaste $");
-
-LEAF(ntohl)                            # a0 = 0x11223344, return 0x44332211
-#ifdef __MIPSEB__
-	move	v0, a0
-#else
-        srl     v1, a0, 24              # v1 = 0x00000011
-        sll     v0, a0, 24              # v0 = 0x44000000
-        or      v0, v0, v1
-        and     v1, a0, 0xff00
-        sll     v1, v1, 8               # v1 = 0x00330000
-        or      v0, v0, v1
-        srl     v1, a0, 8
-        and     v1, v1, 0xff00          # v1 = 0x00002200
-        or      v0, v0, v1
-#endif
-        j       ra
-END(ntohl)
diff --git a/lib/libc_bsd/mips/net/ntohs.S b/lib/libc_bsd/mips/net/ntohs.S
deleted file mode 100644
index b24df0a..0000000
--- a/lib/libc_bsd/mips/net/ntohs.S
+++ /dev/null
@@ -1,46 +0,0 @@
-/*	$NetBSD: byte_swap_2.S,v 1.2 2006/02/08 21:52:36 simonb Exp $	*/
-
-/*-
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Charles M. Hannum.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/net/ntohs.S 251091 2013-05-29 01:54:10Z emaste $");
-
-LEAF(ntohs)
-#ifdef __MIPSEB__
-        move    v0, a0
-#else
-	srl	v0, a0, 8
-	and	v0, v0, 0xff
-	sll	v1, a0, 8
-	and	v1, v1, 0xff00
-	or	v0, v0, v1
-#endif
-	j	ra
-END(ntohs)
diff --git a/lib/libc_bsd/mips/softfloat/milieu.h b/lib/libc_bsd/mips/softfloat/milieu.h
deleted file mode 100644
index d1a609e..0000000
--- a/lib/libc_bsd/mips/softfloat/milieu.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/mips/softfloat/milieu.h 178580 2008-04-26 12:08:02Z imp $ */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "mips-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc_bsd/mips/softfloat/mips-gcc.h b/lib/libc_bsd/mips/softfloat/mips-gcc.h
deleted file mode 100644
index a6cd97c..0000000
--- a/lib/libc_bsd/mips/softfloat/mips-gcc.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/mips/softfloat/mips-gcc.h 178580 2008-04-26 12:08:02Z imp $ */
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#ifdef __MIPSEB__
-#define BIGENDIAN
-#else
-#define LITTLEENDIAN
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef int uint8;
-typedef int int8;
-typedef int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static __inline
-
-#if defined(SOFTFLOAT_FOR_GCC)
-/* XXXMIPS: check this one */
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
-#endif
diff --git a/lib/libc_bsd/mips/softfloat/softfloat.h b/lib/libc_bsd/mips/softfloat/softfloat.h
deleted file mode 100644
index 1788219..0000000
--- a/lib/libc_bsd/mips/softfloat/softfloat.h
+++ /dev/null
@@ -1,315 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $	*/
-/* $FreeBSD: releng/10.2/lib/libc/mips/softfloat/softfloat.h 230189 2012-01-16 04:05:53Z das $ */
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-/* #define FLOAT128 */
-
-#include <fenv.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern int float_rounding_mode;
-enum {
-    float_round_nearest_even = FE_TONEAREST,
-    float_round_to_zero      = FE_TOWARDZERO,
-    float_round_down         = FE_DOWNWARD,
-    float_round_up           = FE_UPWARD
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern int float_exception_flags;
-extern int float_exception_mask;
-enum {
-    float_flag_inexact   = FE_INEXACT,
-    float_flag_underflow = FE_UNDERFLOW,
-    float_flag_overflow  = FE_OVERFLOW,
-    float_flag_divbyzero = FE_DIVBYZERO,
-    float_flag_invalid   = FE_INVALID
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( int );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int );
-float64 int32_to_float64( int );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __floatdi?f is in libgcc2.c */
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float32_to_uint32_round_to_zero( float32 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-#endif
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-int float32_eq( float32, float32 );
-int float32_le( float32, float32 );
-int float32_lt( float32, float32 );
-int float32_eq_signaling( float32, float32 );
-int float32_le_quiet( float32, float32 );
-int float32_lt_quiet( float32, float32 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-unsigned int float64_to_uint32_round_to_zero( float64 );
-#endif
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-#endif
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-int float64_eq( float64, float64 );
-int float64_le( float64, float64 );
-int float64_lt( float64, float64 );
-int float64_eq_signaling( float64, float64 );
-int float64_le_quiet( float64, float64 );
-int float64_lt_quiet( float64, float64 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float64_is_signaling_nan( float64 );
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-int floatx80_eq( floatx80, floatx80 );
-int floatx80_le( floatx80, floatx80 );
-int floatx80_lt( floatx80, floatx80 );
-int floatx80_eq_signaling( floatx80, floatx80 );
-int floatx80_le_quiet( floatx80, floatx80 );
-int floatx80_lt_quiet( floatx80, floatx80 );
-int floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-int float128_eq( float128, float128 );
-int float128_le( float128, float128 );
-int float128_lt( float128, float128 );
-int float128_eq_signaling( float128, float128 );
-int float128_le_quiet( float128, float128 );
-int float128_lt_quiet( float128, float128 );
-int float128_is_signaling_nan( float128 );
-
-#endif
-
diff --git a/lib/libc_bsd/mips/string/Makefile.inc b/lib/libc_bsd/mips/string/Makefile.inc
deleted file mode 100644
index b7c49fc..0000000
--- a/lib/libc_bsd/mips/string/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.2 2000/10/10 21:51:54 jeffs Exp $
-Makefile.incl 229368 2012-01-03 07:14:01Z ed $
-
-SRCS+=	bcmp.S bcopy.S bzero.S ffs.S memchr.c memcmp.c memset.c \
-	memcpy.S memmove.S \
-	strcat.c strchr.S strcmp.S strcpy.c strcspn.c strlen.S \
-	strncat.c strncmp.c strncpy.c strrchr.S strpbrk.c strsep.c \
-	strspn.c strstr.c swab.c
diff --git a/lib/libc_bsd/mips/string/bcmp.S b/lib/libc_bsd/mips/string/bcmp.S
deleted file mode 100644
index 18502a6..0000000
--- a/lib/libc_bsd/mips/string/bcmp.S
+++ /dev/null
@@ -1,130 +0,0 @@
-/*	$NetBSD: bcmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/bcmp.S 209231 2010-06-16 12:55:14Z jchandra $");
-
-#define _LOCORE		/* XXX not really, just assembly-code source */
-#include <machine/endian.h>	/* LWLO/LWHI, SWLO/SWHI */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	ASMSTR("from: @(#)bcmp.s	8.1 (Berkeley) 6/4/93")
-#else
-	ASMSTR("$NetBSD: bcmp.S,v 1.9 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-/* bcmp(s1, s2, n) */
-
-
-LEAF(bcmp)
-	.set	noreorder
-	blt		a2, 16, small	# is it worth any trouble?
-	xor		v0, a0, a1	# compare low two bits of addresses
-	and		v0, v0, 3
-	PTR_SUBU	a3, zero, a1	# compute # bytes to word align address
-	bne		v0, zero, unaligned # not possible to align addresses
-	and		a3, a3, 3
-
-	beq		a3, zero, 1f
-	PTR_SUBU	a2, a2, a3	# subtract from remaining count
-	move		v0, v1		# init v0,v1 so unmodified bytes match
-	LWHI		v0, 0(a0)	# read 1, 2, or 3 bytes
-	LWHI		v1, 0(a1)
-	PTR_ADDU	a1, a1, a3
-	bne		v0, v1, nomatch
-	PTR_ADDU	a0, a0, a3
-1:
-	and		a3, a2, ~3	# compute number of whole words left
-	PTR_SUBU	a2, a2, a3	#   which has to be >= (16-3) & ~3
-	PTR_ADDU	a3, a3, a0	# compute ending address
-2:
-	lw		v0, 0(a0)	# compare words
-	lw		v1, 0(a1)
-	PTR_ADDU	a0, a0, 4
-	bne		v0, v1, nomatch
-	PTR_ADDU	a1, a1, 4
-	bne		a0, a3, 2b
-	nop
-	b		small		# finish remainder
-	nop
-unaligned:
-	beq		a3, zero, 2f
-	PTR_SUBU	a2, a2, a3	# subtract from remaining count
-	PTR_ADDU	a3, a3, a0	# compute ending address
-1:
-	lbu		v0, 0(a0)	# compare bytes until a1 word aligned
-	lbu		v1, 0(a1)
-	PTR_ADDU	a0, a0, 1
-	bne		v0, v1, nomatch
-	PTR_ADDU	a1, a1, 1
-	bne		a0, a3, 1b
-	nop
-2:
-	and		a3, a2, ~3	# compute number of whole words left
-	PTR_SUBU	a2, a2, a3	#   which has to be >= (16-3) & ~3
-	PTR_ADDU	a3, a3, a0	# compute ending address
-3:
-	LWHI		v0, 0(a0)	# compare words a0 unaligned, a1 aligned
-	LWLO		v0, 3(a0)
-	lw		v1, 0(a1)
-	PTR_ADDU	a0, a0, 4
-	bne		v0, v1, nomatch
-	PTR_ADDU	a1, a1, 4
-	bne		a0, a3, 3b
-	nop
-small:
-	ble		a2, zero, match
-	PTR_ADDU	a3, a2, a0		# compute ending address
-1:
-	lbu		v0, 0(a0)
-	lbu		v1, 0(a1)
-	PTR_ADDU	a0, a0, 1
-	bne		v0, v1, nomatch
-	PTR_ADDU	a1, a1, 1
-	bne		a0, a3, 1b
-	nop
-match:
-	j		ra
-	move		v0, zero
-nomatch:
-	j		ra
-	li		v0, 1
-	.set	reorder
-END(bcmp)
diff --git a/lib/libc_bsd/mips/string/bcopy.S b/lib/libc_bsd/mips/string/bcopy.S
deleted file mode 100644
index 0d0997d..0000000
--- a/lib/libc_bsd/mips/string/bcopy.S
+++ /dev/null
@@ -1,297 +0,0 @@
-/*	$NetBSD: bcopy.S,v 1.3 2009/12/14 00:39:00 matt Exp $	*/
-
-/*
- * Mach Operating System
- * Copyright (c) 1993 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-/*
- *	File:	mips_bcopy.s
- *	Author:	Chris Maeda
- *	Date:	June 1993
- *
- *	Fast copy routine.  Derived from aligned_block_copy.
- */
-
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/bcopy.S 209231 2010-06-16 12:55:14Z jchandra $");
-
-#define _LOCORE		/* XXX not really, just assembly-code source */
-#include <machine/endian.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	ASMSTR("from: @(#)mips_bcopy.s	2.2 CMU 18/06/93")
-#else
-	ASMSTR("$NetBSD: bcopy.S,v 1.3 2009/12/14 00:39:00 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-/*
- *	bcopy(caddr_t src, caddr_t dst, unsigned int len)
- *
- *	a0 	src address
- *	a1	dst address
- *	a2	length
- */
-
-#if defined(MEMCOPY) || defined(MEMMOVE)
-#ifdef MEMCOPY
-#define	FUNCTION	memcpy
-#else
-#define FUNCTION	memmove
-#endif
-#define	SRCREG		a1
-#define	DSTREG		a0
-#else
-#define	FUNCTION	bcopy
-#define	SRCREG		a0
-#define	DSTREG		a1
-#endif
-
-#define	SIZEREG		a2
-
-LEAF(FUNCTION)
-	.set	noat
-	.set	noreorder
-
-#if defined(MEMCOPY) || defined(MEMMOVE)
-	/* set up return value, while we still can */
-	move	v0,DSTREG
-#endif
-	/*
-	 *	Make sure we can copy forwards.
-	 */
-	sltu	t0,SRCREG,DSTREG	# t0 == SRCREG < DSTREG
-	bne	t0,zero,6f		# copy backwards
-
-	/*
-	 * 	There are four alignment cases (with frequency)
-	 *	(Based on measurements taken with a DECstation 5000/200
-	 *	 inside a Mach kernel.)
-	 *
-	 * 	aligned   -> aligned		(mostly)
-	 * 	unaligned -> aligned		(sometimes)
-	 * 	aligned,unaligned -> unaligned	(almost never)
-	 *
-	 *	Note that we could add another case that checks if
-	 *	the destination and source are unaligned but the
-	 *	copy is alignable.  eg if src and dest are both
-	 *	on a halfword boundary.
-	 */
-	andi		t1,DSTREG,(SZREG-1)	# get last bits of dest
-	bne		t1,zero,3f		# dest unaligned
-	andi		t0,SRCREG,(SZREG-1)	# get last bits of src
-	bne		t0,zero,5f
-
-	/*
-	 *	Forward aligned->aligned copy, 8 words at a time.
-	 */
-98:
-	li		AT,-(SZREG*8)
-	and		t0,SIZEREG,AT		# count truncated to multiples
-	PTR_ADDU	a3,SRCREG,t0		# run fast loop up to this addr
-	sltu		AT,SRCREG,a3		# any work to do?
-	beq		AT,zero,2f
-	PTR_SUBU	SIZEREG,t0
-
-	/*
-	 *	loop body
-	 */
-1:	# cp
-	REG_L		t3,(0*SZREG)(SRCREG)
-	REG_L		v1,(1*SZREG)(SRCREG)
-	REG_L		t0,(2*SZREG)(SRCREG)
-	REG_L		t1,(3*SZREG)(SRCREG)
-	PTR_ADDU	SRCREG,SZREG*8
-	REG_S		t3,(0*SZREG)(DSTREG)
-	REG_S		v1,(1*SZREG)(DSTREG)
-	REG_S		t0,(2*SZREG)(DSTREG)
-	REG_S		t1,(3*SZREG)(DSTREG)
-	REG_L		t1,(-1*SZREG)(SRCREG)
-	REG_L		t0,(-2*SZREG)(SRCREG)
-	REG_L		v1,(-3*SZREG)(SRCREG)
-	REG_L		t3,(-4*SZREG)(SRCREG)
-	PTR_ADDU	DSTREG,SZREG*8
-	REG_S		t1,(-1*SZREG)(DSTREG)
-	REG_S		t0,(-2*SZREG)(DSTREG)
-	REG_S		v1,(-3*SZREG)(DSTREG)
-	bne		SRCREG,a3,1b
-	REG_S		t3,(-4*SZREG)(DSTREG)
-
-	/*
-	 *	Copy a word at a time, no loop unrolling.
-	 */
-2:	# wordcopy
-	andi		t2,SIZEREG,(SZREG-1)	# get byte count / SZREG
-	PTR_SUBU	t2,SIZEREG,t2		# t2 = words to copy * SZREG
-	beq		t2,zero,3f
-	PTR_ADDU	t0,SRCREG,t2		# stop at t0
-	PTR_SUBU	SIZEREG,SIZEREG,t2
-1:
-	REG_L		t3,0(SRCREG)
-	PTR_ADDU	SRCREG,SZREG
-	REG_S		t3,0(DSTREG)
-	bne		SRCREG,t0,1b
-	PTR_ADDU	DSTREG,SZREG
-
-3:	# bytecopy
-	beq		SIZEREG,zero,4f		# nothing left to do?
-	nop
-1:
-	lb		t3,0(SRCREG)
-	PTR_ADDU	SRCREG,1
-	sb		t3,0(DSTREG)
-	PTR_SUBU	SIZEREG,1
-	bgtz		SIZEREG,1b
-	PTR_ADDU	DSTREG,1
-
-4:	# copydone
-	j	ra
-	nop
-
-	/*
-	 *	Copy from unaligned source to aligned dest.
-	 */
-5:	# destaligned
-	andi		t0,SIZEREG,(SZREG-1)	# t0 = bytecount mod SZREG
-	PTR_SUBU	a3,SIZEREG,t0		# number of words to transfer
-	beq		a3,zero,3b
-	nop
-	move		SIZEREG,t0		# this many to do after we are done
-	PTR_ADDU	a3,SRCREG,a3		# stop point
-
-1:
-	REG_LHI		t3,0(SRCREG)
-	REG_LLO		t3,SZREG-1(SRCREG)
-	PTR_ADDI	SRCREG,SZREG
-	REG_S		t3,0(DSTREG)
-	bne		SRCREG,a3,1b
-	PTR_ADDI	DSTREG,SZREG
-
-	b		3b
-	nop
-
-6:	# backcopy -- based on above
-	PTR_ADDU	SRCREG,SIZEREG
-	PTR_ADDU	DSTREG,SIZEREG
-	andi		t1,DSTREG,SZREG-1	# get last 3 bits of dest
-	bne		t1,zero,3f
-	andi		t0,SRCREG,SZREG-1	# get last 3 bits of src
-	bne		t0,zero,5f
-
-	/*
-	 *	Forward aligned->aligned copy, 8*4 bytes at a time.
-	 */
-	li		AT,(-8*SZREG)
-	and		t0,SIZEREG,AT		# count truncated to multiple of 32
-	beq		t0,zero,2f		# any work to do?
-	PTR_SUBU	SIZEREG,t0
-	PTR_SUBU	a3,SRCREG,t0
-
-	/*
-	 *	loop body
-	 */
-1:	# cp
-	REG_L		t3,(-4*SZREG)(SRCREG)
-	REG_L		v1,(-3*SZREG)(SRCREG)
-	REG_L		t0,(-2*SZREG)(SRCREG)
-	REG_L		t1,(-1*SZREG)(SRCREG)
-	PTR_SUBU	SRCREG,8*SZREG
-	REG_S		t3,(-4*SZREG)(DSTREG)
-	REG_S		v1,(-3*SZREG)(DSTREG)
-	REG_S		t0,(-2*SZREG)(DSTREG)
-	REG_S		t1,(-1*SZREG)(DSTREG)
-	REG_L		t1,(3*SZREG)(SRCREG)
-	REG_L		t0,(2*SZREG)(SRCREG)
-	REG_L		v1,(1*SZREG)(SRCREG)
-	REG_L		t3,(0*SZREG)(SRCREG)
-	PTR_SUBU	DSTREG,8*SZREG
-	REG_S		t1,(3*SZREG)(DSTREG)
-	REG_S		t0,(2*SZREG)(DSTREG)
-	REG_S		v1,(1*SZREG)(DSTREG)
-	bne		SRCREG,a3,1b
-	REG_S		t3,(0*SZREG)(DSTREG)
-
-	/*
-	 *	Copy a word at a time, no loop unrolling.
-	 */
-2:	# wordcopy
-	andi		t2,SIZEREG,SZREG-1	# get byte count / 4
-	PTR_SUBU	t2,SIZEREG,t2		# t2 = number of words to copy
-	beq		t2,zero,3f
-	PTR_SUBU	t0,SRCREG,t2		# stop at t0
-	PTR_SUBU	SIZEREG,SIZEREG,t2
-1:
-	REG_L		t3,-SZREG(SRCREG)
-	PTR_SUBU	SRCREG,SZREG
-	REG_S		t3,-SZREG(DSTREG)
-	bne		SRCREG,t0,1b
-	PTR_SUBU	DSTREG,SZREG
-
-3:	# bytecopy
-	beq		SIZEREG,zero,4f		# nothing left to do?
-	nop
-1:
-	lb		t3,-1(SRCREG)
-	PTR_SUBU	SRCREG,1
-	sb		t3,-1(DSTREG)
-	PTR_SUBU	SIZEREG,1
-	bgtz		SIZEREG,1b
-	PTR_SUBU	DSTREG,1
-
-4:	# copydone
-	j	ra
-	nop
-
-	/*
-	 *	Copy from unaligned source to aligned dest.
-	 */
-5:	# destaligned
-	andi		t0,SIZEREG,SZREG-1	# t0 = bytecount mod 4
-	PTR_SUBU	a3,SIZEREG,t0		# number of words to transfer
-	beq		a3,zero,3b
-	nop
-	move		SIZEREG,t0		# this many to do after we are done
-	PTR_SUBU	a3,SRCREG,a3		# stop point
-
-1:
-	REG_LHI		t3,-SZREG(SRCREG)
-	REG_LLO		t3,-1(SRCREG)
-	PTR_SUBU	SRCREG,SZREG
-	REG_S		t3,-SZREG(DSTREG)
-	bne		SRCREG,a3,1b
-	PTR_SUBU	DSTREG,SZREG
-
-	b		3b
-	nop
-
-	.set	reorder
-	.set	at
-	END(FUNCTION)
diff --git a/lib/libc_bsd/mips/string/bzero.S b/lib/libc_bsd/mips/string/bzero.S
deleted file mode 100644
index 8472473..0000000
--- a/lib/libc_bsd/mips/string/bzero.S
+++ /dev/null
@@ -1,83 +0,0 @@
-/*	$NetBSD: bzero.S,v 1.10 2009/12/14 02:53:52 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/bzero.S 218939 2011-02-22 07:49:51Z jchandra $");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	ASMSTR("from: @(#)bzero.s	8.1 (Berkeley) 6/4/93")
-#else
-	ASMSTR("$NetBSD: bzero.S,v 1.10 2009/12/14 02:53:52 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-#define _LOCORE		/* XXX not really, just assembly-code source */
-#include <machine/endian.h>
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-/* bzero(s1, n) */
-
-LEAF(bzero)
-	.set	noreorder
-	blt		a1, 3*SZREG, smallclr # small amount to clear?
-	PTR_SUBU	a3, zero, a0	# compute # bytes to word align address
-	and		a3, a3, SZREG-1
-	beq		a3, zero, 1f	# skip if word aligned
-	PTR_SUBU	a1, a1, a3	# subtract from remaining count
-	REG_SHI		zero, 0(a0)	# clear 1, 2, or 3 bytes to align
-	PTR_ADDU	a0, a0, a3
-1:
-	and		v0, a1, SZREG-1	# compute number of words left
-	PTR_SUBU	a3, a1, v0
-	move		a1, v0
-	PTR_ADDU	a3, a3, a0	# compute ending address
-2:
-	PTR_ADDU	a0, a0, SZREG	# clear words
-	bne		a0, a3, 2b	#  unrolling loop doesnt help
-	REG_S		zero, -SZREG(a0) # since we are limited by memory speed
-smallclr:
-	ble		a1, zero, 2f
-	PTR_ADDU	a3, a1, a0	# compute ending address
-1:
-	PTR_ADDU	a0, a0, 1	# clear bytes
-	bne		a0, a3, 1b
-	sb		zero, -1(a0)
-2:
-	j		ra
-	nop
-END(bzero)
diff --git a/lib/libc_bsd/mips/string/ffs.S b/lib/libc_bsd/mips/string/ffs.S
deleted file mode 100644
index 1b34adc..0000000
--- a/lib/libc_bsd/mips/string/ffs.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: ffs.S,v 1.2 2009/12/14 00:39:00 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/ffs.S 209231 2010-06-16 12:55:14Z jchandra $");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)ffs.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: ffs.S,v 1.2 2009/12/14 00:39:00 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-/* bit = ffs(value) */
-
-LEAF(ffs)
-	move	v0, zero
-	beq	a0, zero, done
-1:
-	and	v1, a0, 1		# bit set?
-	addu	v0, v0, 1
-	srl	a0, a0, 1
-	beq	v1, zero, 1b		# no, continue
-done:
-	j	ra
-END(ffs)
diff --git a/lib/libc_bsd/mips/string/memcpy.S b/lib/libc_bsd/mips/string/memcpy.S
deleted file mode 100644
index bcee398..0000000
--- a/lib/libc_bsd/mips/string/memcpy.S
+++ /dev/null
@@ -1,7 +0,0 @@
-/*	$NetBSD: memcpy.S,v 1.1 2005/12/20 19:28:50 christos Exp $	*/
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/memcpy.S 178580 2008-04-26 12:08:02Z imp $");
-
-#define MEMCOPY
-#include "bcopy.S"
diff --git a/lib/libc_bsd/mips/string/memmove.S b/lib/libc_bsd/mips/string/memmove.S
deleted file mode 100644
index 4d98938..0000000
--- a/lib/libc_bsd/mips/string/memmove.S
+++ /dev/null
@@ -1,7 +0,0 @@
-/*	$NetBSD: memmove.S,v 1.1 2005/12/20 19:28:50 christos Exp $	*/
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/memmove.S 178580 2008-04-26 12:08:02Z imp $");
-
-#define MEMMOVE
-#include "bcopy.S"
diff --git a/lib/libc_bsd/mips/string/strchr.S b/lib/libc_bsd/mips/string/strchr.S
deleted file mode 100644
index 0d5819c..0000000
--- a/lib/libc_bsd/mips/string/strchr.S
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	$NetBSD: index.S,v 1.8 2005/04/22 06:59:00 simonb Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/strchr.S 229571 2012-01-05 10:32:53Z ed $");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)index.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: index.S,v 1.8 2005/04/22 06:59:00 simonb Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-LEAF(strchr)
-1:
-	lbu		a2, 0(a0)		# get a byte
-	PTR_ADDU	a0, a0, 1
-	beq		a2, a1, fnd
-	bne		a2, zero, 1b
-notfnd:
-	move		v0, zero
-	j		ra
-fnd:
-	PTR_SUBU	v0, a0, 1
-	j		ra
-END(strchr)
-
-WEAK_ALIAS(index, strchr)
diff --git a/lib/libc_bsd/mips/string/strcmp.S b/lib/libc_bsd/mips/string/strcmp.S
deleted file mode 100644
index 7dd6451..0000000
--- a/lib/libc_bsd/mips/string/strcmp.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: strcmp.S,v 1.2 2009/12/14 00:39:00 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/strcmp.S 209231 2010-06-16 12:55:14Z jchandra $");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)strcmp.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: strcmp.S,v 1.2 2009/12/14 00:39:00 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-/*
- * NOTE: this version assumes unsigned chars in order to be "8 bit clean".
- */
-LEAF(strcmp)
-1:
-	lbu	t0, 0(a0)		# get two bytes and compare them
-	lbu	t1, 0(a1)
-	beq	t0, zero, LessOrEq	# end of first string?
-	bne	t0, t1, NotEq
-	lbu	t0, 1(a0)		# unroll loop
-	lbu	t1, 1(a1)
-	PTR_ADD	a0, a0, 2
-	beq	t0, zero, LessOrEq	# end of first string?
-	PTR_ADD	a1, a1, 2
-	beq	t0, t1, 1b
-NotEq:
-	subu	v0, t0, t1
-	j	ra
-LessOrEq:
-	subu	v0, zero, t1
-	j	ra
-END(strcmp)
diff --git a/lib/libc_bsd/mips/string/strlen.S b/lib/libc_bsd/mips/string/strlen.S
deleted file mode 100644
index a4bc06a..0000000
--- a/lib/libc_bsd/mips/string/strlen.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: strlen.S,v 1.2 2009/12/14 00:39:00 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/strlen.S 209231 2010-06-16 12:55:14Z jchandra $");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)strlen.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: strlen.S,v 1.2 2009/12/14 00:39:00 matt Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-LEAF(strlen)
-	PTR_ADDU	v1, a0, 1
-1:
-	lb		v0, 0(a0)	# get byte from string
-	PTR_ADDU	a0, a0, 1	# increment pointer
-	bne		v0, zero, 1b	# continue if not end
-	PTR_SUBU 	v0, a0, v1	# compute length - 1 for '\0' char
-	j		ra
-END(strlen)
diff --git a/lib/libc_bsd/mips/string/strrchr.S b/lib/libc_bsd/mips/string/strrchr.S
deleted file mode 100644
index 57e7fac..0000000
--- a/lib/libc_bsd/mips/string/strrchr.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*	$NetBSD: rindex.S,v 1.7 2003/08/07 16:42:16 agc Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/string/strrchr.S 229571 2012-01-05 10:32:53Z ed $");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)rindex.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: rindex.S,v 1.7 2003/08/07 16:42:16 agc Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-#ifdef __ABICALLS__
-	.abicalls
-#endif
-
-LEAF(strrchr)
-	move		v0, zero		# default if not found
-1:
-	lbu		a3, 0(a0)		# get a byte
-	PTR_ADDU	a0, a0, 1
-	bne		a3, a1, 2f
-	PTR_SUBU	v0, a0, 1		# save address of last match
-2:
-	bne		a3, zero, 1b		# continue if not end
-	j		ra
-END(strrchr)
-
-WEAK_ALIAS(rindex, strrchr)
diff --git a/lib/libc_bsd/mips/sys/Makefile.inc b/lib/libc_bsd/mips/sys/Makefile.inc
deleted file mode 100644
index a9fa3f7..0000000
--- a/lib/libc_bsd/mips/sys/Makefile.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Makefile.incl 246117 2013-01-30 12:48:16Z kib $
-
-SRCS+=	__vdso_gettc.c
-
-MDASM=  Ovfork.S brk.S cerror.S exect.S \
-	fork.S pipe.S ptrace.S sbrk.S syscall.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o ftruncate.o getlogin.o lseek.o mmap.o \
-	openbsd_poll.o pread.o pwrite.o sstk.o truncate.o vfork.o yield.o
-
-PSEUDO= _exit.o _getlogin.o
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
diff --git a/lib/libc_bsd/mips/sys/Ovfork.S b/lib/libc_bsd/mips/sys/Ovfork.S
deleted file mode 100644
index 7e4d28b..0000000
--- a/lib/libc_bsd/mips/sys/Ovfork.S
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: compat_Ovfork.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/Ovfork.S 209231 2010-06-16 12:55:14Z jchandra $");
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)Ovfork.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: compat_Ovfork.S,v 1.1 2005/09/17 11:49:39 tsutsui Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-/*
- * pid = vfork();
- *
- * v1 == 0 in parent process, v1 == 1 in child process.
- * v0 == pid of child in parent, v0 == pid of parent in child.
- */
-
-LEAF(__sys_vfork)
-	WEAK_ALIAS(vfork, __sys_vfork)
-	WEAK_ALIAS(_vfork, __sys_vfork)
-	PIC_PROLOGUE(__sys_vfork)
-	li	v0, SYS_vfork		# system call number for vfork
-	syscall
-	beq	a3, zero, 1f		# jump if no errors
-	PIC_TAILCALL(__cerror)
-1:
-	beq	v1, zero, 2f		# parent process ?
-	move	v0, zero		# return zero in child
-2:
-	PIC_RETURN()
-END(__sys_vfork)
diff --git a/lib/libc_bsd/mips/sys/__vdso_gettc.c b/lib/libc_bsd/mips/sys/__vdso_gettc.c
deleted file mode 100644
index 8d0d3ad..0000000
--- a/lib/libc_bsd/mips/sys/__vdso_gettc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2013 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/__vdso_gettc.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-
-#pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
-{
-
-	return (0);
-}
-
-#pragma weak __vdso_gettimekeep
-int
-__vdso_gettimekeep(struct vdso_timekeep **tk)
-{
-
-	return (ENOSYS);
-}
diff --git a/lib/libc_bsd/mips/sys/brk.S b/lib/libc_bsd/mips/sys/brk.S
deleted file mode 100644
index fa92236..0000000
--- a/lib/libc_bsd/mips/sys/brk.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: brk.S,v 1.16 2003/08/07 16:42:17 agc Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/brk.S 209521 2010-06-25 05:36:36Z jchandra $");
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)brk.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: brk.S,v 1.16 2003/08/07 16:42:17 agc Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-	.globl	_C_LABEL(minbrk)
-	.globl	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(_end)
-
-	.data
-_C_LABEL(minbrk):
-	PTR_WORD	_C_LABEL(_end)
-
-	.text
-LEAF(__sys_brk)
-	WEAK_ALIAS(brk, __sys_brk)
-	WEAK_ALIAS(_brk, __sys_brk)
-	PIC_PROLOGUE(__sys_brk)
-	PTR_LA	v0, _C_LABEL(minbrk)
-	PTR_L	v0, 0(v0)
-	bgeu	a0, v0, 1f
-	move	a0, v0		# dont allow break < minbrk
-1:
-	li	v0, SYS_break
-	syscall
-	bne	a3, zero, 2f
-	PTR_LA	t0, _C_LABEL(__curbrk)
-	PTR_S	a0, 0(t0)
-	move	v0, zero
-	PIC_RETURN()
-2:
-	PIC_TAILCALL(__cerror)
-END(__sys_brk)
diff --git a/lib/libc_bsd/mips/sys/cerror.S b/lib/libc_bsd/mips/sys/cerror.S
deleted file mode 100644
index 357d522..0000000
--- a/lib/libc_bsd/mips/sys/cerror.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: cerror.S,v 1.14 2009/12/14 01:07:42 matt Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/cerror.S 209231 2010-06-16 12:55:14Z jchandra $");
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-	RCSID("from: @(#)cerror.s	8.1 (Berkeley) 6/16/93")
-#else
-	RCSID("$NetBSD: cerror.S,v 1.14 2009/12/14 01:07:42 matt Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-
-	.globl	_C_LABEL(__error)
-NESTED_NOPROFILE(__cerror, CALLFRAME_SIZ, ra)
-	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	SETUP_GP
-	PTR_SUBU	sp, sp, CALLFRAME_SIZ
-	SETUP_GP64(CALLFRAME_GP, __cerror)
-	SAVE_GP(CALLFRAME_GP)
-
-	PTR_S		ra, CALLFRAME_RA(sp)
-	REG_S		v0, CALLFRAME_S0(sp)	# save errno value
-
-	PTR_LA		t9, _C_LABEL(__error)	# locate address of errno
-	jalr		t9
-
-	REG_L		t0, CALLFRAME_S0(sp)
-	PTR_L		ra, CALLFRAME_RA(sp)
-	INT_S		t0, 0(v0)		# update errno value
-
-	RESTORE_GP64
-	PTR_ADDU	sp, sp, CALLFRAME_SIZ
-
-	li		v0, -1
-	li		v1, -1
-
-	j		ra
-END(__cerror)
diff --git a/lib/libc_bsd/mips/sys/exect.S b/lib/libc_bsd/mips/sys/exect.S
deleted file mode 100644
index b64a497..0000000
--- a/lib/libc_bsd/mips/sys/exect.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*	$NetBSD: exect.S,v 1.9 2003/08/07 16:42:17 agc Exp $	*/
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/exect.S 209231 2010-06-16 12:55:14Z jchandra $");
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)exect.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: exect.S,v 1.9 2003/08/07 16:42:17 agc Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-LEAF(exect)
-	PIC_PROLOGUE(exect)
-	li	v0, SYS_execve
-	syscall
-	bne	a3, zero, 1f
-	PIC_RETURN()
-1:
-	PIC_TAILCALL(__cerror)
-END(exect)
diff --git a/lib/libc_bsd/mips/sys/fork.S b/lib/libc_bsd/mips/sys/fork.S
deleted file mode 100644
index a7ff140..0000000
--- a/lib/libc_bsd/mips/sys/fork.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: fork.S,v 1.11 2003/08/07 16:42:17 agc Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/fork.S 209231 2010-06-16 12:55:14Z jchandra $");
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)fork.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: fork.S,v 1.11 2003/08/07 16:42:17 agc Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-LEAF(__sys_fork)
-	WEAK_ALIAS(fork, __sys_fork)
-	WEAK_ALIAS(_fork, __sys_fork)
-	PIC_PROLOGUE(__sys_fork)
-	li	v0, SYS_fork	# pid = fork()
-	syscall
-	bne	a3, zero, 2f
-	beq	v1, zero, 1f	# v1 == 0 in parent, 1 in child
-	move	v0, zero
-1:
-	PIC_RETURN()
-2:
-	PIC_TAILCALL(__cerror)
-END(__sys_fork)
diff --git a/lib/libc_bsd/mips/sys/pipe.S b/lib/libc_bsd/mips/sys/pipe.S
deleted file mode 100644
index 74f7f78..0000000
--- a/lib/libc_bsd/mips/sys/pipe.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*	$NetBSD: pipe.S,v 1.11 2005/04/22 06:58:01 simonb Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/pipe.S 209231 2010-06-16 12:55:14Z jchandra $");
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)pipe.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: pipe.S,v 1.11 2005/04/22 06:58:01 simonb Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-LEAF(__sys_pipe)
-	WEAK_ALIAS(pipe, __sys_pipe)
-	WEAK_ALIAS(_pipe, __sys_pipe)
-	PIC_PROLOGUE(__sys_pipe)
-	li	v0, SYS_pipe	# pipe(fildes) int fildes[2];
-	syscall
-	bne	a3, zero, 1f
-	sw	v0, 0(a0)	# store the two file descriptors
-	sw	v1, 4(a0)
-	move	v0, zero
-	PIC_RETURN()
-1:
-	PIC_TAILCALL(__cerror)
-END(__sys_pipe)
diff --git a/lib/libc_bsd/mips/sys/ptrace.S b/lib/libc_bsd/mips/sys/ptrace.S
deleted file mode 100644
index 7eb12a6..0000000
--- a/lib/libc_bsd/mips/sys/ptrace.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*	$NetBSD: ptrace.S,v 1.9 2003/08/07 16:42:17 agc Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/ptrace.S 209231 2010-06-16 12:55:14Z jchandra $");
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)ptrace.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: ptrace.S,v 1.9 2003/08/07 16:42:17 agc Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-NESTED_NOPROFILE(ptrace, CALLFRAME_SIZ, ra)
-	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
-	SETUP_GP
-	PTR_SUBU	sp, sp, CALLFRAME_SIZ
-	SETUP_GP64(CALLFRAME_GP, ptrace)
-	SAVE_GP(CALLFRAME_GP)
-
-	PTR_S		ra, CALLFRAME_RA(sp)
-
-	PTR_LA		t9, _C_LABEL(__error)	# locate address of errno
-	jalr		t9
-
-	PTR_L		ra, CALLFRAME_RA(sp)
-	INT_S		zero, 0(v0)		# update errno value
-
-	li		v0, SYS_ptrace
-	syscall
-
-	# Load __cerror's address using our gp, then restore it.
-	PTR_LA		t9, __cerror
-	RESTORE_GP64
-	PTR_ADDU	sp, sp, CALLFRAME_SIZ
-
-	bne		a3, zero, 1f
-
-	j		ra
-1:	j		t9
-END(ptrace)
diff --git a/lib/libc_bsd/mips/sys/sbrk.S b/lib/libc_bsd/mips/sys/sbrk.S
deleted file mode 100644
index c448bbc..0000000
--- a/lib/libc_bsd/mips/sys/sbrk.S
+++ /dev/null
@@ -1,73 +0,0 @@
-/*	$NetBSD: sbrk.S,v 1.16 2005/04/22 06:58:01 simonb Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/sbrk.S 209521 2010-06-25 05:36:36Z jchandra $");
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)sbrk.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: sbrk.S,v 1.16 2005/04/22 06:58:01 simonb Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-	.globl	_C_LABEL(__curbrk)
-	.globl	_C_LABEL(_end)
-
-	.data
-_C_LABEL(__curbrk):
-	PTR_WORD	_C_LABEL(_end)
-	.text
-
-LEAF(__sys_sbrk)
-	WEAK_ALIAS(sbrk, __sys_sbrk)
-	WEAK_ALIAS(_sbrk, __sys_sbrk)
-	PIC_PROLOGUE(__sys_sbrk)
-	PTR_LA	t0, _C_LABEL(__curbrk)
-	PTR_L	t0, 0(t0)
-	PTR_ADDU a0, a0, t0
-
-	li	v0, SYS_break
-	syscall
-
-	bne	a3, zero, 1f
-	nop
-	move	v0, t0			# return old val of curbrk from above
-	PTR_LA	t0, _C_LABEL(__curbrk)
-	PTR_S	a0, 0(t0)		# save current val of curbrk from above
-	PIC_RETURN()
-	j	ra
-
-1:
-	PIC_TAILCALL(__cerror)
-END(__sys_sbrk)
diff --git a/lib/libc_bsd/mips/sys/shmat.S b/lib/libc_bsd/mips/sys/shmat.S
deleted file mode 100644
index 29c9e0f..0000000
--- a/lib/libc_bsd/mips/sys/shmat.S
+++ /dev/null
@@ -1,7 +0,0 @@
-/*	$NetBSD: shmat.S,v 1.1 2000/07/07 08:20:52 itohy Exp $	*/
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/shmat.S 178580 2008-04-26 12:08:02Z imp $");
-#include "SYS.h"
-
-RSYSCALL(shmat)
diff --git a/lib/libc_bsd/mips/sys/syscall.S b/lib/libc_bsd/mips/sys/syscall.S
deleted file mode 100644
index e3b0a34..0000000
--- a/lib/libc_bsd/mips/sys/syscall.S
+++ /dev/null
@@ -1,44 +0,0 @@
-/*	$NetBSD: syscall.S,v 1.5 2003/08/07 16:42:18 agc Exp $	*/
-
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/mips/sys/syscall.S 178580 2008-04-26 12:08:02Z imp $");
-#include "SYS.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	ASMSTR("from: @(#)syscall.s	8.1 (Berkeley) 6/4/93")
-	ASMSTR("$NetBSD: syscall.S,v 1.5 2003/08/07 16:42:18 agc Exp $")
-#endif /* LIBC_SCCS and not lint */
-
-RSYSCALL(syscall)
diff --git a/lib/libc_bsd/nameser/Makefile.inc b/lib/libc_bsd/nameser/Makefile.inc
deleted file mode 100644
index 3d9ca20..0000000
--- a/lib/libc_bsd/nameser/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile.incl 157049 2006-03-23 16:55:13Z des $
-
-# nameser sources
-.PATH: ${.CURDIR}/nameser
-
-SRCS+=	ns_name.c ns_netint.c ns_parse.c ns_print.c ns_samedomain.c ns_ttl.c
-
-SYM_MAPS+= ${.CURDIR}/nameser/Symbol.map
diff --git a/lib/libc_bsd/nameser/Symbol.map b/lib/libc_bsd/nameser/Symbol.map
deleted file mode 100644
index 8dd9a6b..0000000
--- a/lib/libc_bsd/nameser/Symbol.map
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/nameser/Symbol.map 270838 2014-08-30 10:16:25Z ume $
- */
-
-FBSD_1.0 {
-	__ns_makecanon;
-	__ns_msg_getflag;
-	__ns_name_ntol;
-	__ns_name_ntop;
-	__ns_name_pton;
-	__ns_name_unpack;
-	__ns_name_pack;
-	__ns_name_uncompress;
-	__ns_name_compress;
-	__ns_name_rollback;
-	__ns_name_skip;
-	__ns_get16;
-	__ns_get32;
-	__ns_put16;
-	__ns_put32;
-	__ns_initparse;
-	__ns_parserr;
-	_ns_flagdata;
-	__ns_samedomain;
-	__ns_samename;
-	__ns_skiprr;
-	__ns_sprintrr;
-	__ns_sprintrrf;
-	__ns_format_ttl;
-	__ns_parse_ttl;
-};
-
-FBSD_1.4 {
-	__ns_parserr2;
-	__ns_name_pton2;
-	__ns_name_unpack2;
-	__ns_name_length;
-	__ns_name_eq;
-	__ns_name_owned;
-	__ns_name_map;
-	__ns_name_labels;
-	__ns_newmsg_init;
-	__ns_newmsg_copy;
-	__ns_newmsg_id;
-	__ns_newmsg_flag;
-	__ns_newmsg_q;
-	__ns_newmsg_rr;
-	__ns_newmsg_done;
-	__ns_rdata_unpack;
-	__ns_rdata_equal;
-	__ns_rdata_refers;
-};
diff --git a/lib/libc_bsd/nameser/ns_name.c b/lib/libc_bsd/nameser/ns_name.c
deleted file mode 100644
index 58a91a4..0000000
--- a/lib/libc_bsd/nameser/ns_name.c
+++ /dev/null
@@ -1,1156 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/nameser/ns_name.c 270839 2014-08-30 10:25:41Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <limits.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-#define NS_TYPE_ELT			0x40 /*%< EDNS0 extended label type */
-#define DNS_LABELTYPE_BITSTRING		0x41
-
-/* Data. */
-
-static const char	digits[] = "0123456789";
-
-static const char digitvalue[256] = {
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,	/*16*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*32*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*48*/
-	 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, -1, -1, -1, -1, -1, -1, /*64*/
-	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*80*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*96*/
-	-1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*112*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*128*/
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*256*/
-};
-
-/* Forward. */
-
-static int		special(int);
-static int		printable(int);
-static int		dn_find(const u_char *, const u_char *,
-				const u_char * const *,
-				const u_char * const *);
-static int		encode_bitsring(const char **, const char *,
-					unsigned char **, unsigned char **,
-					unsigned const char *);
-static int		labellen(const u_char *);
-static int		decode_bitstring(const unsigned char **,
-					 char *, const char *);
-
-/* Public. */
-
-/*%
- *	Convert an encoded domain name to printable ascii as per RFC1035.
-
- * return:
- *\li	Number of bytes written to buffer, or -1 (with errno set)
- *
- * notes:
- *\li	The root is returned as "."
- *\li	All other domains are returned in non absolute form
- */
-int
-ns_name_ntop(const u_char *src, char *dst, size_t dstsiz)
-{
-	const u_char *cp;
-	char *dn, *eom;
-	u_char c;
-	u_int n;
-	int l;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn != dst) {
-			if (dn >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*dn++ = '.';
-		}
-		if ((l = labellen(cp - 1)) < 0) {
-			errno = EMSGSIZE; /*%< XXX */
-			return (-1);
-		}
-		if (dn + l >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if ((n & NS_CMPRSFLGS) == NS_TYPE_ELT) {
-			int m;
-
-			if (n != DNS_LABELTYPE_BITSTRING) {
-				/* XXX: labellen should reject this case */
-				errno = EINVAL;
-				return (-1);
-			}
-			if ((m = decode_bitstring(&cp, dn, eom)) < 0)
-			{
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			dn += m; 
-			continue;
-		}
-		for ((void)NULL; l > 0; l--) {
-			c = *cp++;
-			if (special(c)) {
-				if (dn + 1 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = (char)c;
-			} else if (!printable(c)) {
-				if (dn + 3 >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = '\\';
-				*dn++ = digits[c / 100];
-				*dn++ = digits[(c % 100) / 10];
-				*dn++ = digits[c % 10];
-			} else {
-				if (dn >= eom) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				*dn++ = (char)c;
-			}
-		}
-	}
-	if (dn == dst) {
-		if (dn >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = '.';
-	}
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*dn++ = '\0';
-	return (dn - dst);
-}
-
-/*%
- *	Convert a ascii string into an encoded domain name as per RFC1035.
- *
- * return:
- *
- *\li	-1 if it fails
- *\li	1 if string was fully qualified
- *\li	0 is string was not fully qualified
- *
- * notes:
- *\li	Enforces label and domain length limits.
- */
-int
-ns_name_pton(const char *src, u_char *dst, size_t dstsiz) {
-	return (ns_name_pton2(src, dst, dstsiz, NULL));
-}
-
-/*
- * ns_name_pton2(src, dst, dstsiz, *dstlen)
- *	Convert a ascii string into an encoded domain name as per RFC1035.
- * return:
- *	-1 if it fails
- *	1 if string was fully qualified
- *	0 is string was not fully qualified
- * side effects:
- *	fills in *dstlen (if non-NULL)
- * notes:
- *	Enforces label and domain length limits.
- */
-int
-ns_name_pton2(const char *src, u_char *dst, size_t dstsiz, size_t *dstlen) {
-	u_char *label, *bp, *eom;
-	int c, n, escaped, e = 0;
-	char *cp;
-
-	escaped = 0;
-	bp = dst;
-	eom = dst + dstsiz;
-	label = bp++;
-
-	while ((c = *src++) != 0) {
-		if (escaped) {
-			if (c == '[') { /*%< start a bit string label */
-				if ((cp = strchr(src, ']')) == NULL) {
-					errno = EINVAL; /*%< ??? */
-					return (-1);
-				}
-				if ((e = encode_bitsring(&src, cp + 2,
-							 &label, &bp, eom))
-				    != 0) {
-					errno = e;
-					return (-1);
-				}
-				escaped = 0;
-				label = bp++;
-				if ((c = *src++) == 0)
-					goto done;
-				else if (c != '.') {
-					errno = EINVAL;
-					return	(-1);
-				}
-				continue;
-			}
-			else if ((cp = strchr(digits, c)) != NULL) {
-				n = (cp - digits) * 100;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits) * 10;
-				if ((c = *src++) == 0 ||
-				    (cp = strchr(digits, c)) == NULL) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				n += (cp - digits);
-				if (n > 255) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				c = n;
-			}
-			escaped = 0;
-		} else if (c == '\\') {
-			escaped = 1;
-			continue;
-		} else if (c == '.') {
-			c = (bp - label - 1);
-			if ((c & NS_CMPRSFLGS) != 0) {	/*%< Label too big. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (label >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			*label = c;
-			/* Fully qualified ? */
-			if (*src == '\0') {
-				if (c != 0) {
-					if (bp >= eom) {
-						errno = EMSGSIZE;
-						return (-1);
-					}
-					*bp++ = '\0';
-				}
-				if ((bp - dst) > MAXCDNAME) {
-					errno = EMSGSIZE;
-					return (-1);
-				}
-				if (dstlen != NULL)
-					*dstlen = (bp - dst);
-				return (1);
-			}
-			if (c == 0 || *src == '.') {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			label = bp++;
-			continue;
-		}
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = (u_char)c;
-	}
-	c = (bp - label - 1);
-	if ((c & NS_CMPRSFLGS) != 0) {		/*%< Label too big. */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-  done:
-	if (label >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*label = c;
-	if (c != 0) {
-		if (bp >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*bp++ = 0;
-	}
-	if ((bp - dst) > MAXCDNAME) {	/*%< src too big */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	if (dstlen != NULL)
-		*dstlen = (bp - dst);
-	return (0);
-}
-
-/*%
- *	Convert a network strings labels into all lowercase.
- *
- * return:
- *\li	Number of bytes written to buffer, or -1 (with errno set)
- *
- * notes:
- *\li	Enforces label and domain length limits.
- */
-
-int
-ns_name_ntol(const u_char *src, u_char *dst, size_t dstsiz)
-{
-	const u_char *cp;
-	u_char *dn, *eom;
-	u_char c;
-	u_int n;
-	int l;
-
-	cp = src;
-	dn = dst;
-	eom = dst + dstsiz;
-
-	if (dn >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	while ((n = *cp++) != 0) {
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			/* Some kind of compression pointer. */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		*dn++ = n;
-		if ((l = labellen(cp - 1)) < 0) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (dn + l >= eom) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		for ((void)NULL; l > 0; l--) {
-			c = *cp++;
-			if (isascii(c) && isupper(c))
-				*dn++ = tolower(c);
-			else
-				*dn++ = c;
-		}
-	}
-	*dn++ = '\0';
-	return (dn - dst);
-}
-
-/*%
- *	Unpack a domain name from a message, source may be compressed.
- *
- * return:
- *\li	-1 if it fails, or consumed octets if it succeeds.
- */
-int
-ns_name_unpack(const u_char *msg, const u_char *eom, const u_char *src,
-	       u_char *dst, size_t dstsiz)
-{
-	return (ns_name_unpack2(msg, eom, src, dst, dstsiz, NULL));
-}
-
-/*
- * ns_name_unpack2(msg, eom, src, dst, dstsiz, *dstlen)
- *	Unpack a domain name from a message, source may be compressed.
- * return:
- *	-1 if it fails, or consumed octets if it succeeds.
- * side effect:
- *	fills in *dstlen (if non-NULL).
- */
-int
-ns_name_unpack2(const u_char *msg, const u_char *eom, const u_char *src,
-		u_char *dst, size_t dstsiz, size_t *dstlen)
-{
-	const u_char *srcp, *dstlim;
-	u_char *dstp;
-	int n, len, checked, l;
-
-	len = -1;
-	checked = 0;
-	dstp = dst;
-	srcp = src;
-	dstlim = dst + dstsiz;
-	if (srcp < msg || srcp >= eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	/* Fetch next label in domain name. */
-	while ((n = *srcp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:
-		case NS_TYPE_ELT:
-			/* Limit checks. */
-			if ((l = labellen(srcp - 1)) < 0) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (dstp + l + 1 >= dstlim || srcp + l >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			checked += l + 1;
-			*dstp++ = n;
-			memcpy(dstp, srcp, l);
-			dstp += l;
-			srcp += l;
-			break;
-
-		case NS_CMPRSFLGS:
-			if (srcp >= eom) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			if (len < 0)
-				len = srcp - src + 1;
-			l = ((n & 0x3f) << 8) | (*srcp & 0xff);
-			if (l >= eom - msg) {  /*%< Out of range. */
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			srcp = msg + l;
-			checked += 2;
-			/*
-			 * Check for loops in the compressed name;
-			 * if we've looked at the whole message,
-			 * there must be a loop.
-			 */
-			if (checked >= eom - msg) {
-				errno = EMSGSIZE;
-				return (-1);
-			}
-			break;
-
-		default:
-			errno = EMSGSIZE;
-			return (-1);			/*%< flag error */
-		}
-	}
-	*dstp++ = 0;
-	if (dstlen != NULL)
-		*dstlen = dstp - dst;
-	if (len < 0)
-		len = srcp - src;
-	return (len);
-}
-
-/*%
- *	Pack domain name 'domain' into 'comp_dn'.
- *
- * return:
- *\li	Size of the compressed name, or -1.
- *
- * notes:
- *\li	'dnptrs' is an array of pointers to previous compressed names.
- *\li	dnptrs[0] is a pointer to the beginning of the message. The array
- *	ends with NULL.
- *\li	'lastdnptr' is a pointer to the end of the array pointed to
- *	by 'dnptrs'.
- *
- * Side effects:
- *\li	The list of pointers in dnptrs is updated for labels inserted into
- *	the message as we compress the name.  If 'dnptr' is NULL, we don't
- *	try to compress names. If 'lastdnptr' is NULL, we don't update the
- *	list.
- */
-int
-ns_name_pack(const u_char *src, u_char *dst, int dstsiz,
-	     const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char *dstp;
-	const u_char **cpp, **lpp, *eob, *msg;
-	const u_char *srcp;
-	int n, l, first = 1;
-
-	srcp = src;
-	dstp = dst;
-	eob = dstp + dstsiz;
-	lpp = cpp = NULL;
-	if (dnptrs != NULL) {
-		if ((msg = *dnptrs++) != NULL) {
-			for (cpp = dnptrs; *cpp != NULL; cpp++)
-				(void)NULL;
-			lpp = cpp;	/*%< end of list to search */
-		}
-	} else
-		msg = NULL;
-
-	/* make sure the domain we are about to add is legal */
-	l = 0;
-	do {
-		int l0;
-
-		n = *srcp;
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if ((l0 = labellen(srcp)) < 0) {
-			errno = EINVAL;
-			return (-1);
-		}
-		l += l0 + 1;
-		if (l > MAXCDNAME) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		srcp += l0 + 1;
-	} while (n != 0);
-
-	/* from here on we need to reset compression pointer array on error */
-	srcp = src;
-	do {
-		/* Look to see if we can use pointers. */
-		n = *srcp;
-		if (n != 0 && msg != NULL) {
-			l = dn_find(srcp, msg, (const u_char * const *)dnptrs,
-				    (const u_char * const *)lpp);
-			if (l >= 0) {
-				if (dstp + 1 >= eob) {
-					goto cleanup;
-				}
-				*dstp++ = (l >> 8) | NS_CMPRSFLGS;
-				*dstp++ = l % 256;
-				return (dstp - dst);
-			}
-			/* Not found, save it. */
-			if (lastdnptr != NULL && cpp < lastdnptr - 1 &&
-			    (dstp - msg) < 0x4000 && first) {
-				*cpp++ = dstp;
-				*cpp = NULL;
-				first = 0;
-			}
-		}
-		/* copy label to buffer */
-		if ((n & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-			/* Should not happen. */
-			goto cleanup;
-		}
-		n = labellen(srcp);
-		if (dstp + 1 + n >= eob) {
-			goto cleanup;
-		}
-		memcpy(dstp, srcp, n + 1);
-		srcp += n + 1;
-		dstp += n + 1;
-	} while (n != 0);
-
-	if (dstp > eob) {
-cleanup:
-		if (msg != NULL)
-			*lpp = NULL;
-		errno = EMSGSIZE;
-		return (-1);
-	} 
-	return (dstp - dst);
-}
-
-/*%
- *	Expand compressed domain name to presentation format.
- *
- * return:
- *\li	Number of bytes read out of `src', or -1 (with errno set).
- *
- * note:
- *\li	Root domain returns as "." not "".
- */
-int
-ns_name_uncompress(const u_char *msg, const u_char *eom, const u_char *src,
-		   char *dst, size_t dstsiz)
-{
-	u_char tmp[NS_MAXCDNAME];
-	int n;
-	
-	if ((n = ns_name_unpack(msg, eom, src, tmp, sizeof tmp)) == -1)
-		return (-1);
-	if (ns_name_ntop(tmp, dst, dstsiz) == -1)
-		return (-1);
-	return (n);
-}
-
-/*%
- *	Compress a domain name into wire format, using compression pointers.
- *
- * return:
- *\li	Number of bytes consumed in `dst' or -1 (with errno set).
- *
- * notes:
- *\li	'dnptrs' is an array of pointers to previous compressed names.
- *\li	dnptrs[0] is a pointer to the beginning of the message.
- *\li	The list ends with NULL.  'lastdnptr' is a pointer to the end of the
- *	array pointed to by 'dnptrs'. Side effect is to update the list of
- *	pointers for labels inserted into the message as we compress the name.
- *\li	If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
- *	is NULL, we don't update the list.
- */
-int
-ns_name_compress(const char *src, u_char *dst, size_t dstsiz,
-		 const u_char **dnptrs, const u_char **lastdnptr)
-{
-	u_char tmp[NS_MAXCDNAME];
-
-	if (ns_name_pton(src, tmp, sizeof tmp) == -1)
-		return (-1);
-	return (ns_name_pack(tmp, dst, dstsiz, dnptrs, lastdnptr));
-}
-
-/*%
- * Reset dnptrs so that there are no active references to pointers at or
- * after src.
- */
-void
-ns_name_rollback(const u_char *src, const u_char **dnptrs,
-		 const u_char **lastdnptr)
-{
-	while (dnptrs < lastdnptr && *dnptrs != NULL) {
-		if (*dnptrs >= src) {
-			*dnptrs = NULL;
-			break;
-		}
-		dnptrs++;
-	}
-}
-
-/*%
- *	Advance *ptrptr to skip over the compressed name it points at.
- *
- * return:
- *\li	0 on success, -1 (with errno set) on failure.
- */
-int
-ns_name_skip(const u_char **ptrptr, const u_char *eom)
-{
-	const u_char *cp;
-	u_int n;
-	int l;
-
-	cp = *ptrptr;
-	while (cp < eom && (n = *cp++) != 0) {
-		/* Check for indirection. */
-		switch (n & NS_CMPRSFLGS) {
-		case 0:			/*%< normal case, n == len */
-			cp += n;
-			continue;
-		case NS_TYPE_ELT: /*%< EDNS0 extended label */
-			if ((l = labellen(cp - 1)) < 0) {
-				errno = EMSGSIZE; /*%< XXX */
-				return (-1);
-			}
-			cp += l;
-			continue;
-		case NS_CMPRSFLGS:	/*%< indirection */
-			cp++;
-			break;
-		default:		/*%< illegal type */
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		break;
-	}
-	if (cp > eom) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	*ptrptr = cp;
-	return (0);
-}
-
-/* Find the number of octets an nname takes up, including the root label.
- * (This is basically ns_name_skip() without compression-pointer support.)
- * ((NOTE: can only return zero if passed-in namesiz argument is zero.))
- */
-ssize_t
-ns_name_length(ns_nname_ct nname, size_t namesiz) {
-	ns_nname_ct orig = nname;
-	u_int n;
-
-	while (namesiz-- > 0 && (n = *nname++) != 0) {
-		if ((n & NS_CMPRSFLGS) != 0) {
-			errno = EISDIR;
-			return (-1);
-		}
-		if (n > namesiz) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		nname += n;
-		namesiz -= n;
-	}
-	return (nname - orig);
-}
-
-/* Compare two nname's for equality.  Return -1 on error (setting errno).
- */
-int
-ns_name_eq(ns_nname_ct a, size_t as, ns_nname_ct b, size_t bs) {
-	ns_nname_ct ae = a + as, be = b + bs;
-	int ac, bc;
-
-	while (ac = *a, bc = *b, ac != 0 && bc != 0) {
-		if ((ac & NS_CMPRSFLGS) != 0 || (bc & NS_CMPRSFLGS) != 0) {
-			errno = EISDIR;
-			return (-1);
-		}
-		if (a + ac >= ae || b + bc >= be) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		if (ac != bc || strncasecmp((const char *) ++a,
-					    (const char *) ++b, ac) != 0)
-			return (0);
-		a += ac, b += bc;
-	}
-	return (ac == 0 && bc == 0);
-}
-
-/* Is domain "A" owned by (at or below) domain "B"?
- */
-int
-ns_name_owned(ns_namemap_ct a, int an, ns_namemap_ct b, int bn) {
-	/* If A is shorter, it cannot be owned by B. */
-	if (an < bn)
-		return (0);
-
-	/* If they are unequal before the length of the shorter, A cannot... */
-	while (bn > 0) {
-		if (a->len != b->len ||
-		    strncasecmp((const char *) a->base,
-				(const char *) b->base, a->len) != 0)
-			return (0);
-		a++, an--;
-		b++, bn--;
-	}
-
-	/* A might be longer or not, but either way, B owns it. */
-	return (1);
-}
-
-/* Build an array of <base,len> tuples from an nname, top-down order.
- * Return the number of tuples (labels) thus discovered.
- */
-int
-ns_name_map(ns_nname_ct nname, size_t namelen, ns_namemap_t map, int mapsize) {
-	u_int n;
-	int l;
-
-	n = *nname++;
-	namelen--;
-
-	/* Root zone? */
-	if (n == 0) {
-		/* Extra data follows name? */
-		if (namelen > 0) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		return (0);
-	}
-
-	/* Compression pointer? */
-	if ((n & NS_CMPRSFLGS) != 0) {
-		errno = EISDIR;
-		return (-1);
-	}
-
-	/* Label too long? */
-	if (n > namelen) {
-		errno = EMSGSIZE;
-		return (-1);
-	}
-
-	/* Recurse to get rest of name done first. */
-	l = ns_name_map(nname + n, namelen - n, map, mapsize);
-	if (l < 0)
-		return (-1);
-
-	/* Too many labels? */
-	if (l >= mapsize) {
-		errno = ENAMETOOLONG;
-		return (-1);
-	}
-
-	/* We're on our way back up-stack, store current map data. */
-	map[l].base = nname;
-	map[l].len = n;
-	return (l + 1);
-}
-
-/* Count the labels in a domain name.  Root counts, so COM. has two.  This
- * is to make the result comparable to the result of ns_name_map().
- */
-int
-ns_name_labels(ns_nname_ct nname, size_t namesiz) {
-	int ret = 0;
-	u_int n;
-
-	while (namesiz-- > 0 && (n = *nname++) != 0) {
-		if ((n & NS_CMPRSFLGS) != 0) {
-			errno = EISDIR;
-			return (-1);
-		}
-		if (n > namesiz) {
-			errno = EMSGSIZE;
-			return (-1);
-		}
-		nname += n;
-		namesiz -= n;
-		ret++;
-	}
-	return (ret + 1);
-}
-
-/* Private. */
-
-/*%
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this characted special ("in need of quoting") ?
- *
- * return:
- *\li	boolean.
- */
-static int
-special(int ch) {
-	switch (ch) {
-	case 0x22: /*%< '"' */
-	case 0x2E: /*%< '.' */
-	case 0x3B: /*%< ';' */
-	case 0x5C: /*%< '\\' */
-	case 0x28: /*%< '(' */
-	case 0x29: /*%< ')' */
-	/* Special modifiers in zone files. */
-	case 0x40: /*%< '@' */
-	case 0x24: /*%< '$' */
-		return (1);
-	default:
-		return (0);
-	}
-}
-
-/*%
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	is this character visible and not a space when printed ?
- *
- * return:
- *\li	boolean.
- */
-static int
-printable(int ch) {
-	return (ch > 0x20 && ch < 0x7f);
-}
-
-/*%
- *	Thinking in noninternationalized USASCII (per the DNS spec),
- *	convert this character to lower case if it's upper case.
- */
-static int
-mklower(int ch) {
-	if (ch >= 0x41 && ch <= 0x5A)
-		return (ch + 0x20);
-	return (ch);
-}
-
-/*%
- *	Search for the counted-label name in an array of compressed names.
- *
- * return:
- *\li	offset from msg if found, or -1.
- *
- * notes:
- *\li	dnptrs is the pointer to the first name on the list,
- *\li	not the pointer to the start of the message.
- */
-static int
-dn_find(const u_char *domain, const u_char *msg,
-	const u_char * const *dnptrs,
-	const u_char * const *lastdnptr)
-{
-	const u_char *dn, *cp, *sp;
-	const u_char * const *cpp;
-	u_int n;
-
-	for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
-		sp = *cpp;
-		/*
-		 * terminate search on:
-		 * root label
-		 * compression pointer
-		 * unusable offset
-		 */
-		while (*sp != 0 && (*sp & NS_CMPRSFLGS) == 0 &&
-		       (sp - msg) < 0x4000) {
-			dn = domain;
-			cp = sp;
-			while ((n = *cp++) != 0) {
-				/*
-				 * check for indirection
-				 */
-				switch (n & NS_CMPRSFLGS) {
-				case 0:		/*%< normal case, n == len */
-					n = labellen(cp - 1); /*%< XXX */
-					if (n != *dn++)
-						goto next;
-
-					for ((void)NULL; n > 0; n--)
-						if (mklower(*dn++) !=
-						    mklower(*cp++))
-							goto next;
-					/* Is next root for both ? */
-					if (*dn == '\0' && *cp == '\0')
-						return (sp - msg);
-					if (*dn)
-						continue;
-					goto next;
-				case NS_CMPRSFLGS:	/*%< indirection */
-					cp = msg + (((n & 0x3f) << 8) | *cp);
-					break;
-
-				default:	/*%< illegal type */
-					errno = EMSGSIZE;
-					return (-1);
-				}
-			}
- next: ;
-			sp += *sp + 1;
-		}
-	}
-	errno = ENOENT;
-	return (-1);
-}
-
-static int
-decode_bitstring(const unsigned char **cpp, char *dn, const char *eom)
-{
-	const unsigned char *cp = *cpp;
-	char *beg = dn, tc;
-	int b, blen, plen, i;
-
-	if ((blen = (*cp & 0xff)) == 0)
-		blen = 256;
-	plen = (blen + 3) / 4;
-	plen += sizeof("\\[x/]") + (blen > 99 ? 3 : (blen > 9) ? 2 : 1);
-	if (dn + plen >= eom)
-		return (-1);
-
-	cp++;
-	i = SPRINTF((dn, "\\[x"));
-	if (i < 0)
-		return (-1);
-	dn += i;
-	for (b = blen; b > 7; b -= 8, cp++) {
-		i = SPRINTF((dn, "%02x", *cp & 0xff));
-		if (i < 0)
-			return (-1);
-		dn += i;
-	}
-	if (b > 4) {
-		tc = *cp++;
-		i = SPRINTF((dn, "%02x", tc & (0xff << (8 - b))));
-		if (i < 0)
-			return (-1);
-		dn += i;
-	} else if (b > 0) {
-		tc = *cp++;
-		i = SPRINTF((dn, "%1x",
-			       ((tc >> 4) & 0x0f) & (0x0f << (4 - b)))); 
-		if (i < 0)
-			return (-1);
-		dn += i;
-	}
-	i = SPRINTF((dn, "/%d]", blen));
-	if (i < 0)
-		return (-1);
-	dn += i;
-
-	*cpp = cp;
-	return (dn - beg);
-}
-
-static int
-encode_bitsring(const char **bp, const char *end, unsigned char **labelp,
-		unsigned char ** dst, unsigned const char *eom)
-{
-	int afterslash = 0;
-	const char *cp = *bp;
-	unsigned char *tp;
-	char c;
-	const char *beg_blen;
-	char *end_blen = NULL;
-	int value = 0, count = 0, tbcount = 0, blen = 0;
-
-	beg_blen = end_blen = NULL;
-
-	/* a bitstring must contain at least 2 characters */
-	if (end - cp < 2)
-		return (EINVAL);
-
-	/* XXX: currently, only hex strings are supported */
-	if (*cp++ != 'x')
-		return (EINVAL);
-	if (!isxdigit((*cp) & 0xff)) /*%< reject '\[x/BLEN]' */
-		return (EINVAL);
-
-	for (tp = *dst + 1; cp < end && tp < eom; cp++) {
-		switch((c = *cp)) {
-		case ']':	/*%< end of the bitstring */
-			if (afterslash) {
-				if (beg_blen == NULL)
-					return (EINVAL);
-				blen = (int)strtol(beg_blen, &end_blen, 10);
-				if (*end_blen != ']')
-					return (EINVAL);
-			}
-			if (count)
-				*tp++ = ((value << 4) & 0xff);
-			cp++;	/*%< skip ']' */
-			goto done;
-		case '/':
-			afterslash = 1;
-			break;
-		default:
-			if (afterslash) {
-				if (!isdigit(c&0xff))
-					return (EINVAL);
-				if (beg_blen == NULL) {
-					
-					if (c == '0') {
-						/* blen never begings with 0 */
-						return (EINVAL);
-					}
-					beg_blen = cp;
-				}
-			} else {
-				if (!isxdigit(c&0xff))
-					return (EINVAL);
-				value <<= 4;
-				value += digitvalue[(int)c];
-				count += 4;
-				tbcount += 4;
-				if (tbcount > 256)
-					return (EINVAL);
-				if (count == 8) {
-					*tp++ = value;
-					count = 0;
-				}
-			}
-			break;
-		}
-	}
-  done:
-	if (cp >= end || tp >= eom)
-		return (EMSGSIZE);
-
-	/*
-	 * bit length validation:
-	 * If a <length> is present, the number of digits in the <bit-data>
-	 * MUST be just sufficient to contain the number of bits specified
-	 * by the <length>. If there are insignificant bits in a final
-	 * hexadecimal or octal digit, they MUST be zero.
-	 * RFC2673, Section 3.2.
-	 */
-	if (blen > 0) {
-		int traillen;
-
-		if (((blen + 3) & ~3) != tbcount)
-			return (EINVAL);
-		traillen = tbcount - blen; /*%< between 0 and 3 */
-		if (((value << (8 - traillen)) & 0xff) != 0)
-			return (EINVAL);
-	}
-	else
-		blen = tbcount;
-	if (blen == 256)
-		blen = 0;
-
-	/* encode the type and the significant bit fields */
-	**labelp = DNS_LABELTYPE_BITSTRING;
-	**dst = blen;
-
-	*bp = cp;
-	*dst = tp;
-
-	return (0);
-}
-
-static int
-labellen(const u_char *lp)
-{
-	int bitlen;
-	u_char l = *lp;
-
-	if ((l & NS_CMPRSFLGS) == NS_CMPRSFLGS) {
-		/* should be avoided by the caller */
-		return (-1);
-	}
-
-	if ((l & NS_CMPRSFLGS) == NS_TYPE_ELT) {
-		if (l == DNS_LABELTYPE_BITSTRING) {
-			if ((bitlen = *(lp + 1)) == 0)
-				bitlen = 256;
-			return ((bitlen + 7 ) / 8 + 1);
-		}
-		return (-1);	/*%< unknwon ELT */
-	}
-	return (l);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/nameser/ns_netint.c b/lib/libc_bsd/nameser/ns_netint.c
deleted file mode 100644
index bef47ae..0000000
--- a/lib/libc_bsd/nameser/ns_netint.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_netint.c,v 1.3 2005/04/27 04:56:40 sra Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/nameser/ns_netint.c 270838 2014-08-30 10:16:25Z ume $");
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <arpa/nameser.h>
-
-#include "port_after.h"
-
-/* Public. */
-
-u_int
-ns_get16(const u_char *src) {
-	u_int dst;
-
-	NS_GET16(dst, src);
-	return (dst);
-}
-
-u_long
-ns_get32(const u_char *src) {
-	u_long dst;
-
-	NS_GET32(dst, src);
-	return (dst);
-}
-
-void
-ns_put16(u_int src, u_char *dst) {
-	NS_PUT16(src, dst);
-}
-
-void
-ns_put32(u_long src, u_char *dst) {
-	NS_PUT32(src, dst);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/nameser/ns_parse.c b/lib/libc_bsd/nameser/ns_parse.c
deleted file mode 100644
index b581e45..0000000
--- a/lib/libc_bsd/nameser/ns_parse.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/nameser/ns_parse.c 270838 2014-08-30 10:16:25Z ume $");
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <sys/types.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-
-#include "port_after.h"
-
-/* Forward. */
-
-static void	setsection(ns_msg *msg, ns_sect sect);
-
-/* Macros. */
-
-#if !defined(SOLARIS2) || defined(__COVERITY__)
-#define RETERR(err) do { errno = (err); return (-1); } while (0)
-#else
-#define RETERR(err) \
-	do { errno = (err); if (errno == errno) return (-1); } while (0)
-#endif
-
-#define PARSE_FMT_PRESO 0	/* Parse using presentation-format names */
-#define PARSE_FMT_WIRE 1	/* Parse using network-format names */
-
-/* Public. */
-
-/* These need to be in the same order as the nres.h:ns_flag enum. */
-struct _ns_flagdata _ns_flagdata[16] = {
-	{ 0x8000, 15 },		/*%< qr. */
-	{ 0x7800, 11 },		/*%< opcode. */
-	{ 0x0400, 10 },		/*%< aa. */
-	{ 0x0200, 9 },		/*%< tc. */
-	{ 0x0100, 8 },		/*%< rd. */
-	{ 0x0080, 7 },		/*%< ra. */
-	{ 0x0040, 6 },		/*%< z. */
-	{ 0x0020, 5 },		/*%< ad. */
-	{ 0x0010, 4 },		/*%< cd. */
-	{ 0x000f, 0 },		/*%< rcode. */
-	{ 0x0000, 0 },		/*%< expansion (1/6). */
-	{ 0x0000, 0 },		/*%< expansion (2/6). */
-	{ 0x0000, 0 },		/*%< expansion (3/6). */
-	{ 0x0000, 0 },		/*%< expansion (4/6). */
-	{ 0x0000, 0 },		/*%< expansion (5/6). */
-	{ 0x0000, 0 },		/*%< expansion (6/6). */
-};
-
-int ns_msg_getflag(ns_msg handle, int flag) {
-	return(((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift);
-}
-
-int
-ns_skiprr(const u_char *ptr, const u_char *eom, ns_sect section, int count) {
-	const u_char *optr = ptr;
-
-	for ((void)NULL; count > 0; count--) {
-		int b, rdlength;
-
-		b = dn_skipname(ptr, eom);
-		if (b < 0)
-			RETERR(EMSGSIZE);
-		ptr += b/*Name*/ + NS_INT16SZ/*Type*/ + NS_INT16SZ/*Class*/;
-		if (section != ns_s_qd) {
-			if (ptr + NS_INT32SZ + NS_INT16SZ > eom)
-				RETERR(EMSGSIZE);
-			ptr += NS_INT32SZ/*TTL*/;
-			NS_GET16(rdlength, ptr);
-			ptr += rdlength/*RData*/;
-		}
-	}
-	if (ptr > eom)
-		RETERR(EMSGSIZE);
-	return (ptr - optr);
-}
-
-int
-ns_initparse(const u_char *msg, int msglen, ns_msg *handle) {
-	const u_char *eom = msg + msglen;
-	int i;
-
-	handle->_msg = msg;
-	handle->_eom = eom;
-	if (msg + NS_INT16SZ > eom)
-		RETERR(EMSGSIZE);
-	NS_GET16(handle->_id, msg);
-	if (msg + NS_INT16SZ > eom)
-		RETERR(EMSGSIZE);
-	NS_GET16(handle->_flags, msg);
-	for (i = 0; i < ns_s_max; i++) {
-		if (msg + NS_INT16SZ > eom)
-			RETERR(EMSGSIZE);
-		NS_GET16(handle->_counts[i], msg);
-	}
-	for (i = 0; i < ns_s_max; i++)
-		if (handle->_counts[i] == 0)
-			handle->_sections[i] = NULL;
-		else {
-			int b = ns_skiprr(msg, eom, (ns_sect)i,
-					  handle->_counts[i]);
-
-			if (b < 0)
-				return (-1);
-			handle->_sections[i] = msg;
-			msg += b;
-		}
-	if (msg != eom)
-		RETERR(EMSGSIZE);
-	setsection(handle, ns_s_max);
-	return (0);
-}
-
-int
-ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
-	int b;
-	int tmp;
-
-	/* Make section right. */
-	tmp = section;
-	if (tmp < 0 || section >= ns_s_max)
-		RETERR(ENODEV);
-	if (section != handle->_sect)
-		setsection(handle, section);
-
-	/* Make rrnum right. */
-	if (rrnum == -1)
-		rrnum = handle->_rrnum;
-	if (rrnum < 0 || rrnum >= handle->_counts[(int)section])
-		RETERR(ENODEV);
-	if (rrnum < handle->_rrnum)
-		setsection(handle, section);
-	if (rrnum > handle->_rrnum) {
-		b = ns_skiprr(handle->_msg_ptr, handle->_eom, section,
-			      rrnum - handle->_rrnum);
-
-		if (b < 0)
-			return (-1);
-		handle->_msg_ptr += b;
-		handle->_rrnum = rrnum;
-	}
-
-	/* Do the parse. */
-	b = dn_expand(handle->_msg, handle->_eom,
-		      handle->_msg_ptr, rr->name, NS_MAXDNAME);
-	if (b < 0)
-		return (-1);
-	handle->_msg_ptr += b;
-	if (handle->_msg_ptr + NS_INT16SZ + NS_INT16SZ > handle->_eom)
-		RETERR(EMSGSIZE);
-	NS_GET16(rr->type, handle->_msg_ptr);
-	NS_GET16(rr->rr_class, handle->_msg_ptr);
-	if (section == ns_s_qd) {
-		rr->ttl = 0;
-		rr->rdlength = 0;
-		rr->rdata = NULL;
-	} else {
-		if (handle->_msg_ptr + NS_INT32SZ + NS_INT16SZ > handle->_eom)
-			RETERR(EMSGSIZE);
-		NS_GET32(rr->ttl, handle->_msg_ptr);
-		NS_GET16(rr->rdlength, handle->_msg_ptr);
-		if (handle->_msg_ptr + rr->rdlength > handle->_eom)
-			RETERR(EMSGSIZE);
-		rr->rdata = handle->_msg_ptr;
-		handle->_msg_ptr += rr->rdlength;
-	}
-	if (++handle->_rrnum > handle->_counts[(int)section])
-		setsection(handle, (ns_sect)((int)section + 1));
-
-	/* All done. */
-	return (0);
-}
-
-/*
- * This is identical to the above but uses network-format (uncompressed) names.
- */
-int
-ns_parserr2(ns_msg *handle, ns_sect section, int rrnum, ns_rr2 *rr) {
-	int b;
-	int tmp;
-
-	/* Make section right. */
-	if ((tmp = section) < 0 || section >= ns_s_max)
-		RETERR(ENODEV);
-	if (section != handle->_sect)
-		setsection(handle, section);
-
-	/* Make rrnum right. */
-	if (rrnum == -1)
-		rrnum = handle->_rrnum;
-	if (rrnum < 0 || rrnum >= handle->_counts[(int)section])
-		RETERR(ENODEV);
-	if (rrnum < handle->_rrnum)
-		setsection(handle, section);
-	if (rrnum > handle->_rrnum) {
-		b = ns_skiprr(handle->_msg_ptr, handle->_eom, section,
-			      rrnum - handle->_rrnum);
-
-		if (b < 0)
-			return (-1);
-		handle->_msg_ptr += b;
-		handle->_rrnum = rrnum;
-	}
-
-	/* Do the parse. */
-	b = ns_name_unpack2(handle->_msg, handle->_eom, handle->_msg_ptr,
-			    rr->nname, NS_MAXNNAME, &rr->nnamel);
-	if (b < 0)
-		return (-1);
-	handle->_msg_ptr += b;
-	if (handle->_msg_ptr + NS_INT16SZ + NS_INT16SZ > handle->_eom)
-		RETERR(EMSGSIZE);
-	NS_GET16(rr->type, handle->_msg_ptr);
-	NS_GET16(rr->rr_class, handle->_msg_ptr);
-	if (section == ns_s_qd) {
-		rr->ttl = 0;
-		rr->rdlength = 0;
-		rr->rdata = NULL;
-	} else {
-		if (handle->_msg_ptr + NS_INT32SZ + NS_INT16SZ > handle->_eom)
-			RETERR(EMSGSIZE);
-		NS_GET32(rr->ttl, handle->_msg_ptr);
-		NS_GET16(rr->rdlength, handle->_msg_ptr);
-		if (handle->_msg_ptr + rr->rdlength > handle->_eom)
-			RETERR(EMSGSIZE);
-		rr->rdata = handle->_msg_ptr;
-		handle->_msg_ptr += rr->rdlength;
-	}
-	if (++handle->_rrnum > handle->_counts[(int)section])
-		setsection(handle, (ns_sect)((int)section + 1));
-
-	/* All done. */
-	return (0);
-}
-
-/* Private. */
-
-static void
-setsection(ns_msg *msg, ns_sect sect) {
-	msg->_sect = sect;
-	if (sect == ns_s_max) {
-		msg->_rrnum = -1;
-		msg->_msg_ptr = NULL;
-	} else {
-		msg->_rrnum = 0;
-		msg->_msg_ptr = msg->_sections[(int)sect];
-	}
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/nameser/ns_print.c b/lib/libc_bsd/nameser/ns_print.c
deleted file mode 100644
index 895702c..0000000
--- a/lib/libc_bsd/nameser/ns_print.c
+++ /dev/null
@@ -1,1254 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_print.c,v 1.12 2009/03/03 05:29:58 each Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/nameser/ns_print.c 270840 2014-08-30 10:29:47Z ume $");
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#ifdef _LIBC
-#include <assert.h>
-#define INSIST(cond)	assert(cond)
-#else
-#include <isc/assertions.h>
-#include <isc/dst.h>
-#endif
-#include <errno.h>
-#include <resolv.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/* Forward. */
-
-static size_t	prune_origin(const char *name, const char *origin);
-static int	charstr(const u_char *rdata, const u_char *edata,
-			char **buf, size_t *buflen);
-static int	addname(const u_char *msg, size_t msglen,
-			const u_char **p, const char *origin,
-			char **buf, size_t *buflen);
-static void	addlen(size_t len, char **buf, size_t *buflen);
-static int	addstr(const char *src, size_t len,
-		       char **buf, size_t *buflen);
-static int	addtab(size_t len, size_t target, int spaced,
-		       char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define	T(x) \
-	do { \
-		if ((x) < 0) \
-			return (-1); \
-	} while (0)
-
-static const char base32hex[] =
-        "0123456789ABCDEFGHIJKLMNOPQRSTUV=0123456789abcdefghijklmnopqrstuv";
-
-/* Public. */
-
-/*%
- *	Convert an RR to presentation format.
- *
- * return:
- *\li	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrr(const ns_msg *handle, const ns_rr *rr,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	int n;
-
-	n = ns_sprintrrf(ns_msg_base(*handle), ns_msg_size(*handle),
-			 ns_rr_name(*rr), ns_rr_class(*rr), ns_rr_type(*rr),
-			 ns_rr_ttl(*rr), ns_rr_rdata(*rr), ns_rr_rdlen(*rr),
-			 name_ctx, origin, buf, buflen);
-	return (n);
-}
-
-/*%
- *	Convert the fields of an RR into presentation format.
- *
- * return:
- *\li	Number of characters written to buf, or -1 (check errno).
- */
-int
-ns_sprintrrf(const u_char *msg, size_t msglen,
-	    const char *name, ns_class class, ns_type type,
-	    u_long ttl, const u_char *rdata, size_t rdlen,
-	    const char *name_ctx, const char *origin,
-	    char *buf, size_t buflen)
-{
-	const char *obuf = buf;
-	const u_char *edata = rdata + rdlen;
-	int spaced = 0;
-
-	const char *comment;
-	char tmp[100];
-	int len, x;
-
-	/*
-	 * Owner.
-	 */
-	if (name_ctx != NULL && ns_samename(name_ctx, name) == 1) {
-		T(addstr("\t\t\t", 3, &buf, &buflen));
-	} else {
-		len = prune_origin(name, origin);
-		if (*name == '\0') {
-			goto root;
-		} else if (len == 0) {
-			T(addstr("@\t\t\t", 4, &buf, &buflen));
-		} else {
-			T(addstr(name, len, &buf, &buflen));
-			/* Origin not used or not root, and no trailing dot? */
-			if (((origin == NULL || origin[0] == '\0') ||
-			    (origin[0] != '.' && origin[1] != '\0' &&
-			    name[len] == '\0')) && name[len - 1] != '.') {
- root:
-				T(addstr(".", 1, &buf, &buflen));
-				len++;
-			}
-			T(spaced = addtab(len, 24, spaced, &buf, &buflen));
-		}
-	}
-
-	/*
-	 * TTL, Class, Type.
-	 */
-	T(x = ns_format_ttl(ttl, buf, buflen));
-	addlen(x, &buf, &buflen);
-	len = SPRINTF((tmp, " %s %s", p_class(class), p_type(type)));
-	T(addstr(tmp, len, &buf, &buflen));
-	T(spaced = addtab(x + len, 16, spaced, &buf, &buflen));
-
-	/*
-	 * RData.
-	 */
-	switch (type) {
-	case ns_t_a:
-		if (rdlen != (size_t)NS_INADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_cname:
-	case ns_t_mb:
-	case ns_t_mg:
-	case ns_t_mr:
-	case ns_t_ns:
-	case ns_t_ptr:
-	case ns_t_dname:
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-
-	case ns_t_hinfo:
-	case ns_t_isdn:
-		/* First word. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		    
-		/* Second word, optional in ISDN records. */
-		if (type == ns_t_isdn && rdata == edata)
-			break;
-		    
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_soa: {
-		u_long t;
-
-		/* Server name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Administrator name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" (\n", 3, &buf, &buflen));
-		spaced = 0;
-
-		if ((edata - rdata) != 5*NS_INT32SZ)
-			goto formerr;
-
-		/* Serial number. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		len = SPRINTF((tmp, "%lu", t));
-		T(addstr(tmp, len, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; serial\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Refresh interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; refresh\n", 10, &buf, &buflen));
-		spaced = 0;
-
-		/* Retry interval. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; retry\n", 8, &buf, &buflen));
-		spaced = 0;
-
-		/* Expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; expiry\n", 9, &buf, &buflen));
-		spaced = 0;
-
-		/* Minimum TTL. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		T(addstr("\t\t\t\t\t", 5, &buf, &buflen));
-		T(len = ns_format_ttl(t, buf, buflen));
-		addlen(len, &buf, &buflen);
-		T(addstr(" )", 2, &buf, &buflen));
-		T(spaced = addtab(len, 16, spaced, &buf, &buflen));
-		T(addstr("; minimum\n", 10, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_mx:
-	case ns_t_afsdb:
-	case ns_t_rt:
-	case ns_t_kx: {
-		u_int t;
-
-		if (rdlen < (size_t)NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Target. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_px: {
-		u_int t;
-
-		if (rdlen < (size_t)NS_INT16SZ)
-			goto formerr;
-
-		/* Priority. */
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_x25:
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		break;
-
-	case ns_t_txt:
-	case ns_t_spf:
-		while (rdata < edata) {
-			T(len = charstr(rdata, edata, &buf, &buflen));
-			if (len == 0)
-				goto formerr;
-			rdata += len;
-			if (rdata < edata)
-				T(addstr(" ", 1, &buf, &buflen));
-		}
-		break;
-
-	case ns_t_nsap: {
-		char t[2+255*3];
-
-		(void) inet_nsap_ntoa(rdlen, rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_aaaa:
-		if (rdlen != (size_t)NS_IN6ADDRSZ)
-			goto formerr;
-		(void) inet_ntop(AF_INET6, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-
-	case ns_t_loc: {
-		char t[255];
-
-		/* XXX protocol format checking? */
-		(void) loc_ntoa(rdata, t);
-		T(addstr(t, strlen(t), &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_naptr: {
-		u_int order, preference;
-		char t[50];
-
-		if (rdlen < 2U*NS_INT16SZ)
-			goto formerr;
-
-		/* Order, Precedence. */
-		order = ns_get16(rdata);	rdata += NS_INT16SZ;
-		preference = ns_get16(rdata);	rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u ", order, preference));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Flags. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Service. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Regexp. */
-		T(len = charstr(rdata, edata, &buf, &buflen));
-		if (len < 0)
-			return (-1);
-		if (len == 0)
-			goto formerr;
-		rdata += len;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_srv: {
-		u_int priority, weight, port;
-		char t[50];
-
-		if (rdlen < 3U*NS_INT16SZ)
-			goto formerr;
-
-		/* Priority, Weight, Port. */
-		priority = ns_get16(rdata);  rdata += NS_INT16SZ;
-		weight   = ns_get16(rdata);  rdata += NS_INT16SZ;
-		port     = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((t, "%u %u %u ", priority, weight, port));
-		T(addstr(t, len, &buf, &buflen));
-
-		/* Server. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_minfo:
-	case ns_t_rp:
-		/* Name1. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Name2. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		break;
-
-	case ns_t_wks: {
-		int n, lcnt;
-
-		if (rdlen < 1U + NS_INT32SZ)
-			goto formerr;
-
-		/* Address. */
-		(void) inet_ntop(AF_INET, rdata, buf, buflen);
-		addlen(strlen(buf), &buf, &buflen);
-		rdata += NS_INADDRSZ;
-
-		/* Protocol. */
-		len = SPRINTF((tmp, " %u ( ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata += NS_INT8SZ;
-
-		/* Bit map. */
-		n = 0;
-		lcnt = 0;
-		while (rdata < edata) {
-			u_int c = *rdata++;
-			do {
-				if (c & 0200) {
-					if (lcnt == 0) {
-						T(addstr("\n\t\t\t\t", 5,
-							 &buf, &buflen));
-						lcnt = 10;
-						spaced = 0;
-					}
-					len = SPRINTF((tmp, "%d ", n));
-					T(addstr(tmp, len, &buf, &buflen));
-					lcnt--;
-				}
-				c <<= 1;
-			} while (++n & 07);
-		}
-		T(addstr(")", 1, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_key:
-	case ns_t_dnskey: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int keyflags, protocol, algorithm, key_id;
-		const char *leader;
-		int n;
-
-		if (rdlen < 0U + NS_INT16SZ + NS_INT8SZ + NS_INT8SZ)
-			goto formerr;
-
-		/* Key flags, Protocol, Algorithm. */
-#ifndef _LIBC
-		key_id = dst_s_dns_key_id(rdata, edata-rdata);
-#else
-		key_id = 0;
-#endif
-		keyflags = ns_get16(rdata);  rdata += NS_INT16SZ;
-		protocol = *rdata++;
-		algorithm = *rdata++;
-		len = SPRINTF((tmp, "0x%04x %u %u",
-			       keyflags, protocol, algorithm));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Public key data. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len < 0)
-			goto formerr;
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-		n = SPRINTF((tmp, " ; key_tag= %u", key_id));
-		T(addstr(tmp, n, &buf, &buflen));
-
-		break;
-	    }
-
-	case ns_t_sig:
-	case ns_t_rrsig: {
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		u_int type, algorithm, labels, footprint;
-		const char *leader;
-		u_long t;
-		int n;
-
-		if (rdlen < 22U)
-			goto formerr;
-
-		/* Type covered, Algorithm, Label count, Original TTL. */
-		type = ns_get16(rdata);  rdata += NS_INT16SZ;
-		algorithm = *rdata++;
-		labels = *rdata++;
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s %d %d %lu ",
-			       p_type(type), algorithm, labels, t));
-		T(addstr(tmp, len, &buf, &buflen));
-		if (labels > (u_int)dn_count_labels(name))
-			goto formerr;
-
-		/* Signature expiry. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Time signed. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signature Footprint. */
-		footprint = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", footprint));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Signer's name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Signature. */
-		len = b64_ntop(rdata, edata - rdata,
-			       base64_key, sizeof base64_key);
-		if (len > 15) {
-			T(addstr(" (", 2, &buf, &buflen));
-			leader = "\n\t\t";
-			spaced = 0;
-		} else
-			leader = " ";
-		if (len < 0)
-			goto formerr;
-		for (n = 0; n < len; n += 48) {
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-			T(addstr(base64_key + n, MIN(len - n, 48),
-				 &buf, &buflen));
-		}
-		if (len > 15)
-			T(addstr(" )", 2, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_nxt: {
-		int n, c;
-
-		/* Next domain name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		/* Type bit map. */
-		n = edata - rdata;
-		for (c = 0; c < n*8; c++)
-			if (NS_NXT_BIT_ISSET(c, rdata)) {
-				len = SPRINTF((tmp, " %s", p_type(c)));
-				T(addstr(tmp, len, &buf, &buflen));
-			}
-		break;
-	    }
-
-	case ns_t_cert: {
-		u_int c_type, key_tag, alg;
-		int n;
-		unsigned int siz;
-		char base64_cert[8192], tmp[40];
-		const char *leader;
-
-		c_type  = ns_get16(rdata); rdata += NS_INT16SZ;
-		key_tag = ns_get16(rdata); rdata += NS_INT16SZ;
-		alg = (u_int) *rdata++;
-
-		len = SPRINTF((tmp, "%d %d %d ", c_type, key_tag, alg));
-		T(addstr(tmp, len, &buf, &buflen));
-		siz = (edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */
-		if (siz > sizeof(base64_cert) * 3/4) {
-			const char *str = "record too long to print";
-			T(addstr(str, strlen(str), &buf, &buflen));
-		}
-		else {
-			len = b64_ntop(rdata, edata-rdata, base64_cert, siz);
-
-			if (len < 0)
-				goto formerr;
-			else if (len > 15) {
-				T(addstr(" (", 2, &buf, &buflen));
-				leader = "\n\t\t";
-				spaced = 0;
-			}
-			else
-				leader = " ";
-	
-			for (n = 0; n < len; n += 48) {
-				T(addstr(leader, strlen(leader),
-					 &buf, &buflen));
-				T(addstr(base64_cert + n, MIN(len - n, 48),
-					 &buf, &buflen));
-			}
-			if (len > 15)
-				T(addstr(" )", 2, &buf, &buflen));
-		}
-		break;
-	    }
-
-	case ns_t_tkey: {
-		/* KJD - need to complete this */
-		u_long t;
-		int mode, err, keysize;
-
-		/* Algorithm name. */
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-
-		/* Inception. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Experation. */
-		t = ns_get32(rdata);  rdata += NS_INT32SZ;
-		len = SPRINTF((tmp, "%s ", p_secstodate(t)));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* Mode , Error, Key Size. */
-		/* Priority, Weight, Port. */
-		mode = ns_get16(rdata);  rdata += NS_INT16SZ;
-		err  = ns_get16(rdata);  rdata += NS_INT16SZ;
-		keysize  = ns_get16(rdata);  rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u %u %u ", mode, err, keysize));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		/* XXX need to dump key, print otherdata length & other data */
-		break;
-	    }
-
-	case ns_t_tsig: {
-		/* BEW - need to complete this */
-		int n;
-
-		T(len = addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		T(addstr(" ", 1, &buf, &buflen));
-		rdata += 8; /*%< time */
-		n = ns_get16(rdata); rdata += INT16SZ;
-		rdata += n; /*%< sig */
-		n = ns_get16(rdata); rdata += INT16SZ; /*%< original id */
-		sprintf(buf, "%d", ns_get16(rdata));
-		rdata += INT16SZ;
-		addlen(strlen(buf), &buf, &buflen);
-		break;
-	    }
-
-	case ns_t_a6: {
-		struct in6_addr a;
-		int pbyte, pbit;
-
-		/* prefix length */
-		if (rdlen == 0U) goto formerr;
-		len = SPRINTF((tmp, "%d ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		pbit = *rdata;
-		if (pbit > 128) goto formerr;
-		pbyte = (pbit & ~7) / 8;
-		rdata++;
-
-		/* address suffix: provided only when prefix len != 128 */
-		if (pbit < 128) {
-			if (rdata + pbyte >= edata) goto formerr;
-			memset(&a, 0, sizeof(a));
-			memcpy(&a.s6_addr[pbyte], rdata, sizeof(a) - pbyte);
-			(void) inet_ntop(AF_INET6, &a, buf, buflen);
-			addlen(strlen(buf), &buf, &buflen);
-			rdata += sizeof(a) - pbyte;
-		}
-
-		/* prefix name: provided only when prefix len > 0 */
-		if (pbit == 0)
-			break;
-		if (rdata >= edata) goto formerr;
-		T(addstr(" ", 1, &buf, &buflen));
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-		
-		break;
-	    }
-
-	case ns_t_opt: {
-		len = SPRINTF((tmp, "%u bytes", class));
-		T(addstr(tmp, len, &buf, &buflen));
-		break;
-	    }
-
-	case ns_t_ds:
-	case ns_t_dlv:
-	case ns_t_sshfp: {
-		u_int t;
-
-		if (type == ns_t_ds || type == ns_t_dlv) {
-			if (rdlen < 4U) goto formerr;
-			t = ns_get16(rdata);
-			rdata += NS_INT16SZ;
-			len = SPRINTF((tmp, "%u ", t));
-			T(addstr(tmp, len, &buf, &buflen));
-		} else
-			if (rdlen < 2U) goto formerr;
-
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata++;
-
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata++;
-
-		while (rdata < edata) {
-			len = SPRINTF((tmp, "%02X", *rdata));
-			T(addstr(tmp, len, &buf, &buflen));
-			rdata++;
-		}
-		break;
-	    }
-
-	case ns_t_nsec3:
-	case ns_t_nsec3param: {
-		u_int t, w, l, j, k, c;
-		
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata++;
-
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata++;
-
-		t = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-		len = SPRINTF((tmp, "%u ", t));
-		T(addstr(tmp, len, &buf, &buflen));
-
-		t = *rdata++;
-		if (t == 0) {
-			T(addstr("-", 1, &buf, &buflen));
-		} else {
-			while (t-- > 0) {
-				len = SPRINTF((tmp, "%02X", *rdata));
-				T(addstr(tmp, len, &buf, &buflen));
-				rdata++;
-			}
-		}
-		if (type == ns_t_nsec3param)
-			break;
-		T(addstr(" ", 1, &buf, &buflen));
-
-		t = *rdata++;
-		while (t > 0) {
-			switch (t) {
-			case 1:
-				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)];
-				tmp[2] = tmp[3] = tmp[4] = '=';
-				tmp[5] = tmp[6] = tmp[7] = '=';
-				break;
-			case 2:
-				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
-						   ((rdata[1]>>6)&0x03)];
-				tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
-				tmp[3] = base32hex[((rdata[1]<<4)&0x10)];
-				tmp[4] = tmp[5] = tmp[6] = tmp[7] = '=';
-				break;
-			case 3:
-				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
-						   ((rdata[1]>>6)&0x03)];
-				tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
-				tmp[3] = base32hex[((rdata[1]<<4)&0x10)|
-						   ((rdata[2]>>4)&0x0f)];
-				tmp[4] = base32hex[((rdata[2]<<1)&0x1e)];
-				tmp[5] = tmp[6] = tmp[7] = '=';
-				break;
-			case 4:
-				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
-						   ((rdata[1]>>6)&0x03)];
-				tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
-				tmp[3] = base32hex[((rdata[1]<<4)&0x10)|
-						   ((rdata[2]>>4)&0x0f)];
-				tmp[4] = base32hex[((rdata[2]<<1)&0x1e)|
-						   ((rdata[3]>>7)&0x01)];
-				tmp[5] = base32hex[((rdata[3]>>2)&0x1f)];
-				tmp[6] = base32hex[(rdata[3]<<3)&0x18];
-				tmp[7] = '=';
-				break;
-			default:
-				tmp[0] = base32hex[((rdata[0]>>3)&0x1f)];
-				tmp[1] = base32hex[((rdata[0]<<2)&0x1c)|
-						   ((rdata[1]>>6)&0x03)];
-				tmp[2] = base32hex[((rdata[1]>>1)&0x1f)];
-				tmp[3] = base32hex[((rdata[1]<<4)&0x10)|
-						   ((rdata[2]>>4)&0x0f)];
-				tmp[4] = base32hex[((rdata[2]<<1)&0x1e)|
-						   ((rdata[3]>>7)&0x01)];
-				tmp[5] = base32hex[((rdata[3]>>2)&0x1f)];
-				tmp[6] = base32hex[((rdata[3]<<3)&0x18)|
-						   ((rdata[4]>>5)&0x07)];
-				tmp[7] = base32hex[(rdata[4]&0x1f)];
-				break;
-			}
-			T(addstr(tmp, 8, &buf, &buflen));
-			if (t >= 5) {
-				rdata += 5;
-				t -= 5;
-			} else {
-				rdata += t;
-				t -= t;
-			}
-		}
-
-		while (rdata < edata) {
-			w = *rdata++;
-			l = *rdata++;
-			for (j = 0; j < l; j++) {
-				if (rdata[j] == 0)
-					continue;
-				for (k = 0; k < 8; k++) {
-					if ((rdata[j] & (0x80 >> k)) == 0)
-						continue;
-					c = w * 256 + j * 8 + k;
-					len = SPRINTF((tmp, " %s", p_type(c)));
-					T(addstr(tmp, len, &buf, &buflen));
-				}
-			}
-			rdata += l;
-		}
-		break;
-	    }
-
-	case ns_t_nsec: {
-		u_int w, l, j, k, c;
-
-		T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-
-		while (rdata < edata) {
-			w = *rdata++;
-			l = *rdata++;
-			for (j = 0; j < l; j++) {
-				if (rdata[j] == 0)
-					continue;
-				for (k = 0; k < 8; k++) {
-					if ((rdata[j] & (0x80 >> k)) == 0)
-						continue;
-					c = w * 256 + j * 8 + k;
-					len = SPRINTF((tmp, " %s", p_type(c)));
-					T(addstr(tmp, len, &buf, &buflen));
-				}
-			}
-			rdata += l;
-		}
-		break;
-	    }
-
-	case ns_t_dhcid: {
-		int n;
-		unsigned int siz;
-		char base64_dhcid[8192];
-		const char *leader;
-
-		siz = (edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */
-		if (siz > sizeof(base64_dhcid) * 3/4) {
-			const char *str = "record too long to print";
-			T(addstr(str, strlen(str), &buf, &buflen));
-		} else {
-			len = b64_ntop(rdata, edata-rdata, base64_dhcid, siz);
-		
-			if (len < 0)
-				goto formerr;
-
-			else if (len > 15) {
-				T(addstr(" (", 2, &buf, &buflen));
-				leader = "\n\t\t";
-				spaced = 0;
-			}
-			else
-				leader = " ";
-
-			for (n = 0; n < len; n += 48) {
-				T(addstr(leader, strlen(leader),
-					 &buf, &buflen));
-				T(addstr(base64_dhcid + n, MIN(len - n, 48),
-					 &buf, &buflen));
-			}
-			if (len > 15)
-				T(addstr(" )", 2, &buf, &buflen));
-		}
-		break;
-	}
-
-	case ns_t_ipseckey: {
-		int n;
-		unsigned int siz;
-		char base64_key[8192];
-		const char *leader;
-	
-		if (rdlen < 2)
-			goto formerr;
-
-		switch (rdata[1]) {
-		case 0:
-		case 3:
-			if (rdlen < 3)
-				goto formerr;
-			break;
-		case 1:
-			if (rdlen < 7)
-				goto formerr;
-			break;
-		case 2:
-			if (rdlen < 19)
-				goto formerr;
-			break;
-		default:
-			comment = "unknown IPSECKEY gateway type";
-			goto hexify;
-		}
-
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata++;
-
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata++;
-		
-		len = SPRINTF((tmp, "%u ", *rdata));
-		T(addstr(tmp, len, &buf, &buflen));
-		rdata++;
-
-		switch (rdata[-2]) {
-		case 0:
-			T(addstr(".", 1, &buf, &buflen));
-			break;
-		case 1:
-			(void) inet_ntop(AF_INET, rdata, buf, buflen);
-			addlen(strlen(buf), &buf, &buflen);
-			rdata += 4;
-			break;
-		case 2:
-			(void) inet_ntop(AF_INET6, rdata, buf, buflen);
-			addlen(strlen(buf), &buf, &buflen);
-			rdata += 16;
-			break;
-		case 3:
-			T(addname(msg, msglen, &rdata, origin, &buf, &buflen));
-			break;
-		}
-
-		if (rdata >= edata)
-			break;
-
-		siz = (edata-rdata)*4/3 + 4; /* "+4" accounts for trailing \0 */
-		if (siz > sizeof(base64_key) * 3/4) {
-			const char *str = "record too long to print";
-			T(addstr(str, strlen(str), &buf, &buflen));
-		} else {
-			len = b64_ntop(rdata, edata-rdata, base64_key, siz);
-
-			if (len < 0)
-				goto formerr;
-
-			else if (len > 15) {
-				T(addstr(" (", 2, &buf, &buflen));
-				leader = "\n\t\t";
-				spaced = 0;
-			}
-			else
-				leader = " ";
-
-			for (n = 0; n < len; n += 48) {
-				T(addstr(leader, strlen(leader),
-					 &buf, &buflen));
-				T(addstr(base64_key + n, MIN(len - n, 48),
-					 &buf, &buflen));
-			}
-			if (len > 15)
-				T(addstr(" )", 2, &buf, &buflen));
-		}
-	}
-
-	case ns_t_hip: {
-		unsigned int i, hip_len, algorithm, key_len;
-		char base64_key[NS_MD5RSA_MAX_BASE64];
-		unsigned int siz;
-		const char *leader = "\n\t\t\t\t\t";
-		
-		hip_len = *rdata++;
-		algorithm = *rdata++;
-		key_len = ns_get16(rdata);
-		rdata += NS_INT16SZ;
-
-		siz = key_len*4/3 + 4; /* "+4" accounts for trailing \0 */
-		if (siz > sizeof(base64_key) * 3/4) {
-			const char *str = "record too long to print";
-			T(addstr(str, strlen(str), &buf, &buflen));
-		} else {
-			len = sprintf(tmp, "( %u ", algorithm);
-			T(addstr(tmp, len, &buf, &buflen));
-
-			for (i = 0; i < hip_len; i++) {
-				len = sprintf(tmp, "%02X", *rdata);
-				T(addstr(tmp, len, &buf, &buflen));
-				rdata++;
-			}
-			T(addstr(leader, strlen(leader), &buf, &buflen));
-
-			len = b64_ntop(rdata, key_len, base64_key, siz);
-			if (len < 0)
-				goto formerr;
-
-			T(addstr(base64_key, len, &buf, &buflen));
-				
-			rdata += key_len;
-			while (rdata < edata) {
-				T(addstr(leader, strlen(leader), &buf, &buflen));
-				T(addname(msg, msglen, &rdata, origin,
-					  &buf, &buflen));
-			}
-			T(addstr(" )", 2, &buf, &buflen));
-		}
-		break;
-	}
-
-	default:
-		comment = "unknown RR type";
-		goto hexify;
-	}
-	return (buf - obuf);
- formerr:
-	comment = "RR format error";
- hexify: {
-	int n, m;
-	char *p;
-
-	len = SPRINTF((tmp, "\\# %u%s\t; %s", (unsigned)(edata - rdata),
-		       rdlen != 0U ? " (" : "", comment));
-	T(addstr(tmp, len, &buf, &buflen));
-	while (rdata < edata) {
-		p = tmp;
-		p += SPRINTF((p, "\n\t"));
-		spaced = 0;
-		n = MIN(16, edata - rdata);
-		for (m = 0; m < n; m++)
-			p += SPRINTF((p, "%02x ", rdata[m]));
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		if (n < 16) {
-			T(addstr(")", 1, &buf, &buflen));
-			T(addtab(p - tmp + 1, 48, spaced, &buf, &buflen));
-		}
-		p = tmp;
-		p += SPRINTF((p, "; "));
-		for (m = 0; m < n; m++)
-			*p++ = (isascii(rdata[m]) && isprint(rdata[m]))
-				? rdata[m]
-				: '.';
-		T(addstr(tmp, p - tmp, &buf, &buflen));
-		rdata += n;
-	}
-	return (buf - obuf);
-    }
-}
-
-/* Private. */
-
-/*%
- * size_t
- * prune_origin(name, origin)
- *	Find out if the name is at or under the current origin.
- * return:
- *	Number of characters in name before start of origin,
- *	or length of name if origin does not match.
- * notes:
- *	This function should share code with samedomain().
- */
-static size_t
-prune_origin(const char *name, const char *origin) {
-	const char *oname = name;
-
-	while (*name != '\0') {
-		if (origin != NULL && ns_samename(name, origin) == 1)
-			return (name - oname - (name > oname));
-		while (*name != '\0') {
-			if (*name == '\\') {
-				name++;
-				/* XXX need to handle \nnn form. */
-				if (*name == '\0')
-					break;
-			} else if (*name == '.') {
-				name++;
-				break;
-			}
-			name++;
-		}
-	}
-	return (name - oname);
-}
-
-/*%
- * int
- * charstr(rdata, edata, buf, buflen)
- *	Format a <character-string> into the presentation buffer.
- * return:
- *	Number of rdata octets consumed
- *	0 for protocol format error
- *	-1 for output buffer error
- * side effects:
- *	buffer is advanced on success.
- */
-static int
-charstr(const u_char *rdata, const u_char *edata, char **buf, size_t *buflen) {
-	const u_char *odata = rdata;
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	if (rdata < edata) {
-		int n = *rdata;
-
-		if (rdata + 1 + n <= edata) {
-			rdata++;
-			while (n-- > 0) {
-				if (strchr("\n\"\\", *rdata) != NULL)
-					if (addstr("\\", 1, buf, buflen) < 0)
-						goto enospc;
-				if (addstr((const char *)rdata, 1,
-					   buf, buflen) < 0)
-					goto enospc;
-				rdata++;
-			}
-		}
-	}
-	if (addstr("\"", 1, buf, buflen) < 0)
-		goto enospc;
-	return (rdata - odata);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static int
-addname(const u_char *msg, size_t msglen,
-	const u_char **pp, const char *origin,
-	char **buf, size_t *buflen)
-{
-	size_t newlen, save_buflen = *buflen;
-	char *save_buf = *buf;
-	int n;
-
-	n = dn_expand(msg, msg + msglen, *pp, *buf, *buflen);
-	if (n < 0)
-		goto enospc;	/*%< Guess. */
-	newlen = prune_origin(*buf, origin);
-	if (**buf == '\0') {
-		goto root;
-	} else if (newlen == 0U) {
-		/* Use "@" instead of name. */
-		if (newlen + 2 > *buflen)
-			goto enospc;        /* No room for "@\0". */
-		(*buf)[newlen++] = '@';
-		(*buf)[newlen] = '\0';
-	} else {
-		if (((origin == NULL || origin[0] == '\0') ||
-		    (origin[0] != '.' && origin[1] != '\0' &&
-		    (*buf)[newlen] == '\0')) && (*buf)[newlen - 1] != '.') {
-			/* No trailing dot. */
- root:
-			if (newlen + 2 > *buflen)
-				goto enospc;	/* No room for ".\0". */
-			(*buf)[newlen++] = '.';
-			(*buf)[newlen] = '\0';
-		}
-	}
-	*pp += n;
-	addlen(newlen, buf, buflen);
-	**buf = '\0';
-	return (newlen);
- enospc:
-	errno = ENOSPC;
-	*buf = save_buf;
-	*buflen = save_buflen;
-	return (-1);
-}
-
-static void
-addlen(size_t len, char **buf, size_t *buflen) {
-	INSIST(len <= *buflen);
-	*buf += len;
-	*buflen -= len;
-}
-
-static int
-addstr(const char *src, size_t len, char **buf, size_t *buflen) {
-	if (len >= *buflen) {
-		errno = ENOSPC;
-		return (-1);
-	}
-	memcpy(*buf, src, len);
-	addlen(len, buf, buflen);
-	**buf = '\0';
-	return (0);
-}
-
-static int
-addtab(size_t len, size_t target, int spaced, char **buf, size_t *buflen) {
-	size_t save_buflen = *buflen;
-	char *save_buf = *buf;
-	int t;
-
-	if (spaced || len >= target - 1) {
-		T(addstr("  ", 2, buf, buflen));
-		spaced = 1;
-	} else {
-		for (t = (target - len - 1) / 8; t >= 0; t--)
-			if (addstr("\t", 1, buf, buflen) < 0) {
-				*buflen = save_buflen;
-				*buf = save_buf;
-				return (-1);
-			}
-		spaced = 0;
-	}
-	return (spaced);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/nameser/ns_samedomain.c b/lib/libc_bsd/nameser/ns_samedomain.c
deleted file mode 100644
index 63c6c9e..0000000
--- a/lib/libc_bsd/nameser/ns_samedomain.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/nameser/ns_samedomain.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <string.h>
-
-#include "port_after.h"
-
-/*%
- *	Check whether a name belongs to a domain.
- *
- * Inputs:
- *\li	a - the domain whose ancestory is being verified
- *\li	b - the potential ancestor we're checking against
- *
- * Return:
- *\li	boolean - is a at or below b?
- *
- * Notes:
- *\li	Trailing dots are first removed from name and domain.
- *	Always compare complete subdomains, not only whether the
- *	domain name is the trailing string of the given name.
- *
- *\li	"host.foobar.top" lies in "foobar.top" and in "top" and in ""
- *	but NOT in "bar.top"
- */
-
-int
-ns_samedomain(const char *a, const char *b) {
-	size_t la, lb;
-	int diff, i, escaped;
-	const char *cp;
-
-	la = strlen(a);
-	lb = strlen(b);
-
-	/* Ignore a trailing label separator (i.e. an unescaped dot) in 'a'. */
-	if (la != 0U && a[la - 1] == '.') {
-		escaped = 0;
-		/* Note this loop doesn't get executed if la==1. */
-		for (i = la - 2; i >= 0; i--)
-			if (a[i] == '\\') {
-				if (escaped)
-					escaped = 0;
-				else
-					escaped = 1;
-			} else
-				break;
-		if (!escaped)
-			la--;
-	}
-
-	/* Ignore a trailing label separator (i.e. an unescaped dot) in 'b'. */
-	if (lb != 0U && b[lb - 1] == '.') {
-		escaped = 0;
-		/* note this loop doesn't get executed if lb==1 */
-		for (i = lb - 2; i >= 0; i--)
-			if (b[i] == '\\') {
-				if (escaped)
-					escaped = 0;
-				else
-					escaped = 1;
-			} else
-				break;
-		if (!escaped)
-			lb--;
-	}
-
-	/* lb == 0 means 'b' is the root domain, so 'a' must be in 'b'. */
-	if (lb == 0U)
-		return (1);
-
-	/* 'b' longer than 'a' means 'a' can't be in 'b'. */
-	if (lb > la)
-		return (0);
-
-	/* 'a' and 'b' being equal at this point indicates sameness. */
-	if (lb == la)
-		return (strncasecmp(a, b, lb) == 0);
-
-	/* Ok, we know la > lb. */
-
-	diff = la - lb;
-
-	/*
-	 * If 'a' is only 1 character longer than 'b', then it can't be
-	 * a subdomain of 'b' (because of the need for the '.' label
-	 * separator).
-	 */
-	if (diff < 2)
-		return (0);
-
-	/*
-	 * If the character before the last 'lb' characters of 'b'
-	 * isn't '.', then it can't be a match (this lets us avoid
-	 * having "foobar.com" match "bar.com").
-	 */
-	if (a[diff - 1] != '.')
-		return (0);
-
-	/*
-	 * We're not sure about that '.', however.  It could be escaped
-         * and thus not a really a label separator.
-	 */
-	escaped = 0;
-	for (i = diff - 2; i >= 0; i--)
-		if (a[i] == '\\') {
-			if (escaped)
-				escaped = 0;
-			else
-				escaped = 1;
-		} else
-			break;
-	if (escaped)
-		return (0);
-	  
-	/* Now compare aligned trailing substring. */
-	cp = a + diff;
-	return (strncasecmp(cp, b, lb) == 0);
-}
-
-#ifndef _LIBC
-/*%
- *	is "a" a subdomain of "b"?
- */
-int
-ns_subdomain(const char *a, const char *b) {
-	return (ns_samename(a, b) != 1 && ns_samedomain(a, b));
-}
-#endif
-
-/*%
- *	make a canonical copy of domain name "src"
- *
- * notes:
- * \code
- *	foo -> foo.
- *	foo. -> foo.
- *	foo.. -> foo.
- *	foo\. -> foo\..
- *	foo\\. -> foo\\.
- * \endcode
- */
-
-int
-ns_makecanon(const char *src, char *dst, size_t dstsize) {
-	size_t n = strlen(src);
-
-	if (n + sizeof "." > dstsize) {			/*%< Note: sizeof == 2 */
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	strcpy(dst, src);
-	while (n >= 1U && dst[n - 1] == '.')		/*%< Ends in "." */
-		if (n >= 2U && dst[n - 2] == '\\' &&	/*%< Ends in "\." */
-		    (n < 3U || dst[n - 3] != '\\'))	/*%< But not "\\." */
-			break;
-		else
-			dst[--n] = '\0';
-	dst[n++] = '.';
-	dst[n] = '\0';
-	return (0);
-}
-
-/*%
- *	determine whether domain name "a" is the same as domain name "b"
- *
- * return:
- *\li	-1 on error
- *\li	0 if names differ
- *\li	1 if names are the same
- */
-
-int
-ns_samename(const char *a, const char *b) {
-	char ta[NS_MAXDNAME], tb[NS_MAXDNAME];
-
-	if (ns_makecanon(a, ta, sizeof ta) < 0 ||
-	    ns_makecanon(b, tb, sizeof tb) < 0)
-		return (-1);
-	if (strcasecmp(ta, tb) == 0)
-		return (1);
-	else
-		return (0);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/nameser/ns_ttl.c b/lib/libc_bsd/nameser/ns_ttl.c
deleted file mode 100644
index 506eb77..0000000
--- a/lib/libc_bsd/nameser/ns_ttl.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996,1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef lint
-static const char rcsid[] = "$Id: ns_ttl.c,v 1.4 2005/07/28 06:51:49 marka Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/nameser/ns_ttl.c 270838 2014-08-30 10:16:25Z ume $");
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) ((size_t)sprintf x)
-#endif
-
-/* Forward. */
-
-static int	fmt1(int t, char s, char **buf, size_t *buflen);
-
-/* Macros. */
-
-#define T(x) if ((x) < 0) return (-1); else (void)NULL
-
-/* Public. */
-
-int
-ns_format_ttl(u_long src, char *dst, size_t dstlen) {
-	char *odst = dst;
-	int secs, mins, hours, days, weeks, x;
-	char *p;
-
-	secs = src % 60;   src /= 60;
-	mins = src % 60;   src /= 60;
-	hours = src % 24;  src /= 24;
-	days = src % 7;    src /= 7;
-	weeks = src;       src = 0;
-
-	x = 0;
-	if (weeks) {
-		T(fmt1(weeks, 'W', &dst, &dstlen));
-		x++;
-	}
-	if (days) {
-		T(fmt1(days, 'D', &dst, &dstlen));
-		x++;
-	}
-	if (hours) {
-		T(fmt1(hours, 'H', &dst, &dstlen));
-		x++;
-	}
-	if (mins) {
-		T(fmt1(mins, 'M', &dst, &dstlen));
-		x++;
-	}
-	if (secs || !(weeks || days || hours || mins)) {
-		T(fmt1(secs, 'S', &dst, &dstlen));
-		x++;
-	}
-
-	if (x > 1) {
-		int ch;
-
-		for (p = odst; (ch = *p) != '\0'; p++)
-			if (isascii(ch) && isupper(ch))
-				*p = tolower(ch);
-	}
-
-	return (dst - odst);
-}
-
-int
-ns_parse_ttl(const char *src, u_long *dst) {
-	u_long ttl, tmp;
-	int ch, digits, dirty;
-
-	ttl = 0;
-	tmp = 0;
-	digits = 0;
-	dirty = 0;
-	while ((ch = *src++) != '\0') {
-		if (!isascii(ch) || !isprint(ch))
-			goto einval;
-		if (isdigit(ch)) {
-			tmp *= 10;
-			tmp += (ch - '0');
-			digits++;
-			continue;
-		}
-		if (digits == 0)
-			goto einval;
-		if (islower(ch))
-			ch = toupper(ch);
-		switch (ch) {
-		case 'W':  tmp *= 7;
-		case 'D':  tmp *= 24;
-		case 'H':  tmp *= 60;
-		case 'M':  tmp *= 60;
-		case 'S':  break;
-		default:   goto einval;
-		}
-		ttl += tmp;
-		tmp = 0;
-		digits = 0;
-		dirty = 1;
-	}
-	if (digits > 0) {
-		if (dirty)
-			goto einval;
-		else
-			ttl += tmp;
-	} else if (!dirty)
-		goto einval;
-	*dst = ttl;
-	return (0);
-
- einval:
-	errno = EINVAL;
-	return (-1);
-}
-
-/* Private. */
-
-static int
-fmt1(int t, char s, char **buf, size_t *buflen) {
-	char tmp[50];
-	size_t len;
-
-	len = SPRINTF((tmp, "%d%c", t, s));
-	if (len + 1 > *buflen)
-		return (-1);
-	strcpy(*buf, tmp);
-	*buf += len;
-	*buflen -= len;
-	return (0);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/net/Makefile.inc b/lib/libc_bsd/net/Makefile.inc
deleted file mode 100644
index 8dddc77..0000000
--- a/lib/libc_bsd/net/Makefile.inc
+++ /dev/null
@@ -1,129 +0,0 @@
-#	from @(#)Makefile.inc	8.2 (Berkeley) 9/5/93
-Makefile.incl 237402 2012-06-21 15:47:06Z obrien $
-
-# machine-independent net sources
-.PATH: ${.CURDIR}/net
-
-SRCS+=	base64.c ether_addr.c eui64.c \
-	gai_strerror.c getaddrinfo.c \
-	gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
-	getifaddrs.c getifmaddrs.c getnameinfo.c \
-	getnetbydns.c getnetbyht.c getnetbynis.c getnetnamadr.c \
-	getproto.c getprotoent.c getprotoname.c getservent.c \
-	if_indextoname.c if_nameindex.c if_nametoindex.c \
-	ip6opt.c linkaddr.c map_v4v6.c name6.c ntoh.c \
-	nsdispatch.c nslexer.c nsparser.y nss_compat.c \
-	rcmd.c rcmdsh.c recv.c rthdr.c sctp_sys_calls.c send.c \
-        sockatmark.c sourcefilter.c vars.c
-
-.if ${MK_NS_CACHING} != "no"
-SRCS+=	nscache.c nscachedcli.c
-.endif
-
-SYM_MAPS+=${.CURDIR}/net/Symbol.map
-
-.if ${MK_INET6_SUPPORT} != "no"
-CFLAGS+=-DINET6
-.endif
-
-CFLAGS+=-I${.OBJDIR}
-
-# name6.c refers res_private.h
-CFLAGS+=-I${.CURDIR}/resolv
-
-YFLAGS+=-p_nsyy
-LFLAGS+=-P_nsyy
-
-CLEANFILES+=nslexer.c
-
-nslexer.c: nslexer.l nsparser.h
-	${LEX} ${LFLAGS} -o/dev/stdout ${.IMPSRC} | \
-		sed -e '/YY_BUF_SIZE/s/16384/1024/' >${.TARGET}
-
-MAN+=	byteorder.3 ethers.3 eui64.3 \
-	getaddrinfo.3 gai_strerror.3 gethostbyname.3 \
-	getifaddrs.3 getifmaddrs.3 getipnodebyname.3 \
-	getnameinfo.3 getnetent.3 getprotoent.3 getservent.3 \
-	if_indextoname.3 \
-	inet.3 inet_net.3 \
-	inet6_opt_init.3 inet6_option_space.3 inet6_rth_space.3 \
-	inet6_rthdr_space.3 linkaddr.3 \
-	nsdispatch.3 rcmd.3 rcmdsh.3 resolver.3 sockatmark.3 \
-	sourcefilter.3 \
-        sctp_bindx.3 sctp_connectx.3 sctp_freepaddrs.3 \
-        sctp_getaddrlen.3 sctp_getassocid.3 sctp_getpaddrs.3 \
-        sctp_opt_info.3 sctp_recvmsg.3 sctp_send.3 sctp_sendmsg.3 \
-
-MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
-	byteorder.3 ntohs.3
-MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \
-	ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3
-MLINKS+=eui64.3 eui64_aton.3 eui64.3 eui64_hostton.3 \
-	eui64.3 eui64_ntoa.3 eui64.3 eui64_ntohost.3
-MLINKS+=getaddrinfo.3 freeaddrinfo.3 
-MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
-	gethostbyname.3 gethostbyname2.3 gethostbyname.3 gethostent.3 \
-	gethostbyname.3 herror.3 gethostbyname.3 hstrerror.3 \
-	gethostbyname.3 sethostent.3
-MLINKS+=getifaddrs.3 freeifaddrs.3
-MLINKS+=getifmaddrs.3 freeifmaddrs.3
-MLINKS+=getipnodebyname.3 getipnodebyaddr.3 getipnodebyname.3 freehostent.3
-MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
-	getnetent.3 getnetbyname.3 getnetent.3 setnetent.3
-MLINKS+=getprotoent.3 endprotoent.3 getprotoent.3 getprotobyname.3 \
-	getprotoent.3 getprotobynumber.3 getprotoent.3 setprotoent.3
-MLINKS+=getservent.3 endservent.3 getservent.3 getservbyname.3 \
-	getservent.3 getservbyport.3 getservent.3 setservent.3
-MLINKS+=if_indextoname.3 if_nametoindex.3 if_indextoname.3 if_nameindex.3 \
-	if_indextoname.3 if_freenameindex.3
-MLINKS+=inet.3 addr.3 inet.3 inet_addr.3 inet.3 inet_aton.3 \
-	inet.3 inet_lnaof.3 inet.3 inet_makeaddr.3 inet.3 inet_netof.3 \
-	inet.3 inet_network.3 inet.3 inet_ntoa.3 inet.3 inet_ntoa_r.3\
-	inet.3 inet_ntop.3 inet.3 inet_pton.3 \
-	inet.3 network.3 inet.3 ntoa.3 
-MLINKS+= sctp_send.3 sctp_sendx.3
-MLINKS+= sctp_sendmsg.3 sctp_sendmsgx.3
-MLINKS+= sctp_freepaddrs.3 sctp_freeladdrs.3
-MLINKS+= sctp_getpaddrs.3 sctp_getladdrs.3
-MLINKS+=inet_net.3 inet_net_ntop.3 inet_net.3 inet_net_pton.3
-MLINKS+=inet6_opt_init.3 inet6_opt_append.3 \
-	inet6_opt_init.3 inet6_opt_find.3 \
-	inet6_opt_init.3 inet6_opt_finish.3 \
-	inet6_opt_init.3 inet6_opt_get_val.3 \
-	inet6_opt_init.3 inet6_opt_next.3 \
-	inet6_opt_init.3 inet6_opt_set_val.3 \
-	inet6_option_space.3 inet6_option_alloc.3 \
-	inet6_option_space.3 inet6_option_append.3 \
-	inet6_option_space.3 inet6_option_find.3 \
-	inet6_option_space.3 inet6_option_init.3 \
-	inet6_option_space.3 inet6_option_next.3 \
-	inet6_rth_space.3 inet6_rth_add.3 \
-	inet6_rth_space.3 inet6_rth_getaddr.3 \
-	inet6_rth_space.3 inet6_rth_init.3 \
-	inet6_rth_space.3 inet6_rth_reverse.3 \
-	inet6_rth_space.3 inet6_rth_segments.3 \
-	inet6_rthdr_space.3 inet6_rthdr_add.3 \
-	inet6_rthdr_space.3 inet6_rthdr_getaddr.3 \
-	inet6_rthdr_space.3 inet6_rthdr_getflags.3 \
-	inet6_rthdr_space.3 inet6_rthdr_init.3 \
-	inet6_rthdr_space.3 inet6_rthdr_lasthop.3 \
-	inet6_rthdr_space.3 inet6_rthdr_reverse.3 \
-	inet6_rthdr_space.3 inet6_rthdr_segments.3
-MLINKS+=linkaddr.3 link_addr.3 linkaddr.3 link_ntoa.3 
-MLINKS+=rcmd.3 iruserok.3 rcmd.3 iruserok_sa.3 \
-	rcmd.3 rcmd_af.3 \
-	rcmd.3 rresvport.3 rcmd.3 rresvport_af.3 \
-	rcmd.3 ruserok.3
-MLINKS+=resolver.3 dn_comp.3 resolver.3 dn_expand.3 resolver.3 res_init.3 \
-	resolver.3 res_mkquery.3 resolver.3 res_query.3 \
-	resolver.3 res_search.3 resolver.3 res_send.3 resolver.3 dn_skipname.3 \
-	resolver.3 ns_get16.3 resolver.3 ns_get32.3 \
-	resolver.3 ns_put16.3 resolver.3 ns_put32.3
-MLINKS+=sourcefilter.3 setipv4sourcefilter.3 sourcefilter.3 getipv4sourcefilter.3 \
-	sourcefilter.3 setsourcefilter.3 sourcefilter.3 getsourcefilter.3
-
-.if ${MK_HESIOD} != "no"
-SRCS+=	hesiod.c 
-MAN+=	hesiod.3
-.endif
-
diff --git a/lib/libc_bsd/net/Symbol.map b/lib/libc_bsd/net/Symbol.map
deleted file mode 100644
index 427df44..0000000
--- a/lib/libc_bsd/net/Symbol.map
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/net/Symbol.map 283737 2015-05-29 13:28:24Z tuexen $
- */
-
-FBSD_1.0 {
-	__b64_ntop;
-	__b64_pton;
-	ether_line;
-	ether_aton;
-	ether_aton_r;
-	ether_ntoa;
-	ether_ntoa_r;
-	ether_ntohost;
-	ether_hostton;
-	eui64_aton;
-	eui64_ntoa;
-	eui64_ntohost;
-	eui64_hostton;
-	gai_strerror;
-	freeaddrinfo;
-	getaddrinfo;
-	gethostent;
-	gethostent_r;
-	gethostbyname;
-	gethostbyname_r;
-	gethostbyname2;
-	gethostbyname2_r;
-	gethostbyaddr;
-	gethostbyaddr_r;
-	sethostent;
-	endhostent;
-	getifaddrs;
-	freeifaddrs;
-	getifmaddrs;
-	freeifmaddrs;
-	getnameinfo;
-	getnetent;
-	getnetent_r;
-	getnetbyname;
-	getnetbyname_r;
-	getnetbyaddr;
-	getnetbyaddr_r;
-	setnetent;
-	endnetent;
-	getprotobynumber;
-	getprotobynumber_r;
-	setprotoent;
-	endprotoent;
-	getprotoent;
-	getprotoent_r;
-	getprotobyname;
-	getprotobyname_r;
-	getservbyname;
-	getservbyname_r;
-	getservbyport;
-	getservbyport_r;
-	setservent;
-	endservent;
-	getservent;
-	getservent_r;
-	hesiod_init;
-	hesiod_end;
-	hesiod_to_bind;
-	hesiod_resolve;
-	hesiod_free_list;
-	hes_init;
-	hes_to_bind;
-	hes_resolve;
-	hes_error;
-	hes_free;
-	if_indextoname;
-	if_nameindex;
-	if_freenameindex;
-	if_nametoindex;
-	inet6_option_space;
-	inet6_option_init;
-	inet6_option_append;
-	inet6_option_alloc;
-	inet6_option_next;
-	inet6_option_find;
-	inet6_opt_init;
-	inet6_opt_append;
-	inet6_opt_finish;
-	inet6_opt_set_val;
-	inet6_opt_next;
-	inet6_opt_find;
-	inet6_opt_get_val;
-	link_addr;
-	link_ntoa;
-	getipnodebyname;
-	getipnodebyaddr;
-	freehostent;
-	__nsdefaultsrc;
-	_nsdbtaddsrc;
-	_nsdbtdump;
-	_nsdbtput;
-	nsdispatch;
-	rcmd;
-	rcmd_af;
-	rresvport;
-	rresvport_af;
-	ruserok;
-	iruserok;
-	iruserok_sa;
-	rcmdsh;
-	recv;
-	inet6_rthdr_space;
-	inet6_rthdr_init;
-	inet6_rthdr_add;
-	inet6_rthdr_lasthop;
-	inet6_rthdr_segments;
-	inet6_rthdr_getaddr;
-	inet6_rthdr_getflags;
-	inet6_rth_space;
-	inet6_rth_init;
-	inet6_rth_add;
-	inet6_rth_reverse;
-	inet6_rth_segments;
-	inet6_rth_getaddr;
-	send;
-	sockatmark;
-	in6addr_any;
-	in6addr_loopback;
-	in6addr_nodelocal_allnodes;
-	in6addr_linklocal_allnodes;
-	sctp_getaddrlen;
-	sctp_getassocid;
-	sctp_bindx;
-	sctp_connectx;
-	sctp_peeloff;
-	sctp_opt_info;
-	sctp_getpaddrs;
-	sctp_freepaddrs;
-	sctp_getladdrs;
-	sctp_freeladdrs;
-	sctp_sendmsg;
-	sctp_sendmsgx;
-	sctp_send;
-	sctp_sendx;
-	sctp_recvmsg;
-	setipv4sourcefilter;
-	getipv4sourcefilter;
-	getsourcefilter;
-	setsourcefilter;
-};
-
-FBSD_1.3 {
-	sctp_recvv;
-	sctp_sendv;
-};
-
-FBSDprivate_1.0 {
-	_nsdispatch;
-	_nsyyerror;	/* generated from nslexer.l */
-	_nsyylex;	/* generated from nslexer.l */
-	_nsyyparse;	/* generated from nsparser.y */
-	_nsyylineno;	/* generated from nsparser.y */
-	__dns_getanswer;
-	__ivaliduser;
-	__ivaliduser_af;
-	__ivaliduser_sa;
-	__check_rhosts_file;
-	__rcmd_errstr;
-	__nss_compat_getgrnam_r;
-	__nss_compat_getgrgid_r;
-	__nss_compat_getgrent_r;
-	__nss_compat_setgrent;
-	__nss_compat_endgrent;
-	__nss_compat_getpwnam_r;
-	__nss_compat_getpwuid_r;
-	__nss_compat_getpwent_r;
-	__nss_compat_setpwent;
-	__nss_compat_endpwent;
-};
diff --git a/lib/libc_bsd/net/base64.c b/lib/libc_bsd/net/base64.c
deleted file mode 100644
index cc20422..0000000
--- a/lib/libc_bsd/net/base64.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 1996, 1998 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/base64.c 280399 2015-03-23 20:51:35Z emaste $");
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define Assert(Cond) if (!(Cond)) abort()
-
-static const char Base64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char Pad64 = '=';
-
-/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
-   The following encoding technique is taken from RFC 1521 by Borenstein
-   and Freed.  It is reproduced here in a slightly edited form for
-   convenience.
-
-   A 65-character subset of US-ASCII is used, enabling 6 bits to be
-   represented per printable character. (The extra 65th character, "=",
-   is used to signify a special processing function.)
-
-   The encoding process represents 24-bit groups of input bits as output
-   strings of 4 encoded characters. Proceeding from left to right, a
-   24-bit input group is formed by concatenating 3 8-bit input groups.
-   These 24 bits are then treated as 4 concatenated 6-bit groups, each
-   of which is translated into a single digit in the base64 alphabet.
-
-   Each 6-bit group is used as an index into an array of 64 printable
-   characters. The character referenced by the index is placed in the
-   output string.
-
-                         Table 1: The Base64 Alphabet
-
-      Value Encoding  Value Encoding  Value Encoding  Value Encoding
-          0 A            17 R            34 i            51 z
-          1 B            18 S            35 j            52 0
-          2 C            19 T            36 k            53 1
-          3 D            20 U            37 l            54 2
-          4 E            21 V            38 m            55 3
-          5 F            22 W            39 n            56 4
-          6 G            23 X            40 o            57 5
-          7 H            24 Y            41 p            58 6
-          8 I            25 Z            42 q            59 7
-          9 J            26 a            43 r            60 8
-         10 K            27 b            44 s            61 9
-         11 L            28 c            45 t            62 +
-         12 M            29 d            46 u            63 /
-         13 N            30 e            47 v
-         14 O            31 f            48 w         (pad) =
-         15 P            32 g            49 x
-         16 Q            33 h            50 y
-
-   Special processing is performed if fewer than 24 bits are available
-   at the end of the data being encoded.  A full encoding quantum is
-   always completed at the end of a quantity.  When fewer than 24 input
-   bits are available in an input group, zero bits are added (on the
-   right) to form an integral number of 6-bit groups.  Padding at the
-   end of the data is performed using the '=' character.
-
-   Since all base64 input is an integral number of octets, only the
-         -------------------------------------------------                       
-   following cases can arise:
-   
-       (1) the final quantum of encoding input is an integral
-           multiple of 24 bits; here, the final unit of encoded
-	   output will be an integral multiple of 4 characters
-	   with no "=" padding,
-       (2) the final quantum of encoding input is exactly 8 bits;
-           here, the final unit of encoded output will be two
-	   characters followed by two "=" padding characters, or
-       (3) the final quantum of encoding input is exactly 16 bits;
-           here, the final unit of encoded output will be three
-	   characters followed by one "=" padding character.
-   */
-
-int
-b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) {
-	size_t datalength = 0;
-	u_char input[3];
-	u_char output[4];
-	size_t i;
-
-	while (2 < srclength) {
-		input[0] = *src++;
-		input[1] = *src++;
-		input[2] = *src++;
-		srclength -= 3;
-
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		output[3] = input[2] & 0x3f;
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-		Assert(output[3] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		target[datalength++] = Base64[output[2]];
-		target[datalength++] = Base64[output[3]];
-	}
-    
-	/* Now we worry about padding. */
-	if (0 != srclength) {
-		/* Get what's left. */
-		input[0] = input[1] = input[2] = '\0';
-		for (i = 0; i < srclength; i++)
-			input[i] = *src++;
-	
-		output[0] = input[0] >> 2;
-		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
-		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-		Assert(output[0] < 64);
-		Assert(output[1] < 64);
-		Assert(output[2] < 64);
-
-		if (datalength + 4 > targsize)
-			return (-1);
-		target[datalength++] = Base64[output[0]];
-		target[datalength++] = Base64[output[1]];
-		if (srclength == 1)
-			target[datalength++] = Pad64;
-		else
-			target[datalength++] = Base64[output[2]];
-		target[datalength++] = Pad64;
-	}
-	if (datalength >= targsize)
-		return (-1);
-	target[datalength] = '\0';	/* Returned value doesn't count \0. */
-	return (datalength);
-}
-
-/* skips all whitespace anywhere.
-   converts characters, four at a time, starting at (or after)
-   src from base - 64 numbers into three 8 bit bytes in the target area.
-   it returns the number of data bytes stored at the target, or -1 on error.
- */
-
-int
-b64_pton(const char *src, u_char *target, size_t targsize)
-{
-	int tarindex, state, ch;
-	u_char nextbyte;
-	char *pos;
-
-	state = 0;
-	tarindex = 0;
-
-	while ((ch = *src++) != '\0') {
-		if (isspace((unsigned char)ch))        /* Skip whitespace anywhere. */
-			continue;
-
-		if (ch == Pad64)
-			break;
-
-		pos = strchr(Base64, ch);
-		if (pos == 0) 		/* A non-base64 character. */
-			return (-1);
-
-		switch (state) {
-		case 0:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] = (pos - Base64) << 2;
-			}
-			state = 1;
-			break;
-		case 1:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 4;
-				nextbyte = ((pos - Base64) & 0x0f) << 4;
-				if ((size_t)tarindex + 1 < targsize)
-					target[tarindex + 1] = nextbyte;
-				else if (nextbyte)
-					return (-1);
-			}
-			tarindex++;
-			state = 2;
-			break;
-		case 2:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex]   |=  (pos - Base64) >> 2;
-				nextbyte = ((pos - Base64) & 0x03) << 6;
-				if ((size_t)tarindex + 1 < targsize)
-					target[tarindex + 1] = nextbyte;
-				else if (nextbyte)
-					return (-1);
-			}
-			tarindex++;
-			state = 3;
-			break;
-		case 3:
-			if (target) {
-				if ((size_t)tarindex >= targsize)
-					return (-1);
-				target[tarindex] |= (pos - Base64);
-			}
-			tarindex++;
-			state = 0;
-			break;
-		default:
-			abort();
-		}
-	}
-
-	/*
-	 * We are done decoding Base-64 chars.  Let's see if we ended
-	 * on a byte boundary, and/or with erroneous trailing characters.
-	 */
-
-	if (ch == Pad64) {		/* We got a pad char. */
-		ch = *src++;		/* Skip it, get next. */
-		switch (state) {
-		case 0:		/* Invalid = in first position */
-		case 1:		/* Invalid = in second position */
-			return (-1);
-
-		case 2:		/* Valid, means one byte of info */
-			/* Skip any number of spaces. */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace((unsigned char)ch))
-					break;
-			/* Make sure there is another trailing = sign. */
-			if (ch != Pad64)
-				return (-1);
-			ch = *src++;		/* Skip the = */
-			/* Fall through to "single trailing =" case. */
-			/* FALLTHROUGH */
-
-		case 3:		/* Valid, means two bytes of info */
-			/*
-			 * We know this char is an =.  Is there anything but
-			 * whitespace after it?
-			 */
-			for ((void)NULL; ch != '\0'; ch = *src++)
-				if (!isspace((unsigned char)ch))
-					return (-1);
-
-			/*
-			 * Now make sure for cases 2 and 3 that the "extra"
-			 * bits that slopped past the last full byte were
-			 * zeros.  If we don't check them, they become a
-			 * subliminal channel.
-			 */
-			if (target && (size_t)tarindex < targsize &&
-			    target[tarindex] != 0)
-				return (-1);
-		}
-	} else {
-		/*
-		 * We ended by seeing the end of the string.  Make sure we
-		 * have no partial bytes lying around.
-		 */
-		if (state != 0)
-			return (-1);
-	}
-
-	return (tarindex);
-}
diff --git a/lib/libc_bsd/net/byteorder.3 b/lib/libc_bsd/net/byteorder.3
deleted file mode 100644
index 5f8335b..0000000
--- a/lib/libc_bsd/net/byteorder.3
+++ /dev/null
@@ -1,86 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)byteorder.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/net/byteorder.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd March 20, 2005
-.Dt BYTEORDER 3
-.Os
-.Sh NAME
-.Nm htonl ,
-.Nm htons ,
-.Nm ntohl ,
-.Nm ntohs
-.Nd convert values between host and network byte order
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In arpa/inet.h
-.Pp
-or
-.Pp
-.In netinet/in.h
-.Ft uint32_t
-.Fn htonl "uint32_t hostlong"
-.Ft uint16_t
-.Fn htons "uint16_t hostshort"
-.Ft uint32_t
-.Fn ntohl "uint32_t netlong"
-.Ft uint16_t
-.Fn ntohs "uint16_t netshort"
-.Sh DESCRIPTION
-These routines convert 16 and 32 bit quantities between network
-byte order and host byte order.
-On machines which have a byte order which is the same as the network
-order, routines are defined as null macros.
-.Pp
-These routines are most often used in conjunction with Internet
-addresses and ports as returned by
-.Xr gethostbyname 3
-and
-.Xr getservent 3 .
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr getservent 3 ,
-.Xr byteorder 9
-.Sh STANDARDS
-The
-.Nm byteorder
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Nm byteorder
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-On the
-.Tn VAX
-bytes are handled backwards from most everyone else in
-the world.
-This is not expected to be fixed in the near future.
diff --git a/lib/libc_bsd/net/ether_addr.c b/lib/libc_bsd/net/ether_addr.c
deleted file mode 100644
index 1a0cb98..0000000
--- a/lib/libc_bsd/net/ether_addr.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (c) 1995 Bill Paul <wpaul@ctr.columbia.edu>.
- * Copyright (c) 2007 Robert N. M. Watson
- * 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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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.
- *
- * ethernet address conversion and lookup routines
- *
- * Written by Bill Paul <wpaul@ctr.columbia.edu>
- * Center for Telecommunications Research
- * Columbia University, New York City
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/ether_addr.c 264592 2014-04-17 11:49:19Z jmmv $");
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <net/ethernet.h>
-
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#include <paths.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef _PATH_ETHERS
-#define	_PATH_ETHERS	"/etc/ethers"
-#endif
-
-/*
- * Parse a string of text containing an ethernet address and hostname and
- * separate it into its component parts.
- */
-int
-ether_line(const char *l, struct ether_addr *e, char *hostname)
-{
-	int i, o[6];
-
-	i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3],
-	    &o[4], &o[5], hostname);
-	if (i == 7) {
-		for (i = 0; i < 6; i++)
-			e->octet[i] = o[i];
-		return (0);
-	} else {
-		return (-1);
-	}
-}
-
-/*
- * Convert an ASCII representation of an ethernet address to binary form.
- */
-struct ether_addr *
-ether_aton_r(const char *a, struct ether_addr *e)
-{
-	int i;
-	unsigned int o0, o1, o2, o3, o4, o5;
-
-	i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5);
-	if (i != 6)
-		return (NULL);
-	e->octet[0]=o0;
-	e->octet[1]=o1;
-	e->octet[2]=o2;
-	e->octet[3]=o3;
-	e->octet[4]=o4;
-	e->octet[5]=o5;
-	return (e);
-}
-
-struct ether_addr *
-ether_aton(const char *a)
-{
-	static struct ether_addr e;
-
-	return (ether_aton_r(a, &e));
-}
-
-/*
- * Convert a binary representation of an ethernet address to an ASCII string.
- */
-char *
-ether_ntoa_r(const struct ether_addr *n, char *a)
-{
-	int i;
-
-	i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->octet[0],
-	    n->octet[1], n->octet[2], n->octet[3], n->octet[4], n->octet[5]);
-	if (i < 17)
-		return (NULL);
-	return (a);
-}
-
-char *
-ether_ntoa(const struct ether_addr *n)
-{
-	static char a[18];
-
-	return (ether_ntoa_r(n, a));
-}
-
-/*
- * Map an ethernet address to a hostname. Use either /etc/ethers or NIS/YP.
- */
-int
-ether_ntohost(char *hostname, const struct ether_addr *e)
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *ether_a;
-	char *yp_domain;
-#endif
-
-	if ((fp = fopen(_PATH_ETHERS, "re")) == NULL)
-		return (1);
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			ether_a = ether_ntoa(e);
-			if (yp_match(yp_domain, "ethers.byaddr", ether_a,
-			    strlen(ether_a), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!bcmp((char *)&local_ether.octet[0],
-			    (char *)&e->octet[0], 6)) {
-				/* We have a match. */
-				strcpy(hostname, local_host);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
-
-/*
- * Map a hostname to an ethernet address using /etc/ethers or NIS/YP.
- */
-int
-ether_hostton(const char *hostname, struct ether_addr *e)
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct ether_addr local_ether;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *yp_domain;
-#endif
-
-	if ((fp = fopen(_PATH_ETHERS, "re")) == NULL)
-		return (1);
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			if (yp_match(yp_domain, "ethers.byname", hostname,
-			    strlen(hostname), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (!ether_line(buf, &local_ether, local_host)) {
-			if (!strcmp(hostname, local_host)) {
-				/* We have a match. */
-				bcopy((char *)&local_ether.octet[0],
-				    (char *)&e->octet[0], 6);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
diff --git a/lib/libc_bsd/net/ethers.3 b/lib/libc_bsd/net/ethers.3
deleted file mode 100644
index 724b7d6..0000000
--- a/lib/libc_bsd/net/ethers.3
+++ /dev/null
@@ -1,233 +0,0 @@
-.\" Copyright (c) 1995 Bill Paul <wpaul@ctr.columbia.edu>.
-.\" Copyright (c) 2007 Robert N. M. Watson
-.\" 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 Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/ethers.3 224701 2011-08-08 03:09:03Z hrs $
-.\"
-.Dd October 30, 2007
-.Dt ETHERS 3
-.Os
-.Sh NAME
-.Nm ethers ,
-.Nm ether_line ,
-.Nm ether_aton ,
-.Nm ether_aton_r ,
-.Nm ether_ntoa ,
-.Nm ether_ntoa_r ,
-.Nm ether_ntohost ,
-.Nm ether_hostton
-.Nd Ethernet address conversion and lookup routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/ethernet.h
-.Ft int
-.Fn ether_line "const char *l" "struct ether_addr *e" "char *hostname"
-.Ft struct ether_addr *
-.Fn ether_aton "const char *a"
-.Ft struct ether_addr *
-.Fn ether_aton_r "const char *a" "struct ether_addr *e"
-.Ft char *
-.Fn ether_ntoa "const struct ether_addr *n"
-.Ft char *
-.Fn ether_ntoa_r "const struct ether_addr *n" "char *buf"
-.Ft int
-.Fn ether_ntohost "char *hostname" "const struct ether_addr *e"
-.Ft int
-.Fn ether_hostton "const char *hostname" "struct ether_addr *e"
-.Sh DESCRIPTION
-These functions operate on ethernet addresses using an
-.Vt ether_addr
-structure, which is defined in the header file
-.In net/ethernet.h :
-.Bd -literal -offset indent
-/*
- * The number of bytes in an ethernet (MAC) address.
- */
-#define ETHER_ADDR_LEN		6
-
-/*
- * Structure of a 48-bit Ethernet address.
- */
-struct  ether_addr {
-        u_char octet[ETHER_ADDR_LEN];
-};
-.Ed
-.Pp
-The function
-.Fn ether_line
-scans
-.Fa l ,
-an
-.Tn ASCII
-string in
-.Xr ethers 5
-format and sets
-.Fa e
-to the ethernet address specified in the string and
-.Fa h
-to the hostname.
-This function is used to parse lines from
-.Pa /etc/ethers
-into their component parts.
-.Pp
-The
-.Fn ether_aton
-and
-.Fn ether_aton_r
-functions convert
-.Tn ASCII
-representation of ethernet addresses into
-.Vt ether_addr
-structures.
-Likewise, the
-.Fn ether_ntoa
-and
-.Fn ether_ntoa_r
-functions
-convert ethernet addresses specified as
-.Vt ether_addr
-structures into
-.Tn ASCII
-strings.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions map ethernet addresses to their corresponding hostnames
-as specified in the
-.Pa /etc/ethers
-database.
-The
-.Fn ether_ntohost
-function
-converts from ethernet address to hostname, and
-.Fn ether_hostton
-converts from hostname to ethernet address.
-.Sh RETURN VALUES
-The
-.Fn ether_line
-function
-returns zero on success and non-zero if it was unable to parse
-any part of the supplied line
-.Fa l .
-It returns the extracted ethernet address in the supplied
-.Vt ether_addr
-structure
-.Fa e
-and the hostname in the supplied string
-.Fa h .
-.Pp
-On success,
-.Fn ether_ntoa
-and
-.Fn ether_ntoa_r
-functions return a pointer to a string containing an
-.Tn ASCII
-representation of an ethernet address.
-If it is unable to convert
-the supplied
-.Vt ether_addr
-structure, it returns a
-.Dv NULL
-pointer.
-.Fn ether_ntoa
-stores the result in a static buffer;
-.Fn ether_ntoa_r
-stores the result in a user-passed buffer.
-.Pp
-Likewise,
-.Fn ether_aton
-and
-.Fn ether_aton_r
-return a pointer to an
-.Vt ether_addr
-structure on success and a
-.Dv NULL
-pointer on failure.
-.Fn ether_aton
-stores the result in a static buffer;
-.Fn ether_aton_r
-stores the result in a user-passed buffer.
-.Pp
-The
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions both return zero on success or non-zero if they were
-unable to find a match in the
-.Pa /etc/ethers
-database.
-.Sh NOTES
-The user must ensure that the hostname strings passed to the
-.Fn ether_line ,
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions are large enough to contain the returned hostnames.
-.Sh NIS INTERACTION
-If the
-.Pa /etc/ethers
-contains a line with a single + in it, the
-.Fn ether_ntohost
-and
-.Fn ether_hostton
-functions will attempt to consult the NIS
-.Pa ethers.byname
-and
-.Pa ethers.byaddr
-maps in addition to the data in the
-.Pa /etc/ethers
-file.
-.Sh SEE ALSO
-.Xr ethers 5 ,
-.Xr yp 8
-.Sh HISTORY
-This particular implementation of the
-.Nm
-library functions were written for and first appeared in
-.Fx 2.1 .
-Thread-safe function variants first appeared in
-.Fx 7.0 .
-.Sh BUGS
-The
-.Fn ether_aton
-and
-.Fn ether_ntoa
-functions returns values that are stored in static memory areas
-which may be overwritten the next time they are called.
-.Pp
-.Fn ether_ntoa_r
-accepts a character buffer pointer, but not a buffer length.
-The caller must ensure adequate space is available in the buffer in order to
-avoid a buffer overflow.
diff --git a/lib/libc_bsd/net/eui64.3 b/lib/libc_bsd/net/eui64.3
deleted file mode 100644
index be9b8a0..0000000
--- a/lib/libc_bsd/net/eui64.3
+++ /dev/null
@@ -1,223 +0,0 @@
-.\" Copyright 2004 The Aerospace Corporation.  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 Aerospace Corporation may not be used to endorse or
-.\"     promote products derived from this software.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "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 AEROSPACE CORPORATION 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.
-.\"
-.\" Copyright (c) 1995
-.\"	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
-.\" 4. Neither the name of the author nor the names of any co-contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bill Paul 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/eui64.3 231196 2012-02-08 11:30:13Z brooks $
-.\"
-.Dd March 4, 2004
-.Dt EUI64 3
-.Os
-.Sh NAME
-.Nm eui64 ,
-.\" .Nm eui64_line ,
-.Nm eui64_aton ,
-.Nm eui64_ntoa ,
-.Nm eui64_ntohost ,
-.Nm eui64_hostton
-.Nd IEEE EUI-64 conversion and lookup routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/eui64.h
-.\" .Ft int
-.\" .Fn eui64_line "const char *l" "struct eui64 *e" "char *hostname" "size_t len"
-.Ft int
-.Fn eui64_aton "const char *a" "struct eui64 *e"
-.Ft int
-.Fn eui64_ntoa "const struct eui64 *id" "char *a" "size_t len"
-.Ft int
-.Fn eui64_ntohost "char *hostname" "size_t len" "const struct eui64 *id"
-.Ft int
-.Fn eui64_hostton "const char *hostname" "struct eui64 *id"
-.Sh DESCRIPTION
-These functions operate on IEEE EUI-64s using an
-.Vt eui64
-structure, which is defined in the header file
-.In sys/eui64.h :
-.Bd -literal -offset indent
-/*
- * The number of bytes in an EUI-64.
- */
-#define EUI64_LEN		8
-
-/*
- * Structure of an IEEE EUI-64.
- */
-struct  eui64 {
-        u_char octet[EUI64_LEN];
-};
-.Ed
-.\" .Pp
-.\" The function
-.\" .Fn eui64_line
-.\" scans
-.\" .Fa l ,
-.\" an
-.\" .Tn ASCII
-.\" string in
-.\" .Xr eui64 5
-.\" format and sets
-.\" .Fa e
-.\" to the EUI-64 specified in the string and
-.\" .Fa h
-.\" to the hostname.
-.\" This function is used to parse lines from
-.\" .Pa /etc/eui64
-.\" into their component parts.
-.Pp
-The
-.Fn eui64_aton
-function converts an
-.Tn ASCII
-representation of an EUI-64 into an
-.Vt eui64
-structure.
-Likewise,
-.Fn eui64_ntoa
-converts an EUI-64 specified as an
-.Vt eui64
-structure into an
-.Tn ASCII
-string.
-.Pp
-The
-.Fn eui64_ntohost
-and
-.Fn eui64_hostton
-functions map EUI-64s to their corresponding hostnames
-as specified in the
-.Pa /etc/eui64
-database.
-The
-.Fn eui64_ntohost
-function
-converts from EUI-64 to hostname, and
-.Fn eui64_hostton
-converts from hostname to EUI-64.
-.Sh RETURN VALUES
-.\" The
-.\" .Fn eui64_line
-.\" function
-.\" returns zero on success and non-zero if it was unable to parse
-.\" any part of the supplied line
-.\" .Fa l .
-.\" It returns the extracted EUI-64 in the supplied
-.\" .Vt eui64
-.\" structure
-.\" .Fa e
-.\" and the hostname in the supplied string
-.\" .Fa h .
-.\" .Pp
-On success,
-.Fn eui64_ntoa
-returns a pointer to a string containing an
-.Tn ASCII
-representation of an EUI-64.
-If it is unable to convert
-the supplied
-.Vt eui64
-structure, it returns a
-.Dv NULL
-pointer.
-Likewise,
-.Fn eui64_aton
-returns a pointer to an
-.Vt eui64
-structure on success and a
-.Dv NULL
-pointer on failure.
-.Pp
-The
-.Fn eui64_ntohost
-and
-.Fn eui64_hostton
-functions both return zero on success or non-zero if they were
-unable to find a match in the
-.Pa /etc/eui64
-database.
-.Sh NOTES
-The user must ensure that the hostname strings passed to the
-.\" .Fn eui64_line ,
-.Fn eui64_ntohost
-and
-.Fn eui64_hostton
-functions are large enough to contain the returned hostnames.
-.Sh NIS INTERACTION
-If the
-.Pa /etc/eui64
-contains a line with a single
-.Ql +
-in it, the
-.Fn eui64_ntohost
-and
-.Fn eui64_hostton
-functions will attempt to consult the NIS
-.Pa eui64.byname
-and
-.Pa eui64.byid
-maps in addition to the data in the
-.Pa /etc/eui64
-file.
-.Sh SEE ALSO
-.Xr firewire 4 ,
-.Xr eui64 5 ,
-.Xr yp 8
-.Sh HISTORY
-These functions first appears in
-.Fx 5.3 .
-They are derived from the
-.Xr ethers 3
-family of functions.
diff --git a/lib/libc_bsd/net/eui64.c b/lib/libc_bsd/net/eui64.c
deleted file mode 100644
index 50f3748..0000000
--- a/lib/libc_bsd/net/eui64.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright 2004 The Aerospace Corporation.  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 Aerospace Corporation may not be used to endorse or
- *     promote products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AEROSPACE CORPORATION "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 AEROSPACE CORPORATION 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.
- *
- * Copyright (c) 1995
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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.
- *
- * EUI-64 conversion and lookup routines
- *
- *
- * Converted from ether_addr.c rev
- * FreeBSD: src/lib/libc/net/eui64.c,v 1.15 2002/04/08 07:51:10 ru Exp
- * by Brooks Davis
- *
- * Written by Bill Paul <wpaul@ctr.columbia.edu>
- * Center for Telecommunications Research
- * Columbia University, New York City
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/eui64.c 254700 2013-08-23 13:59:47Z jilles $");
-
-#include <stdio.h>
-#include <paths.h>
-#include <sys/types.h>
-#include <sys/eui64.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/param.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-
-#ifndef _PATH_EUI64
-#define _PATH_EUI64 "/etc/eui64"
-#endif
-
-static int eui64_line(const char *l, struct eui64 *e, char *hostname,
-    size_t len);
-
-/*
- * Parse a string of text containing an EUI-64 and hostname
- * and separate it into its component parts.
- */
-static int
-eui64_line(const char *l, struct eui64 *e, char *hostname, size_t len)
-{
-	char *line, *linehead, *cur;
-
-	linehead = strdup(l);
-	if (linehead == NULL)
-		return (-1);
-	line = linehead;
-
-	/* Find and parse the EUI64 */
-	while ((cur = strsep(&line, " \t\r\n")) != NULL) {
-		if (*cur != '\0') {
-			if (eui64_aton(cur, e) == 0)
-				break;
-			else
-				goto bad;
-		}
-	}
-
-	/* Find the hostname */
-	while ((cur = strsep(&line, " \t\r\n")) != NULL) {
-		if (*cur != '\0') {
-			if (strlcpy(hostname, cur, len) <= len)
-				break;
-			else
-				goto bad;
-		}
-	}
-
-	/* Make sure what remains is either whitespace or a comment */
-	while ((cur = strsep(&line, " \t\r\n")) != NULL) {
-		if (*cur == '#')
-			break;
-		if (*cur != '\0')
-			goto bad;
-	}
-
-	return (0);
-
-bad:
-	free(linehead);
-	return (-1);
-}
-
-/*
- * Convert an ASCII representation of an EUI-64 to binary form.
- */
-int
-eui64_aton(const char *a, struct eui64 *e)
-{
-	int i;
-	unsigned int o0, o1, o2, o3, o4, o5, o6, o7;
-
-	/* canonical form */
-	i = sscanf(a, "%x-%x-%x-%x-%x-%x-%x-%x",
-	    &o0, &o1, &o2, &o3, &o4, &o5, &o6, &o7);
-	if (i == EUI64_LEN)
-		goto good;
-	/* ethernet form */
-	i = sscanf(a, "%x:%x:%x:%x:%x:%x:%x:%x",
-	    &o0, &o1, &o2, &o3, &o4, &o5, &o6, &o7);
-	if (i == EUI64_LEN)
-		goto good;
-	/* classic fwcontrol/dconschat form */
-	i = sscanf(a, "0x%2x%2x%2x%2x%2x%2x%2x%2x",
-	    &o0, &o1, &o2, &o3, &o4, &o5, &o6, &o7);
-	if (i == EUI64_LEN)
-		goto good;
-	/* MAC format (-) */
-	i = sscanf(a, "%x-%x-%x-%x-%x-%x",
-	    &o0, &o1, &o2, &o5, &o6, &o7);
-	if (i == 6) {
-		o3 = 0xff;
-		o4 = 0xfe;
-		goto good;
-	}
-	/* MAC format (:) */
-	i = sscanf(a, "%x:%x:%x:%x:%x:%x",
-	    &o0, &o1, &o2, &o5, &o6, &o7);
-	if (i == 6) {
-		o3 = 0xff;
-		o4 = 0xfe;
-		goto good;
-	}
-
-	return (-1);
-
-good:
-        e->octet[0]=o0;
-	e->octet[1]=o1;
-	e->octet[2]=o2;
-	e->octet[3]=o3;
-	e->octet[4]=o4;
-	e->octet[5]=o5;
-	e->octet[6]=o6;
-	e->octet[7]=o7;
-
-        return (0);
-}
-
-/*
- * Convert a binary representation of an EUI-64 to an ASCII string.
- */
-int
-eui64_ntoa(const struct eui64 *id, char *a, size_t len)
-{
-        int i;
-
-        i = snprintf(a, len, "%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x",
-	    id->octet[0], id->octet[1], id->octet[2], id->octet[3],
-	    id->octet[4], id->octet[5], id->octet[6], id->octet[7]);
-        if (i < 23 || i >= len)
-                return (-1);
-        return (0);
-}
-
-/*
- * Map an EUI-64 to a hostname. Use either /etc/eui64 or NIS/YP.
- */
-int
-eui64_ntohost(char *hostname, size_t len, const struct eui64 *id)
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct eui64 local_eui64;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char eui64_a[24];
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_EUI64, "re")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			eui64_ntoa(id, eui64_a, sizeof(eui64_a));
-			if (yp_match(yp_domain, "eui64.byid", eui64_a,
-				strlen(eui64_a), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (eui64_line(buf, &local_eui64, local_host,
-		    sizeof(local_host)) == 0) {
-			if (bcmp(&local_eui64.octet[0],
-				&id->octet[0], EUI64_LEN) == 0) {
-			/* We have a match */
-				strcpy(hostname, local_host);
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
-
-/*
- * Map a hostname to an EUI-64 using /etc/eui64 or NIS/YP.
- */
-int
-eui64_hostton(const char *hostname, struct eui64 *id)
-{
-	FILE *fp;
-	char buf[BUFSIZ + 2];
-	struct eui64 local_eui64;
-	char local_host[MAXHOSTNAMELEN];
-#ifdef YP
-	char *result;
-	int resultlen;
-	char *yp_domain;
-#endif
-	if ((fp = fopen(_PATH_EUI64, "re")) == NULL)
-		return (1);
-
-	while (fgets(buf,BUFSIZ,fp)) {
-		if (buf[0] == '#')
-			continue;
-#ifdef YP
-		if (buf[0] == '+') {
-			if (yp_get_default_domain(&yp_domain))
-				continue;
-			if (yp_match(yp_domain, "eui64.byname", hostname,
-				strlen(hostname), &result, &resultlen)) {
-				continue;
-			}
-			strncpy(buf, result, resultlen);
-			buf[resultlen] = '\0';
-			free(result);
-		}
-#endif
-		if (eui64_line(buf, &local_eui64, local_host,
-		    sizeof(local_host)) == 0) {
-			if (strcmp(hostname, local_host) == 0) {
-				/* We have a match */
-				bcopy(&local_eui64, id, sizeof(struct eui64));
-				fclose(fp);
-				return(0);
-			}
-		}
-	}
-	fclose(fp);
-	return (1);
-}
diff --git a/lib/libc_bsd/net/gai_strerror.3 b/lib/libc_bsd/net/gai_strerror.3
deleted file mode 100644
index 9b244f0..0000000
--- a/lib/libc_bsd/net/gai_strerror.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\"	$KAME: gai_strerror.3,v 1.1 2005/01/05 03:04:47 itojun Exp $
-.\"	$OpenBSD: gai_strerror.3,v 1.4 2004/12/20 23:04:53 millert Exp $
-.\"
-.\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001  Internet Software Consortium.
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-.\" PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/gai_strerror.3 162385 2006-09-17 21:27:35Z ru $
-.\"
-.Dd May 21, 2006
-.Dt GAI_STRERROR 3
-.Os
-.Sh NAME
-.Nm gai_strerror
-.Nd get error message string from EAI_xxx error code
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft "const char *"
-.Fn gai_strerror "int ecode"
-.Sh DESCRIPTION
-The
-.Fn gai_strerror
-function returns an error message string corresponding to the error code
-returned by
-.Xr getaddrinfo 3
-or
-.Xr getnameinfo 3 .
-.Pp
-The following error codes and their meaning are defined in
-.In netdb.h :
-.Pp
-.Bl -tag -width ".Dv EAI_BADFLAGS" -offset indent -compact
-.It Dv EAI_AGAIN
-temporary failure in name resolution
-.It Dv EAI_BADFLAGS
-invalid value for
-.Fa ai_flags
-.It Dv EAI_BADHINTS
-invalid value for
-.Fa hints
-.It Dv EAI_FAIL
-non-recoverable failure in name resolution
-.It Dv EAI_FAMILY
-.Fa ai_family
-not supported
-.It Dv EAI_MEMORY
-memory allocation failure
-.It Dv EAI_NONAME
-.Fa hostname
-or
-.Fa servname
-not provided, or not known
-.It Dv EAI_OVERFLOW
-argument buffer overflow
-.It Dv EAI_PROTOCOL
-resolved protocol is unknown
-.It Dv EAI_SERVICE
-.Fa servname
-not supported for
-.Fa ai_socktype
-.It Dv EAI_SOCKTYPE
-.Fa ai_socktype
-not supported
-.It Dv EAI_SYSTEM
-system error returned in
-.Va errno
-.El
-.Sh RETURN VALUES
-The
-.Fn gai_strerror
-function
-returns a pointer to the error message string corresponding to
-.Fa ecode .
-If
-.Fa ecode
-is out of range, an implementation-specific error message string is returned.
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr getnameinfo 3
diff --git a/lib/libc_bsd/net/gai_strerror.c b/lib/libc_bsd/net/gai_strerror.c
deleted file mode 100644
index c46d222..0000000
--- a/lib/libc_bsd/net/gai_strerror.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/gai_strerror.c 199083 2009-11-09 12:46:59Z ume $");
-
-#include "namespace.h"
-#include <netdb.h>
-#if defined(NLS)
-#include <nl_types.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include "reentrant.h"
-#endif
-#include "un-namespace.h"
-
-/* Entries EAI_ADDRFAMILY (1) and EAI_NODATA (7) are obsoleted, but left */
-/* for backward compatibility with userland code prior to 2553bis-02 */
-static const char *ai_errlist[] = {
-	"Success",					/* 0 */
-	"Address family for hostname not supported",	/* 1 */
-	"Temporary failure in name resolution",		/* EAI_AGAIN */
-	"Invalid value for ai_flags",			/* EAI_BADFLAGS */
-	"Non-recoverable failure in name resolution",	/* EAI_FAIL */
-	"ai_family not supported",			/* EAI_FAMILY */
-	"Memory allocation failure", 			/* EAI_MEMORY */
-	"No address associated with hostname",		/* 7 */
-	"hostname nor servname provided, or not known",	/* EAI_NONAME */
-	"servname not supported for ai_socktype",	/* EAI_SERVICE */
-	"ai_socktype not supported", 			/* EAI_SOCKTYPE */
-	"System error returned in errno", 		/* EAI_SYSTEM */
-	"Invalid value for hints",			/* EAI_BADHINTS */
-	"Resolved protocol is unknown",			/* EAI_PROTOCOL */
-	"Argument buffer overflow"			/* EAI_OVERFLOW */
-};
-
-#if defined(NLS)
-static char		gai_buf[NL_TEXTMAX];
-static once_t		gai_init_once = ONCE_INITIALIZER;
-static thread_key_t	gai_key;
-static int		gai_keycreated = 0;
-
-static void
-gai_keycreate(void)
-{
-	gai_keycreated = (thr_keycreate(&gai_key, free) == 0);
-}
-#endif
-
-const char *
-gai_strerror(int ecode)
-{
-#if defined(NLS)
-	nl_catd catd;
-	char *buf;
-
-	if (thr_main() != 0)
-		buf = gai_buf;
-	else {
-		if (thr_once(&gai_init_once, gai_keycreate) != 0 ||
-		    !gai_keycreated)
-			goto thr_err;
-		if ((buf = thr_getspecific(gai_key)) == NULL) {
-			if ((buf = malloc(sizeof(gai_buf))) == NULL)
-				goto thr_err;
-			if (thr_setspecific(gai_key, buf) != 0) {
-				free(buf);
-				goto thr_err;
-			}
-		}
-	}
-
-	catd = catopen("libc", NL_CAT_LOCALE);
-	if (ecode > 0 && ecode < EAI_MAX)
-		strlcpy(buf, catgets(catd, 3, ecode, ai_errlist[ecode]),
-		    sizeof(gai_buf));
-	else if (ecode == 0)
-		strlcpy(buf, catgets(catd, 3, NL_MSGMAX - 1, "Success"),
-		    sizeof(gai_buf));
-	else
-		strlcpy(buf, catgets(catd, 3, NL_MSGMAX, "Unknown error"),
-		    sizeof(gai_buf));
-	catclose(catd);
-	return buf;
-
-thr_err:
-#endif
-	if (ecode >= 0 && ecode < EAI_MAX)
-		return ai_errlist[ecode];
-	return "Unknown error";
-}
diff --git a/lib/libc_bsd/net/getaddrinfo.3 b/lib/libc_bsd/net/getaddrinfo.3
deleted file mode 100644
index 77aa63f..0000000
--- a/lib/libc_bsd/net/getaddrinfo.3
+++ /dev/null
@@ -1,460 +0,0 @@
-.\"	$KAME: getaddrinfo.3,v 1.36 2005/01/05 03:23:05 itojun Exp $
-.\"	$OpenBSD: getaddrinfo.3,v 1.35 2004/12/21 03:40:31 jaredy Exp $
-.\"
-.\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001  Internet Software Consortium.
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-.\" PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/getaddrinfo.3 253066 2013-07-09 08:23:43Z hrs $
-.\"
-.Dd February 14, 2013
-.Dt GETADDRINFO 3
-.Os
-.Sh NAME
-.Nm getaddrinfo ,
-.Nm freeaddrinfo
-.Nd socket address structure to host and service name
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft int
-.Fo getaddrinfo
-.Fa "const char *hostname" "const char *servname"
-.Fa "const struct addrinfo *hints" "struct addrinfo **res"
-.Fc
-.Ft void
-.Fn freeaddrinfo "struct addrinfo *ai"
-.Sh DESCRIPTION
-The
-.Fn getaddrinfo
-function is used to get a list of
-.Tn IP
-addresses and port numbers for host
-.Fa hostname
-and service
-.Fa servname .
-It is a replacement for and provides more flexibility than the
-.Xr gethostbyname 3
-and
-.Xr getservbyname 3
-functions.
-.Pp
-The
-.Fa hostname
-and
-.Fa servname
-arguments are either pointers to NUL-terminated strings or the null pointer.
-An acceptable value for
-.Fa hostname
-is either a valid host name or a numeric host address string consisting
-of a dotted decimal IPv4 address or an IPv6 address.
-The
-.Fa servname
-is either a decimal port number or a service name listed in
-.Xr services 5 .
-At least one of
-.Fa hostname
-and
-.Fa servname
-must be non-null.
-.Pp
-.Fa hints
-is an optional pointer to a
-.Li struct addrinfo ,
-as defined by
-.Aq Pa netdb.h :
-.Bd -literal
-struct addrinfo {
-	int ai_flags;		/* input flags */
-	int ai_family;		/* protocol family for socket */
-	int ai_socktype;	/* socket type */
-	int ai_protocol;	/* protocol for socket */
-	socklen_t ai_addrlen;	/* length of socket-address */
-	struct sockaddr *ai_addr; /* socket-address for socket */
-	char *ai_canonname;	/* canonical name for service location */
-	struct addrinfo *ai_next; /* pointer to next in list */
-};
-.Ed
-.Pp
-This structure can be used to provide hints concerning the type of socket
-that the caller supports or wishes to use.
-The caller can supply the following structure elements in
-.Fa hints :
-.Bl -tag -width "ai_socktypeXX"
-.It Fa ai_family
-The protocol family that should be used.
-When
-.Fa ai_family
-is set to
-.Dv PF_UNSPEC ,
-it means the caller will accept any protocol family supported by the
-operating system.
-.It Fa ai_socktype
-Denotes the type of socket that is wanted:
-.Dv SOCK_STREAM ,
-.Dv SOCK_DGRAM ,
-or
-.Dv SOCK_RAW .
-When
-.Fa ai_socktype
-is zero the caller will accept any socket type.
-.It Fa ai_protocol
-Indicates which transport protocol is desired,
-.Dv IPPROTO_UDP
-or
-.Dv IPPROTO_TCP .
-If
-.Fa ai_protocol
-is zero the caller will accept any protocol.
-.It Fa ai_flags
-The
-.Fa ai_flags
-field to which the
-.Fa hints
-parameter points shall be set to zero
-or be the bitwise-inclusive OR of one or more of the values
-.Dv AI_ADDRCONFIG ,
-.Dv AI_CANONNAME ,
-.Dv AI_NUMERICHOST ,
-.Dv AI_NUMERICSERV
-and
-.Dv AI_PASSIVE .
-.Bl -tag -width "AI_CANONNAMEXX"
-.It Dv AI_ADDRCONFIG
-If the
-.Dv AI_ADDRCONFIG
-bit is set, IPv4 addresses shall be returned only if
-an IPv4 address is configured on the local system,
-and IPv6 addresses shall be returned only if
-an IPv6 address is configured on the local system.
-.It Dv AI_CANONNAME
-If the
-.Dv AI_CANONNAME
-bit is set, a successful call to
-.Fn getaddrinfo
-will return a NUL-terminated string containing the canonical name
-of the specified hostname in the
-.Fa ai_canonname
-element of the first
-.Li addrinfo
-structure returned.
-.It Dv AI_NUMERICHOST
-If the
-.Dv AI_NUMERICHOST
-bit is set, it indicates that
-.Fa hostname
-should be treated as a numeric string defining an IPv4 or IPv6 address
-and no name resolution should be attempted.
-.It Dv AI_NUMERICSERV
-If the
-.Dv AI_NUMERICSERV
-bit is set,
-then a non-null
-.Fa servname
-string supplied shall be a numeric port string.
-Otherwise, an
-.Dv EAI_NONAME
-error shall be returned.
-This bit shall prevent any type of name resolution service
-(for example, NIS+) from being invoked.
-.It Dv AI_PASSIVE
-If the
-.Dv AI_PASSIVE
-bit is set it indicates that the returned socket address structure
-is intended for use in a call to
-.Xr bind 2 .
-In this case, if the
-.Fa hostname
-argument is the null pointer, then the IP address portion of the
-socket address structure will be set to
-.Dv INADDR_ANY
-for an IPv4 address or
-.Dv IN6ADDR_ANY_INIT
-for an IPv6 address.
-.Pp
-If the
-.Dv AI_PASSIVE
-bit is not set, the returned socket address structure will be ready
-for use in a call to
-.Xr connect 2
-for a connection-oriented protocol or
-.Xr connect 2 ,
-.Xr sendto 2 ,
-or
-.Xr sendmsg 2
-if a connectionless protocol was chosen.
-The
-.Tn IP
-address portion of the socket address structure will be set to the
-loopback address if
-.Fa hostname
-is the null pointer and
-.Dv AI_PASSIVE
-is not set.
-.El
-.El
-.Pp
-All other elements of the
-.Li addrinfo
-structure passed via
-.Fa hints
-must be zero or the null pointer.
-.Pp
-If
-.Fa hints
-is the null pointer,
-.Fn getaddrinfo
-behaves as if the caller provided a
-.Li struct addrinfo
-with
-.Fa ai_family
-set to
-.Dv PF_UNSPEC
-and all other elements set to zero or
-.Dv NULL .
-.Pp
-After a successful call to
-.Fn getaddrinfo ,
-.Fa *res
-is a pointer to a linked list of one or more
-.Li addrinfo
-structures.
-The list can be traversed by following the
-.Fa ai_next
-pointer in each
-.Li addrinfo
-structure until a null pointer is encountered.
-The three members
-.Fa ai_family,
-.Fa ai_socktype,
-and
-.Fa ai_protocol
-in each returned
-.Li addrinfo
-structure are suitable for a call to
-.Xr socket 2 .
-For each
-.Li addrinfo
-structure in the list, the
-.Fa ai_addr
-member points to a filled-in socket address structure of length
-.Fa ai_addrlen .
-.Pp
-This implementation of
-.Fn getaddrinfo
-allows numeric IPv6 address notation with scope identifier,
-as documented in chapter 11 of RFC 4007.
-By appending the percent character and scope identifier to addresses,
-one can fill the
-.Li sin6_scope_id
-field for addresses.
-This would make management of scoped addresses easier
-and allows cut-and-paste input of scoped addresses.
-.Pp
-At this moment the code supports only link-local addresses with the format.
-The scope identifier is hardcoded to the name of the hardware interface
-associated
-with the link
-.Po
-such as
-.Li ne0
-.Pc .
-An example is
-.Dq Li fe80::1%ne0 ,
-which means
-.Do
-.Li fe80::1
-on the link associated with the
-.Li ne0
-interface
-.Dc .
-.Pp
-The current implementation assumes a one-to-one relationship between
-the interface and link, which is not necessarily true from the specification.
-.Pp
-All of the information returned by
-.Fn getaddrinfo
-is dynamically allocated: the
-.Li addrinfo
-structures themselves as well as the socket address structures and
-the canonical host name strings included in the
-.Li addrinfo
-structures.
-.Pp
-Memory allocated for the dynamically allocated structures created by
-a successful call to
-.Fn getaddrinfo
-is released by the
-.Fn freeaddrinfo
-function.
-The
-.Fa ai
-pointer should be a
-.Li addrinfo
-structure created by a call to
-.Fn getaddrinfo .
-.Sh RETURN VALUES
-.Fn getaddrinfo
-returns zero on success or one of the error codes listed in
-.Xr gai_strerror 3
-if an error occurs.
-.Sh EXAMPLES
-The following code tries to connect to
-.Dq Li www.kame.net
-service
-.Dq Li http
-via a stream socket.
-It loops through all the addresses available, regardless of address family.
-If the destination resolves to an IPv4 address, it will use an
-.Dv AF_INET
-socket.
-Similarly, if it resolves to IPv6, an
-.Dv AF_INET6
-socket is used.
-Observe that there is no hardcoded reference to a particular address family.
-The code works even if
-.Fn getaddrinfo
-returns addresses that are not IPv4/v6.
-.Bd -literal -offset indent
-struct addrinfo hints, *res, *res0;
-int error;
-int s;
-const char *cause = NULL;
-
-memset(&hints, 0, sizeof(hints));
-hints.ai_family = PF_UNSPEC;
-hints.ai_socktype = SOCK_STREAM;
-error = getaddrinfo("www.kame.net", "http", &hints, &res0);
-if (error) {
-	errx(1, "%s", gai_strerror(error));
-	/* NOTREACHED */
-}
-s = -1;
-for (res = res0; res; res = res->ai_next) {
-	s = socket(res->ai_family, res->ai_socktype,
-	    res->ai_protocol);
-	if (s < 0) {
-		cause = "socket";
-		continue;
-	}
-
-	if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
-		cause = "connect";
-		close(s);
-		s = -1;
-		continue;
-	}
-
-	break;	/* okay we got one */
-}
-if (s < 0) {
-	err(1, "%s", cause);
-	/* NOTREACHED */
-}
-freeaddrinfo(res0);
-.Ed
-.Pp
-The following example tries to open a wildcard listening socket onto service
-.Dq Li http ,
-for all the address families available.
-.Bd -literal -offset indent
-struct addrinfo hints, *res, *res0;
-int error;
-int s[MAXSOCK];
-int nsock;
-const char *cause = NULL;
-
-memset(&hints, 0, sizeof(hints));
-hints.ai_family = PF_UNSPEC;
-hints.ai_socktype = SOCK_STREAM;
-hints.ai_flags = AI_PASSIVE;
-error = getaddrinfo(NULL, "http", &hints, &res0);
-if (error) {
-	errx(1, "%s", gai_strerror(error));
-	/* NOTREACHED */
-}
-nsock = 0;
-for (res = res0; res && nsock < MAXSOCK; res = res->ai_next) {
-	s[nsock] = socket(res->ai_family, res->ai_socktype,
-	    res->ai_protocol);
-	if (s[nsock] < 0) {
-		cause = "socket";
-		continue;
-	}
-
-	if (bind(s[nsock], res->ai_addr, res->ai_addrlen) < 0) {
-		cause = "bind";
-		close(s[nsock]);
-		continue;
-	}
-	(void) listen(s[nsock], 5);
-
-	nsock++;
-}
-if (nsock == 0) {
-	err(1, "%s", cause);
-	/* NOTREACHED */
-}
-freeaddrinfo(res0);
-.Ed
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr connect 2 ,
-.Xr send 2 ,
-.Xr socket 2 ,
-.Xr gai_strerror 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnameinfo 3 ,
-.Xr getservbyname 3 ,
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr resolv.conf 5 ,
-.Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A J. McCann
-.%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC 3493
-.%D February 2003
-.Re
-.Rs
-.%A S. Deering
-.%A B. Haberman
-.%A T. Jinmei
-.%A E. Nordmark
-.%A B. Zill
-.%T "IPv6 Scoped Address Architecture"
-.%R RFC 4007
-.%D March 2005
-.Re
-.Rs
-.%A Craig Metz
-.%T Protocol Independence Using the Sockets API
-.%B "Proceedings of the freenix track: 2000 USENIX annual technical conference"
-.%D June 2000
-.Re
-.Sh STANDARDS
-The
-.Fn getaddrinfo
-function is defined by the
-.St -p1003.1-2004
-specification and documented in
-.Dv "RFC 3493" ,
-.Dq Basic Socket Interface Extensions for IPv6 .
diff --git a/lib/libc_bsd/net/getaddrinfo.c b/lib/libc_bsd/net/getaddrinfo.c
deleted file mode 100644
index c966f40..0000000
--- a/lib/libc_bsd/net/getaddrinfo.c
+++ /dev/null
@@ -1,2905 +0,0 @@
-/*	$KAME: getaddrinfo.c,v 1.15 2000/07/09 04:37:24 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * "#ifdef FAITH" part is local hack for supporting IPv4-v6 translator.
- *
- * Issues to be discussed:
- * - Return values.  There are nonstandard return values defined and used
- *   in the source code.  This is because RFC2553 is silent about which error
- *   code must be returned for which situation.
- * - freeaddrinfo(NULL).  RFC2553 is silent about it.  XNET 5.2 says it is
- *   invalid.  current code - SEGV on freeaddrinfo(NULL)
- *
- * Note:
- * - The code filters out AFs that are not supported by the kernel,
- *   when globbing NULL hostname (to loopback, or wildcard).  Is it the right
- *   thing to do?  What is the relationship with post-RFC2553 AI_ADDRCONFIG
- *   in ai_flags?
- * - (post-2553) semantics of AI_ADDRCONFIG itself is too vague.
- *   (1) what should we do against numeric hostname (2) what should we do
- *   against NULL hostname (3) what is AI_ADDRCONFIG itself.  AF not ready?
- *   non-loopback address configured?  global address configured?
- *
- * OS specific notes for freebsd4:
- * - FreeBSD supported $GAI.  The code does not.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getaddrinfo.c 268216 2014-07-03 15:56:30Z ume $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <net/if_types.h>
-#include <ifaddrs.h>
-#include <sys/queue.h>
-#ifdef INET6
-#include <net/if_var.h>
-#include <sys/sysctl.h>
-#include <sys/ioctl.h>
-#include <netinet6/in6_var.h>
-#include <netinet6/nd6.h>
-#endif
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include "res_config.h"
-
-#ifdef DEBUG
-#include <syslog.h>
-#endif
-
-#include <stdarg.h>
-#include <nsswitch.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-
-#if defined(__KAME__) && defined(INET6)
-# define FAITH
-#endif
-
-#define ANY 0
-#define YES 1
-#define NO  0
-
-static const char in_addrany[] = { 0, 0, 0, 0 };
-static const char in_loopback[] = { 127, 0, 0, 1 };
-#ifdef INET6
-static const char in6_addrany[] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-static const char in6_loopback[] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-};
-#endif
-
-struct policyqueue {
-	TAILQ_ENTRY(policyqueue) pc_entry;
-#ifdef INET6
-	struct in6_addrpolicy pc_policy;
-#endif
-};
-TAILQ_HEAD(policyhead, policyqueue);
-
-static const struct afd {
-	int a_af;
-	int a_addrlen;
-	socklen_t a_socklen;
-	int a_off;
-	const char *a_addrany;
-	const char *a_loopback;
-	int a_scoped;
-} afdl [] = {
-#ifdef INET6
-#define	N_INET6 0
-	{PF_INET6, sizeof(struct in6_addr),
-	 sizeof(struct sockaddr_in6),
-	 offsetof(struct sockaddr_in6, sin6_addr),
-	 in6_addrany, in6_loopback, 1},
-#define	N_INET 1
-#else
-#define	N_INET 0
-#endif
-	{PF_INET, sizeof(struct in_addr),
-	 sizeof(struct sockaddr_in),
-	 offsetof(struct sockaddr_in, sin_addr),
-	 in_addrany, in_loopback, 0},
-	{0, 0, 0, 0, NULL, NULL, 0},
-};
-
-struct explore {
-	int e_af;
-	int e_socktype;
-	int e_protocol;
-	int e_wild;
-#define WILD_AF(ex)		((ex)->e_wild & 0x01)
-#define WILD_SOCKTYPE(ex)	((ex)->e_wild & 0x02)
-#define WILD_PROTOCOL(ex)	((ex)->e_wild & 0x04)
-};
-
-static const struct explore explore[] = {
-#if 0
-	{ PF_LOCAL, ANY, ANY, 0x01 },
-#endif
-#ifdef INET6
-	{ PF_INET6, SOCK_DGRAM, IPPROTO_UDP, 0x07 },
-	{ PF_INET6, SOCK_STREAM, IPPROTO_TCP, 0x07 },
-	{ PF_INET6, SOCK_STREAM, IPPROTO_SCTP, 0x03 },
-	{ PF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP, 0x07 },
-	{ PF_INET6, SOCK_DGRAM, IPPROTO_UDPLITE, 0x03 },
-	{ PF_INET6, SOCK_RAW, ANY, 0x05 },
-#endif
-	{ PF_INET, SOCK_DGRAM, IPPROTO_UDP, 0x07 },
-	{ PF_INET, SOCK_STREAM, IPPROTO_TCP, 0x07 },
-	{ PF_INET, SOCK_STREAM, IPPROTO_SCTP, 0x03 },
-	{ PF_INET, SOCK_SEQPACKET, IPPROTO_SCTP, 0x07 },
-	{ PF_INET, SOCK_DGRAM, IPPROTO_UDPLITE, 0x03 },
-	{ PF_INET, SOCK_RAW, ANY, 0x05 },
-	{ -1, 0, 0, 0 },
-};
-
-#ifdef INET6
-#define PTON_MAX	16
-#else
-#define PTON_MAX	4
-#endif
-
-#define AIO_SRCFLAG_DEPRECATED	0x1
-
-struct ai_order {
-	union {
-		struct sockaddr_storage aiou_ss;
-		struct sockaddr aiou_sa;
-	} aio_src_un;
-#define aio_srcsa aio_src_un.aiou_sa
-	uint32_t aio_srcflag;
-	int aio_srcscope;
-	int aio_dstscope;
-	struct policyqueue *aio_srcpolicy;
-	struct policyqueue *aio_dstpolicy;
-	struct addrinfo *aio_ai;
-	int aio_matchlen;
-};
-
-static const ns_src default_dns_files[] = {
-	{ NSSRC_FILES, 	NS_SUCCESS },
-	{ NSSRC_DNS, 	NS_SUCCESS },
-	{ 0 }
-};
-
-struct res_target {
-	struct res_target *next;
-	const char *name;	/* domain name */
-	int qclass, qtype;	/* class and type of query */
-	u_char *answer;		/* buffer to put answer */
-	int anslen;		/* size of answer buffer */
-	int n;			/* result length */
-};
-
-#define MAXPACKET	(64*1024)
-
-typedef union {
-	HEADER hdr;
-	u_char buf[MAXPACKET];
-} querybuf;
-
-static int str2number(const char *, int *);
-static int explore_copy(const struct addrinfo *, const struct addrinfo *,
-	struct addrinfo **);
-static int explore_null(const struct addrinfo *,
-	const char *, struct addrinfo **);
-static int explore_numeric(const struct addrinfo *, const char *,
-	const char *, struct addrinfo **, const char *);
-static int explore_numeric_scope(const struct addrinfo *, const char *,
-	const char *, struct addrinfo **);
-static int get_canonname(const struct addrinfo *,
-	struct addrinfo *, const char *);
-static struct addrinfo *get_ai(const struct addrinfo *,
-	const struct afd *, const char *);
-static struct addrinfo *copy_ai(const struct addrinfo *);
-static int get_portmatch(const struct addrinfo *, const char *);
-static int get_port(struct addrinfo *, const char *, int);
-static const struct afd *find_afd(int);
-static int addrconfig(struct addrinfo *);
-#ifdef INET6
-static int is_ifdisabled(char *);
-#endif
-static void set_source(struct ai_order *, struct policyhead *);
-static int comp_dst(const void *, const void *);
-#ifdef INET6
-static int ip6_str2scopeid(char *, struct sockaddr_in6 *, uint32_t *);
-#endif
-static int gai_addr2scopetype(struct sockaddr *);
-
-static int explore_fqdn(const struct addrinfo *, const char *,
-	const char *, struct addrinfo **);
-
-static int reorder(struct addrinfo *);
-static int get_addrselectpolicy(struct policyhead *);
-static void free_addrselectpolicy(struct policyhead *);
-static struct policyqueue *match_addrselectpolicy(struct sockaddr *,
-	struct policyhead *);
-static int matchlen(struct sockaddr *, struct sockaddr *);
-
-static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
-	const struct addrinfo *, res_state);
-#if defined(RESOLVSORT)
-static int addr4sort(struct addrinfo *, res_state);
-#endif
-static int _dns_getaddrinfo(void *, void *, va_list);
-static void _sethtent(FILE **);
-static void _endhtent(FILE **);
-static struct addrinfo *_gethtent(FILE **, const char *,
-	const struct addrinfo *);
-static int _files_getaddrinfo(void *, void *, va_list);
-#ifdef YP
-static struct addrinfo *_yphostent(char *, const struct addrinfo *);
-static int _yp_getaddrinfo(void *, void *, va_list);
-#endif
-#ifdef NS_CACHING
-static int addrinfo_id_func(char *, size_t *, va_list, void *);
-static int addrinfo_marshal_func(char *, size_t *, void *, va_list, void *);
-static int addrinfo_unmarshal_func(char *, size_t, void *, va_list, void *);
-#endif
-
-static int res_queryN(const char *, struct res_target *, res_state);
-static int res_searchN(const char *, struct res_target *, res_state);
-static int res_querydomainN(const char *, const char *,
-	struct res_target *, res_state);
-
-/* XXX macros that make external reference is BAD. */
-
-#define GET_AI(ai, afd, addr) \
-do { \
-	/* external reference: pai, error, and label free */ \
-	(ai) = get_ai(pai, (afd), (addr)); \
-	if ((ai) == NULL) { \
-		error = EAI_MEMORY; \
-		goto free; \
-	} \
-} while (/*CONSTCOND*/0)
-
-#define GET_PORT(ai, serv) \
-do { \
-	/* external reference: error and label free */ \
-	error = get_port((ai), (serv), 0); \
-	if (error != 0) \
-		goto free; \
-} while (/*CONSTCOND*/0)
-
-#define GET_CANONNAME(ai, str) \
-do { \
-	/* external reference: pai, error and label free */ \
-	error = get_canonname(pai, (ai), (str)); \
-	if (error != 0) \
-		goto free; \
-} while (/*CONSTCOND*/0)
-
-#define ERR(err) \
-do { \
-	/* external reference: error, and label bad */ \
-	error = (err); \
-	goto bad; \
-	/*NOTREACHED*/ \
-} while (/*CONSTCOND*/0)
-
-#define MATCH_FAMILY(x, y, w) \
-	((x) == (y) || (/*CONSTCOND*/(w) && ((x) == PF_UNSPEC || (y) == PF_UNSPEC)))
-#define MATCH(x, y, w) \
-	((x) == (y) || (/*CONSTCOND*/(w) && ((x) == ANY || (y) == ANY)))
-
-void
-freeaddrinfo(struct addrinfo *ai)
-{
-	struct addrinfo *next;
-
-	do {
-		next = ai->ai_next;
-		if (ai->ai_canonname)
-			free(ai->ai_canonname);
-		/* no need to free(ai->ai_addr) */
-		free(ai);
-		ai = next;
-	} while (ai);
-}
-
-static int
-str2number(const char *p, int *portp)
-{
-	char *ep;
-	unsigned long v;
-
-	if (*p == '\0')
-		return -1;
-	ep = NULL;
-	errno = 0;
-	v = strtoul(p, &ep, 10);
-	if (errno == 0 && ep && *ep == '\0' && v <= UINT_MAX) {
-		*portp = v;
-		return 0;
-	} else
-		return -1;
-}
-
-int
-getaddrinfo(const char *hostname, const char *servname,
-    const struct addrinfo *hints, struct addrinfo **res)
-{
-	struct addrinfo sentinel;
-	struct addrinfo *cur;
-	int error = 0;
-	struct addrinfo ai, ai0, *afai;
-	struct addrinfo *pai;
-	const struct afd *afd;
-	const struct explore *ex;
-	struct addrinfo *afailist[sizeof(afdl)/sizeof(afdl[0])];
-	struct addrinfo *afai_unspec;
-	int found;
-	int numeric = 0;
-
-	/* ensure we return NULL on errors */
-	*res = NULL;
-
-	memset(&ai, 0, sizeof(ai));
-
-	memset(afailist, 0, sizeof(afailist));
-	afai_unspec = NULL;
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-	pai = &ai;
-	pai->ai_flags = 0;
-	pai->ai_family = PF_UNSPEC;
-	pai->ai_socktype = ANY;
-	pai->ai_protocol = ANY;
-	pai->ai_addrlen = 0;
-	pai->ai_canonname = NULL;
-	pai->ai_addr = NULL;
-	pai->ai_next = NULL;
-
-	if (hostname == NULL && servname == NULL)
-		return EAI_NONAME;
-	if (hints) {
-		/* error check for hints */
-		if (hints->ai_addrlen || hints->ai_canonname ||
-		    hints->ai_addr || hints->ai_next)
-			ERR(EAI_BADHINTS); /* xxx */
-		if (hints->ai_flags & ~AI_MASK)
-			ERR(EAI_BADFLAGS);
-		switch (hints->ai_family) {
-		case PF_UNSPEC:
-		case PF_INET:
-#ifdef INET6
-		case PF_INET6:
-#endif
-			break;
-		default:
-			ERR(EAI_FAMILY);
-		}
-		memcpy(pai, hints, sizeof(*pai));
-
-		/*
-		 * if both socktype/protocol are specified, check if they
-		 * are meaningful combination.
-		 */
-		if (pai->ai_socktype != ANY && pai->ai_protocol != ANY) {
-			for (ex = explore; ex->e_af >= 0; ex++) {
-				if (!MATCH_FAMILY(pai->ai_family, ex->e_af,
-				    WILD_AF(ex)))
-					continue;
-				if (!MATCH(pai->ai_socktype, ex->e_socktype,
-				    WILD_SOCKTYPE(ex)))
-					continue;
-				if (!MATCH(pai->ai_protocol, ex->e_protocol,
-				    WILD_PROTOCOL(ex)))
-					continue;
-
-				/* matched */
-				break;
-			}
-
-			if (ex->e_af < 0)
-				ERR(EAI_BADHINTS);
-		}
-	}
-
-	/*
-	 * check for special cases.  (1) numeric servname is disallowed if
-	 * socktype/protocol are left unspecified. (2) servname is disallowed
-	 * for raw and other inet{,6} sockets.
-	 */
-	if (MATCH_FAMILY(pai->ai_family, PF_INET, 1)
-#ifdef PF_INET6
-	    || MATCH_FAMILY(pai->ai_family, PF_INET6, 1)
-#endif
-	    ) {
-		ai0 = *pai;	/* backup *pai */
-
-		if (pai->ai_family == PF_UNSPEC) {
-#ifdef PF_INET6
-			pai->ai_family = PF_INET6;
-#else
-			pai->ai_family = PF_INET;
-#endif
-		}
-		error = get_portmatch(pai, servname);
-		if (error)
-			goto bad;
-
-		*pai = ai0;
-	}
-
-	ai0 = *pai;
-
-	/*
-	 * NULL hostname, or numeric hostname.
-	 * If numeric representation of AF1 can be interpreted as FQDN
-	 * representation of AF2, we need to think again about the code below.
-	 */
-	found = 0;
-	for (afd = afdl; afd->a_af; afd++) {
-		*pai = ai0;
-
-		if (!MATCH_FAMILY(pai->ai_family, afd->a_af, 1))
-			continue;
-
-		if (pai->ai_family == PF_UNSPEC)
-			pai->ai_family = afd->a_af;
-
-		if (hostname == NULL) {
-			error = explore_null(pai, servname,
-			    &afailist[afd - afdl]);
-
-			/*
-			 * Errors from explore_null should be unexpected and
-			 * be caught to avoid returning an incomplete result.
-			 */
-			if (error != 0)
-				goto bad;
-		} else {
-			error = explore_numeric_scope(pai, hostname, servname,
-			    &afailist[afd - afdl]);
-
-			/*
-			 * explore_numeric_scope returns an error for address
-			 * families that do not match that of hostname.
-			 * Thus we should not catch the error at this moment. 
-			 */
-		}
-
-		if (!error && afailist[afd - afdl])
-			found++;
-	}
-	if (found) {
-		numeric = 1;
-		goto globcopy;
-	}
-
-	if (hostname == NULL)
-		ERR(EAI_NONAME);	/* used to be EAI_NODATA */
-	if (pai->ai_flags & AI_NUMERICHOST)
-		ERR(EAI_NONAME);
-
-	if ((pai->ai_flags & AI_ADDRCONFIG) != 0 && !addrconfig(&ai0))
-		ERR(EAI_FAIL);
-
-	/*
-	 * hostname as alphabetical name.
-	 */
-	*pai = ai0;
-	error = explore_fqdn(pai, hostname, servname, &afai_unspec);
-
-globcopy:
-	for (ex = explore; ex->e_af >= 0; ex++) {
-		*pai = ai0;
-
-		if (!MATCH_FAMILY(pai->ai_family, ex->e_af, WILD_AF(ex)))
-			continue;
-		if (!MATCH(pai->ai_socktype, ex->e_socktype,
-		    WILD_SOCKTYPE(ex)))
-			continue;
-		if (!MATCH(pai->ai_protocol, ex->e_protocol,
-		    WILD_PROTOCOL(ex)))
-			continue;
-
-		if (pai->ai_family == PF_UNSPEC)
-			pai->ai_family = ex->e_af;
-		if (pai->ai_socktype == ANY && ex->e_socktype != ANY)
-			pai->ai_socktype = ex->e_socktype;
-		if (pai->ai_protocol == ANY && ex->e_protocol != ANY)
-			pai->ai_protocol = ex->e_protocol;
-
-		/*
-		 * if the servname does not match socktype/protocol, ignore it.
-		 */
-		if (get_portmatch(pai, servname) != 0)
-			continue;
-
-		if (afai_unspec)
-			afai = afai_unspec;
-		else {
-			if ((afd = find_afd(pai->ai_family)) == NULL)
-				continue;
-			/* XXX assumes that afd points inside afdl[] */
-			afai = afailist[afd - afdl];
-		}
-		if (!afai)
-			continue;
-
-		error = explore_copy(pai, afai, &cur->ai_next);
-		if (error != 0)
-			goto bad;
-
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	/*
-	 * ensure we return either:
-	 * - error == 0, non-NULL *res
-	 * - error != 0, NULL *res
-	 */
-	if (error == 0) {
-		if (sentinel.ai_next) {
-			/*
-			 * If the returned entry is for an active connection,
-			 * and the given name is not numeric, reorder the
-			 * list, so that the application would try the list
-			 * in the most efficient order.  Since the head entry
-			 * of the original list may contain ai_canonname and
-			 * that entry may be moved elsewhere in the new list,
-			 * we keep the pointer and will  restore it in the new
-			 * head entry.  (Note that RFC3493 requires the head
-			 * entry store it when requested by the caller).
-			 */
-			if (hints == NULL || !(hints->ai_flags & AI_PASSIVE)) {
-				if (!numeric) {
-					char *canonname;
-
-					canonname =
-					    sentinel.ai_next->ai_canonname;
-					sentinel.ai_next->ai_canonname = NULL;
-					(void)reorder(&sentinel);
-					if (sentinel.ai_next->ai_canonname ==
-					    NULL) {
-						sentinel.ai_next->ai_canonname
-						    = canonname;
-					} else if (canonname != NULL)
-						free(canonname);
-				}
-			}
-			*res = sentinel.ai_next;
-		} else
-			error = EAI_FAIL;
-	}
-
-bad:
-	if (afai_unspec)
-		freeaddrinfo(afai_unspec);
-	for (afd = afdl; afd->a_af; afd++) {
-		if (afailist[afd - afdl])
-			freeaddrinfo(afailist[afd - afdl]);
-	}
-	if (!*res)
-		if (sentinel.ai_next)
-			freeaddrinfo(sentinel.ai_next);
-
-	return (error);
-}
-
-static int
-reorder(struct addrinfo *sentinel)
-{
-	struct addrinfo *ai, **aip;
-	struct ai_order *aio;
-	int i, n;
-	struct policyhead policyhead;
-
-	/* count the number of addrinfo elements for sorting. */
-	for (n = 0, ai = sentinel->ai_next; ai != NULL; ai = ai->ai_next, n++)
-		;
-
-	/*
-	 * If the number is small enough, we can skip the reordering process.
-	 */
-	if (n <= 1)
-		return(n);
-
-	/* allocate a temporary array for sort and initialization of it. */
-	if ((aio = malloc(sizeof(*aio) * n)) == NULL)
-		return(n);	/* give up reordering */
-	memset(aio, 0, sizeof(*aio) * n);
-
-	/* retrieve address selection policy from the kernel */
-	TAILQ_INIT(&policyhead);
-	if (!get_addrselectpolicy(&policyhead)) {
-		/* no policy is installed into kernel, we don't sort. */
-		free(aio);
-		return (n);
-	}
-
-	for (i = 0, ai = sentinel->ai_next; i < n; ai = ai->ai_next, i++) {
-		aio[i].aio_ai = ai;
-		aio[i].aio_dstscope = gai_addr2scopetype(ai->ai_addr);
-		aio[i].aio_dstpolicy = match_addrselectpolicy(ai->ai_addr,
-							      &policyhead);
-		set_source(&aio[i], &policyhead);
-	}
-
-	/* perform sorting. */
-	qsort(aio, n, sizeof(*aio), comp_dst);
-
-	/* reorder the addrinfo chain. */
-	for (i = 0, aip = &sentinel->ai_next; i < n; i++) {
-		*aip = aio[i].aio_ai;
-		aip = &aio[i].aio_ai->ai_next;
-	}
-	*aip = NULL;
-
-	/* cleanup and return */
-	free(aio);
-	free_addrselectpolicy(&policyhead);
-	return(n);
-}
-
-static int
-get_addrselectpolicy(struct policyhead *head)
-{
-#ifdef INET6
-	int mib[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_ADDRCTLPOLICY };
-	size_t l;
-	char *buf;
-	struct in6_addrpolicy *pol, *ep;
-
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0)
-		return (0);
-	if (l == 0)
-		return (0);
-	if ((buf = malloc(l)) == NULL)
-		return (0);
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
-		free(buf);
-		return (0);
-	}
-
-	ep = (struct in6_addrpolicy *)(buf + l);
-	for (pol = (struct in6_addrpolicy *)buf; pol + 1 <= ep; pol++) {
-		struct policyqueue *new;
-
-		if ((new = malloc(sizeof(*new))) == NULL) {
-			free_addrselectpolicy(head); /* make the list empty */
-			break;
-		}
-		new->pc_policy = *pol;
-		TAILQ_INSERT_TAIL(head, new, pc_entry);
-	}
-
-	free(buf);
-	return (1);
-#else
-	return (0);
-#endif
-}
-
-static void
-free_addrselectpolicy(struct policyhead *head)
-{
-	struct policyqueue *ent, *nent;
-
-	for (ent = TAILQ_FIRST(head); ent; ent = nent) {
-		nent = TAILQ_NEXT(ent, pc_entry);
-		TAILQ_REMOVE(head, ent, pc_entry);
-		free(ent);
-	}
-}
-
-static struct policyqueue *
-match_addrselectpolicy(struct sockaddr *addr, struct policyhead *head)
-{
-#ifdef INET6
-	struct policyqueue *ent, *bestent = NULL;
-	struct in6_addrpolicy *pol;
-	int matchlen, bestmatchlen = -1;
-	u_char *mp, *ep, *k, *p, m;
-	struct sockaddr_in6 key;
-
-	switch(addr->sa_family) {
-	case AF_INET6:
-		key = *(struct sockaddr_in6 *)addr;
-		break;
-	case AF_INET:
-		/* convert the address into IPv4-mapped IPv6 address. */
-		memset(&key, 0, sizeof(key));
-		key.sin6_family = AF_INET6;
-		key.sin6_len = sizeof(key);
-		key.sin6_addr.s6_addr[10] = 0xff;
-		key.sin6_addr.s6_addr[11] = 0xff;
-		memcpy(&key.sin6_addr.s6_addr[12],
-		       &((struct sockaddr_in *)addr)->sin_addr, 4);
-		break;
-	default:
-		return(NULL);
-	}
-
-	for (ent = TAILQ_FIRST(head); ent; ent = TAILQ_NEXT(ent, pc_entry)) {
-		pol = &ent->pc_policy;
-		matchlen = 0;
-
-		mp = (u_char *)&pol->addrmask.sin6_addr;
-		ep = mp + 16;	/* XXX: scope field? */
-		k = (u_char *)&key.sin6_addr;
-		p = (u_char *)&pol->addr.sin6_addr;
-		for (; mp < ep && *mp; mp++, k++, p++) {
-			m = *mp;
-			if ((*k & m) != *p)
-				goto next; /* not match */
-			if (m == 0xff) /* short cut for a typical case */
-				matchlen += 8;
-			else {
-				while (m >= 0x80) {
-					matchlen++;
-					m <<= 1;
-				}
-			}
-		}
-
-		/* matched.  check if this is better than the current best. */
-		if (matchlen > bestmatchlen) {
-			bestent = ent;
-			bestmatchlen = matchlen;
-		}
-
-	  next:
-		continue;
-	}
-
-	return(bestent);
-#else
-	return(NULL);
-#endif
-
-}
-
-static void
-set_source(struct ai_order *aio, struct policyhead *ph)
-{
-	struct addrinfo ai = *aio->aio_ai;
-	struct sockaddr_storage ss;
-	socklen_t srclen;
-	int s;
-
-	/* set unspec ("no source is available"), just in case */
-	aio->aio_srcsa.sa_family = AF_UNSPEC;
-	aio->aio_srcscope = -1;
-
-	switch(ai.ai_family) {
-	case AF_INET:
-#ifdef INET6
-	case AF_INET6:
-#endif
-		break;
-	default:		/* ignore unsupported AFs explicitly */
-		return;
-	}
-
-	/* XXX: make a dummy addrinfo to call connect() */
-	ai.ai_socktype = SOCK_DGRAM;
-	ai.ai_protocol = IPPROTO_UDP; /* is UDP too specific? */
-	ai.ai_next = NULL;
-	memset(&ss, 0, sizeof(ss));
-	memcpy(&ss, ai.ai_addr, ai.ai_addrlen);
-	ai.ai_addr = (struct sockaddr *)&ss;
-	get_port(&ai, "1", 0);
-
-	/* open a socket to get the source address for the given dst */
-	if ((s = _socket(ai.ai_family, ai.ai_socktype | SOCK_CLOEXEC,
-	    ai.ai_protocol)) < 0)
-		return;		/* give up */
-	if (_connect(s, ai.ai_addr, ai.ai_addrlen) < 0)
-		goto cleanup;
-	srclen = ai.ai_addrlen;
-	if (_getsockname(s, &aio->aio_srcsa, &srclen) < 0) {
-		aio->aio_srcsa.sa_family = AF_UNSPEC;
-		goto cleanup;
-	}
-	aio->aio_srcscope = gai_addr2scopetype(&aio->aio_srcsa);
-	aio->aio_srcpolicy = match_addrselectpolicy(&aio->aio_srcsa, ph);
-	aio->aio_matchlen = matchlen(&aio->aio_srcsa, aio->aio_ai->ai_addr);
-#ifdef INET6
-	if (ai.ai_family == AF_INET6) {
-		struct in6_ifreq ifr6;
-		uint32_t flags6;
-
-		memset(&ifr6, 0, sizeof(ifr6));
-		memcpy(&ifr6.ifr_addr, ai.ai_addr, ai.ai_addrlen);
-		if (_ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) == 0) {
-			flags6 = ifr6.ifr_ifru.ifru_flags6;
-			if ((flags6 & IN6_IFF_DEPRECATED))
-				aio->aio_srcflag |= AIO_SRCFLAG_DEPRECATED;
-		}
-	}
-#endif
-
-  cleanup:
-	_close(s);
-	return;
-}
-
-static int
-matchlen(struct sockaddr *src, struct sockaddr *dst)
-{
-	int match = 0;
-	u_char *s, *d;
-	u_char *lim, r;
-	int addrlen;
-
-	switch (src->sa_family) {
-#ifdef INET6
-	case AF_INET6:
-		s = (u_char *)&((struct sockaddr_in6 *)src)->sin6_addr;
-		d = (u_char *)&((struct sockaddr_in6 *)dst)->sin6_addr;
-		addrlen = sizeof(struct in6_addr);
-		lim = s + addrlen;
-		break;
-#endif
-	case AF_INET:
-		s = (u_char *)&((struct sockaddr_in *)src)->sin_addr;
-		d = (u_char *)&((struct sockaddr_in *)dst)->sin_addr;
-		addrlen = sizeof(struct in_addr);
-		lim = s + addrlen;
-		break;
-	default:
-		return(0);
-	}
-
-	while (s < lim)
-		if ((r = (*d++ ^ *s++)) != 0) {
-			while (r < addrlen * 8) {
-				match++;
-				r <<= 1;
-			}
-			break;
-		} else
-			match += 8;
-	return(match);
-}
-
-static int
-comp_dst(const void *arg1, const void *arg2)
-{
-	const struct ai_order *dst1 = arg1, *dst2 = arg2;
-
-	/*
-	 * Rule 1: Avoid unusable destinations.
-	 * XXX: we currently do not consider if an appropriate route exists.
-	 */
-	if (dst1->aio_srcsa.sa_family != AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family == AF_UNSPEC) {
-		return(-1);
-	}
-	if (dst1->aio_srcsa.sa_family == AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family != AF_UNSPEC) {
-		return(1);
-	}
-
-	/* Rule 2: Prefer matching scope. */
-	if (dst1->aio_dstscope == dst1->aio_srcscope &&
-	    dst2->aio_dstscope != dst2->aio_srcscope) {
-		return(-1);
-	}
-	if (dst1->aio_dstscope != dst1->aio_srcscope &&
-	    dst2->aio_dstscope == dst2->aio_srcscope) {
-		return(1);
-	}
-
-	/* Rule 3: Avoid deprecated addresses. */
-	if (dst1->aio_srcsa.sa_family != AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family != AF_UNSPEC) {
-		if (!(dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) &&
-		    (dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) {
-			return(-1);
-		}
-		if ((dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) &&
-		    !(dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) {
-			return(1);
-		}
-	}
-
-	/* Rule 4: Prefer home addresses. */
-	/* XXX: not implemented yet */
-
-	/* Rule 5: Prefer matching label. */
-#ifdef INET6
-	if (dst1->aio_srcpolicy && dst1->aio_dstpolicy &&
-	    dst1->aio_srcpolicy->pc_policy.label ==
-	    dst1->aio_dstpolicy->pc_policy.label &&
-	    (dst2->aio_srcpolicy == NULL || dst2->aio_dstpolicy == NULL ||
-	     dst2->aio_srcpolicy->pc_policy.label !=
-	     dst2->aio_dstpolicy->pc_policy.label)) {
-		return(-1);
-	}
-	if (dst2->aio_srcpolicy && dst2->aio_dstpolicy &&
-	    dst2->aio_srcpolicy->pc_policy.label ==
-	    dst2->aio_dstpolicy->pc_policy.label &&
-	    (dst1->aio_srcpolicy == NULL || dst1->aio_dstpolicy == NULL ||
-	     dst1->aio_srcpolicy->pc_policy.label !=
-	     dst1->aio_dstpolicy->pc_policy.label)) {
-		return(1);
-	}
-#endif
-
-	/* Rule 6: Prefer higher precedence. */
-#ifdef INET6
-	if (dst1->aio_dstpolicy &&
-	    (dst2->aio_dstpolicy == NULL ||
-	     dst1->aio_dstpolicy->pc_policy.preced >
-	     dst2->aio_dstpolicy->pc_policy.preced)) {
-		return(-1);
-	}
-	if (dst2->aio_dstpolicy &&
-	    (dst1->aio_dstpolicy == NULL ||
-	     dst2->aio_dstpolicy->pc_policy.preced >
-	     dst1->aio_dstpolicy->pc_policy.preced)) {
-		return(1);
-	}
-#endif
-
-	/* Rule 7: Prefer native transport. */
-	/* XXX: not implemented yet */
-
-	/* Rule 8: Prefer smaller scope. */
-	if (dst1->aio_dstscope >= 0 &&
-	    dst1->aio_dstscope < dst2->aio_dstscope) {
-		return(-1);
-	}
-	if (dst2->aio_dstscope >= 0 &&
-	    dst2->aio_dstscope < dst1->aio_dstscope) {
-		return(1);
-	}
-
-	/*
-	 * Rule 9: Use longest matching prefix.
-	 * We compare the match length in a same AF only.
-	 */
-	if (dst1->aio_ai->ai_addr->sa_family ==
-	    dst2->aio_ai->ai_addr->sa_family &&
-	    dst1->aio_ai->ai_addr->sa_family != AF_INET) {
-		if (dst1->aio_matchlen > dst2->aio_matchlen) {
-			return(-1);
-		}
-		if (dst1->aio_matchlen < dst2->aio_matchlen) {
-			return(1);
-		}
-	}
-
-	/* Rule 10: Otherwise, leave the order unchanged. */
-	return(-1);
-}
-
-/*
- * Copy from scope.c.
- * XXX: we should standardize the functions and link them as standard
- * library.
- */
-static int
-gai_addr2scopetype(struct sockaddr *sa)
-{
-#ifdef INET6
-	struct sockaddr_in6 *sa6;
-#endif
-	struct sockaddr_in *sa4;
-
-	switch(sa->sa_family) {
-#ifdef INET6
-	case AF_INET6:
-		sa6 = (struct sockaddr_in6 *)sa;
-		if (IN6_IS_ADDR_MULTICAST(&sa6->sin6_addr)) {
-			/* just use the scope field of the multicast address */
-			return(sa6->sin6_addr.s6_addr[2] & 0x0f);
-		}
-		/*
-		 * Unicast addresses: map scope type to corresponding scope
-		 * value defined for multcast addresses.
-		 * XXX: hardcoded scope type values are bad...
-		 */
-		if (IN6_IS_ADDR_LOOPBACK(&sa6->sin6_addr))
-			return(1); /* node local scope */
-		if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr))
-			return(2); /* link-local scope */
-		if (IN6_IS_ADDR_SITELOCAL(&sa6->sin6_addr))
-			return(5); /* site-local scope */
-		return(14);	/* global scope */
-		break;
-#endif
-	case AF_INET:
-		/*
-		 * IPv4 pseudo scoping according to RFC 3484.
-		 */
-		sa4 = (struct sockaddr_in *)sa;
-		/* IPv4 autoconfiguration addresses have link-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 169 &&
-		    ((u_char *)&sa4->sin_addr)[1] == 254)
-			return(2);
-		/* Private addresses have site-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 10 ||
-		    (((u_char *)&sa4->sin_addr)[0] == 172 &&
-		     (((u_char *)&sa4->sin_addr)[1] & 0xf0) == 16) ||
-		    (((u_char *)&sa4->sin_addr)[0] == 192 &&
-		     ((u_char *)&sa4->sin_addr)[1] == 168))
-			return(14);	/* XXX: It should be 5 unless NAT */
-		/* Loopback addresses have link-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 127)
-			return(2);
-		return(14);
-		break;
-	default:
-		errno = EAFNOSUPPORT; /* is this a good error? */
-		return(-1);
-	}
-}
-
-static int
-explore_copy(const struct addrinfo *pai, const struct addrinfo *src0,
-    struct addrinfo **res)
-{
-	int error;
-	struct addrinfo sentinel, *cur;
-	const struct addrinfo *src;
-
-	error = 0;
-	sentinel.ai_next = NULL;
-	cur = &sentinel;
-
-	for (src = src0; src != NULL; src = src->ai_next) {
-		if (src->ai_family != pai->ai_family)
-			continue;
-
-		cur->ai_next = copy_ai(src);
-		if (!cur->ai_next) {
-			error = EAI_MEMORY;
-			goto fail;
-		}
-
-		cur->ai_next->ai_socktype = pai->ai_socktype;
-		cur->ai_next->ai_protocol = pai->ai_protocol;
-		cur = cur->ai_next;
-	}
-
-	*res = sentinel.ai_next;
-	return 0;
-
-fail:
-	freeaddrinfo(sentinel.ai_next);
-	return error;
-}
-
-/*
- * hostname == NULL.
- * passive socket -> anyaddr (0.0.0.0 or ::)
- * non-passive socket -> localhost (127.0.0.1 or ::1)
- */
-static int
-explore_null(const struct addrinfo *pai, const char *servname,
-    struct addrinfo **res)
-{
-	int s;
-	const struct afd *afd;
-	struct addrinfo *ai;
-	int error;
-
-	*res = NULL;
-	ai = NULL;
-
-	/*
-	 * filter out AFs that are not supported by the kernel
-	 * XXX errno?
-	 */
-	s = _socket(pai->ai_family, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-	if (s < 0) {
-		if (errno != EMFILE)
-			return 0;
-	} else
-		_close(s);
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	if (pai->ai_flags & AI_PASSIVE) {
-		GET_AI(ai, afd, afd->a_addrany);
-		GET_PORT(ai, servname);
-	} else {
-		GET_AI(ai, afd, afd->a_loopback);
-		GET_PORT(ai, servname);
-	}
-
-	*res = ai;
-	return 0;
-
-free:
-	if (ai != NULL)
-		freeaddrinfo(ai);
-	return error;
-}
-
-/*
- * numeric hostname
- */
-static int
-explore_numeric(const struct addrinfo *pai, const char *hostname,
-    const char *servname, struct addrinfo **res, const char *canonname)
-{
-	const struct afd *afd;
-	struct addrinfo *ai;
-	int error;
-	char pton[PTON_MAX];
-
-	*res = NULL;
-	ai = NULL;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	switch (afd->a_af) {
-	case AF_INET:
-		/*
-		 * RFC3493 requires getaddrinfo() to accept AF_INET formats
-		 * that are accepted by inet_addr() and its family.  The
-		 * accepted forms includes the "classful" one, which inet_pton
-		 * does not accept.  So we need to separate the case for
-		 * AF_INET.
-		 */
-		if (inet_aton(hostname, (struct in_addr *)pton) != 1)
-			return 0;
-		break;
-	default:
-		if (inet_pton(afd->a_af, hostname, pton) != 1)
-			return 0;
-		break;
-	}
-
-	if (pai->ai_family == afd->a_af) {
-		GET_AI(ai, afd, pton);
-		GET_PORT(ai, servname);
-		if ((pai->ai_flags & AI_CANONNAME)) {
-			/*
-			 * Set the numeric address itself as the canonical
-			 * name, based on a clarification in RFC3493.
-			 */
-			GET_CANONNAME(ai, canonname);
-		}
-	} else {
-		/*
-		 * XXX: This should not happen since we already matched the AF
-		 * by find_afd.
-		 */
-		ERR(EAI_FAMILY);
-	}
-
-	*res = ai;
-	return 0;
-
-free:
-bad:
-	if (ai != NULL)
-		freeaddrinfo(ai);
-	return error;
-}
-
-/*
- * numeric hostname with scope
- */
-static int
-explore_numeric_scope(const struct addrinfo *pai, const char *hostname,
-    const char *servname, struct addrinfo **res)
-{
-#if !defined(SCOPE_DELIMITER) || !defined(INET6)
-	return explore_numeric(pai, hostname, servname, res, hostname);
-#else
-	const struct afd *afd;
-	struct addrinfo *cur;
-	int error;
-	char *cp, *hostname2 = NULL, *scope, *addr;
-	struct sockaddr_in6 *sin6;
-
-	afd = find_afd(pai->ai_family);
-	if (afd == NULL)
-		return 0;
-
-	if (!afd->a_scoped)
-		return explore_numeric(pai, hostname, servname, res, hostname);
-
-	cp = strchr(hostname, SCOPE_DELIMITER);
-	if (cp == NULL)
-		return explore_numeric(pai, hostname, servname, res, hostname);
-
-	/*
-	 * Handle special case of <scoped_address><delimiter><scope id>
-	 */
-	hostname2 = strdup(hostname);
-	if (hostname2 == NULL)
-		return EAI_MEMORY;
-	/* terminate at the delimiter */
-	hostname2[cp - hostname] = '\0';
-	addr = hostname2;
-	scope = cp + 1;
-
-	error = explore_numeric(pai, addr, servname, res, hostname);
-	if (error == 0) {
-		uint32_t scopeid;
-
-		for (cur = *res; cur; cur = cur->ai_next) {
-			if (cur->ai_family != AF_INET6)
-				continue;
-			sin6 = (struct sockaddr_in6 *)(void *)cur->ai_addr;
-			if (ip6_str2scopeid(scope, sin6, &scopeid) == -1) {
-				free(hostname2);
-				freeaddrinfo(*res);
-				*res = NULL;
-				return(EAI_NONAME); /* XXX: is return OK? */
-			}
-			sin6->sin6_scope_id = scopeid;
-		}
-	}
-
-	free(hostname2);
-
-	if (error && *res) {
-		freeaddrinfo(*res);
-		*res = NULL;
-	}
-	return error;
-#endif
-}
-
-static int
-get_canonname(const struct addrinfo *pai, struct addrinfo *ai, const char *str)
-{
-	if ((pai->ai_flags & AI_CANONNAME) != 0) {
-		ai->ai_canonname = strdup(str);
-		if (ai->ai_canonname == NULL)
-			return EAI_MEMORY;
-	}
-	return 0;
-}
-
-static struct addrinfo *
-get_ai(const struct addrinfo *pai, const struct afd *afd, const char *addr)
-{
-	char *p;
-	struct addrinfo *ai;
-#ifdef FAITH
-	struct in6_addr faith_prefix;
-	char *fp_str;
-	int translate = 0;
-#endif
-
-#ifdef FAITH
-	/*
-	 * Transfrom an IPv4 addr into a special IPv6 addr format for
-	 * IPv6->IPv4 translation gateway. (only TCP is supported now)
-	 *
-	 * +-----------------------------------+------------+
-	 * | faith prefix part (12 bytes)      | embedded   |
-	 * |                                   | IPv4 addr part (4 bytes)
-	 * +-----------------------------------+------------+
-	 *
-	 * faith prefix part is specified as ascii IPv6 addr format
-	 * in environmental variable GAI.
-	 * For FAITH to work correctly, routing to faith prefix must be
-	 * setup toward a machine where a FAITH daemon operates.
-	 * Also, the machine must enable some mechanizm
-	 * (e.g. faith interface hack) to divert those packet with
-	 * faith prefixed destination addr to user-land FAITH daemon.
-	 */
-	fp_str = getenv("GAI");
-	if (fp_str && inet_pton(AF_INET6, fp_str, &faith_prefix) == 1 &&
-	    afd->a_af == AF_INET && pai->ai_socktype == SOCK_STREAM) {
-		uint32_t v4a;
-		u_int8_t v4a_top;
-
-		memcpy(&v4a, addr, sizeof v4a);
-		v4a_top = v4a >> IN_CLASSA_NSHIFT;
-		if (!IN_MULTICAST(v4a) && !IN_EXPERIMENTAL(v4a) &&
-		    v4a_top != 0 && v4a != IN_LOOPBACKNET) {
-			afd = &afdl[N_INET6];
-			memcpy(&faith_prefix.s6_addr[12], addr,
-			       sizeof(struct in_addr));
-			translate = 1;
-		}
-	}
-#endif
-
-	ai = (struct addrinfo *)malloc(sizeof(struct addrinfo)
-		+ (afd->a_socklen));
-	if (ai == NULL)
-		return NULL;
-
-	memcpy(ai, pai, sizeof(struct addrinfo));
-	ai->ai_addr = (struct sockaddr *)(void *)(ai + 1);
-	memset(ai->ai_addr, 0, (size_t)afd->a_socklen);
-	ai->ai_addr->sa_len = afd->a_socklen;
-	ai->ai_addrlen = afd->a_socklen;
-	ai->ai_addr->sa_family = ai->ai_family = afd->a_af;
-	p = (char *)(void *)(ai->ai_addr);
-#ifdef FAITH
-	if (translate == 1)
-		memcpy(p + afd->a_off, &faith_prefix, (size_t)afd->a_addrlen);
-	else
-#endif
-	memcpy(p + afd->a_off, addr, (size_t)afd->a_addrlen);
-	return ai;
-}
-
-/* XXX need to malloc() the same way we do from other functions! */
-static struct addrinfo *
-copy_ai(const struct addrinfo *pai)
-{
-	struct addrinfo *ai;
-	size_t l;
-
-	l = sizeof(*ai) + pai->ai_addrlen;
-	if ((ai = (struct addrinfo *)malloc(l)) == NULL)
-		return NULL;
-	memset(ai, 0, l);
-	memcpy(ai, pai, sizeof(*ai));
-	ai->ai_addr = (struct sockaddr *)(void *)(ai + 1);
-	memcpy(ai->ai_addr, pai->ai_addr, pai->ai_addrlen);
-
-	if (pai->ai_canonname) {
-		l = strlen(pai->ai_canonname) + 1;
-		if ((ai->ai_canonname = malloc(l)) == NULL) {
-			free(ai);
-			return NULL;
-		}
-		strlcpy(ai->ai_canonname, pai->ai_canonname, l);
-	} else {
-		/* just to make sure */
-		ai->ai_canonname = NULL;
-	}
-
-	ai->ai_next = NULL;
-
-	return ai;
-}
-
-static int
-get_portmatch(const struct addrinfo *ai, const char *servname)
-{
-
-	/* get_port does not touch first argument when matchonly == 1. */
-	/* LINTED const cast */
-	return get_port((struct addrinfo *)ai, servname, 1);
-}
-
-static int
-get_port(struct addrinfo *ai, const char *servname, int matchonly)
-{
-	const char *proto;
-	struct servent *sp;
-	int port, error;
-	int allownumeric;
-
-	if (servname == NULL)
-		return 0;
-	switch (ai->ai_family) {
-	case AF_INET:
-#ifdef AF_INET6
-	case AF_INET6:
-#endif
-		break;
-	default:
-		return 0;
-	}
-
-	switch (ai->ai_socktype) {
-	case SOCK_RAW:
-		return EAI_SERVICE;
-	case SOCK_DGRAM:
-	case SOCK_STREAM:
-	case SOCK_SEQPACKET:
-		allownumeric = 1;
-		break;
-	case ANY:
-		switch (ai->ai_family) {
-		case AF_INET:
-#ifdef AF_INET6
-		case AF_INET6:
-#endif
-			allownumeric = 1;
-			break;
-		default:
-			allownumeric = 0;
-			break;
-		}
-		break;
-	default:
-		return EAI_SOCKTYPE;
-	}
-
-	error = str2number(servname, &port);
-	if (error == 0) {
-		if (!allownumeric)
-			return EAI_SERVICE;
-		if (port < 0 || port > 65535)
-			return EAI_SERVICE;
-		port = htons(port);
-	} else {
-		if (ai->ai_flags & AI_NUMERICSERV)
-			return EAI_NONAME;
-
-		switch (ai->ai_protocol) {
-		case IPPROTO_UDP:
-			proto = "udp";
-			break;
-		case IPPROTO_TCP:
-			proto = "tcp";
-			break;
-		case IPPROTO_SCTP:
-			proto = "sctp";
-			break;
-		case IPPROTO_UDPLITE:
-			proto = "udplite";
-			break;
-		default:
-			proto = NULL;
-			break;
-		}
-
-		if ((sp = getservbyname(servname, proto)) == NULL)
-			return EAI_SERVICE;
-		port = sp->s_port;
-	}
-
-	if (!matchonly) {
-		switch (ai->ai_family) {
-		case AF_INET:
-			((struct sockaddr_in *)(void *)
-			    ai->ai_addr)->sin_port = port;
-			break;
-#ifdef INET6
-		case AF_INET6:
-			((struct sockaddr_in6 *)(void *)
-			    ai->ai_addr)->sin6_port = port;
-			break;
-#endif
-		}
-	}
-
-	return 0;
-}
-
-static const struct afd *
-find_afd(int af)
-{
-	const struct afd *afd;
-
-	if (af == PF_UNSPEC)
-		return NULL;
-	for (afd = afdl; afd->a_af; afd++) {
-		if (afd->a_af == af)
-			return afd;
-	}
-	return NULL;
-}
-
-/*
- * RFC 3493: AI_ADDRCONFIG check.  Determines which address families are
- * configured on the local system and correlates with pai->ai_family value.
- * If an address family is not configured on the system, it will not be
- * queried for.  For this purpose, loopback addresses are not considered
- * configured addresses.
- *
- * XXX PF_UNSPEC -> PF_INET6 + PF_INET mapping needs to be in sync with
- * _dns_getaddrinfo.
- */
-static int
-addrconfig(struct addrinfo *pai)
-{
-	struct ifaddrs *ifaddrs, *ifa;
-	struct sockaddr_in *sin;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	int seen_inet = 0, seen_inet6 = 0;
-
-	if (getifaddrs(&ifaddrs) != 0)
-		return (0);
-
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr == NULL || (ifa->ifa_flags & IFF_UP) == 0)
-			continue;
-		switch (ifa->ifa_addr->sa_family) {
-		case AF_INET:
-			if (seen_inet)
-				continue;
-			sin = (struct sockaddr_in *)(ifa->ifa_addr);
-			if (IN_LOOPBACK(htonl(sin->sin_addr.s_addr)))
-				continue;
-			seen_inet = 1;
-			break;
-#ifdef INET6
-		case AF_INET6:
-			if (seen_inet6)
-				continue;
-			sin6 = (struct sockaddr_in6 *)(ifa->ifa_addr);
-			if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
-				continue;
-			if ((ifa->ifa_flags & IFT_LOOP) != 0 &&
-			    IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr))
-				continue;
-			if (is_ifdisabled(ifa->ifa_name))
-				continue;
-			seen_inet6 = 1;
-			break;
-#endif
-		}
-	}
-	freeifaddrs(ifaddrs);
-
-	switch(pai->ai_family) {
-	case AF_INET6:
-		return (seen_inet6);
-	case AF_INET:
-		return (seen_inet);
-	case AF_UNSPEC:
-		if (seen_inet == seen_inet6)
-			return (seen_inet);
-		pai->ai_family = seen_inet ? AF_INET : AF_INET6;
-		return (1);
-	}
-	return (1);
-}
-
-#ifdef INET6
-static int
-is_ifdisabled(char *name)
-{
-	struct in6_ndireq nd;
-	int fd;
-
-	if ((fd = _socket(AF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0)) < 0)
-		return (-1);
-	memset(&nd, 0, sizeof(nd));
-	strlcpy(nd.ifname, name, sizeof(nd.ifname));
-	if (_ioctl(fd, SIOCGIFINFO_IN6, &nd) < 0) {
-		_close(fd);
-		return (-1);
-	}
-	_close(fd);
-	return ((nd.ndi.flags & ND6_IFF_IFDISABLED) != 0);
-}
-
-/* convert a string to a scope identifier. XXX: IPv6 specific */
-static int
-ip6_str2scopeid(char *scope, struct sockaddr_in6 *sin6, uint32_t *scopeid)
-{
-	u_long lscopeid;
-	struct in6_addr *a6;
-	char *ep;
-
-	a6 = &sin6->sin6_addr;
-
-	/* empty scopeid portion is invalid */
-	if (*scope == '\0')
-		return -1;
-
-	if (IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6) ||
-	    IN6_IS_ADDR_MC_NODELOCAL(a6)) {
-		/*
-		 * We currently assume a one-to-one mapping between links
-		 * and interfaces, so we simply use interface indices for
-		 * like-local scopes.
-		 */
-		*scopeid = if_nametoindex(scope);
-		if (*scopeid == 0)
-			goto trynumeric;
-		return 0;
-	}
-
-	/* still unclear about literal, allow numeric only - placeholder */
-	if (IN6_IS_ADDR_SITELOCAL(a6) || IN6_IS_ADDR_MC_SITELOCAL(a6))
-		goto trynumeric;
-	if (IN6_IS_ADDR_MC_ORGLOCAL(a6))
-		goto trynumeric;
-	else
-		goto trynumeric;	/* global */
-
-	/* try to convert to a numeric id as a last resort */
-  trynumeric:
-	errno = 0;
-	lscopeid = strtoul(scope, &ep, 10);
-	*scopeid = (uint32_t)(lscopeid & 0xffffffffUL);
-	if (errno == 0 && ep && *ep == '\0' && *scopeid == lscopeid)
-		return 0;
-	else
-		return -1;
-}
-#endif
-
-
-#ifdef NS_CACHING
-static int
-addrinfo_id_func(char *buffer, size_t *buffer_size, va_list ap,
-    void *cache_mdata)
-{
-	res_state statp;
-	u_long res_options;
-
-	const int op_id = 0;	/* identifies the getaddrinfo for the cache */
-	char *hostname;
-	struct addrinfo *hints;
-
-	char *p;
-	int ai_flags, ai_family, ai_socktype, ai_protocol;
-	size_t desired_size, size;
-
-	statp = __res_state();
-	res_options = statp->options & (RES_RECURSE | RES_DEFNAMES |
-	    RES_DNSRCH | RES_NOALIASES | RES_USE_INET6);
-
-	hostname = va_arg(ap, char *);
-	hints = va_arg(ap, struct addrinfo *);
-
-	desired_size = sizeof(res_options) + sizeof(int) + sizeof(int) * 4;
-	if (hostname != NULL) {
-		size = strlen(hostname);
-		desired_size += size + 1;
-	} else
-		size = 0;
-
-	if (desired_size > *buffer_size) {
-		*buffer_size = desired_size;
-		return (NS_RETURN);
-	}
-
-	if (hints == NULL)
-		ai_flags = ai_family = ai_socktype = ai_protocol = 0;
-	else {
-		ai_flags = hints->ai_flags;
-		ai_family = hints->ai_family;
-		ai_socktype = hints->ai_socktype;
-		ai_protocol = hints->ai_protocol;
-	}
-
-	p = buffer;
-	memcpy(p, &res_options, sizeof(res_options));
-	p += sizeof(res_options);
-
-	memcpy(p, &op_id, sizeof(int));
-	p += sizeof(int);
-
-	memcpy(p, &ai_flags, sizeof(int));
-	p += sizeof(int);
-
-	memcpy(p, &ai_family, sizeof(int));
-	p += sizeof(int);
-
-	memcpy(p, &ai_socktype, sizeof(int));
-	p += sizeof(int);
-
-	memcpy(p, &ai_protocol, sizeof(int));
-	p += sizeof(int);
-
-	if (hostname != NULL)
-		memcpy(p, hostname, size);
-
-	*buffer_size = desired_size;
-	return (NS_SUCCESS);
-}
-
-static int
-addrinfo_marshal_func(char *buffer, size_t *buffer_size, void *retval,
-    va_list ap, void *cache_mdata)
-{
-	struct addrinfo	*ai, *cai;
-	char *p;
-	size_t desired_size, size, ai_size;
-
-	ai = *((struct addrinfo **)retval);
-
-	desired_size = sizeof(size_t);
-	ai_size = 0;
-	for (cai = ai; cai != NULL; cai = cai->ai_next) {
-		desired_size += sizeof(struct addrinfo) + cai->ai_addrlen;
-		if (cai->ai_canonname != NULL)
-			desired_size += sizeof(size_t) +
-			    strlen(cai->ai_canonname);
-		++ai_size;
-	}
-
-	if (desired_size > *buffer_size) {
-		/* this assignment is here for future use */
-		errno = ERANGE;
-		*buffer_size = desired_size;
-		return (NS_RETURN);
-	}
-
-	memset(buffer, 0, desired_size);
-	p = buffer;
-
-	memcpy(p, &ai_size, sizeof(size_t));
-	p += sizeof(size_t);
-	for (cai = ai; cai != NULL; cai = cai->ai_next) {
-		memcpy(p, cai, sizeof(struct addrinfo));
-		p += sizeof(struct addrinfo);
-
-		memcpy(p, cai->ai_addr, cai->ai_addrlen);
-		p += cai->ai_addrlen;
-
-		if (cai->ai_canonname != NULL) {
-			size = strlen(cai->ai_canonname);
-			memcpy(p, &size, sizeof(size_t));
-			p += sizeof(size_t);
-
-			memcpy(p, cai->ai_canonname, size);
-			p += size;
-		}
-	}
-
-	return (NS_SUCCESS);
-}
-
-static int
-addrinfo_unmarshal_func(char *buffer, size_t buffer_size, void *retval,
-    va_list ap, void *cache_mdata)
-{
-	struct addrinfo	new_ai, *result, *sentinel, *lasts;
-
-	char *p;
-	size_t ai_size, ai_i, size;
-
-	p = buffer;
-	memcpy(&ai_size, p, sizeof(size_t));
-	p += sizeof(size_t);
-
-	result = NULL;
-	lasts = NULL;
-	for (ai_i = 0; ai_i < ai_size; ++ai_i) {
-		memcpy(&new_ai, p, sizeof(struct addrinfo));
-		p += sizeof(struct addrinfo);
-		size = new_ai.ai_addrlen + sizeof(struct addrinfo) +
-			_ALIGNBYTES;
-
-		sentinel = (struct addrinfo *)malloc(size);
-		memset(sentinel, 0, size);
-
-		memcpy(sentinel, &new_ai, sizeof(struct addrinfo));
-		sentinel->ai_addr = (struct sockaddr *)_ALIGN((char *)sentinel +
-		    sizeof(struct addrinfo));
-
-		memcpy(sentinel->ai_addr, p, new_ai.ai_addrlen);
-		p += new_ai.ai_addrlen;
-
-		if (new_ai.ai_canonname != NULL) {
-			memcpy(&size, p, sizeof(size_t));
-			p += sizeof(size_t);
-
-			sentinel->ai_canonname = (char *)malloc(size + 1);
-			memset(sentinel->ai_canonname, 0, size + 1);
-
-			memcpy(sentinel->ai_canonname, p, size);
-			p += size;
-		}
-
-		if (result == NULL) {
-			result = sentinel;
-			lasts = sentinel;
-		} else {
-			lasts->ai_next = sentinel;
-			lasts = sentinel;
-		}
-	}
-
-	*((struct addrinfo **)retval) = result;
-	return (NS_SUCCESS);
-}
-#endif /* NS_CACHING */
-
-/*
- * FQDN hostname, DNS lookup
- */
-static int
-explore_fqdn(const struct addrinfo *pai, const char *hostname,
-    const char *servname, struct addrinfo **res)
-{
-	struct addrinfo *result;
-	struct addrinfo *cur;
-	int error = 0;
-
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-	NS_COMMON_CACHE_INFO_INITIALIZER(
-		hosts, NULL, addrinfo_id_func, addrinfo_marshal_func,
-		addrinfo_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_files_getaddrinfo, NULL)
-		{ NSSRC_DNS, _dns_getaddrinfo, NULL },	/* force -DHESIOD */
-		NS_NIS_CB(_yp_getaddrinfo, NULL)
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ 0 }
-	};
-
-	result = NULL;
-
-	/*
-	 * if the servname does not match socktype/protocol, ignore it.
-	 */
-	if (get_portmatch(pai, servname) != 0)
-		return 0;
-
-	switch (_nsdispatch(&result, dtab, NSDB_HOSTS, "getaddrinfo",
-			default_dns_files, hostname, pai)) {
-	case NS_TRYAGAIN:
-		error = EAI_AGAIN;
-		goto free;
-	case NS_UNAVAIL:
-		error = EAI_FAIL;
-		goto free;
-	case NS_NOTFOUND:
-		error = EAI_NONAME;
-		goto free;
-	case NS_SUCCESS:
-		error = 0;
-		for (cur = result; cur; cur = cur->ai_next) {
-			GET_PORT(cur, servname);
-			/* canonname should be filled already */
-		}
-		break;
-	}
-
-	*res = result;
-
-	return 0;
-
-free:
-	if (result)
-		freeaddrinfo(result);
-	return error;
-}
-
-#ifdef DEBUG
-static const char AskedForGot[] =
-	"gethostby*.getanswer: asked for \"%s\", got \"%s\"";
-#endif
-
-static struct addrinfo *
-getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-    const struct addrinfo *pai, res_state res)
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo ai;
-	const struct afd *afd;
-	char *canonname;
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	const u_char *eom;
-	char *bp, *ep;
-	int type, class, ancount, qdcount;
-	int haveanswer, had_error;
-	char tbuf[MAXDNAME];
-	int (*name_ok)(const char *);
-	char hostbuf[8*1024];
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	canonname = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-	case T_ANY:	/*use T_ANY only for T_A/T_AAAA lookup*/
-		name_ok = res_hnok;
-		break;
-	default:
-		return (NULL);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hostbuf;
-	ep = hostbuf + sizeof hostbuf;
-	cp = answer->buf + HFIXEDSZ;
-	if (qdcount != 1) {
-		RES_SET_H_ERRNO(res, NO_RECOVERY);
-		return (NULL);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		RES_SET_H_ERRNO(res, NO_RECOVERY);
-		return (NULL);
-	}
-	cp += n + QFIXEDSZ;
-	if (qtype == T_A || qtype == T_AAAA || qtype == T_ANY) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			return (NULL);
-		}
-		canonname = bp;
-		bp += n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = canonname;
-	}
-	haveanswer = 0;
-	had_error = 0;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ + INT32SZ;	/* class, TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA || qtype == T_ANY) &&
-		    type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strlcpy(bp, tbuf, ep - bp);
-			canonname = bp;
-			bp += n;
-			continue;
-		}
-		if (qtype == T_ANY) {
-			if (!(type == T_A || type == T_AAAA)) {
-				cp += n;
-				continue;
-			}
-		} else if (type != qtype) {
-#ifdef DEBUG
-			if (type != T_KEY && type != T_SIG &&
-			    type != ns_t_dname)
-				syslog(LOG_NOTICE|LOG_AUTH,
-	       "gethostby*.getanswer: asked for \"%s %s %s\", got type \"%s\"",
-				       qname, p_class(C_IN), p_type(qtype),
-				       p_type(type));
-#endif
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(canonname, bp) != 0) {
-#ifdef DEBUG
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, canonname, bp);
-#endif
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (type == T_A && n != INADDRSZ) {
-				cp += n;
-				continue;
-			}
-			if (type == T_AAAA && n != IN6ADDRSZ) {
-				cp += n;
-				continue;
-			}
-#ifdef FILTER_V4MAPPED
-			if (type == T_AAAA) {
-				struct in6_addr in6;
-				memcpy(&in6, cp, sizeof(in6));
-				if (IN6_IS_ADDR_V4MAPPED(&in6)) {
-					cp += n;
-					continue;
-				}
-			}
-#endif
-			if (!haveanswer) {
-				int nn;
-
-				canonname = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-			}
-
-			/* don't overwrite pai */
-			ai = *pai;
-			ai.ai_family = (type == T_A) ? AF_INET : AF_INET6;
-			afd = find_afd(ai.ai_family);
-			if (afd == NULL) {
-				cp += n;
-				continue;
-			}
-			cur->ai_next = get_ai(&ai, afd, (const char *)cp);
-			if (cur->ai_next == NULL)
-				had_error++;
-			while (cur && cur->ai_next)
-				cur = cur->ai_next;
-			cp += n;
-			break;
-		default:
-			abort();
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-#if defined(RESOLVSORT)
-		/*
-		 * We support only IPv4 address for backward
-		 * compatibility against gethostbyname(3).
-		 */
-		if (res->nsort && qtype == T_A) {
-			if (addr4sort(&sentinel, res) < 0) {
-				freeaddrinfo(sentinel.ai_next);
-				RES_SET_H_ERRNO(res, NO_RECOVERY);
-				return NULL;
-			}
-		}
-#endif /*RESOLVSORT*/
-		if (!canonname)
-			(void)get_canonname(pai, sentinel.ai_next, qname);
-		else
-			(void)get_canonname(pai, sentinel.ai_next, canonname);
-		RES_SET_H_ERRNO(res, NETDB_SUCCESS);
-		return sentinel.ai_next;
-	}
-
-	RES_SET_H_ERRNO(res, NO_RECOVERY);
-	return NULL;
-}
-
-#ifdef RESOLVSORT
-struct addr_ptr {
-	struct addrinfo *ai;
-	int aval;
-};
-
-static int
-addr4sort(struct addrinfo *sentinel, res_state res)
-{
-	struct addrinfo *ai;
-	struct addr_ptr *addrs, addr;
-	struct sockaddr_in *sin;
-	int naddrs, i, j;
-	int needsort = 0;
-
-	if (!sentinel)
-		return -1;
-	naddrs = 0;
-	for (ai = sentinel->ai_next; ai; ai = ai->ai_next)
-		naddrs++;
-	if (naddrs < 2)
-		return 0;		/* We don't need sorting. */
-	if ((addrs = malloc(sizeof(struct addr_ptr) * naddrs)) == NULL)
-		return -1;
-	i = 0;
-	for (ai = sentinel->ai_next; ai; ai = ai->ai_next) {
-		sin = (struct sockaddr_in *)ai->ai_addr;
-		for (j = 0; (unsigned)j < res->nsort; j++) {
-			if (res->sort_list[j].addr.s_addr ==
-			    (sin->sin_addr.s_addr & res->sort_list[j].mask))
-				break;
-		}
-		addrs[i].ai = ai;
-		addrs[i].aval = j;
-		if (needsort == 0 && i > 0 && j < addrs[i - 1].aval)
-			needsort = i;
-		i++;
-	}
-	if (!needsort) {
-		free(addrs);
-		return 0;
-	}
-
-	while (needsort < naddrs) {
-		for (j = needsort - 1; j >= 0; j--) {
-			if (addrs[j].aval > addrs[j+1].aval) {
-				addr = addrs[j];
-				addrs[j] = addrs[j + 1];
-				addrs[j + 1] = addr;
-			} else
-				break;
-		}
-		needsort++;
-	}
-
-	ai = sentinel;
-	for (i = 0; i < naddrs; ++i) {
-		ai->ai_next = addrs[i].ai;
-		ai = ai->ai_next;
-	}
-	ai->ai_next = NULL;
-	free(addrs);
-	return 0;
-}
-#endif /*RESOLVSORT*/
-
-/*ARGSUSED*/
-static int
-_dns_getaddrinfo(void *rv, void *cb_data, va_list ap)
-{
-	struct addrinfo *ai;
-	querybuf *buf, *buf2;
-	const char *hostname;
-	const struct addrinfo *pai;
-	struct addrinfo sentinel, *cur;
-	struct res_target q, q2;
-	res_state res;
-
-	hostname = va_arg(ap, char *);
-	pai = va_arg(ap, const struct addrinfo *);
-
-	memset(&q, 0, sizeof(q));
-	memset(&q2, 0, sizeof(q2));
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	buf = malloc(sizeof(*buf));
-	if (!buf) {
-		RES_SET_H_ERRNO(res, NETDB_INTERNAL);
-		return NS_NOTFOUND;
-	}
-	buf2 = malloc(sizeof(*buf2));
-	if (!buf2) {
-		free(buf);
-		RES_SET_H_ERRNO(res, NETDB_INTERNAL);
-		return NS_NOTFOUND;
-	}
-
-	switch (pai->ai_family) {
-	case AF_UNSPEC:
-		q.name = hostname;
-		q.qclass = C_IN;
-		q.qtype = T_A;
-		q.answer = buf->buf;
-		q.anslen = sizeof(buf->buf);
-		q.next = &q2;
-		q2.name = hostname;
-		q2.qclass = C_IN;
-		q2.qtype = T_AAAA;
-		q2.answer = buf2->buf;
-		q2.anslen = sizeof(buf2->buf);
-		break;
-	case AF_INET:
-		q.name = hostname;
-		q.qclass = C_IN;
-		q.qtype = T_A;
-		q.answer = buf->buf;
-		q.anslen = sizeof(buf->buf);
-		break;
-	case AF_INET6:
-		q.name = hostname;
-		q.qclass = C_IN;
-		q.qtype = T_AAAA;
-		q.answer = buf->buf;
-		q.anslen = sizeof(buf->buf);
-		break;
-	default:
-		free(buf);
-		free(buf2);
-		return NS_UNAVAIL;
-	}
-
-	res = __res_state();
-	if ((res->options & RES_INIT) == 0 && res_ninit(res) == -1) {
-		RES_SET_H_ERRNO(res, NETDB_INTERNAL);
-		free(buf);
-		free(buf2);
-		return NS_NOTFOUND;
-	}
-
-	if (res_searchN(hostname, &q, res) < 0) {
-		free(buf);
-		free(buf2);
-		return NS_NOTFOUND;
-	}
-	/* prefer IPv6 */
-	if (q.next) {
-		ai = getanswer(buf2, q2.n, q2.name, q2.qtype, pai, res);
-		if (ai) {
-			cur->ai_next = ai;
-			while (cur && cur->ai_next)
-				cur = cur->ai_next;
-		}
-	}
-	ai = getanswer(buf, q.n, q.name, q.qtype, pai, res);
-	if (ai)
-		cur->ai_next = ai;
-	free(buf);
-	free(buf2);
-	if (sentinel.ai_next == NULL)
-		switch (res->res_h_errno) {
-		case HOST_NOT_FOUND:
-			return NS_NOTFOUND;
-		case TRY_AGAIN:
-			return NS_TRYAGAIN;
-		default:
-			return NS_UNAVAIL;
-		}
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	return NS_SUCCESS;
-}
-
-static void
-_sethtent(FILE **hostf)
-{
-	if (!*hostf)
-		*hostf = fopen(_PATH_HOSTS, "re");
-	else
-		rewind(*hostf);
-}
-
-static void
-_endhtent(FILE **hostf)
-{
-	if (*hostf) {
-		(void) fclose(*hostf);
-		*hostf = NULL;
-	}
-}
-
-static struct addrinfo *
-_gethtent(FILE **hostf, const char *name, const struct addrinfo *pai)
-{
-	char *p;
-	char *cp, *tname, *cname;
-	struct addrinfo hints, *res0, *res;
-	int error;
-	const char *addr;
-	char hostbuf[8*1024];
-
-	if (!*hostf && !(*hostf = fopen(_PATH_HOSTS, "re")))
-		return (NULL);
-again:
-	if (!(p = fgets(hostbuf, sizeof hostbuf, *hostf)))
-		return (NULL);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-	addr = p;
-	cname = NULL;
-	/* if this is not something we're looking for, skip it. */
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		tname = cp;
-		if (cname == NULL)
-			cname = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-		if (strcasecmp(name, tname) == 0)
-			goto found;
-	}
-	goto again;
-
-found:
-	/* we should not glob socktype/protocol here */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = pai->ai_family;
-	hints.ai_socktype = SOCK_DGRAM;
-	hints.ai_protocol = 0;
-	hints.ai_flags = AI_NUMERICHOST;
-	error = getaddrinfo(addr, "0", &hints, &res0);
-	if (error)
-		goto again;
-#ifdef FILTER_V4MAPPED
-	/* XXX should check all items in the chain */
-	if (res0->ai_family == AF_INET6 &&
-	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)res0->ai_addr)->sin6_addr)) {
-		freeaddrinfo(res0);
-		goto again;
-	}
-#endif
-	for (res = res0; res; res = res->ai_next) {
-		/* cover it up */
-		res->ai_flags = pai->ai_flags;
-		res->ai_socktype = pai->ai_socktype;
-		res->ai_protocol = pai->ai_protocol;
-
-		if (pai->ai_flags & AI_CANONNAME) {
-			if (get_canonname(pai, res, cname) != 0) {
-				freeaddrinfo(res0);
-				goto again;
-			}
-		}
-	}
-	return res0;
-}
-
-/*ARGSUSED*/
-static int
-_files_getaddrinfo(void *rv, void *cb_data, va_list ap)
-{
-	const char *name;
-	const struct addrinfo *pai;
-	struct addrinfo sentinel, *cur;
-	struct addrinfo *p;
-	FILE *hostf = NULL;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, struct addrinfo *);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	_sethtent(&hostf);
-	while ((p = _gethtent(&hostf, name, pai)) != NULL) {
-		cur->ai_next = p;
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-	_endhtent(&hostf);
-
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	if (sentinel.ai_next == NULL)
-		return NS_NOTFOUND;
-	return NS_SUCCESS;
-}
-
-#ifdef YP
-/*ARGSUSED*/
-static struct addrinfo *
-_yphostent(char *line, const struct addrinfo *pai)
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo hints, *res, *res0;
-	int error;
-	char *p = line;
-	const char *addr, *canonname;
-	char *nextline;
-	char *cp;
-
-	addr = canonname = NULL;
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-nextline:
-	/* terminate line */
-	cp = strchr(p, '\n');
-	if (cp) {
-		*cp++ = '\0';
-		nextline = cp;
-	} else
-		nextline = NULL;
-
-	cp = strpbrk(p, " \t");
-	if (cp == NULL) {
-		if (canonname == NULL)
-			return (NULL);
-		else
-			goto done;
-	}
-	*cp++ = '\0';
-
-	addr = p;
-
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (!canonname)
-			canonname = cp;
-		if ((cp = strpbrk(cp, " \t")) != NULL)
-			*cp++ = '\0';
-	}
-
-	hints = *pai;
-	hints.ai_flags = AI_NUMERICHOST;
-	error = getaddrinfo(addr, NULL, &hints, &res0);
-	if (error == 0) {
-		for (res = res0; res; res = res->ai_next) {
-			/* cover it up */
-			res->ai_flags = pai->ai_flags;
-
-			if (pai->ai_flags & AI_CANONNAME)
-				(void)get_canonname(pai, res, canonname);
-		}
-	} else
-		res0 = NULL;
-	if (res0) {
-		cur->ai_next = res0;
-		while (cur && cur->ai_next)
-			cur = cur->ai_next;
-	}
-
-	if (nextline) {
-		p = nextline;
-		goto nextline;
-	}
-
-done:
-	return sentinel.ai_next;
-}
-
-/*ARGSUSED*/
-static int
-_yp_getaddrinfo(void *rv, void *cb_data, va_list ap)
-{
-	struct addrinfo sentinel, *cur;
-	struct addrinfo *ai = NULL;
-	char *ypbuf;
-	int ypbuflen, r;
-	const char *name;
-	const struct addrinfo *pai;
-	char *ypdomain;
-
-	if (_yp_check(&ypdomain) == 0)
-		return NS_UNAVAIL;
-
-	name = va_arg(ap, char *);
-	pai = va_arg(ap, const struct addrinfo *);
-
-	memset(&sentinel, 0, sizeof(sentinel));
-	cur = &sentinel;
-
-	/* hosts.byname is only for IPv4 (Solaris8) */
-	if (pai->ai_family == PF_UNSPEC || pai->ai_family == PF_INET) {
-		r = yp_match(ypdomain, "hosts.byname", name,
-			(int)strlen(name), &ypbuf, &ypbuflen);
-		if (r == 0) {
-			struct addrinfo ai4;
-
-			ai4 = *pai;
-			ai4.ai_family = AF_INET;
-			ai = _yphostent(ypbuf, &ai4);
-			if (ai) {
-				cur->ai_next = ai;
-				while (cur && cur->ai_next)
-					cur = cur->ai_next;
-			}
-			free(ypbuf);
-		}
-	}
-
-	/* ipnodes.byname can hold both IPv4/v6 */
-	r = yp_match(ypdomain, "ipnodes.byname", name,
-		(int)strlen(name), &ypbuf, &ypbuflen);
-	if (r == 0) {
-		ai = _yphostent(ypbuf, pai);
-		if (ai)
-			cur->ai_next = ai;
-		free(ypbuf);
-	}
-
-	if (sentinel.ai_next == NULL) {
-		RES_SET_H_ERRNO(__res_state(), HOST_NOT_FOUND);
-		return NS_NOTFOUND;
-	}
-	*((struct addrinfo **)rv) = sentinel.ai_next;
-	return NS_SUCCESS;
-}
-#endif
-
-/* resolver logic */
-
-/*
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in h_errno.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-static int
-res_queryN(const char *name, struct res_target *target, res_state res)
-{
-	u_char *buf;
-	HEADER *hp;
-	int n;
-	u_int oflags;
-	struct res_target *t;
-	int rcode;
-	int ancount;
-
-	rcode = NOERROR;
-	ancount = 0;
-
-	buf = malloc(MAXPACKET);
-	if (!buf) {
-		RES_SET_H_ERRNO(res, NETDB_INTERNAL);
-		return -1;
-	}
-
-	for (t = target; t; t = t->next) {
-		int class, type;
-		u_char *answer;
-		int anslen;
-
-		hp = (HEADER *)(void *)t->answer;
-
-		/* make it easier... */
-		class = t->qclass;
-		type = t->qtype;
-		answer = t->answer;
-		anslen = t->anslen;
-
-		oflags = res->_flags;
-
-again:
-		hp->rcode = NOERROR;	/* default */
-
-#ifdef DEBUG
-		if (res->options & RES_DEBUG)
-			printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-		n = res_nmkquery(res, QUERY, name, class, type, NULL, 0, NULL,
-		    buf, MAXPACKET);
-		if (n > 0 && (res->_flags & RES_F_EDNS0ERR) == 0 &&
-		    (res->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U)
-			n = res_nopt(res, n, buf, MAXPACKET, anslen);
-		if (n <= 0) {
-#ifdef DEBUG
-			if (res->options & RES_DEBUG)
-				printf(";; res_query: mkquery failed\n");
-#endif
-			free(buf);
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			return (n);
-		}
-		n = res_nsend(res, buf, n, answer, anslen);
-		if (n < 0) {
-			/*
-			 * if the query choked with EDNS0, retry
-			 * without EDNS0
-			 */
-			if ((res->options & (RES_USE_EDNS0|RES_USE_DNSSEC))
-			    != 0U &&
-			    ((oflags ^ res->_flags) & RES_F_EDNS0ERR) != 0) {
-				res->_flags |= RES_F_EDNS0ERR;
-				if (res->options & RES_DEBUG)
-					printf(";; res_nquery: retry without EDNS0\n");
-				goto again;
-			}
-			rcode = hp->rcode;	/* record most recent error */
-#ifdef DEBUG
-			if (res->options & RES_DEBUG)
-				printf(";; res_query: send error\n");
-#endif
-			continue;
-		}
-
-		if (n > anslen)
-			hp->rcode = FORMERR; /* XXX not very informative */
-		if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-			rcode = hp->rcode;	/* record most recent error */
-#ifdef DEBUG
-			if (res->options & RES_DEBUG)
-				printf(";; rcode = %u, ancount=%u\n", hp->rcode,
-				    ntohs(hp->ancount));
-#endif
-			continue;
-		}
-
-		ancount += ntohs(hp->ancount);
-
-		t->n = n;
-	}
-
-	free(buf);
-
-	if (ancount == 0) {
-		switch (rcode) {
-		case NXDOMAIN:
-			RES_SET_H_ERRNO(res, HOST_NOT_FOUND);
-			break;
-		case SERVFAIL:
-			RES_SET_H_ERRNO(res, TRY_AGAIN);
-			break;
-		case NOERROR:
-			RES_SET_H_ERRNO(res, NO_DATA);
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			break;
-		}
-		return (-1);
-	}
-	return (ancount);
-}
-
-/*
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in h_errno.
- */
-static int
-res_searchN(const char *name, struct res_target *target, res_state res)
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *)(void *)target->answer;	/*XXX*/
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, root_on_list = 0;
-	int tried_as_is = 0;
-	int searched = 0;
-	char abuf[MAXDNAME];
-
-	errno = 0;
-	RES_SET_H_ERRNO(res, HOST_NOT_FOUND); /* default, if we never query */
-	dots = 0;
-	for (cp = name; *cp; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias
-	 */
-	if (!dots &&
-	    (cp = res_hostalias(res, name, abuf, sizeof(abuf))) != NULL)
-		return (res_queryN(cp, target, res));
-
-	/*
-	 * If there are enough dots in the name, let's just give it a
-	 * try 'as is'. The threshold can be set with the "ndots" option.
-	 * Also, query 'as is', if there is a trailing dot in the name.
-	 */
-	saved_herrno = -1;
-	if (dots >= res->ndots || trailing_dot) {
-		ret = res_querydomainN(name, NULL, target, res);
-		if (ret > 0 || trailing_dot)
-			return (ret);
-		if (errno == ECONNREFUSED) {
-			RES_SET_H_ERRNO(res, TRY_AGAIN);
-			return (-1);
-		}
-		switch (res->res_h_errno) {
-		case NO_DATA:
-		case HOST_NOT_FOUND:
-			break;
-		case TRY_AGAIN:
-			if (hp->rcode == SERVFAIL)
-				break;
-			/* FALLTHROUGH */
-		default:
-			return (-1);
-		}
-		saved_herrno = res->res_h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (res->options & RES_DEFNAMES)) ||
-	    (dots && !trailing_dot && (res->options & RES_DNSRCH))) {
-		int done = 0;
-
-		for (domain = (const char * const *)res->dnsrch;
-		   *domain && !done;
-		   domain++) {
-			searched = 1;
-
-			if (domain[0][0] == '\0' ||
-			    (domain[0][0] == '.' && domain[0][1] == '\0'))
-				root_on_list++;
-
-			if (root_on_list && tried_as_is)
-				continue;
-
-			ret = res_querydomainN(name, *domain, target, res);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				RES_SET_H_ERRNO(res, TRY_AGAIN);
-				return (-1);
-			}
-
-			switch (res->res_h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				got_servfail++;
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-			/*
-			 * if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if (!(res->options & RES_DNSRCH))
-			        done++;
-		}
-	}
-
-	switch (res->res_h_errno) {
-	case NO_DATA:
-	case HOST_NOT_FOUND:
-		break;
-	case TRY_AGAIN:
-		if (hp->rcode == SERVFAIL)
-			break;
-		/* FALLTHROUGH */
-	default:
-		goto giveup;
-	}
-
-	/*
-	 * If the query has not already been tried as is then try it
-	 * unless RES_NOTLDQUERY is set and there were no dots.
-	 */
-	if ((dots || !searched || !(res->options & RES_NOTLDQUERY)) &&
-	    !(tried_as_is || root_on_list)) {
-		ret = res_querydomainN(name, NULL, target, res);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/*
-	 * if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's h_errno
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless h_errno, that being the one from
-	 * the last DNSRCH we did.
-	 */
-giveup:
-	if (saved_herrno != -1)
-		RES_SET_H_ERRNO(res, saved_herrno);
-	else if (got_nodata)
-		RES_SET_H_ERRNO(res, NO_DATA);
-	else if (got_servfail)
-		RES_SET_H_ERRNO(res, TRY_AGAIN);
-	return (-1);
-}
-
-/*
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-static int
-res_querydomainN(const char *name, const char *domain,
-    struct res_target *target, res_state res)
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	size_t n, d;
-
-#ifdef DEBUG
-	if (res->options & RES_DEBUG)
-		printf(";; res_querydomain(%s, %s)\n",
-			name, domain?domain:"<Nil>");
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			return (-1);
-		}
-		if (n > 0 && name[--n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			RES_SET_H_ERRNO(res, NO_RECOVERY);
-			return (-1);
-		}
-		snprintf(nbuf, sizeof(nbuf), "%s.%s", name, domain);
-	}
-	return (res_queryN(longname, target, res));
-}
diff --git a/lib/libc_bsd/net/gethostbydns.c b/lib/libc_bsd/net/gethostbydns.c
deleted file mode 100644
index f44dbc1..0000000
--- a/lib/libc_bsd/net/gethostbydns.c
+++ /dev/null
@@ -1,779 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 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.
- * 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/gethostbydns.c 211340 2010-08-15 16:28:08Z ume $");
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <errno.h>
-#include <syslog.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-
-#include "netdb_private.h"
-#include "res_config.h"
-
-#define SPRINTF(x) ((size_t)sprintf x)
-
-static const char AskedForGot[] =
-		"gethostby*.gethostanswer: asked for \"%s\", got \"%s\"";
-
-#ifdef RESOLVSORT
-static void addrsort(char **, int, res_state);
-#endif
-
-#ifdef DEBUG
-static void dprintf(char *, int, res_state) __printflike(1, 0);
-#endif
-
-#define MAXPACKET	(64*1024)
-
-typedef union {
-    HEADER hdr;
-    u_char buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-    int32_t al;
-    char ac;
-} align;
-
-int _dns_ttl_;
-
-#ifdef DEBUG
-static void
-dprintf(msg, num, res)
-	char *msg;
-	int num;
-	res_state res;
-{
-	if (res->options & RES_DEBUG) {
-		int save = errno;
-
-		printf(msg, num);
-		errno = save;
-	}
-}
-#else
-# define dprintf(msg, num, res) /*nada*/
-#endif
-
-#define BOUNDED_INCR(x) \
-	do { \
-		cp += x; \
-		if (cp > eom) { \
-			RES_SET_H_ERRNO(statp, NO_RECOVERY); \
-			return (-1); \
-		} \
-	} while (0)
-
-#define BOUNDS_CHECK(ptr, count) \
-	do { \
-		if ((ptr) + (count) > eom) { \
-			RES_SET_H_ERRNO(statp, NO_RECOVERY); \
-			return (-1); \
-		} \
-	} while (0)
-
-static int
-gethostanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-    struct hostent *he, struct hostent_data *hed, res_state statp)
-{
-	const HEADER *hp;
-	const u_char *cp;
-	int n;
-	const u_char *eom, *erdata;
-	char *bp, *ep, **ap, **hap;
-	int type, class, ancount, qdcount;
-	int haveanswer, had_error;
-	int toobig = 0;
-	char tbuf[MAXDNAME];
-	const char *tname;
-	int (*name_ok)(const char *);
-
-	tname = qname;
-	he->h_name = NULL;
-	eom = answer->buf + anslen;
-	switch (qtype) {
-	case T_A:
-	case T_AAAA:
-		name_ok = res_hnok;
-		break;
-	case T_PTR:
-		name_ok = res_dnok;
-		break;
-	default:
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);	/* XXX should be abort(); */
-	}
-	/*
-	 * find first satisfactory answer
-	 */
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	bp = hed->hostbuf;
-	ep = hed->hostbuf + sizeof hed->hostbuf;
-	cp = answer->buf;
-	BOUNDED_INCR(HFIXEDSZ);
-	if (qdcount != 1) {
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);
-	}
-	n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-	if ((n < 0) || !(*name_ok)(bp)) {
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);
-	}
-	BOUNDED_INCR(n + QFIXEDSZ);
-	if (qtype == T_A || qtype == T_AAAA) {
-		/* res_send() has already verified that the query name is the
-		 * same as the one we sent; this just gets the expanded name
-		 * (i.e., with the succeeding search-domain tacked on).
-		 */
-		n = strlen(bp) + 1;		/* for the \0 */
-		if (n >= MAXHOSTNAMELEN) {
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-		}
-		he->h_name = bp;
-		bp += n;
-		/* The qname can be abbreviated, but h_name is now absolute. */
-		qname = he->h_name;
-	}
-	ap = hed->host_aliases;
-	*ap = NULL;
-	he->h_aliases = hed->host_aliases;
-	hap = hed->h_addr_ptrs;
-	*hap = NULL;
-	he->h_addr_list = hed->h_addr_ptrs;
-	haveanswer = 0;
-	had_error = 0;
-	_dns_ttl_ = -1;
-	while (ancount-- > 0 && cp < eom && !had_error) {
-		n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-		if ((n < 0) || !(*name_ok)(bp)) {
-			had_error++;
-			continue;
-		}
-		cp += n;			/* name */
-		BOUNDS_CHECK(cp, 3 * INT16SZ + INT32SZ);
-		type = _getshort(cp);
- 		cp += INT16SZ;			/* type */
-		class = _getshort(cp);
- 		cp += INT16SZ;			/* class */
-		if (qtype == T_A  && type == T_A)
-			_dns_ttl_ = _getlong(cp);
-		cp += INT32SZ;			/* TTL */
-		n = _getshort(cp);
-		cp += INT16SZ;			/* len */
-		BOUNDS_CHECK(cp, n);
-		erdata = cp + n;
-		if (class != C_IN) {
-			/* XXX - debug? syslog? */
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		if ((qtype == T_A || qtype == T_AAAA) && type == T_CNAME) {
-			if (ap >= &hed->host_aliases[_MAXALIASES-1])
-				continue;
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				RES_SET_H_ERRNO(statp, NO_RECOVERY);
-				return (-1);
-			}
-			/* Store alias. */
-			*ap++ = bp;
-			n = strlen(bp) + 1;	/* for the \0 */
-			if (n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			bp += n;
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			he->h_name = bp;
-			bp += n;
-			continue;
-		}
-		if (qtype == T_PTR && type == T_CNAME) {
-			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if (n < 0 || !res_dnok(tbuf)) {
-				had_error++;
-				continue;
-			}
-			cp += n;
-			if (cp != erdata) {
-				RES_SET_H_ERRNO(statp, NO_RECOVERY);
-				return (-1);
-			}
-			/* Get canonical name. */
-			n = strlen(tbuf) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN) {
-				had_error++;
-				continue;
-			}
-			strcpy(bp, tbuf);
-			tname = bp;
-			bp += n;
-			continue;
-		}
-		if (type != qtype) {
-			if (type != T_SIG && type != ns_t_dname)
-				syslog(LOG_NOTICE|LOG_AUTH,
-	"gethostby*.gethostanswer: asked for \"%s %s %s\", got type \"%s\"",
-				       qname, p_class(C_IN), p_type(qtype),
-				       p_type(type));
-			cp += n;
-			continue;		/* XXX - had_error++ ? */
-		}
-		switch (type) {
-		case T_PTR:
-			if (strcasecmp(tname, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, qname, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-			if ((n < 0) || !res_hnok(bp)) {
-				had_error++;
-				break;
-			}
-#if MULTI_PTRS_ARE_ALIASES
-			cp += n;
-			if (cp != erdata) {
-				RES_SET_H_ERRNO(statp, NO_RECOVERY);
-				return (-1);
-			}
-			if (!haveanswer)
-				he->h_name = bp;
-			else if (ap < &hed->host_aliases[_MAXALIASES-1])
-				*ap++ = bp;
-			else
-				n = -1;
-			if (n != -1) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-			}
-			break;
-#else
-			he->h_name = bp;
-			if (statp->options & RES_USE_INET6) {
-				n = strlen(bp) + 1;	/* for the \0 */
-				if (n >= MAXHOSTNAMELEN) {
-					had_error++;
-					break;
-				}
-				bp += n;
-				_map_v4v6_hostent(he, &bp, ep);
-			}
-			RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-			return (0);
-#endif
-		case T_A:
-		case T_AAAA:
-			if (strcasecmp(he->h_name, bp) != 0) {
-				syslog(LOG_NOTICE|LOG_AUTH,
-				       AskedForGot, he->h_name, bp);
-				cp += n;
-				continue;	/* XXX - had_error++ ? */
-			}
-			if (n != he->h_length) {
-				cp += n;
-				continue;
-			}
-			if (!haveanswer) {
-				int nn;
-
-				he->h_name = bp;
-				nn = strlen(bp) + 1;	/* for the \0 */
-				bp += nn;
-			}
-
-			bp += sizeof(align) - ((u_long)bp % sizeof(align));
-
-			if (bp + n >= ep) {
-				dprintf("size (%d) too big\n", n, statp);
-				had_error++;
-				continue;
-			}
-			if (hap >= &hed->h_addr_ptrs[_MAXADDRS-1]) {
-				if (!toobig++)
-					dprintf("Too many addresses (%d)\n",
-						_MAXADDRS, statp);
-				cp += n;
-				continue;
-			}
-			memcpy(*hap++ = bp, cp, n);
-			bp += n;
-			cp += n;
-			if (cp != erdata) {
-				RES_SET_H_ERRNO(statp, NO_RECOVERY);
-				return (-1);
-			}
-			break;
-		default:
-			dprintf("Impossible condition (type=%d)\n", type,
-			    statp);
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-			/* BIND has abort() here, too risky on bad data */
-		}
-		if (!had_error)
-			haveanswer++;
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		*hap = NULL;
-# if defined(RESOLVSORT)
-		/*
-		 * Note: we sort even if host can take only one address
-		 * in its return structures - should give it the "best"
-		 * address in that case, not some random one
-		 */
-		if (statp->nsort && haveanswer > 1 && qtype == T_A)
-			addrsort(hed->h_addr_ptrs, haveanswer, statp);
-# endif /*RESOLVSORT*/
-		if (!he->h_name) {
-			n = strlen(qname) + 1;	/* for the \0 */
-			if (n > ep - bp || n >= MAXHOSTNAMELEN)
-				goto no_recovery;
-			strcpy(bp, qname);
-			he->h_name = bp;
-			bp += n;
-		}
-		if (statp->options & RES_USE_INET6)
-			_map_v4v6_hostent(he, &bp, ep);
-		RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-		return (0);
-	}
- no_recovery:
-	RES_SET_H_ERRNO(statp, NO_RECOVERY);
-	return (-1);
-}
-
-/* XXX: for async DNS resolver in ypserv */
-struct hostent *
-__dns_getanswer(const char *answer, int anslen, const char *qname, int qtype)
-{
-	struct hostent *he;
-	struct hostent_data *hed;
-	int error;
-	res_state statp;
-
-	statp = __res_state();
-	if ((he = __hostent_init()) == NULL ||
-	    (hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (NULL);
-	}
-	switch (qtype) {
-	case T_AAAA:
-		he->h_addrtype = AF_INET6;
-		he->h_length = NS_IN6ADDRSZ;
-		break;
-	case T_A:
-	default:
-		he->h_addrtype = AF_INET;
-		he->h_length = NS_INADDRSZ;
-		break;
-	}
-
-	error = gethostanswer((const querybuf *)answer, anslen, qname, qtype,
-	    he, hed, statp);
-	return (error == 0) ? he : NULL;
-}
-
-int
-_dns_gethostbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	querybuf *buf;
-	int n, type, error;
-	res_state statp;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	he.h_addrtype = af;
-	switch (af) {
-	case AF_INET:
-		he.h_length = NS_INADDRSZ;
-		type = T_A;
-		break;
-	case AF_INET6:
-		he.h_length = NS_IN6ADDRSZ;
-		type = T_AAAA;
-		break;
-	default:
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		errno = EAFNOSUPPORT;
-		return (NS_UNAVAIL);
-	}
-
-	if ((buf = malloc(sizeof(*buf))) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	n = res_nsearch(statp, name, C_IN, type, buf->buf, sizeof(buf->buf));
-	if (n < 0) {
-		free(buf);
-		dprintf("res_nsearch failed (%d)\n", n, statp);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	} else if (n > sizeof(buf->buf)) {
-		free(buf);
-		dprintf("static buffer is too small (%d)\n", n, statp);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	error = gethostanswer(buf, n, name, type, &he, hed, statp);
-	free(buf);
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		switch (statp->res_h_errno) {
-		case HOST_NOT_FOUND:
-			return (NS_NOTFOUND);
-		case TRY_AGAIN:
-			return (NS_TRYAGAIN);
-		default:
-			return (NS_UNAVAIL);
-		}
-		/*NOTREACHED*/
-	}
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-}
-
-int
-_dns_gethostbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	socklen_t len;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	const u_char *uaddr;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	int n;
-	querybuf *buf;
-	char qbuf[MAXDNAME+1], *qp;
-	res_state statp;
-#ifdef SUNSECURITY
-	struct hostdata rhd;
-	struct hostent *rhe;
-	char **haddr;
-	u_long old_options;
-	char hname2[MAXDNAME+1], numaddr[46];
-	int ret_h_error;
-#endif /*SUNSECURITY*/
-
-	addr = va_arg(ap, const void *);
-	len = va_arg(ap, socklen_t);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-	uaddr = (const u_char *)addr;
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	switch (af) {
-	case AF_INET:
-		(void) sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa",
-			       (uaddr[3] & 0xff),
-			       (uaddr[2] & 0xff),
-			       (uaddr[1] & 0xff),
-			       (uaddr[0] & 0xff));
-		break;
-	case AF_INET6:
-		qp = qbuf;
-		for (n = NS_IN6ADDRSZ - 1; n >= 0; n--) {
-			qp += SPRINTF((qp, "%x.%x.",
-				       uaddr[n] & 0xf,
-				       (uaddr[n] >> 4) & 0xf));
-		}
-		strlcat(qbuf, "ip6.arpa", sizeof(qbuf));
-		break;
-	default:
-		abort();
-	}
-	if ((buf = malloc(sizeof(*buf))) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return NS_NOTFOUND;
-	}
-	n = res_nquery(statp, qbuf, C_IN, T_PTR, (u_char *)buf->buf,
-	    sizeof buf->buf);
-	if (n < 0) {
-		free(buf);
-		dprintf("res_nquery failed (%d)\n", n, statp);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	if (n > sizeof buf->buf) {
-		free(buf);
-		dprintf("static buffer is too small (%d)\n", n, statp);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	if (gethostanswer(buf, n, qbuf, T_PTR, &he, hed, statp) != 0) {
-		free(buf);
-		*h_errnop = statp->res_h_errno;
-		switch (statp->res_h_errno) {
-		case HOST_NOT_FOUND:
-			return (NS_NOTFOUND);
-		case TRY_AGAIN:
-			return (NS_TRYAGAIN);
-		default:
-			return (NS_UNAVAIL);
-		}
-		/*NOTREACHED*/
-	}
-	free(buf);
-#ifdef SUNSECURITY
-	if (af == AF_INET) {
-	    /*
-	     * turn off search as the name should be absolute,
-	     * 'localhost' should be matched by defnames
-	     */
-	    strncpy(hname2, he.h_name, MAXDNAME);
-	    hname2[MAXDNAME] = '\0';
-	    old_options = statp->options;
-	    statp->options &= ~RES_DNSRCH;
-	    statp->options |= RES_DEFNAMES;
-	    memset(&rhd, 0, sizeof rhd);
-	    rhe = gethostbyname_r(hname2, &rhd.host, &rhd.data,
-	        sizeof(rhd.data), &ret_h_error);
-	    if (rhe == NULL) {
-		if (inet_ntop(af, addr, numaddr, sizeof(numaddr)) == NULL)
-		    strlcpy(numaddr, "UNKNOWN", sizeof(numaddr));
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: No A record for %s (verifying [%s])",
-		       hname2, numaddr);
-		statp->options = old_options;
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	    }
-	    statp->options = old_options;
-	    for (haddr = rhe->h_addr_list; *haddr; haddr++)
-		if (!memcmp(*haddr, addr, NS_INADDRSZ))
-			break;
-	    if (!*haddr) {
-		if (inet_ntop(af, addr, numaddr, sizeof(numaddr)) == NULL)
-		    strlcpy(numaddr, "UNKNOWN", sizeof(numaddr));
-		syslog(LOG_NOTICE|LOG_AUTH,
-		       "gethostbyaddr: A record of %s != PTR record [%s]",
-		       hname2, numaddr);
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	    }
-	}
-#endif /*SUNSECURITY*/
-	he.h_addrtype = af;
-	he.h_length = len;
-	memcpy(hed->host_addr, uaddr, len);
-	hed->h_addr_ptrs[0] = (char *)hed->host_addr;
-	hed->h_addr_ptrs[1] = NULL;
-	if (af == AF_INET && (statp->options & RES_USE_INET6)) {
-		_map_v4v6_address((char*)hed->host_addr, (char*)hed->host_addr);
-		he.h_addrtype = AF_INET6;
-		he.h_length = NS_IN6ADDRSZ;
-	}
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-}
-
-#ifdef RESOLVSORT
-static void
-addrsort(char **ap, int num, res_state res)
-{
-	int i, j;
-	char **p;
-	short aval[_MAXADDRS];
-	int needsort = 0;
-
-	p = ap;
-	for (i = 0; i < num; i++, p++) {
-	    for (j = 0 ; (unsigned)j < res->nsort; j++)
-		if (res->sort_list[j].addr.s_addr == 
-		    (((struct in_addr *)(*p))->s_addr & res->sort_list[j].mask))
-			break;
-	    aval[i] = j;
-	    if (needsort == 0 && i > 0 && j < aval[i-1])
-		needsort = i;
-	}
-	if (!needsort)
-	    return;
-
-	while (needsort < num) {
-	    for (j = needsort - 1; j >= 0; j--) {
-		if (aval[j] > aval[j+1]) {
-		    char *hp;
-
-		    i = aval[j];
-		    aval[j] = aval[j+1];
-		    aval[j+1] = i;
-
-		    hp = ap[j];
-		    ap[j] = ap[j+1];
-		    ap[j+1] = hp;
-
-		} else
-		    break;
-	    }
-	    needsort++;
-	}
-}
-#endif
-
-void
-_sethostdnsent(int stayopen)
-{
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1)
-		return;
-	if (stayopen)
-		statp->options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endhostdnsent()
-{
-	res_state statp;
-
-	statp = __res_state();
-	statp->options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_nclose(statp);
-}
diff --git a/lib/libc_bsd/net/gethostbyht.c b/lib/libc_bsd/net/gethostbyht.c
deleted file mode 100644
index 33b9ef6..0000000
--- a/lib/libc_bsd/net/gethostbyht.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 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.
- * 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/gethostbyht.c 254700 2013-08-23 13:59:47Z jilles $");
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <arpa/nameser.h>	/* XXX */
-#include <resolv.h>		/* XXX */
-#include "netdb_private.h"
-
-void
-_sethosthtent(int f, struct hostent_data *hed)
-{
-	if (!hed->hostf)
-		hed->hostf = fopen(_PATH_HOSTS, "re");
-	else
-		rewind(hed->hostf);
-	hed->stayopen = f;
-}
-
-void
-_endhosthtent(struct hostent_data *hed)
-{
-	if (hed->hostf && !hed->stayopen) {
-		(void) fclose(hed->hostf);
-		hed->hostf = NULL;
-	}
-}
-
-static int
-gethostent_p(struct hostent *he, struct hostent_data *hed, int mapped,
-    res_state statp)
-{
-	char *p, *bp, *ep;
-	char *cp, **q;
-	int af, len;
-	char hostbuf[BUFSIZ + 1];
-
-	if (!hed->hostf && !(hed->hostf = fopen(_PATH_HOSTS, "re"))) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
- again:
-	if (!(p = fgets(hostbuf, sizeof hostbuf, hed->hostf))) {
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		return (-1);
-	}
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	if (!(cp = strpbrk(p, " \t")))
-		goto again;
-	*cp++ = '\0';
-	if (inet_pton(AF_INET6, p, hed->host_addr) > 0) {
-		af = AF_INET6;
-		len = IN6ADDRSZ;
-	} else if (inet_pton(AF_INET, p, hed->host_addr) > 0) {
-		if (mapped) {
-			_map_v4v6_address((char *)hed->host_addr,
-			    (char *)hed->host_addr);
-			af = AF_INET6;
-			len = IN6ADDRSZ;
-		} else {
-			af = AF_INET;
-			len = INADDRSZ;
-		}
-	} else {
-		goto again;
-	}
-	hed->h_addr_ptrs[0] = (char *)hed->host_addr;
-	hed->h_addr_ptrs[1] = NULL;
-	he->h_addr_list = hed->h_addr_ptrs;
-	he->h_length = len;
-	he->h_addrtype = af;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	bp = hed->hostbuf;
-	ep = hed->hostbuf + sizeof hed->hostbuf;
-	he->h_name = bp;
-	q = he->h_aliases = hed->host_aliases;
-	if ((p = strpbrk(cp, " \t")) != NULL)
-		*p++ = '\0';
-	len = strlen(cp) + 1;
-	if (ep - bp < len) {
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);
-	}
-	strlcpy(bp, cp, ep - bp);
-	bp += len;
-	cp = p;
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q >= &hed->host_aliases[_MAXALIASES - 1])
-			break;
-		if ((p = strpbrk(cp, " \t")) != NULL)
-			*p++ = '\0';
-		len = strlen(cp) + 1;
-		if (ep - bp < len)
-			break;
-		strlcpy(bp, cp, ep - bp);
-		*q++ = bp;
-		bp += len;
-		cp = p;
-	}
-	*q = NULL;
-	RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-	return (0);
-}
-
-int
-gethostent_r(struct hostent *hptr, char *buffer, size_t buflen,
-    struct hostent **result, int *h_errnop)
-{
-	struct hostent_data *hed;
-	struct hostent he;
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-	if (gethostent_p(&he, hed, statp->options & RES_USE_INET6, statp) != 0)
-		return (-1);
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return ((errno != 0) ? errno : -1);
-	}
-	*result = hptr;
-	return (0);
-}
-
-struct hostent *
-gethostent(void)
-{
-	struct hostdata *hd;
-	struct hostent *rval;
-	int ret_h_errno;
-
-	if ((hd = __hostdata_init()) == NULL)
-		return (NULL);
-	if (gethostent_r(&hd->host, hd->data, sizeof(hd->data), &rval,
-	    &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-int
-_ht_gethostbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	char **cp;
-	res_state statp;
-	int error;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	_sethosthtent(0, hed);
-	while ((error = gethostent_p(&he, hed, 0, statp)) == 0) {
-		if (he.h_addrtype != af)
-			continue;
-		if (he.h_addrtype == AF_INET &&
-		    statp->options & RES_USE_INET6) {
-			_map_v4v6_address(he.h_addr, he.h_addr);
-			he.h_length = IN6ADDRSZ;
-			he.h_addrtype = AF_INET6;
-		}
-		if (strcasecmp(he.h_name, name) == 0)
-			break;
-		for (cp = he.h_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	_endhosthtent(hed);
-
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-}
-
-int
-_ht_gethostbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	const void *addr;
-	socklen_t len;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	res_state statp;
-	int error;
-
-	addr = va_arg(ap, const void *);
-	len = va_arg(ap, socklen_t);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	_sethosthtent(0, hed);
-	while ((error = gethostent_p(&he, hed, 0, statp)) == 0)
-		if (he.h_addrtype == af && !bcmp(he.h_addr, addr, len)) {
-			if (he.h_addrtype == AF_INET &&
-			    statp->options & RES_USE_INET6) {
-				_map_v4v6_address(he.h_addr, he.h_addr);
-				he.h_length = IN6ADDRSZ;
-				he.h_addrtype = AF_INET6;
-			}
-			break;
-		}
-	_endhosthtent(hed);
-
-	if (error != 0)
-		return (NS_NOTFOUND);
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-}
diff --git a/lib/libc_bsd/net/gethostbyname.3 b/lib/libc_bsd/net/gethostbyname.3
deleted file mode 100644
index 4f1dd79..0000000
--- a/lib/libc_bsd/net/gethostbyname.3
+++ /dev/null
@@ -1,375 +0,0 @@
-.\" Copyright (c) 1983, 1987, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\" $FreeBSD: releng/10.2/lib/libc/net/gethostbyname.3 254484 2013-08-18 10:38:59Z pjd $
-.\"
-.Dd May 12, 2006
-.Dt GETHOSTBYNAME 3
-.Os
-.Sh NAME
-.Nm gethostbyname ,
-.Nm gethostbyname2 ,
-.Nm gethostbyaddr ,
-.Nm gethostent ,
-.Nm sethostent ,
-.Nm endhostent ,
-.Nm herror ,
-.Nm hstrerror
-.Nd get network host entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Vt int h_errno ;
-.Ft struct hostent *
-.Fn gethostbyname "const char *name"
-.Ft struct hostent *
-.Fn gethostbyname2 "const char *name" "int af"
-.Ft struct hostent *
-.Fn gethostbyaddr "const void *addr" "socklen_t len" "int af"
-.Ft struct hostent *
-.Fn gethostent void
-.Ft void
-.Fn sethostent "int stayopen"
-.Ft void
-.Fn endhostent void
-.Ft void
-.Fn herror "const char *string"
-.Ft const char *
-.Fn hstrerror "int err"
-.Sh DESCRIPTION
-.Bf -symbolic
-The
-.Xr getaddrinfo 3
-and
-.Xr getnameinfo 3
-functions are preferred over the
-.Fn gethostbyname ,
-.Fn gethostbyname2 ,
-and
-.Fn gethostbyaddr
-functions.
-.Ef
-.Pp
-The
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-functions
-each return a pointer to an object with the
-following structure describing an internet host
-referenced by name or by address, respectively.
-.Pp
-The
-.Fa name
-argument passed to
-.Fn gethostbyname
-or
-.Fn gethostbyname2
-should point to a
-.Dv NUL Ns -terminated
-hostname.
-The
-.Fa addr
-argument passed to
-.Fn gethostbyaddr
-should point to an address which is
-.Fa len
-bytes long,
-in binary form
-(i.e., not an IP address in human readable
-.Tn ASCII
-form).
-The
-.Fa af
-argument specifies the address family
-(e.g.\&
-.Dv AF_INET , AF_INET6 ,
-etc.) of this address.
-.Pp
-The structure returned contains either the information obtained from the name
-server,
-.Xr named 8 ,
-broken-out fields from a line in
-.Pa /etc/hosts ,
-or database entries supplied by the
-.Xr yp 8
-system.
-The order of the lookups is controlled by the
-.Sq hosts
-entry in
-.Xr nsswitch.conf 5 .
-.Bd -literal
-struct	hostent {
-	char	*h_name;	/* official name of host */
-	char	**h_aliases;	/* alias list */
-	int	h_addrtype;	/* host address type */
-	int	h_length;	/* length of address */
-	char	**h_addr_list;	/* list of addresses from name server */
-};
-#define	h_addr  h_addr_list[0]	/* address, for backward compatibility */
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width h_addr_list
-.It Va h_name
-Official name of the host.
-.It Va h_aliases
-A
-.Dv NULL Ns -terminated
-array of alternate names for the host.
-.It Va h_addrtype
-The type of address being returned; usually
-.Dv AF_INET .
-.It Va h_length
-The length, in bytes, of the address.
-.It Va h_addr_list
-A
-.Dv NULL Ns -terminated
-array of network addresses for the host.
-Host addresses are returned in network byte order.
-.It Va h_addr
-The first address in
-.Va h_addr_list ;
-this is for backward compatibility.
-.El
-.Pp
-When using the nameserver,
-.Fn gethostbyname
-and
-.Fn gethostbyname2
-will search for the named host in the current domain and its parents
-unless the name ends in a dot.
-If the name contains no dot, and if the environment variable
-.Dq Ev HOSTALIASES
-contains the name of an alias file, the alias file will first be searched
-for an alias matching the input name.
-See
-.Xr hostname 7
-for the domain search procedure and the alias file format.
-.Pp
-The
-.Fn gethostbyname2
-function is an evolution of
-.Fn gethostbyname
-which is intended to allow lookups in address families other than
-.Dv AF_INET ,
-for example
-.Dv AF_INET6 .
-.Pp
-The
-.Fn sethostent
-function
-may be used to request the use of a connected
-.Tn TCP
-socket for queries.
-If the
-.Fa stayopen
-flag is non-zero,
-this sets the option to send all queries to the name server using
-.Tn TCP
-and to retain the connection after each call to
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-Otherwise, queries are performed using
-.Tn UDP
-datagrams.
-.Pp
-The
-.Fn endhostent
-function
-closes the
-.Tn TCP
-connection.
-.Pp
-The
-.Fn herror
-function writes a message to the diagnostic output consisting of the
-string argument
-.Fa string ,
-the constant string
-.Qq Li ":\ " ,
-and a message corresponding to the value of
-.Va h_errno .
-.Pp
-The
-.Fn hstrerror
-function returns a string which is the message text corresponding to the
-value of the
-.Fa err
-argument.
-.Sh FILES
-.Bl -tag -width /etc/nsswitch.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/nsswitch.conf
-.It Pa /etc/resolv.conf
-.El
-.Sh EXAMPLES
-Print out the hostname associated with a specific IP address:
-.Bd -literal -offset indent
-const char *ipstr = "127.0.0.1";
-struct in_addr ip;
-struct hostent *hp;
-
-if (!inet_aton(ipstr, &ip))
-	errx(1, "can't parse IP address %s", ipstr);
-
-if ((hp = gethostbyaddr((const void *)&ip,
-    sizeof ip, AF_INET)) == NULL)
-	errx(1, "no name associated with %s", ipstr);
-
-printf("name associated with %s is %s\en", ipstr, hp->h_name);
-.Ed
-.Sh DIAGNOSTICS
-Error return status from
-.Fn gethostbyname ,
-.Fn gethostbyname2
-and
-.Fn gethostbyaddr
-is indicated by return of a
-.Dv NULL
-pointer.
-The integer
-.Va h_errno
-may then be checked to see whether this is a temporary failure
-or an invalid or unknown host.
-The routine
-.Fn herror
-can be used to print an error message describing the failure.
-If its argument
-.Fa string
-is
-.Pf non- Dv NULL ,
-it is printed, followed by a colon and a space.
-The error message is printed with a trailing newline.
-.Pp
-The variable
-.Va h_errno
-can have the following values:
-.Bl -tag -width HOST_NOT_FOUND
-.It Dv HOST_NOT_FOUND
-No such host is known.
-.It Dv TRY_AGAIN
-This is usually a temporary error
-and means that the local server did not receive
-a response from an authoritative server.
-A retry at some later time may succeed.
-.It Dv NO_RECOVERY
-Some unexpected server failure was encountered.
-This is a non-recoverable error.
-.It Dv NO_DATA
-The requested name is valid but does not have an IP address;
-this is not a temporary error.
-This means that the name is known to the name server but there is no address
-associated with this name.
-Another type of request to the name server using this domain name
-will result in an answer;
-for example, a mail-forwarder may be registered for this domain.
-.El
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr getnameinfo 3 ,
-.Xr inet_aton 3 ,
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Sh CAVEAT
-The
-.Fn gethostent
-function
-is defined, and
-.Fn sethostent
-and
-.Fn endhostent
-are redefined,
-when
-.Lb libc
-is built to use only the routines to lookup in
-.Pa /etc/hosts
-and not the name server.
-.Pp
-The
-.Fn gethostent
-function
-reads the next line of
-.Pa /etc/hosts ,
-opening the file if necessary.
-.Pp
-The
-.Fn sethostent
-function
-opens and/or rewinds the file
-.Pa /etc/hosts .
-If the
-.Fa stayopen
-argument is non-zero,
-the file will not be closed after each call to
-.Fn gethostbyname ,
-.Fn gethostbyname2
-or
-.Fn gethostbyaddr .
-.Pp
-The
-.Fn endhostent
-function
-closes the file.
-.Sh HISTORY
-The
-.Fn herror
-function appeared in
-.Bx 4.3 .
-The
-.Fn endhostent ,
-.Fn gethostbyaddr ,
-.Fn gethostbyname ,
-.Fn gethostent ,
-and
-.Fn sethostent
-functions appeared in
-.Bx 4.2 .
-The
-.Fn gethostbyname2
-function first appeared in
-.Tn BIND
-version 4.9.4.
-.Sh BUGS
-These functions use a thread-specific data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-.Pp
-Though these functions are thread-safe,
-still it is recommended to use the
-.Xr getaddrinfo 3
-family of functions, instead.
-.Pp
-Only the Internet
-address format is currently understood.
diff --git a/lib/libc_bsd/net/gethostbynis.c b/lib/libc_bsd/net/gethostbynis.c
deleted file mode 100644
index 907a61c..0000000
--- a/lib/libc_bsd/net/gethostbynis.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/gethostbynis.c 229403 2012-01-03 18:51:58Z ed $");
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <resolv.h>		/* XXX */
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include "netdb_private.h"
-
-#ifdef YP
-static int
-_gethostbynis(const char *name, char *map, int af, struct hostent *he,
-    struct hostent_data *hed)
-{
-	char *p, *bp, *ep;
-	char *cp, **q;
-	char *result;
-	int resultlen, size, addrok = 0;
-	char ypbuf[YPMAXRECORD + 2];
-	res_state statp;
-
-	statp = __res_state();
-	switch(af) {
-	case AF_INET:
-		size = NS_INADDRSZ;
-		break;
-	case AF_INET6:
-		size = NS_IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	if (hed->yp_domain == (char *)NULL)
-		if (yp_get_default_domain (&hed->yp_domain)) {
-			RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-			return (-1);
-		}
-
-	if (yp_match(hed->yp_domain, map, name, strlen(name), &result,
-	    &resultlen)) {
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		return (-1);
-	}
-
-	/* avoid potential memory leak */
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = strchr(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	he->h_addr_list = hed->h_addr_ptrs;
-	he->h_addr = (char *)hed->host_addr;
-	switch (af) {
-	case AF_INET:
-		addrok = inet_aton(result, (struct in_addr *)hed->host_addr);
-		if (addrok != 1)
-			break;
-		if (statp->options & RES_USE_INET6) {
-			_map_v4v6_address((char *)hed->host_addr,
-			    (char *)hed->host_addr);
-			af = AF_INET6;
-			size = NS_IN6ADDRSZ;
-		}
-		break;
-	case AF_INET6:
-		addrok = inet_pton(af, result, hed->host_addr);
-		break;
-	}
-	if (addrok != 1) {
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		return (-1);
-	}
-	he->h_addr_list[1] = NULL;
-	he->h_length = size;
-	he->h_addrtype = af;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	bp = hed->hostbuf;
-	ep = hed->hostbuf + sizeof hed->hostbuf;
-	he->h_name = bp;
-	q = he->h_aliases = hed->host_aliases;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	size = strlen(cp) + 1;
-	if (ep - bp < size) {
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (-1);
-	}
-	strlcpy(bp, cp, ep - bp);
-	bp += size;
-	cp = p;
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q >= &hed->host_aliases[_MAXALIASES - 1])
-			break;
-		p = strpbrk(cp, " \t");
-		if (p != NULL)
-			*p++ = '\0';
-		size = strlen(cp) + 1;
-		if (ep - bp < size)
-			break;
-		strlcpy(bp, cp, ep - bp);
-		*q++ = bp;
-		bp += size;
-		cp = p;
-	}
-	*q = NULL;
-	return (0);
-}
-
-static int
-_gethostbynisname_r(const char *name, int af, struct hostent *he,
-    struct hostent_data *hed)
-{
-	char *map;
-
-	switch (af) {
-	case AF_INET:
-		map = "hosts.byname";
-		break;
-	default:
-		map = "ipnodes.byname";
-		break;
-	}
-	return (_gethostbynis(name, map, af, he, hed));
-}
-
-static int
-_gethostbynisaddr_r(const void *addr, socklen_t len, int af,
-    struct hostent *he, struct hostent_data *hed)
-{
-	char *map;
-	char numaddr[46];
-
-	switch (af) {
-	case AF_INET:
-		map = "hosts.byaddr";
-		break;
-	default:
-		map = "ipnodes.byaddr";
-		break;
-	}
-	if (inet_ntop(af, addr, numaddr, sizeof(numaddr)) == NULL)
-		return (-1);
-	return (_gethostbynis(numaddr, map, af, he, hed));
-}
-#endif /* YP */
-
-/* XXX _gethostbynisname/_gethostbynisaddr only used by getipnodeby*() */
-struct hostent *
-_gethostbynisname(const char *name, int af)
-{
-#ifdef YP
-	struct hostent *he;
-	struct hostent_data *hed;
-	u_long oresopt;
-	int error;
-	res_state statp;
-
-	statp = __res_state();
-	if ((he = __hostent_init()) == NULL ||
-	    (hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (NULL);
-	}
-
-	oresopt = statp->options;
-	statp->options &= ~RES_USE_INET6;
-	error = _gethostbynisname_r(name, af, he, hed);
-	statp->options = oresopt;
-	return (error == 0) ? he : NULL;
-#else
-	return (NULL);
-#endif
-}
-
-struct hostent *
-_gethostbynisaddr(const void *addr, socklen_t len, int af)
-{
-#ifdef YP
-	struct hostent *he;
-	struct hostent_data *hed;
-	u_long oresopt;
-	int error;
-	res_state statp;
-
-	statp = __res_state();
-	if ((he = __hostent_init()) == NULL ||
-	    (hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (NULL);
-	}
-
-	oresopt = statp->options;
-	statp->options &= ~RES_USE_INET6;
-	error = _gethostbynisaddr_r(addr, len, af, he, hed);
-	statp->options = oresopt;
-	return (error == 0) ? he : NULL;
-#else
-	return (NULL);
-#endif
-}
-
-int
-_nis_gethostbyname(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	const char *name;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	res_state statp;
-
-	name = va_arg(ap, const char *);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	if (_gethostbynisname_r(name, af, &he, hed) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-#else
-	*((struct hostent **)rval) = NULL;
-	return (NS_UNAVAIL);
-#endif
-}
-
-int
-_nis_gethostbyaddr(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	const void *addr;
-	socklen_t len;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct hostent *hptr, he;
-	struct hostent_data *hed;
-	res_state statp;
-
-	addr = va_arg(ap, const void *);
-	len = va_arg(ap, socklen_t);
-	af = va_arg(ap, int);
-	hptr = va_arg(ap, struct hostent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	*((struct hostent **)rval) = NULL;
-
-	statp = __res_state();
-	if ((hed = __hostent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	if (_gethostbynisaddr_r(addr, len, af, &he, hed) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_hostent(&he, hptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	*((struct hostent **)rval) = hptr;
-	return (NS_SUCCESS);
-#else
-	*((struct hostent **)rval) = NULL;
-	return (NS_UNAVAIL);
-#endif
-}
diff --git a/lib/libc_bsd/net/gethostnamadr.c b/lib/libc_bsd/net/gethostnamadr.c
deleted file mode 100644
index 9429fee..0000000
--- a/lib/libc_bsd/net/gethostnamadr.c
+++ /dev/null
@@ -1,734 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/gethostnamadr.c 211276 2010-08-13 06:39:54Z ume $");
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <arpa/nameser.h>		/* XXX hack for _res */
-#include <resolv.h>			/* XXX hack for _res */
-#include "un-namespace.h"
-#include "netdb_private.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-
-extern int _ht_gethostbyname(void *, void *, va_list);
-extern int _dns_gethostbyname(void *, void *, va_list);
-extern int _nis_gethostbyname(void *, void *, va_list);
-extern int _ht_gethostbyaddr(void *, void *, va_list);
-extern int _dns_gethostbyaddr(void *, void *, va_list);
-extern int _nis_gethostbyaddr(void *, void *, va_list);
-
-static int gethostbyname_internal(const char *, int, struct hostent *, char *,
-    size_t, struct hostent **, int *, res_state);
-
-/* Host lookup order if nsswitch.conf is broken or nonexistant */
-static const ns_src default_src[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NSSRC_DNS, NS_SUCCESS },
-	{ 0 }
-};
-#ifdef NS_CACHING
-static int host_id_func(char *, size_t *, va_list, void *);
-static int host_marshal_func(char *, size_t *, void *, va_list, void *);
-static int host_unmarshal_func(char *, size_t, void *, va_list, void *);
-#endif
-
-NETDB_THREAD_ALLOC(hostent)
-NETDB_THREAD_ALLOC(hostent_data)
-NETDB_THREAD_ALLOC(hostdata)
-
-static void
-hostent_free(void *ptr)
-{
-	free(ptr);
-}
-
-static void
-hostent_data_free(void *ptr)
-{
-	struct hostent_data *hed = ptr;
-
-	if (hed == NULL)
-		return;
-	hed->stayopen = 0;
-	_endhosthtent(hed);
-	free(hed);
-}
-
-static void
-hostdata_free(void *ptr)
-{
-	free(ptr);
-}
-
-int
-__copy_hostent(struct hostent *he, struct hostent *hptr, char *buf,
-    size_t buflen)
-{
-	char *cp;
-	char **ptr;
-	int i, n;
-	int nptr, len;
-
-	/* Find out the amount of space required to store the answer. */
-	nptr = 2; /* NULL ptrs */
-	len = (char *)ALIGN(buf) - buf;
-	for (i = 0; he->h_addr_list[i]; i++, nptr++) {
-		len += he->h_length;
-	}
-	for (i = 0; he->h_aliases[i]; i++, nptr++) {
-		len += strlen(he->h_aliases[i]) + 1;
-	}
-	len += strlen(he->h_name) + 1;
-	len += nptr * sizeof(char*);
-
-	if (len > buflen) {
-		errno = ERANGE;
-		return (-1);
-	}
-
-	/* copy address size and type */
-	hptr->h_addrtype = he->h_addrtype;
-	n = hptr->h_length = he->h_length;
-
-	ptr = (char **)ALIGN(buf);
-	cp = (char *)ALIGN(buf) + nptr * sizeof(char *);
-
-	/* copy address list */
-	hptr->h_addr_list = ptr;
-	for (i = 0; he->h_addr_list[i]; i++ , ptr++) {
-		memcpy(cp, he->h_addr_list[i], n);
-		hptr->h_addr_list[i] = cp;
-		cp += n;
-	}
-	hptr->h_addr_list[i] = NULL;
-	ptr++;
-
-	/* copy official name */
-	n = strlen(he->h_name) + 1;
-	strcpy(cp, he->h_name);
-	hptr->h_name = cp;
-	cp += n;
-
-	/* copy aliases */
-	hptr->h_aliases = ptr;
-	for (i = 0 ; he->h_aliases[i]; i++) {
-		n = strlen(he->h_aliases[i]) + 1;
-		strcpy(cp, he->h_aliases[i]);
-		hptr->h_aliases[i] = cp;
-		cp += n;
-	}
-	hptr->h_aliases[i] = NULL;
-
-	return (0);
-}
-
-#ifdef NS_CACHING
-static int
-host_id_func(char *buffer, size_t *buffer_size, va_list ap, void *cache_mdata)
-{
-	res_state statp;
-	u_long res_options;
-
-	const int op_id = 1;
-	char *str;
-	void *addr;
-	socklen_t len;
-	int type;
-
-	size_t desired_size, size;
-	enum nss_lookup_type lookup_type;
-	char *p;
-	int res = NS_UNAVAIL;
-
-	statp = __res_state();
-	res_options = statp->options & (RES_RECURSE | RES_DEFNAMES |
-	    RES_DNSRCH | RES_NOALIASES | RES_USE_INET6);
-
-	lookup_type = (enum nss_lookup_type)cache_mdata;
-	switch (lookup_type) {
-	case nss_lt_name:
-		str = va_arg(ap, char *);
-		type = va_arg(ap, int);
-
-		size = strlen(str);
-		desired_size = sizeof(res_options) + sizeof(int) +
-		    sizeof(enum nss_lookup_type) + sizeof(int) + size + 1;
-
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		p = buffer;
-
-		memcpy(p, &res_options, sizeof(res_options));
-		p += sizeof(res_options);
-
-		memcpy(p, &op_id, sizeof(int));
-		p += sizeof(int);
-
-		memcpy(p, &lookup_type, sizeof(enum nss_lookup_type));
-		p += sizeof(int);
-
-		memcpy(p, &type, sizeof(int));
-		p += sizeof(int);
-
-		memcpy(p, str, size + 1);
-
-		res = NS_SUCCESS;
-		break;
-	case nss_lt_id:
-		addr = va_arg(ap, void *);
-		len = va_arg(ap, socklen_t);
-		type = va_arg(ap, int);
-
-		desired_size = sizeof(res_options) + sizeof(int) +
-		    sizeof(enum nss_lookup_type) + sizeof(int) +
-		    sizeof(socklen_t) + len;
-
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		p = buffer;
-		memcpy(p, &res_options, sizeof(res_options));
-		p += sizeof(res_options);
-
-		memcpy(p, &op_id, sizeof(int));
-		p += sizeof(int);
-
-		memcpy(p, &lookup_type, sizeof(enum nss_lookup_type));
-		p += sizeof(int);
-
-		memcpy(p, &type, sizeof(int));
-		p += sizeof(int);
-
-		memcpy(p, &len, sizeof(socklen_t));
-		p += sizeof(socklen_t);
-
-		memcpy(p, addr, len);
-
-		res = NS_SUCCESS;
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-fin:
-	*buffer_size = desired_size;
-	return (res);
-}
-
-static int
-host_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *str;
-	void *addr;
-	socklen_t len;
-	int type;
-	struct hostent *ht;
-
-	struct hostent new_ht;
-	size_t desired_size, aliases_size, addr_size, size;
-	char *p, **iter;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		str = va_arg(ap, char *);
-		type = va_arg(ap, int);
-		break;
-	case nss_lt_id:
-		addr = va_arg(ap, void *);
-		len = va_arg(ap, socklen_t);
-		type = va_arg(ap, int);
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-	ht = va_arg(ap, struct hostent *);
-
-	desired_size = _ALIGNBYTES + sizeof(struct hostent) + sizeof(char *);
-	if (ht->h_name != NULL)
-		desired_size += strlen(ht->h_name) + 1;
-
-	if (ht->h_aliases != NULL) {
-		aliases_size = 0;
-		for (iter = ht->h_aliases; *iter; ++iter) {
-			desired_size += strlen(*iter) + 1;
-			++aliases_size;
-		}
-
-		desired_size += _ALIGNBYTES +
-		    (aliases_size + 1) * sizeof(char *);
-	}
-
-	if (ht->h_addr_list != NULL) {
-		addr_size = 0;
-		for (iter = ht->h_addr_list; *iter; ++iter)
-			++addr_size;
-
-		desired_size += addr_size * _ALIGN(ht->h_length);
-		desired_size += _ALIGNBYTES + (addr_size + 1) * sizeof(char *);
-	}
-
-	if (desired_size > *buffer_size) {
-		/* this assignment is here for future use */
-		*buffer_size = desired_size;
-		return (NS_RETURN);
-	}
-
-	memcpy(&new_ht, ht, sizeof(struct hostent));
-	memset(buffer, 0, desired_size);
-
-	*buffer_size = desired_size;
-	p = buffer + sizeof(struct hostent) + sizeof(char *);
-	memcpy(buffer + sizeof(struct hostent), &p, sizeof(char *));
-	p = (char *)_ALIGN(p);
-
-	if (new_ht.h_name != NULL) {
-		size = strlen(new_ht.h_name);
-		memcpy(p, new_ht.h_name, size);
-		new_ht.h_name = p;
-		p += size + 1;
-	}
-
-	if (new_ht.h_aliases != NULL) {
-		p = (char *)_ALIGN(p);
-		memcpy(p, new_ht.h_aliases, sizeof(char *) * aliases_size);
-		new_ht.h_aliases = (char **)p;
-		p += sizeof(char *) * (aliases_size + 1);
-
-		for (iter = new_ht.h_aliases; *iter; ++iter) {
-			size = strlen(*iter);
-			memcpy(p, *iter, size);
-			*iter = p;
-			p += size + 1;
-		}
-	}
-
-	if (new_ht.h_addr_list != NULL) {
-		p = (char *)_ALIGN(p);
-		memcpy(p, new_ht.h_addr_list, sizeof(char *) * addr_size);
-		new_ht.h_addr_list = (char **)p;
-		p += sizeof(char *) * (addr_size + 1);
-
-		size = _ALIGN(new_ht.h_length);
-		for (iter = new_ht.h_addr_list; *iter; ++iter) {
-			memcpy(p, *iter, size);
-			*iter = p;
-			p += size + 1;
-		}
-	}
-	memcpy(buffer, &new_ht, sizeof(struct hostent));
-	return (NS_SUCCESS);
-}
-
-static int
-host_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *str;
-	void *addr;
-	socklen_t len;
-	int type;
-	struct hostent *ht;
-
-	char *p;
-	char **iter;
-	char *orig_buf;
-	size_t orig_buf_size;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		str = va_arg(ap, char *);
-		type = va_arg(ap, int);
-		break;
-	case nss_lt_id:
-		addr = va_arg(ap, void *);
-		len = va_arg(ap, socklen_t);
-		type = va_arg(ap, int);
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	ht = va_arg(ap, struct hostent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-
-	if (orig_buf_size <
-	    buffer_size - sizeof(struct hostent) - sizeof(char *)) {
-		errno = ERANGE;
-		return (NS_RETURN);
-	}
-
-	memcpy(ht, buffer, sizeof(struct hostent));
-	memcpy(&p, buffer + sizeof(struct hostent), sizeof(char *));
-
-	orig_buf = (char *)_ALIGN(orig_buf);
-	memcpy(orig_buf, buffer + sizeof(struct hostent) + sizeof(char *) +
-	    _ALIGN(p) - (size_t)p,
-	    buffer_size - sizeof(struct hostent) - sizeof(char *) -
-	    _ALIGN(p) + (size_t)p);
-	p = (char *)_ALIGN(p);
-
-	NS_APPLY_OFFSET(ht->h_name, orig_buf, p, char *);
-	if (ht->h_aliases != NULL) {
-		NS_APPLY_OFFSET(ht->h_aliases, orig_buf, p, char **);
-
-		for (iter = ht->h_aliases; *iter; ++iter)
-			NS_APPLY_OFFSET(*iter, orig_buf, p, char *);
-	}
-
-	if (ht->h_addr_list != NULL) {
-		NS_APPLY_OFFSET(ht->h_addr_list, orig_buf, p, char **);
-
-		for (iter = ht->h_addr_list; *iter; ++iter)
-			NS_APPLY_OFFSET(*iter, orig_buf, p, char *);
-	}
-
-	*((struct hostent **)retval) = ht;
-	return (NS_SUCCESS);
-}
-#endif /* NS_CACHING */
-
-static int
-fakeaddr(const char *name, int af, struct hostent *hp, char *buf,
-    size_t buflen, res_state statp)
-{
-	struct hostent_data *hed;
-	struct hostent he;
-
-	if ((hed = __hostent_data_init()) == NULL) {
-		errno = ENOMEM;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	if ((af != AF_INET ||
-	    inet_aton(name, (struct in_addr *)hed->host_addr) != 1) &&
-	    inet_pton(af, name, hed->host_addr) != 1) {
-		RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		return (-1);
-	}
-	strncpy(hed->hostbuf, name, MAXDNAME);
-	hed->hostbuf[MAXDNAME] = '\0';
-	if (af == AF_INET && (statp->options & RES_USE_INET6) != 0U) {
-		_map_v4v6_address((char *)hed->host_addr,
-		    (char *)hed->host_addr);
-		af = AF_INET6;
-	}
-	he.h_addrtype = af;
-	switch(af) {
-	case AF_INET:
-		he.h_length = NS_INADDRSZ;
-		break;
-	case AF_INET6:
-		he.h_length = NS_IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-	he.h_name = hed->hostbuf;
-	he.h_aliases = hed->host_aliases;
-	hed->host_aliases[0] = NULL;
-	hed->h_addr_ptrs[0] = (char *)hed->host_addr;
-	hed->h_addr_ptrs[1] = NULL;
-	he.h_addr_list = hed->h_addr_ptrs;
-	if (__copy_hostent(&he, hp, buf, buflen) != 0) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-	RES_SET_H_ERRNO(statp, NETDB_SUCCESS);
-	return (0);
-}
-
-int
-gethostbyname_r(const char *name, struct hostent *he, char *buffer,
-    size_t buflen, struct hostent **result, int *h_errnop)
-{
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-	if (statp->options & RES_USE_INET6) {
-		if (fakeaddr(name, AF_INET, he, buffer, buflen, statp) == 0) {
-			*result = he;
-			return (0);
-		}
-		if (gethostbyname_internal(name, AF_INET6, he, buffer, buflen,
-		    result, h_errnop, statp) == 0)
-			return (0);
-	}
-	return (gethostbyname_internal(name, AF_INET, he, buffer, buflen,
-	    result, h_errnop, statp));
-}
-
-int
-gethostbyname2_r(const char *name, int af, struct hostent *he, char *buffer,
-    size_t buflen, struct hostent **result, int *h_errnop)
-{
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		return (-1);
-	}
-	return (gethostbyname_internal(name, af, he, buffer, buflen, result,
-	    h_errnop, statp));
-}
-
-int
-gethostbyname_internal(const char *name, int af, struct hostent *hp, char *buf,
-    size_t buflen, struct hostent **result, int *h_errnop, res_state statp)
-{
-	const char *cp;
-	int rval, ret_errno = 0;
-	char abuf[MAXDNAME];
-
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-		NS_COMMON_CACHE_INFO_INITIALIZER(
-		hosts, (void *)nss_lt_name,
-		host_id_func, host_marshal_func, host_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_gethostbyname, NULL)
-		{ NSSRC_DNS, _dns_gethostbyname, NULL },
-		NS_NIS_CB(_nis_gethostbyname, NULL) /* force -DHESIOD */
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ 0 }
-	};
-
-	switch (af) {
-	case AF_INET:
-	case AF_INET6:
-		break;
-	default:
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-
-	/*
-	 * if there aren't any dots, it could be a user-level alias.
-	 * this is also done in res_query() since we are not the only
-	 * function that looks up host names.
-	 */
-	if (!strchr(name, '.') &&
-	    (cp = res_hostalias(statp, name, abuf, sizeof abuf)))
-		name = cp;
-
-	if (fakeaddr(name, af, hp, buf, buflen, statp) == 0) {
-		*result = hp;
-		return (0);
-	}
-
-	rval = _nsdispatch((void *)result, dtab, NSDB_HOSTS,
-	    "gethostbyname2_r", default_src, name, af, hp, buf, buflen,
-	    &ret_errno, h_errnop);
-
-	if (rval != NS_SUCCESS) {
-		errno = ret_errno;
-		return ((ret_errno != 0) ? ret_errno : -1);
-	}
-	return (0);
-}
-
-int
-gethostbyaddr_r(const void *addr, socklen_t len, int af, struct hostent *hp,
-    char *buf, size_t buflen, struct hostent **result, int *h_errnop)
-{
-	const u_char *uaddr = (const u_char *)addr;
-	const struct in6_addr *addr6;
-	socklen_t size;
-	int rval, ret_errno = 0;
-	res_state statp;
-
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-		NS_COMMON_CACHE_INFO_INITIALIZER(
-		hosts, (void *)nss_lt_id,
-		host_id_func, host_marshal_func, host_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_gethostbyaddr, NULL)
-		{ NSSRC_DNS, _dns_gethostbyaddr, NULL },
-		NS_NIS_CB(_nis_gethostbyaddr, NULL) /* force -DHESIOD */
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ 0 }
-	};
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-
-	if (af == AF_INET6 && len == NS_IN6ADDRSZ) {
-		addr6 = (const struct in6_addr *)addr;
-		if (IN6_IS_ADDR_LINKLOCAL(addr6)) {
-			RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-			*h_errnop = statp->res_h_errno;
-			return (-1);
-		}
-		if (IN6_IS_ADDR_V4MAPPED(addr6) ||
-		    IN6_IS_ADDR_V4COMPAT(addr6)) {
-			/* Unmap. */
-			uaddr += NS_IN6ADDRSZ - NS_INADDRSZ;
-			af = AF_INET;
-			len = NS_INADDRSZ;
-		}
-	}
-	switch (af) {
-	case AF_INET:
-		size = NS_INADDRSZ;
-		break;
-	case AF_INET6:
-		size = NS_IN6ADDRSZ;
-		break;
-	default:
-		errno = EAFNOSUPPORT;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-	if (size != len) {
-		errno = EINVAL;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-
-	rval = _nsdispatch((void *)result, dtab, NSDB_HOSTS,
-	    "gethostbyaddr_r", default_src, uaddr, len, af, hp, buf, buflen,
-	    &ret_errno, h_errnop);
-
-	if (rval != NS_SUCCESS) {
-		errno = ret_errno;
-		return ((ret_errno != 0) ? ret_errno : -1);
-	}
-	return (0);
-}
-
-struct hostent *
-gethostbyname(const char *name)
-{
-	struct hostdata *hd;
-	struct hostent *rval;
-	int ret_h_errno;
-
-	if ((hd = __hostdata_init()) == NULL)
-		return (NULL);
-	if (gethostbyname_r(name, &hd->host, hd->data, sizeof(hd->data), &rval,
-	    &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-struct hostent *
-gethostbyname2(const char *name, int af)
-{
-	struct hostdata *hd;
-	struct hostent *rval;
-	int ret_h_errno;
-
-	if ((hd = __hostdata_init()) == NULL)
-		return (NULL);
-	if (gethostbyname2_r(name, af, &hd->host, hd->data, sizeof(hd->data),
-	    &rval, &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-struct hostent *
-gethostbyaddr(const void *addr, socklen_t len, int af)
-{
-	struct hostdata *hd;
-	struct hostent *rval;
-	int ret_h_errno;
-
-	if ((hd = __hostdata_init()) == NULL)
-		return (NULL);
-	if (gethostbyaddr_r(addr, len, af, &hd->host, hd->data,
-	    sizeof(hd->data), &rval, &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-void
-sethostent(int stayopen)
-{
-	struct hostent_data *hed;
-
-	if ((hed = __hostent_data_init()) == NULL)
-		return;
-	_sethosthtent(stayopen, hed);
-	_sethostdnsent(stayopen);
-}
-
-void
-endhostent(void)
-{
-	struct hostent_data *hed;
-
-	if ((hed = __hostent_data_init()) == NULL)
-		return;
-	_endhosthtent(hed);
-	_endhostdnsent();
-}
diff --git a/lib/libc_bsd/net/getifaddrs.3 b/lib/libc_bsd/net/getifaddrs.3
deleted file mode 100644
index ab4dd88..0000000
--- a/lib/libc_bsd/net/getifaddrs.3
+++ /dev/null
@@ -1,165 +0,0 @@
-.\"	$KAME: getifaddrs.3,v 1.4 2000/05/17 14:13:14 itojun Exp $
-.\"	BSDI	getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp
-.\"
-.\" Copyright (c) 1995, 1999
-.\"	Berkeley Software Design, Inc.  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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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: releng/10.2/lib/libc/net/getifaddrs.3 250888 2013-05-21 21:39:18Z ed $
-.\"
-.Dd May 21, 2013
-.Dt GETIFADDRS 3
-.Os
-.Sh NAME
-.Nm getifaddrs
-.Nd get interface addresses
-.Sh SYNOPSIS
-.In ifaddrs.h
-.Ft int
-.Fn getifaddrs "struct ifaddrs **ifap"
-.Ft void
-.Fn freeifaddrs "struct ifaddrs *ifp"
-.Sh DESCRIPTION
-The
-.Fn getifaddrs
-function stores a reference to a linked list of the network interfaces
-on the local machine in the memory referenced by
-.Fa ifap .
-The list consists of
-.Nm ifaddrs
-structures, as defined in the include file
-.In ifaddrs.h .
-The
-.Nm ifaddrs
-structure contains at least the following entries:
-.Bd -literal
-    struct ifaddrs   *ifa_next;         /* Pointer to next struct */
-    char             *ifa_name;         /* Interface name */
-    u_int             ifa_flags;        /* Interface flags */
-    struct sockaddr  *ifa_addr;         /* Interface address */
-    struct sockaddr  *ifa_netmask;      /* Interface netmask */
-    struct sockaddr  *ifa_broadaddr;    /* Interface broadcast address */
-    struct sockaddr  *ifa_dstaddr;      /* P2P interface destination */
-    void             *ifa_data;		/* Address specific data */
-.Ed
-.Pp
-The
-.Li ifa_next
-field contains a pointer to the next structure on the list.
-This field is
-.Dv NULL
-in last structure on the list.
-.Pp
-The
-.Li ifa_name
-field contains the interface name.
-.Pp
-The
-.Li ifa_flags
-field contains the interface flags, as set by
-.Xr ifconfig 8
-utility.
-.Pp
-The
-.Li ifa_addr
-field references either the address of the interface or the link level
-address of the interface, if one exists, otherwise it is NULL.
-(The
-.Li sa_family
-field of the
-.Li ifa_addr
-field should be consulted to determine the format of the
-.Li ifa_addr
-address.)
-.Pp
-The
-.Li ifa_netmask
-field references the netmask associated with
-.Li ifa_addr ,
-if one is set, otherwise it is NULL.
-.Pp
-The
-.Li ifa_broadaddr
-field,
-which should only be referenced for non-P2P interfaces,
-references the broadcast address associated with
-.Li ifa_addr ,
-if one exists, otherwise it is NULL.
-.Pp
-The
-.Li ifa_dstaddr
-field references the destination address on a P2P interface,
-if one exists, otherwise it is NULL.
-.Pp
-The
-.Li ifa_data
-field references address family specific data.
-For
-.Dv AF_LINK
-addresses it contains a pointer to the
-.Fa struct if_data
-(as defined in include file
-.In net/if.h )
-which contains various interface attributes and statistics.
-For all other address families, it contains a pointer to the
-.Fa struct ifa_data
-(as defined in include file
-.In net/if.h )
-which contains per-address interface statistics.
-.Pp
-The data returned by
-.Fn getifaddrs
-is dynamically allocated and should be freed using
-.Fn freeifaddrs
-when no longer needed.
-.Sh RETURN VALUES
-.Rv -std getifaddrs
-.Sh ERRORS
-The
-.Fn getifaddrs
-may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr ioctl 2 ,
-.Xr socket 2 ,
-.Xr malloc 3
-or
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr socket 2 ,
-.Xr sysctl 3 ,
-.Xr networking 4 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Nm
-implementation first appeared in BSDi
-.Bsx .
-.Sh BUGS
-If both
-.In net/if.h
-and
-.In ifaddrs.h
-are being included,
-.In net/if.h
-.Em must
-be included before
-.In ifaddrs.h .
diff --git a/lib/libc_bsd/net/getifaddrs.c b/lib/libc_bsd/net/getifaddrs.c
deleted file mode 100644
index a28df63..0000000
--- a/lib/libc_bsd/net/getifaddrs.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/*	$KAME: getifaddrs.c,v 1.9 2001/08/20 02:31:20 itojun Exp $	*/
-
-/*
- * Copyright (c) 1995, 1999
- *	Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *	BSDI getifaddrs.c,v 2.12 2000/02/23 14:51:59 dab Exp
- */
-/*
- * NOTE: SIOCGIFCONF case is not LP64 friendly.  it also does not perform
- * try-and-error for region size.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getifaddrs.c 231506 2012-02-11 06:05:40Z bz $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#ifdef	NET_RT_IFLIST
-#include <sys/param.h>
-#include <net/route.h>
-#include <sys/sysctl.h>
-#include <net/if_dl.h>
-#endif
-
-#include <errno.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#if !defined(AF_LINK)
-#define	SA_LEN(sa)	sizeof(struct sockaddr)
-#endif
-
-#if !defined(SA_LEN)
-#define	SA_LEN(sa)	(sa)->sa_len
-#endif
-
-#define	SALIGN	(sizeof(long) - 1)
-#define	SA_RLEN(sa)	((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : (SALIGN + 1))
-
-#ifndef	ALIGNBYTES
-/*
- * On systems with a routing socket, ALIGNBYTES should match the value
- * that the kernel uses when building the messages.
- */
-#define	ALIGNBYTES	XXX
-#endif
-#ifndef	ALIGN
-#define	ALIGN(p)	(((u_long)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-#endif
-
-#define MAX_SYSCTL_TRY 5
-
-int
-getifaddrs(struct ifaddrs **pif)
-{
-	int icnt = 1;
-	int dcnt = 0;
-	int ncnt = 0;
-	int ntry = 0;
-	int mib[6];
-	size_t needed;
-	char *buf;
-	char *next;
-	struct ifaddrs *cif = 0;
-	char *p, *p0;
-	struct rt_msghdr *rtm;
-	struct if_msghdrl *ifm;
-	struct ifa_msghdrl *ifam;
-	struct sockaddr_dl *dl;
-	struct sockaddr *sa;
-	struct ifaddrs *ifa, *ift;
-	struct if_data *if_data;
-	u_short idx = 0;
-	int i;
-	size_t len, alen;
-	char *data;
-	char *names;
-
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;             /* protocol */
-	mib[3] = 0;             /* wildcard address family */
-	mib[4] = NET_RT_IFLISTL;/* extra fields for extensible msghdr structs */
-	mib[5] = 0;             /* no flags */
-	do {
-		/*
-		 * We'll try to get addresses several times in case that
-		 * the number of addresses is unexpectedly increased during
-		 * the two sysctl calls.  This should rarely happen, but we'll
-		 * try to do our best for applications that assume success of
-		 * this library (which should usually be the case).
-		 * Portability note: since FreeBSD does not add margin of
-		 * memory at the first sysctl, the possibility of failure on
-		 * the second sysctl call is a bit higher.
-		 */
-
-		if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-			return (-1);
-		if ((buf = malloc(needed)) == NULL)
-			return (-1);
-		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-			if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
-				free(buf);
-				return (-1);
-			}
-			free(buf);
-			buf = NULL;
-		} 
-	} while (buf == NULL);
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_IFINFO:
-			ifm = (struct if_msghdrl *)(void *)rtm;
-			if (ifm->ifm_addrs & RTA_IFP) {
-				idx = ifm->ifm_index;
-				++icnt;
-				if_data = IF_MSGHDRL_IFM_DATA(ifm);
-				dcnt += if_data->ifi_datalen;
-				dl = (struct sockaddr_dl *)IF_MSGHDRL_RTA(ifm);
-				dcnt += SA_RLEN((struct sockaddr *)(void*)dl) +
-				    ALIGNBYTES;
-				ncnt += dl->sdl_nlen + 1;
-			} else
-				idx = 0;
-			break;
-
-		case RTM_NEWADDR:
-			ifam = (struct ifa_msghdrl *)(void *)rtm;
-			if (idx && ifam->ifam_index != idx)
-				abort();	/* this cannot happen */
-
-#define	RTA_MASKS	(RTA_NETMASK | RTA_IFA | RTA_BRD)
-			if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-				break;
-			p = (char *)IFA_MSGHDRL_RTA(ifam);
-			++icnt;
-			if_data = IFA_MSGHDRL_IFAM_DATA(ifam);
-			dcnt += if_data->ifi_datalen + ALIGNBYTES;
-
-			/* Scan to look for length of address */
-			alen = 0;
-			for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_IFA) {
-					alen = len;
-					break;
-				}
-				p += len;
-			}
-			for (p = p0, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_NETMASK && SA_LEN(sa) == 0)
-					dcnt += alen;
-				else
-					dcnt += len;
-				p += len;
-			}
-			break;
-		}
-	}
-
-	if (icnt + dcnt + ncnt == 1) {
-		*pif = NULL;
-		free(buf);
-		return (0);
-	}
-	data = malloc(sizeof(struct ifaddrs) * icnt + dcnt + ncnt);
-	if (data == NULL) {
-		free(buf);
-		return(-1);
-	}
-
-	ifa = (struct ifaddrs *)(void *)data;
-	data += sizeof(struct ifaddrs) * icnt;
-	names = data + dcnt;
-
-	memset(ifa, 0, sizeof(struct ifaddrs) * icnt);
-	ift = ifa;
-
-	idx = 0;
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_IFINFO:
-			ifm = (struct if_msghdrl *)(void *)rtm;
-			if ((ifm->ifm_addrs & RTA_IFP) == 0) {
-				idx = 0;
-				break;
-			}
-
-			idx = ifm->ifm_index;
-			dl = (struct sockaddr_dl *)IF_MSGHDRL_RTA(ifm);
-
-			cif = ift;
-			ift->ifa_name = names;
-			ift->ifa_flags = (int)ifm->ifm_flags;
-			memcpy(names, dl->sdl_data, (size_t)dl->sdl_nlen);
-			names[dl->sdl_nlen] = 0;
-			names += dl->sdl_nlen + 1;
-
-			ift->ifa_addr = (struct sockaddr *)(void *)data;
-			memcpy(data, dl, (size_t)SA_LEN((struct sockaddr *)
-			    (void *)dl));
-			data += SA_RLEN((struct sockaddr *)(void *)dl);
-
-			if_data = IF_MSGHDRL_IFM_DATA(ifm);
-			/* ifm_data needs to be aligned */
-			ift->ifa_data = data = (void *)ALIGN(data);
-			memcpy(data, if_data, if_data->ifi_datalen);
-			data += if_data->ifi_datalen;
-
-			ift = (ift->ifa_next = ift + 1);
-			break;
-
-		case RTM_NEWADDR:
-			ifam = (struct ifa_msghdrl *)(void *)rtm;
-			if (idx && ifam->ifam_index != idx)
-				abort();	/* this cannot happen */
-
-			if (idx == 0 || (ifam->ifam_addrs & RTA_MASKS) == 0)
-				break;
-			ift->ifa_name = cif->ifa_name;
-			ift->ifa_flags = cif->ifa_flags;
-			ift->ifa_data = NULL;
-
-			p = (char *)IFA_MSGHDRL_RTA(ifam);
-			/* Scan to look for length of address */
-			alen = 0;
-			for (p0 = p, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				if (i == RTAX_IFA) {
-					alen = len;
-					break;
-				}
-				p += len;
-			}
-			for (p = p0, i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifam->ifam_addrs & (1 << i))
-				    == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				switch (i) {
-				case RTAX_IFA:
-					ift->ifa_addr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_NETMASK:
-					ift->ifa_netmask =
-					    (struct sockaddr *)(void *)data;
-					if (SA_LEN(sa) == 0) {
-						memset(data, 0, alen);
-						data += alen;
-						break;
-					}
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_BRD:
-					ift->ifa_broadaddr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-				}
-				p += len;
-			}
-
-			if_data = IFA_MSGHDRL_IFAM_DATA(ifam);
-			/* ifam_data needs to be aligned */
-			ift->ifa_data = data = (void *)ALIGN(data);
-			memcpy(data, if_data, if_data->ifi_datalen);
-			data += if_data->ifi_datalen;
-
-			ift = (ift->ifa_next = ift + 1);
-			break;
-		}
-	}
-
-	free(buf);
-
-	if (--ift >= ifa) {
-		ift->ifa_next = NULL;
-		*pif = ifa;
-	} else {
-		*pif = NULL;
-		free(ifa);
-	}
-	return (0);
-}
-
-void
-freeifaddrs(struct ifaddrs *ifp)
-{
-
-	free(ifp);
-}
diff --git a/lib/libc_bsd/net/getifmaddrs.3 b/lib/libc_bsd/net/getifmaddrs.3
deleted file mode 100644
index 9280614..0000000
--- a/lib/libc_bsd/net/getifmaddrs.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\" Copyright (c) 2003 Bruce M. Simpson. 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Bruce M. Simpson ``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 Bruce M. Simpson 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: releng/10.2/lib/libc/net/getifmaddrs.3 250888 2013-05-21 21:39:18Z ed $
-.\"
-.Dd May 21, 2013
-.Dt GETIFMADDRS 3
-.Os
-.Sh NAME
-.Nm getifmaddrs
-.Nd get multicast group memberships
-.Sh SYNOPSIS
-.In ifaddrs.h
-.Ft int
-.Fn getifmaddrs "struct ifmaddrs **ifmap"
-.Ft void
-.Fn freeifmaddrs "struct ifmaddrs *ifmp"
-.Sh DESCRIPTION
-The
-.Fn getifmaddrs
-function stores a reference to a linked list of the multicast memberships
-on the local machine in the memory referenced by
-.Fa ifmap .
-The list consists of
-.Vt ifmaddrs
-structures, as defined in the include file
-.In ifaddrs.h .
-The
-.Vt ifmaddrs
-structure contains at least the following entries:
-.Bd -literal
-    struct ifmaddrs   *ifma_next;     /* Pointer to next struct */
-    struct sockaddr   *ifma_name;     /* Interface name (AF_LINK) */
-    struct sockaddr   *ifma_addr;     /* Multicast address */
-    struct sockaddr   *ifma_lladdr;   /* Link-layer translation, if any */
-.Ed
-.Pp
-The
-.Va ifma_next
-field contains a pointer to the next structure on the list.
-This field is
-.Dv NULL
-in last structure on the list.
-.Pp
-The
-.Va ifma_name
-field references an
-.Dv AF_LINK
-address structure, containing the name of the
-interface where the membership exists.
-.Pp
-The
-.Va ifma_addr
-references the address that this membership is for.
-.Pp
-The
-.Va ifma_lladdr
-field references a link-layer translation for the protocol-level address in
-.Va ifma_addr ,
-if one is set, otherwise it is
-.Dv NULL .
-.Pp
-The data returned by
-.Fn getifmaddrs
-is dynamically allocated and should be freed using
-.Fn freeifmaddrs
-when no longer needed.
-.Sh RETURN VALUES
-.Rv -std getifmaddrs
-.Sh ERRORS
-The
-.Fn getifmaddrs
-may fail and set
-.Va errno
-for any of the errors specified for the library routines
-.Xr malloc 3
-or
-.Xr sysctl 3 .
-.Sh SEE ALSO
-.Xr sysctl 3 ,
-.Xr networking 4 ,
-.Xr ifconfig 8
-.Sh HISTORY
-The
-.Fn getifmaddrs
-function first appeared in
-.Fx 5.2 .
-.Sh BUGS
-If both
-.In net/if.h
-and
-.In ifaddrs.h
-are being included,
-.In net/if.h
-.Em must
-be included before
-.In ifaddrs.h .
diff --git a/lib/libc_bsd/net/getifmaddrs.c b/lib/libc_bsd/net/getifmaddrs.c
deleted file mode 100644
index c15ba34..0000000
--- a/lib/libc_bsd/net/getifmaddrs.c
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2003 Bruce M. Simpson.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getifmaddrs.c 251475 2013-06-06 21:09:27Z emaste $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <errno.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#define	SALIGN	(sizeof(long) - 1)
-#define	SA_RLEN(sa)	((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : \
-			    (SALIGN + 1))
-#define	MAX_SYSCTL_TRY	5
-#define	RTA_MASKS	(RTA_GATEWAY | RTA_IFP | RTA_IFA)
-
-int
-getifmaddrs(struct ifmaddrs **pif)
-{
-	int icnt = 1;
-	int dcnt = 0;
-	int ntry = 0;
-	size_t len;
-	size_t needed;
-	int mib[6];
-	int i;
-	char *buf;
-	char *data;
-	char *next;
-	char *p;
-	struct ifma_msghdr *ifmam;
-	struct ifmaddrs *ifa, *ift;
-	struct rt_msghdr *rtm;
-	struct sockaddr *sa;
-
-	mib[0] = CTL_NET;
-	mib[1] = PF_ROUTE;
-	mib[2] = 0;             /* protocol */
-	mib[3] = 0;             /* wildcard address family */
-	mib[4] = NET_RT_IFMALIST;
-	mib[5] = 0;             /* no flags */
-	do {
-		if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-			return (-1);
-		if ((buf = malloc(needed)) == NULL)
-			return (-1);
-		if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
-			if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
-				free(buf);
-				return (-1);
-			}
-			free(buf);
-			buf = NULL;
-		} 
-	} while (buf == NULL);
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-		switch (rtm->rtm_type) {
-		case RTM_NEWMADDR:
-			ifmam = (struct ifma_msghdr *)(void *)rtm;
-			if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
-				break;
-			icnt++;
-			p = (char *)(ifmam + 1);
-			for (i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifmam->ifmam_addrs &
-				    (1 << i)) == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				dcnt += len;
-				p += len;
-			}
-			break;
-		}
-	}
-
-	data = malloc(sizeof(struct ifmaddrs) * icnt + dcnt);
-	if (data == NULL) {
-		free(buf);
-		return (-1);
-	}
-
-	ifa = (struct ifmaddrs *)(void *)data;
-	data += sizeof(struct ifmaddrs) * icnt;
-
-	memset(ifa, 0, sizeof(struct ifmaddrs) * icnt);
-	ift = ifa;
-
-	for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
-		rtm = (struct rt_msghdr *)(void *)next;
-		if (rtm->rtm_version != RTM_VERSION)
-			continue;
-
-		switch (rtm->rtm_type) {
-		case RTM_NEWMADDR:
-			ifmam = (struct ifma_msghdr *)(void *)rtm;
-			if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
-				break;
-
-			p = (char *)(ifmam + 1);
-			for (i = 0; i < RTAX_MAX; i++) {
-				if ((RTA_MASKS & ifmam->ifmam_addrs &
-				    (1 << i)) == 0)
-					continue;
-				sa = (struct sockaddr *)(void *)p;
-				len = SA_RLEN(sa);
-				switch (i) {
-				case RTAX_GATEWAY:
-					ift->ifma_lladdr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_IFP:
-					ift->ifma_name =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				case RTAX_IFA:
-					ift->ifma_addr =
-					    (struct sockaddr *)(void *)data;
-					memcpy(data, p, len);
-					data += len;
-					break;
-
-				default:
-					data += len;
-					break;
-				}
-				p += len;
-			}
-			ift->ifma_next = ift + 1;
-			ift = ift->ifma_next;
-			break;
-		}
-	}
-
-	free(buf);
-
-	if (ift > ifa) {
-		ift--;
-		ift->ifma_next = NULL;
-		*pif = ifa;
-	} else {
-		*pif = NULL;
-		free(ifa);
-	}
-	return (0);
-}
-
-void
-freeifmaddrs(struct ifmaddrs *ifmp)
-{
-
-	free(ifmp);
-}
diff --git a/lib/libc_bsd/net/getipnodebyname.3 b/lib/libc_bsd/net/getipnodebyname.3
deleted file mode 100644
index 0dce090..0000000
--- a/lib/libc_bsd/net/getipnodebyname.3
+++ /dev/null
@@ -1,474 +0,0 @@
-.\"	$KAME: getipnodebyname.3,v 1.6 2000/08/09 21:16:17 itojun Exp $
-.\"
-.\" Copyright (c) 1983, 1987, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)gethostbyname.3	8.4 (Berkeley) 5/25/95
-.\" $FreeBSD: releng/10.2/lib/libc/net/getipnodebyname.3 233522 2012-03-26 21:22:53Z joel $
-.\"
-.Dd August 6, 2004
-.Dt GETIPNODEBYNAME 3
-.Os
-.\"
-.Sh NAME
-.Nm getipnodebyname ,
-.Nm getipnodebyaddr ,
-.Nm freehostent
-.Nd nodename-to-address and address-to-nodename translation
-.\"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft "struct hostent *"
-.Fn getipnodebyname "const char *name" "int af" "int flags" "int *error_num"
-.Ft "struct hostent *"
-.Fn getipnodebyaddr "const void *src" "size_t len" "int af" "int *error_num"
-.Ft void
-.Fn freehostent "struct hostent *ptr"
-.\"
-.Sh DESCRIPTION
-The
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-functions are very similar to
-.Xr gethostbyname 3 ,
-.Xr gethostbyname2 3
-and
-.Xr gethostbyaddr 3 .
-The functions cover all the functionalities provided by the older ones,
-and provide better interface to programmers.
-The functions require additional arguments,
-.Fa af ,
-and
-.Fa flags ,
-for specifying address family and operation mode.
-The additional arguments allow programmer to get address for a nodename,
-for specific address family
-(such as
-.Dv AF_INET
-or
-.Dv AF_INET6 ) .
-The functions also require an additional pointer argument,
-.Fa error_num
-to return the appropriate error code,
-to support thread safe error code returns.
-.Pp
-The type and usage of the return value,
-.Li "struct hostent"
-is described in
-.Xr gethostbyname 3 .
-.Pp
-For
-.Fn getipnodebyname ,
-the
-.Fa name
-argument can be either a node name or a numeric address
-string
-(i.e., a dotted-decimal IPv4 address or an IPv6 hex address).
-The
-.Fa af
-argument specifies the address family, either
-.Dv AF_INET
-or
-.Dv AF_INET6 .
-The
-.Fa flags
-argument specifies the types of addresses that are searched for,
-and the types of addresses that are returned.
-We note that a special flags value of
-.Dv AI_DEFAULT
-(defined below)
-should handle most applications.
-That is, porting simple applications to use IPv6 replaces the call
-.Bd -literal -offset indent
-hptr = gethostbyname(name);
-.Ed
-.Pp
-with
-.Bd -literal -offset indent
-hptr = getipnodebyname(name, AF_INET6, AI_DEFAULT, &error_num);
-.Ed
-.Pp
-Applications desiring finer control over the types of addresses
-searched for and returned, can specify other combinations of the
-.Fa flags
-argument.
-.Pp
-A
-.Fa flags
-of
-.Li 0
-implies a strict interpretation of the
-.Fa af
-argument:
-.Bl -bullet
-.It
-If
-.Fa flags
-is 0 and
-.Fa af
-is
-.Dv AF_INET ,
-then the caller wants only IPv4 addresses.
-A query is made for
-.Li A
-records.
-If successful, the IPv4 addresses are returned and the
-.Li h_length
-member of the
-.Li hostent
-structure will be 4, else the function returns a
-.Dv NULL
-pointer.
-.It
-If
-.Fa flags
-is 0 and if
-.Fa af
-is
-.Li AF_INET6 ,
-then the caller wants only IPv6 addresses.
-A query is made for
-.Li AAAA
-records.
-If successful, the IPv6 addresses are returned and the
-.Li h_length
-member of the
-.Li hostent
-structure will be 16, else the function returns a
-.Dv NULL
-pointer.
-.El
-.Pp
-Other constants can be logically-ORed into the
-.Fa flags
-argument, to modify the behavior of the function.
-.Bl -bullet
-.It
-If the
-.Dv AI_V4MAPPED
-flag is specified along with an
-.Fa af
-of
-.Dv AF_INET6 ,
-then the caller will accept IPv4-mapped IPv6 addresses.
-That is, if no
-.Li AAAA
-records are found then a query is made for
-.Li A
-records and any found are returned as IPv4-mapped IPv6 addresses
-.Li ( h_length
-will be 16).
-The
-.Dv AI_V4MAPPED
-flag is ignored unless
-.Fa af
-equals
-.Dv AF_INET6 .
-.It
-The
-.Dv AI_V4MAPPED_CFG
-flag is exact same as the
-.Dv AI_V4MAPPED
-flag only if the kernel supports IPv4-mapped IPv6 address.
-.It
-If the
-.Dv AI_ALL
-flag is used in conjunction with the
-.Dv AI_V4MAPPED
-flag, and only used with the IPv6 address family.
-When
-.Dv AI_ALL
-is logically or'd with
-.Dv AI_V4MAPPED
-flag then the caller wants all addresses: IPv6 and IPv4-mapped IPv6.
-A query is first made for
-.Li AAAA
-records and if successful, the
-IPv6 addresses are returned.
-Another query is then made for
-.Li A
-records and any found are returned as IPv4-mapped IPv6 addresses.
-.Li h_length
-will be 16.
-Only if both queries fail does the function
-return a
-.Dv NULL
-pointer.
-This flag is ignored unless af equals
-AF_INET6.
-If both
-.Dv AI_ALL
-and
-.Dv AI_V4MAPPED
-are specified,
-.Dv AI_ALL
-takes precedence.
-.It
-The
-.Dv AI_ADDRCONFIG
-flag specifies that a query for
-.Li AAAA
-records
-should occur only if the node has at least one IPv6 source
-address configured and a query for
-.Li A
-records should occur only if the node has at least one IPv4 source address
-configured.
-.Pp
-For example, if the node has no IPv6 source addresses configured,
-and
-.Fa af
-equals AF_INET6, and the node name being looked up has both
-.Li AAAA
-and
-.Li A
-records, then:
-(a) if only
-.Dv AI_ADDRCONFIG
-is
-specified, the function returns a
-.Dv NULL
-pointer;
-(b) if
-.Dv AI_ADDRCONFIG
-|
-.Dv AI_V4MAPPED
-is specified, the
-.Li A
-records are returned as IPv4-mapped IPv6 addresses;
-.El
-.Pp
-The special flags value of
-.Dv AI_DEFAULT
-is defined as
-.Bd -literal -offset indent
-#define  AI_DEFAULT  (AI_V4MAPPED_CFG | AI_ADDRCONFIG)
-.Ed
-.Pp
-We noted that the
-.Fn getipnodebyname
-function must allow the
-.Fa name
-argument to be either a node name or a literal address string
-(i.e., a dotted-decimal IPv4 address or an IPv6 hex address).
-This saves applications from having to call
-.Xr inet_pton 3
-to handle literal address strings.
-When the
-.Fa name
-argument is a literal address string,
-the
-.Fa flags
-argument is always ignored.
-.Pp
-There are four scenarios based on the type of literal address string
-and the value of the
-.Fa af
-argument.
-The two simple cases are when
-.Fa name
-is a dotted-decimal IPv4 address and
-.Fa af
-equals
-.Dv AF_INET ,
-or when
-.Fa name
-is an IPv6 hex address and
-.Fa af
-equals
-.Dv AF_INET6 .
-The members of the
-returned hostent structure are:
-.Li h_name
-points to a copy of the
-.Fa name
-argument,
-.Li h_aliases
-is a
-.Dv NULL
-pointer,
-.Li h_addrtype
-is a copy of the
-.Fa af
-argument,
-.Li h_length
-is either 4
-(for
-.Dv AF_INET )
-or 16
-(for
-.Dv AF_INET6 ) ,
-.Li h_addr_list[0]
-is a pointer to the 4-byte or 16-byte binary address,
-and
-.Li h_addr_list[1]
-is a
-.Dv NULL
-pointer.
-.Pp
-When
-.Fa name
-is a dotted-decimal IPv4 address and
-.Fa af
-equals
-.Dv AF_INET6 ,
-and
-.Dv AI_V4MAPPED
-is specified,
-an IPv4-mapped IPv6 address is returned:
-.Li h_name
-points to an IPv6 hex address containing the IPv4-mapped IPv6 address,
-.Li h_aliases
-is a
-.Dv NULL
-pointer,
-.Li h_addrtype
-is
-.Dv AF_INET6 ,
-.Li h_length
-is 16,
-.Li h_addr_list[0]
-is a pointer to the 16-byte binary address, and
-.Li h_addr_list[1]
-is a
-.Dv NULL
-pointer.
-.Pp
-It is an error when
-.Fa name
-is an IPv6 hex address and
-.Fa af
-equals
-.Dv AF_INET .
-The function's return value is a
-.Dv NULL
-pointer and the value pointed to by
-.Fa error_num
-equals
-.Dv HOST_NOT_FOUND .
-.Pp
-The
-.Fn getipnodebyaddr
-function
-takes almost the same argument as
-.Xr gethostbyaddr 3 ,
-but adds a pointer to return an error number.
-Additionally it takes care of IPv4-mapped IPv6 addresses,
-and IPv4-compatible IPv6 addresses.
-.Pp
-The
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-functions
-dynamically allocate the structure to be returned to the caller.
-The
-.Fn freehostent
-function
-reclaims memory region allocated and returned by
-.Fn getipnodebyname
-or
-.Fn getipnodebyaddr .
-.\"
-.Sh FILES
-.Bl -tag -width /etc/nsswitch.conf -compact
-.It Pa /etc/hosts
-.It Pa /etc/nsswitch.conf
-.It Pa /etc/resolv.conf
-.El
-.\"
-.Sh DIAGNOSTICS
-The
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-functions
-returns
-.Dv NULL
-on errors.
-The integer values pointed to by
-.Fa error_num
-may then be checked to see whether this is a temporary failure
-or an invalid or unknown host.
-The meanings of each error code are described in
-.Xr gethostbyname 3 .
-.\"
-.Sh SEE ALSO
-.Xr getaddrinfo 3 ,
-.Xr gethostbyaddr 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnameinfo 3 ,
-.Xr hosts 5 ,
-.Xr nsswitch.conf 5 ,
-.Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC2553
-.%D March 1999
-.Re
-.\"
-.Sh STANDARDS
-The
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-functions
-are documented in
-.Dq Basic Socket Interface Extensions for IPv6
-(RFC2553).
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
-.\"
-.Sh BUGS
-The
-.Fn getipnodebyname
-and
-.Fn getipnodebyaddr
-functions
-do not handle scoped IPv6 address properly.
-If you use these functions,
-your program will not be able to handle scoped IPv6 addresses.
-For IPv6 address manipulation,
-.Fn getaddrinfo 3
-and
-.Fn getnameinfo 3
-are recommended.
-.Pp
-The text was shamelessly copied from RFC2553.
diff --git a/lib/libc_bsd/net/getnameinfo.3 b/lib/libc_bsd/net/getnameinfo.3
deleted file mode 100644
index f9f9cfc..0000000
--- a/lib/libc_bsd/net/getnameinfo.3
+++ /dev/null
@@ -1,285 +0,0 @@
-.\"	$KAME: getnameinfo.3,v 1.37 2005/01/05 03:23:05 itojun Exp $
-.\"	$OpenBSD: getnameinfo.3,v 1.36 2004/12/21 09:48:20 jmc Exp $
-.\"
-.\" Copyright (C) 2004  Internet Systems Consortium, Inc. ("ISC")
-.\" Copyright (C) 2000, 2001  Internet Software Consortium.
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-.\" REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-.\" AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-.\" INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-.\" LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-.\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-.\" PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/getnameinfo.3 253066 2013-07-09 08:23:43Z hrs $
-.\"
-.Dd February 14, 2013
-.Dt GETNAMEINFO 3
-.Os
-.Sh NAME
-.Nm getnameinfo
-.Nd socket address structure to hostname and service name
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netdb.h
-.Ft int
-.Fo getnameinfo
-.Fa "const struct sockaddr *sa" "socklen_t salen" "char *host"
-.Fa "size_t hostlen" "char *serv" "size_t servlen" "int flags"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn getnameinfo
-function is used to convert a
-.Li sockaddr
-structure to a pair of host name and service strings.
-It is a replacement for and provides more flexibility than the
-.Xr gethostbyaddr 3
-and
-.Xr getservbyport 3
-functions and is the converse of the
-.Xr getaddrinfo 3
-function.
-.Pp
-If a link-layer address is passed to
-.Fn getnameinfo ,
-its ASCII representation will be stored in
-.Fa host .
-The string pointed to by
-.Fa serv
-will be set to the empty string if non-NULL;
-.Fa flags
-will always be ignored.
-This is intended as a replacement for the legacy
-.Xr link_ntoa 3
-function.
-.Pp
-The
-.Li sockaddr
-structure
-.Fa sa
-should point to either a
-.Li sockaddr_in ,
-.Li sockaddr_in6
-or
-.Li sockaddr_dl
-structure (for IPv4, IPv6 or link-layer respectively) that is
-.Fa salen
-bytes long.
-.Pp
-The host and service names associated with
-.Fa sa
-are stored in
-.Fa host
-and
-.Fa serv
-which have length parameters
-.Fa hostlen
-and
-.Fa servlen .
-The maximum value for
-.Fa hostlen
-is
-.Dv NI_MAXHOST
-and
-the maximum value for
-.Fa servlen
-is
-.Dv NI_MAXSERV ,
-as defined by
-.Aq Pa netdb.h .
-If a length parameter is zero, no string will be stored.
-Otherwise, enough space must be provided to store the
-host name or service string plus a byte for the NUL terminator.
-.Pp
-The
-.Fa flags
-argument is formed by
-.Tn OR Ns 'ing
-the following values:
-.Bl -tag -width "NI_NUMERICHOSTXX"
-.It Dv NI_NOFQDN
-A fully qualified domain name is not required for local hosts.
-The local part of the fully qualified domain name is returned instead.
-.It Dv NI_NUMERICHOST
-Return the address in numeric form, as if calling
-.Xr inet_ntop 3 ,
-instead of a host name.
-.It Dv NI_NAMEREQD
-A name is required.
-If the host name cannot be found in DNS and this flag is set,
-a non-zero error code is returned.
-If the host name is not found and the flag is not set, the
-address is returned in numeric form.
-.It NI_NUMERICSERV
-The service name is returned as a digit string representing the port number.
-.It NI_DGRAM
-Specifies that the service being looked up is a datagram
-service, and causes
-.Xr getservbyport 3
-to be called with a second argument of
-.Dq udp
-instead of its default of
-.Dq tcp .
-This is required for the few ports (512\-514) that have different services
-for
-.Tn UDP
-and
-.Tn TCP .
-.El
-.Pp
-This implementation allows numeric IPv6 address notation with scope identifier,
-as documented in chapter 11 of RFC 4007.
-IPv6 link-local address will appear as a string like
-.Dq Li fe80::1%ne0 .
-Refer to
-.Xr getaddrinfo 3
-for more information.
-.Sh RETURN VALUES
-.Fn getnameinfo
-returns zero on success or one of the error codes listed in
-.Xr gai_strerror 3
-if an error occurs.
-.Sh EXAMPLES
-The following code tries to get a numeric host name, and service name,
-for a given socket address.
-Observe that there is no hardcoded reference to a particular address family.
-.Bd -literal -offset indent
-struct sockaddr *sa;	/* input */
-char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV];
-
-if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), sbuf,
-    sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV)) {
-	errx(1, "could not get numeric hostname");
-	/* NOTREACHED */
-}
-printf("host=%s, serv=%s\en", hbuf, sbuf);
-.Ed
-.Pp
-The following version checks if the socket address has a reverse address mapping:
-.Bd -literal -offset indent
-struct sockaddr *sa;	/* input */
-char hbuf[NI_MAXHOST];
-
-if (getnameinfo(sa, sa->sa_len, hbuf, sizeof(hbuf), NULL, 0,
-    NI_NAMEREQD)) {
-	errx(1, "could not resolve hostname");
-	/* NOTREACHED */
-}
-printf("host=%s\en", hbuf);
-.Ed
-.Sh SEE ALSO
-.Xr gai_strerror 3 ,
-.Xr getaddrinfo 3 ,
-.Xr gethostbyaddr 3 ,
-.Xr getservbyport 3 ,
-.Xr inet_ntop 3 ,
-.Xr link_ntoa 3 ,
-.Xr resolver 3 ,
-.Xr hosts 5 ,
-.Xr resolv.conf 5 ,
-.Xr services 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Rs
-.%A R. Gilligan
-.%A S. Thomson
-.%A J. Bound
-.%A J. McCann
-.%A W. Stevens
-.%T Basic Socket Interface Extensions for IPv6
-.%R RFC 3493
-.%D February 2003
-.Re
-.Rs
-.%A S. Deering
-.%A B. Haberman
-.%A T. Jinmei
-.%A E. Nordmark
-.%A B. Zill
-.%T "IPv6 Scoped Address Architecture"
-.%R RFC 4007
-.%D March 2005
-.Re
-.Rs
-.%A Craig Metz
-.%T Protocol Independence Using the Sockets API
-.%B "Proceedings of the freenix track: 2000 USENIX annual technical conference"
-.%D June 2000
-.Re
-.Sh STANDARDS
-The
-.Fn getnameinfo
-function is defined by the
-.St -p1003.1-2004
-specification and documented in
-.Tn "RFC 3493" ,
-.Dq Basic Socket Interface Extensions for IPv6 .
-.Sh CAVEATS
-.Fn getnameinfo
-can return both numeric and FQDN forms of the address specified in
-.Fa sa .
-There is no return value that indicates whether the string returned in
-.Fa host
-is a result of binary to numeric-text translation (like
-.Xr inet_ntop 3 ) ,
-or is the result of a DNS reverse lookup.
-Because of this, malicious parties could set up a PTR record as follows:
-.Bd -literal -offset indent
-1.0.0.127.in-addr.arpa. IN PTR  10.1.1.1
-.Ed
-.Pp
-and trick the caller of
-.Fn getnameinfo
-into believing that
-.Fa sa
-is
-.Li 10.1.1.1
-when it is actually
-.Li 127.0.0.1 .
-.Pp
-To prevent such attacks, the use of
-.Dv NI_NAMEREQD
-is recommended when the result of
-.Fn getnameinfo
-is used
-for access control purposes:
-.Bd -literal -offset indent
-struct sockaddr *sa;
-socklen_t salen;
-char addr[NI_MAXHOST];
-struct addrinfo hints, *res;
-int error;
-
-error = getnameinfo(sa, salen, addr, sizeof(addr),
-    NULL, 0, NI_NAMEREQD);
-if (error == 0) {
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	hints.ai_flags = AI_NUMERICHOST;
-	if (getaddrinfo(addr, "0", &hints, &res) == 0) {
-		/* malicious PTR record */
-		freeaddrinfo(res);
-		printf("bogus PTR record\en");
-		return -1;
-	}
-	/* addr is FQDN as a result of PTR lookup */
-} else {
-	/* addr is numeric string */
-	error = getnameinfo(sa, salen, addr, sizeof(addr),
-	    NULL, 0, NI_NUMERICHOST);
-}
-.Ed
-.\".Pp
-.\".Ox
-.\"intentionally uses a different
-.\".Dv NI_MAXHOST
-.\"value from what
-.\".Tn "RFC 2553"
-.\"suggests, to avoid buffer length handling mistakes.
diff --git a/lib/libc_bsd/net/getnameinfo.c b/lib/libc_bsd/net/getnameinfo.c
deleted file mode 100644
index 7ba4971..0000000
--- a/lib/libc_bsd/net/getnameinfo.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/*	$KAME: getnameinfo.c,v 1.61 2002/06/27 09:25:47 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * Copyright (c) 2000 Ben Harris.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-/*
- * Issues to be discussed:
- * - Thread safe-ness must be checked
- * - RFC2553 says that we should raise error on short buffer.  X/Open says
- *   we need to truncate the result.  We obey RFC2553 (and X/Open should be
- *   modified).  ipngwg rough consensus seems to follow RFC2553.
- * - What is "local" in NI_FQDN?
- * - NI_NAMEREQD and NI_NUMERICHOST conflict with each other.
- * - (KAME extension) always attach textual scopeid (fe80::1%lo0), if
- *   sin6_scope_id is filled - standardization status?
- *   XXX breaks backward compat for code that expects no scopeid.
- *   beware on merge.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getnameinfo.c 199221 2009-11-12 11:54:12Z ume $");
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
-#include <net/firewire.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <stddef.h>
-#include <errno.h>
-
-static int	getnameinfo_inet(const struct sockaddr *, socklen_t, char *,
-    size_t, char *, size_t, int);
-#ifdef INET6
-static int ip6_parsenumeric(const struct sockaddr *, const char *, char *,
-    size_t, int);
-static int ip6_sa2str(const struct sockaddr_in6 *, char *, size_t, int);
-#endif
-static int	getnameinfo_link(const struct sockaddr *, socklen_t, char *,
-    size_t, char *, size_t, int);
-static int	hexname(const u_int8_t *, size_t, char *, size_t);
-
-int
-getnameinfo(const struct sockaddr *sa, socklen_t salen,
-    char *host, size_t hostlen, char *serv, size_t servlen,
-    int flags)
-{
-
-	switch (sa->sa_family) {
-	case AF_INET:
-#ifdef INET6
-	case AF_INET6:
-#endif
-		return getnameinfo_inet(sa, salen, host, hostlen, serv,
-		    servlen, flags);
-	case AF_LINK:
-		return getnameinfo_link(sa, salen, host, hostlen, serv,
-		    servlen, flags);
-	default:
-		return EAI_FAMILY;
-	}
-}
-
-static const struct afd {
-	int a_af;
-	size_t a_addrlen;
-	socklen_t a_socklen;
-	int a_off;
-} afdl [] = {
-#ifdef INET6
-	{PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
-		offsetof(struct sockaddr_in6, sin6_addr)},
-#endif
-	{PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in),
-		offsetof(struct sockaddr_in, sin_addr)},
-	{0, 0, 0},
-};
-
-struct sockinet {
-	u_char	si_len;
-	u_char	si_family;
-	u_short	si_port;
-};
-
-static int
-getnameinfo_inet(const struct sockaddr *sa, socklen_t salen,
-    char *host, size_t hostlen, char *serv, size_t servlen,
-    int flags)
-{
-	const struct afd *afd;
-	struct servent *sp;
-	struct hostent *hp;
-	u_short port;
-	int family, i;
-	const char *addr;
-	uint32_t v4a;
-	int h_error;
-	char numserv[512];
-	char numaddr[512];
-
-	if (sa == NULL)
-		return EAI_FAIL;
-
-	family = sa->sa_family;
-	for (i = 0; afdl[i].a_af; i++)
-		if (afdl[i].a_af == family) {
-			afd = &afdl[i];
-			goto found;
-		}
-	return EAI_FAMILY;
-
- found:
-	if (salen != afd->a_socklen)
-		return EAI_FAIL;
-
-	/* network byte order */
-	port = ((const struct sockinet *)sa)->si_port;
-	addr = (const char *)sa + afd->a_off;
-
-	if (serv == NULL || servlen == 0) {
-		/*
-		 * do nothing in this case.
-		 * in case you are wondering if "&&" is more correct than
-		 * "||" here: rfc2553bis-03 says that serv == NULL OR
-		 * servlen == 0 means that the caller does not want the result.
-		 */
-	} else {
-		if (flags & NI_NUMERICSERV)
-			sp = NULL;
-		else {
-			sp = getservbyport(port,
-				(flags & NI_DGRAM) ? "udp" : "tcp");
-		}
-		if (sp) {
-			if (strlen(sp->s_name) + 1 > servlen)
-				return EAI_MEMORY;
-			strlcpy(serv, sp->s_name, servlen);
-		} else {
-			snprintf(numserv, sizeof(numserv), "%u", ntohs(port));
-			if (strlen(numserv) + 1 > servlen)
-				return EAI_MEMORY;
-			strlcpy(serv, numserv, servlen);
-		}
-	}
-
-	switch (sa->sa_family) {
-	case AF_INET:
-		v4a = (uint32_t)
-		    ntohl(((const struct sockaddr_in *)sa)->sin_addr.s_addr);
-		if (IN_MULTICAST(v4a) || IN_EXPERIMENTAL(v4a))
-			flags |= NI_NUMERICHOST;
-		v4a >>= IN_CLASSA_NSHIFT;
-		if (v4a == 0)
-			flags |= NI_NUMERICHOST;
-		break;
-#ifdef INET6
-	case AF_INET6:
-	    {
-		const struct sockaddr_in6 *sin6;
-		sin6 = (const struct sockaddr_in6 *)sa;
-		switch (sin6->sin6_addr.s6_addr[0]) {
-		case 0x00:
-			if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr))
-				;
-			else if (IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr))
-				;
-			else
-				flags |= NI_NUMERICHOST;
-			break;
-		default:
-			if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) {
-				flags |= NI_NUMERICHOST;
-			}
-			else if (IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr))
-				flags |= NI_NUMERICHOST;
-			break;
-		}
-	    }
-		break;
-#endif
-	}
-	if (host == NULL || hostlen == 0) {
-		/*
-		 * do nothing in this case.
-		 * in case you are wondering if "&&" is more correct than
-		 * "||" here: rfc2553bis-03 says that host == NULL or
-		 * hostlen == 0 means that the caller does not want the result.
-		 */
-	} else if (flags & NI_NUMERICHOST) {
-		size_t numaddrlen;
-
-		/* NUMERICHOST and NAMEREQD conflicts with each other */
-		if (flags & NI_NAMEREQD)
-			return EAI_NONAME;
-
-		switch(afd->a_af) {
-#ifdef INET6
-		case AF_INET6:
-		{
-			int error;
-
-			if ((error = ip6_parsenumeric(sa, addr, host,
-						      hostlen, flags)) != 0)
-				return(error);
-			break;
-		}
-#endif
-		default:
-			if (inet_ntop(afd->a_af, addr, numaddr, sizeof(numaddr))
-			    == NULL)
-				return EAI_SYSTEM;
-			numaddrlen = strlen(numaddr);
-			if (numaddrlen + 1 > hostlen) /* don't forget terminator */
-				return EAI_MEMORY;
-			strlcpy(host, numaddr, hostlen);
-			break;
-		}
-	} else {
-		hp = getipnodebyaddr(addr, afd->a_addrlen, afd->a_af, &h_error);
-
-		if (hp) {
-#if 0
-			/*
-			 * commented out, since "for local host" is not
-			 * implemented here - see RFC2553 p30
-			 */
-			if (flags & NI_NOFQDN) {
-				char *p;
-				p = strchr(hp->h_name, '.');
-				if (p)
-					*p = '\0';
-			}
-#endif
-			if (strlen(hp->h_name) + 1 > hostlen) {
-				freehostent(hp);
-				return EAI_MEMORY;
-			}
-			strlcpy(host, hp->h_name, hostlen);
-			freehostent(hp);
-		} else {
-			if (flags & NI_NAMEREQD)
-				return EAI_NONAME;
-			switch(afd->a_af) {
-#ifdef INET6
-			case AF_INET6:
-			{
-				int error;
-
-				if ((error = ip6_parsenumeric(sa, addr, host,
-							      hostlen,
-							      flags)) != 0)
-					return(error);
-				break;
-			}
-#endif
-			default:
-				if (inet_ntop(afd->a_af, addr, host,
-				    hostlen) == NULL)
-					return EAI_SYSTEM;
-				break;
-			}
-		}
-	}
-	return(0);
-}
-
-#ifdef INET6
-static int
-ip6_parsenumeric(const struct sockaddr *sa, const char *addr,
-    char *host, size_t hostlen, int flags)
-{
-	size_t numaddrlen;
-	char numaddr[512];
-
-	if (inet_ntop(AF_INET6, addr, numaddr, sizeof(numaddr)) == NULL)
-		return EAI_SYSTEM;
-
-	numaddrlen = strlen(numaddr);
-	if (numaddrlen + 1 > hostlen) /* don't forget terminator */
-		return EAI_OVERFLOW;
-	strlcpy(host, numaddr, hostlen);
-
-	if (((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
-		char zonebuf[MAXHOSTNAMELEN];
-		int zonelen;
-
-		zonelen = ip6_sa2str(
-		    (const struct sockaddr_in6 *)(const void *)sa,
-		    zonebuf, sizeof(zonebuf), flags);
-		if (zonelen < 0)
-			return EAI_OVERFLOW;
-		if (zonelen + 1 + numaddrlen + 1 > hostlen)
-			return EAI_OVERFLOW;
-
-		/* construct <numeric-addr><delim><zoneid> */
-		memcpy(host + numaddrlen + 1, zonebuf,
-		    (size_t)zonelen);
-		host[numaddrlen] = SCOPE_DELIMITER;
-		host[numaddrlen + 1 + zonelen] = '\0';
-	}
-
-	return 0;
-}
-
-/* ARGSUSED */
-static int
-ip6_sa2str(const struct sockaddr_in6 *sa6, char *buf, size_t bufsiz, int flags)
-{
-	unsigned int ifindex;
-	const struct in6_addr *a6;
-	int n;
-
-	ifindex = (unsigned int)sa6->sin6_scope_id;
-	a6 = &sa6->sin6_addr;
-
-#ifdef NI_NUMERICSCOPE
-	if ((flags & NI_NUMERICSCOPE) != 0) {
-		n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
-		if (n < 0 || n >= bufsiz)
-			return -1;
-		else
-			return n;
-	}
-#endif
-
-	/* if_indextoname() does not take buffer size.  not a good api... */
-	if ((IN6_IS_ADDR_LINKLOCAL(a6) || IN6_IS_ADDR_MC_LINKLOCAL(a6) ||
-	     IN6_IS_ADDR_MC_NODELOCAL(a6)) && bufsiz >= IF_NAMESIZE) {
-		char *p = if_indextoname(ifindex, buf);
-		if (p) {
-			return(strlen(p));
-		}
-	}
-
-	/* last resort */
-	n = snprintf(buf, bufsiz, "%u", sa6->sin6_scope_id);
-	if (n < 0 || (size_t)n >= bufsiz)
-		return -1;
-	else
-		return n;
-}
-#endif /* INET6 */
-
-/*
- * getnameinfo_link():
- * Format a link-layer address into a printable format, paying attention to
- * the interface type.
- */
-/* ARGSUSED */
-static int
-getnameinfo_link(const struct sockaddr *sa, socklen_t salen,
-    char *host, size_t hostlen, char *serv, size_t servlen, int flags)
-{
-	const struct sockaddr_dl *sdl =
-	    (const struct sockaddr_dl *)(const void *)sa;
-	const struct fw_hwaddr *iha;
-	int n;
-
-	if (serv != NULL && servlen > 0)
-		*serv = '\0';
-
-	if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 && sdl->sdl_slen == 0) {
-		n = snprintf(host, hostlen, "link#%d", sdl->sdl_index);
-		if (n > hostlen) {
-			*host = '\0';
-			return EAI_MEMORY;
-		}
-		return 0;
-	}
-
-	switch (sdl->sdl_type) {
-	case IFT_IEEE1394:
-		if (sdl->sdl_alen < sizeof(iha->sender_unique_ID_hi) +
-		    sizeof(iha->sender_unique_ID_lo))
-			return EAI_FAMILY;
-		iha = (const struct fw_hwaddr *)(const void *)LLADDR(sdl);
-		return hexname((const u_int8_t *)&iha->sender_unique_ID_hi,
-		    sizeof(iha->sender_unique_ID_hi) +
-		    sizeof(iha->sender_unique_ID_lo),
-		    host, hostlen);
-	/*
-	 * The following have zero-length addresses.
-	 * IFT_ATM	(net/if_atmsubr.c)
-	 * IFT_FAITH	(net/if_faith.c)
-	 * IFT_GIF	(net/if_gif.c)
-	 * IFT_LOOP	(net/if_loop.c)
-	 * IFT_PPP	(net/if_ppp.c, net/if_spppsubr.c)
-	 * IFT_SLIP	(net/if_sl.c, net/if_strip.c)
-	 * IFT_STF	(net/if_stf.c)
-	 * IFT_L2VLAN	(net/if_vlan.c)
-	 * IFT_BRIDGE (net/if_bridge.h>
-	 */
-	/*
-	 * The following use IPv4 addresses as link-layer addresses:
-	 * IFT_OTHER	(net/if_gre.c)
-	 * IFT_OTHER	(netinet/ip_ipip.c)
-	 */
-	/* default below is believed correct for all these. */
-	case IFT_ARCNET:
-	case IFT_ETHER:
-	case IFT_FDDI:
-	case IFT_HIPPI:
-	case IFT_ISO88025:
-	default:
-		return hexname((u_int8_t *)LLADDR(sdl), (size_t)sdl->sdl_alen,
-		    host, hostlen);
-	}
-}
-
-static int
-hexname(cp, len, host, hostlen)
-	const u_int8_t *cp;
-	char *host;
-	size_t len, hostlen;
-{
-	int i, n;
-	char *outp = host;
-
-	*outp = '\0';
-	for (i = 0; i < len; i++) {
-		n = snprintf(outp, hostlen, "%s%02x",
-		    i ? ":" : "", cp[i]);
-		if (n < 0 || n >= hostlen) {
-			*host = '\0';
-			return EAI_MEMORY;
-		}
-		outp += n;
-		hostlen -= n;
-	}
-	return 0;
-}
diff --git a/lib/libc_bsd/net/getnetbydns.c b/lib/libc_bsd/net/getnetbydns.c
deleted file mode 100644
index 272e1d6..0000000
--- a/lib/libc_bsd/net/getnetbydns.c
+++ /dev/null
@@ -1,465 +0,0 @@
-/*-
- * Copyright (c) 1985, 1988, 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.
- * 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getnetbydns.c 211276 2010-08-13 06:39:54Z ume $");
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <string.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-
-#include "netdb_private.h"
-#include "res_config.h"
-
-#define BYADDR 0
-#define BYNAME 1
-
-#define MAXPACKET	(64*1024)
-
-typedef union {
-	HEADER	hdr;
-	u_char	buf[MAXPACKET];
-} querybuf;
-
-typedef union {
-	long	al;
-	char	ac;
-} align;
-
-/*
- * Reverse the order of first four dotted entries of in.
- * Out must contain space for at least strlen(in) characters.
- * The result does not include any leading 0s of in.
- */
-static void
-ipreverse(char *in, char *out)
-{
-	char *pos[4];
-	int len[4];
-	char *p, *start;
-	int i = 0;
-	int leading = 1;
-
-	/* Fill-in element positions and lengths: pos[], len[]. */
-	start = p = in;
-	for (;;) {
-		if (*p == '.' || *p == '\0') {
-			/* Leading 0? */
-			if (leading && p - start == 1 && *start == '0')
-				len[i] = 0;
-			else {
-				len[i] = p - start;
-				leading = 0;
-			}
-			pos[i] = start;
-			start = p + 1;
-			i++;
-		}
-		if (i == 4)
-			break;
-		if (*p == 0) {
-			for (; i < 4; i++) {
-				pos[i] = p;
-				len[i] = 0;
-			}
-			break;
-		}
-		p++;
-	}
-
-	/* Copy the entries in reverse order */
-	p = out;
-	leading = 1;
-	for (i = 3; i >= 0; i--) {
-		memcpy(p, pos[i], len[i]);
-		if (len[i])
-			leading = 0;
-		p += len[i];
-		/* Need a . separator? */
-		if (!leading && i > 0 && len[i - 1])
-			*p++ = '.';
-	}
-	*p = '\0';
-}
-
-static int
-getnetanswer(querybuf *answer, int anslen, int net_i, struct netent *ne,
-    struct netent_data *ned, res_state statp)
-{
-
-	HEADER *hp;
-	u_char *cp;
-	int n;
-	u_char *eom;
-	int type, class, ancount, qdcount, haveanswer;
-	char aux[MAXHOSTNAMELEN];
-	char ans[MAXHOSTNAMELEN];
-	char *in, *bp, *ep, **ap;
-
-	/*
-	 * find first satisfactory answer
-	 *
-	 *      answer --> +------------+  ( MESSAGE )
-	 *		   |   Header   |
-	 *		   +------------+
-	 *		   |  Question  | the question for the name server
-	 *		   +------------+
-	 *		   |   Answer   | RRs answering the question
-	 *		   +------------+
-	 *		   | Authority  | RRs pointing toward an authority
-	 *		   | Additional | RRs holding additional information
-	 *		   +------------+
-	 */
-	eom = answer->buf + anslen;
-	hp = &answer->hdr;
-	ancount = ntohs(hp->ancount); /* #/records in the answer section */
-	qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
-	bp = ned->netbuf;
-	ep = ned->netbuf + sizeof(ned->netbuf);
-	cp = answer->buf + HFIXEDSZ;
-	if (!qdcount) {
-		if (hp->aa)
-			RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-		else
-			RES_SET_H_ERRNO(statp, TRY_AGAIN);
-		return (-1);
-	}
-	while (qdcount-- > 0)
-		cp += __dn_skipname(cp, eom) + QFIXEDSZ;
-	ap = ned->net_aliases;
-	*ap = NULL;
-	ne->n_aliases = ned->net_aliases;
-	haveanswer = 0;
-	while (--ancount >= 0 && cp < eom) {
-		n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-		if ((n < 0) || !res_dnok(bp))
-			break;
-		cp += n;
-		ans[0] = '\0';
-		(void)strncpy(&ans[0], bp, sizeof(ans) - 1);
-		ans[sizeof(ans) - 1] = '\0';
-		GETSHORT(type, cp);
-		GETSHORT(class, cp);
-		cp += INT32SZ;		/* TTL */
-		GETSHORT(n, cp);
-		if (class == C_IN && type == T_PTR) {
-			n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-			if ((n < 0) || !res_hnok(bp)) {
-				cp += n;
-				return (-1);
-			}
-			cp += n;
-			*ap++ = bp;
-			n = strlen(bp) + 1;
-			bp += n;
-			ne->n_addrtype = (class == C_IN) ? AF_INET : AF_UNSPEC;
-			haveanswer++;
-		}
-	}
-	if (haveanswer) {
-		*ap = NULL;
-		switch (net_i) {
-		case BYADDR:
-			ne->n_name = *ne->n_aliases;
-			ne->n_net = 0L;
-			break;
-		case BYNAME:
-			in = *ne->n_aliases;
-			n = strlen(ans) + 1;
-			if (ep - bp < n) {
-				RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-				errno = ENOBUFS;
-				return (-1);
-			}
-			strlcpy(bp, ans, ep - bp);
-			ne->n_name = bp;
-			if (strlen(in) + 1 > sizeof(aux)) {
-				RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-				errno = ENOBUFS;
-				return (-1);
-			}
-			ipreverse(in, aux);
-			ne->n_net = inet_network(aux);
-			break;
-		}
-		ne->n_aliases++;
-		return (0);
-	}
-	RES_SET_H_ERRNO(statp, TRY_AGAIN);
-	return (-1);
-}
-
-int
-_dns_getnetbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	uint32_t net;
-	int net_type;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	unsigned int netbr[4];
-	int nn, anslen, error;
-	querybuf *buf;
-	char qbuf[MAXDNAME];
-	uint32_t net2;
-	res_state statp;
-
-	net = va_arg(ap, uint32_t);
-	net_type = va_arg(ap, int);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	*((struct netent **)rval) = NULL;
-
-	if (net_type != AF_INET) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	for (nn = 4, net2 = net; net2; net2 >>= 8)
-		netbr[--nn] = net2 & 0xff;
-	switch (nn) {
-	case 3: 	/* Class A */
-		sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
-		break;
-	case 2: 	/* Class B */
-		sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
-		break;
-	case 1: 	/* Class C */
-		sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1]);
-		break;
-	case 0: 	/* Class D - E */
-		sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
-		    netbr[1], netbr[0]);
-		break;
-	}
-	if ((buf = malloc(sizeof(*buf))) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	anslen = res_nquery(statp, qbuf, C_IN, T_PTR, (u_char *)buf,
-	    sizeof(*buf));
-	if (anslen < 0) {
-		free(buf);
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf("res_nsearch failed\n");
-#endif
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	} else if (anslen > sizeof(*buf)) {
-		free(buf);
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf("res_nsearch static buffer too small\n");
-#endif
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	error = getnetanswer(buf, anslen, BYADDR, &ne, ned, statp);
-	free(buf);
-	if (error == 0) {
-		/* Strip trailing zeros */
-		while ((net & 0xff) == 0 && net != 0)
-			net >>= 8;
-		ne.n_net = net;
-		if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-			*errnop = errno;
-			RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-			*h_errnop = statp->res_h_errno;
-			return (NS_RETURN);
-		}
-		*((struct netent **)rval) = nptr;
-		return (NS_SUCCESS);
-	}
-	*h_errnop = statp->res_h_errno;
-	return (NS_NOTFOUND);
-}
-
-int
-_dns_getnetbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *net;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	int anslen, error;
-	querybuf *buf;
-	char qbuf[MAXDNAME];
-	res_state statp;
-
-	net = va_arg(ap, const char *);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-	if ((buf = malloc(sizeof(*buf))) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-
-	*((struct netent **)rval) = NULL;
-
-	strncpy(qbuf, net, sizeof(qbuf) - 1);
-	qbuf[sizeof(qbuf) - 1] = '\0';
-	anslen = res_nsearch(statp, qbuf, C_IN, T_PTR, (u_char *)buf,
-	    sizeof(*buf));
-	if (anslen < 0) {
-		free(buf);
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf("res_nsearch failed\n");
-#endif
-		return (NS_UNAVAIL);
-	} else if (anslen > sizeof(*buf)) {
-		free(buf);
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf("res_search static buffer too small\n");
-#endif
-		return (NS_UNAVAIL);
-	}
-	error = getnetanswer(buf, anslen, BYNAME, &ne, ned, statp);
-	free(buf);
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-}
-
-void
-_setnetdnsent(int stayopen)
-{
-	res_state statp;
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0 && res_ninit(statp) == -1)
-		return;
-	if (stayopen)
-		statp->options |= RES_STAYOPEN | RES_USEVC;
-}
-
-void
-_endnetdnsent()
-{
-	res_state statp;
-
-	statp = __res_state();
-	statp->options &= ~(RES_STAYOPEN | RES_USEVC);
-	res_nclose(statp);
-}
diff --git a/lib/libc_bsd/net/getnetbyht.c b/lib/libc_bsd/net/getnetbyht.c
deleted file mode 100644
index 190ba18..0000000
--- a/lib/libc_bsd/net/getnetbyht.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-/* Portions Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
- *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * from getnetent.c	1.1 (Coimbra) 93/06/02
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetent.c	8.1 (Berkeley) 6/4/93";
-static char orig_rcsid[] = "From: Id: getnetent.c,v 8.4 1997/06/01 20:34:37 vixie Exp";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getnetbyht.c 254700 2013-08-23 13:59:47Z jilles $");
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include "netdb_private.h"
-
-void
-_setnethtent(int f, struct netent_data *ned)
-{
-
-	if (ned->netf == NULL)
-		ned->netf = fopen(_PATH_NETWORKS, "re");
-	else
-		rewind(ned->netf);
-	ned->stayopen |= f;
-}
-
-void
-_endnethtent(struct netent_data *ned)
-{
-
-	if (ned->netf) {
-		fclose(ned->netf);
-		ned->netf = NULL;
-	}
-	ned->stayopen = 0;
-}
-
-static int
-getnetent_p(struct netent *ne, struct netent_data *ned)
-{
-	char *p, *bp, *ep;
-	char *cp, **q;
-	int len;
-	char line[BUFSIZ + 1];
-
-	if (ned->netf == NULL &&
-	    (ned->netf = fopen(_PATH_NETWORKS, "re")) == NULL)
-		return (-1);
-again:
-	p = fgets(line, sizeof line, ned->netf);
-	if (p == NULL)
-		return (-1);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	bp = ned->netbuf;
-	ep = ned->netbuf + sizeof ned->netbuf;
-	ne->n_name = bp;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	len = strlen(p) + 1;
-	if (ep - bp < len) {
-		RES_SET_H_ERRNO(__res_state(), NO_RECOVERY);
-		return (-1);
-	}
-	strlcpy(bp, p, ep - bp);
-	bp += len;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	ne->n_net = inet_network(cp);
-	ne->n_addrtype = AF_INET;
-	q = ne->n_aliases = ned->net_aliases;
-	if (p != NULL) {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q >= &ned->net_aliases[_MAXALIASES - 1])
-				break;
-			p = strpbrk(cp, " \t");
-			if (p != NULL)
-				*p++ = '\0';
-			len = strlen(cp) + 1;
-			if (ep - bp < len)
-				break;
-			strlcpy(bp, cp, ep - bp);
-			*q++ = bp;
-			bp += len;
-			cp = p;
-		}
-	}
-	*q = NULL;
-	return (0);
-}
-
-int
-getnetent_r(struct netent *nptr, char *buffer, size_t buflen,
-    struct netent **result, int *h_errnop)
-{
-	struct netent_data *ned;
-	struct netent ne;
-	res_state statp;
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (-1);
-	}
-	if (getnetent_p(&ne, ned) != 0)
-		return (-1);
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return ((errno != 0) ? errno : -1);
-	}
-	*result = nptr;
-	return (0);
-}
-
-struct netent *
-getnetent(void)
-{
-	struct netdata *nd;
-	struct netent *rval;
-	int ret_h_errno;
-
-	if ((nd = __netdata_init()) == NULL)
-		return (NULL);
-	if (getnetent_r(&nd->net, nd->data, sizeof(nd->data), &rval,
-	    &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-int
-_ht_getnetbyname(void *rval, void *cb_data, va_list ap)
-{
-	const char *name;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	char **cp;
-	res_state statp;
-	int error;
-
-	name = va_arg(ap, const char *);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	_setnethtent(ned->stayopen, ned);
-	while ((error = getnetent_p(&ne, ned)) == 0) {
-		if (strcasecmp(ne.n_name, name) == 0)
-			break;
-		for (cp = ne.n_aliases; *cp != 0; cp++)
-			if (strcasecmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!ned->stayopen)
-		_endnethtent(ned);
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-}
-
-int
-_ht_getnetbyaddr(void *rval, void *cb_data, va_list ap)
-{
-	uint32_t net;
-	int type;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	res_state statp;
-	int error;
-
-	net = va_arg(ap, uint32_t);
-	type = va_arg(ap, int);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	_setnethtent(ned->stayopen, ned);
-	while ((error = getnetent_p(&ne, ned)) == 0)
-		if (ne.n_addrtype == type && ne.n_net == net)
-			break;
-	if (!ned->stayopen)
-		_endnethtent(ned);
-	if (error != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-}
diff --git a/lib/libc_bsd/net/getnetbynis.c b/lib/libc_bsd/net/getnetbynis.c
deleted file mode 100644
index 057e8cb..0000000
--- a/lib/libc_bsd/net/getnetbynis.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getnetbynis.c 229403 2012-01-03 18:51:58Z ed $");
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <errno.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <arpa/nameser.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include "netdb_private.h"
-
-#ifdef YP
-static int
-_getnetbynis(const char *name, char *map, int af, struct netent *ne,
-    struct netent_data *ned)
-{
-	char *p, *bp, *ep;
-	char *cp, **q;
-	char *result;
-	int resultlen, len;
-	char ypbuf[YPMAXRECORD + 2];
-
-	switch(af) {
-	case AF_INET:
-		break;
-	default:
-	case AF_INET6:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-
-	if (ned->yp_domain == (char *)NULL)
-		if (yp_get_default_domain (&ned->yp_domain))
-			return (-1);
-
-	if (yp_match(ned->yp_domain, map, name, strlen(name), &result,
-	    &resultlen))
-		return (-1);
-
-	bcopy((char *)result, (char *)&ypbuf, resultlen);
-	ypbuf[resultlen] = '\0';
-	free(result);
-	result = (char *)&ypbuf;
-
-	if ((cp = strchr(result, '\n')))
-		*cp = '\0';
-
-	cp = strpbrk(result, " \t");
-	*cp++ = '\0';
-	bp = ned->netbuf;
-	ep = ned->netbuf + sizeof ned->netbuf;
-	len = strlen(result) + 1;
-	if (ep - bp < len) {
-		RES_SET_H_ERRNO(__res_state(), NO_RECOVERY);
-		return (-1);
-	}
-	strlcpy(bp, result, ep - bp);
-	ne->n_name = bp;
-	bp += len;
-
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-
-	ne->n_net = inet_network(cp);
-	ne->n_addrtype = AF_INET;
-
-	q = ne->n_aliases = ned->net_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q > &ned->net_aliases[_MAXALIASES - 1])
-			break;
-		p = strpbrk(cp, " \t");
-		if (p != NULL)
-			*p++ = '\0';
-		len = strlen(cp) + 1;
-		if (ep - bp < len)
-			break;
-		strlcpy(bp, cp, ep - bp);
-		*q++ = bp;
-		bp += len;
-		cp = p;
-	}
-	*q = NULL;
-	return (0);
-}
-#endif /* YP */
-
-int
-_nis_getnetbyname(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	const char *name;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	res_state statp;
-
-	name = va_arg(ap, const char *);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	if (_getnetbynis(name, "networks.byname", AF_INET, &ne, ned) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-#else
-	return (NS_UNAVAIL);
-#endif
-
-}
-
-int
-_nis_getnetbyaddr(void *rval, void *cb_data, va_list ap)
-{
-#ifdef YP
-	uint32_t addr;
-	int af;
-	char *buffer;
-	size_t buflen;
-	int *errnop, *h_errnop;
-	struct netent *nptr, ne;
-	struct netent_data *ned;
-	char *str, *cp;
-	uint32_t net2;
-	int nn;
-	unsigned int netbr[4];
-	char buf[MAXDNAME];
-	res_state statp;
-
-	addr = va_arg(ap, uint32_t);
-	af = va_arg(ap, int);
-	nptr = va_arg(ap, struct netent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	h_errnop = va_arg(ap, int *);
-
-	statp = __res_state();
-	if ((ned = __netent_data_init()) == NULL) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_UNAVAIL);
-	}
-
-	if (af != AF_INET) {
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		errno = EAFNOSUPPORT;
-		return (NS_UNAVAIL);
-	}
-
-        for (nn = 4, net2 = addr; net2; net2 >>= 8) {
-                netbr[--nn] = net2 & 0xff;
-	}
-
-	switch (nn) {
-	case 3:		/* Class A */
-		sprintf(buf, "%u", netbr[3]);
-		break;
-        case 2:		/* Class B */
-		sprintf(buf, "%u.%u", netbr[2], netbr[3]);
-		break;
-        case 1:		/* Class C */
-		sprintf(buf, "%u.%u.%u", netbr[1], netbr[2], netbr[3]);
-                break;
-        case 0:		/* Class D - E */
-		sprintf(buf, "%u.%u.%u.%u", netbr[0], netbr[1],
-			netbr[2], netbr[3]);
-		break;
-	}
-
-	str = (char *)&buf;
-	cp = str + (strlen(str) - 2);
-
-	while(!strcmp(cp, ".0")) {
-		*cp = '\0';
-		cp = str + (strlen(str) - 2);
-	}
-
-	if (_getnetbynis(str, "networks.byaddr", af, &ne, ned) != 0) {
-		*h_errnop = statp->res_h_errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_netent(&ne, nptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		*h_errnop = statp->res_h_errno;
-		return (NS_RETURN);
-	}
-	*((struct netent **)rval) = nptr;
-	return (NS_SUCCESS);
-#else
-	return (NS_UNAVAIL);
-#endif /* YP */
-}
diff --git a/lib/libc_bsd/net/getnetent.3 b/lib/libc_bsd/net/getnetent.3
deleted file mode 100644
index 3fee8e6..0000000
--- a/lib/libc_bsd/net/getnetent.3
+++ /dev/null
@@ -1,170 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getnetent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/net/getnetent.3 243156 2012-11-16 15:02:35Z kevlo $
-.\"
-.Dd June 4, 1993
-.Dt GETNETENT 3
-.Os
-.Sh NAME
-.Nm getnetent ,
-.Nm getnetbyaddr ,
-.Nm getnetbyname ,
-.Nm setnetent ,
-.Nm endnetent
-.Nd get network entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct netent *
-.Fn getnetent void
-.Ft struct netent *
-.Fn getnetbyname "const char *name"
-.Ft struct netent *
-.Fn getnetbyaddr "uint32_t net" "int type"
-.Ft void
-.Fn setnetent "int stayopen"
-.Ft void
-.Fn endnetent void
-.Sh DESCRIPTION
-The
-.Fn getnetent ,
-.Fn getnetbyname ,
-and
-.Fn getnetbyaddr
-functions
-each return a pointer to an object with the
-following structure describing an internet network.
-This structure contains either the information obtained
-from the nameserver,
-.Xr named 8 ,
-broken-out fields of a line in the network data base
-.Pa /etc/networks ,
-or entries supplied by the
-.Xr yp 8
-system.
-The order of the lookups is controlled by the
-`networks' entry in
-.Xr nsswitch.conf 5 .
-.Bd -literal -offset indent
-struct netent {
-	char		*n_name;	/* official name of net */
-	char		**n_aliases;	/* alias list */
-	int		n_addrtype;	/* net number type */
-	uint32_t	n_net;		/* net number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width n_addrtype
-.It Fa n_name
-The official name of the network.
-.It Fa n_aliases
-A zero terminated list of alternate names for the network.
-.It Fa n_addrtype
-The type of the network number returned; currently only AF_INET.
-.It Fa n_net
-The network number.
-Network numbers are returned in machine byte
-order.
-.El
-.Pp
-The
-.Fn getnetent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setnetent
-function
-opens and rewinds the file.
-If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getnetbyname
-or
-.Fn getnetbyaddr .
-.Pp
-The
-.Fn endnetent
-function
-closes the file.
-.Pp
-The
-.Fn getnetbyname
-function
-and
-.Fn getnetbyaddr
-sequentially search from the beginning
-of the file until a matching
-net name or
-net address and type is found,
-or until
-.Dv EOF
-is encountered.
-The
-.Fa type
-argument
-must be
-.Dv AF_INET .
-Network numbers are supplied in host order.
-.Sh FILES
-.Bl -tag -width /etc/nsswitch.conf -compact
-.It Pa /etc/networks
-.It Pa /etc/nsswitch.conf
-.It Pa /etc/resolv.conf
-.El
-.Sh DIAGNOSTICS
-Null pointer returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr networks 5
-.Pp
-.%T RFC 1101
-.Sh HISTORY
-The
-.Fn getnetent ,
-.Fn getnetbyaddr ,
-.Fn getnetbyname ,
-.Fn setnetent ,
-and
-.Fn endnetent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-The data space used by
-these functions is thread-specific; if future use requires the data, it should be
-copied before any subsequent calls to these functions overwrite it.
-Only Internet network
-numbers are currently understood.
-Expecting network numbers to fit
-in no more than 32 bits is probably
-naive.
diff --git a/lib/libc_bsd/net/getnetnamadr.c b/lib/libc_bsd/net/getnetnamadr.c
deleted file mode 100644
index 1373441..0000000
--- a/lib/libc_bsd/net/getnetnamadr.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/*-
- * Copyright (c) 1994, Garrett Wollman
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getnetnamadr.c 211276 2010-08-13 06:39:54Z ume $");
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include "un-namespace.h"
-#include "netdb_private.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-
-extern int _ht_getnetbyname(void *, void *, va_list);
-extern int _dns_getnetbyname(void *, void *, va_list);
-extern int _nis_getnetbyname(void *, void *, va_list);
-extern int _ht_getnetbyaddr(void *, void *, va_list);
-extern int _dns_getnetbyaddr(void *, void *, va_list);
-extern int _nis_getnetbyaddr(void *, void *, va_list);
-
-/* Network lookup order if nsswitch.conf is broken or nonexistant */
-static const ns_src default_src[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NSSRC_DNS, NS_SUCCESS },
-	{ 0 }
-};
-
-NETDB_THREAD_ALLOC(netent_data)
-NETDB_THREAD_ALLOC(netdata)
-
-#ifdef NS_CACHING
-static int
-net_id_func(char *buffer, size_t *buffer_size, va_list ap, void *cache_mdata)
-{
-	char *name;
-	uint32_t net;
-	int type;
-
-	size_t desired_size, size;
-	enum nss_lookup_type lookup_type;
-	int res = NS_UNAVAIL;
-
-	lookup_type = (enum nss_lookup_type)cache_mdata;
-	switch (lookup_type) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-
-		size = strlen(name);
-		desired_size = sizeof(enum nss_lookup_type) + size + 1;
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), name, size + 1);
-
-		res = NS_SUCCESS;
-		break;
-	case nss_lt_id:
-		net = va_arg(ap, uint32_t);
-		type = va_arg(ap, int);
-
-		desired_size = sizeof(enum nss_lookup_type) +
-		    sizeof(uint32_t) + sizeof(int);
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), &net,
-		    sizeof(uint32_t));
-		memcpy(buffer + sizeof(enum nss_lookup_type) + sizeof(uint32_t),
-		    &type, sizeof(int));
-
-		res = NS_SUCCESS;
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-fin:
-	*buffer_size = desired_size;
-	return (res);
-}
-
-
-static int
-net_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	uint32_t net;
-	int type;
-	struct netent *ne;
-	char *orig_buf;
-	size_t orig_buf_size;
-
-	struct netent new_ne;
-	size_t desired_size, size, aliases_size;
-	char *p;
-	char **alias;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		net = va_arg(ap, uint32_t);
-		type = va_arg(ap, int);
-	break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	ne = va_arg(ap, struct netent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-
-	desired_size = _ALIGNBYTES + sizeof(struct netent) + sizeof(char *);
-	if (ne->n_name != NULL)
-		desired_size += strlen(ne->n_name) + 1;
-
-	if (ne->n_aliases != NULL) {
-		aliases_size = 0;
-		for (alias = ne->n_aliases; *alias; ++alias) {
-			desired_size += strlen(*alias) + 1;
-			++aliases_size;
-		}
-
-		desired_size += _ALIGNBYTES +
-		    (aliases_size + 1) * sizeof(char *);
-	}
-
-	if (*buffer_size < desired_size) {
-		/* this assignment is here for future use */
-		*buffer_size = desired_size;
-		return (NS_RETURN);
-	}
-
-	memcpy(&new_ne, ne, sizeof(struct netent));
-
-	*buffer_size = desired_size;
-	memset(buffer, 0, desired_size);
-	p = buffer + sizeof(struct netent) + sizeof(char *);
-	memcpy(buffer + sizeof(struct netent), &p, sizeof(char *));
-	p = (char *)_ALIGN(p);
-
-	if (new_ne.n_name != NULL) {
-		size = strlen(new_ne.n_name);
-		memcpy(p, new_ne.n_name, size);
-		new_ne.n_name = p;
-		p += size + 1;
-	}
-
-	if (new_ne.n_aliases != NULL) {
-		p = (char *)_ALIGN(p);
-		memcpy(p, new_ne.n_aliases, sizeof(char *) * aliases_size);
-		new_ne.n_aliases = (char **)p;
-		p += sizeof(char *) * (aliases_size + 1);
-
-		for (alias = new_ne.n_aliases; *alias; ++alias) {
-			size = strlen(*alias);
-			memcpy(p, *alias, size);
-			*alias = p;
-			p += size + 1;
-		}
-	}
-
-	memcpy(buffer, &new_ne, sizeof(struct netent));
-	return (NS_SUCCESS);
-}
-
-static int
-net_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	uint32_t net;
-	int type;
-	struct netent *ne;
-	char *orig_buf;
-	size_t orig_buf_size;
-	int *ret_errno;
-
-	char *p;
-	char **alias;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		net = va_arg(ap, uint32_t);
-		type = va_arg(ap, int);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	ne = va_arg(ap, struct netent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-	ret_errno = va_arg(ap, int *);
-
-	if (orig_buf_size <
-	    buffer_size - sizeof(struct netent) - sizeof(char *)) {
-		*ret_errno = ERANGE;
-		return (NS_RETURN);
-	}
-
-	memcpy(ne, buffer, sizeof(struct netent));
-	memcpy(&p, buffer + sizeof(struct netent), sizeof(char *));
-
-	orig_buf = (char *)_ALIGN(orig_buf);
-	memcpy(orig_buf, buffer + sizeof(struct netent) + sizeof(char *) +
-	    _ALIGN(p) - (size_t)p,
-	    buffer_size - sizeof(struct netent) - sizeof(char *) -
-	    _ALIGN(p) + (size_t)p);
-	p = (char *)_ALIGN(p);
-
-	NS_APPLY_OFFSET(ne->n_name, orig_buf, p, char *);
-	if (ne->n_aliases != NULL) {
-		NS_APPLY_OFFSET(ne->n_aliases, orig_buf, p, char **);
-
-		for (alias = ne->n_aliases; *alias; ++alias)
-			NS_APPLY_OFFSET(*alias, orig_buf, p, char *);
-	}
-
-	if (retval != NULL)
-		*((struct netent **)retval) = ne;
-
-	return (NS_SUCCESS);
-}
-#endif /* NS_CACHING */
-
-static void
-netent_data_free(void *ptr)
-{
-	struct netent_data *ned = ptr;
-
-	if (ned == NULL)
-		return;
-	ned->stayopen = 0;
-	_endnethtent(ned);
-	free(ned);
-}
-
-static void
-netdata_free(void *ptr)
-{
-	free(ptr);
-}
-
-int
-__copy_netent(struct netent *ne, struct netent *nptr, char *buf, size_t buflen)
-{
-	char *cp;
-	int i, n;
-	int numptr, len;
-
-	/* Find out the amount of space required to store the answer. */
-	numptr = 1; /* NULL ptr */
-	len = (char *)ALIGN(buf) - buf;
-	for (i = 0; ne->n_aliases[i]; i++, numptr++) {
-		len += strlen(ne->n_aliases[i]) + 1;
-	}
-	len += strlen(ne->n_name) + 1;
-	len += numptr * sizeof(char*);
-
-	if (len > (int)buflen) {
-		errno = ERANGE;
-		return (-1);
-	}
-
-	/* copy net value and type */
-	nptr->n_addrtype = ne->n_addrtype;
-	nptr->n_net = ne->n_net;
-
-	cp = (char *)ALIGN(buf) + numptr * sizeof(char *);
-
-	/* copy official name */
-	n = strlen(ne->n_name) + 1;
-	strcpy(cp, ne->n_name);
-	nptr->n_name = cp;
-	cp += n;
-
-	/* copy aliases */
-	nptr->n_aliases = (char **)ALIGN(buf);
-	for (i = 0 ; ne->n_aliases[i]; i++) {
-		n = strlen(ne->n_aliases[i]) + 1;
-		strcpy(cp, ne->n_aliases[i]);
-		nptr->n_aliases[i] = cp;
-		cp += n;
-	}
-	nptr->n_aliases[i] = NULL;
-
-	return (0);
-}
-
-int
-getnetbyname_r(const char *name, struct netent *ne, char *buffer,
-    size_t buflen, struct netent **result, int *h_errorp)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-    		NS_COMMON_CACHE_INFO_INITIALIZER(
-		networks, (void *)nss_lt_name,
-		net_id_func, net_marshal_func, net_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_getnetbyname, NULL)
-		{ NSSRC_DNS, _dns_getnetbyname, NULL },
-		NS_NIS_CB(_nis_getnetbyname, NULL) /* force -DHESIOD */
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ 0 }
-	};
-	int rval, ret_errno = 0;
-
-	rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS,
-	    "getnetbyname_r", default_src, name, ne, buffer, buflen,
-	    &ret_errno, h_errorp);
-
-	if (rval != NS_SUCCESS) {
-		errno = ret_errno;
-		return ((ret_errno != 0) ? ret_errno : -1);
-	}
-	return (0);
-}
-
-int
-getnetbyaddr_r(uint32_t addr, int af, struct netent *ne, char *buffer,
-    size_t buflen, struct netent **result, int *h_errorp)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-    		NS_COMMON_CACHE_INFO_INITIALIZER(
-		networks, (void *)nss_lt_id,
-		net_id_func, net_marshal_func, net_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		NS_FILES_CB(_ht_getnetbyaddr, NULL)
-		{ NSSRC_DNS, _dns_getnetbyaddr, NULL },
-		NS_NIS_CB(_nis_getnetbyaddr, NULL) /* force -DHESIOD */
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ 0 }
-	};
-	int rval, ret_errno = 0;
-
-	rval = _nsdispatch((void *)result, dtab, NSDB_NETWORKS,
-	    "getnetbyaddr_r", default_src, addr, af, ne, buffer, buflen,
-	    &ret_errno, h_errorp);
-
-	if (rval != NS_SUCCESS) {
-		errno = ret_errno;
-		return ((ret_errno != 0) ? ret_errno : -1);
-	}
-	return (0);
-}
-
-struct netent *
-getnetbyname(const char *name)
-{
-	struct netdata *nd;
-	struct netent *rval;
-	int ret_h_errno;
-
-	if ((nd = __netdata_init()) == NULL)
-		return (NULL);
-	if (getnetbyname_r(name, &nd->net, nd->data, sizeof(nd->data), &rval,
-	    &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-struct netent *
-getnetbyaddr(uint32_t addr, int af)
-{
-	struct netdata *nd;
-	struct netent *rval;
-	int ret_h_errno;
-
-	if ((nd = __netdata_init()) == NULL)
-		return (NULL);
-	if (getnetbyaddr_r(addr, af, &nd->net, nd->data, sizeof(nd->data),
-	    &rval, &ret_h_errno) != 0)
-		return (NULL);
-	return (rval);
-}
-
-void
-setnetent(int stayopen)
-{
-	struct netent_data *ned;
-
-	if ((ned = __netent_data_init()) == NULL)
-		return;
-	_setnethtent(stayopen, ned);
-	_setnetdnsent(stayopen);
-}
-
-void
-endnetent(void)
-{
-	struct netent_data *ned;
-
-	if ((ned = __netent_data_init()) == NULL)
-		return;
-	_endnethtent(ned);
-	_endnetdnsent();
-}
diff --git a/lib/libc_bsd/net/getproto.c b/lib/libc_bsd/net/getproto.c
deleted file mode 100644
index 5d67fe0..0000000
--- a/lib/libc_bsd/net/getproto.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getproto.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getproto.c 213453 2010-10-05 15:40:59Z ume $");
-
-#include <errno.h>
-#include <netdb.h>
-#include <nsswitch.h>
-#include "netdb_private.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-#include "nss_tls.h"
-
-static const ns_src defaultsrc[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NULL, 0 }
-};
-
-#ifdef NS_CACHING
-extern int __proto_id_func(char *, size_t *, va_list, void *);
-extern int __proto_marshal_func(char *, size_t *, void *, va_list, void *);
-extern int __proto_unmarshal_func(char *, size_t, void *, va_list, void *);
-#endif
-
-static int
-files_getprotobynumber(void *retval, void *mdata, va_list ap)
-{
-	struct protoent pe;
-	struct protoent_data *ped;
-	int error;
-
-	int number;
-	struct protoent	*pptr;
-	char *buffer;
-	size_t buflen;
-	int *errnop;
-
-	number = va_arg(ap, int);
-	pptr = va_arg(ap, struct protoent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-
-	if ((ped = __protoent_data_init()) == NULL) {
-		*errnop = errno;
-		return (NS_NOTFOUND);
-	}
-
-	__setprotoent_p(ped->stayopen, ped);
-	while ((error = __getprotoent_p(&pe, ped)) == 0)
-		if (pe.p_proto == number)
-			break;
-	if (!ped->stayopen)
-		__endprotoent_p(ped);
-	if (error != 0) {
-		*errnop = errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		return (NS_RETURN);
-	}
-
-	*((struct protoent **)retval) = pptr;
-	return (NS_SUCCESS);
-}
-
-int
-getprotobynumber_r(int proto, struct protoent *pptr, char *buffer,
-    size_t buflen, struct protoent **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-    		NS_COMMON_CACHE_INFO_INITIALIZER(
-		protocols, (void *)nss_lt_id,
-		__proto_id_func, __proto_marshal_func, __proto_unmarshal_func);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_getprotobynumber, NULL },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobynumber_r",
-		defaultsrc, proto, pptr, buffer, buflen, &ret_errno);
-
-	if (rv != NS_SUCCESS) {
-		errno = ret_errno;
-		return (ret_errno);
-	}
-	return (0);
-}
-
-struct protoent *
-getprotobynumber(int proto)
-{
-	struct protodata *pd;
-	struct protoent *rval;
-
-	if ((pd = __protodata_init()) == NULL)
-		return (NULL);
-	if (getprotobynumber_r(proto, &pd->proto, pd->data, sizeof(pd->data),
-	    &rval) != 0)
-		return (NULL);
-	return (rval);
-}
diff --git a/lib/libc_bsd/net/getprotoent.3 b/lib/libc_bsd/net/getprotoent.3
deleted file mode 100644
index 6ee9d1f..0000000
--- a/lib/libc_bsd/net/getprotoent.3
+++ /dev/null
@@ -1,144 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getprotoent.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/net/getprotoent.3 243156 2012-11-16 15:02:35Z kevlo $
-.\"
-.Dd June 4, 1993
-.Dt GETPROTOENT 3
-.Os
-.Sh NAME
-.Nm getprotoent ,
-.Nm getprotobynumber ,
-.Nm getprotobyname ,
-.Nm setprotoent ,
-.Nm endprotoent
-.Nd get protocol entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct protoent *
-.Fn getprotoent void
-.Ft struct protoent *
-.Fn getprotobyname "const char *name"
-.Ft struct protoent *
-.Fn getprotobynumber "int proto"
-.Ft void
-.Fn setprotoent "int stayopen"
-.Ft void
-.Fn endprotoent void
-.Sh DESCRIPTION
-The
-.Fn getprotoent ,
-.Fn getprotobyname ,
-and
-.Fn getprotobynumber
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network protocol data base,
-.Pa /etc/protocols .
-.Bd -literal -offset indent
-struct protoent {
-	char	*p_name;	/* official name of protocol */
-	char	**p_aliases;	/* alias list */
-	int	p_proto;	/* protocol number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width p_aliases
-.It Fa p_name
-The official name of the protocol.
-.It Fa p_aliases
-A zero terminated list of alternate names for the protocol.
-.It Fa p_proto
-The protocol number.
-.El
-.Pp
-The
-.Fn getprotoent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setprotoent
-function
-opens and rewinds the file.
-If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getprotobyname
-or
-.Fn getprotobynumber .
-.Pp
-The
-.Fn endprotoent
-function
-closes the file.
-.Pp
-The
-.Fn getprotobyname
-function
-and
-.Fn getprotobynumber
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-protocol number is found,
-or until
-.Dv EOF
-is encountered.
-.Sh RETURN VALUES
-Null pointer returned on
-.Dv EOF
-or error.
-.Sh FILES
-.Bl -tag -width /etc/protocols -compact
-.It Pa /etc/protocols
-.El
-.Sh SEE ALSO
-.Xr protocols 5
-.Sh HISTORY
-The
-.Fn getprotoent ,
-.Fn getprotobynumber ,
-.Fn getprotobyname ,
-.Fn setprotoent ,
-and
-.Fn endprotoent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-These functions use a thread-specific data space;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Only the Internet
-protocols are currently understood.
diff --git a/lib/libc_bsd/net/getprotoent.c b/lib/libc_bsd/net/getprotoent.c
deleted file mode 100644
index 6458ef3..0000000
--- a/lib/libc_bsd/net/getprotoent.c
+++ /dev/null
@@ -1,554 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getprotoent.c 254700 2013-08-23 13:59:47Z jilles $");
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <nsswitch.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "namespace.h"
-#include "reentrant.h"
-#include "un-namespace.h"
-#include "netdb_private.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-#include "nss_tls.h"
-
-static const ns_src defaultsrc[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NULL, 0 }
-};
-
-NETDB_THREAD_ALLOC(protoent_data)
-NETDB_THREAD_ALLOC(protodata)
-
-static void
-protoent_data_clear(struct protoent_data *ped)
-{
-	if (ped->fp) {
-		fclose(ped->fp);
-		ped->fp = NULL;
-	}
-}
-
-static void
-protoent_data_free(void *ptr)
-{
-	struct protoent_data *ped = ptr;
-
-	protoent_data_clear(ped);
-	free(ped);
-}
-
-static void
-protodata_free(void *ptr)
-{
-	free(ptr);
-}
-
-#ifdef NS_CACHING
-int
-__proto_id_func(char *buffer, size_t *buffer_size, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	int proto;
-
-	size_t desired_size, size;
-	enum nss_lookup_type lookup_type;
-	int res = NS_UNAVAIL;
-
-	lookup_type = (enum nss_lookup_type)cache_mdata;
-	switch (lookup_type) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-
-		size = strlen(name);
-		desired_size = sizeof(enum nss_lookup_type) + size + 1;
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), name, size + 1);
-
-		res = NS_SUCCESS;
-		break;
-	case nss_lt_id:
-		proto = va_arg(ap, int);
-
-		desired_size = sizeof(enum nss_lookup_type) + sizeof(int);
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), &proto,
-			sizeof(int));
-
-		res = NS_SUCCESS;
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-fin:
-	*buffer_size = desired_size;
-	return (res);
-}
-
-
-int
-__proto_marshal_func(char *buffer, size_t *buffer_size, void *retval,
-    va_list ap, void *cache_mdata)
-{
-	char *name;
-	int num;
-	struct protoent *proto;
-	char *orig_buf;
-	size_t orig_buf_size;
-
-	struct protoent new_proto;
-	size_t desired_size, size, aliases_size;
-	char *p;
-	char **alias;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		num = va_arg(ap, int);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	proto = va_arg(ap, struct protoent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-
-	desired_size = _ALIGNBYTES + sizeof(struct protoent) + sizeof(char *);
-	if (proto->p_name != NULL)
-		desired_size += strlen(proto->p_name) + 1;
-
-	if (proto->p_aliases != NULL) {
-		aliases_size = 0;
-		for (alias = proto->p_aliases; *alias; ++alias) {
-			desired_size += strlen(*alias) + 1;
-			++aliases_size;
-		}
-
-		desired_size += _ALIGNBYTES + (aliases_size + 1) *
-		    sizeof(char *);
-	}
-
-	if (*buffer_size < desired_size) {
-		/* this assignment is here for future use */
-		*buffer_size = desired_size;
-		return (NS_RETURN);
-	}
-
-	memcpy(&new_proto, proto, sizeof(struct protoent));
-
-	*buffer_size = desired_size;
-	memset(buffer, 0, desired_size);
-	p = buffer + sizeof(struct protoent) + sizeof(char *);
-	memcpy(buffer + sizeof(struct protoent), &p, sizeof(char *));
-	p = (char *)_ALIGN(p);
-
-	if (new_proto.p_name != NULL) {
-		size = strlen(new_proto.p_name);
-		memcpy(p, new_proto.p_name, size);
-		new_proto.p_name = p;
-		p += size + 1;
-	}
-
-	if (new_proto.p_aliases != NULL) {
-		p = (char *)_ALIGN(p);
-		memcpy(p, new_proto.p_aliases, sizeof(char *) * aliases_size);
-		new_proto.p_aliases = (char **)p;
-		p += sizeof(char *) * (aliases_size + 1);
-
-		for (alias = new_proto.p_aliases; *alias; ++alias) {
-			size = strlen(*alias);
-			memcpy(p, *alias, size);
-			*alias = p;
-			p += size + 1;
-		}
-	}
-
-	memcpy(buffer, &new_proto, sizeof(struct protoent));
-	return (NS_SUCCESS);
-}
-
-int
-__proto_unmarshal_func(char *buffer, size_t buffer_size, void *retval,
-    va_list ap, void *cache_mdata)
-{
-	char *name;
-	int num;
-	struct protoent *proto;
-	char *orig_buf;
-	size_t orig_buf_size;
-	int *ret_errno;
-
-	char *p;
-	char **alias;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		num = va_arg(ap, int);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	proto = va_arg(ap, struct protoent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-	ret_errno = va_arg(ap, int *);
-
-	if (orig_buf_size <
-	    buffer_size - sizeof(struct protoent) - sizeof(char *)) {
-		*ret_errno = ERANGE;
-		return (NS_RETURN);
-	}
-
-	memcpy(proto, buffer, sizeof(struct protoent));
-	memcpy(&p, buffer + sizeof(struct protoent), sizeof(char *));
-
-	orig_buf = (char *)_ALIGN(orig_buf);
-	memcpy(orig_buf, buffer + sizeof(struct protoent) + sizeof(char *) +
-	    _ALIGN(p) - (size_t)p,
-	    buffer_size - sizeof(struct protoent) - sizeof(char *) -
-	    _ALIGN(p) + (size_t)p);
-	p = (char *)_ALIGN(p);
-
-	NS_APPLY_OFFSET(proto->p_name, orig_buf, p, char *);
-	if (proto->p_aliases != NULL) {
-		NS_APPLY_OFFSET(proto->p_aliases, orig_buf, p, char **);
-
-		for (alias = proto->p_aliases; *alias; ++alias)
-			NS_APPLY_OFFSET(*alias, orig_buf, p, char *);
-	}
-
-	if (retval != NULL)
-		*((struct protoent **)retval) = proto;
-
-	return (NS_SUCCESS);
-}
-
-NSS_MP_CACHE_HANDLING(protocols);
-#endif /* NS_CACHING */
-
-int
-__copy_protoent(struct protoent *pe, struct protoent *pptr, char *buf,
-    size_t buflen)
-{
-	char *cp;
-	int i, n;
-	int numptr, len;
-
-	/* Find out the amount of space required to store the answer. */
-	numptr = 1; /* NULL ptr */
-	len = (char *)ALIGN(buf) - buf;
-	for (i = 0; pe->p_aliases[i]; i++, numptr++) {
-		len += strlen(pe->p_aliases[i]) + 1;
-	}
-	len += strlen(pe->p_name) + 1;
-	len += numptr * sizeof(char*);
-
-	if (len > (int)buflen) {
-		errno = ERANGE;
-		return (-1);
-	}
-
-	/* copy protocol value*/
-	pptr->p_proto = pe->p_proto;
-
-	cp = (char *)ALIGN(buf) + numptr * sizeof(char *);
-
-	/* copy official name */
-	n = strlen(pe->p_name) + 1;
-	strcpy(cp, pe->p_name);
-	pptr->p_name = cp;
-	cp += n;
-
-	/* copy aliases */
-	pptr->p_aliases = (char **)ALIGN(buf);
-	for (i = 0 ; pe->p_aliases[i]; i++) {
-		n = strlen(pe->p_aliases[i]) + 1;
-		strcpy(cp, pe->p_aliases[i]);
-		pptr->p_aliases[i] = cp;
-		cp += n;
-	}
-	pptr->p_aliases[i] = NULL;
-
-	return (0);
-}
-
-void
-__setprotoent_p(int f, struct protoent_data *ped)
-{
-	if (ped->fp == NULL)
-		ped->fp = fopen(_PATH_PROTOCOLS, "re");
-	else
-		rewind(ped->fp);
-	ped->stayopen |= f;
-}
-
-void
-__endprotoent_p(struct protoent_data *ped)
-{
-	if (ped->fp) {
-		fclose(ped->fp);
-		ped->fp = NULL;
-	}
-	ped->stayopen = 0;
-}
-
-int
-__getprotoent_p(struct protoent *pe, struct protoent_data *ped)
-{
-	char *p;
-	char *cp, **q, *endp;
-	long l;
-
-	if (ped->fp == NULL && (ped->fp = fopen(_PATH_PROTOCOLS, "re")) == NULL)
-		return (-1);
-again:
-	if ((p = fgets(ped->line, sizeof ped->line, ped->fp)) == NULL)
-		return (-1);
-	if (*p == '#')
-		goto again;
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	pe->p_name = p;
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		goto again;
-	*cp++ = '\0';
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	p = strpbrk(cp, " \t");
-	if (p != NULL)
-		*p++ = '\0';
-	l = strtol(cp, &endp, 10);
-	if (endp == cp || *endp != '\0' || l < 0 || l > USHRT_MAX)
-		goto again;
-	pe->p_proto = l;
-	q = pe->p_aliases = ped->aliases;
-	if (p != NULL) {
-		cp = p;
-		while (cp && *cp) {
-			if (*cp == ' ' || *cp == '\t') {
-				cp++;
-				continue;
-			}
-			if (q < &ped->aliases[_MAXALIASES - 1])
-				*q++ = cp;
-			cp = strpbrk(cp, " \t");
-			if (cp != NULL)
-				*cp++ = '\0';
-		}
-	}
-	*q = NULL;
-	return (0);
-}
-
-static int
-files_getprotoent_r(void *retval, void *mdata, va_list ap)
-{
-	struct protoent pe;
-	struct protoent_data *ped;
-
-	struct protoent	*pptr;
-	char *buffer;
-	size_t buflen;
-	int *errnop;
-
-	pptr = va_arg(ap, struct protoent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-
-	if ((ped = __protoent_data_init()) == NULL) {
-		*errnop = errno;
-		return (NS_NOTFOUND);
-	}
-
-	if (__getprotoent_p(&pe, ped) != 0) {
-		*errnop = errno;
-		return (NS_NOTFOUND);
-	}
-
-	if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		return (NS_RETURN);
-	}
-
-	*((struct protoent **)retval) = pptr;
-	return (NS_SUCCESS);
-}
-
-static int
-files_setprotoent(void *retval, void *mdata, va_list ap)
-{
-	struct protoent_data *ped;
-	int f;
-
-	f = va_arg(ap, int);
-	if ((ped = __protoent_data_init()) == NULL)
-		return (NS_UNAVAIL);
-
-	__setprotoent_p(f, ped);
-	return (NS_UNAVAIL);
-}
-
-static int
-files_endprotoent(void *retval, void *mdata, va_list ap)
-{
-	struct protoent_data *ped;
-
-	if ((ped = __protoent_data_init()) == NULL)
-		return (NS_UNAVAIL);
-
-	__endprotoent_p(ped);
-	return (NS_UNAVAIL);
-}
-
-int
-getprotoent_r(struct protoent *pptr, char *buffer, size_t buflen,
-    struct protoent **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		protocols, (void *)nss_lt_all,
-		__proto_marshal_func, __proto_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_getprotoent_r, (void *)nss_lt_all },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotoent_r",
-	    defaultsrc, pptr, buffer, buflen, &ret_errno);
-
-	if (rv != NS_SUCCESS) {
-		errno = ret_errno;
-		return (ret_errno);
-	}
-	return (0);
-}
-
-void
-setprotoent(int stayopen)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		protocols, (void *)nss_lt_all,
-		NULL, NULL);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setprotoent, NULL },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-
-	(void)nsdispatch(NULL, dtab, NSDB_PROTOCOLS, "setprotoent", defaultsrc,
-		stayopen);
-}
-
-void
-endprotoent(void)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		protocols, (void *)nss_lt_all,
-		NULL, NULL);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_endprotoent, NULL },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-
-	(void)nsdispatch(NULL, dtab, NSDB_PROTOCOLS, "endprotoent", defaultsrc);
-}
-
-struct protoent *
-getprotoent(void)
-{
-	struct protodata *pd;
-	struct protoent *rval;
-
-	if ((pd = __protodata_init()) == NULL)
-		return (NULL);
-	if (getprotoent_r(&pd->proto, pd->data, sizeof(pd->data), &rval) != 0)
-		return (NULL);
-	return (rval);
-}
diff --git a/lib/libc_bsd/net/getprotoname.c b/lib/libc_bsd/net/getprotoname.c
deleted file mode 100644
index f92dad2..0000000
--- a/lib/libc_bsd/net/getprotoname.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getprotoname.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getprotoname.c 213453 2010-10-05 15:40:59Z ume $");
-
-#include <errno.h>
-#include <netdb.h>
-#include <nsswitch.h>
-#include <string.h>
-#include "netdb_private.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-#include "nss_tls.h"
-
-static const ns_src defaultsrc[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ NULL, 0 }
-};
-
-#ifdef NS_CACHING
-extern int __proto_id_func(char *, size_t *, va_list, void *);
-extern int __proto_marshal_func(char *, size_t *, void *, va_list, void *);
-extern int __proto_unmarshal_func(char *, size_t, void *, va_list, void *);
-#endif
-
-static int
-files_getprotobyname(void *retval, void *mdata, va_list ap)
-{
-	struct protoent pe;
-	struct protoent_data *ped;
-	char **cp;
-	int error;
-
-	char *name;
-	struct protoent	*pptr;
-	char *buffer;
-	size_t buflen;
-	int *errnop;
-
-	name = va_arg(ap, char *);
-	pptr = va_arg(ap, struct protoent *);
-	buffer = va_arg(ap, char *);
-	buflen = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-
-
-	if ((ped = __protoent_data_init()) == NULL) {
-		*errnop = errno;
-		return (NS_NOTFOUND);
-	}
-
-	__setprotoent_p(ped->stayopen, ped);
-	while ((error = __getprotoent_p(&pe, ped)) == 0) {
-		if (strcmp(pe.p_name, name) == 0)
-			break;
-		for (cp = pe.p_aliases; *cp != 0; cp++)
-			if (strcmp(*cp, name) == 0)
-				goto found;
-	}
-found:
-	if (!ped->stayopen)
-		__endprotoent_p(ped);
-	if (error != 0) {
-		*errnop = errno;
-		return (NS_NOTFOUND);
-	}
-	if (__copy_protoent(&pe, pptr, buffer, buflen) != 0) {
-		*errnop = errno;
-		return (NS_RETURN);
-	}
-
-	*((struct protoent **)retval) = pptr;
-	return (NS_SUCCESS);
-}
-
-
-int
-getprotobyname_r(const char *name, struct protoent *pptr, char *buffer,
-    size_t buflen, struct protoent **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-		NS_COMMON_CACHE_INFO_INITIALIZER(
-		protocols, (void *)nss_lt_name,
-		__proto_id_func, __proto_marshal_func, __proto_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_getprotobyname, NULL },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = nsdispatch(result, dtab, NSDB_PROTOCOLS, "getprotobyname_r",
-	    defaultsrc, name, pptr, buffer, buflen, &ret_errno);
-
-	if (rv != NS_SUCCESS) {
-		errno = ret_errno;
-		return (ret_errno);
-	}
-	return (0);
-}
-
-struct protoent *
-getprotobyname(const char *name)
-{
-	struct protodata *pd;
-	struct protoent *rval;
-
-	if ((pd = __protodata_init()) == NULL)
-		return (NULL);
-	if (getprotobyname_r(name, &pd->proto, pd->data, sizeof(pd->data),
-	    &rval) != 0)
-		return (NULL);
-	return (rval);
-}
diff --git a/lib/libc_bsd/net/getservent.3 b/lib/libc_bsd/net/getservent.3
deleted file mode 100644
index 00447a4..0000000
--- a/lib/libc_bsd/net/getservent.3
+++ /dev/null
@@ -1,154 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)getservent.3	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD: releng/10.2/lib/libc/net/getservent.3 243156 2012-11-16 15:02:35Z kevlo $
-.\"
-.Dd July 9, 1995
-.Dt GETSERVENT 3
-.Os
-.Sh NAME
-.Nm getservent ,
-.Nm getservbyport ,
-.Nm getservbyname ,
-.Nm setservent ,
-.Nm endservent
-.Nd get service entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netdb.h
-.Ft struct servent *
-.Fn getservent
-.Ft struct servent *
-.Fn getservbyname "const char *name" "const char *proto"
-.Ft struct servent *
-.Fn getservbyport "int port" "const char *proto"
-.Ft void
-.Fn setservent "int stayopen"
-.Ft void
-.Fn endservent void
-.Sh DESCRIPTION
-The
-.Fn getservent ,
-.Fn getservbyname ,
-and
-.Fn getservbyport
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the network services data base,
-.Pa /etc/services .
-.Bd -literal -offset indent
-struct servent {
-	char	*s_name;	/* official name of service */
-	char	**s_aliases;	/* alias list */
-	int	s_port;		/* port service resides at */
-	char	*s_proto;	/* protocol to use */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width s_aliases
-.It Fa s_name
-The official name of the service.
-.It Fa s_aliases
-A zero terminated list of alternate names for the service.
-.It Fa s_port
-The port number at which the service resides.
-Port numbers are returned in network byte order.
-.It Fa s_proto
-The name of the protocol to use when contacting the
-service.
-.El
-.Pp
-The
-.Fn getservent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setservent
-function
-opens and rewinds the file.
-If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getservbyname
-or
-.Fn getservbyport .
-.Pp
-The
-.Fn endservent
-function
-closes the file.
-.Pp
-The
-.Fn getservbyname
-and
-.Fn getservbyport
-functions
-sequentially search from the beginning
-of the file until a matching
-protocol name or
-port number (which must be specified in
-network byte order) is found,
-or until
-.Dv EOF
-is encountered.
-If a protocol name is also supplied (non-
-.Dv NULL ) ,
-searches must also match the protocol.
-.Sh FILES
-.Bl -tag -width /etc/services -compact
-.It Pa /etc/services
-.El
-.Sh DIAGNOSTICS
-Null pointer returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr getprotoent 3 ,
-.Xr services 5
-.Sh HISTORY
-The
-.Fn getservent ,
-.Fn getservbyport ,
-.Fn getservbyname ,
-.Fn setservent ,
-and
-.Fn endservent
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-These functions use a thread-specific data storage;
-if the data is needed for future use, it should be
-copied before any subsequent calls overwrite it.
-Expecting port numbers to fit in a 32 bit
-quantity is probably naive.
diff --git a/lib/libc_bsd/net/getservent.c b/lib/libc_bsd/net/getservent.c
deleted file mode 100644
index 0916a8c..0000000
--- a/lib/libc_bsd/net/getservent.c
+++ /dev/null
@@ -1,1373 +0,0 @@
-/*
- * Copyright (c) 1983, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getservent.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/getservent.c 254700 2013-08-23 13:59:47Z jilles $");
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <db.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <netdb.h>
-#include <nsswitch.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#ifdef YP
-#include <rpc/rpc.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include "namespace.h"
-#include "reentrant.h"
-#include "un-namespace.h"
-#include "netdb_private.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-#include "nss_tls.h"
-
-enum constants
-{
-	SETSERVENT		= 1,
-	ENDSERVENT		= 2,
-	SERVENT_STORAGE_INITIAL	= 1 << 10, /* 1 KByte */
-	SERVENT_STORAGE_MAX	= 1 << 20, /* 1 MByte */
-};
-
-struct servent_mdata
-{
-	enum nss_lookup_type how;
-	int compat_mode;
-};
-
-static const ns_src defaultsrc[] = {
-	{ NSSRC_COMPAT, NS_SUCCESS },
-	{ NULL, 0 }
-};
-
-static int servent_unpack(char *, struct servent *, char **, size_t, int *);
-
-/* files backend declarations */
-struct files_state
-{
-	FILE *fp;
-	int stayopen;
-
-	int compat_mode_active;
-};
-static void files_endstate(void *);
-NSS_TLS_HANDLING(files);
-
-static int files_servent(void *, void *, va_list);
-static int files_setservent(void *, void *, va_list);
-
-/* db backend declarations */
-struct db_state
-{
-        DB *db;
-	int stayopen;
-	int keynum;
-};
-static void db_endstate(void *);
-NSS_TLS_HANDLING(db);
-
-static int db_servent(void *, void *, va_list);
-static int db_setservent(void *, void *, va_list);
-
-#ifdef YP
-/* nis backend declarations */
-static 	int 	nis_servent(void *, void *, va_list);
-static 	int 	nis_setservent(void *, void *, va_list);
-
-struct nis_state
-{
-	int yp_stepping;
-	char yp_domain[MAXHOSTNAMELEN];
-	char *yp_key;
-	int yp_keylen;
-};
-static void nis_endstate(void *);
-NSS_TLS_HANDLING(nis);
-
-static int nis_servent(void *, void *, va_list);
-static int nis_setservent(void *, void *, va_list);
-#endif
-
-/* compat backend declarations */
-static int compat_setservent(void *, void *, va_list);
-
-/* get** wrappers for get**_r functions declarations */
-struct servent_state {
-	struct servent serv;
-	char *buffer;
-	size_t bufsize;
-};
-static	void	servent_endstate(void *);
-NSS_TLS_HANDLING(servent);
-
-struct key {
-	const char *proto;
-	union {
-		const char *name;
-		int port;
-	};
-};
-
-static int wrap_getservbyname_r(struct key, struct servent *, char *, size_t,
-    struct servent **);
-static int wrap_getservbyport_r(struct key, struct servent *, char *, size_t,
-    struct servent **);
-static int wrap_getservent_r(struct key, struct servent *, char *, size_t,
-    struct servent **);
-static struct servent *getserv(int (*fn)(struct key, struct servent *, char *,
-    size_t, struct servent **), struct key);
-
-#ifdef NS_CACHING
-static int serv_id_func(char *, size_t *, va_list, void *);
-static int serv_marshal_func(char *, size_t *, void *, va_list, void *);
-static int serv_unmarshal_func(char *, size_t, void *, va_list, void *);
-#endif
-
-static int
-servent_unpack(char *p, struct servent *serv, char **aliases,
-    size_t aliases_size, int *errnop)
-{
-	char *cp, **q, *endp;
-	long l;
-
-	if (*p == '#')
-		return -1;
-
-	memset(serv, 0, sizeof(struct servent));
-
-	cp = strpbrk(p, "#\n");
-	if (cp != NULL)
-		*cp = '\0';
-	serv->s_name = p;
-
-	p = strpbrk(p, " \t");
-	if (p == NULL)
-		return -1;
-	*p++ = '\0';
-	while (*p == ' ' || *p == '\t')
-		p++;
-	cp = strpbrk(p, ",/");
-	if (cp == NULL)
-		return -1;
-
-	*cp++ = '\0';
-	l = strtol(p, &endp, 10);
-	if (endp == p || *endp != '\0' || l < 0 || l > USHRT_MAX)
-		return -1;
-	serv->s_port = htons((in_port_t)l);
-	serv->s_proto = cp;
-
-	q = serv->s_aliases = aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &aliases[aliases_size - 1]) {
-			*q++ = cp;
-		} else {
-			*q = NULL;
-			*errnop = ERANGE;
-			return -1;
-		}
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-
-	return 0;
-}
-
-static int
-parse_result(struct servent *serv, char *buffer, size_t bufsize,
-    char *resultbuf, size_t resultbuflen, int *errnop)
-{
-	char **aliases;
-	int aliases_size;
-
-	if (bufsize <= resultbuflen + _ALIGNBYTES + sizeof(char *)) {
-		*errnop = ERANGE;
-		return (NS_RETURN);
-	}
-	aliases = (char **)_ALIGN(&buffer[resultbuflen + 1]);
-	aliases_size = (buffer + bufsize - (char *)aliases) / sizeof(char *);
-	if (aliases_size < 1) {
-		*errnop = ERANGE;
-		return (NS_RETURN);
-	}
-
-	memcpy(buffer, resultbuf, resultbuflen);
-	buffer[resultbuflen] = '\0';
-
-	if (servent_unpack(buffer, serv, aliases, aliases_size, errnop) != 0)
-		return ((*errnop == 0) ? NS_NOTFOUND : NS_RETURN);
-	return (NS_SUCCESS);
-}
-
-/* files backend implementation */
-static	void
-files_endstate(void *p)
-{
-	FILE * f;
-
-	if (p == NULL)
-		return;
-
-	f = ((struct files_state *)p)->fp;
-	if (f != NULL)
-		fclose(f);
-
-	free(p);
-}
-
-/*
- * compat structures. compat and files sources functionalities are almost
- * equal, so they all are managed by files_servent function
- */
-static int
-files_servent(void *retval, void *mdata, va_list ap)
-{
-	static const ns_src compat_src[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab compat_dtab[] = {
-		{ NSSRC_DB, db_servent,
-			(void *)((struct servent_mdata *)mdata)->how },
-#ifdef YP
-		{ NSSRC_NIS, nis_servent,
-			(void *)((struct servent_mdata *)mdata)->how },
-#endif
-		{ NULL, NULL, NULL }
-	};
-
-	struct files_state *st;
-	int rv;
-	int stayopen;
-
-	struct servent_mdata *serv_mdata;
-	char *name;
-	char *proto;
-	int port;
-
-	struct servent *serv;
-	char *buffer;
-	size_t bufsize;
-	int *errnop;
-
-	size_t linesize;
-	char *line;
-	char **cp;
-
-	name = NULL;
-	proto = NULL;
-	serv_mdata = (struct servent_mdata *)mdata;
-	switch (serv_mdata->how) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		port = va_arg(ap, int);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		return NS_NOTFOUND;
-	};
-
-	serv = va_arg(ap, struct servent *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap,int *);
-
-	*errnop = files_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-
-	if (st->fp == NULL)
-		st->compat_mode_active = 0;
-
-	if (st->fp == NULL && (st->fp = fopen(_PATH_SERVICES, "re")) == NULL) {
-		*errnop = errno;
-		return (NS_UNAVAIL);
-	}
-
-	if (serv_mdata->how == nss_lt_all)
-		stayopen = 1;
-	else {
-		rewind(st->fp);
-		stayopen = st->stayopen;
-	}
-
-	rv = NS_NOTFOUND;
-	do {
-		if (!st->compat_mode_active) {
-			if ((line = fgetln(st->fp, &linesize)) == NULL) {
-				*errnop = errno;
-				rv = NS_RETURN;
-				break;
-			}
-
-			if (*line=='+' && serv_mdata->compat_mode != 0)
-				st->compat_mode_active = 1;
-		}
-
-		if (st->compat_mode_active != 0) {
-			switch (serv_mdata->how) {
-			case nss_lt_name:
-				rv = nsdispatch(retval, compat_dtab,
-				    NSDB_SERVICES_COMPAT, "getservbyname_r",
-				    compat_src, name, proto, serv, buffer,
-				    bufsize, errnop);
-				break;
-			case nss_lt_id:
-				rv = nsdispatch(retval, compat_dtab,
-				    NSDB_SERVICES_COMPAT, "getservbyport_r",
-				    compat_src, port, proto, serv, buffer,
-					bufsize, errnop);
-				break;
-			case nss_lt_all:
-				rv = nsdispatch(retval, compat_dtab,
-				    NSDB_SERVICES_COMPAT, "getservent_r",
-				    compat_src, serv, buffer, bufsize, errnop);
-				break;
-			}
-
-			if (!(rv & NS_TERMINATE) ||
-			    serv_mdata->how != nss_lt_all)
-				st->compat_mode_active = 0;
-
-			continue;
-		}
-
-		rv = parse_result(serv, buffer, bufsize, line, linesize,
-		    errnop);
-		if (rv == NS_NOTFOUND)
-			continue;
-		if (rv == NS_RETURN)
-			break;
-
-		rv = NS_NOTFOUND;
-		switch (serv_mdata->how) {
-		case nss_lt_name:
-			if (strcmp(name, serv->s_name) == 0)
-				goto gotname;
-			for (cp = serv->s_aliases; *cp; cp++)
-				if (strcmp(name, *cp) == 0)
-					goto gotname;
-
-			continue;
-		gotname:
-			if (proto == 0 || strcmp(serv->s_proto, proto) == 0)
-				rv = NS_SUCCESS;
-			break;
-		case nss_lt_id:
-			if (port != serv->s_port)
-				continue;
-
-			if (proto == 0 || strcmp(serv->s_proto, proto) == 0)
-				rv = NS_SUCCESS;
-			break;
-		case nss_lt_all:
-			rv = NS_SUCCESS;
-			break;
-		}
-
-	} while (!(rv & NS_TERMINATE));
-
-	if (!stayopen && st->fp != NULL) {
-		fclose(st->fp);
-		st->fp = NULL;
-	}
-
-	if ((rv == NS_SUCCESS) && (retval != NULL))
-		*(struct servent **)retval=serv;
-
-	return (rv);
-}
-
-static int
-files_setservent(void *retval, void *mdata, va_list ap)
-{
-	struct files_state *st;
-	int rv;
-	int f;
-
-	rv = files_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-
-	switch ((enum constants)mdata) {
-	case SETSERVENT:
-		f = va_arg(ap,int);
-		if (st->fp == NULL)
-			st->fp = fopen(_PATH_SERVICES, "re");
-		else
-			rewind(st->fp);
-		st->stayopen |= f;
-		break;
-	case ENDSERVENT:
-		if (st->fp != NULL) {
-			fclose(st->fp);
-			st->fp = NULL;
-		}
-		st->stayopen = 0;
-		break;
-	default:
-		break;
-	};
-
-	st->compat_mode_active = 0;
-	return (NS_UNAVAIL);
-}
-
-/* db backend implementation */
-static	void
-db_endstate(void *p)
-{
-	DB *db;
-
-	if (p == NULL)
-		return;
-
-	db = ((struct db_state *)p)->db;
-	if (db != NULL)
-		db->close(db);
-
-	free(p);
-}
-
-static int
-db_servent(void *retval, void *mdata, va_list ap)
-{
-	char buf[BUFSIZ];
-	DBT key, data, *result;
-	DB *db;
-
-	struct db_state *st;
-	int rv;
-	int stayopen;
-
-	enum nss_lookup_type how;
-	char *name;
-	char *proto;
-	int port;
-
-	struct servent *serv;
-	char *buffer;
-	size_t bufsize;
-	int *errnop;
-
-	name = NULL;
-	proto = NULL;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		port = va_arg(ap, int);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		return NS_NOTFOUND;
-	};
-
-	serv = va_arg(ap, struct servent *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap,int *);
-
-	*errnop = db_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-
-	if (how == nss_lt_all && st->keynum < 0)
-		return (NS_NOTFOUND);
-
-	if (st->db == NULL) {
-		st->db = dbopen(_PATH_SERVICES_DB, O_RDONLY, 0, DB_HASH, NULL);
-		if (st->db == NULL) {
-			*errnop = errno;
-			return (NS_UNAVAIL);
-		}
-	}
-
-	stayopen = (how == nss_lt_all) ? 1 : st->stayopen;
-	db = st->db;
-
-	do {
-		switch (how) {
-		case nss_lt_name:
-			key.data = buf;
-			if (proto == NULL)
-				key.size = snprintf(buf, sizeof(buf),
-				    "\376%s", name);
-			else
-				key.size = snprintf(buf, sizeof(buf),
-				    "\376%s/%s", name, proto);
-			key.size++;
-			if (db->get(db, &key, &data, 0) != 0 ||
-			    db->get(db, &data, &key, 0) != 0) {
-				rv = NS_NOTFOUND;
-				goto db_fin;
-			}
-			result = &key;
-			break;
-		case nss_lt_id:
-			key.data = buf;
-			port = htons(port);
-			if (proto == NULL)
-				key.size = snprintf(buf, sizeof(buf),
-				    "\377%d", port);
-			else
-				key.size = snprintf(buf, sizeof(buf),
-				    "\377%d/%s", port, proto);
-			key.size++;
-			if (db->get(db, &key, &data, 0) != 0 ||
-			    db->get(db, &data, &key, 0) != 0) {
-				rv = NS_NOTFOUND;
-				goto db_fin;
-			}
-			result = &key;
-			break;
-		case nss_lt_all:
-			key.data = buf;
-			key.size = snprintf(buf, sizeof(buf), "%d",
-			    st->keynum++);
-			key.size++;
-			if (db->get(db, &key, &data, 0) != 0) {
-				st->keynum = -1;
-				rv = NS_NOTFOUND;
-				goto db_fin;
-			}
-			result = &data;
-			break;
-		}
-
-		rv = parse_result(serv, buffer, bufsize, result->data,
-		    result->size - 1, errnop);
-
-	} while (!(rv & NS_TERMINATE) && how == nss_lt_all);
-
-db_fin:
-	if (!stayopen && st->db != NULL) {
-		db->close(db);
-		st->db = NULL;
-	}
-
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct servent **)retval = serv;
-
-	return (rv);
-}
-
-static int
-db_setservent(void *retval, void *mdata, va_list ap)
-{
-	DB *db;
-	struct db_state *st;
-	int rv;
-	int f;
-
-	rv = db_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-
-	switch ((enum constants)mdata) {
-	case SETSERVENT:
-		f = va_arg(ap, int);
-		st->stayopen |= f;
-		st->keynum = 0;
-		break;
-	case ENDSERVENT:
-		db = st->db;
-		if (db != NULL) {
-			db->close(db);
-			st->db = NULL;
-		}
-		st->stayopen = 0;
-		break;
-	default:
-		break;
-	};
-
-	return (NS_UNAVAIL);
-}
-
-/* nis backend implementation */
-#ifdef YP
-static 	void
-nis_endstate(void *p)
-{
-	if (p == NULL)
-		return;
-
-	free(((struct nis_state *)p)->yp_key);
-	free(p);
-}
-
-static int
-nis_servent(void *retval, void *mdata, va_list ap)
-{
-	char *resultbuf, *lastkey;
-	int resultbuflen;
-	char buf[YPMAXRECORD + 2];
-
-	struct nis_state *st;
-	int rv;
-
-	enum nss_lookup_type how;
-	char *name;
-	char *proto;
-	int port;
-
-	struct servent *serv;
-	char *buffer;
-	size_t bufsize;
-	int *errnop;
-
-	name = NULL;
-	proto = NULL;
-	how = (enum nss_lookup_type)mdata;
-	switch (how) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		port = va_arg(ap, int);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		return NS_NOTFOUND;
-	};
-
-	serv = va_arg(ap, struct servent *);
-	buffer  = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-
-	*errnop = nis_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-
-	if (st->yp_domain[0] == '\0') {
-		if (getdomainname(st->yp_domain, sizeof st->yp_domain)) {
-			*errnop = errno;
-			return (NS_UNAVAIL);
-		}
-	}
-
-	do {
-		switch (how) {
-		case nss_lt_name:
-			snprintf(buf, sizeof(buf), "%s/%s", name, proto);
-			if (yp_match(st->yp_domain, "services.byname", buf,
-			    strlen(buf), &resultbuf, &resultbuflen)) {
-				rv = NS_NOTFOUND;
-				goto fin;
-			}
-			break;
-		case nss_lt_id:
-			snprintf(buf, sizeof(buf), "%d/%s", ntohs(port),
-			    proto);
-
-			/*
-			 * We have to be a little flexible
-			 * here. Ideally you're supposed to have both
-			 * a services.byname and a services.byport
-			 * map, but some systems have only
-			 * services.byname. FreeBSD cheats a little by
-			 * putting the services.byport information in
-			 * the same map as services.byname so that
-			 * either case will work. We allow for both
-			 * possibilities here: if there is no
-			 * services.byport map, we try services.byname
-			 * instead.
-			 */
-			rv = yp_match(st->yp_domain, "services.byport", buf,
-			    strlen(buf), &resultbuf, &resultbuflen);
-			if (rv) {
-				if (rv == YPERR_MAP) {
-					if (yp_match(st->yp_domain,
-					    "services.byname", buf,
-					    strlen(buf), &resultbuf,
-					    &resultbuflen)) {
-						rv = NS_NOTFOUND;
-						goto fin;
-					}
-				} else {
-					rv = NS_NOTFOUND;
-					goto fin;
-				}
-			}
-
-			break;
-		case nss_lt_all:
-			if (!st->yp_stepping) {
-				free(st->yp_key);
-				rv = yp_first(st->yp_domain, "services.byname",
-				    &st->yp_key, &st->yp_keylen, &resultbuf,
-				    &resultbuflen);
-				if (rv) {
-					rv = NS_NOTFOUND;
-					goto fin;
-				}
-				st->yp_stepping = 1;
-			} else {
-				lastkey = st->yp_key;
-				rv = yp_next(st->yp_domain, "services.byname",
-				    st->yp_key, st->yp_keylen, &st->yp_key,
-				    &st->yp_keylen, &resultbuf, &resultbuflen);
-				free(lastkey);
-				if (rv) {
-					st->yp_stepping = 0;
-					rv = NS_NOTFOUND;
-					goto fin;
-				}
-			}
-			break;
-		};
-
-		rv = parse_result(serv, buffer, bufsize, resultbuf,
-		    resultbuflen, errnop);
-		free(resultbuf);
-
-	} while (!(rv & NS_TERMINATE) && how == nss_lt_all);
-
-fin:
-	if (rv == NS_SUCCESS && retval != NULL)
-		*(struct servent **)retval = serv;
-
-	return (rv);
-}
-
-static int
-nis_setservent(void *result, void *mdata, va_list ap)
-{
-	struct nis_state *st;
-	int rv;
-
-	rv = nis_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-
-	switch ((enum constants)mdata) {
-	case SETSERVENT:
-	case ENDSERVENT:
-		free(st->yp_key);
-		st->yp_key = NULL;
-		st->yp_stepping = 0;
-		break;
-	default:
-		break;
-	};
-
-	return (NS_UNAVAIL);
-}
-#endif
-
-/* compat backend implementation */
-static int
-compat_setservent(void *retval, void *mdata, va_list ap)
-{
-	static const ns_src compat_src[] = {
-#ifdef YP
-		{ NSSRC_NIS, NS_SUCCESS },
-#endif
-		{ NULL, 0 }
-	};
-	ns_dtab compat_dtab[] = {
-		{ NSSRC_DB, db_setservent, mdata },
-#ifdef YP
-		{ NSSRC_NIS, nis_setservent, mdata },
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int f;
-
-	(void)files_setservent(retval, mdata, ap);
-
-	switch ((enum constants)mdata) {
-	case SETSERVENT:
-		f = va_arg(ap,int);
-		(void)nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT,
-		    "setservent", compat_src, f);
-		break;
-	case ENDSERVENT:
-		(void)nsdispatch(retval, compat_dtab, NSDB_SERVICES_COMPAT,
-		    "endservent", compat_src);
-		break;
-	default:
-		break;
-	}
-
-	return (NS_UNAVAIL);
-}
-
-#ifdef NS_CACHING
-static int
-serv_id_func(char *buffer, size_t *buffer_size, va_list ap, void *cache_mdata)
-{
-	char *name;
-	char *proto;
-	int port;
-
-	size_t desired_size, size, size2;
-	enum nss_lookup_type lookup_type;
-	int res = NS_UNAVAIL;
-
-	lookup_type = (enum nss_lookup_type)cache_mdata;
-	switch (lookup_type) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		proto = va_arg(ap, char *);
-
-		size = strlen(name);
-		desired_size = sizeof(enum nss_lookup_type) + size + 1;
-		if (proto != NULL) {
-			size2 = strlen(proto);
-			desired_size += size2 + 1;
-		} else
-			size2 = 0;
-
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), name, size + 1);
-
-		if (proto != NULL)
-			memcpy(buffer + sizeof(enum nss_lookup_type) + size + 1,
-			    proto, size2 + 1);
-
-		res = NS_SUCCESS;
-		break;
-	case nss_lt_id:
-		port = va_arg(ap, int);
-		proto = va_arg(ap, char *);
-
-		desired_size = sizeof(enum nss_lookup_type) + sizeof(int);
-		if (proto != NULL) {
-			size = strlen(proto);
-			desired_size += size + 1;
-		} else
-			size = 0;
-
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), &port,
-		    sizeof(int));
-
-		if (proto != NULL)
-			memcpy(buffer + sizeof(enum nss_lookup_type) +
-			    sizeof(int), proto, size + 1);
-
-		res = NS_SUCCESS;
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-fin:
-	*buffer_size = desired_size;
-	return (res);
-}
-
-int
-serv_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	char *proto;
-	int port;
-	struct servent *serv;
-	char *orig_buf;
-	size_t orig_buf_size;
-
-	struct servent new_serv;
-	size_t desired_size;
-	char **alias;
-	char *p;
-	size_t size;
-	size_t aliases_size;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		port = va_arg(ap, int);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	serv = va_arg(ap, struct servent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-
-	desired_size = _ALIGNBYTES + sizeof(struct servent) + sizeof(char *);
-	if (serv->s_name != NULL)
-		desired_size += strlen(serv->s_name) + 1;
-	if (serv->s_proto != NULL)
-		desired_size += strlen(serv->s_proto) + 1;
-
-	aliases_size = 0;
-	if (serv->s_aliases != NULL) {
-		for (alias = serv->s_aliases; *alias; ++alias) {
-			desired_size += strlen(*alias) + 1;
-			++aliases_size;
-		}
-
-		desired_size += _ALIGNBYTES +
-		    sizeof(char *) * (aliases_size + 1);
-	}
-
-	if (*buffer_size < desired_size) {
-		/* this assignment is here for future use */
-		*buffer_size = desired_size;
-		return (NS_RETURN);
-	}
-
-	memcpy(&new_serv, serv, sizeof(struct servent));
-	memset(buffer, 0, desired_size);
-
-	*buffer_size = desired_size;
-	p = buffer + sizeof(struct servent) + sizeof(char *);
-	memcpy(buffer + sizeof(struct servent), &p, sizeof(char *));
-	p = (char *)_ALIGN(p);
-
-	if (new_serv.s_name != NULL) {
-		size = strlen(new_serv.s_name);
-		memcpy(p, new_serv.s_name, size);
-		new_serv.s_name = p;
-		p += size + 1;
-	}
-
-	if (new_serv.s_proto != NULL) {
-		size = strlen(new_serv.s_proto);
-		memcpy(p, new_serv.s_proto, size);
-		new_serv.s_proto = p;
-		p += size + 1;
-	}
-
-	if (new_serv.s_aliases != NULL) {
-		p = (char *)_ALIGN(p);
-		memcpy(p, new_serv.s_aliases, sizeof(char *) * aliases_size);
-		new_serv.s_aliases = (char **)p;
-		p += sizeof(char *) * (aliases_size + 1);
-
-		for (alias = new_serv.s_aliases; *alias; ++alias) {
-			size = strlen(*alias);
-			memcpy(p, *alias, size);
-			*alias = p;
-			p += size + 1;
-		}
-	}
-
-	memcpy(buffer, &new_serv, sizeof(struct servent));
-	return (NS_SUCCESS);
-}
-
-int
-serv_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	char *proto;
-	int port;
-	struct servent *serv;
-	char *orig_buf;
-	char *p;
-	char **alias;
-	size_t orig_buf_size;
-	int *ret_errno;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		port = va_arg(ap, int);
-		proto = va_arg(ap, char *);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	serv = va_arg(ap, struct servent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-	ret_errno = va_arg(ap, int *);
-
-	if (orig_buf_size <
-	    buffer_size - sizeof(struct servent) - sizeof(char *)) {
-		*ret_errno = ERANGE;
-		return (NS_RETURN);
-	}
-
-	memcpy(serv, buffer, sizeof(struct servent));
-	memcpy(&p, buffer + sizeof(struct servent), sizeof(char *));
-
-	orig_buf = (char *)_ALIGN(orig_buf);
-	memcpy(orig_buf, buffer + sizeof(struct servent) + sizeof(char *) +
-	    (_ALIGN(p) - (size_t)p),
-	    buffer_size - sizeof(struct servent) - sizeof(char *) -
-	    (_ALIGN(p) - (size_t)p));
-	p = (char *)_ALIGN(p);
-
-	NS_APPLY_OFFSET(serv->s_name, orig_buf, p, char *);
-	NS_APPLY_OFFSET(serv->s_proto, orig_buf, p, char *);
-	if (serv->s_aliases != NULL) {
-		NS_APPLY_OFFSET(serv->s_aliases, orig_buf, p, char **);
-
-		for (alias = serv->s_aliases; *alias; ++alias)
-			NS_APPLY_OFFSET(*alias, orig_buf, p, char *);
-	}
-
-	if (retval != NULL)
-		*((struct servent **)retval) = serv;
-	return (NS_SUCCESS);
-}
-
-NSS_MP_CACHE_HANDLING(services);
-#endif /* NS_CACHING */
-
-/* get**_r functions implementation */
-int
-getservbyname_r(const char *name, const char *proto, struct servent *serv,
-    char *buffer, size_t bufsize, struct servent **result)
-{
-	static const struct servent_mdata mdata = { nss_lt_name, 0 };
-	static const struct servent_mdata compat_mdata = { nss_lt_name, 1 };
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-	NS_COMMON_CACHE_INFO_INITIALIZER(
-		services, (void *)nss_lt_name,
-		serv_id_func, serv_marshal_func, serv_unmarshal_func);
-#endif /* NS_CACHING */
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_servent, (void *)&mdata },
-		{ NSSRC_DB, db_servent, (void *)nss_lt_name },
-#ifdef YP
-		{ NSSRC_NIS, nis_servent, (void *)nss_lt_name },
-#endif
-		{ NSSRC_COMPAT, files_servent, (void *)&compat_mdata },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int	rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = nsdispatch(result, dtab, NSDB_SERVICES, "getservbyname_r",
-	    defaultsrc, name, proto, serv, buffer, bufsize, &ret_errno);
-
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-int
-getservbyport_r(int port, const char *proto, struct servent *serv,
-    char *buffer, size_t bufsize, struct servent **result)
-{
-	static const struct servent_mdata mdata = { nss_lt_id, 0 };
-	static const struct servent_mdata compat_mdata = { nss_lt_id, 1 };
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-	NS_COMMON_CACHE_INFO_INITIALIZER(
-		services, (void *)nss_lt_id,
-		serv_id_func, serv_marshal_func, serv_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_servent, (void *)&mdata },
-		{ NSSRC_DB, db_servent, (void *)nss_lt_id },
-#ifdef YP
-		{ NSSRC_NIS, nis_servent, (void *)nss_lt_id },
-#endif
-		{ NSSRC_COMPAT, files_servent, (void *)&compat_mdata },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = nsdispatch(result, dtab, NSDB_SERVICES, "getservbyport_r",
-	    defaultsrc, port, proto, serv, buffer, bufsize, &ret_errno);
-
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-int
-getservent_r(struct servent *serv, char *buffer, size_t bufsize,
-    struct servent **result)
-{
-	static const struct servent_mdata mdata = { nss_lt_all, 0 };
-	static const struct servent_mdata compat_mdata = { nss_lt_all, 1 };
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		services, (void *)nss_lt_all,
-		serv_marshal_func, serv_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_servent, (void *)&mdata },
-		{ NSSRC_DB, db_servent, (void *)nss_lt_all },
-#ifdef YP
-		{ NSSRC_NIS, nis_servent, (void *)nss_lt_all },
-#endif
-		{ NSSRC_COMPAT, files_servent, (void *)&compat_mdata },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = nsdispatch(result, dtab, NSDB_SERVICES, "getservent_r",
-	    defaultsrc, serv, buffer, bufsize, &ret_errno);
-
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-void
-setservent(int stayopen)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		services, (void *)nss_lt_all,
-		NULL, NULL);
-#endif
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setservent, (void *)SETSERVENT },
-		{ NSSRC_DB, db_setservent, (void *)SETSERVENT },
-#ifdef YP
-		{ NSSRC_NIS, nis_setservent, (void *)SETSERVENT },
-#endif
-		{ NSSRC_COMPAT, compat_setservent, (void *)SETSERVENT },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-
-	(void)nsdispatch(NULL, dtab, NSDB_SERVICES, "setservent", defaultsrc,
-	    stayopen);
-}
-
-void
-endservent()
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		services, (void *)nss_lt_all,
-		NULL, NULL);
-#endif
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setservent, (void *)ENDSERVENT },
-		{ NSSRC_DB, db_setservent, (void *)ENDSERVENT },
-#ifdef YP
-		{ NSSRC_NIS, nis_setservent, (void *)ENDSERVENT },
-#endif
-		{ NSSRC_COMPAT, compat_setservent, (void *)ENDSERVENT },
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-
-	(void)nsdispatch(NULL, dtab, NSDB_SERVICES, "endservent", defaultsrc);
-}
-
-/* get** wrappers for get**_r functions implementation */
-static void
-servent_endstate(void *p)
-{
-	if (p == NULL)
-		return;
-
-	free(((struct servent_state *)p)->buffer);
-	free(p);
-}
-
-static int
-wrap_getservbyname_r(struct key key, struct servent *serv, char *buffer,
-    size_t bufsize, struct servent **res)
-{
-	return (getservbyname_r(key.name, key.proto, serv, buffer, bufsize,
-	    res));
-}
-
-static int
-wrap_getservbyport_r(struct key key, struct servent *serv, char *buffer,
-    size_t bufsize, struct servent **res)
-{
-	return (getservbyport_r(key.port, key.proto, serv, buffer, bufsize,
-	    res));
-}
-
-static	int
-wrap_getservent_r(struct key key, struct servent *serv, char *buffer,
-    size_t bufsize, struct servent **res)
-{
-	return (getservent_r(serv, buffer, bufsize, res));
-}
-
-static struct servent *
-getserv(int (*fn)(struct key, struct servent *, char *, size_t,
-    struct servent **), struct key key)
-{
-	int rv;
-	struct servent *res;
-	struct servent_state * st;
-
-	rv = servent_getstate(&st);
-	if (rv != 0) {
-		errno = rv;
-		return NULL;
-	}
-
-	if (st->buffer == NULL) {
-		st->buffer = malloc(SERVENT_STORAGE_INITIAL);
-		if (st->buffer == NULL)
-			return (NULL);
-		st->bufsize = SERVENT_STORAGE_INITIAL;
-	}
-	do {
-		rv = fn(key, &st->serv, st->buffer, st->bufsize, &res);
-		if (res == NULL && rv == ERANGE) {
-			free(st->buffer);
-			if ((st->bufsize << 1) > SERVENT_STORAGE_MAX) {
-				st->buffer = NULL;
-				errno = ERANGE;
-				return (NULL);
-			}
-			st->bufsize <<= 1;
-			st->buffer = malloc(st->bufsize);
-			if (st->buffer == NULL)
-				return (NULL);
-		}
-	} while (res == NULL && rv == ERANGE);
-	if (rv != 0)
-		errno = rv;
-
-	return (res);
-}
-
-struct servent *
-getservbyname(const char *name, const char *proto)
-{
-	struct key key;
-
-	key.name = name;
-	key.proto = proto;
-
-	return (getserv(wrap_getservbyname_r, key));
-}
-
-struct servent *
-getservbyport(int port, const char *proto)
-{
-	struct key key;
-
-	key.port = port;
-	key.proto = proto;
-
-	return (getserv(wrap_getservbyport_r, key));
-}
-
-struct servent *
-getservent()
-{
-	struct key key;
-
-	key.proto = NULL;
-	key.port = 0;
-
-	return (getserv(wrap_getservent_r, key));
-}
diff --git a/lib/libc_bsd/net/hesiod.3 b/lib/libc_bsd/net/hesiod.3
deleted file mode 100644
index c220e3d..0000000
--- a/lib/libc_bsd/net/hesiod.3
+++ /dev/null
@@ -1,176 +0,0 @@
-.\"	$NetBSD: hesiod.3,v 1.1 1999/01/25 03:43:04 lukem Exp $
-.\"
-.\" from: #Id: hesiod.3,v 1.9.2.1 1997/01/03 21:02:23 ghudson Exp #
-.\"
-.\" Copyright 1988, 1996 by the Massachusetts Institute of Technology.
-.\"
-.\" Permission to use, copy, modify, and distribute this
-.\" software and its documentation for any purpose and without
-.\" fee is hereby granted, provided that the above copyright
-.\" notice appear in all copies and that both that copyright
-.\" notice and this permission notice appear in supporting
-.\" documentation, and that the name of M.I.T. not be used in
-.\" advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.
-.\" M.I.T. makes no representations about the suitability of
-.\" this software for any purpose.  It is provided "as is"
-.\" without express or implied warranty.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/hesiod.3 140505 2005-01-20 09:17:07Z ru $
-.\"
-.Dd November 30, 1996
-.Dt HESIOD 3
-.Os
-.Sh NAME
-.Nm hesiod ,
-.Nm hesiod_init ,
-.Nm hesiod_resolve ,
-.Nm hesiod_free_list ,
-.Nm hesiod_to_bind ,
-.Nm hesiod_end
-.Nd Hesiod name server interface library
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In hesiod.h
-.Ft int
-.Fn hesiod_init "void **context"
-.Ft char **
-.Fn hesiod_resolve "void *context" "const char *name" "const char *type"
-.Ft void
-.Fn hesiod_free_list "void *context" "char **list"
-.Ft char *
-.Fn hesiod_to_bind "void *context" "const char *name" "const char *type"
-.Ft void
-.Fn hesiod_end "void *context"
-.Sh DESCRIPTION
-This family of functions allows you to perform lookups of Hesiod
-information, which is stored as text records in the Domain Name
-Service.
-To perform lookups, you must first initialize a
-.Fa context ,
-an opaque object which stores information used internally by the
-library between calls.
-The
-.Fn hesiod_init
-function
-initializes a context, storing a pointer to the context in the
-location pointed to by the
-.Fa context
-argument.
-The
-.Fn hesiod_end
-function
-frees the resources used by a context.
-.Pp
-The
-.Fn hesiod_resolve
-function
-is the primary interface to the library.
-If successful, it returns a
-list of one or more strings giving the records matching
-.Fa name
-and
-.Fa type .
-The last element of the list is followed by a
-.Dv NULL
-pointer.
-It is the
-caller's responsibility to call
-.Fn hesiod_free_list
-to free the resources used by the returned list.
-.Pp
-The
-.Fn hesiod_to_bind
-function
-converts
-.Fa name
-and
-.Fa type
-into the DNS name used by
-.Fn hesiod_resolve .
-It is the caller's responsibility to free the returned string using
-.Fn free .
-.Sh RETURN VALUES
-.Rv -std hesiod_init
-On failure,
-.Fn hesiod_resolve
-and
-.Fn hesiod_to_bind
-return
-.Dv NULL
-and set the global variable
-.Va errno
-to indicate the error.
-.Sh ENVIRONMENT
-.Bl -tag -width HESIOD_CONFIG
-.It Ev HES_DOMAIN
-If the environment variable
-.Ev HES_DOMAIN
-is set, it will override the domain in the Hesiod configuration file.
-.It Ev HESIOD_CONFIG
-If the environment variable
-.Ev HESIOD_CONFIG
-is set, it specifies the location of the Hesiod configuration file.
-.El
-.Sh ERRORS
-Hesiod calls may fail because of:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory was available to carry out the requested
-operation.
-.It Bq Er ENOEXEC
-The
-.Fn hesiod_init
-function
-failed because the Hesiod configuration file was invalid.
-.It Bq Er ECONNREFUSED
-The
-.Fn hesiod_resolve
-function
-failed because no name server could be contacted to answer the query.
-.It Bq Er EMSGSIZE
-The
-.Fn hesiod_resolve
-or
-.Fn hesiod_to_bind
-function
-failed because the query or response was too big to fit into the
-packet buffers.
-.It Bq Er ENOENT
-The
-.Fn hesiod_resolve
-function
-failed because the name server had no text records matching
-.Fa name
-and
-.Fa type ,
-or
-.Fn hesiod_to_bind
-failed because the
-.Fa name
-argument had a domain extension which could not be resolved with type
-.Dq rhs\-extension
-in the local Hesiod domain.
-.El
-.Sh SEE ALSO
-.Xr hesiod.conf 5 ,
-.Xr named 8
-.Rs
-.%T "Hesiod - Project Athena Technical Plan -- Name Service"
-.Re
-.Sh AUTHORS
-.An Steve Dyer ,
-IBM/Project Athena
-.An Greg Hudson ,
-MIT Team Athena
-.Pp
-Copyright 1987, 1988, 1995, 1996 by the Massachusetts Institute of Technology.
-.Sh BUGS
-The strings corresponding to the
-.Va errno
-values set by the Hesiod functions are not particularly indicative of
-what went wrong, especially for
-.Er ENOEXEC
-and
-.Er ENOENT .
diff --git a/lib/libc_bsd/net/hesiod.c b/lib/libc_bsd/net/hesiod.c
deleted file mode 100644
index 27bf228..0000000
--- a/lib/libc_bsd/net/hesiod.c
+++ /dev/null
@@ -1,584 +0,0 @@
-/*	$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $	*/
-
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/* Copyright 1996 by the Massachusetts Institute of Technology.
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in
- * advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- */
-
-/* This file is part of the hesiod library.  It implements the core
- * portion of the hesiod resolver.
- *
- * This file is loosely based on an interim version of hesiod.c from
- * the BIND IRS library, which was in turn based on an earlier version
- * of this file.  Extensive changes have been made on each step of the
- * path.
- *
- * This implementation is not truly thread-safe at the moment because
- * it uses res_send() and accesses _res.
- */
-
-#include <sys/cdefs.h>
-
-#if 0
-static char *orig_rcsid = "$NetBSD: hesiod.c,v 1.9 1999/02/11 06:16:38 simonb Exp $";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/hesiod.c 254700 2013-08-23 13:59:47Z jilles $");
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <hesiod.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-struct hesiod_p {
-	char	*lhs;			/* normally ".ns" */
-	char	*rhs;			/* AKA the default hesiod domain */
-	int	 classes[2];		/* The class search order. */
-};
-
-#define	MAX_HESRESP	1024
-
-static int	  read_config_file(struct hesiod_p *, const char *);
-static char	**get_txt_records(int, const char *);
-static int	  init_context(void);
-static void	  translate_errors(void);
-
-
-/*
- * hesiod_init --
- *	initialize a hesiod_p.
- */
-int 
-hesiod_init(context)
-	void	**context;
-{
-	struct hesiod_p	*ctx;
-	const char	*p, *configname;
-
-	ctx = malloc(sizeof(struct hesiod_p));
-	if (ctx) {
-		*context = ctx;
-		if (!issetugid())
-			configname = getenv("HESIOD_CONFIG");
-		else
-			configname = NULL;
-		if (!configname)
-			configname = _PATH_HESIOD_CONF;
-		if (read_config_file(ctx, configname) >= 0) {
-			/*
-			 * The default rhs can be overridden by an
-			 * environment variable.
-			 */
-			if (!issetugid())
-				p = getenv("HES_DOMAIN");
-			else
-				p = NULL;
-			if (p) {
-				if (ctx->rhs)
-					free(ctx->rhs);
-				ctx->rhs = malloc(strlen(p) + 2);
-				if (ctx->rhs) {
-					*ctx->rhs = '.';
-					strcpy(ctx->rhs + 1,
-					    (*p == '.') ? p + 1 : p);
-					return 0;
-				} else
-					errno = ENOMEM;
-			} else
-				return 0;
-		}
-	} else
-		errno = ENOMEM;
-
-	if (ctx->lhs)
-		free(ctx->lhs);
-	if (ctx->rhs)
-		free(ctx->rhs);
-	if (ctx)
-		free(ctx);
-	return -1;
-}
-
-/*
- * hesiod_end --
- *	Deallocates the hesiod_p.
- */
-void 
-hesiod_end(context)
-	void	*context;
-{
-	struct hesiod_p *ctx = (struct hesiod_p *) context;
-
-	free(ctx->rhs);
-	if (ctx->lhs)
-		free(ctx->lhs);
-	free(ctx);
-}
-
-/*
- * hesiod_to_bind --
- * 	takes a hesiod (name, type) and returns a DNS
- *	name which is to be resolved.
- */
-char *
-hesiod_to_bind(void *context, const char *name, const char *type)
-{
-	struct hesiod_p *ctx = (struct hesiod_p *) context;
-	char		 bindname[MAXDNAME], *p, *ret, **rhs_list = NULL;
-	const char	*rhs;
-	int		 len;
-
-	if (strlcpy(bindname, name, sizeof(bindname)) >= sizeof(bindname)) {
-		errno = EMSGSIZE;
-		return NULL;
-	}
-
-		/*
-		 * Find the right right hand side to use, possibly
-		 * truncating bindname.
-		 */
-	p = strchr(bindname, '@');
-	if (p) {
-		*p++ = 0;
-		if (strchr(p, '.'))
-			rhs = name + (p - bindname);
-		else {
-			rhs_list = hesiod_resolve(context, p, "rhs-extension");
-			if (rhs_list)
-				rhs = *rhs_list;
-			else {
-				errno = ENOENT;
-				return NULL;
-			}
-		}
-	} else
-		rhs = ctx->rhs;
-
-		/* See if we have enough room. */
-	len = strlen(bindname) + 1 + strlen(type);
-	if (ctx->lhs)
-		len += strlen(ctx->lhs) + ((ctx->lhs[0] != '.') ? 1 : 0);
-	len += strlen(rhs) + ((rhs[0] != '.') ? 1 : 0);
-	if (len > sizeof(bindname) - 1) {
-		if (rhs_list)
-			hesiod_free_list(context, rhs_list);
-		errno = EMSGSIZE;
-		return NULL;
-	}
-		/* Put together the rest of the domain. */
-	strcat(bindname, ".");
-	strcat(bindname, type);
-		/* Only append lhs if it isn't empty. */
-	if (ctx->lhs && ctx->lhs[0] != '\0' ) {
-		if (ctx->lhs[0] != '.')
-			strcat(bindname, ".");
-		strcat(bindname, ctx->lhs);
-	}
-	if (rhs[0] != '.')
-		strcat(bindname, ".");
-	strcat(bindname, rhs);
-
-		/* rhs_list is no longer needed, since we're done with rhs. */
-	if (rhs_list)
-		hesiod_free_list(context, rhs_list);
-
-		/* Make a copy of the result and return it to the caller. */
-	ret = strdup(bindname);
-	if (!ret)
-		errno = ENOMEM;
-	return ret;
-}
-
-/*
- * hesiod_resolve --
- *	Given a hesiod name and type, return an array of strings returned
- *	by the resolver.
- */
-char **
-hesiod_resolve(context, name, type)
-	void		*context;
-	const char	*name;
-	const char	*type;
-{
-	struct hesiod_p	*ctx = (struct hesiod_p *) context;
-	char		*bindname, **retvec;
-
-	bindname = hesiod_to_bind(context, name, type);
-	if (!bindname)
-		return NULL;
-
-	retvec = get_txt_records(ctx->classes[0], bindname);
-	if (retvec == NULL && errno == ENOENT && ctx->classes[1])
-		retvec = get_txt_records(ctx->classes[1], bindname);
-
-	free(bindname);
-	return retvec;
-}
-
-/*ARGSUSED*/
-void 
-hesiod_free_list(context, list)
-	void	 *context;
-	char	**list;
-{
-	char  **p;
-
-	if (list == NULL)
-		return;
-	for (p = list; *p; p++)
-		free(*p);
-	free(list);
-}
-
-
-/* read_config_file --
- *	Parse the /etc/hesiod.conf file.  Returns 0 on success,
- *	-1 on failure.  On failure, it might leave values in ctx->lhs
- *	or ctx->rhs which need to be freed by the caller.
- */
-static int 
-read_config_file(ctx, filename)
-	struct hesiod_p	*ctx;
-	const char	*filename;
-{
-	char	*key, *data, *p, **which;
-	char	 buf[MAXDNAME + 7];
-	int	 n;
-	FILE	*fp;
-
-		/* Set default query classes. */
-	ctx->classes[0] = C_IN;
-	ctx->classes[1] = C_HS;
-
-		/* Try to open the configuration file. */
-	fp = fopen(filename, "re");
-	if (!fp) {
-		/* Use compiled in default domain names. */
-		ctx->lhs = strdup(DEF_LHS);
-		ctx->rhs = strdup(DEF_RHS);
-		if (ctx->lhs && ctx->rhs)
-			return 0;
-		else {
-			errno = ENOMEM;
-			return -1;
-		}
-	}
-	ctx->lhs = NULL;
-	ctx->rhs = NULL;
-	while (fgets(buf, sizeof(buf), fp) != NULL) {
-		p = buf;
-		if (*p == '#' || *p == '\n' || *p == '\r')
-			continue;
-		while (*p == ' ' || *p == '\t')
-			p++;
-		key = p;
-		while (*p != ' ' && *p != '\t' && *p != '=')
-			p++;
-		*p++ = 0;
-
-		while (isspace(*p) || *p == '=')
-			p++;
-		data = p;
-		while (!isspace(*p))
-			p++;
-		*p = 0;
-
-		if (strcasecmp(key, "lhs") == 0 ||
-		    strcasecmp(key, "rhs") == 0) {
-			which = (strcasecmp(key, "lhs") == 0)
-			    ? &ctx->lhs : &ctx->rhs;
-			*which = strdup(data);
-			if (!*which) {
-				fclose(fp);
-				errno = ENOMEM;
-				return -1;
-			}
-		} else {
-			if (strcasecmp(key, "classes") == 0) {
-				n = 0;
-				while (*data && n < 2) {
-					p = data;
-					while (*p && *p != ',')
-						p++;
-					if (*p)
-						*p++ = 0;
-					if (strcasecmp(data, "IN") == 0)
-						ctx->classes[n++] = C_IN;
-					else
-						if (strcasecmp(data, "HS") == 0)
-							ctx->classes[n++] =
-							    C_HS;
-					data = p;
-				}
-				while (n < 2)
-					ctx->classes[n++] = 0;
-			}
-		}
-	}
-	fclose(fp);
-
-	if (!ctx->rhs || ctx->classes[0] == 0 ||
-	    ctx->classes[0] == ctx->classes[1]) {
-		errno = ENOEXEC;
-		return -1;
-	}
-	return 0;
-}
-
-/*
- * get_txt_records --
- *	Given a DNS class and a DNS name, do a lookup for TXT records, and
- *	return a list of them.
- */
-static char **
-get_txt_records(qclass, name)
-	int		 qclass;
-	const char	*name;
-{
-	HEADER		*hp;
-	unsigned char	 qbuf[PACKETSZ], abuf[MAX_HESRESP], *p, *eom, *eor;
-	char		*dst, **list;
-	int		 ancount, qdcount, i, j, n, skip, type, class, len;
-
-		/* Make sure the resolver is initialized. */
-	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
-		return NULL;
-
-		/* Construct the query. */
-	n = res_mkquery(QUERY, name, qclass, T_TXT, NULL, 0,
-	    NULL, qbuf, PACKETSZ);
-	if (n < 0)
-		return NULL;
-
-		/* Send the query. */
-	n = res_send(qbuf, n, abuf, MAX_HESRESP);
-	if (n < 0 || n > MAX_HESRESP) {
-		errno = ECONNREFUSED; /* XXX */
-		return NULL;
-	}
-		/* Parse the header of the result. */
-	hp = (HEADER *) (void *) abuf;
-	ancount = ntohs(hp->ancount);
-	qdcount = ntohs(hp->qdcount);
-	p = abuf + sizeof(HEADER);
-	eom = abuf + n;
-
-		/*
-		 * Skip questions, trying to get to the answer section
-		 * which follows.
-		 */
-	for (i = 0; i < qdcount; i++) {
-		skip = dn_skipname(p, eom);
-		if (skip < 0 || p + skip + QFIXEDSZ > eom) {
-			errno = EMSGSIZE;
-			return NULL;
-		}
-		p += skip + QFIXEDSZ;
-	}
-
-		/* Allocate space for the text record answers. */
-	list = malloc((ancount + 1) * sizeof(char *));
-	if (!list) {
-		errno = ENOMEM;
-		return NULL;
-	}
-		/* Parse the answers. */
-	j = 0;
-	for (i = 0; i < ancount; i++) {
-		/* Parse the header of this answer. */
-		skip = dn_skipname(p, eom);
-		if (skip < 0 || p + skip + 10 > eom)
-			break;
-		type = p[skip + 0] << 8 | p[skip + 1];
-		class = p[skip + 2] << 8 | p[skip + 3];
-		len = p[skip + 8] << 8 | p[skip + 9];
-		p += skip + 10;
-		if (p + len > eom) {
-			errno = EMSGSIZE;
-			break;
-		}
-		/* Skip entries of the wrong class and type. */
-		if (class != qclass || type != T_TXT) {
-			p += len;
-			continue;
-		}
-		/* Allocate space for this answer. */
-		list[j] = malloc((size_t)len);
-		if (!list[j]) {
-			errno = ENOMEM;
-			break;
-		}
-		dst = list[j++];
-
-		/* Copy answer data into the allocated area. */
-		eor = p + len;
-		while (p < eor) {
-			n = (unsigned char) *p++;
-			if (p + n > eor) {
-				errno = EMSGSIZE;
-				break;
-			}
-			memcpy(dst, p, (size_t)n);
-			p += n;
-			dst += n;
-		}
-		if (p < eor) {
-			errno = EMSGSIZE;
-			break;
-		}
-		*dst = 0;
-	}
-
-		/*
-		 * If we didn't terminate the loop normally, something
-		 * went wrong.
-		 */
-	if (i < ancount) {
-		for (i = 0; i < j; i++)
-			free(list[i]);
-		free(list);
-		return NULL;
-	}
-	if (j == 0) {
-		errno = ENOENT;
-		free(list);
-		return NULL;
-	}
-	list[j] = NULL;
-	return list;
-}
-
-		/*
-		 *	COMPATIBILITY FUNCTIONS
-		 */
-
-static int	  inited = 0;
-static void	 *context;
-static int	  errval = HES_ER_UNINIT;
-
-int
-hes_init()
-{
-	init_context();
-	return errval;
-}
-
-char *
-hes_to_bind(name, type)
-	const char	*name;
-	const char	*type;
-{
-	static	char	*bindname;
-	if (init_context() < 0)
-		return NULL;
-	if (bindname)
-		free(bindname);
-	bindname = hesiod_to_bind(context, name, type);
-	if (!bindname)
-		translate_errors();
-	return bindname;
-}
-
-char **
-hes_resolve(name, type)
-	const char	*name;
-	const char	*type;
-{
-	static char	**list;
-
-	if (init_context() < 0)
-		return NULL;
-
-	/*
-	 * In the old Hesiod interface, the caller was responsible for
-	 * freeing the returned strings but not the vector of strings itself.
-	 */
-	if (list)
-		free(list);
-
-	list = hesiod_resolve(context, name, type);
-	if (!list)
-		translate_errors();
-	return list;
-}
-
-int
-hes_error()
-{
-	return errval;
-}
-
-void
-hes_free(hp)
-	char **hp;
-{
-	hesiod_free_list(context, hp);
-}
-
-static int
-init_context()
-{
-	if (!inited) {
-		inited = 1;
-		if (hesiod_init(&context) < 0) {
-			errval = HES_ER_CONFIG;
-			return -1;
-		}
-		errval = HES_ER_OK;
-	}
-	return 0;
-}
-
-static void
-translate_errors()
-{
-	switch (errno) {
-	case ENOENT:
-		errval = HES_ER_NOTFOUND;
-		break;
-	case ECONNREFUSED:
-	case EMSGSIZE:
-		errval = HES_ER_NET;
-		break;
-	case ENOMEM:
-	default:
-		/* Not a good match, but the best we can do. */
-		errval = HES_ER_CONFIG;
-		break;
-	}
-}
diff --git a/lib/libc_bsd/net/if_indextoname.3 b/lib/libc_bsd/net/if_indextoname.3
deleted file mode 100644
index 38f86c1..0000000
--- a/lib/libc_bsd/net/if_indextoname.3
+++ /dev/null
@@ -1,152 +0,0 @@
-.\"	$KAME: if_indextoname.3,v 1.10 2000/11/24 08:13:51 itojun Exp $
-.\"	BSDI	Id: if_indextoname.3,v 2.2 2000/04/17 22:38:05 dab Exp
-.\"
-.\" Copyright (c) 1997, 2000
-.\"	Berkeley Software Design, Inc.  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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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: releng/10.2/lib/libc/net/if_indextoname.3 152712 2005-11-23 10:49:07Z ru $
-.\"
-.Dd November 23, 2005
-.Dt IF_NAMETOINDEX 3
-.Os
-.Sh NAME
-.Nm if_nametoindex ,
-.Nm if_indextoname ,
-.Nm if_nameindex ,
-.Nm if_freenameindex
-.Nd provide mappings between interface names and indexes
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/if.h
-.Ft "unsigned int"
-.Fn if_nametoindex "const char *ifname"
-.Ft "char *"
-.Fn if_indextoname "unsigned int ifindex" "char *ifname"
-.Ft "struct if_nameindex *"
-.Fn if_nameindex "void"
-.Ft void
-.Fn if_freenameindex "struct if_nameindex *ptr"
-.Sh DESCRIPTION
-The
-.Fn if_nametoindex
-function maps the interface name specified in
-.Fa ifname
-to its corresponding index.
-If the specified interface does not exist, it returns 0.
-.Pp
-The
-.Fn if_indextoname
-function maps the interface index specified in
-.Fa ifindex
-to it corresponding name, which is copied into the
-buffer pointed to by
-.Fa ifname ,
-which must be of at least
-.Dv IFNAMSIZ
-bytes.
-This pointer is also the return value of the function.
-If there is no interface corresponding to the specified
-index,
-.Dv NULL
-is returned.
-.Pp
-The
-.Fn if_nameindex
-function returns an array of
-.Vt if_nameindex
-structures, one structure per interface, as
-defined in the include file
-.In net/if.h .
-The
-.Vt if_nameindex
-structure contains at least the following entries:
-.Bd -literal
-    unsigned int   if_index;  /* 1, 2, ... */
-    char          *if_name;   /* null terminated name: "le0", ... */
-.Ed
-.Pp
-The end of the array of structures is indicated by a structure with an
-.Va if_index
-of 0 and an
-.Va if_name
-of
-.Dv NULL .
-A
-.Dv NULL
-pointer is returned upon an error.
-.Pp
-The
-.Fn if_freenameindex
-function frees the dynamic memory that was
-allocated by
-.Fn if_nameindex .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn if_nametoindex
-returns the index number of the interface.
-If the interface is not found, a value of 0 is returned and
-.Va errno
-is set to
-.Er ENXIO .
-A value of 0 is also returned if an error
-occurs while retrieving the list of interfaces via
-.Xr getifaddrs 3 .
-.Pp
-Upon successful completion,
-.Fn if_indextoname
-returns
-.Fa ifname .
-If the interface is not found, a
-.Dv NULL
-pointer is returned and
-.Va errno
-is set to
-.Er ENXIO .
-A
-.Dv NULL
-pointer is also returned if an error
-occurs while retrieving the list of interfaces via
-.Xr getifaddrs 3 .
-.Pp
-The
-.Fn if_nameindex
-returns a
-.Dv NULL
-pointer if an error
-occurs while retrieving the list of interfaces via
-.Xr getifaddrs 3 ,
-or if sufficient memory cannot be allocated.
-.Sh SEE ALSO
-.Xr getifaddrs 3 ,
-.Xr networking 4
-.Sh STANDARDS
-The
-.Fn if_nametoindex ,
-.Fn if_indextoname ,
-.Fn if_nameindex ,
-and
-.Fn if_freenameindex
-functions conform to
-.%T "RFC 2553" .
-.Sh HISTORY
-The implementation first appeared in BSDi
-.Bsx .
diff --git a/lib/libc_bsd/net/if_indextoname.c b/lib/libc_bsd/net/if_indextoname.c
deleted file mode 100644
index 477a69c..0000000
--- a/lib/libc_bsd/net/if_indextoname.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*	$KAME: if_indextoname.c,v 1.7 2000/11/08 03:09:30 itojun Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2000
- *	Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *	BSDI Id: if_indextoname.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/if_indextoname.c 235640 2012-05-19 02:39:43Z marcel $");
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-/*
- * From RFC 2533:
- *
- * The second function maps an interface index into its corresponding
- * name.
- *
- *    #include <net/if.h>
- *
- *    char  *if_indextoname(unsigned int ifindex, char *ifname);
- *
- * The ifname argument must point to a buffer of at least IF_NAMESIZE
- * bytes into which the interface name corresponding to the specified
- * index is returned.  (IF_NAMESIZE is also defined in <net/if.h> and
- * its value includes a terminating null byte at the end of the
- * interface name.) This pointer is also the return value of the
- * function.  If there is no interface corresponding to the specified
- * index, NULL is returned, and errno is set to ENXIO, if there was a
- * system error (such as running out of memory), if_indextoname returns
- * NULL and errno would be set to the proper value (e.g., ENOMEM).
- */
-
-char *
-if_indextoname(unsigned int ifindex, char *ifname)
-{
-	struct ifaddrs *ifaddrs, *ifa;
-	int error = 0;
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return(NULL);	/* getifaddrs properly set errno */
-
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK &&
-		    ifindex == LLINDEX((struct sockaddr_dl*)ifa->ifa_addr))
-			break;
-	}
-
-	if (ifa == NULL) {
-		error = ENXIO;
-		ifname = NULL;
-	}
-	else
-		strncpy(ifname, ifa->ifa_name, IFNAMSIZ);
-
-	freeifaddrs(ifaddrs);
-
-	errno = error;
-	return(ifname);
-}
diff --git a/lib/libc_bsd/net/if_nameindex.c b/lib/libc_bsd/net/if_nameindex.c
deleted file mode 100644
index b92c92b..0000000
--- a/lib/libc_bsd/net/if_nameindex.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*	$KAME: if_nameindex.c,v 1.8 2000/11/24 08:20:01 itojun Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2000
- *	Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *	BSDI Id: if_nameindex.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/if_nameindex.c 235640 2012-05-19 02:39:43Z marcel $");
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <net/if.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * From RFC 2553:
- *
- * 4.3 Return All Interface Names and Indexes
- *
- *    The if_nameindex structure holds the information about a single
- *    interface and is defined as a result of including the <net/if.h>
- *    header.
- *
- *       struct if_nameindex {
- *         unsigned int   if_index;
- *         char          *if_name;
- *       };
- *
- *    The final function returns an array of if_nameindex structures, one
- *    structure per interface.
- *
- *       struct if_nameindex  *if_nameindex(void);
- *
- *    The end of the array of structures is indicated by a structure with
- *    an if_index of 0 and an if_name of NULL.  The function returns a NULL
- *    pointer upon an error, and would set errno to the appropriate value.
- *
- *    The memory used for this array of structures along with the interface
- *    names pointed to by the if_name members is obtained dynamically.
- *    This memory is freed by the next function.
- *
- * 4.4.  Free Memory
- *
- *    The following function frees the dynamic memory that was allocated by
- *    if_nameindex().
- *
- *        #include <net/if.h>
- *
- *        void  if_freenameindex(struct if_nameindex *ptr);
- *
- *    The argument to this function must be a pointer that was returned by
- *    if_nameindex().
- */
-
-struct if_nameindex *
-if_nameindex(void)
-{
-	struct ifaddrs *ifaddrs, *ifa;
-	unsigned int ni;
-	int nbytes;
-	struct if_nameindex *ifni, *ifni2;
-	char *cp;
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return(NULL);
-
-	/*
-	 * First, find out how many interfaces there are, and how
-	 * much space we need for the string names.
-	 */
-	ni = 0;
-	nbytes = 0;
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK) {
-			nbytes += strlen(ifa->ifa_name) + 1;
-			ni++;
-		}
-	}
-
-	/*
-	 * Next, allocate a chunk of memory, use the first part
-	 * for the array of structures, and the last part for
-	 * the strings.
-	 */
-	cp = malloc((ni + 1) * sizeof(struct if_nameindex) + nbytes);
-	ifni = (struct if_nameindex *)cp;
-	if (ifni == NULL)
-		goto out;
-	cp += (ni + 1) * sizeof(struct if_nameindex);
-
-	/*
-	 * Now just loop through the list of interfaces again,
-	 * filling in the if_nameindex array and making copies
-	 * of all the strings.
-	 */
-	ifni2 = ifni;
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK) {
-			ifni2->if_index =
-			    LLINDEX((struct sockaddr_dl*)ifa->ifa_addr);
-			ifni2->if_name = cp;
-			strcpy(cp, ifa->ifa_name);
-			ifni2++;
-			cp += strlen(cp) + 1;
-		}
-	}
-	/*
-	 * Finally, don't forget to terminate the array.
-	 */
-	ifni2->if_index = 0;
-	ifni2->if_name = NULL;
-out:
-	freeifaddrs(ifaddrs);
-	return(ifni);
-}
-
-void
-if_freenameindex(struct if_nameindex *ptr)
-{
-	free(ptr);
-}
diff --git a/lib/libc_bsd/net/if_nametoindex.c b/lib/libc_bsd/net/if_nametoindex.c
deleted file mode 100644
index c34aba2..0000000
--- a/lib/libc_bsd/net/if_nametoindex.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*	$KAME: if_nametoindex.c,v 1.6 2000/11/24 08:18:54 itojun Exp $	*/
-
-/*-
- * Copyright (c) 1997, 2000
- *	Berkeley Software Design, Inc.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY Berkeley Software Design, Inc. ``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 Berkeley Software Design, Inc. 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.
- *
- *	BSDI Id: if_nametoindex.c,v 2.3 2000/04/17 22:38:05 dab Exp
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/if_nametoindex.c 255328 2013-09-06 21:02:06Z jilles $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-/*
- * From RFC 2553:
- *
- * 4.1 Name-to-Index
- *
- *
- *    The first function maps an interface name into its corresponding
- *    index.
- *
- *       #include <net/if.h>
- *
- *       unsigned int  if_nametoindex(const char *ifname);
- *
- *    If the specified interface name does not exist, the return value is
- *    0, and errno is set to ENXIO.  If there was a system error (such as
- *    running out of memory), the return value is 0 and errno is set to the
- *    proper value (e.g., ENOMEM).
- */
-
-unsigned int
-if_nametoindex(const char *ifname)
-{
-	int s;
-	struct ifreq ifr;
-	struct ifaddrs *ifaddrs, *ifa;
-	unsigned int ni;
-
-	s = _socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0);
-	if (s != -1) {
-#ifdef PURIFY
-		memset(&ifr, 0, sizeof(ifr));
-#endif
-		strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name));
-		if (_ioctl(s, SIOCGIFINDEX, &ifr) != -1) {
-			_close(s);
-			return (ifr.ifr_index);
-		}
-		_close(s);
-	}
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return(0);
-
-	ni = 0;
-
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		if (ifa->ifa_addr &&
-		    ifa->ifa_addr->sa_family == AF_LINK &&
-		    strcmp(ifa->ifa_name, ifname) == 0) {
-			ni = LLINDEX((struct sockaddr_dl*)ifa->ifa_addr);
-			break;
-		}
-	}
-
-	freeifaddrs(ifaddrs);
-	if (!ni)
-		errno = ENXIO;
-	return(ni);
-}
diff --git a/lib/libc_bsd/net/inet.3 b/lib/libc_bsd/net/inet.3
deleted file mode 100644
index 7758b95..0000000
--- a/lib/libc_bsd/net/inet.3
+++ /dev/null
@@ -1,305 +0,0 @@
-.\" Copyright (c) 1983, 1990, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/net/inet.3 170715 2007-06-14 07:13:28Z delphij $
-.\"
-.Dd June 14, 2007
-.Dt INET 3
-.Os
-.Sh NAME
-.Nm inet_aton ,
-.Nm inet_addr ,
-.Nm inet_network ,
-.Nm inet_ntoa ,
-.Nm inet_ntoa_r ,
-.Nm inet_ntop ,
-.Nm inet_pton ,
-.Nm inet_makeaddr ,
-.Nm inet_lnaof ,
-.Nm inet_netof
-.Nd Internet address manipulation routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/in.h
-.In arpa/inet.h
-.Ft int
-.Fn inet_aton "const char *cp" "struct in_addr *pin"
-.Ft in_addr_t
-.Fn inet_addr "const char *cp"
-.Ft in_addr_t
-.Fn inet_network "const char *cp"
-.Ft char *
-.Fn inet_ntoa "struct in_addr in"
-.Ft char *
-.Fo inet_ntoa_r
-.Fa "struct in_addr in"
-.Fa "char *buf"
-.Fa "socklen_t size"
-.Fc
-.Ft const char *
-.Fo inet_ntop
-.Fa "int af"
-.Fa "const void * restrict src"
-.Fa "char * restrict dst"
-.Fa "socklen_t size"
-.Fc
-.Ft int
-.Fn inet_pton "int af" "const char * restrict src" "void * restrict dst"
-.Ft struct in_addr
-.Fn inet_makeaddr "in_addr_t net" "in_addr_t lna"
-.Ft in_addr_t
-.Fn inet_lnaof "struct in_addr in"
-.Ft in_addr_t
-.Fn inet_netof "struct in_addr in"
-.Sh DESCRIPTION
-The routines
-.Fn inet_aton ,
-.Fn inet_addr
-and
-.Fn inet_network
-interpret character strings representing
-numbers expressed in the Internet standard
-.Ql .\&
-notation.
-.Pp
-The
-.Fn inet_pton
-function converts a presentation format address (that is, printable form
-as held in a character string) to network format (usually a
-.Ft struct in_addr
-or some other internal binary representation, in network byte order).
-It returns 1 if the address was valid for the specified address family, or
-0 if the address was not parseable in the specified address family, or -1
-if some system error occurred (in which case
-.Va errno
-will have been set).
-This function is presently valid for
-.Dv AF_INET
-and
-.Dv AF_INET6 .
-.Pp
-The
-.Fn inet_aton
-routine interprets the specified character string as an Internet address,
-placing the address into the structure provided.
-It returns 1 if the string was successfully interpreted,
-or 0 if the string is invalid.
-The
-.Fn inet_addr
-and
-.Fn inet_network
-functions return numbers suitable for use
-as Internet addresses and Internet network
-numbers, respectively.
-.Pp
-The function
-.Fn inet_ntop
-converts an address
-.Fa *src
-from network format
-(usually a
-.Ft struct in_addr
-or some other binary form, in network byte order) to presentation format
-(suitable for external display purposes).
-The
-.Fa size
-argument specifies the size, in bytes, of the buffer
-.Fa *dst .
-.Dv INET_ADDRSTRLEN
-and
-.Dv INET6_ADDRSTRLEN
-define the maximum size required to convert an address of the respective
-type.
-It returns NULL if a system error occurs (in which case,
-.Va errno
-will have been set), or it returns a pointer to the destination string.
-This function is presently valid for
-.Dv AF_INET
-and
-.Dv AF_INET6 .
-.Pp
-The routine
-.Fn inet_ntoa
-takes an Internet address and returns an
-.Tn ASCII
-string representing the address in
-.Ql .\&
-notation.
-The routine
-.Fn inet_ntoa_r
-is the reentrant version of
-.Fn inet_ntoa .
-The routine
-.Fn inet_makeaddr
-takes an Internet network number and a local
-network address and constructs an Internet address
-from it.
-The routines
-.Fn inet_netof
-and
-.Fn inet_lnaof
-break apart Internet host addresses, returning
-the network number and local network address part,
-respectively.
-.Pp
-All Internet addresses are returned in network
-order (bytes ordered from left to right).
-All network numbers and local address parts are
-returned as machine byte order integer values.
-.Sh INTERNET ADDRESSES
-Values specified using the
-.Ql .\&
-notation take one
-of the following forms:
-.Bd -literal -offset indent
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet address.
-Note
-that when an Internet address is viewed as a 32-bit
-integer quantity on the
-.Tn VAX
-the bytes referred to
-above appear as
-.Dq Li d.c.b.a .
-That is,
-.Tn VAX
-bytes are
-ordered from right to left.
-.Pp
-When a three part address is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the right-most two bytes of the network address.
-This makes the three part address format convenient
-for specifying Class B network addresses as
-.Dq Li 128.net.host .
-.Pp
-When a two part address is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the right most three bytes of the network address.
-This makes the two part address format convenient
-for specifying Class A network addresses as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the network address without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Ql .\&
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.Sh DIAGNOSTICS
-The constant
-.Dv INADDR_NONE
-is returned by
-.Fn inet_addr
-and
-.Fn inet_network
-for malformed requests.
-.Sh ERRORS
-The
-.Fn inet_ntop
-call fails if:
-.Bl -tag -width Er
-.It Bq Er ENOSPC
-.Fa size
-was not large enough to store the presentation form of the address.
-.It Bq Er EAFNOSUPPORT
-.Fa *src
-was not an
-.Dv AF_INET
-or
-.Dv AF_INET6
-family address.
-.El
-.Sh SEE ALSO
-.Xr byteorder 3 ,
-.Xr getaddrinfo 3 ,
-.Xr gethostbyname 3 ,
-.Xr getnameinfo 3 ,
-.Xr getnetent 3 ,
-.Xr inet_net 3 ,
-.Xr hosts 5 ,
-.Xr networks 5
-.Rs
-.%R RFC
-.%N 2373
-.%D July 1998
-.%T "IP Version 6 Addressing Architecture"
-.Re
-.Sh STANDARDS
-The
-.Fn inet_ntop
-and
-.Fn inet_pton
-functions conform to
-.St -xns5.2 .
-Note that
-.Fn inet_pton
-does not accept 1-, 2-, or 3-part dotted addresses; all four parts
-must be specified and are interpreted only as decimal values.
-This is a narrower input set than that accepted by
-.Fn inet_aton .
-.Sh HISTORY
-These
-functions appeared in
-.Bx 4.2 .
-.Sh BUGS
-The value
-.Dv INADDR_NONE
-(0xffffffff) is a valid broadcast address, but
-.Fn inet_addr
-cannot return that value without indicating failure.
-The newer
-.Fn inet_aton
-function does not share this problem.
-The problem of host byte ordering versus network byte ordering is
-confusing.
-The string returned by
-.Fn inet_ntoa
-resides in a static memory area.
-.Pp
-The
-.Fn inet_addr
-function should return a
-.Fa struct in_addr .
diff --git a/lib/libc_bsd/net/inet6_opt_init.3 b/lib/libc_bsd/net/inet6_opt_init.3
deleted file mode 100644
index 0056ce3..0000000
--- a/lib/libc_bsd/net/inet6_opt_init.3
+++ /dev/null
@@ -1,337 +0,0 @@
-.\"	$KAME: inet6_opt_init.3,v 1.7 2004/12/27 05:08:23 itojun Exp $
-.\"
-.\" Copyright (C) 2004 WIDE Project.
-.\" 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. Neither the name of the project 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 PROJECT 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 PROJECT 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: releng/10.2/lib/libc/net/inet6_opt_init.3 152717 2005-11-23 16:07:54Z ru $
-.\"
-.Dd December 23, 2004
-.Dt INET6_OPT_INIT 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_opt_init ,
-.Nm inet6_opt_append ,
-.Nm inet6_opt_finish ,
-.Nm inet6_opt_set_val ,
-.Nm inet6_opt_next ,
-.Nm inet6_opt_find ,
-.Nm inet6_opt_get_val
-.Nd IPv6 Hop-by-Hop and Destination Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft "int"
-.Fn inet6_opt_init "void *extbuf" "socklen_t extlen"
-.Ft "int"
-.Fn inet6_opt_append "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t len" "u_int8_t align" "void **databufp"
-.Ft "int"
-.Fn inet6_opt_finish "void *extbuf" "socklen_t extlen" "int offset"
-.Ft "int"
-.Fn inet6_opt_set_val "void *databuf" "int offset" "void *val" "socklen_t vallen"
-.Ft "int"
-.Fn inet6_opt_next "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t *typep" "socklen_t *lenp" "void **databufp"
-.Ft "int"
-.Fn inet6_opt_find "void *extbuf" "socklen_t extlen" "int offset" "u_int8_t type" "socklen_t *lenp" "void **databufp"
-.Ft "int"
-.Fn inet6_opt_get_val "void *databuf" "int offset" "void *val" "socklen_t vallen"
-.\"
-.Sh DESCRIPTION
-Building and parsing the Hop-by-Hop and Destination options is
-complicated.
-The advanced sockets API defines a set of functions to
-help applications create and manipulate Hop-by-Hop and Destination
-options.
-This man page describes the functions specified in
-IETF Draft RFC3542.
-These functions use the
-formatting rules specified in Appendix B in RFC2460, i.e., that the
-largest field is placed last in the option.
-The function prototypes
-for these functions are all contained in the
-.In netinet/in.h
-header file.
-.\"
-.Ss inet6_opt_init
-The
-.Fn inet6_opt_init
-function
-returns the number of bytes needed for an empty
-extension header, one without any options.
-If the
-.Fa extbuf
-argument points to a valid section of memory
-then the
-.Fn inet6_opt_init
-function also initializes the extension header's length field.
-When attempting to initialize an extension buffer passed in the
-.Fa extbuf
-argument,
-.Fa extlen
-must be a positive multiple of 8 or else the function fails and
-returns \-1 to the caller.
-.\"
-.Ss inet6_opt_append
-The
-.Fn inet6_opt_append
-function can perform two different jobs.
-When a valid
-.Fa extbuf
-argument is supplied it appends an option to the extension buffer and
-returns the updated total length as well as a pointer to the newly
-created option in
-.Fa databufp .
-If the value
-of
-.Fa extbuf
-is
-.Dv NULL
-then the
-.Fn inet6_opt_append
-function only reports what the total length would
-be if the option were actually appended.
-The
-.Fa len
-and
-.Fa align
-arguments specify the length of the option and the required data
-alignment which must be used when appending the option.
-The
-.Fa offset
-argument should be the length returned by the
-.Fn inet6_opt_init
-function or a previous call to
-.Fn inet6_opt_append .
-.Pp
-The
-.Fa type
-argument is the 8-bit option type.
-.Pp
-After
-.Fn inet6_opt_append
-has been called, the application can use the buffer pointed to by
-.Fa databufp
-directly, or use
-.Fn inet6_opt_set_val
-to specify the data to be contained in the option.
-.Pp
-Option types of
-.Li 0
-and
-.Li 1
-are reserved for the
-.Li Pad1
-and
-.Li PadN
-options.
-All other values from 2 through 255 may be used by applications.
-.Pp
-The length of the option data is contained in an 8-bit value and so
-may contain any value from 0 through 255.
-.Pp
-The
-.Fa align
-parameter must have a value of 1, 2, 4, or 8 and cannot exceed the
-value of
-.Fa len .
-The alignment values represent no alignment, 16 bit, 32 bit and 64 bit
-alignments, respectively.
-.\"
-.Ss inet6_opt_finish
-The
-.Fn inet6_opt_finish
-function
-calculates the final padding necessary to make the extension header a
-multiple of 8 bytes, as required by the IPv6 extension header
-specification, and returns the extension header's updated total
-length.
-The
-.Fa offset
-argument should be the length returned by
-.Fn inet6_opt_init
-or
-.Fn inet6_opt_append .
-When
-.Fa extbuf
-is not
-.Dv NULL
-the function also sets up the appropriate padding bytes by inserting a
-Pad1 or PadN option of the proper length.
-.Pp
-If the extension header is too small to contain the proper padding
-then an error of \-1 is returned to the caller.
-.\"
-.Ss inet6_opt_set_val
-The
-.Fn inet6_opt_set_val
-function inserts data items of various sizes into the data portion of
-the option.
-The
-.Fa databuf
-argument is a pointer to memory that was returned by the
-.Fn inet6_opt_append
-call and the
-.Fa offset
-argument specifies where the option should be placed in the
-data buffer.
-The
-.Fa val
-argument points to an area of memory containing the data to be
-inserted into the extension header, and the
-.Fa vallen
-argument indicates how much data to copy.
-.Pp
-The caller should ensure that each field is aligned on its natural
-boundaries as described in Appendix B of RFC2460.
-.Pp
-The function returns the offset for the next field which is calculated as
-.Fa offset
-+
-.Fa vallen
-and is used when composing options with multiple fields.
-.\"
-.Ss inet6_opt_next
-The
-.Fn inet6_opt_next
-function parses received extension headers.
-The
-.Fa extbuf
-and
-.Fa extlen
-arguments specify the location and length of the extension header
-being parsed.
-The
-.Fa offset
-argument should either be zero, for the first option, or the length value
-returned by a previous call to
-.Fn inet6_opt_next
-or
-.Fn inet6_opt_find .
-The return value specifies the position where to continue scanning the
-extension buffer.
-The option is returned in the arguments
-.Fa typep , lenp ,
-and
-.Fa databufp ,
-which
-point to the 8-bit option type, the 8-bit option length and the option
-data, respectively.
-This function does not return any PAD1 or PADN options.
-When an error occurs or there are no more options, the return
-value is \-1.
-.\"
-.Ss inet6_opt_find
-The
-.Fn inet6_opt_find
-function searches the extension buffer for a particular option type,
-passed in through the
-.Fa type
-argument.
-If the option is found then the
-.Fa lenp
-and
-.Fa databufp
-arguments are updated to point to the option's length and data,
-respectively.
-The
-.Fa extbuf
-and
-.Fa extlen
-arguments
-must point to a valid extension buffer and give its length.
-The
-.Fa offset
-argument can be used to search from a location anywhere in the
-extension header.
-.Ss inet6_opt_get_val
-The
-.Fn inet6_opt_get_val
-function extracts data items of various sizes in the data portion of
-the option.
-The
-.Fa databuf
-is a pointer returned by the
-.Fn inet6_opt_next
-or
-.Fn inet6_opt_find
-functions.
-The
-.Fa val
-argument points where the data will be extracted.
-The
-.Fa offset
-argument specifies from where in the data portion of the option the
-value should be extracted; the first byte of option data is specified
-by an offset of zero.
-.Pp
-It is expected that each field is aligned on its natural boundaries as
-described in Appendix B of RFC2460.
-.Pp
-The function returns the offset for the next field
-by calculating
-.Fa offset
-+
-.Fa vallen
-which can be used when extracting option content with multiple fields.
-Robust receivers must verify alignment before calling this function.
-.\"
-.Sh RETURN VALUES
-All the functions return
-\-1
-on an error.
-.\"
-.Sh EXAMPLES
-RFC3542 gives comprehensive examples in Section 23.
-.Pp
-KAME also provides examples in the
-.Pa advapitest
-directory of its kit.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%A E. Nordmark
-.%A T. Jinmei
-.%T "Advanced Sockets API for IPv6"
-.%N RFC3542
-.%D October 2002
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC2460
-.%D December 1998
-.Re
-.Sh STANDARDS
-The functions are documented in
-.Dq Advanced Sockets API for IPv6
-.Pq RFC3542 .
-.\"
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
diff --git a/lib/libc_bsd/net/inet6_option_space.3 b/lib/libc_bsd/net/inet6_option_space.3
deleted file mode 100644
index 8a0c32b..0000000
--- a/lib/libc_bsd/net/inet6_option_space.3
+++ /dev/null
@@ -1,54 +0,0 @@
-.\"	$KAME: inet6_option_space.3,v 1.11 2005/01/05 03:00:44 itojun Exp $
-.\"
-.\" Copyright (C) 2004 WIDE Project.
-.\" 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. Neither the name of the project 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 PROJECT 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 PROJECT 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: releng/10.2/lib/libc/net/inet6_option_space.3 140750 2005-01-24 18:14:18Z ru $
-.\"
-.Dd January 24, 2005
-.Dt INET6_OPTION_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_option_space ,
-.Nm inet6_option_init ,
-.Nm inet6_option_append ,
-.Nm inet6_option_alloc ,
-.Nm inet6_option_next ,
-.Nm inet6_option_find
-.Nd IPv6 Hop-by-Hop and Destination Option Manipulation
-.\"
-.Sh DESCRIPTION
-The functions that were documented in this manual page are now
-deprecated in favor of those described in
-.Xr inet6_opt_init 3 .
-Please refer to that manual page for information on how to manipulate
-IPv6 Hop-by-Hop and Destination options.
-.Sh SEE ALSO
-.Xr inet6_opt_init 3
-.\"
-.\"
diff --git a/lib/libc_bsd/net/inet6_rth_space.3 b/lib/libc_bsd/net/inet6_rth_space.3
deleted file mode 100644
index 1deae62..0000000
--- a/lib/libc_bsd/net/inet6_rth_space.3
+++ /dev/null
@@ -1,225 +0,0 @@
-.\"	$KAME: inet6_rth_space.3,v 1.7 2005/01/05 03:00:44 itojun Exp $
-.\"
-.\" Copyright (C) 2004 WIDE Project.
-.\" 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. Neither the name of the project 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 PROJECT 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 PROJECT 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: releng/10.2/lib/libc/net/inet6_rth_space.3 211397 2010-08-16 15:18:30Z joel $
-.\"
-.Dd December 24, 2004
-.Dt INET6_RTH_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_rth_space ,
-.Nm inet6_rth_init ,
-.Nm inet6_rth_add ,
-.Nm inet6_rth_reverse ,
-.Nm inet6_rth_segments ,
-.Nm inet6_rth_getaddr
-.Nd IPv6 Routing Header Options manipulation
-.\"
-.Sh SYNOPSIS
-.In netinet/in.h
-.Ft socklen_t
-.Fn inet6_rth_space "int" "int"
-.Ft "void *"
-.Fn inet6_rth_init "void *" "socklen_t" "int" "int"
-.Ft int
-.Fn inet6_rth_add "void *" "const struct in6_addr *"
-.Ft int
-.Fn inet6_rth_reverse "const void *" "void *"
-.Ft int
-.Fn inet6_rth_segments "const void *"
-.Ft "struct in6_addr *"
-.Fn inet6_rth_getaddr "const void *" "int"
-.\"
-.Sh DESCRIPTION
-The IPv6 Advanced API, RFC 3542, defines the functions that an
-application calls to build and examine IPv6 Routing headers.
-Routing headers are used to perform source routing in IPv6 networks.
-The RFC uses the word
-.Dq segments
-to describe addresses and that is the term used here as well.
-All of the functions are defined in the
-.In netinet/in.h
-header file.
-The functions described in this manual page all operate
-on routing header structures which are defined in
-.In netinet/ip6.h
-but which should not need to be modified outside the use of this API.
-The size and shape of the route header structures may change, so using
-the APIs is a more portable, long term, solution.
-.Pp
-The functions in the API are split into two groups, those that build a
-routing header and those that parse a received routing header.
-We will describe the builder functions followed by the parser functions.
-.Ss inet6_rth_space
-The
-.Fn inet6_rth_space
-function returns the number of bytes required to hold a Routing Header
-of the type, specified in the
-.Fa type
-argument and containing the number of addresses specified in the
-.Fa segments
-argument.
-When the type is
-.Dv IPV6_RTHDR_TYPE_0
-the number of segments must be from 0 through 127.
-Routing headers of type
-.Dv IPV6_RTHDR_TYPE_2
-contain only one segment, and are only used with Mobile IPv6.
-The return value from this function is the number of bytes required to
-store the routing header.
-If the value 0 is returned then either the
-route header type was not recognized or another error occurred.
-.Ss inet6_rth_init
-The
-.Fn inet6_rth_init
-function initializes the pre-allocated buffer pointed to by
-.Fa bp
-to contain a routing header of the specified type.
-The
-.Fa bp_len
-argument is used to verify that the buffer is large enough.
-The caller must allocate the buffer pointed to by bp.
-The necessary buffer size should be determined by calling
-.Fn inet6_rth_space
-described in the previous sections.
-.Pp
-The
-.Fn inet6_rth_init
-function returns a pointer to
-.Fa bp
-on success and
-.Dv NULL
-when there is an error.
-.Ss inet6_rth_add
-The
-.Fn inet6_rth_add
-function adds the IPv6 address pointed to by
-.Fa addr
-to the end of the routing header being constructed.
-.Pp
-A successful addition results in the function returning 0, otherwise
-\-1 is returned.
-.Ss inet6_rth_reverse
-The
-.Fn inet6_rth_reverse
-function takes a routing header, pointed to by the
-argument
-.Fa in ,
-and writes a new routing header into the argument pointed to by
-.Fa out .
-The routing header at that sends datagrams along the reverse of that
-route.
-Both arguments are allowed to point to the same buffer meaning
-that the reversal can occur in place.
-.Pp
-The return value of the function is 0 on success, or \-1 when
-there is an error.
-.\"
-.Pp
-The next set of functions operate on a routing header that the
-application wants to parse.
-In the usual case such a routing header
-is received from the network, although these functions can also be
-used with routing headers that the application itself created.
-.Ss inet6_rth_segments
-The
-.Fn inet6_rth_segments
-function returns the number of segments contained in the
-routing header pointed to by
-.Fa bp .
-The return value is the number of segments contained in the routing
-header, or \-1 if an error occurred.
-It is not an error for 0 to be
-returned as a routing header may contain 0 segments.
-.\"
-.Ss inet6_rth_getaddr
-The
-.Fn inet6_rth_getaddr
-function is used to retrieve a single address from a routing header.
-The
-.Fa index
-is the location in the routing header from which the application wants
-to retrieve an address.
-The
-.Fa index
-parameter must have a value between 0 and one less than the number of
-segments present in the routing header.
-The
-.Fn inet6_rth_segments
-function, described in the last section, should be used to determine
-the total number of segments in the routing header.
-The
-.Fn inet6_rth_getaddr
-function returns a pointer to an IPv6 address on success or
-.Dv NULL
-when an error has occurred.
-.\"
-.Sh EXAMPLES
-RFC 3542 gives extensive examples in Section 21, Appendix B.
-.Pp
-KAME also provides examples in the advapitest directory of its kit.
-.\"
-.Sh DIAGNOSTICS
-The
-.Fn inet6_rth_space
-and
-.Fn inet6_rth_getaddr
-functions return 0 on errors.
-.Pp
-The
-.Fn inet6_rthdr_init
-function returns
-.Dv NULL
-on error.
-The
-.Fn inet6_rth_add
-and
-.Fn inet6_rth_reverse
-functions return 0 on success, or \-1 upon an error.
-.\"
-.Sh SEE ALSO
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%A E. Nordmark
-.%A T. Jinmei
-.%T "Advanced Sockets API for IPv6"
-.%N RFC 3542
-.%D May 2003
-.Re
-.Rs
-.%A S. Deering
-.%A R. Hinden
-.%T "Internet Protocol, Version 6 (IPv6) Specification"
-.%N RFC2460
-.%D December 1998
-.Re
-.Sh HISTORY
-The implementation first appeared in KAME advanced networking kit.
diff --git a/lib/libc_bsd/net/inet6_rthdr_space.3 b/lib/libc_bsd/net/inet6_rthdr_space.3
deleted file mode 100644
index f794fd5..0000000
--- a/lib/libc_bsd/net/inet6_rthdr_space.3
+++ /dev/null
@@ -1,57 +0,0 @@
-.\"	$KAME: inet6_rthdr_space.3,v 1.11 2005/01/05 03:00:44 itojun Exp $
-.\"
-.\" Copyright (C) 2004 WIDE Project.
-.\" 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. Neither the name of the project 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 PROJECT 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 PROJECT 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: releng/10.2/lib/libc/net/inet6_rthdr_space.3 140750 2005-01-24 18:14:18Z ru $
-.\"
-.Dd January 24, 2005
-.Dt INET6_RTHDR_SPACE 3
-.Os
-.\"
-.Sh NAME
-.Nm inet6_rthdr_space ,
-.Nm inet6_rthdr_init ,
-.Nm inet6_rthdr_add ,
-.Nm inet6_rthdr_lasthop ,
-.Nm inet6_rthdr_reverse ,
-.Nm inet6_rthdr_segments ,
-.Nm inet6_rthdr_getaddr ,
-.Nm inet6_rthdr_getflags
-.Nd IPv6 Routing Header Options Manipulation
-.\"
-.Sh DESCRIPTION
-The RFC 2292 IPv6 Advanced API has been deprecated in favor of the
-newer, RFC 3542 APIs documented in
-.Xr inet6_rth_space 3 .
-On platforms that support it, currently only
-.Fx ,
-please use the newer API to manipulate routing header
-options.
-.\"
-.Sh SEE ALSO
-.Xr inet6_rth_space 3
diff --git a/lib/libc_bsd/net/inet_net.3 b/lib/libc_bsd/net/inet_net.3
deleted file mode 100644
index 7e15a6c..0000000
--- a/lib/libc_bsd/net/inet_net.3
+++ /dev/null
@@ -1,162 +0,0 @@
-.\"	$NetBSD: inet_net.3,v 1.4 1999/03/22 19:44:52 garbled Exp $
-.\"
-.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" 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.
-.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libc/net/inet_net.3 233462 2012-03-25 12:13:24Z joel $
-.\"
-.Dd February 26, 2006
-.Dt INET_NET 3
-.Os
-.Sh NAME
-.Nm inet_net_ntop ,
-.Nm inet_net_pton
-.Nd Internet network number manipulation routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/in.h
-.In arpa/inet.h
-.Ft char *
-.Fn inet_net_ntop "int af" "const void *src" "int bits" "char *dst" "size_t size"
-.Ft int
-.Fn inet_net_pton "int af" "const char *src" "void *dst" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn inet_net_ntop
-function converts an Internet network number from network format (usually a
-.Vt "struct in_addr"
-or some other binary form, in network byte order) to CIDR presentation format
-(suitable for external display purposes).
-The
-.Fa bits
-argument
-is the number of bits in
-.Fa src
-that are the network number.
-It returns
-.Dv NULL
-if a system error occurs (in which case,
-.Va errno
-will have been set), or it returns a pointer to the destination string.
-.Pp
-The
-.Fn inet_net_pton
-function converts a presentation format Internet network number (that is,
-printable form as held in a character string) to network format (usually a
-.Vt "struct in_addr"
-or some other internal binary representation, in network byte order).
-It returns the number of bits (either computed based on the class, or
-specified with /CIDR), or \-1 if a failure occurred
-(in which case
-.Va errno
-will have been set.
-It will be set to
-.Er ENOENT
-if the Internet network number was not valid).
-.Pp
-The currently supported values for
-.Fa af
-are
-.Dv AF_INET
-and
-.Dv AF_INET6 .
-The
-.Fa size
-argument
-is the size of the result buffer
-.Fa dst .
-.Sh NETWORK NUMBERS (IP VERSION 4)
-Internet network numbers may be specified in one of the following forms:
-.Bd -literal -offset indent
-a.b.c.d/bits
-a.b.c.d
-a.b.c
-a.b
-a
-.Ed
-.Pp
-When four parts are specified, each is interpreted
-as a byte of data and assigned, from left to right,
-to the four bytes of an Internet network number.
-Note
-that when an Internet network number is viewed as a 32-bit
-integer quantity on a system that uses little-endian
-byte order (such as the
-.Tn Intel 386 , 486 ,
-and
-.Tn Pentium
-processors) the bytes referred to above appear as
-.Dq Li d.c.b.a .
-That is, little-endian bytes are ordered from right to left.
-.Pp
-When a three part number is specified, the last
-part is interpreted as a 16-bit quantity and placed
-in the rightmost two bytes of the Internet network number.
-This makes the three part number format convenient
-for specifying Class B network numbers as
-.Dq Li 128.net.host .
-.Pp
-When a two part number is supplied, the last part
-is interpreted as a 24-bit quantity and placed in
-the rightmost three bytes of the Internet network number.
-This makes the two part number format convenient
-for specifying Class A network numbers as
-.Dq Li net.host .
-.Pp
-When only one part is given, the value is stored
-directly in the Internet network number without any byte
-rearrangement.
-.Pp
-All numbers supplied as
-.Dq parts
-in a
-.Ql \&.
-notation
-may be decimal, octal, or hexadecimal, as specified
-in the C language (i.e., a leading 0x or 0X implies
-hexadecimal; otherwise, a leading 0 implies octal;
-otherwise, the number is interpreted as decimal).
-.\"
-.\" .Sh NETWORK NUMBERS (IP VERSION 6)
-.\" XXX - document this!
-.\"
-.Sh SEE ALSO
-.Xr byteorder 3 ,
-.Xr inet 3 ,
-.Xr networks 5
-.Sh HISTORY
-The
-.Fn inet_net_ntop
-and
-.Fn inet_net_pton
-functions appeared in BIND 4.9.4.
diff --git a/lib/libc_bsd/net/ip6opt.c b/lib/libc_bsd/net/ip6opt.c
deleted file mode 100644
index f34a5d4..0000000
--- a/lib/libc_bsd/net/ip6opt.c
+++ /dev/null
@@ -1,605 +0,0 @@
-/*	$KAME: ip6opt.c,v 1.13 2003/06/06 10:08:20 suz Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/ip6opt.c 269454 2014-08-03 02:24:52Z marcel $");
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <string.h>
-#include <stdio.h>
-
-static int ip6optlen(u_int8_t *opt, u_int8_t *lim);
-static void inet6_insert_padopt(u_char *p, int len);
-
-#ifndef IPV6_2292HOPOPTS
-#define	IPV6_2292HOPOPTS	22
-#endif
-#ifndef IPV6_2292DSTOPTS
-#define	IPV6_2292DSTOPTS	23
-#endif
-
-#define	is_ipv6_hopopts(x)	\
-	((x) == IPV6_HOPOPTS || (x) == IPV6_2292HOPOPTS)
-#define	is_ipv6_dstopts(x)	\
-	((x) == IPV6_DSTOPTS || (x) == IPV6_2292DSTOPTS)
-
-/*
- * This function returns the number of bytes required to hold an option
- * when it is stored as ancillary data, including the cmsghdr structure
- * at the beginning, and any padding at the end (to make its size a
- * multiple of 8 bytes).  The argument is the size of the structure
- * defining the option, which must include any pad bytes at the
- * beginning (the value y in the alignment term "xn + y"), the type
- * byte, the length byte, and the option data.
- */
-int
-inet6_option_space(int nbytes)
-{
-	nbytes += 2;	/* we need space for nxt-hdr and length fields */
-	return(CMSG_SPACE((nbytes + 7) & ~7));
-}
-
-/*
- * This function is called once per ancillary data object that will
- * contain either Hop-by-Hop or Destination options.  It returns 0 on
- * success or -1 on an error.
- */
-int
-inet6_option_init(void *bp, struct cmsghdr **cmsgp, int type)
-{
-	struct cmsghdr *ch = (struct cmsghdr *)bp;
-
-	/* argument validation */
-	if (!is_ipv6_hopopts(type) && !is_ipv6_dstopts(type))
-		return(-1);
-
-	ch->cmsg_level = IPPROTO_IPV6;
-	ch->cmsg_type = type;
-	ch->cmsg_len = CMSG_LEN(0);
-
-	*cmsgp = ch;
-	return(0);
-}
-
-/*
- * This function appends a Hop-by-Hop option or a Destination option
- * into an ancillary data object that has been initialized by
- * inet6_option_init().  This function returns 0 if it succeeds or -1 on
- * an error.
- * multx is the value x in the alignment term "xn + y" described
- * earlier.  It must have a value of 1, 2, 4, or 8.
- * plusy is the value y in the alignment term "xn + y" described
- * earlier.  It must have a value between 0 and 7, inclusive.
- */
-int
-inet6_option_append(struct cmsghdr *cmsg, const u_int8_t *typep, int multx,
-    int plusy)
-{
-	int padlen, optlen, off;
-	u_char *bp = (u_char *)cmsg + cmsg->cmsg_len;
-	struct ip6_ext *eh = (struct ip6_ext *)CMSG_DATA(cmsg);
-
-	/* argument validation */
-	if (multx != 1 && multx != 2 && multx != 4 && multx != 8)
-		return(-1);
-	if (plusy < 0 || plusy > 7)
-		return(-1);
-
-	/*
-	 * If this is the first option, allocate space for the
-	 * first 2 bytes(for next header and length fields) of
-	 * the option header.
-	 */
-	if (bp == (u_char *)eh) {
-		bp += 2;
-		cmsg->cmsg_len += 2;
-	}
-
-	/* calculate pad length before the option. */
-	off = bp - (u_char *)eh;
-	padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
-		(off % multx);
-	padlen += plusy;
-	padlen %= multx;	/* keep the pad as short as possible */
-	/* insert padding */
-	inet6_insert_padopt(bp, padlen);
-	cmsg->cmsg_len += padlen;
-	bp += padlen;
-
-	/* copy the option */
-	if (typep[0] == IP6OPT_PAD1)
-		optlen = 1;
-	else
-		optlen = typep[1] + 2;
-	memcpy(bp, typep, optlen);
-	bp += optlen;
-	cmsg->cmsg_len += optlen;
-
-	/* calculate pad length after the option and insert the padding */
-	off = bp - (u_char *)eh;
-	padlen = ((off + 7) & ~7) - off;
-	inet6_insert_padopt(bp, padlen);
-	bp += padlen;
-	cmsg->cmsg_len += padlen;
-
-	/* update the length field of the ip6 option header */
-	eh->ip6e_len = ((bp - (u_char *)eh) >> 3) - 1;
-
-	return(0);
-}
-
-/*
- * This function appends a Hop-by-Hop option or a Destination option
- * into an ancillary data object that has been initialized by
- * inet6_option_init().  This function returns a pointer to the 8-bit
- * option type field that starts the option on success, or NULL on an
- * error.
- * The difference between this function and inet6_option_append() is
- * that the latter copies the contents of a previously built option into
- * the ancillary data object while the current function returns a
- * pointer to the space in the data object where the option's TLV must
- * then be built by the caller.
- * 
- */
-u_int8_t *
-inet6_option_alloc(struct cmsghdr *cmsg, int datalen, int multx, int plusy)
-{
-	int padlen, off;
-	u_int8_t *bp = (u_char *)cmsg + cmsg->cmsg_len;
-	u_int8_t *retval;
-	struct ip6_ext *eh = (struct ip6_ext *)CMSG_DATA(cmsg);
-
-	/* argument validation */
-	if (multx != 1 && multx != 2 && multx != 4 && multx != 8)
-		return(NULL);
-	if (plusy < 0 || plusy > 7)
-		return(NULL);
-
-	/*
-	 * If this is the first option, allocate space for the
-	 * first 2 bytes(for next header and length fields) of
-	 * the option header.
-	 */
-	if (bp == (u_char *)eh) {
-		bp += 2;
-		cmsg->cmsg_len += 2;
-	}
-
-	/* calculate pad length before the option. */
-	off = bp - (u_char *)eh;
-	padlen = (((off % multx) + (multx - 1)) & ~(multx - 1)) -
-		(off % multx);
-	padlen += plusy;
-	padlen %= multx;	/* keep the pad as short as possible */
-	/* insert padding */
-	inet6_insert_padopt(bp, padlen);
-	cmsg->cmsg_len += padlen;
-	bp += padlen;
-
-	/* keep space to store specified length of data */
-	retval = bp;
-	bp += datalen;
-	cmsg->cmsg_len += datalen;
-
-	/* calculate pad length after the option and insert the padding */
-	off = bp - (u_char *)eh;
-	padlen = ((off + 7) & ~7) - off;
-	inet6_insert_padopt(bp, padlen);
-	bp += padlen;
-	cmsg->cmsg_len += padlen;
-
-	/* update the length field of the ip6 option header */
-	eh->ip6e_len = ((bp - (u_char *)eh) >> 3) - 1;
-
-	return(retval);
-}
-
-/*
- * This function processes the next Hop-by-Hop option or Destination
- * option in an ancillary data object.  If another option remains to be
- * processed, the return value of the function is 0 and *tptrp points to
- * the 8-bit option type field (which is followed by the 8-bit option
- * data length, followed by the option data).  If no more options remain
- * to be processed, the return value is -1 and *tptrp is NULL.  If an
- * error occurs, the return value is -1 and *tptrp is not NULL.
- * (RFC 2292, 6.3.5)
- */
-int
-inet6_option_next(const struct cmsghdr *cmsg, u_int8_t **tptrp)
-{
-	struct ip6_ext *ip6e;
-	int hdrlen, optlen;
-	u_int8_t *lim;
-
-	if (cmsg->cmsg_level != IPPROTO_IPV6 ||
-	    (!is_ipv6_hopopts(cmsg->cmsg_type) &&
-	     !is_ipv6_dstopts(cmsg->cmsg_type)))
-		return(-1);
-
-	/* message length validation */
-	if (cmsg->cmsg_len < CMSG_SPACE(sizeof(struct ip6_ext)))
-		return(-1);
-	ip6e = (struct ip6_ext *)CMSG_DATA(cmsg);
-	hdrlen = (ip6e->ip6e_len + 1) << 3;
-	if (cmsg->cmsg_len < CMSG_SPACE(hdrlen))
-		return(-1);
-
-	/*
-	 * If the caller does not specify the starting point,
-	 * simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	lim = (u_int8_t *)ip6e + hdrlen;
-	if (*tptrp == NULL)
-		*tptrp = (u_int8_t *)(ip6e + 1);
-	else {
-		if ((optlen = ip6optlen(*tptrp, lim)) == 0)
-			return(-1);
-
-		*tptrp = *tptrp + optlen;
-	}
-	if (*tptrp >= lim) {	/* there is no option */
-		*tptrp = NULL;
-		return(-1);
-	}
-	/*
-	 * Finally, checks if the next option is safely stored in the
-	 * cmsg data.
-	 */
-	if (ip6optlen(*tptrp, lim) == 0)
-		return(-1);
-	else
-		return(0);
-}
-
-/*
- * This function is similar to the inet6_option_next() function,
- * except this function lets the caller specify the option type to be
- * searched for, instead of always returning the next option in the
- * ancillary data object.
- * Note: RFC 2292 says the type of tptrp is u_int8_t *, but we think
- *       it's a typo. The variable should be type of u_int8_t **.
- */
-int
-inet6_option_find(const struct cmsghdr *cmsg, u_int8_t **tptrp, int type)
-{
-	struct ip6_ext *ip6e;
-	int hdrlen, optlen;
-	u_int8_t *optp, *lim;
-
-	if (cmsg->cmsg_level != IPPROTO_IPV6 ||
-	    (!is_ipv6_hopopts(cmsg->cmsg_type) &&
-	     !is_ipv6_dstopts(cmsg->cmsg_type)))
-		return(-1);
-
-	/* message length validation */
-	if (cmsg->cmsg_len < CMSG_SPACE(sizeof(struct ip6_ext)))
-		return(-1);
-	ip6e = (struct ip6_ext *)CMSG_DATA(cmsg);
-	hdrlen = (ip6e->ip6e_len + 1) << 3;
-	if (cmsg->cmsg_len < CMSG_SPACE(hdrlen))
-		return(-1);	
-
-	/*
-	 * If the caller does not specify the starting point,
-	 * search from the beginning of the option list.
-	 * Otherwise, search from *the next option* of the specified point.
-	 */
-	lim = (u_int8_t *)ip6e + hdrlen;
-	if (*tptrp == NULL)
-		*tptrp = (u_int8_t *)(ip6e + 1);
-	else {
-		if ((optlen = ip6optlen(*tptrp, lim)) == 0)
-			return(-1);
-
-		*tptrp = *tptrp + optlen;
-	}
-	for (optp = *tptrp; optp < lim; optp += optlen) {
-		if (*optp == type) {
-			*tptrp = optp;
-			return(0);
-		}
-		if ((optlen = ip6optlen(optp, lim)) == 0)
-			return(-1);
-	}
-
-	/* search failed */
-	*tptrp = NULL;
-	return(-1);
-}
-
-/*
- * Calculate the length of a given IPv6 option. Also checks
- * if the option is safely stored in user's buffer according to the
- * calculated length and the limitation of the buffer.
- */
-static int
-ip6optlen(u_int8_t *opt, u_int8_t *lim)
-{
-	int optlen;
-
-	if (*opt == IP6OPT_PAD1)
-		optlen = 1;
-	else {
-		/* is there enough space to store type and len? */
-		if (opt + 2 > lim)
-			return(0);
-		optlen = *(opt + 1) + 2;
-	}
-	if (opt + optlen <= lim)
-		return(optlen);
-
-	return(0);
-}
-
-static void
-inet6_insert_padopt(u_char *p, int len)
-{
-	switch(len) {
-	 case 0:
-		 return;
-	 case 1:
-		 p[0] = IP6OPT_PAD1;
-		 return;
-	 default:
-		 p[0] = IP6OPT_PADN;
-		 p[1] = len - 2; 
-		 memset(&p[2], 0, len - 2);
-		 return;
-	}
-}
-
-/*
- * The following functions are defined in RFC3542, which is a successor
- * of RFC2292.
- */
-
-int
-inet6_opt_init(void *extbuf, socklen_t extlen)
-{
-	struct ip6_ext *ext = (struct ip6_ext *)extbuf;
-
-	if (extlen < 0 || (extlen % 8))
-		return(-1);
-
-	if (ext) {
-		if (extlen == 0)
-			return(-1);
-		ext->ip6e_len = (extlen >> 3) - 1;
-	}
-
-	return(2);		/* sizeof the next and the length fields */
-}
-
-int
-inet6_opt_append(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
-		 socklen_t len, u_int8_t align, void **databufp)
-{
-	int currentlen = offset, padlen = 0;
-
-	/*
-	 * The option type must have a value from 2 to 255, inclusive.
-	 * (0 and 1 are reserved for the Pad1 and PadN options, respectively.)
-	 */
-	if (type < 2)
-		return(-1);
-
-	/*
-	 * The option data length must have a value between 0 and 255,
-	 * inclusive, and is the length of the option data that follows.
-	 */
-	if (len < 0 || len > 255)
-		return(-1);
-
-	/*
-	 * The align parameter must have a value of 1, 2, 4, or 8.
-	 * The align value can not exceed the value of len.
-	 */
-	if (align != 1 && align != 2 && align != 4 && align != 8)
-		return(-1);
-	if (align > len)
-		return(-1);
-
-	/* Calculate the padding length. */
-	currentlen += 2 + len;	/* 2 means "type + len" */
-	if (currentlen % align)
-		padlen = align - (currentlen % align);
-
-	/* The option must fit in the extension header buffer. */
-	currentlen += padlen;
-	if (extlen &&		/* XXX: right? */
-	    currentlen > extlen)
-		return(-1);
-
-	if (extbuf) {
-		u_int8_t *optp = (u_int8_t *)extbuf + offset;
-
-		if (padlen == 1) {
-			/* insert a Pad1 option */
-			*optp = IP6OPT_PAD1;
-			optp++;
-		}
-		else if (padlen > 0) {
-			/* insert a PadN option for alignment */
-			*optp++ = IP6OPT_PADN;
-			*optp++ = padlen - 2;
-			memset(optp, 0, padlen - 2);
-			optp += (padlen - 2);
-		}
-
-		*optp++ = type;
-		*optp++ = len;
-
-		*databufp = optp;
-	}
-
-	return(currentlen);
-}
-
-int
-inet6_opt_finish(void *extbuf, socklen_t extlen, int offset)
-{
-	int updatelen = offset > 0 ? (1 + ((offset - 1) | 7)) : 0;
-
-	if (extbuf) {
-		u_int8_t *padp;
-		int padlen = updatelen - offset;
-
-		if (updatelen > extlen)
-			return(-1);
-
-		padp = (u_int8_t *)extbuf + offset;
-		if (padlen == 1)
-			*padp = IP6OPT_PAD1;
-		else if (padlen > 0) {
-			*padp++ = IP6OPT_PADN;
-			*padp++ = (padlen - 2);
-			memset(padp, 0, padlen - 2);
-		}
-	}
-
-	return(updatelen);
-}
-
-int
-inet6_opt_set_val(void *databuf, int offset, void *val, socklen_t vallen)
-{
-
-	memcpy((u_int8_t *)databuf + offset, val, vallen);
-	return(offset + vallen);
-}
-
-int
-inet6_opt_next(void *extbuf, socklen_t extlen, int offset, u_int8_t *typep,
-	       socklen_t *lenp, void **databufp)
-{
-	u_int8_t *optp, *lim;
-	int optlen;
-
-	/* Validate extlen. XXX: is the variable really necessary?? */
-	if (extlen == 0 || (extlen % 8))
-		return(-1);
-	lim = (u_int8_t *)extbuf + extlen;
-
-	/*
-	 * If this is the first time this function called for this options
-	 * header, simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	if (offset == 0) {
-		optp = (u_int8_t *)((struct ip6_hbh *)extbuf + 1);
-	}
-	else
-		optp = (u_int8_t *)extbuf + offset;
-
-	/* Find the next option skipping any padding options. */
-	while(optp < lim) {
-		switch(*optp) {
-		case IP6OPT_PAD1:
-			optp++;
-			break;
-		case IP6OPT_PADN:
-			if ((optlen = ip6optlen(optp, lim)) == 0)
-				goto optend;
-			optp += optlen;
-			break;
-		default:	/* found */
-			if ((optlen = ip6optlen(optp, lim)) == 0)
-				goto optend;
-			*typep = *optp;
-			*lenp = optlen - 2;
-			*databufp = optp + 2;
-			return(optp + optlen - (u_int8_t *)extbuf);
-		}
-	}
-
-  optend:
-	*databufp = NULL; /* for safety */
-	return(-1);
-}
-
-int
-inet6_opt_find(void *extbuf, socklen_t extlen, int offset, u_int8_t type,
-	       socklen_t *lenp, void **databufp)
-{
-	u_int8_t *optp, *lim;
-	int optlen;
-
-	/* Validate extlen. XXX: is the variable really necessary?? */
-	if (extlen == 0 || (extlen % 8))
-		return(-1);
-	lim = (u_int8_t *)extbuf + extlen;
-
-	/*
-	 * If this is the first time this function called for this options
-	 * header, simply return the 1st option.
-	 * Otherwise, search the option list for the next option.
-	 */
-	if (offset == 0) {
-		optp = (u_int8_t *)((struct ip6_hbh *)extbuf + 1);
-	}
-	else
-		optp = (u_int8_t *)extbuf + offset;
-
-	/* Find the specified option */
-	while(optp < lim) {
-		if ((optlen = ip6optlen(optp, lim)) == 0)
-			goto optend;
-
-		if (*optp == type) { /* found */
-			*lenp = optlen - 2;
-			*databufp = optp + 2;
-			return(optp + optlen - (u_int8_t *)extbuf);
-		}
-
-		optp += optlen;
-	}
-
-  optend:
-	*databufp = NULL; /* for safety */
-	return(-1);
-}
-
-int
-inet6_opt_get_val(void *databuf, int offset, void *val, socklen_t vallen)
-{
-
-	/* we can't assume alignment here */
-	memcpy(val, (u_int8_t *)databuf + offset, vallen);
-
-	return(offset + vallen);
-}
diff --git a/lib/libc_bsd/net/linkaddr.3 b/lib/libc_bsd/net/linkaddr.3
deleted file mode 100644
index b30d6e8..0000000
--- a/lib/libc_bsd/net/linkaddr.3
+++ /dev/null
@@ -1,134 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley at BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     From: @(#)linkaddr.3	8.1 (Berkeley) 7/28/93
-.\" $FreeBSD: releng/10.2/lib/libc/net/linkaddr.3 167121 2007-02-28 21:18:38Z bms $
-.\"
-.Dd February 28, 2007
-.Dt LINK_ADDR 3
-.Os
-.Sh NAME
-.Nm link_addr ,
-.Nm link_ntoa
-.Nd elementary address specification routines for link level access
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In net/if_dl.h
-.Ft void
-.Fn link_addr "const char *addr" "struct sockaddr_dl *sdl"
-.Ft char *
-.Fn link_ntoa "const struct sockaddr_dl *sdl"
-.Sh DESCRIPTION
-The routine
-.Fn link_addr
-interprets character strings representing
-link-level addresses, returning binary information suitable
-for use in system calls.
-The routine
-.Fn link_ntoa
-takes
-a link-level
-address and returns an
-.Tn ASCII
-string representing some of the information present,
-including the link level address itself, and the interface name
-or number, if present.
-This facility is experimental and is
-still subject to change.
-.Pp
-For
-.Fn link_addr ,
-the string
-.Fa addr
-may contain
-an optional network interface identifier of the form
-.Dq "name unit-number" ,
-suitable for the first argument to
-.Xr ifconfig 8 ,
-followed in all cases by a colon and
-an interface address in the form of
-groups of hexadecimal digits
-separated by periods.
-Each group represents a byte of address;
-address bytes are filled left to right from
-low order bytes through high order bytes.
-.Pp
-.\" A regular expression may make this format clearer:
-.\" .Bd -literal -offset indent
-.\" ([a-z]+[0-9]+:)?[0-9a-f]+(\e.[0-9a-f]+)*
-.\" .Ed
-.\" .Pp
-Thus
-.Li le0:8.0.9.13.d.30
-represents an ethernet address
-to be transmitted on the first Lance ethernet interface.
-.Sh RETURN VALUES
-The
-.Fn link_ntoa
-function
-always returns a null terminated string.
-The
-.Fn link_addr
-function
-has no return value.
-(See
-.Sx BUGS . )
-.Sh SEE ALSO
-.Xr getnameinfo 3
-.Sh HISTORY
-The
-.Fn link_addr
-and
-.Fn link_ntoa
-functions appeared in
-.Bx 4.3 Reno .
-.Sh BUGS
-The returned values for link_ntoa
-reside in a static memory area.
-.Pp
-The function
-.Fn link_addr
-should diagnose improperly formed input, and there should be an unambiguous
-way to recognize this.
-.Pp
-If the
-.Va sdl_len
-field of the link socket address
-.Fa sdl
-is 0,
-.Fn link_ntoa
-will not insert a colon before the interface address bytes.
-If this translated address is given to
-.Fn link_addr
-without inserting an initial colon,
-the latter will not interpret it correctly.
diff --git a/lib/libc_bsd/net/linkaddr.c b/lib/libc_bsd/net/linkaddr.c
deleted file mode 100644
index c8baef3..0000000
--- a/lib/libc_bsd/net/linkaddr.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)linkaddr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/linkaddr.c 270032 2014-08-16 01:00:37Z pfg $");
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <net/if_dl.h>
-#include <string.h>
-
-/* States*/
-#define NAMING	0
-#define GOTONE	1
-#define GOTTWO	2
-#define RESET	3
-/* Inputs */
-#define	DIGIT	(4*0)
-#define	END	(4*1)
-#define DELIM	(4*2)
-#define LETTER	(4*3)
-
-void
-link_addr(addr, sdl)
-	const char *addr;
-	struct sockaddr_dl *sdl;
-{
-	char *cp = sdl->sdl_data;
-	char *cplim = sdl->sdl_len + (char *)sdl;
-	int byte = 0, state = NAMING, new;
-
-	bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1);
-	sdl->sdl_family = AF_LINK;
-	do {
-		state &= ~LETTER;
-		if ((*addr >= '0') && (*addr <= '9')) {
-			new = *addr - '0';
-		} else if ((*addr >= 'a') && (*addr <= 'f')) {
-			new = *addr - 'a' + 10;
-		} else if ((*addr >= 'A') && (*addr <= 'F')) {
-			new = *addr - 'A' + 10;
-		} else if (*addr == 0) {
-			state |= END;
-		} else if (state == NAMING &&
-			   (((*addr >= 'A') && (*addr <= 'Z')) ||
-			   ((*addr >= 'a') && (*addr <= 'z'))))
-			state |= LETTER;
-		else
-			state |= DELIM;
-		addr++;
-		switch (state /* | INPUT */) {
-		case NAMING | DIGIT:
-		case NAMING | LETTER:
-			*cp++ = addr[-1];
-			continue;
-		case NAMING | DELIM:
-			state = RESET;
-			sdl->sdl_nlen = cp - sdl->sdl_data;
-			continue;
-		case GOTTWO | DIGIT:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | DIGIT:
-			state = GOTONE;
-			byte = new;
-			continue;
-		case GOTONE | DIGIT:
-			state = GOTTWO;
-			byte = new + (byte << 4);
-			continue;
-		default: /* | DELIM */
-			state = RESET;
-			*cp++ = byte;
-			byte = 0;
-			continue;
-		case GOTONE | END:
-		case GOTTWO | END:
-			*cp++ = byte;
-			/* FALLTHROUGH */
-		case RESET | END:
-			break;
-		}
-		break;
-	} while (cp < cplim);
-	sdl->sdl_alen = cp - LLADDR(sdl);
-	new = cp - (char *)sdl;
-	if (new > sizeof(*sdl))
-		sdl->sdl_len = new;
-	return;
-}
-
-static const char hexlist[] = "0123456789abcdef";
-
-char *
-link_ntoa(sdl)
-	const struct sockaddr_dl *sdl;
-{
-	static char obuf[64];
-	char *out = obuf;
-	int i;
-	u_char *in = (u_char *)LLADDR(sdl);
-	u_char *inlim = in + sdl->sdl_alen;
-	int firsttime = 1;
-
-	if (sdl->sdl_nlen) {
-		bcopy(sdl->sdl_data, obuf, sdl->sdl_nlen);
-		out += sdl->sdl_nlen;
-		if (sdl->sdl_alen)
-			*out++ = ':';
-	}
-	while (in < inlim) {
-		if (firsttime)
-			firsttime = 0;
-		else
-			*out++ = '.';
-		i = *in++;
-		if (i > 0xf) {
-			out[1] = hexlist[i & 0xf];
-			i >>= 4;
-			out[0] = hexlist[i];
-			out += 2;
-		} else
-			*out++ = hexlist[i];
-	}
-	*out = 0;
-	return (obuf);
-}
diff --git a/lib/libc_bsd/net/map_v4v6.c b/lib/libc_bsd/net/map_v4v6.c
deleted file mode 100644
index ec923a1..0000000
--- a/lib/libc_bsd/net/map_v4v6.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 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.
- * 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gethostnamadr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/map_v4v6.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <ctype.h>
-#include <syslog.h>
-
-typedef union {
-	int32_t al;
-	char ac;
-} align;
-
-void
-_map_v4v6_address(const char *src, char *dst)
-{
-	u_char *p = (u_char *)dst;
-	char tmp[NS_INADDRSZ];
-	int i;
-
-	/* Stash a temporary copy so our caller can update in place. */
-	memcpy(tmp, src, NS_INADDRSZ);
-	/* Mark this ipv6 addr as a mapped ipv4. */
-	for (i = 0; i < 10; i++)
-		*p++ = 0x00;
-	*p++ = 0xff;
-	*p++ = 0xff;
-	/* Retrieve the saved copy and we're done. */
-	memcpy((void*)p, tmp, NS_INADDRSZ);
-}
-
-void
-_map_v4v6_hostent(struct hostent *hp, char **bpp, char *ep) {
-	char **ap;
-
-	if (hp->h_addrtype != AF_INET || hp->h_length != INADDRSZ)
-		return;
-	hp->h_addrtype = AF_INET6;
-	hp->h_length = IN6ADDRSZ;
-	for (ap = hp->h_addr_list; *ap; ap++) {
-		int i = (u_long)*bpp % sizeof(align);
-
-		if (i != 0)
-			i = sizeof(align) - i;
-
-		if ((ep - *bpp) < (i + IN6ADDRSZ)) {
-			/* Out of memory.  Truncate address list here. */
-			*ap = NULL;
-			return;
-		}
-		*bpp += i;
-		_map_v4v6_address(*ap, *bpp);
-		*ap = *bpp;
-		*bpp += IN6ADDRSZ;
-	}
-}
diff --git a/lib/libc_bsd/net/name6.c b/lib/libc_bsd/net/name6.c
deleted file mode 100644
index 7849c3b..0000000
--- a/lib/libc_bsd/net/name6.c
+++ /dev/null
@@ -1,1114 +0,0 @@
-/*	$KAME: name6.c,v 1.25 2000/06/26 16:44:40 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-/*
- * ++Copyright++ 1985, 1988, 1993
- * -
- * Copyright (c) 1985, 1988, 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. 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
- *	Atsushi Onoe <onoe@sm.sony.co.jp>
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/name6.c 255328 2013-09-06 21:02:06Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/queue.h>
-#include <netinet/in.h>
-#ifdef INET6
-#include <net/if.h>
-#include <net/if_var.h>
-#include <sys/sysctl.h>
-#include <sys/ioctl.h>
-#include <netinet6/in6_var.h>	/* XXX */
-#endif
-
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <nsswitch.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "netdb_private.h"
-#include "res_private.h"
-
-#ifndef MAXALIASES
-#define	MAXALIASES	10
-#endif
-#ifndef	MAXADDRS
-#define	MAXADDRS	20
-#endif
-#ifndef MAXDNAME
-#define	MAXDNAME	1025
-#endif
-
-#ifdef INET6
-#define	ADDRLEN(af)	((af) == AF_INET6 ? sizeof(struct in6_addr) : \
-					    sizeof(struct in_addr))
-#else
-#define	ADDRLEN(af)	sizeof(struct in_addr)
-#endif
-
-#define	MAPADDR(ab, ina) \
-do {									\
-	memcpy(&(ab)->map_inaddr, ina, sizeof(struct in_addr));		\
-	memset((ab)->map_zero, 0, sizeof((ab)->map_zero));		\
-	memset((ab)->map_one, 0xff, sizeof((ab)->map_one));		\
-} while (0)
-#define	MAPADDRENABLED(flags) \
-	(((flags) & AI_V4MAPPED) || \
-	 (((flags) & AI_V4MAPPED_CFG)))
-
-union inx_addr {
-	struct in_addr	in_addr;
-#ifdef INET6
-	struct in6_addr	in6_addr;
-#endif
-	struct {
-		u_char	mau_zero[10];
-		u_char	mau_one[2];
-		struct in_addr mau_inaddr;
-	}		map_addr_un;
-#define	map_zero	map_addr_un.mau_zero
-#define	map_one		map_addr_un.mau_one
-#define	map_inaddr	map_addr_un.mau_inaddr
-};
-
-struct policyqueue {
-	TAILQ_ENTRY(policyqueue) pc_entry;
-#ifdef INET6
-	struct in6_addrpolicy pc_policy;
-#endif
-};
-TAILQ_HEAD(policyhead, policyqueue);
-
-#define AIO_SRCFLAG_DEPRECATED	0x1
-
-struct hp_order {
-	union {
-		struct sockaddr_storage aiou_ss;
-		struct sockaddr aiou_sa;
-	} aio_src_un;
-#define aio_srcsa aio_src_un.aiou_sa
-	uint32_t aio_srcflag;
-	int aio_srcscope;
-	int aio_dstscope;
-	struct policyqueue *aio_srcpolicy;
-	struct policyqueue *aio_dstpolicy;
-	union {
-		struct sockaddr_storage aiou_ss;
-		struct sockaddr aiou_sa;
-	} aio_un;
-#define aio_sa aio_un.aiou_sa
-	int aio_matchlen;
-	char *aio_h_addr;
-};
-
-static struct	 hostent *_hpcopy(struct hostent *, int *);
-static struct	 hostent *_hpaddr(int, const char *, void *, int *);
-#ifdef INET6
-static struct	 hostent *_hpmerge(struct hostent *, struct hostent *, int *);
-static struct	 hostent *_hpmapv6(struct hostent *, int *);
-#endif
-static struct	 hostent *_hpsort(struct hostent *, res_state);
-
-#ifdef INET6
-static struct	 hostent *_hpreorder(struct hostent *);
-static int	 get_addrselectpolicy(struct policyhead *);
-static void	 free_addrselectpolicy(struct policyhead *);
-static struct	 policyqueue *match_addrselectpolicy(struct sockaddr *,
-	struct policyhead *);
-static void	 set_source(struct hp_order *, struct policyhead *);
-static int	 matchlen(struct sockaddr *, struct sockaddr *);
-static int	 comp_dst(const void *, const void *);
-static int	 gai_addr2scopetype(struct sockaddr *);
-#endif
-
-/*
- * Functions defined in RFC2553
- *	getipnodebyname, getipnodebyaddr, freehostent
- */
-
-struct hostent *
-getipnodebyname(const char *name, int af, int flags, int *errp)
-{
-	struct hostent *hp;
-	union inx_addr addrbuf;
-	res_state statp;
-	u_long options;
-
-	switch (af) {
-	case AF_INET:
-#ifdef INET6
-	case AF_INET6:
-#endif
-		break;
-	default:
-		*errp = NO_RECOVERY;
-		return NULL;
-	}
-
-	if (flags & AI_ADDRCONFIG) {
-		int s;
-
-		if ((s = _socket(af, SOCK_DGRAM | SOCK_CLOEXEC, 0)) < 0)
-			return NULL;
-		/*
-		 * TODO:
-		 * Note that implementation dependent test for address
-		 * configuration should be done everytime called
-		 * (or apropriate interval),
-		 * because addresses will be dynamically assigned or deleted.
-		 */
-		_close(s);
-	}
-	
-#ifdef INET6
-	/* special case for literal address */
-	if (inet_pton(AF_INET6, name, &addrbuf) == 1) {
-		if (af != AF_INET6) {
-			*errp = HOST_NOT_FOUND;
-			return NULL;
-		}
-		return _hpaddr(af, name, &addrbuf, errp);
-	}
-#endif
-	if (inet_aton(name, (struct in_addr *)&addrbuf) == 1) {
-		if (af != AF_INET) {
-			if (MAPADDRENABLED(flags)) {
-				MAPADDR(&addrbuf, &addrbuf.in_addr);
-			} else {
-				*errp = HOST_NOT_FOUND;
-				return NULL;
-			}
-		}
-		return _hpaddr(af, name, &addrbuf, errp);
-	}
-
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0) {
-		if (res_ninit(statp) < 0) {
-			*errp = NETDB_INTERNAL;
-			return NULL;
-		}
-	}
-	
-	options = statp->options;
-	statp->options &= ~RES_USE_INET6;
-	
-	hp = gethostbyname2(name, af);
-	hp = _hpcopy(hp, errp);
-#ifdef INET6
-	if (af == AF_INET6)
-		hp = _hpreorder(hp);
-
-	if (af == AF_INET6 && ((flags & AI_ALL) || hp == NULL) &&
-	    MAPADDRENABLED(flags)) {
-		struct hostent *hp2 = gethostbyname2(name, AF_INET);
-		if (hp == NULL)
-			if (hp2 == NULL)
-				*errp = statp->res_h_errno;
-			else
-				hp = _hpmapv6(hp2, errp);
-		else {
-			if (hp2 && strcmp(hp->h_name, hp2->h_name) == 0) {
-				struct hostent *hpb = hp;
-				hp = _hpmerge(hpb, hp2, errp);
-				freehostent(hpb);
-			}
-		}
-	}
-#endif
-	
-	if (hp == NULL)
-		*errp = statp->res_h_errno;
-	
-	statp->options = options;
-	return _hpsort(hp, statp);
-}
-
-struct hostent *
-getipnodebyaddr(const void *src, size_t len, int af, int *errp)
-{
-	struct hostent *hp;
-	res_state statp;
-	u_long options;
-	
-#ifdef INET6
-	struct in6_addr addrbuf;
-#else
-	struct in_addr addrbuf;
-#endif
-	
-	switch (af) {
-	case AF_INET:
-		if (len != sizeof(struct in_addr)) {
-			*errp = NO_RECOVERY;
-			return NULL;
-		}
-		if ((long)src & ~(sizeof(struct in_addr) - 1)) {
-			memcpy(&addrbuf, src, len);
-			src = &addrbuf;
-		}
-		if (((struct in_addr *)src)->s_addr == 0)
-			return NULL;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		if (len != sizeof(struct in6_addr)) {
-			*errp = NO_RECOVERY;
-			return NULL;
-		}
-		if ((long)src & ~(sizeof(struct in6_addr) / 2 - 1)) {	/*XXX*/
-			memcpy(&addrbuf, src, len);
-			src = &addrbuf;
-		}
-		if (IN6_IS_ADDR_UNSPECIFIED((struct in6_addr *)src))
-			return NULL;
-		if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)src)
-		||  IN6_IS_ADDR_V4COMPAT((struct in6_addr *)src)) {
-			src = (char *)src +
-			    (sizeof(struct in6_addr) - sizeof(struct in_addr));
-			af = AF_INET;
-			len = sizeof(struct in_addr);
-		}
-		break;
-#endif
-	default:
-		*errp = NO_RECOVERY;
-		return NULL;
-	}
-
-	statp = __res_state();
-	if ((statp->options & RES_INIT) == 0) {
-		if (res_ninit(statp) < 0) {
-			RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-			return NULL;
-		}
-	}
-	
-	options = statp->options;
-	statp->options &= ~RES_USE_INET6;
-
-	hp = gethostbyaddr(src, len, af);
-	if (hp == NULL)
-		*errp = statp->res_h_errno;
-	
-	statp->options = options;	
-	return (_hpcopy(hp, errp));
-}
-
-void
-freehostent(struct hostent *ptr)
-{
-	free(ptr);
-}
-
-/*
- * Private utility functions
- */
-
-/*
- * _hpcopy: allocate and copy hostent structure
- */
-static struct hostent *
-_hpcopy(struct hostent *hp, int *errp)
-{
-	struct hostent *nhp;
-	char *cp, **pp;
-	int size, addrsize;
-	int nalias = 0, naddr = 0;
-	int al_off;
-	int i;
-
-	if (hp == NULL)
-		return hp;
-
-	/* count size to be allocated */
-	size = sizeof(struct hostent);
-	if (hp->h_name != NULL)
-		size += strlen(hp->h_name) + 1;
-	if ((pp = hp->h_aliases) != NULL) {
-		for (i = 0; *pp != NULL; i++, pp++) {
-			if (**pp != '\0') {
-				size += strlen(*pp) + 1;
-				nalias++;
-			}
-		}
-	}
-	/* adjust alignment */
-	size = ALIGN(size);
-	al_off = size;
-	size += sizeof(char *) * (nalias + 1);
-	addrsize = ALIGN(hp->h_length);
-	if ((pp = hp->h_addr_list) != NULL) {
-		while (*pp++ != NULL)
-			naddr++;
-	}
-	size += addrsize * naddr;
-	size += sizeof(char *) * (naddr + 1);
-
-	/* copy */
-	if ((nhp = (struct hostent *)malloc(size)) == NULL) {
-		*errp = TRY_AGAIN;
-		return NULL;
-	}
-	cp = (char *)&nhp[1];
-	if (hp->h_name != NULL) {
-		nhp->h_name = cp;
-		strcpy(cp, hp->h_name);
-		cp += strlen(cp) + 1;
-	} else
-		nhp->h_name = NULL;
-	nhp->h_aliases = (char **)((char *)nhp + al_off);
-	if ((pp = hp->h_aliases) != NULL) {
-		for (i = 0; *pp != NULL; pp++) {
-			if (**pp != '\0') {
-				nhp->h_aliases[i++] = cp;
-				strcpy(cp, *pp);
-				cp += strlen(cp) + 1;
-			}
-		}
-	}
-	nhp->h_aliases[nalias] = NULL;
-	cp = (char *)&nhp->h_aliases[nalias + 1];
-	nhp->h_addrtype = hp->h_addrtype;
-	nhp->h_length = hp->h_length;
-	nhp->h_addr_list = (char **)cp;
-	if ((pp = hp->h_addr_list) != NULL) {
-		cp = (char *)&nhp->h_addr_list[naddr + 1];
-		for (i = 0; *pp != NULL; pp++) {
-			nhp->h_addr_list[i++] = cp;
-			memcpy(cp, *pp, hp->h_length);
-			cp += addrsize;
-		}
-	}
-	nhp->h_addr_list[naddr] = NULL;
-	return nhp;
-}
-
-/*
- * _hpaddr: construct hostent structure with one address
- */
-static struct hostent *
-_hpaddr(int af, const char *name, void *addr, int *errp)
-{
-	struct hostent *hp, hpbuf;
-	char *addrs[2];
-
-	hp = &hpbuf;
-	hp->h_name = (char *)name;
-	hp->h_aliases = NULL;
-	hp->h_addrtype = af;
-	hp->h_length = ADDRLEN(af);
-	hp->h_addr_list = addrs;
-	addrs[0] = (char *)addr;
-	addrs[1] = NULL;
-	return (_hpcopy(hp, errp));
-}
-
-#ifdef INET6
-/*
- * _hpmerge: merge 2 hostent structure, arguments will be freed
- */
-static struct hostent *
-_hpmerge(struct hostent *hp1, struct hostent *hp2, int *errp)
-{
-	int i, j;
-	int naddr, nalias;
-	char **pp;
-	struct hostent *hp, hpbuf;
-	char *aliases[MAXALIASES + 1], *addrs[MAXADDRS + 1];
-	union inx_addr addrbuf[MAXADDRS];
-
-	if (hp1 == NULL)
-		return _hpcopy(hp2, errp);
-	if (hp2 == NULL)
-		return _hpcopy(hp1, errp);
-
-#define	HP(i)	(i == 1 ? hp1 : hp2)
-	hp = &hpbuf;
-	hp->h_name = (hp1->h_name != NULL ? hp1->h_name : hp2->h_name);
-	hp->h_aliases = aliases;
-	nalias = 0;
-	for (i = 1; i <= 2; i++) {
-		if ((pp = HP(i)->h_aliases) == NULL)
-			continue;
-		for (; nalias < MAXALIASES && *pp != NULL; pp++) {
-			/* check duplicates */
-			for (j = 0; j < nalias; j++)
-				if (strcasecmp(*pp, aliases[j]) == 0)
-					break;
-			if (j == nalias)
-				aliases[nalias++] = *pp;
-		}
-	}
-	aliases[nalias] = NULL;
-	if (hp1->h_length != hp2->h_length) {
-		hp->h_addrtype = AF_INET6;
-		hp->h_length = sizeof(struct in6_addr);
-	} else {
-		hp->h_addrtype = hp1->h_addrtype;
-		hp->h_length = hp1->h_length;
-	}
-
-	hp->h_addr_list = addrs;
-	naddr = 0;
-	for (i = 1; i <= 2; i++) {
-		if ((pp = HP(i)->h_addr_list) == NULL)
-			continue;
-		if (HP(i)->h_length == hp->h_length) {
-			while (naddr < MAXADDRS && *pp != NULL)
-				addrs[naddr++] = *pp++;
-		} else {
-			/* copy IPv4 addr as mapped IPv6 addr */
-			while (naddr < MAXADDRS && *pp != NULL) {
-				MAPADDR(&addrbuf[naddr], *pp++);
-				addrs[naddr] = (char *)&addrbuf[naddr];
-				naddr++;
-			}
-		}
-	}
-	addrs[naddr] = NULL;
-	return (_hpcopy(hp, errp));
-}
-#endif
-
-/*
- * _hpmapv6: convert IPv4 hostent into IPv4-mapped IPv6 addresses
- */
-#ifdef INET6
-static struct hostent *
-_hpmapv6(struct hostent *hp, int *errp)
-{
-	struct hostent hp6;
-
-	if (hp == NULL)
-		return NULL;
-	if (hp->h_addrtype == AF_INET6)
-		return _hpcopy(hp, errp);
-
-	memset(&hp6, 0, sizeof(struct hostent));
-	hp6.h_addrtype = AF_INET6;
-	hp6.h_length = sizeof(struct in6_addr);
-	return _hpmerge(&hp6, hp, errp);
-}
-#endif
-
-/*
- * _hpsort: sort address by sortlist
- */
-static struct hostent *
-_hpsort(struct hostent *hp, res_state statp)
-{
-	int i, j, n;
-	u_char *ap, *sp, *mp, **pp;
-	char t;
-	char order[MAXADDRS];
-	int nsort = statp->nsort;
-
-	if (hp == NULL || hp->h_addr_list[1] == NULL || nsort == 0)
-		return hp;
-	for (i = 0; (ap = (u_char *)hp->h_addr_list[i]); i++) {
-		for (j = 0; j < nsort; j++) {
-#ifdef INET6
-			if (statp->_u._ext.ext->sort_list[j].af !=
-			    hp->h_addrtype)
-				continue;
-			sp = (u_char *)&statp->_u._ext.ext->sort_list[j].addr;
-			mp = (u_char *)&statp->_u._ext.ext->sort_list[j].mask;
-#else
-			sp = (u_char *)&statp->sort_list[j].addr;
-			mp = (u_char *)&statp->sort_list[j].mask;
-#endif
-			for (n = 0; n < hp->h_length; n++) {
-				if ((ap[n] & mp[n]) != sp[n])
-					break;
-			}
-			if (n == hp->h_length)
-				break;
-		}
-		order[i] = j;
-	}
-	n = i;
-	pp = (u_char **)hp->h_addr_list;
-	for (i = 0; i < n - 1; i++) {
-		for (j = i + 1; j < n; j++) {
-			if (order[i] > order[j]) {
-				ap = pp[i];
-				pp[i] = pp[j];
-				pp[j] = ap;
-				t = order[i];
-				order[i] = order[j];
-				order[j] = t;
-			}
-		}
-	}
-	return hp;
-}
-
-#ifdef INET6
-/*
- * _hpreorder: sort address by default address selection
- */
-static struct hostent *
-_hpreorder(struct hostent *hp)
-{
-	struct hp_order *aio;
-	int i, n;
-	char *ap;
-	struct sockaddr *sa;
-	struct policyhead policyhead;
-
-	if (hp == NULL)
-		return hp;
-
-	switch (hp->h_addrtype) {
-	case AF_INET:
-#ifdef INET6
-	case AF_INET6:
-#endif
-		break;
-	default:
-		free_addrselectpolicy(&policyhead);
-		return hp;
-	}
-
-	/* count the number of addrinfo elements for sorting. */
-	for (n = 0; hp->h_addr_list[n] != NULL; n++)
-		;
-
-	/*
-	 * If the number is small enough, we can skip the reordering process.
-	 */
-	if (n <= 1)
-		return hp;
-
-	/* allocate a temporary array for sort and initialization of it. */
-	if ((aio = malloc(sizeof(*aio) * n)) == NULL)
-		return hp;	/* give up reordering */
-	memset(aio, 0, sizeof(*aio) * n);
-
-	/* retrieve address selection policy from the kernel */
-	TAILQ_INIT(&policyhead);
-	if (!get_addrselectpolicy(&policyhead)) {
-		/* no policy is installed into kernel, we don't sort. */
-		free(aio);
-		return hp;
-	}
-
-	for (i = 0; i < n; i++) {
-		ap = hp->h_addr_list[i];
-		aio[i].aio_h_addr = ap;
-		sa = &aio[i].aio_sa;
-		switch (hp->h_addrtype) {
-		case AF_INET:
-			sa->sa_family = AF_INET;
-			sa->sa_len = sizeof(struct sockaddr_in);
-			memcpy(&((struct sockaddr_in *)sa)->sin_addr, ap,
-			    sizeof(struct in_addr));
-			break;
-#ifdef INET6
-		case AF_INET6:
-			if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *)ap)) {
-				sa->sa_family = AF_INET;
-				sa->sa_len = sizeof(struct sockaddr_in);
-				memcpy(&((struct sockaddr_in *)sa)->sin_addr,
-				    &ap[12], sizeof(struct in_addr));
-			} else {
-				sa->sa_family = AF_INET6;
-				sa->sa_len = sizeof(struct sockaddr_in6);
-				memcpy(&((struct sockaddr_in6 *)sa)->sin6_addr,
-				    ap, sizeof(struct in6_addr));
-			}
-			break;
-#endif
-		}
-		aio[i].aio_dstscope = gai_addr2scopetype(sa);
-		aio[i].aio_dstpolicy = match_addrselectpolicy(sa, &policyhead);
-		set_source(&aio[i], &policyhead);
-	}
-
-	/* perform sorting. */
-	qsort(aio, n, sizeof(*aio), comp_dst);
-
-	/* reorder the h_addr_list. */
-	for (i = 0; i < n; i++)
-		hp->h_addr_list[i] = aio[i].aio_h_addr;
-
-	/* cleanup and return */
-	free(aio);
-	free_addrselectpolicy(&policyhead);
-	return hp;
-}
-
-static int
-get_addrselectpolicy(struct policyhead *head)
-{
-#ifdef INET6
-	int mib[] = { CTL_NET, PF_INET6, IPPROTO_IPV6, IPV6CTL_ADDRCTLPOLICY };
-	size_t l;
-	char *buf;
-	struct in6_addrpolicy *pol, *ep;
-
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), NULL, &l, NULL, 0) < 0)
-		return (0);
-	if ((buf = malloc(l)) == NULL)
-		return (0);
-	if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buf, &l, NULL, 0) < 0) {
-		free(buf);
-		return (0);
-	}
-
-	ep = (struct in6_addrpolicy *)(buf + l);
-	for (pol = (struct in6_addrpolicy *)buf; pol + 1 <= ep; pol++) {
-		struct policyqueue *new;
-
-		if ((new = malloc(sizeof(*new))) == NULL) {
-			free_addrselectpolicy(head); /* make the list empty */
-			break;
-		}
-		new->pc_policy = *pol;
-		TAILQ_INSERT_TAIL(head, new, pc_entry);
-	}
-
-	free(buf);
-	return (1);
-#else
-	return (0);
-#endif
-}
-
-static void
-free_addrselectpolicy(struct policyhead *head)
-{
-	struct policyqueue *ent, *nent;
-
-	for (ent = TAILQ_FIRST(head); ent; ent = nent) {
-		nent = TAILQ_NEXT(ent, pc_entry);
-		TAILQ_REMOVE(head, ent, pc_entry);
-		free(ent);
-	}
-}
-
-static struct policyqueue *
-match_addrselectpolicy(struct sockaddr *addr, struct policyhead *head)
-{
-#ifdef INET6
-	struct policyqueue *ent, *bestent = NULL;
-	struct in6_addrpolicy *pol;
-	int matchlen, bestmatchlen = -1;
-	u_char *mp, *ep, *k, *p, m;
-	struct sockaddr_in6 key;
-
-	switch(addr->sa_family) {
-	case AF_INET6:
-		key = *(struct sockaddr_in6 *)addr;
-		break;
-	case AF_INET:
-		/* convert the address into IPv4-mapped IPv6 address. */
-		memset(&key, 0, sizeof(key));
-		key.sin6_family = AF_INET6;
-		key.sin6_len = sizeof(key);
-		key.sin6_addr.s6_addr[10] = 0xff;
-		key.sin6_addr.s6_addr[11] = 0xff;
-		memcpy(&key.sin6_addr.s6_addr[12],
-		       &((struct sockaddr_in *)addr)->sin_addr, 4);
-		break;
-	default:
-		return(NULL);
-	}
-
-	for (ent = TAILQ_FIRST(head); ent; ent = TAILQ_NEXT(ent, pc_entry)) {
-		pol = &ent->pc_policy;
-		matchlen = 0;
-
-		mp = (u_char *)&pol->addrmask.sin6_addr;
-		ep = mp + 16;	/* XXX: scope field? */
-		k = (u_char *)&key.sin6_addr;
-		p = (u_char *)&pol->addr.sin6_addr;
-		for (; mp < ep && *mp; mp++, k++, p++) {
-			m = *mp;
-			if ((*k & m) != *p)
-				goto next; /* not match */
-			if (m == 0xff) /* short cut for a typical case */
-				matchlen += 8;
-			else {
-				while (m >= 0x80) {
-					matchlen++;
-					m <<= 1;
-				}
-			}
-		}
-
-		/* matched.  check if this is better than the current best. */
-		if (matchlen > bestmatchlen) {
-			bestent = ent;
-			bestmatchlen = matchlen;
-		}
-
-	  next:
-		continue;
-	}
-
-	return(bestent);
-#else
-	return(NULL);
-#endif
-
-}
-
-static void
-set_source(struct hp_order *aio, struct policyhead *ph)
-{
-	struct sockaddr_storage ss = aio->aio_un.aiou_ss;
-	socklen_t srclen;
-	int s;
-
-	/* set unspec ("no source is available"), just in case */
-	aio->aio_srcsa.sa_family = AF_UNSPEC;
-	aio->aio_srcscope = -1;
-
-	switch(ss.ss_family) {
-	case AF_INET:
-		((struct sockaddr_in *)&ss)->sin_port = htons(1);
-		break;
-#ifdef INET6
-	case AF_INET6:
-		((struct sockaddr_in6 *)&ss)->sin6_port = htons(1);
-		break;
-#endif
-	default:		/* ignore unsupported AFs explicitly */
-		return;
-	}
-
-	/* open a socket to get the source address for the given dst */
-	if ((s = _socket(ss.ss_family, SOCK_DGRAM | SOCK_CLOEXEC,
-	    IPPROTO_UDP)) < 0)
-		return;		/* give up */
-	if (_connect(s, (struct sockaddr *)&ss, ss.ss_len) < 0)
-		goto cleanup;
-	srclen = ss.ss_len;
-	if (_getsockname(s, &aio->aio_srcsa, &srclen) < 0) {
-		aio->aio_srcsa.sa_family = AF_UNSPEC;
-		goto cleanup;
-	}
-	aio->aio_srcscope = gai_addr2scopetype(&aio->aio_srcsa);
-	aio->aio_srcpolicy = match_addrselectpolicy(&aio->aio_srcsa, ph);
-	aio->aio_matchlen = matchlen(&aio->aio_srcsa, (struct sockaddr *)&ss);
-#ifdef INET6
-	if (ss.ss_family == AF_INET6) {
-		struct in6_ifreq ifr6;
-		uint32_t flags6;
-
-		memset(&ifr6, 0, sizeof(ifr6));
-		memcpy(&ifr6.ifr_addr, &ss, ss.ss_len);
-		if (_ioctl(s, SIOCGIFAFLAG_IN6, &ifr6) == 0) {
-			flags6 = ifr6.ifr_ifru.ifru_flags6;
-			if ((flags6 & IN6_IFF_DEPRECATED))
-				aio->aio_srcflag |= AIO_SRCFLAG_DEPRECATED;
-		}
-	}
-#endif
-
-  cleanup:
-	_close(s);
-	return;
-}
-
-static int
-matchlen(struct sockaddr *src, struct sockaddr *dst)
-{
-	int match = 0;
-	u_char *s, *d;
-	u_char *lim, r;
-	int addrlen;
-
-	switch (src->sa_family) {
-#ifdef INET6
-	case AF_INET6:
-		s = (u_char *)&((struct sockaddr_in6 *)src)->sin6_addr;
-		d = (u_char *)&((struct sockaddr_in6 *)dst)->sin6_addr;
-		addrlen = sizeof(struct in6_addr);
-		lim = s + addrlen;
-		break;
-#endif
-	case AF_INET:
-		s = (u_char *)&((struct sockaddr_in *)src)->sin_addr;
-		d = (u_char *)&((struct sockaddr_in *)dst)->sin_addr;
-		addrlen = sizeof(struct in_addr);
-		lim = s + addrlen;
-		break;
-	default:
-		return(0);
-	}
-
-	while (s < lim)
-		if ((r = (*d++ ^ *s++)) != 0) {
-			while (r < addrlen * 8) {
-				match++;
-				r <<= 1;
-			}
-			break;
-		} else
-			match += 8;
-	return(match);
-}
-
-static int
-comp_dst(const void *arg1, const void *arg2)
-{
-	const struct hp_order *dst1 = arg1, *dst2 = arg2;
-
-	/*
-	 * Rule 1: Avoid unusable destinations.
-	 * XXX: we currently do not consider if an appropriate route exists.
-	 */
-	if (dst1->aio_srcsa.sa_family != AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family == AF_UNSPEC) {
-		return(-1);
-	}
-	if (dst1->aio_srcsa.sa_family == AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family != AF_UNSPEC) {
-		return(1);
-	}
-
-	/* Rule 2: Prefer matching scope. */
-	if (dst1->aio_dstscope == dst1->aio_srcscope &&
-	    dst2->aio_dstscope != dst2->aio_srcscope) {
-		return(-1);
-	}
-	if (dst1->aio_dstscope != dst1->aio_srcscope &&
-	    dst2->aio_dstscope == dst2->aio_srcscope) {
-		return(1);
-	}
-
-	/* Rule 3: Avoid deprecated addresses. */
-	if (dst1->aio_srcsa.sa_family != AF_UNSPEC &&
-	    dst2->aio_srcsa.sa_family != AF_UNSPEC) {
-		if (!(dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) &&
-		    (dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) {
-			return(-1);
-		}
-		if ((dst1->aio_srcflag & AIO_SRCFLAG_DEPRECATED) &&
-		    !(dst2->aio_srcflag & AIO_SRCFLAG_DEPRECATED)) {
-			return(1);
-		}
-	}
-
-	/* Rule 4: Prefer home addresses. */
-	/* XXX: not implemented yet */
-
-	/* Rule 5: Prefer matching label. */
-#ifdef INET6
-	if (dst1->aio_srcpolicy && dst1->aio_dstpolicy &&
-	    dst1->aio_srcpolicy->pc_policy.label ==
-	    dst1->aio_dstpolicy->pc_policy.label &&
-	    (dst2->aio_srcpolicy == NULL || dst2->aio_dstpolicy == NULL ||
-	     dst2->aio_srcpolicy->pc_policy.label !=
-	     dst2->aio_dstpolicy->pc_policy.label)) {
-		return(-1);
-	}
-	if (dst2->aio_srcpolicy && dst2->aio_dstpolicy &&
-	    dst2->aio_srcpolicy->pc_policy.label ==
-	    dst2->aio_dstpolicy->pc_policy.label &&
-	    (dst1->aio_srcpolicy == NULL || dst1->aio_dstpolicy == NULL ||
-	     dst1->aio_srcpolicy->pc_policy.label !=
-	     dst1->aio_dstpolicy->pc_policy.label)) {
-		return(1);
-	}
-#endif
-
-	/* Rule 6: Prefer higher precedence. */
-#ifdef INET6
-	if (dst1->aio_dstpolicy &&
-	    (dst2->aio_dstpolicy == NULL ||
-	     dst1->aio_dstpolicy->pc_policy.preced >
-	     dst2->aio_dstpolicy->pc_policy.preced)) {
-		return(-1);
-	}
-	if (dst2->aio_dstpolicy &&
-	    (dst1->aio_dstpolicy == NULL ||
-	     dst2->aio_dstpolicy->pc_policy.preced >
-	     dst1->aio_dstpolicy->pc_policy.preced)) {
-		return(1);
-	}
-#endif
-
-	/* Rule 7: Prefer native transport. */
-	/* XXX: not implemented yet */
-
-	/* Rule 8: Prefer smaller scope. */
-	if (dst1->aio_dstscope >= 0 &&
-	    dst1->aio_dstscope < dst2->aio_dstscope) {
-		return(-1);
-	}
-	if (dst2->aio_dstscope >= 0 &&
-	    dst2->aio_dstscope < dst1->aio_dstscope) {
-		return(1);
-	}
-
-	/*
-	 * Rule 9: Use longest matching prefix.
-	 * We compare the match length in a same AF only.
-	 */
-	if (dst1->aio_sa.sa_family == dst2->aio_sa.sa_family) {
-		if (dst1->aio_matchlen > dst2->aio_matchlen) {
-			return(-1);
-		}
-		if (dst1->aio_matchlen < dst2->aio_matchlen) {
-			return(1);
-		}
-	}
-
-	/* Rule 10: Otherwise, leave the order unchanged. */
-	return(-1);
-}
-
-/*
- * Copy from scope.c.
- * XXX: we should standardize the functions and link them as standard
- * library.
- */
-static int
-gai_addr2scopetype(struct sockaddr *sa)
-{
-#ifdef INET6
-	struct sockaddr_in6 *sa6;
-#endif
-	struct sockaddr_in *sa4;
-
-	switch(sa->sa_family) {
-#ifdef INET6
-	case AF_INET6:
-		sa6 = (struct sockaddr_in6 *)sa;
-		if (IN6_IS_ADDR_MULTICAST(&sa6->sin6_addr)) {
-			/* just use the scope field of the multicast address */
-			return(sa6->sin6_addr.s6_addr[2] & 0x0f);
-		}
-		/*
-		 * Unicast addresses: map scope type to corresponding scope
-		 * value defined for multcast addresses.
-		 * XXX: hardcoded scope type values are bad...
-		 */
-		if (IN6_IS_ADDR_LOOPBACK(&sa6->sin6_addr))
-			return(1); /* node local scope */
-		if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr))
-			return(2); /* link-local scope */
-		if (IN6_IS_ADDR_SITELOCAL(&sa6->sin6_addr))
-			return(5); /* site-local scope */
-		return(14);	/* global scope */
-		break;
-#endif
-	case AF_INET:
-		/*
-		 * IPv4 pseudo scoping according to RFC 3484.
-		 */
-		sa4 = (struct sockaddr_in *)sa;
-		/* IPv4 autoconfiguration addresses have link-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 169 &&
-		    ((u_char *)&sa4->sin_addr)[1] == 254)
-			return(2);
-		/* Private addresses have site-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 10 ||
-		    (((u_char *)&sa4->sin_addr)[0] == 172 &&
-		     (((u_char *)&sa4->sin_addr)[1] & 0xf0) == 16) ||
-		    (((u_char *)&sa4->sin_addr)[0] == 192 &&
-		     ((u_char *)&sa4->sin_addr)[1] == 168))
-			return(14);	/* XXX: It should be 5 unless NAT */
-		/* Loopback addresses have link-local scope. */
-		if (((u_char *)&sa4->sin_addr)[0] == 127)
-			return(2);
-		return(14);
-		break;
-	default:
-		errno = EAFNOSUPPORT; /* is this a good error? */
-		return(-1);
-	}
-}
-#endif
diff --git a/lib/libc_bsd/net/netdb_private.h b/lib/libc_bsd/net/netdb_private.h
deleted file mode 100644
index 6d00bc4..0000000
--- a/lib/libc_bsd/net/netdb_private.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * Copyright (C) 2005 The FreeBSD Project.  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.
- *
- * 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 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/net/netdb_private.h 158477 2006-05-12 15:37:23Z ume $
- */
-
-#ifndef _NETDB_PRIVATE_H_
-#define _NETDB_PRIVATE_H_
-
-#include <stdio.h>				/* XXX: for FILE */
-
-#define	NETDB_THREAD_ALLOC(name)					\
-static struct name name;						\
-static thread_key_t name##_key;						\
-static once_t name##_init_once = ONCE_INITIALIZER;			\
-static int name##_thr_keycreated = 0;					\
-\
-static void name##_free(void *);					\
-\
-static void								\
-name##_keycreate(void)							\
-{									\
-	name##_thr_keycreated =						\
-	    (thr_keycreate(&name##_key, name##_free) == 0);		\
-}									\
-\
-struct name *								\
-__##name##_init(void)							\
-{									\
-	struct name *he;						\
-									\
-	if (thr_main() != 0)						\
-		return (&name);						\
-	if (thr_once(&name##_init_once, name##_keycreate) != 0 ||	\
-	    !name##_thr_keycreated)					\
-		return (NULL);						\
-	if ((he = thr_getspecific(name##_key)) != NULL)			\
-		return (he);						\
-	if ((he = calloc(1, sizeof(*he))) == NULL)			\
-		return (NULL);						\
-	if (thr_setspecific(name##_key, he) == 0)			\
-		return (he);						\
-	free(he);							\
-	return (NULL);							\
-}
-
-#define	_MAXALIASES	35
-#define	_MAXLINELEN	1024
-#define	_MAXADDRS	35
-#define	_HOSTBUFSIZE	(8 * 1024)
-#define	_NETBUFSIZE	1025
-
-struct hostent_data {
-	uint32_t host_addr[4];			/* IPv4 or IPv6 */
-	char *h_addr_ptrs[_MAXADDRS + 1];
-	char *host_aliases[_MAXALIASES];
-	char hostbuf[_HOSTBUFSIZE];
-	FILE *hostf;
-	int stayopen;
-#ifdef YP
-	char *yp_domain;
-#endif
-};
-
-struct netent_data {
-	char *net_aliases[_MAXALIASES];
-	char netbuf[_NETBUFSIZE];
-	FILE *netf;
-	int stayopen;
-#ifdef YP
-	char *yp_domain;
-#endif
-};
-
-struct protoent_data {
-	FILE *fp;
-	char *aliases[_MAXALIASES];
-	int stayopen;
-	char line[_MAXLINELEN + 1];
-};
-
-struct hostdata {
-	struct hostent host;
-	char data[sizeof(struct hostent_data)];
-};
-
-struct netdata {
-	struct netent net;
-	char data[sizeof(struct netent_data)];
-};
-
-struct protodata {
-	struct protoent proto;
-	char data[sizeof(struct protoent_data)];
-};
-
-struct hostdata *__hostdata_init(void);
-struct hostent *__hostent_init(void);
-struct hostent_data *__hostent_data_init(void);
-struct netdata *__netdata_init(void);
-struct netent_data *__netent_data_init(void);
-struct protodata *__protodata_init(void);
-struct protoent_data *__protoent_data_init(void);
-int __copy_hostent(struct hostent *, struct hostent *, char *, size_t);
-int __copy_netent(struct netent *, struct netent *, char *, size_t);
-int __copy_protoent(struct protoent *, struct protoent *, char *, size_t);
-
-void __endprotoent_p(struct protoent_data *);
-int __getprotoent_p(struct protoent *, struct protoent_data *);
-void __setprotoent_p(int, struct protoent_data *);
-void _endhostdnsent(void);
-void _endhosthtent(struct hostent_data *);
-void _endnetdnsent(void);
-void _endnethtent(struct netent_data *);
-struct hostent *_gethostbynisaddr(const void *, socklen_t, int);
-struct hostent *_gethostbynisname(const char *, int);
-void _map_v4v6_address(const char *, char *);
-void _map_v4v6_hostent(struct hostent *, char **, char *);
-void _sethostdnsent(int);
-void _sethosthtent(int, struct hostent_data *);
-void _setnetdnsent(int);
-void _setnethtent(int, struct netent_data *);
-
-#endif /* _NETDB_PRIVATE_H_ */
diff --git a/lib/libc_bsd/net/nscache.c b/lib/libc_bsd/net/nscache.c
deleted file mode 100644
index 83c23a9..0000000
--- a/lib/libc_bsd/net/nscache.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/*-
- * Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/nscache.c 172730 2007-10-17 23:20:49Z tmclaugh $");
-
-#include "namespace.h"
-#include <nsswitch.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "nscachedcli.h"
-#include "nscache.h"
-
-#define NSS_CACHE_KEY_INITIAL_SIZE	(256)
-#define NSS_CACHE_KEY_SIZE_LIMIT	(NSS_CACHE_KEY_INITIAL_SIZE << 4)
-
-#define NSS_CACHE_BUFFER_INITIAL_SIZE	(1024)
-#define NSS_CACHE_BUFFER_SIZE_LIMIT	(NSS_CACHE_BUFFER_INITIAL_SIZE << 8)
-
-#define CACHED_SOCKET_PATH 		"/var/run/nscd"
-
-int
-__nss_cache_handler(void *retval, void *mdata, va_list ap)
-{
-	return (NS_UNAVAIL);
-}
-
-int
-__nss_common_cache_read(void *retval, void *mdata, va_list ap)
-{
-	struct cached_connection_params params;
-	cached_connection connection;
-
-	char *buffer;
-	size_t buffer_size, size;
-
-	nss_cache_info const *cache_info;
-	nss_cache_data *cache_data;
-	va_list ap_new;
-	int res;
-
-	cache_data = (nss_cache_data *)mdata;
-	cache_info = cache_data->info;
-
-	memset(&params, 0, sizeof(struct cached_connection_params));
-	params.socket_path = CACHED_SOCKET_PATH;
-
-	cache_data->key = (char *)malloc(NSS_CACHE_KEY_INITIAL_SIZE);
-	memset(cache_data->key, 0, NSS_CACHE_KEY_INITIAL_SIZE);
-	cache_data->key_size = NSS_CACHE_KEY_INITIAL_SIZE;
-	va_copy(ap_new, ap);
-
-	do {
-		size = cache_data->key_size;
-		res = cache_info->id_func(cache_data->key, &size, ap_new,
-		    cache_info->mdata);
-		va_end(ap_new);
-		if (res == NS_RETURN) {
-			if (cache_data->key_size > NSS_CACHE_KEY_SIZE_LIMIT)
-				break;
-
-			cache_data->key_size <<= 1;
-			cache_data->key = realloc(cache_data->key,
-			    cache_data->key_size);
-			memset(cache_data->key, 0, cache_data->key_size);
-			va_copy(ap_new, ap);
-		}
-	} while (res == NS_RETURN);
-
-	if (res != NS_SUCCESS) {
-		free(cache_data->key);
-		cache_data->key = NULL;
-		cache_data->key_size = 0;
-		return (res);
-	} else
-		cache_data->key_size = size;
-
-	buffer_size = NSS_CACHE_BUFFER_INITIAL_SIZE;
-	buffer = (char *)malloc(NSS_CACHE_BUFFER_INITIAL_SIZE);
-	memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE);
-
-	do {
-		connection = __open_cached_connection(&params);
-		if (connection == NULL) {
-			res = -1;
-			break;
-		}
-		res = __cached_read(connection, cache_info->entry_name,
-		    cache_data->key, cache_data->key_size, buffer,
-		    &buffer_size);
-		__close_cached_connection(connection);
-		if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) {
-			buffer = (char *)realloc(buffer, buffer_size);
-			memset(buffer, 0, buffer_size);
-		}
-	} while (res == -2);
-
-	if (res == 0) {
-		if (buffer_size == 0) {
-			free(buffer);
-			free(cache_data->key);
-			cache_data->key = NULL;
-			cache_data->key_size = 0;
-			return (NS_RETURN);
-		}
-
-		va_copy(ap_new, ap);
-		res = cache_info->unmarshal_func(buffer, buffer_size, retval,
-		    ap_new, cache_info->mdata);
-		va_end(ap_new);
-
-		if (res != NS_SUCCESS) {
-			free(buffer);
-			free(cache_data->key);
-			cache_data->key = NULL;
-			cache_data->key_size = 0;
-			return (res);
-		} else
-			res = 0;
-	}
-
-	if (res == 0) {
-		free(cache_data->key);
-		cache_data->key = NULL;
-		cache_data->key_size = 0;
-	}
-
-	free(buffer);
-	return (res == 0 ? NS_SUCCESS : NS_NOTFOUND);
-}
-
-int
-__nss_common_cache_write(void *retval, void *mdata, va_list ap)
-{
-	struct cached_connection_params params;
-	cached_connection connection;
-
-	char *buffer;
-	size_t buffer_size;
-
-	nss_cache_info const *cache_info;
-	nss_cache_data *cache_data;
-	va_list ap_new;
-	int res;
-
-	cache_data = (nss_cache_data *)mdata;
-	cache_info = cache_data->info;
-
-	if (cache_data->key == NULL)
-		return (NS_UNAVAIL);
-
-	memset(&params, 0, sizeof(struct cached_connection_params));
-	params.socket_path = CACHED_SOCKET_PATH;
-
-	connection = __open_cached_connection(&params);
-	if (connection == NULL) {
-		free(cache_data->key);
-		return (NS_UNAVAIL);
-	}
-
-	buffer_size = NSS_CACHE_BUFFER_INITIAL_SIZE;
-	buffer = (char *)malloc(NSS_CACHE_BUFFER_INITIAL_SIZE);
-	memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE);
-
-	do {
-		size_t size;
-
-		size = buffer_size;
-		va_copy(ap_new, ap);
-		res = cache_info->marshal_func(buffer, &size, retval, ap_new,
-		    cache_info->mdata);
-		va_end(ap_new);
-
-		if (res == NS_RETURN) {
-			if (buffer_size > NSS_CACHE_BUFFER_SIZE_LIMIT)
-				break;
-
-			buffer_size <<= 1;
-			buffer = (char *)realloc(buffer, buffer_size);
-			memset(buffer, 0, buffer_size);
-		}
-	} while (res == NS_RETURN);
-
-	if (res != NS_SUCCESS) {
-		__close_cached_connection(connection);
-		free(cache_data->key);
-		free(buffer);
-		return (res);
-	}
-
-	res = __cached_write(connection, cache_info->entry_name,
-	    cache_data->key, cache_data->key_size, buffer, buffer_size);
-	__close_cached_connection(connection);
-
-	free(cache_data->key);
-	free(buffer);
-
-	return (res == 0 ? NS_SUCCESS : NS_UNAVAIL);
-}
-
-int
-__nss_common_cache_write_negative(void *mdata)
-{
-	struct cached_connection_params params;
-	cached_connection connection;
-	int res;
-
-	nss_cache_info const *cache_info;
-	nss_cache_data *cache_data;
-
-	cache_data = (nss_cache_data *)mdata;
-	cache_info = cache_data->info;
-
-	if (cache_data->key == NULL)
-		return (NS_UNAVAIL);
-
-	memset(&params, 0, sizeof(struct cached_connection_params));
-	params.socket_path = CACHED_SOCKET_PATH;
-
-	connection = __open_cached_connection(&params);
-	if (connection == NULL) {
-		free(cache_data->key);
-		return (NS_UNAVAIL);
-	}
-
-	res = __cached_write(connection, cache_info->entry_name,
-	    cache_data->key, cache_data->key_size, NULL, 0);
-	__close_cached_connection(connection);
-
-	free(cache_data->key);
-	return (res == 0 ? NS_SUCCESS : NS_UNAVAIL);
-}
-
-int
-__nss_mp_cache_read(void *retval, void *mdata, va_list ap)
-{
-	struct cached_connection_params params;
-	cached_mp_read_session rs;
-
-	char *buffer;
-	size_t buffer_size;
-
-	nss_cache_info const *cache_info;
-	nss_cache_data *cache_data;
-	va_list ap_new;
-	int res;
-
-	cache_data = (nss_cache_data *)mdata;
-	cache_info = cache_data->info;
-
-	if (cache_info->get_mp_ws_func() != INVALID_CACHED_MP_WRITE_SESSION)
-		return (NS_UNAVAIL);
-
-	rs = cache_info->get_mp_rs_func();
-	if (rs == INVALID_CACHED_MP_READ_SESSION) {
-		memset(&params, 0, sizeof(struct cached_connection_params));
-		params.socket_path = CACHED_SOCKET_PATH;
-
-		rs = __open_cached_mp_read_session(&params,
-		    cache_info->entry_name);
-		if (rs == INVALID_CACHED_MP_READ_SESSION)
-			return (NS_UNAVAIL);
-
-		cache_info->set_mp_rs_func(rs);
-	}
-
-	buffer_size = NSS_CACHE_BUFFER_INITIAL_SIZE;
-	buffer = (char *)malloc(NSS_CACHE_BUFFER_INITIAL_SIZE);
-	memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE);
-
-	do {
-		res = __cached_mp_read(rs, buffer, &buffer_size);
-		if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) {
-			buffer = (char *)realloc(buffer, buffer_size);
-			memset(buffer, 0, buffer_size);
-		}
-	} while (res == -2);
-
-	if (res == 0) {
-		va_copy(ap_new, ap);
-		res = cache_info->unmarshal_func(buffer, buffer_size, retval,
-		    ap_new, cache_info->mdata);
-		va_end(ap_new);
-
-		if (res != NS_SUCCESS) {
-			free(buffer);
-			return (res);
-		} else
-			res = 0;
-	} else {
-		free(buffer);
-		__close_cached_mp_read_session(rs);
-		rs = INVALID_CACHED_MP_READ_SESSION;
-		cache_info->set_mp_rs_func(rs);
-		return (res == -1 ? NS_RETURN : NS_UNAVAIL);
-	}
-
-	free(buffer);
-	return (res == 0 ? NS_SUCCESS : NS_NOTFOUND);
-}
-
-int
-__nss_mp_cache_write(void *retval, void *mdata, va_list ap)
-{
-	struct cached_connection_params params;
-	cached_mp_write_session ws;
-
-	char *buffer;
-	size_t buffer_size;
-
-	nss_cache_info const *cache_info;
-	nss_cache_data *cache_data;
-	va_list ap_new;
-	int res;
-
-	cache_data = (nss_cache_data *)mdata;
-	cache_info = cache_data->info;
-
-	ws = cache_info->get_mp_ws_func();
-	if (ws == INVALID_CACHED_MP_WRITE_SESSION) {
-		memset(&params, 0, sizeof(struct cached_connection_params));
-		params.socket_path = CACHED_SOCKET_PATH;
-
-		ws = __open_cached_mp_write_session(&params,
-		    cache_info->entry_name);
-		if (ws == INVALID_CACHED_MP_WRITE_SESSION)
-			return (NS_UNAVAIL);
-
-		cache_info->set_mp_ws_func(ws);
-	}
-
-	buffer_size = NSS_CACHE_BUFFER_INITIAL_SIZE;
-	buffer = (char *)malloc(NSS_CACHE_BUFFER_INITIAL_SIZE);
-	memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE);
-
-	do {
-		size_t size;
-
-		size = buffer_size;
-		va_copy(ap_new, ap);
-		res = cache_info->marshal_func(buffer, &size, retval, ap_new,
-		    cache_info->mdata);
-		va_end(ap_new);
-
-		if (res == NS_RETURN) {
-			if (buffer_size > NSS_CACHE_BUFFER_SIZE_LIMIT)
-				break;
-
-			buffer_size <<= 1;
-			buffer = (char *)realloc(buffer, buffer_size);
-			memset(buffer, 0, buffer_size);
-		}
-	} while (res == NS_RETURN);
-
-	if (res != NS_SUCCESS) {
-		free(buffer);
-		return (res);
-	}
-
-	res = __cached_mp_write(ws, buffer, buffer_size);
-
-	free(buffer);
-	return (res == 0 ? NS_SUCCESS : NS_UNAVAIL);
-}
-
-int
-__nss_mp_cache_write_submit(void *retval, void *mdata, va_list ap)
-{
-	cached_mp_write_session ws;
-
-	nss_cache_info const *cache_info;
-	nss_cache_data *cache_data;
-
-	cache_data = (nss_cache_data *)mdata;
-	cache_info = cache_data->info;
-
-	ws = cache_info->get_mp_ws_func();
-	if (ws != INVALID_CACHED_MP_WRITE_SESSION) {
-		__close_cached_mp_write_session(ws);
-		ws = INVALID_CACHED_MP_WRITE_SESSION;
-		cache_info->set_mp_ws_func(ws);
-	}
-	return (NS_UNAVAIL);
-}
-
-int
-__nss_mp_cache_end(void *retval, void *mdata, va_list ap)
-{
-	cached_mp_write_session ws;
-	cached_mp_read_session rs;
-
-	nss_cache_info const *cache_info;
-	nss_cache_data *cache_data;
-
-	cache_data = (nss_cache_data *)mdata;
-	cache_info = cache_data->info;
-
-	ws = cache_info->get_mp_ws_func();
-	if (ws != INVALID_CACHED_MP_WRITE_SESSION) {
-		__abandon_cached_mp_write_session(ws);
-		ws = INVALID_CACHED_MP_WRITE_SESSION;
-		cache_info->set_mp_ws_func(ws);
-	}
-
-	rs = cache_info->get_mp_rs_func();
-	if (rs != INVALID_CACHED_MP_READ_SESSION) {
-		__close_cached_mp_read_session(rs);
-		rs = INVALID_CACHED_MP_READ_SESSION;
-		cache_info->set_mp_rs_func(rs);
-	}
-
-	return (NS_UNAVAIL);
-}
diff --git a/lib/libc_bsd/net/nscachedcli.c b/lib/libc_bsd/net/nscachedcli.c
deleted file mode 100644
index b4aea81..0000000
--- a/lib/libc_bsd/net/nscachedcli.c
+++ /dev/null
@@ -1,577 +0,0 @@
-/*-
- * Copyright (c) 2005 Michael Bushkov <bushman@rsu.ru>
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/nscachedcli.c 255328 2013-09-06 21:02:06Z jilles $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/event.h>
-#include <sys/uio.h>
-#include <sys/un.h>
-#include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "nscachedcli.h"
-
-#define NS_DEFAULT_CACHED_IO_TIMEOUT	4
-
-static int safe_write(struct cached_connection_ *, const void *, size_t);
-static int safe_read(struct cached_connection_ *, void *, size_t);
-static int send_credentials(struct cached_connection_ *, int);
-
-/*
- * safe_write writes data to the specified connection and tries to do it in
- * the very safe manner. We ensure, that we can write to the socket with
- * kevent. If the data_size can't be sent in one piece, then it would be
- * splitted.
- */
-static int
-safe_write(struct cached_connection_ *connection, const void *data,
-    size_t data_size)
-{
-	struct kevent eventlist;
-	int nevents;
-	size_t result;
-	ssize_t s_result;
-	struct timespec timeout;
-
-	if (data_size == 0)
-		return (0);
-
-	timeout.tv_sec = NS_DEFAULT_CACHED_IO_TIMEOUT;
-	timeout.tv_nsec = 0;
-	result = 0;
-	do {
-		nevents = _kevent(connection->write_queue, NULL, 0, &eventlist,
-		    1, &timeout);
-		if ((nevents == 1) && (eventlist.filter == EVFILT_WRITE)) {
-			s_result = _sendto(connection->sockfd, data + result,
-			    eventlist.data < data_size - result ?
-			    eventlist.data : data_size - result, MSG_NOSIGNAL,
-			    NULL, 0);
-			if (s_result == -1)
-				return (-1);
-			else
-				result += s_result;
-
-			if (eventlist.flags & EV_EOF)
-				return (result < data_size ? -1 : 0);
-		} else
-			return (-1);
-	} while (result < data_size);
-
-	return (0);
-}
-
-/*
- * safe_read reads data from connection and tries to do it in the very safe
- * and stable way. It uses kevent to ensure, that the data are availabe for
- * reading. If the amount of data to be read is too large, then they would
- * be splitted.
- */
-static int
-safe_read(struct cached_connection_ *connection, void *data, size_t data_size)
-{
-	struct kevent eventlist;
-	size_t result;
-	ssize_t s_result;
-	struct timespec timeout;
-	int nevents;
-
-	if (data_size == 0)
-		return (0);
-
-	timeout.tv_sec = NS_DEFAULT_CACHED_IO_TIMEOUT;
-	timeout.tv_nsec = 0;
-	result = 0;
-	do {
-		nevents = _kevent(connection->read_queue, NULL, 0, &eventlist,
-		    1, &timeout);
-		if (nevents == 1 && eventlist.filter == EVFILT_READ) {
-			s_result = _read(connection->sockfd, data + result,
-			    eventlist.data <= data_size - result ?
-			    eventlist.data : data_size - result);
-			if (s_result == -1)
-				return (-1);
-			else
-				result += s_result;
-
-			if (eventlist.flags & EV_EOF)
-				return (result < data_size ? -1 : 0);
-		} else
-			return (-1);
-	} while (result < data_size);
-
-	return (0);
-}
-
-/*
- * Sends the credentials information to the connection along with the
- * communication element type.
- */
-static int
-send_credentials(struct cached_connection_ *connection, int type)
-{
-	struct kevent eventlist;
-	int nevents;
-	ssize_t result;
-	int res;
-
-	struct msghdr cred_hdr;
-	struct iovec iov;
-
-	struct {
-		struct cmsghdr hdr;
-		char cred[CMSG_SPACE(sizeof(struct cmsgcred))];
-	} cmsg;
-
-	memset(&cmsg, 0, sizeof(cmsg));
-	cmsg.hdr.cmsg_len =  CMSG_LEN(sizeof(struct cmsgcred));
-	cmsg.hdr.cmsg_level = SOL_SOCKET;
-	cmsg.hdr.cmsg_type = SCM_CREDS;
-
-	memset(&cred_hdr, 0, sizeof(struct msghdr));
-	cred_hdr.msg_iov = &iov;
-	cred_hdr.msg_iovlen = 1;
-	cred_hdr.msg_control = (caddr_t)&cmsg;
-	cred_hdr.msg_controllen = CMSG_SPACE(sizeof(struct cmsgcred));
-
-	iov.iov_base = &type;
-	iov.iov_len = sizeof(int);
-
-	EV_SET(&eventlist, connection->sockfd, EVFILT_WRITE, EV_ADD,
-	    NOTE_LOWAT, sizeof(int), NULL);
-	res = _kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL);
-
-	nevents = _kevent(connection->write_queue, NULL, 0, &eventlist, 1,
-	    NULL);
-	if (nevents == 1 && eventlist.filter == EVFILT_WRITE) {
-		result = (_sendmsg(connection->sockfd, &cred_hdr,
-		    MSG_NOSIGNAL) == -1) ?  -1 : 0;
-		EV_SET(&eventlist, connection->sockfd, EVFILT_WRITE, EV_ADD,
-		    0, 0, NULL);
-		_kevent(connection->write_queue, &eventlist, 1, NULL, 0, NULL);
-		return (result);
-	} else
-		return (-1);
-}
-
-/*
- * Opens the connection with the specified params. Initializes all kqueues.
- */
-struct cached_connection_ *
-__open_cached_connection(struct cached_connection_params const *params)
-{
-	struct cached_connection_ *retval;
-	struct kevent eventlist;
-	struct sockaddr_un client_address;
-	int client_address_len, client_socket;
-	int res;
-
-	assert(params != NULL);
-
-	client_socket = _socket(PF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);
-	client_address.sun_family = PF_LOCAL;
-	strncpy(client_address.sun_path, params->socket_path,
-	    sizeof(client_address.sun_path));
-	client_address_len = sizeof(client_address.sun_family) +
-	    strlen(client_address.sun_path) + 1;
-
-	res = _connect(client_socket, (struct sockaddr *)&client_address,
-	    client_address_len);
-	if (res == -1) {
-		_close(client_socket);
-		return (NULL);
-	}
-	_fcntl(client_socket, F_SETFL, O_NONBLOCK);
-
-	retval = malloc(sizeof(struct cached_connection_));
-	assert(retval != NULL);
-	memset(retval, 0, sizeof(struct cached_connection_));
-
-	retval->sockfd = client_socket;
-
-	retval->write_queue = kqueue();
-	assert(retval->write_queue != -1);
-
-	EV_SET(&eventlist, retval->sockfd, EVFILT_WRITE, EV_ADD, 0, 0, NULL);
-	res = _kevent(retval->write_queue, &eventlist, 1, NULL, 0, NULL);
-
-	retval->read_queue = kqueue();
-	assert(retval->read_queue != -1);
-
-	EV_SET(&eventlist, retval->sockfd, EVFILT_READ, EV_ADD, 0, 0, NULL);
-	res = _kevent(retval->read_queue, &eventlist, 1, NULL, 0, NULL);
-
-	return (retval);
-}
-
-void
-__close_cached_connection(struct cached_connection_ *connection)
-{
-	assert(connection != NULL);
-
-	_close(connection->sockfd);
-	_close(connection->read_queue);
-	_close(connection->write_queue);
-	free(connection);
-}
-
-/*
- * This function is very close to the cache_write function of the caching
- * library, which is used in the caching daemon. It caches the data with the
- * specified key in the cache entry with entry_name.
- */
-int
-__cached_write(struct cached_connection_ *connection, const char *entry_name,
-    const char *key, size_t key_size, const char *data, size_t data_size)
-{
-	size_t name_size;
-	int error_code;
-	int result;
-
-	error_code = -1;
-	result = 0;
-	result = send_credentials(connection, CET_WRITE_REQUEST);
-	if (result != 0)
-		goto fin;
-
-	name_size = strlen(entry_name);
-	result = safe_write(connection, &name_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, &key_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, &data_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, entry_name, name_size);
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, key, key_size);
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, data, data_size);
-	if (result != 0)
-		goto fin;
-
-	result = safe_read(connection, &error_code, sizeof(int));
-	if (result != 0)
-		error_code = -1;
-
-fin:
-	return (error_code);
-}
-
-/*
- * This function is very close to the cache_read function of the caching
- * library, which is used in the caching daemon. It reads cached data with the
- * specified key from the cache entry with entry_name.
- */
-int
-__cached_read(struct cached_connection_ *connection, const char *entry_name,
-    const char *key, size_t key_size, char *data, size_t *data_size)
-{
-	size_t name_size, result_size;
-	int error_code, rec_error_code;
-	int result;
-
-	assert(connection != NULL);
-	result = 0;
-	error_code = -1;
-
-	result = send_credentials(connection, CET_READ_REQUEST);
-	if (result != 0)
-		goto fin;
-
-	name_size = strlen(entry_name);
-	result = safe_write(connection, &name_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, &key_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, entry_name, name_size);
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, key, key_size);
-	if (result != 0)
-		goto fin;
-
-	result = safe_read(connection, &rec_error_code, sizeof(int));
-	if (result != 0)
-		goto fin;
-
-	if (rec_error_code != 0) {
-		error_code = rec_error_code;
-		goto fin;
-	}
-
-	result = safe_read(connection, &result_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	 if (result_size > *data_size) {
-		 *data_size = result_size;
-		 error_code = -2;
-		 goto fin;
-	 }
-
-	result = safe_read(connection, data, result_size);
-	if (result != 0)
-		goto fin;
-
-	*data_size = result_size;
-	error_code = 0;
-
-fin:
-	return (error_code);
-}
-
-/*
- * Initializes the mp_write_session. For such a session the new connection
- * would be opened. The data should be written to the session with
- * __cached_mp_write function. The __close_cached_mp_write_session function
- * should be used to submit session and __abandon_cached_mp_write_session - to
- * abandon it. When the session is submitted, the whole se
- */
-struct cached_connection_ *
-__open_cached_mp_write_session(struct cached_connection_params const *params,
-    const char *entry_name)
-{
-	struct cached_connection_ *connection, *retval;
-	size_t name_size;
-	int error_code;
-	int result;
-
-	retval = NULL;
-	connection = __open_cached_connection(params);
-	if (connection == NULL)
-		return (NULL);
-	connection->mp_flag = 1;
-
-	result = send_credentials(connection, CET_MP_WRITE_SESSION_REQUEST);
-	if (result != 0)
-		goto fin;
-
-	name_size = strlen(entry_name);
-	result = safe_write(connection, &name_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, entry_name, name_size);
-	if (result != 0)
-		goto fin;
-
-	result = safe_read(connection, &error_code, sizeof(int));
-	if (result != 0)
-		goto fin;
-
-	if (error_code != 0)
-		result = error_code;
-
-fin:
-	if (result != 0)
-		__close_cached_connection(connection);
-	else
-		retval = connection;
-	return (retval);
-}
-
-/*
- * Adds new portion of data to the opened write session
- */
-int
-__cached_mp_write(struct cached_connection_ *ws, const char *data,
-    size_t data_size)
-{
-	int request, result;
-	int error_code;
-
-	error_code = -1;
-
-	request = CET_MP_WRITE_SESSION_WRITE_REQUEST;
-	result = safe_write(ws, &request, sizeof(int));
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(ws, &data_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(ws, data, data_size);
-	if (result != 0)
-		goto fin;
-
-	result = safe_read(ws, &error_code, sizeof(int));
-	if (result != 0)
-		error_code = -1;
-
-fin:
-	return (error_code);
-}
-
-/*
- * Abandons all operations with the write session. All data, that were written
- * to the session before, are discarded.
- */
-int
-__abandon_cached_mp_write_session(struct cached_connection_ *ws)
-{
-	int notification;
-	int result;
-
-	notification = CET_MP_WRITE_SESSION_ABANDON_NOTIFICATION;
-	result = safe_write(ws, &notification, sizeof(int));
-	__close_cached_connection(ws);
-	return (result);
-}
-
-/*
- * Gracefully closes the write session. The data, that were previously written
- * to the session, are committed.
- */
-int
-__close_cached_mp_write_session(struct cached_connection_ *ws)
-{
-	int notification;
-	int result;
-
-	notification = CET_MP_WRITE_SESSION_CLOSE_NOTIFICATION;
-	result = safe_write(ws, &notification, sizeof(int));
-	__close_cached_connection(ws);
-	return (0);
-}
-
-struct cached_connection_ *
-__open_cached_mp_read_session(struct cached_connection_params const *params,
-	const char *entry_name)
-{
-	struct cached_connection_ *connection, *retval;
-	size_t name_size;
-	int error_code;
-	int result;
-
-	retval = NULL;
-	connection = __open_cached_connection(params);
-	if (connection == NULL)
-		return (NULL);
-	connection->mp_flag = 1;
-
-	result = send_credentials(connection, CET_MP_READ_SESSION_REQUEST);
-	if (result != 0)
-		goto fin;
-
-	name_size = strlen(entry_name);
-	result = safe_write(connection, &name_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	result = safe_write(connection, entry_name, name_size);
-	if (result != 0)
-		goto fin;
-
-	result = safe_read(connection, &error_code, sizeof(int));
-	if (result != 0)
-		goto fin;
-
-	if (error_code != 0)
-		result = error_code;
-
-fin:
-	if (result != 0)
-		__close_cached_connection(connection);
-	else
-		retval = connection;
-	return (retval);
-}
-
-int
-__cached_mp_read(struct cached_connection_ *rs, char *data, size_t *data_size)
-{
-	size_t result_size;
-	int error_code, rec_error_code;
-	int request, result;
-
-	error_code = -1;
-	request = CET_MP_READ_SESSION_READ_REQUEST;
-	result = safe_write(rs, &request, sizeof(int));
-	if (result != 0)
-		goto fin;
-
-	result = safe_read(rs, &rec_error_code, sizeof(int));
-	if (result != 0)
-		goto fin;
-
-	if (rec_error_code != 0) {
-		error_code = rec_error_code;
-		goto fin;
-	}
-
-	result = safe_read(rs, &result_size, sizeof(size_t));
-	if (result != 0)
-		goto fin;
-
-	if (result_size > *data_size) {
-		*data_size = result_size;
-		error_code = -2;
-		goto fin;
-	}
-
-	result = safe_read(rs, data, result_size);
-	if (result != 0)
-		goto fin;
-
-	*data_size = result_size;
-	error_code = 0;
-
-fin:
-	return (error_code);
-}
-
-int
-__close_cached_mp_read_session(struct cached_connection_ *rs)
-{
-
-	__close_cached_connection(rs);
-	return (0);
-}
diff --git a/lib/libc_bsd/net/nsdispatch.3 b/lib/libc_bsd/net/nsdispatch.3
deleted file mode 100644
index 5a9401b..0000000
--- a/lib/libc_bsd/net/nsdispatch.3
+++ /dev/null
@@ -1,258 +0,0 @@
-.\"	$NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $
-.\"
-.\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Luke Mewburn.
-.\"
-.\" 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.
-.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libc/net/nsdispatch.3 235401 2012-05-13 14:28:00Z joel $
-.\"
-.Dd April 4, 2010
-.Dt NSDISPATCH 3
-.Os
-.Sh NAME
-.Nm nsdispatch
-.Nd name-service switch dispatcher routine
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In stdarg.h
-.In nsswitch.h
-.Ft int
-.Fo nsdispatch
-.Fa "void *retval"
-.Fa "const ns_dtab dtab[]"
-.Fa "const char *database"
-.Fa "const char *method_name"
-.Fa "const ns_src defaults[]"
-.Fa "..."
-.Fc
-.Sh DESCRIPTION
-The
-.Fn nsdispatch
-function invokes the methods specified in
-.Va dtab
-in the order given by
-.Xr nsswitch.conf 5
-for the database
-.Va database
-until a successful entry is found.
-.Pp
-.Va retval
-is passed to each method to modify as necessary, to pass back results to
-the caller of
-.Fn nsdispatch .
-.Pp
-Each method has the function signature described by the typedef:
-.Pp
-.Ft typedef int
-.Fn \*(lp*nss_method\*(rp "void *retval" "void *mdata" "va_list *ap" ;
-.Pp
-.Va dtab
-is an array of
-.Va ns_dtab
-structures, which have the following format:
-.Bd -literal -offset indent
-typedef struct _ns_dtab {
-	const char	*src;
-	nss_method	 method;
-	void		*mdata;
-} ns_dtab;
-.Ed
-.Pp
-The
-.Fa dtab
-array should consist of one entry for each source type that is
-implemented, with
-.Va src
-as the name of the source,
-.Va method
-as a function which handles that source, and
-.Va mdata
-as a handle on arbitrary data to be passed to the method.
-The last entry in
-.Va dtab
-should contain
-.Dv NULL
-values for
-.Va src ,
-.Va method ,
-and
-.Va mdata .
-.Pp
-Additionally, methods may be implemented in NSS modules, in
-which case they are selected using the
-.Fa database
-and
-.Fa method_name
-arguments along with the configured source.
-(The methods supplied via
-.Fa dtab
-take priority over those implemented in NSS modules in the event
-of a conflict.)
-.Pp
-.Va defaults
-contains a list of default sources to try if
-.Xr nsswitch.conf 5
-is missing or corrupted, or if there is no relevant entry for
-.Va database .
-It is an array of
-.Va ns_src
-structures, which have the following format:
-.Bd -literal -offset indent
-typedef struct _ns_src {
-	const char	*src;
-	uint32_t	 flags;
-} ns_src;
-.Ed
-.Pp
-The
-.Fa defaults
-array should consist of one entry for each source to be configured by
-default indicated by
-.Va src ,
-and
-.Va flags
-set to the criterion desired
-(usually
-.Dv NS_SUCCESS ;
-refer to
-.Sx Method return values
-for more information).
-The last entry in
-.Va defaults
-should have
-.Va src
-set to
-.Dv NULL
-and
-.Va flags
-set to 0.
-.Pp
-For convenience, a global variable defined as:
-.Pp
-.Dl extern const ns_src __nsdefaultsrc[];
-.Pp
-exists which contains a single default entry for the source
-.Sq files
-that may be used by callers which do not require complicated default
-rules.
-.Pp
-.Sq Va ...
-are optional extra arguments, which are passed to the appropriate method
-as a variable argument list of the type
-.Vt va_list .
-.Ss Valid source types
-While there is support for arbitrary sources, the following
-#defines for commonly implemented sources are available:
-.Bl -column NSSRC_COMPAT compat -offset indent
-.It Sy "#define	value"
-.It Dv NSSRC_FILES Ta  \&"files\&"
-.It Dv NSSRC_DB Ta \&"db\&"
-.It Dv NSSRC_DNS Ta \&"dns\&"
-.It Dv NSSRC_NIS Ta \&"nis\&"
-.It Dv NSSRC_COMPAT Ta \&"compat\&"
-.El
-.Pp
-Refer to
-.Xr nsswitch.conf 5
-for a complete description of what each source type is.
-.Ss Method return values
-The
-.Vt nss_method
-functions must return one of the following values depending upon status
-of the lookup:
-.Bl -column "Return value" "Status code"
-.It Sy "Return value	Status code"
-.It Dv NS_SUCCESS Ta success
-.It Dv NS_NOTFOUND Ta notfound
-.It Dv NS_UNAVAIL Ta unavail
-.It Dv NS_TRYAGAIN Ta tryagain
-.It Dv NS_RETURN Ta -none-
-.El
-.Pp
-Refer to
-.Xr nsswitch.conf 5
-for a complete description of each status code.
-.Pp
-The
-.Fn nsdispatch
-function returns the value of the method that caused the dispatcher to
-terminate, or
-.Dv NS_NOTFOUND
-otherwise.
-.Sh NOTES
-.Fx Ns 's
-.Lb libc
-provides stubs for compatibility with NSS modules
-written for the
-.Tn GNU
-C Library
-.Nm nsswitch
-interface.
-However, these stubs only support the use of the
-.Dq Li passwd
-and
-.Dq Li group
-databases.
-.Sh SEE ALSO
-.Xr hesiod 3 ,
-.Xr stdarg 3 ,
-.Xr nsswitch.conf 5 ,
-.Xr yp 8
-.Sh HISTORY
-The
-.Fn nsdispatch
-function first appeared in
-.Fx 5.0 .
-It was imported from the
-.Nx
-Project,
-where it appeared first in
-.Nx 1.4 .
-Support for NSS modules first appeared in
-.Fx 5.1 .
-.Sh AUTHORS
-Luke Mewburn
-.Aq lukem@netbsd.org
-wrote this freely-distributable name-service switch implementation,
-using ideas from the
-.Tn ULTRIX
-svc.conf(5)
-and
-.Tn Solaris
-nsswitch.conf(4)
-manual pages.
-The
-.Fx
-Project
-added the support for threads and NSS modules, and normalized the uses
-of
-.Fn nsdispatch
-within the standard C library.
diff --git a/lib/libc_bsd/net/nsdispatch.c b/lib/libc_bsd/net/nsdispatch.c
deleted file mode 100644
index 63cd171..0000000
--- a/lib/libc_bsd/net/nsdispatch.c
+++ /dev/null
@@ -1,766 +0,0 @@
-/*	$NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * Portions of this software were developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- *
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/nsdispatch.c 285317 2015-07-09 13:30:37Z des $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "nss_tls.h"
-#include "libc_private.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-
-enum _nss_constants {
-	/* Number of elements allocated when we grow a vector */
-	ELEMSPERCHUNK =	8
-};
-
-/*
- * Global NSS data structures are mostly read-only, but we update
- * them when we read or re-read the nsswitch.conf.
- */
-static	pthread_rwlock_t	nss_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-/*
- * Runtime determination of whether we are dynamically linked or not.
- */
-extern	int		_DYNAMIC __attribute__ ((weak));
-#define	is_dynamic()	(&_DYNAMIC != NULL)
-
-/*
- * default sourcelist: `files'
- */
-const ns_src __nsdefaultsrc[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-	{ 0 },
-};
-
-/* Database, source mappings. */
-static	unsigned int		 _nsmapsize;
-static	ns_dbt			*_nsmap = NULL;
-
-/* NSS modules. */
-static	unsigned int		 _nsmodsize;
-static	ns_mod			*_nsmod;
-
-/* Placeholder for builtin modules' dlopen `handle'. */
-static	int			 __nss_builtin_handle;
-static	void			*nss_builtin_handle = &__nss_builtin_handle;
-
-#ifdef NS_CACHING
-/*
- * Cache lookup cycle prevention function - if !NULL then no cache lookups
- * will be made
- */
-static	void			*nss_cache_cycle_prevention_func = NULL;
-#endif
-
-/*
- * We keep track of nsdispatch() nesting depth in dispatch_depth.  When a
- * fallback method is invoked from nsdispatch(), we temporarily set
- * fallback_depth to the current dispatch depth plus one.  Subsequent
- * calls at that exact depth will run in fallback mode (restricted to the
- * same source as the call that was handled by the fallback method), while
- * calls below that depth will be handled normally, allowing fallback
- * methods to perform arbitrary lookups.
- */
-struct fb_state {
-	int	dispatch_depth;
-	int	fallback_depth;
-};
-static	void	fb_endstate(void *);
-NSS_TLS_HANDLING(fb);
-
-/*
- * Attempt to spew relatively uniform messages to syslog.
- */
-#define nss_log(level, fmt, ...) \
-	syslog((level), "NSSWITCH(%s): " fmt, __func__, __VA_ARGS__)
-#define nss_log_simple(level, s) \
-	syslog((level), "NSSWITCH(%s): " s, __func__)
-
-/*
- * Dynamically growable arrays are used for lists of databases, sources,
- * and modules.  The following `vector' interface is used to isolate the
- * common operations.
- */
-typedef	int	(*vector_comparison)(const void *, const void *);
-typedef	void	(*vector_free_elem)(void *);
-static	void	  vector_sort(void *, unsigned int, size_t,
-		    vector_comparison);
-static	void	  vector_free(void *, unsigned int *, size_t,
-		    vector_free_elem);
-static	void	 *vector_ref(unsigned int, void *, unsigned int, size_t);
-static	void	 *vector_search(const void *, void *, unsigned int, size_t,
-		    vector_comparison);
-static	void	 *vector_append(const void *, void *, unsigned int *, size_t);
-
-
-/*
- * Internal interfaces.
- */
-static	int	 string_compare(const void *, const void *);
-static	int	 mtab_compare(const void *, const void *);
-static	int	 nss_configure(void);
-static	void	 ns_dbt_free(ns_dbt *);
-static	void	 ns_mod_free(ns_mod *);
-static	void	 ns_src_free(ns_src **, int);
-static	void	 nss_load_builtin_modules(void);
-static	void	 nss_load_module(const char *, nss_module_register_fn);
-static	void	 nss_atexit(void);
-/* nsparser */
-extern	FILE	*_nsyyin;
-
-
-/*
- * The vector operations
- */
-static void
-vector_sort(void *vec, unsigned int count, size_t esize,
-    vector_comparison comparison)
-{
-	qsort(vec, count, esize, comparison);
-}
-
-
-static void *
-vector_search(const void *key, void *vec, unsigned int count, size_t esize,
-    vector_comparison comparison)
-{
-	return (bsearch(key, vec, count, esize, comparison));
-}
-
-
-static void *
-vector_append(const void *elem, void *vec, unsigned int *count, size_t esize)
-{
-	void	*p;
-
-	if ((*count % ELEMSPERCHUNK) == 0) {
-		p = realloc(vec, (*count + ELEMSPERCHUNK) * esize);
-		if (p == NULL) {
-			nss_log_simple(LOG_ERR, "memory allocation failure");
-			return (vec);
-		}
-		vec = p;
-	}
-	memmove((void *)(((uintptr_t)vec) + (*count * esize)), elem, esize);
-	(*count)++;
-	return (vec);
-}
-
-
-static void *
-vector_ref(unsigned int i, void *vec, unsigned int count, size_t esize)
-{
-	if (i < count)
-		return (void *)((uintptr_t)vec + (i * esize));
-	else
-		return (NULL);
-}
-
-
-#define VECTOR_FREE(v, c, s, f) \
-	do { vector_free(v, c, s, f); v = NULL; } while (0)
-static void
-vector_free(void *vec, unsigned int *count, size_t esize,
-    vector_free_elem free_elem)
-{
-	unsigned int	 i;
-	void		*elem;
-
-	for (i = 0; i < *count; i++) {
-		elem = vector_ref(i, vec, *count, esize);
-		if (elem != NULL)
-			free_elem(elem);
-	}
-	free(vec);
-	*count = 0;
-}
-
-/*
- * Comparison functions for vector_search.
- */
-static int
-string_compare(const void *a, const void *b)
-{
-      return (strcasecmp(*(const char * const *)a, *(const char * const *)b));
-}
-
-
-static int
-mtab_compare(const void *a, const void *b)
-{
-      int     cmp;
-
-      cmp = strcmp(((const ns_mtab *)a)->name, ((const ns_mtab *)b)->name);
-      if (cmp != 0)
-	      return (cmp);
-      else
-	      return (strcmp(((const ns_mtab *)a)->database,
-		  ((const ns_mtab *)b)->database));
-}
-
-/*
- * NSS nsmap management.
- */
-void
-_nsdbtaddsrc(ns_dbt *dbt, const ns_src *src)
-{
-	const ns_mod	*modp;
-
-	dbt->srclist = vector_append(src, dbt->srclist, &dbt->srclistsize,
-	    sizeof(*src));
-	modp = vector_search(&src->name, _nsmod, _nsmodsize, sizeof(*_nsmod),
-	    string_compare);
-	if (modp == NULL)
-		nss_load_module(src->name, NULL);
-}
-
-
-#ifdef _NSS_DEBUG
-void
-_nsdbtdump(const ns_dbt *dbt)
-{
-	int i;
-
-	printf("%s (%d source%s):", dbt->name, dbt->srclistsize,
-	    dbt->srclistsize == 1 ? "" : "s");
-	for (i = 0; i < (int)dbt->srclistsize; i++) {
-		printf(" %s", dbt->srclist[i].name);
-		if (!(dbt->srclist[i].flags &
-		    (NS_UNAVAIL|NS_NOTFOUND|NS_TRYAGAIN)) &&
-		    (dbt->srclist[i].flags & NS_SUCCESS))
-			continue;
-		printf(" [");
-		if (!(dbt->srclist[i].flags & NS_SUCCESS))
-			printf(" SUCCESS=continue");
-		if (dbt->srclist[i].flags & NS_UNAVAIL)
-			printf(" UNAVAIL=return");
-		if (dbt->srclist[i].flags & NS_NOTFOUND)
-			printf(" NOTFOUND=return");
-		if (dbt->srclist[i].flags & NS_TRYAGAIN)
-			printf(" TRYAGAIN=return");
-		printf(" ]");
-	}
-	printf("\n");
-}
-#endif
-
-
-/*
- * The first time nsdispatch is called (during a process's lifetime,
- * or after nsswitch.conf has been updated), nss_configure will
- * prepare global data needed by NSS.
- */
-static int
-nss_configure(void)
-{
-	static pthread_mutex_t conf_lock = PTHREAD_MUTEX_INITIALIZER;
-	static time_t	 confmod;
-	struct stat	 statbuf;
-	int		 result, isthreaded;
-	const char	*path;
-#ifdef NS_CACHING
-	void		*handle;
-#endif
-
-	result = 0;
-	isthreaded = __isthreaded;
-#if defined(_NSS_DEBUG) && defined(_NSS_SHOOT_FOOT)
-	/* NOTE WELL:  THIS IS A SECURITY HOLE. This must only be built
-	 * for debugging purposes and MUST NEVER be used in production.
-	 */
-	path = getenv("NSSWITCH_CONF");
-	if (path == NULL)
-#endif
-	path = _PATH_NS_CONF;
-	if (stat(path, &statbuf) != 0)
-		return (0);
-	if (statbuf.st_mtime <= confmod)
-		return (0);
-	if (isthreaded) {
-	    result = _pthread_mutex_trylock(&conf_lock);
-	    if (result != 0)
-		    return (0);
-	    (void)_pthread_rwlock_unlock(&nss_lock);
-	    result = _pthread_rwlock_wrlock(&nss_lock);
-	    if (result != 0)
-		    goto fin2;
-	}
-	_nsyyin = fopen(path, "re");
-	if (_nsyyin == NULL)
-		goto fin;
-	VECTOR_FREE(_nsmap, &_nsmapsize, sizeof(*_nsmap),
-	    (vector_free_elem)ns_dbt_free);
-	VECTOR_FREE(_nsmod, &_nsmodsize, sizeof(*_nsmod),
-	    (vector_free_elem)ns_mod_free);
-	nss_load_builtin_modules();
-	_nsyyparse();
-	(void)fclose(_nsyyin);
-	vector_sort(_nsmap, _nsmapsize, sizeof(*_nsmap), string_compare);
-	if (confmod == 0)
-		(void)atexit(nss_atexit);
-	confmod = statbuf.st_mtime;
-
-#ifdef NS_CACHING
-	handle = libc_dlopen(NULL, RTLD_LAZY | RTLD_GLOBAL);
-	if (handle != NULL) {
-		nss_cache_cycle_prevention_func = dlsym(handle,
-			"_nss_cache_cycle_prevention_function");
-		dlclose(handle);
-	}
-#endif
-fin:
-	if (isthreaded) {
-	    (void)_pthread_rwlock_unlock(&nss_lock);
-	    if (result == 0)
-		    result = _pthread_rwlock_rdlock(&nss_lock);
-	}
-fin2:
-	if (isthreaded)
-		(void)_pthread_mutex_unlock(&conf_lock);
-	return (result);
-}
-
-
-void
-_nsdbtput(const ns_dbt *dbt)
-{
-	unsigned int	 i;
-	ns_dbt		*p;
-
-	for (i = 0; i < _nsmapsize; i++) {
-		p = vector_ref(i, _nsmap, _nsmapsize, sizeof(*_nsmap));
-		if (string_compare(&dbt->name, &p->name) == 0) {
-			/* overwrite existing entry */
-			if (p->srclist != NULL)
-				ns_src_free(&p->srclist, p->srclistsize);
-			memmove(p, dbt, sizeof(*dbt));
-			return;
-		}
-	}
-	_nsmap = vector_append(dbt, _nsmap, &_nsmapsize, sizeof(*_nsmap));
-}
-
-
-static void
-ns_dbt_free(ns_dbt *dbt)
-{
-	ns_src_free(&dbt->srclist, dbt->srclistsize);
-	if (dbt->name)
-		free((void *)dbt->name);
-}
-
-
-static void
-ns_src_free(ns_src **src, int srclistsize)
-{
-	int	i;
-
-	for (i = 0; i < srclistsize; i++)
-		if ((*src)[i].name != NULL)
-			/* This one was allocated by nslexer. You'll just
-			 * have to trust me.
-			 */
-			free((void *)((*src)[i].name));
-	free(*src);
-	*src = NULL;
-}
-
-
-
-/*
- * NSS module management.
- */
-/* The built-in NSS modules are all loaded at once. */
-#define NSS_BACKEND(name, reg) \
-ns_mtab	*reg(unsigned int *, nss_module_unregister_fn *);
-#include "nss_backends.h"
-#undef NSS_BACKEND
-
-static void
-nss_load_builtin_modules(void)
-{
-#define NSS_BACKEND(name, reg) nss_load_module(#name, reg);
-#include "nss_backends.h"
-#undef NSS_BACKEND
-}
-
-
-/* Load a built-in or dynamically linked module.  If the `reg_fn'
- * argument is non-NULL, assume a built-in module and use reg_fn to
- * register it.  Otherwise, search for a dynamic NSS module.
- */
-static void
-nss_load_module(const char *source, nss_module_register_fn reg_fn)
-{
-	char		 buf[PATH_MAX];
-	ns_mod		 mod;
-	nss_module_register_fn fn;
-
-	memset(&mod, 0, sizeof(mod));
-	mod.name = strdup(source);
-	if (mod.name == NULL) {
-		nss_log_simple(LOG_ERR, "memory allocation failure");
-		return;
-	}
-	if (reg_fn != NULL) {
-		/* The placeholder is required, as a NULL handle
-		 * represents an invalid module.
-		 */
-		mod.handle = nss_builtin_handle;
-		fn = reg_fn;
-	} else if (!is_dynamic())
-		goto fin;
-	else {
-		if (snprintf(buf, sizeof(buf), "nss_%s.so.%d", mod.name,
-		    NSS_MODULE_INTERFACE_VERSION) >= (int)sizeof(buf))
-			goto fin;
-		mod.handle = libc_dlopen(buf, RTLD_LOCAL|RTLD_LAZY);
-		if (mod.handle == NULL) {
-#ifdef _NSS_DEBUG
-			/* This gets pretty annoying since the built-in
-			 * sources aren't modules yet.
-			 */
-			nss_log(LOG_DEBUG, "%s, %s", mod.name, dlerror());
-#endif
-			goto fin;
-		}
-		fn = (nss_module_register_fn)dlfunc(mod.handle,
-		    "nss_module_register");
-		if (fn == NULL) {
-			(void)dlclose(mod.handle);
-			mod.handle = NULL;
-			nss_log(LOG_ERR, "%s, %s", mod.name, dlerror());
-			goto fin;
-		}
-	}
-	mod.mtab = fn(mod.name, &mod.mtabsize, &mod.unregister);
-	if (mod.mtab == NULL || mod.mtabsize == 0) {
-		if (mod.handle != nss_builtin_handle)
-			(void)dlclose(mod.handle);
-		mod.handle = NULL;
-		nss_log(LOG_ERR, "%s, registration failed", mod.name);
-		goto fin;
-	}
-	if (mod.mtabsize > 1)
-		qsort(mod.mtab, mod.mtabsize, sizeof(mod.mtab[0]),
-		    mtab_compare);
-fin:
-	_nsmod = vector_append(&mod, _nsmod, &_nsmodsize, sizeof(*_nsmod));
-	vector_sort(_nsmod, _nsmodsize, sizeof(*_nsmod), string_compare);
-}
-
-
-
-static void
-ns_mod_free(ns_mod *mod)
-{
-
-	free(mod->name);
-	if (mod->handle == NULL)
-		return;
-	if (mod->unregister != NULL)
-		mod->unregister(mod->mtab, mod->mtabsize);
-	if (mod->handle != nss_builtin_handle)
-		(void)dlclose(mod->handle);
-}
-
-
-
-/*
- * Cleanup
- */
-static void
-nss_atexit(void)
-{
-	int isthreaded;
-
-	isthreaded = __isthreaded;
-	if (isthreaded)
-		(void)_pthread_rwlock_wrlock(&nss_lock);
-	VECTOR_FREE(_nsmap, &_nsmapsize, sizeof(*_nsmap),
-	    (vector_free_elem)ns_dbt_free);
-	VECTOR_FREE(_nsmod, &_nsmodsize, sizeof(*_nsmod),
-	    (vector_free_elem)ns_mod_free);
-	if (isthreaded)
-		(void)_pthread_rwlock_unlock(&nss_lock);
-}
-
-
-
-/*
- * Finally, the actual implementation.
- */
-static nss_method
-nss_method_lookup(const char *source, const char *database,
-    const char *method, const ns_dtab disp_tab[], void **mdata)
-{
-	ns_mod	*mod;
-	ns_mtab	*match, key;
-	int	 i;
-
-	if (disp_tab != NULL)
-		for (i = 0; disp_tab[i].src != NULL; i++)
-			if (strcasecmp(source, disp_tab[i].src) == 0) {
-				*mdata = disp_tab[i].mdata;
-				return (disp_tab[i].method);
-			}
-	mod = vector_search(&source, _nsmod, _nsmodsize, sizeof(*_nsmod),
-	    string_compare);
-	if (mod != NULL && mod->handle != NULL) {
-		key.database = database;
-		key.name = method;
-		match = bsearch(&key, mod->mtab, mod->mtabsize,
-		    sizeof(mod->mtab[0]), mtab_compare);
-		if (match != NULL) {
-			*mdata = match->mdata;
-			return (match->method);
-		}
-	}
-
-	*mdata = NULL;
-	return (NULL);
-}
-
-static void
-fb_endstate(void *p)
-{
-	free(p);
-}
-
-__weak_reference(_nsdispatch, nsdispatch);
-
-int
-_nsdispatch(void *retval, const ns_dtab disp_tab[], const char *database,
-	    const char *method_name, const ns_src defaults[], ...)
-{
-	va_list		 ap;
-	const ns_dbt	*dbt;
-	const ns_src	*srclist;
-	nss_method	 method, fb_method;
-	void		*mdata;
-	int		 isthreaded, serrno, i, result, srclistsize;
-	struct fb_state	*st;
-	int		 saved_depth;
-
-#ifdef NS_CACHING
-	nss_cache_data	 cache_data;
-	nss_cache_data	*cache_data_p;
-	int		 cache_flag;
-#endif
-	
-	dbt = NULL;
-	fb_method = NULL;
-
-	isthreaded = __isthreaded;
-	serrno = errno;
-	if (isthreaded) {
-		result = _pthread_rwlock_rdlock(&nss_lock);
-		if (result != 0) {
-			result = NS_UNAVAIL;
-			goto fin;
-		}
-	}
-
-	result = fb_getstate(&st);
-	if (result != 0) {
-		result = NS_UNAVAIL;
-		goto fin;
-	}
-
-	result = nss_configure();
-	if (result != 0) {
-		result = NS_UNAVAIL;
-		goto fin;
-	}
-	++st->dispatch_depth;
-	if (st->dispatch_depth > st->fallback_depth) {
-		dbt = vector_search(&database, _nsmap, _nsmapsize, sizeof(*_nsmap),
-		    string_compare);
-		fb_method = nss_method_lookup(NSSRC_FALLBACK, database,
-		    method_name, disp_tab, &mdata);
-	}
-
-	if (dbt != NULL) {
-		srclist = dbt->srclist;
-		srclistsize = dbt->srclistsize;
-	} else {
-		srclist = defaults;
-		srclistsize = 0;
-		while (srclist[srclistsize].name != NULL)
-			srclistsize++;
-	}
-
-#ifdef NS_CACHING
-	cache_data_p = NULL;
-	cache_flag = 0;
-#endif
-	for (i = 0; i < srclistsize; i++) {
-		result = NS_NOTFOUND;
-		method = nss_method_lookup(srclist[i].name, database,
-		    method_name, disp_tab, &mdata);
-
-		if (method != NULL) {
-#ifdef NS_CACHING
-			if (strcmp(srclist[i].name, NSSRC_CACHE) == 0 &&
-			    nss_cache_cycle_prevention_func == NULL) {
-#ifdef NS_STRICT_LIBC_EID_CHECKING
-				if (issetugid() != 0)
-					continue;
-#endif
-				cache_flag = 1;
-
-				memset(&cache_data, 0, sizeof(nss_cache_data));
-				cache_data.info = (nss_cache_info const *)mdata;
-				cache_data_p = &cache_data;
-
-				va_start(ap, defaults);
-				if (cache_data.info->id_func != NULL)
-					result = __nss_common_cache_read(retval,
-					    cache_data_p, ap);
-				else if (cache_data.info->marshal_func != NULL)
-					result = __nss_mp_cache_read(retval,
-					    cache_data_p, ap);
-				else
-					result = __nss_mp_cache_end(retval,
-					    cache_data_p, ap);
-				va_end(ap);
-			} else {
-				cache_flag = 0;
-				errno = 0;
-				va_start(ap, defaults);
-				result = method(retval, mdata, ap);
-				va_end(ap);
-			}
-#else /* NS_CACHING */
-			errno = 0;
-			va_start(ap, defaults);
-			result = method(retval, mdata, ap);
-			va_end(ap);
-#endif /* NS_CACHING */
-
-			if (result & (srclist[i].flags))
-				break;
-		} else {
-			if (fb_method != NULL) {
-				saved_depth = st->fallback_depth;
-				st->fallback_depth = st->dispatch_depth + 1;
-				va_start(ap, defaults);
-				result = fb_method(retval,
-				    (void *)srclist[i].name, ap);
-				va_end(ap);
-				st->fallback_depth = saved_depth;
-			} else
-				nss_log(LOG_DEBUG, "%s, %s, %s, not found, "
-				    "and no fallback provided",
-				    srclist[i].name, database, method_name);
-		}
-	}
-
-#ifdef NS_CACHING
-	if (cache_data_p != NULL &&
-	    (result & (NS_NOTFOUND | NS_SUCCESS)) && cache_flag == 0) {
-		va_start(ap, defaults);
-		if (result == NS_SUCCESS) {
-			if (cache_data.info->id_func != NULL)
-				__nss_common_cache_write(retval, cache_data_p,
-				    ap);
-			else if (cache_data.info->marshal_func != NULL)
-				__nss_mp_cache_write(retval, cache_data_p, ap);
-		} else if (result == NS_NOTFOUND) {
-			if (cache_data.info->id_func == NULL) {
-				if (cache_data.info->marshal_func != NULL)
-					__nss_mp_cache_write_submit(retval,
-					    cache_data_p, ap);
-			} else
-				__nss_common_cache_write_negative(cache_data_p);
-		}
-		va_end(ap);
-	}
-#endif /* NS_CACHING */
-
-	if (isthreaded)
-		(void)_pthread_rwlock_unlock(&nss_lock);
-	--st->dispatch_depth;
-fin:
-	errno = serrno;
-	return (result);
-}
diff --git a/lib/libc_bsd/net/nslexer.l b/lib/libc_bsd/net/nslexer.l
deleted file mode 100644
index 7402e57..0000000
--- a/lib/libc_bsd/net/nslexer.l
+++ /dev/null
@@ -1,112 +0,0 @@
-%{
-/*	$NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = 
-  "$FreeBSD: releng/10.2/lib/libc/net/nslexer.l 251091 2013-05-29 01:54:10Z emaste $";
-#endif /* LIBC_SCCS and not lint */
-
-#include "namespace.h"
-#include <ctype.h>
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <string.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-#include "nsparser.h"
-
-%}
-
-%option noinput
-%option nounput
-%option yylineno
-
-BLANK		[ \t]
-CR		\n
-STRING		[a-zA-Z][a-zA-Z0-9_]*
-
-%%
-
-{BLANK}+	;			/* skip whitespace */
-
-#.*		;			/* skip comments */
-
-\\{CR}		;			/* allow continuation */
-
-{CR}		return NL;
-
-[sS][uU][cC][cC][eE][sS][sS]		return SUCCESS;
-[uU][nN][aA][vV][aA][iI][lL]		return UNAVAIL;
-[nN][oO][tT][fF][oO][uU][nN][dD]	return NOTFOUND;
-[tT][rR][yY][aA][gG][aA][iI][nN]	return TRYAGAIN;
-
-[rR][eE][tT][uU][rR][nN]		return RETURN;
-[cC][oO][nN][tT][iI][nN][uU][eE]	return CONTINUE;
-
-{STRING}	{
-			char *p;
-			int i;
-
-			if ((p = strdup(yytext)) == NULL) {
-				syslog(LOG_ERR,
-			       "NSSWITCH(nslexer): memory allocation failure");
-				return ERRORTOKEN;
-			}
-			for (i = 0; i < strlen(p); i++) {
-				if (isupper((unsigned char)p[i]))
-					p[i] = tolower((unsigned char)p[i]);
-			}
-			_nsyylval.str = p;
-			return STRING;
-		}
-
-.		return yytext[0];
-
-%%
-
-#undef _nsyywrap
-int
-_nsyywrap()
-{
-	return 1;
-} /* _nsyywrap */
-
-void
-_nsyyerror(msg)
-	const char *msg;
-{
-
-	 syslog(LOG_ERR, "NSSWITCH(nslexer): %s line %d: %s at '%s'",
-	     _PATH_NS_CONF, yylineno, msg, yytext);
-} /* _nsyyerror */
diff --git a/lib/libc_bsd/net/nsparser.y b/lib/libc_bsd/net/nsparser.y
deleted file mode 100644
index 6713972..0000000
--- a/lib/libc_bsd/net/nsparser.y
+++ /dev/null
@@ -1,178 +0,0 @@
-%{
-/*	$NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $	*/
-
-/*-
- * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Luke Mewburn.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/nsparser.y 251091 2013-05-29 01:54:10Z emaste $");
-
-#include "namespace.h"
-#define _NS_PRIVATE
-#include <nsswitch.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-static	void	_nsaddsrctomap(const char *);
-
-static	ns_dbt		curdbt;
-static	ns_src		cursrc;
-%}
-
-%union {
-	char *str;
-	int   mapval;
-}
-
-%token	NL
-%token	SUCCESS UNAVAIL NOTFOUND TRYAGAIN
-%token	RETURN CONTINUE
-%token  ERRORTOKEN
-%token	<str> STRING
-
-%type	<mapval> Status Action
-
-%%
-
-File
-	:	/* empty */
-	| Lines
-	;
-
-Lines
-	: Entry
-	| Lines Entry
-	;
-
-Entry
-	: NL
-	| Database ':' NL
-		{
-			free((char*)curdbt.name);
-		}
-	| Database ':' Srclist NL
-		{
-			_nsdbtput(&curdbt);
-		}
-	| error NL
-		{
-			yyerrok;
-		}
-	;
-
-Database
-	: STRING
-		{
-			curdbt.name = yylval.str;
-			curdbt.srclist = NULL;
-			curdbt.srclistsize = 0;
-		}
-	;
-
-Srclist
-	: Item
-	| Srclist Item
-	;
-
-Item
-	: STRING
-		{
-			cursrc.flags = NS_TERMINATE;
-			_nsaddsrctomap($1);
-		}
-	| STRING '[' { cursrc.flags = NS_SUCCESS; } Criteria ']'
-		{
-			_nsaddsrctomap($1);
-		}
-	;
-
-Criteria
-	: Criterion
-	| Criteria Criterion
-	;
-
-Criterion
-	: Status '=' Action
-		{
-			if ($3)	     /* if action == RETURN set RETURN bit */
-				cursrc.flags |= $1;  
-			else	     /* else unset it */
-				cursrc.flags &= ~$1;
-		}
-	;
-
-Status
-	: SUCCESS	{ $$ = NS_SUCCESS; }
-	| UNAVAIL	{ $$ = NS_UNAVAIL; }
-	| NOTFOUND	{ $$ = NS_NOTFOUND; }
-	| TRYAGAIN	{ $$ = NS_TRYAGAIN; }
-	;
-
-Action
-	: RETURN	{ $$ = NS_ACTION_RETURN; }
-	| CONTINUE	{ $$ = NS_ACTION_CONTINUE; }
-	;
-
-%%
-
-static void
-_nsaddsrctomap(elem)
-	const char *elem;
-{
-	int		i, lineno;
-	extern int	_nsyylineno;
-	extern char *	_nsyytext;
-
-	lineno = _nsyylineno - (*_nsyytext == '\n' ? 1 : 0);
-	if (curdbt.srclistsize > 0) {
-		if (((strcasecmp(elem, NSSRC_COMPAT) == 0) &&
-		    (strcasecmp(curdbt.srclist[0].name, NSSRC_CACHE) != 0)) ||
-		    (strcasecmp(curdbt.srclist[0].name, NSSRC_COMPAT) == 0)) {
-			syslog(LOG_ERR,
-	    "NSSWITCH(nsparser): %s line %d: 'compat' used with sources, other than 'cache'",
-			    _PATH_NS_CONF, lineno);
-			free((void*)elem);
-			return;
-		}
-	}
-	for (i = 0; i < curdbt.srclistsize; i++) {
-		if (strcasecmp(curdbt.srclist[i].name, elem) == 0) {
-			syslog(LOG_ERR,
-		       "NSSWITCH(nsparser): %s line %d: duplicate source '%s'",
-			    _PATH_NS_CONF, lineno, elem);
-			free((void*)elem);
-			return;
-		}
-	}
-	cursrc.name = elem;
-	_nsdbtaddsrc(&curdbt, &cursrc);
-}
diff --git a/lib/libc_bsd/net/nss_backends.h b/lib/libc_bsd/net/nss_backends.h
deleted file mode 100644
index 8bbe048..0000000
--- a/lib/libc_bsd/net/nss_backends.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/net/nss_backends.h 113595 2003-04-17 14:14:22Z nectar $
- */
-/*
- * Eventually, the implementations of existing built-in NSS functions
- * may be moved into NSS modules and live here.
- */
-#if 0
-NSS_BACKEND(	files,	_files_nss_module_register	)
-NSS_BACKEND(	dns,	_dns_nss_module_register	)
-NSS_BACKEND(	nis,	_nis_nss_module_register	)
-NSS_BACKEND(	compat,	_compat_nss_module_register	)
-#endif
diff --git a/lib/libc_bsd/net/nss_compat.c b/lib/libc_bsd/net/nss_compat.c
deleted file mode 100644
index 7f280a7..0000000
--- a/lib/libc_bsd/net/nss_compat.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project by
- * Jacques A. Vidrine, Safeport Network Services, and Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
- * ("CBOSS"), as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- *
- * Compatibility shims for the GNU C Library-style nsswitch interface.
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/nss_compat.c 127625 2004-03-30 15:56:15Z nectar $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <errno.h>
-#include <nss.h>
-#include <pthread.h>
-#include <pthread_np.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-
-struct group;
-struct passwd;
-
-static int	terminator;
-
-#define DECLARE_TERMINATOR(x)					\
-static pthread_key_t	 _term_key_##x;				\
-static void							\
-_term_create_##x(void)						\
-{								\
-	(void)_pthread_key_create(&_term_key_##x, NULL);	\
-}								\
-static void		*_term_main_##x;			\
-static pthread_once_t	 _term_once_##x = PTHREAD_ONCE_INIT
-
-#define SET_TERMINATOR(x, y)						\
-do {									\
-	if (!__isthreaded || _pthread_main_np())			\
-		_term_main_##x = (y);					\
-	else {								\
-		(void)_pthread_once(&_term_once_##x, _term_create_##x);	\
-		(void)_pthread_setspecific(_term_key_##x, y);		\
-	}								\
-} while (0)
-
-#define CHECK_TERMINATOR(x)					\
-(!__isthreaded || _pthread_main_np() ?				\
-    (_term_main_##x) :						\
-    ((void)_pthread_once(&_term_once_##x, _term_create_##x),	\
-    _pthread_getspecific(_term_key_##x)))
-
-
-
-DECLARE_TERMINATOR(group);
-
-
-int
-__nss_compat_getgrnam_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(const char *, struct group *, char *, size_t, int *);
-	const char	*name;
-	struct group	*grp;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-
-	fn = mdata;
-	name = va_arg(ap, const char *);
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(name, grp, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct group **)retval = grp;
-	return (status);
-}
-
-
-int
-__nss_compat_getgrgid_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(gid_t, struct group *, char *, size_t, int *);
-	gid_t		 gid;
-	struct group	*grp;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-	
-	fn = mdata;
-	gid = va_arg(ap, gid_t);
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(gid, grp, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct group **)retval = grp;
-	return (status);
-}
-
-
-int
-__nss_compat_getgrent_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(struct group *, char *, size_t, int *);
-	struct group	*grp;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-
-	if (CHECK_TERMINATOR(group))
-		return (NS_NOTFOUND);
-	fn = mdata;
-	grp = va_arg(ap, struct group *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(grp, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct group **)retval = grp;
-	else if (status != NS_RETURN)
-		SET_TERMINATOR(group, &terminator);
-	return (status);
-}
-
-
-int
-__nss_compat_setgrent(void *retval, void *mdata, va_list ap)
-{
-
-	SET_TERMINATOR(group, NULL);
-	((int (*)(void))mdata)();
-	return (NS_UNAVAIL);
-}
-
-
-int
-__nss_compat_endgrent(void *retval, void *mdata, va_list ap)
-{
-
-	SET_TERMINATOR(group, NULL);
-	((int (*)(void))mdata)();
-	return (NS_UNAVAIL);
-}
-
-
-
-DECLARE_TERMINATOR(passwd);
-
-
-int
-__nss_compat_getpwnam_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(const char *, struct passwd *, char *, size_t, int *);
-	const char	*name;
-	struct passwd	*pwd;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-
-	fn = mdata;
-	name = va_arg(ap, const char *);
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(name, pwd, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct passwd **)retval = pwd;
-	return (status);
-}
-
-
-int
-__nss_compat_getpwuid_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(uid_t, struct passwd *, char *, size_t, int *);
-	uid_t		 uid;
-	struct passwd	*pwd;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-	
-	fn = mdata;
-	uid = va_arg(ap, uid_t);
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(uid, pwd, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct passwd **)retval = pwd;
-	return (status);
-}
-
-
-int
-__nss_compat_getpwent_r(void *retval, void *mdata, va_list ap)
-{
-	int (*fn)(struct passwd *, char *, size_t, int *);
-	struct passwd	*pwd;
-	char		*buffer;
-	int		*errnop;
-	size_t		 bufsize;
-	enum nss_status	 status;
-
-	if (CHECK_TERMINATOR(passwd))
-		return (NS_NOTFOUND);
-	fn = mdata;
-	pwd = va_arg(ap, struct passwd *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-	status = fn(pwd, buffer, bufsize, errnop);
-	status = __nss_compat_result(status, *errnop);
-	if (status == NS_SUCCESS)
-		*(struct passwd **)retval = pwd;
-	else if (status != NS_RETURN)
-		SET_TERMINATOR(passwd, &terminator);
-	return (status);
-}
-
-
-int
-__nss_compat_setpwent(void *retval, void *mdata, va_list ap)
-{
-
-	SET_TERMINATOR(passwd, NULL);
-	((int (*)(void))mdata)();
-	return (NS_UNAVAIL);
-}
-
-
-int
-__nss_compat_endpwent(void *retval, void *mdata, va_list ap)
-{
-
-	SET_TERMINATOR(passwd, NULL);
-	((int (*)(void))mdata)();
-	return (NS_UNAVAIL);
-}
diff --git a/lib/libc_bsd/net/ntoh.c b/lib/libc_bsd/net/ntoh.c
deleted file mode 100644
index 226f413..0000000
--- a/lib/libc_bsd/net/ntoh.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 2006 Olivier Houchard
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/ntoh.c 164053 2006-11-06 22:07:47Z cognet $");
-
-#include <sys/endian.h>
-
-uint32_t
-htonl(uint32_t hl)
-{
-
-	return (__htonl(hl));
-}
-
-uint16_t
-htons(uint16_t hs)
-{
-	
-	return (__htons(hs));
-}
-
-uint32_t
-ntohl(uint32_t nl)
-{
-
-	return (__ntohl(nl));
-}
-
-uint16_t
-ntohs(uint16_t ns)
-{
-	
-	return (__ntohs(ns));
-}
diff --git a/lib/libc_bsd/net/rcmd.3 b/lib/libc_bsd/net/rcmd.3
deleted file mode 100644
index c236ecb..0000000
--- a/lib/libc_bsd/net/rcmd.3
+++ /dev/null
@@ -1,306 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)rcmd.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/net/rcmd.3 189208 2009-03-01 05:47:14Z delphij $
-.\"
-.Dd March 3, 2000
-.Dt RCMD 3
-.Os
-.Sh NAME
-.Nm rcmd ,
-.Nm rresvport ,
-.Nm iruserok ,
-.Nm ruserok ,
-.Nm rcmd_af ,
-.Nm rresvport_af ,
-.Nm iruserok_sa
-.Nd routines for returning a stream to a remote command
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn rcmd "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p"
-.Ft int
-.Fn rresvport "int *port"
-.Ft int
-.Fn iruserok "u_long raddr" "int superuser" "const char *ruser" "const char *luser"
-.Ft int
-.Fn ruserok "const char *rhost" "int superuser" "const char *ruser" "const char *luser"
-.Ft int
-.Fn rcmd_af "char **ahost" "int inport" "const char *locuser" "const char *remuser" "const char *cmd" "int *fd2p" "int af"
-.Ft int
-.Fn rresvport_af "int *port" "int af"
-.Ft int
-.Fn iruserok_sa "const void *addr" "int addrlen" "int superuser" "const char *ruser" "const char *luser"
-.Sh DESCRIPTION
-The
-.Fn rcmd
-function
-is used by the super-user to execute a command on
-a remote machine using an authentication scheme based
-on reserved port numbers.
-The
-.Fn rresvport
-function
-returns a descriptor to a socket
-with an address in the privileged port space.
-The
-.Fn ruserok
-function
-is used by servers
-to authenticate clients requesting service with
-.Fn rcmd .
-All three functions are present in the same file and are used
-by the
-.Xr rshd 8
-server (among others).
-.Pp
-The
-.Fn rcmd
-function
-looks up the host
-.Fa *ahost
-using
-.Xr gethostbyname 3 ,
-returning -1 if the host does not exist.
-Otherwise
-.Fa *ahost
-is set to the standard name of the host
-and a connection is established to a server
-residing at the well-known Internet port
-.Fa inport .
-.Pp
-If the connection succeeds,
-a socket in the Internet domain of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as
-.Dv stdin
-and
-.Dv stdout .
-If
-.Fa fd2p
-is non-zero, then an auxiliary channel to a control
-process will be set up, and a descriptor for it will be placed
-in
-.Fa *fd2p .
-The control process will return diagnostic
-output from the command (unit 2) on this channel, and will also
-accept bytes on this channel as being
-.Ux
-signal numbers, to be
-forwarded to the process group of the command.
-If
-.Fa fd2p
-is 0, then the
-.Dv stderr
-(unit 2 of the remote
-command) will be made the same as the
-.Dv stdout
-and no
-provision is made for sending arbitrary signals to the remote process,
-although you may be able to get its attention by using out-of-band data.
-.Pp
-The protocol is described in detail in
-.Xr rshd 8 .
-.Pp
-The
-.Fn rresvport
-function is used to obtain a socket to which an address with a Privileged
-Internet port is bound.
-This socket is suitable for use by
-.Fn rcmd
-and several other functions.
-Privileged Internet ports are those in the range 0 to 1023.
-Only the super-user is allowed to bind an address of this sort
-to a socket.
-.Pp
-The
-.Fn iruserok
-and
-.Fn ruserok
-functions take a remote host's IP address or name, as returned by the
-.Xr gethostbyname 3
-routines, two user names and a flag indicating whether the local user's
-name is that of the super-user.
-Then, if the user is
-.Em NOT
-the super-user, it checks the
-.Pa /etc/hosts.equiv
-file.
-If that lookup is not done, or is unsuccessful, the
-.Pa .rhosts
-in the local user's home directory is checked to see if the request for
-service is allowed.
-.Pp
-If this file does not exist, is not a regular file, is owned by anyone
-other than the user or the super-user, or is writable by anyone other
-than the owner, the check automatically fails.
-Zero is returned if the machine name is listed in the
-.Dq Pa hosts.equiv
-file, or the host and remote user name are found in the
-.Dq Pa .rhosts
-file; otherwise
-.Fn iruserok
-and
-.Fn ruserok
-return -1.
-If the local domain (as obtained from
-.Xr gethostname 3 )
-is the same as the remote domain, only the machine name need be specified.
-.Pp
-The
-.Fn iruserok
-function is strongly preferred for security reasons.
-It requires trusting the local DNS at most, while the
-.Fn ruserok
-function requires trusting the entire DNS, which can be spoofed.
-.Pp
-The functions with an
-.Dq Li _af
-or
-.Dq Li _sa
-suffix, i.e.,
-.Fn rcmd_af ,
-.Fn rresvport_af
-and
-.Fn iruserok_sa ,
-work the same as the corresponding functions without a
-suffix, except that they are capable of handling both IPv6 and IPv4 ports.
-.Pp
-The
-.Dq Li _af
-suffix means that the function has an additional
-.Fa af
-argument which is used to specify the address family,
-(see below).
-The
-.Fa af
-argument extension is implemented for functions
-that have no binary address argument.
-Instead, the
-.Fa af
-argument specifies which address family is desired.
-.Pp
-The
-.Dq Li _sa
-suffix means that the function has general socket address and
-length arguments.
-As the socket address is a protocol independent data structure,
-IPv4 and IPv6 socket address can be passed as desired.
-The
-.Fa sa
-argument extension is implemented for functions
-that pass a protocol dependent binary address argument.
-The argument needs to be replaced with a more general address structure
-to support multiple address families in a general way.
-.Pp
-The functions with neither an
-.Dq Li _af
-suffix nor an
-.Dq Li _sa
-suffix work for IPv4 only, except for
-.Fn ruserok
-which can handle both IPv6 and IPv4.
-To switch the address family, the
-.Fa af
-argument must be filled with
-.Dv AF_INET ,
-or
-.Dv AF_INET6 .
-For
-.Fn rcmd_af ,
-.Dv PF_UNSPEC
-is also allowed.
-.Sh ENVIRONMENT
-.Bl -tag -width RSH
-.It Ev RSH
-When using the
-.Fn rcmd
-function, this variable is used as the program to run instead of
-.Xr rsh 1 .
-.El
-.Sh DIAGNOSTICS
-The
-.Fn rcmd
-function
-returns a valid socket descriptor on success.
-It returns -1 on error and prints a diagnostic message
-on the standard error.
-.Pp
-The
-.Fn rresvport
-function
-returns a valid, bound socket descriptor on success.
-It returns -1 on error with the global value
-.Va errno
-set according to the reason for failure.
-The error code
-.Er EAGAIN
-is overloaded to mean ``All network ports in use.''
-.Sh SEE ALSO
-.Xr rlogin 1 ,
-.Xr rsh 1 ,
-.Xr intro 2 ,
-.Xr rlogind 8 ,
-.Xr rshd 8
-.Pp
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%T "Advanced Socket API for IPv6"
-.%O RFC2292
-.Re
-.Rs
-.%A W. Stevens
-.%A M. Thomas
-.%A E. Nordmark
-.%T "Advanced Socket API for IPv6"
-.%O RFC3542
-.Re
-.Sh HISTORY
-Most of these
-functions appeared in
-.Bx 4.2 .
-The
-.Fn rresvport_af
-function
-appeared in RFC2292, and was implemented by the WIDE project
-for the Hydrangea IPv6 protocol stack kit.
-The
-.Fn rcmd_af
-function
-appeared in draft-ietf-ipngwg-rfc2292bis-01.txt,
-and was implemented in the WIDE/KAME IPv6 protocol stack kit.
-The
-.Fn iruserok_sa
-function
-appeared in discussion on the IETF ipngwg mailing list,
-and was implemented in
-.Fx 4.0 .
diff --git a/lib/libc_bsd/net/rcmd.c b/lib/libc_bsd/net/rcmd.c
deleted file mode 100644
index cf6efac..0000000
--- a/lib/libc_bsd/net/rcmd.c
+++ /dev/null
@@ -1,762 +0,0 @@
-/*
- * Copyright (c) 1983, 1993, 1994
- *	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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/rcmd.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <signal.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <rpc/rpc.h>
-#ifdef YP
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <arpa/nameser.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-extern int innetgr( const char *, const char *, const char *, const char * );
-
-#define max(a, b)	((a > b) ? a : b)
-
-int __ivaliduser(FILE *, uint32_t, const char *, const char *);
-int __ivaliduser_af(FILE *,const void *, const char *, const char *, int, int);
-int __ivaliduser_sa(FILE *, const struct sockaddr *, socklen_t, const char *,
-    const char *);
-static int __icheckhost(const struct sockaddr *, socklen_t, const char *);
-
-char paddr[NI_MAXHOST];
-
-int
-rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-{
-	return rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
-}
-
-int
-rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-	int af;
-{
-	struct addrinfo hints, *res, *ai;
-	struct sockaddr_storage from;
-	fd_set reads;
-	sigset_t oldmask, newmask;
-	pid_t pid;
-	int s, aport, lport, timo, error;
-	char c, *p;
-	int refused, nres;
-	char num[8];
-	static char canonnamebuf[MAXDNAME];	/* is it proper here? */
-
-	/* call rcmdsh() with specified remote shell if appropriate. */
-	if (!issetugid() && (p = getenv("RSH"))) {
-		struct servent *sp = getservbyname("shell", "tcp");
-
-		if (sp && sp->s_port == rport)
-			return (rcmdsh(ahost, rport, locuser, remuser,
-			    cmd, p));
-	}
-
-	/* use rsh(1) if non-root and remote port is shell. */
-	if (geteuid()) {
-		struct servent *sp = getservbyname("shell", "tcp");
-
-		if (sp && sp->s_port == rport)
-			return (rcmdsh(ahost, rport, locuser, remuser,
-			    cmd, NULL));
-	}
-
-	pid = getpid();
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_flags = AI_CANONNAME;
-	hints.ai_family = af;
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_protocol = 0;
-	(void)snprintf(num, sizeof(num), "%d", ntohs(rport));
-	error = getaddrinfo(*ahost, num, &hints, &res);
-	if (error) {
-		fprintf(stderr, "rcmd: getaddrinfo: %s\n",
-			gai_strerror(error));
-		if (error == EAI_SYSTEM)
-			fprintf(stderr, "rcmd: getaddrinfo: %s\n",
-				strerror(errno));
-		return (-1);
-	}
-
-	if (res->ai_canonname
-	 && strlen(res->ai_canonname) + 1 < sizeof(canonnamebuf)) {
-		strncpy(canonnamebuf, res->ai_canonname, sizeof(canonnamebuf));
-		*ahost = canonnamebuf;
-	}
-	nres = 0;
-	for (ai = res; ai; ai = ai->ai_next)
-		nres++;
-	ai = res;
-	refused = 0;
-	sigemptyset(&newmask);
-	sigaddset(&newmask, SIGURG);
-	__libc_sigprocmask(SIG_BLOCK, (const sigset_t *)&newmask, &oldmask);
-	for (timo = 1, lport = IPPORT_RESERVED - 1;;) {
-		s = rresvport_af(&lport, ai->ai_family);
-		if (s < 0) {
-			if (errno != EAGAIN && ai->ai_next) {
-				ai = ai->ai_next;
-				continue;
-			}
-			if (errno == EAGAIN)
-				(void)fprintf(stderr,
-				    "rcmd: socket: All ports in use\n");
-			else
-				(void)fprintf(stderr, "rcmd: socket: %s\n",
-				    strerror(errno));
-			freeaddrinfo(res);
-			__libc_sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask,
-			    NULL);
-			return (-1);
-		}
-		_fcntl(s, F_SETOWN, pid);
-		if (_connect(s, ai->ai_addr, ai->ai_addrlen) >= 0)
-			break;
-		(void)_close(s);
-		if (errno == EADDRINUSE) {
-			lport--;
-			continue;
-		}
-		if (errno == ECONNREFUSED)
-			refused = 1;
-		if (ai->ai_next == NULL && (!refused || timo > 16)) {
-			(void)fprintf(stderr, "%s: %s\n",
-				      *ahost, strerror(errno));
-			freeaddrinfo(res);
-			__libc_sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask,
-			    NULL);
-			return (-1);
-		}
-		if (nres > 1) {
-			int oerrno = errno;
-
-			getnameinfo(ai->ai_addr, ai->ai_addrlen, paddr,
-			    sizeof(paddr), NULL, 0, NI_NUMERICHOST);
-			(void)fprintf(stderr, "connect to address %s: ",
-				      paddr);
-			errno = oerrno;
-			perror(0);
-		}
-		if ((ai = ai->ai_next) == NULL) {
-			/* refused && timo <= 16 */
-			struct timespec time_to_sleep, time_remaining;
-
-			time_to_sleep.tv_sec = timo;
-			time_to_sleep.tv_nsec = 0;
-			(void)_nanosleep(&time_to_sleep, &time_remaining);
-			timo *= 2;
-			ai = res;
-			refused = 0;
-		}
-		if (nres > 1) {
-			getnameinfo(ai->ai_addr, ai->ai_addrlen, paddr,
-			    sizeof(paddr), NULL, 0, NI_NUMERICHOST);
-			fprintf(stderr, "Trying %s...\n", paddr);
-		}
-	}
-	lport--;
-	if (fd2p == 0) {
-		_write(s, "", 1);
-		lport = 0;
-	} else {
-		int s2 = rresvport_af(&lport, ai->ai_family), s3;
-		socklen_t len = ai->ai_addrlen;
-		int nfds;
-
-		if (s2 < 0)
-			goto bad;
-		_listen(s2, 1);
-		(void)snprintf(num, sizeof(num), "%d", lport);
-		if (_write(s, num, strlen(num)+1) != strlen(num)+1) {
-			(void)fprintf(stderr,
-			    "rcmd: write (setting up stderr): %s\n",
-			    strerror(errno));
-			(void)_close(s2);
-			goto bad;
-		}
-		nfds = max(s, s2)+1;
-		if(nfds > FD_SETSIZE) {
-			fprintf(stderr, "rcmd: too many files\n");
-			(void)_close(s2);
-			goto bad;
-		}
-again:
-		FD_ZERO(&reads);
-		FD_SET(s, &reads);
-		FD_SET(s2, &reads);
-		errno = 0;
-		if (_select(nfds, &reads, 0, 0, 0) < 1 || !FD_ISSET(s2, &reads)){
-			if (errno != 0)
-				(void)fprintf(stderr,
-				    "rcmd: select (setting up stderr): %s\n",
-				    strerror(errno));
-			else
-				(void)fprintf(stderr,
-				"select: protocol failure in circuit setup\n");
-			(void)_close(s2);
-			goto bad;
-		}
-		s3 = _accept(s2, (struct sockaddr *)&from, &len);
-		switch (from.ss_family) {
-		case AF_INET:
-			aport = ntohs(((struct sockaddr_in *)&from)->sin_port);
-			break;
-#ifdef INET6
-		case AF_INET6:
-			aport = ntohs(((struct sockaddr_in6 *)&from)->sin6_port);
-			break;
-#endif
-		default:
-			aport = 0;	/* error */
-			break;
-		}
-		/*
-		 * XXX careful for ftp bounce attacks. If discovered, shut them
-		 * down and check for the real auxiliary channel to connect.
-		 */
-		if (aport == 20) {
-			_close(s3);
-			goto again;
-		}
-		(void)_close(s2);
-		if (s3 < 0) {
-			(void)fprintf(stderr,
-			    "rcmd: accept: %s\n", strerror(errno));
-			lport = 0;
-			goto bad;
-		}
-		*fd2p = s3;
-		if (aport >= IPPORT_RESERVED || aport < IPPORT_RESERVED / 2) {
-			(void)fprintf(stderr,
-			    "socket: protocol failure in circuit setup.\n");
-			goto bad2;
-		}
-	}
-	(void)_write(s, locuser, strlen(locuser)+1);
-	(void)_write(s, remuser, strlen(remuser)+1);
-	(void)_write(s, cmd, strlen(cmd)+1);
-	if (_read(s, &c, 1) != 1) {
-		(void)fprintf(stderr,
-		    "rcmd: %s: %s\n", *ahost, strerror(errno));
-		goto bad2;
-	}
-	if (c != 0) {
-		while (_read(s, &c, 1) == 1) {
-			(void)_write(STDERR_FILENO, &c, 1);
-			if (c == '\n')
-				break;
-		}
-		goto bad2;
-	}
-	__libc_sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask, NULL);
-	freeaddrinfo(res);
-	return (s);
-bad2:
-	if (lport)
-		(void)_close(*fd2p);
-bad:
-	(void)_close(s);
-	__libc_sigprocmask(SIG_SETMASK, (const sigset_t *)&oldmask, NULL);
-	freeaddrinfo(res);
-	return (-1);
-}
-
-int
-rresvport(port)
-	int *port;
-{
-	return rresvport_af(port, AF_INET);
-}
-
-int
-rresvport_af(alport, family)
-	int *alport, family;
-{
-	int s;
-	struct sockaddr_storage ss;
-	u_short *sport;
-
-	memset(&ss, 0, sizeof(ss));
-	ss.ss_family = family;
-	switch (family) {
-	case AF_INET:
-		((struct sockaddr *)&ss)->sa_len = sizeof(struct sockaddr_in);
-		sport = &((struct sockaddr_in *)&ss)->sin_port;
-		((struct sockaddr_in *)&ss)->sin_addr.s_addr = INADDR_ANY;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		((struct sockaddr *)&ss)->sa_len = sizeof(struct sockaddr_in6);
-		sport = &((struct sockaddr_in6 *)&ss)->sin6_port;
-		((struct sockaddr_in6 *)&ss)->sin6_addr = in6addr_any;
-		break;
-#endif
-	default:
-		errno = EAFNOSUPPORT;
-		return -1;
-	}
-
-	s = _socket(ss.ss_family, SOCK_STREAM, 0);
-	if (s < 0)
-		return (-1);
-#if 0 /* compat_exact_traditional_rresvport_semantics */
-	sin.sin_port = htons((u_short)*alport);
-	if (_bind(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0)
-		return (s);
-	if (errno != EADDRINUSE) {
-		(void)_close(s);
-		return (-1);
-	}
-#endif
-	*sport = 0;
-	if (bindresvport_sa(s, (struct sockaddr *)&ss) == -1) {
-		(void)_close(s);
-		return (-1);
-	}
-	*alport = (int)ntohs(*sport);
-	return (s);
-}
-
-int	__check_rhosts_file = 1;
-char	*__rcmd_errstr;
-
-int
-ruserok(rhost, superuser, ruser, luser)
-	const char *rhost, *ruser, *luser;
-	int superuser;
-{
-	struct addrinfo hints, *res, *r;
-	int error;
-
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = PF_UNSPEC;
-	hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-	error = getaddrinfo(rhost, "0", &hints, &res);
-	if (error)
-		return (-1);
-
-	for (r = res; r; r = r->ai_next) {
-		if (iruserok_sa(r->ai_addr, r->ai_addrlen, superuser, ruser,
-		    luser) == 0) {
-			freeaddrinfo(res);
-			return (0);
-		}
-	}
-	freeaddrinfo(res);
-	return (-1);
-}
-
-/*
- * New .rhosts strategy: We are passed an ip address. We spin through
- * hosts.equiv and .rhosts looking for a match. When the .rhosts only
- * has ip addresses, we don't have to trust a nameserver.  When it
- * contains hostnames, we spin through the list of addresses the nameserver
- * gives us and look for a match.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok(raddr, superuser, ruser, luser)
-	unsigned long raddr;
-	int superuser;
-	const char *ruser, *luser;
-{
-	struct sockaddr_in sin;
-
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin.sin_len = sizeof(struct sockaddr_in);
-	memcpy(&sin.sin_addr, &raddr, sizeof(sin.sin_addr));
-	return iruserok_sa((struct sockaddr *)&sin, sin.sin_len, superuser,
-		ruser, luser);
-}
-
-/*
- * AF independent extension of iruserok.
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-iruserok_sa(ra, rlen, superuser, ruser, luser)
-	const void *ra;
-	int rlen;
-	int superuser;
-	const char *ruser, *luser;
-{
-	char *cp;
-	struct stat sbuf;
-	struct passwd *pwd;
-	FILE *hostf;
-	uid_t uid;
-	int first;
-	char pbuf[MAXPATHLEN];
-	const struct sockaddr *raddr;
-	struct sockaddr_storage ss;
-
-	/* avoid alignment issue */
-	if (rlen > sizeof(ss)) 
-		return(-1);
-	memcpy(&ss, ra, rlen);
-	raddr = (struct sockaddr *)&ss;
-
-	first = 1;
-	hostf = superuser ? NULL : fopen(_PATH_HEQUIV, "re");
-again:
-	if (hostf) {
-		if (__ivaliduser_sa(hostf, raddr, rlen, luser, ruser) == 0) {
-			(void)fclose(hostf);
-			return (0);
-		}
-		(void)fclose(hostf);
-	}
-	if (first == 1 && (__check_rhosts_file || superuser)) {
-		first = 0;
-		if ((pwd = getpwnam(luser)) == NULL)
-			return (-1);
-		(void)strcpy(pbuf, pwd->pw_dir);
-		(void)strcat(pbuf, "/.rhosts");
-
-		/*
-		 * Change effective uid while opening .rhosts.  If root and
-		 * reading an NFS mounted file system, can't read files that
-		 * are protected read/write owner only.
-		 */
-		uid = geteuid();
-		(void)seteuid(pwd->pw_uid);
-		hostf = fopen(pbuf, "re");
-		(void)seteuid(uid);
-
-		if (hostf == NULL)
-			return (-1);
-		/*
-		 * If not a regular file, or is owned by someone other than
-		 * user or root or if writeable by anyone but the owner, quit.
-		 */
-		cp = NULL;
-		if (lstat(pbuf, &sbuf) < 0)
-			cp = ".rhosts lstat failed";
-		else if (!S_ISREG(sbuf.st_mode))
-			cp = ".rhosts not regular file";
-		else if (_fstat(fileno(hostf), &sbuf) < 0)
-			cp = ".rhosts fstat failed";
-		else if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid)
-			cp = "bad .rhosts owner";
-		else if (sbuf.st_mode & (S_IWGRP|S_IWOTH))
-			cp = ".rhosts writeable by other than owner";
-		/* If there were any problems, quit. */
-		if (cp) {
-			__rcmd_errstr = cp;
-			(void)fclose(hostf);
-			return (-1);
-		}
-		goto again;
-	}
-	return (-1);
-}
-
-/*
- * XXX
- * Don't make static, used by lpd(8).
- *
- * Returns 0 if ok, -1 if not ok.
- */
-int
-__ivaliduser(hostf, raddr, luser, ruser)
-	FILE *hostf;
-	uint32_t raddr;
-	const char *luser, *ruser;
-{
-	struct sockaddr_in sin;
-
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-	sin.sin_len = sizeof(struct sockaddr_in);
-	memcpy(&sin.sin_addr, &raddr, sizeof(sin.sin_addr));
-	return __ivaliduser_sa(hostf, (struct sockaddr *)&sin, sin.sin_len,
-		luser, ruser);
-}
-
-/*
- * Returns 0 if ok, -1 if not ok.
- *
- * XXX obsolete API.
- */
-int
-__ivaliduser_af(hostf, raddr, luser, ruser, af, len)
-	FILE *hostf;
-	const void *raddr;
-	const char *luser, *ruser;
-	int af, len;
-{
-	struct sockaddr *sa = NULL;
-	struct sockaddr_in *sin = NULL;
-#ifdef INET6
-	struct sockaddr_in6 *sin6 = NULL;
-#endif
-	struct sockaddr_storage ss;
-
-	memset(&ss, 0, sizeof(ss));
-	switch (af) {
-	case AF_INET:
-		if (len != sizeof(sin->sin_addr))
-			return -1;
-		sin = (struct sockaddr_in *)&ss;
-		sin->sin_family = AF_INET;
-		sin->sin_len = sizeof(struct sockaddr_in);
-		memcpy(&sin->sin_addr, raddr, sizeof(sin->sin_addr));
-		break;
-#ifdef INET6
-	case AF_INET6:
-		if (len != sizeof(sin6->sin6_addr))
-			return -1;
-		/* you will lose scope info */
-		sin6 = (struct sockaddr_in6 *)&ss;
-		sin6->sin6_family = AF_INET6;
-		sin6->sin6_len = sizeof(struct sockaddr_in6);
-		memcpy(&sin6->sin6_addr, raddr, sizeof(sin6->sin6_addr));
-		break;
-#endif
-	default:
-		return -1;
-	}
-
-	sa = (struct sockaddr *)&ss;
-	return __ivaliduser_sa(hostf, sa, sa->sa_len, luser, ruser);
-}
-
-int
-__ivaliduser_sa(hostf, raddr, salen, luser, ruser)
-	FILE *hostf;
-	const struct sockaddr *raddr;
-	socklen_t salen;
-	const char *luser, *ruser;
-{
-	char *user, *p;
-	int ch;
-	char buf[MAXHOSTNAMELEN + 128];		/* host + login */
-	char hname[MAXHOSTNAMELEN];
-	/* Presumed guilty until proven innocent. */
-	int userok = 0, hostok = 0;
-#ifdef YP
-	char *ypdomain;
-
-	if (yp_get_default_domain(&ypdomain))
-		ypdomain = NULL;
-#else
-#define	ypdomain NULL
-#endif
-	/* We need to get the damn hostname back for netgroup matching. */
-	if (getnameinfo(raddr, salen, hname, sizeof(hname), NULL, 0,
-			NI_NAMEREQD) != 0)
-		hname[0] = '\0';
-
-	while (fgets(buf, sizeof(buf), hostf)) {
-		p = buf;
-		/* Skip lines that are too long. */
-		if (strchr(p, '\n') == NULL) {
-			while ((ch = getc(hostf)) != '\n' && ch != EOF);
-			continue;
-		}
-		if (*p == '\n' || *p == '#') {
-			/* comment... */
-			continue;
-		}
-		while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
-			*p = isupper((unsigned char)*p) ? tolower((unsigned char)*p) : *p;
-			p++;
-		}
-		if (*p == ' ' || *p == '\t') {
-			*p++ = '\0';
-			while (*p == ' ' || *p == '\t')
-				p++;
-			user = p;
-			while (*p != '\n' && *p != ' ' &&
-			    *p != '\t' && *p != '\0')
-				p++;
-		} else
-			user = p;
-		*p = '\0';
-		/*
-		 * Do +/- and +@/-@ checking. This looks really nasty,
-		 * but it matches SunOS's behavior so far as I can tell.
-		 */
-		switch(buf[0]) {
-		case '+':
-			if (!buf[1]) {     /* '+' matches all hosts */
-				hostok = 1;
-				break;
-			}
-			if (buf[1] == '@')  /* match a host by netgroup */
-				hostok = hname[0] != '\0' &&
-				    innetgr(&buf[2], hname, NULL, ypdomain);
-			else		/* match a host by addr */
-				hostok = __icheckhost(raddr, salen,
-						      (char *)&buf[1]);
-			break;
-		case '-':     /* reject '-' hosts and all their users */
-			if (buf[1] == '@') {
-				if (hname[0] == '\0' ||
-				    innetgr(&buf[2], hname, NULL, ypdomain))
-					return(-1);
-			} else {
-				if (__icheckhost(raddr, salen,
-						 (char *)&buf[1]))
-					return(-1);
-			}
-			break;
-		default:  /* if no '+' or '-', do a simple match */
-			hostok = __icheckhost(raddr, salen, buf);
-			break;
-		}
-		switch(*user) {
-		case '+':
-			if (!*(user+1)) {      /* '+' matches all users */
-				userok = 1;
-				break;
-			}
-			if (*(user+1) == '@')  /* match a user by netgroup */
-				userok = innetgr(user+2, NULL, ruser, ypdomain);
-			else	   /* match a user by direct specification */
-				userok = !(strcmp(ruser, user+1));
-			break;
-		case '-': 		/* if we matched a hostname, */
-			if (hostok) {   /* check for user field rejections */
-				if (!*(user+1))
-					return(-1);
-				if (*(user+1) == '@') {
-					if (innetgr(user+2, NULL,
-							ruser, ypdomain))
-						return(-1);
-				} else {
-					if (!strcmp(ruser, user+1))
-						return(-1);
-				}
-			}
-			break;
-		default:	/* no rejections: try to match the user */
-			if (hostok)
-				userok = !(strcmp(ruser,*user ? user : luser));
-			break;
-		}
-		if (hostok && userok)
-			return(0);
-	}
-	return (-1);
-}
-
-/*
- * Returns "true" if match, 0 if no match.
- */
-static int
-__icheckhost(raddr, salen, lhost)
-	const struct sockaddr *raddr;
-	socklen_t salen;
-        const char *lhost;
-{
-	struct sockaddr_in sin;
-	struct sockaddr_in6 *sin6;
-	struct addrinfo hints, *res, *r;
-	int error;
-	char h1[NI_MAXHOST], h2[NI_MAXHOST];
-
-	if (raddr->sa_family == AF_INET6) {
-		sin6 = (struct sockaddr_in6 *)raddr;
-		if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
-			memset(&sin, 0, sizeof(sin));
-			sin.sin_family = AF_INET;
-			sin.sin_len = sizeof(struct sockaddr_in);
-			memcpy(&sin.sin_addr, &sin6->sin6_addr.s6_addr[12],
-			       sizeof(sin.sin_addr));
-			raddr = (struct sockaddr *)&sin;
-			salen = sin.sin_len;
-		}
-	}
-
-	h1[0] = '\0';
-	if (getnameinfo(raddr, salen, h1, sizeof(h1), NULL, 0,
-			NI_NUMERICHOST) != 0)
-		return (0);
-
-	/* Resolve laddr into sockaddr */
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = raddr->sa_family;
-	hints.ai_socktype = SOCK_DGRAM;	/*XXX dummy*/
-	res = NULL;
-	error = getaddrinfo(lhost, "0", &hints, &res);
-	if (error)
-		return (0);
-
-	for (r = res; r ; r = r->ai_next) {
-		h2[0] = '\0';
-		if (getnameinfo(r->ai_addr, r->ai_addrlen, h2, sizeof(h2),
-				NULL, 0, NI_NUMERICHOST) != 0)
-			continue;
-		if (strcmp(h1, h2) == 0) {
-			freeaddrinfo(res);
-			return (1);
-		}
-	}
-
-	/* No match. */
-	freeaddrinfo(res);
-	return (0);
-}
diff --git a/lib/libc_bsd/net/rcmdsh.3 b/lib/libc_bsd/net/rcmdsh.3
deleted file mode 100644
index af2232f..0000000
--- a/lib/libc_bsd/net/rcmdsh.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\"	$OpenBSD: rcmdsh.3,v 1.6 1999/07/05 04:41:00 aaron Exp $
-.\"
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/rcmdsh.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd September 1, 1996
-.Dt RCMDSH 3
-.Os
-.Sh NAME
-.Nm rcmdsh
-.Nd return a stream to a remote command without superuser
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fo rcmdsh
-.Fa "char **ahost"
-.Fa "int inport"
-.Fa "const char *locuser"
-.Fa "const char *remuser"
-.Fa "const char *cmd"
-.Fa "const char *rshprog"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn rcmdsh
-function
-is used by normal users to execute a command on
-a remote machine using an authentication scheme based
-on reserved port numbers using
-.Xr rshd 8
-or the value of
-.Fa rshprog
-(if
-.No non- Ns Dv NULL ) .
-.Pp
-The
-.Fn rcmdsh
-function
-looks up the host
-.Fa *ahost
-using
-.Xr gethostbyname 3 ,
-returning \-1 if the host does not exist.
-Otherwise
-.Fa *ahost
-is set to the standard name of the host
-and a connection is established to a server
-residing at the well-known Internet port
-.Dq Li shell/tcp
-(or whatever port is used by
-.Fa rshprog ) .
-The
-.Fa inport
-argument
-is ignored; it is only included to provide an interface similar to
-.Xr rcmd 3 .
-.Pp
-If the connection succeeds,
-a socket in the
-.Ux
-domain of type
-.Dv SOCK_STREAM
-is returned to the caller, and given to the remote
-command as
-.Dv stdin , stdout ,
-and
-.Dv stderr .
-.Sh RETURN VALUES
-The
-.Fn rcmdsh
-function
-returns a valid socket descriptor on success.
-Otherwise, \-1 is returned
-and a diagnostic message is printed on the standard error.
-.Sh SEE ALSO
-.Xr rsh 1 ,
-.Xr socketpair 2 ,
-.Xr rcmd 3 ,
-.Xr rshd 8
-.Sh HISTORY
-The
-.Fn rcmdsh
-function first appeared in
-.Ox 2.0 ,
-and made its way into
-.Fx 4.6 .
-.Sh BUGS
-If
-.Xr rsh 1
-encounters an error, a file descriptor is still returned instead of \-1.
diff --git a/lib/libc_bsd/net/rcmdsh.c b/lib/libc_bsd/net/rcmdsh.c
deleted file mode 100644
index 8521769..0000000
--- a/lib/libc_bsd/net/rcmdsh.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*	$OpenBSD: rcmdsh.c,v 1.5 1998/04/25 16:23:58 millert Exp $	*/
-
-/*
- * Copyright (c) 2001, MagniComp
- * 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. Neither the name of the MagniComp 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 COPYRIGHT HOLDERS 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.
- */
-
-/*
- * This is an rcmd() replacement originally by
- * Chris Siebenmann <cks@utcc.utoronto.ca>.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/rcmdsh.c 111618 2003-02-27 13:40:01Z nectar $");
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <paths.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#ifndef _PATH_RSH
-#define	_PATH_RSH	"/usr/bin/rsh"
-#endif
-
-/*
- * This is a replacement rcmd() function that uses the rsh(1)
- * program in place of a direct rcmd(3) function call so as to
- * avoid having to be root.  Note that rport is ignored.
- */
-int
-rcmdsh(ahost, rport, locuser, remuser, cmd, rshprog)
-	char **ahost;
-	int rport;
-	const char *locuser, *remuser, *cmd, *rshprog;
-{
-	struct addrinfo hints, *res;
-	int cpid, sp[2], error;
-	char *p;
-	struct passwd *pw;
-	char num[8];
-	static char hbuf[NI_MAXHOST];
-
-	/* What rsh/shell to use. */
-	if (rshprog == NULL)
-		rshprog = _PATH_RSH;
-
-	/* locuser must exist on this host. */
-	if ((pw = getpwnam(locuser)) == NULL) {
-		(void)fprintf(stderr, "rcmdsh: unknown user: %s\n", locuser);
-		return (-1);
-	}
-
-	/* Validate remote hostname. */
-	if (strcmp(*ahost, "localhost") != 0) {
-		memset(&hints, 0, sizeof(hints));
-		hints.ai_flags = AI_CANONNAME;
-		hints.ai_family = PF_UNSPEC;
-		hints.ai_socktype = SOCK_STREAM;
-		(void)snprintf(num, sizeof(num), "%u",
-		    (unsigned int)ntohs(rport));
-		error = getaddrinfo(*ahost, num, &hints, &res);
-		if (error) {
-			fprintf(stderr, "rcmdsh: getaddrinfo: %s\n",
-				gai_strerror(error));
-			return (-1);
-		}
-		if (res->ai_canonname) {
-			strncpy(hbuf, res->ai_canonname, sizeof(hbuf) - 1);
-			hbuf[sizeof(hbuf) - 1] = '\0';
-			*ahost = hbuf;
-		}
-		freeaddrinfo(res);
-	}
-
-	/* Get a socketpair we'll use for stdin and stdout. */
-	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, sp) == -1) {
-		perror("rcmdsh: socketpair");
-		return (-1);
-	}
-
-	cpid = fork();
-	if (cpid == -1) {
-		perror("rcmdsh: fork failed");
-		return (-1);
-	} else if (cpid == 0) {
-		/*
-		 * Child.  We use sp[1] to be stdin/stdout, and close sp[0].
-		 */
-		(void)close(sp[0]);
-		if (dup2(sp[1], 0) == -1 || dup2(0, 1) == -1) {
-			perror("rcmdsh: dup2 failed");
-			_exit(255);
-		}
-		/* Fork again to lose parent. */
-		cpid = fork();
-		if (cpid == -1) {
-			perror("rcmdsh: fork to lose parent failed");
-			_exit(255);
-		}
-		if (cpid > 0)
-			_exit(0);
-
-		/* In grandchild here.  Become local user for rshprog. */
-		if (setuid(pw->pw_uid) == -1) {
-			(void)fprintf(stderr, "rcmdsh: setuid(%u): %s\n",
-			    pw->pw_uid, strerror(errno));
-			_exit(255);
-		}
-
-		/*
-		 * If remote host is "localhost" and local and remote users
-		 * are the same, avoid running remote shell for efficiency.
-		 */
-		if (strcmp(*ahost, "localhost") == 0 &&
-		    strcmp(locuser, remuser) == 0) {
-			if (pw->pw_shell[0] == '\0')
-				rshprog = _PATH_BSHELL;
-			else
-				rshprog = pw->pw_shell;
-			p = strrchr(rshprog, '/');
-			execlp(rshprog, p ? p + 1 : rshprog, "-c", cmd,
-			    (char *)NULL);
-		} else {
-			p = strrchr(rshprog, '/');
-			execlp(rshprog, p ? p + 1 : rshprog, *ahost, "-l",
-			    remuser, cmd, (char *)NULL);
-		}
-		(void)fprintf(stderr, "rcmdsh: execlp %s failed: %s\n",
-		    rshprog, strerror(errno));
-		_exit(255);
-	} else {
-		/* Parent. close sp[1], return sp[0]. */
-		(void)close(sp[1]);
-		/* Reap child. */
-		(void)wait(NULL);
-		return (sp[0]);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/net/recv.c b/lib/libc_bsd/net/recv.c
deleted file mode 100644
index 110f71a..0000000
--- a/lib/libc_bsd/net/recv.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)recv.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/recv.c 251575 2013-06-09 14:31:59Z jilles $");
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-recv(s, buf, len, flags)
-	int s, flags;
-	size_t len;
-	void *buf;
-{
-	/*
-	 * POSIX says recv() shall be a cancellation point, so call the
-	 * cancellation-enabled recvfrom() and not _recvfrom().
-	 */
-	return (recvfrom(s, buf, len, flags, NULL, 0));
-}
diff --git a/lib/libc_bsd/net/res_config.h b/lib/libc_bsd/net/res_config.h
deleted file mode 100644
index b9d8136..0000000
--- a/lib/libc_bsd/net/res_config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/net/res_config.h 156960 2006-03-21 16:11:11Z ume $ */
-
-#define	DEBUG	1	/* enable debugging code (needed for dig) */
-#define	RESOLVSORT	/* allow sorting of addresses in gethostbyname */
-#undef	SUNSECURITY	/* verify gethostbyaddr() calls - WE DONT NEED IT  */
-#define MULTI_PTRS_ARE_ALIASES 1 /* fold multiple PTR records into aliases */
diff --git a/lib/libc_bsd/net/resolver.3 b/lib/libc_bsd/net/resolver.3
deleted file mode 100644
index 19f8b95..0000000
--- a/lib/libc_bsd/net/resolver.3
+++ /dev/null
@@ -1,461 +0,0 @@
-.\" Copyright (c) 1985, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/net/resolver.3 193024 2009-05-29 07:55:44Z delphij $
-.\"
-.Dd May 29, 2009
-.Dt RESOLVER 3
-.Os
-.Sh NAME
-.Nm res_query ,
-.Nm res_search ,
-.Nm res_mkquery ,
-.Nm res_send ,
-.Nm res_init ,
-.Nm dn_comp ,
-.Nm dn_expand ,
-.Nm dn_skipname ,
-.Nm ns_get16 ,
-.Nm ns_get32 ,
-.Nm ns_put16 ,
-.Nm ns_put32
-.Nd resolver routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In netinet/in.h
-.In arpa/nameser.h
-.In resolv.h
-.Ft int
-.Fo res_query
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_search
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fo res_mkquery
-.Fa "int op"
-.Fa "const char *dname"
-.Fa "int class"
-.Fa "int type"
-.Fa "const u_char *data"
-.Fa "int datalen"
-.Fa "const u_char *newrr_in"
-.Fa "u_char *buf"
-.Fa "int buflen"
-.Fc
-.Ft int
-.Fo res_send
-.Fa "const u_char *msg"
-.Fa "int msglen"
-.Fa "u_char *answer"
-.Fa "int anslen"
-.Fc
-.Ft int
-.Fn res_init void
-.Ft int
-.Fo dn_comp
-.Fa "const char *exp_dn"
-.Fa "u_char *comp_dn"
-.Fa "int length"
-.Fa "u_char **dnptrs"
-.Fa "u_char **lastdnptr"
-.Fc
-.Ft int
-.Fo dn_expand
-.Fa "const u_char *msg"
-.Fa "const u_char *eomorig"
-.Fa "const u_char *comp_dn"
-.Fa "char *exp_dn"
-.Fa "int length"
-.Fc
-.Ft int
-.Fn dn_skipname "const u_char *comp_dn" "const u_char *eom"
-.Ft u_int
-.Fn ns_get16 "const u_char *src"
-.Ft u_long
-.Fn ns_get32 "const u_char *src"
-.Ft void
-.Fn ns_put16 "u_int src" "u_char *dst"
-.Ft void
-.Fn ns_put32 "u_long src" "u_char *dst"
-.Sh DESCRIPTION
-These routines are used for making, sending and interpreting
-query and reply messages with Internet domain name servers.
-.Pp
-Global configuration and state information that is used by the
-resolver routines is kept in the structure
-.Va _res .
-Most of the values have reasonable defaults and can be ignored.
-Options
-stored in
-.Va _res.options
-are defined in
-.In resolv.h
-and are as follows.
-Options are stored as a simple bit mask containing the bitwise ``or''
-of the options enabled.
-.Bl -tag -width RES_USE_INET6
-.It Dv RES_INIT
-True if the initial name server address and default domain name are
-initialized (i.e.,
-.Fn res_init
-has been called).
-.It Dv RES_DEBUG
-Print debugging messages.
-.It Dv RES_AAONLY
-Accept authoritative answers only.
-With this option,
-.Fn res_send
-should continue until it finds an authoritative answer or finds an error.
-Currently this is not implemented.
-.It Dv RES_USEVC
-Use
-.Tn TCP
-connections for queries instead of
-.Tn UDP
-datagrams.
-.It Dv RES_STAYOPEN
-Used with
-.Dv RES_USEVC
-to keep the
-.Tn TCP
-connection open between
-queries.
-This is useful only in programs that regularly do many queries.
-.Tn UDP
-should be the normal mode used.
-.It Dv RES_IGNTC
-Unused currently (ignore truncation errors, i.e., do not retry with
-.Tn TCP ) .
-.It Dv RES_RECURSE
-Set the recursion-desired bit in queries.
-This is the default.
-.Pf ( Fn res_send
-does not do iterative queries and expects the name server
-to handle recursion.)
-.It Dv RES_DEFNAMES
-If set,
-.Fn res_search
-will append the default domain name to single-component names
-(those that do not contain a dot).
-This option is enabled by default.
-.It Dv RES_DNSRCH
-If this option is set,
-.Fn res_search
-will search for host names in the current domain and in parent domains; see
-.Xr hostname 7 .
-This is used by the standard host lookup routine
-.Xr gethostbyname 3 .
-This option is enabled by default.
-.It Dv RES_NOALIASES
-This option turns off the user level aliasing feature controlled by the
-.Dq Ev HOSTALIASES
-environment variable.
-Network daemons should set this option.
-.It Dv RES_USE_INET6
-Enables support for IPv6-only applications.
-This causes IPv4 addresses to be returned as an IPv4 mapped address.
-For example,
-.Li 10.1.1.1
-will be returned as
-.Li ::ffff:10.1.1.1 .
-The option is meaningful with certain kernel configuration only.
-.It Dv RES_USE_EDNS0
-Enables support for OPT pseudo-RR for EDNS0 extension.
-With the option, resolver code will attach OPT pseudo-RR into DNS queries,
-to inform of our receive buffer size.
-The option will allow DNS servers to take advantage of non-default receive
-buffer size, and to send larger replies.
-DNS query packets with EDNS0 extension is not compatible with
-non-EDNS0 DNS servers.
-.El
-.Pp
-The
-.Fn res_init
-routine
-reads the configuration file (if any; see
-.Xr resolver 5 )
-to get the default domain name,
-search list and
-the Internet address of the local name server(s).
-If no server is configured, the host running
-the resolver is tried.
-The current domain name is defined by the hostname
-if not specified in the configuration file;
-it can be overridden by the environment variable
-.Ev LOCALDOMAIN .
-This environment variable may contain several blank-separated
-tokens if you wish to override the
-.Em "search list"
-on a per-process basis.
-This is similar to the
-.Ic search
-command in the configuration file.
-Another environment variable
-.Dq Ev RES_OPTIONS
-can be set to
-override certain internal resolver options which are otherwise
-set by changing fields in the
-.Va _res
-structure or are inherited from the configuration file's
-.Ic options
-command.
-The syntax of the
-.Dq Ev RES_OPTIONS
-environment variable is explained in
-.Xr resolver 5 .
-Initialization normally occurs on the first call
-to one of the following routines.
-.Pp
-The
-.Fn res_query
-function provides an interface to the server query mechanism.
-It constructs a query, sends it to the local server,
-awaits a response, and makes preliminary checks on the reply.
-The query requests information of the specified
-.Fa type
-and
-.Fa class
-for the specified fully-qualified domain name
-.Fa dname .
-The reply message is left in the
-.Fa answer
-buffer with length
-.Fa anslen
-supplied by the caller.
-.Pp
-The
-.Fn res_search
-routine makes a query and awaits a response like
-.Fn res_query ,
-but in addition, it implements the default and search rules
-controlled by the
-.Dv RES_DEFNAMES
-and
-.Dv RES_DNSRCH
-options.
-It returns the first successful reply.
-.Pp
-The remaining routines are lower-level routines used by
-.Fn res_query .
-The
-.Fn res_mkquery
-function
-constructs a standard query message and places it in
-.Fa buf .
-It returns the size of the query, or \-1 if the query is
-larger than
-.Fa buflen .
-The query type
-.Fa op
-is usually
-.Dv QUERY ,
-but can be any of the query types defined in
-.In arpa/nameser.h .
-The domain name for the query is given by
-.Fa dname .
-The
-.Fa newrr_in
-argument
-is currently unused but is intended for making update messages.
-.Pp
-The
-.Fn res_send
-routine
-sends a pre-formatted query and returns an answer.
-It will call
-.Fn res_init
-if
-.Dv RES_INIT
-is not set, send the query to the local name server, and
-handle timeouts and retries.
-The length of the reply message is returned, or
-\-1 if there were errors.
-.Pp
-The
-.Fn dn_comp
-function
-compresses the domain name
-.Fa exp_dn
-and stores it in
-.Fa comp_dn .
-The size of the compressed name is returned or \-1 if there were errors.
-The size of the array pointed to by
-.Fa comp_dn
-is given by
-.Fa length .
-The compression uses
-an array of pointers
-.Fa dnptrs
-to previously-compressed names in the current message.
-The first pointer points to
-the beginning of the message and the list ends with
-.Dv NULL .
-The limit to the array is specified by
-.Fa lastdnptr .
-A side effect of
-.Fn dn_comp
-is to update the list of pointers for
-labels inserted into the message
-as the name is compressed.
-If
-.Fa dnptr
-is
-.Dv NULL ,
-names are not compressed.
-If
-.Fa lastdnptr
-is
-.Dv NULL ,
-the list of labels is not updated.
-.Pp
-The
-.Fn dn_expand
-entry
-expands the compressed domain name
-.Fa comp_dn
-to a full domain name
-The compressed name is contained in a query or reply message;
-.Fa msg
-is a pointer to the beginning of the message.
-The uncompressed name is placed in the buffer indicated by
-.Fa exp_dn
-which is of size
-.Fa length .
-The size of compressed name is returned or \-1 if there was an error.
-.Pp
-The
-.Fn dn_skipname
-function skips over a compressed domain name, which starts at a location
-pointed to by
-.Fa comp_dn .
-The compressed name is contained in a query or reply message;
-.Fa eom
-is a pointer to the end of the message.
-The size of compressed name is returned or \-1 if there was
-an error.
-.Pp
-The
-.Fn ns_get16
-function gets a 16-bit quantity from a buffer pointed to by
-.Fa src .
-.Pp
-The
-.Fn ns_get32
-function gets a 32-bit quantity from a buffer pointed to by
-.Fa src .
-.Pp
-The
-.Fn ns_put16
-function puts a 16-bit quantity
-.Fa src
-to a buffer pointed to by
-.Fa dst .
-.Pp
-The
-.Fn ns_put32
-function puts a 32-bit quantity
-.Fa src
-to a buffer pointed to by
-.Fa dst .
-.Sh IMPLEMENTATION NOTES
-This implementation of the resolver is thread-safe, but it will not
-function properly if the programmer attempts to declare his or her own
-.Va _res
-structure in an attempt to replace the per-thread version referred to
-by that macro.
-.Pp
-The following compile-time option can be specified to change the default
-behavior of resolver routines when necessary.
-.Bl -tag -width RES_ENFORCE_RFC1034
-.It Dv RES_ENFORCE_RFC1034
-If this symbol is defined during compile-time,
-.Fn res_search
-will enforce RFC 1034 check, namely, disallow using of underscore character
-within host names.
-This is used by the standard host lookup routines like
-.Xr gethostbyname 3 .
-For compatibility reasons this option is not enabled by default.
-.El
-.Sh RETURN VALUES
-The
-.Fn res_init
-function will return 0 on success, or \-1 in a threaded program if
-per-thread storage could not be allocated.
-.Pp
-The
-.Fn res_mkquery ,
-.Fn res_search ,
-and
-.Fn res_query
-functions return the size of the response on success, or \-1 if an
-error occurs.
-The integer
-.Vt h_errno
-may be checked to determine the reason for error.
-See
-.Xr gethostbyname 3
-for more information.
-.Sh FILES
-.Bl -tag -width /etc/resolv.conf
-.It Pa /etc/resolv.conf
-The configuration file,
-see
-.Xr resolver 5 .
-.El
-.Sh SEE ALSO
-.Xr gethostbyname 3 ,
-.Xr resolver 5 ,
-.Xr hostname 7 ,
-.Xr named 8
-.Pp
-.%T RFC1032 ,
-.%T RFC1033 ,
-.%T RFC1034 ,
-.%T RFC1035 ,
-.%T RFC974
-.Rs
-.%T "Name Server Operations Guide for BIND"
-.Re
-.Sh HISTORY
-The
-.Nm
-function appeared in
-.Bx 4.3 .
diff --git a/lib/libc_bsd/net/rthdr.c b/lib/libc_bsd/net/rthdr.c
deleted file mode 100644
index 4f3bb9b..0000000
--- a/lib/libc_bsd/net/rthdr.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/*	$KAME: rthdr.c,v 1.19 2003/06/06 10:48:51 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/rthdr.c 168867 2007-04-19 15:48:16Z mtm $");
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/ip6.h>
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * RFC2292 API
- */
-
-size_t
-inet6_rthdr_space(type, seg)
-	int type, seg;
-{
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-		if (seg < 1 || seg > 23)
-			return (0);
-#ifdef COMPAT_RFC2292
-		return (CMSG_SPACE(sizeof(struct in6_addr) * (seg - 1) +
-		    sizeof(struct ip6_rthdr0)));
-#else
-		return (CMSG_SPACE(sizeof(struct in6_addr) * seg +
-		    sizeof(struct ip6_rthdr0)));
-#endif 
-	default:
-		return (0);
-	}
-}
-
-struct cmsghdr *
-inet6_rthdr_init(bp, type)
-	void *bp;
-	int type;
-{
-	struct cmsghdr *ch = (struct cmsghdr *)bp;
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(ch);
-
-	ch->cmsg_level = IPPROTO_IPV6;
-	ch->cmsg_type = IPV6_RTHDR;
-
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-#ifdef COMPAT_RFC2292
-		ch->cmsg_len = CMSG_LEN(sizeof(struct ip6_rthdr0) -
-		    sizeof(struct in6_addr));
-#else
-		ch->cmsg_len = CMSG_LEN(sizeof(struct ip6_rthdr0));
-#endif 
-
-		bzero(rthdr, sizeof(struct ip6_rthdr0));
-		rthdr->ip6r_type = IPV6_RTHDR_TYPE_0;
-		return (ch);
-	default:
-		return (NULL);
-	}
-}
-
-/* ARGSUSED */
-int
-inet6_rthdr_add(cmsg, addr, flags)
-	struct cmsghdr *cmsg;
-	const struct in6_addr *addr;
-	u_int flags;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-		if (flags != IPV6_RTHDR_LOOSE && flags != IPV6_RTHDR_STRICT)
-			return (-1);
-		if (rt0->ip6r0_segleft == 23)
-			return (-1);
-
-#ifdef COMPAT_RFC1883		/* XXX */
-		if (flags == IPV6_RTHDR_STRICT) {
-			int c, b;
-			c = rt0->ip6r0_segleft / 8;
-			b = rt0->ip6r0_segleft % 8;
-			rt0->ip6r0_slmap[c] |= (1 << (7 - b));
-		}
-#else
-		if (flags != IPV6_RTHDR_LOOSE)
-			return (-1);
-#endif 
-		rt0->ip6r0_segleft++;
-		bcopy(addr, (caddr_t)rt0 + ((rt0->ip6r0_len + 1) << 3),
-		    sizeof(struct in6_addr));
-		rt0->ip6r0_len += sizeof(struct in6_addr) >> 3;
-		cmsg->cmsg_len = CMSG_LEN((rt0->ip6r0_len + 1) << 3);
-		break;
-	}
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-/* ARGSUSED */
-int
-inet6_rthdr_lasthop(cmsg, flags)
-	struct cmsghdr *cmsg;
-	unsigned int flags;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-#ifdef COMPAT_RFC1883		/* XXX */
-		if (flags != IPV6_RTHDR_LOOSE && flags != IPV6_RTHDR_STRICT)
-			return (-1);
-#endif /* COMPAT_RFC1883 */
-		if (rt0->ip6r0_segleft > 23)
-			return (-1);
-#ifdef COMPAT_RFC1883		/* XXX */
-		if (flags == IPV6_RTHDR_STRICT) {
-			int c, b;
-			c = rt0->ip6r0_segleft / 8;
-			b = rt0->ip6r0_segleft % 8;
-			rt0->ip6r0_slmap[c] |= (1 << (7 - b));
-		}
-#else
-		if (flags != IPV6_RTHDR_LOOSE)
-			return (-1);
-#endif /* COMPAT_RFC1883 */
-		break;
-	}
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-#if 0
-int
-inet6_rthdr_reverse(in, out)
-	const struct cmsghdr *in;
-	struct cmsghdr *out;
-{
-
-	return (-1);
-}
-#endif
-
-int
-inet6_rthdr_segments(cmsg)
-	const struct cmsghdr *cmsg;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-
-		if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-			return (-1);
-
-		return (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-	}
-
-	default:
-		return (-1);
-	}
-}
-
-struct in6_addr *
-inet6_rthdr_getaddr(cmsg, idx)
-	struct cmsghdr *cmsg;
-	int idx;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-		int naddr;
-
-		if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-			return NULL;
-		naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-		if (idx <= 0 || naddr < idx)
-			return NULL;
-#ifdef COMPAT_RFC2292
-		return (((struct in6_addr *)(rt0 + 1)) + idx - 1);
-#else
-		return (((struct in6_addr *)(rt0 + 1)) + idx);
-#endif
-	}
-
-	default:
-		return NULL;
-	}
-}
-
-int
-inet6_rthdr_getflags(cmsg, idx)
-	const struct cmsghdr *cmsg;
-	int idx;
-{
-	struct ip6_rthdr *rthdr;
-
-	rthdr = (struct ip6_rthdr *)CMSG_DATA(cmsg);
-
-	switch (rthdr->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-	{
-		struct ip6_rthdr0 *rt0 = (struct ip6_rthdr0 *)rthdr;
-		int naddr;
-
-		if (rt0->ip6r0_len % 2 || 46 < rt0->ip6r0_len)
-			return (-1);
-		naddr = (rt0->ip6r0_len * 8) / sizeof(struct in6_addr);
-		if (idx < 0 || naddr < idx)
-			return (-1);
-#ifdef COMPAT_RFC1883		/* XXX */
-		if (rt0->ip6r0_slmap[idx / 8] & (0x80 >> (idx % 8)))
-			return IPV6_RTHDR_STRICT;
-		else
-			return IPV6_RTHDR_LOOSE;
-#else
-		return IPV6_RTHDR_LOOSE;
-#endif /* COMPAT_RFC1883 */
-	}
-
-	default:
-		return (-1);
-	}
-}
-
-/*
- * RFC3542 API
- */
-
-socklen_t
-inet6_rth_space(int type, int segments)
-{
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-		if ((segments >= 0) && (segments <= 127))
-			return (((segments * 2) + 1) << 3);
-		/* FALLTHROUGH */
-	default:
-		return (0);	/* type not suppported */
-	}
-}
-
-void *
-inet6_rth_init(void *bp, socklen_t bp_len, int type, int segments)
-{
-	struct ip6_rthdr *rth = (struct ip6_rthdr *)bp;
-	struct ip6_rthdr0 *rth0;
-
-	switch (type) {
-	case IPV6_RTHDR_TYPE_0:
-		/* length validation */
-		if (bp_len < inet6_rth_space(IPV6_RTHDR_TYPE_0, segments))
-			return (NULL);
-		/* segment validation */
-		if ((segments < 0) || (segments > 127))
-			return (NULL);
-
-		memset(bp, 0, bp_len);
-		rth0 = (struct ip6_rthdr0 *)rth;
-		rth0->ip6r0_len = segments * 2;
-		rth0->ip6r0_type = IPV6_RTHDR_TYPE_0;
-		rth0->ip6r0_segleft = 0;
-		rth0->ip6r0_reserved = 0;
-		break;
-	default:
-		return (NULL);	/* type not supported */
-	}
-
-	return (bp);
-}
-
-int
-inet6_rth_add(void *bp, const struct in6_addr *addr)
-{
-	struct ip6_rthdr *rth = (struct ip6_rthdr *)bp;
-	struct ip6_rthdr0 *rth0;
-	struct in6_addr *nextaddr;
-
-	switch (rth->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		rth0 = (struct ip6_rthdr0 *)rth;
-		/* Don't exceed the number of stated segments */
-		if (rth0->ip6r0_segleft == (rth0->ip6r0_len / 2))
-			return (-1);
-		nextaddr = (struct in6_addr *)(rth0 + 1) + rth0->ip6r0_segleft;
-		*nextaddr = *addr;
-		rth0->ip6r0_segleft++;
-		break;
-	default:
-		return (-1);	/* type not supported */
-	}
-
-	return (0);
-}
-
-int
-inet6_rth_reverse(const void *in, void *out)
-{
-	struct ip6_rthdr *rth_in = (struct ip6_rthdr *)in;
-	struct ip6_rthdr0 *rth0_in, *rth0_out;
-	int i, segments;
-
-	switch (rth_in->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		rth0_in = (struct ip6_rthdr0 *)in;
-		rth0_out = (struct ip6_rthdr0 *)out;
-
-		/* parameter validation XXX too paranoid? */
-		if (rth0_in->ip6r0_len % 2)
-			return (-1);
-		segments = rth0_in->ip6r0_len / 2;
-
-		/* we can't use memcpy here, since in and out may overlap */
-		memmove((void *)rth0_out, (void *)rth0_in,
-			((rth0_in->ip6r0_len) + 1) << 3);
-		rth0_out->ip6r0_segleft = segments;
-
-		/* reverse the addresses */
-		for (i = 0; i < segments / 2; i++) {
-			struct in6_addr addr_tmp, *addr1, *addr2;
-
-			addr1 = (struct in6_addr *)(rth0_out + 1) + i;
-			addr2 = (struct in6_addr *)(rth0_out + 1) +
-				(segments - i - 1);
-			addr_tmp = *addr1;
-			*addr1 = *addr2;
-			*addr2 = addr_tmp;
-		}
-
-		break;
-	default:
-		return (-1);	/* type not supported */
-	}
-
-	return (0);
-}
-
-int
-inet6_rth_segments(const void *bp)
-{
-	struct ip6_rthdr *rh = (struct ip6_rthdr *)bp;
-	struct ip6_rthdr0 *rh0;
-	int addrs;
-
-	switch (rh->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		rh0 = (struct ip6_rthdr0 *)bp;
-
-		/*
-		 * Validation for a type-0 routing header.
-		 * Is this too strict?
-		 */
-		if ((rh0->ip6r0_len % 2) != 0 ||
-		    (addrs = (rh0->ip6r0_len >> 1)) < rh0->ip6r0_segleft)
-			return (-1);
-
-		return (addrs);
-	default:
-		return (-1);	/* unknown type */
-	}
-}
-
-struct in6_addr *
-inet6_rth_getaddr(const void *bp, int idx)
-{
-	struct ip6_rthdr *rh = (struct ip6_rthdr *)bp;
-	struct ip6_rthdr0 *rh0;
-	int addrs;
-
-	switch (rh->ip6r_type) {
-	case IPV6_RTHDR_TYPE_0:
-		 rh0 = (struct ip6_rthdr0 *)bp;
-
-		/*
-		 * Validation for a type-0 routing header.
-		 * Is this too strict?
-		 */
-		if ((rh0->ip6r0_len % 2) != 0 ||
-		    (addrs = (rh0->ip6r0_len >> 1)) < rh0->ip6r0_segleft)
-			return (NULL);
-
-		if (idx < 0 || addrs <= idx)
-			return (NULL);
-
-		return (((struct in6_addr *)(rh0 + 1)) + idx);
-	default:
-		return (NULL);	/* unknown type */
-		break;
-	}
-}
diff --git a/lib/libc_bsd/net/sctp_bindx.3 b/lib/libc_bsd/net/sctp_bindx.3
deleted file mode 100644
index cd23058..0000000
--- a/lib/libc_bsd/net/sctp_bindx.3
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_bindx.3 284506 2015-06-17 09:41:16Z tuexen $
-.\"
-.Dd June 14, 2015
-.Dt SCTP_BINDX 3
-.Os
-.Sh NAME
-.Nm sctp_bindx
-.Nd bind or unbind an SCTP socket to a list of addresses.
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft int
-.Fn sctp_bindx "int s" "struct sockaddr *addrs" "int num" "int type"
-.Sh DESCRIPTION
-The
-.Fn sctp_bindx
-call binds or unbinds a address or a list of addresses to an
-SCTP endpoint.
-This allows a user to bind a subset of
-addresses.
-The
-.Fn sctp_bindx
-call operates similarly to
-.Fn bind
-but allows a list of addresses and also allows a bind or an
-unbind.
-The argument
-.Fa s
-must be a valid SCTP socket descriptor.
-The argument
-.Fa addrs
-is a list of addresses (where the list may be only 1 in
-length) that the user wishes to bind or unbind to the
-socket.
-The argument
-.Fa type
-must be one of the following values.
-.Pp
-.Dv SCTP_BINDX_ADD_ADDR
-This value indicates that the listed address(es) need to
-be added to the endpoint.
-.Pp
-.Dv SCTP_BINDX_REM_ADDR
-This value indicates that the listed address(es) need to
-be removed from the endpoint.
-.Pp
-Note that when a user adds or deletes an address to an
-association if the dynamic address flag
-.Va net.inet.sctp.auto_asconf
-is enabled any associations in the endpoint will attempt to
-have the address(es) added dynamically to the existing
-association.
-.Sh RETURN VALUES
-The call returns 0 on success and -1 upon failure.
-.Sh ERRORS
-The
-.Fn sctp_bindx
-function can return the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-This value is returned if the
-.Fa type
-field is not one of the allowed values (see above).
-.It Bq Er ENOMEM
-This value is returned if the number of addresses
-being added causes a memory allocation failure in
-the call.
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.El
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr sctp 4
diff --git a/lib/libc_bsd/net/sctp_connectx.3 b/lib/libc_bsd/net/sctp_connectx.3
deleted file mode 100644
index 951b522..0000000
--- a/lib/libc_bsd/net/sctp_connectx.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_connectx.3 251067 2013-05-28 20:37:48Z emaste $
-.\"
-.Dd June 19, 2007
-.Dt SCTP_CONNECTX 3
-.Os
-.Sh NAME
-.Nm sctp_connectx
-.Nd connect an SCTP socket with multiple destination addresses
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft int
-.Fn sctp_connectx "int sd" "struct sockaddr *addrs" "int addrcnt" "sctp_assoc_t *id"
-.Sh DESCRIPTION
-The
-.Fn sctp_connectx
-call attempts to initiate an association to a peer SCTP
-endpoint.
-The call operates similarly to
-.Fn connect
-but it also provides the ability to specify multiple destination
-addresses for the peer.
-This allows a fault tolerant method
-of initiating an association.
-When one of the peers addresses
-is unreachable, the subsequent listed addresses will also be used
-to set up the association with the peer.
-.Pp
-The user also needs to consider that any address listed in an
-.Fn sctp_connectx
-call is also considered "confirmed".
-A confirmed address is one in
-which the SCTP transport will trust is a part of the association
-and it will not send a confirmation heartbeat to it with
-a random nonce.
-.Pp
-If the peer SCTP stack does not list one or more of
-the provided addresses in its response message then
-the extra addresses sent in the
-.Fn sctp_connectx
-call will be silently discarded from the association.
-On
-successful completion the provided
-.Fa id
-will be
-filled in with the association identification of the newly
-forming association.
-.Sh RETURN VALUES
-The call returns 0 on success and -1 upon failure.
-.Sh ERRORS
-The
-.Fn sctp_connectx
-function can return the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-An address listed has an invalid family or no
-addresses were provided.
-.It Bq Er E2BIG
-The size of the address list exceeds the amount of
-data provided.
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.El
-.Sh SEE ALSO
-.Xr connect 2 ,
-.Xr sctp 4
diff --git a/lib/libc_bsd/net/sctp_freepaddrs.3 b/lib/libc_bsd/net/sctp_freepaddrs.3
deleted file mode 100644
index abb76cd..0000000
--- a/lib/libc_bsd/net/sctp_freepaddrs.3
+++ /dev/null
@@ -1,64 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_freepaddrs.3 251067 2013-05-28 20:37:48Z emaste $
-.\"
-.Dd December 15, 2006
-.Dt SCTP_FREEPADDRS 3
-.Os
-.Sh NAME
-.Nm sctp_freepaddrs ,
-.Nm sctp_freeladdrs
-.Nd release the memory returned from a previous call
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft void
-.Fn sctp_freepaddrs "struct sockaddr *"
-.Ft void
-.Fn sctp_freeladdrs "struct sockaddr *"
-.Sh DESCRIPTION
-The
-.Fn sctp_freepaddrs
-and
-.Fn sctp_freeladdrs
-functions are used to release the memory allocated by previous
-calls to
-.Fn sctp_getpaddrs
-or
-.Fn sctp_getladdrs
-respectively.
-.Sh RETURN VALUES
-none.
-.Sh SEE ALSO
-.Xr sctp_getladdrs 3 ,
-.Xr sctp_getpaddrs 3 ,
-.Xr sctp 4
diff --git a/lib/libc_bsd/net/sctp_getaddrlen.3 b/lib/libc_bsd/net/sctp_getaddrlen.3
deleted file mode 100644
index d7fc424..0000000
--- a/lib/libc_bsd/net/sctp_getaddrlen.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_getaddrlen.3 251067 2013-05-28 20:37:48Z emaste $
-.\"
-.Dd December 15, 2006
-.Dt SCTP_GETADDRLEN 3
-.Os
-.Sh NAME
-.Nm sctp_getaddrlen
-.Nd return the address length of an address family
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft int
-.Fn sctp_getaddrlen "sa_family_t family"
-.Sh DESCRIPTION
-The
-.Fn sctp_getaddrlen
-function returns the size of a specific address family.
-This function
-is provided for application binary compatibility since it
-provides the application with the size the operating system
-thinks the specific address family is.
-Note that the function
-will actually create an SCTP socket and then gather the
-information via a
-.Fn getsockopt
-system calls.
-If for some reason a SCTP socket cannot
-be created or the
-.Fn getsockopt
-call fails, an error will be returned
-with
-.Va errno
-set as specified in the
-.Fn socket
-or
-.Fn getsockopt
-system call.
-.Sh RETURN VALUES
-The call returns the number of bytes that the operating
-system expects for the specific address family or -1.
-.Sh ERRORS
-The
-.Fn sctp_getaddrlen
-function can return the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The address family specified does NOT exist.
-.El
-.Sh SEE ALSO
-.Xr getsockopt 2 ,
-.Xr socket 2 ,
-.Xr sctp 4
diff --git a/lib/libc_bsd/net/sctp_getassocid.3 b/lib/libc_bsd/net/sctp_getassocid.3
deleted file mode 100644
index 6e95ef7..0000000
--- a/lib/libc_bsd/net/sctp_getassocid.3
+++ /dev/null
@@ -1,70 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_getassocid.3 251067 2013-05-28 20:37:48Z emaste $
-.\"
-.Dd December 15, 2006
-.Dt SCTP_GETASSOCID 3
-.Os
-.Sh NAME
-.Nm sctp_getassocid
-.Nd return an association id for a specified socket address.
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft sctp_assoc_t
-.Fn sctp_getassocid "int s" "struct sockaddr *addr"
-.Sh DESCRIPTION
-The
-.Fn sctp_getassocid
-call attempts to look up the specified socket address
-.Fa addr
-and find the respective association identification.
-.Sh RETURN VALUES
-The call returns the association id upon success and
-0 is returned upon failure.
-.Sh ERRORS
-The
-.Fn sctp_getassocid
-function can return the following errors:
-.Bl -tag -width Er
-.It Bq Er ENOENT
-The address does not have an association setup to it.
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.El
-.Sh SEE ALSO
-.Xr sctp 4
diff --git a/lib/libc_bsd/net/sctp_getpaddrs.3 b/lib/libc_bsd/net/sctp_getpaddrs.3
deleted file mode 100644
index 7a95bd6..0000000
--- a/lib/libc_bsd/net/sctp_getpaddrs.3
+++ /dev/null
@@ -1,96 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_getpaddrs.3 251067 2013-05-28 20:37:48Z emaste $
-.\"
-.Dd December 15, 2006
-.Dt SCTP_GETPADDRS 3
-.Os
-.Sh NAME
-.Nm sctp_getpaddrs ,
-.Nm sctp_getladdrs
-.Nd return a list of addresses to the caller
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft int
-.Fn sctp_getpaddrs "int s" "sctp_assoc_t asocid" "struct sockaddr **addrs"
-.Ft int
-.Fn sctp_getladdrs "int s" "sctp_assoc_t asocid" "struct sockaddr **addrs"
-.Sh DESCRIPTION
-The
-.Fn sctp_getpaddrs
-function is used to get the list of the peers addresses.
-The
-.Fn sctp_getladdrs
-function is used to get the list of the local addresses.
-The association of interest is identified by the
-.Fa asocid
-argument.
-The addresses are returned in a newly allocated
-array of socket addresses returned in the argument
-.Fa addrs
-upon success.
-.Pp
-After the caller is finished, the function
-.Fn sctp_freepaddrs
-or
-.Fn sctp_freeladdrs
-should be used to release the memory allocated by these
-calls.
-.Sh RETURN VALUES
-The call returns -1 upon failure and a count of
-the number of addresses returned in
-.Fa addrs
-upon success.
-.Sh ERRORS
-The functions can return the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-An address listed has an invalid family or no
-addresses were provided.
-.It Bq Er ENOMEM
-The call cannot allocate memory to hold the
-socket addresses.
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.El
-.Sh SEE ALSO
-.Xr getsockopt 2 ,
-.Xr sctp_freeladdrs 3 ,
-.Xr sctp_freepaddrs 3 ,
-.Xr sctp 4
diff --git a/lib/libc_bsd/net/sctp_opt_info.3 b/lib/libc_bsd/net/sctp_opt_info.3
deleted file mode 100644
index 4df741d..0000000
--- a/lib/libc_bsd/net/sctp_opt_info.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_opt_info.3 251067 2013-05-28 20:37:48Z emaste $
-.\"
-.Dd June 18, 2011
-.Dt SCTP_OPT_INFO 3
-.Os
-.Sh NAME
-.Nm sctp_opt_info
-.Nd get SCTP socket information
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft int
-.Fn sctp_opt_info "int sd" "sctp_assoc_t id" "int opt" "void *arg" "socklen_t *size"
-.Sh DESCRIPTION
-The
-.Fn sctp_opt_info
-call provides a multi-os compatible method for getting
-specific
-.Fn getsockopt
-data where an association identification needs to be passed
-into the operating system.
-For
-.Fx
-a direct
-.Fn getsockopt
-may be used, since
-.Fx
-has the ability to pass information
-into the operating system on a
-.Fn getsockopt
-call.
-Other operating systems may not have this ability.
-For those
-who wish to write portable code amongst multiple operating systems
-this call should be used for the following SCTP
-socket options.
-.Pp
-.Dv SCTP_RTOINFO
-.Pp
-.Dv SCTP_ASSOCINFO
-.Pp
-.Dv SCTP_PRIMARY_ADDR
-.Pp
-.Dv SCTP_PEER_ADDR_PARAMS
-.Pp
-.Dv SCTP_DEFAULT_SEND_PARAM
-.Pp
-.Dv SCTP_MAX_SEG
-.Pp
-.Dv SCTP_AUTH_ACTIVE_KEY
-.Pp
-.Dv SCTP_DELAYED_SACK
-.Pp
-.Dv SCTP_MAX_BURST
-.Pp
-.Dv SCTP_CONTEXT
-.Pp
-.Dv SCTP_EVENT
-.Pp
-.Dv SCTP_DEFAULT_SNDINFO
-.Pp
-.Dv SCTP_DEFAULT_PRINFO
-.Pp
-.Dv SCTP_STATUS
-.Pp
-.Dv SCTP_GET_PEER_ADDR_INFO
-.Pp
-.Dv SCTP_PEER_AUTH_CHUNKS
-.Pp
-.Dv SCTP_LOCAL_AUTH_CHUNKS
-.Sh RETURN VALUES
-The call returns 0 on success and -1 upon error.
-.Sh ERRORS
-The
-.Fn sctp_opt_info
-function can return the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The argument
-.Fa arg
-value was invalid.
-.It Bq Er EOPNOTSUPP
-The argument
-.Fa opt
-was not one of the above listed SCTP socket
-options.
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.El
-.Sh SEE ALSO
-.Xr getsockopt 2 ,
-.Xr sctp 4
-.Sh BUGS
-Because the structure used for
-.Fa arg
-of the
-.Dv SCTP_MAX_BURST
-socket option has changed in FreeBSD 9.0 and higher,
-using
-.Dv SCTP_MAX_BURST
-as
-.Fa opt
-is only supported in FreeBSD 9.0 and higher.
diff --git a/lib/libc_bsd/net/sctp_recvmsg.3 b/lib/libc_bsd/net/sctp_recvmsg.3
deleted file mode 100644
index 3b3d965..0000000
--- a/lib/libc_bsd/net/sctp_recvmsg.3
+++ /dev/null
@@ -1,294 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_recvmsg.3 283739 2015-05-29 13:32:08Z tuexen $
-.\"
-.Dd April 23, 2015
-.Dt SCTP_RECVMSG 3
-.Os
-.Sh NAME
-.Nm sctp_recvmsg
-.Nd receive a message from an SCTP socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft ssize_t
-.Fo sctp_recvmsg
-.Fa "int s" "void *msg" "size_t len" "struct sockaddr * restrict from"
-.Fa "socklen_t * restrict fromlen" "struct sctp_sndrcvinfo *sinfo" "int *flags"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn sctp_recvmsg
-system call
-is used to receive a message from another SCTP endpoint.
-The
-.Fn sctp_recvmsg
-call is used by one-to-one (SOCK_STREAM) type sockets after a
-successful
-.Fn connect
-call or after the application has performed a
-.Fn listen
-followed by a successful
-.Fn accept .
-For a one-to-many (SOCK_SEQPACKET) type socket, an endpoint may call
-.Fn sctp_recvmsg
-after having implicitly started an association via one
-of the send calls including
-.Fn sctp_sendmsg ,
-.Fn sendto
-and
-.Fn sendmsg .
-Or, an application may also receive a message after having
-called
-.Fn listen
-with a positive backlog to enable the reception of new associations.
-.Pp
-The address of the sender is held in the
-.Fa from
-argument with
-.Fa fromlen
-specifying its size.
-At the completion of a successful
-.Fn sctp_recvmsg
-call
-.Fa from
-will hold the address of the peer and
-.Fa fromlen
-will hold the length of that address.
-Note that
-the address is bounded by the initial value of
-.Fa fromlen
-which is used as an in/out variable.
-.Pp
-The length of the message
-.Fa msg
-to be received is bounded by
-.Fa len .
-If the message is too long to fit in the users
-receive buffer, then the
-.Fa flags
-argument will
-.Em not
-have the
-.Dv MSG_EOR
-flag applied.
-If the message is a complete message then
-the
-.Fa flags
-argument will have
-.Dv MSG_EOR
-set.
-Locally detected errors are
-indicated by a return value of -1 with
-.Va errno
-set accordingly.
-The
-.Fa flags
-argument may also hold the value
-.Dv MSG_NOTIFICATION .
-When this
-occurs it indicates that the message received is
-.Em not
-from
-the peer endpoint, but instead is a notification from the
-SCTP stack (see
-.Xr sctp 4
-for more details).
-Note that no notifications are ever
-given unless the user subscribes to such notifications using
-the
-.Dv SCTP_EVENTS
-socket option.
-.Pp
-If no messages are available at the socket then
-.Fn sctp_recvmsg
-normally blocks on the reception of a message or NOTIFICATION, unless the
-socket has been placed in non-blocking I/O mode.
-The
-.Xr select 2
-system call may be used to determine when it is possible to
-receive a message.
-.Pp
-The
-.Fa sinfo
-argument is defined as follows.
-.Bd -literal
-struct sctp_sndrcvinfo {
-	uint16_t sinfo_stream;  /* Stream arriving on */
-	uint16_t sinfo_ssn;     /* Stream Sequence Number */
-	uint16_t sinfo_flags;   /* Flags on the incoming message */
-	uint32_t sinfo_ppid;    /* The ppid field */
-	uint32_t sinfo_context; /* context field */
-	uint32_t sinfo_timetolive; /* not used by sctp_recvmsg */
-	uint32_t sinfo_tsn;        /* The transport sequence number */
-	uint32_t sinfo_cumtsn;     /* The cumulative acknowledgment point  */
-	sctp_assoc_t sinfo_assoc_id; /* The association id of the peer */
-};
-.Ed
-.Pp
-The
-.Fa sinfo->sinfo_ppid
-field is an opaque 32 bit value that is passed transparently
-through the stack from the peer endpoint.
-Note that the stack passes this value without regard to byte
-order.
-.Pp
-The
-.Fa sinfo->sinfo_flags
-field may include the following:
-.Bd -literal
-#define SCTP_UNORDERED 	  0x0400	/* Message is un-ordered */
-.Ed
-.Pp
-The
-.Dv SCTP_UNORDERED
-flag is used to specify that the message arrived with no
-specific order and was delivered to the peer application
-as soon as possible.
-When this flag is absent the message
-was delivered in order within the stream it was received.
-.Pp
-The
-.Fa sinfo->sinfo_stream
-field is the SCTP stream that the message was received on.
-Streams in SCTP are reliable (or partially reliable) flows of ordered
-messages.
-.Pp
-The
-.Fa sinfo->sinfo_context
-field is used only if the local application set an association level
-context with the
-.Dv SCTP_CONTEXT
-socket option.
-Optionally a user process can use this value to index some application
-specific data structure for all data coming from a specific
-association.
-.Pp
-The
-.Fa sinfo->sinfo_ssn
-field will hold the stream sequence number assigned
-by the peer endpoint if the message is
-.Em not
-unordered.
-For unordered messages this field holds an undefined value.
-.Pp
-The
-.Fa sinfo->sinfo_tsn
-field holds a transport sequence number (TSN) that was assigned
-to this message by the peer endpoint.
-For messages that fit in or less
-than the path MTU this will be the only TSN assigned.
-Note that for messages that span multiple TSNs this
-value will be one of the TSNs that was used on the
-message.
-.Pp
-The
-.Fa sinfo->sinfo_cumtsn
-field holds the current cumulative acknowledgment point of
-the transport association.
-Note that this may be larger
-or smaller than the TSN assigned to the message itself.
-.Pp
-The
-.Fa sinfo->sinfo_assoc_id
-is the unique association identification that was assigned
-to the association.
-For one-to-many (SOCK_SEQPACKET) type
-sockets this value can be used to send data to the peer without
-the use of an address field.
-It is also quite useful in
-setting various socket options on the specific association
-(see
-.Xr sctp 4 ) .
-.Pp
-The
-.Fa sinfo->info_timetolive
-field is not used by
-.Fn sctp_recvmsg .
-.Sh RETURN VALUES
-The call returns the number of bytes received, or -1
-if an error occurred.
-.Sh ERRORS
-The
-.Fn sctp_recvmsg
-system call
-fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-An invalid descriptor was specified.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.It Bq Er EFAULT
-An invalid user space address was specified for an argument.
-.It Bq Er EMSGSIZE
-The socket requires that message be sent atomically,
-and the size of the message to be sent made this impossible.
-.It Bq Er EAGAIN
-The socket is marked non-blocking and the requested operation
-would block.
-.It Bq Er ENOBUFS
-The system was unable to allocate an internal buffer.
-The operation may succeed when buffers become available.
-.It Bq Er ENOBUFS
-The output queue for a network interface was full.
-This generally indicates that the interface has stopped sending,
-but may be caused by transient congestion.
-.It Bq Er EHOSTUNREACH
-The remote host was unreachable.
-.It Bq Er ENOTCONN
-On a one-to-one style socket no association exists.
-.It Bq Er ECONNRESET
-An abort was received by the stack while the user was
-attempting to send data to the peer.
-.It Bq Er ENOENT
-On a one to many style socket no address is specified
-so that the association cannot be located or the
-SCTP_ABORT flag was specified on a non-existing association.
-.It Bq Er EPIPE
-The socket is unable to send anymore data
-.Dv ( SBS_CANTSENDMORE
-has been set on the socket).
-This typically means that the socket
-is not connected and is a one-to-one style socket.
-.El
-.Sh SEE ALSO
-.Xr recv 2 ,
-.Xr select 2 ,
-.Xr socket 2 ,
-.Xr write 2 ,
-.Xr getsockopt 2 ,
-.Xr setsockopt 2 ,
-.Xr sctp_send 3 ,
-.Xr sctp_sendmsg 3 ,
-.Xr sendmsg 3 ,
-.Xr sctp 4
diff --git a/lib/libc_bsd/net/sctp_send.3 b/lib/libc_bsd/net/sctp_send.3
deleted file mode 100644
index 96e7692..0000000
--- a/lib/libc_bsd/net/sctp_send.3
+++ /dev/null
@@ -1,350 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_send.3 251067 2013-05-28 20:37:48Z emaste $
-.\"
-.Dd December 15, 2006
-.Dt SCTP_SEND 3
-.Os
-.Sh NAME
-.Nm sctp_send ,
-.Nm sctp_sendx
-.Nd send a message from an SCTP socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft ssize_t
-.Fo sctp_send
-.Fa "int sd" "const void *msg" "size_t len"
-.Fa "const struct sctp_sndrcvinfo *sinfo" "int flags"
-.Fc
-.Ft ssize_t
-.Fo sctp_sendx
-.Fa "int sd" "const void *msg" "size_t len" "struct sockaddr *addrs"
-.Fa "int addrcnt" "const struct sctp_sndrcvinfo *sinfo" "int flags"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn sctp_send
-system call
-is used to transmit a message to another SCTP endpoint.
-.Fn sctp_send
-may be used to send data to an existing association for both
-one-to-many (SOCK_SEQPACKET) and one-to-one (SOCK_STREAM) socket types.
-The length of the message
-.Fa msg
-is given by
-.Fa len .
-If the message is too long to pass atomically through the
-underlying protocol,
-.Va errno
-is set to
-.Er EMSGSIZE ,
--1 is returned, and
-the message is not transmitted.
-.Pp
-No indication of failure to deliver is implicit in a
-.Fn sctp_send .
-Locally detected errors are indicated by a return value of -1.
-.Pp
-If no space is available at the socket to hold
-the message to be transmitted, then
-.Fn sctp_send
-normally blocks, unless the socket has been placed in
-non-blocking I/O mode.
-The
-.Xr select 2
-system call may be used to determine when it is possible to
-send more data on one-to-one type (SOCK_STREAM) sockets.
-.Pp
-The
-.Fa sinfo
-structure is used to control various SCTP features
-and has the following format:
-.Bd -literal
-struct sctp_sndrcvinfo {
-	uint16_t sinfo_stream;  /* Stream sending to */
-	uint16_t sinfo_ssn;     /* valid for recv only */
-	uint16_t sinfo_flags;   /* flags to control sending */
-	uint32_t sinfo_ppid;    /* ppid field */
-	uint32_t sinfo_context; /* context field */
-	uint32_t sinfo_timetolive; /* timetolive for PR-SCTP */
-	uint32_t sinfo_tsn;        /* valid for recv only */
-	uint32_t sinfo_cumtsn;     /* valid for recv only */
-	sctp_assoc_t sinfo_assoc_id; /* The association id */
-};
-.Ed
-.Pp
-The
-.Fa sinfo->sinfo_ppid
-argument is an opaque 32 bit value that is passed transparently
-through the stack to the peer endpoint. It will be available on
-reception of a message (see
-.Xr sctp_recvmsg 3 ) .
-Note that the stack passes this value without regard to byte
-order.
-.Pp
-The
-.Fa sinfo->sinfo_flags
-argument may include one or more of the following:
-.Bd -literal
-#define SCTP_EOF 	  0x0100	/* Start a shutdown procedures */
-#define SCTP_ABORT	  0x0200	/* Send an ABORT to peer */
-#define SCTP_UNORDERED 	  0x0400	/* Message is un-ordered */
-#define SCTP_ADDR_OVER	  0x0800	/* Override the primary-address */
-#define SCTP_SENDALL      0x1000	/* Send this on all associations */
-					/* for the endpoint */
-/* The lower byte is an enumeration of PR-SCTP policies */
-#define SCTP_PR_SCTP_TTL  0x0001	/* Time based PR-SCTP */
-#define SCTP_PR_SCTP_BUF  0x0002	/* Buffer based PR-SCTP */
-#define SCTP_PR_SCTP_RTX  0x0003	/* Number of retransmissions based PR-SCTP */
-.Ed
-.Pp
-The flag
-.Dv SCTP_EOF
-is used to instruct the SCTP stack to queue this message
-and then start a graceful shutdown of the association.
-All
-remaining data in queue will be sent after which the association
-will be shut down.
-.Pp
-.Dv SCTP_ABORT
-is used to immediately terminate an association.
-An abort
-is sent to the peer and the local TCB is destroyed.
-.Pp
-.Dv SCTP_UNORDERED
-is used to specify that the message being sent has no
-specific order and should be delivered to the peer application
-as soon as possible.
-When this flag is absent messages
-are delivered in order within the stream they are sent, but without
-respect to order to peer streams.
-.Pp
-The flag
-.Dv SCTP_ADDR_OVER
-is used to specify that a specific address should be used.
-Normally
-SCTP will use only one of a multi-homed peers addresses as the primary
-address to send to.
-By default, no matter what the
-.Fa to
-argument is, this primary address is used to send data.
-By specifying
-this flag, the user is asking the stack to ignore the primary address
-and instead use the specified address not only as a lookup mechanism
-to find the association but also as the actual address to send to.
-.Pp
-For a one-to-many type (SOCK_SEQPACKET) socket the flag
-.Dv SCTP_SENDALL
-can be used as a convenient way to make one send call and have
-all associations that are under the socket get a copy of the message.
-Note that this mechanism is quite efficient and makes only one actual
-copy of the data which is shared by all the associations for sending.
-.Pp
-The remaining flags are used for the partial reliability extension (RFC3758)
-and will only be effective if the peer endpoint supports this extension.
-This option specifies what local policy the local endpoint should use
-in skipping data.
-If none of these options are set, then data is
-never skipped over.
-.Pp
-.Dv SCTP_PR_SCTP_TTL
-is used to indicate that a time based lifetime is being applied
-to the data.
-The
-.Fa sinfo->sinfo_timetolive
-argument is then a number of milliseconds for which the data is
-attempted to be transmitted.
-If that many milliseconds elapse
-and the peer has not acknowledged the data, the data will be
-skipped and no longer transmitted.
-Note that this policy does
-not even assure that the data will ever be sent.
-In times of a congestion
-with large amounts of data being queued, the
-.Fa sinfo->sinfo_timetolive
-may expire before the first transmission is ever made.
-.Pp
-The
-.Dv SCTP_PR_SCTP_BUF
-based policy transforms the
-.Fa sinfo->sinfo_timetolive
-field into a total number of bytes allowed on the outbound
-send queue.
-If that number or more bytes are in queue, then
-other buffer-based sends are looked to be removed and
-skipped.
-Note that this policy may also result in the data
-never being sent if no buffer based sends are in queue and
-the maximum specified by
-.Fa timetolive
-bytes is in queue.
-.Pp
-The
-.Dv SCTP_PR_SCTP_RTX
-policy transforms the
-.Fa sinfo->sinfo_timetolive
-into a number of retransmissions to allow.
-This policy
-always assures that at a minimum one send attempt is
-made of the data.
-After which no more than
-.Fa sinfo->sinfo_timetolive
-retransmissions will be made before the data is skipped.
-.Pp
-.Fa sinfo->sinfo_stream
-is the SCTP stream that you wish to send the
-message on.
-Streams in SCTP are reliable (or partially reliable) flows of ordered
-messages.
-.Pp
-The
-.Fa sinfo->sinfo_assoc_id
-field is used to
-select the association to send to on a one-to-many socket.
-For a one-to-one socket, this field is ignored.
-.Pp
-The
-.Fa sinfo->sinfo_context
-field is used only in the event the message cannot be sent.
-This is an opaque
-value that the stack retains and will give to the user when a failed send
-is given if that notification is enabled (see
-.Xr sctp 4 ) .
-Normally a user process can use this value to index some application
-specific data structure when a send cannot be fulfilled.
-.Pp
-The
-.Fa flags
-argument holds the same meaning and values as those found in
-.Xr sendmsg 2
-but is generally ignored by SCTP.
-.Pp
-The fields
-.Fa sinfo->sinfo_ssn ,
-.Fa sinfo->sinfo_tsn ,
-and
-.Fa sinfo->sinfo_cumtsn
-are used only when receiving messages and are thus ignored by
-.Fn sctp_send .
-The function
-.Fn sctp_sendx
-has the same properties as
-.Fn sctp_send
-with the additional arguments of an array of sockaddr structures
-passed in.
-With the
-.Fa addrs
-argument being given as an array of addresses to be sent to and
-the
-.Fa addrcnt
-argument indicating how many socket addresses are in the passed
-in array.
-Note that all of the addresses will only be used
-when an implicit association is being set up.
-This allows the
-user the equivalent behavior as doing a
-.Fn sctp_connectx
-followed by a
-.Fn sctp_send
-to the association.
-Note that if the
-.Fa sinfo->sinfo_assoc_id
-field is 0, then the first address will be used to look up
-the association in place of the association id.
-If both
-an address and an association id are specified, the association
-id has priority.
-.Sh RETURN VALUES
-The call returns the number of characters sent, or -1
-if an error occurred.
-.Sh ERRORS
-The
-.Fn sctp_send
-system call
-fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-An invalid descriptor was specified.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.It Bq Er EFAULT
-An invalid user space address was specified for an argument.
-.It Bq Er EMSGSIZE
-The socket requires that message be sent atomically,
-and the size of the message to be sent made this impossible.
-.It Bq Er EAGAIN
-The socket is marked non-blocking and the requested operation
-would block.
-.It Bq Er ENOBUFS
-The system was unable to allocate an internal buffer.
-The operation may succeed when buffers become available.
-.It Bq Er ENOBUFS
-The output queue for a network interface was full.
-This generally indicates that the interface has stopped sending,
-but may be caused by transient congestion.
-.It Bq Er EHOSTUNREACH
-The remote host was unreachable.
-.It Bq Er ENOTCONN
-On a one-to-one style socket no association exists.
-.It Bq Er ECONNRESET
-An abort was received by the stack while the user was
-attempting to send data to the peer.
-.It Bq Er ENOENT
-On a one-to-many style socket no address is specified
-so that the association cannot be located or the
-SCTP_ABORT flag was specified on a non-existing association.
-.It Bq Er EPIPE
-The socket is unable to send anymore data
-.Dv ( SBS_CANTSENDMORE
-has been set on the socket).
-This typically means that the socket
-is not connected and is a one-to-one style socket.
-.El
-.Sh SEE ALSO
-.Xr getsockopt 2 ,
-.Xr recv 2 ,
-.Xr select 2 ,
-.Xr sendmsg 2 ,
-.Xr socket 2 ,
-.Xr write 2
-.Xr sctp_connectx 3 ,
-.Xr sctp_recvmsg 3 ,
-.Xr sctp_sendmsg 3 ,
-.Xr sctp 4
-.Sh BUGS
-Because
-.Fn sctp_send
-may have multiple associations under one endpoint, a
-select on write will only work for a one-to-one style
-socket.
diff --git a/lib/libc_bsd/net/sctp_sendmsg.3 b/lib/libc_bsd/net/sctp_sendmsg.3
deleted file mode 100644
index 0d4ec27..0000000
--- a/lib/libc_bsd/net/sctp_sendmsg.3
+++ /dev/null
@@ -1,329 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: releng/10.2/lib/libc/net/sctp_sendmsg.3 251067 2013-05-28 20:37:48Z emaste $
-.\"
-.Dd December 15, 2006
-.Dt SCTP_SENDMSG 3
-.Os
-.Sh NAME
-.Nm sctp_sendmsg ,
-.Nm sctp_sendmsgx
-.Nd send a message from an SCTP socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft ssize_t
-.Fo sctp_sendmsg
-.Fa "int s" "const void *msg" "size_t len" "const struct sockaddr *to"
-.Fa "socklen_t tolen" "uint32_t ppid" "uint32_t flags" "uint16_t stream_no"
-.Fa "uint32_t timetolive" "uint32_t context"
-.Fc
-.Ft ssize_t
-.Fo sctp_sendmsgx
-.Fa "int s" "const void *msg" "size_t len" "const struct sockaddr *to"
-.Fa "int addrcnt" "uint32_t ppid" "uint32_t flags" "uint16_t stream_no"
-.Fa "uint32_t timetolive" "uint32_t context"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn sctp_sendmsg
-system call
-is used to transmit a message to another SCTP endpoint.
-The
-.Fn sctp_sendmsg
-may be used at any time.
-If the socket is a one-to-many type (SOCK_SEQPACKET)
-socket then an attempt to send to an address that no association exists to will
-implicitly create a new association.
-Data sent in such an instance will result in
-the data being sent on the third leg of the SCTP four-way handshake.
-Note that if
-the socket is a one-to-one type (SOCK_STREAM) socket then an association must
-be in existence (by use of the
-.Xr connect 2
-system call).
-Calling
-.Fn sctp_sendmsg
-or
-.Fn sctp_sendmsgx
-on a non-connected one-to-one socket will result in
-.Va errno
-being set to
-.Er ENOTCONN ,
--1 being returned, and the message not being transmitted.
-.Pp
-The address of the target is given by
-.Fa to
-with
-.Fa tolen
-specifying its size.
-The length of the message
-.Fa msg
-is given by
-.Fa len .
-If the message is too long to pass atomically through the
-underlying protocol,
-.Va errno
-is set to
-.Er EMSGSIZE ,
--1 is returned, and
-the message is not transmitted.
-.Pp
-No indication of failure to deliver is implicit in a
-.Xr sctp_sendmsg 3
-call.
-Locally detected errors are indicated by a return value of -1.
-.Pp
-If no space is available at the socket to hold
-the message to be transmitted, then
-.Xr sctp_sendmsg 3
-normally blocks, unless the socket has been placed in
-non-blocking I/O mode.
-The
-.Xr select 2
-system call may be used to determine when it is possible to
-send more data on one-to-one type (SOCK_STREAM) sockets.
-.Pp
-The
-.Fa ppid
-argument is an opaque 32 bit value that is passed transparently
-through the stack to the peer endpoint.
-It will be available on
-reception of a message (see
-.Xr sctp_recvmsg 3 ) .
-Note that the stack passes this value without regard to byte
-order.
-.Pp
-The
-.Fa flags
-argument may include one or more of the following:
-.Bd -literal
-#define SCTP_EOF 	  0x0100	/* Start a shutdown procedures */
-#define SCTP_ABORT	  0x0200	/* Send an ABORT to peer */
-#define SCTP_UNORDERED 	  0x0400	/* Message is un-ordered */
-#define SCTP_ADDR_OVER	  0x0800	/* Override the primary-address */
-#define SCTP_SENDALL      0x1000	/* Send this on all associations */
-					/* for the endpoint */
-/* The lower byte is an enumeration of PR-SCTP policies */
-#define SCTP_PR_SCTP_TTL  0x0001	/* Time based PR-SCTP */
-#define SCTP_PR_SCTP_BUF  0x0002	/* Buffer based PR-SCTP */
-#define SCTP_PR_SCTP_RTX  0x0003	/* Number of retransmissions based PR-SCTP */
-.Ed
-.Pp
-The flag
-.Dv SCTP_EOF
-is used to instruct the SCTP stack to queue this message
-and then start a graceful shutdown of the association.
-All
-remaining data in queue will be sent after which the association
-will be shut down.
-.Pp
-.Dv SCTP_ABORT
-is used to immediately terminate an association.
-An abort
-is sent to the peer and the local TCB is destroyed.
-.Pp
-.Dv SCTP_UNORDERED
-is used to specify that the message being sent has no
-specific order and should be delivered to the peer application
-as soon as possible.
-When this flag is absent messages
-are delivered in order within the stream they are sent, but without
-respect to order to peer streams.
-.Pp
-The flag
-.Dv SCTP_ADDR_OVER
-is used to specify that an specific address should be used.
-Normally
-SCTP will use only one of a multi-homed peers addresses as the primary
-address to send to.
-By default, no matter what the
-.Fa to
-argument is, this primary address is used to send data.
-By specifying
-this flag, the user is asking the stack to ignore the primary address
-and instead use the specified address not only as a lookup mechanism
-to find the association but also as the actual address to send to.
-.Pp
-For a one-to-many type (SOCK_SEQPACKET) socket the flag
-.Dv SCTP_SENDALL
-can be used as a convenient way to make one send call and have
-all associations that are under the socket get a copy of the message.
-Note that this mechanism is quite efficient and makes only one actual
-copy of the data which is shared by all the associations for sending.
-.Pp
-The remaining flags are used for the partial reliability extension (RFC3758)
-and will only be effective if the peer endpoint supports this extension.
-This option specifies what local policy the local endpoint should use
-in skipping data.
-If none of these options are set, then data is
-never skipped over.
-.Pp
-.Dv SCTP_PR_SCTP_TTL
-is used to indicate that a time based lifetime is being applied
-to the data.
-The
-.Fa timetolive
-argument is then a number of milliseconds for which the data is
-attempted to be transmitted.
-If that many milliseconds elapse
-and the peer has not acknowledged the data, the data will be
-skipped and no longer transmitted.
-Note that this policy does
-not even assure that the data will ever be sent.
-In times of a congestion
-with large amounts of data being queued, the
-.Fa timetolive
-may expire before the first transmission is ever made.
-.Pp
-The
-.Dv SCTP_PR_SCTP_BUF
-based policy transforms the
-.Fa timetolive
-field into a total number of bytes allowed on the outbound
-send queue.
-If that number or more bytes are in queue, then
-other buffer based sends are looked to be removed and
-skipped.
-Note that this policy may also result in the data
-never being sent if no buffer based sends are in queue and
-the maximum specified by
-.Fa timetolive
-bytes is in queue.
-.Pp
-The
-.Dv SCTP_PR_SCTP_RTX
-policy transforms the
-.Fa timetolive
-into a number of retransmissions to allow.
-This policy
-always assures that at a minimum one send attempt is
-made of the data.
-After which no more than
-.Fa timetolive
-retransmissions will be made before the data is skipped.
-.Pp
-.Fa stream_no
-is the SCTP stream that you wish to send the
-message on.
-Streams in SCTP are reliable (or partially reliable) flows of ordered
-messages.
-The
-.Fa context
-field is used only in the event the message cannot be sent.
-This is an opaque
-value that the stack retains and will give to the user when a failed send
-is given if that notification is enabled (see
-.Xr sctp 4 ) .
-Normally a user process can use this value to index some application
-specific data structure when a send cannot be fulfilled.
-.Fn sctp_sendmsgx
-is identical to
-.Fn sctp_sendmsg
-with the exception that it takes an array of sockaddr structures in the
-argument
-.Fa to
-and adds the additional argument
-.Fa addrcnt
-which specifies how many addresses are in the array.
-This allows a
-caller to implicitly set up an association passing multiple addresses
-as if
-.Fn sctp_connectx
-had been called to set up the association.
-.Sh RETURN VALUES
-The call returns the number of characters sent, or -1
-if an error occurred.
-.Sh ERRORS
-The
-.Fn sctp_sendmsg
-system call
-fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-An invalid descriptor was specified.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.It Bq Er EFAULT
-An invalid user space address was specified for an argument.
-.It Bq Er EMSGSIZE
-The socket requires that message be sent atomically,
-and the size of the message to be sent made this impossible.
-.It Bq Er EAGAIN
-The socket is marked non-blocking and the requested operation
-would block.
-.It Bq Er ENOBUFS
-The system was unable to allocate an internal buffer.
-The operation may succeed when buffers become available.
-.It Bq Er ENOBUFS
-The output queue for a network interface was full.
-This generally indicates that the interface has stopped sending,
-but may be caused by transient congestion.
-.It Bq Er EHOSTUNREACH
-The remote host was unreachable.
-.It Bq Er ENOTCONN
-On a one-to-one style socket no association exists.
-.It Bq Er ECONNRESET
-An abort was received by the stack while the user was
-attempting to send data to the peer.
-.It Bq Er ENOENT
-On a one-to-many style socket no address is specified
-so that the association cannot be located or the
-.Dv SCTP_ABORT
-flag was specified on a non-existing association.
-.It Bq Er EPIPE
-The socket is unable to send anymore data
-.Dv ( SBS_CANTSENDMORE
-has been set on the socket).
-This typically means that the socket
-is not connected and is a one-to-one style socket.
-.El
-.Sh SEE ALSO
-.Xr connect 2 ,
-.Xr getsockopt 2 ,
-.Xr recv 2 ,
-.Xr select 2 ,
-.Xr socket 2 ,
-.Xr write 2 ,
-.Xr sctp_connectx 3 ,
-.Xr sendmsg 3 ,
-.Xr sctp 4
-.Sh BUGS
-Because in the one-to-many style socket
-.Fn sctp_sendmsg
-or
-.Fn sctp_sendmsgx
-may have multiple associations under one endpoint, a
-select on write will only work for a one-to-one style
-socket.
diff --git a/lib/libc_bsd/net/sctp_sys_calls.c b/lib/libc_bsd/net/sctp_sys_calls.c
deleted file mode 100644
index 7342af1..0000000
--- a/lib/libc_bsd/net/sctp_sys_calls.c
+++ /dev/null
@@ -1,1191 +0,0 @@
-/*-
- * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
- * Copyright (c) 2008-2012, by Randall Stewart. All rights reserved.
- * Copyright (c) 2008-2012, by Michael Tuexen. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * a) Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- *
- * b) 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.
- *
- * c) Neither the name of Cisco Systems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/sctp_sys_calls.c 283724 2015-05-29 12:54:30Z tuexen $");
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/errno.h>
-#include <sys/syscall.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netinet/sctp_uio.h>
-#include <netinet/sctp.h>
-
-#ifndef IN6_IS_ADDR_V4MAPPED
-#define IN6_IS_ADDR_V4MAPPED(a)		      \
-	((*(const uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) &&	\
-	 (*(const uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
-#endif
-
-#define SCTP_CONTROL_VEC_SIZE_RCV  16384
-
-
-static void
-in6_sin6_2_sin(struct sockaddr_in *sin, struct sockaddr_in6 *sin6)
-{
-	bzero(sin, sizeof(*sin));
-	sin->sin_len = sizeof(struct sockaddr_in);
-	sin->sin_family = AF_INET;
-	sin->sin_port = sin6->sin6_port;
-	sin->sin_addr.s_addr = sin6->sin6_addr.__u6_addr.__u6_addr32[3];
-}
-
-int
-sctp_getaddrlen(sa_family_t family)
-{
-	int ret, sd;
-	socklen_t siz;
-	struct sctp_assoc_value av;
-
-	av.assoc_value = family;
-	siz = sizeof(av);
-#if defined(AF_INET)
-	sd = socket(AF_INET, SOCK_SEQPACKET, IPPROTO_SCTP);
-#elif defined(AF_INET6)
-	sd = socket(AF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP);
-#else
-	sd = -1;
-#endif
-	if (sd == -1) {
-		return (-1);
-	}
-	ret = getsockopt(sd, IPPROTO_SCTP, SCTP_GET_ADDR_LEN, &av, &siz);
-	close(sd);
-	if (ret == 0) {
-		return ((int)av.assoc_value);
-	} else {
-		return (-1);
-	}
-}
-
-int
-sctp_connectx(int sd, const struct sockaddr *addrs, int addrcnt,
-    sctp_assoc_t * id)
-{
-	char *buf;
-	int i, ret, *aa;
-	char *cpto;
-	const struct sockaddr *at;
-	size_t len;
-
-	/* validate the address count and list */
-	if ((addrs == NULL) || (addrcnt <= 0)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if ((buf = malloc(sizeof(int) + (size_t)addrcnt * sizeof(struct sockaddr_in6))) == NULL) {
-		errno = E2BIG;
-		return (-1);
-	}
-	len = sizeof(int);
-	at = addrs;
-	cpto = buf + sizeof(int);
-	/* validate all the addresses and get the size */
-	for (i = 0; i < addrcnt; i++) {
-		switch (at->sa_family) {
-		case AF_INET:
-			if (at->sa_len != sizeof(struct sockaddr_in)) {
-				free(buf);
-				errno = EINVAL;
-				return (-1);
-			}
-			memcpy(cpto, at, sizeof(struct sockaddr_in));
-			cpto = ((caddr_t)cpto + sizeof(struct sockaddr_in));
-			len += sizeof(struct sockaddr_in);
-			break;
-		case AF_INET6:
-			if (at->sa_len != sizeof(struct sockaddr_in6)) {
-				free(buf);
-				errno = EINVAL;
-				return (-1);
-			}
-			if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)at)->sin6_addr)) {
-				in6_sin6_2_sin((struct sockaddr_in *)cpto, (struct sockaddr_in6 *)at);
-				cpto = ((caddr_t)cpto + sizeof(struct sockaddr_in));
-				len += sizeof(struct sockaddr_in);
-			} else {
-				memcpy(cpto, at, sizeof(struct sockaddr_in6));
-				cpto = ((caddr_t)cpto + sizeof(struct sockaddr_in6));
-				len += sizeof(struct sockaddr_in6);
-			}
-			break;
-		default:
-			free(buf);
-			errno = EINVAL;
-			return (-1);
-		}
-		at = (struct sockaddr *)((caddr_t)at + at->sa_len);
-	}
-	aa = (int *)buf;
-	*aa = addrcnt;
-	ret = setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X, (void *)buf,
-	    (socklen_t) len);
-	if ((ret == 0) && (id != NULL)) {
-		*id = *(sctp_assoc_t *) buf;
-	}
-	free(buf);
-	return (ret);
-}
-
-int
-sctp_bindx(int sd, struct sockaddr *addrs, int addrcnt, int flags)
-{
-	struct sctp_getaddresses *gaddrs;
-	struct sockaddr *sa;
-	struct sockaddr_in *sin;
-	struct sockaddr_in6 *sin6;
-	int i;
-	size_t argsz;
-	uint16_t sport = 0;
-
-	/* validate the flags */
-	if ((flags != SCTP_BINDX_ADD_ADDR) &&
-	    (flags != SCTP_BINDX_REM_ADDR)) {
-		errno = EFAULT;
-		return (-1);
-	}
-	/* validate the address count and list */
-	if ((addrcnt <= 0) || (addrs == NULL)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	/* First pre-screen the addresses */
-	sa = addrs;
-	for (i = 0; i < addrcnt; i++) {
-		switch (sa->sa_family) {
-		case AF_INET:
-			if (sa->sa_len != sizeof(struct sockaddr_in)) {
-				errno = EINVAL;
-				return (-1);
-			}
-			sin = (struct sockaddr_in *)sa;
-			if (sin->sin_port) {
-				/* non-zero port, check or save */
-				if (sport) {
-					/* Check against our port */
-					if (sport != sin->sin_port) {
-						errno = EINVAL;
-						return (-1);
-					}
-				} else {
-					/* save off the port */
-					sport = sin->sin_port;
-				}
-			}
-			break;
-		case AF_INET6:
-			if (sa->sa_len != sizeof(struct sockaddr_in6)) {
-				errno = EINVAL;
-				return (-1);
-			}
-			sin6 = (struct sockaddr_in6 *)sa;
-			if (sin6->sin6_port) {
-				/* non-zero port, check or save */
-				if (sport) {
-					/* Check against our port */
-					if (sport != sin6->sin6_port) {
-						errno = EINVAL;
-						return (-1);
-					}
-				} else {
-					/* save off the port */
-					sport = sin6->sin6_port;
-				}
-			}
-			break;
-		default:
-			/* Invalid address family specified. */
-			errno = EAFNOSUPPORT;
-			return (-1);
-		}
-		sa = (struct sockaddr *)((caddr_t)sa + sa->sa_len);
-	}
-	argsz = sizeof(struct sctp_getaddresses) +
-	    sizeof(struct sockaddr_storage);
-	if ((gaddrs = (struct sctp_getaddresses *)malloc(argsz)) == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	sa = addrs;
-	for (i = 0; i < addrcnt; i++) {
-		memset(gaddrs, 0, argsz);
-		gaddrs->sget_assoc_id = 0;
-		memcpy(gaddrs->addr, sa, sa->sa_len);
-		/*
-		 * Now, if there was a port mentioned, assure that the first
-		 * address has that port to make sure it fails or succeeds
-		 * correctly.
-		 */
-		if ((i == 0) && (sport != 0)) {
-			switch (gaddrs->addr->sa_family) {
-			case AF_INET:
-				sin = (struct sockaddr_in *)gaddrs->addr;
-				sin->sin_port = sport;
-				break;
-			case AF_INET6:
-				sin6 = (struct sockaddr_in6 *)gaddrs->addr;
-				sin6->sin6_port = sport;
-				break;
-			}
-		}
-		if (setsockopt(sd, IPPROTO_SCTP, flags, gaddrs,
-		    (socklen_t) argsz) != 0) {
-			free(gaddrs);
-			return (-1);
-		}
-		sa = (struct sockaddr *)((caddr_t)sa + sa->sa_len);
-	}
-	free(gaddrs);
-	return (0);
-}
-
-int
-sctp_opt_info(int sd, sctp_assoc_t id, int opt, void *arg, socklen_t * size)
-{
-	if (arg == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if ((id == SCTP_CURRENT_ASSOC) ||
-	    (id == SCTP_ALL_ASSOC)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	switch (opt) {
-	case SCTP_RTOINFO:
-		((struct sctp_rtoinfo *)arg)->srto_assoc_id = id;
-		break;
-	case SCTP_ASSOCINFO:
-		((struct sctp_assocparams *)arg)->sasoc_assoc_id = id;
-		break;
-	case SCTP_DEFAULT_SEND_PARAM:
-		((struct sctp_assocparams *)arg)->sasoc_assoc_id = id;
-		break;
-	case SCTP_PRIMARY_ADDR:
-		((struct sctp_setprim *)arg)->ssp_assoc_id = id;
-		break;
-	case SCTP_PEER_ADDR_PARAMS:
-		((struct sctp_paddrparams *)arg)->spp_assoc_id = id;
-		break;
-	case SCTP_MAXSEG:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_AUTH_KEY:
-		((struct sctp_authkey *)arg)->sca_assoc_id = id;
-		break;
-	case SCTP_AUTH_ACTIVE_KEY:
-		((struct sctp_authkeyid *)arg)->scact_assoc_id = id;
-		break;
-	case SCTP_DELAYED_SACK:
-		((struct sctp_sack_info *)arg)->sack_assoc_id = id;
-		break;
-	case SCTP_CONTEXT:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_STATUS:
-		((struct sctp_status *)arg)->sstat_assoc_id = id;
-		break;
-	case SCTP_GET_PEER_ADDR_INFO:
-		((struct sctp_paddrinfo *)arg)->spinfo_assoc_id = id;
-		break;
-	case SCTP_PEER_AUTH_CHUNKS:
-		((struct sctp_authchunks *)arg)->gauth_assoc_id = id;
-		break;
-	case SCTP_LOCAL_AUTH_CHUNKS:
-		((struct sctp_authchunks *)arg)->gauth_assoc_id = id;
-		break;
-	case SCTP_TIMEOUTS:
-		((struct sctp_timeouts *)arg)->stimo_assoc_id = id;
-		break;
-	case SCTP_EVENT:
-		((struct sctp_event *)arg)->se_assoc_id = id;
-		break;
-	case SCTP_DEFAULT_SNDINFO:
-		((struct sctp_sndinfo *)arg)->snd_assoc_id = id;
-		break;
-	case SCTP_DEFAULT_PRINFO:
-		((struct sctp_default_prinfo *)arg)->pr_assoc_id = id;
-		break;
-	case SCTP_PEER_ADDR_THLDS:
-		((struct sctp_paddrthlds *)arg)->spt_assoc_id = id;
-		break;
-	case SCTP_REMOTE_UDP_ENCAPS_PORT:
-		((struct sctp_udpencaps *)arg)->sue_assoc_id = id;
-		break;
-	case SCTP_ECN_SUPPORTED:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_PR_SUPPORTED:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_AUTH_SUPPORTED:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_ASCONF_SUPPORTED:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_RECONFIG_SUPPORTED:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_NRSACK_SUPPORTED:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_PKTDROP_SUPPORTED:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_MAX_BURST:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_ENABLE_STREAM_RESET:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	case SCTP_PR_STREAM_STATUS:
-		((struct sctp_prstatus *)arg)->sprstat_assoc_id = id;
-		break;
-	case SCTP_PR_ASSOC_STATUS:
-		((struct sctp_prstatus *)arg)->sprstat_assoc_id = id;
-		break;
-	case SCTP_MAX_CWND:
-		((struct sctp_assoc_value *)arg)->assoc_id = id;
-		break;
-	default:
-		break;
-	}
-	return (getsockopt(sd, IPPROTO_SCTP, opt, arg, size));
-}
-
-int
-sctp_getpaddrs(int sd, sctp_assoc_t id, struct sockaddr **raddrs)
-{
-	struct sctp_getaddresses *addrs;
-	struct sockaddr *sa;
-	sctp_assoc_t asoc;
-	caddr_t lim;
-	socklen_t opt_len;
-	int cnt;
-
-	if (raddrs == NULL) {
-		errno = EFAULT;
-		return (-1);
-	}
-	asoc = id;
-	opt_len = (socklen_t) sizeof(sctp_assoc_t);
-	if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_REMOTE_ADDR_SIZE,
-	    &asoc, &opt_len) != 0) {
-		return (-1);
-	}
-	/* size required is returned in 'asoc' */
-	opt_len = (socklen_t) ((size_t)asoc + sizeof(struct sctp_getaddresses));
-	addrs = calloc(1, (size_t)opt_len);
-	if (addrs == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	addrs->sget_assoc_id = id;
-	/* Now lets get the array of addresses */
-	if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES,
-	    addrs, &opt_len) != 0) {
-		free(addrs);
-		return (-1);
-	}
-	*raddrs = (struct sockaddr *)&addrs->addr[0];
-	cnt = 0;
-	sa = (struct sockaddr *)&addrs->addr[0];
-	lim = (caddr_t)addrs + opt_len;
-	while (((caddr_t)sa < lim) && (sa->sa_len > 0)) {
-		sa = (struct sockaddr *)((caddr_t)sa + sa->sa_len);
-		cnt++;
-	}
-	return (cnt);
-}
-
-void
-sctp_freepaddrs(struct sockaddr *addrs)
-{
-	void *fr_addr;
-
-	/* Take away the hidden association id */
-	fr_addr = (void *)((caddr_t)addrs - sizeof(sctp_assoc_t));
-	/* Now free it */
-	free(fr_addr);
-}
-
-int
-sctp_getladdrs(int sd, sctp_assoc_t id, struct sockaddr **raddrs)
-{
-	struct sctp_getaddresses *addrs;
-	caddr_t lim;
-	struct sockaddr *sa;
-	size_t size_of_addresses;
-	socklen_t opt_len;
-	int cnt;
-
-	if (raddrs == NULL) {
-		errno = EFAULT;
-		return (-1);
-	}
-	size_of_addresses = 0;
-	opt_len = (socklen_t) sizeof(int);
-	if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDR_SIZE,
-	    &size_of_addresses, &opt_len) != 0) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	if (size_of_addresses == 0) {
-		errno = ENOTCONN;
-		return (-1);
-	}
-	opt_len = (socklen_t) (size_of_addresses +
-	    sizeof(struct sockaddr_storage) +
-	    sizeof(struct sctp_getaddresses));
-	addrs = calloc(1, (size_t)opt_len);
-	if (addrs == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	addrs->sget_assoc_id = id;
-	/* Now lets get the array of addresses */
-	if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs,
-	    &opt_len) != 0) {
-		free(addrs);
-		errno = ENOMEM;
-		return (-1);
-	}
-	*raddrs = (struct sockaddr *)&addrs->addr[0];
-	cnt = 0;
-	sa = (struct sockaddr *)&addrs->addr[0];
-	lim = (caddr_t)addrs + opt_len;
-	while (((caddr_t)sa < lim) && (sa->sa_len > 0)) {
-		sa = (struct sockaddr *)((caddr_t)sa + sa->sa_len);
-		cnt++;
-	}
-	return (cnt);
-}
-
-void
-sctp_freeladdrs(struct sockaddr *addrs)
-{
-	void *fr_addr;
-
-	/* Take away the hidden association id */
-	fr_addr = (void *)((caddr_t)addrs - sizeof(sctp_assoc_t));
-	/* Now free it */
-	free(fr_addr);
-}
-
-ssize_t
-sctp_sendmsg(int s,
-    const void *data,
-    size_t len,
-    const struct sockaddr *to,
-    socklen_t tolen,
-    uint32_t ppid,
-    uint32_t flags,
-    uint16_t stream_no,
-    uint32_t timetolive,
-    uint32_t context)
-{
-#ifdef SYS_sctp_generic_sendmsg
-	struct sctp_sndrcvinfo sinfo;
-
-	memset(&sinfo, 0, sizeof(struct sctp_sndrcvinfo));
-	sinfo.sinfo_ppid = ppid;
-	sinfo.sinfo_flags = flags;
-	sinfo.sinfo_stream = stream_no;
-	sinfo.sinfo_timetolive = timetolive;
-	sinfo.sinfo_context = context;
-	sinfo.sinfo_assoc_id = 0;
-	return (syscall(SYS_sctp_generic_sendmsg, s,
-	    data, len, to, tolen, &sinfo, 0));
-#else
-	struct msghdr msg;
-	struct sctp_sndrcvinfo *sinfo;
-	struct iovec iov;
-	char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
-	struct cmsghdr *cmsg;
-	struct sockaddr *who = NULL;
-	union {
-		struct sockaddr_in in;
-		struct sockaddr_in6 in6;
-	}     addr;
-
-	if ((tolen > 0) &&
-	    ((to == NULL) || (tolen < sizeof(struct sockaddr)))) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if ((to != NULL) && (tolen > 0)) {
-		switch (to->sa_family) {
-		case AF_INET:
-			if (tolen != sizeof(struct sockaddr_in)) {
-				errno = EINVAL;
-				return (-1);
-			}
-			if ((to->sa_len > 0) &&
-			    (to->sa_len != sizeof(struct sockaddr_in))) {
-				errno = EINVAL;
-				return (-1);
-			}
-			memcpy(&addr, to, sizeof(struct sockaddr_in));
-			addr.in.sin_len = sizeof(struct sockaddr_in);
-			break;
-		case AF_INET6:
-			if (tolen != sizeof(struct sockaddr_in6)) {
-				errno = EINVAL;
-				return (-1);
-			}
-			if ((to->sa_len > 0) &&
-			    (to->sa_len != sizeof(struct sockaddr_in6))) {
-				errno = EINVAL;
-				return (-1);
-			}
-			memcpy(&addr, to, sizeof(struct sockaddr_in6));
-			addr.in6.sin6_len = sizeof(struct sockaddr_in6);
-			break;
-		default:
-			errno = EAFNOSUPPORT;
-			return (-1);
-		}
-		who = (struct sockaddr *)&addr;
-	}
-	iov.iov_base = (char *)data;
-	iov.iov_len = len;
-
-	if (who) {
-		msg.msg_name = (caddr_t)who;
-		msg.msg_namelen = who->sa_len;
-	} else {
-		msg.msg_name = (caddr_t)NULL;
-		msg.msg_namelen = 0;
-	}
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = cmsgbuf;
-	msg.msg_controllen = CMSG_SPACE(sizeof(struct sctp_sndrcvinfo));
-	msg.msg_flags = 0;
-	cmsg = (struct cmsghdr *)cmsgbuf;
-	cmsg->cmsg_level = IPPROTO_SCTP;
-	cmsg->cmsg_type = SCTP_SNDRCV;
-	cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
-	sinfo = (struct sctp_sndrcvinfo *)CMSG_DATA(cmsg);
-	memset(sinfo, 0, sizeof(struct sctp_sndrcvinfo));
-	sinfo->sinfo_stream = stream_no;
-	sinfo->sinfo_ssn = 0;
-	sinfo->sinfo_flags = flags;
-	sinfo->sinfo_ppid = ppid;
-	sinfo->sinfo_context = context;
-	sinfo->sinfo_assoc_id = 0;
-	sinfo->sinfo_timetolive = timetolive;
-	return (sendmsg(s, &msg, 0));
-#endif
-}
-
-
-sctp_assoc_t
-sctp_getassocid(int sd, struct sockaddr *sa)
-{
-	struct sctp_paddrinfo sp;
-	socklen_t siz;
-
-	/* First get the assoc id */
-	siz = sizeof(sp);
-	memset(&sp, 0, sizeof(sp));
-	memcpy((caddr_t)&sp.spinfo_address, sa, sa->sa_len);
-	if (getsockopt(sd, IPPROTO_SCTP,
-	    SCTP_GET_PEER_ADDR_INFO, &sp, &siz) != 0) {
-		/* We depend on the fact that 0 can never be returned */
-		return ((sctp_assoc_t) 0);
-	}
-	return (sp.spinfo_assoc_id);
-}
-
-ssize_t
-sctp_send(int sd, const void *data, size_t len,
-    const struct sctp_sndrcvinfo *sinfo,
-    int flags)
-{
-
-#ifdef SYS_sctp_generic_sendmsg
-	struct sockaddr *to = NULL;
-
-	return (syscall(SYS_sctp_generic_sendmsg, sd,
-	    data, len, to, 0, sinfo, flags));
-#else
-	struct msghdr msg;
-	struct iovec iov;
-	char cmsgbuf[CMSG_SPACE(sizeof(struct sctp_sndrcvinfo))];
-	struct cmsghdr *cmsg;
-
-	if (sinfo == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	iov.iov_base = (char *)data;
-	iov.iov_len = len;
-
-	msg.msg_name = NULL;
-	msg.msg_namelen = 0;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = cmsgbuf;
-	msg.msg_controllen = CMSG_SPACE(sizeof(struct sctp_sndrcvinfo));
-	msg.msg_flags = 0;
-	cmsg = (struct cmsghdr *)cmsgbuf;
-	cmsg->cmsg_level = IPPROTO_SCTP;
-	cmsg->cmsg_type = SCTP_SNDRCV;
-	cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
-	memcpy(CMSG_DATA(cmsg), sinfo, sizeof(struct sctp_sndrcvinfo));
-	return (sendmsg(sd, &msg, flags));
-#endif
-}
-
-
-
-ssize_t
-sctp_sendx(int sd, const void *msg, size_t msg_len,
-    struct sockaddr *addrs, int addrcnt,
-    struct sctp_sndrcvinfo *sinfo,
-    int flags)
-{
-	struct sctp_sndrcvinfo __sinfo;
-	ssize_t ret;
-	int i, cnt, *aa, saved_errno;
-	char *buf;
-	int no_end_cx = 0;
-	size_t len, add_len;
-	struct sockaddr *at;
-
-	if (addrs == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-#ifdef SYS_sctp_generic_sendmsg
-	if (addrcnt == 1) {
-		socklen_t l;
-
-		/*
-		 * Quick way, we don't need to do a connectx so lets use the
-		 * syscall directly.
-		 */
-		l = addrs->sa_len;
-		return (syscall(SYS_sctp_generic_sendmsg, sd,
-		    msg, msg_len, addrs, l, sinfo, flags));
-	}
-#endif
-
-	len = sizeof(int);
-	at = addrs;
-	cnt = 0;
-	/* validate all the addresses and get the size */
-	for (i = 0; i < addrcnt; i++) {
-		if (at->sa_family == AF_INET) {
-			add_len = sizeof(struct sockaddr_in);
-		} else if (at->sa_family == AF_INET6) {
-			add_len = sizeof(struct sockaddr_in6);
-		} else {
-			errno = EINVAL;
-			return (-1);
-		}
-		len += add_len;
-		at = (struct sockaddr *)((caddr_t)at + add_len);
-		cnt++;
-	}
-	/* do we have any? */
-	if (cnt == 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-	buf = malloc(len);
-	if (buf == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	aa = (int *)buf;
-	*aa = cnt;
-	aa++;
-	memcpy((caddr_t)aa, addrs, (size_t)(len - sizeof(int)));
-	ret = setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X_DELAYED, (void *)buf,
-	    (socklen_t) len);
-
-	free(buf);
-	if (ret != 0) {
-		if (errno == EALREADY) {
-			no_end_cx = 1;
-			goto continue_send;
-		}
-		return (ret);
-	}
-continue_send:
-	if (sinfo == NULL) {
-		sinfo = &__sinfo;
-		memset(&__sinfo, 0, sizeof(__sinfo));
-	}
-	sinfo->sinfo_assoc_id = sctp_getassocid(sd, addrs);
-	if (sinfo->sinfo_assoc_id == 0) {
-		(void)setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X_COMPLETE, (void *)addrs,
-		    (socklen_t) addrs->sa_len);
-		errno = ENOENT;
-		return (-1);
-	}
-	ret = sctp_send(sd, msg, msg_len, sinfo, flags);
-	saved_errno = errno;
-	if (no_end_cx == 0)
-		(void)setsockopt(sd, IPPROTO_SCTP, SCTP_CONNECT_X_COMPLETE, (void *)addrs,
-		    (socklen_t) addrs->sa_len);
-
-	errno = saved_errno;
-	return (ret);
-}
-
-ssize_t
-sctp_sendmsgx(int sd,
-    const void *msg,
-    size_t len,
-    struct sockaddr *addrs,
-    int addrcnt,
-    uint32_t ppid,
-    uint32_t flags,
-    uint16_t stream_no,
-    uint32_t timetolive,
-    uint32_t context)
-{
-	struct sctp_sndrcvinfo sinfo;
-
-	memset((void *)&sinfo, 0, sizeof(struct sctp_sndrcvinfo));
-	sinfo.sinfo_ppid = ppid;
-	sinfo.sinfo_flags = flags;
-	sinfo.sinfo_ssn = stream_no;
-	sinfo.sinfo_timetolive = timetolive;
-	sinfo.sinfo_context = context;
-	return (sctp_sendx(sd, msg, len, addrs, addrcnt, &sinfo, 0));
-}
-
-ssize_t
-sctp_recvmsg(int s,
-    void *dbuf,
-    size_t len,
-    struct sockaddr *from,
-    socklen_t * fromlen,
-    struct sctp_sndrcvinfo *sinfo,
-    int *msg_flags)
-{
-#ifdef SYS_sctp_generic_recvmsg
-	struct iovec iov;
-
-	iov.iov_base = dbuf;
-	iov.iov_len = len;
-	return (syscall(SYS_sctp_generic_recvmsg, s,
-	    &iov, 1, from, fromlen, sinfo, msg_flags));
-#else
-	ssize_t sz;
-	struct msghdr msg;
-	struct iovec iov;
-	char cmsgbuf[SCTP_CONTROL_VEC_SIZE_RCV];
-	struct cmsghdr *cmsg;
-
-	if (msg_flags == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	iov.iov_base = dbuf;
-	iov.iov_len = len;
-	msg.msg_name = (caddr_t)from;
-	if (fromlen == NULL)
-		msg.msg_namelen = 0;
-	else
-		msg.msg_namelen = *fromlen;
-	msg.msg_iov = &iov;
-	msg.msg_iovlen = 1;
-	msg.msg_control = cmsgbuf;
-	msg.msg_controllen = sizeof(cmsgbuf);
-	msg.msg_flags = 0;
-	sz = recvmsg(s, &msg, *msg_flags);
-	*msg_flags = msg.msg_flags;
-	if (sz <= 0) {
-		return (sz);
-	}
-	if (sinfo) {
-		sinfo->sinfo_assoc_id = 0;
-	}
-	if ((msg.msg_controllen > 0) && (sinfo != NULL)) {
-		/*
-		 * parse through and see if we find the sctp_sndrcvinfo (if
-		 * the user wants it).
-		 */
-		for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-			if (cmsg->cmsg_level != IPPROTO_SCTP) {
-				continue;
-			}
-			if (cmsg->cmsg_type == SCTP_SNDRCV) {
-				memcpy(sinfo, CMSG_DATA(cmsg), sizeof(struct sctp_sndrcvinfo));
-				break;
-			}
-			if (cmsg->cmsg_type == SCTP_EXTRCV) {
-				/*
-				 * Let's hope that the user provided enough
-				 * enough memory. At least he asked for more
-				 * information.
-				 */
-				memcpy(sinfo, CMSG_DATA(cmsg), sizeof(struct sctp_extrcvinfo));
-				break;
-			}
-		}
-	}
-	return (sz);
-#endif
-}
-
-ssize_t 
-sctp_recvv(int sd,
-    const struct iovec *iov,
-    int iovlen,
-    struct sockaddr *from,
-    socklen_t * fromlen,
-    void *info,
-    socklen_t * infolen,
-    unsigned int *infotype,
-    int *flags)
-{
-	char cmsgbuf[SCTP_CONTROL_VEC_SIZE_RCV];
-	struct msghdr msg;
-	struct cmsghdr *cmsg;
-	ssize_t ret;
-	struct sctp_rcvinfo *rcvinfo;
-	struct sctp_nxtinfo *nxtinfo;
-
-	if (((info != NULL) && (infolen == NULL)) ||
-	    ((info == NULL) && (infolen != NULL) && (*infolen != 0)) ||
-	    ((info != NULL) && (infotype == NULL))) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (infotype) {
-		*infotype = SCTP_RECVV_NOINFO;
-	}
-	msg.msg_name = from;
-	if (fromlen == NULL) {
-		msg.msg_namelen = 0;
-	} else {
-		msg.msg_namelen = *fromlen;
-	}
-	msg.msg_iov = (struct iovec *)iov;
-	msg.msg_iovlen = iovlen;
-	msg.msg_control = cmsgbuf;
-	msg.msg_controllen = sizeof(cmsgbuf);
-	msg.msg_flags = 0;
-	ret = recvmsg(sd, &msg, *flags);
-	*flags = msg.msg_flags;
-	if ((ret > 0) &&
-	    (msg.msg_controllen > 0) &&
-	    (infotype != NULL) &&
-	    (infolen != NULL) &&
-	    (*infolen > 0)) {
-		rcvinfo = NULL;
-		nxtinfo = NULL;
-		for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-			if (cmsg->cmsg_level != IPPROTO_SCTP) {
-				continue;
-			}
-			if (cmsg->cmsg_type == SCTP_RCVINFO) {
-				rcvinfo = (struct sctp_rcvinfo *)CMSG_DATA(cmsg);
-				if (nxtinfo != NULL) {
-					break;
-				} else {
-					continue;
-				}
-			}
-			if (cmsg->cmsg_type == SCTP_NXTINFO) {
-				nxtinfo = (struct sctp_nxtinfo *)CMSG_DATA(cmsg);
-				if (rcvinfo != NULL) {
-					break;
-				} else {
-					continue;
-				}
-			}
-		}
-		if (rcvinfo != NULL) {
-			if ((nxtinfo != NULL) && (*infolen >= sizeof(struct sctp_recvv_rn))) {
-				struct sctp_recvv_rn *rn_info;
-
-				rn_info = (struct sctp_recvv_rn *)info;
-				rn_info->recvv_rcvinfo = *rcvinfo;
-				rn_info->recvv_nxtinfo = *nxtinfo;
-				*infolen = (socklen_t) sizeof(struct sctp_recvv_rn);
-				*infotype = SCTP_RECVV_RN;
-			} else if (*infolen >= sizeof(struct sctp_rcvinfo)) {
-				memcpy(info, rcvinfo, sizeof(struct sctp_rcvinfo));
-				*infolen = (socklen_t) sizeof(struct sctp_rcvinfo);
-				*infotype = SCTP_RECVV_RCVINFO;
-			}
-		} else if (nxtinfo != NULL) {
-			if (*infolen >= sizeof(struct sctp_nxtinfo)) {
-				memcpy(info, nxtinfo, sizeof(struct sctp_nxtinfo));
-				*infolen = (socklen_t) sizeof(struct sctp_nxtinfo);
-				*infotype = SCTP_RECVV_NXTINFO;
-			}
-		}
-	}
-	return (ret);
-}
-
-ssize_t
-sctp_sendv(int sd,
-    const struct iovec *iov, int iovcnt,
-    struct sockaddr *addrs, int addrcnt,
-    void *info, socklen_t infolen, unsigned int infotype,
-    int flags)
-{
-	ssize_t ret;
-	int i;
-	socklen_t addr_len;
-	struct msghdr msg;
-	in_port_t port;
-	struct sctp_sendv_spa *spa_info;
-	struct cmsghdr *cmsg;
-	char *cmsgbuf;
-	struct sockaddr *addr;
-	struct sockaddr_in *addr_in;
-	struct sockaddr_in6 *addr_in6;
-
-	if ((addrcnt < 0) ||
-	    (iovcnt < 0) ||
-	    ((addrs == NULL) && (addrcnt > 0)) ||
-	    ((addrs != NULL) && (addrcnt == 0)) ||
-	    ((iov == NULL) && (iovcnt > 0)) ||
-	    ((iov != NULL) && (iovcnt == 0))) {
-		errno = EINVAL;
-		return (-1);
-	}
-	cmsgbuf = malloc(CMSG_SPACE(sizeof(struct sctp_sndinfo)) +
-	    CMSG_SPACE(sizeof(struct sctp_prinfo)) +
-	    CMSG_SPACE(sizeof(struct sctp_authinfo)) +
-	    (size_t)addrcnt * CMSG_SPACE(sizeof(struct in6_addr)));
-	if (cmsgbuf == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	msg.msg_control = cmsgbuf;
-	msg.msg_controllen = 0;
-	cmsg = (struct cmsghdr *)cmsgbuf;
-	switch (infotype) {
-	case SCTP_SENDV_NOINFO:
-		if ((infolen != 0) || (info != NULL)) {
-			free(cmsgbuf);
-			errno = EINVAL;
-			return (-1);
-		}
-		break;
-	case SCTP_SENDV_SNDINFO:
-		if ((info == NULL) || (infolen < sizeof(struct sctp_sndinfo))) {
-			free(cmsgbuf);
-			errno = EINVAL;
-			return (-1);
-		}
-		cmsg->cmsg_level = IPPROTO_SCTP;
-		cmsg->cmsg_type = SCTP_SNDINFO;
-		cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndinfo));
-		memcpy(CMSG_DATA(cmsg), info, sizeof(struct sctp_sndinfo));
-		msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_sndinfo));
-		cmsg = (struct cmsghdr *)((caddr_t)cmsg + CMSG_SPACE(sizeof(struct sctp_sndinfo)));
-		break;
-	case SCTP_SENDV_PRINFO:
-		if ((info == NULL) || (infolen < sizeof(struct sctp_prinfo))) {
-			free(cmsgbuf);
-			errno = EINVAL;
-			return (-1);
-		}
-		cmsg->cmsg_level = IPPROTO_SCTP;
-		cmsg->cmsg_type = SCTP_PRINFO;
-		cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_prinfo));
-		memcpy(CMSG_DATA(cmsg), info, sizeof(struct sctp_prinfo));
-		msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_prinfo));
-		cmsg = (struct cmsghdr *)((caddr_t)cmsg + CMSG_SPACE(sizeof(struct sctp_prinfo)));
-		break;
-	case SCTP_SENDV_AUTHINFO:
-		if ((info == NULL) || (infolen < sizeof(struct sctp_authinfo))) {
-			free(cmsgbuf);
-			errno = EINVAL;
-			return (-1);
-		}
-		cmsg->cmsg_level = IPPROTO_SCTP;
-		cmsg->cmsg_type = SCTP_AUTHINFO;
-		cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_authinfo));
-		memcpy(CMSG_DATA(cmsg), info, sizeof(struct sctp_authinfo));
-		msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_authinfo));
-		cmsg = (struct cmsghdr *)((caddr_t)cmsg + CMSG_SPACE(sizeof(struct sctp_authinfo)));
-		break;
-	case SCTP_SENDV_SPA:
-		if ((info == NULL) || (infolen < sizeof(struct sctp_sendv_spa))) {
-			free(cmsgbuf);
-			errno = EINVAL;
-			return (-1);
-		}
-		spa_info = (struct sctp_sendv_spa *)info;
-		if (spa_info->sendv_flags & SCTP_SEND_SNDINFO_VALID) {
-			cmsg->cmsg_level = IPPROTO_SCTP;
-			cmsg->cmsg_type = SCTP_SNDINFO;
-			cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndinfo));
-			memcpy(CMSG_DATA(cmsg), &spa_info->sendv_sndinfo, sizeof(struct sctp_sndinfo));
-			msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_sndinfo));
-			cmsg = (struct cmsghdr *)((caddr_t)cmsg + CMSG_SPACE(sizeof(struct sctp_sndinfo)));
-		}
-		if (spa_info->sendv_flags & SCTP_SEND_PRINFO_VALID) {
-			cmsg->cmsg_level = IPPROTO_SCTP;
-			cmsg->cmsg_type = SCTP_PRINFO;
-			cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_prinfo));
-			memcpy(CMSG_DATA(cmsg), &spa_info->sendv_prinfo, sizeof(struct sctp_prinfo));
-			msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_prinfo));
-			cmsg = (struct cmsghdr *)((caddr_t)cmsg + CMSG_SPACE(sizeof(struct sctp_prinfo)));
-		}
-		if (spa_info->sendv_flags & SCTP_SEND_AUTHINFO_VALID) {
-			cmsg->cmsg_level = IPPROTO_SCTP;
-			cmsg->cmsg_type = SCTP_AUTHINFO;
-			cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_authinfo));
-			memcpy(CMSG_DATA(cmsg), &spa_info->sendv_authinfo, sizeof(struct sctp_authinfo));
-			msg.msg_controllen += CMSG_SPACE(sizeof(struct sctp_authinfo));
-			cmsg = (struct cmsghdr *)((caddr_t)cmsg + CMSG_SPACE(sizeof(struct sctp_authinfo)));
-		}
-		break;
-	default:
-		free(cmsgbuf);
-		errno = EINVAL;
-		return (-1);
-	}
-	addr = addrs;
-	msg.msg_name = NULL;
-	msg.msg_namelen = 0;
-
-	for (i = 0; i < addrcnt; i++) {
-		switch (addr->sa_family) {
-		case AF_INET:
-			addr_len = (socklen_t) sizeof(struct sockaddr_in);
-			addr_in = (struct sockaddr_in *)addr;
-			if (addr_in->sin_len != addr_len) {
-				free(cmsgbuf);
-				errno = EINVAL;
-				return (-1);
-			}
-			if (i == 0) {
-				port = addr_in->sin_port;
-			} else {
-				if (port == addr_in->sin_port) {
-					cmsg->cmsg_level = IPPROTO_SCTP;
-					cmsg->cmsg_type = SCTP_DSTADDRV4;
-					cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
-					memcpy(CMSG_DATA(cmsg), &addr_in->sin_addr, sizeof(struct in_addr));
-					msg.msg_controllen += CMSG_SPACE(sizeof(struct in_addr));
-					cmsg = (struct cmsghdr *)((caddr_t)cmsg + CMSG_SPACE(sizeof(struct in_addr)));
-				} else {
-					free(cmsgbuf);
-					errno = EINVAL;
-					return (-1);
-				}
-			}
-			break;
-		case AF_INET6:
-			addr_len = (socklen_t) sizeof(struct sockaddr_in6);
-			addr_in6 = (struct sockaddr_in6 *)addr;
-			if (addr_in6->sin6_len != addr_len) {
-				free(cmsgbuf);
-				errno = EINVAL;
-				return (-1);
-			}
-			if (i == 0) {
-				port = addr_in6->sin6_port;
-			} else {
-				if (port == addr_in6->sin6_port) {
-					cmsg->cmsg_level = IPPROTO_SCTP;
-					cmsg->cmsg_type = SCTP_DSTADDRV6;
-					cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_addr));
-					memcpy(CMSG_DATA(cmsg), &addr_in6->sin6_addr, sizeof(struct in6_addr));
-					msg.msg_controllen += CMSG_SPACE(sizeof(struct in6_addr));
-					cmsg = (struct cmsghdr *)((caddr_t)cmsg + CMSG_SPACE(sizeof(struct in6_addr)));
-				} else {
-					free(cmsgbuf);
-					errno = EINVAL;
-					return (-1);
-				}
-			}
-			break;
-		default:
-			free(cmsgbuf);
-			errno = EINVAL;
-			return (-1);
-		}
-		if (i == 0) {
-			msg.msg_name = addr;
-			msg.msg_namelen = addr_len;
-		}
-		addr = (struct sockaddr *)((caddr_t)addr + addr_len);
-	}
-	if (msg.msg_controllen == 0) {
-		msg.msg_control = NULL;
-	}
-	msg.msg_iov = (struct iovec *)iov;
-	msg.msg_iovlen = iovcnt;
-	msg.msg_flags = 0;
-	ret = sendmsg(sd, &msg, flags);
-	free(cmsgbuf);
-	return (ret);
-}
-
-
-#if !defined(SYS_sctp_peeloff) && !defined(HAVE_SCTP_PEELOFF_SOCKOPT)
-
-int
-sctp_peeloff(int sd, sctp_assoc_t assoc_id)
-{
-	/* NOT supported, return invalid sd */
-	errno = ENOTSUP;
-	return (-1);
-}
-
-#endif
-#if defined(SYS_sctp_peeloff) && !defined(HAVE_SCTP_PEELOFF_SOCKOPT)
-int
-sctp_peeloff(int sd, sctp_assoc_t assoc_id)
-{
-	return (syscall(SYS_sctp_peeloff, sd, assoc_id));
-}
-
-#endif
-
-#undef SCTP_CONTROL_VEC_SIZE_RCV
diff --git a/lib/libc_bsd/net/send.c b/lib/libc_bsd/net/send.c
deleted file mode 100644
index 5709a5a..0000000
--- a/lib/libc_bsd/net/send.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)send.c	8.2 (Berkeley) 2/21/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/send.c 251575 2013-06-09 14:31:59Z jilles $");
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <stddef.h>
-
-ssize_t
-send(s, msg, len, flags)
-	int s, flags;
-	size_t len;
-	const void *msg;
-{
-	/*
-	 * POSIX says send() shall be a cancellation point, so call the
-	 * cancellation-enabled sendto() and not _sendto().
-	 */
-	return (sendto(s, msg, len, flags, NULL, 0));
-}
diff --git a/lib/libc_bsd/net/sockatmark.3 b/lib/libc_bsd/net/sockatmark.3
deleted file mode 100644
index 1692c58..0000000
--- a/lib/libc_bsd/net/sockatmark.3
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Copyright (c) 2002 William C. Fenner.  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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/net/sockatmark.3 108087 2002-12-19 09:40:28Z ru $
-.\"
-.Dd October 13, 2002
-.Dt SOCKATMARK 3
-.Os
-.Sh NAME
-.Nm sockatmark
-.Nd determine whether the read pointer is at the OOB mark
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn sockatmark "int s"
-.Sh DESCRIPTION
-To find out if the read pointer is currently pointing at
-the mark in the data stream, the
-.Fn sockatmark
-function is provided.
-If
-.Fn sockatmark
-returns 1, the next read will return data
-after the mark.
-Otherwise (assuming out of band data has arrived),
-the next read will provide data sent by the client prior
-to transmission of the out of band signal.
-The routine used
-in the remote login process to flush output on receipt of an
-interrupt or quit signal is shown below.
-It reads the normal data up to the mark (to discard it),
-then reads the out-of-band byte.
-.Bd -literal -offset indent
-#include <sys/socket.h>
-\&...
-oob()
-{
-	int out = FWRITE, mark;
-	char waste[BUFSIZ];
-
-	/* flush local terminal output */
-	ioctl(1, TIOCFLUSH, (char *)&out);
-	for (;;) {
-		if ((mark = sockatmark(rem)) < 0) {
-			perror("sockatmark");
-			break;
-		}
-		if (mark)
-			break;
-		(void) read(rem, waste, sizeof (waste));
-	}
-	if (recv(rem, &mark, 1, MSG_OOB) < 0) {
-		perror("recv");
-		...
-	}
-	...
-}
-.Ed
-.Sh RETURN VALUES
-Upon successful completion, the
-.Fn sockatmark
-function returns the value 1 if the read pointer is pointing at
-the OOB mark, 0 if it is not.
-Otherwise the value \-1 is returned
-and the global variable
-.Va errno
-is set to
-indicate the error.
-.Sh ERRORS
-The
-.Fn sockatmark
-call fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa s
-argument
-is not a valid descriptor.
-.It Bq Er ENOTTY
-The
-.Fa s
-argument
-is a descriptor for a file, not a socket.
-.El
-.Sh SEE ALSO
-.Xr recv 2 ,
-.Xr send 2
-.Sh HISTORY
-The
-.Fn sockatmark
-function was introduced by
-.St -p1003.1-2001 ,
-to standardize the historical
-.Dv SIOCATMARK
-.Xr ioctl 2 .
-The
-.Er ENOTTY
-error instead of the usual
-.Er ENOTSOCK
-is to match the historical behavior of
-.Dv SIOCATMARK .
diff --git a/lib/libc_bsd/net/sockatmark.c b/lib/libc_bsd/net/sockatmark.c
deleted file mode 100644
index 6703199..0000000
--- a/lib/libc_bsd/net/sockatmark.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2002 William C. Fenner.  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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/net/sockatmark.c 107836 2002-12-13 22:22:55Z fenner $
- */
-#include <sys/ioctl.h>
-
-int sockatmark(int s)
-{
-	int atmark;
-
-	if (ioctl(s, SIOCATMARK, &atmark) == -1)
-		return -1;
-	return atmark;
-}
diff --git a/lib/libc_bsd/net/sourcefilter.3 b/lib/libc_bsd/net/sourcefilter.3
deleted file mode 100644
index 85d9d7c..0000000
--- a/lib/libc_bsd/net/sourcefilter.3
+++ /dev/null
@@ -1,240 +0,0 @@
-.\" Copyright (c) 2007-2009 Bruce Simpson.
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/net/sourcefilter.3 235286 2012-05-11 20:06:46Z gjb $
-.\"
-.Dd February 13, 2009
-.Dt SOURCEFILTER 3
-.Os
-.Sh NAME
-.Nm sourcefilter
-.Nd advanced multicast group membership API
-.Sh SYNOPSIS
-.In sys/socket.h
-.In netinet/in.h
-.Ft int
-.Fo getipv4sourcefilter
-.Fa "int s"
-.Fa "struct in_addr interface"
-.Fa "struct in_addr group"
-.Fa "uint32_t *fmode"
-.Fa "uint32_t *numsrc"
-.Fa "struct in_addr *slist"
-.Fc
-.Ft int
-.Fo getsourcefilter
-.Fa "int s"
-.Fa "uint32_t interface"
-.Fa "struct sockaddr *group"
-.Fa "socklen_t grouplen"
-.Fa "uint32_t *fmode"
-.Fa "uint32_t *numsrc"
-.Fa "struct sockaddr_storage *slist"
-.Fc
-.Ft int
-.Fo setipv4sourcefilter
-.Fa "int s"
-.Fa "struct in_addr interface"
-.Fa "struct in_addr group"
-.Fa "uint32_t fmode"
-.Fa "uint32_t numsrc"
-.Fa "struct in_addr *slist"
-.Fc
-.Ft int
-.Fo setsourcefilter
-.Fa "int s"
-.Fa "uint32_t interface"
-.Fa "struct sockaddr *group"
-.Fa "socklen_t grouplen"
-.Fa "uint32_t fmode"
-.Fa "uint32_t numsrc"
-.Fa "struct sockaddr_storage *slist"
-.Fc
-.Sh DESCRIPTION
-The
-.Nm
-functions implement the advanced, full-state multicast API
-defined in RFC 3678.
-An application may use these functions to atomically set and
-retrieve the multicast source address filters associated with a socket
-.Fa s
-and a multicast
-.Fa group .
-.Pp
-The functions
-.Fn getipv4sourcefilter
-and
-.Fn getsourcefilter
-allow an application to discover the filter mode, and
-source filter entries,
-for an existing group membership.
-.Pp
-The kernel will always return the number of source filter
-entries on the socket for that group in
-.Fa *numsrc .
-If the
-.Fa *numsrc
-argument is non-zero, the kernel will attempt to return up to
-.Fa *numsrc
-filter entries in the array pointed to by
-.Fa slist .
-The
-.Fa *numsrc
-argument may be set to 0, in which case the
-.Fa slist
-argument will be ignored.
-.Pp
-For the
-.Fn setipv4sourcefilter
-and
-.Fn setsourcefilter
-functions,
-the
-.Fa fmode
-argument may be used to place the socket into inclusive or exclusive
-group membership modes, by using the
-.Dv MCAST_INCLUDE
-or
-.Dv MCAST_EXCLUDE
-constants respectively.
-The
-.Fa numsrc
-argument specifies the number of source entries in the
-.Fa slist
-array.
-If the
-.Fa numsrc
-argument has a value of 0,
-all source filters will be removed from the socket.
-Removing all source filters from a membership which is in the
-.Dv MCAST_INCLUDE
-filter mode will cause the group to be left on that socket.
-.Pp
-The protocol-independent function
-.Fn setsourcefilter
-allows an application to join a multicast group on an interface
-which may not have an assigned protocol address,
-by passing its index for the
-.Fa interface
-argument.
-.Pp
-Any changes made by these functions
-will be communicated to IGMPv3 and/or MLDv2 routers
-on the local network as appropriate.
-If no IGMPv3 or MLDv2 routers are present, changes in the source filter
-lists made by these functions will not cause
-state changes to be transmitted, with the exception of any
-change which causes a group to be joined or left.
-The kernel will continue to maintain the source filter state
-regardless of the IGMP or MLD version in use on the link.
-.Sh IMPLEMENTATION NOTES
-The IPv4 specific versions of these functions are implemented in terms
-of the protocol-independent functions.
-Application writers are encouraged to use the protocol-independent functions
-for efficiency, and forwards compatibility with IPv6 networks.
-.Pp
-For the protocol-independent functions
-.Fn getsourcefilter
-and
-.Fn setsourcefilter ,
-the
-.Fa grouplen
-argument specifies the size of the structure pointed to by
-.Fa group .
-This is required in order to differentiate between different
-address families.
-.Pp
-Currently
-.Fx
-does not support source address selection for the IPv4
-protocol family, therefore the use of multicast APIs with
-an unnumbered IPv4 interface is
-.Em not recommended.
-In all cases, the first assigned IPv4 address on the interface
-will be used as the source address of IGMP control traffic.
-If this address is removed or changed, the results are undefined.
-.Sh RETURN VALUES
-.Rv -std getsourcefilter getipv4sourcefilter setsourcefilter setipv4sourcefilter
-.Sh ERRORS
-The
-.Nm
-functions may fail because of:
-.Bl -tag -width Er
-.It Bq Er EADDRNOTAVAIL
-The network interface which the
-.Dv interface
-argument refers to was not configured in the system,
-or the system is not a member of the
-.Dv group .
-.It Bq Er EAFNOSUPPORT
-The
-.Dv group
-and/or one or more of the
-.Dv slist
-arguments were of an address family unsupported by the system,
-or the address family of the
-.Dv group
-and
-.Dv slist
-arguments were not identical.
-.It Bq Er EINVAL
-The
-.Dv group
-argument does not contain a multicast address.
-The
-.Dv fmode
-argument is invalid; it must be set to either
-.Dv MCAST_INCLUDE
-or
-.Dv MCAST_EXCLUDE .
-The
-.Dv numsrc
-or
-.Dv slist
-arguments do not specify a source list.
-.It Bq Er ENOMEM
-Insufficient memory was available to carry out the requested
-operation.
-.El
-.Sh SEE ALSO
-.Xr ip 4 ,
-.Xr ip6 4 ,
-.Xr multicast 4 ,
-.Xr ifmcstat 8
-.Rs
-.%A D. Thaler
-.%A B. Fenner
-.%A B. Quinn
-.%T "Socket Interface Extensions for Multicast Source Filters"
-.%N RFC 3678
-.%D Jan 2004
-.Re
-.Sh HISTORY
-The
-.Nm
-functions first appeared in
-.Fx 7.0 .
-.Sh AUTHORS
-Bruce M. Simpson
-.Aq bms@FreeBSD.org
diff --git a/lib/libc_bsd/net/sourcefilter.c b/lib/libc_bsd/net/sourcefilter.c
deleted file mode 100644
index 2ad0d13..0000000
--- a/lib/libc_bsd/net/sourcefilter.c
+++ /dev/null
@@ -1,403 +0,0 @@
-/*-
- * Copyright (c) 2007-2009 Bruce Simpson.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/sourcefilter.c 269480 2014-08-03 18:03:00Z pfg $");
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-
-#include <net/if_dl.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <ifaddrs.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "un-namespace.h"
-
-/*
- * Advanced (Full-state) multicast group membership APIs [RFC3678]
- * Currently this module assumes IPv4 support (INET) in the base system.
- */
-#ifndef INET
-#define INET
-#endif
-
-union sockunion {
-	struct sockaddr_storage	ss;
-	struct sockaddr		sa;
-	struct sockaddr_dl	sdl;
-#ifdef INET
-	struct sockaddr_in	sin;
-#endif
-#ifdef INET6
-	struct sockaddr_in6	sin6;
-#endif
-};
-typedef union sockunion sockunion_t;
-
-#ifndef MIN
-#define	MIN(a, b)	((a) < (b) ? (a) : (b))
-#endif
-
-/*
- * Internal: Map an IPv4 unicast address to an interface index.
- * This is quite inefficient so it is recommended applications use
- * the newer, more portable, protocol independent API.
- */
-static uint32_t
-__inaddr_to_index(in_addr_t ifaddr)
-{
-	struct ifaddrs	*ifa;
-	struct ifaddrs	*ifaddrs;
-	char		*ifname;
-	int		 ifindex;
-	sockunion_t	*psu;
-
-	if (getifaddrs(&ifaddrs) < 0)
-		return (0);
-
-	ifindex = 0;
-	ifname = NULL;
-
-	/*
-	 * Pass #1: Find the ifaddr entry corresponding to the
-	 * supplied IPv4 address. We should really use the ifindex
-	 * consistently for matches, however it is not available to
-	 * us on this pass.
-	 */
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		psu = (sockunion_t *)ifa->ifa_addr;
-		if (psu && psu->ss.ss_family == AF_INET &&
-		    psu->sin.sin_addr.s_addr == ifaddr) {
-			ifname = ifa->ifa_name;
-			break;
-		}
-	}
-	if (ifname == NULL)
-		goto out;
-
-	/*
-	 * Pass #2: Find the index of the interface matching the name
-	 * we obtained from looking up the IPv4 ifaddr in pass #1.
-	 * There must be a better way of doing this.
-	 */
-	for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
-		psu = (sockunion_t *)ifa->ifa_addr;
-		if (psu && psu->ss.ss_family == AF_LINK &&
-		    strcmp(ifa->ifa_name, ifname) == 0) {
-			ifindex = LLINDEX(&psu->sdl);
-			break;
-		}
-	}
-	assert(ifindex != 0);
-
-out:
-	freeifaddrs(ifaddrs);
-	return (ifindex);
-}
-
-/*
- * Set IPv4 source filter list in use on socket.
- *
- * Stubbed to setsourcefilter(). Performs conversion of structures which
- * may be inefficient; applications are encouraged to use the
- * protocol-independent API.
- */
-int
-setipv4sourcefilter(int s, struct in_addr interface, struct in_addr group,
-    uint32_t fmode, uint32_t numsrc, struct in_addr *slist)
-{
-#ifdef INET
-	sockunion_t	 tmpgroup;
-	struct in_addr	*pina;
-	sockunion_t	*psu, *tmpslist;
-	int		 err;
-	size_t		 i;
-	uint32_t	 ifindex;
-
-	assert(s != -1);
-
-	tmpslist = NULL;
-
-	if (!IN_MULTICAST(ntohl(group.s_addr)) ||
-	    (fmode != MCAST_INCLUDE && fmode != MCAST_EXCLUDE)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ifindex = __inaddr_to_index(interface.s_addr);
-	if (ifindex == 0) {
-		errno = EADDRNOTAVAIL;
-		return (-1);
-	}
-
-	memset(&tmpgroup, 0, sizeof(sockunion_t));
-	tmpgroup.sin.sin_family = AF_INET;
-	tmpgroup.sin.sin_len = sizeof(struct sockaddr_in);
-	tmpgroup.sin.sin_addr = group;
-
-	if (numsrc != 0 || slist != NULL) {
-		tmpslist = calloc(numsrc, sizeof(sockunion_t));
-		if (tmpslist == NULL) {
-			errno = ENOMEM;
-			return (-1);
-		}
-
-		pina = slist;
-		psu = tmpslist;
-		for (i = 0; i < numsrc; i++, pina++, psu++) {
-			psu->sin.sin_family = AF_INET;
-			psu->sin.sin_len = sizeof(struct sockaddr_in);
-			psu->sin.sin_addr = *pina;
-		}
-	}
-
-	err = setsourcefilter(s, ifindex, (struct sockaddr *)&tmpgroup,
-	    sizeof(struct sockaddr_in), fmode, numsrc,
-	    (struct sockaddr_storage *)tmpslist);
-
-	if (tmpslist != NULL)
-		free(tmpslist);
-
-	return (err);
-#else /* !INET */
-	return (EAFNOSUPPORT);
-#endif /* INET */
-}
-
-/*
- * Get IPv4 source filter list in use on socket.
- *
- * Stubbed to getsourcefilter(). Performs conversion of structures which
- * may be inefficient; applications are encouraged to use the
- * protocol-independent API.
- * An slist of NULL may be used for guessing the required buffer size.
- */
-int
-getipv4sourcefilter(int s, struct in_addr interface, struct in_addr group,
-    uint32_t *fmode, uint32_t *numsrc, struct in_addr *slist)
-{
-	sockunion_t	*psu, *tmpslist;
-	sockunion_t	 tmpgroup;
-	struct in_addr	*pina;
-	int		 err;
-	size_t		 i;
-	uint32_t	 ifindex, onumsrc;
-
-	assert(s != -1);
-	assert(fmode != NULL);
-	assert(numsrc != NULL);
-
-	onumsrc = *numsrc;
-	*numsrc = 0;
-	tmpslist = NULL;
-
-	if (!IN_MULTICAST(ntohl(group.s_addr)) ||
-	    (onumsrc != 0 && slist == NULL)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	ifindex = __inaddr_to_index(interface.s_addr);
-	if (ifindex == 0) {
-		errno = EADDRNOTAVAIL;
-		return (-1);
-	}
-
-	memset(&tmpgroup, 0, sizeof(sockunion_t));
-	tmpgroup.sin.sin_family = AF_INET;
-	tmpgroup.sin.sin_len = sizeof(struct sockaddr_in);
-	tmpgroup.sin.sin_addr = group;
-
-	if (onumsrc != 0 || slist != NULL) {
-		tmpslist = calloc(onumsrc, sizeof(sockunion_t));
-		if (tmpslist == NULL) {
-			errno = ENOMEM;
-			return (-1);
-		}
-	}
-
-	err = getsourcefilter(s, ifindex, (struct sockaddr *)&tmpgroup,
-	    sizeof(struct sockaddr_in), fmode, numsrc,
-	    (struct sockaddr_storage *)tmpslist);
-
-	if (tmpslist != NULL && *numsrc != 0) {
-		pina = slist;
-		psu = tmpslist;
-		for (i = 0; i < MIN(onumsrc, *numsrc); i++, psu++) {
-			if (psu->ss.ss_family != AF_INET)
-				continue;
-			*pina++ = psu->sin.sin_addr;
-		}
-		free(tmpslist);
-	}
-
-	return (err);
-}
-
-/*
- * Set protocol-independent source filter list in use on socket.
- */
-int
-setsourcefilter(int s, uint32_t interface, struct sockaddr *group,
-    socklen_t grouplen, uint32_t fmode, uint32_t numsrc,
-    struct sockaddr_storage *slist)
-{
-	struct __msfilterreq	 msfr;
-	sockunion_t		*psu;
-	int			 level, optname;
-
-	if (fmode != MCAST_INCLUDE && fmode != MCAST_EXCLUDE) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	psu = (sockunion_t *)group;
-	switch (psu->ss.ss_family) {
-#ifdef INET
-	case AF_INET:
-		if ((grouplen != sizeof(struct sockaddr_in) ||
-		    !IN_MULTICAST(ntohl(psu->sin.sin_addr.s_addr)))) {
-			errno = EINVAL;
-			return (-1);
-		}
-		level = IPPROTO_IP;
-		optname = IP_MSFILTER;
-		break;
-#endif
-#ifdef INET6
-	case AF_INET6:
-		if (grouplen != sizeof(struct sockaddr_in6) ||
-		    !IN6_IS_ADDR_MULTICAST(&psu->sin6.sin6_addr)) {
-			errno = EINVAL;
-			return (-1);
-		}
-		level = IPPROTO_IPV6;
-		optname = IPV6_MSFILTER;
-		break;
-#endif
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-	}
-
-	memset(&msfr, 0, sizeof(msfr));
-	msfr.msfr_ifindex = interface;
-	msfr.msfr_fmode = fmode;
-	msfr.msfr_nsrcs = numsrc;
-	memcpy(&msfr.msfr_group, &psu->ss, psu->ss.ss_len);
-	msfr.msfr_srcs = slist;		/* pointer */
-
-	return (_setsockopt(s, level, optname, &msfr, sizeof(msfr)));
-}
-
-/*
- * Get protocol-independent source filter list in use on socket.
- * An slist of NULL may be used for guessing the required buffer size.
- */
-int
-getsourcefilter(int s, uint32_t interface, struct sockaddr *group,
-    socklen_t grouplen, uint32_t *fmode, uint32_t *numsrc,
-    struct sockaddr_storage *slist)
-{
-	struct __msfilterreq	 msfr;
-	sockunion_t		*psu;
-	socklen_t		 optlen;
-	int			 err, level, nsrcs, optname;
-
-	if (interface == 0 || group == NULL || numsrc == NULL ||
-	    fmode == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	nsrcs = *numsrc;
-	*numsrc = 0;
-	*fmode = 0;
-
-	psu = (sockunion_t *)group;
-	switch (psu->ss.ss_family) {
-#ifdef INET
-	case AF_INET:
-		if ((grouplen != sizeof(struct sockaddr_in) ||
-		    !IN_MULTICAST(ntohl(psu->sin.sin_addr.s_addr)))) {
-			errno = EINVAL;
-			return (-1);
-		}
-		level = IPPROTO_IP;
-		optname = IP_MSFILTER;
-		break;
-#endif
-#ifdef INET6
-	case AF_INET6:
-		if (grouplen != sizeof(struct sockaddr_in6) ||
-		    !IN6_IS_ADDR_MULTICAST(&psu->sin6.sin6_addr)) {
-			errno = EINVAL;
-			return (-1);
-		}
-		level = IPPROTO_IPV6;
-		optname = IPV6_MSFILTER;
-		break;
-#endif
-	default:
-		errno = EAFNOSUPPORT;
-		return (-1);
-		break;
-	}
-
-	optlen = sizeof(struct __msfilterreq);
-	memset(&msfr, 0, optlen);
-	msfr.msfr_ifindex = interface;
-	msfr.msfr_fmode = 0;
-	msfr.msfr_nsrcs = nsrcs;
-	memcpy(&msfr.msfr_group, &psu->ss, psu->ss.ss_len);
-
-	/*
-	 * msfr_srcs is a pointer to a vector of sockaddr_storage. It
-	 * may be NULL. The kernel will always return the total number
-	 * of filter entries for the group in msfr.msfr_nsrcs.
-	 */
-	msfr.msfr_srcs = slist;
-	err = _getsockopt(s, level, optname, &msfr, &optlen);
-	if (err == 0) {
-		*numsrc = msfr.msfr_nsrcs;
-		*fmode = msfr.msfr_fmode;
-	}
-
-	return (err);
-}
diff --git a/lib/libc_bsd/net/vars.c b/lib/libc_bsd/net/vars.c
deleted file mode 100644
index b1277f1..0000000
--- a/lib/libc_bsd/net/vars.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*	$KAME: vars.c,v 1.2 2001/08/20 02:32:41 itojun Exp $	*/
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/net/vars.c 95023 2002-04-19 04:46:24Z suz $");
-
-#include <sys/types.h>
-#include <netinet/in.h>
-
-/*
- * Definitions of some costant IPv6 addresses.
- */
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
-const struct in6_addr in6addr_nodelocal_allnodes = IN6ADDR_NODELOCAL_ALLNODES_INIT;
-const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_INIT;
-
diff --git a/lib/libc_bsd/nls/C.msg b/lib/libc_bsd/nls/C.msg
deleted file mode 100644
index c9080a8..0000000
--- a/lib/libc_bsd/nls/C.msg
+++ /dev/null
@@ -1,301 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/C.msg 250250 2013-05-04 19:07:22Z pluknet $
-$
-$ Message catalog for C locale (template)
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operation not permitted
-$ ENOENT
-2 No such file or directory
-$ ESRCH
-3 No such process
-$ EINTR
-4 Interrupted system call
-$ EIO
-5 Input/output error
-$ ENXIO
-6 Device not configured
-$ E2BIG
-7 Argument list too long
-$ ENOEXEC
-8 Exec format error
-$ EBADF
-9 Bad file descriptor
-$ ECHILD
-10 No child processes
-$ EDEADLK
-11 Resource deadlock avoided
-$ ENOMEM
-12 Cannot allocate memory
-$ EACCES
-13 Permission denied
-$ EFAULT
-14 Bad address
-$ ENOTBLK
-15 Block device required
-$ EBUSY
-16 Device busy
-$ EEXIST
-17 File exists
-$ EXDEV
-18 Cross-device link
-$ ENODEV
-19 Operation not supported by device
-$ ENOTDIR
-20 Not a directory
-$ EISDIR
-21 Is a directory
-$ EINVAL
-22 Invalid argument
-$ ENFILE
-23 Too many open files in system
-$ EMFILE
-24 Too many open files
-$ ENOTTY
-25 Inappropriate ioctl for device
-$ ETXTBSY
-26 Text file busy
-$ EFBIG
-27 File too large
-$ ENOSPC
-28 No space left on device
-$ ESPIPE
-29 Illegal seek
-$ EROFS
-30 Read-only file system
-$ EMLINK
-31 Too many links
-$ EPIPE
-32 Broken pipe
-$ EDOM
-33 Numerical argument out of domain
-$ ERANGE
-34 Result too large
-$ EAGAIN, EWOULDBLOCK
-35 Resource temporarily unavailable
-$ EINPROGRESS
-36 Operation now in progress
-$ EALREADY
-37 Operation already in progress
-$ ENOTSOCK
-38 Socket operation on non-socket
-$ EDESTADDRREQ
-39 Destination address required
-$ EMSGSIZE
-40 Message too long
-$ EPROTOTYPE
-41 Protocol wrong type for socket
-$ ENOPROTOOPT
-42 Protocol not available
-$ EPROTONOSUPPORT
-43 Protocol not supported
-$ ESOCKTNOSUPPORT
-44 Socket type not supported
-$ EOPNOTSUPP
-45 Operation not supported
-$ EPFNOSUPPORT
-46 Protocol family not supported
-$ EAFNOSUPPORT
-47 Address family not supported by protocol family
-$ EADDRINUSE
-48 Address already in use
-$ EADDRNOTAVAIL
-49 Can't assign requested address
-$ ENETDOWN
-50 Network is down
-$ ENETUNREACH
-51 Network is unreachable
-$ ENETRESET
-52 Network dropped connection on reset
-$ ECONNABORTED
-53 Software caused connection abort
-$ ECONNRESET
-54 Connection reset by peer
-$ ENOBUFS
-55 No buffer space available
-$ EISCONN
-56 Socket is already connected
-$ ENOTCONN
-57 Socket is not connected
-$ ESHUTDOWN
-58 Can't send after socket shutdown
-$ ETOOMANYREFS
-59 Too many references: can't splice
-$ ETIMEDOUT
-60 Operation timed out
-$ ECONNREFUSED
-61 Connection refused
-$ ELOOP
-62 Too many levels of symbolic links
-$ ENAMETOOLONG
-63 File name too long
-$ EHOSTDOWN
-64 Host is down
-$ EHOSTUNREACH
-65 No route to host
-$ ENOTEMPTY
-66 Directory not empty
-$ EPROCLIM
-67 Too many processes
-$ EUSERS
-68 Too many users
-$ EDQUOT
-69 Disc quota exceeded
-$ ESTALE
-70 Stale NFS file handle
-$ EREMOTE
-71 Too many levels of remote in path
-$ EBADRPC
-72 RPC struct is bad
-$ ERPCMISMATCH
-73 RPC version wrong
-$ EPROGUNAVAIL
-74 RPC prog. not avail
-$ EPROGMISMATCH
-75 Program version wrong
-$ EPROCUNAVAIL
-76 Bad procedure for program
-$ ENOLCK
-77 No locks available
-$ ENOSYS
-78 Function not implemented
-$ EFTYPE
-79 Inappropriate file type or format
-$ EAUTH
-80 Authentication error
-$ ENEEDAUTH
-81 Need authenticator
-$ EIDRM
-82 Identifier removed
-$ ENOMSG
-83 No message of desired type
-$ EOVERFLOW
-84 Value too large to be stored in data type
-$ ECANCELED
-85 Operation canceled
-$ EILSEQ
-86 Illegal byte sequence
-$ ENOATTR
-87 Attribute not found
-$ EDOOFUS
-88 Programming error
-$ EBADMSG
-89 Bad message
-$ EMULTIHOP
-90 Multihop attempted
-$ ENOLINK
-91 Link has been severed
-$ EPROTO
-92 Protocol error
-$ ENOTCAPABLE
-93 Capabilities insufficient
-$ ECAPMODE
-94 Not permitted in capability mode
-$ ENOTRECOVERABLE
-95 State not recoverable
-$ EOWNERDEAD
-96 Previous owner died
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Hangup
-$ SIGINT
-2 Interrupt
-$ SIGQUIT
-3 Quit
-$ SIGILL
-4 Illegal instruction
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Floating point exception
-$ SIGKILL
-9 Killed
-$ SIGBUS
-10 Bus error
-$ SIGSEGV
-11 Segmentation fault
-$ SIGSYS
-12 Bad system call
-$ SIGPIPE
-13 Broken pipe
-$ SIGALRM
-14 Alarm clock
-$ SIGTERM
-15 Terminated
-$ SIGURG
-16 Urgent I/O condition
-$ SIGSTOP
-17 Suspended (signal)
-$ SIGTSTP
-18 Suspended
-$ SIGCONT
-19 Continued
-$ SIGCHLD
-20 Child exited
-$ SIGTTIN
-21 Stopped (tty input)
-$ SIGTTOU
-22 Stopped (tty output)
-$ SIGIO
-23 I/O possible
-$ SIGXCPU
-24 Cputime limit exceeded
-$ SIGXFSZ
-25 Filesize limit exceeded
-$ SIGVTALRM
-26 Virtual timer expired
-$ SIGPROF
-27 Profiling timer expired
-$ SIGWINCH
-28 Window size changes
-$ SIGINFO
-29 Information request
-$ SIGUSR1
-30 User defined signal 1
-$ SIGUSR2
-31 User defined signal 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsolete)
-1 Address family for hostname not supported
-$ EAI_AGAIN
-2 Temporary failure in name resolution
-$ EAI_BADFLAGS
-3 Invalid value for ai_flags
-$ EAI_FAIL
-4 Non-recoverable failure in name resolution
-$ EAI_FAMILY
-5 ai_family not supported
-$ EAI_MEMORY
-6 Memory allocation failure
-$ 7 (obsolete)
-7 No address associated with hostname
-$ EAI_NONAME
-8 hostname nor servname provided, or not known
-$ EAI_SERVICE
-9 servname not supported for ai_socktype
-$ EAI_SOCKTYPE
-10 ai_socktype not supported
-$ EAI_SYSTEM
-11 System error returned in errno
-$ EAI_BADHINTS
-12 Invalid value for hints
-$ EAI_PROTOCOL
-13 Resolved protocol is unknown
-$ EAI_OVERFLOW
-14 Argument buffer overflow
-$ 0
-32766 Success
-$ NL_MSGMAX
-32767 Unknown error
diff --git a/lib/libc_bsd/nls/Makefile.inc b/lib/libc_bsd/nls/Makefile.inc
deleted file mode 100644
index ab8e922..0000000
--- a/lib/libc_bsd/nls/Makefile.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-#	from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-Makefile.incl 244757 2012-12-28 01:23:12Z delphij $
-
-.PATH: ${.CURDIR}/nls
-
-SRCS+=	msgcat.c
-
-SYM_MAPS+=${.CURDIR}/nls/Symbol.map
-
-MAN+=	catclose.3 catgets.3 catopen.3
-
-# NOTE: C.msg should not be processed here, it's used as a template
-#       for translators.
-
-NLSNAME=	libc
-NLS+=	be_BY.UTF-8
-NLS+=	ca_ES.ISO8859-1
-NLS+=	de_DE.ISO8859-1
-NLS+=	el_GR.ISO8859-7
-NLS+=	es_ES.ISO8859-1
-NLS+=	fi_FI.ISO8859-1
-NLS+=	fr_FR.ISO8859-1
-NLS+=	gl_ES.ISO8859-1
-NLS+=	hu_HU.ISO8859-2
-NLS+=	it_IT.ISO8859-15
-NLS+=	ja_JP.UTF-8
-NLS+=	ja_JP.eucJP
-NLS+=	ko_KR.UTF-8
-NLS+=	ko_KR.eucKR
-NLS+=	mn_MN.UTF-8
-NLS+=	nl_NL.ISO8859-1
-NLS+=	no_NO.ISO8859-1
-NLS+=	pl_PL.ISO8859-2
-NLS+=	pt_BR.ISO8859-1
-NLS+=	ru_RU.KOI8-R
-NLS+=	sk_SK.ISO8859-2
-NLS+=	sv_SE.ISO8859-1
-NLS+=	uk_UA.UTF-8
-NLS+=	zh_CN.GB18030
-NLS+=	zh_CN.GB2312
-NLS+=	zh_CN.UTF-8
diff --git a/lib/libc_bsd/nls/Symbol.map b/lib/libc_bsd/nls/Symbol.map
deleted file mode 100644
index cb9e95a..0000000
--- a/lib/libc_bsd/nls/Symbol.map
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/nls/Symbol.map 169092 2007-04-29 14:05:22Z deischen $
- */
-
-FBSD_1.0 {
-	catopen;
-	catgets;
-	catclose;
-};
diff --git a/lib/libc_bsd/nls/be_BY.UTF-8.msg b/lib/libc_bsd/nls/be_BY.UTF-8.msg
deleted file mode 100644
index ca2dd83..0000000
--- a/lib/libc_bsd/nls/be_BY.UTF-8.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/be_BY.UTF-8.msg 192653 2009-05-23 17:13:35Z des $
-$
-$ Message catalog for be_BY.UTF-8 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Аперацыя не дазволена
-$ ENOENT
-2 Няма такога файлу ці каталогу
-$ ESRCH
-3 Няма такога працэсу
-$ EINTR
-4 Перарваны сістэмны выклік
-$ EIO
-5 Памылка ўводу/вываду
-$ ENXIO
-6 Прыстасаванне не сканфігуравана
-$ E2BIG
-7 Надта доўгі спіс аргументаў
-$ ENOEXEC
-8 Памылка фармату файлу, які выконваецца
-$ EBADF
-9 Некарэктны дэскрыптар файлу
-$ ECHILD
-10 Няма дачэрніх працэсаў
-$ EDEADLK
-11 Прадухілена ўзаемная блакіроўка падчас доступу да рэсурсу
-$ ENOMEM
-12 Не дастае памяці
-$ EACCES
-13 Не дастае прывілеяў
-$ EFAULT
-14 Некарэктны адрас
-$ ENOTBLK
-15 Неабходна блочнае прыстасаванне
-$ EBUSY
-16 Прыстасаванне занятае
-$ EEXIST
-17 Файл існуе
-$ EXDEV
-18 Спасылка на іншае прыстасаванне
-$ ENODEV
-19 Аперацыя не падтрымліваецца прыстасаваннем
-$ ENOTDIR
-20 Пазначаны файл не з'яўляецца каталогам
-$ EISDIR
-21 Пазначаны файл з'яўляецца каталогам
-$ EINVAL
-22 Недапушчальны аргумент
-$ ENFILE
-23 Надта шмат адчыненых файлаў у сістэме
-$ EMFILE
-24  Надта шмат адчыненых файлаў
-$ ENOTTY
-25 Выклік ioctl не падтрымліваецца прыстасаваннем
-$ ETXTBSY
-26 Текставы файл заняты
-$ EFBIG
-27 Надта вялікі файл
-$ ENOSPC
-28 На прыстасаванні не засталося месца
-$ ESPIPE
-29 Недапушчальнае пазіцыянаванне
-$ EROFS
-30 Файлавая сістэма толькі для чытання
-$ EMLINK
-31 Надта шмат спасылак
-$ EPIPE
-32 Канал пашкоджаны
-$ EDOM
-33 Недапушчальнае значэнне лічбавага аргументу
-$ ERANGE
-34 Надта вялікі рэзультат
-$ EAGAIN, EWOULDBLOCK
-35 Рэсурс часова недаступны
-$ EINPROGRESS
-36 Аперацыя ў працэсе выканання
-$ EALREADY
-37 Аперацыя ўжо выконваецца
-$ ENOTSOCK
-38 Аперацыя з сокетам прыменена не да сокету
-$ EDESTADDRREQ
-39 Патрабуецца адрас прызначэння
-$ EMSGSIZE
-40 Надта доўгае паведамленне
-$ EPROTOTYPE
-41 Няправільны тып пратаколу для сокету
-$ ENOPROTOOPT
-42 Пратакол недаступны
-$ EPROTONOSUPPORT
-43 Пратакол не падтрымліваецца
-$ ESOCKTNOSUPPORT
-44 Тып сокету не падтрымліваецца
-$ EOPNOTSUPP
-45 Аперацыя не падтрымліваецца
-$ EPFNOSUPPORT
-46 Сямейства пратаколаў не падтрымліваецца
-$ EAFNOSUPPORT
-47 Сямейства адрасоў не падтрымліваецца сямействам пратаколаў
-$ EADDRINUSE
-48 Адрас ўжо выкарыстоўваецца
-$ EADDRNOTAVAIL
-49 Не магчыма прызначыць дадзены адрас
-$ ENETDOWN
-50 Сетка не працуе
-$ ENETUNREACH
-51 Сетка недасяжна
-$ ENETRESET
-52 Злучэнне прыпынена сеткай
-$ ECONNABORTED
-53 Праграма выклікала аварыйнае завяршэнне злучэння
-$ ECONNRESET
-54 Злучэнне завяршана супрацьлеглым бокам
-$ ENOBUFS
-55 Не засталося месца пад буфер
-$ EISCONN
-56 Сокет ужо падлучаны
-$ ENOTCONN
-57 Сокет не падлучаны
-$ ESHUTDOWN
-58 Не магчыма дасылаць пасля закрыцця сокету
-$ ETOOMANYREFS
-59 Надта шмат спасылак: не магчыма злучыць
-$ ETIMEDOUT
-60 Аперацыя перавысіла часавы ліміт
-$ ECONNREFUSED
-61 У злучэнні адмоўлена
-$ ELOOP
-62 Надта шмат узроўняў сімвальных спасылак
-$ ENAMETOOLONG
-63 Надта доўгае імя файлу
-$ EHOSTDOWN
-64 Хост не працуе
-$ EHOSTUNREACH
-65 Няма маршруту да хосту
-$ ENOTEMPTY
-66 Каталог не пусты
-$ EPROCLIM
-67 Надта шмат працэсаў
-$ EUSERS
-68 Надта шмат карыстальнікаў
-$ EDQUOT
-69 Перавышана дыскавая квота
-$ ESTALE
-70 Састарэлы дэскрыптар файлу NFS
-$ EREMOTE
-71 Надта шмат дыстанцыйных пераходаў на шляху
-$ EBADRPC
-72 Некарэктная структура RPC
-$ ERPCMISMATCH
-73 Няправільная версія RPC
-$ EPROGUNAVAIL
-74 Праграма RPC недасяжная
-$ EPROGMISMATCH
-75 Няправільная версія праграмы
-$ EPROCUNAVAIL
-76 Некарэктная працэдура для праграмы
-$ ENOLCK
-77 Блакіроўкі недаступны
-$ ENOSYS
-78 Функцыя не рэалізавана
-$ EFTYPE
-79 Непадыходзячы тып ці фармат файлу
-$ EAUTH
-80 Памылка аўтэнтыфікацыі
-$ ENEEDAUTH
-81 Неабходна аўтэнтыфікацыя
-$ EIDRM
-82 Ідэнтыфікатар выдалены
-$ ENOMSG
-83 Няма паведамлення патрэбнага тыпу
-$ EOVERFLOW
-84 Надта вялікае значэнне для захоўвання ў пазначаным тыпе дадзеных
-$ ECANCELED
-85 Аперацыя адменена
-$ EILSEQ
-86 Недазволеная паслядоўнасць байтаў
-$ ENOATTR
-87 Атрыбут не знойдзены
-$ EDOOFUS
-88 Памылка праграмавання
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Разрыў сувязі
-$ SIGINT
-2 Перарванне па сігналу
-$ SIGQUIT
-3 Выхад
-$ SIGILL
-4 Недапушчальная інструкцыя
-$ SIGTRAP
-5 Пастка трасіроўкі/кропкі спынення
-$ SIGABRT
-6 Пастка аварыйнага завяршэння
-$ SIGEMT
-7 Пастка EMT
-$ SIGFPE
-8 Памылка падчас працы з рэчыўным лікам
-$ SIGKILL
-9 Прымусова спынены
-$ SIGBUS
-10 Памылка шыны
-$ SIGSEGV
-11 Памылка сегментацыі
-$ SIGSYS
-12 Недапушчальны сістэмны выклік
-$ SIGPIPE
-13 Канал пашкоджаны
-$ SIGALRM
-14 Спрацаваў таймер
-$ SIGTERM
-15 Завершаны
-$ SIGURG
-16 Неабходны тэрміновы ўвод-вывад
-$ SIGSTOP
-17 Прыпыненне (сігнал)
-$ SIGTSTP
-18 Прыпыненне
-$ SIGCONT
-19 Працяг працы
-$ SIGCHLD
-20 Завершана праца дачэрняга працэсу
-$ SIGTTIN
-21 Спынены (увод з тэрміналу)
-$ SIGTTOU
-22 Спынены (увод на тэрмінал)
-$ SIGIO
-23 Увод-вывад магчымы
-$ SIGXCPU
-24 Перавышана абмежаванне працэсарнага часу
-$ SIGXFSZ
-25 Перавышаны максімальны памер файлу
-$ SIGVTALRM
-26 Вычарпаны віртуальны таймер
-$ SIGPROF
-27 Вычарпаны таймер прафілявання
-$ SIGWINCH
-28 Змена памеру вакна
-$ SIGINFO
-29 Запыт інфармацыі
-$ SIGUSR1
-30 Сігнал карыстальніка 1
-$ SIGUSR2
-31 Сігнал карыстальніка 2
diff --git a/lib/libc_bsd/nls/ca_ES.ISO8859-1.msg b/lib/libc_bsd/nls/ca_ES.ISO8859-1.msg
deleted file mode 100644
index e8349f9..0000000
--- a/lib/libc_bsd/nls/ca_ES.ISO8859-1.msg
+++ /dev/null
@@ -1,267 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/ca_ES.ISO8859-1.msg 189765 2009-03-13 10:40:38Z gabor $
-$
-$ Message catalog for ca_ES.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operaci� no permesa
-$ ENOENT
-2 Arxiu o directori inexistent
-$ ESRCH
-3 Proc�s inexistent
-$ EINTR
-4 Crida del sistema interrompuda
-$ EIO
-5 Error d'entrada/sortida
-$ ENXIO
-6 Dispositiu no configurat
-$ E2BIG
-7 Llista de par�metres massa llarga
-$ ENOEXEC
-8 Error en el format de l'executable
-$ EBADF
-9 Descriptor d'arxiu incorrecte
-$ ECHILD
-10 No hi ha processos fills
-$ EDEADLK
-11 S'ha evitat el bloqueig del recurs
-$ ENOMEM
-12 No es pot assignar la mem�ria demanada
-$ EACCES
-13 Perm�s denegat
-$ EFAULT
-14 Adre�a incorrecta
-$ ENOTBLK
-15 Es necessita un dispositiu de blocs
-$ EBUSY
-16 Dispositiu ocupat
-$ EEXIST
-17 L'arxiu ja existeix
-$ EXDEV
-18 Enlla� entre dispositius
-$ ENODEV
-19 Operaci� no suportada pel dispositiu
-$ ENOTDIR
-20 No �s un directori
-$ EISDIR
-21 �s un directori
-$ EINVAL
-22 Par�metre incorrecte
-$ ENFILE
-23 Hi ha massa arxius oberts al sistema
-$ EMFILE
-24 Hi ha massa arxius oberts
-$ ENOTTY
-25 L'ioctl no �s adecuat per al dispositiu
-$ ETXTBSY
-26 Arxiu de text ocupat
-$ EFBIG
-27 Arxiu massa gran
-$ ENOSPC
-28 No queda espai lliure en el dispositiu
-$ ESPIPE
-29 Cerca il�legal
-$ EROFS
-30 Sistema d'arxius de nom�s lectura
-$ EMLINK
-31 Massa enlla�os
-$ EPIPE
-32 Canal (pipe) trencat
-$ EDOM
-33 El resultat surt fora de rang
-$ ERANGE
-34 Resultat massa gran
-$ EAGAIN, EWOULDBLOCK
-35 El recurs no est� disponible temporalment
-$ EINPROGRESS
-36 L'operaci� es troba en progr�s actualment
-$ EALREADY
-37 L'operaci� ja es troba en progr�s
-$ ENOTSOCK
-38 Operaci� de tipus socket en quelcom que no ho �s
-$ EDESTADDRREQ
-39 Es requereix l'adre�a de dest�
-$ EMSGSIZE
-40 Missatge massa llarg
-$ EPROTOTYPE
-41 Tipus de protocol incorrecte per al socket
-$ ENOPROTOOPT
-42 Protocol no disponible
-$ EPROTONOSUPPORT
-43 Protocol no suportat
-$ ESOCKTNOSUPPORT
-44 Tipus de socket no suportat
-$ EOPNOTSUPP
-45 Operaci� no suportada
-$ EPFNOSUPPORT
-46 Fam�lia de protocols no suportada
-$ EAFNOSUPPORT
-47 Fam�lia d'adreces no suportada per la fam�lia de protocols
-$ EADDRINUSE
-48 L'adre�a ja es troba en �s
-$ EADDRNOTAVAIL
-49 No es pot assignar l'adre�a demanada
-$ ENETDOWN
-50 La xarxa no es troba disponible
-$ ENETUNREACH
-51 No es pot accedir a la xarxa
-$ ENETRESET
-52 La connexi� a la xarxa s'ha perdut durant la reinicialitzaci�
-$ ECONNABORTED
-53 El programari ha causat l'avort de la connexi�
-$ ECONNRESET
-54 L'interlocutor ha reinicialitzat la comunicaci�
-$ ENOBUFS
-55 No hi ha prou espai per a la memoria interm�dia (buffer)
-$ EISCONN
-56 El socket ja es troba connectat
-$ ENOTCONN
-57 El socket no es troba connectat
-$ ESHUTDOWN
-58 No es pot enviar despr�s de la desconnexi� del socket
-$ ETOOMANYREFS
-59 Hi ha massa refer�ncies: no es poden unir
-$ ETIMEDOUT
-60 El temps de connexi� s'ha esgotat
-$ ECONNREFUSED
-61 Connexi� rebutjada
-$ ELOOP
-62 Hi ha massa nivells d'enlla�os simb�lics
-$ ENAMETOOLONG
-63 Nom d'arxiu massa llarg
-$ EHOSTDOWN
-64 La m�quina no es troba disponible
-$ EHOSTUNREACH
-65 No hi ha cap cam� fins a la m�quina
-$ ENOTEMPTY
-66 El directori no est� buit
-$ EPROCLIM
-67 Hi ha massa processos
-$ EUSERS
-68 Hi ha massa usuaris
-$ EDQUOT
-69 Quota de disc sobrepassada
-$ ESTALE
-70 Descriptor d'arxiu NFS incorrecte
-$ EREMOTE
-71 Massa nivells en el cam� de dest�
-$ EBADRPC
-72 L'estructura RPC es incorrecta
-$ ERPCMISMATCH
-73 La versi� del RPC es incorrecta
-$ EPROGUNAVAIL
-74 El programa RPC no es troba disponible
-$ EPROGMISMATCH
-75 Versi� incorrecta del programa
-$ EPROCUNAVAIL
-76 Procediment erroni per al programa
-$ ENOLCK
-77 No hi ha bloquejos disponibles
-$ ENOSYS
-78 Funci� no implementada
-$ EFTYPE
-79 Tipus d'arxiu o de format inadequat
-$ EAUTH
-80 Error d'autenticaci�
-$ ENEEDAUTH
-81 Es necessita un autenticador
-$ EIDRM
-82 Identificador eliminat
-$ ENOMSG
-83 No hi ha missatges del tipus desitjat
-$ EOVERFLOW
-84 Valor massa gran per a �sser emmagatzemat en el tipus de dades
-$ EILSEQ
-85 Seq��ncia de bytes il�legal
-$ ENOTSUP
-86 No suportat
-$ ECANCELED
-87 Operaci� cancel�lada
-$ EBADMSG
-88 Missatje incorrecte o corrupte
-$ ENODATA
-89 No hi ha missatges disponibles
-$ ENOSR
-90 No hi ha recursos de tipus STREAM
-$ ENOSTR
-91 No �s un STREAM
-$ ETIME
-92 Temps d'espera esgotat en el ioctl STREAM
-$ ENOATTR
-93 Atribut inexistent
-$ EMULTIHOP
-94 S'ha intentat un multisalt
-$ ENOLINK
-95 L'enlla� s'ha servit
-$ EPROTO
-96 Error de protocol
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 F� de l�nia (hangup)
-$ SIGINT
-2 Interrupci�
-$ SIGQUIT
-3 Finalitzaci�
-$ SIGILL
-4 Instrucci� il�legal
-$ SIGTRAP
-5 Depuraci� (Trace/BPT)
-$ SIGABRT
-6 Crida d'avort
-$ SIGEMT
-7 Captura d'EMT
-$ SIGFPE
-8 Excepci� de coma flotant
-$ SIGKILL
-9 Matat
-$ SIGBUS
-10 Error del bus
-$ SIGSEGV
-11 Error de segmentaci�
-$ SIGSYS
-12 Crida al sistema incorrecta
-$ SIGPIPE
-13 Canal (pipe) trencat
-$ SIGALRM
-14 Alarma de rellotge
-$ SIGTERM
-15 Finalitzat
-$ SIGURG
-16 Condici� urgent d'E/S
-$ SIGSTOP
-17 Parat (per senyal)
-$ SIGTSTP
-18 Parat
-$ SIGCONT
-19 Continuant
-$ SIGCHLD
-20 El fill ha acabat
-$ SIGTTIN
-21 Parat (entrada de tty)
-$ SIGTTOU
-22 Parat (sortida de tty)
-$ SIGIO
-23 I/O permesa
-$ SIGXCPU
-24 S'ha sobrepassat el l�mit de temps de la CPU
-$ SIGXFSZ
-25 S'ha sobrepassat el l�mit de la longitud de l'arxiu
-$ SIGVTALRM
-26 El temporitzador virtual ha expirat
-$ SIGPROF
-27 El temporitzador del perfilador ha expirat
-$ SIGWINCH
-28 Canvis en la mida de la finestra
-$ SIGINFO
-29 Demanda d'informaci�
-$ SIGUSR1
-30 Senyal 1 definida per l'usuari
-$ SIGUSR2
-31 Senyal 2 definida per l'usuari
-$ SIGPWR
-32 Fallada/reinicialitzaci� de l'alimentaci�
diff --git a/lib/libc_bsd/nls/catclose.3 b/lib/libc_bsd/nls/catclose.3
deleted file mode 100644
index 0d22cdc..0000000
--- a/lib/libc_bsd/nls/catclose.3
+++ /dev/null
@@ -1,64 +0,0 @@
-.\" Copyright (c) 1994 Winning Strategies, Inc.
-.\" 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 Winning Strategies, Inc.
-.\" 4. 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 ``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 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: releng/10.2/lib/libc/nls/catclose.3 142665 2005-02-27 16:30:16Z phantom $
-.Dd February 12, 2005
-.Dt CATCLOSE 3
-.Os
-.Sh NAME
-.Nm catclose
-.Nd close message catalog
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nl_types.h
-.Ft int
-.Fn catclose "nl_catd catd"
-.Sh DESCRIPTION
-The
-.Fn catclose
-function closes the message catalog specified by the argument
-.Fa catd .
-.Sh RETURN VALUES
-.Rv -std catclose
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-An invalid message catalog descriptor was passed by the
-.Fa catd
-argument.
-.El
-.Sh SEE ALSO
-.Xr gencat 1 ,
-.Xr catgets 3 ,
-.Xr catopen 3
-.Sh STANDARDS
-The
-.Fn catclose
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/nls/catgets.3 b/lib/libc_bsd/nls/catgets.3
deleted file mode 100644
index c229f4b..0000000
--- a/lib/libc_bsd/nls/catgets.3
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" Copyright (c) 1994 Winning Strategies, Inc.
-.\" 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 Winning Strategies, Inc.
-.\" 4. 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 ``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 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: releng/10.2/lib/libc/nls/catgets.3 147402 2005-06-15 19:04:04Z ru $
-.Dd February 12, 2005
-.Dt CATGETS 3
-.Os
-.Sh NAME
-.Nm catgets
-.Nd retrieve string from message catalog
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nl_types.h
-.Ft char *
-.Fn catgets "nl_catd catd" "int set_id" "int msg_id" "const char *s"
-.Sh DESCRIPTION
-The
-.Fn catgets
-function attempts to retrieve message
-.Fa msg_id
-of set
-.Fa set_id
-from the message catalog referenced by the descriptor
-.Fa catd .
-The argument
-.Fa s
-points to a default message which is returned if the function
-is unable to retrieve the specified message.
-.Sh RETURN VALUES
-If the specified message was retrieved successfully,
-.Fn catgets
-returns a pointer to an internal buffer containing the message string;
-otherwise it returns
-.Fa s .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa catd
-argument is not a valid message catalog descriptor.
-.It Bq Er EBADMSG
-The message identified by
-.Fa set_id
-and
-.Fa msg_id
-is not in the message catalog.
-.El
-.Sh SEE ALSO
-.Xr gencat 1 ,
-.Xr catclose 3 ,
-.Xr catopen 3
-.Sh STANDARDS
-The
-.Fn catgets
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/nls/catopen.3 b/lib/libc_bsd/nls/catopen.3
deleted file mode 100644
index 4600c5f..0000000
--- a/lib/libc_bsd/nls/catopen.3
+++ /dev/null
@@ -1,157 +0,0 @@
-.\" Copyright (c) 1994 Winning Strategies, Inc.
-.\" 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 Winning Strategies, Inc.
-.\" 4. 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 ``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 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: releng/10.2/lib/libc/nls/catopen.3 142665 2005-02-27 16:30:16Z phantom $
-.Dd February 12, 2005
-.Dt CATOPEN 3
-.Os
-.Sh NAME
-.Nm catopen
-.Nd open message catalog
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In nl_types.h
-.Ft nl_catd
-.Fn catopen "const char *name" "int oflag"
-.Sh DESCRIPTION
-The
-.Fn catopen
-function opens the message catalog specified by
-.Fa name
-and returns a message catalog descriptor.
-If
-.Fa name
-contains a
-.Sq /
-then
-.Fa name
-specifies the full pathname for the message catalog, otherwise the value
-of the environment variable
-.Ev NLSPATH
-is used with
-the following substitutions:
-.Bl -tag -width XXX
-.It \&%N
-The value of the
-.Fa name
-argument.
-.It \&%L
-The value of the
-.Ev LANG
-environment variable or the
-.Dv LC_MESSAGES
-category (see below).
-.It \&%l
-The language element from the
-.Ev LANG
-environment variable or from the
-.Dv LC_MESSAGES
-category.
-.It \&%t
-The territory element from the
-.Ev LANG
-environment variable or from the
-.Dv LC_MESSAGES
-category.
-.It \&%c
-The codeset element from the
-.Ev LANG
-environment variable or from the
-.Dv LC_MESSAGES
-category.
-.It \&%%
-A single % character.
-.El
-.Pp
-An empty string is substituted for undefined values.
-.Pp
-Path names templates defined in
-.Ev NLSPATH
-are separated by colons
-.No ( Sq \&: ) .
-A leading or two adjacent colons
-is equivalent to specifying %N.
-.Pp
-If the
-.Fa oflag
-argument is set to the
-.Dv NL_CAT_LOCALE
-constant,
-.Dv LC_MESSAGES
-locale category used to open the message catalog; using
-.Dv NL_CAT_LOCALE
-conforms to the
-.St -xpg4
-standard.
-You can specify 0 for compatibility with
-.St -xpg3 ;
-when
-.Fa oflag
-is set to 0, the
-.Ev LANG
-environment variable
-determines the message catalog locale.
-.Pp
-A message catalog descriptor
-remains valid in a process until that process closes it, or
-until a successful call to one of the
-.Xr exec 3
-function.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn catopen
-returns a message catalog descriptor.
-Otherwise, (nl_catd) -1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa name
-does not point to a valid message catalog, or catalog is corrupt.
-.It Bq Er ENAMETOOLONG
-An entire path to the message catalog exceeded 1024 characters.
-.It Bq Er ENOENT
-The named message catalog does not exists, or the
-.Fa name
-argument points to an empty string.
-.It Bq Er ENOMEM
-Insufficient memory is available.
-.El
-.Sh SEE ALSO
-.Xr gencat 1 ,
-.Xr catclose 3 ,
-.Xr catgets 3 ,
-.Xr setlocale 3
-.Sh STANDARDS
-The
-.Fn catopen
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/nls/de_DE.ISO8859-1.msg b/lib/libc_bsd/nls/de_DE.ISO8859-1.msg
deleted file mode 100644
index 6a47e5f..0000000
--- a/lib/libc_bsd/nls/de_DE.ISO8859-1.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/de_DE.ISO8859-1.msg 190410 2009-03-25 12:36:37Z netchild $
-$
-$ Message catalog for de_DE.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operation nicht erlaubt
-$ ENOENT
-2 Datei oder Verzeichnis nicht gefunden
-$ ESRCH
-3 Prozess nicht gefunden
-$ EINTR
-4 Interrupt innerhalb eines Systemaufrufs
-$ EIO
-5 Ein-/Ausgabefehler
-$ ENXIO
-6 Ger�t ist nicht konfiguriert
-$ E2BIG
-7 Argumentliste ist zu lang
-$ ENOEXEC
-8 Die Datei hat kein bekanntes ausf�hrbares Format
-$ EBADF
-9 Ung�ltiger Dateideskriptor
-$ ECHILD
-10 Keine Kindprozesse
-$ EDEADLK
-11 Ein Deadlock wurde vermieden
-$ ENOMEM
-12 Kann nicht genug Speicher belegen
-$ EACCES
-13 Zugriff verweigert
-$ EFAULT
-14 Ung�ltige Adresse
-$ ENOTBLK
-15 Es wird ein Blockger�t ben�tigt
-$ EBUSY
-16 Das Ger�t ist belegt
-$ EEXIST
-17 Datei existiert bereits
-$ EXDEV
-18 Link zwischen verschiedenen Ger�ten
-$ ENODEV
-19 Die Operation wird von diesem Ger�t nicht unterst�tzt
-$ ENOTDIR
-20 Kein Verzeichnis
-$ EISDIR
-21 Ist ein Verzeichnis
-$ EINVAL
-22 Ung�ltiges Argument
-$ ENFILE
-23 Zu viele offene Dateien im System
-$ EMFILE
-24 Zu viele offene Dateien
-$ ENOTTY
-25 Ung�ltiger IOCTL f�r dieses Ger�t
-$ ETXTBSY
-26 Datei wird benutzt
-$ EFBIG
-27 Datei zu gro�
-$ ENOSPC
-28 Kein Platz mehr auf dem Ger�t
-$ ESPIPE
-29 Ung�ltige Positionierung
-$ EROFS
-30 Dateisystem ist schreibgesch�tzt
-$ EMLINK
-31 Zu viele Links
-$ EPIPE
-32 Unterbrochene Pipe
-$ EDOM
-33 Numerisches Argument au�erhalb des Wertebereichs
-$ ERANGE
-34 Ergebnis au�erhalb des Wertebereichs
-$ EAGAIN, EWOULDBLOCK
-35 Ressource vor�bergehend nicht verf�gbar
-$ EINPROGRESS
-36 Operation wird gerade ausgef�hrt
-$ EALREADY
-37 Operation wird bereits ausgef�hrt
-$ ENOTSOCK
-38 Deskriptor ist kein Socket
-$ EDESTADDRREQ
-39 Zieladresse ben�tigt
-$ EMSGSIZE
-40 Nachricht zu lang
-$ EPROTOTYPE
-41 Ung�ltiger Protokolltyp f�r diesen Socket
-$ ENOPROTOOPT
-42 Protokoll nicht verf�gbar
-$ EPROTONOSUPPORT
-43 Protokoll nicht unterst�tzt
-$ ESOCKTNOSUPPORT
-44 Sockettyp nicht unterst�tzt
-$ EOPNOTSUPP
-45 Operation nicht unterst�tzt
-$ EPFNOSUPPORT
-46 Protokollfamilie nicht unterst�tzt
-$ EAFNOSUPPORT
-47 Adressfamilie wird von der Protokollfamilie nicht unterst�tzt
-$ EADDRINUSE
-48 Adresse wird bereits benutzt
-$ EADDRNOTAVAIL
-49 Kann angeforderte Adresse nicht belegen
-$ ENETDOWN
-50 Netzwerk nicht verf�gbar
-$ ENETUNREACH
-51 Netzwerk nicht erreichbar
-$ ENETRESET
-52 Netzwerk hat Verbindung mit Reset abgebrochen
-$ ECONNABORTED
-53 Software verursachte einen Verbindungsabbruch
-$ ECONNRESET
-54 Verbindung wurde von der Gegenstelle geschlossen
-$ ENOBUFS
-55 Keine Buffer verf�gbar
-$ EISCONN
-56 Socket ist schon verbunden
-$ ENOTCONN
-57 Socket ist nicht verbunden
-$ ESHUTDOWN
-58 Kann nach einem Socket-Shutdown nicht mehr senden
-$ ETOOMANYREFS
-59 Zu viele Referenzen, kann nicht verbinden
-$ ETIMEDOUT
-60 Verbindungsabbruch durch Zeit�berschreitung
-$ ECONNREFUSED
-61 Verbindung wurde abgelehnt
-$ ELOOP
-62 Zu viele symbolische Links (zirkul�r?)
-$ ENAMETOOLONG
-63 Dateiname zu lang
-$ EHOSTDOWN
-64 Host nicht verf�gbar
-$ EHOSTUNREACH
-65 Keine Route zum Host
-$ ENOTEMPTY
-66 Verzeichnis ist nicht leer
-$ EPROCLIM
-67 Zu viele Prozesse
-$ EUSERS
-68 Zu viele Benutzer
-$ EDQUOT
-69 Platzlimit �berschritten
-$ ESTALE
-70 Verwaister NFS-Dateideskriptor
-$ EREMOTE
-71 Zu viele Fernverweise in diesem Zugriff
-$ EBADRPC
-72 RPC-Struktur ist ung�ltig
-$ ERPCMISMATCH
-73 RPC-Version ist falsch
-$ EPROGUNAVAIL
-74 RPC-Programm nicht verf�gbar
-$ EPROGMISMATCH
-75 Falsche Programmversion
-$ EPROCUNAVAIL
-76 Falsche Prozedur f�r dieses Programm
-$ ENOLCK
-77 Keine Dateisperren verf�gbar
-$ ENOSYS
-78 Funktion nicht implementiert
-$ EFTYPE
-79 Ung�ltiger Dateityp oder Dateiformat
-$ EAUTH
-80 Authentifizierungsfehler
-$ ENEEDAUTH
-81 Authentikator ben�tigt
-$ EIDRM
-82 Identifizierung entfernt
-$ ENOMSG
-83 Keine Nachricht vom gew�nschten Typ
-$ EOVERFLOW
-84 Wert zu gro�, um in Datentyp zu speichern
-$ ECANCELED
-85 Operation abgebrochen
-$ EILSEQ
-86 Ung�ltige Byte-Sequenz
-$ ENOATTR
-87 Attribut nicht gefunden
-$ EDOOFUS
-88 Programmierfehler
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Verbindungsende
-$ SIGINT
-2 Unterbrechung
-$ SIGQUIT
-3 Programmende
-$ SIGILL
-4 Ung�ltiger Maschinenbefehl
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Flie�kommafehler
-$ SIGKILL
-9 Unbedingter Programmabbruch
-$ SIGBUS
-10 Bus-Zugriffsfehler
-$ SIGSEGV
-11 Illegaler Speicherzugriff
-$ SIGSYS
-12 Ung�ltiger Systemaufruf
-$ SIGPIPE
-13 Unterbrochene Pipe
-$ SIGALRM
-14 Wecker
-$ SIGTERM
-15 Beendet
-$ SIGURG
-16 Dringende Ein/Ausgabeanforderung
-$ SIGSTOP
-17 Gestoppt (Signal)
-$ SIGTSTP
-18 Gestoppt
-$ SIGCONT
-19 Fortgesetzt
-$ SIGCHLD
-20 Kindprozess beendet
-$ SIGTTIN
-21 Gestoppt (Eingabe)
-$ SIGTTOU
-22 Gestoppt (Ausgabe)
-$ SIGIO
-23 Ein/Ausgabe m�glich
-$ SIGXCPU
-24 CPU-Zeitlimit �berschritten
-$ SIGXFSZ
-25 Dateigr��enlimit �berschritten
-$ SIGVTALRM
-26 Virtueller Wecker abgelaufen
-$ SIGPROF
-27 Profil-Wecker abgelaufen
-$ SIGWINCH
-28 Fenstergr��e hat sich ver�ndert
-$ SIGINFO
-29 Informationsanforderung
-$ SIGUSR1
-30 Benutzerdefiniertes Signal 1
-$ SIGUSR2
-31 Benutzerdefiniertes Signal 2
diff --git a/lib/libc_bsd/nls/el_GR.ISO8859-7.msg b/lib/libc_bsd/nls/el_GR.ISO8859-7.msg
deleted file mode 100644
index 80717f1..0000000
--- a/lib/libc_bsd/nls/el_GR.ISO8859-7.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/el_GR.ISO8859-7.msg 192653 2009-05-23 17:13:35Z des $
-$
-$ Message catalog for C locale (template)
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 �� ��������� ��������
-$ ENOENT
-2 ��� ������� ������ ������ � ���������
-$ ESRCH
-3 � ��������� ���� ��� �������
-$ EINTR
-4 � ����� ���������� ���������
-$ EIO
-5 ������ �������/������
-$ ENXIO
-6 � ������� ��� ���� ���������
-$ E2BIG
-7 � ����� ��� ���������� ����� ���� ������
-$ ENOEXEC
-8 ���������� ����� �����������
-$ EBADF
-9 ������������� ����������� �������
-$ ECHILD
-10 ��� �������� ����������� ����������
-$ EDEADLK
-11 ����������� �������� �����
-$ ENOMEM
-12 �������� ��������� ������
-$ EACCES
-13 ������ ���������
-$ EFAULT
-14 ����� ���������
-$ ENOTBLK
-15 ���������� ������� ����� block
-$ EBUSY
-16 ������� ������������
-$ EEXIST
-17 �� ������ �������
-$ EXDEV
-18 ��������� ������ ��������
-$ ENODEV
-19 � ���������� ��� ������������� ��� �� �������
-$ ENOTDIR
-20 ��� ����� ���������
-$ EISDIR
-21 ����� ���������
-$ EINVAL
-22 �� ������ ����������
-$ ENFILE
-23 ���������� ����� ������� ������ ��� �������
-$ EMFILE
-24 ���������� ����� ������� ������
-$ ENOTTY
-25 ���������� ioctl ��� �� �������
-$ ETXTBSY
-26 �� ������ �������� ����� ������������
-$ EFBIG
-27 ���� ������ ������
-$ ENOSPC
-28 ��� ���� ������ ��������� ����� ��� �������
-$ ESPIPE
-29 ���������� ���������
-$ EROFS
-30 �� ������� ������� ����� ���� ��� ��������
-$ EMLINK
-31 ���� ������ ���������
-$ EPIPE
-32 ���������� ��������
-$ EDOM
-33 �� ���������� ������ ����� ����� �����
-$ ERANGE
-34 ���� ������ ����������
-$ EAGAIN, EWOULDBLOCK
-35 � ����� ��� ����� ���������� ���������
-$ EINPROGRESS
-36 � ���������� ��������� �� ������� ����
-$ EALREADY
-37 � ���������� ����� ��� �� �������
-$ ENOTSOCK
-38 ���������� �������� �� ��-�������
-$ EDESTADDRREQ
-39 ���������� ��������� ����������
-$ EMSGSIZE
-40 ���� ������ ������
-$ EPROTOTYPE
-41 ����� ����� ���������� ��� �������
-$ ENOPROTOOPT
-42 �� ���������� ��� ����� ���������
-$ EPROTONOSUPPORT
-43 �� ���������� ��� �������������
-$ ESOCKTNOSUPPORT
-44 � ����� ��� �������� ��� ������������
-$ EOPNOTSUPP
-45 � ���������� ��� �������������
-$ EPFNOSUPPORT
-46 ��� ������������� � ���������� �����������
-$ EAFNOSUPPORT
-47 � ���������� ����������� ��� ������������� ��� ��� ���������� �����������
-$ EADDRINUSE
-48 � ��������� ��������������� ���
-$ EADDRNOTAVAIL
-49 ��� ������ �� ����� ������� ��� ���������� ����������
-$ ENETDOWN
-50 �� ������ ��� ����������
-$ ENETUNREACH
-51 ��� ������� �������� ���� �� ������
-$ ENETRESET
-52 �� ������ ������� �� ������� ���� ��� ���������
-$ ECONNABORTED
-53 �� ��������� ��������� ���������� ��� ��������
-$ ECONNRESET
-54 � ������� ������������ ��� ��� ���� �����
-$ ENOBUFS
-55 ��� ������� ���������� ���������� �����
-$ EISCONN
-56 � ������� ���� ��� ��������
-$ ENOTCONN
-57 � ������� ��� ���� ��������
-$ ESHUTDOWN
-58 ��� ����� ������ � �������� ���� ��� ���������� ��� ��������
-$ ETOOMANYREFS
-59 ���� ������ ��������: ��� ������ �� ����� ��������
-$ ETIMEDOUT
-60 ����� ������ �����������
-$ ECONNREFUSED
-61 ������ ��������
-$ ELOOP
-62 ���� ����� ������� ���������� ���������
-$ ENAMETOOLONG
-63 ���� ������ ����� �������
-$ EHOSTDOWN
-64 �� ������� ��� ����� �� ����������
-$ EHOSTUNREACH
-65 ��� ������� �������� ���� �� �������
-$ ENOTEMPTY
-66 � ��������� ��� ����� ������
-$ EPROCLIM
-67 ���������� ������ ����������
-$ EUSERS
-68 ���������� ������ �������
-$ EDQUOT
-69 �������� ����� ������ ������
-$ ESTALE
-70 ����� handle ������� ��� NFS
-$ EREMOTE
-71 ���� ����� ������������� ������� ��� ��������
-$ EBADRPC
-72 � ���� RPC ����� ������������
-$ ERPCMISMATCH
-73 ���������� ������ RPC
-$ EPROGUNAVAIL
-74 �� ��������� RPC ��� ����� ���������
-$ EPROGMISMATCH
-75 ���������� ������ ������������
-$ EPROCUNAVAIL
-76 ������������ ���������� ��� �� ���������
-$ ENOLCK
-77 ��� �������� ��������� ����������
-$ ENOSYS
-78 � ���������� ��� ���� ����������
-$ EFTYPE
-79 ����������� ����� � ����� �������
-$ EAUTH
-80 ������ ���� ��� ����������� ��������������
-$ ENEEDAUTH
-81 ���������� ������������ ��������������
-$ EIDRM
-82 �� ������������� ���� ���������
-$ ENOMSG
-83 ��� ������� ������ ��� ������������ �����
-$ EOVERFLOW
-84 � ���� ����� ���� ������ ��� �� ����������� ���� ���� ���������
-$ ECANCELED
-85 � ���������� ���������
-$ EILSEQ
-86 ��-������ ��������� bytes
-$ ENOATTR
-87 �� �������������� ��� �������
-$ EDOOFUS
-88 ������ ���������������
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 ��������
-$ SIGINT
-2 �������
-$ SIGQUIT
-3 �����������
-$ SIGILL
-4 ��-������ ������
-$ SIGTRAP
-5 ������ Trace/BPT
-$ SIGABRT
-6 ������ ��������
-$ SIGEMT
-7 ������ EMT
-$ SIGFPE
-8 �������� ������� ������������
-$ SIGKILL
-9 ������������
-$ SIGBUS
-10 ������ �������
-$ SIGSEGV
-11 ������ Segmentation
-$ SIGSYS
-12 ���� ����� ����������
-$ SIGPIPE
-13 ������� pipe
-$ SIGALRM
-14 ����� �����������
-$ SIGTERM
-15 ������������
-$ SIGURG
-16 ������� ��������� �/�
-$ SIGSTOP
-17 �� ������� (����)
-$ SIGTSTP
-18 �� �������
-$ SIGCONT
-19 �����������
-$ SIGCHLD
-20 ����� ����������� ����������
-$ SIGTTIN
-21 ������� (������� tty)
-$ SIGTTOU
-22 ������� (������ tty)
-$ SIGIO
-23 ���������� I/O
-$ SIGXCPU
-24 ����������� �� ���� ������ ��� CPU
-$ SIGXFSZ
-25 ����������� �� ������� ������� �������
-$ SIGVTALRM
-26 ����������� � ��������� �������������
-$ SIGPROF
-27 ����������� � ������������� profiling
-$ SIGWINCH
-28 �� ������� ��� ��������� �������
-$ SIGINFO
-29 ������ ��� ����������
-$ SIGUSR1
-30 ���� 1 ����������� ��� �� ������
-$ SIGUSR2
-31 ���� 2 ����������� ��� �� ������
diff --git a/lib/libc_bsd/nls/es_ES.ISO8859-1.msg b/lib/libc_bsd/nls/es_ES.ISO8859-1.msg
deleted file mode 100644
index a63a3ed..0000000
--- a/lib/libc_bsd/nls/es_ES.ISO8859-1.msg
+++ /dev/null
@@ -1,295 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/es_ES.ISO8859-1.msg 200077 2009-12-03 19:27:12Z gabor $
-$
-$ Message catalog for es_ES.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operaci�n no permitida
-$ ENOENT
-2 Fichero o directorio inexistente
-$ ESRCH
-3 Proceso inexistente
-$ EINTR
-4 Llamada del sistema interrumpida
-$ EIO
-5 Error de Entrada/Salida
-$ ENXIO
-6 Dispositivo no configurado
-$ E2BIG
-7 La lista de argumentos es demasiado larga
-$ ENOEXEC
-8 Error en el formato del ejecutable
-$ EBADF
-9 Descriptor incorrecto de fichero
-$ ECHILD
-10 No hay procesos hijo
-$ EDEADLK
-11 Se ha evitado el bloqueo del recurso
-$ ENOMEM
-12 No se pudo asignar memoria
-$ EACCES
-13 Permiso denegado
-$ EFAULT
-14 Direcci�n incorrecta
-$ ENOTBLK
-15 Se necesita un dispositivo de bloques
-$ EBUSY
-16 Dispositivo ocupado
-$ EEXIST
-17 El fichero ya existe
-$ EXDEV
-18 Enlace entre dispositivos
-$ ENODEV
-19 Operaci�n inadecuada para este dispositivo
-$ ENOTDIR
-20 No es un directorio
-$ EISDIR
-21 Es un directorio
-$ EINVAL
-22 Argumento inadecuado
-$ ENFILE
-23 Hay demasiados ficheros abiertos en el sistema
-$ EMFILE
-24 Hay demasiados ficheros abiertos
-$ ENOTTY
-25 ioctl inapropiado para el dispositivo
-$ ETXTBSY
-26 Fichero de texto ocupado
-$ EFBIG
-27 Fichero demasiado grande
-$ ENOSPC
-28 No queda espacio libre en el dispositivo
-$ ESPIPE
-29 B�squeda ilegal
-$ EROFS
-30 Sistema de ficheros de solo lectura
-$ EMLINK
-31 Demasiados enlaces
-$ EPIPE
-32 Canal (pipe) roto
-$ EDOM
-33 Argumento num�rico fuera de rango
-$ ERANGE
-34 El resultado es demasiado grande
-$ EAGAIN, EWOULDBLOCK
-35 el recurso no est� disponible temporalmente
-$ EINPROGRESS
-36 Operaci�n en proceso
-$ EALREADY
-37 La operaci�n ya se est� ejecutando
-$ ENOTSOCK
-38 Operaci�n de socket inaceptable para el dispositivo
-$ EDESTADDRREQ
-39 Se necesita una direcci�n de destino
-$ EMSGSIZE
-40 Mensaje demasiado largo
-$ EPROTOTYPE
-41 Tipo err�neo de protocolo para el socket
-$ ENOPROTOOPT
-42 Protocolo no disponible
-$ EPROTONOSUPPORT
-43 Protocolo no contemplado
-$ ESOCKTNOSUPPORT
-44 Tipo de socket no contemplado
-$ EOPNOTSUPP
-45 Operaci�n no contemplada
-$ EPFNOSUPPORT
-46 Familia de protocolos no contemplada
-$ EAFNOSUPPORT
-47 Familia de direcciones no contemplada por la familia de protocolos
-$ EADDRINUSE
-48 La direcci�n ya est� siendo usada
-$ EADDRNOTAVAIL
-49 No se pudo asignar la direcci�n requerida
-$ ENETDOWN
-50 La red no funciona
-$ ENETUNREACH
-51 No se ha podido acceder a la red
-$ ENETRESET
-52 La conexi�n de red se ha interrumpido al reinicializar
-$ ECONNABORTED
-53 Conexi�n perdida por problemas en el software
-$ ECONNRESET
-54 El interlocutor ha reinicializado la conexi�n
-$ ENOBUFS
-55 No queda espacio en el b�fer
-$ EISCONN
-56 El socket ya estaba conectado
-$ ENOTCONN
-57 El socket no est� conectado
-$ ESHUTDOWN
-58 No se puede enviar tras la desconexi�n del socket
-$ ETOOMANYREFS
-59 Demasiadas referencias: no se pueden unir
-$ ETIMEDOUT
-60 El tiempo de conexi�n ha expirado
-$ ECONNREFUSED
-61 Conexi�n rehusada
-$ ELOOP
-62 Demasiados niveles de enlaces simb�licos
-$ ENAMETOOLONG
-63 Nombre de fichero demasiado largo
-$ EHOSTDOWN
-64 La m�quina est� fuera de servicio
-$ EHOSTUNREACH
-65 No hay ruta hasta la m�quina
-$ ENOTEMPTY
-66 Directorio no vac�o
-$ EPROCLIM
-67 Demasiados procesos
-$ EUSERS
-68 Demasiados usuarios
-$ EDQUOT
-69 Cuota de disco sobrepasada
-$ ESTALE
-70 Descriptor de fichero NFS inv�lido
-$ EREMOTE
-71 Ruta con demasiados niveles
-$ EBADRPC
-72 La estructura de la RPC es err�nea
-$ ERPCMISMATCH
-73 La vers�n de la RPC es err�nea
-$ EPROGUNAVAIL
-74 La RPC no est� accesible
-$ EPROGMISMATCH
-75 Versi�n err�nea del programa
-$ EPROCUNAVAIL
-76 Procedimiento err�neo para el programa
-$ ENOLCK
-77 No hay bloqueos disponibles
-$ ENOSYS
-78 Funci�n no realizada
-$ EFTYPE
-79 Tipo de fichero o formato inapropiado
-$ EAUTH
-80 Error de autentificaci�n
-$ ENEEDAUTH
-81 Se necesita un autenticador
-$ EIDRM
-82 Identificador eliminado
-$ ENOMSG
-83 No hay mensajes del tipo deseado
-$ EOVERFLOW
-84 Valor demasiado grande para almacenarse en el tipo deseado
-$ ECANCELED
-85 Operaci�n cancelada
-$ EILSEQ
-86 Secuencia de bytes ilegal
-$ ENOATTR
-87 Atributo no encontrado
-$ EDOOFUS
-88 Error de programaci�n
-$ EBADMSG
-89 Mensaje inv�lido
-$ EMULTIHOP
-90 Intento de hop multiple
-$ ENOLINK
-91 El enlace se ha roto
-$ EPROTO
-92 Fallo de protocolo
-$ ENOTCAPABLE
-93 Habilidades insuficientes
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Fin de l�nea (Hangup)
-$ SIGINT
-2 Interrumpido
-$ SIGQUIT
-3 Terminado
-$ SIGILL
-4 Instrucci�n ilegal
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Excepci�n de coma flotante
-$ SIGKILL
-9 Matado
-$ SIGBUS
-10 Error en el bus
-$ SIGSEGV
-11 Fallo de segmentaci�n
-$ SIGSYS
-12 Llamada al sistema err�nea
-$ SIGPIPE
-13 Canal (pipe) roto
-$ SIGALRM
-14 Alarma del reloj
-$ SIGTERM
-15 Terminado
-$ SIGURG
-16 Condici�n urgente de E/S
-$ SIGSTOP
-17 Detenido (se�al)
-$ SIGTSTP
-18 Detenido
-$ SIGCONT
-19 Continuando
-$ SIGCHLD
-20 Proceso hijo terminado
-$ SIGTTIN
-21 Detenido (entrada tty)
-$ SIGTTOU
-22 Detenido (salida tty)
-$ SIGIO
-23 E/S posible
-$ SIGXCPU
-24 Se ha sobrepasado el tiempo l�mite de la CPU
-$ SIGXFSZ
-25 Se ha sobrepasado el l�mite de tama�o de fichero
-$ SIGVTALRM
-26 Temporizador virtual expirado
-$ SIGPROF
-27 Temporizador de perfilaci�n expirado
-$ SIGWINCH
-28 Cambios en el tama�o de ventana
-$ SIGINFO
-29 Petici�n de informaci�n
-$ SIGUSR1
-30 Se�al definida por el usuario n1
-$ SIGUSR2
-31 Se�al definida por el usuario n2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsoleto)
-1 Tipo de direcci�n no contemplado
-$ EAI_AGAIN
-2 Error transitorio en la resoluci�n de nombres
-$ EAI_BADFLAGS
-3 Valor inv�lido de ai_flags
-$ EAI_FAIL
-4 Error no recuperable en la resoluci�n de nombres
-$ EAI_FAMILY
-5 ai_family no contemplado
-$ EAI_MEMORY
-6 Error en la asignaci�n de memoria
-$ 7 (obsoleto)
-7 No hay direcci�n asociada con el nombre de m�quina
-$ EAI_NONAME
-8 No se dispone nombre de m�quina, ni nombre de servicio
-$ EAI_SERVICE
-9 Nombre de servicio no contemplado en ai_socktype
-$ EAI_SOCKTYPE
-10 ai_socktype no contemplado
-$ EAI_SYSTEM
-11 Error de sistema devuelto en errno
-$ EAI_BADHINTS
-12 Valor inv�lido de hints
-$ EAI_PROTOCOL
-13 Protocolo resuelto desconocido
-$ EAI_OVERFLOW
-14 B�fer de argumentos sobrepasado
-$ 0
-32766 �xito
-$ NL_MSGMAX
-32767 Error desconocido
diff --git a/lib/libc_bsd/nls/fi_FI.ISO8859-1.msg b/lib/libc_bsd/nls/fi_FI.ISO8859-1.msg
deleted file mode 100644
index 0f659b6..0000000
--- a/lib/libc_bsd/nls/fi_FI.ISO8859-1.msg
+++ /dev/null
@@ -1,233 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/fi_FI.ISO8859-1.msg 189765 2009-03-13 10:40:38Z gabor $
-$
-$ Message catalog for fi_FI.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Toimintoa ei sallita
-$ ENOENT
-2 Tiedostoa tai hakemistoa ei l�ydy
-$ ESRCH
-3 Prosessia ei l�ydy
-$ EINTR
-4 Systeemikutsu keskeytyi
-$ EIO
-5 Sy�tt�/tulostusvirhe
-$ ENXIO
-6 Laitetta ei m��ritelty
-$ E2BIG
-7 Liikaa argumentteja
-$ ENOEXEC
-8 Tuntematon ohjelmatyyppi
-$ EBADF
-9 Virheellinen tiedosto-osoitin
-$ ECHILD
-10 Ei lapsiprosesseja
-$ EDEADLK
-11 Resurssin ristiinlukitus v�ltetty
-$ ENOMEM
-12 Muistinvaraus ep�onnistui
-$ EACCES
-13 Lupa kielletty
-$ EFAULT
-14 Virheellinen osoite
-$ ENOTBLK
-15 Tarvitaan lohko-osoitettava laite
-$ EBUSY
-16 Laite k�yt�ss�
-$ EEXIST
-17 Tiedosto on jo olemassa
-$ EXDEV
-18 Laitteiden v�linen linkki
-$ ENODEV
-19 Laite ei tue toimintoa
-$ ENOTDIR
-20 Kohde ei ole hakemisto
-$ EISDIR
-21 Kohde on hakemisto
-$ EINVAL
-22 Virheellinen argumentti
-$ ENFILE
-23 J�rjestelm�ss� on liian monta avointa tiedostoa
-$ EMFILE
-24 Liian monta avointa tiedostoa
-$ ENOTTY
-25 Virheellinen ohjaustoiminto laitteelle
-$ ETXTBSY
-26 Tiedosto on k�yt�ss�
-$ EFBIG
-27 Tiedosto liian suuri
-$ ENOSPC
-28 Laitteella ei ole tilaa
-$ ESPIPE
-29 Virheellinen haku
-$ EROFS
-30 Vain luettava tiedostoj�rjestelm�
-$ EMLINK
-31 Liian monta linkki�
-$ EPIPE
-32 Katkennut putki
-$ EDOM
-33 Numeerinen sy�te virheellinen
-$ ERANGE
-34 Tulos liian suuri
-$ EAGAIN, EWOULDBLOCK
-35 Resurssi ei ole tilap�isesti saatavilla
-$ EINPROGRESS
-36 Toiminta on k�ynniss�
-$ EALREADY
-37 Toiminta oli jo k�ynniss�
-$ ENOTSOCK
-38 Socket-operaatio muulla kuin socketilla
-$ EDESTADDRREQ
-39 Tarvitaan kohdeosoite
-$ EMSGSIZE
-40 Sanoma liian pitk�
-$ EPROTOTYPE
-41 V��r� protokolla socketille
-$ ENOPROTOOPT
-42 Protokolla ei ole k�ytett�viss�
-$ EPROTONOSUPPORT
-43 Protokollaa ei tueta
-$ ESOCKTNOSUPPORT
-44 Socket-tyyppi� ei tueta
-$ EOPNOTSUPP
-45 Toimintoa ei tueta
-$ EPFNOSUPPORT
-46 Protokollaperhett� ei tueta
-$ EAFNOSUPPORT
-47 Protokollaperhe ei tue osoiteperhett�
-$ EADDRINUSE
-48 Osoite on jo k�yt�ss�
-$ EADDRNOTAVAIL
-49 Ei pysty antamaan pyydetty� osoitetta
-$ ENETDOWN
-50 Verkko ei ole k�ytett�viss�
-$ ENETUNREACH
-51 Verkkoon ei ole yhteytt�
-$ ENETRESET
-52 Verkko sulki yhteyden
-$ ECONNABORTED
-53 Ohjelmiston aiheuttama yhteyden keskeytyminen
-$ ECONNRESET
-54 Is�nt� nollasi yhteyden
-$ ENOBUFS
-55 Puskuritila on lopussa
-$ EISCONN
-56 Yhteys on jo olemassa
-$ ENOTCONN
-57 Yhteytt� ei ole olemassa
-$ ESHUTDOWN
-58 L�hett�minen ei ole mahdollista yhteyden katkaisun j�lkeen
-$ ETOOMANYREFS
-59 Liikaa viittauksia: ei voi yhdist��
-$ ETIMEDOUT
-60 Yhteyden aikavalvontakatkaisu
-$ ECONNREFUSED
-61 Yhteys hyl�tty
-$ ELOOP
-62 Liian monta per�kk�ist� symbolista linkki�
-$ ENAMETOOLONG
-63 Tiedoston nimi on liian pitk�
-$ EHOSTDOWN
-64 Is�nt� ei vastaa
-$ EHOSTUNREACH
-65 Ei reitti� is�nt��n
-$ ENOTEMPTY
-66 Hakemisto ei ole tyhj�
-$ EPROCLIM
-67 Liian monta prosessia
-$ EUSERS
-68 Liian monta k�ytt�j��
-$ EDQUOT
-69 Levytilarajoitus ylittyi
-$ ESTALE
-70 Vanhentunut NFS-yhteys
-$ EREMOTE
-71 Liian monta verkkolevy� polussa
-$ EBADRPC
-72 Virheellinen RPC-pyynt�
-$ ERPCMISMATCH
-73 V��r� RPC-versio
-$ EPROGUNAVAIL
-74 RPC ei k�ytett�viss�
-$ EPROGMISMATCH
-75 V��r� ohjelmaversio
-$ EPROCUNAVAIL
-76 V��r� RPC-pyynt� ohjelmalle
-$ ENOLCK
-77 Lukitus ei k�ytett�viss�
-$ ENOSYS
-78 Toimintoa ei ole
-$ EFTYPE
-79 V��r� tiedostotyyppi tai -formaatti
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Katkaisu
-$ SIGINT
-2 Keskeytys
-$ SIGQUIT
-3 Lopetus
-$ SIGILL
-4 Laiton k�sky
-$ SIGTRAP
-5 J�ljitys/BPT ansa
-$ SIGABRT
-6 Poistumisansa
-$ SIGEMT
-7 EMT-ansa
-$ SIGFPE
-8 Liukulukuvirhe
-$ SIGKILL
-9 Tapettu
-$ SIGBUS
-10 V�yl�virhe
-$ SIGSEGV
-11 Suojausvirhe
-$ SIGSYS
-12 Virheellinen systeemikutsu
-$ SIGPIPE
-13 Katkennut putki
-$ SIGALRM
-14 H�lytyskello
-$ SIGTERM
-15 Lopetettu
-$ SIGURG
-16 Kiireellinen sy�tt�/tulostus
-$ SIGSTOP
-17 Pys�ytetty (signaali)
-$ SIGTSTP
-18 Pys�ytetty
-$ SIGCONT
-19 Jatkettu
-$ SIGCHLD
-20 Lapsiprosessi p��ttynyt
-$ SIGTTIN
-21 Pys�ytetty (tty-sy�te)
-$ SIGTTOU
-22 Pys�ytetty (tty-tuloste)
-$ SIGIO
-23 Sy�tt� ja tulostus mahdollisia
-$ SIGXCPU
-24 Keskusyksikk�aikarajoitus ylitetty
-$ SIGXFSZ
-25 Tiedoston kokorajoitus ylitetty
-$ SIGVTALRM
-26 Virtuaali-ajastin laukesi
-$ SIGPROF
-27 Profilointiajastin laukesi
-$ SIGWINCH
-28 Ikkunan koko muuttuu
-$ SIGINFO
-29 Informaatiopyynt�
-$ SIGUSR1
-30 K�ytt�j�n m��ritelt�v� signaali 1
-$ SIGUSR2
-31 K�ytt�j�n m��ritelt�v� signaali 2
-$ SIGPWR
-32 Virransaannin tilassa muutos
diff --git a/lib/libc_bsd/nls/fr_FR.ISO8859-1.msg b/lib/libc_bsd/nls/fr_FR.ISO8859-1.msg
deleted file mode 100644
index 846bbe8..0000000
--- a/lib/libc_bsd/nls/fr_FR.ISO8859-1.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/fr_FR.ISO8859-1.msg 249471 2013-04-14 11:44:47Z jilles $
-$
-$ Message catalog for fr_FR.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Op�ration non autoris�e
-$ ENOENT
-2 Fichier ou r�pertoire inexistant
-$ ESRCH
-3 Processus inconnu
-$ EINTR
-4 Appel syst�me interrompu
-$ EIO
-5 Erreur d'entr�e/sortie
-$ ENXIO
-6 Dispositif non configur�
-$ E2BIG
-7 Liste d'arguments trop longue
-$ ENOEXEC
-8 Format d'ex�cutable invalide
-$ EBADF
-9 Mauvais descripteur de fichier
-$ ECHILD
-10 Pas de processus fils
-$ EDEADLK
-11 �treinte mortelle d�tect�e
-$ ENOMEM
-12 Impossible d'allouer de la m�moire
-$ EACCES
-13 Permission refus�e
-$ EFAULT
-14 Mauvaise adresse
-$ ENOTBLK
-15 Dispositif en mode bloc requis
-$ EBUSY
-16 Dispositif occup�
-$ EEXIST
-17 Le fichier existe
-$ EXDEV
-18 Lien inter-unit�s
-$ ENODEV
-19 Op�ration non support�e par le dispositif
-$ ENOTDIR
-20 Pas un r�pertoire
-$ EISDIR
-21 Est un r�pertoire
-$ EINVAL
-22 Argument invalide
-$ ENFILE
-23 Trop de fichiers ouverts sur le syst�me
-$ EMFILE
-24 Trop de fichiers ouverts
-$ ENOTTY
-25 Fonction inadapt�e au dispositif
-$ ETXTBSY
-26 Fichier en cours d'utilisation
-$ EFBIG
-27 Fichier trop grand
-$ ENOSPC
-28 Plus d'espace disponible
-$ ESPIPE
-29 Recherche ill�gale
-$ EROFS
-30 Syst�me de fichier en lecture seulement
-$ EMLINK
-31 Trop de liens
-$ EPIPE
-32 Tube d�connect�
-$ EDOM
-33 Argument num�rique hors d�finition
-$ ERANGE
-34 R�sultat trop grand
-$ EAGAIN, EWOULDBLOCK
-35 Ressource indisponible temporairement
-$ EINPROGRESS
-36 Op�ration en cours
-$ EALREADY
-37 Op�ration d�j� en cours
-$ ENOTSOCK
-38 Op�ration de type socket sur un descripteur de fichier
-$ EDESTADDRREQ
-39 Adresse de destination obligatoire
-$ EMSGSIZE
-40 Message trop long
-$ EPROTOTYPE
-41 Mauvais type de protocole pour la socket
-$ ENOPROTOOPT
-42 Protocole non disponible
-$ EPROTONOSUPPORT
-43 Protocole non support�
-$ ESOCKTNOSUPPORT
-44 Type de socket non support�
-$ EOPNOTSUPP
-45 Op�ration non support�e
-$ EPFNOSUPPORT
-46 Famille de protocole non support�e
-$ EAFNOSUPPORT
-47 Famille d'adresse non support�e par la famille de protocole
-$ EADDRINUSE
-48 Adresse en cours d'utilisation
-$ EADDRNOTAVAIL
-49 Impossible d'assigner l'adresse demand�e
-$ ENETDOWN
-50 Plus de r�seau
-$ ENETUNREACH
-51 R�seau inaccessible
-$ ENETRESET
-52 Connexion coup�e par le r�seau
-$ ECONNABORTED
-53 Connexion interrompue
-$ ECONNRESET
-54 Connexion interrompue par l'h�te distant
-$ ENOBUFS
-55 Tampon satur�
-$ EISCONN
-56 La socket est d�j� connect�e
-$ ENOTCONN
-57 La socket n'est pas connect�e
-$ ESHUTDOWN
-58 Impossible d'envoyer apr�s la coupure
-$ ETOOMANYREFS
-59 Trop de r�f�rences�: lien impossible
-$ ETIMEDOUT
-60 D�passement du d�lai d'attente
-$ ECONNREFUSED
-61 Connexion refus�e
-$ ELOOP
-62 Trop de niveaux de liens symboliques
-$ ENAMETOOLONG
-63 Nom de fichier trop long
-$ EHOSTDOWN
-64 H�te distant arr�t�
-$ EHOSTUNREACH
-65 Pas de route vers l'h�te distant
-$ ENOTEMPTY
-66 R�pertoire non vide
-$ EPROCLIM
-67 Trop de processus
-$ EUSERS
-68 Trop d'utilisateurs
-$ EDQUOT
-69 Quota de disque d�pass�
-$ ESTALE
-70 Identificateur de fichier NFS p�rim�
-$ EREMOTE
-71 Trop de niveaux ext�rieurs dans le path
-$ EBADRPC
-72 Mauvaise structure RPC
-$ ERPCMISMATCH
-73 Mauvaise version RPC
-$ EPROGUNAVAIL
-74 Prog. RPC indisponible
-$ EPROGMISMATCH
-75 Mauvaise version de programme
-$ EPROCUNAVAIL
-76 Mauvaise proc�dure pour le programme
-$ ENOLCK
-77 Plus de verrous disponibles
-$ ENOSYS
-78 Fonction non impl�ment�e
-$ EFTYPE
-79 Type de fichier ou format inappropri�
-$ EAUTH
-80 Erreur d'authentification
-$ ENEEDAUTH
-81 Authentification requise
-$ EIDRM
-82 Identifiant retir�
-$ ENOMSG
-83 Aucun message du type souhait�
-$ EOVERFLOW
-84 Valeur trop grande pour le type de donn�e
-$ ECANCELED
-85 Op�ration annul�e
-$ EILSEQ
-86 S�quence d'octets ill�gale
-$ ENOATTR
-87 Attribut non trouv�
-$ EDOOFUS
-88 Erreur de programmation
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Fin de connexion
-$ SIGINT
-2 Interruption
-$ SIGQUIT
-3 Quitter
-$ SIGILL
-4 Instruction ill�gale
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Exception sur virgule flottante
-$ SIGKILL
-9 Tu�
-$ SIGBUS
-10 Bus error
-$ SIGSEGV
-11 Segmentation fault
-$ SIGSYS
-12 Bad system call
-$ SIGPIPE
-13 Broken pipe
-$ SIGALRM
-14 Alarm clock
-$ SIGTERM
-15 Termin�
-$ SIGURG
-16 Urgent I/O condition
-$ SIGSTOP
-17 Suspended (signal)
-$ SIGTSTP
-18 Suspended
-$ SIGCONT
-19 Continued
-$ SIGCHLD
-20 Child exited
-$ SIGTTIN
-21 Stopped (tty input)
-$ SIGTTOU
-22 Stopped (tty output)
-$ SIGIO
-23 I/O possible
-$ SIGXCPU
-24 Cputime limit exceeded
-$ SIGXFSZ
-25 Filesize limit exceeded
-$ SIGVTALRM
-26 Virtual timer expired
-$ SIGPROF
-27 Profiling timer expired
-$ SIGWINCH
-28 Window size changes
-$ SIGINFO
-29 Information request
-$ SIGUSR1
-30 User defined signal 1
-$ SIGUSR2
-31 User defined signal 2
diff --git a/lib/libc_bsd/nls/gl_ES.ISO8859-1.msg b/lib/libc_bsd/nls/gl_ES.ISO8859-1.msg
deleted file mode 100644
index 2cc5cf0..0000000
--- a/lib/libc_bsd/nls/gl_ES.ISO8859-1.msg
+++ /dev/null
@@ -1,295 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/gl_ES.ISO8859-1.msg 202743 2010-01-21 11:36:40Z gabor $
-$
-$ Message catalog for gl_ES.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operaci�n non permitida
-$ ENOENT
-2 Ficheiro ou directorio inexistente
-$ ESRCH
-3 Proceso inexistente
-$ EINTR
-4 Chamada do sistema interrompida
-$ EIO
-5 Erro de Entrada/Sa�da
-$ ENXIO
-6 Dispositivo non configurado
-$ E2BIG
-7 A lista de argumentos � demasiado larga
-$ ENOEXEC
-8 Erro no formato do executable
-$ EBADF
-9 Descriptor incorrecto de ficheiro
-$ ECHILD
-10 Non hai procesos fillos
-$ EDEADLK
-11 Evitouse o bloqueo do recurso
-$ ENOMEM
-12 Non se puido asignar memoria
-$ EACCES
-13 Permiso denegado
-$ EFAULT
-14 Direcci�n incorrecta
-$ ENOTBLK
-15 Prec�sase un dispositivo de bloques
-$ EBUSY
-16 Dispositivo ocupado
-$ EEXIST
-17 O ficheiro xa existe
-$ EXDEV
-18 Enlace entre dispositivos
-$ ENODEV
-19 Operaci�n inadecuada para este dispositivo
-$ ENOTDIR
-20 Non � un directorio
-$ EISDIR
-21 � un directorio
-$ EINVAL
-22 Argumento inadecuado
-$ ENFILE
-23 Hai demasiados ficheiros abertos no sistema
-$ EMFILE
-24 Hai demasiados ficheiros abertos
-$ ENOTTY
-25 ioctl inapropiado para o dispositivo
-$ ETXTBSY
-26 Ficheiro de texto ocupado
-$ EFBIG
-27 Ficheiro demasiado grande
-$ ENOSPC
-28 Non queda espacio libre no dispositivo
-$ ESPIPE
-29 seek inv�lido
-$ EROFS
-30 Sistema de ficheiros de s� lectura
-$ EMLINK
-31 Demasiados enlaces
-$ EPIPE
-32 Canal (pipe) roto
-$ EDOM
-33 Argumento num�rico f�ra de rango
-$ ERANGE
-34 O resultado � demasiado grande
-$ EAGAIN, EWOULDBLOCK
-35 O recurso non est� dispo�ible temporalmente
-$ EINPROGRESS
-36 Operaci�n en proceso
-$ EALREADY
-37 A operaci�n xa estase executando
-$ ENOTSOCK
-38 Operaci�n de socket inaceptable para o dispositivo
-$ EDESTADDRREQ
-39 Prec�sase unha direcci�n de destino
-$ EMSGSIZE
-40 Mensaxe demasiado largo
-$ EPROTOTYPE
-41 Tipo malo de protocolo para o socket
-$ ENOPROTOOPT
-42 Protocolo non dispo�ible
-$ EPROTONOSUPPORT
-43 Protocolo non contemplado
-$ ESOCKTNOSUPPORT
-44 Tipo de socket non contemplado
-$ EOPNOTSUPP
-45 Operaci�n non contemplada
-$ EPFNOSUPPORT
-46 Familia de protocolos non contemplada
-$ EAFNOSUPPORT
-47 Familia de direcciones non contemplada pola familia de protocolos
-$ EADDRINUSE
-48 A direcci�n xa est� en uso
-$ EADDRNOTAVAIL
-49 Non se puido asignar a direcci�n requerida
-$ ENETDOWN
-50 A rede non funciona
-$ ENETUNREACH
-51 Non se puido acceder � rede
-$ ENETRESET
-52 A conexi�n de rede interrompiuse ao reinicializar
-$ ECONNABORTED
-53 Conexi�n perdida por problemas no software
-$ ECONNRESET
-54 O interlocutor reinicializou a conexi�n
-$ ENOBUFS
-55 Non queda espacio no b�fer
-$ EISCONN
-56 O socket xa estaba conectado
-$ ENOTCONN
-57 O socket non est� conectado
-$ ESHUTDOWN
-58 Non se pode enviar tras a desconexi�n do socket
-$ ETOOMANYREFS
-59 Demasiadas referencias: non poden unirse
-$ ETIMEDOUT
-60 O tempo de conexi�n expirou
-$ ECONNREFUSED
-61 Conexi�n rexeitada
-$ ELOOP
-62 Demasiados niveles de enlaces simb�licos
-$ ENAMETOOLONG
-63 Nome de ficheiro demasiado largo
-$ EHOSTDOWN
-64 A m�quina est� f�ra de servicio
-$ EHOSTUNREACH
-65 Non hai ruta ata a m�quina
-$ ENOTEMPTY
-66 Directorio non baleiro
-$ EPROCLIM
-67 Demasiados procesos
-$ EUSERS
-68 Demasiados usuarios
-$ EDQUOT
-69 Cuota de disco sobrepasada
-$ ESTALE
-70 Descriptor de ficheiro NFS inv�lido
-$ EREMOTE
-71 Ruta con demasiados niveles
-$ EBADRPC
-72 A estructura da RPC � mala
-$ ERPCMISMATCH
-73 A versi�n da RPC � mala
-$ EPROGUNAVAIL
-74 A RPC non est� accesible
-$ EPROGMISMATCH
-75 Versi�n mala do programa
-$ EPROCUNAVAIL
-76 Procedemento malo para o programa
-$ ENOLCK
-77 Non hai bloqueos dispo�ibles
-$ ENOSYS
-78 Funci�n non realizada
-$ EFTYPE
-79 Tipo de ficheiro ou formato inapropiado
-$ EAUTH
-80 Erro de autenticaci�n
-$ ENEEDAUTH
-81 Prec�sase un autenticador
-$ EIDRM
-82 Identificador eliminado
-$ ENOMSG
-83 Non hai mensaxes do tipo desexado
-$ EOVERFLOW
-84 Valor demasiado grande para se almacenar no tipo desexado
-$ ECANCELED
-85 Operaci�n cancelada
-$ EILSEQ
-86 Secuencia inv�lida de byte
-$ ENOATTR
-87 Atributo non encontrado
-$ EDOOFUS
-88 Erro de programaci�n
-$ EBADMSG
-89 Mensaxe inv�lido
-$ EMULTIHOP
-90 Intento de Multihop
-$ ENOLINK
-91 Enlace fortaleceuse
-$ EPROTO
-92 Erro de protocolo
-$ ENOTCAPABLE
-93 Habilidades non suficientes
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Fin de li�a (Hangup)
-$ SIGINT
-2 Interrompido
-$ SIGQUIT
-3 Terminado
-$ SIGILL
-4 Instrucci�n inv�lida
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Excepci�n de coma flotante
-$ SIGKILL
-9 Matado
-$ SIGBUS
-10 Erro no bus
-$ SIGSEGV
-11 Fallo de segmentaci�n
-$ SIGSYS
-12 Chamada ao sistema mala
-$ SIGPIPE
-13 Canal (pipe) roto
-$ SIGALRM
-14 Alarma do reloxo
-$ SIGTERM
-15 Terminado
-$ SIGURG
-16 Condici�n urxente de E/S
-$ SIGSTOP
-17 Detido (sinal)
-$ SIGTSTP
-18 Detido
-$ SIGCONT
-19 Continuando
-$ SIGCHLD
-20 Proceso fillo terminado
-$ SIGTTIN
-21 Detido (entrada tty)
-$ SIGTTOU
-22 Detido (s�da tty)
-$ SIGIO
-23 E/S posible
-$ SIGXCPU
-24 Sobrepasouse o tempo l�mite da CPU
-$ SIGXFSZ
-25 Sobrepasouse o l�mite de tama�o de ficheiro
-$ SIGVTALRM
-26 Temporizador virtual caducado
-$ SIGPROF
-27 Temporizador de perfilaci�n caducado
-$ SIGWINCH
-28 Cambios no tama�o de xanela
-$ SIGINFO
-29 Petici�n de informaci�n
-$ SIGUSR1
-30 Sinal definida polo usuario no. 1
-$ SIGUSR2
-31 Sinal definida polo usuario no. 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsoleto)
-1 Tipo de direcci�n non soportado
-$ EAI_AGAIN
-2 Erro temporal na resoluci�n de nomes
-$ EAI_BADFLAGS
-3 Valor inv�lido de ai_flags
-$ EAI_FAIL
-4 Erro non recuperable na resoluci�n de nomes
-$ EAI_FAMILY
-5 ai_family non soportado
-$ EAI_MEMORY
-6 Erro na asignaci�n de memoria
-$ 7 (obsoleto)
-7 Non hai direcci�n asociada co nome de m�quina
-$ EAI_NONAME
-8 Non se disp�n nome de m�quina, nin nome de servizo
-$ EAI_SERVICE
-9 Nome de servizo non soportado en ai_socktype
-$ EAI_SOCKTYPE
-10 ai_socktype non soportado
-$ EAI_SYSTEM
-11 Erro de sistema devolto en errno
-$ EAI_BADHINTS
-12 Valor inv�lido de hints
-$ EAI_PROTOCOL
-13 Protocolo resolto desco�ecido
-$ EAI_OVERFLOW
-14 B�fer de argumentos excedido
-$ 0
-32766 �xito
-$ NL_MSGMAX
-32767 Erro desco�ecido
diff --git a/lib/libc_bsd/nls/hu_HU.ISO8859-2.msg b/lib/libc_bsd/nls/hu_HU.ISO8859-2.msg
deleted file mode 100644
index 6d581e9..0000000
--- a/lib/libc_bsd/nls/hu_HU.ISO8859-2.msg
+++ /dev/null
@@ -1,295 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/hu_HU.ISO8859-2.msg 199417 2009-11-17 18:57:44Z gabor $
-$
-$ Message catalog for hu_HU.ISO8859-2 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Nem enged�lyezett m�velet
-$ ENOENT
-2 F�jl vagy k�nyvt�r nem tal�lhat�
-$ ESRCH
-3 Processz nem tal�lhat�
-$ EINTR
-4 Megszak�tott rendszerh�v�s
-$ EIO
-5 B/K hiba
-$ ENXIO
-6 Konfigur�latlan eszk�z
-$ E2BIG
-7 T�l hossz� argumentumlista
-$ ENOEXEC
-8 Hib�s v�grehajthat� form�tum
-$ EBADF
-9 Rossz f�jlle�r�
-$ ECHILD
-10 Nem l�tez� gyermek processz
-$ EDEADLK
-11 Resource deadlock avoided
-$ ENOMEM
-12 Mem�ria nem foglalhat� le
-$ EACCES
-13 Hozz�f�r�s megtagadva
-$ EFAULT
-14 Rossz c�m
-$ ENOTBLK
-15 Blokkos eszk�z sz�ks�ges
-$ EBUSY
-16 Eszk�z foglalt
-$ EEXIST
-17 F�jl l�tezik
-$ EXDEV
-18 Kereszthivatkoz�s eszk�z�k�n
-$ ENODEV
-19 A m�velet nem t�mogatott az eszk�z �ltal
-$ ENOTDIR
-20 Nem k�nyvt�r
-$ EISDIR
-21 K�nyvt�r
-$ EINVAL
-22 �rv�nytelen argumentum
-$ ENFILE
-23 T�l sok megnyitott f�jl a rendszerben
-$ EMFILE
-24 T�l sok megnyitott f�jl
-$ ENOTTY
-25 Nem megfelel� ioctl az eszk�zh�z
-$ ETXTBSY
-26 Sz�veges f�jl foglalt
-$ EFBIG
-27 F�jl t�l nagy
-$ ENOSPC
-28 Nincs hely az eszk�z�n
-$ ESPIPE
-29 �rv�nytelen seek
-$ EROFS
-30 Csak olvashat� f�jlrendszer
-$ EMLINK
-31 T�l sok link
-$ EPIPE
-32 Hib�s cs�vezet�k
-$ EDOM
-33 Numerikus argumentum nem esik a tartom�nyba
-$ ERANGE
-34 Az eserm�ny t�l nagy
-$ EAGAIN, EWOULDBLOCK
-35 Az er�forr�s ideiglenesen nem �rhet� el
-$ EINPROGRESS
-36 A m�velet folyamatban van
-$ EALREADY
-37 A m�velet m�r folyamatban van
-$ ENOTSOCK
-38 Socket m�velet nem socketen
-$ EDESTADDRREQ
-39 C�l c�m sz�ks�ges
-$ EMSGSIZE
-40 T�l hossz� �zenet
-$ EPROTOTYPE
-41 Rossz protokollt�pus a sockethez
-$ ENOPROTOOPT
-42 Protokoll nem �rhet� el
-$ EPROTONOSUPPORT
-43 Protokoll nem t�mogatott
-$ ESOCKTNOSUPPORT
-44 Sockett�pus nem t�mogatott
-$ EOPNOTSUPP
-45 M�velet nem t�mogatott
-$ EPFNOSUPPORT
-46 Protokollcsal�d nem t�mogatott
-$ EAFNOSUPPORT
-47 A c�mcsal�d nem t�mogatott a protokollcsal�d �ltal
-$ EADDRINUSE
-48 A c�m m�r haszn�latban van
-$ EADDRNOTAVAIL
-49 A k�rt c�m nem oszthat� ki
-$ ENETDOWN
-50 A h�l�zat nem m�k�dik
-$ ENETUNREACH
-51 A h�l�zat nem �rhet� el
-$ ENETRESET
-52 A h�l�zat megszak�totta a kapcsolatot
-$ ECONNABORTED
-53 A szoftver megszak�totta a kapcsolatot
-$ ECONNRESET
-54 A kapcsolatot megszak�totta a peer
-$ ENOBUFS
-55 Nincs rendelkez�sre �ll� pufferter�let
-$ EISCONN
-56 A socket m�r kapcsol�dva van
-$ ENOTCONN
-57 A socket nincs kapcsol�dva
-$ ESHUTDOWN
-58 Nem k�ldhet� el a socket lebont�sa ut�n
-$ ETOOMANYREFS
-59 T�l sok hivatkoz�s: nem illeszthet� �ssze
-$ ETIMEDOUT
-60 A m�velet t�ll�pte a rendelkez�sre �ll� id�t
-$ ECONNREFUSED
-61 Kapcsolat elutas�tva
-$ ELOOP
-62 T�l sok szint a szimbolikus linkekben
-$ ENAMETOOLONG
-63 T�l hossz� f�jln�v
-$ EHOSTDOWN
-64 A kiszolg�l� nem �rhet� el
-$ EHOSTUNREACH
-65 Nincs �tvonal a kiszolg�l�hoz
-$ ENOTEMPTY
-66 K�nyvt�r nem �res
-$ EPROCLIM
-67 T�l sok processz
-$ EUSERS
-68 T�l sok felhaszn�l�
-$ EDQUOT
-69 A lemezkv�ta t�ll�pve
-$ ESTALE
-70 Elavult NFS f�jlkezel�
-$ EREMOTE
-71 T�l sok szint a t�voli �tvonalban
-$ EBADRPC
-72 Rossz RPC strukt�ra
-$ ERPCMISMATCH
-73 Rossz RPC verzi�
-$ EPROGUNAVAIL
-74 RPC program nem �rhet� el
-$ EPROGMISMATCH
-75 Rossz programverzi�
-$ EPROCUNAVAIL
-76 Rossz elj�r�s a programhoz
-$ ENOLCK
-77 Nincs el�rhet� z�rol�s
-$ ENOSYS
-78 Nem implement�lt funkci�
-$ EFTYPE
-79 Nem megfelel� f�jlt�pus vagy form�tum
-$ EAUTH
-80 Azonos�t�si hiba
-$ ENEEDAUTH
-81 Azonos�t�s sz�ks�ges
-$ EIDRM
-82 Azonos�t� elt�vol�tva
-$ ENOMSG
-83 Nincs �zenet a k�v�nt t�pusb�l
-$ EOVERFLOW
-84 Az �rt�k t�l nagy az adott adatt�pusban val� t�rol�shoz
-$ ECANCELED
-85 M�velet t�r�lva
-$ EILSEQ
-86 �rv�nytelen b�jtsorrend
-$ ENOATTR
-87 Attrib�tum nem tal�lhat�
-$ EDOOFUS
-88 Programoz�si hiba
-$ EBADMSG
-89 Helytelen �zenet
-$ EMULTIHOP
-90 Multihop k�s�rlet
-$ ENOLINK
-91 A kapcsolat szigor�tva lett
-$ EPROTO
-92 Protokol hiba
-$ ENOTCAPABLE
-93 El�gtelen k�pess�gek
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Hangup
-$ SIGINT
-2 Megszak�t�s
-$ SIGQUIT
-3 Kil�p�s
-$ SIGILL
-4 �rv�nytelen m�velet
-$ SIGTRAP
-5 Trace/BPT csapda
-$ SIGABRT
-6 Abort csapda
-$ SIGEMT
-7 EMT csapda
-$ SIGFPE
-8 Lebeg�pontos kiv�tel
-$ SIGKILL
-9 Meg�lve
-$ SIGBUS
-10 Busz hiba
-$ SIGSEGV
-11 Szegment�ci�s hiba
-$ SIGSYS
-12 Rossz rendszerh�v�s
-$ SIGPIPE
-13 Hib�s cs�vezet�k
-$ SIGALRM
-14 Id�z�t�si riaszt�s
-$ SIGTERM
-15 Befejezve
-$ SIGURG
-16 S�rg�s B/K felt�tel
-$ SIGSTOP
-17 Elaltatva (szign�l)
-$ SIGTSTP
-18 Elaltatva
-$ SIGCONT
-19 Folytatva
-$ SIGCHLD
-20 Gyermek befejez�d�tt
-$ SIGTTIN
-21 Le�ll�tva (tty bevitel)
-$ SIGTTOU
-22 Le�ll�tva (tty kivitel)
-$ SIGIO
-23 B/K lehets�ges
-$ SIGXCPU
-24 Processzorid�-korl�toz�s t�ll�pve
-$ SIGXFSZ
-25 �jlm�ret-korl�toz�s t�ll�pve
-$ SIGVTALRM
-26 Virtu�lis id�z�t� lej�rt
-$ SIGPROF
-27 Profilid�z�t� lej�rt
-$ SIGWINCH
-28 Ablakm�ret-v�ltoz�sok
-$ SIGINFO
-29 Inform�ci�k�r�s
-$ SIGUSR1
-30 Felhaszn�l�i szign�l 1
-$ SIGUSR2
-31 Felhaszn�l�i szign�l 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (elavult)
-1 A hosztn�vhez tartoz� c�mcsal�d nem t�mogatott
-$ EAI_AGAIN
-2 Ideiglenes hiba a n�vfelold�skor
-$ EAI_BADFLAGS
-3 �rv�nytelen ai_flags �rt�k
-$ EAI_FAIL
-4 Nem helyre�ll�that� hiba a n�vfelold�sban
-$ EAI_FAMILY
-5 ai_family nem t�mogatott
-$ EAI_MEMORY
-6 Mem�riafoglal�si hiba
-$ 7 (elavult)
-7 Nem tartozik c�m � hosztn�vhez
-$ EAI_NONAME
-8 Se hosztn�v, se szolg�ltat�sn�v nem �ll rendelkez�sre
-$ EAI_SERVICE
-9 Nem t�mogatott ai_socktype szolg�ltat�sn�v
-$ EAI_SOCKTYPE
-10 ai_socktype nem t�mogatott
-$ EAI_SYSTEM
-11 Rendszerhiba j�tt vissza az errno v�ltoz�ban
-$ EAI_BADHINTS
-12 �rv�nytelen hint �rt�k
-$ EAI_PROTOCOL
-13 A feloldott protokol ismeretlen
-$ EAI_OVERFLOW
-14 Az argumentumok puffere t�lcsordult
-$ 0
-32766 Siker
-$ NL_MSGMAX
-32767 Ismeretlen hiba
diff --git a/lib/libc_bsd/nls/it_IT.ISO8859-15.msg b/lib/libc_bsd/nls/it_IT.ISO8859-15.msg
deleted file mode 100644
index e94eb1d..0000000
--- a/lib/libc_bsd/nls/it_IT.ISO8859-15.msg
+++ /dev/null
@@ -1,231 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/it_IT.ISO8859-15.msg 189765 2009-03-13 10:40:38Z gabor $
-$
-$ Message catalog for it_IT.ISO8859-15 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operazione non permessa
-$ ENOENT
-2 File o directory inesistente
-$ ESRCH
-3 Processo inesistente
-$ EINTR
-4 Chiamata di sistema interrotta
-$ EIO
-5 Errore di input/output
-$ ENXIO
-6 Periferica non configurata
-$ E2BIG
-7 Lista degli argomenti troppo lunga
-$ ENOEXEC
-8 Errore nel formato eseguibile
-$ EBADF
-9 Descrittore di file non valido
-$ ECHILD
-10 Nessun processo figlio
-$ EDEADLK
-11 Situazione di deadlock evitata
-$ ENOMEM
-12 Impossibile allocare memoria
-$ EACCES
-13 Permesso negato
-$ EFAULT
-14 Indirizzo non valido
-$ ENOTBLK
-15 Periferica a blocchi necessaria
-$ EBUSY
-16 Periferica occupata
-$ EEXIST
-17 Il file esiste
-$ EXDEV
-18 Link improprio
-$ ENODEV
-19 Operazione non supportata dalla periferica
-$ ENOTDIR
-20 Non è una directory
-$ EISDIR
-21 E' una directory
-$ EINVAL
-22 Argomento non valido
-$ ENFILE
-23 Troppi file aperti nel sistema
-$ EMFILE
-24 Troppi file aperti
-$ ENOTTY
-25 Ioctl inappropriata per la periferica
-$ ETXTBSY
-26 File di testo occupato
-$ EFBIG
-27 File troppo grande
-$ ENOSPC
-28 Spazio sulla periferica esaurito
-$ ESPIPE
-29 Ricerca non valida
-$ EROFS
-30 Filesystem di sola lettura
-$ EMLINK
-31 Troppi link
-$ EPIPE
-32 Pipe rotta
-$ EDOM
-33 Argomento numerico fuori dal dominio
-$ ERANGE
-34 Risultato troppo grande
-$ EAGAIN, EWOULDBLOCK
-35 Risorsa temporaneamente non disponibile
-$ EINPROGRESS
-36 Operazione in esecuzione
-$ EALREADY
-37 Operazione già in esecuzione
-$ ENOTSOCK
-38 Operazione sui socket eseguita su un non-socket
-$ EDESTADDRREQ
-39 Indirizzo destinazione necessario
-$ EMSGSIZE
-40 Messaggio troppo lungo
-$ EPROTOTYPE
-41 Tipo di protocollo non valido per il socket
-$ ENOPROTOOPT
-42 Protocollo non disponibile
-$ EPROTONOSUPPORT
-43 Protocollo non supportato
-$ ESOCKTNOSUPPORT
-44 Tipo di socket non supportato
-$ EOPNOTSUPP
-45 Operazione non supportata
-$ EPFNOSUPPORT
-46 Famiglia di protocolli non supportata
-$ EAFNOSUPPORT
-47 Famiglia di indirizzi non supportata dalla famiglia di protocolli
-$ EADDRINUSE
-48 Indirizzo già in uso
-$ EADDRNOTAVAIL
-49 Impossibile assegnare l'indirizzo richiesto
-$ ENETDOWN
-50 Network fuori uso
-$ ENETUNREACH
-51 Network non raggiungibile
-$ ENETRESET
-52 Network dropped connection on reset
-$ ECONNABORTED
-53 Interruzione della connessione causata dal software
-$ ECONNRESET
-54 Connessione azzerata dal corrispondente
-$ ENOBUFS
-55 Spazio del buffer esaurito
-$ EISCONN
-56 Socket già connesso
-$ ENOTCONN
-57 Socket non connesso
-$ ESHUTDOWN
-58 Impossibile inviare dopo la chiusura del socket
-$ ETOOMANYREFS
-59 Troppe referenze: impossibile raccordare
-$ ETIMEDOUT
-60 Connessione scaduta
-$ ECONNREFUSED
-61 Connection rifiutata
-$ ELOOP
-62 Troppi livelli di link simbolici
-$ ENAMETOOLONG
-63 Nome di file troppo lungo
-$ EHOSTDOWN
-64 Host fuori uso
-$ EHOSTUNREACH
-65 Host irraggiungibile
-$ ENOTEMPTY
-66 Directory non vuota
-$ EPROCLIM
-67 Troppi processi
-$ EUSERS
-68 Troppi utenti
-$ EDQUOT
-69 Quota disco superata
-$ ESTALE
-70 Manipolatore di file NFS scaduto
-$ EREMOTE
-71 Troppi livelli remoti nel path
-$ EBADRPC
-72 Struttura RPC non valida
-$ ERPCMISMATCH
-73 Versione RPC non corrispondente
-$ EPROGUNAVAIL
-74 Programma RPC non disponibile
-$ EPROGMISMATCH
-75 Versione del programma non corrispodente
-$ EPROCUNAVAIL
-76 Procedura non disponibile
-$ ENOLCK
-77 Nessun lock disponibile
-$ ENOSYS
-78 Funzione non implementata
-$ EFTYPE
-79 Tipo di file o formato inappropriato
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Hangup
-$ SIGINT
-2 Interruzione
-$ SIGQUIT
-3 Chiusura
-$ SIGILL
-4 Istruzione illegale
-$ SIGTRAP
-5 Trappola Trace/breakpoint
-$ SIGABRT
-6 Trappola abort()
-$ SIGEMT
-7 Trappola EMT
-$ SIGFPE
-8 Errore di virgola mobile
-$ SIGKILL
-9 Ucciso
-$ SIGBUS
-10 Errore di bus
-$ SIGSEGV
-11 Errore di segmentazione
-$ SIGSYS
-12 Chiamata di sistema non valida
-$ SIGPIPE
-13 Pipe rotta
-$ SIGALRM
-14 Sveglia
-$ SIGTERM
-15 Terminato
-$ SIGURG
-16 I/O urgente
-$ SIGSTOP
-17 Processo fermato
-$ SIGTSTP
-18 Stop da terminale
-$ SIGCONT
-19 Continuato
-$ SIGCHLD
-20 Processo figlio uscito
-$ SIGTTIN
-21 Input da terminale per processo in background
-$ SIGTTOU
-22 Output a terminale per processo in background
-$ SIGIO
-23 I/O possibile
-$ SIGXCPU
-24 Limite del tempo di CPU superato
-$ SIGXFSZ
-25 Limite della dimensione del file superato
-$ SIGVTALRM
-26 Timer virtuale scaduto
-$ SIGPROF
-27 Timer di profilo expired
-$ SIGWINCH
-28 Cambio di dimensione della finestra
-$ SIGINFO
-29 Richiesta di informazioni
-$ SIGUSR1
-30 Segnale definito dall'utente 1
-$ SIGUSR2
-31 Segnale definito dall'utente 2
diff --git a/lib/libc_bsd/nls/ja_JP.UTF-8.msg b/lib/libc_bsd/nls/ja_JP.UTF-8.msg
deleted file mode 100644
index 30076c6..0000000
--- a/lib/libc_bsd/nls/ja_JP.UTF-8.msg
+++ /dev/null
@@ -1,295 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/ja_JP.UTF-8.msg 199128 2009-11-10 03:56:51Z ume $
-$
-$ Message catalog for ja_JP.UTF-8 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 許可されていない操作です
-$ ENOENT
-2 そのようなファイルまたはディレクトリはありません
-$ ESRCH
-3 そのようなプロセスはありません
-$ EINTR
-4 システムコールが中断されました
-$ EIO
-5 入出力エラーです
-$ ENXIO
-6 デバイスが準備されていません
-$ E2BIG
-7 引数のリストが長すぎます
-$ ENOEXEC
-8 無効な実行形式です
-$ EBADF
-9 無効なファイル記述子です
-$ ECHILD
-10 子プロセスがありません
-$ EDEADLK
-11 リソースデッドロックを回避しました
-$ ENOMEM
-12 メモリの割り当てができません
-$ EACCES
-13 パーミッションが拒絶されました
-$ EFAULT
-14 無効なアドレスです
-$ ENOTBLK
-15 ブロックデバイスが要求されています
-$ EBUSY
-16 デバイスがビジー状態です
-$ EEXIST
-17 ファイルが存在します
-$ EXDEV
-18 デバイスをまたぐリンクです
-$ ENODEV
-19 デバイスが対応してない操作です
-$ ENOTDIR
-20 ディレクトリではありません
-$ EISDIR
-21 ディレクトリです
-$ EINVAL
-22 無効な引数です
-$ ENFILE
-23 システム内でオープンされているファイルが多すぎます
-$ EMFILE
-24 オープンしているファイルが多すぎます
-$ ENOTTY
-25 デバイスが対応していない ioctl です
-$ ETXTBSY
-26 テキストファイルがビジー状態です
-$ EFBIG
-27 ファイルが大きすぎます
-$ ENOSPC
-28 デバイスの空き領域不足です
-$ ESPIPE
-29 無効なシークです
-$ EROFS
-30 読み込み専用ファイルシステムです
-$ EMLINK
-31 リンク数が多すぎます
-$ EPIPE
-32 パイプが破壊されてました
-$ EDOM
-33 数値引数が範囲外です
-$ ERANGE
-34 結果が大き過ぎます
-$ EAGAIN, EWOULDBLOCK
-35 リソースが一時的に利用できません
-$ EINPROGRESS
-36 操作が現在進行中です
-$ EALREADY
-37 操作は既に進行中です
-$ ENOTSOCK
-38 ソケットでないものについてソケット操作を行いました
-$ EDESTADDRREQ
-39 宛先アドレスが要求されています
-$ EMSGSIZE
-40 メッセージが長すぎます
-$ EPROTOTYPE
-41 ソケットが対応していないプロトコルタイプです
-$ ENOPROTOOPT
-42 利用できないプロトコルです
-$ EPROTONOSUPPORT
-43 対応していないプロトコルです
-$ ESOCKTNOSUPPORT
-44 対応していないソケットタイプです
-$ EOPNOTSUPP
-45 対応していない操作です
-$ EPFNOSUPPORT
-46 対応していないプロトコルファミリです
-$ EAFNOSUPPORT
-47 プロトコルファミリが対応していないアドレスファミリが指定されました
-$ EADDRINUSE
-48 アドレスが既に使用中です
-$ EADDRNOTAVAIL
-49 要求されたアドレスを割り当てできません
-$ ENETDOWN
-50 ネットワークがダウンしています
-$ ENETUNREACH
-51 ネットワークに到達できません
-$ ENETRESET
-52 リセットによりネットワークの接続が失われました
-$ ECONNABORTED
-53 ソフトウェアによって接続が切断されました
-$ ECONNRESET
-54 接続が通信相手によってリセットされました
-$ ENOBUFS
-55 バッファの容量不足です
-$ EISCONN
-56 ソケットは既に接続されています
-$ ENOTCONN
-57 ソケットは接続されていません
-$ ESHUTDOWN
-58 ソケットのシャットダウンの後で送信ができません
-$ ETOOMANYREFS
-59 処理限界を超える多重参照です
-$ ETIMEDOUT
-60 操作がタイムアウトしました
-$ ECONNREFUSED
-61 接続が拒絶されました
-$ ELOOP
-62 処理限界を超えるシンボリックリンクレベルです
-$ ENAMETOOLONG
-63 ファイル名が長すぎます
-$ EHOSTDOWN
-64 ホストがダウンしています
-$ EHOSTUNREACH
-65 ホストへの経路がありません
-$ ENOTEMPTY
-66 ディレクトリが空ではありません
-$ EPROCLIM
-67 プロセスが多すぎます
-$ EUSERS
-68 ユーザが多すぎます
-$ EDQUOT
-69 ディスククォータが超過しました
-$ ESTALE
-70 失効した NFS ファイルハンドルです
-$ EREMOTE
-71 パス中のリモートのレベルが多すぎます
-$ EBADRPC
-72 無効な RPC 構造体です
-$ ERPCMISMATCH
-73 RPC バージョンが間違っています
-$ EPROGUNAVAIL
-74 RPC プログラムが利用できません
-$ EPROGMISMATCH
-75 プログラムのバージョンが合っていません
-$ EPROCUNAVAIL
-76 プログラムでは利用できない procedure です
-$ ENOLCK
-77 ロックが利用できません
-$ ENOSYS
-78 関数が実装されていません
-$ EFTYPE
-79 ファイルの型または形式が不適切です
-$ EAUTH
-80 認証エラーです
-$ ENEEDAUTH
-81 認証物が必要です
-$ EIDRM
-82 識別子は削除されました
-$ ENOMSG
-83 要求された型のメッセージがありません
-$ EOVERFLOW
-84 データ型に格納するには大きすぎる値です
-$ ECANCELED
-85 処理がキャンセルされました
-$ EILSEQ
-86 不正なバイト列です
-$ ENOATTR
-87 そのような属性はありません
-$ EDOOFUS
-88 プログラミングエラーです
-$ EBADMSG
-89 無効なメッセージです
-$ EMULTIHOP
-90 マルチホップが試みられました
-$ ENOLINK
-91 リンクが切断されています
-$ EPROTO
-92 プロトコルエラーです
-$ ENOTCAPABLE
-93 ケーパビリティが不足です
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 ハングアップ
-$ SIGINT
-2 割り込み
-$ SIGQUIT
-3 中断
-$ SIGILL
-4 不正命令
-$ SIGTRAP
-5 トレース/BPT トラップ
-$ SIGABRT
-6 アボートトラップ
-$ SIGEMT
-7 EMT トラップ
-$ SIGFPE
-8 浮動小数点例外
-$ SIGKILL
-9 Kill された
-$ SIGBUS
-10 バスエラー
-$ SIGSEGV
-11 セグメンテーション違反
-$ SIGSYS
-12 存在しないシステムコール
-$ SIGPIPE
-13 パイプ破壊
-$ SIGALRM
-14 アラームクロック
-$ SIGTERM
-15 終了
-$ SIGURG
-16 緊急入出力状況
-$ SIGSTOP
-17 一時停止 (シグナル)
-$ SIGTSTP
-18 一時停止
-$ SIGCONT
-19 継続
-$ SIGCHLD
-20 子プロセスの終了
-$ SIGTTIN
-21 一時停止 (tty 入力)
-$ SIGTTOU
-22 一時停止 (tty 出力)
-$ SIGIO
-23 入出力可能
-$ SIGXCPU
-24 CPU 時間の制限超過
-$ SIGXFSZ
-25 ファイルサイズの制限超過
-$ SIGVTALRM
-26 仮想タイマの期限超過
-$ SIGPROF
-27 プロファイルタイマの期限超過
-$ SIGWINCH
-28 ウィンドウサイズの変化
-$ SIGINFO
-29 情報要求
-$ SIGUSR1
-30 ユーザ定義シグナル 1
-$ SIGUSR2
-31 ユーザ定義シグナル 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsolete)
-1 ホスト名のアドレスファミリーはサポートされません
-$ EAI_AGAIN
-2 名前解決での一時的な失敗
-$ EAI_BADFLAGS
-3 ai_flags の値が無効
-$ EAI_FAIL
-4 名前解決での回復不能な失敗
-$ EAI_FAMILY
-5 ai_family はサポートされません
-$ EAI_MEMORY
-6 メモリ割り当て失敗
-$ 7 (obsolete)
-7 ホスト名に対応するアドレスはありません
-$ EAI_NONAME
-8 ホスト名かサービス名が指定されない、または不明
-$ EAI_SERVICE
-9 サービス名は ai_socktype に対してサポートされません
-$ EAI_SOCKTYPE
-10 ai_socktype はサポートされません
-$ EAI_SYSTEM
-11 システムエラー、errno 参照
-$ EAI_BADHINTS
-12 hints の値が無効
-$ EAI_PROTOCOL
-13 解決されたプロトコルは不明です
-$ EAI_OVERFLOW
-14 引数バッファオーバフロー
-$ 0
-32766 成功
-$ NL_MSGMAX
-32767 不明なエラー
diff --git a/lib/libc_bsd/nls/ja_JP.eucJP.msg b/lib/libc_bsd/nls/ja_JP.eucJP.msg
deleted file mode 100644
index 3894e89..0000000
--- a/lib/libc_bsd/nls/ja_JP.eucJP.msg
+++ /dev/null
@@ -1,295 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/ja_JP.eucJP.msg 199128 2009-11-10 03:56:51Z ume $
-$
-$ Message catalog for ja_JP.eucJP locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 ���Ĥ���Ƥ��ʤ����Ǥ�
-$ ENOENT
-2 ���Τ褦�ʥե�����ޤ��ϥǥ��쥯�ȥ�Ϥ���ޤ���
-$ ESRCH
-3 ���Τ褦�ʥץ����Ϥ���ޤ���
-$ EINTR
-4 �����ƥॳ���뤬���Ǥ���ޤ���
-$ EIO
-5 �����ϥ��顼�Ǥ�
-$ ENXIO
-6 �ǥХ�������������Ƥ��ޤ���
-$ E2BIG
-7 �����Υꥹ�Ȥ�Ĺ�����ޤ�
-$ ENOEXEC
-8 ̵���ʼ¹Է����Ǥ�
-$ EBADF
-9 ̵���ʥե����뵭�һҤǤ�
-$ ECHILD
-10 �ҥץ���������ޤ���
-$ EDEADLK
-11 �꥽�����ǥåɥ�å�����򤷤ޤ���
-$ ENOMEM
-12 ����γ�����Ƥ��Ǥ��ޤ���
-$ EACCES
-13 �ѡ��ߥå���󤬵��䤵��ޤ���
-$ EFAULT
-14 ̵���ʥ��ɥ쥹�Ǥ�
-$ ENOTBLK
-15 �֥�å��ǥХ������׵ᤵ��Ƥ��ޤ�
-$ EBUSY
-16 �ǥХ������ӥ������֤Ǥ�
-$ EEXIST
-17 �ե����뤬¸�ߤ��ޤ�
-$ EXDEV
-18 �ǥХ�����ޤ�����󥯤Ǥ�
-$ ENODEV
-19 �ǥХ������б����Ƥʤ����Ǥ�
-$ ENOTDIR
-20 �ǥ��쥯�ȥ�ǤϤ���ޤ���
-$ EISDIR
-21 �ǥ��쥯�ȥ�Ǥ�
-$ EINVAL
-22 ̵���ʰ����Ǥ�
-$ ENFILE
-23 �����ƥ���ǥ����ץ󤵤�Ƥ���ե����뤬¿�����ޤ�
-$ EMFILE
-24 �����ץ󤷤Ƥ���ե����뤬¿�����ޤ�
-$ ENOTTY
-25 �ǥХ������б����Ƥ��ʤ� ioctl �Ǥ�
-$ ETXTBSY
-26 �ƥ����ȥե����뤬�ӥ������֤Ǥ�
-$ EFBIG
-27 �ե����뤬�礭�����ޤ�
-$ ENOSPC
-28 �ǥХ����ζ����ΰ���­�Ǥ�
-$ ESPIPE
-29 ̵���ʥ������Ǥ�
-$ EROFS
-30 �ɤ߹������ѥե����륷���ƥ�Ǥ�
-$ EMLINK
-31 ��󥯿���¿�����ޤ�
-$ EPIPE
-32 �ѥ��פ��˲�����Ƥޤ���
-$ EDOM
-33 ���Ͱ������ϰϳ��Ǥ�
-$ ERANGE
-34 ��̤��礭�᤮�ޤ�
-$ EAGAIN, EWOULDBLOCK
-35 �꥽���������Ū�����ѤǤ��ޤ���
-$ EINPROGRESS
-36 �����߿ʹ���Ǥ�
-$ EALREADY
-37 ���ϴ��˿ʹ���Ǥ�
-$ ENOTSOCK
-38 �����åȤǤʤ���ΤˤĤ��ƥ����å�����Ԥ��ޤ���
-$ EDESTADDRREQ
-39 ���襢�ɥ쥹���׵ᤵ��Ƥ��ޤ�
-$ EMSGSIZE
-40 ��å�������Ĺ�����ޤ�
-$ EPROTOTYPE
-41 �����åȤ��б����Ƥ��ʤ��ץ�ȥ��륿���פǤ�
-$ ENOPROTOOPT
-42 ���ѤǤ��ʤ��ץ�ȥ���Ǥ�
-$ EPROTONOSUPPORT
-43 �б����Ƥ��ʤ��ץ�ȥ���Ǥ�
-$ ESOCKTNOSUPPORT
-44 �б����Ƥ��ʤ������åȥ����פǤ�
-$ EOPNOTSUPP
-45 �б����Ƥ��ʤ����Ǥ�
-$ EPFNOSUPPORT
-46 �б����Ƥ��ʤ��ץ�ȥ���ե��ߥ�Ǥ�
-$ EAFNOSUPPORT
-47 �ץ�ȥ���ե��ߥ꤬�б����Ƥ��ʤ����ɥ쥹�ե��ߥ꤬���ꤵ��ޤ���
-$ EADDRINUSE
-48 ���ɥ쥹�����˻�����Ǥ�
-$ EADDRNOTAVAIL
-49 �׵ᤵ�줿���ɥ쥹�������ƤǤ��ޤ���
-$ ENETDOWN
-50 �ͥåȥ���������󤷤Ƥ��ޤ�
-$ ENETUNREACH
-51 �ͥåȥ������ã�Ǥ��ޤ���
-$ ENETRESET
-52 �ꥻ�åȤˤ��ͥåȥ������³�������ޤ���
-$ ECONNABORTED
-53 ���եȥ������ˤ�ä���³�����Ǥ���ޤ���
-$ ECONNRESET
-54 ��³���̿����ˤ�äƥꥻ�åȤ���ޤ���
-$ ENOBUFS
-55 �Хåե���������­�Ǥ�
-$ EISCONN
-56 �����åȤϴ�����³����Ƥ��ޤ�
-$ ENOTCONN
-57 �����åȤ���³����Ƥ��ޤ���
-$ ESHUTDOWN
-58 �����åȤΥ���åȥ�����θ���������Ǥ��ޤ���
-$ ETOOMANYREFS
-59 �����³���Ķ����¿�Ż��ȤǤ�
-$ ETIMEDOUT
-60 �������ॢ���Ȥ��ޤ���
-$ ECONNREFUSED
-61 ��³�����䤵��ޤ���
-$ ELOOP
-62 �����³���Ķ���륷��ܥ�å���󥯥�٥�Ǥ�
-$ ENAMETOOLONG
-63 �ե�����̾��Ĺ�����ޤ�
-$ EHOSTDOWN
-64 �ۥ��Ȥ������󤷤Ƥ��ޤ�
-$ EHOSTUNREACH
-65 �ۥ��Ȥؤη�ϩ������ޤ���
-$ ENOTEMPTY
-66 �ǥ��쥯�ȥ꤬���ǤϤ���ޤ���
-$ EPROCLIM
-67 �ץ�����¿�����ޤ�
-$ EUSERS
-68 �桼����¿�����ޤ�
-$ EDQUOT
-69 �ǥ���������������Ķ�ᤷ�ޤ���
-$ ESTALE
-70 �������� NFS �ե�����ϥ�ɥ�Ǥ�
-$ EREMOTE
-71 �ѥ���Υ�⡼�ȤΥ�٥뤬¿�����ޤ�
-$ EBADRPC
-72 ̵���� RPC ��¤�ΤǤ�
-$ ERPCMISMATCH
-73 RPC �С�����󤬴ְ�äƤ��ޤ�
-$ EPROGUNAVAIL
-74 RPC �ץ���ब���ѤǤ��ޤ���
-$ EPROGMISMATCH
-75 �ץ����ΥС�����󤬹�äƤ��ޤ���
-$ EPROCUNAVAIL
-76 �ץ����Ǥ����ѤǤ��ʤ� procedure �Ǥ�
-$ ENOLCK
-77 ��å������ѤǤ��ޤ���
-$ ENOSYS
-78 �ؿ�����������Ƥ��ޤ���
-$ EFTYPE
-79 �ե�����η��ޤ��Ϸ�������Ŭ�ڤǤ�
-$ EAUTH
-80 ǧ�ڥ��顼�Ǥ�
-$ ENEEDAUTH
-81 ǧ��ʪ��ɬ�פǤ�
-$ EIDRM
-82 ���̻ҤϺ������ޤ���
-$ ENOMSG
-83 �׵ᤵ�줿���Υ�å�����������ޤ���
-$ EOVERFLOW
-84 �ǡ������˳�Ǽ����ˤ��礭�������ͤǤ�
-$ ECANCELED
-85 ����������󥻥뤵��ޤ���
-$ EILSEQ
-86 �����ʥХ�����Ǥ�
-$ ENOATTR
-87 ���Τ褦��°���Ϥ���ޤ���
-$ EDOOFUS
-88 �ץ���ߥ󥰥��顼�Ǥ�
-$ EBADMSG
-89 ̵���ʥ�å������Ǥ�
-$ EMULTIHOP
-90 �ޥ���ۥåפ���ߤ��ޤ���
-$ ENOLINK
-91 ��󥯤����Ǥ���Ƥ��ޤ�
-$ EPROTO
-92 �ץ�ȥ��륨�顼�Ǥ�
-$ ENOTCAPABLE
-93 �����ѥӥ�ƥ�����­�Ǥ�
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 �ϥ󥰥��å�
-$ SIGINT
-2 ������
-$ SIGQUIT
-3 ����
-$ SIGILL
-4 ����̿��
-$ SIGTRAP
-5 �ȥ졼��/BPT �ȥ�å�
-$ SIGABRT
-6 ���ܡ��ȥȥ�å�
-$ SIGEMT
-7 EMT �ȥ�å�
-$ SIGFPE
-8 ��ư�������㳰
-$ SIGKILL
-9 Kill ���줿
-$ SIGBUS
-10 �Х����顼
-$ SIGSEGV
-11 �������ơ�������ȿ
-$ SIGSYS
-12 ¸�ߤ��ʤ������ƥॳ����
-$ SIGPIPE
-13 �ѥ����˲�
-$ SIGALRM
-14 ���顼�९��å�
-$ SIGTERM
-15 ��λ
-$ SIGURG
-16 �۵������Ͼ���
-$ SIGSTOP
-17 ������ (�����ʥ�)
-$ SIGTSTP
-18 ������
-$ SIGCONT
-19 ��³
-$ SIGCHLD
-20 �ҥץ����ν�λ
-$ SIGTTIN
-21 ������ (tty ����)
-$ SIGTTOU
-22 ������ (tty ����)
-$ SIGIO
-23 �����ϲ�ǽ
-$ SIGXCPU
-24 CPU ���֤�����Ķ��
-$ SIGXFSZ
-25 �ե����륵����������Ķ��
-$ SIGVTALRM
-26 ���ۥ����ޤδ���Ķ��
-$ SIGPROF
-27 �ץ�ե����륿���ޤδ���Ķ��
-$ SIGWINCH
-28 ������ɥ����������Ѳ�
-$ SIGINFO
-29 �����׵�
-$ SIGUSR1
-30 �桼����������ʥ� 1
-$ SIGUSR2
-31 �桼����������ʥ� 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsolete)
-1 �ۥ���̾�Υ��ɥ쥹�ե��ߥ꡼�ϥ��ݡ��Ȥ���ޤ���
-$ EAI_AGAIN
-2 ̾�����Ǥΰ��Ū�ʼ���
-$ EAI_BADFLAGS
-3 ai_flags ���ͤ�̵��
-$ EAI_FAIL
-4 ̾�����Ǥβ�����ǽ�ʼ���
-$ EAI_FAMILY
-5 ai_family �ϥ��ݡ��Ȥ���ޤ���
-$ EAI_MEMORY
-6 ���������Ƽ���
-$ 7 (obsolete)
-7 �ۥ���̾���б����륢�ɥ쥹�Ϥ���ޤ���
-$ EAI_NONAME
-8 �ۥ���̾�������ӥ�̾�����ꤵ��ʤ����ޤ�������
-$ EAI_SERVICE
-9 �����ӥ�̾�� ai_socktype ���Ф��ƥ��ݡ��Ȥ���ޤ���
-$ EAI_SOCKTYPE
-10 ai_socktype �ϥ��ݡ��Ȥ���ޤ���
-$ EAI_SYSTEM
-11 �����ƥ२�顼��errno ����
-$ EAI_BADHINTS
-12 hints ���ͤ�̵��
-$ EAI_PROTOCOL
-13 ��褵�줿�ץ�ȥ���������Ǥ�
-$ EAI_OVERFLOW
-14 �����Хåե������Хե�
-$ 0
-32766 ����
-$ NL_MSGMAX
-32767 �����ʥ��顼
diff --git a/lib/libc_bsd/nls/ko_KR.UTF-8.msg b/lib/libc_bsd/nls/ko_KR.UTF-8.msg
deleted file mode 100644
index bb4d0da..0000000
--- a/lib/libc_bsd/nls/ko_KR.UTF-8.msg
+++ /dev/null
@@ -1,295 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/ko_KR.UTF-8.msg 199329 2009-11-16 19:10:09Z jkim $
-$
-$ Message catalog for ko_KR.UTF-8 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 명령이 허용되지 않습니다
-$ ENOENT
-2 파일 또는 디렉터리가 없습니다
-$ ESRCH
-3 존재하지 않는 프로세스입니다
-$ EINTR
-4 시스템 호출이 중단되었습니다
-$ EIO
-5 입출력 에러입니다
-$ ENXIO
-6 장치가 설정되지 않았습니다
-$ E2BIG
-7 인자가 너무 깁니다
-$ ENOEXEC
-8 실행 파일 형식이 잘못되었습니다
-$ EBADF
-9 잘못된 파일 디스크립터입니다
-$ ECHILD
-10 자식 프로세스가 없습니다
-$ EDEADLK
-11 자원 데드락을 중단하였습니다
-$ ENOMEM
-12 메모리를 할당할 수 없습니다
-$ EACCES
-13 권한이 없습니다
-$ EFAULT
-14 잘못된 주소가 지정되었습니다
-$ ENOTBLK
-15 블럭 장치여야 합니다
-$ EBUSY
-16 장치가 사용 중입니다
-$ EEXIST
-17 파일이 이미 존재합니다
-$ EXDEV
-18 다른 장치 간의 연결입니다
-$ ENODEV
-19 그 장치가 지원하지 않는 명령입니다
-$ ENOTDIR
-20 디렉터리가 아닙니다
-$ EISDIR
-21 디렉터리입니다
-$ EINVAL
-22 인자가 잘못되었습니다
-$ ENFILE
-23 시스템에 파일이 너무 많이 열려있습니다
-$ EMFILE
-24 파일이 너무 많이 열려있습니다
-$ ENOTTY
-25 장치가 지원하지 않는 ioctl입니다
-$ ETXTBSY
-26 Text 파일이 사용 중입니다
-$ EFBIG
-27 파일이 너무 큽니다
-$ ENOSPC
-28 장치에 여유 공간이 남아있지 않습니다
-$ ESPIPE
-29 잘못된 탐색입니다
-$ EROFS
-30 읽기 전용 파일 시스템입니다
-$ EMLINK
-31 연결이 너무 많습니다
-$ EPIPE
-32 파이프가 끊어졌습니다
-$ EDOM
-33 수치 인자가 영역을 벗어났습니다
-$ ERANGE
-34 결과가 너무 큽니다
-$ EAGAIN, EWOULDBLOCK
-35 자원을 잠시 사용할 수 없습니다
-$ EINPROGRESS
-36 작업이 진행 중입니다
-$ EALREADY
-37 작업이 이미 진행 중입니다
-$ ENOTSOCK
-38 소켓이 아닌 객체에 대한 소켓 작업입니다
-$ EDESTADDRREQ
-39 목적지 주소가 필요합니다
-$ EMSGSIZE
-40 메시지가 너무 깁니다
-$ EPROTOTYPE
-41 소켓에 사용할 수 없는 프로토콜 유형입니다
-$ ENOPROTOOPT
-42 프로토콜을 사용할 수 없습니다
-$ EPROTONOSUPPORT
-43 지원하지 않는 프로토콜입니다
-$ ESOCKTNOSUPPORT
-44 지원하지 않는 종류의 소켓입니다
-$ EOPNOTSUPP
-45 지원되지 않는 명령입니다
-$ EPFNOSUPPORT
-46 지원되지 않는 프로토콜군입니다
-$ EAFNOSUPPORT
-47 프로토콜군에서 지원되지 않는 주소군입니다
-$ EADDRINUSE
-48 이미 사용 중인 주소입니다
-$ EADDRNOTAVAIL
-49 요청한 주소를 할당할 수 없습니다
-$ ENETDOWN
-50 네트워크가 단절되었습니다
-$ ENETUNREACH
-51 네트워크에 도달할 수 없습니다
-$ ENETRESET
-52 네트워크가 재설정되어 접속이 끊어졌습니다
-$ ECONNABORTED
-53 소프트웨어적인 이유로 연결이 끊어졌습니다
-$ ECONNRESET
-54 상대방이 연결을 끊었습니다
-$ ENOBUFS
-55 버퍼 공간이 모자랍니다
-$ EISCONN
-56 소켓이 이미 연결되있습니다
-$ ENOTCONN
-57 소켓이 연결되어 있지 않습니다
-$ ESHUTDOWN
-58 소켓이 이미 중단되어, 더 이상 전송할 수 없습니다
-$ ETOOMANYREFS
-59 참조수가 너무 많아 나눌 수 없습니다
-$ ETIMEDOUT
-60 시간이 너무 많이 지나 작업이 중단되었습니다
-$ ECONNREFUSED
-61 접속이 거부되었습니다
-$ ELOOP
-62 심볼릭 연결이 너무 많이 거쳐서 연결되었습니다
-$ ENAMETOOLONG
-63 파일 이름이 너무 깁니다
-$ EHOSTDOWN
-64 호스트가 죽었습니다
-$ EHOSTUNREACH
-65 호스트로 갈 경로가 없습니다
-$ ENOTEMPTY
-66 디렉터리가 비어있지 않습니다
-$ EPROCLIM
-67 프로세스가 너무 많습니다
-$ EUSERS
-68 사용자가 너무 많습니다
-$ EDQUOT
-69 디스크 할당량을 초과했습니다
-$ ESTALE
-70 끊어진 NFS 연결입니다
-$ EREMOTE
-71 너무 많은 경로로 원격에 접근하였습니다
-$ EBADRPC
-72 RPC 구조체가 잘못되었습니다
-$ ERPCMISMATCH
-73 RPC 버전이 맞지 않습니다
-$ EPROGUNAVAIL
-74 RPC 프로그램이 없습니다
-$ EPROGMISMATCH
-75 프로그램 버전이 맞지 않습니다
-$ EPROCUNAVAIL
-76 프로그램에 원격 프로시저가 없습니다
-$ ENOLCK
-77 잠금이 불가능합니다
-$ ENOSYS
-78 구현되지 않은 기능입니다
-$ EFTYPE
-79 잘못된 파일 종류이거나 형식이 잘못됐습니다
-$ EAUTH
-80 인증이 실패했습니다
-$ ENEEDAUTH
-81 인증 서버가 지정되지 않았습니다
-$ EIDRM
-82 식별자가 제거되었습니다
-$ ENOMSG
-83 요청된 형식의 메시지는 없습니다
-$ EOVERFLOW
-84 데이터 형식에 저장하기에 너무 큰 값입니다
-$ ECANCELED
-85 작업이 취소되었습니다
-$ EILSEQ
-86 바이트 배열이 잘못되었습니다
-$ ENOATTR
-87 속성을 찾을 수 없습니다
-$ EDOOFUS
-88 프로그램상 오류입니다
-$ EBADMSG
-89 잘못된 메시지입니다
-$ EMULTIHOP
-90 멀티홉이 시도되었습니다
-$ ENOLINK
-91 연결이 끊겼습니다
-$ EPROTO
-92 프로토콜이 잘못되었습니다
-$ ENOTCAPABLE
-93 접근 능력이 충분치 않습니다
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 끊김
-$ SIGINT
-2 중단
-$ SIGQUIT
-3 종료
-$ SIGILL
-4 잘못된 명령
-$ SIGTRAP
-5 Trace/BPT 트랩
-$ SIGABRT
-6 Abort 트랩
-$ SIGEMT
-7 EMT 트랩
-$ SIGFPE
-8 부동소수점 연산 예외
-$ SIGKILL
-9 강제종료
-$ SIGBUS
-10 버스 오류
-$ SIGSEGV
-11 세그먼테이션 오류
-$ SIGSYS
-12 잘못된 시스템 호출
-$ SIGPIPE
-13 파이프가 끊김
-$ SIGALRM
-14 시간 경보
-$ SIGTERM
-15 종료됨
-$ SIGURG
-16 긴급 I/O 조건
-$ SIGSTOP
-17 일시정지 (시그널)
-$ SIGTSTP
-18 일시정지
-$ SIGCONT
-19 계속
-$ SIGCHLD
-20 자식 프로세스 종료
-$ SIGTTIN
-21 정지 (터미널 입력)
-$ SIGTTOU
-22 정지 (터미널 출력)
-$ SIGIO
-23 I/O 가능
-$ SIGXCPU
-24 CPU 사용 시간 초과
-$ SIGXFSZ
-25 파일 용량 제한 초과
-$ SIGVTALRM
-26 가상 타이머 만료
-$ SIGPROF
-27 프로파일링 타이머 만료
-$ SIGWINCH
-28 창 크기 변경
-$ SIGINFO
-29 정보 요청
-$ SIGUSR1
-30 사용자 정의 시그널 1
-$ SIGUSR2
-31 사용자 정의 시그널 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsolete)
-1 호스트 이름이 지원하지 않는 주소군입니다
-$ EAI_AGAIN
-2 주소 변환에 일시적으로 실패했습니다
-$ EAI_BADFLAGS
-3 잘못된 ai_flags입니다
-$ EAI_FAIL
-4 주소 변환에 완전히 실패했습니다
-$ EAI_FAMILY
-5 지원되지 않는 ai_family입니다
-$ EAI_MEMORY
-6 메모리 할당에 실패했습니다
-$ 7 (obsolete)
-7 호스트 이름과 일치하는 주소가 없습니다
-$ EAI_NONAME
-8 호스트 이름 또는 서비스 이름이 지정되지 않았거나 알 수 없습니다
-$ EAI_SERVICE
-9 서비스 이름은 ai_socktype에서 지원되지 않습니다
-$ EAI_SOCKTYPE
-10 지원되지 않는 ai_socktype입니다
-$ EAI_SYSTEM
-11 시스템 오류가 errno에 반환되었습니다
-$ EAI_BADHINTS
-12 잘못된 hints입니다
-$ EAI_PROTOCOL
-13 알 수 없는 프로토콜이 변환되었습니다
-$ EAI_OVERFLOW
-14 인자 버퍼 공간이 모자랍니다
-$ 0
-32766 성공
-$ NL_MSGMAX
-32767 알 수 없는 오류
diff --git a/lib/libc_bsd/nls/ko_KR.eucKR.msg b/lib/libc_bsd/nls/ko_KR.eucKR.msg
deleted file mode 100644
index 723415e..0000000
--- a/lib/libc_bsd/nls/ko_KR.eucKR.msg
+++ /dev/null
@@ -1,295 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/ko_KR.eucKR.msg 199329 2009-11-16 19:10:09Z jkim $
-$
-$ Message catalog for ko_KR.eucKR locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 ����� ������ �ʽ��ϴ�
-$ ENOENT
-2 ���� �Ǵ� ���͸��� �����ϴ�
-$ ESRCH
-3 �������� �ʴ� ���μ����Դϴ�
-$ EINTR
-4 �ý��� ȣ���� �ߴܵǾ����ϴ�
-$ EIO
-5 ����� �����Դϴ�
-$ ENXIO
-6 ��ġ�� �������� �ʾҽ��ϴ�
-$ E2BIG
-7 ���ڰ� �ʹ� ��ϴ�
-$ ENOEXEC
-8 ���� ���� ������ �߸��Ǿ����ϴ�
-$ EBADF
-9 �߸��� ���� ��ũ�����Դϴ�
-$ ECHILD
-10 �ڽ� ���μ����� �����ϴ�
-$ EDEADLK
-11 �ڿ� ������� �ߴ��Ͽ����ϴ�
-$ ENOMEM
-12 �޸𸮸� �Ҵ��� �� �����ϴ�
-$ EACCES
-13 ������ �����ϴ�
-$ EFAULT
-14 �߸��� �ּҰ� �����Ǿ����ϴ�
-$ ENOTBLK
-15 �� ��ġ���� �մϴ�
-$ EBUSY
-16 ��ġ�� ��� ���Դϴ�
-$ EEXIST
-17 ������ �̹� �����մϴ�
-$ EXDEV
-18 �ٸ� ��ġ ���� �����Դϴ�
-$ ENODEV
-19 �� ��ġ�� �������� �ʴ� ����Դϴ�
-$ ENOTDIR
-20 ���͸��� �ƴմϴ�
-$ EISDIR
-21 ���͸��Դϴ�
-$ EINVAL
-22 ���ڰ� �߸��Ǿ����ϴ�
-$ ENFILE
-23 �ý��ۿ� ������ �ʹ� ���� �����ֽ��ϴ�
-$ EMFILE
-24 ������ �ʹ� ���� �����ֽ��ϴ�
-$ ENOTTY
-25 ��ġ�� �������� �ʴ� ioctl�Դϴ�
-$ ETXTBSY
-26 Text ������ ��� ���Դϴ�
-$ EFBIG
-27 ������ �ʹ� Ů�ϴ�
-$ ENOSPC
-28 ��ġ�� ���� ������ �������� �ʽ��ϴ�
-$ ESPIPE
-29 �߸��� Ž���Դϴ�
-$ EROFS
-30 �б� ���� ���� �ý����Դϴ�
-$ EMLINK
-31 ������ �ʹ� �����ϴ�
-$ EPIPE
-32 �������� ���������ϴ�
-$ EDOM
-33 ��ġ ���ڰ� ������ ������ϴ�
-$ ERANGE
-34 ����� �ʹ� Ů�ϴ�
-$ EAGAIN, EWOULDBLOCK
-35 �ڿ��� ��� ����� �� �����ϴ�
-$ EINPROGRESS
-36 �۾��� ���� ���Դϴ�
-$ EALREADY
-37 �۾��� �̹� ���� ���Դϴ�
-$ ENOTSOCK
-38 ������ �ƴ� ��ü�� ���� ���� �۾��Դϴ�
-$ EDESTADDRREQ
-39 ������ �ּҰ� �ʿ��մϴ�
-$ EMSGSIZE
-40 �޽����� �ʹ� ��ϴ�
-$ EPROTOTYPE
-41 ���Ͽ� ����� �� ���� �������� �����Դϴ�
-$ ENOPROTOOPT
-42 ���������� ����� �� �����ϴ�
-$ EPROTONOSUPPORT
-43 �������� �ʴ� ���������Դϴ�
-$ ESOCKTNOSUPPORT
-44 �������� �ʴ� ������ �����Դϴ�
-$ EOPNOTSUPP
-45 �������� �ʴ� ����Դϴ�
-$ EPFNOSUPPORT
-46 �������� �ʴ� �������ݱ��Դϴ�
-$ EAFNOSUPPORT
-47 �������ݱ����� �������� �ʴ� �ּұ��Դϴ�
-$ EADDRINUSE
-48 �̹� ��� ���� �ּ��Դϴ�
-$ EADDRNOTAVAIL
-49 ��û�� �ּҸ� �Ҵ��� �� �����ϴ�
-$ ENETDOWN
-50 ��Ʈ��ũ�� �����Ǿ����ϴ�
-$ ENETUNREACH
-51 ��Ʈ��ũ�� ������ �� �����ϴ�
-$ ENETRESET
-52 ��Ʈ��ũ�� �缳���Ǿ� ������ ���������ϴ�
-$ ECONNABORTED
-53 ����Ʈ�������� ������ ������ ���������ϴ�
-$ ECONNRESET
-54 ������ ������ �������ϴ�
-$ ENOBUFS
-55 ���� ������ ���ڶ��ϴ�
-$ EISCONN
-56 ������ �̹� ������ֽ��ϴ�
-$ ENOTCONN
-57 ������ ����Ǿ� ���� �ʽ��ϴ�
-$ ESHUTDOWN
-58 ������ �̹� �ߴܵǾ�, �� �̻� ������ �� �����ϴ�
-$ ETOOMANYREFS
-59 �������� �ʹ� ���� ���� �� �����ϴ�
-$ ETIMEDOUT
-60 �ð��� �ʹ� ���� ���� �۾��� �ߴܵǾ����ϴ�
-$ ECONNREFUSED
-61 ������ �źεǾ����ϴ�
-$ ELOOP
-62 �ɺ��� ������ �ʹ� ���� ���ļ� ����Ǿ����ϴ�
-$ ENAMETOOLONG
-63 ���� �̸��� �ʹ� ��ϴ�
-$ EHOSTDOWN
-64 ȣ��Ʈ�� �׾����ϴ�
-$ EHOSTUNREACH
-65 ȣ��Ʈ�� �� ��ΰ� �����ϴ�
-$ ENOTEMPTY
-66 ���͸��� ������� �ʽ��ϴ�
-$ EPROCLIM
-67 ���μ����� �ʹ� �����ϴ�
-$ EUSERS
-68 ����ڰ� �ʹ� �����ϴ�
-$ EDQUOT
-69 ��ũ �Ҵ緮�� �ʰ��߽��ϴ�
-$ ESTALE
-70 ������ NFS �����Դϴ�
-$ EREMOTE
-71 �ʹ� ���� ��η� ���ݿ� �����Ͽ����ϴ�
-$ EBADRPC
-72 RPC ����ü�� �߸��Ǿ����ϴ�
-$ ERPCMISMATCH
-73 RPC ������ ���� �ʽ��ϴ�
-$ EPROGUNAVAIL
-74 RPC ���α׷��� �����ϴ�
-$ EPROGMISMATCH
-75 ���α׷� ������ ���� �ʽ��ϴ�
-$ EPROCUNAVAIL
-76 ���α׷��� ���� ���ν����� �����ϴ�
-$ ENOLCK
-77 ����� �Ұ����մϴ�
-$ ENOSYS
-78 �������� ���� ����Դϴ�
-$ EFTYPE
-79 �߸��� ���� �����̰ų� ������ �߸��ƽ��ϴ�
-$ EAUTH
-80 ������ �����߽��ϴ�
-$ ENEEDAUTH
-81 ���� ������ �������� �ʾҽ��ϴ�
-$ EIDRM
-82 �ĺ��ڰ� ���ŵǾ����ϴ�
-$ ENOMSG
-83 ��û�� ������ �޽����� �����ϴ�
-$ EOVERFLOW
-84 ������ ���Ŀ� �����ϱ⿡ �ʹ� ū ���Դϴ�
-$ ECANCELED
-85 �۾��� ��ҵǾ����ϴ�
-$ EILSEQ
-86 ����Ʈ �迭�� �߸��Ǿ����ϴ�
-$ ENOATTR
-87 �Ӽ��� ã�� �� �����ϴ�
-$ EDOOFUS
-88 ���α׷��� �����Դϴ�
-$ EBADMSG
-89 �߸��� �޽����Դϴ�
-$ EMULTIHOP
-90 ��Ƽȩ�� �õ��Ǿ����ϴ�
-$ ENOLINK
-91 ������ ������ϴ�
-$ EPROTO
-92 ���������� �߸��Ǿ����ϴ�
-$ ENOTCAPABLE
-93 ���� �ɷ��� ���ġ �ʽ��ϴ�
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 ����
-$ SIGINT
-2 �ߴ�
-$ SIGQUIT
-3 ����
-$ SIGILL
-4 �߸��� ���
-$ SIGTRAP
-5 Trace/BPT Ʈ��
-$ SIGABRT
-6 Abort Ʈ��
-$ SIGEMT
-7 EMT Ʈ��
-$ SIGFPE
-8 �ε��Ҽ��� ���� ����
-$ SIGKILL
-9 ��������
-$ SIGBUS
-10 ���� ����
-$ SIGSEGV
-11 ���׸����̼� ����
-$ SIGSYS
-12 �߸��� �ý��� ȣ��
-$ SIGPIPE
-13 �������� ����
-$ SIGALRM
-14 �ð� �溸
-$ SIGTERM
-15 �����
-$ SIGURG
-16 ��� I/O ����
-$ SIGSTOP
-17 �Ͻ����� (�ñ׳�)
-$ SIGTSTP
-18 �Ͻ�����
-$ SIGCONT
-19 ���
-$ SIGCHLD
-20 �ڽ� ���μ��� ����
-$ SIGTTIN
-21 ���� (�͹̳� �Է�)
-$ SIGTTOU
-22 ���� (�͹̳� ���)
-$ SIGIO
-23 I/O ����
-$ SIGXCPU
-24 CPU ��� �ð� �ʰ�
-$ SIGXFSZ
-25 ���� �뷮 ���� �ʰ�
-$ SIGVTALRM
-26 ���� Ÿ�̸� ����
-$ SIGPROF
-27 �������ϸ� Ÿ�̸� ����
-$ SIGWINCH
-28 â ũ�� ����
-$ SIGINFO
-29 ���� ��û
-$ SIGUSR1
-30 ����� ���� �ñ׳� 1
-$ SIGUSR2
-31 ����� ���� �ñ׳� 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsolete)
-1 ȣ��Ʈ �̸��� �������� �ʴ� �ּұ��Դϴ�
-$ EAI_AGAIN
-2 �ּ� ��ȯ�� �Ͻ������� �����߽��ϴ�
-$ EAI_BADFLAGS
-3 �߸��� ai_flags�Դϴ�
-$ EAI_FAIL
-4 �ּ� ��ȯ�� ������ �����߽��ϴ�
-$ EAI_FAMILY
-5 �������� �ʴ� ai_family�Դϴ�
-$ EAI_MEMORY
-6 �޸� �Ҵ翡 �����߽��ϴ�
-$ 7 (obsolete)
-7 ȣ��Ʈ �̸��� ��ġ�ϴ� �ּҰ� �����ϴ�
-$ EAI_NONAME
-8 ȣ��Ʈ �̸� �Ǵ� ���� �̸��� �������� �ʾҰų� �� �� �����ϴ�
-$ EAI_SERVICE
-9 ���� �̸��� ai_socktype���� �������� �ʽ��ϴ�
-$ EAI_SOCKTYPE
-10 �������� �ʴ� ai_socktype�Դϴ�
-$ EAI_SYSTEM
-11 �ý��� ������ errno�� ��ȯ�Ǿ����ϴ�
-$ EAI_BADHINTS
-12 �߸��� hints�Դϴ�
-$ EAI_PROTOCOL
-13 �� �� ���� ���������� ��ȯ�Ǿ����ϴ�
-$ EAI_OVERFLOW
-14 ���� ���� ������ ���ڶ��ϴ�
-$ 0
-32766 ����
-$ NL_MSGMAX
-32767 �� �� ���� ����
diff --git a/lib/libc_bsd/nls/mn_MN.UTF-8.msg b/lib/libc_bsd/nls/mn_MN.UTF-8.msg
deleted file mode 100644
index eb50c04..0000000
--- a/lib/libc_bsd/nls/mn_MN.UTF-8.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/mn_MN.UTF-8.msg 192653 2009-05-23 17:13:35Z des $
-$
-$ Message catalog for mn_MN.UTF-8 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Үйлдэл зөвшөөрөгдөхгүй
-$ ENOENT
-2 Тийм файл эсвэл сан алга
-$ ESRCH
-3 Тийм процесс байхгүй
-$ EINTR
-4 Системийн тасалдсан дуудлага
-$ EIO
-5 Оролт/гаралтын алдаа
-$ ENXIO
-6 Төхөөрөмж тохируулагдаагүй
-$ E2BIG
-7 Дагавар өгөгдлийн жагсаалт хэтэрхий урт
-$ ENOEXEC
-8 Exec хэлбэршилтийн алдаа
-$ EBADF
-9 Файлын буруу тодорхойлогч
-$ ECHILD
-10 Хүүхэд процесс алга
-$ EDEADLK
-11 Эх үүсвэрийн гацаанаас зайлсхийсэн
-$ ENOMEM
-12 Санах ойд зай байрлуулж чадахгүй байна
-$ EACCES
-13 Зөвшөөрөхөөс татгалзсан
-$ EFAULT
-14 Буруу хаяг 
-$ ENOTBLK
-15 Блок төхөөрөмж шаардагдсан
-$ EBUSY
-16 Төхөөрөмж завгүй
-$ EEXIST
-17 Файл байна
-$ EXDEV
-18 Төхөөрөмж хоорондын холбоос
-$ ENODEV
-19 Үйлдлийг төхөөрөмж дэмжээгүй
-$ ENOTDIR
-20 Сан биш
-$ EISDIR
-21 Сан мөн
-$ EINVAL
-22 Дагавар өгөгдөл буруу
-$ ENFILE
-23 Системд хэтэрхий олон нээлттэй файл байна
-$ EMFILE
-24 Хэтэрхий олон нээлттэй файл байна
-$ ENOTTY
-25 Төхөөрөмжтэй тохирохгүй ioctl үйлдэл
-$ ETXTBSY
-26 Текст файл завгүй
-$ EFBIG
-27 Файл хэтэрхий том
-$ ENOSPC
-28 Төхөөрөмж дээр зай үлдсэнгүй
-$ ESPIPE
-29 Хайлт буруу
-$ EROFS
-30 Зөвхөн-уншигдах файлын систем
-$ EMLINK
-31 Хэтэрхий олон холбоос байна
-$ EPIPE
-32 Эвдэрхий хоолой
-$ EDOM
-33 Тоон дагавар өгөгдөл талбараас гадна байна
-$ ERANGE
-34 Үр дүн хэтэрхий том
-$ EAGAIN, EWOULDBLOCK
-35 Эх үүсвэр түр зуур боломжгүй байна
-$ EINPROGRESS
-36 Үйлдэл одоо хийгдэж байна
-$ EALREADY
-37 Үйлдэл аль хэдийн хийгдэж байна
-$ ENOTSOCK
-38 Сокет бус зүйл дээр сокет үйлдэл
-$ EDESTADDRREQ
-39 Очих хаяг шаардагдсан
-$ EMSGSIZE
-40 Зурвас мэдээ хэтэрхий урт
-$ EPROTOTYPE
-41 Сокетийн хувьд протокол буруу төрлийнх байна
-$ ENOPROTOOPT
-42 Протокол байхгүй
-$ EPROTONOSUPPORT
-43 Протокол дэмжигдээгүй
-$ ESOCKTNOSUPPORT
-44 Сокетийн төрөл дэмжигдээгүй
-$ EOPNOTSUPP
-45 Үйлдэл дэмжигдээгүй
-$ EPFNOSUPPORT
-46 Протоколын гэр бүл дэмжигдээгүй
-$ EAFNOSUPPORT
-47 Хаягийн гэр бүлийг протоколын гэр бүл дэмжээгүй
-$ EADDRINUSE
-48 Хаяг ашиглагдаж байна
-$ EADDRNOTAVAIL
-49 Хүссэн хаягийг өгч чадахгүй
-$ ENETDOWN
-50 Сүлжээ унасан байна
-$ ENETUNREACH
-51 Сүлжээнд хүрэх боломжгүй
-$ ENETRESET
-52 Салгалт хийгдэхэд сүлжээ холболтыг унагалаа
-$ ECONNABORTED
-53 Програм хангамжаас болж холболт зогслоо
-$ ECONNRESET
-54 Холболтыг харилцагч салгалаа
-$ ENOBUFS
-55 Буфферийн зай байхгүй
-$ EISCONN
-56 Сокет аль хэдийн холбогдсон
-$ ENOTCONN
-57 Сокет холбогдоогүй
-$ ESHUTDOWN
-58 Сокет унтарсны дараа илгээж чадахгүй
-$ ETOOMANYREFS
-59 Хэтэрхий их хамаарлууд байна: залгаж чадахгүй
-$ ETIMEDOUT
-60 Үйлдлийн хугацаа дууссан
-$ ECONNREFUSED
-61 Холболт тогтоохоос татгалзлаа
-$ ELOOP
-62 Тэмдэгт холбоосуудын түвшин хэтэрхий олон байна
-$ ENAMETOOLONG
-63 Файлын нэр хэтэрхий урт
-$ EHOSTDOWN
-64 Төв компьютер зогссон байна
-$ EHOSTUNREACH
-65 Төв компьютер рүү чиглүүлэлт байхгүй
-$ ENOTEMPTY
-66 Сан хоосон биш
-$ EPROCLIM
-67 Хэтэрхий олон үйлдэл байна
-$ EUSERS
-68 Хэтэрхий олон хэрэглэгч байна
-$ EDQUOT
-69 Дискийн хязгаар хэмжээ хэтэрсэн
-$ ESTALE
-70 Хуучирсан NFS файлын жолоо
-$ EREMOTE
-71 Зам хэтэрхий алслагдсан түвшинтэй байна
-$ EBADRPC
-2 RPC бүтэц буруу
-$ ERPCMISMATCH
-73 RPC-ийн хувилбар буруу
-$ EPROGUNAVAIL
-74 RPC програм байхгүй
-$ EPROGMISMATCH
-75 Програмын хувилбар буруу
-$ EPROCUNAVAIL
-76 Програмын хувьд процедур буруу
-$ ENOLCK
-77 Түгжээ байхгүй
-$ ENOSYS
-78 Функц гүйцэтгэгдээгүй
-$ EFTYPE
-79 Файлын төрөл эсвэл хэлбэршилт тохироогүй
-$ EAUTH
-80 Нэвтрүүлэх алдаа
-$ ENEEDAUTH
-81 Нэвтррүүлэгч хэрэгтэй
-$ EIDRM
-82 Танигч устгагдсан
-$ ENOMSG
-83 Хүссэн төрлийн зурвас мэдээ байхгүй
-$ EOVERFLOW
-84 Утга нь өгөгдлийн төрөлд хадгалагдаж болохооргүй хэтэрхий том байна
-$ ECANCELED
-85 Үйлдэл зогсоогдсон
-$ EILSEQ
-86 Байтын дараалал буруу
-$ ENOATTR
-87 Атрибут олдсонгүй
-$ EDOOFUS
-88 Програмчлалын алдаа
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Зогсоох (Hangup)
-$ SIGINT
-2 Тасалдал
-$ SIGQUIT
-3 Гарах
-$ SIGILL
-4 Буруу заавар
-$ SIGTRAP
-5 Мөр/BPT занга
-$ SIGABRT
-6 Таслан зогсоох занга
-$ SIGEMT
-7 EMT занга
-$ SIGFPE
-8 Хөвөгч цэгийн онцгой алдаа
-$ SIGKILL
-9 Хөнөөсөн
-$ SIGBUS
-10 Шугамын алдаа
-$ SIGSEGV
-11 Сегментийн гэмтэл
-$ SIGSYS
-12 Системийн буруу дуудлага
-$ SIGPIPE
-13 Эвдэрхий хоолой
-$ SIGALRM
-14 Сэрүүлэгт цаг
-$ SIGTERM
-15 Төгссөн
-$ SIGURG
-16 Яаралтай I/O нөхцөл
-$ SIGSTOP
-17 Түр зогссон (дохио)
-$ SIGTSTP
-18 Түр зогссон
-$ SIGCONT
-19 Үргэлжилсэн
-$ SIGCHLD
-20 Хүүхэд процесс гарсан
-$ SIGTTIN
-21 Зогссон (tty оролт)
-$ SIGTTOU
-22 Зогссон (tty гаралт)
-$ SIGIO
-23 I/O боломжтой
-$ SIGXCPU
-24 CPU-ийн хугацааны хязгаар хэтэрсэн
-$ SIGXFSZ
-25 Файлын хэмжээний хязгаар хэтэрсэн
-$ SIGVTALRM
-26 Виртуал цаг хэмжигчийн хугацаа дууссан
-$ SIGPROF
-27 Профил хийх цаг хэмжигчийн хугацаа дууссан
-$ SIGWINCH
-28 Цонхны хэмжээний өөрчлөлт
-$ SIGINFO
-29 Мэдээллийн хүсэлт
-$ SIGUSR1
-30 Хэрэглэгчийн тодорхойлсон дохио 1
-$ SIGUSR2
-31 Хэрэглэгчийн тодорхойлсон дохио 2
diff --git a/lib/libc_bsd/nls/msgcat.c b/lib/libc_bsd/nls/msgcat.c
deleted file mode 100644
index c730aba..0000000
--- a/lib/libc_bsd/nls/msgcat.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/***********************************************************
-Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
-Copyright 2010, Gabor Kovesdan <gabor@FreeBSD.org>
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that Alfalfa's name not be used in
-advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.
-
-ALPHALPHA DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-ALPHALPHA BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-If you make any modifications, bugfixes or other changes to this software
-we'd appreciate it if you could send a copy to us so we can keep things
-up-to-date.  Many thanks.
-				Kee Hinckley
-				Alfalfa Software, Inc.
-				267 Allston St., #3
-				Cambridge, MA 02139  USA
-				nazgul@alfalfa.com
-
-******************************************************************/
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/nls/msgcat.c 281033 2015-04-03 17:16:05Z bdrewery $");
-
-#define _NLS_PRIVATE
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/queue.h>
-
-#include <arpa/inet.h>		/* for ntohl() */
-
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <locale.h>
-#include <nl_types.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "../locale/setlocale.h"        /* for ENCODING_LEN */
-
-#define _DEFAULT_NLS_PATH "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L:/usr/local/share/nls/%L/%N.cat:/usr/local/share/nls/%N/%L"
-
-#define RLOCK(fail)	{ int ret;						\
-			  if (__isthreaded &&					\
-			      ((ret = _pthread_rwlock_rdlock(&rwlock)) != 0)) {	\
-				  errno = ret;					\
-				  return (fail);				\
-			  }}
-#define WLOCK(fail)	{ int ret;						\
-			  if (__isthreaded &&					\
-			      ((ret = _pthread_rwlock_wrlock(&rwlock)) != 0)) {	\
-				  errno = ret;					\
-				  return (fail);				\
-			  }}
-#define UNLOCK		{ if (__isthreaded)					\
-			      _pthread_rwlock_unlock(&rwlock); }
-
-#define	NLERR		((nl_catd) -1)
-#define NLRETERR(errc)  { errno = errc; return (NLERR); }
-#define SAVEFAIL(n, l, e)	{ WLOCK(NLERR);					\
-				  np = malloc(sizeof(struct catentry));		\
-				  if (np != NULL) {				\
-				  	np->name = strdup(n);			\
-					np->path = NULL;			\
-					np->catd = NLERR;			\
-					np->refcount = 0;			\
-					np->lang = (l == NULL) ? NULL :		\
-					    strdup(l);				\
-					np->caterrno = e;			\
-				  	SLIST_INSERT_HEAD(&cache, np, list);	\
-				  }						\
-				  UNLOCK;					\
-				  errno = e;					\
-				}
-
-static nl_catd load_msgcat(const char *, const char *, const char *);
-
-static pthread_rwlock_t		 rwlock = PTHREAD_RWLOCK_INITIALIZER;
-
-struct catentry {
-	SLIST_ENTRY(catentry)	 list;
-	char			*name;
-	char			*path;
-	int			 caterrno;
-	nl_catd			 catd;
-	char			*lang;
-	int			 refcount;
-};
-
-SLIST_HEAD(listhead, catentry) cache =
-    SLIST_HEAD_INITIALIZER(cache);
-
-nl_catd
-catopen(const char *name, int type)
-{
-	struct stat sbuf;
-	struct catentry *np;
-	char *base, *cptr, *cptr1, *lang, *nlspath, *pathP, *pcode;
-	char *plang, *pter, *tmpptr;
-	int saverr, spcleft;
-	char path[PATH_MAX];
-
-	/* sanity checking */
-	if (name == NULL || *name == '\0')
-		NLRETERR(EINVAL);
-
-	if (strchr(name, '/') != NULL)
-		/* have a pathname */
-		lang = NULL;
-	else {
-		if (type == NL_CAT_LOCALE)
-			lang = setlocale(LC_MESSAGES, NULL);
-		else
-			lang = getenv("LANG");
-
-		if (lang == NULL || *lang == '\0' || strlen(lang) > ENCODING_LEN ||
-		    (lang[0] == '.' &&
-		    (lang[1] == '\0' || (lang[1] == '.' && lang[2] == '\0'))) ||
-		    strchr(lang, '/') != NULL)
-			lang = "C";
-	}
-
-	/* Try to get it from the cache first */
-	RLOCK(NLERR);
-	SLIST_FOREACH(np, &cache, list) {
-		if ((strcmp(np->name, name) == 0) &&
-		    ((lang != NULL && np->lang != NULL &&
-		    strcmp(np->lang, lang) == 0) || (np->lang == lang))) {
-			if (np->caterrno != 0) {
-				/* Found cached failing entry */
-				UNLOCK;
-				NLRETERR(np->caterrno);
-			} else {
-				/* Found cached successful entry */
-				np->refcount++;
-				UNLOCK;
-				return (np->catd);
-			}
-		}
-	}
-	UNLOCK;
-
-	/* is it absolute path ? if yes, load immediately */
-	if (strchr(name, '/') != NULL)
-		return (load_msgcat(name, name, lang));
-
-	/* sanity checking */
-	if ((plang = cptr1 = strdup(lang)) == NULL)
-		return (NLERR);
-	if ((cptr = strchr(cptr1, '@')) != NULL)
-		*cptr = '\0';
-	pter = pcode = "";
-	if ((cptr = strchr(cptr1, '_')) != NULL) {
-		*cptr++ = '\0';
-		pter = cptr1 = cptr;
-	}
-	if ((cptr = strchr(cptr1, '.')) != NULL) {
-		*cptr++ = '\0';
-		pcode = cptr;
-	}
-
-	if ((nlspath = getenv("NLSPATH")) == NULL || issetugid())
-		nlspath = _DEFAULT_NLS_PATH;
-
-	if ((base = cptr = strdup(nlspath)) == NULL) {
-		saverr = errno;
-		free(plang);
-		errno = saverr;
-		return (NLERR);
-	}
-
-	while ((nlspath = strsep(&cptr, ":")) != NULL) {
-		pathP = path;
-		if (*nlspath) {
-			for (; *nlspath; ++nlspath) {
-				if (*nlspath == '%') {
-					switch (*(nlspath + 1)) {
-					case 'l':
-						tmpptr = plang;
-						break;
-					case 't':
-						tmpptr = pter;
-						break;
-					case 'c':
-						tmpptr = pcode;
-						break;
-					case 'L':
-						tmpptr = lang;
-						break;
-					case 'N':
-						tmpptr = (char *)name;
-						break;
-					case '%':
-						++nlspath;
-						/* FALLTHROUGH */
-					default:
-						if (pathP - path >=
-						    sizeof(path) - 1)
-							goto too_long;
-						*(pathP++) = *nlspath;
-						continue;
-					}
-					++nlspath;
-			put_tmpptr:
-					spcleft = sizeof(path) -
-						  (pathP - path) - 1;
-					if (strlcpy(pathP, tmpptr, spcleft) >=
-					    spcleft) {
-			too_long:
-						free(plang);
-						free(base);
-						SAVEFAIL(name, lang, ENAMETOOLONG);
-						NLRETERR(ENAMETOOLONG);
-					}
-					pathP += strlen(tmpptr);
-				} else {
-					if (pathP - path >= sizeof(path) - 1)
-						goto too_long;
-					*(pathP++) = *nlspath;
-				}
-			}
-			*pathP = '\0';
-			if (stat(path, &sbuf) == 0) {
-				free(plang);
-				free(base);
-				return (load_msgcat(path, name, lang));
-			}
-		} else {
-			tmpptr = (char *)name;
-			--nlspath;
-			goto put_tmpptr;
-		}
-	}
-	free(plang);
-	free(base);
-	SAVEFAIL(name, lang, ENOENT);
-	NLRETERR(ENOENT);
-}
-
-char *
-catgets(nl_catd catd, int set_id, int msg_id, const char *s)
-{
-	struct _nls_cat_hdr *cat_hdr;
-	struct _nls_msg_hdr *msg_hdr;
-	struct _nls_set_hdr *set_hdr;
-	int i, l, r, u;
-
-	if (catd == NULL || catd == NLERR) {
-		errno = EBADF;
-		/* LINTED interface problem */
-		return ((char *)s);
-	}
-
-	cat_hdr = (struct _nls_cat_hdr *)catd->__data;
-	set_hdr = (struct _nls_set_hdr *)(void *)((char *)catd->__data +
-	    sizeof(struct _nls_cat_hdr));
-
-	/* binary search, see knuth algorithm b */
-	l = 0;
-	u = ntohl((uint32_t)cat_hdr->__nsets) - 1;
-	while (l <= u) {
-		i = (l + u) / 2;
-		r = set_id - ntohl((uint32_t)set_hdr[i].__setno);
-
-		if (r == 0) {
-			msg_hdr = (struct _nls_msg_hdr *)
-			    (void *)((char *)catd->__data +
-			    sizeof(struct _nls_cat_hdr) +
-			    ntohl((uint32_t)cat_hdr->__msg_hdr_offset));
-
-			l = ntohl((uint32_t)set_hdr[i].__index);
-			u = l + ntohl((uint32_t)set_hdr[i].__nmsgs) - 1;
-			while (l <= u) {
-				i = (l + u) / 2;
-				r = msg_id -
-				    ntohl((uint32_t)msg_hdr[i].__msgno);
-				if (r == 0) {
-					return ((char *) catd->__data +
-					    sizeof(struct _nls_cat_hdr) +
-					    ntohl((uint32_t)
-					    cat_hdr->__msg_txt_offset) +
-					    ntohl((uint32_t)
-					    msg_hdr[i].__offset));
-				} else if (r < 0) {
-					u = i - 1;
-				} else {
-					l = i + 1;
-				}
-			}
-
-			/* not found */
-			goto notfound;
-
-		} else if (r < 0) {
-			u = i - 1;
-		} else {
-			l = i + 1;
-		}
-	}
-
-notfound:
-	/* not found */
-	errno = ENOMSG;
-	/* LINTED interface problem */
-	return ((char *)s);
-}
-
-int
-catclose(nl_catd catd)
-{
-	struct catentry *np;
-
-	/* sanity checking */
-	if (catd == NULL || catd == NLERR) {
-		errno = EBADF;
-		return (-1);
-	}
-
-	/* Remove from cache if not referenced any more */
-	WLOCK(-1);
-	SLIST_FOREACH(np, &cache, list) {
-		if (catd == np->catd) {
-			np->refcount--;
-			if (np->refcount == 0) {
-				munmap(catd->__data, (size_t)catd->__size);
-				free(catd);
-				SLIST_REMOVE(&cache, np, catentry, list);
-				free(np->name);
-				free(np->path);
-				free(np->lang);
-				free(np);
-			}
-			break;
-		}
-	}
-	UNLOCK;
-	return (0);
-}
-
-/*
- * Internal support functions
- */
-
-static nl_catd
-load_msgcat(const char *path, const char *name, const char *lang)
-{
-	struct stat st;
-	nl_catd	catd;
-	struct catentry *np;
-	void *data;
-	int fd;
-
-	/* path/name will never be NULL here */
-
-	/*
-	 * One more try in cache; if it was not found by name,
-	 * it might still be found by absolute path.
-	 */
-	RLOCK(NLERR);
-	SLIST_FOREACH(np, &cache, list) {
-		if ((np->path != NULL) && (strcmp(np->path, path) == 0)) {
-			np->refcount++;
-			UNLOCK;
-			return (np->catd);
-		}
-	}
-	UNLOCK;
-
-	if ((fd = _open(path, O_RDONLY | O_CLOEXEC)) == -1) {
-		SAVEFAIL(name, lang, errno);
-		NLRETERR(errno);
-	}
-
-	if (_fstat(fd, &st) != 0) {
-		_close(fd);
-		SAVEFAIL(name, lang, EFTYPE);
-		NLRETERR(EFTYPE);
-	}
-
-	/*
-	 * If the file size cannot be held in size_t we cannot mmap()
-	 * it to the memory.  Probably, this will not be a problem given
-	 * that catalog files are usually small.
-	 */
-	if (st.st_size > SIZE_T_MAX) {
-		_close(fd);
-		SAVEFAIL(name, lang, EFBIG);
-		NLRETERR(EFBIG);
-	}
-
-	if ((data = mmap(0, (size_t)st.st_size, PROT_READ,
-	    MAP_FILE|MAP_SHARED, fd, (off_t)0)) == MAP_FAILED) {
-		int saved_errno = errno;
-		_close(fd);
-		SAVEFAIL(name, lang, saved_errno);
-		NLRETERR(saved_errno);
-	}
-	_close(fd);
-
-	if (ntohl((uint32_t)((struct _nls_cat_hdr *)data)->__magic) !=
-	    _NLS_MAGIC) {
-		munmap(data, (size_t)st.st_size);
-		SAVEFAIL(name, lang, EFTYPE);
-		NLRETERR(EFTYPE);
-	}
-
-	if ((catd = malloc(sizeof (*catd))) == NULL) {
-		munmap(data, (size_t)st.st_size);
-		SAVEFAIL(name, lang, ENOMEM);
-		NLRETERR(ENOMEM);
-	}
-
-	catd->__data = data;
-	catd->__size = (int)st.st_size;
-
-	/* Caching opened catalog */
-	WLOCK(NLERR);
-	if ((np = malloc(sizeof(struct catentry))) != NULL) {
-		np->name = strdup(name);
-		np->path = strdup(path);
-		np->catd = catd;
-		np->lang = (lang == NULL) ? NULL : strdup(lang);
-		np->refcount = 1;
-		np->caterrno = 0;
-		SLIST_INSERT_HEAD(&cache, np, list);
-	}
-	UNLOCK;
-	return (catd);
-}
diff --git a/lib/libc_bsd/nls/nl_NL.ISO8859-1.msg b/lib/libc_bsd/nls/nl_NL.ISO8859-1.msg
deleted file mode 100644
index 7c0840d..0000000
--- a/lib/libc_bsd/nls/nl_NL.ISO8859-1.msg
+++ /dev/null
@@ -1,294 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/nl_NL.ISO8859-1.msg 199190 2009-11-11 18:28:12Z rene $
-$
-$ Message catalog for nl_NL.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Bewerking niet toegestaan
-$ ENOENT
-2 Bestand of map niet gevonden
-$ ESRCH
-3 Taak bestaat niet
-$ EINTR
-4 Onderbroken systeemaanroep
-$ EIO
-5 Invoer/uitvoer fout
-$ ENXIO
-6 Apparaat niet geconfigureerd
-$ E2BIG
-7 Argumentenlijst is te lang
-$ ENOEXEC
-8 Programma kan niet worden uitgevoerd
-$ EBADF
-9 Ongeldige bestandsverwijzing
-$ ECHILD
-10 Geen kindprocessen
-$ EDEADLK
-11 Een deadlock op een bron is vermeden
-$ ENOMEM
-12 Kan geen geheugen meer verkrijgen
-$ EACCES
-13 Toegang geweigerd
-$ EFAULT
-14 Ongeldig adres
-$ ENOTBLK
-15 Een per blok adresseerbaar apparaat is vereist
-$ EBUSY
-16 Apparaat is bezig
-$ EEXIST
-17 Bestand bestaat reeds
-$ EXDEV
-18 Verwijzing tussen verschillende apparaten
-$ ENODEV
-19 Bewerking wordt niet ondersteund door dit apparaat
-$ ENOTDIR
-20 Dit is geen map
-$ EISDIR
-21 Dit is een map
-$ EINVAL
-22 Ongeldig argument
-$ ENFILE
-23 Te veel open bestanden in het systeem
-$ EMFILE
-24 Te veel open bestanden
-$ ENOTTY
-25 ioctl niet van toepassing op dit apparaat
-$ ETXTBSY
-26 Programmabestand is bezig
-$ EFBIG
-27 Bestand is te groot
-$ ENOSPC
-28 Geen ruimte meer op dit apparaat
-$ ESPIPE
-29 Ongeldige zoekopdracht
-$ EROFS
-30 Van dit bestandssysteem kan alleen worden gelezen
-$ EMLINK
-31 Te veel bestandsverwijzingen
-$ EPIPE
-32 Gebroken pijp
-$ EDOM
-33 Numeriek argument valt buiten domein
-$ ERANGE
-34 Resultaat te groot of te klein
-$ EAGAIN, EWOULDBLOCK
-35 Middel tijdelijk onbeschikbaar
-$ EINPROGRESS
-36 Bewerking in gang gezet
-$ EALREADY
-37 Bewerking is al in gang gezet
-$ ENOTSOCK
-38 Voor deze bewerking is een contactpunt vereist
-$ EDESTADDRREQ
-39 Een bestemmingsadres is vereist
-$ EMSGSIZE
-40 Te groot bericht
-$ EPROTOTYPE
-41 Protocol past niet bij dit contactpunt
-$ ENOPROTOOPT
-42 Protocol is niet beschikbaar
-$ EPROTONOSUPPORT
-43 Protocol is niet ondersteund
-$ ESOCKTNOSUPPORT
-44 Dit soort contactpunt is niet ondersteund
-$ EOPNOTSUPP
-45 Bewerking niet ondersteund
-$ EPFNOSUPPORT
-46 Protocolfamilie niet ondersteund
-$ EAFNOSUPPORT
-47 Adressenfamilie niet ondersteund door protocolfamilie
-$ EADDRINUSE
-48 Adres is al in gebruik
-$ EADDRNOTAVAIL
-49 Het gevraagde adres kan niet worden toegekend
-$ ENETDOWN
-50 Netwerk is plat
-$ ENETUNREACH
-51 Netwerk is onbereikbaar
-$ ENETRESET
-52 Netwerk onderbrak verbinding tijdens herstart
-$ ECONNABORTED
-53 Verbroken verbinding veroorzaakt door software
-$ ECONNRESET
-54 Verbinding werd aan de andere kant verbroken
-$ ENOBUFS
-55 Geen bufferruimte meer beschikbaar
-$ EISCONN
-56 Contactpunt is al verbonden
-$ ENOTCONN
-57 Contactpunt is niet verbonden
-$ ESHUTDOWN
-58 Een afgesloten contactpunt kan geen gegevens meer verzenden
-$ ETOOMANYREFS
-59 Te veel verwijzingen: splitsen niet mogelijk
-$ ETIMEDOUT
-60 Verbinding te lang niet mogelijk
-$ ECONNREFUSED
-61 Verbinding geweigerd
-$ ELOOP
-62 Te veel niveaus van symbolische verwijzingen
-$ ENAMETOOLONG
-63 Bestandsnaam te lang
-$ EHOSTDOWN
-64 Bestemming niet actief
-$ EHOSTUNREACH
-65 Bestemming niet bereikbaar
-$ ENOTEMPTY
-66 Map is niet leeg
-$ EPROCLIM
-67 Te veel processen
-$ EUSERS
-68 Te veel gebruikers
-$ EDQUOT
-69 Schijfquota overschreden
-$ ESTALE
-70 Verlopen NFS-bestandsverwijzing
-$ EREMOTE
-71 Te veel verwijzingen op afstand in dit pad
-$ EBADRPC
-72 RPC-argumentstructuur is incorrect
-$ ERPCMISMATCH
-73 RPC-versie is verkeerd
-$ EPROGUNAVAIL
-74 RPC-programma niet beschikbaar
-$ EPROGMISMATCH
-75 Programmaversie is verkeerd
-$ EPROCUNAVAIL
-76 Taak kan niet door dit programma worden uitgevoerd
-$ ENOLCK
-77 Geen sloten beschikbaar
-$ ENOSYS
-78 Systeemfunctie is niet geimplementeerd
-$ EFTYPE
-79 Bestandsformaat niet van toepassing
-$ EAUTH
-80 Aanmeldingsfout
-$ ENEEDAUTH
-81 Aanmeldingsprocedure benodigd
-$ EIDRM
-82 De aanwijzer is verwijderd
-$ ENOMSG
-83 Geen bericht van het gewenste type
-$ EOVERFLOW
-84 Waarde te groot om te bewaren in gegevenstype
-$ ECANCELED
-85 Bewerking geannuleerd
-$ EILSEQ
-86 Ongeldige bytereeks
-$ ENOATTR
-87 Attribuut niet gevonden
-$ EDOOFUS
-88 Programmeerfout
-$ EBADMSG
-89 Verkeerd of defect bericht
-$ EMULTIHOP
-90 Multihopverzoek
-$ ENOLINK
-91 Verbinding werd verstoord
-$ EPROTO
-92 Protocolfout
-$ ENOTCAPABLE
-93 Onvoldoende mogelijkheden
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Opgehangen
-$ SIGINT
-2 Onderbroken
-$ SIGQUIT
-3 Opgegeven
-$ SIGILL
-4 Verboden instructie
-$ SIGTRAP
-5 Spoor/BPT-val
-$ SIGABRT
-6 Abort-val
-$ SIGEMT
-7 EMT-val
-$ SIGFPE
-8 Drijvende kommafout
-$ SIGKILL
-9 Gedood
-$ SIGBUS
-10 Busfout
-$ SIGSEGV
-11 Segmentatiefout
-$ SIGSYS
-12 Verkeerde systeemaanroep
-$ SIGPIPE
-13 Gebroken pijp
-$ SIGALRM
-14 Wekker
-$ SIGTERM
-15 Beeindigd
-$ SIGURG
-16 Dringende I/O opgemerkt
-$ SIGSTOP
-17 Gestopt (signaal)
-$ SIGTSTP
-18 Gestopt
-$ SIGCONT
-19 Voortgezet
-$ SIGCHLD
-20 Kindproces beeindigd
-$ SIGTTIN
-21 Gestopt (TTY-invoer)
-$ SIGTTOU
-22 Gestopt (TTY-uitvoer)
-$ SIGIO
-23 I/O mogelijk
-$ SIGXCPU
-24 Te veel CPU-tijd verbruikt
-$ SIGXFSZ
-25 Maximale bestandsgrootte overschreden
-$ SIGVTALRM
-26 Virtuele wekker
-$ SIGPROF
-27 Profiling-wekker
-$ SIGWINCH
-28 Venstergrootte veranderd
-$ SIGINFO
-29 Informatieverzoek
-$ SIGUSR1
-30 Gebruikersignaal 1
-$ SIGUSR2
-31 Gebruikersignaal 2
-$
-$ gai_strerror() support catalog
-$set 3
-$ 1 (obsolete)
-1 Adresfamilie voor hostnaam niet ondersteund
-$ EAI_AGAIN
-2 Tijdelijke fout in naamresolutie
-$ EAI_BADFLAGS
-3 Ongeldige waarde voor ai_flags
-$ EAI_FAIL
-4 Onherstelbare fout in naamresolutie
-$ EAI_FAMILY
-5 ai_familie niet ondersteund
-$ EAI_MEMORY
-6 Geheugenallocatiefout
-$ 7 (obsolete)
-7 Geen adres met hostnaam geassocieerd
-$ EAI_NONAME
-8 hostname noch servname gegeven, of onbekend
-$ EAI_SERVICE
-9 servname niet ondersteund voor ai_socktype
-$ EAI_SOCKTYPE
-10 ai_socktype niet ondersteund
-$ EAI_SYSTEM
-11 Systeemfout geretourneerd in errno
-$ EAI_BADHINTS
-12 Ongeldige waarde voor hints
-$ EAI_PROTOCOL
-13 Opgelost protocol is onbekend
-$ EAI_OVERFLOW
-14 Argumentbuffer overstroomd
-$ 0
-32766 Succes
-$ NL_MSGMAX
-32767 Onbekende fout
diff --git a/lib/libc_bsd/nls/no_NO.ISO8859-1.msg b/lib/libc_bsd/nls/no_NO.ISO8859-1.msg
deleted file mode 100644
index c1622cc..0000000
--- a/lib/libc_bsd/nls/no_NO.ISO8859-1.msg
+++ /dev/null
@@ -1,231 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/no_NO.ISO8859-1.msg 189765 2009-03-13 10:40:38Z gabor $
-$
-$ Message catalog for no_NO.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operasjonen er ikke tillatt
-$ ENOENT
-2 Filen eller katalogen finnes ikke
-$ ESRCH
-3 Prosessen finnes ikke
-$ EINTR
-4 Avbrudt systemkall
-$ EIO
-5 I/O feil
-$ ENXIO
-6 Enheten er ikke konfigurert
-$ E2BIG
-7 Argumentlisten er for lang
-$ ENOEXEC
-8 Ukjent kj�rbart format
-$ EBADF
-9 Ugyldig fildeskriptor
-$ ECHILD
-10 Ingen barneprosess
-$ EDEADLK
-11 Vrangl�s unng�tt
-$ ENOMEM
-12 Kan ikke allokere nok minne
-$ EACCES
-13 Ingen adgang
-$ EFAULT
-14 Ugyldig adresse
-$ ENOTBLK
-15 Blokk-enhet p�krevd
-$ EBUSY
-16 Enheten er opptatt
-$ EEXIST
-17 Filen finnes
-$ EXDEV
-18 Link mellom forskjellige enheter
-$ ENODEV
-19 Operasjonen er ikke st�ttet av enheten
-$ ENOTDIR
-20 Ikke en katalog
-$ EISDIR
-21 Er en katalog
-$ EINVAL
-22 Ugyldig argument
-$ ENFILE
-23 For mange �pne filer i systemet
-$ EMFILE
-24 For mange �pne filer
-$ ENOTTY
-25 Ugyldig ioctl for enheten
-$ ETXTBSY
-26 Kj�rbar fil i bruk
-$ EFBIG
-27 Filen er for stor
-$ ENOSPC
-28 Ingen ledig plass p� enheten
-$ ESPIPE
-29 Ugyldig seek operasjon
-$ EROFS
-30 Filsystemet er skrivebeskyttet
-$ EMLINK
-31 For mange linker
-$ EPIPE
-32 Brudt pipe
-$ EDOM
-33 Numerisk argument utenfor arbeidsomr�det
-$ ERANGE
-34 Resultatet er for stort
-$ EAGAIN, EWOULDBLOCK
-35 Ressurs midlertidig utilgjengelig
-$ EINPROGRESS
-36 Operasjonen er n� i gang
-$ EALREADY
-37 Operasjonen er allerede i gang
-$ ENOTSOCK
-38 Deskriptoren er ikke en socket
-$ EDESTADDRREQ
-39 Mottakeradresse er p�krevd
-$ EMSGSIZE
-40 Meldingen er for lang
-$ EPROTOTYPE
-41 Ugyldig protokolltype for denne socketen
-$ ENOPROTOOPT
-42 Protokollen er ikke tilgjengelig
-$ EPROTONOSUPPORT
-43 Protokollen er ikke st�ttet
-$ ESOCKTNOSUPPORT
-44 Socket-typen er ikke st�ttet
-$ EOPNOTSUPP
-45 Operasjonen er ikke st�ttet
-$ EPFNOSUPPORT
-46 Protokollfamilien er ikke st�ttet
-$ EAFNOSUPPORT
-47 Adressetypen er ikke st�ttet av protokollfamilien
-$ EADDRINUSE
-48 Adressen er allerede i bruk
-$ EADDRNOTAVAIL
-49 Kan ikke bruke den �nskede adressen
-$ ENETDOWN
-50 Nettverket er nede
-$ ENETUNREACH
-51 Nettverket er utilgjengelig
-$ ENETRESET
-52 Nettverket kuttet forbindelsen ved reset
-$ ECONNABORTED
-53 Programvaren for�rsaket brudd av forbindelsen
-$ ECONNRESET
-54 Forbindelsen avbrudt av korrespondenten
-$ ENOBUFS
-55 Buffer-plass ikke tilgjengelig
-$ EISCONN
-56 Socketen er allerede forbundet
-$ ENOTCONN
-57 Socketen er ikke forbundet
-$ ESHUTDOWN
-58 Kan ikke sende etter at socketen er tatt ned
-$ ETOOMANYREFS
-59 For mange referanser: kan ikke sl� dem sammen
-$ ETIMEDOUT
-60 Tiden til forbindelsen utl�p
-$ ECONNREFUSED
-61 Forbindelse nektet
-$ ELOOP
-62 For mange niv�er med symbolske linker
-$ ENAMETOOLONG
-63 Filnavnet er for langt
-$ EHOSTDOWN
-64 Maskinen er nede
-$ EHOSTUNREACH
-65 Ingen rute til maskinen
-$ ENOTEMPTY
-66 Katalogen er ikke tom
-$ EPROCLIM
-67 For mange prosesser
-$ EUSERS
-68 For mange brukere
-$ EDQUOT
-69 Diskkvote overskredet
-$ ESTALE
-70 Fastl�st NFS fildeskriptor
-$ EREMOTE
-71 For mange niv�er med remote i stien
-$ EBADRPC
-72 Ugyldig RPC struktur
-$ ERPCMISMATCH
-73 Feil RPC versjon
-$ EPROGUNAVAIL
-74 RPC program ikke tilgjengelig
-$ EPROGMISMATCH
-75 Feil programversjon
-$ EPROCUNAVAIL
-76 Prosedyren finnes ikke i programmet
-$ ENOLCK
-77 Ingen l�sing tilgjengelig
-$ ENOSYS
-78 Funksjonen er ikke implementert
-$ EFTYPE
-79 Ugyldig filtype eller format
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Hangup
-$ SIGINT
-2 Avbrudd
-$ SIGQUIT
-3 Avslutt
-$ SIGILL
-4 Ugyldig instruksjon
-$ SIGTRAP
-5 Trace/BPT trap
-$ SIGABRT
-6 Abort trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Flyttallsfeil
-$ SIGKILL
-9 Drept
-$ SIGBUS
-10 Buss feil
-$ SIGSEGV
-11 Segmenteringsfeil
-$ SIGSYS
-12 Ugyldig systemkall
-$ SIGPIPE
-13 Brudt pipe
-$ SIGALRM
-14 Alarmklokke
-$ SIGTERM
-15 Terminert
-$ SIGURG
-16 Urgent I/O condition
-$ SIGSTOP
-17 Stoppet (signal)
-$ SIGTSTP
-18 Stoppet
-$ SIGCONT
-19 Fortsetter
-$ SIGCHLD
-20 Barn avsluttet
-$ SIGTTIN
-21 Stoppet (tty input)
-$ SIGTTOU
-22 Stoppet (tty output)
-$ SIGIO
-23 I/O mulig
-$ SIGXCPU
-24 CPU-tid overskredet
-$ SIGXFSZ
-25 Maksimal filst�rrelse overskredet
-$ SIGVTALRM
-26 Virtuell timer utl�pt
-$ SIGPROF
-27 Profileringstimer utl�pt
-$ SIGWINCH
-28 Vindust�rrelse endres
-$ SIGINFO
-29 Informasjonsforesp�rsel
-$ SIGUSR1
-30 Brukerdefinert signal 1
-$ SIGUSR2
-31 Brukerdefinert signal 2
diff --git a/lib/libc_bsd/nls/pl_PL.ISO8859-2.msg b/lib/libc_bsd/nls/pl_PL.ISO8859-2.msg
deleted file mode 100644
index c54d625..0000000
--- a/lib/libc_bsd/nls/pl_PL.ISO8859-2.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/pl_PL.ISO8859-2.msg 148355 2005-07-23 21:30:35Z pjd $
-$
-$ Message catalog for pl_PL.ISO8859-2 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Operacja niedozwolona
-$ ENOENT
-2 Nie ma takiego pliku/katalogu
-$ ESRCH
-3 Nie ma takiego procesu
-$ EINTR
-4 Wywo�anie systemowe przerwane
-$ EIO
-5 B��d wej�cia/wyj�cia
-$ ENXIO
-6 Nieskonfigurowane urz�dzenie
-$ E2BIG
-7 Zbyt d�uga lista argument�w
-$ ENOEXEC
-8 B��dny format pliku wykonywalnego
-$ EBADF
-9 Z�y deskryptor pliku
-$ ECHILD
-10 Brak proces�w potomnych
-$ EDEADLK
-11 Unikni�to zakleszczenia zasob�w
-$ ENOMEM
-12 Brak pami�ci do przydzia�u
-$ EACCES
-13 Brak dost�pu
-$ EFAULT
-14 Z�y adres
-$ ENOTBLK
-15 Wymagane urz�dzenie blokowe
-$ EBUSY
-16 Urz�dzenie zaj�te
-$ EEXIST
-17 Plik istnieje
-$ EXDEV
-18 Dowi�zanie miedzy urz�dzeniami
-$ ENODEV
-19 Operacja nieobs�ugiwana przez urz�dzenie
-$ ENOTDIR
-20 To nie jest katalog
-$ EISDIR
-21 To jest katalog
-$ EINVAL
-22 B��dny argument
-$ ENFILE
-23 Zbyt wiele otwartych plik�w w systemie
-$ EMFILE
-24 Zbyt wiele otwartych plik�w
-$ ENOTTY
-25 Niew�a�ciwy dost�p do urz�dzenia
-$ ETXTBSY
-26 Plik wykonywalny jest zaj�ty
-$ EFBIG
-27 Zbyt du�y plik
-$ ENOSPC
-28 Brak miejsca na urz�dzeniu
-$ ESPIPE
-29 Przesuni�cie niemo�liwe
-$ EROFS
-30 System plik�w tylko do odczytu
-$ EMLINK
-31 Zbyt wiele dowi�za�
-$ EPIPE
-32 Potok przerwany
-$ EDOM
-33 Argument liczbowy z poza zakresu
-$ ERANGE
-34 Wynik z poza zakresu
-$ EAGAIN, EWOULDBLOCK
-35 Zasoby chwilowo niedost�pne
-$ EINPROGRESS
-36 Operacja jest w�a�nie wykonywana
-$ EALREADY
-37 Operacja jest ju� wykonywana
-$ ENOTSOCK
-38 Operacja na obiekcie, kt�ry nie jest gniazdem
-$ EDESTADDRREQ
-39 Wymagany adres przeznaczenia
-$ EMSGSIZE
-40 Wiadomo�� zbyt d�uga
-$ EPROTOTYPE
-41 Typ protoko�u nie pasuje do gniazda
-$ ENOPROTOOPT
-42 Protok� nie jest dost�pny
-$ EPROTONOSUPPORT
-43 Nieobs�ugiwany protok�
-$ ESOCKTNOSUPPORT
-44 Nieobs�ugiwany typ gniazda
-$ EOPNOTSUPP
-45 Nieobs�ugiwana operacja
-$ EPFNOSUPPORT
-46 Nieobs�ugiwana rodzina protoko��w
-$ EAFNOSUPPORT
-47 Rodzina adres�w nie jest obs�ugiwana przez rodzin� protoko��w
-$ EADDRINUSE
-48 Adres jest ju� w u�yciu
-$ EADDRNOTAVAIL
-49 Adres nie mo�e by� przydzielony
-$ ENETDOWN
-50 Sie� nie dzia�a
-$ ENETUNREACH
-51 Sie� jest niedost�pna
-$ ENETRESET
-52 Sie� przerwa�a po��czenie po resecie
-$ ECONNABORTED
-53 Oprogramowanie spowodowa�o przerwanie po��czenia
-$ ECONNRESET
-54 Po��czenie zerwane przez drug� stron�
-$ ENOBUFS
-55 Brak miejsca w buforze
-$ EISCONN
-56 Gniazdo jest ju� po��czone
-$ ENOTCONN
-57 Gniazdo nie jest po��czone
-$ ESHUTDOWN
-58 Nie mo�na wysy�a� po zamkni�ciu gniazda
-$ ETOOMANYREFS
-59 Za du�o powi�za�: dowi�zanie niemo�liwe
-$ ETIMEDOUT
-60 Limit czasu operacji przekroczony
-$ ECONNREFUSED
-61 Po��czenie odrzucone
-$ ELOOP
-62 Zbyt wiele wzajemnych dowi�za� symbolicznych
-$ ENAMETOOLONG
-63 Zbyt d�uga nazwa pliku
-$ EHOSTDOWN
-64 Host jest wy��czony
-$ EHOSTUNREACH
-65 Brak drogi do hosta
-$ ENOTEMPTY
-66 Katalog nie jest pusty
-$ EPROCLIM
-67 Zbyt wiele proces�w
-$ EUSERS
-68 Zbyt wielu u�ytkownik�w
-$ EDQUOT
-69 Przekroczono limit miejsca na dysku
-$ ESTALE
-70 Uchwyt pliku NFS jest nieaktualny
-$ EREMOTE
-71 Zbyt wiele poziom�w zagnie�d�enia w �cie�ce
-$ EBADRPC
-72 RPC b��dna struktura
-$ ERPCMISMATCH
-73 RPC niekompatybilna wersja
-$ EPROGUNAVAIL
-74 RPC program niedost�pny
-$ EPROGMISMATCH
-75 Nieobs�ugiwana wersja programu
-$ EPROCUNAVAIL
-76 Nieobs�ugiwana procedura
-$ ENOLCK
-77 Wyczerpany limit blokad
-$ ENOSYS
-78 Nieobs�ugiwana funkcja
-$ EFTYPE
-79 Niew�a�ciwy typ lub format pliku
-$ EAUTH
-80 B��d uwierzytelnienia
-$ ENEEDAUTH
-81 Wymagane uwierzytelnienie
-$ EIDRM
-82 Identyfikator zosta� usuni�ty
-$ ENOMSG
-83 Brak komunikatu po��danego typu
-$ EOVERFLOW
-84 Warto�� zbyt du�a dla zdefiniowanego typu danych
-$ ECANCELED
-85 Operacja anulowana
-$ EILSEQ
-86 B��dna sekwencja bajt�w
-$ ENOATTR
-87 Nie znaleziono atrybutu
-$ EDOOFUS
-88 Wewn�trzny b��d programu
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Roz��czenie
-$ SIGINT
-2 Przerwanie
-$ SIGQUIT
-3 Wyj�cie
-$ SIGILL
-4 Nieznana instrukcja
-$ SIGTRAP
-5 Pu�apka debuggera/BPT
-$ SIGABRT
-6 Przerwana pu�apka
-$ SIGEMT
-7 Pu�apka EMT
-$ SIGFPE
-8 B��d w obliczeniach zmiennoprzecinkowych
-$ SIGKILL
-9 Unicestwiony
-$ SIGBUS
-10 B��d szyny
-$ SIGSEGV
-11 Naruszenie ochrony pami�ci
-$ SIGSYS
-12 B��dne wywo�anie systemowe
-$ SIGPIPE
-13 Przerwany potok
-$ SIGALRM
-14 Budzik
-$ SIGTERM
-15 Zako�czony
-$ SIGURG
-16 Nag�y wypadek I/O
-$ SIGSTOP
-17 Zatrzymany (sygna�)
-$ SIGTSTP
-18 Zatrzymany
-$ SIGCONT
-19 Kontynuacja
-$ SIGCHLD
-20 Proces potomny zako�czy� prac�
-$ SIGTTIN
-21 Zatrzymany (wej�cie z tty)
-$ SIGTTOU
-22 Zatrzymany (wyj�cie z tty)
-$ SIGIO
-23 Wej/Wyj dozwolone
-$ SIGXCPU
-24 Przekroczony limit czasu procesora
-$ SIGXFSZ
-25 Przekroczony limit wielko�ci pliku
-$ SIGVTALRM
-26 Alarm stopera wirtualnego
-$ SIGPROF
-27 Alarm stopera profiluj�cego
-$ SIGWINCH
-28 Zmiana rozmiaru okna
-$ SIGINFO
-29 ��danie informacji
-$ SIGUSR1
-30 Sygna� u�ytkownika 1
-$ SIGUSR2
-31 Sygna� u�ytkownika 2
diff --git a/lib/libc_bsd/nls/pt_BR.ISO8859-1.msg b/lib/libc_bsd/nls/pt_BR.ISO8859-1.msg
deleted file mode 100644
index 26b9441..0000000
--- a/lib/libc_bsd/nls/pt_BR.ISO8859-1.msg
+++ /dev/null
@@ -1,249 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/pt_BR.ISO8859-1.msg 189963 2009-03-18 14:33:10Z gabor $
-$
-$ Message catalog for pt_BR.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Opera��o n�o permitida
-$ ENOENT
-2 Nenhum arquivo ou diret�rio encontrado
-$ ESRCH
-3 Nenhum processo encontrado
-$ EINTR
-4 Chamada de sistema interrompida
-$ EIO
-5 Erro de entrada/sa�da
-$ ENXIO
-6 Dispositivo n�o configurado
-$ E2BIG
-7 Lista de argumentos muito grande
-$ ENOEXEC
-8 Erro no formato de execu��o
-$ EBADF
-9 Erro no descritor de arquivo
-$ ECHILD
-10 Nenhum processo filho
-$ EDEADLK
-11 Bloqueio de recurso evitado
-$ ENOMEM
-12 Imposs�vel alocar mem�ria
-$ EACCES
-13 Permiss�o negada
-$ EFAULT
-14 Endere�o errado
-$ ENOTBLK
-15 Dispositivo de bloco requerido
-$ EBUSY
-16 Dispositivo ocupado
-$ EEXIST
-17 Arquivo existe
-$ EXDEV
-18 Liga��o entre dispositivos
-$ ENODEV
-19 Opera��o n�o suportada pelo dispositivo
-$ ENOTDIR
-20 N�o � um diret�rio
-$ EISDIR
-21 � um diret�rio
-$ EINVAL
-22 Argumento inv�lido
-$ ENFILE
-23 Muitos arquivos abertos no sistema
-$ EMFILE
-24 Muitos arquivos abertos no sistema
-$ ENOTTY
-25 ioctl inapropriado para o dispositivo
-$ ETXTBSY
-26 Arquivo texto sendo utilizado
-$ EFBIG
-27 Arquivo muito grande
-$ ENOSPC
-28 Sem espa�o no dispositivo
-$ ESPIPE
-29 seek ilegal
-$ EROFS
-30 Sistema de arquivos apenas para leitura
-$ EMLINK
-31 Muitos links
-$ EPIPE
-32 pipe quebrado
-$ EDOM
-33 Argumento num�rico fora do dom�nio
-$ ERANGE
-34 Resultado muito grande
-$ EAGAIN, EWOULDBLOCK
-35 Recurso temporariamente indispon�vel
-$ EINPROGRESS
-36 Opera��o em progresso agora
-$ EALREADY
-37 Opera��o em progresso pronta
-$ ENOTSOCK
-38 Opera��o de socket em um n�o-socket
-$ EDESTADDRREQ
-39 Endere�o de destino requerido
-$ EMSGSIZE
-40 Mensagem muito grande
-$ EPROTOTYPE
-41 Tipo de protocolo errado para socket
-$ ENOPROTOOPT
-42 Protocolo n�o dispon�vel
-$ EPROTONOSUPPORT
-43 Protocolo n�o suportado
-$ ESOCKTNOSUPPORT
-44 Tipo de socket n�o suportado
-$ EOPNOTSUPP
-45 Opera��o n�o permitida
-$ EPFNOSUPPORT
-46 Fam�lia de protocolo n�o suportada
-$ EAFNOSUPPORT
-47 Fam�lia de endere�os n�o suportada pela fam�lia de protocolos
-$ EADDRINUSE
-48 Endere�o j� est� em uso
-$ EADDRNOTAVAIL
-49 Imposs�vel obter endere�o solicitado
-$ ENETDOWN
-50 Rede est� parada
-$ ENETUNREACH
-51 Rede est� inalcan��vel
-$ ENETRESET
-52 Conex�o de rede perdida durante reset
-$ ECONNABORTED
-53 Conex�o abortada por software
-$ ECONNRESET
-54 Conex�o reiniciada pelo outro ponto
-$ ENOBUFS
-55 Sem espa�o de buffer dispon�vel
-$ EISCONN
-56 Socket j� est� conectado
-$ ENOTCONN
-57 Socket n�o est� conectado
-$ ESHUTDOWN
-58 Imposs�vel enviar depois que o socket foi finalizado
-$ ETOOMANYREFS
-59 Muitas refer�ncias: imposs�vel ligar
-$ ETIMEDOUT
-60 Tempo de opera��o expirou
-$ ECONNREFUSED
-61 Conex�o recusada
-$ ELOOP
-62 Muitos n�veis de links simb�licos
-$ ENAMETOOLONG
-63 Nome de arquivo muito grande
-$ EHOSTDOWN
-64 Host est� desligado
-$ EHOSTUNREACH
-65 Sem rota para o host
-$ ENOTEMPTY
-66 Diret�rio n�o est� vazio
-$ EPROCLIM
-67 Muitos processos
-$ EUSERS
-68 Muitos usu�rios
-$ EDQUOT
-69 Quota de disco excedida
-$ ESTALE
-70 Manipulador de arquivo NFS velho
-$ EREMOTE
-71 Muitos n�veis no caminho remoto
-$ EBADRPC
-72 Estrutura RPC incorreta
-$ ERPCMISMATCH
-73 Vers�o RPC incorreta
-$ EPROGUNAVAIL
-74 Programa RPC indispon�vel
-$ EPROGMISMATCH
-75 Vers�o do programa incorreta
-$ EPROCUNAVAIL
-76 Procedimento incorreto para o programa
-$ ENOLCK
-77 Nenhum lock dispon�vel
-$ ENOSYS
-78 Fun��o n�o implementada
-$ EFTYPE
-79 Tipo de arquivo ou formato inapropriados
-$ EAUTH
-80 Erro de autentica��o
-$ ENEEDAUTH
-81 Necessidade de autenticador
-$ EIDRM
-82 Identificador removido
-$ ENOMSG
-83 Nenhuma mensagem do tipo desejado
-$ EOVERFLOW
-84 Valor muito grande para ser armazenado neste tipo de dado
-$ ECANCELED
-85 Opera��o cancelada
-$ EILSEQ
-86 Sequ�ncia de bytes ilegal
-$ ENOATTR
-87 Atributo n�o encontrado
-$ EDOOFUS
-88 Erro de programa��o
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Fim da linha (Hangup)
-$ SIGINT
-2 Interrup��o
-$ SIGQUIT
-3 Sa�da
-$ SIGILL
-4 Instru��o ilegal
-$ SIGTRAP
-5 Trap de Trace/BPT
-$ SIGABRT
-6 Abortar trap
-$ SIGEMT
-7 EMT trap
-$ SIGFPE
-8 Exce��o de ponto flutuante
-$ SIGKILL
-9 Morreu
-$ SIGBUS
-10 Erro de barramento
-$ SIGSEGV
-11 Falha de segmenta��o
-$ SIGSYS
-12 Chamada de sistema incorreta
-$ SIGPIPE
-13 Pipe incorreto
-$ SIGALRM
-14 Alarme do rel�gio
-$ SIGTERM
-15 Terminado
-$ SIGURG
-16 Condi��o urgente de E/S
-$ SIGSTOP
-17 Suspendido (sinal)
-$ SIGTSTP
-18 Suspendido
-$ SIGCONT
-19 Continuado
-$ SIGCHLD
-20 Filho saiu
-$ SIGTTIN
-21 Parado (entrada de tty)
-$ SIGTTOU
-22 Parado (sa�da de tty)
-$ SIGIO
-23 E/S poss�vel
-$ SIGXCPU
-24 Limite de tempo de CPU excedido
-$ SIGXFSZ
-25 Tamanho de arquivo excedido
-$ SIGVTALRM
-26 Temporizador virtual expirou
-$ SIGPROF
-27 Temporizador de profiling expirou
-$ SIGWINCH
-28 Mudan�a no tamanho de janela
-$ SIGINFO
-29 Requisi��o de informa��o
-$ SIGUSR1
-30 Sinal 1 definido pelo usu�rio
-$ SIGUSR2
-31 Sinal 2 definido pelo usu�rio
diff --git a/lib/libc_bsd/nls/ru_RU.KOI8-R.msg b/lib/libc_bsd/nls/ru_RU.KOI8-R.msg
deleted file mode 100644
index fde2f08..0000000
--- a/lib/libc_bsd/nls/ru_RU.KOI8-R.msg
+++ /dev/null
@@ -1,266 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/ru_RU.KOI8-R.msg 209360 2010-06-20 06:52:10Z maxim $
-$
-$ Message catalog for ru_RU.KOI8-R locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 �������� �� ���������
-$ ENOENT
-2 ��� ������ ����� ��� ��������
-$ ESRCH
-3 ��� ������ ��������
-$ EINTR
-4 ���������� ��������� �����
-$ EIO
-5 ������ �����/������
-$ ENXIO
-6 ���������� �� ����������������
-$ E2BIG
-7 ������� ������� ������ ����������
-$ ENOEXEC
-8 ������ ������� ������������ �����
-$ EBADF
-9 ������������ ���������� �����
-$ ECHILD
-10 ��� ����������� ���������
-$ EDEADLK
-11 ������������� �������� ���������� ��� ������� � �������
-$ ENOMEM
-12 ���������� �������� ������
-$ EACCES
-13 ������������ ����������
-$ EFAULT
-14 ������������ �����
-$ ENOTBLK
-15 ���������� ������� ������� ����������
-$ EBUSY
-16 ���������� ������
-$ EEXIST
-17 ���� ����������
-$ EXDEV
-18 ������ �� ������ ����������
-$ ENODEV
-19 �������� �� �������������� �����������
-$ ENOTDIR
-20 ��������� ���� �� �������� ���������
-$ EISDIR
-21 ��������� ���� �������� ���������
-$ EINVAL
-22 ������������ ��������
-$ ENFILE
-23 ������� ����� �������� ������ � �������
-$ EMFILE
-24 ������� ����� �������� ������
-$ ENOTTY
-25 ����� ioctl �� �������������� �����������
-$ ETXTBSY
-26 ��������� ���� �����
-$ EFBIG
-27 ������� ������� ����
-$ ENOSPC
-28 �� ���������� �� �������� �����
-$ ESPIPE
-29 ������������ ��������
-$ EROFS
-30 �������� ������� ������ ��� ������
-$ EMLINK
-31 ������� ����� ������
-$ EPIPE
-$ XXX???
-32 ����� ��������
-$ EDOM
-33 ������������ �������� ��������� ���������
-$ ERANGE
-34 ������� ������� ���������
-$ EAGAIN, EWOULDBLOCK
-35 ������ �������� ����������
-$ EINPROGRESS
-36 �������� � �������� ����������
-$ EALREADY
-$ XXX???
-37 �������� ��� �����������
-$ ENOTSOCK
-38 �������� � ������� ��������� �� � ������
-$ EDESTADDRREQ
-39 ��������� ������� �����
-$ EMSGSIZE
-40 ������� ������� ���������
-$ EPROTOTYPE
-41 �������� ��� ��������� ��� ������
-$ ENOPROTOOPT
-42 �������� ����������
-$ EPROTONOSUPPORT
-43 �������� �� ��������������
-$ ESOCKTNOSUPPORT
-44 ���� ��� ������ �� ��������������
-$ EOPNOTSUPP
-45 �������� �� ��������������
-$ EPFNOSUPPORT
-46 ��������� ���������� �� ��������������
-$ EAFNOSUPPORT
-47 ��������� ������� �� �������������� ���������� ����������
-$ EADDRINUSE
-48 ����� ��� ������������
-$ EADDRNOTAVAIL
-49 �� ���� ��������� ��������� �����
-$ ENETDOWN
-50 ���� �� ��������
-$ ENETUNREACH
-51 ���� �����������
-$ ENETRESET
-52 ���� ������� ����������� ��� ������
-$ ECONNABORTED
-53 ��������� ������� ��������� ����������� �����������
-$ ECONNRESET
-54 ����������� �������� ��������������� ��������
-$ ENOBUFS
-55 �� �������� ����� ��� �����
-$ EISCONN
-56 ����� ��� ���������
-$ ENOTCONN
-57 ����� �� ���������
-$ ESHUTDOWN
-58 �� ���� ������� ����� �������� ������
-$ ETOOMANYREFS
-59 ������� ����� ������: �� ���� ���������
-$ ETIMEDOUT
-60 �������� ��������� ����� �������
-$ ECONNREFUSED
-61 ����������� ����������
-$ ELOOP
-62 ������� ����� ������� ���������� ������
-$ ENAMETOOLONG
-63 ������� ������� ��� �����
-$ EHOSTDOWN
-64 ���� �� ��������
-$ EHOSTUNREACH
-65 ��� �������� � �����
-$ ENOTEMPTY
-66 ������� �� ����
-$ EPROCLIM
-67 ������� ����� ���������
-$ EUSERS
-68 ������� ����� �������������
-$ EDQUOT
-69 ����������� �������� �����
-$ ESTALE
-70 ���������� ���������� ����� NFS
-$ EREMOTE
-71 ������� ����� ������������� ��������� � ����
-$ EBADRPC
-72 ������������ ��������� RPC
-$ ERPCMISMATCH
-73 �������� ������ RPC
-$ EPROGUNAVAIL
-74 ��������� RPC ����������
-$ EPROGMISMATCH
-75 �������� ������ ���������
-$ EPROCUNAVAIL
-76 ������������ ��������� ��� ���������
-$ ENOLCK
-77 ���������� ����������
-$ ENOSYS
-78 ������� �� �����������
-$ EFTYPE
-79 ������������ ��� ��� ������ �����
-$ EAUTH
-80 ������ ��������������
-$ ENEEDAUTH
-81 ���������� �������������
-$ EIDRM
-82 ������������� ������
-$ ENOMSG
-83 ��� ��������� ���������� ����
-$ EOVERFLOW
-84 ������� ������� �������� ��� �������� � ��������� ���� ������
-$ ECANCELED
-85 �������� ��������
-$ EILSEQ
-86 ������������ ������������������ ������
-$ ENOATTR
-87 ������� �� ������
-$ EDOOFUS
-88 ������ ����������������
-$ EBADMSG
-89 ������ ������ ���������
-$ EMULTIHOP
-90 ������� ����������
-$ ENOLINK
-91 ����� ��������
-$ EPROTO
-92 ������ ���������
-$ ENOTCAPABLE
-93 ������������ ������������
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-$ XXX: ����������?
-1 ������ �����
-$ SIGINT
-2 ���������� �� �������
-$ SIGQUIT
-3 �����
-$ SIGILL
-4 ������������ ����������
-$ SIGTRAP
-5 ������� �����������/����� ��������
-$ SIGABRT
-$ XXX: ��������� ����������
-6 ������� ���������� �����������
-$ SIGEMT
-7 ������� EMT
-$ SIGFPE
-$ XXX: ������ �������� � ��������� ������?
-8 ������ ��� ������ � ������������ ������
-$ SIGKILL
-$ XXX: ����
-9 ������������� ���������
-$ SIGBUS
-$ XXX: ������ ��������� �� ����
-10 ������ ����
-$ SIGSEGV
-11 ������ �����������
-$ SIGSYS
-12 ������������ ��������� �����
-$ SIGPIPE
-13 ����� ��������
-$ SIGALRM
-14 �������� ������
-$ SIGTERM
-15 ��������
-$ SIGURG
-16 ��������� ������� ����-�����
-$ SIGSTOP
-17 ������������ (������)
-$ SIGTSTP
-18 ������������
-$ SIGCONT
-19 ����������� ������
-$ SIGCHLD
-20 ��������� ������ ������������ ��������
-$ SIGTTIN
-21 ���������� (���� � ���������)
-$ SIGTTOU
-22 ���������� (����� �� ��������)
-$ SIGIO
-23 ����-����� ��������
-$ SIGXCPU
-24 ��������� ����������� ������������� �������
-$ SIGXFSZ
-25 �������� ������������ ������ �����
-$ SIGVTALRM
-26 ����� ����������� ������
-$ SIGPROF
-27 ����� ������ ��������������
-$ SIGWINCH
-28 ��������� ������� ����
-$ SIGINFO
-29 ������ ����������
-$ SIGUSR1
-30 ���������������� ������ 1
-$ SIGUSR2
-31 ���������������� ������ 2
diff --git a/lib/libc_bsd/nls/sk_SK.ISO8859-2.msg b/lib/libc_bsd/nls/sk_SK.ISO8859-2.msg
deleted file mode 100644
index 014ca25..0000000
--- a/lib/libc_bsd/nls/sk_SK.ISO8859-2.msg
+++ /dev/null
@@ -1,267 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/sk_SK.ISO8859-2.msg 189765 2009-03-13 10:40:38Z gabor $
-$
-$ Message catalog for sk_SK.ISO8859-2 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Oper�cia nie je povolen�
-$ ENOENT
-2 Neexistuj�ci s�bor alebo adres�r
-$ ESRCH
-3 Proces neexistuje
-$ EINTR
-4 Syst�mov� volanie preru�en�
-$ EIO
-5 Chyba vstupu/v�stupu
-$ ENXIO
-6 Zariadenie nie je nakonfigurovan�
-$ E2BIG
-7 Pr�li� dlh� zoznam argumentov
-$ ENOEXEC
-8 Chybn� form�t spusten�ho s�boru
-$ EBADF
-9 Chybn� deskriptor s�boru
-$ ECHILD
-10 Neexistuje �iaden potomok procesu
-$ EDEADLK
-11 Bolo zabr�nen� zablokovaniu prostriedku
-$ ENOMEM
-12 Nie je mo�n� prideli� pam�
-$ EACCES
-13 Pr�stup odmietnut�
-$ EFAULT
-14 Chybn� adresa
-$ ENOTBLK
-15 Vy�adovan� blokov� zariadenie
-$ EBUSY
-16 Zariadenie je pou��van�
-$ EEXIST
-17 S�bor existuje
-$ EXDEV
-18 Odkaz medzi zariadeniami
-$ ENODEV
-19 Oper�cia nie je zariaden�m podporovan�
-$ ENOTDIR
-20 Nie je adres�r
-$ EISDIR
-21 Je adres�r
-$ EINVAL
-22 Chybn� argument
-$ ENFILE
-23 Prive�a otvoren�ch s�borov v syst�me
-$ EMFILE
-24 Prive�a otvoren�ch s�borov
-$ ENOTTY
-25 Nevhodn� ioctl pre dan� zariadenie
-$ ETXTBSY
-26 Textov� s�bor je pou��van�
-$ EFBIG
-27 S�bor je pr�li� ve�k�
-$ ENOSPC
-28 Na zariaden� nie je vo�n� miesto
-$ ESPIPE
-29 Nepr�pustn� nastavenie poz�cie
-$ EROFS
-30 S�borov� syst�m je len na ��tanie
-$ EMLINK
-31 Prive�a odkazov
-$ EPIPE
-32 Preru�en� r�ra
-$ EDOM
-33 ��seln� argument mimo defini�n� obor
-$ ERANGE
-34 V�sledok pr�li� ve�k� alebo pr�li� mal�
-$ EAGAIN, EWOULDBLOCK
-35 Zdroj je do�asne nedostupn�
-$ EINPROGRESS
-36 Oper�cia pr�ve prebieha
-$ EALREADY
-37 Oper�cia u� prebieha
-$ ENOTSOCK
-38 Socketov� oper�cia na objekte, ktor� nie je socket
-$ EDESTADDRREQ
-39 Vy�adovan� cie�ov� adresa
-$ EMSGSIZE
-40 Pr�li� dlh� spr�va
-$ EPROTOTYPE
-41 Protokol nie je socketom podporovan�
-$ ENOPROTOOPT
-42 Protokol nie je k dispoz�cii
-$ EPROTONOSUPPORT
-43 Protokol nie je podporovan�
-$ ESOCKTNOSUPPORT
-44 Typ socketu nie je podporovan�
-$ EOPNOTSUPP
-45 Oper�cia nie je podporovan�
-$ EPFNOSUPPORT
-46 Rodina protokolov nie je podporovan�
-$ EAFNOSUPPORT
-47 Rodina adries nie je podporovan� rodinou protokolov
-$ EADDRINUSE
-48 Adresa je u� pou��van�
-$ EADDRNOTAVAIL
-49 Nie je mo�n� prideli� po�adovan� adresu
-$ ENETDOWN
-50 Sie� je nefunk�n�
-$ ENETUNREACH
-51 Sie� je nedostupn�
-$ ENETRESET
-52 Sie� zru�ila spojenie po resete
-$ ECONNABORTED
-53 Program sp�sobil ukon�enie spojenia
-$ ECONNRESET
-54 Spojenie zru�en� druhou stranou
-$ ENOBUFS
-55 Vyrovn�vacia pam� nie je k dispoz�cii
-$ EISCONN
-56 Socket je u� pripojen�
-$ ENOTCONN
-57 Socket nie je pripojen�
-$ ESHUTDOWN
-58 Nie je mo�n� posiela� po uzavret� socketu
-$ ETOOMANYREFS
-59 Pr�li� mnoho odkazov: nie je mo�n� spoji�
-$ ETIMEDOUT
-60 �asov� limit pre spojenie vypr�al
-$ ECONNREFUSED
-61 Spojenie odmietnut�
-$ ELOOP
-62 Prive�a �rovn� symbolick�ch odkazov
-$ ENAMETOOLONG
-63 Meno s�boru pr�li� dlh�
-$ EHOSTDOWN
-64 Vzdialen� uzol je odpojen�
-$ EHOSTUNREACH
-65 Neexistuje cesta k vzdialen�mu uzlu
-$ ENOTEMPTY
-66 Adres�r nie je pr�zdny
-$ EPROCLIM
-67 Prive�a procesov
-$ EUSERS
-68 Prive�a pou��vate�ov
-$ EDQUOT
-69 Diskov� kv�ta prekro�en�
-$ ESTALE
-70 Zastaral� NFS s�borov� ukazate�
-$ EREMOTE
-71 Prive�a �rovn� vzdialen�ho v ceste
-$ EBADRPC
-72 RPC �trukt�ra je chybn�
-$ ERPCMISMATCH
-73 Chybn� verzia RPC
-$ EPROGUNAVAIL
-74 RPC program nie je k dispoz�cii
-$ EPROGMISMATCH
-75 Chybn� verzia RPC programu
-$ EPROCUNAVAIL
-76 Chybn� RPC proced�ra pre program
-$ ENOLCK
-77 Z�mky nie s� k dispoz�cii
-$ ENOSYS
-78 Funkcia nie je implementovan�
-$ EFTYPE
-79 Nevhodn� typ alebo form�t s�boru
-$ EAUTH
-80 Overenie pr�v ne�spe�n�
-$ ENEEDAUTH
-81 Vy�adovan� overovac� objekt
-$ EIDRM
-82 Identifik�tor odstr�nen�
-$ ENOMSG
-83 Neexistuje spr�va �elan�ho typu
-$ EOVERFLOW
-84 Hodnota je pre dan� d�tov� typ prive�k�
-$ EILSEQ
-85 Nepr�pustn� postupnos� bajtov
-$ ENOTSUP
-86 Nie je podporovan�
-$ ECANCELED
-87 Oper�cia zru�en�
-$ EBADMSG
-88 Chybn� alebo poru�en� spr�va
-$ ENODATA
-89 �iadna spr�va nie je k dispoz�cii
-$ ENOSR
-90 �iadne STREAM zdroje
-$ ENOSTR
-91 Nie je STREAM
-$ ETIME
-92 �asov� limit pre STREAM ioctl vypr�al
-$ ENOATTR
-93 Atrib�t nen�jden�
-$ EMULTIHOP
-94 Pokus o spojenie cez viacero uzlov
-$ ENOLINK
-95 Odkaz bol pretrhnut�
-$ EPROTO
-96 Chyba protokolu
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Termin�l odpojen�
-$ SIGINT
-2 Preru�enie
-$ SIGQUIT
-3 Koniec
-$ SIGILL
-4 Chybn� in�trukcia
-$ SIGTRAP
-5 Trasovacia/ladiaca in�trukcia
-$ SIGABRT
-6 N�siln� ukon�enie
-$ SIGEMT
-7 Emulovan� in�trukcia
-$ SIGFPE
-8 V�nimka pohyblivej r�dovej �iarky
-$ SIGKILL
-9 Zabit�
-$ SIGBUS
-10 Chyba na zbernici
-$ SIGSEGV
-11 Chyba segment�cie
-$ SIGSYS
-12 Chybn� syst�mov� volanie
-$ SIGPIPE
-13 Preru�en� r�ra
-$ SIGALRM
-14 Bud�k
-$ SIGTERM
-15 Ukon�en�
-$ SIGURG
-16 Naliehav� vstupn�/v�stupn� stav
-$ SIGSTOP
-17 Pozastaven� (sign�l)
-$ SIGTSTP
-18 Pozastaven�
-$ SIGCONT
-19 Pokra�ovanie
-$ SIGCHLD
-20 Potomok procesu ukon�en�
-$ SIGTTIN
-21 Pozastaven� (termin�lov� vstup)
-$ SIGTTOU
-22 Pozastaven� (termin�lov� v�stup)
-$ SIGIO
-23 Vstup/v�stup mo�n�
-$ SIGXCPU
-24 Prekro�en� �asov� limit pre procesor
-$ SIGXFSZ
-25 Prekro�en� limit ve�kosti s�boru
-$ SIGVTALRM
-26 Vypr�al virtu�lny �asova�
-$ SIGPROF
-27 Vypr�al profilovac� �asova�
-$ SIGWINCH
-28 Ve�kos� okna zmenen�
-$ SIGINFO
-29 �iados� o inform�ciu
-$ SIGUSR1
-30 Pou��vate�om definovan� sign�l 1
-$ SIGUSR2
-31 Pou��vate�om definovan� sign�l 2
-$ SIGPWR
-32 Zlyhanie/opakovan� spustenie nap�jania
diff --git a/lib/libc_bsd/nls/sv_SE.ISO8859-1.msg b/lib/libc_bsd/nls/sv_SE.ISO8859-1.msg
deleted file mode 100644
index 293bd12..0000000
--- a/lib/libc_bsd/nls/sv_SE.ISO8859-1.msg
+++ /dev/null
@@ -1,233 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/sv_SE.ISO8859-1.msg 189765 2009-03-13 10:40:38Z gabor $
-$
-$ Message catalog for sv_SE.ISO8859-1 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Otill�ten operation
-$ ENOENT
-2 Filen eller katalogen finns ej
-$ ESRCH
-3 Denna process finns ej
-$ EINTR
-4 Avbrutet systemanrop
-$ EIO
-5 In-/utmatningsfel
-$ ENXIO
-6 Enheten �r ej konfigurerad
-$ E2BIG
-7 Argumentlistan �r f�r l�ng
-$ ENOEXEC
-8 Ej k�rbar fil
-$ EBADF
-9 Felaktigt filhandtag
-$ ECHILD
-10 Inga barnprocesser
-$ EDEADLK
-11 Undvek resursd�dl�ge
-$ ENOMEM
-12 Kan ej erh�lla minne
-$ EACCES
-13 Tillst�nd nekas
-$ EFAULT
-14 Felaktig adress
-$ ENOTBLK
-15 Blockenhet kr�vs
-$ EBUSY
-16 Enheten �r upptagen
-$ EEXIST
-17 Filen finns redan
-$ EXDEV
-18 L�nken korsar enheter
-$ ENODEV
-19 Enheten st�der ej operationen
-$ ENOTDIR
-20 �r ej en katalog
-$ EISDIR
-21 �r en katalog
-$ EINVAL
-22 Ogiltigt argument
-$ ENFILE
-23 F�r m�nga �ppna filer i systemet
-$ EMFILE
-24 F�r m�nga �ppna filer
-$ ENOTTY
-25 Ol�mplig ioctl f�r enheten
-$ ETXTBSY
-26 Programfilen �r upptagen
-$ EFBIG
-27 Filen �r f�r stor
-$ ENOSPC
-28 Inget utrymme kvar p� enheten
-$ ESPIPE
-29 Otill�ten s�kning
-$ EROFS
-30 Skrivskyddat filsystem
-$ EMLINK
-31 F�r m�nga l�nkar
-$ EPIPE
-32 Avbruten kommunikationskanal
-$ EDOM
-33 Numeriskt argument utanf�r dom�nen
-$ ERANGE
-34 Resultatet �r f�r stort
-$ EAGAIN, EWOULDBLOCK
-35 Resursen �r tillf�lligt otillg�nglig
-$ EINPROGRESS
-36 Operationen �r ig�ng
-$ EALREADY
-37 Operationen �r redan ig�ng
-$ ENOTSOCK
-38 Sockeloperation p� icke-sockel
-$ EDESTADDRREQ
-39 Destinationsadress erfordras
-$ EMSGSIZE
-40 F�r l�ngt meddelande
-$ EPROTOTYPE
-41 Fel protokolltyp f�r sockeln
-$ ENOPROTOOPT
-42 Protokollet otillg�ngligt
-$ EPROTONOSUPPORT
-43 Protokollet �r ej underst�tt
-$ ESOCKTNOSUPPORT
-44 Sockeltypen �r ej underst�dd
-$ EOPNOTSUPP
-45 Operationen �r ej underst�dd
-$ EPFNOSUPPORT
-46 Protokollfamiljen �r ej underst�dd
-$ EAFNOSUPPORT
-47 Adressfamiljen �r ej underst�dd av protokollfamiljen
-$ EADDRINUSE
-48 Adressen �r upptagen
-$ EADDRNOTAVAIL
-49 Kan ej tilldela den beg�rda adressen
-$ ENETDOWN
-50 N�tverket fungerar inte
-$ ENETUNREACH
-51 N�tverket �r ej kontaktbart
-$ ENETRESET
-52 N�tverket tappade kontakten vid �terst�llningen
-$ ECONNABORTED
-53 Mjukvara orsakade nedkoppling
-$ ECONNRESET
-54 Motparten avbr�t uppkopplingen
-$ ENOBUFS
-55 Inget buffertutrymme tillg�ngligt
-$ EISCONN
-56 Sockeln �r redan uppkopplad
-$ ENOTCONN
-57 Sockeln �r ej uppkopplad
-$ ESHUTDOWN
-58 Kan ej s�nda efter att sockeln nedkopplats
-$ ETOOMANYREFS
-59 F�r m�nga referenser: kan inte delas
-$ ETIMEDOUT
-60 Uppkopplingstiden tog slut
-$ ECONNREFUSED
-61 Uppkopplingen nekad
-$ ELOOP
-62 F�r m�nga niv�er av symboliska l�nkar
-$ ENAMETOOLONG
-63 Alldeles f�r l�ngt filnamn
-$ EHOSTDOWN
-64 V�rddatorn �r nere
-$ EHOSTUNREACH
-65 V�g till v�rddatorn saknas
-$ ENOTEMPTY
-66 Katalogen ej tom
-$ EPROCLIM
-67 F�r m�nga processer
-$ EUSERS
-68 F�r m�nga anv�ndare
-$ EDQUOT
-69 Diskkvot �verskriden
-$ ESTALE
-70 Inaktuellt NFS-filhandtag
-$ EREMOTE
-71 F�r m�nga fj�rrniv�er i s�kv�gen
-$ EBADRPC
-72 Felaktig RPC-struktur
-$ ERPCMISMATCH
-73 Felaktig RPC-version
-$ EPROGUNAVAIL
-74 RPC-programmet otillg�ngligt
-$ EPROGMISMATCH
-75 Fel programversion
-$ EPROCUNAVAIL
-76 Felaktig procedur f�r programmet
-$ ENOLCK
-77 Inga l�s tillg�ngliga
-$ ENOSYS
-78 Funktionen �r ej implementerad
-$ EFTYPE
-79 Ol�mplig filtyp eller format
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 L�gg p�
-$ SIGINT
-2 Avbryt
-$ SIGQUIT
-3 Avsluta
-$ SIGILL
-4 Olaglig instruktion
-$ SIGTRAP
-5 Sp�r- eller brytpunktsf�lla
-$ SIGABRT
-6 Avslutsf�lla
-$ SIGEMT
-7 Emuleringsf�lla
-$ SIGFPE
-8 Flyttalsavbrott
-$ SIGKILL
-9 Dr�pt
-$ SIGBUS
-10 Bussfel
-$ SIGSEGV
-11 Segmentfel
-$ SIGSYS
-12 Felaktigt systemanrop
-$ SIGPIPE
-13 Avbruten kommunikationskanal
-$ SIGALRM
-14 �ggklocka
-$ SIGTERM
-15 Terminerad
-$ SIGURG
-16 Br�dskande In/Ut-tillst�nd
-$ SIGSTOP
-17 Stoppad (signal)
-$ SIGTSTP
-18 Stoppad
-$ SIGCONT
-19 Forts�tter
-$ SIGCHLD
-20 Barn avslutat
-$ SIGTTIN
-21 Stoppad (terminalinmatning)
-$ SIGTTOU
-22 Stoppad (terminalutmatning)
-$ SIGIO
-23 In- och utmatning m�jlig
-$ SIGXCPU
-24 Cputidsgr�nsen �verskriden
-$ SIGXFSZ
-25 Filstorleksgr�nsen �verskriden
-$ SIGVTALRM
-26 Virtuella �ggklockan ringde
-$ SIGPROF
-27 Profilerings�ggklockan ringde
-$ SIGWINCH
-28 F�nsterstorleken �ndras
-$ SIGINFO
-29 Informationsf�rfr�gan
-$ SIGUSR1
-30 Anv�ndardefinierad signal 1
-$ SIGUSR2
-31 Anv�ndardefinierad signal 2
-$ SIGPWR
-32 Kraftbortfall/omstart
diff --git a/lib/libc_bsd/nls/uk_UA.UTF-8.msg b/lib/libc_bsd/nls/uk_UA.UTF-8.msg
deleted file mode 100644
index 082c3a5..0000000
--- a/lib/libc_bsd/nls/uk_UA.UTF-8.msg
+++ /dev/null
@@ -1,259 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/uk_UA.UTF-8.msg 199044 2009-11-08 11:55:03Z gabor $
-$
-$ Message catalog for uk_UA.UTF-8 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 Операція не дозволена
-$ ENOENT
-2 Немає такого файлу або каталогу
-$ ESRCH
-3 Немає такого процесу
-$ EINTR
-4 Перервано виклик функції
-$ EIO
-5 Помилка вводу-виводу
-$ ENXIO
-6 Немає такого пристрою або адреси
-$ E2BIG
-7 Перелік аргументів надто довгий
-$ ENOEXEC
-8 Помилка формату виконуваного файлу
-$ EBADF
-9 Невірний дескриптор файлу
-$ ECHILD
-10 Немає дочірнього процесу
-$ EDEADLK
-11 Уникнуто взаємне блокування ресурсів
-$ ENOMEM
-12 Не достатньо пам'яті
-$ EACCES
-13 Відмова у доступі
-$ EFAULT
-14 Невірна адреса
-$ ENOTBLK
-15 Потрібен блочний пристрій
-$ EBUSY
-16 Ресурс зайнятий
-$ EEXIST
-17 Файл вже існує
-$ EXDEV
-18 Посилання за межі пристрою
-$ ENODEV
-19 Немає такого пристрою
-$ ENOTDIR
-20 Це не каталог
-$ EISDIR
-21 Це каталог
-$ EINVAL
-22 Недозволений аргумент
-$ ENFILE
-23 Забагато відкритих файлів у системі
-$ EMFILE
-24 Забагато відкритих файлів
-$ ENOTTY
-25 Це не термінал
-$ ETXTBSY
-26 Текстовий файл зайнятий
-$ EFBIG
-27 Файл надто великий
-$ ENOSPC
-28 Не залишилось місця на пристрої
-$ ESPIPE
-29 Недозволене позиціонування
-$ EROFS
-30 Файлова система лише для читання
-$ EMLINK
-31 Забагато посилань
-$ EPIPE
-32 Канал зруйновано
-$ EDOM
-33 Помилка області визначення
-$ ERANGE
-34 Результат надто великий
-$ EAGAIN, EWOULDBLOCK
-35 Ресурс тимчасово не доступний
-$ EINPROGRESS
-36 Операція у процесі виконання
-$ EALREADY
-37 Операція вже виконується
-$ ENOTSOCK
-38 Це не сокет
-$ EDESTADDRREQ
-39 Необхідна адреса призначення
-$ EMSGSIZE
-40 Повідомлення надто довге
-$ EPROTOTYPE
-41 Помилковий тип протоколу для сокету
-$ ENOPROTOOPT
-42 Немає такого протоколу
-$ EPROTONOSUPPORT
-43 Протокол не підтримується
-$ ESOCKTNOSUPPORT
-44 Цей тип сокету не підтримується
-$ EOPNOTSUPP
-45 Операція не підтримується
-$ EPFNOSUPPORT
-46 Родина протоколів не підтримується
-$ EAFNOSUPPORT
-47 Родина адрес не підтримується протоколом
-$ EADDRINUSE
-48 Адреса вже використовується
-$ EADDRNOTAVAIL
-49 Адреса недосяжна
-$ ENETDOWN
-50 Мережа не працює
-$ ENETUNREACH
-51 Мережа недосяжна
-$ ENETRESET
-52 З'єднання припинено мережею
-$ ECONNABORTED
-53 З'єднання припинено
-$ ECONNRESET
-54 З'єднання припинено протилежною стороною
-$ ENOBUFS
-55 Немає вільних буферів
-$ EISCONN
-56 Сокет вже під'єднано
-$ ENOTCONN
-57 Сокет не під'єднано
-$ ESHUTDOWN
-58 Не можу відіслати після закриття сокету протилежною стороною
-$ ETOOMANYREFS
-59 Забагато посилань: не можу з'єднати
-$ ETIMEDOUT
-60 Вийшов ліміт часу для з'єднання
-$ ECONNREFUSED
-61 Відмова у з'єднанні
-$ ELOOP
-62 Забагато рівнів символічних посилань
-$ ENAMETOOLONG
-63 Ім'я файлу надто довге
-$ EHOSTDOWN
-64 Хост не працює
-$ EHOSTUNREACH
-65 Хост недосяжний
-$ ENOTEMPTY
-66 Каталог не порожній
-$ EPROCLIM
-67 Забагато процесів
-$ EUSERS
-68 Забагато користувачів
-$ EDQUOT
-69 Перевищена дискова квота
-$ ESTALE
-70 Застарілий дескриптор файлу NFS
-$ EREMOTE
-71 Віддалений об'єкт
-$ EBADRPC
-72 Погана структура RPC
-$ ERPCMISMATCH
-73 Невірна версія RPC
-$ EPROGUNAVAIL
-74 Програма RPC недосяжна
-$ EPROGMISMATCH
-75 Невірна версія програми
-$ EPROCUNAVAIL
-76 Погана процедура для програми
-$ ENOLCK
-77 Блокування не доступне
-$ ENOSYS
-78 Функцію не реалізовано
-$ EFTYPE
-79 Непридатний тип чи формат файлу
-$ EAUTH
-80 Помилка аутентифікації
-$ ENEEDAUTH
-81 Потрібна аутентифікація
-$ EIDRM
-82 Ідентифікатор вилучено
-$ ENOMSG
-83 Немає повідомлення бажаного типу
-$ EOVERFLOW
-84 Завелике значення для цього типу даних
-$ ECANCELED
-85 Операцію скасовано
-$ EILSEQ
-86 Недозволена послідовність байтів
-$ ENOATTR
-87 Атрибут не знайдено
-$ EDOOFUS
-88 Помилка програмування
-$ EBADMSG
-89 Поганий формат повідомлення
-$ EMULTIHOP XXX
-90 Спроба мултіхопу
-$ ENOLINK
-91 Мережовий канал розірвано
-$ EPROTO
-92 Помилка протоколу
-$ ENOTCAPABLE
-93 Можливості недостатні
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 Відключення
-$ SIGINT
-2 Переривання
-$ SIGQUIT
-3 Вихід
-$ SIGILL
-4 Неприпустима інструкція
-$ SIGTRAP
-5 Пастка трасування
-$ SIGABRT
-6 Аварійне завершення
-$ SIGEMT
-7 Перехоплення емульованої інструкції
-$ SIGFPE
-8 Помилка роботи з плаваючою крапкою
-$ SIGKILL
-9 Вбито
-$ SIGBUS
-10 Помилка шини
-$ SIGSEGV
-11 Порушення сегментації
-$ SIGSYS
-12 Поганий системний виклик
-$ SIGPIPE
-13 Канал зруйновано
-$ SIGALRM
-14 Таймер вичерпано
-$ SIGTERM
-15 Завершення
-$ SIGURG
-16 Невідкладний стан на сокеті
-$ SIGSTOP
-17 Призупинено (сигнал)
-$ SIGTSTP
-18 Призупинено
-$ SIGCONT
-19 Продовження роботи
-$ SIGCHLD
-20 Зміна статусу дочірнього процесу
-$ SIGTTIN
-21 Зупинено (ввід з терміналу)
-$ SIGTTOU
-22 Зупинено (вивід на термінал)
-$ SIGIO
-23 Ввід-вивід можливий
-$ SIGXCPU
-24 Перевищено ліміт процесорного часу
-$ SIGXFSZ
-25 Перевищено ліміт максимального розміру файла
-$ SIGVTALRM
-26 Віртуальний таймер вичерпано
-$ SIGPROF
-27 Таймер профілювання вичерпано
-$ SIGWINCH
-28 Розмір вікна змінено
-$ SIGINFO
-29 Запит інформації
-$ SIGUSR1
-30 Сигнал користувача 1
-$ SIGUSR2
-31 Сигнал користувача 2
diff --git a/lib/libc_bsd/nls/zh_CN.GB18030.msg b/lib/libc_bsd/nls/zh_CN.GB18030.msg
deleted file mode 100644
index 68fcb6d..0000000
--- a/lib/libc_bsd/nls/zh_CN.GB18030.msg
+++ /dev/null
@@ -1,297 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/zh_CN.GB18030.msg 244757 2012-12-28 01:23:12Z delphij $
-$
-$ Message catalog for zh_CN.GB18030 locale
-$
-$ Derived from FreeBSD: head/lib/libc/nls/zh_CN.UTF-8.msg 244756 2012-12-28 01:09:30Z delphij
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 ������IJ���
-$ ENOENT
-2 �ļ���Ŀ¼������
-$ ESRCH
-3 ���̲�����
-$ EINTR
-4 ϵͳ������ֹ
-$ EIO
-5 ����/�������
-$ ENXIO
-6 δ���õ��豸
-$ E2BIG
-7 ���������
-$ ENOEXEC
-8 ��ִ���ļ���ʽ����
-$ EBADF
-9 �ļ���������Ч
-$ ECHILD
-10 ָ���ӽ��̲�����
-$ EDEADLK
-11 �˲����ᵼ������
-$ ENOMEM
-12 �޷������ڴ�
-$ EACCES
-13 �ܾ�����
-$ EFAULT
-14 ��Ч��ַ
-$ ENOTBLK
-15 �ò�����Ҫ���豸
-$ EBUSY
-16 �豸ʹ����
-$ EEXIST
-17 �ļ��Ѵ���
-$ EXDEV
-18 ���ӿ��豸
-$ ENODEV
-19 �豸��֧�ִ˲���
-$ ENOTDIR
-20 �����Ŀ¼
-$ EISDIR
-21 ����ΪĿ¼
-$ EINVAL
-22 ������Ч
-$ ENFILE
-23 ϵͳ���ļ�����
-$ EMFILE
-24 ���̴��ļ�����
-$ ENOTTY
-25 ��Ч�豸 ioctl
-$ ETXTBSY
-26 ��ִ���ļ�æ
-$ EFBIG
-27 �ļ�����
-$ ENOSPC
-28 �豸�޿��ÿռ�
-$ ESPIPE
-29 ������ִ�� seek ����
-$ EROFS
-30 �ļ�ϵͳֻ��
-$ EMLINK
-31 �ļ����ӹ���
-$ EPIPE
-32 �ܵ�����ֹ
-$ EDOM
-33 ��ֵ����Խ��
-$ ERANGE
-34 �������
-$ EAGAIN, EWOULDBLOCK
-35 ��Դ��ʱ������
-$ EINPROGRESS
-36 ����������
-$ EALREADY
-37 �����ѿ�ʼ
-$ ENOTSOCK
-38 �����ڷ� socket ��ִ�� socket ����
-$ EDESTADDRREQ
-39 ��ҪĿ�ĵ�ַ
-$ EMSGSIZE
-40 ��Ϣ����
-$ EPROTOTYPE
-41 socketЭ�����ʹ���
-$ ENOPROTOOPT
-42 Э�鲻����
-$ EPROTONOSUPPORT
-43 ��֧�ֵ�Э��
-$ ESOCKTNOSUPPORT
-44 ��֧�ֵ� socket ����
-$ EOPNOTSUPP
-45 ��֧�ֵIJ���
-$ EPFNOSUPPORT
-46 ��֧�ֵ�Э����
-$ EAFNOSUPPORT
-47 Э���岻֧�ֵĵ�ַ��
-$ EADDRINUSE
-48 ��ַ�ѱ�ռ��
-$ EADDRNOTAVAIL
-49 �޷�ָ������ĵ�ַ
-$ ENETDOWN
-50 �����ѹر�
-$ ENETUNREACH
-51 ���粻�ɴ�
-$ ENETRESET
-52 ��λ�����������Ӷ�ʧ
-$ ECONNABORTED
-53 ������µ�������ֹ
-$ ECONNRESET
-54 �Է���λ������
-$ ENOBUFS
-55 �������ռ䲻��
-$ EISCONN
-56 socket ������
-$ ENOTCONN
-57 socket ���
-$ ESHUTDOWN
-58 socket shutdown ֮���޷���������
-$ ETOOMANYREFS
-59 ���������ࣺ�޷�ƴ��
-$ ETIMEDOUT
-60 ������ʱ
-$ ECONNREFUSED
-61 �ܾ�����
-$ ELOOP
-62 �������Ӳ�������
-$ ENAMETOOLONG
-63 �ļ�������
-$ EHOSTDOWN
-64 �����ѹر�
-$ EHOSTUNREACH
-65 û�е�������·��
-$ ENOTEMPTY
-66 Ŀ¼�ǿ�
-$ EPROCLIM
-67 ����������
-$ EUSERS
-68 �û�������
-$ EDQUOT
-69 ���̿ռ�����
-$ ESTALE
-70 NFS �ļ������ʧЧ
-$ EREMOTE
-71 Զ��Ŀ¼��������
-$ EBADRPC
-72 RPC �ṹ��Ч
-$ ERPCMISMATCH
-73 RPC �汾����
-$ EPROGUNAVAIL
-74 RPC ���򲻿���
-$ EPROGMISMATCH
-75 ����汾����
-$ EPROCUNAVAIL
-76 δ�ṩ��Զ�̺���
-$ ENOLCK
-77 ��֧����
-$ ENOSYS
-78 ����δʵ��
-$ EFTYPE
-79 �ļ����ͻ��ʽ��Ч
-$ EAUTH
-80 �����Ч
-$ ENEEDAUTH
-81 ������ƾ��
-$ EIDRM
-82 �ޱ�ʶ��
-$ ENOMSG
-83 ����Ϣ����
-$ EOVERFLOW
-84 ��ֵ���
-$ ECANCELED
-85 ������ȡ��
-$ EILSEQ
-86 ��Ч�ַ�����
-$ ENOATTR
-87 ����չ����
-$ EDOOFUS
-88 ������ƴ���
-$ EBADMSG
-89 ��Ч��Ϣ
-$ EMULTIHOP
-90 Multihop attempted
-$ ENOLINK
-91 Link has been severed
-$ EPROTO
-92 �����
-$ ENOTCAPABLE
-93 Ȩ�ܲ���
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 �ն���·�Ҷ�
-$ SIGINT
-2 �ж�
-$ SIGQUIT
-3 �˳�
-$ SIGILL
-4 ��Чָ��
-$ SIGTRAP
-5 ����/BPT ����
-$ SIGABRT
-6 ��ֹ����
-$ SIGEMT
-7 EMT ����
-$ SIGFPE
-8 �����쳣
-$ SIGKILL
-9 ǿ����ֹ����
-$ SIGBUS
-10 ϵͳ�ڴ����Խ��
-$ SIGSEGV
-11 �ڴ����Խ��
-$ SIGSYS
-12 ��Чϵͳ����
-$ SIGPIPE
-13 д�ܵ�ʱ��ȡ�߲�����
-$ SIGALRM
-14 ʵʱ����ʱ����
-$ SIGTERM
-15 ��ֹ
-$ SIGURG
-16 ����������� I/O ����״��
-$ SIGSTOP
-17 ���� (�ź�)
-$ SIGTSTP
-18 ����
-$ SIGCONT
-19 ��������
-$ SIGCHLD
-20 �ӽ�����ֹ
-$ SIGTTIN
-21 TTY ��������
-$ SIGTTOU
-22 TTY �������
-$ SIGIO
-23 I/O ����
-$ SIGXCPU
-24 CPU ʹ��ʱ�����
-$ SIGXFSZ
-25 �ļ��ߴ����
-$ SIGVTALRM
-26 ���⵹��ʱ����
-$ SIGPROF
-27 ��������ʱ����
-$ SIGWINCH
-28 ���ڳߴ�仯
-$ SIGINFO
-29 ������Ϣ
-$ SIGUSR1
-30 �û��Զ����ź� 1
-$ SIGUSR2
-31 �û��Զ����ź� 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsolete)
-1 ������ʹ���˲�֧�ֵĵ�ַ����
-$ EAI_AGAIN
-2 ��ʱ�޷���������
-$ EAI_BADFLAGS
-3 ��Ч�� ai_flags ֵ
-$ EAI_FAIL
-4 ��������ʱ�����޷��ָ��Ĵ���
-$ EAI_FAMILY
-5 ��֧�ֵĵ�ַ��Ϣ����
-$ EAI_MEMORY
-6 �ڴ����ʧ��
-$ 7 (obsolete)
-7 ��������������ĵ�ַ
-$ EAI_NONAME
-8 δ֪���������������
-$ EAI_SERVICE
-9 �׽������Ͳ�֧�ִ˷�����
-$ EAI_SOCKTYPE
-10 ��֧�ֵ��׽�������
-$ EAI_SYSTEM
-11 ϵͳ���÷����� errno ����
-$ EAI_BADHINTS
-12 ��Ч��ʾ����
-$ EAI_PROTOCOL
-13 δ֪Э��
-$ EAI_OVERFLOW
-14 �����������
-$ 0
-32766 �ɹ�
-$ NL_MSGMAX
-32767 δ֪����
diff --git a/lib/libc_bsd/nls/zh_CN.GB2312.msg b/lib/libc_bsd/nls/zh_CN.GB2312.msg
deleted file mode 100644
index 887cade..0000000
--- a/lib/libc_bsd/nls/zh_CN.GB2312.msg
+++ /dev/null
@@ -1,297 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/zh_CN.GB2312.msg 244757 2012-12-28 01:23:12Z delphij $
-$
-$ Message catalog for zh_CN.GB2312 locale
-$
-$ Derived from FreeBSD: head/lib/libc/nls/zh_CN.UTF-8.msg 244756 2012-12-28 01:09:30Z delphij
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 ������IJ���
-$ ENOENT
-2 �ļ���Ŀ¼������
-$ ESRCH
-3 ���̲�����
-$ EINTR
-4 ϵͳ������ֹ
-$ EIO
-5 ����/�������
-$ ENXIO
-6 δ���õ��豸
-$ E2BIG
-7 ���������
-$ ENOEXEC
-8 ��ִ���ļ���ʽ����
-$ EBADF
-9 �ļ���������Ч
-$ ECHILD
-10 ָ���ӽ��̲�����
-$ EDEADLK
-11 �˲����ᵼ������
-$ ENOMEM
-12 �޷������ڴ�
-$ EACCES
-13 �ܾ�����
-$ EFAULT
-14 ��Ч��ַ
-$ ENOTBLK
-15 �ò�����Ҫ���豸
-$ EBUSY
-16 �豸ʹ����
-$ EEXIST
-17 �ļ��Ѵ���
-$ EXDEV
-18 ���ӿ��豸
-$ ENODEV
-19 �豸��֧�ִ˲���
-$ ENOTDIR
-20 �����Ŀ¼
-$ EISDIR
-21 ����ΪĿ¼
-$ EINVAL
-22 ������Ч
-$ ENFILE
-23 ϵͳ���ļ�����
-$ EMFILE
-24 ���̴��ļ�����
-$ ENOTTY
-25 ��Ч�豸 ioctl
-$ ETXTBSY
-26 ��ִ���ļ�æ
-$ EFBIG
-27 �ļ�����
-$ ENOSPC
-28 �豸�޿��ÿռ�
-$ ESPIPE
-29 ������ִ�� seek ����
-$ EROFS
-30 �ļ�ϵͳֻ��
-$ EMLINK
-31 �ļ����ӹ���
-$ EPIPE
-32 �ܵ�����ֹ
-$ EDOM
-33 ��ֵ����Խ��
-$ ERANGE
-34 �������
-$ EAGAIN, EWOULDBLOCK
-35 ��Դ��ʱ������
-$ EINPROGRESS
-36 ����������
-$ EALREADY
-37 �����ѿ�ʼ
-$ ENOTSOCK
-38 �����ڷ� socket ��ִ�� socket ����
-$ EDESTADDRREQ
-39 ��ҪĿ�ĵ�ַ
-$ EMSGSIZE
-40 ��Ϣ����
-$ EPROTOTYPE
-41 socketЭ�����ʹ���
-$ ENOPROTOOPT
-42 Э�鲻����
-$ EPROTONOSUPPORT
-43 ��֧�ֵ�Э��
-$ ESOCKTNOSUPPORT
-44 ��֧�ֵ� socket ����
-$ EOPNOTSUPP
-45 ��֧�ֵIJ���
-$ EPFNOSUPPORT
-46 ��֧�ֵ�Э����
-$ EAFNOSUPPORT
-47 Э���岻֧�ֵĵ�ַ��
-$ EADDRINUSE
-48 ��ַ�ѱ�ռ��
-$ EADDRNOTAVAIL
-49 �޷�ָ������ĵ�ַ
-$ ENETDOWN
-50 �����ѹر�
-$ ENETUNREACH
-51 ���粻�ɴ�
-$ ENETRESET
-52 ��λ�����������Ӷ�ʧ
-$ ECONNABORTED
-53 ������µ�������ֹ
-$ ECONNRESET
-54 �Է���λ������
-$ ENOBUFS
-55 �������ռ䲻��
-$ EISCONN
-56 socket ������
-$ ENOTCONN
-57 socket ���
-$ ESHUTDOWN
-58 socket shutdown ֮���޷���������
-$ ETOOMANYREFS
-59 ���������ࣺ�޷�ƴ��
-$ ETIMEDOUT
-60 ������ʱ
-$ ECONNREFUSED
-61 �ܾ�����
-$ ELOOP
-62 �������Ӳ�������
-$ ENAMETOOLONG
-63 �ļ�������
-$ EHOSTDOWN
-64 �����ѹر�
-$ EHOSTUNREACH
-65 û�е�������·��
-$ ENOTEMPTY
-66 Ŀ¼�ǿ�
-$ EPROCLIM
-67 ����������
-$ EUSERS
-68 �û�������
-$ EDQUOT
-69 ���̿ռ�����
-$ ESTALE
-70 NFS �ļ������ʧЧ
-$ EREMOTE
-71 Զ��Ŀ¼��������
-$ EBADRPC
-72 RPC �ṹ��Ч
-$ ERPCMISMATCH
-73 RPC �汾����
-$ EPROGUNAVAIL
-74 RPC ���򲻿���
-$ EPROGMISMATCH
-75 ����汾����
-$ EPROCUNAVAIL
-76 δ�ṩ��Զ�̺���
-$ ENOLCK
-77 ��֧����
-$ ENOSYS
-78 ����δʵ��
-$ EFTYPE
-79 �ļ����ͻ��ʽ��Ч
-$ EAUTH
-80 �����Ч
-$ ENEEDAUTH
-81 ������ƾ��
-$ EIDRM
-82 �ޱ�ʶ��
-$ ENOMSG
-83 ����Ϣ����
-$ EOVERFLOW
-84 ��ֵ���
-$ ECANCELED
-85 ������ȡ��
-$ EILSEQ
-86 ��Ч�ַ�����
-$ ENOATTR
-87 ����չ����
-$ EDOOFUS
-88 ������ƴ���
-$ EBADMSG
-89 ��Ч��Ϣ
-$ EMULTIHOP
-90 Multihop attempted
-$ ENOLINK
-91 Link has been severed
-$ EPROTO
-92 �����
-$ ENOTCAPABLE
-93 Ȩ�ܲ���
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 �ն���·�Ҷ�
-$ SIGINT
-2 �ж�
-$ SIGQUIT
-3 �˳�
-$ SIGILL
-4 ��Чָ��
-$ SIGTRAP
-5 ����/BPT ����
-$ SIGABRT
-6 ��ֹ����
-$ SIGEMT
-7 EMT ����
-$ SIGFPE
-8 �����쳣
-$ SIGKILL
-9 ǿ����ֹ����
-$ SIGBUS
-10 ϵͳ�ڴ����Խ��
-$ SIGSEGV
-11 �ڴ����Խ��
-$ SIGSYS
-12 ��Чϵͳ����
-$ SIGPIPE
-13 д�ܵ�ʱ��ȡ�߲�����
-$ SIGALRM
-14 ʵʱ����ʱ����
-$ SIGTERM
-15 ��ֹ
-$ SIGURG
-16 ����������� I/O ����״��
-$ SIGSTOP
-17 ���� (�ź�)
-$ SIGTSTP
-18 ����
-$ SIGCONT
-19 ��������
-$ SIGCHLD
-20 �ӽ�����ֹ
-$ SIGTTIN
-21 TTY ��������
-$ SIGTTOU
-22 TTY �������
-$ SIGIO
-23 I/O ����
-$ SIGXCPU
-24 CPU ʹ��ʱ�����
-$ SIGXFSZ
-25 �ļ��ߴ����
-$ SIGVTALRM
-26 ���⵹��ʱ����
-$ SIGPROF
-27 ��������ʱ����
-$ SIGWINCH
-28 ���ڳߴ�仯
-$ SIGINFO
-29 ������Ϣ
-$ SIGUSR1
-30 �û��Զ����ź� 1
-$ SIGUSR2
-31 �û��Զ����ź� 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsolete)
-1 ������ʹ���˲�֧�ֵĵ�ַ����
-$ EAI_AGAIN
-2 ��ʱ�޷���������
-$ EAI_BADFLAGS
-3 ��Ч�� ai_flags ֵ
-$ EAI_FAIL
-4 ��������ʱ�����޷��ָ��Ĵ���
-$ EAI_FAMILY
-5 ��֧�ֵĵ�ַ��Ϣ����
-$ EAI_MEMORY
-6 �ڴ����ʧ��
-$ 7 (obsolete)
-7 ��������������ĵ�ַ
-$ EAI_NONAME
-8 δ֪���������������
-$ EAI_SERVICE
-9 �׽������Ͳ�֧�ִ˷�����
-$ EAI_SOCKTYPE
-10 ��֧�ֵ��׽�������
-$ EAI_SYSTEM
-11 ϵͳ���÷����� errno ����
-$ EAI_BADHINTS
-12 ��Ч��ʾ����
-$ EAI_PROTOCOL
-13 δ֪Э��
-$ EAI_OVERFLOW
-14 �����������
-$ 0
-32766 �ɹ�
-$ NL_MSGMAX
-32767 δ֪����
diff --git a/lib/libc_bsd/nls/zh_CN.UTF-8.msg b/lib/libc_bsd/nls/zh_CN.UTF-8.msg
deleted file mode 100644
index 1a37f32..0000000
--- a/lib/libc_bsd/nls/zh_CN.UTF-8.msg
+++ /dev/null
@@ -1,295 +0,0 @@
-$ $FreeBSD: releng/10.2/lib/libc/nls/zh_CN.UTF-8.msg 244756 2012-12-28 01:09:30Z delphij $
-$
-$ Message catalog for zh_CN.UTF-8 locale
-$
-$ strerror() support catalog
-$
-$set 1
-$ EPERM
-1 不允许的操作
-$ ENOENT
-2 文件或目录不存在
-$ ESRCH
-3 进程不存在
-$ EINTR
-4 系统调用中止
-$ EIO
-5 输入/输出错误
-$ ENXIO
-6 未配置的设备
-$ E2BIG
-7 参数表过长
-$ ENOEXEC
-8 可执行文件格式错误
-$ EBADF
-9 文件描述符无效
-$ ECHILD
-10 指定子进程不存在
-$ EDEADLK
-11 此操作会导致死锁
-$ ENOMEM
-12 无法分配内存
-$ EACCES
-13 拒绝访问
-$ EFAULT
-14 无效地址
-$ ENOTBLK
-15 该操作需要块设备
-$ EBUSY
-16 设备使用中
-$ EEXIST
-17 文件已存在
-$ EXDEV
-18 链接跨设备
-$ ENODEV
-19 设备不支持此操作
-$ ENOTDIR
-20 对象非目录
-$ EISDIR
-21 对象为目录
-$ EINVAL
-22 参数无效
-$ ENFILE
-23 系统打开文件过多
-$ EMFILE
-24 进程打开文件过多
-$ ENOTTY
-25 无效设备 ioctl
-$ ETXTBSY
-26 可执行文件忙
-$ EFBIG
-27 文件过大
-$ ENOSPC
-28 设备无可用空间
-$ ESPIPE
-29 不允许执行 seek 操作
-$ EROFS
-30 文件系统只读
-$ EMLINK
-31 文件链接过多
-$ EPIPE
-32 管道已中止
-$ EDOM
-33 数值参数越界
-$ ERANGE
-34 结果过大
-$ EAGAIN, EWOULDBLOCK
-35 资源暂时不可用
-$ EINPROGRESS
-36 操作进行中
-$ EALREADY
-37 操作已开始
-$ ENOTSOCK
-38 尝试在非 socket 上执行 socket 操作
-$ EDESTADDRREQ
-39 需要目的地址
-$ EMSGSIZE
-40 消息过长
-$ EPROTOTYPE
-41 socket协议类型错误
-$ ENOPROTOOPT
-42 协议不可用
-$ EPROTONOSUPPORT
-43 不支持的协议
-$ ESOCKTNOSUPPORT
-44 不支持的 socket 类型
-$ EOPNOTSUPP
-45 不支持的操作
-$ EPFNOSUPPORT
-46 不支持的协议族
-$ EAFNOSUPPORT
-47 协议族不支持的地址族
-$ EADDRINUSE
-48 地址已被占用
-$ EADDRNOTAVAIL
-49 无法指定请求的地址
-$ ENETDOWN
-50 网络已关闭
-$ ENETUNREACH
-51 网络不可达
-$ ENETRESET
-52 复位导致网络连接丢失
-$ ECONNABORTED
-53 软件导致的连接中止
-$ ECONNRESET
-54 对方复位了连接
-$ ENOBUFS
-55 缓冲区空间不足
-$ EISCONN
-56 socket 已连接
-$ ENOTCONN
-57 socket 未连接
-$ ESHUTDOWN
-58 socket shutdown 之后无法发送数据
-$ ETOOMANYREFS
-59 引用数过多：无法拼接
-$ ETIMEDOUT
-60 操作超时
-$ ECONNREFUSED
-61 拒绝连接
-$ ELOOP
-62 符号链接层数过多
-$ ENAMETOOLONG
-63 文件名过长
-$ EHOSTDOWN
-64 主机已关闭
-$ EHOSTUNREACH
-65 没有到主机的路由
-$ ENOTEMPTY
-66 目录非空
-$ EPROCLIM
-67 进程数超限
-$ EUSERS
-68 用户数超限
-$ EDQUOT
-69 磁盘空间配额超限
-$ ESTALE
-70 NFS 文件句柄已失效
-$ EREMOTE
-71 远程目录层数过多
-$ EBADRPC
-72 RPC 结构无效
-$ ERPCMISMATCH
-73 RPC 版本错误
-$ EPROGUNAVAIL
-74 RPC 程序不可用
-$ EPROGMISMATCH
-75 程序版本错误
-$ EPROCUNAVAIL
-76 未提供的远程函数
-$ ENOLCK
-77 不支持锁
-$ ENOSYS
-78 功能未实现
-$ EFTYPE
-79 文件类型或格式无效
-$ EAUTH
-80 身份无效
-$ ENEEDAUTH
-81 无信任凭据
-$ EIDRM
-82 无标识符
-$ ENOMSG
-83 无消息类型
-$ EOVERFLOW
-84 数值溢出
-$ ECANCELED
-85 操作已取消
-$ EILSEQ
-86 无效字符序列
-$ ENOATTR
-87 无扩展属性
-$ EDOOFUS
-88 程序设计错误
-$ EBADMSG
-89 无效消息
-$ EMULTIHOP
-90 Multihop attempted
-$ ENOLINK
-91 Link has been severed
-$ EPROTO
-92 协议错误
-$ ENOTCAPABLE
-93 权能不足
-$
-$ strsignal() support catalog
-$
-$set 2
-$ SIGHUP
-1 终端线路挂断
-$ SIGINT
-2 中断
-$ SIGQUIT
-3 退出
-$ SIGILL
-4 无效指令
-$ SIGTRAP
-5 跟踪/BPT 陷阱
-$ SIGABRT
-6 终止陷阱
-$ SIGEMT
-7 EMT 陷阱
-$ SIGFPE
-8 浮点异常
-$ SIGKILL
-9 强制终止进程
-$ SIGBUS
-10 系统内存访问越界
-$ SIGSEGV
-11 内存访问越界
-$ SIGSYS
-12 无效系统调用
-$ SIGPIPE
-13 写管道时读取者不存在
-$ SIGALRM
-14 实时倒计时到期
-$ SIGTERM
-15 终止
-$ SIGURG
-16 需立即处理的 I/O 紧急状况
-$ SIGSTOP
-17 挂起 (信号)
-$ SIGTSTP
-18 挂起
-$ SIGCONT
-19 继续运行
-$ SIGCHLD
-20 子进程终止
-$ SIGTTIN
-21 TTY 输入阻塞
-$ SIGTTOU
-22 TTY 输出阻塞
-$ SIGIO
-23 I/O 就绪
-$ SIGXCPU
-24 CPU 使用时间过长
-$ SIGXFSZ
-25 文件尺寸过大
-$ SIGVTALRM
-26 虚拟倒计时到期
-$ SIGPROF
-27 剖析倒计时到期
-$ SIGWINCH
-28 窗口尺寸变化
-$ SIGINFO
-29 请求信息
-$ SIGUSR1
-30 用户自定义信号 1
-$ SIGUSR2
-31 用户自定义信号 2
-$
-$ gai_strerror() support catalog
-$
-$set 3
-$ 1 (obsolete)
-1 主机名使用了不支持的地址类型
-$ EAI_AGAIN
-2 暂时无法解析名称
-$ EAI_BADFLAGS
-3 无效的 ai_flags 值
-$ EAI_FAIL
-4 解析名称时出现无法恢复的错误
-$ EAI_FAMILY
-5 不支持的地址信息类型
-$ EAI_MEMORY
-6 内存分配失败
-$ 7 (obsolete)
-7 主机名无相关联的地址
-$ EAI_NONAME
-8 未知的主机名或服务名
-$ EAI_SERVICE
-9 套接字类型不支持此服务名
-$ EAI_SOCKTYPE
-10 不支持的套接字类型
-$ EAI_SYSTEM
-11 系统调用返回了 errno 错误
-$ EAI_BADHINTS
-12 无效提示参数
-$ EAI_PROTOCOL
-13 未知协议
-$ EAI_OVERFLOW
-14 参数缓冲溢出
-$ 0
-32766 成功
-$ NL_MSGMAX
-32767 未知错误
diff --git a/lib/libc_bsd/posix1e/Makefile.inc b/lib/libc_bsd/posix1e/Makefile.inc
deleted file mode 100644
index b09921e..0000000
--- a/lib/libc_bsd/posix1e/Makefile.inc
+++ /dev/null
@@ -1,124 +0,0 @@
-Makefile.incl 209147 2010-06-14 02:26:13Z kientzle $
-
-.PATH: ${.CURDIR}/posix1e
-
-CFLAGS+=-D_ACL_PRIVATE
-
-# Copy kern/subr_acl_nfs4.c to the libc object directory.
-subr_acl_nfs4.c: ${.CURDIR}/../../sys/kern/subr_acl_nfs4.c
-	cat ${.ALLSRC} > ${.TARGET}
-
-SRCS+=	acl_branding.c			\
-	acl_calc_mask.c			\
-	acl_copy.c			\
-	acl_compat.c			\
-	acl_delete.c			\
-	acl_delete_entry.c		\
-	acl_entry.c			\
-	acl_flag.c			\
-	acl_free.c			\
-	acl_from_text.c			\
-	acl_from_text_nfs4.c		\
-	acl_get.c			\
-	acl_id_to_name.c		\
-	acl_init.c			\
-	acl_perm.c			\
-	acl_set.c			\
-	acl_strip.c			\
-	acl_support.c			\
-	acl_support_nfs4.c		\
-	acl_to_text.c			\
-	acl_to_text_nfs4.c		\
-	acl_valid.c			\
-	extattr.c			\
-	mac.c				\
-	mac_exec.c			\
-	mac_get.c			\
-	mac_set.c			\
-	subr_acl_nfs4.c
-
-SYM_MAPS+=${.CURDIR}/posix1e/Symbol.map
-
-MAN+=	acl.3				\
-	acl_add_flag_np.3		\
-	acl_add_perm.3			\
-	acl_calc_mask.3			\
-	acl_clear_flags_np.3		\
-	acl_clear_perms.3		\
-	acl_copy_entry.3		\
-	acl_create_entry.3		\
-	acl_delete.3			\
-	acl_delete_entry.3		\
-	acl_delete_flag_np.3		\
-	acl_delete_perm.3		\
-	acl_dup.3			\
-	acl_free.3			\
-	acl_from_text.3			\
-	acl_get.3			\
-	acl_get_brand_np.3		\
-	acl_get_entry.3			\
-	acl_get_entry_type_np.3		\
-	acl_get_flagset_np.3		\
-	acl_get_flag_np.3		\
-	acl_get_permset.3		\
-	acl_get_perm_np.3		\
-	acl_get_qualifier.3		\
-	acl_get_tag_type.3		\
-	acl_init.3			\
-	acl_is_trivial_np.3		\
-	acl_set.3			\
-	acl_set_entry_type_np.3		\
-	acl_set_flagset_np.3		\
-	acl_set_permset.3		\
-	acl_set_qualifier.3		\
-	acl_set_tag_type.3		\
-	acl_strip_np.3			\
-	acl_to_text.3			\
-	acl_valid.3			\
-	extattr.3			\
-	mac.3				\
-	mac.conf.5			\
-	mac_free.3			\
-	mac_is_present.3		\
-	mac_get.3			\
-	mac_prepare.3			\
-	mac_set.3			\
-	mac_text.3			\
-	posix1e.3
-
-MLINKS+=acl_create_entry.3 acl_create_entry_np.3\
-	acl_delete.3 acl_delete_def_file.3	\
-	acl_delete.3 acl_delete_file_np.3	\
-	acl_delete.3 acl_delete_fd_np.3		\
-	acl_delete_entry.3 acl_delete_entry_np.3\
-	acl_get.3 acl_get_file.3		\
-	acl_get.3 acl_get_fd.3			\
-	acl_get.3 acl_get_fd_np.3		\
-	acl_get.3 acl_get_link_np.3		\
-	acl_set.3 acl_set_file.3		\
-	acl_set.3 acl_set_fd.3			\
-	acl_set.3 acl_set_fd_np.3		\
-	acl_set.3 acl_set_link_np.3		\
-	acl_to_text.3 acl_to_text_np.3		\
-	acl_valid.3 acl_valid_file_np.3		\
-	acl_valid.3 acl_valid_fd_np.3		\
-	extattr.3 extattr_namespace_to_string.3	\
-	extattr.3 extattr_string_to_namespace.3 \
-	mac_get.3 mac_get_fd.3			\
-	mac_get.3 mac_get_file.3		\
-	mac_get.3 mac_get_link.3		\
-	mac_get.3 mac_get_peer.3		\
-	mac_get.3 mac_get_pid.3			\
-	mac_get.3 mac_get_proc.3		\
-	mac_prepare.3 mac_prepare_file_label.3	\
-	mac_prepare.3 mac_prepare_ifnet_label.3	\
-	mac_prepare.3 mac_prepare_process_label.3	\
-	mac_prepare.3 mac_prepare_type.3	\
-	mac_set.3 mac_set_fd.3			\
-	mac_set.3 mac_set_file.3		\
-	mac_set.3 mac_set_link.3		\
-	mac_set.3 mac_set_proc.3		\
-	mac_text.3 mac_from_text.3		\
-	mac_text.3 mac_to_text.3
-
-CLEANFILES+=	subr_acl_nfs4.c
diff --git a/lib/libc_bsd/posix1e/Symbol.map b/lib/libc_bsd/posix1e/Symbol.map
deleted file mode 100644
index 854e350..0000000
--- a/lib/libc_bsd/posix1e/Symbol.map
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/posix1e/Symbol.map 194955 2009-06-25 12:46:59Z trasz $
- */
-
-FBSD_1.0 {
-	acl_calc_mask;
-	acl_copy_entry;
-	acl_copy_ext;
-	acl_copy_int;
-	acl_delete_def_file;
-	acl_delete_def_link_np;
-	acl_delete_file_np;
-	acl_delete_link_np;
-	acl_delete_fd_np;
-	acl_delete_entry;
-	acl_create_entry;
-	acl_get_entry;
-	acl_free;
-	acl_from_text;
-	acl_get_file;
-	acl_get_link_np;
-	acl_get_fd;
-	acl_get_fd_np;
-	acl_get_permset;
-	acl_get_qualifier;
-	acl_get_tag_type;
-	acl_init;
-	acl_dup;
-	acl_clear_perms;
-	acl_set_file;
-	acl_set_link_np;
-	acl_set_fd;
-	acl_set_fd_np;
-	acl_set_permset;
-	acl_set_qualifier;
-	acl_set_tag_type;
-	acl_to_text;
-	acl_valid;
-	acl_valid_file_np;
-	acl_valid_link_np;
-	acl_valid_fd_np;
-	extattr_namespace_to_string;
-	extattr_string_to_namespace;
-	mac_reload;
-	mac_free;
-	mac_from_text;
-	mac_to_text;
-	mac_prepare;
-	mac_prepare_type;
-	mac_prepare_ifnet_label;
-	mac_prepare_file_label;
-	mac_prepare_packet_label;
-	mac_prepare_process_label;
-	mac_is_present;
-	mac_execve;
-	mac_get_fd;
-	mac_get_file;
-	mac_get_link;
-	mac_get_peer;
-	mac_get_pid;
-	mac_get_proc;
-	mac_set_fd;
-	mac_set_file;
-	mac_set_link;
-	mac_set_proc;
-};
-
-FBSD_1.1 {
-	acl_add_flag_np;
-	acl_add_perm;
-	acl_clear_flags_np;
-	acl_create_entry_np;
-	acl_delete_entry_np;
-	acl_delete_flag_np;
-	acl_delete_perm;
-	acl_get_brand_np;
-	acl_get_entry_type_np;
-	acl_get_flag_np;
-	acl_get_flagset_np;
-	acl_get_perm_np;
-	acl_is_trivial_np;
-	acl_set_entry_type_np;
-	acl_set_flagset_np;
-	acl_strip_np;
-	acl_to_text_np;
-};
diff --git a/lib/libc_bsd/posix1e/acl.3 b/lib/libc_bsd/posix1e/acl.3
deleted file mode 100644
index 4490d10..0000000
--- a/lib/libc_bsd/posix1e/acl.3
+++ /dev/null
@@ -1,307 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl.3 275254 2014-11-29 15:51:48Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL 3
-.Os
-.Sh NAME
-.Nm acl
-.Nd introduction to the POSIX.1e/NFSv4 ACL security API
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Sh DESCRIPTION
-.Fx
-permits file systems to export Access Control Lists via the VFS, and
-provides a library for userland access to and manipulation of these ACLs.
-.Fx
-supports POSIX.1e and NFSv4 ACLs, but
-not all file systems provide support for ACLs, and some may require that
-ACL support be explicitly enabled by the administrator.
-The library calls include routines to allocate, duplicate, retrieve, set,
-and validate ACLs associated with file objects.
-As well as the POSIX.1e routines, there are a number of non-portable
-extensions defined that allow for ACL semantics alternative to
-POSIX.1e, such as NFSv4.
-Where routines are non-standard, they are suffixed with _np to indicate that
-they are not portable.
-.Pp
-POSIX.1e describes a set of ACL manipulation routines to manage the
-contents of ACLs, as well as their relationships with files; almost
-all of these support routines are implemented in
-.Fx .
-.Pp
-Available functions, sorted by behavior, include:
-.Bl -tag -width indent
-.It Fn acl_add_flag_np
-This function is described in
-.Xr acl_add_flag_np 3 ,
-and may be used to add flags to a flagset.
-.It Fn acl_add_perm
-This function is described in
-.Xr acl_add_perm 3 ,
-and may be used to add permissions to a permission set.
-.It Fn acl_calc_mask
-This function is described in
-.Xr acl_calc_mask 3 ,
-and may be used to calculate and set the permissions associated with
-the
-.Dv ACL_MASK
-entry.
-.It Fn acl_clear_flags_np
-This function is described in
-.Xr acl_clear_flags_np 3 ,
-and may be used to clear all flags from a flagset.
-.It Fn acl_clear_perms
-This function is described in
-.Xr acl_clear_perms 3 ,
-and may be used to clear all permissions from a permission set.
-.It Fn acl_copy_entry
-This function is described in
-.Xr acl_copy_entry 3 ,
-and may be used to copy the contents of an ACL entry.
-.It Xo
-.Fn acl_create_entry ,
-.Fn acl_create_entry_np
-.Xc
-These functions are described in
-.Xr acl_create_entry 3 ,
-and may be used to create an empty entry in an ACL.
-.It Xo
-.Fn acl_delete_def_file ,
-.Fn acl_delete_def_link_np ,
-.Fn acl_delete_fd_np ,
-.Fn acl_delete_file_np ,
-.Fn acl_delete_link_np
-.Xc
-These functions are described in
-.Xr acl_delete 3 ,
-and may be used to delete ACLs from file system objects.
-.It Xo
-.Fn acl_delete_entry ,
-.Fn acl_delete_entry_np ,
-.Xc
-This functions are described in
-.Xr acl_delete_entry 3 ,
-and may be used to delete an entry from an ACL.
-.It Fn acl_delete_flag_np
-This function is described in
-.Xr acl_delete_flag_np 3 ,
-and may be used to delete flags from a flagset.
-.It Fn acl_delete_perm
-This function is described in
-.Xr acl_delete_perm 3 ,
-and may be used to delete permissions from a permset.
-.It Fn acl_dup
-This function is described in
-.Xr acl_dup 3 ,
-and may be used to duplicate an ACL structure.
-.It Fn acl_free
-This function is described in
-.Xr acl_free 3 ,
-and may be used to free userland working ACL storage.
-.It Fn acl_from_text
-This function is described in
-.Xr acl_from_text 3 ,
-and may be used to convert a text-form ACL into working ACL state, if
-the ACL has POSIX.1e or NFSv4 semantics.
-.It Fn acl_get_brand_np
-This function is described in
-.Xr acl_get_brand_np 3
-and may be used to determine whether the ACL has POSIX.1e or NFSv4 semantics.
-.It Fn acl_get_entry
-This function is described in
-.Xr acl_get_entry 3 ,
-and may be used to retrieve a designated ACL entry from an ACL.
-.It Xo
-.Fn acl_get_fd ,
-.Fn acl_get_fd_np ,
-.Fn acl_get_file ,
-.Fn acl_get_link_np
-.Xc
-These functions are described in
-.Xr acl_get 3 ,
-and may be used to retrieve ACLs from file system objects.
-.It Fn acl_get_entry_type_np
-This function is described in
-.Xr acl_get_entry_type_np 3 ,
-and may be used to retrieve an ACL type from an ACL entry.
-.It Fn acl_get_flagset_np
-This function is described in
-.Xr acl_get_flagset_np 3 ,
-and may be used to retrieve a flagset from an ACL entry.
-.It Fn acl_get_permset
-This function is described in
-.Xr acl_get_permset 3 ,
-and may be used to retrieve a permset from an ACL entry.
-.It Fn acl_get_qualifier
-This function is described in
-.Xr acl_get_qualifier 3 ,
-and may be used to retrieve the qualifier from an ACL entry.
-.It Fn acl_get_tag_type
-This function is described in
-.Xr acl_get_tag_type 3 ,
-and may be used to retrieve the tag type from an ACL entry.
-.It Fn acl_init
-This function is described in
-.Xr acl_init 3 ,
-and may be used to allocate a fresh (empty) ACL structure.
-.It Fn acl_is_trivial_np
-This function is described in
-.Xr acl_is_trivial_np 3 ,
-and may be used to find out whether ACL is trivial.
-.It Xo
-.Fn acl_set_fd ,
-.Fn acl_set_fd_np ,
-.Fn acl_set_file ,
-.Fn acl_set_link_np
-.Xc
-These functions are described in
-.Xr acl_set 3 ,
-and may be used to assign an ACL to a file system object.
-.It Fn acl_set_entry_type_np
-This function is described in
-.Xr acl_set_entry_type_np 3 ,
-and may be used to set the ACL type of an ACL entry.
-.It Fn acl_set_flagset_np
-This function is described in
-.Xr acl_set_flagset_np 3 ,
-and may be used to set the flags of an ACL entry from a flagset.
-.It Fn acl_set_permset
-This function is described in
-.Xr acl_set_permset 3 ,
-and may be used to set the permissions of an ACL entry from a permset.
-.It Fn acl_set_qualifier
-This function is described in
-.Xr acl_set_qualifier 3 ,
-and may be used to set the qualifier of an ACL.
-.It Fn acl_set_tag_type
-This function is described in
-.Xr acl_set_tag_type 3 ,
-and may be used to set the tag type of an ACL.
-.It Fn acl_strip_np
-This function is described in
-.Xr acl-strip_np 3 ,
-and may be used to remove extended entries from an ACL.
-.It Xo
-.Fn acl_to_text ,
-.Fn acl_to_text_np
-.Xc
-These functions are described in
-.Xr acl_to_text 3 ,
-and may be used to generate a text-form of a POSIX.1e or NFSv4 semantics ACL.
-.It Xo
-.Fn acl_valid ,
-.Fn acl_valid_fd_np ,
-.Fn acl_valid_file_np ,
-.Fn acl_valid_link_np
-.Xc
-These functions are described in
-.Xr acl_valid 3 ,
-and may be used to validate an ACL as correct POSIX.1e-semantics, or
-as appropriate for a particular file system object regardless of semantics.
-.El
-.Pp
-Documentation of the internal kernel interfaces backing these calls may
-be found in
-.Xr acl 9 .
-The syscalls between the internal interfaces and the public library
-routines may change over time, and as such are not documented.
-They are not intended to be called directly without going through the
-library.
-.Sh SEE ALSO
-.Xr getfacl 1 ,
-.Xr setfacl 1 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_calc_mask 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_copy_entry 3 ,
-.Xr acl_create_entry 3 ,
-.Xr acl_delete_entry 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_dup 3 ,
-.Xr acl_free 3 ,
-.Xr acl_from_text 3 ,
-.Xr acl_get 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_get_entry_type_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_get_qualifier 3 ,
-.Xr acl_get_tag_type 3 ,
-.Xr acl_init 3 ,
-.Xr acl_is_trivial_np 3 ,
-.Xr acl_set 3 ,
-.Xr acl_set_entry_type_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr acl_set_permset 3 ,
-.Xr acl_set_qualifier 3 ,
-.Xr acl_set_tag_type 3 ,
-.Xr acl_strip_np 3 ,
-.Xr acl_to_text 3 ,
-.Xr acl_valid 3 ,
-.Xr posix1e 3 ,
-.Xr acl 9
-.Sh STANDARDS
-POSIX.1e assigns security labels to all objects, extending the security
-functionality described in POSIX.1.
-These additional labels provide fine-grained discretionary access control,
-fine-grained capabilities, and labels necessary for mandatory access
-control.
-POSIX.2c describes a set of userland utilities for manipulating these
-labels.
-.Pp
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft continues on the cross-platform POSIX.1e
-implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ;
-.Fx 5.0
-was the first version to include a complete ACL implementation based
-on extended attributes for the UFS and UFS2 file systems.
-NFSv4 ACL support was introduced in
-.Fx 8.0 .
-.Pp
-The
-.Xr getfacl 1
-and
-.Xr setfacl 1
-utilities describe the user tools that permit direct manipulation of complete
-file ACLs.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc_bsd/posix1e/acl_add_flag_np.3 b/lib/libc_bsd/posix1e/acl_add_flag_np.3
deleted file mode 100644
index 5c6d85b..0000000
--- a/lib/libc_bsd/posix1e/acl_add_flag_np.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_add_flag_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_ADD_FLAG_NP 3
-.Os
-.Sh NAME
-.Nm acl_add_flag_np
-.Nd add flags to a flagset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_add_flag_np "acl_flagset_t flagset_d" "acl_flag_t flag"
-.Sh DESCRIPTION
-The
-.Fn acl_add_flag_np
-function
-is a non-portable call that adds the NFSv4 ACL flags contained in
-.Fa flags
-to the flagset
-.Fa flagset_d .
-.Pp
-Note: it is not considered an error to attempt to add flags
-that already exist in the flagset.
-.Pp
-Valid values are:
-.Bl -column -offset 3n "ACL_ENTRY_NO_PROPAGATE_INHERIT"
-.It ACL_ENTRY_FILE_INHERIT Ta "Will be inherited by files."
-.It ACL_ENTRY_DIRECTORY_INHERIT Ta "Will be inherited by directories."
-.It ACL_ENTRY_NO_PROPAGATE_INHERIT Ta "Will not propagate."
-.It ACL_ENTRY_INHERIT_ONLY Ta "Inherit-only."
-.El
-.Sh RETURN VALUES
-.Rv -std acl_add_flag_np
-.Sh ERRORS
-The
-.Fn acl_add_flag_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa flagset_d
-is not a valid descriptor for a flagset within an ACL entry.
-Argument
-.Fa flag
-does not contain a valid
-.Vt acl_flag_t
-value.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_add_flag_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_add_flag_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_add_perm.3 b/lib/libc_bsd/posix1e/acl_add_perm.3
deleted file mode 100644
index 905c9e7..0000000
--- a/lib/libc_bsd/posix1e/acl_add_perm.3
+++ /dev/null
@@ -1,129 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_add_perm.3 233665 2012-03-29 16:02:40Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_ADD_PERM 3
-.Os
-.Sh NAME
-.Nm acl_add_perm
-.Nd add permissions to a permission set
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_add_perm "acl_permset_t permset_d" "acl_perm_t perm"
-.Sh DESCRIPTION
-The
-.Fn acl_add_perm
-function
-is a POSIX.1e call that adds the permission contained in
-.Fa perm
-to the permission set
-.Fa permset_d .
-.Pp
-Note: it is not considered an error to attempt to add permissions
-that already exist in the permission set.
-.Pp
-For POSIX.1e ACLs, valid values are:
-.Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS"
-.It ACL_EXECUTE	Execute permission
-.It ACL_WRITE	Write permission
-.It ACL_READ	Read permission
-.El
-.Pp
-For NFSv4 ACLs, valid values are:
-.Bl -column -offset 3n "ACL_WRITE_NAMED_ATTRS"
-.It ACL_READ_DATA Ta "Read permission"
-.It ACL_LIST_DIRECTORY Ta "Same as ACL_READ_DATA"
-.It ACL_WRITE_DATA Ta "Write permission, or permission to create files"
-.It ACL_ADD_FILE Ta "Same as ACL_READ_DATA"
-.It ACL_APPEND_DATA Ta "Permission to create directories.  Ignored for files"
-.It ACL_ADD_SUBDIRECTORY Ta "Same as ACL_APPEND_DATA"
-.It ACL_READ_NAMED_ATTRS Ta "Ignored"
-.It ACL_WRITE_NAMED_ATTRS Ta "Ignored"
-.It ACL_EXECUTE Ta "Execute permission"
-.It ACL_DELETE_CHILD Ta "Permission to delete files and subdirectories"
-.It ACL_READ_ATTRIBUTES Ta "Permission to read basic attributes"
-.It ACL_WRITE_ATTRIBUTES Ta "Permission to change basic attributes"
-.It ACL_DELETE Ta "Permission to delete the object this ACL is placed on"
-.It ACL_READ_ACL Ta "Permission to read ACL"
-.It ACL_WRITE_ACL Ta "Permission to change the ACL and file mode"
-.It ACL_SYNCHRONIZE Ta "Ignored"
-.El
-.Pp
-Calling
-.Fn acl_add_perm
-with
-.Fa perm
-equal to ACL_WRITE or ACL_READ brands the ACL as POSIX.
-Calling it with ACL_READ_DATA, ACL_LIST_DIRECTORY, ACL_WRITE_DATA,
-ACL_ADD_FILE, ACL_APPEND_DATA, ACL_ADD_SUBDIRECTORY, ACL_READ_NAMED_ATTRS,
-ACL_WRITE_NAMED_ATTRS, ACL_DELETE_CHILD, ACL_READ_ATTRIBUTES,
-ACL_WRITE_ATTRIBUTES, ACL_DELETE, ACL_READ_ACL, ACL_WRITE_ACL
-or ACL_SYNCHRONIZE brands the ACL as NFSv4.
-.Sh RETURN VALUES
-.Rv -std acl_add_perm
-.Sh ERRORS
-The
-.Fn acl_add_perm
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa permset_d
-is not a valid descriptor for a permission set within an ACL entry.
-Argument
-.Fa perm
-does not contain a valid
-.Vt acl_perm_t
-value.
-ACL is already branded differently.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_add_perm
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_add_perm
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_branding.c b/lib/libc_bsd/posix1e/acl_branding.c
deleted file mode 100644
index f44a55d..0000000
--- a/lib/libc_bsd/posix1e/acl_branding.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_branding.c 208034 2010-05-13 16:44:27Z trasz $");
-
-#include <assert.h>
-#include <errno.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-/*
- * An ugly detail of the implementation - fortunately not visible
- * to the API users - is the "branding": libc needs to keep track
- * of what "brand" ACL is: NFSv4, POSIX.1e or unknown.  It happens
- * automatically - for example, during acl_get_file(3) ACL gets
- * branded according to the "type" argument; during acl_set_permset
- * ACL, if its brand is unknown it gets branded as NFSv4 if any of the
- * NFSv4 permissions that are not valid for POSIX.1e ACL are set etc.
- * Branding information is used for printing out the ACL (acl_to_text(3)),
- * veryfying acl_set_whatever arguments (checking against setting
- * bits that are valid only for NFSv4 in ACL branded as POSIX.1e) etc.
- */
-
-static acl_t
-entry2acl(acl_entry_t entry)
-{
-	acl_t aclp;
-
-	aclp = (acl_t)(((long)entry >> _ACL_T_ALIGNMENT_BITS) << _ACL_T_ALIGNMENT_BITS);
-
-	return (aclp);
-}
-
-/*
- * Return brand of an ACL.
- */
-int
-_acl_brand(const acl_t acl)
-{
-
-	return (acl->ats_brand);
-}
-
-int
-_entry_brand(const acl_entry_t entry)
-{
-
-	return (_acl_brand(entry2acl(entry)));
-}
-
-/*
- * Return 1, iff branding ACL as "brand" is ok.
- */
-int
-_acl_brand_may_be(const acl_t acl, int brand)
-{
-
-	if (_acl_brand(acl) == ACL_BRAND_UNKNOWN)
-		return (1);
-
-	if (_acl_brand(acl) == brand)
-		return (1);
-
-	return (0);
-}
-
-int
-_entry_brand_may_be(const acl_entry_t entry, int brand)
-{
-
-	return (_acl_brand_may_be(entry2acl(entry), brand));
-}
-
-/*
- * Brand ACL as "brand".
- */
-void
-_acl_brand_as(acl_t acl, int brand)
-{
-
-	assert(_acl_brand_may_be(acl, brand));
-
-	acl->ats_brand = brand;
-}
-
-void
-_entry_brand_as(const acl_entry_t entry, int brand)
-{
-
-	_acl_brand_as(entry2acl(entry), brand);
-}
-
-int
-_acl_type_not_valid_for_acl(const acl_t acl, acl_type_t type)
-{
-
-	switch (_acl_brand(acl)) {
-	case ACL_BRAND_NFS4:
-		if (type == ACL_TYPE_NFS4)
-			return (0);
-		break;
-
-	case ACL_BRAND_POSIX:
-		if (type == ACL_TYPE_ACCESS || type == ACL_TYPE_DEFAULT)
-			return (0);
-		break;
-
-	case ACL_BRAND_UNKNOWN:
-		return (0);
-	}
-
-	return (-1);
-}
-
-void
-_acl_brand_from_type(acl_t acl, acl_type_t type)
-{
-
-	switch (type) {
-	case ACL_TYPE_NFS4:
-		_acl_brand_as(acl, ACL_BRAND_NFS4);
-		break;
-	case ACL_TYPE_ACCESS:
-	case ACL_TYPE_DEFAULT:
-		_acl_brand_as(acl, ACL_BRAND_POSIX);
-		break;
-	default:
-		/* XXX: What to do here? */
-		break;
-	}
-}
-
-int
-acl_get_brand_np(acl_t acl, int *brand_p)
-{
-
-	if (acl == NULL || brand_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	*brand_p = _acl_brand(acl);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/posix1e/acl_calc_mask.3 b/lib/libc_bsd/posix1e/acl_calc_mask.3
deleted file mode 100644
index dba9334..0000000
--- a/lib/libc_bsd/posix1e/acl_calc_mask.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_calc_mask.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_CALC_MASK 3
-.Os
-.Sh NAME
-.Nm acl_calc_mask
-.Nd calculate and set ACL mask permissions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_calc_mask "acl_t *acl_p"
-.Sh DESCRIPTION
-The
-.Fn acl_calc_mask
-function
-is a POSIX.1e call that calculates and set the permissions
-associated with the
-.Dv ACL_MASK
-ACL entry of the ACL referred to by
-.Fa acl_p .
-.Pp
-The value of new permissions are the union of the permissions
-granted by the
-.Dv ACL_GROUP , ACL_GROUP_OBJ , ACL_USER
-tag types which
-match processes in the file group class contained in the ACL
-referred to by
-.Fa acl_p .
-.Pp
-If the ACL referred to by
-.Fa acl_p
-already contains an
-.Dv ACL_MASK
-entry, its permissions shall be
-overwritten; if it does not contain an
-.Dv ACL_MASK
-entry, one shall
-be added.
-.Sh RETURN VALUES
-.Rv -std acl_calc_mask
-.Sh ERRORS
-The
-.Fn acl_calc_mask
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl_p
-does not point to a pointer to a valid ACL.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_entry 3 ,
-.Xr acl_valid 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_calc_mask
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_calc_mask
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_calc_mask.c b/lib/libc_bsd/posix1e/acl_calc_mask.c
deleted file mode 100644
index 055e922..0000000
--- a/lib/libc_bsd/posix1e/acl_calc_mask.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_calc_mask.c 196740 2009-09-01 18:30:17Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <stdio.h>
-
-#include "acl_support.h"
-
-/*
- * acl_calc_mask() (23.4.2): calculate and set the permissions
- * associated with the ACL_MASK ACL entry.  If the ACL already
- * contains an ACL_MASK entry, its permissions shall be
- * overwritten; if not, one shall be added.
- */
-int
-acl_calc_mask(acl_t *acl_p)
-{
-	struct acl	*acl_int, *acl_int_new;
-	acl_t		acl_new;
-	int		i, mask_mode, mask_num;
-
-	/*
-	 * (23.4.2.4) requires acl_p to point to a pointer to a valid ACL.
-	 * Since one of the primary reasons to use this function would be
-	 * to calculate the appropriate mask to obtain a valid ACL, we only
-	 * perform sanity checks here and validate the ACL prior to
-	 * returning.
-	 */
-	if (acl_p == NULL || *acl_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (!_acl_brand_may_be(*acl_p, ACL_BRAND_POSIX)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	_acl_brand_as(*acl_p, ACL_BRAND_POSIX);
-
-	acl_int = &(*acl_p)->ats_acl;
-	if ((acl_int->acl_cnt < 3) || (acl_int->acl_cnt > ACL_MAX_ENTRIES)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_new = acl_dup(*acl_p);
-	if (acl_new == NULL)
-		return (-1);
-	acl_int_new = &acl_new->ats_acl;
-
-	mask_mode = 0;
-	mask_num = -1;
-
-	/* gather permissions and find a mask entry */
-	for (i = 0; i < acl_int_new->acl_cnt; i++) {
-		switch(acl_int_new->acl_entry[i].ae_tag) {
-		case ACL_USER:
-		case ACL_GROUP:
-		case ACL_GROUP_OBJ:
-			mask_mode |=
-			    acl_int_new->acl_entry[i].ae_perm & ACL_PERM_BITS;
-			break;
-		case ACL_MASK:
-			mask_num = i;
-			break;
-		}
-	}
-
-	/* if a mask entry already exists, overwrite the perms */
-	if (mask_num != -1)
-		acl_int_new->acl_entry[mask_num].ae_perm = mask_mode;
-	else {
-		/* if no mask exists, check acl_cnt... */
-		if (acl_int_new->acl_cnt == ACL_MAX_ENTRIES) {
-			errno = ENOMEM;
-			return (-1);
-		}
-		/* ...and add the mask entry */
-		acl_int_new->acl_entry[acl_int_new->acl_cnt].ae_tag = ACL_MASK;
-		acl_int_new->acl_entry[acl_int_new->acl_cnt].ae_id =
-		    ACL_UNDEFINED_ID;
-		acl_int_new->acl_entry[acl_int_new->acl_cnt].ae_perm =
-		    mask_mode;
-		acl_int_new->acl_cnt++;
-	}
-
-	if (acl_valid(acl_new) == -1) {
-		errno = EINVAL;
-		acl_free(acl_new);
-		return (-1);
-	}
-
-	**acl_p = *acl_new;
-	acl_free(acl_new);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/posix1e/acl_clear_flags_np.3 b/lib/libc_bsd/posix1e/acl_clear_flags_np.3
deleted file mode 100644
index f25a6ae..0000000
--- a/lib/libc_bsd/posix1e/acl_clear_flags_np.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_clear_flags_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_CLEAR_FLAGS_NP 3
-.Os
-.Sh NAME
-.Nm acl_clear_flags_np
-.Nd clear flags from a flagset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_clear_flags_np "acl_flagset_t flagset_d"
-.Sh DESCRIPTION
-The
-.Fn acl_clear_flags_np
-function
-is a non-portable call that clears all NFSv4 ACL flags from flagset
-.Fa flagset_d .
-.Sh RETURN VALUES
-.Rv -std acl_clear_flags_np
-.Sh ERRORS
-The
-.Fn acl_clear_flags_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa flagset_d
-is not a valid descriptor for a flagset.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_clear_flags_np
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_clear_flags_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_clear_perms.3 b/lib/libc_bsd/posix1e/acl_clear_perms.3
deleted file mode 100644
index e72806c..0000000
--- a/lib/libc_bsd/posix1e/acl_clear_perms.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_clear_perms.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_CLEAR_PERMS 3
-.Os
-.Sh NAME
-.Nm acl_clear_perms
-.Nd clear permissions from a permission set
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_clear_perms "acl_permset_t permset_d"
-.Sh DESCRIPTION
-The
-.Fn acl_clear_perms
-function
-is a POSIX.1e call that clears all permissions from permissions set
-.Fa permset_d .
-.Sh RETURN VALUES
-.Rv -std acl_clear_perms
-.Sh ERRORS
-The
-.Fn acl_clear_perms
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa permset_d
-is not a valid descriptor for a permission set.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_clear_perms
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_clear_perms
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_compat.c b/lib/libc_bsd/posix1e/acl_compat.c
deleted file mode 100644
index 65b88d4..0000000
--- a/lib/libc_bsd/posix1e/acl_compat.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2008 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_compat.c 192804 2009-05-26 11:42:06Z trasz $");
-
-#include <sys/acl.h>
-
-/*
- * Compatibility wrappers for applications compiled against libc from before
- * NFSv4 ACLs were added.
- */
-int
-__oldacl_get_perm_np(acl_permset_t permset_d, oldacl_perm_t perm)
-{
-
-	return (acl_get_perm_np(permset_d, perm));
-}
-
-int
-__oldacl_add_perm(acl_permset_t permset_d, oldacl_perm_t perm)
-{
-
-	return (acl_add_perm(permset_d, perm));
-}
-
-int
-__oldacl_delete_perm(acl_permset_t permset_d, oldacl_perm_t perm)
-{
-
-	return (acl_delete_perm(permset_d, perm));
-}
-
-__sym_compat(acl_get_perm_np, __oldacl_get_perm_np, FBSD_1.0);
-__sym_compat(acl_add_perm, __oldacl_add_perm, FBSD_1.0);
-__sym_compat(acl_delete_perm, __oldacl_delete_perm, FBSD_1.0);
diff --git a/lib/libc_bsd/posix1e/acl_copy.c b/lib/libc_bsd/posix1e/acl_copy.c
deleted file mode 100644
index b82c951..0000000
--- a/lib/libc_bsd/posix1e/acl_copy.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_copy.c 194955 2009-06-25 12:46:59Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <string.h>
-
-#include "acl_support.h"
-
-/*
- * acl_copy_entry() (23.4.4): copy the contents of ACL entry src_d to
- * ACL entry dest_d
- */
-int
-acl_copy_entry(acl_entry_t dest_d, acl_entry_t src_d)
-{
-
-	if (src_d == NULL || dest_d == NULL || src_d == dest_d) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/*
-	 * Can we brand the new entry the same as the source entry?
-	 */
-	if (!_entry_brand_may_be(dest_d, _entry_brand(src_d))) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	_entry_brand_as(dest_d, _entry_brand(src_d));
-
-	dest_d->ae_tag = src_d->ae_tag;
-	dest_d->ae_id = src_d->ae_id;
-	dest_d->ae_perm = src_d->ae_perm;
-	dest_d->ae_entry_type = src_d->ae_entry_type;
-	dest_d->ae_flags = src_d->ae_flags;
-
-	return (0);
-}
-
-ssize_t
-acl_copy_ext(void *buf_p, acl_t acl, ssize_t size)
-{
-
-	errno = ENOSYS;
-	return (-1);
-}
-
-acl_t
-acl_copy_int(const void *buf_p)
-{
-
-	errno = ENOSYS;
-	return (NULL);
-}
diff --git a/lib/libc_bsd/posix1e/acl_copy_entry.3 b/lib/libc_bsd/posix1e/acl_copy_entry.3
deleted file mode 100644
index 200b733..0000000
--- a/lib/libc_bsd/posix1e/acl_copy_entry.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_copy_entry.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_COPY_ENTRY 3
-.Os
-.Sh NAME
-.Nm acl_copy_entry
-.Nd copy an ACL entry to another ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_copy_entry "acl_entry_t dest_d" "acl_entry_t src_d"
-.Sh DESCRIPTION
-The
-.Fn acl_copy_entry
-function
-is a POSIX.1e call that copies the contents of ACL entry
-.Fa src_d
-to ACL entry
-.Fa dest_d .
-.Sh RETURN VALUES
-.Rv -std acl_copy_entry
-.Sh ERRORS
-The
-.Fn acl_copy_entry
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa src_d
-or
-.Fa dest_d
-is not a valid descriptor for an ACL entry, or
-arguments
-.Fa src_d
-and
-.Fa dest_d
-reference the same ACL entry.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_entry 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_copy_entry
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_copy_entry
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_create_entry.3 b/lib/libc_bsd/posix1e/acl_create_entry.3
deleted file mode 100644
index dcad1a1..0000000
--- a/lib/libc_bsd/posix1e/acl_create_entry.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_create_entry.3 233648 2012-03-29 05:02:12Z eadler $
-.\"
-.Dd June 25, 2009
-.Dt ACL_CREATE_ENTRY 3
-.Os
-.Sh NAME
-.Nm acl_create_entry
-.Nm acl_create_entry_np
-.Nd create a new ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_create_entry "acl_t *acl_p" "acl_entry_t *entry_p"
-.Ft int
-.Fn acl_create_entry_np "acl_t *acl_p" "acl_entry_t *entry_p" "int index"
-.Sh DESCRIPTION
-The
-.Fn acl_create_entry
-function
-is a POSIX.1e call that creates a new ACL entry in the ACL
-pointed to by
-.Fa acl_p .
-The
-.Fn acl_create_entry_np
-function is a non-portable version that creates the ACL entry
-at position
-.Fa index .
-Positions are numbered starting from zero, i.e. calling
-.Fn acl_create_entry_np
-with
-.Fa index
-argument equal to zero will prepend the entry to the ACL.
-.Sh RETURN VALUES
-.Rv -std acl_create_entry
-.Sh ERRORS
-The
-.Fn acl_create_entry
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl_p
-does not point to a pointer to a valid ACL.
-Argument
-.Fa index
-is out of bounds.
-.It Bq Er ENOMEM
-The ACL working storage requires more memory than is
-allowed by the hardware or system-imposed memory
-management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_delete_entry 3 ,
-.Xr acl_get_entry 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_create_entry
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_create_entry
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_delete.3 b/lib/libc_bsd/posix1e/acl_delete.3
deleted file mode 100644
index 535f577..0000000
--- a/lib/libc_bsd/posix1e/acl_delete.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_delete.3 131635 2004-07-05 17:12:53Z ru $
-.\"
-.Dd December 29, 2002
-.Dt ACL_DELETE 3
-.Os
-.Sh NAME
-.Nm acl_delete_def_file ,
-.Nm acl_delete_def_link_np ,
-.Nm acl_delete_fd_np ,
-.Nm acl_delete_file_np ,
-.Nm acl_delete_link_np
-.Nd delete an ACL from a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_delete_def_file "const char *path_p"
-.Ft int
-.Fn acl_delete_def_link_np "const char *path_p"
-.Ft int
-.Fn acl_delete_fd_np "int filedes" "acl_type_t type"
-.Ft int
-.Fn acl_delete_file_np "const char *path_p" "acl_type_t type"
-.Ft int
-.Fn acl_delete_link_np "const char *path_p" "acl_type_t type"
-.Sh DESCRIPTION
-The
-.Fn acl_delete_def_file ,
-.Fn acl_delete_def_link_np ,
-.Fn acl_delete_fd_np ,
-.Fn acl_delete_file_np ,
-and
-.Fn acl_delete_link_np
-each allow the deletion of an ACL from a file.
-The
-.Fn acl_delete_def_file
-function
-is a POSIX.1e call that deletes the default ACL from a file (normally a
-directory) by name; the remainder of the calls are non-portable extensions
-that permit the deletion of arbitrary ACL types from a file/directory
-either by path name or file descriptor.
-The
-.Fn _file
-variations follow a symlink if it occurs in the last segment of the
-path name; the
-.Fn _link
-variations operate on the symlink itself.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-If any of the following conditions occur, these functions shall return -1
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or the
-object exists and the process does not have appropriate access rights.
-.It Bq Er EBADF
-The
-.Va fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-The ACL type passed is invalid for this file object.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an
-entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named object does not exist, or the
-.Va path_p
-argument points to an empty string.
-.It Bq Er ENOMEM
-Insufficient memory available to fulfill request.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.Pp
-Argument
-.Va path_p
-must be a directory, and is not.
-.It Bq Er EOPNOTSUPP
-The file system does not support ACL deletion.
-.It Bq Er EPERM
-The process does not have appropriate privilege to perform the operation
-to delete an ACL.
-.It Bq Er EROFS
-The file system is read-only.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get 3 ,
-.Xr acl_set 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc_bsd/posix1e/acl_delete.c b/lib/libc_bsd/posix1e/acl_delete.c
deleted file mode 100644
index 0ebc158..0000000
--- a/lib/libc_bsd/posix1e/acl_delete.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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.
- */
-/*
- * acl_delete_def_file -- remove a default acl from a file
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_delete.c 192586 2009-05-22 15:56:43Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-
-#include "acl_support.h"
-
-int
-acl_delete_def_file(const char *path_p)
-{
-
-	return (__acl_delete_file(path_p, ACL_TYPE_DEFAULT));
-}
-
-int
-acl_delete_def_link_np(const char *path_p)
-{
-
-	return (__acl_delete_link(path_p, ACL_TYPE_DEFAULT));
-}
-
-int
-acl_delete_file_np(const char *path_p, acl_type_t type)
-{
-
-	type = _acl_type_unold(type);
-	return (__acl_delete_file(path_p, type));
-}
-
-int
-acl_delete_link_np(const char *path_p, acl_type_t type)
-{
-
-	type = _acl_type_unold(type);
-	return (__acl_delete_link(path_p, type));
-}
-
-int
-acl_delete_fd_np(int filedes, acl_type_t type)
-{
-
-	type = _acl_type_unold(type);
-	return (___acl_delete_fd(filedes, type));
-}
diff --git a/lib/libc_bsd/posix1e/acl_delete_entry.3 b/lib/libc_bsd/posix1e/acl_delete_entry.3
deleted file mode 100644
index 1fd3cf8..0000000
--- a/lib/libc_bsd/posix1e/acl_delete_entry.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_delete_entry.3 235286 2012-05-11 20:06:46Z gjb $
-.\"
-.Dd June 25, 2009
-.Dt ACL_DELETE_ENTRY 3
-.Os
-.Sh NAME
-.Nm acl_delete_entry ,
-.Nm acl_delete_entry_np
-.Nd delete an ACL entry from an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_delete_entry "acl_t acl" "acl_entry_t entry_d"
-.Ft int
-.Fn acl_delete_entry_np "acl_t acl" "int index"
-.Sh DESCRIPTION
-The
-.Fn acl_delete_entry
-function
-is a POSIX.1e call that removes the ACL entry
-.Fa entry_d
-from ACL
-.Fa acl .
-The
-.Fn acl_delete_entry_np
-function is a non-portable version that removes the ACL entry
-at position
-.Fa index
-from ACL
-.Fa acl .
-Positions are numbered starting from zero, i.e. calling
-.Fn acl_delete_entry_np
-with
-.Fa index
-argument equal to zero will remove the first ACL entry.
-.Sh RETURN VALUES
-.Rv -std acl_delete_entry
-.Sh ERRORS
-The
-.Fn acl_delete_entry
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl
-does not point to a valid ACL.
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry in
-.Fa acl .
-Argument
-.Fa index
-is out of bounds.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_copy_entry 3 ,
-.Xr acl_get_entry 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_delete_entry
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_delete_entry
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_delete_entry.c b/lib/libc_bsd/posix1e/acl_delete_entry.c
deleted file mode 100644
index 9f89acb..0000000
--- a/lib/libc_bsd/posix1e/acl_delete_entry.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_delete_entry.c 200992 2009-12-25 18:05:06Z markus $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "acl_support.h"
-
-static int
-_entry_matches(const acl_entry_t a, const acl_entry_t b)
-{
-	/*
-	 * There is a semantical difference here between NFSv4 and POSIX
-	 * draft ACLs.  In POSIX, there may be only one entry for the particular
-	 * user or group.  In NFSv4 ACL, there may be any number of them.  We're
-	 * trying to be more specific here in that case.
-	 */
-	switch (_entry_brand(a)) {
-	case ACL_BRAND_NFS4:
-		if (a->ae_tag != b->ae_tag || a->ae_entry_type != b->ae_entry_type)
-			return (0);
-
-		/* If ae_ids matter, compare them as well. */
-		if (a->ae_tag == ACL_USER || a->ae_tag == ACL_GROUP) {
-			if (a->ae_id != b->ae_id)
-				return (0);
-		}
-
-		return (1);
-
-	default:
-		if ((a->ae_tag == b->ae_tag) && (a->ae_id == b->ae_id))
-			return (1);
-	}
-
-	return (0);
-}
-
-/*
- * acl_delete_entry() (23.4.9): remove the ACL entry indicated by entry_d
- * from acl.
- */
-int
-acl_delete_entry(acl_t acl, acl_entry_t entry_d)
-{
-	struct acl *acl_int;
-	struct acl_entry entry_int;
-	int i, j, found = 0;
-
-	if (acl == NULL || entry_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_int = &acl->ats_acl;
-
-	if (_entry_brand(entry_d) != _acl_brand(acl)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if ((acl->ats_acl.acl_cnt < 1) ||
-	    (acl->ats_acl.acl_cnt > ACL_MAX_ENTRIES)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/* Use a local copy to prevent deletion of more than this entry */
-	entry_int = *entry_d;
-
-	for (i = 0; i < acl->ats_acl.acl_cnt;) {
-		if (_entry_matches(&(acl->ats_acl.acl_entry[i]), &entry_int)) {
-			/* ...shift the remaining entries... */
-			for (j = i; j < acl->ats_acl.acl_cnt - 1; ++j)
-				acl->ats_acl.acl_entry[j] =
-				    acl->ats_acl.acl_entry[j+1];
-			/* ...drop the count and zero the unused entry... */
-			acl->ats_acl.acl_cnt--;
-			bzero(&acl->ats_acl.acl_entry[j],
-			    sizeof(struct acl_entry));
-			acl->ats_cur_entry = 0;
-			
-			/* Continue with the loop to remove all maching entries. */
-			found = 1;
-		} else
-			i++;
-	}
-
-	if (found)
-		return (0);
-
-	errno = EINVAL;
-	return (-1);
-}
-
-int
-acl_delete_entry_np(acl_t acl, int offset)
-{
-	struct acl *acl_int;
-	int i;
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_int = &acl->ats_acl;
-
-	if (offset < 0 || offset >= acl_int->acl_cnt) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if ((acl->ats_acl.acl_cnt < 1) ||
-	    (acl->ats_acl.acl_cnt > ACL_MAX_ENTRIES)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/* ...shift the remaining entries... */
-	for (i = offset; i < acl->ats_acl.acl_cnt - 1; ++i)
-		acl->ats_acl.acl_entry[i] =
-		    acl->ats_acl.acl_entry[i+1];
-	/* ...drop the count and zero the unused entry... */
-	acl->ats_acl.acl_cnt--;
-	bzero(&acl->ats_acl.acl_entry[i],
-	    sizeof(struct acl_entry));
-	acl->ats_cur_entry = 0;
-
-	return (0);
-}
diff --git a/lib/libc_bsd/posix1e/acl_delete_flag_np.3 b/lib/libc_bsd/posix1e/acl_delete_flag_np.3
deleted file mode 100644
index 7656c69..0000000
--- a/lib/libc_bsd/posix1e/acl_delete_flag_np.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_delete_flag_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_DELETE_FLAG_NP 3
-.Os
-.Sh NAME
-.Nm acl_delete_flag_np
-.Nd delete flags from a flagset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_delete_flag_np "acl_flagset_t flagset_d" "acl_flag_t flag"
-.Sh DESCRIPTION
-The
-.Fn acl_delete_flag_np
-function
-is a non-portable call that removes specific NFSv4 ACL flags from flagset
-.Fa flags .
-.Sh RETURN VALUES
-.Rv -std acl_delete_flag_np
-.Sh ERRORS
-The
-.Fn acl_delete_flag_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa flagset_d
-is not a valid descriptor for a flagset.
-Argument
-.Fa flag
-does not contain a valid
-.Vt acl_flag_t
-value.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_clear_flag_nps 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_delete_flag_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_delete_flag_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_delete_perm.3 b/lib/libc_bsd/posix1e/acl_delete_perm.3
deleted file mode 100644
index 8ca839e..0000000
--- a/lib/libc_bsd/posix1e/acl_delete_perm.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_delete_perm.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_DELETE_PERM 3
-.Os
-.Sh NAME
-.Nm acl_delete_perm
-.Nd delete permissions from a permission set
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_delete_perm "acl_permset_t permset_d" "acl_perm_t perm"
-.Sh DESCRIPTION
-The
-.Fn acl_delete_perm
-function
-is a POSIX.1e call that removes specific permissions from permissions set
-.Fa perm .
-.Sh RETURN VALUES
-.Rv -std acl_delete_perm
-.Sh ERRORS
-The
-.Fn acl_delete_perm
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa permset_d
-is not a valid descriptor for a permission set.
-Argument
-.Fa perm
-does not contain a valid
-.Vt acl_perm_t
-value.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_delete_perm
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_delete_perm
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_dup.3 b/lib/libc_bsd/posix1e/acl_dup.3
deleted file mode 100644
index 69b841c..0000000
--- a/lib/libc_bsd/posix1e/acl_dup.3
+++ /dev/null
@@ -1,110 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_dup.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd January 28, 2000
-.Dt ACL_DUP 3
-.Os
-.Sh NAME
-.Nm acl_dup
-.Nd duplicate an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_dup "acl_t acl"
-.Sh DESCRIPTION
-The
-.Fn acl_dup
-function returns a pointer to a copy of the ACL pointed to by the argument
-.Va acl .
-.Pp
-This function may cause memory to be allocated.
-The caller should free any
-releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void*)acl_t
-as an argument.
-.Pp
-Any existing ACL pointers that refer to the ACL referred to by
-.Va acl
-shall continue to refer to the ACL.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, this function shall return a pointer to the
-duplicate ACL.
-Otherwise, a value of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_init
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL.
-.It Bq Er ENOMEM
-The
-.Va acl_t
-to be returned requires more memory than is allowed by the hardware or
-system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr acl_get 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc_bsd/posix1e/acl_entry.c b/lib/libc_bsd/posix1e/acl_entry.c
deleted file mode 100644
index 0e92e32..0000000
--- a/lib/libc_bsd/posix1e/acl_entry.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_entry.c 208783 2010-06-03 14:16:58Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <stdlib.h>
-
-/*
- * acl_create_entry() (23.4.7): create a new ACL entry in the ACL pointed
- * to by acl_p.
- */
-int
-acl_create_entry(acl_t *acl_p, acl_entry_t *entry_p)
-{
-	struct acl *acl_int;
-
-	if (acl_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_int = &(*acl_p)->ats_acl;
-
-	/*
-	 * +1, because we are checking if there is space left for one more
-	 * entry.
-	 */
-	if (acl_int->acl_cnt + 1 >= ACL_MAX_ENTRIES) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*entry_p = &acl_int->acl_entry[acl_int->acl_cnt++];
-
-	(**entry_p).ae_tag  = ACL_UNDEFINED_TAG;
-	(**entry_p).ae_id   = ACL_UNDEFINED_ID;
-	(**entry_p).ae_perm = ACL_PERM_NONE;
-	(**entry_p).ae_entry_type = 0;
-	(**entry_p).ae_flags = 0;
-
-	(*acl_p)->ats_cur_entry = 0;
-
-	return (0);
-}
-
-int
-acl_create_entry_np(acl_t *acl_p, acl_entry_t *entry_p, int offset)
-{
-	int i;
-	struct acl *acl_int;
-
-	if (acl_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	acl_int = &(*acl_p)->ats_acl;
-
-	if (acl_int->acl_cnt + 1 >= ACL_MAX_ENTRIES) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (offset < 0 || offset >= acl_int->acl_cnt) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/* Make room for the new entry. */
-	for (i = acl_int->acl_cnt; i > offset; i--)
-		acl_int->acl_entry[i] = acl_int->acl_entry[i - 1];
-
-	acl_int->acl_cnt++;
-
-	*entry_p = &acl_int->acl_entry[offset];
-
-	(**entry_p).ae_tag  = ACL_UNDEFINED_TAG;
-	(**entry_p).ae_id   = ACL_UNDEFINED_ID;
-	(**entry_p).ae_perm = ACL_PERM_NONE;
-	(**entry_p).ae_entry_type = 0;
-	(**entry_p).ae_flags= 0;
-
-	(*acl_p)->ats_cur_entry = 0;
-
-	return (0);
-}
-
-/*
- * acl_get_entry() (23.4.14): returns an ACL entry from an ACL
- * indicated by entry_id.
- */
-int
-acl_get_entry(acl_t acl, int entry_id, acl_entry_t *entry_p)
-{
-	struct acl *acl_int;
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	acl_int = &acl->ats_acl;
-
-	switch(entry_id) {
-	case ACL_FIRST_ENTRY:
-		acl->ats_cur_entry = 0;
-		/* PASSTHROUGH */
-	case ACL_NEXT_ENTRY:
-		if (acl->ats_cur_entry >= acl->ats_acl.acl_cnt)
-			return 0;
-		*entry_p = &acl_int->acl_entry[acl->ats_cur_entry++];
-		return (1);
-	}
-
-	errno = EINVAL;
-	return (-1);
-}
diff --git a/lib/libc_bsd/posix1e/acl_flag.c b/lib/libc_bsd/posix1e/acl_flag.c
deleted file mode 100644
index 6e136a5..0000000
--- a/lib/libc_bsd/posix1e/acl_flag.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_flag.c 194957 2009-06-25 13:08:02Z trasz $");
-
-#include <stdio.h>
-#include <errno.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-static int
-_flag_is_invalid(acl_flag_t flag)
-{
-
-	if ((flag & ACL_FLAGS_BITS) == flag)
-		return (0);
-
-	errno = EINVAL;
-
-	return (1);
-}
-
-int
-acl_add_flag_np(acl_flagset_t flagset_d, acl_flag_t flag)
-{
-
-	if (flagset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_flag_is_invalid(flag))
-		return (-1);
-
-	*flagset_d |= flag;
-
-	return (0);
-}
-
-int
-acl_clear_flags_np(acl_flagset_t flagset_d)
-{
-
-	if (flagset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*flagset_d |= 0;
-
-	return (0);
-}
-
-int
-acl_delete_flag_np(acl_flagset_t flagset_d, acl_flag_t flag)
-{
-
-	if (flagset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_flag_is_invalid(flag))
-		return (-1);
-
-	*flagset_d &= ~flag;
-
-	return (0);
-}
-
-int
-acl_get_flag_np(acl_flagset_t flagset_d, acl_flag_t flag)
-{
-
-	if (flagset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_flag_is_invalid(flag))
-		return (-1);
-
-	if (*flagset_d & flag)
-		return (1);
-
-	return (0);
-}
-
-int
-acl_get_flagset_np(acl_entry_t entry_d, acl_flagset_t *flagset_p)
-{
-
-	if (entry_d == NULL || flagset_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*flagset_p = &entry_d->ae_flags;
-
-	return (0);
-}
-
-int
-acl_set_flagset_np(acl_entry_t entry_d, acl_flagset_t flagset_d)
-{
-
-	if (entry_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	_entry_brand_as(entry_d, ACL_BRAND_NFS4);
-
-	if (_flag_is_invalid(*flagset_d))
-		return (-1);
-
-	entry_d->ae_flags = *flagset_d;
-
-	return (0);
-}
diff --git a/lib/libc_bsd/posix1e/acl_free.3 b/lib/libc_bsd/posix1e/acl_free.3
deleted file mode 100644
index 53d0364..0000000
--- a/lib/libc_bsd/posix1e/acl_free.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_free.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd January 28, 2000
-.Dt ACL_FREE 3
-.Os
-.Sh NAME
-.Nm acl_free
-.Nd free ACL working state
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_free "void *obj_p"
-.Sh DESCRIPTION
-The
-.Fn acl_free
-call allows the freeing of ACL working space, such as is allocated by
-.Xr acl_dup 3 ,
-or
-.Xr acl_from_text 3 .
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-.Rv -std acl_free
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_free
-function shall return -1 and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Va obj_p
-argument is invalid.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_dup 3 ,
-.Xr acl_from_text 3 ,
-.Xr acl_get 3 ,
-.Xr acl_init 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc_bsd/posix1e/acl_free.c b/lib/libc_bsd/posix1e/acl_free.c
deleted file mode 100644
index 7dae1d1..0000000
--- a/lib/libc_bsd/posix1e/acl_free.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * acl_free -- free ACL objects from user memory
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_free.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-#include <stdlib.h>
-
-/*
- * acl_free() (23.4.12): free any releasable memory allocated to the
- * ACL data object identified by obj_p.
- */
-int
-acl_free(void *obj_p)
-{
-
-	if (obj_p) {
-		free(obj_p);
-		obj_p = NULL;
-	}
-
-	return (0);
-}
diff --git a/lib/libc_bsd/posix1e/acl_from_text.3 b/lib/libc_bsd/posix1e/acl_from_text.3
deleted file mode 100644
index dd304e0..0000000
--- a/lib/libc_bsd/posix1e/acl_from_text.3
+++ /dev/null
@@ -1,130 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_from_text.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd January 28, 2000
-.Dt ACL_FROM_TEXT 3
-.Os
-.Sh NAME
-.Nm acl_from_text
-.Nd create an ACL from text
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_from_text "const char *buf_p"
-.Sh DESCRIPTION
-The
-.Fn acl_from_text
-function converts the text form of an ACL referred to by
-.Va buf_p
-into the internal working structure for ACLs, appropriate for applying to
-files or manipulating.
-.Pp
-This function may cause memory to be allocated.
-The caller should free any
-releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void *)acl_t
-as an argument.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, the function shall return a pointer to the
-internal representation of the ACL in working storage.
-Otherwise, a value
-of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_from_text
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Va buf_p
-cannot be translated into an ACL.
-.It Bq Er ENOMEM
-The ACL working storage requires more memory than is allowed by the
-hardware or system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr acl_get 3 ,
-.Xr acl_to_text 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
-.Sh BUGS
-The
-.Fn acl_from_text
-and
-.Fn acl_to_text
-functions
-rely on the
-.Xr getpwent 3
-library calls to manage username and uid mapping, as well as the
-.Xr getgrent 3
-library calls to manage groupname and gid mapping.
-These calls are not
-thread safe, and so transitively, neither are
-.Fn acl_from_text
-and
-.Fn acl_to_text .
-These functions may also interfere with stateful
-calls associated with the
-.Fn getpwent
-and
-.Fn getgrent
-calls.
diff --git a/lib/libc_bsd/posix1e/acl_from_text.c b/lib/libc_bsd/posix1e/acl_from_text.c
deleted file mode 100644
index 30dcded..0000000
--- a/lib/libc_bsd/posix1e/acl_from_text.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * acl_from_text: Convert a text-form ACL from a string to an acl_t.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_from_text.c 209736 2010-07-06 17:20:08Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "acl_support.h"
-
-static acl_tag_t acl_string_to_tag(char *tag, char *qualifier);
-
-int _nfs4_acl_entry_from_text(acl_t aclp, char *entry);
-int _text_could_be_nfs4_acl(const char *entry);
-
-static acl_tag_t
-acl_string_to_tag(char *tag, char *qualifier)
-{
-
-	if (*qualifier == '\0') {
-		if ((!strcmp(tag, "user")) || (!strcmp(tag, "u"))) {
-			return (ACL_USER_OBJ);
-		} else
-		if ((!strcmp(tag, "group")) || (!strcmp(tag, "g"))) {
-			return (ACL_GROUP_OBJ);
-		} else
-		if ((!strcmp(tag, "mask")) || (!strcmp(tag, "m"))) {
-			return (ACL_MASK);
-		} else
-		if ((!strcmp(tag, "other")) || (!strcmp(tag, "o"))) {
-			return (ACL_OTHER);
-		} else
-			return(-1);
-	} else {
-		if ((!strcmp(tag, "user")) || (!strcmp(tag, "u"))) {
-			return(ACL_USER);
-		} else
-		if ((!strcmp(tag, "group")) || (!strcmp(tag, "g"))) {
-			return(ACL_GROUP);
-		} else
-			return(-1);
-	}
-}
-
-static int
-_posix1e_acl_entry_from_text(acl_t aclp, char *entry)
-{
-	acl_tag_t	 t;
-	acl_perm_t	 p;
-	char		*tag, *qualifier, *permission;
-	uid_t		 id;
-	int		 error;
-
-	assert(_acl_brand(aclp) == ACL_BRAND_POSIX);
-
-	/* Split into three ':' delimited fields. */
-	tag = strsep(&entry, ":");
-	if (tag == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	tag = string_skip_whitespace(tag);
-	if ((*tag == '\0') && (!entry)) {
-		/*
-		 * Is an entirely comment line, skip to next
-		 * comma.
-		 */
-		return (0);
-	}
-	string_trim_trailing_whitespace(tag);
-
-	qualifier = strsep(&entry, ":");
-	if (qualifier == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	qualifier = string_skip_whitespace(qualifier);
-	string_trim_trailing_whitespace(qualifier);
-
-	permission = strsep(&entry, ":");
-	if (permission == NULL || entry) {
-		errno = EINVAL;
-		return (-1);
-	}
-	permission = string_skip_whitespace(permission);
-	string_trim_trailing_whitespace(permission);
-
-	t = acl_string_to_tag(tag, qualifier);
-	if (t == -1) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	error = _posix1e_acl_string_to_perm(permission, &p);
-	if (error == -1) {
-		errno = EINVAL;
-		return (-1);
-	}		
-
-	switch(t) {
-		case ACL_USER_OBJ:
-		case ACL_GROUP_OBJ:
-		case ACL_MASK:
-		case ACL_OTHER:
-			if (*qualifier != '\0') {
-				errno = EINVAL;
-				return (-1);
-			}
-			id = 0;
-			break;
-
-		case ACL_USER:
-		case ACL_GROUP:
-			error = _acl_name_to_id(t, qualifier, &id);
-			if (error == -1)
-				return (-1);
-			break;
-
-		default:
-			errno = EINVAL;
-			return (-1);
-	}
-
-	error = _posix1e_acl_add_entry(aclp, t, id, p);
-	if (error == -1)
-		return (-1);
-
-	return (0);
-}
-
-static int
-_text_is_nfs4_entry(const char *entry)
-{
-	int count = 0;
-
-	assert(strlen(entry) > 0);
-
-	while (*entry != '\0') {
-		if (*entry == ':' || *entry == '@')
-			count++;
-		entry++;
-	}
-
-	if (count <= 2)
-		return (0);
-
-	return (1);
-}
-
-/*
- * acl_from_text -- Convert a string into an ACL.
- * Postpone most validity checking until the end and call acl_valid() to do
- * that.
- */
-acl_t
-acl_from_text(const char *buf_p)
-{
-	acl_t		 acl;
-	char		*mybuf_p, *line, *cur, *notcomment, *comment, *entry;
-	int		 error;
-
-	/* Local copy we can mess up. */
-	mybuf_p = strdup(buf_p);
-	if (mybuf_p == NULL)
-		return(NULL);
-
-	acl = acl_init(3); /* XXX: WTF, 3? */
-	if (acl == NULL) {
-		free(mybuf_p);
-		return(NULL);
-	}
-
-	/* Outer loop: delimit at \n boundaries. */
-	cur = mybuf_p;
-	while ((line = strsep(&cur, "\n"))) {
-		/* Now split the line on the first # to strip out comments. */
-		comment = line;
-		notcomment = strsep(&comment, "#");
-
-		/* Inner loop: delimit at ',' boundaries. */
-		while ((entry = strsep(&notcomment, ","))) {
-
-			/* Skip empty lines. */
-			if (strlen(string_skip_whitespace(entry)) == 0)
-				continue;
-
-			if (_acl_brand(acl) == ACL_BRAND_UNKNOWN) {
-				if (_text_is_nfs4_entry(entry))
-					_acl_brand_as(acl, ACL_BRAND_NFS4);
-				else
-					_acl_brand_as(acl, ACL_BRAND_POSIX);
-			}
-
-			switch (_acl_brand(acl)) {
-			case ACL_BRAND_NFS4:
-				error = _nfs4_acl_entry_from_text(acl, entry);
-				break;
-
-			case ACL_BRAND_POSIX:
-				error = _posix1e_acl_entry_from_text(acl, entry);
-				break;
-
-			default:
-				error = EINVAL;
-				break;
-			}
-
-			if (error)
-				goto error_label;
-		}
-	}
-
-#if 0
-	/* XXX Should we only return ACLs valid according to acl_valid? */
-	/* Verify validity of the ACL we read in. */
-	if (acl_valid(acl) == -1) {
-		errno = EINVAL;
-		goto error_label;
-	}
-#endif
-
-	free(mybuf_p);
-	return(acl);
-
-error_label:
-	acl_free(acl);
-	free(mybuf_p);
-	return(NULL);
-}
-
-/*
- * Given a username/groupname from a text form of an ACL, return the uid/gid
- * XXX NOT THREAD SAFE, RELIES ON GETPWNAM, GETGRNAM
- * XXX USES *PW* AND *GR* WHICH ARE STATEFUL AND THEREFORE THIS ROUTINE
- * MAY HAVE SIDE-EFFECTS
- */
-int
-_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id)
-{
-	struct group	*g;
-	struct passwd	*p;
-	unsigned long	l;
-	char 		*endp;
-
-	switch(tag) {
-	case ACL_USER:
-		p = getpwnam(name);
-		if (p == NULL) {
-			l = strtoul(name, &endp, 0);
-			if (*endp != '\0' || l != (unsigned long)(uid_t)l) {
-				errno = EINVAL;
-				return (-1);
-			}
-			*id = (uid_t)l;
-			return (0);
-		}
-		*id = p->pw_uid;
-		return (0);
-
-	case ACL_GROUP:
-		g = getgrnam(name);
-		if (g == NULL) {
-			l = strtoul(name, &endp, 0);
-			if (*endp != '\0' || l != (unsigned long)(gid_t)l) {
-				errno = EINVAL;
-				return (-1);
-			}
-			*id = (gid_t)l;
-			return (0);
-		}
-		*id = g->gr_gid;
-		return (0);
-
-	default:
-		return (EINVAL);
-	}
-}
diff --git a/lib/libc_bsd/posix1e/acl_from_text_nfs4.c b/lib/libc_bsd/posix1e/acl_from_text_nfs4.c
deleted file mode 100644
index c80fb93..0000000
--- a/lib/libc_bsd/posix1e/acl_from_text_nfs4.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_from_text_nfs4.c 209736 2010-07-06 17:20:08Z trasz $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
-#include <string.h>
-#include <pwd.h>
-#include <grp.h>
-#include <ctype.h>
-#include <err.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-#define MAX_ENTRY_LENGTH 512
-
-/*
- * Parse the tag field of ACL entry passed as "str".  If qualifier
- * needs to follow, then the variable referenced by "need_qualifier"
- * is set to 1, otherwise it's set to 0.
- */
-static int
-parse_tag(const char *str, acl_entry_t entry, int *need_qualifier)
-{
-
-	assert(need_qualifier != NULL);
-	*need_qualifier = 0;
-
-	if (strcmp(str, "owner@") == 0)
-		return (acl_set_tag_type(entry, ACL_USER_OBJ));
-	if (strcmp(str, "group@") == 0)
-		return (acl_set_tag_type(entry, ACL_GROUP_OBJ));
-	if (strcmp(str, "everyone@") == 0)
-		return (acl_set_tag_type(entry, ACL_EVERYONE));
-
-	*need_qualifier = 1;
-
-	if (strcmp(str, "user") == 0 || strcmp(str, "u") == 0)
-		return (acl_set_tag_type(entry, ACL_USER));
-	if (strcmp(str, "group") == 0 || strcmp(str, "g") == 0)
-		return (acl_set_tag_type(entry, ACL_GROUP));
-
-	warnx("malformed ACL: invalid \"tag\" field");
-
-	return (-1);
-}
-
-/*
- * Parse the qualifier field of ACL entry passed as "str".
- * If user or group name cannot be resolved, then the variable
- * referenced by "need_qualifier" is set to 1; it will be checked
- * later to figure out whether the appended_id is required.
- */
-static int
-parse_qualifier(char *str, acl_entry_t entry, int *need_qualifier)
-{
-	int qualifier_length, error;
-	uid_t id;
-	acl_tag_t tag;
-
-	assert(need_qualifier != NULL);
-	*need_qualifier = 0;
-
-	qualifier_length = strlen(str);
-
-	if (qualifier_length == 0) {
-		warnx("malformed ACL: empty \"qualifier\" field");
-		return (-1);
-	}
-
-	error = acl_get_tag_type(entry, &tag);
-	if (error)
-		return (error);
-
-	error = _acl_name_to_id(tag, str, &id);
-	if (error) {
-		*need_qualifier = 1;
-		return (0);
-	}
-
-	return (acl_set_qualifier(entry, &id));
-}
-
-static int
-parse_access_mask(char *str, acl_entry_t entry)
-{
-	int error;
-	acl_perm_t perm;
-
-	error = _nfs4_parse_access_mask(str, &perm);
-	if (error)
-		return (error);
-
-	error = acl_set_permset(entry, &perm);
-
-	return (error);
-}
-
-static int
-parse_flags(char *str, acl_entry_t entry)
-{
-	int error;
-	acl_flag_t flags;
-
-	error = _nfs4_parse_flags(str, &flags);
-	if (error)
-		return (error);
-
-	error = acl_set_flagset_np(entry, &flags);
-
-	return (error);
-}
-
-static int
-parse_entry_type(const char *str, acl_entry_t entry)
-{
-
-	if (strcmp(str, "allow") == 0)
-		return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_ALLOW));
-	if (strcmp(str, "deny") == 0)
-		return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_DENY));
-	if (strcmp(str, "audit") == 0)
-		return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_AUDIT));
-	if (strcmp(str, "alarm") == 0)
-		return (acl_set_entry_type_np(entry, ACL_ENTRY_TYPE_ALARM));
-
-	warnx("malformed ACL: invalid \"type\" field");
-
-	return (-1);
-}
-
-static int
-parse_appended_id(char *str, acl_entry_t entry)
-{
-	int qualifier_length;
-	char *end;
-	id_t id;
-
-	qualifier_length = strlen(str);
-	if (qualifier_length == 0) {
-		warnx("malformed ACL: \"appended id\" field present, "
-	           "but empty");
-		return (-1);
-	}
-
-	id = strtod(str, &end);
-	if (end - str != qualifier_length) {
-		warnx("malformed ACL: appended id is not a number");
-		return (-1);
-	}
-
-	return (acl_set_qualifier(entry, &id));
-}
-
-static int
-number_of_colons(const char *str)
-{
-	int count = 0;
-
-	while (*str != '\0') {
-		if (*str == ':')
-			count++;
-
-		str++;
-	}
-
-	return (count);
-}
-
-int
-_nfs4_acl_entry_from_text(acl_t aclp, char *str)
-{
-	int error, need_qualifier;
-	acl_entry_t entry;
-	char *field, *qualifier_field;
-
-	error = acl_create_entry(&aclp, &entry);
-	if (error)
-		return (error);
-
-	assert(_entry_brand(entry) == ACL_BRAND_NFS4);
-
-	if (str == NULL)
-		goto truncated_entry;
-	field = strsep(&str, ":");
-
-	field = string_skip_whitespace(field);
-	if ((*field == '\0') && (!str)) {
-		/*
-		 * Is an entirely comment line, skip to next
-		 * comma.
-		 */
-		return (0);
-	}
-
-	error = parse_tag(field, entry, &need_qualifier);
-	if (error)
-		goto malformed_field;
-
-	if (need_qualifier) {
-		if (str == NULL)
-			goto truncated_entry;
-		qualifier_field = field = strsep(&str, ":");
-		error = parse_qualifier(field, entry, &need_qualifier);
-		if (error)
-			goto malformed_field;
-	}
-
-	if (str == NULL)
-		goto truncated_entry;
-	field = strsep(&str, ":");
-	error = parse_access_mask(field, entry);
-	if (error)
-		goto malformed_field;
-
-	if (str == NULL)
-		goto truncated_entry;
-	/* Do we have "flags" field? */
-	if (number_of_colons(str) > 0) {
-		field = strsep(&str, ":");
-		error = parse_flags(field, entry);
-		if (error)
-			goto malformed_field;
-	}
-
-	if (str == NULL)
-		goto truncated_entry;
-	field = strsep(&str, ":");
-	error = parse_entry_type(field, entry);
-	if (error)
-		goto malformed_field;
-
-	if (need_qualifier) {
-		if (str == NULL) {
-			warnx("malformed ACL: unknown user or group name "
-			    "\"%s\"", qualifier_field);
-			goto truncated_entry;
-		}
-
-		error = parse_appended_id(str, entry);
-		if (error)
-			goto malformed_field;
-	}
-
-	return (0);
-
-truncated_entry:
-malformed_field:
-	acl_delete_entry(aclp, entry);
-	errno = EINVAL;
-	return (-1);
-}
diff --git a/lib/libc_bsd/posix1e/acl_get.3 b/lib/libc_bsd/posix1e/acl_get.3
deleted file mode 100644
index bd1ca84..0000000
--- a/lib/libc_bsd/posix1e/acl_get.3
+++ /dev/null
@@ -1,168 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get.3 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd June 25, 2009
-.Dt ACL_GET 3
-.Os
-.Sh NAME
-.Nm acl_get_fd ,
-.Nm acl_get_fd_np ,
-.Nm acl_get_file ,
-.Nm acl_get_link_np
-.Nd get an ACL for a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_get_fd "int fd"
-.Ft acl_t
-.Fn acl_get_fd_np "int fd" "acl_type_t type"
-.Ft acl_t
-.Fn acl_get_file "const char *path_p" "acl_type_t type"
-.Ft acl_t
-.Fn acl_get_link_np "const char *path_p" "acl_type_t type"
-.Sh DESCRIPTION
-The
-.Fn acl_get_fd ,
-.Fn acl_get_file ,
-.Fn acl_get_link_np ,
-and
-.Fn acl_get_fd_np
-each allow the retrieval of an ACL from a file.
-The
-.Fn acl_get_fd
-is a POSIX.1e call that allows the retrieval of an ACL of type
-ACL_TYPE_ACCESS
-from a file descriptor.
-The
-.Fn acl_get_fd_np
-function
-is a non-portable form of
-.Fn acl_get_fd
-that allows the retrieval of any type of ACL from a file descriptor.
-The
-.Fn acl_get_file
-function is a POSIX.1e call that allows the retrieval of a
-specified type of ACL from a file by name;
-.Fn acl_get_link_np
-is a non-portable variation on
-.Fn acl_get_file
-which does not follow a symlink if the target of the call is a
-symlink.
-.Pp
-These functions may cause memory to be allocated.
-The caller should free
-any releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void *)acl_t
-as an argument.
-.Pp
-The ACL in the working storage is an independent copy of the ACL associated
-with the object referred to by
-.Va fd .
-The ACL in the working storage shall not participate in any access control
-decisions.
-.Pp
-Valid values for the
-.Va type
-argument are:
-.Bl -column -offset 3n "ACL_TYPE_DEFAULT"
-.It ACL_TYPE_ACCESS	POSIX.1e access ACL
-.It ACL_TYPE_DEFAULT	POSIX.1e default ACL
-.It ACL_TYPE_NFS4	NFSv4 ACL
-.El
-.Pp
-The ACL returned will be branded accordingly.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, the function shall return a pointer to the ACL
-that was retrieved.
-Otherwise, a value of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_get_fd
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or the
-object exists and the process does not have appropriate access rights.
-.It Bq Er EBADF
-The
-.Va fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-The ACL type passed is invalid for this file object.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an
-entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named object does not exist, or the
-.Va path_p
-argument points to an empty string.
-.It Bq Er ENOMEM
-Insufficient memory available to fulfill request.
-.It Bq Er EOPNOTSUPP
-The file system does not support ACL retrieval.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr acl_get 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_set 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc_bsd/posix1e/acl_get.c b/lib/libc_bsd/posix1e/acl_get.c
deleted file mode 100644
index fc712e2..0000000
--- a/lib/libc_bsd/posix1e/acl_get.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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.
- */
-/*
- * acl_get_fd - syscall wrapper for retrieving access ACL by fd
- * acl_get_fd_np - syscall wrapper for retrieving ACL by fd (non-POSIX)
- * acl_get_file - syscall wrapper for retrieving ACL by filename
- * acl_get_link_np - syscall wrapper for retrieving ACL by filename (NOFOLLOW)
- *                   (non-POSIX)
- * acl_get_perm_np() checks if a permission is in the specified
- *                   permset (non-POSIX)
- * acl_get_permset() returns the permission set in the ACL entry
- * acl_get_qualifier() retrieves the qualifier of the tag from the ACL entry
- * acl_get_tag_type() returns the tag type for the ACL entry entry_d
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_get.c 208437 2010-05-23 08:12:36Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "acl_support.h"
-
-acl_t
-acl_get_file(const char *path_p, acl_type_t type)
-{
-	acl_t	aclp;
-	int	error;
-
-	aclp = acl_init(ACL_MAX_ENTRIES);
-	if (aclp == NULL)
-		return (NULL);
-
-	type = _acl_type_unold(type);
-	error = __acl_get_file(path_p, type, &aclp->ats_acl);
-	if (error) {
-		acl_free(aclp);
-		return (NULL);
-	}
-
-	aclp->ats_acl.acl_maxcnt = ACL_MAX_ENTRIES;
-	_acl_brand_from_type(aclp, type);
-
-	return (aclp);
-}
-
-acl_t
-acl_get_link_np(const char *path_p, acl_type_t type)
-{
-	acl_t	aclp;
-	int	error;
-
-	aclp = acl_init(ACL_MAX_ENTRIES);
-	if (aclp == NULL)
-		return (NULL);
-
-	type = _acl_type_unold(type);
-	error = __acl_get_link(path_p, type, &aclp->ats_acl);
-	if (error) {
-		acl_free(aclp);
-		return (NULL);
-	}
-
-	aclp->ats_acl.acl_maxcnt = ACL_MAX_ENTRIES;
-	_acl_brand_from_type(aclp, type);
-
-	return (aclp);
-}
-
-acl_t
-acl_get_fd(int fd)
-{
-	if (fpathconf(fd, _PC_ACL_NFS4) == 1)
-		return (acl_get_fd_np(fd, ACL_TYPE_NFS4));
-
-	return (acl_get_fd_np(fd, ACL_TYPE_ACCESS));
-}
-
-acl_t
-acl_get_fd_np(int fd, acl_type_t type)
-{
-	acl_t	aclp;
-	int	error;
-
-	aclp = acl_init(ACL_MAX_ENTRIES);
-	if (aclp == NULL)
-		return (NULL);
-
-	type = _acl_type_unold(type);
-	error = ___acl_get_fd(fd, type, &aclp->ats_acl);
-	if (error) {
-		acl_free(aclp);
-		return (NULL);
-	}
-
-	aclp->ats_acl.acl_maxcnt = ACL_MAX_ENTRIES;
-	_acl_brand_from_type(aclp, type);
-
-	return (aclp);
-}
-
-/*
- * acl_get_permset() (23.4.17): return via permset_p a descriptor to
- * the permission set in the ACL entry entry_d.
- */
-int
-acl_get_permset(acl_entry_t entry_d, acl_permset_t *permset_p)
-{
-
-	if (entry_d == NULL || permset_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*permset_p = &entry_d->ae_perm;
-
-	return (0);
-}
-
-/*
- * acl_get_qualifier() (23.4.18): retrieve the qualifier of the tag
- * for the ACL entry entry_d.
- */
-void *
-acl_get_qualifier(acl_entry_t entry_d)
-{
-	uid_t *retval;
-
-	if (entry_d == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	switch(entry_d->ae_tag) {
-	case ACL_USER:
-	case ACL_GROUP:
-		retval = malloc(sizeof(uid_t));
-		if (retval == NULL)
-			return (NULL);
-		*retval = entry_d->ae_id;
-		return (retval);
-	}
-
-	errno = EINVAL;
-	return (NULL);
-}
-
-/*
- * acl_get_tag_type() (23.4.19): return the tag type for the ACL
- * entry entry_p.
- */
-int
-acl_get_tag_type(acl_entry_t entry_d, acl_tag_t *tag_type_p)
-{
-
-	if (entry_d == NULL || tag_type_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*tag_type_p = entry_d->ae_tag;
-
-	return (0);
-}
-
-int
-acl_get_entry_type_np(acl_entry_t entry_d, acl_entry_type_t *entry_type_p)
-{
-
-	if (entry_d == NULL || entry_type_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*entry_type_p = entry_d->ae_entry_type;
-
-	return (0);
-}
diff --git a/lib/libc_bsd/posix1e/acl_get_brand_np.3 b/lib/libc_bsd/posix1e/acl_get_brand_np.3
deleted file mode 100644
index 78b9b4b..0000000
--- a/lib/libc_bsd/posix1e/acl_get_brand_np.3
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get_brand_np.3 204725 2010-03-04 19:38:24Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_GET_BRAND_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_brand_np
-.Nd retrieve the ACL brand from an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_brand_np "acl_t acl" "int *brand_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_brand_np
-function
-is a non-portable call that returns the ACL brand for the ACL
-.Fa acl .
-Upon successful completion, the location referred to by the argument
-.Fa brand_p
-will be set to the ACL brand of the ACL
-.Fa acl .
-.Pp
-Branding is an internal mechanism intended to prevent mixing POSIX.1e
-and NFSv4 entries by mistake.
-It's also used by the libc to determine how to print out the ACL.
-The first call to function that is specific for one particular brand - POSIX.1e
-or NFSv4 - "brands" the ACL.
-After that, calling function specific to another brand will result in error.
-.Sh RETURN VALUES
-.Rv -std acl_get_brand_np
-.Sh ERRORS
-The
-.Fn acl_get_brand_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl
-does not point to a valid ACL.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_brand_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_brand_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_get_entry.3 b/lib/libc_bsd/posix1e/acl_get_entry.3
deleted file mode 100644
index 67d6c14..0000000
--- a/lib/libc_bsd/posix1e/acl_get_entry.3
+++ /dev/null
@@ -1,145 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_entry.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd April 13, 2001
-.Dt ACL_GET_ENTRY 3
-.Os
-.Sh NAME
-.Nm acl_get_entry
-.Nd retrieve an ACL entry from an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_entry "acl_t acl" "int entry_id" "acl_entry_t *entry_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_entry
-function
-is a POSIX.1e call that retrieves a descriptor for an ACL entry
-specified by the argument
-.Fa entry_d
-within the ACL indicated by the argument
-.Fa acl .
-.Pp
-If the value of
-.Fa entry_id
-is
-.Dv ACL_FIRST_ENTRY ,
-then the function will return in
-.Fa entry_p
-a descriptor for the first ACL entry within
-.Fa acl .
-If a call is made to
-.Fn acl_get_entry
-with
-.Fa entry_id
-set to
-.Dv ACL_NEXT_ENTRY
-when there has not been either an initial successful call to
-.Fn acl_get_entry ,
-or a previous successful call to
-.Fn acl_create_entry ,
-.Fn acl_delete_entry ,
-.Fn acl_dup ,
-.Fn acl_from_text ,
-.Fn acl_get_fd ,
-.Fn acl_get_file ,
-.Fn acl_set_fd ,
-.Fn acl_set_file ,
-or
-.Fn acl_valid ,
-then the result is unspecified.
-.Sh RETURN VALUES
-If the
-.Fn acl_get_entry
-function successfully obtains an ACL entry, a value of 1 is returned.
-If the ACL has no ACL entries, the
-.Fn acl_get_entry
-returns a value of 0.
-If the value of
-.Fa entry_id
-is
-.Dv ACL_NEXT_ENTRY
-and the last ACL entry in the ACL has already been returned by a
-previous call to
-.Fn acl_get_entry ,
-a value of 0 will be returned until a successful call with
-.Fa entry_id
-of
-.Dv ACL_FIRST_ENTRY
-is made.
-Otherwise, a value of -1 will be returned and
-the global variable
-.Va errno
-will be set to indicate the error.
-.Sh ERRORS
-The
-.Fn acl_get_entry
-fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa acl
-does not point to a valid ACL.
-Argument
-.Fa entry_id
-is neither
-.Dv ACL_FIRST_ENTRY
-nor
-.Dv ACL_NEXT_ENTRY .
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_calc_mask 3 ,
-.Xr acl_create_entry 3 ,
-.Xr acl_delete_entry 3 ,
-.Xr acl_dup 3 ,
-.Xr acl_from_text 3 ,
-.Xr acl_get_fd 3 ,
-.Xr acl_get_file 3 ,
-.Xr acl_init 3 ,
-.Xr acl_set_fd 3 ,
-.Xr acl_set_file 3 ,
-.Xr acl_valid 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_entry
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_entry
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_get_entry_type_np.3 b/lib/libc_bsd/posix1e/acl_get_entry_type_np.3
deleted file mode 100644
index 95e5345..0000000
--- a/lib/libc_bsd/posix1e/acl_get_entry_type_np.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get_entry_type_np.3 204725 2010-03-04 19:38:24Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_GET_ENTRY_TYPE_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_entry_type_np
-.Nd retrieve the ACL type from an NFSv4 ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_entry_type_np "acl_entry_t entry_d" "acl_entry_type_t *entry_type_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_entry_type_np
-function
-is a non-portable call that returns the ACL type for the NFSv4 ACL entry
-.Fa entry_d .
-Upon successful completion, the location referred to by the argument
-.Fa entry_type_p
-will be set to the ACL type of the ACL entry
-.Fa entry_d .
-.Sh RETURN VALUES
-.Rv -std acl_get_entry_type_np
-.Sh ERRORS
-The
-.Fn acl_get_entry_type_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an NFSv4 ACL entry;
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_set_entry_type_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_entry_type_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_entry_type_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_get_flag_np.3 b/lib/libc_bsd/posix1e/acl_get_flag_np.3
deleted file mode 100644
index 9a06aed..0000000
--- a/lib/libc_bsd/posix1e/acl_get_flag_np.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get_flag_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_GET_FLAG_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_flag_np
-.Nd check if a flag is set in a flagset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_flag_np "acl_flagset_t flagset_d" "acl_flag_t flag"
-.Sh DESCRIPTION
-The
-.Fn acl_get_flag_np
-function
-is a non-portable function that checks if a NFSv4 ACL flag is set in
-a flagset.
-.Sh RETURN VALUES
-If the flag in
-.Fa flag
-is set in the flagset
-.Fa flagset_d ,
-a value of
-1
-is returned, otherwise a value of
-0
-is returned.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_get_flag_np
-function will return a value of
-\-1
-and set global variable
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa flag
-does not contain a valid ACL flag or argument
-.Fa flagset_d
-is not a valid ACL flagset.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_flag_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_flag_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_get_flagset_np.3 b/lib/libc_bsd/posix1e/acl_get_flagset_np.3
deleted file mode 100644
index a25b738..0000000
--- a/lib/libc_bsd/posix1e/acl_get_flagset_np.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_get_flagset_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_GET_FLAGSET_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_flagset_np
-.Nd retrieve flagset from an NFSv4 ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_flagset_np "acl_entry_t entry_d" "acl_flagset_t *flagset_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_flagset_np
-function
-is a non-portable call that returns via
-.Fa flagset_np_p
-a descriptor to the flagset in the NFSv4 ACL entry
-.Fa entry_d .
-Subsequent operations using the returned flagset operate
-on the flagset within the ACL entry.
-.Sh RETURN VALUES
-.Rv -std acl_get_flagset_np
-.Sh ERRORS
-The
-.Fn acl_get_flagset_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_set_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_flagset_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_flagset_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_get_perm_np.3 b/lib/libc_bsd/posix1e/acl_get_perm_np.3
deleted file mode 100644
index 1fb007e..0000000
--- a/lib/libc_bsd/posix1e/acl_get_perm_np.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_perm_np.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd April 10, 2001
-.Dt ACL_GET_PERM_NP 3
-.Os
-.Sh NAME
-.Nm acl_get_perm_np
-.Nd "check if a permission is set in a permission set"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_perm_np "acl_permset_t permset_d" "acl_perm_t perm"
-.Sh DESCRIPTION
-The
-.Fn acl_get_perm_np
-function
-is a non-portable function that checks if a permission is set in
-a permission set.
-.Sh RETURN VALUES
-If the permission in
-.Fa perm
-is set in the permission set
-.Fa permset_d ,
-a value of
-1
-is returned, otherwise a value of
-0
-is returned.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_get_perm_np
-function will return a value of
-\-1
-and set global variable
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa perm
-does not contain a valid ACL permission or argument
-.Fa permset_d
-is not a valid ACL permset.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_get_permset 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_perm_np
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_perm_np
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_get_permset.3 b/lib/libc_bsd/posix1e/acl_get_permset.3
deleted file mode 100644
index 0c84964..0000000
--- a/lib/libc_bsd/posix1e/acl_get_permset.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_permset.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_GET_PERMSET 3
-.Os
-.Sh NAME
-.Nm acl_get_permset
-.Nd retrieve permission set from an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_permset "acl_entry_t entry_d" "acl_permset_t *permset_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_permset
-function
-is a POSIX.1e call that returns via
-.Fa permset_p
-a descriptor to the permission set in the ACL entry
-.Fa entry_d .
-Subsequent operations using the returned permission set operate
-on the permission set within the ACL entry.
-.Sh RETURN VALUES
-.Rv -std acl_get_permset
-.Sh ERRORS
-The
-.Fn acl_get_permset
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_set_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_permset
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_permset
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_get_qualifier.3 b/lib/libc_bsd/posix1e/acl_get_qualifier.3
deleted file mode 100644
index 68b1494..0000000
--- a/lib/libc_bsd/posix1e/acl_get_qualifier.3
+++ /dev/null
@@ -1,140 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_qualifier.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 13, 2001
-.Dt ACL_GET_QUALIFIER 3
-.Os
-.Sh NAME
-.Nm acl_get_qualifier
-.Nd retrieve the qualifier from an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft void *
-.Fn acl_get_qualifier "acl_entry_t entry_d"
-.Sh DESCRIPTION
-The
-.Fn acl_get_qualifier
-function
-is a POSIX.1e call that retrieves the qualifier of the tag for
-the ACL entry indicated by the argument
-.Fa entry_d
-into working storage and returns a pointer to that storage.
-.Pp
-If the value of the tag type in the ACL entry referred to by
-.Fa entry_d
-is
-.Dv ACL_USER ,
-then the value returned by
-.Fn acl_get_qualifier
-will be a pointer to type
-.Vt uid_t .
-.Pp
-If the value of the tag type in
-the ACL entry referred to by
-.Fa entry_d
-is
-.Dv ACL_GROUP ,
-then the value returned by
-.Fn acl_get_qualifier
-will be a pointer to type
-.Vt gid_t .
-.Pp
-If the value of the tag type in the ACL entry referred to by
-.Fa entry_d
-is
-.Dv ACL_UNDEFINED_TAG , ACL_USER_OBJ , ACL_GROUP_OBJ ,
-.Dv ACL_OTHER , ACL_MASK ,
-or an implementation-defined value for which a qualifier
-is not supported, then
-.Fn acl_get_qualifier
-will return a value of
-.Vt ( void * ) Ns Dv NULL
-and the function will fail.
-.Pp
-This function may cause memory to be allocated.
-The caller should
-free any releasable memory, when the new qualifier is no longer
-required, by calling
-.Fn acl_free
-with
-.Vt void *
-as the argument.
-.Sh RETURN VALUES
-The
-.Fn acl_get_qualifier
-function returns a pointer to the allocated storage if successful;
-otherwise a
-.Dv NULL
-pointer is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn acl_get_qualifier
-fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-does not point to a valid descriptor for an ACL entry.
-The
-value of the tag type in the ACL entry referenced by argument
-.Fa entry_d
-is not
-.Dv ACL_USER
-or
-.Dv ACL_GROUP .
-.It Bq Er ENOMEM
-The value to be returned requires more memory than is allowed
-by the hardware or system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_create_entry 3 ,
-.Xr acl_free 3 ,
-.Xr acl_get_entry 3 ,
-.Xr acl_get_tag_type 3 ,
-.Xr acl_set_qualifier 3 ,
-.Xr acl_set_tag_type 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_qualifier
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_qualifier
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_get_tag_type.3 b/lib/libc_bsd/posix1e/acl_get_tag_type.3
deleted file mode 100644
index 37cf258..0000000
--- a/lib/libc_bsd/posix1e/acl_get_tag_type.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_get_tag_type.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_GET_TAG_TYPE 3
-.Os
-.Sh NAME
-.Nm acl_get_tag_type
-.Nd retrieve the tag type from an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_get_tag_type "acl_entry_t entry_d" "acl_tag_t *tag_type_p"
-.Sh DESCRIPTION
-The
-.Fn acl_get_tag_type
-function
-is a POSIX.1e call that returns the tag type for the ACL entry
-.Fa entry_d .
-Upon successful completion, the location referred to by the argument
-.Fa tag_type_p
-will be set to the tag type of the ACL entry
-.Fa entry_d .
-.Sh RETURN VALUES
-.Rv -std acl_get_tag_type
-.Sh ERRORS
-The
-.Fn acl_get_tag_type
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry;
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_create_entry 3 ,
-.Xr acl_get_entry 3 ,
-.Xr acl_get_qualifier 3 ,
-.Xr acl_init 3 ,
-.Xr acl_set_qualifier 3 ,
-.Xr acl_set_tag_type 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_tag_type
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_tag_type
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_id_to_name.c b/lib/libc_bsd/posix1e/acl_id_to_name.c
deleted file mode 100644
index 783b8a4..0000000
--- a/lib/libc_bsd/posix1e/acl_id_to_name.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 1999-2001, 2008 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * Support functionality for the POSIX.1e ACL interface
- * These calls are intended only to be called within the library.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_id_to_name.c 209147 2010-06-14 02:26:13Z kientzle $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <errno.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "acl_support.h"
-
-/*
- * Given a uid/gid, return a username/groupname for the text form of an ACL.
- * Note that we truncate user and group names, rather than error out, as
- * this is consistent with other tools manipulating user and group names.
- * XXX NOT THREAD SAFE, RELIES ON GETPWUID, GETGRGID
- * XXX USES *PW* AND *GR* WHICH ARE STATEFUL AND THEREFORE THIS ROUTINE
- * MAY HAVE SIDE-EFFECTS
- */
-int
-_posix1e_acl_id_to_name(acl_tag_t tag, uid_t id, ssize_t buf_len, char *buf,
-    int flags)
-{
-	struct group	*g;
-	struct passwd	*p;
-	int	i;
-
-	switch(tag) {
-	case ACL_USER:
-		if (flags & ACL_TEXT_NUMERIC_IDS)
-			p = NULL;
-		else
-			p = getpwuid(id);
-		if (!p)
-			i = snprintf(buf, buf_len, "%d", id);
-		else
-			i = snprintf(buf, buf_len, "%s", p->pw_name);
-
-		if (i < 0) {
-			errno = ENOMEM;
-			return (-1);
-		}
-		return (0);
-
-	case ACL_GROUP:
-		if (flags & ACL_TEXT_NUMERIC_IDS)
-			g = NULL;
-		else
-			g = getgrgid(id);
-		if (g == NULL)
-			i = snprintf(buf, buf_len, "%d", id);
-		else
-			i = snprintf(buf, buf_len, "%s", g->gr_name);
-
-		if (i < 0) {
-			errno = ENOMEM;
-			return (-1);
-		}
-		return (0);
-
-	default:
-		return (EINVAL);
-	}
-}
diff --git a/lib/libc_bsd/posix1e/acl_init.3 b/lib/libc_bsd/posix1e/acl_init.3
deleted file mode 100644
index e298454..0000000
--- a/lib/libc_bsd/posix1e/acl_init.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_init.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd January 28, 2000
-.Dt ACL_INIT 3
-.Os
-.Sh NAME
-.Nm acl_init
-.Nd initialize ACL working storage
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_init "int count"
-.Sh DESCRIPTION
-The
-.Fn acl_init
-function allocates and initializes the working storage for an ACL of at
-least
-.Va count
-ACL entries.
-A pointer to the working storage is returned.
-The working
-storage allocated to contain the ACL is freed by a call to
-.Xr acl_free 3 .
-When the area is first allocated, it shall contain an ACL that contains
-no ACL entries.
-.Pp
-This function may cause memory to be allocated.
-The caller should free any
-releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void*)acl_t
-as an argument.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, this function shall return a pointer to the
-working storage.
-Otherwise, a value of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_init
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of count is less than zero.
-.It Bq Er ENOMEM
-The
-.Va acl_t
-to be returned requires more memory than is allowed by the hardware or
-system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc_bsd/posix1e/acl_init.c b/lib/libc_bsd/posix1e/acl_init.c
deleted file mode 100644
index bc512d8..0000000
--- a/lib/libc_bsd/posix1e/acl_init.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * acl_init -- return a fresh acl structure
- * acl_dup -- duplicate an acl and return the new copy
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_init.c 194955 2009-06-25 12:46:59Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "acl_support.h"
-
-#ifndef CTASSERT
-#define CTASSERT(x)		_CTASSERT(x, __LINE__)
-#define _CTASSERT(x, y)		__CTASSERT(x, y)
-#define __CTASSERT(x, y)	typedef char __assert_ ## y [(x) ? 1 : -1]
-#endif
-
-CTASSERT(1 << _ACL_T_ALIGNMENT_BITS > sizeof(struct acl_t_struct));
-
-acl_t
-acl_init(int count)
-{
-	int error;
-	acl_t acl;
-
-	if (count > ACL_MAX_ENTRIES) {
-		errno = ENOMEM;
-		return (NULL);
-	}
-	if (count < 0) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	error = posix_memalign((void *)&acl, 1 << _ACL_T_ALIGNMENT_BITS,
-	    sizeof(struct acl_t_struct));
-	if (error)
-		return (NULL);
-
-	bzero(acl, sizeof(struct acl_t_struct));
-	acl->ats_brand = ACL_BRAND_UNKNOWN;
-	acl->ats_acl.acl_maxcnt = ACL_MAX_ENTRIES;
-
-	return (acl);
-}
-
-acl_t
-acl_dup(acl_t acl)
-{
-	acl_t	acl_new;
-
-	acl_new = acl_init(ACL_MAX_ENTRIES);
-	if (acl_new != NULL) {
-		*acl_new = *acl;
-		acl->ats_cur_entry = 0;
-		acl_new->ats_cur_entry = 0;
-	}
-
-	return (acl_new);
-}
diff --git a/lib/libc_bsd/posix1e/acl_is_trivial_np.3 b/lib/libc_bsd/posix1e/acl_is_trivial_np.3
deleted file mode 100644
index 11d4299..0000000
--- a/lib/libc_bsd/posix1e/acl_is_trivial_np.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_is_trivial_np.3 258877 2013-12-03 18:28:18Z trasz $
-.\"
-.Dd November 12, 2013
-.Dt ACL_STRIP_NP 3
-.Os
-.Sh NAME
-.Nm acl_is_trivial_np
-.Nd determine whether ACL is trivial
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_is_trivial_np "const acl_t aclp" "int *trivialp"
-.Sh DESCRIPTION
-The
-.Fn acl_is_trivial
-function determines whether the ACL pointed to by the argument
-.Va acl
-is trivial.
-Upon successful completion, the location referred to by the argument
-.Fa trivialp
-will be set to 1, if the ACL
-.Fa aclp
-points to is trivial, or 0 if it's not.
-.Pp
-ACL is trivial if it can be fully expressed as a file mode without losing
-any access rules.
-For POSIX.1e ACLs, ACL is trivial if it has the three required entries,
-one for owner, one for owning group, and one for other.
-For NFSv4 ACLs, ACL is trivial if it is identical to the ACL generated by
-.Fn acl_strip_np 3 .
-Files that have non-trivial ACL have a plus sign appended after mode bits
-in "ls -l" output.
-.Sh RETURN VALUES
-.Rv -std acl_get_tag_type
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_is_trivial_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_perm.c b/lib/libc_bsd/posix1e/acl_perm.c
deleted file mode 100644
index ae60081..0000000
--- a/lib/libc_bsd/posix1e/acl_perm.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Chris D. Faulhaber
- * 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.
- *
- * 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_perm.c 208437 2010-05-23 08:12:36Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <string.h>
-
-static int
-_perm_is_invalid(acl_perm_t perm)
-{
-
-	/* Check if more than a single bit is set. */
-	if ((perm & -perm) == perm &&
-	    (perm & (ACL_POSIX1E_BITS | ACL_NFS4_PERM_BITS)) == perm)
-		return (0);
-
-	errno = EINVAL;
-
-	return (1);
-}
-
-/*
- * acl_add_perm() (23.4.1): add the permission contained in perm to the
- * permission set permset_d
- */
-int
-acl_add_perm(acl_permset_t permset_d, acl_perm_t perm)
-{
-
-	if (permset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_perm_is_invalid(perm))
-		return (-1);
-
-	*permset_d |= perm;
-
-	return (0);
-}
-
-/*
- * acl_clear_perms() (23.4.3): clear all permisions from the permission
- * set permset_d
- */
-int
-acl_clear_perms(acl_permset_t permset_d)
-{
-
-	if (permset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	*permset_d = ACL_PERM_NONE;
-
-	return (0);
-}
-
-/*
- * acl_delete_perm() (23.4.10): remove the permission in perm from the
- * permission set permset_d
- */
-int
-acl_delete_perm(acl_permset_t permset_d, acl_perm_t perm)
-{
-
-	if (permset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_perm_is_invalid(perm))
-		return (-1);
-
-	*permset_d &= ~perm;
-
-	return (0);
-}
-
-int
-acl_get_perm_np(acl_permset_t permset_d, acl_perm_t perm)
-{
-
-	if (permset_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (_perm_is_invalid(perm))
-		return (-1);
-
-	if (*permset_d & perm)
-		return (1);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/posix1e/acl_set.3 b/lib/libc_bsd/posix1e/acl_set.3
deleted file mode 100644
index 7a1e45d..0000000
--- a/lib/libc_bsd/posix1e/acl_set.3
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_set.3 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd June 25, 2009
-.Dt ACL_SET 3
-.Os
-.Sh NAME
-.Nm acl_set_fd ,
-.Nm acl_set_fd_np ,
-.Nm acl_set_file ,
-.Nm acl_set_link_np
-.Nd set an ACL for a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_fd "int fd" "acl_t acl"
-.Ft int
-.Fn acl_set_fd_np "int fd" "acl_t acl" "acl_type_t type"
-.Ft int
-.Fn acl_set_file "const char *path_p" "acl_type_t type" "acl_t acl"
-.Ft int
-.Fn acl_set_link_np "const char *path_p" "acl_type_t type" "acl_t acl"
-.Sh DESCRIPTION
-The
-.Fn acl_set_fd ,
-.Fn acl_set_fd_np ,
-.Fn acl_set_file ,
-and
-.Fn acl_set_link_np
-each associate an ACL with an object referred to by
-.Va fd
-or
-.Va path_p .
-The
-.Fn acl_set_fd_np
-and
-.Fn acl_set_link_np
-functions are not POSIX.1e calls.
-The
-.Fn acl_set_fd
-function allows only the setting of ACLs of type ACL_TYPE_ACCESS
-where as
-.Fn acl_set_fd_np
-allows the setting of ACLs of any type.
-The
-.Fn acl_set_link_np
-function acts on a symlink rather than its target, if the target of the
-path is a symlink.
-.Pp
-Valid values for the
-.Va type
-argument are:
-.Bl -column -offset 3n "ACL_TYPE_DEFAULT"
-.It ACL_TYPE_ACCESS	POSIX.1e access ACL
-.It ACL_TYPE_DEFAULT	POSIX.1e default ACL
-.It ACL_TYPE_NFS4	NFSv4 ACL
-.El
-.Pp
-Trying to set ACL_TYPE_NFS4 with
-.Va acl
-branded as POSIX.1e, or ACL_TYPE_ACCESS or ACL_TYPE_DEFAULT with ACL
-branded as NFSv4, will result in error.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-If any of the following conditions occur, these functions shall return
--1 and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or the
-object exists and the process does not have appropriate access rights.
-.It Bq Er EBADF
-The
-.Va fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL for this object, or the ACL type
-specified in
-.Va type
-is invalid for this object, or there is branding mismatch.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an
-entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named object does not exist, or the
-.Va path_p
-argument points to an empty string.
-.It Bq Er ENOMEM
-Insufficient memory available to fulfill request.
-.It Bq Er ENOSPC
-The directory or file system that would contain the new ACL cannot be
-extended, or the file system is out of file allocation resources.
-.It Bq Er EOPNOTSUPP
-The file system does not support ACL retrieval.
-.It Bq Er EROFS
-This function requires modification of a file system which is currently
-read-only.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_delete 3 ,
-.Xr acl_get 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_valid 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc_bsd/posix1e/acl_set.c b/lib/libc_bsd/posix1e/acl_set.c
deleted file mode 100644
index 00f959b..0000000
--- a/lib/libc_bsd/posix1e/acl_set.c
+++ /dev/null
@@ -1,253 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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.
- */
-/*
- * acl_set_file -- set a file/directory ACL by name
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_set.c 208785 2010-06-03 14:29:17Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "acl_support.h"
-
-/*
- * For POSIX.1e-semantic ACLs, do a presort so the kernel doesn't have to
- * (the POSIX.1e semantic code will reject unsorted ACL submission).  If it's
- * not a semantic that the library knows about, just submit it flat and
- * assume the caller knows what they're up to.
- */
-int
-acl_set_file(const char *path_p, acl_type_t type, acl_t acl)
-{
-
-	if (acl == NULL || path_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_acl_type_not_valid_for_acl(acl, type)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	acl->ats_cur_entry = 0;
-
-	return (__acl_set_file(path_p, type, &acl->ats_acl));
-}
-
-int
-acl_set_link_np(const char *path_p, acl_type_t type, acl_t acl)
-{
-
-	if (acl == NULL || path_p == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_acl_type_not_valid_for_acl(acl, type)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	acl->ats_cur_entry = 0;
-
-	return (__acl_set_link(path_p, type, &acl->ats_acl));
-}
-
-int
-acl_set_fd(int fd, acl_t acl)
-{
-
-	if (fpathconf(fd, _PC_ACL_NFS4) == 1)
-		return (acl_set_fd_np(fd, acl, ACL_TYPE_NFS4));
-
-	return (acl_set_fd_np(fd, acl, ACL_TYPE_ACCESS));
-}
-
-int
-acl_set_fd_np(int fd, acl_t acl, acl_type_t type)
-{
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_acl_type_not_valid_for_acl(acl, type)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	acl->ats_cur_entry = 0;
-
-	return (___acl_set_fd(fd, type, &acl->ats_acl));
-}
-
-/*
- * acl_set_permset() (23.4.23): sets the permissions of ACL entry entry_d
- * with the permissions in permset_d
- */
-int
-acl_set_permset(acl_entry_t entry_d, acl_permset_t permset_d)
-{
-
-	if (!entry_d) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if ((*permset_d & ACL_POSIX1E_BITS) != *permset_d) {
-		if ((*permset_d & ACL_NFS4_PERM_BITS) != *permset_d) {
-			errno = EINVAL;
-			return (-1);
-		}
-		if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-			errno = EINVAL;
-			return (-1);
-		}
-		_entry_brand_as(entry_d, ACL_BRAND_NFS4);
-	}
-
-	entry_d->ae_perm = *permset_d;
-
-	return (0);
-}
-
-/*
- * acl_set_qualifier() sets the qualifier (ae_id) of the tag for
- * ACL entry entry_d to the value referred to by tag_qualifier_p
- */
-int
-acl_set_qualifier(acl_entry_t entry_d, const void *tag_qualifier_p)
-{
-
-	if (!entry_d || !tag_qualifier_p) {
-		errno = EINVAL;
-		return (-1);
-	}
-	switch(entry_d->ae_tag) {
-	case ACL_USER:
-	case ACL_GROUP:
-		entry_d->ae_id = *(uid_t *)tag_qualifier_p;
-		break;
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-
-	return (0);
-}
-
-/*
- * acl_set_tag_type() sets the tag type for ACL entry entry_d to the
- * value of tag_type
- */
-int
-acl_set_tag_type(acl_entry_t entry_d, acl_tag_t tag_type)
-{
-
-	if (entry_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	switch(tag_type) {
-	case ACL_OTHER:
-	case ACL_MASK:
-		if (!_entry_brand_may_be(entry_d, ACL_BRAND_POSIX)) {
-			errno = EINVAL;
-			return (-1);
-		}
-		_entry_brand_as(entry_d, ACL_BRAND_POSIX);
-		break;
-	case ACL_EVERYONE:
-		if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-			errno = EINVAL;
-			return (-1);
-		}
-		_entry_brand_as(entry_d, ACL_BRAND_NFS4);
-		break;
-	}
-
-	switch(tag_type) {
-	case ACL_USER_OBJ:
-	case ACL_USER:
-	case ACL_GROUP_OBJ:
-	case ACL_GROUP:
-	case ACL_MASK:
-	case ACL_OTHER:
-	case ACL_EVERYONE:
-		entry_d->ae_tag = tag_type;
-		return (0);
-	}
-
-	errno = EINVAL;
-	return (-1);
-}
-
-int
-acl_set_entry_type_np(acl_entry_t entry_d, acl_entry_type_t entry_type)
-{
-
-	if (entry_d == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (!_entry_brand_may_be(entry_d, ACL_BRAND_NFS4)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	_entry_brand_as(entry_d, ACL_BRAND_NFS4);
-
-	switch (entry_type) {
-	case ACL_ENTRY_TYPE_ALLOW:
-	case ACL_ENTRY_TYPE_DENY:
-	case ACL_ENTRY_TYPE_AUDIT:
-	case ACL_ENTRY_TYPE_ALARM:
-		entry_d->ae_entry_type = entry_type;
-		return (0);
-	}
-
-	errno = EINVAL;
-	return (-1);
-}
diff --git a/lib/libc_bsd/posix1e/acl_set_entry_type_np.3 b/lib/libc_bsd/posix1e/acl_set_entry_type_np.3
deleted file mode 100644
index 9adbdf9..0000000
--- a/lib/libc_bsd/posix1e/acl_set_entry_type_np.3
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_set_entry_type_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_SET_ENTRY_TYPE_NP 3
-.Os
-.Sh NAME
-.Nm acl_set_entry_type_np
-.Nd set NFSv4 ACL entry type
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_entry_type_np "acl_entry_t entry_d" "acl_entry_type_t entry_type"
-.Sh DESCRIPTION
-The
-.Fn acl_set_entry_type_np
-function
-is a non-portable call that sets the type of the NFSv4 ACL entry
-.Fa entry_d
-to the value referred to by
-.Fa entry_type .
-.Pp
-Valid values are:
-.Bl -column -offset 3n "ACL_ENTRY_TYPE_ALLOW"
-.It ACL_ENTRY_TYPE_ALLOW Ta "allow" type entry
-.It ACL_ENTRY_TYPE_DENY Ta "deny" type entry
-.El
-.Pp
-This call brands the ACL as NFSv4.
-.Sh RETURN VALUES
-.Rv -std acl_set_entry_type_np
-.Sh ERRORS
-The
-.Fn acl_set_entry_type_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-The value pointed to by
-.Fa entry_type
-is not valid.
-ACL is already branded as POSIX.1e.
-.It Bq Er ENOMEM
-The value to be returned requires more memory than is allowed
-by the hardware or system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_get_entry_type_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_entry_type_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_entry_type_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_set_flagset_np.3 b/lib/libc_bsd/posix1e/acl_set_flagset_np.3
deleted file mode 100644
index 4bc257a..0000000
--- a/lib/libc_bsd/posix1e/acl_set_flagset_np.3
+++ /dev/null
@@ -1,85 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_set_flagset_np.3 275253 2014-11-29 15:50:13Z trasz $
-.\"
-.Dd October 30, 2014
-.Dt ACL_SET_FLAGSET_NP 3
-.Os
-.Sh NAME
-.Nm acl_set_flagset_np
-.Nd set the flags of an NFSv4 ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_flagset_np "acl_entry_t entry_d" "acl_flagset_t flagset_d"
-.Sh DESCRIPTION
-The
-.Fn acl_set_flagset_np
-function
-is a non-portable call that sets the flags of NFSv4 ACL entry
-.Fa entry_d
-with the flags contained in
-.Fa flagset_d .
-.Pp
-This call brands the ACL as NFSv4.
-.Sh RETURN VALUES
-.Rv -std acl_set_flagset_np
-.Sh ERRORS
-The
-.Fn acl_set_flagset_np
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-ACL is already branded as POSIX.1e.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_flag_np 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_clear_flags_np 3 ,
-.Xr acl_delete_flag_np 3 ,
-.Xr acl_get_flagset_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_set_flagset_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-The
-.Fn acl_set_flagset_np
-function was written by
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_set_permset.3 b/lib/libc_bsd/posix1e/acl_set_permset.3
deleted file mode 100644
index f8aa51b..0000000
--- a/lib/libc_bsd/posix1e/acl_set_permset.3
+++ /dev/null
@@ -1,81 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_set_permset.3 184607 2008-11-04 00:20:43Z imp $
-.\"
-.Dd March 10, 2001
-.Dt ACL_SET_PERMSET 3
-.Os
-.Sh NAME
-.Nm acl_set_permset
-.Nd set the permissions of an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_permset "acl_entry_t entry_d" "acl_permset_t permset_d"
-.Sh DESCRIPTION
-The
-.Fn acl_set_permset
-function
-is a POSIX.1e call that sets the permissions of ACL entry
-.Fa entry_d
-with the permissions contained in
-.Fa permset_d .
-.Sh RETURN VALUES
-.Rv -std acl_set_permset
-.Sh ERRORS
-The
-.Fn acl_set_permset
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_add_perm 3 ,
-.Xr acl_clear_perms 3 ,
-.Xr acl_delete_perm 3 ,
-.Xr acl_get_permset 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_set_permset
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_set_permset
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_set_qualifier.3 b/lib/libc_bsd/posix1e/acl_set_qualifier.3
deleted file mode 100644
index 1556df5..0000000
--- a/lib/libc_bsd/posix1e/acl_set_qualifier.3
+++ /dev/null
@@ -1,91 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_set_qualifier.3 191520 2009-04-26 10:12:20Z trasz $
-.\"
-.Dd March 10, 2001
-.Dt ACL_SET_QUALIFIER 3
-.Os
-.Sh NAME
-.Nm acl_set_qualifier
-.Nd set ACL tag qualifier
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_qualifier "acl_entry_t entry_d" "const void *tag_qualifier_p"
-.Sh DESCRIPTION
-The
-.Fn acl_set_qualifier
-function
-is a POSIX.1e call that sets the qualifier of the tag for the ACL entry
-.Fa entry_d
-to the value referred to by
-.Fa tag_qualifier_p .
-.Sh RETURN VALUES
-.Rv -std acl_set_qualifier
-.Sh ERRORS
-The
-.Fn acl_set_qualifier
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-The tag type of the
-ACL entry
-.Fa entry_d
-is not
-.Dv ACL_USER
-or
-.Dv ACL_GROUP .
-The value pointed to by
-.Fa tag_qualifier_p
-is not valid.
-.It Bq Er ENOMEM
-The value to be returned requires more memory than is allowed
-by the hardware or system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_qualifier 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_get_qualifier
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_get_qualifier
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_set_tag_type.3 b/lib/libc_bsd/posix1e/acl_set_tag_type.3
deleted file mode 100644
index 127d3fb..0000000
--- a/lib/libc_bsd/posix1e/acl_set_tag_type.3
+++ /dev/null
@@ -1,102 +0,0 @@
-.\"-
-.\" Copyright (c) 2001 Chris D. Faulhaber
-.\" 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.
-.\"
-.\" 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 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: releng/10.2/lib/libc/posix1e/acl_set_tag_type.3 233665 2012-03-29 16:02:40Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_SET_TAG_TYPE 3
-.Os
-.Sh NAME
-.Nm acl_set_tag_type
-.Nd set the tag type of an ACL entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_set_tag_type "acl_entry_t entry_d" "acl_tag_t tag_type"
-.Sh DESCRIPTION
-The
-.Fn acl_set_tag_type
-function
-is a POSIX.1e call that sets the ACL tag type of ACL entry
-.Fa entry_d
-to the value of
-.Fa tag_type .
-.Pp
-Valid values are:
-.Bl -column -offset 3n "ACL_OTHER_OBJ"
-.It ACL_USER_OBJ Ta "Permissions apply to file owner"
-.It ACL_USER Ta "Permissions apply to additional user specified by qualifier"
-.It ACL_GROUP_OBJ Ta "Permissions apply to file group"
-.It ACL_GROUP Ta "Permissions apply to additional group specified by qualifier"
-.It ACL_MASK Ta "Permissions specify mask"
-.It ACL_OTHER Ta Permissions apply to "other"
-.It ACL_OTHER_OBJ Ta "Same as ACL_OTHER"
-.It ACL_EVERYONE Ta Permissions apply to "everyone@"
-.El
-.Pp
-Calling
-.Fn acl_set_tag_type
-with
-.Fa tag_type
-equal to ACL_MASK, ACL_OTHER or ACL_OTHER_OBJ brands the ACL as POSIX.1e.
-Calling it with ACL_EVERYONE brands the ACL as NFSv4.
-.Sh RETURN VALUES
-.Rv -std acl_set_tag_type
-.Sh ERRORS
-The
-.Fn acl_set_tag_type
-function fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Fa entry_d
-is not a valid descriptor for an ACL entry.
-Argument
-.Fa tag_type
-is not a valid ACL tag type.
-ACL is already branded differently.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get_brand_np 3 ,
-.Xr acl_get_tag_type 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_set_tag_type
-function was added in
-.Fx 5.0 .
-.Sh AUTHORS
-The
-.Fn acl_set_tag_type
-function was written by
-.An Chris D. Faulhaber Aq jedgar@fxp.org .
diff --git a/lib/libc_bsd/posix1e/acl_strip.c b/lib/libc_bsd/posix1e/acl_strip.c
deleted file mode 100644
index 096b643..0000000
--- a/lib/libc_bsd/posix1e/acl_strip.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*-
- * Copyright (c) 2001 Chris D. Faulhaber
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_strip.c 219878 2011-03-22 17:44:07Z trasz $");
-
-#include <errno.h>
-#include <stdio.h>
-#include <assert.h>
-#include <sys/acl.h>
-#include <sys/stat.h>
-
-#include "acl_support.h"
-
-/*
- * These routines from sys/kern/subr_acl_nfs4.c are used by both kernel
- * and libc.
- */
-void	acl_nfs4_sync_mode_from_acl(mode_t *_mode, const struct acl *aclp);
-void	acl_nfs4_trivial_from_mode_libc(struct acl *aclp, int file_owner_id,
-	    int canonical_six);
-
-static acl_t
-_nfs4_acl_strip_np(const acl_t aclp, int canonical_six)
-{
-	acl_t newacl;
-	mode_t mode = 0;
-
-	newacl = acl_init(ACL_MAX_ENTRIES);
-	if (newacl == NULL) {
-		errno = ENOMEM;
-		return (NULL);
-	}
-
-	_acl_brand_as(newacl, ACL_BRAND_NFS4);
-
-	acl_nfs4_sync_mode_from_acl(&mode, &(aclp->ats_acl));
-	acl_nfs4_trivial_from_mode_libc(&(newacl->ats_acl), mode, canonical_six);
-
-	return (newacl);
-}
-
-static acl_t
-_posix1e_acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	acl_t acl_new, acl_old;
-	acl_entry_t entry, entry_new;
-	acl_permset_t perm;
-	acl_tag_t tag;
-	int entry_id, have_mask_entry;
-
-	assert(_acl_brand(aclp) == ACL_BRAND_POSIX);
-
-	acl_old = acl_dup(aclp);
-	if (acl_old == NULL)
-		return (NULL);
-
-	assert(_acl_brand(acl_old) == ACL_BRAND_POSIX);
-
-	have_mask_entry = 0;
-	acl_new = acl_init(ACL_MAX_ENTRIES);
-	if (acl_new == NULL)
-		return (NULL);
-	tag = ACL_UNDEFINED_TAG;
-
-	/* only save the default user/group/other entries */
-	entry_id = ACL_FIRST_ENTRY;
-	while (acl_get_entry(acl_old, entry_id, &entry) == 1) {
-		entry_id = ACL_NEXT_ENTRY;
-
-		assert(_entry_brand(entry) == ACL_BRAND_POSIX);
-
-		if (acl_get_tag_type(entry, &tag) == -1)
-			return (NULL);
-
-		switch(tag) {
-		case ACL_USER_OBJ:
-		case ACL_GROUP_OBJ:
-		case ACL_OTHER:
-			if (acl_get_tag_type(entry, &tag) == -1)
-				return (NULL);
-			if (acl_get_permset(entry, &perm) == -1)
-				return (NULL);
-			if (acl_create_entry(&acl_new, &entry_new) == -1)
-				return (NULL);
-			if (acl_set_tag_type(entry_new, tag) == -1)
-				return (NULL);
-			if (acl_set_permset(entry_new, perm) == -1)
-				return (NULL);
-			if (acl_copy_entry(entry_new, entry) == -1)
-				return (NULL);
-			assert(_entry_brand(entry_new) == ACL_BRAND_POSIX);
-			break;
-		case ACL_MASK:
-			have_mask_entry = 1;
-			break;
-		default:
-			break;
-		}
-	}
-
-	assert(_acl_brand(acl_new) == ACL_BRAND_POSIX);
-
-	if (have_mask_entry && recalculate_mask) {
-		if (acl_calc_mask(&acl_new) == -1)
-			return (NULL);
-	}
-
-	return (acl_new);
-}
-
-acl_t
-acl_strip_np(const acl_t aclp, int recalculate_mask)
-{
-	switch (_acl_brand(aclp)) {
-	case ACL_BRAND_NFS4:
-		return (_nfs4_acl_strip_np(aclp, 0));
-
-	case ACL_BRAND_POSIX:
-		return (_posix1e_acl_strip_np(aclp, recalculate_mask));
-
-	default:
-		errno = EINVAL;
-		return (NULL);
-	}
-}
-
-/*
- * Return 1, if ACL is trivial, 0 otherwise.
- *
- * ACL is trivial, iff its meaning could be fully expressed using just file
- * mode.  In other words, ACL is trivial iff it doesn't have "+" to the right
- * of the mode bits in "ls -l" output ;-)
- */
-int
-acl_is_trivial_np(const acl_t aclp, int *trivialp)
-{
-	acl_t tmpacl;
-	int differs;
-
-	if (aclp == NULL || trivialp == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	switch (_acl_brand(aclp)) {
-	case ACL_BRAND_POSIX:
-		if (aclp->ats_acl.acl_cnt == 3)
-			*trivialp = 1;
-		else
-			*trivialp = 0;
-
-		return (0);
-
-	case ACL_BRAND_NFS4:
-		/*
-		 * If the ACL has more than canonical six entries,
-		 * it's non trivial by definition.
-		 */
-		if (aclp->ats_acl.acl_cnt > 6) {
-			*trivialp = 0;
-			return (0);
-		}
-			
-		/*
-		 * Calculate trivial ACL - using acl_strip_np(3) - and compare
-		 * with the original.
-		 */
-		tmpacl = _nfs4_acl_strip_np(aclp, 0);
-		if (tmpacl == NULL)
-			return (-1);
-
-		differs = _acl_differs(aclp, tmpacl);
-		acl_free(tmpacl);
-
-		if (differs == 0) {
-			*trivialp = 1;
-			return (0);
-		}
-
-		/*
-		 * Try again with an old-style, "canonical six" trivial ACL.
-		 */
-		tmpacl = _nfs4_acl_strip_np(aclp, 1);
-		if (tmpacl == NULL)
-			return (-1);
-
-		differs = _acl_differs(aclp, tmpacl);
-		acl_free(tmpacl);
-
-		if (differs)
-			*trivialp = 0;
-		else
-			*trivialp = 1;
-
-		return (0);
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
diff --git a/lib/libc_bsd/posix1e/acl_strip_np.3 b/lib/libc_bsd/posix1e/acl_strip_np.3
deleted file mode 100644
index 77c108e..0000000
--- a/lib/libc_bsd/posix1e/acl_strip_np.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\"-
-.\" Copyright (c) 2008, 2009 Edward Tomasz Napierala
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_strip_np.3 210772 2010-08-02 16:01:45Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_STRIP_NP 3
-.Os
-.Sh NAME
-.Nm acl_strip_np
-.Nd strip extended entries from an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft acl_t
-.Fn acl_strip_np "const acl_t acl" "int recalculate_mask"
-.Sh DESCRIPTION
-The
-.Fn acl_strip_np
-function returns a pointer to a trivial ACL computed from the ACL pointed
-to by the argument
-.Va acl .
-.Pp
-This function may cause memory to be allocated.
-The caller should free any
-releasable memory, when the new ACL is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void*)acl_t
-as an argument.
-.Pp
-Any existing ACL pointers that refer to the ACL referred to by
-.Va acl
-shall continue to refer to the ACL.
-.Sh RETURN VALUES
-Upon successful completion, this function shall return a pointer to the
-newly allocated ACL.
-Otherwise, a value of
-.Va (acl_t)NULL
-shall be returned, and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_init
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL.
-.It Bq Er ENOMEM
-The
-.Va acl_t
-to be returned requires more memory than is allowed by the hardware or
-system-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_is_trivial_np 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 .
-The
-.Fn acl_strip_np
-function was added in
-.Fx 8.0 .
-.Sh AUTHORS
-.An Edward Tomasz Napierala Aq trasz@FreeBSD.org .
diff --git a/lib/libc_bsd/posix1e/acl_support.c b/lib/libc_bsd/posix1e/acl_support.c
deleted file mode 100644
index b7dc1f7..0000000
--- a/lib/libc_bsd/posix1e/acl_support.c
+++ /dev/null
@@ -1,418 +0,0 @@
-/*-
- * Copyright (c) 1999-2001, 2008 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * Support functionality for the POSIX.1e ACL interface
- * These calls are intended only to be called within the library.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_support.c 209147 2010-06-14 02:26:13Z kientzle $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <errno.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "acl_support.h"
-
-#define ACL_STRING_PERM_WRITE   'w'
-#define ACL_STRING_PERM_READ    'r'
-#define ACL_STRING_PERM_EXEC    'x'
-#define ACL_STRING_PERM_NONE    '-'
-
-/*
- * Return 0, if both ACLs are identical.
- */
-int
-_acl_differs(const acl_t a, const acl_t b)
-{
-	int i;
-	struct acl_entry *entrya, *entryb;
-
-	assert(_acl_brand(a) == _acl_brand(b));
-	assert(_acl_brand(a) != ACL_BRAND_UNKNOWN);
-	assert(_acl_brand(b) != ACL_BRAND_UNKNOWN);
-
-	if (a->ats_acl.acl_cnt != b->ats_acl.acl_cnt)
-		return (1);
-
-	for (i = 0; i < b->ats_acl.acl_cnt; i++) {
-		entrya = &(a->ats_acl.acl_entry[i]);
-		entryb = &(b->ats_acl.acl_entry[i]);
-
-		if (entrya->ae_tag != entryb->ae_tag ||
-		    entrya->ae_id != entryb->ae_id ||
-		    entrya->ae_perm != entryb->ae_perm ||
-		    entrya->ae_entry_type != entryb->ae_entry_type ||
-		    entrya->ae_flags != entryb->ae_flags)
-			return (1);
-	}
-
-	return (0);
-}
-
-/*
- * _posix1e_acl_entry_compare -- compare two acl_entry structures to
- * determine the order they should appear in.  Used by _posix1e_acl_sort to
- * sort ACL entries into the kernel-desired order -- i.e., the order useful
- * for evaluation and O(n) validity checking.  Beter to have an O(nlogn) sort
- * in userland and an O(n) in kernel than to have both in kernel.
- */
-typedef int (*compare)(const void *, const void *);
-static int
-_posix1e_acl_entry_compare(struct acl_entry *a, struct acl_entry *b)
-{
-
-	assert(_entry_brand(a) == ACL_BRAND_POSIX);
-	assert(_entry_brand(b) == ACL_BRAND_POSIX);
-
-	/*
-	 * First, sort between tags -- conveniently defined in the correct
-	 * order for verification.
-	 */
-	if (a->ae_tag < b->ae_tag)
-		return (-1);
-	if (a->ae_tag > b->ae_tag)
-		return (1);
-
-	/*
-	 * Next compare uids/gids on appropriate types.
-	 */
-
-	if (a->ae_tag == ACL_USER || a->ae_tag == ACL_GROUP) {
-		if (a->ae_id < b->ae_id)
-			return (-1);
-		if (a->ae_id > b->ae_id)
-			return (1);
-
-		/* shouldn't be equal, fall through to the invalid case */
-	}
-
-	/*
-	 * Don't know how to sort multiple entries of the rest--either it's
-	 * a bad entry, or there shouldn't be more than one.  Ignore and the
-	 * validity checker can get it later.
-	 */
-	return (0);
-}
-
-/*
- * _posix1e_acl_sort -- sort ACL entries in POSIX.1e-formatted ACLs.
- */
-void
-_posix1e_acl_sort(acl_t acl)
-{
-	struct acl *acl_int;
-
-	acl_int = &acl->ats_acl;
-
-	qsort(&acl_int->acl_entry[0], acl_int->acl_cnt,
-	    sizeof(struct acl_entry), (compare) _posix1e_acl_entry_compare);
-}
-
-/*
- * acl_posix1e -- in what situations should we acl_sort before submission?
- * We apply posix1e ACL semantics for any ACL of type ACL_TYPE_ACCESS or
- * ACL_TYPE_DEFAULT
- */
-int
-_posix1e_acl(acl_t acl, acl_type_t type)
-{
-
-	if (_acl_brand(acl) != ACL_BRAND_POSIX)
-		return (0);
-
-	return ((type == ACL_TYPE_ACCESS) || (type == ACL_TYPE_DEFAULT));
-}
-
-/*
- * _posix1e_acl_check -- given an ACL, check its validity.  This is mirrored
- * from code in sys/kern/kern_acl.c, and if changes are made in one, they
- * should be made in the other also.  This copy of acl_check is made
- * available * in userland for the benefit of processes wanting to check ACLs
- * for validity before submitting them to the kernel, or for performing
- * in userland file system checking.  Needless to say, the kernel makes
- * the real checks on calls to get/setacl.
- *
- * See the comments in kernel for explanation -- just briefly, it assumes
- * an already sorted ACL, and checks based on that assumption.  The
- * POSIX.1e interface, acl_valid(), will perform the sort before calling
- * this.  Returns 0 on success, EINVAL on failure.
- */
-int
-_posix1e_acl_check(acl_t acl)
-{
-	struct acl *acl_int;
-	struct acl_entry	*entry; 	/* current entry */
-	uid_t	highest_uid=0, highest_gid=0;
-	int	stage = ACL_USER_OBJ;
-	int	i = 0;
-	int	count_user_obj=0, count_user=0, count_group_obj=0,
-		count_group=0, count_mask=0, count_other=0;
-
-	acl_int = &acl->ats_acl;
-
-	/* printf("_posix1e_acl_check: checking acl with %d entries\n",
-	    acl->acl_cnt); */
-	while (i < acl_int->acl_cnt) {
-		entry = &acl_int->acl_entry[i];
-
-		if ((entry->ae_perm | ACL_PERM_BITS) != ACL_PERM_BITS)
-			return (EINVAL);
-
-		switch(entry->ae_tag) {
-		case ACL_USER_OBJ:
-			/* printf("_posix1e_acl_check: %d: ACL_USER_OBJ\n",
-			    i); */
-			if (stage > ACL_USER_OBJ)
-				return (EINVAL);
-			stage = ACL_USER;
-			count_user_obj++;
-			break;
-
-		case ACL_USER:
-			/* printf("_posix1e_acl_check: %d: ACL_USER\n", i); */
-			if (stage > ACL_USER)
-				return (EINVAL);
-			stage = ACL_USER;
-			if (count_user && (entry->ae_id <= highest_uid))
-				return (EINVAL);
-			highest_uid = entry->ae_id;
-			count_user++;
-			break;
-
-		case ACL_GROUP_OBJ:
-			/* printf("_posix1e_acl_check: %d: ACL_GROUP_OBJ\n",
-			    i); */
-			if (stage > ACL_GROUP_OBJ)
-				return (EINVAL);
-			stage = ACL_GROUP;
-			count_group_obj++;
-			break;
-
-		case ACL_GROUP:
-			/* printf("_posix1e_acl_check: %d: ACL_GROUP\n", i); */
-			if (stage > ACL_GROUP)
-				return (EINVAL);
-			stage = ACL_GROUP;
-			if (count_group && (entry->ae_id <= highest_gid))
-				return (EINVAL);
-			highest_gid = entry->ae_id;
-			count_group++;
-			break;
-
-		case ACL_MASK:
-			/* printf("_posix1e_acl_check: %d: ACL_MASK\n", i); */
-			if (stage > ACL_MASK)
-				return (EINVAL);
-			stage = ACL_MASK;
-			count_mask++;
-			break;
-
-		case ACL_OTHER:
-			/* printf("_posix1e_acl_check: %d: ACL_OTHER\n", i); */
-			if (stage > ACL_OTHER)
-				return (EINVAL);
-			stage = ACL_OTHER;
-			count_other++;
-			break;
-
-		default:
-			/* printf("_posix1e_acl_check: %d: INVALID\n", i); */
-			return (EINVAL);
-		}
-		i++;
-	}
-
-	if (count_user_obj != 1)
-		return (EINVAL);
-
-	if (count_group_obj != 1)
-		return (EINVAL);
-
-	if (count_mask != 0 && count_mask != 1)
-		return (EINVAL);
-
-	if (count_other != 1)
-		return (EINVAL);
-
-	return (0);
-}
-
-/*
- * Given a right-shifted permission (i.e., direct ACL_PERM_* mask), fill
- * in a string describing the permissions.
- */
-int
-_posix1e_acl_perm_to_string(acl_perm_t perm, ssize_t buf_len, char *buf)
-{
-
-	if (buf_len < _POSIX1E_ACL_STRING_PERM_MAXSIZE + 1) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	if ((perm | ACL_PERM_BITS) != ACL_PERM_BITS) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	buf[3] = 0;	/* null terminate */
-
-	if (perm & ACL_READ)
-		buf[0] = ACL_STRING_PERM_READ;
-	else
-		buf[0] = ACL_STRING_PERM_NONE;
-
-	if (perm & ACL_WRITE)
-		buf[1] = ACL_STRING_PERM_WRITE;
-	else
-		buf[1] = ACL_STRING_PERM_NONE;
-
-	if (perm & ACL_EXECUTE)
-		buf[2] = ACL_STRING_PERM_EXEC;
-	else
-		buf[2] = ACL_STRING_PERM_NONE;
-
-	return (0);
-}
-
-/*
- * given a string, return a permission describing it
- */
-int
-_posix1e_acl_string_to_perm(char *string, acl_perm_t *perm)
-{
-	acl_perm_t	myperm = ACL_PERM_NONE;
-	char	*ch;
-
-	ch = string;
-	while (*ch) {
-		switch(*ch) {
-		case ACL_STRING_PERM_READ:
-			myperm |= ACL_READ;
-			break;
-		case ACL_STRING_PERM_WRITE:
-			myperm |= ACL_WRITE;
-			break;
-		case ACL_STRING_PERM_EXEC:
-			myperm |= ACL_EXECUTE;
-			break;
-		case ACL_STRING_PERM_NONE:
-			break;
-		default:
-			return (EINVAL);
-		}
-		ch++;
-	}
-
-	*perm = myperm;
-	return (0);
-}
-
-/*
- * Add an ACL entry without doing much checking, et al
- */
-int
-_posix1e_acl_add_entry(acl_t acl, acl_tag_t tag, uid_t id, acl_perm_t perm)
-{
-	struct acl		*acl_int;
-	struct acl_entry	*e;
-
-	acl_int = &acl->ats_acl;
-
-	if (acl_int->acl_cnt >= ACL_MAX_ENTRIES) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	e = &(acl_int->acl_entry[acl_int->acl_cnt]);
-	e->ae_perm = perm;
-	e->ae_tag = tag;
-	e->ae_id = id;
-	acl_int->acl_cnt++;
-
-	return (0);
-}
-
-/*
- * Convert "old" type - ACL_TYPE_{ACCESS,DEFAULT}_OLD - into its "new"
- * counterpart.  It's neccessary for the old (pre-NFSv4 ACLs) binaries
- * to work with new libc and kernel.  Fixing 'type' for old binaries with
- * old libc and new kernel is being done by kern/vfs_acl.c:type_unold().
- */
-int
-_acl_type_unold(acl_type_t type)
-{
-
-	switch (type) {
-	case ACL_TYPE_ACCESS_OLD:
-		return (ACL_TYPE_ACCESS);
-	case ACL_TYPE_DEFAULT_OLD:
-		return (ACL_TYPE_DEFAULT);
-	default:
-		return (type);
-	}
-}
-
-char *
-string_skip_whitespace(char *string)
-{
-
-	while (*string && ((*string == ' ') || (*string == '\t')))
-		string++;
-
-	return (string);
-}
-
-void
-string_trim_trailing_whitespace(char *string)
-{
-	char	*end;
-
-	if (*string == '\0')
-		return;
-
-	end = string + strlen(string) - 1;
-
-	while (end != string) {
-		if ((*end == ' ') || (*end == '\t')) {
-			*end = '\0';
-			end--;
-		} else {
-			return;
-		}
-	}
-
-	return;
-}
diff --git a/lib/libc_bsd/posix1e/acl_support.h b/lib/libc_bsd/posix1e/acl_support.h
deleted file mode 100644
index d337c0f..0000000
--- a/lib/libc_bsd/posix1e/acl_support.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson
- * 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.
- *
- * 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: releng/10.2/lib/libc/posix1e/acl_support.h 209736 2010-07-06 17:20:08Z trasz $
- */
-/*
- * Support functionality for the POSIX.1e ACL interface
- * These calls are intended only to be called within the library.
- */
-#ifndef _ACL_SUPPORT_H
-#define _ACL_SUPPORT_H
-
-#define _POSIX1E_ACL_STRING_PERM_MAXSIZE 3       /* read, write, exec */
-#define _ACL_T_ALIGNMENT_BITS		13
-
-int	_acl_type_unold(acl_type_t type);
-int	_acl_differs(const acl_t a, const acl_t b);
-int	_acl_type_not_valid_for_acl(const acl_t acl, acl_type_t type);
-void	_acl_brand_from_type(acl_t acl, acl_type_t type);
-int	_acl_brand(const acl_t acl);
-int	_entry_brand(const acl_entry_t entry);
-int	_acl_brand_may_be(const acl_t acl, int brand);
-int	_entry_brand_may_be(const acl_entry_t entry, int brand);
-void	_acl_brand_as(acl_t acl, int brand);
-void	_entry_brand_as(const acl_entry_t entry, int brand);
-int	_nfs4_format_flags(char *str, size_t size, acl_flag_t var, int verbose);
-int	_nfs4_format_access_mask(char *str, size_t size, acl_perm_t var, int verbose);
-int	_nfs4_parse_flags(const char *str, acl_flag_t *var);
-int	_nfs4_parse_access_mask(const char *str, acl_perm_t *var);
-int	_posix1e_acl_check(acl_t acl);
-void	_posix1e_acl_sort(acl_t acl);
-int	_posix1e_acl(acl_t acl, acl_type_t type);
-int	_posix1e_acl_id_to_name(acl_tag_t tag, uid_t id, ssize_t buf_len,
-	    char *buf, int flags);
-int	_posix1e_acl_perm_to_string(acl_perm_t perm, ssize_t buf_len,
-	    char *buf);
-int	_posix1e_acl_string_to_perm(char *string, acl_perm_t *perm);
-int	_posix1e_acl_add_entry(acl_t acl, acl_tag_t tag, uid_t id,
-	    acl_perm_t perm);
-char	*string_skip_whitespace(char *string);
-void	string_trim_trailing_whitespace(char *string);
-int	_acl_name_to_id(acl_tag_t tag, char *name, uid_t *id);
-
-#endif
diff --git a/lib/libc_bsd/posix1e/acl_support_nfs4.c b/lib/libc_bsd/posix1e/acl_support_nfs4.c
deleted file mode 100644
index f3c7e05..0000000
--- a/lib/libc_bsd/posix1e/acl_support_nfs4.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_support_nfs4.c 220465 2011-04-09 07:42:25Z trasz $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <err.h>
-#include <sys/acl.h>
-#include "acl_support.h"
-
-struct flagnames_struct {
-	uint32_t	flag;
-	const char	*name;
-	char		letter;
-};
-
-struct flagnames_struct a_flags[] =
-    {{ ACL_ENTRY_FILE_INHERIT, "file_inherit", 'f'},
-     { ACL_ENTRY_DIRECTORY_INHERIT, "dir_inherit", 'd'},
-     { ACL_ENTRY_INHERIT_ONLY, "inherit_only", 'i'},
-     { ACL_ENTRY_NO_PROPAGATE_INHERIT, "no_propagate", 'n'},
-     { ACL_ENTRY_SUCCESSFUL_ACCESS, "successfull_access", 'S'},
-     { ACL_ENTRY_FAILED_ACCESS, "failed_access", 'F'},
-     /*
-      * There is no ACE_IDENTIFIER_GROUP here - SunOS does not show it
-      * in the "flags" field.  There is no ACE_OWNER, ACE_GROUP or
-      * ACE_EVERYONE either, for obvious reasons.
-      */
-     { 0, 0, 0}};
-
-struct flagnames_struct a_access_masks[] =
-    {{ ACL_READ_DATA, "read_data", 'r'},
-     { ACL_WRITE_DATA, "write_data", 'w'},
-     { ACL_EXECUTE, "execute", 'x'},
-     { ACL_APPEND_DATA, "append_data", 'p'},
-     { ACL_DELETE_CHILD, "delete_child", 'D'},
-     { ACL_DELETE, "delete", 'd'},
-     { ACL_READ_ATTRIBUTES, "read_attributes", 'a'},
-     { ACL_WRITE_ATTRIBUTES, "write_attributes", 'A'},
-     { ACL_READ_NAMED_ATTRS, "read_xattr", 'R'},
-     { ACL_WRITE_NAMED_ATTRS, "write_xattr", 'W'},
-     { ACL_READ_ACL, "read_acl", 'c'},
-     { ACL_WRITE_ACL, "write_acl", 'C'},
-     { ACL_WRITE_OWNER, "write_owner", 'o'},
-     { ACL_SYNCHRONIZE, "synchronize", 's'},
-     { ACL_FULL_SET, "full_set", '\0'},
-     { ACL_MODIFY_SET, "modify_set", '\0'},
-     { ACL_READ_SET, "read_set", '\0'},
-     { ACL_WRITE_SET, "write_set", '\0'},
-     { 0, 0, 0}};
-
-static const char *
-format_flag(uint32_t *var, const struct flagnames_struct *flags)
-{
-
-	for (; flags->name != 0; flags++) {
-		if ((flags->flag & *var) == 0)
-			continue;
-
-		*var &= ~flags->flag;
-		return (flags->name);
-	}
-
-	return (NULL);
-}
-
-static int
-format_flags_verbose(char *str, size_t size, uint32_t var,
-    const struct flagnames_struct *flags)
-{
-	size_t off = 0;
-	const char *tmp;
-
-	while ((tmp = format_flag(&var, flags)) != NULL) {
-		off += snprintf(str + off, size - off, "%s/", tmp);
-		assert (off < size);
-	}
-
-	/* If there were any flags added... */
-	if (off > 0) {
-		off--;
-		/* ... then remove the last slash. */
-		assert(str[off] == '/');
-	} 
-
-	str[off] = '\0';
-
-	return (0);
-}
-
-static int
-format_flags_compact(char *str, size_t size, uint32_t var,
-    const struct flagnames_struct *flags)
-{
-	size_t i;
-
-	for (i = 0; flags[i].letter != '\0'; i++) {
-		assert(i < size);
-		if ((flags[i].flag & var) == 0)
-			str[i] = '-';
-		else
-			str[i] = flags[i].letter;
-	}
-
-	str[i] = '\0';
-
-	return (0);
-}
-
-static int
-parse_flags_verbose(const char *strp, uint32_t *var,
-    const struct flagnames_struct *flags, const char *flags_name,
-    int *try_compact)
-{
-	int i, found, ever_found = 0;
-	char *str, *flag;
-
-	str = strdup(strp);
-	*try_compact = 0;
-	*var = 0;
-
-	while (str != NULL) {
-		flag = strsep(&str, "/:");
-
-		found = 0;
-		for (i = 0; flags[i].name != NULL; i++) {
-			if (strcmp(flags[i].name, flag) == 0) {
-				*var |= flags[i].flag;
-				found = 1;
-				ever_found = 1;
-			}
-		}
-
-		if (!found) {
-			if (ever_found)
-				warnx("malformed ACL: \"%s\" field contains "
-				    "invalid flag \"%s\"", flags_name, flag);
-			else
-				*try_compact = 1;
-			free(str);
-			return (-1);
-		}
-	}
-
-	free(str);
-	return (0);
-}
-
-static int
-parse_flags_compact(const char *str, uint32_t *var,
-    const struct flagnames_struct *flags, const char *flags_name)
-{
-	int i, j, found;
-
-	*var = 0;
-
-	for (i = 0;; i++) {
-		if (str[i] == '\0')
-			return (0);
-
-		/* Ignore minus signs. */
-		if (str[i] == '-')
-			continue;
-
-		found = 0;
-
-		for (j = 0; flags[j].name != NULL; j++) {
-			if (flags[j].letter == str[i]) {
-				*var |= flags[j].flag;
-				found = 1;
-				break;
-			}
-		}
-
-		if (!found) {
-			warnx("malformed ACL: \"%s\" field contains "
-			    "invalid flag \"%c\"", flags_name, str[i]);
-			return (-1);
-		}
-	}
-}
-
-int
-_nfs4_format_flags(char *str, size_t size, acl_flag_t var, int verbose)
-{
-
-	if (verbose)
-		return (format_flags_verbose(str, size, var, a_flags));
-
-	return (format_flags_compact(str, size, var, a_flags));
-}
-
-int
-_nfs4_format_access_mask(char *str, size_t size, acl_perm_t var, int verbose)
-{
-
-	if (verbose)
-		return (format_flags_verbose(str, size, var, a_access_masks));
-
-	return (format_flags_compact(str, size, var, a_access_masks));
-}
-
-int
-_nfs4_parse_flags(const char *str, acl_flag_t *flags)
-{
-	int error, try_compact;
-	int tmpflags;
-
-	error = parse_flags_verbose(str, &tmpflags, a_flags, "flags", &try_compact);
-	if (error && try_compact)
-		error = parse_flags_compact(str, &tmpflags, a_flags, "flags");
-
-	*flags = tmpflags;
-
-	return (error);
-}
-
-int
-_nfs4_parse_access_mask(const char *str, acl_perm_t *perms)
-{
-	int error, try_compact;
-	int tmpperms;
-
-	error = parse_flags_verbose(str, &tmpperms, a_access_masks,
-	    "access permissions", &try_compact);
-	if (error && try_compact)
-		error = parse_flags_compact(str, &tmpperms,
-		    a_access_masks, "access permissions");
-
-	*perms = tmpperms;
-
-	return (error);
-}
diff --git a/lib/libc_bsd/posix1e/acl_to_text.3 b/lib/libc_bsd/posix1e/acl_to_text.3
deleted file mode 100644
index f3ec3b6..0000000
--- a/lib/libc_bsd/posix1e/acl_to_text.3
+++ /dev/null
@@ -1,158 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_to_text.3 233665 2012-03-29 16:02:40Z joel $
-.\"
-.Dd June 25, 2009
-.Dt ACL_TO_TEXT 3
-.Os
-.Sh NAME
-.Nm acl_to_text ,
-.Nm acl_to_text_np
-.Nd convert an ACL to text
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft char *
-.Fn acl_to_text "acl_t acl" "ssize_t *len_p"
-.Ft char *
-.Fn acl_to_text_np "acl_t acl" "ssize_t *len_p" "int flags"
-.Sh DESCRIPTION
-The
-.Fn acl_to_text
-and
-.Fn acl_to_text_np
-functions translate the ACL pointed to by argument
-.Va acl
-into a NULL terminated character string.
-If the pointer
-.Va len_p
-is not NULL, then the function shall return the length of the string (not
-including the NULL terminator) in the location pointed to by
-.Va len_p .
-If the ACL is POSIX.1e, the format of the text string returned by
-.Fn acl_to_text
-shall be the POSIX.1e long ACL form.  If the ACL is NFSv4, the format
-of the text string shall be the compact form, unless the
-.Va ACL_TEXT_VERBOSE
-flag is given.
-.Pp
-The flags specified are formed by
-.Em or Ns 'ing
-the following values
-.Bl -column -offset 3n "ACL_TEXT_NUMERIC_IDS"
-.It ACL_TEXT_VERBOSE Ta "Format ACL using verbose form"
-.It ACL_TEXT_NUMERIC_IDS Ta "Do not resolve IDs into user or group names"
-.It ACL_TEXT_APPEND_ID Ta "In addition to user and group names, append numeric IDs"
-.El
-.Pp
-This function allocates any memory necessary to contain the string and
-returns a pointer to the string.
-The caller should free any releasable
-memory, when the new string is no longer required, by calling
-.Xr acl_free 3
-with the
-.Va (void*)char
-as an argument.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-Upon successful completion, the function shall return a pointer to the
-long text form of an ACL.
-Otherwise, a value of
-.Va (char*)NULL
-shall be returned and
-.Va errno
-shall be set to indicate the error.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn acl_to_text
-function shall return a value of
-.Va (acl_t)NULL
-and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL.
-.Pp
-The ACL denoted by
-.Va acl
-contains one or more improperly formed ACL entries, or for some other
-reason cannot be translated into a text form of an ACL.
-.It Bq Er ENOMEM
-The character string to be returned requires more memory than is allowed
-by the hardware or software-imposed memory management constraints.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_free 3 ,
-.Xr acl_from_text 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
-.Sh BUGS
-The
-.Fn acl_from_text
-and
-.Fn acl_to_text
-functions
-rely on the
-.Xr getpwent 3
-library calls to manage username and uid mapping, as well as the
-.Xr getgrent 3
-library calls to manage groupname and gid mapping.
-These calls are not
-thread safe, and so transitively, neither are
-.Fn acl_from_text
-and
-.Fn acl_to_text .
-These functions may also interfere with stateful
-calls associated with the
-.Fn getpwent
-and
-.Fn getgrent
-calls.
diff --git a/lib/libc_bsd/posix1e/acl_to_text.c b/lib/libc_bsd/posix1e/acl_to_text.c
deleted file mode 100644
index 825600e..0000000
--- a/lib/libc_bsd/posix1e/acl_to_text.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/*-
- * Copyright (c) 1999-2002 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * acl_to_text - return a text string with a text representation of the acl
- * in it.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_to_text.c 200142 2009-12-05 19:04:21Z ed $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "acl_support.h"
-
-/*
- * acl_to_text - generate a text form of an acl
- * spec says nothing about output ordering, so leave in acl order
- *
- * This function will not produce nice results if it is called with
- * a non-POSIX.1e semantics ACL.
- */
-
-char *_nfs4_acl_to_text_np(const acl_t acl, ssize_t *len_p, int flags);
-
-static char *
-_posix1e_acl_to_text(acl_t acl, ssize_t *len_p, int flags)
-{
-	struct acl	*acl_int;
-	char		*buf, *tmpbuf;
-	char		 name_buf[MAXLOGNAME];
-	char		 perm_buf[_POSIX1E_ACL_STRING_PERM_MAXSIZE+1],
-			 effective_perm_buf[_POSIX1E_ACL_STRING_PERM_MAXSIZE+1];
-	int		 i, error, len;
-	uid_t		 ae_id;
-	acl_tag_t	 ae_tag;
-	acl_perm_t	 ae_perm, effective_perm, mask_perm;
-
-	buf = strdup("");
-	if (buf == NULL)
-		return(NULL);
-
-	acl_int = &acl->ats_acl;
-
-	mask_perm = ACL_PERM_BITS;	/* effective is regular if no mask */
-	for (i = 0; i < acl_int->acl_cnt; i++)
-		if (acl_int->acl_entry[i].ae_tag == ACL_MASK) 
-			mask_perm = acl_int->acl_entry[i].ae_perm;
-
-	for (i = 0; i < acl_int->acl_cnt; i++) {
-		ae_tag = acl_int->acl_entry[i].ae_tag;
-		ae_id = acl_int->acl_entry[i].ae_id;
-		ae_perm = acl_int->acl_entry[i].ae_perm;
-
-		switch(ae_tag) {
-		case ACL_USER_OBJ:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-			len = asprintf(&tmpbuf, "%suser::%s\n", buf,
-			    perm_buf);
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_USER:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			error = _posix1e_acl_id_to_name(ae_tag, ae_id,
-			    MAXLOGNAME, name_buf, flags);
-			if (error)
-				goto error_label;
-
-			effective_perm = ae_perm & mask_perm;
-			if (effective_perm != ae_perm) {
-				error = _posix1e_acl_perm_to_string(
-				    effective_perm,
-				    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1,
-				    effective_perm_buf);
-				if (error)
-					goto error_label;
-				len = asprintf(&tmpbuf, "%suser:%s:%s\t\t# "
-				    "effective: %s\n",
-				    buf, name_buf, perm_buf,
-				    effective_perm_buf);
-			} else {
-				len = asprintf(&tmpbuf, "%suser:%s:%s\n", buf,
-				    name_buf, perm_buf);
-			}
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_GROUP_OBJ:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			effective_perm = ae_perm & mask_perm;
-			if (effective_perm != ae_perm) {
-				error = _posix1e_acl_perm_to_string(
-				    effective_perm,
-				    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1,
-				    effective_perm_buf);
-				if (error)
-					goto error_label;
-				len = asprintf(&tmpbuf, "%sgroup::%s\t\t# "
-				    "effective: %s\n",
-				    buf, perm_buf, effective_perm_buf);
-			} else {
-				len = asprintf(&tmpbuf, "%sgroup::%s\n", buf,
-				    perm_buf);
-			}
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_GROUP:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			error = _posix1e_acl_id_to_name(ae_tag, ae_id,
-			    MAXLOGNAME, name_buf, flags);
-			if (error)
-				goto error_label;
-
-			effective_perm = ae_perm & mask_perm;
-			if (effective_perm != ae_perm) {
-				error = _posix1e_acl_perm_to_string(
-				    effective_perm,
-				    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1,
-				    effective_perm_buf);
-				if (error)
-					goto error_label;
-				len = asprintf(&tmpbuf, "%sgroup:%s:%s\t\t# "
-				    "effective: %s\n",
-				    buf, name_buf, perm_buf,
-				    effective_perm_buf);
-			} else {
-				len = asprintf(&tmpbuf, "%sgroup:%s:%s\n", buf,
-				    name_buf, perm_buf);
-			}
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_MASK:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			len = asprintf(&tmpbuf, "%smask::%s\n", buf,
-			    perm_buf);
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		case ACL_OTHER:
-			error = _posix1e_acl_perm_to_string(ae_perm,
-			    _POSIX1E_ACL_STRING_PERM_MAXSIZE+1, perm_buf);
-			if (error)
-				goto error_label;
-
-			len = asprintf(&tmpbuf, "%sother::%s\n", buf,
-			    perm_buf);
-			if (len == -1)
-				goto error_label;
-			free(buf);
-			buf = tmpbuf;
-			break;
-
-		default:
-			errno = EINVAL;
-			goto error_label;
-		}
-	}
-
-	if (len_p) {
-		*len_p = strlen(buf);
-	}
-	return (buf);
-
-error_label:
-	/* jump to here sets errno already, we just clean up */
-	if (buf) free(buf);
-	return (NULL);
-}
-
-char *
-acl_to_text_np(acl_t acl, ssize_t *len_p, int flags)
-{
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return(NULL);
-	}
-
-	switch (_acl_brand(acl)) {
-	case ACL_BRAND_POSIX:
-		return (_posix1e_acl_to_text(acl, len_p, flags));
-	case ACL_BRAND_NFS4:
-		return (_nfs4_acl_to_text_np(acl, len_p, flags));
-	default:
-		errno = EINVAL;
-		return (NULL);
-	}
-}
-
-char *
-acl_to_text(acl_t acl, ssize_t *len_p)
-{
-
-	return (acl_to_text_np(acl, len_p, 0));
-}
diff --git a/lib/libc_bsd/posix1e/acl_to_text_nfs4.c b/lib/libc_bsd/posix1e/acl_to_text_nfs4.c
deleted file mode 100644
index 49d983a..0000000
--- a/lib/libc_bsd/posix1e/acl_to_text_nfs4.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/*-
- * Copyright (c) 2008, 2009 Edward Tomasz Napierała <trasz@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_to_text_nfs4.c 208811 2010-06-05 07:40:32Z trasz $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
-#include <string.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
-#include <sys/acl.h>
-
-#include "acl_support.h"
-
-#define MAX_ENTRY_LENGTH 512
-
-static int
-format_who(char *str, size_t size, const acl_entry_t entry, int numeric)
-{
-	int error;
-	acl_tag_t tag;
-	struct passwd *pwd;
-	struct group *grp;
-	uid_t *id;
-
-	error = acl_get_tag_type(entry, &tag);
-	if (error)
-		return (error);
-
-	switch (tag) {
-	case ACL_USER_OBJ:
-		snprintf(str, size, "owner@");
-		break;
-
-	case ACL_USER:
-		id = (uid_t *)acl_get_qualifier(entry);
-		if (id == NULL)
-			return (-1);
-		/* XXX: Thread-unsafe. */
-		if (!numeric)
-			pwd = getpwuid(*id);
-		else
-			pwd = NULL;
-		if (pwd == NULL)
-			snprintf(str, size, "user:%d", (unsigned int)*id);
-		else
-			snprintf(str, size, "user:%s", pwd->pw_name);
-		break;
-
-	case ACL_GROUP_OBJ:
-		snprintf(str, size, "group@");
-		break;
-
-	case ACL_GROUP:
-		id = (uid_t *)acl_get_qualifier(entry);
-		if (id == NULL)
-			return (-1);
-		/* XXX: Thread-unsafe. */
-		if (!numeric)
-			grp = getgrgid(*id);
-		else
-			grp = NULL;
-		if (grp == NULL)
-			snprintf(str, size, "group:%d", (unsigned int)*id);
-		else
-			snprintf(str, size, "group:%s", grp->gr_name);
-		break;
-
-	case ACL_EVERYONE:
-		snprintf(str, size, "everyone@");
-		break;
-
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-static int
-format_entry_type(char *str, size_t size, const acl_entry_t entry)
-{
-	int error;
-	acl_entry_type_t entry_type;
-
-	error = acl_get_entry_type_np(entry, &entry_type);
-	if (error)
-		return (error);
-
-	switch (entry_type) {
-	case ACL_ENTRY_TYPE_ALLOW:
-		snprintf(str, size, "allow");
-		break;
-	case ACL_ENTRY_TYPE_DENY:
-		snprintf(str, size, "deny");
-		break;
-	case ACL_ENTRY_TYPE_AUDIT:
-		snprintf(str, size, "audit");
-		break;
-	case ACL_ENTRY_TYPE_ALARM:
-		snprintf(str, size, "alarm");
-		break;
-	default:
-		return (-1);
-	}
-
-	return (0);
-}
-
-static int
-format_additional_id(char *str, size_t size, const acl_entry_t entry)
-{
-	int error;
-	acl_tag_t tag;
-	uid_t *id;
-
-	error = acl_get_tag_type(entry, &tag);
-	if (error)
-		return (error);
-
-	switch (tag) {
-	case ACL_USER_OBJ:
-	case ACL_GROUP_OBJ:
-	case ACL_EVERYONE:
-		str[0] = '\0';
-		break;
-
-	default:
-		id = (uid_t *)acl_get_qualifier(entry);
-		if (id == NULL)
-			return (-1);
-		snprintf(str, size, ":%d", (unsigned int)*id);
-	}
-
-	return (0);
-}
-
-static int
-format_entry(char *str, size_t size, const acl_entry_t entry, int flags)
-{
-	size_t off = 0, min_who_field_length = 18;
-	acl_permset_t permset;
-	acl_flagset_t flagset;
-	int error, len;
-	char buf[MAX_ENTRY_LENGTH + 1];
-
-	assert(_entry_brand(entry) == ACL_BRAND_NFS4);
-
-	error = acl_get_flagset_np(entry, &flagset);
-	if (error)
-		return (error);
-
-	error = acl_get_permset(entry, &permset);
-	if (error)
-		return (error);
-
-	error = format_who(buf, sizeof(buf), entry,
-	    flags & ACL_TEXT_NUMERIC_IDS);
-	if (error)
-		return (error);
-	len = strlen(buf);
-	if (len < min_who_field_length)
-		len = min_who_field_length;
-	off += snprintf(str + off, size - off, "%*s:", len, buf);
-
-	error = _nfs4_format_access_mask(buf, sizeof(buf), *permset,
-	    flags & ACL_TEXT_VERBOSE);
-	if (error)
-		return (error);
-	off += snprintf(str + off, size - off, "%s:", buf);
-
-	error = _nfs4_format_flags(buf, sizeof(buf), *flagset,
-	    flags & ACL_TEXT_VERBOSE);
-	if (error)
-		return (error);
-	off += snprintf(str + off, size - off, "%s:", buf);
-
-	error = format_entry_type(buf, sizeof(buf), entry);
-	if (error)
-		return (error);
-	off += snprintf(str + off, size - off, "%s", buf);
-
-	if (flags & ACL_TEXT_APPEND_ID) {
-		error = format_additional_id(buf, sizeof(buf), entry);
-		if (error)
-			return (error);
-		off += snprintf(str + off, size - off, "%s", buf);
-	}
-
-	off += snprintf(str + off, size - off, "\n");
-
-	/* Make sure we didn't truncate anything. */
-	assert (off < size);
-
-	return (0);
-}
-
-char *
-_nfs4_acl_to_text_np(const acl_t aclp, ssize_t *len_p, int flags)
-{
-	int error, off = 0, size, entry_id = ACL_FIRST_ENTRY;
-	char *str;
-	acl_entry_t entry;
-
-	if (aclp->ats_acl.acl_cnt == 0)
-		return strdup("");
-
-	size = aclp->ats_acl.acl_cnt * MAX_ENTRY_LENGTH;
-	str = malloc(size);
-	if (str == NULL)
-		return (NULL);
-
-	while (acl_get_entry(aclp, entry_id, &entry) == 1) {
-		entry_id = ACL_NEXT_ENTRY;
-
-		assert(off < size);
-
-		error = format_entry(str + off, size - off, entry, flags);
-		if (error) {
-			free(str);
-			errno = EINVAL;
-			return (NULL);
-		}
-
-		off = strlen(str);
-	}
-
-	assert(off < size);
-	str[off] = '\0';
-
-	if (len_p != NULL)
-		*len_p = off;
-
-	return (str);
-}
diff --git a/lib/libc_bsd/posix1e/acl_valid.3 b/lib/libc_bsd/posix1e/acl_valid.3
deleted file mode 100644
index c524df0..0000000
--- a/lib/libc_bsd/posix1e/acl_valid.3
+++ /dev/null
@@ -1,170 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2002 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed by Robert Watson for the TrustedBSD Project.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/acl_valid.3 140288 2005-01-15 12:21:03Z ru $
-.\"
-.Dd December 29, 2002
-.Dt ACL_VALID 3
-.Os
-.Sh NAME
-.Nm acl_valid ,
-.Nm acl_valid_fd_np ,
-.Nm acl_valid_file_np ,
-.Nm acl_valid_link_np
-.Nd validate an ACL
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.Ft int
-.Fn acl_valid "acl_t acl"
-.Ft int
-.Fn acl_valid_fd_np "int fd" "acl_type_t type" "acl_t acl"
-.Ft int
-.Fn acl_valid_file_np "const char *path_p" "acl_type_t type" "acl_t acl"
-.Ft int
-.Fn acl_valid_link_np "const char *path_p" "acl_type_t type" "acl_t acl"
-.Sh DESCRIPTION
-These functions check that the ACL referred to by the argument
-.Va acl
-is valid.
-The POSIX.1e routine,
-.Fn acl_valid ,
-checks this validity only with POSIX.1e ACL semantics, and irrespective
-of the context in which the ACL is to be used.
-The non-portable forms,
-.Fn acl_valid_fd_np ,
-.Fn acl_valid_file_np ,
-and
-.Fn acl_valid_link_np
-allow an ACL to be checked in the context of a specific acl type,
-.Va type ,
-and file system object.
-In environments where additional ACL types are
-supported than just POSIX.1e, this makes more sense.
-Whereas
-.Fn acl_valid_file_np
-will follow the symlink if the specified path is to a symlink,
-.Fn acl_valid_link_np
-will not.
-.Pp
-For POSIX.1e semantics, the checks include:
-.Bl -bullet
-.It
-The three required entries
-.Dv ( ACL_USER_OBJ , ACL_GROUP_OBJ ,
-and
-.Dv ACL_OTHER )
-shall exist exactly once in the ACL.
-If the ACL contains any
-.Dv ACL_USER , ACL_GROUP ,
-or any other
-implementation-defined entries in the file group class
-then one
-.Dv ACL_MASK
-entry shall also be required.
-The ACL shall contain at most one
-.Dv ACL_MASK
-entry.
-.It
-The qualifier field shall be unique among all entries of
-the same POSIX.1e ACL facility defined tag type.
-The
-tag type field shall contain valid values including any
-implementation-defined values.
-Validation of the values
-of the qualifier field is implementation-defined.
-.El
-.Pp
-The POSIX.1e
-.Fn acl_valid
-function may reorder the ACL for the purposes of verification; the
-non-portable validation functions will not.
-.Sh IMPLEMENTATION NOTES
-.Fx Ns 's
-support for POSIX.1e interfaces and features is still under
-development at this time.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-If any of the following conditions occur, these functions shall return
--1 and set
-.Va errno
-to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix, or the
-object exists and the process does not have appropriate access rights.
-.It Bq Er EBADF
-The
-.Va fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-Argument
-.Va acl
-does not point to a valid ACL.
-.Pp
-One or more of the required ACL entries is not present in
-.Va acl .
-.Pp
-The ACL contains entries that are not unique.
-.Pp
-The file system rejects the ACL based on fs-specific semantics issues.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters, or an
-entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named object does not exist, or the
-.Va path_p
-argument points to an empty string.
-.It Bq Er ENOMEM
-Insufficient memory available to fulfill request.
-.It Bq Er EOPNOTSUPP
-The file system does not support ACL retrieval.
-.El
-.Sh SEE ALSO
-.Xr acl 3 ,
-.Xr acl_get 3 ,
-.Xr acl_init 3 ,
-.Xr acl_set 3 ,
-.Xr posix1e 3
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
-.Sh AUTHORS
-.An Robert N M Watson
diff --git a/lib/libc_bsd/posix1e/acl_valid.c b/lib/libc_bsd/posix1e/acl_valid.c
deleted file mode 100644
index 070a3ae..0000000
--- a/lib/libc_bsd/posix1e/acl_valid.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*-
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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.
- *
- * 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.
- */
-/*
- * acl_valid -- POSIX.1e ACL check routine
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/acl_valid.c 208785 2010-06-03 14:29:17Z trasz $");
-
-#include <sys/types.h>
-#include "namespace.h"
-#include <sys/acl.h>
-#include "un-namespace.h"
-#include <sys/errno.h>
-#include <stdlib.h>
-
-#include "acl_support.h"
-
-/*
- * acl_valid: accepts an ACL, returns 0 on valid ACL, -1 for invalid,
- * and errno set to EINVAL.
- *
- * Implemented by calling the acl_check routine in acl_support, which
- * requires ordering.  We call acl_support's _posix1e_acl_sort to make this
- * true.  POSIX.1e allows acl_valid() to reorder the ACL as it sees fit.
- *
- * This call is deprecated, as it doesn't ask whether the ACL is valid
- * for a particular target.  However, this call is standardized, unlike
- * the other two forms.
- */ 
-int
-acl_valid(acl_t acl)
-{
-	int	error;
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (!_acl_brand_may_be(acl, ACL_BRAND_POSIX)) {
-		errno = EINVAL;
-		return (-1);
-	}
-	_posix1e_acl_sort(acl);
-	error = _posix1e_acl_check(acl);
-	if (error) {
-		errno = error;
-		return (-1);
-	} else {
-		return (0);
-	}
-}
-
-int
-acl_valid_file_np(const char *pathp, acl_type_t type, acl_t acl)
-{
-
-	if (pathp == NULL || acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	return (__acl_aclcheck_file(pathp, type, &acl->ats_acl));
-}
-
-int
-acl_valid_link_np(const char *pathp, acl_type_t type, acl_t acl)
-{
-
-	if (pathp == NULL || acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	return (__acl_aclcheck_link(pathp, type, &acl->ats_acl));
-}
-
-int
-acl_valid_fd_np(int fd, acl_type_t type, acl_t acl)
-{
-
-	if (acl == NULL) {
-		errno = EINVAL;
-		return (-1);
-	}
-	type = _acl_type_unold(type);
-	if (_posix1e_acl(acl, type))
-		_posix1e_acl_sort(acl);
-
-	acl->ats_cur_entry = 0;
-
-	return (___acl_aclcheck_fd(fd, type, &acl->ats_acl));
-}
diff --git a/lib/libc_bsd/posix1e/extattr.3 b/lib/libc_bsd/posix1e/extattr.3
deleted file mode 100644
index 4be28d7..0000000
--- a/lib/libc_bsd/posix1e/extattr.3
+++ /dev/null
@@ -1,100 +0,0 @@
-.\"
-.\" Copyright (c) 2001 Dima Dorfman <dd@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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/extattr.3 107788 2002-12-12 17:26:04Z ru $
-.\"
-.Dd June 24, 2001
-.Dt EXTATTR 3
-.Os
-.Sh NAME
-.Nm extattr_namespace_to_string ,
-.Nm extattr_string_to_namespace
-.Nd convert an extended attribute namespace identifier to a string and
-vice versa
-.Sh LIBRARY
-.Lb libutil
-.Sh SYNOPSIS
-.In sys/extattr.h
-.In libutil.h
-.Ft int
-.Fn extattr_namespace_to_string "int attrnamespace" "char **string"
-.Ft int
-.Fn extattr_string_to_namespace "const char *string" "int *attrnamespace"
-.Sh DESCRIPTION
-The
-.Fn extattr_namespace_to_string
-function converts a VFS extended attribute identifier to a human-readable
-string;
-the
-.Fn extattr_string_to_namespace
-function undoes the aforementioned operation,
-and converts a human-readable string representing a namespace to a
-namespace identifier.
-Although a file system may implement arbitrary namespaces,
-these functions only support the
-.Dv EXTATTR_NAMESPACE_USER
-.Pq Dq user
-and
-.Dv EXTATTR_NAMESPACE_SYSTEM
-.Pq Dq system
-namespaces,
-which are defined in
-.Xr extattr 9 .
-.Pp
-These functions are meant to be used in error reporting and other
-interactive tasks.
-For example,
-instead of printing the integer identifying an extended attribute in
-an error message,
-a program might use
-.Fn extattr_namespace_to_string
-to obtain a human-readable representation.
-Likewise,
-instead of requiring a user to enter the integer representing a namespace,
-an interactive program might ask for a name and use
-.Fn extattr_string_to_namespace
-to get the desired identifier.
-.Sh RETURN VALUES
-If any of the calls are unsuccessful, the value \-1 is returned
-and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The requested namespace could not be identified.
-.El
-.Sh SEE ALSO
-.Xr extattr 2 ,
-.Xr getextattr 8 ,
-.Xr setextattr 8 ,
-.Xr extattr 9
-.Sh HISTORY
-Extended attribute support was developed as part of the
-.Tn TrustedBSD
-Project, and introduced in
-.Fx 5.0 .
-It was developed to support security extensions requiring additional labels
-to be associated with each file or directory.
diff --git a/lib/libc_bsd/posix1e/extattr.c b/lib/libc_bsd/posix1e/extattr.c
deleted file mode 100644
index 90801fc..0000000
--- a/lib/libc_bsd/posix1e/extattr.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2001 Robert N. M. Watson
- * 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.
- *
- * 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.
- */
-/*
- * TrustedBSD: Utility functions for extended attributes.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/extattr.c 150065 2005-09-12 19:52:42Z stefanf $");
-
-#include <sys/types.h>
-#include <sys/extattr.h>
-
-#include <errno.h>
-#include <libutil.h>
-#include <string.h>
-
-int
-extattr_namespace_to_string(int attrnamespace, char **string)
-{
-
-	switch(attrnamespace) {
-	case EXTATTR_NAMESPACE_USER:
-		if (string != NULL)
-			*string = strdup(EXTATTR_NAMESPACE_USER_STRING);
-		return (0);
-
-	case EXTATTR_NAMESPACE_SYSTEM:
-		if (string != NULL)
-			*string = strdup(EXTATTR_NAMESPACE_SYSTEM_STRING);
-		return (0);
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-int
-extattr_string_to_namespace(const char *string, int *attrnamespace)
-{
-
-	if (!strcmp(string, EXTATTR_NAMESPACE_USER_STRING)) {
-		if (attrnamespace != NULL)
-			*attrnamespace = EXTATTR_NAMESPACE_USER;
-		return (0);
-	} else if (!strcmp(string, EXTATTR_NAMESPACE_SYSTEM_STRING)) {
-		if (attrnamespace != NULL)
-			*attrnamespace = EXTATTR_NAMESPACE_SYSTEM;
-		return (0);
-	} else {
-		errno = EINVAL;
-		return (-1);
-	}
-}
diff --git a/lib/libc_bsd/posix1e/mac.3 b/lib/libc_bsd/posix1e/mac.3
deleted file mode 100644
index 2d77759..0000000
--- a/lib/libc_bsd/posix1e/mac.3
+++ /dev/null
@@ -1,176 +0,0 @@
-.\" Copyright (c) 2001, 2003 Networks Associates Technology, Inc.
-.\" Copyright (c) 2009 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and Network Associates
-.\" Laboratories, the Security Research Division of Network Associates,
-.\" Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part
-.\" of the DARPA CHATS research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac.3 210772 2010-08-02 16:01:45Z joel $
-.\"
-.Dd August 7, 2009
-.Dt MAC 3
-.Os
-.Sh NAME
-.Nm mac
-.Nd introduction to the MAC security API
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Pp
-In the kernel configuration file:
-.Cd "options MAC"
-.Sh DESCRIPTION
-Mandatory Access Control labels describe confidentiality, integrity, and
-other security attributes of operating system objects, overriding
-discretionary access control.
-Not all system objects support MAC labeling, and MAC policies must be
-explicitly enabled by the administrator.
-This API, based on POSIX.1e, includes routines to retrieve, manipulate, set,
-and convert to and from text the MAC labels on files and processes.
-.Pp
-MAC labels consist of a set of (name, value) tuples, representing security
-attributes from MAC policies.
-For example, this label contains security labels defined by two policies,
-.Xr mac_biba 4
-and
-.Xr mac_mls 4 :
-.Bd -literal -offset indent
-biba/low,mls/low
-.Ed
-.Pp
-Further syntax and semantics of MAC labels may be found in
-.Xr maclabel 7 .
-.Pp
-Applications operate on labels stored in
-.Vt mac_t ,
-but can convert between this internal format and a text format for the
-purposes of presentation to uses or external storage.
-When querying a label on an object, a
-.Vt mac_t
-must first be prepared using the interfaces described in
-.Xr mac_prepare 3 ,
-allowing the application to declare which policies it wishes to interrogate.
-The application writer can also rely on default label names declared in
-.Xr mac.conf 5 .
-.Pp
-When finished with a
-.Vt mac_t ,
-the application must call
-.Xr mac_free 3
-to release its storage.
-.Pp
-The following functions are defined:
-.Bl -tag -width indent
-.It Fn mac_is_present
-This function, described in
-.Xr mac_is_present 3 ,
-allows applications to test whether MAC is configured, as well as whether
-specific policies are configured.
-.It Fn mac_get_fd , Fn mac_get_file , Fn mac_get_link , Fn mac_get_peer
-These functions, described in
-.Xr mac_get 3 ,
-retrieve the MAC labels associated with file descriptors, files, and socket
-peers.
-.It Fn mac_get_pid , Fn mac_get_proc
-These functions, described in
-.Xr mac_get 3 ,
-retrieve the MAC labels associated with processes.
-.It Fn mac_set_fd , Fn mac_set_file , Fn mac_set_link
-These functions, described in
-.Xr mac_set 3 ,
-set the MAC labels associated with file descriptors and files.
-.It Fn mac_set_proc
-This function, described in
-.Xr mac_set 3 ,
-sets the MAC label associated with the current process.
-.It Fn mac_free
-This function, described in
-.Xr mac_free 3 ,
-frees working MAC label storage.
-.It Fn mac_from_text
-This function, described in
-.Xr mac_text 3 ,
-converts a text-form MAC label into working MAC label storage,
-.Vt mac_t .
-.It Fn mac_prepare , Fn mac_prepare_file_label , Fn mac_prepare_ifnet_label , Fn mac_prepare_process_label , Fn mac_prepare_type
-These functions,  described in
-.Xr mac_prepare 3 ,
-allocate working storage for MAC label operations.
-.Xr mac_prepare 3
-prepares a label based on caller-specified label names; the other calls
-rely on the default configuration specified in
-.Xr mac.conf 5 .
-.It Fn mac_to_text
-This function is described in
-.Xr mac_text 3 ,
-and may be used to convert a
-.Vt mac_t
-into a text-form MAC label.
-.El
-.Sh FILES
-.Bl -tag -width ".Pa /etc/mac.conf" -compact
-.It Pa /etc/mac.conf
-MAC library configuration file, documented in
-.Xr mac.conf 5 .
-Provides default behavior for applications aware of MAC labels on
-system objects, but without policy-specific knowledge.
-.El
-.Sh SEE ALSO
-.Xr mac_free 3 ,
-.Xr mac_get 3 ,
-.Xr mac_is_present 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr mac_text 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr mac.conf 5 ,
-.Xr mac 9
-.Sh STANDARDS
-These APIs are loosely based on the APIs described in POSIX.1e, as described
-in IEEE POSIX.1e draft 17.
-However, the resemblance of these APIs to the POSIX APIs is loose, as the
-POSIX APIs were unable to express some notions required for flexible and
-extensible access control.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
-.Sh BUGS
-The
-.Tn TrustedBSD
-MAC Framework and associated policies, interfaces, and
-applications are considered to be an experimental feature in
-.Fx .
-Sites considering production deployment should keep the experimental
-status of these services in mind during any deployment process.
-See also
-.Xr mac 9
-for related considerations regarding the kernel framework.
diff --git a/lib/libc_bsd/posix1e/mac.c b/lib/libc_bsd/posix1e/mac.c
deleted file mode 100644
index 10bae79..0000000
--- a/lib/libc_bsd/posix1e/mac.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/mac.c 254700 2013-08-23 13:59:47Z jilles $");
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/sysctl.h>
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <sys/mac.h>
-
-static int	internal_initialized;
-
-/*
- * Maintain a list of default label preparations for various object
- * types.  Each name will appear only once in the list.
- *
- * XXXMAC: Not thread-safe.
- */
-static LIST_HEAD(, label_default) label_default_head;
-struct label_default {
-	char				*ld_name;
-	char				*ld_labels;
-	LIST_ENTRY(label_default)	 ld_entries;
-};
-
-static void
-mac_destroy_labels(void)
-{
-	struct label_default *ld;
-
-	while ((ld = LIST_FIRST(&label_default_head))) {
-		free(ld->ld_name);
-		free(ld->ld_labels);
-		LIST_REMOVE(ld, ld_entries);
-		free(ld);
-	}
-}
-
-static void
-mac_destroy_internal(void)
-{
-
-	mac_destroy_labels();
-
-	internal_initialized = 0;
-}
-
-static int
-mac_add_type(const char *name, const char *labels)
-{
-	struct label_default *ld, *ld_new;
-	char *name_dup, *labels_dup;
-
-	/*
-	 * Speculatively allocate all the memory now to avoid allocating
-	 * later when we will someday hold a mutex.
-	 */
-	name_dup = strdup(name);
-	if (name_dup == NULL) {
-		errno = ENOMEM;
-		return (-1);
-	}
-	labels_dup = strdup(labels);
-	if (labels_dup == NULL) {
-		free(name_dup);
-		errno = ENOMEM;
-		return (-1);
-	}
-	ld_new = malloc(sizeof(*ld));
-	if (ld_new == NULL) {
-		free(name_dup);
-		free(labels_dup);
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	/*
-	 * If the type is already present, replace the current entry
-	 * rather than add a new instance.
-	 */
-	for (ld = LIST_FIRST(&label_default_head); ld != NULL;
-	    ld = LIST_NEXT(ld, ld_entries)) {
-		if (strcmp(name, ld->ld_name) == 0)
-			break;
-	}
-
-	if (ld != NULL) {
-		free(ld->ld_labels);
-		ld->ld_labels = labels_dup;
-		labels_dup = NULL;
-	} else {
-		ld = ld_new;
-		ld->ld_name = name_dup;
-		ld->ld_labels = labels_dup;
-
-		ld_new = NULL;
-		name_dup = NULL;
-		labels_dup = NULL;
-
-		LIST_INSERT_HEAD(&label_default_head, ld, ld_entries);
-	}
-
-	if (name_dup != NULL)
-		free(name_dup);
-	if (labels_dup != NULL)
-		free(labels_dup);
-	if (ld_new != NULL)
-		free(ld_new);
-
-	return (0);
-}
-
-static char *
-next_token(char **string)
-{
-	char *token;
-
-	token = strsep(string, " \t");
-	while (token != NULL && *token == '\0')
-		token = strsep(string, " \t");
-
-	return (token);
-}
-
-static int
-mac_init_internal(int ignore_errors)
-{
-	const char *filename;
-	char line[LINE_MAX];
-	FILE *file;
-	int error;
-
-	error = 0;
-
-	LIST_INIT(&label_default_head);
-
-	if (!issetugid() && getenv("MAC_CONFFILE") != NULL)
-		filename = getenv("MAC_CONFFILE");
-	else
-		filename = MAC_CONFFILE;
-	file = fopen(filename, "re");
-	if (file == NULL)
-		return (0);
-
-	while (fgets(line, LINE_MAX, file)) {
-		char *comment, *parse, *statement;
-
-		if (line[strlen(line)-1] == '\n')
-			line[strlen(line)-1] = '\0';
-		else {
-			if (ignore_errors)
-				continue;
-			fclose(file);
-			error = EINVAL;
-			goto just_return;
-		}
-
-		/* Remove any comment. */
-		comment = line;
-		parse = strsep(&comment, "#");
-
-		/* Blank lines OK. */
-		statement = next_token(&parse);
-		if (statement == NULL)
-			continue;
-
-		if (strcmp(statement, "default_labels") == 0) {
-			char *name, *labels;
-
-			name = next_token(&parse);
-			labels = next_token(&parse);
-			if (name == NULL || labels == NULL ||
-			    next_token(&parse) != NULL) {
-				if (ignore_errors)
-					continue;
-				error = EINVAL;
-				fclose(file);
-				goto just_return;
-			}
-
-			if (mac_add_type(name, labels) == -1) {
-				if (ignore_errors)
-					continue;
-				fclose(file);
-				goto just_return;
-			}
-		} else if (strcmp(statement, "default_ifnet_labels") == 0 ||
-		    strcmp(statement, "default_file_labels") == 0 ||
-		    strcmp(statement, "default_process_labels") == 0) {
-			char *labels, *type;
-
-			if (strcmp(statement, "default_ifnet_labels") == 0)
-				type = "ifnet";
-			else if (strcmp(statement, "default_file_labels") == 0)
-				type = "file";
-			else if (strcmp(statement, "default_process_labels") ==
-			    0)
-				type = "process";
-
-			labels = next_token(&parse);
-			if (labels == NULL || next_token(&parse) != NULL) {
-				if (ignore_errors)
-					continue;
-				error = EINVAL;
-				fclose(file);
-				goto just_return;
-			}
-
-			if (mac_add_type(type, labels) == -1) {
-				if (ignore_errors)
-					continue;
-				fclose(file);
-				goto just_return;
-			}
-		} else {
-			if (ignore_errors)
-				continue;
-			fclose(file);
-			error = EINVAL;
-			goto just_return;
-		}
-	}
-
-	fclose(file);
-
-	internal_initialized = 1;
-
-just_return:
-	if (error != 0)
-		mac_destroy_internal();
-	return (error);
-}
-
-static int
-mac_maybe_init_internal(void)
-{
-
-	if (!internal_initialized)
-		return (mac_init_internal(1));
-	else
-		return (0);
-}
-
-int
-mac_reload(void)
-{
-
-	if (internal_initialized)
-		mac_destroy_internal();
-	return (mac_init_internal(0));
-}
-
-int
-mac_free(struct mac *mac)
-{
-
-	if (mac->m_string != NULL)
-		free(mac->m_string);
-	free(mac);
-
-	return (0);
-}
-
-int
-mac_from_text(struct mac **mac, const char *text)
-{
-
-	*mac = (struct mac *) malloc(sizeof(**mac));
-	if (*mac == NULL)
-		return (ENOMEM);
-
-	(*mac)->m_string = strdup(text);
-	if ((*mac)->m_string == NULL) {
-		free(*mac);
-		*mac = NULL;
-		return (ENOMEM);
-	}
-
-	(*mac)->m_buflen = strlen((*mac)->m_string)+1;
-
-	return (0);
-}
-
-int
-mac_to_text(struct mac *mac, char **text)
-{
-
-	*text = strdup(mac->m_string);
-	if (*text == NULL)
-		return (ENOMEM);
-	return (0);
-}
-
-int
-mac_prepare(struct mac **mac, const char *elements)
-{
-
-	if (strlen(elements) >= MAC_MAX_LABEL_BUF_LEN)
-		return (EINVAL);
-
-	*mac = (struct mac *) malloc(sizeof(**mac));
-	if (*mac == NULL)
-		return (ENOMEM);
-
-	(*mac)->m_string = malloc(MAC_MAX_LABEL_BUF_LEN);
-	if ((*mac)->m_string == NULL) {
-		free(*mac);
-		*mac = NULL;
-		return (ENOMEM);
-	}
-
-	strcpy((*mac)->m_string, elements);
-	(*mac)->m_buflen = MAC_MAX_LABEL_BUF_LEN;
-
-	return (0);
-}
-
-int
-mac_prepare_type(struct mac **mac, const char *name)
-{
-	struct label_default *ld;
-	int error;
-
-	error = mac_maybe_init_internal();
-	if (error != 0)
-		return (error);
-
-	for (ld = LIST_FIRST(&label_default_head); ld != NULL;
-	    ld = LIST_NEXT(ld, ld_entries)) {
-		if (strcmp(name, ld->ld_name) == 0)
-			return (mac_prepare(mac, ld->ld_labels));
-	}
-
-	errno = ENOENT;
-	return (-1);		/* XXXMAC: ENOLABEL */
-}
-
-int
-mac_prepare_ifnet_label(struct mac **mac)
-{
-
-	return (mac_prepare_type(mac, "ifnet"));
-}
-
-int
-mac_prepare_file_label(struct mac **mac)
-{
-
-	return (mac_prepare_type(mac, "file"));
-}
-
-int
-mac_prepare_packet_label(struct mac **mac)
-{
-
-	return (mac_prepare_type(mac, "packet"));
-}
-
-int
-mac_prepare_process_label(struct mac **mac)
-{
-
-	return (mac_prepare_type(mac, "process"));
-}
-
-/*
- * Simply test whether the TrustedBSD/MAC MIB tree is present; if so,
- * return 1 to indicate that the system has MAC enabled overall or for
- * a given policy.
- */
-int
-mac_is_present(const char *policyname)
-{
-	int mib[5];
-	size_t siz;
-	char *mibname;
-	int error;
-
-	if (policyname != NULL) {
-		if (policyname[strcspn(policyname, ".=")] != '\0') {
-			errno = EINVAL;
-			return (-1);
-		}
-		mibname = malloc(sizeof("security.mac.") - 1 +
-		    strlen(policyname) + sizeof(".enabled"));
-		if (mibname == NULL)
-			return (-1);
-		strcpy(mibname, "security.mac.");
-		strcat(mibname, policyname);
-		strcat(mibname, ".enabled");
-		siz = 5;
-		error = sysctlnametomib(mibname, mib, &siz);
-		free(mibname);
-	} else {
-		siz = 3;
-		error = sysctlnametomib("security.mac", mib, &siz);
-	}
-	if (error == -1) {
-		switch (errno) {
-		case ENOTDIR:
-		case ENOENT:
-			return (0);
-		default:
-			return (error);
-		}
-	}
-	return (1);
-}
diff --git a/lib/libc_bsd/posix1e/mac.conf.5 b/lib/libc_bsd/posix1e/mac.conf.5
deleted file mode 100644
index 0badcda..0000000
--- a/lib/libc_bsd/posix1e/mac.conf.5
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Copyright (c) 2003 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project in part by Network
-.\" Associates Laboratories, the Security Research Division of Network
-.\" Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
-.\" as part of the DARPA CHATS research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac.conf.5 140505 2005-01-20 09:17:07Z ru $
-.\"
-.Dd April 19, 2003
-.Dt MAC.CONF 5
-.Os
-.Sh NAME
-.Nm mac.conf
-.Nd format of the MAC library configuration file
-.Sh DESCRIPTION
-The
-.Nm
-file configures the default label elements to be used by policy-agnostic
-applications that operate on MAC labels.
-A file contains a series of default label sets specified by object class,
-in addition to blank lines and comments preceded by a
-.Ql #
-symbol.
-.Pp
-Currently, the implementation supports two syntax styles for label
-element declaration.
-The old (deprecated) syntax consists of a
-single line with two fields separated by white space: the object
-class name, and a list of label elements as used by the
-.Xr mac_prepare 3
-library calls prior to an application invocation of a function from
-.Xr mac_get 3 .
-.Pp
-The newer more preferred syntax consists of three fields separated by
-white space: the label group, object class name and a list of
-label elements.
-.Pp
-Label element names may optionally begin with a
-.Ql \&?
-symbol to indicate that a failure to retrieve the label element for
-an object should be silently ignored, and improves usability if the
-set of MAC policies may change over time.
-.Sh FILES
-.Bl -tag -width ".Pa /etc/mac.conf" -compact
-.It Pa /etc/mac.conf
-MAC library configuration file.
-.El
-.Sh EXAMPLES
-The following example configures user applications to operate with
-four MAC policies:
-.Xr mac_biba 4 ,
-.Xr mac_mls 4 ,
-SEBSD,
-and
-.Xr mac_partition 4 .
-.Bd -literal -offset indent
-#
-# Default label set to be used by simple MAC applications
-
-default_labels file ?biba,?lomac,?mls,?sebsd
-default_labels ifnet ?biba,?lomac,?mls,?sebsd
-default_labels process ?biba,?lomac,?mls,?partition,?sebsd
-default_labels socket ?biba,?lomac,?mls
-
-#
-# Deprecated (old) syntax
-
-default_file_labels ?biba,?mls,?sebsd
-default_ifnet_labels ?biba,?mls,?sebsd
-default_process_labels ?biba,?mls,partition,?sebsd
-.Ed
-.Pp
-In this example, userland applications will attempt to retrieve Biba,
-MLS, and SEBSD labels for all object classes; for processes, they will
-additionally attempt to retrieve a Partition identifier.
-In all cases except the Partition identifier, failure to retrieve a
-label due to the respective policy not being present will be ignored.
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_get 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
-.Sh BUGS
-The
-.Tn TrustedBSD
-MAC Framework and associated policies, interfaces, and
-applications are considered to be an experimental feature in
-.Fx .
-Sites considering production deployment should keep the experimental
-status of these services in mind during any deployment process.
-See also
-.Xr mac 9
-for related considerations regarding the kernel framework.
diff --git a/lib/libc_bsd/posix1e/mac_exec.c b/lib/libc_bsd/posix1e/mac_exec.c
deleted file mode 100644
index cd2ad17..0000000
--- a/lib/libc_bsd/posix1e/mac_exec.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2002 Networks Associates Technology, Inc.
- * All rights reserved.
- *
- * This software was developed for the FreeBSD Project in part by Network
- * Associates Laboratories, the Security Research Division of Network
- * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"),
- * as part of the DARPA CHATS research program.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/mac_exec.c 176901 2008-03-07 15:25:56Z rwatson $");
-
-#include <sys/types.h>
-#include <sys/mac.h>
-
-extern int __mac_execve(char *fname, char **argv, char **envv,
-    struct mac *mac_p);
-
-int
-mac_execve(char *fname, char **argv, char **envv, struct mac *label)
-{
-
-	return (__mac_execve(fname, argv, envv, label));
-}
diff --git a/lib/libc_bsd/posix1e/mac_free.3 b/lib/libc_bsd/posix1e/mac_free.3
deleted file mode 100644
index fed6447..0000000
--- a/lib/libc_bsd/posix1e/mac_free.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" Copyright (c) 2001, 2002 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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 AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_free.3 196123 2009-08-12 10:46:48Z rwatson $
-.\"
-.Dd December 21, 2001
-.Dt MAC_FREE 3
-.Os
-.Sh NAME
-.Nm mac_free
-.Nd free MAC label
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_free "mac_t label"
-.Sh DESCRIPTION
-The
-.Fn mac_free
-function frees the storage allocated to contain a
-.Vt mac_t .
-.Sh RETURN VALUES
-The
-.Fn mac_free
-function always returns 0.
-WARNING: see the notes in the
-.Sx BUGS
-section regarding the use of this
-function.
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_get 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr mac_text 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
-.Sh BUGS
-POSIX.1e specifies that
-.Fn mac_free
-will be used to free text strings created using
-.Xr mac_to_text 3 .
-Because
-.Vt mac_t
-is a complex structure in the
-.Tn TrustedBSD
-implementation,
-.Fn mac_free
-is specific to
-.Vt mac_3 ,
-and must not be used to free the character strings returned from
-.Fn mac_to_text .
-Doing so may result in undefined behavior.
diff --git a/lib/libc_bsd/posix1e/mac_get.3 b/lib/libc_bsd/posix1e/mac_get.3
deleted file mode 100644
index 13b247b..0000000
--- a/lib/libc_bsd/posix1e/mac_get.3
+++ /dev/null
@@ -1,152 +0,0 @@
-.\" Copyright (c) 2001, 2004 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_get.3 196123 2009-08-12 10:46:48Z rwatson $
-.\"
-.Dd December 21, 2001
-.Dt MAC_GET 3
-.Os
-.Sh NAME
-.Nm mac_get_file ,
-.Nm mac_get_link ,
-.Nm mac_get_fd ,
-.Nm mac_get_peer ,
-.Nm mac_get_pid ,
-.Nm mac_get_proc
-.Nd get the label of a file, socket, socket peer or process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_get_file "const char *path" "mac_t label"
-.Ft int
-.Fn mac_get_link "const char *path" "mac_t label"
-.Ft int
-.Fn mac_get_fd "int fd" "mac_t label"
-.Ft int
-.Fn mac_get_peer "int fd" "mac_t label"
-.Ft int
-.Fn mac_get_pid "pid_t pid" "mac_t label"
-.Ft int
-.Fn mac_get_proc "mac_t label"
-.Sh DESCRIPTION
-The
-.Fn mac_get_file
-system call returns the label associated with a file specified by
-pathname.
-The
-.Fn mac_get_link
-function is the same as
-.Fn mac_get_file ,
-except that it does not follow symlinks.
-.Pp
-The
-.Fn mac_get_fd
-system call returns the label associated with an object referenced by
-the specified file descriptor.
-Note that in the case of a file system socket, the label returned will
-be the socket label, which may be different from the label of the
-on-disk node acting as a rendezvous for the socket.
-The
-.Fn mac_get_peer
-system call returns the label associated with the remote endpoint of
-a socket; the exact semantics of this call will depend on the protocol
-domain, communications type, and endpoint; typically this label will
-be cached when a connection-oriented protocol instance is first set up,
-and is undefined for datagram protocols.
-.Pp
-The
-.Fn mac_get_pid
-and
-.Fn mac_get_proc
-system calls return the process label associated with an arbitrary
-process ID, or the current process.
-.Pp
-Label storage for use with these calls must first be allocated and
-prepared using the
-.Xr mac_prepare 3
-functions.
-When an application is done using a label, the memory may be returned
-using
-.Xr mac_free 3 .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EACCES
-A component of
-.Fa path
-is not searchable,
-or MAC read access to the file
-is denied.
-.It Bq Er EINVAL
-The requested label operation is not valid for the object referenced by
-.Fa fd .
-.It Bq Er ENAMETOOLONG
-The pathname pointed to by
-.Fa path
-exceeds
-.Dv PATH_MAX ,
-or a component of the pathname exceeds
-.Dv NAME_MAX .
-.It Bq Er ENOENT
-A component of
-.Fa path
-does not exist.
-.It Bq Er ENOMEM
-Insufficient memory is available
-to allocate a new MAC label structure.
-.It Bq Er ENOTDIR
-A component of
-.Fa path
-is not a directory.
-.El
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_free 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr mac_text 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
diff --git a/lib/libc_bsd/posix1e/mac_get.c b/lib/libc_bsd/posix1e/mac_get.c
deleted file mode 100644
index 20fa55f..0000000
--- a/lib/libc_bsd/posix1e/mac_get.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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 names of the authors 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/mac_get.c 176901 2008-03-07 15:25:56Z rwatson $");
-
-#include <sys/types.h>
-#include <sys/mac.h>
-#include <sys/socket.h>
-
-extern int __mac_get_fd(int fd, struct mac *mac_p);
-extern int __mac_get_file(const char *path_p, struct mac *mac_p);
-extern int __mac_get_link(const char *path_p, struct mac *mac_p);
-extern int __mac_get_pid(pid_t pid, struct mac *mac_p);
-extern int __mac_get_proc(struct mac *mac_p);
-
-int
-mac_get_fd(int fd, struct mac *label)
-{
-
-	return (__mac_get_fd(fd, label));
-}
-
-int
-mac_get_file(const char *path, struct mac *label)
-{
-
-	return (__mac_get_file(path, label));
-}
-
-int
-mac_get_link(const char *path, struct mac *label)
-{
-
-	return (__mac_get_link(path, label));
-}
-
-int
-mac_get_peer(int fd, struct mac *label)
-{
-	socklen_t len;
-
-	len = sizeof(*label);
-	return (getsockopt(fd, SOL_SOCKET, SO_PEERLABEL, label, &len));
-}
-
-int
-mac_get_pid(pid_t pid, struct mac *label)
-{
-
-	return (__mac_get_pid(pid, label));
-}
-
-int
-mac_get_proc(struct mac *label)
-{
-
-	return (__mac_get_proc(label));
-}
diff --git a/lib/libc_bsd/posix1e/mac_is_present.3 b/lib/libc_bsd/posix1e/mac_is_present.3
deleted file mode 100644
index 1f6d6a1..0000000
--- a/lib/libc_bsd/posix1e/mac_is_present.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 2002 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_is_present.3 162841 2006-09-30 10:34:13Z ru $
-.\"
-.Dd July 7, 2006
-.Dt MAC_IS_PRESENT 3
-.Os
-.Sh NAME
-.Nm mac_is_present
-.Nd report whether the running system has MAC support
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_is_present "const char *policyname"
-.Sh DESCRIPTION
-The
-.Fn mac_is_present
-function determines whether the currently-running kernel supports MAC for
-a given policy or not.
-If
-.Fa policyname
-is
-.Pf non- Dv NULL ,
-the presence of the named policy
-(e.g.\&
-.Dq Li biba ,
-.Dq Li mls ,
-.Dq Li te )
-is checked, otherwise the presence of any MAC policies at all is checked.
-.Sh RETURN VALUES
-If the system supports the given MAC policy, the value 1 is returned.
-If the specified MAC policy is not supported, the value 0 is returned.
-If an error occurs, the value \-1 is returned.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of
-.Fa policyname
-is not valid.
-.It Bq Er ENOMEM
-Insufficient memory was available to allocate internal storage.
-.El
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_free 3 ,
-.Xr mac_get 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr mac_text 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
diff --git a/lib/libc_bsd/posix1e/mac_prepare.3 b/lib/libc_bsd/posix1e/mac_prepare.3
deleted file mode 100644
index 3e2c3ee..0000000
--- a/lib/libc_bsd/posix1e/mac_prepare.3
+++ /dev/null
@@ -1,126 +0,0 @@
-.\" Copyright (c) 2002, 2003 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and Network Associates Labs,
-.\" the Security Research Division of Network Associates, Inc. under
-.\" DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the
-.\" DARPA CHATS research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_prepare.3 235400 2012-05-13 14:16:04Z joel $
-.\"
-.Dd August 22, 2003
-.Dt MAC_PREPARE 3
-.Os
-.Sh NAME
-.Nm mac_prepare , mac_prepare_type , mac_prepare_file_label ,
-.Nm mac_prepare_ifnet_label , mac_prepare_process_label
-.Nd allocate appropriate storage for
-.Vt mac_t
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_prepare "mac_t *mac" "const char *elements"
-.Ft int
-.Fn mac_prepare_type "mac_t *mac" "const char *name"
-.Ft int
-.Fn mac_prepare_file_label "mac_t *mac"
-.Ft int
-.Fn mac_prepare_ifnet_label "mac_t *mac"
-.Ft int
-.Fn mac_prepare_process_label "mac_t *mac"
-.Sh DESCRIPTION
-The
-.Nm
-family of functions allocates the appropriate amount of storage and initializes
-.Fa *mac
-for use by
-.Xr mac_get 3 .
-When the resulting label is passed into the
-.Xr mac_get 3
-functions, the kernel will attempt to fill in the label elements specified
-when the label was prepared.
-Elements are specified in a nul-terminated string, using commas to
-delimit fields.
-Element names may be prefixed with the
-.Ql \&?
-character to indicate that a failure by the kernel to retrieve that
-element should not be considered fatal.
-.Pp
-The
-.Fn mac_prepare
-function accepts a list of policy names as a parameter, and allocates the
-storage to fit those label elements accordingly.
-The remaining functions in the family make use of system defaults defined
-in
-.Xr mac.conf 5
-instead of an explicit
-.Va elements
-argument, deriving the default from the specified object type.
-.Pp
-.Fn mac_prepare_type
-allocates the storage to fit an object label of the type specified by
-the
-.Va name
-argument.
-The
-.Fn mac_prepare_file_label ,
-.Fn mac_prepare_ifnet_label ,
-and
-.Fn mac_prepare_process_label
-functions are equivalent to invocations of
-.Fn mac_prepare_type
-with arguments of
-.Qq file ,
-.Qq ifnet ,
-and
-.Qq process
-respectively.
-.Sh RETURN VALUES
-.Rv -std
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_free 3 ,
-.Xr mac_get 3 ,
-.Xr mac_is_present 3 ,
-.Xr mac_set 3 ,
-.Xr mac 4 ,
-.Xr mac.conf 5 ,
-.Xr maclabel 7
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
-Support for generic object types first appeared in
-.Fx 5.2 .
diff --git a/lib/libc_bsd/posix1e/mac_set.3 b/lib/libc_bsd/posix1e/mac_set.3
deleted file mode 100644
index aaf0454..0000000
--- a/lib/libc_bsd/posix1e/mac_set.3
+++ /dev/null
@@ -1,149 +0,0 @@
-.\" Copyright (c) 2001 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_set.3 196123 2009-08-12 10:46:48Z rwatson $
-.\"
-.Dd January 14, 2003
-.Dt MAC_SET 3
-.Os
-.Sh NAME
-.Nm mac_set_file ,
-.Nm mac_set_fd ,
-.Nm mac_set_proc
-.Nd set the MAC label for a file or process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_set_file "const char *path" "mac_t label"
-.Ft int
-.Fn mac_set_link "const char *path" "mac_t label"
-.Ft int
-.Fn mac_set_fd "int fd" "mac_t label"
-.Ft int
-.Fn mac_set_proc "mac_t label"
-.Sh DESCRIPTION
-The
-.Fn mac_set_file
-and
-.Fn mac_set_fd
-functions associate a MAC label
-specified by
-.Fa label
-to the file referenced to by
-.Fa path_p ,
-or to the file descriptor
-.Fa fd ,
-respectively.
-Note that when a file descriptor references a socket, label operations
-on the file descriptor act on the socket, not on the file that may
-have been used as a rendezvous when binding the socket.
-The
-.Fn mac_set_link
-function is the same as
-.Fn mac_set_file ,
-except that it does not follow symlinks.
-.Pp
-The
-.Fn mac_set_proc
-function associates the MAC label
-specified by
-.Fa label
-to the calling process.
-.Pp
-A process is allowed to set a label for a file
-only if it has MAC write access to the file,
-and its effective user ID is equal to
-the owner of the file,
-or has appropriate privileges.
-.Sh RETURN VALUES
-.Rv -std mac_set_fd mac_set_file mac_set_link mac_set_proc
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EACCES
-MAC write access to the file is denied.
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid file descriptor.
-.It Bq Er EINVAL
-The
-.Fa label
-argument
-is not a valid MAC label, or the object referenced by
-.Fa fd
-is not appropriate for label operations.
-.It Bq Er EOPNOTSUPP
-Setting MAC labels is not supported
-by the file referenced by
-.Fa fd .
-.It Bq Er EPERM
-The calling process had insufficient privilege
-to change the MAC label.
-.It Bq Er EROFS
-File system for the object being modified
-is read only.
-.It Bq Er ENAMETOOLONG
-.\" XXX POSIX_NO_TRUNC?
-The length of the pathname in
-.Fa path_p
-exceeds
-.Dv PATH_MAX ,
-or a component of the pathname
-is longer than
-.Dv NAME_MAX .
-.It Bq Er ENOENT
-The file referenced by
-.Fa path_p
-does not exist.
-.It Bq Er ENOTDIR
-A component of the pathname
-referenced by
-.Fa path_p
-is not a directory.
-.El
-.Sh SEE ALSO
-.Xr mac 3 ,
-.Xr mac_free 3 ,
-.Xr mac_get 3 ,
-.Xr mac_is_present 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_text 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr mac 9
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
diff --git a/lib/libc_bsd/posix1e/mac_set.c b/lib/libc_bsd/posix1e/mac_set.c
deleted file mode 100644
index 0aaf8b1..0000000
--- a/lib/libc_bsd/posix1e/mac_set.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson
- * All rights reserved.
- *
- * This software was developed by Robert Watson for the TrustedBSD Project.
- *
- * 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 names of the authors 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/posix1e/mac_set.c 176901 2008-03-07 15:25:56Z rwatson $");
-
-#include <sys/types.h>
-#include <sys/mac.h>
-
-extern	int	__mac_set_fd(int fd, struct mac *mac_p);
-extern	int	__mac_set_file(const char *path_p, struct mac *mac_p);
-extern	int	__mac_set_link(const char *path_p, struct mac *mac_p);
-extern	int	__mac_set_proc(struct mac *mac_p);
-
-int
-mac_set_fd(int fd, struct mac *label)
-{
-
-	return (__mac_set_fd(fd, label));
-}
-
-int
-mac_set_file(const char *path, struct mac *label)
-{
-
-	return (__mac_set_file(path, label));
-}
-
-int
-mac_set_link(const char *path, struct mac *label)
-{
-
-	return (__mac_set_link(path, label));
-}
-
-int
-mac_set_proc(struct mac *label)
-{
-
-	return (__mac_set_proc(label));
-}
diff --git a/lib/libc_bsd/posix1e/mac_text.3 b/lib/libc_bsd/posix1e/mac_text.3
deleted file mode 100644
index 64805eb..0000000
--- a/lib/libc_bsd/posix1e/mac_text.3
+++ /dev/null
@@ -1,117 +0,0 @@
-.\" Copyright (c) 2001 Networks Associates Technology, Inc.
-.\" All rights reserved.
-.\"
-.\" This software was developed for the FreeBSD Project by Chris
-.\" Costello at Safeport Network Services and NAI Labs, the Security
-.\" Research Division of Network Associates, Inc. under DARPA/SPAWAR
-.\" contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS
-.\" research program.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/posix1e/mac_text.3 196123 2009-08-12 10:46:48Z rwatson $
-.\"
-.Dd December 21, 2001
-.Dt MAC_TEXT 3
-.Os
-.Sh NAME
-.Nm mac_from_text ,
-.Nm mac_to_text
-.Nd convert MAC label to/from text representation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mac.h
-.Ft int
-.Fn mac_from_text "mac_t *mac" "const char *text"
-.Ft int
-.Fn mac_to_text "mac_t label" "char **text"
-.Sh DESCRIPTION
-The
-.Fn mac_from_text
-function converts the text representation of a label
-into the internal policy label format
-.Pq Vt mac_t
-and places it in
-.Fa *mac ,
-which must later be freed with
-.Xr free 3 .
-.Pp
-The
-.Fn mac_to_text
-function allocates storage for
-.Fa *text ,
-which will be set to the text representation of
-.Fa label .
-.Pp
-Refer to
-.Xr maclabel 7
-for the MAC label format.
-.Sh RETURN VALUES
-.Rv -std mac_from_text mac_to_text
-.Sh COMPATIBILITY
-POSIX.1e does not define
-a format for text representations
-of MAC labels.
-.Pp
-POSIX.1e requires that text strings allocated using
-.Fn mac_to_text
-be freed using
-.Xr mac_free 3 ;
-in the
-.Fx
-implementation, they must be freed using
-.Xr free 3 ,
-as
-.Xr mac_free 3
-is used only to free memory used for type
-.Vt mac_t .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient memory was available
-to allocate internal storage.
-.El
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr mac 3 ,
-.Xr mac_get 3 ,
-.Xr mac_is_present 3 ,
-.Xr mac_prepare 3 ,
-.Xr mac_set 3 ,
-.Xr posix1e 3 ,
-.Xr mac 4 ,
-.Xr maclabel 7
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
-.Sh HISTORY
-Support for Mandatory Access Control was introduced in
-.Fx 5.0
-as part of the
-.Tn TrustedBSD
-Project.
diff --git a/lib/libc_bsd/posix1e/posix1e.3 b/lib/libc_bsd/posix1e/posix1e.3
deleted file mode 100644
index c28f00c..0000000
--- a/lib/libc_bsd/posix1e/posix1e.3
+++ /dev/null
@@ -1,118 +0,0 @@
-.\"-
-.\" Copyright (c) 2000, 2009 Robert N. M. Watson
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/posix1e/posix1e.3 264818 2014-04-23 12:11:14Z brueffer $
-.\"
-.Dd April 15, 2014
-.Dt POSIX1E 3
-.Os
-.Sh NAME
-.Nm posix1e
-.Nd introduction to the POSIX.1e security API
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/acl.h
-.In sys/mac.h
-.Sh DESCRIPTION
-POSIX.1e describes five security extensions to the POSIX.1 API: Access
-Control Lists (ACLs), Auditing, Capabilities, Mandatory Access Control, and
-Information Flow Labels.
-While IEEE POSIX.1e D17 specification has not been standardized, several of
-its interfaces are widely used.
-.Pp
-.Fx
-implements POSIX.1e interface for access control lists, described in
-.Xr acl 3 ,
-and supports ACLs on the
-.Xr ffs 7
-file system; ACLs must be administratively enabled using
-.Xr tunefs 8 .
-.Pp
-.Fx
-implements a POSIX.1e-like mandatory access control interface, described in
-.Xr mac 3 ,
-although with a number of extensions and important semantic differences.
-.Pp
-.Fx
-does not implement the POSIX.1e audit, privilege (capability), or information
-flow label APIs.
-However,
-.Fx
-does implement the
-.Xr libbsm
-audit API.
-It also provides
-.Xr capsicum 4 ,
-a lightweight OS capability and sandbox framework implementing a
-hybrid capability system model.
-.Sh ENVIRONMENT
-POSIX.1e assigns security attributes to all objects, extending the security
-functionality described in POSIX.1.
-These additional attributes store fine-grained discretionary access control
-information and mandatory access control labels; for files, they are stored
-in extended attributes, described in
-.Xr extattr 3 .
-.Pp
-POSIX.2c describes
-a set of userland utilities for manipulating these attributes, including
-.Xr getfacl 1
-and
-.Xr setfacl 1
-for access control lists, and
-.Xr getfmac 8
-and
-.Xr setfmac 8
-for mandatory access control labels.
-.Sh SEE ALSO
-.Xr getfacl 1 ,
-.Xr setfacl 1 ,
-.Xr extattr 2 ,
-.Xr acl 3 ,
-.Xr extattr 3 ,
-.Xr libcapsicum 3 ,
-.Xr libbsm 3 ,
-.Xr mac 3 ,
-.Xr capsicum 4 ,
-.Xr ffs 7 ,
-.Xr getfmac 8 ,
-.Xr setfmac 8 ,
-.Xr tunefs 8 ,
-.Xr acl 9 ,
-.Xr extattr 9 ,
-.Xr mac 9
-.Sh STANDARDS
-POSIX.1e is described in IEEE POSIX.1e draft 17.
-.Sh HISTORY
-POSIX.1e support was introduced in
-.Fx 4.0 ;
-most features were available as of
-.Fx 5.0 .
-.Sh AUTHORS
-.An Robert N M Watson
-.An Chris D. Faulhaber
-.An Thomas Moestl
-.An Ilmar S Habibulin
diff --git a/lib/libc_bsd/powerpc/Makefile.inc b/lib/libc_bsd/powerpc/Makefile.inc
deleted file mode 100644
index e8e8f2c..0000000
--- a/lib/libc_bsd/powerpc/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile.incl 246117 2013-01-30 12:48:16Z kib $
-
-SRCS+=	__vdso_gettc.c
-
-# Long double is 64-bits
-MDSRCS+=machdep_ldisd.c
-SYM_MAPS+=${.CURDIR}/powerpc/Symbol.map
diff --git a/lib/libc_bsd/powerpc/SYS.h b/lib/libc_bsd/powerpc/SYS.h
deleted file mode 100644
index 29b5053..0000000
--- a/lib/libc_bsd/powerpc/SYS.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2002 Benno Rice.  All rights reserved.
- * Copyright (c) 2002 David E. O'Brien.  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. Neither the name of the author nor the names of any contributors
- *    may 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 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.
- *
- *	$NetBSD: SYS.h,v 1.8 2002/01/14 00:55:56 thorpej Exp $
- * $FreeBSD: releng/10.2/lib/libc/powerpc/SYS.h 231044 2012-02-05 20:04:43Z andreast $
- */
-
-#include <sys/syscall.h>
-#include <machine/asm.h>
-
-#define	_SYSCALL(name)						\
-	.text;							\
-	.align 2;						\
-	li	0,(__CONCAT(SYS_, name));			\
-	sc
-
-#define	SYSCALL(name)						\
-	.text;							\
-	.align 2;						\
-2:	b	PIC_PLT(CNAME(HIDENAME(cerror)));		\
-ENTRY(__CONCAT(__sys_, name));				\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), name);		\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\
-	_SYSCALL(name);						\
-	bso	2b
-
-#define	PSEUDO(name)						\
-	.text;							\
-	.align 2;						\
-ENTRY(__CONCAT(__sys_, name));				\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\
-	_SYSCALL(name);						\
-	bnslr;							\
-	b	PIC_PLT(CNAME(HIDENAME(cerror)))
-
-#define	RSYSCALL(name)						\
-	.text;							\
-	.align 2;						\
-2:	b	PIC_PLT(CNAME(HIDENAME(cerror)));		\
-ENTRY(__CONCAT(__sys_, name));				\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), name);		\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\
-	_SYSCALL(name);						\
-	bnslr;							\
-	b	PIC_PLT(CNAME(HIDENAME(cerror)))
diff --git a/lib/libc_bsd/powerpc/Symbol.map b/lib/libc_bsd/powerpc/Symbol.map
deleted file mode 100644
index d592ec9..0000000
--- a/lib/libc_bsd/powerpc/Symbol.map
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/powerpc/Symbol.map 236006 2012-05-25 16:30:42Z marcel $
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSD_1.0 {
-	/* PSEUDO syscalls */
-	_exit;
-
-	_mcount;
-	_setjmp;
-	_longjmp;
-	fabs;
-	__flt_rounds;
-	fpgetmask;
-	fpgetround;
-	fpgetsticky;
-	fpsetmask;
-	fpsetround;
-	__infinity;
-	__nan;
-	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
-	htonl;
-	htons;
-	ntohl;
-	ntohs;
-	brk;
-	exect;
-	sbrk;
-	vfork;
-};
-
-FBSD_1.3 {
-	__eabi;
-};
-
-FBSDprivate_1.0 {
-	/* PSEUDO syscalls */
-	__sys_getlogin;
-	_getlogin;
-	__sys_exit;
-
-	_set_tp;
-	_fpgetsticky;
-	__makecontext;
-	__longjmp;
-	signalcontext;
-	__signalcontext;
-	__syncicache;
-	_end;
-	.curbrk;
-	.minbrk;
-	.cerror;
-};
diff --git a/lib/libc_bsd/powerpc/_fpmath.h b/lib/libc_bsd/powerpc/_fpmath.h
deleted file mode 100644
index 65e4ea5..0000000
--- a/lib/libc_bsd/powerpc/_fpmath.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2003 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/powerpc/_fpmath.h 143214 2005-03-07 04:55:22Z das $
- */
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-		unsigned int		sign	:1;
-		unsigned int		exp	:11;
-		unsigned int		manh	:20;
-		unsigned int		manl	:32;
-	} bits;
-};
-
-#define	mask_nbit_l(u)	((void)0)
-#define	LDBL_IMPLICIT_NBIT
-#define	LDBL_NBIT	0
-
-#define	LDBL_MANH_SIZE	20
-#define	LDBL_MANL_SIZE	32
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)(u).bits.manh;		\
-} while(0)
diff --git a/lib/libc_bsd/powerpc/arith.h b/lib/libc_bsd/powerpc/arith.h
deleted file mode 100644
index 0d3131c..0000000
--- a/lib/libc_bsd/powerpc/arith.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD: releng/10.2/lib/libc/powerpc/arith.h 114839 2003-05-08 13:50:44Z das $
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-
-#define IEEE_MC68k
-#define Arith_Kind_ASL 2
-#define Double_Align
diff --git a/lib/libc_bsd/powerpc/gd_qnan.h b/lib/libc_bsd/powerpc/gd_qnan.h
deleted file mode 100644
index 58c2abd..0000000
--- a/lib/libc_bsd/powerpc/gd_qnan.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * This file can be generated by compiling and running contrib/gdtoa/qnan.c
- * on the target architecture after arith.h has been generated.
- *
- * $FreeBSD: releng/10.2/lib/libc/powerpc/gd_qnan.h 165747 2007-01-03 05:00:03Z das $
- */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
-#define ld_QNAN0 0x7ff80000
-#define ld_QNAN1 0x0
-#define ld_QNAN2 0x0
-#define ld_QNAN3 0x0
-#define ldus_QNAN0 0x7ff8
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0x0
-#define ldus_QNAN4 0x0
diff --git a/lib/libc_bsd/powerpc/gen/Makefile.inc b/lib/libc_bsd/powerpc/gen/Makefile.inc
deleted file mode 100644
index 0800d40..0000000
--- a/lib/libc_bsd/powerpc/gen/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.incl 235929 2012-05-24 20:12:46Z marcel $
-
-SRCS += _ctx_start.S eabi.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \
-	fpgetsticky.c fpsetmask.c fpsetround.c getcontextx.c \
-	infinity.c ldexp.c makecontext.c _setjmp.S \
-	setjmp.S sigsetjmp.S signalcontext.c syncicache.c \
-	_set_tp.c
-
-
diff --git a/lib/libc_bsd/powerpc/gen/_ctx_start.S b/lib/libc_bsd/powerpc/gen/_ctx_start.S
deleted file mode 100644
index 1910937..0000000
--- a/lib/libc_bsd/powerpc/gen/_ctx_start.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2004 Suleiman Souhlal
- * 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.
- *
- * 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.
- */
-
- #include <machine/asm.h>
-
- __FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/_ctx_start.S 217398 2011-01-14 11:33:40Z kib $");
-
-	.globl  CNAME(_ctx_done)
-	.globl  CNAME(abort)
-
- ENTRY(_ctx_start)
-	mtlr	%r14
-	blrl			/* branch to start function */
-	mr	%r3,%r15	/* pass pointer to ucontext as argument */
-	bl	PIC_PLT(CNAME(_ctx_done)) /* branch to ctxt completion func */
-	/*
-	 * we should never return from the
-	 * above branch.
-	 */
-	bl	PIC_PLT(CNAME(abort))	/* abort */
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/gen/_set_tp.c b/lib/libc_bsd/powerpc/gen/_set_tp.c
deleted file mode 100644
index 76d30a3..0000000
--- a/lib/libc_bsd/powerpc/gen/_set_tp.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/powerpc/gen/_set_tp.c 161853 2006-09-02 01:07:21Z marcel $
- */
-
-void
-_set_tp(void *tpval)
-{
-	register void *tp __asm__("r2");
-
-	__asm __volatile("mr %0,%1" : "=r"(tp) : "r"((char*)tpval + 0x7008));
-}
diff --git a/lib/libc_bsd/powerpc/gen/_setjmp.S b/lib/libc_bsd/powerpc/gen/_setjmp.S
deleted file mode 100644
index c9c0f63..0000000
--- a/lib/libc_bsd/powerpc/gen/_setjmp.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: _setjmp.S,v 1.1 1997/03/29 20:55:53 thorpej Exp $      */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/_setjmp.S 234115 2012-04-11 00:00:40Z nwhitehorn $");
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *      _longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *      _setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is NOT restored.
- *
- * jmpbuf layout:
- *     +------------+
- *     |   unused   |
- *     +------------+
- *     |   unused   |
- *     |            |
- *     | (4 words)  |
- *     |            |
- *     +------------+
- *     | saved regs |
- *     |    ...     |	
- */
-
-ENTRY(_setjmp)
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-	stmw	%r9,20(%r3)
-	li	%r3,0
-	blr
-
-ENTRY(_longjmp)
-	lmw	%r9,20(%r3)
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r1,%r10
-	or.	%r3,%r4,%r4
-	bnelr
-	li	%r3,1
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/gen/eabi.S b/lib/libc_bsd/powerpc/gen/eabi.S
deleted file mode 100644
index fc3f5e9..0000000
--- a/lib/libc_bsd/powerpc/gen/eabi.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2011 Marcel Moolenaar
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/eabi.S 235929 2012-05-24 20:12:46Z marcel $");
-
-ENTRY(__eabi)
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/gen/fabs.S b/lib/libc_bsd/powerpc/gen/fabs.S
deleted file mode 100644
index 0217057..0000000
--- a/lib/libc_bsd/powerpc/gen/fabs.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2004 Peter Grehan.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/fabs.S 217398 2011-01-14 11:33:40Z kib $");
-
-/*
- * double fabs(double)
- */
-ENTRY(fabs)
-	fabs	%f1,%f1
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/gen/flt_rounds.c b/lib/libc_bsd/powerpc/gen/flt_rounds.c
deleted file mode 100644
index 3195a79..0000000
--- a/lib/libc_bsd/powerpc/gen/flt_rounds.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.4.10.3 2002/03/22 20:41:53 nathanw Exp $	*/
-
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * 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 Mark Brinicombe
- *	for the NetBSD Project.
- * 4. 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/flt_rounds.c 176530 2008-02-24 19:22:53Z raj $");
-
-#include <sys/types.h>
-#include <machine/float.h>
-
-#ifndef _SOFT_FLOAT
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds()
-{
-	uint64_t fpscr;
-
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
-	return map[(fpscr & 0x03)];
-}
-#endif
diff --git a/lib/libc_bsd/powerpc/gen/fpgetmask.c b/lib/libc_bsd/powerpc/gen/fpgetmask.c
deleted file mode 100644
index 2863946..0000000
--- a/lib/libc_bsd/powerpc/gen/fpgetmask.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/fpgetmask.c 204606 2010-03-02 22:11:14Z joel $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-fp_except_t
-fpgetmask()
-{
-	u_int64_t fpscr;
-
-	__asm__("mffs %0" : "=f"(fpscr));
-	return ((fp_except_t)((fpscr >> 3) & 0x1f));
-}
-#endif
diff --git a/lib/libc_bsd/powerpc/gen/fpgetround.c b/lib/libc_bsd/powerpc/gen/fpgetround.c
deleted file mode 100644
index d66a558..0000000
--- a/lib/libc_bsd/powerpc/gen/fpgetround.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/fpgetround.c 204606 2010-03-02 22:11:14Z joel $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-fp_rnd_t
-fpgetround()
-{
-	u_int64_t fpscr;
-
-	__asm__("mffs %0" : "=f"(fpscr));
-	return ((fp_rnd_t)(fpscr & 0x3));
-}
-#endif
diff --git a/lib/libc_bsd/powerpc/gen/fpgetsticky.c b/lib/libc_bsd/powerpc/gen/fpgetsticky.c
deleted file mode 100644
index c9e68a1..0000000
--- a/lib/libc_bsd/powerpc/gen/fpgetsticky.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libc/powerpc/gen/fpgetsticky.c 204606 2010-03-02 22:11:14Z joel $
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except_t
-fpgetsticky()
-{
-	u_int64_t fpscr;
-
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
-	return ((fp_except_t)((fpscr >> 25) & 0x1f));
-}
-#endif
diff --git a/lib/libc_bsd/powerpc/gen/fpsetmask.c b/lib/libc_bsd/powerpc/gen/fpsetmask.c
deleted file mode 100644
index 5e20e3c..0000000
--- a/lib/libc_bsd/powerpc/gen/fpsetmask.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/fpsetmask.c 204606 2010-03-02 22:11:14Z joel $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-fp_except_t
-fpsetmask(fp_except_t mask)
-{
-	u_int64_t fpscr;
-	fp_rnd_t old;
-
-	__asm__("mffs %0" : "=f"(fpscr));
-	old = (fp_rnd_t)((fpscr >> 3) & 0x1f);
-	fpscr = (fpscr & 0xffffff07) | (mask << 3);
-	__asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
-	return (old);
-}
-#endif
diff --git a/lib/libc_bsd/powerpc/gen/fpsetround.c b/lib/libc_bsd/powerpc/gen/fpsetround.c
deleted file mode 100644
index 5c681cd..0000000
--- a/lib/libc_bsd/powerpc/gen/fpsetround.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/fpsetround.c 204606 2010-03-02 22:11:14Z joel $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-fp_rnd_t
-fpsetround(fp_rnd_t rnd_dir)
-{
-	u_int64_t fpscr;
-	fp_rnd_t old;
-
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
-	old = (fp_rnd_t)(fpscr & 0x3);
-	fpscr = (fpscr & 0xfffffffc) | rnd_dir;
-	__asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
-	return (old);
-}
-#endif
diff --git a/lib/libc_bsd/powerpc/gen/getcontextx.c b/lib/libc_bsd/powerpc/gen/getcontextx.c
deleted file mode 100644
index 4cd054c..0000000
--- a/lib/libc_bsd/powerpc/gen/getcontextx.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/getcontextx.c 251047 2013-05-28 04:54:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stdlib.h>
-
-int
-__getcontextx_size(void)
-{
-
-	return (sizeof(ucontext_t));
-}
-
-int
-__fillcontextx2(char *ctx)
-{
-
-	return (0);
-}
-
-int
-__fillcontextx(char *ctx)
-{
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	return (getcontext(ucp));
-}
-
-__weak_reference(__getcontextx, getcontextx);
-
-ucontext_t *
-__getcontextx(void)
-{
-	char *ctx;
-	int error;
-
-	ctx = malloc(__getcontextx_size());
-	if (ctx == NULL)
-		return (NULL);
-	if (__fillcontextx(ctx) == -1) {
-		error = errno;
-		free(ctx);
-		errno = error;
-		return (NULL);
-	}
-	return ((ucontext_t *)ctx);
-}
diff --git a/lib/libc_bsd/powerpc/gen/infinity.c b/lib/libc_bsd/powerpc/gen/infinity.c
deleted file mode 100644
index 381821a..0000000
--- a/lib/libc_bsd/powerpc/gen/infinity.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/infinity.c 110566 2003-02-08 20:37:55Z mike $");
-
-/* infinity.c */
-
-#include <math.h>
-
-/* bytes for +Infinity on powerpc */
-const union __infinity_un __infinity = { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } };
-
-/* bytes for NaN */
-const union __nan_un __nan = { { 0xff, 0xc0, 0, 0 } };
diff --git a/lib/libc_bsd/powerpc/gen/makecontext.c b/lib/libc_bsd/powerpc/gen/makecontext.c
deleted file mode 100644
index 6c3503e..0000000
--- a/lib/libc_bsd/powerpc/gen/makecontext.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2004 Suleiman Souhlal
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/makecontext.c 132398 2004-07-19 12:05:07Z grehan $");
-
-#include <sys/param.h>
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <ucontext.h>
-
-__weak_reference(__makecontext, makecontext);
-
-void _ctx_done(ucontext_t *ucp);
-void _ctx_start(void);
-
-void
-_ctx_done(ucontext_t *ucp)
-{
-	if (ucp->uc_link == NULL)
-		exit(0);
-	else {
-		/* invalidate context */
-		ucp->uc_mcontext.mc_len = 0;
-
-		setcontext((const ucontext_t *)ucp->uc_link);
-
-		abort(); /* should never return from above call */
-	}
-}
-
-void
-__makecontext(ucontext_t *ucp, void (*start)(void), int argc, ...)
-{
-	mcontext_t *mc;
-	char *sp;
-	va_list ap;
-	int i, regargs, stackargs;
-
-	/* Sanity checks */
-	if ((ucp == NULL) || (argc < 0) || (argc > NCARGS)
-	    || (ucp->uc_stack.ss_sp == NULL)
-	    || (ucp->uc_stack.ss_size < MINSIGSTKSZ)) {
-		/* invalidate context */
-		ucp->uc_mcontext.mc_len = 0;
-		return;
-	}
-
-	/*
-	 * The stack must have space for the frame pointer, saved
-	 * link register, overflow arguments, and be 16-byte
-	 * aligned.
-	 */
-	stackargs = (argc > 8) ? argc - 8 : 0;
-	sp = (char *) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size
-		- sizeof(uint32_t)*(stackargs + 2);
-	sp = (char *)((uint32_t)sp & ~0x1f);
-
-	mc = &ucp->uc_mcontext;
-
-	/*
-	 * Up to 8 register args. Assumes all args are 32-bit and
-	 * integer only. Not sure how to cater for floating point,
-	 * although 64-bit args will work if aligned correctly
-	 * in the arg list.
-	 */
-	regargs = (argc > 8) ? 8 : argc;
-	va_start(ap, argc);
-	for (i = 0; i < regargs; i++)
-		mc->mc_gpr[3 + i] = va_arg(ap, uint32_t);
-
-	/*
-	 * Overflow args go onto the stack
-	 */
-	if (argc > 8) {
-		uint32_t *argp;
-
-		/* Skip past frame pointer and saved LR */
-		argp = (uint32_t *)sp + 2;
-
-		for (i = 0; i < stackargs; i++)
-			*argp++ = va_arg(ap, uint32_t);
-	}
-	va_end(ap);
-
-	/*
-	 * Use caller-saved regs 14/15 to hold params that _ctx_start
-	 * will use to invoke the user-supplied func
-	 */
-	mc->mc_srr0 = (uint32_t) _ctx_start;
-	mc->mc_gpr[1] = (uint32_t) sp;		/* new stack pointer */
-	mc->mc_gpr[14] = (uint32_t) start;	/* r14 <- start */
-	mc->mc_gpr[15] = (uint32_t) ucp;	/* r15 <- ucp */
-}
diff --git a/lib/libc_bsd/powerpc/gen/setjmp.S b/lib/libc_bsd/powerpc/gen/setjmp.S
deleted file mode 100644
index 3c7b50e..0000000
--- a/lib/libc_bsd/powerpc/gen/setjmp.S
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: setjmp.S,v 1.3 1998/10/03 12:30:38 tsubai Exp $        */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/setjmp.S 234115 2012-04-11 00:00:40Z nwhitehorn $");
-
-#include <sys/syscall.h>
-	
-/*
- * C library -- setjmp, longjmp
- *
- *      longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *      setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- *
- * jmpbuf layout:
- *     +------------+
- *     |   unused   |
- *     +------------+
- *     | sig state  |
- *     |            |
- *     | (4 words)  |
- *     |            |
- *     +------------+
- *     | saved regs |
- *     |    ...     |
- */
-
-ENTRY(setjmp)
-	mr	%r6,%r3
-	li	%r3,1			/* SIG_BLOCK, but doesn't matter */
-					/*            since set == NULL  */
-	li	%r4,0			/* set = NULL */
-	mr	%r5,%r6			/* &oset */
-	addi	%r5,%r5,4
-	li	%r0, SYS_sigprocmask	/*sigprocmask(SIG_BLOCK, NULL, &oset)*/
-	sc				/*assume no error       XXX */
-	mflr	%r11			/* r11 <- link reg */
-	mfcr	%r12			/* r12 <- condition reg */
-	mr	%r10,%r1		/* r10 <- stackptr */
-	mr	%r9,%r2			/*  r9 <- global ptr */
-	stmw	%r9,20(%r6)
-	li	%r3,0			/* return (0) */
-	blr
-
-	WEAK_REFERENCE(CNAME(__longjmp), longjmp)
-ENTRY(__longjmp)
-	lmw	%r9,20(%r3)		/* restore regs */
-	mr	%r6,%r4			/* save val param */
-	mtlr	%r11			/* r11 -> link reg */
-	mtcr	%r12			/* r12 -> condition reg */
-	mr	%r1,%r10		/* r10 -> stackptr */
-	mr	%r4,%r3
-	li	%r3,3			/* SIG_SETMASK */
-	addi	%r4,%r4,4		/* &set */
-	li	%r5,0			/* oset = NULL */
-	li	%r0,SYS_sigprocmask	/* sigprocmask(SIG_SET, &set, NULL) */
-	sc                              /* assume no error       XXX */
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/gen/signalcontext.c b/lib/libc_bsd/powerpc/gen/signalcontext.c
deleted file mode 100644
index daad90c..0000000
--- a/lib/libc_bsd/powerpc/gen/signalcontext.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2004 Marcel Moolenaar, Peter Grehan
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/signalcontext.c 132399 2004-07-19 12:08:03Z grehan $");
-
-#include <sys/param.h>
-#include <sys/ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <strings.h>
-
-typedef void (*handler_t)(uint32_t, uint32_t, uint32_t);
-
-/* Prototypes */
-static void ctx_wrapper(ucontext_t *ucp, handler_t func, uint32_t sig,
-			uint32_t sig_si, uint32_t sig_uc);
-
-__weak_reference(__signalcontext, signalcontext);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	siginfo_t *sig_si;
-	ucontext_t *sig_uc;
-	uint32_t sp;
-
-	/* Bail out if we don't have a valid ucontext pointer. */
-	if (ucp == NULL)
-		abort();
-
-	/*
-	 * Build a 16-byte-aligned signal frame
-	 */
-	sp = (ucp->uc_mcontext.mc_gpr[1] - sizeof(ucontext_t)) & ~15UL;
-	sig_uc = (ucontext_t *)sp;
-	bcopy(ucp, sig_uc, sizeof(*sig_uc));
-	sp = (sp - sizeof(siginfo_t)) & ~15UL;
-	sig_si = (siginfo_t *)sp;
-	bzero(sig_si, sizeof(*sig_si));
-	sig_si->si_signo = sig;
-
-	/*
-	 * Subtract 8 bytes from stack to allow for frameptr
-	 */
-	sp -= 2*sizeof(uint32_t);
-	sp &= ~15UL;
-
-	/*
-	 * Setup the ucontext of the signal handler.
-	 */
-	bzero(&ucp->uc_mcontext, sizeof(ucp->uc_mcontext));
-	ucp->uc_link = sig_uc;
-	sigdelset(&ucp->uc_sigmask, sig);
-
-	ucp->uc_mcontext.mc_vers = _MC_VERSION;
-	ucp->uc_mcontext.mc_len = sizeof(struct __mcontext);
-	ucp->uc_mcontext.mc_srr0 = (uint32_t) ctx_wrapper;
-	ucp->uc_mcontext.mc_gpr[1] = (uint32_t) sp;
-	ucp->uc_mcontext.mc_gpr[3] = (uint32_t) func;
-	ucp->uc_mcontext.mc_gpr[4] = (uint32_t) sig;
-	ucp->uc_mcontext.mc_gpr[5] = (uint32_t) sig_si;
-	ucp->uc_mcontext.mc_gpr[6] = (uint32_t) sig_uc;
-
-	return (0);
-}
-
-static void
-ctx_wrapper(ucontext_t *ucp, handler_t func, uint32_t sig, uint32_t sig_si,
-	    uint32_t sig_uc)
-{
-
-	(*func)(sig, sig_si, sig_uc);
-	if (ucp->uc_link == NULL)
-		exit(0);
-	setcontext((const ucontext_t *)ucp->uc_link);
-	/* should never get here */
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/powerpc/gen/sigsetjmp.S b/lib/libc_bsd/powerpc/gen/sigsetjmp.S
deleted file mode 100644
index 30a56ba..0000000
--- a/lib/libc_bsd/powerpc/gen/sigsetjmp.S
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: sigsetjmp.S,v 1.4 1998/10/03 12:30:38 tsubai Exp $     */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/gen/sigsetjmp.S 234115 2012-04-11 00:00:40Z nwhitehorn $");
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *      siglongjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *      sigsetjmp(a, savemask)
- * by restoring registers from the stack.
- * The previous signal state is restored if savemask is non-zero
- *
- * jmpbuf layout:
- *     +------------+
- *     |  savemask  |
- *     +------------+
- *     | sig state  |
- *     |            |
- *     | (4 words)  |
- *     |            |
- *     +------------+
- *     | saved regs |
- *     |    ...     |
- */
-
-	
-#include <sys/syscall.h>
-
-ENTRY(sigsetjmp)
-	mr	%r6,%r3
-	stw	%r4,0(%r3)
-	or.	%r7,%r4,%r4
-	beq	1f
-	li	%r3,1			/* SIG_BLOCK, but doesn't matter */
-					/*            since set == NULL  */
-	li	%r4,0			/* set = NULL */
-	mr	%r5,%r6			/* &oset */
-	addi	%r5,%r5,4
-	li	%r0, SYS_sigprocmask   /* sigprocmask(SIG_BLOCK, NULL, &oset)*/
-	sc				/* assume no error       XXX */
-1:
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-	stmw	%r9,20(%r6)
-	li	%r3,0
-	blr
-
-ENTRY(siglongjmp)
-	lmw	%r9,20(%r3)
-	lwz	%r7,0(%r3)
-	mr	%r6,%r4
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r1,%r10
-	or.	%r7,%r7,%r7
-	beq	1f
-	mr	%r4,%r3
-	li	%r3,3			/* SIG_SETMASK */
-	addi	%r4,%r4,4		/* &set */
-	li	%r5,0			/* oset = NULL */
-	li	%r0,SYS_sigprocmask	/* sigprocmask(SIG_SET, &set, NULL) */
-	sc				/* assume no error       XXX */
-1:
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/gen/syncicache.c b/lib/libc_bsd/powerpc/gen/syncicache.c
deleted file mode 100644
index 3135787..0000000
--- a/lib/libc_bsd/powerpc/gen/syncicache.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
- * Copyright (C) 1995-1997, 1999 TooLs GmbH.
- * 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
- *
- * $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $
- */
-
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD: releng/10.2/lib/libc/powerpc/gen/syncicache.c 253750 2013-07-28 18:44:17Z avg $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#if	defined(_KERNEL) || defined(_STANDALONE)
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <vm/vm.h>
-#endif
-#include <sys/sysctl.h>
-
-#include <machine/cpu.h>
-#include <machine/md_var.h>
-
-#ifdef _STANDALONE
-int cacheline_size = 32;
-#endif
-
-#if	!defined(_KERNEL) && !defined(_STANDALONE)
-#include <stdlib.h>
-
-int cacheline_size = 0;
-
-static void getcachelinesize(void);
-
-static void
-getcachelinesize()
-{
-	static int	cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
-	int		clen;
-
-	clen = sizeof(cacheline_size);
-
-	if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
-	    &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) {
-		abort();
-	}
-}
-#endif
-
-void
-__syncicache(void *from, int len)
-{
-	int	l, off;
-	char	*p;
-
-#if	!defined(_KERNEL) && !defined(_STANDALONE)
-	if (!cacheline_size)
-		getcachelinesize();
-#endif	
-
-	off = (u_int)from & (cacheline_size - 1);
-	l = len += off;
-	p = (char *)from - off;
-
-	do {
-		__asm __volatile ("dcbst 0,%0" :: "r"(p));
-		p += cacheline_size;
-	} while ((l -= cacheline_size) > 0);
-	__asm __volatile ("sync");
-	p = (char *)from - off;
-	do {
-		__asm __volatile ("icbi 0,%0" :: "r"(p));
-		p += cacheline_size;
-	} while ((len -= cacheline_size) > 0);
-	__asm __volatile ("sync; isync");
-}
-
diff --git a/lib/libc_bsd/powerpc/softfloat/milieu.h b/lib/libc_bsd/powerpc/softfloat/milieu.h
deleted file mode 100644
index a2e3fdd..0000000
--- a/lib/libc_bsd/powerpc/softfloat/milieu.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/powerpc/softfloat/milieu.h 178620 2008-04-27 18:34:34Z marcel $ */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "powerpc-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc_bsd/powerpc/softfloat/powerpc-gcc.h b/lib/libc_bsd/powerpc/softfloat/powerpc-gcc.h
deleted file mode 100644
index 35ff135..0000000
--- a/lib/libc_bsd/powerpc/softfloat/powerpc-gcc.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/powerpc/softfloat/powerpc-gcc.h 178620 2008-04-27 18:34:34Z marcel $ */
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#define BIGENDIAN
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef unsigned int uint8;
-typedef int int8;
-typedef unsigned int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static __inline
-
-/*
--------------------------------------------------------------------------------
-The ARM FPA is odd in that it stores doubles high-order word first, no matter
-what the endianness of the CPU.  VFP is sane.
--------------------------------------------------------------------------------
-*/
-#if defined(SOFTFLOAT_FOR_GCC)
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
-#endif
diff --git a/lib/libc_bsd/powerpc/softfloat/softfloat.h b/lib/libc_bsd/powerpc/softfloat/softfloat.h
deleted file mode 100644
index bdaa710..0000000
--- a/lib/libc_bsd/powerpc/softfloat/softfloat.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $	*/
-/* $FreeBSD: releng/10.2/lib/libc/powerpc/softfloat/softfloat.h 178620 2008-04-27 18:34:34Z marcel $ */
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-/* #define FLOAT128 */
-
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int8 float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd_t float_rounding_mode;
-enum {
-    float_round_nearest_even = FP_RN,
-    float_round_to_zero      = FP_RZ,
-    float_round_down         = FP_RM,
-    float_round_up           = FP_RP
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-typedef fp_except_t fp_except;
-
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int );
-float64 int32_to_float64( int );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int );
-#endif
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-unsigned int float32_to_uint32_round_to_zero( float32 );
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-int float32_eq( float32, float32 );
-int float32_le( float32, float32 );
-int float32_lt( float32, float32 );
-int float32_eq_signaling( float32, float32 );
-int float32_le_quiet( float32, float32 );
-int float32_lt_quiet( float32, float32 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-unsigned int float64_to_uint32_round_to_zero( float64 );
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-int float64_eq( float64, float64 );
-int float64_le( float64, float64 );
-int float64_lt( float64, float64 );
-int float64_eq_signaling( float64, float64 );
-int float64_le_quiet( float64, float64 );
-int float64_lt_quiet( float64, float64 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float64_is_signaling_nan( float64 );
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-int floatx80_eq( floatx80, floatx80 );
-int floatx80_le( floatx80, floatx80 );
-int floatx80_lt( floatx80, floatx80 );
-int floatx80_eq_signaling( floatx80, floatx80 );
-int floatx80_le_quiet( floatx80, floatx80 );
-int floatx80_lt_quiet( floatx80, floatx80 );
-int floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-int float128_eq( float128, float128 );
-int float128_le( float128, float128 );
-int float128_lt( float128, float128 );
-int float128_eq_signaling( float128, float128 );
-int float128_le_quiet( float128, float128 );
-int float128_lt_quiet( float128, float128 );
-int float128_is_signaling_nan( float128 );
-
-#endif
-
diff --git a/lib/libc_bsd/powerpc/sys/Makefile.inc b/lib/libc_bsd/powerpc/sys/Makefile.inc
deleted file mode 100644
index 2ddbb59..0000000
--- a/lib/libc_bsd/powerpc/sys/Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile.incl 184789 2008-11-09 10:45:13Z ed $
-
-MDASM+=	brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
diff --git a/lib/libc_bsd/powerpc/sys/__vdso_gettc.c b/lib/libc_bsd/powerpc/sys/__vdso_gettc.c
deleted file mode 100644
index 0a17568..0000000
--- a/lib/libc_bsd/powerpc/sys/__vdso_gettc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2013 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/sys/__vdso_gettc.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-
-#pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
-{
-
-	return (0);
-}
-
-#pragma weak __vdso_gettimekeep
-int
-__vdso_gettimekeep(struct vdso_timekeep **tk)
-{
-
-	return (ENOSYS);
-}
diff --git a/lib/libc_bsd/powerpc/sys/brk.S b/lib/libc_bsd/powerpc/sys/brk.S
deleted file mode 100644
index 3fa9d53..0000000
--- a/lib/libc_bsd/powerpc/sys/brk.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: brk.S,v 1.9 2000/06/26 06:25:43 kleink Exp $   */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/sys/brk.S 217398 2011-01-14 11:33:40Z kib $");
-
-#include "SYS.h"
-
-        .globl  HIDENAME(curbrk)
-        .globl  HIDENAME(minbrk)
-        .globl  CNAME(_end)
-
-        .data
-HIDENAME(minbrk):
-        .long   CNAME(_end)
-
-        .text
-
-ENTRY(brk)
-#ifdef PIC
-	mflr    %r10
-	bl	_GLOBAL_OFFSET_TABLE_@local-4
-	mflr	%r9
-	mtlr	%r10
-	lwz	%r5,HIDENAME(minbrk)@got(%r9)
-	lwz	%r6,0(%r5)
-#else
-	lis	%r5,HIDENAME(minbrk)@ha
-	lwz	%r6,HIDENAME(minbrk)@l(%r5)
-#endif
-	cmplw   %r6,%r3			/* if (minbrk <= r3) */
-	bgt     0f
-	mr	%r6,%r3			/* r6 = r3 */
-0:
-	mr      %r3,%r6			/* new break value */
-	li      %r0,SYS_break
-	sc				/* assume, that r5 is kept */
-	bso	1f
-#ifdef PIC
-	lwz	%r7,HIDENAME(curbrk)@got(%r9)
-	stw	%r6,0(%r7)
-#else
-	lis	%r7,HIDENAME(curbrk)@ha /* record new break */
-	stw	%r6,HIDENAME(curbrk)@l(%r7)
-#endif
-	blr				/* return 0 */
-
-1:
-	b	PIC_PLT(HIDENAME(cerror))
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/sys/cerror.S b/lib/libc_bsd/powerpc/sys/cerror.S
deleted file mode 100644
index a437738..0000000
--- a/lib/libc_bsd/powerpc/sys/cerror.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: cerror.S,v 1.5 2000/01/27 14:58:48 kleink Exp $        */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/sys/cerror.S 217398 2011-01-14 11:33:40Z kib $");
-	
-#include "SYS.h"
-
-	.globl  HIDENAME(cerror)
-	.globl  CNAME(__error)
-
-	/*
-	 * The __error() function is thread aware. For non-threaded
-	 * programs and the initial threaded in threaded programs,
-	 * it returns a pointer to the global errno variable.
-	 */
-HIDENAME(cerror):
-	mflr	%r0
-	stwu	%r1,-16(%r1)		/* allocate new stack frame */
-	stw	%r0,20(%r1)		/* and save lr, r31 */
-	stw	%r31,8(%r1)
-	mr	%r31,%r3          /* stash errval in callee-saved register */
-	bl	PIC_PLT(CNAME(__error))
-	stw	%r31,0(%r3)		/* store errval into &errno */
-	lwz	%r0,20(%r1)
-	lwz	%r31,8(%r1)
-	mtlr	%r0
-	la	%r1,16(%r1)
-	li	%r3,-1
-	li	%r4,-1
-	blr				/* return to callers caller */
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/sys/exect.S b/lib/libc_bsd/powerpc/sys/exect.S
deleted file mode 100644
index 23ef200..0000000
--- a/lib/libc_bsd/powerpc/sys/exect.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: exect.S,v 1.3 1998/05/25 15:28:03 ws Exp $     */
-	
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/sys/exect.S 217398 2011-01-14 11:33:40Z kib $");
-
-#include "SYS.h"
-
-ENTRY(exect)
-	li	%r0,SYS_execve
-	sc
-	bso	1f
-	blr
-1:
-	b	PIC_PLT(HIDENAME(cerror))
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/sys/pipe.S b/lib/libc_bsd/powerpc/sys/pipe.S
deleted file mode 100644
index 8145622..0000000
--- a/lib/libc_bsd/powerpc/sys/pipe.S
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: pipe.S,v 1.6 2000/09/28 08:38:54 kleink Exp $  */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/sys/pipe.S 217398 2011-01-14 11:33:40Z kib $");
-
-#include "SYS.h"
-
-ENTRY(pipe)
-	mr	%r5,%r3		/* save pointer */
-	li	%r0,SYS_pipe
-	sc			/* r5 is preserved */
-	bso	1f
-	stw	%r3,0(%r5)	/* success, store fds */
-	stw	%r4,4(%r5)
-	li	%r3,0
-	blr			/* and return 0 */
-1:
-	b	PIC_PLT(HIDENAME(cerror))
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/sys/ptrace.S b/lib/libc_bsd/powerpc/sys/ptrace.S
deleted file mode 100644
index e2a8e2e..0000000
--- a/lib/libc_bsd/powerpc/sys/ptrace.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: ptrace.S,v 1.3 2000/02/23 20:16:57 kleink Exp $        */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/sys/ptrace.S 217398 2011-01-14 11:33:40Z kib $");
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-	mflr	%r0
-	stwu	%r1,-32(%r1)
-	stw	%r0,36(%r1)
-	stw	%r3,8(%r1)
-	stw	%r4,12(%r1)
-	stw	%r5,16(%r1)
-	stw	%r6,20(%r1)
-
-	bl	PIC_PLT(CNAME(__error))
-	li	%r7,0
-	stw	%r7,0(%r3)
-
-	lwz	%r3,8(%r1)
-	lwz	%r4,12(%r1)
-	lwz	%r5,16(%r1)
-	lwz	%r0,36(%r1)
-	lwz	%r6,20(%r1)
-	mtlr	%r0
-	la	%r1,32(%r1)
-	li	%r0,SYS_ptrace
-	sc
-	bso	1f
-	blr
-1:
-	b	PIC_PLT(HIDENAME(cerror))
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/sys/sbrk.S b/lib/libc_bsd/powerpc/sys/sbrk.S
deleted file mode 100644
index 148036d..0000000
--- a/lib/libc_bsd/powerpc/sys/sbrk.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: sbrk.S,v 1.8 2000/06/26 06:25:44 kleink Exp $  */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/sys/sbrk.S 217398 2011-01-14 11:33:40Z kib $");
-
-#include "SYS.h"
-
-	.globl	HIDENAME(curbrk)
-	.globl	CNAME(_end)
-
-	.data
-HIDENAME(curbrk):
-	.long	CNAME(_end)
-
-	.text
-ENTRY(sbrk)
-
-#ifdef PIC
-	mflr	%r10
-	bl	_GLOBAL_OFFSET_TABLE_@local-4
-	mflr	%r5
-	mtlr	%r10
-	lwz	%r5,HIDENAME(curbrk)@got(%r5)
-	lwz	%r6,0(%r5)
-#else
-	lis	%r5,HIDENAME(curbrk)@ha
-	lwz	%r6,HIDENAME(curbrk)@l(%r5)	/* r6 = old break */
-#endif
-	cmpwi	%r3,0				/* sbrk(0) - return curbrk */
-	beq	1f
-	add	%r3,%r3,%r6
-	mr	%r7,%r3				/* r7 = new break */
-	li	%r0,SYS_break
-	sc					/* break(new_break) */
-	bso	2f
-#ifdef PIC
-	stw     %r7,0(%r5)
-#else
-	stw     %r7,HIDENAME(curbrk)@l(%r5)	/* record new break */
-#endif
-1:
-	mr      %r3,%r6				/* set return value */
-	blr
-2:
-	b	PIC_PLT(HIDENAME(cerror))
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc/sys/setlogin.S b/lib/libc_bsd/powerpc/sys/setlogin.S
deleted file mode 100644
index ae444f8..0000000
--- a/lib/libc_bsd/powerpc/sys/setlogin.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: setlogin.S,v 1.3 1998/11/24 11:14:57 tsubai Exp $      */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc/sys/setlogin.S 217398 2011-01-14 11:33:40Z kib $");
-	
-#include "SYS.h"
-
-	.globl  CNAME(_logname_valid)		/* in _getlogin() */
-
-SYSCALL(setlogin)
-#ifdef PIC
-	mflr	%r10
-	bl	_GLOBAL_OFFSET_TABLE_@local-4
-	mflr	%r4
-	lwz	%r4,CNAME(_logname_valid)@got(%r4)
-	li	%r5,%r0
-	stw	%r5,0(%r4)
-	mtlr	%r10
-#else
-	lis	%r4,CNAME(_logname_valid)@ha
-	li	%r5,0
-	stw	%r5,CNAME(_logname_valid)@l(%r4)
-#endif
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/Makefile.inc b/lib/libc_bsd/powerpc64/Makefile.inc
deleted file mode 100644
index 2a61c88..0000000
--- a/lib/libc_bsd/powerpc64/Makefile.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile.incl 246117 2013-01-30 12:48:16Z kib $
-
-SRCS+=	__vdso_gettc.c
-
-# Long double is 64-bits
-MDSRCS+=machdep_ldisd.c
-SYM_MAPS+=${.CURDIR}/powerpc64/Symbol.map
diff --git a/lib/libc_bsd/powerpc64/SYS.h b/lib/libc_bsd/powerpc64/SYS.h
deleted file mode 100644
index 14dfb04..0000000
--- a/lib/libc_bsd/powerpc64/SYS.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 2002 Benno Rice.  All rights reserved.
- * Copyright (c) 2002 David E. O'Brien.  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. Neither the name of the author nor the names of any contributors
- *    may 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 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.
- *
- *	$NetBSD: SYS.h,v 1.8 2002/01/14 00:55:56 thorpej Exp $
- * $FreeBSD: releng/10.2/lib/libc/powerpc64/SYS.h 231044 2012-02-05 20:04:43Z andreast $
- */
-
-#include <sys/syscall.h>
-#include <machine/asm.h>
-
-#define	_SYSCALL(name)						\
-	.text;							\
-	.align 2;						\
-	li	0,(__CONCAT(SYS_, name));			\
-	sc
-
-#define	SYSCALL(name)						\
-	.text;							\
-	.align 2;						\
-2:	mflr	%r0;						\
-	std	%r0,16(%r1);					\
-	stdu	%r1,-48(%r1);					\
-	bl	CNAME(HIDENAME(cerror));			\
-	nop;							\
-	addi	%r1,%r1,48;					\
-	ld	%r0,16(%r1);					\
-	mtlr	%r0;						\
-	blr;							\
-ENTRY(__CONCAT(__sys_, name));						\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), name);			\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name)); 	\
-	_SYSCALL(name);							\
-	bso	2b
-
-#define	PSEUDO(name)						\
-	.text;							\
-	.align 2;						\
-ENTRY(__CONCAT(__sys_, name));					\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));   \
-	_SYSCALL(name);						\
-	bnslr;							\
-	mflr	%r0;						\
-	std	%r0,16(%r1);					\
-	stdu	%r1,-48(%r1);					\
-	bl	CNAME(HIDENAME(cerror));			\
-	nop;							\
-	addi	%r1,%r1,48;					\
-	ld	%r0,16(%r1);					\
-	mtlr	%r0;						\
-	blr;
-
-#define	RSYSCALL(name)						\
-	.text;							\
-	.align 2;						\
-ENTRY(__CONCAT(__sys_, name));					\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), name);		\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\
-	_SYSCALL(name);						\
-	bnslr;							\
-								\
-	mflr	%r0;						\
-	std	%r0,16(%r1);					\
-	stdu	%r1,-48(%r1);					\
-	bl	CNAME(HIDENAME(cerror));			\
-	nop;							\
-	addi	%r1,%r1,48;					\
-	ld	%r0,16(%r1);					\
-	mtlr	%r0;						\
-	blr;
diff --git a/lib/libc_bsd/powerpc64/Symbol.map b/lib/libc_bsd/powerpc64/Symbol.map
deleted file mode 100644
index d49b150..0000000
--- a/lib/libc_bsd/powerpc64/Symbol.map
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/powerpc64/Symbol.map 226606 2011-10-21 06:40:36Z das $
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSD_1.0 {
-	/* PSEUDO syscalls */
-	_exit;
-
-	_mcount;
-	_setjmp;
-	_longjmp;
-	fabs;
-	__flt_rounds;
-	fpgetmask;
-	fpgetround;
-	fpgetsticky;
-	fpsetmask;
-	fpsetround;
-	__infinity;
-	__nan;
-	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
-	htonl;
-	htons;
-	ntohl;
-	ntohs;
-	brk;
-	exect;
-	sbrk;
-	vfork;
-};
-
-FBSDprivate_1.0 {
-	/* PSEUDO syscalls */
-	__sys_getlogin;
-	_getlogin;
-	__sys_exit;
-
-	_set_tp;
-	_fpgetsticky;
-	__makecontext;
-	__longjmp;
-	signalcontext;
-	__signalcontext;
-	__syncicache;
-	_end;
-	_curbrk;
-	_minbrk;
-	_cerror;
-};
diff --git a/lib/libc_bsd/powerpc64/_fpmath.h b/lib/libc_bsd/powerpc64/_fpmath.h
deleted file mode 100644
index a5016ae..0000000
--- a/lib/libc_bsd/powerpc64/_fpmath.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2003 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/powerpc64/_fpmath.h 209878 2010-07-10 14:45:03Z nwhitehorn $
- */
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-		unsigned int		sign	:1;
-		unsigned int		exp	:11;
-		unsigned int		manh	:20;
-		unsigned int		manl	:32;
-	} bits;
-};
-
-#define	mask_nbit_l(u)	((void)0)
-#define	LDBL_IMPLICIT_NBIT
-#define	LDBL_NBIT	0
-
-#define	LDBL_MANH_SIZE	20
-#define	LDBL_MANL_SIZE	32
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)(u).bits.manh;		\
-} while(0)
diff --git a/lib/libc_bsd/powerpc64/arith.h b/lib/libc_bsd/powerpc64/arith.h
deleted file mode 100644
index e40edbe..0000000
--- a/lib/libc_bsd/powerpc64/arith.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD: releng/10.2/lib/libc/powerpc64/arith.h 209878 2010-07-10 14:45:03Z nwhitehorn $
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-
-#define IEEE_MC68k
-#define Arith_Kind_ASL 2
-#define Double_Align
diff --git a/lib/libc_bsd/powerpc64/gd_qnan.h b/lib/libc_bsd/powerpc64/gd_qnan.h
deleted file mode 100644
index e49ccf3..0000000
--- a/lib/libc_bsd/powerpc64/gd_qnan.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * This file can be generated by compiling and running contrib/gdtoa/qnan.c
- * on the target architecture after arith.h has been generated.
- *
- * $FreeBSD: releng/10.2/lib/libc/powerpc64/gd_qnan.h 209878 2010-07-10 14:45:03Z nwhitehorn $
- */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x0
-#define ld_QNAN0 0x7ff80000
-#define ld_QNAN1 0x0
-#define ld_QNAN2 0x0
-#define ld_QNAN3 0x0
-#define ldus_QNAN0 0x7ff8
-#define ldus_QNAN1 0x0
-#define ldus_QNAN2 0x0
-#define ldus_QNAN3 0x0
-#define ldus_QNAN4 0x0
diff --git a/lib/libc_bsd/powerpc64/gen/Makefile.inc b/lib/libc_bsd/powerpc64/gen/Makefile.inc
deleted file mode 100644
index faf7fa3..0000000
--- a/lib/libc_bsd/powerpc64/gen/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile.incl 230429 2012-01-21 18:00:28Z kib $
-
-SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \
-	fpgetsticky.c fpsetmask.c fpsetround.c getcontextx.c \
-	infinity.c ldexp.c makecontext.c _setjmp.S \
-	setjmp.S sigsetjmp.S signalcontext.c syncicache.c \
-	_set_tp.c
-
-
diff --git a/lib/libc_bsd/powerpc64/gen/_ctx_start.S b/lib/libc_bsd/powerpc64/gen/_ctx_start.S
deleted file mode 100644
index 7db7a83..0000000
--- a/lib/libc_bsd/powerpc64/gen/_ctx_start.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2004 Suleiman Souhlal
- * 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.
- *
- * 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.
- */
-
- #include <machine/asm.h>
-
- __FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/_ctx_start.S 218824 2011-02-18 21:44:53Z nwhitehorn $");
-
-	.globl  CNAME(_ctx_done)
-	.globl  CNAME(abort)
-
- ENTRY(_ctx_start)
-	ld	%r2,8(%r14)
-	ld	%r14,0(%r14)
-	mtlr	%r14
-	blrl			/* branch to start function */
-	mr	%r3,%r15	/* pass pointer to ucontext as argument */
-	nop
-	bl	CNAME(_ctx_done) /* branch to ctxt completion func */
-	/*
-	 * we should never return from the
-	 * above branch.
-	 */
-	nop
-	bl	CNAME(abort)	/* abort */
-	nop
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/gen/_set_tp.c b/lib/libc_bsd/powerpc64/gen/_set_tp.c
deleted file mode 100644
index f5218a3..0000000
--- a/lib/libc_bsd/powerpc64/gen/_set_tp.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/powerpc64/gen/_set_tp.c 209878 2010-07-10 14:45:03Z nwhitehorn $
- */
-
-void
-_set_tp(void *tpval)
-{
-	register void *tp __asm__("r13");
-
-	__asm __volatile("mr %0,%1" : "=r"(tp) : "r"((char*)tpval + 0x7010));
-}
diff --git a/lib/libc_bsd/powerpc64/gen/_setjmp.S b/lib/libc_bsd/powerpc64/gen/_setjmp.S
deleted file mode 100644
index 0507615..0000000
--- a/lib/libc_bsd/powerpc64/gen/_setjmp.S
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: _setjmp.S,v 1.1 1997/03/29 20:55:53 thorpej Exp $      */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/_setjmp.S 234115 2012-04-11 00:00:40Z nwhitehorn $");
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *      _longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *      _setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is NOT restored.
- *
- * jmpbuf layout:
- *     +------------+
- *     |   unused   |
- *     +------------+
- *     |   unused   |
- *     |            |
- *     | (4 words)  |
- *     |            |
- *     +------------+
- *     | saved regs |
- *     |    ...     |	
- */
-
-ENTRY(_setjmp)
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-	std	%r9,40 + 0*8(%r3)
-	std	%r10,40 + 1*8(%r3)
-	std	%r11,40 + 2*8(%r3)
-	std	%r12,40 + 3*8(%r3)
-	std	%r13,40 + 4*8(%r3)
-	std	%r14,40 + 5*8(%r3)
-	std	%r15,40 + 6*8(%r3)
-	std	%r16,40 + 7*8(%r3)
-	std	%r17,40 + 8*8(%r3)
-	std	%r18,40 + 9*8(%r3)
-	std	%r19,40 + 10*8(%r3)
-	std	%r20,40 + 11*8(%r3)
-	std	%r21,40 + 12*8(%r3)
-	std	%r22,40 + 13*8(%r3)
-	std	%r23,40 + 14*8(%r3)
-	std	%r24,40 + 15*8(%r3)
-	std	%r25,40 + 16*8(%r3)
-	std	%r26,40 + 17*8(%r3)
-	std	%r27,40 + 18*8(%r3)
-	std	%r28,40 + 19*8(%r3)
-	std	%r29,40 + 20*8(%r3)
-	std	%r30,40 + 21*8(%r3)
-	std	%r31,40 + 22*8(%r3)
-	li	%r3,0
-	blr
-
-ENTRY(_longjmp)
-	ld	%r9,40 + 0*8(%r3)
-	ld	%r10,40 + 1*8(%r3)
-	ld	%r11,40 + 2*8(%r3)
-	ld	%r12,40 + 3*8(%r3)
-	ld	%r14,40 + 5*8(%r3)
-	ld	%r15,40 + 6*8(%r3)
-	ld	%r16,40 + 7*8(%r3)
-	ld	%r17,40 + 8*8(%r3)
-	ld	%r18,40 + 9*8(%r3)
-	ld	%r19,40 + 10*8(%r3)
-	ld	%r20,40 + 11*8(%r3)
-	ld	%r21,40 + 12*8(%r3)
-	ld	%r22,40 + 13*8(%r3)
-	ld	%r23,40 + 14*8(%r3)
-	ld	%r24,40 + 15*8(%r3)
-	ld	%r25,40 + 16*8(%r3)
-	ld	%r26,40 + 17*8(%r3)
-	ld	%r27,40 + 18*8(%r3)
-	ld	%r28,40 + 19*8(%r3)
-	ld	%r29,40 + 20*8(%r3)
-	ld	%r30,40 + 21*8(%r3)
-	ld	%r31,40 + 22*8(%r3)
-
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r2,%r9
-	mr	%r1,%r10
-	or.	%r3,%r4,%r4
-	bnelr
-	li	%r3,1
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/gen/fabs.S b/lib/libc_bsd/powerpc64/gen/fabs.S
deleted file mode 100644
index e9b5b6c..0000000
--- a/lib/libc_bsd/powerpc64/gen/fabs.S
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2004 Peter Grehan.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/fabs.S 217398 2011-01-14 11:33:40Z kib $");
-
-/*
- * double fabs(double)
- */
-ENTRY(fabs)
-	fabs	%f1,%f1
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/gen/flt_rounds.c b/lib/libc_bsd/powerpc64/gen/flt_rounds.c
deleted file mode 100644
index 9e2c0ca..0000000
--- a/lib/libc_bsd/powerpc64/gen/flt_rounds.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*	$NetBSD: flt_rounds.c,v 1.4.10.3 2002/03/22 20:41:53 nathanw Exp $	*/
-
-/*
- * Copyright (c) 1996 Mark Brinicombe
- * 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 Mark Brinicombe
- *	for the NetBSD Project.
- * 4. 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/flt_rounds.c 209878 2010-07-10 14:45:03Z nwhitehorn $");
-
-#include <sys/types.h>
-#include <machine/float.h>
-
-#ifndef _SOFT_FLOAT
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds()
-{
-	uint64_t fpscr;
-
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
-	return map[(fpscr & 0x03)];
-}
-#endif
diff --git a/lib/libc_bsd/powerpc64/gen/fpgetmask.c b/lib/libc_bsd/powerpc64/gen/fpgetmask.c
deleted file mode 100644
index 9dc9394..0000000
--- a/lib/libc_bsd/powerpc64/gen/fpgetmask.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/fpgetmask.c 251091 2013-05-29 01:54:10Z emaste $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-fp_except_t
-fpgetmask()
-{
-	u_int64_t fpscr;
-
-	__asm__("mffs %0" : "=f"(fpscr));
-	return ((fp_except_t)((fpscr >> 3) & 0x1f));
-}
-#endif
diff --git a/lib/libc_bsd/powerpc64/gen/fpgetround.c b/lib/libc_bsd/powerpc64/gen/fpgetround.c
deleted file mode 100644
index 940e932..0000000
--- a/lib/libc_bsd/powerpc64/gen/fpgetround.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/fpgetround.c 251091 2013-05-29 01:54:10Z emaste $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-fp_rnd_t
-fpgetround()
-{
-	u_int64_t fpscr;
-
-	__asm__("mffs %0" : "=f"(fpscr));
-	return ((fp_rnd_t)(fpscr & 0x3));
-}
-#endif
diff --git a/lib/libc_bsd/powerpc64/gen/fpgetsticky.c b/lib/libc_bsd/powerpc64/gen/fpgetsticky.c
deleted file mode 100644
index 5a9521b..0000000
--- a/lib/libc_bsd/powerpc64/gen/fpgetsticky.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- * 
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- * 
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libc/powerpc64/gen/fpgetsticky.c 251091 2013-05-29 01:54:10Z emaste $
- */
-
-#include <sys/cdefs.h>
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except_t
-fpgetsticky()
-{
-	u_int64_t fpscr;
-
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
-	return ((fp_except_t)((fpscr >> 25) & 0x1f));
-}
-#endif
diff --git a/lib/libc_bsd/powerpc64/gen/fpsetmask.c b/lib/libc_bsd/powerpc64/gen/fpsetmask.c
deleted file mode 100644
index 87314cb..0000000
--- a/lib/libc_bsd/powerpc64/gen/fpsetmask.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/fpsetmask.c 251091 2013-05-29 01:54:10Z emaste $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-fp_except_t
-fpsetmask(fp_except_t mask)
-{
-	u_int64_t fpscr;
-	fp_rnd_t old;
-
-	__asm__("mffs %0" : "=f"(fpscr));
-	old = (fp_rnd_t)((fpscr >> 3) & 0x1f);
-	fpscr = (fpscr & 0xffffff07) | (mask << 3);
-	__asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
-	return (old);
-}
-#endif
diff --git a/lib/libc_bsd/powerpc64/gen/fpsetround.c b/lib/libc_bsd/powerpc64/gen/fpsetround.c
deleted file mode 100644
index db5f76d..0000000
--- a/lib/libc_bsd/powerpc64/gen/fpsetround.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1999 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dan Winship.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/fpsetround.c 251091 2013-05-29 01:54:10Z emaste $");
-
-#include <sys/types.h>
-#include <ieeefp.h>
-
-#ifndef _SOFT_FLOAT
-fp_rnd_t
-fpsetround(fp_rnd_t rnd_dir)
-{
-	u_int64_t fpscr;
-	fp_rnd_t old;
-
-	__asm__ __volatile("mffs %0" : "=f"(fpscr));
-	old = (fp_rnd_t)(fpscr & 0x3);
-	fpscr = (fpscr & 0xfffffffc) | rnd_dir;
-	__asm__ __volatile("mtfsf 0xff,%0" :: "f"(fpscr));
-	return (old);
-}
-#endif
diff --git a/lib/libc_bsd/powerpc64/gen/getcontextx.c b/lib/libc_bsd/powerpc64/gen/getcontextx.c
deleted file mode 100644
index 0393e33..0000000
--- a/lib/libc_bsd/powerpc64/gen/getcontextx.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/getcontextx.c 251047 2013-05-28 04:54:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stdlib.h>
-
-int
-__getcontextx_size(void)
-{
-
-	return (sizeof(ucontext_t));
-}
-
-int
-__fillcontextx2(char *ctx)
-{
-
-	return (0);
-}
-
-int
-__fillcontextx(char *ctx)
-{
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	return (getcontext(ucp));
-}
-
-__weak_reference(__getcontextx, getcontextx);
-
-ucontext_t *
-__getcontextx(void)
-{
-	char *ctx;
-	int error;
-
-	ctx = malloc(__getcontextx_size());
-	if (ctx == NULL)
-		return (NULL);
-	if (__fillcontextx(ctx) == -1) {
-		error = errno;
-		free(ctx);
-		errno = error;
-		return (NULL);
-	}
-	return ((ucontext_t *)ctx);
-}
diff --git a/lib/libc_bsd/powerpc64/gen/infinity.c b/lib/libc_bsd/powerpc64/gen/infinity.c
deleted file mode 100644
index c9a1ef8..0000000
--- a/lib/libc_bsd/powerpc64/gen/infinity.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/infinity.c 209878 2010-07-10 14:45:03Z nwhitehorn $");
-
-/* infinity.c */
-
-#include <math.h>
-
-/* bytes for +Infinity on powerpc */
-const union __infinity_un __infinity = { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } };
-
-/* bytes for NaN */
-const union __nan_un __nan = { { 0xff, 0xc0, 0, 0 } };
diff --git a/lib/libc_bsd/powerpc64/gen/makecontext.c b/lib/libc_bsd/powerpc64/gen/makecontext.c
deleted file mode 100644
index 1faf518..0000000
--- a/lib/libc_bsd/powerpc64/gen/makecontext.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2004 Suleiman Souhlal
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/makecontext.c 234003 2012-04-07 22:28:50Z nwhitehorn $");
-
-#include <sys/param.h>
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <ucontext.h>
-
-__weak_reference(__makecontext, makecontext);
-
-void _ctx_done(ucontext_t *ucp);
-void _ctx_start(void);
-
-void
-_ctx_done(ucontext_t *ucp)
-{
-	if (ucp->uc_link == NULL)
-		exit(0);
-	else {
-		/* invalidate context */
-		ucp->uc_mcontext.mc_len = 0;
-
-		setcontext((const ucontext_t *)ucp->uc_link);
-
-		abort(); /* should never return from above call */
-	}
-}
-
-void
-__makecontext(ucontext_t *ucp, void (*start)(void), int argc, ...)
-{
-	mcontext_t *mc;
-	char *sp;
-	va_list ap;
-	int i, regargs, stackargs;
-
-	/* Sanity checks */
-	if ((ucp == NULL) || (argc < 0) || (argc > NCARGS)
-	    || (ucp->uc_stack.ss_sp == NULL)
-	    || (ucp->uc_stack.ss_size < MINSIGSTKSZ)) {
-		/* invalidate context */
-		ucp->uc_mcontext.mc_len = 0;
-		return;
-	}
-
-	/*
-	 * The stack must have space for the frame pointer, saved
-	 * link register, overflow arguments, and be 16-byte
-	 * aligned.
-	 */
-	stackargs = (argc > 8) ? argc - 8 : 0;
-	sp = (char *) ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size
-		- sizeof(uintptr_t)*(stackargs + 2);
-	sp = (char *)((uintptr_t)sp & ~0x1f);
-
-	mc = &ucp->uc_mcontext;
-
-	/*
-	 * Up to 8 register args. Assumes all args are 64-bit and
-	 * integer only. Not sure how to cater for floating point.
-	 */
-	regargs = (argc > 8) ? 8 : argc;
-	va_start(ap, argc);
-	for (i = 0; i < regargs; i++)
-		mc->mc_gpr[3 + i] = va_arg(ap, uint64_t);
-
-	/*
-	 * Overflow args go onto the stack
-	 */
-	if (argc > 8) {
-		uint64_t *argp;
-
-		/* Skip past frame pointer and saved LR */
-		argp = (uint64_t *)sp + 6;
-
-		for (i = 0; i < stackargs; i++)
-			*argp++ = va_arg(ap, uint64_t);
-	}
-	va_end(ap);
-
-	/*
-	 * Use caller-saved regs 14/15 to hold params that _ctx_start
-	 * will use to invoke the user-supplied func
-	 */
-	mc->mc_srr0 = *(uintptr_t *)_ctx_start;
-	mc->mc_gpr[1] = (uintptr_t) sp;		/* new stack pointer */
-	mc->mc_gpr[14] = (uintptr_t) start;	/* r14 <- start */
-	mc->mc_gpr[15] = (uintptr_t) ucp;	/* r15 <- ucp */
-}
diff --git a/lib/libc_bsd/powerpc64/gen/setjmp.S b/lib/libc_bsd/powerpc64/gen/setjmp.S
deleted file mode 100644
index aace683..0000000
--- a/lib/libc_bsd/powerpc64/gen/setjmp.S
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: setjmp.S,v 1.3 1998/10/03 12:30:38 tsubai Exp $        */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/setjmp.S 234115 2012-04-11 00:00:40Z nwhitehorn $");
-
-#include <sys/syscall.h>
-	
-/*
- * C library -- setjmp, longjmp
- *
- *      longjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *      setjmp(a)
- * by restoring registers from the stack.
- * The previous signal state is restored.
- *
- * jmpbuf layout:
- *     +------------+
- *     |   unused   |
- *     +------------+
- *     | sig state  |
- *     |            |
- *     | (4 words)  |
- *     |            |
- *     +------------+
- *     | saved regs |
- *     |    ...     |
- */
-
-ENTRY(setjmp)
-	mr	%r6,%r3
-	li	%r3,1			/* SIG_BLOCK, but doesn't matter */
-					/*            since set == NULL  */
-	li	%r4,0			/* set = NULL */
-	mr	%r5,%r6			/* &oset */
-	addi	%r5,%r5,4
-	li	%r0, SYS_sigprocmask	/*sigprocmask(SIG_BLOCK, NULL, &oset)*/
-	sc				/*assume no error       XXX */
-	mflr	%r11			/* r11 <- link reg */
-	mfcr	%r12			/* r12 <- condition reg */
-	mr	%r10,%r1		/* r10 <- stackptr */
-	mr	%r9,%r2			/*  r9 <- global ptr */
-
-	std	%r9,40 + 0*8(%r6)
-	std	%r10,40 + 1*8(%r6)
-	std	%r11,40 + 2*8(%r6)
-	std	%r12,40 + 3*8(%r6)
-	std	%r13,40 + 4*8(%r6)
-	std	%r14,40 + 5*8(%r6)
-	std	%r15,40 + 6*8(%r6)
-	std	%r16,40 + 7*8(%r6)
-	std	%r17,40 + 8*8(%r6)
-	std	%r18,40 + 9*8(%r6)
-	std	%r19,40 + 10*8(%r6)
-	std	%r20,40 + 11*8(%r6)
-	std	%r21,40 + 12*8(%r6)
-	std	%r22,40 + 13*8(%r6)
-	std	%r23,40 + 14*8(%r6)
-	std	%r24,40 + 15*8(%r6)
-	std	%r25,40 + 16*8(%r6)
-	std	%r26,40 + 17*8(%r6)
-	std	%r27,40 + 18*8(%r6)
-	std	%r28,40 + 19*8(%r6)
-	std	%r29,40 + 20*8(%r6)
-	std	%r30,40 + 21*8(%r6)
-	std	%r31,40 + 22*8(%r6)
-
-	li	%r3,0			/* return (0) */
-	blr
-
-	WEAK_REFERENCE(__longjmp, longjmp)
-ENTRY(__longjmp)
-	ld	%r9,40 + 0*8(%r3)
-	ld	%r10,40 + 1*8(%r3)
-	ld	%r11,40 + 2*8(%r3)
-	ld	%r12,40 + 3*8(%r3)
-	ld	%r14,40 + 5*8(%r3)
-	ld	%r15,40 + 6*8(%r3)
-	ld	%r16,40 + 7*8(%r3)
-	ld	%r17,40 + 8*8(%r3)
-	ld	%r18,40 + 9*8(%r3)
-	ld	%r19,40 + 10*8(%r3)
-	ld	%r20,40 + 11*8(%r3)
-	ld	%r21,40 + 12*8(%r3)
-	ld	%r22,40 + 13*8(%r3)
-	ld	%r23,40 + 14*8(%r3)
-	ld	%r24,40 + 15*8(%r3)
-	ld	%r25,40 + 16*8(%r3)
-	ld	%r26,40 + 17*8(%r3)
-	ld	%r27,40 + 18*8(%r3)
-	ld	%r28,40 + 19*8(%r3)
-	ld	%r29,40 + 20*8(%r3)
-	ld	%r30,40 + 21*8(%r3)
-	ld	%r31,40 + 22*8(%r3)
-	mr	%r6,%r4			/* save val param */
-	mtlr	%r11			/* r11 -> link reg */
-	mtcr	%r12			/* r12 -> condition reg */
-	mr	%r2,%r9			/* r9  -> global ptr */
-	mr	%r1,%r10		/* r10 -> stackptr */
-	mr	%r4,%r3
-	li	%r3,3			/* SIG_SETMASK */
-	addi	%r4,%r4,4		/* &set */
-	li	%r5,0			/* oset = NULL */
-	li	%r0,SYS_sigprocmask	/* sigprocmask(SIG_SET, &set, NULL) */
-	sc                              /* assume no error       XXX */
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/gen/signalcontext.c b/lib/libc_bsd/powerpc64/gen/signalcontext.c
deleted file mode 100644
index f47ea54..0000000
--- a/lib/libc_bsd/powerpc64/gen/signalcontext.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2004 Marcel Moolenaar, Peter Grehan
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/signalcontext.c 209878 2010-07-10 14:45:03Z nwhitehorn $");
-
-#include <sys/param.h>
-#include <sys/ucontext.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <strings.h>
-
-typedef void (*handler_t)(uint32_t, uint32_t, uint32_t);
-
-/* Prototypes */
-static void ctx_wrapper(ucontext_t *ucp, handler_t func, uint32_t sig,
-			uint32_t sig_si, uint32_t sig_uc);
-
-__weak_reference(__signalcontext, signalcontext);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	siginfo_t *sig_si;
-	ucontext_t *sig_uc;
-	uintptr_t sp;
-
-	/* Bail out if we don't have a valid ucontext pointer. */
-	if (ucp == NULL)
-		abort();
-
-	/*
-	 * Build a 16-byte-aligned signal frame
-	 */
-	sp = (ucp->uc_mcontext.mc_gpr[1] - sizeof(ucontext_t)) & ~15UL;
-	sig_uc = (ucontext_t *)sp;
-	bcopy(ucp, sig_uc, sizeof(*sig_uc));
-	sp = (sp - sizeof(siginfo_t)) & ~15UL;
-	sig_si = (siginfo_t *)sp;
-	bzero(sig_si, sizeof(*sig_si));
-	sig_si->si_signo = sig;
-
-	/*
-	 * Subtract 48 bytes from stack to allow for frameptr
-	 */
-	sp -= 6*sizeof(uint64_t);
-	sp &= ~15UL;
-
-	/*
-	 * Setup the ucontext of the signal handler.
-	 */
-	bzero(&ucp->uc_mcontext, sizeof(ucp->uc_mcontext));
-	ucp->uc_link = sig_uc;
-	sigdelset(&ucp->uc_sigmask, sig);
-
-	ucp->uc_mcontext.mc_vers = _MC_VERSION;
-	ucp->uc_mcontext.mc_len = sizeof(struct __mcontext);
-	ucp->uc_mcontext.mc_srr0 = (uint64_t) ctx_wrapper;
-	ucp->uc_mcontext.mc_gpr[1] = (uint64_t) sp;
-	ucp->uc_mcontext.mc_gpr[3] = (uint64_t) func;
-	ucp->uc_mcontext.mc_gpr[4] = (uint64_t) sig;
-	ucp->uc_mcontext.mc_gpr[5] = (uint64_t) sig_si;
-	ucp->uc_mcontext.mc_gpr[6] = (uint64_t) sig_uc;
-
-	return (0);
-}
-
-static void
-ctx_wrapper(ucontext_t *ucp, handler_t func, uint32_t sig, uint32_t sig_si,
-	    uint32_t sig_uc)
-{
-
-	(*func)(sig, sig_si, sig_uc);
-	if (ucp->uc_link == NULL)
-		exit(0);
-	setcontext((const ucontext_t *)ucp->uc_link);
-	/* should never get here */
-	abort();
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/powerpc64/gen/sigsetjmp.S b/lib/libc_bsd/powerpc64/gen/sigsetjmp.S
deleted file mode 100644
index d7b021a..0000000
--- a/lib/libc_bsd/powerpc64/gen/sigsetjmp.S
+++ /dev/null
@@ -1,145 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: sigsetjmp.S,v 1.4 1998/10/03 12:30:38 tsubai Exp $     */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/sigsetjmp.S 234115 2012-04-11 00:00:40Z nwhitehorn $");
-
-/*
- * C library -- sigsetjmp, siglongjmp
- *
- *      siglongjmp(a,v)
- * will generate a "return(v?v:1)" from the last call to
- *      sigsetjmp(a, savemask)
- * by restoring registers from the stack.
- * The previous signal state is restored if savemask is non-zero
- *
- * jmpbuf layout:
- *     +------------+
- *     |  savemask  |
- *     +------------+
- *     | sig state  |
- *     |            |
- *     | (4 words)  |
- *     |            |
- *     +------------+
- *     | saved regs |
- *     |    ...     |
- */
-
-	
-#include <sys/syscall.h>
-
-ENTRY(sigsetjmp)
-	mr	%r6,%r3
-	stw	%r4,0(%r3)
-	or.	%r7,%r4,%r4
-	beq	1f
-	li	%r3,1			/* SIG_BLOCK, but doesn't matter */
-					/*            since set == NULL  */
-	li	%r4,0			/* set = NULL */
-	mr	%r5,%r6			/* &oset */
-	addi	%r5,%r5,4
-	li	%r0, SYS_sigprocmask   /* sigprocmask(SIG_BLOCK, NULL, &oset)*/
-	sc				/* assume no error       XXX */
-1:
-	mflr	%r11
-	mfcr	%r12
-	mr	%r10,%r1
-	mr	%r9,%r2
-
-	std	%r9,40 + 0*8(%r6)
-	std	%r10,40 + 1*8(%r6)
-	std	%r11,40 + 2*8(%r6)
-	std	%r12,40 + 3*8(%r6)
-	std	%r13,40 + 4*8(%r6)
-	std	%r14,40 + 5*8(%r6)
-	std	%r15,40 + 6*8(%r6)
-	std	%r16,40 + 7*8(%r6)
-	std	%r17,40 + 8*8(%r6)
-	std	%r18,40 + 9*8(%r6)
-	std	%r19,40 + 10*8(%r6)
-	std	%r20,40 + 11*8(%r6)
-	std	%r21,40 + 12*8(%r6)
-	std	%r22,40 + 13*8(%r6)
-	std	%r23,40 + 14*8(%r6)
-	std	%r24,40 + 15*8(%r6)
-	std	%r25,40 + 16*8(%r6)
-	std	%r26,40 + 17*8(%r6)
-	std	%r27,40 + 18*8(%r6)
-	std	%r28,40 + 19*8(%r6)
-	std	%r29,40 + 20*8(%r6)
-	std	%r30,40 + 21*8(%r6)
-	std	%r31,40 + 22*8(%r6)
-
-	li	%r3,0
-	blr
-
-ENTRY(siglongjmp)
-	ld	%r9,40 + 0*8(%r3)
-	ld	%r10,40 + 1*8(%r3)
-	ld	%r11,40 + 2*8(%r3)
-	ld	%r12,40 + 3*8(%r3)
-	ld	%r14,40 + 5*8(%r3)
-	ld	%r15,40 + 6*8(%r3)
-	ld	%r16,40 + 7*8(%r3)
-	ld	%r17,40 + 8*8(%r3)
-	ld	%r18,40 + 9*8(%r3)
-	ld	%r19,40 + 10*8(%r3)
-	ld	%r20,40 + 11*8(%r3)
-	ld	%r21,40 + 12*8(%r3)
-	ld	%r22,40 + 13*8(%r3)
-	ld	%r23,40 + 14*8(%r3)
-	ld	%r24,40 + 15*8(%r3)
-	ld	%r25,40 + 16*8(%r3)
-	ld	%r26,40 + 17*8(%r3)
-	ld	%r27,40 + 18*8(%r3)
-	ld	%r28,40 + 19*8(%r3)
-	ld	%r29,40 + 20*8(%r3)
-	ld	%r30,40 + 21*8(%r3)
-	ld	%r31,40 + 22*8(%r3)
-
-	lwz	%r7,0(%r3)
-	mr	%r6,%r4
-	mtlr	%r11
-	mtcr	%r12
-	mr	%r2,%r9
-	mr	%r1,%r10
-	or.	%r7,%r7,%r7
-	beq	1f
-	mr	%r4,%r3
-	li	%r3,3			/* SIG_SETMASK */
-	addi	%r4,%r4,4		/* &set */
-	li	%r5,0			/* oset = NULL */
-	li	%r0,SYS_sigprocmask	/* sigprocmask(SIG_SET, &set, NULL) */
-	sc				/* assume no error       XXX */
-1:
-	or.	%r3,%r6,%r6
-	bnelr
-	li	%r3,1
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/gen/syncicache.c b/lib/libc_bsd/powerpc64/gen/syncicache.c
deleted file mode 100644
index aa70822..0000000
--- a/lib/libc_bsd/powerpc64/gen/syncicache.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (C) 1995-1997, 1999 Wolfgang Solfrank.
- * Copyright (C) 1995-1997, 1999 TooLs GmbH.
- * 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.
- *
- * $NetBSD: syncicache.c,v 1.2 1999/05/05 12:36:40 tsubai Exp $
- */
-
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD: releng/10.2/lib/libc/powerpc64/gen/syncicache.c 253750 2013-07-28 18:44:17Z avg $";
-#endif /* not lint */
-
-#include <sys/param.h>
-#if	defined(_KERNEL) || defined(_STANDALONE)
-#include <sys/time.h>
-#include <sys/proc.h>
-#include <vm/vm.h>
-#endif
-#include <sys/sysctl.h>
-
-#include <machine/cpu.h>
-#include <machine/md_var.h>
-
-#ifdef _STANDALONE
-int cacheline_size = 32;
-#endif
-
-#if	!defined(_KERNEL) && !defined(_STANDALONE)
-#include <stdlib.h>
-
-int cacheline_size = 0;
-
-static void getcachelinesize(void);
-
-static void
-getcachelinesize()
-{
-	static int	cachemib[] = { CTL_MACHDEP, CPU_CACHELINE };
-	long		clen;
-
-	clen = sizeof(cacheline_size);
-
-	if (sysctl(cachemib, sizeof(cachemib) / sizeof(cachemib[0]),
-	    &cacheline_size, &clen, NULL, 0) < 0 || !cacheline_size) {
-		abort();
-	}
-}
-#endif
-
-void
-__syncicache(void *from, int len)
-{
-	off_t	l, off;
-	char	*p;
-
-#if	!defined(_KERNEL) && !defined(_STANDALONE)
-	if (!cacheline_size)
-		getcachelinesize();
-#endif	
-
-	off = (uintptr_t)from & (cacheline_size - 1);
-	l = len += off;
-	p = (char *)from - off;
-
-	do {
-		__asm __volatile ("dcbst 0,%0" :: "r"(p));
-		p += cacheline_size;
-	} while ((l -= cacheline_size) > 0);
-	__asm __volatile ("sync");
-	p = (char *)from - off;
-	do {
-		__asm __volatile ("icbi 0,%0" :: "r"(p));
-		p += cacheline_size;
-	} while ((len -= cacheline_size) > 0);
-	__asm __volatile ("sync; isync");
-}
-
diff --git a/lib/libc_bsd/powerpc64/softfloat/milieu.h b/lib/libc_bsd/powerpc64/softfloat/milieu.h
deleted file mode 100644
index 9e93f8d..0000000
--- a/lib/libc_bsd/powerpc64/softfloat/milieu.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $NetBSD: milieu.h,v 1.1 2000/12/29 20:13:54 bjh21 Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/powerpc64/softfloat/milieu.h 209878 2010-07-10 14:45:03Z nwhitehorn $ */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "powerpc-gcc.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
diff --git a/lib/libc_bsd/powerpc64/softfloat/powerpc-gcc.h b/lib/libc_bsd/powerpc64/softfloat/powerpc-gcc.h
deleted file mode 100644
index ea49fde..0000000
--- a/lib/libc_bsd/powerpc64/softfloat/powerpc-gcc.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* $NetBSD: arm-gcc.h,v 1.2 2001/02/21 18:09:25 bjh21 Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/powerpc64/softfloat/powerpc-gcc.h 209878 2010-07-10 14:45:03Z nwhitehorn $ */
-
-/*
--------------------------------------------------------------------------------
-One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined.
--------------------------------------------------------------------------------
-*/
-#define BIGENDIAN
-
-/*
--------------------------------------------------------------------------------
-The macro `BITS64' can be defined to indicate that 64-bit integer types are
-supported by the compiler.
--------------------------------------------------------------------------------
-*/
-#define BITS64
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines the most convenient type that holds
-integers of at least as many bits as specified.  For example, `uint8' should
-be the most convenient type that can hold unsigned integers of as many as
-8 bits.  The `flag' type must be able to hold either a 0 or 1.  For most
-implementations of C, `flag', `uint8', and `int8' should all be `typedef'ed
-to the same as `int'.
--------------------------------------------------------------------------------
-*/
-typedef int flag;
-typedef unsigned int uint8;
-typedef int int8;
-typedef unsigned int uint16;
-typedef int int16;
-typedef unsigned int uint32;
-typedef signed int int32;
-#ifdef BITS64
-typedef unsigned long long int uint64;
-typedef signed long long int int64;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Each of the following `typedef's defines a type that holds integers
-of _exactly_ the number of bits specified.  For instance, for most
-implementation of C, `bits16' and `sbits16' should be `typedef'ed to
-`unsigned short int' and `signed short int' (or `short int'), respectively.
--------------------------------------------------------------------------------
-*/
-typedef unsigned char bits8;
-typedef signed char sbits8;
-typedef unsigned short int bits16;
-typedef signed short int sbits16;
-typedef unsigned int bits32;
-typedef signed int sbits32;
-#ifdef BITS64
-typedef unsigned long long int bits64;
-typedef signed long long int sbits64;
-#endif
-
-#ifdef BITS64
-/*
--------------------------------------------------------------------------------
-The `LIT64' macro takes as its argument a textual integer literal and
-if necessary ``marks'' the literal as having a 64-bit integer type.
-For example, the GNU C Compiler (`gcc') requires that 64-bit literals be
-appended with the letters `LL' standing for `long long', which is `gcc's
-name for the 64-bit integer type.  Some compilers may allow `LIT64' to be
-defined as the identity macro:  `#define LIT64( a ) a'.
--------------------------------------------------------------------------------
-*/
-#define LIT64( a ) a##LL
-#endif
-
-/*
--------------------------------------------------------------------------------
-The macro `INLINE' can be used before functions that should be inlined.  If
-a compiler does not support explicit inlining, this macro should be defined
-to be `static'.
--------------------------------------------------------------------------------
-*/
-#define INLINE static __inline
-
-/*
--------------------------------------------------------------------------------
-The ARM FPA is odd in that it stores doubles high-order word first, no matter
-what the endianness of the CPU.  VFP is sane.
--------------------------------------------------------------------------------
-*/
-#if defined(SOFTFLOAT_FOR_GCC)
-#define FLOAT64_DEMANGLE(a)	(a)
-#define FLOAT64_MANGLE(a)	(a)
-#endif
diff --git a/lib/libc_bsd/powerpc64/softfloat/softfloat.h b/lib/libc_bsd/powerpc64/softfloat/softfloat.h
deleted file mode 100644
index e7aa3c6..0000000
--- a/lib/libc_bsd/powerpc64/softfloat/softfloat.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*	$NetBSD: softfloat.h,v 1.6 2002/05/12 13:12:46 bjh21 Exp $	*/
-/* $FreeBSD: releng/10.2/lib/libc/powerpc64/softfloat/softfloat.h 209878 2010-07-10 14:45:03Z nwhitehorn $ */
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-/* #define FLOATX80 */
-/* #define FLOAT128 */
-
-#include <machine/ieeefp.h>
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef unsigned int float32;
-typedef unsigned long long float64;
-#ifdef FLOATX80
-typedef struct {
-    unsigned short high;
-    unsigned long long low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    unsigned long long high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-#ifndef SOFTFLOAT_FOR_GCC
-extern int8 float_detect_tininess;
-#endif
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern fp_rnd_t float_rounding_mode;
-enum {
-    float_round_nearest_even = FP_RN,
-    float_round_to_zero      = FP_RZ,
-    float_round_down         = FP_RM,
-    float_round_up           = FP_RP
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-typedef fp_except_t fp_except;
-
-extern fp_except float_exception_flags;
-extern fp_except float_exception_mask;
-enum {
-    float_flag_inexact   = FP_X_IMP,
-    float_flag_underflow = FP_X_UFL,
-    float_flag_overflow  = FP_X_OFL,
-    float_flag_divbyzero = FP_X_DZ,
-    float_flag_invalid   = FP_X_INV
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( fp_except );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int );
-float64 int32_to_float64( int );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( int );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( int );
-#endif
-float32 int64_to_float32( long long );
-float64 int64_to_float64( long long );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( long long );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( long long );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float32_to_int32( float32 );
-int float32_to_int32_round_to_zero( float32 );
-unsigned int float32_to_uint32_round_to_zero( float32 );
-long long float32_to_int64( float32 );
-long long float32_to_int64_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-int float32_eq( float32, float32 );
-int float32_le( float32, float32 );
-int float32_lt( float32, float32 );
-int float32_eq_signaling( float32, float32 );
-int float32_le_quiet( float32, float32 );
-int float32_lt_quiet( float32, float32 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float32_is_signaling_nan( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float64_to_int32( float64 );
-int float64_to_int32_round_to_zero( float64 );
-unsigned int float64_to_uint32_round_to_zero( float64 );
-long long float64_to_int64( float64 );
-long long float64_to_int64_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-int float64_eq( float64, float64 );
-int float64_le( float64, float64 );
-int float64_lt( float64, float64 );
-int float64_eq_signaling( float64, float64 );
-int float64_le_quiet( float64, float64 );
-int float64_lt_quiet( float64, float64 );
-#ifndef SOFTFLOAT_FOR_GCC
-int float64_is_signaling_nan( float64 );
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int floatx80_to_int32( floatx80 );
-int floatx80_to_int32_round_to_zero( floatx80 );
-long long floatx80_to_int64( floatx80 );
-long long floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern int floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-int floatx80_eq( floatx80, floatx80 );
-int floatx80_le( floatx80, floatx80 );
-int floatx80_lt( floatx80, floatx80 );
-int floatx80_eq_signaling( floatx80, floatx80 );
-int floatx80_le_quiet( floatx80, floatx80 );
-int floatx80_lt_quiet( floatx80, floatx80 );
-int floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-int float128_to_int32( float128 );
-int float128_to_int32_round_to_zero( float128 );
-long long float128_to_int64( float128 );
-long long float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-int float128_eq( float128, float128 );
-int float128_le( float128, float128 );
-int float128_lt( float128, float128 );
-int float128_eq_signaling( float128, float128 );
-int float128_le_quiet( float128, float128 );
-int float128_lt_quiet( float128, float128 );
-int float128_is_signaling_nan( float128 );
-
-#endif
-
diff --git a/lib/libc_bsd/powerpc64/sys/Makefile.inc b/lib/libc_bsd/powerpc64/sys/Makefile.inc
deleted file mode 100644
index 8e51ed5..0000000
--- a/lib/libc_bsd/powerpc64/sys/Makefile.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile.incl 209878 2010-07-10 14:45:03Z nwhitehorn $
-
-MDASM+=	brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
diff --git a/lib/libc_bsd/powerpc64/sys/__vdso_gettc.c b/lib/libc_bsd/powerpc64/sys/__vdso_gettc.c
deleted file mode 100644
index 2c5fb56..0000000
--- a/lib/libc_bsd/powerpc64/sys/__vdso_gettc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2013 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/sys/__vdso_gettc.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-
-#pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
-{
-
-	return (0);
-}
-
-#pragma weak __vdso_gettimekeep
-int
-__vdso_gettimekeep(struct vdso_timekeep **tk)
-{
-
-	return (ENOSYS);
-}
diff --git a/lib/libc_bsd/powerpc64/sys/brk.S b/lib/libc_bsd/powerpc64/sys/brk.S
deleted file mode 100644
index e8f4693..0000000
--- a/lib/libc_bsd/powerpc64/sys/brk.S
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: brk.S,v 1.9 2000/06/26 06:25:43 kleink Exp $   */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/sys/brk.S 218824 2011-02-18 21:44:53Z nwhitehorn $");
-
-#include "SYS.h"
-
-        .globl  HIDENAME(curbrk)
-        .globl  HIDENAME(minbrk)
-        .globl  CNAME(_end)
-
-        .data
-        .align 3
-HIDENAME(minbrk):
-        .llong   CNAME(_end)
-
-        .text
-
-ENTRY(brk)
-	addis	%r6,%r2,HIDENAME(minbrk)@toc@ha
-	ld	%r6,HIDENAME(minbrk)@toc@l(%r6)
-	cmpld   %r6,%r3			/* if (minbrk <= r3) */
-	bgt     0f
-	mr	%r6,%r3			/* r6 = r3 */
-0:
-	mr      %r3,%r6			/* new break value */
-	li      %r0,SYS_break
-	sc				/* assume, that r5 is kept */
-	bso	1f
-
-	/* record new break */
-	addis	%r7,%r2,HIDENAME(curbrk)@toc@ha
-	std	%r6,HIDENAME(curbrk)@toc@l(%r7)
-
-	blr				/* return 0 */
-
-1:
-	mflr	%r0
-	std	%r0,16(%r1)
-	stdu	%r1,-48(%r1)
-	bl	HIDENAME(cerror)
-	nop
-	ld	%r1,0(%r1)
-	ld	%r0,16(%r1)
-	mtlr	%r0
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/sys/cerror.S b/lib/libc_bsd/powerpc64/sys/cerror.S
deleted file mode 100644
index 99130c3..0000000
--- a/lib/libc_bsd/powerpc64/sys/cerror.S
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: cerror.S,v 1.5 2000/01/27 14:58:48 kleink Exp $        */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/sys/cerror.S 230400 2012-01-20 22:34:19Z andreast $");
-	
-#include "SYS.h"
-
-	.globl  HIDENAME(cerror)
-	.globl  CNAME(__error)
-
-	/*
-	 * The __error() function is thread aware. For non-threaded
-	 * programs and the initial threaded in threaded programs,
-	 * it returns a pointer to the global errno variable.
-	 */
-ENTRY_NOPROF(HIDENAME(cerror))
-	mflr	%r0
-	std	%r0,16(%r1)		/* save lr */
-	stdu	%r1,-64(%r1)		/* allocate new stack frame */
-	std	%r31,48(%r1)
-
-	mr	%r31,%r3          /* stash errval in callee-saved register */
-	bl	CNAME(__error)
-	nop
-	stw	%r31,0(%r3)		/* store errval into &errno */
-
-	ld	%r31,48(%r1)
-	ld	%r1,0(%r1)
-	ld	%r0,16(%r1)
-	mtlr	%r0
-	li	%r3,-1
-	li	%r4,-1
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/sys/exect.S b/lib/libc_bsd/powerpc64/sys/exect.S
deleted file mode 100644
index 56fefd4..0000000
--- a/lib/libc_bsd/powerpc64/sys/exect.S
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: exect.S,v 1.3 1998/05/25 15:28:03 ws Exp $     */
-	
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/sys/exect.S 218824 2011-02-18 21:44:53Z nwhitehorn $");
-
-#include "SYS.h"
-
-ENTRY(exect)
-	li	%r0,SYS_execve
-	sc
-	bso	1f
-	blr
-1:
-	mflr	%r0
-	std	%r0,16(%r1)
-	stdu	%r1,-48(%r1)
-	bl	HIDENAME(cerror)
-	nop
-	ld	%r1,0(%r1)
-	ld	%r0,16(%r1)
-	mtlr	%r0
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/sys/pipe.S b/lib/libc_bsd/powerpc64/sys/pipe.S
deleted file mode 100644
index 5ba8573..0000000
--- a/lib/libc_bsd/powerpc64/sys/pipe.S
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: pipe.S,v 1.6 2000/09/28 08:38:54 kleink Exp $  */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/sys/pipe.S 218824 2011-02-18 21:44:53Z nwhitehorn $");
-
-#include "SYS.h"
-
-ENTRY(pipe)
-	mr	%r5,%r3		/* save pointer */
-	li	%r0,SYS_pipe
-	sc			/* r5 is preserved */
-	bso	1f
-	stw	%r3,0(%r5)	/* success, store fds */
-	stw	%r4,4(%r5)
-	li	%r3,0
-	blr			/* and return 0 */
-1:
-	mflr	%r0
-	std	%r0,16(%r1)
-	stdu	%r1,-48(%r1)
-	bl	HIDENAME(cerror)
-	nop
-	ld	%r1,0(%r1)
-	ld	%r0,16(%r1)
-	mtlr	%r0
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/sys/ptrace.S b/lib/libc_bsd/powerpc64/sys/ptrace.S
deleted file mode 100644
index a34614f..0000000
--- a/lib/libc_bsd/powerpc64/sys/ptrace.S
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: ptrace.S,v 1.3 2000/02/23 20:16:57 kleink Exp $        */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/sys/ptrace.S 218824 2011-02-18 21:44:53Z nwhitehorn $");
-
-#include "SYS.h"
-
-ENTRY(ptrace)
-	mflr	%r0
-	std	%r0,16(%r1)
-	stdu	%r1,-80(%r1)
-	stw	%r3,48(%r1)
-	stw	%r4,52(%r1)
-	std	%r5,56(%r1)
-	stw	%r6,64(%r1)
-
-	bl	CNAME(__error)
-	nop
-	li	%r7,0
-	stw	%r7,0(%r3)
-
-	lwz	%r3,48(%r1)
-	lwz	%r4,52(%r1)
-	ld	%r5,56(%r1)
-	lwz	%r6,64(%r1)
-	ld	%r1,0(%r1)
-	ld	%r0,16(%r1)
-	mtlr	%r0
-	li	%r0,SYS_ptrace
-	sc
-	bso	1f
-	blr
-1:
-	stdu	%r1,-48(%r1)		/* lr already saved */
-	bl	HIDENAME(cerror)
-	nop
-	ld	%r1,0(%r1)
-	ld	%r0,16(%r1)
-	mtlr	%r0
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/sys/sbrk.S b/lib/libc_bsd/powerpc64/sys/sbrk.S
deleted file mode 100644
index 63f9078..0000000
--- a/lib/libc_bsd/powerpc64/sys/sbrk.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: sbrk.S,v 1.8 2000/06/26 06:25:44 kleink Exp $  */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/sys/sbrk.S 218824 2011-02-18 21:44:53Z nwhitehorn $");
-
-#include "SYS.h"
-
-	.globl	HIDENAME(curbrk)
-	.globl	CNAME(_end)
-
-	.data
-	.align 3
-HIDENAME(curbrk):
-	.llong	CNAME(_end)
-
-	.text
-ENTRY(sbrk)
-	addis	%r5,%r2,HIDENAME(curbrk)@toc@ha
-	addi	%r5,%r5,HIDENAME(curbrk)@toc@l
-	ld	%r6,0(%r5)			/* r6 = old break */
-	cmpdi	%r3,0				/* sbrk(0) - return curbrk */
-	beq	1f
-	add	%r3,%r3,%r6
-	mr	%r7,%r3				/* r7 = new break */
-	li	%r0,SYS_break
-	sc					/* break(new_break) */
-	bso	2f
-	std     %r7,0(%r5)
-1:
-	mr      %r3,%r6				/* set return value */
-	blr
-2:
-	mflr	%r0
-	std	%r0,16(%r1)
-	stdu	%r1,-48(%r1)
-	bl	HIDENAME(cerror)
-	nop
-	ld	%r1,0(%r1)
-	ld	%r0,16(%r1)
-	mtlr	%r0
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/powerpc64/sys/setlogin.S b/lib/libc_bsd/powerpc64/sys/setlogin.S
deleted file mode 100644
index aecf632..0000000
--- a/lib/libc_bsd/powerpc64/sys/setlogin.S
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2002 Peter Grehan.
- * 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.
- *
- * 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.
- */
-/*      $NetBSD: setlogin.S,v 1.3 1998/11/24 11:14:57 tsubai Exp $      */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/powerpc64/sys/setlogin.S 217398 2011-01-14 11:33:40Z kib $");
-	
-#include "SYS.h"
-
-	.globl  CNAME(_logname_valid)		/* in _getlogin() */
-
-SYSCALL(setlogin)
-	addis	%r4,%r2,CNAME(_logname_valid)@toc@ha
-	li	%r5,0
-	stw	%r5,CNAME(_logname_valid)@toc@l(%r4)
-	blr
-
-	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc_bsd/quad/Makefile.incl b/lib/libc_bsd/quad/Makefile.incl
deleted file mode 100644
index 7f92aa3..0000000
--- a/lib/libc_bsd/quad/Makefile.incl
+++ /dev/null
@@ -1,23 +0,0 @@
-#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 245644 2013-01-19 02:33:57Z andrew $
-
-# Quad support, if needed
-.PATH: ${.CURDIR}/${LIBC_ARCH}/quad ${.CURDIR}/quad
-
-.if ${LIBC_ARCH} == "i386"
-
-SRCS+=	cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c
-
-.elif ${LIBC_ARCH} == "arm" && ${MK_ARM_EABI} != "no"
-SRCS+=adddi3.c anddi3.c floatunsdidf.c iordi3.c lshldi3.c notdi2.c qdivrem.c subdi3.c xordi3.c
-.else
-
-SRCS+=	adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \
-	fixsfdi.c fixunsdfdi.c fixunssfdi.c floatdidf.c floatdisf.c \
-	floatunsdidf.c iordi3.c lshldi3.c lshrdi3.c moddi3.c muldi3.c \
-	negdi2.c notdi2.c qdivrem.c subdi3.c ucmpdi2.c udivdi3.c umoddi3.c \
-	xordi3.c
-
-.endif
-
-SYM_MAPS+=${.CURDIR}/quad/Symbol.map
diff --git a/lib/libc_bsd/quad/Symbol.map b/lib/libc_bsd/quad/Symbol.map
deleted file mode 100644
index e8a55f9..0000000
--- a/lib/libc_bsd/quad/Symbol.map
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/quad/Symbol.map 170155 2007-05-31 13:07:37Z deischen $
- */
-
-FBSD_1.0 {
-	/*
-	 * These symbols really shouldn't be exported since they should
-	 * be pulled from libgcc, but the build of some applications is
-	 * broken and they expect to see them in libc.  glibc exports
-	 * them, but they do not appear to be exported in Solaris.
-	 */
-	__adddi3;
-	__anddi3;
-	__ashldi3;
-	__ashrdi3;
-	__cmpdi2;
-	__divdi3;
-	__fixdfdi;
-	__fixsfdi;
-	__fixunsdfdi;
-	__fixunssfdi;
-	__floatdidf;
-	__floatdisf;
-	__floatunsdidf;
-	__iordi3;
-	__lshldi3;
-	__lshrdi3;
-	__moddi3;
-	__muldi3;
-	__negdi2;
-	__one_cmpldi2;
-	__qdivrem;
-	__subdi3;
-	__ucmpdi2;
-	__udivdi3;
-	__umoddi3;
-	__xordi3;
-};
diff --git a/lib/libc_bsd/quad/TESTS/Makefile b/lib/libc_bsd/quad/TESTS/Makefile
deleted file mode 100644
index 5834f21..0000000
--- a/lib/libc_bsd/quad/TESTS/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/4/93
-
-all: mul divrem
-
-MUL=	mul.c ../muldi3.c
-mul: ${MUL}
-	gcc -g -DSPARC_XXX ${MUL} -o ${.TARGET}
-
-DIVREM=	divrem.c ../qdivrem.c
-divrem: ${DIVREM}
-	gcc -g -DSPARC_XXX ${DIVREM} -o ${.TARGET}
diff --git a/lib/libc_bsd/quad/TESTS/divrem.c b/lib/libc_bsd/quad/TESTS/divrem.c
deleted file mode 100644
index f9155d1..0000000
--- a/lib/libc_bsd/quad/TESTS/divrem.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)divrem.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/TESTS/divrem.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <stdio.h>
-
-main()
-{
-	union { long long q; unsigned long v[2]; } a, b, q, r;
-	char buf[300];
-	extern long long __qdivrem(unsigned long long, unsigned long long,
-	    unsigned long long *);
-
-	for (;;) {
-		printf("> ");
-		if (fgets(buf, sizeof buf, stdin) == NULL)
-			break;
-		if (sscanf(buf, "%lu:%lu %lu:%lu",
-			    &a.v[0], &a.v[1], &b.v[0], &b.v[1]) != 4 &&
-		    sscanf(buf, "0x%lx:%lx 0x%lx:%lx",
-			    &a.v[0], &a.v[1], &b.v[0], &b.v[1]) != 4) {
-			printf("eh?\n");
-			continue;
-		}
-		q.q = __qdivrem(a.q, b.q, &r.q);
-		printf("%lx:%lx /%% %lx:%lx => q=%lx:%lx r=%lx:%lx\n",
-		    a.v[0], a.v[1], b.v[0], b.v[1],
-		    q.v[0], q.v[1], r.v[0], r.v[1]);
-		printf("  = %lX%08lX / %lX%08lX => %lX%08lX\n\
-  = %lX%08lX %% %lX%08lX => %lX%08lX\n",
-		    a.v[0], a.v[1], b.v[0], b.v[1], q.v[0], q.v[1],
-		    a.v[0], a.v[1], b.v[0], b.v[1], r.v[0], r.v[1]);
-	}
-	exit(0);
-}
diff --git a/lib/libc_bsd/quad/TESTS/mul.c b/lib/libc_bsd/quad/TESTS/mul.c
deleted file mode 100644
index 35966d5..0000000
--- a/lib/libc_bsd/quad/TESTS/mul.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#ifndef lint
-static char copyright[] =
-"@(#) Copyright (c) 1992, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mul.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/TESTS/mul.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include <stdio.h>
-
-main()
-{
-	union { long long q; unsigned long v[2]; } a, b, m;
-	char buf[300];
-	extern long long __muldi3(long long, long long);
-
-	for (;;) {
-		printf("> ");
-		if (fgets(buf, sizeof buf, stdin) == NULL)
-			break;
-		if (sscanf(buf, "%lu:%lu %lu:%lu",
-			    &a.v[0], &a.v[1], &b.v[0], &b.v[1]) != 4 &&
-		    sscanf(buf, "0x%lx:%lx 0x%lx:%lx",
-			    &a.v[0], &a.v[1], &b.v[0], &b.v[1]) != 4) {
-			printf("eh?\n");
-			continue;
-		}
-		m.q = __muldi3(a.q, b.q);
-		printf("%lx:%lx * %lx:%lx => %lx:%lx\n",
-		    a.v[0], a.v[1], b.v[0], b.v[1], m.v[0], m.v[1]);
-		printf("  = %lX%08lX * %lX%08lX => %lX%08lX\n",
-		    a.v[0], a.v[1], b.v[0], b.v[1], m.v[0], m.v[1]);
-	}
-	exit(0);
-}
diff --git a/lib/libc_bsd/quad/adddi3.c b/lib/libc_bsd/quad/adddi3.c
deleted file mode 100644
index 7e3d3de..0000000
--- a/lib/libc_bsd/quad/adddi3.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)adddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/adddi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Add two quads.  This is trivial since a one-bit carry from a single
- * u_long addition x+y occurs if and only if the sum x+y is less than
- * either x or y (the choice to compare with x or y is arbitrary).
- */
-quad_t
-__adddi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb, sum;
-
-	aa.q = a;
-	bb.q = b;
-	sum.ul[L] = aa.ul[L] + bb.ul[L];
-	sum.ul[H] = aa.ul[H] + bb.ul[H] + (sum.ul[L] < bb.ul[L]);
-	return (sum.q);
-}
diff --git a/lib/libc_bsd/quad/anddi3.c b/lib/libc_bsd/quad/anddi3.c
deleted file mode 100644
index 34b234f..0000000
--- a/lib/libc_bsd/quad/anddi3.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)anddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/anddi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Return a & b, in quad.
- */
-quad_t
-__anddi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.q = a;
-	bb.q = b;
-	aa.ul[0] &= bb.ul[0];
-	aa.ul[1] &= bb.ul[1];
-	return (aa.q);
-}
diff --git a/lib/libc_bsd/quad/ashldi3.c b/lib/libc_bsd/quad/ashldi3.c
deleted file mode 100644
index 08c004c..0000000
--- a/lib/libc_bsd/quad/ashldi3.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ashldi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/ashldi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Shift a (signed) quad value left (arithmetic shift left).
- * This is the same as logical shift left!
- */
-quad_t
-__ashldi3(a, shift)
-	quad_t a;
-	qshift_t shift;
-{
-	union uu aa;
-
-	aa.q = a;
-	if (shift >= LONG_BITS) {
-		aa.ul[H] = shift >= QUAD_BITS ? 0 :
-		    aa.ul[L] << (shift - LONG_BITS);
-		aa.ul[L] = 0;
-	} else if (shift > 0) {
-		aa.ul[H] = (aa.ul[H] << shift) |
-		    (aa.ul[L] >> (LONG_BITS - shift));
-		aa.ul[L] <<= shift;
-	}
-	return (aa.q);
-}
diff --git a/lib/libc_bsd/quad/ashrdi3.c b/lib/libc_bsd/quad/ashrdi3.c
deleted file mode 100644
index b21d957..0000000
--- a/lib/libc_bsd/quad/ashrdi3.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ashrdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/ashrdi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Shift a (signed) quad value right (arithmetic shift right).
- */
-quad_t
-__ashrdi3(a, shift)
-	quad_t a;
-	qshift_t shift;
-{
-	union uu aa;
-
-	aa.q = a;
-	if (shift >= LONG_BITS) {
-		long s;
-
-		/*
-		 * Smear bits rightward using the machine's right-shift
-		 * method, whether that is sign extension or zero fill,
-		 * to get the `sign word' s.  Note that shifting by
-		 * LONG_BITS is undefined, so we shift (LONG_BITS-1),
-		 * then 1 more, to get our answer.
-		 */
-		s = (aa.sl[H] >> (LONG_BITS - 1)) >> 1;
-		aa.ul[L] = shift >= QUAD_BITS ? s :
-		    aa.sl[H] >> (shift - LONG_BITS);
-		aa.ul[H] = s;
-	} else if (shift > 0) {
-		aa.ul[L] = (aa.ul[L] >> shift) |
-		    (aa.ul[H] << (LONG_BITS - shift));
-		aa.sl[H] >>= shift;
-	}
-	return (aa.q);
-}
diff --git a/lib/libc_bsd/quad/cmpdi2.c b/lib/libc_bsd/quad/cmpdi2.c
deleted file mode 100644
index 4d261e0..0000000
--- a/lib/libc_bsd/quad/cmpdi2.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)cmpdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/cmpdi2.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Return 0, 1, or 2 as a <, =, > b respectively.
- * Both a and b are considered signed---which means only the high word is
- * signed.
- */
-int
-__cmpdi2(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.q = a;
-	bb.q = b;
-	return (aa.sl[H] < bb.sl[H] ? 0 : aa.sl[H] > bb.sl[H] ? 2 :
-	    aa.ul[L] < bb.ul[L] ? 0 : aa.ul[L] > bb.ul[L] ? 2 : 1);
-}
diff --git a/lib/libc_bsd/quad/divdi3.c b/lib/libc_bsd/quad/divdi3.c
deleted file mode 100644
index af30403..0000000
--- a/lib/libc_bsd/quad/divdi3.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)divdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/divdi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Divide two signed quads.
- * ??? if -1/2 should produce -1 on this machine, this code is wrong
- */
-quad_t
-__divdi3(a, b)
-	quad_t a, b;
-{
-	u_quad_t ua, ub, uq;
-	int neg;
-
-	if (a < 0)
-		ua = -(u_quad_t)a, neg = 1;
-	else
-		ua = a, neg = 0;
-	if (b < 0)
-		ub = -(u_quad_t)b, neg ^= 1;
-	else
-		ub = b;
-	uq = __qdivrem(ua, ub, (u_quad_t *)0);
-	return (neg ? -uq : uq);
-}
diff --git a/lib/libc_bsd/quad/fixdfdi.c b/lib/libc_bsd/quad/fixdfdi.c
deleted file mode 100644
index d36b1d0..0000000
--- a/lib/libc_bsd/quad/fixdfdi.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fixdfdi.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/fixdfdi.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Convert double to (signed) quad.
- * We clamp anything that is out of range.
- */
-quad_t
-__fixdfdi(x)
-	double x;
-{
-	if (x < 0)
-		if (x <= QUAD_MIN)
-			return (QUAD_MIN);
-		else
-			return ((quad_t)-(u_quad_t)-x);
-	else
-		if (x >= QUAD_MAX)
-			return (QUAD_MAX);
-		else
-			return ((quad_t)(u_quad_t)x);
-}
diff --git a/lib/libc_bsd/quad/fixsfdi.c b/lib/libc_bsd/quad/fixsfdi.c
deleted file mode 100644
index 482e9c5..0000000
--- a/lib/libc_bsd/quad/fixsfdi.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1992 The Regents of the University of California.
- * All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fixsfdi.c	5.1 (Berkeley) 7/7/92";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/fixsfdi.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Convert float to (signed) quad.
- * We clamp anything that is out of range.
- *
- * N.B.: must use new ANSI syntax (sorry).
- */
-long long
-__fixsfdi(float x)
-{
-	if (x < 0)
-		if (x <= QUAD_MIN)
-			return (QUAD_MIN);
-		else
-			return ((quad_t)-(u_quad_t)-x);
-	else
-		if (x >= QUAD_MAX)
-			return (QUAD_MAX);
-		else
-			return ((quad_t)(u_quad_t)x);
-}
diff --git a/lib/libc_bsd/quad/fixunsdfdi.c b/lib/libc_bsd/quad/fixunsdfdi.c
deleted file mode 100644
index adc2e90..0000000
--- a/lib/libc_bsd/quad/fixunsdfdi.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fixunsdfdi.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/fixunsdfdi.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-#define	ONE_FOURTH	(1 << (LONG_BITS - 2))
-#define	ONE_HALF	(ONE_FOURTH * 2.0)
-#define	ONE		(ONE_FOURTH * 4.0)
-
-/*
- * Convert double to (unsigned) quad.
- * Not sure what to do with negative numbers---for now, anything out
- * of range becomes UQUAD_MAX.
- */
-u_quad_t
-__fixunsdfdi(x)
-	double x;
-{
-	double toppart;
-	union uu t;
-
-	if (x < 0)
-		return (UQUAD_MAX);	/* ??? should be 0?  ERANGE??? */
-#ifdef notdef				/* this falls afoul of a GCC bug */
-	if (x >= UQUAD_MAX)
-		return (UQUAD_MAX);
-#else					/* so we wire in 2^64-1 instead */
-	if (x >= 18446744073709551615.0)
-		return (UQUAD_MAX);
-#endif
-	/*
-	 * Get the upper part of the result.  Note that the divide
-	 * may round up; we want to avoid this if possible, so we
-	 * subtract `1/2' first.
-	 */
-	toppart = (x - ONE_HALF) / ONE;
-	/*
-	 * Now build a u_quad_t out of the top part.  The difference
-	 * between x and this is the bottom part (this may introduce
-	 * a few fuzzy bits, but what the heck).  With any luck this
-	 * difference will be nonnegative: x should wind up in the
-	 * range [0..ULONG_MAX].  For paranoia, we assume [LONG_MIN..
-	 * 2*ULONG_MAX] instead.
-	 */
-	t.ul[H] = (unsigned long)toppart;
-	t.ul[L] = 0;
-	x -= (double)t.uq;
-	if (x < 0) {
-		t.ul[H]--;
-		x += ULONG_MAX;
-	}
-	if (x > ULONG_MAX) {
-		t.ul[H]++;
-		x -= ULONG_MAX;
-	}
-	t.ul[L] = (u_long)x;
-	return (t.uq);
-}
diff --git a/lib/libc_bsd/quad/fixunssfdi.c b/lib/libc_bsd/quad/fixunssfdi.c
deleted file mode 100644
index 894f422..0000000
--- a/lib/libc_bsd/quad/fixunssfdi.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fixunssfdi.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/fixunssfdi.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-#define	ONE_FOURTH	(1 << (LONG_BITS - 2))
-#define	ONE_HALF	(ONE_FOURTH * 2.0)
-#define	ONE		(ONE_FOURTH * 4.0)
-
-/*
- * Convert float to (unsigned) quad.  We do most of our work in double,
- * out of sheer paranoia.
- *
- * Not sure what to do with negative numbers---for now, anything out
- * of range becomes UQUAD_MAX.
- *
- * N.B.: must use new ANSI syntax (sorry).
- */
-u_quad_t
-__fixunssfdi(float f)
-{
-	double x, toppart;
-	union uu t;
-
-	if (f < 0)
-		return (UQUAD_MAX);	/* ??? should be 0?  ERANGE??? */
-#ifdef notdef				/* this falls afoul of a GCC bug */
-	if (f >= UQUAD_MAX)
-		return (UQUAD_MAX);
-#else					/* so we wire in 2^64-1 instead */
-	if (f >= 18446744073709551615.0)
-		return (UQUAD_MAX);
-#endif
-	x = f;
-	/*
-	 * Get the upper part of the result.  Note that the divide
-	 * may round up; we want to avoid this if possible, so we
-	 * subtract `1/2' first.
-	 */
-	toppart = (x - ONE_HALF) / ONE;
-	/*
-	 * Now build a u_quad_t out of the top part.  The difference
-	 * between x and this is the bottom part (this may introduce
-	 * a few fuzzy bits, but what the heck).  With any luck this
-	 * difference will be nonnegative: x should wind up in the
-	 * range [0..ULONG_MAX].  For paranoia, we assume [LONG_MIN..
-	 * 2*ULONG_MAX] instead.
-	 */
-	t.ul[H] = (unsigned long)toppart;
-	t.ul[L] = 0;
-	x -= (double)t.uq;
-	if (x < 0) {
-		t.ul[H]--;
-		x += ULONG_MAX;
-	}
-	if (x > ULONG_MAX) {
-		t.ul[H]++;
-		x -= ULONG_MAX;
-	}
-	t.ul[L] = (u_long)x;
-	return (t.uq);
-}
diff --git a/lib/libc_bsd/quad/floatdidf.c b/lib/libc_bsd/quad/floatdidf.c
deleted file mode 100644
index 9c7f435..0000000
--- a/lib/libc_bsd/quad/floatdidf.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)floatdidf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/floatdidf.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Convert (signed) quad to double.
- */
-double
-__floatdidf(x)
-	quad_t x;
-{
-	double d;
-	union uu u;
-	int neg;
-
-	/*
-	 * Get an unsigned number first, by negating if necessary.
-	 */
-	if (x < 0)
-		u.q = -x, neg = 1;
-	else
-		u.q = x, neg = 0;
-
-	/*
-	 * Now u.ul[H] has the factor of 2^32 (or whatever) and u.ul[L]
-	 * has the units.  Ideally we could just set d, add LONG_BITS to
-	 * its exponent, and then add the units, but this is portable
-	 * code and does not know how to get at an exponent.  Machine-
-	 * specific code may be able to do this more efficiently.
-	 */
-	d = (double)u.ul[H] * ((1 << (LONG_BITS - 2)) * 4.0);
-	d += u.ul[L];
-
-	return (neg ? -d : d);
-}
diff --git a/lib/libc_bsd/quad/floatdisf.c b/lib/libc_bsd/quad/floatdisf.c
deleted file mode 100644
index eec3aea..0000000
--- a/lib/libc_bsd/quad/floatdisf.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)floatdisf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/floatdisf.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Convert (signed) quad to float.
- */
-float
-__floatdisf(x)
-	quad_t x;
-{
-	float f;
-	union uu u;
-	int neg;
-
-	/*
-	 * Get an unsigned number first, by negating if necessary.
-	 */
-	if (x < 0)
-		u.q = -x, neg = 1;
-	else
-		u.q = x, neg = 0;
-
-	/*
-	 * Now u.ul[H] has the factor of 2^32 (or whatever) and u.ul[L]
-	 * has the units.  Ideally we could just set f, add LONG_BITS to
-	 * its exponent, and then add the units, but this is portable
-	 * code and does not know how to get at an exponent.  Machine-
-	 * specific code may be able to do this more efficiently.
-	 *
-	 * Using double here may be excessive paranoia.
-	 */
-	f = (double)u.ul[H] * ((1 << (LONG_BITS - 2)) * 4.0);
-	f += u.ul[L];
-
-	return (neg ? -f : f);
-}
diff --git a/lib/libc_bsd/quad/floatunsdidf.c b/lib/libc_bsd/quad/floatunsdidf.c
deleted file mode 100644
index aca2b26..0000000
--- a/lib/libc_bsd/quad/floatunsdidf.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)floatunsdidf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/floatunsdidf.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Convert (unsigned) quad to double.
- * This is exactly like floatdidf.c except that negatives never occur.
- */
-double
-__floatunsdidf(x)
-	u_quad_t x;
-{
-	double d;
-	union uu u;
-
-	u.uq = x;
-	d = (double)u.ul[H] * ((1 << (LONG_BITS - 2)) * 4.0);
-	d += u.ul[L];
-	return (d);
-}
diff --git a/lib/libc_bsd/quad/iordi3.c b/lib/libc_bsd/quad/iordi3.c
deleted file mode 100644
index f832c7d..0000000
--- a/lib/libc_bsd/quad/iordi3.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)iordi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/iordi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Return a | b, in quad.
- */
-quad_t
-__iordi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.q = a;
-	bb.q = b;
-	aa.ul[0] |= bb.ul[0];
-	aa.ul[1] |= bb.ul[1];
-	return (aa.q);
-}
diff --git a/lib/libc_bsd/quad/lshldi3.c b/lib/libc_bsd/quad/lshldi3.c
deleted file mode 100644
index d88e0e2..0000000
--- a/lib/libc_bsd/quad/lshldi3.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lshldi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/lshldi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Shift an (unsigned) quad value left (logical shift left).
- * This is the same as arithmetic shift left!
- */
-quad_t
-__lshldi3(a, shift)
-	quad_t a;
-	qshift_t shift;
-{
-	union uu aa;
-
-	aa.q = a;
-	if (shift >= LONG_BITS) {
-		aa.ul[H] = shift >= QUAD_BITS ? 0 :
-		    aa.ul[L] << (shift - LONG_BITS);
-		aa.ul[L] = 0;
-	} else if (shift > 0) {
-		aa.ul[H] = (aa.ul[H] << shift) |
-		    (aa.ul[L] >> (LONG_BITS - shift));
-		aa.ul[L] <<= shift;
-	}
-	return (aa.q);
-}
diff --git a/lib/libc_bsd/quad/lshrdi3.c b/lib/libc_bsd/quad/lshrdi3.c
deleted file mode 100644
index dfaef40..0000000
--- a/lib/libc_bsd/quad/lshrdi3.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lshrdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/lshrdi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Shift an (unsigned) quad value right (logical shift right).
- */
-quad_t
-__lshrdi3(a, shift)
-	quad_t a;
-	qshift_t shift;
-{
-	union uu aa;
-
-	aa.q = a;
-	if (shift >= LONG_BITS) {
-		aa.ul[L] = shift >= QUAD_BITS ? 0 :
-		    aa.ul[H] >> (shift - LONG_BITS);
-		aa.ul[H] = 0;
-	} else if (shift > 0) {
-		aa.ul[L] = (aa.ul[L] >> shift) |
-		    (aa.ul[H] << (LONG_BITS - shift));
-		aa.ul[H] >>= shift;
-	}
-	return (aa.q);
-}
diff --git a/lib/libc_bsd/quad/moddi3.c b/lib/libc_bsd/quad/moddi3.c
deleted file mode 100644
index 552bd66..0000000
--- a/lib/libc_bsd/quad/moddi3.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)moddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/moddi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Return remainder after dividing two signed quads.
- *
- * XXX
- * If -1/2 should produce -1 on this machine, this code is wrong.
- */
-quad_t
-__moddi3(a, b)
-	quad_t a, b;
-{
-	u_quad_t ua, ub, ur;
-	int neg;
-
-	if (a < 0)
-		ua = -(u_quad_t)a, neg = 1;
-	else
-		ua = a, neg = 0;
-	if (b < 0)
-		ub = -(u_quad_t)b;
-	else
-		ub = b;
-	(void)__qdivrem(ua, ub, &ur);
-	return (neg ? -ur : ur);
-}
diff --git a/lib/libc_bsd/quad/muldi3.c b/lib/libc_bsd/quad/muldi3.c
deleted file mode 100644
index 4d4e77e..0000000
--- a/lib/libc_bsd/quad/muldi3.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)muldi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/muldi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Multiply two quads.
- *
- * Our algorithm is based on the following.  Split incoming quad values
- * u and v (where u,v >= 0) into
- *
- *	u = 2^n u1  *  u0	(n = number of bits in `u_long', usu. 32)
- *
- * and
- *
- *	v = 2^n v1  *  v0
- *
- * Then
- *
- *	uv = 2^2n u1 v1  +  2^n u1 v0  +  2^n v1 u0  +  u0 v0
- *	   = 2^2n u1 v1  +     2^n (u1 v0 + v1 u0)   +  u0 v0
- *
- * Now add 2^n u1 v1 to the first term and subtract it from the middle,
- * and add 2^n u0 v0 to the last term and subtract it from the middle.
- * This gives:
- *
- *	uv = (2^2n + 2^n) (u1 v1)  +
- *	         (2^n)    (u1 v0 - u1 v1 + u0 v1 - u0 v0)  +
- *	       (2^n + 1)  (u0 v0)
- *
- * Factoring the middle a bit gives us:
- *
- *	uv = (2^2n + 2^n) (u1 v1)  +			[u1v1 = high]
- *		 (2^n)    (u1 - u0) (v0 - v1)  +	[(u1-u0)... = mid]
- *	       (2^n + 1)  (u0 v0)			[u0v0 = low]
- *
- * The terms (u1 v1), (u1 - u0) (v0 - v1), and (u0 v0) can all be done
- * in just half the precision of the original.  (Note that either or both
- * of (u1 - u0) or (v0 - v1) may be negative.)
- *
- * This algorithm is from Knuth vol. 2 (2nd ed), section 4.3.3, p. 278.
- *
- * Since C does not give us a `long * long = quad' operator, we split
- * our input quads into two longs, then split the two longs into two
- * shorts.  We can then calculate `short * short = long' in native
- * arithmetic.
- *
- * Our product should, strictly speaking, be a `long quad', with 128
- * bits, but we are going to discard the upper 64.  In other words,
- * we are not interested in uv, but rather in (uv mod 2^2n).  This
- * makes some of the terms above vanish, and we get:
- *
- *	(2^n)(high) + (2^n)(mid) + (2^n + 1)(low)
- *
- * or
- *
- *	(2^n)(high + mid + low) + low
- *
- * Furthermore, `high' and `mid' can be computed mod 2^n, as any factor
- * of 2^n in either one will also vanish.  Only `low' need be computed
- * mod 2^2n, and only because of the final term above.
- */
-static quad_t __lmulq(u_long, u_long);
-
-quad_t
-__muldi3(a, b)
-	quad_t a, b;
-{
-	union uu u, v, low, prod;
-	u_long high, mid, udiff, vdiff;
-	int negall, negmid;
-#define	u1	u.ul[H]
-#define	u0	u.ul[L]
-#define	v1	v.ul[H]
-#define	v0	v.ul[L]
-
-	/*
-	 * Get u and v such that u, v >= 0.  When this is finished,
-	 * u1, u0, v1, and v0 will be directly accessible through the
-	 * longword fields.
-	 */
-	if (a >= 0)
-		u.q = a, negall = 0;
-	else
-		u.q = -a, negall = 1;
-	if (b >= 0)
-		v.q = b;
-	else
-		v.q = -b, negall ^= 1;
-
-	if (u1 == 0 && v1 == 0) {
-		/*
-		 * An (I hope) important optimization occurs when u1 and v1
-		 * are both 0.  This should be common since most numbers
-		 * are small.  Here the product is just u0*v0.
-		 */
-		prod.q = __lmulq(u0, v0);
-	} else {
-		/*
-		 * Compute the three intermediate products, remembering
-		 * whether the middle term is negative.  We can discard
-		 * any upper bits in high and mid, so we can use native
-		 * u_long * u_long => u_long arithmetic.
-		 */
-		low.q = __lmulq(u0, v0);
-
-		if (u1 >= u0)
-			negmid = 0, udiff = u1 - u0;
-		else
-			negmid = 1, udiff = u0 - u1;
-		if (v0 >= v1)
-			vdiff = v0 - v1;
-		else
-			vdiff = v1 - v0, negmid ^= 1;
-		mid = udiff * vdiff;
-
-		high = u1 * v1;
-
-		/*
-		 * Assemble the final product.
-		 */
-		prod.ul[H] = high + (negmid ? -mid : mid) + low.ul[L] +
-		    low.ul[H];
-		prod.ul[L] = low.ul[L];
-	}
-	return (negall ? -prod.q : prod.q);
-#undef u1
-#undef u0
-#undef v1
-#undef v0
-}
-
-/*
- * Multiply two 2N-bit longs to produce a 4N-bit quad, where N is half
- * the number of bits in a long (whatever that is---the code below
- * does not care as long as quad.h does its part of the bargain---but
- * typically N==16).
- *
- * We use the same algorithm from Knuth, but this time the modulo refinement
- * does not apply.  On the other hand, since N is half the size of a long,
- * we can get away with native multiplication---none of our input terms
- * exceeds (ULONG_MAX >> 1).
- *
- * Note that, for u_long l, the quad-precision result
- *
- *	l << N
- *
- * splits into high and low longs as HHALF(l) and LHUP(l) respectively.
- */
-static quad_t
-__lmulq(u_long u, u_long v)
-{
-	u_long u1, u0, v1, v0, udiff, vdiff, high, mid, low;
-	u_long prodh, prodl, was;
-	union uu prod;
-	int neg;
-
-	u1 = HHALF(u);
-	u0 = LHALF(u);
-	v1 = HHALF(v);
-	v0 = LHALF(v);
-
-	low = u0 * v0;
-
-	/* This is the same small-number optimization as before. */
-	if (u1 == 0 && v1 == 0)
-		return (low);
-
-	if (u1 >= u0)
-		udiff = u1 - u0, neg = 0;
-	else
-		udiff = u0 - u1, neg = 1;
-	if (v0 >= v1)
-		vdiff = v0 - v1;
-	else
-		vdiff = v1 - v0, neg ^= 1;
-	mid = udiff * vdiff;
-
-	high = u1 * v1;
-
-	/* prod = (high << 2N) + (high << N); */
-	prodh = high + HHALF(high);
-	prodl = LHUP(high);
-
-	/* if (neg) prod -= mid << N; else prod += mid << N; */
-	if (neg) {
-		was = prodl;
-		prodl -= LHUP(mid);
-		prodh -= HHALF(mid) + (prodl > was);
-	} else {
-		was = prodl;
-		prodl += LHUP(mid);
-		prodh += HHALF(mid) + (prodl < was);
-	}
-
-	/* prod += low << N */
-	was = prodl;
-	prodl += LHUP(low);
-	prodh += HHALF(low) + (prodl < was);
-	/* ... + low; */
-	if ((prodl += low) < low)
-		prodh++;
-
-	/* return 4N-bit product */
-	prod.ul[H] = prodh;
-	prod.ul[L] = prodl;
-	return (prod.q);
-}
diff --git a/lib/libc_bsd/quad/negdi2.c b/lib/libc_bsd/quad/negdi2.c
deleted file mode 100644
index 3019338..0000000
--- a/lib/libc_bsd/quad/negdi2.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)negdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/negdi2.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Return -a (or, equivalently, 0 - a), in quad.  See subdi3.c.
- */
-quad_t
-__negdi2(a)
-	quad_t a;
-{
-	union uu aa, res;
-
-	aa.q = a;
-	res.ul[L] = -aa.ul[L];
-	res.ul[H] = -aa.ul[H] - (res.ul[L] > 0);
-	return (res.q);
-}
diff --git a/lib/libc_bsd/quad/notdi2.c b/lib/libc_bsd/quad/notdi2.c
deleted file mode 100644
index 1151278..0000000
--- a/lib/libc_bsd/quad/notdi2.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)notdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/notdi2.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Return ~a.  For some reason gcc calls this `one's complement' rather
- * than `not'.
- */
-quad_t
-__one_cmpldi2(a)
-	quad_t a;
-{
-	union uu aa;
-
-	aa.q = a;
-	aa.ul[0] = ~aa.ul[0];
-	aa.ul[1] = ~aa.ul[1];
-	return (aa.q);
-}
diff --git a/lib/libc_bsd/quad/qdivrem.c b/lib/libc_bsd/quad/qdivrem.c
deleted file mode 100644
index e3d2059..0000000
--- a/lib/libc_bsd/quad/qdivrem.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)qdivrem.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/qdivrem.c 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * Multiprecision divide.  This algorithm is from Knuth vol. 2 (2nd ed),
- * section 4.3.1, pp. 257--259.
- */
-
-#include "quad.h"
-
-#define	B	(1 << HALF_BITS)	/* digit base */
-
-/* Combine two `digits' to make a single two-digit number. */
-#define	COMBINE(a, b) (((u_long)(a) << HALF_BITS) | (b))
-
-/* select a type for digits in base B: use unsigned short if they fit */
-#if ULONG_MAX == 0xffffffff && USHRT_MAX >= 0xffff
-typedef unsigned short digit;
-#else
-typedef u_long digit;
-#endif
-
-/*
- * Shift p[0]..p[len] left `sh' bits, ignoring any bits that
- * `fall out' the left (there never will be any such anyway).
- * We may assume len >= 0.  NOTE THAT THIS WRITES len+1 DIGITS.
- */
-static void
-shl(digit *p, int len, int sh)
-{
-	int i;
-
-	for (i = 0; i < len; i++)
-		p[i] = LHALF(p[i] << sh) | (p[i + 1] >> (HALF_BITS - sh));
-	p[i] = LHALF(p[i] << sh);
-}
-
-/*
- * __qdivrem(u, v, rem) returns u/v and, optionally, sets *rem to u%v.
- *
- * We do this in base 2-sup-HALF_BITS, so that all intermediate products
- * fit within u_long.  As a consequence, the maximum length dividend and
- * divisor are 4 `digits' in this base (they are shorter if they have
- * leading zeros).
- */
-u_quad_t
-__qdivrem(uq, vq, arq)
-	u_quad_t uq, vq, *arq;
-{
-	union uu tmp;
-	digit *u, *v, *q;
-	digit v1, v2;
-	u_long qhat, rhat, t;
-	int m, n, d, j, i;
-	digit uspace[5], vspace[5], qspace[5];
-
-	/*
-	 * Take care of special cases: divide by zero, and u < v.
-	 */
-	if (vq == 0) {
-		/* divide by zero. */
-		static volatile const unsigned int zero = 0;
-
-		tmp.ul[H] = tmp.ul[L] = 1 / zero;
-		if (arq)
-			*arq = uq;
-		return (tmp.q);
-	}
-	if (uq < vq) {
-		if (arq)
-			*arq = uq;
-		return (0);
-	}
-	u = &uspace[0];
-	v = &vspace[0];
-	q = &qspace[0];
-
-	/*
-	 * Break dividend and divisor into digits in base B, then
-	 * count leading zeros to determine m and n.  When done, we
-	 * will have:
-	 *	u = (u[1]u[2]...u[m+n]) sub B
-	 *	v = (v[1]v[2]...v[n]) sub B
-	 *	v[1] != 0
-	 *	1 < n <= 4 (if n = 1, we use a different division algorithm)
-	 *	m >= 0 (otherwise u < v, which we already checked)
-	 *	m + n = 4
-	 * and thus
-	 *	m = 4 - n <= 2
-	 */
-	tmp.uq = uq;
-	u[0] = 0;
-	u[1] = HHALF(tmp.ul[H]);
-	u[2] = LHALF(tmp.ul[H]);
-	u[3] = HHALF(tmp.ul[L]);
-	u[4] = LHALF(tmp.ul[L]);
-	tmp.uq = vq;
-	v[1] = HHALF(tmp.ul[H]);
-	v[2] = LHALF(tmp.ul[H]);
-	v[3] = HHALF(tmp.ul[L]);
-	v[4] = LHALF(tmp.ul[L]);
-	for (n = 4; v[1] == 0; v++) {
-		if (--n == 1) {
-			u_long rbj;	/* r*B+u[j] (not root boy jim) */
-			digit q1, q2, q3, q4;
-
-			/*
-			 * Change of plan, per exercise 16.
-			 *	r = 0;
-			 *	for j = 1..4:
-			 *		q[j] = floor((r*B + u[j]) / v),
-			 *		r = (r*B + u[j]) % v;
-			 * We unroll this completely here.
-			 */
-			t = v[2];	/* nonzero, by definition */
-			q1 = u[1] / t;
-			rbj = COMBINE(u[1] % t, u[2]);
-			q2 = rbj / t;
-			rbj = COMBINE(rbj % t, u[3]);
-			q3 = rbj / t;
-			rbj = COMBINE(rbj % t, u[4]);
-			q4 = rbj / t;
-			if (arq)
-				*arq = rbj % t;
-			tmp.ul[H] = COMBINE(q1, q2);
-			tmp.ul[L] = COMBINE(q3, q4);
-			return (tmp.q);
-		}
-	}
-
-	/*
-	 * By adjusting q once we determine m, we can guarantee that
-	 * there is a complete four-digit quotient at &qspace[1] when
-	 * we finally stop.
-	 */
-	for (m = 4 - n; u[1] == 0; u++)
-		m--;
-	for (i = 4 - m; --i >= 0;)
-		q[i] = 0;
-	q += 4 - m;
-
-	/*
-	 * Here we run Program D, translated from MIX to C and acquiring
-	 * a few minor changes.
-	 *
-	 * D1: choose multiplier 1 << d to ensure v[1] >= B/2.
-	 */
-	d = 0;
-	for (t = v[1]; t < B / 2; t <<= 1)
-		d++;
-	if (d > 0) {
-		shl(&u[0], m + n, d);		/* u <<= d */
-		shl(&v[1], n - 1, d);		/* v <<= d */
-	}
-	/*
-	 * D2: j = 0.
-	 */
-	j = 0;
-	v1 = v[1];	/* for D3 -- note that v[1..n] are constant */
-	v2 = v[2];	/* for D3 */
-	do {
-		digit uj0, uj1, uj2;
-
-		/*
-		 * D3: Calculate qhat (\^q, in TeX notation).
-		 * Let qhat = min((u[j]*B + u[j+1])/v[1], B-1), and
-		 * let rhat = (u[j]*B + u[j+1]) mod v[1].
-		 * While rhat < B and v[2]*qhat > rhat*B+u[j+2],
-		 * decrement qhat and increase rhat correspondingly.
-		 * Note that if rhat >= B, v[2]*qhat < rhat*B.
-		 */
-		uj0 = u[j + 0];	/* for D3 only -- note that u[j+...] change */
-		uj1 = u[j + 1];	/* for D3 only */
-		uj2 = u[j + 2];	/* for D3 only */
-		if (uj0 == v1) {
-			qhat = B;
-			rhat = uj1;
-			goto qhat_too_big;
-		} else {
-			u_long n = COMBINE(uj0, uj1);
-			qhat = n / v1;
-			rhat = n % v1;
-		}
-		while (v2 * qhat > COMBINE(rhat, uj2)) {
-	qhat_too_big:
-			qhat--;
-			if ((rhat += v1) >= B)
-				break;
-		}
-		/*
-		 * D4: Multiply and subtract.
-		 * The variable `t' holds any borrows across the loop.
-		 * We split this up so that we do not require v[0] = 0,
-		 * and to eliminate a final special case.
-		 */
-		for (t = 0, i = n; i > 0; i--) {
-			t = u[i + j] - v[i] * qhat - t;
-			u[i + j] = LHALF(t);
-			t = (B - HHALF(t)) & (B - 1);
-		}
-		t = u[j] - t;
-		u[j] = LHALF(t);
-		/*
-		 * D5: test remainder.
-		 * There is a borrow if and only if HHALF(t) is nonzero;
-		 * in that (rare) case, qhat was too large (by exactly 1).
-		 * Fix it by adding v[1..n] to u[j..j+n].
-		 */
-		if (HHALF(t)) {
-			qhat--;
-			for (t = 0, i = n; i > 0; i--) { /* D6: add back. */
-				t += u[i + j] + v[i];
-				u[i + j] = LHALF(t);
-				t = HHALF(t);
-			}
-			u[j] = LHALF(u[j] + t);
-		}
-		q[j] = qhat;
-	} while (++j <= m);		/* D7: loop on j. */
-
-	/*
-	 * If caller wants the remainder, we have to calculate it as
-	 * u[m..m+n] >> d (this is at most n digits and thus fits in
-	 * u[m+1..m+n], but we may need more source digits).
-	 */
-	if (arq) {
-		if (d) {
-			for (i = m + n; i > m; --i)
-				u[i] = (u[i] >> d) |
-				    LHALF(u[i - 1] << (HALF_BITS - d));
-			u[i] = 0;
-		}
-		tmp.ul[H] = COMBINE(uspace[1], uspace[2]);
-		tmp.ul[L] = COMBINE(uspace[3], uspace[4]);
-		*arq = tmp.q;
-	}
-
-	tmp.ul[H] = COMBINE(qspace[1], qspace[2]);
-	tmp.ul[L] = COMBINE(qspace[3], qspace[4]);
-	return (tmp.q);
-}
diff --git a/lib/libc_bsd/quad/quad.h b/lib/libc_bsd/quad/quad.h
deleted file mode 100644
index 42ba45a..0000000
--- a/lib/libc_bsd/quad/quad.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- *	@(#)quad.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: releng/10.2/lib/libc/quad/quad.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-/*
- * Quad arithmetic.
- *
- * This library makes the following assumptions:
- *
- *  - The type long long (aka quad_t) exists.
- *
- *  - A quad variable is exactly twice as long as `long'.
- *
- *  - The machine's arithmetic is two's complement.
- *
- * This library can provide 128-bit arithmetic on a machine with 128-bit
- * quads and 64-bit longs, for instance, or 96-bit arithmetic on machines
- * with 48-bit longs.
- */
-
-#include <sys/types.h>
-#include <limits.h>
-
-/*
- * Depending on the desired operation, we view a `long long' (aka quad_t) in
- * one or more of the following formats.
- */
-union uu {
-	quad_t	q;		/* as a (signed) quad */
-	quad_t	uq;		/* as an unsigned quad */
-	long	sl[2];		/* as two signed longs */
-	u_long	ul[2];		/* as two unsigned longs */
-};
-
-/*
- * Define high and low longwords.
- */
-#define	H		_QUAD_HIGHWORD
-#define	L		_QUAD_LOWWORD
-
-/*
- * Total number of bits in a quad_t and in the pieces that make it up.
- * These are used for shifting, and also below for halfword extraction
- * and assembly.
- */
-#define	QUAD_BITS	(sizeof(quad_t) * CHAR_BIT)
-#define	LONG_BITS	(sizeof(long) * CHAR_BIT)
-#define	HALF_BITS	(sizeof(long) * CHAR_BIT / 2)
-
-/*
- * Extract high and low shortwords from longword, and move low shortword of
- * longword to upper half of long, i.e., produce the upper longword of
- * ((quad_t)(x) << (number_of_bits_in_long/2)).  (`x' must actually be u_long.)
- *
- * These are used in the multiply code, to split a longword into upper
- * and lower halves, and to reassemble a product as a quad_t, shifted left
- * (sizeof(long)*CHAR_BIT/2).
- */
-#define	HHALF(x)	((x) >> HALF_BITS)
-#define	LHALF(x)	((x) & ((1 << HALF_BITS) - 1))
-#define	LHUP(x)		((x) << HALF_BITS)
-
-int		__cmpdi2(quad_t a, quad_t b);
-quad_t		__divdi3(quad_t a, quad_t b);
-quad_t		__moddi3(quad_t a, quad_t b);
-u_quad_t	__qdivrem(u_quad_t u, u_quad_t v, u_quad_t *rem);
-int		__ucmpdi2(u_quad_t a, u_quad_t b);
-u_quad_t	__udivdi3(u_quad_t a, u_quad_t b);
-u_quad_t	__umoddi3(u_quad_t a, u_quad_t b);
-
-typedef unsigned int	qshift_t;
diff --git a/lib/libc_bsd/quad/subdi3.c b/lib/libc_bsd/quad/subdi3.c
deleted file mode 100644
index 5083642..0000000
--- a/lib/libc_bsd/quad/subdi3.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)subdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/subdi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Subtract two quad values.  This is trivial since a one-bit carry
- * from a single u_long difference x-y occurs if and only if (x-y) > x.
- */
-quad_t
-__subdi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb, diff;
-
-	aa.q = a;
-	bb.q = b;
-	diff.ul[L] = aa.ul[L] - bb.ul[L];
-	diff.ul[H] = aa.ul[H] - bb.ul[H] - (diff.ul[L] > aa.ul[L]);
-	return (diff.q);
-}
diff --git a/lib/libc_bsd/quad/ucmpdi2.c b/lib/libc_bsd/quad/ucmpdi2.c
deleted file mode 100644
index c0cd651..0000000
--- a/lib/libc_bsd/quad/ucmpdi2.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ucmpdi2.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/ucmpdi2.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Return 0, 1, or 2 as a <, =, > b respectively.
- * Neither a nor b are considered signed.
- */
-int
-__ucmpdi2(a, b)
-	u_quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.uq = a;
-	bb.uq = b;
-	return (aa.ul[H] < bb.ul[H] ? 0 : aa.ul[H] > bb.ul[H] ? 2 :
-	    aa.ul[L] < bb.ul[L] ? 0 : aa.ul[L] > bb.ul[L] ? 2 : 1);
-}
diff --git a/lib/libc_bsd/quad/udivdi3.c b/lib/libc_bsd/quad/udivdi3.c
deleted file mode 100644
index 36dd91a..0000000
--- a/lib/libc_bsd/quad/udivdi3.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)udivdi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/udivdi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Divide two unsigned quads.
- */
-u_quad_t
-__udivdi3(a, b)
-	u_quad_t a, b;
-{
-
-	return (__qdivrem(a, b, (u_quad_t *)0));
-}
diff --git a/lib/libc_bsd/quad/umoddi3.c b/lib/libc_bsd/quad/umoddi3.c
deleted file mode 100644
index 4a96729..0000000
--- a/lib/libc_bsd/quad/umoddi3.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)umoddi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/umoddi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Return remainder after dividing two unsigned quads.
- */
-u_quad_t
-__umoddi3(a, b)
-	u_quad_t a, b;
-{
-	u_quad_t r;
-
-	(void)__qdivrem(a, b, &r);
-	return (r);
-}
diff --git a/lib/libc_bsd/quad/xordi3.c b/lib/libc_bsd/quad/xordi3.c
deleted file mode 100644
index 345d392..0000000
--- a/lib/libc_bsd/quad/xordi3.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)xordi3.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/quad/xordi3.c 165903 2007-01-09 00:28:16Z imp $");
-
-#include "quad.h"
-
-/*
- * Return a ^ b, in quad.
- */
-quad_t
-__xordi3(a, b)
-	quad_t a, b;
-{
-	union uu aa, bb;
-
-	aa.q = a;
-	bb.q = b;
-	aa.ul[0] ^= bb.ul[0];
-	aa.ul[1] ^= bb.ul[1];
-	return (aa.q);
-}
diff --git a/lib/libc_bsd/regex/COPYRIGHT b/lib/libc_bsd/regex/COPYRIGHT
deleted file mode 100644
index 574f6bc..0000000
--- a/lib/libc_bsd/regex/COPYRIGHT
+++ /dev/null
@@ -1,56 +0,0 @@
-Copyright 1992, 1993, 1994 Henry Spencer.  All rights reserved.
-This software is not subject to any license of the American Telephone
-and Telegraph Company or of the Regents of the University of California.
-
-Permission is granted to anyone to use this software for any purpose on
-any computer system, and to alter it and redistribute it, subject
-to the following restrictions:
-
-1. The author is not responsible for the consequences of use of this
-   software, no matter how awful, even if they arise from flaws in it.
-
-2. The origin of this software must not be misrepresented, either by
-   explicit claim or by omission.  Since few users ever read sources,
-   credits must appear in the documentation.
-
-3. Altered versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.  Since few users
-   ever read sources, credits must appear in the documentation.
-
-4. This notice may not be removed or altered.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-/*-
- * Copyright (c) 1994
- *	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.
- *
- *	@(#)COPYRIGHT	8.1 (Berkeley) 3/16/94
- */
diff --git a/lib/libc_bsd/regex/Makefile.inc b/lib/libc_bsd/regex/Makefile.inc
deleted file mode 100644
index 76aa342..0000000
--- a/lib/libc_bsd/regex/Makefile.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-#	from @(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 156613 2006-03-13 01:15:01Z deischen $
-
-# regex sources
-.PATH: ${.CURDIR}/regex
-
-CFLAGS+=-DPOSIX_MISTAKE
-
-SRCS+=	regcomp.c regerror.c regexec.c regfree.c
-
-SYM_MAPS+=${.CURDIR}/regex/Symbol.map
-
-MAN+=	regex.3
-MAN+=	re_format.7
-
-MLINKS+=regex.3 regcomp.3 regex.3 regexec.3 regex.3 regerror.3
-MLINKS+=regexec.3 regfree.3
diff --git a/lib/libc_bsd/regex/Symbol.map b/lib/libc_bsd/regex/Symbol.map
deleted file mode 100644
index bbdba53..0000000
--- a/lib/libc_bsd/regex/Symbol.map
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/regex/Symbol.map 169092 2007-04-29 14:05:22Z deischen $
- */
-
-FBSD_1.0 {
-	regcomp;
-	regerror;
-	regexec;
-	regfree;
-};
diff --git a/lib/libc_bsd/regex/WHATSNEW b/lib/libc_bsd/regex/WHATSNEW
deleted file mode 100644
index f4301d3..0000000
--- a/lib/libc_bsd/regex/WHATSNEW
+++ /dev/null
@@ -1,94 +0,0 @@
-# @(#)WHATSNEW	8.3 (Berkeley) 3/18/94
-
-New in alpha3.4:  The complex bug alluded to below has been fixed (in a
-slightly kludgey temporary way that may hurt efficiency a bit; this is
-another "get it out the door for 4.4" release).  The tests at the end of
-the tests file have accordingly been uncommented.  The primary sign of
-the bug was that something like a?b matching ab matched b rather than ab.
-(The bug was essentially specific to this exact situation, else it would
-have shown up earlier.)
-
-New in alpha3.3:  The definition of word boundaries has been altered
-slightly, to more closely match the usual programming notion that "_"
-is an alphabetic.  Stuff used for pre-ANSI systems is now in a subdir,
-and the makefile no longer alludes to it in mysterious ways.  The
-makefile has generally been cleaned up some.  Fixes have been made
-(again!) so that the regression test will run without -DREDEBUG, at
-the cost of weaker checking.  A workaround for a bug in some folks'
-<assert.h> has been added.  And some more things have been added to
-tests, including a couple right at the end which are commented out
-because the code currently flunks them (complex bug; fix coming).
-Plus the usual minor cleanup.
-
-New in alpha3.2:  Assorted bits of cleanup and portability improvement
-(the development base is now a BSDI system using GCC instead of an ancient
-Sun system, and the newer compiler exposed some glitches).  Fix for a
-serious bug that affected REs using many [] (including REG_ICASE REs
-because of the way they are implemented), *sometimes*, depending on
-memory-allocation patterns.  The header-file prototypes no longer name
-the parameters, avoiding possible name conflicts.  The possibility that
-some clot has defined CHAR_MIN as (say) `-128' instead of `(-128)' is
-now handled gracefully.  "uchar" is no longer used as an internal type
-name (too many people have the same idea).  Still the same old lousy
-performance, alas.
-
-New in alpha3.1:  Basically nothing, this release is just a bookkeeping
-convenience.  Stay tuned.
-
-New in alpha3.0:  Performance is no better, alas, but some fixes have been
-made and some functionality has been added.  (This is basically the "get
-it out the door in time for 4.4" release.)  One bug fix:  regfree() didn't
-free the main internal structure (how embarrassing).  It is now possible
-to put NULs in either the RE or the target string, using (resp.) a new
-REG_PEND flag and the old REG_STARTEND flag.  The REG_NOSPEC flag to
-regcomp() makes all characters ordinary, so you can match a literal
-string easily (this will become more useful when performance improves!).
-There are now primitives to match beginnings and ends of words, although
-the syntax is disgusting and so is the implementation.  The REG_ATOI
-debugging interface has changed a bit.  And there has been considerable
-internal cleanup of various kinds.
-
-New in alpha2.3:  Split change list out of README, and moved flags notes
-into Makefile.  Macro-ized the name of regex(7) in regex(3), since it has
-to change for 4.4BSD.  Cleanup work in engine.c, and some new regression
-tests to catch tricky cases thereof.
-
-New in alpha2.2:  Out-of-date manpages updated.  Regerror() acquires two
-small extensions -- REG_ITOA and REG_ATOI -- which avoid debugging kludges
-in my own test program and might be useful to others for similar purposes.
-The regression test will now compile (and run) without REDEBUG.  The
-BRE \$ bug is fixed.  Most uses of "uchar" are gone; it's all chars now.
-Char/uchar parameters are now written int/unsigned, to avoid possible
-portability problems with unpromoted parameters.  Some unsigned casts have
-been introduced to minimize portability problems with shifting into sign
-bits.
-
-New in alpha2.1:  Lots of little stuff, cleanup and fixes.  The one big
-thing is that regex.h is now generated, using mkh, rather than being
-supplied in the distribution; due to circularities in dependencies,
-you have to build regex.h explicitly by "make h".  The two known bugs
-have been fixed (and the regression test now checks for them), as has a
-problem with assertions not being suppressed in the absence of REDEBUG.
-No performance work yet.
-
-New in alpha2:  Backslash-anything is an ordinary character, not an
-error (except, of course, for the handful of backslashed metacharacters
-in BREs), which should reduce script breakage.  The regression test
-checks *where* null strings are supposed to match, and has generally
-been tightened up somewhat.  Small bug fixes in parameter passing (not
-harmful, but technically errors) and some other areas.  Debugging
-invoked by defining REDEBUG rather than not defining NDEBUG.
-
-New in alpha+3:  full prototyping for internal routines, using a little
-helper program, mkh, which extracts prototypes given in stylized comments.
-More minor cleanup.  Buglet fix:  it's CHAR_BIT, not CHAR_BITS.  Simple
-pre-screening of input when a literal string is known to be part of the
-RE; this does wonders for performance.
-
-New in alpha+2:  minor bits of cleanup.  Notably, the number "32" for the
-word width isn't hardwired into regexec.c any more, the public header
-file prototypes the functions if __STDC__ is defined, and some small typos
-in the manpages have been fixed.
-
-New in alpha+1:  improvements to the manual pages, and an important
-extension, the REG_STARTEND option to regexec().
diff --git a/lib/libc_bsd/regex/cname.h b/lib/libc_bsd/regex/cname.h
deleted file mode 100644
index 83f4266..0000000
--- a/lib/libc_bsd/regex/cname.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- * 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.
- *
- *	@(#)cname.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD: releng/10.2/lib/libc/regex/cname.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-/* character-name table */
-static struct cname {
-	char *name;
-	char code;
-} cnames[] = {
-	{"NUL",			'\0'},
-	{"SOH",			'\001'},
-	{"STX",			'\002'},
-	{"ETX",			'\003'},
-	{"EOT",			'\004'},
-	{"ENQ",			'\005'},
-	{"ACK",			'\006'},
-	{"BEL",			'\007'},
-	{"alert",		'\007'},
-	{"BS",			'\010'},
-	{"backspace",		'\b'},
-	{"HT",			'\011'},
-	{"tab",			'\t'},
-	{"LF",			'\012'},
-	{"newline",		'\n'},
-	{"VT",			'\013'},
-	{"vertical-tab",	'\v'},
-	{"FF",			'\014'},
-	{"form-feed",		'\f'},
-	{"CR",			'\015'},
-	{"carriage-return",	'\r'},
-	{"SO",			'\016'},
-	{"SI",			'\017'},
-	{"DLE",			'\020'},
-	{"DC1",			'\021'},
-	{"DC2",			'\022'},
-	{"DC3",			'\023'},
-	{"DC4",			'\024'},
-	{"NAK",			'\025'},
-	{"SYN",			'\026'},
-	{"ETB",			'\027'},
-	{"CAN",			'\030'},
-	{"EM",			'\031'},
-	{"SUB",			'\032'},
-	{"ESC",			'\033'},
-	{"IS4",			'\034'},
-	{"FS",			'\034'},
-	{"IS3",			'\035'},
-	{"GS",			'\035'},
-	{"IS2",			'\036'},
-	{"RS",			'\036'},
-	{"IS1",			'\037'},
-	{"US",			'\037'},
-	{"space",		' '},
-	{"exclamation-mark",	'!'},
-	{"quotation-mark",	'"'},
-	{"number-sign",		'#'},
-	{"dollar-sign",		'$'},
-	{"percent-sign",	'%'},
-	{"ampersand",		'&'},
-	{"apostrophe",		'\''},
-	{"left-parenthesis",	'('},
-	{"right-parenthesis",	')'},
-	{"asterisk",		'*'},
-	{"plus-sign",		'+'},
-	{"comma",		','},
-	{"hyphen",		'-'},
-	{"hyphen-minus",	'-'},
-	{"period",		'.'},
-	{"full-stop",		'.'},
-	{"slash",		'/'},
-	{"solidus",		'/'},
-	{"zero",		'0'},
-	{"one",			'1'},
-	{"two",			'2'},
-	{"three",		'3'},
-	{"four",		'4'},
-	{"five",		'5'},
-	{"six",			'6'},
-	{"seven",      		'7'},
-	{"eight",		'8'},
-	{"nine",		'9'},
-	{"colon",		':'},
-	{"semicolon",		';'},
-	{"less-than-sign",	'<'},
-	{"equals-sign",		'='},
-	{"greater-than-sign",	'>'},
-	{"question-mark",	'?'},
-	{"commercial-at",	'@'},
-	{"left-square-bracket",	'['},
-	{"backslash",		'\\'},
-	{"reverse-solidus",	'\\'},
-	{"right-square-bracket",']'},
-	{"circumflex",		'^'},
-	{"circumflex-accent",	'^'},
-	{"underscore",		'_'},
-	{"low-line",		'_'},
-	{"grave-accent",	'`'},
-	{"left-brace",		'{'},
-	{"left-curly-bracket",	'{'},
-	{"vertical-line",	'|'},
-	{"right-brace",		'}'},
-	{"right-curly-bracket",	'}'},
-	{"tilde",		'~'},
-	{"DEL",	'\177'},
-	{NULL,	0}
-};
diff --git a/lib/libc_bsd/regex/engine.c b/lib/libc_bsd/regex/engine.c
deleted file mode 100644
index 9f301b8..0000000
--- a/lib/libc_bsd/regex/engine.c
+++ /dev/null
@@ -1,1186 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- * 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.
- *
- *	@(#)engine.c	8.5 (Berkeley) 3/20/94
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/regex/engine.c 265726 2014-05-09 01:20:39Z pfg $");
-
-/*
- * The matching engine and friends.  This file is #included by regexec.c
- * after suitable #defines of a variety of macros used herein, so that
- * different state representations can be used without duplicating masses
- * of code.
- */
-
-#ifdef SNAMES
-#define	matcher	smatcher
-#define	fast	sfast
-#define	slow	sslow
-#define	dissect	sdissect
-#define	backref	sbackref
-#define	step	sstep
-#define	print	sprint
-#define	at	sat
-#define	match	smat
-#endif
-#ifdef LNAMES
-#define	matcher	lmatcher
-#define	fast	lfast
-#define	slow	lslow
-#define	dissect	ldissect
-#define	backref	lbackref
-#define	step	lstep
-#define	print	lprint
-#define	at	lat
-#define	match	lmat
-#endif
-#ifdef MNAMES
-#define	matcher	mmatcher
-#define	fast	mfast
-#define	slow	mslow
-#define	dissect	mdissect
-#define	backref	mbackref
-#define	step	mstep
-#define	print	mprint
-#define	at	mat
-#define	match	mmat
-#endif
-
-/* another structure passed up and down to avoid zillions of parameters */
-struct match {
-	struct re_guts *g;
-	int eflags;
-	regmatch_t *pmatch;	/* [nsub+1] (0 element unused) */
-	const char *offp;	/* offsets work from here */
-	const char *beginp;	/* start of string -- virtual NUL precedes */
-	const char *endp;	/* end of string -- virtual NUL here */
-	const char *coldp;	/* can be no match starting before here */
-	const char **lastpos;	/* [nplus+1] */
-	STATEVARS;
-	states st;		/* current states */
-	states fresh;		/* states for a fresh start */
-	states tmp;		/* temporary */
-	states empty;		/* empty set of states */
-	mbstate_t mbs;		/* multibyte conversion state */
-};
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === engine.c === */
-static int matcher(struct re_guts *g, const char *string, size_t nmatch, regmatch_t pmatch[], int eflags);
-static const char *dissect(struct match *m, const char *start, const char *stop, sopno startst, sopno stopst);
-static const char *backref(struct match *m, const char *start, const char *stop, sopno startst, sopno stopst, sopno lev, int);
-static const char *fast(struct match *m, const char *start, const char *stop, sopno startst, sopno stopst);
-static const char *slow(struct match *m, const char *start, const char *stop, sopno startst, sopno stopst);
-static states step(struct re_guts *g, sopno start, sopno stop, states bef, wint_t ch, states aft);
-#define MAX_RECURSION	100
-#define	BOL	(OUT-1)
-#define	EOL	(BOL-1)
-#define	BOLEOL	(BOL-2)
-#define	NOTHING	(BOL-3)
-#define	BOW	(BOL-4)
-#define	EOW	(BOL-5)
-#define	BADCHAR	(BOL-6)
-#define	NONCHAR(c)	((c) <= OUT)
-#ifdef REDEBUG
-static void print(struct match *m, const char *caption, states st, int ch, FILE *d);
-#endif
-#ifdef REDEBUG
-static void at(struct match *m, const char *title, const char *start, const char *stop, sopno startst, sopno stopst);
-#endif
-#ifdef REDEBUG
-static const char *pchar(int ch);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-
-#ifdef REDEBUG
-#define	SP(t, s, c)	print(m, t, s, c, stdout)
-#define	AT(t, p1, p2, s1, s2)	at(m, t, p1, p2, s1, s2)
-#define	NOTE(str)	{ if (m->eflags&REG_TRACE) printf("=%s\n", (str)); }
-#else
-#define	SP(t, s, c)	/* nothing */
-#define	AT(t, p1, p2, s1, s2)	/* nothing */
-#define	NOTE(s)	/* nothing */
-#endif
-
-/*
- - matcher - the actual matching engine
- == static int matcher(struct re_guts *g, const char *string, \
- ==	size_t nmatch, regmatch_t pmatch[], int eflags);
- */
-static int			/* 0 success, REG_NOMATCH failure */
-matcher(struct re_guts *g,
-	const char *string,
-	size_t nmatch,
-	regmatch_t pmatch[],
-	int eflags)
-{
-	const char *endp;
-	int i;
-	struct match mv;
-	struct match *m = &mv;
-	const char *dp;
-	const sopno gf = g->firststate+1;	/* +1 for OEND */
-	const sopno gl = g->laststate;
-	const char *start;
-	const char *stop;
-	/* Boyer-Moore algorithms variables */
-	const char *pp;
-	int cj, mj;
-	const char *mustfirst;
-	const char *mustlast;
-	int *matchjump;
-	int *charjump;
-
-	/* simplify the situation where possible */
-	if (g->cflags&REG_NOSUB)
-		nmatch = 0;
-	if (eflags&REG_STARTEND) {
-		start = string + pmatch[0].rm_so;
-		stop = string + pmatch[0].rm_eo;
-	} else {
-		start = string;
-		stop = start + strlen(start);
-	}
-	if (stop < start)
-		return(REG_INVARG);
-
-	/* prescreening; this does wonders for this rather slow code */
-	if (g->must != NULL) {
-		if (g->charjump != NULL && g->matchjump != NULL) {
-			mustfirst = g->must;
-			mustlast = g->must + g->mlen - 1;
-			charjump = g->charjump;
-			matchjump = g->matchjump;
-			pp = mustlast;
-			for (dp = start+g->mlen-1; dp < stop;) {
-				/* Fast skip non-matches */
-				while (dp < stop && charjump[(int)*dp])
-					dp += charjump[(int)*dp];
-
-				if (dp >= stop)
-					break;
-
-				/* Greedy matcher */
-				/* We depend on not being used for
-				 * for strings of length 1
-				 */
-				while (*--dp == *--pp && pp != mustfirst);
-
-				if (*dp == *pp)
-					break;
-
-				/* Jump to next possible match */
-				mj = matchjump[pp - mustfirst];
-				cj = charjump[(int)*dp];
-				dp += (cj < mj ? mj : cj);
-				pp = mustlast;
-			}
-			if (pp != mustfirst)
-				return(REG_NOMATCH);
-		} else {
-			for (dp = start; dp < stop; dp++)
-				if (*dp == g->must[0] &&
-				    stop - dp >= g->mlen &&
-				    memcmp(dp, g->must, (size_t)g->mlen) == 0)
-					break;
-			if (dp == stop)		/* we didn't find g->must */
-				return(REG_NOMATCH);
-		}
-	}
-
-	/* match struct setup */
-	m->g = g;
-	m->eflags = eflags;
-	m->pmatch = NULL;
-	m->lastpos = NULL;
-	m->offp = string;
-	m->beginp = start;
-	m->endp = stop;
-	STATESETUP(m, 4);
-	SETUP(m->st);
-	SETUP(m->fresh);
-	SETUP(m->tmp);
-	SETUP(m->empty);
-	CLEAR(m->empty);
-	ZAPSTATE(&m->mbs);
-
-	/* Adjust start according to moffset, to speed things up */
-	if (g->moffset > -1)
-		start = ((dp - g->moffset) < start) ? start : dp - g->moffset;
-
-	SP("mloop", m->st, *start);
-
-	/* this loop does only one repetition except for backrefs */
-	for (;;) {
-		endp = fast(m, start, stop, gf, gl);
-		if (endp == NULL) {		/* a miss */
-			if (m->pmatch != NULL)
-				free((char *)m->pmatch);
-			if (m->lastpos != NULL)
-				free((char *)m->lastpos);
-			STATETEARDOWN(m);
-			return(REG_NOMATCH);
-		}
-		if (nmatch == 0 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* where? */
-		assert(m->coldp != NULL);
-		for (;;) {
-			NOTE("finding start");
-			endp = slow(m, m->coldp, stop, gf, gl);
-			if (endp != NULL)
-				break;
-			assert(m->coldp < m->endp);
-			m->coldp += XMBRTOWC(NULL, m->coldp,
-			    m->endp - m->coldp, &m->mbs, 0);
-		}
-		if (nmatch == 1 && !g->backrefs)
-			break;		/* no further info needed */
-
-		/* oh my, he wants the subexpressions... */
-		if (m->pmatch == NULL)
-			m->pmatch = (regmatch_t *)malloc((m->g->nsub + 1) *
-							sizeof(regmatch_t));
-		if (m->pmatch == NULL) {
-			STATETEARDOWN(m);
-			return(REG_ESPACE);
-		}
-		for (i = 1; i <= m->g->nsub; i++)
-			m->pmatch[i].rm_so = m->pmatch[i].rm_eo = -1;
-		if (!g->backrefs && !(m->eflags&REG_BACKR)) {
-			NOTE("dissecting");
-			dp = dissect(m, m->coldp, endp, gf, gl);
-		} else {
-			if (g->nplus > 0 && m->lastpos == NULL)
-				m->lastpos = malloc((g->nplus+1) *
-						sizeof(const char *));
-			if (g->nplus > 0 && m->lastpos == NULL) {
-				free(m->pmatch);
-				STATETEARDOWN(m);
-				return(REG_ESPACE);
-			}
-			NOTE("backref dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0, 0);
-		}
-		if (dp != NULL)
-			break;
-
-		/* uh-oh... we couldn't find a subexpression-level match */
-		assert(g->backrefs);	/* must be back references doing it */
-		assert(g->nplus == 0 || m->lastpos != NULL);
-		for (;;) {
-			if (dp != NULL || endp <= m->coldp)
-				break;		/* defeat */
-			NOTE("backoff");
-			endp = slow(m, m->coldp, endp-1, gf, gl);
-			if (endp == NULL)
-				break;		/* defeat */
-			/* try it on a shorter possibility */
-#ifndef NDEBUG
-			for (i = 1; i <= m->g->nsub; i++) {
-				assert(m->pmatch[i].rm_so == -1);
-				assert(m->pmatch[i].rm_eo == -1);
-			}
-#endif
-			NOTE("backoff dissect");
-			dp = backref(m, m->coldp, endp, gf, gl, (sopno)0, 0);
-		}
-		assert(dp == NULL || dp == endp);
-		if (dp != NULL)		/* found a shorter one */
-			break;
-
-		/* despite initial appearances, there is no match here */
-		NOTE("false alarm");
-		/* recycle starting later */
-		start = m->coldp + XMBRTOWC(NULL, m->coldp,
-		    stop - m->coldp, &m->mbs, 0);
-		assert(start <= stop);
-	}
-
-	/* fill in the details if requested */
-	if (nmatch > 0) {
-		pmatch[0].rm_so = m->coldp - m->offp;
-		pmatch[0].rm_eo = endp - m->offp;
-	}
-	if (nmatch > 1) {
-		assert(m->pmatch != NULL);
-		for (i = 1; i < nmatch; i++)
-			if (i <= m->g->nsub)
-				pmatch[i] = m->pmatch[i];
-			else {
-				pmatch[i].rm_so = -1;
-				pmatch[i].rm_eo = -1;
-			}
-	}
-
-	if (m->pmatch != NULL)
-		free((char *)m->pmatch);
-	if (m->lastpos != NULL)
-		free((char *)m->lastpos);
-	STATETEARDOWN(m);
-	return(0);
-}
-
-/*
- - dissect - figure out what matched what, no back references
- == static const char *dissect(struct match *m, const char *start, \
- ==	const char *stop, sopno startst, sopno stopst);
- */
-static const char *		/* == stop (success) always */
-dissect(struct match *m,
-	const char *start,
-	const char *stop,
-	sopno startst,
-	sopno stopst)
-{
-	int i;
-	sopno ss;		/* start sop of current subRE */
-	sopno es;		/* end sop of current subRE */
-	const char *sp;		/* start of string matched by it */
-	const char *stp;	/* string matched by it cannot pass here */
-	const char *rest;	/* start of rest of string */
-	const char *tail;	/* string unmatched by rest of RE */
-	sopno ssub;		/* start sop of subsubRE */
-	sopno esub;		/* end sop of subsubRE */
-	const char *ssp;	/* start of string matched by subsubRE */
-	const char *sep;	/* end of string matched by subsubRE */
-	const char *oldssp;	/* previous ssp */
-	const char *dp;
-
-	AT("diss", start, stop, startst, stopst);
-	sp = start;
-	for (ss = startst; ss < stopst; ss = es) {
-		/* identify end of subRE */
-		es = ss;
-		switch (OP(m->g->strip[es])) {
-		case OPLUS_:
-		case OQUEST_:
-			es += OPND(m->g->strip[es]);
-			break;
-		case OCH_:
-			while (OP(m->g->strip[es]) != O_CH)
-				es += OPND(m->g->strip[es]);
-			break;
-		}
-		es++;
-
-		/* figure out what it matched */
-		switch (OP(m->g->strip[ss])) {
-		case OEND:
-			assert(nope);
-			break;
-		case OCHAR:
-			sp += XMBRTOWC(NULL, sp, stop - start, &m->mbs, 0);
-			break;
-		case OBOL:
-		case OEOL:
-		case OBOW:
-		case OEOW:
-			break;
-		case OANY:
-		case OANYOF:
-			sp += XMBRTOWC(NULL, sp, stop - start, &m->mbs, 0);
-			break;
-		case OBACK_:
-		case O_BACK:
-			assert(nope);
-			break;
-		/* cases where length of match is hard to find */
-		case OQUEST_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			/* did innards match? */
-			if (slow(m, sp, rest, ssub, esub) != NULL) {
-				dp = dissect(m, sp, rest, ssub, esub);
-				assert(dp == rest);
-			} else		/* no */
-				assert(sp == rest);
-			sp = rest;
-			break;
-		case OPLUS_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = es - 1;
-			ssp = sp;
-			oldssp = ssp;
-			for (;;) {	/* find last match of innards */
-				sep = slow(m, ssp, rest, ssub, esub);
-				if (sep == NULL || sep == ssp)
-					break;	/* failed or matched null */
-				oldssp = ssp;	/* on to next try */
-				ssp = sep;
-			}
-			if (sep == NULL) {
-				/* last successful match */
-				sep = ssp;
-				ssp = oldssp;
-			}
-			assert(sep == rest);	/* must exhaust substring */
-			assert(slow(m, ssp, sep, ssub, esub) == rest);
-			dp = dissect(m, ssp, sep, ssub, esub);
-			assert(dp == sep);
-			sp = rest;
-			break;
-		case OCH_:
-			stp = stop;
-			for (;;) {
-				/* how long could this one be? */
-				rest = slow(m, sp, stp, ss, es);
-				assert(rest != NULL);	/* it did match */
-				/* could the rest match the rest? */
-				tail = slow(m, rest, stop, es, stopst);
-				if (tail == stop)
-					break;		/* yes! */
-				/* no -- try a shorter match for this one */
-				stp = rest - 1;
-				assert(stp >= sp);	/* it did work */
-			}
-			ssub = ss + 1;
-			esub = ss + OPND(m->g->strip[ss]) - 1;
-			assert(OP(m->g->strip[esub]) == OOR1);
-			for (;;) {	/* find first matching branch */
-				if (slow(m, sp, rest, ssub, esub) == rest)
-					break;	/* it matched all of it */
-				/* that one missed, try next one */
-				assert(OP(m->g->strip[esub]) == OOR1);
-				esub++;
-				assert(OP(m->g->strip[esub]) == OOR2);
-				ssub = esub + 1;
-				esub += OPND(m->g->strip[esub]);
-				if (OP(m->g->strip[esub]) == OOR2)
-					esub--;
-				else
-					assert(OP(m->g->strip[esub]) == O_CH);
-			}
-			dp = dissect(m, sp, rest, ssub, esub);
-			assert(dp == rest);
-			sp = rest;
-			break;
-		case O_PLUS:
-		case O_QUEST:
-		case OOR1:
-		case OOR2:
-		case O_CH:
-			assert(nope);
-			break;
-		case OLPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_so = sp - m->offp;
-			break;
-		case ORPAREN:
-			i = OPND(m->g->strip[ss]);
-			assert(0 < i && i <= m->g->nsub);
-			m->pmatch[i].rm_eo = sp - m->offp;
-			break;
-		default:		/* uh oh */
-			assert(nope);
-			break;
-		}
-	}
-
-	assert(sp == stop);
-	return(sp);
-}
-
-/*
- - backref - figure out what matched what, figuring in back references
- == static const char *backref(struct match *m, const char *start, \
- ==	const char *stop, sopno startst, sopno stopst, sopno lev);
- */
-static const char *		/* == stop (success) or NULL (failure) */
-backref(struct match *m,
-	const char *start,
-	const char *stop,
-	sopno startst,
-	sopno stopst,
-	sopno lev,		/* PLUS nesting level */
-	int rec)
-{
-	int i;
-	sopno ss;		/* start sop of current subRE */
-	const char *sp;		/* start of string matched by it */
-	sopno ssub;		/* start sop of subsubRE */
-	sopno esub;		/* end sop of subsubRE */
-	const char *ssp;	/* start of string matched by subsubRE */
-	const char *dp;
-	size_t len;
-	int hard;
-	sop s;
-	regoff_t offsave;
-	cset *cs;
-	wint_t wc;
-
-	AT("back", start, stop, startst, stopst);
-	sp = start;
-
-	/* get as far as we can with easy stuff */
-	hard = 0;
-	for (ss = startst; !hard && ss < stopst; ss++)
-		switch (OP(s = m->g->strip[ss])) {
-		case OCHAR:
-			if (sp == stop)
-				return(NULL);
-			sp += XMBRTOWC(&wc, sp, stop - sp, &m->mbs, BADCHAR);
-			if (wc != OPND(s))
-				return(NULL);
-			break;
-		case OANY:
-			if (sp == stop)
-				return(NULL);
-			sp += XMBRTOWC(&wc, sp, stop - sp, &m->mbs, BADCHAR);
-			if (wc == BADCHAR)
-				return (NULL);
-			break;
-		case OANYOF:
-			if (sp == stop)
-				return (NULL);
-			cs = &m->g->sets[OPND(s)];
-			sp += XMBRTOWC(&wc, sp, stop - sp, &m->mbs, BADCHAR);
-			if (wc == BADCHAR || !CHIN(cs, wc))
-				return(NULL);
-			break;
-		case OBOL:
-			if ( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOL:
-			if ( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OBOW:
-			if (( (sp == m->beginp && !(m->eflags&REG_NOTBOL)) ||
-					(sp < m->endp && *(sp-1) == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp > m->beginp &&
-							!ISWORD(*(sp-1))) ) &&
-					(sp < m->endp && ISWORD(*sp)) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case OEOW:
-			if (( (sp == m->endp && !(m->eflags&REG_NOTEOL)) ||
-					(sp < m->endp && *sp == '\n' &&
-						(m->g->cflags&REG_NEWLINE)) ||
-					(sp < m->endp && !ISWORD(*sp)) ) &&
-					(sp > m->beginp && ISWORD(*(sp-1))) )
-				{ /* yes */ }
-			else
-				return(NULL);
-			break;
-		case O_QUEST:
-			break;
-		case OOR1:	/* matches null but needs to skip */
-			ss++;
-			s = m->g->strip[ss];
-			do {
-				assert(OP(s) == OOR2);
-				ss += OPND(s);
-			} while (OP(s = m->g->strip[ss]) != O_CH);
-			/* note that the ss++ gets us past the O_CH */
-			break;
-		default:	/* have to make a choice */
-			hard = 1;
-			break;
-		}
-	if (!hard) {		/* that was it! */
-		if (sp != stop)
-			return(NULL);
-		return(sp);
-	}
-	ss--;			/* adjust for the for's final increment */
-
-	/* the hard stuff */
-	AT("hard", sp, stop, ss, stopst);
-	s = m->g->strip[ss];
-	switch (OP(s)) {
-	case OBACK_:		/* the vilest depths */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		if (m->pmatch[i].rm_eo == -1)
-			return(NULL);
-		assert(m->pmatch[i].rm_so != -1);
-		len = m->pmatch[i].rm_eo - m->pmatch[i].rm_so;
-		if (len == 0 && rec++ > MAX_RECURSION)
-			return(NULL);
-		assert(stop - m->beginp >= len);
-		if (sp > stop - len)
-			return(NULL);	/* not enough left to match */
-		ssp = m->offp + m->pmatch[i].rm_so;
-		if (memcmp(sp, ssp, len) != 0)
-			return(NULL);
-		while (m->g->strip[ss] != SOP(O_BACK, i))
-			ss++;
-		return(backref(m, sp+len, stop, ss+1, stopst, lev, rec));
-	case OQUEST_:		/* to null or not */
-		dp = backref(m, sp, stop, ss+1, stopst, lev, rec);
-		if (dp != NULL)
-			return(dp);	/* not */
-		return(backref(m, sp, stop, ss+OPND(s)+1, stopst, lev, rec));
-	case OPLUS_:
-		assert(m->lastpos != NULL);
-		assert(lev+1 <= m->g->nplus);
-		m->lastpos[lev+1] = sp;
-		return(backref(m, sp, stop, ss+1, stopst, lev+1, rec));
-	case O_PLUS:
-		if (sp == m->lastpos[lev])	/* last pass matched null */
-			return(backref(m, sp, stop, ss+1, stopst, lev-1, rec));
-		/* try another pass */
-		m->lastpos[lev] = sp;
-		dp = backref(m, sp, stop, ss-OPND(s)+1, stopst, lev, rec);
-		if (dp == NULL)
-			return(backref(m, sp, stop, ss+1, stopst, lev-1, rec));
-		else
-			return(dp);
-	case OCH_:		/* find the right one, if any */
-		ssub = ss + 1;
-		esub = ss + OPND(s) - 1;
-		assert(OP(m->g->strip[esub]) == OOR1);
-		for (;;) {	/* find first matching branch */
-			dp = backref(m, sp, stop, ssub, esub, lev, rec);
-			if (dp != NULL)
-				return(dp);
-			/* that one missed, try next one */
-			if (OP(m->g->strip[esub]) == O_CH)
-				return(NULL);	/* there is none */
-			esub++;
-			assert(OP(m->g->strip[esub]) == OOR2);
-			ssub = esub + 1;
-			esub += OPND(m->g->strip[esub]);
-			if (OP(m->g->strip[esub]) == OOR2)
-				esub--;
-			else
-				assert(OP(m->g->strip[esub]) == O_CH);
-		}
-		/* NOTREACHED */
-		break;
-	case OLPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_so;
-		m->pmatch[i].rm_so = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev, rec);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_so = offsave;
-		return(NULL);
-	case ORPAREN:		/* must undo assignment if rest fails */
-		i = OPND(s);
-		assert(0 < i && i <= m->g->nsub);
-		offsave = m->pmatch[i].rm_eo;
-		m->pmatch[i].rm_eo = sp - m->offp;
-		dp = backref(m, sp, stop, ss+1, stopst, lev, rec);
-		if (dp != NULL)
-			return(dp);
-		m->pmatch[i].rm_eo = offsave;
-		return(NULL);
-	default:		/* uh oh */
-		assert(nope);
-		break;
-	}
-
-	/* "can't happen" */
-	assert(nope);
-	/* NOTREACHED */
-	return "shut up gcc";
-}
-
-/*
- - fast - step through the string at top speed
- == static const char *fast(struct match *m, const char *start, \
- ==	const char *stop, sopno startst, sopno stopst);
- */
-static const char *		/* where tentative match ended, or NULL */
-fast(	struct match *m,
-	const char *start,
-	const char *stop,
-	sopno startst,
-	sopno stopst)
-{
-	states st = m->st;
-	states fresh = m->fresh;
-	states tmp = m->tmp;
-	const char *p = start;
-	wint_t c;
-	wint_t lastc;		/* previous c */
-	wint_t flagch;
-	int i;
-	const char *coldp;	/* last p after which no match was underway */
-	size_t clen;
-
-	CLEAR(st);
-	SET1(st, startst);
-	SP("fast", st, *p);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	ASSIGN(fresh, st);
-	SP("start", st, *p);
-	coldp = NULL;
-	if (start == m->beginp)
-		c = OUT;
-	else {
-		/*
-		 * XXX Wrong if the previous character was multi-byte.
-		 * Newline never is (in encodings supported by FreeBSD),
-		 * so this only breaks the ISWORD tests below.
-		 */
-		c = (uch)*(start - 1);
-	}
-	for (;;) {
-		/* next character */
-		lastc = c;
-		if (p == m->endp) {
-			clen = 0;
-			c = OUT;
-		} else
-			clen = XMBRTOWC(&c, p, m->endp - p, &m->mbs, BADCHAR);
-		if (EQ(st, fresh))
-			coldp = p;
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("boweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst) || p == stop || clen > stop - p)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, fresh);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("aft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p += clen;
-	}
-
-	assert(coldp != NULL);
-	m->coldp = coldp;
-	if (ISSET(st, stopst))
-		return(p+XMBRTOWC(NULL, p, stop - p, &m->mbs, 0));
-	else
-		return(NULL);
-}
-
-/*
- - slow - step through the string more deliberately
- == static const char *slow(struct match *m, const char *start, \
- ==	const char *stop, sopno startst, sopno stopst);
- */
-static const char *		/* where it ended */
-slow(	struct match *m,
-	const char *start,
-	const char *stop,
-	sopno startst,
-	sopno stopst)
-{
-	states st = m->st;
-	states empty = m->empty;
-	states tmp = m->tmp;
-	const char *p = start;
-	wint_t c;
-	wint_t lastc;		/* previous c */
-	wint_t flagch;
-	int i;
-	const char *matchp;	/* last p at which a match ended */
-	size_t clen;
-
-	AT("slow", start, stop, startst, stopst);
-	CLEAR(st);
-	SET1(st, startst);
-	SP("sstart", st, *p);
-	st = step(m->g, startst, stopst, st, NOTHING, st);
-	matchp = NULL;
-	if (start == m->beginp)
-		c = OUT;
-	else {
-		/*
-		 * XXX Wrong if the previous character was multi-byte.
-		 * Newline never is (in encodings supported by FreeBSD),
-		 * so this only breaks the ISWORD tests below.
-		 */
-		c = (uch)*(start - 1);
-	}
-	for (;;) {
-		/* next character */
-		lastc = c;
-		if (p == m->endp) {
-			c = OUT;
-			clen = 0;
-		} else
-			clen = XMBRTOWC(&c, p, m->endp - p, &m->mbs, BADCHAR);
-
-		/* is there an EOL and/or BOL between lastc and c? */
-		flagch = '\0';
-		i = 0;
-		if ( (lastc == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(lastc == OUT && !(m->eflags&REG_NOTBOL)) ) {
-			flagch = BOL;
-			i = m->g->nbol;
-		}
-		if ( (c == '\n' && m->g->cflags&REG_NEWLINE) ||
-				(c == OUT && !(m->eflags&REG_NOTEOL)) ) {
-			flagch = (flagch == BOL) ? BOLEOL : EOL;
-			i += m->g->neol;
-		}
-		if (i != 0) {
-			for (; i > 0; i--)
-				st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboleol", st, c);
-		}
-
-		/* how about a word boundary? */
-		if ( (flagch == BOL || (lastc != OUT && !ISWORD(lastc))) &&
-					(c != OUT && ISWORD(c)) ) {
-			flagch = BOW;
-		}
-		if ( (lastc != OUT && ISWORD(lastc)) &&
-				(flagch == EOL || (c != OUT && !ISWORD(c))) ) {
-			flagch = EOW;
-		}
-		if (flagch == BOW || flagch == EOW) {
-			st = step(m->g, startst, stopst, st, flagch, st);
-			SP("sboweow", st, c);
-		}
-
-		/* are we done? */
-		if (ISSET(st, stopst))
-			matchp = p;
-		if (EQ(st, empty) || p == stop || clen > stop - p)
-			break;		/* NOTE BREAK OUT */
-
-		/* no, we must deal with this character */
-		ASSIGN(tmp, st);
-		ASSIGN(st, empty);
-		assert(c != OUT);
-		st = step(m->g, startst, stopst, tmp, c, st);
-		SP("saft", st, c);
-		assert(EQ(step(m->g, startst, stopst, st, NOTHING, st), st));
-		p += clen;
-	}
-
-	return(matchp);
-}
-
-
-/*
- - step - map set of states reachable before char to set reachable after
- == static states step(struct re_guts *g, sopno start, sopno stop, \
- ==	states bef, int ch, states aft);
- == #define	BOL	(OUT-1)
- == #define	EOL	(BOL-1)
- == #define	BOLEOL	(BOL-2)
- == #define	NOTHING	(BOL-3)
- == #define	BOW	(BOL-4)
- == #define	EOW	(BOL-5)
- == #define	BADCHAR	(BOL-6)
- == #define	NONCHAR(c)	((c) <= OUT)
- */
-static states
-step(struct re_guts *g,
-	sopno start,		/* start state within strip */
-	sopno stop,		/* state after stop state within strip */
-	states bef,		/* states reachable before */
-	wint_t ch,		/* character or NONCHAR code */
-	states aft)		/* states already known reachable after */
-{
-	cset *cs;
-	sop s;
-	sopno pc;
-	onestate here;		/* note, macros know this name */
-	sopno look;
-	int i;
-
-	for (pc = start, INIT(here, pc); pc != stop; pc++, INC(here)) {
-		s = g->strip[pc];
-		switch (OP(s)) {
-		case OEND:
-			assert(pc == stop-1);
-			break;
-		case OCHAR:
-			/* only characters can match */
-			assert(!NONCHAR(ch) || ch != OPND(s));
-			if (ch == OPND(s))
-				FWD(aft, bef, 1);
-			break;
-		case OBOL:
-			if (ch == BOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OEOL:
-			if (ch == EOL || ch == BOLEOL)
-				FWD(aft, bef, 1);
-			break;
-		case OBOW:
-			if (ch == BOW)
-				FWD(aft, bef, 1);
-			break;
-		case OEOW:
-			if (ch == EOW)
-				FWD(aft, bef, 1);
-			break;
-		case OANY:
-			if (!NONCHAR(ch))
-				FWD(aft, bef, 1);
-			break;
-		case OANYOF:
-			cs = &g->sets[OPND(s)];
-			if (!NONCHAR(ch) && CHIN(cs, ch))
-				FWD(aft, bef, 1);
-			break;
-		case OBACK_:		/* ignored here */
-		case O_BACK:
-			FWD(aft, aft, 1);
-			break;
-		case OPLUS_:		/* forward, this is just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case O_PLUS:		/* both forward and back */
-			FWD(aft, aft, 1);
-			i = ISSETBACK(aft, OPND(s));
-			BACK(aft, aft, OPND(s));
-			if (!i && ISSETBACK(aft, OPND(s))) {
-				/* oho, must reconsider loop body */
-				pc -= OPND(s) + 1;
-				INIT(here, pc);
-			}
-			break;
-		case OQUEST_:		/* two branches, both forward */
-			FWD(aft, aft, 1);
-			FWD(aft, aft, OPND(s));
-			break;
-		case O_QUEST:		/* just an empty */
-			FWD(aft, aft, 1);
-			break;
-		case OLPAREN:		/* not significant here */
-		case ORPAREN:
-			FWD(aft, aft, 1);
-			break;
-		case OCH_:		/* mark the first two branches */
-			FWD(aft, aft, 1);
-			assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-			FWD(aft, aft, OPND(s));
-			break;
-		case OOR1:		/* done a branch, find the O_CH */
-			if (ISSTATEIN(aft, here)) {
-				for (look = 1;
-						OP(s = g->strip[pc+look]) != O_CH;
-						look += OPND(s))
-					assert(OP(s) == OOR2);
-				FWD(aft, aft, look + 1);
-			}
-			break;
-		case OOR2:		/* propagate OCH_'s marking */
-			FWD(aft, aft, 1);
-			if (OP(g->strip[pc+OPND(s)]) != O_CH) {
-				assert(OP(g->strip[pc+OPND(s)]) == OOR2);
-				FWD(aft, aft, OPND(s));
-			}
-			break;
-		case O_CH:		/* just empty */
-			FWD(aft, aft, 1);
-			break;
-		default:		/* ooooops... */
-			assert(nope);
-			break;
-		}
-	}
-
-	return(aft);
-}
-
-#ifdef REDEBUG
-/*
- - print - print a set of states
- == #ifdef REDEBUG
- == static void print(struct match *m, const char *caption, states st, \
- ==	int ch, FILE *d);
- == #endif
- */
-static void
-print(struct match *m,
-	const char *caption,
-	states st,
-	int ch,
-	FILE *d)
-{
-	struct re_guts *g = m->g;
-	int i;
-	int first = 1;
-
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	fprintf(d, "%s", caption);
-	if (ch != '\0')
-		fprintf(d, " %s", pchar(ch));
-	for (i = 0; i < g->nstates; i++)
-		if (ISSET(st, i)) {
-			fprintf(d, "%s%d", (first) ? "\t" : ", ", i);
-			first = 0;
-		}
-	fprintf(d, "\n");
-}
-
-/*
- - at - print current situation
- == #ifdef REDEBUG
- == static void at(struct match *m, const char *title, const char *start, \
- ==			 const char *stop, sopno startst, sopno stopst);
- == #endif
- */
-static void
-at(	struct match *m,
-	const char *title,
-	const char *start,
-	const char *stop,
-	sopno startst,
-	sopno stopst)
-{
-	if (!(m->eflags&REG_TRACE))
-		return;
-
-	printf("%s %s-", title, pchar(*start));
-	printf("%s ", pchar(*stop));
-	printf("%ld-%ld\n", (long)startst, (long)stopst);
-}
-
-#ifndef PCHARDONE
-#define	PCHARDONE	/* never again */
-/*
- - pchar - make a character printable
- == #ifdef REDEBUG
- == static const char *pchar(int ch);
- == #endif
- *
- * Is this identical to regchar() over in debug.c?  Well, yes.  But a
- * duplicate here avoids having a debugging-capable regexec.o tied to
- * a matching debug.o, and this is convenient.  It all disappears in
- * the non-debug compilation anyway, so it doesn't matter much.
- */
-static const char *		/* -> representation */
-pchar(int ch)
-{
-	static char pbuf[10];
-
-	if (isprint((uch)ch) || ch == ' ')
-		sprintf(pbuf, "%c", ch);
-	else
-		sprintf(pbuf, "\\%o", ch);
-	return(pbuf);
-}
-#endif
-#endif
-
-#undef	matcher
-#undef	fast
-#undef	slow
-#undef	dissect
-#undef	backref
-#undef	step
-#undef	print
-#undef	at
-#undef	match
diff --git a/lib/libc_bsd/regex/grot/Makefile b/lib/libc_bsd/regex/grot/Makefile
deleted file mode 100644
index 1c58b71..0000000
--- a/lib/libc_bsd/regex/grot/Makefile
+++ /dev/null
@@ -1,98 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/regex/grot/Makefile 132390 2004-07-19 08:48:17Z tjr $
-# You probably want to take -DREDEBUG out of CFLAGS, and put something like
-# -O in, *after* testing (-DREDEBUG strengthens testing by enabling a lot of
-# internal assertion checking).  Take -Dconst= out for an ANSI compiler.
-# Do not take -DPOSIX_MISTAKE out.  REGCFLAGS isn't important to you (it's
-# for my use in some special contexts).
-
-PATHS= ${.CURDIR}/.. ${.CURDIR}/../../locale ${.CURDIR}/../../../../include
-.PATH: ${PATHS}
-
-CFLAGS+= -DPOSIX_MISTAKE -DREDEBUG $(REGCFLAGS)
-.for incpath in ${PATHS}
-CFLAGS+= -I${incpath}
-.endfor
-
-# If you have an ANSI compiler, take -o out of MKHFLAGS.  If you want
-# the Berkeley __P macro, put -b in.
-MKHFLAGS =
-
-LDFLAGS =
-
-# If you have an ANSI environment, take limits.h and stdlib.h out of
-# HMISSING and take memmove out of SRCMISSING and OBJMISSING.
-HMISSING =
-SRCMISSING = split.c
-OBJMISSING = split.o
-H = cname.h regex2.h utils.h $(HMISSING)
-REGSRC = regcomp.c regerror.c regexec.c regfree.c engine.c
-SRC = $(REGSRC) debug.c main.c $(SRCMISSING)
-
-# Internal stuff, should not need changing.
-OBJPRODN = regcomp.o regexec.o regerror.o regfree.o
-OBJS = $(OBJPRODN) debug.o main.o $(OBJMISSING)
-
-# Stuff that matters only if you're trying to lint the package.
-LINTFLAGS = -I. -Dstatic= -Dconst= -DREDEBUG
-LINTC = regcomp.c regexec.c regerror.c regfree.c debug.c main.c $(SRCMISSING)
-JUNKLINT =possible pointer alignment|null effect
-
-.SUFFIXES:	.ih .h
-.c.ih:
-	sh mkh $(MKHFLAGS) -p $< >$@
-
-default:	r
-
-re:	$(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@
-
-o:	$(OBJPRODN)
-
-REGEXHSRC = ../regex2.h ../reg*.c
-h:	$(REGEXHSRC)
-	sh mkh $(MKHFLAGS) -i _REGEX_H_ $(REGEXHSRC) >regex.tmp
-	cmp -s regex.tmp regex.h 2>/dev/null || cp regex.tmp regex.h
-	rm -f regex.tmp
-
-regex.h: h
-
-regcomp.o regexec.o regfree.o debug.o:	utils.h regex.h regex2.h
-regcomp.o:	cname.h regcomp.ih
-regexec.o:	engine.c engine.ih
-regerror.o:	regerror.ih
-regerror.o:	utils.h
-debug.o:	debug.ih
-main.o:	main.ih
-
-r:	re tests
-	./re <tests
-	./re -el <tests
-	./re -er <tests
-
-ra:	./re tests
-	-./re <tests
-	-./re -el <tests
-	-./re -er <tests
-
-rx:	./re tests
-	./re -x <tests
-	./re -x -el <tests
-	./re -x -er <tests
-
-t:	./re tests
-	-time ./re <tests
-	-time ./re -cs <tests
-	-time ./re -el <tests
-	-time ./re -cs -el <tests
-
-l:	$(LINTC)
-	lint $(LINTFLAGS) -h $(LINTC) 2>&1 | egrep -v '$(JUNKLINT)' | tee lint
-
-clean:	tidy
-	rm -f *.o *.s *.ih re
-
-tidy:
-	rm -f junk* core regex.tmp lint
-
-spotless:	clean
-	rm -f regex.h
diff --git a/lib/libc_bsd/regex/grot/debug.c b/lib/libc_bsd/regex/grot/debug.c
deleted file mode 100644
index 50b9799..0000000
--- a/lib/libc_bsd/regex/grot/debug.c
+++ /dev/null
@@ -1,212 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/regex/grot/debug.c 132388 2004-07-19 08:28:53Z tjr $");
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <regex.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "utils.h"
-#include "regex2.h"
-#include "debug.ih"
-
-/*
- - regprint - print a regexp for debugging
- == void regprint(regex_t *r, FILE *d);
- */
-void
-regprint(r, d)
-regex_t *r;
-FILE *d;
-{
-	struct re_guts *g = r->re_g;
-	int i;
-	int c;
-	int last;
-
-	fprintf(d, "%ld states", (long)g->nstates);
-	fprintf(d, ", first %ld last %ld", (long)g->firststate,
-						(long)g->laststate);
-	if (g->iflags&USEBOL)
-		fprintf(d, ", USEBOL");
-	if (g->iflags&USEEOL)
-		fprintf(d, ", USEEOL");
-	if (g->iflags&BAD)
-		fprintf(d, ", BAD");
-	if (g->nsub > 0)
-		fprintf(d, ", nsub=%ld", (long)g->nsub);
-	if (g->must != NULL)
-		fprintf(d, ", must(%ld) `%*s'", (long)g->mlen, (int)g->mlen,
-								g->must);
-	if (g->backrefs)
-		fprintf(d, ", backrefs");
-	if (g->nplus > 0)
-		fprintf(d, ", nplus %ld", (long)g->nplus);
-	fprintf(d, "\n");
-	s_print(g, d);
-}
-
-/*
- - s_print - print the strip for debugging
- == static void s_print(struct re_guts *g, FILE *d);
- */
-static void
-s_print(g, d)
-struct re_guts *g;
-FILE *d;
-{
-	sop *s;
-	cset *cs;
-	int i;
-	int done = 0;
-	sop opnd;
-	int col = 0;
-	int last;
-	sopno offset = 2;
-#	define	GAP()	{	if (offset % 5 == 0) { \
-					if (col > 40) { \
-						fprintf(d, "\n\t"); \
-						col = 0; \
-					} else { \
-						fprintf(d, " "); \
-						col++; \
-					} \
-				} else \
-					col++; \
-				offset++; \
-			}
-
-	if (OP(g->strip[0]) != OEND)
-		fprintf(d, "missing initial OEND!\n");
-	for (s = &g->strip[1]; !done; s++) {
-		opnd = OPND(*s);
-		switch (OP(*s)) {
-		case OEND:
-			fprintf(d, "\n");
-			done = 1;
-			break;
-		case OCHAR:
-			if (strchr("\\|()^$.[+*?{}!<> ", (char)opnd) != NULL)
-				fprintf(d, "\\%c", (char)opnd);
-			else
-				fprintf(d, "%s", regchar((char)opnd));
-			break;
-		case OBOL:
-			fprintf(d, "^");
-			break;
-		case OEOL:
-			fprintf(d, "$");
-			break;
-		case OBOW:
-			fprintf(d, "\\{");
-			break;
-		case OEOW:
-			fprintf(d, "\\}");
-			break;
-		case OANY:
-			fprintf(d, ".");
-			break;
-		case OANYOF:
-			fprintf(d, "[(%ld)", (long)opnd);
-#if 0
-			cs = &g->sets[opnd];
-			last = -1;
-			for (i = 0; i < g->csetsize+1; i++)	/* +1 flushes */
-				if (CHIN(cs, i) && i < g->csetsize) {
-					if (last < 0) {
-						fprintf(d, "%s", regchar(i));
-						last = i;
-					}
-				} else {
-					if (last >= 0) {
-						if (last != i-1)
-							fprintf(d, "-%s",
-								regchar(i-1));
-						last = -1;
-					}
-				}
-#endif
-			fprintf(d, "]");
-			break;
-		case OBACK_:
-			fprintf(d, "(\\<%ld>", (long)opnd);
-			break;
-		case O_BACK:
-			fprintf(d, "<%ld>\\)", (long)opnd);
-			break;
-		case OPLUS_:
-			fprintf(d, "(+");
-			if (OP(*(s+opnd)) != O_PLUS)
-				fprintf(d, "<%ld>", (long)opnd);
-			break;
-		case O_PLUS:
-			if (OP(*(s-opnd)) != OPLUS_)
-				fprintf(d, "<%ld>", (long)opnd);
-			fprintf(d, "+)");
-			break;
-		case OQUEST_:
-			fprintf(d, "(?");
-			if (OP(*(s+opnd)) != O_QUEST)
-				fprintf(d, "<%ld>", (long)opnd);
-			break;
-		case O_QUEST:
-			if (OP(*(s-opnd)) != OQUEST_)
-				fprintf(d, "<%ld>", (long)opnd);
-			fprintf(d, "?)");
-			break;
-		case OLPAREN:
-			fprintf(d, "((<%ld>", (long)opnd);
-			break;
-		case ORPAREN:
-			fprintf(d, "<%ld>))", (long)opnd);
-			break;
-		case OCH_:
-			fprintf(d, "<");
-			if (OP(*(s+opnd)) != OOR2)
-				fprintf(d, "<%ld>", (long)opnd);
-			break;
-		case OOR1:
-			if (OP(*(s-opnd)) != OOR1 && OP(*(s-opnd)) != OCH_)
-				fprintf(d, "<%ld>", (long)opnd);
-			fprintf(d, "|");
-			break;
-		case OOR2:
-			fprintf(d, "|");
-			if (OP(*(s+opnd)) != OOR2 && OP(*(s+opnd)) != O_CH)
-				fprintf(d, "<%ld>", (long)opnd);
-			break;
-		case O_CH:
-			if (OP(*(s-opnd)) != OOR1)
-				fprintf(d, "<%ld>", (long)opnd);
-			fprintf(d, ">");
-			break;
-		default:
-			fprintf(d, "!%d(%d)!", OP(*s), opnd);
-			break;
-		}
-		if (!done)
-			GAP();
-	}
-}
-
-/*
- - regchar - make a character printable
- == static char *regchar(int ch);
- */
-static char *			/* -> representation */
-regchar(ch)
-int ch;
-{
-	static char buf[10];
-
-	if (isprint(ch) || ch == ' ')
-		sprintf(buf, "%c", ch);
-	else
-		sprintf(buf, "\\%o", ch);
-	return(buf);
-}
diff --git a/lib/libc_bsd/regex/grot/main.c b/lib/libc_bsd/regex/grot/main.c
deleted file mode 100644
index 920196e..0000000
--- a/lib/libc_bsd/regex/grot/main.c
+++ /dev/null
@@ -1,513 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/regex/grot/main.c 176380 2008-02-18 03:19:25Z kevlo $");
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <regex.h>
-#include <assert.h>
-
-#include "main.ih"
-
-char *progname;
-int debug = 0;
-int line = 0;
-int status = 0;
-
-int copts = REG_EXTENDED;
-int eopts = 0;
-regoff_t startoff = 0;
-regoff_t endoff = 0;
-
-
-extern int split();
-extern void regprint();
-
-/*
- - main - do the simple case, hand off to regress() for regression
- */
-main(argc, argv)
-int argc;
-char *argv[];
-{
-	regex_t re;
-#	define	NS	10
-	regmatch_t subs[NS];
-	char erbuf[100];
-	int err;
-	size_t len;
-	int c;
-	int errflg = 0;
-	int i;
-	extern int optind;
-	extern char *optarg;
-
-	progname = argv[0];
-
-	while ((c = getopt(argc, argv, "c:e:S:E:x")) != -1)
-		switch (c) {
-		case 'c':	/* compile options */
-			copts = options('c', optarg);
-			break;
-		case 'e':	/* execute options */
-			eopts = options('e', optarg);
-			break;
-		case 'S':	/* start offset */
-			startoff = (regoff_t)atoi(optarg);
-			break;
-		case 'E':	/* end offset */
-			endoff = (regoff_t)atoi(optarg);
-			break;
-		case 'x':	/* Debugging. */
-			debug++;
-			break;
-		case '?':
-		default:
-			errflg++;
-			break;
-		}
-	if (errflg) {
-		fprintf(stderr, "usage: %s ", progname);
-		fprintf(stderr, "[-c copt][-C][-d] [re]\n");
-		exit(2);
-	}
-
-	if (optind >= argc) {
-		regress(stdin);
-		exit(status);
-	}
-
-	err = regcomp(&re, argv[optind++], copts);
-	if (err) {
-		len = regerror(err, &re, erbuf, sizeof(erbuf));
-		fprintf(stderr, "error %s, %d/%d `%s'\n",
-			eprint(err), len, sizeof(erbuf), erbuf);
-		exit(status);
-	}
-	regprint(&re, stdout);	
-
-	if (optind >= argc) {
-		regfree(&re);
-		exit(status);
-	}
-
-	if (eopts&REG_STARTEND) {
-		subs[0].rm_so = startoff;
-		subs[0].rm_eo = strlen(argv[optind]) - endoff;
-	}
-	err = regexec(&re, argv[optind], (size_t)NS, subs, eopts);
-	if (err) {
-		len = regerror(err, &re, erbuf, sizeof(erbuf));
-		fprintf(stderr, "error %s, %d/%d `%s'\n",
-			eprint(err), len, sizeof(erbuf), erbuf);
-		exit(status);
-	}
-	if (!(copts&REG_NOSUB)) {
-		len = (int)(subs[0].rm_eo - subs[0].rm_so);
-		if (subs[0].rm_so != -1) {
-			if (len != 0)
-				printf("match `%.*s'\n", len,
-					argv[optind] + subs[0].rm_so);
-			else
-				printf("match `'@%.1s\n",
-					argv[optind] + subs[0].rm_so);
-		}
-		for (i = 1; i < NS; i++)
-			if (subs[i].rm_so != -1)
-				printf("(%d) `%.*s'\n", i,
-					(int)(subs[i].rm_eo - subs[i].rm_so),
-					argv[optind] + subs[i].rm_so);
-	}
-	exit(status);
-}
-
-/*
- - regress - main loop of regression test
- == void regress(FILE *in);
- */
-void
-regress(in)
-FILE *in;
-{
-	char inbuf[1000];
-#	define	MAXF	10
-	char *f[MAXF];
-	int nf;
-	int i;
-	char erbuf[100];
-	size_t ne;
-	char *badpat = "invalid regular expression";
-#	define	SHORT	10
-	char *bpname = "REG_BADPAT";
-	regex_t re;
-
-	while (fgets(inbuf, sizeof(inbuf), in) != NULL) {
-		line++;
-		if (inbuf[0] == '#' || inbuf[0] == '\n')
-			continue;			/* NOTE CONTINUE */
-		inbuf[strlen(inbuf)-1] = '\0';	/* get rid of stupid \n */
-		if (debug)
-			fprintf(stdout, "%d:\n", line);
-		nf = split(inbuf, f, MAXF, "\t\t");
-		if (nf < 3) {
-			fprintf(stderr, "bad input, line %d\n", line);
-			exit(1);
-		}
-		for (i = 0; i < nf; i++)
-			if (strcmp(f[i], "\"\"") == 0)
-				f[i] = "";
-		if (nf <= 3)
-			f[3] = NULL;
-		if (nf <= 4)
-			f[4] = NULL;
-		try(f[0], f[1], f[2], f[3], f[4], options('c', f[1]));
-		if (opt('&', f[1]))	/* try with either type of RE */
-			try(f[0], f[1], f[2], f[3], f[4],
-					options('c', f[1]) &~ REG_EXTENDED);
-	}
-
-	ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
-	if (strcmp(erbuf, badpat) != 0 || ne != strlen(badpat)+1) {
-		fprintf(stderr, "end: regerror() test gave `%s' not `%s'\n",
-							erbuf, badpat);
-		status = 1;
-	}
-	ne = regerror(REG_BADPAT, (regex_t *)NULL, erbuf, (size_t)SHORT);
-	if (strncmp(erbuf, badpat, SHORT-1) != 0 || erbuf[SHORT-1] != '\0' ||
-						ne != strlen(badpat)+1) {
-		fprintf(stderr, "end: regerror() short test gave `%s' not `%.*s'\n",
-						erbuf, SHORT-1, badpat);
-		status = 1;
-	}
-	ne = regerror(REG_ITOA|REG_BADPAT, (regex_t *)NULL, erbuf, sizeof(erbuf));
-	if (strcmp(erbuf, bpname) != 0 || ne != strlen(bpname)+1) {
-		fprintf(stderr, "end: regerror() ITOA test gave `%s' not `%s'\n",
-						erbuf, bpname);
-		status = 1;
-	}
-	re.re_endp = bpname;
-	ne = regerror(REG_ATOI, &re, erbuf, sizeof(erbuf));
-	if (atoi(erbuf) != (int)REG_BADPAT) {
-		fprintf(stderr, "end: regerror() ATOI test gave `%s' not `%ld'\n",
-						erbuf, (long)REG_BADPAT);
-		status = 1;
-	} else if (ne != strlen(erbuf)+1) {
-		fprintf(stderr, "end: regerror() ATOI test len(`%s') = %ld\n",
-						erbuf, (long)REG_BADPAT);
-		status = 1;
-	}
-}
-
-/*
- - try - try it, and report on problems
- == void try(char *f0, char *f1, char *f2, char *f3, char *f4, int opts);
- */
-void
-try(f0, f1, f2, f3, f4, opts)
-char *f0;
-char *f1;
-char *f2;
-char *f3;
-char *f4;
-int opts;			/* may not match f1 */
-{
-	regex_t re;
-#	define	NSUBS	10
-	regmatch_t subs[NSUBS];
-#	define	NSHOULD	15
-	char *should[NSHOULD];
-	int nshould;
-	char erbuf[100];
-	int err;
-	int len;
-	char *type = (opts & REG_EXTENDED) ? "ERE" : "BRE";
-	int i;
-	char *grump;
-	char f0copy[1000];
-	char f2copy[1000];
-
-	strcpy(f0copy, f0);
-	re.re_endp = (opts&REG_PEND) ? f0copy + strlen(f0copy) : NULL;
-	fixstr(f0copy);
-	err = regcomp(&re, f0copy, opts);
-	if (err != 0 && (!opt('C', f1) || err != efind(f2))) {
-		/* unexpected error or wrong error */
-		len = regerror(err, &re, erbuf, sizeof(erbuf));
-		fprintf(stderr, "%d: %s error %s, %d/%d `%s'\n",
-					line, type, eprint(err), len,
-					sizeof(erbuf), erbuf);
-		status = 1;
-	} else if (err == 0 && opt('C', f1)) {
-		/* unexpected success */
-		fprintf(stderr, "%d: %s should have given REG_%s\n",
-						line, type, f2);
-		status = 1;
-		err = 1;	/* so we won't try regexec */
-	}
-
-	if (err != 0) {
-		regfree(&re);
-		return;
-	}
-
-	strcpy(f2copy, f2);
-	fixstr(f2copy);
-
-	if (options('e', f1)&REG_STARTEND) {
-		if (strchr(f2, '(') == NULL || strchr(f2, ')') == NULL)
-			fprintf(stderr, "%d: bad STARTEND syntax\n", line);
-		subs[0].rm_so = strchr(f2, '(') - f2 + 1;
-		subs[0].rm_eo = strchr(f2, ')') - f2;
-	}
-	err = regexec(&re, f2copy, NSUBS, subs, options('e', f1));
-
-	if (err != 0 && (f3 != NULL || err != REG_NOMATCH)) {
-		/* unexpected error or wrong error */
-		len = regerror(err, &re, erbuf, sizeof(erbuf));
-		fprintf(stderr, "%d: %s exec error %s, %d/%d `%s'\n",
-					line, type, eprint(err), len,
-					sizeof(erbuf), erbuf);
-		status = 1;
-	} else if (err != 0) {
-		/* nothing more to check */
-	} else if (f3 == NULL) {
-		/* unexpected success */
-		fprintf(stderr, "%d: %s exec should have failed\n",
-						line, type);
-		status = 1;
-		err = 1;		/* just on principle */
-	} else if (opts&REG_NOSUB) {
-		/* nothing more to check */
-	} else if ((grump = check(f2, subs[0], f3)) != NULL) {
-		fprintf(stderr, "%d: %s %s\n", line, type, grump);
-		status = 1;
-		err = 1;
-	}
-
-	if (err != 0 || f4 == NULL) {
-		regfree(&re);
-		return;
-	}
-
-	for (i = 1; i < NSHOULD; i++)
-		should[i] = NULL;
-	nshould = split(f4, should+1, NSHOULD-1, ",");
-	if (nshould == 0) {
-		nshould = 1;
-		should[1] = "";
-	}
-	for (i = 1; i < NSUBS; i++) {
-		grump = check(f2, subs[i], should[i]);
-		if (grump != NULL) {
-			fprintf(stderr, "%d: %s $%d %s\n", line,
-							type, i, grump);
-			status = 1;
-			err = 1;
-		}
-	}
-
-	regfree(&re);
-}
-
-/*
- - options - pick options out of a regression-test string
- == int options(int type, char *s);
- */
-int
-options(type, s)
-int type;			/* 'c' compile, 'e' exec */
-char *s;
-{
-	char *p;
-	int o = (type == 'c') ? copts : eopts;
-	char *legal = (type == 'c') ? "bisnmp" : "^$#tl";
-
-	for (p = s; *p != '\0'; p++)
-		if (strchr(legal, *p) != NULL)
-			switch (*p) {
-			case 'b':
-				o &= ~REG_EXTENDED;
-				break;
-			case 'i':
-				o |= REG_ICASE;
-				break;
-			case 's':
-				o |= REG_NOSUB;
-				break;
-			case 'n':
-				o |= REG_NEWLINE;
-				break;
-			case 'm':
-				o &= ~REG_EXTENDED;
-				o |= REG_NOSPEC;
-				break;
-			case 'p':
-				o |= REG_PEND;
-				break;
-			case '^':
-				o |= REG_NOTBOL;
-				break;
-			case '$':
-				o |= REG_NOTEOL;
-				break;
-			case '#':
-				o |= REG_STARTEND;
-				break;
-			case 't':	/* trace */
-				o |= REG_TRACE;
-				break;
-			case 'l':	/* force long representation */
-				o |= REG_LARGE;
-				break;
-			case 'r':	/* force backref use */
-				o |= REG_BACKR;
-				break;
-			}
-	return(o);
-}
-
-/*
- - opt - is a particular option in a regression string?
- == int opt(int c, char *s);
- */
-int				/* predicate */
-opt(c, s)
-int c;
-char *s;
-{
-	return(strchr(s, c) != NULL);
-}
-
-/*
- - fixstr - transform magic characters in strings
- == void fixstr(char *p);
- */
-void
-fixstr(p)
-char *p;
-{
-	if (p == NULL)
-		return;
-
-	for (; *p != '\0'; p++)
-		if (*p == 'N')
-			*p = '\n';
-		else if (*p == 'T')
-			*p = '\t';
-		else if (*p == 'S')
-			*p = ' ';
-		else if (*p == 'Z')
-			*p = '\0';
-}
-
-/*
- - check - check a substring match
- == char *check(char *str, regmatch_t sub, char *should);
- */
-char *				/* NULL or complaint */
-check(str, sub, should)
-char *str;
-regmatch_t sub;
-char *should;
-{
-	int len;
-	int shlen;
-	char *p;
-	static char grump[500];
-	char *at = NULL;
-
-	if (should != NULL && strcmp(should, "-") == 0)
-		should = NULL;
-	if (should != NULL && should[0] == '@') {
-		at = should + 1;
-		should = "";
-	}
-
-	/* check rm_so and rm_eo for consistency */
-	if (sub.rm_so > sub.rm_eo || (sub.rm_so == -1 && sub.rm_eo != -1) ||
-				(sub.rm_so != -1 && sub.rm_eo == -1) ||
-				(sub.rm_so != -1 && sub.rm_so < 0) ||
-				(sub.rm_eo != -1 && sub.rm_eo < 0) ) {
-		sprintf(grump, "start %ld end %ld", (long)sub.rm_so,
-							(long)sub.rm_eo);
-		return(grump);
-	}
-
-	/* check for no match */
-	if (sub.rm_so == -1 && should == NULL)
-		return(NULL);
-	if (sub.rm_so == -1)
-		return("did not match");
-
-	/* check for in range */
-	if (sub.rm_eo > strlen(str)) {
-		sprintf(grump, "start %ld end %ld, past end of string",
-					(long)sub.rm_so, (long)sub.rm_eo);
-		return(grump);
-	}
-
-	len = (int)(sub.rm_eo - sub.rm_so);
-	shlen = (int)strlen(should);
-	p = str + sub.rm_so;
-
-	/* check for not supposed to match */
-	if (should == NULL) {
-		sprintf(grump, "matched `%.*s'", len, p);
-		return(grump);
-	}
-
-	/* check for wrong match */
-	if (len != shlen || strncmp(p, should, (size_t)shlen) != 0) {
-		sprintf(grump, "matched `%.*s' instead", len, p);
-		return(grump);
-	}
-	if (shlen > 0)
-		return(NULL);
-
-	/* check null match in right place */
-	if (at == NULL)
-		return(NULL);
-	shlen = strlen(at);
-	if (shlen == 0)
-		shlen = 1;	/* force check for end-of-string */
-	if (strncmp(p, at, shlen) != 0) {
-		sprintf(grump, "matched null at `%.20s'", p);
-		return(grump);
-	}
-	return(NULL);
-}
-
-/*
- - eprint - convert error number to name
- == static char *eprint(int err);
- */
-static char *
-eprint(err)
-int err;
-{
-	static char epbuf[100];
-	size_t len;
-
-	len = regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
-	assert(len <= sizeof(epbuf));
-	return(epbuf);
-}
-
-/*
- - efind - convert error name to number
- == static int efind(char *name);
- */
-static int
-efind(name)
-char *name;
-{
-	static char efbuf[100];
-	size_t n;
-	regex_t re;
-
-	sprintf(efbuf, "REG_%s", name);
-	assert(strlen(efbuf) < sizeof(efbuf));
-	re.re_endp = efbuf;
-	(void) regerror(REG_ATOI, &re, efbuf, sizeof(efbuf));
-	return(atoi(efbuf));
-}
diff --git a/lib/libc_bsd/regex/grot/mkh b/lib/libc_bsd/regex/grot/mkh
deleted file mode 100755
index cae6f74..0000000
--- a/lib/libc_bsd/regex/grot/mkh
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh
-# mkh - pull headers out of C source
-# $FreeBSD: releng/10.2/lib/libc/regex/grot/mkh 92971 2002-03-22 19:45:43Z obrien $
-PATH=/bin:/usr/bin ; export PATH
-
-# egrep pattern to pick out marked lines
-egrep='^ =([ 	]|$)'
-
-# Sed program to process marked lines into lines for the header file.
-# The markers have already been removed.  Two things are done here:  removal
-# of backslashed newlines, and some fudging of comments.  The first is done
-# because -o needs to have prototypes on one line to strip them down.
-# Getting comments into the output is tricky; we turn C++-style // comments
-# into /* */ comments, after altering any existing */'s to avoid trouble.
-peel='	/\\$/N
-	/\\\n[ 	]*/s///g
-	/\/\//s;\*/;* /;g
-	/\/\//s;//\(.*\);/*\1 */;'
-
-for a
-do
-	case "$a" in
-	-o)	# old (pre-function-prototype) compiler
-		# add code to comment out argument lists
-		peel="$peel
-			"'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1(/*\2*/);'
-		shift
-		;;
-	-b)	# funny Berkeley __P macro
-		peel="$peel
-			"'/^\([^#\/][^\/]*[a-zA-Z0-9_)]\)(\(.*\))/s;;\1 __P((\2));'
-		shift
-		;;
-	-s)	# compiler doesn't like `static foo();'
-		# add code to get rid of the `static'
-		peel="$peel
-			"'/^static[ 	][^\/]*[a-zA-Z0-9_)](.*)/s;static.;;'
-		shift
-		;;
-	-p)	# private declarations
-		egrep='^ ==([ 	]|$)'
-		shift
-		;;
-	-i)	# wrap in #ifndef, argument is name
-		ifndef="$2"
-		shift ; shift
-		;;
-	*)	break
-		;;
-	esac
-done
-
-if test " $ifndef" != " "
-then
-	echo "#ifndef $ifndef"
-	echo "#define	$ifndef	/* never again */"
-fi
-echo "/* ========= begin header generated by $0 ========= */"
-echo '#ifdef __cplusplus'
-echo 'extern "C" {'
-echo '#endif'
-for f
-do
-	echo
-	echo "/* === $f === */"
-	egrep "$egrep" $f | sed 's/^ ==*[ 	]//;s/^ ==*$//' | sed "$peel"
-	echo
-done
-echo '#ifdef __cplusplus'
-echo '}'
-echo '#endif'
-echo "/* ========= end header generated by $0 ========= */"
-if test " $ifndef" != " "
-then
-	echo "#endif"
-fi
-exit 0
diff --git a/lib/libc_bsd/regex/grot/split.c b/lib/libc_bsd/regex/grot/split.c
deleted file mode 100644
index cb917da..0000000
--- a/lib/libc_bsd/regex/grot/split.c
+++ /dev/null
@@ -1,319 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/regex/grot/split.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#include <stdio.h>
-#include <string.h>
-
-/*
- - split - divide a string into fields, like awk split()
- = int split(char *string, char *fields[], int nfields, char *sep);
- */
-int				/* number of fields, including overflow */
-split(string, fields, nfields, sep)
-char *string;
-char *fields[];			/* list is not NULL-terminated */
-int nfields;			/* number of entries available in fields[] */
-char *sep;			/* "" white, "c" single char, "ab" [ab]+ */
-{
-	char *p = string;
-	char c;			/* latest character */
-	char sepc = sep[0];
-	char sepc2;
-	int fn;
-	char **fp = fields;
-	char *sepp;
-	int trimtrail;
-
-	/* white space */
-	if (sepc == '\0') {
-		while ((c = *p++) == ' ' || c == '\t')
-			continue;
-		p--;
-		trimtrail = 1;
-		sep = " \t";	/* note, code below knows this is 2 long */
-		sepc = ' ';
-	} else
-		trimtrail = 0;
-	sepc2 = sep[1];		/* now we can safely pick this up */
-
-	/* catch empties */
-	if (*p == '\0')
-		return(0);
-
-	/* single separator */
-	if (sepc2 == '\0') {
-		fn = nfields;
-		for (;;) {
-			*fp++ = p;
-			fn--;
-			if (fn == 0)
-				break;
-			while ((c = *p++) != sepc)
-				if (c == '\0')
-					return(nfields - fn);
-			*(p-1) = '\0';
-		}
-		/* we have overflowed the fields vector -- just count them */
-		fn = nfields;
-		for (;;) {
-			while ((c = *p++) != sepc)
-				if (c == '\0')
-					return(fn);
-			fn++;
-		}
-		/* not reached */
-	}
-
-	/* two separators */
-	if (sep[2] == '\0') {
-		fn = nfields;
-		for (;;) {
-			*fp++ = p;
-			fn--;
-			while ((c = *p++) != sepc && c != sepc2)
-				if (c == '\0') {
-					if (trimtrail && **(fp-1) == '\0')
-						fn++;
-					return(nfields - fn);
-				}
-			if (fn == 0)
-				break;
-			*(p-1) = '\0';
-			while ((c = *p++) == sepc || c == sepc2)
-				continue;
-			p--;
-		}
-		/* we have overflowed the fields vector -- just count them */
-		fn = nfields;
-		while (c != '\0') {
-			while ((c = *p++) == sepc || c == sepc2)
-				continue;
-			p--;
-			fn++;
-			while ((c = *p++) != '\0' && c != sepc && c != sepc2)
-				continue;
-		}
-		/* might have to trim trailing white space */
-		if (trimtrail) {
-			p--;
-			while ((c = *--p) == sepc || c == sepc2)
-				continue;
-			p++;
-			if (*p != '\0') {
-				if (fn == nfields+1)
-					*p = '\0';
-				fn--;
-			}
-		}
-		return(fn);
-	}
-
-	/* n separators */
-	fn = 0;
-	for (;;) {
-		if (fn < nfields)
-			*fp++ = p;
-		fn++;
-		for (;;) {
-			c = *p++;
-			if (c == '\0')
-				return(fn);
-			sepp = sep;
-			while ((sepc = *sepp++) != '\0' && sepc != c)
-				continue;
-			if (sepc != '\0')	/* it was a separator */
-				break;
-		}
-		if (fn < nfields)
-			*(p-1) = '\0';
-		for (;;) {
-			c = *p++;
-			sepp = sep;
-			while ((sepc = *sepp++) != '\0' && sepc != c)
-				continue;
-			if (sepc == '\0')	/* it wasn't a separator */
-				break;
-		}
-		p--;
-	}
-
-	/* not reached */
-}
-
-#ifdef TEST_SPLIT
-
-
-/*
- * test program
- * pgm		runs regression
- * pgm sep	splits stdin lines by sep
- * pgm str sep	splits str by sep
- * pgm str sep n	splits str by sep n times
- */
-int
-main(argc, argv)
-int argc;
-char *argv[];
-{
-	char buf[512];
-	int n;
-#	define	MNF	10
-	char *fields[MNF];
-
-	if (argc > 4)
-		for (n = atoi(argv[3]); n > 0; n--) {
-			(void) strcpy(buf, argv[1]);
-		}
-	else if (argc > 3)
-		for (n = atoi(argv[3]); n > 0; n--) {
-			(void) strcpy(buf, argv[1]);
-			(void) split(buf, fields, MNF, argv[2]);
-		}
-	else if (argc > 2)
-		dosplit(argv[1], argv[2]);
-	else if (argc > 1)
-		while (fgets(buf, sizeof(buf), stdin) != NULL) {
-			buf[strlen(buf)-1] = '\0';	/* stomp newline */
-			dosplit(buf, argv[1]);
-		}
-	else
-		regress();
-
-	exit(0);
-}
-
-dosplit(string, seps)
-char *string;
-char *seps;
-{
-#	define	NF	5
-	char *fields[NF];
-	int nf;
-
-	nf = split(string, fields, NF, seps);
-	print(nf, NF, fields);
-}
-
-print(nf, nfp, fields)
-int nf;
-int nfp;
-char *fields[];
-{
-	int fn;
-	int bound;
-
-	bound = (nf > nfp) ? nfp : nf;
-	printf("%d:\t", nf);
-	for (fn = 0; fn < bound; fn++)
-		printf("\"%s\"%s", fields[fn], (fn+1 < nf) ? ", " : "\n");
-}
-
-#define	RNF	5		/* some table entries know this */
-struct {
-	char *str;
-	char *seps;
-	int nf;
-	char *fi[RNF];
-} tests[] = {
-	"",		" ",	0,	{ "" },
-	" ",		" ",	2,	{ "", "" },
-	"x",		" ",	1,	{ "x" },
-	"xy",		" ",	1,	{ "xy" },
-	"x y",		" ",	2,	{ "x", "y" },
-	"abc def  g ",	" ",	5,	{ "abc", "def", "", "g", "" },
-	"  a bcd",	" ",	4,	{ "", "", "a", "bcd" },
-	"a b c d e f",	" ",	6,	{ "a", "b", "c", "d", "e f" },
-	" a b c d ",	" ",	6,	{ "", "a", "b", "c", "d " },
-
-	"",		" _",	0,	{ "" },
-	" ",		" _",	2,	{ "", "" },
-	"x",		" _",	1,	{ "x" },
-	"x y",		" _",	2,	{ "x", "y" },
-	"ab _ cd",	" _",	2,	{ "ab", "cd" },
-	" a_b  c ",	" _",	5,	{ "", "a", "b", "c", "" },
-	"a b c_d e f",	" _",	6,	{ "a", "b", "c", "d", "e f" },
-	" a b c d ",	" _",	6,	{ "", "a", "b", "c", "d " },
-
-	"",		" _~",	0,	{ "" },
-	" ",		" _~",	2,	{ "", "" },
-	"x",		" _~",	1,	{ "x" },
-	"x y",		" _~",	2,	{ "x", "y" },
-	"ab _~ cd",	" _~",	2,	{ "ab", "cd" },
-	" a_b  c~",	" _~",	5,	{ "", "a", "b", "c", "" },
-	"a b_c d~e f",	" _~",	6,	{ "a", "b", "c", "d", "e f" },
-	"~a b c d ",	" _~",	6,	{ "", "a", "b", "c", "d " },
-
-	"",		" _~-",	0,	{ "" },
-	" ",		" _~-",	2,	{ "", "" },
-	"x",		" _~-",	1,	{ "x" },
-	"x y",		" _~-",	2,	{ "x", "y" },
-	"ab _~- cd",	" _~-",	2,	{ "ab", "cd" },
-	" a_b  c~",	" _~-",	5,	{ "", "a", "b", "c", "" },
-	"a b_c-d~e f",	" _~-",	6,	{ "a", "b", "c", "d", "e f" },
-	"~a-b c d ",	" _~-",	6,	{ "", "a", "b", "c", "d " },
-
-	"",		"  ",	0,	{ "" },
-	" ",		"  ",	2,	{ "", "" },
-	"x",		"  ",	1,	{ "x" },
-	"xy",		"  ",	1,	{ "xy" },
-	"x y",		"  ",	2,	{ "x", "y" },
-	"abc def  g ",	"  ",	4,	{ "abc", "def", "g", "" },
-	"  a bcd",	"  ",	3,	{ "", "a", "bcd" },
-	"a b c d e f",	"  ",	6,	{ "a", "b", "c", "d", "e f" },
-	" a b c d ",	"  ",	6,	{ "", "a", "b", "c", "d " },
-
-	"",		"",	0,	{ "" },
-	" ",		"",	0,	{ "" },
-	"x",		"",	1,	{ "x" },
-	"xy",		"",	1,	{ "xy" },
-	"x y",		"",	2,	{ "x", "y" },
-	"abc def  g ",	"",	3,	{ "abc", "def", "g" },
-	"\t a bcd",	"",	2,	{ "a", "bcd" },
-	"  a \tb\t c ",	"",	3,	{ "a", "b", "c" },
-	"a b c d e ",	"",	5,	{ "a", "b", "c", "d", "e" },
-	"a b\tc d e f",	"",	6,	{ "a", "b", "c", "d", "e f" },
-	" a b c d e f ",	"",	6,	{ "a", "b", "c", "d", "e f " },
-
-	NULL,		NULL,	0,	{ NULL },
-};
-
-regress()
-{
-	char buf[512];
-	int n;
-	char *fields[RNF+1];
-	int nf;
-	int i;
-	int printit;
-	char *f;
-
-	for (n = 0; tests[n].str != NULL; n++) {
-		(void) strcpy(buf, tests[n].str);
-		fields[RNF] = NULL;
-		nf = split(buf, fields, RNF, tests[n].seps);
-		printit = 0;
-		if (nf != tests[n].nf) {
-			printf("split `%s' by `%s' gave %d fields, not %d\n",
-				tests[n].str, tests[n].seps, nf, tests[n].nf);
-			printit = 1;
-		} else if (fields[RNF] != NULL) {
-			printf("split() went beyond array end\n");
-			printit = 1;
-		} else {
-			for (i = 0; i < nf && i < RNF; i++) {
-				f = fields[i];
-				if (f == NULL)
-					f = "(NULL)";
-				if (strcmp(f, tests[n].fi[i]) != 0) {
-					printf("split `%s' by `%s' field %d is `%s', not `%s'\n",
-						tests[n].str, tests[n].seps,
-						i, fields[i], tests[n].fi[i]);
-					printit = 1;
-				}
-			}
-		}
-		if (printit)
-			print(nf, RNF, fields);
-	}
-}
-#endif
diff --git a/lib/libc_bsd/regex/grot/tests b/lib/libc_bsd/regex/grot/tests
deleted file mode 100644
index ae5dd02..0000000
--- a/lib/libc_bsd/regex/grot/tests
+++ /dev/null
@@ -1,477 +0,0 @@
-# regular expression test set
-# $FreeBSD: releng/10.2/lib/libc/regex/grot/tests 197234 2009-09-15 21:15:29Z dds $
-# Lines are at least three fields, separated by one or more tabs.  "" stands
-# for an empty field.  First field is an RE.  Second field is flags.  If
-# C flag given, regcomp() is expected to fail, and the third field is the
-# error name (minus the leading REG_).
-#
-# Otherwise it is expected to succeed, and the third field is the string to
-# try matching it against.  If there is no fourth field, the match is
-# expected to fail.  If there is a fourth field, it is the substring that
-# the RE is expected to match.  If there is a fifth field, it is a comma-
-# separated list of what the subexpressions should match, with - indicating
-# no match for that one.  In both the fourth and fifth fields, a (sub)field
-# starting with @ indicates that the (sub)expression is expected to match
-# a null string followed by the stuff after the @; this provides a way to
-# test where null strings match.  The character `N' in REs and strings
-# is newline, `S' is space, `T' is tab, `Z' is NUL.
-#
-# The full list of flags:
-#	-	placeholder, does nothing
-#	b	RE is a BRE, not an ERE
-#	&	try it as both an ERE and a BRE
-#	C	regcomp() error expected, third field is error name
-#	i	REG_ICASE
-#	m	("mundane") REG_NOSPEC
-#	s	REG_NOSUB (not really testable)
-#	n	REG_NEWLINE
-#	^	REG_NOTBOL
-#	$	REG_NOTEOL
-#	#	REG_STARTEND (see below)
-#	p	REG_PEND
-#
-# For REG_STARTEND, the start/end offsets are those of the substring
-# enclosed in ().
-
-# basics
-a		&	a	a
-abc		&	abc	abc
-abc|de		-	abc	abc
-a|b|c		-	abc	a
-
-# parentheses and perversions thereof
-a(b)c		-	abc	abc
-a\(b\)c		b	abc	abc
-a(		C	EPAREN
-a(		b	a(	a(
-a\(		-	a(	a(
-a\(		bC	EPAREN
-a\(b		bC	EPAREN
-a(b		C	EPAREN
-a(b		b	a(b	a(b
-# gag me with a right parenthesis -- 1003.2 goofed here (my fault, partly)
-a)		-	a)	a)
-)		-	)	)
-# end gagging (in a just world, those *should* give EPAREN)
-a)		b	a)	a)
-a\)		bC	EPAREN
-\)		bC	EPAREN
-a()b		-	ab	ab
-a\(\)b		b	ab	ab
-
-# anchoring and REG_NEWLINE
-^abc$		&	abc	abc
-a^b		-	a^b
-a^b		b	a^b	a^b
-a$b		-	a$b
-a$b		b	a$b	a$b
-^		&	abc	@abc
-$		&	abc	@
-^$		&	""	@
-$^		-	""	@
-\($\)\(^\)	b	""	@
-# stop retching, those are legitimate (although disgusting)
-^^		-	""	@
-$$		-	""	@
-b$		&	abNc
-b$		&n	abNc	b
-^b$		&	aNbNc
-^b$		&n	aNbNc	b
-^$		&n	aNNb	@Nb
-^$		n	abc
-^$		n	abcN	@
-$^		n	aNNb	@Nb
-\($\)\(^\)	bn	aNNb	@Nb
-^^		n^	aNNb	@Nb
-$$		n	aNNb	@NN
-^a		^	a
-a$		$	a
-^a		^n	aNb
-^b		^n	aNb	b
-a$		$n	bNa
-b$		$n	bNa	b
-a*(^b$)c*	-	b	b
-a*\(^b$\)c*	b	b	b
-
-# certain syntax errors and non-errors
-|		C	EMPTY
-|		b	|	|
-*		C	BADRPT
-*		b	*	*
-+		C	BADRPT
-?		C	BADRPT
-""		&C	EMPTY
-()		-	abc	@abc
-\(\)		b	abc	@abc
-a||b		C	EMPTY
-|ab		C	EMPTY
-ab|		C	EMPTY
-(|a)b		C	EMPTY
-(a|)b		C	EMPTY
-(*a)		C	BADRPT
-(+a)		C	BADRPT
-(?a)		C	BADRPT
-({1}a)		C	BADRPT
-\(\{1\}a\)	bC	BADRPT
-(a|*b)		C	BADRPT
-(a|+b)		C	BADRPT
-(a|?b)		C	BADRPT
-(a|{1}b)	C	BADRPT
-^*		C	BADRPT
-^*		b	*	*
-^+		C	BADRPT
-^?		C	BADRPT
-^{1}		C	BADRPT
-^\{1\}		bC	BADRPT
-
-# metacharacters, backslashes
-a.c		&	abc	abc
-a[bc]d		&	abd	abd
-a\*c		&	a*c	a*c
-a\\b		&	a\b	a\b
-a\\\*b		&	a\*b	a\*b
-a\bc		&	abc	abc
-a\		&C	EESCAPE
-a\\bc		&	a\bc	a\bc
-\{		bC	BADRPT
-# trailing $ is a peculiar special case for the BRE code
-a$		&	a	a
-a$		&	a$
-a\$		&	a
-a\$		&	a$	a$
-a\\$		&	a
-a\\$		&	a$
-a\\$		&	a\$
-a\\$		&	a\	a\
-
-# back references, ugh
-a\(b\)\2c	bC	ESUBREG
-a\(b\1\)c	bC	ESUBREG
-a\(b*\)c\1d	b	abbcbbd	abbcbbd	bb
-a\(b*\)c\1d	b	abbcbd
-a\(b*\)c\1d	b	abbcbbbd
-^\(.\)\1	b	abc
-a\([bc]\)\1d	b	abcdabbd	abbd	b
-a\(\([bc]\)\2\)*d	b	abbccd	abbccd
-a\(\([bc]\)\2\)*d	b	abbcbd
-# actually, this next one probably ought to fail, but the spec is unclear
-a\(\(b\)*\2\)*d		b	abbbd	abbbd
-# here is a case that no NFA implementation does right
-\(ab*\)[ab]*\1	b	ababaaa	ababaaa	a
-# check out normal matching in the presence of back refs
-\(a\)\1bcd	b	aabcd	aabcd
-\(a\)\1bc*d	b	aabcd	aabcd
-\(a\)\1bc*d	b	aabd	aabd
-\(a\)\1bc*d	b	aabcccd	aabcccd
-\(a\)\1bc*[ce]d	b	aabcccd	aabcccd
-^\(a\)\1b\(c\)*cd$	b	aabcccd	aabcccd
-\(b*\)\(a*\1\)*	b	ab	a
-\([^_]*\)\(_*\1\)*	b	foo_foo_bar_bar_bar_baz	foo_foo	foo,_foo
-\([^_]*\)\(_*\1\)*	b	bar_bar_bar_baz	bar_bar_bar	bar,_bar
-\([^_]*\)\(_*\1\)*	b	foo_bar_baz	foo	foo
-\(.*\)\1	b	""	""
-\(.*\)\1	b	a	""
-\(.*\)\1	b	aa	aa
-\(.*\)\1	b	aaa	aa
-\(.*\)\1	b	aaaa	aaaa
-\([^_]*\)\1	b	""	""
-\([^_]*\)\1	b	a	""
-\([^_]*\)\1	b	aa	aa
-\([^_]*\)\1	b	aaa	aa
-\([^_]*\)\1	b	aaaa	aaaa
-foo\(.*\)bar\1	b	foolbarl	foolbarl	l
-foo\(.*\)bar\1	b	foobar	foobar	""
-\(\(.\)b\)*\1	b	aba
-\(\(.\)b\)*\1	b	abba
-\(\(.\)b\)*\1	b	abbba
-\(\(.\)b\)*\1	b	abbbba	bbbb	bb,b
-\(\(.\)b\)*\1	b	abbbbba	abbbbb	bb,b
-\(\(.\)b\)*\1	b	abbbbbba	abbbbb	bb,b
-\(\(.\)b\)*\1	b	abbbbbbbbbbbbbba	abbbbbbbbbbbbb	bb,b
-\(\(.\)b\)*\1	b	abbbbbbbbbbbbbbba	abbbbbbbbbbbbbbb	bb,b
-
-# ordinary repetitions
-ab*c		&	abc	abc
-ab+c		-	abc	abc
-ab?c		-	abc	abc
-a\(*\)b		b	a*b	a*b
-a\(**\)b	b	ab	ab
-a\(***\)b	bC	BADRPT
-*a		b	*a	*a
-**a		b	a	a
-***a		bC	BADRPT
-
-# the dreaded bounded repetitions
-{		&	{	{
-{abc		&	{abc	{abc
-{1		C	BADRPT
-{1}		C	BADRPT
-a{b		&	a{b	a{b
-a{1}b		-	ab	ab
-a\{1\}b		b	ab	ab
-a{1,}b		-	ab	ab
-a\{1,\}b	b	ab	ab
-a{1,2}b		-	aab	aab
-a\{1,2\}b	b	aab	aab
-a{1		C	EBRACE
-a\{1		bC	EBRACE
-a{1a		C	EBRACE
-a\{1a		bC	EBRACE
-a{1a}		C	BADBR
-a\{1a\}		bC	BADBR
-a{,2}		-	a{,2}	a{,2}
-a\{,2\}		bC	BADBR
-a{,}		-	a{,}	a{,}
-a\{,\}		bC	BADBR
-a{1,x}		C	BADBR
-a\{1,x\}	bC	BADBR
-a{1,x		C	EBRACE
-a\{1,x		bC	EBRACE
-a{300}		C	BADBR
-a\{300\}	bC	BADBR
-a{1,0}		C	BADBR
-a\{1,0\}	bC	BADBR
-ab{0,0}c	-	abcac	ac
-ab\{0,0\}c	b	abcac	ac
-ab{0,1}c	-	abcac	abc
-ab\{0,1\}c	b	abcac	abc
-ab{0,3}c	-	abbcac	abbc
-ab\{0,3\}c	b	abbcac	abbc
-ab{1,1}c	-	acabc	abc
-ab\{1,1\}c	b	acabc	abc
-ab{1,3}c	-	acabc	abc
-ab\{1,3\}c	b	acabc	abc
-ab{2,2}c	-	abcabbc	abbc
-ab\{2,2\}c	b	abcabbc	abbc
-ab{2,4}c	-	abcabbc	abbc
-ab\{2,4\}c	b	abcabbc	abbc
-((a{1,10}){1,10}){1,10}	-	a	a	a,a
-((a{1,10}){1,10}){1,10}bb	-	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaabb	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaabb
-
-# multiple repetitions
-a**		&C	BADRPT
-a++		C	BADRPT
-a??		C	BADRPT
-a*+		C	BADRPT
-a*?		C	BADRPT
-a+*		C	BADRPT
-a+?		C	BADRPT
-a?*		C	BADRPT
-a?+		C	BADRPT
-a{1}{1}		C	BADRPT
-a*{1}		C	BADRPT
-a+{1}		C	BADRPT
-a?{1}		C	BADRPT
-a{1}*		C	BADRPT
-a{1}+		C	BADRPT
-a{1}?		C	BADRPT
-a*{b}		-	a{b}	a{b}
-a\{1\}\{1\}	bC	BADRPT
-a*\{1\}		bC	BADRPT
-a\{1\}*		bC	BADRPT
-
-# brackets, and numerous perversions thereof
-a[b]c		&	abc	abc
-a[ab]c		&	abc	abc
-a[^ab]c		&	adc	adc
-a[]b]c		&	a]c	a]c
-a[[b]c		&	a[c	a[c
-a[-b]c		&	a-c	a-c
-a[^]b]c		&	adc	adc
-a[^-b]c		&	adc	adc
-a[b-]c		&	a-c	a-c
-a[b		&C	EBRACK
-a[]		&C	EBRACK
-a[1-3]c		&	a2c	a2c
-a[3-1]c		&C	ERANGE
-a[1-3-5]c	&C	ERANGE
-a[[.-.]--]c	&	a-c	a-c
-a[1-		&C	ERANGE
-a[[.		&C	EBRACK
-a[[.x		&C	EBRACK
-a[[.x.		&C	EBRACK
-a[[.x.]		&C	EBRACK
-a[[.x.]]	&	ax	ax
-a[[.x,.]]	&C	ECOLLATE
-a[[.one.]]b	&	a1b	a1b
-a[[.notdef.]]b	&C	ECOLLATE
-a[[.].]]b	&	a]b	a]b
-a[[:alpha:]]c	&	abc	abc
-a[[:notdef:]]c	&C	ECTYPE
-a[[:		&C	EBRACK
-a[[:alpha	&C	EBRACK
-a[[:alpha:]	&C	EBRACK
-a[[:alpha,:]	&C	ECTYPE
-a[[:]:]]b	&C	ECTYPE
-a[[:-:]]b	&C	ECTYPE
-a[[:alph:]]	&C	ECTYPE
-a[[:alphabet:]]	&C	ECTYPE
-[[:alnum:]]+	-	-%@a0X-	a0X
-[[:alpha:]]+	-	-%@aX0-	aX
-[[:blank:]]+	-	aSSTb	SST
-[[:cntrl:]]+	-	aNTb	NT
-[[:digit:]]+	-	a019b	019
-[[:graph:]]+	-	Sa%bS	a%b
-[[:lower:]]+	-	AabC	ab
-[[:print:]]+	-	NaSbN	aSb
-[[:punct:]]+	-	S%-&T	%-&
-[[:space:]]+	-	aSNTb	SNT
-[[:upper:]]+	-	aBCd	BC
-[[:xdigit:]]+	-	p0f3Cq	0f3C
-a[[=b=]]c	&	abc	abc
-a[[=		&C	EBRACK
-a[[=b		&C	EBRACK
-a[[=b=		&C	EBRACK
-a[[=b=]		&C	EBRACK
-a[[=b,=]]	&C	ECOLLATE
-a[[=one=]]b	&	a1b	a1b
-
-# complexities
-a(((b)))c	-	abc	abc
-a(b|(c))d	-	abd	abd
-a(b*|c)d	-	abbd	abbd
-# just gotta have one DFA-buster, of course
-a[ab]{20}	-	aaaaabaaaabaaaabaaaab	aaaaabaaaabaaaabaaaab
-# and an inline expansion in case somebody gets tricky
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab]	-	aaaaabaaaabaaaabaaaab	aaaaabaaaabaaaabaaaab
-# and in case somebody just slips in an NFA...
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab](wee|week)(knights|night)	-	aaaaabaaaabaaaabaaaabweeknights	aaaaabaaaabaaaabaaaabweeknights
-# fish for anomalies as the number of states passes 32
-12345678901234567890123456789	-	a12345678901234567890123456789b	12345678901234567890123456789
-123456789012345678901234567890	-	a123456789012345678901234567890b	123456789012345678901234567890
-1234567890123456789012345678901	-	a1234567890123456789012345678901b	1234567890123456789012345678901
-12345678901234567890123456789012	-	a12345678901234567890123456789012b	12345678901234567890123456789012
-123456789012345678901234567890123	-	a123456789012345678901234567890123b	123456789012345678901234567890123
-# and one really big one, beyond any plausible word width
-1234567890123456789012345678901234567890123456789012345678901234567890	-	a1234567890123456789012345678901234567890123456789012345678901234567890b	1234567890123456789012345678901234567890123456789012345678901234567890
-# fish for problems as brackets go past 8
-[ab][cd][ef][gh][ij][kl][mn]	-	xacegikmoq	acegikm
-[ab][cd][ef][gh][ij][kl][mn][op]	-	xacegikmoq	acegikmo
-[ab][cd][ef][gh][ij][kl][mn][op][qr]	-	xacegikmoqy	acegikmoq
-[ab][cd][ef][gh][ij][kl][mn][op][q]	-	xacegikmoqy	acegikmoq
-
-# subtleties of matching
-abc		&	xabcy	abc
-a\(b\)?c\1d	b	acd
-aBc		i	Abc	Abc
-a[Bc]*d		i	abBCcd	abBCcd
-0[[:upper:]]1	&i	0a1	0a1
-0[[:lower:]]1	&i	0A1	0A1
-a[^b]c		&i	abc
-a[^b]c		&i	aBc
-a[^b]c		&i	adc	adc
-[a]b[c]		-	abc	abc
-[a]b[a]		-	aba	aba
-[abc]b[abc]	-	abc	abc
-[abc]b[abd]	-	abd	abd
-a(b?c)+d	-	accd	accd
-(wee|week)(knights|night)	-	weeknights	weeknights
-(we|wee|week|frob)(knights|night|day)	-	weeknights	weeknights
-a[bc]d		-	xyzaaabcaababdacd	abd
-a[ab]c		-	aaabc	abc
-abc		s	abc	abc
-
-# subexpressions
-a(b)(c)d	-	abcd	abcd	b,c
-a(((b)))c	-	abc	abc	b,b,b
-a(b|(c))d	-	abd	abd	b,-
-a(b*|c|e)d	-	abbd	abbd	bb
-a(b*|c|e)d	-	acd	acd	c
-a(b*|c|e)d	-	ad	ad	@d
-a(b?)c		-	abc	abc	b
-a(b?)c		-	ac	ac	@c
-a(b+)c		-	abc	abc	b
-a(b+)c		-	abbbc	abbbc	bbb
-a(b*)c		-	ac	ac	@c
-(a|ab)(bc([de]+)f|cde)	-	abcdef	abcdef	a,bcdef,de
-# the regression tester only asks for 9 subexpressions
-a(b)(c)(d)(e)(f)(g)(h)(i)(j)k	-	abcdefghijk	abcdefghijk	b,c,d,e,f,g,h,i,j
-a(b)(c)(d)(e)(f)(g)(h)(i)(j)(k)l	-	abcdefghijkl	abcdefghijkl	b,c,d,e,f,g,h,i,j,k
-a([bc]?)c	-	abc	abc	b
-a([bc]?)c	-	ac	ac	@c
-a([bc]+)c	-	abc	abc	b
-a([bc]+)c	-	abcc	abcc	bc
-a([bc]+)bc	-	abcbc	abcbc	bc
-a(bb+|b)b	-	abb	abb	b
-a(bbb+|bb+|b)b	-	abb	abb	b
-a(bbb+|bb+|b)b	-	abbb	abbb	bb
-a(bbb+|bb+|b)bb	-	abbb	abbb	b
-(.*).*		-	abcdef	abcdef	abcdef
-(a*)*		-	bc	@b	@b
-
-# do we get the right subexpression when it is used more than once?
-a(b|c)*d	-	ad	ad	-
-a(b|c)*d	-	abcd	abcd	c
-a(b|c)+d	-	abd	abd	b
-a(b|c)+d	-	abcd	abcd	c
-a(b|c?)+d	-	ad	ad	@d
-a(b|c?)+d	-	abcd	abcd	@d
-a(b|c){0,0}d	-	ad	ad	-
-a(b|c){0,1}d	-	ad	ad	-
-a(b|c){0,1}d	-	abd	abd	b
-a(b|c){0,2}d	-	ad	ad	-
-a(b|c){0,2}d	-	abcd	abcd	c
-a(b|c){0,}d	-	ad	ad	-
-a(b|c){0,}d	-	abcd	abcd	c
-a(b|c){1,1}d	-	abd	abd	b
-a(b|c){1,1}d	-	acd	acd	c
-a(b|c){1,2}d	-	abd	abd	b
-a(b|c){1,2}d	-	abcd	abcd	c
-a(b|c){1,}d	-	abd	abd	b
-a(b|c){1,}d	-	abcd	abcd	c
-a(b|c){2,2}d	-	acbd	acbd	b
-a(b|c){2,2}d	-	abcd	abcd	c
-a(b|c){2,4}d	-	abcd	abcd	c
-a(b|c){2,4}d	-	abcbd	abcbd	b
-a(b|c){2,4}d	-	abcbcd	abcbcd	c
-a(b|c){2,}d	-	abcd	abcd	c
-a(b|c){2,}d	-	abcbd	abcbd	b
-a(b+|((c)*))+d	-	abd	abd	@d,@d,-
-a(b+|((c)*))+d	-	abcd	abcd	@d,@d,-
-
-# check out the STARTEND option
-[abc]		&#	a(b)c	b
-[abc]		&#	a(d)c
-[abc]		&#	a(bc)d	b
-[abc]		&#	a(dc)d	c
-.		&#	a()c
-b.*c		&#	b(bc)c	bc
-b.*		&#	b(bc)c	bc
-.*c		&#	b(bc)c	bc
-
-# plain strings, with the NOSPEC flag
-abc		m	abc	abc
-abc		m	xabcy	abc
-abc		m	xyz
-a*b		m	aba*b	a*b
-a*b		m	ab
-""		mC	EMPTY
-
-# cases involving NULs
-aZb		&	a	a
-aZb		&p	a
-aZb		&p#	(aZb)	aZb
-aZ*b		&p#	(ab)	ab
-a.b		&#	(aZb)	aZb
-a.*		&#	(aZb)c	aZb
-
-# word boundaries (ick)
-[[:<:]]a	&	a	a
-[[:<:]]a	&	ba
-[[:<:]]a	&	-a	a
-a[[:>:]]	&	a	a
-a[[:>:]]	&	ab
-a[[:>:]]	&	a-	a
-[[:<:]]a.c[[:>:]]	&	axcd-dayc-dazce-abc	abc
-[[:<:]]a.c[[:>:]]	&	axcd-dayc-dazce-abc-q	abc
-[[:<:]]a.c[[:>:]]	&	axc-dayc-dazce-abc	axc
-
-# past problems
-(A[1])|(A[2])|(A[3])|(A[4])|(A[5])|(A[6])|(A[7])|(A[8])|(A[9])|(A[A])	-	A1	A1
-abcdefghijklmnop	i	abcdefghijklmnop	abcdefghijklmnop
-abcdefghijklmnopqrstuv	i	abcdefghijklmnopqrstuv	abcdefghijklmnopqrstuv
-(ALAK)|(ALT[AB])|(CC[123]1)|(CM[123]1)|(GAMC)|(LC[23][EO ])|(SEM[1234])|(SL[ES][12])|(SLWW)|(SLF )|(SLDT)|(VWH[12])|(WH[34][EW])|(WP1[ESN])	-	CC11	CC11
-CC[13]1|a{21}[23][EO][123][Es][12]a{15}aa[34][EW]aaaaaaa[X]a	-	CC11	CC11
-# PR 130504
-(.|())(b)	-	ab	ab
-(()|.)(b)	-	ab	ab
diff --git a/lib/libc_bsd/regex/re_format.7 b/lib/libc_bsd/regex/re_format.7
deleted file mode 100644
index ec67fd5..0000000
--- a/lib/libc_bsd/regex/re_format.7
+++ /dev/null
@@ -1,490 +0,0 @@
-.\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
-.\" Copyright (c) 1992, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Henry Spencer.
-.\"
-.\" 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.
-.\"
-.\"	@(#)re_format.7	8.3 (Berkeley) 3/20/94
-.\" $FreeBSD: releng/10.2/lib/libc/regex/re_format.7 269484 2014-08-03 18:39:11Z pfg $
-.\"
-.Dd June 30, 2014
-.Dt RE_FORMAT 7
-.Os
-.Sh NAME
-.Nm re_format
-.Nd POSIX 1003.2 regular expressions
-.Sh DESCRIPTION
-Regular expressions
-.Pq Dq RE Ns s ,
-as defined in
-.St -p1003.2 ,
-come in two forms:
-modern REs (roughly those of
-.Xr egrep 1 ;
-1003.2 calls these
-.Dq extended
-REs)
-and obsolete REs (roughly those of
-.Xr ed 1 ;
-1003.2
-.Dq basic
-REs).
-Obsolete REs mostly exist for backward compatibility in some old programs;
-they will be discussed at the end.
-.St -p1003.2
-leaves some aspects of RE syntax and semantics open;
-`\(dd' marks decisions on these aspects that
-may not be fully portable to other
-.St -p1003.2
-implementations.
-.Pp
-A (modern) RE is one\(dd or more non-empty\(dd
-.Em branches ,
-separated by
-.Ql \&| .
-It matches anything that matches one of the branches.
-.Pp
-A branch is one\(dd or more
-.Em pieces ,
-concatenated.
-It matches a match for the first, followed by a match for the second, etc.
-.Pp
-A piece is an
-.Em atom
-possibly followed
-by a single\(dd
-.Ql \&* ,
-.Ql \&+ ,
-.Ql \&? ,
-or
-.Em bound .
-An atom followed by
-.Ql \&*
-matches a sequence of 0 or more matches of the atom.
-An atom followed by
-.Ql \&+
-matches a sequence of 1 or more matches of the atom.
-An atom followed by
-.Ql ?\&
-matches a sequence of 0 or 1 matches of the atom.
-.Pp
-A
-.Em bound
-is
-.Ql \&{
-followed by an unsigned decimal integer,
-possibly followed by
-.Ql \&,
-possibly followed by another unsigned decimal integer,
-always followed by
-.Ql \&} .
-The integers must lie between 0 and
-.Dv RE_DUP_MAX
-(255\(dd) inclusive,
-and if there are two of them, the first may not exceed the second.
-An atom followed by a bound containing one integer
-.Em i
-and no comma matches
-a sequence of exactly
-.Em i
-matches of the atom.
-An atom followed by a bound
-containing one integer
-.Em i
-and a comma matches
-a sequence of
-.Em i
-or more matches of the atom.
-An atom followed by a bound
-containing two integers
-.Em i
-and
-.Em j
-matches
-a sequence of
-.Em i
-through
-.Em j
-(inclusive) matches of the atom.
-.Pp
-An atom is a regular expression enclosed in
-.Ql ()
-(matching a match for the
-regular expression),
-an empty set of
-.Ql ()
-(matching the null string)\(dd,
-a
-.Em bracket expression
-(see below),
-.Ql .\&
-(matching any single character),
-.Ql \&^
-(matching the null string at the beginning of a line),
-.Ql \&$
-(matching the null string at the end of a line), a
-.Ql \e
-followed by one of the characters
-.Ql ^.[$()|*+?{\e
-(matching that character taken as an ordinary character),
-a
-.Ql \e
-followed by any other character\(dd
-(matching that character taken as an ordinary character,
-as if the
-.Ql \e
-had not been present\(dd),
-or a single character with no other significance (matching that character).
-A
-.Ql \&{
-followed by a character other than a digit is an ordinary
-character, not the beginning of a bound\(dd.
-It is illegal to end an RE with
-.Ql \e .
-.Pp
-A
-.Em bracket expression
-is a list of characters enclosed in
-.Ql [] .
-It normally matches any single character from the list (but see below).
-If the list begins with
-.Ql \&^ ,
-it matches any single character
-(but see below)
-.Em not
-from the rest of the list.
-If two characters in the list are separated by
-.Ql \&- ,
-this is shorthand
-for the full
-.Em range
-of characters between those two (inclusive) in the
-collating sequence,
-.No e.g. Ql [0-9]
-in ASCII matches any decimal digit.
-It is illegal\(dd for two ranges to share an
-endpoint,
-.No e.g. Ql a-c-e .
-Ranges are very collating-sequence-dependent,
-and portable programs should avoid relying on them.
-.Pp
-To include a literal
-.Ql \&]
-in the list, make it the first character
-(following a possible
-.Ql \&^ ) .
-To include a literal
-.Ql \&- ,
-make it the first or last character,
-or the second endpoint of a range.
-To use a literal
-.Ql \&-
-as the first endpoint of a range,
-enclose it in
-.Ql [.\&
-and
-.Ql .]\&
-to make it a collating element (see below).
-With the exception of these and some combinations using
-.Ql \&[
-(see next paragraphs), all other special characters, including
-.Ql \e ,
-lose their special significance within a bracket expression.
-.Pp
-Within a bracket expression, a collating element (a character,
-a multi-character sequence that collates as if it were a single character,
-or a collating-sequence name for either)
-enclosed in
-.Ql [.\&
-and
-.Ql .]\&
-stands for the
-sequence of characters of that collating element.
-The sequence is a single element of the bracket expression's list.
-A bracket expression containing a multi-character collating element
-can thus match more than one character,
-e.g.\& if the collating sequence includes a
-.Ql ch
-collating element,
-then the RE
-.Ql [[.ch.]]*c
-matches the first five characters
-of
-.Ql chchcc .
-.Pp
-Within a bracket expression, a collating element enclosed in
-.Ql [=
-and
-.Ql =]
-is an equivalence class, standing for the sequences of characters
-of all collating elements equivalent to that one, including itself.
-(If there are no other equivalent collating elements,
-the treatment is as if the enclosing delimiters were
-.Ql [.\&
-and
-.Ql .] . )
-For example, if
-.Ql x
-and
-.Ql y
-are the members of an equivalence class,
-then
-.Ql [[=x=]] ,
-.Ql [[=y=]] ,
-and
-.Ql [xy]
-are all synonymous.
-An equivalence class may not\(dd be an endpoint
-of a range.
-.Pp
-Within a bracket expression, the name of a
-.Em character class
-enclosed in
-.Ql [:
-and
-.Ql :]
-stands for the list of all characters belonging to that
-class.
-Standard character class names are:
-.Bl -column "alnum" "digit" "xdigit" -offset indent
-.It Em "alnum	digit	punct"
-.It Em "alpha	graph	space"
-.It Em "blank	lower	upper"
-.It Em "cntrl	print	xdigit"
-.El
-.Pp
-These stand for the character classes defined in
-.Xr ctype 3 .
-A locale may provide others.
-A character class may not be used as an endpoint of a range.
-.Pp
-A bracketed expression like
-.Ql [[:class:]]
-can be used to match a single character that belongs to a character
-class.
-The reverse, matching any character that does not belong to a specific
-class, the negation operator of bracket expressions may be used:
-.Ql [^[:class:]] .
-.Pp
-There are two special cases\(dd of bracket expressions:
-the bracket expressions
-.Ql [[:<:]]
-and
-.Ql [[:>:]]
-match the null string at the beginning and end of a word respectively.
-A word is defined as a sequence of word characters
-which is neither preceded nor followed by
-word characters.
-A word character is an
-.Em alnum
-character (as defined by
-.Xr ctype 3 )
-or an underscore.
-This is an extension,
-compatible with but not specified by
-.St -p1003.2 ,
-and should be used with
-caution in software intended to be portable to other systems.
-The additional word delimiters  
-.Ql \e<
-and
-.Ql \e> 
-are provided to ease compatibility with traditional
-.Xr svr4 4
-systems but are not portable and should be avoided.
-.Pp
-In the event that an RE could match more than one substring of a given
-string,
-the RE matches the one starting earliest in the string.
-If the RE could match more than one substring starting at that point,
-it matches the longest.
-Subexpressions also match the longest possible substrings, subject to
-the constraint that the whole match be as long as possible,
-with subexpressions starting earlier in the RE taking priority over
-ones starting later.
-Note that higher-level subexpressions thus take priority over
-their lower-level component subexpressions.
-.Pp
-Match lengths are measured in characters, not collating elements.
-A null string is considered longer than no match at all.
-For example,
-.Ql bb*
-matches the three middle characters of
-.Ql abbbc ,
-.Ql (wee|week)(knights|nights)
-matches all ten characters of
-.Ql weeknights ,
-when
-.Ql (.*).*\&
-is matched against
-.Ql abc
-the parenthesized subexpression
-matches all three characters, and
-when
-.Ql (a*)*
-is matched against
-.Ql bc
-both the whole RE and the parenthesized
-subexpression match the null string.
-.Pp
-If case-independent matching is specified,
-the effect is much as if all case distinctions had vanished from the
-alphabet.
-When an alphabetic that exists in multiple cases appears as an
-ordinary character outside a bracket expression, it is effectively
-transformed into a bracket expression containing both cases,
-.No e.g. Ql x
-becomes
-.Ql [xX] .
-When it appears inside a bracket expression, all case counterparts
-of it are added to the bracket expression, so that (e.g.)
-.Ql [x]
-becomes
-.Ql [xX]
-and
-.Ql [^x]
-becomes
-.Ql [^xX] .
-.Pp
-No particular limit is imposed on the length of REs\(dd.
-Programs intended to be portable should not employ REs longer
-than 256 bytes,
-as an implementation can refuse to accept such REs and remain
-POSIX-compliant.
-.Pp
-Obsolete
-.Pq Dq basic
-regular expressions differ in several respects.
-.Ql \&|
-is an ordinary character and there is no equivalent
-for its functionality.
-.Ql \&+
-and
-.Ql ?\&
-are ordinary characters, and their functionality
-can be expressed using bounds
-.No ( Ql {1,}
-or
-.Ql {0,1}
-respectively).
-Also note that
-.Ql x+
-in modern REs is equivalent to
-.Ql xx* .
-The delimiters for bounds are
-.Ql \e{
-and
-.Ql \e} ,
-with
-.Ql \&{
-and
-.Ql \&}
-by themselves ordinary characters.
-The parentheses for nested subexpressions are
-.Ql \e(
-and
-.Ql \e) ,
-with
-.Ql \&(
-and
-.Ql \&)
-by themselves ordinary characters.
-.Ql \&^
-is an ordinary character except at the beginning of the
-RE or\(dd the beginning of a parenthesized subexpression,
-.Ql \&$
-is an ordinary character except at the end of the
-RE or\(dd the end of a parenthesized subexpression,
-and
-.Ql \&*
-is an ordinary character if it appears at the beginning of the
-RE or the beginning of a parenthesized subexpression
-(after a possible leading
-.Ql \&^ ) .
-Finally, there is one new type of atom, a
-.Em back reference :
-.Ql \e
-followed by a non-zero decimal digit
-.Em d
-matches the same sequence of characters
-matched by the
-.Em d Ns th
-parenthesized subexpression
-(numbering subexpressions by the positions of their opening parentheses,
-left to right),
-so that (e.g.)
-.Ql \e([bc]\e)\e1
-matches
-.Ql bb
-or
-.Ql cc
-but not
-.Ql bc .
-.Sh SEE ALSO
-.Xr regex 3
-.Rs
-.%T Regular Expression Notation
-.%R IEEE Std
-.%N 1003.2
-.%P section 2.8
-.Re
-.Sh BUGS
-Having two kinds of REs is a botch.
-.Pp
-The current
-.St -p1003.2
-spec says that
-.Ql \&)
-is an ordinary character in
-the absence of an unmatched
-.Ql \&( ;
-this was an unintentional result of a wording error,
-and change is likely.
-Avoid relying on it.
-.Pp
-Back references are a dreadful botch,
-posing major problems for efficient implementations.
-They are also somewhat vaguely defined
-(does
-.Ql a\e(\e(b\e)*\e2\e)*d
-match
-.Ql abbbd ? ) .
-Avoid using them.
-.Pp
-.St -p1003.2
-specification of case-independent matching is vague.
-The
-.Dq one case implies all cases
-definition given above
-is current consensus among implementors as to the right interpretation.
-.Pp
-The syntax for word boundaries is incredibly ugly.
diff --git a/lib/libc_bsd/regex/regcomp.c b/lib/libc_bsd/regex/regcomp.c
deleted file mode 100644
index a8a9857..0000000
--- a/lib/libc_bsd/regex/regcomp.c
+++ /dev/null
@@ -1,1818 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- * 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.
- *
- *	@(#)regcomp.c	8.5 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/regex/regcomp.c 278910 2015-02-17 19:14:16Z delphij $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <regex.h>
-#include <runetype.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "collate.h"
-
-#include "utils.h"
-#include "regex2.h"
-
-#include "cname.h"
-
-/*
- * parse structure, passed up and down to avoid global variables and
- * other clumsinesses
- */
-struct parse {
-	char *next;		/* next character in RE */
-	char *end;		/* end of string (-> NUL normally) */
-	int error;		/* has an error been seen? */
-	sop *strip;		/* malloced strip */
-	sopno ssize;		/* malloced strip size (allocated) */
-	sopno slen;		/* malloced strip length (used) */
-	int ncsalloc;		/* number of csets allocated */
-	struct re_guts *g;
-#	define	NPAREN	10	/* we need to remember () 1-9 for back refs */
-	sopno pbegin[NPAREN];	/* -> ( ([0] unused) */
-	sopno pend[NPAREN];	/* -> ) ([0] unused) */
-};
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regcomp.c === */
-static void p_ere(struct parse *p, int stop);
-static void p_ere_exp(struct parse *p);
-static void p_str(struct parse *p);
-static void p_bre(struct parse *p, int end1, int end2);
-static int p_simp_re(struct parse *p, int starordinary);
-static int p_count(struct parse *p);
-static void p_bracket(struct parse *p);
-static void p_b_term(struct parse *p, cset *cs);
-static void p_b_cclass(struct parse *p, cset *cs);
-static void p_b_eclass(struct parse *p, cset *cs);
-static wint_t p_b_symbol(struct parse *p);
-static wint_t p_b_coll_elem(struct parse *p, wint_t endc);
-static wint_t othercase(wint_t ch);
-static void bothcases(struct parse *p, wint_t ch);
-static void ordinary(struct parse *p, wint_t ch);
-static void nonnewline(struct parse *p);
-static void repeat(struct parse *p, sopno start, int from, int to);
-static int seterr(struct parse *p, int e);
-static cset *allocset(struct parse *p);
-static void freeset(struct parse *p, cset *cs);
-static void CHadd(struct parse *p, cset *cs, wint_t ch);
-static void CHaddrange(struct parse *p, cset *cs, wint_t min, wint_t max);
-static void CHaddtype(struct parse *p, cset *cs, wctype_t wct);
-static wint_t singleton(cset *cs);
-static sopno dupl(struct parse *p, sopno start, sopno finish);
-static void doemit(struct parse *p, sop op, size_t opnd);
-static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
-static void dofwd(struct parse *p, sopno pos, sop value);
-static int enlarge(struct parse *p, sopno size);
-static void stripsnug(struct parse *p, struct re_guts *g);
-static void findmust(struct parse *p, struct re_guts *g);
-static int altoffset(sop *scan, int offset);
-static void computejumps(struct parse *p, struct re_guts *g);
-static void computematchjumps(struct parse *p, struct re_guts *g);
-static sopno pluscount(struct parse *p, struct re_guts *g);
-static wint_t wgetnext(struct parse *p);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-
-static char nuls[10];		/* place to point scanner in event of error */
-
-/*
- * macros for use with parse structure
- * BEWARE:  these know that the parse structure is named `p' !!!
- */
-#define	PEEK()	(*p->next)
-#define	PEEK2()	(*(p->next+1))
-#define	MORE()	(p->next < p->end)
-#define	MORE2()	(p->next+1 < p->end)
-#define	SEE(c)	(MORE() && PEEK() == (c))
-#define	SEETWO(a, b)	(MORE() && MORE2() && PEEK() == (a) && PEEK2() == (b))
-#define	EAT(c)	((SEE(c)) ? (NEXT(), 1) : 0)
-#define	EATTWO(a, b)	((SEETWO(a, b)) ? (NEXT2(), 1) : 0)
-#define	NEXT()	(p->next++)
-#define	NEXT2()	(p->next += 2)
-#define	NEXTn(n)	(p->next += (n))
-#define	GETNEXT()	(*p->next++)
-#define	WGETNEXT()	wgetnext(p)
-#define	SETERROR(e)	seterr(p, (e))
-#define	REQUIRE(co, e)	((co) || SETERROR(e))
-#define	MUSTSEE(c, e)	(REQUIRE(MORE() && PEEK() == (c), e))
-#define	MUSTEAT(c, e)	(REQUIRE(MORE() && GETNEXT() == (c), e))
-#define	MUSTNOTSEE(c, e)	(REQUIRE(!MORE() || PEEK() != (c), e))
-#define	EMIT(op, sopnd)	doemit(p, (sop)(op), (size_t)(sopnd))
-#define	INSERT(op, pos)	doinsert(p, (sop)(op), HERE()-(pos)+1, pos)
-#define	AHEAD(pos)		dofwd(p, pos, HERE()-(pos))
-#define	ASTERN(sop, pos)	EMIT(sop, HERE()-pos)
-#define	HERE()		(p->slen)
-#define	THERE()		(p->slen - 1)
-#define	THERETHERE()	(p->slen - 2)
-#define	DROP(n)	(p->slen -= (n))
-
-#ifndef NDEBUG
-static int never = 0;		/* for use in asserts; shuts lint up */
-#else
-#define	never	0		/* some <assert.h>s have bugs too */
-#endif
-
-/* Macro used by computejump()/computematchjump() */
-#define MIN(a,b)	((a)<(b)?(a):(b))
-
-/*
- - regcomp - interface for parser and compilation
- = extern int regcomp(regex_t *, const char *, int);
- = #define	REG_BASIC	0000
- = #define	REG_EXTENDED	0001
- = #define	REG_ICASE	0002
- = #define	REG_NOSUB	0004
- = #define	REG_NEWLINE	0010
- = #define	REG_NOSPEC	0020
- = #define	REG_PEND	0040
- = #define	REG_DUMP	0200
- */
-int				/* 0 success, otherwise REG_something */
-regcomp(regex_t * __restrict preg,
-	const char * __restrict pattern,
-	int cflags)
-{
-	struct parse pa;
-	struct re_guts *g;
-	struct parse *p = &pa;
-	int i;
-	size_t len;
-	size_t maxlen;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&~REG_DUMP)
-#endif
-
-	cflags = GOODFLAGS(cflags);
-	if ((cflags&REG_EXTENDED) && (cflags&REG_NOSPEC))
-		return(REG_INVARG);
-
-	if (cflags&REG_PEND) {
-		if (preg->re_endp < pattern)
-			return(REG_INVARG);
-		len = preg->re_endp - pattern;
-	} else
-		len = strlen((char *)pattern);
-
-	/* do the mallocs early so failure handling is easy */
-	g = (struct re_guts *)malloc(sizeof(struct re_guts));
-	if (g == NULL)
-		return(REG_ESPACE);
-	/*
-	 * Limit the pattern space to avoid a 32-bit overflow on buffer
-	 * extension.  Also avoid any signed overflow in case of conversion
-	 * so make the real limit based on a 31-bit overflow.
-	 *
-	 * Likely not applicable on 64-bit systems but handle the case
-	 * generically (who are we to stop people from using ~715MB+
-	 * patterns?).
-	 */
-	maxlen = ((size_t)-1 >> 1) / sizeof(sop) * 2 / 3;
-	if (len >= maxlen) {
-		free((char *)g);
-		return(REG_ESPACE);
-	}
-	p->ssize = len/(size_t)2*(size_t)3 + (size_t)1;	/* ugh */
-	assert(p->ssize >= len);
-
-	p->strip = (sop *)malloc(p->ssize * sizeof(sop));
-	p->slen = 0;
-	if (p->strip == NULL) {
-		free((char *)g);
-		return(REG_ESPACE);
-	}
-
-	/* set things up */
-	p->g = g;
-	p->next = (char *)pattern;	/* convenience; we do not modify it */
-	p->end = p->next + len;
-	p->error = 0;
-	p->ncsalloc = 0;
-	for (i = 0; i < NPAREN; i++) {
-		p->pbegin[i] = 0;
-		p->pend[i] = 0;
-	}
-	g->sets = NULL;
-	g->ncsets = 0;
-	g->cflags = cflags;
-	g->iflags = 0;
-	g->nbol = 0;
-	g->neol = 0;
-	g->must = NULL;
-	g->moffset = -1;
-	g->charjump = NULL;
-	g->matchjump = NULL;
-	g->mlen = 0;
-	g->nsub = 0;
-	g->backrefs = 0;
-
-	/* do it */
-	EMIT(OEND, 0);
-	g->firststate = THERE();
-	if (cflags&REG_EXTENDED)
-		p_ere(p, OUT);
-	else if (cflags&REG_NOSPEC)
-		p_str(p);
-	else
-		p_bre(p, OUT, OUT);
-	EMIT(OEND, 0);
-	g->laststate = THERE();
-
-	/* tidy up loose ends and fill things in */
-	stripsnug(p, g);
-	findmust(p, g);
-	/* only use Boyer-Moore algorithm if the pattern is bigger
-	 * than three characters
-	 */
-	if(g->mlen > 3) {
-		computejumps(p, g);
-		computematchjumps(p, g);
-		if(g->matchjump == NULL && g->charjump != NULL) {
-			free(g->charjump);
-			g->charjump = NULL;
-		}
-	}
-	g->nplus = pluscount(p, g);
-	g->magic = MAGIC2;
-	preg->re_nsub = g->nsub;
-	preg->re_g = g;
-	preg->re_magic = MAGIC1;
-#ifndef REDEBUG
-	/* not debugging, so can't rely on the assert() in regexec() */
-	if (g->iflags&BAD)
-		SETERROR(REG_ASSERT);
-#endif
-
-	/* win or lose, we're done */
-	if (p->error != 0)	/* lose */
-		regfree(preg);
-	return(p->error);
-}
-
-/*
- - p_ere - ERE parser top level, concatenation and alternation
- == static void p_ere(struct parse *p, int_t stop);
- */
-static void
-p_ere(struct parse *p,
-	int stop)		/* character this ERE should end at */
-{
-	char c;
-	sopno prevback;
-	sopno prevfwd;
-	sopno conc;
-	int first = 1;		/* is this the first alternative? */
-
-	for (;;) {
-		/* do a bunch of concatenated expressions */
-		conc = HERE();
-		while (MORE() && (c = PEEK()) != '|' && c != stop)
-			p_ere_exp(p);
-		(void)REQUIRE(HERE() != conc, REG_EMPTY);	/* require nonempty */
-
-		if (!EAT('|'))
-			break;		/* NOTE BREAK OUT */
-
-		if (first) {
-			INSERT(OCH_, conc);	/* offset is wrong */
-			prevfwd = conc;
-			prevback = conc;
-			first = 0;
-		}
-		ASTERN(OOR1, prevback);
-		prevback = THERE();
-		AHEAD(prevfwd);			/* fix previous offset */
-		prevfwd = HERE();
-		EMIT(OOR2, 0);			/* offset is very wrong */
-	}
-
-	if (!first) {		/* tail-end fixups */
-		AHEAD(prevfwd);
-		ASTERN(O_CH, prevback);
-	}
-
-	assert(!MORE() || SEE(stop));
-}
-
-/*
- - p_ere_exp - parse one subERE, an atom possibly followed by a repetition op
- == static void p_ere_exp(struct parse *p);
- */
-static void
-p_ere_exp(struct parse *p)
-{
-	char c;
-	wint_t wc;
-	sopno pos;
-	int count;
-	int count2;
-	sopno subno;
-	int wascaret = 0;
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-
-	pos = HERE();
-	switch (c) {
-	case '(':
-		(void)REQUIRE(MORE(), REG_EPAREN);
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		if (!SEE(')'))
-			p_ere(p, ')');
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		(void)MUSTEAT(')', REG_EPAREN);
-		break;
-#ifndef POSIX_MISTAKE
-	case ')':		/* happens only if no current unmatched ( */
-		/*
-		 * You may ask, why the ifndef?  Because I didn't notice
-		 * this until slightly too late for 1003.2, and none of the
-		 * other 1003.2 regular-expression reviewers noticed it at
-		 * all.  So an unmatched ) is legal POSIX, at least until
-		 * we can get it fixed.
-		 */
-		SETERROR(REG_EPAREN);
-		break;
-#endif
-	case '^':
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-		wascaret = 1;
-		break;
-	case '$':
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-		break;
-	case '|':
-		SETERROR(REG_EMPTY);
-		break;
-	case '*':
-	case '+':
-	case '?':
-		SETERROR(REG_BADRPT);
-		break;
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case '\\':
-		(void)REQUIRE(MORE(), REG_EESCAPE);
-		wc = WGETNEXT();
-		switch (wc) {
-		case '<':
-			EMIT(OBOW, 0);
-			break;
-		case '>':
-			EMIT(OEOW, 0);
-			break;
-		default:
-			ordinary(p, wc);
-			break;
-		}
-		break;
-	case '{':		/* okay as ordinary except if digit follows */
-		(void)REQUIRE(!MORE() || !isdigit((uch)PEEK()), REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		p->next--;
-		wc = WGETNEXT();
-		ordinary(p, wc);
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	/* we call { a repetition if followed by a digit */
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit((uch)PEEK2())) ))
-		return;		/* no repetition, we're done */
-	NEXT();
-
-	(void)REQUIRE(!wascaret, REG_BADRPT);
-	switch (c) {
-	case '*':	/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-		break;
-	case '+':
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		break;
-	case '?':
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, pos);		/* offset slightly wrong */
-		ASTERN(OOR1, pos);		/* this one's right */
-		AHEAD(pos);			/* fix the OCH_ */
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case '{':
-		count = p_count(p);
-		if (EAT(',')) {
-			if (isdigit((uch)PEEK())) {
-				count2 = p_count(p);
-				(void)REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2);
-		if (!EAT('}')) {	/* error heuristics */
-			while (MORE() && PEEK() != '}')
-				NEXT();
-			(void)REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-		break;
-	}
-
-	if (!MORE())
-		return;
-	c = PEEK();
-	if (!( c == '*' || c == '+' || c == '?' ||
-				(c == '{' && MORE2() && isdigit((uch)PEEK2())) ) )
-		return;
-	SETERROR(REG_BADRPT);
-}
-
-/*
- - p_str - string (no metacharacters) "parser"
- == static void p_str(struct parse *p);
- */
-static void
-p_str(struct parse *p)
-{
-	(void)REQUIRE(MORE(), REG_EMPTY);
-	while (MORE())
-		ordinary(p, WGETNEXT());
-}
-
-/*
- - p_bre - BRE parser top level, anchoring and concatenation
- == static void p_bre(struct parse *p,  int end1, \
- ==	int end2);
- * Giving end1 as OUT essentially eliminates the end1/end2 check.
- *
- * This implementation is a bit of a kludge, in that a trailing $ is first
- * taken as an ordinary character and then revised to be an anchor.
- * The amount of lookahead needed to avoid this kludge is excessive.
- */
-static void
-p_bre(struct parse *p,
-	int end1,		/* first terminating character */
-	int end2)		/* second terminating character */
-{
-	sopno start = HERE();
-	int first = 1;			/* first subexpression? */
-	int wasdollar = 0;
-
-	if (EAT('^')) {
-		EMIT(OBOL, 0);
-		p->g->iflags |= USEBOL;
-		p->g->nbol++;
-	}
-	while (MORE() && !SEETWO(end1, end2)) {
-		wasdollar = p_simp_re(p, first);
-		first = 0;
-	}
-	if (wasdollar) {	/* oops, that was a trailing anchor */
-		DROP(1);
-		EMIT(OEOL, 0);
-		p->g->iflags |= USEEOL;
-		p->g->neol++;
-	}
-
-	(void)REQUIRE(HERE() != start, REG_EMPTY);	/* require nonempty */
-}
-
-/*
- - p_simp_re - parse a simple RE, an atom possibly followed by a repetition
- == static int p_simp_re(struct parse *p, int starordinary);
- */
-static int			/* was the simple RE an unbackslashed $? */
-p_simp_re(struct parse *p,
-	int starordinary)	/* is a leading * an ordinary character? */
-{
-	int c;
-	int count;
-	int count2;
-	sopno pos;
-	int i;
-	wint_t wc;
-	sopno subno;
-#	define	BACKSL	(1<<CHAR_BIT)
-
-	pos = HERE();		/* repetion op, if any, covers from here */
-
-	assert(MORE());		/* caller should have ensured this */
-	c = GETNEXT();
-	if (c == '\\') {
-		(void)REQUIRE(MORE(), REG_EESCAPE);
-		c = BACKSL | GETNEXT();
-	}
-	switch (c) {
-	case '.':
-		if (p->g->cflags&REG_NEWLINE)
-			nonnewline(p);
-		else
-			EMIT(OANY, 0);
-		break;
-	case '[':
-		p_bracket(p);
-		break;
-	case BACKSL|'<':
-		EMIT(OBOW, 0);
-		break;
-	case BACKSL|'>':
-		EMIT(OEOW, 0);
-		break;
-	case BACKSL|'{':
-		SETERROR(REG_BADRPT);
-		break;
-	case BACKSL|'(':
-		p->g->nsub++;
-		subno = p->g->nsub;
-		if (subno < NPAREN)
-			p->pbegin[subno] = HERE();
-		EMIT(OLPAREN, subno);
-		/* the MORE here is an error heuristic */
-		if (MORE() && !SEETWO('\\', ')'))
-			p_bre(p, '\\', ')');
-		if (subno < NPAREN) {
-			p->pend[subno] = HERE();
-			assert(p->pend[subno] != 0);
-		}
-		EMIT(ORPAREN, subno);
-		(void)REQUIRE(EATTWO('\\', ')'), REG_EPAREN);
-		break;
-	case BACKSL|')':	/* should not get here -- must be user */
-	case BACKSL|'}':
-		SETERROR(REG_EPAREN);
-		break;
-	case BACKSL|'1':
-	case BACKSL|'2':
-	case BACKSL|'3':
-	case BACKSL|'4':
-	case BACKSL|'5':
-	case BACKSL|'6':
-	case BACKSL|'7':
-	case BACKSL|'8':
-	case BACKSL|'9':
-		i = (c&~BACKSL) - '0';
-		assert(i < NPAREN);
-		if (p->pend[i] != 0) {
-			assert(i <= p->g->nsub);
-			EMIT(OBACK_, i);
-			assert(p->pbegin[i] != 0);
-			assert(OP(p->strip[p->pbegin[i]]) == OLPAREN);
-			assert(OP(p->strip[p->pend[i]]) == ORPAREN);
-			(void) dupl(p, p->pbegin[i]+1, p->pend[i]);
-			EMIT(O_BACK, i);
-		} else
-			SETERROR(REG_ESUBREG);
-		p->g->backrefs = 1;
-		break;
-	case '*':
-		(void)REQUIRE(starordinary, REG_BADRPT);
-		/* FALLTHROUGH */
-	default:
-		p->next--;
-		wc = WGETNEXT();
-		ordinary(p, wc);
-		break;
-	}
-
-	if (EAT('*')) {		/* implemented as +? */
-		/* this case does not require the (y|) trick, noKLUDGE */
-		INSERT(OPLUS_, pos);
-		ASTERN(O_PLUS, pos);
-		INSERT(OQUEST_, pos);
-		ASTERN(O_QUEST, pos);
-	} else if (EATTWO('\\', '{')) {
-		count = p_count(p);
-		if (EAT(',')) {
-			if (MORE() && isdigit((uch)PEEK())) {
-				count2 = p_count(p);
-				(void)REQUIRE(count <= count2, REG_BADBR);
-			} else		/* single number with comma */
-				count2 = INFINITY;
-		} else		/* just a single number */
-			count2 = count;
-		repeat(p, pos, count, count2);
-		if (!EATTWO('\\', '}')) {	/* error heuristics */
-			while (MORE() && !SEETWO('\\', '}'))
-				NEXT();
-			(void)REQUIRE(MORE(), REG_EBRACE);
-			SETERROR(REG_BADBR);
-		}
-	} else if (c == '$')     /* $ (but not \$) ends it */
-		return(1);
-
-	return(0);
-}
-
-/*
- - p_count - parse a repetition count
- == static int p_count(struct parse *p);
- */
-static int			/* the value */
-p_count(struct parse *p)
-{
-	int count = 0;
-	int ndigits = 0;
-
-	while (MORE() && isdigit((uch)PEEK()) && count <= DUPMAX) {
-		count = count*10 + (GETNEXT() - '0');
-		ndigits++;
-	}
-
-	(void)REQUIRE(ndigits > 0 && count <= DUPMAX, REG_BADBR);
-	return(count);
-}
-
-/*
- - p_bracket - parse a bracketed character list
- == static void p_bracket(struct parse *p);
- */
-static void
-p_bracket(struct parse *p)
-{
-	cset *cs;
-	wint_t ch;
-
-	/* Dept of Truly Sickening Special-Case Kludges */
-	if (p->next + 5 < p->end && strncmp(p->next, "[:<:]]", 6) == 0) {
-		EMIT(OBOW, 0);
-		NEXTn(6);
-		return;
-	}
-	if (p->next + 5 < p->end && strncmp(p->next, "[:>:]]", 6) == 0) {
-		EMIT(OEOW, 0);
-		NEXTn(6);
-		return;
-	}
-
-	if ((cs = allocset(p)) == NULL)
-		return;
-
-	if (p->g->cflags&REG_ICASE)
-		cs->icase = 1;
-	if (EAT('^'))
-		cs->invert = 1;
-	if (EAT(']'))
-		CHadd(p, cs, ']');
-	else if (EAT('-'))
-		CHadd(p, cs, '-');
-	while (MORE() && PEEK() != ']' && !SEETWO('-', ']'))
-		p_b_term(p, cs);
-	if (EAT('-'))
-		CHadd(p, cs, '-');
-	(void)MUSTEAT(']', REG_EBRACK);
-
-	if (p->error != 0)	/* don't mess things up further */
-		return;
-
-	if (cs->invert && p->g->cflags&REG_NEWLINE)
-		cs->bmp['\n' >> 3] |= 1 << ('\n' & 7);
-
-	if ((ch = singleton(cs)) != OUT) {	/* optimize singleton sets */
-		ordinary(p, ch);
-		freeset(p, cs);
-	} else
-		EMIT(OANYOF, (int)(cs - p->g->sets));
-}
-
-/*
- - p_b_term - parse one term of a bracketed character list
- == static void p_b_term(struct parse *p, cset *cs);
- */
-static void
-p_b_term(struct parse *p, cset *cs)
-{
-	char c;
-	wint_t start, finish;
-	wint_t i;
-	struct xlocale_collate *table =
-		(struct xlocale_collate*)__get_locale()->components[XLC_COLLATE];
-
-	/* classify what we've got */
-	switch ((MORE()) ? PEEK() : '\0') {
-	case '[':
-		c = (MORE2()) ? PEEK2() : '\0';
-		break;
-	case '-':
-		SETERROR(REG_ERANGE);
-		return;			/* NOTE RETURN */
-	default:
-		c = '\0';
-		break;
-	}
-
-	switch (c) {
-	case ':':		/* character class */
-		NEXT2();
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		(void)REQUIRE(c != '-' && c != ']', REG_ECTYPE);
-		p_b_cclass(p, cs);
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		(void)REQUIRE(EATTWO(':', ']'), REG_ECTYPE);
-		break;
-	case '=':		/* equivalence class */
-		NEXT2();
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		c = PEEK();
-		(void)REQUIRE(c != '-' && c != ']', REG_ECOLLATE);
-		p_b_eclass(p, cs);
-		(void)REQUIRE(MORE(), REG_EBRACK);
-		(void)REQUIRE(EATTWO('=', ']'), REG_ECOLLATE);
-		break;
-	default:		/* symbol, ordinary character, or range */
-		start = p_b_symbol(p);
-		if (SEE('-') && MORE2() && PEEK2() != ']') {
-			/* range */
-			NEXT();
-			if (EAT('-'))
-				finish = '-';
-			else
-				finish = p_b_symbol(p);
-		} else
-			finish = start;
-		if (start == finish)
-			CHadd(p, cs, start);
-		else {
-			if (table->__collate_load_error) {
-				(void)REQUIRE((uch)start <= (uch)finish, REG_ERANGE);
-				CHaddrange(p, cs, start, finish);
-			} else {
-				(void)REQUIRE(__collate_range_cmp(table, start, finish) <= 0, REG_ERANGE);
-				for (i = 0; i <= UCHAR_MAX; i++) {
-					if (   __collate_range_cmp(table, start, i) <= 0
-					    && __collate_range_cmp(table, i, finish) <= 0
-					   )
-						CHadd(p, cs, i);
-				}
-			}
-		}
-		break;
-	}
-}
-
-/*
- - p_b_cclass - parse a character-class name and deal with it
- == static void p_b_cclass(struct parse *p, cset *cs);
- */
-static void
-p_b_cclass(struct parse *p, cset *cs)
-{
-	char *sp = p->next;
-	size_t len;
-	wctype_t wct;
-	char clname[16];
-
-	while (MORE() && isalpha((uch)PEEK()))
-		NEXT();
-	len = p->next - sp;
-	if (len >= sizeof(clname) - 1) {
-		SETERROR(REG_ECTYPE);
-		return;
-	}
-	memcpy(clname, sp, len);
-	clname[len] = '\0';
-	if ((wct = wctype(clname)) == 0) {
-		SETERROR(REG_ECTYPE);
-		return;
-	}
-	CHaddtype(p, cs, wct);
-}
-
-/*
- - p_b_eclass - parse an equivalence-class name and deal with it
- == static void p_b_eclass(struct parse *p, cset *cs);
- *
- * This implementation is incomplete. xxx
- */
-static void
-p_b_eclass(struct parse *p, cset *cs)
-{
-	wint_t c;
-
-	c = p_b_coll_elem(p, '=');
-	CHadd(p, cs, c);
-}
-
-/*
- - p_b_symbol - parse a character or [..]ed multicharacter collating symbol
- == static wint_t p_b_symbol(struct parse *p);
- */
-static wint_t			/* value of symbol */
-p_b_symbol(struct parse *p)
-{
-	wint_t value;
-
-	(void)REQUIRE(MORE(), REG_EBRACK);
-	if (!EATTWO('[', '.'))
-		return(WGETNEXT());
-
-	/* collating symbol */
-	value = p_b_coll_elem(p, '.');
-	(void)REQUIRE(EATTWO('.', ']'), REG_ECOLLATE);
-	return(value);
-}
-
-/*
- - p_b_coll_elem - parse a collating-element name and look it up
- == static wint_t p_b_coll_elem(struct parse *p, wint_t endc);
- */
-static wint_t			/* value of collating element */
-p_b_coll_elem(struct parse *p,
-	wint_t endc)		/* name ended by endc,']' */
-{
-	char *sp = p->next;
-	struct cname *cp;
-	int len;
-	mbstate_t mbs;
-	wchar_t wc;
-	size_t clen;
-
-	while (MORE() && !SEETWO(endc, ']'))
-		NEXT();
-	if (!MORE()) {
-		SETERROR(REG_EBRACK);
-		return(0);
-	}
-	len = p->next - sp;
-	for (cp = cnames; cp->name != NULL; cp++)
-		if (strncmp(cp->name, sp, len) == 0 && cp->name[len] == '\0')
-			return(cp->code);	/* known name */
-	memset(&mbs, 0, sizeof(mbs));
-	if ((clen = mbrtowc(&wc, sp, len, &mbs)) == len)
-		return (wc);			/* single character */
-	else if (clen == (size_t)-1 || clen == (size_t)-2)
-		SETERROR(REG_ILLSEQ);
-	else
-		SETERROR(REG_ECOLLATE);		/* neither */
-	return(0);
-}
-
-/*
- - othercase - return the case counterpart of an alphabetic
- == static wint_t othercase(wint_t ch);
- */
-static wint_t			/* if no counterpart, return ch */
-othercase(wint_t ch)
-{
-	assert(iswalpha(ch));
-	if (iswupper(ch))
-		return(towlower(ch));
-	else if (iswlower(ch))
-		return(towupper(ch));
-	else			/* peculiar, but could happen */
-		return(ch);
-}
-
-/*
- - bothcases - emit a dualcase version of a two-case character
- == static void bothcases(struct parse *p, wint_t ch);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-bothcases(struct parse *p, wint_t ch)
-{
-	char *oldnext = p->next;
-	char *oldend = p->end;
-	char bracket[3 + MB_LEN_MAX];
-	size_t n;
-	mbstate_t mbs;
-
-	assert(othercase(ch) != ch);	/* p_bracket() would recurse */
-	p->next = bracket;
-	memset(&mbs, 0, sizeof(mbs));
-	n = wcrtomb(bracket, ch, &mbs);
-	assert(n != (size_t)-1);
-	bracket[n] = ']';
-	bracket[n + 1] = '\0';
-	p->end = bracket+n+1;
-	p_bracket(p);
-	assert(p->next == p->end);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - ordinary - emit an ordinary character
- == static void ordinary(struct parse *p, wint_t ch);
- */
-static void
-ordinary(struct parse *p, wint_t ch)
-{
-	cset *cs;
-
-	if ((p->g->cflags&REG_ICASE) && iswalpha(ch) && othercase(ch) != ch)
-		bothcases(p, ch);
-	else if ((ch & OPDMASK) == ch)
-		EMIT(OCHAR, ch);
-	else {
-		/*
-		 * Kludge: character is too big to fit into an OCHAR operand.
-		 * Emit a singleton set.
-		 */
-		if ((cs = allocset(p)) == NULL)
-			return;
-		CHadd(p, cs, ch);
-		EMIT(OANYOF, (int)(cs - p->g->sets));
-	}
-}
-
-/*
- - nonnewline - emit REG_NEWLINE version of OANY
- == static void nonnewline(struct parse *p);
- *
- * Boy, is this implementation ever a kludge...
- */
-static void
-nonnewline(struct parse *p)
-{
-	char *oldnext = p->next;
-	char *oldend = p->end;
-	char bracket[4];
-
-	p->next = bracket;
-	p->end = bracket+3;
-	bracket[0] = '^';
-	bracket[1] = '\n';
-	bracket[2] = ']';
-	bracket[3] = '\0';
-	p_bracket(p);
-	assert(p->next == bracket+3);
-	p->next = oldnext;
-	p->end = oldend;
-}
-
-/*
- - repeat - generate code for a bounded repetition, recursively if needed
- == static void repeat(struct parse *p, sopno start, int from, int to);
- */
-static void
-repeat(struct parse *p,
-	sopno start,		/* operand from here to end of strip */
-	int from,		/* repeated from this number */
-	int to)			/* to this number of times (maybe INFINITY) */
-{
-	sopno finish = HERE();
-#	define	N	2
-#	define	INF	3
-#	define	REP(f, t)	((f)*8 + (t))
-#	define	MAP(n)	(((n) <= 1) ? (n) : ((n) == INFINITY) ? INF : N)
-	sopno copy;
-
-	if (p->error != 0)	/* head off possible runaway recursion */
-		return;
-
-	assert(from <= to);
-
-	switch (REP(MAP(from), MAP(to))) {
-	case REP(0, 0):			/* must be user doing this */
-		DROP(finish-start);	/* drop the operand */
-		break;
-	case REP(0, 1):			/* as x{1,1}? */
-	case REP(0, N):			/* as x{1,n}? */
-	case REP(0, INF):		/* as x{1,}? */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);		/* offset is wrong... */
-		repeat(p, start+1, 1, to);
-		ASTERN(OOR1, start);
-		AHEAD(start);			/* ... fix it */
-		EMIT(OOR2, 0);
-		AHEAD(THERE());
-		ASTERN(O_CH, THERETHERE());
-		break;
-	case REP(1, 1):			/* trivial case */
-		/* done */
-		break;
-	case REP(1, N):			/* as x?x{1,n-1} */
-		/* KLUDGE: emit y? as (y|) until subtle bug gets fixed */
-		INSERT(OCH_, start);
-		ASTERN(OOR1, start);
-		AHEAD(start);
-		EMIT(OOR2, 0);			/* offset very wrong... */
-		AHEAD(THERE());			/* ...so fix it */
-		ASTERN(O_CH, THERETHERE());
-		copy = dupl(p, start+1, finish+1);
-		assert(copy == finish+4);
-		repeat(p, copy, 1, to-1);
-		break;
-	case REP(1, INF):		/* as x+ */
-		INSERT(OPLUS_, start);
-		ASTERN(O_PLUS, start);
-		break;
-	case REP(N, N):			/* as xx{m-1,n-1} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to-1);
-		break;
-	case REP(N, INF):		/* as xx{n-1,INF} */
-		copy = dupl(p, start, finish);
-		repeat(p, copy, from-1, to);
-		break;
-	default:			/* "can't happen" */
-		SETERROR(REG_ASSERT);	/* just in case */
-		break;
-	}
-}
-
-/*
- - wgetnext - helper function for WGETNEXT() macro. Gets the next wide
- - character from the parse struct, signals a REG_ILLSEQ error if the
- - character can't be converted. Returns the number of bytes consumed.
- */
-static wint_t
-wgetnext(struct parse *p)
-{
-	mbstate_t mbs;
-	wchar_t wc;
-	size_t n;
-
-	memset(&mbs, 0, sizeof(mbs));
-	n = mbrtowc(&wc, p->next, p->end - p->next, &mbs);
-	if (n == (size_t)-1 || n == (size_t)-2) {
-		SETERROR(REG_ILLSEQ);
-		return (0);
-	}
-	if (n == 0)
-		n = 1;
-	p->next += n;
-	return (wc);
-}
-
-/*
- - seterr - set an error condition
- == static int seterr(struct parse *p, int e);
- */
-static int			/* useless but makes type checking happy */
-seterr(struct parse *p, int e)
-{
-	if (p->error == 0)	/* keep earliest error condition */
-		p->error = e;
-	p->next = nuls;		/* try to bring things to a halt */
-	p->end = nuls;
-	return(0);		/* make the return value well-defined */
-}
-
-/*
- - allocset - allocate a set of characters for []
- == static cset *allocset(struct parse *p);
- */
-static cset *
-allocset(struct parse *p)
-{
-	cset *cs, *ncs;
-
-	ncs = realloc(p->g->sets, (p->g->ncsets + 1) * sizeof(*ncs));
-	if (ncs == NULL) {
-		SETERROR(REG_ESPACE);
-		return (NULL);
-	}
-	p->g->sets = ncs;
-	cs = &p->g->sets[p->g->ncsets++];
-	memset(cs, 0, sizeof(*cs));
-
-	return(cs);
-}
-
-/*
- - freeset - free a now-unused set
- == static void freeset(struct parse *p, cset *cs);
- */
-static void
-freeset(struct parse *p, cset *cs)
-{
-	cset *top = &p->g->sets[p->g->ncsets];
-
-	free(cs->wides);
-	free(cs->ranges);
-	free(cs->types);
-	memset(cs, 0, sizeof(*cs));
-	if (cs == top-1)	/* recover only the easy case */
-		p->g->ncsets--;
-}
-
-/*
- - singleton - Determine whether a set contains only one character,
- - returning it if so, otherwise returning OUT.
- */
-static wint_t
-singleton(cset *cs)
-{
-	wint_t i, s, n;
-
-	for (i = n = 0; i < NC; i++)
-		if (CHIN(cs, i)) {
-			n++;
-			s = i;
-		}
-	if (n == 1)
-		return (s);
-	if (cs->nwides == 1 && cs->nranges == 0 && cs->ntypes == 0 &&
-	    cs->icase == 0)
-		return (cs->wides[0]);
-	/* Don't bother handling the other cases. */
-	return (OUT);
-}
-
-/*
- - CHadd - add character to character set.
- */
-static void
-CHadd(struct parse *p, cset *cs, wint_t ch)
-{
-	wint_t nch, *newwides;
-	assert(ch >= 0);
-	if (ch < NC)
-		cs->bmp[ch >> 3] |= 1 << (ch & 7);
-	else {
-		newwides = realloc(cs->wides, (cs->nwides + 1) *
-		    sizeof(*cs->wides));
-		if (newwides == NULL) {
-			SETERROR(REG_ESPACE);
-			return;
-		}
-		cs->wides = newwides;
-		cs->wides[cs->nwides++] = ch;
-	}
-	if (cs->icase) {
-		if ((nch = towlower(ch)) < NC)
-			cs->bmp[nch >> 3] |= 1 << (nch & 7);
-		if ((nch = towupper(ch)) < NC)
-			cs->bmp[nch >> 3] |= 1 << (nch & 7);
-	}
-}
-
-/*
- - CHaddrange - add all characters in the range [min,max] to a character set.
- */
-static void
-CHaddrange(struct parse *p, cset *cs, wint_t min, wint_t max)
-{
-	crange *newranges;
-
-	for (; min < NC && min <= max; min++)
-		CHadd(p, cs, min);
-	if (min >= max)
-		return;
-	newranges = realloc(cs->ranges, (cs->nranges + 1) *
-	    sizeof(*cs->ranges));
-	if (newranges == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-	cs->ranges = newranges;
-	cs->ranges[cs->nranges].min = min;
-	cs->ranges[cs->nranges].max = max;
-	cs->nranges++;
-}
-
-/*
- - CHaddtype - add all characters of a certain type to a character set.
- */
-static void
-CHaddtype(struct parse *p, cset *cs, wctype_t wct)
-{
-	wint_t i;
-	wctype_t *newtypes;
-
-	for (i = 0; i < NC; i++)
-		if (iswctype(i, wct))
-			CHadd(p, cs, i);
-	newtypes = realloc(cs->types, (cs->ntypes + 1) *
-	    sizeof(*cs->types));
-	if (newtypes == NULL) {
-		SETERROR(REG_ESPACE);
-		return;
-	}
-	cs->types = newtypes;
-	cs->types[cs->ntypes++] = wct;
-}
-
-/*
- - dupl - emit a duplicate of a bunch of sops
- == static sopno dupl(struct parse *p, sopno start, sopno finish);
- */
-static sopno			/* start of duplicate */
-dupl(struct parse *p,
-	sopno start,		/* from here */
-	sopno finish)		/* to this less one */
-{
-	sopno ret = HERE();
-	sopno len = finish - start;
-
-	assert(finish >= start);
-	if (len == 0)
-		return(ret);
-	if (!enlarge(p, p->ssize + len)) /* this many unexpected additions */
-		return(ret);
-	(void) memcpy((char *)(p->strip + p->slen),
-		(char *)(p->strip + start), (size_t)len*sizeof(sop));
-	p->slen += len;
-	return(ret);
-}
-
-/*
- - doemit - emit a strip operator
- == static void doemit(struct parse *p, sop op, size_t opnd);
- *
- * It might seem better to implement this as a macro with a function as
- * hard-case backup, but it's just too big and messy unless there are
- * some changes to the data structures.  Maybe later.
- */
-static void
-doemit(struct parse *p, sop op, size_t opnd)
-{
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/* deal with oversize operands ("can't happen", more or less) */
-	assert(opnd < 1<<OPSHIFT);
-
-	/* deal with undersized strip */
-	if (p->slen >= p->ssize)
-		if (!enlarge(p, (p->ssize+1) / 2 * 3))	/* +50% */
-			return;
-
-	/* finally, it's all reduced to the easy case */
-	p->strip[p->slen++] = SOP(op, opnd);
-}
-
-/*
- - doinsert - insert a sop into the strip
- == static void doinsert(struct parse *p, sop op, size_t opnd, sopno pos);
- */
-static void
-doinsert(struct parse *p, sop op, size_t opnd, sopno pos)
-{
-	sopno sn;
-	sop s;
-	int i;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	sn = HERE();
-	EMIT(op, opnd);		/* do checks, ensure space */
-	assert(HERE() == sn+1);
-	s = p->strip[sn];
-
-	/* adjust paren pointers */
-	assert(pos > 0);
-	for (i = 1; i < NPAREN; i++) {
-		if (p->pbegin[i] >= pos) {
-			p->pbegin[i]++;
-		}
-		if (p->pend[i] >= pos) {
-			p->pend[i]++;
-		}
-	}
-
-	memmove((char *)&p->strip[pos+1], (char *)&p->strip[pos],
-						(HERE()-pos-1)*sizeof(sop));
-	p->strip[pos] = s;
-}
-
-/*
- - dofwd - complete a forward reference
- == static void dofwd(struct parse *p, sopno pos, sop value);
- */
-static void
-dofwd(struct parse *p, sopno pos, sop value)
-{
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	assert(value < 1<<OPSHIFT);
-	p->strip[pos] = OP(p->strip[pos]) | value;
-}
-
-/*
- - enlarge - enlarge the strip
- == static int enlarge(struct parse *p, sopno size);
- */
-static int
-enlarge(struct parse *p, sopno size)
-{
-	sop *sp;
-
-	if (p->ssize >= size)
-		return 1;
-
-	sp = (sop *)realloc(p->strip, size*sizeof(sop));
-	if (sp == NULL) {
-		SETERROR(REG_ESPACE);
-		return 0;
-	}
-	p->strip = sp;
-	p->ssize = size;
-	return 1;
-}
-
-/*
- - stripsnug - compact the strip
- == static void stripsnug(struct parse *p, struct re_guts *g);
- */
-static void
-stripsnug(struct parse *p, struct re_guts *g)
-{
-	g->nstates = p->slen;
-	g->strip = (sop *)realloc((char *)p->strip, p->slen * sizeof(sop));
-	if (g->strip == NULL) {
-		SETERROR(REG_ESPACE);
-		g->strip = p->strip;
-	}
-}
-
-/*
- - findmust - fill in must and mlen with longest mandatory literal string
- == static void findmust(struct parse *p, struct re_guts *g);
- *
- * This algorithm could do fancy things like analyzing the operands of |
- * for common subsequences.  Someday.  This code is simple and finds most
- * of the interesting cases.
- *
- * Note that must and mlen got initialized during setup.
- */
-static void
-findmust(struct parse *p, struct re_guts *g)
-{
-	sop *scan;
-	sop *start;
-	sop *newstart;
-	sopno newlen;
-	sop s;
-	char *cp;
-	int offset;
-	char buf[MB_LEN_MAX];
-	size_t clen;
-	mbstate_t mbs;
-
-	/* avoid making error situations worse */
-	if (p->error != 0)
-		return;
-
-	/*
-	 * It's not generally safe to do a ``char'' substring search on
-	 * multibyte character strings, but it's safe for at least
-	 * UTF-8 (see RFC 3629).
-	 */
-	if (MB_CUR_MAX > 1 &&
-	    strcmp(_CurrentRuneLocale->__encoding, "UTF-8") != 0)
-		return;
-
-	/* find the longest OCHAR sequence in strip */
-	newlen = 0;
-	offset = 0;
-	g->moffset = 0;
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OCHAR:		/* sequence member */
-			if (newlen == 0) {		/* new sequence */
-				memset(&mbs, 0, sizeof(mbs));
-				newstart = scan - 1;
-			}
-			clen = wcrtomb(buf, OPND(s), &mbs);
-			if (clen == (size_t)-1)
-				goto toohard;
-			newlen += clen;
-			break;
-		case OPLUS_:		/* things that don't break one */
-		case OLPAREN:
-		case ORPAREN:
-			break;
-		case OQUEST_:		/* things that must be skipped */
-		case OCH_:
-			offset = altoffset(scan, offset);
-			scan--;
-			do {
-				scan += OPND(s);
-				s = *scan;
-				/* assert() interferes w debug printouts */
-				if (OP(s) != O_QUEST && OP(s) != O_CH &&
-							OP(s) != OOR2) {
-					g->iflags |= BAD;
-					return;
-				}
-			} while (OP(s) != O_QUEST && OP(s) != O_CH);
-			/* FALLTHROUGH */
-		case OBOW:		/* things that break a sequence */
-		case OEOW:
-		case OBOL:
-		case OEOL:
-		case O_QUEST:
-		case O_CH:
-		case OEND:
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1) {
-					g->moffset += offset;
-					offset = newlen;
-				} else
-					g->moffset = offset;
-			} else {
-				if (offset > -1)
-					offset += newlen;
-			}
-			newlen = 0;
-			break;
-		case OANY:
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1) {
-					g->moffset += offset;
-					offset = newlen;
-				} else
-					g->moffset = offset;
-			} else {
-				if (offset > -1)
-					offset += newlen;
-			}
-			if (offset > -1)
-				offset++;
-			newlen = 0;
-			break;
-		case OANYOF:		/* may or may not invalidate offset */
-			/* First, everything as OANY */
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1) {
-					g->moffset += offset;
-					offset = newlen;
-				} else
-					g->moffset = offset;
-			} else {
-				if (offset > -1)
-					offset += newlen;
-			}
-			if (offset > -1)
-				offset++;
-			newlen = 0;
-			break;
-		toohard:
-		default:
-			/* Anything here makes it impossible or too hard
-			 * to calculate the offset -- so we give up;
-			 * save the last known good offset, in case the
-			 * must sequence doesn't occur later.
-			 */
-			if (newlen > g->mlen) {		/* ends one */
-				start = newstart;
-				g->mlen = newlen;
-				if (offset > -1)
-					g->moffset += offset;
-				else
-					g->moffset = offset;
-			}
-			offset = -1;
-			newlen = 0;
-			break;
-		}
-	} while (OP(s) != OEND);
-
-	if (g->mlen == 0) {		/* there isn't one */
-		g->moffset = -1;
-		return;
-	}
-
-	/* turn it into a character string */
-	g->must = malloc((size_t)g->mlen + 1);
-	if (g->must == NULL) {		/* argh; just forget it */
-		g->mlen = 0;
-		g->moffset = -1;
-		return;
-	}
-	cp = g->must;
-	scan = start;
-	memset(&mbs, 0, sizeof(mbs));
-	while (cp < g->must + g->mlen) {
-		while (OP(s = *scan++) != OCHAR)
-			continue;
-		clen = wcrtomb(cp, OPND(s), &mbs);
-		assert(clen != (size_t)-1);
-		cp += clen;
-	}
-	assert(cp == g->must + g->mlen);
-	*cp++ = '\0';		/* just on general principles */
-}
-
-/*
- - altoffset - choose biggest offset among multiple choices
- == static int altoffset(sop *scan, int offset);
- *
- * Compute, recursively if necessary, the largest offset among multiple
- * re paths.
- */
-static int
-altoffset(sop *scan, int offset)
-{
-	int largest;
-	int try;
-	sop s;
-
-	/* If we gave up already on offsets, return */
-	if (offset == -1)
-		return -1;
-
-	largest = 0;
-	try = 0;
-	s = *scan++;
-	while (OP(s) != O_QUEST && OP(s) != O_CH) {
-		switch (OP(s)) {
-		case OOR1:
-			if (try > largest)
-				largest = try;
-			try = 0;
-			break;
-		case OQUEST_:
-		case OCH_:
-			try = altoffset(scan, try);
-			if (try == -1)
-				return -1;
-			scan--;
-			do {
-				scan += OPND(s);
-				s = *scan;
-				if (OP(s) != O_QUEST && OP(s) != O_CH &&
-							OP(s) != OOR2)
-					return -1;
-			} while (OP(s) != O_QUEST && OP(s) != O_CH);
-			/* We must skip to the next position, or we'll
-			 * leave altoffset() too early.
-			 */
-			scan++;
-			break;
-		case OANYOF:
-		case OCHAR:
-		case OANY:
-			try++;
-		case OBOW:
-		case OEOW:
-		case OLPAREN:
-		case ORPAREN:
-		case OOR2:
-			break;
-		default:
-			try = -1;
-			break;
-		}
-		if (try == -1)
-			return -1;
-		s = *scan++;
-	}
-
-	if (try > largest)
-		largest = try;
-
-	return largest+offset;
-}
-
-/*
- - computejumps - compute char jumps for BM scan
- == static void computejumps(struct parse *p, struct re_guts *g);
- *
- * This algorithm assumes g->must exists and is has size greater than
- * zero. It's based on the algorithm found on Computer Algorithms by
- * Sara Baase.
- *
- * A char jump is the number of characters one needs to jump based on
- * the value of the character from the text that was mismatched.
- */
-static void
-computejumps(struct parse *p, struct re_guts *g)
-{
-	int ch;
-	int mindex;
-
-	/* Avoid making errors worse */
-	if (p->error != 0)
-		return;
-
-	g->charjump = (int*) malloc((NC + 1) * sizeof(int));
-	if (g->charjump == NULL)	/* Not a fatal error */
-		return;
-	/* Adjust for signed chars, if necessary */
-	g->charjump = &g->charjump[-(CHAR_MIN)];
-
-	/* If the character does not exist in the pattern, the jump
-	 * is equal to the number of characters in the pattern.
-	 */
-	for (ch = CHAR_MIN; ch < (CHAR_MAX + 1); ch++)
-		g->charjump[ch] = g->mlen;
-
-	/* If the character does exist, compute the jump that would
-	 * take us to the last character in the pattern equal to it
-	 * (notice that we match right to left, so that last character
-	 * is the first one that would be matched).
-	 */
-	for (mindex = 0; mindex < g->mlen; mindex++)
-		g->charjump[(int)g->must[mindex]] = g->mlen - mindex - 1;
-}
-
-/*
- - computematchjumps - compute match jumps for BM scan
- == static void computematchjumps(struct parse *p, struct re_guts *g);
- *
- * This algorithm assumes g->must exists and is has size greater than
- * zero. It's based on the algorithm found on Computer Algorithms by
- * Sara Baase.
- *
- * A match jump is the number of characters one needs to advance based
- * on the already-matched suffix.
- * Notice that all values here are minus (g->mlen-1), because of the way
- * the search algorithm works.
- */
-static void
-computematchjumps(struct parse *p, struct re_guts *g)
-{
-	int mindex;		/* General "must" iterator */
-	int suffix;		/* Keeps track of matching suffix */
-	int ssuffix;		/* Keeps track of suffixes' suffix */
-	int* pmatches;		/* pmatches[k] points to the next i
-				 * such that i+1...mlen is a substring
-				 * of k+1...k+mlen-i-1
-				 */
-
-	/* Avoid making errors worse */
-	if (p->error != 0)
-		return;
-
-	pmatches = (int*) malloc(g->mlen * sizeof(unsigned int));
-	if (pmatches == NULL) {
-		g->matchjump = NULL;
-		return;
-	}
-
-	g->matchjump = (int*) malloc(g->mlen * sizeof(unsigned int));
-	if (g->matchjump == NULL) {	/* Not a fatal error */
-		free(pmatches);
-		return;
-	}
-
-	/* Set maximum possible jump for each character in the pattern */
-	for (mindex = 0; mindex < g->mlen; mindex++)
-		g->matchjump[mindex] = 2*g->mlen - mindex - 1;
-
-	/* Compute pmatches[] */
-	for (mindex = g->mlen - 1, suffix = g->mlen; mindex >= 0;
-	    mindex--, suffix--) {
-		pmatches[mindex] = suffix;
-
-		/* If a mismatch is found, interrupting the substring,
-		 * compute the matchjump for that position. If no
-		 * mismatch is found, then a text substring mismatched
-		 * against the suffix will also mismatch against the
-		 * substring.
-		 */
-		while (suffix < g->mlen
-		    && g->must[mindex] != g->must[suffix]) {
-			g->matchjump[suffix] = MIN(g->matchjump[suffix],
-			    g->mlen - mindex - 1);
-			suffix = pmatches[suffix];
-		}
-	}
-
-	/* Compute the matchjump up to the last substring found to jump
-	 * to the beginning of the largest must pattern prefix matching
-	 * it's own suffix.
-	 */
-	for (mindex = 0; mindex <= suffix; mindex++)
-		g->matchjump[mindex] = MIN(g->matchjump[mindex],
-		    g->mlen + suffix - mindex);
-
-        ssuffix = pmatches[suffix];
-        while (suffix < g->mlen) {
-                while (suffix <= ssuffix && suffix < g->mlen) {
-                        g->matchjump[suffix] = MIN(g->matchjump[suffix],
-			    g->mlen + ssuffix - suffix);
-                        suffix++;
-                }
-		if (suffix < g->mlen)
-                	ssuffix = pmatches[ssuffix];
-        }
-
-	free(pmatches);
-}
-
-/*
- - pluscount - count + nesting
- == static sopno pluscount(struct parse *p, struct re_guts *g);
- */
-static sopno			/* nesting depth */
-pluscount(struct parse *p, struct re_guts *g)
-{
-	sop *scan;
-	sop s;
-	sopno plusnest = 0;
-	sopno maxnest = 0;
-
-	if (p->error != 0)
-		return(0);	/* there may not be an OEND */
-
-	scan = g->strip + 1;
-	do {
-		s = *scan++;
-		switch (OP(s)) {
-		case OPLUS_:
-			plusnest++;
-			break;
-		case O_PLUS:
-			if (plusnest > maxnest)
-				maxnest = plusnest;
-			plusnest--;
-			break;
-		}
-	} while (OP(s) != OEND);
-	if (plusnest != 0)
-		g->iflags |= BAD;
-	return(maxnest);
-}
diff --git a/lib/libc_bsd/regex/regerror.c b/lib/libc_bsd/regex/regerror.c
deleted file mode 100644
index 630b093..0000000
--- a/lib/libc_bsd/regex/regerror.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- * 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.
- *
- *	@(#)regerror.c	8.4 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regerror.c	8.4 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/regex/regerror.c 170528 2007-06-11 03:05:54Z delphij $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <regex.h>
-
-#include "utils.h"
-
-/* ========= begin header generated by ./mkh ========= */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* === regerror.c === */
-static char *regatoi(const regex_t *preg, char *localbuf);
-
-#ifdef __cplusplus
-}
-#endif
-/* ========= end header generated by ./mkh ========= */
-/*
- = #define	REG_NOMATCH	 1
- = #define	REG_BADPAT	 2
- = #define	REG_ECOLLATE	 3
- = #define	REG_ECTYPE	 4
- = #define	REG_EESCAPE	 5
- = #define	REG_ESUBREG	 6
- = #define	REG_EBRACK	 7
- = #define	REG_EPAREN	 8
- = #define	REG_EBRACE	 9
- = #define	REG_BADBR	10
- = #define	REG_ERANGE	11
- = #define	REG_ESPACE	12
- = #define	REG_BADRPT	13
- = #define	REG_EMPTY	14
- = #define	REG_ASSERT	15
- = #define	REG_INVARG	16
- = #define	REG_ILLSEQ	17
- = #define	REG_ATOI	255	// convert name to number (!)
- = #define	REG_ITOA	0400	// convert number to name (!)
- */
-static struct rerr {
-	int code;
-	char *name;
-	char *explain;
-} rerrs[] = {
-	{REG_NOMATCH,	"REG_NOMATCH",	"regexec() failed to match"},
-	{REG_BADPAT,	"REG_BADPAT",	"invalid regular expression"},
-	{REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element"},
-	{REG_ECTYPE,	"REG_ECTYPE",	"invalid character class"},
-	{REG_EESCAPE,	"REG_EESCAPE",	"trailing backslash (\\)"},
-	{REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number"},
-	{REG_EBRACK,	"REG_EBRACK",	"brackets ([ ]) not balanced"},
-	{REG_EPAREN,	"REG_EPAREN",	"parentheses not balanced"},
-	{REG_EBRACE,	"REG_EBRACE",	"braces not balanced"},
-	{REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)"},
-	{REG_ERANGE,	"REG_ERANGE",	"invalid character range"},
-	{REG_ESPACE,	"REG_ESPACE",	"out of memory"},
-	{REG_BADRPT,	"REG_BADRPT",	"repetition-operator operand invalid"},
-	{REG_EMPTY,	"REG_EMPTY",	"empty (sub)expression"},
-	{REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug"},
-	{REG_INVARG,	"REG_INVARG",	"invalid argument to regex routine"},
-	{REG_ILLSEQ,	"REG_ILLSEQ",	"illegal byte sequence"},
-	{0,		"",		"*** unknown regexp error code ***"}
-};
-
-/*
- - regerror - the interface to error numbers
- = extern size_t regerror(int, const regex_t *, char *, size_t);
- */
-/* ARGSUSED */
-size_t
-regerror(int errcode,
-	 const regex_t * __restrict preg,
-	 char * __restrict errbuf,
-	 size_t errbuf_size)
-{
-	struct rerr *r;
-	size_t len;
-	int target = errcode &~ REG_ITOA;
-	char *s;
-	char convbuf[50];
-
-	if (errcode == REG_ATOI)
-		s = regatoi(preg, convbuf);
-	else {
-		for (r = rerrs; r->code != 0; r++)
-			if (r->code == target)
-				break;
-
-		if (errcode&REG_ITOA) {
-			if (r->code != 0)
-				(void) strcpy(convbuf, r->name);
-			else
-				sprintf(convbuf, "REG_0x%x", target);
-			assert(strlen(convbuf) < sizeof(convbuf));
-			s = convbuf;
-		} else
-			s = r->explain;
-	}
-
-	len = strlen(s) + 1;
-	if (errbuf_size > 0) {
-		if (errbuf_size > len)
-			(void) strcpy(errbuf, s);
-		else {
-			(void) strncpy(errbuf, s, errbuf_size-1);
-			errbuf[errbuf_size-1] = '\0';
-		}
-	}
-
-	return(len);
-}
-
-/*
- - regatoi - internal routine to implement REG_ATOI
- == static char *regatoi(const regex_t *preg, char *localbuf);
- */
-static char *
-regatoi(const regex_t *preg, char *localbuf)
-{
-	struct rerr *r;
-
-	for (r = rerrs; r->code != 0; r++)
-		if (strcmp(r->name, preg->re_endp) == 0)
-			break;
-	if (r->code == 0)
-		return("0");
-
-	sprintf(localbuf, "%d", r->code);
-	return(localbuf);
-}
diff --git a/lib/libc_bsd/regex/regex.3 b/lib/libc_bsd/regex/regex.3
deleted file mode 100644
index c02c439..0000000
--- a/lib/libc_bsd/regex/regex.3
+++ /dev/null
@@ -1,727 +0,0 @@
-.\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
-.\" Copyright (c) 1992, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Henry Spencer.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)regex.3	8.4 (Berkeley) 3/20/94
-.\" $FreeBSD: releng/10.2/lib/libc/regex/regex.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd August 17, 2005
-.Dt REGEX 3
-.Os
-.Sh NAME
-.Nm regcomp ,
-.Nm regexec ,
-.Nm regerror ,
-.Nm regfree
-.Nd regular-expression library
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In regex.h
-.Ft int
-.Fo regcomp
-.Fa "regex_t * restrict preg" "const char * restrict pattern" "int cflags"
-.Fc
-.Ft int
-.Fo regexec
-.Fa "const regex_t * restrict preg" "const char * restrict string"
-.Fa "size_t nmatch" "regmatch_t pmatch[restrict]" "int eflags"
-.Fc
-.Ft size_t
-.Fo regerror
-.Fa "int errcode" "const regex_t * restrict preg"
-.Fa "char * restrict errbuf" "size_t errbuf_size"
-.Fc
-.Ft void
-.Fn regfree "regex_t *preg"
-.Sh DESCRIPTION
-These routines implement
-.St -p1003.2
-regular expressions
-.Pq Do RE Dc Ns s ;
-see
-.Xr re_format 7 .
-The
-.Fn regcomp
-function
-compiles an RE written as a string into an internal form,
-.Fn regexec
-matches that internal form against a string and reports results,
-.Fn regerror
-transforms error codes from either into human-readable messages,
-and
-.Fn regfree
-frees any dynamically-allocated storage used by the internal form
-of an RE.
-.Pp
-The header
-.In regex.h
-declares two structure types,
-.Ft regex_t
-and
-.Ft regmatch_t ,
-the former for compiled internal forms and the latter for match reporting.
-It also declares the four functions,
-a type
-.Ft regoff_t ,
-and a number of constants with names starting with
-.Dq Dv REG_ .
-.Pp
-The
-.Fn regcomp
-function
-compiles the regular expression contained in the
-.Fa pattern
-string,
-subject to the flags in
-.Fa cflags ,
-and places the results in the
-.Ft regex_t
-structure pointed to by
-.Fa preg .
-The
-.Fa cflags
-argument
-is the bitwise OR of zero or more of the following flags:
-.Bl -tag -width REG_EXTENDED
-.It Dv REG_EXTENDED
-Compile modern
-.Pq Dq extended
-REs,
-rather than the obsolete
-.Pq Dq basic
-REs that
-are the default.
-.It Dv REG_BASIC
-This is a synonym for 0,
-provided as a counterpart to
-.Dv REG_EXTENDED
-to improve readability.
-.It Dv REG_NOSPEC
-Compile with recognition of all special characters turned off.
-All characters are thus considered ordinary,
-so the
-.Dq RE
-is a literal string.
-This is an extension,
-compatible with but not specified by
-.St -p1003.2 ,
-and should be used with
-caution in software intended to be portable to other systems.
-.Dv REG_EXTENDED
-and
-.Dv REG_NOSPEC
-may not be used
-in the same call to
-.Fn regcomp .
-.It Dv REG_ICASE
-Compile for matching that ignores upper/lower case distinctions.
-See
-.Xr re_format 7 .
-.It Dv REG_NOSUB
-Compile for matching that need only report success or failure,
-not what was matched.
-.It Dv REG_NEWLINE
-Compile for newline-sensitive matching.
-By default, newline is a completely ordinary character with no special
-meaning in either REs or strings.
-With this flag,
-.Ql [^
-bracket expressions and
-.Ql .\&
-never match newline,
-a
-.Ql ^\&
-anchor matches the null string after any newline in the string
-in addition to its normal function,
-and the
-.Ql $\&
-anchor matches the null string before any newline in the
-string in addition to its normal function.
-.It Dv REG_PEND
-The regular expression ends,
-not at the first NUL,
-but just before the character pointed to by the
-.Va re_endp
-member of the structure pointed to by
-.Fa preg .
-The
-.Va re_endp
-member is of type
-.Ft "const char *" .
-This flag permits inclusion of NULs in the RE;
-they are considered ordinary characters.
-This is an extension,
-compatible with but not specified by
-.St -p1003.2 ,
-and should be used with
-caution in software intended to be portable to other systems.
-.El
-.Pp
-When successful,
-.Fn regcomp
-returns 0 and fills in the structure pointed to by
-.Fa preg .
-One member of that structure
-(other than
-.Va re_endp )
-is publicized:
-.Va re_nsub ,
-of type
-.Ft size_t ,
-contains the number of parenthesized subexpressions within the RE
-(except that the value of this member is undefined if the
-.Dv REG_NOSUB
-flag was used).
-If
-.Fn regcomp
-fails, it returns a non-zero error code;
-see
-.Sx DIAGNOSTICS .
-.Pp
-The
-.Fn regexec
-function
-matches the compiled RE pointed to by
-.Fa preg
-against the
-.Fa string ,
-subject to the flags in
-.Fa eflags ,
-and reports results using
-.Fa nmatch ,
-.Fa pmatch ,
-and the returned value.
-The RE must have been compiled by a previous invocation of
-.Fn regcomp .
-The compiled form is not altered during execution of
-.Fn regexec ,
-so a single compiled RE can be used simultaneously by multiple threads.
-.Pp
-By default,
-the NUL-terminated string pointed to by
-.Fa string
-is considered to be the text of an entire line, minus any terminating
-newline.
-The
-.Fa eflags
-argument is the bitwise OR of zero or more of the following flags:
-.Bl -tag -width REG_STARTEND
-.It Dv REG_NOTBOL
-The first character of
-the string
-is not the beginning of a line, so the
-.Ql ^\&
-anchor should not match before it.
-This does not affect the behavior of newlines under
-.Dv REG_NEWLINE .
-.It Dv REG_NOTEOL
-The NUL terminating
-the string
-does not end a line, so the
-.Ql $\&
-anchor should not match before it.
-This does not affect the behavior of newlines under
-.Dv REG_NEWLINE .
-.It Dv REG_STARTEND
-The string is considered to start at
-.Fa string
-+
-.Fa pmatch Ns [0]. Ns Va rm_so
-and to have a terminating NUL located at
-.Fa string
-+
-.Fa pmatch Ns [0]. Ns Va rm_eo
-(there need not actually be a NUL at that location),
-regardless of the value of
-.Fa nmatch .
-See below for the definition of
-.Fa pmatch
-and
-.Fa nmatch .
-This is an extension,
-compatible with but not specified by
-.St -p1003.2 ,
-and should be used with
-caution in software intended to be portable to other systems.
-Note that a non-zero
-.Va rm_so
-does not imply
-.Dv REG_NOTBOL ;
-.Dv REG_STARTEND
-affects only the location of the string,
-not how it is matched.
-.El
-.Pp
-See
-.Xr re_format 7
-for a discussion of what is matched in situations where an RE or a
-portion thereof could match any of several substrings of
-.Fa string .
-.Pp
-Normally,
-.Fn regexec
-returns 0 for success and the non-zero code
-.Dv REG_NOMATCH
-for failure.
-Other non-zero error codes may be returned in exceptional situations;
-see
-.Sx DIAGNOSTICS .
-.Pp
-If
-.Dv REG_NOSUB
-was specified in the compilation of the RE,
-or if
-.Fa nmatch
-is 0,
-.Fn regexec
-ignores the
-.Fa pmatch
-argument (but see below for the case where
-.Dv REG_STARTEND
-is specified).
-Otherwise,
-.Fa pmatch
-points to an array of
-.Fa nmatch
-structures of type
-.Ft regmatch_t .
-Such a structure has at least the members
-.Va rm_so
-and
-.Va rm_eo ,
-both of type
-.Ft regoff_t
-(a signed arithmetic type at least as large as an
-.Ft off_t
-and a
-.Ft ssize_t ) ,
-containing respectively the offset of the first character of a substring
-and the offset of the first character after the end of the substring.
-Offsets are measured from the beginning of the
-.Fa string
-argument given to
-.Fn regexec .
-An empty substring is denoted by equal offsets,
-both indicating the character following the empty substring.
-.Pp
-The 0th member of the
-.Fa pmatch
-array is filled in to indicate what substring of
-.Fa string
-was matched by the entire RE.
-Remaining members report what substring was matched by parenthesized
-subexpressions within the RE;
-member
-.Va i
-reports subexpression
-.Va i ,
-with subexpressions counted (starting at 1) by the order of their opening
-parentheses in the RE, left to right.
-Unused entries in the array (corresponding either to subexpressions that
-did not participate in the match at all, or to subexpressions that do not
-exist in the RE (that is,
-.Va i
->
-.Fa preg Ns -> Ns Va re_nsub ) )
-have both
-.Va rm_so
-and
-.Va rm_eo
-set to -1.
-If a subexpression participated in the match several times,
-the reported substring is the last one it matched.
-(Note, as an example in particular, that when the RE
-.Ql "(b*)+"
-matches
-.Ql bbb ,
-the parenthesized subexpression matches each of the three
-.So Li b Sc Ns s
-and then
-an infinite number of empty strings following the last
-.Ql b ,
-so the reported substring is one of the empties.)
-.Pp
-If
-.Dv REG_STARTEND
-is specified,
-.Fa pmatch
-must point to at least one
-.Ft regmatch_t
-(even if
-.Fa nmatch
-is 0 or
-.Dv REG_NOSUB
-was specified),
-to hold the input offsets for
-.Dv REG_STARTEND .
-Use for output is still entirely controlled by
-.Fa nmatch ;
-if
-.Fa nmatch
-is 0 or
-.Dv REG_NOSUB
-was specified,
-the value of
-.Fa pmatch Ns [0]
-will not be changed by a successful
-.Fn regexec .
-.Pp
-The
-.Fn regerror
-function
-maps a non-zero
-.Fa errcode
-from either
-.Fn regcomp
-or
-.Fn regexec
-to a human-readable, printable message.
-If
-.Fa preg
-is
-.No non\- Ns Dv NULL ,
-the error code should have arisen from use of
-the
-.Ft regex_t
-pointed to by
-.Fa preg ,
-and if the error code came from
-.Fn regcomp ,
-it should have been the result from the most recent
-.Fn regcomp
-using that
-.Ft regex_t .
-The
-.Fn ( regerror
-may be able to supply a more detailed message using information
-from the
-.Ft regex_t . )
-The
-.Fn regerror
-function
-places the NUL-terminated message into the buffer pointed to by
-.Fa errbuf ,
-limiting the length (including the NUL) to at most
-.Fa errbuf_size
-bytes.
-If the whole message will not fit,
-as much of it as will fit before the terminating NUL is supplied.
-In any case,
-the returned value is the size of buffer needed to hold the whole
-message (including terminating NUL).
-If
-.Fa errbuf_size
-is 0,
-.Fa errbuf
-is ignored but the return value is still correct.
-.Pp
-If the
-.Fa errcode
-given to
-.Fn regerror
-is first ORed with
-.Dv REG_ITOA ,
-the
-.Dq message
-that results is the printable name of the error code,
-e.g.\&
-.Dq Dv REG_NOMATCH ,
-rather than an explanation thereof.
-If
-.Fa errcode
-is
-.Dv REG_ATOI ,
-then
-.Fa preg
-shall be
-.No non\- Ns Dv NULL
-and the
-.Va re_endp
-member of the structure it points to
-must point to the printable name of an error code;
-in this case, the result in
-.Fa errbuf
-is the decimal digits of
-the numeric value of the error code
-(0 if the name is not recognized).
-.Dv REG_ITOA
-and
-.Dv REG_ATOI
-are intended primarily as debugging facilities;
-they are extensions,
-compatible with but not specified by
-.St -p1003.2 ,
-and should be used with
-caution in software intended to be portable to other systems.
-Be warned also that they are considered experimental and changes are possible.
-.Pp
-The
-.Fn regfree
-function
-frees any dynamically-allocated storage associated with the compiled RE
-pointed to by
-.Fa preg .
-The remaining
-.Ft regex_t
-is no longer a valid compiled RE
-and the effect of supplying it to
-.Fn regexec
-or
-.Fn regerror
-is undefined.
-.Pp
-None of these functions references global variables except for tables
-of constants;
-all are safe for use from multiple threads if the arguments are safe.
-.Sh IMPLEMENTATION CHOICES
-There are a number of decisions that
-.St -p1003.2
-leaves up to the implementor,
-either by explicitly saying
-.Dq undefined
-or by virtue of them being
-forbidden by the RE grammar.
-This implementation treats them as follows.
-.Pp
-See
-.Xr re_format 7
-for a discussion of the definition of case-independent matching.
-.Pp
-There is no particular limit on the length of REs,
-except insofar as memory is limited.
-Memory usage is approximately linear in RE size, and largely insensitive
-to RE complexity, except for bounded repetitions.
-See
-.Sx BUGS
-for one short RE using them
-that will run almost any system out of memory.
-.Pp
-A backslashed character other than one specifically given a magic meaning
-by
-.St -p1003.2
-(such magic meanings occur only in obsolete
-.Bq Dq basic
-REs)
-is taken as an ordinary character.
-.Pp
-Any unmatched
-.Ql [\&
-is a
-.Dv REG_EBRACK
-error.
-.Pp
-Equivalence classes cannot begin or end bracket-expression ranges.
-The endpoint of one range cannot begin another.
-.Pp
-.Dv RE_DUP_MAX ,
-the limit on repetition counts in bounded repetitions, is 255.
-.Pp
-A repetition operator
-.Ql ( ?\& ,
-.Ql *\& ,
-.Ql +\& ,
-or bounds)
-cannot follow another
-repetition operator.
-A repetition operator cannot begin an expression or subexpression
-or follow
-.Ql ^\&
-or
-.Ql |\& .
-.Pp
-.Ql |\&
-cannot appear first or last in a (sub)expression or after another
-.Ql |\& ,
-i.e., an operand of
-.Ql |\&
-cannot be an empty subexpression.
-An empty parenthesized subexpression,
-.Ql "()" ,
-is legal and matches an
-empty (sub)string.
-An empty string is not a legal RE.
-.Pp
-A
-.Ql {\&
-followed by a digit is considered the beginning of bounds for a
-bounded repetition, which must then follow the syntax for bounds.
-A
-.Ql {\&
-.Em not
-followed by a digit is considered an ordinary character.
-.Pp
-.Ql ^\&
-and
-.Ql $\&
-beginning and ending subexpressions in obsolete
-.Pq Dq basic
-REs are anchors, not ordinary characters.
-.Sh DIAGNOSTICS
-Non-zero error codes from
-.Fn regcomp
-and
-.Fn regexec
-include the following:
-.Pp
-.Bl -tag -width REG_ECOLLATE -compact
-.It Dv REG_NOMATCH
-The
-.Fn regexec
-function
-failed to match
-.It Dv REG_BADPAT
-invalid regular expression
-.It Dv REG_ECOLLATE
-invalid collating element
-.It Dv REG_ECTYPE
-invalid character class
-.It Dv REG_EESCAPE
-.Ql \e
-applied to unescapable character
-.It Dv REG_ESUBREG
-invalid backreference number
-.It Dv REG_EBRACK
-brackets
-.Ql "[ ]"
-not balanced
-.It Dv REG_EPAREN
-parentheses
-.Ql "( )"
-not balanced
-.It Dv REG_EBRACE
-braces
-.Ql "{ }"
-not balanced
-.It Dv REG_BADBR
-invalid repetition count(s) in
-.Ql "{ }"
-.It Dv REG_ERANGE
-invalid character range in
-.Ql "[ ]"
-.It Dv REG_ESPACE
-ran out of memory
-.It Dv REG_BADRPT
-.Ql ?\& ,
-.Ql *\& ,
-or
-.Ql +\&
-operand invalid
-.It Dv REG_EMPTY
-empty (sub)expression
-.It Dv REG_ASSERT
-cannot happen - you found a bug
-.It Dv REG_INVARG
-invalid argument, e.g.\& negative-length string
-.It Dv REG_ILLSEQ
-illegal byte sequence (bad multibyte character)
-.El
-.Sh SEE ALSO
-.Xr grep 1 ,
-.Xr re_format 7
-.Pp
-.St -p1003.2 ,
-sections 2.8 (Regular Expression Notation)
-and
-B.5 (C Binding for Regular Expression Matching).
-.Sh HISTORY
-Originally written by
-.An Henry Spencer .
-Altered for inclusion in the
-.Bx 4.4
-distribution.
-.Sh BUGS
-This is an alpha release with known defects.
-Please report problems.
-.Pp
-The back-reference code is subtle and doubts linger about its correctness
-in complex cases.
-.Pp
-The
-.Fn regexec
-function
-performance is poor.
-This will improve with later releases.
-The
-.Fa nmatch
-argument
-exceeding 0 is expensive;
-.Fa nmatch
-exceeding 1 is worse.
-The
-.Fn regexec
-function
-is largely insensitive to RE complexity
-.Em except
-that back
-references are massively expensive.
-RE length does matter; in particular, there is a strong speed bonus
-for keeping RE length under about 30 characters,
-with most special characters counting roughly double.
-.Pp
-The
-.Fn regcomp
-function
-implements bounded repetitions by macro expansion,
-which is costly in time and space if counts are large
-or bounded repetitions are nested.
-An RE like, say,
-.Ql "((((a{1,100}){1,100}){1,100}){1,100}){1,100}"
-will (eventually) run almost any existing machine out of swap space.
-.Pp
-There are suspected problems with response to obscure error conditions.
-Notably,
-certain kinds of internal overflow,
-produced only by truly enormous REs or by multiply nested bounded repetitions,
-are probably not handled well.
-.Pp
-Due to a mistake in
-.St -p1003.2 ,
-things like
-.Ql "a)b"
-are legal REs because
-.Ql )\&
-is
-a special character only in the presence of a previous unmatched
-.Ql (\& .
-This cannot be fixed until the spec is fixed.
-.Pp
-The standard's definition of back references is vague.
-For example, does
-.Ql "a\e(\e(b\e)*\e2\e)*d"
-match
-.Ql "abbbd" ?
-Until the standard is clarified,
-behavior in such cases should not be relied on.
-.Pp
-The implementation of word-boundary matching is a bit of a kludge,
-and bugs may lurk in combinations of word-boundary matching and anchoring.
-.Pp
-Word-boundary matching does not work properly in multibyte locales.
diff --git a/lib/libc_bsd/regex/regex2.h b/lib/libc_bsd/regex/regex2.h
deleted file mode 100644
index fa42258..0000000
--- a/lib/libc_bsd/regex/regex2.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- * 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.
- *
- *	@(#)regex2.h	8.4 (Berkeley) 3/20/94
- * $FreeBSD: releng/10.2/lib/libc/regex/regex2.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-/*
- * First, the stuff that ends up in the outside-world include file
- = typedef off_t regoff_t;
- = typedef struct {
- = 	int re_magic;
- = 	size_t re_nsub;		// number of parenthesized subexpressions
- = 	const char *re_endp;	// end pointer for REG_PEND
- = 	struct re_guts *re_g;	// none of your business :-)
- = } regex_t;
- = typedef struct {
- = 	regoff_t rm_so;		// start of match
- = 	regoff_t rm_eo;		// end of match
- = } regmatch_t;
- */
-/*
- * internals of regex_t
- */
-#define	MAGIC1	((('r'^0200)<<8) | 'e')
-
-/*
- * The internal representation is a *strip*, a sequence of
- * operators ending with an endmarker.  (Some terminology etc. is a
- * historical relic of earlier versions which used multiple strips.)
- * Certain oddities in the representation are there to permit running
- * the machinery backwards; in particular, any deviation from sequential
- * flow must be marked at both its source and its destination.  Some
- * fine points:
- *
- * - OPLUS_ and O_PLUS are *inside* the loop they create.
- * - OQUEST_ and O_QUEST are *outside* the bypass they create.
- * - OCH_ and O_CH are *outside* the multi-way branch they create, while
- *   OOR1 and OOR2 are respectively the end and the beginning of one of
- *   the branches.  Note that there is an implicit OOR2 following OCH_
- *   and an implicit OOR1 preceding O_CH.
- *
- * In state representations, an operator's bit is on to signify a state
- * immediately *preceding* "execution" of that operator.
- */
-typedef unsigned long sop;	/* strip operator */
-typedef long sopno;
-#define	OPRMASK	0xf8000000L
-#define	OPDMASK	0x07ffffffL
-#define	OPSHIFT	((unsigned)27)
-#define	OP(n)	((n)&OPRMASK)
-#define	OPND(n)	((n)&OPDMASK)
-#define	SOP(op, opnd)	((op)|(opnd))
-/* operators			   meaning	operand			*/
-/*						(back, fwd are offsets)	*/
-#define	OEND	(1L<<OPSHIFT)	/* endmarker	-			*/
-#define	OCHAR	(2L<<OPSHIFT)	/* character	wide character		*/
-#define	OBOL	(3L<<OPSHIFT)	/* left anchor	-			*/
-#define	OEOL	(4L<<OPSHIFT)	/* right anchor	-			*/
-#define	OANY	(5L<<OPSHIFT)	/* .		-			*/
-#define	OANYOF	(6L<<OPSHIFT)	/* [...]	set number		*/
-#define	OBACK_	(7L<<OPSHIFT)	/* begin \d	paren number		*/
-#define	O_BACK	(8L<<OPSHIFT)	/* end \d	paren number		*/
-#define	OPLUS_	(9L<<OPSHIFT)	/* + prefix	fwd to suffix		*/
-#define	O_PLUS	(10L<<OPSHIFT)	/* + suffix	back to prefix		*/
-#define	OQUEST_	(11L<<OPSHIFT)	/* ? prefix	fwd to suffix		*/
-#define	O_QUEST	(12L<<OPSHIFT)	/* ? suffix	back to prefix		*/
-#define	OLPAREN	(13L<<OPSHIFT)	/* (		fwd to )		*/
-#define	ORPAREN	(14L<<OPSHIFT)	/* )		back to (		*/
-#define	OCH_	(15L<<OPSHIFT)	/* begin choice	fwd to OOR2		*/
-#define	OOR1	(16L<<OPSHIFT)	/* | pt. 1	back to OOR1 or OCH_	*/
-#define	OOR2	(17L<<OPSHIFT)	/* | pt. 2	fwd to OOR2 or O_CH	*/
-#define	O_CH	(18L<<OPSHIFT)	/* end choice	back to OOR1		*/
-#define	OBOW	(19L<<OPSHIFT)	/* begin word	-			*/
-#define	OEOW	(20L<<OPSHIFT)	/* end word	-			*/
-
-/*
- * Structures for [] character-set representation.
- */
-typedef struct {
-	wint_t		min;
-	wint_t		max;
-} crange;
-typedef struct {
-	unsigned char	bmp[NC / 8];
-	wctype_t	*types;
-	int		ntypes;
-	wint_t		*wides;
-	int		nwides;
-	crange		*ranges;
-	int		nranges;
-	int		invert;
-	int		icase;
-} cset;
-
-static int
-CHIN1(cset *cs, wint_t ch)
-{
-	int i;
-
-	assert(ch >= 0);
-	if (ch < NC)
-		return (((cs->bmp[ch >> 3] & (1 << (ch & 7))) != 0) ^
-		    cs->invert);
-	for (i = 0; i < cs->nwides; i++)
-		if (ch == cs->wides[i])
-			return (!cs->invert);
-	for (i = 0; i < cs->nranges; i++)
-		if (cs->ranges[i].min <= ch && ch <= cs->ranges[i].max)
-			return (!cs->invert);
-	for (i = 0; i < cs->ntypes; i++)
-		if (iswctype(ch, cs->types[i]))
-			return (!cs->invert);
-	return (cs->invert);
-}
-
-static __inline int
-CHIN(cset *cs, wint_t ch)
-{
-
-	assert(ch >= 0);
-	if (ch < NC)
-		return (((cs->bmp[ch >> 3] & (1 << (ch & 7))) != 0) ^
-		    cs->invert);
-	else if (cs->icase)
-		return (CHIN1(cs, ch) || CHIN1(cs, towlower(ch)) ||
-		    CHIN1(cs, towupper(ch)));
-	else
-		return (CHIN1(cs, ch));
-}
-
-/*
- * main compiled-expression structure
- */
-struct re_guts {
-	int magic;
-#		define	MAGIC2	((('R'^0200)<<8)|'E')
-	sop *strip;		/* malloced area for strip */
-	int ncsets;		/* number of csets in use */
-	cset *sets;		/* -> cset [ncsets] */
-	int cflags;		/* copy of regcomp() cflags argument */
-	sopno nstates;		/* = number of sops */
-	sopno firststate;	/* the initial OEND (normally 0) */
-	sopno laststate;	/* the final OEND */
-	int iflags;		/* internal flags */
-#		define	USEBOL	01	/* used ^ */
-#		define	USEEOL	02	/* used $ */
-#		define	BAD	04	/* something wrong */
-	int nbol;		/* number of ^ used */
-	int neol;		/* number of $ used */
-	char *must;		/* match must contain this string */
-	int moffset;		/* latest point at which must may be located */
-	int *charjump;		/* Boyer-Moore char jump table */
-	int *matchjump;		/* Boyer-Moore match jump table */
-	int mlen;		/* length of must */
-	size_t nsub;		/* copy of re_nsub */
-	int backrefs;		/* does it use back references? */
-	sopno nplus;		/* how deep does it nest +s? */
-};
-
-/* misc utilities */
-#define	OUT	(CHAR_MIN - 1)	/* a non-character value */
-#define ISWORD(c)       (iswalnum((uch)(c)) || (c) == '_')
diff --git a/lib/libc_bsd/regex/regexec.c b/lib/libc_bsd/regex/regexec.c
deleted file mode 100644
index 82ffae9..0000000
--- a/lib/libc_bsd/regex/regexec.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- * 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.
- *
- *	@(#)regexec.c	8.3 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regexec.c	8.3 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/regex/regexec.c 170528 2007-06-11 03:05:54Z delphij $");
-
-/*
- * the outer shell of regexec()
- *
- * This file includes engine.c three times, after muchos fiddling with the
- * macros that code uses.  This lets the same code operate on two different
- * representations for state sets and characters.
- */
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <ctype.h>
-#include <regex.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "utils.h"
-#include "regex2.h"
-
-static int nope __unused = 0;	/* for use in asserts; shuts lint up */
-
-static __inline size_t
-xmbrtowc(wint_t *wi, const char *s, size_t n, mbstate_t *mbs, wint_t dummy)
-{
-	size_t nr;
-	wchar_t wc;
-
-	nr = mbrtowc(&wc, s, n, mbs);
-	if (wi != NULL)
-		*wi = wc;
-	if (nr == 0)
-		return (1);
-	else if (nr == (size_t)-1 || nr == (size_t)-2) {
-		memset(mbs, 0, sizeof(*mbs));
-		if (wi != NULL)
-			*wi = dummy;
-		return (1);
-	} else
-                return (nr);
-}
-
-static __inline size_t
-xmbrtowc_dummy(wint_t *wi,
-		const char *s,
-		size_t n __unused,
-		mbstate_t *mbs __unused,
-		wint_t dummy __unused)
-{
-
-	if (wi != NULL)
-		*wi = (unsigned char)*s;
-	return (1);
-}
-
-/* macros for manipulating states, small version */
-#define	states	long
-#define	states1	states		/* for later use in regexec() decision */
-#define	CLEAR(v)	((v) = 0)
-#define	SET0(v, n)	((v) &= ~((unsigned long)1 << (n)))
-#define	SET1(v, n)	((v) |= (unsigned long)1 << (n))
-#define	ISSET(v, n)	(((v) & ((unsigned long)1 << (n))) != 0)
-#define	ASSIGN(d, s)	((d) = (s))
-#define	EQ(a, b)	((a) == (b))
-#define	STATEVARS	long dummy	/* dummy version */
-#define	STATESETUP(m, n)	/* nothing */
-#define	STATETEARDOWN(m)	/* nothing */
-#define	SETUP(v)	((v) = 0)
-#define	onestate	long
-#define	INIT(o, n)	((o) = (unsigned long)1 << (n))
-#define	INC(o)	((o) <<= 1)
-#define	ISSTATEIN(v, o)	(((v) & (o)) != 0)
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst) |= ((unsigned long)(src)&(here)) << (n))
-#define	BACK(dst, src, n)	((dst) |= ((unsigned long)(src)&(here)) >> (n))
-#define	ISSETBACK(v, n)	(((v) & ((unsigned long)here >> (n))) != 0)
-/* no multibyte support */
-#define	XMBRTOWC	xmbrtowc_dummy
-#define	ZAPSTATE(mbs)	((void)(mbs))
-/* function names */
-#define SNAMES			/* engine.c looks after details */
-
-#include "engine.c"
-
-/* now undo things */
-#undef	states
-#undef	CLEAR
-#undef	SET0
-#undef	SET1
-#undef	ISSET
-#undef	ASSIGN
-#undef	EQ
-#undef	STATEVARS
-#undef	STATESETUP
-#undef	STATETEARDOWN
-#undef	SETUP
-#undef	onestate
-#undef	INIT
-#undef	INC
-#undef	ISSTATEIN
-#undef	FWD
-#undef	BACK
-#undef	ISSETBACK
-#undef	SNAMES
-#undef	XMBRTOWC
-#undef	ZAPSTATE
-
-/* macros for manipulating states, large version */
-#define	states	char *
-#define	CLEAR(v)	memset(v, 0, m->g->nstates)
-#define	SET0(v, n)	((v)[n] = 0)
-#define	SET1(v, n)	((v)[n] = 1)
-#define	ISSET(v, n)	((v)[n])
-#define	ASSIGN(d, s)	memcpy(d, s, m->g->nstates)
-#define	EQ(a, b)	(memcmp(a, b, m->g->nstates) == 0)
-#define	STATEVARS	long vn; char *space
-#define	STATESETUP(m, nv)	{ (m)->space = malloc((nv)*(m)->g->nstates); \
-				if ((m)->space == NULL) return(REG_ESPACE); \
-				(m)->vn = 0; }
-#define	STATETEARDOWN(m)	{ free((m)->space); }
-#define	SETUP(v)	((v) = &m->space[m->vn++ * m->g->nstates])
-#define	onestate	long
-#define	INIT(o, n)	((o) = (n))
-#define	INC(o)	((o)++)
-#define	ISSTATEIN(v, o)	((v)[o])
-/* some abbreviations; note that some of these know variable names! */
-/* do "if I'm here, I can also be there" etc without branches */
-#define	FWD(dst, src, n)	((dst)[here+(n)] |= (src)[here])
-#define	BACK(dst, src, n)	((dst)[here-(n)] |= (src)[here])
-#define	ISSETBACK(v, n)	((v)[here - (n)])
-/* no multibyte support */
-#define	XMBRTOWC	xmbrtowc_dummy
-#define	ZAPSTATE(mbs)	((void)(mbs))
-/* function names */
-#define	LNAMES			/* flag */
-
-#include "engine.c"
-
-/* multibyte character & large states version */
-#undef	LNAMES
-#undef	XMBRTOWC
-#undef	ZAPSTATE
-#define	XMBRTOWC	xmbrtowc
-#define	ZAPSTATE(mbs)	memset((mbs), 0, sizeof(*(mbs)))
-#define	MNAMES
-
-#include "engine.c"
-
-/*
- - regexec - interface for matching
- = extern int regexec(const regex_t *, const char *, size_t, \
- =					regmatch_t [], int);
- = #define	REG_NOTBOL	00001
- = #define	REG_NOTEOL	00002
- = #define	REG_STARTEND	00004
- = #define	REG_TRACE	00400	// tracing of execution
- = #define	REG_LARGE	01000	// force large representation
- = #define	REG_BACKR	02000	// force use of backref code
- *
- * We put this here so we can exploit knowledge of the state representation
- * when choosing which matcher to call.  Also, by this point the matchers
- * have been prototyped.
- */
-int				/* 0 success, REG_NOMATCH failure */
-regexec(const regex_t * __restrict preg,
-	const char * __restrict string,
-	size_t nmatch,
-	regmatch_t pmatch[__restrict],
-	int eflags)
-{
-	struct re_guts *g = preg->re_g;
-#ifdef REDEBUG
-#	define	GOODFLAGS(f)	(f)
-#else
-#	define	GOODFLAGS(f)	((f)&(REG_NOTBOL|REG_NOTEOL|REG_STARTEND))
-#endif
-
-	if (preg->re_magic != MAGIC1 || g->magic != MAGIC2)
-		return(REG_BADPAT);
-	assert(!(g->iflags&BAD));
-	if (g->iflags&BAD)		/* backstop for no-debug case */
-		return(REG_BADPAT);
-	eflags = GOODFLAGS(eflags);
-
-	if (MB_CUR_MAX > 1)
-		return(mmatcher(g, (char *)string, nmatch, pmatch, eflags));
-	else if (g->nstates <= CHAR_BIT*sizeof(states1) && !(eflags&REG_LARGE))
-		return(smatcher(g, (char *)string, nmatch, pmatch, eflags));
-	else
-		return(lmatcher(g, (char *)string, nmatch, pmatch, eflags));
-}
diff --git a/lib/libc_bsd/regex/regfree.c b/lib/libc_bsd/regex/regfree.c
deleted file mode 100644
index 0a7dec9..0000000
--- a/lib/libc_bsd/regex/regfree.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- * 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.
- *
- *	@(#)regfree.c	8.3 (Berkeley) 3/20/94
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)regfree.c	8.3 (Berkeley) 3/20/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/regex/regfree.c 170528 2007-06-11 03:05:54Z delphij $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <regex.h>
-#include <wchar.h>
-#include <wctype.h>
-
-#include "utils.h"
-#include "regex2.h"
-
-/*
- - regfree - free everything
- = extern void regfree(regex_t *);
- */
-void
-regfree(regex_t *preg)
-{
-	struct re_guts *g;
-	int i;
-
-	if (preg->re_magic != MAGIC1)	/* oops */
-		return;			/* nice to complain, but hard */
-
-	g = preg->re_g;
-	if (g == NULL || g->magic != MAGIC2)	/* oops again */
-		return;
-	preg->re_magic = 0;		/* mark it invalid */
-	g->magic = 0;			/* mark it invalid */
-
-	if (g->strip != NULL)
-		free((char *)g->strip);
-	if (g->sets != NULL) {
-		for (i = 0; i < g->ncsets; i++) {
-			free(g->sets[i].ranges);
-			free(g->sets[i].wides);
-			free(g->sets[i].types);
-		}
-		free((char *)g->sets);
-	}
-	if (g->must != NULL)
-		free(g->must);
-	if (g->charjump != NULL)
-		free(&g->charjump[CHAR_MIN]);
-	if (g->matchjump != NULL)
-		free(g->matchjump);
-	free((char *)g);
-}
diff --git a/lib/libc_bsd/regex/utils.h b/lib/libc_bsd/regex/utils.h
deleted file mode 100644
index 796d604..0000000
--- a/lib/libc_bsd/regex/utils.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993, 1994 Henry Spencer.
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Henry Spencer.
- *
- * 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.
- * 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.
- *
- *	@(#)utils.h	8.3 (Berkeley) 3/20/94
- * $FreeBSD: releng/10.2/lib/libc/regex/utils.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-/* utility definitions */
-#define	DUPMAX		_POSIX2_RE_DUP_MAX	/* xxx is this right? */
-#define	INFINITY	(DUPMAX + 1)
-#define	NC		(CHAR_MAX - CHAR_MIN + 1)
-typedef unsigned char uch;
-
-/* switch off assertions (if not already off) if no REDEBUG */
-#ifndef REDEBUG
-#ifndef NDEBUG
-#define	NDEBUG	/* no assertions please */
-#endif
-#endif
-#include <assert.h>
-
-/* for old systems with bcopy() but no memmove() */
-#ifdef USEBCOPY
-#define	memmove(d, s, c)	bcopy(s, d, c)
-#endif
diff --git a/lib/libc_bsd/resolv/Makefile.inc b/lib/libc_bsd/resolv/Makefile.inc
deleted file mode 100644
index 5aed1ea..0000000
--- a/lib/libc_bsd/resolv/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Makefile.incl 270838 2014-08-30 10:16:25Z ume $
-
-# resolv sources
-.PATH: ${.CURDIR}/resolv
-
-SRCS+=	herror.c h_errno.c mtctxres.c res_comp.c res_data.c res_debug.c \
-	res_findzonecut.c res_init.c res_mkquery.c res_mkupdate.c \
-	res_query.c res_send.c res_state.c res_update.c
-
-SYM_MAPS+= ${.CURDIR}/resolv/Symbol.map
-
-CFLAGS+=-I${.CURDIR}/../libmd
diff --git a/lib/libc_bsd/resolv/Symbol.map b/lib/libc_bsd/resolv/Symbol.map
deleted file mode 100644
index dba76f3..0000000
--- a/lib/libc_bsd/resolv/Symbol.map
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/resolv/Symbol.map 270838 2014-08-30 10:16:25Z ume $
- */
-
-FBSD_1.0 {
-	/* h_nerr; */	/* Why is this not staticized in net/herror.c? */
-	h_errlist;
-	herror;
-	hstrerror;
-	__dn_expand;
-	__dn_comp;
-	__dn_skipname;
-	__res_hnok;
-	__res_ownok;
-	__res_mailok;
-	__res_dnok;
-	__putlong;
-	__putshort;
-	_getlong;
-	_getshort;
-	dn_comp;
-	dn_expand;
-	__fp_resstat;
-	__p_query;
-	__fp_query;
-	__fp_nquery;
-	__p_cdnname;
-	__p_cdname;
-	__p_fqnname;
-	__p_fqname;
-	__p_cert_syms;
-	__p_class_syms;
-	__p_key_syms;
-	__p_rcode_syms;
-	__p_type_syms;
-	__sym_ston;
-	__sym_ntos;
-	__sym_ntop;
-	__p_rcode;
-	__p_sockun;
-	__p_type;
-	__p_section;
-	__p_class;
-	__p_option;
-	__p_time;
-	__loc_aton;
-	__loc_ntoa;
-	__dn_count_labels;
-	__p_secstodate;
-	fp_resstat;
-	p_query;
-	p_fqnname;
-	sym_ston;
-	sym_ntos;
-	sym_ntop;
-	dn_count_labels;
-	p_secstodate;
-	__res_init;
-	__res_randomid;
-	__h_errno;
-	__h_errno_set;
-	h_errno;
-	res_init;
-	__res_findzonecut2;
-	__res_freeupdrec;
-	__res_mkquery;
-	res_mkquery;
-	__res_mkupdrec;
-	__res_mkupdate;
-	__res_opt;
-	__res_getservers;
-	__res_hostalias;
-	__res_nametoclass;
-	__res_nametotype;
-	__res_nclose;
-	__res_ndestroy;
-	__res_ninit;
-	__res_nmkquery;
-	__res_nmkupdate;
-	__res_nopt;
-	__res_nquery;
-	__res_nquerydomain;
-	__res_nsearch;
-	__res_nsend;
-	__res_nupdate;
-	__res_ourserver_p;
-	__res_pquery;
-	__res_query;
-	__res_search;
-	__res_querydomain;
-	__res_setservers;
-	_res;
-	__res_state;
-	__res_vinit;
-	__hostalias;
-	res_query;
-	res_search;
-	res_querydomain;
-	__res_isourserver;
-	__res_nameinquery;
-	__res_queriesmatch;
-	__res_send;
-	__res_close;
-	_res_close;
-	res_send;
-	__res_update;
-};
-
-FBSD_1.4 {
-	__res_rndinit;
-	__res_nrandomid;
-};
diff --git a/lib/libc_bsd/resolv/h_errno.c b/lib/libc_bsd/resolv/h_errno.c
deleted file mode 100644
index 3d86b6a..0000000
--- a/lib/libc_bsd/resolv/h_errno.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2006 The FreeBSD Project. 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.
- *
- * 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: releng/10.2/lib/libc/resolv/h_errno.c 158792 2006-05-21 11:29:26Z ume $
- */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-#undef	h_errno
-extern int h_errno;
-
-int *
-__h_errno(void)
-{
-	return (&__res_state()->res_h_errno);
-}
-
-void
-__h_errno_set(res_state res, int err)
-{
-	h_errno = res->res_h_errno = err;
-}
diff --git a/lib/libc_bsd/resolv/herror.c b/lib/libc_bsd/resolv/herror.c
deleted file mode 100644
index e74e3a8..0000000
--- a/lib/libc_bsd/resolv/herror.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- * 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.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)herror.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: herror.c,v 1.4 2005/04/27 04:56:41 sra Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/herror.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-
-#include <netdb.h>
-#include <resolv.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "port_after.h"
-
-const char *h_errlist[] = {
-	"Resolver Error 0 (no error)",
-	"Unknown host",				/*%< 1 HOST_NOT_FOUND */
-	"Host name lookup failure",		/*%< 2 TRY_AGAIN */
-	"Unknown server error",			/*%< 3 NO_RECOVERY */
-	"No address associated with name",	/*%< 4 NO_ADDRESS */
-};
-const int h_nerr = { sizeof h_errlist / sizeof h_errlist[0] };
-
-#undef	h_errno
-int	h_errno;
-
-/*%
- * herror --
- *	print the error indicated by the h_errno value.
- */
-void
-herror(const char *s) {
-	struct iovec iov[4], *v = iov;
-	char *t;
-
-	if (s != NULL && *s != '\0') {
-		DE_CONST(s, t);
-		v->iov_base = t;
-		v->iov_len = strlen(t);
-		v++;
-		DE_CONST(": ", t);
-		v->iov_base = t;
-		v->iov_len = 2;
-		v++;
-	}
-	DE_CONST(hstrerror(*__h_errno()), t);
-	v->iov_base = t;
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	DE_CONST("\n", t);
-	v->iov_base = t;
-	v->iov_len = 1;
-	_writev(STDERR_FILENO, iov, (v - iov) + 1);
-}
-
-/*%
- * hstrerror --
- *	return the string associated with a given "host" errno value.
- */
-const char *
-hstrerror(int err) {
-	if (err < 0)
-		return ("Resolver internal error");
-	else if (err < h_nerr)
-		return (h_errlist[err]);
-	return ("Unknown resolver error");
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/resolv/mtctxres.c b/lib/libc_bsd/resolv/mtctxres.c
deleted file mode 100644
index fa2eac9..0000000
--- a/lib/libc_bsd/resolv/mtctxres.c
+++ /dev/null
@@ -1,141 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/mtctxres.c 165258 2006-12-15 20:59:55Z ume $");
-
-#include <port_before.h>
-#ifdef DO_PTHREADS
-#include <pthread.h>
-#ifdef _LIBC
-#include <pthread_np.h>
-#endif
-#endif
-#include <errno.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <string.h>
-#include <resolv_mt.h>
-#include <port_after.h>
-
-#ifdef DO_PTHREADS
-static pthread_key_t	key;
-static int		mt_key_initialized = 0;
-
-static int		__res_init_ctx(void);
-static void		__res_destroy_ctx(void *);
-
-#if defined(sun) && !defined(__GNUC__)
-#pragma init	(_mtctxres_init)
-#endif
-#endif
-
-static mtctxres_t	sharedctx;
-
-#ifdef DO_PTHREADS
-/*
- * Initialize the TSD key. By doing this at library load time, we're
- * implicitly running without interference from other threads, so there's
- * no need for locking.
- */
-static void
-_mtctxres_init(void) {
-	int pthread_keycreate_ret;
-
-	pthread_keycreate_ret = pthread_key_create(&key, __res_destroy_ctx);
-	if (pthread_keycreate_ret == 0)
-		mt_key_initialized = 1;
-}
-#endif
-
-#ifndef _LIBC
-/*
- * To support binaries that used the private MT-safe interface in
- * Solaris 8, we still need to provide the __res_enable_mt()
- * and __res_disable_mt() entry points. They're do-nothing routines.
- */
-int
-__res_enable_mt(void) {
-	return (-1);
-}
-
-int
-__res_disable_mt(void) {
-	return (0);
-}
-#endif
-
-#ifdef DO_PTHREADS
-static int
-__res_init_ctx(void) {
-
-	mtctxres_t	*mt;
-	int		ret;
-
-
-	if (pthread_getspecific(key) != 0) {
-		/* Already exists */
-		return (0);
-	}
-
-	if ((mt = malloc(sizeof (mtctxres_t))) == 0) {
-		errno = ENOMEM;
-		return (-1);
-	}
-
-	memset(mt, 0, sizeof (mtctxres_t));
-
-	if ((ret = pthread_setspecific(key, mt)) != 0) {
-		free(mt);
-		errno = ret;
-		return (-1);
-	}
-
-	return (0);
-}
-
-static void
-__res_destroy_ctx(void *value) {
-
-	mtctxres_t	*mt = (mtctxres_t *)value;
-
-	if (mt != 0)
-		free(mt);
-}
-#endif
-
-mtctxres_t *
-___mtctxres(void) {
-#ifdef DO_PTHREADS
-	mtctxres_t	*mt;
-
-#ifdef _LIBC
-	if (pthread_main_np() != 0)
-		return (&sharedctx);
-#endif
-
-	/*
-	 * This if clause should only be executed if we are linking
-	 * statically.  When linked dynamically _mtctxres_init() should
-	 * be called at binding time due the #pragma above.
-	 */
-	if (!mt_key_initialized) {
-		static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER;
-                if (pthread_mutex_lock(&keylock) == 0) {
-			_mtctxres_init();
-			(void) pthread_mutex_unlock(&keylock);
-		}
-	}
-
-	/*
-	 * If we have already been called in this thread return the existing
-	 * context.  Otherwise recreat a new context and return it.  If
-	 * that fails return a global context.
-	 */
-	if (mt_key_initialized) {
-		if (((mt = pthread_getspecific(key)) != 0) ||
-		    (__res_init_ctx() == 0 &&
-		     (mt = pthread_getspecific(key)) != 0)) {
-			return (mt);
-		}
-	}
-#endif
-	return (&sharedctx);
-}
diff --git a/lib/libc_bsd/resolv/res_comp.c b/lib/libc_bsd/resolv/res_comp.c
deleted file mode 100644
index f29f70e..0000000
--- a/lib/libc_bsd/resolv/res_comp.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_comp.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_comp.c 284559 2015-06-18 16:39:05Z ume $");
-
-#include "port_before.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "port_after.h"
-
-/*%
- * Expand compressed domain name 'src' to full domain name.
- *
- * \li 'msg' is a pointer to the begining of the message,
- * \li 'eom' points to the first location after the message,
- * \li 'dst' is a pointer to a buffer of size 'dstsiz' for the result.
- * \li Return size of compressed name or -1 if there was an error.
- */
-int
-dn_expand(const u_char *msg, const u_char *eom, const u_char *src,
-	  char *dst, int dstsiz)
-{
-	int n = ns_name_uncompress(msg, eom, src, dst, (size_t)dstsiz);
-
-	if (n > 0 && dst[0] == '.')
-		dst[0] = '\0';
-	return (n);
-}
-
-/*%
- * Pack domain name 'exp_dn' in presentation form into 'comp_dn'.
- *
- * \li Return the size of the compressed name or -1.
- * \li 'length' is the size of the array pointed to by 'comp_dn'.
- */
-int
-dn_comp(const char *src, u_char *dst, int dstsiz,
-	u_char **dnptrs, u_char **lastdnptr)
-{
-	return (ns_name_compress(src, dst, (size_t)dstsiz,
-				 (const u_char **)dnptrs,
-				 (const u_char **)lastdnptr));
-}
-
-/*%
- * Skip over a compressed domain name. Return the size or -1.
- */
-int
-dn_skipname(const u_char *ptr, const u_char *eom) {
-	const u_char *saveptr = ptr;
-
-	if (ns_name_skip(&ptr, eom) == -1)
-		return (-1);
-	return (ptr - saveptr);
-}
-
-/*%
- * Verify that a domain name uses an acceptable character set.
- *
- * Note the conspicuous absence of ctype macros in these definitions.  On
- * non-ASCII hosts, we can't depend on string literals or ctype macros to
- * tell us anything about network-format data.  The rest of the BIND system
- * is not careful about this, but for some reason, we're doing it right here.
- */
-#define PERIOD 0x2e
-#define	hyphenchar(c) ((c) == 0x2d)
-#define bslashchar(c) ((c) == 0x5c)
-#define underscorechar(c) ((c) == 0x5f)
-#define periodchar(c) ((c) == PERIOD)
-#define asterchar(c) ((c) == 0x2a)
-#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
-		   || ((c) >= 0x61 && (c) <= 0x7a))
-#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
-
-#ifdef	RES_ENFORCE_RFC1034
-#define borderchar(c) (alphachar(c) || digitchar(c))
-#else
-#define borderchar(c) (alphachar(c) || digitchar(c) || underscorechar(c))
-#endif
-#define middlechar(c) (borderchar(c) || hyphenchar(c))
-#define	domainchar(c) ((c) > 0x20 && (c) < 0x7f)
-
-int
-res_hnok(const char *dn) {
-	int pch = PERIOD, ch = *dn++;
-
-	while (ch != '\0') {
-		int nch = *dn++;
-
-		if (periodchar(ch)) {
-			(void)NULL;
-		} else if (periodchar(pch)) {
-			if (!borderchar(ch))
-				return (0);
-		} else if (periodchar(nch) || nch == '\0') {
-			if (!borderchar(ch))
-				return (0);
-		} else {
-			if (!middlechar(ch))
-				return (0);
-		}
-		pch = ch, ch = nch;
-	}
-	return (1);
-}
-
-/*%
- * hostname-like (A, MX, WKS) owners can have "*" as their first label
- * but must otherwise be as a host name.
- */
-int
-res_ownok(const char *dn) {
-	if (asterchar(dn[0])) {
-		if (periodchar(dn[1]))
-			return (res_hnok(dn+2));
-		if (dn[1] == '\0')
-			return (1);
-	}
-	return (res_hnok(dn));
-}
-
-/*%
- * SOA RNAMEs and RP RNAMEs can have any printable character in their first
- * label, but the rest of the name has to look like a host name.
- */
-int
-res_mailok(const char *dn) {
-	int ch, escaped = 0;
-
-	/* "." is a valid missing representation */
-	if (*dn == '\0')
-		return (1);
-
-	/* otherwise <label>.<hostname> */
-	while ((ch = *dn++) != '\0') {
-		if (!domainchar(ch))
-			return (0);
-		if (!escaped && periodchar(ch))
-			break;
-		if (escaped)
-			escaped = 0;
-		else if (bslashchar(ch))
-			escaped = 1;
-	}
-	if (periodchar(ch))
-		return (res_hnok(dn));
-	return (0);
-}
-
-/*%
- * This function is quite liberal, since RFC1034's character sets are only
- * recommendations.
- */
-int
-res_dnok(const char *dn) {
-	int ch;
-
-	while ((ch = *dn++) != '\0')
-		if (!domainchar(ch))
-			return (0);
-	return (1);
-}
-
-#ifdef BIND_4_COMPAT
-/*%
- * This module must export the following externally-visible symbols:
- *	___putlong
- *	___putshort
- *	__getlong
- *	__getshort
- * Note that one _ comes from C and the others come from us.
- */
-
-#ifdef SOLARIS2
-#ifdef  __putlong
-#undef  __putlong
-#endif
-#ifdef  __putshort
-#undef  __putshort
-#endif
-#pragma weak    putlong         =       __putlong
-#pragma weak    putshort        =       __putshort
-#endif /* SOLARIS2 */
-
-void __putlong(uint32_t src, u_char *dst) { ns_put32(src, dst); }
-void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); }
-#ifndef __ultrix__
-uint32_t _getlong(const u_char *src) { return (ns_get32(src)); }
-u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); }
-#endif /*__ultrix__*/
-#endif /*BIND_4_COMPAT*/
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef dn_comp
-__weak_reference(__dn_comp, dn_comp);
-#undef dn_expand
-__weak_reference(__dn_expand, dn_expand);
-
-/*! \file */
diff --git a/lib/libc_bsd/resolv/res_data.c b/lib/libc_bsd/resolv/res_data.c
deleted file mode 100644
index d9a51e3..0000000
--- a/lib/libc_bsd/resolv/res_data.c
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1995-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: res_data.c,v 1.7 2008/12/11 09:59:00 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_data.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <res_update.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "port_after.h"
-
-const char *_res_opcodes[] = {
-	"QUERY",
-	"IQUERY",
-	"CQUERYM",
-	"CQUERYU",	/*%< experimental */
-	"NOTIFY",	/*%< experimental */
-	"UPDATE",
-	"6",
-	"7",
-	"8",
-	"9",
-	"10",
-	"11",
-	"12",
-	"13",
-	"ZONEINIT",
-	"ZONEREF",
-};
-
-#ifdef BIND_UPDATE
-const char *_res_sectioncodes[] = {
-	"ZONE",
-	"PREREQUISITES",
-	"UPDATE",
-	"ADDITIONAL",
-};
-#endif
-
-#ifndef __BIND_NOSTATIC
-
-/* Proto. */
-
-int  res_ourserver_p(const res_state, const struct sockaddr_in *);
-
-int
-res_init(void) {
-	extern int __res_vinit(res_state, int);
-
-	/*
-	 * These three fields used to be statically initialized.  This made
-	 * it hard to use this code in a shared library.  It is necessary,
-	 * now that we're doing dynamic initialization here, that we preserve
-	 * the old semantics: if an application modifies one of these three
-	 * fields of _res before res_init() is called, res_init() will not
-	 * alter them.  Of course, if an application is setting them to
-	 * _zero_ before calling res_init(), hoping to override what used
-	 * to be the static default, we can't detect it and unexpected results
-	 * will follow.  Zero for any of these fields would make no sense,
-	 * so one can safely assume that the applications were already getting
-	 * unexpected results.
-	 *
-	 * _res.options is tricky since some apps were known to diddle the bits
-	 * before res_init() was first called. We can't replicate that semantic
-	 * with dynamic initialization (they may have turned bits off that are
-	 * set in RES_DEFAULT).  Our solution is to declare such applications
-	 * "broken".  They could fool us by setting RES_INIT but none do (yet).
-	 */
-	if (!_res.retrans)
-		_res.retrans = RES_TIMEOUT;
-	if (!_res.retry)
-		_res.retry = RES_DFLRETRY;
-	if (!(_res.options & RES_INIT))
-		_res.options = RES_DEFAULT;
-
-	return (__res_vinit(&_res, 1));
-}
-
-void
-p_query(const u_char *msg) {
-	fp_query(msg, stdout);
-}
-
-void
-fp_query(const u_char *msg, FILE *file) {
-	fp_nquery(msg, PACKETSZ, file);
-}
-
-void
-fp_nquery(const u_char *msg, int len, FILE *file) {
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1)
-		return;
-
-	res_pquery(&_res, msg, len, file);
-}
-
-int
-res_mkquery(int op,			/*!< opcode of query  */
-	    const char *dname,		/*!< domain name  */
-	    int class, int type,	/*!< class and type of query  */
-	    const u_char *data,		/*!< resource record data  */
-	    int datalen,		/*!< length of data  */
-	    const u_char *newrr_in,	/*!< new rr for modify or append  */
-	    u_char *buf,		/*!< buffer to put query  */
-	    int buflen)			/*!< size of buffer  */
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-	return (res_nmkquery(&_res, op, dname, class, type,
-			     data, datalen,
-			     newrr_in, buf, buflen));
-}
-
-int
-res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nmkupdate(&_res, rrecp_in, buf, buflen));
-}
-
-int
-res_query(const char *name,	/*!< domain name  */
-	  int class, int type,	/*!< class and type of query  */
-	  u_char *answer,	/*!< buffer to put answer  */
-	  int anslen)		/*!< size of answer buffer  */
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-	return (res_nquery(&_res, name, class, type, answer, anslen));
-}
-
-#ifndef _LIBC
-void
-res_send_setqhook(res_send_qhook hook) {
-	_res.qhook = hook;
-}
-
-void
-res_send_setrhook(res_send_rhook hook) {
-	_res.rhook = hook;
-}
-#endif
-
-int
-res_isourserver(const struct sockaddr_in *inp) {
-	return (res_ourserver_p(&_res, inp));
-}
-
-int
-res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) {
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-
-	return (res_nsend(&_res, buf, buflen, ans, anssiz));
-}
-
-#ifndef _LIBC
-int
-res_sendsigned(const u_char *buf, int buflen, ns_tsig_key *key,
-	       u_char *ans, int anssiz)
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		/* errno should have been set by res_init() in this case. */
-		return (-1);
-	}
-
-	return (res_nsendsigned(&_res, buf, buflen, key, ans, anssiz));
-}
-#endif
-
-void
-res_close(void) {
-	res_nclose(&_res);
-}
-
-int
-res_update(ns_updrec *rrecp_in) {
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nupdate(&_res, rrecp_in, NULL));
-}
-
-int
-res_search(const char *name,	/*!< domain name  */
-	   int class, int type,	/*!< class and type of query  */
-	   u_char *answer,	/*!< buffer to put answer  */
-	   int anslen)		/*!< size of answer  */
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nsearch(&_res, name, class, type, answer, anslen));
-}
-
-int
-res_querydomain(const char *name,
-		const char *domain,
-		int class, int type,	/*!< class and type of query  */
-		u_char *answer,		/*!< buffer to put answer  */
-		int anslen)		/*!< size of answer  */
-{
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nquerydomain(&_res, name, domain,
-				 class, type,
-				 answer, anslen));
-}
-
-u_int
-res_randomid(void) {
-	if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
-		RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
-		return (-1);
-	}
-
-	return (res_nrandomid(&_res));
-}
-
-int
-res_opt(int n0, u_char *buf, int buflen, int anslen)
-{
-	return (res_nopt(&_res, n0, buf, buflen, anslen));
-}
-
-const char *
-hostalias(const char *name) {
-	static char abuf[MAXDNAME];
-
-	return (res_hostalias(&_res, name, abuf, sizeof abuf));
-}
-
-#ifdef ultrix
-int
-local_hostname_length(const char *hostname) {
-	int len_host, len_domain;
-
-	if (!*_res.defdname)
-		res_init();
-	len_host = strlen(hostname);
-	len_domain = strlen(_res.defdname);
-	if (len_host > len_domain &&
-	    !strcasecmp(hostname + len_host - len_domain, _res.defdname) &&
-	    hostname[len_host - len_domain - 1] == '.')
-		return (len_host - len_domain - 1);
-	return (0);
-}
-#endif /*ultrix*/
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef res_init
-__weak_reference(__res_init, res_init);
-#undef p_query
-__weak_reference(__p_query, p_query);
-#undef res_mkquery
-__weak_reference(__res_mkquery, res_mkquery);
-#undef res_query
-__weak_reference(__res_query, res_query);
-#undef res_send
-__weak_reference(__res_send, res_send);
-#undef res_close
-__weak_reference(__res_close, _res_close);
-#undef res_search
-__weak_reference(__res_search, res_search);
-#undef res_querydomain
-__weak_reference(__res_querydomain, res_querydomain);
-
-#endif
-
-/*! \file */
diff --git a/lib/libc_bsd/resolv/res_debug.c b/lib/libc_bsd/resolv/res_debug.c
deleted file mode 100644
index a32e354..0000000
--- a/lib/libc_bsd/resolv/res_debug.c
+++ /dev/null
@@ -1,1248 +0,0 @@
-/*
- * Portions Copyright (C) 2004, 2005, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1996-2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Copyright (c) 1985
- *    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.
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Portions Copyright (c) 1995 by International Business Machines, Inc.
- *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
- *
- * To the extent it has a right to do so, IBM grants an immunity from suit
- * under its patents, if any, for the use, sale or manufacture of products to
- * the extent that such products are used for performing Domain Name System
- * dynamic updates in TCP/IP networks by means of the Software.  No immunity is
- * granted for any product per se or for any other function of any product.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_debug.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <math.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <resolv_mt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "port_after.h"
-
-#ifdef SPRINTF_CHAR
-# define SPRINTF(x) strlen(sprintf/**/x)
-#else
-# define SPRINTF(x) sprintf x
-#endif
-
-extern const char *_res_opcodes[];
-extern const char *_res_sectioncodes[];
-
-/*%
- * Print the current options.
- */
-void
-fp_resstat(const res_state statp, FILE *file) {
-	u_long mask;
-
-	fprintf(file, ";; res options:");
-	for (mask = 1;  mask != 0U;  mask <<= 1)
-		if (statp->options & mask)
-			fprintf(file, " %s", p_option(mask));
-	putc('\n', file);
-}
-
-static void
-do_section(const res_state statp,
-	   ns_msg *handle, ns_sect section,
-	   int pflag, FILE *file)
-{
-	int n, sflag, rrnum;
-	static int buflen = 2048;
-	char *buf;
-	ns_opcode opcode;
-	ns_rr rr;
-
-	/*
-	 * Print answer records.
-	 */
-	sflag = (statp->pfcode & pflag);
-	if (statp->pfcode && !sflag)
-		return;
-
-	buf = malloc(buflen);
-	if (buf == NULL) {
-		fprintf(file, ";; memory allocation failure\n");
-		return;
-	}
-
-	opcode = (ns_opcode) ns_msg_getflag(*handle, ns_f_opcode);
-	rrnum = 0;
-	for (;;) {
-		if (ns_parserr(handle, section, rrnum, &rr)) {
-			if (errno != ENODEV)
-				fprintf(file, ";; ns_parserr: %s\n",
-					strerror(errno));
-			else if (rrnum > 0 && sflag != 0 &&
-				 (statp->pfcode & RES_PRF_HEAD1))
-				putc('\n', file);
-			goto cleanup;
-		}
-		if (rrnum == 0 && sflag != 0 && (statp->pfcode & RES_PRF_HEAD1))
-			fprintf(file, ";; %s SECTION:\n",
-				p_section(section, opcode));
-		if (section == ns_s_qd)
-			fprintf(file, ";;\t%s, type = %s, class = %s\n",
-				ns_rr_name(rr),
-				p_type(ns_rr_type(rr)),
-				p_class(ns_rr_class(rr)));
-		else if (section == ns_s_ar && ns_rr_type(rr) == ns_t_opt) {
-			u_int16_t optcode, optlen, rdatalen = ns_rr_rdlen(rr);
-			uint32_t ttl = ns_rr_ttl(rr);
-
-			fprintf(file,
-				"; EDNS: version: %u, udp=%u, flags=%04x\n",
-				(ttl>>16)&0xff, ns_rr_class(rr), ttl&0xffff);
-
-			while (rdatalen >= 4) {
-				const u_char *cp = ns_rr_rdata(rr);
-				int i;
-
-				GETSHORT(optcode, cp);
-				GETSHORT(optlen, cp);
-
-				if (optcode == NS_OPT_NSID) {
-					fputs("; NSID: ", file);
-					if (optlen == 0) {
-						fputs("; NSID\n", file);
-					} else {
-						fputs("; NSID: ", file);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%02x ",
-								cp[i]);
-						fputs(" (",file);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%c",
-								isprint(cp[i])?
-								cp[i] : '.');
-						fputs(")\n", file);
-					}
-				} else {
-					if (optlen == 0) {
-						fprintf(file, "; OPT=%u\n",
-							optcode);
-					} else {
-						fprintf(file, "; OPT=%u: ",
-							optcode);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%02x ",
-								cp[i]);
-						fputs(" (",file);
-						for (i = 0; i < optlen; i++)
-							fprintf(file, "%c",
-								isprint(cp[i]) ?
-									cp[i] : '.');
-						fputs(")\n", file);
-					}
-				}
-				rdatalen -= 4 + optlen;
-			}
-		} else {
-			n = ns_sprintrr(handle, &rr, NULL, NULL,
-					buf, buflen);
-			if (n < 0) {
-				if (errno == ENOSPC) {
-					free(buf);
-					buf = NULL;
-					if (buflen < 131072)
-						buf = malloc(buflen += 1024);
-					if (buf == NULL) {
-						fprintf(file,
-					      ";; memory allocation failure\n");
-					      return;
-					}
-					continue;
-				}
-				fprintf(file, ";; ns_sprintrr: %s\n",
-					strerror(errno));
-				goto cleanup;
-			}
-			fputs(buf, file);
-			fputc('\n', file);
-		}
-		rrnum++;
-	}
- cleanup:
-	if (buf != NULL)
-		free(buf);
-}
-
-/*%
- * Print the contents of a query.
- * This is intended to be primarily a debugging routine.
- */
-void
-res_pquery(const res_state statp, const u_char *msg, int len, FILE *file) {
-	ns_msg handle;
-	int qdcount, ancount, nscount, arcount;
-	u_int opcode, rcode, id;
-
-	if (ns_initparse(msg, len, &handle) < 0) {
-		fprintf(file, ";; ns_initparse: %s\n", strerror(errno));
-		return;
-	}
-	opcode = ns_msg_getflag(handle, ns_f_opcode);
-	rcode = ns_msg_getflag(handle, ns_f_rcode);
-	id = ns_msg_id(handle);
-	qdcount = ns_msg_count(handle, ns_s_qd);
-	ancount = ns_msg_count(handle, ns_s_an);
-	nscount = ns_msg_count(handle, ns_s_ns);
-	arcount = ns_msg_count(handle, ns_s_ar);
-
-	/*
-	 * Print header fields.
-	 */
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEADX) || rcode)
-		fprintf(file,
-			";; ->>HEADER<<- opcode: %s, status: %s, id: %d\n",
-			_res_opcodes[opcode], p_rcode(rcode), id);
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEADX))
-		putc(';', file);
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEAD2)) {
-		fprintf(file, "; flags:");
-		if (ns_msg_getflag(handle, ns_f_qr))
-			fprintf(file, " qr");
-		if (ns_msg_getflag(handle, ns_f_aa))
-			fprintf(file, " aa");
-		if (ns_msg_getflag(handle, ns_f_tc))
-			fprintf(file, " tc");
-		if (ns_msg_getflag(handle, ns_f_rd))
-			fprintf(file, " rd");
-		if (ns_msg_getflag(handle, ns_f_ra))
-			fprintf(file, " ra");
-		if (ns_msg_getflag(handle, ns_f_z))
-			fprintf(file, " ??");
-		if (ns_msg_getflag(handle, ns_f_ad))
-			fprintf(file, " ad");
-		if (ns_msg_getflag(handle, ns_f_cd))
-			fprintf(file, " cd");
-	}
-	if ((!statp->pfcode) || (statp->pfcode & RES_PRF_HEAD1)) {
-		fprintf(file, "; %s: %d",
-			p_section(ns_s_qd, opcode), qdcount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_an, opcode), ancount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ns, opcode), nscount);
-		fprintf(file, ", %s: %d",
-			p_section(ns_s_ar, opcode), arcount);
-	}
-	if ((!statp->pfcode) || (statp->pfcode &
-		(RES_PRF_HEADX | RES_PRF_HEAD2 | RES_PRF_HEAD1))) {
-		putc('\n',file);
-	}
-	/*
-	 * Print the various sections.
-	 */
-	do_section(statp, &handle, ns_s_qd, RES_PRF_QUES, file);
-	do_section(statp, &handle, ns_s_an, RES_PRF_ANS, file);
-	do_section(statp, &handle, ns_s_ns, RES_PRF_AUTH, file);
-	do_section(statp, &handle, ns_s_ar, RES_PRF_ADD, file);
-	if (qdcount == 0 && ancount == 0 &&
-	    nscount == 0 && arcount == 0)
-		putc('\n', file);
-}
-
-const u_char *
-p_cdnname(const u_char *cp, const u_char *msg, int len, FILE *file) {
-	char name[MAXDNAME];
-	int n;
-
-	if ((n = dn_expand(msg, msg + len, cp, name, sizeof name)) < 0)
-		return (NULL);
-	if (name[0] == '\0')
-		putc('.', file);
-	else
-		fputs(name, file);
-	return (cp + n);
-}
-
-const u_char *
-p_cdname(const u_char *cp, const u_char *msg, FILE *file) {
-	return (p_cdnname(cp, msg, PACKETSZ, file));
-}
-
-/*%
- * Return a fully-qualified domain name from a compressed name (with
-   length supplied).  */
-
-const u_char *
-p_fqnname(cp, msg, msglen, name, namelen)
-	const u_char *cp, *msg;
-	int msglen;
-	char *name;
-	int namelen;
-{
-	int n, newlen;
-
-	if ((n = dn_expand(msg, cp + msglen, cp, name, namelen)) < 0)
-		return (NULL);
-	newlen = strlen(name);
-	if (newlen == 0 || name[newlen - 1] != '.') {
-		if (newlen + 1 >= namelen)	/*%< Lack space for final dot */
-			return (NULL);
-		else
-			strcpy(name + newlen, ".");
-	}
-	return (cp + n);
-}
-
-/* XXX:	the rest of these functions need to become length-limited, too. */
-
-const u_char *
-p_fqname(const u_char *cp, const u_char *msg, FILE *file) {
-	char name[MAXDNAME];
-	const u_char *n;
-
-	n = p_fqnname(cp, msg, MAXCDNAME, name, sizeof name);
-	if (n == NULL)
-		return (NULL);
-	fputs(name, file);
-	return (n);
-}
-
-/*%
- * Names of RR classes and qclasses.  Classes and qclasses are the same, except
- * that C_ANY is a qclass but not a class.  (You can ask for records of class
- * C_ANY, but you can't have any records of that class in the database.)
- */
-const struct res_sym __p_class_syms[] = {
-	{C_IN,		"IN",		(char *)0},
-	{C_CHAOS,	"CH",		(char *)0},
-	{C_CHAOS,	"CHAOS",	(char *)0},
-	{C_HS,		"HS",		(char *)0},
-	{C_HS,		"HESIOD",	(char *)0},
-	{C_ANY,		"ANY",		(char *)0},
-	{C_NONE,	"NONE",		(char *)0},
-	{C_IN, 		(char *)0,	(char *)0}
-};
-
-/*%
- * Names of message sections.
- */
-static const struct res_sym __p_default_section_syms[] = {
-	{ns_s_qd,	"QUERY",	(char *)0},
-	{ns_s_an,	"ANSWER",	(char *)0},
-	{ns_s_ns,	"AUTHORITY",	(char *)0},
-	{ns_s_ar,	"ADDITIONAL",	(char *)0},
-	{0,		(char *)0,	(char *)0}
-};
-
-static const struct res_sym __p_update_section_syms[] = {
-	{S_ZONE,	"ZONE",		(char *)0},
-	{S_PREREQ,	"PREREQUISITE",	(char *)0},
-	{S_UPDATE,	"UPDATE",	(char *)0},
-	{S_ADDT,	"ADDITIONAL",	(char *)0},
-	{0,		(char *)0,	(char *)0}
-};
-
-const struct res_sym __p_key_syms[] = {
-	{NS_ALG_MD5RSA,		"RSA",		"RSA KEY with MD5 hash"},
-	{NS_ALG_DH,		"DH",		"Diffie Hellman"},
-	{NS_ALG_DSA,		"DSA",		"Digital Signature Algorithm"},
-	{NS_ALG_EXPIRE_ONLY,	"EXPIREONLY",	"No algorithm"},
-	{NS_ALG_PRIVATE_OID,	"PRIVATE",	"Algorithm obtained from OID"},
-	{0,			NULL,		NULL}
-};
-
-const struct res_sym __p_cert_syms[] = {
-	{cert_t_pkix,	"PKIX",		"PKIX (X.509v3) Certificate"},
-	{cert_t_spki,	"SPKI",		"SPKI certificate"},
-	{cert_t_pgp,	"PGP",		"PGP certificate"},
-	{cert_t_url,	"URL",		"URL Private"},
-	{cert_t_oid,	"OID",		"OID Private"},
-	{0,		NULL,		NULL}
-};
-
-/*%
- * Names of RR types and qtypes.  Types and qtypes are the same, except
- * that T_ANY is a qtype but not a type.  (You can ask for records of type
- * T_ANY, but you can't have any records of that type in the database.)
- */
-const struct res_sym __p_type_syms[] = {
-	{ns_t_a,	"A",		"address"},
-	{ns_t_ns,	"NS",		"name server"},
-	{ns_t_md,	"MD",		"mail destination (deprecated)"},
-	{ns_t_mf,	"MF",		"mail forwarder (deprecated)"},
-	{ns_t_cname,	"CNAME",	"canonical name"},
-	{ns_t_soa,	"SOA",		"start of authority"},
-	{ns_t_mb,	"MB",		"mailbox"},
-	{ns_t_mg,	"MG",		"mail group member"},
-	{ns_t_mr,	"MR",		"mail rename"},
-	{ns_t_null,	"NULL",		"null"},
-	{ns_t_wks,	"WKS",		"well-known service (deprecated)"},
-	{ns_t_ptr,	"PTR",		"domain name pointer"},
-	{ns_t_hinfo,	"HINFO",	"host information"},
-	{ns_t_minfo,	"MINFO",	"mailbox information"},
-	{ns_t_mx,	"MX",		"mail exchanger"},
-	{ns_t_txt,	"TXT",		"text"},
-	{ns_t_rp,	"RP",		"responsible person"},
-	{ns_t_afsdb,	"AFSDB",	"DCE or AFS server"},
-	{ns_t_x25,	"X25",		"X25 address"},
-	{ns_t_isdn,	"ISDN",		"ISDN address"},
-	{ns_t_rt,	"RT",		"router"},
-	{ns_t_nsap,	"NSAP",		"nsap address"},
-	{ns_t_nsap_ptr,	"NSAP_PTR",	"domain name pointer"},
-	{ns_t_sig,	"SIG",		"signature"},
-	{ns_t_key,	"KEY",		"key"},
-	{ns_t_px,	"PX",		"mapping information"},
-	{ns_t_gpos,	"GPOS",		"geographical position (withdrawn)"},
-	{ns_t_aaaa,	"AAAA",		"IPv6 address"},
-	{ns_t_loc,	"LOC",		"location"},
-	{ns_t_nxt,	"NXT",		"next valid name (unimplemented)"},
-	{ns_t_eid,	"EID",		"endpoint identifier (unimplemented)"},
-	{ns_t_nimloc,	"NIMLOC",	"NIMROD locator (unimplemented)"},
-	{ns_t_srv,	"SRV",		"server selection"},
-	{ns_t_atma,	"ATMA",		"ATM address (unimplemented)"},
-	{ns_t_naptr,	"NAPTR",	"naptr"},
-	{ns_t_kx,	"KX",		"key exchange"},
-	{ns_t_cert,	"CERT",		"certificate"},
-	{ns_t_a6,	"A",		"IPv6 address (experminental)"},
-	{ns_t_dname,	"DNAME",	"non-terminal redirection"},
-	{ns_t_opt,	"OPT",		"opt"},
-	{ns_t_apl,	"apl",		"apl"},
-	{ns_t_ds,	"DS",		"delegation signer"},
-	{ns_t_sshfp,	"SSFP",		"SSH fingerprint"},
-	{ns_t_ipseckey,	"IPSECKEY",	"IPSEC key"},
-	{ns_t_rrsig,	"RRSIG",	"rrsig"},
-	{ns_t_nsec,	"NSEC",		"nsec"},
-	{ns_t_dnskey,	"DNSKEY",	"DNS key"},
-	{ns_t_dhcid,	"DHCID",       "dynamic host configuration identifier"},
-	{ns_t_nsec3,	"NSEC3",	"nsec3"},
-	{ns_t_nsec3param, "NSEC3PARAM", "NSEC3 parameters"},
-	{ns_t_hip,	"HIP",		"host identity protocol"},
-	{ns_t_spf,	"SPF",		"sender policy framework"},
-	{ns_t_tkey,	"TKEY",		"tkey"},
-	{ns_t_tsig,	"TSIG",		"transaction signature"},
-	{ns_t_ixfr,	"IXFR",		"incremental zone transfer"},
-	{ns_t_axfr,	"AXFR",		"zone transfer"},
-	{ns_t_zxfr,	"ZXFR",		"compressed zone transfer"},
-	{ns_t_mailb,	"MAILB",	"mailbox-related data (deprecated)"},
-	{ns_t_maila,	"MAILA",	"mail agent (deprecated)"},
-	{ns_t_naptr,	"NAPTR",	"URN Naming Authority"},
-	{ns_t_kx,	"KX",		"Key Exchange"},
-	{ns_t_cert,	"CERT",		"Certificate"},
-	{ns_t_a6,	"A6",		"IPv6 Address"},
-	{ns_t_dname,	"DNAME",	"dname"},
-	{ns_t_sink,	"SINK",		"Kitchen Sink (experimental)"},
-	{ns_t_opt,	"OPT",		"EDNS Options"},
-	{ns_t_any,	"ANY",		"\"any\""},
-	{ns_t_dlv,	"DLV",		"DNSSEC look-aside validation"},
-	{0, 		NULL,		NULL}
-};
-
-/*%
- * Names of DNS rcodes.
- */
-const struct res_sym __p_rcode_syms[] = {
-	{ns_r_noerror,	"NOERROR",		"no error"},
-	{ns_r_formerr,	"FORMERR",		"format error"},
-	{ns_r_servfail,	"SERVFAIL",		"server failed"},
-	{ns_r_nxdomain,	"NXDOMAIN",		"no such domain name"},
-	{ns_r_notimpl,	"NOTIMP",		"not implemented"},
-	{ns_r_refused,	"REFUSED",		"refused"},
-	{ns_r_yxdomain,	"YXDOMAIN",		"domain name exists"},
-	{ns_r_yxrrset,	"YXRRSET",		"rrset exists"},
-	{ns_r_nxrrset,	"NXRRSET",		"rrset doesn't exist"},
-	{ns_r_notauth,	"NOTAUTH",		"not authoritative"},
-	{ns_r_notzone,	"NOTZONE",		"Not in zone"},
-	{ns_r_max,	"",			""},
-	{ns_r_badsig,	"BADSIG",		"bad signature"},
-	{ns_r_badkey,	"BADKEY",		"bad key"},
-	{ns_r_badtime,	"BADTIME",		"bad time"},
-	{0, 		NULL,			NULL}
-};
-
-int
-sym_ston(const struct res_sym *syms, const char *name, int *success) {
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (strcasecmp (name, syms->name) == 0) {
-			if (success)
-				*success = 1;
-			return (syms->number);
-		}
-	}
-	if (success)
-		*success = 0;
-	return (syms->number);		/*%< The default value. */
-}
-
-const char *
-sym_ntos(const struct res_sym *syms, int number, int *success) {
-	char *unname = sym_ntos_unname;
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->name);
-		}
-	}
-
-	sprintf(unname, "%d", number);		/*%< XXX nonreentrant */
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-const char *
-sym_ntop(const struct res_sym *syms, int number, int *success) {
-	char *unname = sym_ntop_unname;
-
-	for ((void)NULL; syms->name != 0; syms++) {
-		if (number == syms->number) {
-			if (success)
-				*success = 1;
-			return (syms->humanname);
-		}
-	}
-	sprintf(unname, "%d", number);		/*%< XXX nonreentrant */
-	if (success)
-		*success = 0;
-	return (unname);
-}
-
-/*%
- * Return a string for the type.
- */
-const char *
-p_type(int type) {
-	int success;
-	const char *result;
-	static char typebuf[20];
-
-	result = sym_ntos(__p_type_syms, type, &success);
-	if (success)
-		return (result);
-	if (type < 0 || type > 0xffff)
-		return ("BADTYPE");
-	sprintf(typebuf, "TYPE%d", type);
-	return (typebuf);
-}
-
-/*%
- * Return a string for the type.
- */
-const char *
-p_section(int section, int opcode) {
-	const struct res_sym *symbols;
-
-	switch (opcode) {
-	case ns_o_update:
-		symbols = __p_update_section_syms;
-		break;
-	default:
-		symbols = __p_default_section_syms;
-		break;
-	}
-	return (sym_ntos(symbols, section, (int *)0));
-}
-
-/*%
- * Return a mnemonic for class.
- */
-const char *
-p_class(int class) {
-	int success;
-	const char *result;
-	static char classbuf[20];
-
-	result = sym_ntos(__p_class_syms, class, &success);
-	if (success)
-		return (result);
-	if (class < 0 || class > 0xffff)
-		return ("BADCLASS");
-	sprintf(classbuf, "CLASS%d", class);
-	return (classbuf);
-}
-
-/*%
- * Return a mnemonic for an option
- */
-const char *
-p_option(u_long option) {
-	char *nbuf = p_option_nbuf;
-
-	switch (option) {
-	case RES_INIT:		return "init";
-	case RES_DEBUG:		return "debug";
-	case RES_AAONLY:	return "aaonly(unimpl)";
-	case RES_USEVC:		return "usevc";
-	case RES_PRIMARY:	return "primry(unimpl)";
-	case RES_IGNTC:		return "igntc";
-	case RES_RECURSE:	return "recurs";
-	case RES_DEFNAMES:	return "defnam";
-	case RES_STAYOPEN:	return "styopn";
-	case RES_DNSRCH:	return "dnsrch";
-	case RES_INSECURE1:	return "insecure1";
-	case RES_INSECURE2:	return "insecure2";
-	case RES_NOALIASES:	return "noaliases";
-	case RES_USE_INET6:	return "inet6";
-#ifdef RES_USE_EDNS0	/*%< KAME extension */
-	case RES_USE_EDNS0:	return "edns0";
-	case RES_NSID:		return "nsid";
-#endif
-#ifdef RES_USE_DNAME
-	case RES_USE_DNAME:	return "dname";
-#endif
-#ifdef RES_USE_DNSSEC
-	case RES_USE_DNSSEC:	return "dnssec";
-#endif
-#ifdef RES_NOTLDQUERY
-	case RES_NOTLDQUERY:	return "no-tld-query";
-#endif
-#ifdef RES_NO_NIBBLE2
-	case RES_NO_NIBBLE2:	return "no-nibble2";
-#endif
-				/* XXX nonreentrant */
-	default:		sprintf(nbuf, "?0x%lx?", (u_long)option);
-				return (nbuf);
-	}
-}
-
-/*%
- * Return a mnemonic for a time to live.
- */
-const char *
-p_time(uint32_t value) {
-	char *nbuf = p_time_nbuf;
-
-	if (ns_format_ttl(value, nbuf, sizeof nbuf) < 0)
-		sprintf(nbuf, "%u", value);
-	return (nbuf);
-}
-
-/*%
- * Return a string for the rcode.
- */
-const char *
-p_rcode(int rcode) {
-	return (sym_ntos(__p_rcode_syms, rcode, (int *)0));
-}
-
-/*%
- * Return a string for a res_sockaddr_union.
- */
-const char *
-p_sockun(union res_sockaddr_union u, char *buf, size_t size) {
-	char ret[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:123.123.123.123"];
-
-	switch (u.sin.sin_family) {
-	case AF_INET:
-		inet_ntop(AF_INET, &u.sin.sin_addr, ret, sizeof ret);
-		break;
-#ifdef HAS_INET6_STRUCTS
-	case AF_INET6:
-		inet_ntop(AF_INET6, &u.sin6.sin6_addr, ret, sizeof ret);
-		break;
-#endif
-	default:
-		sprintf(ret, "[af%d]", u.sin.sin_family);
-		break;
-	}
-	if (size > 0U) {
-		strncpy(buf, ret, size - 1);
-		buf[size - 1] = '0';
-	}
-	return (buf);
-}
-
-/*%
- * routines to convert between on-the-wire RR format and zone file format.
- * Does not contain conversion to/from decimal degrees; divide or multiply
- * by 60*60*1000 for that.
- */
-
-static unsigned int poweroften[10] = {1, 10, 100, 1000, 10000, 100000,
-				      1000000,10000000,100000000,1000000000};
-
-/*% takes an XeY precision/size value, returns a string representation. */
-static const char *
-precsize_ntoa(prec)
-	u_int8_t prec;
-{
-	char *retbuf = precsize_ntoa_retbuf;
-	unsigned long val;
-	int mantissa, exponent;
-
-	mantissa = (int)((prec >> 4) & 0x0f) % 10;
-	exponent = (int)((prec >> 0) & 0x0f) % 10;
-
-	val = mantissa * poweroften[exponent];
-
-	(void) sprintf(retbuf, "%lu.%.2lu", val/100, val%100);
-	return (retbuf);
-}
-
-/*% converts ascii size/precision X * 10**Y(cm) to 0xXY.  moves pointer.  */
-static u_int8_t
-precsize_aton(const char **strptr) {
-	unsigned int mval = 0, cmval = 0;
-	u_int8_t retval = 0;
-	const char *cp;
-	int exponent;
-	int mantissa;
-
-	cp = *strptr;
-
-	while (isdigit((unsigned char)*cp))
-		mval = mval * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/*%< centimeters */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			cmval = (*cp++ - '0') * 10;
-			if (isdigit((unsigned char)*cp)) {
-				cmval += (*cp++ - '0');
-			}
-		}
-	}
-	cmval = (mval * 100) + cmval;
-
-	for (exponent = 0; exponent < 9; exponent++)
-		if (cmval < poweroften[exponent+1])
-			break;
-
-	mantissa = cmval / poweroften[exponent];
-	if (mantissa > 9)
-		mantissa = 9;
-
-	retval = (mantissa << 4) | exponent;
-
-	*strptr = cp;
-
-	return (retval);
-}
-
-/*% converts ascii lat/lon to unsigned encoded 32-bit number.  moves pointer. */
-static uint32_t
-latlon2ul(const char **latlonstrptr, int *which) {
-	const char *cp;
-	uint32_t retval;
-	int deg = 0, min = 0, secs = 0, secsfrac = 0;
-
-	cp = *latlonstrptr;
-
-	while (isdigit((unsigned char)*cp))
-		deg = deg * 10 + (*cp++ - '0');
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
-	if (!(isdigit((unsigned char)*cp)))
-		goto fndhemi;
-
-	while (isdigit((unsigned char)*cp))
-		min = min * 10 + (*cp++ - '0');
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
-	if (!(isdigit((unsigned char)*cp)))
-		goto fndhemi;
-
-	while (isdigit((unsigned char)*cp))
-		secs = secs * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/*%< decimal seconds */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			secsfrac = (*cp++ - '0') * 100;
-			if (isdigit((unsigned char)*cp)) {
-				secsfrac += (*cp++ - '0') * 10;
-				if (isdigit((unsigned char)*cp)) {
-					secsfrac += (*cp++ - '0');
-				}
-			}
-		}
-	}
-
-	while (!isspace((unsigned char)*cp))	/*%< if any trailing garbage */
-		cp++;
-
-	while (isspace((unsigned char)*cp))
-		cp++;
-
- fndhemi:
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'E': case 'e':
-		retval = ((unsigned)1<<31)
-			+ (((((deg * 60) + min) * 60) + secs) * 1000)
-			+ secsfrac;
-		break;
-	case 'S': case 's':
-	case 'W': case 'w':
-		retval = ((unsigned)1<<31)
-			- (((((deg * 60) + min) * 60) + secs) * 1000)
-			- secsfrac;
-		break;
-	default:
-		retval = 0;	/*%< invalid value -- indicates error */
-		break;
-	}
-
-	switch (*cp) {
-	case 'N': case 'n':
-	case 'S': case 's':
-		*which = 1;	/*%< latitude */
-		break;
-	case 'E': case 'e':
-	case 'W': case 'w':
-		*which = 2;	/*%< longitude */
-		break;
-	default:
-		*which = 0;	/*%< error */
-		break;
-	}
-
-	cp++;			/*%< skip the hemisphere */
-	while (!isspace((unsigned char)*cp))	/*%< if any trailing garbage */
-		cp++;
-
-	while (isspace((unsigned char)*cp))	/*%< move to next field */
-		cp++;
-
-	*latlonstrptr = cp;
-
-	return (retval);
-}
-
-/*%
- * converts a zone file representation in a string to an RDATA on-the-wire
- * representation. */
-int
-loc_aton(ascii, binary)
-	const char *ascii;
-	u_char *binary;
-{
-	const char *cp, *maxcp;
-	u_char *bcp;
-
-	uint32_t latit = 0, longit = 0, alt = 0;
-	uint32_t lltemp1 = 0, lltemp2 = 0;
-	int altmeters = 0, altfrac = 0, altsign = 1;
-	u_int8_t hp = 0x16;	/*%< default = 1e6 cm = 10000.00m = 10km */
-	u_int8_t vp = 0x13;	/*%< default = 1e3 cm = 10.00m */
-	u_int8_t siz = 0x12;	/*%< default = 1e2 cm = 1.00m */
-	int which1 = 0, which2 = 0;
-
-	cp = ascii;
-	maxcp = cp + strlen(ascii);
-
-	lltemp1 = latlon2ul(&cp, &which1);
-
-	lltemp2 = latlon2ul(&cp, &which2);
-
-	switch (which1 + which2) {
-	case 3:			/*%< 1 + 2, the only valid combination */
-		if ((which1 == 1) && (which2 == 2)) { /*%< normal case */
-			latit = lltemp1;
-			longit = lltemp2;
-		} else if ((which1 == 2) && (which2 == 1)) { /*%< reversed */
-			longit = lltemp1;
-			latit = lltemp2;
-		} else {	/*%< some kind of brokenness */
-			return (0);
-		}
-		break;
-	default:		/*%< we didn't get one of each */
-		return (0);
-	}
-
-	/* altitude */
-	if (*cp == '-') {
-		altsign = -1;
-		cp++;
-	}
-
-	if (*cp == '+')
-		cp++;
-
-	while (isdigit((unsigned char)*cp))
-		altmeters = altmeters * 10 + (*cp++ - '0');
-
-	if (*cp == '.') {		/*%< decimal meters */
-		cp++;
-		if (isdigit((unsigned char)*cp)) {
-			altfrac = (*cp++ - '0') * 10;
-			if (isdigit((unsigned char)*cp)) {
-				altfrac += (*cp++ - '0');
-			}
-		}
-	}
-
-	alt = (10000000 + (altsign * (altmeters * 100 + altfrac)));
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp)) /*%< if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	siz = precsize_aton(&cp);
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp))	/*%< if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	hp = precsize_aton(&cp);
-
-	while (!isspace((unsigned char)*cp) && (cp < maxcp))	/*%< if trailing garbage or m */
-		cp++;
-
-	while (isspace((unsigned char)*cp) && (cp < maxcp))
-		cp++;
-
-	if (cp >= maxcp)
-		goto defaults;
-
-	vp = precsize_aton(&cp);
-
- defaults:
-
-	bcp = binary;
-	*bcp++ = (u_int8_t) 0;	/*%< version byte */
-	*bcp++ = siz;
-	*bcp++ = hp;
-	*bcp++ = vp;
-	PUTLONG(latit,bcp);
-	PUTLONG(longit,bcp);
-	PUTLONG(alt,bcp);
-
-	return (16);		/*%< size of RR in octets */
-}
-
-/*% takes an on-the-wire LOC RR and formats it in a human readable format. */
-const char *
-loc_ntoa(binary, ascii)
-	const u_char *binary;
-	char *ascii;
-{
-	static const char *error = "?";
-	static char tmpbuf[sizeof
-"1000 60 60.000 N 1000 60 60.000 W -12345678.00m 90000000.00m 90000000.00m 90000000.00m"];
-	const u_char *cp = binary;
-
-	int latdeg, latmin, latsec, latsecfrac;
-	int longdeg, longmin, longsec, longsecfrac;
-	char northsouth, eastwest;
-	const char *altsign;
-	int altmeters, altfrac;
-
-	const uint32_t referencealt = 100000 * 100;
-
-	int32_t latval, longval, altval;
-	uint32_t templ;
-	u_int8_t sizeval, hpval, vpval, versionval;
-
-	char *sizestr, *hpstr, *vpstr;
-
-	versionval = *cp++;
-
-	if (ascii == NULL)
-		ascii = tmpbuf;
-
-	if (versionval) {
-		(void) sprintf(ascii, "; error: unknown LOC RR version");
-		return (ascii);
-	}
-
-	sizeval = *cp++;
-
-	hpval = *cp++;
-	vpval = *cp++;
-
-	GETLONG(templ, cp);
-	latval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	longval = (templ - ((unsigned)1<<31));
-
-	GETLONG(templ, cp);
-	if (templ < referencealt) { /*%< below WGS 84 spheroid */
-		altval = referencealt - templ;
-		altsign = "-";
-	} else {
-		altval = templ - referencealt;
-		altsign = "";
-	}
-
-	if (latval < 0) {
-		northsouth = 'S';
-		latval = -latval;
-	} else
-		northsouth = 'N';
-
-	latsecfrac = latval % 1000;
-	latval = latval / 1000;
-	latsec = latval % 60;
-	latval = latval / 60;
-	latmin = latval % 60;
-	latval = latval / 60;
-	latdeg = latval;
-
-	if (longval < 0) {
-		eastwest = 'W';
-		longval = -longval;
-	} else
-		eastwest = 'E';
-
-	longsecfrac = longval % 1000;
-	longval = longval / 1000;
-	longsec = longval % 60;
-	longval = longval / 60;
-	longmin = longval % 60;
-	longval = longval / 60;
-	longdeg = longval;
-
-	altfrac = altval % 100;
-	altmeters = (altval / 100);
-
-	sizestr = strdup(precsize_ntoa(sizeval));
-	hpstr = strdup(precsize_ntoa(hpval));
-	vpstr = strdup(precsize_ntoa(vpval));
-
-	sprintf(ascii,
-	    "%d %.2d %.2d.%.3d %c %d %.2d %.2d.%.3d %c %s%d.%.2dm %sm %sm %sm",
-		latdeg, latmin, latsec, latsecfrac, northsouth,
-		longdeg, longmin, longsec, longsecfrac, eastwest,
-		altsign, altmeters, altfrac,
-		(sizestr != NULL) ? sizestr : error,
-		(hpstr != NULL) ? hpstr : error,
-		(vpstr != NULL) ? vpstr : error);
-
-	if (sizestr != NULL)
-		free(sizestr);
-	if (hpstr != NULL)
-		free(hpstr);
-	if (vpstr != NULL)
-		free(vpstr);
-
-	return (ascii);
-}
-
-
-/*% Return the number of DNS hierarchy levels in the name. */
-int
-dn_count_labels(const char *name) {
-	int i, len, count;
-
-	len = strlen(name);
-	for (i = 0, count = 0; i < len; i++) {
-		/* XXX need to check for \. or use named's nlabels(). */
-		if (name[i] == '.')
-			count++;
-	}
-
-	/* don't count initial wildcard */
-	if (name[0] == '*')
-		if (count)
-			count--;
-
-	/* don't count the null label for root. */
-	/* if terminating '.' not found, must adjust */
-	/* count to include last label */
-	if (len > 0 && name[len-1] != '.')
-		count++;
-	return (count);
-}
-
-/*%
- * Make dates expressed in seconds-since-Jan-1-1970 easy to read.
- * SIG records are required to be printed like this, by the Secure DNS RFC.
- */
-char *
-p_secstodate (u_long secs) {
-	char *output = p_secstodate_output;
-	time_t clock = secs;
-	struct tm *time;
-#ifdef HAVE_TIME_R
-	struct tm res;
-
-	time = gmtime_r(&clock, &res);
-#else
-	time = gmtime(&clock);
-#endif
-	time->tm_year += 1900;
-	time->tm_mon += 1;
-	sprintf(output, "%04d%02d%02d%02d%02d%02d",
-		time->tm_year, time->tm_mon, time->tm_mday,
-		time->tm_hour, time->tm_min, time->tm_sec);
-	return (output);
-}
-
-u_int16_t
-res_nametoclass(const char *buf, int *successp) {
-	unsigned long result;
-	char *endptr;
-	int success;
-
-	result = sym_ston(__p_class_syms, buf, &success);
-	if (success)
-		goto done;
-
-	if (strncasecmp(buf, "CLASS", 5) != 0 ||
-	    !isdigit((unsigned char)buf[5]))
-		goto done;
-	errno = 0;
-	result = strtoul(buf + 5, &endptr, 10);
-	if (errno == 0 && *endptr == '\0' && result <= 0xffffU)
-		success = 1;
- done:
-	if (successp)
-		*successp = success;
-	return (result);
-}
-
-u_int16_t
-res_nametotype(const char *buf, int *successp) {
-	unsigned long result;
-	char *endptr;
-	int success;
-
-	result = sym_ston(__p_type_syms, buf, &success);
-	if (success)
-		goto done;
-
-	if (strncasecmp(buf, "type", 4) != 0 ||
-	    !isdigit((unsigned char)buf[4]))
-		goto done;
-	errno = 0;
-	result = strtoul(buf + 4, &endptr, 10);
-	if (errno == 0 && *endptr == '\0' && result <= 0xffffU)
-		success = 1;
- done:
-	if (successp)
-		*successp = success;
-	return (result);
-}
-
-/*
- * Weak aliases for applications that use certain private entry points,
- * and fail to include <resolv.h>.
- */
-#undef fp_resstat
-__weak_reference(__fp_resstat, fp_resstat);
-#undef p_fqnname
-__weak_reference(__p_fqnname, p_fqnname);
-#undef sym_ston
-__weak_reference(__sym_ston, sym_ston);
-#undef sym_ntos
-__weak_reference(__sym_ntos, sym_ntos);
-#undef sym_ntop
-__weak_reference(__sym_ntop, sym_ntop);
-#undef dn_count_labels
-__weak_reference(__dn_count_labels, dn_count_labels);
-#undef p_secstodate
-__weak_reference(__p_secstodate, p_secstodate);
-
-/*! \file */
diff --git a/lib/libc_bsd/resolv/res_debug.h b/lib/libc_bsd/resolv/res_debug.h
deleted file mode 100644
index c28171d..0000000
--- a/lib/libc_bsd/resolv/res_debug.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _RES_DEBUG_H_
-#define _RES_DEBUG_H_
-
-#ifndef DEBUG
-#   define Dprint(cond, args) /*empty*/
-#   define DprintQ(cond, args, query, size) /*empty*/
-#   define Aerror(statp, file, string, error, address) /*empty*/
-#   define Perror(statp, file, string, error) /*empty*/
-#else
-#   define Dprint(cond, args) if (cond) {fprintf args;} else {}
-#   define DprintQ(cond, args, query, size) if (cond) {\
-			fprintf args;\
-			res_pquery(statp, query, size, stdout);\
-		} else {}
-#endif
-
-#endif /* _RES_DEBUG_H_ */ 
-/*! \file */
diff --git a/lib/libc_bsd/resolv/res_findzonecut.c b/lib/libc_bsd/resolv/res_findzonecut.c
deleted file mode 100644
index 047c3dd..0000000
--- a/lib/libc_bsd/resolv/res_findzonecut.c
+++ /dev/null
@@ -1,727 +0,0 @@
-#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_findzonecut.c,v 1.10 2005/10/11 00:10:16 marka Exp $";
-#endif /* not lint */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_findzonecut.c 270838 2014-08-30 10:16:25Z ume $");
-
-/* Import. */
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <isc/list.h>
-
-#include "port_after.h"
-
-#include <resolv.h>
-
-/* Data structures. */
-
-typedef struct rr_a {
-	LINK(struct rr_a)	link;
-	union res_sockaddr_union addr;
-} rr_a;
-typedef LIST(rr_a) rrset_a;
-
-typedef struct rr_ns {
-	LINK(struct rr_ns)	link;
-	const char *		name;
-	unsigned int		flags;
-	rrset_a			addrs;
-} rr_ns;
-typedef LIST(rr_ns) rrset_ns;
-
-#define	RR_NS_HAVE_V4		0x01
-#define	RR_NS_HAVE_V6		0x02
-
-/* Forward. */
-
-static int	satisfy(res_state, const char *, rrset_ns *,
-			union res_sockaddr_union *, int);
-static int	add_addrs(res_state, rr_ns *,
-			  union res_sockaddr_union *, int);
-static int	get_soa(res_state, const char *, ns_class, int,
-			char *, size_t, char *, size_t,
-			rrset_ns *);
-static int	get_ns(res_state, const char *, ns_class, int, rrset_ns *);
-static int	get_glue(res_state, ns_class, int, rrset_ns *);
-static int	save_ns(res_state, ns_msg *, ns_sect,
-			const char *, ns_class, int, rrset_ns *);
-static int	save_a(res_state, ns_msg *, ns_sect,
-		       const char *, ns_class, int, rr_ns *);
-static void	free_nsrrset(rrset_ns *);
-static void	free_nsrr(rrset_ns *, rr_ns *);
-static rr_ns *	find_ns(rrset_ns *, const char *);
-static int	do_query(res_state, const char *, ns_class, ns_type,
-			 u_char *, ns_msg *);
-static void	res_dprintf(const char *, ...) ISC_FORMAT_PRINTF(1, 2);
-
-/* Macros. */
-
-#define DPRINTF(x) do {\
-		int save_errno = errno; \
-		if ((statp->options & RES_DEBUG) != 0U) res_dprintf x; \
-		errno = save_errno; \
-	} while (0)
-
-/* Public. */
-
-/*%
- *	find enclosing zone for a <dname,class>, and some server addresses
- *
- * parameters:
- *\li	res - resolver context to work within (is modified)
- *\li	dname - domain name whose enclosing zone is desired
- *\li	class - class of dname (and its enclosing zone)
- *\li	zname - found zone name
- *\li	zsize - allocated size of zname
- *\li	addrs - found server addresses
- *\li	naddrs - max number of addrs
- *
- * return values:
- *\li	< 0 - an error occurred (check errno)
- *\li	= 0 - zname is now valid, but addrs[] wasn't changed
- *\li	> 0 - zname is now valid, and return value is number of addrs[] found
- *
- * notes:
- *\li	this function calls res_nsend() which means it depends on correctly
- *	functioning recursive nameservers (usually defined in /etc/resolv.conf
- *	or its local equivilent).
- *
- *\li	we start by asking for an SOA<dname,class>.  if we get one as an
- *	answer, that just means <dname,class> is a zone top, which is fine.
- *	more than likely we'll be told to go pound sand, in the form of a
- *	negative answer.
- *
- *\li	note that we are not prepared to deal with referrals since that would
- *	only come from authority servers and our correctly functioning local
- *	recursive server would have followed the referral and got us something
- *	more definite.
- *
- *\li	if the authority section contains an SOA, this SOA should also be the
- *	closest enclosing zone, since any intermediary zone cuts would've been
- *	returned as referrals and dealt with by our correctly functioning local
- *	recursive name server.  but an SOA in the authority section should NOT
- *	match our dname (since that would have been returned in the answer
- *	section).  an authority section SOA has to be "above" our dname.
- *
- *\li	however, since authority section SOA's were once optional, it's
- *	possible that we'll have to go hunting for the enclosing SOA by
- *	ripping labels off the front of our dname -- this is known as "doing
- *	it the hard way."
- *
- *\li	ultimately we want some server addresses, which are ideally the ones
- *	pertaining to the SOA.MNAME, but only if there is a matching NS RR.
- *	so the second phase (after we find an SOA) is to go looking for the
- *	NS RRset for that SOA's zone.
- *
- *\li	no answer section processed by this code is allowed to contain CNAME
- *	or DNAME RR's.  for the SOA query this means we strip a label and
- *	keep going.  for the NS and A queries this means we just give up.
- */
-
-#ifndef _LIBC
-int
-res_findzonecut(res_state statp, const char *dname, ns_class class, int opts,
-		char *zname, size_t zsize, struct in_addr *addrs, int naddrs)
-{
-	int result, i;
-	union res_sockaddr_union *u;
-
-	
-	opts |= RES_IPV4ONLY;
-	opts &= ~RES_IPV6ONLY;
-
-	u = calloc(naddrs, sizeof(*u));
-	if (u == NULL)
-		return(-1);
-
-	result = res_findzonecut2(statp, dname, class, opts, zname, zsize,
-				  u, naddrs);
-
-	for (i = 0; i < result; i++) {
-		addrs[i] = u[i].sin.sin_addr;
-	}
-	free(u);
-	return (result);
-}
-#endif
-
-int
-res_findzonecut2(res_state statp, const char *dname, ns_class class, int opts,
-		 char *zname, size_t zsize, union res_sockaddr_union *addrs,
-		 int naddrs)
-{
-	char mname[NS_MAXDNAME];
-	u_long save_pfcode;
-	rrset_ns nsrrs;
-	int n;
-
-	DPRINTF(("START dname='%s' class=%s, zsize=%ld, naddrs=%d",
-		 dname, p_class(class), (long)zsize, naddrs));
-	save_pfcode = statp->pfcode;
-	statp->pfcode |= RES_PRF_HEAD2 | RES_PRF_HEAD1 | RES_PRF_HEADX |
-			 RES_PRF_QUES | RES_PRF_ANS |
-			 RES_PRF_AUTH | RES_PRF_ADD;
-	INIT_LIST(nsrrs);
-
-	DPRINTF(("get the soa, and see if it has enough glue"));
-	if ((n = get_soa(statp, dname, class, opts, zname, zsize,
-			 mname, sizeof mname, &nsrrs)) < 0 ||
-	    ((opts & RES_EXHAUSTIVE) == 0 &&
-	     (n = satisfy(statp, mname, &nsrrs, addrs, naddrs)) > 0))
-		goto done;
-
-	DPRINTF(("get the ns rrset and see if it has enough glue"));
-	if ((n = get_ns(statp, zname, class, opts, &nsrrs)) < 0 ||
-	    ((opts & RES_EXHAUSTIVE) == 0 &&
-	     (n = satisfy(statp, mname, &nsrrs, addrs, naddrs)) > 0))
-		goto done;
-
-	DPRINTF(("get the missing glue and see if it's finally enough"));
-	if ((n = get_glue(statp, class, opts, &nsrrs)) >= 0)
-		n = satisfy(statp, mname, &nsrrs, addrs, naddrs);
-
- done:
-	DPRINTF(("FINISH n=%d (%s)", n, (n < 0) ? strerror(errno) : "OK"));
-	free_nsrrset(&nsrrs);
-	statp->pfcode = save_pfcode;
-	return (n);
-}
-
-/* Private. */
-
-static int
-satisfy(res_state statp, const char *mname, rrset_ns *nsrrsp,
-	union res_sockaddr_union *addrs, int naddrs)
-{
-	rr_ns *nsrr;
-	int n, x;
-
-	n = 0;
-	nsrr = find_ns(nsrrsp, mname);
-	if (nsrr != NULL) {
-		x = add_addrs(statp, nsrr, addrs, naddrs);
-		addrs += x;
-		naddrs -= x;
-		n += x;
-	}
-	for (nsrr = HEAD(*nsrrsp);
-	     nsrr != NULL && naddrs > 0;
-	     nsrr = NEXT(nsrr, link))
-		if (ns_samename(nsrr->name, mname) != 1) {
-			x = add_addrs(statp, nsrr, addrs, naddrs);
-			addrs += x;
-			naddrs -= x;
-			n += x;
-		}
-	DPRINTF(("satisfy(%s): %d", mname, n));
-	return (n);
-}
-
-static int
-add_addrs(res_state statp, rr_ns *nsrr,
-	  union res_sockaddr_union *addrs, int naddrs)
-{
-	rr_a *arr;
-	int n = 0;
-
-	for (arr = HEAD(nsrr->addrs); arr != NULL; arr = NEXT(arr, link)) {
-		if (naddrs <= 0)
-			return (0);
-		*addrs++ = arr->addr;
-		naddrs--;
-		n++;
-	}
-	DPRINTF(("add_addrs: %d", n));
-	return (n);
-}
-
-static int
-get_soa(res_state statp, const char *dname, ns_class class, int opts,
-	char *zname, size_t zsize, char *mname, size_t msize,
-	rrset_ns *nsrrsp)
-{
-	char tname[NS_MAXDNAME];
-	u_char *resp = NULL;
-	int n, i, ancount, nscount;
-	ns_sect sect;
-	ns_msg msg;
-	u_int rcode;
-
-	/*
-	 * Find closest enclosing SOA, even if it's for the root zone.
-	 */
-
-	/* First canonicalize dname (exactly one unescaped trailing "."). */
-	if (ns_makecanon(dname, tname, sizeof tname) < 0)
-		goto cleanup;
-	dname = tname;
-
-	resp = malloc(NS_MAXMSG);
-	if (resp == NULL)
-		goto cleanup;
-
-	/* Now grovel the subdomains, hunting for an SOA answer or auth. */
-	for (;;) {
-		/* Leading or inter-label '.' are skipped here. */
-		while (*dname == '.')
-			dname++;
-
-		/* Is there an SOA? */
-		n = do_query(statp, dname, class, ns_t_soa, resp, &msg);
-		if (n < 0) {
-			DPRINTF(("get_soa: do_query('%s', %s) failed (%d)",
-				 dname, p_class(class), n));
-			goto cleanup;
-		}
-		if (n > 0) {
-			DPRINTF(("get_soa: CNAME or DNAME found"));
-			sect = ns_s_max, n = 0;
-		} else {
-			rcode = ns_msg_getflag(msg, ns_f_rcode);
-			ancount = ns_msg_count(msg, ns_s_an);
-			nscount = ns_msg_count(msg, ns_s_ns);
-			if (ancount > 0 && rcode == ns_r_noerror)
-				sect = ns_s_an, n = ancount;
-			else if (nscount > 0)
-				sect = ns_s_ns, n = nscount;
-			else
-				sect = ns_s_max, n = 0;
-		}
-		for (i = 0; i < n; i++) {
-			const char *t;
-			const u_char *rdata;
-			ns_rr rr;
-
-			if (ns_parserr(&msg, sect, i, &rr) < 0) {
-				DPRINTF(("get_soa: ns_parserr(%s, %d) failed",
-					 p_section(sect, ns_o_query), i));
-				goto cleanup;
-			}
-			if (ns_rr_type(rr) == ns_t_cname ||
-			    ns_rr_type(rr) == ns_t_dname)
-				break;
-			if (ns_rr_type(rr) != ns_t_soa ||
-			    ns_rr_class(rr) != class)
-				continue;
-			t = ns_rr_name(rr);
-			switch (sect) {
-			case ns_s_an:
-				if (ns_samedomain(dname, t) == 0) {
-					DPRINTF(
-				    ("get_soa: ns_samedomain('%s', '%s') == 0",
-						dname, t)
-						);
-					errno = EPROTOTYPE;
-					goto cleanup;
-				}
-				break;
-			case ns_s_ns:
-				if (ns_samename(dname, t) == 1 ||
-				    ns_samedomain(dname, t) == 0) {
-					DPRINTF(
-		       ("get_soa: ns_samename() || !ns_samedomain('%s', '%s')",
-						dname, t)
-						);
-					errno = EPROTOTYPE;
-					goto cleanup;
-				}
-				break;
-			default:
-				abort();
-			}
-			if (strlen(t) + 1 > zsize) {
-				DPRINTF(("get_soa: zname(%lu) too small (%lu)",
-					 (unsigned long)zsize,
-					 (unsigned long)strlen(t) + 1));
-				errno = EMSGSIZE;
-				goto cleanup;
-			}
-			strcpy(zname, t);
-			rdata = ns_rr_rdata(rr);
-			if (ns_name_uncompress(resp, ns_msg_end(msg), rdata,
-					       mname, msize) < 0) {
-				DPRINTF(("get_soa: ns_name_uncompress failed")
-					);
-				goto cleanup;
-			}
-			if (save_ns(statp, &msg, ns_s_ns,
-				    zname, class, opts, nsrrsp) < 0) {
-				DPRINTF(("get_soa: save_ns failed"));
-				goto cleanup;
-			}
-			free(resp);
-			return (0);
-		}
-
-		/* If we're out of labels, then not even "." has an SOA! */
-		if (*dname == '\0')
-			break;
-
-		/* Find label-terminating "."; top of loop will skip it. */
-		while (*dname != '.') {
-			if (*dname == '\\')
-				if (*++dname == '\0') {
-					errno = EMSGSIZE;
-					goto cleanup;
-				}
-			dname++;
-		}
-	}
-	DPRINTF(("get_soa: out of labels"));
-	errno = EDESTADDRREQ;
- cleanup:
-	if (resp != NULL)
-		free(resp);
-	return (-1);
-}
-
-static int
-get_ns(res_state statp, const char *zname, ns_class class, int opts,
-      rrset_ns *nsrrsp)
-{
-	u_char *resp;
-	ns_msg msg;
-	int n;
-
-	resp = malloc(NS_MAXMSG);
-	if (resp == NULL)
-		return (-1);
-
-	/* Go and get the NS RRs for this zone. */
-	n = do_query(statp, zname, class, ns_t_ns, resp, &msg);
-	if (n != 0) {
-		DPRINTF(("get_ns: do_query('%s', %s) failed (%d)",
-			 zname, p_class(class), n));
-		free(resp);
-		return (-1);
-	}
-
-	/* Remember the NS RRs and associated A RRs that came back. */
-	if (save_ns(statp, &msg, ns_s_an, zname, class, opts, nsrrsp) < 0) {
-		DPRINTF(("get_ns save_ns('%s', %s) failed",
-			 zname, p_class(class)));
-		free(resp);
-		return (-1);
-	}
-
-	free(resp);
-	return (0);
-}
-
-static int
-get_glue(res_state statp, ns_class class, int opts, rrset_ns *nsrrsp) {
-	rr_ns *nsrr, *nsrr_n;
-	u_char *resp;
-
-	resp = malloc(NS_MAXMSG);
-	if (resp == NULL)
-		return(-1);
-
-	/* Go and get the A RRs for each empty NS RR on our list. */
-	for (nsrr = HEAD(*nsrrsp); nsrr != NULL; nsrr = nsrr_n) {
-		ns_msg msg;
-		int n;
-
-		nsrr_n = NEXT(nsrr, link);
-
-		if ((nsrr->flags & RR_NS_HAVE_V4) == 0) {
-			n = do_query(statp, nsrr->name, class, ns_t_a,
-				     resp, &msg);
-			if (n < 0) {
-				DPRINTF(
-				       ("get_glue: do_query('%s', %s') failed",
-					nsrr->name, p_class(class)));
-				goto cleanup;
-			}
-			if (n > 0) {
-				DPRINTF((
-			"get_glue: do_query('%s', %s') CNAME or DNAME found",
-					 nsrr->name, p_class(class)));
-			}
-			if (save_a(statp, &msg, ns_s_an, nsrr->name, class,
-				   opts, nsrr) < 0) {
-				DPRINTF(("get_glue: save_r('%s', %s) failed",
-					 nsrr->name, p_class(class)));
-				goto cleanup;
-			}
-		}
-
-		if ((nsrr->flags & RR_NS_HAVE_V6) == 0) {
-			n = do_query(statp, nsrr->name, class, ns_t_aaaa,
-				     resp, &msg);
-			if (n < 0) {
-				DPRINTF(
-				       ("get_glue: do_query('%s', %s') failed",
-					nsrr->name, p_class(class)));
-				goto cleanup;
-			}
-			if (n > 0) {
-				DPRINTF((
-			"get_glue: do_query('%s', %s') CNAME or DNAME found",
-					 nsrr->name, p_class(class)));
-			}
-			if (save_a(statp, &msg, ns_s_an, nsrr->name, class,
-				   opts, nsrr) < 0) {
-				DPRINTF(("get_glue: save_r('%s', %s) failed",
-					 nsrr->name, p_class(class)));
-				goto cleanup;
-			}
-		}
-
-		/* If it's still empty, it's just chaff. */
-		if (EMPTY(nsrr->addrs)) {
-			DPRINTF(("get_glue: removing empty '%s' NS",
-				 nsrr->name));
-			free_nsrr(nsrrsp, nsrr);
-		}
-	}
-	free(resp);
-	return (0);
-
- cleanup:
-	free(resp);
-	return (-1);
-}
-
-static int
-save_ns(res_state statp, ns_msg *msg, ns_sect sect,
-	const char *owner, ns_class class, int opts,
-	rrset_ns *nsrrsp)
-{
-	int i;
-
-	for (i = 0; i < ns_msg_count(*msg, sect); i++) {
-		char tname[MAXDNAME];
-		const u_char *rdata;
-		rr_ns *nsrr;
-		ns_rr rr;
-
-		if (ns_parserr(msg, sect, i, &rr) < 0) {
-			DPRINTF(("save_ns: ns_parserr(%s, %d) failed",
-				 p_section(sect, ns_o_query), i));
-			return (-1);
-		}
-		if (ns_rr_type(rr) != ns_t_ns ||
-		    ns_rr_class(rr) != class ||
-		    ns_samename(ns_rr_name(rr), owner) != 1)
-			continue;
-		nsrr = find_ns(nsrrsp, ns_rr_name(rr));
-		if (nsrr == NULL) {
-			nsrr = malloc(sizeof *nsrr);
-			if (nsrr == NULL) {
-				DPRINTF(("save_ns: malloc failed"));
-				return (-1);
-			}
-			rdata = ns_rr_rdata(rr);
-			if (ns_name_uncompress(ns_msg_base(*msg),
-					       ns_msg_end(*msg), rdata,
-					       tname, sizeof tname) < 0) {
-				DPRINTF(("save_ns: ns_name_uncompress failed")
-					);
-				free(nsrr);
-				return (-1);
-			}
-			nsrr->name = strdup(tname);
-			if (nsrr->name == NULL) {
-				DPRINTF(("save_ns: strdup failed"));
-				free(nsrr);
-				return (-1);
-			}
-			INIT_LINK(nsrr, link);
-			INIT_LIST(nsrr->addrs);
-			nsrr->flags = 0;
-			APPEND(*nsrrsp, nsrr, link);
-		}
-		if (save_a(statp, msg, ns_s_ar,
-			   nsrr->name, class, opts, nsrr) < 0) {
-			DPRINTF(("save_ns: save_r('%s', %s) failed",
-				 nsrr->name, p_class(class)));
-			return (-1);
-		}
-	}
-	return (0);
-}
-
-static int
-save_a(res_state statp, ns_msg *msg, ns_sect sect,
-       const char *owner, ns_class class, int opts,
-       rr_ns *nsrr)
-{
-	int i;
-
-	for (i = 0; i < ns_msg_count(*msg, sect); i++) {
-		ns_rr rr;
-		rr_a *arr;
-
-		if (ns_parserr(msg, sect, i, &rr) < 0) {
-			DPRINTF(("save_a: ns_parserr(%s, %d) failed",
-				 p_section(sect, ns_o_query), i));
-			return (-1);
-		}
-		if ((ns_rr_type(rr) != ns_t_a &&
-		     ns_rr_type(rr) != ns_t_aaaa) ||
-		    ns_rr_class(rr) != class ||
-		    ns_samename(ns_rr_name(rr), owner) != 1 ||
-		    ns_rr_rdlen(rr) != NS_INADDRSZ)
-			continue;
-		if ((opts & RES_IPV6ONLY) != 0 && ns_rr_type(rr) != ns_t_aaaa)
-			continue;
-		if ((opts & RES_IPV4ONLY) != 0 && ns_rr_type(rr) != ns_t_a)
-			continue;
-		arr = malloc(sizeof *arr);
-		if (arr == NULL) {
-			DPRINTF(("save_a: malloc failed"));
-			return (-1);
-		}
-		INIT_LINK(arr, link);
-		memset(&arr->addr, 0, sizeof(arr->addr));
-		switch (ns_rr_type(rr)) {
-		case ns_t_a:
-			arr->addr.sin.sin_family = AF_INET;
-#ifdef HAVE_SA_LEN
-			arr->addr.sin.sin_len = sizeof(arr->addr.sin);
-#endif
-			memcpy(&arr->addr.sin.sin_addr, ns_rr_rdata(rr),
-			       NS_INADDRSZ);
-			arr->addr.sin.sin_port = htons(NAMESERVER_PORT);
-			nsrr->flags |= RR_NS_HAVE_V4;
-			break;
-		case ns_t_aaaa:
-			arr->addr.sin6.sin6_family = AF_INET6;
-#ifdef HAVE_SA_LEN
-			arr->addr.sin6.sin6_len = sizeof(arr->addr.sin6);
-#endif
-			memcpy(&arr->addr.sin6.sin6_addr, ns_rr_rdata(rr), 16);
-			arr->addr.sin.sin_port = htons(NAMESERVER_PORT);
-			nsrr->flags |= RR_NS_HAVE_V6;
-			break;
-		default:
-			abort();
-		}
-		APPEND(nsrr->addrs, arr, link);
-	}
-	return (0);
-}
-
-static void
-free_nsrrset(rrset_ns *nsrrsp) {
-	rr_ns *nsrr;
-
-	while ((nsrr = HEAD(*nsrrsp)) != NULL)
-		free_nsrr(nsrrsp, nsrr);
-}
-
-static void
-free_nsrr(rrset_ns *nsrrsp, rr_ns *nsrr) {
-	rr_a *arr;
-	char *tmp;
-
-	while ((arr = HEAD(nsrr->addrs)) != NULL) {
-		UNLINK(nsrr->addrs, arr, link);
-		free(arr);
-	}
-	DE_CONST(nsrr->name, tmp);
-	free(tmp);
-	UNLINK(*nsrrsp, nsrr, link);
-	free(nsrr);
-}
-
-static rr_ns *
-find_ns(rrset_ns *nsrrsp, const char *dname) {
-	rr_ns *nsrr;
-
-	for (nsrr = HEAD(*nsrrsp); nsrr != NULL; nsrr = NEXT(nsrr, link))
-		if (ns_samename(nsrr->name, dname) == 1)
-			return (nsrr);
-	return (NULL);
-}
-
-static int
-do_query(res_state statp, const char *dname, ns_class class, ns_type qtype,
-	 u_char *resp, ns_msg *msg)
-{
-	u_char req[NS_PACKETSZ];
-	int i, n;
-
-	n = res_nmkquery(statp, ns_o_query, dname, class, qtype,
-			 NULL, 0, NULL, req, NS_PACKETSZ);
-	if (n < 0) {
-		DPRINTF(("do_query: res_nmkquery failed"));
-		return (-1);
-	}
-	n = res_nsend(statp, req, n, resp, NS_MAXMSG);
-	if (n < 0) {
-		DPRINTF(("do_query: res_nsend failed"));
-		return (-1);
-	}
-	if (n == 0) {
-		DPRINTF(("do_query: res_nsend returned 0"));
-		errno = EMSGSIZE;
-		return (-1);
-	}
-	if (ns_initparse(resp, n, msg) < 0) {
-		DPRINTF(("do_query: ns_initparse failed"));
-		return (-1);
-	}
-	n = 0;
-	for (i = 0; i < ns_msg_count(*msg, ns_s_an); i++) {
-		ns_rr rr;
-
-		if (ns_parserr(msg, ns_s_an, i, &rr) < 0) {
-			DPRINTF(("do_query: ns_parserr failed"));
-			return (-1);
-		}
-		n += (ns_rr_class(rr) == class &&
-		      (ns_rr_type(rr) == ns_t_cname ||
-		       ns_rr_type(rr) == ns_t_dname));
-	}
-	return (n);
-}
-
-static void
-res_dprintf(const char *fmt, ...) {
-	va_list ap;
-
-	va_start(ap, fmt);
-	fputs(";; res_findzonecut: ", stderr);
-	vfprintf(stderr, fmt, ap);
-	fputc('\n', stderr);
-	va_end(ap);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/resolv/res_init.c b/lib/libc_bsd/resolv/res_init.c
deleted file mode 100644
index cce51e7..0000000
--- a/lib/libc_bsd/resolv/res_init.c
+++ /dev/null
@@ -1,929 +0,0 @@
-/*
- * Copyright (c) 1985, 1989, 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.
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_init.c	8.1 (Berkeley) 6/7/93";
-static const char rcsid[] = "$Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_init.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include "namespace.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <netdb.h>
-
-#ifndef HAVE_MD5
-# include "../dst/md5.h"
-#else
-# ifdef SOLARIS2
-#  include <sys/md5.h>
-# elif _LIBC
-# include <md5.h>
-# endif
-#endif
-#ifndef _MD5_H_
-# define _MD5_H_ 1	/*%< make sure we do not include rsaref md5.h file */
-#endif
-
-#include "un-namespace.h"
-
-#include "port_after.h"
-
-/* ensure that sockaddr_in6 and IN6ADDR_ANY_INIT are declared / defined */
-#include <resolv.h>
-
-#include "res_private.h"
-
-/*% Options.  Should all be left alone. */
-#define RESOLVSORT
-#define DEBUG
-
-#ifdef SOLARIS2
-#include <sys/systeminfo.h>
-#endif
-
-static void res_setoptions(res_state, const char *, const char *);
-
-#ifdef RESOLVSORT
-static const char sort_mask[] = "/&";
-#define ISSORTMASK(ch) (strchr(sort_mask, ch) != NULL)
-static uint32_t net_mask(struct in_addr);
-#endif
-
-#if !defined(isascii)	/*%< XXX - could be a function */
-# define isascii(c) (!(c & 0200))
-#endif
-
-/*
- * Resolver state default settings.
- */
-
-/*%
- * Set up default settings.  If the configuration file exist, the values
- * there will have precedence.  Otherwise, the server address is set to
- * INADDR_ANY and the default domain name comes from the gethostname().
- *
- * An interrim version of this code (BIND 4.9, pre-4.4BSD) used 127.0.0.1
- * rather than INADDR_ANY ("0.0.0.0") as the default name server address
- * since it was noted that INADDR_ANY actually meant ``the first interface
- * you "ifconfig"'d at boot time'' and if this was a SLIP or PPP interface,
- * it had to be "up" in order for you to reach your own name server.  It
- * was later decided that since the recommended practice is to always 
- * install local static routes through 127.0.0.1 for all your network
- * interfaces, that we could solve this problem without a code change.
- *
- * The configuration file should always be used, since it is the only way
- * to specify a default domain.  If you are running a server on your local
- * machine, you should say "nameserver 0.0.0.0" or "nameserver 127.0.0.1"
- * in the configuration file.
- *
- * Return 0 if completes successfully, -1 on error
- */
-int
-res_ninit(res_state statp) {
-	extern int __res_vinit(res_state, int);
-
-	return (__res_vinit(statp, 0));
-}
-
-/*% This function has to be reachable by res_data.c but not publically. */
-int
-__res_vinit(res_state statp, int preinit) {
-	FILE *fp;
-	char *cp, **pp;
-	int n;
-	char buf[BUFSIZ];
-	int nserv = 0;    /*%< number of nameserver records read from file */
-	int haveenv = 0;
-	int havesearch = 0;
-#ifdef RESOLVSORT
-	int nsort = 0;
-	char *net;
-#endif
-	int dots;
-	union res_sockaddr_union u[2];
-	int maxns = MAXNS;
-
-	RES_SET_H_ERRNO(statp, 0);
-	if (statp->_u._ext.ext != NULL)
-		res_ndestroy(statp);
-
-	if (!preinit) {
-		statp->retrans = RES_TIMEOUT;
-		statp->retry = RES_DFLRETRY;
-		statp->options = RES_DEFAULT;
-	}
-
-	statp->_rnd = malloc(16);
-	res_rndinit(statp);
-	statp->id = res_nrandomid(statp);
-
-	memset(u, 0, sizeof(u));
-#ifdef USELOOPBACK
-	u[nserv].sin.sin_addr = inet_makeaddr(IN_LOOPBACKNET, 1);
-#else
-	u[nserv].sin.sin_addr.s_addr = INADDR_ANY;
-#endif
-	u[nserv].sin.sin_family = AF_INET;
-	u[nserv].sin.sin_port = htons(NAMESERVER_PORT);
-#ifdef HAVE_SA_LEN
-	u[nserv].sin.sin_len = sizeof(struct sockaddr_in);
-#endif
-	nserv++;
-#ifdef HAS_INET6_STRUCTS
-#ifdef USELOOPBACK
-	u[nserv].sin6.sin6_addr = in6addr_loopback;
-#else
-	u[nserv].sin6.sin6_addr = in6addr_any;
-#endif
-	u[nserv].sin6.sin6_family = AF_INET6;
-	u[nserv].sin6.sin6_port = htons(NAMESERVER_PORT);
-#ifdef HAVE_SA_LEN
-	u[nserv].sin6.sin6_len = sizeof(struct sockaddr_in6);
-#endif
-	nserv++;
-#endif
-	statp->nscount = 0;
-	statp->ndots = 1;
-	statp->pfcode = 0;
-	statp->_vcsock = -1;
-	statp->_flags = 0;
-	statp->qhook = NULL;
-	statp->rhook = NULL;
-	statp->_u._ext.nscount = 0;
-	statp->_u._ext.ext = malloc(sizeof(*statp->_u._ext.ext));
-	if (statp->_u._ext.ext != NULL) {
-	        memset(statp->_u._ext.ext, 0, sizeof(*statp->_u._ext.ext));
-		statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr;
-		strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa");
-		strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int");
-	} else {
-		/*
-		 * Historically res_init() rarely, if at all, failed.
-		 * Examples and applications exist which do not check
-		 * our return code.  Furthermore several applications
-		 * simply call us to get the systems domainname.  So
-		 * rather then immediately fail here we store the
-		 * failure, which is returned later, in h_errno.  And
-		 * prevent the collection of 'nameserver' information
-		 * by setting maxns to 0.  Thus applications that fail
-		 * to check our return code wont be able to make
-		 * queries anyhow.
-		 */
-		RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
-		maxns = 0;
-	}
-#ifdef RESOLVSORT
-	statp->nsort = 0;
-#endif
-	res_setservers(statp, u, nserv);
-
-#ifdef	SOLARIS2
-	/*
-	 * The old libresolv derived the defaultdomain from NIS/NIS+.
-	 * We want to keep this behaviour
-	 */
-	{
-		char buf[sizeof(statp->defdname)], *cp;
-		int ret;
-
-		if ((ret = sysinfo(SI_SRPC_DOMAIN, buf, sizeof(buf))) > 0 &&
-			(unsigned int)ret <= sizeof(buf)) {
-			if (buf[0] == '+')
-				buf[0] = '.';
-			cp = strchr(buf, '.');
-			cp = (cp == NULL) ? buf : (cp + 1);
-			strncpy(statp->defdname, cp,
-				sizeof(statp->defdname) - 1);
-			statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		}
-	}
-#endif	/* SOLARIS2 */
-
-	/* Allow user to override the local domain definition */
-	if (issetugid() == 0 && (cp = getenv("LOCALDOMAIN")) != NULL) {
-		(void)strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
-		statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		haveenv++;
-
-		/*
-		 * Set search list to be blank-separated strings
-		 * from rest of env value.  Permits users of LOCALDOMAIN
-		 * to still have a search list, and anyone to set the
-		 * one that they want to use as an individual (even more
-		 * important now that the rfc1535 stuff restricts searches)
-		 */
-		cp = statp->defdname;
-		pp = statp->dnsrch;
-		*pp++ = cp;
-		for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
-			if (*cp == '\n')	/*%< silly backwards compat */
-				break;
-			else if (*cp == ' ' || *cp == '\t') {
-				*cp = 0;
-				n = 1;
-			} else if (n) {
-				*pp++ = cp;
-				n = 0;
-				havesearch = 1;
-			}
-		}
-		/* null terminate last domain if there are excess */
-		while (*cp != '\0' && *cp != ' ' && *cp != '\t' && *cp != '\n')
-			cp++;
-		*cp = '\0';
-		*pp++ = 0;
-	}
-
-#define	MATCH(line, name) \
-	(!strncmp(line, name, sizeof(name) - 1) && \
-	(line[sizeof(name) - 1] == ' ' || \
-	 line[sizeof(name) - 1] == '\t'))
-
-	nserv = 0;
-	if ((fp = fopen(_PATH_RESCONF, "re")) != NULL) {
-	    /* read the config file */
-	    while (fgets(buf, sizeof(buf), fp) != NULL) {
-		/* skip comments */
-		if (*buf == ';' || *buf == '#')
-			continue;
-		/* read default domain name */
-		if (MATCH(buf, "domain")) {
-		    if (haveenv)	/*%< skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("domain") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
-		    statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		    if ((cp = strpbrk(statp->defdname, " \t\n")) != NULL)
-			    *cp = '\0';
-		    havesearch = 0;
-		    continue;
-		}
-		/* set search list */
-		if (MATCH(buf, "search")) {
-		    if (haveenv)	/*%< skip if have from environ */
-			    continue;
-		    cp = buf + sizeof("search") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			    cp++;
-		    if ((*cp == '\0') || (*cp == '\n'))
-			    continue;
-		    strncpy(statp->defdname, cp, sizeof(statp->defdname) - 1);
-		    statp->defdname[sizeof(statp->defdname) - 1] = '\0';
-		    if ((cp = strchr(statp->defdname, '\n')) != NULL)
-			    *cp = '\0';
-		    /*
-		     * Set search list to be blank-separated strings
-		     * on rest of line.
-		     */
-		    cp = statp->defdname;
-		    pp = statp->dnsrch;
-		    *pp++ = cp;
-		    for (n = 0; *cp && pp < statp->dnsrch + MAXDNSRCH; cp++) {
-			    if (*cp == ' ' || *cp == '\t') {
-				    *cp = 0;
-				    n = 1;
-			    } else if (n) {
-				    *pp++ = cp;
-				    n = 0;
-			    }
-		    }
-		    /* null terminate last domain if there are excess */
-		    while (*cp != '\0' && *cp != ' ' && *cp != '\t')
-			    cp++;
-		    *cp = '\0';
-		    *pp++ = 0;
-		    havesearch = 1;
-		    continue;
-		}
-		/* read nameservers to query */
-		if (MATCH(buf, "nameserver") && nserv < maxns) {
-		    struct addrinfo hints, *ai;
-		    char sbuf[NI_MAXSERV];
-		    const size_t minsiz =
-		        sizeof(statp->_u._ext.ext->nsaddrs[0]);
-
-		    cp = buf + sizeof("nameserver") - 1;
-		    while (*cp == ' ' || *cp == '\t')
-			cp++;
-		    cp[strcspn(cp, ";# \t\n")] = '\0';
-		    if ((*cp != '\0') && (*cp != '\n')) {
-			memset(&hints, 0, sizeof(hints));
-			hints.ai_family = PF_UNSPEC;
-			hints.ai_socktype = SOCK_DGRAM;	/*dummy*/
-			hints.ai_flags = AI_NUMERICHOST;
-			sprintf(sbuf, "%u", NAMESERVER_PORT);
-			if (getaddrinfo(cp, sbuf, &hints, &ai) == 0 &&
-			    ai->ai_addrlen <= minsiz) {
-			    if (statp->_u._ext.ext != NULL) {
-				memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
-				    ai->ai_addr, ai->ai_addrlen);
-			    }
-			    if (ai->ai_addrlen <=
-			        sizeof(statp->nsaddr_list[nserv])) {
-				memcpy(&statp->nsaddr_list[nserv],
-				    ai->ai_addr, ai->ai_addrlen);
-			    } else
-				statp->nsaddr_list[nserv].sin_family = 0;
-			    freeaddrinfo(ai);
-			    nserv++;
-			}
-		    }
-		    continue;
-		}
-#ifdef RESOLVSORT
-		if (MATCH(buf, "sortlist")) {
-		    struct in_addr a;
-		    struct in6_addr a6;
-		    int m, i;
-		    u_char *u;
-		    struct __res_state_ext *ext = statp->_u._ext.ext;
-
-		    cp = buf + sizeof("sortlist") - 1;
-		    while (nsort < MAXRESOLVSORT) {
-			while (*cp == ' ' || *cp == '\t')
-			    cp++;
-			if (*cp == '\0' || *cp == '\n' || *cp == ';')
-			    break;
-			net = cp;
-			while (*cp && !ISSORTMASK(*cp) && *cp != ';' &&
-			       isascii(*cp) && !isspace((unsigned char)*cp))
-				cp++;
-			n = *cp;
-			*cp = 0;
-			if (inet_aton(net, &a)) {
-			    statp->sort_list[nsort].addr = a;
-			    if (ISSORTMASK(n)) {
-				*cp++ = n;
-				net = cp;
-				while (*cp && *cp != ';' &&
-					isascii(*cp) &&
-					!isspace((unsigned char)*cp))
-				    cp++;
-				n = *cp;
-				*cp = 0;
-				if (inet_aton(net, &a)) {
-				    statp->sort_list[nsort].mask = a.s_addr;
-				} else {
-				    statp->sort_list[nsort].mask = 
-					net_mask(statp->sort_list[nsort].addr);
-				}
-			    } else {
-				statp->sort_list[nsort].mask = 
-				    net_mask(statp->sort_list[nsort].addr);
-			    }
-			    ext->sort_list[nsort].af = AF_INET;
-			    ext->sort_list[nsort].addr.ina =
-				statp->sort_list[nsort].addr;
-			    ext->sort_list[nsort].mask.ina.s_addr =
-				statp->sort_list[nsort].mask;
-			    nsort++;
-			}
-			else if (inet_pton(AF_INET6, net, &a6) == 1) {
-
-			    ext->sort_list[nsort].af = AF_INET6;
-			    ext->sort_list[nsort].addr.in6a = a6;
-			    u = (u_char *)&ext->sort_list[nsort].mask.in6a;
-			    *cp++ = n;
-			    net = cp;
-			    while (*cp && *cp != ';' &&
-				    isascii(*cp) && !isspace(*cp))
-				cp++;
-			    m = n;
-			    n = *cp;
-			    *cp = 0;
-			    switch (m) {
-			    case '/':
-				m = atoi(net);
-				break;
-			    case '&':
-				if (inet_pton(AF_INET6, net, u) == 1) {
-				    m = -1;
-				    break;
-				}
-				/*FALLTHROUGH*/
-			    default:
-				m = sizeof(struct in6_addr) * CHAR_BIT;
-				break;
-			    }
-			    if (m >= 0) {
-				for (i = 0; i < sizeof(struct in6_addr); i++) {
-				    if (m <= 0) {
-					*u = 0;
-				    } else {
-					m -= CHAR_BIT;
-					*u = (u_char)~0;
-					if (m < 0)
-					    *u <<= -m;
-				    }
-				    u++;
-				}
-			    }
-			    statp->sort_list[nsort].addr.s_addr =
-				(uint32_t)0xffffffff;
-			    statp->sort_list[nsort].mask =
-				(uint32_t)0xffffffff;
-			    nsort++;
-			}
-			*cp = n;
-		    }
-		    continue;
-		}
-#endif
-		if (MATCH(buf, "options")) {
-		    res_setoptions(statp, buf + sizeof("options") - 1, "conf");
-		    continue;
-		}
-	    }
-	    if (nserv > 0) 
-		statp->nscount = nserv;
-#ifdef RESOLVSORT
-	    statp->nsort = nsort;
-#endif
-	    (void) fclose(fp);
-	}
-/*
- * Last chance to get a nameserver.  This should not normally
- * be necessary
- */
-#ifdef NO_RESOLV_CONF
-	if(nserv == 0)
-		nserv = get_nameservers(statp);
-#endif
-
-	if (statp->defdname[0] == 0 &&
-	    gethostname(buf, sizeof(statp->defdname) - 1) == 0 &&
-	    (cp = strchr(buf, '.')) != NULL)
-		strcpy(statp->defdname, cp + 1);
-
-	/* find components of local domain that might be searched */
-	if (havesearch == 0) {
-		pp = statp->dnsrch;
-		*pp++ = statp->defdname;
-		*pp = NULL;
-
-		dots = 0;
-		for (cp = statp->defdname; *cp; cp++)
-			dots += (*cp == '.');
-
-		cp = statp->defdname;
-		while (pp < statp->dnsrch + MAXDFLSRCH) {
-			if (dots < LOCALDOMAINPARTS)
-				break;
-			cp = strchr(cp, '.') + 1;    /*%< we know there is one */
-			*pp++ = cp;
-			dots--;
-		}
-		*pp = NULL;
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG) {
-			printf(";; res_init()... default dnsrch list:\n");
-			for (pp = statp->dnsrch; *pp; pp++)
-				printf(";;\t%s\n", *pp);
-			printf(";;\t..END..\n");
-		}
-#endif
-	}
-
-	if (issetugid())
-		statp->options |= RES_NOALIASES;
-	else if ((cp = getenv("RES_OPTIONS")) != NULL)
-		res_setoptions(statp, cp, "env");
-	statp->options |= RES_INIT;
-	return (statp->res_h_errno);
-}
-
-static void
-res_setoptions(res_state statp, const char *options, const char *source)
-{
-	const char *cp = options;
-	int i;
-#ifndef _LIBC
-	struct __res_state_ext *ext = statp->_u._ext.ext;
-#endif
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_setoptions(\"%s\", \"%s\")...\n",
-		       options, source);
-#endif
-	while (*cp) {
-		/* skip leading and inner runs of spaces */
-		while (*cp == ' ' || *cp == '\t')
-			cp++;
-		/* search for and process individual options */
-		if (!strncmp(cp, "ndots:", sizeof("ndots:") - 1)) {
-			i = atoi(cp + sizeof("ndots:") - 1);
-			if (i <= RES_MAXNDOTS)
-				statp->ndots = i;
-			else
-				statp->ndots = RES_MAXNDOTS;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\tndots=%d\n", statp->ndots);
-#endif
-		} else if (!strncmp(cp, "timeout:", sizeof("timeout:") - 1)) {
-			i = atoi(cp + sizeof("timeout:") - 1);
-			if (i <= RES_MAXRETRANS)
-				statp->retrans = i;
-			else
-				statp->retrans = RES_MAXRETRANS;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\ttimeout=%d\n", statp->retrans);
-#endif
-#ifdef	SOLARIS2
-		} else if (!strncmp(cp, "retrans:", sizeof("retrans:") - 1)) {
-			/*
-		 	 * For backward compatibility, 'retrans' is
-		 	 * supported as an alias for 'timeout', though
-		 	 * without an imposed maximum.
-		 	 */
-			statp->retrans = atoi(cp + sizeof("retrans:") - 1);
-		} else if (!strncmp(cp, "retry:", sizeof("retry:") - 1)){
-			/*
-			 * For backward compatibility, 'retry' is
-			 * supported as an alias for 'attempts', though
-			 * without an imposed maximum.
-			 */
-			statp->retry = atoi(cp + sizeof("retry:") - 1);
-#endif	/* SOLARIS2 */
-		} else if (!strncmp(cp, "attempts:", sizeof("attempts:") - 1)){
-			i = atoi(cp + sizeof("attempts:") - 1);
-			if (i <= RES_MAXRETRY)
-				statp->retry = i;
-			else
-				statp->retry = RES_MAXRETRY;
-#ifdef DEBUG
-			if (statp->options & RES_DEBUG)
-				printf(";;\tattempts=%d\n", statp->retry);
-#endif
-		} else if (!strncmp(cp, "debug", sizeof("debug") - 1)) {
-#ifdef DEBUG
-			if (!(statp->options & RES_DEBUG)) {
-				printf(";; res_setoptions(\"%s\", \"%s\")..\n",
-				       options, source);
-				statp->options |= RES_DEBUG;
-			}
-			printf(";;\tdebug\n");
-#endif
-		} else if (!strncmp(cp, "no_tld_query",
-				    sizeof("no_tld_query") - 1) ||
-			   !strncmp(cp, "no-tld-query",
-				    sizeof("no-tld-query") - 1)) {
-			statp->options |= RES_NOTLDQUERY;
-		} else if (!strncmp(cp, "inet6", sizeof("inet6") - 1)) {
-			statp->options |= RES_USE_INET6;
-		} else if (!strncmp(cp, "insecure1", sizeof("insecure1") - 1)) {
-		       statp->options |= RES_INSECURE1;
-		} else if (!strncmp(cp, "insecure2", sizeof("insecure2") - 1)) {
-		       statp->options |= RES_INSECURE2;
-		} else if (!strncmp(cp, "rotate", sizeof("rotate") - 1)) {
-			statp->options |= RES_ROTATE;
-		} else if (!strncmp(cp, "no-check-names",
-				    sizeof("no-check-names") - 1)) {
-			statp->options |= RES_NOCHECKNAME;
-		}
-#ifdef RES_USE_EDNS0
-		else if (!strncmp(cp, "edns0", sizeof("edns0") - 1)) {
-			statp->options |= RES_USE_EDNS0;
-		}
-#endif
-#ifndef _LIBC
-		else if (!strncmp(cp, "dname", sizeof("dname") - 1)) {
-			statp->options |= RES_USE_DNAME;
-		}
-		else if (!strncmp(cp, "nibble:", sizeof("nibble:") - 1)) {
-			if (ext == NULL)
-				goto skip;
-			cp += sizeof("nibble:") - 1;
-			i = MIN(strcspn(cp, " \t"), sizeof(ext->nsuffix) - 1);
-			strncpy(ext->nsuffix, cp, i);
-			ext->nsuffix[i] = '\0';
-		}
-		else if (!strncmp(cp, "nibble2:", sizeof("nibble2:") - 1)) {
-			if (ext == NULL)
-				goto skip;
-			cp += sizeof("nibble2:") - 1;
-			i = MIN(strcspn(cp, " \t"), sizeof(ext->nsuffix2) - 1);
-			strncpy(ext->nsuffix2, cp, i);
-			ext->nsuffix2[i] = '\0';
-		}
-		else if (!strncmp(cp, "v6revmode:", sizeof("v6revmode:") - 1)) {
-			cp += sizeof("v6revmode:") - 1;
-			/* "nibble" and "bitstring" used to be valid */
-			if (!strncmp(cp, "single", sizeof("single") - 1)) {
-				statp->options |= RES_NO_NIBBLE2;
-			} else if (!strncmp(cp, "both", sizeof("both") - 1)) {
-				statp->options &=
-					 ~RES_NO_NIBBLE2;
-			}
-		}
-#endif
-		else {
-			/* XXX - print a warning here? */
-		}
-#ifndef _LIBC
-   skip:
-#endif
-		/* skip to next run of spaces */
-		while (*cp && *cp != ' ' && *cp != '\t')
-			cp++;
-	}
-}
-
-#ifdef RESOLVSORT
-/* XXX - should really support CIDR which means explicit masks always. */
-static uint32_t
-net_mask(in)		/*!< XXX - should really use system's version of this  */
-	struct in_addr in;
-{
-	uint32_t i = ntohl(in.s_addr);
-
-	if (IN_CLASSA(i))
-		return (htonl(IN_CLASSA_NET));
-	else if (IN_CLASSB(i))
-		return (htonl(IN_CLASSB_NET));
-	return (htonl(IN_CLASSC_NET));
-}
-#endif
-
-static u_char srnd[16];
-
-void
-res_rndinit(res_state statp)
-{
-	struct timeval now;
-	uint32_t u32;
-	u_int16_t u16;
-	u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd;
-
-	gettimeofday(&now, NULL);
-	u32 = now.tv_sec;
-	memcpy(rnd, &u32, 4);
-	u32 = now.tv_usec;
-	memcpy(rnd + 4, &u32, 4);
-	u32 += now.tv_sec;
-	memcpy(rnd + 8, &u32, 4);
-	u16 = getpid();
-	memcpy(rnd + 12, &u16, 2);
-}
-
-u_int
-res_nrandomid(res_state statp) {
-	struct timeval now;
-	u_int16_t u16;
-	MD5_CTX ctx;
-	u_char *rnd = statp->_rnd == NULL ? srnd : statp->_rnd;
-
-	gettimeofday(&now, NULL);
-	u16 = (u_int16_t) (now.tv_sec ^ now.tv_usec);
-	memcpy(rnd + 14, &u16, 2);
-#ifndef HAVE_MD5
-	MD5_Init(&ctx);
-	MD5_Update(&ctx, rnd, 16);
-	MD5_Final(rnd, &ctx);
-#else
-	MD5Init(&ctx);
-	MD5Update(&ctx, rnd, 16);
-	MD5Final(rnd, &ctx);
-#endif
-	memcpy(&u16, rnd + 14, 2);
-	return ((u_int) u16);
-}
-
-/*%
- * This routine is for closing the socket if a virtual circuit is used and
- * the program wants to close it.  This provides support for endhostent()
- * which expects to close the socket.
- *
- * This routine is not expected to be user visible.
- */
-void
-res_nclose(res_state statp) {
-	int ns;
-
-	if (statp->_vcsock >= 0) { 
-		(void) _close(statp->_vcsock);
-		statp->_vcsock = -1;
-		statp->_flags &= ~(RES_F_VC | RES_F_CONN);
-	}
-	for (ns = 0; ns < statp->_u._ext.nscount; ns++) {
-		if (statp->_u._ext.nssocks[ns] != -1) {
-			(void) _close(statp->_u._ext.nssocks[ns]);
-			statp->_u._ext.nssocks[ns] = -1;
-		}
-	}
-}
-
-void
-res_ndestroy(res_state statp) {
-	res_nclose(statp);
-	if (statp->_u._ext.ext != NULL) {
-		free(statp->_u._ext.ext);
-		statp->_u._ext.ext = NULL;
-	}
-	if (statp->_rnd != NULL) {
-		free(statp->_rnd);
-		statp->_rnd = NULL;
-	}
-	statp->options &= ~RES_INIT;
-}
-
-#ifndef _LIBC
-const char *
-res_get_nibblesuffix(res_state statp) {
-	if (statp->_u._ext.ext)
-		return (statp->_u._ext.ext->nsuffix);
-	return ("ip6.arpa");
-}
-
-const char *
-res_get_nibblesuffix2(res_state statp) {
-	if (statp->_u._ext.ext)
-		return (statp->_u._ext.ext->nsuffix2);
-	return ("ip6.int");
-}
-#endif
-
-void
-res_setservers(res_state statp, const union res_sockaddr_union *set, int cnt) {
-	int i, nserv;
-	size_t size;
-
-	/* close open servers */
-	res_nclose(statp);
-
-	/* cause rtt times to be forgotten */
-	statp->_u._ext.nscount = 0;
-
-	nserv = 0;
-	for (i = 0; i < cnt && nserv < MAXNS; i++) {
-		switch (set->sin.sin_family) {
-		case AF_INET:
-			size = sizeof(set->sin);
-			if (statp->_u._ext.ext)
-				memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
-					&set->sin, size);
-			if (size <= sizeof(statp->nsaddr_list[nserv]))
-				memcpy(&statp->nsaddr_list[nserv],
-					&set->sin, size);
-			else
-				statp->nsaddr_list[nserv].sin_family = 0;
-			nserv++;
-			break;
-
-#ifdef HAS_INET6_STRUCTS
-		case AF_INET6:
-			size = sizeof(set->sin6);
-			if (statp->_u._ext.ext)
-				memcpy(&statp->_u._ext.ext->nsaddrs[nserv],
-					&set->sin6, size);
-			if (size <= sizeof(statp->nsaddr_list[nserv]))
-				memcpy(&statp->nsaddr_list[nserv],
-					&set->sin6, size);
-			else
-				statp->nsaddr_list[nserv].sin_family = 0;
-			nserv++;
-			break;
-#endif
-
-		default:
-			break;
-		}
-		set++;
-	}
-	statp->nscount = nserv;
-	
-}
-
-int
-res_getservers(res_state statp, union res_sockaddr_union *set, int cnt) {
-	int i;
-	size_t size;
-	u_int16_t family;
-
-	for (i = 0; i < statp->nscount && i < cnt; i++) {
-		if (statp->_u._ext.ext)
-			family = statp->_u._ext.ext->nsaddrs[i].sin.sin_family;
-		else 
-			family = statp->nsaddr_list[i].sin_family;
-
-		switch (family) {
-		case AF_INET:
-			size = sizeof(set->sin);
-			if (statp->_u._ext.ext)
-				memcpy(&set->sin,
-				       &statp->_u._ext.ext->nsaddrs[i],
-				       size);
-			else
-				memcpy(&set->sin, &statp->nsaddr_list[i],
-				       size);
-			break;
-
-#ifdef HAS_INET6_STRUCTS
-		case AF_INET6:
-			size = sizeof(set->sin6);
-			if (statp->_u._ext.ext)
-				memcpy(&set->sin6,
-				       &statp->_u._ext.ext->nsaddrs[i],
-				       size);
-			else
-				memcpy(&set->sin6, &statp->nsaddr_list[i],
-				       size);
-			break;
-#endif
-
-		default:
-			set->sin.sin_family = 0;
-			break;
-		}
-		set++;
-	}
-	return (statp->nscount);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/resolv/res_mkquery.c b/lib/libc_bsd/resolv/res_mkquery.c
deleted file mode 100644
index e2f3a8c..0000000
--- a/lib/libc_bsd/resolv/res_mkquery.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1996, 1997, 1988, 1999, 2001, 2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Copyright (c) 1985, 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.
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_mkquery.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <string.h>
-#include "port_after.h"
-
-/* Options.  Leave them on. */
-#define DEBUG
-
-extern const char *_res_opcodes[];
-
-/*%
- * Form all types of queries.
- * Returns the size of the result or -1.
- */
-int
-res_nmkquery(res_state statp,
-	     int op,			/*!< opcode of query  */
-	     const char *dname,		/*!< domain name  */
-	     int class, int type,	/*!< class and type of query  */
-	     const u_char *data,	/*!< resource record data  */
-	     int datalen,		/*!< length of data  */
-	     const u_char *newrr_in,	/*!< new rr for modify or append  */
-	     u_char *buf,		/*!< buffer to put query  */
-	     int buflen)		/*!< size of buffer  */
-{
-	HEADER *hp;
-	u_char *cp, *ep;
-	int n;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-
-	UNUSED(newrr_in);
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_nmkquery(%s, %s, %s, %s)\n",
-		       _res_opcodes[op], dname, p_class(class), p_type(type));
-#endif
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	statp->id = res_nrandomid(statp);
-	hp->id = htons(statp->id);
-	hp->opcode = op;
-	hp->rd = (statp->options & RES_RECURSE) != 0U;
-	hp->rcode = NOERROR;
-	cp = buf + HFIXEDSZ;
-	ep = buf + buflen;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-	/*
-	 * perform opcode specific processing
-	 */
-	switch (op) {
-	case QUERY:	/*FALLTHROUGH*/
-	case NS_NOTIFY_OP:
-		if (ep - cp < QFIXEDSZ)
-			return (-1);
-		if ((n = dn_comp(dname, cp, ep - cp - QFIXEDSZ, dnptrs,
-		    lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		ns_put16(type, cp);
-		cp += INT16SZ;
-		ns_put16(class, cp);
-		cp += INT16SZ;
-		hp->qdcount = htons(1);
-		if (op == QUERY || data == NULL)
-			break;
-		/*
-		 * Make an additional record for completion domain.
-		 */
-		if ((ep - cp) < RRFIXEDSZ)
-			return (-1);
-		n = dn_comp((const char *)data, cp, ep - cp - RRFIXEDSZ,
-			    dnptrs, lastdnptr);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		ns_put16(T_NULL, cp);
-		cp += INT16SZ;
-		ns_put16(class, cp);
-		cp += INT16SZ;
-		ns_put32(0, cp);
-		cp += INT32SZ;
-		ns_put16(0, cp);
-		cp += INT16SZ;
-		hp->arcount = htons(1);
-		break;
-
-	case IQUERY:
-		/*
-		 * Initialize answer section
-		 */
-		if (ep - cp < 1 + RRFIXEDSZ + datalen)
-			return (-1);
-		*cp++ = '\0';	/*%< no domain name */
-		ns_put16(type, cp);
-		cp += INT16SZ;
-		ns_put16(class, cp);
-		cp += INT16SZ;
-		ns_put32(0, cp);
-		cp += INT32SZ;
-		ns_put16(datalen, cp);
-		cp += INT16SZ;
-		if (datalen) {
-			memcpy(cp, data, datalen);
-			cp += datalen;
-		}
-		hp->ancount = htons(1);
-		break;
-
-	default:
-		return (-1);
-	}
-	return (cp - buf);
-}
-
-#ifdef RES_USE_EDNS0
-/* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */
-
-int
-res_nopt(res_state statp,
-	 int n0,		/*%< current offset in buffer */
-	 u_char *buf,		/*%< buffer to put query */
-	 int buflen,		/*%< size of buffer */
-	 int anslen)		/*%< UDP answer buffer size */
-{
-	HEADER *hp;
-	u_char *cp, *ep;
-	u_int16_t flags = 0;
-
-#ifdef DEBUG
-	if ((statp->options & RES_DEBUG) != 0U)
-		printf(";; res_nopt()\n");
-#endif
-
-	hp = (HEADER *) buf;
-	cp = buf + n0;
-	ep = buf + buflen;
-
-	if ((ep - cp) < 1 + RRFIXEDSZ)
-		return (-1);
-
-	*cp++ = 0;				/*%< "." */
-	ns_put16(ns_t_opt, cp);			/*%< TYPE */
-	cp += INT16SZ;
-	if (anslen > 0xffff)
-		anslen = 0xffff;		/* limit to 16bit value */
-	ns_put16(anslen & 0xffff, cp);		/*%< CLASS = UDP payload size */
-	cp += INT16SZ;
-	*cp++ = NOERROR;			/*%< extended RCODE */
-	*cp++ = 0;				/*%< EDNS version */
-
-	if (statp->options & RES_USE_DNSSEC) {
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; res_opt()... ENDS0 DNSSEC\n");
-#endif
-		flags |= NS_OPT_DNSSEC_OK;
-	}
-	ns_put16(flags, cp);
-	cp += INT16SZ;
-
-	ns_put16(0U, cp);			/*%< RDLEN */
-	cp += INT16SZ;
-
-	hp->arcount = htons(ntohs(hp->arcount) + 1);
-
-	return (cp - buf);
-}
-
-/*
- * Construct variable data (RDATA) block for OPT psuedo-RR, append it
- * to the buffer, then update the RDLEN field (previously set to zero by
- * res_nopt()) with the new RDATA length.
- */
-int
-res_nopt_rdata(res_state statp,
-	  int n0,	 	/*%< current offset in buffer */
-	  u_char *buf,	 	/*%< buffer to put query */
-	  int buflen,		/*%< size of buffer */
-	  u_char *rdata,	/*%< ptr to start of opt rdata */
-	  u_short code,		/*%< OPTION-CODE */
-	  u_short len,		/*%< OPTION-LENGTH */
-	  u_char *data)		/*%< OPTION_DATA */
-{
-	register u_char *cp, *ep;
-
-#ifdef DEBUG
-	if ((statp->options & RES_DEBUG) != 0U)
-		printf(";; res_nopt_rdata()\n");
-#endif
-
-	cp = buf + n0;
-	ep = buf + buflen;
-
-	if ((ep - cp) < (4 + len))
-		return (-1);
-
-	if (rdata < (buf + 2) || rdata >= ep)
-		return (-1);
-
-	ns_put16(code, cp);
-	cp += INT16SZ;
-
-	ns_put16(len, cp);
-	cp += INT16SZ;
-
-	memcpy(cp, data, len);
-	cp += len;
-
-	len = cp - rdata;
-	ns_put16(len, rdata - 2);	/* Update RDLEN field */
-
-	return (cp - buf);
-}
-#endif
-
-/*! \file */
diff --git a/lib/libc_bsd/resolv/res_mkupdate.c b/lib/libc_bsd/resolv/res_mkupdate.c
deleted file mode 100644
index 4b3a4bf..0000000
--- a/lib/libc_bsd/resolv/res_mkupdate.c
+++ /dev/null
@@ -1,1197 +0,0 @@
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*! \file
- * \brief
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * &lt;viraj_bais@ccm.fm.intel.com>
- */
-
-#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_mkupdate.c,v 1.10 2008/12/11 09:59:00 marka Exp $";
-#endif /* not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_mkupdate.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <res_update.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#ifdef _LIBC
-#include <isc/list.h>
-#endif
-
-#include "port_after.h"
-
-/* Options.  Leave them on. */
-#define DEBUG
-#define MAXPORT 1024
-
-static int getnum_str(u_char **, u_char *);
-static int gethexnum_str(u_char **, u_char *);
-static int getword_str(char *, int, u_char **, u_char *);
-static int getstr_str(char *, int, u_char **, u_char *);
-
-#define ShrinkBuffer(x)  if ((buflen -= x) < 0) return (-2);
-
-/* Forward. */
-
-#ifdef _LIBC
-static
-#endif
-int res_protocolnumber(const char *);
-#ifdef _LIBC
-static
-#endif
-int res_servicenumber(const char *);
-
-/*%
- * Form update packets.
- * Returns the size of the resulting packet if no error
- *
- * On error,
- *	returns 
- *\li              -1 if error in reading a word/number in rdata
- *		   portion for update packets
- *\li		-2 if length of buffer passed is insufficient
- *\li		-3 if zone section is not the first section in
- *		   the linked list, or section order has a problem
- *\li		-4 on a number overflow
- *\li		-5 unknown operation or no records
- */
-int
-res_nmkupdate(res_state statp, ns_updrec *rrecp_in, u_char *buf, int buflen) {
-	ns_updrec *rrecp_start = rrecp_in;
-	HEADER *hp;
-	u_char *cp, *sp2, *startp, *endp;
-	int n, i, soanum, multiline;
-	ns_updrec *rrecp;
-	struct in_addr ina;
-	struct in6_addr in6a;
-        char buf2[MAXDNAME];
-	u_char buf3[MAXDNAME];
-	int section, numrrs = 0, counts[ns_s_max];
-	u_int16_t rtype, rclass;
-	uint32_t n1, rttl;
-	u_char *dnptrs[20], **dpp, **lastdnptr;
-#ifndef _LIBC
-	int siglen;
-#endif
-	int keylen, certlen;
-
-	/*
-	 * Initialize header fields.
-	 */
-	if ((buf == NULL) || (buflen < HFIXEDSZ))
-		return (-1);
-	memset(buf, 0, HFIXEDSZ);
-	hp = (HEADER *) buf;
-	statp->id = res_nrandomid(statp);
-	hp->id = htons(statp->id);
-	hp->opcode = ns_o_update;
-	hp->rcode = NOERROR;
-	cp = buf + HFIXEDSZ;
-	buflen -= HFIXEDSZ;
-	dpp = dnptrs;
-	*dpp++ = buf;
-	*dpp++ = NULL;
-	lastdnptr = dnptrs + sizeof dnptrs / sizeof dnptrs[0];
-
-	if (rrecp_start == NULL)
-		return (-5);
-	else if (rrecp_start->r_section != S_ZONE)
-		return (-3);
-
-	memset(counts, 0, sizeof counts);
-	for (rrecp = rrecp_start; rrecp; rrecp = NEXT(rrecp, r_glink)) {
-		numrrs++;
-                section = rrecp->r_section;
-		if (section < 0 || section >= ns_s_max)
-			return (-1);
-		counts[section]++;
-		for (i = section + 1; i < ns_s_max; i++)
-			if (counts[i])
-				return (-3);
-		rtype = rrecp->r_type;
-		rclass = rrecp->r_class;
-		rttl = rrecp->r_ttl;
-		/* overload class and type */
-		if (section == S_PREREQ) {
-			rttl = 0;
-			switch (rrecp->r_opcode) {
-			case YXDOMAIN:
-				rclass = C_ANY;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXDOMAIN:
-				rclass = C_NONE;
-				rtype = T_ANY;
-				rrecp->r_size = 0;
-				break;
-			case NXRRSET:
-				rclass = C_NONE;
-				rrecp->r_size = 0;
-				break;
-			case YXRRSET:
-				if (rrecp->r_size == 0)
-					rclass = C_ANY;
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		} else if (section == S_UPDATE) {
-			switch (rrecp->r_opcode) {
-			case DELETE:
-				rclass = rrecp->r_size == 0 ? C_ANY : C_NONE;
-				break;
-			case ADD:
-				break;
-			default:
-				fprintf(stderr,
-					"res_mkupdate: incorrect opcode: %d\n",
-					rrecp->r_opcode);
-				fflush(stderr);
-				return (-1);
-			}
-		}
-
-		/*
-		 * XXX	appending default domain to owner name is omitted,
-		 *	fqdn must be provided
-		 */
-		if ((n = dn_comp(rrecp->r_dname, cp, buflen, dnptrs,
-				 lastdnptr)) < 0)
-			return (-1);
-		cp += n;
-		ShrinkBuffer(n + 2*INT16SZ);
-		PUTSHORT(rtype, cp);
-		PUTSHORT(rclass, cp);
-		if (section == S_ZONE) {
-			if (numrrs != 1 || rrecp->r_type != T_SOA)
-				return (-3);
-			continue;
-		}
-		ShrinkBuffer(INT32SZ + INT16SZ);
-		PUTLONG(rttl, cp);
-		sp2 = cp;  /*%< save pointer to length byte */
-		cp += INT16SZ;
-		if (rrecp->r_size == 0) {
-			if (section == S_UPDATE && rclass != C_ANY)
-				return (-1);
-			else {
-				PUTSHORT(0, sp2);
-				continue;
-			}
-		}
-		startp = rrecp->r_data;
-		endp = startp + rrecp->r_size - 1;
-		/* XXX this should be done centrally. */
-		switch (rrecp->r_type) {
-		case T_A:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			if (!inet_aton(buf2, &ina))
-				return (-1);
-			n1 = ntohl(ina.s_addr);
-			ShrinkBuffer(INT32SZ);
-			PUTLONG(n1, cp);
-			break;
-		case T_CNAME:
-		case T_MB:
-		case T_MG:
-		case T_MR:
-		case T_NS:
-		case T_PTR:
-		case ns_t_dname:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_MINFO:
-		case T_SOA:
-		case T_RP:
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-				return (-1);
-				n = dn_comp(buf2, cp, buflen,
-					    dnptrs, lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			if (rrecp->r_type == T_SOA) {
-				ShrinkBuffer(5 * INT32SZ);
-				while (isspace(*startp) || !*startp)
-					startp++;
-				if (*startp == '(') {
-					multiline = 1;
-					startp++;
-				} else
-					multiline = 0;
-				/* serial, refresh, retry, expire, minimum */
-				for (i = 0; i < 5; i++) {
-					soanum = getnum_str(&startp, endp);
-					if (soanum < 0)
-						return (-1);
-					PUTLONG(soanum, cp);
-				}
-				if (multiline) {
-					while (isspace(*startp) || !*startp)
-						startp++;
-					if (*startp != ')')
-						return (-1);
-				}
-			}
-			break;
-		case T_MX:
-		case T_AFSDB:
-		case T_RT:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_SRV:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, NULL, NULL);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		case T_PX:
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			PUTSHORT(n, cp);
-			ShrinkBuffer(INT16SZ);
-			for (i = 0; i < 2; i++) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-					return (-1);
-				n = dn_comp(buf2, cp, buflen, dnptrs,
-					    lastdnptr);
-				if (n < 0)
-					return (-1);
-				cp += n;
-				ShrinkBuffer(n);
-			}
-			break;
-		case T_WKS: {
-			char bm[MAXPORT/8];
-			unsigned int maxbm = 0;
-
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			if (!inet_aton(buf2, &ina))
-				return (-1);
-			n1 = ntohl(ina.s_addr);
-			ShrinkBuffer(INT32SZ);
-			PUTLONG(n1, cp);
-
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			if ((i = res_protocolnumber(buf2)) < 0)
-				return (-1);
-			ShrinkBuffer(1);
-			*cp++ = i & 0xff;
-			 
-			for (i = 0; i < MAXPORT/8 ; i++)
-				bm[i] = 0;
-
-			while (getword_str(buf2, sizeof buf2, &startp, endp)) {
-				if ((n = res_servicenumber(buf2)) <= 0)
-					return (-1);
-
-				if (n < MAXPORT) {
-					bm[n/8] |= (0x80>>(n%8));
-					if ((unsigned)n > maxbm)
-						maxbm = n;
-				} else
-					return (-1);
-			}
-			maxbm = maxbm/8 + 1;
-			ShrinkBuffer(maxbm);
-			memcpy(cp, bm, maxbm);
-			cp += maxbm;
-			break;
-		}
-		case T_HINFO:
-			for (i = 0; i < 2; i++) {
-				if ((n = getstr_str(buf2, sizeof buf2,
-						&startp, endp)) < 0)
-					return (-1);
-				if (n > 255)
-					return (-1);
-				ShrinkBuffer(n+1);
-				*cp++ = n;
-				memcpy(cp, buf2, n);
-				cp += n;
-			}
-			break;
-		case T_TXT:
-			for (;;) {
-				if ((n = getstr_str(buf2, sizeof buf2,
-						&startp, endp)) < 0) {
-					if (cp != (sp2 + INT16SZ))
-						break;
-					return (-1);
-				}
-				if (n > 255)
-					return (-1);
-				ShrinkBuffer(n+1);
-				*cp++ = n;
-				memcpy(cp, buf2, n);
-				cp += n;
-			}
-			break;
-		case T_X25:
-			/* RFC1183 */
-			if ((n = getstr_str(buf2, sizeof buf2, &startp,
-					 endp)) < 0)
-				return (-1);
-			if (n > 255)
-				return (-1);
-			ShrinkBuffer(n+1);
-			*cp++ = n;
-			memcpy(cp, buf2, n);
-			cp += n;
-			break;
-		case T_ISDN:
-			/* RFC1183 */
-			if ((n = getstr_str(buf2, sizeof buf2, &startp,
-					 endp)) < 0)
-				return (-1);
-			if ((n > 255) || (n == 0))
-				return (-1);
-			ShrinkBuffer(n+1);
-			*cp++ = n;
-			memcpy(cp, buf2, n);
-			cp += n;
-			if ((n = getstr_str(buf2, sizeof buf2, &startp,
-					 endp)) < 0)
-				n = 0;
-			if (n > 255)
-				return (-1);
-			ShrinkBuffer(n+1);
-			*cp++ = n;
-			memcpy(cp, buf2, n);
-			cp += n;
-			break;
-		case T_NSAP:
-			if ((n = inet_nsap_addr((char *)startp, (u_char *)buf2, sizeof(buf2))) != 0) {
-				ShrinkBuffer(n);
-				memcpy(cp, buf2, n);
-				cp += n;
-			} else {
-				return (-1);
-			}
-			break;
-		case T_LOC:
-			if ((n = loc_aton((char *)startp, (u_char *)buf2)) != 0) {
-				ShrinkBuffer(n);
-				memcpy(cp, buf2, n);
-				cp += n;
-			} else
-				return (-1);
-			break;
-		case ns_t_sig:
-#ifdef _LIBC
-			return (-1);
-#else
-		    {
-			int sig_type, success, dateerror;
-			uint32_t exptime, timesigned;
-
-			/* type */
-			if ((n = getword_str(buf2, sizeof buf2,
-					     &startp, endp)) < 0)
-				return (-1);
-			sig_type = sym_ston(__p_type_syms, buf2, &success);
-			if (!success || sig_type == ns_t_any)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(sig_type, cp);
-			/* alg */
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(1);
-			*cp++ = n;
-			/* labels */
-			n = getnum_str(&startp, endp);
-			if (n <= 0 || n > 255)
-				return (-1);
-			ShrinkBuffer(1);
-			*cp++ = n;
-			/* ottl  & expire */
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			exptime = ns_datetosecs(buf2, &dateerror);
-			if (!dateerror) {
-				ShrinkBuffer(INT32SZ);
-				PUTLONG(rttl, cp);
-			}
-			else {
-				char *ulendp;
-				uint32_t ottl;
-
-				errno = 0;
-				ottl = strtoul(buf2, &ulendp, 10);
-				if (errno != 0 ||
-				    (ulendp != NULL && *ulendp != '\0'))
-					return (-1);
-				ShrinkBuffer(INT32SZ);
-				PUTLONG(ottl, cp);
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-					return (-1);
-				exptime = ns_datetosecs(buf2, &dateerror);
-				if (dateerror)
-					return (-1);
-			}
-			/* expire */
-			ShrinkBuffer(INT32SZ);
-			PUTLONG(exptime, cp);
-			/* timesigned */
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			timesigned = ns_datetosecs(buf2, &dateerror);
-			if (!dateerror) {
-				ShrinkBuffer(INT32SZ);
-				PUTLONG(timesigned, cp);
-			}
-			else
-				return (-1);
-			/* footprint */
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-			/* signer name */
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, dnptrs, lastdnptr);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			/* sig */
-			if ((n = getword_str(buf2, sizeof buf2,
-					     &startp, endp)) < 0)
-				return (-1);
-			siglen = b64_pton(buf2, buf3, sizeof(buf3));
-			if (siglen < 0)
-				return (-1);
-			ShrinkBuffer(siglen);
-			memcpy(cp, buf3, siglen);
-			cp += siglen;
-			break;
-		    }
-#endif
-		case ns_t_key:
-			/* flags */
-			n = gethexnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-			/* proto */
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(1);
-			*cp++ = n;
-			/* alg */
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(1);
-			*cp++ = n;
-			/* key */
-			if ((n = getword_str(buf2, sizeof buf2,
-					     &startp, endp)) < 0)
-				return (-1);
-			keylen = b64_pton(buf2, buf3, sizeof(buf3));
-			if (keylen < 0)
-				return (-1);
-			ShrinkBuffer(keylen);
-			memcpy(cp, buf3, keylen);
-			cp += keylen;
-			break;
-		case ns_t_nxt:
-		    {
-			int success, nxt_type;
-			u_char data[32];
-			int maxtype;
-
-			/* next name */
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, NULL, NULL);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			maxtype = 0;
-			memset(data, 0, sizeof data);
-			for (;;) {
-				if (!getword_str(buf2, sizeof buf2, &startp,
-						 endp))
-					break;
-				nxt_type = sym_ston(__p_type_syms, buf2,
-						    &success);
-				if (!success || !ns_t_rr_p(nxt_type))
-					return (-1);
-				NS_NXT_BIT_SET(nxt_type, data);
-				if (nxt_type > maxtype)
-					maxtype = nxt_type;
-			}
-			n = maxtype/NS_NXT_BITS+1;
-			ShrinkBuffer(n);
-			memcpy(cp, data, n);
-			cp += n;
-			break;
-		    }
-		case ns_t_cert:
-			/* type */
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-			/* key tag */
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-			/* alg */
-			n = getnum_str(&startp, endp);
-			if (n < 0)
-				return (-1);
-			ShrinkBuffer(1);
-			*cp++ = n;
-			/* cert */
-			if ((n = getword_str(buf2, sizeof buf2,
-					     &startp, endp)) < 0)
-				return (-1);
-			certlen = b64_pton(buf2, buf3, sizeof(buf3));
-			if (certlen < 0)
-				return (-1);
-			ShrinkBuffer(certlen);
-			memcpy(cp, buf3, certlen);
-			cp += certlen;
-			break;
-		case ns_t_aaaa:
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			if (inet_pton(AF_INET6, buf2, &in6a) <= 0)
-				return (-1);
-			ShrinkBuffer(NS_IN6ADDRSZ);
-			memcpy(cp, &in6a, NS_IN6ADDRSZ);
-			cp += NS_IN6ADDRSZ;
-			break;
-		case ns_t_naptr:
-			/* Order Preference Flags Service Replacement Regexp */
-			/* Order */
-			n = getnum_str(&startp, endp);
-			if (n < 0 || n > 65535)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-			/* Preference */
-			n = getnum_str(&startp, endp);
-			if (n < 0 || n > 65535)
-				return (-1);
-			ShrinkBuffer(INT16SZ);
-			PUTSHORT(n, cp);
-			/* Flags */
-			if ((n = getstr_str(buf2, sizeof buf2,
-					&startp, endp)) < 0) {
-				return (-1);
-			}
-			if (n > 255)
-				return (-1);
-			ShrinkBuffer(n+1);
-			*cp++ = n;
-			memcpy(cp, buf2, n);
-			cp += n;
-			/* Service Classes */
-			if ((n = getstr_str(buf2, sizeof buf2,
-					&startp, endp)) < 0) {
-				return (-1);
-			}
-			if (n > 255)
-				return (-1);
-			ShrinkBuffer(n+1);
-			*cp++ = n;
-			memcpy(cp, buf2, n);
-			cp += n;
-			/* Pattern */
-			if ((n = getstr_str(buf2, sizeof buf2,
-					&startp, endp)) < 0) {
-				return (-1);
-			}
-			if (n > 255)
-				return (-1);
-			ShrinkBuffer(n+1);
-			*cp++ = n;
-			memcpy(cp, buf2, n);
-			cp += n;
-			/* Replacement */
-			if (!getword_str(buf2, sizeof buf2, &startp, endp))
-				return (-1);
-			n = dn_comp(buf2, cp, buflen, NULL, NULL);
-			if (n < 0)
-				return (-1);
-			cp += n;
-			ShrinkBuffer(n);
-			break;
-		default:
-			return (-1);
-		} /*switch*/
-		n = (u_int16_t)((cp - sp2) - INT16SZ);
-		PUTSHORT(n, sp2);
-	} /*for*/
-		
-	hp->qdcount = htons(counts[0]);
-	hp->ancount = htons(counts[1]);
-	hp->nscount = htons(counts[2]);
-	hp->arcount = htons(counts[3]);
-	return (cp - buf);
-}
-
-/*%
- * Get a whitespace delimited word from a string (not file)
- * into buf. modify the start pointer to point after the
- * word in the string.
- */
-static int
-getword_str(char *buf, int size, u_char **startpp, u_char *endp) {
-        char *cp;
-        int c;
- 
-        for (cp = buf; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (cp != buf) /*%< trailing whitespace */
-                                break;
-                        else { /*%< leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                (*startpp)++;
-                if (cp >= buf+size-1)
-                        break;
-                *cp++ = (u_char)c;
-        }
-        *cp = '\0';
-        return (cp != buf);
-}
-
-/*%
- * get a white spae delimited string from memory.  Process quoted strings
- * and \\DDD escapes.  Return length or -1 on error.  Returned string may
- * contain nulls.
- */
-static char digits[] = "0123456789";
-static int
-getstr_str(char *buf, int size, u_char **startpp, u_char *endp) {
-        char *cp;
-        int c, c1 = 0;
-	int inquote = 0;
-	int seen_quote = 0;
-	int escape = 0;
-	int dig = 0;
- 
-	for (cp = buf; *startpp <= endp; ) {
-                if ((c = **startpp) == '\0')
-			break;
-		/* leading white space */
-		if ((cp == buf) && !seen_quote && isspace(c)) {
-			(*startpp)++;
-			continue;
-		}
-
-		switch (c) {
-		case '\\':
-			if (!escape)  {
-				escape = 1;
-				dig = 0;
-				c1 = 0;
-				(*startpp)++;
-				continue;
-			} 
-			goto do_escape;
-		case '"':
-			if (!escape) {
-				inquote = !inquote;
-				seen_quote = 1;
-				(*startpp)++;
-				continue;
-			}
-			/* fall through */
-		default:
-		do_escape:
-			if (escape) {
-				switch (c) {
-				case '0':
-				case '1':
-				case '2':
-				case '3':
-				case '4':
-				case '5':
-				case '6':
-				case '7':
-				case '8':
-				case '9':
-					c1 = c1 * 10 + 
-						(strchr(digits, c) - digits);
-
-					if (++dig == 3) {
-						c = c1 &0xff;
-						break;
-					}
-					(*startpp)++;
-					continue;
-				}
-				escape = 0;
-			} else if (!inquote && isspace(c))
-				goto done;
-			if (cp >= buf+size-1)
-				goto done;
-			*cp++ = (u_char)c;
-			(*startpp)++;
-		}
-	}
- done:
-	*cp = '\0';
-	return ((cp == buf)?  (seen_quote? 0: -1): (cp - buf));
-}
-
-/*%
- * Get a whitespace delimited base 16 number from a string (not file) into buf
- * update the start pointer to point after the number in the string.
- */
-static int
-gethexnum_str(u_char **startpp, u_char *endp) {
-        int c, n;
-        int seendigit = 0;
-        int m = 0;
-
-	if (*startpp + 2 >= endp || strncasecmp((char *)*startpp, "0x", 2) != 0)
-		return getnum_str(startpp, endp);
-	(*startpp)+=2;
-        for (n = 0; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (seendigit) /*%< trailing whitespace */
-                                break;
-                        else { /*%< leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                if (c == ';') {
-                        while ((*startpp <= endp) &&
-			       ((c = **startpp) != '\n'))
-					(*startpp)++;
-                        if (seendigit)
-                                break;
-                        continue;
-                }
-                if (!isxdigit(c)) {
-                        if (c == ')' && seendigit) {
-                                (*startpp)--;
-                                break;
-                        }
-			return (-1);
-                }        
-                (*startpp)++;
-		if (isdigit(c))
-	                n = n * 16 + (c - '0');
-		else
-			n = n * 16 + (tolower(c) - 'a' + 10);
-                seendigit = 1;
-        }
-        return (n + m);
-}
-
-/*%
- * Get a whitespace delimited base 10 number from a string (not file) into buf
- * update the start pointer to point after the number in the string.
- */
-static int
-getnum_str(u_char **startpp, u_char *endp) {
-        int c, n;
-        int seendigit = 0;
-        int m = 0;
-
-        for (n = 0; *startpp <= endp; ) {
-                c = **startpp;
-                if (isspace(c) || c == '\0') {
-                        if (seendigit) /*%< trailing whitespace */
-                                break;
-                        else { /*%< leading whitespace */
-                                (*startpp)++;
-                                continue;
-                        }
-                }
-                if (c == ';') {
-                        while ((*startpp <= endp) &&
-			       ((c = **startpp) != '\n'))
-					(*startpp)++;
-                        if (seendigit)
-                                break;
-                        continue;
-                }
-                if (!isdigit(c)) {
-                        if (c == ')' && seendigit) {
-                                (*startpp)--;
-                                break;
-                        }
-			return (-1);
-                }        
-                (*startpp)++;
-                n = n * 10 + (c - '0');
-                seendigit = 1;
-        }
-        return (n + m);
-}
-
-/*%
- * Allocate a resource record buffer & save rr info.
- */
-ns_updrec *
-res_mkupdrec(int section, const char *dname,
-	     u_int class, u_int type, u_long ttl) {
-	ns_updrec *rrecp = (ns_updrec *)calloc(1, sizeof(ns_updrec));
-
-	if (!rrecp || !(rrecp->r_dname = strdup(dname))) {
-		if (rrecp)
-			free((char *)rrecp);
-		return (NULL);
-	}
-	INIT_LINK(rrecp, r_link);
-	INIT_LINK(rrecp, r_glink);
- 	rrecp->r_class = (ns_class)class;
-	rrecp->r_type = (ns_type)type;
-	rrecp->r_ttl = ttl;
-	rrecp->r_section = (ns_sect)section;
-	return (rrecp);
-}
-
-/*%
- * Free a resource record buffer created by res_mkupdrec.
- */
-void
-res_freeupdrec(ns_updrec *rrecp) {
-	/* Note: freeing r_dp is the caller's responsibility. */
-	if (rrecp->r_dname != NULL)
-		free(rrecp->r_dname);
-	free(rrecp);
-}
-
-struct valuelist {
-	struct valuelist *	next;
-	struct valuelist *	prev;
-	char *			name;
-	char *			proto;
-	int			port;
-};
-static struct valuelist *servicelist, *protolist;
-
-static void
-res_buildservicelist() {
-	struct servent *sp;
-	struct valuelist *slp;
-
-#ifdef MAYBE_HESIOD
-	setservent(0);
-#else
-	setservent(1);
-#endif
-	while ((sp = getservent()) != NULL) {
-		slp = (struct valuelist *)malloc(sizeof(struct valuelist));
-		if (!slp)
-			break;
-		slp->name = strdup(sp->s_name);
-		slp->proto = strdup(sp->s_proto);
-		if ((slp->name == NULL) || (slp->proto == NULL)) {
-			if (slp->name) free(slp->name);
-			if (slp->proto) free(slp->proto);
-			free(slp);
-			break;
-		}
-		slp->port = ntohs((u_int16_t)sp->s_port);  /*%< host byt order */
-		slp->next = servicelist;
-		slp->prev = NULL;
-		if (servicelist)
-			servicelist->prev = slp;
-		servicelist = slp;
-	}
-	endservent();
-}
-
-#ifndef _LIBC
-void
-res_destroyservicelist() {
-	struct valuelist *slp, *slp_next;
-
-	for (slp = servicelist; slp != NULL; slp = slp_next) {
-		slp_next = slp->next;
-		free(slp->name);
-		free(slp->proto);
-		free(slp);
-	}
-	servicelist = (struct valuelist *)0;
-}
-#endif
-
-#ifdef _LIBC
-static
-#endif
-void
-res_buildprotolist(void) {
-	struct protoent *pp;
-	struct valuelist *slp;
-
-#ifdef MAYBE_HESIOD
-	setprotoent(0);
-#else
-	setprotoent(1);
-#endif
-	while ((pp = getprotoent()) != NULL) {
-		slp = (struct valuelist *)malloc(sizeof(struct valuelist));
-		if (!slp)
-			break;
-		slp->name = strdup(pp->p_name);
-		if (slp->name == NULL) {
-			free(slp);
-			break;
-		}
-		slp->port = pp->p_proto;	/*%< host byte order */
-		slp->next = protolist;
-		slp->prev = NULL;
-		if (protolist)
-			protolist->prev = slp;
-		protolist = slp;
-	}
-	endprotoent();
-}
-
-#ifndef _LIBC
-void
-res_destroyprotolist(void) {
-	struct valuelist *plp, *plp_next;
-
-	for (plp = protolist; plp != NULL; plp = plp_next) {
-		plp_next = plp->next;
-		free(plp->name);
-		free(plp);
-	}
-	protolist = (struct valuelist *)0;
-}
-#endif
-
-static int
-findservice(const char *s, struct valuelist **list) {
-	struct valuelist *lp = *list;
-	int n;
-
-	for (; lp != NULL; lp = lp->next)
-		if (strcasecmp(lp->name, s) == 0) {
-			if (lp != *list) {
-				lp->prev->next = lp->next;
-				if (lp->next)
-					lp->next->prev = lp->prev;
-				(*list)->prev = lp;
-				lp->next = *list;
-				*list = lp;
-			}
-			return (lp->port);	/*%< host byte order */
-		}
-	if (sscanf(s, "%d", &n) != 1 || n <= 0)
-		n = -1;
-	return (n);
-}
-
-/*%
- * Convert service name or (ascii) number to int.
- */
-#ifdef _LIBC
-static
-#endif
-int
-res_servicenumber(const char *p) {
-	if (servicelist == (struct valuelist *)0)
-		res_buildservicelist();
-	return (findservice(p, &servicelist));
-}
-
-/*%
- * Convert protocol name or (ascii) number to int.
- */
-#ifdef _LIBC
-static
-#endif
-int
-res_protocolnumber(const char *p) {
-	if (protolist == (struct valuelist *)0)
-		res_buildprotolist();
-	return (findservice(p, &protolist));
-}
-
-#ifndef _LIBC
-static struct servent *
-cgetservbyport(u_int16_t port, const char *proto) {	/*%< Host byte order. */
-	struct valuelist **list = &servicelist;
-	struct valuelist *lp = *list;
-	static struct servent serv;
-
-	port = ntohs(port);
-	for (; lp != NULL; lp = lp->next) {
-		if (port != (u_int16_t)lp->port)	/*%< Host byte order. */
-			continue;
-		if (strcasecmp(lp->proto, proto) == 0) {
-			if (lp != *list) {
-				lp->prev->next = lp->next;
-				if (lp->next)
-					lp->next->prev = lp->prev;
-				(*list)->prev = lp;
-				lp->next = *list;
-				*list = lp;
-			}
-			serv.s_name = lp->name;
-			serv.s_port = htons((u_int16_t)lp->port);
-			serv.s_proto = lp->proto;
-			return (&serv);
-		}
-	}
-	return (0);
-}
-
-static struct protoent *
-cgetprotobynumber(int proto) {				/*%< Host byte order. */
-	struct valuelist **list = &protolist;
-	struct valuelist *lp = *list;
-	static struct protoent prot;
-
-	for (; lp != NULL; lp = lp->next)
-		if (lp->port == proto) {		/*%< Host byte order. */
-			if (lp != *list) {
-				lp->prev->next = lp->next;
-				if (lp->next)
-					lp->next->prev = lp->prev;
-				(*list)->prev = lp;
-				lp->next = *list;
-				*list = lp;
-			}
-			prot.p_name = lp->name;
-			prot.p_proto = lp->port;	/*%< Host byte order. */
-			return (&prot);
-		}
-	return (0);
-}
-
-const char *
-res_protocolname(int num) {
-	static char number[8];
-	struct protoent *pp;
-
-	if (protolist == (struct valuelist *)0)
-		res_buildprotolist();
-	pp = cgetprotobynumber(num);
-	if (pp == 0)  {
-		(void) sprintf(number, "%d", num);
-		return (number);
-	}
-	return (pp->p_name);
-}
-
-const char *
-res_servicename(u_int16_t port, const char *proto) {	/*%< Host byte order. */
-	static char number[8];
-	struct servent *ss;
-
-	if (servicelist == (struct valuelist *)0)
-		res_buildservicelist();
-	ss = cgetservbyport(htons(port), proto);
-	if (ss == 0)  {
-		(void) sprintf(number, "%d", port);
-		return (number);
-	}
-	return (ss->s_name);
-}
-#endif
diff --git a/lib/libc_bsd/resolv/res_private.h b/lib/libc_bsd/resolv/res_private.h
deleted file mode 100644
index 4e98157..0000000
--- a/lib/libc_bsd/resolv/res_private.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef res_private_h
-#define res_private_h
-
-struct __res_state_ext {
-	union res_sockaddr_union nsaddrs[MAXNS];
-	struct sort_list {
-		int     af;
-		union {
-			struct in_addr  ina;
-			struct in6_addr in6a;
-		} addr, mask;
-	} sort_list[MAXRESOLVSORT];
-	char nsuffix[64];
-	char nsuffix2[64];
-};
-
-extern int
-res_ourserver_p(const res_state statp, const struct sockaddr *sa);
-
-#endif
-
-/*! \file */
diff --git a/lib/libc_bsd/resolv/res_query.c b/lib/libc_bsd/resolv/res_query.c
deleted file mode 100644
index bb429ee..0000000
--- a/lib/libc_bsd/resolv/res_query.c
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Portions Copyright (C) 2004, 2005, 2008  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1996-2001, 2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Copyright (c) 1988, 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.
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_query.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "port_after.h"
-
-/* Options.  Leave them on. */
-#define DEBUG
-
-#if PACKETSZ > 1024
-#define MAXPACKET	PACKETSZ
-#else
-#define MAXPACKET	1024
-#endif
-
-/*%
- * Formulate a normal query, send, and await answer.
- * Returned answer is placed in supplied buffer "answer".
- * Perform preliminary check of answer, returning success only
- * if no error is indicated and the answer count is nonzero.
- * Return the size of the response on success, -1 on error.
- * Error number is left in H_ERRNO.
- *
- * Caller must parse answer and determine whether it answers the question.
- */
-int
-res_nquery(res_state statp,
-	   const char *name,	/*%< domain name */
-	   int class, int type,	/*%< class and type of query */
-	   u_char *answer,	/*%< buffer to put answer */
-	   int anslen)		/*%< size of answer buffer */
-{
-	u_char buf[MAXPACKET];
-	HEADER *hp = (HEADER *) answer;
-	u_int oflags;
-	u_char *rdata;
-	int n;
-
-	oflags = statp->_flags;
-
-again:
-	hp->rcode = NOERROR;	/*%< default */
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_query(%s, %d, %d)\n", name, class, type);
-#endif
-
-	n = res_nmkquery(statp, QUERY, name, class, type, NULL, 0, NULL,
-			 buf, sizeof(buf));
-#ifdef RES_USE_EDNS0
-	if (n > 0 && (statp->_flags & RES_F_EDNS0ERR) == 0 &&
-	    (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC|RES_NSID))) {
-		n = res_nopt(statp, n, buf, sizeof(buf), anslen);
-		rdata = &buf[n];
-		if (n > 0 && (statp->options & RES_NSID) != 0U) {
-			n = res_nopt_rdata(statp, n, buf, sizeof(buf), rdata,
-					   NS_OPT_NSID, 0, NULL);
-		}
-	}
-#endif
-	if (n <= 0) {
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; res_query: mkquery failed\n");
-#endif
-		RES_SET_H_ERRNO(statp, NO_RECOVERY);
-		return (n);
-	}
-
-	n = res_nsend(statp, buf, n, answer, anslen);
-	if (n < 0) {
-#ifdef RES_USE_EDNS0
-		/* if the query choked with EDNS0, retry without EDNS0 */
-		if ((statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U &&
-		    ((oflags ^ statp->_flags) & RES_F_EDNS0ERR) != 0) {
-			statp->_flags |= RES_F_EDNS0ERR;
-			if (statp->options & RES_DEBUG)
-				printf(";; res_nquery: retry without EDNS0\n");
-			goto again;
-		}
-#endif
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; res_query: send error\n");
-#endif
-		RES_SET_H_ERRNO(statp, TRY_AGAIN);
-		return (n);
-	}
-
-	if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
-#ifdef DEBUG
-		if (statp->options & RES_DEBUG)
-			printf(";; rcode = (%s), counts = an:%d ns:%d ar:%d\n",
-			       p_rcode(hp->rcode),
-			       ntohs(hp->ancount),
-			       ntohs(hp->nscount),
-			       ntohs(hp->arcount));
-#endif
-		switch (hp->rcode) {
-		case NXDOMAIN:
-			RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);
-			break;
-		case SERVFAIL:
-			RES_SET_H_ERRNO(statp, TRY_AGAIN);
-			break;
-		case NOERROR:
-			RES_SET_H_ERRNO(statp, NO_DATA);
-			break;
-		case FORMERR:
-		case NOTIMP:
-		case REFUSED:
-		default:
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			break;
-		}
-		return (-1);
-	}
-	return (n);
-}
-
-/*%
- * Formulate a normal query, send, and retrieve answer in supplied buffer.
- * Return the size of the response on success, -1 on error.
- * If enabled, implement search rules until answer or unrecoverable failure
- * is detected.  Error code, if any, is left in H_ERRNO.
- */
-int
-res_nsearch(res_state statp,
-	    const char *name,	/*%< domain name */
-	    int class, int type,	/*%< class and type of query */
-	    u_char *answer,	/*%< buffer to put answer */
-	    int anslen)		/*%< size of answer */
-{
-	const char *cp, * const *domain;
-	HEADER *hp = (HEADER *) answer;
-	char tmp[NS_MAXDNAME];
-	u_int dots;
-	int trailing_dot, ret, saved_herrno;
-	int got_nodata = 0, got_servfail = 0, root_on_list = 0;
-	int tried_as_is = 0;
-	int searched = 0;
-
-	errno = 0;
-	RES_SET_H_ERRNO(statp, HOST_NOT_FOUND);  /*%< True if we never query. */
-	dots = 0;
-	for (cp = name; *cp != '\0'; cp++)
-		dots += (*cp == '.');
-	trailing_dot = 0;
-	if (cp > name && *--cp == '.')
-		trailing_dot++;
-
-	/* If there aren't any dots, it could be a user-level alias. */
-	if (!dots && (cp = res_hostalias(statp, name, tmp, sizeof tmp))!= NULL)
-		return (res_nquery(statp, cp, class, type, answer, anslen));
-
-	/*
-	 * If there are enough dots in the name, let's just give it a
-	 * try 'as is'. The threshold can be set with the "ndots" option.
-	 * Also, query 'as is', if there is a trailing dot in the name.
-	 */
-	saved_herrno = -1;
-	if (dots >= statp->ndots || trailing_dot) {
-		ret = res_nquerydomain(statp, name, NULL, class, type,
-					 answer, anslen);
-		if (ret > 0 || trailing_dot)
-			return (ret);
-		if (errno == ECONNREFUSED) {
-			RES_SET_H_ERRNO(statp, TRY_AGAIN);
-			return (-1);
-		}
-		switch (statp->res_h_errno) {
-		case NO_DATA:
-		case HOST_NOT_FOUND:
-			break;
-		case TRY_AGAIN:
-			if (hp->rcode == SERVFAIL)
-				break;
-			/* FALLTHROUGH */
-		default:
-			return (-1);
-		}
-		saved_herrno = statp->res_h_errno;
-		tried_as_is++;
-	}
-
-	/*
-	 * We do at least one level of search if
-	 *	- there is no dot and RES_DEFNAME is set, or
-	 *	- there is at least one dot, there is no trailing dot,
-	 *	  and RES_DNSRCH is set.
-	 */
-	if ((!dots && (statp->options & RES_DEFNAMES) != 0U) ||
-	    (dots && !trailing_dot && (statp->options & RES_DNSRCH) != 0U)) {
-		int done = 0;
-
-		for (domain = (const char * const *)statp->dnsrch;
-		     *domain && !done;
-		     domain++) {
-			searched = 1;
-
-			if (domain[0][0] == '\0' ||
-			    (domain[0][0] == '.' && domain[0][1] == '\0'))
-				root_on_list++;
-
-			if (root_on_list && tried_as_is)
-				continue;
-
-			ret = res_nquerydomain(statp, name, *domain,
-					       class, type,
-					       answer, anslen);
-			if (ret > 0)
-				return (ret);
-
-			/*
-			 * If no server present, give up.
-			 * If name isn't found in this domain,
-			 * keep trying higher domains in the search list
-			 * (if that's enabled).
-			 * On a NO_DATA error, keep trying, otherwise
-			 * a wildcard entry of another type could keep us
-			 * from finding this entry higher in the domain.
-			 * If we get some other error (negative answer or
-			 * server failure), then stop searching up,
-			 * but try the input name below in case it's
-			 * fully-qualified.
-			 */
-			if (errno == ECONNREFUSED) {
-				RES_SET_H_ERRNO(statp, TRY_AGAIN);
-				return (-1);
-			}
-
-			switch (statp->res_h_errno) {
-			case NO_DATA:
-				got_nodata++;
-				/* FALLTHROUGH */
-			case HOST_NOT_FOUND:
-				/* keep trying */
-				break;
-			case TRY_AGAIN:
-				/*
-				 * This can occur due to a server failure
-				 * (that is, all listed servers have failed),
-				 * or all listed servers have timed out.
-				 * ((HEADER *)answer)->rcode may not be set
-				 * to SERVFAIL in the case of a timeout.
-				 *
-				 * Either way we must return TRY_AGAIN in
-				 * order to avoid non-deterministic
-				 * return codes.
-				 * For example, loaded name servers or races
-				 * against network startup/validation (dhcp,
-				 * ppp, etc) can cause the search to timeout
-				 * on one search element, e.g. 'fu.bar.com',
-				 * and return a definitive failure on the
-				 * next search element, e.g. 'fu.'.
-				 */
-				got_servfail++;
-				if (hp->rcode == SERVFAIL) {
-					/* try next search element, if any */
-					break;
-				}
-				/* FALLTHROUGH */
-			default:
-				/* anything else implies that we're done */
-				done++;
-			}
-
-			/* if we got here for some reason other than DNSRCH,
-			 * we only wanted one iteration of the loop, so stop.
-			 */
-			if ((statp->options & RES_DNSRCH) == 0U)
-				done++;
-		}
-	}
-
-	switch (statp->res_h_errno) {
-	case NO_DATA:
-	case HOST_NOT_FOUND:
-		break;
-	case TRY_AGAIN:
-		if (hp->rcode == SERVFAIL)
-			break;
-		/* FALLTHROUGH */
-	default:
-		goto giveup;
-	}
-
-	/*
-	 * If the query has not already been tried as is then try it
-	 * unless RES_NOTLDQUERY is set and there were no dots.
-	 */
-	if ((dots || !searched || (statp->options & RES_NOTLDQUERY) == 0U) &&
-	    !(tried_as_is || root_on_list)) {
-		ret = res_nquerydomain(statp, name, NULL, class, type,
-				       answer, anslen);
-		if (ret > 0)
-			return (ret);
-	}
-
-	/* if we got here, we didn't satisfy the search.
-	 * if we did an initial full query, return that query's H_ERRNO
-	 * (note that we wouldn't be here if that query had succeeded).
-	 * else if we ever got a nodata, send that back as the reason.
-	 * else send back meaningless H_ERRNO, that being the one from
-	 * the last DNSRCH we did.
-	 */
-giveup:
-	if (saved_herrno != -1)
-		RES_SET_H_ERRNO(statp, saved_herrno);
-	else if (got_nodata)
-		RES_SET_H_ERRNO(statp, NO_DATA);
-	else if (got_servfail)
-		RES_SET_H_ERRNO(statp, TRY_AGAIN);
-	return (-1);
-}
-
-/*%
- * Perform a call on res_query on the concatenation of name and domain,
- * removing a trailing dot from name if domain is NULL.
- */
-int
-res_nquerydomain(res_state statp,
-	    const char *name,
-	    const char *domain,
-	    int class, int type,	/*%< class and type of query */
-	    u_char *answer,		/*%< buffer to put answer */
-	    int anslen)		/*%< size of answer */
-{
-	char nbuf[MAXDNAME];
-	const char *longname = nbuf;
-	int n, d;
-
-#ifdef DEBUG
-	if (statp->options & RES_DEBUG)
-		printf(";; res_nquerydomain(%s, %s, %d, %d)\n",
-		       name, domain?domain:"<Nil>", class, type);
-#endif
-	if (domain == NULL) {
-		/*
-		 * Check for trailing '.';
-		 * copy without '.' if present.
-		 */
-		n = strlen(name);
-		if (n >= MAXDNAME) {
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-		}
-		n--;
-		if (n >= 0 && name[n] == '.') {
-			strncpy(nbuf, name, n);
-			nbuf[n] = '\0';
-		} else
-			longname = name;
-	} else {
-		n = strlen(name);
-		d = strlen(domain);
-		if (n + d + 1 >= MAXDNAME) {
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			return (-1);
-		}
-		sprintf(nbuf, "%s.%s", name, domain);
-	}
-	return (res_nquery(statp, longname, class, type, answer, anslen));
-}
-
-const char *
-res_hostalias(const res_state statp, const char *name, char *dst, size_t siz) {
-	char *file, *cp1, *cp2;
-	char buf[BUFSIZ];
-	FILE *fp;
-
-	if (statp->options & RES_NOALIASES)
-		return (NULL);
-	if (issetugid())
-		return (NULL);
-	file = getenv("HOSTALIASES");
-	if (file == NULL || (fp = fopen(file, "re")) == NULL)
-		return (NULL);
-	setbuf(fp, NULL);
-	buf[sizeof(buf) - 1] = '\0';
-	while (fgets(buf, sizeof(buf), fp)) {
-		for (cp1 = buf; *cp1 && !isspace((unsigned char)*cp1); ++cp1)
-			;
-		if (!*cp1)
-			break;
-		*cp1 = '\0';
-		if (ns_samename(buf, name) == 1) {
-			while (isspace((unsigned char)*++cp1))
-				;
-			if (!*cp1)
-				break;
-			for (cp2 = cp1 + 1; *cp2 &&
-			     !isspace((unsigned char)*cp2); ++cp2)
-				;
-			*cp2 = '\0';
-			strncpy(dst, cp1, siz - 1);
-			dst[siz - 1] = '\0';
-			fclose(fp);
-			return (dst);
-		}
-	}
-	fclose(fp);
-	return (NULL);
-}
-
-/*! \file */
diff --git a/lib/libc_bsd/resolv/res_send.c b/lib/libc_bsd/resolv/res_send.c
deleted file mode 100644
index cacb93b..0000000
--- a/lib/libc_bsd/resolv/res_send.c
+++ /dev/null
@@ -1,1180 +0,0 @@
-/*
- * Portions Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
- * Portions Copyright (C) 1996-2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Copyright (c) 1985, 1989, 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.
- * 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.
- */
-
-/*
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp $";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_send.c 270838 2014-08-30 10:16:25Z ume $");
-
-/*! \file
- * \brief
- * Send query to name server and wait for reply.
- */
-
-#include "port_before.h"
-#ifndef USE_KQUEUE
-#include "fd_setsize.h"
-#endif
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <arpa/inet.h>
-
-#include <errno.h>
-#include <netdb.h>
-#include <resolv.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <isc/eventlib.h>
-
-#include "port_after.h"
-
-#ifdef USE_KQUEUE
-#include <sys/event.h>
-#else
-#ifdef USE_POLL
-#ifdef HAVE_STROPTS_H
-#include <stropts.h>
-#endif
-#include <poll.h>
-#endif /* USE_POLL */
-#endif
-
-#include "un-namespace.h"
-
-/* Options.  Leave them on. */
-#define DEBUG
-#include "res_debug.h"
-#include "res_private.h"
-
-#define EXT(res) ((res)->_u._ext)
-
-#if !defined(USE_POLL) && !defined(USE_KQUEUE)
-static const int highestFD = FD_SETSIZE - 1;
-#endif
-
-/* Forward. */
-
-static int		get_salen(const struct sockaddr *);
-static struct sockaddr * get_nsaddr(res_state, size_t);
-static int		send_vc(res_state, const u_char *, int,
-				u_char *, int, int *, int);
-static int		send_dg(res_state,
-#ifdef USE_KQUEUE
-				int kq,
-#endif
-				const u_char *, int,
-				u_char *, int, int *, int, int,
-				int *, int *);
-static void		Aerror(const res_state, FILE *, const char *, int,
-			       const struct sockaddr *, int);
-static void		Perror(const res_state, FILE *, const char *, int);
-static int		sock_eq(struct sockaddr *, struct sockaddr *);
-#if defined(NEED_PSELECT) && !defined(USE_POLL) && !defined(USE_KQUEUE)
-static int		pselect(int, void *, void *, void *,
-				struct timespec *,
-				const sigset_t *);
-#endif
-void res_pquery(const res_state, const u_char *, int, FILE *);
-
-static const int niflags = NI_NUMERICHOST | NI_NUMERICSERV;
-
-/* Public. */
-
-/*%
- *	looks up "ina" in _res.ns_addr_list[]
- *
- * returns:
- *\li	0  : not found
- *\li	>0 : found
- *
- * author:
- *\li	paul vixie, 29may94
- */
-int
-res_ourserver_p(const res_state statp, const struct sockaddr *sa) {
-	const struct sockaddr_in *inp, *srv;
-	const struct sockaddr_in6 *in6p, *srv6;
-	int ns;
-
-	switch (sa->sa_family) {
-	case AF_INET:
-		inp = (const struct sockaddr_in *)sa;
-		for (ns = 0;  ns < statp->nscount;  ns++) {
-			srv = (struct sockaddr_in *)get_nsaddr(statp, ns);
-			if (srv->sin_family == inp->sin_family &&
-			    srv->sin_port == inp->sin_port &&
-			    (srv->sin_addr.s_addr == INADDR_ANY ||
-			     srv->sin_addr.s_addr == inp->sin_addr.s_addr))
-				return (1);
-		}
-		break;
-	case AF_INET6:
-		if (EXT(statp).ext == NULL)
-			break;
-		in6p = (const struct sockaddr_in6 *)sa;
-		for (ns = 0;  ns < statp->nscount;  ns++) {
-			srv6 = (struct sockaddr_in6 *)get_nsaddr(statp, ns);
-			if (srv6->sin6_family == in6p->sin6_family &&
-			    srv6->sin6_port == in6p->sin6_port &&
-#ifdef HAVE_SIN6_SCOPE_ID
-			    (srv6->sin6_scope_id == 0 ||
-			     srv6->sin6_scope_id == in6p->sin6_scope_id) &&
-#endif
-			    (IN6_IS_ADDR_UNSPECIFIED(&srv6->sin6_addr) ||
-			     IN6_ARE_ADDR_EQUAL(&srv6->sin6_addr, &in6p->sin6_addr)))
-				return (1);
-		}
-		break;
-	default:
-		break;
-	}
-	return (0);
-}
-
-/*%
- *	look for (name,type,class) in the query section of packet (buf,eom)
- *
- * requires:
- *\li	buf + HFIXEDSZ <= eom
- *
- * returns:
- *\li	-1 : format error
- *\li	0  : not found
- *\li	>0 : found
- *
- * author:
- *\li	paul vixie, 29may94
- */
-int
-res_nameinquery(const char *name, int type, int class,
-		const u_char *buf, const u_char *eom)
-{
-	const u_char *cp = buf + HFIXEDSZ;
-	int qdcount = ntohs(((const HEADER*)buf)->qdcount);
-
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf, eom, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom)
-			return (-1);
-		ttype = ns_get16(cp); cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (ttype == type && tclass == class &&
-		    ns_samename(tname, name) == 1)
-			return (1);
-	}
-	return (0);
-}
-
-/*%
- *	is there a 1:1 mapping of (name,type,class)
- *	in (buf1,eom1) and (buf2,eom2)?
- *
- * returns:
- *\li	-1 : format error
- *\li	0  : not a 1:1 mapping
- *\li	>0 : is a 1:1 mapping
- *
- * author:
- *\li	paul vixie, 29may94
- */
-int
-res_queriesmatch(const u_char *buf1, const u_char *eom1,
-		 const u_char *buf2, const u_char *eom2)
-{
-	const u_char *cp = buf1 + HFIXEDSZ;
-	int qdcount = ntohs(((const HEADER*)buf1)->qdcount);
-
-	if (buf1 + HFIXEDSZ > eom1 || buf2 + HFIXEDSZ > eom2)
-		return (-1);
-
-	/*
-	 * Only header section present in replies to
-	 * dynamic update packets.
-	 */
-	if ((((const HEADER *)buf1)->opcode == ns_o_update) &&
-	    (((const HEADER *)buf2)->opcode == ns_o_update))
-		return (1);
-
-	if (qdcount != ntohs(((const HEADER*)buf2)->qdcount))
-		return (0);
-	while (qdcount-- > 0) {
-		char tname[MAXDNAME+1];
-		int n, ttype, tclass;
-
-		n = dn_expand(buf1, eom1, cp, tname, sizeof tname);
-		if (n < 0)
-			return (-1);
-		cp += n;
-		if (cp + 2 * INT16SZ > eom1)
-			return (-1);
-		ttype = ns_get16(cp);	cp += INT16SZ;
-		tclass = ns_get16(cp); cp += INT16SZ;
-		if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
-			return (0);
-	}
-	return (1);
-}
-
-int
-res_nsend(res_state statp,
-	  const u_char *buf, int buflen, u_char *ans, int anssiz)
-{
-	int gotsomewhere, terrno, tries, v_circuit, resplen, ns, n;
-#ifdef USE_KQUEUE
-	int kq;
-#endif
-	char abuf[NI_MAXHOST];
-
-	/* No name servers or res_init() failure */
-	if (statp->nscount == 0 || EXT(statp).ext == NULL) {
-		errno = ESRCH;
-		return (-1);
-	}
-	if (anssiz < HFIXEDSZ) {
-		errno = EINVAL;
-		return (-1);
-	}
-	DprintQ((statp->options & RES_DEBUG) || (statp->pfcode & RES_PRF_QUERY),
-		(stdout, ";; res_send()\n"), buf, buflen);
-	v_circuit = (statp->options & RES_USEVC) || buflen > PACKETSZ;
-	gotsomewhere = 0;
-	terrno = ETIMEDOUT;
-
-#ifdef USE_KQUEUE
-	if ((kq = kqueue()) < 0) {
-		Perror(statp, stderr, "kqueue", errno);
-		return (-1);
-	}
-#endif
-
-	/*
-	 * If the ns_addr_list in the resolver context has changed, then
-	 * invalidate our cached copy and the associated timing data.
-	 */
-	if (EXT(statp).nscount != 0) {
-		int needclose = 0;
-		struct sockaddr_storage peer;
-		ISC_SOCKLEN_T peerlen;
-
-		if (EXT(statp).nscount != statp->nscount)
-			needclose++;
-		else
-			for (ns = 0; ns < statp->nscount; ns++) {
-				if (statp->nsaddr_list[ns].sin_family &&
-				    !sock_eq((struct sockaddr *)&statp->nsaddr_list[ns],
-					     (struct sockaddr *)&EXT(statp).ext->nsaddrs[ns])) {
-					needclose++;
-					break;
-				}
-
-				if (EXT(statp).nssocks[ns] == -1)
-					continue;
-				peerlen = sizeof(peer);
-				if (_getpeername(EXT(statp).nssocks[ns],
-				    (struct sockaddr *)&peer, &peerlen) < 0) {
-					needclose++;
-					break;
-				}
-				if (!sock_eq((struct sockaddr *)&peer,
-				    get_nsaddr(statp, ns))) {
-					needclose++;
-					break;
-				}
-			}
-		if (needclose) {
-			res_nclose(statp);
-			EXT(statp).nscount = 0;
-		}
-	}
-
-	/*
-	 * Maybe initialize our private copy of the ns_addr_list.
-	 */
-	if (EXT(statp).nscount == 0) {
-		for (ns = 0; ns < statp->nscount; ns++) {
-			EXT(statp).nstimes[ns] = RES_MAXTIME;
-			EXT(statp).nssocks[ns] = -1;
-			if (!statp->nsaddr_list[ns].sin_family)
-				continue;
-			EXT(statp).ext->nsaddrs[ns].sin =
-				 statp->nsaddr_list[ns];
-		}
-		EXT(statp).nscount = statp->nscount;
-	}
-
-	/*
-	 * Some resolvers want to even out the load on their nameservers.
-	 * Note that RES_BLAST overrides RES_ROTATE.
-	 */
-	if ((statp->options & RES_ROTATE) != 0U &&
-	    (statp->options & RES_BLAST) == 0U) {
-		union res_sockaddr_union inu;
-		struct sockaddr_in ina;
-		int lastns = statp->nscount - 1;
-		int fd;
-		u_int16_t nstime;
-
-		if (EXT(statp).ext != NULL)
-			inu = EXT(statp).ext->nsaddrs[0];
-		ina = statp->nsaddr_list[0];
-		fd = EXT(statp).nssocks[0];
-		nstime = EXT(statp).nstimes[0];
-		for (ns = 0; ns < lastns; ns++) {
-			if (EXT(statp).ext != NULL)
-				EXT(statp).ext->nsaddrs[ns] =
-					EXT(statp).ext->nsaddrs[ns + 1];
-			statp->nsaddr_list[ns] = statp->nsaddr_list[ns + 1];
-			EXT(statp).nssocks[ns] = EXT(statp).nssocks[ns + 1];
-			EXT(statp).nstimes[ns] = EXT(statp).nstimes[ns + 1];
-		}
-		if (EXT(statp).ext != NULL)
-			EXT(statp).ext->nsaddrs[lastns] = inu;
-		statp->nsaddr_list[lastns] = ina;
-		EXT(statp).nssocks[lastns] = fd;
-		EXT(statp).nstimes[lastns] = nstime;
-	}
-
-	/*
-	 * Send request, RETRY times, or until successful.
-	 */
-	for (tries = 0; tries < statp->retry; tries++) {
-	    for (ns = 0; ns < statp->nscount; ns++) {
-		struct sockaddr *nsap;
-		int nsaplen;
-		nsap = get_nsaddr(statp, ns);
-		nsaplen = get_salen(nsap);
-		statp->_flags &= ~RES_F_LASTMASK;
-		statp->_flags |= (ns << RES_F_LASTSHIFT);
- same_ns:
-		if (statp->qhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*statp->qhook)(&nsap, &buf, &buflen,
-						      ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-					done = 1;
-					break;
-				case res_nextns:
-					res_nclose(statp);
-					goto next_ns;
-				case res_done:
-#ifdef USE_KQUEUE
-					_close(kq);
-#endif
-					return (resplen);
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					goto fail;
-				}
-			} while (!done);
-		}
-
-		Dprint(((statp->options & RES_DEBUG) &&
-			getnameinfo(nsap, nsaplen, abuf, sizeof(abuf),
-				    NULL, 0, niflags) == 0),
-		       (stdout, ";; Querying server (# %d) address = %s\n",
-			ns + 1, abuf));
-
-
-		if (v_circuit) {
-			/* Use VC; at most one attempt per server. */
-			tries = statp->retry;
-			n = send_vc(statp, buf, buflen, ans, anssiz, &terrno,
-				    ns);
-			if (n < 0)
-				goto fail;
-			if (n == 0)
-				goto next_ns;
-			resplen = n;
-		} else {
-			/* Use datagrams. */
-			n = send_dg(statp,
-#ifdef USE_KQUEUE
-				    kq,
-#endif
-				    buf, buflen, ans, anssiz, &terrno,
-				    ns, tries, &v_circuit, &gotsomewhere);
-			if (n < 0)
-				goto fail;
-			if (n == 0)
-				goto next_ns;
-			if (v_circuit)
-				goto same_ns;
-			resplen = n;
-		}
-
-		Dprint((statp->options & RES_DEBUG) ||
-		       ((statp->pfcode & RES_PRF_REPLY) &&
-			(statp->pfcode & RES_PRF_HEAD1)),
-		       (stdout, ";; got answer:\n"));
-
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, "%s", ""),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-
-		/*
-		 * If we have temporarily opened a virtual circuit,
-		 * or if we haven't been asked to keep a socket open,
-		 * close the socket.
-		 */
-		if ((v_circuit && (statp->options & RES_USEVC) == 0U) ||
-		    (statp->options & RES_STAYOPEN) == 0U) {
-			res_nclose(statp);
-		}
-		if (statp->rhook) {
-			int done = 0, loops = 0;
-
-			do {
-				res_sendhookact act;
-
-				act = (*statp->rhook)(nsap, buf, buflen,
-						      ans, anssiz, &resplen);
-				switch (act) {
-				case res_goahead:
-				case res_done:
-					done = 1;
-					break;
-				case res_nextns:
-					res_nclose(statp);
-					goto next_ns;
-				case res_modified:
-					/* give the hook another try */
-					if (++loops < 42) /*doug adams*/
-						break;
-					/*FALLTHROUGH*/
-				case res_error:
-					/*FALLTHROUGH*/
-				default:
-					goto fail;
-				}
-			} while (!done);
-
-		}
-#ifdef USE_KQUEUE
-		_close(kq);
-#endif
-		return (resplen);
- next_ns: ;
-	   } /*foreach ns*/
-	} /*foreach retry*/
-	res_nclose(statp);
-#ifdef USE_KQUEUE
-	_close(kq);
-#endif
-	if (!v_circuit) {
-		if (!gotsomewhere)
-			errno = ECONNREFUSED;	/*%< no nameservers found */
-		else
-			errno = ETIMEDOUT;	/*%< no answer obtained */
-	} else
-		errno = terrno;
-	return (-1);
- fail:
-	res_nclose(statp);
-#ifdef USE_KQUEUE
-	_close(kq);
-#endif
-	return (-1);
-}
-
-/* Private */
-
-static int
-get_salen(sa)
-	const struct sockaddr *sa;
-{
-
-#ifdef HAVE_SA_LEN
-	/* There are people do not set sa_len.  Be forgiving to them. */
-	if (sa->sa_len)
-		return (sa->sa_len);
-#endif
-
-	if (sa->sa_family == AF_INET)
-		return (sizeof(struct sockaddr_in));
-	else if (sa->sa_family == AF_INET6)
-		return (sizeof(struct sockaddr_in6));
-	else
-		return (0);	/*%< unknown, die on connect */
-}
-
-/*%
- * pick appropriate nsaddr_list for use.  see res_init() for initialization.
- */
-static struct sockaddr *
-get_nsaddr(statp, n)
-	res_state statp;
-	size_t n;
-{
-
-	if (!statp->nsaddr_list[n].sin_family && EXT(statp).ext) {
-		/*
-		 * - EXT(statp).ext->nsaddrs[n] holds an address that is larger
-		 *   than struct sockaddr, and
-		 * - user code did not update statp->nsaddr_list[n].
-		 */
-		return (struct sockaddr *)(void *)&EXT(statp).ext->nsaddrs[n];
-	} else {
-		/*
-		 * - user code updated statp->nsaddr_list[n], or
-		 * - statp->nsaddr_list[n] has the same content as
-		 *   EXT(statp).ext->nsaddrs[n].
-		 */
-		return (struct sockaddr *)(void *)&statp->nsaddr_list[n];
-	}
-}
-
-static int
-send_vc(res_state statp,
-	const u_char *buf, int buflen, u_char *ans, int anssiz,
-	int *terrno, int ns)
-{
-	const HEADER *hp = (const HEADER *) buf;
-	HEADER *anhp = (HEADER *) ans;
-	struct sockaddr *nsap;
-	int nsaplen;
-	int truncating, connreset, resplen, n;
-	struct iovec iov[2];
-	u_short len;
-	u_char *cp;
-	void *tmp;
-#ifdef SO_NOSIGPIPE
-	int on = 1;
-#endif
-
-	nsap = get_nsaddr(statp, ns);
-	nsaplen = get_salen(nsap);
-
-	connreset = 0;
- same_ns:
-	truncating = 0;
-
-	/* Are we still talking to whom we want to talk to? */
-	if (statp->_vcsock >= 0 && (statp->_flags & RES_F_VC) != 0) {
-		struct sockaddr_storage peer;
-		ISC_SOCKLEN_T size = sizeof peer;
-
-		if (_getpeername(statp->_vcsock,
-				(struct sockaddr *)&peer, &size) < 0 ||
-		    !sock_eq((struct sockaddr *)&peer, nsap)) {
-			res_nclose(statp);
-			statp->_flags &= ~RES_F_VC;
-		}
-	}
-
-	if (statp->_vcsock < 0 || (statp->_flags & RES_F_VC) == 0) {
-		if (statp->_vcsock >= 0)
-			res_nclose(statp);
-
-		statp->_vcsock = _socket(nsap->sa_family, SOCK_STREAM |
-		    SOCK_CLOEXEC, 0);
-#if !defined(USE_POLL) && !defined(USE_KQUEUE)
-		if (statp->_vcsock > highestFD) {
-			res_nclose(statp);
-			errno = ENOTSOCK;
-		}
-#endif
-		if (statp->_vcsock < 0) {
-			switch (errno) {
-			case EPROTONOSUPPORT:
-#ifdef EPFNOSUPPORT
-			case EPFNOSUPPORT:
-#endif
-			case EAFNOSUPPORT:
-				Perror(statp, stderr, "socket(vc)", errno);
-				return (0);
-			default:
-				*terrno = errno;
-				Perror(statp, stderr, "socket(vc)", errno);
-				return (-1);
-			}
-		}
-#ifdef SO_NOSIGPIPE
-		/*
-		 * Disable generation of SIGPIPE when writing to a closed
-		 * socket.  Write should return -1 and set errno to EPIPE
-		 * instead.
-		 *
-		 * Push on even if setsockopt(SO_NOSIGPIPE) fails.
-		 */
-		(void)_setsockopt(statp->_vcsock, SOL_SOCKET, SO_NOSIGPIPE, &on,
-				 sizeof(on));
-#endif
-		errno = 0;
-		if (_connect(statp->_vcsock, nsap, nsaplen) < 0) {
-			*terrno = errno;
-			Aerror(statp, stderr, "connect/vc", errno, nsap,
-			    nsaplen);
-			res_nclose(statp);
-			return (0);
-		}
-		statp->_flags |= RES_F_VC;
-	}
-
-	/*
-	 * Send length & message
-	 */
-	ns_put16((u_short)buflen, (u_char*)&len);
-	iov[0] = evConsIovec(&len, INT16SZ);
-	DE_CONST(buf, tmp);
-	iov[1] = evConsIovec(tmp, buflen);
-	if (_writev(statp->_vcsock, iov, 2) != (INT16SZ + buflen)) {
-		*terrno = errno;
-		Perror(statp, stderr, "write failed", errno);
-		res_nclose(statp);
-		return (0);
-	}
-	/*
-	 * Receive length & response
-	 */
- read_len:
-	cp = ans;
-	len = INT16SZ;
-	while ((n = _read(statp->_vcsock, (char *)cp, (int)len)) > 0) {
-		cp += n;
-		if ((len -= n) == 0)
-			break;
-	}
-	if (n <= 0) {
-		*terrno = errno;
-		Perror(statp, stderr, "read failed", errno);
-		res_nclose(statp);
-		/*
-		 * A long running process might get its TCP
-		 * connection reset if the remote server was
-		 * restarted.  Requery the server instead of
-		 * trying a new one.  When there is only one
-		 * server, this means that a query might work
-		 * instead of failing.  We only allow one reset
-		 * per query to prevent looping.
-		 */
-		if (*terrno == ECONNRESET && !connreset) {
-			connreset = 1;
-			res_nclose(statp);
-			goto same_ns;
-		}
-		res_nclose(statp);
-		return (0);
-	}
-	resplen = ns_get16(ans);
-	if (resplen > anssiz) {
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; response truncated\n")
-		       );
-		truncating = 1;
-		len = anssiz;
-	} else
-		len = resplen;
-	if (len < HFIXEDSZ) {
-		/*
-		 * Undersized message.
-		 */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; undersized: %d\n", len));
-		*terrno = EMSGSIZE;
-		res_nclose(statp);
-		return (0);
-	}
-	cp = ans;
-	while (len != 0 &&
-	    (n = _read(statp->_vcsock, (char *)cp, (int)len)) > 0) {
-		cp += n;
-		len -= n;
-	}
-	if (n <= 0) {
-		*terrno = errno;
-		Perror(statp, stderr, "read(vc)", errno);
-		res_nclose(statp);
-		return (0);
-	}
-	if (truncating) {
-		/*
-		 * Flush rest of answer so connection stays in synch.
-		 */
-		anhp->tc = 1;
-		len = resplen - anssiz;
-		while (len != 0) {
-			char junk[PACKETSZ];
-
-			n = _read(statp->_vcsock, junk,
-			    (len > sizeof junk) ? sizeof junk : len);
-			if (n > 0)
-				len -= n;
-			else
-				break;
-		}
-	}
-	/*
-	 * If the calling applicating has bailed out of
-	 * a previous call and failed to arrange to have
-	 * the circuit closed or the server has got
-	 * itself confused, then drop the packet and
-	 * wait for the correct one.
-	 */
-	if (hp->id != anhp->id) {
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; old answer (unexpected):\n"),
-			ans, (resplen > anssiz) ? anssiz: resplen);
-		goto read_len;
-	}
-
-	/*
-	 * All is well, or the error is fatal.  Signal that the
-	 * next nameserver ought not be tried.
-	 */
-	return (resplen);
-}
-
-static int
-send_dg(res_state statp,
-#ifdef USE_KQUEUE
-	int kq,
-#endif
-	const u_char *buf, int buflen, u_char *ans,
-	int anssiz, int *terrno, int ns, int tries, int *v_circuit,
-	int *gotsomewhere)
-{
-	const HEADER *hp = (const HEADER *) buf;
-	HEADER *anhp = (HEADER *) ans;
-	const struct sockaddr *nsap;
-	int nsaplen;
-	struct timespec now, timeout, finish;
-	struct sockaddr_storage from;
-	ISC_SOCKLEN_T fromlen;
-	int resplen, seconds, n, s;
-#ifdef USE_KQUEUE
-	struct kevent kv;
-#else
-#ifdef USE_POLL
-	int     polltimeout;
-	struct pollfd   pollfd;
-#else
-	fd_set dsmask;
-#endif
-#endif
-
-	nsap = get_nsaddr(statp, ns);
-	nsaplen = get_salen(nsap);
-	if (EXT(statp).nssocks[ns] == -1) {
-		EXT(statp).nssocks[ns] = _socket(nsap->sa_family,
-		    SOCK_DGRAM | SOCK_CLOEXEC, 0);
-#if !defined(USE_POLL) && !defined(USE_KQUEUE)
-		if (EXT(statp).nssocks[ns] > highestFD) {
-			res_nclose(statp);
-			errno = ENOTSOCK;
-		}
-#endif
-		if (EXT(statp).nssocks[ns] < 0) {
-			switch (errno) {
-			case EPROTONOSUPPORT:
-#ifdef EPFNOSUPPORT
-			case EPFNOSUPPORT:
-#endif
-			case EAFNOSUPPORT:
-				Perror(statp, stderr, "socket(dg)", errno);
-				return (0);
-			default:
-				*terrno = errno;
-				Perror(statp, stderr, "socket(dg)", errno);
-				return (-1);
-			}
-		}
-#ifndef CANNOT_CONNECT_DGRAM
-		/*
-		 * On a 4.3BSD+ machine (client and server,
-		 * actually), sending to a nameserver datagram
-		 * port with no nameserver will cause an
-		 * ICMP port unreachable message to be returned.
-		 * If our datagram socket is "connected" to the
-		 * server, we get an ECONNREFUSED error on the next
-		 * socket operation, and select returns if the
-		 * error message is received.  We can thus detect
-		 * the absence of a nameserver without timing out.
-		 *
-		 * When the option "insecure1" is specified, we'd
-		 * rather expect to see responses from an "unknown"
-		 * address.  In order to let the kernel accept such
-		 * responses, do not connect the socket here.
-		 * XXX: or do we need an explicit option to disable
-		 * connecting?
-		 */
-		if (!(statp->options & RES_INSECURE1) &&
-		    _connect(EXT(statp).nssocks[ns], nsap, nsaplen) < 0) {
-			Aerror(statp, stderr, "connect(dg)", errno, nsap,
-			    nsaplen);
-			res_nclose(statp);
-			return (0);
-		}
-#endif /* !CANNOT_CONNECT_DGRAM */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; new DG socket\n"))
-	}
-	s = EXT(statp).nssocks[ns];
-#ifndef CANNOT_CONNECT_DGRAM
-	if (statp->options & RES_INSECURE1) {
-		if (_sendto(s,
-		    (const char*)buf, buflen, 0, nsap, nsaplen) != buflen) {
-			Aerror(statp, stderr, "sendto", errno, nsap, nsaplen);
-			res_nclose(statp);
-			return (0);
-		}
-	} else if (send(s, (const char*)buf, buflen, 0) != buflen) {
-		Perror(statp, stderr, "send", errno);
-		res_nclose(statp);
-		return (0);
-	}
-#else /* !CANNOT_CONNECT_DGRAM */
-	if (_sendto(s, (const char*)buf, buflen, 0, nsap, nsaplen) != buflen)
-	{
-		Aerror(statp, stderr, "sendto", errno, nsap, nsaplen);
-		res_nclose(statp);
-		return (0);
-	}
-#endif /* !CANNOT_CONNECT_DGRAM */
-
-	/*
-	 * Wait for reply.
-	 */
-	seconds = (statp->retrans << tries);
-	if (ns > 0)
-		seconds /= statp->nscount;
-	if (seconds <= 0)
-		seconds = 1;
-	now = evNowTime();
-	timeout = evConsTime(seconds, 0);
-	finish = evAddTime(now, timeout);
-	goto nonow;
- wait:
-	now = evNowTime();
- nonow:
-#ifndef USE_POLL
-	if (evCmpTime(finish, now) > 0)
-		timeout = evSubTime(finish, now);
-	else
-		timeout = evConsTime(0, 0);
-#ifdef USE_KQUEUE
-	EV_SET(&kv, s, EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, 0);
-	n = _kevent(kq, &kv, 1, &kv, 1, &timeout);
-#else
-	FD_ZERO(&dsmask);
-	FD_SET(s, &dsmask);
-	n = pselect(s + 1, &dsmask, NULL, NULL, &timeout, NULL);
-#endif
-#else
-	timeout = evSubTime(finish, now);
-	if (timeout.tv_sec < 0)
-		timeout = evConsTime(0, 0);
-	polltimeout = 1000*timeout.tv_sec +
-		timeout.tv_nsec/1000000;
-	pollfd.fd = s;
-	pollfd.events = POLLRDNORM;
-	n = poll(&pollfd, 1, polltimeout);
-#endif /* USE_POLL */
-
-	if (n == 0) {
-		Dprint(statp->options & RES_DEBUG, (stdout, ";; timeout\n"));
-		*gotsomewhere = 1;
-		return (0);
-	}
-	if (n < 0) {
-		if (errno == EINTR)
-			goto wait;
-#ifdef USE_KQUEUE
-		Perror(statp, stderr, "kevent", errno);
-#else
-#ifndef USE_POLL
-		Perror(statp, stderr, "select", errno);
-#else
-		Perror(statp, stderr, "poll", errno);
-#endif /* USE_POLL */
-#endif
-		res_nclose(statp);
-		return (0);
-	}
-#ifdef USE_KQUEUE
-	if (kv.ident != s)
-		goto wait;
-#endif
-	errno = 0;
-	fromlen = sizeof(from);
-	resplen = _recvfrom(s, (char*)ans, anssiz,0,
-			   (struct sockaddr *)&from, &fromlen);
-	if (resplen <= 0) {
-		Perror(statp, stderr, "recvfrom", errno);
-		res_nclose(statp);
-		return (0);
-	}
-	*gotsomewhere = 1;
-	if (resplen < HFIXEDSZ) {
-		/*
-		 * Undersized message.
-		 */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; undersized: %d\n",
-			resplen));
-		*terrno = EMSGSIZE;
-		res_nclose(statp);
-		return (0);
-	}
-	if (hp->id != anhp->id) {
-		/*
-		 * response from old query, ignore it.
-		 * XXX - potential security hazard could
-		 *	 be detected here.
-		 */
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; old answer:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		goto wait;
-	}
-	if (!(statp->options & RES_INSECURE1) &&
-	    !res_ourserver_p(statp, (struct sockaddr *)&from)) {
-		/*
-		 * response from wrong server? ignore it.
-		 * XXX - potential security hazard could
-		 *	 be detected here.
-		 */
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; not our server:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		goto wait;
-	}
-#ifdef RES_USE_EDNS0
-	if (anhp->rcode == FORMERR && (statp->options & RES_USE_EDNS0) != 0U) {
-		/*
-		 * Do not retry if the server do not understand EDNS0.
-		 * The case has to be captured here, as FORMERR packet do not
-		 * carry query section, hence res_queriesmatch() returns 0.
-		 */
-		DprintQ(statp->options & RES_DEBUG,
-			(stdout, "server rejected query with EDNS0:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		/* record the error */
-		statp->_flags |= RES_F_EDNS0ERR;
-		res_nclose(statp);
-		return (0);
-	}
-#endif
-	if (!(statp->options & RES_INSECURE2) &&
-	    !res_queriesmatch(buf, buf + buflen,
-			      ans, ans + anssiz)) {
-		/*
-		 * response contains wrong query? ignore it.
-		 * XXX - potential security hazard could
-		 *	 be detected here.
-		 */
-		DprintQ((statp->options & RES_DEBUG) ||
-			(statp->pfcode & RES_PRF_REPLY),
-			(stdout, ";; wrong query name:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		goto wait;
-	}
-	if (anhp->rcode == SERVFAIL ||
-	    anhp->rcode == NOTIMP ||
-	    anhp->rcode == REFUSED) {
-		DprintQ(statp->options & RES_DEBUG,
-			(stdout, "server rejected query:\n"),
-			ans, (resplen > anssiz) ? anssiz : resplen);
-		res_nclose(statp);
-		/* don't retry if called from dig */
-		if (!statp->pfcode)
-			return (0);
-	}
-	if (!(statp->options & RES_IGNTC) && anhp->tc) {
-		/*
-		 * To get the rest of answer,
-		 * use TCP with same server.
-		 */
-		Dprint(statp->options & RES_DEBUG,
-		       (stdout, ";; truncated answer\n"));
-		*v_circuit = 1;
-		res_nclose(statp);
-		return (1);
-	}
-	/*
-	 * All is well, or the error is fatal.  Signal that the
-	 * next nameserver ought not be tried.
-	 */
-	return (resplen);
-}
-
-static void
-Aerror(const res_state statp, FILE *file, const char *string, int error,
-       const struct sockaddr *address, int alen)
-{
-	int save = errno;
-	char hbuf[NI_MAXHOST];
-	char sbuf[NI_MAXSERV];
-
-	if ((statp->options & RES_DEBUG) != 0U) {
-		if (getnameinfo(address, alen, hbuf, sizeof(hbuf),
-		    sbuf, sizeof(sbuf), niflags)) {
-			strncpy(hbuf, "?", sizeof(hbuf) - 1);
-			hbuf[sizeof(hbuf) - 1] = '\0';
-			strncpy(sbuf, "?", sizeof(sbuf) - 1);
-			sbuf[sizeof(sbuf) - 1] = '\0';
-		}
-		fprintf(file, "res_send: %s ([%s].%s): %s\n",
-			string, hbuf, sbuf, strerror(error));
-	}
-	errno = save;
-}
-
-static void
-Perror(const res_state statp, FILE *file, const char *string, int error) {
-	int save = errno;
-
-	if ((statp->options & RES_DEBUG) != 0U)
-		fprintf(file, "res_send: %s: %s\n",
-			string, strerror(error));
-	errno = save;
-}
-
-static int
-sock_eq(struct sockaddr *a, struct sockaddr *b) {
-	struct sockaddr_in *a4, *b4;
-	struct sockaddr_in6 *a6, *b6;
-
-	if (a->sa_family != b->sa_family)
-		return 0;
-	switch (a->sa_family) {
-	case AF_INET:
-		a4 = (struct sockaddr_in *)a;
-		b4 = (struct sockaddr_in *)b;
-		return a4->sin_port == b4->sin_port &&
-		    a4->sin_addr.s_addr == b4->sin_addr.s_addr;
-	case AF_INET6:
-		a6 = (struct sockaddr_in6 *)a;
-		b6 = (struct sockaddr_in6 *)b;
-		return a6->sin6_port == b6->sin6_port &&
-#ifdef HAVE_SIN6_SCOPE_ID
-		    a6->sin6_scope_id == b6->sin6_scope_id &&
-#endif
-		    IN6_ARE_ADDR_EQUAL(&a6->sin6_addr, &b6->sin6_addr);
-	default:
-		return 0;
-	}
-}
-
-#if defined(NEED_PSELECT) && !defined(USE_POLL) && !defined(USE_KQUEUE)
-/* XXX needs to move to the porting library. */
-static int
-pselect(int nfds, void *rfds, void *wfds, void *efds,
-	struct timespec *tsp, const sigset_t *sigmask)
-{
-	struct timeval tv, *tvp;
-	sigset_t sigs;
-	int n;
-
-	if (tsp) {
-		tvp = &tv;
-		tv = evTimeVal(*tsp);
-	} else
-		tvp = NULL;
-	if (sigmask)
-		sigprocmask(SIG_SETMASK, sigmask, &sigs);
-	n = select(nfds, rfds, wfds, efds, tvp);
-	if (sigmask)
-		sigprocmask(SIG_SETMASK, &sigs, NULL);
-	if (tsp)
-		*tsp = evTimeSpec(tv);
-	return (n);
-}
-#endif
diff --git a/lib/libc_bsd/resolv/res_state.c b/lib/libc_bsd/resolv/res_state.c
deleted file mode 100644
index f82b9f0..0000000
--- a/lib/libc_bsd/resolv/res_state.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*-
- * Copyright (c) 2006 The FreeBSD Project. 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.
- *
- * 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: releng/10.2/lib/libc/resolv/res_state.c 158792 2006-05-21 11:29:26Z ume $
- */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <stdlib.h>
-
-#include "namespace.h"
-#include "reentrant.h"
-#include "un-namespace.h"
-
-#undef _res
-
-struct __res_state _res;
-
-static thread_key_t res_key;
-static once_t res_init_once = ONCE_INITIALIZER;
-static int res_thr_keycreated = 0;
-
-static void
-free_res(void *ptr)
-{
-	res_state statp = ptr;
-
-	if (statp->_u._ext.ext != NULL)
-		res_ndestroy(statp);
-	free(statp);
-}
-
-static void
-res_keycreate(void)
-{
-	res_thr_keycreated = thr_keycreate(&res_key, free_res) == 0;
-}
-
-res_state
-__res_state(void)
-{
-	res_state statp;
-
-	if (thr_main() != 0)
-		return (&_res);
-
-	if (thr_once(&res_init_once, res_keycreate) != 0 ||
-	    !res_thr_keycreated)
-		return (&_res);
-
-	statp = thr_getspecific(res_key);
-	if (statp != NULL)
-		return (statp);
-	statp = calloc(1, sizeof(*statp));
-	if (statp == NULL)
-		return (&_res);
-#ifdef __BIND_RES_TEXT
-	statp->options = RES_TIMEOUT;			/* Motorola, et al. */
-#endif
-	if (thr_setspecific(res_key, statp) == 0)
-		return (statp);
-	free(statp);
-	return (&_res);
-}
diff --git a/lib/libc_bsd/resolv/res_update.c b/lib/libc_bsd/resolv/res_update.c
deleted file mode 100644
index fbc9a04..0000000
--- a/lib/libc_bsd/resolv/res_update.c
+++ /dev/null
@@ -1,222 +0,0 @@
-#if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_update.c,v 1.13 2005/04/27 04:56:43 sra Exp $";
-#endif /* not lint */
-
-/*
- * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
- * Copyright (c) 1996-1999 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
- * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*! \file
- * \brief
- * Based on the Dynamic DNS reference implementation by Viraj Bais
- * &lt;viraj_bais@ccm.fm.intel.com>
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/resolv/res_update.c 270838 2014-08-30 10:16:25Z ume $");
-
-#include "port_before.h"
-
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-
-#include <errno.h>
-#include <limits.h>
-#include <netdb.h>
-#include <res_update.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <isc/list.h>
-#include <resolv.h>
-
-#include "port_after.h"
-#include "res_private.h"
-
-/*%
- * Separate a linked list of records into groups so that all records
- * in a group will belong to a single zone on the nameserver.
- * Create a dynamic update packet for each zone and send it to the
- * nameservers for that zone, and await answer.
- * Abort if error occurs in updating any zone.
- * Return the number of zones updated on success, < 0 on error.
- *
- * On error, caller must deal with the unsynchronized zones
- * eg. an A record might have been successfully added to the forward
- * zone but the corresponding PTR record would be missing if error
- * was encountered while updating the reverse zone.
- */
-
-struct zonegrp {
-	char			z_origin[MAXDNAME];
-	ns_class		z_class;
-	union res_sockaddr_union z_nsaddrs[MAXNS];
-	int			z_nscount;
-	int			z_flags;
-	LIST(ns_updrec)		z_rrlist;
-	LINK(struct zonegrp)	z_link;
-};
-
-#define ZG_F_ZONESECTADDED	0x0001
-
-/* Forward. */
-
-static void	res_dprintf(const char *, ...) ISC_FORMAT_PRINTF(1, 2);
-
-/* Macros. */
-
-#define DPRINTF(x) do {\
-		int save_errno = errno; \
-		if ((statp->options & RES_DEBUG) != 0U) res_dprintf x; \
-		errno = save_errno; \
-	} while (0)
-
-/* Public. */
-
-int
-res_nupdate(res_state statp, ns_updrec *rrecp_in, ns_tsig_key *key) {
-	ns_updrec *rrecp;
-	u_char answer[PACKETSZ];
-	u_char *packet;
-	struct zonegrp *zptr, tgrp;
-	LIST(struct zonegrp) zgrps;
-	int nzones = 0, nscount = 0, n;
-	union res_sockaddr_union nsaddrs[MAXNS];
-
-	packet = malloc(NS_MAXMSG);
-	if (packet == NULL) {
-		DPRINTF(("malloc failed"));
-		return (0);
-	}
-	/* Thread all of the updates onto a list of groups. */
-	INIT_LIST(zgrps);
-	memset(&tgrp, 0, sizeof (tgrp));
-	for (rrecp = rrecp_in; rrecp;
-	     rrecp = LINKED(rrecp, r_link) ? NEXT(rrecp, r_link) : NULL) {
-		int nscnt;
-		/* Find the origin for it if there is one. */
-		tgrp.z_class = rrecp->r_class;
-		nscnt = res_findzonecut2(statp, rrecp->r_dname, tgrp.z_class,
-					 RES_EXHAUSTIVE, tgrp.z_origin,
-					 sizeof tgrp.z_origin, 
-					 tgrp.z_nsaddrs, MAXNS);
-		if (nscnt <= 0) {
-			DPRINTF(("res_findzonecut failed (%d)", nscnt));
-			goto done;
-		}
-		tgrp.z_nscount = nscnt;
-		/* Find the group for it if there is one. */
-		for (zptr = HEAD(zgrps); zptr != NULL; zptr = NEXT(zptr, z_link))
-			if (ns_samename(tgrp.z_origin, zptr->z_origin) == 1 &&
-			    tgrp.z_class == zptr->z_class)
-				break;
-		/* Make a group for it if there isn't one. */
-		if (zptr == NULL) {
-			zptr = malloc(sizeof *zptr);
-			if (zptr == NULL) {
-				DPRINTF(("malloc failed"));
-				goto done;
-			}
-			*zptr = tgrp;
-			zptr->z_flags = 0;
-			INIT_LINK(zptr, z_link);
-			INIT_LIST(zptr->z_rrlist);
-			APPEND(zgrps, zptr, z_link);
-		}
-		/* Thread this rrecp onto the right group. */
-		APPEND(zptr->z_rrlist, rrecp, r_glink);
-	}
-
-	for (zptr = HEAD(zgrps); zptr != NULL; zptr = NEXT(zptr, z_link)) {
-		/* Construct zone section and prepend it. */
-		rrecp = res_mkupdrec(ns_s_zn, zptr->z_origin,
-				     zptr->z_class, ns_t_soa, 0);
-		if (rrecp == NULL) {
-			DPRINTF(("res_mkupdrec failed"));
-			goto done;
-		}
-		PREPEND(zptr->z_rrlist, rrecp, r_glink);
-		zptr->z_flags |= ZG_F_ZONESECTADDED;
-
-		/* Marshall the update message. */
-		n = res_nmkupdate(statp, HEAD(zptr->z_rrlist),
-				  packet, NS_MAXMSG);
-		DPRINTF(("res_mkupdate -> %d", n));
-		if (n < 0)
-			goto done;
-
-		/* Temporarily replace the resolver's nameserver set. */
-		nscount = res_getservers(statp, nsaddrs, MAXNS);
-		res_setservers(statp, zptr->z_nsaddrs, zptr->z_nscount);
-
-		/* Send the update and remember the result. */
-		if (key != NULL) {
-#ifdef _LIBC
-			DPRINTF(("TSIG is not supported\n"));
-			RES_SET_H_ERRNO(statp, NO_RECOVERY);
-			goto done;
-#else
-			n = res_nsendsigned(statp, packet, n, key,
-					    answer, sizeof answer);
-#endif
-		} else
-			n = res_nsend(statp, packet, n, answer, sizeof answer);
-		if (n < 0) {
-			DPRINTF(("res_nsend: send error, n=%d (%s)\n",
-				 n, strerror(errno)));
-			goto done;
-		}
-		if (((HEADER *)answer)->rcode == NOERROR)
-			nzones++;
-
-		/* Restore resolver's nameserver set. */
-		res_setservers(statp, nsaddrs, nscount);
-		nscount = 0;
-	}
- done:
-	while (!EMPTY(zgrps)) {
-		zptr = HEAD(zgrps);
-		if ((zptr->z_flags & ZG_F_ZONESECTADDED) != 0)
-			res_freeupdrec(HEAD(zptr->z_rrlist));
-		UNLINK(zgrps, zptr, z_link);
-		free(zptr);
-	}
-	if (nscount != 0)
-		res_setservers(statp, nsaddrs, nscount);
-
-	free(packet);
-	return (nzones);
-}
-
-/* Private. */
-
-static void
-res_dprintf(const char *fmt, ...) {
-	va_list ap;
-
-	va_start(ap, fmt);
-	fputs(";; res_nupdate: ", stderr);
-	vfprintf(stderr, fmt, ap);
-	fputc('\n', stderr);
-	va_end(ap);
-}
diff --git a/lib/libc_bsd/rpc/DISCLAIMER b/lib/libc_bsd/rpc/DISCLAIMER
deleted file mode 100644
index 837b223..0000000
--- a/lib/libc_bsd/rpc/DISCLAIMER
+++ /dev/null
@@ -1,60 +0,0 @@
-/*	$NetBSD: DISCLAIMER,v 1.2 1998/01/09 04:11:51 perry Exp $	*/
-/*	$FreeBSD: releng/10.2/lib/libc/rpc/DISCLAIMER 261046 2014-01-22 23:45:27Z mav $ */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
diff --git a/lib/libc_bsd/rpc/Makefile.inc b/lib/libc_bsd/rpc/Makefile.inc
deleted file mode 100644
index 74bfab8..0000000
--- a/lib/libc_bsd/rpc/Makefile.inc
+++ /dev/null
@@ -1,179 +0,0 @@
-#	@(#)Makefile    5.11 (Berkeley) 9/6/90
-Makefile.incl 231118 2012-02-07 09:27:07Z dim $
-
-.PATH: ${.CURDIR}/rpc ${.CURDIR}/.
-SRCS+=	auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
-	clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
-	clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \
-	getrpcport.c mt_misc.c pmap_clnt.c pmap_getmaps.c pmap_getport.c \
-	pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \
-	rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
-	rpcb_st_xdr.c rpcsec_gss_stub.c svc.c svc_auth.c svc_dg.c \
-	svc_auth_unix.c svc_generic.c svc_raw.c svc_run.c svc_simple.c \
-	svc_vc.c
-
-# Secure-RPC
-SRCS+=  auth_time.c auth_des.c authdes_prot.c des_crypt.c des_soft.c \
-	crypt_client.c key_call.c key_prot_xdr.c getpublickey.c \
-	svc_auth_des.c
-
-# Resolver stuff
-SRCS+=	netname.c netnamer.c rpcdname.c
-
-# Misc Source
-SRCS+=	rtime.c
-
-# generated sources
-SRCS+=  crypt_clnt.c crypt_xdr.c crypt.h
-
-SYM_MAPS+=${.CURDIR}/rpc/Symbol.map
-
-CFLAGS+= -DBROKEN_DES -DPORTMAP -DDES_BUILTIN
-CFLAGS+= -I${.CURDIR}/rpc
-
-CLEANFILES+= crypt_clnt.c crypt_xdr.c crypt.h
-
-RPCDIR= ${DESTDIR}/usr/include/rpcsvc
-RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -C
-
-crypt_clnt.c: ${RPCDIR}/crypt.x crypt.h
-	${RPCGEN} -l -o ${.TARGET} ${RPCDIR}/crypt.x
-
-crypt_xdr.c: ${RPCDIR}/crypt.x crypt.h
-	${RPCGEN} -c -o ${.TARGET} ${RPCDIR}/crypt.x
-
-crypt.h: ${RPCDIR}/crypt.x
-	${RPCGEN} -h -o ${.TARGET} ${RPCDIR}/crypt.x
-MAN+=	bindresvport.3 des_crypt.3 getnetconfig.3 getnetpath.3 getrpcent.3 \
-	getrpcport.3 rpc.3 rpc_soc.3 rpc_clnt_auth.3 rpc_clnt_calls.3 \
-	rpc_clnt_create.3 rpc_svc_calls.3 rpc_svc_create.3 rpc_svc_err.3 \
-	rpc_svc_reg.3 rpc_xdr.3 rpcbind.3 publickey.3 rpc_secure.3 \
-	rtime.3
-MAN+=	publickey.5 rpc.5 netconfig.5
-MLINKS+=	bindresvport.3 bindresvport_sa.3 \
-		des_crypt.3 ecb_crypt.3 \
-		des_crypt.3 cbc_crypt.3 \
-		des_crypt.3 des_setparity.3 \
-		getnetconfig.3 setnetconfig.3 \
-		getnetconfig.3 getnetconfigent.3 \
-		getnetconfig.3 freenetconfigent.3 \
-		getnetconfig.3 endnetconfig.3 \
-		getnetconfig.3 nc_perror.3 \
-		getnetconfig.3 nc_sperror.3 \
-		getnetpath.3 setnetpath.3 \
-		getnetpath.3 endnetpath.3 \
-		getrpcent.3 getrpcbyname.3 \
-		getrpcent.3 getrpcbynumber.3 \
-		getrpcent.3 endrpcent.3 \
-		getrpcent.3 setrpcent.3 \
-		publickey.3 getpublickey.3 \
-		publickey.3 getsecretkey.3 \
-		rpc_clnt_auth.3 auth_destroy.3 \
-		rpc_clnt_auth.3 authnone_create.3 \
-		rpc_clnt_auth.3 authsys_create.3 \
-		rpc_clnt_auth.3 authsys_create_default.3 \
-		rpc_clnt_calls.3 clnt_call.3 \
-		rpc_clnt_calls.3 clnt_perrno.3 \
-		rpc_clnt_calls.3 clnt_perror.3 \
-		rpc_clnt_calls.3 clnt_sperrno.3 \
-		rpc_clnt_calls.3 clnt_sperror.3 \
-		rpc_clnt_calls.3 rpc_call.3 \
-		rpc_clnt_calls.3 rpc_broadcast.3 \
-		rpc_clnt_calls.3 rpc_broadcast_exp.3 \
-		rpc_clnt_calls.3 clnt_freeres.3 \
-		rpc_clnt_calls.3 clnt_geterr.3 \
-		rpc_clnt_create.3 clnt_control.3 \
-		rpc_clnt_create.3 clnt_create.3 \
-		rpc_clnt_create.3 clnt_create_timed.3 \
-		rpc_clnt_create.3 clnt_create_vers.3 \
-		rpc_clnt_create.3 clnt_create_vers_timed.3 \
-		rpc_clnt_create.3 clnt_destroy.3 \
-		rpc_clnt_create.3 clnt_pcreateerror.3 \
-		rpc_clnt_create.3 clnt_spcreateerror.3 \
-		rpc_clnt_create.3 clnt_dg_create.3 \
-		rpc_clnt_create.3 clnt_raw_create.3 \
-		rpc_clnt_create.3 clnt_tli_create.3 \
-		rpc_clnt_create.3 clnt_tp_create.3 \
-		rpc_clnt_create.3 clnt_tp_create_timed.3 \
-		rpc_clnt_create.3 clnt_vc_create.3 \
-		rpc_secure.3 authdes_create.3 \
-		rpc_secure.3 authdes_getucred.3 \
-		rpc_secure.3 getnetname.3 \
-		rpc_secure.3 host2netname.3 \
-		rpc_secure.3 key_decryptsession.3 \
-		rpc_secure.3 key_encryptsession.3 \
-		rpc_secure.3 key_gendes.3 \
-		rpc_secure.3 key_setsecret.3 \
-		rpc_secure.3 netname2host.3 \
-		rpc_secure.3 netname2user.3 \
-		rpc_secure.3 user2netname.3 \
-		rpc_svc_calls.3 svc_dg_enablecache.3 \
-		rpc_svc_calls.3 svc_exit.3 \
-		rpc_svc_calls.3 svc_freeargs.3 \
-		rpc_svc_calls.3 svc_getargs.3 \
-		rpc_svc_calls.3 svc_getreq_common.3 \
-		rpc_svc_calls.3 svc_getreq_poll.3 \
-		rpc_svc_calls.3 svc_getreqset.3 \
-		rpc_svc_calls.3 svc_getrpccaller.3 \
-		rpc_svc_calls.3 __svc_getcallercreds.3 \
-		rpc_svc_calls.3 svc_pollset.3 \
-		rpc_svc_calls.3 svc_run.3 \
-		rpc_svc_calls.3 svc_sendreply.3 \
-		rpc_svc_create.3 svc_control.3 \
-		rpc_svc_create.3 svc_create.3 \
-		rpc_svc_create.3 svc_dg_create.3 \
-		rpc_svc_create.3 svc_destroy.3 \
-		rpc_svc_create.3 svc_fd_create.3 \
-		rpc_svc_create.3 svc_raw_create.3 \
-		rpc_svc_create.3 svc_tli_create.3 \
-		rpc_svc_create.3 svc_tp_create.3 \
-		rpc_svc_create.3 svc_vc_create.3 \
-		rpc_svc_err.3 svcerr_auth.3 \
-		rpc_svc_err.3 svcerr_decode.3 \
-		rpc_svc_err.3 svcerr_noproc.3 \
-		rpc_svc_err.3 svcerr_noprog.3 \
-		rpc_svc_err.3 svcerr_progvers.3 \
-		rpc_svc_err.3 svcerr_systemerr.3 \
-		rpc_svc_err.3 svcerr_weakauth.3 \
-		rpc_svc_reg.3 rpc_reg.3 \
-		rpc_svc_reg.3 svc_reg.3 \
-		rpc_svc_reg.3 svc_unreg.3 \
-		rpc_svc_reg.3 svc_auth_reg.3 \
-		rpc_svc_reg.3 xprt_register.3 \
-		rpc_svc_reg.3 xprt_unregister.3 \
-		rpcbind.3 rpcb_getmaps.3 \
-		rpcbind.3 rpcb_getaddr.3 \
-		rpcbind.3 rpcb_gettime.3 \
-		rpcbind.3 rpcb_rmtcall.3 \
-		rpcbind.3 rpcb_set.3 \
-		rpcbind.3 rpcb_unset.3 \
-		rpc_soc.3 authunix_create.3 \
-		rpc_soc.3 authunix_create_default.3 \
-		rpc_soc.3 callrpc.3 \
-		rpc_soc.3 clnt_broadcast.3 \
-		rpc_soc.3 clntraw_create.3 \
-		rpc_soc.3 clnttcp_create.3 \
-		rpc_soc.3 clntunix_create.3 \
-		rpc_soc.3 clntudp_bufcreate.3 \
-		rpc_soc.3 clntudp_create.3 \
-		rpc_soc.3 get_myaddress.3 \
-		rpc_soc.3 pmap_getmaps.3 \
-		rpc_soc.3 pmap_getport.3 \
-		rpc_soc.3 pmap_rmtcall.3 \
-		rpc_soc.3 pmap_set.3 \
-		rpc_soc.3 pmap_unset.3 \
-		rpc_soc.3 registerrpc.3 \
-		rpc_soc.3 rpc_createerr.3 \
-		rpc_soc.3 svc_fds.3 \
-		rpc_soc.3 svc_fdset.3 \
-		rpc_soc.3 svc_getcaller.3 \
-		rpc_soc.3 svc_register.3 \
-		rpc_soc.3 svc_unregister.3 \
-		rpc_soc.3 svcfd_create.3 \
-		rpc_soc.3 svcunixfd_create.3 \
-		rpc_soc.3 svcraw_create.3 \
-		rpc_soc.3 svctcp_create.3 \
-		rpc_soc.3 svcudp_bufcreate.3 \
-		rpc_soc.3 svcunix_create.3 \
-		rpc_soc.3 xdr_pmap.3 \
-		rpc_soc.3 xdr_pmaplist.3
diff --git a/lib/libc_bsd/rpc/README b/lib/libc_bsd/rpc/README
deleted file mode 100644
index f806432..0000000
--- a/lib/libc_bsd/rpc/README
+++ /dev/null
@@ -1,176 +0,0 @@
-$FreeBSD: releng/10.2/lib/libc/rpc/README 74462 2001-03-19 12:50:13Z alfred $
-
-PLEASE READ THE DISCLAIMER FILE.  DO NOT CALL THE SUN MICROSYSTEMS SUPPORT
-LINE WITH QUESTIONS ON THIS RELEASE.  THEY CANNOT ANSWER QUESTIONS ABOUT THIS
-UNSUPPORTED SOURCE RELEASE.
-
-TIRPCSRC 2.3 29 Aug 1994
-
-This distribution contains SunSoft's implementation of transport-independent
-RPC (TI-RPC), External Data Representation (XDR), and various utilities and
-documentation.  These libraries and programs form the base of Open Network
-Computing (ONC), and are derived directly from the Solaris 2.3 source.
-
-Previous releases of RPC Source based on SunOS 4.x were ported to 4.2BSD and
-used Sockets as the transport interface.  These versions were
-transport-specific RPC (TS-RPC).
-
-TI-RPC is an enhanced version of TS-RPC that requires the UNIX System V
-Transport Layer Interface (TLI) or an equivalent X/Open Transport Interface
-(XTI).  TI-RPC is on-the-wire compatible with the TS-RPC, which is supported
-by almost 70 vendors on all major operating systems.  TS-RPC source code
-(RPCSRC 4.0) remains available from several internet sites.
-
-This release is a native source release, that is, it is compatible for
-building on Solaris 2.3.  This release was built on Solaris 2.3 using SunPro
-SPARCompiler 2.0.1.
-
-Solaris 2.3 is based on System V, Release 4 (SVR4), and while this release
-should be mostly compatible with other SVR4 systems, some Solaris facilities
-that are assumed may not be available.  In particular, this release uses the
-Makefile format supported by SparcCompiler 2.0.1.  Second, the Secure RPC
-routines use the Solaris Name Service Switch to access public-key credential
-databases.  This code will need to be ported if your system does not support
-the Name Service Switch.  Finally, this release uses the synchronization
-interfaces of UI Threads to make certain interfaces thread-safe.  These
-interfaces are found in libthread in Solaris 2.3 and later.
-
-Applications linked with this release's librpc must link with the United
-States domestic version of libcrypt in order to resolve the cbc_crypt() and
-ecb_crypt() functions.  These routines are used with Secure RPC however all
-RPC programs that link with this release's librpc will need to link with the
-domestic libcrypt.  Note that the Solaris 2.3 Encryption Kit is only available
-within the United States.  (PLEASE NOTE: The RPC implementation found in
-Solaris 2.3's libnsl does *not* have this requirement; linking with libcrypt
-is only a requirement for the TIRPCSRC 2.3 version of librpc.)
-
-
-DOCUMENTATION NOTE
-
-The documentation found in the doc directory are derived from the Solaris 2.3
-Network Interfaces Programming Guide.  A small number of compile examples are
-given, and these use libnsl to link in the RPC library.  This release builds
-the RPC library as librpc.  To use this release's librpc, use the link command
-"-lrpc -lnsl -lcrypt".  This links the application with TIRPCSRC 2.3's librpc
-for RPC routines, Solaris's libnsl for other networking functions, and
-libcrypt for the cbc_crypt() and ecb_crypt functions.
-
-
-WHY IS THIS RELEASE BEING DONE?
-
-This release is being distributed to make the Sun implementation of the ONC
-technologies available for reference and porting to non-Solaris platforms.
-The current release is a native source distribution, and provides services
-that are already available on Solaris 2.3 (such as the RPC headers, the RPC
-library in libnsl, rpcbind, rpcinfo, etc.).  It is not our intention to
-replace these services.  See the DISCLAIMER for further information about the
-legal status of this release.
-
-
-WHAT'S NEW IN THIS RELEASE: TIRPCSRC 2.3
-
-The previous release was TIRPCSRC 2.0.
-
-1.      This release is based on Solaris 2.3.  The previous release was
-	based on Solaris 2.0.  This release contains a siginificant number of
-	bug fixes and other enhancements over TIRPCSRC 2.0.
-
-2.      The RPC library is thread safe for all client-side interfaces
-	(clnt_create, clnt_call, etc.).  The server-side interfaces
-	(svc_create, svc_run, etc.) are not thread safe in this release. The
-	server-side interfaces will be made thread safe in the next release of
-	TIRPCSRC.  Please see the manual pages for details about which
-	interfaces are thread safe.
-
-3.      As part of the work to make the RPC library thread-safe, rpcgen has
-	been enhanced to generate thread-safe RPC stubs (the -M option).  Note
-	that this modifies the call-signature for the stub functions; the
-	procedure calling the RPC stub must now pass to the stub a pointer to
-	an allocated structure where results will be placed by the stub.  See
-	the rpcgen manual page and the rpcgen Programming Guide for details.
-
-4.      The Remote Asynchronous Calls (RAC) library is now included.  RAC was
-	first introduced in TIRPCSRC 1.0, and was bundled with librpc.  It is
-	now a separate library.  The asynchronous call model that RAC provides
-	can be achieved by using threads for making client-side RPC calls.
-	The ONC Technology group recommends using threads (where possible) to
-	achieve asynchrony rather than RAC.  See the rpc_rac(3n) manual page
-	for details.
-
-
-ROADMAP
-
-The directory hierarchy is as follows:
-
-    cmd/        Utilities
-    cmd/rpcgen      The RPC Language compiler (for .x files)
-    cmd/rpcbind     The RPC bindery and portmapper
-    cmd/rpcinfo     RPC bindery query utility
-    cmd/keyserv     The Secure RPC keyserver
-    cmd/demo        Some simple ONC demo services
-
-    doc/        Postscript versions of ONC documentation
-
-    head/       Header files
-    head/rpcsvc     RPCL (.x) specifications for various ONC services, and
-                    header files.
-
-    lib/        Libraries
-    lib/librpc      The RPC and XDR library
-    lib/librac      The Remote Asynchronous Calls (RAC) library
-
-    man/        Manual pages for the RPC library and utilities.
-
-    uts/common/rpc      RPC header files
-
-
-
-BUILD INSTRUCTIONS
-
-Prior to building the release, you must define the SRC environment variable
-to be the path to the top-level Makefile.  For example, if /usr/src/tirpcsrc
-is where to top-level Makefile is located, execute this command prior to
-building the release:
-
-        setenv SRC /usr/src/tirpcsrc        (csh)
-or
-        SRC=/usr/src/tirpcsrc; export SRC   (sh)
-
-The sources in the lib directory depend on header files installed from head
-and uts/common/rpc, and the programs in the cmd directory depend on libraries
-from lib.  Therefore, you should do a "make install" to build the release.
-
-The top-level Makefile builds the release.  The "ROOT" macro defines where the
-headers and libraries are installed.  The default for ROOT is "/proto".  You
-may change this by either modifiying Makefile.master, or issuing the build
-command with a new definition for ROOT:
-
-        make install ROOT=/opt/onc
-
-You will of course need write privileges for the destination directory.
-The headers, libraries and executables will be built and installed under the
-ROOT.
-
-
-The demonstration services in the demo directory are not built by the
-top-level "make install" command.  To build these, cd to the cmd/demo
-directory and enter "make".  The four services will be built.
-RPCGEN MUST BE INSTALLED in a path that make can find.  To run the
-services, rpcbind must be running, then invoke the service
-(you probably will want to put it in the background).  rpcinfo can be
-used to check that the service succeeded in getting registered with
-rpcbind, and to ping the service (see rpcinfo's man page).  You can
-then use the corresponding client program to exercise the service.
-
-
-BUILDING ONC APPLICATIONS
-
-See the Makefiles in the demonstration services for examples of building
-ONC applications with this release.  The $(ROOT)/usr/include directory
-must be included in the compiler header file search path (-I), and the
-$(ROOT)/usr/lib directory must be included in the linker library file search
-path (-L).  Also, to run executables built dynamically, the shared library
-search path (LD_LIBRARY_PATH) must also include $(ROOT)/usr/lib.  In addition
-to linking in this release's librpc (via -lrpc), you must also link with
-Solaris's libnsl (-lnsl) and the US domestic version of libcrypt (-lcrypt).
-
diff --git a/lib/libc_bsd/rpc/Symbol.map b/lib/libc_bsd/rpc/Symbol.map
deleted file mode 100644
index 50af46d..0000000
--- a/lib/libc_bsd/rpc/Symbol.map
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/rpc/Symbol.map 204950 2010-03-10 13:23:25Z jhb $
- */
-
-FBSD_1.0 {
-	/* From crypt_clnt.c (generated by rpcgen - include/rpcsvc/crypt.x) */
-	des_crypt_1;
-
-	/* From crypt_xdr.c (generated by rpcgen - include/rpcsvc/crypt.x) */
-	xdr_des_dir;
-	xdr_des_mode;
-	xdr_desargs;
-	xdr_desresp;
-
-	/* From yp_xdr.c (generated by rpcgen - include/rpcsvc/yp.x) */
-	xdr_domainname;
-	xdr_keydat;
-	xdr_mapname;
-	xdr_peername;
-	xdr_valdat;
-	xdr_ypbind_binding;
-	xdr_ypbind_resp;
-	xdr_ypbind_resptype;
-	xdr_ypbind_setdom;
-	xdr_ypmap_parms;
-	xdr_ypmaplist;
-	xdr_yppush_status;
-	xdr_yppushresp_xfr;
-	xdr_ypreq_key;
-	xdr_ypreq_nokey;
-	xdr_ypreq_xfr;
-	xdr_ypreqtype;
-	xdr_yprequest;
-	xdr_ypresp_all;
-	xdr_ypresp_key_val;
-	xdr_ypresp_maplist;
-	xdr_ypresp_master;
-	xdr_ypresp_order;
-	xdr_ypresp_val;
-	xdr_ypresp_xfr;
-	xdr_ypresponse;
-	xdr_ypresptype;
-	xdr_ypstat;
-	xdr_ypxfrstat;
-
-	authdes_seccreate;
-	authdes_pk_seccreate;
-	authnone_create;
-	authunix_create;
-	authunix_create_default;
-	xdr_authdes_cred;
-	xdr_authdes_verf;
-	xdr_authunix_parms;
-	bindresvport;
-	bindresvport_sa;
-	rpc_broadcast_exp;
-	rpc_broadcast;
-	clnt_dg_create;
-	clnt_create_vers;
-	clnt_create_vers_timed;
-	clnt_create;
-	clnt_create_timed;
-	clnt_tp_create;
-	clnt_tp_create_timed;
-	clnt_tli_create;
-	clnt_sperror;
-	clnt_perror;
-	clnt_sperrno;
-	clnt_perrno;
-	clnt_spcreateerror;
-	clnt_pcreateerror;
-	clnt_raw_create;
-	rpc_call;
-	clnt_vc_create;
-	cbc_crypt;
-	ecb_crypt;
-	des_setparity;
-	setnetconfig;
-	getnetconfig;
-	endnetconfig;
-	getnetconfigent;
-	freenetconfigent;
-	nc_sperror;
-	nc_perror;
-	setnetpath;
-	getnetpath;
-	endnetpath;
-	getpublicandprivatekey;
-	getpublickey;
-	getrpcbynumber;
-	getrpcbyname;
-	setrpcent;
-	endrpcent;
-	getrpcent;
-	getrpcport;
-	key_setsecret;
-	key_secretkey_is_set;
-	key_encryptsession_pk;
-	key_decryptsession_pk;
-	key_encryptsession;
-	key_decryptsession;
-	key_gendes;
-	key_setnet;
-	key_get_conv;
-	xdr_keystatus;
-	xdr_keybuf;
-	xdr_netnamestr;
-	xdr_cryptkeyarg;
-	xdr_cryptkeyarg2;
-	xdr_cryptkeyres;
-	xdr_unixcred;
-	xdr_getcredres;
-	xdr_key_netstarg;
-	xdr_key_netstres;
-	rpc_createerr;
-	__rpc_createerr;
-	getnetname;
-	user2netname;
-	host2netname;
-	netname2user;
-	netname2host;
-	pmap_set;
-	pmap_unset;
-	pmap_getmaps;
-	pmap_getport;
-	xdr_pmap;
-	xdr_pmaplist;
-	xdr_pmaplist_ptr;
-	pmap_rmtcall;
-	xdr_rmtcall_args;
-	xdr_rmtcallres;
-	xdr_callmsg;
-	_null_auth;
-	svc_fdset;
-	svc_maxfd;
-	_rpc_dtablesize;
-	__rpc_get_t_size;
-	__rpc_getconfip;
-	__rpc_setconf;
-	__rpc_getconf;
-	__rpc_endconf;
-	rpc_nullproc;
-	__rpc_fd2sockinfo;
-	__rpc_nconf2sockinfo;
-	__rpc_nconf2fd;
-	taddr2uaddr;
-	uaddr2taddr;
-	xdr_opaque_auth;
-	xdr_des_block;
-	xdr_accepted_reply;
-	xdr_rejected_reply;
-	xdr_replymsg;
-	xdr_callhdr;
-	_seterr_reply;
-	clntudp_bufcreate;
-	clntudp_create;
-	clnttcp_create;
-	clntraw_create;
-	svctcp_create;
-	svcudp_bufcreate;
-	svcfd_create;
-	svcudp_create;
-	svcraw_create;
-	get_myaddress;
-	callrpc;
-	registerrpc;
-	clnt_broadcast;
-	authdes_create;
-	clntunix_create;
-	svcunix_create;
-	svcunixfd_create;
-	rpcb_set;
-	rpcb_unset;
-	rpcb_getaddr;
-	rpcb_getmaps;
-	rpcb_rmtcall;
-	rpcb_gettime;
-	rpcb_taddr2uaddr;
-	rpcb_uaddr2taddr;
-	xdr_rpcb;
-	xdr_rpcblist_ptr;
-	xdr_rpcblist;
-	xdr_rpcb_entry;
-	xdr_rpcb_entry_list_ptr;
-	xdr_rpcb_rmtcallargs;
-	xdr_rpcb_rmtcallres;
-	xdr_netbuf;
-	xdr_rpcbs_addrlist;
-	xdr_rpcbs_rmtcalllist;
-	xdr_rpcbs_proc;
-	xdr_rpcbs_addrlist_ptr;
-	xdr_rpcbs_rmtcalllist_ptr;
-	xdr_rpcb_stat;
-	xdr_rpcb_stat_byvers;
-	rtime;
-	xprt_register;
-	xprt_unregister;
-	svc_reg;
-	svc_unreg;
-	svc_register;
-	svc_unregister;
-	svc_sendreply;
-	svcerr_noproc;
-	svcerr_decode;
-	svcerr_systemerr;
-	svcerr_auth;
-	svcerr_weakauth;
-	svcerr_noprog;
-	svcerr_progvers;
-	svc_getreq;
-	svc_getreqset;
-	svc_getreq_common;
-	svc_getreq_poll;
-	rpc_control;
-	_authenticate;
-	_svcauth_null;
-	svc_auth_reg;
-	_svcauth_des;
-	authdes_getucred;
-	_svcauth_unix;
-	_svcauth_short;
-	svc_dg_create;
-	svc_dg_enablecache;
-	svc_create;
-	svc_tp_create;
-	svc_tli_create;
-	__rpc_rawcombuf;
-	svc_raw_create;
-	svc_run;
-	svc_exit;
-	rpc_reg;
-	svc_vc_create;
-	svc_fd_create;
-	__rpc_get_local_uid;
-};
-
-FBSDprivate_1.0 {
-	__des_crypt_LOCAL;
-	__key_encryptsession_pk_LOCAL;
-	__key_decryptsession_pk_LOCAL;
-	__key_gendes_LOCAL;
-	__svc_clean_idle;
-	__rpc_gss_unwrap;
-	__rpc_gss_unwrap_stub;
-	__rpc_gss_wrap;
-	__rpc_gss_wrap_stub;
-};
diff --git a/lib/libc_bsd/rpc/auth_des.c b/lib/libc_bsd/rpc/auth_des.c
deleted file mode 100644
index a8f7955..0000000
--- a/lib/libc_bsd/rpc/auth_des.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1988 by Sun Microsystems, Inc.
- */
-/*
- * auth_des.c, client-side implementation of DES authentication
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <err.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/cdefs.h>
-#include <rpc/des_crypt.h>
-#include <syslog.h>
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/auth_des.h>
-#include <rpc/clnt.h>
-#include <rpc/xdr.h>
-#include <sys/socket.h>
-#undef NIS
-#include <rpcsvc/nis.h>
-#include "un-namespace.h"
-#include "mt_misc.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = 	"@(#)auth_des.c	2.2 88/07/29 4.0 RPCSRC; from 1.9 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/auth_des.c 261046 2014-01-22 23:45:27Z mav $");
-
-#define USEC_PER_SEC		1000000
-#define RTIME_TIMEOUT		5	/* seconds to wait for sync */
-
-#define AUTH_PRIVATE(auth)	(struct ad_private *) auth->ah_private
-#define ALLOC(object_type)	(object_type *) mem_alloc(sizeof(object_type))
-#define FREE(ptr, size)		mem_free((char *)(ptr), (int) size)
-#define ATTEMPT(xdr_op)		if (!(xdr_op)) return (FALSE)
-
-extern bool_t xdr_authdes_cred( XDR *, struct authdes_cred *);
-extern bool_t xdr_authdes_verf( XDR *, struct authdes_verf *);
-extern int key_encryptsession_pk();
-
-extern bool_t __rpc_get_time_offset(struct timeval *, nis_server *, char *,
-	char **, char **);
-
-/* 
- * DES authenticator operations vector
- */
-static void	authdes_nextverf(AUTH *);
-static bool_t	authdes_marshal(AUTH *, XDR *);
-static bool_t	authdes_validate(AUTH *, struct opaque_auth *);
-static bool_t	authdes_refresh(AUTH *, void *);
-static void	authdes_destroy(AUTH *);
-
-static struct auth_ops *authdes_ops(void);
-
-/*
- * This struct is pointed to by the ah_private field of an "AUTH *"
- */
-struct ad_private {
-	char *ad_fullname; 		/* client's full name */
-	u_int ad_fullnamelen;		/* length of name, rounded up */
-	char *ad_servername; 		/* server's full name */
-	u_int ad_servernamelen;		/* length of name, rounded up */
-	u_int ad_window;	  	/* client specified window */
-	bool_t ad_dosync;		/* synchronize? */		
-	struct netbuf ad_syncaddr;	/* remote host to synch with */
-	char *ad_timehost;		/* remote host to synch with */
-	struct timeval ad_timediff;	/* server's time - client's time */
-	u_int ad_nickname;		/* server's nickname for client */
-	struct authdes_cred ad_cred;	/* storage for credential */
-	struct authdes_verf ad_verf;	/* storage for verifier */
-	struct timeval ad_timestamp;	/* timestamp sent */
-	des_block ad_xkey;		/* encrypted conversation key */
-	u_char ad_pkey[1024];		/* Server's actual public key */
-	char *ad_netid;			/* Timehost netid */
-	char *ad_uaddr;			/* Timehost uaddr */
-	nis_server *ad_nis_srvr;	/* NIS+ server struct */
-};
-
-AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *,
-	const des_block *, nis_server *);
-	
-/*
- * documented version of authdes_seccreate
- */
-/*
-	servername:	network name of server
-	win:		time to live
-	timehost:	optional hostname to sync with
-	ckey:		optional conversation key to use
-*/
-
-AUTH *
-authdes_seccreate(const char *servername, const u_int win,
-	const char *timehost, const des_block *ckey)
-{
-	u_char  pkey_data[1024];
-	netobj  pkey;
-	AUTH    *dummy;
-
-	if (! getpublickey(servername, (char *) pkey_data)) {
-		syslog(LOG_ERR,
-		    "authdes_seccreate: no public key found for %s",
-		    servername);
-		return (NULL);
-	}
-
-	pkey.n_bytes = (char *) pkey_data;
-	pkey.n_len = (u_int)strlen((char *)pkey_data) + 1;
-	dummy = authdes_pk_seccreate(servername, &pkey, win, timehost,
-	    ckey, NULL);
-	return (dummy);
-}
-
-/*
- * Slightly modified version of authdessec_create which takes the public key
- * of the server principal as an argument. This spares us a call to
- * getpublickey() which in the nameserver context can cause a deadlock.
- */
-AUTH *
-authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window,
-	const char *timehost, const des_block *ckey, nis_server *srvr)
-{
-	AUTH *auth;
-	struct ad_private *ad;
-	char namebuf[MAXNETNAMELEN+1];
-
-	/*
-	 * Allocate everything now
-	 */
-	auth = ALLOC(AUTH);
-	if (auth == NULL) {
-		syslog(LOG_ERR, "authdes_pk_seccreate: out of memory");
-		return (NULL);
-	}
-	ad = ALLOC(struct ad_private);
-	if (ad == NULL) {
-		syslog(LOG_ERR, "authdes_pk_seccreate: out of memory");
-		goto failed;
-	}
-	ad->ad_fullname = ad->ad_servername = NULL; /* Sanity reasons */
-	ad->ad_timehost = NULL;
-	ad->ad_netid = NULL;
-	ad->ad_uaddr = NULL;
-	ad->ad_nis_srvr = NULL;
-	ad->ad_timediff.tv_sec = 0;
-	ad->ad_timediff.tv_usec = 0;
-	memcpy(ad->ad_pkey, pkey->n_bytes, pkey->n_len);
-	if (!getnetname(namebuf))
-		goto failed;
-	ad->ad_fullnamelen = RNDUP((u_int) strlen(namebuf));
-	ad->ad_fullname = (char *)mem_alloc(ad->ad_fullnamelen + 1);
-	ad->ad_servernamelen = strlen(servername);
-	ad->ad_servername = (char *)mem_alloc(ad->ad_servernamelen + 1);
-
-	if (ad->ad_fullname == NULL || ad->ad_servername == NULL) {
-		syslog(LOG_ERR, "authdes_seccreate: out of memory");
-		goto failed;
-	}
-	if (timehost != NULL) {
-		ad->ad_timehost = (char *)mem_alloc(strlen(timehost) + 1);
-		if (ad->ad_timehost == NULL) {
-			syslog(LOG_ERR, "authdes_seccreate: out of memory");
-			goto failed;
-		}
-		memcpy(ad->ad_timehost, timehost, strlen(timehost) + 1);
-		ad->ad_dosync = TRUE;
-	} else if (srvr != NULL) {
-		ad->ad_nis_srvr = srvr;	/* transient */
-		ad->ad_dosync = TRUE;
-	} else {
-		ad->ad_dosync = FALSE;
-	}
-	memcpy(ad->ad_fullname, namebuf, ad->ad_fullnamelen + 1);
-	memcpy(ad->ad_servername, servername, ad->ad_servernamelen + 1);
-	ad->ad_window = window;
-	if (ckey == NULL) {
-		if (key_gendes(&auth->ah_key) < 0) {
-			syslog(LOG_ERR,
-	    "authdes_seccreate: keyserv(1m) is unable to generate session key");
-			goto failed;
-		}
-	} else {
-		auth->ah_key = *ckey;
-	}
-
-	/*
-	 * Set up auth handle
-	 */
-	auth->ah_cred.oa_flavor = AUTH_DES;
-	auth->ah_verf.oa_flavor = AUTH_DES;
-	auth->ah_ops = authdes_ops();
-	auth->ah_private = (caddr_t)ad;
-
-	if (!authdes_refresh(auth, NULL)) {
-		goto failed;
-	}
-	ad->ad_nis_srvr = NULL; /* not needed any longer */
-	return (auth);
-
-failed:
-	if (auth)
-		FREE(auth, sizeof (AUTH));
-	if (ad) {
-		if (ad->ad_fullname)
-			FREE(ad->ad_fullname, ad->ad_fullnamelen + 1);
-		if (ad->ad_servername)
-			FREE(ad->ad_servername, ad->ad_servernamelen + 1);
-		if (ad->ad_timehost)
-			FREE(ad->ad_timehost, strlen(ad->ad_timehost) + 1);
-		if (ad->ad_netid)
-			FREE(ad->ad_netid, strlen(ad->ad_netid) + 1);
-		if (ad->ad_uaddr)
-			FREE(ad->ad_uaddr, strlen(ad->ad_uaddr) + 1);
-		FREE(ad, sizeof (struct ad_private));
-	}
-	return (NULL);
-}
-
-/*
- * Implement the five authentication operations
- */
-
-
-/*
- * 1. Next Verifier
- */	
-/*ARGSUSED*/
-static void
-authdes_nextverf(AUTH *auth)
-{
-	/* what the heck am I supposed to do??? */
-}
-
-
-/*
- * 2. Marshal
- */
-static bool_t
-authdes_marshal(AUTH *auth, XDR *xdrs)
-{
-/* LINTED pointer alignment */
-	struct ad_private *ad = AUTH_PRIVATE(auth);
-	struct authdes_cred *cred = &ad->ad_cred;
-	struct authdes_verf *verf = &ad->ad_verf;
-	des_block cryptbuf[2];	
-	des_block ivec;
-	int status;
-	int len;
-	rpc_inline_t *ixdr;
-
-	/*
-	 * Figure out the "time", accounting for any time difference
-	 * with the server if necessary.
-	 */
-	(void)gettimeofday(&ad->ad_timestamp, NULL);
-	ad->ad_timestamp.tv_sec += ad->ad_timediff.tv_sec;
-	ad->ad_timestamp.tv_usec += ad->ad_timediff.tv_usec;
-	while (ad->ad_timestamp.tv_usec >= USEC_PER_SEC) {
-		ad->ad_timestamp.tv_usec -= USEC_PER_SEC;
-		ad->ad_timestamp.tv_sec++;
-	}
-
-	/*
-	 * XDR the timestamp and possibly some other things, then
-	 * encrypt them.
-	 */
-	ixdr = (rpc_inline_t *)cryptbuf;
-	IXDR_PUT_INT32(ixdr, ad->ad_timestamp.tv_sec);
-	IXDR_PUT_INT32(ixdr, ad->ad_timestamp.tv_usec);
-	if (ad->ad_cred.adc_namekind == ADN_FULLNAME) {
-		IXDR_PUT_U_INT32(ixdr, ad->ad_window);
-		IXDR_PUT_U_INT32(ixdr, ad->ad_window - 1);
-		ivec.key.high = ivec.key.low = 0;	
-		status = cbc_crypt((char *)&auth->ah_key, (char *)cryptbuf, 
-			(u_int) 2 * sizeof (des_block),
-			DES_ENCRYPT | DES_HW, (char *)&ivec);
-	} else {
-		status = ecb_crypt((char *)&auth->ah_key, (char *)cryptbuf, 
-			(u_int) sizeof (des_block),
-			DES_ENCRYPT | DES_HW);
-	}
-	if (DES_FAILED(status)) {
-		syslog(LOG_ERR, "authdes_marshal: DES encryption failure");
-		return (FALSE);
-	}
-	ad->ad_verf.adv_xtimestamp = cryptbuf[0];
-	if (ad->ad_cred.adc_namekind == ADN_FULLNAME) {
-		ad->ad_cred.adc_fullname.window = cryptbuf[1].key.high;
-		ad->ad_verf.adv_winverf = cryptbuf[1].key.low;
-	} else {
-		ad->ad_cred.adc_nickname = ad->ad_nickname;
-		ad->ad_verf.adv_winverf = 0;
-	}
-
-	/*
-	 * Serialize the credential and verifier into opaque
-	 * authentication data.
-	 */
-	if (ad->ad_cred.adc_namekind == ADN_FULLNAME) {
-		len = ((1 + 1 + 2 + 1)*BYTES_PER_XDR_UNIT + ad->ad_fullnamelen);
-	} else {
-		len = (1 + 1)*BYTES_PER_XDR_UNIT;
-	}
-
-	if ((ixdr = xdr_inline(xdrs, 2*BYTES_PER_XDR_UNIT))) {
-		IXDR_PUT_INT32(ixdr, AUTH_DES);
-		IXDR_PUT_INT32(ixdr, len);
-	} else {
-		ATTEMPT(xdr_putint32(xdrs, (int *)&auth->ah_cred.oa_flavor));
-		ATTEMPT(xdr_putint32(xdrs, &len));
-	}
-	ATTEMPT(xdr_authdes_cred(xdrs, cred));
-
-	len = (2 + 1)*BYTES_PER_XDR_UNIT; 
-	if ((ixdr = xdr_inline(xdrs, 2*BYTES_PER_XDR_UNIT))) {
-		IXDR_PUT_INT32(ixdr, AUTH_DES);
-		IXDR_PUT_INT32(ixdr, len);
-	} else {
-		ATTEMPT(xdr_putint32(xdrs, (int *)&auth->ah_verf.oa_flavor));
-		ATTEMPT(xdr_putint32(xdrs, &len));
-	}
-	ATTEMPT(xdr_authdes_verf(xdrs, verf));
-	return (TRUE);
-}
-
-
-/*
- * 3. Validate
- */
-static bool_t
-authdes_validate(AUTH *auth, struct opaque_auth *rverf)
-{
-/* LINTED pointer alignment */
-	struct ad_private *ad = AUTH_PRIVATE(auth);
-	struct authdes_verf verf;
-	int status;
-	uint32_t *ixdr;
-	des_block buf;
-
-	if (rverf->oa_length != (2 + 1) * BYTES_PER_XDR_UNIT) {
-		return (FALSE);
-	}
-/* LINTED pointer alignment */
-	ixdr = (uint32_t *)rverf->oa_base;
-	buf.key.high = (uint32_t)*ixdr++;
-	buf.key.low = (uint32_t)*ixdr++;
-	verf.adv_int_u = (uint32_t)*ixdr++;
-
-	/*
-	 * Decrypt the timestamp
-	 */
-	status = ecb_crypt((char *)&auth->ah_key, (char *)&buf,
-		(u_int)sizeof (des_block), DES_DECRYPT | DES_HW);
-
-	if (DES_FAILED(status)) {
-		syslog(LOG_ERR, "authdes_validate: DES decryption failure");
-		return (FALSE);
-	}
-
-	/*
-	 * xdr the decrypted timestamp
-	 */
-/* LINTED pointer alignment */
-	ixdr = (uint32_t *)buf.c;
-	verf.adv_timestamp.tv_sec = IXDR_GET_INT32(ixdr) + 1;
-	verf.adv_timestamp.tv_usec = IXDR_GET_INT32(ixdr);
-
-	/*
-	 * validate
-	 */
-	if (bcmp((char *)&ad->ad_timestamp, (char *)&verf.adv_timestamp,
-		 sizeof(struct timeval)) != 0) {
-		syslog(LOG_DEBUG, "authdes_validate: verifier mismatch");
-		return (FALSE);
-	}
-
-	/*
-	 * We have a nickname now, let's use it
-	 */
-	ad->ad_nickname = verf.adv_nickname;
-	ad->ad_cred.adc_namekind = ADN_NICKNAME;
-	return (TRUE);
-}
-
-/*
- * 4. Refresh
- */
-/*ARGSUSED*/
-static bool_t
-authdes_refresh(AUTH *auth, void *dummy)
-{
-/* LINTED pointer alignment */
-	struct ad_private *ad = AUTH_PRIVATE(auth);
-	struct authdes_cred *cred = &ad->ad_cred;
-	int		ok;
-	netobj		pkey;
-
-	if (ad->ad_dosync) {
-                ok = __rpc_get_time_offset(&ad->ad_timediff, ad->ad_nis_srvr,
-		    ad->ad_timehost, &(ad->ad_uaddr),
-		    &(ad->ad_netid));
-		if (! ok) {
-			/*
-			 * Hope the clocks are synced!
-			 */
-			ad->ad_dosync = 0;
-			syslog(LOG_DEBUG,
-			    "authdes_refresh: unable to synchronize clock");
-		 }
-	}
-	ad->ad_xkey = auth->ah_key;
-	pkey.n_bytes = (char *)(ad->ad_pkey);
-	pkey.n_len = (u_int)strlen((char *)ad->ad_pkey) + 1;
-	if (key_encryptsession_pk(ad->ad_servername, &pkey, &ad->ad_xkey) < 0) {
-		syslog(LOG_INFO,
-		    "authdes_refresh: keyserv(1m) is unable to encrypt session key");
-		return (FALSE);
-	}
-	cred->adc_fullname.key = ad->ad_xkey;
-	cred->adc_namekind = ADN_FULLNAME;
-	cred->adc_fullname.name = ad->ad_fullname;
-	return (TRUE);
-}
-
-
-/*
- * 5. Destroy
- */
-static void
-authdes_destroy(AUTH *auth)
-{
-/* LINTED pointer alignment */
-	struct ad_private *ad = AUTH_PRIVATE(auth);
-
-	FREE(ad->ad_fullname, ad->ad_fullnamelen + 1);
-	FREE(ad->ad_servername, ad->ad_servernamelen + 1);
-	if (ad->ad_timehost)
-		FREE(ad->ad_timehost, strlen(ad->ad_timehost) + 1);
-	if (ad->ad_netid)
-		FREE(ad->ad_netid, strlen(ad->ad_netid) + 1);
-	if (ad->ad_uaddr)
-		FREE(ad->ad_uaddr, strlen(ad->ad_uaddr) + 1);
-	FREE(ad, sizeof (struct ad_private));
-	FREE(auth, sizeof(AUTH));
-}
-
-static struct auth_ops *
-authdes_ops(void)
-{
-	static struct auth_ops ops;
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
- 
-	mutex_lock(&authdes_ops_lock);
-	if (ops.ah_nextverf == NULL) {
-		ops.ah_nextverf = authdes_nextverf;
-		ops.ah_marshal = authdes_marshal;
-		ops.ah_validate = authdes_validate;
-		ops.ah_refresh = authdes_refresh;
-		ops.ah_destroy = authdes_destroy;
-        }
-	mutex_unlock(&authdes_ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc_bsd/rpc/auth_none.c b/lib/libc_bsd/rpc/auth_none.c
deleted file mode 100644
index 8237e70..0000000
--- a/lib/libc_bsd/rpc/auth_none.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*	$NetBSD: auth_none.c,v 1.13 2000/01/22 22:19:17 mycroft Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)auth_none.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)auth_none.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/auth_none.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * auth_none.c
- * Creates a client authentication handle for passing "null"
- * credentials and verifiers to remote systems.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include "un-namespace.h"
-#include "mt_misc.h"
-
-#define MAX_MARSHAL_SIZE 20
-
-/*
- * Authenticator operations routines
- */
-
-static bool_t authnone_marshal (AUTH *, XDR *);
-static void authnone_verf (AUTH *);
-static bool_t authnone_validate (AUTH *, struct opaque_auth *);
-static bool_t authnone_refresh (AUTH *, void *);
-static void authnone_destroy (AUTH *);
-
-extern bool_t xdr_opaque_auth();
-
-static struct auth_ops *authnone_ops();
-
-static struct authnone_private {
-	AUTH	no_client;
-	char	marshalled_client[MAX_MARSHAL_SIZE];
-	u_int	mcnt;
-} *authnone_private;
-
-AUTH *
-authnone_create()
-{
-	struct authnone_private *ap = authnone_private;
-	XDR xdr_stream;
-	XDR *xdrs;
-
-	mutex_lock(&authnone_lock);
-	if (ap == 0) {
-		ap = (struct authnone_private *)calloc(1, sizeof (*ap));
-		if (ap == 0) {
-			mutex_unlock(&authnone_lock);
-			return (0);
-		}
-		authnone_private = ap;
-	}
-	if (!ap->mcnt) {
-		ap->no_client.ah_cred = ap->no_client.ah_verf = _null_auth;
-		ap->no_client.ah_ops = authnone_ops();
-		xdrs = &xdr_stream;
-		xdrmem_create(xdrs, ap->marshalled_client,
-		    (u_int)MAX_MARSHAL_SIZE, XDR_ENCODE);
-		(void)xdr_opaque_auth(xdrs, &ap->no_client.ah_cred);
-		(void)xdr_opaque_auth(xdrs, &ap->no_client.ah_verf);
-		ap->mcnt = XDR_GETPOS(xdrs);
-		XDR_DESTROY(xdrs);
-	}
-	mutex_unlock(&authnone_lock);
-	return (&ap->no_client);
-}
-
-/*ARGSUSED*/
-static bool_t
-authnone_marshal(AUTH *client, XDR *xdrs)
-{
-	struct authnone_private *ap;
-	bool_t dummy;
-
-	assert(xdrs != NULL);
-
-	ap = authnone_private;
-	if (ap == NULL) {
-		mutex_unlock(&authnone_lock);
-		return (FALSE);
-	}
-	dummy = (*xdrs->x_ops->x_putbytes)(xdrs,
-	    ap->marshalled_client, ap->mcnt);
-	mutex_unlock(&authnone_lock);
-	return (dummy);
-}
-
-/* All these unused parameters are required to keep ANSI-C from grumbling */
-/*ARGSUSED*/
-static void
-authnone_verf(AUTH *client)
-{
-}
-
-/*ARGSUSED*/
-static bool_t
-authnone_validate(AUTH *client, struct opaque_auth *opaque)
-{
-
-	return (TRUE);
-}
-
-/*ARGSUSED*/
-static bool_t
-authnone_refresh(AUTH *client, void *dummy)
-{
-
-	return (FALSE);
-}
-
-/*ARGSUSED*/
-static void
-authnone_destroy(AUTH *client)
-{
-}
-
-static struct auth_ops *
-authnone_ops()
-{
-	static struct auth_ops ops;
- 
-/* VARIABLES PROTECTED BY ops_lock: ops */
- 
-	mutex_lock(&ops_lock);
-	if (ops.ah_nextverf == NULL) {
-		ops.ah_nextverf = authnone_verf;
-		ops.ah_marshal = authnone_marshal;
-		ops.ah_validate = authnone_validate;
-		ops.ah_refresh = authnone_refresh;
-		ops.ah_destroy = authnone_destroy;
-	}
-	mutex_unlock(&ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc_bsd/rpc/auth_time.c b/lib/libc_bsd/rpc/auth_time.c
deleted file mode 100644
index e618ee3..0000000
--- a/lib/libc_bsd/rpc/auth_time.c
+++ /dev/null
@@ -1,507 +0,0 @@
-/* #pragma ident	"@(#)auth_time.c	1.4	92/11/10 SMI" */
-
-/*
- *	auth_time.c
- *
- * This module contains the private function __rpc_get_time_offset()
- * which will return the difference in seconds between the local system's
- * notion of time and a remote server's notion of time. This must be
- * possible without calling any functions that may invoke the name
- * service. (netdir_getbyxxx, getXbyY, etc). The function is used in the
- * synchronize call of the authdes code to synchronize clocks between
- * NIS+ clients and their servers.
- *
- * Note to minimize the amount of duplicate code, portions of the
- * synchronize() function were folded into this code, and the synchronize
- * call becomes simply a wrapper around this function. Further, if this
- * function is called with a timehost it *DOES* recurse to the name
- * server so don't use it in that mode if you are doing name service code.
- *
- *	Copyright (c) 1992 Sun Microsystems Inc.
- *	All rights reserved.
- *
- * Side effects :
- *	When called a client handle to a RPCBIND process is created
- *	and destroyed. Two strings "netid" and "uaddr" are malloc'd
- *	and returned. The SIGALRM processing is modified only if
- *	needed to deal with TCP connections.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/auth_time.c 172259 2007-09-20 22:35:24Z matteo $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <sys/signal.h>
-#include <sys/errno.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <rpc/rpc.h>
-#include <rpc/rpc_com.h>
-#include <rpc/rpcb_prot.h>
-#undef NIS
-#include <rpcsvc/nis.h>
-#include "un-namespace.h"
-
-extern int _rpc_dtablesize( void );
-
-#ifdef TESTING
-#define	msg(x)	printf("ERROR: %s\n", x)
-/* #define msg(x) syslog(LOG_ERR, "%s", x) */
-#else
-#define	msg(x)
-#endif
-
-static int saw_alarm = 0;
-
-static void
-alarm_hndler(s)
-	int	s;
-{
-	saw_alarm = 1;
-	return;
-}
-
-/*
- * The internet time server defines the epoch to be Jan 1, 1900
- * whereas UNIX defines it to be Jan 1, 1970. To adjust the result
- * from internet time-service time, into UNIX time we subtract the
- * following offset :
- */
-#define	NYEARS	(1970 - 1900)
-#define	TOFFSET ((u_long)60*60*24*(365*NYEARS + (NYEARS/4)))
-
-
-/*
- * Stolen from rpc.nisd:
- * Turn a 'universal address' into a struct sockaddr_in.
- * Bletch.
- */
-static int uaddr_to_sockaddr(uaddr, sin)
-#ifdef foo
-	endpoint		*endpt;
-#endif
-	char			*uaddr;
-	struct sockaddr_in	*sin;
-{
-	unsigned char		p_bytes[2];
-	int			i;
-	unsigned long		a[6];
-
-	i = sscanf(uaddr, "%lu.%lu.%lu.%lu.%lu.%lu", &a[0], &a[1], &a[2],
-						&a[3], &a[4], &a[5]);
-
-	if (i < 6)
-		return(1);
-
-	for (i = 0; i < 4; i++)
-		sin->sin_addr.s_addr |= (a[i] & 0x000000FF) << (8 * i);
-
-	p_bytes[0] = (unsigned char)a[4] & 0x000000FF;
-	p_bytes[1] = (unsigned char)a[5] & 0x000000FF;
-
-	sin->sin_family = AF_INET; /* always */
-	bcopy((char *)&p_bytes, (char *)&sin->sin_port, 2);
-
-	return (0);
-}
-
-/*
- * free_eps()
- *
- * Free the strings that were strduped into the eps structure.
- */
-static void
-free_eps(eps, num)
-	endpoint	eps[];
-	int		num;
-{
-	int		i;
-
-	for (i = 0; i < num; i++) {
-		free(eps[i].uaddr);
-		free(eps[i].proto);
-		free(eps[i].family);
-	}
-	return;
-}
-
-/*
- * get_server()
- *
- * This function constructs a nis_server structure description for the
- * indicated hostname.
- *
- * NOTE: There is a chance we may end up recursing here due to the
- * fact that gethostbyname() could do an NIS search. Ideally, the
- * NIS+ server will call __rpc_get_time_offset() with the nis_server
- * structure already populated.
- */
-static nis_server *
-get_server(sin, host, srv, eps, maxep)
-	struct sockaddr_in *sin;
-	char		*host;	/* name of the time host	*/
-	nis_server	*srv;	/* nis_server struct to use.	*/
-	endpoint	eps[];	/* array of endpoints		*/
-	int		maxep;	/* max array size		*/
-{
-	char			hname[256];
-	int			num_ep = 0, i;
-	struct hostent		*he;
-	struct hostent		dummy;
-	char			*ptr[2];
-	endpoint		*ep;
-
-	if (host == NULL && sin == NULL)
-		return (NULL);
-
-	if (sin == NULL) {
-		he = gethostbyname(host);
-		if (he == NULL)
-			return(NULL);
-	} else {
-		he = &dummy;
-		ptr[0] = (char *)&sin->sin_addr.s_addr;
-		ptr[1] = NULL;
-		dummy.h_addr_list = ptr;
-	}
-
-	/*
-	 * This is lame. We go around once for TCP, then again
-	 * for UDP.
-	 */
-	for (i = 0, ep = eps; (he->h_addr_list[i] != NULL) && (num_ep < maxep);
-	    i++, ep++, num_ep++) {
-		struct in_addr *a;
-
-		a = (struct in_addr *)he->h_addr_list[i];
-		snprintf(hname, sizeof(hname), "%s.0.111", inet_ntoa(*a));
-		ep->uaddr = strdup(hname);
-		ep->family = strdup("inet");
-		ep->proto =  strdup("tcp");
-		if (ep->uaddr == NULL || ep->family == NULL || ep->proto == NULL) {
-			free_eps(eps, num_ep + 1);
-			return (NULL);
-		}
-	}
-
-	for (i = 0; (he->h_addr_list[i] != NULL) && (num_ep < maxep);
-	    i++, ep++, num_ep++) {
-		struct in_addr *a;
-
-		a = (struct in_addr *)he->h_addr_list[i];
-		snprintf(hname, sizeof(hname), "%s.0.111", inet_ntoa(*a));
-		ep->uaddr = strdup(hname);
-		ep->family = strdup("inet");
-		ep->proto =  strdup("udp");
-		if (ep->uaddr == NULL || ep->family == NULL || ep->proto == NULL) {
-			free_eps(eps, num_ep + 1);
-			return (NULL);
-		}
-	}
-
-	srv->name = (nis_name) host;
-	srv->ep.ep_len = num_ep;
-	srv->ep.ep_val = eps;
-	srv->key_type = NIS_PK_NONE;
-	srv->pkey.n_bytes = NULL;
-	srv->pkey.n_len = 0;
-	return (srv);
-}
-
-/*
- * __rpc_get_time_offset()
- *
- * This function uses a nis_server structure to contact the a remote
- * machine (as named in that structure) and returns the offset in time
- * between that machine and this one. This offset is returned in seconds
- * and may be positive or negative.
- *
- * The first time through, a lot of fiddling is done with the netconfig
- * stuff to find a suitable transport. The function is very aggressive
- * about choosing UDP or at worst TCP if it can. This is because
- * those transports support both the RCPBIND call and the internet
- * time service.
- *
- * Once through, *uaddr is set to the universal address of
- * the machine and *netid is set to the local netid for the transport
- * that uaddr goes with. On the second call, the netconfig stuff
- * is skipped and the uaddr/netid pair are used to fetch the netconfig
- * structure and to then contact the machine for the time.
- *
- * td = "server" - "client"
- */
-int
-__rpc_get_time_offset(td, srv, thost, uaddr, netid)
-	struct timeval	*td;	 /* Time difference			*/
-	nis_server	*srv;	 /* NIS Server description 		*/
-	char		*thost;	 /* if no server, this is the timehost	*/
-	char		**uaddr; /* known universal address		*/
-	struct sockaddr_in *netid; /* known network identifier		*/
-{
-	CLIENT			*clnt; 		/* Client handle 	*/
-	endpoint		*ep,		/* useful endpoints	*/
-				*useep = NULL;	/* endpoint of xp	*/
-	char			*useua = NULL;	/* uaddr of selected xp	*/
-	int			epl, i;		/* counters		*/
-	enum clnt_stat		status;		/* result of clnt_call	*/
-	u_long			thetime, delta;
-	int			needfree = 0;
-	struct timeval		tv;
-	int			time_valid;
-	int			udp_ep = -1, tcp_ep = -1;
-	int			a1, a2, a3, a4;
-	char			ut[64], ipuaddr[64];
-	endpoint		teps[32];
-	nis_server		tsrv;
-	void			(*oldsig)() = NULL; /* old alarm handler */
-	struct sockaddr_in	sin;
-	socklen_t		len;
-	int			s = RPC_ANYSOCK;
-	int			type = 0;
-
-	td->tv_sec = 0;
-	td->tv_usec = 0;
-
-	/*
-	 * First check to see if we need to find and address for this
-	 * server.
-	 */
-	if (*uaddr == NULL) {
-		if ((srv != NULL) && (thost != NULL)) {
-			msg("both timehost and srv pointer used!");
-			return (0);
-		}
-		if (! srv) {
-			srv = get_server(netid, thost, &tsrv, teps, 32);
-			if (srv == NULL) {
-				msg("unable to contruct server data.");
-				return (0);
-			}
-			needfree = 1;	/* need to free data in endpoints */
-		}
-
-		ep = srv->ep.ep_val;
-		epl = srv->ep.ep_len;
-
-		/* Identify the TCP and UDP endpoints */
-		for (i = 0;
-			(i < epl) && ((udp_ep == -1) || (tcp_ep == -1)); i++) {
-			if (strcasecmp(ep[i].proto, "udp") == 0)
-				udp_ep = i;
-			if (strcasecmp(ep[i].proto, "tcp") == 0)
-				tcp_ep = i;
-		}
-
-		/* Check to see if it is UDP or TCP */
-		if (tcp_ep > -1) {
-			useep = &ep[tcp_ep];
-			useua = ep[tcp_ep].uaddr;
-			type = SOCK_STREAM;
-		} else if (udp_ep > -1) {
-			useep = &ep[udp_ep];
-			useua = ep[udp_ep].uaddr;
-			type = SOCK_DGRAM;
-		}
-
-		if (useep == NULL) {
-			msg("no acceptable transport endpoints.");
-			if (needfree)
-				free_eps(teps, tsrv.ep.ep_len);
-			return (0);
-		}
-	}
-
-	/*
-	 * Create a sockaddr from the uaddr.
-	 */
-	if (*uaddr != NULL)
-		useua = *uaddr;
-
-	/* Fixup test for NIS+ */
-	sscanf(useua, "%d.%d.%d.%d.", &a1, &a2, &a3, &a4);
-	sprintf(ipuaddr, "%d.%d.%d.%d.0.111", a1, a2, a3, a4);
-	useua = &ipuaddr[0];
-
-	bzero((char *)&sin, sizeof(sin));
-	if (uaddr_to_sockaddr(useua, &sin)) {
-		msg("unable to translate uaddr to sockaddr.");
-		if (needfree)
-			free_eps(teps, tsrv.ep.ep_len);
-		return (0);
-	}
-
-	/*
-	 * Create the client handle to rpcbind. Note we always try
-	 * version 3 since that is the earliest version that supports
-	 * the RPCB_GETTIME call. Also it is the version that comes
-	 * standard with SVR4. Since most everyone supports TCP/IP
-	 * we could consider trying the rtime call first.
-	 */
-	clnt = clnttcp_create(&sin, RPCBPROG, RPCBVERS, &s, 0, 0);
-	if (clnt == NULL) {
-		msg("unable to create client handle to rpcbind.");
-		if (needfree)
-			free_eps(teps, tsrv.ep.ep_len);
-		return (0);
-	}
-
-	tv.tv_sec = 5;
-	tv.tv_usec = 0;
-	time_valid = 0;
-	status = clnt_call(clnt, RPCBPROC_GETTIME, (xdrproc_t)xdr_void, NULL,
-					(xdrproc_t)xdr_u_long, &thetime, tv);
-	/*
-	 * The only error we check for is anything but success. In
-	 * fact we could have seen PROGMISMATCH if talking to a 4.1
-	 * machine (pmap v2) or TIMEDOUT if the net was busy.
-	 */
-	if (status == RPC_SUCCESS)
-		time_valid = 1;
-	else {
-		int save;
-
-		/* Blow away possible stale CLNT handle. */
-		if (clnt != NULL) {
-			clnt_destroy(clnt);
-			clnt = NULL;
-		}
-
-		/*
-		 * Convert PMAP address into timeservice address
-		 * We take advantage of the fact that we "know" what
-		 * the universal address looks like for inet transports.
-		 *
-		 * We also know that the internet timeservice is always
-		 * listening on port 37.
-		 */
-		sscanf(useua, "%d.%d.%d.%d.", &a1, &a2, &a3, &a4);
-		sprintf(ut, "%d.%d.%d.%d.0.37", a1, a2, a3, a4);
-
-		if (uaddr_to_sockaddr(ut, &sin)) {
-			msg("cannot convert timeservice uaddr to sockaddr.");
-			goto error;
-		}
-
-		s = _socket(AF_INET, type, 0);
-		if (s == -1) {
-			msg("unable to open fd to network.");
-			goto error;
-		}
-
-		/*
-		 * Now depending on whether or not we're talking to
-		 * UDP we set a timeout or not.
-		 */
-		if (type == SOCK_DGRAM) {
-			struct timeval timeout = { 20, 0 };
-			struct sockaddr_in from;
-			fd_set readfds;
-			int res;
-
-			if (_sendto(s, &thetime, sizeof(thetime), 0,
-				(struct sockaddr *)&sin, sizeof(sin)) == -1) {
-				msg("udp : sendto failed.");
-				goto error;
-			}
-			do {
-				FD_ZERO(&readfds);
-				FD_SET(s, &readfds);
-				res = _select(_rpc_dtablesize(), &readfds,
-				     (fd_set *)NULL, (fd_set *)NULL, &timeout);
-			} while (res < 0 && errno == EINTR);
-			if (res <= 0)
-				goto error;
-			len = sizeof(from);
-			res = _recvfrom(s, (char *)&thetime, sizeof(thetime), 0,
-				       (struct sockaddr *)&from, &len);
-			if (res == -1) {
-				msg("recvfrom failed on udp transport.");
-				goto error;
-			}
-			time_valid = 1;
-		} else {
-			int res;
-
-			oldsig = (void (*)())signal(SIGALRM, alarm_hndler);
-			saw_alarm = 0; /* global tracking the alarm */
-			alarm(20); /* only wait 20 seconds */
-			res = _connect(s, (struct sockaddr *)&sin, sizeof(sin));
-			if (res == -1) {
-				msg("failed to connect to tcp endpoint.");
-				goto error;
-			}
-			if (saw_alarm) {
-				msg("alarm caught it, must be unreachable.");
-				goto error;
-			}
-			res = _read(s, (char *)&thetime, sizeof(thetime));
-			if (res != sizeof(thetime)) {
-				if (saw_alarm)
-					msg("timed out TCP call.");
-				else
-					msg("wrong size of results returned");
-
-				goto error;
-			}
-			time_valid = 1;
-		}
-		save = errno;
-		(void)_close(s);
-		errno = save;
-		s = RPC_ANYSOCK;
-
-		if (time_valid) {
-			thetime = ntohl(thetime);
-			thetime = thetime - TOFFSET; /* adjust to UNIX time */
-		} else
-			thetime = 0;
-	}
-
-	gettimeofday(&tv, 0);
-
-error:
-	/*
-	 * clean up our allocated data structures.
-	 */
-
-	if (s != RPC_ANYSOCK)
-		(void)_close(s);
-
-	if (clnt != NULL)
-		clnt_destroy(clnt);
-
-	alarm(0);	/* reset that alarm if its outstanding */
-	if (oldsig) {
-		signal(SIGALRM, oldsig);
-	}
-
-	/*
-	 * note, don't free uaddr strings until after we've made a
-	 * copy of them.
-	 */
-	if (time_valid) {
-		if (*uaddr == NULL)
-			*uaddr = strdup(useua);
-
-		/* Round to the nearest second */
-		tv.tv_sec += (tv.tv_sec > 500000) ? 1 : 0;
-		delta = (thetime > tv.tv_sec) ? thetime - tv.tv_sec :
-						tv.tv_sec - thetime;
-		td->tv_sec = (thetime < tv.tv_sec) ? - delta : delta;
-		td->tv_usec = 0;
-	} else {
-		msg("unable to get the server's time.");
-	}
-
-	if (needfree)
-		free_eps(teps, tsrv.ep.ep_len);
-
-	return (time_valid);
-}
diff --git a/lib/libc_bsd/rpc/auth_unix.c b/lib/libc_bsd/rpc/auth_unix.c
deleted file mode 100644
index d6e0012..0000000
--- a/lib/libc_bsd/rpc/auth_unix.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/*	$NetBSD: auth_unix.c,v 1.18 2000/07/06 03:03:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)auth_unix.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)auth_unix.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/auth_unix.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * auth_unix.c, Implements UNIX style authentication parameters.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * The system is very weak.  The client uses no encryption for it's
- * credentials and only sends null verifiers.  The server sends backs
- * null verifiers or optionally a verifier that suggests a new short hand
- * for the credentials.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
-#include "un-namespace.h"
-#include "mt_misc.h"
-
-/* auth_unix.c */
-static void authunix_nextverf (AUTH *);
-static bool_t authunix_marshal (AUTH *, XDR *);
-static bool_t authunix_validate (AUTH *, struct opaque_auth *);
-static bool_t authunix_refresh (AUTH *, void *);
-static void authunix_destroy (AUTH *);
-static void marshal_new_auth (AUTH *);
-static struct auth_ops *authunix_ops (void);
-
-/*
- * This struct is pointed to by the ah_private field of an auth_handle.
- */
-struct audata {
-	struct opaque_auth	au_origcred;	/* original credentials */
-	struct opaque_auth	au_shcred;	/* short hand cred */
-	u_long			au_shfaults;	/* short hand cache faults */
-	char			au_marshed[MAX_AUTH_BYTES];
-	u_int			au_mpos;	/* xdr pos at end of marshed */
-};
-#define	AUTH_PRIVATE(auth)	((struct audata *)auth->ah_private)
-
-/*
- * Create a unix style authenticator.
- * Returns an auth handle with the given stuff in it.
- */
-AUTH *
-authunix_create(machname, uid, gid, len, aup_gids)
-	char *machname;
-	u_int uid;
-	u_int gid;
-	int len;
-	u_int *aup_gids;
-{
-	struct authunix_parms aup;
-	char mymem[MAX_AUTH_BYTES];
-	struct timeval now;
-	XDR xdrs;
-	AUTH *auth;
-	struct audata *au;
-
-	/*
-	 * Allocate and set up auth handle
-	 */
-	au = NULL;
-	auth = mem_alloc(sizeof(*auth));
-#ifndef _KERNEL
-	if (auth == NULL) {
-		warnx("authunix_create: out of memory");
-		goto cleanup_authunix_create;
-	}
-#endif
-	au = mem_alloc(sizeof(*au));
-#ifndef _KERNEL
-	if (au == NULL) {
-		warnx("authunix_create: out of memory");
-		goto cleanup_authunix_create;
-	}
-#endif
-	auth->ah_ops = authunix_ops();
-	auth->ah_private = (caddr_t)au;
-	auth->ah_verf = au->au_shcred = _null_auth;
-	au->au_shfaults = 0;
-	au->au_origcred.oa_base = NULL;
-
-	/*
-	 * fill in param struct from the given params
-	 */
-	(void)gettimeofday(&now, NULL);
-	aup.aup_time = now.tv_sec;
-	aup.aup_machname = machname;
-	aup.aup_uid = uid;
-	aup.aup_gid = gid;
-	aup.aup_len = (u_int)len;
-	aup.aup_gids = aup_gids;
-
-	/*
-	 * Serialize the parameters into origcred
-	 */
-	xdrmem_create(&xdrs, mymem, MAX_AUTH_BYTES, XDR_ENCODE);
-	if (! xdr_authunix_parms(&xdrs, &aup)) 
-		abort();
-	au->au_origcred.oa_length = len = XDR_GETPOS(&xdrs);
-	au->au_origcred.oa_flavor = AUTH_UNIX;
-#ifdef _KERNEL
-	au->au_origcred.oa_base = mem_alloc((u_int) len);
-#else
-	if ((au->au_origcred.oa_base = mem_alloc((u_int) len)) == NULL) {
-		warnx("authunix_create: out of memory");
-		goto cleanup_authunix_create;
-	}
-#endif
-	memmove(au->au_origcred.oa_base, mymem, (size_t)len);
-
-	/*
-	 * set auth handle to reflect new cred.
-	 */
-	auth->ah_cred = au->au_origcred;
-	marshal_new_auth(auth);
-	return (auth);
-#ifndef _KERNEL
- cleanup_authunix_create:
-	if (auth)
-		mem_free(auth, sizeof(*auth));
-	if (au) {
-		if (au->au_origcred.oa_base)
-			mem_free(au->au_origcred.oa_base, (u_int)len);
-		mem_free(au, sizeof(*au));
-	}
-	return (NULL);
-#endif
-}
-
-/*
- * Returns an auth handle with parameters determined by doing lots of
- * syscalls.
- */
-AUTH *
-authunix_create_default()
-{
-	AUTH *auth;
-	int ngids;
-	long ngids_max;
-	char machname[MAXHOSTNAMELEN + 1];
-	uid_t uid;
-	gid_t gid;
-	gid_t *gids;
-
-	ngids_max = sysconf(_SC_NGROUPS_MAX) + 1;
-	gids = malloc(sizeof(gid_t) * ngids_max);
-	if (gids == NULL)
-		return (NULL);
-
-	if (gethostname(machname, sizeof machname) == -1)
-		abort();
-	machname[sizeof(machname) - 1] = 0;
-	uid = geteuid();
-	gid = getegid();
-	if ((ngids = getgroups(ngids_max, gids)) < 0)
-		abort();
-	if (ngids > NGRPS)
-		ngids = NGRPS;
-	/* XXX: interface problem; we should translate from uid_t and gid_t */
-	auth = authunix_create(machname, uid, gid, ngids, gids);
-	free(gids);
-	return (auth);
-}
-
-/*
- * authunix operations
- */
-
-/* ARGSUSED */
-static void
-authunix_nextverf(auth)
-	AUTH *auth;
-{
-	/* no action necessary */
-}
-
-static bool_t
-authunix_marshal(auth, xdrs)
-	AUTH *auth;
-	XDR *xdrs;
-{
-	struct audata *au;
-
-	assert(auth != NULL);
-	assert(xdrs != NULL);
-
-	au = AUTH_PRIVATE(auth);
-	return (XDR_PUTBYTES(xdrs, au->au_marshed, au->au_mpos));
-}
-
-static bool_t
-authunix_validate(auth, verf)
-	AUTH *auth;
-	struct opaque_auth *verf;
-{
-	struct audata *au;
-	XDR xdrs;
-
-	assert(auth != NULL);
-	assert(verf != NULL);
-
-	if (verf->oa_flavor == AUTH_SHORT) {
-		au = AUTH_PRIVATE(auth);
-		xdrmem_create(&xdrs, verf->oa_base, verf->oa_length,
-		    XDR_DECODE);
-
-		if (au->au_shcred.oa_base != NULL) {
-			mem_free(au->au_shcred.oa_base,
-			    au->au_shcred.oa_length);
-			au->au_shcred.oa_base = NULL;
-		}
-		if (xdr_opaque_auth(&xdrs, &au->au_shcred)) {
-			auth->ah_cred = au->au_shcred;
-		} else {
-			xdrs.x_op = XDR_FREE;
-			(void)xdr_opaque_auth(&xdrs, &au->au_shcred);
-			au->au_shcred.oa_base = NULL;
-			auth->ah_cred = au->au_origcred;
-		}
-		marshal_new_auth(auth);
-	}
-	return (TRUE);
-}
-
-static bool_t
-authunix_refresh(AUTH *auth, void *dummy)
-{
-	struct audata *au = AUTH_PRIVATE(auth);
-	struct authunix_parms aup;
-	struct timeval now;
-	XDR xdrs;
-	int stat;
-
-	assert(auth != NULL);
-
-	if (auth->ah_cred.oa_base == au->au_origcred.oa_base) {
-		/* there is no hope.  Punt */
-		return (FALSE);
-	}
-	au->au_shfaults ++;
-
-	/* first deserialize the creds back into a struct authunix_parms */
-	aup.aup_machname = NULL;
-	aup.aup_gids = NULL;
-	xdrmem_create(&xdrs, au->au_origcred.oa_base,
-	    au->au_origcred.oa_length, XDR_DECODE);
-	stat = xdr_authunix_parms(&xdrs, &aup);
-	if (! stat)
-		goto done;
-
-	/* update the time and serialize in place */
-	(void)gettimeofday(&now, NULL);
-	aup.aup_time = now.tv_sec;
-	xdrs.x_op = XDR_ENCODE;
-	XDR_SETPOS(&xdrs, 0);
-	stat = xdr_authunix_parms(&xdrs, &aup);
-	if (! stat)
-		goto done;
-	auth->ah_cred = au->au_origcred;
-	marshal_new_auth(auth);
-done:
-	/* free the struct authunix_parms created by deserializing */
-	xdrs.x_op = XDR_FREE;
-	(void)xdr_authunix_parms(&xdrs, &aup);
-	XDR_DESTROY(&xdrs);
-	return (stat);
-}
-
-static void
-authunix_destroy(auth)
-	AUTH *auth;
-{
-	struct audata *au;
-
-	assert(auth != NULL);
-
-	au = AUTH_PRIVATE(auth);
-	mem_free(au->au_origcred.oa_base, au->au_origcred.oa_length);
-
-	if (au->au_shcred.oa_base != NULL)
-		mem_free(au->au_shcred.oa_base, au->au_shcred.oa_length);
-
-	mem_free(auth->ah_private, sizeof(struct audata));
-
-	if (auth->ah_verf.oa_base != NULL)
-		mem_free(auth->ah_verf.oa_base, auth->ah_verf.oa_length);
-
-	mem_free(auth, sizeof(*auth));
-}
-
-/*
- * Marshals (pre-serializes) an auth struct.
- * sets private data, au_marshed and au_mpos
- */
-static void
-marshal_new_auth(auth)
-	AUTH *auth;
-{
-	XDR	xdr_stream;
-	XDR	*xdrs = &xdr_stream;
-	struct audata *au;
-
-	assert(auth != NULL);
-
-	au = AUTH_PRIVATE(auth);
-	xdrmem_create(xdrs, au->au_marshed, MAX_AUTH_BYTES, XDR_ENCODE);
-	if ((! xdr_opaque_auth(xdrs, &(auth->ah_cred))) ||
-	    (! xdr_opaque_auth(xdrs, &(auth->ah_verf))))
-		warnx("auth_none.c - Fatal marshalling problem");
-	else
-		au->au_mpos = XDR_GETPOS(xdrs);
-	XDR_DESTROY(xdrs);
-}
-
-static struct auth_ops *
-authunix_ops()
-{
-	static struct auth_ops ops;
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.ah_nextverf == NULL) {
-		ops.ah_nextverf = authunix_nextverf;
-		ops.ah_marshal = authunix_marshal;
-		ops.ah_validate = authunix_validate;
-		ops.ah_refresh = authunix_refresh;
-		ops.ah_destroy = authunix_destroy;
-	}
-	mutex_unlock(&ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc_bsd/rpc/authdes_prot.c b/lib/libc_bsd/rpc/authdes_prot.c
deleted file mode 100644
index 31f9d36..0000000
--- a/lib/libc_bsd/rpc/authdes_prot.c
+++ /dev/null
@@ -1,93 +0,0 @@
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = 	"@(#)authdes_prot.c	2.1 88/07/29 4.0 RPCSRC; from 1.6 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/authdes_prot.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-/*
- * authdes_prot.c, XDR routines for DES authentication
- */
-
-#include "namespace.h"
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_des.h>
-#include "un-namespace.h"
-
-#define ATTEMPT(xdr_op) if (!(xdr_op)) return (FALSE)
-
-bool_t
-xdr_authdes_cred(xdrs, cred)
-	XDR *xdrs;
-	struct authdes_cred *cred;
-{
-	enum authdes_namekind *padc_namekind = &cred->adc_namekind;
-	/*
-	 * Unrolled xdr
-	 */
-	ATTEMPT(xdr_enum(xdrs, (enum_t *) padc_namekind));
-	switch (cred->adc_namekind) {
-	case ADN_FULLNAME:
-		ATTEMPT(xdr_string(xdrs, &cred->adc_fullname.name,
-		    MAXNETNAMELEN));
-		ATTEMPT(xdr_opaque(xdrs, (caddr_t)&cred->adc_fullname.key,
-		    sizeof(des_block)));
-		ATTEMPT(xdr_opaque(xdrs, (caddr_t)&cred->adc_fullname.window,
-		    sizeof(cred->adc_fullname.window)));
-		return (TRUE);
-	case ADN_NICKNAME:
-		ATTEMPT(xdr_opaque(xdrs, (caddr_t)&cred->adc_nickname,
-		    sizeof(cred->adc_nickname)));
-		return (TRUE);
-	default:
-		return (FALSE);
-	}
-}
-
-
-bool_t
-xdr_authdes_verf(xdrs, verf)
-	XDR *xdrs;
-	struct authdes_verf *verf;	
-{
-	/*
- 	 * Unrolled xdr
- 	 */
-	ATTEMPT(xdr_opaque(xdrs, (caddr_t)&verf->adv_xtimestamp,
-	    sizeof(des_block)));
-	ATTEMPT(xdr_opaque(xdrs, (caddr_t)&verf->adv_int_u,
-	    sizeof(verf->adv_int_u)));
-	return (TRUE);
-}
diff --git a/lib/libc_bsd/rpc/authunix_prot.c b/lib/libc_bsd/rpc/authunix_prot.c
deleted file mode 100644
index a062078..0000000
--- a/lib/libc_bsd/rpc/authunix_prot.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*	$NetBSD: authunix_prot.c,v 1.12 2000/01/22 22:19:17 mycroft Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)authunix_prot.c 1.15 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)authunix_prot.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/authunix_prot.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * authunix_prot.c
- * XDR for UNIX style authentication parameters for RPC
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
-#include "un-namespace.h"
-
-/*
- * XDR for unix authentication parameters.
- */
-bool_t
-xdr_authunix_parms(xdrs, p)
-	XDR *xdrs;
-	struct authunix_parms *p;
-{
-	u_int **paup_gids;
-
-	assert(xdrs != NULL);
-	assert(p != NULL);
-
-	paup_gids = &p->aup_gids;
-
-	if (xdr_u_long(xdrs, &(p->aup_time)) &&
-	    xdr_string(xdrs, &(p->aup_machname), MAX_MACHINE_NAME) &&
-	    xdr_u_int(xdrs, &(p->aup_uid)) &&
-	    xdr_u_int(xdrs, &(p->aup_gid)) &&
-	    xdr_array(xdrs, (char **) paup_gids,
-	    &(p->aup_len), NGRPS, sizeof(u_int), (xdrproc_t)xdr_u_int) ) {
-		return (TRUE);
-	}
-	return (FALSE);
-}
diff --git a/lib/libc_bsd/rpc/bindresvport.3 b/lib/libc_bsd/rpc/bindresvport.3
deleted file mode 100644
index 9c99482..0000000
--- a/lib/libc_bsd/rpc/bindresvport.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\" @(#)bindresvport.3n	2.2 88/08/02 4.0 RPCSRC; from 1.7 88/03/14 SMI
-.\" $NetBSD: bindresvport.3,v 1.8 2000/07/05 15:45:33 msaitoh Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/bindresvport.3 108037 2002-12-18 12:45:11Z ru $
-.\"
-.Dd November 22, 1987
-.Dt BINDRESVPORT 3
-.Os
-.Sh NAME
-.Nm bindresvport ,
-.Nm bindresvport_sa
-.Nd bind a socket to a privileged IP port
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In rpc/rpc.h
-.Ft int
-.Fn bindresvport "int sd" "struct sockaddr_in *sin"
-.Ft int
-.Fn bindresvport_sa "int sd" "struct sockaddr *sa"
-.Sh DESCRIPTION
-The
-.Fn bindresvport
-and
-.Fn bindresvport_sa
-functions
-are used to bind a socket descriptor to a privileged
-.Tn IP
-port, that is, a
-port number in the range 0-1023.
-.Pp
-If
-.Fa sin
-is a pointer to a
-.Ft "struct sockaddr_in"
-then the appropriate fields in the structure should be defined.
-Note that
-.Fa sin->sin_family
-must be initialized to the address family of the socket, passed by
-.Fa sd .
-If
-.Fa sin->sin_port
-is
-.Sq 0
-then an anonymous port (in the range 600-1023) will be
-chosen, and if
-.Xr bind 2
-is successful, the
-.Fa sin->sin_port
-will be updated to contain the allocated port.
-.Pp
-If
-.Fa sin
-is the
-.Dv NULL
-pointer,
-an anonymous port will be allocated (as above).
-However, there is no way for
-.Fn bindresvport
-to return the allocated port in this case.
-.Pp
-Only root can bind to a privileged port; this call will fail for any
-other users.
-.Pp
-Function prototype of
-.Fn bindresvport
-is biased to
-.Dv AF_INET
-socket.
-The
-.Fn bindresvport_sa
-function
-acts exactly the same, with more neutral function prototype.
-Note that both functions behave exactly the same, and
-both support
-.Dv AF_INET6
-sockets as well as
-.Dv AF_INET
-sockets.
-.Sh RETURN VALUES
-.Rv -std bindresvport
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EPFNOSUPPORT
-If second argument was supplied,
-and address family did not match between arguments.
-.El
-.Pp
-The
-.Fn bindresvport
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the calls
-.Xr bind 2 ,
-.Xr getsockopt 2 ,
-or
-.Xr setsockopt 2 .
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr getsockopt 2 ,
-.Xr setsockopt 2 ,
-.Xr ip 4
diff --git a/lib/libc_bsd/rpc/bindresvport.c b/lib/libc_bsd/rpc/bindresvport.c
deleted file mode 100644
index d1853bc..0000000
--- a/lib/libc_bsd/rpc/bindresvport.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*	$NetBSD: bindresvport.c,v 1.19 2000/07/06 03:03:59 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)bindresvport.c 1.8 88/02/08 SMI";
-static char *sccsid = "from: @(#)bindresvport.c	2.2 88/07/29 4.0 RPCSRC";
-#endif
-/* from: $OpenBSD: bindresvport.c,v 1.7 1996/07/30 16:25:47 downsj Exp $ */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/bindresvport.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * Copyright (c) 1987 by Sun Microsystems, Inc.
- *
- * Portions Copyright(C) 1996, Jason Downs.  All rights reserved.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-
-#include <string.h>
-#include "un-namespace.h"
-
-/*
- * Bind a socket to a privileged IP port
- */
-int
-bindresvport(sd, sin)
-	int sd;
-	struct sockaddr_in *sin;
-{
-	return bindresvport_sa(sd, (struct sockaddr *)sin);
-}
-
-/*
- * Bind a socket to a privileged IP port
- */
-int
-bindresvport_sa(sd, sa)
-	int sd;
-	struct sockaddr *sa;
-{
-	int old, error, af;
-	struct sockaddr_storage myaddr;
-	struct sockaddr_in *sin;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	int proto, portrange, portlow;
-	u_int16_t *portp;
-	socklen_t salen;
-
-	if (sa == NULL) {
-		salen = sizeof(myaddr);
-		sa = (struct sockaddr *)&myaddr;
-
-		if (_getsockname(sd, sa, &salen) == -1)
-			return -1;	/* errno is correctly set */
-
-		af = sa->sa_family;
-		memset(sa, 0, salen);
-	} else
-		af = sa->sa_family;
-
-	switch (af) {
-	case AF_INET:
-		proto = IPPROTO_IP;
-		portrange = IP_PORTRANGE;
-		portlow = IP_PORTRANGE_LOW;
-		sin = (struct sockaddr_in *)sa;
-		salen = sizeof(struct sockaddr_in);
-		portp = &sin->sin_port;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		proto = IPPROTO_IPV6;
-		portrange = IPV6_PORTRANGE;
-		portlow = IPV6_PORTRANGE_LOW;
-		sin6 = (struct sockaddr_in6 *)sa;
-		salen = sizeof(struct sockaddr_in6);
-		portp = &sin6->sin6_port;
-		break;
-#endif
-	default:
-		errno = EPFNOSUPPORT;
-		return (-1);
-	}
-	sa->sa_family = af;
-	sa->sa_len = salen;
-
-	if (*portp == 0) {
-		socklen_t oldlen = sizeof(old);
-
-		error = _getsockopt(sd, proto, portrange, &old, &oldlen);
-		if (error < 0)
-			return (error);
-
-		error = _setsockopt(sd, proto, portrange, &portlow,
-		    sizeof(portlow));
-		if (error < 0)
-			return (error);
-	}
-
-	error = _bind(sd, sa, salen);
-
-	if (*portp == 0) {
-		int saved_errno = errno;
-
-		if (error < 0) {
-			if (_setsockopt(sd, proto, portrange, &old,
-			    sizeof(old)) < 0)
-				errno = saved_errno;
-			return (error);
-		}
-
-		if (sa != (struct sockaddr *)&myaddr) {
-			/* Hmm, what did the kernel assign? */
-			if (_getsockname(sd, sa, &salen) < 0)
-				errno = saved_errno;
-			return (error);
-		}
-	}
-	return (error);
-}
diff --git a/lib/libc_bsd/rpc/clnt_bcast.c b/lib/libc_bsd/rpc/clnt_bcast.c
deleted file mode 100644
index 431748f..0000000
--- a/lib/libc_bsd/rpc/clnt_bcast.c
+++ /dev/null
@@ -1,672 +0,0 @@
-/*	$NetBSD: clnt_bcast.c,v 1.3 2000/07/06 03:05:20 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)clnt_bcast.c	1.18	94/05/03 SMI"
-static char sccsid[] = "@(#)clnt_bcast.c 1.15 89/04/21 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/clnt_bcast.c 261046 2014-01-22 23:45:27Z mav $");
-
-
-/*
- * clnt_bcast.c
- * Client interface to broadcast service.
- *
- * Copyright (C) 1988, Sun Microsystems, Inc.
- *
- * The following is kludged-up support for simple rpc broadcasts.
- * Someday a large, complicated system will replace these routines.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <ifaddrs.h>
-#include <sys/poll.h>
-#include <rpc/rpc.h>
-#ifdef PORTMAP
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_rmt.h>
-#endif				/* PORTMAP */
-#include <rpc/nettype.h>
-#include <arpa/inet.h>
-#ifdef RPC_DEBUG
-#include <stdio.h>
-#endif
-#include <errno.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <err.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-
-#define	MAXBCAST 20	/* Max no of broadcasting transports */
-#define	INITTIME 4000	/* Time to wait initially */
-#define	WAITTIME 8000	/* Maximum time to wait */
-
-/*
- * If nettype is NULL, it broadcasts on all the available
- * datagram_n transports. May potentially lead to broadacst storms
- * and hence should be used with caution, care and courage.
- *
- * The current parameter xdr packet size is limited by the max tsdu
- * size of the transport. If the max tsdu size of any transport is
- * smaller than the parameter xdr packet, then broadcast is not
- * sent on that transport.
- *
- * Also, the packet size should be less the packet size of
- * the data link layer (for ethernet it is 1400 bytes).  There is
- * no easy way to find out the max size of the data link layer and
- * we are assuming that the args would be smaller than that.
- *
- * The result size has to be smaller than the transport tsdu size.
- *
- * If PORTMAP has been defined, we send two packets for UDP, one for
- * rpcbind and one for portmap. For those machines which support
- * both rpcbind and portmap, it will cause them to reply twice, and
- * also here it will get two responses ... inefficient and clumsy.
- */
-
-struct broadif {
-	int index;
-	struct sockaddr_storage broadaddr;
-	TAILQ_ENTRY(broadif) link;
-};
-
-typedef TAILQ_HEAD(, broadif) broadlist_t;
-
-int __rpc_getbroadifs(int, int, int, broadlist_t *);
-void __rpc_freebroadifs(broadlist_t *);
-int __rpc_broadenable(int, int, struct broadif *);
-
-int __rpc_lowvers = 0;
-
-int
-__rpc_getbroadifs(int af, int proto, int socktype, broadlist_t *list)
-{
-	int count = 0;
-	struct broadif *bip;
-	struct ifaddrs *ifap, *ifp;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	struct sockaddr_in *sin;
-	struct addrinfo hints, *res;
-
-	if (getifaddrs(&ifp) < 0)
-		return 0;
-
-	memset(&hints, 0, sizeof hints);
-
-	hints.ai_family = af;
-	hints.ai_protocol = proto;
-	hints.ai_socktype = socktype;
-
-	if (getaddrinfo(NULL, "sunrpc", &hints, &res) != 0) {
-		freeifaddrs(ifp);
-		return 0;
-	}
-
-	for (ifap = ifp; ifap != NULL; ifap = ifap->ifa_next) {
-		if (ifap->ifa_addr->sa_family != af ||
-		    !(ifap->ifa_flags & IFF_UP))
-			continue;
-		bip = (struct broadif *)malloc(sizeof *bip);
-		if (bip == NULL)
-			break;
-		bip->index = if_nametoindex(ifap->ifa_name);
-		if (
-#ifdef INET6
-		af != AF_INET6 &&
-#endif
-		(ifap->ifa_flags & IFF_BROADCAST) &&
-		 ifap->ifa_broadaddr) {
-			memcpy(&bip->broadaddr, ifap->ifa_broadaddr,
-			    (size_t)ifap->ifa_broadaddr->sa_len);
-			sin = (struct sockaddr_in *)(void *)&bip->broadaddr;
-			sin->sin_port =
-			    ((struct sockaddr_in *)
-			    (void *)res->ai_addr)->sin_port;
-		} else
-#ifdef INET6
-		if (af == AF_INET6 && (ifap->ifa_flags & IFF_MULTICAST)) {
-			sin6 = (struct sockaddr_in6 *)(void *)&bip->broadaddr;
-			inet_pton(af, RPCB_MULTICAST_ADDR, &sin6->sin6_addr);
-			sin6->sin6_family = af;
-			sin6->sin6_len = sizeof *sin6;
-			sin6->sin6_port =
-			    ((struct sockaddr_in6 *)
-			    (void *)res->ai_addr)->sin6_port;
-			sin6->sin6_scope_id = bip->index;
-		} else
-#endif
-		{
-			free(bip);
-			continue;
-		}
-		TAILQ_INSERT_TAIL(list, bip, link);
-		count++;
-	}
-	freeifaddrs(ifp);
-	freeaddrinfo(res);
-
-	return count;
-}
-
-void
-__rpc_freebroadifs(broadlist_t *list)
-{
-	struct broadif *bip, *next;
-
-	bip = TAILQ_FIRST(list);
-
-	while (bip != NULL) {
-		next = TAILQ_NEXT(bip, link);
-		free(bip);
-		bip = next;
-	}
-}
-
-int
-/*ARGSUSED*/
-__rpc_broadenable(int af, int s, struct broadif *bip)
-{
-	int o = 1;
-
-#if 0
-	if (af == AF_INET6) {
-		fprintf(stderr, "set v6 multicast if to %d\n", bip->index);
-		if (_setsockopt(s, IPPROTO_IPV6, IPV6_MULTICAST_IF, &bip->index,
-		    sizeof bip->index) < 0)
-			return -1;
-	} else
-#endif
-		if (_setsockopt(s, SOL_SOCKET, SO_BROADCAST, &o, sizeof o) < 0)
-			return -1;
-
-	return 0;
-}
-
-
-enum clnt_stat
-rpc_broadcast_exp(prog, vers, proc, xargs, argsp, xresults, resultsp,
-	eachresult, inittime, waittime, nettype)
-	rpcprog_t	prog;		/* program number */
-	rpcvers_t	vers;		/* version number */
-	rpcproc_t	proc;		/* procedure number */
-	xdrproc_t	xargs;		/* xdr routine for args */
-	caddr_t		argsp;		/* pointer to args */
-	xdrproc_t	xresults;	/* xdr routine for results */
-	caddr_t		resultsp;	/* pointer to results */
-	resultproc_t	eachresult;	/* call with each result obtained */
-	int 		inittime;	/* how long to wait initially */
-	int 		waittime;	/* maximum time to wait */
-	const char		*nettype;	/* transport type */
-{
-	enum clnt_stat	stat = RPC_SUCCESS; /* Return status */
-	XDR 		xdr_stream; /* XDR stream */
-	XDR 		*xdrs = &xdr_stream;
-	struct rpc_msg	msg;	/* RPC message */
-	struct timeval	t;
-	char 		*outbuf = NULL;	/* Broadcast msg buffer */
-	char		*inbuf = NULL; /* Reply buf */
-	int		inlen;
-	u_int 		maxbufsize = 0;
-	AUTH 		*sys_auth = authunix_create_default();
-	int		i;
-	void		*handle;
-	char		uaddress[1024];	/* A self imposed limit */
-	char		*uaddrp = uaddress;
-	int 		pmap_reply_flag; /* reply recvd from PORTMAP */
-	/* An array of all the suitable broadcast transports */
-	struct {
-		int fd;		/* File descriptor */
-		int af;
-		int proto;
-		struct netconfig *nconf; /* Netconfig structure */
-		u_int asize;	/* Size of the addr buf */
-		u_int dsize;	/* Size of the data buf */
-		struct sockaddr_storage raddr; /* Remote address */
-		broadlist_t nal;
-	} fdlist[MAXBCAST];
-	struct pollfd pfd[MAXBCAST];
-	size_t fdlistno = 0;
-	struct r_rpcb_rmtcallargs barg;	/* Remote arguments */
-	struct r_rpcb_rmtcallres bres; /* Remote results */
-	size_t outlen;
-	struct netconfig *nconf;
-	int msec;
-	int pollretval;
-	int fds_found;
-
-#ifdef PORTMAP
-	size_t outlen_pmap = 0;
-	u_long port;		/* Remote port number */
-	int pmap_flag = 0;	/* UDP exists ? */
-	char *outbuf_pmap = NULL;
-	struct rmtcallargs barg_pmap;	/* Remote arguments */
-	struct rmtcallres bres_pmap; /* Remote results */
-	u_int udpbufsz = 0;
-#endif				/* PORTMAP */
-
-	if (sys_auth == NULL) {
-		return (RPC_SYSTEMERROR);
-	}
-	/*
-	 * initialization: create a fd, a broadcast address, and send the
-	 * request on the broadcast transport.
-	 * Listen on all of them and on replies, call the user supplied
-	 * function.
-	 */
-
-	if (nettype == NULL)
-		nettype = "datagram_n";
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		AUTH_DESTROY(sys_auth);
-		return (RPC_UNKNOWNPROTO);
-	}
-	while ((nconf = __rpc_getconf(handle)) != NULL) {
-		int fd;
-		struct __rpc_sockinfo si;
-
-		if (nconf->nc_semantics != NC_TPI_CLTS)
-			continue;
-		if (fdlistno >= MAXBCAST)
-			break;	/* No more slots available */
-		if (!__rpc_nconf2sockinfo(nconf, &si))
-			continue;
-
-		TAILQ_INIT(&fdlist[fdlistno].nal);
-		if (__rpc_getbroadifs(si.si_af, si.si_proto, si.si_socktype, 
-		    &fdlist[fdlistno].nal) == 0)
-			continue;
-
-		fd = _socket(si.si_af, si.si_socktype, si.si_proto);
-		if (fd < 0) {
-			stat = RPC_CANTSEND;
-			continue;
-		}
-		fdlist[fdlistno].af = si.si_af;
-		fdlist[fdlistno].proto = si.si_proto;
-		fdlist[fdlistno].fd = fd;
-		fdlist[fdlistno].nconf = nconf;
-		fdlist[fdlistno].asize = __rpc_get_a_size(si.si_af);
-		pfd[fdlistno].events = POLLIN | POLLPRI |
-			POLLRDNORM | POLLRDBAND;
-		pfd[fdlistno].fd = fdlist[fdlistno].fd = fd;
-		fdlist[fdlistno].dsize = __rpc_get_t_size(si.si_af, si.si_proto,
-							  0);
-
-		if (maxbufsize <= fdlist[fdlistno].dsize)
-			maxbufsize = fdlist[fdlistno].dsize;
-
-#ifdef PORTMAP
-		if (si.si_af == AF_INET && si.si_proto == IPPROTO_UDP) {
-			udpbufsz = fdlist[fdlistno].dsize;
-			if ((outbuf_pmap = malloc(udpbufsz)) == NULL) {
-				_close(fd);
-				stat = RPC_SYSTEMERROR;
-				goto done_broad;
-			}
-			pmap_flag = 1;
-		}
-#endif				/* PORTMAP */
-		fdlistno++;
-	}
-
-	if (fdlistno == 0) {
-		if (stat == RPC_SUCCESS)
-			stat = RPC_UNKNOWNPROTO;
-		goto done_broad;
-	}
-	if (maxbufsize == 0) {
-		if (stat == RPC_SUCCESS)
-			stat = RPC_CANTSEND;
-		goto done_broad;
-	}
-	inbuf = malloc(maxbufsize);
-	outbuf = malloc(maxbufsize);
-	if ((inbuf == NULL) || (outbuf == NULL)) {
-		stat = RPC_SYSTEMERROR;
-		goto done_broad;
-	}
-
-	/* Serialize all the arguments which have to be sent */
-	(void) gettimeofday(&t, NULL);
-	msg.rm_xid = __RPC_GETXID(&t);
-	msg.rm_direction = CALL;
-	msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	msg.rm_call.cb_prog = RPCBPROG;
-	msg.rm_call.cb_vers = RPCBVERS;
-	msg.rm_call.cb_proc = RPCBPROC_CALLIT;
-	barg.prog = prog;
-	barg.vers = vers;
-	barg.proc = proc;
-	barg.args.args_val = argsp;
-	barg.xdr_args = xargs;
-	bres.addr = uaddrp;
-	bres.results.results_val = resultsp;
-	bres.xdr_res = xresults;
-	msg.rm_call.cb_cred = sys_auth->ah_cred;
-	msg.rm_call.cb_verf = sys_auth->ah_verf;
-	xdrmem_create(xdrs, outbuf, maxbufsize, XDR_ENCODE);
-	if ((!xdr_callmsg(xdrs, &msg)) ||
-	    (!xdr_rpcb_rmtcallargs(xdrs,
-	    (struct rpcb_rmtcallargs *)(void *)&barg))) {
-		stat = RPC_CANTENCODEARGS;
-		goto done_broad;
-	}
-	outlen = xdr_getpos(xdrs);
-	xdr_destroy(xdrs);
-
-#ifdef PORTMAP
-	/* Prepare the packet for version 2 PORTMAP */
-	if (pmap_flag) {
-		msg.rm_xid++;	/* One way to distinguish */
-		msg.rm_call.cb_prog = PMAPPROG;
-		msg.rm_call.cb_vers = PMAPVERS;
-		msg.rm_call.cb_proc = PMAPPROC_CALLIT;
-		barg_pmap.prog = prog;
-		barg_pmap.vers = vers;
-		barg_pmap.proc = proc;
-		barg_pmap.args_ptr = argsp;
-		barg_pmap.xdr_args = xargs;
-		bres_pmap.port_ptr = &port;
-		bres_pmap.xdr_results = xresults;
-		bres_pmap.results_ptr = resultsp;
-		xdrmem_create(xdrs, outbuf_pmap, udpbufsz, XDR_ENCODE);
-		if ((! xdr_callmsg(xdrs, &msg)) ||
-		    (! xdr_rmtcall_args(xdrs, &barg_pmap))) {
-			stat = RPC_CANTENCODEARGS;
-			goto done_broad;
-		}
-		outlen_pmap = xdr_getpos(xdrs);
-		xdr_destroy(xdrs);
-	}
-#endif				/* PORTMAP */
-
-	/*
-	 * Basic loop: broadcast the packets to transports which
-	 * support data packets of size such that one can encode
-	 * all the arguments.
-	 * Wait a while for response(s).
-	 * The response timeout grows larger per iteration.
-	 */
-	for (msec = inittime; msec <= waittime; msec += msec) {
-		struct broadif *bip;
-
-		/* Broadcast all the packets now */
-		for (i = 0; i < fdlistno; i++) {
-			if (fdlist[i].dsize < outlen) {
-				stat = RPC_CANTSEND;
-				continue;
-			}
-			for (bip = TAILQ_FIRST(&fdlist[i].nal); bip != NULL;
-			     bip = TAILQ_NEXT(bip, link)) {
-				void *addr;
-
-				addr = &bip->broadaddr;
-
-				__rpc_broadenable(fdlist[i].af, fdlist[i].fd,
-				    bip);
-
-				/*
-				 * Only use version 3 if lowvers is not set
-				 */
-
-				if (!__rpc_lowvers)
-					if (_sendto(fdlist[i].fd, outbuf,
-					    outlen, 0, (struct sockaddr*)addr,
-					    (size_t)fdlist[i].asize) !=
-					    outlen) {
-#ifdef RPC_DEBUG
-						perror("sendto");
-#endif
-						warnx("clnt_bcast: cannot send "
-						      "broadcast packet");
-						stat = RPC_CANTSEND;
-						continue;
-					};
-#ifdef RPC_DEBUG
-				if (!__rpc_lowvers)
-					fprintf(stderr, "Broadcast packet sent "
-						"for %s\n",
-						 fdlist[i].nconf->nc_netid);
-#endif
-#ifdef PORTMAP
-				/*
-				 * Send the version 2 packet also
-				 * for UDP/IP
-				 */
-				if (pmap_flag &&
-				    fdlist[i].proto == IPPROTO_UDP) {
-					if (_sendto(fdlist[i].fd, outbuf_pmap,
-					    outlen_pmap, 0, addr,
-					    (size_t)fdlist[i].asize) !=
-						outlen_pmap) {
-						warnx("clnt_bcast: "
-						    "Cannot send broadcast packet");
-						stat = RPC_CANTSEND;
-						continue;
-					}
-				}
-#ifdef RPC_DEBUG
-				fprintf(stderr, "PMAP Broadcast packet "
-					"sent for %s\n",
-					fdlist[i].nconf->nc_netid);
-#endif
-#endif				/* PORTMAP */
-			}
-			/* End for sending all packets on this transport */
-		}	/* End for sending on all transports */
-
-		if (eachresult == NULL) {
-			stat = RPC_SUCCESS;
-			goto done_broad;
-		}
-
-		/*
-		 * Get all the replies from these broadcast requests
-		 */
-	recv_again:
-
-		switch (pollretval = _poll(pfd, fdlistno, msec)) {
-		case 0:		/* timed out */
-			stat = RPC_TIMEDOUT;
-			continue;
-		case -1:	/* some kind of error - we ignore it */
-			goto recv_again;
-		}		/* end of poll results switch */
-
-		for (i = fds_found = 0;
-		     i < fdlistno && fds_found < pollretval; i++) {
-			bool_t done = FALSE;
-
-			if (pfd[i].revents == 0)
-				continue;
-			else if (pfd[i].revents & POLLNVAL) {
-				/*
-				 * Something bad has happened to this descri-
-				 * ptor. We can cause _poll() to ignore
-				 * it simply by using a negative fd.  We do that
-				 * rather than compacting the pfd[] and fdlist[]
-				 * arrays.
-				 */
-				pfd[i].fd = -1;
-				fds_found++;
-				continue;
-			} else
-				fds_found++;
-#ifdef RPC_DEBUG
-			fprintf(stderr, "response for %s\n",
-				fdlist[i].nconf->nc_netid);
-#endif
-		try_again:
-			inlen = _recvfrom(fdlist[i].fd, inbuf, fdlist[i].dsize,
-			    0, (struct sockaddr *)(void *)&fdlist[i].raddr,
-			    &fdlist[i].asize);
-			if (inlen < 0) {
-				if (errno == EINTR)
-					goto try_again;
-				warnx("clnt_bcast: Cannot receive reply to "
-					"broadcast");
-				stat = RPC_CANTRECV;
-				continue;
-			}
-			if (inlen < sizeof (uint32_t))
-				continue; /* Drop that and go ahead */
-			/*
-			 * see if reply transaction id matches sent id.
-			 * If so, decode the results. If return id is xid + 1
-			 * it was a PORTMAP reply
-			 */
-			if (*((uint32_t *)(void *)(inbuf)) ==
-			    *((uint32_t *)(void *)(outbuf))) {
-				pmap_reply_flag = 0;
-				msg.acpted_rply.ar_verf = _null_auth;
-				msg.acpted_rply.ar_results.where =
-					(caddr_t)(void *)&bres;
-				msg.acpted_rply.ar_results.proc =
-					(xdrproc_t)xdr_rpcb_rmtcallres;
-#ifdef PORTMAP
-			} else if (pmap_flag &&
-				*((uint32_t *)(void *)(inbuf)) ==
-				*((uint32_t *)(void *)(outbuf_pmap))) {
-				pmap_reply_flag = 1;
-				msg.acpted_rply.ar_verf = _null_auth;
-				msg.acpted_rply.ar_results.where =
-					(caddr_t)(void *)&bres_pmap;
-				msg.acpted_rply.ar_results.proc =
-					(xdrproc_t)xdr_rmtcallres;
-#endif				/* PORTMAP */
-			} else
-				continue;
-			xdrmem_create(xdrs, inbuf, (u_int)inlen, XDR_DECODE);
-			if (xdr_replymsg(xdrs, &msg)) {
-				if ((msg.rm_reply.rp_stat == MSG_ACCEPTED) &&
-				    (msg.acpted_rply.ar_stat == SUCCESS)) {
-					struct netbuf taddr, *np;
-					struct sockaddr_in *sin;
-
-#ifdef PORTMAP
-					if (pmap_flag && pmap_reply_flag) {
-						sin = (struct sockaddr_in *)
-						    (void *)&fdlist[i].raddr;
-						sin->sin_port =
-						    htons((u_short)port);
-						taddr.len = taddr.maxlen = 
-						    fdlist[i].raddr.ss_len;
-						taddr.buf = &fdlist[i].raddr;
-						done = (*eachresult)(resultsp,
-						    &taddr, fdlist[i].nconf);
-					} else {
-#endif				/* PORTMAP */
-#ifdef RPC_DEBUG
-						fprintf(stderr, "uaddr %s\n",
-						    uaddrp);
-#endif
-						np = uaddr2taddr(
-						    fdlist[i].nconf, uaddrp);
-						done = (*eachresult)(resultsp,
-						    np, fdlist[i].nconf);
-						free(np);
-#ifdef PORTMAP
-					}
-#endif				/* PORTMAP */
-				}
-				/* otherwise, we just ignore the errors ... */
-			}
-			/* else some kind of deserialization problem ... */
-
-			xdrs->x_op = XDR_FREE;
-			msg.acpted_rply.ar_results.proc = (xdrproc_t) xdr_void;
-			(void) xdr_replymsg(xdrs, &msg);
-			(void) (*xresults)(xdrs, resultsp);
-			XDR_DESTROY(xdrs);
-			if (done) {
-				stat = RPC_SUCCESS;
-				goto done_broad;
-			} else {
-				goto recv_again;
-			}
-		}		/* The recv for loop */
-	}			/* The giant for loop */
-
-done_broad:
-	if (inbuf)
-		(void) free(inbuf);
-	if (outbuf)
-		(void) free(outbuf);
-#ifdef PORTMAP
-	if (outbuf_pmap)
-		(void) free(outbuf_pmap);
-#endif				/* PORTMAP */
-	for (i = 0; i < fdlistno; i++) {
-		(void)_close(fdlist[i].fd);
-		__rpc_freebroadifs(&fdlist[i].nal);
-	}
-	AUTH_DESTROY(sys_auth);
-	(void) __rpc_endconf(handle);
-
-	return (stat);
-}
-
-
-enum clnt_stat
-rpc_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp,
-			eachresult, nettype)
-	rpcprog_t	prog;		/* program number */
-	rpcvers_t	vers;		/* version number */
-	rpcproc_t	proc;		/* procedure number */
-	xdrproc_t	xargs;		/* xdr routine for args */
-	caddr_t		argsp;		/* pointer to args */
-	xdrproc_t	xresults;	/* xdr routine for results */
-	caddr_t		resultsp;	/* pointer to results */
-	resultproc_t	eachresult;	/* call with each result obtained */
-	const char		*nettype;	/* transport type */
-{
-	enum clnt_stat	dummy;
-
-	dummy = rpc_broadcast_exp(prog, vers, proc, xargs, argsp,
-		xresults, resultsp, eachresult,
-		INITTIME, WAITTIME, nettype);
-	return (dummy);
-}
diff --git a/lib/libc_bsd/rpc/clnt_dg.c b/lib/libc_bsd/rpc/clnt_dg.c
deleted file mode 100644
index c71e03c..0000000
--- a/lib/libc_bsd/rpc/clnt_dg.c
+++ /dev/null
@@ -1,858 +0,0 @@
-/*	$NetBSD: clnt_dg.c,v 1.4 2000/07/14 08:40:41 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)clnt_dg.c	1.23	94/04/22 SMI"
-static char sccsid[] = "@(#)clnt_dg.c 1.19 89/03/16 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/clnt_dg.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * Implements a connectionless client side RPC.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <arpa/inet.h>
-#include <rpc/rpc.h>
-#include <rpc/rpcsec_gss.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
-#include <err.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-
-#ifdef _FREEFALL_CONFIG
-/*
- * Disable RPC exponential back-off for FreeBSD.org systems.
- */
-#define	RPC_MAX_BACKOFF		1 /* second */
-#else
-#define	RPC_MAX_BACKOFF		30 /* seconds */
-#endif
-
-
-static struct clnt_ops *clnt_dg_ops(void);
-static bool_t time_not_ok(struct timeval *);
-static enum clnt_stat clnt_dg_call(CLIENT *, rpcproc_t, xdrproc_t, void *,
-	    xdrproc_t, void *, struct timeval);
-static void clnt_dg_geterr(CLIENT *, struct rpc_err *);
-static bool_t clnt_dg_freeres(CLIENT *, xdrproc_t, void *);
-static void clnt_dg_abort(CLIENT *);
-static bool_t clnt_dg_control(CLIENT *, u_int, void *);
-static void clnt_dg_destroy(CLIENT *);
-
-
-
-
-/*
- *	This machinery implements per-fd locks for MT-safety.  It is not
- *	sufficient to do per-CLIENT handle locks for MT-safety because a
- *	user may create more than one CLIENT handle with the same fd behind
- *	it.  Therfore, we allocate an array of flags (dg_fd_locks), protected
- *	by the clnt_fd_lock mutex, and an array (dg_cv) of condition variables
- *	similarly protected.  Dg_fd_lock[fd] == 1 => a call is activte on some
- *	CLIENT handle created for that fd.
- *	The current implementation holds locks across the entire RPC and reply,
- *	including retransmissions.  Yes, this is silly, and as soon as this
- *	code is proven to work, this should be the first thing fixed.  One step
- *	at a time.
- */
-static int	*dg_fd_locks;
-static cond_t	*dg_cv;
-#define	release_fd_lock(fd, mask) {		\
-	mutex_lock(&clnt_fd_lock);	\
-	dg_fd_locks[fd] = 0;		\
-	mutex_unlock(&clnt_fd_lock);	\
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL); \
-	cond_signal(&dg_cv[fd]);	\
-}
-
-static const char mem_err_clnt_dg[] = "clnt_dg_create: out of memory";
-
-/* VARIABLES PROTECTED BY clnt_fd_lock: dg_fd_locks, dg_cv */
-
-#define	MCALL_MSG_SIZE 24
-
-/*
- * Private data kept per client handle
- */
-struct cu_data {
-	int			cu_fd;		/* connections fd */
-	bool_t			cu_closeit;	/* opened by library */
-	struct sockaddr_storage	cu_raddr;	/* remote address */
-	int			cu_rlen;
-	struct timeval		cu_wait;	/* retransmit interval */
-	struct timeval		cu_total;	/* total time for the call */
-	struct rpc_err		cu_error;
-	XDR			cu_outxdrs;
-	u_int			cu_xdrpos;
-	u_int			cu_sendsz;	/* send size */
-	char			cu_outhdr[MCALL_MSG_SIZE];
-	char			*cu_outbuf;
-	u_int			cu_recvsz;	/* recv size */
-	int			cu_async;
-	int			cu_connect;	/* Use connect(). */
-	int			cu_connected;	/* Have done connect(). */
-	struct kevent		cu_kin;
-	int			cu_kq;
-	char			cu_inbuf[1];
-};
-
-/*
- * Connection less client creation returns with client handle parameters.
- * Default options are set, which the user can change using clnt_control().
- * fd should be open and bound.
- * NB: The rpch->cl_auth is initialized to null authentication.
- * 	Caller may wish to set this something more useful.
- *
- * sendsz and recvsz are the maximum allowable packet sizes that can be
- * sent and received. Normally they are the same, but they can be
- * changed to improve the program efficiency and buffer allocation.
- * If they are 0, use the transport default.
- *
- * If svcaddr is NULL, returns NULL.
- */
-CLIENT *
-clnt_dg_create(fd, svcaddr, program, version, sendsz, recvsz)
-	int fd;				/* open file descriptor */
-	const struct netbuf *svcaddr;	/* servers address */
-	rpcprog_t program;		/* program number */
-	rpcvers_t version;		/* version number */
-	u_int sendsz;			/* buffer recv size */
-	u_int recvsz;			/* buffer send size */
-{
-	CLIENT *cl = NULL;		/* client handle */
-	struct cu_data *cu = NULL;	/* private data */
-	struct timeval now;
-	struct rpc_msg call_msg;
-	sigset_t mask;
-	sigset_t newmask;
-	struct __rpc_sockinfo si;
-	int one = 1;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	if (dg_fd_locks == (int *) NULL) {
-		int cv_allocsz;
-		size_t fd_allocsz;
-		int dtbsize = __rpc_dtbsize();
-
-		fd_allocsz = dtbsize * sizeof (int);
-		dg_fd_locks = (int *) mem_alloc(fd_allocsz);
-		if (dg_fd_locks == (int *) NULL) {
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err1;
-		} else
-			memset(dg_fd_locks, '\0', fd_allocsz);
-
-		cv_allocsz = dtbsize * sizeof (cond_t);
-		dg_cv = (cond_t *) mem_alloc(cv_allocsz);
-		if (dg_cv == (cond_t *) NULL) {
-			mem_free(dg_fd_locks, fd_allocsz);
-			dg_fd_locks = (int *) NULL;
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err1;
-		} else {
-			int i;
-
-			for (i = 0; i < dtbsize; i++)
-				cond_init(&dg_cv[i], 0, (void *) 0);
-		}
-	}
-
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-
-	if (svcaddr == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (NULL);
-	}
-
-	if (!__rpc_fd2sockinfo(fd, &si)) {
-		rpc_createerr.cf_stat = RPC_TLIERROR;
-		rpc_createerr.cf_error.re_errno = 0;
-		return (NULL);
-	}
-	/*
-	 * Find the receive and the send size
-	 */
-	sendsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsz);
-	recvsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsz);
-	if ((sendsz == 0) || (recvsz == 0)) {
-		rpc_createerr.cf_stat = RPC_TLIERROR; /* XXX */
-		rpc_createerr.cf_error.re_errno = 0;
-		return (NULL);
-	}
-
-	if ((cl = mem_alloc(sizeof (CLIENT))) == NULL)
-		goto err1;
-	/*
-	 * Should be multiple of 4 for XDR.
-	 */
-	sendsz = ((sendsz + 3) / 4) * 4;
-	recvsz = ((recvsz + 3) / 4) * 4;
-	cu = mem_alloc(sizeof (*cu) + sendsz + recvsz);
-	if (cu == NULL)
-		goto err1;
-	(void) memcpy(&cu->cu_raddr, svcaddr->buf, (size_t)svcaddr->len);
-	cu->cu_rlen = svcaddr->len;
-	cu->cu_outbuf = &cu->cu_inbuf[recvsz];
-	/* Other values can also be set through clnt_control() */
-	cu->cu_wait.tv_sec = 15;	/* heuristically chosen */
-	cu->cu_wait.tv_usec = 0;
-	cu->cu_total.tv_sec = -1;
-	cu->cu_total.tv_usec = -1;
-	cu->cu_sendsz = sendsz;
-	cu->cu_recvsz = recvsz;
-	cu->cu_async = FALSE;
-	cu->cu_connect = FALSE;
-	cu->cu_connected = FALSE;
-	(void) gettimeofday(&now, NULL);
-	call_msg.rm_xid = __RPC_GETXID(&now);
-	call_msg.rm_call.cb_prog = program;
-	call_msg.rm_call.cb_vers = version;
-	xdrmem_create(&(cu->cu_outxdrs), cu->cu_outhdr, MCALL_MSG_SIZE,
-	    XDR_ENCODE);
-	if (! xdr_callhdr(&cu->cu_outxdrs, &call_msg)) {
-		rpc_createerr.cf_stat = RPC_CANTENCODEARGS;  /* XXX */
-		rpc_createerr.cf_error.re_errno = 0;
-		goto err2;
-	}
-	cu->cu_xdrpos = XDR_GETPOS(&(cu->cu_outxdrs));
-	XDR_DESTROY(&cu->cu_outxdrs);
-	xdrmem_create(&cu->cu_outxdrs, cu->cu_outbuf, sendsz, XDR_ENCODE);
-
-	/* XXX fvdl - do we still want this? */
-#if 0
-	(void)bindresvport_sa(fd, (struct sockaddr *)svcaddr->buf);
-#endif
-	_ioctl(fd, FIONBIO, (char *)(void *)&one);
-
-	/*
-	 * By default, closeit is always FALSE. It is users responsibility
-	 * to do a close on it, else the user may use clnt_control
-	 * to let clnt_destroy do it for him/her.
-	 */
-	cu->cu_closeit = FALSE;
-	cu->cu_fd = fd;
-	cl->cl_ops = clnt_dg_ops();
-	cl->cl_private = (caddr_t)(void *)cu;
-	cl->cl_auth = authnone_create();
-	cl->cl_tp = NULL;
-	cl->cl_netid = NULL;
-	cu->cu_kq = -1;
-	EV_SET(&cu->cu_kin, cu->cu_fd, EVFILT_READ, EV_ADD, 0, 0, 0);
-	return (cl);
-err1:
-	warnx(mem_err_clnt_dg);
-	rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-	rpc_createerr.cf_error.re_errno = errno;
-err2:
-	if (cl) {
-		mem_free(cl, sizeof (CLIENT));
-		if (cu)
-			mem_free(cu, sizeof (*cu) + sendsz + recvsz);
-	}
-	return (NULL);
-}
-
-static enum clnt_stat
-clnt_dg_call(cl, proc, xargs, argsp, xresults, resultsp, utimeout)
-	CLIENT	*cl;			/* client handle */
-	rpcproc_t	proc;		/* procedure number */
-	xdrproc_t	xargs;		/* xdr routine for args */
-	void		*argsp;		/* pointer to args */
-	xdrproc_t	xresults;	/* xdr routine for results */
-	void		*resultsp;	/* pointer to results */
-	struct timeval	utimeout;	/* seconds to wait before giving up */
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	XDR *xdrs;
-	size_t outlen = 0;
-	struct rpc_msg reply_msg;
-	XDR reply_xdrs;
-	bool_t ok;
-	int nrefreshes = 2;		/* number of times to refresh cred */
-	int nretries = 0;		/* number of times we retransmitted */
-	struct timeval timeout;
-	struct timeval retransmit_time;
-	struct timeval next_sendtime, starttime, time_waited, tv;
-	struct timespec ts;
-	struct kevent kv;
-	struct sockaddr *sa;
-	sigset_t mask;
-	sigset_t newmask;
-	socklen_t inlen, salen;
-	ssize_t recvlen = 0;
-	int kin_len, n, rpc_lock_value;
-	uint32_t xid;
-
-	outlen = 0;
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu->cu_fd])
-		cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock);
-	if (__isthreaded)
-		rpc_lock_value = 1;
-	else
-		rpc_lock_value = 0;
-	dg_fd_locks[cu->cu_fd] = rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-	if (cu->cu_total.tv_usec == -1) {
-		timeout = utimeout;	/* use supplied timeout */
-	} else {
-		timeout = cu->cu_total;	/* use default timeout */
-	}
-
-	if (cu->cu_connect && !cu->cu_connected) {
-		if (_connect(cu->cu_fd, (struct sockaddr *)&cu->cu_raddr,
-		    cu->cu_rlen) < 0) {
-			cu->cu_error.re_errno = errno;
-			cu->cu_error.re_status = RPC_CANTSEND;
-			goto out;
-		}
-		cu->cu_connected = 1;
-	}
-	if (cu->cu_connected) {
-		sa = NULL;
-		salen = 0;
-	} else {
-		sa = (struct sockaddr *)&cu->cu_raddr;
-		salen = cu->cu_rlen;
-	}
-	time_waited.tv_sec = 0;
-	time_waited.tv_usec = 0;
-	retransmit_time = next_sendtime = cu->cu_wait;
-	gettimeofday(&starttime, NULL);
-
-	/* Clean up in case the last call ended in a longjmp(3) call. */
-	if (cu->cu_kq >= 0)
-		_close(cu->cu_kq);
-	if ((cu->cu_kq = kqueue()) < 0) {
-		cu->cu_error.re_errno = errno;
-		cu->cu_error.re_status = RPC_CANTSEND;
-		goto out;
-	}
-	kin_len = 1;
-
-call_again:
-	if (cu->cu_async == TRUE && xargs == NULL)
-		goto get_reply;
-	/*
-	 * the transaction is the first thing in the out buffer
-	 * XXX Yes, and it's in network byte order, so we should to
-	 * be careful when we increment it, shouldn't we.
-	 */
-	xid = ntohl(*(uint32_t *)(void *)(cu->cu_outhdr));
-	xid++;
-	*(uint32_t *)(void *)(cu->cu_outhdr) = htonl(xid);
-call_again_same_xid:
-	xdrs = &(cu->cu_outxdrs);
-	xdrs->x_op = XDR_ENCODE;
-	XDR_SETPOS(xdrs, 0);
-
-	if (cl->cl_auth->ah_cred.oa_flavor != RPCSEC_GSS) {
-		if ((! XDR_PUTBYTES(xdrs, cu->cu_outhdr, cu->cu_xdrpos)) ||
-		    (! XDR_PUTINT32(xdrs, &proc)) ||
-		    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
-		    (! (*xargs)(xdrs, argsp))) {
-			cu->cu_error.re_status = RPC_CANTENCODEARGS;
-			goto out;
-		}
-	} else {
-		*(uint32_t *) &cu->cu_outhdr[cu->cu_xdrpos] = htonl(proc);
-		if (!__rpc_gss_wrap(cl->cl_auth, cu->cu_outhdr,
-			cu->cu_xdrpos + sizeof(uint32_t),
-			xdrs, xargs, argsp)) {
-			cu->cu_error.re_status = RPC_CANTENCODEARGS;
-			goto out;
-		}
-	}
-	outlen = (size_t)XDR_GETPOS(xdrs);
-
-send_again:
-	if (_sendto(cu->cu_fd, cu->cu_outbuf, outlen, 0, sa, salen) != outlen) {
-		cu->cu_error.re_errno = errno;
-		cu->cu_error.re_status = RPC_CANTSEND;
-		goto out;
-	}
-
-	/*
-	 * Hack to provide rpc-based message passing
-	 */
-	if (timeout.tv_sec == 0 && timeout.tv_usec == 0) {
-		cu->cu_error.re_status = RPC_TIMEDOUT;
-		goto out;
-	}
-
-get_reply:
-
-	/*
-	 * sub-optimal code appears here because we have
-	 * some clock time to spare while the packets are in flight.
-	 * (We assume that this is actually only executed once.)
-	 */
-	reply_msg.acpted_rply.ar_verf = _null_auth;
-	if (cl->cl_auth->ah_cred.oa_flavor != RPCSEC_GSS) {
-		reply_msg.acpted_rply.ar_results.where = resultsp;
-		reply_msg.acpted_rply.ar_results.proc = xresults;
-	} else {
-		reply_msg.acpted_rply.ar_results.where = NULL;
-		reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
-	}
-
-	for (;;) {
-		/* Decide how long to wait. */
-		if (timercmp(&next_sendtime, &timeout, <))
-			timersub(&next_sendtime, &time_waited, &tv);
-		else
-			timersub(&timeout, &time_waited, &tv);
-		if (tv.tv_sec < 0 || tv.tv_usec < 0)
-			tv.tv_sec = tv.tv_usec = 0;
-		TIMEVAL_TO_TIMESPEC(&tv, &ts);
-
-		n = _kevent(cu->cu_kq, &cu->cu_kin, kin_len, &kv, 1, &ts);
-		/* We don't need to register the event again. */
-		kin_len = 0;
-
-		if (n == 1) {
-			if (kv.flags & EV_ERROR) {
-				cu->cu_error.re_errno = kv.data;
-				cu->cu_error.re_status = RPC_CANTRECV;
-				goto out;
-			}
-			/* We have some data now */
-			do {
-				recvlen = _recvfrom(cu->cu_fd, cu->cu_inbuf,
-				    cu->cu_recvsz, 0, NULL, NULL);
-			} while (recvlen < 0 && errno == EINTR);
-			if (recvlen < 0 && errno != EWOULDBLOCK) {
-				cu->cu_error.re_errno = errno;
-				cu->cu_error.re_status = RPC_CANTRECV;
-				goto out;
-			}
-			if (recvlen >= sizeof(uint32_t) &&
-			    (cu->cu_async == TRUE ||
-			    *((uint32_t *)(void *)(cu->cu_inbuf)) ==
-			    *((uint32_t *)(void *)(cu->cu_outbuf)))) {
-				/* We now assume we have the proper reply. */
-				break;
-			}
-		}
-		if (n == -1 && errno != EINTR) {
-			cu->cu_error.re_errno = errno;
-			cu->cu_error.re_status = RPC_CANTRECV;
-			goto out;
-		}
-		gettimeofday(&tv, NULL);
-		timersub(&tv, &starttime, &time_waited);
-
-		/* Check for timeout. */
-		if (timercmp(&time_waited, &timeout, >)) {
-			cu->cu_error.re_status = RPC_TIMEDOUT;
-			goto out;
-		}
-
-		/* Retransmit if necessary. */		
-		if (timercmp(&time_waited, &next_sendtime, >)) {
-			/* update retransmit_time */
-			if (retransmit_time.tv_sec < RPC_MAX_BACKOFF)
-				timeradd(&retransmit_time, &retransmit_time,
-				    &retransmit_time);
-			timeradd(&next_sendtime, &retransmit_time,
-			    &next_sendtime);
-			nretries++;
-
-			/*
-			 * When retransmitting a RPCSEC_GSS message,
-			 * we must use a new sequence number (handled
-			 * by __rpc_gss_wrap above).
-			 */
-			if (cl->cl_auth->ah_cred.oa_flavor != RPCSEC_GSS)
-				goto send_again;
-			else
-				goto call_again_same_xid;
-		}
-	}
-	inlen = (socklen_t)recvlen;
-
-	/*
-	 * now decode and validate the response
-	 */
-
-	xdrmem_create(&reply_xdrs, cu->cu_inbuf, (u_int)recvlen, XDR_DECODE);
-	ok = xdr_replymsg(&reply_xdrs, &reply_msg);
-	/* XDR_DESTROY(&reply_xdrs);	save a few cycles on noop destroy */
-	if (ok) {
-		if ((reply_msg.rm_reply.rp_stat == MSG_ACCEPTED) &&
-			(reply_msg.acpted_rply.ar_stat == SUCCESS))
-			cu->cu_error.re_status = RPC_SUCCESS;
-		else
-			_seterr_reply(&reply_msg, &(cu->cu_error));
-
-		if (cu->cu_error.re_status == RPC_SUCCESS) {
-			if (! AUTH_VALIDATE(cl->cl_auth,
-					    &reply_msg.acpted_rply.ar_verf)) {
-				if (nretries &&
-				    cl->cl_auth->ah_cred.oa_flavor
-				    == RPCSEC_GSS)
-					/*
-					 * If we retransmitted, its
-					 * possible that we will
-					 * receive a reply for one of
-					 * the earlier transmissions
-					 * (which will use an older
-					 * RPCSEC_GSS sequence
-					 * number). In this case, just
-					 * go back and listen for a
-					 * new reply. We could keep a
-					 * record of all the seq
-					 * numbers we have transmitted
-					 * so far so that we could
-					 * accept a reply for any of
-					 * them here.
-					 */
-					goto get_reply;
-				cu->cu_error.re_status = RPC_AUTHERROR;
-				cu->cu_error.re_why = AUTH_INVALIDRESP;
-			} else {
-				if (cl->cl_auth->ah_cred.oa_flavor
-				    == RPCSEC_GSS) {
-					if (!__rpc_gss_unwrap(cl->cl_auth,
-						&reply_xdrs, xresults,
-						resultsp))
-						cu->cu_error.re_status =
-							RPC_CANTDECODERES;
-				}
-			}
-			if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) {
-				xdrs->x_op = XDR_FREE;
-				(void) xdr_opaque_auth(xdrs,
-					&(reply_msg.acpted_rply.ar_verf));
-			}
-		}		/* end successful completion */
-		/*
-		 * If unsuccesful AND error is an authentication error
-		 * then refresh credentials and try again, else break
-		 */
-		else if (cu->cu_error.re_status == RPC_AUTHERROR)
-			/* maybe our credentials need to be refreshed ... */
-			if (nrefreshes > 0 &&
-			    AUTH_REFRESH(cl->cl_auth, &reply_msg)) {
-				nrefreshes--;
-				goto call_again;
-			}
-		/* end of unsuccessful completion */
-	}	/* end of valid reply message */
-	else {
-		cu->cu_error.re_status = RPC_CANTDECODERES;
-
-	}
-out:
-	if (cu->cu_kq >= 0)
-		_close(cu->cu_kq);
-	cu->cu_kq = -1;
-	release_fd_lock(cu->cu_fd, mask);
-	return (cu->cu_error.re_status);
-}
-
-static void
-clnt_dg_geterr(cl, errp)
-	CLIENT *cl;
-	struct rpc_err *errp;
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-
-	*errp = cu->cu_error;
-}
-
-static bool_t
-clnt_dg_freeres(cl, xdr_res, res_ptr)
-	CLIENT *cl;
-	xdrproc_t xdr_res;
-	void *res_ptr;
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	XDR *xdrs = &(cu->cu_outxdrs);
-	bool_t dummy;
-	sigset_t mask;
-	sigset_t newmask;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu->cu_fd])
-		cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock);
-	xdrs->x_op = XDR_FREE;
-	dummy = (*xdr_res)(xdrs, res_ptr);
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &mask, NULL);
-	cond_signal(&dg_cv[cu->cu_fd]);
-	return (dummy);
-}
-
-/*ARGSUSED*/
-static void
-clnt_dg_abort(h)
-	CLIENT *h;
-{
-}
-
-static bool_t
-clnt_dg_control(cl, request, info)
-	CLIENT *cl;
-	u_int request;
-	void *info;
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	struct netbuf *addr;
-	sigset_t mask;
-	sigset_t newmask;
-	int rpc_lock_value;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu->cu_fd])
-		cond_wait(&dg_cv[cu->cu_fd], &clnt_fd_lock);
-	if (__isthreaded)
-                rpc_lock_value = 1;
-        else
-                rpc_lock_value = 0;
-	dg_fd_locks[cu->cu_fd] = rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-	switch (request) {
-	case CLSET_FD_CLOSE:
-		cu->cu_closeit = TRUE;
-		release_fd_lock(cu->cu_fd, mask);
-		return (TRUE);
-	case CLSET_FD_NCLOSE:
-		cu->cu_closeit = FALSE;
-		release_fd_lock(cu->cu_fd, mask);
-		return (TRUE);
-	}
-
-	/* for other requests which use info */
-	if (info == NULL) {
-		release_fd_lock(cu->cu_fd, mask);
-		return (FALSE);
-	}
-	switch (request) {
-	case CLSET_TIMEOUT:
-		if (time_not_ok((struct timeval *)info)) {
-			release_fd_lock(cu->cu_fd, mask);
-			return (FALSE);
-		}
-		cu->cu_total = *(struct timeval *)info;
-		break;
-	case CLGET_TIMEOUT:
-		*(struct timeval *)info = cu->cu_total;
-		break;
-	case CLGET_SERVER_ADDR:		/* Give him the fd address */
-		/* Now obsolete. Only for backward compatibility */
-		(void) memcpy(info, &cu->cu_raddr, (size_t)cu->cu_rlen);
-		break;
-	case CLSET_RETRY_TIMEOUT:
-		if (time_not_ok((struct timeval *)info)) {
-			release_fd_lock(cu->cu_fd, mask);
-			return (FALSE);
-		}
-		cu->cu_wait = *(struct timeval *)info;
-		break;
-	case CLGET_RETRY_TIMEOUT:
-		*(struct timeval *)info = cu->cu_wait;
-		break;
-	case CLGET_FD:
-		*(int *)info = cu->cu_fd;
-		break;
-	case CLGET_SVC_ADDR:
-		addr = (struct netbuf *)info;
-		addr->buf = &cu->cu_raddr;
-		addr->len = cu->cu_rlen;
-		addr->maxlen = sizeof cu->cu_raddr;
-		break;
-	case CLSET_SVC_ADDR:		/* set to new address */
-		addr = (struct netbuf *)info;
-		if (addr->len < sizeof cu->cu_raddr) {
-			release_fd_lock(cu->cu_fd, mask);
-			return (FALSE);
-		}
-		(void) memcpy(&cu->cu_raddr, addr->buf, addr->len);
-		cu->cu_rlen = addr->len;
-		break;
-	case CLGET_XID:
-		/*
-		 * use the knowledge that xid is the
-		 * first element in the call structure *.
-		 * This will get the xid of the PREVIOUS call
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)cu->cu_outhdr);
-		break;
-
-	case CLSET_XID:
-		/* This will set the xid of the NEXT call */
-		*(uint32_t *)(void *)cu->cu_outhdr =
-		    htonl(*(uint32_t *)info - 1);
-		/* decrement by 1 as clnt_dg_call() increments once */
-		break;
-
-	case CLGET_VERS:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the version number field is the fifth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)(cu->cu_outhdr +
-		    4 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_VERS:
-		*(uint32_t *)(void *)(cu->cu_outhdr + 4 * BYTES_PER_XDR_UNIT)
-			= htonl(*(uint32_t *)info);
-		break;
-
-	case CLGET_PROG:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the program number field is the fourth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)(cu->cu_outhdr +
-		    3 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_PROG:
-		*(uint32_t *)(void *)(cu->cu_outhdr + 3 * BYTES_PER_XDR_UNIT)
-			= htonl(*(uint32_t *)info);
-		break;
-	case CLSET_ASYNC:
-		cu->cu_async = *(int *)info;
-		break;
-	case CLSET_CONNECT:
-		cu->cu_connect = *(int *)info;
-		break;
-	default:
-		release_fd_lock(cu->cu_fd, mask);
-		return (FALSE);
-	}
-	release_fd_lock(cu->cu_fd, mask);
-	return (TRUE);
-}
-
-static void
-clnt_dg_destroy(cl)
-	CLIENT *cl;
-{
-	struct cu_data *cu = (struct cu_data *)cl->cl_private;
-	int cu_fd = cu->cu_fd;
-	sigset_t mask;
-	sigset_t newmask;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (dg_fd_locks[cu_fd])
-		cond_wait(&dg_cv[cu_fd], &clnt_fd_lock);
-	if (cu->cu_closeit)
-		(void)_close(cu_fd);
-	if (cu->cu_kq >= 0)
-		_close(cu->cu_kq);
-	XDR_DESTROY(&(cu->cu_outxdrs));
-	mem_free(cu, (sizeof (*cu) + cu->cu_sendsz + cu->cu_recvsz));
-	if (cl->cl_netid && cl->cl_netid[0])
-		mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);
-	if (cl->cl_tp && cl->cl_tp[0])
-		mem_free(cl->cl_tp, strlen(cl->cl_tp) +1);
-	mem_free(cl, sizeof (CLIENT));
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &mask, NULL);
-	cond_signal(&dg_cv[cu_fd]);
-}
-
-static struct clnt_ops *
-clnt_dg_ops()
-{
-	static struct clnt_ops ops;
-	sigset_t mask;
-	sigset_t newmask;
-
-/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&ops_lock);
-	if (ops.cl_call == NULL) {
-		ops.cl_call = clnt_dg_call;
-		ops.cl_abort = clnt_dg_abort;
-		ops.cl_geterr = clnt_dg_geterr;
-		ops.cl_freeres = clnt_dg_freeres;
-		ops.cl_destroy = clnt_dg_destroy;
-		ops.cl_control = clnt_dg_control;
-	}
-	mutex_unlock(&ops_lock);
-	thr_sigsetmask(SIG_SETMASK, &mask, NULL);
-	return (&ops);
-}
-
-/*
- * Make sure that the time is not garbage.  -1 value is allowed.
- */
-static bool_t
-time_not_ok(t)
-	struct timeval *t;
-{
-	return (t->tv_sec < -1 || t->tv_sec > 100000000 ||
-		t->tv_usec < -1 || t->tv_usec > 1000000);
-}
-
diff --git a/lib/libc_bsd/rpc/clnt_generic.c b/lib/libc_bsd/rpc/clnt_generic.c
deleted file mode 100644
index 99c4117..0000000
--- a/lib/libc_bsd/rpc/clnt_generic.c
+++ /dev/null
@@ -1,448 +0,0 @@
-/*	$NetBSD: clnt_generic.c,v 1.18 2000/07/06 03:10:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-/* #ident	"@(#)clnt_generic.c	1.40	99/04/21 SMI" */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)clnt_generic.c 1.4 87/08/11 (C) 1987 SMI";
-static char *sccsid = "from: @(#)clnt_generic.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/clnt_generic.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * Copyright (c) 1986-1996,1998 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <stdio.h>
-#include <errno.h>
-#include <netdb.h>
-#include <syslog.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-
-extern bool_t __rpc_is_local_host(const char *);
-int __rpc_raise_fd(int);
-
-#ifndef NETIDLEN
-#define	NETIDLEN 32
-#endif
-
-
-/*
- * Generic client creation with version checking the value of
- * vers_out is set to the highest server supported value
- * vers_low <= vers_out <= vers_high  AND an error results
- * if this can not be done.
- *
- * It calls clnt_create_vers_timed() with a NULL value for the timeout
- * pointer, which indicates that the default timeout should be used.
- */
-CLIENT *
-clnt_create_vers(const char *hostname, rpcprog_t prog, rpcvers_t *vers_out,
-	rpcvers_t vers_low, rpcvers_t vers_high, const char *nettype)
-{
-
-	return (clnt_create_vers_timed(hostname, prog, vers_out, vers_low,
-				vers_high, nettype, NULL));
-}
-
-/*
- * This the routine has the same definition as clnt_create_vers(),
- * except it takes an additional timeout parameter - a pointer to
- * a timeval structure.  A NULL value for the pointer indicates
- * that the default timeout value should be used.
- */
-CLIENT *
-clnt_create_vers_timed(const char *hostname, rpcprog_t prog,
-    rpcvers_t *vers_out, rpcvers_t vers_low, rpcvers_t vers_high,
-    const char *nettype, const struct timeval *tp)
-{
-	CLIENT *clnt;
-	struct timeval to;
-	enum clnt_stat rpc_stat;
-	struct rpc_err rpcerr;
-
-	clnt = clnt_create_timed(hostname, prog, vers_high, nettype, tp);
-	if (clnt == NULL) {
-		return (NULL);
-	}
-	to.tv_sec = 10;
-	to.tv_usec = 0;
-	rpc_stat = clnt_call(clnt, NULLPROC, (xdrproc_t)xdr_void,
-			(char *)NULL, (xdrproc_t)xdr_void, (char *)NULL, to);
-	if (rpc_stat == RPC_SUCCESS) {
-		*vers_out = vers_high;
-		return (clnt);
-	}
-	while (rpc_stat == RPC_PROGVERSMISMATCH && vers_high > vers_low) {
-		unsigned int minvers, maxvers;
-
-		clnt_geterr(clnt, &rpcerr);
-		minvers = rpcerr.re_vers.low;
-		maxvers = rpcerr.re_vers.high;
-		if (maxvers < vers_high)
-			vers_high = maxvers;
-		else
-			vers_high--;
-		if (minvers > vers_low)
-			vers_low = minvers;
-		if (vers_low > vers_high) {
-			goto error;
-		}
-		CLNT_CONTROL(clnt, CLSET_VERS, (char *)&vers_high);
-		rpc_stat = clnt_call(clnt, NULLPROC, (xdrproc_t)xdr_void,
-				(char *)NULL, (xdrproc_t)xdr_void,
-				(char *)NULL, to);
-		if (rpc_stat == RPC_SUCCESS) {
-			*vers_out = vers_high;
-			return (clnt);
-		}
-	}
-	clnt_geterr(clnt, &rpcerr);
-
-error:
-	rpc_createerr.cf_stat = rpc_stat;
-	rpc_createerr.cf_error = rpcerr;
-	clnt_destroy(clnt);
-	return (NULL);
-}
-
-/*
- * Top level client creation routine.
- * Generic client creation: takes (servers name, program-number, nettype) and
- * returns client handle. Default options are set, which the user can
- * change using the rpc equivalent of _ioctl()'s.
- *
- * It tries for all the netids in that particular class of netid until
- * it succeeds.
- * XXX The error message in the case of failure will be the one
- * pertaining to the last create error.
- *
- * It calls clnt_create_timed() with the default timeout.
- */
-CLIENT *
-clnt_create(const char *hostname, rpcprog_t prog, rpcvers_t vers,
-    const char *nettype)
-{
-
-	return (clnt_create_timed(hostname, prog, vers, nettype, NULL));
-}
-
-/*
- * This the routine has the same definition as clnt_create(),
- * except it takes an additional timeout parameter - a pointer to
- * a timeval structure.  A NULL value for the pointer indicates
- * that the default timeout value should be used.
- *
- * This function calls clnt_tp_create_timed().
- */
-CLIENT *
-clnt_create_timed(const char *hostname, rpcprog_t prog, rpcvers_t vers,
-    const char *netclass, const struct timeval *tp)
-{
-	struct netconfig *nconf;
-	CLIENT *clnt = NULL;
-	void *handle;
-	enum clnt_stat	save_cf_stat = RPC_SUCCESS;
-	struct rpc_err	save_cf_error;
-	char nettype_array[NETIDLEN];
-	char *nettype = &nettype_array[0];
-
-	if (netclass == NULL)
-		nettype = NULL;
-	else {
-		size_t len = strlen(netclass);
-		if (len >= sizeof (nettype_array)) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			return (NULL);
-		}
-		strcpy(nettype, netclass);
-	}
-
-	if ((handle = __rpc_setconf((char *)nettype)) == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-	rpc_createerr.cf_stat = RPC_SUCCESS;
-	while (clnt == NULL) {
-		if ((nconf = __rpc_getconf(handle)) == NULL) {
-			if (rpc_createerr.cf_stat == RPC_SUCCESS)
-				rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			break;
-		}
-#ifdef CLNT_DEBUG
-		printf("trying netid %s\n", nconf->nc_netid);
-#endif
-		clnt = clnt_tp_create_timed(hostname, prog, vers, nconf, tp);
-		if (clnt)
-			break;
-		else
-			/*
-			 *	Since we didn't get a name-to-address
-			 *	translation failure here, we remember
-			 *	this particular error.  The object of
-			 *	this is to enable us to return to the
-			 *	caller a more-specific error than the
-			 *	unhelpful ``Name to address translation
-			 *	failed'' which might well occur if we
-			 *	merely returned the last error (because
-			 *	the local loopbacks are typically the
-			 *	last ones in /etc/netconfig and the most
-			 *	likely to be unable to translate a host
-			 *	name).  We also check for a more
-			 *	meaningful error than ``unknown host
-			 *	name'' for the same reasons.
-			 */
-			if (rpc_createerr.cf_stat != RPC_N2AXLATEFAILURE &&
-			    rpc_createerr.cf_stat != RPC_UNKNOWNHOST) {
-				save_cf_stat = rpc_createerr.cf_stat;
-				save_cf_error = rpc_createerr.cf_error;
-			}
-	}
-
-	/*
-	 *	Attempt to return an error more specific than ``Name to address
-	 *	translation failed'' or ``unknown host name''
-	 */
-	if ((rpc_createerr.cf_stat == RPC_N2AXLATEFAILURE ||
-				rpc_createerr.cf_stat == RPC_UNKNOWNHOST) &&
-					(save_cf_stat != RPC_SUCCESS)) {
-		rpc_createerr.cf_stat = save_cf_stat;
-		rpc_createerr.cf_error = save_cf_error;
-	}
-	__rpc_endconf(handle);
-	return (clnt);
-}
-
-/*
- * Generic client creation: takes (servers name, program-number, netconf) and
- * returns client handle. Default options are set, which the user can
- * change using the rpc equivalent of _ioctl()'s : clnt_control()
- * It finds out the server address from rpcbind and calls clnt_tli_create().
- *
- * It calls clnt_tp_create_timed() with the default timeout.
- */
-CLIENT *
-clnt_tp_create(const char *hostname, rpcprog_t prog, rpcvers_t vers,
-    const struct netconfig *nconf)
-{
-
-	return (clnt_tp_create_timed(hostname, prog, vers, nconf, NULL));
-}
-
-/*
- * This has the same definition as clnt_tp_create(), except it
- * takes an additional parameter - a pointer to a timeval structure.
- * A NULL value for the timeout pointer indicates that the default
- * value for the timeout should be used.
- */
-CLIENT *
-clnt_tp_create_timed(const char *hostname, rpcprog_t prog, rpcvers_t vers,
-    const struct netconfig *nconf, const struct timeval *tp)
-{
-	struct netbuf *svcaddr;			/* servers address */
-	CLIENT *cl = NULL;			/* client handle */
-
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-
-	/*
-	 * Get the address of the server
-	 */
-	if ((svcaddr = __rpcb_findaddr_timed(prog, vers,
-			(struct netconfig *)nconf, (char *)hostname,
-			&cl, (struct timeval *)tp)) == NULL) {
-		/* appropriate error number is set by rpcbind libraries */
-		return (NULL);
-	}
-	if (cl == NULL) {
-		cl = clnt_tli_create(RPC_ANYFD, nconf, svcaddr,
-					prog, vers, 0, 0);
-	} else {
-		/* Reuse the CLIENT handle and change the appropriate fields */
-		if (CLNT_CONTROL(cl, CLSET_SVC_ADDR, (void *)svcaddr) == TRUE) {
-			if (cl->cl_netid == NULL)
-				cl->cl_netid = strdup(nconf->nc_netid);
-			if (cl->cl_tp == NULL)
-				cl->cl_tp = strdup(nconf->nc_device);
-			(void) CLNT_CONTROL(cl, CLSET_PROG, (void *)&prog);
-			(void) CLNT_CONTROL(cl, CLSET_VERS, (void *)&vers);
-		} else {
-			CLNT_DESTROY(cl);
-			cl = clnt_tli_create(RPC_ANYFD, nconf, svcaddr,
-					prog, vers, 0, 0);
-		}
-	}
-	free(svcaddr->buf);
-	free(svcaddr);
-	return (cl);
-}
-
-/*
- * Generic client creation:  returns client handle.
- * Default options are set, which the user can
- * change using the rpc equivalent of _ioctl()'s : clnt_control().
- * If fd is RPC_ANYFD, it will be opened using nconf.
- * It will be bound if not so.
- * If sizes are 0; appropriate defaults will be chosen.
- */
-CLIENT *
-clnt_tli_create(int fd, const struct netconfig *nconf,
-	struct netbuf *svcaddr, rpcprog_t prog, rpcvers_t vers,
-	uint sendsz, uint recvsz)
-{
-	CLIENT *cl;			/* client handle */
-	bool_t madefd = FALSE;		/* whether fd opened here */
-	long servtype;
-	int one = 1;
-	struct __rpc_sockinfo si;
-	extern int __rpc_minfd;
-
-	if (fd == RPC_ANYFD) {
-		if (nconf == NULL) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			return (NULL);
-		}
-
-		fd = __rpc_nconf2fd(nconf);
-
-		if (fd == -1)
-			goto err;
-		if (fd < __rpc_minfd)
-			fd = __rpc_raise_fd(fd);
-		madefd = TRUE;
-		servtype = nconf->nc_semantics;
-		if (!__rpc_fd2sockinfo(fd, &si))
-			goto err;
-		bindresvport(fd, NULL);
-	} else {
-		if (!__rpc_fd2sockinfo(fd, &si))
-			goto err;
-		servtype = __rpc_socktype2seman(si.si_socktype);
-		if (servtype == -1) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			return (NULL);
-		}
-	}
-
-	if (si.si_af != ((struct sockaddr *)svcaddr->buf)->sa_family) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNHOST;	/* XXX */
-		goto err1;
-	}
-
-	switch (servtype) {
-	case NC_TPI_COTS:
-		cl = clnt_vc_create(fd, svcaddr, prog, vers, sendsz, recvsz);
-		break;
-	case NC_TPI_COTS_ORD:
-		if (nconf && ((strcmp(nconf->nc_protofmly, "inet") == 0))) {
-			_setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &one,
-			    sizeof (one));
-		}
-		cl = clnt_vc_create(fd, svcaddr, prog, vers, sendsz, recvsz);
-		break;
-	case NC_TPI_CLTS:
-		cl = clnt_dg_create(fd, svcaddr, prog, vers, sendsz, recvsz);
-		break;
-	default:
-		goto err;
-	}
-
-	if (cl == NULL)
-		goto err1; /* borrow errors from clnt_dg/vc creates */
-	if (nconf) {
-		cl->cl_netid = strdup(nconf->nc_netid);
-		cl->cl_tp = strdup(nconf->nc_device);
-	} else {
-		cl->cl_netid = "";
-		cl->cl_tp = "";
-	}
-	if (madefd) {
-		(void) CLNT_CONTROL(cl, CLSET_FD_CLOSE, NULL);
-/*		(void) CLNT_CONTROL(cl, CLSET_POP_TIMOD, NULL);  */
-	};
-
-	return (cl);
-
-err:
-	rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-	rpc_createerr.cf_error.re_errno = errno;
-err1:	if (madefd)
-		(void)_close(fd);
-	return (NULL);
-}
-
-/*
- *  To avoid conflicts with the "magic" file descriptors (0, 1, and 2),
- *  we try to not use them.  The __rpc_raise_fd() routine will dup
- *  a descriptor to a higher value.  If we fail to do it, we continue
- *  to use the old one (and hope for the best).
- */
-int __rpc_minfd = 3;
-
-int
-__rpc_raise_fd(int fd)
-{
-	int nfd;
-
-	if (fd >= __rpc_minfd)
-		return (fd);
-
-	if ((nfd = _fcntl(fd, F_DUPFD, __rpc_minfd)) == -1)
-		return (fd);
-
-	if (_fsync(nfd) == -1) {
-		_close(nfd);
-		return (fd);
-	}
-
-	if (_close(fd) == -1) {
-		/* this is okay, we will syslog an error, then use the new fd */
-		(void) syslog(LOG_ERR,
-			"could not close() fd %d; mem & fd leak", fd);
-	}
-
-	return (nfd);
-}
diff --git a/lib/libc_bsd/rpc/clnt_perror.c b/lib/libc_bsd/rpc/clnt_perror.c
deleted file mode 100644
index 11fc570..0000000
--- a/lib/libc_bsd/rpc/clnt_perror.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*	$NetBSD: clnt_perror.c,v 1.24 2000/06/02 23:11:07 fvdl Exp $	*/
-
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)clnt_perror.c 1.15 87/10/07 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)clnt_perror.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/clnt_perror.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * clnt_perror.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- */
-#include "namespace.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include <rpc/types.h>
-#include <rpc/auth.h>
-#include <rpc/clnt.h>
-#include "un-namespace.h"
-
-static char *buf;
-
-static char *_buf(void);
-static char *auth_errmsg(enum auth_stat);
-#define CLNT_PERROR_BUFLEN 256
-
-static char *
-_buf()
-{
-
-	if (buf == 0)
-		buf = (char *)malloc(CLNT_PERROR_BUFLEN);
-	return (buf);
-}
-
-/*
- * Print reply error info
- */
-char *
-clnt_sperror(rpch, s)
-	CLIENT *rpch;
-	const char *s;
-{
-	struct rpc_err e;
-	char *err;
-	char *str;
-	char *strstart;
-	size_t len, i;
-
-	assert(rpch != NULL);
-	assert(s != NULL);
-
-	str = _buf(); /* side effect: sets CLNT_PERROR_BUFLEN */
-	if (str == 0)
-		return (0);
-	len = CLNT_PERROR_BUFLEN;
-	strstart = str;
-	CLNT_GETERR(rpch, &e);
-
-	if ((i = snprintf(str, len, "%s: ", s)) > 0) {
-		str += i;
-		len -= i;
-	}
-
-	(void)strncpy(str, clnt_sperrno(e.re_status), len - 1);
-	i = strlen(str);
-	str += i;
-	len -= i;
-
-	switch (e.re_status) {
-	case RPC_SUCCESS:
-	case RPC_CANTENCODEARGS:
-	case RPC_CANTDECODERES:
-	case RPC_TIMEDOUT:
-	case RPC_PROGUNAVAIL:
-	case RPC_PROCUNAVAIL:
-	case RPC_CANTDECODEARGS:
-	case RPC_SYSTEMERROR:
-	case RPC_UNKNOWNHOST:
-	case RPC_UNKNOWNPROTO:
-	case RPC_PMAPFAILURE:
-	case RPC_PROGNOTREGISTERED:
-	case RPC_FAILED:
-		break;
-
-	case RPC_CANTSEND:
-	case RPC_CANTRECV:
-		i = snprintf(str, len, "; errno = %s", strerror(e.re_errno)); 
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-
-	case RPC_VERSMISMATCH:
-		i = snprintf(str, len, "; low version = %u, high version = %u", 
-			e.re_vers.low, e.re_vers.high);
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-
-	case RPC_AUTHERROR:
-		err = auth_errmsg(e.re_why);
-		i = snprintf(str, len, "; why = ");
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		if (err != NULL) {
-			i = snprintf(str, len, "%s",err);
-		} else {
-			i = snprintf(str, len,
-				"(unknown authentication error - %d)",
-				(int) e.re_why);
-		}
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-
-	case RPC_PROGVERSMISMATCH:
-		i = snprintf(str, len, "; low version = %u, high version = %u", 
-			e.re_vers.low, e.re_vers.high);
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-
-	default:	/* unknown */
-		i = snprintf(str, len, "; s1 = %u, s2 = %u", 
-			e.re_lb.s1, e.re_lb.s2);
-		if (i > 0) {
-			str += i;
-			len -= i;
-		}
-		break;
-	}
-	strstart[CLNT_PERROR_BUFLEN-1] = '\0';
-	return(strstart) ;
-}
-
-void
-clnt_perror(rpch, s)
-	CLIENT *rpch;
-	const char *s;
-{
-
-	assert(rpch != NULL);
-	assert(s != NULL);
-
-	(void) fprintf(stderr, "%s\n", clnt_sperror(rpch,s));
-}
-
-static const char *const rpc_errlist[] = {
-	"RPC: Success",				/*  0 - RPC_SUCCESS */
-	"RPC: Can't encode arguments",		/*  1 - RPC_CANTENCODEARGS */
-	"RPC: Can't decode result",		/*  2 - RPC_CANTDECODERES */
-	"RPC: Unable to send",			/*  3 - RPC_CANTSEND */
-	"RPC: Unable to receive",		/*  4 - RPC_CANTRECV */
-	"RPC: Timed out",			/*  5 - RPC_TIMEDOUT */
-	"RPC: Incompatible versions of RPC",	/*  6 - RPC_VERSMISMATCH */
-	"RPC: Authentication error",		/*  7 - RPC_AUTHERROR */
-	"RPC: Program unavailable",		/*  8 - RPC_PROGUNAVAIL */
-	"RPC: Program/version mismatch",	/*  9 - RPC_PROGVERSMISMATCH */
-	"RPC: Procedure unavailable",		/* 10 - RPC_PROCUNAVAIL */
-	"RPC: Server can't decode arguments",	/* 11 - RPC_CANTDECODEARGS */
-	"RPC: Remote system error",		/* 12 - RPC_SYSTEMERROR */
-	"RPC: Unknown host",			/* 13 - RPC_UNKNOWNHOST */
-	"RPC: Port mapper failure",		/* 14 - RPC_PMAPFAILURE */
-	"RPC: Program not registered",		/* 15 - RPC_PROGNOTREGISTERED */
-	"RPC: Failed (unspecified error)",	/* 16 - RPC_FAILED */
-	"RPC: Unknown protocol"			/* 17 - RPC_UNKNOWNPROTO */
-};
-
-
-/*
- * This interface for use by clntrpc
- */
-char *
-clnt_sperrno(stat)
-	enum clnt_stat stat;
-{
-	unsigned int errnum = stat;
-
-	if (errnum < (sizeof(rpc_errlist)/sizeof(rpc_errlist[0])))
-		/* LINTED interface problem */
-		return (char *)rpc_errlist[errnum];
-
-	return ("RPC: (unknown error code)");
-}
-
-void
-clnt_perrno(num)
-	enum clnt_stat num;
-{
-	(void) fprintf(stderr, "%s\n", clnt_sperrno(num));
-}
-
-
-char *
-clnt_spcreateerror(s)
-	const char *s;
-{
-	char *str;
-	size_t len, i;
-
-	assert(s != NULL);
-
-	str = _buf(); /* side effect: sets CLNT_PERROR_BUFLEN */
-	if (str == 0)
-		return(0);
-	len = CLNT_PERROR_BUFLEN;
-	i = snprintf(str, len, "%s: ", s);
-	if (i > 0)
-		len -= i;
-	(void)strncat(str, clnt_sperrno(rpc_createerr.cf_stat), len - 1);
-	switch (rpc_createerr.cf_stat) {
-	case RPC_PMAPFAILURE:
-		(void) strncat(str, " - ", len - 1);
-		(void) strncat(str,
-		    clnt_sperrno(rpc_createerr.cf_error.re_status), len - 4);
-		break;
-
-	case RPC_SYSTEMERROR:
-		(void)strncat(str, " - ", len - 1);
-		(void)strncat(str, strerror(rpc_createerr.cf_error.re_errno),
-		    len - 4);
-		break;
-
-	case RPC_CANTSEND:
-	case RPC_CANTDECODERES:
-	case RPC_CANTENCODEARGS:
-	case RPC_SUCCESS:
-	case RPC_UNKNOWNPROTO:
-	case RPC_PROGNOTREGISTERED:
-	case RPC_FAILED:
-	case RPC_UNKNOWNHOST:
-	case RPC_CANTDECODEARGS:
-	case RPC_PROCUNAVAIL:
-	case RPC_PROGVERSMISMATCH:
-	case RPC_PROGUNAVAIL:
-	case RPC_AUTHERROR:
-	case RPC_VERSMISMATCH:
-	case RPC_TIMEDOUT:
-	case RPC_CANTRECV:
-	default:
-		break;
-	}
-	str[CLNT_PERROR_BUFLEN-1] = '\0';
-	return (str);
-}
-
-void
-clnt_pcreateerror(s)
-	const char *s;
-{
-
-	assert(s != NULL);
-
-	(void) fprintf(stderr, "%s\n", clnt_spcreateerror(s));
-}
-
-static const char *const auth_errlist[] = {
-	"Authentication OK",			/* 0 - AUTH_OK */
-	"Invalid client credential",		/* 1 - AUTH_BADCRED */
-	"Server rejected credential",		/* 2 - AUTH_REJECTEDCRED */
-	"Invalid client verifier", 		/* 3 - AUTH_BADVERF */
-	"Server rejected verifier", 		/* 4 - AUTH_REJECTEDVERF */
-	"Client credential too weak",		/* 5 - AUTH_TOOWEAK */
-	"Invalid server verifier",		/* 6 - AUTH_INVALIDRESP */
-	"Failed (unspecified error)",		/* 7 - AUTH_FAILED */
-	"Kerberos generic error",		/* 8 - AUTH_KERB_GENERIC*/
-	"Kerberos credential expired",		/* 9 - AUTH_TIMEEXPIRE */
-	"Bad kerberos ticket file",		/* 10 - AUTH_TKT_FILE */
-	"Can't decode kerberos authenticator",	/* 11 - AUTH_DECODE */
-	"Address wrong in kerberos ticket",	/* 12 - AUTH_NET_ADDR */
-	"GSS-API crediential problem",		/* 13 - RPCSEC_GSS_CREDPROBLEM */
-	"GSS-API context problem"		/* 14 - RPCSEC_GSS_CTXPROBLEM */
-};
-
-static char *
-auth_errmsg(stat)
-	enum auth_stat stat;
-{
-	unsigned int errnum = stat;
-
-	if (errnum < (sizeof(auth_errlist)/sizeof(auth_errlist[0])))
-		/* LINTED interface problem */
-		return (char *)auth_errlist[errnum];
-
-	return(NULL);
-}
diff --git a/lib/libc_bsd/rpc/clnt_raw.c b/lib/libc_bsd/rpc/clnt_raw.c
deleted file mode 100644
index 5e9b8cd..0000000
--- a/lib/libc_bsd/rpc/clnt_raw.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*	$NetBSD: clnt_raw.c,v 1.20 2000/12/10 04:12:03 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)clnt_raw.c 1.22 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)clnt_raw.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/clnt_raw.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * clnt_raw.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * Memory based rpc for simple testing and timing.
- * Interface to create an rpc client and server in the same process.
- * This lets us similate rpc and get round trip overhead, without
- * any interference from the kernel.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <assert.h>
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <rpc/rpc.h>
-#include <rpc/raw.h>
-#include "un-namespace.h"
-#include "mt_misc.h"
-
-#define MCALL_MSG_SIZE 24
-
-/*
- * This is the "network" we will be moving stuff over.
- */
-static struct clntraw_private {
-	CLIENT	client_object;
-	XDR	xdr_stream;
-	char	*_raw_buf;
-	union {
-	    struct rpc_msg	mashl_rpcmsg;
-	    char 		mashl_callmsg[MCALL_MSG_SIZE];
-	} u;
-	u_int	mcnt;
-} *clntraw_private;
-
-static enum clnt_stat clnt_raw_call(CLIENT *, rpcproc_t, xdrproc_t, void *,
-	xdrproc_t, void *, struct timeval);
-static void clnt_raw_geterr(CLIENT *, struct rpc_err *);
-static bool_t clnt_raw_freeres(CLIENT *, xdrproc_t, void *);
-static void clnt_raw_abort(CLIENT *);
-static bool_t clnt_raw_control(CLIENT *, u_int, void *);
-static void clnt_raw_destroy(CLIENT *);
-static struct clnt_ops *clnt_raw_ops(void);
-
-/*
- * Create a client handle for memory based rpc.
- */
-CLIENT *
-clnt_raw_create(prog, vers)
-	rpcprog_t prog;
-	rpcvers_t vers;
-{
-	struct clntraw_private *clp;
-	struct rpc_msg call_msg;
-	XDR *xdrs;
-	CLIENT	*client;
-
-	mutex_lock(&clntraw_lock);
-	if ((clp = clntraw_private) == NULL) {
-		clp = (struct clntraw_private *)calloc(1, sizeof (*clp));
-		if (clp == NULL) {
-			mutex_unlock(&clntraw_lock);
-			return NULL;
-		}
-		if (__rpc_rawcombuf == NULL)
-			__rpc_rawcombuf =
-			    (char *)calloc(UDPMSGSIZE, sizeof (char));
-		clp->_raw_buf = __rpc_rawcombuf;
-		clntraw_private = clp;
-	}
-	xdrs = &clp->xdr_stream;
-	client = &clp->client_object;
-
-	/*
-	 * pre-serialize the static part of the call msg and stash it away
-	 */
-	call_msg.rm_direction = CALL;
-	call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	/* XXX: prog and vers have been long historically :-( */
-	call_msg.rm_call.cb_prog = (uint32_t)prog;
-	call_msg.rm_call.cb_vers = (uint32_t)vers;
-	xdrmem_create(xdrs, clp->u.mashl_callmsg, MCALL_MSG_SIZE, XDR_ENCODE); 
-	if (! xdr_callhdr(xdrs, &call_msg))
-		warnx("clntraw_create - Fatal header serialization error.");
-	clp->mcnt = XDR_GETPOS(xdrs);
-	XDR_DESTROY(xdrs);
-
-	/*
-	 * Set xdrmem for client/server shared buffer
-	 */
-	xdrmem_create(xdrs, clp->_raw_buf, UDPMSGSIZE, XDR_FREE);
-
-	/*
-	 * create client handle
-	 */
-	client->cl_ops = clnt_raw_ops();
-	client->cl_auth = authnone_create();
-	mutex_unlock(&clntraw_lock);
-	return (client);
-}
-
-/* ARGSUSED */
-static enum clnt_stat 
-clnt_raw_call(h, proc, xargs, argsp, xresults, resultsp, timeout)
-	CLIENT *h;
-	rpcproc_t proc;
-	xdrproc_t xargs;
-	void *argsp;
-	xdrproc_t xresults;
-	void *resultsp;
-	struct timeval timeout;
-{
-	struct clntraw_private *clp = clntraw_private;
-	XDR *xdrs = &clp->xdr_stream;
-	struct rpc_msg msg;
-	enum clnt_stat status;
-	struct rpc_err error;
-
-	assert(h != NULL);
-
-	mutex_lock(&clntraw_lock);
-	if (clp == NULL) {
-		mutex_unlock(&clntraw_lock);
-		return (RPC_FAILED);
-	}
-	mutex_unlock(&clntraw_lock);
-
-call_again:
-	/*
-	 * send request
-	 */
-	xdrs->x_op = XDR_ENCODE;
-	XDR_SETPOS(xdrs, 0);
-	clp->u.mashl_rpcmsg.rm_xid ++ ;
-	if ((! XDR_PUTBYTES(xdrs, clp->u.mashl_callmsg, clp->mcnt)) ||
-	    (! XDR_PUTINT32(xdrs, &proc)) ||
-	    (! AUTH_MARSHALL(h->cl_auth, xdrs)) ||
-	    (! (*xargs)(xdrs, argsp))) {
-		return (RPC_CANTENCODEARGS);
-	}
-	(void)XDR_GETPOS(xdrs);  /* called just to cause overhead */
-
-	/*
-	 * We have to call server input routine here because this is
-	 * all going on in one process. Yuk.
-	 */
-	svc_getreq_common(FD_SETSIZE);
-
-	/*
-	 * get results
-	 */
-	xdrs->x_op = XDR_DECODE;
-	XDR_SETPOS(xdrs, 0);
-	msg.acpted_rply.ar_verf = _null_auth;
-	msg.acpted_rply.ar_results.where = resultsp;
-	msg.acpted_rply.ar_results.proc = xresults;
-	if (! xdr_replymsg(xdrs, &msg)) {
-		/*
-		 * It's possible for xdr_replymsg() to fail partway
-		 * through its attempt to decode the result from the
-		 * server. If this happens, it will leave the reply
-		 * structure partially populated with dynamically
-		 * allocated memory. (This can happen if someone uses
-		 * clntudp_bufcreate() to create a CLIENT handle and
-		 * specifies a receive buffer size that is too small.)
-		 * This memory must be free()ed to avoid a leak.
-		 */
-		int op = xdrs->x_op;
-		xdrs->x_op = XDR_FREE;
-		xdr_replymsg(xdrs, &msg);
-		xdrs->x_op = op;
-		return (RPC_CANTDECODERES);
-	}
-	_seterr_reply(&msg, &error);
-	status = error.re_status;
-
-	if (status == RPC_SUCCESS) {
-		if (! AUTH_VALIDATE(h->cl_auth, &msg.acpted_rply.ar_verf)) {
-			status = RPC_AUTHERROR;
-		}
-	}  /* end successful completion */
-	else {
-		if (AUTH_REFRESH(h->cl_auth, &msg))
-			goto call_again;
-	}  /* end of unsuccessful completion */
-
-	if (status == RPC_SUCCESS) {
-		if (! AUTH_VALIDATE(h->cl_auth, &msg.acpted_rply.ar_verf)) {
-			status = RPC_AUTHERROR;
-		}
-		if (msg.acpted_rply.ar_verf.oa_base != NULL) {
-			xdrs->x_op = XDR_FREE;
-			(void)xdr_opaque_auth(xdrs, &(msg.acpted_rply.ar_verf));
-		}
-	}
-
-	return (status);
-}
-
-/*ARGSUSED*/
-static void
-clnt_raw_geterr(cl, err)
-	CLIENT *cl;
-	struct rpc_err *err;
-{
-}
-
-
-/* ARGSUSED */
-static bool_t
-clnt_raw_freeres(cl, xdr_res, res_ptr)
-	CLIENT *cl;
-	xdrproc_t xdr_res;
-	void *res_ptr;
-{
-	struct clntraw_private *clp = clntraw_private;
-	XDR *xdrs = &clp->xdr_stream;
-	bool_t rval;
-
-	mutex_lock(&clntraw_lock);
-	if (clp == NULL) {
-		rval = (bool_t) RPC_FAILED;
-		mutex_unlock(&clntraw_lock);
-		return (rval);
-	}
-	mutex_unlock(&clntraw_lock);
-	xdrs->x_op = XDR_FREE;
-	return ((*xdr_res)(xdrs, res_ptr));
-}
-
-/*ARGSUSED*/
-static void
-clnt_raw_abort(cl)
-	CLIENT *cl;
-{
-}
-
-/*ARGSUSED*/
-static bool_t
-clnt_raw_control(cl, ui, str)
-	CLIENT *cl;
-	u_int ui;
-	void *str;
-{
-	return (FALSE);
-}
-
-/*ARGSUSED*/
-static void
-clnt_raw_destroy(cl)
-	CLIENT *cl;
-{
-}
-
-static struct clnt_ops *
-clnt_raw_ops()
-{
-	static struct clnt_ops ops;
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.cl_call == NULL) {
-		ops.cl_call = clnt_raw_call;
-		ops.cl_abort = clnt_raw_abort;
-		ops.cl_geterr = clnt_raw_geterr;
-		ops.cl_freeres = clnt_raw_freeres;
-		ops.cl_destroy = clnt_raw_destroy;
-		ops.cl_control = clnt_raw_control;
-	}
-	mutex_unlock(&ops_lock);
-	return (&ops);
-}
diff --git a/lib/libc_bsd/rpc/clnt_simple.c b/lib/libc_bsd/rpc/clnt_simple.c
deleted file mode 100644
index 5b640f8..0000000
--- a/lib/libc_bsd/rpc/clnt_simple.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*	$NetBSD: clnt_simple.c,v 1.21 2000/07/06 03:10:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)clnt_simple.c 1.35 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "from: @(#)clnt_simple.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/clnt_simple.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * clnt_simple.c
- * Simplified front end to client rpc.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-#include <stdio.h>
-#include <errno.h>
-#include <rpc/rpc.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "mt_misc.h"
-
-#ifndef MAXHOSTNAMELEN
-#define	MAXHOSTNAMELEN 64
-#endif
-
-#ifndef NETIDLEN
-#define	NETIDLEN 32
-#endif
-
-struct rpc_call_private {
-	int	valid;			/* Is this entry valid ? */
-	CLIENT	*client;		/* Client handle */
-	pid_t	pid;			/* process-id at moment of creation */
-	rpcprog_t prognum;		/* Program */
-	rpcvers_t versnum;		/* Version */
-	char	host[MAXHOSTNAMELEN];	/* Servers host */
-	char	nettype[NETIDLEN];	/* Network type */
-};
-static struct rpc_call_private *rpc_call_private_main;
-static thread_key_t rpc_call_key;
-static once_t rpc_call_once = ONCE_INITIALIZER;
-static int rpc_call_key_error;
-
-static void rpc_call_key_init(void);
-static void rpc_call_destroy(void *);
-
-static void
-rpc_call_destroy(void *vp)
-{
-	struct rpc_call_private *rcp = (struct rpc_call_private *)vp;
-
-	if (rcp) {
-		if (rcp->client)
-			CLNT_DESTROY(rcp->client);
-		free(rcp);
-	}
-}
-
-static void
-rpc_call_key_init(void)
-{
-
-	rpc_call_key_error = thr_keycreate(&rpc_call_key, rpc_call_destroy);
-}
-
-/*
- * This is the simplified interface to the client rpc layer.
- * The client handle is not destroyed here and is reused for
- * the future calls to same prog, vers, host and nettype combination.
- *
- * The total time available is 25 seconds.
- */
-enum clnt_stat
-rpc_call(host, prognum, versnum, procnum, inproc, in, outproc, out, nettype)
-	const char *host;			/* host name */
-	rpcprog_t prognum;			/* program number */
-	rpcvers_t versnum;			/* version number */
-	rpcproc_t procnum;			/* procedure number */
-	xdrproc_t inproc, outproc;	/* in/out XDR procedures */
-	const char *in;
-	char  *out;			/* recv/send data */
-	const char *nettype;			/* nettype */
-{
-	struct rpc_call_private *rcp = (struct rpc_call_private *) 0;
-	enum clnt_stat clnt_stat;
-	struct timeval timeout, tottimeout;
-	int main_thread = 1;
-
-	if ((main_thread = thr_main())) {
-		rcp = rpc_call_private_main;
-	} else {
-		if (thr_once(&rpc_call_once, rpc_call_key_init) != 0 ||
-		    rpc_call_key_error != 0) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = rpc_call_key_error;
-			return (rpc_createerr.cf_stat);
-		}
-		rcp = (struct rpc_call_private *)thr_getspecific(rpc_call_key);
-	}
-	if (rcp == NULL) {
-		rcp = malloc(sizeof (*rcp));
-		if (rcp == NULL) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			return (rpc_createerr.cf_stat);
-		}
-		if (main_thread)
-			rpc_call_private_main = rcp;
-		else
-			thr_setspecific(rpc_call_key, (void *) rcp);
-		rcp->valid = 0;
-		rcp->client = NULL;
-	}
-	if ((nettype == NULL) || (nettype[0] == 0))
-		nettype = "netpath";
-	if (!(rcp->valid && rcp->pid == getpid() &&
-		(rcp->prognum == prognum) &&
-		(rcp->versnum == versnum) &&
-		(!strcmp(rcp->host, host)) &&
-		(!strcmp(rcp->nettype, nettype)))) {
-		int fd;
-
-		rcp->valid = 0;
-		if (rcp->client)
-			CLNT_DESTROY(rcp->client);
-		/*
-		 * Using the first successful transport for that type
-		 */
-		rcp->client = clnt_create(host, prognum, versnum, nettype);
-		rcp->pid = getpid();
-		if (rcp->client == NULL) {
-			return (rpc_createerr.cf_stat);
-		}
-		/*
-		 * Set time outs for connectionless case.  Do it
-		 * unconditionally.  Faster than doing a t_getinfo()
-		 * and then doing the right thing.
-		 */
-		timeout.tv_usec = 0;
-		timeout.tv_sec = 5;
-		(void) CLNT_CONTROL(rcp->client,
-				CLSET_RETRY_TIMEOUT, (char *)(void *)&timeout);
-		if (CLNT_CONTROL(rcp->client, CLGET_FD, (char *)(void *)&fd))
-			_fcntl(fd, F_SETFD, 1);	/* make it "close on exec" */
-		rcp->prognum = prognum;
-		rcp->versnum = versnum;
-		if ((strlen(host) < (size_t)MAXHOSTNAMELEN) &&
-		    (strlen(nettype) < (size_t)NETIDLEN)) {
-			(void) strcpy(rcp->host, host);
-			(void) strcpy(rcp->nettype, nettype);
-			rcp->valid = 1;
-		} else {
-			rcp->valid = 0;
-		}
-	} /* else reuse old client */
-	tottimeout.tv_sec = 25;
-	tottimeout.tv_usec = 0;
-	/*LINTED const castaway*/
-	clnt_stat = CLNT_CALL(rcp->client, procnum, inproc, (char *) in,
-	    outproc, out, tottimeout);
-	/*
-	 * if call failed, empty cache
-	 */
-	if (clnt_stat != RPC_SUCCESS)
-		rcp->valid = 0;
-	return (clnt_stat);
-}
diff --git a/lib/libc_bsd/rpc/clnt_vc.c b/lib/libc_bsd/rpc/clnt_vc.c
deleted file mode 100644
index 9f3957c..0000000
--- a/lib/libc_bsd/rpc/clnt_vc.c
+++ /dev/null
@@ -1,872 +0,0 @@
-/*	$NetBSD: clnt_vc.c,v 1.4 2000/07/14 08:40:42 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)clnt_tcp.c	2.2 88/08/01 4.0 RPCSRC";
-static char sccsid3[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/clnt_vc.c 266243 2014-05-16 15:48:45Z brueffer $");
- 
-/*
- * clnt_tcp.c, Implements a TCP/IP based, client side RPC.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * TCP based RPC supports 'batched calls'.
- * A sequence of calls may be batched-up in a send buffer.  The rpc call
- * return immediately to the client even though the call was not necessarily
- * sent.  The batching occurs if the results' xdr routine is NULL (0) AND
- * the rpc timeout value is zero (see clnt.h, rpc).
- *
- * Clients should NOT casually batch calls that in fact return results; that is,
- * the server side should be aware that a call is batched and not produce any
- * return message.  Batched calls that produce many result messages can
- * deadlock (netlock) the client and the server....
- *
- * Now go hang yourself.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/poll.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/uio.h>
-
-#include <arpa/inet.h>
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <signal.h>
-
-#include <rpc/rpc.h>
-#include <rpc/rpcsec_gss.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-#define MCALL_MSG_SIZE 24
-
-struct cmessage {
-        struct cmsghdr cmsg;
-        struct cmsgcred cmcred;
-};
-
-static enum clnt_stat clnt_vc_call(CLIENT *, rpcproc_t, xdrproc_t, void *,
-    xdrproc_t, void *, struct timeval);
-static void clnt_vc_geterr(CLIENT *, struct rpc_err *);
-static bool_t clnt_vc_freeres(CLIENT *, xdrproc_t, void *);
-static void clnt_vc_abort(CLIENT *);
-static bool_t clnt_vc_control(CLIENT *, u_int, void *);
-static void clnt_vc_destroy(CLIENT *);
-static struct clnt_ops *clnt_vc_ops(void);
-static bool_t time_not_ok(struct timeval *);
-static int read_vc(void *, void *, int);
-static int write_vc(void *, void *, int);
-static int __msgwrite(int, void *, size_t);
-static int __msgread(int, void *, size_t);
-
-struct ct_data {
-	int		ct_fd;		/* connection's fd */
-	bool_t		ct_closeit;	/* close it on destroy */
-	struct timeval	ct_wait;	/* wait interval in milliseconds */
-	bool_t          ct_waitset;	/* wait set by clnt_control? */
-	struct netbuf	ct_addr;	/* remote addr */
-	struct rpc_err	ct_error;
-	union {
-		char	ct_mcallc[MCALL_MSG_SIZE];	/* marshalled callmsg */
-		uint32_t ct_mcalli;
-	} ct_u;
-	u_int		ct_mpos;	/* pos after marshal */
-	XDR		ct_xdrs;	/* XDR stream */
-};
-
-/*
- *      This machinery implements per-fd locks for MT-safety.  It is not
- *      sufficient to do per-CLIENT handle locks for MT-safety because a
- *      user may create more than one CLIENT handle with the same fd behind
- *      it.  Therfore, we allocate an array of flags (vc_fd_locks), protected
- *      by the clnt_fd_lock mutex, and an array (vc_cv) of condition variables
- *      similarly protected.  Vc_fd_lock[fd] == 1 => a call is activte on some
- *      CLIENT handle created for that fd.
- *      The current implementation holds locks across the entire RPC and reply.
- *      Yes, this is silly, and as soon as this code is proven to work, this
- *      should be the first thing fixed.  One step at a time.
- */
-static int      *vc_fd_locks;
-static cond_t   *vc_cv;
-#define release_fd_lock(fd, mask) {	\
-	mutex_lock(&clnt_fd_lock);	\
-	vc_fd_locks[fd] = 0;		\
-	mutex_unlock(&clnt_fd_lock);	\
-	thr_sigsetmask(SIG_SETMASK, &(mask), (sigset_t *) NULL);	\
-	cond_signal(&vc_cv[fd]);	\
-}
-
-static const char clnt_vc_errstr[] = "%s : %s";
-static const char clnt_vc_str[] = "clnt_vc_create";
-static const char clnt_read_vc_str[] = "read_vc";
-static const char __no_mem_str[] = "out of memory";
-
-/*
- * Create a client handle for a connection.
- * Default options are set, which the user can change using clnt_control()'s.
- * The rpc/vc package does buffering similar to stdio, so the client
- * must pick send and receive buffer sizes, 0 => use the default.
- * NB: fd is copied into a private area.
- * NB: The rpch->cl_auth is set null authentication. Caller may wish to
- * set this something more useful.
- *
- * fd should be an open socket
- */
-CLIENT *
-clnt_vc_create(fd, raddr, prog, vers, sendsz, recvsz)
-	int fd;				/* open file descriptor */
-	const struct netbuf *raddr;	/* servers address */
-	const rpcprog_t prog;			/* program number */
-	const rpcvers_t vers;			/* version number */
-	u_int sendsz;			/* buffer recv size */
-	u_int recvsz;			/* buffer send size */
-{
-	CLIENT *cl;			/* client handle */
-	struct ct_data *ct = NULL;	/* client handle */
-	struct timeval now;
-	struct rpc_msg call_msg;
-	static uint32_t disrupt;
-	sigset_t mask;
-	sigset_t newmask;
-	struct sockaddr_storage ss;
-	socklen_t slen;
-	struct __rpc_sockinfo si;
-
-	if (disrupt == 0)
-		disrupt = (uint32_t)(long)raddr;
-
-	cl = (CLIENT *)mem_alloc(sizeof (*cl));
-	ct = (struct ct_data *)mem_alloc(sizeof (*ct));
-	if ((cl == (CLIENT *)NULL) || (ct == (struct ct_data *)NULL)) {
-		(void) syslog(LOG_ERR, clnt_vc_errstr,
-		    clnt_vc_str, __no_mem_str);
-		rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-		rpc_createerr.cf_error.re_errno = errno;
-		goto err;
-	}
-	ct->ct_addr.buf = NULL;
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	if (vc_fd_locks == (int *) NULL) {
-		int cv_allocsz, fd_allocsz;
-		int dtbsize = __rpc_dtbsize();
-
-		fd_allocsz = dtbsize * sizeof (int);
-		vc_fd_locks = (int *) mem_alloc(fd_allocsz);
-		if (vc_fd_locks == (int *) NULL) {
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err;
-		} else
-			memset(vc_fd_locks, '\0', fd_allocsz);
-
-		assert(vc_cv == (cond_t *) NULL);
-		cv_allocsz = dtbsize * sizeof (cond_t);
-		vc_cv = (cond_t *) mem_alloc(cv_allocsz);
-		if (vc_cv == (cond_t *) NULL) {
-			mem_free(vc_fd_locks, fd_allocsz);
-			vc_fd_locks = (int *) NULL;
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err;
-		} else {
-			int i;
-
-			for (i = 0; i < dtbsize; i++)
-				cond_init(&vc_cv[i], 0, (void *) 0);
-		}
-	} else
-		assert(vc_cv != (cond_t *) NULL);
-
-	/*
-	 * XXX - fvdl connecting while holding a mutex?
-	 */
-	slen = sizeof ss;
-	if (_getpeername(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		if (errno != ENOTCONN) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err;
-		}
-		if (_connect(fd, (struct sockaddr *)raddr->buf, raddr->len) < 0){
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			mutex_unlock(&clnt_fd_lock);
-			thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-			goto err;
-		}
-	}
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	if (!__rpc_fd2sockinfo(fd, &si))
-		goto err;
-
-	ct->ct_closeit = FALSE;
-
-	/*
-	 * Set up private data struct
-	 */
-	ct->ct_fd = fd;
-	ct->ct_wait.tv_usec = 0;
-	ct->ct_waitset = FALSE;
-	ct->ct_addr.buf = malloc(raddr->maxlen);
-	if (ct->ct_addr.buf == NULL)
-		goto err;
-	memcpy(ct->ct_addr.buf, raddr->buf, raddr->len);
-	ct->ct_addr.len = raddr->len;
-	ct->ct_addr.maxlen = raddr->maxlen;
-
-	/*
-	 * Initialize call message
-	 */
-	(void)gettimeofday(&now, NULL);
-	call_msg.rm_xid = ((uint32_t)++disrupt) ^ __RPC_GETXID(&now);
-	call_msg.rm_direction = CALL;
-	call_msg.rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	call_msg.rm_call.cb_prog = (uint32_t)prog;
-	call_msg.rm_call.cb_vers = (uint32_t)vers;
-
-	/*
-	 * pre-serialize the static part of the call msg and stash it away
-	 */
-	xdrmem_create(&(ct->ct_xdrs), ct->ct_u.ct_mcallc, MCALL_MSG_SIZE,
-	    XDR_ENCODE);
-	if (! xdr_callhdr(&(ct->ct_xdrs), &call_msg)) {
-		if (ct->ct_closeit) {
-			(void)_close(fd);
-		}
-		goto err;
-	}
-	ct->ct_mpos = XDR_GETPOS(&(ct->ct_xdrs));
-	XDR_DESTROY(&(ct->ct_xdrs));
-	assert(ct->ct_mpos + sizeof(uint32_t) <= MCALL_MSG_SIZE);
-
-	/*
-	 * Create a client handle which uses xdrrec for serialization
-	 * and authnone for authentication.
-	 */
-	cl->cl_ops = clnt_vc_ops();
-	cl->cl_private = ct;
-	cl->cl_auth = authnone_create();
-	sendsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsz);
-	recvsz = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsz);
-	xdrrec_create(&(ct->ct_xdrs), sendsz, recvsz,
-	    cl->cl_private, read_vc, write_vc);
-	return (cl);
-
-err:
-	if (ct) {
-		if (ct->ct_addr.len)
-			mem_free(ct->ct_addr.buf, ct->ct_addr.len);
-		mem_free(ct, sizeof (struct ct_data));
-	}
-	if (cl)
-		mem_free(cl, sizeof (CLIENT));
-	return ((CLIENT *)NULL);
-}
-
-static enum clnt_stat
-clnt_vc_call(cl, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
-	CLIENT *cl;
-	rpcproc_t proc;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-	xdrproc_t xdr_results;
-	void *results_ptr;
-	struct timeval timeout;
-{
-	struct ct_data *ct = (struct ct_data *) cl->cl_private;
-	XDR *xdrs = &(ct->ct_xdrs);
-	struct rpc_msg reply_msg;
-	uint32_t x_id;
-	uint32_t *msg_x_id = &ct->ct_u.ct_mcalli;    /* yuk */
-	bool_t shipnow;
-	int refreshes = 2;
-	sigset_t mask, newmask;
-	int rpc_lock_value;
-	bool_t reply_stat;
-
-	assert(cl != NULL);
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (vc_fd_locks[ct->ct_fd])
-		cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock);
-	if (__isthreaded)
-                rpc_lock_value = 1;
-        else
-                rpc_lock_value = 0;
-	vc_fd_locks[ct->ct_fd] = rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-	if (!ct->ct_waitset) {
-		/* If time is not within limits, we ignore it. */
-		if (time_not_ok(&timeout) == FALSE)
-			ct->ct_wait = timeout;
-	}
-
-	shipnow =
-	    (xdr_results == NULL && timeout.tv_sec == 0
-	    && timeout.tv_usec == 0) ? FALSE : TRUE;
-
-call_again:
-	xdrs->x_op = XDR_ENCODE;
-	ct->ct_error.re_status = RPC_SUCCESS;
-	x_id = ntohl(--(*msg_x_id));
-
-	if (cl->cl_auth->ah_cred.oa_flavor != RPCSEC_GSS) {
-		if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) ||
-		    (! XDR_PUTINT32(xdrs, &proc)) ||
-		    (! AUTH_MARSHALL(cl->cl_auth, xdrs)) ||
-		    (! (*xdr_args)(xdrs, args_ptr))) {
-			if (ct->ct_error.re_status == RPC_SUCCESS)
-				ct->ct_error.re_status = RPC_CANTENCODEARGS;
-			(void)xdrrec_endofrecord(xdrs, TRUE);
-			release_fd_lock(ct->ct_fd, mask);
-			return (ct->ct_error.re_status);
-		}
-	} else {
-		*(uint32_t *) &ct->ct_u.ct_mcallc[ct->ct_mpos] = htonl(proc);
-		if (! __rpc_gss_wrap(cl->cl_auth, ct->ct_u.ct_mcallc,
-			ct->ct_mpos + sizeof(uint32_t),
-			xdrs, xdr_args, args_ptr)) {
-			if (ct->ct_error.re_status == RPC_SUCCESS)
-				ct->ct_error.re_status = RPC_CANTENCODEARGS;
-			(void)xdrrec_endofrecord(xdrs, TRUE);
-			release_fd_lock(ct->ct_fd, mask);
-			return (ct->ct_error.re_status);
-		}
-	}
-	if (! xdrrec_endofrecord(xdrs, shipnow)) {
-		release_fd_lock(ct->ct_fd, mask);
-		return (ct->ct_error.re_status = RPC_CANTSEND);
-	}
-	if (! shipnow) {
-		release_fd_lock(ct->ct_fd, mask);
-		return (RPC_SUCCESS);
-	}
-	/*
-	 * Hack to provide rpc-based message passing
-	 */
-	if (timeout.tv_sec == 0 && timeout.tv_usec == 0) {
-		release_fd_lock(ct->ct_fd, mask);
-		return(ct->ct_error.re_status = RPC_TIMEDOUT);
-	}
-
-
-	/*
-	 * Keep receiving until we get a valid transaction id
-	 */
-	xdrs->x_op = XDR_DECODE;
-	while (TRUE) {
-		reply_msg.acpted_rply.ar_verf = _null_auth;
-		reply_msg.acpted_rply.ar_results.where = NULL;
-		reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void;
-		if (! xdrrec_skiprecord(xdrs)) {
-			release_fd_lock(ct->ct_fd, mask);
-			return (ct->ct_error.re_status);
-		}
-		/* now decode and validate the response header */
-		if (! xdr_replymsg(xdrs, &reply_msg)) {
-			if (ct->ct_error.re_status == RPC_SUCCESS)
-				continue;
-			release_fd_lock(ct->ct_fd, mask);
-			return (ct->ct_error.re_status);
-		}
-		if (reply_msg.rm_xid == x_id)
-			break;
-	}
-
-	/*
-	 * process header
-	 */
-	_seterr_reply(&reply_msg, &(ct->ct_error));
-	if (ct->ct_error.re_status == RPC_SUCCESS) {
-		if (! AUTH_VALIDATE(cl->cl_auth,
-		    &reply_msg.acpted_rply.ar_verf)) {
-			ct->ct_error.re_status = RPC_AUTHERROR;
-			ct->ct_error.re_why = AUTH_INVALIDRESP;
-		} else {
-			if (cl->cl_auth->ah_cred.oa_flavor != RPCSEC_GSS) {
-				reply_stat = (*xdr_results)(xdrs, results_ptr);
-			} else {
-				reply_stat = __rpc_gss_unwrap(cl->cl_auth,
-				    xdrs, xdr_results, results_ptr);
-			}
-			if (! reply_stat) {
-				if (ct->ct_error.re_status == RPC_SUCCESS)
-					ct->ct_error.re_status =
-						RPC_CANTDECODERES;
-			}
-		}
-		/* free verifier ... */
-		if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) {
-			xdrs->x_op = XDR_FREE;
-			(void)xdr_opaque_auth(xdrs,
-			    &(reply_msg.acpted_rply.ar_verf));
-		}
-	}  /* end successful completion */
-	else {
-		/* maybe our credentials need to be refreshed ... */
-		if (refreshes-- && AUTH_REFRESH(cl->cl_auth, &reply_msg))
-			goto call_again;
-	}  /* end of unsuccessful completion */
-	release_fd_lock(ct->ct_fd, mask);
-	return (ct->ct_error.re_status);
-}
-
-static void
-clnt_vc_geterr(cl, errp)
-	CLIENT *cl;
-	struct rpc_err *errp;
-{
-	struct ct_data *ct;
-
-	assert(cl != NULL);
-	assert(errp != NULL);
-
-	ct = (struct ct_data *) cl->cl_private;
-	*errp = ct->ct_error;
-}
-
-static bool_t
-clnt_vc_freeres(cl, xdr_res, res_ptr)
-	CLIENT *cl;
-	xdrproc_t xdr_res;
-	void *res_ptr;
-{
-	struct ct_data *ct;
-	XDR *xdrs;
-	bool_t dummy;
-	sigset_t mask;
-	sigset_t newmask;
-
-	assert(cl != NULL);
-
-	ct = (struct ct_data *)cl->cl_private;
-	xdrs = &(ct->ct_xdrs);
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (vc_fd_locks[ct->ct_fd])
-		cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock);
-	xdrs->x_op = XDR_FREE;
-	dummy = (*xdr_res)(xdrs, res_ptr);
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	cond_signal(&vc_cv[ct->ct_fd]);
-
-	return dummy;
-}
-
-/*ARGSUSED*/
-static void
-clnt_vc_abort(cl)
-	CLIENT *cl;
-{
-}
-
-static bool_t
-clnt_vc_control(cl, request, info)
-	CLIENT *cl;
-	u_int request;
-	void *info;
-{
-	struct ct_data *ct;
-	void *infop = info;
-	sigset_t mask;
-	sigset_t newmask;
-	int rpc_lock_value;
-
-	assert(cl != NULL);
-
-	ct = (struct ct_data *)cl->cl_private;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (vc_fd_locks[ct->ct_fd])
-		cond_wait(&vc_cv[ct->ct_fd], &clnt_fd_lock);
-	if (__isthreaded)
-                rpc_lock_value = 1;
-        else
-                rpc_lock_value = 0;
-	vc_fd_locks[ct->ct_fd] = rpc_lock_value;
-	mutex_unlock(&clnt_fd_lock);
-
-	switch (request) {
-	case CLSET_FD_CLOSE:
-		ct->ct_closeit = TRUE;
-		release_fd_lock(ct->ct_fd, mask);
-		return (TRUE);
-	case CLSET_FD_NCLOSE:
-		ct->ct_closeit = FALSE;
-		release_fd_lock(ct->ct_fd, mask);
-		return (TRUE);
-	default:
-		break;
-	}
-
-	/* for other requests which use info */
-	if (info == NULL) {
-		release_fd_lock(ct->ct_fd, mask);
-		return (FALSE);
-	}
-	switch (request) {
-	case CLSET_TIMEOUT:
-		if (time_not_ok((struct timeval *)info)) {
-			release_fd_lock(ct->ct_fd, mask);
-			return (FALSE);
-		}
-		ct->ct_wait = *(struct timeval *)infop;
-		ct->ct_waitset = TRUE;
-		break;
-	case CLGET_TIMEOUT:
-		*(struct timeval *)infop = ct->ct_wait;
-		break;
-	case CLGET_SERVER_ADDR:
-		(void) memcpy(info, ct->ct_addr.buf, (size_t)ct->ct_addr.len);
-		break;
-	case CLGET_FD:
-		*(int *)info = ct->ct_fd;
-		break;
-	case CLGET_SVC_ADDR:
-		/* The caller should not free this memory area */
-		*(struct netbuf *)info = ct->ct_addr;
-		break;
-	case CLSET_SVC_ADDR:		/* set to new address */
-		release_fd_lock(ct->ct_fd, mask);
-		return (FALSE);
-	case CLGET_XID:
-		/*
-		 * use the knowledge that xid is the
-		 * first element in the call structure
-		 * This will get the xid of the PREVIOUS call
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)&ct->ct_u.ct_mcalli);
-		break;
-	case CLSET_XID:
-		/* This will set the xid of the NEXT call */
-		*(uint32_t *)(void *)&ct->ct_u.ct_mcalli =
-		    htonl(*((uint32_t *)info) + 1);
-		/* increment by 1 as clnt_vc_call() decrements once */
-		break;
-	case CLGET_VERS:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the version number field is the fifth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    4 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_VERS:
-		*(uint32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    4 * BYTES_PER_XDR_UNIT) =
-		    htonl(*(uint32_t *)info);
-		break;
-
-	case CLGET_PROG:
-		/*
-		 * This RELIES on the information that, in the call body,
-		 * the program number field is the fourth field from the
-		 * begining of the RPC header. MUST be changed if the
-		 * call_struct is changed
-		 */
-		*(uint32_t *)info =
-		    ntohl(*(uint32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    3 * BYTES_PER_XDR_UNIT));
-		break;
-
-	case CLSET_PROG:
-		*(uint32_t *)(void *)(ct->ct_u.ct_mcallc +
-		    3 * BYTES_PER_XDR_UNIT) =
-		    htonl(*(uint32_t *)info);
-		break;
-
-	default:
-		release_fd_lock(ct->ct_fd, mask);
-		return (FALSE);
-	}
-	release_fd_lock(ct->ct_fd, mask);
-	return (TRUE);
-}
-
-
-static void
-clnt_vc_destroy(cl)
-	CLIENT *cl;
-{
-	struct ct_data *ct = (struct ct_data *) cl->cl_private;
-	int ct_fd = ct->ct_fd;
-	sigset_t mask;
-	sigset_t newmask;
-
-	assert(cl != NULL);
-
-	ct = (struct ct_data *) cl->cl_private;
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&clnt_fd_lock);
-	while (vc_fd_locks[ct_fd])
-		cond_wait(&vc_cv[ct_fd], &clnt_fd_lock);
-	if (ct->ct_closeit && ct->ct_fd != -1) {
-		(void)_close(ct->ct_fd);
-	}
-	XDR_DESTROY(&(ct->ct_xdrs));
-	if (ct->ct_addr.buf)
-		free(ct->ct_addr.buf);
-	mem_free(ct, sizeof(struct ct_data));
-	if (cl->cl_netid && cl->cl_netid[0])
-		mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);
-	if (cl->cl_tp && cl->cl_tp[0])
-		mem_free(cl->cl_tp, strlen(cl->cl_tp) +1);
-	mem_free(cl, sizeof(CLIENT));
-	mutex_unlock(&clnt_fd_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	cond_signal(&vc_cv[ct_fd]);
-}
-
-/*
- * Interface between xdr serializer and tcp connection.
- * Behaves like the system calls, read & write, but keeps some error state
- * around for the rpc level.
- */
-static int
-read_vc(ctp, buf, len)
-	void *ctp;
-	void *buf;
-	int len;
-{
-	struct sockaddr sa;
-	socklen_t sal;
-	struct ct_data *ct = (struct ct_data *)ctp;
-	struct pollfd fd;
-	int milliseconds = (int)((ct->ct_wait.tv_sec * 1000) +
-	    (ct->ct_wait.tv_usec / 1000));
-
-	if (len == 0)
-		return (0);
-	fd.fd = ct->ct_fd;
-	fd.events = POLLIN;
-	for (;;) {
-		switch (_poll(&fd, 1, milliseconds)) {
-		case 0:
-			ct->ct_error.re_status = RPC_TIMEDOUT;
-			return (-1);
-
-		case -1:
-			if (errno == EINTR)
-				continue;
-			ct->ct_error.re_status = RPC_CANTRECV;
-			ct->ct_error.re_errno = errno;
-			return (-1);
-		}
-		break;
-	}
-
-	sal = sizeof(sa);
-	if ((_getpeername(ct->ct_fd, &sa, &sal) == 0) &&
-	    (sa.sa_family == AF_LOCAL)) {
-		len = __msgread(ct->ct_fd, buf, (size_t)len);
-	} else {
-		len = _read(ct->ct_fd, buf, (size_t)len);
-	}
-
-	switch (len) {
-	case 0:
-		/* premature eof */
-		ct->ct_error.re_errno = ECONNRESET;
-		ct->ct_error.re_status = RPC_CANTRECV;
-		len = -1;  /* it's really an error */
-		break;
-
-	case -1:
-		ct->ct_error.re_errno = errno;
-		ct->ct_error.re_status = RPC_CANTRECV;
-		break;
-	}
-	return (len);
-}
-
-static int
-write_vc(ctp, buf, len)
-	void *ctp;
-	void *buf;
-	int len;
-{
-	struct sockaddr sa;
-	socklen_t sal;
-	struct ct_data *ct = (struct ct_data *)ctp;
-	int i, cnt;
-
-	sal = sizeof(sa);
-	if ((_getpeername(ct->ct_fd, &sa, &sal) == 0) &&
-	    (sa.sa_family == AF_LOCAL)) {
-		for (cnt = len; cnt > 0; cnt -= i, buf = (char *)buf + i) {
-			if ((i = __msgwrite(ct->ct_fd, buf,
-			     (size_t)cnt)) == -1) {
-				ct->ct_error.re_errno = errno;
-				ct->ct_error.re_status = RPC_CANTSEND;
-				return (-1);
-			}
-		}
-	} else {
-		for (cnt = len; cnt > 0; cnt -= i, buf = (char *)buf + i) {
-			if ((i = _write(ct->ct_fd, buf, (size_t)cnt)) == -1) {
-				ct->ct_error.re_errno = errno;
-				ct->ct_error.re_status = RPC_CANTSEND;
-				return (-1);
-			}
-		}
-	}
-	return (len);
-}
-
-static struct clnt_ops *
-clnt_vc_ops()
-{
-	static struct clnt_ops ops;
-	sigset_t mask, newmask;
-
-	/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	sigfillset(&newmask);
-	thr_sigsetmask(SIG_SETMASK, &newmask, &mask);
-	mutex_lock(&ops_lock);
-	if (ops.cl_call == NULL) {
-		ops.cl_call = clnt_vc_call;
-		ops.cl_abort = clnt_vc_abort;
-		ops.cl_geterr = clnt_vc_geterr;
-		ops.cl_freeres = clnt_vc_freeres;
-		ops.cl_destroy = clnt_vc_destroy;
-		ops.cl_control = clnt_vc_control;
-	}
-	mutex_unlock(&ops_lock);
-	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);
-	return (&ops);
-}
-
-/*
- * Make sure that the time is not garbage.   -1 value is disallowed.
- * Note this is different from time_not_ok in clnt_dg.c
- */
-static bool_t
-time_not_ok(t)
-	struct timeval *t;
-{
-	return (t->tv_sec <= -1 || t->tv_sec > 100000000 ||
-		t->tv_usec <= -1 || t->tv_usec > 1000000);
-}
-
-static int
-__msgread(sock, buf, cnt)
-	int sock;
-	void *buf;
-	size_t cnt;
-{
-	struct iovec iov[1];
-	struct msghdr msg;
-	union {
-		struct cmsghdr cmsg;
-		char control[CMSG_SPACE(sizeof(struct cmsgcred))];
-	} cm;
- 
-	bzero((char *)&cm, sizeof(cm));
-	iov[0].iov_base = buf;
-	iov[0].iov_len = cnt;
- 
-	msg.msg_iov = iov;
-	msg.msg_iovlen = 1;
-	msg.msg_name = NULL;
-	msg.msg_namelen = 0;
-	msg.msg_control = (caddr_t)&cm;
-	msg.msg_controllen = CMSG_SPACE(sizeof(struct cmsgcred));
-	msg.msg_flags = 0;
- 
-	return(_recvmsg(sock, &msg, 0));
-}
-
-static int
-__msgwrite(sock, buf, cnt)
-	int sock;
-	void *buf;
-	size_t cnt;
-{
-	struct iovec iov[1];
-	struct msghdr msg;
-	union {
-		struct cmsghdr cmsg;
-		char control[CMSG_SPACE(sizeof(struct cmsgcred))];
-	} cm;
- 
-	bzero((char *)&cm, sizeof(cm));
-	iov[0].iov_base = buf;
-	iov[0].iov_len = cnt;
- 
-	cm.cmsg.cmsg_type = SCM_CREDS;
-	cm.cmsg.cmsg_level = SOL_SOCKET;
-	cm.cmsg.cmsg_len = CMSG_LEN(sizeof(struct cmsgcred));
- 
-	msg.msg_iov = iov;
-	msg.msg_iovlen = 1;
-	msg.msg_name = NULL;
-	msg.msg_namelen = 0;
-	msg.msg_control = (caddr_t)&cm;
-	msg.msg_controllen = CMSG_SPACE(sizeof(struct cmsgcred));
-	msg.msg_flags = 0;
-
-	return(_sendmsg(sock, &msg, 0));
-}
diff --git a/lib/libc_bsd/rpc/crypt_client.c b/lib/libc_bsd/rpc/crypt_client.c
deleted file mode 100644
index 042f579..0000000
--- a/lib/libc_bsd/rpc/crypt_client.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1996
- *	Bill Paul <wpaul@ctr.columbia.edu>.  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 Bill Paul.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/crypt_client.c 228538 2011-12-15 20:27:36Z dim $");
-
-#include "namespace.h"
-#include <err.h>
-#include <sys/types.h>
-#include <rpc/des_crypt.h>
-#include <rpc/des.h>
-#include <string.h>
-#include <rpcsvc/crypt.h>
-#include "un-namespace.h"
-
-int
-_des_crypt_call(buf, len, dparms)
-	char *buf;
-	int len;
-	struct desparams *dparms;
-{
-	CLIENT *clnt;
-	desresp  *result_1;
-	desargs  des_crypt_1_arg;
-	struct netconfig *nconf;
-	void *localhandle;
-	int stat;
-
-	nconf = NULL;
-	localhandle = setnetconfig();
-	while ((nconf = getnetconfig(localhandle)) != NULL) {
-		if (nconf->nc_protofmly != NULL &&
-		     strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
-			break;
-	}
-	if (nconf == NULL) {
-		warnx("getnetconfig: %s", nc_sperror());
-		return(DESERR_HWERROR);
-	}
-	clnt = clnt_tp_create(NULL, CRYPT_PROG, CRYPT_VERS, nconf);
-	if (clnt == (CLIENT *) NULL) {
-		endnetconfig(localhandle);
-		return(DESERR_HWERROR);
-	}
-	endnetconfig(localhandle);
-
-	des_crypt_1_arg.desbuf.desbuf_len = len;
-	des_crypt_1_arg.desbuf.desbuf_val = buf;
-	des_crypt_1_arg.des_dir = (dparms->des_dir == ENCRYPT) ? ENCRYPT_DES : DECRYPT_DES;
-	des_crypt_1_arg.des_mode = (dparms->des_mode == CBC) ? CBC_DES : ECB_DES;
-	bcopy(dparms->des_ivec, des_crypt_1_arg.des_ivec, 8);
-	bcopy(dparms->des_key, des_crypt_1_arg.des_key, 8);
-
-	result_1 = des_crypt_1(&des_crypt_1_arg, clnt);
-	if (result_1 == (desresp *) NULL) {
-		clnt_destroy(clnt);
-		return(DESERR_HWERROR);
-	}
-
-	stat = result_1->stat;
-
-	if (result_1->stat == DESERR_NONE ||
-	    result_1->stat == DESERR_NOHWDEVICE) {
-		bcopy(result_1->desbuf.desbuf_val, buf, len);
-		bcopy(result_1->des_ivec, dparms->des_ivec, 8);
-	}
-
-	clnt_freeres(clnt, (xdrproc_t)xdr_desresp, result_1);
-	clnt_destroy(clnt);
-
-	return(stat);
-}
diff --git a/lib/libc_bsd/rpc/des_crypt.3 b/lib/libc_bsd/rpc/des_crypt.3
deleted file mode 100644
index 68839ab..0000000
--- a/lib/libc_bsd/rpc/des_crypt.3
+++ /dev/null
@@ -1,130 +0,0 @@
-.\" @(#)des_crypt.3	2.1 88/08/11 4.0 RPCSRC; from 1.16 88/03/02 SMI;
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/des_crypt.3 108087 2002-12-19 09:40:28Z ru $
-.\"
-.Dd October 6, 1987
-.Dt DES_CRYPT 3
-.Os
-.Sh NAME
-.Nm des_crypt , ecb_crypt , cbc_crypt , des_setparity
-.Nd "fast DES encryption"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/des_crypt.h
-.Ft int
-.Fn ecb_crypt "char *key" "char *data" "unsigned datalen" "unsigned mode"
-.Ft int
-.Fn cbc_crypt "char *key" "char *data" "unsigned datalen" "unsigned mode" "char *ivec"
-.Ft void
-.Fn des_setparity "char *key"
-.Sh DESCRIPTION
-The
-.Fn ecb_crypt
-and
-.Fn cbc_crypt
-functions
-implement the
-.Tn NBS
-.Tn DES
-(Data Encryption Standard).
-These routines are faster and more general purpose than
-.Xr crypt 3 .
-They also are able to utilize
-.Tn DES
-hardware if it is available.
-The
-.Fn ecb_crypt
-function
-encrypts in
-.Tn ECB
-(Electronic Code Book)
-mode, which encrypts blocks of data independently.
-The
-.Fn cbc_crypt
-function
-encrypts in
-.Tn CBC
-(Cipher Block Chaining)
-mode, which chains together
-successive blocks.
-.Tn CBC
-mode protects against insertions, deletions and
-substitutions of blocks.
-Also, regularities in the clear text will
-not appear in the cipher text.
-.Pp
-Here is how to use these routines.
-The first argument,
-.Fa key ,
-is the 8-byte encryption key with parity.
-To set the key's parity, which for
-.Tn DES
-is in the low bit of each byte, use
-.Fn des_setparity .
-The second argument,
-.Fa data ,
-contains the data to be encrypted or decrypted.
-The
-third argument,
-.Fa datalen ,
-is the length in bytes of
-.Fa data ,
-which must be a multiple of 8.
-The fourth argument,
-.Fa mode ,
-is formed by
-.Em OR Ns 'ing
-together some things.
-For the encryption direction
-.Em OR
-in either
-.Dv DES_ENCRYPT
-or
-.Dv DES_DECRYPT .
-For software versus hardware
-encryption,
-.Em OR
-in either
-.Dv DES_HW
-or
-.Dv DES_SW .
-If
-.Dv DES_HW
-is specified, and there is no hardware, then the encryption is performed
-in software and the routine returns
-.Er DESERR_NOHWDEVICE .
-For
-.Fn cbc_crypt ,
-the
-.Fa ivec
-argument
-is the 8-byte initialization
-vector for the chaining.
-It is updated to the next initialization
-vector upon return.
-.Sh ERRORS
-.Bl -tag -width [DESERR_NOHWDEVICE] -compact
-.It Bq Er DESERR_NONE
-No error.
-.It Bq Er DESERR_NOHWDEVICE
-Encryption succeeded, but done in software instead of the requested hardware.
-.It Bq Er DESERR_HWERR
-An error occurred in the hardware or driver.
-.It Bq Er DESERR_BADPARAM
-Bad argument to routine.
-.El
-.Pp
-Given a result status
-.Va stat ,
-the macro
-.Fn DES_FAILED stat
-is false only for the first two statuses.
-.Sh SEE ALSO
-.\" .Xr des 1 ,
-.Xr crypt 3
-.Sh RESTRICTIONS
-These routines are not available in RPCSRC 4.0.
-This information is provided to describe the
-.Tn DES
-interface expected by
-Secure RPC.
diff --git a/lib/libc_bsd/rpc/des_crypt.c b/lib/libc_bsd/rpc/des_crypt.c
deleted file mode 100644
index 36ca3d7..0000000
--- a/lib/libc_bsd/rpc/des_crypt.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * des_crypt.c, DES encryption library routines
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-
-#include <sys/types.h>
-#include <rpc/des_crypt.h>
-#include <rpc/des.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)des_crypt.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/des_crypt.c 261046 2014-01-22 23:45:27Z mav $");
-
-static int common_crypt( char *, char *, unsigned, unsigned, struct desparams * );
-int (*__des_crypt_LOCAL)() = 0;
-extern int _des_crypt_call(char *, int, struct desparams *);
-/*
- * Copy 8 bytes
- */
-#define COPY8(src, dst) { \
-	char *a = (char *) dst; \
-	char *b = (char *) src; \
-	*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
-	*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
-}
- 
-/*
- * Copy multiple of 8 bytes
- */
-#define DESCOPY(src, dst, len) { \
-	char *a = (char *) dst; \
-	char *b = (char *) src; \
-	int i; \
-	for (i = (int) len; i > 0; i -= 8) { \
-		*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
-		*a++ = *b++; *a++ = *b++; *a++ = *b++; *a++ = *b++; \
-	} \
-}
-
-/*
- * CBC mode encryption
- */
-int
-cbc_crypt(key, buf, len, mode, ivec)
-	char *key;
-	char *buf;
-	unsigned len;
-	unsigned mode;
-	char *ivec;	
-{
-	int err;
-	struct desparams dp;
-
-#ifdef BROKEN_DES
-	dp.UDES.UDES_buf = buf;
-	dp.des_mode = ECB;
-#else
-	dp.des_mode = CBC;
-#endif
-	COPY8(ivec, dp.des_ivec);
-	err = common_crypt(key, buf, len, mode, &dp);
-	COPY8(dp.des_ivec, ivec);
-	return(err);
-}
-
-
-/*
- * ECB mode encryption
- */
-int
-ecb_crypt(key, buf, len, mode)
-	char *key;
-	char *buf;
-	unsigned len;
-	unsigned mode;
-{
-	struct desparams dp;
-
-#ifdef BROKEN_DES
-	dp.UDES.UDES_buf = buf;
-	dp.des_mode = CBC;
-#else
-	dp.des_mode = ECB;
-#endif
-	return(common_crypt(key, buf, len, mode, &dp));
-}
-
-
-
-/*
- * Common code to cbc_crypt() & ecb_crypt()
- */
-static int
-common_crypt(key, buf, len, mode, desp)	
-	char *key;	
-	char *buf;
-	unsigned len;
-	unsigned mode;
-	struct desparams *desp;
-{
-	int desdev;
-
-	if ((len % 8) != 0 || len > DES_MAXDATA) {
-		return(DESERR_BADPARAM);
-	}
-	desp->des_dir =
-		((mode & DES_DIRMASK) == DES_ENCRYPT) ? ENCRYPT : DECRYPT;
-
-	desdev = mode & DES_DEVMASK;
-	COPY8(key, desp->des_key);
-	/* 
-	 * software
-	 */
-	if (__des_crypt_LOCAL != NULL) {
-		if (!__des_crypt_LOCAL(buf, len, desp)) {
-			return (DESERR_HWERROR);
-		}
-	} else {
-		if (!_des_crypt_call(buf, len, desp)) {
-			return (DESERR_HWERROR);
-		}
-	}
-	return(desdev == DES_SW ? DESERR_NONE : DESERR_NOHWDEVICE);
-}
diff --git a/lib/libc_bsd/rpc/des_soft.c b/lib/libc_bsd/rpc/des_soft.c
deleted file mode 100644
index e9d39c8..0000000
--- a/lib/libc_bsd/rpc/des_soft.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)des_soft.c	2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/des_soft.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * Table giving odd parity in the low bit for ASCII characters
- */
-static char partab[128] = {
-	0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x07, 0x07,
-	0x08, 0x08, 0x0b, 0x0b, 0x0d, 0x0d, 0x0e, 0x0e,
-	0x10, 0x10, 0x13, 0x13, 0x15, 0x15, 0x16, 0x16,
-	0x19, 0x19, 0x1a, 0x1a, 0x1c, 0x1c, 0x1f, 0x1f,
-	0x20, 0x20, 0x23, 0x23, 0x25, 0x25, 0x26, 0x26,
-	0x29, 0x29, 0x2a, 0x2a, 0x2c, 0x2c, 0x2f, 0x2f,
-	0x31, 0x31, 0x32, 0x32, 0x34, 0x34, 0x37, 0x37,
-	0x38, 0x38, 0x3b, 0x3b, 0x3d, 0x3d, 0x3e, 0x3e,
-	0x40, 0x40, 0x43, 0x43, 0x45, 0x45, 0x46, 0x46,
-	0x49, 0x49, 0x4a, 0x4a, 0x4c, 0x4c, 0x4f, 0x4f,
-	0x51, 0x51, 0x52, 0x52, 0x54, 0x54, 0x57, 0x57,
-	0x58, 0x58, 0x5b, 0x5b, 0x5d, 0x5d, 0x5e, 0x5e,
-	0x61, 0x61, 0x62, 0x62, 0x64, 0x64, 0x67, 0x67,
-	0x68, 0x68, 0x6b, 0x6b, 0x6d, 0x6d, 0x6e, 0x6e,
-	0x70, 0x70, 0x73, 0x73, 0x75, 0x75, 0x76, 0x76,
-	0x79, 0x79, 0x7a, 0x7a, 0x7c, 0x7c, 0x7f, 0x7f,
-};
-
-/*
- * Add odd parity to low bit of 8 byte key
- */
-void
-des_setparity(p)
-	char *p;
-{
-	int i;
-
-	for (i = 0; i < 8; i++) {
-		*p = partab[*p & 0x7f];
-		p++;
-	}
-}
diff --git a/lib/libc_bsd/rpc/getnetconfig.3 b/lib/libc_bsd/rpc/getnetconfig.3
deleted file mode 100644
index 5388a5b..0000000
--- a/lib/libc_bsd/rpc/getnetconfig.3
+++ /dev/null
@@ -1,222 +0,0 @@
-.\" @(#)getnetconfig.3n 1.28 93/06/02 SMI; from SVr4
-.\" $NetBSD: getnetconfig.3,v 1.1 2000/06/02 23:11:11 fvdl Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/getnetconfig.3 108087 2002-12-19 09:40:28Z ru $
-.\" Copyright 1989 AT&T
-.Dd April 22, 2000
-.Dt GETNETCONFIG 3
-.Os
-.Sh NAME
-.Nm getnetconfig ,
-.Nm setnetconfig ,
-.Nm endnetconfig ,
-.Nm getnetconfigent ,
-.Nm freenetconfigent ,
-.Nm nc_perror ,
-.Nm nc_sperror
-.Nd get network configuration database entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netconfig.h
-.Ft "struct netconfig *"
-.Fn getnetconfig "void *handlep"
-.Ft "void *"
-.Fn setnetconfig "void"
-.Ft int
-.Fn endnetconfig "void *handlep"
-.Ft "struct netconfig *"
-.Fn getnetconfigent "const char *netid"
-.Ft void
-.Fn freenetconfigent "struct netconfig *netconfigp"
-.Ft void
-.Fn nc_perror "const char *msg"
-.Ft "char *"
-.Fn nc_sperror "void"
-.Sh DESCRIPTION
-The library routines described on this page
-provide the application access to
-the system network configuration database,
-.Pa /etc/netconfig .
-The
-.Fn getnetconfig
-function
-returns a pointer to the
-current entry in the
-netconfig
-database, formatted as a
-.Ft "struct netconfig" .
-Successive calls will return successive netconfig
-entries in the netconfig database.
-The
-.Fn getnetconfig
-function
-can be used to search the entire netconfig
-file.
-The
-.Fn getnetconfig
-function
-returns
-.Dv NULL
-at the end of the file.
-The
-.Fa handlep
-argument
-is the handle obtained through
-.Fn setnetconfig .
-.Pp
-A call to
-.Fn setnetconfig
-has the effect of
-.Dq binding
-to or
-.Dq rewinding
-the netconfig database.
-The
-.Fn setnetconfig
-function
-must be called before the first call to
-.Fn getnetconfig
-and may be called at any other time.
-The
-.Fn setnetconfig
-function
-need not be called before a call to
-.Fn getnetconfigent .
-The
-.Fn setnetconfig
-function
-returns a unique handle to be used by
-.Fn getnetconfig .
-.Pp
-The
-.Fn endnetconfig
-function
-should be called when processing is complete to release resources for reuse.
-The
-.Fa handlep
-argument
-is the handle obtained through
-.Fn setnetconfig .
-Programmers should be aware, however, that the last call to
-.Fn endnetconfig
-frees all memory allocated by
-.Fn getnetconfig
-for the
-.Ft "struct netconfig"
-data structure.
-The
-.Fn endnetconfig
-function
-may not be called before
-.Fn setnetconfig .
-.Pp
-The
-.Fn getnetconfigent
-function
-returns a pointer
-to the netconfig structure corresponding
-to
-.Fa netid .
-It returns
-.Dv NULL
-if
-.Fa netid
-is invalid
-(that is, does not name an entry in the netconfig database).
-.Pp
-The
-.Fn freenetconfigent
-function
-frees the netconfig structure pointed to by
-.Fa netconfigp
-(previously returned by
-.Fn getnetconfigent ) .
-.Pp
-The
-.Fn nc_perror
-function
-prints a message to the standard error indicating why any of the
-above routines failed.
-The message is prepended with the string
-.Fa msg
-and a colon.
-A newline character is appended at the end of the message.
-.Pp
-The
-.Fn nc_sperror
-function
-is similar to
-.Fn nc_perror
-but instead of sending the message
-to the standard error, will return a pointer to a string that
-contains the error message.
-.Pp
-The
-.Fn nc_perror
-and
-.Fn nc_sperror
-functions
-can also be used with the
-.Ev NETPATH
-access routines defined in
-.Xr getnetpath 3 .
-.Sh RETURN VALUES
-The
-.Fn setnetconfig
-function
-returns a unique handle to be used by
-.Fn getnetconfig .
-In the case of an error,
-.Fn setnetconfig
-returns
-.Dv NULL
-and
-.Fn nc_perror
-or
-.Fn nc_sperror
-can be used to print the reason for failure.
-.Pp
-The
-.Fn getnetconfig
-function
-returns a pointer to the current entry in the netconfig
-database, formatted as a
-.Ft "struct netconfig" .
-The
-.Fn getnetconfig
-function
-returns
-.Dv NULL
-at the end of the file, or upon failure.
-.Pp
-The
-.Fn endnetconfig
-function
-returns 0 on success and \-1 on failure
-(for example, if
-.Fn setnetconfig
-was not called previously).
-.Pp
-On success,
-.Fn getnetconfigent
-returns a pointer to the
-.Ft "struct netconfig"
-structure corresponding to
-.Fa netid ;
-otherwise it returns
-.Dv NULL .
-.Pp
-The
-.Fn nc_sperror
-function
-returns a pointer to a buffer which contains the error message string.
-This buffer is overwritten on each call.
-In multithreaded applications, this buffer is
-implemented as thread-specific data.
-.Sh FILES
-.Bl -tag -width /etc/netconfig -compact
-.It Pa /etc/netconfig
-.El
-.Sh SEE ALSO
-.Xr getnetpath 3 ,
-.Xr netconfig 5
diff --git a/lib/libc_bsd/rpc/getnetconfig.c b/lib/libc_bsd/rpc/getnetconfig.c
deleted file mode 100644
index 6e92c87..0000000
--- a/lib/libc_bsd/rpc/getnetconfig.c
+++ /dev/null
@@ -1,740 +0,0 @@
-/*	$NetBSD: getnetconfig.c,v 1.3 2000/07/06 03:10:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetconfig.c	1.12 91/12/19 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/getnetconfig.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * Copyright (c) 1989 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <stdio.h>
-#include <errno.h>
-#include <netconfig.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <rpc/rpc.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-
-/*
- * The five library routines in this file provide application access to the
- * system network configuration database, /etc/netconfig.  In addition to the
- * netconfig database and the routines for accessing it, the environment
- * variable NETPATH and its corresponding routines in getnetpath.c may also be
- * used to specify the network transport to be used.
- */
-
-
-/*
- * netconfig errors
- */
-
-#define NC_NONETCONFIG	ENOENT
-#define NC_NOMEM	ENOMEM
-#define NC_NOTINIT	EINVAL	    /* setnetconfig was not called first */
-#define NC_BADFILE	EBADF	    /* format for netconfig file is bad */
-#define NC_NOTFOUND	ENOPROTOOPT /* specified netid was not found */
-
-/*
- * semantics as strings (should be in netconfig.h)
- */
-#define NC_TPI_CLTS_S	    "tpi_clts"
-#define	NC_TPI_COTS_S	    "tpi_cots"
-#define	NC_TPI_COTS_ORD_S   "tpi_cots_ord"
-#define	NC_TPI_RAW_S        "tpi_raw"
-
-/*
- * flags as characters (also should be in netconfig.h)
- */
-#define	NC_NOFLAG_C	'-'
-#define	NC_VISIBLE_C	'v'
-#define	NC_BROADCAST_C	'b'
-
-/*
- * Character used to indicate there is no name-to-address lookup library
- */
-#define NC_NOLOOKUP	"-"
-
-static const char * const _nc_errors[] = {
-    "Netconfig database not found",
-    "Not enough memory",
-    "Not initialized",
-    "Netconfig database has invalid format",
-    "Netid not found in netconfig database"
-};
-
-struct netconfig_info {
-    int		eof;	/* all entries has been read */
-    int		ref;	/* # of times setnetconfig() has been called */
-    struct netconfig_list	*head;	/* head of the list */
-    struct netconfig_list	*tail;	/* last of the list */
-};
-
-struct netconfig_list {
-    char			*linep;	/* hold line read from netconfig */
-    struct netconfig		*ncp;
-    struct netconfig_list	*next;
-};
-
-struct netconfig_vars {
-    int   valid;	/* token that indicates a valid netconfig_vars */
-    int   flag;		/* first time flag */
-    struct netconfig_list *nc_configs;  /* pointer to the current netconfig entry */
-};
-
-#define NC_VALID	0xfeed
-#define NC_STORAGE	0xf00d
-#define NC_INVALID	0
-
-
-static int *__nc_error(void);
-static int parse_ncp(char *, struct netconfig *);
-static struct netconfig *dup_ncp(struct netconfig *);
-
-
-static FILE *nc_file;		/* for netconfig db */
-static mutex_t nc_file_lock = MUTEX_INITIALIZER;
-
-static struct netconfig_info	ni = { 0, 0, NULL, NULL};
-static mutex_t ni_lock = MUTEX_INITIALIZER;
-
-static thread_key_t nc_key;
-static once_t nc_once = ONCE_INITIALIZER;
-static int nc_key_error;
-
-static void
-nc_key_init(void)
-{
-
-	nc_key_error = thr_keycreate(&nc_key, free);
-}
-
-#define MAXNETCONFIGLINE    1000
-
-static int *
-__nc_error()
-{
-	static int nc_error = 0;
-	int *nc_addr;
-
-	/*
-	 * Use the static `nc_error' if we are the main thread
-	 * (including non-threaded programs), or if an allocation
-	 * fails.
-	 */
-	if (thr_main())
-		return (&nc_error);
-	if (thr_once(&nc_once, nc_key_init) != 0 || nc_key_error != 0)
-		return (&nc_error);
-	if ((nc_addr = (int *)thr_getspecific(nc_key)) == NULL) {
-		nc_addr = (int *)malloc(sizeof (int));
-		if (thr_setspecific(nc_key, (void *) nc_addr) != 0) {
-			if (nc_addr)
-				free(nc_addr);
-			return (&nc_error);
-		}
-		*nc_addr = 0;
-	}
-	return (nc_addr);
-}
-
-#define nc_error        (*(__nc_error()))
-/*
- * A call to setnetconfig() establishes a /etc/netconfig "session".  A session
- * "handle" is returned on a successful call.  At the start of a session (after
- * a call to setnetconfig()) searches through the /etc/netconfig database will
- * proceed from the start of the file.  The session handle must be passed to
- * getnetconfig() to parse the file.  Each call to getnetconfig() using the
- * current handle will process one subsequent entry in /etc/netconfig.
- * setnetconfig() must be called before the first call to getnetconfig().
- * (Handles are used to allow for nested calls to setnetpath()).
- *
- * A new session is established with each call to setnetconfig(), with a new
- * handle being returned on each call.  Previously established sessions remain
- * active until endnetconfig() is called with that session's handle as an
- * argument.
- *
- * setnetconfig() need *not* be called before a call to getnetconfigent().
- * setnetconfig() returns a NULL pointer on failure (for example, if
- * the netconfig database is not present).
- */
-void *
-setnetconfig()
-{
-    struct netconfig_vars *nc_vars;
-
-    if ((nc_vars = (struct netconfig_vars *)malloc(sizeof
-		(struct netconfig_vars))) == NULL) {
-	return(NULL);
-    }
-
-    /*
-     * For multiple calls, i.e. nc_file is not NULL, we just return the
-     * handle without reopening the netconfig db.
-     */
-    mutex_lock(&ni_lock);
-    ni.ref++;
-    mutex_unlock(&ni_lock);
-
-    mutex_lock(&nc_file_lock);
-    if ((nc_file != NULL) || (nc_file = fopen(NETCONFIG, "r")) != NULL) {
-	nc_vars->valid = NC_VALID;
-	nc_vars->flag = 0;
-	nc_vars->nc_configs = ni.head;
-	mutex_unlock(&nc_file_lock);
-	return ((void *)nc_vars);
-    }
-    mutex_unlock(&nc_file_lock);
-
-    mutex_lock(&ni_lock);
-    ni.ref--;
-    mutex_unlock(&ni_lock);
-
-    nc_error = NC_NONETCONFIG;
-    free(nc_vars);
-    return (NULL);
-}
-
-
-/*
- * When first called, getnetconfig() returns a pointer to the first entry in
- * the netconfig database, formatted as a struct netconfig.  On each subsequent
- * call, getnetconfig() returns a pointer to the next entry in the database.
- * getnetconfig() can thus be used to search the entire netconfig file.
- * getnetconfig() returns NULL at end of file.
- */
-
-struct netconfig *
-getnetconfig(handlep)
-void *handlep;
-{
-    struct netconfig_vars *ncp = (struct netconfig_vars *)handlep;
-    char *stringp;		/* tmp string pointer */
-    struct netconfig_list	*list;
-    struct netconfig *np;
-    struct netconfig *result;
-
-    /*
-     * Verify that handle is valid
-     */
-    mutex_lock(&nc_file_lock);
-    if (ncp == NULL || nc_file == NULL) {
-	nc_error = NC_NOTINIT;
-	mutex_unlock(&nc_file_lock);
-	return (NULL);
-    }
-    mutex_unlock(&nc_file_lock);
-
-    switch (ncp->valid) {
-    case NC_VALID:
-	/*
-	 * If entry has already been read into the list,
-	 * we return the entry in the linked list.
-	 * If this is the first time call, check if there are any entries in
-	 * linked list.  If no entries, we need to read the netconfig db.
-	 * If we have been here and the next entry is there, we just return
-	 * it.
-	 */
-	if (ncp->flag == 0) {	/* first time */
-	    ncp->flag = 1;
-	    mutex_lock(&ni_lock);
-	    ncp->nc_configs = ni.head;
-	    mutex_unlock(&ni_lock);
-	    if (ncp->nc_configs != NULL)	/* entry already exist */
-		return(ncp->nc_configs->ncp);
-	}
-	else if (ncp->nc_configs != NULL && ncp->nc_configs->next != NULL) {
-	    ncp->nc_configs = ncp->nc_configs->next;
-	    return(ncp->nc_configs->ncp);
-	}
-
-	/*
-	 * If we cannot find the entry in the list and is end of file,
-	 * we give up.
-	 */
-	mutex_lock(&ni_lock);
-	if (ni.eof == 1) {
-		mutex_unlock(&ni_lock);
-		return(NULL);
-	}
-	mutex_unlock(&ni_lock);
-
-	break;
-    default:
-	nc_error = NC_NOTINIT;
-	return (NULL);
-    }
-
-    stringp = (char *) malloc(MAXNETCONFIGLINE);
-    if (stringp == NULL)
-    	return (NULL);
-
-#ifdef MEM_CHK
-    if (malloc_verify() == 0) {
-	fprintf(stderr, "memory heap corrupted in getnetconfig\n");
-	exit(1);
-    }
-#endif
-
-    /*
-     * Read a line from netconfig file.
-     */
-    mutex_lock(&nc_file_lock);
-    do {
-	if (fgets(stringp, MAXNETCONFIGLINE, nc_file) == NULL) {
-	    free(stringp);
-	    mutex_lock(&ni_lock);
-	    ni.eof = 1;
-	    mutex_unlock(&ni_lock);
-	    mutex_unlock(&nc_file_lock);
-	    return (NULL);
-        }
-    } while (*stringp == '#');
-    mutex_unlock(&nc_file_lock);
-
-    list = (struct netconfig_list *) malloc(sizeof (struct netconfig_list));
-    if (list == NULL) {
-    	free(stringp);
-    	return(NULL);
-    }
-    np = (struct netconfig *) malloc(sizeof (struct netconfig));
-    if (np == NULL) {
-    	free(stringp);
-	free(list);
-    	return(NULL);
-    }
-    list->ncp = np;
-    list->next = NULL;
-    list->ncp->nc_lookups = NULL;
-    list->linep = stringp;
-    if (parse_ncp(stringp, list->ncp) == -1) {
-	free(stringp);
-	free(np);
-	free(list);
-	return (NULL);
-    }
-    else {
-	/*
-	 * If this is the first entry that's been read, it is the head of
-	 * the list.  If not, put the entry at the end of the list.
-	 * Reposition the current pointer of the handle to the last entry
-	 * in the list.
-	 */
-	mutex_lock(&ni_lock);
-	if (ni.head == NULL) {	/* first entry */
-	    ni.head = ni.tail = list;
-	}
-    	else {
-    	    ni.tail->next = list;
-    	    ni.tail = ni.tail->next;
-    	}
-	ncp->nc_configs = ni.tail;
-	result = ni.tail->ncp;
-	mutex_unlock(&ni_lock);
-	return(result);
-    }
-}
-
-/*
- * endnetconfig() may be called to "unbind" or "close" the netconfig database
- * when processing is complete, releasing resources for reuse.  endnetconfig()
- * may not be called before setnetconfig().  endnetconfig() returns 0 on
- * success and -1 on failure (for example, if setnetconfig() was not called
- * previously).
- */
-int
-endnetconfig(handlep)
-void *handlep;
-{
-    struct netconfig_vars *nc_handlep = (struct netconfig_vars *)handlep;
-
-    struct netconfig_list *q, *p;
-
-    /*
-     * Verify that handle is valid
-     */
-    if (nc_handlep == NULL || (nc_handlep->valid != NC_VALID &&
-	    nc_handlep->valid != NC_STORAGE)) {
-	nc_error = NC_NOTINIT;
-	return (-1);
-    }
-
-    /*
-     * Return 0 if anyone still needs it.
-     */
-    nc_handlep->valid = NC_INVALID;
-    nc_handlep->flag = 0;
-    nc_handlep->nc_configs = NULL;
-    mutex_lock(&ni_lock);
-    if (--ni.ref > 0) {
-	mutex_unlock(&ni_lock);
-    	free(nc_handlep);
-	return(0);
-    }
-
-    /*
-     * Noone needs these entries anymore, then frees them.
-     * Make sure all info in netconfig_info structure has been reinitialized.
-     */
-    q = ni.head;
-    ni.eof = ni.ref = 0;
-    ni.head = NULL;
-    ni.tail = NULL;
-    mutex_unlock(&ni_lock);
-
-    while (q != NULL) {
-	p = q->next;
-	if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups);
-	free(q->ncp);
-	free(q->linep);
-	free(q);
-	q = p;
-    }
-    free(nc_handlep);
-
-    mutex_lock(&nc_file_lock);
-    fclose(nc_file);
-    nc_file = NULL;
-    mutex_unlock(&nc_file_lock);
-
-    return (0);
-}
-
-/*
- * getnetconfigent(netid) returns a pointer to the struct netconfig structure
- * corresponding to netid.  It returns NULL if netid is invalid (that is, does
- * not name an entry in the netconfig database).  It returns NULL and sets
- * errno in case of failure (for example, if the netconfig database cannot be
- * opened).
- */
-
-struct netconfig *
-getnetconfigent(netid)
-	const char *netid;
-{
-    FILE *file;		/* NETCONFIG db's file pointer */
-    char *linep;	/* holds current netconfig line */
-    char *stringp;	/* temporary string pointer */
-    struct netconfig *ncp = NULL;   /* returned value */
-    struct netconfig_list *list;	/* pointer to cache list */
-
-    nc_error = NC_NOTFOUND;	/* default error. */
-    if (netid == NULL || strlen(netid) == 0) {
-	return (NULL);
-    }
-
-    /*
-     * Look up table if the entries have already been read and parsed in
-     * getnetconfig(), then copy this entry into a buffer and return it.
-     * If we cannot find the entry in the current list and there are more
-     * entries in the netconfig db that has not been read, we then read the
-     * db and try find the match netid.
-     * If all the netconfig db has been read and placed into the list and
-     * there is no match for the netid, return NULL.
-     */
-    mutex_lock(&ni_lock);
-    if (ni.head != NULL) {
-	for (list = ni.head; list; list = list->next) {
-	    if (strcmp(list->ncp->nc_netid, netid) == 0) {
-		mutex_unlock(&ni_lock);
-	        return(dup_ncp(list->ncp));
-	    }
-	}
-	if (ni.eof == 1) {	/* that's all the entries */
-		mutex_unlock(&ni_lock);
-		return(NULL);
-	}
-    }
-    mutex_unlock(&ni_lock);
-
-
-    if ((file = fopen(NETCONFIG, "r")) == NULL) {
-	nc_error = NC_NONETCONFIG;
-	return (NULL);
-    }
-
-    if ((linep = malloc(MAXNETCONFIGLINE)) == NULL) {
-	fclose(file);
-	nc_error = NC_NOMEM;
-	return (NULL);
-    }
-    do {
-	ptrdiff_t len;
-	char *tmpp;	/* tmp string pointer */
-
-	do {
-	    if ((stringp = fgets(linep, MAXNETCONFIGLINE, file)) == NULL) {
-		break;
-	    }
-	} while (*stringp == '#');
-	if (stringp == NULL) {	    /* eof */
-	    break;
-	}
-	if ((tmpp = strpbrk(stringp, "\t ")) == NULL) {	/* can't parse file */
-	    nc_error = NC_BADFILE;
-	    break;
-	}
-	if (strlen(netid) == (size_t) (len = tmpp - stringp) &&	/* a match */
-		strncmp(stringp, netid, (size_t)len) == 0) {
-	    if ((ncp = (struct netconfig *)
-		    malloc(sizeof (struct netconfig))) == NULL) {
-		break;
-	    }
-	    ncp->nc_lookups = NULL;
-	    if (parse_ncp(linep, ncp) == -1) {
-		free(ncp);
-		ncp = NULL;
-	    }
-	    break;
-	}
-    } while (stringp != NULL);
-    if (ncp == NULL) {
-	free(linep);
-    }
-    fclose(file);
-    return(ncp);
-}
-
-/*
- * freenetconfigent(netconfigp) frees the netconfig structure pointed to by
- * netconfigp (previously returned by getnetconfigent()).
- */
-
-void
-freenetconfigent(netconfigp)
-	struct netconfig *netconfigp;
-{
-    if (netconfigp != NULL) {
-	free(netconfigp->nc_netid);	/* holds all netconfigp's strings */
-	if (netconfigp->nc_lookups != NULL)
-	    free(netconfigp->nc_lookups);
-	free(netconfigp);
-    }
-    return;
-}
-
-/*
- * Parse line and stuff it in a struct netconfig
- * Typical line might look like:
- *	udp tpi_cots vb inet udp /dev/udp /usr/lib/ip.so,/usr/local/ip.so
- *
- * We return -1 if any of the tokens don't parse, or malloc fails.
- *
- * Note that we modify stringp (putting NULLs after tokens) and
- * we set the ncp's string field pointers to point to these tokens within
- * stringp.
- */
-
-static int
-parse_ncp(stringp, ncp)
-char *stringp;		/* string to parse */
-struct netconfig *ncp;	/* where to put results */
-{
-    char    *tokenp;	/* for processing tokens */
-    char    *lasts;
-    char    **nc_lookups;
-
-    nc_error = NC_BADFILE;	/* nearly anything that breaks is for this reason */
-    stringp[strlen(stringp)-1] = '\0';	/* get rid of newline */
-    /* netid */
-    if ((ncp->nc_netid = strtok_r(stringp, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-
-    /* semantics */
-    if ((tokenp = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    if (strcmp(tokenp, NC_TPI_COTS_ORD_S) == 0)
-	ncp->nc_semantics = NC_TPI_COTS_ORD;
-    else if (strcmp(tokenp, NC_TPI_COTS_S) == 0)
-	ncp->nc_semantics = NC_TPI_COTS;
-    else if (strcmp(tokenp, NC_TPI_CLTS_S) == 0)
-	ncp->nc_semantics = NC_TPI_CLTS;
-    else if (strcmp(tokenp, NC_TPI_RAW_S) == 0)
-	ncp->nc_semantics = NC_TPI_RAW;
-    else
-	return (-1);
-
-    /* flags */
-    if ((tokenp = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    for (ncp->nc_flag = NC_NOFLAG; *tokenp != '\0';
-	    tokenp++) {
-	switch (*tokenp) {
-	case NC_NOFLAG_C:
-	    break;
-	case NC_VISIBLE_C:
-	    ncp->nc_flag |= NC_VISIBLE;
-	    break;
-	case NC_BROADCAST_C:
-	    ncp->nc_flag |= NC_BROADCAST;
-	    break;
-	default:
-	    return (-1);
-	}
-    }
-    /* protocol family */
-    if ((ncp->nc_protofmly = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    /* protocol name */
-    if ((ncp->nc_proto = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    /* network device */
-    if ((ncp->nc_device = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    if ((tokenp = strtok_r(NULL, "\t ", &lasts)) == NULL) {
-	return (-1);
-    }
-    if (strcmp(tokenp, NC_NOLOOKUP) == 0) {
-	ncp->nc_nlookups = 0;
-	ncp->nc_lookups = NULL;
-    } else {
-	char *cp;	    /* tmp string */
-
-	if (ncp->nc_lookups != NULL)	/* from last visit */
-	    free(ncp->nc_lookups);
-	ncp->nc_lookups = NULL;
-	ncp->nc_nlookups = 0;
-	while ((cp = tokenp) != NULL) {
-	    if ((nc_lookups = realloc(ncp->nc_lookups,
-		(ncp->nc_nlookups + 1) * sizeof *ncp->nc_lookups)) == NULL) {
-		    free(ncp->nc_lookups);
-		    ncp->nc_lookups = NULL;
-		    return (-1);
-	    }
-	    tokenp = _get_next_token(cp, ',');
-	    ncp->nc_lookups = nc_lookups;
-	    ncp->nc_lookups[ncp->nc_nlookups++] = cp;
-	}
-    }
-    return (0);
-}
-
-
-/*
- * Returns a string describing the reason for failure.
- */
-char *
-nc_sperror()
-{
-    const char *message;
-
-    switch(nc_error) {
-    case NC_NONETCONFIG:
-	message = _nc_errors[0];
-	break;
-    case NC_NOMEM:
-	message = _nc_errors[1];
-	break;
-    case NC_NOTINIT:
-	message = _nc_errors[2];
-	break;
-    case NC_BADFILE:
-	message = _nc_errors[3];
-	break;
-    case NC_NOTFOUND:
-	message = _nc_errors[4];
-	break;
-    default:
-	message = "Unknown network selection error";
-    }
-    /* LINTED const castaway */
-    return ((char *)message);
-}
-
-/*
- * Prints a message onto standard error describing the reason for failure.
- */
-void
-nc_perror(s)
-	const char *s;
-{
-    fprintf(stderr, "%s: %s\n", s, nc_sperror());
-}
-
-/*
- * Duplicates the matched netconfig buffer.
- */
-static struct netconfig *
-dup_ncp(ncp)
-struct netconfig	*ncp;
-{
-    struct netconfig	*p;
-    char	*tmp;
-    u_int	i;
-
-    if ((tmp=malloc(MAXNETCONFIGLINE)) == NULL)
-	return(NULL);
-    if ((p=(struct netconfig *)malloc(sizeof(struct netconfig))) == NULL) {
-	free(tmp);
-	return(NULL);
-    }
-    /*
-     * First we dup all the data from matched netconfig buffer.  Then we
-     * adjust some of the member pointer to a pre-allocated buffer where
-     * contains part of the data.
-     * To follow the convention used in parse_ncp(), we store all the
-     * necessary information in the pre-allocated buffer and let each
-     * of the netconfig char pointer member point to the right address
-     * in the buffer.
-     */
-    *p = *ncp;
-    p->nc_netid = (char *)strcpy(tmp,ncp->nc_netid);
-    tmp = strchr(tmp, '\0') + 1;
-    p->nc_protofmly = (char *)strcpy(tmp,ncp->nc_protofmly);
-    tmp = strchr(tmp, '\0') + 1;
-    p->nc_proto = (char *)strcpy(tmp,ncp->nc_proto);
-    tmp = strchr(tmp, '\0') + 1;
-    p->nc_device = (char *)strcpy(tmp,ncp->nc_device);
-    p->nc_lookups = (char **)malloc((size_t)(p->nc_nlookups+1) * sizeof(char *));
-    if (p->nc_lookups == NULL) {
-	free(p->nc_netid);
-	free(p);
-	return(NULL);
-    }
-    for (i=0; i < p->nc_nlookups; i++) {
-    	tmp = strchr(tmp, '\0') + 1;
-    	p->nc_lookups[i] = (char *)strcpy(tmp,ncp->nc_lookups[i]);
-    }
-    return(p);
-}
diff --git a/lib/libc_bsd/rpc/getnetpath.3 b/lib/libc_bsd/rpc/getnetpath.3
deleted file mode 100644
index ba1bab0..0000000
--- a/lib/libc_bsd/rpc/getnetpath.3
+++ /dev/null
@@ -1,170 +0,0 @@
-.\" @(#)getnetpath.3n 1.26 93/05/07 SMI; from SVr4
-.\" $NetBSD: getnetpath.3,v 1.1 2000/06/02 23:11:11 fvdl Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/getnetpath.3 108037 2002-12-18 12:45:11Z ru $
-.\" Copyright 1989 AT&T
-.Dd April 22, 2000
-.Dt GETNETPATH 3
-.Os
-.Sh NAME
-.Nm getnetpath ,
-.Nm setnetpath ,
-.Nm endnetpath
-.Nd get
-.Pa /etc/netconfig
-entry corresponding to
-.Ev NETPATH
-component
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In netconfig.h
-.Ft "struct netconfig *"
-.Fn getnetpath "void *handlep"
-.Ft "void *"
-.Fn setnetpath "void"
-.Ft int
-.Fn endnetpath "void *handlep"
-.Sh DESCRIPTION
-The routines described in this page provide the application access to the system
-network configuration database,
-.Pa /etc/netconfig ,
-as it is
-.Dq filtered
-by the
-.Ev NETPATH
-environment variable (see
-.Xr environ 7 ) .
-See
-.Xr getnetconfig 3
-for other routines that also access the
-network configuration database directly.
-The
-.Ev NETPATH
-variable is a list of colon-separated network identifiers.
-.Pp
-The
-.Fn getnetpath
-function
-returns a pointer to the
-netconfig database entry corresponding to the first valid
-.Ev NETPATH
-component.
-The netconfig entry is formatted as a
-.Ft "struct netconfig" .
-On each subsequent call,
-.Fn getnetpath
-returns a pointer to the netconfig entry that corresponds to the next
-valid
-.Ev NETPATH
-component.
-The
-.Fn getnetpath
-function
-can thus be used to search the netconfig database for all networks
-included in the
-.Ev NETPATH
-variable.
-When
-.Ev NETPATH
-has been exhausted,
-.Fn getnetpath
-returns
-.Dv NULL .
-.Pp
-A call to
-.Fn setnetpath
-.Dq binds
-to or
-.Dq rewinds
-.Ev NETPATH .
-The
-.Fn setnetpath
-function
-must be called before the first call to
-.Fn getnetpath
-and may be called at any other time.
-It returns a handle that is used by
-.Fn getnetpath .
-.Pp
-The
-.Fn getnetpath
-function
-silently ignores invalid
-.Ev NETPATH
-components.
-A
-.Ev NETPATH
-component is invalid if there is no corresponding
-entry in the netconfig database.
-.Pp
-If the
-.Ev NETPATH
-variable is unset,
-.Fn getnetpath
-behaves as if
-.Ev NETPATH
-were set to the sequence of
-.Dq default
-or
-.Dq visible
-networks in the netconfig database, in the
-order in which they are listed.
-.\"This proviso holds also for this
-.\"whole manpage.
-.Pp
-The
-.Fn endnetpath
-function
-may be called to
-.Dq unbind
-from
-.Ev NETPATH
-when processing is complete, releasing resources for reuse.
-Programmers should be aware, however, that
-.Fn endnetpath
-frees all memory allocated by
-.Fn getnetpath
-for the struct netconfig data structure.
-.Sh RETURN VALUES
-The
-.Fn setnetpath
-function
-returns a handle that is used by
-.Fn getnetpath .
-In case of an error,
-.Fn setnetpath
-returns
-.Dv NULL .
-.Pp
-The
-.Fn endnetpath
-function
-returns 0 on success and \-1 on failure
-(for example, if
-.Fn setnetpath
-was not called previously).
-The
-.Fn nc_perror
-or
-.Fn nc_sperror
-function
-can be used to print out the reason for failure.
-See
-.Xr getnetconfig 3 .
-.Pp
-When first called,
-.Fn getnetpath
-returns a pointer to the netconfig database entry corresponding to the first
-valid
-.Ev NETPATH
-component.
-When
-.Ev NETPATH
-has been exhausted,
-.Fn getnetpath
-returns
-.Dv NULL .
-.Sh SEE ALSO
-.Xr getnetconfig 3 ,
-.Xr netconfig 5 ,
-.Xr environ 7
diff --git a/lib/libc_bsd/rpc/getnetpath.c b/lib/libc_bsd/rpc/getnetpath.c
deleted file mode 100644
index dbe1c80..0000000
--- a/lib/libc_bsd/rpc/getnetpath.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/*	$NetBSD: getnetpath.c,v 1.3 2000/07/06 03:10:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getnetpath.c	1.11 91/12/19 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/getnetpath.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * Copyright (c) 1989 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <stdio.h>
-#include <errno.h>
-#include <netconfig.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-/*
- * internal structure to keep track of a netpath "session"
- */
-struct netpath_chain {
-    struct netconfig *ncp;  /* an nconf entry */
-    struct netpath_chain *nchain_next;	/* next nconf entry allocated */
-};
-
-
-struct netpath_vars {
-    int   valid;	    /* token that indicates a valid netpath_vars */
-    void *nc_handlep;	    /* handle for current netconfig "session" */
-    char *netpath;	    /* pointer to current view-point in NETPATH */
-    char *netpath_start;    /* pointer to start of our copy of NETPATH */
-    struct netpath_chain *ncp_list;  /* list of nconfs allocated this session*/
-};
-
-#define NP_VALID	0xf00d
-#define NP_INVALID	0
-
-char *_get_next_token(char *, int);
-
-
-/*
- * A call to setnetpath() establishes a NETPATH "session".  setnetpath()
- * must be called before the first call to getnetpath().  A "handle" is
- * returned to distinguish the session; this handle should be passed
- * subsequently to getnetpath().  (Handles are used to allow for nested calls
- * to setnetpath()).
- * If setnetpath() is unable to establish a session (due to lack of memory
- * resources, or the absence of the /etc/netconfig file), a NULL pointer is
- * returned.
- */
-
-void *
-setnetpath()
-{
-
-    struct netpath_vars *np_sessionp;   /* this session's variables */
-    char *npp;				/* NETPATH env variable */
-
-#ifdef MEM_CHK
-    malloc_debug(1);
-#endif
-
-    if ((np_sessionp =
-	(struct netpath_vars *)malloc(sizeof (struct netpath_vars))) == NULL) {
-	return (NULL);
-    }
-    if ((np_sessionp->nc_handlep = setnetconfig()) == NULL) {
-	syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-	goto failed;
-    }
-    np_sessionp->valid = NP_VALID;
-    np_sessionp->ncp_list = NULL;
-    if ((npp = getenv(NETPATH)) == NULL) {
-	np_sessionp->netpath = NULL;
-    } else {
-	(void) endnetconfig(np_sessionp->nc_handlep);/* won't need nc session*/
-	np_sessionp->nc_handlep = NULL;
-	if ((np_sessionp->netpath = malloc(strlen(npp)+1)) == NULL)
-		goto failed;
-	else {
-	    (void) strcpy(np_sessionp->netpath, npp);
-	}
-    }
-    np_sessionp->netpath_start = np_sessionp->netpath;
-    return ((void *)np_sessionp);
-
-failed:
-    free(np_sessionp);
-    return (NULL);
-}
-
-/*
- * When first called, getnetpath() returns a pointer to the netconfig
- * database entry corresponding to the first valid NETPATH component.  The
- * netconfig entry is formatted as a struct netconfig.
- * On each subsequent call, getnetpath returns a pointer to the netconfig
- * entry that corresponds to the next valid NETPATH component.  getnetpath
- * can thus be used to search the netconfig database for all networks
- * included in the NETPATH variable.
- * When NETPATH has been exhausted, getnetpath() returns NULL.  It returns
- * NULL and sets errno in case of an error (e.g., setnetpath was not called
- * previously).
- * getnetpath() silently ignores invalid NETPATH components.  A NETPATH
- * compnent is invalid if there is no corresponding entry in the netconfig
- * database.
- * If the NETPATH variable is unset, getnetpath() behaves as if NETPATH
- * were set to the sequence of default or visible networks in the netconfig
- * database, in the order in which they are listed.
- */
-
-struct netconfig *
-getnetpath(handlep)
-    void *handlep;
-{
-    struct netpath_vars *np_sessionp = (struct netpath_vars *)handlep;
-    struct netconfig *ncp = NULL;   /* temp. holds a netconfig session */
-    struct netpath_chain *chainp;   /* holds chain of ncp's we alloc */
-    char  *npp;		/* holds current NETPATH */
-
-    if (np_sessionp == NULL || np_sessionp->valid != NP_VALID) {
-	errno = EINVAL;
-	return (NULL);
-    }
-    if (np_sessionp->netpath_start == NULL) {	/* NETPATH was not set */
-	do {                /* select next visible network */
-	    if (np_sessionp->nc_handlep == NULL) {
-		np_sessionp->nc_handlep = setnetconfig();
-		if (np_sessionp->nc_handlep == NULL)
-		    syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-	    }
-	    if ((ncp = getnetconfig(np_sessionp->nc_handlep)) == NULL) {
-		return(NULL);
-	    }
-	} while ((ncp->nc_flag & NC_VISIBLE) == 0);
-	return (ncp);
-    }
-    /*
-     * Find first valid network ID in netpath.
-     */
-    while ((npp = np_sessionp->netpath) != NULL && strlen(npp) != 0) {
-	np_sessionp->netpath = _get_next_token(npp, ':');
-    	/*
-    	 * npp is a network identifier.
-	 */
-	if ((ncp = getnetconfigent(npp)) != NULL) {
-	    chainp = (struct netpath_chain *)	/* cobble alloc chain entry */
-		    malloc(sizeof (struct netpath_chain));
-	    chainp->ncp = ncp;
-	    chainp->nchain_next = NULL;
-	    if (np_sessionp->ncp_list == NULL) {
-		np_sessionp->ncp_list = chainp;
-	    } else {
-		np_sessionp->ncp_list->nchain_next = chainp;
-	    }
-	    return (ncp);
-	}
-	/* couldn't find this token in the database; go to next one. */
-    }
-    return (NULL);
-}
-
-/*
- * endnetpath() may be called to unbind NETPATH when processing is complete,
- * releasing resources for reuse.  It returns 0 on success and -1 on failure
- * (e.g. if setnetpath() was not called previously.
- */
-int
-endnetpath(handlep)
-    void *handlep;
-{
-    struct netpath_vars *np_sessionp = (struct netpath_vars *)handlep;
-    struct netpath_chain *chainp, *lastp;
-
-    if (np_sessionp == NULL || np_sessionp->valid != NP_VALID) {
-	errno = EINVAL;
-	return (-1);
-    }
-    if (np_sessionp->nc_handlep != NULL)
-	endnetconfig(np_sessionp->nc_handlep);
-    if (np_sessionp->netpath_start != NULL)
-	free(np_sessionp->netpath_start);
-    for (chainp = np_sessionp->ncp_list; chainp != NULL;
-	    lastp=chainp, chainp=chainp->nchain_next, free(lastp)) {
-	freenetconfigent(chainp->ncp);
-    }
-    free(np_sessionp);
-#ifdef MEM_CHK
-    if (malloc_verify() == 0) {
-	fprintf(stderr, "memory heap corrupted in endnetpath\n");
-	exit(1);
-    }
-#endif
-    return (0);
-}
-
-
-
-/*
- * Returns pointer to the rest-of-the-string after the current token.
- * The token itself starts at arg, and we null terminate it.  We return NULL
- * if either the arg is empty, or if this is the last token.
- */
-
-char *
-_get_next_token(npp, token)
-char *npp;		/* string */
-int token;		/* char to parse string for */
-{
-    char  *cp;		/* char pointer */
-    char  *np;		/* netpath pointer */
-    char  *ep;		/* escape pointer */
-
-    if ((cp = strchr(npp, token)) == NULL) {
-	return (NULL);
-    }
-    /*
-     * did find a token, but it might be escaped.
-     */
-    if ((cp > npp) && (cp[-1] == '\\')) {
-        /* if slash was also escaped, carry on, otherwise find next token */
-	if ((cp > npp + 1) && (cp[-2] != '\\')) {
-	    /* shift r-o-s  onto the escaped token */
-	    strcpy(&cp[-1], cp);    /* XXX: overlapping string copy */
-	    /*
-	     * Do a recursive call.
-	     * We don't know how many escaped tokens there might be.
-	     */
-	    return (_get_next_token(cp, token));
-	}
-    }
-
-    *cp++ = '\0';		/* null-terminate token */
-    /* get rid of any backslash escapes */
-    ep = npp;
-    while ((np = strchr(ep, '\\')) != 0) {
-	if (np[1] == '\\')
-	    np++;
-	strcpy(np, (ep = &np[1]));  /* XXX: overlapping string copy */
-    }
-    return (cp);		/* return ptr to r-o-s */
-}
diff --git a/lib/libc_bsd/rpc/getpublickey.c b/lib/libc_bsd/rpc/getpublickey.c
deleted file mode 100644
index 21016f9..0000000
--- a/lib/libc_bsd/rpc/getpublickey.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)publickey.c 1.10 91/03/11 Copyr 1986 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/getpublickey.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * publickey.c
- * Copyright (C) 1986, Sun Microsystems, Inc.
- */
-
-/*
- * Public key lookup routines
- */
-#include "namespace.h"
-#include <stdio.h>
-#include <pwd.h>
-#include <rpc/rpc.h>
-#include <rpc/key_prot.h>
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#include <string.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-#define PKFILE "/etc/publickey"
-
-/*
- * Hack to let ypserv/rpc.nisd use AUTH_DES.
- */
-int (*__getpublickey_LOCAL)() = 0;
-
-/*
- * Get somebody's public key
- */
-static int
-__getpublickey_real(netname, publickey)
-	const char *netname;
-	char *publickey;
-{
-	char lookup[3 * HEXKEYBYTES];
-	char *p;
-
-	if (publickey == NULL)
-		return (0);
-	if (!getpublicandprivatekey(netname, lookup))
-		return (0);
-	p = strchr(lookup, ':');
-	if (p == NULL) {
-		return (0);
-	}
-	*p = '\0';
-	(void) strncpy(publickey, lookup, HEXKEYBYTES);
-	publickey[HEXKEYBYTES] = '\0';
-	return (1);
-}
-
-/*
- * reads the file /etc/publickey looking for a + to optionally go to the
- * yellow pages
- */
-
-int
-getpublicandprivatekey(key, ret)
-	const char *key;
-	char *ret;
-{
-	char buf[1024];	/* big enough */
-	char *res;
-	FILE *fd;
-	char *mkey;
-	char *mval;
-
-	fd = fopen(PKFILE, "r");
-	if (fd == NULL)
-		return (0);
-	for (;;) {
-		res = fgets(buf, sizeof(buf), fd);
-		if (res == NULL) {
-			fclose(fd);
-			return (0);
-		}
-		if (res[0] == '#')
-			continue;
-		else if (res[0] == '+') {
-#ifdef YP
-			char *PKMAP = "publickey.byname";
-			char *lookup;
-			char *domain;
-			int err;
-			int len;
-
-			err = yp_get_default_domain(&domain);
-			if (err) {
-				continue;
-			}
-			lookup = NULL;
-			err = yp_match(domain, PKMAP, key, strlen(key), &lookup, &len);
-			if (err) {
-#ifdef DEBUG
-				fprintf(stderr, "match failed error %d\n", err);
-#endif
-				continue;
-			}
-			lookup[len] = 0;
-			strcpy(ret, lookup);
-			fclose(fd);
-			free(lookup);
-			return (2);
-#else /* YP */
-#ifdef DEBUG
-			fprintf(stderr,
-"Bad record in %s '+' -- NIS not supported in this library copy\n", PKFILE);
-#endif /* DEBUG */
-			continue;
-#endif /* YP */
-		} else {
-			mkey = strsep(&res, "\t ");
-			if (mkey == NULL) {
-				fprintf(stderr,
-				"Bad record in %s -- %s", PKFILE, buf);
-				continue;
-			}
-			do {
-				mval = strsep(&res, " \t#\n");
-			} while (mval != NULL && !*mval);
-			if (mval == NULL) {
-				fprintf(stderr,
-			"Bad record in %s val problem - %s", PKFILE, buf);
-				continue;
-			}
-			if (strcmp(mkey, key) == 0) {
-				strcpy(ret, mval);
-				fclose(fd);
-				return (1);
-			}
-		}
-	}
-}
-
-int getpublickey(netname, publickey)
-	const char *netname;
-	char *publickey;
-{
-	if (__getpublickey_LOCAL != NULL)
-		return(__getpublickey_LOCAL(netname, publickey));
-	else
-		return(__getpublickey_real(netname, publickey));
-}
diff --git a/lib/libc_bsd/rpc/getrpcent.3 b/lib/libc_bsd/rpc/getrpcent.3
deleted file mode 100644
index c02c303..0000000
--- a/lib/libc_bsd/rpc/getrpcent.3
+++ /dev/null
@@ -1,109 +0,0 @@
-.\" @(#)getrpcent.3n	2.2 88/08/02 4.0 RPCSRC; from 1.11 88/03/14 SMI
-.\" $NetBSD: getrpcent.3,v 1.6 1998/02/05 18:49:06 perry Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/getrpcent.3 140505 2005-01-20 09:17:07Z ru $
-.\"
-.Dd December 14, 1987
-.Dt GETRPCENT 3
-.Os
-.Sh NAME
-.Nm getrpcent ,
-.Nm getrpcbyname ,
-.Nm getrpcbynumber ,
-.Nm endrpcent ,
-.Nm setrpcent
-.Nd get RPC entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft struct rpcent *
-.Fn getrpcent void
-.Ft struct rpcent *
-.Fn getrpcbyname "char *name"
-.Ft struct rpcent *
-.Fn getrpcbynumber "int number"
-.Ft void
-.Fn setrpcent "int stayopen"
-.Ft void
-.Fn endrpcent void
-.Sh DESCRIPTION
-The
-.Fn getrpcent ,
-.Fn getrpcbyname ,
-and
-.Fn getrpcbynumber
-functions
-each return a pointer to an object with the
-following structure
-containing the broken-out
-fields of a line in the rpc program number data base,
-.Pa /etc/rpc :
-.Bd -literal
-struct rpcent {
-	char	*r_name;	/* name of server for this rpc program */
-	char	**r_aliases;	/* alias list */
-	long	r_number;	/* rpc program number */
-};
-.Ed
-.Pp
-The members of this structure are:
-.Bl -tag -width r_aliases -offset indent
-.It Va r_name
-The name of the server for this rpc program.
-.It Va r_aliases
-A zero terminated list of alternate names for the rpc program.
-.It Va r_number
-The rpc program number for this service.
-.El
-.Pp
-The
-.Fn getrpcent
-function
-reads the next line of the file, opening the file if necessary.
-.Pp
-The
-.Fn setrpcent
-function
-opens and rewinds the file.
-If the
-.Fa stayopen
-flag is non-zero,
-the net data base will not be closed after each call to
-.Fn getrpcent
-(either directly, or indirectly through one of
-the other
-.Dq getrpc
-calls).
-.Pp
-The
-.Fn endrpcent
-function
-closes the file.
-.Pp
-The
-.Fn getrpcbyname
-and
-.Fn getrpcbynumber
-functions
-sequentially search from the beginning
-of the file until a matching rpc program name or
-program number is found, or until end-of-file is encountered.
-.Sh FILES
-.Bl -tag -width /etc/rpc -compact
-.It Pa /etc/rpc
-.El
-.Sh DIAGNOSTICS
-A
-.Dv NULL
-pointer is returned on
-.Dv EOF
-or error.
-.Sh SEE ALSO
-.Xr rpc 5 ,
-.Xr rpcinfo 8 ,
-.Xr ypserv 8
-.Sh BUGS
-All information
-is contained in a static area
-so it must be copied if it is
-to be saved.
diff --git a/lib/libc_bsd/rpc/getrpcent.c b/lib/libc_bsd/rpc/getrpcent.c
deleted file mode 100644
index b413e21..0000000
--- a/lib/libc_bsd/rpc/getrpcent.c
+++ /dev/null
@@ -1,1046 +0,0 @@
-/*	$NetBSD: getrpcent.c,v 1.17 2000/01/22 22:19:17 mycroft Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)getrpcent.c 1.14 91/03/11 Copyr 1984 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/getrpcent.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * Copyright (c) 1984 by Sun Microsystems, Inc.
- */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <assert.h>
-#include <errno.h>
-#include <nsswitch.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <rpc/rpc.h>
-#ifdef YP
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <unistd.h>
-#include "namespace.h"
-#include "reentrant.h"
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "nss_tls.h"
-#ifdef NS_CACHING
-#include "nscache.h"
-#endif
-
-#define	RPCDB	"/etc/rpc"
-
-/* nsswitch declarations */
-enum constants
-{
-	SETRPCENT = 1,
-	ENDRPCENT = 2,
-	RPCENT_STORAGE_INITIAL	= 1 << 10, /* 1 KByte */
-	RPCENT_STORAGE_MAX	= 1 << 20, /* 1 MByte */
-};
-
-static const ns_src defaultsrc[] = {
-	{ NSSRC_FILES, NS_SUCCESS },
-#ifdef YP
-	{ NSSRC_NIS, NS_SUCCESS },
-#endif
-	{ NULL, 0 }
-};
-
-/* files backend declarations */
-struct files_state {
-	FILE	*fp;
-	int	stayopen;
-};
-
-static	int	files_rpcent(void *, void *, va_list);
-static	int	files_setrpcent(void *, void *, va_list);
-
-static	void	files_endstate(void *);
-NSS_TLS_HANDLING(files);
-
-/* nis backend declarations */
-#ifdef YP
-struct nis_state {
-	char	domain[MAXHOSTNAMELEN];
-	char	*current;
-	int	currentlen;
-	int	stepping;
-	int	no_name_map;
-};
-
-static	int	nis_rpcent(void *, void *, va_list);
-static	int	nis_setrpcent(void *, void *, va_list);
-
-static	void	nis_endstate(void *);
-NSS_TLS_HANDLING(nis);
-#endif
-
-/* get** wrappers for get**_r functions declarations */
-struct rpcent_state {
-	struct rpcent	rpc;
-	char		*buffer;
-	size_t	bufsize;
-};
-static	void	rpcent_endstate(void *);
-NSS_TLS_HANDLING(rpcent);
-
-union key {
-	const char	*name;
-	int		number;
-};
-
-static int wrap_getrpcbyname_r(union key, struct rpcent *, char *,
-			size_t, struct rpcent **);
-static int wrap_getrpcbynumber_r(union key, struct rpcent *, char *,
-			size_t, struct rpcent **);
-static int wrap_getrpcent_r(union key, struct rpcent *, char *,
-			size_t, struct rpcent **);
-static struct rpcent *getrpc(int (*fn)(union key, struct rpcent *, char *,
-			size_t, struct rpcent **), union key);
-
-#ifdef NS_CACHING
-static int rpc_id_func(char *, size_t *, va_list, void *);
-static int rpc_marshal_func(char *, size_t *, void *, va_list, void *);
-static int rpc_unmarshal_func(char *, size_t, void *, va_list, void *);
-#endif
-
-static int
-rpcent_unpack(char *p, struct rpcent *rpc, char **r_aliases,
-	size_t aliases_size, int *errnop)
-{
-	char *cp, **q;
-
-	assert(p != NULL);
-
-	if (*p == '#')
-		return (-1);
-	cp = strpbrk(p, "#\n");
-	if (cp == NULL)
-		return (-1);
-	*cp = '\0';
-	cp = strpbrk(p, " \t");
-	if (cp == NULL)
-		return (-1);
-	*cp++ = '\0';
-	/* THIS STUFF IS INTERNET SPECIFIC */
-	rpc->r_name = p;
-	while (*cp == ' ' || *cp == '\t')
-		cp++;
-	rpc->r_number = atoi(cp);
-	q = rpc->r_aliases = r_aliases;
-	cp = strpbrk(cp, " \t");
-	if (cp != NULL)
-		*cp++ = '\0';
-	while (cp && *cp) {
-		if (*cp == ' ' || *cp == '\t') {
-			cp++;
-			continue;
-		}
-		if (q < &(r_aliases[aliases_size - 1]))
-			*q++ = cp;
-		else {
-			*errnop = ERANGE;
-			return -1;
-		}
-
-		cp = strpbrk(cp, " \t");
-		if (cp != NULL)
-			*cp++ = '\0';
-	}
-	*q = NULL;
-	return 0;
-}
-
-/* files backend implementation */
-static	void
-files_endstate(void *p)
-{
-	FILE * f;
-
-	if (p == NULL)
-		return;
-
-	f = ((struct files_state *)p)->fp;
-	if (f != NULL)
-		fclose(f);
-
-	free(p);
-}
-
-static int
-files_rpcent(void *retval, void *mdata, va_list ap)
-{
-	char *name;
-	int number;
-	struct rpcent *rpc;
-	char *buffer;
-	size_t bufsize;
-	int *errnop;
-
-	char *line;
-	size_t linesize;
-	char **aliases;
-	int aliases_size;
-	char **rp;
-
-	struct files_state	*st;
-	int rv;
-	int stayopen;
-	enum nss_lookup_type how;
-
-	how = (enum nss_lookup_type)mdata;
-	switch (how)
-	{
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		number = va_arg(ap, int);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		return (NS_NOTFOUND);
-	}
-
-	rpc = va_arg(ap, struct rpcent *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-
-	*errnop = files_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-
-	if (st->fp == NULL && (st->fp = fopen(RPCDB, "r")) == NULL) {
-		*errnop = errno;
-		return (NS_UNAVAIL);
-	}
-
-	if (how == nss_lt_all)
-		stayopen = 1;
-	else {
-		rewind(st->fp);
-		stayopen = st->stayopen;
-	}
-
-	do {
-		if ((line = fgetln(st->fp, &linesize)) == NULL) {
-			*errnop = errno;
-			rv = NS_RETURN;
-			break;
-		}
-
-		if (bufsize <= linesize + _ALIGNBYTES + sizeof(char *)) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-
-		aliases = (char **)_ALIGN(&buffer[linesize+1]);
-		aliases_size = (buffer + bufsize -
-			(char *)aliases)/sizeof(char *);
-		if (aliases_size < 1) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-
-		memcpy(buffer, line, linesize);
-		buffer[linesize] = '\0';
-
-		rv = rpcent_unpack(buffer, rpc, aliases, aliases_size, errnop);
-		if (rv != 0) {
-			if (*errnop == 0) {
-				rv = NS_NOTFOUND;
-				continue;
-			}
-			else {
-				rv = NS_RETURN;
-				break;
-			}
-		}
-
-		switch (how)
-		{
-		case nss_lt_name:
-			if (strcmp(rpc->r_name, name) == 0)
-				goto done;
-			for (rp = rpc->r_aliases; *rp != NULL; rp++) {
-				if (strcmp(*rp, name) == 0)
-					goto done;
-			}
-			rv = NS_NOTFOUND;
-			continue;
-done:
-			rv = NS_SUCCESS;
-			break;
-		case nss_lt_id:
-			rv = (rpc->r_number == number) ? NS_SUCCESS :
-				NS_NOTFOUND;
-			break;
-		case nss_lt_all:
-			rv = NS_SUCCESS;
-			break;
-		}
-
-	} while (!(rv & NS_TERMINATE));
-
-	if (!stayopen && st->fp!=NULL) {
-		fclose(st->fp);
-		st->fp = NULL;
-	}
-
-	if ((rv == NS_SUCCESS) && (retval != NULL))
-		*((struct rpcent **)retval) = rpc;
-
-	return (rv);
-}
-
-static int
-files_setrpcent(void *retval, void *mdata, va_list ap)
-{
-	struct files_state	*st;
-	int	rv;
-	int	f;
-
-	rv = files_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-
-	switch ((enum constants)mdata)
-	{
-	case SETRPCENT:
-		f = va_arg(ap,int);
-		if (st->fp == NULL)
-			st->fp = fopen(RPCDB, "r");
-		else
-			rewind(st->fp);
-		st->stayopen |= f;
-		break;
-	case ENDRPCENT:
-		if (st->fp != NULL) {
-			fclose(st->fp);
-			st->fp = NULL;
-		}
-		st->stayopen = 0;
-		break;
-	default:
-		break;
-	}
-
-	return (NS_UNAVAIL);
-}
-
-/* nis backend implementation */
-#ifdef YP
-static 	void
-nis_endstate(void *p)
-{
-	if (p == NULL)
-		return;
-
-	free(((struct nis_state *)p)->current);
-	free(p);
-}
-
-static int
-nis_rpcent(void *retval, void *mdata, va_list ap)
-{
-	char		*name;
-	int		number;
-	struct rpcent	*rpc;
-	char		*buffer;
-	size_t	bufsize;
-	int		*errnop;
-
-	char		**rp;
-	char		**aliases;
-	int		aliases_size;
-
-	char	*lastkey;
-	char	*resultbuf;
-	int	resultbuflen;
-	char	buf[YPMAXRECORD + 2];
-
-	struct nis_state	*st;
-	int		rv;
-	enum nss_lookup_type	how;
-	int	no_name_active;
-
-	how = (enum nss_lookup_type)mdata;
-	switch (how)
-	{
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		number = va_arg(ap, int);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		return (NS_NOTFOUND);
-	}
-
-	rpc = va_arg(ap, struct rpcent *);
-	buffer = va_arg(ap, char *);
-	bufsize = va_arg(ap, size_t);
-	errnop = va_arg(ap, int *);
-
-	*errnop = nis_getstate(&st);
-	if (*errnop != 0)
-		return (NS_UNAVAIL);
-
-	if (st->domain[0] == '\0') {
-		if (getdomainname(st->domain, sizeof(st->domain)) != 0) {
-			*errnop = errno;
-			return (NS_UNAVAIL);
-		}
-	}
-
-	no_name_active = 0;
-	do {
-		switch (how)
-		{
-		case nss_lt_name:
-			if (!st->no_name_map)
-			{
-				snprintf(buf, sizeof buf, "%s", name);
-				rv = yp_match(st->domain, "rpc.byname", buf,
-			    		strlen(buf), &resultbuf, &resultbuflen);
-
-				switch (rv) {
-				case 0:
-					break;
-				case YPERR_MAP:
-					st->stepping = 0;
-					no_name_active = 1;
-					how = nss_lt_all;
-
-					rv = NS_NOTFOUND;
-					continue;
-				default:
-					rv = NS_NOTFOUND;
-					goto fin;
-				}
-			} else {
-				st->stepping = 0;
-				no_name_active = 1;
-				how = nss_lt_all;
-
-				rv = NS_NOTFOUND;
-				continue;
-			}
-		break;
-		case nss_lt_id:
-			snprintf(buf, sizeof buf, "%d", number);
-			if (yp_match(st->domain, "rpc.bynumber", buf,
-			    	strlen(buf), &resultbuf, &resultbuflen)) {
-				rv = NS_NOTFOUND;
-				goto fin;
-			}
-			break;
-		case nss_lt_all:
-				if (!st->stepping) {
-					rv = yp_first(st->domain, "rpc.bynumber",
-				    		&st->current,
-						&st->currentlen, &resultbuf,
-				    		&resultbuflen);
-					if (rv) {
-						rv = NS_NOTFOUND;
-						goto fin;
-					}
-					st->stepping = 1;
-				} else {
-					lastkey = st->current;
-					rv = yp_next(st->domain, "rpc.bynumber",
-				    		st->current,
-						st->currentlen, &st->current,
-				    		&st->currentlen,
-						&resultbuf,	&resultbuflen);
-					free(lastkey);
-					if (rv) {
-						st->stepping = 0;
-						rv = NS_NOTFOUND;
-						goto fin;
-					}
-				}
-			break;
-		}
-
-		/* we need a room for additional \n symbol */
-		if (bufsize <= resultbuflen + 1 + _ALIGNBYTES +
-		    sizeof(char *)) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-
-		aliases=(char **)_ALIGN(&buffer[resultbuflen+2]);
-		aliases_size = (buffer + bufsize - (char *)aliases) /
-			sizeof(char *);
-		if (aliases_size < 1) {
-			*errnop = ERANGE;
-			rv = NS_RETURN;
-			break;
-		}
-
-		/*
-		 * rpcent_unpack expects lines terminated with \n -- make it happy
-		 */
-		memcpy(buffer, resultbuf, resultbuflen);
-		buffer[resultbuflen] = '\n';
-		buffer[resultbuflen+1] = '\0';
-		free(resultbuf);
-
-		if (rpcent_unpack(buffer, rpc, aliases, aliases_size,
-		    errnop) != 0) {
-			if (*errnop == 0)
-				rv = NS_NOTFOUND;
-			else
-				rv = NS_RETURN;
-		} else {
-			if ((how == nss_lt_all) && (no_name_active != 0)) {
-				if (strcmp(rpc->r_name, name) == 0)
-					goto done;
-				for (rp = rpc->r_aliases; *rp != NULL; rp++) {
-					if (strcmp(*rp, name) == 0)
-						goto done;
-				}
-				rv = NS_NOTFOUND;
-				continue;
-done:
-				rv = NS_SUCCESS;
-			} else
-				rv = NS_SUCCESS;
-		}
-
-	} while (!(rv & NS_TERMINATE) && (how == nss_lt_all));
-
-fin:
-	if ((rv == NS_SUCCESS) && (retval != NULL))
-		*((struct rpcent **)retval) = rpc;
-
-	return (rv);
-}
-
-static int
-nis_setrpcent(void *retval, void *mdata, va_list ap)
-{
-	struct nis_state	*st;
-	int	rv;
-
-	rv = nis_getstate(&st);
-	if (rv != 0)
-		return (NS_UNAVAIL);
-
-	switch ((enum constants)mdata)
-	{
-	case SETRPCENT:
-	case ENDRPCENT:
-		free(st->current);
-		st->current = NULL;
-		st->stepping = 0;
-		break;
-	default:
-		break;
-	}
-
-	return (NS_UNAVAIL);
-}
-#endif
-
-#ifdef NS_CACHING
-static int
-rpc_id_func(char *buffer, size_t *buffer_size, va_list ap, void *cache_mdata)
-{
-	char *name;
-	int rpc;
-
-	size_t desired_size, size;
-	enum nss_lookup_type lookup_type;
-	int res = NS_UNAVAIL;
-
-	lookup_type = (enum nss_lookup_type)cache_mdata;
-	switch (lookup_type) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-
-		size = strlen(name);
-		desired_size = sizeof(enum nss_lookup_type) + size + 1;
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), name, size + 1);
-
-		res = NS_SUCCESS;
-		break;
-	case nss_lt_id:
-		rpc = va_arg(ap, int);
-
-		desired_size = sizeof(enum nss_lookup_type) + sizeof(int);
-		if (desired_size > *buffer_size) {
-			res = NS_RETURN;
-			goto fin;
-		}
-
-		memcpy(buffer, &lookup_type, sizeof(enum nss_lookup_type));
-		memcpy(buffer + sizeof(enum nss_lookup_type), &rpc,
-		    sizeof(int));
-
-		res = NS_SUCCESS;
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-fin:
-	*buffer_size = desired_size;
-	return (res);
-}
-
-static int
-rpc_marshal_func(char *buffer, size_t *buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	int num;
-	struct rpcent *rpc;
-	char *orig_buf;
-	size_t orig_buf_size;
-
-	struct rpcent new_rpc;
-	size_t desired_size, size, aliases_size;
-	char *p;
-	char **alias;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		num = va_arg(ap, int);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	rpc = va_arg(ap, struct rpcent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-
-	desired_size = _ALIGNBYTES + sizeof(struct rpcent) + sizeof(char *);
-	if (rpc->r_name != NULL)
-		desired_size += strlen(rpc->r_name) + 1;
-
-	if (rpc->r_aliases != NULL) {
-		aliases_size = 0;
-		for (alias = rpc->r_aliases; *alias; ++alias) {
-			desired_size += strlen(*alias) + 1;
-			++aliases_size;
-		}
-
-		desired_size += _ALIGNBYTES + (aliases_size + 1) *
-		    sizeof(char *);
-	}
-
-	if (*buffer_size < desired_size) {
-		/* this assignment is here for future use */
-		*buffer_size = desired_size;
-		return (NS_RETURN);
-	}
-
-	new_rpc = *rpc;
-
-	*buffer_size = desired_size;
-	memset(buffer, 0, desired_size);
-	p = buffer + sizeof(struct rpcent) + sizeof(char *);
-	memcpy(buffer + sizeof(struct rpcent), &p, sizeof(char *));
-	p = (char *)_ALIGN(p);
-
-	if (new_rpc.r_name != NULL) {
-		size = strlen(new_rpc.r_name);
-		memcpy(p, new_rpc.r_name, size);
-		new_rpc.r_name = p;
-		p += size + 1;
-	}
-
-	if (new_rpc.r_aliases != NULL) {
-		p = (char *)_ALIGN(p);
-		memcpy(p, new_rpc.r_aliases, sizeof(char *) * aliases_size);
-		new_rpc.r_aliases = (char **)p;
-		p += sizeof(char *) * (aliases_size + 1);
-
-		for (alias = new_rpc.r_aliases; *alias; ++alias) {
-			size = strlen(*alias);
-			memcpy(p, *alias, size);
-			*alias = p;
-			p += size + 1;
-		}
-	}
-
-	memcpy(buffer, &new_rpc, sizeof(struct rpcent));
-	return (NS_SUCCESS);
-}
-
-static int
-rpc_unmarshal_func(char *buffer, size_t buffer_size, void *retval, va_list ap,
-    void *cache_mdata)
-{
-	char *name;
-	int num;
-	struct rpcent *rpc;
-	char *orig_buf;
-	size_t orig_buf_size;
-	int *ret_errno;
-
-	char *p;
-	char **alias;
-
-	switch ((enum nss_lookup_type)cache_mdata) {
-	case nss_lt_name:
-		name = va_arg(ap, char *);
-		break;
-	case nss_lt_id:
-		num = va_arg(ap, int);
-		break;
-	case nss_lt_all:
-		break;
-	default:
-		/* should be unreachable */
-		return (NS_UNAVAIL);
-	}
-
-	rpc = va_arg(ap, struct rpcent *);
-	orig_buf = va_arg(ap, char *);
-	orig_buf_size = va_arg(ap, size_t);
-	ret_errno = va_arg(ap, int *);
-
-	if (orig_buf_size <
-	    buffer_size - sizeof(struct rpcent) - sizeof(char *)) {
-		*ret_errno = ERANGE;
-		return (NS_RETURN);
-	}
-
-	memcpy(rpc, buffer, sizeof(struct rpcent));
-	memcpy(&p, buffer + sizeof(struct rpcent), sizeof(char *));
-
-	orig_buf = (char *)_ALIGN(orig_buf);
-	memcpy(orig_buf, buffer + sizeof(struct rpcent) + sizeof(char *) +
-	    _ALIGN(p) - (size_t)p,
-	    buffer_size - sizeof(struct rpcent) - sizeof(char *) -
-	    _ALIGN(p) + (size_t)p);
-	p = (char *)_ALIGN(p);
-
-	NS_APPLY_OFFSET(rpc->r_name, orig_buf, p, char *);
-	if (rpc->r_aliases != NULL) {
-		NS_APPLY_OFFSET(rpc->r_aliases, orig_buf, p, char **);
-
-		for (alias = rpc->r_aliases	; *alias; ++alias)
-			NS_APPLY_OFFSET(*alias, orig_buf, p, char *);
-	}
-
-	if (retval != NULL)
-		*((struct rpcent **)retval) = rpc;
-
-	return (NS_SUCCESS);
-}
-
-NSS_MP_CACHE_HANDLING(rpc);
-#endif /* NS_CACHING */
-
-
-/* get**_r functions implementation */
-static int
-getrpcbyname_r(const char *name, struct rpcent *rpc, char *buffer,
-	size_t bufsize, struct rpcent **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-    		NS_COMMON_CACHE_INFO_INITIALIZER(
-		rpc, (void *)nss_lt_name,
-		rpc_id_func, rpc_marshal_func, rpc_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_rpcent, (void *)nss_lt_name },
-#ifdef YP
-		{ NSSRC_NIS, nis_rpcent, (void *)nss_lt_name },
-#endif
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = nsdispatch(result, dtab, NSDB_RPC, "getrpcbyname_r", defaultsrc,
-	    name, rpc, buffer, bufsize, &ret_errno);
-
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-static int
-getrpcbynumber_r(int number, struct rpcent *rpc, char *buffer,
-	size_t bufsize, struct rpcent **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info =
-    		NS_COMMON_CACHE_INFO_INITIALIZER(
-		rpc, (void *)nss_lt_id,
-		rpc_id_func, rpc_marshal_func, rpc_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_rpcent, (void *)nss_lt_id },
-#ifdef YP
-		{ NSSRC_NIS, nis_rpcent, (void *)nss_lt_id },
-#endif
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = nsdispatch(result, dtab, NSDB_RPC, "getrpcbynumber_r", defaultsrc,
-	    number, rpc, buffer, bufsize, &ret_errno);
-
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-static int
-getrpcent_r(struct rpcent *rpc, char *buffer, size_t bufsize,
-	struct rpcent **result)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		rpc, (void *)nss_lt_all,
-		rpc_marshal_func, rpc_unmarshal_func);
-#endif
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_rpcent, (void *)nss_lt_all },
-#ifdef YP
-		{ NSSRC_NIS, nis_rpcent, (void *)nss_lt_all },
-#endif
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-	int rv, ret_errno;
-
-	ret_errno = 0;
-	*result = NULL;
-	rv = nsdispatch(result, dtab, NSDB_RPC, "getrpcent_r", defaultsrc,
-	    rpc, buffer, bufsize, &ret_errno);
-
-	if (rv == NS_SUCCESS)
-		return (0);
-	else
-		return (ret_errno);
-}
-
-/* get** wrappers for get**_r functions implementation */
-static 	void
-rpcent_endstate(void *p)
-{
-	if (p == NULL)
-		return;
-
-	free(((struct rpcent_state *)p)->buffer);
-	free(p);
-}
-
-static	int
-wrap_getrpcbyname_r(union key key, struct rpcent *rpc, char *buffer,
-    size_t bufsize, struct rpcent **res)
-{
-	return (getrpcbyname_r(key.name, rpc, buffer, bufsize, res));
-}
-
-static	int
-wrap_getrpcbynumber_r(union key key, struct rpcent *rpc, char *buffer,
-    size_t bufsize, struct rpcent **res)
-{
-	return (getrpcbynumber_r(key.number, rpc, buffer, bufsize, res));
-}
-
-static	int
-wrap_getrpcent_r(union key key __unused, struct rpcent *rpc, char *buffer,
-    size_t bufsize, struct rpcent **res)
-{
-	return (getrpcent_r(rpc, buffer, bufsize, res));
-}
-
-static struct rpcent *
-getrpc(int (*fn)(union key, struct rpcent *, char *, size_t, struct rpcent **),
-    union key key)
-{
-	int		 rv;
-	struct rpcent	*res;
-	struct rpcent_state * st;
-
-	rv=rpcent_getstate(&st);
-	if (rv != 0) {
-		errno = rv;
-		return NULL;
-	}
-
-	if (st->buffer == NULL) {
-		st->buffer = malloc(RPCENT_STORAGE_INITIAL);
-		if (st->buffer == NULL)
-			return (NULL);
-		st->bufsize = RPCENT_STORAGE_INITIAL;
-	}
-	do {
-		rv = fn(key, &st->rpc, st->buffer, st->bufsize, &res);
-		if (res == NULL && rv == ERANGE) {
-			free(st->buffer);
-			if ((st->bufsize << 1) > RPCENT_STORAGE_MAX) {
-				st->buffer = NULL;
-				errno = ERANGE;
-				return (NULL);
-			}
-			st->bufsize <<= 1;
-			st->buffer = malloc(st->bufsize);
-			if (st->buffer == NULL)
-				return (NULL);
-		}
-	} while (res == NULL && rv == ERANGE);
-	if (rv != 0)
-		errno = rv;
-
-	return (res);
-}
-
-struct rpcent *
-getrpcbyname(char *name)
-{
-	union key key;
-
-	key.name = name;
-
-	return (getrpc(wrap_getrpcbyname_r, key));
-}
-
-struct rpcent *
-getrpcbynumber(int number)
-{
-	union key key;
-
-	key.number = number;
-
-	return (getrpc(wrap_getrpcbynumber_r, key));
-}
-
-struct rpcent *
-getrpcent()
-{
-	union key key;
-
-	key.number = 0;	/* not used */
-
-	return (getrpc(wrap_getrpcent_r, key));
-}
-
-void
-setrpcent(int stayopen)
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		rpc, (void *)nss_lt_all,
-		NULL, NULL);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setrpcent, (void *)SETRPCENT },
-#ifdef YP
-		{ NSSRC_NIS, nis_setrpcent, (void *)SETRPCENT },
-#endif
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-
-	(void)nsdispatch(NULL, dtab, NSDB_RPC, "setrpcent", defaultsrc,
-		stayopen);
-}
-
-void
-endrpcent()
-{
-#ifdef NS_CACHING
-	static const nss_cache_info cache_info = NS_MP_CACHE_INFO_INITIALIZER(
-		rpc, (void *)nss_lt_all,
-		NULL, NULL);
-#endif
-
-	static const ns_dtab dtab[] = {
-		{ NSSRC_FILES, files_setrpcent, (void *)ENDRPCENT },
-#ifdef YP
-		{ NSSRC_NIS, nis_setrpcent, (void *)ENDRPCENT },
-#endif
-#ifdef NS_CACHING
-		NS_CACHE_CB(&cache_info)
-#endif
-		{ NULL, NULL, NULL }
-	};
-
-	(void)nsdispatch(NULL, dtab, NSDB_RPC, "endrpcent", defaultsrc);
-}
diff --git a/lib/libc_bsd/rpc/getrpcport.3 b/lib/libc_bsd/rpc/getrpcport.3
deleted file mode 100644
index 108a9b7..0000000
--- a/lib/libc_bsd/rpc/getrpcport.3
+++ /dev/null
@@ -1,36 +0,0 @@
-.\" @(#)getrpcport.3r	2.2 88/08/02 4.0 RPCSRC; from 1.12 88/02/26 SMI
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/getrpcport.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd October 6, 1987
-.Dt GETRPCPORT 3
-.Os
-.Sh NAME
-.Nm getrpcport
-.Nd get RPC port number
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.Ft int
-.Fn getrpcport "char *host" "int prognum" "int versnum" "int proto"
-.Sh DESCRIPTION
-The
-.Fn getrpcport
-function
-returns the port number for version
-.Fa versnum
-of the RPC program
-.Fa prognum
-running on
-.Fa host
-and using protocol
-.Fa proto .
-It returns 0 if it cannot contact the portmapper, or if
-.Fa prognum
-is not registered.
-If
-.Fa prognum
-is registered but not with version
-.Fa versnum ,
-it will still return a port number (for some version of the program)
-indicating that the program is indeed registered.
-The version mismatch will be detected upon the first call to the service.
diff --git a/lib/libc_bsd/rpc/getrpcport.c b/lib/libc_bsd/rpc/getrpcport.c
deleted file mode 100644
index 5b6e464..0000000
--- a/lib/libc_bsd/rpc/getrpcport.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*	$NetBSD: getrpcport.c,v 1.16 2000/01/22 22:19:18 mycroft Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)getrpcport.c 1.3 87/08/11 SMI";
-static char *sccsid = "@(#)getrpcport.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/getrpcport.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * Copyright (c) 1985 by Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <assert.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
-#include "un-namespace.h"
-
-int
-getrpcport(host, prognum, versnum, proto)
-	char *host;
-	int prognum, versnum, proto;
-{
-	struct sockaddr_in addr;
-	struct hostent *hp;
-
-	assert(host != NULL);
-
-	if ((hp = gethostbyname(host)) == NULL)
-		return (0);
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_len = sizeof(struct sockaddr_in);
-	addr.sin_family = AF_INET;
-	addr.sin_port =  0;
-	if (hp->h_length > addr.sin_len)
-		hp->h_length = addr.sin_len;
-	memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length);
-	/* Inconsistent interfaces need casts! :-( */
-	return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, 
-	    (u_int)proto));
-}
diff --git a/lib/libc_bsd/rpc/key_call.c b/lib/libc_bsd/rpc/key_call.c
deleted file mode 100644
index 4078bc1..0000000
--- a/lib/libc_bsd/rpc/key_call.c
+++ /dev/null
@@ -1,479 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#ident	"@(#)key_call.c	1.25	94/04/24 SMI"
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/key_call.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * key_call.c, Interface to keyserver
- *
- * setsecretkey(key) - set your secret key
- * encryptsessionkey(agent, deskey) - encrypt a session key to talk to agent
- * decryptsessionkey(agent, deskey) - decrypt ditto
- * gendeskey(deskey) - generate a secure des key
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <rpc/rpc.h>
-#include <rpc/auth.h>
-#include <rpc/auth_unix.h>
-#include <rpc/key_prot.h>
-#include <string.h>
-#include <netconfig.h>
-#include <sys/utsname.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <sys/fcntl.h>
-#include "un-namespace.h"
-#include "mt_misc.h"
-
-
-#define	KEY_TIMEOUT	5	/* per-try timeout in seconds */
-#define	KEY_NRETRY	12	/* number of retries */
-
-#ifdef DEBUG
-#define	debug(msg)	(void) fprintf(stderr, "%s\n", msg);
-#else
-#define	debug(msg)
-#endif /* DEBUG */
-
-/*
- * Hack to allow the keyserver to use AUTH_DES (for authenticated
- * NIS+ calls, for example).  The only functions that get called
- * are key_encryptsession_pk, key_decryptsession_pk, and key_gendes.
- *
- * The approach is to have the keyserver fill in pointers to local
- * implementations of these functions, and to call those in key_call().
- */
-
-cryptkeyres *(*__key_encryptsession_pk_LOCAL)() = 0;
-cryptkeyres *(*__key_decryptsession_pk_LOCAL)() = 0;
-des_block *(*__key_gendes_LOCAL)() = 0;
-
-static int key_call( u_long, xdrproc_t, void *, xdrproc_t, void *);
-
-int
-key_setsecret(secretkey)
-	const char *secretkey;
-{
-	keystatus status;
-
-	if (!key_call((u_long) KEY_SET, (xdrproc_t)xdr_keybuf,
-			(void *)secretkey,
-			(xdrproc_t)xdr_keystatus, &status)) {
-		return (-1);
-	}
-	if (status != KEY_SUCCESS) {
-		debug("set status is nonzero");
-		return (-1);
-	}
-	return (0);
-}
-
-
-/* key_secretkey_is_set() returns 1 if the keyserver has a secret key
- * stored for the caller's effective uid; it returns 0 otherwise
- *
- * N.B.:  The KEY_NET_GET key call is undocumented.  Applications shouldn't
- * be using it, because it allows them to get the user's secret key.
- */
-
-int
-key_secretkey_is_set(void)
-{
-	struct key_netstres 	kres;
-
-	memset((void*)&kres, 0, sizeof (kres));
-	if (key_call((u_long) KEY_NET_GET, (xdrproc_t)xdr_void, NULL,
-			(xdrproc_t)xdr_key_netstres, &kres) &&
-	    (kres.status == KEY_SUCCESS) &&
-	    (kres.key_netstres_u.knet.st_priv_key[0] != 0)) {
-		/* avoid leaving secret key in memory */
-		memset(kres.key_netstres_u.knet.st_priv_key, 0, HEXKEYBYTES);
-		return (1);
-	}
-	return (0);
-}
-
-int
-key_encryptsession_pk(remotename, remotekey, deskey)
-	char *remotename;
-	netobj *remotekey;
-	des_block *deskey;
-{
-	cryptkeyarg2 arg;
-	cryptkeyres res;
-
-	arg.remotename = remotename;
-	arg.remotekey = *remotekey;
-	arg.deskey = *deskey;
-	if (!key_call((u_long)KEY_ENCRYPT_PK, (xdrproc_t)xdr_cryptkeyarg2, &arg,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("encrypt status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-int
-key_decryptsession_pk(remotename, remotekey, deskey)
-	char *remotename;
-	netobj *remotekey;
-	des_block *deskey;
-{
-	cryptkeyarg2 arg;
-	cryptkeyres res;
-
-	arg.remotename = remotename;
-	arg.remotekey = *remotekey;
-	arg.deskey = *deskey;
-	if (!key_call((u_long)KEY_DECRYPT_PK, (xdrproc_t)xdr_cryptkeyarg2, &arg,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("decrypt status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-int
-key_encryptsession(remotename, deskey)
-	const char *remotename;
-	des_block *deskey;
-{
-	cryptkeyarg arg;
-	cryptkeyres res;
-
-	arg.remotename = (char *) remotename;
-	arg.deskey = *deskey;
-	if (!key_call((u_long)KEY_ENCRYPT, (xdrproc_t)xdr_cryptkeyarg, &arg,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("encrypt status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-int
-key_decryptsession(remotename, deskey)
-	const char *remotename;
-	des_block *deskey;
-{
-	cryptkeyarg arg;
-	cryptkeyres res;
-
-	arg.remotename = (char *) remotename;
-	arg.deskey = *deskey;
-	if (!key_call((u_long)KEY_DECRYPT, (xdrproc_t)xdr_cryptkeyarg, &arg,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("decrypt status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-int
-key_gendes(key)
-	des_block *key;
-{
-	if (!key_call((u_long)KEY_GEN, (xdrproc_t)xdr_void, NULL,
-			(xdrproc_t)xdr_des_block, key)) {
-		return (-1);
-	}
-	return (0);
-}
-
-int
-key_setnet(arg)
-struct key_netstarg *arg;
-{
-	keystatus status;
-
-
-	if (!key_call((u_long) KEY_NET_PUT, (xdrproc_t)xdr_key_netstarg, arg,
-			(xdrproc_t)xdr_keystatus, &status)){
-		return (-1);
-	}
-
-	if (status != KEY_SUCCESS) {
-		debug("key_setnet status is nonzero");
-		return (-1);
-	}
-	return (1);
-}
-
-
-int
-key_get_conv(pkey, deskey)
-	char *pkey;
-	des_block *deskey;
-{
-	cryptkeyres res;
-
-	if (!key_call((u_long) KEY_GET_CONV, (xdrproc_t)xdr_keybuf, pkey,
-			(xdrproc_t)xdr_cryptkeyres, &res)) {
-		return (-1);
-	}
-	if (res.status != KEY_SUCCESS) {
-		debug("get_conv status is nonzero");
-		return (-1);
-	}
-	*deskey = res.cryptkeyres_u.deskey;
-	return (0);
-}
-
-struct  key_call_private {
-	CLIENT	*client;	/* Client handle */
-	pid_t	pid;		/* process-id at moment of creation */
-	uid_t	uid;		/* user-id at last authorization */
-};
-static struct key_call_private *key_call_private_main = NULL;
-static thread_key_t key_call_key;
-static once_t key_call_once = ONCE_INITIALIZER;
-static int key_call_key_error;
-
-static void
-key_call_destroy(void *vp)
-{
-	struct key_call_private *kcp = (struct key_call_private *)vp;
-
-	if (kcp) {
-		if (kcp->client)
-			clnt_destroy(kcp->client);
-		free(kcp);
-	}
-}
-
-static void
-key_call_init(void)
-{
-
-	key_call_key_error = thr_keycreate(&key_call_key, key_call_destroy);
-}
-
-/*
- * Keep the handle cached.  This call may be made quite often.
- */
-static CLIENT *
-getkeyserv_handle(vers)
-int	vers;
-{
-	void *localhandle;
-	struct netconfig *nconf;
-	struct netconfig *tpconf;
-	struct key_call_private *kcp;
-	struct timeval wait_time;
-	struct utsname u;
-	int main_thread;
-	int fd;
-
-#define	TOTAL_TIMEOUT	30	/* total timeout talking to keyserver */
-#define	TOTAL_TRIES	5	/* Number of tries */
-
-	if ((main_thread = thr_main())) {
-		kcp = key_call_private_main;
-	} else {
-		if (thr_once(&key_call_once, key_call_init) != 0 ||
-		    key_call_key_error != 0)
-			return ((CLIENT *) NULL);
-		kcp = (struct key_call_private *)thr_getspecific(key_call_key);
-	}	
-	if (kcp == (struct key_call_private *)NULL) {
-		kcp = (struct key_call_private *)malloc(sizeof (*kcp));
-		if (kcp == (struct key_call_private *)NULL) {
-			return ((CLIENT *) NULL);
-		}
-                if (main_thread)
-                        key_call_private_main = kcp;
-                else
-                        thr_setspecific(key_call_key, (void *) kcp);
-		kcp->client = NULL;
-	}
-
-	/* if pid has changed, destroy client and rebuild */
-	if (kcp->client != NULL && kcp->pid != getpid()) {
-		clnt_destroy(kcp->client);
-		kcp->client = NULL;
-	}
-
-	if (kcp->client != NULL) {
-		/* if uid has changed, build client handle again */
-		if (kcp->uid != geteuid()) {
-			kcp->uid = geteuid();
-			auth_destroy(kcp->client->cl_auth);
-			kcp->client->cl_auth =
-				authsys_create("", kcp->uid, 0, 0, NULL);
-			if (kcp->client->cl_auth == NULL) {
-				clnt_destroy(kcp->client);
-				kcp->client = NULL;
-				return ((CLIENT *) NULL);
-			}
-		}
-		/* Change the version number to the new one */
-		clnt_control(kcp->client, CLSET_VERS, (void *)&vers);
-		return (kcp->client);
-	}
-	if (!(localhandle = setnetconfig())) {
-		return ((CLIENT *) NULL);
-	}
-        tpconf = NULL;
-#if defined(__FreeBSD__)
-	if (uname(&u) == -1)
-#else
-#if defined(i386)
-	if (_nuname(&u) == -1)
-#elif defined(sparc)
-	if (_uname(&u) == -1)
-#else
-#error Unknown architecture!
-#endif
-#endif
-	{
-		endnetconfig(localhandle);
-		return ((CLIENT *) NULL);
-        }
-	while ((nconf = getnetconfig(localhandle)) != NULL) {
-		if (strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0) {
-			/*
-			 * We use COTS_ORD here so that the caller can
-			 * find out immediately if the server is dead.
-			 */
-			if (nconf->nc_semantics == NC_TPI_COTS_ORD) {
-				kcp->client = clnt_tp_create(u.nodename,
-					KEY_PROG, vers, nconf);
-				if (kcp->client)
-					break;
-			} else {
-				tpconf = nconf;
-			}
-		}
-	}
-	if ((kcp->client == (CLIENT *) NULL) && (tpconf))
-		/* Now, try the CLTS or COTS loopback transport */
-		kcp->client = clnt_tp_create(u.nodename,
-			KEY_PROG, vers, tpconf);
-	endnetconfig(localhandle);
-
-	if (kcp->client == (CLIENT *) NULL) {
-		return ((CLIENT *) NULL);
-        }
-	kcp->uid = geteuid();
-	kcp->pid = getpid();
-	kcp->client->cl_auth = authsys_create("", kcp->uid, 0, 0, NULL);
-	if (kcp->client->cl_auth == NULL) {
-		clnt_destroy(kcp->client);
-		kcp->client = NULL;
-		return ((CLIENT *) NULL);
-	}
-
-	wait_time.tv_sec = TOTAL_TIMEOUT/TOTAL_TRIES;
-	wait_time.tv_usec = 0;
-	(void) clnt_control(kcp->client, CLSET_RETRY_TIMEOUT,
-		(char *)&wait_time);
-	if (clnt_control(kcp->client, CLGET_FD, (char *)&fd))
-		_fcntl(fd, F_SETFD, 1);	/* make it "close on exec" */
-
-	return (kcp->client);
-}
-
-/* returns  0 on failure, 1 on success */
-
-static int
-key_call(proc, xdr_arg, arg, xdr_rslt, rslt)
-	u_long proc;
-	xdrproc_t xdr_arg;
-	void *arg;
-	xdrproc_t xdr_rslt;
-	void *rslt;
-{
-	CLIENT *clnt;
-	struct timeval wait_time;
-
-	if (proc == KEY_ENCRYPT_PK && __key_encryptsession_pk_LOCAL) {
-		cryptkeyres *res;
-		res = (*__key_encryptsession_pk_LOCAL)(geteuid(), arg);
-		*(cryptkeyres*)rslt = *res;
-		return (1);
-	} else if (proc == KEY_DECRYPT_PK && __key_decryptsession_pk_LOCAL) {
-		cryptkeyres *res;
-		res = (*__key_decryptsession_pk_LOCAL)(geteuid(), arg);
-		*(cryptkeyres*)rslt = *res;
-		return (1);
-	} else if (proc == KEY_GEN && __key_gendes_LOCAL) {
-		des_block *res;
-		res = (*__key_gendes_LOCAL)(geteuid(), 0);
-		*(des_block*)rslt = *res;
-		return (1);
-	}
-
-	if ((proc == KEY_ENCRYPT_PK) || (proc == KEY_DECRYPT_PK) ||
-	    (proc == KEY_NET_GET) || (proc == KEY_NET_PUT) ||
-	    (proc == KEY_GET_CONV))
-		clnt = getkeyserv_handle(2); /* talk to version 2 */
-	else
-		clnt = getkeyserv_handle(1); /* talk to version 1 */
-
-	if (clnt == NULL) {
-		return (0);
-	}
-
-	wait_time.tv_sec = TOTAL_TIMEOUT;
-	wait_time.tv_usec = 0;
-
-	if (clnt_call(clnt, proc, xdr_arg, arg, xdr_rslt, rslt,
-		wait_time) == RPC_SUCCESS) {
-		return (1);
-	} else {
-		return (0);
-	}
-}
diff --git a/lib/libc_bsd/rpc/key_prot_xdr.c b/lib/libc_bsd/rpc/key_prot_xdr.c
deleted file mode 100644
index b4cf871..0000000
--- a/lib/libc_bsd/rpc/key_prot_xdr.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Please do not edit this file.
- * It was generated using rpcgen.
- */
-
-#include "namespace.h"
-#include <rpc/key_prot.h>
-#include "un-namespace.h"
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
-
-/* #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/key_prot_xdr.c 261046 2014-01-22 23:45:27Z mav $");
-
-/* 
- * Compiled from key_prot.x using rpcgen.
- * DO NOT EDIT THIS FILE!
- * This is NOT source code!
- */
-
-bool_t
-xdr_keystatus(register XDR *xdrs, keystatus *objp)
-{
-
-	if (!xdr_enum(xdrs, (enum_t *)objp))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_keybuf(register XDR *xdrs, keybuf objp)
-{
-
-	if (!xdr_opaque(xdrs, objp, HEXKEYBYTES))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_netnamestr(register XDR *xdrs, netnamestr *objp)
-{
-
-	if (!xdr_string(xdrs, objp, MAXNETNAMELEN))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_cryptkeyarg(register XDR *xdrs, cryptkeyarg *objp)
-{
-
-	if (!xdr_netnamestr(xdrs, &objp->remotename))
-		return (FALSE);
-	if (!xdr_des_block(xdrs, &objp->deskey))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_cryptkeyarg2(register XDR *xdrs, cryptkeyarg2 *objp)
-{
-
-	if (!xdr_netnamestr(xdrs, &objp->remotename))
-		return (FALSE);
-	if (!xdr_netobj(xdrs, &objp->remotekey))
-		return (FALSE);
-	if (!xdr_des_block(xdrs, &objp->deskey))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_cryptkeyres(register XDR *xdrs, cryptkeyres *objp)
-{
-
-	if (!xdr_keystatus(xdrs, &objp->status))
-		return (FALSE);
-	switch (objp->status) {
-	case KEY_SUCCESS:
-		if (!xdr_des_block(xdrs, &objp->cryptkeyres_u.deskey))
-			return (FALSE);
-		break;
-	default:
-		break;
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_unixcred(register XDR *xdrs, unixcred *objp)
-{
-	u_int **pgids_val;
-
-	if (!xdr_u_int(xdrs, &objp->uid))
-		return (FALSE);
-	if (!xdr_u_int(xdrs, &objp->gid))
-		return (FALSE);
-	pgids_val = &objp->gids.gids_val;
-	if (!xdr_array(xdrs, (char **) pgids_val, (u_int *) &objp->gids.gids_len, MAXGIDS,
-		sizeof (u_int), (xdrproc_t) xdr_u_int))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_getcredres(register XDR *xdrs, getcredres *objp)
-{
-
-	if (!xdr_keystatus(xdrs, &objp->status))
-		return (FALSE);
-	switch (objp->status) {
-	case KEY_SUCCESS:
-		if (!xdr_unixcred(xdrs, &objp->getcredres_u.cred))
-			return (FALSE);
-		break;
-	default:
-		break;
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_key_netstarg(register XDR *xdrs, key_netstarg *objp)
-{
-
-	if (!xdr_keybuf(xdrs, objp->st_priv_key))
-		return (FALSE);
-	if (!xdr_keybuf(xdrs, objp->st_pub_key))
-		return (FALSE);
-	if (!xdr_netnamestr(xdrs, &objp->st_netname))
-		return (FALSE);
-	return (TRUE);
-}
-
-bool_t
-xdr_key_netstres(register XDR *xdrs, key_netstres *objp)
-{
-
-	if (!xdr_keystatus(xdrs, &objp->status))
-		return (FALSE);
-	switch (objp->status) {
-	case KEY_SUCCESS:
-		if (!xdr_key_netstarg(xdrs, &objp->key_netstres_u.knet))
-			return (FALSE);
-		break;
-	default:
-		break;
-	}
-	return (TRUE);
-}
diff --git a/lib/libc_bsd/rpc/mt_misc.c b/lib/libc_bsd/rpc/mt_misc.c
deleted file mode 100644
index d739ba7..0000000
--- a/lib/libc_bsd/rpc/mt_misc.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*	$NetBSD: mt_misc.c,v 1.1 2000/06/02 23:11:11 fvdl Exp $	*/
-
-/* #pragma ident	"@(#)mt_misc.c	1.24	93/04/29 SMI" */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/mt_misc.c 204950 2010-03-10 13:23:25Z jhb $");
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <rpc/rpc.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "mt_misc.h"
-
-/* Take these objects out of the application namespace. */
-#define	svc_lock		__svc_lock
-#define	svc_fd_lock		__svc_fd_lock
-#define	rpcbaddr_cache_lock	__rpcbaddr_cache_lock
-#define	authdes_ops_lock	__authdes_ops_lock
-#define	authnone_lock		__authnone_lock
-#define	authsvc_lock		__authsvc_lock
-#define	clnt_fd_lock		__clnt_fd_lock
-#define	clntraw_lock		__clntraw_lock
-#define	dupreq_lock		__dupreq_lock
-#define	loopnconf_lock		__loopnconf_lock
-#define	ops_lock		__ops_lock
-#define	proglst_lock		__proglst_lock
-#define	rpcsoc_lock		__rpcsoc_lock
-#define	svcraw_lock		__svcraw_lock
-#define	xprtlist_lock		__xprtlist_lock
-
-/* protects the services list (svc.c) */
-pthread_rwlock_t	svc_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-/* protects svc_fdset and the xports[] array */
-pthread_rwlock_t	svc_fd_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-/* protects the RPCBIND address cache */
-pthread_rwlock_t	rpcbaddr_cache_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-/* serializes authdes ops initializations */
-pthread_mutex_t authdes_ops_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects des stats list */
-pthread_mutex_t svcauthdesstats_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* auth_none.c serialization */
-pthread_mutex_t	authnone_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects the Auths list (svc_auth.c) */
-pthread_mutex_t	authsvc_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects client-side fd lock array */
-pthread_mutex_t	clnt_fd_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* clnt_raw.c serialization */
-pthread_mutex_t	clntraw_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* dupreq variables (svc_dg.c) */
-pthread_mutex_t	dupreq_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* loopnconf (rpcb_clnt.c) */
-pthread_mutex_t	loopnconf_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* serializes ops initializations */
-pthread_mutex_t	ops_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* protects proglst list (svc_simple.c) */
-pthread_mutex_t	proglst_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* serializes clnt_com_create() (rpc_soc.c) */
-pthread_mutex_t	rpcsoc_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* svc_raw.c serialization */
-pthread_mutex_t	svcraw_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* xprtlist (svc_generic.c) */
-pthread_mutex_t	xprtlist_lock = PTHREAD_MUTEX_INITIALIZER;
-
-#undef	rpc_createerr
-
-struct rpc_createerr rpc_createerr;
-static thread_key_t rce_key;
-static once_t rce_once = ONCE_INITIALIZER;
-static int rce_key_error;
-
-static void
-rce_key_init(void)
-{
-
-	rce_key_error = thr_keycreate(&rce_key, free);
-}
-
-struct rpc_createerr *
-__rpc_createerr()
-{
-	struct rpc_createerr *rce_addr = 0;
-
-	if (thr_main())
-		return (&rpc_createerr);
-	if (thr_once(&rce_once, rce_key_init) != 0 || rce_key_error != 0)
-		return (&rpc_createerr);
-	rce_addr = (struct rpc_createerr *)thr_getspecific(rce_key);
-	if (!rce_addr) {
-		rce_addr = (struct rpc_createerr *)
-			malloc(sizeof (struct rpc_createerr));
-		if (thr_setspecific(rce_key, (void *) rce_addr) != 0) {
-			if (rce_addr)
-				free(rce_addr);
-			return (&rpc_createerr);
-		}
-		memset(rce_addr, 0, sizeof (struct rpc_createerr));
-		return (rce_addr);
-	}
-	return (rce_addr);
-}
diff --git a/lib/libc_bsd/rpc/mt_misc.h b/lib/libc_bsd/rpc/mt_misc.h
deleted file mode 100644
index 4e322bd..0000000
--- a/lib/libc_bsd/rpc/mt_misc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2006 The FreeBSD Project. 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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: releng/10.2/lib/libc/rpc/mt_misc.h 204950 2010-03-10 13:23:25Z jhb $
- */
-#ifndef _MT_MISC_H
-#define	_MT_MISC_H
-
-/* Take these locks out of the application namespace. */
-#define	svc_lock		__svc_lock
-#define	svc_fd_lock		__svc_fd_lock
-#define	rpcbaddr_cache_lock	__rpcbaddr_cache_lock
-#define	authdes_ops_lock	__authdes_ops_lock
-#define	authnone_lock		__authnone_lock
-#define	authsvc_lock		__authsvc_lock
-#define	clnt_fd_lock		__clnt_fd_lock
-#define	clntraw_lock		__clntraw_lock
-#define	dupreq_lock		__dupreq_lock
-#define	loopnconf_lock		__loopnconf_lock
-#define	ops_lock		__ops_lock
-#define	proglst_lock		__proglst_lock
-#define	rpcsoc_lock		__rpcsoc_lock
-#define	svcraw_lock		__svcraw_lock
-#define	xprtlist_lock		__xprtlist_lock
-
-extern pthread_rwlock_t	svc_lock;
-extern pthread_rwlock_t	svc_fd_lock;
-extern pthread_rwlock_t	rpcbaddr_cache_lock;
-extern pthread_mutex_t	authdes_ops_lock;
-extern pthread_mutex_t	svcauthdesstats_lock;
-extern pthread_mutex_t	authnone_lock;
-extern pthread_mutex_t	authsvc_lock;
-extern pthread_mutex_t	clnt_fd_lock;
-extern pthread_mutex_t	clntraw_lock;
-extern pthread_mutex_t	dupreq_lock;
-extern pthread_mutex_t	loopnconf_lock;
-extern pthread_mutex_t	ops_lock;
-extern pthread_mutex_t	proglst_lock;
-extern pthread_mutex_t	rpcsoc_lock;
-extern pthread_mutex_t	svcraw_lock;
-extern pthread_mutex_t	tsd_lock;
-extern pthread_mutex_t	xprtlist_lock;
-
-#endif
diff --git a/lib/libc_bsd/rpc/netconfig.5 b/lib/libc_bsd/rpc/netconfig.5
deleted file mode 100644
index fa5f565..0000000
--- a/lib/libc_bsd/rpc/netconfig.5
+++ /dev/null
@@ -1,132 +0,0 @@
-.\"	$NetBSD: netconfig.5,v 1.2 2000/11/08 13:18:28 lukem Exp $
-.\" $NetBSD: netconfig.5,v 1.2 2000/11/08 13:18:28 lukem Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/netconfig.5 154224 2006-01-11 13:57:15Z ceri $
-.Dd November 17, 2000
-.Dt NETCONFIG 5
-.Os
-.Sh NAME
-.Nm netconfig
-.Nd network configuration data base
-.Sh SYNOPSIS
-.Pa /etc/netconfig
-.Sh DESCRIPTION
-The
-.Nm
-file defines a list of
-.Dq transport names ,
-describing their semantics and protocol.
-In
-.Fx ,
-this file is only used by the RPC library code.
-.Pp
-Entries have the following format:
-.Pp
-.Ar network_id semantics flags family protoname device libraries
-.Pp
-Entries consist of the following fields:
-.Bl -tag -width network_id
-.It Ar network_id
-The name of the transport described.
-.It Ar semantics
-Describes the semantics of the transport.
-This can be one of:
-.Bl -tag -width tpi_cots_ord -offset indent
-.It Sy tpi_clts
-Connectionless transport.
-.It Sy tpi_cots
-Connection-oriented transport
-.It Sy tpi_cots_ord
-Connection-oriented, ordered transport.
-.It Sy tpi_raw
-A raw connection.
-.El
-.It Ar flags
-This field is either blank (specified by
-.Dq Li - ) ,
-or contains one or more of the following characters:
-.Bl -tag -width b -offset indent
-.It Sy b
-The network represented by this entry is broadcast capable.
-This flag is meaningless in
-.Fx .
-.It Sy v
-The entry may be returned by the
-.Xr getnetpath 3
-function.
-.El
-.It Ar family
-The protocol family of the transport.
-This is currently one of:
-.Bl -tag -width loopback -offset indent
-.It Sy inet6
-The IPv6
-.Pq Dv PF_INET6
-family of protocols.
-.It Sy inet
-The IPv4
-.Pq Dv PF_INET
-family of protocols.
-.It Sy loopback
-The
-.Dv PF_LOCAL
-protocol family.
-.El
-.It Ar protoname
-The name of the protocol used for this transport.
-Can currently be either
-.Sy udp ,
-.Sy tcp
-or empty.
-.It Ar device
-This field is always empty in
-.Fx .
-.It Ar libraries
-This field is always empty in
-.Fx .
-.El
-.Pp
-The order of entries in this file will determine which transport will
-be preferred by the RPC library code, given a match on a specified
-network type.
-For example, if a sample network config file would look like this:
-.Bd -literal -offset indent
-udp6       tpi_clts      v     inet6    udp     -       -
-tcp6       tpi_cots_ord  v     inet6    tcp     -       -
-udp        tpi_clts      v     inet     udp     -       -
-tcp        tpi_cots_ord  v     inet     tcp     -       -
-rawip      tpi_raw       -     inet      -      -       -
-local      tpi_cots_ord  -     loopback  -      -       -
-.Ed
-.Pp
-then using the network type
-.Sy udp
-in calls to the RPC library function (see
-.Xr rpc 3 )
-will make the code first try
-.Sy udp6 ,
-and then
-.Sy udp .
-.Pp
-.Xr getnetconfig 3
-and associated functions will parse this file and return structures of
-the following format:
-.Bd -literal
-struct netconfig {
-    char *nc_netid;              /* Network ID */
-    unsigned long nc_semantics;  /* Semantics */
-    unsigned long nc_flag;       /* Flags */
-    char *nc_protofmly;          /* Protocol family */
-    char *nc_proto;              /* Protocol name */
-    char *nc_device;             /* Network device pathname (unused) */
-    unsigned long nc_nlookups;   /* Number of lookup libs (unused) */
-    char **nc_lookups;           /* Names of the libraries (unused) */
-    unsigned long nc_unused[9];  /* reserved */
-};
-.Ed
-.Sh FILES
-.Bl -tag -width /etc/netconfig -compact
-.It Pa /etc/netconfig
-.El
-.Sh SEE ALSO
-.Xr getnetconfig 3 ,
-.Xr getnetpath 3
diff --git a/lib/libc_bsd/rpc/netname.c b/lib/libc_bsd/rpc/netname.c
deleted file mode 100644
index 037b222..0000000
--- a/lib/libc_bsd/rpc/netname.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)netname.c 1.8 91/03/11 Copyr 1986 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/netname.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * netname utility routines
- * convert from unix names to network names and vice-versa
- * This module is operating system dependent!
- * What we define here will work with any unix system that has adopted
- * the sun NIS domain architecture.
- */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <rpc/rpc.h>
-#include <rpc/rpc_com.h>
-#ifdef YP
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <ctype.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#ifndef MAXHOSTNAMELEN
-#define MAXHOSTNAMELEN 256
-#endif
-
-#define TYPE_BIT(type)  (sizeof (type) * CHAR_BIT)
-
-#define TYPE_SIGNED(type) (((type) -1) < 0)
-
-/*
-** 302 / 1000 is log10(2.0) rounded up.
-** Subtract one for the sign bit if the type is signed;
-** add one for integer division truncation;
-** add one more for a minus sign if the type is signed.
-*/
-#define INT_STRLEN_MAXIMUM(type) \
-    ((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + 1 + TYPE_SIGNED(type))
-
-static char *OPSYS = "unix";
-
-/*
- * Figure out my fully qualified network name
- */
-int
-getnetname(name)
-	char name[MAXNETNAMELEN+1];
-{
-	uid_t uid;
-
-	uid = geteuid();
-	if (uid == 0) {
-		return (host2netname(name, (char *) NULL, (char *) NULL));
-	} else {
-		return (user2netname(name, uid, (char *) NULL));
-	}
-}
-
-
-/*
- * Convert unix cred to network-name
- */
-int
-user2netname(netname, uid, domain)
-	char netname[MAXNETNAMELEN + 1];
-	const uid_t uid;
-	const char *domain;
-{
-	char *dfltdom;
-
-	if (domain == NULL) {
-		if (__rpc_get_default_domain(&dfltdom) != 0) {
-			return (0);
-		}
-		domain = dfltdom;
-	}
-	if (strlen(domain) + 1 + INT_STRLEN_MAXIMUM(u_long) + 1 + strlen(OPSYS) > MAXNETNAMELEN) {
-		return (0);
-	}
-	(void) sprintf(netname, "%s.%ld@%s", OPSYS, (u_long)uid, domain);	
-	return (1);
-}
-
-
-/*
- * Convert host to network-name
- */
-int
-host2netname(netname, host, domain)
-	char netname[MAXNETNAMELEN + 1];
-	const char *host;
-	const char *domain;
-{
-	char *dfltdom;
-	char hostname[MAXHOSTNAMELEN+1];
-
-	if (domain == NULL) {
-		if (__rpc_get_default_domain(&dfltdom) != 0) {
-			return (0);
-		}
-		domain = dfltdom;
-	}
-	if (host == NULL) {
-		(void) gethostname(hostname, sizeof(hostname));
-		host = hostname;
-	}
-	if (strlen(domain) + 1 + strlen(host) + 1 + strlen(OPSYS) > MAXNETNAMELEN) {
-		return (0);
-	} 
-	(void) sprintf(netname, "%s.%s@%s", OPSYS, host, domain);
-	return (1);
-}
diff --git a/lib/libc_bsd/rpc/netnamer.c b/lib/libc_bsd/rpc/netnamer.c
deleted file mode 100644
index 7f86c4a..0000000
--- a/lib/libc_bsd/rpc/netnamer.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)netnamer.c 1.13 91/03/11 Copyr 1986 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/netnamer.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * netname utility routines convert from unix names to network names and
- * vice-versa This module is operating system dependent! What we define here
- * will work with any unix system that has adopted the sun NIS domain
- * architecture.
- */
-#include "namespace.h"
-#include <sys/param.h>
-#include <rpc/rpc.h>
-#include <rpc/rpc_com.h>
-#ifdef YP
-#include <rpcsvc/yp_prot.h>
-#include <rpcsvc/ypclnt.h>
-#endif
-#include <ctype.h>
-#include <stdio.h>
-#include <grp.h>
-#include <pwd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-static char    *OPSYS = "unix";
-#ifdef YP
-static char    *NETID = "netid.byname";
-#endif
-static char    *NETIDFILE = "/etc/netid";
-
-static int getnetid( char *, char * );
-static int _getgroups( char *, gid_t * );
-
-/*
- * Convert network-name into unix credential
- */
-int
-netname2user(netname, uidp, gidp, gidlenp, gidlist)
-	char            netname[MAXNETNAMELEN + 1];
-	uid_t            *uidp;
-	gid_t            *gidp;
-	int            *gidlenp;
-	gid_t	       *gidlist;
-{
-	char           *p;
-	int             gidlen;
-	uid_t           uid;
-	long		luid;
-	struct passwd  *pwd;
-	char            val[1024];
-	char           *val1, *val2;
-	char           *domain;
-	int             vallen;
-	int             err;
-
-	if (getnetid(netname, val)) {
-		char *res = val;
-
-		p = strsep(&res, ":");
-		if (p == NULL)
-			return (0);
-		*uidp = (uid_t) atol(p);
-		p = strsep(&res, "\n,");
-		if (p == NULL) {
-			return (0);
-		}
-		*gidp = (gid_t) atol(p);
-		for (gidlen = 0; gidlen < NGRPS; gidlen++) {
-			p = strsep(&res, "\n,");
-			if (p == NULL)
-				break;
-			gidlist[gidlen] = (gid_t) atol(p);
-		}
-		*gidlenp = gidlen;
-
-		return (1);
-	}
-	val1 = strchr(netname, '.');
-	if (val1 == NULL)
-		return (0);
-	if (strncmp(netname, OPSYS, (val1-netname)))
-		return (0);
-	val1++;
-	val2 = strchr(val1, '@');
-	if (val2 == NULL)
-		return (0);
-	vallen = val2 - val1;
-	if (vallen > (1024 - 1))
-		vallen = 1024 - 1;
-	(void) strncpy(val, val1, 1024);
-	val[vallen] = 0;
-
-	err = __rpc_get_default_domain(&domain);	/* change to rpc */
-	if (err)
-		return (0);
-
-	if (strcmp(val2 + 1, domain))
-		return (0);	/* wrong domain */
-
-	if (sscanf(val, "%ld", &luid) != 1)
-		return (0);
-	uid = luid;
-
-	/* use initgroups method */
-	pwd = getpwuid(uid);
-	if (pwd == NULL)
-		return (0);
-	*uidp = pwd->pw_uid;
-	*gidp = pwd->pw_gid;
-	*gidlenp = _getgroups(pwd->pw_name, gidlist);
-	return (1);
-}
-
-/*
- * initgroups
- */
-
-static int
-_getgroups(uname, groups)
-	char           *uname;
-	gid_t          groups[NGRPS];
-{
-	gid_t           ngroups = 0;
-	struct group *grp;
-	int    i;
-	int    j;
-	int             filter;
-
-	setgrent();
-	while ((grp = getgrent())) {
-		for (i = 0; grp->gr_mem[i]; i++)
-			if (!strcmp(grp->gr_mem[i], uname)) {
-				if (ngroups == NGRPS) {
-#ifdef DEBUG
-					fprintf(stderr,
-				"initgroups: %s is in too many groups\n", uname);
-#endif
-					goto toomany;
-				}
-				/* filter out duplicate group entries */
-				filter = 0;
-				for (j = 0; j < ngroups; j++)
-					if (groups[j] == grp->gr_gid) {
-						filter++;
-						break;
-					}
-				if (!filter)
-					groups[ngroups++] = grp->gr_gid;
-			}
-	}
-toomany:
-	endgrent();
-	return (ngroups);
-}
-
-/*
- * Convert network-name to hostname
- */
-int
-netname2host(netname, hostname, hostlen)
-	char            netname[MAXNETNAMELEN + 1];
-	char           *hostname;
-	int             hostlen;
-{
-	int             err;
-	char            valbuf[1024];
-	char           *val;
-	char           *val2;
-	int             vallen;
-	char           *domain;
-
-	if (getnetid(netname, valbuf)) {
-		val = valbuf;
-		if ((*val == '0') && (val[1] == ':')) {
-			(void) strncpy(hostname, val + 2, hostlen);
-			return (1);
-		}
-	}
-	val = strchr(netname, '.');
-	if (val == NULL)
-		return (0);
-	if (strncmp(netname, OPSYS, (val - netname)))
-		return (0);
-	val++;
-	val2 = strchr(val, '@');
-	if (val2 == NULL)
-		return (0);
-	vallen = val2 - val;
-	if (vallen > (hostlen - 1))
-		vallen = hostlen - 1;
-	(void) strncpy(hostname, val, vallen);
-	hostname[vallen] = 0;
-
-	err = __rpc_get_default_domain(&domain);	/* change to rpc */
-	if (err)
-		return (0);
-
-	if (strcmp(val2 + 1, domain))
-		return (0);	/* wrong domain */
-	else
-		return (1);
-}
-
-/*
- * reads the file /etc/netid looking for a + to optionally go to the
- * network information service.
- */
-int
-getnetid(key, ret)
-	char           *key, *ret;
-{
-	char            buf[1024];	/* big enough */
-	char           *res;
-	char           *mkey;
-	char           *mval;
-	FILE           *fd;
-#ifdef YP
-	char           *domain;
-	int             err;
-	char           *lookup;
-	int             len;
-#endif
-
-	fd = fopen(NETIDFILE, "r");
-	if (fd == NULL) {
-#ifdef YP
-		res = "+";
-		goto getnetidyp;
-#else
-		return (0);
-#endif
-	}
-	for (;;) {
-		if (fd == NULL)
-			return (0);	/* getnetidyp brings us here */
-		res = fgets(buf, sizeof(buf), fd);
-		if (res == NULL) {
-			fclose(fd);
-			return (0);
-		}
-		if (res[0] == '#')
-			continue;
-		else if (res[0] == '+') {
-#ifdef YP
-	getnetidyp:
-			err = yp_get_default_domain(&domain);
-			if (err) {
-				continue;
-			}
-			lookup = NULL;
-			err = yp_match(domain, NETID, key,
-				strlen(key), &lookup, &len);
-			if (err) {
-#ifdef DEBUG
-				fprintf(stderr, "match failed error %d\n", err);
-#endif
-				continue;
-			}
-			lookup[len] = 0;
-			strcpy(ret, lookup);
-			free(lookup);
-			if (fd != NULL)
-				fclose(fd);
-			return (2);
-#else	/* YP */
-#ifdef DEBUG
-			fprintf(stderr,
-"Bad record in %s '+' -- NIS not supported in this library copy\n",
-				NETIDFILE);
-#endif
-			continue;
-#endif	/* YP */
-		} else {
-			mkey = strsep(&res, "\t ");
-			if (mkey == NULL) {
-				fprintf(stderr,
-		"Bad record in %s -- %s", NETIDFILE, buf);
-				continue;
-			}
-			do {
-				mval = strsep(&res, " \t#\n");
-			} while (mval != NULL && !*mval);
-			if (mval == NULL) {
-				fprintf(stderr,
-		"Bad record in %s val problem - %s", NETIDFILE, buf);
-				continue;
-			}
-			if (strcmp(mkey, key) == 0) {
-				strcpy(ret, mval);
-				fclose(fd);
-				return (1);
-
-			}
-		}
-	}
-}
diff --git a/lib/libc_bsd/rpc/pmap_clnt.c b/lib/libc_bsd/rpc/pmap_clnt.c
deleted file mode 100644
index 708f14d..0000000
--- a/lib/libc_bsd/rpc/pmap_clnt.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*	$NetBSD: pmap_clnt.c,v 1.16 2000/07/06 03:10:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_clnt.c 1.37 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_clnt.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/pmap_clnt.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * pmap_clnt.c
- * Client interface to pmap rpc service.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/nettype.h>
-#include <netinet/in.h>
-#include "un-namespace.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "rpc_com.h"
-
-bool_t
-pmap_set(u_long program, u_long version, int protocol, int port)
-{
-	bool_t rslt;
-	struct netbuf *na;
-	struct netconfig *nconf;
-	char buf[32];
-
-	if ((protocol != IPPROTO_UDP) && (protocol != IPPROTO_TCP)) {
-		return (FALSE);
-	}
-	nconf = __rpc_getconfip(protocol == IPPROTO_UDP ? "udp" : "tcp");
-	if (nconf == NULL) {
-		return (FALSE);
-	}
-	snprintf(buf, sizeof buf, "0.0.0.0.%d.%d", 
-	    (((uint32_t)port) >> 8) & 0xff, port & 0xff);
-	na = uaddr2taddr(nconf, buf);
-	if (na == NULL) {
-		freenetconfigent(nconf);
-		return (FALSE);
-	}
-	rslt = rpcb_set((rpcprog_t)program, (rpcvers_t)version, nconf, na);
-	free(na);
-	freenetconfigent(nconf);
-	return (rslt);
-}
-
-/*
- * Remove the mapping between program, version and port.
- * Calls the pmap service remotely to do the un-mapping.
- */
-bool_t
-pmap_unset(u_long program, u_long version)
-{
-	struct netconfig *nconf;
-	bool_t udp_rslt = FALSE;
-	bool_t tcp_rslt = FALSE;
-
-	nconf = __rpc_getconfip("udp");
-	if (nconf != NULL) {
-		udp_rslt = rpcb_unset((rpcprog_t)program, (rpcvers_t)version,
-		    nconf);
-		freenetconfigent(nconf);
-	}
-	nconf = __rpc_getconfip("tcp");
-	if (nconf != NULL) {
-		tcp_rslt = rpcb_unset((rpcprog_t)program, (rpcvers_t)version,
-		    nconf);
-		freenetconfigent(nconf);
-	}
-	/*
-	 * XXX: The call may still succeed even if only one of the
-	 * calls succeeded.  This was the best that could be
-	 * done for backward compatibility.
-	 */
-	return (tcp_rslt || udp_rslt);
-}
diff --git a/lib/libc_bsd/rpc/pmap_getmaps.c b/lib/libc_bsd/rpc/pmap_getmaps.c
deleted file mode 100644
index 4029126..0000000
--- a/lib/libc_bsd/rpc/pmap_getmaps.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*	$NetBSD: pmap_getmaps.c,v 1.16 2000/07/06 03:10:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_getmaps.c 1.10 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_getmaps.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/pmap_getmaps.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * pmap_getmap.c
- * Client interface to pmap rpc service.
- * contains pmap_getmaps, which is only tcp service involved
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-
-#include <arpa/inet.h>
-#include <net/if.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include "un-namespace.h"
-
-#define NAMELEN 255
-#define MAX_BROADCAST_SIZE 1400
-
-/*
- * Get a copy of the current port maps.
- * Calls the pmap service remotely to do get the maps.
- */
-struct pmaplist *
-pmap_getmaps(address)
-	 struct sockaddr_in *address;
-{
-	struct pmaplist *head = NULL;
-	int sock = -1;
-	struct timeval minutetimeout;
-	CLIENT *client;
-
-	assert(address != NULL);
-
-	minutetimeout.tv_sec = 60;
-	minutetimeout.tv_usec = 0;
-	address->sin_port = htons(PMAPPORT);
-	client = clnttcp_create(address, PMAPPROG,
-	    PMAPVERS, &sock, 50, 500);
-	if (client != NULL) {
-		if (CLNT_CALL(client, (rpcproc_t)PMAPPROC_DUMP,
-		    (xdrproc_t)xdr_void, NULL,
-		    (xdrproc_t)xdr_pmaplist, &head, minutetimeout) !=
-		    RPC_SUCCESS) {
-			clnt_perror(client, "pmap_getmaps rpc problem");
-		}
-		CLNT_DESTROY(client);
-	}
-	address->sin_port = 0;
-	return (head);
-}
diff --git a/lib/libc_bsd/rpc/pmap_getport.c b/lib/libc_bsd/rpc/pmap_getport.c
deleted file mode 100644
index 0d04574..0000000
--- a/lib/libc_bsd/rpc/pmap_getport.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*	$NetBSD: pmap_getport.c,v 1.16 2000/07/06 03:10:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)pmap_getport.c 1.9 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "from: @(#)pmap_getport.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/pmap_getport.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * pmap_getport.c
- * Client interface to pmap rpc service.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include <arpa/inet.h>
-#include <net/if.h>
-
-#include <assert.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include "un-namespace.h"
-
-static const struct timeval timeout = { 5, 0 };
-static const struct timeval tottimeout = { 60, 0 };
-
-/*
- * Find the mapped port for program,version.
- * Calls the pmap service remotely to do the lookup.
- * Returns 0 if no map exists.
- */
-u_short
-pmap_getport(address, program, version, protocol)
-	struct sockaddr_in *address;
-	u_long program;
-	u_long version;
-	u_int protocol;
-{
-	u_short port = 0;
-	int sock = -1;
-	CLIENT *client;
-	struct pmap parms;
-
-	assert(address != NULL);
-
-	address->sin_port = htons(PMAPPORT);
-	client = clntudp_bufcreate(address, PMAPPROG,
-	    PMAPVERS, timeout, &sock, RPCSMALLMSGSIZE, RPCSMALLMSGSIZE);
-	if (client != NULL) {
-		parms.pm_prog = program;
-		parms.pm_vers = version;
-		parms.pm_prot = protocol;
-		parms.pm_port = 0;  /* not needed or used */
-		if (CLNT_CALL(client, (rpcproc_t)PMAPPROC_GETPORT,
-		    (xdrproc_t)xdr_pmap,
-		    &parms, (xdrproc_t)xdr_u_short, &port, tottimeout) !=
-		    RPC_SUCCESS){
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-		} else if (port == 0) {
-			rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-		}
-		CLNT_DESTROY(client);
-	}
-	address->sin_port = 0;
-	return (port);
-}
diff --git a/lib/libc_bsd/rpc/pmap_prot.c b/lib/libc_bsd/rpc/pmap_prot.c
deleted file mode 100644
index 1fde9fb..0000000
--- a/lib/libc_bsd/rpc/pmap_prot.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*	$NetBSD: pmap_prot.c,v 1.10 2000/01/22 22:19:18 mycroft Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_prot.c 1.17 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_prot.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/pmap_prot.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * pmap_prot.c
- * Protocol for the local binder service, or pmap.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/pmap_prot.h>
-#include "un-namespace.h"
-
-
-bool_t
-xdr_pmap(xdrs, regs)
-	XDR *xdrs;
-	struct pmap *regs;
-{
-
-	assert(xdrs != NULL);
-	assert(regs != NULL);
-
-	if (xdr_u_long(xdrs, &regs->pm_prog) &&
-		xdr_u_long(xdrs, &regs->pm_vers) &&
-		xdr_u_long(xdrs, &regs->pm_prot))
-		return (xdr_u_long(xdrs, &regs->pm_port));
-	return (FALSE);
-}
diff --git a/lib/libc_bsd/rpc/pmap_prot2.c b/lib/libc_bsd/rpc/pmap_prot2.c
deleted file mode 100644
index 938eb3b..0000000
--- a/lib/libc_bsd/rpc/pmap_prot2.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*	$NetBSD: pmap_prot2.c,v 1.14 2000/07/06 03:10:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_prot2.c 1.3 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_prot2.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/pmap_prot2.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * pmap_prot2.c
- * Protocol for the local binder service, or pmap.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <assert.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/pmap_prot.h>
-#include "un-namespace.h"
-
-
-/*
- * What is going on with linked lists? (!)
- * First recall the link list declaration from pmap_prot.h:
- *
- * struct pmaplist {
- *	struct pmap pml_map;
- *	struct pmaplist *pml_map;
- * };
- *
- * Compare that declaration with a corresponding xdr declaration that
- * is (a) pointer-less, and (b) recursive:
- *
- * typedef union switch (bool_t) {
- *
- *	case TRUE: struct {
- *		struct pmap;
- * 		pmaplist_t foo;
- *	};
- *
- *	case FALSE: struct {};
- * } pmaplist_t;
- *
- * Notice that the xdr declaration has no nxt pointer while
- * the C declaration has no bool_t variable.  The bool_t can be
- * interpreted as ``more data follows me''; if FALSE then nothing
- * follows this bool_t; if TRUE then the bool_t is followed by
- * an actual struct pmap, and then (recursively) by the
- * xdr union, pamplist_t.
- *
- * This could be implemented via the xdr_union primitive, though this
- * would cause a one recursive call per element in the list.  Rather than do
- * that we can ``unwind'' the recursion
- * into a while loop and do the union arms in-place.
- *
- * The head of the list is what the C programmer wishes to past around
- * the net, yet is the data that the pointer points to which is interesting;
- * this sounds like a job for xdr_reference!
- */
-bool_t
-xdr_pmaplist(xdrs, rp)
-	XDR *xdrs;
-	struct pmaplist **rp;
-{
-	/*
-	 * more_elements is pre-computed in case the direction is
-	 * XDR_ENCODE or XDR_FREE.  more_elements is overwritten by
-	 * xdr_bool when the direction is XDR_DECODE.
-	 */
-	bool_t more_elements;
-	int freeing;
-	struct pmaplist **next	= NULL; /* pacify gcc */
-
-	assert(xdrs != NULL);
-	assert(rp != NULL);
-
-	freeing = (xdrs->x_op == XDR_FREE);
-
-	for (;;) {
-		more_elements = (bool_t)(*rp != NULL);
-		if (! xdr_bool(xdrs, &more_elements))
-			return (FALSE);
-		if (! more_elements)
-			return (TRUE);  /* we are done */
-		/*
-		 * the unfortunate side effect of non-recursion is that in
-		 * the case of freeing we must remember the next object
-		 * before we free the current object ...
-		 */
-		if (freeing)
-			next = &((*rp)->pml_next); 
-		if (! xdr_reference(xdrs, (caddr_t *)rp,
-		    (u_int)sizeof(struct pmaplist), (xdrproc_t)xdr_pmap))
-			return (FALSE);
-		rp = (freeing) ? next : &((*rp)->pml_next);
-	}
-}
-
-
-/*
- * xdr_pmaplist_ptr() is specified to take a PMAPLIST *, but is identical in
- * functionality to xdr_pmaplist().
- */
-bool_t
-xdr_pmaplist_ptr(xdrs, rp)
-	XDR *xdrs;
-	struct pmaplist *rp;
-{
-	return xdr_pmaplist(xdrs, (struct pmaplist **)(void *)rp);
-}
diff --git a/lib/libc_bsd/rpc/pmap_rmt.c b/lib/libc_bsd/rpc/pmap_rmt.c
deleted file mode 100644
index 241a3b2..0000000
--- a/lib/libc_bsd/rpc/pmap_rmt.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*	$NetBSD: pmap_rmt.c,v 1.29 2000/07/06 03:10:34 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)pmap_rmt.c 1.21 87/08/27 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)pmap_rmt.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/pmap_rmt.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * pmap_rmt.c
- * Client interface to pmap rpc service.
- * remote call and broadcast service
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/poll.h>
-#include <sys/socket.h>
-
-#include <net/if.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_rmt.h>
-#include "un-namespace.h"
-
-static const struct timeval timeout = { 3, 0 };
-
-/*
- * pmapper remote-call-service interface.
- * This routine is used to call the pmapper remote call service
- * which will look up a service program in the port maps, and then
- * remotely call that routine with the given parameters.  This allows
- * programs to do a lookup and call in one step.
-*/
-enum clnt_stat
-pmap_rmtcall(addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout,
-    port_ptr)
-	struct sockaddr_in *addr;
-	u_long prog, vers, proc;
-	xdrproc_t xdrargs, xdrres;
-	caddr_t argsp, resp;
-	struct timeval tout;
-	u_long *port_ptr;
-{
-	int sock = -1;
-	CLIENT *client;
-	struct rmtcallargs a;
-	struct rmtcallres r;
-	enum clnt_stat stat;
-
-	assert(addr != NULL);
-	assert(port_ptr != NULL);
-
-	addr->sin_port = htons(PMAPPORT);
-	client = clntudp_create(addr, PMAPPROG, PMAPVERS, timeout, &sock);
-	if (client != NULL) {
-		a.prog = prog;
-		a.vers = vers;
-		a.proc = proc;
-		a.args_ptr = argsp;
-		a.xdr_args = xdrargs;
-		r.port_ptr = port_ptr;
-		r.results_ptr = resp;
-		r.xdr_results = xdrres;
-		stat = CLNT_CALL(client, (rpcproc_t)PMAPPROC_CALLIT,
-		    (xdrproc_t)xdr_rmtcall_args, &a, (xdrproc_t)xdr_rmtcallres,
-		    &r, tout);
-		CLNT_DESTROY(client);
-	} else {
-		stat = RPC_FAILED;
-	}
-	addr->sin_port = 0;
-	return (stat);
-}
-
-
-/*
- * XDR remote call arguments
- * written for XDR_ENCODE direction only
- */
-bool_t
-xdr_rmtcall_args(xdrs, cap)
-	XDR *xdrs;
-	struct rmtcallargs *cap;
-{
-	u_int lenposition, argposition, position;
-
-	assert(xdrs != NULL);
-	assert(cap != NULL);
-
-	if (xdr_u_long(xdrs, &(cap->prog)) &&
-	    xdr_u_long(xdrs, &(cap->vers)) &&
-	    xdr_u_long(xdrs, &(cap->proc))) {
-		lenposition = XDR_GETPOS(xdrs);
-		if (! xdr_u_long(xdrs, &(cap->arglen)))
-		    return (FALSE);
-		argposition = XDR_GETPOS(xdrs);
-		if (! (*(cap->xdr_args))(xdrs, cap->args_ptr))
-		    return (FALSE);
-		position = XDR_GETPOS(xdrs);
-		cap->arglen = (u_long)position - (u_long)argposition;
-		XDR_SETPOS(xdrs, lenposition);
-		if (! xdr_u_long(xdrs, &(cap->arglen)))
-		    return (FALSE);
-		XDR_SETPOS(xdrs, position);
-		return (TRUE);
-	}
-	return (FALSE);
-}
-
-/*
- * XDR remote call results
- * written for XDR_DECODE direction only
- */
-bool_t
-xdr_rmtcallres(xdrs, crp)
-	XDR *xdrs;
-	struct rmtcallres *crp;
-{
-	caddr_t port_ptr;
-
-	assert(xdrs != NULL);
-	assert(crp != NULL);
-
-	port_ptr = (caddr_t)(void *)crp->port_ptr;
-	if (xdr_reference(xdrs, &port_ptr, sizeof (u_long),
-	    (xdrproc_t)xdr_u_long) && xdr_u_long(xdrs, &crp->resultslen)) {
-		crp->port_ptr = (u_long *)(void *)port_ptr;
-		return ((*(crp->xdr_results))(xdrs, crp->results_ptr));
-	}
-	return (FALSE);
-}
diff --git a/lib/libc_bsd/rpc/publickey.3 b/lib/libc_bsd/rpc/publickey.3
deleted file mode 100644
index e34e755..0000000
--- a/lib/libc_bsd/rpc/publickey.3
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" @(#)publickey.3r	2.1 88/08/07 4.0 RPCSRC
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/publickey.3 235286 2012-05-11 20:06:46Z gjb $
-.\"
-.Dd October 6, 1987
-.Dt PUBLICKEY 3
-.Os
-.Sh NAME
-.Nm publickey , getpublickey , getsecretkey
-.Nd "get public or secret key"
-.Sh LIBRARY
-.Lb librpcsvc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.In rpc/key_prot.h
-.Ft int
-.Fo getpublickey
-.Fa "const char netname[MAXNETNAMELEN+1]"
-.Fa "char publickey[HEXKEYBYTES+1]"
-.Fc
-.Ft int
-.Fo getsecretkey
-.Fa "char netname[MAXNETNAMELEN+1]"
-.Fa "char secretkey[HEXKEYBYTES+1]"
-.Fa "char *passwd"
-.Fc
-.Sh DESCRIPTION
-These routines are used to get public and secret keys from the
-.Tn YP
-database.
-The
-.Fn getsecretkey
-function
-has an extra argument,
-.Fa passwd ,
-which is used to decrypt the encrypted secret key stored in the database.
-Both routines return 1 if they are successful in finding the key, 0 otherwise.
-The keys are returned as
-.Dv NUL Ns \-terminated ,
-hexadecimal strings.
-If the password supplied to
-.Fn getsecretkey
-fails to decrypt the secret key, the routine will return 1 but the
-.Fa secretkey
-argument will be a
-.Dv NUL
-string
-.Pq Dq .
-.Sh SEE ALSO
-.Xr publickey 5
-.Pp
-.%T "RPC Programmer's Manual"
-in
-.Pa /usr/share/doc/psd/23.rpc .
diff --git a/lib/libc_bsd/rpc/publickey.5 b/lib/libc_bsd/rpc/publickey.5
deleted file mode 100644
index b819549..0000000
--- a/lib/libc_bsd/rpc/publickey.5
+++ /dev/null
@@ -1,42 +0,0 @@
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/publickey.5 119492 2003-08-26 15:52:47Z eivind $
-.\" @(#)publickey.5	2.1 88/08/07 4.0 RPCSRC; from 1.6 88/02/29 SMI;
-.Dd October 19, 1987
-.Dt PUBLICKEY 5
-.Os
-.Sh NAME
-.Nm publickey
-.Nd "public key database"
-.Sh SYNOPSIS
-.Pa /etc/publickey
-.Sh DESCRIPTION
-.Pa /etc/publickey
-is the public key database used for secure
-RPC (Remote Procedure Calls).
-Each entry in
-the database consists of a network user
-name (which may either refer to
-a user or a hostname), followed by the user's
-public key (in hex
-notation), a colon, and then the user's
-secret key encrypted with
-its login password (also in hex notation).
-.Pp
-This file is altered either by the user through the
-.Xr chkey 1
-command or by the system administrator through the
-.Xr newkey 8
-command.
-The file
-.Pa /etc/publickey
-should only contain data on the
-.Tn NIS
-master machine, where it
-is converted into the
-.Tn NIS
-database
-.Pa publickey.byname .
-.Sh SEE ALSO
-.Xr chkey 1 ,
-.Xr publickey 3 ,
-.Xr newkey 8 ,
-.Xr ypupdated 8
diff --git a/lib/libc_bsd/rpc/rpc.3 b/lib/libc_bsd/rpc/rpc.3
deleted file mode 100644
index deec7f1..0000000
--- a/lib/libc_bsd/rpc/rpc.3
+++ /dev/null
@@ -1,517 +0,0 @@
-.\" @(#)rpc.3n 1.31 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" $NetBSD: rpc.3,v 1.10 2000/06/02 23:11:12 fvdl Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc.3 231564 2012-02-12 18:29:56Z ed $
-.Dd May 7, 1993
-.Dt RPC 3
-.Os
-.Sh NAME
-.Nm rpc
-.Nd library routines for remote procedure calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.In netconfig.h
-.Sh DESCRIPTION
-These
-routines allow C language programs to make procedure
-calls on other machines across a network.
-First, the client sends a request to the server.
-On receipt of the request, the server calls a dispatch routine
-to perform the requested service, and then sends back a reply.
-.Pp
-All
-RPC routines require the header
-.In rpc/rpc.h .
-Routines that take a
-.Vt "struct netconfig"
-also require that
-.In netconfig.h
-be included.
-.Sh Nettype
-Some of the high-level
-RPC interface routines take a
-.Fa nettype
-string as one of the arguments
-(for example,
-.Fn clnt_create ,
-.Fn svc_create ,
-.Fn rpc_reg ,
-.Fn rpc_call ) .
-This string defines a class of transports which can be used
-for a particular application.
-.Pp
-The
-.Fa nettype
-argument
-can be one of the following:
-.Bl -tag -width datagram_v
-.It netpath
-Choose from the transports which have been
-indicated by their token names in the
-.Ev NETPATH
-environment variable.
-.Ev NETPATH
-is unset or
-.Dv NULL ,
-it defaults to
-.Qq visible .
-.Qq netpath
-is the default
-.Fa nettype .
-.It visible
-Choose the transports which have the visible flag (v)
-set in the
-.Pa /etc/netconfig
-file.
-.It circuit_v
-This is same as
-.Qq visible
-except that it chooses only the connection oriented transports
-(semantics
-.Qq tpi_cots
-or
-.Qq tpi_cots_ord )
-from the entries in the
-.Pa /etc/netconfig
-file.
-.It datagram_v
-This is same as
-.Qq visible
-except that it chooses only the connectionless datagram transports
-(semantics
-.Qq tpi_clts )
-from the entries in the
-.Pa /etc/netconfig
-file.
-.It circuit_n
-This is same as
-.Qq netpath
-except that it chooses only the connection oriented datagram transports
-(semantics
-.Qq tpi_cots
-or
-.Qq tpi_cots_ord ) .
-.It datagram_n
-This is same as
-.Qq netpath
-except that it chooses only the connectionless datagram transports
-(semantics
-.Qq tpi_clts ) .
-.It udp
-This refers to Internet UDP, both version 4 and 6.
-.It tcp
-This refers to Internet TCP, both version 4 and 6.
-.El
-.Pp
-If
-.Fa nettype
-is
-.Dv NULL ,
-it defaults to
-.Qq netpath .
-The transports are tried in left to right order in the
-.Ev NETPATH
-variable or in top to down order in the
-.Pa /etc/netconfig
-file.
-.Sh Derived Types
-The derived types used in the RPC interfaces are defined as follows:
-.Bd -literal
-	typedef uint32_t rpcprog_t;
-	typedef uint32_t rpcvers_t;
-	typedef uint32_t rpcproc_t;
-	typedef uint32_t rpcprot_t;
-	typedef uint32_t rpcport_t;
-	typedef int32_t  rpc_inline_t;
-.Ed
-.Sh "Data Structures"
-Some of the data structures used by the
-RPC package are shown below.
-.Sh "The AUTH Structure"
-.Bd -literal
-/*
- * Authentication info. Opaque to client.
- */
-struct opaque_auth {
-    enum_t    oa_flavor;    /* flavor of auth */
-    caddr_t    oa_base;    /* address of more auth stuff */
-    u_int    oa_length;    /* not to exceed MAX_AUTH_BYTES */
-};
-
-/*
- * Auth handle, interface to client side authenticators.
- */
-typedef struct {
-    struct    opaque_auth    ah_cred;
-    struct    opaque_auth    ah_verf;
-    struct auth_ops {
-        void    (*ah_nextverf)(\|);
-        int    (*ah_marshal)(\|);    /* nextverf & serialize */
-        int    (*ah_validate)(\|);    /* validate verifier */
-        int    (*ah_refresh)(\|);    /* refresh credentials */
-        void    (*ah_destroy)(\|);    /* destroy this structure */
-    } *ah_ops;
-    caddr_t ah_private;
-} AUTH;
-.Ed
-.Sh "The CLIENT Structure"
-.Bd -literal
-/*
- * Client rpc handle.
- * Created by individual implementations.
- * Client is responsible for initializing auth.
- */
-
-typedef struct {
-    AUTH    *cl_auth;    /* authenticator */
-    struct clnt_ops {
-        enum clnt_stat    (*cl_call)();    /* call remote procedure */
-        void    (*cl_abort)();        /* abort a call */
-        void    (*cl_geterr)();        /* get specific error code */
-        bool_t    (*cl_freeres)();    /* frees results */
-        void    (*cl_destroy)();    /* destroy this structure */
-        bool_t    (*cl_control)();    /* the ioctl() of rpc */
-    } *cl_ops;
-    caddr_t    cl_private;    /* private stuff */
-    char    *cl_netid;    /* network identifier */
-    char    *cl_tp;        /* device name */
-} CLIENT;
-.Ed
-.Sh "The SVCXPRT structure"
-.Bd -literal
-enum xprt_stat {
-    XPRT_DIED,
-    XPRT_MOREREQS,
-    XPRT_IDLE
-};
-
-/*
- * Server side transport handle
- */
-typedef struct {
-    int    xp_fd;    /* file descriptor for the server handle */
-    u_short    xp_port;    /* obsolete */
-    const struct xp_ops {
-        bool_t    (*xp_recv)();    /* receive incoming requests */
-        enum xprt_stat    (*xp_stat)();    /* get transport status */
-        bool_t    (*xp_getargs)();    /* get arguments */
-        bool_t    (*xp_reply)();      /* send reply */
-        bool_t    (*xp_freeargs)(); /* free mem allocated for args */
-        void    (*xp_destroy)();    /* destroy this struct */
-    } *xp_ops;
-    int    xp_addrlen;    /* length of remote addr.  Obsolete */
-    struct sockaddr_in    xp_raddr; /* Obsolete */
-    const struct xp_ops2 {
-        bool_t    (*xp_control)();    /* catch-all function */
-    } *xp_ops2;
-    char    *xp_tp;    /* transport provider device name */
-    char    *xp_netid;    /* network identifier */
-    struct netbuf    xp_ltaddr;    /* local transport address */
-    struct netbuf    xp_rtaddr;    /* remote transport address */
-    struct opaque_auth    xp_verf;    /* raw response verifier */
-    caddr_t    xp_p1;    /* private: for use by svc ops */
-    caddr_t    xp_p2;    /* private: for use by svc ops */
-    caddr_t    xp_p3;    /* private: for use by svc lib */
-    int    xp_type    /* transport type */
-} SVCXPRT;
-.Ed
-.Sh "The svc_reg structure"
-.Bd -literal
-struct svc_req {
-    rpcprog_t    rq_prog;    /* service program number */
-    rpcvers_t    rq_vers;    /* service protocol version */
-    rpcproc_t    rq_proc;    /* the desired procedure */
-    struct opaque_auth    rq_cred;    /* raw creds from the wire */
-    caddr_t    rq_clntcred;    /* read only cooked cred */
-    SVCXPRT    *rq_xprt;    /* associated transport */
-};
-.Ed
-.Sh "The XDR structure"
-.Bd -literal
-/*
- * XDR operations.
- * XDR_ENCODE causes the type to be encoded into the stream.
- * XDR_DECODE causes the type to be extracted from the stream.
- * XDR_FREE can be used to release the space allocated by an XDR_DECODE
- * request.
- */
-enum xdr_op {
-    XDR_ENCODE=0,
-    XDR_DECODE=1,
-    XDR_FREE=2
-};
-/*
- * This is the number of bytes per unit of external data.
- */
-#define BYTES_PER_XDR_UNIT    (4)
-#define RNDUP(x)  ((((x) + BYTES_PER_XDR_UNIT - 1) /
-                   BYTES_PER_XDR_UNIT) \e * BYTES_PER_XDR_UNIT)
-
-/*
- * A xdrproc_t exists for each data type which is to be encoded or
- * decoded.  The second argument to the xdrproc_t is a pointer to
- * an opaque pointer.  The opaque pointer generally points to a
- * structure of the data type to be decoded.  If this points to 0,
- * then the type routines should allocate dynamic storage of the
- * appropriate size and return it.
- * bool_t  (*xdrproc_t)(XDR *, caddr_t *);
- */
-typedef  bool_t (*xdrproc_t)();
-
-/*
- * The XDR handle.
- * Contains operation which is being applied to the stream,
- * an operations vector for the particular implementation
- */
-typedef struct {
-    enum xdr_op    x_op;    /* operation; fast additional param */
-    struct xdr_ops {
-        bool_t    (*x_getlong)();    /* get a long from underlying stream */
-        bool_t    (*x_putlong)();    /* put a long to underlying stream */
-        bool_t    (*x_getbytes)(); /* get bytes from underlying stream */
-        bool_t    (*x_putbytes)(); /* put bytes to underlying stream */
-        u_int    (*x_getpostn)(); /* returns bytes off from beginning */
-        bool_t    (*x_setpostn)(); /* lets you reposition the stream */
-        long *    (*x_inline)();    /* buf quick ptr to buffered data */
-        void    (*x_destroy)();    /* free privates of this xdr_stream */
-    } *x_ops;
-    caddr_t    x_public;    /* users' data */
-    caddr_t    x_private;    /* pointer to private data */
-    caddr_t    x_base;    /* private used for position info */
-    u_int    x_handy;    /* extra private word */
-} XDR;
-
-/*
- * The netbuf structure. This structure is defined in <xti.h> on SysV
- * systems, but NetBSD / FreeBSD do not use XTI.
- *
- * Usually, buf will point to a struct sockaddr, and len and maxlen
- * will contain the length and maximum length of that socket address,
- * respectively.
- */
-struct netbuf {
-	unsigned int maxlen;
-	unsigned int len;
-	void *buf;
-};
-
-/*
- * The format of the address and options arguments of the XTI t_bind call.
- * Only provided for compatibility, it should not be used other than
- * as an argument to svc_tli_create().
- */
-
-struct t_bind {
-	struct netbuf   addr;
-	unsigned int    qlen;
-};
-.Ed
-.Sh "Index to Routines"
-The following table lists RPC routines and the manual reference
-pages on which they are described:
-.Pp
-.Bl -tag -width "authunix_create_default()" -compact
-.It Em "RPC Routine"
-.Em "Manual Reference Page"
-.Pp
-.It Fn auth_destroy
-.Xr rpc_clnt_auth 3
-.It Fn authdes_create
-.Xr rpc_soc 3
-.It Fn authnone_create
-.Xr rpc_clnt_auth 3
-.It Fn authsys_create
-.Xr rpc_clnt_auth 3
-.It Fn authsys_create_default
-.Xr rpc_clnt_auth 3
-.It Fn authunix_create
-.Xr rpc_soc 3
-.It Fn authunix_create_default
-.Xr rpc_soc 3
-.It Fn callrpc
-.Xr rpc_soc 3
-.It Fn clnt_broadcast
-.Xr rpc_soc 3
-.It Fn clnt_call
-.Xr rpc_clnt_calls 3
-.It Fn clnt_control
-.Xr rpc_clnt_create 3
-.It Fn clnt_create
-.Xr rpc_clnt_create 3
-.It Fn clnt_create_timed
-.Xr rpc_clnt_create 3
-.It Fn clnt_create_vers
-.Xr rpc_clnt_create 3
-.It Fn clnt_create_vers_timed
-.Xr rpc_clnt_create 3
-.It Fn clnt_destroy
-.Xr rpc_clnt_create 3
-.It Fn clnt_dg_create
-.Xr rpc_clnt_create 3
-.It Fn clnt_freeres
-.Xr rpc_clnt_calls 3
-.It Fn clnt_geterr
-.Xr rpc_clnt_calls 3
-.It Fn clnt_pcreateerror
-.Xr rpc_clnt_create 3
-.It Fn clnt_perrno
-.Xr rpc_clnt_calls 3
-.It Fn clnt_perror
-.Xr rpc_clnt_calls 3
-.It Fn clnt_raw_create
-.Xr rpc_clnt_create 3
-.It Fn clnt_spcreateerror
-.Xr rpc_clnt_create 3
-.It Fn clnt_sperrno
-.Xr rpc_clnt_calls 3
-.It Fn clnt_sperror
-.Xr rpc_clnt_calls 3
-.It Fn clnt_tli_create
-.Xr rpc_clnt_create 3
-.It Fn clnt_tp_create
-.Xr rpc_clnt_create 3
-.It Fn clnt_tp_create_timed
-.Xr rpc_clnt_create 3
-.It Fn clnt_udpcreate
-.Xr rpc_soc 3
-.It Fn clnt_vc_create
-.Xr rpc_clnt_create 3
-.It Fn clntraw_create
-.Xr rpc_soc 3
-.It Fn clnttcp_create
-.Xr rpc_soc 3
-.It Fn clntudp_bufcreate
-.Xr rpc_soc 3
-.It Fn get_myaddress
-.Xr rpc_soc 3
-.It Fn pmap_getmaps
-.Xr rpc_soc 3
-.It Fn pmap_getport
-.Xr rpc_soc 3
-.It Fn pmap_rmtcall
-.Xr rpc_soc 3
-.It Fn pmap_set
-.Xr rpc_soc 3
-.It Fn pmap_unset
-.Xr rpc_soc 3
-.It Fn registerrpc
-.Xr rpc_soc 3
-.It Fn rpc_broadcast
-.Xr rpc_clnt_calls 3
-.It Fn rpc_broadcast_exp
-.Xr rpc_clnt_calls 3
-.It Fn rpc_call
-.Xr rpc_clnt_calls 3
-.It Fn rpc_reg
-.Xr rpc_svc_calls 3
-.It Fn svc_create
-.Xr rpc_svc_create 3
-.It Fn svc_destroy
-.Xr rpc_svc_create 3
-.It Fn svc_dg_create
-.Xr rpc_svc_create 3
-.It Fn svc_dg_enablecache
-.Xr rpc_svc_calls 3
-.It Fn svc_fd_create
-.Xr rpc_svc_create 3
-.It Fn svc_fds
-.Xr rpc_soc 3
-.It Fn svc_freeargs
-.Xr rpc_svc_reg 3
-.It Fn svc_getargs
-.Xr rpc_svc_reg 3
-.It Fn svc_getcaller
-.Xr rpc_soc 3
-.It Fn svc_getreq
-.Xr rpc_soc 3
-.It Fn svc_getreqset
-.Xr rpc_svc_calls 3
-.It Fn svc_getrpccaller
-.Xr rpc_svc_calls 3
-.It Fn svc_kerb_reg
-.Xr kerberos_rpc 3
-.It Fn svc_raw_create
-.Xr rpc_svc_create 3
-.It Fn svc_reg
-.Xr rpc_svc_calls 3
-.It Fn svc_register
-.Xr rpc_soc 3
-.It Fn svc_run
-.Xr rpc_svc_reg 3
-.It Fn svc_sendreply
-.Xr rpc_svc_reg 3
-.It Fn svc_tli_create
-.Xr rpc_svc_create 3
-.It Fn svc_tp_create
-.Xr rpc_svc_create 3
-.It Fn svc_unreg
-.Xr rpc_svc_calls 3
-.It Fn svc_unregister
-.Xr rpc_soc 3
-.It Fn svc_vc_create
-.Xr rpc_svc_create 3
-.It Fn svcerr_auth
-.Xr rpc_svc_err 3
-.It Fn svcerr_decode
-.Xr rpc_svc_err 3
-.It Fn svcerr_noproc
-.Xr rpc_svc_err 3
-.It Fn svcerr_noprog
-.Xr rpc_svc_err 3
-.It Fn svcerr_progvers
-.Xr rpc_svc_err 3
-.It Fn svcerr_systemerr
-.Xr rpc_svc_err 3
-.It Fn svcerr_weakauth
-.Xr rpc_svc_err 3
-.It Fn svcfd_create
-.Xr rpc_soc 3
-.It Fn svcraw_create
-.Xr rpc_soc 3
-.It Fn svctcp_create
-.Xr rpc_soc 3
-.It Fn svcudp_bufcreate
-.Xr rpc_soc 3
-.It Fn svcudp_create
-.Xr rpc_soc 3
-.It Fn xdr_accepted_reply
-.Xr rpc_xdr 3
-.It Fn xdr_authsys_parms
-.Xr rpc_xdr 3
-.It Fn xdr_authunix_parms
-.Xr rpc_soc 3
-.It Fn xdr_callhdr
-.Xr rpc_xdr 3
-.It Fn xdr_callmsg
-.Xr rpc_xdr 3
-.It Fn xdr_opaque_auth
-.Xr rpc_xdr 3
-.It Fn xdr_rejected_reply
-.Xr rpc_xdr 3
-.It Fn xdr_replymsg
-.Xr rpc_xdr 3
-.It Fn xprt_register
-.Xr rpc_svc_calls 3
-.It Fn xprt_unregister
-.Xr rpc_svc_calls 3
-.El
-.Sh FILES
-.Bl -tag -width /etc/netconfig
-.It Pa /etc/netconfig
-.El
-.Sh SEE ALSO
-.Xr getnetconfig 3 ,
-.Xr getnetpath 3 ,
-.Xr rpcbind 3 ,
-.Xr rpc_clnt_auth 3 ,
-.Xr rpc_clnt_calls 3 ,
-.Xr rpc_clnt_create 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpc_svc_create 3 ,
-.Xr rpc_svc_err 3 ,
-.Xr rpc_svc_reg 3 ,
-.Xr rpc_xdr 3 ,
-.Xr xdr 3 ,
-.Xr netconfig 5
diff --git a/lib/libc_bsd/rpc/rpc.5 b/lib/libc_bsd/rpc/rpc.5
deleted file mode 100644
index 8e7dcf6..0000000
--- a/lib/libc_bsd/rpc/rpc.5
+++ /dev/null
@@ -1,59 +0,0 @@
-.\" $NetBSD: rpc.5,v 1.3 2000/06/15 20:05:54 fvdl Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc.5 140505 2005-01-20 09:17:07Z ru $
-.\" @(#)rpc.4 1.17 93/08/30 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.Dd December 10, 1991
-.Dt RPC 5
-.Os
-.Sh NAME
-.Nm rpc
-.Nd rpc program number data base
-.Sh SYNOPSIS
-.Pa /etc/rpc
-.Sh DESCRIPTION
-The
-.Nm
-file contains user readable names that
-can be used in place of RPC program numbers.
-For each RPC program a single line should be present
-with the following information:
-.Pp
-.Bl -enum -compact
-.It
-name of the RPC program
-.It
-RPC program number
-.It
-aliases
-.El
-.Pp
-Items are separated by any number of blanks and/or
-tab characters.
-A hash
-.Pq Dq Li #
-indicates the beginning of a comment; characters up to the end of
-the line are not interpreted by routines which search the file.
-.Sh FILES
-.Bl -tag -width /etc/nsswitch.conf -compact
-.It Pa /etc/nsswitch.conf
-.El
-.Sh EXAMPLES
-Below is an example of an RPC database:
-.Bd -literal
-#
-#	rpc
-#
-rpcbind		100000	portmap	sunrpc portmapper
-rusersd		100002	rusers
-nfs		100003	nfsprog
-mountd		100005	mount	showmount
-walld		100008	rwall	shutdown
-sprayd		100012	spray
-llockmgr	100020
-nlockmgr	100021
-status		100024
-bootparam	100026
-keyserv		100029	keyserver
-.Ed
-.Sh SEE ALSO
-.Xr getrpcent 3
diff --git a/lib/libc_bsd/rpc/rpc_callmsg.c b/lib/libc_bsd/rpc/rpc_callmsg.c
deleted file mode 100644
index 95ce8d6..0000000
--- a/lib/libc_bsd/rpc/rpc_callmsg.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/*	$NetBSD: rpc_callmsg.c,v 1.16 2000/07/14 08:40:42 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)rpc_callmsg.c 1.4 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)rpc_callmsg.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpc_callmsg.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * rpc_callmsg.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- */
-
-#include "namespace.h"
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-/*
- * XDR a call message
- */
-bool_t
-xdr_callmsg(xdrs, cmsg)
-	XDR *xdrs;
-	struct rpc_msg *cmsg;
-{
-	enum msg_type *prm_direction;
-	int32_t *buf;
-	struct opaque_auth *oa;
-
-	assert(xdrs != NULL);
-	assert(cmsg != NULL);
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		if (cmsg->rm_call.cb_cred.oa_length > MAX_AUTH_BYTES) {
-			return (FALSE);
-		}
-		if (cmsg->rm_call.cb_verf.oa_length > MAX_AUTH_BYTES) {
-			return (FALSE);
-		}
-		buf = XDR_INLINE(xdrs, 8 * BYTES_PER_XDR_UNIT
-			+ RNDUP(cmsg->rm_call.cb_cred.oa_length)
-			+ 2 * BYTES_PER_XDR_UNIT
-			+ RNDUP(cmsg->rm_call.cb_verf.oa_length));
-		if (buf != NULL) {
-			IXDR_PUT_INT32(buf, cmsg->rm_xid);
-			IXDR_PUT_ENUM(buf, cmsg->rm_direction);
-			if (cmsg->rm_direction != CALL) {
-				return (FALSE);
-			}
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_rpcvers);
-			if (cmsg->rm_call.cb_rpcvers != RPC_MSG_VERSION) {
-				return (FALSE);
-			}
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_prog);
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_vers);
-			IXDR_PUT_INT32(buf, cmsg->rm_call.cb_proc);
-			oa = &cmsg->rm_call.cb_cred;
-			IXDR_PUT_ENUM(buf, oa->oa_flavor);
-			IXDR_PUT_INT32(buf, oa->oa_length);
-			if (oa->oa_length) {
-				memmove(buf, oa->oa_base, oa->oa_length);
-				buf += RNDUP(oa->oa_length) / sizeof (int32_t);
-			}
-			oa = &cmsg->rm_call.cb_verf;
-			IXDR_PUT_ENUM(buf, oa->oa_flavor);
-			IXDR_PUT_INT32(buf, oa->oa_length);
-			if (oa->oa_length) {
-				memmove(buf, oa->oa_base, oa->oa_length);
-				/* no real need....
-				buf += RNDUP(oa->oa_length) / sizeof (int32_t);
-				*/
-			}
-			return (TRUE);
-		}
-	}
-	if (xdrs->x_op == XDR_DECODE) {
-		buf = XDR_INLINE(xdrs, 8 * BYTES_PER_XDR_UNIT);
-		if (buf != NULL) {
-			cmsg->rm_xid = IXDR_GET_U_INT32(buf);
-			cmsg->rm_direction = IXDR_GET_ENUM(buf, enum msg_type);
-			if (cmsg->rm_direction != CALL) {
-				return (FALSE);
-			}
-			cmsg->rm_call.cb_rpcvers = IXDR_GET_U_INT32(buf);
-			if (cmsg->rm_call.cb_rpcvers != RPC_MSG_VERSION) {
-				return (FALSE);
-			}
-			cmsg->rm_call.cb_prog = IXDR_GET_U_INT32(buf);
-			cmsg->rm_call.cb_vers = IXDR_GET_U_INT32(buf);
-			cmsg->rm_call.cb_proc = IXDR_GET_U_INT32(buf);
-			oa = &cmsg->rm_call.cb_cred;
-			oa->oa_flavor = IXDR_GET_ENUM(buf, enum_t);
-			oa->oa_length = (u_int)IXDR_GET_U_INT32(buf);
-			if (oa->oa_length) {
-				if (oa->oa_length > MAX_AUTH_BYTES) {
-					return (FALSE);
-				}
-				if (oa->oa_base == NULL) {
-					oa->oa_base = (caddr_t)
-					    mem_alloc(oa->oa_length);
-					if (oa->oa_base == NULL)
-						return (FALSE);
-				}
-				buf = XDR_INLINE(xdrs, RNDUP(oa->oa_length));
-				if (buf == NULL) {
-					if (xdr_opaque(xdrs, oa->oa_base,
-					    oa->oa_length) == FALSE) {
-						return (FALSE);
-					}
-				} else {
-					memmove(oa->oa_base, buf,
-					    oa->oa_length);
-					/* no real need....
-					buf += RNDUP(oa->oa_length) /
-						sizeof (int32_t);
-					*/
-				}
-			}
-			oa = &cmsg->rm_call.cb_verf;
-			buf = XDR_INLINE(xdrs, 2 * BYTES_PER_XDR_UNIT);
-			if (buf == NULL) {
-				if (xdr_enum(xdrs, &oa->oa_flavor) == FALSE ||
-				    xdr_u_int(xdrs, &oa->oa_length) == FALSE) {
-					return (FALSE);
-				}
-			} else {
-				oa->oa_flavor = IXDR_GET_ENUM(buf, enum_t);
-				oa->oa_length = (u_int)IXDR_GET_U_INT32(buf);
-			}
-			if (oa->oa_length) {
-				if (oa->oa_length > MAX_AUTH_BYTES) {
-					return (FALSE);
-				}
-				if (oa->oa_base == NULL) {
-					oa->oa_base = (caddr_t)
-					    mem_alloc(oa->oa_length);
-					if (oa->oa_base == NULL)
-						return (FALSE);
-				}
-				buf = XDR_INLINE(xdrs, RNDUP(oa->oa_length));
-				if (buf == NULL) {
-					if (xdr_opaque(xdrs, oa->oa_base,
-					    oa->oa_length) == FALSE) {
-						return (FALSE);
-					}
-				} else {
-					memmove(oa->oa_base, buf,
-					    oa->oa_length);
-					/* no real need...
-					buf += RNDUP(oa->oa_length) /
-						sizeof (int32_t);
-					*/
-				}
-			}
-			return (TRUE);
-		}
-	}
-	prm_direction = &cmsg->rm_direction;
-	if (
-	    xdr_uint32_t(xdrs, &(cmsg->rm_xid)) &&
-	    xdr_enum(xdrs, (enum_t *) prm_direction) &&
-	    (cmsg->rm_direction == CALL) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) &&
-	    (cmsg->rm_call.cb_rpcvers == RPC_MSG_VERSION) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_prog)) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_vers)) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_proc)) &&
-	    xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_cred)) )
-		return (xdr_opaque_auth(xdrs, &(cmsg->rm_call.cb_verf)));
-	return (FALSE);
-}
diff --git a/lib/libc_bsd/rpc/rpc_clnt_auth.3 b/lib/libc_bsd/rpc/rpc_clnt_auth.3
deleted file mode 100644
index c09584d..0000000
--- a/lib/libc_bsd/rpc/rpc_clnt_auth.3
+++ /dev/null
@@ -1,96 +0,0 @@
-.\" @(#)rpc_clnt_auth.3n 1.21 93/05/07 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_clnt_auth 1.4 89/07/20 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_clnt_auth.3,v 1.1 2000/06/03 09:29:50 fvdl Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_clnt_auth.3 141580 2005-02-09 18:07:17Z ru $
-.Dd May 7, 1993
-.Dt RPC_CLNT_AUTH 3
-.Os
-.Sh NAME
-.Nm auth_destroy ,
-.Nm authnone_create ,
-.Nm authsys_create ,
-.Nm authsys_create_default
-.Nd library routines for client side remote procedure call authentication
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft "void"
-.Fn auth_destroy "AUTH *auth"
-.Ft "AUTH *"
-.Fn authnone_create "void"
-.Ft "AUTH *"
-.Fn authsys_create "const char *host" "const uid_t uid" "const gid_t gid" "const int len" "const gid_t *aup_gids"
-.Ft "AUTH *"
-.Fn authsys_create_default "void"
-.Sh DESCRIPTION
-These routines are part of the
-RPC library that allows C language programs to make procedure
-calls on other machines across the network,
-with desired authentication.
-.Pp
-These routines are normally called after creating the
-.Vt CLIENT
-handle.
-The
-.Va cl_auth
-field of the
-.Vt CLIENT
-structure should be initialized by the
-.Vt AUTH
-structure returned by some of the following routines.
-The client's authentication information
-is passed to the server when the
-RPC
-call is made.
-.Pp
-Only the
-.Dv NULL
-and the
-.Dv SYS
-style of authentication is discussed here.
-.Sh Routines
-.Bl -tag -width authsys_create_default()
-.It Fn auth_destroy
-A function macro that destroys the authentication
-information associated with
-.Fa auth .
-Destruction usually involves deallocation
-of private data structures.
-The use of
-.Fa auth
-is undefined after calling
-.Fn auth_destroy .
-.It Fn authnone_create
-Create and return an RPC
-authentication handle that passes nonusable
-authentication information with each remote procedure call.
-This is the default authentication used by RPC.
-.It Fn authsys_create
-Create and return an RPC authentication handle that contains
-.Dv AUTH_SYS
-authentication information.
-The
-.Fa host
-argument
-is the name of the machine on which the information was
-created;
-.Fa uid
-is the user's user ID;
-.Fa gid
-is the user's current group ID;
-.Fa len
-and
-.Fa aup_gids
-refer to a counted array of groups to which the user belongs.
-.It Fn authsys_create_default
-Call
-.Fn authsys_create
-with the appropriate arguments.
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr rpc_clnt_calls 3 ,
-.Xr rpc_clnt_create 3
diff --git a/lib/libc_bsd/rpc/rpc_clnt_calls.3 b/lib/libc_bsd/rpc/rpc_clnt_calls.3
deleted file mode 100644
index df5b080..0000000
--- a/lib/libc_bsd/rpc/rpc_clnt_calls.3
+++ /dev/null
@@ -1,316 +0,0 @@
-.\" @(#)rpc_clnt_calls.3n 1.30 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_clnt_calls 1.4 89/07/20 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_clnt_calls.3 141580 2005-02-09 18:07:17Z ru $
-.Dd May 7, 1993
-.Dt RPC_CLNT_CALLS 3
-.Os
-.Sh NAME
-.Nm rpc_clnt_calls ,
-.Nm clnt_call ,
-.Nm clnt_freeres ,
-.Nm clnt_geterr ,
-.Nm clnt_perrno ,
-.Nm clnt_perror ,
-.Nm clnt_sperrno ,
-.Nm clnt_sperror ,
-.Nm rpc_broadcast ,
-.Nm rpc_broadcast_exp ,
-.Nm rpc_call
-.Nd library routines for client side calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft "enum clnt_stat"
-.Fn clnt_call "CLIENT *clnt" "const rpcproc_t procnum" "const xdrproc_t inproc" "const caddr_t in" "const xdrproc_t outproc" "caddr_t out" "const struct timeval tout"
-.Ft bool_t
-.Fn clnt_freeres "CLIENT *clnt" "const xdrproc_t outproc" "caddr_t out"
-.Ft void
-.Fn clnt_geterr "const CLIENT * clnt" "struct rpc_err * errp"
-.Ft void
-.Fn clnt_perrno "const enum clnt_stat stat"
-.Ft void
-.Fn clnt_perror "CLIENT *clnt" "const char *s"
-.Ft "char *"
-.Fn clnt_sperrno "const enum clnt_stat stat"
-.Ft "char *"
-.Fn clnt_sperror "CLIENT *clnt" "const char * s"
-.Ft "enum clnt_stat"
-.Fo rpc_broadcast
-.Fa "const rpcprog_t prognum" "const rpcvers_t versnum"
-.Fa "const rpcproc_t procnum" "const xdrproc_t inproc"
-.Fa "const caddr_t in" "const xdrproc_t outproc" "caddr_t out"
-.Fa "const resultproc_t eachresult" "const char *nettype"
-.Fc
-.Ft "enum clnt_stat"
-.Fo rpc_broadcast_exp
-.Fa "const rpcprog_t prognum" "const rpcvers_t versnum"
-.Fa "const rpcproc_t procnum" "const xdrproc_t xargs"
-.Fa "caddr_t argsp" "const xdrproc_t xresults"
-.Fa "caddr_t resultsp" "const resultproc_t eachresult"
-.Fa "const int inittime" "const int waittime"
-.Fa "const char * nettype"
-.Fc
-.Ft "enum clnt_stat"
-.Fo rpc_call
-.Fa "const char *host" "const rpcprog_t prognum"
-.Fa "const rpcvers_t versnum" "const rpcproc_t procnum"
-.Fa "const xdrproc_t inproc" "const char *in"
-.Fa "const xdrproc_t outproc" "char *out" "const char *nettype"
-.Fc
-.Sh DESCRIPTION
-RPC library routines allow C language programs to make procedure
-calls on other machines across the network.
-First, the client calls a procedure to send a request to the server.
-Upon receipt of the request, the server calls a dispatch routine
-to perform the requested service, and then sends back a reply.
-.Pp
-The
-.Fn clnt_call ,
-.Fn rpc_call ,
-and
-.Fn rpc_broadcast
-routines handle the client side of the procedure call.
-The remaining routines deal with error handling in the case of errors.
-.Pp
-Some of the routines take a
-.Vt CLIENT
-handle as one of the arguments.
-A
-.Vt CLIENT
-handle can be created by an RPC creation routine such as
-.Fn clnt_create
-(see
-.Xr rpc_clnt_create 3 ) .
-.Pp
-These routines are safe for use in multithreaded applications.
-.Vt CLIENT
-handles can be shared between threads, however in this implementation
-requests by different threads are serialized (that is, the first request will
-receive its results before the second request is sent).
-.Sh Routines
-See
-.Xr rpc 3
-for the definition of the
-.Vt CLIENT
-data structure.
-.Bl -tag -width XXXXX
-.It Fn clnt_call
-A function macro that calls the remote procedure
-.Fa procnum
-associated with the client handle,
-.Fa clnt ,
-which is obtained with an RPC
-client creation routine such as
-.Fn clnt_create
-(see
-.Xr rpc_clnt_create 3 ) .
-The
-.Fa inproc
-argument
-is the XDR function used to encode the procedure's arguments, and
-.Fa outproc
-is the XDR function used to decode the procedure's results;
-.Fa in
-is the address of the procedure's argument(s), and
-.Fa out
-is the address of where to place the result(s).
-The
-.Fa tout
-argument
-is the time allowed for results to be returned, which is overridden by
-a time-out set explicitly through
-.Fn clnt_control ,
-see
-.Xr rpc_clnt_create 3 .
-If the remote call succeeds, the status returned is
-.Dv RPC_SUCCESS ,
-otherwise an appropriate status is returned.
-.It Fn clnt_freeres
-A function macro that frees any data allocated by the
-RPC/XDR system when it decoded the results of an RPC call.
-The
-.Fa out
-argument
-is the address of the results, and
-.Fa outproc
-is the XDR routine describing the results.
-This routine returns 1 if the results were successfully freed,
-and 0 otherwise.
-.It Fn clnt_geterr
-A function macro that copies the error structure out of the client
-handle to the structure at address
-.Fa errp .
-.It Fn clnt_perrno
-Print a message to standard error corresponding
-to the condition indicated by
-.Fa stat .
-A newline is appended.
-Normally used after a procedure call fails for a routine
-for which a client handle is not needed, for instance
-.Fn rpc_call .
-.It Fn clnt_perror
-Print a message to the standard error indicating why an
-RPC call failed;
-.Fa clnt
-is the handle used to do the call.
-The message is prepended with string
-.Fa s
-and a colon.
-A newline is appended.
-Normally used after a remote procedure call fails
-for a routine which requires a client handle,
-for instance
-.Fn clnt_call .
-.It Fn clnt_sperrno
-Take the same arguments as
-.Fn clnt_perrno ,
-but instead of sending a message to the standard error
-indicating why an RPC
-call failed, return a pointer to a string which contains the message.
-The
-.Fn clnt_sperrno
-function
-is normally used instead of
-.Fn clnt_perrno
-when the program does not have a standard error (as a program
-running as a server quite likely does not), or if the programmer
-does not want the message to be output with
-.Fn printf
-(see
-.Xr printf 3 ) ,
-or if a message format different than that supported by
-.Fn clnt_perrno
-is to be used.
-Note:
-unlike
-.Fn clnt_sperror
-and
-.Fn clnt_spcreateerror
-(see
-.Xr rpc_clnt_create 3 ) ,
-.Fn clnt_sperrno
-does not return pointer to static data so the
-result will not get overwritten on each call.
-.It Fn clnt_sperror
-Like
-.Fn clnt_perror ,
-except that (like
-.Fn clnt_sperrno )
-it returns a string instead of printing to standard error.
-However,
-.Fn clnt_sperror
-does not append a newline at the end of the message.
-Warning:
-returns pointer to a buffer that is overwritten
-on each call.
-.It Fn rpc_broadcast
-Like
-.Fn rpc_call ,
-except the call message is broadcast to
-all the connectionless transports specified by
-.Fa nettype .
-If
-.Fa nettype
-is
-.Dv NULL ,
-it defaults to
-.Qq netpath .
-Each time it receives a response,
-this routine calls
-.Fn eachresult ,
-whose form is:
-.Ft bool_t
-.Fn eachresult "caddr_t out" "const struct netbuf * addr" "const struct netconfig * netconf"
-where
-.Fa out
-is the same as
-.Fa out
-passed to
-.Fn rpc_broadcast ,
-except that the remote procedure's output is decoded there;
-.Fa addr
-points to the address of the machine that sent the results, and
-.Fa netconf
-is the netconfig structure of the transport on which the remote
-server responded.
-If
-.Fn eachresult
-returns 0,
-.Fn rpc_broadcast
-waits for more replies;
-otherwise it returns with appropriate status.
-Warning:
-broadcast file descriptors are limited in size to the
-maximum transfer size of that transport.
-For Ethernet, this value is 1500 bytes.
-The
-.Fn rpc_broadcast
-function
-uses
-.Dv AUTH_SYS
-credentials by default (see
-.Xr rpc_clnt_auth 3 ) .
-.It Fn rpc_broadcast_exp
-Like
-.Fn rpc_broadcast ,
-except that the initial timeout,
-.Fa inittime
-and the maximum timeout,
-.Fa waittime
-are specified in milliseconds.
-The
-.Fa inittime
-argument
-is the initial time that
-.Fn rpc_broadcast_exp
-waits before resending the request.
-After the first resend, the re-transmission interval
-increases exponentially until it exceeds
-.Fa waittime .
-.It Fn rpc_call
-Call the remote procedure associated with
-.Fa prognum ,
-.Fa versnum ,
-and
-.Fa procnum
-on the machine,
-.Fa host .
-The
-.Fa inproc
-argument
-is used to encode the procedure's arguments, and
-.Fa outproc
-is used to decode the procedure's results;
-.Fa in
-is the address of the procedure's argument(s), and
-.Fa out
-is the address of where to place the result(s).
-The
-.Fa nettype
-argument
-can be any of the values listed on
-.Xr rpc 3 .
-This routine returns
-.Dv RPC_SUCCESS
-if it succeeds,
-or an appropriate status is returned.
-Use the
-.Fn clnt_perrno
-routine to translate failure status into error messages.
-Warning:
-.Fn rpc_call
-uses the first available transport belonging
-to the class
-.Fa nettype ,
-on which it can create a connection.
-You do not have control of timeouts or authentication
-using this routine.
-.El
-.Sh SEE ALSO
-.Xr printf 3 ,
-.Xr rpc 3 ,
-.Xr rpc_clnt_auth 3 ,
-.Xr rpc_clnt_create 3
diff --git a/lib/libc_bsd/rpc/rpc_clnt_create.3 b/lib/libc_bsd/rpc/rpc_clnt_create.3
deleted file mode 100644
index 7948813..0000000
--- a/lib/libc_bsd/rpc/rpc_clnt_create.3
+++ /dev/null
@@ -1,514 +0,0 @@
-.\" @(#)rpc_clnt_create.3n 1.36 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_clnt_create 1.5 89/07/24 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $NetBSD: rpc_clnt_create.3,v 1.2 2000/06/20 00:53:08 fvdl Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_clnt_create.3 231564 2012-02-12 18:29:56Z ed $
-.Dd May 7, 1993
-.Dt RPC_CLNT_CREATE 3
-.Os
-.Sh NAME
-.Nm rpc_clnt_create ,
-.Nm clnt_control ,
-.Nm clnt_create ,
-.Nm clnt_create_timed ,
-.Nm clnt_create_vers ,
-.Nm clnt_create_vers_timed ,
-.Nm clnt_destroy ,
-.Nm clnt_dg_create ,
-.Nm clnt_pcreateerror ,
-.Nm clnt_raw_create ,
-.Nm clnt_spcreateerror ,
-.Nm clnt_tli_create ,
-.Nm clnt_tp_create ,
-.Nm clnt_tp_create_timed ,
-.Nm clnt_vc_create ,
-.Nm rpc_createerr
-.Nd "library routines for dealing with creation and manipulation of"
-.Vt CLIENT
-handles
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft bool_t
-.Fn clnt_control "CLIENT *clnt" "const u_int req" "char *info"
-.Ft "CLIENT *"
-.Fn clnt_create "const char * host" "const rpcprog_t prognum" "const rpcvers_t versnum" "const char *nettype"
-.Ft "CLIENT *"
-.Fn clnt_create_timed "const char * host" "const rpcprog_t prognum" "const rpcvers_t versnum" "const char *nettype" "const struct timeval *timeout"
-.Ft "CLIENT *"
-.Fn clnt_create_vers "const char * host" "const rpcprog_t prognum" "rpcvers_t *vers_outp" "const rpcvers_t vers_low" "const rpcvers_t vers_high" "const char *nettype"
-.Ft "CLIENT *"
-.Fn clnt_create_vers_timed "const char * host" "const rpcprog_t prognum" "rpcvers_t *vers_outp" "const rpcvers_t vers_low" "const rpcvers_t vers_high" "const char *nettype" "const struct timeval *timeout"
-.Ft void
-.Fn clnt_destroy "CLIENT *clnt"
-.Ft "CLIENT *"
-.Fn clnt_dg_create "const int fildes" "const struct netbuf *svcaddr" "const rpcprog_t prognum" "const rpcvers_t versnum" "const u_int sendsz" "const u_int recvsz"
-.Ft void
-.Fn clnt_pcreateerror "const char *s"
-.Ft "char *"
-.Fn clnt_spcreateerror "const char *s"
-.Ft "CLIENT *"
-.Fn clnt_raw_create "const rpcprog_t prognum" "const rpcvers_t versnum"
-.Ft "CLIENT *"
-.Fn clnt_tli_create "const int fildes" "const struct netconfig *netconf" "struct netbuf *svcaddr" "const rpcprog_t prognum" "const rpcvers_t versnum" "const u_int sendsz" "const u_int recvsz"
-.Ft "CLIENT *"
-.Fn clnt_tp_create "const char * host" "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf"
-.Ft "CLIENT *"
-.Fn clnt_tp_create_timed "const char * host" "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf" "const struct timeval *timeout"
-.Ft "CLIENT *"
-.Fn clnt_vc_create "const int fildes" "const struct netbuf *svcaddr" "const rpcprog_t prognum" "const rpcvers_t versnum" "u_int sendsz" "u_int recvsz"
-.Sh DESCRIPTION
-RPC library routines allow C language programs to make procedure
-calls on other machines across the network.
-First a
-.Vt CLIENT
-handle is created and then the client calls a procedure to send a
-request to the server.
-On receipt of the request, the server calls a dispatch routine
-to perform the requested service, and then sends a reply.
-.Sh Routines
-.Bl -tag -width YYYYYYY
-.It Fn clnt_control
-A function macro to change or retrieve various information
-about a client object.
-The
-.Fa req
-argument
-indicates the type of operation, and
-.Fa info
-is a pointer to the information.
-For both connectionless and connection-oriented transports,
-the supported values of
-.Fa req
-and their argument types and what they do are:
-.Bl -column "CLSET_FD_NCLOSE" "struct timeval *" "set total timeout"
-.It Dv CLSET_TIMEOUT Ta "struct timeval *" Ta "set total timeout"
-.It Dv CLGET_TIMEOUT Ta "struct timeval *" Ta "get total timeout"
-.El
-.Pp
-Note:
-if you set the timeout using
-.Fn clnt_control ,
-the timeout argument passed by
-.Fn clnt_call
-is ignored in all subsequent calls.
-.Pp
-Note:
-If you set the timeout value to 0,
-.Fn clnt_control
-immediately returns an error
-.Pq Dv RPC_TIMEDOUT .
-Set the timeout argument to 0 for batching calls.
-.Bl -column CLSET_FD_NCLOSE "struct timeval *"
-.It Dv CLGET_SVC_ADDR Ta "struct netbuf *" Ta "get servers address"
-.It Dv CLGET_FD Ta "int *" Ta "get fd from handle"
-.It Dv CLSET_FD_CLOSE Ta "void" Ta "close fd on destroy"
-.It Dv CLSET_FD_NCLOSE Ta void Ta "do not close fd on destroy"
-.It Dv CLGET_VERS Ta "uint32_t *" Ta "get RPC program version"
-.It Dv CLSET_VERS Ta "uint32_t *" Ta "set RPC program version"
-.It Dv CLGET_XID Ta "uint32_t *" Ta "get XID of previous call"
-.It Dv CLSET_XID Ta "uint32_t *" Ta "set XID of next call"
-.El
-.Pp
-The following operations are valid for connectionless transports only:
-.Bl -column CLSET_RETRY_TIMEOUT "struct timeval *" "set total timeout"
-.It Dv CLSET_RETRY_TIMEOUT Ta "struct timeval *" Ta "set the retry timeout"
-.It Dv CLGET_RETRY_TIMEOUT Ta "struct timeval *" Ta "get the retry timeout"
-.It Dv CLSET_CONNECT Ta Vt "int *" Ta use Xr connect 2
-.El
-.Pp
-The retry timeout is the time that RPC
-waits for the server to reply before retransmitting the request.
-The
-.Fn clnt_control
-function
-returns
-.Dv TRUE
-on success and
-.Dv FALSE
-on failure.
-.It Fn clnt_create
-Generic client creation routine for program
-.Fa prognum
-and version
-.Fa versnum .
-The
-.Fa host
-argument
-identifies the name of the remote host where the server
-is located.
-The
-.Fa nettype
-argument
-indicates the class of transport protocol to use.
-The transports are tried in left to right order in
-.Ev NETPATH
-environment variable or in top to bottom order in
-the netconfig database.
-The
-.Fn clnt_create
-function
-tries all the transports of the
-.Fa nettype
-class available from the
-.Ev NETPATH
-environment variable and the netconfig database,
-and chooses the first successful one.
-A default timeout is set and can be modified using
-.Fn clnt_control .
-This routine returns
-.Dv NULL
-if it fails.
-The
-.Fn clnt_pcreateerror
-routine can be used to print the reason for failure.
-.Pp
-Note:
-.Fn clnt_create
-returns a valid client handle even
-if the particular version number supplied to
-.Fn clnt_create
-is not registered with the
-.Xr rpcbind 8
-service.
-This mismatch will be discovered by a
-.Fn clnt_call
-later (see
-.Xr rpc_clnt_calls 3 ) .
-.It Fn clnt_create_timed
-Generic client creation routine which is similar to
-.Fn clnt_create
-but which also has the additional argument
-.Fa timeout
-that specifies the maximum amount of time allowed for
-each transport class tried.
-In all other respects, the
-.Fn clnt_create_timed
-call behaves exactly like the
-.Fn clnt_create
-call.
-.It Fn clnt_create_vers
-Generic client creation routine which is similar to
-.Fn clnt_create
-but which also checks for the
-version availability.
-The
-.Fa host
-argument
-identifies the name of the remote host where the server
-is located.
-The
-.Fa nettype
-argument
-indicates the class transport protocols to be used.
-If the routine is successful it returns a client handle created for
-the highest version between
-.Fa vers_low
-and
-.Fa vers_high
-that is supported by the server.
-The
-.Fa vers_outp
-argument
-is set to this value.
-That is, after a successful return
-.Fa vers_low
-<=
-.Fa *vers_outp
-<=
-.Fa vers_high .
-If no version between
-.Fa vers_low
-and
-.Fa vers_high
-is supported by the server then the routine fails and returns
-.Dv NULL .
-A default timeout is set and can be modified using
-.Fn clnt_control .
-This routine returns
-.Dv NULL
-if it fails.
-The
-.Fn clnt_pcreateerror
-routine can be used to print the reason for failure.
-Note:
-.Fn clnt_create
-returns a valid client handle even
-if the particular version number supplied to
-.Fn clnt_create
-is not registered with the
-.Xr rpcbind 8
-service.
-This mismatch will be discovered by a
-.Fn clnt_call
-later (see
-.Xr rpc_clnt_calls 3 ) .
-However,
-.Fn clnt_create_vers
-does this for you and returns a valid handle
-only if a version within
-the range supplied is supported by the server.
-.It Fn clnt_create_vers_timed
-Generic client creation routine which is similar to
-.Fn clnt_create_vers
-but which also has the additional argument
-.Fa timeout
-that specifies the maximum amount of time allowed for
-each transport class tried.
-In all other respects, the
-.Fn clnt_create_vers_timed
-call behaves exactly like the
-.Fn clnt_create_vers
-call.
-.It Fn clnt_destroy
-A function macro that destroys the client's RPC handle.
-Destruction usually involves deallocation
-of private data structures, including
-.Fa clnt
-itself.
-Use of
-.Fa clnt
-is undefined after calling
-.Fn clnt_destroy .
-If the RPC library opened the associated file descriptor, or
-.Dv CLSET_FD_CLOSE
-was set using
-.Fn clnt_control ,
-the file descriptor will be closed.
-The caller should call
-.Fn auth_destroy "clnt->cl_auth"
-(before calling
-.Fn clnt_destroy )
-to destroy the associated
-.Vt AUTH
-structure (see
-.Xr rpc_clnt_auth 3 ) .
-.It Fn clnt_dg_create
-This routine creates an RPC client for the remote program
-.Fa prognum
-and version
-.Fa versnum ;
-the client uses a connectionless transport.
-The remote program is located at address
-.Fa svcaddr .
-The
-.Fa fildes
-argument
-is an open and bound file descriptor.
-This routine will resend the call message in intervals of
-15 seconds until a response is received or until the
-call times out.
-The total time for the call to time out is specified by
-.Fn clnt_call
-(see
-.Fn clnt_call
-in
-.Xr rpc_clnt_calls 3 ) .
-The retry time out and the total time out periods can
-be changed using
-.Fn clnt_control .
-The user may set the size of the send and receive
-buffers with the
-.Fa sendsz
-and
-.Fa recvsz
-arguments;
-values of 0 choose suitable defaults.
-This routine returns
-.Dv NULL
-if it fails.
-.It Fn clnt_pcreateerror
-Print a message to standard error indicating
-why a client RPC handle could not be created.
-The message is prepended with the string
-.Fa s
-and a colon, and appended with a newline.
-.It Fn clnt_spcreateerror
-Like
-.Fn clnt_pcreateerror ,
-except that it returns a string
-instead of printing to the standard error.
-A newline is not appended to the message in this case.
-Warning:
-returns a pointer to a buffer that is overwritten
-on each call.
-.It Fn clnt_raw_create
-This routine creates an RPC
-client handle for the remote program
-.Fa prognum
-and version
-.Fa versnum .
-The transport used to pass messages to the service is
-a buffer within the process's address space,
-so the corresponding RPC
-server should live in the same address space;
-(see
-.Fn svc_raw_create
-in
-.Xr rpc_svc_create 3 ) .
-This allows simulation of RPC and measurement of
-RPC overheads, such as round trip times,
-without any kernel or networking interference.
-This routine returns
-.Dv NULL
-if it fails.
-The
-.Fn clnt_raw_create
-function
-should be called after
-.Fn svc_raw_create .
-.It Fn clnt_tli_create
-This routine creates an RPC
-client handle for the remote program
-.Fa prognum
-and version
-.Fa versnum .
-The remote program is located at address
-.Fa svcaddr .
-If
-.Fa svcaddr
-is
-.Dv NULL
-and it is connection-oriented, it is assumed that the file descriptor
-is connected.
-For connectionless transports, if
-.Fa svcaddr
-is
-.Dv NULL ,
-.Dv RPC_UNKNOWNADDR
-error is set.
-The
-.Fa fildes
-argument
-is a file descriptor which may be open, bound and connected.
-If it is
-.Dv RPC_ANYFD ,
-it opens a file descriptor on the transport specified by
-.Fa netconf .
-If
-.Fa fildes
-is
-.Dv RPC_ANYFD
-and
-.Fa netconf
-is
-.Dv NULL ,
-a
-.Dv RPC_UNKNOWNPROTO
-error is set.
-If
-.Fa fildes
-is unbound, then it will attempt to bind the descriptor.
-The user may specify the size of the buffers with the
-.Fa sendsz
-and
-.Fa recvsz
-arguments;
-values of 0 choose suitable defaults.
-Depending upon the type of the transport (connection-oriented
-or connectionless),
-.Fn clnt_tli_create
-calls appropriate client creation routines.
-This routine returns
-.Dv NULL
-if it fails.
-The
-.Fn clnt_pcreateerror
-routine can be used to print the reason for failure.
-The remote rpcbind
-service (see
-.Xr rpcbind 8 )
-is not consulted for the address of the remote
-service.
-.It Fn clnt_tp_create
-Like
-.Fn clnt_create
-except
-.Fn clnt_tp_create
-tries only one transport specified through
-.Fa netconf .
-The
-.Fn clnt_tp_create
-function
-creates a client handle for the program
-.Fa prognum ,
-the version
-.Fa versnum ,
-and for the transport specified by
-.Fa netconf .
-Default options are set,
-which can be changed using
-.Fn clnt_control
-calls.
-The remote rpcbind service on the host
-.Fa host
-is consulted for the address of the remote service.
-This routine returns
-.Dv NULL
-if it fails.
-The
-.Fn clnt_pcreateerror
-routine can be used to print the reason for failure.
-.It Fn clnt_tp_create_timed
-Like
-.Fn clnt_tp_create
-except
-.Fn clnt_tp_create_timed
-has the extra argument
-.Fa timeout
-which specifies the maximum time allowed for
-the creation attempt to succeed.
-In all other respects, the
-.Fn clnt_tp_create_timed
-call behaves exactly like the
-.Fn clnt_tp_create
-call.
-.It Fn clnt_vc_create
-This routine creates an RPC
-client for the remote program
-.Fa prognum
-and version
-.Fa versnum ;
-the client uses a connection-oriented transport.
-The remote program is located at address
-.Fa svcaddr .
-The
-.Fa fildes
-argument
-is an open and bound file descriptor.
-The user may specify the size of the send and receive buffers
-with the
-.Fa sendsz
-and
-.Fa recvsz
-arguments;
-values of 0 choose suitable defaults.
-This routine returns
-.Dv NULL
-if it fails.
-The address
-.Fa svcaddr
-should not be
-.Dv NULL
-and should point to the actual address of the remote program.
-The
-.Fn clnt_vc_create
-function
-does not consult the remote rpcbind service for this information.
-.It Xo
-.Vt "struct rpc_createerr" Va rpc_createerr ;
-.Xc
-A global variable whose value is set by any RPC
-client handle creation routine
-that fails.
-It is used by the routine
-.Fn clnt_pcreateerror
-to print the reason for the failure.
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr rpc_clnt_auth 3 ,
-.Xr rpc_clnt_calls 3 ,
-.Xr rpcbind 8
diff --git a/lib/libc_bsd/rpc/rpc_com.h b/lib/libc_bsd/rpc/rpc_com.h
deleted file mode 100644
index ca6e305..0000000
--- a/lib/libc_bsd/rpc/rpc_com.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*	$NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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: releng/10.2/lib/libc/rpc/rpc_com.h 261046 2014-01-22 23:45:27Z mav $
- */
-/*
- * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
- */
-
-/*
- * rpc_com.h, Common definitions for both the server and client side.
- * All for the topmost layer of rpc
- *
- * In Sun's tirpc distribution, this was installed as <rpc/rpc_com.h>,
- * but as it contains only non-exported interfaces, it was moved here.
- */
-
-#ifndef _RPC_RPCCOM_H
-#define	_RPC_RPCCOM_H
-
-#include <sys/cdefs.h>
-
-/* #pragma ident	"@(#)rpc_com.h	1.11	93/07/05 SMI" */
-
-/*
- * The max size of the transport, if the size cannot be determined
- * by other means.
- */
-#define	RPC_MAXDATASIZE 9000
-#define	RPC_MAXADDRSIZE 1024
-
-#define __RPC_GETXID(now) ((uint32_t)getpid() ^ (uint32_t)(now)->tv_sec ^ \
-    (uint32_t)(now)->tv_usec)
-
-__BEGIN_DECLS
-extern u_int __rpc_get_a_size(int);
-extern int __rpc_dtbsize(void);
-extern struct netconfig * __rpcgettp(int);
-extern  int  __rpc_get_default_domain(char **);
-
-char *__rpc_taddr2uaddr_af(int, const struct netbuf *);
-struct netbuf *__rpc_uaddr2taddr_af(int, const char *);
-int __rpc_fixup_addr(struct netbuf *, const struct netbuf *);
-int __rpc_sockinfo2netid(struct __rpc_sockinfo *, const char **);
-int __rpc_seman2socktype(int);
-int __rpc_socktype2seman(int);
-void *rpc_nullproc(CLIENT *);
-int __rpc_sockisbound(int);
-
-struct netbuf *__rpcb_findaddr_timed(rpcprog_t, rpcvers_t,
-    const struct netconfig *, const char *host, CLIENT **clpp,
-    struct timeval *tp);
-
-bool_t __rpc_control(int,void *);
-
-char *_get_next_token(char *, int);
-
-bool_t __svc_clean_idle(fd_set *, int, bool_t);
-bool_t __xdrrec_setnonblock(XDR *, int);
-bool_t __xdrrec_getrec(XDR *, enum xprt_stat *, bool_t);
-void __xprt_unregister_unlocked(SVCXPRT *);
-
-SVCXPRT **__svc_xports;
-int __svc_maxrec;
-
-__END_DECLS
-
-#endif /* _RPC_RPCCOM_H */
diff --git a/lib/libc_bsd/rpc/rpc_commondata.c b/lib/libc_bsd/rpc/rpc_commondata.c
deleted file mode 100644
index ceff62d..0000000
--- a/lib/libc_bsd/rpc/rpc_commondata.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*	$NetBSD: rpc_commondata.c,v 1.7 2000/06/02 23:11:13 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid = "@(#)rpc_commondata.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpc_commondata.c 261046 2014-01-22 23:45:27Z mav $");
-
-#include "namespace.h"
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-/*
- * This file should only contain common data (global data) that is exported
- * by public interfaces 
- */
-struct opaque_auth _null_auth;
-fd_set svc_fdset;
-int svc_maxfd = -1;
diff --git a/lib/libc_bsd/rpc/rpc_dtablesize.c b/lib/libc_bsd/rpc/rpc_dtablesize.c
deleted file mode 100644
index 8f3df9c..0000000
--- a/lib/libc_bsd/rpc/rpc_dtablesize.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*	$NetBSD: rpc_dtablesize.c,v 1.14 1998/11/15 17:32:43 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)rpc_dtablesize.c 1.2 87/08/11 Copyr 1987 Sun Micro";
-static char *sccsid = "@(#)rpc_dtablesize.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpc_dtablesize.c 261046 2014-01-22 23:45:27Z mav $");
-
-#include "namespace.h"
-#include <unistd.h>
-#include "un-namespace.h"
-
-int _rpc_dtablesize(void);	/* XXX */
-
-/*
- * Cache the result of getdtablesize(), so we don't have to do an
- * expensive system call every time.
- */
-/*
- * XXX In FreeBSD 2.x, you can have the maximum number of open file
- * descriptors be greater than FD_SETSIZE (which us 256 by default).
- *
- * Since old programs tend to use this call to determine the first arg
- * for _select(), having this return > FD_SETSIZE is a Bad Idea(TM)!
- */
-int
-_rpc_dtablesize(void)
-{
-	static int size;
-
-	if (size == 0) {
-		size = getdtablesize();
-		if (size > FD_SETSIZE)
-			size = FD_SETSIZE;
-	}
-	return (size);
-}
diff --git a/lib/libc_bsd/rpc/rpc_generic.c b/lib/libc_bsd/rpc/rpc_generic.c
deleted file mode 100644
index bfe8021..0000000
--- a/lib/libc_bsd/rpc/rpc_generic.c
+++ /dev/null
@@ -1,846 +0,0 @@
-/*	$NetBSD: rpc_generic.c,v 1.4 2000/09/28 09:07:04 kleink Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #pragma ident	"@(#)rpc_generic.c	1.17	94/04/24 SMI" */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpc_generic.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * rpc_generic.c, Miscl routines for RPC.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/un.h>
-#include <sys/resource.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <rpc/rpc.h>
-#include <ctype.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <netdb.h>
-#include <netconfig.h>
-#include <stdlib.h>
-#include <string.h>
-#include <syslog.h>
-#include <rpc/nettype.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-struct handle {
-	NCONF_HANDLE *nhandle;
-	int nflag;		/* Whether NETPATH or NETCONFIG */
-	int nettype;
-};
-
-static const struct _rpcnettype {
-	const char *name;
-	const int type;
-} _rpctypelist[] = {
-	{ "netpath", _RPC_NETPATH },
-	{ "visible", _RPC_VISIBLE },
-	{ "circuit_v", _RPC_CIRCUIT_V },
-	{ "datagram_v", _RPC_DATAGRAM_V },
-	{ "circuit_n", _RPC_CIRCUIT_N },
-	{ "datagram_n", _RPC_DATAGRAM_N },
-	{ "tcp", _RPC_TCP },
-	{ "udp", _RPC_UDP },
-	{ 0, _RPC_NONE }
-};
-
-struct netid_af {
-	const char	*netid;
-	int		af;
-	int		protocol;
-};
-
-static const struct netid_af na_cvt[] = {
-	{ "udp",  AF_INET,  IPPROTO_UDP },
-	{ "tcp",  AF_INET,  IPPROTO_TCP },
-#ifdef INET6
-	{ "udp6", AF_INET6, IPPROTO_UDP },
-	{ "tcp6", AF_INET6, IPPROTO_TCP },
-#endif
-	{ "local", AF_LOCAL, 0 }
-};
-
-#if 0
-static char *strlocase(char *);
-#endif
-static int getnettype(const char *);
-
-/*
- * Cache the result of getrlimit(), so we don't have to do an
- * expensive call every time.
- */
-int
-__rpc_dtbsize()
-{
-	static int tbsize;
-	struct rlimit rl;
-
-	if (tbsize) {
-		return (tbsize);
-	}
-	if (getrlimit(RLIMIT_NOFILE, &rl) == 0) {
-		return (tbsize = (int)rl.rlim_max);
-	}
-	/*
-	 * Something wrong.  I'll try to save face by returning a
-	 * pessimistic number.
-	 */
-	return (32);
-}
-
-
-/*
- * Find the appropriate buffer size
- */
-u_int
-/*ARGSUSED*/
-__rpc_get_t_size(af, proto, size)
-	int af, proto;
-	int size;	/* Size requested */
-{
-	int maxsize, defsize;
-
-	maxsize = 256 * 1024;	/* XXX */
-	switch (proto) {
-	case IPPROTO_TCP:
-		defsize = 64 * 1024;	/* XXX */
-		break;
-	case IPPROTO_UDP:
-		defsize = UDPMSGSIZE;
-		break;
-	default:
-		defsize = RPC_MAXDATASIZE;
-		break;
-	}
-	if (size == 0)
-		return defsize;
-
-	/* Check whether the value is within the upper max limit */
-	return (size > maxsize ? (u_int)maxsize : (u_int)size);
-}
-
-/*
- * Find the appropriate address buffer size
- */
-u_int
-__rpc_get_a_size(af)
-	int af;
-{
-	switch (af) {
-	case AF_INET:
-		return sizeof (struct sockaddr_in);
-#ifdef INET6
-	case AF_INET6:
-		return sizeof (struct sockaddr_in6);
-#endif
-	case AF_LOCAL:
-		return sizeof (struct sockaddr_un);
-	default:
-		break;
-	}
-	return ((u_int)RPC_MAXADDRSIZE);
-}
-
-#if 0
-static char *
-strlocase(p)
-	char *p;
-{
-	char *t = p;
-
-	for (; *p; p++)
-		if (isupper(*p))
-			*p = tolower(*p);
-	return (t);
-}
-#endif
-
-/*
- * Returns the type of the network as defined in <rpc/nettype.h>
- * If nettype is NULL, it defaults to NETPATH.
- */
-static int
-getnettype(nettype)
-	const char *nettype;
-{
-	int i;
-
-	if ((nettype == NULL) || (nettype[0] == 0)) {
-		return (_RPC_NETPATH);	/* Default */
-	}
-
-#if 0
-	nettype = strlocase(nettype);
-#endif
-	for (i = 0; _rpctypelist[i].name; i++)
-		if (strcasecmp(nettype, _rpctypelist[i].name) == 0) {
-			return (_rpctypelist[i].type);
-		}
-	return (_rpctypelist[i].type);
-}
-
-static thread_key_t tcp_key, udp_key;
-static once_t keys_once = ONCE_INITIALIZER;
-static int tcp_key_error, udp_key_error;
-
-static void
-keys_init(void)
-{
-
-	tcp_key_error = thr_keycreate(&tcp_key, free);
-	udp_key_error = thr_keycreate(&udp_key, free);
-}
-
-/*
- * For the given nettype (tcp or udp only), return the first structure found.
- * This should be freed by calling freenetconfigent()
- */
-struct netconfig *
-__rpc_getconfip(nettype)
-	const char *nettype;
-{
-	char *netid;
-	char *netid_tcp = (char *) NULL;
-	char *netid_udp = (char *) NULL;
-	static char *netid_tcp_main;
-	static char *netid_udp_main;
-	struct netconfig *dummy;
-	int main_thread;
-
-	if ((main_thread = thr_main())) {
-		netid_udp = netid_udp_main;
-		netid_tcp = netid_tcp_main;
-	} else {
-		if (thr_once(&keys_once, keys_init) != 0 ||
-		    tcp_key_error != 0 || udp_key_error != 0)
-			return (NULL);
-		netid_tcp = (char *)thr_getspecific(tcp_key);
-		netid_udp = (char *)thr_getspecific(udp_key);
-	}
-	if (!netid_udp && !netid_tcp) {
-		struct netconfig *nconf;
-		void *confighandle;
-
-		if (!(confighandle = setnetconfig())) {
-			syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-			return (NULL);
-		}
-		while ((nconf = getnetconfig(confighandle)) != NULL) {
-			if (strcmp(nconf->nc_protofmly, NC_INET) == 0) {
-				if (strcmp(nconf->nc_proto, NC_TCP) == 0 &&
-				    netid_tcp == NULL) {
-					netid_tcp = strdup(nconf->nc_netid);
-					if (main_thread)
-						netid_tcp_main = netid_tcp;
-					else
-						thr_setspecific(tcp_key,
-							(void *) netid_tcp);
-				} else
-				if (strcmp(nconf->nc_proto, NC_UDP) == 0 &&
-				    netid_udp == NULL) {
-					netid_udp = strdup(nconf->nc_netid);
-					if (main_thread)
-						netid_udp_main = netid_udp;
-					else
-						thr_setspecific(udp_key,
-						(void *) netid_udp);
-				}
-			}
-		}
-		endnetconfig(confighandle);
-	}
-	if (strcmp(nettype, "udp") == 0)
-		netid = netid_udp;
-	else if (strcmp(nettype, "tcp") == 0)
-		netid = netid_tcp;
-	else {
-		return (NULL);
-	}
-	if ((netid == NULL) || (netid[0] == 0)) {
-		return (NULL);
-	}
-	dummy = getnetconfigent(netid);
-	return (dummy);
-}
-
-/*
- * Returns the type of the nettype, which should then be used with
- * __rpc_getconf().
- */
-void *
-__rpc_setconf(nettype)
-	const char *nettype;
-{
-	struct handle *handle;
-
-	handle = (struct handle *) malloc(sizeof (struct handle));
-	if (handle == NULL) {
-		return (NULL);
-	}
-	switch (handle->nettype = getnettype(nettype)) {
-	case _RPC_NETPATH:
-	case _RPC_CIRCUIT_N:
-	case _RPC_DATAGRAM_N:
-		if (!(handle->nhandle = setnetpath()))
-			goto failed;
-		handle->nflag = TRUE;
-		break;
-	case _RPC_VISIBLE:
-	case _RPC_CIRCUIT_V:
-	case _RPC_DATAGRAM_V:
-	case _RPC_TCP:
-	case _RPC_UDP:
-		if (!(handle->nhandle = setnetconfig())) {
-		        syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-			goto failed;
-		}
-		handle->nflag = FALSE;
-		break;
-	default:
-		goto failed;
-	}
-
-	return (handle);
-
-failed:
-	free(handle);
-	return (NULL);
-}
-
-/*
- * Returns the next netconfig struct for the given "net" type.
- * __rpc_setconf() should have been called previously.
- */
-struct netconfig *
-__rpc_getconf(vhandle)
-	void *vhandle;
-{
-	struct handle *handle;
-	struct netconfig *nconf;
-
-	handle = (struct handle *)vhandle;
-	if (handle == NULL) {
-		return (NULL);
-	}
-	for (;;) {
-		if (handle->nflag)
-			nconf = getnetpath(handle->nhandle);
-		else
-			nconf = getnetconfig(handle->nhandle);
-		if (nconf == NULL)
-			break;
-		if ((nconf->nc_semantics != NC_TPI_CLTS) &&
-			(nconf->nc_semantics != NC_TPI_COTS) &&
-			(nconf->nc_semantics != NC_TPI_COTS_ORD))
-			continue;
-		switch (handle->nettype) {
-		case _RPC_VISIBLE:
-			if (!(nconf->nc_flag & NC_VISIBLE))
-				continue;
-			/* FALLTHROUGH */
-		case _RPC_NETPATH:	/* Be happy */
-			break;
-		case _RPC_CIRCUIT_V:
-			if (!(nconf->nc_flag & NC_VISIBLE))
-				continue;
-			/* FALLTHROUGH */
-		case _RPC_CIRCUIT_N:
-			if ((nconf->nc_semantics != NC_TPI_COTS) &&
-				(nconf->nc_semantics != NC_TPI_COTS_ORD))
-				continue;
-			break;
-		case _RPC_DATAGRAM_V:
-			if (!(nconf->nc_flag & NC_VISIBLE))
-				continue;
-			/* FALLTHROUGH */
-		case _RPC_DATAGRAM_N:
-			if (nconf->nc_semantics != NC_TPI_CLTS)
-				continue;
-			break;
-		case _RPC_TCP:
-			if (((nconf->nc_semantics != NC_TPI_COTS) &&
-				(nconf->nc_semantics != NC_TPI_COTS_ORD)) ||
-				(strcmp(nconf->nc_protofmly, NC_INET)
-#ifdef INET6
-				 && strcmp(nconf->nc_protofmly, NC_INET6))
-#else
-				)
-#endif
-				||
-				strcmp(nconf->nc_proto, NC_TCP))
-				continue;
-			break;
-		case _RPC_UDP:
-			if ((nconf->nc_semantics != NC_TPI_CLTS) ||
-				(strcmp(nconf->nc_protofmly, NC_INET)
-#ifdef INET6
-				&& strcmp(nconf->nc_protofmly, NC_INET6))
-#else
-				)
-#endif
-				||
-				strcmp(nconf->nc_proto, NC_UDP))
-				continue;
-			break;
-		}
-		break;
-	}
-	return (nconf);
-}
-
-void
-__rpc_endconf(vhandle)
-	void * vhandle;
-{
-	struct handle *handle;
-
-	handle = (struct handle *) vhandle;
-	if (handle == NULL) {
-		return;
-	}
-	if (handle->nflag) {
-		endnetpath(handle->nhandle);
-	} else {
-		endnetconfig(handle->nhandle);
-	}
-	free(handle);
-}
-
-/*
- * Used to ping the NULL procedure for clnt handle.
- * Returns NULL if fails, else a non-NULL pointer.
- */
-void *
-rpc_nullproc(clnt)
-	CLIENT *clnt;
-{
-	struct timeval TIMEOUT = {25, 0};
-
-	if (clnt_call(clnt, NULLPROC, (xdrproc_t) xdr_void, NULL,
-		(xdrproc_t) xdr_void, NULL, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return ((void *) clnt);
-}
-
-/*
- * Try all possible transports until
- * one succeeds in finding the netconf for the given fd.
- */
-struct netconfig *
-__rpcgettp(fd)
-	int fd;
-{
-	const char *netid;
-	struct __rpc_sockinfo si;
-
-	if (!__rpc_fd2sockinfo(fd, &si))
-		return NULL;
-
-	if (!__rpc_sockinfo2netid(&si, &netid))
-		return NULL;
-
-	/*LINTED const castaway*/
-	return getnetconfigent((char *)netid);
-}
-
-int
-__rpc_fd2sockinfo(int fd, struct __rpc_sockinfo *sip)
-{
-	socklen_t len;
-	int type, proto;
-	struct sockaddr_storage ss;
-
-	len = sizeof ss;
-	if (_getsockname(fd, (struct sockaddr *)(void *)&ss, &len) < 0)
-		return 0;
-	sip->si_alen = len;
-
-	len = sizeof type;
-	if (_getsockopt(fd, SOL_SOCKET, SO_TYPE, &type, &len) < 0)
-		return 0;
-
-	/* XXX */
-	if (ss.ss_family != AF_LOCAL) {
-		if (type == SOCK_STREAM)
-			proto = IPPROTO_TCP;
-		else if (type == SOCK_DGRAM)
-			proto = IPPROTO_UDP;
-		else
-			return 0;
-	} else
-		proto = 0;
-
-	sip->si_af = ss.ss_family;
-	sip->si_proto = proto;
-	sip->si_socktype = type;
-
-	return 1;
-}
-
-/*
- * Linear search, but the number of entries is small.
- */
-int
-__rpc_nconf2sockinfo(const struct netconfig *nconf, struct __rpc_sockinfo *sip)
-{
-	int i;
-
-	for (i = 0; i < (sizeof na_cvt) / (sizeof (struct netid_af)); i++)
-		if (strcmp(na_cvt[i].netid, nconf->nc_netid) == 0 || (
-		    strcmp(nconf->nc_netid, "unix") == 0 &&
-		    strcmp(na_cvt[i].netid, "local") == 0)) {
-			sip->si_af = na_cvt[i].af;
-			sip->si_proto = na_cvt[i].protocol;
-			sip->si_socktype =
-			    __rpc_seman2socktype((int)nconf->nc_semantics);
-			if (sip->si_socktype == -1)
-				return 0;
-			sip->si_alen = __rpc_get_a_size(sip->si_af);
-			return 1;
-		}
-
-	return 0;
-}
-
-int
-__rpc_nconf2fd(const struct netconfig *nconf)
-{
-	struct __rpc_sockinfo si;
-
-	if (!__rpc_nconf2sockinfo(nconf, &si))
-		return 0;
-
-	return _socket(si.si_af, si.si_socktype, si.si_proto);
-}
-
-int
-__rpc_sockinfo2netid(struct __rpc_sockinfo *sip, const char **netid)
-{
-	int i;
-	struct netconfig *nconf;
-
-	nconf = getnetconfigent("local");
-
-	for (i = 0; i < (sizeof na_cvt) / (sizeof (struct netid_af)); i++) {
-		if (na_cvt[i].af == sip->si_af &&
-		    na_cvt[i].protocol == sip->si_proto) {
-			if (strcmp(na_cvt[i].netid, "local") == 0 && nconf == NULL) {
-				if (netid)
-					*netid = "unix";
-			} else {
-				if (netid)
-					*netid = na_cvt[i].netid;
-			}
-			if (nconf != NULL)
-				freenetconfigent(nconf);
-			return 1;
-		}
-	}
-	if (nconf != NULL)
-		freenetconfigent(nconf);
-
-	return 0;
-}
-
-char *
-taddr2uaddr(const struct netconfig *nconf, const struct netbuf *nbuf)
-{
-	struct __rpc_sockinfo si;
-
-	if (!__rpc_nconf2sockinfo(nconf, &si))
-		return NULL;
-	return __rpc_taddr2uaddr_af(si.si_af, nbuf);
-}
-
-struct netbuf *
-uaddr2taddr(const struct netconfig *nconf, const char *uaddr)
-{
-	struct __rpc_sockinfo si;
-	
-	if (!__rpc_nconf2sockinfo(nconf, &si))
-		return NULL;
-	return __rpc_uaddr2taddr_af(si.si_af, uaddr);
-}
-
-char *
-__rpc_taddr2uaddr_af(int af, const struct netbuf *nbuf)
-{
-	char *ret;
-	struct sockaddr_in *sin;
-	struct sockaddr_un *sun;
-	char namebuf[INET_ADDRSTRLEN];
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-	char namebuf6[INET6_ADDRSTRLEN];
-#endif
-	u_int16_t port;
-
-	switch (af) {
-	case AF_INET:
-		sin = nbuf->buf;
-		if (inet_ntop(af, &sin->sin_addr, namebuf, sizeof namebuf)
-		    == NULL)
-			return NULL;
-		port = ntohs(sin->sin_port);
-		if (asprintf(&ret, "%s.%u.%u", namebuf, ((uint32_t)port) >> 8,
-		    port & 0xff) < 0)
-			return NULL;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		sin6 = nbuf->buf;
-		if (inet_ntop(af, &sin6->sin6_addr, namebuf6, sizeof namebuf6)
-		    == NULL)
-			return NULL;
-		port = ntohs(sin6->sin6_port);
-		if (asprintf(&ret, "%s.%u.%u", namebuf6, ((uint32_t)port) >> 8,
-		    port & 0xff) < 0)
-			return NULL;
-		break;
-#endif
-	case AF_LOCAL:
-		sun = nbuf->buf;
-		if (asprintf(&ret, "%.*s", (int)(sun->sun_len -
-		    offsetof(struct sockaddr_un, sun_path)),
-		    sun->sun_path) < 0)
-			return (NULL);
-		break;
-	default:
-		return NULL;
-	}
-
-	return ret;
-}
-
-struct netbuf *
-__rpc_uaddr2taddr_af(int af, const char *uaddr)
-{
-	struct netbuf *ret = NULL;
-	char *addrstr, *p;
-	unsigned port, portlo, porthi;
-	struct sockaddr_in *sin;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-	struct sockaddr_un *sun;
-
-	port = 0;
-	sin = NULL;
-	addrstr = strdup(uaddr);
-	if (addrstr == NULL)
-		return NULL;
-
-	/*
-	 * AF_LOCAL addresses are expected to be absolute
-	 * pathnames, anything else will be AF_INET or AF_INET6.
-	 */
-	if (*addrstr != '/') {
-		p = strrchr(addrstr, '.');
-		if (p == NULL)
-			goto out;
-		portlo = (unsigned)atoi(p + 1);
-		*p = '\0';
-
-		p = strrchr(addrstr, '.');
-		if (p == NULL)
-			goto out;
-		porthi = (unsigned)atoi(p + 1);
-		*p = '\0';
-		port = (porthi << 8) | portlo;
-	}
-
-	ret = (struct netbuf *)malloc(sizeof *ret);
-	if (ret == NULL)
-		goto out;
-	
-	switch (af) {
-	case AF_INET:
-		sin = (struct sockaddr_in *)malloc(sizeof *sin);
-		if (sin == NULL)
-			goto out;
-		memset(sin, 0, sizeof *sin);
-		sin->sin_family = AF_INET;
-		sin->sin_port = htons(port);
-		if (inet_pton(AF_INET, addrstr, &sin->sin_addr) <= 0) {
-			free(sin);
-			free(ret);
-			ret = NULL;
-			goto out;
-		}
-		sin->sin_len = ret->maxlen = ret->len = sizeof *sin;
-		ret->buf = sin;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		sin6 = (struct sockaddr_in6 *)malloc(sizeof *sin6);
-		if (sin6 == NULL)
-			goto out;
-		memset(sin6, 0, sizeof *sin6);
-		sin6->sin6_family = AF_INET6;
-		sin6->sin6_port = htons(port);
-		if (inet_pton(AF_INET6, addrstr, &sin6->sin6_addr) <= 0) {
-			free(sin6);
-			free(ret);
-			ret = NULL;
-			goto out;
-		}
-		sin6->sin6_len = ret->maxlen = ret->len = sizeof *sin6;
-		ret->buf = sin6;
-		break;
-#endif
-	case AF_LOCAL:
-		sun = (struct sockaddr_un *)malloc(sizeof *sun);
-		if (sun == NULL)
-			goto out;
-		memset(sun, 0, sizeof *sun);
-		sun->sun_family = AF_LOCAL;
-		strncpy(sun->sun_path, addrstr, sizeof(sun->sun_path) - 1);
-		ret->len = ret->maxlen = sun->sun_len = SUN_LEN(sun);
-		ret->buf = sun;
-		break;
-	default:
-		break;
-	}
-out:
-	free(addrstr);
-	return ret;
-}
-
-int
-__rpc_seman2socktype(int semantics)
-{
-	switch (semantics) {
-	case NC_TPI_CLTS:
-		return SOCK_DGRAM;
-	case NC_TPI_COTS_ORD:
-		return SOCK_STREAM;
-	case NC_TPI_RAW:
-		return SOCK_RAW;
-	default:
-		break;
-	}
-
-	return -1;
-}
-
-int
-__rpc_socktype2seman(int socktype)
-{
-	switch (socktype) {
-	case SOCK_DGRAM:
-		return NC_TPI_CLTS;
-	case SOCK_STREAM:
-		return NC_TPI_COTS_ORD;
-	case SOCK_RAW:
-		return NC_TPI_RAW;
-	default:
-		break;
-	}
-
-	return -1;
-}
-
-/*
- * XXXX - IPv6 scope IDs can't be handled in universal addresses.
- * Here, we compare the original server address to that of the RPC
- * service we just received back from a call to rpcbind on the remote
- * machine. If they are both "link local" or "site local", copy
- * the scope id of the server address over to the service address.
- */
-int
-__rpc_fixup_addr(struct netbuf *new, const struct netbuf *svc)
-{
-#ifdef INET6
-	struct sockaddr *sa_new, *sa_svc;
-	struct sockaddr_in6 *sin6_new, *sin6_svc;
-
-	sa_svc = (struct sockaddr *)svc->buf;
-	sa_new = (struct sockaddr *)new->buf;
-
-	if (sa_new->sa_family == sa_svc->sa_family &&
-	    sa_new->sa_family == AF_INET6) {
-		sin6_new = (struct sockaddr_in6 *)new->buf;
-		sin6_svc = (struct sockaddr_in6 *)svc->buf;
-
-		if ((IN6_IS_ADDR_LINKLOCAL(&sin6_new->sin6_addr) &&
-		     IN6_IS_ADDR_LINKLOCAL(&sin6_svc->sin6_addr)) ||
-		    (IN6_IS_ADDR_SITELOCAL(&sin6_new->sin6_addr) &&
-		     IN6_IS_ADDR_SITELOCAL(&sin6_svc->sin6_addr))) {
-			sin6_new->sin6_scope_id = sin6_svc->sin6_scope_id;
-		}
-	}
-#endif
-	return 1;
-}
-
-int
-__rpc_sockisbound(int fd)
-{
-	struct sockaddr_storage ss;
-	socklen_t slen;
-
-	slen = sizeof (struct sockaddr_storage);
-	if (_getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) < 0)
-		return 0;
-
-	switch (ss.ss_family) {
-		case AF_INET:
-			return (((struct sockaddr_in *)
-			    (void *)&ss)->sin_port != 0);
-#ifdef INET6
-		case AF_INET6:
-			return (((struct sockaddr_in6 *)
-			    (void *)&ss)->sin6_port != 0);
-#endif
-		case AF_LOCAL:
-			/* XXX check this */
-			return (((struct sockaddr_un *)
-			    (void *)&ss)->sun_path[0] != '\0');
-		default:
-			break;
-	}
-
-	return 0;
-}
diff --git a/lib/libc_bsd/rpc/rpc_prot.c b/lib/libc_bsd/rpc/rpc_prot.c
deleted file mode 100644
index 5212cfd..0000000
--- a/lib/libc_bsd/rpc/rpc_prot.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/*	$NetBSD: rpc_prot.c,v 1.16 2000/06/02 23:11:13 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)rpc_prot.c 1.36 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)rpc_prot.c	2.3 88/08/07 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpc_prot.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * rpc_prot.c
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
- * This set of routines implements the rpc message definition,
- * its serializer and some common rpc utility routines.
- * The routines are meant for various implementations of rpc -
- * they are NOT for the rpc client or rpc service implementations!
- * Because authentication stuff is easy and is part of rpc, the opaque
- * routines are also in this program.
- */
-
-#include "namespace.h"
-#include <sys/param.h>
-
-#include <assert.h>
-
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-static void accepted(enum accept_stat, struct rpc_err *);
-static void rejected(enum reject_stat, struct rpc_err *);
-
-/* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
-
-extern struct opaque_auth _null_auth;
-
-/*
- * XDR an opaque authentication struct
- * (see auth.h)
- */
-bool_t
-xdr_opaque_auth(xdrs, ap)
-	XDR *xdrs;
-	struct opaque_auth *ap;
-{
-
-	assert(xdrs != NULL);
-	assert(ap != NULL);
-
-	if (xdr_enum(xdrs, &(ap->oa_flavor)))
-		return (xdr_bytes(xdrs, &ap->oa_base,
-			&ap->oa_length, MAX_AUTH_BYTES));
-	return (FALSE);
-}
-
-/*
- * XDR a DES block
- */
-bool_t
-xdr_des_block(xdrs, blkp)
-	XDR *xdrs;
-	des_block *blkp;
-{
-
-	assert(xdrs != NULL);
-	assert(blkp != NULL);
-
-	return (xdr_opaque(xdrs, (caddr_t)(void *)blkp, sizeof(des_block)));
-}
-
-/* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */
-
-/*
- * XDR the MSG_ACCEPTED part of a reply message union
- */
-bool_t
-xdr_accepted_reply(xdrs, ar)
-	XDR *xdrs;   
-	struct accepted_reply *ar;
-{
-	enum accept_stat *par_stat;
-
-	assert(xdrs != NULL);
-	assert(ar != NULL);
-
-	par_stat = &ar->ar_stat;
-
-	/* personalized union, rather than calling xdr_union */
-	if (! xdr_opaque_auth(xdrs, &(ar->ar_verf)))
-		return (FALSE);
-	if (! xdr_enum(xdrs, (enum_t *) par_stat))
-		return (FALSE);
-	switch (ar->ar_stat) {
-
-	case SUCCESS:
-		return ((*(ar->ar_results.proc))(xdrs, ar->ar_results.where));
-
-	case PROG_MISMATCH:
-		if (! xdr_uint32_t(xdrs, &(ar->ar_vers.low)))
-			return (FALSE);
-		return (xdr_uint32_t(xdrs, &(ar->ar_vers.high)));
-
-	case GARBAGE_ARGS:
-	case SYSTEM_ERR:
-	case PROC_UNAVAIL:
-	case PROG_UNAVAIL:
-		break;
-	}
-	return (TRUE);  /* TRUE => open ended set of problems */
-}
-
-/*
- * XDR the MSG_DENIED part of a reply message union
- */
-bool_t 
-xdr_rejected_reply(xdrs, rr)
-	XDR *xdrs;
-	struct rejected_reply *rr;
-{
-	enum reject_stat *prj_stat;
-	enum auth_stat *prj_why;
-
-	assert(xdrs != NULL);
-	assert(rr != NULL);
-
-	prj_stat = &rr->rj_stat;
-
-	/* personalized union, rather than calling xdr_union */
-	if (! xdr_enum(xdrs, (enum_t *) prj_stat))
-		return (FALSE);
-	switch (rr->rj_stat) {
-
-	case RPC_MISMATCH:
-		if (! xdr_uint32_t(xdrs, &(rr->rj_vers.low)))
-			return (FALSE);
-		return (xdr_uint32_t(xdrs, &(rr->rj_vers.high)));
-
-	case AUTH_ERROR:
-		prj_why = &rr->rj_why;
-		return (xdr_enum(xdrs, (enum_t *) prj_why));
-	}
-	/* NOTREACHED */
-	assert(0);
-	return (FALSE);
-}
-
-static const struct xdr_discrim reply_dscrm[3] = {
-	{ (int)MSG_ACCEPTED, (xdrproc_t)xdr_accepted_reply },
-	{ (int)MSG_DENIED, (xdrproc_t)xdr_rejected_reply },
-	{ __dontcare__, NULL_xdrproc_t } };
-
-/*
- * XDR a reply message
- */
-bool_t
-xdr_replymsg(xdrs, rmsg)
-	XDR *xdrs;
-	struct rpc_msg *rmsg;
-{
-	enum msg_type *prm_direction;
-	enum reply_stat *prp_stat;
-
-	assert(xdrs != NULL);
-	assert(rmsg != NULL);
-
-	prm_direction = &rmsg->rm_direction;
-	prp_stat = &rmsg->rm_reply.rp_stat;
-
-	if (
-	    xdr_uint32_t(xdrs, &(rmsg->rm_xid)) && 
-	    xdr_enum(xdrs, (enum_t *) prm_direction) &&
-	    (rmsg->rm_direction == REPLY) )
-		return (xdr_union(xdrs, (enum_t *) prp_stat,
-		   (caddr_t)(void *)&(rmsg->rm_reply.ru), reply_dscrm,
-		   NULL_xdrproc_t));
-	return (FALSE);
-}
-
-
-/*
- * Serializes the "static part" of a call message header.
- * The fields include: rm_xid, rm_direction, rpcvers, prog, and vers.
- * The rm_xid is not really static, but the user can easily munge on the fly.
- */
-bool_t
-xdr_callhdr(xdrs, cmsg)
-	XDR *xdrs;
-	struct rpc_msg *cmsg;
-{
-	enum msg_type *prm_direction;
-
-	assert(xdrs != NULL);
-	assert(cmsg != NULL);
-
-	prm_direction = &cmsg->rm_direction;
-
-	cmsg->rm_direction = CALL;
-	cmsg->rm_call.cb_rpcvers = RPC_MSG_VERSION;
-	if (
-	    (xdrs->x_op == XDR_ENCODE) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_xid)) &&
-	    xdr_enum(xdrs, (enum_t *) prm_direction) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_rpcvers)) &&
-	    xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_prog)) )
-		return (xdr_uint32_t(xdrs, &(cmsg->rm_call.cb_vers)));
-	return (FALSE);
-}
-
-/* ************************** Client utility routine ************* */
-
-static void
-accepted(acpt_stat, error)
-	enum accept_stat acpt_stat;
-	struct rpc_err *error;
-{
-
-	assert(error != NULL);
-
-	switch (acpt_stat) {
-
-	case PROG_UNAVAIL:
-		error->re_status = RPC_PROGUNAVAIL;
-		return;
-
-	case PROG_MISMATCH:
-		error->re_status = RPC_PROGVERSMISMATCH;
-		return;
-
-	case PROC_UNAVAIL:
-		error->re_status = RPC_PROCUNAVAIL;
-		return;
-
-	case GARBAGE_ARGS:
-		error->re_status = RPC_CANTDECODEARGS;
-		return;
-
-	case SYSTEM_ERR:
-		error->re_status = RPC_SYSTEMERROR;
-		return;
-
-	case SUCCESS:
-		error->re_status = RPC_SUCCESS;
-		return;
-	}
-	/* NOTREACHED */
-	/* something's wrong, but we don't know what ... */
-	error->re_status = RPC_FAILED;
-	error->re_lb.s1 = (int32_t)MSG_ACCEPTED;
-	error->re_lb.s2 = (int32_t)acpt_stat;
-}
-
-static void 
-rejected(rjct_stat, error)
-	enum reject_stat rjct_stat;
-	struct rpc_err *error;
-{
-
-	assert(error != NULL);
-
-	switch (rjct_stat) {
-	case RPC_MISMATCH:
-		error->re_status = RPC_VERSMISMATCH;
-		return;
-
-	case AUTH_ERROR:
-		error->re_status = RPC_AUTHERROR;
-		return;
-	}
-	/* something's wrong, but we don't know what ... */
-	/* NOTREACHED */
-	error->re_status = RPC_FAILED;
-	error->re_lb.s1 = (int32_t)MSG_DENIED;
-	error->re_lb.s2 = (int32_t)rjct_stat;
-}
-
-/*
- * given a reply message, fills in the error
- */
-void
-_seterr_reply(msg, error)
-	struct rpc_msg *msg;
-	struct rpc_err *error;
-{
-
-	assert(msg != NULL);
-	assert(error != NULL);
-
-	/* optimized for normal, SUCCESSful case */
-	switch (msg->rm_reply.rp_stat) {
-
-	case MSG_ACCEPTED:
-		if (msg->acpted_rply.ar_stat == SUCCESS) {
-			error->re_status = RPC_SUCCESS;
-			return;
-		}
-		accepted(msg->acpted_rply.ar_stat, error);
-		break;
-
-	case MSG_DENIED:
-		rejected(msg->rjcted_rply.rj_stat, error);
-		break;
-
-	default:
-		error->re_status = RPC_FAILED;
-		error->re_lb.s1 = (int32_t)(msg->rm_reply.rp_stat);
-		break;
-	}
-	switch (error->re_status) {
-
-	case RPC_VERSMISMATCH:
-		error->re_vers.low = msg->rjcted_rply.rj_vers.low;
-		error->re_vers.high = msg->rjcted_rply.rj_vers.high;
-		break;
-
-	case RPC_AUTHERROR:
-		error->re_why = msg->rjcted_rply.rj_why;
-		break;
-
-	case RPC_PROGVERSMISMATCH:
-		error->re_vers.low = msg->acpted_rply.ar_vers.low;
-		error->re_vers.high = msg->acpted_rply.ar_vers.high;
-		break;
-
-	case RPC_FAILED:
-	case RPC_SUCCESS:
-	case RPC_PROGNOTREGISTERED:
-	case RPC_PMAPFAILURE:
-	case RPC_UNKNOWNPROTO:
-	case RPC_UNKNOWNHOST:
-	case RPC_SYSTEMERROR:
-	case RPC_CANTDECODEARGS:
-	case RPC_PROCUNAVAIL:
-	case RPC_PROGUNAVAIL:
-	case RPC_TIMEDOUT:
-	case RPC_CANTRECV:
-	case RPC_CANTSEND:
-	case RPC_CANTDECODERES:
-	case RPC_CANTENCODEARGS:
-	default:
-		break;
-	}
-}
diff --git a/lib/libc_bsd/rpc/rpc_secure.3 b/lib/libc_bsd/rpc/rpc_secure.3
deleted file mode 100644
index eac6b9e..0000000
--- a/lib/libc_bsd/rpc/rpc_secure.3
+++ /dev/null
@@ -1,287 +0,0 @@
-.\" @(#)rpc_secure.3n	2.1 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_secure.3 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd February 16, 1988
-.Dt RPC 3
-.Os
-.Sh NAME
-.Nm rpc_secure
-.Nd library routines for secure remote procedure calls
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft AUTH *
-.Fo authdes_create
-.Fa "char *name"
-.Fa "unsigned window"
-.Fa "struct sockaddr *addr"
-.Fa "des_block *ckey"
-.Fc
-.Ft int
-.Fn authdes_getucred "struct authdes_cred *adc" "uid_t *uid" "gid_t *gid" "int *grouplen" "gid_t *groups"
-.Ft int
-.Fn getnetname "char *name"
-.Ft int
-.Fn host2netname "char *name" "const char *host" "const char *domain"
-.Ft int
-.Fn key_decryptsession "const char *remotename" "des_block *deskey"
-.Ft int
-.Fn key_encryptsession "const char *remotename" "des_block *deskey"
-.Ft int
-.Fn key_gendes "des_block *deskey"
-.Ft int
-.Fn key_setsecret "const char *key"
-.Ft int
-.Fn netname2host "char *name" "char *host" "int hostlen"
-.Ft int
-.Fn netname2user "char *name" "uid_t *uidp" "gid_t *gidp" "int *gidlenp" "gid_t *gidlist"
-.Ft int
-.Fn user2netname "char *name" "const uid_t uid" "const char *domain"
-.Sh DESCRIPTION
-These routines are part of the
-.Tn RPC
-library.
-They implement
-.Tn DES
-Authentication.
-See
-.Xr rpc 3
-for further details about
-.Tn RPC .
-.Pp
-The
-.Fn authdes_create
-is the first of two routines which interface to the
-.Tn RPC
-secure authentication system, known as
-.Tn DES
-authentication.
-The second is
-.Fn authdes_getucred ,
-below.
-.Pp
-Note: the keyserver daemon
-.Xr keyserv 8
-must be running for the
-.Tn DES
-authentication system to work.
-.Pp
-The
-.Fn authdes_create
-function,
-used on the client side, returns an authentication handle that
-will enable the use of the secure authentication system.
-The first argument
-.Fa name
-is the network name, or
-.Fa netname ,
-of the owner of the server process.
-This field usually
-represents a
-.Fa hostname
-derived from the utility routine
-.Fn host2netname ,
-but could also represent a user name using
-.Fn user2netname .
-The second field is window on the validity of
-the client credential, given in seconds.
-A small
-window is more secure than a large one, but choosing
-too small of a window will increase the frequency of
-resynchronizations because of clock drift.
-The third
-argument
-.Fa addr
-is optional.
-If it is
-.Dv NULL ,
-then the authentication system will assume
-that the local clock is always in sync with the server's
-clock, and will not attempt resynchronizations.
-If an address
-is supplied, however, then the system will use the address
-for consulting the remote time service whenever
-resynchronization
-is required.
-This argument is usually the
-address of the
-.Tn RPC
-server itself.
-The final argument
-.Fa ckey
-is also optional.
-If it is
-.Dv NULL ,
-then the authentication system will
-generate a random
-.Tn DES
-key to be used for the encryption of credentials.
-If it is supplied, however, then it will be used instead.
-.Pp
-The
-.Fn authdes_getucred
-function,
-the second of the two
-.Tn DES
-authentication routines,
-is used on the server side for converting a
-.Tn DES
-credential, which is
-operating system independent, into a
-.Ux
-credential.
-This routine differs from utility routine
-.Fn netname2user
-in that
-.Fn authdes_getucred
-pulls its information from a cache, and does not have to do a
-Yellow Pages lookup every time it is called to get its information.
-.Pp
-The
-.Fn getnetname
-function
-installs the unique, operating-system independent netname of
-the
-caller in the fixed-length array
-.Fa name .
-Returns
-.Dv TRUE
-if it succeeds and
-.Dv FALSE
-if it fails.
-.Pp
-The
-.Fn host2netname
-function
-converts from a domain-specific hostname to an
-operating-system independent netname.
-Returns
-.Dv TRUE
-if it succeeds and
-.Dv FALSE
-if it fails.
-Inverse of
-.Fn netname2host .
-.Pp
-The
-.Fn key_decryptsession
-function
-is an interface to the keyserver daemon, which is associated
-with
-.Tn RPC Ns 's
-secure authentication system
-.Tn ( DES
-authentication).
-User programs rarely need to call it, or its associated routines
-.Fn key_encryptsession ,
-.Fn key_gendes
-and
-.Fn key_setsecret .
-System commands such as
-.Xr login 1
-and the
-.Tn RPC
-library are the main clients of these four routines.
-.Pp
-The
-.Fn key_decryptsession
-function
-takes a server netname and a
-.Tn DES
-key, and decrypts the key by
-using the public key of the server and the secret key
-associated with the effective uid of the calling process.
-It
-is the inverse of
-.Fn key_encryptsession .
-.Pp
-The
-.Fn key_encryptsession
-function
-is a keyserver interface routine.
-It
-takes a server netname and a des key, and encrypts
-it using the public key of the server and the secret key
-associated with the effective uid of the calling process.
-It
-is the inverse of
-.Fn key_decryptsession .
-.Pp
-The
-.Fn key_gendes
-function
-is a keyserver interface routine.
-It
-is used to ask the keyserver for a secure conversation key.
-Choosing one
-.Qq random
-is usually not good enough,
-because
-the common ways of choosing random numbers, such as using the
-current time, are very easy to guess.
-.Pp
-The
-.Fn key_setsecret
-function
-is a keyserver interface routine.
-It is used to set the key for
-the effective
-.Fa uid
-of the calling process.
-.Pp
-The
-.Fn netname2host
-function
-converts from an operating-system independent netname to a
-domain-specific hostname.
-Returns
-.Dv TRUE
-if it succeeds and
-.Dv FALSE
-if it fails.
-Inverse of
-.Fn host2netname .
-.Pp
-The
-.Fn netname2user
-function
-converts from an operating-system independent netname to a
-domain-specific user ID.
-Returns
-.Dv TRUE
-if it succeeds and
-.Dv FALSE
-if it fails.
-Inverse of
-.Fn user2netname .
-.Pp
-The
-.Fn user2netname
-function
-converts from a domain-specific username to an operating-system
-independent netname.
-Returns
-.Dv TRUE
-if it succeeds and
-.Dv FALSE
-if it fails.
-Inverse of
-.Fn netname2user .
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr xdr 3 ,
-.Xr keyserv 8
-.Pp
-The following manuals:
-.Rs
-.%B Remote Procedure Calls: Protocol Specification
-.Re
-.Rs
-.%B Remote Procedure Call Programming Guide
-.Re
-.Rs
-.%B Rpcgen Programming Guide
-.Re
-.Rs
-.%B RPC: Remote Procedure Call Protocol Specification
-.%O RFC1050, Sun Microsystems Inc., USC-ISI
-.Re
diff --git a/lib/libc_bsd/rpc/rpc_soc.3 b/lib/libc_bsd/rpc/rpc_soc.3
deleted file mode 100644
index 4752ecc..0000000
--- a/lib/libc_bsd/rpc/rpc_soc.3
+++ /dev/null
@@ -1,1721 +0,0 @@
-.\" @(#)rpc.3n	2.4 88/08/08 4.0 RPCSRC; from 1.19 88/06/24 SMI
-.\" $NetBSD: rpc_soc.3,v 1.2 2000/06/07 13:39:43 simonb Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_soc.3 241181 2012-10-04 04:15:18Z pfg $
-.\"
-.Dd February 16, 1988
-.Dt RPC_SOC 3
-.Os
-.Sh NAME
-.Nm rpc_soc ,
-.Nm auth_destroy ,
-.Nm authnone_create ,
-.Nm authunix_create ,
-.Nm authunix_create_default ,
-.Nm callrpc ,
-.Nm clnt_broadcast ,
-.Nm clnt_call ,
-.Nm clnt_control ,
-.Nm clnt_create ,
-.Nm clnt_destroy ,
-.Nm clnt_freeres ,
-.Nm clnt_geterr ,
-.Nm clnt_pcreateerror ,
-.Nm clnt_perrno ,
-.Nm clnt_perror ,
-.Nm clnt_spcreateerror ,
-.Nm clnt_sperrno ,
-.Nm clnt_sperror ,
-.Nm clntraw_create ,
-.Nm clnttcp_create ,
-.Nm clntudp_bufcreate ,
-.Nm clntudp_create ,
-.Nm clntunix_create ,
-.Nm get_myaddress ,
-.Nm pmap_getmaps ,
-.Nm pmap_getport ,
-.Nm pmap_rmtcall ,
-.Nm pmap_set ,
-.Nm pmap_unset ,
-.Nm registerrpc ,
-.Nm rpc_createerr ,
-.Nm svc_destroy ,
-.Nm svc_fds ,
-.Nm svc_fdset ,
-.Nm svc_getargs ,
-.Nm svc_getcaller ,
-.Nm svc_getreq ,
-.Nm svc_getreqset ,
-.Nm svc_register ,
-.Nm svc_run ,
-.Nm svc_sendreply ,
-.Nm svc_unregister ,
-.Nm svcerr_auth ,
-.Nm svcerr_decode ,
-.Nm svcerr_noproc ,
-.Nm svcerr_noprog ,
-.Nm svcerr_progvers ,
-.Nm svcerr_systemerr ,
-.Nm svcerr_weakauth ,
-.Nm svcfd_create ,
-.Nm svcunixfd_create ,
-.Nm svcraw_create ,
-.Nm svcunix_create ,
-.Nm xdr_accepted_reply ,
-.Nm xdr_authunix_parms ,
-.Nm xdr_callhdr ,
-.Nm xdr_callmsg ,
-.Nm xdr_opaque_auth ,
-.Nm xdr_pmap ,
-.Nm xdr_pmaplist ,
-.Nm xdr_rejected_reply ,
-.Nm xdr_replymsg ,
-.Nm xprt_register ,
-.Nm xprt_unregister
-.Nd "library routines for remote procedure calls"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Pp
-See
-.Sx DESCRIPTION
-for function declarations.
-.Sh DESCRIPTION
-.Bf -symbolic
-The
-.Fn svc_*
-and
-.Fn clnt_*
-functions described in this page are the old, TS-RPC
-interface to the XDR and RPC library, and exist for backward compatibility.
-The new interface is described in the pages
-referenced from
-.Xr rpc 3 .
-.Ef
-.Pp
-These routines allow C programs to make procedure
-calls on other machines across the network.
-First, the client calls a procedure to send a
-data packet to the server.
-Upon receipt of the packet, the server calls a dispatch routine
-to perform the requested service, and then sends back a
-reply.
-Finally, the procedure call returns to the client.
-.Pp
-Routines that are used for Secure
-.Tn RPC ( DES
-authentication) are described in
-.Xr rpc_secure 3 .
-Secure
-.Tn RPC
-can be used only if
-.Tn DES
-encryption is available.
-.Pp
-.Bl -tag -width indent -compact
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn auth_destroy "AUTH *auth"
-.Xc
-.Pp
-A macro that destroys the authentication information associated with
-.Fa auth .
-Destruction usually involves deallocation of private data
-structures.
-The use of
-.Fa auth
-is undefined after calling
-.Fn auth_destroy .
-.Pp
-.It Xo
-.Ft "AUTH *"
-.Xc
-.It Xo
-.Fn authnone_create
-.Xc
-.Pp
-Create and return an
-.Tn RPC
-authentication handle that passes nonusable authentication
-information with each remote procedure call.
-This is the
-default authentication used by
-.Tn RPC .
-.Pp
-.It Xo
-.Ft "AUTH *"
-.Xc
-.It Xo
-.Fn authunix_create "char *host" "u_int uid" "u_int gid" "int len" "u_int *aup_gids"
-.Xc
-.Pp
-Create and return an
-.Tn RPC
-authentication handle that contains
-.Ux
-authentication information.
-The
-.Fa host
-argument
-is the name of the machine on which the information was
-created;
-.Fa uid
-is the user's user ID;
-.Fa gid
-is the user's current group ID;
-.Fa len
-and
-.Fa aup_gids
-refer to a counted array of groups to which the user belongs.
-It is easy to impersonate a user.
-.Pp
-.It Xo
-.Ft "AUTH *"
-.Xc
-.It Xo
-.Fn authunix_create_default
-.Xc
-.Pp
-Calls
-.Fn authunix_create
-with the appropriate arguments.
-.Pp
-.It Xo
-.Ft int
-.Fo callrpc
-.Fa "char *host"
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "u_long procnum"
-.Fa "xdrproc_t inproc"
-.Fa "void *in"
-.Fa "xdrproc_t outproc"
-.Fa "void *out"
-.Fc
-.Xc
-.Pp
-Call the remote procedure associated with
-.Fa prognum ,
-.Fa versnum ,
-and
-.Fa procnum
-on the machine
-.Fa host .
-The
-.Fa in
-argument
-is the address of the procedure's argument(s), and
-.Fa out
-is the address of where to place the result(s);
-.Fa inproc
-is used to encode the procedure's arguments, and
-.Fa outproc
-is used to decode the procedure's results.
-This routine returns zero if it succeeds, or the value of
-.Vt "enum clnt_stat"
-cast to an integer if it fails.
-The routine
-.Fn clnt_perrno
-is handy for translating failure statuses into messages.
-.Pp
-Warning: calling remote procedures with this routine
-uses
-.Tn UDP/IP
-as a transport; see
-.Fn clntudp_create
-for restrictions.
-You do not have control of timeouts or authentication using
-this routine.
-.Pp
-.It Xo
-.Ft "enum clnt_stat"
-.Xc
-.It Xo
-.Fo clnt_broadcast
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "u_long procnum"
-.Fa "xdrproc_t inproc"
-.Fa "char *in"
-.Fa "xdrproc_t outproc"
-.Fa "char *out"
-.Fa "bool_t (*eachresult)(caddr_t, struct sockaddr_in *)"
-.Fc
-.Xc
-.Pp
-Like
-.Fn callrpc ,
-except the call message is broadcast to all locally
-connected broadcast nets.
-Each time it receives a
-response, this routine calls
-.Fn eachresult ,
-whose form is:
-.Bd -ragged -offset indent
-.Ft bool_t
-.Fn eachresult "caddr_t out" "struct sockaddr_in *addr"
-.Ed
-.Pp
-where
-.Fa out
-is the same as
-.Fa out
-passed to
-.Fn clnt_broadcast ,
-except that the remote procedure's output is decoded there;
-.Fa addr
-points to the address of the machine that sent the results.
-If
-.Fn eachresult
-returns zero,
-.Fn clnt_broadcast
-waits for more replies; otherwise it returns with appropriate
-status.
-.Pp
-Warning: broadcast sockets are limited in size to the
-maximum transfer unit of the data link.
-For ethernet,
-this value is 1500 bytes.
-.Pp
-.It Xo
-.Ft "enum clnt_stat"
-.Xc
-.It Xo
-.Fo clnt_call
-.Fa "CLIENT *clnt"
-.Fa "u_long procnum"
-.Fa "xdrproc_t inproc"
-.Fa "char *in"
-.Fa "xdrproc_t outproc"
-.Fa "char *out"
-.Fa "struct timeval tout"
-.Fc
-.Xc
-.Pp
-A macro that calls the remote procedure
-.Fa procnum
-associated with the client handle,
-.Fa clnt ,
-which is obtained with an
-.Tn RPC
-client creation routine such as
-.Fn clnt_create .
-The
-.Fa in
-argument
-is the address of the procedure's argument(s), and
-.Fa out
-is the address of where to place the result(s);
-.Fa inproc
-is used to encode the procedure's arguments, and
-.Fa outproc
-is used to decode the procedure's results;
-.Fa tout
-is the time allowed for results to come back.
-.Pp
-.It Xo
-.Ft void
-.Fn clnt_destroy "CLIENT *clnt"
-.Xc
-.Pp
-A macro that destroys the client's
-.Tn RPC
-handle.
-Destruction usually involves deallocation
-of private data structures, including
-.Fa clnt
-itself.
-Use of
-.Fa clnt
-is undefined after calling
-.Fn clnt_destroy .
-If the
-.Tn RPC
-library opened the associated socket, it will close it also.
-Otherwise, the socket remains open.
-.Pp
-.It Xo
-.Ft CLIENT *
-.Xc
-.It Xo
-.Fn clnt_create "char *host" "u_long prog" "u_long vers" "char *proto"
-.Xc
-.Pp
-Generic client creation routine.
-The
-.Fa host
-argument
-identifies the name of the remote host where the server
-is located.
-The
-.Fa proto
-argument
-indicates which kind of transport protocol to use.
-The
-currently supported values for this field are
-.Qq Li udp
-and
-.Qq Li tcp .
-Default timeouts are set, but can be modified using
-.Fn clnt_control .
-.Pp
-Warning: Using
-.Tn UDP
-has its shortcomings.
-Since
-.Tn UDP Ns \-based
-.Tn RPC
-messages can only hold up to 8 Kbytes of encoded data,
-this transport cannot be used for procedures that take
-large arguments or return huge results.
-.Pp
-.It Xo
-.Ft bool_t
-.Xc
-.It Xo
-.Fn clnt_control "CLIENT *cl" "u_int req" "char *info"
-.Xc
-.Pp
-A macro used to change or retrieve various information
-about a client object.
-The
-.Fa req
-argument
-indicates the type of operation, and
-.Fa info
-is a pointer to the information.
-For both
-.Tn UDP
-and
-.Tn TCP ,
-the supported values of
-.Fa req
-and their argument types and what they do are:
-.Bl -column "CLSET_RETRY_TIMEOUT" "struct sockaddr_in"
-.It Dv CLSET_TIMEOUT Ta
-.Vt "struct timeval" Ta "set total timeout"
-.It Dv CLGET_TIMEOUT Ta
-.Vt "struct timeval" Ta "get total timeout"
-.El
-.Pp
-Note: if you set the timeout using
-.Fn clnt_control ,
-the timeout argument passed to
-.Fn clnt_call
-will be ignored in all future calls.
-.Bl -column "CLSET_RETRY_TIMEOUT" "struct sockaddr_in"
-.It Dv CLGET_SERVER_ADDR Ta
-.Vt "struct sockaddr_in" Ta "get server's address"
-.El
-.Pp
-The following operations are valid for
-.Tn UDP
-only:
-.Bl -column "CLSET_RETRY_TIMEOUT" "struct sockaddr_in"
-.It Dv CLSET_RETRY_TIMEOUT Ta
-.Vt "struct timeval" Ta "set the retry timeout"
-.It Dv CLGET_RETRY_TIMEOUT Ta
-.Vt "struct timeval" Ta "get the retry timeout"
-.El
-.Pp
-The retry timeout is the time that
-.Tn "UDP RPC"
-waits for the server to reply before
-retransmitting the request.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn clnt_freeres "CLIENT *clnt" "xdrproc_t outproc" "char *out"
-.Xc
-.Pp
-A macro that frees any data allocated by the
-.Tn RPC/XDR
-system when it decoded the results of an
-.Tn RPC
-call.
-The
-.Fa out
-argument
-is the address of the results, and
-.Fa outproc
-is the
-.Tn XDR
-routine describing the results.
-This routine returns one if the results were successfully
-freed,
-and zero otherwise.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn clnt_geterr "CLIENT *clnt" "struct rpc_err *errp"
-.Xc
-.Pp
-A macro that copies the error structure out of the client
-handle
-to the structure at address
-.Fa errp .
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn clnt_pcreateerror "char *s"
-.Xc
-.Pp
-prints a message to standard error indicating
-why a client
-.Tn RPC
-handle could not be created.
-The message is prepended with string
-.Fa s
-and a colon.
-A newline is appended at the end of the message.
-Used when a
-.Fn clnt_create ,
-.Fn clntraw_create ,
-.Fn clnttcp_create ,
-or
-.Fn clntudp_create
-call fails.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn clnt_perrno "enum clnt_stat stat"
-.Xc
-.Pp
-Print a message to standard error corresponding
-to the condition indicated by
-.Fa stat .
-A newline is appended at the end of the message.
-Used after
-.Fn callrpc .
-.Pp
-.It Xo
-.Ft void
-.Fn clnt_perror "CLIENT *clnt" "char *s"
-.Xc
-.Pp
-Print a message to standard error indicating why an
-.Tn RPC
-call failed;
-.Fa clnt
-is the handle used to do the call.
-The message is prepended with string
-.Fa s
-and a colon.
-A newline is appended at the end of the message.
-Used after
-.Fn clnt_call .
-.Pp
-.It Xo
-.Ft "char *"
-.Xc
-.It Xo
-.Fn clnt_spcreateerror "char *s"
-.Xc
-.Pp
-Like
-.Fn clnt_pcreateerror ,
-except that it returns a string
-instead of printing to the standard error.
-.Pp
-Bugs: returns pointer to static data that is overwritten
-on each call.
-.Pp
-.It Xo
-.Ft "char *"
-.Xc
-.It Xo
-.Fn clnt_sperrno "enum clnt_stat stat"
-.Xc
-.Pp
-Take the same arguments as
-.Fn clnt_perrno ,
-but instead of sending a message to the standard error
-indicating why an
-.Tn RPC
-call failed, return a pointer to a string which contains
-the message.
-.Pp
-The
-.Fn clnt_sperrno
-function
-is used instead of
-.Fn clnt_perrno
-if the program does not have a standard error (as a program
-running as a server quite likely does not), or if the
-programmer
-does not want the message to be output with
-.Fn printf ,
-or if a message format different from that supported by
-.Fn clnt_perrno
-is to be used.
-.Pp
-Note: unlike
-.Fn clnt_sperror
-and
-.Fn clnt_spcreateerror ,
-.Fn clnt_sperrno
-returns pointer to static data, but the
-result will not get overwritten on each call.
-.Pp
-.It Xo
-.Ft "char *"
-.Xc
-.It Xo
-.Fn clnt_sperror "CLIENT *rpch" "char *s"
-.Xc
-.Pp
-Like
-.Fn clnt_perror ,
-except that (like
-.Fn clnt_sperrno )
-it returns a string instead of printing to standard error.
-.Pp
-Bugs: returns pointer to static data that is overwritten
-on each call.
-.Pp
-.It Xo
-.Ft "CLIENT *"
-.Xc
-.It Xo
-.Fn clntraw_create "u_long prognum" "u_long versnum"
-.Xc
-.Pp
-This routine creates a toy
-.Tn RPC
-client for the remote program
-.Fa prognum ,
-version
-.Fa versnum .
-The transport used to pass messages to the service is
-actually a buffer within the process's address space, so the
-corresponding
-.Tn RPC
-server should live in the same address space; see
-.Fn svcraw_create .
-This allows simulation of
-.Tn RPC
-and acquisition of
-.Tn RPC
-overheads, such as round trip times, without any
-kernel interference.
-This routine returns
-.Dv NULL
-if it fails.
-.Pp
-.It Xo
-.Ft "CLIENT *"
-.Xc
-.It Xo
-.Fo clnttcp_create
-.Fa "struct sockaddr_in *addr"
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "int *sockp"
-.Fa "u_int sendsz"
-.Fa "u_int recvsz"
-.Fc
-.Xc
-.Pp
-This routine creates an
-.Tn RPC
-client for the remote program
-.Fa prognum ,
-version
-.Fa versnum ;
-the client uses
-.Tn TCP/IP
-as a transport.
-The remote program is located at Internet
-address
-.Fa addr .
-If
-.Fa addr\->sin_port
-is zero, then it is set to the actual port that the remote
-program is listening on (the remote
-.Xr rpcbind 8
-service is consulted for this information).
-The
-.Fa sockp
-argument
-is a socket; if it is
-.Dv RPC_ANYSOCK ,
-then this routine opens a new one and sets
-.Fa sockp .
-Since
-.Tn TCP Ns \-based
-.Tn RPC
-uses buffered
-.Tn I/O ,
-the user may specify the size of the send and receive buffers
-with the
-.Fa sendsz
-and
-.Fa recvsz
-arguments;
-values of zero choose suitable defaults.
-This routine returns
-.Dv NULL
-if it fails.
-.Pp
-.It Xo
-.Ft "CLIENT *"
-.Xc
-.It Xo
-.Fo clntudp_create
-.Fa "struct sockaddr_in *addr"
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "struct timeval wait"
-.Fa "int *sockp"
-.Fc
-.Xc
-.Pp
-This routine creates an
-.Tn RPC
-client for the remote program
-.Fa prognum ,
-version
-.Fa versnum ;
-the client uses
-.Tn UDP/IP
-as a transport.
-The remote program is located at Internet
-address
-.Fa addr .
-If
-.Fa addr\->sin_port
-is zero, then it is set to actual port that the remote
-program is listening on (the remote
-.Xr rpcbind 8
-service is consulted for this information).
-The
-.Fa sockp
-argument
-is a socket; if it is
-.Dv RPC_ANYSOCK ,
-then this routine opens a new one and sets
-.Fa sockp .
-The
-.Tn UDP
-transport resends the call message in intervals of
-.Fa wait
-time until a response is received or until the call times
-out.
-The total time for the call to time out is specified by
-.Fn clnt_call .
-.Pp
-Warning: since
-.Tn UDP Ns \-based
-.Tn RPC
-messages can only hold up to 8 Kbytes
-of encoded data, this transport cannot be used for procedures
-that take large arguments or return huge results.
-.Pp
-.It Xo
-.Ft "CLIENT *"
-.Xc
-.It Xo
-.Fo clntudp_bufcreate
-.Fa "struct sockaddr_in *addr"
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "struct timeval wait"
-.Fa "int *sockp"
-.Fa "unsigned int sendsize"
-.Fa "unsigned int recosize"
-.Fc
-.Xc
-.Pp
-This routine creates an
-.Tn RPC
-client for the remote program
-.Fa prognum ,
-on
-.Fa versnum ;
-the client uses
-.Tn UDP/IP
-as a transport.
-The remote program is located at Internet
-address
-.Fa addr .
-If
-.Fa addr\->sin_port
-is zero, then it is set to actual port that the remote
-program is listening on (the remote
-.Xr rpcbind 8
-service is consulted for this information).
-The
-.Fa sockp
-argument
-is a socket; if it is
-.Dv RPC_ANYSOCK ,
-then this routine opens a new one and sets
-.Fa sockp .
-The
-.Tn UDP
-transport resends the call message in intervals of
-.Fa wait
-time until a response is received or until the call times
-out.
-The total time for the call to time out is specified by
-.Fn clnt_call .
-.Pp
-This allows the user to specify the maximum packet size
-for sending and receiving
-.Tn UDP Ns \-based
-.Tn RPC
-messages.
-.Pp
-.It Xo
-.Ft "CLIENT *"
-.Xc
-.It Xo
-.Fo clntunix_create
-.Fa "struct sockaddr_un *raddr"
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "int *sockp"
-.Fa "u_int sendsz"
-.Fa "u_int recvsz"
-.Fc
-.Xc
-.Pp
-This routine creates an
-.Tn RPC
-client for the local
-program
-.Fa prognum ,
-version
-.Fa versnum ;
-the client uses
-.Ux Ns -domain
-sockets as a transport.
-The local program is located at the
-.Fa *raddr .
-The
-.Fa sockp
-argument
-is a socket; if it is
-.Dv RPC_ANYSOCK ,
-then this routine opens a new one and sets
-.Fa sockp .
-Since
-.Ux Ns -based
-.Tn RPC
-uses buffered
-.Tn I/O ,
-the user may specify the size of the send and receive buffers
-with the
-.Fa sendsz
-and
-.Fa recvsz
-arguments;
-values of zero choose suitable defaults.
-This routine returns
-.Dv NULL
-if it fails.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn get_myaddress "struct sockaddr_in *addr"
-.Xc
-.Pp
-Stuff the machine's
-.Tn IP
-address into
-.Fa addr ,
-without consulting the library routines that deal with
-.Pa /etc/hosts .
-The port number is always set to
-.Fn htons PMAPPORT .
-Returns zero on success, non-zero on failure.
-.Pp
-.It Xo
-.Ft "struct pmaplist *"
-.Xc
-.It Xo
-.Fn pmap_getmaps "struct sockaddr_in *addr"
-.Xc
-.Pp
-A user interface to the
-.Xr rpcbind 8
-service, which returns a list of the current
-.Tn RPC
-program\-to\-port mappings
-on the host located at
-.Tn IP
-address
-.Fa addr .
-This routine can return
-.Dv NULL .
-The command
-.Dq Nm rpcinfo Fl p
-uses this routine.
-.Pp
-.It Xo
-.Ft u_short
-.Xc
-.It Xo
-.Fo pmap_getport
-.Fa "struct sockaddr_in *addr"
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "u_long protocol"
-.Fc
-.Xc
-.Pp
-A user interface to the
-.Xr rpcbind 8
-service, which returns the port number
-on which waits a service that supports program number
-.Fa prognum ,
-version
-.Fa versnum ,
-and speaks the transport protocol associated with
-.Fa protocol .
-The value of
-.Fa protocol
-is most likely
-.Dv IPPROTO_UDP
-or
-.Dv IPPROTO_TCP .
-A return value of zero means that the mapping does not exist
-or that
-the
-.Tn RPC
-system failed to contact the remote
-.Xr rpcbind 8
-service.
-In the latter case, the global variable
-.Va rpc_createerr
-contains the
-.Tn RPC
-status.
-.Pp
-.It Xo
-.Ft "enum clnt_stat"
-.Xc
-.It Xo
-.Fo pmap_rmtcall
-.Fa "struct sockaddr_in *addr"
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "u_long procnum"
-.Fa "xdrproc_t inproc"
-.Fa "char *in"
-.Fa "xdrproc_t outproc"
-.Fa "char *out"
-.Fa "struct timeval tout"
-.Fa "u_long *portp"
-.Fc
-.Xc
-.Pp
-A user interface to the
-.Xr rpcbind 8
-service, which instructs
-.Xr rpcbind 8
-on the host at
-.Tn IP
-address
-.Fa addr
-to make an
-.Tn RPC
-call on your behalf to a procedure on that host.
-The
-.Fa portp
-argument
-will be modified to the program's port number if the
-procedure
-succeeds.
-The definitions of other arguments are discussed
-in
-.Fn callrpc
-and
-.Fn clnt_call .
-This procedure should be used for a
-.Dq ping
-and nothing
-else.
-See also
-.Fn clnt_broadcast .
-.Pp
-.It Xo
-.Ft bool_t
-.Fn pmap_set "u_long prognum" "u_long versnum" "u_long protocol" "u_short port"
-.Xc
-.Pp
-A user interface to the
-.Xr rpcbind 8
-service, which establishes a mapping between the triple
-.Pq Fa prognum , versnum , protocol
-and
-.Fa port
-on the machine's
-.Xr rpcbind 8
-service.
-The value of
-.Fa protocol
-is most likely
-.Dv IPPROTO_UDP
-or
-.Dv IPPROTO_TCP .
-This routine returns one if it succeeds, zero otherwise.
-Automatically done by
-.Fn svc_register .
-.Pp
-.It Xo
-.Ft bool_t
-.Fn pmap_unset "u_long prognum" "u_long versnum"
-.Xc
-.Pp
-A user interface to the
-.Xr rpcbind 8
-service, which destroys all mapping between the triple
-.Pq Fa prognum , versnum , *
-and
-.Fa ports
-on the machine's
-.Xr rpcbind 8
-service.
-This routine returns one if it succeeds, zero
-otherwise.
-.Pp
-.It Xo
-.Ft bool_t
-.Fo registerrpc
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "u_long procnum"
-.Fa "char *(*procname)(void)"
-.Fa "xdrproc_t inproc"
-.Fa "xdrproc_t outproc"
-.Fc
-.Xc
-.Pp
-Register procedure
-.Fa procname
-with the
-.Tn RPC
-service package.
-If a request arrives for program
-.Fa prognum ,
-version
-.Fa versnum ,
-and procedure
-.Fa procnum ,
-.Fa procname
-is called with a pointer to its argument(s);
-.Fa progname
-should return a pointer to its static result(s);
-.Fa inproc
-is used to decode the arguments while
-.Fa outproc
-is used to encode the results.
-This routine returns zero if the registration succeeded, \-1
-otherwise.
-.Pp
-Warning: remote procedures registered in this form
-are accessed using the
-.Tn UDP/IP
-transport; see
-.Fn svcudp_create
-for restrictions.
-.Pp
-.It Xo
-.Vt "struct rpc_createerr" rpc_createerr ;
-.Xc
-.Pp
-A global variable whose value is set by any
-.Tn RPC
-client creation routine
-that does not succeed.
-Use the routine
-.Fn clnt_pcreateerror
-to print the reason why.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn svc_destroy "SVCXPRT * xprt"
-.Xc
-.Pp
-A macro that destroys the
-.Tn RPC
-service transport handle,
-.Fa xprt .
-Destruction usually involves deallocation
-of private data structures, including
-.Fa xprt
-itself.
-Use of
-.Fa xprt
-is undefined after calling this routine.
-.Pp
-.It Xo
-.Vt fd_set svc_fdset ;
-.Xc
-.Pp
-A global variable reflecting the
-.Tn RPC
-service side's
-read file descriptor bit mask; it is suitable as a template argument
-to the
-.Xr select 2
-system call.
-This is only of interest
-if a service implementor does not call
-.Fn svc_run ,
-but rather does his own asynchronous event processing.
-This variable is read\-only (do not pass its address to
-.Xr select 2 ! ) ,
-yet it may change after calls to
-.Fn svc_getreqset
-or any creation routines.
-As well, note that if the process has descriptor limits
-which are extended beyond
-.Dv FD_SETSIZE ,
-this variable will only be usable for the first
-.Dv FD_SETSIZE
-descriptors.
-.Pp
-.It Xo
-.Vt int svc_fds ;
-.Xc
-.Pp
-Similar to
-.Va svc_fdset ,
-but limited to 32 descriptors.
-This
-interface is obsoleted by
-.Va svc_fdset .
-.Pp
-.It Xo
-.Ft bool_t
-.Fn svc_freeargs "SVCXPRT *xprt" "xdrproc_t inproc" "char *in"
-.Xc
-.Pp
-A macro that frees any data allocated by the
-.Tn RPC/XDR
-system when it decoded the arguments to a service procedure
-using
-.Fn svc_getargs .
-This routine returns 1 if the results were successfully
-freed,
-and zero otherwise.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn svc_getargs "SVCXPRT *xprt" "xdrproc_t inproc" "char *in"
-.Xc
-.Pp
-A macro that decodes the arguments of an
-.Tn RPC
-request
-associated with the
-.Tn RPC
-service transport handle,
-.Fa xprt .
-The
-.Fa in
-argument
-is the address where the arguments will be placed;
-.Fa inproc
-is the
-.Tn XDR
-routine used to decode the arguments.
-This routine returns one if decoding succeeds, and zero
-otherwise.
-.Pp
-.It Xo
-.Ft "struct sockaddr_in *"
-.Xc
-.It Xo
-.Fn svc_getcaller "SVCXPRT *xprt"
-.Xc
-.Pp
-The approved way of getting the network address of the caller
-of a procedure associated with the
-.Tn RPC
-service transport handle,
-.Fa xprt .
-.Pp
-.It Xo
-.Ft void
-.Fn svc_getreqset "fd_set *rdfds"
-.Xc
-.Pp
-This routine is only of interest if a service implementor
-does not call
-.Fn svc_run ,
-but instead implements custom asynchronous event processing.
-It is called when the
-.Xr select 2
-system call has determined that an
-.Tn RPC
-request has arrived on some
-.Tn RPC
-socket(s);
-.Fa rdfds
-is the resultant read file descriptor bit mask.
-The routine returns when all sockets associated with the
-value of
-.Fa rdfds
-have been serviced.
-.Pp
-.It Xo
-.Ft void
-.Fn svc_getreq "int rdfds"
-.Xc
-.Pp
-Similar to
-.Fn svc_getreqset ,
-but limited to 32 descriptors.
-This interface is obsoleted by
-.Fn svc_getreqset .
-.Pp
-.It Xo
-.Ft bool_t
-.Fo svc_register
-.Fa "SVCXPRT *xprt"
-.Fa "u_long prognum"
-.Fa "u_long versnum"
-.Fa "void (*dispatch)(struct svc_req *, SVCXPRT *)"
-.Fa "int protocol"
-.Fc
-.Xc
-.Pp
-Associates
-.Fa prognum
-and
-.Fa versnum
-with the service dispatch procedure,
-.Fn dispatch .
-If
-.Fa protocol
-is zero, the service is not registered with the
-.Xr rpcbind 8
-service.
-If
-.Fa protocol
-is non-zero, then a mapping of the triple
-.Pq Fa prognum , versnum , protocol
-to
-.Fa xprt\->xp_port
-is established with the local
-.Xr rpcbind 8
-service (generally
-.Fa protocol
-is zero,
-.Dv IPPROTO_UDP
-or
-.Dv IPPROTO_TCP ) .
-The procedure
-.Fn dispatch
-has the following form:
-.Bd -ragged -offset indent
-.Ft bool_t
-.Fn dispatch "struct svc_req *request" "SVCXPRT *xprt"
-.Ed
-.Pp
-The
-.Fn svc_register
-routine returns one if it succeeds, and zero otherwise.
-.Pp
-.It Xo
-.Fn svc_run
-.Xc
-.Pp
-This routine never returns.
-It waits for
-.Tn RPC
-requests to arrive, and calls the appropriate service
-procedure using
-.Fn svc_getreq
-when one arrives.
-This procedure is usually waiting for a
-.Xr select 2
-system call to return.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn svc_sendreply "SVCXPRT *xprt" "xdrproc_t outproc" "char *out"
-.Xc
-.Pp
-Called by an
-.Tn RPC
-service's dispatch routine to send the results of a
-remote procedure call.
-The
-.Fa xprt
-argument
-is the request's associated transport handle;
-.Fa outproc
-is the
-.Tn XDR
-routine which is used to encode the results; and
-.Fa out
-is the address of the results.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn svc_unregister "u_long prognum" "u_long versnum"
-.Xc
-.Pp
-Remove all mapping of the double
-.Pq Fa prognum , versnum
-to dispatch routines, and of the triple
-.Pq Fa prognum , versnum , *
-to port number.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn svcerr_auth "SVCXPRT *xprt" "enum auth_stat why"
-.Xc
-.Pp
-Called by a service dispatch routine that refuses to perform
-a remote procedure call due to an authentication error.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn svcerr_decode "SVCXPRT *xprt"
-.Xc
-.Pp
-Called by a service dispatch routine that cannot successfully
-decode its arguments.
-See also
-.Fn svc_getargs .
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn svcerr_noproc "SVCXPRT *xprt"
-.Xc
-.Pp
-Called by a service dispatch routine that does not implement
-the procedure number that the caller requests.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn svcerr_noprog "SVCXPRT *xprt"
-.Xc
-.Pp
-Called when the desired program is not registered with the
-.Tn RPC
-package.
-Service implementors usually do not need this routine.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn svcerr_progvers "SVCXPRT *xprt" "u_long low_vers" "u_long high_vers"
-.Xc
-.Pp
-Called when the desired version of a program is not registered
-with the
-.Tn RPC
-package.
-Service implementors usually do not need this routine.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn svcerr_systemerr "SVCXPRT *xprt"
-.Xc
-.Pp
-Called by a service dispatch routine when it detects a system
-error
-not covered by any particular protocol.
-For example, if a service can no longer allocate storage,
-it may call this routine.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn svcerr_weakauth "SVCXPRT *xprt"
-.Xc
-.Pp
-Called by a service dispatch routine that refuses to perform
-a remote procedure call due to insufficient
-authentication arguments.
-The routine calls
-.Fn svcerr_auth xprt AUTH_TOOWEAK .
-.Pp
-.It Xo
-.Ft "SVCXPRT *"
-.Xc
-.It Xo
-.Fn svcraw_create void
-.Xc
-.Pp
-This routine creates a toy
-.Tn RPC
-service transport, to which it returns a pointer.
-The transport
-is really a buffer within the process's address space,
-so the corresponding
-.Tn RPC
-client should live in the same
-address space;
-see
-.Fn clntraw_create .
-This routine allows simulation of
-.Tn RPC
-and acquisition of
-.Tn RPC
-overheads (such as round trip times), without any kernel
-interference.
-This routine returns
-.Dv NULL
-if it fails.
-.Pp
-.It Xo
-.Ft "SVCXPRT *"
-.Xc
-.It Xo
-.Fn svctcp_create "int sock" "u_int send_buf_size" "u_int recv_buf_size"
-.Xc
-.Pp
-This routine creates a
-.Tn TCP/IP Ns \-based
-.Tn RPC
-service transport, to which it returns a pointer.
-The transport is associated with the socket
-.Fa sock ,
-which may be
-.Dv RPC_ANYSOCK ,
-in which case a new socket is created.
-If the socket is not bound to a local
-.Tn TCP
-port, then this routine binds it to an arbitrary port.
-Upon completion,
-.Fa xprt\->xp_fd
-is the transport's socket descriptor, and
-.Fa xprt\->xp_port
-is the transport's port number.
-This routine returns
-.Dv NULL
-if it fails.
-Since
-.Tn TCP Ns \-based
-.Tn RPC
-uses buffered
-.Tn I/O ,
-users may specify the size of buffers; values of zero
-choose suitable defaults.
-.Pp
-.It Xo
-.Ft "SVCXPRT *"
-.Xc
-.It Xo
-.Fn svcunix_create "int sock" "u_int send_buf_size" "u_int recv_buf_size" "char *path"
-.Xc
-.Pp
-This routine creates a
-.Ux Ns -based
-.Tn RPC
-service transport, to which it returns a pointer.
-The transport is associated with the socket
-.Fa sock ,
-which may be
-.Dv RPC_ANYSOCK ,
-in which case a new socket is created.
-The
-.Fa *path
-argument
-is a variable-length file system pathname of
-at most 104 characters.
-This file is
-.Em not
-removed when the socket is closed.
-The
-.Xr unlink 2
-system call must be used to remove the file.
-Upon completion,
-.Fa xprt\->xp_fd
-is the transport's socket descriptor.
-This routine returns
-.Dv NULL
-if it fails.
-Since
-.Ux Ns -based
-.Tn RPC
-uses buffered
-.Tn I/O ,
-users may specify the size of buffers; values of zero
-choose suitable defaults.
-.Pp
-.It Xo
-.Ft "SVCXPRT *"
-.Xc
-.It Xo
-.Fn svcunixfd_create "int fd" "u_int sendsize" "u_int recvsize"
-.Xc
-.Pp
-Create a service on top of any open descriptor.
-The
-.Fa sendsize
-and
-.Fa recvsize
-arguments
-indicate sizes for the send and receive buffers.
-If they are
-zero, a reasonable default is chosen.
-.Pp
-.It Xo
-.Ft "SVCXPRT *"
-.Xc
-.It Xo
-.Fn svcfd_create "int fd" "u_int sendsize" "u_int recvsize"
-.Xc
-.Pp
-Create a service on top of any open descriptor.
-Typically,
-this
-descriptor is a connected socket for a stream protocol such
-as
-.Tn TCP .
-The
-.Fa sendsize
-and
-.Fa recvsize
-arguments
-indicate sizes for the send and receive buffers.
-If they are
-zero, a reasonable default is chosen.
-.Pp
-.It Xo
-.Ft "SVCXPRT *"
-.Xc
-.It Xo
-.Fn svcudp_bufcreate "int sock" "u_int sendsize" "u_int recvsize"
-.Xc
-.Pp
-This routine creates a
-.Tn UDP/IP Ns \-based
-.Tn RPC
-service transport, to which it returns a pointer.
-The transport is associated with the socket
-.Fa sock ,
-which may be
-.Dv RPC_ANYSOCK ,
-in which case a new socket is created.
-If the socket is not bound to a local
-.Tn UDP
-port, then this routine binds it to an arbitrary port.
-Upon
-completion,
-.Fa xprt\->xp_fd
-is the transport's socket descriptor, and
-.Fa xprt\->xp_port
-is the transport's port number.
-This routine returns
-.Dv NULL
-if it fails.
-.Pp
-This allows the user to specify the maximum packet size for sending and
-receiving
-.Tn UDP Ns \-based
-.Tn RPC
-messages.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn xdr_accepted_reply "XDR *xdrs" "struct accepted_reply *ar"
-.Xc
-.Pp
-Used for encoding
-.Tn RPC
-reply messages.
-This routine is useful for users who
-wish to generate
-.Tn RPC Ns \-style
-messages without using the
-.Tn RPC
-package.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn xdr_authunix_parms "XDR *xdrs" "struct authunix_parms *aupp"
-.Xc
-.Pp
-Used for describing
-.Ux
-credentials.
-This routine is useful for users
-who wish to generate these credentials without using the
-.Tn RPC
-authentication package.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Ft bool_t
-.Fn xdr_callhdr "XDR *xdrs" "struct rpc_msg *chdr"
-.Xc
-.Pp
-Used for describing
-.Tn RPC
-call header messages.
-This routine is useful for users who wish to generate
-.Tn RPC Ns \-style
-messages without using the
-.Tn RPC
-package.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn xdr_callmsg "XDR *xdrs" "struct rpc_msg *cmsg"
-.Xc
-.Pp
-Used for describing
-.Tn RPC
-call messages.
-This routine is useful for users who wish to generate
-.Tn RPC Ns \-style
-messages without using the
-.Tn RPC
-package.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn xdr_opaque_auth "XDR *xdrs" "struct opaque_auth *ap"
-.Xc
-.Pp
-Used for describing
-.Tn RPC
-authentication information messages.
-This routine is useful for users who wish to generate
-.Tn RPC Ns \-style
-messages without using the
-.Tn RPC
-package.
-.Pp
-.It Xo
-.Vt struct pmap ;
-.Xc
-.It Xo
-.Ft bool_t
-.Fn xdr_pmap "XDR *xdrs" "struct pmap *regs"
-.Xc
-.Pp
-Used for describing arguments to various
-.Xr rpcbind 8
-procedures, externally.
-This routine is useful for users who wish to generate
-these arguments without using the
-.Fn pmap_*
-interface.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn xdr_pmaplist "XDR *xdrs" "struct pmaplist **rp"
-.Xc
-.Pp
-Used for describing a list of port mappings, externally.
-This routine is useful for users who wish to generate
-these arguments without using the
-.Fn pmap_*
-interface.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn xdr_rejected_reply "XDR *xdrs" "struct rejected_reply *rr"
-.Xc
-.Pp
-Used for describing
-.Tn RPC
-reply messages.
-This routine is useful for users who wish to generate
-.Tn RPC Ns \-style
-messages without using the
-.Tn RPC
-package.
-.Pp
-.It Xo
-.Ft bool_t
-.Fn xdr_replymsg "XDR *xdrs" "struct rpc_msg *rmsg"
-.Xc
-.Pp
-Used for describing
-.Tn RPC
-reply messages.
-This routine is useful for users who wish to generate
-.Tn RPC
-style messages without using the
-.Tn RPC
-package.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn xprt_register "SVCXPRT *xprt"
-.Xc
-.Pp
-After
-.Tn RPC
-service transport handles are created,
-they should register themselves with the
-.Tn RPC
-service package.
-This routine modifies the global variable
-.Va svc_fds .
-Service implementors usually do not need this routine.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn xprt_unregister "SVCXPRT *xprt"
-.Xc
-.Pp
-Before an
-.Tn RPC
-service transport handle is destroyed,
-it should unregister itself with the
-.Tn RPC
-service package.
-This routine modifies the global variable
-.Va svc_fds .
-Service implementors usually do not need this routine.
-.El
-.Sh SEE ALSO
-.Xr rpc_secure 3 ,
-.Xr xdr 3
-.Rs
-.%T "Remote Procedure Calls: Protocol Specification"
-.Re
-.Rs
-.%T "Remote Procedure Call Programming Guide"
-.Re
-.Rs
-.%T "rpcgen Programming Guide"
-.Re
-.Rs
-.%T "RPC: Remote Procedure Call Protocol Specification"
-.%O RFC1050
-.%Q "Sun Microsystems, Inc., USC-ISI"
-.Re
diff --git a/lib/libc_bsd/rpc/rpc_soc.c b/lib/libc_bsd/rpc/rpc_soc.c
deleted file mode 100644
index 728429a..0000000
--- a/lib/libc_bsd/rpc/rpc_soc.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/*	$NetBSD: rpc_soc.c,v 1.6 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-/* #ident	"@(#)rpc_soc.c	1.17	94/04/24 SMI" */
-
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- * In addition, portions of such source code were derived from Berkeley
- * 4.3 BSD under license from the Regents of the University of
- * California.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rpc_soc.c 1.41 89/05/02 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpc_soc.c 261046 2014-01-22 23:45:27Z mav $");
-
-#ifdef PORTMAP
-/*
- * rpc_soc.c
- *
- * The backward compatibility routines for the earlier implementation
- * of RPC, where the only transports supported were tcp/ip and udp/ip.
- * Based on berkeley socket abstraction, now implemented on the top
- * of TLI/Streams
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <rpc/pmap_clnt.h>
-#include <rpc/pmap_prot.h>
-#include <rpc/nettype.h>
-#include <syslog.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <errno.h>
-#include <syslog.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-static CLIENT *clnt_com_create(struct sockaddr_in *, rpcprog_t, rpcvers_t,
-    int *, u_int, u_int, char *);
-static SVCXPRT *svc_com_create(int, u_int, u_int, char *);
-static bool_t rpc_wrap_bcast(char *, struct netbuf *, struct netconfig *);
-
-/* XXX */
-#define IN4_LOCALHOST_STRING    "127.0.0.1"
-#define IN6_LOCALHOST_STRING    "::1"
-
-/*
- * A common clnt create routine
- */
-static CLIENT *
-clnt_com_create(raddr, prog, vers, sockp, sendsz, recvsz, tp)
-	struct sockaddr_in *raddr;
-	rpcprog_t prog;
-	rpcvers_t vers;
-	int *sockp;
-	u_int sendsz;
-	u_int recvsz;
-	char *tp;
-{
-	CLIENT *cl;
-	int madefd = FALSE;
-	int fd = *sockp;
-	struct netconfig *nconf;
-	struct netbuf bindaddr;
-
-	mutex_lock(&rpcsoc_lock);
-	if ((nconf = __rpc_getconfip(tp)) == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		mutex_unlock(&rpcsoc_lock);
-		return (NULL);
-	}
-	if (fd == RPC_ANYSOCK) {
-		fd = __rpc_nconf2fd(nconf);
-		if (fd == -1)
-			goto syserror;
-		madefd = TRUE;
-	}
-
-	if (raddr->sin_port == 0) {
-		u_int proto;
-		u_short sport;
-
-		mutex_unlock(&rpcsoc_lock);	/* pmap_getport is recursive */
-		proto = strcmp(tp, "udp") == 0 ? IPPROTO_UDP : IPPROTO_TCP;
-		sport = pmap_getport(raddr, (u_long)prog, (u_long)vers,
-		    proto);
-		if (sport == 0) {
-			goto err;
-		}
-		raddr->sin_port = htons(sport);
-		mutex_lock(&rpcsoc_lock);	/* pmap_getport is recursive */
-	}
-
-	/* Transform sockaddr_in to netbuf */
-	bindaddr.maxlen = bindaddr.len =  sizeof (struct sockaddr_in);
-	bindaddr.buf = raddr;
-
-	bindresvport(fd, NULL);
-	cl = clnt_tli_create(fd, nconf, &bindaddr, prog, vers,
-				sendsz, recvsz);
-	if (cl) {
-		if (madefd == TRUE) {
-			/*
-			 * The fd should be closed while destroying the handle.
-			 */
-			(void) CLNT_CONTROL(cl, CLSET_FD_CLOSE, NULL);
-			*sockp = fd;
-		}
-		(void) freenetconfigent(nconf);
-		mutex_unlock(&rpcsoc_lock);
-		return (cl);
-	}
-	goto err;
-
-syserror:
-	rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-	rpc_createerr.cf_error.re_errno = errno;
-
-err:	if (madefd == TRUE)
-		(void)_close(fd);
-	(void) freenetconfigent(nconf);
-	mutex_unlock(&rpcsoc_lock);
-	return (NULL);
-}
-
-CLIENT *
-clntudp_bufcreate(raddr, prog, vers, wait, sockp, sendsz, recvsz)
-	struct sockaddr_in *raddr;
-	u_long prog;
-	u_long vers;
-	struct timeval wait;
-	int *sockp;
-	u_int sendsz;
-	u_int recvsz;
-{
-	CLIENT *cl;
-
-	cl = clnt_com_create(raddr, (rpcprog_t)prog, (rpcvers_t)vers, sockp,
-	    sendsz, recvsz, "udp");
-	if (cl == NULL) {
-		return (NULL);
-	}
-	(void) CLNT_CONTROL(cl, CLSET_RETRY_TIMEOUT, &wait);
-	return (cl);
-}
-
-CLIENT *
-clntudp_create(raddr, program, version, wait, sockp)
-	struct sockaddr_in *raddr;
-	u_long program;
-	u_long version;
-	struct timeval wait;
-	int *sockp;
-{
-
-	return clntudp_bufcreate(raddr, program, version, wait, sockp,
-					UDPMSGSIZE, UDPMSGSIZE);
-}
-
-CLIENT *
-clnttcp_create(raddr, prog, vers, sockp, sendsz, recvsz)
-	struct sockaddr_in *raddr;
-	u_long prog;
-	u_long vers;
-	int *sockp;
-	u_int sendsz;
-	u_int recvsz;
-{
-
-	return clnt_com_create(raddr, (rpcprog_t)prog, (rpcvers_t)vers, sockp,
-	    sendsz, recvsz, "tcp");
-}
-
-CLIENT *
-clntraw_create(prog, vers)
-	u_long prog;
-	u_long vers;
-{
-
-	return clnt_raw_create((rpcprog_t)prog, (rpcvers_t)vers);
-}
-
-/*
- * A common server create routine
- */
-static SVCXPRT *
-svc_com_create(fd, sendsize, recvsize, netid)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-	char *netid;
-{
-	struct netconfig *nconf;
-	SVCXPRT *svc;
-	int madefd = FALSE;
-	int port;
-	struct sockaddr_in sin;
-
-	if ((nconf = __rpc_getconfip(netid)) == NULL) {
-		(void) syslog(LOG_ERR, "Could not get %s transport", netid);
-		return (NULL);
-	}
-	if (fd == RPC_ANYSOCK) {
-		fd = __rpc_nconf2fd(nconf);
-		if (fd == -1) {
-			(void) freenetconfigent(nconf);
-			(void) syslog(LOG_ERR,
-			"svc%s_create: could not open connection", netid);
-			return (NULL);
-		}
-		madefd = TRUE;
-	}
-
-	memset(&sin, 0, sizeof sin);
-	sin.sin_family = AF_INET;
-	bindresvport(fd, &sin);
-	_listen(fd, SOMAXCONN);
-	svc = svc_tli_create(fd, nconf, NULL, sendsize, recvsize);
-	(void) freenetconfigent(nconf);
-	if (svc == NULL) {
-		if (madefd)
-			(void)_close(fd);
-		return (NULL);
-	}
-	port = (((struct sockaddr_in *)svc->xp_ltaddr.buf)->sin_port);
-	svc->xp_port = ntohs(port);
-	return (svc);
-}
-
-SVCXPRT *
-svctcp_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-
-	return svc_com_create(fd, sendsize, recvsize, "tcp");
-}
-
-SVCXPRT *
-svcudp_bufcreate(fd, sendsz, recvsz)
-	int fd;
-	u_int sendsz, recvsz;
-{
-
-	return svc_com_create(fd, sendsz, recvsz, "udp");
-}
-
-SVCXPRT *
-svcfd_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-
-	return svc_fd_create(fd, sendsize, recvsize);
-}
-
-
-SVCXPRT *
-svcudp_create(fd)
-	int fd;
-{
-
-	return svc_com_create(fd, UDPMSGSIZE, UDPMSGSIZE, "udp");
-}
-
-SVCXPRT *
-svcraw_create()
-{
-
-	return svc_raw_create();
-}
-
-int
-get_myaddress(addr)
-	struct sockaddr_in *addr;
-{
-
-	memset((void *) addr, 0, sizeof(*addr));
-	addr->sin_family = AF_INET;
-	addr->sin_port = htons(PMAPPORT);
-	addr->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-	return (0);
-}
-
-/*
- * For connectionless "udp" transport. Obsoleted by rpc_call().
- */
-int
-callrpc(host, prognum, versnum, procnum, inproc, in, outproc, out)
-	const char *host;
-	int prognum, versnum, procnum;
-	xdrproc_t inproc, outproc;
-	void *in, *out;
-{
-
-	return (int)rpc_call(host, (rpcprog_t)prognum, (rpcvers_t)versnum,
-	    (rpcproc_t)procnum, inproc, in, outproc, out, "udp");
-}
-
-/*
- * For connectionless kind of transport. Obsoleted by rpc_reg()
- */
-int
-registerrpc(prognum, versnum, procnum, progname, inproc, outproc)
-	int prognum, versnum, procnum;
-	char *(*progname)(char [UDPMSGSIZE]);
-	xdrproc_t inproc, outproc;
-{
-
-	return rpc_reg((rpcprog_t)prognum, (rpcvers_t)versnum,
-	    (rpcproc_t)procnum, progname, inproc, outproc, "udp");
-}
-
-/*
- * All the following clnt_broadcast stuff is convulated; it supports
- * the earlier calling style of the callback function
- */
-static thread_key_t	clnt_broadcast_key;
-static resultproc_t	clnt_broadcast_result_main;
-static once_t		clnt_broadcast_once = ONCE_INITIALIZER;
-
-static void
-clnt_broadcast_key_init(void)
-{
-
-	thr_keycreate(&clnt_broadcast_key, free);
-}
-
-/*
- * Need to translate the netbuf address into sockaddr_in address.
- * Dont care about netid here.
- */
-/* ARGSUSED */
-static bool_t
-rpc_wrap_bcast(resultp, addr, nconf)
-	char *resultp;		/* results of the call */
-	struct netbuf *addr;	/* address of the guy who responded */
-	struct netconfig *nconf; /* Netconf of the transport */
-{
-	resultproc_t clnt_broadcast_result;
-
-	if (strcmp(nconf->nc_netid, "udp"))
-		return (FALSE);
-	if (thr_main())
-		clnt_broadcast_result = clnt_broadcast_result_main;
-	else
-		clnt_broadcast_result = (resultproc_t)thr_getspecific(clnt_broadcast_key);
-	return (*clnt_broadcast_result)(resultp,
-				(struct sockaddr_in *)addr->buf);
-}
-
-/*
- * Broadcasts on UDP transport. Obsoleted by rpc_broadcast().
- */
-enum clnt_stat
-clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
-	u_long		prog;		/* program number */
-	u_long		vers;		/* version number */
-	u_long		proc;		/* procedure number */
-	xdrproc_t	xargs;		/* xdr routine for args */
-	void	       *argsp;		/* pointer to args */
-	xdrproc_t	xresults;	/* xdr routine for results */
-	void	       *resultsp;	/* pointer to results */
-	resultproc_t	eachresult;	/* call with each result obtained */
-{
-
-	if (thr_main())
-		clnt_broadcast_result_main = eachresult;
-	else {
-		thr_once(&clnt_broadcast_once, clnt_broadcast_key_init);
-		thr_setspecific(clnt_broadcast_key, (void *) eachresult);
-	}
-	return rpc_broadcast((rpcprog_t)prog, (rpcvers_t)vers,
-	    (rpcproc_t)proc, xargs, argsp, xresults, resultsp,
-	    (resultproc_t) rpc_wrap_bcast, "udp");
-}
-
-/*
- * Create the client des authentication object. Obsoleted by
- * authdes_seccreate().
- */
-AUTH *
-authdes_create(servername, window, syncaddr, ckey)
-	char *servername;		/* network name of server */
-	u_int window;			/* time to live */
-	struct sockaddr *syncaddr;	/* optional hostaddr to sync with */
-	des_block *ckey;		/* optional conversation key to use */
-{
-	AUTH *dummy;
-	AUTH *nauth;
-	char hostname[NI_MAXHOST];
-
-	if (syncaddr) {
-		/*
-		 * Change addr to hostname, because that is the way
-		 * new interface takes it.
-		 */
-		if (getnameinfo(syncaddr, syncaddr->sa_len, hostname,
-		    sizeof hostname, NULL, 0, 0) != 0)
-			goto fallback;
-
-		nauth = authdes_seccreate(servername, window, hostname, ckey);
-		return (nauth);
-	}
-fallback:
-	dummy = authdes_seccreate(servername, window, NULL, ckey);
-	return (dummy);
-}
-
-/*
- * Create a client handle for a unix connection. Obsoleted by clnt_vc_create()
- */
-CLIENT *
-clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz)
-	struct sockaddr_un *raddr;
-	u_long prog;
-	u_long vers;
-	int *sockp;
-	u_int sendsz;
-	u_int recvsz;
-{
-	struct netbuf *svcaddr;
-	struct netconfig *nconf;
-	CLIENT *cl;
-	int len;
-
-	cl = NULL;
-	nconf = NULL;
-	svcaddr = NULL;
-	if ((raddr->sun_len == 0) ||
-	   ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) ||
-	   ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) {
-		if (svcaddr != NULL)
-			free(svcaddr);
-		rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-		rpc_createerr.cf_error.re_errno = errno;
-		return(cl);
-	}
-	if (*sockp < 0) {
-		*sockp = _socket(AF_LOCAL, SOCK_STREAM, 0);
-		len = raddr->sun_len = SUN_LEN(raddr);
-		if ((*sockp < 0) || (_connect(*sockp,
-		    (struct sockaddr *)raddr, len) < 0)) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			rpc_createerr.cf_error.re_errno = errno;
-			if (*sockp != -1)
-				(void)_close(*sockp);
-			goto done;
-		}
-	}
-	svcaddr->buf = raddr;
-	svcaddr->len = raddr->sun_len;
-	svcaddr->maxlen = sizeof (struct sockaddr_un);
-	cl = clnt_vc_create(*sockp, svcaddr, prog,
-	    vers, sendsz, recvsz);
-done:
-	free(svcaddr->buf);
-	free(svcaddr);
-	return(cl);
-}
-
-/*
- * Creates, registers, and returns a (rpc) unix based transporter.
- * Obsoleted by svc_vc_create().
- */
-SVCXPRT *
-svcunix_create(sock, sendsize, recvsize, path)
-	int sock;
-	u_int sendsize;
-	u_int recvsize;
-	char *path;
-{
-	struct netconfig *nconf;
-	void *localhandle;
-	struct sockaddr_un sun;
-	struct sockaddr *sa;
-	struct t_bind taddr;
-	SVCXPRT *xprt;
-	int addrlen;
-
-	xprt = (SVCXPRT *)NULL;
-	localhandle = setnetconfig();
-	while ((nconf = getnetconfig(localhandle)) != NULL) {
-		if (nconf->nc_protofmly != NULL &&
-		    strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
-			break;
-	}
-	if (nconf == NULL)
-		return(xprt);
-
-	if ((sock = __rpc_nconf2fd(nconf)) < 0)
-		goto done;
-
-	memset(&sun, 0, sizeof sun);
-	sun.sun_family = AF_LOCAL;
-	if (strlcpy(sun.sun_path, path, sizeof(sun.sun_path)) >=
-	    sizeof(sun.sun_path))
-		goto done;
-	sun.sun_len = SUN_LEN(&sun);
-	addrlen = sizeof (struct sockaddr_un);
-	sa = (struct sockaddr *)&sun;
-
-	if (_bind(sock, sa, addrlen) < 0)
-		goto done;
-
-	taddr.addr.len = taddr.addr.maxlen = addrlen;
-	taddr.addr.buf = malloc(addrlen);
-	if (taddr.addr.buf == NULL)
-		goto done;
-	memcpy(taddr.addr.buf, sa, addrlen);
-
-	if (nconf->nc_semantics != NC_TPI_CLTS) {
-		if (_listen(sock, SOMAXCONN) < 0) {
-			free(taddr.addr.buf);
-			goto done;
-		}
-	}
-
-	xprt = (SVCXPRT *)svc_tli_create(sock, nconf, &taddr, sendsize, recvsize);
-
-done:
-	endnetconfig(localhandle);
-	return(xprt);
-}
-
-/*
- * Like svunix_create(), except the routine takes any *open* UNIX file
- * descriptor as its first input. Obsoleted by svc_fd_create();
- */
-SVCXPRT *
-svcunixfd_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
- 	return (svc_fd_create(fd, sendsize, recvsize));
-}
-
-#endif /* PORTMAP */
diff --git a/lib/libc_bsd/rpc/rpc_svc_calls.3 b/lib/libc_bsd/rpc/rpc_svc_calls.3
deleted file mode 100644
index 99d68c3..0000000
--- a/lib/libc_bsd/rpc/rpc_svc_calls.3
+++ /dev/null
@@ -1,267 +0,0 @@
-.\" @(#)rpc_svc_calls.3n 1.28 93/05/10 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_svc_calls 1.5 89/07/25 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_svc_calls.3,v 1.1 2000/06/02 23:11:13 fvdl Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_svc_calls.3 152720 2005-11-23 16:44:23Z ru $
-.Dd May 3, 1993
-.Dt RPC_SVC_CALLS 3
-.Os
-.Sh NAME
-.Nm svc_dg_enablecache ,
-.Nm svc_exit ,
-.Nm svc_fdset ,
-.Nm svc_freeargs ,
-.Nm svc_getargs ,
-.Nm svc_getreq_common ,
-.Nm svc_getreq_poll ,
-.Nm svc_getreqset ,
-.Nm svc_getrpccaller ,
-.Nm svc_pollset ,
-.Nm svc_run ,
-.Nm svc_sendreply
-.Nd library routines for RPC servers
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft int
-.Fn svc_dg_enablecache "SVCXPRT *xprt" "const unsigned cache_size"
-.Ft void
-.Fn svc_exit "void"
-.Ft bool_t
-.Fn svc_freeargs "const SVCXPRT *xprt" "const xdrproc_t inproc" "caddr_t in"
-.Ft bool_t
-.Fn svc_getargs "const SVCXPRT *xprt" "const xdrproc_t inproc" "caddr_t in"
-.Ft void
-.Fn svc_getreq_common "const int fd"
-.Ft void
-.Fn svc_getreq_poll "struct pollfd *pfdp" "const int pollretval"
-.Ft void
-.Fn svc_getreqset "fd_set * rdfds"
-.Ft "struct netbuf *"
-.Fn svc_getrpccaller "const SVCXPRT *xprt"
-.Ft "struct cmsgcred *"
-.Fn __svc_getcallercreds "const SVCXPRT *xprt"
-.Vt struct pollfd svc_pollset[FD_SETSIZE];
-.Ft void
-.Fn svc_run "void"
-.Ft bool_t
-.Fn svc_sendreply "SVCXPRT *xprt" "xdrproc_t outproc" "void *out"
-.Sh DESCRIPTION
-These routines are part of the
-RPC
-library which allows C language programs to make procedure
-calls on other machines across the network.
-.Pp
-These routines are associated with the server side of the
-RPC mechanism.
-Some of them are called by the server side dispatch function,
-while others
-(such as
-.Fn svc_run )
-are called when the server is initiated.
-.\" .Pp
-.\" In the current implementation, the service transport handle,
-.\" .Dv SVCXPRT ,
-.\" contains a single data area for decoding arguments and encoding results.
-.\" Therefore, this structure cannot be freely shared between threads that call
-.\" functions that do this.
-.\" Routines on this page that are affected by this
-.\" restriction are marked as unsafe for MT applications.
-.Sh Routines
-See
-.Xr rpc 3
-for the definition of the
-.Vt SVCXPRT
-data structure.
-.Bl -tag -width __svc_getcallercreds()
-.It Fn svc_dg_enablecache
-This function allocates a duplicate request cache for the
-service endpoint
-.Fa xprt ,
-large enough to hold
-.Fa cache_size
-entries.
-Once enabled, there is no way to disable caching.
-This routine returns 0 if space necessary for a cache of the given size
-was successfully allocated, and 1 otherwise.
-.It Fn svc_exit
-This function, when called by any of the RPC server procedure or
-otherwise, causes
-.Fn svc_run
-to return.
-.Pp
-As currently implemented,
-.Fn svc_exit
-zeroes the
-.Va svc_fdset
-global variable.
-If RPC server activity is to be resumed,
-services must be reregistered with the RPC library
-either through one of the
-.Xr rpc_svc_create 3
-functions, or using
-.Fn xprt_register .
-The
-.Fn svc_exit
-function
-has global scope and ends all RPC server activity.
-.It Xo
-.Vt fd_set Va svc_fdset
-.Xc
-A global variable reflecting the
-RPC server's read file descriptor bit mask; it is suitable as an argument
-to the
-.Xr select 2
-system call.
-This is only of interest
-if service implementors do not call
-.Fn svc_run ,
-but rather do their own asynchronous event processing.
-This variable is read-only (do not pass its address to
-.Xr select 2 ! ) ,
-yet it may change after calls to
-.Fn svc_getreqset
-or any creation routines.
-.It Fn svc_freeargs
-A function macro that frees any data allocated by the
-RPC/XDR system when it decoded the arguments to a service procedure
-using
-.Fn svc_getargs .
-This routine returns
-.Dv TRUE
-if the results were successfully
-freed, and
-.Dv FALSE
-otherwise.
-.It Fn svc_getargs
-A function macro that decodes the arguments of an
-RPC request associated with the RPC
-service transport handle
-.Fa xprt .
-The
-.Fa in
-argument
-is the address where the arguments will be placed;
-.Fa inproc
-is the XDR
-routine used to decode the arguments.
-This routine returns
-.Dv TRUE
-if decoding succeeds, and
-.Dv FALSE
-otherwise.
-.It Fn svc_getreq_common
-This routine is called to handle a request on the given
-file descriptor.
-.It Fn svc_getreq_poll
-This routine is only of interest if a service implementor
-does not call
-.Fn svc_run ,
-but instead implements custom asynchronous event processing.
-It is called when
-.Xr poll 2
-has determined that an RPC request has arrived on some RPC
-file descriptors;
-.Fa pollretval
-is the return value from
-.Xr poll 2
-and
-.Fa pfdp
-is the array of
-.Vt pollfd
-structures on which the
-.Xr poll 2
-was done.
-It is assumed to be an array large enough to
-contain the maximal number of descriptors allowed.
-.It Fn svc_getreqset
-This routine is only of interest if a service implementor
-does not call
-.Fn svc_run ,
-but instead implements custom asynchronous event processing.
-It is called when
-.Xr poll 2
-has determined that an RPC
-request has arrived on some RPC file descriptors;
-.Fa rdfds
-is the resultant read file descriptor bit mask.
-The routine returns when all file descriptors
-associated with the value of
-.Fa rdfds
-have been serviced.
-.It Fn svc_getrpccaller
-The approved way of getting the network address of the caller
-of a procedure associated with the
-RPC service transport handle
-.Fa xprt .
-.It Fn __svc_getcallercreds
-.Em Warning :
-this macro is specific to
-.Fx
-and thus not portable.
-This macro returns a pointer to a
-.Vt cmsgcred
-structure, defined in
-.In sys/socket.h ,
-identifying the calling client.
-This only works if the client is
-calling the server over an
-.Dv AF_LOCAL
-socket.
-.It Xo
-.Vt struct pollfd Va svc_pollset[FD_SETSIZE] ;
-.Xc
-.Va svc_pollset
-is an array of
-.Vt pollfd
-structures derived from
-.Va svc_fdset[] .
-It is suitable as an argument to the
-.Xr poll 2
-system call.
-The derivation of
-.Va svc_pollset
-from
-.Va svc_fdset
-is made in the current implementation in
-.Fn svc_run .
-Service implementors who do not call
-.Fn svc_run
-and who wish to use this array must perform this derivation themselves.
-.It Fn svc_run
-This routine never returns.
-It waits for RPC
-requests to arrive, and calls the appropriate service
-procedure using
-.Fn svc_getreq_poll
-when one arrives.
-This procedure is usually waiting for the
-.Xr poll 2
-system call to return.
-.It Fn svc_sendreply
-Called by an RPC service's dispatch routine to send the results of a
-remote procedure call.
-The
-.Fa xprt
-argument
-is the request's associated transport handle;
-.Fa outproc
-is the XDR
-routine which is used to encode the results; and
-.Fa out
-is the address of the results.
-This routine returns
-.Dv TRUE
-if it succeeds,
-.Dv FALSE
-otherwise.
-.El
-.Sh SEE ALSO
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr rpc 3 ,
-.Xr rpc_svc_create 3 ,
-.Xr rpc_svc_err 3 ,
-.Xr rpc_svc_reg 3
diff --git a/lib/libc_bsd/rpc/rpc_svc_create.3 b/lib/libc_bsd/rpc/rpc_svc_create.3
deleted file mode 100644
index 712f81d..0000000
--- a/lib/libc_bsd/rpc/rpc_svc_create.3
+++ /dev/null
@@ -1,337 +0,0 @@
-.\" @(#)rpc_svc_create.3n 1.26 93/08/26 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_svc_create 1.3 89/06/28 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_svc_create.3 119893 2003-09-08 19:57:22Z ru $
-.Dd May 3, 1993
-.Dt RPC_SVC_CREATE 3
-.Os
-.Sh NAME
-.Nm rpc_svc_create ,
-.Nm svc_control ,
-.Nm svc_create ,
-.Nm svc_destroy ,
-.Nm svc_dg_create ,
-.Nm svc_fd_create ,
-.Nm svc_raw_create ,
-.Nm svc_tli_create ,
-.Nm svc_tp_create ,
-.Nm svc_vc_create
-.Nd library routines for the creation of server handles
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft bool_t
-.Fn svc_control "SVCXPRT *svc" "const u_int req" "void *info"
-.Ft int
-.Fn svc_create "void (*dispatch)(struct svc_req *, SVCXPRT *)" "const rpcprog_t prognum" "const rpcvers_t versnum" "const char *nettype"
-.Ft SVCXPRT *
-.Fn svc_dg_create "const int fildes" "const u_int sendsz" "const u_int recvsz"
-.Ft void
-.Fn svc_destroy "SVCXPRT *xprt"
-.Ft "SVCXPRT *"
-.Fn svc_fd_create "const int fildes" "const u_int sendsz" "const u_int recvsz"
-.Ft "SVCXPRT *"
-.Fn svc_raw_create "void"
-.Ft "SVCXPRT *"
-.Fn svc_tli_create "const int fildes" "const struct netconfig *netconf" "const struct t_bind *bindaddr" "const u_int sendsz" "const u_int recvsz"
-.Ft "SVCXPRT *"
-.Fn svc_tp_create "void (*dispatch)(struct svc_req *, SVCXPRT *)" "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf"
-.Ft "SVCXPRT *"
-.Fn svc_vc_create "const int fildes" "const u_int sendsz" "const u_int recvsz"
-.Sh DESCRIPTION
-These routines are part of the RPC
-library which allows C language programs to make procedure
-calls on servers across the network.
-These routines deal with the creation of service handles.
-Once the handle is created, the server can be invoked by calling
-.Fn svc_run .
-.Sh Routines
-See
-.Xr rpc 3
-for the definition of the
-.Vt SVCXPRT
-data structure.
-.Bl -tag -width XXXXX
-.It Fn svc_control
-A function to change or retrieve various information
-about a service object.
-The
-.Fa req
-argument
-indicates the type of operation and
-.Fa info
-is a pointer to the information.
-The supported values of
-.Fa req ,
-their argument types, and what they do are:
-.Bl -tag -width SVCGET_XID
-.It Dv SVCGET_VERSQUIET
-If a request is received for a program number
-served by this server but the version number
-is outside the range registered with the server,
-an
-.Dv RPC_PROGVERSMISMATCH
-error will normally
-be returned.
-The
-.Fa info
-argument
-should be a pointer to an
-integer.
-Upon successful completion of the
-.Dv SVCGET_VERSQUIET
-request,
-.Fa *info
-contains an
-integer which describes the server's current
-behavior: 0 indicates normal server behavior
-(that is, an
-.Dv RPC_PROGVERSMISMATCH
-error
-will be returned); 1 indicates that the out of
-range request will be silently ignored.
-.It Dv SVCSET_VERSQUIET
-If a request is received for a program number
-served by this server but the version number
-is outside the range registered with the server,
-an
-.Dv RPC_PROGVERSMISMATCH
-error will normally
-be returned.
-It is sometimes desirable to
-change this behavior.
-The
-.Fa info
-argument
-should be a
-pointer to an integer which is either 0
-(indicating normal server behavior - an
-.Dv RPC_PROGVERSMISMATCH
-error will be returned),
-or 1 (indicating that the out of range request
-should be silently ignored).
-.El
-.It Fn svc_create
-The
-.Fn svc_create
-function
-creates server handles for all the transports
-belonging to the class
-.Fa nettype .
-The
-.Fa nettype
-argument
-defines a class of transports which can be used
-for a particular application.
-The transports are tried in left to right order in
-.Ev NETPATH
-variable or in top to bottom order in the netconfig database.
-If
-.Fa nettype
-is
-.Dv NULL ,
-it defaults to
-.Qq netpath .
-.Pp
-The
-.Fn svc_create
-function
-registers itself with the rpcbind
-service (see
-.Xr rpcbind 8 ) .
-The
-.Fa dispatch
-function
-is called when there is a remote procedure call for the given
-.Fa prognum
-and
-.Fa versnum ;
-this requires calling
-.Fn svc_run
-(see
-.Fn svc_run
-in
-.Xr rpc_svc_reg 3 ) .
-If
-.Fn svc_create
-succeeds, it returns the number of server
-handles it created,
-otherwise it returns 0 and an error message is logged.
-.It Fn svc_destroy
-A function macro that destroys the RPC
-service handle
-.Fa xprt .
-Destruction usually involves deallocation
-of private data structures,
-including
-.Fa xprt
-itself.
-Use of
-.Fa xprt
-is undefined after calling this routine.
-.It Fn svc_dg_create
-This routine creates a connectionless RPC
-service handle, and returns a pointer to it.
-This routine returns
-.Dv NULL
-if it fails, and an error message is logged.
-The
-.Fa sendsz
-and
-.Fa recvsz
-arguments
-are arguments used to specify the size of the buffers.
-If they are 0, suitable defaults are chosen.
-The file descriptor
-.Fa fildes
-should be open and bound.
-The server is not registered with
-.Xr rpcbind 8 .
-.Pp
-Warning:
-since connectionless-based RPC
-messages can only hold limited amount of encoded data,
-this transport cannot be used for procedures
-that take large arguments or return huge results.
-.It Fn svc_fd_create
-This routine creates a service on top of an open and bound file descriptor,
-and returns the handle to it.
-Typically, this descriptor is a connected file descriptor for a
-connection-oriented transport.
-The
-.Fa sendsz
-and
-.Fa recvsz
-arguments
-indicate sizes for the send and receive buffers.
-If they are 0, reasonable defaults are chosen.
-This routine returns
-.Dv NULL
-if it fails, and an error message is logged.
-.It Fn svc_raw_create
-This routine creates an RPC
-service handle and returns a pointer to it.
-The transport is really a buffer within the process's
-address space, so the corresponding RPC
-client should live in the same address space;
-(see
-.Fn clnt_raw_create
-in
-.Xr rpc_clnt_create 3 ) .
-This routine allows simulation of RPC and acquisition of
-RPC overheads (such as round trip times),
-without any kernel and networking interference.
-This routine returns
-.Dv NULL
-if it fails, and an error message is logged.
-.Pp
-Note:
-.Fn svc_run
-should not be called when the raw interface is being used.
-.It Fn svc_tli_create
-This routine creates an RPC
-server handle, and returns a pointer to it.
-The
-.Fa fildes
-argument
-is the file descriptor on which the service is listening.
-If
-.Fa fildes
-is
-.Dv RPC_ANYFD ,
-it opens a file descriptor on the transport specified by
-.Fa netconf .
-If the file descriptor is unbound and
-.Fa bindaddr
-is not
-.Dv NULL ,
-.Fa fildes
-is bound to the address specified by
-.Fa bindaddr ,
-otherwise
-.Fa fildes
-is bound to a default address chosen by the transport.
-.Pp
-Note: the
-.Vt t_bind
-structure comes from the TLI/XTI SysV interface, which
-.Nx
-does not use.
-The structure is defined in
-.In rpc/types.h
-for compatibility as:
-.Bd -literal
-struct t_bind {
-    struct netbuf addr;	/* network address, see rpc(3) */
-    unsigned int  qlen;	/* queue length (for listen(2)) */
-};
-.Ed
-.Pp
-In the case where the default address is chosen,
-the number of outstanding connect requests is set to 8
-for connection-oriented transports.
-The user may specify the size of the send and receive buffers
-with the arguments
-.Fa sendsz
-and
-.Fa recvsz ;
-values of 0 choose suitable defaults.
-This routine returns
-.Dv NULL
-if it fails,
-and an error message is logged.
-The server is not registered with the
-.Xr rpcbind 8
-service.
-.It Fn svc_tp_create
-The
-.Fn svc_tp_create
-function
-creates a server handle for the network
-specified by
-.Fa netconf ,
-and registers itself with the rpcbind service.
-The
-.Fa dispatch
-function
-is called when there is a remote procedure call
-for the given
-.Fa prognum
-and
-.Fa versnum ;
-this requires calling
-.Fn svc_run .
-The
-.Fn svc_tp_create
-function
-returns the service handle if it succeeds,
-otherwise a
-.Dv NULL
-is returned and an error message is logged.
-.It Fn svc_vc_create
-This routine creates a connection-oriented RPC
-service and returns a pointer to it.
-This routine returns
-.Dv NULL
-if it fails, and an error message is logged.
-The users may specify the size of the send and receive buffers
-with the arguments
-.Fa sendsz
-and
-.Fa recvsz ;
-values of 0 choose suitable defaults.
-The file descriptor
-.Fa fildes
-should be open and bound.
-The server is not registered with the
-.Xr rpcbind 8
-service.
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpc_svc_err 3 ,
-.Xr rpc_svc_reg 3 ,
-.Xr rpcbind 8
diff --git a/lib/libc_bsd/rpc/rpc_svc_err.3 b/lib/libc_bsd/rpc/rpc_svc_err.3
deleted file mode 100644
index 4f3ed31..0000000
--- a/lib/libc_bsd/rpc/rpc_svc_err.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" @(#)rpc_svc_err.3n 1.23 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_svc_err 1.4 89/06/28 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_svc_err.3,v 1.1 2000/06/02 23:11:14 fvdl Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_svc_err.3 141580 2005-02-09 18:07:17Z ru $
-.Dd May 3, 1993
-.Dt RPC_SVC_ERR 3
-.Os
-.Sh NAME
-.Nm rpc_svc_err ,
-.Nm svcerr_auth ,
-.Nm svcerr_decode ,
-.Nm svcerr_noproc ,
-.Nm svcerr_noprog ,
-.Nm svcerr_progvers ,
-.Nm svcerr_systemerr ,
-.Nm svcerr_weakauth
-.Nd library routines for server side remote procedure call errors
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft void
-.Fn svcerr_auth "SVCXPRT *xprt" "enum auth_stat why"
-.Ft void
-.Fn svcerr_decode "SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_noproc "SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_noprog "SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_progvers "SVCXPRT *xprt" "rpcvers_t low_vers" "rpcvers_t high_vers"
-.Ft void
-.Fn svcerr_systemerr "SVCXPRT *xprt"
-.Ft void
-.Fn svcerr_weakauth "SVCXPRT *xprt"
-.Sh DESCRIPTION
-These routines are part of the RPC
-library which allows C language programs to make procedure
-calls on other machines across the network.
-.Pp
-These routines can be called by the server side
-dispatch function if there is any error in the
-transaction with the client.
-.Sh Routines
-See
-.Xr rpc 3
-for the definition of the
-.Vt SVCXPRT
-data structure.
-.Bl -tag -width XXXXX
-.It Fn svcerr_auth
-Called by a service dispatch routine that refuses to perform
-a remote procedure call due to an authentication error.
-.It Fn svcerr_decode
-Called by a service dispatch routine that cannot successfully
-decode the remote arguments
-(see
-.Fn svc_getargs
-in
-.Xr rpc_svc_reg 3 ) .
-.It Fn svcerr_noproc
-Called by a service dispatch routine that does not implement
-the procedure number that the caller requests.
-.It Fn svcerr_noprog
-Called when the desired program is not registered with the
-RPC package.
-Service implementors usually do not need this routine.
-.It Fn svcerr_progvers
-Called when the desired version of a program is not registered with the
-RPC package.
-The
-.Fa low_vers
-argument
-is the lowest version number,
-and
-.Fa high_vers
-is the highest version number.
-Service implementors usually do not need this routine.
-.It Fn svcerr_systemerr
-Called by a service dispatch routine when it detects a system
-error not covered by any particular protocol.
-For example, if a service can no longer allocate storage,
-it may call this routine.
-.It Fn svcerr_weakauth
-Called by a service dispatch routine that refuses to perform
-a remote procedure call due to insufficient (but correct)
-authentication arguments.
-The routine calls
-.Fn svcerr_auth "xprt" "AUTH_TOOWEAK" .
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpc_svc_create 3 ,
-.Xr rpc_svc_reg 3
diff --git a/lib/libc_bsd/rpc/rpc_svc_reg.3 b/lib/libc_bsd/rpc/rpc_svc_reg.3
deleted file mode 100644
index a684b2e..0000000
--- a/lib/libc_bsd/rpc/rpc_svc_reg.3
+++ /dev/null
@@ -1,183 +0,0 @@
-.\" @(#)rpc_svc_reg.3n 1.32 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_svc_call 1.6 89/07/20 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\"	$NetBSD: rpc_svc_reg.3,v 1.1 2000/06/02 23:11:14 fvdl Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_svc_reg.3 141580 2005-02-09 18:07:17Z ru $
-.Dd May 3, 1993
-.Dt RPC_SVC_REG 3
-.Os
-.Sh NAME
-.Nm rpc_svc_reg ,
-.Nm rpc_reg ,
-.Nm svc_reg ,
-.Nm svc_unreg ,
-.Nm svc_auth_reg ,
-.Nm xprt_register ,
-.Nm xprt_unregister
-.Nd library routines for registering servers
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft int
-.Fn rpc_reg "rpcprog_t prognum" "rpcvers_t versnum" "rpcproc_t procnum" "char *(*procname)()" "xdrproc_t inproc" "xdrproc_t outproc" "char *nettype"
-.Ft bool_t
-.Fn svc_reg "SVCXPRT *xprt" "const rpcprog_t prognum" "const rpcvers_t versnum" "void (*dispatch)(struct svc_req *, SVCXPRT *)" "const struct netconfig *netconf"
-.Ft void
-.Fn svc_unreg "const rpcprog_t prognum" "const rpcvers_t versnum"
-.Ft int
-.Fn svc_auth_reg "int cred_flavor" "enum auth_stat (*handler)(struct svc_req *, struct rpc_msg *)"
-.Ft void
-.Fn xprt_register "SVCXPRT *xprt"
-.Ft void
-.Fn xprt_unregister "SVCXPRT *xprt"
-.Sh DESCRIPTION
-These routines are a part of the RPC
-library which allows the RPC
-servers to register themselves with rpcbind
-(see
-.Xr rpcbind 8 ) ,
-and associate the given program and version
-number with the dispatch function.
-When the RPC server receives a RPC request, the library invokes the
-dispatch routine with the appropriate arguments.
-.Sh Routines
-See
-.Xr rpc 3
-for the definition of the
-.Vt SVCXPRT
-data structure.
-.Bl -tag -width XXXXX
-.It Fn rpc_reg
-Register program
-.Fa prognum ,
-procedure
-.Fa procname ,
-and version
-.Fa versnum
-with the RPC
-service package.
-If a request arrives for program
-.Fa prognum ,
-version
-.Fa versnum ,
-and procedure
-.Fa procnum ,
-.Fa procname
-is called with a pointer to its argument(s);
-.Fa procname
-should return a pointer to its static result(s);
-.Fa inproc
-is the XDR function used to decode the arguments while
-.Fa outproc
-is the XDR function used to encode the results.
-Procedures are registered on all available transports of the class
-.Fa nettype .
-See
-.Xr rpc 3 .
-This routine returns 0 if the registration succeeded,
-\-1 otherwise.
-.It Fn svc_reg
-Associates
-.Fa prognum
-and
-.Fa versnum
-with the service dispatch procedure,
-.Fa dispatch .
-If
-.Fa netconf
-is
-.Dv NULL ,
-the service is not registered with the
-.Xr rpcbind 8
-service.
-If
-.Fa netconf
-is non-zero,
-then a mapping of the triple
-.Bq Fa prognum , versnum , netconf->nc_netid
-to
-.Fa xprt->xp_ltaddr
-is established with the local rpcbind
-service.
-.Pp
-The
-.Fn svc_reg
-routine returns 1 if it succeeds,
-and 0 otherwise.
-.It Fn svc_unreg
-Remove from the rpcbind
-service, all mappings of the triple
-.Bq Fa prognum , versnum , No all-transports
-to network address
-and all mappings within the RPC service package
-of the double
-.Bq Fa prognum , versnum
-to dispatch routines.
-.It Fn svc_auth_reg
-Registers the service authentication routine
-.Fa handler
-with the dispatch mechanism so that it can be
-invoked to authenticate RPC requests received
-with authentication type
-.Fa cred_flavor .
-This interface allows developers to add new authentication
-types to their RPC applications without needing to modify
-the libraries.
-Service implementors usually do not need this routine.
-.Pp
-Typical service application would call
-.Fn svc_auth_reg
-after registering the service and prior to calling
-.Fn svc_run .
-When needed to process an RPC credential of type
-.Fa cred_flavor ,
-the
-.Fa handler
-procedure will be called with two arguments,
-.Fa "struct svc_req *rqst"
-and
-.Fa "struct rpc_msg *msg" ,
-and is expected to return a valid
-.Vt "enum auth_stat"
-value.
-There is no provision to change or delete an authentication handler
-once registered.
-.Pp
-The
-.Fn svc_auth_reg
-routine returns 0 if the registration is successful,
-1 if
-.Fa cred_flavor
-already has an authentication handler registered for it,
-and \-1 otherwise.
-.It Fn xprt_register
-After RPC service transport handle
-.Fa xprt
-is created, it is registered with the RPC
-service package.
-This routine modifies the global variable
-.Va svc_fdset
-(see
-.Xr rpc_svc_calls 3 ) .
-Service implementors usually do not need this routine.
-.It Fn xprt_unregister
-Before an RPC service transport handle
-.Fa xprt
-is destroyed, it unregisters itself with the
-RPC service package.
-This routine modifies the global variable
-.Va svc_fdset
-(see
-.Xr rpc_svc_calls 3 ) .
-Service implementors usually do not need this routine.
-.El
-.Sh SEE ALSO
-.Xr select 2 ,
-.Xr rpc 3 ,
-.Xr rpcbind 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpc_svc_create 3 ,
-.Xr rpc_svc_err 3 ,
-.Xr rpcbind 8
diff --git a/lib/libc_bsd/rpc/rpc_xdr.3 b/lib/libc_bsd/rpc/rpc_xdr.3
deleted file mode 100644
index 9ab5661..0000000
--- a/lib/libc_bsd/rpc/rpc_xdr.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" @(#)rpc_xdr.3n 1.24 93/08/31 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" @(#)rpc_xdr.new 1.1 89/04/06 SMI;
-.\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpc_xdr.3 141580 2005-02-09 18:07:17Z ru $
-.Dd May 3, 1993
-.Dt RPC_XDR 3
-.Os
-.Sh NAME
-.Nm xdr_accepted_reply ,
-.Nm xdr_authsys_parms ,
-.Nm xdr_callhdr ,
-.Nm xdr_callmsg ,
-.Nm xdr_opaque_auth ,
-.Nm xdr_rejected_reply ,
-.Nm xdr_replymsg
-.Nd XDR library routines for remote procedure calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft bool_t
-.Fn xdr_accepted_reply "XDR *xdrs" "struct accepted_reply *ar"
-.Ft bool_t
-.Fn xdr_authsys_parms "XDR *xdrs" "struct authsys_parms *aupp"
-.Ft bool_t
-.Fn xdr_callhdr "XDR *xdrs" "struct rpc_msg *chdr"
-.Ft bool_t
-.Fn xdr_callmsg "XDR *xdrs" "struct rpc_msg *cmsg"
-.Ft bool_t
-.Fn xdr_opaque_auth "XDR *xdrs" "struct opaque_auth *ap"
-.Ft bool_t
-.Fn xdr_rejected_reply "XDR *xdrs" "struct rejected_reply *rr"
-.Ft bool_t
-.Fn xdr_replymsg "XDR *xdrs" "struct rpc_msg *rmsg"
-.Sh DESCRIPTION
-These routines are used for describing the
-RPC messages in XDR language.
-They should normally be used by those who do not
-want to use the RPC
-package directly.
-These routines return
-.Dv TRUE
-if they succeed,
-.Dv FALSE
-otherwise.
-.Sh Routines
-See
-.Xr rpc 3
-for the definition of the
-.Vt XDR
-data structure.
-.Bl -tag -width XXXXX
-.It Fn xdr_accepted_reply
-Used to translate between RPC
-reply messages and their external representation.
-It includes the status of the RPC
-call in the XDR language format.
-In the case of success, it also includes the call results.
-.It Fn xdr_authsys_parms
-Used for describing
-.Ux
-operating system credentials.
-It includes machine-name, uid, gid list, etc.
-.It Fn xdr_callhdr
-Used for describing
-RPC
-call header messages.
-It encodes the static part of the call message header in the
-XDR language format.
-It includes information such as transaction
-ID, RPC version number, program and version number.
-.It Fn xdr_callmsg
-Used for describing
-RPC call messages.
-This includes all the RPC
-call information such as transaction
-ID, RPC version number, program number, version number,
-authentication information, etc.
-This is normally used by servers to determine information about the client
-RPC call.
-.It Fn xdr_opaque_auth
-Used for describing RPC
-opaque authentication information messages.
-.It Fn xdr_rejected_reply
-Used for describing RPC reply messages.
-It encodes the rejected RPC message in the XDR language format.
-The message could be rejected either because of version
-number mis-match or because of authentication errors.
-.It Fn xdr_replymsg
-Used for describing RPC
-reply messages.
-It translates between the
-RPC reply message and its external representation.
-This reply could be either an acceptance,
-rejection or
-.Dv NULL .
-.El
-.Sh SEE ALSO
-.Xr rpc 3 ,
-.Xr xdr 3
diff --git a/lib/libc_bsd/rpc/rpcb_clnt.c b/lib/libc_bsd/rpc/rpcb_clnt.c
deleted file mode 100644
index ed90af0..0000000
--- a/lib/libc_bsd/rpc/rpcb_clnt.c
+++ /dev/null
@@ -1,1340 +0,0 @@
-/*	$NetBSD: rpcb_clnt.c,v 1.6 2000/07/16 06:41:43 itojun Exp $	*/
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-/* #ident	"@(#)rpcb_clnt.c	1.27	94/04/24 SMI" */
-
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rpcb_clnt.c 1.30 89/06/21 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpcb_clnt.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * rpcb_clnt.c
- * interface to rpcbind rpc service.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/utsname.h>
-#include <rpc/rpc.h>
-#include <rpc/rpcb_prot.h>
-#include <rpc/nettype.h>
-#include <netconfig.h>
-#ifdef PORTMAP
-#include <netinet/in.h>		/* FOR IPPROTO_TCP/UDP definitions */
-#include <rpc/pmap_prot.h>
-#endif				/* PORTMAP */
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <netdb.h>
-#include <syslog.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-static struct timeval tottimeout = { 60, 0 };
-static const struct timeval rmttimeout = { 3, 0 };
-static struct timeval rpcbrmttime = { 15, 0 };
-
-extern bool_t xdr_wrapstring(XDR *, char **);
-
-static const char nullstring[] = "\000";
-
-#define	CACHESIZE 6
-
-struct address_cache {
-	char *ac_host;
-	char *ac_netid;
-	char *ac_uaddr;
-	struct netbuf *ac_taddr;
-	struct address_cache *ac_next;
-};
-
-static struct address_cache *front;
-static int cachesize;
-
-#define	CLCR_GET_RPCB_TIMEOUT	1
-#define	CLCR_SET_RPCB_TIMEOUT	2
-
-
-extern int __rpc_lowvers;
-
-static struct address_cache *check_cache(const char *, const char *);
-static void delete_cache(struct netbuf *);
-static void add_cache(const char *, const char *, struct netbuf *, char *);
-static CLIENT *getclnthandle(const char *, const struct netconfig *, char **);
-static CLIENT *local_rpcb(void);
-static struct netbuf *got_entry(rpcb_entry_list_ptr, const struct netconfig *);
-
-/*
- * This routine adjusts the timeout used for calls to the remote rpcbind.
- * Also, this routine can be used to set the use of portmapper version 2
- * only when doing rpc_broadcasts
- * These are private routines that may not be provided in future releases.
- */
-bool_t
-__rpc_control(request, info)
-	int	request;
-	void	*info;
-{
-	switch (request) {
-	case CLCR_GET_RPCB_TIMEOUT:
-		*(struct timeval *)info = tottimeout;
-		break;
-	case CLCR_SET_RPCB_TIMEOUT:
-		tottimeout = *(struct timeval *)info;
-		break;
-	case CLCR_SET_LOWVERS:
-		__rpc_lowvers = *(int *)info;
-		break;
-	case CLCR_GET_LOWVERS:
-		*(int *)info = __rpc_lowvers;
-		break;
-	default:
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- *	It might seem that a reader/writer lock would be more reasonable here.
- *	However because getclnthandle(), the only user of the cache functions,
- *	may do a delete_cache() operation if a check_cache() fails to return an
- *	address useful to clnt_tli_create(), we may as well use a mutex.
- */
-/*
- * As it turns out, if the cache lock is *not* a reader/writer lock, we will
- * block all clnt_create's if we are trying to connect to a host that's down,
- * since the lock will be held all during that time.
- */
-
-/*
- * The routines check_cache(), add_cache(), delete_cache() manage the
- * cache of rpcbind addresses for (host, netid).
- */
-
-static struct address_cache *
-check_cache(host, netid)
-	const char *host, *netid;
-{
-	struct address_cache *cptr;
-
-	/* READ LOCK HELD ON ENTRY: rpcbaddr_cache_lock */
-
-	for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
-		if (!strcmp(cptr->ac_host, host) &&
-		    !strcmp(cptr->ac_netid, netid)) {
-#ifdef ND_DEBUG
-			fprintf(stderr, "Found cache entry for %s: %s\n",
-				host, netid);
-#endif
-			return (cptr);
-		}
-	}
-	return ((struct address_cache *) NULL);
-}
-
-static void
-delete_cache(addr)
-	struct netbuf *addr;
-{
-	struct address_cache *cptr, *prevptr = NULL;
-
-	/* WRITE LOCK HELD ON ENTRY: rpcbaddr_cache_lock */
-	for (cptr = front; cptr != NULL; cptr = cptr->ac_next) {
-		if (!memcmp(cptr->ac_taddr->buf, addr->buf, addr->len)) {
-			free(cptr->ac_host);
-			free(cptr->ac_netid);
-			free(cptr->ac_taddr->buf);
-			free(cptr->ac_taddr);
-			if (cptr->ac_uaddr)
-				free(cptr->ac_uaddr);
-			if (prevptr)
-				prevptr->ac_next = cptr->ac_next;
-			else
-				front = cptr->ac_next;
-			free(cptr);
-			cachesize--;
-			break;
-		}
-		prevptr = cptr;
-	}
-}
-
-static void
-add_cache(host, netid, taddr, uaddr)
-	const char *host, *netid;
-	char *uaddr;
-	struct netbuf *taddr;
-{
-	struct address_cache  *ad_cache, *cptr, *prevptr;
-
-	ad_cache = (struct address_cache *)
-			malloc(sizeof (struct address_cache));
-	if (!ad_cache) {
-		return;
-	}
-	ad_cache->ac_host = strdup(host);
-	ad_cache->ac_netid = strdup(netid);
-	ad_cache->ac_uaddr = uaddr ? strdup(uaddr) : NULL;
-	ad_cache->ac_taddr = (struct netbuf *)malloc(sizeof (struct netbuf));
-	if (!ad_cache->ac_host || !ad_cache->ac_netid || !ad_cache->ac_taddr ||
-		(uaddr && !ad_cache->ac_uaddr)) {
-		goto out;
-	}
-	ad_cache->ac_taddr->len = ad_cache->ac_taddr->maxlen = taddr->len;
-	ad_cache->ac_taddr->buf = (char *) malloc(taddr->len);
-	if (ad_cache->ac_taddr->buf == NULL) {
-out:
-		if (ad_cache->ac_host)
-			free(ad_cache->ac_host);
-		if (ad_cache->ac_netid)
-			free(ad_cache->ac_netid);
-		if (ad_cache->ac_uaddr)
-			free(ad_cache->ac_uaddr);
-		if (ad_cache->ac_taddr)
-			free(ad_cache->ac_taddr);
-		free(ad_cache);
-		return;
-	}
-	memcpy(ad_cache->ac_taddr->buf, taddr->buf, taddr->len);
-#ifdef ND_DEBUG
-	fprintf(stderr, "Added to cache: %s : %s\n", host, netid);
-#endif
-
-/* VARIABLES PROTECTED BY rpcbaddr_cache_lock:  cptr */
-
-	rwlock_wrlock(&rpcbaddr_cache_lock);
-	if (cachesize < CACHESIZE) {
-		ad_cache->ac_next = front;
-		front = ad_cache;
-		cachesize++;
-	} else {
-		/* Free the last entry */
-		cptr = front;
-		prevptr = NULL;
-		while (cptr->ac_next) {
-			prevptr = cptr;
-			cptr = cptr->ac_next;
-		}
-
-#ifdef ND_DEBUG
-		fprintf(stderr, "Deleted from cache: %s : %s\n",
-			cptr->ac_host, cptr->ac_netid);
-#endif
-		free(cptr->ac_host);
-		free(cptr->ac_netid);
-		free(cptr->ac_taddr->buf);
-		free(cptr->ac_taddr);
-		if (cptr->ac_uaddr)
-			free(cptr->ac_uaddr);
-
-		if (prevptr) {
-			prevptr->ac_next = NULL;
-			ad_cache->ac_next = front;
-			front = ad_cache;
-		} else {
-			front = ad_cache;
-			ad_cache->ac_next = NULL;
-		}
-		free(cptr);
-	}
-	rwlock_unlock(&rpcbaddr_cache_lock);
-}
-
-/*
- * This routine will return a client handle that is connected to the
- * rpcbind. If targaddr is non-NULL, the "universal address" of the
- * host will be stored in *targaddr; the caller is responsible for
- * freeing this string.
- * On error, returns NULL and free's everything.
- */
-static CLIENT *
-getclnthandle(host, nconf, targaddr)
-	const char *host;
-	const struct netconfig *nconf;
-	char **targaddr;
-{
-	CLIENT *client;
-	struct netbuf *addr, taddr;
-	struct netbuf addr_to_delete;
-	struct __rpc_sockinfo si;
-	struct addrinfo hints, *res, *tres;
-	struct address_cache *ad_cache;
-	char *tmpaddr;
-
-/* VARIABLES PROTECTED BY rpcbaddr_cache_lock:  ad_cache */
-
-	/* Get the address of the rpcbind.  Check cache first */
-	client = NULL;
-	addr_to_delete.len = 0;
-	rwlock_rdlock(&rpcbaddr_cache_lock);
-	ad_cache = NULL;
-	if (host != NULL)
-		ad_cache = check_cache(host, nconf->nc_netid);
-	if (ad_cache != NULL) {
-		addr = ad_cache->ac_taddr;
-		client = clnt_tli_create(RPC_ANYFD, nconf, addr,
-		    (rpcprog_t)RPCBPROG, (rpcvers_t)RPCBVERS4, 0, 0);
-		if (client != NULL) {
-			if (targaddr)
-				*targaddr = strdup(ad_cache->ac_uaddr);
-			rwlock_unlock(&rpcbaddr_cache_lock);
-			return (client);
-		}
-		addr_to_delete.len = addr->len;
-		addr_to_delete.buf = (char *)malloc(addr->len);
-		if (addr_to_delete.buf == NULL) {
-			addr_to_delete.len = 0;
-		} else {
-			memcpy(addr_to_delete.buf, addr->buf, addr->len);
-		}
-	}
-	rwlock_unlock(&rpcbaddr_cache_lock);
-	if (addr_to_delete.len != 0) {
-		/*
-		 * Assume this may be due to cache data being
-		 *  outdated
-		 */
-		rwlock_wrlock(&rpcbaddr_cache_lock);
-		delete_cache(&addr_to_delete);
-		rwlock_unlock(&rpcbaddr_cache_lock);
-		free(addr_to_delete.buf);
-	}
-	if (!__rpc_nconf2sockinfo(nconf, &si)) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return NULL;
-	}
-
-	memset(&hints, 0, sizeof hints);
-	hints.ai_family = si.si_af;
-	hints.ai_socktype = si.si_socktype;
-	hints.ai_protocol = si.si_proto;
-
-#ifdef CLNT_DEBUG
-	printf("trying netid %s family %d proto %d socktype %d\n",
-	    nconf->nc_netid, si.si_af, si.si_proto, si.si_socktype);
-#endif
-
-	if (nconf->nc_protofmly != NULL && strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0) {
-		client = local_rpcb();
-		if (! client) {
-#ifdef ND_DEBUG
-			clnt_pcreateerror("rpcbind clnt interface");
-#endif
-			return (NULL);
-		} else {
-			struct sockaddr_un sun;
-			if (targaddr) {
-			    *targaddr = malloc(sizeof(sun.sun_path));
-			    if (*targaddr == NULL) {
-				CLNT_DESTROY(client);
-				return (NULL);
-			    }
-			    strncpy(*targaddr, _PATH_RPCBINDSOCK,
-				sizeof(sun.sun_path));
-			}
-			return (client);
-		}
-	} else {
-		if (getaddrinfo(host, "sunrpc", &hints, &res) != 0) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNHOST;
-			return NULL;
-		}
-	}
-
-	for (tres = res; tres != NULL; tres = tres->ai_next) {
-		taddr.buf = tres->ai_addr;
-		taddr.len = taddr.maxlen = tres->ai_addrlen;
-
-#ifdef ND_DEBUG
-		{
-			char *ua;
-
-			ua = taddr2uaddr(nconf, &taddr);
-			fprintf(stderr, "Got it [%s]\n", ua);
-			free(ua);
-		}
-#endif
-
-#ifdef ND_DEBUG
-		{
-			int i;
-
-			fprintf(stderr, "\tnetbuf len = %d, maxlen = %d\n",
-				taddr.len, taddr.maxlen);
-			fprintf(stderr, "\tAddress is ");
-			for (i = 0; i < taddr.len; i++)
-				fprintf(stderr, "%u.", ((char *)(taddr.buf))[i]);
-			fprintf(stderr, "\n");
-		}
-#endif
-		client = clnt_tli_create(RPC_ANYFD, nconf, &taddr,
-		    (rpcprog_t)RPCBPROG, (rpcvers_t)RPCBVERS4, 0, 0);
-#ifdef ND_DEBUG
-		if (! client) {
-			clnt_pcreateerror("rpcbind clnt interface");
-		}
-#endif
-
-		if (client) {
-			tmpaddr = targaddr ? taddr2uaddr(nconf, &taddr) : NULL;
-			add_cache(host, nconf->nc_netid, &taddr, tmpaddr);
-			if (targaddr)
-				*targaddr = tmpaddr;
-			break;
-		}
-	}
-	if (res)
-		freeaddrinfo(res);
-	return (client);
-}
-
-/* XXX */
-#define IN4_LOCALHOST_STRING	"127.0.0.1"
-#define IN6_LOCALHOST_STRING	"::1"
-
-/*
- * This routine will return a client handle that is connected to the local
- * rpcbind. Returns NULL on error and free's everything.
- */
-static CLIENT *
-local_rpcb()
-{
-	CLIENT *client;
-	static struct netconfig *loopnconf;
-	static char *hostname;
-	int sock;
-	size_t tsize;
-	struct netbuf nbuf;
-	struct sockaddr_un sun;
-
-	/*
-	 * Try connecting to the local rpcbind through a local socket
-	 * first. If this doesn't work, try all transports defined in
-	 * the netconfig file.
-	 */
-	memset(&sun, 0, sizeof sun);
-	sock = _socket(AF_LOCAL, SOCK_STREAM, 0);
-	if (sock < 0)
-		goto try_nconf;
-	sun.sun_family = AF_LOCAL;
-	strcpy(sun.sun_path, _PATH_RPCBINDSOCK);
-	nbuf.len = sun.sun_len = SUN_LEN(&sun);
-	nbuf.maxlen = sizeof (struct sockaddr_un);
-	nbuf.buf = &sun;
-
-	tsize = __rpc_get_t_size(AF_LOCAL, 0, 0);
-	client = clnt_vc_create(sock, &nbuf, (rpcprog_t)RPCBPROG,
-	    (rpcvers_t)RPCBVERS, tsize, tsize);
-
-	if (client != NULL) {
-		/* Mark the socket to be closed in destructor */
-		(void) CLNT_CONTROL(client, CLSET_FD_CLOSE, NULL);
-		return client;
-	}
-
-	/* Nobody needs this socket anymore; free the descriptor. */
-	_close(sock);
-
-try_nconf:
-
-/* VARIABLES PROTECTED BY loopnconf_lock: loopnconf */
-	mutex_lock(&loopnconf_lock);
-	if (loopnconf == NULL) {
-		struct netconfig *nconf, *tmpnconf = NULL;
-		void *nc_handle;
-		int fd;
-
-		nc_handle = setnetconfig();
-		if (nc_handle == NULL) {
-			/* fails to open netconfig file */
-			syslog (LOG_ERR, "rpc: failed to open " NETCONFIG);
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			mutex_unlock(&loopnconf_lock);
-			return (NULL);
-		}
-		while ((nconf = getnetconfig(nc_handle)) != NULL) {
-#ifdef INET6
-			if ((strcmp(nconf->nc_protofmly, NC_INET6) == 0 ||
-#else
-			if ((
-#endif
-			     strcmp(nconf->nc_protofmly, NC_INET) == 0) &&
-			    (nconf->nc_semantics == NC_TPI_COTS ||
-			     nconf->nc_semantics == NC_TPI_COTS_ORD)) {
-				fd = __rpc_nconf2fd(nconf);
-				/*
-				 * Can't create a socket, assume that
-				 * this family isn't configured in the kernel.
-				 */
-				if (fd < 0)
-					continue;
-				_close(fd);
-				tmpnconf = nconf;
-				if (!strcmp(nconf->nc_protofmly, NC_INET))
-					hostname = IN4_LOCALHOST_STRING;
-				else
-					hostname = IN6_LOCALHOST_STRING;
-			}
-		}
-		if (tmpnconf == NULL) {
-			rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			mutex_unlock(&loopnconf_lock);
-			return (NULL);
-		}
-		loopnconf = getnetconfigent(tmpnconf->nc_netid);
-		/* loopnconf is never freed */
-		endnetconfig(nc_handle);
-	}
-	mutex_unlock(&loopnconf_lock);
-	client = getclnthandle(hostname, loopnconf, NULL);
-	return (client);
-}
-
-/*
- * Set a mapping between program, version and address.
- * Calls the rpcbind service to do the mapping.
- */
-bool_t
-rpcb_set(program, version, nconf, address)
-	rpcprog_t program;
-	rpcvers_t version;
-	const struct netconfig *nconf;	/* Network structure of transport */
-	const struct netbuf *address;		/* Services netconfig address */
-{
-	CLIENT *client;
-	bool_t rslt = FALSE;
-	RPCB parms;
-	char uidbuf[32];
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (FALSE);
-	}
-	if (address == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (FALSE);
-	}
-	client = local_rpcb();
-	if (! client) {
-		return (FALSE);
-	}
-
-	/* convert to universal */
-	/*LINTED const castaway*/
-	parms.r_addr = taddr2uaddr((struct netconfig *) nconf,
-				   (struct netbuf *)address);
-	if (!parms.r_addr) {
-		CLNT_DESTROY(client);
-		rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;
-		return (FALSE); /* no universal address */
-	}
-	parms.r_prog = program;
-	parms.r_vers = version;
-	parms.r_netid = nconf->nc_netid;
-	/*
-	 * Though uid is not being used directly, we still send it for
-	 * completeness.  For non-unix platforms, perhaps some other
-	 * string or an empty string can be sent.
-	 */
-	(void) snprintf(uidbuf, sizeof uidbuf, "%d", geteuid());
-	parms.r_owner = uidbuf;
-
-	CLNT_CALL(client, (rpcproc_t)RPCBPROC_SET, (xdrproc_t) xdr_rpcb,
-	    (char *)(void *)&parms, (xdrproc_t) xdr_bool,
-	    (char *)(void *)&rslt, tottimeout);
-
-	CLNT_DESTROY(client);
-	free(parms.r_addr);
-	return (rslt);
-}
-
-/*
- * Remove the mapping between program, version and netbuf address.
- * Calls the rpcbind service to do the un-mapping.
- * If netbuf is NULL, unset for all the transports, otherwise unset
- * only for the given transport.
- */
-bool_t
-rpcb_unset(program, version, nconf)
-	rpcprog_t program;
-	rpcvers_t version;
-	const struct netconfig *nconf;
-{
-	CLIENT *client;
-	bool_t rslt = FALSE;
-	RPCB parms;
-	char uidbuf[32];
-
-	client = local_rpcb();
-	if (! client) {
-		return (FALSE);
-	}
-
-	parms.r_prog = program;
-	parms.r_vers = version;
-	if (nconf)
-		parms.r_netid = nconf->nc_netid;
-	else {
-		/*LINTED const castaway*/
-		parms.r_netid = (char *) &nullstring[0]; /* unsets  all */
-	}
-	/*LINTED const castaway*/
-	parms.r_addr = (char *) &nullstring[0];
-	(void) snprintf(uidbuf, sizeof uidbuf, "%d", geteuid());
-	parms.r_owner = uidbuf;
-
-	CLNT_CALL(client, (rpcproc_t)RPCBPROC_UNSET, (xdrproc_t) xdr_rpcb,
-	    (char *)(void *)&parms, (xdrproc_t) xdr_bool,
-	    (char *)(void *)&rslt, tottimeout);
-
-	CLNT_DESTROY(client);
-	return (rslt);
-}
-
-/*
- * From the merged list, find the appropriate entry
- */
-static struct netbuf *
-got_entry(relp, nconf)
-	rpcb_entry_list_ptr relp;
-	const struct netconfig *nconf;
-{
-	struct netbuf *na = NULL;
-	rpcb_entry_list_ptr sp;
-	rpcb_entry *rmap;
-
-	for (sp = relp; sp != NULL; sp = sp->rpcb_entry_next) {
-		rmap = &sp->rpcb_entry_map;
-		if ((strcmp(nconf->nc_proto, rmap->r_nc_proto) == 0) &&
-		    (strcmp(nconf->nc_protofmly, rmap->r_nc_protofmly) == 0) &&
-		    (nconf->nc_semantics == rmap->r_nc_semantics) &&
-		    (rmap->r_maddr != NULL) && (rmap->r_maddr[0] != 0)) {
-			na = uaddr2taddr(nconf, rmap->r_maddr);
-#ifdef ND_DEBUG
-			fprintf(stderr, "\tRemote address is [%s].\n",
-				rmap->r_maddr);
-			if (!na)
-				fprintf(stderr,
-				    "\tCouldn't resolve remote address!\n");
-#endif
-			break;
-		}
-	}
-	return (na);
-}
-
-/*
- * Quick check to see if rpcbind is up.  Tries to connect over
- * local transport.
- */
-static bool_t
-__rpcbind_is_up()
-{
-	struct netconfig *nconf;
-	struct sockaddr_un sun;
-	void *localhandle;
-	int sock;
-
-	nconf = NULL;
-	localhandle = setnetconfig();
-	while ((nconf = getnetconfig(localhandle)) != NULL) {
-		if (nconf->nc_protofmly != NULL &&
-		    strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0)
-			 break;
-	}
-	if (nconf == NULL)
-		return (FALSE);
-
-	endnetconfig(localhandle);
-
-	memset(&sun, 0, sizeof sun);
-	sock = _socket(AF_LOCAL, SOCK_STREAM, 0);
-	if (sock < 0)
-		return (FALSE);
-	sun.sun_family = AF_LOCAL;
-	strncpy(sun.sun_path, _PATH_RPCBINDSOCK, sizeof(sun.sun_path));
-	sun.sun_len = SUN_LEN(&sun);
-
-	if (_connect(sock, (struct sockaddr *)&sun, sun.sun_len) < 0) {
-		_close(sock);
-		return (FALSE);
-	}
-
-	_close(sock);
-	return (TRUE);
-}
-
-/*
- * An internal function which optimizes rpcb_getaddr function.  It also
- * returns the client handle that it uses to contact the remote rpcbind.
- *
- * The algorithm used: If the transports is TCP or UDP, it first tries
- * version 2 (portmap), 4 and then 3 (svr4).  This order should be
- * changed in the next OS release to 4, 2 and 3.  We are assuming that by
- * that time, version 4 would be available on many machines on the network.
- * With this algorithm, we get performance as well as a plan for
- * obsoleting version 2.
- *
- * For all other transports, the algorithm remains as 4 and then 3.
- *
- * XXX: Due to some problems with t_connect(), we do not reuse the same client
- * handle for COTS cases and hence in these cases we do not return the
- * client handle.  This code will change if t_connect() ever
- * starts working properly.  Also look under clnt_vc.c.
- */
-struct netbuf *
-__rpcb_findaddr_timed(program, version, nconf, host, clpp, tp)
-	rpcprog_t program;
-	rpcvers_t version;
-	const struct netconfig *nconf;
-	const char *host;
-	CLIENT **clpp;
-	struct timeval *tp;
-{
-	static bool_t check_rpcbind = TRUE;
-	CLIENT *client = NULL;
-	RPCB parms;
-	enum clnt_stat clnt_st;
-	char *ua = NULL;
-	rpcvers_t vers;
-	struct netbuf *address = NULL;
-	rpcvers_t start_vers = RPCBVERS4;
-	struct netbuf servaddr;
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-
-	parms.r_addr = NULL;
-
-	/*
-	 * Use default total timeout if no timeout is specified.
-	 */
-	if (tp == NULL)
-		tp = &tottimeout;
-
-#ifdef PORTMAP
-	/* Try version 2 for TCP or UDP */
-	if (strcmp(nconf->nc_protofmly, NC_INET) == 0) {
-		u_short port = 0;
-		struct netbuf remote;
-		rpcvers_t pmapvers = 2;
-		struct pmap pmapparms;
-
-		/*
-		 * Try UDP only - there are some portmappers out
-		 * there that use UDP only.
-		 */
-		if (strcmp(nconf->nc_proto, NC_TCP) == 0) {
-			struct netconfig *newnconf;
-
-			if ((newnconf = getnetconfigent("udp")) == NULL) {
-				rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-				return (NULL);
-			}
-			client = getclnthandle(host, newnconf, &parms.r_addr);
-			freenetconfigent(newnconf);
-		} else {
-			client = getclnthandle(host, nconf, &parms.r_addr);
-		}
-		if (client == NULL)
-			return (NULL);
-
-		/*
-		 * Set version and retry timeout.
-		 */
-		CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *)&rpcbrmttime);
-		CLNT_CONTROL(client, CLSET_VERS, (char *)&pmapvers);
-
-		pmapparms.pm_prog = program;
-		pmapparms.pm_vers = version;
-		pmapparms.pm_prot = strcmp(nconf->nc_proto, NC_TCP) ?
-					IPPROTO_UDP : IPPROTO_TCP;
-		pmapparms.pm_port = 0;	/* not needed */
-		clnt_st = CLNT_CALL(client, (rpcproc_t)PMAPPROC_GETPORT,
-		    (xdrproc_t) xdr_pmap, (caddr_t)(void *)&pmapparms,
-		    (xdrproc_t) xdr_u_short, (caddr_t)(void *)&port,
-		    *tp);
-		if (clnt_st != RPC_SUCCESS) {
-			if ((clnt_st == RPC_PROGVERSMISMATCH) ||
-				(clnt_st == RPC_PROGUNAVAIL))
-				goto try_rpcbind; /* Try different versions */
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			goto error;
-		} else if (port == 0) {
-			address = NULL;
-			rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-			goto error;
-		}
-		port = htons(port);
-		CLNT_CONTROL(client, CLGET_SVC_ADDR, (char *)&remote);
-		if (((address = (struct netbuf *)
-			malloc(sizeof (struct netbuf))) == NULL) ||
-		    ((address->buf = (char *)
-			malloc(remote.len)) == NULL)) {
-			rpc_createerr.cf_stat = RPC_SYSTEMERROR;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			if (address) {
-				free(address);
-				address = NULL;
-			}
-			goto error;
-		}
-		memcpy(address->buf, remote.buf, remote.len);
-		memcpy(&((char *)address->buf)[sizeof (short)],
-				(char *)(void *)&port, sizeof (short));
-		address->len = address->maxlen = remote.len;
-		goto done;
-	}
-#endif				/* PORTMAP */
-
-try_rpcbind:
-	/*
-	 * Check if rpcbind is up.  This prevents needless delays when
-	 * accessing applications such as the keyserver while booting
-	 * disklessly.
-	 */
-	if (check_rpcbind && strcmp(nconf->nc_protofmly, NC_LOOPBACK) == 0) {
-		if (!__rpcbind_is_up()) {
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			rpc_createerr.cf_error.re_errno = 0;
-			goto error;
-		}
-		check_rpcbind = FALSE;
-	}
-
-	/*
-	 * Now we try version 4 and then 3.
-	 * We also send the remote system the address we used to
-	 * contact it in case it can help to connect back with us
-	 */
-	parms.r_prog = program;
-	parms.r_vers = version;
-	/*LINTED const castaway*/
-	parms.r_owner = (char *) &nullstring[0];	/* not needed; */
-							/* just for xdring */
-	parms.r_netid = nconf->nc_netid; /* not really needed */
-
-	/*
-	 * If a COTS transport is being used, try getting address via CLTS
-	 * transport.  This works only with version 4.
-	 */
-	if (nconf->nc_semantics == NC_TPI_COTS_ORD ||
-			nconf->nc_semantics == NC_TPI_COTS) {
-
-		void *handle;
-		struct netconfig *nconf_clts;
-		rpcb_entry_list_ptr relp = NULL;
-
-		if (client == NULL) {
-			/* This did not go through the above PORTMAP/TCP code */
-			if ((handle = __rpc_setconf("datagram_v")) != NULL) {
-				while ((nconf_clts = __rpc_getconf(handle))
-					!= NULL) {
-					if (strcmp(nconf_clts->nc_protofmly,
-						nconf->nc_protofmly) != 0) {
-						continue;
-					}
-					client = getclnthandle(host, nconf_clts,
-							&parms.r_addr);
-					break;
-				}
-				__rpc_endconf(handle);
-			}
-			if (client == NULL)
-				goto regular_rpcbind;	/* Go the regular way */
-		} else {
-			/* This is a UDP PORTMAP handle.  Change to version 4 */
-			vers = RPCBVERS4;
-			CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-		}
-		/*
-		 * We also send the remote system the address we used to
-		 * contact it in case it can help it connect back with us
-		 */
-		if (parms.r_addr == NULL) {
-			/*LINTED const castaway*/
-			parms.r_addr = (char *) &nullstring[0]; /* for XDRing */
-		}
-
-		CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *)&rpcbrmttime);
-
-		clnt_st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETADDRLIST,
-		    (xdrproc_t) xdr_rpcb, (char *)(void *)&parms,
-		    (xdrproc_t) xdr_rpcb_entry_list_ptr,
-		    (char *)(void *)&relp, *tp);
-		if (clnt_st == RPC_SUCCESS) {
-			if ((address = got_entry(relp, nconf)) != NULL) {
-				xdr_free((xdrproc_t) xdr_rpcb_entry_list_ptr,
-				    (char *)(void *)&relp);
-				CLNT_CONTROL(client, CLGET_SVC_ADDR,
-					(char *)(void *)&servaddr);
-				__rpc_fixup_addr(address, &servaddr);
-				goto done;
-			}
-			/* Entry not found for this transport */
-			xdr_free((xdrproc_t) xdr_rpcb_entry_list_ptr,
-			    (char *)(void *)&relp);
-			/*
-			 * XXX: should have perhaps returned with error but
-			 * since the remote machine might not always be able
-			 * to send the address on all transports, we try the
-			 * regular way with regular_rpcbind
-			 */
-			goto regular_rpcbind;
-		} else if ((clnt_st == RPC_PROGVERSMISMATCH) ||
-			(clnt_st == RPC_PROGUNAVAIL)) {
-			start_vers = RPCBVERS;	/* Try version 3 now */
-			goto regular_rpcbind; /* Try different versions */
-		} else {
-			rpc_createerr.cf_stat = RPC_PMAPFAILURE;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			goto error;
-		}
-	}
-
-regular_rpcbind:
-
-	/* Now the same transport is to be used to get the address */
-	if (client && ((nconf->nc_semantics == NC_TPI_COTS_ORD) ||
-			(nconf->nc_semantics == NC_TPI_COTS))) {
-		/* A CLTS type of client - destroy it */
-		CLNT_DESTROY(client);
-		client = NULL;
-	}
-
-	if (client == NULL) {
-		client = getclnthandle(host, nconf, &parms.r_addr);
-		if (client == NULL) {
-			goto error;
-		}
-	}
-	if (parms.r_addr == NULL) {
-		/*LINTED const castaway*/
-		parms.r_addr = (char *) &nullstring[0];
-	}
-
-	/* First try from start_vers and then version 3 (RPCBVERS) */
-
-	CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *) &rpcbrmttime);
-	for (vers = start_vers;  vers >= RPCBVERS; vers--) {
-		/* Set the version */
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-		clnt_st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETADDR,
-		    (xdrproc_t) xdr_rpcb, (char *)(void *)&parms,
-		    (xdrproc_t) xdr_wrapstring, (char *)(void *) &ua, *tp);
-		if (clnt_st == RPC_SUCCESS) {
-			if ((ua == NULL) || (ua[0] == 0)) {
-				/* address unknown */
-				rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
-				goto error;
-			}
-			address = uaddr2taddr(nconf, ua);
-#ifdef ND_DEBUG
-			fprintf(stderr, "\tRemote address is [%s]\n", ua);
-			if (!address)
-				fprintf(stderr,
-					"\tCouldn't resolve remote address!\n");
-#endif
-			xdr_free((xdrproc_t)xdr_wrapstring,
-			    (char *)(void *)&ua);
-
-			if (! address) {
-				/* We don't know about your universal address */
-				rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;
-				goto error;
-			}
-			CLNT_CONTROL(client, CLGET_SVC_ADDR,
-			    (char *)(void *)&servaddr);
-			__rpc_fixup_addr(address, &servaddr);
-			goto done;
-		} else if (clnt_st == RPC_PROGVERSMISMATCH) {
-			struct rpc_err rpcerr;
-
-			clnt_geterr(client, &rpcerr);
-			if (rpcerr.re_vers.low > RPCBVERS4)
-				goto error;  /* a new version, can't handle */
-		} else if (clnt_st != RPC_PROGUNAVAIL) {
-			/* Cant handle this error */
-			rpc_createerr.cf_stat = clnt_st;
-			clnt_geterr(client, &rpc_createerr.cf_error);
-			goto error;
-		}
-	}
-
-error:
-	if (client) {
-		CLNT_DESTROY(client);
-		client = NULL;
-	}
-done:
-	if (nconf->nc_semantics != NC_TPI_CLTS) {
-		/* This client is the connectionless one */
-		if (client) {
-			CLNT_DESTROY(client);
-			client = NULL;
-		}
-	}
-	if (clpp) {
-		*clpp = client;
-	} else if (client) {
-		CLNT_DESTROY(client);
-	}
-	if (parms.r_addr != NULL && parms.r_addr != nullstring)
-		free(parms.r_addr);
-	return (address);
-}
-
-
-/*
- * Find the mapped address for program, version.
- * Calls the rpcbind service remotely to do the lookup.
- * Uses the transport specified in nconf.
- * Returns FALSE (0) if no map exists, else returns 1.
- *
- * Assuming that the address is all properly allocated
- */
-int
-rpcb_getaddr(program, version, nconf, address, host)
-	rpcprog_t program;
-	rpcvers_t version;
-	const struct netconfig *nconf;
-	struct netbuf *address;
-	const char *host;
-{
-	struct netbuf *na;
-
-	if ((na = __rpcb_findaddr_timed(program, version,
-	    (struct netconfig *) nconf, (char *) host,
-	    (CLIENT **) NULL, (struct timeval *) NULL)) == NULL)
-		return (FALSE);
-
-	if (na->len > address->maxlen) {
-		/* Too long address */
-		free(na->buf);
-		free(na);
-		rpc_createerr.cf_stat = RPC_FAILED;
-		return (FALSE);
-	}
-	memcpy(address->buf, na->buf, (size_t)na->len);
-	address->len = na->len;
-	free(na->buf);
-	free(na);
-	return (TRUE);
-}
-
-/*
- * Get a copy of the current maps.
- * Calls the rpcbind service remotely to get the maps.
- *
- * It returns only a list of the services
- * It returns NULL on failure.
- */
-rpcblist *
-rpcb_getmaps(nconf, host)
-	const struct netconfig *nconf;
-	const char *host;
-{
-	rpcblist_ptr head = NULL;
-	CLIENT *client;
-	enum clnt_stat clnt_st;
-	rpcvers_t vers = 0;
-
-	client = getclnthandle(host, nconf, NULL);
-	if (client == NULL) {
-		return (head);
-	}
-	clnt_st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_DUMP,
-	    (xdrproc_t) xdr_void, NULL, (xdrproc_t) xdr_rpcblist_ptr,
-	    (char *)(void *)&head, tottimeout);
-	if (clnt_st == RPC_SUCCESS)
-		goto done;
-
-	if ((clnt_st != RPC_PROGVERSMISMATCH) &&
-	    (clnt_st != RPC_PROGUNAVAIL)) {
-		rpc_createerr.cf_stat = RPC_RPCBFAILURE;
-		clnt_geterr(client, &rpc_createerr.cf_error);
-		goto done;
-	}
-
-	/* fall back to earlier version */
-	CLNT_CONTROL(client, CLGET_VERS, (char *)(void *)&vers);
-	if (vers == RPCBVERS4) {
-		vers = RPCBVERS;
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-		if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_DUMP,
-		    (xdrproc_t) xdr_void, NULL, (xdrproc_t) xdr_rpcblist_ptr,
-		    (char *)(void *)&head, tottimeout) == RPC_SUCCESS)
-			goto done;
-	}
-	rpc_createerr.cf_stat = RPC_RPCBFAILURE;
-	clnt_geterr(client, &rpc_createerr.cf_error);
-
-done:
-	CLNT_DESTROY(client);
-	return (head);
-}
-
-/*
- * rpcbinder remote-call-service interface.
- * This routine is used to call the rpcbind remote call service
- * which will look up a service program in the address maps, and then
- * remotely call that routine with the given parameters. This allows
- * programs to do a lookup and call in one step.
-*/
-enum clnt_stat
-rpcb_rmtcall(nconf, host, prog, vers, proc, xdrargs, argsp,
-		xdrres, resp, tout, addr_ptr)
-	const struct netconfig *nconf;	/* Netconfig structure */
-	const char *host;			/* Remote host name */
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;			/* Remote proc identifiers */
-	xdrproc_t xdrargs, xdrres;	/* XDR routines */
-	caddr_t argsp, resp;		/* Argument and Result */
-	struct timeval tout;		/* Timeout value for this call */
-	const struct netbuf *addr_ptr;	/* Preallocated netbuf address */
-{
-	CLIENT *client;
-	enum clnt_stat stat;
-	struct r_rpcb_rmtcallargs a;
-	struct r_rpcb_rmtcallres r;
-	rpcvers_t rpcb_vers;
-
-	stat = 0;
-	client = getclnthandle(host, nconf, NULL);
-	if (client == NULL) {
-		return (RPC_FAILED);
-	}
-	/*LINTED const castaway*/
-	CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *)(void *)&rmttimeout);
-	a.prog = prog;
-	a.vers = vers;
-	a.proc = proc;
-	a.args.args_val = argsp;
-	a.xdr_args = xdrargs;
-	r.addr = NULL;
-	r.results.results_val = resp;
-	r.xdr_res = xdrres;
-
-	for (rpcb_vers = RPCBVERS4; rpcb_vers >= RPCBVERS; rpcb_vers--) {
-		CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&rpcb_vers);
-		stat = CLNT_CALL(client, (rpcproc_t)RPCBPROC_CALLIT,
-		    (xdrproc_t) xdr_rpcb_rmtcallargs, (char *)(void *)&a,
-		    (xdrproc_t) xdr_rpcb_rmtcallres, (char *)(void *)&r, tout);
-		if ((stat == RPC_SUCCESS) && (addr_ptr != NULL)) {
-			struct netbuf *na;
-			/*LINTED const castaway*/
-			na = uaddr2taddr((struct netconfig *) nconf, r.addr);
-			if (!na) {
-				stat = RPC_N2AXLATEFAILURE;
-				/*LINTED const castaway*/
-				((struct netbuf *) addr_ptr)->len = 0;
-				goto error;
-			}
-			if (na->len > addr_ptr->maxlen) {
-				/* Too long address */
-				stat = RPC_FAILED; /* XXX A better error no */
-				free(na->buf);
-				free(na);
-				/*LINTED const castaway*/
-				((struct netbuf *) addr_ptr)->len = 0;
-				goto error;
-			}
-			memcpy(addr_ptr->buf, na->buf, (size_t)na->len);
-			/*LINTED const castaway*/
-			((struct netbuf *)addr_ptr)->len = na->len;
-			free(na->buf);
-			free(na);
-			break;
-		} else if ((stat != RPC_PROGVERSMISMATCH) &&
-			    (stat != RPC_PROGUNAVAIL)) {
-			goto error;
-		}
-	}
-error:
-	CLNT_DESTROY(client);
-	if (r.addr)
-		xdr_free((xdrproc_t) xdr_wrapstring, (char *)(void *)&r.addr);
-	return (stat);
-}
-
-/*
- * Gets the time on the remote host.
- * Returns 1 if succeeds else 0.
- */
-bool_t
-rpcb_gettime(host, timep)
-	const char *host;
-	time_t *timep;
-{
-	CLIENT *client = NULL;
-	void *handle;
-	struct netconfig *nconf;
-	rpcvers_t vers;
-	enum clnt_stat st;
-
-
-	if ((host == NULL) || (host[0] == 0)) {
-		time(timep);
-		return (TRUE);
-	}
-
-	if ((handle = __rpc_setconf("netpath")) == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (FALSE);
-	}
-	rpc_createerr.cf_stat = RPC_SUCCESS;
-	while (client == NULL) {
-		if ((nconf = __rpc_getconf(handle)) == NULL) {
-			if (rpc_createerr.cf_stat == RPC_SUCCESS)
-				rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-			break;
-		}
-		client = getclnthandle(host, nconf, NULL);
-		if (client)
-			break;
-	}
-	__rpc_endconf(handle);
-	if (client == (CLIENT *) NULL) {
-		return (FALSE);
-	}
-
-	st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETTIME,
-		(xdrproc_t) xdr_void, NULL,
-		(xdrproc_t) xdr_int, (char *)(void *)timep, tottimeout);
-
-	if ((st == RPC_PROGVERSMISMATCH) || (st == RPC_PROGUNAVAIL)) {
-		CLNT_CONTROL(client, CLGET_VERS, (char *)(void *)&vers);
-		if (vers == RPCBVERS4) {
-			/* fall back to earlier version */
-			vers = RPCBVERS;
-			CLNT_CONTROL(client, CLSET_VERS, (char *)(void *)&vers);
-			st = CLNT_CALL(client, (rpcproc_t)RPCBPROC_GETTIME,
-				(xdrproc_t) xdr_void, NULL,
-				(xdrproc_t) xdr_int, (char *)(void *)timep,
-				tottimeout);
-		}
-	}
-	CLNT_DESTROY(client);
-	return (st == RPC_SUCCESS? TRUE: FALSE);
-}
-
-/*
- * Converts taddr to universal address.  This routine should never
- * really be called because local n2a libraries are always provided.
- */
-char *
-rpcb_taddr2uaddr(nconf, taddr)
-	struct netconfig *nconf;
-	struct netbuf *taddr;
-{
-	CLIENT *client;
-	char *uaddr = NULL;
-
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-	if (taddr == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (NULL);
-	}
-	client = local_rpcb();
-	if (! client) {
-		return (NULL);
-	}
-
-	CLNT_CALL(client, (rpcproc_t)RPCBPROC_TADDR2UADDR,
-	    (xdrproc_t) xdr_netbuf, (char *)(void *)taddr,
-	    (xdrproc_t) xdr_wrapstring, (char *)(void *)&uaddr, tottimeout);
-	CLNT_DESTROY(client);
-	return (uaddr);
-}
-
-/*
- * Converts universal address to netbuf.  This routine should never
- * really be called because local n2a libraries are always provided.
- */
-struct netbuf *
-rpcb_uaddr2taddr(nconf, uaddr)
-	struct netconfig *nconf;
-	char *uaddr;
-{
-	CLIENT *client;
-	struct netbuf *taddr;
-
-
-	/* parameter checking */
-	if (nconf == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNPROTO;
-		return (NULL);
-	}
-	if (uaddr == NULL) {
-		rpc_createerr.cf_stat = RPC_UNKNOWNADDR;
-		return (NULL);
-	}
-	client = local_rpcb();
-	if (! client) {
-		return (NULL);
-	}
-
-	taddr = (struct netbuf *)calloc(1, sizeof (struct netbuf));
-	if (taddr == NULL) {
-		CLNT_DESTROY(client);
-		return (NULL);
-	}
-	if (CLNT_CALL(client, (rpcproc_t)RPCBPROC_UADDR2TADDR,
-	    (xdrproc_t) xdr_wrapstring, (char *)(void *)&uaddr,
-	    (xdrproc_t) xdr_netbuf, (char *)(void *)taddr,
-	    tottimeout) != RPC_SUCCESS) {
-		free(taddr);
-		taddr = NULL;
-	}
-	CLNT_DESTROY(client);
-	return (taddr);
-}
diff --git a/lib/libc_bsd/rpc/rpcb_prot.c b/lib/libc_bsd/rpc/rpcb_prot.c
deleted file mode 100644
index dbc1eee..0000000
--- a/lib/libc_bsd/rpc/rpcb_prot.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/*	$NetBSD: rpcb_prot.c,v 1.3 2000/07/14 08:40:42 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)rpcb_prot.c	1.13	94/04/24 SMI" */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rpcb_prot.c 1.9 89/04/21 Copyr 1984 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpcb_prot.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * rpcb_prot.c
- * XDR routines for the rpcbinder version 3.
- *
- * Copyright (C) 1984, 1988, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <rpc/rpc.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/rpcb_prot.h>
-#include "un-namespace.h"
-
-bool_t
-xdr_rpcb(xdrs, objp)
-	XDR *xdrs;
-	RPCB *objp;
-{
-	if (!xdr_uint32_t(xdrs, &objp->r_prog)) {
-		return (FALSE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->r_vers)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_addr, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_owner, (u_int)~0)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- * rpcblist_ptr implements a linked list.  The RPCL definition from
- * rpcb_prot.x is:
- *
- * struct rpcblist {
- * 	rpcb		rpcb_map;
- *	struct rpcblist *rpcb_next;
- * };
- * typedef rpcblist *rpcblist_ptr;
- *
- * Recall that "pointers" in XDR are encoded as a boolean, indicating whether
- * there's any data behind the pointer, followed by the data (if any exists).
- * The boolean can be interpreted as ``more data follows me''; if FALSE then
- * nothing follows the boolean; if TRUE then the boolean is followed by an
- * actual struct rpcb, and another rpcblist_ptr (declared in RPCL as "struct
- * rpcblist *").
- *
- * This could be implemented via the xdr_pointer type, though this would
- * result in one recursive call per element in the list.  Rather than do that
- * we can ``unwind'' the recursion into a while loop and use xdr_reference to
- * serialize the rpcb elements.
- */
-
-bool_t
-xdr_rpcblist_ptr(xdrs, rp)
-	XDR *xdrs;
-	rpcblist_ptr *rp;
-{
-	/*
-	 * more_elements is pre-computed in case the direction is
-	 * XDR_ENCODE or XDR_FREE.  more_elements is overwritten by
-	 * xdr_bool when the direction is XDR_DECODE.
-	 */
-	bool_t more_elements;
-	int freeing = (xdrs->x_op == XDR_FREE);
-	rpcblist_ptr next;
-	rpcblist_ptr next_copy;
-
-	next = NULL;
-	for (;;) {
-		more_elements = (bool_t)(*rp != NULL);
-		if (! xdr_bool(xdrs, &more_elements)) {
-			return (FALSE);
-		}
-		if (! more_elements) {
-			return (TRUE);  /* we are done */
-		}
-		/*
-		 * the unfortunate side effect of non-recursion is that in
-		 * the case of freeing we must remember the next object
-		 * before we free the current object ...
-		 */
-		if (freeing && *rp)
-			next = (*rp)->rpcb_next;
-		if (! xdr_reference(xdrs, (caddr_t *)rp,
-		    (u_int)sizeof (rpcblist), (xdrproc_t)xdr_rpcb)) {
-			return (FALSE);
-		}
-		if (freeing) {
-			next_copy = next;
-			rp = &next_copy;
-			/*
-			 * Note that in the subsequent iteration, next_copy
-			 * gets nulled out by the xdr_reference
-			 * but next itself survives.
-			 */
-		} else if (*rp) {
-			rp = &((*rp)->rpcb_next);
-		}
-	}
-	/*NOTREACHED*/
-}
-
-/*
- * xdr_rpcblist() is specified to take a RPCBLIST **, but is identical in
- * functionality to xdr_rpcblist_ptr().
- */
-bool_t
-xdr_rpcblist(xdrs, rp)
-	XDR *xdrs;
-	RPCBLIST **rp;
-{
-	bool_t	dummy;
-
-	dummy = xdr_rpcblist_ptr(xdrs, (rpcblist_ptr *)rp);
-	return (dummy);
-}
-
-
-bool_t
-xdr_rpcb_entry(xdrs, objp)
-	XDR *xdrs;
-	rpcb_entry *objp;
-{
-	if (!xdr_string(xdrs, &objp->r_maddr, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_nc_netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->r_nc_semantics)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_nc_protofmly, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->r_nc_proto, (u_int)~0)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcb_entry_list_ptr(xdrs, rp)
-	XDR *xdrs;
-	rpcb_entry_list_ptr *rp;
-{
-	/*
-	 * more_elements is pre-computed in case the direction is
-	 * XDR_ENCODE or XDR_FREE.  more_elements is overwritten by
-	 * xdr_bool when the direction is XDR_DECODE.
-	 */
-	bool_t more_elements;
-	int freeing = (xdrs->x_op == XDR_FREE);
-	rpcb_entry_list_ptr next;
-	rpcb_entry_list_ptr next_copy;
-
-	next = NULL;
-	for (;;) {
-		more_elements = (bool_t)(*rp != NULL);
-		if (! xdr_bool(xdrs, &more_elements)) {
-			return (FALSE);
-		}
-		if (! more_elements) {
-			return (TRUE);  /* we are done */
-		}
-		/*
-		 * the unfortunate side effect of non-recursion is that in
-		 * the case of freeing we must remember the next object
-		 * before we free the current object ...
-		 */
-		if (freeing)
-			next = (*rp)->rpcb_entry_next;
-		if (! xdr_reference(xdrs, (caddr_t *)rp,
-		    (u_int)sizeof (rpcb_entry_list),
-				    (xdrproc_t)xdr_rpcb_entry)) {
-			return (FALSE);
-		}
-		if (freeing && *rp) {
-			next_copy = next;
-			rp = &next_copy;
-			/*
-			 * Note that in the subsequent iteration, next_copy
-			 * gets nulled out by the xdr_reference
-			 * but next itself survives.
-			 */
-		} else if (*rp) {
-			rp = &((*rp)->rpcb_entry_next);
-		}
-	}
-	/*NOTREACHED*/
-}
-
-/*
- * XDR remote call arguments
- * written for XDR_ENCODE direction only
- */
-bool_t
-xdr_rpcb_rmtcallargs(xdrs, p)
-	XDR *xdrs;
-	struct rpcb_rmtcallargs *p;
-{
-	struct r_rpcb_rmtcallargs *objp =
-	    (struct r_rpcb_rmtcallargs *)(void *)p;
-	u_int lenposition, argposition, position;
-	int32_t *buf;
-
-	buf = XDR_INLINE(xdrs, 3 * BYTES_PER_XDR_UNIT);
-	if (buf == NULL) {
-		if (!xdr_uint32_t(xdrs, &objp->prog)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->vers)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->proc)) {
-			return (FALSE);
-		}
-	} else {
-		IXDR_PUT_U_INT32(buf, objp->prog);
-		IXDR_PUT_U_INT32(buf, objp->vers);
-		IXDR_PUT_U_INT32(buf, objp->proc);
-	}
-
-	/*
-	 * All the jugglery for just getting the size of the arguments
-	 */
-	lenposition = XDR_GETPOS(xdrs);
-	if (! xdr_u_int(xdrs, &(objp->args.args_len))) {
-		return (FALSE);
-	}
-	argposition = XDR_GETPOS(xdrs);
-	if (! (*objp->xdr_args)(xdrs, objp->args.args_val)) {
-		return (FALSE);
-	}
-	position = XDR_GETPOS(xdrs);
-	objp->args.args_len = (u_int)((u_long)position - (u_long)argposition);
-	XDR_SETPOS(xdrs, lenposition);
-	if (! xdr_u_int(xdrs, &(objp->args.args_len))) {
-		return (FALSE);
-	}
-	XDR_SETPOS(xdrs, position);
-	return (TRUE);
-}
-
-/*
- * XDR remote call results
- * written for XDR_DECODE direction only
- */
-bool_t
-xdr_rpcb_rmtcallres(xdrs, p)
-	XDR *xdrs;
-	struct rpcb_rmtcallres *p;
-{
-	bool_t dummy;
-	struct r_rpcb_rmtcallres *objp = (struct r_rpcb_rmtcallres *)(void *)p;
-
-	if (!xdr_string(xdrs, &objp->addr, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_u_int(xdrs, &objp->results.results_len)) {
-		return (FALSE);
-	}
-	dummy = (*(objp->xdr_res))(xdrs, objp->results.results_val);
-	return (dummy);
-}
-
-bool_t
-xdr_netbuf(xdrs, objp)
-	XDR *xdrs;
-	struct netbuf *objp;
-{
-	bool_t dummy;
-	void **pp;
-
-	if (!xdr_uint32_t(xdrs, (uint32_t *) &objp->maxlen)) {
-		return (FALSE);
-	}
-	pp = &objp->buf;
-	dummy = xdr_bytes(xdrs, (char **) pp,
-			(u_int *)&(objp->len), objp->maxlen);
-	return (dummy);
-}
diff --git a/lib/libc_bsd/rpc/rpcb_st_xdr.c b/lib/libc_bsd/rpc/rpcb_st_xdr.c
deleted file mode 100644
index c6f879e..0000000
--- a/lib/libc_bsd/rpc/rpcb_st_xdr.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*	$NetBSD: rpcb_st_xdr.c,v 1.3 2000/07/14 08:40:42 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright 1991 Sun Microsystems, Inc.
- * rpcb_stat_xdr.c
- */
-
-/*
- * This file was generated from rpcb_prot.x, but includes only those
- * routines used with the rpcbind stats facility.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpcb_st_xdr.c 261046 2014-01-22 23:45:27Z mav $");
-
-#include "namespace.h"
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-/* Link list of all the stats about getport and getaddr */
-
-bool_t
-xdr_rpcbs_addrlist(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_addrlist *objp;
-{
-	struct rpcbs_addrlist **pnext;
-
-	    if (!xdr_uint32_t(xdrs, &objp->prog)) {
-		return (FALSE);
-	    }
-	    if (!xdr_uint32_t(xdrs, &objp->vers)) {
-		return (FALSE);
-	    }
-	    if (!xdr_int(xdrs, &objp->success)) {
-		return (FALSE);
-	    }
-	    if (!xdr_int(xdrs, &objp->failure)) {
-		return (FALSE);
-	    }
-	    if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	    }
-
-	    pnext = &objp->next;
-
-	    if (!xdr_pointer(xdrs, (char **) pnext,
-			sizeof (rpcbs_addrlist),
-			(xdrproc_t)xdr_rpcbs_addrlist)) {
-		return (FALSE);
-	    }
-
-	return (TRUE);
-}
-
-/* Link list of all the stats about rmtcall */
-
-bool_t
-xdr_rpcbs_rmtcalllist(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_rmtcalllist *objp;
-{
-	int32_t *buf;
-	struct rpcbs_rmtcalllist **pnext;
-
-	if (xdrs->x_op == XDR_ENCODE) {
-	buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT);
-	if (buf == NULL) {
-		if (!xdr_uint32_t(xdrs, &objp->prog)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->vers)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->proc)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->success)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->failure)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->indirect)) {
-			return (FALSE);
-		}
-	} else {
-		IXDR_PUT_U_INT32(buf, objp->prog);
-		IXDR_PUT_U_INT32(buf, objp->vers);
-		IXDR_PUT_U_INT32(buf, objp->proc);
-		IXDR_PUT_INT32(buf, objp->success);
-		IXDR_PUT_INT32(buf, objp->failure);
-		IXDR_PUT_INT32(buf, objp->indirect);
-	}
-	if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	pnext = &objp->next;
-	if (!xdr_pointer(xdrs, (char **) pnext,
-			sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-	} else if (xdrs->x_op == XDR_DECODE) {
-	buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT);
-	if (buf == NULL) {
-		if (!xdr_uint32_t(xdrs, &objp->prog)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->vers)) {
-			return (FALSE);
-		}
-		if (!xdr_uint32_t(xdrs, &objp->proc)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->success)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->failure)) {
-			return (FALSE);
-		}
-		if (!xdr_int(xdrs, &objp->indirect)) {
-			return (FALSE);
-		}
-	} else {
-		objp->prog = (rpcprog_t)IXDR_GET_U_INT32(buf);
-		objp->vers = (rpcvers_t)IXDR_GET_U_INT32(buf);
-		objp->proc = (rpcproc_t)IXDR_GET_U_INT32(buf);
-		objp->success = (int)IXDR_GET_INT32(buf);
-		objp->failure = (int)IXDR_GET_INT32(buf);
-		objp->indirect = (int)IXDR_GET_INT32(buf);
-	}
-	if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **) pnext,
-			sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->prog)) {
-		return (FALSE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->vers)) {
-		return (FALSE);
-	}
-	if (!xdr_uint32_t(xdrs, &objp->proc)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->success)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->failure)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->indirect)) {
-		return (FALSE);
-	}
-	if (!xdr_string(xdrs, &objp->netid, (u_int)~0)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **) pnext,
-			sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcbs_proc(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_proc objp;
-{
-	if (!xdr_vector(xdrs, (char *)(void *)objp, RPCBSTAT_HIGHPROC,
-	    sizeof (int), (xdrproc_t)xdr_int)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcbs_addrlist_ptr(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_addrlist_ptr *objp;
-{
-	if (!xdr_pointer(xdrs, (char **)objp, sizeof (rpcbs_addrlist),
-			(xdrproc_t)xdr_rpcbs_addrlist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcbs_rmtcalllist_ptr(xdrs, objp)
-	XDR *xdrs;
-	rpcbs_rmtcalllist_ptr *objp;
-{
-	if (!xdr_pointer(xdrs, (char **)objp, sizeof (rpcbs_rmtcalllist),
-			(xdrproc_t)xdr_rpcbs_rmtcalllist)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_rpcb_stat(xdrs, objp)
-	XDR *xdrs;
-	rpcb_stat *objp;
-{
-
-	if (!xdr_rpcbs_proc(xdrs, objp->info)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->setinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->unsetinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_rpcbs_addrlist_ptr(xdrs, &objp->addrinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_rpcbs_rmtcalllist_ptr(xdrs, &objp->rmtinfo)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- * One rpcb_stat structure is returned for each version of rpcbind
- * being monitored.
- */
-bool_t
-xdr_rpcb_stat_byvers(xdrs, objp)
-    XDR *xdrs;
-    rpcb_stat_byvers objp;
-{
-	if (!xdr_vector(xdrs, (char *)(void *)objp, RPCBVERS_STAT,
-	    sizeof (rpcb_stat), (xdrproc_t)xdr_rpcb_stat)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
diff --git a/lib/libc_bsd/rpc/rpcbind.3 b/lib/libc_bsd/rpc/rpcbind.3
deleted file mode 100644
index b9f5109..0000000
--- a/lib/libc_bsd/rpc/rpcbind.3
+++ /dev/null
@@ -1,194 +0,0 @@
-.\" @(#)rpcbind.3n 1.25 93/05/07 SMI; from SVr4
-.\" Copyright 1989 AT&T
-.\" Copyright (c) 1988 Sun Microsystem's, Inc. - All Right's Reserved.
-.\"	$NetBSD: rpcbind.3,v 1.2 2000/06/03 18:47:28 fvdl Exp	$
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rpcbind.3 141580 2005-02-09 18:07:17Z ru $
-.Dd May 7, 1993
-.Dt RPCBIND 3
-.Os
-.Sh NAME
-.Nm rpcb_getmaps ,
-.Nm rpcb_getaddr ,
-.Nm rpcb_gettime ,
-.Nm rpcb_rmtcall ,
-.Nm rpcb_set ,
-.Nm rpcb_unset
-.Nd library routines for RPC bind service
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/rpc.h
-.Ft "rpcblist *"
-.Fn rpcb_getmaps "const struct netconfig *netconf" "const char *host"
-.Ft bool_t
-.Fn rpcb_getaddr "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf" "struct netbuf *svcaddr" "const char *host"
-.Ft bool_t
-.Fn rpcb_gettime "const char *host" "time_t * timep"
-.Ft "enum clnt_stat"
-.Fn rpcb_rmtcall "const struct netconfig *netconf" "const char *host" "const rpcprog_t prognum, const rpcvers_t versnum" "const rpcproc_t procnum, const xdrproc_t inproc" "const caddr_t in" "const xdrproc_t outproc" "const caddr_t out" "const struct timeval tout, const struct netbuf *svcaddr"
-.Ft bool_t
-.Fn rpcb_set "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf" "const struct netbuf *svcaddr"
-.Ft bool_t
-.Fn rpcb_unset "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf"
-.Sh DESCRIPTION
-These routines allow client C programs to make procedure
-calls to the RPC binder service.
-(see
-.Xr rpcbind 8 )
-maintains a list of mappings between programs
-and their universal addresses.
-.Sh Routines
-.Bl -tag -width XXXXX
-.It Fn rpcb_getmaps
-An interface to the rpcbind service,
-which returns a list of the current
-RPC program-to-address mappings on
-.Fa host .
-It uses the transport specified through
-.Fa netconf
-to contact the remote rpcbind
-service on
-.Fa host .
-This routine will return
-.Dv NULL ,
-if the remote rpcbind could not be contacted.
-.It Fn rpcb_getaddr
-An interface to the rpcbind
-service, which finds the address of the service on
-.Fa host
-that is registered with program number
-.Fa prognum ,
-version
-.Fa versnum ,
-and speaks the transport protocol associated with
-.Fa netconf .
-The address found is returned in
-.Fa svcaddr .
-The
-.Fa svcaddr
-argument
-should be preallocated.
-This routine returns
-.Dv TRUE
-if it succeeds.
-A return value of
-.Dv FALSE
-means that the mapping does not exist
-or that the RPC
-system failed to contact the remote
-rpcbind service.
-In the latter case, the global variable
-.Va rpc_createerr
-(see
-.Xr rpc_clnt_create 3 )
-contains the
-RPC status.
-.It Fn rpcb_gettime
-This routine returns the time on
-.Fa host
-in
-.Fa timep .
-If
-.Fa host
-is
-.Dv NULL ,
-.Fn rpcb_gettime
-returns the time on its own machine.
-This routine returns
-.Dv TRUE
-if it succeeds,
-.Dv FALSE
-if it fails.
-The
-.Fn rpcb_gettime
-function
-can be used to synchronize the time between the
-client and the remote server.
-.It Fn rpcb_rmtcall
-An interface to the rpcbind service, which instructs
-rpcbind on
-.Fa host
-to make an RPC
-call on your behalf to a procedure on that host.
-The
-.Fn netconfig
-structure should correspond to a connectionless transport.
-The
-.Fa svcaddr
-argument
-will be modified to the server's address if the procedure succeeds
-(see
-.Fn rpc_call
-and
-.Fn clnt_call
-in
-.Xr rpc_clnt_calls 3
-for the definitions of other arguments).
-.Pp
-This procedure should normally be used for a
-.Dq ping
-and nothing else.
-This routine allows programs to do lookup and call, all in one step.
-.Pp
-Note: Even if the server is not running
-.Fn rpcb_rmtcall
-does not return any error messages to the caller.
-In such a case, the caller times out.
-.Pp
-Note:
-.Fn rpcb_rmtcall
-is only available for connectionless transports.
-.It Fn rpcb_set
-An interface to the rpcbind
-service, which establishes a mapping between the triple
-.Bq Fa prognum , versnum , netconf->nc_netid
-and
-.Fa svcaddr
-on the machine's rpcbind
-service.
-The value of
-.Fa nc_netid
-must correspond to a network identifier that is defined by the
-netconfig database.
-This routine returns
-.Dv TRUE
-if it succeeds,
-.Dv FALSE
-otherwise.
-(See also
-.Fn svc_reg
-in
-.Xr rpc_svc_calls 3 . )
-If there already exists such an entry with rpcbind,
-.Fn rpcb_set
-will fail.
-.It Fn rpcb_unset
-An interface to the rpcbind
-service, which destroys the mapping between the triple
-.Bq Fa prognum , versnum , netconf->nc_netid
-and the address on the machine's rpcbind
-service.
-If
-.Fa netconf
-is
-.Dv NULL ,
-.Fn rpcb_unset
-destroys all mapping between the triple
-.Bq Fa prognum , versnum , No all-transports
-and the addresses on the machine's rpcbind service.
-This routine returns
-.Dv TRUE
-if it succeeds,
-.Dv FALSE
-otherwise.
-Only the owner of the service or the super-user can destroy the mapping.
-(See also
-.Fn svc_unreg
-in
-.Xr rpc_svc_calls 3 . )
-.El
-.Sh SEE ALSO
-.Xr rpc_clnt_calls 3 ,
-.Xr rpc_svc_calls 3 ,
-.Xr rpcbind 8 ,
-.Xr rpcinfo 8
diff --git a/lib/libc_bsd/rpc/rpcdname.c b/lib/libc_bsd/rpc/rpcdname.c
deleted file mode 100644
index d425000..0000000
--- a/lib/libc_bsd/rpc/rpcdname.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rpcdname.c 1.7 91/03/11 Copyr 1989 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rpcdname.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * rpcdname.c
- * Gets the default domain name
- */
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include "un-namespace.h"
-
-static char *default_domain = 0;
-
-static char *
-get_default_domain()
-{
-	char temp[256];
-
-	if (default_domain)
-		return (default_domain);
-	if (getdomainname(temp, sizeof(temp)) < 0)
-		return (0);
-	if ((int) strlen(temp) > 0) {
-		default_domain = (char *)malloc((strlen(temp)+(unsigned)1));
-		if (default_domain == 0)
-			return (0);
-		(void) strcpy(default_domain, temp);
-		return (default_domain);
-	}
-	return (0);
-}
-
-/*
- * This is a wrapper for the system call getdomainname which returns a
- * ypclnt.h error code in the failure case.  It also checks to see that
- * the domain name is non-null, knowing that the null string is going to
- * get rejected elsewhere in the NIS client package.
- */
-int
-__rpc_get_default_domain(domain)
-	char **domain;
-{
-	if ((*domain = get_default_domain()) != 0)
-		return (0);
-	return (-1);
-}
diff --git a/lib/libc_bsd/rpc/rpcsec_gss_stub.c b/lib/libc_bsd/rpc/rpcsec_gss_stub.c
deleted file mode 100644
index 2b2e2c2..0000000
--- a/lib/libc_bsd/rpc/rpcsec_gss_stub.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2006 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/rpc/rpcsec_gss_stub.c 181344 2008-08-06 14:02:05Z dfr $
- */
-
-#include <rpc/rpc.h>
-#include <rpc/rpcsec_gss.h>
-
-bool_t
-__rpc_gss_wrap_stub(AUTH *auth, void *header, size_t headerlen, XDR* xdrs,
-    xdrproc_t xdr_args, void *args_ptr)
-{
-
-	return (FALSE);
-}
-
-bool_t
-__rpc_gss_unwrap_stub(AUTH *auth, XDR* xdrs, xdrproc_t xdr_args, void *args_ptr)
-{
-
-	return (FALSE);
-}
-
-__weak_reference(__rpc_gss_wrap_stub,	__rpc_gss_wrap);
-__weak_reference(__rpc_gss_unwrap_stub,	__rpc_gss_unwrap);
diff --git a/lib/libc_bsd/rpc/rtime.3 b/lib/libc_bsd/rpc/rtime.3
deleted file mode 100644
index 2bddabc..0000000
--- a/lib/libc_bsd/rpc/rtime.3
+++ /dev/null
@@ -1,50 +0,0 @@
-.\" @(#)rtime.3n	2.1 88/08/08 4.0 RPCSRC; from 1.5 88/02/08 SMI
-.\" $FreeBSD: releng/10.2/lib/libc/rpc/rtime.3 108087 2002-12-19 09:40:28Z ru $
-.\"
-.Dd November 22, 1987
-.Dt RTIME 3
-.Os
-.Sh NAME
-.Nm rtime
-.Nd "get remote time"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/time.h
-.In netinet/in.h
-.Ft int
-.Fo rtime
-.Fa "struct sockaddr_in *addrp"
-.Fa "struct timeval *timep"
-.Fa "struct timeval *timeout"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn rtime
-function
-consults the Internet Time Server at the address pointed to by
-.Fa addrp
-and returns the remote time in the
-.Vt timeval
-struct pointed to by
-.Fa timep .
-Normally, the
-.Tn UDP
-protocol is used when consulting the Time Server.
-The
-.Fa timeout
-argument specifies how long the
-routine should wait before giving
-up when waiting for a reply.
-If
-.Fa timeout
-is specified as
-.Dv NULL ,
-however, the routine will instead use
-.Tn TCP
-and block until a reply is received from the time server.
-.Sh RETURN VALUES
-.Rv -std rtime
-.Sh SEE ALSO
-.Xr timed 8
diff --git a/lib/libc_bsd/rpc/rtime.c b/lib/libc_bsd/rpc/rtime.c
deleted file mode 100644
index f18a23d..0000000
--- a/lib/libc_bsd/rpc/rtime.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-/*
- * Copyright (c) 1988 by Sun Microsystems, Inc.
-
- */
-
-/*
- * rtime - get time from remote machine
- *
- * gets time, obtaining value from host
- * on the udp/time socket.  Since timeserver returns
- * with time of day in seconds since Jan 1, 1900,  must
- * subtract seconds before Jan 1, 1970 to get
- * what unix uses.
- */
-#include "namespace.h"
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <netdb.h>
-#include "un-namespace.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = 	"@(#)rtime.c	2.2 88/08/10 4.0 RPCSRC; from 1.8 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/rtime.c 261046 2014-01-22 23:45:27Z mav $");
-
-extern int _rpc_dtablesize( void );
-
-#define NYEARS	(unsigned long)(1970 - 1900)
-#define TOFFSET (unsigned long)(60*60*24*(365*NYEARS + (NYEARS/4)))
-
-static void do_close( int );
-
-int
-rtime(addrp, timep, timeout)
-	struct sockaddr_in *addrp;
-	struct timeval *timep;
-	struct timeval *timeout;
-{
-	int s;
-	fd_set readfds;
-	int res;
-	unsigned long thetime;
-	struct sockaddr_in from;
-	socklen_t fromlen;
-	int type;
-	struct servent *serv;
-
-	if (timeout == NULL) {
-		type = SOCK_STREAM;
-	} else {
-		type = SOCK_DGRAM;
-	}
-	s = _socket(AF_INET, type, 0);
-	if (s < 0) {
-		return(-1);
-	}
-	addrp->sin_family = AF_INET;
-
-	/* TCP and UDP port are the same in this case */
-	if ((serv = getservbyname("time", "tcp")) == NULL) {
-		return(-1);
-	}
-
-	addrp->sin_port = serv->s_port;
-
-	if (type == SOCK_DGRAM) {
-		res = _sendto(s, (char *)&thetime, sizeof(thetime), 0, 
-			     (struct sockaddr *)addrp, sizeof(*addrp));
-		if (res < 0) {
-			do_close(s);
-			return(-1);	
-		}
-		do {
-			FD_ZERO(&readfds);
-			FD_SET(s, &readfds);
-			res = _select(_rpc_dtablesize(), &readfds,
-				     (fd_set *)NULL, (fd_set *)NULL, timeout);
-		} while (res < 0 && errno == EINTR);
-		if (res <= 0) {
-			if (res == 0) {
-				errno = ETIMEDOUT;
-			}
-			do_close(s);
-			return(-1);	
-		}
-		fromlen = sizeof(from);
-		res = _recvfrom(s, (char *)&thetime, sizeof(thetime), 0, 
-			       (struct sockaddr *)&from, &fromlen);
-		do_close(s);
-		if (res < 0) {
-			return(-1);	
-		}
-	} else {
-		if (_connect(s, (struct sockaddr *)addrp, sizeof(*addrp)) < 0) {
-			do_close(s);
-			return(-1);
-		}
-		res = _read(s, (char *)&thetime, sizeof(thetime));
-		do_close(s);
-		if (res < 0) {
-			return(-1);
-		}
-	}
-	if (res != sizeof(thetime)) {
-		errno = EIO;
-		return(-1);	
-	}
-	thetime = ntohl(thetime);
-	timep->tv_sec = thetime - TOFFSET;
-	timep->tv_usec = 0;
-	return(0);
-}
-
-static void
-do_close(s)
-	int s;
-{
-	int save;
-
-	save = errno;
-	(void)_close(s);
-	errno = save;
-}
diff --git a/lib/libc_bsd/rpc/svc.c b/lib/libc_bsd/rpc/svc.c
deleted file mode 100644
index 2e6fda4..0000000
--- a/lib/libc_bsd/rpc/svc.c
+++ /dev/null
@@ -1,796 +0,0 @@
-/*	$NetBSD: svc.c,v 1.21 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)svc.c 1.44 88/02/08 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc.c	2.4 88/08/11 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * svc.c, Server-side remote procedure call interface.
- *
- * There are two sets of procedures here.  The xprt routines are
- * for handling transport handles.  The svc routines handle the
- * list of service routines.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/poll.h>
-#include <assert.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#ifdef PORTMAP
-#include <rpc/pmap_clnt.h>
-#endif				/* PORTMAP */
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-#define	RQCRED_SIZE	400		/* this size is excessive */
-
-#define SVC_VERSQUIET 0x0001		/* keep quiet about vers mismatch */
-#define version_keepquiet(xp) (SVC_EXT(xp)->xp_flags & SVC_VERSQUIET)
-
-#define max(a, b) (a > b ? a : b)
-
-/*
- * The services list
- * Each entry represents a set of procedures (an rpc program).
- * The dispatch routine takes request structs and runs the
- * apropriate procedure.
- */
-static struct svc_callout {
-	struct svc_callout *sc_next;
-	rpcprog_t	    sc_prog;
-	rpcvers_t	    sc_vers;
-	char		   *sc_netid;
-	void		    (*sc_dispatch)(struct svc_req *, SVCXPRT *);
-} *svc_head;
-
-static struct svc_callout *svc_find(rpcprog_t, rpcvers_t,
-    struct svc_callout **, char *);
-static void __xprt_do_unregister (SVCXPRT *xprt, bool_t dolock);
-
-/* ***************  SVCXPRT related stuff **************** */
-
-/*
- * Activate a transport handle.
- */
-void
-xprt_register(xprt)
-	SVCXPRT *xprt;
-{
-	int sock;
-
-	assert(xprt != NULL);
-
-	sock = xprt->xp_fd;
-
-	rwlock_wrlock(&svc_fd_lock);
-	if (__svc_xports == NULL) {
-		__svc_xports = (SVCXPRT **)
-			mem_alloc(FD_SETSIZE * sizeof(SVCXPRT *));
-		if (__svc_xports == NULL) {
-			rwlock_unlock(&svc_fd_lock);
-			return;
-		}
-		memset(__svc_xports, '\0', FD_SETSIZE * sizeof(SVCXPRT *));
-	}
-	if (sock < FD_SETSIZE) {
-		__svc_xports[sock] = xprt;
-		FD_SET(sock, &svc_fdset);
-		svc_maxfd = max(svc_maxfd, sock);
-	}
-	rwlock_unlock(&svc_fd_lock);
-}
-
-void
-xprt_unregister(SVCXPRT *xprt)
-{
-	__xprt_do_unregister(xprt, TRUE);
-}
-
-void
-__xprt_unregister_unlocked(SVCXPRT *xprt)
-{
-	__xprt_do_unregister(xprt, FALSE);
-}
-
-/*
- * De-activate a transport handle.
- */
-static void
-__xprt_do_unregister(xprt, dolock)
-	SVCXPRT *xprt;
-	bool_t dolock;
-{
-	int sock;
-
-	assert(xprt != NULL);
-
-	sock = xprt->xp_fd;
-
-	if (dolock)
-		rwlock_wrlock(&svc_fd_lock);
-	if ((sock < FD_SETSIZE) && (__svc_xports[sock] == xprt)) {
-		__svc_xports[sock] = NULL;
-		FD_CLR(sock, &svc_fdset);
-		if (sock >= svc_maxfd) {
-			for (svc_maxfd--; svc_maxfd>=0; svc_maxfd--)
-				if (__svc_xports[svc_maxfd])
-					break;
-		}
-	}
-	if (dolock)
-		rwlock_unlock(&svc_fd_lock);
-}
-
-/*
- * Add a service program to the callout list.
- * The dispatch routine will be called when a rpc request for this
- * program number comes in.
- */
-bool_t
-svc_reg(xprt, prog, vers, dispatch, nconf)
-	SVCXPRT *xprt;
-	const rpcprog_t prog;
-	const rpcvers_t vers;
-	void (*dispatch)(struct svc_req *, SVCXPRT *);
-	const struct netconfig *nconf;
-{
-	bool_t dummy;
-	struct svc_callout *prev;
-	struct svc_callout *s;
-	struct netconfig *tnconf;
-	char *netid = NULL;
-	int flag = 0;
-
-/* VARIABLES PROTECTED BY svc_lock: s, prev, svc_head */
-
-	if (xprt->xp_netid) {
-		netid = strdup(xprt->xp_netid);
-		flag = 1;
-	} else if (nconf && nconf->nc_netid) {
-		netid = strdup(nconf->nc_netid);
-		flag = 1;
-	} else if ((tnconf = __rpcgettp(xprt->xp_fd)) != NULL) {
-		netid = strdup(tnconf->nc_netid);
-		flag = 1;
-		freenetconfigent(tnconf);
-	} /* must have been created with svc_raw_create */
-	if ((netid == NULL) && (flag == 1)) {
-		return (FALSE);
-	}
-
-	rwlock_wrlock(&svc_lock);
-	if ((s = svc_find(prog, vers, &prev, netid)) != NULL) {
-		if (netid)
-			free(netid);
-		if (s->sc_dispatch == dispatch)
-			goto rpcb_it; /* he is registering another xptr */
-		rwlock_unlock(&svc_lock);
-		return (FALSE);
-	}
-	s = mem_alloc(sizeof (struct svc_callout));
-	if (s == NULL) {
-		if (netid)
-			free(netid);
-		rwlock_unlock(&svc_lock);
-		return (FALSE);
-	}
-
-	s->sc_prog = prog;
-	s->sc_vers = vers;
-	s->sc_dispatch = dispatch;
-	s->sc_netid = netid;
-	s->sc_next = svc_head;
-	svc_head = s;
-
-	if ((xprt->xp_netid == NULL) && (flag == 1) && netid)
-		((SVCXPRT *) xprt)->xp_netid = strdup(netid);
-
-rpcb_it:
-	rwlock_unlock(&svc_lock);
-	/* now register the information with the local binder service */
-	if (nconf) {
-		/*LINTED const castaway*/
-		dummy = rpcb_set(prog, vers, (struct netconfig *) nconf,
-		&((SVCXPRT *) xprt)->xp_ltaddr);
-		return (dummy);
-	}
-	return (TRUE);
-}
-
-/*
- * Remove a service program from the callout list.
- */
-void
-svc_unreg(prog, vers)
-	const rpcprog_t prog;
-	const rpcvers_t vers;
-{
-	struct svc_callout *prev;
-	struct svc_callout *s;
-
-	/* unregister the information anyway */
-	(void) rpcb_unset(prog, vers, NULL);
-	rwlock_wrlock(&svc_lock);
-	while ((s = svc_find(prog, vers, &prev, NULL)) != NULL) {
-		if (prev == NULL) {
-			svc_head = s->sc_next;
-		} else {
-			prev->sc_next = s->sc_next;
-		}
-		s->sc_next = NULL;
-		if (s->sc_netid)
-			mem_free(s->sc_netid, sizeof (s->sc_netid) + 1);
-		mem_free(s, sizeof (struct svc_callout));
-	}
-	rwlock_unlock(&svc_lock);
-}
-
-/* ********************** CALLOUT list related stuff ************* */
-
-#ifdef PORTMAP
-/*
- * Add a service program to the callout list.
- * The dispatch routine will be called when a rpc request for this
- * program number comes in.
- */
-bool_t
-svc_register(xprt, prog, vers, dispatch, protocol)
-	SVCXPRT *xprt;
-	u_long prog;
-	u_long vers;
-	void (*dispatch)(struct svc_req *, SVCXPRT *);
-	int protocol;
-{
-	struct svc_callout *prev;
-	struct svc_callout *s;
-
-	assert(xprt != NULL);
-	assert(dispatch != NULL);
-
-	if ((s = svc_find((rpcprog_t)prog, (rpcvers_t)vers, &prev, NULL)) !=
-	    NULL) {
-		if (s->sc_dispatch == dispatch)
-			goto pmap_it;  /* he is registering another xptr */
-		return (FALSE);
-	}
-	s = mem_alloc(sizeof(struct svc_callout));
-	if (s == NULL) {
-		return (FALSE);
-	}
-	s->sc_prog = (rpcprog_t)prog;
-	s->sc_vers = (rpcvers_t)vers;
-	s->sc_dispatch = dispatch;
-	s->sc_next = svc_head;
-	svc_head = s;
-pmap_it:
-	/* now register the information with the local binder service */
-	if (protocol) {
-		return (pmap_set(prog, vers, protocol, xprt->xp_port));
-	}
-	return (TRUE);
-}
-
-/*
- * Remove a service program from the callout list.
- */
-void
-svc_unregister(prog, vers)
-	u_long prog;
-	u_long vers;
-{
-	struct svc_callout *prev;
-	struct svc_callout *s;
-
-	if ((s = svc_find((rpcprog_t)prog, (rpcvers_t)vers, &prev, NULL)) ==
-	    NULL)
-		return;
-	if (prev == NULL) {
-		svc_head = s->sc_next;
-	} else {
-		prev->sc_next = s->sc_next;
-	}
-	s->sc_next = NULL;
-	mem_free(s, sizeof(struct svc_callout));
-	/* now unregister the information with the local binder service */
-	(void)pmap_unset(prog, vers);
-}
-#endif				/* PORTMAP */
-
-/*
- * Search the callout list for a program number, return the callout
- * struct.
- */
-static struct svc_callout *
-svc_find(prog, vers, prev, netid)
-	rpcprog_t prog;
-	rpcvers_t vers;
-	struct svc_callout **prev;
-	char *netid;
-{
-	struct svc_callout *s, *p;
-
-	assert(prev != NULL);
-
-	p = NULL;
-	for (s = svc_head; s != NULL; s = s->sc_next) {
-		if (((s->sc_prog == prog) && (s->sc_vers == vers)) &&
-		    ((netid == NULL) || (s->sc_netid == NULL) ||
-		    (strcmp(netid, s->sc_netid) == 0)))
-			break;
-		p = s;
-	}
-	*prev = p;
-	return (s);
-}
-
-/* ******************* REPLY GENERATION ROUTINES  ************ */
-
-/*
- * Send a reply to an rpc request
- */
-bool_t
-svc_sendreply(xprt, xdr_results, xdr_location)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_results;
-	void * xdr_location;
-{
-	struct rpc_msg rply; 
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;  
-	rply.rm_reply.rp_stat = MSG_ACCEPTED; 
-	rply.acpted_rply.ar_verf = xprt->xp_verf; 
-	rply.acpted_rply.ar_stat = SUCCESS;
-	rply.acpted_rply.ar_results.where = xdr_location;
-	rply.acpted_rply.ar_results.proc = xdr_results;
-	return (SVC_REPLY(xprt, &rply)); 
-}
-
-/*
- * No procedure error reply
- */
-void
-svcerr_noproc(xprt)
-	SVCXPRT *xprt;
-{
-	struct rpc_msg rply;
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;
-	rply.rm_reply.rp_stat = MSG_ACCEPTED;
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = PROC_UNAVAIL;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Can't decode args error reply
- */
-void
-svcerr_decode(xprt)
-	SVCXPRT *xprt;
-{
-	struct rpc_msg rply; 
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY; 
-	rply.rm_reply.rp_stat = MSG_ACCEPTED; 
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = GARBAGE_ARGS;
-	SVC_REPLY(xprt, &rply); 
-}
-
-/*
- * Some system error
- */
-void
-svcerr_systemerr(xprt)
-	SVCXPRT *xprt;
-{
-	struct rpc_msg rply; 
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY; 
-	rply.rm_reply.rp_stat = MSG_ACCEPTED; 
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = SYSTEM_ERR;
-	SVC_REPLY(xprt, &rply); 
-}
-
-#if 0
-/*
- * Tell RPC package to not complain about version errors to the client.	 This
- * is useful when revving broadcast protocols that sit on a fixed address.
- * There is really one (or should be only one) example of this kind of
- * protocol: the portmapper (or rpc binder).
- */
-void
-__svc_versquiet_on(xprt)
-	SVCXPRT *xprt;
-{
-
-	SVC_EXT(xprt)->xp_flags |= SVC_VERSQUIET;
-}
-
-void
-__svc_versquiet_off(xprt)
-	SVCXPRT *xprt;
-{
-
-	SVC_EXT(xprt)->xp_flags &= ~SVC_VERSQUIET;
-}
-
-void
-svc_versquiet(xprt)
-	SVCXPRT *xprt;
-{
-	__svc_versquiet_on(xprt);
-}
-
-int
-__svc_versquiet_get(xprt)
-	SVCXPRT *xprt;
-{
-
-	return (SVC_EXT(xprt)->xp_flags & SVC_VERSQUIET);
-}
-#endif
-
-/*
- * Authentication error reply
- */
-void
-svcerr_auth(xprt, why)
-	SVCXPRT *xprt;
-	enum auth_stat why;
-{
-	struct rpc_msg rply;
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;
-	rply.rm_reply.rp_stat = MSG_DENIED;
-	rply.rjcted_rply.rj_stat = AUTH_ERROR;
-	rply.rjcted_rply.rj_why = why;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Auth too weak error reply
- */
-void
-svcerr_weakauth(xprt)
-	SVCXPRT *xprt;
-{
-
-	assert(xprt != NULL);
-
-	svcerr_auth(xprt, AUTH_TOOWEAK);
-}
-
-/*
- * Program unavailable error reply
- */
-void 
-svcerr_noprog(xprt)
-	SVCXPRT *xprt;
-{
-	struct rpc_msg rply;  
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;   
-	rply.rm_reply.rp_stat = MSG_ACCEPTED;  
-	rply.acpted_rply.ar_verf = xprt->xp_verf;  
-	rply.acpted_rply.ar_stat = PROG_UNAVAIL;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Program version mismatch error reply
- */
-void  
-svcerr_progvers(xprt, low_vers, high_vers)
-	SVCXPRT *xprt; 
-	rpcvers_t low_vers;
-	rpcvers_t high_vers;
-{
-	struct rpc_msg rply;
-
-	assert(xprt != NULL);
-
-	rply.rm_direction = REPLY;
-	rply.rm_reply.rp_stat = MSG_ACCEPTED;
-	rply.acpted_rply.ar_verf = xprt->xp_verf;
-	rply.acpted_rply.ar_stat = PROG_MISMATCH;
-	rply.acpted_rply.ar_vers.low = (uint32_t)low_vers;
-	rply.acpted_rply.ar_vers.high = (uint32_t)high_vers;
-	SVC_REPLY(xprt, &rply);
-}
-
-/*
- * Allocate a new server transport structure. All fields are
- * initialized to zero and xp_p3 is initialized to point at an
- * extension structure to hold various flags and authentication
- * parameters.
- */
-SVCXPRT *
-svc_xprt_alloc()
-{
-	SVCXPRT *xprt;
-	SVCXPRT_EXT *ext;
-
-	xprt = mem_alloc(sizeof(SVCXPRT));
-	if (xprt == NULL)
-		return (NULL);
-	memset(xprt, 0, sizeof(SVCXPRT));
-	ext = mem_alloc(sizeof(SVCXPRT_EXT));
-	if (ext == NULL) {
-		mem_free(xprt, sizeof(SVCXPRT));
-		return (NULL);
-	}
-	memset(ext, 0, sizeof(SVCXPRT_EXT));
-	xprt->xp_p3 = ext;
-	ext->xp_auth.svc_ah_ops = &svc_auth_null_ops;
-
-	return (xprt);
-}
-
-/*
- * Free a server transport structure.
- */
-void
-svc_xprt_free(xprt)
-	SVCXPRT *xprt;
-{
-
-	mem_free(xprt->xp_p3, sizeof(SVCXPRT_EXT));
-	mem_free(xprt, sizeof(SVCXPRT));
-}
-
-/* ******************* SERVER INPUT STUFF ******************* */
-
-/*
- * Get server side input from some transport.
- *
- * Statement of authentication parameters management:
- * This function owns and manages all authentication parameters, specifically
- * the "raw" parameters (msg.rm_call.cb_cred and msg.rm_call.cb_verf) and
- * the "cooked" credentials (rqst->rq_clntcred).
- * However, this function does not know the structure of the cooked
- * credentials, so it make the following assumptions:
- *   a) the structure is contiguous (no pointers), and
- *   b) the cred structure size does not exceed RQCRED_SIZE bytes.
- * In all events, all three parameters are freed upon exit from this routine.
- * The storage is trivially management on the call stack in user land, but
- * is mallocated in kernel land.
- */
-
-void
-svc_getreq(rdfds)
-	int rdfds;
-{
-	fd_set readfds;
-
-	FD_ZERO(&readfds);
-	readfds.fds_bits[0] = rdfds;
-	svc_getreqset(&readfds);
-}
-
-void
-svc_getreqset(readfds)
-	fd_set *readfds;
-{
-	int bit, fd;
-	fd_mask mask, *maskp;
-	int sock;
-
-	assert(readfds != NULL);
-
-	maskp = readfds->fds_bits;
-	for (sock = 0; sock < FD_SETSIZE; sock += NFDBITS) {
-	    for (mask = *maskp++; (bit = ffsl(mask)) != 0;
-		mask ^= (1ul << (bit - 1))) {
-		/* sock has input waiting */
-		fd = sock + bit - 1;
-		svc_getreq_common(fd);
-	    }
-	}
-}
-
-void
-svc_getreq_common(fd)
-	int fd;
-{
-	SVCXPRT *xprt;
-	struct svc_req r;
-	struct rpc_msg msg;
-	int prog_found;
-	rpcvers_t low_vers;
-	rpcvers_t high_vers;
-	enum xprt_stat stat;
-	char cred_area[2*MAX_AUTH_BYTES + RQCRED_SIZE];
-
-	msg.rm_call.cb_cred.oa_base = cred_area;
-	msg.rm_call.cb_verf.oa_base = &(cred_area[MAX_AUTH_BYTES]);
-	r.rq_clntcred = &(cred_area[2*MAX_AUTH_BYTES]);
-
-	rwlock_rdlock(&svc_fd_lock);
-	xprt = __svc_xports[fd];
-	rwlock_unlock(&svc_fd_lock);
-	if (xprt == NULL)
-		/* But do we control sock? */
-		return;
-	/* now receive msgs from xprtprt (support batch calls) */
-	do {
-		if (SVC_RECV(xprt, &msg)) {
-
-			/* now find the exported program and call it */
-			struct svc_callout *s;
-			enum auth_stat why;
-
-			r.rq_xprt = xprt;
-			r.rq_prog = msg.rm_call.cb_prog;
-			r.rq_vers = msg.rm_call.cb_vers;
-			r.rq_proc = msg.rm_call.cb_proc;
-			r.rq_cred = msg.rm_call.cb_cred;
-			/* first authenticate the message */
-			if ((why = _authenticate(&r, &msg)) != AUTH_OK) {
-				/*
-				 * RPCSEC_GSS uses this return code
-				 * for requests that form part of its
-				 * context establishment protocol and
-				 * should not be dispatched to the
-				 * application.
-				 */
-				if (why != RPCSEC_GSS_NODISPATCH)
-					svcerr_auth(xprt, why);
-				goto call_done;
-			}
-			/* now match message with a registered service*/
-			prog_found = FALSE;
-			low_vers = (rpcvers_t) -1L;
-			high_vers = (rpcvers_t) 0L;
-			for (s = svc_head; s != NULL; s = s->sc_next) {
-				if (s->sc_prog == r.rq_prog) {
-					if (s->sc_vers == r.rq_vers) {
-						(*s->sc_dispatch)(&r, xprt);
-						goto call_done;
-					}  /* found correct version */
-					prog_found = TRUE;
-					if (s->sc_vers < low_vers)
-						low_vers = s->sc_vers;
-					if (s->sc_vers > high_vers)
-						high_vers = s->sc_vers;
-				}   /* found correct program */
-			}
-			/*
-			 * if we got here, the program or version
-			 * is not served ...
-			 */
-			if (prog_found)
-				svcerr_progvers(xprt, low_vers, high_vers);
-			else
-				svcerr_noprog(xprt);
-			/* Fall through to ... */
-		}
-		/*
-		 * Check if the xprt has been disconnected in a
-		 * recursive call in the service dispatch routine.
-		 * If so, then break.
-		 */
-		rwlock_rdlock(&svc_fd_lock);
-		if (xprt != __svc_xports[fd]) {
-			rwlock_unlock(&svc_fd_lock);
-			break;
-		}
-		rwlock_unlock(&svc_fd_lock);
-call_done:
-		if ((stat = SVC_STAT(xprt)) == XPRT_DIED){
-			SVC_DESTROY(xprt);
-			break;
-		}
-	} while (stat == XPRT_MOREREQS);
-}
-
-
-void
-svc_getreq_poll(pfdp, pollretval)
-	struct pollfd	*pfdp;
-	int	pollretval;
-{
-	int i;
-	int fds_found;
-
-	for (i = fds_found = 0; fds_found < pollretval; i++) {
-		struct pollfd *p = &pfdp[i];
-
-		if (p->revents) {
-			/* fd has input waiting */
-			fds_found++;
-			/*
-			 *	We assume that this function is only called
-			 *	via someone _select()ing from svc_fdset or
-			 *	_poll()ing from svc_pollset[].  Thus it's safe
-			 *	to handle the POLLNVAL event by simply turning
-			 *	the corresponding bit off in svc_fdset.  The
-			 *	svc_pollset[] array is derived from svc_fdset
-			 *	and so will also be updated eventually.
-			 *
-			 *	XXX Should we do an xprt_unregister() instead?
-			 */
-			if (p->revents & POLLNVAL) {
-				rwlock_wrlock(&svc_fd_lock);
-				FD_CLR(p->fd, &svc_fdset);
-				rwlock_unlock(&svc_fd_lock);
-			} else
-				svc_getreq_common(p->fd);
-		}
-	}
-}
-
-bool_t
-rpc_control(int what, void *arg)
-{
-	int val;
-
-	switch (what) {
-	case RPC_SVC_CONNMAXREC_SET:
-		val = *(int *)arg;
-		if (val <= 0)
-			return FALSE;
-		__svc_maxrec = val;
-		return TRUE;
-	case RPC_SVC_CONNMAXREC_GET:
-		*(int *)arg = __svc_maxrec;
-		return TRUE;
-	default:
-		break;
-	}
-	return FALSE;
-}
diff --git a/lib/libc_bsd/rpc/svc_auth.c b/lib/libc_bsd/rpc/svc_auth.c
deleted file mode 100644
index 7e0bc98..0000000
--- a/lib/libc_bsd/rpc/svc_auth.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*	$NetBSD: svc_auth.c,v 1.12 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)svc_auth.c	1.16	94/04/24 SMI"
-static char sccsid[] = "@(#)svc_auth.c 1.26 89/02/07 Copyr 1984 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc_auth.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * svc_auth.c, Server-side rpc authenticator interface.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <rpc/rpc.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "mt_misc.h"
-
-/*
- * svcauthsw is the bdevsw of server side authentication.
- *
- * Server side authenticators are called from authenticate by
- * using the client auth struct flavor field to index into svcauthsw.
- * The server auth flavors must implement a routine that looks
- * like:
- *
- *	enum auth_stat
- *	flavorx_auth(rqst, msg)
- *		struct svc_req *rqst;
- *		struct rpc_msg *msg;
- *
- */
-
-/* declarations to allow servers to specify new authentication flavors */
-struct authsvc {
-	int	flavor;
-	enum	auth_stat (*handler)(struct svc_req *, struct rpc_msg *);
-	struct	authsvc	  *next;
-};
-static struct authsvc *Auths = NULL;
-
-struct svc_auth_ops svc_auth_null_ops;
-
-/*
- * The call rpc message, msg has been obtained from the wire.  The msg contains
- * the raw form of credentials and verifiers.  authenticate returns AUTH_OK
- * if the msg is successfully authenticated.  If AUTH_OK then the routine also
- * does the following things:
- * set rqst->rq_xprt->verf to the appropriate response verifier;
- * sets rqst->rq_client_cred to the "cooked" form of the credentials.
- *
- * NB: rqst->rq_cxprt->verf must be pre-alloctaed;
- * its length is set appropriately.
- *
- * The caller still owns and is responsible for msg->u.cmb.cred and
- * msg->u.cmb.verf.  The authentication system retains ownership of
- * rqst->rq_client_cred, the cooked credentials.
- *
- * There is an assumption that any flavour less than AUTH_NULL is
- * invalid.
- */
-enum auth_stat
-_authenticate(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-	int cred_flavor;
-	struct authsvc *asp;
-	enum auth_stat dummy;
-
-/* VARIABLES PROTECTED BY authsvc_lock: asp, Auths */
-
-	rqst->rq_cred = msg->rm_call.cb_cred;
-	SVC_AUTH(rqst->rq_xprt).svc_ah_ops = &svc_auth_null_ops;
-	SVC_AUTH(rqst->rq_xprt).svc_ah_private = NULL;
-	rqst->rq_xprt->xp_verf.oa_flavor = _null_auth.oa_flavor;
-	rqst->rq_xprt->xp_verf.oa_length = 0;
-	cred_flavor = rqst->rq_cred.oa_flavor;
-	switch (cred_flavor) {
-	case AUTH_NULL:
-		dummy = _svcauth_null(rqst, msg);
-		return (dummy);
-	case AUTH_SYS:
-		dummy = _svcauth_unix(rqst, msg);
-		return (dummy);
-	case AUTH_SHORT:
-		dummy = _svcauth_short(rqst, msg);
-		return (dummy);
-#ifdef DES_BUILTIN
-	case AUTH_DES:
-		dummy = _svcauth_des(rqst, msg);
-		return (dummy);
-#endif
-	default:
-		break;
-	}
-
-	/* flavor doesn't match any of the builtin types, so try new ones */
-	mutex_lock(&authsvc_lock);
-	for (asp = Auths; asp; asp = asp->next) {
-		if (asp->flavor == cred_flavor) {
-			enum auth_stat as;
-
-			as = (*asp->handler)(rqst, msg);
-			mutex_unlock(&authsvc_lock);
-			return (as);
-		}
-	}
-	mutex_unlock(&authsvc_lock);
-
-	return (AUTH_REJECTEDCRED);
-}
-
-/*
- * A set of null auth methods used by any authentication protocols
- * that don't need to inspect or modify the message body.
- */
-static bool_t
-svcauth_null_wrap(auth, xdrs, xdr_func, xdr_ptr)
-	SVCAUTH *auth;
-	XDR *xdrs;
-	xdrproc_t xdr_func;
-	caddr_t xdr_ptr;
-{
-
-	return (xdr_func(xdrs, xdr_ptr));
-}
-
-struct svc_auth_ops svc_auth_null_ops = {
-	svcauth_null_wrap,
-	svcauth_null_wrap,
-};
-
-/*ARGSUSED*/
-enum auth_stat
-_svcauth_null(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-	return (AUTH_OK);
-}
-
-/*
- *  Allow the rpc service to register new authentication types that it is
- *  prepared to handle.  When an authentication flavor is registered,
- *  the flavor is checked against already registered values.  If not
- *  registered, then a new Auths entry is added on the list.
- *
- *  There is no provision to delete a registration once registered.
- *
- *  This routine returns:
- *	 0 if registration successful
- *	 1 if flavor already registered
- *	-1 if can't register (errno set)
- */
-
-int
-svc_auth_reg(cred_flavor, handler)
-	int cred_flavor;
-	enum auth_stat (*handler)(struct svc_req *, struct rpc_msg *);
-{
-	struct authsvc *asp;
-
-	switch (cred_flavor) {
-	    case AUTH_NULL:
-	    case AUTH_SYS:
-	    case AUTH_SHORT:
-#ifdef DES_BUILTIN
-	    case AUTH_DES:
-#endif
-		/* already registered */
-		return (1);
-
-	    default:
-		mutex_lock(&authsvc_lock);
-		for (asp = Auths; asp; asp = asp->next) {
-			if (asp->flavor == cred_flavor) {
-				/* already registered */
-				mutex_unlock(&authsvc_lock);
-				return (1);
-			}
-		}
-
-		/* this is a new one, so go ahead and register it */
-		asp = mem_alloc(sizeof (*asp));
-		if (asp == NULL) {
-			mutex_unlock(&authsvc_lock);
-			return (-1);
-		}
-		asp->flavor = cred_flavor;
-		asp->handler = handler;
-		asp->next = Auths;
-		Auths = asp;
-		mutex_unlock(&authsvc_lock);
-		break;
-	}
-	return (0);
-}
diff --git a/lib/libc_bsd/rpc/svc_auth_des.c b/lib/libc_bsd/rpc/svc_auth_des.c
deleted file mode 100644
index 394376d..0000000
--- a/lib/libc_bsd/rpc/svc_auth_des.c
+++ /dev/null
@@ -1,537 +0,0 @@
-
-/*
- * Copyright (c) 1988 by Sun Microsystems, Inc.
- */
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-/*
- * svcauth_des.c, server-side des authentication
- *
- * We insure for the service the following:
- * (1) The timestamp microseconds do not exceed 1 million.
- * (2) The timestamp plus the window is less than the current time.
- * (3) The timestamp is not less than the one previously
- *     seen in the current session.
- *
- * It is up to the server to determine if the window size is
- * too small .
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <rpc/des_crypt.h>
-#include <sys/param.h>
-#include <netinet/in.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/auth_des.h>
-#include <rpc/svc.h>
-#include <rpc/rpc_msg.h>
-#include <rpc/svc_auth.h>
-#include "libc_private.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = 	"@(#)svcauth_des.c	2.3 89/07/11 4.0 RPCSRC; from 1.15 88/02/08 SMI";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc_auth_des.c 261046 2014-01-22 23:45:27Z mav $");
-
-extern int key_decryptsession_pk(const char *, netobj *, des_block *);
-
-#define debug(msg)	 printf("svcauth_des: %s\n", msg) 
-
-#define USEC_PER_SEC ((u_long) 1000000L)
-#define BEFORE(t1, t2) timercmp(t1, t2, <)
-
-/*
- * LRU cache of conversation keys and some other useful items.
- */
-#define AUTHDES_CACHESZ 64
-struct cache_entry {
-	des_block key;		/* conversation key */
-	char *rname;		/* client's name */
-	u_int window;		/* credential lifetime window */
-	struct timeval laststamp;	/* detect replays of creds */
-	char *localcred;	/* generic local credential */
-};
-static struct cache_entry *authdes_cache/* [AUTHDES_CACHESZ] */;
-static short *authdes_lru/* [AUTHDES_CACHESZ] */;
-
-static void cache_init();	/* initialize the cache */
-static short cache_spot();	/* find an entry in the cache */
-static void cache_ref(/*short sid*/);	/* note that sid was ref'd */
-
-static void invalidate();	/* invalidate entry in cache */
-
-/*
- * cache statistics 
- */
-static struct {
-	u_long ncachehits;	/* times cache hit, and is not replay */
-	u_long ncachereplays;	/* times cache hit, and is replay */
-	u_long ncachemisses;	/* times cache missed */
-} svcauthdes_stats;
-
-/*
- * Service side authenticator for AUTH_DES
- */
-enum auth_stat
-_svcauth_des(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-
-	long *ixdr;
-	des_block cryptbuf[2];
-	struct authdes_cred *cred;
-	struct authdes_verf verf;
-	int status;
-	struct cache_entry *entry;
-	short sid = 0;
-	des_block *sessionkey;
-	des_block ivec;
-	u_int window;
-	struct timeval timestamp;
-	u_long namelen;
-	struct area {
-		struct authdes_cred area_cred;
-		char area_netname[MAXNETNAMELEN+1];
-	} *area;
-
-	if (authdes_cache == NULL) {
-		cache_init();
-	}
-
-	area = (struct area *)rqst->rq_clntcred;
-	cred = (struct authdes_cred *)&area->area_cred;
-
-	/*
-	 * Get the credential
-	 */
-	ixdr = (long *)msg->rm_call.cb_cred.oa_base;
-	cred->adc_namekind = IXDR_GET_ENUM(ixdr, enum authdes_namekind);
-	switch (cred->adc_namekind) {
-	case ADN_FULLNAME:
-		namelen = IXDR_GET_U_LONG(ixdr);
-		if (namelen > MAXNETNAMELEN) {
-			return (AUTH_BADCRED);
-		}
-		cred->adc_fullname.name = area->area_netname;
-		bcopy((char *)ixdr, cred->adc_fullname.name, 
-			(u_int)namelen);
-		cred->adc_fullname.name[namelen] = 0;
-		ixdr += (RNDUP(namelen) / BYTES_PER_XDR_UNIT);
-		cred->adc_fullname.key.key.high = (u_long)*ixdr++;
-		cred->adc_fullname.key.key.low = (u_long)*ixdr++;
-		cred->adc_fullname.window = (u_long)*ixdr++;
-		break;
-	case ADN_NICKNAME:
-		cred->adc_nickname = (u_long)*ixdr++;
-		break;
-	default:
-		return (AUTH_BADCRED);	
-	}
-
-	/*
-	 * Get the verifier
-	 */
-	ixdr = (long *)msg->rm_call.cb_verf.oa_base;
-	verf.adv_xtimestamp.key.high = (u_long)*ixdr++;
-	verf.adv_xtimestamp.key.low =  (u_long)*ixdr++;
-	verf.adv_int_u = (u_long)*ixdr++;
-
-
-	/*
-	 * Get the conversation key
- 	 */
-	if (cred->adc_namekind == ADN_FULLNAME) {
-		netobj pkey;
-		char pkey_data[1024];
-
-		sessionkey = &cred->adc_fullname.key;
-		if (! getpublickey(cred->adc_fullname.name, pkey_data)) {
-			debug("getpublickey");
-			return(AUTH_BADCRED);
-		}
-		pkey.n_bytes = pkey_data;
-		pkey.n_len = strlen(pkey_data) + 1;
-		if (key_decryptsession_pk(cred->adc_fullname.name, &pkey,
-				       sessionkey) < 0) {
-			debug("decryptsessionkey");
-			return (AUTH_BADCRED); /* key not found */
-		}
-	} else { /* ADN_NICKNAME */	
-		sid = (short)cred->adc_nickname;
-		if (sid < 0 || sid >= AUTHDES_CACHESZ) {
-			debug("bad nickname");
-			return (AUTH_BADCRED);	/* garbled credential */
-		}
-		sessionkey = &authdes_cache[sid].key;
-	}
-
-
-	/*
-	 * Decrypt the timestamp
-	 */
-	cryptbuf[0] = verf.adv_xtimestamp; 
-	if (cred->adc_namekind == ADN_FULLNAME) {
-		cryptbuf[1].key.high = cred->adc_fullname.window;
-		cryptbuf[1].key.low = verf.adv_winverf;
-		ivec.key.high = ivec.key.low = 0;	
-		status = cbc_crypt((char *)sessionkey, (char *)cryptbuf,
-			2*sizeof(des_block), DES_DECRYPT | DES_HW, 
-			(char *)&ivec);
-	} else {
-		status = ecb_crypt((char *)sessionkey, (char *)cryptbuf,
-			sizeof(des_block), DES_DECRYPT | DES_HW);
-	}
-	if (DES_FAILED(status)) {
-		debug("decryption failure");
-		return (AUTH_FAILED);	/* system error */
-	}
-
-	/*
-	 * XDR the decrypted timestamp
-	 */
-	ixdr = (long *)cryptbuf;
-	timestamp.tv_sec = IXDR_GET_LONG(ixdr);
-	timestamp.tv_usec = IXDR_GET_LONG(ixdr);
-
-	/*
- 	 * Check for valid credentials and verifiers.
-	 * They could be invalid because the key was flushed
-	 * out of the cache, and so a new session should begin.
-	 * Be sure and send AUTH_REJECTED{CRED, VERF} if this is the case.
-	 */
-	{
-		struct timeval current;
-		int nick;
-		int winverf;
-
-		if (cred->adc_namekind == ADN_FULLNAME) {
-			window = IXDR_GET_U_LONG(ixdr);
-			winverf = IXDR_GET_U_LONG(ixdr);
-			if (winverf != window - 1) {
-				debug("window verifier mismatch");
-				return (AUTH_BADCRED);	/* garbled credential */
-			}
-			sid = cache_spot(sessionkey, cred->adc_fullname.name, 
-			    &timestamp);
-			if (sid < 0) {
-				debug("replayed credential");
-				return (AUTH_REJECTEDCRED);	/* replay */
-			}
-			nick = 0;
-		} else {	/* ADN_NICKNAME */
-			window = authdes_cache[sid].window;
-			nick = 1;
-		}
-
-		if ((u_long)timestamp.tv_usec >= USEC_PER_SEC) {
-			debug("invalid usecs");
-			/* cached out (bad key), or garbled verifier */
-			return (nick ? AUTH_REJECTEDVERF : AUTH_BADVERF);
-		}
-		if (nick && BEFORE(&timestamp, 
-				   &authdes_cache[sid].laststamp)) {
-			debug("timestamp before last seen");
-			return (AUTH_REJECTEDVERF);	/* replay */
-		}
-		(void)gettimeofday(&current, NULL);
-		current.tv_sec -= window;	/* allow for expiration */
-		if (!BEFORE(&current, &timestamp)) {
-			debug("timestamp expired");
-			/* replay, or garbled credential */
-			return (nick ? AUTH_REJECTEDVERF : AUTH_BADCRED);
-		}
-	}
-
-	/*
-	 * Set up the reply verifier
-	 */
-	verf.adv_nickname = (u_long)sid;
-
-	/*
-	 * xdr the timestamp before encrypting
-	 */
-	ixdr = (long *)cryptbuf;
-	IXDR_PUT_LONG(ixdr, timestamp.tv_sec - 1);
-	IXDR_PUT_LONG(ixdr, timestamp.tv_usec);
-
-	/*	 
-	 * encrypt the timestamp
-	 */
-	status = ecb_crypt((char *)sessionkey, (char *)cryptbuf,
-	    sizeof(des_block), DES_ENCRYPT | DES_HW);
-	if (DES_FAILED(status)) {
-		debug("encryption failure");
-		return (AUTH_FAILED);	/* system error */
-	}
-	verf.adv_xtimestamp = cryptbuf[0];
-
-	/*
-	 * Serialize the reply verifier, and update rqst
-	 */
-	ixdr = (long *)msg->rm_call.cb_verf.oa_base;
-	*ixdr++ = (long)verf.adv_xtimestamp.key.high;
-	*ixdr++ = (long)verf.adv_xtimestamp.key.low;
-	*ixdr++ = (long)verf.adv_int_u;
-
-	rqst->rq_xprt->xp_verf.oa_flavor = AUTH_DES;
-	rqst->rq_xprt->xp_verf.oa_base = msg->rm_call.cb_verf.oa_base;
-	rqst->rq_xprt->xp_verf.oa_length = 
-		(char *)ixdr - msg->rm_call.cb_verf.oa_base;
-
-	/*
-	 * We succeeded, commit the data to the cache now and
-	 * finish cooking the credential.
-	 */
-	entry = &authdes_cache[sid];
-	entry->laststamp = timestamp;
-	cache_ref(sid);
-	if (cred->adc_namekind == ADN_FULLNAME) {
-		cred->adc_fullname.window = window;
-		cred->adc_nickname = (u_long)sid;	/* save nickname */
-		if (entry->rname != NULL) {
-			mem_free(entry->rname, strlen(entry->rname) + 1);
-		}
-		entry->rname = (char *)mem_alloc((u_int)strlen(cred->adc_fullname.name)
-					 + 1);
-		if (entry->rname != NULL) {
-			(void) strcpy(entry->rname, cred->adc_fullname.name);
-		} else {
-			debug("out of memory");
-		}
-		entry->key = *sessionkey;
-		entry->window = window;
-		invalidate(entry->localcred); /* mark any cached cred invalid */
-	} else { /* ADN_NICKNAME */
-		/*
-		 * nicknames are cooked into fullnames
-		 */	
-		cred->adc_namekind = ADN_FULLNAME;
-		cred->adc_fullname.name = entry->rname;
-		cred->adc_fullname.key = entry->key;
-		cred->adc_fullname.window = entry->window;
-	}
-	return (AUTH_OK);	/* we made it!*/
-}
-
-
-/*
- * Initialize the cache
- */
-static void
-cache_init()
-{
-	int i;
-
-	authdes_cache = (struct cache_entry *)
-		mem_alloc(sizeof(struct cache_entry) * AUTHDES_CACHESZ);	
-	bzero((char *)authdes_cache, 
-		sizeof(struct cache_entry) * AUTHDES_CACHESZ);
-
-	authdes_lru = (short *)mem_alloc(sizeof(short) * AUTHDES_CACHESZ);
-	/*
-	 * Initialize the lru list
-	 */
-	for (i = 0; i < AUTHDES_CACHESZ; i++) {
-		authdes_lru[i] = i;
-	}
-}
-
-
-/*
- * Find the lru victim
- */
-static short
-cache_victim()
-{
-	return (authdes_lru[AUTHDES_CACHESZ-1]);
-}
-
-/*
- * Note that sid was referenced
- */
-static void
-cache_ref(sid)
-	short sid;
-{
-	int i;
-	short curr;
-	short prev;
-
-	prev = authdes_lru[0];
-	authdes_lru[0] = sid;
-	for (i = 1; prev != sid; i++) {
-		curr = authdes_lru[i];
-		authdes_lru[i] = prev;
-		prev = curr;
-	}
-}
-
-
-/*
- * Find a spot in the cache for a credential containing
- * the items given.  Return -1 if a replay is detected, otherwise
- * return the spot in the cache.
- */
-static short
-cache_spot(key, name, timestamp)
-	des_block *key;
-	char *name;
-	struct timeval *timestamp;
-{
-	struct cache_entry *cp;
-	int i;
-	u_long hi;
-
-	hi = key->key.high;
-	for (cp = authdes_cache, i = 0; i < AUTHDES_CACHESZ; i++, cp++) {
-		if (cp->key.key.high == hi && 
-		    cp->key.key.low == key->key.low &&
-		    cp->rname != NULL &&
-		    bcmp(cp->rname, name, strlen(name) + 1) == 0) {
-			if (BEFORE(timestamp, &cp->laststamp)) {
-				svcauthdes_stats.ncachereplays++;
-				return (-1); /* replay */
-			}
-			svcauthdes_stats.ncachehits++;
-			return (i);	/* refresh */
-		}
-	}
-	svcauthdes_stats.ncachemisses++;
-	return (cache_victim());	/* new credential */
-}
-
-
-#if (defined(sun) || defined(vax) || defined(__FreeBSD__))
-/*
- * Local credential handling stuff.
- * NOTE: bsd unix dependent.
- * Other operating systems should put something else here.
- */
-#define UNKNOWN 	-2	/* grouplen, if cached cred is unknown user */
-#define INVALID		-1 	/* grouplen, if cache entry is invalid */
-
-struct bsdcred {
-	uid_t uid;		/* cached uid */
-	gid_t gid;		/* cached gid */
-	int grouplen;	/* length of cached groups */
-	gid_t groups[NGRPS];	/* cached groups */
-};
-
-/*
- * Map a des credential into a unix cred.
- * We cache the credential here so the application does
- * not have to make an rpc call every time to interpret
- * the credential.
- */
-int
-authdes_getucred(adc, uid, gid, grouplen, groups)
-	struct authdes_cred *adc;
-	uid_t *uid;
-	gid_t *gid;
-	int *grouplen;
-	gid_t *groups;
-{
-	unsigned sid;
-	int i;
-	uid_t i_uid;	
-	gid_t i_gid;
-	int i_grouplen;
-	struct bsdcred *cred;
-
-	sid = adc->adc_nickname;
-	if (sid >= AUTHDES_CACHESZ) {
-		debug("invalid nickname");
-		return (0);
-	}
-	cred = (struct bsdcred *)authdes_cache[sid].localcred;
-	if (cred == NULL) {
-		cred = (struct bsdcred *)mem_alloc(sizeof(struct bsdcred));
-		authdes_cache[sid].localcred = (char *)cred;
-		cred->grouplen = INVALID;
-	}
-	if (cred->grouplen == INVALID) {
-		/*
-		 * not in cache: lookup
-		 */
-		if (!netname2user(adc->adc_fullname.name, &i_uid, &i_gid, 
-			&i_grouplen, groups))
-		{
-			debug("unknown netname");
-			cred->grouplen = UNKNOWN;	/* mark as lookup up, but not found */
-			return (0);
-		}
-		debug("missed ucred cache");
-		*uid = cred->uid = i_uid;
-		*gid = cred->gid = i_gid;
-		*grouplen = cred->grouplen = i_grouplen;
-		for (i = i_grouplen - 1; i >= 0; i--) {
-			cred->groups[i] = groups[i]; /* int to short */
-		}
-		return (1);
-	} else if (cred->grouplen == UNKNOWN) {
-		/*
-		 * Already lookup up, but no match found
-		 */	
-		return (0);
-	}
-
-	/*
-	 * cached credentials
-	 */
-	*uid = cred->uid;
-	*gid = cred->gid;
-	*grouplen = cred->grouplen;
-	for (i = cred->grouplen - 1; i >= 0; i--) {
-		groups[i] = cred->groups[i];	/* short to int */
-	}
-	return (1);
-}
-
-static void
-invalidate(cred)
-	char *cred;
-{
-	if (cred == NULL) {
-		return;
-	}
-	((struct bsdcred *)cred)->grouplen = INVALID;
-}
-#endif
-
diff --git a/lib/libc_bsd/rpc/svc_auth_unix.c b/lib/libc_bsd/rpc/svc_auth_unix.c
deleted file mode 100644
index a14432a..0000000
--- a/lib/libc_bsd/rpc/svc_auth_unix.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)svc_auth_unix.c 1.28 88/02/08 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc_auth_unix.c	2.3 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc_auth_unix.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * svc_auth_unix.c
- * Handles UNIX flavor authentication parameters on the service side of rpc.
- * There are two svc auth implementations here: AUTH_UNIX and AUTH_SHORT.
- * _svcauth_unix does full blown unix style uid,gid+gids auth,
- * _svcauth_short uses a shorthand auth to index into a cache of longhand auths.
- * Note: the shorthand has been gutted for efficiency.
- *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- */
-
-#include "namespace.h"
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <rpc/rpc.h>
-#include "un-namespace.h"
-
-/*
- * Unix longhand authenticator
- */
-enum auth_stat
-_svcauth_unix(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-	enum auth_stat stat;
-	XDR xdrs;
-	struct authunix_parms *aup;
-	int32_t *buf;
-	struct area {
-		struct authunix_parms area_aup;
-		char area_machname[MAX_MACHINE_NAME+1];
-		u_int area_gids[NGRPS];
-	} *area;
-	u_int auth_len;
-	size_t str_len, gid_len;
-	u_int i;
-
-	assert(rqst != NULL);
-	assert(msg != NULL);
-
-	area = (struct area *) rqst->rq_clntcred;
-	aup = &area->area_aup;
-	aup->aup_machname = area->area_machname;
-	aup->aup_gids = area->area_gids;
-	auth_len = (u_int)msg->rm_call.cb_cred.oa_length;
-	xdrmem_create(&xdrs, msg->rm_call.cb_cred.oa_base, auth_len,XDR_DECODE);
-	buf = XDR_INLINE(&xdrs, auth_len);
-	if (buf != NULL) {
-		aup->aup_time = IXDR_GET_INT32(buf);
-		str_len = (size_t)IXDR_GET_U_INT32(buf);
-		if (str_len > MAX_MACHINE_NAME) {
-			stat = AUTH_BADCRED;
-			goto done;
-		}
-		memmove(aup->aup_machname, buf, str_len);
-		aup->aup_machname[str_len] = 0;
-		str_len = RNDUP(str_len);
-		buf += str_len / sizeof (int32_t);
-		aup->aup_uid = (int)IXDR_GET_INT32(buf);
-		aup->aup_gid = (int)IXDR_GET_INT32(buf);
-		gid_len = (size_t)IXDR_GET_U_INT32(buf);
-		if (gid_len > NGRPS) {
-			stat = AUTH_BADCRED;
-			goto done;
-		}
-		aup->aup_len = gid_len;
-		for (i = 0; i < gid_len; i++) {
-			aup->aup_gids[i] = (int)IXDR_GET_INT32(buf);
-		}
-		/*
-		 * five is the smallest unix credentials structure -
-		 * timestamp, hostname len (0), uid, gid, and gids len (0).
-		 */
-		if ((5 + gid_len) * BYTES_PER_XDR_UNIT + str_len > auth_len) {
-			(void) printf("bad auth_len gid %ld str %ld auth %u\n",
-			    (long)gid_len, (long)str_len, auth_len);
-			stat = AUTH_BADCRED;
-			goto done;
-		}
-	} else if (! xdr_authunix_parms(&xdrs, aup)) {
-		xdrs.x_op = XDR_FREE;
-		(void)xdr_authunix_parms(&xdrs, aup);
-		stat = AUTH_BADCRED;
-		goto done;
-	}
-
-       /* get the verifier */
-	if ((u_int)msg->rm_call.cb_verf.oa_length) {
-		rqst->rq_xprt->xp_verf.oa_flavor =
-			msg->rm_call.cb_verf.oa_flavor;
-		rqst->rq_xprt->xp_verf.oa_base =
-			msg->rm_call.cb_verf.oa_base;
-		rqst->rq_xprt->xp_verf.oa_length =
-			msg->rm_call.cb_verf.oa_length;
-	} else {
-		rqst->rq_xprt->xp_verf.oa_flavor = AUTH_NULL;
-		rqst->rq_xprt->xp_verf.oa_length = 0;
-	}
-	stat = AUTH_OK;
-done:
-	XDR_DESTROY(&xdrs);
-	return (stat);
-}
-
-
-/*
- * Shorthand unix authenticator
- * Looks up longhand in a cache.
- */
-/*ARGSUSED*/
-enum auth_stat 
-_svcauth_short(rqst, msg)
-	struct svc_req *rqst;
-	struct rpc_msg *msg;
-{
-	return (AUTH_REJECTEDCRED);
-}
diff --git a/lib/libc_bsd/rpc/svc_dg.c b/lib/libc_bsd/rpc/svc_dg.c
deleted file mode 100644
index 8217ffb..0000000
--- a/lib/libc_bsd/rpc/svc_dg.c
+++ /dev/null
@@ -1,738 +0,0 @@
-/*	$NetBSD: svc_dg.c,v 1.4 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)svc_dg.c	1.17	94/04/24 SMI"
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc_dg.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * svc_dg.c, Server side for connectionless RPC.
- *
- * Does some caching in the hopes of achieving execute-at-most-once semantics.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <rpc/rpc.h>
-#include <rpc/svc_dg.h>
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef RPC_CACHE_DEBUG
-#include <netconfig.h>
-#include <netdir.h>
-#endif
-#include <err.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-#define	su_data(xprt)	((struct svc_dg_data *)(xprt->xp_p2))
-#define	rpc_buffer(xprt) ((xprt)->xp_p1)
-
-#ifndef MAX
-#define	MAX(a, b)	(((a) > (b)) ? (a) : (b))
-#endif
-
-static void svc_dg_ops(SVCXPRT *);
-static enum xprt_stat svc_dg_stat(SVCXPRT *);
-static bool_t svc_dg_recv(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_dg_reply(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_dg_getargs(SVCXPRT *, xdrproc_t, void *);
-static bool_t svc_dg_freeargs(SVCXPRT *, xdrproc_t, void *);
-static void svc_dg_destroy(SVCXPRT *);
-static bool_t svc_dg_control(SVCXPRT *, const u_int, void *);
-static int cache_get(SVCXPRT *, struct rpc_msg *, char **, size_t *);
-static void cache_set(SVCXPRT *, size_t);
-int svc_dg_enablecache(SVCXPRT *, u_int);
-
-/*
- * Usage:
- *	xprt = svc_dg_create(sock, sendsize, recvsize);
- * Does other connectionless specific initializations.
- * Once *xprt is initialized, it is registered.
- * see (svc.h, xprt_register). If recvsize or sendsize are 0 suitable
- * system defaults are chosen.
- * The routines returns NULL if a problem occurred.
- */
-static const char svc_dg_str[] = "svc_dg_create: %s";
-static const char svc_dg_err1[] = "could not get transport information";
-static const char svc_dg_err2[] = "transport does not support data transfer";
-static const char svc_dg_err3[] = "getsockname failed";
-static const char svc_dg_err4[] = "cannot set IP_RECVDSTADDR";
-static const char __no_mem_str[] = "out of memory";
-
-SVCXPRT *
-svc_dg_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-	SVCXPRT *xprt;
-	struct svc_dg_data *su = NULL;
-	struct __rpc_sockinfo si;
-	struct sockaddr_storage ss;
-	socklen_t slen;
-
-	if (!__rpc_fd2sockinfo(fd, &si)) {
-		warnx(svc_dg_str, svc_dg_err1);
-		return (NULL);
-	}
-	/*
-	 * Find the receive and the send size
-	 */
-	sendsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsize);
-	recvsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsize);
-	if ((sendsize == 0) || (recvsize == 0)) {
-		warnx(svc_dg_str, svc_dg_err2);
-		return (NULL);
-	}
-
-	xprt = svc_xprt_alloc();
-	if (xprt == NULL)
-		goto freedata;
-
-	su = mem_alloc(sizeof (*su));
-	if (su == NULL)
-		goto freedata;
-	su->su_iosz = ((MAX(sendsize, recvsize) + 3) / 4) * 4;
-	if ((rpc_buffer(xprt) = mem_alloc(su->su_iosz)) == NULL)
-		goto freedata;
-	xdrmem_create(&(su->su_xdrs), rpc_buffer(xprt), su->su_iosz,
-		XDR_DECODE);
-	su->su_cache = NULL;
-	xprt->xp_fd = fd;
-	xprt->xp_p2 = su;
-	xprt->xp_verf.oa_base = su->su_verfbody;
-	svc_dg_ops(xprt);
-	xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
-
-	slen = sizeof ss;
-	if (_getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		warnx(svc_dg_str, svc_dg_err3);
-		goto freedata_nowarn;
-	}
-	xprt->xp_ltaddr.buf = mem_alloc(sizeof (struct sockaddr_storage));
-	xprt->xp_ltaddr.maxlen = sizeof (struct sockaddr_storage);
-	xprt->xp_ltaddr.len = slen;
-	memcpy(xprt->xp_ltaddr.buf, &ss, slen);
-
-	if (ss.ss_family == AF_INET) {
-		struct sockaddr_in *sin;
-		static const int true_value = 1;
-
-		sin = (struct sockaddr_in *)(void *)&ss;
-		if (sin->sin_addr.s_addr == INADDR_ANY) {
-		    su->su_srcaddr.buf = mem_alloc(sizeof (ss));
-		    su->su_srcaddr.maxlen = sizeof (ss);
-
-		    if (_setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR,
-				    &true_value, sizeof(true_value))) {
-			    warnx(svc_dg_str,  svc_dg_err4);
-			    goto freedata_nowarn;
-		    }
-		}
-	}
-
-	xprt_register(xprt);
-	return (xprt);
-freedata:
-	(void) warnx(svc_dg_str, __no_mem_str);
-freedata_nowarn:
-	if (xprt) {
-		if (su)
-			(void) mem_free(su, sizeof (*su));
-		svc_xprt_free(xprt);
-	}
-	return (NULL);
-}
-
-/*ARGSUSED*/
-static enum xprt_stat
-svc_dg_stat(xprt)
-	SVCXPRT *xprt;
-{
-	return (XPRT_IDLE);
-}
-
-static int
-svc_dg_recvfrom(int fd, char *buf, int buflen,
-    struct sockaddr *raddr, socklen_t *raddrlen,
-    struct sockaddr *laddr, socklen_t *laddrlen)
-{
-	struct msghdr msg;
-	struct iovec msg_iov[1];
-	struct sockaddr_in *lin = (struct sockaddr_in *)laddr;
-	int rlen;
-	bool_t have_lin = FALSE;
-	char tmp[CMSG_LEN(sizeof(*lin))];
-	struct cmsghdr *cmsg;
-
-	memset((char *)&msg, 0, sizeof(msg));
-	msg_iov[0].iov_base = buf;
-	msg_iov[0].iov_len = buflen;
-	msg.msg_iov = msg_iov;
-	msg.msg_iovlen = 1;
-	msg.msg_namelen = *raddrlen;
-	msg.msg_name = (char *)raddr;
-	if (laddr != NULL) {
-	    msg.msg_control = (caddr_t)tmp;
-	    msg.msg_controllen = CMSG_LEN(sizeof(*lin));
-	}
-	rlen = _recvmsg(fd, &msg, 0);
-	if (rlen >= 0)
-		*raddrlen = msg.msg_namelen;
-
-	if (rlen == -1 || laddr == NULL ||
-	    msg.msg_controllen < sizeof(struct cmsghdr) ||
-	    msg.msg_flags & MSG_CTRUNC)
-		return rlen;
-
-	for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
-	     cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-		if (cmsg->cmsg_level == IPPROTO_IP &&
-		    cmsg->cmsg_type == IP_RECVDSTADDR) {
-			have_lin = TRUE;
-			memcpy(&lin->sin_addr,
-			    (struct in_addr *)CMSG_DATA(cmsg),
-			    sizeof(struct in_addr));
-			break;
-		}
-	}
-
-	lin->sin_family = AF_INET;
-	lin->sin_port = 0;
-	*laddrlen = sizeof(struct sockaddr_in);
-
-	if (!have_lin)
-		lin->sin_addr.s_addr = INADDR_ANY;
-
-	return rlen;
-}
-
-static bool_t
-svc_dg_recv(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct svc_dg_data *su = su_data(xprt);
-	XDR *xdrs = &(su->su_xdrs);
-	char *reply;
-	struct sockaddr_storage ss;
-	socklen_t alen;
-	size_t replylen;
-	ssize_t rlen;
-
-again:
-	alen = sizeof (struct sockaddr_storage);
-	rlen = svc_dg_recvfrom(xprt->xp_fd, rpc_buffer(xprt), su->su_iosz,
-	    (struct sockaddr *)(void *)&ss, &alen,
-	    (struct sockaddr *)su->su_srcaddr.buf, &su->su_srcaddr.len);
-	if (rlen == -1 && errno == EINTR)
-		goto again;
-	if (rlen == -1 || (rlen < (ssize_t)(4 * sizeof (uint32_t))))
-		return (FALSE);
-	if (xprt->xp_rtaddr.len < alen) {
-		if (xprt->xp_rtaddr.len != 0)
-			mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.len);
-		xprt->xp_rtaddr.buf = mem_alloc(alen);
-		xprt->xp_rtaddr.len = alen;
-	}
-	memcpy(xprt->xp_rtaddr.buf, &ss, alen);
-#ifdef PORTMAP
-	if (ss.ss_family == AF_INET) {
-		xprt->xp_raddr = *(struct sockaddr_in *)xprt->xp_rtaddr.buf;
-		xprt->xp_addrlen = sizeof (struct sockaddr_in);
-	}
-#endif				/* PORTMAP */
-	xdrs->x_op = XDR_DECODE;
-	XDR_SETPOS(xdrs, 0);
-	if (! xdr_callmsg(xdrs, msg)) {
-		return (FALSE);
-	}
-	su->su_xid = msg->rm_xid;
-	if (su->su_cache != NULL) {
-		if (cache_get(xprt, msg, &reply, &replylen)) {
-			(void)_sendto(xprt->xp_fd, reply, replylen, 0,
-			    (struct sockaddr *)(void *)&ss, alen);
-			return (FALSE);
-		}
-	}
-	return (TRUE);
-}
-
-static int
-svc_dg_sendto(int fd, char *buf, int buflen,
-    const struct sockaddr *raddr, socklen_t raddrlen,
-    const struct sockaddr *laddr, socklen_t laddrlen)
-{
-	struct msghdr msg;
-	struct iovec msg_iov[1];
-	struct sockaddr_in *laddr_in = (struct sockaddr_in *)laddr;
-	struct in_addr *lin = &laddr_in->sin_addr;
-	char tmp[CMSG_SPACE(sizeof(*lin))];
-	struct cmsghdr *cmsg;
-
-	memset((char *)&msg, 0, sizeof(msg));
-	msg_iov[0].iov_base = buf;
-	msg_iov[0].iov_len = buflen;
-	msg.msg_iov = msg_iov;
-	msg.msg_iovlen = 1;
-	msg.msg_namelen = raddrlen;
-	msg.msg_name = (char *)raddr;
-
-	if (laddr != NULL && laddr->sa_family == AF_INET &&
-	    lin->s_addr != INADDR_ANY) {
-		msg.msg_control = (caddr_t)tmp;
-		msg.msg_controllen = CMSG_LEN(sizeof(*lin));
-		cmsg = CMSG_FIRSTHDR(&msg);
-		cmsg->cmsg_len = CMSG_LEN(sizeof(*lin));
-		cmsg->cmsg_level = IPPROTO_IP;
-		cmsg->cmsg_type = IP_SENDSRCADDR;
-		memcpy(CMSG_DATA(cmsg), lin, sizeof(*lin));
-	}
-
-	return _sendmsg(fd, &msg, 0);
-}
-
-static bool_t
-svc_dg_reply(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct svc_dg_data *su = su_data(xprt);
-	XDR *xdrs = &(su->su_xdrs);
-	bool_t stat = TRUE;
-	size_t slen;
-	xdrproc_t xdr_proc;
-	caddr_t xdr_where;
-
-	xdrs->x_op = XDR_ENCODE;
-	XDR_SETPOS(xdrs, 0);
-	msg->rm_xid = su->su_xid;
-	if (msg->rm_reply.rp_stat == MSG_ACCEPTED &&
-	    msg->rm_reply.rp_acpt.ar_stat == SUCCESS) {
-		xdr_proc = msg->acpted_rply.ar_results.proc;
-		xdr_where = msg->acpted_rply.ar_results.where;
-		msg->acpted_rply.ar_results.proc = (xdrproc_t) xdr_void;
-		msg->acpted_rply.ar_results.where = NULL;
-
-		if (!xdr_replymsg(xdrs, msg) ||
-		    !SVCAUTH_WRAP(&SVC_AUTH(xprt), xdrs, xdr_proc, xdr_where))
-			stat = FALSE;
-	} else {
-		stat = xdr_replymsg(xdrs, msg);
-	}
-	if (stat) {
-		slen = XDR_GETPOS(xdrs);
-		if (svc_dg_sendto(xprt->xp_fd, rpc_buffer(xprt), slen,
-		    (struct sockaddr *)xprt->xp_rtaddr.buf,
-		    (socklen_t)xprt->xp_rtaddr.len,
-		    (struct sockaddr *)su->su_srcaddr.buf,
-		    (socklen_t)su->su_srcaddr.len) == (ssize_t) slen) {
-			stat = TRUE;
-			if (su->su_cache)
-				cache_set(xprt, slen);
-		}
-	}
-	return (stat);
-}
-
-static bool_t
-svc_dg_getargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	struct svc_dg_data *su;
-
-	assert(xprt != NULL);
-	su = su_data(xprt);
-	return (SVCAUTH_UNWRAP(&SVC_AUTH(xprt),
-		&su->su_xdrs, xdr_args, args_ptr));
-}
-
-static bool_t
-svc_dg_freeargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	XDR *xdrs = &(su_data(xprt)->su_xdrs);
-
-	xdrs->x_op = XDR_FREE;
-	return (*xdr_args)(xdrs, args_ptr);
-}
-
-static void
-svc_dg_destroy(xprt)
-	SVCXPRT *xprt;
-{
-	struct svc_dg_data *su = su_data(xprt);
-
-	xprt_unregister(xprt);
-	if (xprt->xp_fd != -1)
-		(void)_close(xprt->xp_fd);
-	XDR_DESTROY(&(su->su_xdrs));
-	(void) mem_free(rpc_buffer(xprt), su->su_iosz);
-	if (su->su_srcaddr.buf)
-		(void) mem_free(su->su_srcaddr.buf, su->su_srcaddr.maxlen);
-	(void) mem_free(su, sizeof (*su));
-	if (xprt->xp_rtaddr.buf)
-		(void) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
-	if (xprt->xp_ltaddr.buf)
-		(void) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen);
-	if (xprt->xp_tp)
-		(void) free(xprt->xp_tp);
-	svc_xprt_free(xprt);
-}
-
-static bool_t
-/*ARGSUSED*/
-svc_dg_control(xprt, rq, in)
-	SVCXPRT *xprt;
-	const u_int	rq;
-	void		*in;
-{
-	return (FALSE);
-}
-
-static void
-svc_dg_ops(xprt)
-	SVCXPRT *xprt;
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-
-/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = svc_dg_recv;
-		ops.xp_stat = svc_dg_stat;
-		ops.xp_getargs = svc_dg_getargs;
-		ops.xp_reply = svc_dg_reply;
-		ops.xp_freeargs = svc_dg_freeargs;
-		ops.xp_destroy = svc_dg_destroy;
-		ops2.xp_control = svc_dg_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
-
-/*  The CACHING COMPONENT */
-
-/*
- * Could have been a separate file, but some part of it depends upon the
- * private structure of the client handle.
- *
- * Fifo cache for cl server
- * Copies pointers to reply buffers into fifo cache
- * Buffers are sent again if retransmissions are detected.
- */
-
-#define	SPARSENESS 4	/* 75% sparse */
-
-#define	ALLOC(type, size)	\
-	(type *) mem_alloc((sizeof (type) * (size)))
-
-#define	MEMZERO(addr, type, size)	 \
-	(void) memset((void *) (addr), 0, sizeof (type) * (int) (size))
-
-#define	FREE(addr, type, size)	\
-	mem_free((addr), (sizeof (type) * (size)))
-
-/*
- * An entry in the cache
- */
-typedef struct cache_node *cache_ptr;
-struct cache_node {
-	/*
-	 * Index into cache is xid, proc, vers, prog and address
-	 */
-	uint32_t cache_xid;
-	rpcproc_t cache_proc;
-	rpcvers_t cache_vers;
-	rpcprog_t cache_prog;
-	struct netbuf cache_addr;
-	/*
-	 * The cached reply and length
-	 */
-	char *cache_reply;
-	size_t cache_replylen;
-	/*
-	 * Next node on the list, if there is a collision
-	 */
-	cache_ptr cache_next;
-};
-
-/*
- * The entire cache
- */
-struct cl_cache {
-	u_int uc_size;		/* size of cache */
-	cache_ptr *uc_entries;	/* hash table of entries in cache */
-	cache_ptr *uc_fifo;	/* fifo list of entries in cache */
-	u_int uc_nextvictim;	/* points to next victim in fifo list */
-	rpcprog_t uc_prog;	/* saved program number */
-	rpcvers_t uc_vers;	/* saved version number */
-	rpcproc_t uc_proc;	/* saved procedure number */
-};
-
-
-/*
- * the hashing function
- */
-#define	CACHE_LOC(transp, xid)	\
-	(xid % (SPARSENESS * ((struct cl_cache *) \
-		su_data(transp)->su_cache)->uc_size))
-
-/*
- * Enable use of the cache. Returns 1 on success, 0 on failure.
- * Note: there is no disable.
- */
-static const char cache_enable_str[] = "svc_enablecache: %s %s";
-static const char alloc_err[] = "could not allocate cache ";
-static const char enable_err[] = "cache already enabled";
-
-int
-svc_dg_enablecache(transp, size)
-	SVCXPRT *transp;
-	u_int size;
-{
-	struct svc_dg_data *su = su_data(transp);
-	struct cl_cache *uc;
-
-	mutex_lock(&dupreq_lock);
-	if (su->su_cache != NULL) {
-		(void) warnx(cache_enable_str, enable_err, " ");
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	uc = ALLOC(struct cl_cache, 1);
-	if (uc == NULL) {
-		warnx(cache_enable_str, alloc_err, " ");
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	uc->uc_size = size;
-	uc->uc_nextvictim = 0;
-	uc->uc_entries = ALLOC(cache_ptr, size * SPARSENESS);
-	if (uc->uc_entries == NULL) {
-		warnx(cache_enable_str, alloc_err, "data");
-		FREE(uc, struct cl_cache, 1);
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	MEMZERO(uc->uc_entries, cache_ptr, size * SPARSENESS);
-	uc->uc_fifo = ALLOC(cache_ptr, size);
-	if (uc->uc_fifo == NULL) {
-		warnx(cache_enable_str, alloc_err, "fifo");
-		FREE(uc->uc_entries, cache_ptr, size * SPARSENESS);
-		FREE(uc, struct cl_cache, 1);
-		mutex_unlock(&dupreq_lock);
-		return (0);
-	}
-	MEMZERO(uc->uc_fifo, cache_ptr, size);
-	su->su_cache = (char *)(void *)uc;
-	mutex_unlock(&dupreq_lock);
-	return (1);
-}
-
-/*
- * Set an entry in the cache.  It assumes that the uc entry is set from
- * the earlier call to cache_get() for the same procedure.  This will always
- * happen because cache_get() is calle by svc_dg_recv and cache_set() is called
- * by svc_dg_reply().  All this hoopla because the right RPC parameters are
- * not available at svc_dg_reply time.
- */
-
-static const char cache_set_str[] = "cache_set: %s";
-static const char cache_set_err1[] = "victim not found";
-static const char cache_set_err2[] = "victim alloc failed";
-static const char cache_set_err3[] = "could not allocate new rpc buffer";
-
-static void
-cache_set(xprt, replylen)
-	SVCXPRT *xprt;
-	size_t replylen;
-{
-	cache_ptr victim;
-	cache_ptr *vicp;
-	struct svc_dg_data *su = su_data(xprt);
-	struct cl_cache *uc = (struct cl_cache *) su->su_cache;
-	u_int loc;
-	char *newbuf;
-#ifdef RPC_CACHE_DEBUG
-	struct netconfig *nconf;
-	char *uaddr;
-#endif
-
-	mutex_lock(&dupreq_lock);
-	/*
-	 * Find space for the new entry, either by
-	 * reusing an old entry, or by mallocing a new one
-	 */
-	victim = uc->uc_fifo[uc->uc_nextvictim];
-	if (victim != NULL) {
-		loc = CACHE_LOC(xprt, victim->cache_xid);
-		for (vicp = &uc->uc_entries[loc];
-			*vicp != NULL && *vicp != victim;
-			vicp = &(*vicp)->cache_next)
-			;
-		if (*vicp == NULL) {
-			warnx(cache_set_str, cache_set_err1);
-			mutex_unlock(&dupreq_lock);
-			return;
-		}
-		*vicp = victim->cache_next;	/* remove from cache */
-		newbuf = victim->cache_reply;
-	} else {
-		victim = ALLOC(struct cache_node, 1);
-		if (victim == NULL) {
-			warnx(cache_set_str, cache_set_err2);
-			mutex_unlock(&dupreq_lock);
-			return;
-		}
-		newbuf = mem_alloc(su->su_iosz);
-		if (newbuf == NULL) {
-			warnx(cache_set_str, cache_set_err3);
-			FREE(victim, struct cache_node, 1);
-			mutex_unlock(&dupreq_lock);
-			return;
-		}
-	}
-
-	/*
-	 * Store it away
-	 */
-#ifdef RPC_CACHE_DEBUG
-	if (nconf = getnetconfigent(xprt->xp_netid)) {
-		uaddr = taddr2uaddr(nconf, &xprt->xp_rtaddr);
-		freenetconfigent(nconf);
-		printf(
-	"cache set for xid= %x prog=%d vers=%d proc=%d for rmtaddr=%s\n",
-			su->su_xid, uc->uc_prog, uc->uc_vers,
-			uc->uc_proc, uaddr);
-		free(uaddr);
-	}
-#endif
-	victim->cache_replylen = replylen;
-	victim->cache_reply = rpc_buffer(xprt);
-	rpc_buffer(xprt) = newbuf;
-	xdrmem_create(&(su->su_xdrs), rpc_buffer(xprt),
-			su->su_iosz, XDR_ENCODE);
-	victim->cache_xid = su->su_xid;
-	victim->cache_proc = uc->uc_proc;
-	victim->cache_vers = uc->uc_vers;
-	victim->cache_prog = uc->uc_prog;
-	victim->cache_addr = xprt->xp_rtaddr;
-	victim->cache_addr.buf = ALLOC(char, xprt->xp_rtaddr.len);
-	(void) memcpy(victim->cache_addr.buf, xprt->xp_rtaddr.buf,
-	    (size_t)xprt->xp_rtaddr.len);
-	loc = CACHE_LOC(xprt, victim->cache_xid);
-	victim->cache_next = uc->uc_entries[loc];
-	uc->uc_entries[loc] = victim;
-	uc->uc_fifo[uc->uc_nextvictim++] = victim;
-	uc->uc_nextvictim %= uc->uc_size;
-	mutex_unlock(&dupreq_lock);
-}
-
-/*
- * Try to get an entry from the cache
- * return 1 if found, 0 if not found and set the stage for cache_set()
- */
-static int
-cache_get(xprt, msg, replyp, replylenp)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-	char **replyp;
-	size_t *replylenp;
-{
-	u_int loc;
-	cache_ptr ent;
-	struct svc_dg_data *su = su_data(xprt);
-	struct cl_cache *uc = (struct cl_cache *) su->su_cache;
-#ifdef RPC_CACHE_DEBUG
-	struct netconfig *nconf;
-	char *uaddr;
-#endif
-
-	mutex_lock(&dupreq_lock);
-	loc = CACHE_LOC(xprt, su->su_xid);
-	for (ent = uc->uc_entries[loc]; ent != NULL; ent = ent->cache_next) {
-		if (ent->cache_xid == su->su_xid &&
-			ent->cache_proc == msg->rm_call.cb_proc &&
-			ent->cache_vers == msg->rm_call.cb_vers &&
-			ent->cache_prog == msg->rm_call.cb_prog &&
-			ent->cache_addr.len == xprt->xp_rtaddr.len &&
-			(memcmp(ent->cache_addr.buf, xprt->xp_rtaddr.buf,
-				xprt->xp_rtaddr.len) == 0)) {
-#ifdef RPC_CACHE_DEBUG
-			if (nconf = getnetconfigent(xprt->xp_netid)) {
-				uaddr = taddr2uaddr(nconf, &xprt->xp_rtaddr);
-				freenetconfigent(nconf);
-				printf(
-	"cache entry found for xid=%x prog=%d vers=%d proc=%d for rmtaddr=%s\n",
-					su->su_xid, msg->rm_call.cb_prog,
-					msg->rm_call.cb_vers,
-					msg->rm_call.cb_proc, uaddr);
-				free(uaddr);
-			}
-#endif
-			*replyp = ent->cache_reply;
-			*replylenp = ent->cache_replylen;
-			mutex_unlock(&dupreq_lock);
-			return (1);
-		}
-	}
-	/*
-	 * Failed to find entry
-	 * Remember a few things so we can do a set later
-	 */
-	uc->uc_proc = msg->rm_call.cb_proc;
-	uc->uc_vers = msg->rm_call.cb_vers;
-	uc->uc_prog = msg->rm_call.cb_prog;
-	mutex_unlock(&dupreq_lock);
-	return (0);
-}
diff --git a/lib/libc_bsd/rpc/svc_generic.c b/lib/libc_bsd/rpc/svc_generic.c
deleted file mode 100644
index 4b1aeba..0000000
--- a/lib/libc_bsd/rpc/svc_generic.c
+++ /dev/null
@@ -1,310 +0,0 @@
-/*	$NetBSD: svc_generic.c,v 1.3 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#ident	"@(#)svc_generic.c	1.19	94/04/24 SMI" 
-static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc_generic.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * svc_generic.c, Server side for RPC.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <err.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-extern int __svc_vc_setflag(SVCXPRT *, int);
-
-/*
- * The highest level interface for server creation.
- * It tries for all the nettokens in that particular class of token
- * and returns the number of handles it can create and/or find.
- *
- * It creates a link list of all the handles it could create.
- * If svc_create() is called multiple times, it uses the handle
- * created earlier instead of creating a new handle every time.
- */
-int
-svc_create(dispatch, prognum, versnum, nettype)
-	void (*dispatch)(struct svc_req *, SVCXPRT *);
-	rpcprog_t prognum;		/* Program number */
-	rpcvers_t versnum;		/* Version number */
-	const char *nettype;		/* Networktype token */
-{
-	struct xlist {
-		SVCXPRT *xprt;		/* Server handle */
-		struct xlist *next;	/* Next item */
-	} *l;
-	static struct xlist *xprtlist;	/* A link list of all the handles */
-	int num = 0;
-	SVCXPRT *xprt;
-	struct netconfig *nconf;
-	void *handle;
-
-/* VARIABLES PROTECTED BY xprtlist_lock: xprtlist */
-
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		warnx("svc_create: unknown protocol");
-		return (0);
-	}
-	while ((nconf = __rpc_getconf(handle)) != NULL) {
-		mutex_lock(&xprtlist_lock);
-		for (l = xprtlist; l; l = l->next) {
-			if (strcmp(l->xprt->xp_netid, nconf->nc_netid) == 0) {
-				/* Found an old one, use it */
-				(void) rpcb_unset(prognum, versnum, nconf);
-				if (svc_reg(l->xprt, prognum, versnum,
-					dispatch, nconf) == FALSE)
-					warnx(
-		"svc_create: could not register prog %u vers %u on %s",
-					(unsigned)prognum, (unsigned)versnum,
-					 nconf->nc_netid);
-				else
-					num++;
-				break;
-			}
-		}
-		if (l == NULL) {
-			/* It was not found. Now create a new one */
-			xprt = svc_tp_create(dispatch, prognum, versnum, nconf);
-			if (xprt) {
-				l = (struct xlist *)malloc(sizeof (*l));
-				if (l == NULL) {
-					warnx("svc_create: no memory");
-					mutex_unlock(&xprtlist_lock);
-					return (0);
-				}
-				l->xprt = xprt;
-				l->next = xprtlist;
-				xprtlist = l;
-				num++;
-			}
-		}
-		mutex_unlock(&xprtlist_lock);
-	}
-	__rpc_endconf(handle);
-	/*
-	 * In case of num == 0; the error messages are generated by the
-	 * underlying layers; and hence not needed here.
-	 */
-	return (num);
-}
-
-/*
- * The high level interface to svc_tli_create().
- * It tries to create a server for "nconf" and registers the service
- * with the rpcbind. It calls svc_tli_create();
- */
-SVCXPRT *
-svc_tp_create(dispatch, prognum, versnum, nconf)
-	void (*dispatch)(struct svc_req *, SVCXPRT *);
-	rpcprog_t prognum;		/* Program number */
-	rpcvers_t versnum;		/* Version number */
-	const struct netconfig *nconf; /* Netconfig structure for the network */
-{
-	SVCXPRT *xprt;
-
-	if (nconf == NULL) {
-		warnx(
-	"svc_tp_create: invalid netconfig structure for prog %u vers %u",
-				(unsigned)prognum, (unsigned)versnum);
-		return (NULL);
-	}
-	xprt = svc_tli_create(RPC_ANYFD, nconf, NULL, 0, 0);
-	if (xprt == NULL) {
-		return (NULL);
-	}
-	/*LINTED const castaway*/
-	(void) rpcb_unset(prognum, versnum, (struct netconfig *) nconf);
-	if (svc_reg(xprt, prognum, versnum, dispatch, nconf) == FALSE) {
-		warnx(
-		"svc_tp_create: Could not register prog %u vers %u on %s",
-				(unsigned)prognum, (unsigned)versnum,
-				nconf->nc_netid);
-		SVC_DESTROY(xprt);
-		return (NULL);
-	}
-	return (xprt);
-}
-
-/*
- * If fd is RPC_ANYFD, then it opens a fd for the given transport
- * provider (nconf cannot be NULL then). If the t_state is T_UNBND and
- * bindaddr is NON-NULL, it performs a t_bind using the bindaddr. For
- * NULL bindadr and Connection oriented transports, the value of qlen
- * is set to 8.
- *
- * If sendsz or recvsz are zero, their default values are chosen.
- */
-SVCXPRT *
-svc_tli_create(fd, nconf, bindaddr, sendsz, recvsz)
-	int fd;				/* Connection end point */
-	const struct netconfig *nconf;	/* Netconfig struct for nettoken */
-	const struct t_bind *bindaddr;	/* Local bind address */
-	u_int sendsz;			/* Max sendsize */
-	u_int recvsz;			/* Max recvsize */
-{
-	SVCXPRT *xprt = NULL;		/* service handle */
-	bool_t madefd = FALSE;		/* whether fd opened here  */
-	struct __rpc_sockinfo si;
-	struct sockaddr_storage ss;
-	socklen_t slen;
-
-	if (fd == RPC_ANYFD) {
-		if (nconf == NULL) {
-			warnx("svc_tli_create: invalid netconfig");
-			return (NULL);
-		}
-		fd = __rpc_nconf2fd(nconf);
-		if (fd == -1) {
-			warnx(
-			    "svc_tli_create: could not open connection for %s",
-					nconf->nc_netid);
-			return (NULL);
-		}
-		__rpc_nconf2sockinfo(nconf, &si);
-		madefd = TRUE;
-	} else {
-		/*
-		 * It is an open descriptor. Get the transport info.
-		 */
-		if (!__rpc_fd2sockinfo(fd, &si)) {
-			warnx(
-		"svc_tli_create: could not get transport information");
-			return (NULL);
-		}
-	}
-
-	/*
-	 * If the fd is unbound, try to bind it.
-	 */
-	if (madefd || !__rpc_sockisbound(fd)) {
-		if (bindaddr == NULL) {
-			if (bindresvport(fd, NULL) < 0) {
-				memset(&ss, 0, sizeof ss);
-				ss.ss_family = si.si_af;
-				ss.ss_len = si.si_alen;
-				if (_bind(fd, (struct sockaddr *)(void *)&ss,
-				    (socklen_t)si.si_alen) < 0) {
-					warnx(
-			"svc_tli_create: could not bind to anonymous port");
-					goto freedata;
-				}
-			}
-			_listen(fd, SOMAXCONN);
-		} else {
-			if (_bind(fd,
-			    (struct sockaddr *)bindaddr->addr.buf,
-			    (socklen_t)si.si_alen) < 0) {
-				warnx(
-		"svc_tli_create: could not bind to requested address");
-				goto freedata;
-			}
-			_listen(fd, (int)bindaddr->qlen);
-		}
-			
-	}
-	/*
-	 * call transport specific function.
-	 */
-	switch (si.si_socktype) {
-		case SOCK_STREAM:
-			slen = sizeof ss;
-			if (_getpeername(fd, (struct sockaddr *)(void *)&ss, &slen)
-			    == 0) {
-				/* accepted socket */
-				xprt = svc_fd_create(fd, sendsz, recvsz);
-			} else
-				xprt = svc_vc_create(fd, sendsz, recvsz);
-			if (!nconf || !xprt)
-				break;
-#if 0
-			/* XXX fvdl */
-			if (strcmp(nconf->nc_protofmly, "inet") == 0 ||
-			    strcmp(nconf->nc_protofmly, "inet6") == 0)
-				(void) __svc_vc_setflag(xprt, TRUE);
-#endif
-			break;
-		case SOCK_DGRAM:
-			xprt = svc_dg_create(fd, sendsz, recvsz);
-			break;
-		default:
-			warnx("svc_tli_create: bad service type");
-			goto freedata;
-	}
-
-	if (xprt == NULL)
-		/*
-		 * The error messages here are spitted out by the lower layers:
-		 * svc_vc_create(), svc_fd_create() and svc_dg_create().
-		 */
-		goto freedata;
-
-	/* Fill in type of service */
-	xprt->xp_type = __rpc_socktype2seman(si.si_socktype);
-
-	if (nconf) {
-		xprt->xp_netid = strdup(nconf->nc_netid);
-		xprt->xp_tp = strdup(nconf->nc_device);
-	}
-	return (xprt);
-
-freedata:
-	if (madefd)
-		(void)_close(fd);
-	if (xprt) {
-		if (!madefd) /* so that svc_destroy doesnt close fd */
-			xprt->xp_fd = RPC_ANYFD;
-		SVC_DESTROY(xprt);
-	}
-	return (NULL);
-}
diff --git a/lib/libc_bsd/rpc/svc_raw.c b/lib/libc_bsd/rpc/svc_raw.c
deleted file mode 100644
index fe959f2..0000000
--- a/lib/libc_bsd/rpc/svc_raw.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*	$NetBSD: svc_raw.c,v 1.14 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #ident	"@(#)svc_raw.c	1.16	94/04/24 SMI" */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)svc_raw.c 1.25 89/01/31 Copyr 1984 Sun Micro";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc_raw.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * svc_raw.c,   This a toy for simple testing and timing.
- * Interface to create an rpc client and server in the same UNIX process.
- * This lets us similate rpc and get rpc (round trip) overhead, without
- * any interference from the kernel.
- *
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <rpc/rpc.h>
-#include <sys/types.h>
-#include <rpc/raw.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "mt_misc.h"
-
-#ifndef UDPMSGSIZE
-#define	UDPMSGSIZE 8800
-#endif
-
-/*
- * This is the "network" that we will be moving data over
- */
-static struct svc_raw_private {
-	char	*raw_buf;	/* should be shared with the cl handle */
-	SVCXPRT	*server;
-	XDR	xdr_stream;
-	char	verf_body[MAX_AUTH_BYTES];
-} *svc_raw_private;
-
-static enum xprt_stat svc_raw_stat(SVCXPRT *);
-static bool_t svc_raw_recv(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_raw_reply(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_raw_getargs(SVCXPRT *, xdrproc_t, void *);
-static bool_t svc_raw_freeargs(SVCXPRT *, xdrproc_t, void *);
-static void svc_raw_destroy(SVCXPRT *);
-static void svc_raw_ops(SVCXPRT *);
-static bool_t svc_raw_control(SVCXPRT *, const u_int, void *);
-
-char *__rpc_rawcombuf = NULL;
-
-SVCXPRT *
-svc_raw_create()
-{
-	struct svc_raw_private *srp;
-/* VARIABLES PROTECTED BY svcraw_lock: svc_raw_private, srp */
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		srp = (struct svc_raw_private *)calloc(1, sizeof (*srp));
-		if (srp == NULL) {
-			mutex_unlock(&svcraw_lock);
-			return (NULL);
-		}
-		if (__rpc_rawcombuf == NULL) {
-			__rpc_rawcombuf = calloc(UDPMSGSIZE, sizeof (char));
-			if (__rpc_rawcombuf == NULL) {
-				free(srp);
-				mutex_unlock(&svcraw_lock);
-				return (NULL);
-			}
-		}
-		srp->raw_buf = __rpc_rawcombuf; /* Share it with the client */
-		srp->server = svc_xprt_alloc();
-		if (srp->server == NULL) {
-			free(__rpc_rawcombuf);
-			free(srp);
-			mutex_unlock(&svcraw_lock);
-			return (NULL);
-		}
-		svc_raw_private = srp;
-	}
-	srp->server->xp_fd = FD_SETSIZE;
-	srp->server->xp_port = 0;
-	svc_raw_ops(srp->server);
-	srp->server->xp_verf.oa_base = srp->verf_body;
-	xdrmem_create(&srp->xdr_stream, srp->raw_buf, UDPMSGSIZE, XDR_DECODE);
-	xprt_register(srp->server);
-	mutex_unlock(&svcraw_lock);
-	return (srp->server);
-}
-
-/*ARGSUSED*/
-static enum xprt_stat
-svc_raw_stat(xprt)
-SVCXPRT *xprt; /* args needed to satisfy ANSI-C typechecking */
-{
-	return (XPRT_IDLE);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_recv(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct svc_raw_private *srp;
-	XDR *xdrs;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	xdrs = &srp->xdr_stream;
-	xdrs->x_op = XDR_DECODE;
-	(void) XDR_SETPOS(xdrs, 0);
-	if (! xdr_callmsg(xdrs, msg)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_reply(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct svc_raw_private *srp;
-	XDR *xdrs;
-	bool_t stat;
-	xdrproc_t xdr_proc;
-	caddr_t xdr_where;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	xdrs = &srp->xdr_stream;
-	xdrs->x_op = XDR_ENCODE;
-	(void) XDR_SETPOS(xdrs, 0);
-	if (msg->rm_reply.rp_stat == MSG_ACCEPTED &&
-	    msg->rm_reply.rp_acpt.ar_stat == SUCCESS) {
-		xdr_proc = msg->acpted_rply.ar_results.proc;
-		xdr_where = msg->acpted_rply.ar_results.where;
-		msg->acpted_rply.ar_results.proc = (xdrproc_t) xdr_void;
-		msg->acpted_rply.ar_results.where = NULL;
-
-		stat = xdr_replymsg(xdrs, msg) &&
-		    SVCAUTH_WRAP(&SVC_AUTH(xprt), xdrs, xdr_proc, xdr_where);
-	} else {
-		stat = xdr_replymsg(xdrs, msg);
-	}
-	if (!stat) {
-		return (FALSE);
-	}
-	(void) XDR_GETPOS(xdrs);  /* called just for overhead */
-	return (TRUE);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_getargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	struct svc_raw_private *srp;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	return (SVCAUTH_UNWRAP(&SVC_AUTH(xprt), &srp->xdr_stream,
-		xdr_args, args_ptr));
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_freeargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	struct svc_raw_private *srp;
-	XDR *xdrs;
-
-	mutex_lock(&svcraw_lock);
-	srp = svc_raw_private;
-	if (srp == NULL) {
-		mutex_unlock(&svcraw_lock);
-		return (FALSE);
-	}
-	mutex_unlock(&svcraw_lock);
-
-	xdrs = &srp->xdr_stream;
-	xdrs->x_op = XDR_FREE;
-	return (*xdr_args)(xdrs, args_ptr);
-}
-
-/*ARGSUSED*/
-static void
-svc_raw_destroy(xprt)
-SVCXPRT *xprt;
-{
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_raw_control(xprt, rq, in)
-	SVCXPRT *xprt;
-	const u_int	rq;
-	void		*in;
-{
-	return (FALSE);
-}
-
-static void
-svc_raw_ops(xprt)
-	SVCXPRT *xprt;
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-
-/* VARIABLES PROTECTED BY ops_lock: ops */
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = svc_raw_recv;
-		ops.xp_stat = svc_raw_stat;
-		ops.xp_getargs = svc_raw_getargs;
-		ops.xp_reply = svc_raw_reply;
-		ops.xp_freeargs = svc_raw_freeargs;
-		ops.xp_destroy = svc_raw_destroy;
-		ops2.xp_control = svc_raw_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
diff --git a/lib/libc_bsd/rpc/svc_run.c b/lib/libc_bsd/rpc/svc_run.c
deleted file mode 100644
index 1d226e5..0000000
--- a/lib/libc_bsd/rpc/svc_run.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*	$NetBSD: svc_run.c,v 1.17 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "from: @(#)svc_run.c 1.1 87/10/13 Copyr 1984 Sun Micro";
-static char *sccsid = "from: @(#)svc_run.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc_run.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * This is the rpc server side idle loop
- * Wait for input, call server program.
- */
-#include "namespace.h"
-#include "reentrant.h"
-#include <err.h>
-#include <errno.h>
-#include <rpc/rpc.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include <rpc/rpc.h>
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-void
-svc_run()
-{
-	fd_set readfds, cleanfds;
-	struct timeval timeout;
-
-	timeout.tv_sec = 30;
-	timeout.tv_usec = 0;
-
-	for (;;) {
-		rwlock_rdlock(&svc_fd_lock);
-		readfds = svc_fdset;
-		cleanfds = svc_fdset;
-		rwlock_unlock(&svc_fd_lock);
-		switch (_select(svc_maxfd+1, &readfds, NULL, NULL, &timeout)) {
-		case -1:
-			FD_ZERO(&readfds);
-			if (errno == EINTR) {
-				continue;
-			}
-			_warn("svc_run: - select failed");
-			return;
-		case 0:
-			__svc_clean_idle(&cleanfds, 30, FALSE);
-			continue;
-		default:
-			svc_getreqset(&readfds);
-		}
-	}
-}
-
-/*
- *      This function causes svc_run() to exit by telling it that it has no
- *      more work to do.
- */
-void
-svc_exit()
-{
-	rwlock_wrlock(&svc_fd_lock);
-	FD_ZERO(&svc_fdset);
-	rwlock_unlock(&svc_fd_lock);
-}
diff --git a/lib/libc_bsd/rpc/svc_simple.c b/lib/libc_bsd/rpc/svc_simple.c
deleted file mode 100644
index e215fd6..0000000
--- a/lib/libc_bsd/rpc/svc_simple.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/*	$NetBSD: svc_simple.c,v 1.20 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-/*
- * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
- */
-
-/* #pragma ident	"@(#)svc_simple.c	1.18	94/04/24 SMI" */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc_simple.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * svc_simple.c
- * Simplified front end to rpc.
- */
-
-/*
- * This interface creates a virtual listener for all the services
- * started thru rpc_reg(). It listens on the same endpoint for
- * all the services and then executes the corresponding service
- * for the given prognum and procnum.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <rpc/rpc.h>
-#include <rpc/nettype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <err.h>
-#include "un-namespace.h"
-
-#include "rpc_com.h"
-#include "mt_misc.h"
-
-static void universal(struct svc_req *, SVCXPRT *);
-
-static struct proglst {
-	char *(*p_progname)(char *);
-	rpcprog_t p_prognum;
-	rpcvers_t p_versnum;
-	rpcproc_t p_procnum;
-	SVCXPRT *p_transp;
-	char *p_netid;
-	char *p_xdrbuf;
-	int p_recvsz;
-	xdrproc_t p_inproc, p_outproc;
-	struct proglst *p_nxt;
-} *proglst;
-
-static const char rpc_reg_err[] = "%s: %s";
-static const char rpc_reg_msg[] = "rpc_reg: ";
-static const char __reg_err1[] = "can't find appropriate transport";
-static const char __reg_err2[] = "can't get protocol info";
-static const char __reg_err3[] = "unsupported transport size";
-static const char __no_mem_str[] = "out of memory";
-
-/*
- * For simplified, easy to use kind of rpc interfaces.
- * nettype indicates the type of transport on which the service will be
- * listening. Used for conservation of the system resource. Only one
- * handle is created for all the services (actually one of each netid)
- * and same xdrbuf is used for same netid. The size of the arguments
- * is also limited by the recvsize for that transport, even if it is
- * a COTS transport. This may be wrong, but for cases like these, they
- * should not use the simplified interfaces like this.
- */
-
-int
-rpc_reg(prognum, versnum, procnum, progname, inproc, outproc, nettype)
-	rpcprog_t prognum;			/* program number */
-	rpcvers_t versnum;			/* version number */
-	rpcproc_t procnum;			/* procedure number */
-	char *(*progname)(char *); /* Server routine */
-	xdrproc_t inproc, outproc;	/* in/out XDR procedures */
-	char *nettype;			/* nettype */
-{
-	struct netconfig *nconf;
-	int done = FALSE;
-	void *handle;
-
-
-	if (procnum == NULLPROC) {
-		warnx("%s can't reassign procedure number %u", rpc_reg_msg,
-			NULLPROC);
-		return (-1);
-	}
-
-	if (nettype == NULL)
-		nettype = "netpath";		/* The default behavior */
-	if ((handle = __rpc_setconf(nettype)) == NULL) {
-		warnx(rpc_reg_err, rpc_reg_msg, __reg_err1);
-		return (-1);
-	}
-/* VARIABLES PROTECTED BY proglst_lock: proglst */
-	mutex_lock(&proglst_lock);
-	while ((nconf = __rpc_getconf(handle)) != NULL) {
-		struct proglst *pl;
-		SVCXPRT *svcxprt;
-		int madenow;
-		u_int recvsz;
-		char *xdrbuf;
-		char *netid;
-
-		madenow = FALSE;
-		svcxprt = NULL;
-		recvsz = 0;
-		xdrbuf = netid = NULL;
-		for (pl = proglst; pl; pl = pl->p_nxt) {
-			if (strcmp(pl->p_netid, nconf->nc_netid) == 0) {
-				svcxprt = pl->p_transp;
-				xdrbuf = pl->p_xdrbuf;
-				recvsz = pl->p_recvsz;
-				netid = pl->p_netid;
-				break;
-			}
-		}
-
-		if (svcxprt == NULL) {
-			struct __rpc_sockinfo si;
-
-			svcxprt = svc_tli_create(RPC_ANYFD, nconf, NULL, 0, 0);
-			if (svcxprt == NULL)
-				continue;
-			if (!__rpc_fd2sockinfo(svcxprt->xp_fd, &si)) {
-				warnx(rpc_reg_err, rpc_reg_msg, __reg_err2);
-				SVC_DESTROY(svcxprt);
-				continue;
-			}
-			recvsz = __rpc_get_t_size(si.si_af, si.si_proto, 0);
-			if (recvsz == 0) {
-				warnx(rpc_reg_err, rpc_reg_msg, __reg_err3);
-				SVC_DESTROY(svcxprt);
-				continue;
-			}
-			if (((xdrbuf = malloc((unsigned)recvsz)) == NULL) ||
-				((netid = strdup(nconf->nc_netid)) == NULL)) {
-				warnx(rpc_reg_err, rpc_reg_msg, __no_mem_str);
-				if (xdrbuf != NULL)
-					free(xdrbuf);
-				if (netid != NULL)
-					free(netid);
-				SVC_DESTROY(svcxprt);
-				break;
-			}
-			madenow = TRUE;
-		}
-		/*
-		 * Check if this (program, version, netid) had already been
-		 * registered.  The check may save a few RPC calls to rpcbind
-		 */
-		for (pl = proglst; pl; pl = pl->p_nxt)
-			if ((pl->p_prognum == prognum) &&
-				(pl->p_versnum == versnum) &&
-				(strcmp(pl->p_netid, netid) == 0))
-				break;
-		if (pl == NULL) { /* Not yet */
-			(void) rpcb_unset(prognum, versnum, nconf);
-		} else {
-			/* so that svc_reg does not call rpcb_set() */
-			nconf = NULL;
-		}
-
-		if (!svc_reg(svcxprt, prognum, versnum, universal, nconf)) {
-			warnx("%s couldn't register prog %u vers %u for %s",
-				rpc_reg_msg, (unsigned)prognum,
-				(unsigned)versnum, netid);
-			if (madenow) {
-				SVC_DESTROY(svcxprt);
-				free(xdrbuf);
-				free(netid);
-			}
-			continue;
-		}
-
-		pl = malloc(sizeof (struct proglst));
-		if (pl == NULL) {
-			warnx(rpc_reg_err, rpc_reg_msg, __no_mem_str);
-			if (madenow) {
-				SVC_DESTROY(svcxprt);
-				free(xdrbuf);
-				free(netid);
-			}
-			break;
-		}
-		pl->p_progname = progname;
-		pl->p_prognum = prognum;
-		pl->p_versnum = versnum;
-		pl->p_procnum = procnum;
-		pl->p_inproc = inproc;
-		pl->p_outproc = outproc;
-		pl->p_transp = svcxprt;
-		pl->p_xdrbuf = xdrbuf;
-		pl->p_recvsz = recvsz;
-		pl->p_netid = netid;
-		pl->p_nxt = proglst;
-		proglst = pl;
-		done = TRUE;
-	}
-	__rpc_endconf(handle);
-	mutex_unlock(&proglst_lock);
-
-	if (done == FALSE) {
-		warnx("%s cant find suitable transport for %s",
-			rpc_reg_msg, nettype);
-		return (-1);
-	}
-	return (0);
-}
-
-/*
- * The universal handler for the services registered using registerrpc.
- * It handles both the connectionless and the connection oriented cases.
- */
-
-static void
-universal(rqstp, transp)
-	struct svc_req *rqstp;
-	SVCXPRT *transp;
-{
-	rpcprog_t prog;
-	rpcvers_t vers;
-	rpcproc_t proc;
-	char *outdata;
-	char *xdrbuf;
-	struct proglst *pl;
-
-	/*
-	 * enforce "procnum 0 is echo" convention
-	 */
-	if (rqstp->rq_proc == NULLPROC) {
-		if (svc_sendreply(transp, (xdrproc_t) xdr_void, NULL) ==
-		    FALSE) {
-			warnx("svc_sendreply failed");
-		}
-		return;
-	}
-	prog = rqstp->rq_prog;
-	vers = rqstp->rq_vers;
-	proc = rqstp->rq_proc;
-	mutex_lock(&proglst_lock);
-	for (pl = proglst; pl; pl = pl->p_nxt)
-		if (pl->p_prognum == prog && pl->p_procnum == proc &&
-			pl->p_versnum == vers &&
-			(strcmp(pl->p_netid, transp->xp_netid) == 0)) {
-			/* decode arguments into a CLEAN buffer */
-			xdrbuf = pl->p_xdrbuf;
-			/* Zero the arguments: reqd ! */
-			(void) memset(xdrbuf, 0, sizeof (pl->p_recvsz));
-			/*
-			 * Assuming that sizeof (xdrbuf) would be enough
-			 * for the arguments; if not then the program
-			 * may bomb. BEWARE!
-			 */
-			if (!svc_getargs(transp, pl->p_inproc, xdrbuf)) {
-				svcerr_decode(transp);
-				mutex_unlock(&proglst_lock);
-				return;
-			}
-			outdata = (*(pl->p_progname))(xdrbuf);
-			if (outdata == NULL &&
-				pl->p_outproc != (xdrproc_t) xdr_void){
-				/* there was an error */
-				mutex_unlock(&proglst_lock);
-				return;
-			}
-			if (!svc_sendreply(transp, pl->p_outproc, outdata)) {
-				warnx(
-			"rpc: rpc_reg trouble replying to prog %u vers %u",
-				(unsigned)prog, (unsigned)vers);
-				mutex_unlock(&proglst_lock);
-				return;
-			}
-			/* free the decoded arguments */
-			(void)svc_freeargs(transp, pl->p_inproc, xdrbuf);
-			mutex_unlock(&proglst_lock);
-			return;
-		}
-	mutex_unlock(&proglst_lock);
-	/* This should never happen */
-	warnx("rpc: rpc_reg: never registered prog %u vers %u",
-		(unsigned)prog, (unsigned)vers);
-	return;
-}
diff --git a/lib/libc_bsd/rpc/svc_vc.c b/lib/libc_bsd/rpc/svc_vc.c
deleted file mode 100644
index 844130d..0000000
--- a/lib/libc_bsd/rpc/svc_vc.c
+++ /dev/null
@@ -1,810 +0,0 @@
-/*	$NetBSD: svc_vc.c,v 1.7 2000/08/03 00:01:53 fvdl Exp $	*/
-
-/*-
- * Copyright (c) 2009, Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met:
- * - Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer.
- * - 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.
- * - Neither the name of Sun Microsystems, Inc. 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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)svc_tcp.c 1.21 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)svc_tcp.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/rpc/svc_vc.c 261046 2014-01-22 23:45:27Z mav $");
-
-/*
- * svc_vc.c, Server side for Connection Oriented based RPC. 
- *
- * Actually implements two flavors of transporter -
- * a tcp rendezvouser (a listner and connection establisher)
- * and a record/tcp stream.
- */
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/poll.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-#include <assert.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <rpc/rpc.h>
-
-#include "rpc_com.h"
-#include "mt_misc.h"
-#include "un-namespace.h"
-
-static SVCXPRT *makefd_xprt(int, u_int, u_int);
-static bool_t rendezvous_request(SVCXPRT *, struct rpc_msg *);
-static enum xprt_stat rendezvous_stat(SVCXPRT *);
-static void svc_vc_destroy(SVCXPRT *);
-static void __svc_vc_dodestroy (SVCXPRT *);
-static int read_vc(void *, void *, int);
-static int write_vc(void *, void *, int);
-static enum xprt_stat svc_vc_stat(SVCXPRT *);
-static bool_t svc_vc_recv(SVCXPRT *, struct rpc_msg *);
-static bool_t svc_vc_getargs(SVCXPRT *, xdrproc_t, void *);
-static bool_t svc_vc_freeargs(SVCXPRT *, xdrproc_t, void *);
-static bool_t svc_vc_reply(SVCXPRT *, struct rpc_msg *);
-static void svc_vc_rendezvous_ops(SVCXPRT *);
-static void svc_vc_ops(SVCXPRT *);
-static bool_t svc_vc_control(SVCXPRT *xprt, const u_int rq, void *in);
-static bool_t svc_vc_rendezvous_control (SVCXPRT *xprt, const u_int rq,
-				   	     void *in);
-
-struct cf_rendezvous { /* kept in xprt->xp_p1 for rendezvouser */
-	u_int sendsize;
-	u_int recvsize;
-	int maxrec;
-};
-
-struct cf_conn {  /* kept in xprt->xp_p1 for actual connection */
-	enum xprt_stat strm_stat;
-	uint32_t x_id;
-	XDR xdrs;
-	char verf_body[MAX_AUTH_BYTES];
-	u_int sendsize;
-	u_int recvsize;
-	int maxrec;
-	bool_t nonblock;
-	struct timeval last_recv_time;
-};
-
-/*
- * Usage:
- *	xprt = svc_vc_create(sock, send_buf_size, recv_buf_size);
- *
- * Creates, registers, and returns a (rpc) tcp based transporter.
- * Once *xprt is initialized, it is registered as a transporter
- * see (svc.h, xprt_register).  This routine returns
- * a NULL if a problem occurred.
- *
- * The filedescriptor passed in is expected to refer to a bound, but
- * not yet connected socket.
- *
- * Since streams do buffered io similar to stdio, the caller can specify
- * how big the send and receive buffers are via the second and third parms;
- * 0 => use the system default.
- */
-SVCXPRT *
-svc_vc_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-	SVCXPRT *xprt;
-	struct cf_rendezvous *r = NULL;
-	struct __rpc_sockinfo si;
-	struct sockaddr_storage sslocal;
-	socklen_t slen;
-
-	if (!__rpc_fd2sockinfo(fd, &si))
-		return NULL;
-
-	r = mem_alloc(sizeof(*r));
-	if (r == NULL) {
-		warnx("svc_vc_create: out of memory");
-		goto cleanup_svc_vc_create;
-	}
-	r->sendsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)sendsize);
-	r->recvsize = __rpc_get_t_size(si.si_af, si.si_proto, (int)recvsize);
-	r->maxrec = __svc_maxrec;
-	xprt = svc_xprt_alloc();
-	if (xprt == NULL) {
-		warnx("svc_vc_create: out of memory");
-		goto cleanup_svc_vc_create;
-	}
-	xprt->xp_p1 = r;
-	xprt->xp_verf = _null_auth;
-	svc_vc_rendezvous_ops(xprt);
-	xprt->xp_port = (u_short)-1;	/* It is the rendezvouser */
-	xprt->xp_fd = fd;
-
-	slen = sizeof (struct sockaddr_storage);
-	if (_getsockname(fd, (struct sockaddr *)(void *)&sslocal, &slen) < 0) {
-		warnx("svc_vc_create: could not retrieve local addr");
-		goto cleanup_svc_vc_create;
-	}
-
-	xprt->xp_ltaddr.maxlen = xprt->xp_ltaddr.len = sslocal.ss_len;
-	xprt->xp_ltaddr.buf = mem_alloc((size_t)sslocal.ss_len);
-	if (xprt->xp_ltaddr.buf == NULL) {
-		warnx("svc_vc_create: no mem for local addr");
-		goto cleanup_svc_vc_create;
-	}
-	memcpy(xprt->xp_ltaddr.buf, &sslocal, (size_t)sslocal.ss_len);
-
-	xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage);
-	xprt_register(xprt);
-	return (xprt);
-cleanup_svc_vc_create:
-	if (xprt)
-		mem_free(xprt, sizeof(*xprt));
-	if (r != NULL)
-		mem_free(r, sizeof(*r));
-	return (NULL);
-}
-
-/*
- * Like svtcp_create(), except the routine takes any *open* UNIX file
- * descriptor as its first input.
- */
-SVCXPRT *
-svc_fd_create(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-	struct sockaddr_storage ss;
-	socklen_t slen;
-	SVCXPRT *ret;
-
-	assert(fd != -1);
-
-	ret = makefd_xprt(fd, sendsize, recvsize);
-	if (ret == NULL)
-		return NULL;
-
-	slen = sizeof (struct sockaddr_storage);
-	if (_getsockname(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		warnx("svc_fd_create: could not retrieve local addr");
-		goto freedata;
-	}
-	ret->xp_ltaddr.maxlen = ret->xp_ltaddr.len = ss.ss_len;
-	ret->xp_ltaddr.buf = mem_alloc((size_t)ss.ss_len);
-	if (ret->xp_ltaddr.buf == NULL) {
-		warnx("svc_fd_create: no mem for local addr");
-		goto freedata;
-	}
-	memcpy(ret->xp_ltaddr.buf, &ss, (size_t)ss.ss_len);
-
-	slen = sizeof (struct sockaddr_storage);
-	if (_getpeername(fd, (struct sockaddr *)(void *)&ss, &slen) < 0) {
-		warnx("svc_fd_create: could not retrieve remote addr");
-		goto freedata;
-	}
-	ret->xp_rtaddr.maxlen = ret->xp_rtaddr.len = ss.ss_len;
-	ret->xp_rtaddr.buf = mem_alloc((size_t)ss.ss_len);
-	if (ret->xp_rtaddr.buf == NULL) {
-		warnx("svc_fd_create: no mem for local addr");
-		goto freedata;
-	}
-	memcpy(ret->xp_rtaddr.buf, &ss, (size_t)ss.ss_len);
-#ifdef PORTMAP
-	if (ss.ss_family == AF_INET || ss.ss_family == AF_LOCAL) {
-		ret->xp_raddr = *(struct sockaddr_in *)ret->xp_rtaddr.buf;
-		ret->xp_addrlen = sizeof (struct sockaddr_in);
-	}
-#endif				/* PORTMAP */
-
-	return ret;
-
-freedata:
-	if (ret->xp_ltaddr.buf != NULL)
-		mem_free(ret->xp_ltaddr.buf, rep->xp_ltaddr.maxlen);
-
-	return NULL;
-}
-
-static SVCXPRT *
-makefd_xprt(fd, sendsize, recvsize)
-	int fd;
-	u_int sendsize;
-	u_int recvsize;
-{
-	SVCXPRT *xprt;
-	struct cf_conn *cd;
-	const char *netid;
-	struct __rpc_sockinfo si;
- 
-	assert(fd != -1);
-
-	xprt = svc_xprt_alloc();
-	if (xprt == NULL) {
-		warnx("svc_vc: makefd_xprt: out of memory");
-		goto done;
-	}
-	cd = mem_alloc(sizeof(struct cf_conn));
-	if (cd == NULL) {
-		warnx("svc_tcp: makefd_xprt: out of memory");
-		svc_xprt_free(xprt);
-		xprt = NULL;
-		goto done;
-	}
-	cd->strm_stat = XPRT_IDLE;
-	xdrrec_create(&(cd->xdrs), sendsize, recvsize,
-	    xprt, read_vc, write_vc);
-	xprt->xp_p1 = cd;
-	xprt->xp_verf.oa_base = cd->verf_body;
-	svc_vc_ops(xprt);  /* truely deals with calls */
-	xprt->xp_port = 0;  /* this is a connection, not a rendezvouser */
-	xprt->xp_fd = fd;
-        if (__rpc_fd2sockinfo(fd, &si) && __rpc_sockinfo2netid(&si, &netid))
-		xprt->xp_netid = strdup(netid);
-
-	xprt_register(xprt);
-done:
-	return (xprt);
-}
-
-/*ARGSUSED*/
-static bool_t
-rendezvous_request(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	int sock, flags;
-	struct cf_rendezvous *r;
-	struct cf_conn *cd;
-	struct sockaddr_storage addr;
-	socklen_t len;
-	struct __rpc_sockinfo si;
-	SVCXPRT *newxprt;
-	fd_set cleanfds;
-
-	assert(xprt != NULL);
-	assert(msg != NULL);
-
-	r = (struct cf_rendezvous *)xprt->xp_p1;
-again:
-	len = sizeof addr;
-	if ((sock = _accept(xprt->xp_fd, (struct sockaddr *)(void *)&addr,
-	    &len)) < 0) {
-		if (errno == EINTR)
-			goto again;
-		/*
-		 * Clean out the most idle file descriptor when we're
-		 * running out.
-		 */
-		if (errno == EMFILE || errno == ENFILE) {
-			cleanfds = svc_fdset;
-			__svc_clean_idle(&cleanfds, 0, FALSE);
-			goto again;
-		}
-		return (FALSE);
-	}
-	/*
-	 * make a new transporter (re-uses xprt)
-	 */
-	newxprt = makefd_xprt(sock, r->sendsize, r->recvsize);
-	newxprt->xp_rtaddr.buf = mem_alloc(len);
-	if (newxprt->xp_rtaddr.buf == NULL)
-		return (FALSE);
-	memcpy(newxprt->xp_rtaddr.buf, &addr, len);
-	newxprt->xp_rtaddr.len = len;
-#ifdef PORTMAP
-	if (addr.ss_family == AF_INET || addr.ss_family == AF_LOCAL) {
-		newxprt->xp_raddr = *(struct sockaddr_in *)newxprt->xp_rtaddr.buf;
-		newxprt->xp_addrlen = sizeof (struct sockaddr_in);
-	}
-#endif				/* PORTMAP */
-	if (__rpc_fd2sockinfo(sock, &si) && si.si_proto == IPPROTO_TCP) {
-		len = 1;
-		/* XXX fvdl - is this useful? */
-		_setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &len, sizeof (len));
-	}
-
-	cd = (struct cf_conn *)newxprt->xp_p1;
-
-	cd->recvsize = r->recvsize;
-	cd->sendsize = r->sendsize;
-	cd->maxrec = r->maxrec;
-
-	if (cd->maxrec != 0) {
-		flags = _fcntl(sock, F_GETFL, 0);
-		if (flags  == -1)
-			return (FALSE);
-		if (_fcntl(sock, F_SETFL, flags | O_NONBLOCK) == -1)
-			return (FALSE);
-		if (cd->recvsize > cd->maxrec)
-			cd->recvsize = cd->maxrec;
-		cd->nonblock = TRUE;
-		__xdrrec_setnonblock(&cd->xdrs, cd->maxrec);
-	} else
-		cd->nonblock = FALSE;
-
-	gettimeofday(&cd->last_recv_time, NULL);
-
-	return (FALSE); /* there is never an rpc msg to be processed */
-}
-
-/*ARGSUSED*/
-static enum xprt_stat
-rendezvous_stat(xprt)
-	SVCXPRT *xprt;
-{
-
-	return (XPRT_IDLE);
-}
-
-static void
-svc_vc_destroy(xprt)
-	SVCXPRT *xprt;
-{
-	assert(xprt != NULL);
-	
-	xprt_unregister(xprt);
-	__svc_vc_dodestroy(xprt);
-}
-
-static void
-__svc_vc_dodestroy(xprt)
-	SVCXPRT *xprt;
-{
-	struct cf_conn *cd;
-	struct cf_rendezvous *r;
-
-	cd = (struct cf_conn *)xprt->xp_p1;
-
-	if (xprt->xp_fd != RPC_ANYFD)
-		(void)_close(xprt->xp_fd);
-	if (xprt->xp_port != 0) {
-		/* a rendezvouser socket */
-		r = (struct cf_rendezvous *)xprt->xp_p1;
-		mem_free(r, sizeof (struct cf_rendezvous));
-		xprt->xp_port = 0;
-	} else {
-		/* an actual connection socket */
-		XDR_DESTROY(&(cd->xdrs));
-		mem_free(cd, sizeof(struct cf_conn));
-	}
-	if (xprt->xp_rtaddr.buf)
-		mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen);
-	if (xprt->xp_ltaddr.buf)
-		mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen);
-	if (xprt->xp_tp)
-		free(xprt->xp_tp);
-	if (xprt->xp_netid)
-		free(xprt->xp_netid);
-	svc_xprt_free(xprt);
-}
-
-/*ARGSUSED*/
-static bool_t
-svc_vc_control(xprt, rq, in)
-	SVCXPRT *xprt;
-	const u_int rq;
-	void *in;
-{
-	return (FALSE);
-}
-
-static bool_t
-svc_vc_rendezvous_control(xprt, rq, in)
-	SVCXPRT *xprt;
-	const u_int rq;
-	void *in;
-{
-	struct cf_rendezvous *cfp;
-
-	cfp = (struct cf_rendezvous *)xprt->xp_p1;
-	if (cfp == NULL)
-		return (FALSE);
-	switch (rq) {
-		case SVCGET_CONNMAXREC:
-			*(int *)in = cfp->maxrec;
-			break;
-		case SVCSET_CONNMAXREC:
-			cfp->maxrec = *(int *)in;
-			break;
-		default:
-			return (FALSE);
-	}
-	return (TRUE);
-}
-
-/*
- * reads data from the tcp or uip connection.
- * any error is fatal and the connection is closed.
- * (And a read of zero bytes is a half closed stream => error.)
- * All read operations timeout after 35 seconds.  A timeout is
- * fatal for the connection.
- */
-static int
-read_vc(xprtp, buf, len)
-	void *xprtp;
-	void *buf;
-	int len;
-{
-	SVCXPRT *xprt;
-	int sock;
-	int milliseconds = 35 * 1000;
-	struct pollfd pollfd;
-	struct cf_conn *cfp;
-
-	xprt = (SVCXPRT *)xprtp;
-	assert(xprt != NULL);
-
-	sock = xprt->xp_fd;
-
-	cfp = (struct cf_conn *)xprt->xp_p1;
-
-	if (cfp->nonblock) {
-		len = _read(sock, buf, (size_t)len);
-		if (len < 0) {
-			if (errno == EAGAIN)
-				len = 0;
-			else
-				goto fatal_err;
-		}
-		if (len != 0)
-			gettimeofday(&cfp->last_recv_time, NULL);
-		return len;
-	}
-
-	do {
-		pollfd.fd = sock;
-		pollfd.events = POLLIN;
-		pollfd.revents = 0;
-		switch (_poll(&pollfd, 1, milliseconds)) {
-		case -1:
-			if (errno == EINTR)
-				continue;
-			/*FALLTHROUGH*/
-		case 0:
-			goto fatal_err;
-
-		default:
-			break;
-		}
-	} while ((pollfd.revents & POLLIN) == 0);
-
-	if ((len = _read(sock, buf, (size_t)len)) > 0) {
-		gettimeofday(&cfp->last_recv_time, NULL);
-		return (len);
-	}
-
-fatal_err:
-	((struct cf_conn *)(xprt->xp_p1))->strm_stat = XPRT_DIED;
-	return (-1);
-}
-
-/*
- * writes data to the tcp connection.
- * Any error is fatal and the connection is closed.
- */
-static int
-write_vc(xprtp, buf, len)
-	void *xprtp;
-	void *buf;
-	int len;
-{
-	SVCXPRT *xprt;
-	int i, cnt;
-	struct cf_conn *cd;
-	struct timeval tv0, tv1;
-
-	xprt = (SVCXPRT *)xprtp;
-	assert(xprt != NULL);
-
-	cd = (struct cf_conn *)xprt->xp_p1;
-
-	if (cd->nonblock)
-		gettimeofday(&tv0, NULL);
-	
-	for (cnt = len; cnt > 0; cnt -= i, buf = (char *)buf + i) {
-		i = _write(xprt->xp_fd, buf, (size_t)cnt);
-		if (i  < 0) {
-			if (errno != EAGAIN || !cd->nonblock) {
-				cd->strm_stat = XPRT_DIED;
-				return (-1);
-			}
-			if (cd->nonblock) {
-				/*
-				 * For non-blocking connections, do not
-				 * take more than 2 seconds writing the
-				 * data out.
-				 *
-				 * XXX 2 is an arbitrary amount.
-				 */
-				gettimeofday(&tv1, NULL);
-				if (tv1.tv_sec - tv0.tv_sec >= 2) {
-					cd->strm_stat = XPRT_DIED;
-					return (-1);
-				}
-			}
-			i = 0;
-		}
-	}
-
-	return (len);
-}
-
-static enum xprt_stat
-svc_vc_stat(xprt)
-	SVCXPRT *xprt;
-{
-	struct cf_conn *cd;
-
-	assert(xprt != NULL);
-
-	cd = (struct cf_conn *)(xprt->xp_p1);
-
-	if (cd->strm_stat == XPRT_DIED)
-		return (XPRT_DIED);
-	if (! xdrrec_eof(&(cd->xdrs)))
-		return (XPRT_MOREREQS);
-	return (XPRT_IDLE);
-}
-
-static bool_t
-svc_vc_recv(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct cf_conn *cd;
-	XDR *xdrs;
-
-	assert(xprt != NULL);
-	assert(msg != NULL);
-
-	cd = (struct cf_conn *)(xprt->xp_p1);
-	xdrs = &(cd->xdrs);
-
-	if (cd->nonblock) {
-		if (!__xdrrec_getrec(xdrs, &cd->strm_stat, TRUE))
-			return FALSE;
-	} else {
-		(void)xdrrec_skiprecord(xdrs);
-	}
-
-	xdrs->x_op = XDR_DECODE;
-	if (xdr_callmsg(xdrs, msg)) {
-		cd->x_id = msg->rm_xid;
-		return (TRUE);
-	}
-	cd->strm_stat = XPRT_DIED;
-	return (FALSE);
-}
-
-static bool_t
-svc_vc_getargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	struct cf_conn *cd;
-
-	assert(xprt != NULL);
-	cd = (struct cf_conn *)(xprt->xp_p1);
-	return (SVCAUTH_UNWRAP(&SVC_AUTH(xprt),
-		&cd->xdrs, xdr_args, args_ptr));
-}
-
-static bool_t
-svc_vc_freeargs(xprt, xdr_args, args_ptr)
-	SVCXPRT *xprt;
-	xdrproc_t xdr_args;
-	void *args_ptr;
-{
-	XDR *xdrs;
-
-	assert(xprt != NULL);
-	/* args_ptr may be NULL */
-
-	xdrs = &(((struct cf_conn *)(xprt->xp_p1))->xdrs);
-
-	xdrs->x_op = XDR_FREE;
-	return ((*xdr_args)(xdrs, args_ptr));
-}
-
-static bool_t
-svc_vc_reply(xprt, msg)
-	SVCXPRT *xprt;
-	struct rpc_msg *msg;
-{
-	struct cf_conn *cd;
-	XDR *xdrs;
-	bool_t rstat;
-	xdrproc_t xdr_proc;
-	caddr_t xdr_where;
-	u_int pos;
-
-	assert(xprt != NULL);
-	assert(msg != NULL);
-
-	cd = (struct cf_conn *)(xprt->xp_p1);
-	xdrs = &(cd->xdrs);
-
-	xdrs->x_op = XDR_ENCODE;
-	msg->rm_xid = cd->x_id;
-	rstat = TRUE;
-	if (msg->rm_reply.rp_stat == MSG_ACCEPTED &&
-	    msg->rm_reply.rp_acpt.ar_stat == SUCCESS) {
-		xdr_proc = msg->acpted_rply.ar_results.proc;
-		xdr_where = msg->acpted_rply.ar_results.where;
-		msg->acpted_rply.ar_results.proc = (xdrproc_t) xdr_void;
-		msg->acpted_rply.ar_results.where = NULL;
-
-		pos = XDR_GETPOS(xdrs);
-		if (!xdr_replymsg(xdrs, msg) ||
-		    !SVCAUTH_WRAP(&SVC_AUTH(xprt), xdrs, xdr_proc, xdr_where)) {
-			XDR_SETPOS(xdrs, pos);
-			rstat = FALSE;
-		}
-	} else {
-		rstat = xdr_replymsg(xdrs, msg);
-	}
-
-	if (rstat)
-		(void)xdrrec_endofrecord(xdrs, TRUE);
-
-	return (rstat);
-}
-
-static void
-svc_vc_ops(xprt)
-	SVCXPRT *xprt;
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-
-/* VARIABLES PROTECTED BY ops_lock: ops, ops2 */
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = svc_vc_recv;
-		ops.xp_stat = svc_vc_stat;
-		ops.xp_getargs = svc_vc_getargs;
-		ops.xp_reply = svc_vc_reply;
-		ops.xp_freeargs = svc_vc_freeargs;
-		ops.xp_destroy = svc_vc_destroy;
-		ops2.xp_control = svc_vc_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
-
-static void
-svc_vc_rendezvous_ops(xprt)
-	SVCXPRT *xprt;
-{
-	static struct xp_ops ops;
-	static struct xp_ops2 ops2;
-
-	mutex_lock(&ops_lock);
-	if (ops.xp_recv == NULL) {
-		ops.xp_recv = rendezvous_request;
-		ops.xp_stat = rendezvous_stat;
-		ops.xp_getargs =
-		    (bool_t (*)(SVCXPRT *, xdrproc_t, void *))abort;
-		ops.xp_reply =
-		    (bool_t (*)(SVCXPRT *, struct rpc_msg *))abort;
-		ops.xp_freeargs =
-		    (bool_t (*)(SVCXPRT *, xdrproc_t, void *))abort,
-		ops.xp_destroy = svc_vc_destroy;
-		ops2.xp_control = svc_vc_rendezvous_control;
-	}
-	xprt->xp_ops = &ops;
-	xprt->xp_ops2 = &ops2;
-	mutex_unlock(&ops_lock);
-}
-
-/*
- * Get the effective UID of the sending process. Used by rpcbind, keyserv
- * and rpc.yppasswdd on AF_LOCAL.
- */
-int
-__rpc_get_local_uid(SVCXPRT *transp, uid_t *uid) {
-	int sock, ret;
-	gid_t egid;
-	uid_t euid;
-	struct sockaddr *sa;
-
-	sock = transp->xp_fd;
-	sa = (struct sockaddr *)transp->xp_rtaddr.buf;
-	if (sa->sa_family == AF_LOCAL) {
-		ret = getpeereid(sock, &euid, &egid);
-		if (ret == 0)
-			*uid = euid;
-		return (ret);
-	} else
-		return (-1);
-}
-
-/*
- * Destroy xprts that have not have had any activity in 'timeout' seconds.
- * If 'cleanblock' is true, blocking connections (the default) are also
- * cleaned. If timeout is 0, the least active connection is picked.
- */
-bool_t
-__svc_clean_idle(fd_set *fds, int timeout, bool_t cleanblock)
-{
-	int i, ncleaned;
-	SVCXPRT *xprt, *least_active;
-	struct timeval tv, tdiff, tmax;
-	struct cf_conn *cd;
-
-	gettimeofday(&tv, NULL);
-	tmax.tv_sec = tmax.tv_usec = 0;
-	least_active = NULL;
-	rwlock_wrlock(&svc_fd_lock);
-	for (i = ncleaned = 0; i <= svc_maxfd; i++) {
-		if (FD_ISSET(i, fds)) {
-			xprt = __svc_xports[i];
-			if (xprt == NULL || xprt->xp_ops == NULL ||
-			    xprt->xp_ops->xp_recv != svc_vc_recv)
-				continue;
-			cd = (struct cf_conn *)xprt->xp_p1;
-			if (!cleanblock && !cd->nonblock)
-				continue;
-			if (timeout == 0) {
-				timersub(&tv, &cd->last_recv_time, &tdiff);
-				if (timercmp(&tdiff, &tmax, >)) {
-					tmax = tdiff;
-					least_active = xprt;
-				}
-				continue;
-			}
-			if (tv.tv_sec - cd->last_recv_time.tv_sec > timeout) {
-				__xprt_unregister_unlocked(xprt);
-				__svc_vc_dodestroy(xprt);
-				ncleaned++;
-			}
-		}
-	}
-	if (timeout == 0 && least_active != NULL) {
-		__xprt_unregister_unlocked(least_active);
-		__svc_vc_dodestroy(least_active);
-		ncleaned++;
-	}
-	rwlock_unlock(&svc_fd_lock);
-	return ncleaned > 0 ? TRUE : FALSE;
-}
diff --git a/lib/libc_bsd/softfloat/Makefile.inc b/lib/libc_bsd/softfloat/Makefile.inc
deleted file mode 100644
index 3fb59d6..0000000
--- a/lib/libc_bsd/softfloat/Makefile.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.10 2011/07/04 02:53:15 mrg Exp $
-Makefile.incl 230363 2012-01-20 06:16:14Z das $
-
-SOFTFLOAT_BITS?=64
-.PATH:		${LIBC_ARCH}/softfloat \
-		${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat
-
-CFLAGS+=	-I${.CURDIR}/${LIBC_ARCH}/softfloat -I${.CURDIR}/softfloat
-CFLAGS+=	-DSOFTFLOAT_FOR_GCC
-
-SRCS+=		softfloat.c
-
-SRCS+=		fpgetround.c fpsetround.c fpgetmask.c fpsetmask.c \
-		fpgetsticky.c
-
-SRCS+=		eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \
-		eqdf2.c nedf2.c gtdf2.c gedf2.c ltdf2.c ledf2.c negdf2.c \
-		unordsf2.c unorddf2.c
-
-.if defined(SOFTFLOAT_128)
-CFLAGS+=	-DFLOAT128
-SRCS+=		eqtf2.c netf2.c gttf2.c getf2.c lttf2.c letf2.c negtf2.c
-.endif
-
-.if defined(SOFTFLOAT_X80)
-CFLAGS+=	-DFLOATX80
-SRCS+=		nexf2.c gtxf2.c gexf2.c negxf2.c
-.endif
-
-SYM_MAPS+=	${.CURDIR}/softfloat/Symbol.map
diff --git a/lib/libc_bsd/softfloat/README.NetBSD b/lib/libc_bsd/softfloat/README.NetBSD
deleted file mode 100644
index fcb22b2..0000000
--- a/lib/libc_bsd/softfloat/README.NetBSD
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: README.NetBSD,v 1.2 2002/05/21 23:51:05 bjh21 Exp $
-$FreeBSD: releng/10.2/lib/libc/softfloat/README.NetBSD 129203 2004-05-14 12:13:06Z cognet $
-
-This is a modified version of part of John Hauser's SoftFloat 2a package.
-This version has been heavily modified to support its use with GCC to
-implement built-in floating-point operations, but compiling
-softfloat.c without SOFTFLOAT_FOR_GCC defined should get you the same
-results as from the original.
-
diff --git a/lib/libc_bsd/softfloat/README.txt b/lib/libc_bsd/softfloat/README.txt
deleted file mode 100644
index b9689df..0000000
--- a/lib/libc_bsd/softfloat/README.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: README.txt,v 1.1 2000/06/06 08:15:02 bjh21 Exp $
-$FreeBSD: releng/10.2/lib/libc/softfloat/README.txt 129203 2004-05-14 12:13:06Z cognet $
-
-Package Overview for SoftFloat Release 2a
-
-John R. Hauser
-1998 December 13
-
-
-SoftFloat is a software implementation of floating-point that conforms to
-the IEC/IEEE Standard for Binary Floating-Point Arithmetic.  SoftFloat is
-distributed in the form of C source code.  Compiling the SoftFloat sources
-generates two things:
-
--- A SoftFloat object file (typically `softfloat.o') containing the complete
-   set of IEC/IEEE floating-point routines.
-
--- A `timesoftfloat' program for evaluating the speed of the SoftFloat
-   routines.  (The SoftFloat module is linked into this program.)
-
-The SoftFloat package is documented in four text files:
-
-   softfloat.txt          Documentation for using the SoftFloat functions.
-   softfloat-source.txt   Documentation for compiling SoftFloat.
-   softfloat-history.txt  History of major changes to SoftFloat.
-   timesoftfloat.txt      Documentation for using `timesoftfloat'.
-
-Other files in the package comprise the source code for SoftFloat.
-
-Please be aware that some work is involved in porting this software to other
-targets.  It is not just a matter of getting `make' to complete without
-error messages.  I would have written the code that way if I could, but
-there are fundamental differences between systems that I can't make go away.
-You should not attempt to compile SoftFloat without first reading both
-`softfloat.txt' and `softfloat-source.txt'.
-
-At the time of this writing, the most up-to-date information about
-SoftFloat and the latest release can be found at the Web page `http://
-HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/SoftFloat.html'.
-
diff --git a/lib/libc_bsd/softfloat/Symbol.map b/lib/libc_bsd/softfloat/Symbol.map
deleted file mode 100644
index 1b60569..0000000
--- a/lib/libc_bsd/softfloat/Symbol.map
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/softfloat/Symbol.map 230190 2012-01-16 04:06:56Z das $
- */
-
-FBSD_1.0 {
-	_fpgetmask;
-	fpgetmask;
-	_fpgetround;
-	fpgetround;
-	_fpgetsticky;
-	fpgetsticky;
-	_fpsetmask;
-	fpsetmask;
-	_fpsetround;
-	fpsetround;
-	_fpsetsticky;
-	fpsetsticky;
-};
-
-FBSDprivate_1.0 {
-	__softfloat_float_exception_flags;
-	__softfloat_float_exception_mask;
-	__softfloat_float_rounding_mode;
-	__softfloat_float_raise;
-	__eqdf2;
-	__eqsf2;
-	__gedf2;
-	__gesf2;
-	__gtdf2;
-	__gtsf2;
-	__ledf2;
-	__lesf2;
-	__ltdf2;
-	__ltsf2;
-	__nedf2;
-	__negdf2;
-	__negsf2;
-	__nesf2;
-	__unorddf2;
-	__unordsf2;
-};
diff --git a/lib/libc_bsd/softfloat/bits32/softfloat-macros b/lib/libc_bsd/softfloat/bits32/softfloat-macros
deleted file mode 100644
index ec3561a..0000000
--- a/lib/libc_bsd/softfloat/bits32/softfloat-macros
+++ /dev/null
@@ -1,649 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/softfloat/bits32/softfloat-macros 230363 2012-01-20 06:16:14Z das $ */
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Shifts `a' right by the number of bits given in `count'.  If any nonzero
-bits are shifted off, they are ``jammed'' into the least significant bit of
-the result by setting the least significant bit to 1.  The value of `count'
-can be arbitrarily large; in particular, if `count' is greater than 32, the
-result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-The result is stored in the location pointed to by `zPtr'.
--------------------------------------------------------------------------------
-*/
-INLINE void shift32RightJamming( bits32 a, int16 count, bits32 *zPtr )
-{
-    bits32 z;
-
-    if ( count == 0 ) {
-        z = a;
-    }
-    else if ( count < 32 ) {
-        z = ( a>>count ) | ( ( a<<( ( - count ) & 31 ) ) != 0 );
-    }
-    else {
-        z = ( a != 0 );
-    }
-    *zPtr = z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 64-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' can be arbitrarily large; in particular, if `count' is greater
-than 64, the result will be 0.  The result is broken into two 32-bit pieces
-which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift64Right(
-     bits32 a0, bits32 a1, int16 count, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-    bits32 z0, z1;
-    int8 negCount = ( - count ) & 31;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 32 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count );
-        z0 = a0>>count;
-    }
-    else {
-        z1 = ( count < 64 ) ? ( a0>>( count & 31 ) ) : 0;
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 64-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  If any nonzero bits are shifted off, they
-are ``jammed'' into the least significant bit of the result by setting the
-least significant bit to 1.  The value of `count' can be arbitrarily large;
-in particular, if `count' is greater than 64, the result will be either 0
-or 1, depending on whether the concatenation of `a0' and `a1' is zero or
-nonzero.  The result is broken into two 32-bit pieces which are stored at
-the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift64RightJamming(
-     bits32 a0, bits32 a1, int16 count, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-    bits32 z0, z1;
-    int8 negCount = ( - count ) & 31;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 32 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count ) | ( ( a1<<negCount ) != 0 );
-        z0 = a0>>count;
-    }
-    else {
-        if ( count == 32 ) {
-            z1 = a0 | ( a1 != 0 );
-        }
-        else if ( count < 64 ) {
-            z1 = ( a0>>( count & 31 ) ) | ( ( ( a0<<negCount ) | a1 ) != 0 );
-        }
-        else {
-            z1 = ( ( a0 | a1 ) != 0 );
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 96-bit value formed by concatenating `a0', `a1', and `a2' right
-by 32 _plus_ the number of bits given in `count'.  The shifted result is
-at most 64 nonzero bits; these are broken into two 32-bit pieces which are
-stored at the locations pointed to by `z0Ptr' and `z1Ptr'.  The bits shifted
-off form a third 32-bit result as follows:  The _last_ bit shifted off is
-the most-significant bit of the extra result, and the other 31 bits of the
-extra result are all zero if and only if _all_but_the_last_ bits shifted off
-were all zero.  This extra result is stored in the location pointed to by
-`z2Ptr'.  The value of `count' can be arbitrarily large.
-    (This routine makes more sense if `a0', `a1', and `a2' are considered
-to form a fixed-point value with binary point between `a1' and `a2'.  This
-fixed-point value is shifted right by the number of bits given in `count',
-and the integer part of the result is returned at the locations pointed to
-by `z0Ptr' and `z1Ptr'.  The fractional part of the result may be slightly
-corrupted as described above, and is returned at the location pointed to by
-`z2Ptr'.)
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift64ExtraRightJamming(
-     bits32 a0,
-     bits32 a1,
-     bits32 a2,
-     int16 count,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2;
-    int8 negCount = ( - count ) & 31;
-
-    if ( count == 0 ) {
-        z2 = a2;
-        z1 = a1;
-        z0 = a0;
-    }
-    else {
-        if ( count < 32 ) {
-            z2 = a1<<negCount;
-            z1 = ( a0<<negCount ) | ( a1>>count );
-            z0 = a0>>count;
-        }
-        else {
-            if ( count == 32 ) {
-                z2 = a1;
-                z1 = a0;
-            }
-            else {
-                a2 |= a1;
-                if ( count < 64 ) {
-                    z2 = a0<<negCount;
-                    z1 = a0>>( count & 31 );
-                }
-                else {
-                    z2 = ( count == 64 ) ? a0 : ( a0 != 0 );
-                    z1 = 0;
-                }
-            }
-            z0 = 0;
-        }
-        z2 |= ( a2 != 0 );
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 64-bit value formed by concatenating `a0' and `a1' left by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' must be less than 32.  The result is broken into two 32-bit
-pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift64Left(
-     bits32 a0, bits32 a1, int16 count, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-
-    *z1Ptr = a1<<count;
-    *z0Ptr =
-        ( count == 0 ) ? a0 : ( a0<<count ) | ( a1>>( ( - count ) & 31 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 96-bit value formed by concatenating `a0', `a1', and `a2' left
-by the number of bits given in `count'.  Any bits shifted off are lost.
-The value of `count' must be less than 32.  The result is broken into three
-32-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift96Left(
-     bits32 a0,
-     bits32 a1,
-     bits32 a2,
-     int16 count,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2;
-    int8 negCount;
-
-    z2 = a2<<count;
-    z1 = a1<<count;
-    z0 = a0<<count;
-    if ( 0 < count ) {
-        negCount = ( ( - count ) & 31 );
-        z1 |= a2>>negCount;
-        z0 |= a1>>negCount;
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 64-bit value formed by concatenating `a0' and `a1' to the 64-bit
-value formed by concatenating `b0' and `b1'.  Addition is modulo 2^64, so
-any carry out is lost.  The result is broken into two 32-bit pieces which
-are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add64(
-     bits32 a0, bits32 a1, bits32 b0, bits32 b1, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-    bits32 z1;
-
-    z1 = a1 + b1;
-    *z1Ptr = z1;
-    *z0Ptr = a0 + b0 + ( z1 < a1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 96-bit value formed by concatenating `a0', `a1', and `a2' to the
-96-bit value formed by concatenating `b0', `b1', and `b2'.  Addition is
-modulo 2^96, so any carry out is lost.  The result is broken into three
-32-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add96(
-     bits32 a0,
-     bits32 a1,
-     bits32 a2,
-     bits32 b0,
-     bits32 b1,
-     bits32 b2,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2;
-    int8 carry0, carry1;
-
-    z2 = a2 + b2;
-    carry1 = ( z2 < a2 );
-    z1 = a1 + b1;
-    carry0 = ( z1 < a1 );
-    z0 = a0 + b0;
-    z1 += carry1;
-    z0 += ( z1 < (bits32)carry1 );
-    z0 += carry0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 64-bit value formed by concatenating `b0' and `b1' from the
-64-bit value formed by concatenating `a0' and `a1'.  Subtraction is modulo
-2^64, so any borrow out (carry out) is lost.  The result is broken into two
-32-bit pieces which are stored at the locations pointed to by `z0Ptr' and
-`z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub64(
-     bits32 a0, bits32 a1, bits32 b0, bits32 b1, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-
-    *z1Ptr = a1 - b1;
-    *z0Ptr = a0 - b0 - ( a1 < b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 96-bit value formed by concatenating `b0', `b1', and `b2' from
-the 96-bit value formed by concatenating `a0', `a1', and `a2'.  Subtraction
-is modulo 2^96, so any borrow out (carry out) is lost.  The result is broken
-into three 32-bit pieces which are stored at the locations pointed to by
-`z0Ptr', `z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub96(
-     bits32 a0,
-     bits32 a1,
-     bits32 a2,
-     bits32 b0,
-     bits32 b1,
-     bits32 b2,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2;
-    int8 borrow0, borrow1;
-
-    z2 = a2 - b2;
-    borrow1 = ( a2 < b2 );
-    z1 = a1 - b1;
-    borrow0 = ( a1 < b1 );
-    z0 = a0 - b0;
-    z0 -= ( z1 < (bits32)borrow1 );
-    z1 -= borrow1;
-    z0 -= borrow0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies `a' by `b' to obtain a 64-bit product.  The product is broken
-into two 32-bit pieces which are stored at the locations pointed to by
-`z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void mul32To64( bits32 a, bits32 b, bits32 *z0Ptr, bits32 *z1Ptr )
-{
-    bits16 aHigh, aLow, bHigh, bLow;
-    bits32 z0, zMiddleA, zMiddleB, z1;
-
-    aLow = a;
-    aHigh = a>>16;
-    bLow = b;
-    bHigh = b>>16;
-    z1 = ( (bits32) aLow ) * bLow;
-    zMiddleA = ( (bits32) aLow ) * bHigh;
-    zMiddleB = ( (bits32) aHigh ) * bLow;
-    z0 = ( (bits32) aHigh ) * bHigh;
-    zMiddleA += zMiddleB;
-    z0 += ( ( (bits32) ( zMiddleA < zMiddleB ) )<<16 ) + ( zMiddleA>>16 );
-    zMiddleA <<= 16;
-    z1 += zMiddleA;
-    z0 += ( z1 < zMiddleA );
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 64-bit value formed by concatenating `a0' and `a1' by `b'
-to obtain a 96-bit product.  The product is broken into three 32-bit pieces
-which are stored at the locations pointed to by `z0Ptr', `z1Ptr', and
-`z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul64By32To96(
-     bits32 a0,
-     bits32 a1,
-     bits32 b,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr
- )
-{
-    bits32 z0, z1, z2, more1;
-
-    mul32To64( a1, b, &z1, &z2 );
-    mul32To64( a0, b, &z0, &more1 );
-    add64( z0, more1, 0, z1, &z0, &z1 );
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 64-bit value formed by concatenating `a0' and `a1' to the
-64-bit value formed by concatenating `b0' and `b1' to obtain a 128-bit
-product.  The product is broken into four 32-bit pieces which are stored at
-the locations pointed to by `z0Ptr', `z1Ptr', `z2Ptr', and `z3Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul64To128(
-     bits32 a0,
-     bits32 a1,
-     bits32 b0,
-     bits32 b1,
-     bits32 *z0Ptr,
-     bits32 *z1Ptr,
-     bits32 *z2Ptr,
-     bits32 *z3Ptr
- )
-{
-    bits32 z0, z1, z2, z3;
-    bits32 more1, more2;
-
-    mul32To64( a1, b1, &z2, &z3 );
-    mul32To64( a1, b0, &z1, &more2 );
-    add64( z1, more2, 0, z2, &z1, &z2 );
-    mul32To64( a0, b0, &z0, &more1 );
-    add64( z0, more1, 0, z1, &z0, &z1 );
-    mul32To64( a0, b1, &more1, &more2 );
-    add64( more1, more2, 0, z2, &more1, &z2 );
-    add64( z0, z1, 0, more1, &z0, &z1 );
-    *z3Ptr = z3;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the 32-bit integer quotient obtained by dividing
-`b' into the 64-bit value formed by concatenating `a0' and `a1'.  The
-divisor `b' must be at least 2^31.  If q is the exact quotient truncated
-toward zero, the approximation returned lies between q and q + 2 inclusive.
-If the exact quotient q is larger than 32 bits, the maximum positive 32-bit
-unsigned integer is returned.
--------------------------------------------------------------------------------
-*/
-static bits32 estimateDiv64To32( bits32 a0, bits32 a1, bits32 b )
-{
-    bits32 b0, b1;
-    bits32 rem0, rem1, term0, term1;
-    bits32 z;
-
-    if ( b <= a0 ) return 0xFFFFFFFF;
-    b0 = b>>16;
-    z = ( b0<<16 <= a0 ) ? 0xFFFF0000 : ( a0 / b0 )<<16;
-    mul32To64( b, z, &term0, &term1 );
-    sub64( a0, a1, term0, term1, &rem0, &rem1 );
-    while ( ( (sbits32) rem0 ) < 0 ) {
-        z -= 0x10000;
-        b1 = b<<16;
-        add64( rem0, rem1, b0, b1, &rem0, &rem1 );
-    }
-    rem0 = ( rem0<<16 ) | ( rem1>>16 );
-    z |= ( b0<<16 <= rem0 ) ? 0xFFFF : rem0 / b0;
-    return z;
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the square root of the 32-bit significand given
-by `a'.  Considered as an integer, `a' must be at least 2^31.  If bit 0 of
-`aExp' (the least significant bit) is 1, the integer returned approximates
-2^31*sqrt(`a'/2^31), where `a' is considered an integer.  If bit 0 of `aExp'
-is 0, the integer returned approximates 2^31*sqrt(`a'/2^30).  In either
-case, the approximation returned lies strictly within +/-2 of the exact
-value.
--------------------------------------------------------------------------------
-*/
-static bits32 estimateSqrt32( int16 aExp, bits32 a )
-{
-    static const bits16 sqrtOddAdjustments[] = {
-        0x0004, 0x0022, 0x005D, 0x00B1, 0x011D, 0x019F, 0x0236, 0x02E0,
-        0x039C, 0x0468, 0x0545, 0x0631, 0x072B, 0x0832, 0x0946, 0x0A67
-    };
-    static const bits16 sqrtEvenAdjustments[] = {
-        0x0A2D, 0x08AF, 0x075A, 0x0629, 0x051A, 0x0429, 0x0356, 0x029E,
-        0x0200, 0x0179, 0x0109, 0x00AF, 0x0068, 0x0034, 0x0012, 0x0002
-    };
-    int8 index;
-    bits32 z;
-
-    index = ( a>>27 ) & 15;
-    if ( aExp & 1 ) {
-        z = 0x4000 + ( a>>17 ) - sqrtOddAdjustments[ index ];
-        z = ( ( a / z )<<14 ) + ( z<<15 );
-        a >>= 1;
-    }
-    else {
-        z = 0x8000 + ( a>>17 ) - sqrtEvenAdjustments[ index ];
-        z = a / z + z;
-        z = ( 0x20000 <= z ) ? 0xFFFF8000 : ( z<<15 );
-        if ( z <= a ) return (bits32) ( ( (sbits32) a )>>1 );
-    }
-    return ( ( estimateDiv64To32( a, 0, z ) )>>1 ) + ( z>>1 );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the number of leading 0 bits before the most-significant 1 bit of
-`a'.  If `a' is zero, 32 is returned.
--------------------------------------------------------------------------------
-*/
-static int8 countLeadingZeros32( bits32 a )
-{
-    static const int8 countLeadingZerosHigh[] = {
-        8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    int8 shiftCount;
-
-    shiftCount = 0;
-    if ( a < 0x10000 ) {
-        shiftCount += 16;
-        a <<= 16;
-    }
-    if ( a < 0x1000000 ) {
-        shiftCount += 8;
-        a <<= 8;
-    }
-    shiftCount += countLeadingZerosHigh[ a>>24 ];
-    return shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 64-bit value formed by concatenating `a0' and `a1' is
-equal to the 64-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag eq64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
-{
-
-    return ( a0 == b0 ) && ( a1 == b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 64-bit value formed by concatenating `a0' and `a1' is less
-than or equal to the 64-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag le64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 <= b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 64-bit value formed by concatenating `a0' and `a1' is less
-than the 64-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag lt64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 < b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 64-bit value formed by concatenating `a0' and `a1' is not
-equal to the 64-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag ne64( bits32 a0, bits32 a1, bits32 b0, bits32 b1 )
-{
-
-    return ( a0 != b0 ) || ( a1 != b1 );
-
-}
-
diff --git a/lib/libc_bsd/softfloat/bits32/softfloat.c b/lib/libc_bsd/softfloat/bits32/softfloat.c
deleted file mode 100644
index 0fa33b4..0000000
--- a/lib/libc_bsd/softfloat/bits32/softfloat.c
+++ /dev/null
@@ -1,2347 +0,0 @@
-/* $NetBSD: softfloat.c,v 1.1 2002/05/21 23:51:07 bjh21 Exp $ */
-
-/*
- * This version hacked for use with gcc -msoft-float by bjh21.
- * (Mostly a case of #ifdefing out things GCC doesn't need or provides
- *  itself).
- */
-
-/*
- * Things you may want to define:
- *
- * SOFTFLOAT_FOR_GCC - build only those functions necessary for GCC (with
- *   -msoft-float) to work.  Include "softfloat-for-gcc.h" to get them
- *   properly renamed.
- */
-
-/*
- * This differs from the standard bits32/softfloat.c in that float64
- * is defined to be a 64-bit integer rather than a structure.  The
- * structure is float64s, with translation between the two going via
- * float64u.
- */
-
-/*
-===============================================================================
-
-This C source file is part of the SoftFloat IEC/IEEE Floating-Point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/bits32/softfloat.c 230189 2012-01-16 04:05:53Z das $");
-
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-
-#include "milieu.h"
-#include "softfloat.h"
-
-/*
- * Conversions between floats as stored in memory and floats as
- * SoftFloat uses them
- */
-#ifndef FLOAT64_DEMANGLE
-#define FLOAT64_DEMANGLE(a)	(a)
-#endif
-#ifndef FLOAT64_MANGLE
-#define FLOAT64_MANGLE(a)	(a)
-#endif
-
-/*
--------------------------------------------------------------------------------
-Floating-point rounding mode and exception flags.
--------------------------------------------------------------------------------
-*/
-int float_rounding_mode = float_round_nearest_even;
-int float_exception_flags = 0;
-
-/*
--------------------------------------------------------------------------------
-Primitive arithmetic functions, including multi-word arithmetic, and
-division and square root approximations.  (Can be specialized to target if
-desired.)
--------------------------------------------------------------------------------
-*/
-#include "softfloat-macros"
-
-/*
--------------------------------------------------------------------------------
-Functions and definitions to determine:  (1) whether tininess for underflow
-is detected before or after rounding by default, (2) what (if anything)
-happens when exceptions are raised, (3) how signaling NaNs are distinguished
-from quiet NaNs, (4) the default generated quiet NaNs, and (4) how NaNs
-are propagated from function inputs to output.  These details are target-
-specific.
--------------------------------------------------------------------------------
-*/
-#include "softfloat-specialize"
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits32 extractFloat32Frac( float32 a )
-{
-
-    return a & 0x007FFFFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat32Exp( float32 a )
-{
-
-    return ( a>>23 ) & 0xFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat32Sign( float32 a )
-{
-
-    return a>>31;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal single-precision floating-point value represented
-by the denormalized significand `aSig'.  The normalized exponent and
-significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat32Subnormal( bits32 aSig, int16 *zExpPtr, bits32 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( aSig ) - 8;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-single-precision floating-point value, returning the result.  After being
-shifted into the proper positions, the three fields are simply added
-together to form the result.  This means that any integer portion of `zSig'
-will be added into the exponent.  Since a properly normalized significand
-will have an integer portion equal to 1, the `zExp' input should be 1 less
-than the desired result exponent whenever `zSig' is a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float32 packFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-
-    return ( ( (bits32) zSign )<<31 ) + ( ( (bits32) zExp )<<23 ) + zSig;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  Ordinarily, the abstract
-value is simply rounded and packed into the single-precision format, with
-the inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal single-
-precision floating-point number.
-    The input significand `zSig' has its binary point between bits 30
-and 29, which is 7 bits to the left of the usual location.  This shifted
-significand must be normalized or smaller.  If `zSig' is not normalized,
-`zExp' must be 0; in that case, the result returned is a subnormal number,
-and it must not require rounding.  In the usual case that `zSig' is
-normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-The handling of underflow and overflow follows the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 roundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int8 roundIncrement, roundBits;
-    flag isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = roundingMode == float_round_nearest_even;
-    roundIncrement = 0x40;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x7F;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig & 0x7F;
-    if ( 0xFD <= (bits16) zExp ) {
-        if (    ( 0xFD < zExp )
-             || (    ( zExp == 0xFD )
-                  && ( (sbits32) ( zSig + roundIncrement ) < 0 ) )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            return packFloat32( zSign, 0xFF, 0 ) - ( roundIncrement == 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ( zSig + roundIncrement < 0x80000000 );
-            shift32RightJamming( zSig, - zExp, &zSig );
-            zExp = 0;
-            roundBits = zSig & 0x7F;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-        }
-    }
-    if ( roundBits ) float_exception_flags |= float_flag_inexact;
-    zSig = ( zSig + roundIncrement )>>7;
-    zSig &= ~ ( ( ( roundBits ^ 0x40 ) == 0 ) & roundNearestEven );
-    if ( zSig == 0 ) zExp = 0;
-    return packFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  This routine is just like
-`roundAndPackFloat32' except that `zSig' does not have to be normalized.
-Bit 31 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-floating-point exponent.
--------------------------------------------------------------------------------
-*/
-static float32
- normalizeRoundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( zSig ) - 1;
-    return roundAndPackFloat32( zSign, zExp - shiftCount, zSig<<shiftCount );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the least-significant 32 fraction bits of the double-precision
-floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits32 extractFloat64Frac1( float64 a )
-{
-
-    return FLOAT64_DEMANGLE(a) & LIT64( 0x00000000FFFFFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the most-significant 20 fraction bits of the double-precision
-floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits32 extractFloat64Frac0( float64 a )
-{
-
-    return ( FLOAT64_DEMANGLE(a)>>32 ) & 0x000FFFFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat64Exp( float64 a )
-{
-
-    return ( FLOAT64_DEMANGLE(a)>>52 ) & 0x7FF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat64Sign( float64 a )
-{
-
-    return FLOAT64_DEMANGLE(a)>>63;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal double-precision floating-point value represented
-by the denormalized significand formed by the concatenation of `aSig0' and
-`aSig1'.  The normalized exponent is stored at the location pointed to by
-`zExpPtr'.  The most significant 21 bits of the normalized significand are
-stored at the location pointed to by `zSig0Ptr', and the least significant
-32 bits of the normalized significand are stored at the location pointed to
-by `zSig1Ptr'.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat64Subnormal(
-     bits32 aSig0,
-     bits32 aSig1,
-     int16 *zExpPtr,
-     bits32 *zSig0Ptr,
-     bits32 *zSig1Ptr
- )
-{
-    int8 shiftCount;
-
-    if ( aSig0 == 0 ) {
-        shiftCount = countLeadingZeros32( aSig1 ) - 11;
-        if ( shiftCount < 0 ) {
-            *zSig0Ptr = aSig1>>( - shiftCount );
-            *zSig1Ptr = aSig1<<( shiftCount & 31 );
-        }
-        else {
-            *zSig0Ptr = aSig1<<shiftCount;
-            *zSig1Ptr = 0;
-        }
-        *zExpPtr = - shiftCount - 31;
-    }
-    else {
-        shiftCount = countLeadingZeros32( aSig0 ) - 11;
-        shortShift64Left( aSig0, aSig1, shiftCount, zSig0Ptr, zSig1Ptr );
-        *zExpPtr = 1 - shiftCount;
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', the exponent `zExp', and the significand formed by
-the concatenation of `zSig0' and `zSig1' into a double-precision floating-
-point value, returning the result.  After being shifted into the proper
-positions, the three fields `zSign', `zExp', and `zSig0' are simply added
-together to form the most significant 32 bits of the result.  This means
-that any integer portion of `zSig0' will be added into the exponent.  Since
-a properly normalized significand will have an integer portion equal to 1,
-the `zExp' input should be 1 less than the desired result exponent whenever
-`zSig0' and `zSig1' concatenated form a complete, normalized significand.
--------------------------------------------------------------------------------
-*/
-INLINE float64
- packFloat64( flag zSign, int16 zExp, bits32 zSig0, bits32 zSig1 )
-{
-
-    return FLOAT64_MANGLE( ( ( (bits64) zSign )<<63 ) +
-			   ( ( (bits64) zExp )<<52 ) + 
-			   ( ( (bits64) zSig0 )<<32 ) + zSig1 );
-
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and extended significand formed by the concatenation of `zSig0', `zSig1',
-and `zSig2', and returns the proper double-precision floating-point value
-corresponding to the abstract input.  Ordinarily, the abstract value is
-simply rounded and packed into the double-precision format, with the inexact
-exception raised if the abstract input cannot be represented exactly.
-However, if the abstract value is too large, the overflow and inexact
-exceptions are raised and an infinity or maximal finite value is returned.
-If the abstract value is too small, the input value is rounded to a
-subnormal number, and the underflow and inexact exceptions are raised if the
-abstract input cannot be represented exactly as a subnormal double-precision
-floating-point number.
-    The input significand must be normalized or smaller.  If the input
-significand is not normalized, `zExp' must be 0; in that case, the result
-returned is a subnormal number, and it must not require rounding.  In the
-usual case that the input significand is normalized, `zExp' must be 1 less
-than the ``true'' floating-point exponent.  The handling of underflow and
-overflow follows the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64
- roundAndPackFloat64(
-     flag zSign, int16 zExp, bits32 zSig0, bits32 zSig1, bits32 zSig2 )
-{
-    int8 roundingMode;
-    flag roundNearestEven, increment, isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    increment = ( (sbits32) zSig2 < 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            increment = 0;
-        }
-        else {
-            if ( zSign ) {
-                increment = ( roundingMode == float_round_down ) && zSig2;
-            }
-            else {
-                increment = ( roundingMode == float_round_up ) && zSig2;
-            }
-        }
-    }
-    if ( 0x7FD <= (bits16) zExp ) {
-        if (    ( 0x7FD < zExp )
-             || (    ( zExp == 0x7FD )
-                  && eq64( 0x001FFFFF, 0xFFFFFFFF, zSig0, zSig1 )
-                  && increment
-                )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            if (    ( roundingMode == float_round_to_zero )
-                 || ( zSign && ( roundingMode == float_round_up ) )
-                 || ( ! zSign && ( roundingMode == float_round_down ) )
-               ) {
-                return packFloat64( zSign, 0x7FE, 0x000FFFFF, 0xFFFFFFFF );
-            }
-            return packFloat64( zSign, 0x7FF, 0, 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ! increment
-                || lt64( zSig0, zSig1, 0x001FFFFF, 0xFFFFFFFF );
-            shift64ExtraRightJamming(
-                zSig0, zSig1, zSig2, - zExp, &zSig0, &zSig1, &zSig2 );
-            zExp = 0;
-            if ( isTiny && zSig2 ) float_raise( float_flag_underflow );
-            if ( roundNearestEven ) {
-                increment = ( (sbits32) zSig2 < 0 );
-            }
-            else {
-                if ( zSign ) {
-                    increment = ( roundingMode == float_round_down ) && zSig2;
-                }
-                else {
-                    increment = ( roundingMode == float_round_up ) && zSig2;
-                }
-            }
-        }
-    }
-    if ( zSig2 ) float_exception_flags |= float_flag_inexact;
-    if ( increment ) {
-        add64( zSig0, zSig1, 0, 1, &zSig0, &zSig1 );
-        zSig1 &= ~ ( ( zSig2 + zSig2 == 0 ) & roundNearestEven );
-    }
-    else {
-        if ( ( zSig0 | zSig1 ) == 0 ) zExp = 0;
-    }
-    return packFloat64( zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand formed by the concatenation of `zSig0' and `zSig1', and
-returns the proper double-precision floating-point value corresponding
-to the abstract input.  This routine is just like `roundAndPackFloat64'
-except that the input significand has fewer bits and does not have to be
-normalized.  In all cases, `zExp' must be 1 less than the ``true'' floating-
-point exponent.
--------------------------------------------------------------------------------
-*/
-static float64
- normalizeRoundAndPackFloat64(
-     flag zSign, int16 zExp, bits32 zSig0, bits32 zSig1 )
-{
-    int8 shiftCount;
-    bits32 zSig2;
-
-    if ( zSig0 == 0 ) {
-        zSig0 = zSig1;
-        zSig1 = 0;
-        zExp -= 32;
-    }
-    shiftCount = countLeadingZeros32( zSig0 ) - 11;
-    if ( 0 <= shiftCount ) {
-        zSig2 = 0;
-        shortShift64Left( zSig0, zSig1, shiftCount, &zSig0, &zSig1 );
-    }
-    else {
-        shift64ExtraRightJamming(
-            zSig0, zSig1, 0, - shiftCount, &zSig0, &zSig1, &zSig2 );
-    }
-    zExp -= shiftCount;
-    return roundAndPackFloat64( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a' to
-the single-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 a )
-{
-    flag zSign;
-
-    if ( a == 0 ) return 0;
-    if ( a == (sbits32) 0x80000000 ) return packFloat32( 1, 0x9E, 0 );
-    zSign = ( a < 0 );
-    return normalizeRoundAndPackFloat32( zSign, 0x9C, zSign ? - a : a );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a' to
-the double-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 int32_to_float64( int32 a )
-{
-    flag zSign;
-    bits32 absA;
-    int8 shiftCount;
-    bits32 zSig0, zSig1;
-
-    if ( a == 0 ) return packFloat64( 0, 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) - 11;
-    if ( 0 <= shiftCount ) {
-        zSig0 = absA<<shiftCount;
-        zSig1 = 0;
-    }
-    else {
-        shift64Right( absA, 0, - shiftCount, &zSig0, &zSig1 );
-    }
-    return packFloat64( zSign, 0x412 - shiftCount, zSig0, zSig1 );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig, aSigExtra;
-    int32 z;
-    int8 roundingMode;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0x96;
-    if ( 0 <= shiftCount ) {
-        if ( 0x9E <= aExp ) {
-            if ( a != 0xCF000000 ) {
-                float_raise( float_flag_invalid );
-                if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) {
-                    return 0x7FFFFFFF;
-                }
-            }
-            return (sbits32) 0x80000000;
-        }
-        z = ( aSig | 0x00800000 )<<shiftCount;
-        if ( aSign ) z = - z;
-    }
-    else {
-        if ( aExp < 0x7E ) {
-            aSigExtra = aExp | aSig;
-            z = 0;
-        }
-        else {
-            aSig |= 0x00800000;
-            aSigExtra = aSig<<( shiftCount & 31 );
-            z = aSig>>( - shiftCount );
-        }
-        if ( aSigExtra ) float_exception_flags |= float_flag_inexact;
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            if ( (sbits32) aSigExtra < 0 ) {
-                ++z;
-                if ( (bits32) ( aSigExtra<<1 ) == 0 ) z &= ~1;
-            }
-            if ( aSign ) z = - z;
-        }
-        else {
-            aSigExtra = ( aSigExtra != 0 );
-            if ( aSign ) {
-                z += ( roundingMode == float_round_down ) & aSigExtra;
-                z = - z;
-            }
-            else {
-                z += ( roundingMode == float_round_up ) & aSigExtra;
-            }
-        }
-    }
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32_round_to_zero( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    int32 z;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0x9E;
-    if ( 0 <= shiftCount ) {
-        if ( a != 0xCF000000 ) {
-            float_raise( float_flag_invalid );
-            if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) return 0x7FFFFFFF;
-        }
-        return (sbits32) 0x80000000;
-    }
-    else if ( aExp <= 0x7E ) {
-        if ( aExp | aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig = ( aSig | 0x00800000 )<<8;
-    z = aSig>>( - shiftCount );
-    if ( (bits32) ( aSig<<( shiftCount & 31 ) ) ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the double-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float32_to_float64( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig, zSig0, zSig1;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloat64( float32ToCommonNaN( a ) );
-        return packFloat64( aSign, 0x7FF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( aSign, 0, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-        --aExp;
-    }
-    shift64Right( aSig, 0, 3, &zSig0, &zSig1 );
-    return packFloat64( aSign, aExp + 0x380, zSig0, zSig1 );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Rounds the single-precision floating-point value `a' to an integer,
-and returns the result as a single-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float32 z;
-
-    aExp = extractFloat32Exp( a );
-    if ( 0x96 <= aExp ) {
-        if ( ( aExp == 0xFF ) && extractFloat32Frac( a ) ) {
-            return propagateFloat32NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp <= 0x7E ) {
-        if ( (bits32) ( a<<1 ) == 0 ) return a;
-        float_exception_flags |= float_flag_inexact;
-        aSign = extractFloat32Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x7E ) && extractFloat32Frac( a ) ) {
-                return packFloat32( aSign, 0x7F, 0 );
-            }
-            break;
-	 case float_round_to_zero:
-	    break;
-         case float_round_down:
-            return aSign ? 0xBF800000 : 0;
-         case float_round_up:
-            return aSign ? 0x80000000 : 0x3F800000;
-        }
-        return packFloat32( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x96 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z += lastBitMask>>1;
-        if ( ( z & roundBitsMask ) == 0 ) z &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloat32Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~ roundBitsMask;
-    if ( z != a ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the single-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 addFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 6;
-    bSig <<= 6;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0xFF ) {
-            if ( aSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig |= 0x20000000;
-        }
-        shift32RightJamming( bSig, expDiff, &bSig );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig |= 0x20000000;
-        }
-        shift32RightJamming( aSig, - expDiff, &aSig );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0xFF ) {
-            if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( aExp == 0 ) return packFloat32( zSign, 0, ( aSig + bSig )>>6 );
-        zSig = 0x40000000 + aSig + bSig;
-        zExp = aExp;
-        goto roundAndPack;
-    }
-    aSig |= 0x20000000;
-    zSig = ( aSig + bSig )<<1;
-    --zExp;
-    if ( (sbits32) zSig < 0 ) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
- roundAndPack:
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the single-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 subFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 7;
-    bSig <<= 7;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0xFF ) {
-        if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloat32( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign ^ 1, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig |= 0x40000000;
-    }
-    shift32RightJamming( aSig, - expDiff, &aSig );
-    bSig |= 0x40000000;
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig |= 0x40000000;
-    }
-    shift32RightJamming( bSig, expDiff, &bSig );
-    aSig |= 0x40000000;
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the single-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_add( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sub( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_mul( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig0, zSig1;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x7F;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    mul32To64( aSig, bSig, &zSig0, &zSig1 );
-    zSig0 |= ( zSig1 != 0 );
-    if ( 0 <= (sbits32) ( zSig0<<1 ) ) {
-        zSig0 <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the single-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_div( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig, rem0, rem1, term0, term1;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
-                float_raise( float_flag_invalid );
-                return float32_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x7D;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    if ( bSig <= ( aSig + aSig ) ) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = estimateDiv64To32( aSig, 0, bSig );
-    if ( ( zSig & 0x3F ) <= 2 ) {
-        mul32To64( bSig, zSig, &term0, &term1 );
-        sub64( aSig, 0, term0, term1, &rem0, &rem1 );
-        while ( (sbits32) rem0 < 0 ) {
-            --zSig;
-            add64( rem0, rem1, 0, bSig, &rem0, &rem1 );
-        }
-        zSig |= ( rem1 != 0 );
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the single-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_rem( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits32 aSig, bSig, q, allZero, alternateASig;
-    sbits32 sigMean;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return a;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    expDiff = aExp - bExp;
-    aSig = ( aSig | 0x00800000 )<<8;
-    bSig = ( bSig | 0x00800000 )<<8;
-    if ( expDiff < 0 ) {
-        if ( expDiff < -1 ) return a;
-        aSig >>= 1;
-    }
-    q = ( bSig <= aSig );
-    if ( q ) aSig -= bSig;
-    expDiff -= 32;
-    while ( 0 < expDiff ) {
-        q = estimateDiv64To32( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        aSig = - ( ( bSig>>2 ) * q );
-        expDiff -= 30;
-    }
-    expDiff += 32;
-    if ( 0 < expDiff ) {
-        q = estimateDiv64To32( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        q >>= 32 - expDiff;
-        bSig >>= 2;
-        aSig = ( ( aSig>>1 )<<( expDiff - 1 ) ) - bSig * q;
-    }
-    else {
-        aSig >>= 2;
-        bSig >>= 2;
-    }
-    do {
-        alternateASig = aSig;
-        ++q;
-        aSig -= bSig;
-    } while ( 0 <= (sbits32) aSig );
-    sigMean = aSig + alternateASig;
-    if ( ( sigMean < 0 ) || ( ( sigMean == 0 ) && ( q & 1 ) ) ) {
-        aSig = alternateASig;
-    }
-    zSign = ( (sbits32) aSig < 0 );
-    if ( zSign ) aSig = - aSig;
-    return normalizeRoundAndPackFloat32( aSign ^ zSign, bExp, aSig );
-
-}
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the square root of the single-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sqrt( float32 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits32 aSig, zSig, rem0, rem1, term0, term1;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, 0 );
-        if ( ! aSign ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig ) == 0 ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return 0;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = ( ( aExp - 0x7F )>>1 ) + 0x7E;
-    aSig = ( aSig | 0x00800000 )<<8;
-    zSig = estimateSqrt32( aExp, aSig ) + 2;
-    if ( ( zSig & 0x7F ) <= 5 ) {
-        if ( zSig < 2 ) {
-            zSig = 0x7FFFFFFF;
-            goto roundAndPack;
-        }
-        else {
-            aSig >>= aExp & 1;
-            mul32To64( zSig, zSig, &term0, &term1 );
-            sub64( aSig, 0, term0, term1, &rem0, &rem1 );
-            while ( (sbits32) rem0 < 0 ) {
-                --zSig;
-                shortShift64Left( 0, zSig, 1, &term0, &term1 );
-                term1 |= 1;
-                add64( rem0, rem1, term0, term1, &rem0, &rem1 );
-            }
-            zSig |= ( ( rem0 | rem1 ) != 0 );
-        }
-    }
-    shift32RightJamming( zSig, 1, &zSig );
- roundAndPack:
-    return roundAndPackFloat32( 0, zExp, zSig );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq_signaling( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-    int16 aExp, bExp;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig0, aSig1, absZ, aSigExtra;
-    int32 z;
-    int8 roundingMode;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    shiftCount = aExp - 0x413;
-    if ( 0 <= shiftCount ) {
-        if ( 0x41E < aExp ) {
-            if ( ( aExp == 0x7FF ) && ( aSig0 | aSig1 ) ) aSign = 0;
-            goto invalid;
-        }
-        shortShift64Left(
-            aSig0 | 0x00100000, aSig1, shiftCount, &absZ, &aSigExtra );
-        if ( 0x80000000 < absZ ) goto invalid;
-    }
-    else {
-        aSig1 = ( aSig1 != 0 );
-        if ( aExp < 0x3FE ) {
-            aSigExtra = aExp | aSig0 | aSig1;
-            absZ = 0;
-        }
-        else {
-            aSig0 |= 0x00100000;
-            aSigExtra = ( aSig0<<( shiftCount & 31 ) ) | aSig1;
-            absZ = aSig0>>( - shiftCount );
-        }
-    }
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        if ( (sbits32) aSigExtra < 0 ) {
-            ++absZ;
-            if ( (bits32) ( aSigExtra<<1 ) == 0 ) absZ &= ~1;
-        }
-        z = aSign ? - absZ : absZ;
-    }
-    else {
-        aSigExtra = ( aSigExtra != 0 );
-        if ( aSign ) {
-            z = - (   absZ
-                    + ( ( roundingMode == float_round_down ) & aSigExtra ) );
-        }
-        else {
-            z = absZ + ( ( roundingMode == float_round_up ) & aSigExtra );
-        }
-    }
-    if ( ( aSign ^ ( z < 0 ) ) && z ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( aSigExtra ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig0, aSig1, absZ, aSigExtra;
-    int32 z;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    shiftCount = aExp - 0x413;
-    if ( 0 <= shiftCount ) {
-        if ( 0x41E < aExp ) {
-            if ( ( aExp == 0x7FF ) && ( aSig0 | aSig1 ) ) aSign = 0;
-            goto invalid;
-        }
-        shortShift64Left(
-            aSig0 | 0x00100000, aSig1, shiftCount, &absZ, &aSigExtra );
-    }
-    else {
-        if ( aExp < 0x3FF ) {
-            if ( aExp | aSig0 | aSig1 ) {
-                float_exception_flags |= float_flag_inexact;
-            }
-            return 0;
-        }
-        aSig0 |= 0x00100000;
-        aSigExtra = ( aSig0<<( shiftCount & 31 ) ) | aSig1;
-        absZ = aSig0>>( - shiftCount );
-    }
-    z = aSign ? - absZ : absZ;
-    if ( ( aSign ^ ( z < 0 ) ) && z ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( aSigExtra ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the single-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float64_to_float32( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig0, aSig1, zSig;
-    bits32 allZero;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 ) {
-            return commonNaNToFloat32( float64ToCommonNaN( a ) );
-        }
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    shift64RightJamming( aSig0, aSig1, 22, &allZero, &zSig );
-    if ( aExp ) zSig |= 0x40000000;
-    return roundAndPackFloat32( aSign, aExp - 0x381, zSig );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Rounds the double-precision floating-point value `a' to an integer,
-and returns the result as a double-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float64 z;
-
-    aExp = extractFloat64Exp( a );
-    if ( 0x413 <= aExp ) {
-        if ( 0x433 <= aExp ) {
-            if (    ( aExp == 0x7FF )
-                 && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) ) {
-                return propagateFloat64NaN( a, a );
-            }
-            return a;
-        }
-        lastBitMask = 1;
-        lastBitMask = ( lastBitMask<<( 0x432 - aExp ) )<<1;
-        roundBitsMask = lastBitMask - 1;
-        z = a;
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            if ( lastBitMask ) {
-                add64( z.high, z.low, 0, lastBitMask>>1, &z.high, &z.low );
-                if ( ( z.low & roundBitsMask ) == 0 ) z.low &= ~ lastBitMask;
-            }
-            else {
-                if ( (sbits32) z.low < 0 ) {
-                    ++z.high;
-                    if ( (bits32) ( z.low<<1 ) == 0 ) z.high &= ~1;
-                }
-            }
-        }
-        else if ( roundingMode != float_round_to_zero ) {
-            if (   extractFloat64Sign( z )
-                 ^ ( roundingMode == float_round_up ) ) {
-                add64( z.high, z.low, 0, roundBitsMask, &z.high, &z.low );
-            }
-        }
-        z.low &= ~ roundBitsMask;
-    }
-    else {
-        if ( aExp <= 0x3FE ) {
-            if ( ( ( (bits32) ( a.high<<1 ) ) | a.low ) == 0 ) return a;
-            float_exception_flags |= float_flag_inexact;
-            aSign = extractFloat64Sign( a );
-            switch ( float_rounding_mode ) {
-             case float_round_nearest_even:
-                if (    ( aExp == 0x3FE )
-                     && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) )
-                   ) {
-                    return packFloat64( aSign, 0x3FF, 0, 0 );
-                }
-                break;
-             case float_round_down:
-                return
-                      aSign ? packFloat64( 1, 0x3FF, 0, 0 )
-                    : packFloat64( 0, 0, 0, 0 );
-             case float_round_up:
-                return
-                      aSign ? packFloat64( 1, 0, 0, 0 )
-                    : packFloat64( 0, 0x3FF, 0, 0 );
-            }
-            return packFloat64( aSign, 0, 0, 0 );
-        }
-        lastBitMask = 1;
-        lastBitMask <<= 0x413 - aExp;
-        roundBitsMask = lastBitMask - 1;
-        z.low = 0;
-        z.high = a.high;
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            z.high += lastBitMask>>1;
-            if ( ( ( z.high & roundBitsMask ) | a.low ) == 0 ) {
-                z.high &= ~ lastBitMask;
-            }
-        }
-        else if ( roundingMode != float_round_to_zero ) {
-            if (   extractFloat64Sign( z )
-                 ^ ( roundingMode == float_round_up ) ) {
-                z.high |= ( a.low != 0 );
-                z.high += roundBitsMask;
-            }
-        }
-        z.high &= ~ roundBitsMask;
-    }
-    if ( ( z.low != a.low ) || ( z.high != a.high ) ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the double-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 addFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    int16 expDiff;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FF ) {
-            if ( aSig0 | aSig1 ) return propagateFloat64NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig0 |= 0x00100000;
-        }
-        shift64ExtraRightJamming(
-            bSig0, bSig1, 0, expDiff, &bSig0, &bSig1, &zSig2 );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FF ) {
-            if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-            return packFloat64( zSign, 0x7FF, 0, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig0 |= 0x00100000;
-        }
-        shift64ExtraRightJamming(
-            aSig0, aSig1, 0, - expDiff, &aSig0, &aSig1, &zSig2 );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FF ) {
-            if ( aSig0 | aSig1 | bSig0 | bSig1 ) {
-                return propagateFloat64NaN( a, b );
-            }
-            return a;
-        }
-        add64( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-        if ( aExp == 0 ) return packFloat64( zSign, 0, zSig0, zSig1 );
-        zSig2 = 0;
-        zSig0 |= 0x00200000;
-        zExp = aExp;
-        goto shiftRight1;
-    }
-    aSig0 |= 0x00100000;
-    add64( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-    --zExp;
-    if ( zSig0 < 0x00200000 ) goto roundAndPack;
-    ++zExp;
- shiftRight1:
-    shift64ExtraRightJamming( zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2 );
- roundAndPack:
-    return roundAndPackFloat64( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the double-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 subFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1;
-    int16 expDiff;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    shortShift64Left( aSig0, aSig1, 10, &aSig0, &aSig1 );
-    shortShift64Left( bSig0, bSig1, 10, &bSig0, &bSig1 );
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 | bSig0 | bSig1 ) {
-            return propagateFloat64NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig0 < aSig0 ) goto aBigger;
-    if ( aSig0 < bSig0 ) goto bBigger;
-    if ( bSig1 < aSig1 ) goto aBigger;
-    if ( aSig1 < bSig1 ) goto bBigger;
-    return packFloat64( float_rounding_mode == float_round_down, 0, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign ^ 1, 0x7FF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig0 |= 0x40000000;
-    }
-    shift64RightJamming( aSig0, aSig1, - expDiff, &aSig0, &aSig1 );
-    bSig0 |= 0x40000000;
- bBigger:
-    sub64( bSig0, bSig1, aSig0, aSig1, &zSig0, &zSig1 );
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig0 |= 0x40000000;
-    }
-    shift64RightJamming( bSig0, bSig1, expDiff, &bSig0, &bSig1 );
-    aSig0 |= 0x40000000;
- aBigger:
-    sub64( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat64( zSign, zExp - 10, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the double-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_add( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sub( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_mul( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2, zSig3;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if (    ( aSig0 | aSig1 )
-             || ( ( bExp == 0x7FF ) && ( bSig0 | bSig1 ) ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        if ( ( bExp | bSig0 | bSig1 ) == 0 ) goto invalid;
-        return packFloat64( zSign, 0x7FF, 0, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-        if ( ( aExp | aSig0 | aSig1 ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat64( zSign, 0, 0, 0 );
-        normalizeFloat64Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) return packFloat64( zSign, 0, 0, 0 );
-        normalizeFloat64Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    zExp = aExp + bExp - 0x400;
-    aSig0 |= 0x00100000;
-    shortShift64Left( bSig0, bSig1, 12, &bSig0, &bSig1 );
-    mul64To128( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1, &zSig2, &zSig3 );
-    add64( zSig0, zSig1, aSig0, aSig1, &zSig0, &zSig1 );
-    zSig2 |= ( zSig3 != 0 );
-    if ( 0x00200000 <= zSig0 ) {
-        shift64ExtraRightJamming(
-            zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2 );
-        ++zExp;
-    }
-    return roundAndPackFloat64( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the double-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_div( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    bits32 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat64NaN( a, b );
-        if ( bExp == 0x7FF ) {
-            if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-            goto invalid;
-        }
-        return packFloat64( zSign, 0x7FF, 0, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign, 0, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) {
-            if ( ( aExp | aSig0 | aSig1 ) == 0 ) {
- invalid:
-                float_raise( float_flag_invalid );
-                return float64_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat64( zSign, 0x7FF, 0, 0 );
-        }
-        normalizeFloat64Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat64( zSign, 0, 0, 0 );
-        normalizeFloat64Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    zExp = aExp - bExp + 0x3FD;
-    shortShift64Left( aSig0 | 0x00100000, aSig1, 11, &aSig0, &aSig1 );
-    shortShift64Left( bSig0 | 0x00100000, bSig1, 11, &bSig0, &bSig1 );
-    if ( le64( bSig0, bSig1, aSig0, aSig1 ) ) {
-        shift64Right( aSig0, aSig1, 1, &aSig0, &aSig1 );
-        ++zExp;
-    }
-    zSig0 = estimateDiv64To32( aSig0, aSig1, bSig0 );
-    mul64By32To96( bSig0, bSig1, zSig0, &term0, &term1, &term2 );
-    sub96( aSig0, aSig1, 0, term0, term1, term2, &rem0, &rem1, &rem2 );
-    while ( (sbits32) rem0 < 0 ) {
-        --zSig0;
-        add96( rem0, rem1, rem2, 0, bSig0, bSig1, &rem0, &rem1, &rem2 );
-    }
-    zSig1 = estimateDiv64To32( rem1, rem2, bSig0 );
-    if ( ( zSig1 & 0x3FF ) <= 4 ) {
-        mul64By32To96( bSig0, bSig1, zSig1, &term1, &term2, &term3 );
-        sub96( rem1, rem2, 0, term1, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits32) rem1 < 0 ) {
-            --zSig1;
-            add96( rem1, rem2, rem3, 0, bSig0, bSig1, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shift64ExtraRightJamming( zSig0, zSig1, 0, 11, &zSig0, &zSig1, &zSig2 );
-    return roundAndPackFloat64( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the double-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_rem( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits32 aSig0, aSig1, bSig0, bSig1, q, term0, term1, term2;
-    bits32 allZero, alternateASig0, alternateASig1, sigMean1;
-    sbits32 sigMean0;
-    float64 z;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig1 = extractFloat64Frac1( b );
-    bSig0 = extractFloat64Frac0( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    if ( aExp == 0x7FF ) {
-        if (    ( aSig0 | aSig1 )
-             || ( ( bExp == 0x7FF ) && ( bSig0 | bSig1 ) ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        goto invalid;
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        normalizeFloat64Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return a;
-        normalizeFloat64Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    expDiff = aExp - bExp;
-    if ( expDiff < -1 ) return a;
-    shortShift64Left(
-        aSig0 | 0x00100000, aSig1, 11 - ( expDiff < 0 ), &aSig0, &aSig1 );
-    shortShift64Left( bSig0 | 0x00100000, bSig1, 11, &bSig0, &bSig1 );
-    q = le64( bSig0, bSig1, aSig0, aSig1 );
-    if ( q ) sub64( aSig0, aSig1, bSig0, bSig1, &aSig0, &aSig1 );
-    expDiff -= 32;
-    while ( 0 < expDiff ) {
-        q = estimateDiv64To32( aSig0, aSig1, bSig0 );
-        q = ( 4 < q ) ? q - 4 : 0;
-        mul64By32To96( bSig0, bSig1, q, &term0, &term1, &term2 );
-        shortShift96Left( term0, term1, term2, 29, &term1, &term2, &allZero );
-        shortShift64Left( aSig0, aSig1, 29, &aSig0, &allZero );
-        sub64( aSig0, 0, term1, term2, &aSig0, &aSig1 );
-        expDiff -= 29;
-    }
-    if ( -32 < expDiff ) {
-        q = estimateDiv64To32( aSig0, aSig1, bSig0 );
-        q = ( 4 < q ) ? q - 4 : 0;
-        q >>= - expDiff;
-        shift64Right( bSig0, bSig1, 8, &bSig0, &bSig1 );
-        expDiff += 24;
-        if ( expDiff < 0 ) {
-            shift64Right( aSig0, aSig1, - expDiff, &aSig0, &aSig1 );
-        }
-        else {
-            shortShift64Left( aSig0, aSig1, expDiff, &aSig0, &aSig1 );
-        }
-        mul64By32To96( bSig0, bSig1, q, &term0, &term1, &term2 );
-        sub64( aSig0, aSig1, term1, term2, &aSig0, &aSig1 );
-    }
-    else {
-        shift64Right( aSig0, aSig1, 8, &aSig0, &aSig1 );
-        shift64Right( bSig0, bSig1, 8, &bSig0, &bSig1 );
-    }
-    do {
-        alternateASig0 = aSig0;
-        alternateASig1 = aSig1;
-        ++q;
-        sub64( aSig0, aSig1, bSig0, bSig1, &aSig0, &aSig1 );
-    } while ( 0 <= (sbits32) aSig0 );
-    add64(
-        aSig0, aSig1, alternateASig0, alternateASig1, &sigMean0, &sigMean1 );
-    if (    ( sigMean0 < 0 )
-         || ( ( ( sigMean0 | sigMean1 ) == 0 ) && ( q & 1 ) ) ) {
-        aSig0 = alternateASig0;
-        aSig1 = alternateASig1;
-    }
-    zSign = ( (sbits32) aSig0 < 0 );
-    if ( zSign ) sub64( 0, 0, aSig0, aSig1, &aSig0, &aSig1 );
-    return
-        normalizeRoundAndPackFloat64( aSign ^ zSign, bExp - 4, aSig0, aSig1 );
-
-}
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the square root of the double-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sqrt( float64 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits32 aSig0, aSig1, zSig0, zSig1, zSig2, doubleZSig0;
-    bits32 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-    float64 z;
-
-    aSig1 = extractFloat64Frac1( a );
-    aSig0 = extractFloat64Frac0( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat64NaN( a, a );
-        if ( ! aSign ) return a;
-        goto invalid;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig0 | aSig1 ) == 0 ) return a;
- invalid:
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat64( 0, 0, 0, 0 );
-        normalizeFloat64Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    zExp = ( ( aExp - 0x3FF )>>1 ) + 0x3FE;
-    aSig0 |= 0x00100000;
-    shortShift64Left( aSig0, aSig1, 11, &term0, &term1 );
-    zSig0 = ( estimateSqrt32( aExp, term0 )>>1 ) + 1;
-    if ( zSig0 == 0 ) zSig0 = 0x7FFFFFFF;
-    doubleZSig0 = zSig0 + zSig0;
-    shortShift64Left( aSig0, aSig1, 9 - ( aExp & 1 ), &aSig0, &aSig1 );
-    mul32To64( zSig0, zSig0, &term0, &term1 );
-    sub64( aSig0, aSig1, term0, term1, &rem0, &rem1 );
-    while ( (sbits32) rem0 < 0 ) {
-        --zSig0;
-        doubleZSig0 -= 2;
-        add64( rem0, rem1, 0, doubleZSig0 | 1, &rem0, &rem1 );
-    }
-    zSig1 = estimateDiv64To32( rem1, 0, doubleZSig0 );
-    if ( ( zSig1 & 0x1FF ) <= 5 ) {
-        if ( zSig1 == 0 ) zSig1 = 1;
-        mul32To64( doubleZSig0, zSig1, &term1, &term2 );
-        sub64( rem1, 0, term1, term2, &rem1, &rem2 );
-        mul32To64( zSig1, zSig1, &term2, &term3 );
-        sub96( rem1, rem2, 0, 0, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits32) rem1 < 0 ) {
-            --zSig1;
-            shortShift64Left( 0, zSig1, 1, &term2, &term3 );
-            term3 |= 1;
-            term2 |= doubleZSig0;
-            add96( rem1, rem2, rem3, 0, term2, term3, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shift64ExtraRightJamming( zSig0, zSig1, 0, 10, &zSig0, &zSig1, &zSig2 );
-    return roundAndPackFloat64( 0, zExp, zSig0, zSig1, zSig2 );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq( float64 a, float64 b )
-{
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) ||
-	( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign )
-	return aSign ||
-	    ( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) ==
-	      0 );
-    return ( a == b ) ||
-	( aSign ^ ( FLOAT64_DEMANGLE(a) < FLOAT64_DEMANGLE(b) ) );
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign )
-	return aSign &&
-	    ( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) !=
-	      0 );
-    return ( a != b ) &&
-	( aSign ^ ( FLOAT64_DEMANGLE(a) < FLOAT64_DEMANGLE(b) ) );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq_signaling( float64 a, float64 b )
-{
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits64) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits64) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat64Exp( a ) == 0x7FF )
-              && ( extractFloat64Frac0( a ) | extractFloat64Frac1( a ) ) )
-         || (    ( extractFloat64Exp( b ) == 0x7FF )
-              && ( extractFloat64Frac0( b ) | extractFloat64Frac1( b ) ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits64) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-#endif
diff --git a/lib/libc_bsd/softfloat/bits64/softfloat-macros b/lib/libc_bsd/softfloat/bits64/softfloat-macros
deleted file mode 100644
index 8ae23a8..0000000
--- a/lib/libc_bsd/softfloat/bits64/softfloat-macros
+++ /dev/null
@@ -1,746 +0,0 @@
-/* $NetBSD: softfloat-macros,v 1.2 2009/02/16 10:23:35 tron Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/softfloat/bits64/softfloat-macros 230363 2012-01-20 06:16:14Z das $ */
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Shifts `a' right by the number of bits given in `count'.  If any nonzero
-bits are shifted off, they are ``jammed'' into the least significant bit of
-the result by setting the least significant bit to 1.  The value of `count'
-can be arbitrarily large; in particular, if `count' is greater than 32, the
-result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-The result is stored in the location pointed to by `zPtr'.
--------------------------------------------------------------------------------
-*/
-INLINE void shift32RightJamming( bits32 a, int16 count, bits32 *zPtr )
-{
-    bits32 z;
-
-    if ( count == 0 ) {
-        z = a;
-    }
-    else if ( count < 32 ) {
-        z = ( a>>count ) | ( ( a<<( ( - count ) & 31 ) ) != 0 );
-    }
-    else {
-        z = ( a != 0 );
-    }
-    *zPtr = z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts `a' right by the number of bits given in `count'.  If any nonzero
-bits are shifted off, they are ``jammed'' into the least significant bit of
-the result by setting the least significant bit to 1.  The value of `count'
-can be arbitrarily large; in particular, if `count' is greater than 64, the
-result will be either 0 or 1, depending on whether `a' is zero or nonzero.
-The result is stored in the location pointed to by `zPtr'.
--------------------------------------------------------------------------------
-*/
-INLINE void shift64RightJamming( bits64 a, int16 count, bits64 *zPtr )
-{
-    bits64 z;
-
-    if ( count == 0 ) {
-        z = a;
-    }
-    else if ( count < 64 ) {
-        z = ( a>>count ) | ( ( a<<( ( - count ) & 63 ) ) != 0 );
-    }
-    else {
-        z = ( a != 0 );
-    }
-    *zPtr = z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' right by 64
-_plus_ the number of bits given in `count'.  The shifted result is at most
-64 nonzero bits; this is stored at the location pointed to by `z0Ptr'.  The
-bits shifted off form a second 64-bit result as follows:  The _last_ bit
-shifted off is the most-significant bit of the extra result, and the other
-63 bits of the extra result are all zero if and only if _all_but_the_last_
-bits shifted off were all zero.  This extra result is stored in the location
-pointed to by `z1Ptr'.  The value of `count' can be arbitrarily large.
-    (This routine makes more sense if `a0' and `a1' are considered to form a
-fixed-point value with binary point between `a0' and `a1'.  This fixed-point
-value is shifted right by the number of bits given in `count', and the
-integer part of the result is returned at the location pointed to by
-`z0Ptr'.  The fractional part of the result may be slightly corrupted as
-described above, and is returned at the location pointed to by `z1Ptr'.)
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift64ExtraRightJamming(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z0, z1;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 64 ) {
-        z1 = ( a0<<negCount ) | ( a1 != 0 );
-        z0 = a0>>count;
-    }
-    else {
-        if ( count == 64 ) {
-            z1 = a0 | ( a1 != 0 );
-        }
-        else {
-            z1 = ( ( a0 | a1 ) != 0 );
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' can be arbitrarily large; in particular, if `count' is greater
-than 128, the result will be 0.  The result is broken into two 64-bit pieces
-which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift128Right(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z0, z1;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 64 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count );
-        z0 = a0>>count;
-    }
-    else {
-        z1 = ( count < 64 ) ? ( a0>>( count & 63 ) ) : 0;
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' right by the
-number of bits given in `count'.  If any nonzero bits are shifted off, they
-are ``jammed'' into the least significant bit of the result by setting the
-least significant bit to 1.  The value of `count' can be arbitrarily large;
-in particular, if `count' is greater than 128, the result will be either
-0 or 1, depending on whether the concatenation of `a0' and `a1' is zero or
-nonzero.  The result is broken into two 64-bit pieces which are stored at
-the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift128RightJamming(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z0, z1;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z1 = a1;
-        z0 = a0;
-    }
-    else if ( count < 64 ) {
-        z1 = ( a0<<negCount ) | ( a1>>count ) | ( ( a1<<negCount ) != 0 );
-        z0 = a0>>count;
-    }
-    else {
-        if ( count == 64 ) {
-            z1 = a0 | ( a1 != 0 );
-        }
-        else if ( count < 128 ) {
-            z1 = ( a0>>( count & 63 ) ) | ( ( ( a0<<negCount ) | a1 ) != 0 );
-        }
-        else {
-            z1 = ( ( a0 | a1 ) != 0 );
-        }
-        z0 = 0;
-    }
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 192-bit value formed by concatenating `a0', `a1', and `a2' right
-by 64 _plus_ the number of bits given in `count'.  The shifted result is
-at most 128 nonzero bits; these are broken into two 64-bit pieces which are
-stored at the locations pointed to by `z0Ptr' and `z1Ptr'.  The bits shifted
-off form a third 64-bit result as follows:  The _last_ bit shifted off is
-the most-significant bit of the extra result, and the other 63 bits of the
-extra result are all zero if and only if _all_but_the_last_ bits shifted off
-were all zero.  This extra result is stored in the location pointed to by
-`z2Ptr'.  The value of `count' can be arbitrarily large.
-    (This routine makes more sense if `a0', `a1', and `a2' are considered
-to form a fixed-point value with binary point between `a1' and `a2'.  This
-fixed-point value is shifted right by the number of bits given in `count',
-and the integer part of the result is returned at the locations pointed to
-by `z0Ptr' and `z1Ptr'.  The fractional part of the result may be slightly
-corrupted as described above, and is returned at the location pointed to by
-`z2Ptr'.)
--------------------------------------------------------------------------------
-*/
-INLINE void
- shift128ExtraRightJamming(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     int16 count,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 negCount = ( - count ) & 63;
-
-    if ( count == 0 ) {
-        z2 = a2;
-        z1 = a1;
-        z0 = a0;
-    }
-    else {
-        if ( count < 64 ) {
-            z2 = a1<<negCount;
-            z1 = ( a0<<negCount ) | ( a1>>count );
-            z0 = a0>>count;
-        }
-        else {
-            if ( count == 64 ) {
-                z2 = a1;
-                z1 = a0;
-            }
-            else {
-                a2 |= a1;
-                if ( count < 128 ) {
-                    z2 = a0<<negCount;
-                    z1 = a0>>( count & 63 );
-                }
-                else {
-                    z2 = ( count == 128 ) ? a0 : ( a0 != 0 );
-                    z1 = 0;
-                }
-            }
-            z0 = 0;
-        }
-        z2 |= ( a2 != 0 );
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 128-bit value formed by concatenating `a0' and `a1' left by the
-number of bits given in `count'.  Any bits shifted off are lost.  The value
-of `count' must be less than 64.  The result is broken into two 64-bit
-pieces which are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift128Left(
-     bits64 a0, bits64 a1, int16 count, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-
-    *z1Ptr = a1<<count;
-    *z0Ptr =
-        ( count == 0 ) ? a0 : ( a0<<count ) | ( a1>>( ( - count ) & 63 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Shifts the 192-bit value formed by concatenating `a0', `a1', and `a2' left
-by the number of bits given in `count'.  Any bits shifted off are lost.
-The value of `count' must be less than 64.  The result is broken into three
-64-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- shortShift192Left(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     int16 count,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 negCount;
-
-    z2 = a2<<count;
-    z1 = a1<<count;
-    z0 = a0<<count;
-    if ( 0 < count ) {
-        negCount = ( ( - count ) & 63 );
-        z1 |= a2>>negCount;
-        z0 |= a1>>negCount;
-    }
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 128-bit value formed by concatenating `a0' and `a1' to the 128-bit
-value formed by concatenating `b0' and `b1'.  Addition is modulo 2^128, so
-any carry out is lost.  The result is broken into two 64-bit pieces which
-are stored at the locations pointed to by `z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add128(
-     bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits64 z1;
-
-    z1 = a1 + b1;
-    *z1Ptr = z1;
-    *z0Ptr = a0 + b0 + ( z1 < a1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Adds the 192-bit value formed by concatenating `a0', `a1', and `a2' to the
-192-bit value formed by concatenating `b0', `b1', and `b2'.  Addition is
-modulo 2^192, so any carry out is lost.  The result is broken into three
-64-bit pieces which are stored at the locations pointed to by `z0Ptr',
-`z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- add192(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     bits64 b0,
-     bits64 b1,
-     bits64 b2,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 carry0, carry1;
-
-    z2 = a2 + b2;
-    carry1 = ( z2 < a2 );
-    z1 = a1 + b1;
-    carry0 = ( z1 < a1 );
-    z0 = a0 + b0;
-    z1 += carry1;
-    z0 += ( z1 < (bits64)carry1 );
-    z0 += carry0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 128-bit value formed by concatenating `b0' and `b1' from the
-128-bit value formed by concatenating `a0' and `a1'.  Subtraction is modulo
-2^128, so any borrow out (carry out) is lost.  The result is broken into two
-64-bit pieces which are stored at the locations pointed to by `z0Ptr' and
-`z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub128(
-     bits64 a0, bits64 a1, bits64 b0, bits64 b1, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-
-    *z1Ptr = a1 - b1;
-    *z0Ptr = a0 - b0 - ( a1 < b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Subtracts the 192-bit value formed by concatenating `b0', `b1', and `b2'
-from the 192-bit value formed by concatenating `a0', `a1', and `a2'.
-Subtraction is modulo 2^192, so any borrow out (carry out) is lost.  The
-result is broken into three 64-bit pieces which are stored at the locations
-pointed to by `z0Ptr', `z1Ptr', and `z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- sub192(
-     bits64 a0,
-     bits64 a1,
-     bits64 a2,
-     bits64 b0,
-     bits64 b1,
-     bits64 b2,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2;
-    int8 borrow0, borrow1;
-
-    z2 = a2 - b2;
-    borrow1 = ( a2 < b2 );
-    z1 = a1 - b1;
-    borrow0 = ( a1 < b1 );
-    z0 = a0 - b0;
-    z0 -= ( z1 < (bits64)borrow1 );
-    z1 -= borrow1;
-    z0 -= borrow0;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies `a' by `b' to obtain a 128-bit product.  The product is broken
-into two 64-bit pieces which are stored at the locations pointed to by
-`z0Ptr' and `z1Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void mul64To128( bits64 a, bits64 b, bits64 *z0Ptr, bits64 *z1Ptr )
-{
-    bits32 aHigh, aLow, bHigh, bLow;
-    bits64 z0, zMiddleA, zMiddleB, z1;
-
-    aLow = a;
-    aHigh = a>>32;
-    bLow = b;
-    bHigh = b>>32;
-    z1 = ( (bits64) aLow ) * bLow;
-    zMiddleA = ( (bits64) aLow ) * bHigh;
-    zMiddleB = ( (bits64) aHigh ) * bLow;
-    z0 = ( (bits64) aHigh ) * bHigh;
-    zMiddleA += zMiddleB;
-    z0 += ( ( (bits64) ( zMiddleA < zMiddleB ) )<<32 ) + ( zMiddleA>>32 );
-    zMiddleA <<= 32;
-    z1 += zMiddleA;
-    z0 += ( z1 < zMiddleA );
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 128-bit value formed by concatenating `a0' and `a1' by
-`b' to obtain a 192-bit product.  The product is broken into three 64-bit
-pieces which are stored at the locations pointed to by `z0Ptr', `z1Ptr', and
-`z2Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul128By64To192(
-     bits64 a0,
-     bits64 a1,
-     bits64 b,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr
- )
-{
-    bits64 z0, z1, z2, more1;
-
-    mul64To128( a1, b, &z1, &z2 );
-    mul64To128( a0, b, &z0, &more1 );
-    add128( z0, more1, 0, z1, &z0, &z1 );
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Multiplies the 128-bit value formed by concatenating `a0' and `a1' to the
-128-bit value formed by concatenating `b0' and `b1' to obtain a 256-bit
-product.  The product is broken into four 64-bit pieces which are stored at
-the locations pointed to by `z0Ptr', `z1Ptr', `z2Ptr', and `z3Ptr'.
--------------------------------------------------------------------------------
-*/
-INLINE void
- mul128To256(
-     bits64 a0,
-     bits64 a1,
-     bits64 b0,
-     bits64 b1,
-     bits64 *z0Ptr,
-     bits64 *z1Ptr,
-     bits64 *z2Ptr,
-     bits64 *z3Ptr
- )
-{
-    bits64 z0, z1, z2, z3;
-    bits64 more1, more2;
-
-    mul64To128( a1, b1, &z2, &z3 );
-    mul64To128( a1, b0, &z1, &more2 );
-    add128( z1, more2, 0, z2, &z1, &z2 );
-    mul64To128( a0, b0, &z0, &more1 );
-    add128( z0, more1, 0, z1, &z0, &z1 );
-    mul64To128( a0, b1, &more1, &more2 );
-    add128( more1, more2, 0, z2, &more1, &z2 );
-    add128( z0, z1, 0, more1, &z0, &z1 );
-    *z3Ptr = z3;
-    *z2Ptr = z2;
-    *z1Ptr = z1;
-    *z0Ptr = z0;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the 64-bit integer quotient obtained by dividing
-`b' into the 128-bit value formed by concatenating `a0' and `a1'.  The
-divisor `b' must be at least 2^63.  If q is the exact quotient truncated
-toward zero, the approximation returned lies between q and q + 2 inclusive.
-If the exact quotient q is larger than 64 bits, the maximum positive 64-bit
-unsigned integer is returned.
--------------------------------------------------------------------------------
-*/
-static bits64 estimateDiv128To64( bits64 a0, bits64 a1, bits64 b )
-{
-    bits64 b0, b1;
-    bits64 rem0, rem1, term0, term1;
-    bits64 z;
-
-    if ( b <= a0 ) return LIT64( 0xFFFFFFFFFFFFFFFF );
-    b0 = b>>32;
-    z = ( b0<<32 <= a0 ) ? LIT64( 0xFFFFFFFF00000000 ) : ( a0 / b0 )<<32;
-    mul64To128( b, z, &term0, &term1 );
-    sub128( a0, a1, term0, term1, &rem0, &rem1 );
-    while ( ( (sbits64) rem0 ) < 0 ) {
-        z -= LIT64( 0x100000000 );
-        b1 = b<<32;
-        add128( rem0, rem1, b0, b1, &rem0, &rem1 );
-    }
-    rem0 = ( rem0<<32 ) | ( rem1>>32 );
-    z |= ( b0<<32 <= rem0 ) ? 0xFFFFFFFF : rem0 / b0;
-    return z;
-
-}
-
-#if !defined(SOFTFLOAT_FOR_GCC) || defined(FLOATX80) || defined(FLOAT128)
-/*
--------------------------------------------------------------------------------
-Returns an approximation to the square root of the 32-bit significand given
-by `a'.  Considered as an integer, `a' must be at least 2^31.  If bit 0 of
-`aExp' (the least significant bit) is 1, the integer returned approximates
-2^31*sqrt(`a'/2^31), where `a' is considered an integer.  If bit 0 of `aExp'
-is 0, the integer returned approximates 2^31*sqrt(`a'/2^30).  In either
-case, the approximation returned lies strictly within +/-2 of the exact
-value.
--------------------------------------------------------------------------------
-*/
-static bits32 estimateSqrt32( int16 aExp, bits32 a )
-{
-    static const bits16 sqrtOddAdjustments[] = {
-        0x0004, 0x0022, 0x005D, 0x00B1, 0x011D, 0x019F, 0x0236, 0x02E0,
-        0x039C, 0x0468, 0x0545, 0x0631, 0x072B, 0x0832, 0x0946, 0x0A67
-    };
-    static const bits16 sqrtEvenAdjustments[] = {
-        0x0A2D, 0x08AF, 0x075A, 0x0629, 0x051A, 0x0429, 0x0356, 0x029E,
-        0x0200, 0x0179, 0x0109, 0x00AF, 0x0068, 0x0034, 0x0012, 0x0002
-    };
-    int8 idx;
-    bits32 z;
-
-    idx = ( a>>27 ) & 15;
-    if ( aExp & 1 ) {
-        z = 0x4000 + ( a>>17 ) - sqrtOddAdjustments[ idx ];
-        z = ( ( a / z )<<14 ) + ( z<<15 );
-        a >>= 1;
-    }
-    else {
-        z = 0x8000 + ( a>>17 ) - sqrtEvenAdjustments[ idx ];
-        z = a / z + z;
-        z = ( 0x20000 <= z ) ? 0xFFFF8000 : ( z<<15 );
-        if ( z <= a ) return (bits32) ( ( (sbits32) a )>>1 );
-    }
-    return ( (bits32) ( ( ( (bits64) a )<<31 ) / z ) ) + ( z>>1 );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the number of leading 0 bits before the most-significant 1 bit of
-`a'.  If `a' is zero, 32 is returned.
--------------------------------------------------------------------------------
-*/
-static int8 countLeadingZeros32( bits32 a )
-{
-    static const int8 countLeadingZerosHigh[] = {
-        8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    int8 shiftCount;
-
-    shiftCount = 0;
-    if ( a < 0x10000 ) {
-        shiftCount += 16;
-        a <<= 16;
-    }
-    if ( a < 0x1000000 ) {
-        shiftCount += 8;
-        a <<= 8;
-    }
-    shiftCount += countLeadingZerosHigh[ a>>24 ];
-    return shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the number of leading 0 bits before the most-significant 1 bit of
-`a'.  If `a' is zero, 64 is returned.
--------------------------------------------------------------------------------
-*/
-static int8 countLeadingZeros64( bits64 a )
-{
-    int8 shiftCount;
-
-    shiftCount = 0;
-    if ( a < ( (bits64) 1 )<<32 ) {
-        shiftCount += 32;
-    }
-    else {
-        a >>= 32;
-    }
-    shiftCount += countLeadingZeros32( a );
-    return shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1'
-is equal to the 128-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag eq128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 == b0 ) && ( a1 == b1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is less
-than or equal to the 128-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag le128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 <= b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is less
-than the 128-bit value formed by concatenating `b0' and `b1'.  Otherwise,
-returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag lt128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 < b0 ) || ( ( a0 == b0 ) && ( a1 < b1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the 128-bit value formed by concatenating `a0' and `a1' is
-not equal to the 128-bit value formed by concatenating `b0' and `b1'.
-Otherwise, returns 0.
--------------------------------------------------------------------------------
-*/
-INLINE flag ne128( bits64 a0, bits64 a1, bits64 b0, bits64 b1 )
-{
-
-    return ( a0 != b0 ) || ( a1 != b1 );
-
-}
-
diff --git a/lib/libc_bsd/softfloat/bits64/softfloat.c b/lib/libc_bsd/softfloat/bits64/softfloat.c
deleted file mode 100644
index 496c7ba..0000000
--- a/lib/libc_bsd/softfloat/bits64/softfloat.c
+++ /dev/null
@@ -1,5599 +0,0 @@
-/* $NetBSD: softfloat.c,v 1.8 2011/07/10 04:52:23 matt Exp $ */
-
-/*
- * This version hacked for use with gcc -msoft-float by bjh21.
- * (Mostly a case of #ifdefing out things GCC doesn't need or provides
- *  itself).
- */
-
-/*
- * Things you may want to define:
- *
- * SOFTFLOAT_FOR_GCC - build only those functions necessary for GCC (with
- *   -msoft-float) to work.  Include "softfloat-for-gcc.h" to get them
- *   properly renamed.
- */
-
-/*
-===============================================================================
-
-This C source file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/bits64/softfloat.c 230380 2012-01-20 14:44:21Z das $");
-
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-
-#include "milieu.h"
-#include "softfloat.h"
-
-/*
- * Conversions between floats as stored in memory and floats as
- * SoftFloat uses them
- */
-#ifndef FLOAT64_DEMANGLE
-#define FLOAT64_DEMANGLE(a)	(a)
-#endif
-#ifndef FLOAT64_MANGLE
-#define FLOAT64_MANGLE(a)	(a)
-#endif
-
-/*
--------------------------------------------------------------------------------
-Floating-point rounding mode, extended double-precision rounding precision,
-and exception flags.
--------------------------------------------------------------------------------
-*/
-int float_rounding_mode = float_round_nearest_even;
-int float_exception_flags = 0;
-#ifdef FLOATX80
-int8 floatx80_rounding_precision = 80;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Primitive arithmetic functions, including multi-word arithmetic, and
-division and square root approximations.  (Can be specialized to target if
-desired.)
--------------------------------------------------------------------------------
-*/
-#include "softfloat-macros"
-
-/*
--------------------------------------------------------------------------------
-Functions and definitions to determine:  (1) whether tininess for underflow
-is detected before or after rounding by default, (2) what (if anything)
-happens when exceptions are raised, (3) how signaling NaNs are distinguished
-from quiet NaNs, (4) the default generated quiet NaNs, and (5) how NaNs
-are propagated from function inputs to output.  These details are target-
-specific.
--------------------------------------------------------------------------------
-*/
-#include "softfloat-specialize"
-
-#if !defined(SOFTFLOAT_FOR_GCC) || defined(FLOATX80) || defined(FLOAT128)
-/*
--------------------------------------------------------------------------------
-Takes a 64-bit fixed-point value `absZ' with binary point between bits 6
-and 7, and returns the properly rounded 32-bit integer corresponding to the
-input.  If `zSign' is 1, the input is negated before being converted to an
-integer.  Bit 63 of `absZ' must be zero.  Ordinarily, the fixed-point input
-is simply rounded to an integer, with the inexact exception raised if the
-input cannot be represented exactly as an integer.  However, if the fixed-
-point input is too large, the invalid exception is raised and the largest
-positive or negative integer is returned.
--------------------------------------------------------------------------------
-*/
-static int32 roundAndPackInt32( flag zSign, bits64 absZ )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int8 roundIncrement, roundBits;
-    int32 z;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    roundIncrement = 0x40;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x7F;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = absZ & 0x7F;
-    absZ = ( absZ + roundIncrement )>>7;
-    absZ &= ~ ( ( ( roundBits ^ 0x40 ) == 0 ) & roundNearestEven );
-    z = absZ;
-    if ( zSign ) z = - z;
-    if ( ( absZ>>32 ) || ( z && ( ( z < 0 ) ^ zSign ) ) ) {
-        float_raise( float_flag_invalid );
-        return zSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( roundBits ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes the 128-bit fixed-point value formed by concatenating `absZ0' and
-`absZ1', with binary point between bits 63 and 64 (between the input words),
-and returns the properly rounded 64-bit integer corresponding to the input.
-If `zSign' is 1, the input is negated before being converted to an integer.
-Ordinarily, the fixed-point input is simply rounded to an integer, with
-the inexact exception raised if the input cannot be represented exactly as
-an integer.  However, if the fixed-point input is too large, the invalid
-exception is raised and the largest positive or negative integer is
-returned.
--------------------------------------------------------------------------------
-*/
-static int64 roundAndPackInt64( flag zSign, bits64 absZ0, bits64 absZ1 )
-{
-    int8 roundingMode;
-    flag roundNearestEven, increment;
-    int64 z;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    increment = ( (sbits64) absZ1 < 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            increment = 0;
-        }
-        else {
-            if ( zSign ) {
-                increment = ( roundingMode == float_round_down ) && absZ1;
-            }
-            else {
-                increment = ( roundingMode == float_round_up ) && absZ1;
-            }
-        }
-    }
-    if ( increment ) {
-        ++absZ0;
-        if ( absZ0 == 0 ) goto overflow;
-        absZ0 &= ~ ( ( (bits64) ( absZ1<<1 ) == 0 ) & roundNearestEven );
-    }
-    z = absZ0;
-    if ( zSign ) z = - z;
-    if ( z && ( ( z < 0 ) ^ zSign ) ) {
- overflow:
-        float_raise( float_flag_invalid );
-        return
-              zSign ? (sbits64) LIT64( 0x8000000000000000 )
-            : LIT64( 0x7FFFFFFFFFFFFFFF );
-    }
-    if ( absZ1 ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits32 extractFloat32Frac( float32 a )
-{
-
-    return a & 0x007FFFFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat32Exp( float32 a )
-{
-
-    return ( a>>23 ) & 0xFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the single-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat32Sign( float32 a )
-{
-
-    return a>>31;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal single-precision floating-point value represented
-by the denormalized significand `aSig'.  The normalized exponent and
-significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat32Subnormal( bits32 aSig, int16 *zExpPtr, bits32 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( aSig ) - 8;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-single-precision floating-point value, returning the result.  After being
-shifted into the proper positions, the three fields are simply added
-together to form the result.  This means that any integer portion of `zSig'
-will be added into the exponent.  Since a properly normalized significand
-will have an integer portion equal to 1, the `zExp' input should be 1 less
-than the desired result exponent whenever `zSig' is a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float32 packFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-
-    return ( ( (bits32) zSign )<<31 ) + ( ( (bits32) zExp )<<23 ) + zSig;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  Ordinarily, the abstract
-value is simply rounded and packed into the single-precision format, with
-the inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal single-
-precision floating-point number.
-    The input significand `zSig' has its binary point between bits 30
-and 29, which is 7 bits to the left of the usual location.  This shifted
-significand must be normalized or smaller.  If `zSig' is not normalized,
-`zExp' must be 0; in that case, the result returned is a subnormal number,
-and it must not require rounding.  In the usual case that `zSig' is
-normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-The handling of underflow and overflow follows the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 roundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int8 roundIncrement, roundBits;
-    flag isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    roundIncrement = 0x40;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x7F;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig & 0x7F;
-    if ( 0xFD <= (bits16) zExp ) {
-        if (    ( 0xFD < zExp )
-             || (    ( zExp == 0xFD )
-                  && ( (sbits32) ( zSig + roundIncrement ) < 0 ) )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            return packFloat32( zSign, 0xFF, 0 ) - ( roundIncrement == 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ( zSig + roundIncrement < 0x80000000 );
-            shift32RightJamming( zSig, - zExp, &zSig );
-            zExp = 0;
-            roundBits = zSig & 0x7F;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-        }
-    }
-    if ( roundBits ) float_exception_flags |= float_flag_inexact;
-    zSig = ( zSig + roundIncrement )>>7;
-    zSig &= ~ ( ( ( roundBits ^ 0x40 ) == 0 ) & roundNearestEven );
-    if ( zSig == 0 ) zExp = 0;
-    return packFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper single-precision floating-
-point value corresponding to the abstract input.  This routine is just like
-`roundAndPackFloat32' except that `zSig' does not have to be normalized.
-Bit 31 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-floating-point exponent.
--------------------------------------------------------------------------------
-*/
-static float32
- normalizeRoundAndPackFloat32( flag zSign, int16 zExp, bits32 zSig )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros32( zSig ) - 1;
-    return roundAndPackFloat32( zSign, zExp - shiftCount, zSig<<shiftCount );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloat64Frac( float64 a )
-{
-
-    return FLOAT64_DEMANGLE(a) & LIT64( 0x000FFFFFFFFFFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int16 extractFloat64Exp( float64 a )
-{
-
-    return ( FLOAT64_DEMANGLE(a)>>52 ) & 0x7FF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the double-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat64Sign( float64 a )
-{
-
-    return FLOAT64_DEMANGLE(a)>>63;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal double-precision floating-point value represented
-by the denormalized significand `aSig'.  The normalized exponent and
-significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat64Subnormal( bits64 aSig, int16 *zExpPtr, bits64 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros64( aSig ) - 11;
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into a
-double-precision floating-point value, returning the result.  After being
-shifted into the proper positions, the three fields are simply added
-together to form the result.  This means that any integer portion of `zSig'
-will be added into the exponent.  Since a properly normalized significand
-will have an integer portion equal to 1, the `zExp' input should be 1 less
-than the desired result exponent whenever `zSig' is a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float64 packFloat64( flag zSign, int16 zExp, bits64 zSig )
-{
-
-    return FLOAT64_MANGLE( ( ( (bits64) zSign )<<63 ) +
-			   ( ( (bits64) zExp )<<52 ) + zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper double-precision floating-
-point value corresponding to the abstract input.  Ordinarily, the abstract
-value is simply rounded and packed into the double-precision format, with
-the inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal double-
-precision floating-point number.
-    The input significand `zSig' has its binary point between bits 62
-and 61, which is 10 bits to the left of the usual location.  This shifted
-significand must be normalized or smaller.  If `zSig' is not normalized,
-`zExp' must be 0; in that case, the result returned is a subnormal number,
-and it must not require rounding.  In the usual case that `zSig' is
-normalized, `zExp' must be 1 less than the ``true'' floating-point exponent.
-The handling of underflow and overflow follows the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 roundAndPackFloat64( flag zSign, int16 zExp, bits64 zSig )
-{
-    int8 roundingMode;
-    flag roundNearestEven;
-    int16 roundIncrement, roundBits;
-    flag isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    roundIncrement = 0x200;
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = 0x3FF;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig & 0x3FF;
-    if ( 0x7FD <= (bits16) zExp ) {
-        if (    ( 0x7FD < zExp )
-             || (    ( zExp == 0x7FD )
-                  && ( (sbits64) ( zSig + roundIncrement ) < 0 ) )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            return FLOAT64_MANGLE(
-		FLOAT64_DEMANGLE(packFloat64( zSign, 0x7FF, 0 )) -
-		( roundIncrement == 0 ));
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ( zSig + roundIncrement < LIT64( 0x8000000000000000 ) );
-            shift64RightJamming( zSig, - zExp, &zSig );
-            zExp = 0;
-            roundBits = zSig & 0x3FF;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-        }
-    }
-    if ( roundBits ) float_exception_flags |= float_flag_inexact;
-    zSig = ( zSig + roundIncrement )>>10;
-    zSig &= ~ ( ( ( roundBits ^ 0x200 ) == 0 ) & roundNearestEven );
-    if ( zSig == 0 ) zExp = 0;
-    return packFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand `zSig', and returns the proper double-precision floating-
-point value corresponding to the abstract input.  This routine is just like
-`roundAndPackFloat64' except that `zSig' does not have to be normalized.
-Bit 63 of `zSig' must be zero, and `zExp' must be 1 less than the ``true''
-floating-point exponent.
--------------------------------------------------------------------------------
-*/
-static float64
- normalizeRoundAndPackFloat64( flag zSign, int16 zExp, bits64 zSig )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros64( zSig ) - 1;
-    return roundAndPackFloat64( zSign, zExp - shiftCount, zSig<<shiftCount );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the fraction bits of the extended double-precision floating-point
-value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloatx80Frac( floatx80 a )
-{
-
-    return a.low;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the extended double-precision floating-point
-value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE int32 extractFloatx80Exp( floatx80 a )
-{
-
-    return a.high & 0x7FFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the extended double-precision floating-point value
-`a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloatx80Sign( floatx80 a )
-{
-
-    return a.high>>15;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal extended double-precision floating-point value
-represented by the denormalized significand `aSig'.  The normalized exponent
-and significand are stored at the locations pointed to by `zExpPtr' and
-`zSigPtr', respectively.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloatx80Subnormal( bits64 aSig, int32 *zExpPtr, bits64 *zSigPtr )
-{
-    int8 shiftCount;
-
-    shiftCount = countLeadingZeros64( aSig );
-    *zSigPtr = aSig<<shiftCount;
-    *zExpPtr = 1 - shiftCount;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', exponent `zExp', and significand `zSig' into an
-extended double-precision floating-point value, returning the result.
--------------------------------------------------------------------------------
-*/
-INLINE floatx80 packFloatx80( flag zSign, int32 zExp, bits64 zSig )
-{
-    floatx80 z;
-
-    z.low = zSig;
-    z.high = ( ( (bits16) zSign )<<15 ) + zExp;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and extended significand formed by the concatenation of `zSig0' and `zSig1',
-and returns the proper extended double-precision floating-point value
-corresponding to the abstract input.  Ordinarily, the abstract value is
-rounded and packed into the extended double-precision format, with the
-inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal extended
-double-precision floating-point number.
-    If `roundingPrecision' is 32 or 64, the result is rounded to the same
-number of bits as single or double precision, respectively.  Otherwise, the
-result is rounded to the full precision of the extended double-precision
-format.
-    The input significand must be normalized or smaller.  If the input
-significand is not normalized, `zExp' must be 0; in that case, the result
-returned is a subnormal number, and it must not require rounding.  The
-handling of underflow and overflow follows the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static floatx80
- roundAndPackFloatx80(
-     int8 roundingPrecision, flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1
- )
-{
-    int8 roundingMode;
-    flag roundNearestEven, increment, isTiny;
-    int64 roundIncrement, roundMask, roundBits;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    if ( roundingPrecision == 80 ) goto precision80;
-    if ( roundingPrecision == 64 ) {
-        roundIncrement = LIT64( 0x0000000000000400 );
-        roundMask = LIT64( 0x00000000000007FF );
-    }
-    else if ( roundingPrecision == 32 ) {
-        roundIncrement = LIT64( 0x0000008000000000 );
-        roundMask = LIT64( 0x000000FFFFFFFFFF );
-    }
-    else {
-        goto precision80;
-    }
-    zSig0 |= ( zSig1 != 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            roundIncrement = 0;
-        }
-        else {
-            roundIncrement = roundMask;
-            if ( zSign ) {
-                if ( roundingMode == float_round_up ) roundIncrement = 0;
-            }
-            else {
-                if ( roundingMode == float_round_down ) roundIncrement = 0;
-            }
-        }
-    }
-    roundBits = zSig0 & roundMask;
-    if ( 0x7FFD <= (bits32) ( zExp - 1 ) ) {
-        if (    ( 0x7FFE < zExp )
-             || ( ( zExp == 0x7FFE ) && ( zSig0 + roundIncrement < zSig0 ) )
-           ) {
-            goto overflow;
-        }
-        if ( zExp <= 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < 0 )
-                || ( zSig0 <= zSig0 + roundIncrement );
-            shift64RightJamming( zSig0, 1 - zExp, &zSig0 );
-            zExp = 0;
-            roundBits = zSig0 & roundMask;
-            if ( isTiny && roundBits ) float_raise( float_flag_underflow );
-            if ( roundBits ) float_exception_flags |= float_flag_inexact;
-            zSig0 += roundIncrement;
-            if ( (sbits64) zSig0 < 0 ) zExp = 1;
-            roundIncrement = roundMask + 1;
-            if ( roundNearestEven && ( roundBits<<1 == roundIncrement ) ) {
-                roundMask |= roundIncrement;
-            }
-            zSig0 &= ~ roundMask;
-            return packFloatx80( zSign, zExp, zSig0 );
-        }
-    }
-    if ( roundBits ) float_exception_flags |= float_flag_inexact;
-    zSig0 += roundIncrement;
-    if ( zSig0 < roundIncrement ) {
-        ++zExp;
-        zSig0 = LIT64( 0x8000000000000000 );
-    }
-    roundIncrement = roundMask + 1;
-    if ( roundNearestEven && ( roundBits<<1 == roundIncrement ) ) {
-        roundMask |= roundIncrement;
-    }
-    zSig0 &= ~ roundMask;
-    if ( zSig0 == 0 ) zExp = 0;
-    return packFloatx80( zSign, zExp, zSig0 );
- precision80:
-    increment = ( (sbits64) zSig1 < 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            increment = 0;
-        }
-        else {
-            if ( zSign ) {
-                increment = ( roundingMode == float_round_down ) && zSig1;
-            }
-            else {
-                increment = ( roundingMode == float_round_up ) && zSig1;
-            }
-        }
-    }
-    if ( 0x7FFD <= (bits32) ( zExp - 1 ) ) {
-        if (    ( 0x7FFE < zExp )
-             || (    ( zExp == 0x7FFE )
-                  && ( zSig0 == LIT64( 0xFFFFFFFFFFFFFFFF ) )
-                  && increment
-                )
-           ) {
-            roundMask = 0;
- overflow:
-            float_raise( float_flag_overflow | float_flag_inexact );
-            if (    ( roundingMode == float_round_to_zero )
-                 || ( zSign && ( roundingMode == float_round_up ) )
-                 || ( ! zSign && ( roundingMode == float_round_down ) )
-               ) {
-                return packFloatx80( zSign, 0x7FFE, ~ roundMask );
-            }
-            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-        }
-        if ( zExp <= 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < 0 )
-                || ! increment
-                || ( zSig0 < LIT64( 0xFFFFFFFFFFFFFFFF ) );
-            shift64ExtraRightJamming( zSig0, zSig1, 1 - zExp, &zSig0, &zSig1 );
-            zExp = 0;
-            if ( isTiny && zSig1 ) float_raise( float_flag_underflow );
-            if ( zSig1 ) float_exception_flags |= float_flag_inexact;
-            if ( roundNearestEven ) {
-                increment = ( (sbits64) zSig1 < 0 );
-            }
-            else {
-                if ( zSign ) {
-                    increment = ( roundingMode == float_round_down ) && zSig1;
-                }
-                else {
-                    increment = ( roundingMode == float_round_up ) && zSig1;
-                }
-            }
-            if ( increment ) {
-                ++zSig0;
-                zSig0 &=
-                    ~ ( ( (bits64) ( zSig1<<1 ) == 0 ) & roundNearestEven );
-                if ( (sbits64) zSig0 < 0 ) zExp = 1;
-            }
-            return packFloatx80( zSign, zExp, zSig0 );
-        }
-    }
-    if ( zSig1 ) float_exception_flags |= float_flag_inexact;
-    if ( increment ) {
-        ++zSig0;
-        if ( zSig0 == 0 ) {
-            ++zExp;
-            zSig0 = LIT64( 0x8000000000000000 );
-        }
-        else {
-            zSig0 &= ~ ( ( (bits64) ( zSig1<<1 ) == 0 ) & roundNearestEven );
-        }
-    }
-    else {
-        if ( zSig0 == 0 ) zExp = 0;
-    }
-    return packFloatx80( zSign, zExp, zSig0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent
-`zExp', and significand formed by the concatenation of `zSig0' and `zSig1',
-and returns the proper extended double-precision floating-point value
-corresponding to the abstract input.  This routine is just like
-`roundAndPackFloatx80' except that the input significand does not have to be
-normalized.
--------------------------------------------------------------------------------
-*/
-static floatx80
- normalizeRoundAndPackFloatx80(
-     int8 roundingPrecision, flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1
- )
-{
-    int8 shiftCount;
-
-    if ( zSig0 == 0 ) {
-        zSig0 = zSig1;
-        zSig1 = 0;
-        zExp -= 64;
-    }
-    shiftCount = countLeadingZeros64( zSig0 );
-    shortShift128Left( zSig0, zSig1, shiftCount, &zSig0, &zSig1 );
-    zExp -= shiftCount;
-    return
-        roundAndPackFloatx80( roundingPrecision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the least-significant 64 fraction bits of the quadruple-precision
-floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloat128Frac1( float128 a )
-{
-
-    return a.low;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the most-significant 48 fraction bits of the quadruple-precision
-floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE bits64 extractFloat128Frac0( float128 a )
-{
-
-    return a.high & LIT64( 0x0000FFFFFFFFFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the exponent bits of the quadruple-precision floating-point value
-`a'.
--------------------------------------------------------------------------------
-*/
-INLINE int32 extractFloat128Exp( float128 a )
-{
-
-    return ( a.high>>48 ) & 0x7FFF;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the sign bit of the quadruple-precision floating-point value `a'.
--------------------------------------------------------------------------------
-*/
-INLINE flag extractFloat128Sign( float128 a )
-{
-
-    return a.high>>63;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Normalizes the subnormal quadruple-precision floating-point value
-represented by the denormalized significand formed by the concatenation of
-`aSig0' and `aSig1'.  The normalized exponent is stored at the location
-pointed to by `zExpPtr'.  The most significant 49 bits of the normalized
-significand are stored at the location pointed to by `zSig0Ptr', and the
-least significant 64 bits of the normalized significand are stored at the
-location pointed to by `zSig1Ptr'.
--------------------------------------------------------------------------------
-*/
-static void
- normalizeFloat128Subnormal(
-     bits64 aSig0,
-     bits64 aSig1,
-     int32 *zExpPtr,
-     bits64 *zSig0Ptr,
-     bits64 *zSig1Ptr
- )
-{
-    int8 shiftCount;
-
-    if ( aSig0 == 0 ) {
-        shiftCount = countLeadingZeros64( aSig1 ) - 15;
-        if ( shiftCount < 0 ) {
-            *zSig0Ptr = aSig1>>( - shiftCount );
-            *zSig1Ptr = aSig1<<( shiftCount & 63 );
-        }
-        else {
-            *zSig0Ptr = aSig1<<shiftCount;
-            *zSig1Ptr = 0;
-        }
-        *zExpPtr = - shiftCount - 63;
-    }
-    else {
-        shiftCount = countLeadingZeros64( aSig0 ) - 15;
-        shortShift128Left( aSig0, aSig1, shiftCount, zSig0Ptr, zSig1Ptr );
-        *zExpPtr = 1 - shiftCount;
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Packs the sign `zSign', the exponent `zExp', and the significand formed
-by the concatenation of `zSig0' and `zSig1' into a quadruple-precision
-floating-point value, returning the result.  After being shifted into the
-proper positions, the three fields `zSign', `zExp', and `zSig0' are simply
-added together to form the most significant 32 bits of the result.  This
-means that any integer portion of `zSig0' will be added into the exponent.
-Since a properly normalized significand will have an integer portion equal
-to 1, the `zExp' input should be 1 less than the desired result exponent
-whenever `zSig0' and `zSig1' concatenated form a complete, normalized
-significand.
--------------------------------------------------------------------------------
-*/
-INLINE float128
- packFloat128( flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1 )
-{
-    float128 z;
-
-    z.low = zSig1;
-    z.high = ( ( (bits64) zSign )<<63 ) + ( ( (bits64) zExp )<<48 ) + zSig0;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and extended significand formed by the concatenation of `zSig0', `zSig1',
-and `zSig2', and returns the proper quadruple-precision floating-point value
-corresponding to the abstract input.  Ordinarily, the abstract value is
-simply rounded and packed into the quadruple-precision format, with the
-inexact exception raised if the abstract input cannot be represented
-exactly.  However, if the abstract value is too large, the overflow and
-inexact exceptions are raised and an infinity or maximal finite value is
-returned.  If the abstract value is too small, the input value is rounded to
-a subnormal number, and the underflow and inexact exceptions are raised if
-the abstract input cannot be represented exactly as a subnormal quadruple-
-precision floating-point number.
-    The input significand must be normalized or smaller.  If the input
-significand is not normalized, `zExp' must be 0; in that case, the result
-returned is a subnormal number, and it must not require rounding.  In the
-usual case that the input significand is normalized, `zExp' must be 1 less
-than the ``true'' floating-point exponent.  The handling of underflow and
-overflow follows the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float128
- roundAndPackFloat128(
-     flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1, bits64 zSig2 )
-{
-    int8 roundingMode;
-    flag roundNearestEven, increment, isTiny;
-
-    roundingMode = float_rounding_mode;
-    roundNearestEven = ( roundingMode == float_round_nearest_even );
-    increment = ( (sbits64) zSig2 < 0 );
-    if ( ! roundNearestEven ) {
-        if ( roundingMode == float_round_to_zero ) {
-            increment = 0;
-        }
-        else {
-            if ( zSign ) {
-                increment = ( roundingMode == float_round_down ) && zSig2;
-            }
-            else {
-                increment = ( roundingMode == float_round_up ) && zSig2;
-            }
-        }
-    }
-    if ( 0x7FFD <= (bits32) zExp ) {
-        if (    ( 0x7FFD < zExp )
-             || (    ( zExp == 0x7FFD )
-                  && eq128(
-                         LIT64( 0x0001FFFFFFFFFFFF ),
-                         LIT64( 0xFFFFFFFFFFFFFFFF ),
-                         zSig0,
-                         zSig1
-                     )
-                  && increment
-                )
-           ) {
-            float_raise( float_flag_overflow | float_flag_inexact );
-            if (    ( roundingMode == float_round_to_zero )
-                 || ( zSign && ( roundingMode == float_round_up ) )
-                 || ( ! zSign && ( roundingMode == float_round_down ) )
-               ) {
-                return
-                    packFloat128(
-                        zSign,
-                        0x7FFE,
-                        LIT64( 0x0000FFFFFFFFFFFF ),
-                        LIT64( 0xFFFFFFFFFFFFFFFF )
-                    );
-            }
-            return packFloat128( zSign, 0x7FFF, 0, 0 );
-        }
-        if ( zExp < 0 ) {
-            isTiny =
-                   ( float_detect_tininess == float_tininess_before_rounding )
-                || ( zExp < -1 )
-                || ! increment
-                || lt128(
-                       zSig0,
-                       zSig1,
-                       LIT64( 0x0001FFFFFFFFFFFF ),
-                       LIT64( 0xFFFFFFFFFFFFFFFF )
-                   );
-            shift128ExtraRightJamming(
-                zSig0, zSig1, zSig2, - zExp, &zSig0, &zSig1, &zSig2 );
-            zExp = 0;
-            if ( isTiny && zSig2 ) float_raise( float_flag_underflow );
-            if ( roundNearestEven ) {
-                increment = ( (sbits64) zSig2 < 0 );
-            }
-            else {
-                if ( zSign ) {
-                    increment = ( roundingMode == float_round_down ) && zSig2;
-                }
-                else {
-                    increment = ( roundingMode == float_round_up ) && zSig2;
-                }
-            }
-        }
-    }
-    if ( zSig2 ) float_exception_flags |= float_flag_inexact;
-    if ( increment ) {
-        add128( zSig0, zSig1, 0, 1, &zSig0, &zSig1 );
-        zSig1 &= ~ ( ( zSig2 + zSig2 == 0 ) & roundNearestEven );
-    }
-    else {
-        if ( ( zSig0 | zSig1 ) == 0 ) zExp = 0;
-    }
-    return packFloat128( zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes an abstract floating-point value having sign `zSign', exponent `zExp',
-and significand formed by the concatenation of `zSig0' and `zSig1', and
-returns the proper quadruple-precision floating-point value corresponding
-to the abstract input.  This routine is just like `roundAndPackFloat128'
-except that the input significand has fewer bits and does not have to be
-normalized.  In all cases, `zExp' must be 1 less than the ``true'' floating-
-point exponent.
--------------------------------------------------------------------------------
-*/
-static float128
- normalizeRoundAndPackFloat128(
-     flag zSign, int32 zExp, bits64 zSig0, bits64 zSig1 )
-{
-    int8 shiftCount;
-    bits64 zSig2;
-
-    if ( zSig0 == 0 ) {
-        zSig0 = zSig1;
-        zSig1 = 0;
-        zExp -= 64;
-    }
-    shiftCount = countLeadingZeros64( zSig0 ) - 15;
-    if ( 0 <= shiftCount ) {
-        zSig2 = 0;
-        shortShift128Left( zSig0, zSig1, shiftCount, &zSig0, &zSig1 );
-    }
-    else {
-        shift128ExtraRightJamming(
-            zSig0, zSig1, 0, - shiftCount, &zSig0, &zSig1, &zSig2 );
-    }
-    zExp -= shiftCount;
-    return roundAndPackFloat128( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a'
-to the single-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( int32 a )
-{
-    flag zSign;
-
-    if ( a == 0 ) return 0;
-    if ( a == (sbits32) 0x80000000 ) return packFloat32( 1, 0x9E, 0 );
-    zSign = ( a < 0 );
-    return normalizeRoundAndPackFloat32( zSign, 0x9C, zSign ? - a : a );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* __floatunsisf is in libgcc */
-float32 uint32_to_float32( uint32 a )
-{
-    if ( a == 0 ) return 0;
-    if ( a & (bits32) 0x80000000 )
-	return normalizeRoundAndPackFloat32( 0, 0x9D, a >> 1 );
-    return normalizeRoundAndPackFloat32( 0, 0x9C, a );
-}
-#endif
-
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a'
-to the double-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 int32_to_float64( int32 a )
-{
-    flag zSign;
-    uint32 absA;
-    int8 shiftCount;
-    bits64 zSig;
-
-    if ( a == 0 ) return 0;
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) + 21;
-    zSig = absA;
-    return packFloat64( zSign, 0x432 - shiftCount, zSig<<shiftCount );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* __floatunsidf is in libgcc */
-float64 uint32_to_float64( uint32 a )
-{
-    int8 shiftCount;
-    bits64 zSig = a;
-
-    if ( a == 0 ) return 0;
-    shiftCount = countLeadingZeros32( a ) + 21;
-    return packFloat64( 0, 0x432 - shiftCount, zSig<<shiftCount );
-
-}
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a'
-to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 int32_to_floatx80( int32 a )
-{
-    flag zSign;
-    uint32 absA;
-    int8 shiftCount;
-    bits64 zSig;
-
-    if ( a == 0 ) return packFloatx80( 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) + 32;
-    zSig = absA;
-    return packFloatx80( zSign, 0x403E - shiftCount, zSig<<shiftCount );
-
-}
-
-floatx80 uint32_to_floatx80( uint32 a )
-{
-    int8 shiftCount;
-    bits64 zSig = a;
-
-    if ( a == 0 ) return packFloatx80( 0, 0, 0 );
-    shiftCount = countLeadingZeros32( a ) + 32;
-    return packFloatx80( 0, 0x403E - shiftCount, zSig<<shiftCount );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 32-bit two's complement integer `a' to
-the quadruple-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 int32_to_float128( int32 a )
-{
-    flag zSign;
-    uint32 absA;
-    int8 shiftCount;
-    bits64 zSig0;
-
-    if ( a == 0 ) return packFloat128( 0, 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros32( absA ) + 17;
-    zSig0 = absA;
-    return packFloat128( zSign, 0x402E - shiftCount, zSig0<<shiftCount, 0 );
-
-}
-
-float128 uint32_to_float128( uint32 a )
-{
-    int8 shiftCount;
-    bits64 zSig0 = a;
-
-    if ( a == 0 ) return packFloat128( 0, 0, 0, 0 );
-    shiftCount = countLeadingZeros32( a ) + 17;
-    return packFloat128( 0, 0x402E - shiftCount, zSig0<<shiftCount, 0 );
-
-}
-
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC /* __floatdi?f is in libgcc2.c */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 64-bit two's complement integer `a'
-to the single-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 int64_to_float32( int64 a )
-{
-    flag zSign;
-    uint64 absA;
-    int8 shiftCount;
-
-    if ( a == 0 ) return 0;
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros64( absA ) - 40;
-    if ( 0 <= shiftCount ) {
-        return packFloat32( zSign, 0x95 - shiftCount, absA<<shiftCount );
-    }
-    else {
-        shiftCount += 7;
-        if ( shiftCount < 0 ) {
-            shift64RightJamming( absA, - shiftCount, &absA );
-        }
-        else {
-            absA <<= shiftCount;
-        }
-        return roundAndPackFloat32( zSign, 0x9C - shiftCount, absA );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 64-bit two's complement integer `a'
-to the double-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 int64_to_float64( int64 a )
-{
-    flag zSign;
-
-    if ( a == 0 ) return 0;
-    if ( a == (sbits64) LIT64( 0x8000000000000000 ) ) {
-        return packFloat64( 1, 0x43E, 0 );
-    }
-    zSign = ( a < 0 );
-    return normalizeRoundAndPackFloat64( zSign, 0x43C, zSign ? - a : a );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 64-bit two's complement integer `a'
-to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 int64_to_floatx80( int64 a )
-{
-    flag zSign;
-    uint64 absA;
-    int8 shiftCount;
-
-    if ( a == 0 ) return packFloatx80( 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros64( absA );
-    return packFloatx80( zSign, 0x403E - shiftCount, absA<<shiftCount );
-
-}
-
-#endif
-
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the 64-bit two's complement integer `a' to
-the quadruple-precision floating-point format.  The conversion is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 int64_to_float128( int64 a )
-{
-    flag zSign;
-    uint64 absA;
-    int8 shiftCount;
-    int32 zExp;
-    bits64 zSig0, zSig1;
-
-    if ( a == 0 ) return packFloat128( 0, 0, 0, 0 );
-    zSign = ( a < 0 );
-    absA = zSign ? - a : a;
-    shiftCount = countLeadingZeros64( absA ) + 49;
-    zExp = 0x406E - shiftCount;
-    if ( 64 <= shiftCount ) {
-        zSig1 = 0;
-        zSig0 = absA;
-        shiftCount -= 64;
-    }
-    else {
-        zSig1 = absA;
-        zSig0 = 0;
-    }
-    shortShift128Left( zSig0, zSig1, shiftCount, &zSig0, &zSig1 );
-    return packFloat128( zSign, zExp, zSig0, zSig1 );
-
-}
-
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    bits64 aSig64;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( ( aExp == 0xFF ) && aSig ) aSign = 0;
-    if ( aExp ) aSig |= 0x00800000;
-    shiftCount = 0xAF - aExp;
-    aSig64 = aSig;
-    aSig64 <<= 32;
-    if ( 0 < shiftCount ) shift64RightJamming( aSig64, shiftCount, &aSig64 );
-    return roundAndPackInt32( aSign, aSig64 );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float32_to_int32_round_to_zero( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    int32 z;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0x9E;
-    if ( 0 <= shiftCount ) {
-        if ( a != 0xCF000000 ) {
-            float_raise( float_flag_invalid );
-            if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) return 0x7FFFFFFF;
-        }
-        return (sbits32) 0x80000000;
-    }
-    else if ( aExp <= 0x7E ) {
-        if ( aExp | aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig = ( aSig | 0x00800000 )<<8;
-    z = aSig>>( - shiftCount );
-    if ( (bits32) ( aSig<<( shiftCount & 31 ) ) ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* __fix?fdi provided by libgcc2.c */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 64-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 float32_to_int64( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    bits64 aSig64, aSigExtra;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = 0xBE - aExp;
-    if ( shiftCount < 0 ) {
-        float_raise( float_flag_invalid );
-        if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) {
-            return LIT64( 0x7FFFFFFFFFFFFFFF );
-        }
-        return (sbits64) LIT64( 0x8000000000000000 );
-    }
-    if ( aExp ) aSig |= 0x00800000;
-    aSig64 = aSig;
-    aSig64 <<= 40;
-    shift64ExtraRightJamming( aSig64, 0, shiftCount, &aSig64, &aSigExtra );
-    return roundAndPackInt64( aSign, aSig64, aSigExtra );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 64-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  Otherwise, if the
-conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int64 float32_to_int64_round_to_zero( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    bits64 aSig64;
-    int64 z;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0xBE;
-    if ( 0 <= shiftCount ) {
-        if ( a != 0xDF000000 ) {
-            float_raise( float_flag_invalid );
-            if ( ! aSign || ( ( aExp == 0xFF ) && aSig ) ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-        }
-        return (sbits64) LIT64( 0x8000000000000000 );
-    }
-    else if ( aExp <= 0x7E ) {
-        if ( aExp | aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig64 = aSig | 0x00800000;
-    aSig64 <<= 40;
-    z = aSig64>>( - shiftCount );
-    if ( (bits64) ( aSig64<<( shiftCount & 63 ) ) ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the double-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float32_to_float64( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloat64( float32ToCommonNaN( a ) );
-        return packFloat64( aSign, 0x7FF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( aSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-        --aExp;
-    }
-    return packFloat64( aSign, aExp + 0x380, ( (bits64) aSig )<<29 );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 float32_to_floatx80( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloatx80( float32ToCommonNaN( a ) );
-        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    aSig |= 0x00800000;
-    return packFloatx80( aSign, aExp + 0x3F80, ( (bits64) aSig )<<40 );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the double-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float32_to_float128( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 aSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return commonNaNToFloat128( float32ToCommonNaN( a ) );
-        return packFloat128( aSign, 0x7FFF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat128( aSign, 0, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-        --aExp;
-    }
-    return packFloat128( aSign, aExp + 0x3F80, ( (bits64) aSig )<<25, 0 );
-
-}
-
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Rounds the single-precision floating-point value `a' to an integer, and
-returns the result as a single-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits32 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float32 z;
-
-    aExp = extractFloat32Exp( a );
-    if ( 0x96 <= aExp ) {
-        if ( ( aExp == 0xFF ) && extractFloat32Frac( a ) ) {
-            return propagateFloat32NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp <= 0x7E ) {
-        if ( (bits32) ( a<<1 ) == 0 ) return a;
-        float_exception_flags |= float_flag_inexact;
-        aSign = extractFloat32Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x7E ) && extractFloat32Frac( a ) ) {
-                return packFloat32( aSign, 0x7F, 0 );
-            }
-            break;
-	 case float_round_to_zero:
-	    break;
-         case float_round_down:
-            return aSign ? 0xBF800000 : 0;
-         case float_round_up:
-            return aSign ? 0x80000000 : 0x3F800000;
-        }
-        return packFloat32( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x96 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z += lastBitMask>>1;
-        if ( ( z & roundBitsMask ) == 0 ) z &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloat32Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~ roundBitsMask;
-    if ( z != a ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the single-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 addFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 6;
-    bSig <<= 6;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0xFF ) {
-            if ( aSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig |= 0x20000000;
-        }
-        shift32RightJamming( bSig, expDiff, &bSig );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig |= 0x20000000;
-        }
-        shift32RightJamming( aSig, - expDiff, &aSig );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0xFF ) {
-            if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-            return a;
-        }
-        if ( aExp == 0 ) return packFloat32( zSign, 0, ( aSig + bSig )>>6 );
-        zSig = 0x40000000 + aSig + bSig;
-        zExp = aExp;
-        goto roundAndPack;
-    }
-    aSig |= 0x20000000;
-    zSig = ( aSig + bSig )<<1;
-    --zExp;
-    if ( (sbits32) zSig < 0 ) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
- roundAndPack:
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the single-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float32 subFloat32Sigs( float32 a, float32 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 7;
-    bSig <<= 7;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0xFF ) {
-        if ( aSig | bSig ) return propagateFloat32NaN( a, b );
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloat32( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign ^ 1, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig |= 0x40000000;
-    }
-    shift32RightJamming( aSig, - expDiff, &aSig );
-    bSig |= 0x40000000;
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig |= 0x40000000;
-    }
-    shift32RightJamming( bSig, expDiff, &bSig );
-    aSig |= 0x40000000;
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the single-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_add( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sub( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat32Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat32Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the single-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_mul( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig;
-    bits64 zSig64;
-    bits32 zSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x7F;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    shift64RightJamming( ( (bits64) aSig ) * bSig, 32, &zSig64 );
-    zSig = zSig64;
-    if ( 0 <= (sbits32) ( zSig<<1 ) ) {
-        zSig <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the single-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_div( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits32 aSig, bSig, zSig;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, b );
-        if ( bExp == 0xFF ) {
-            if ( bSig ) return propagateFloat32NaN( a, b );
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        return packFloat32( zSign, 0xFF, 0 );
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return packFloat32( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
-                float_raise( float_flag_invalid );
-                return float32_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat32( zSign, 0xFF, 0 );
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat32( zSign, 0, 0 );
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x7D;
-    aSig = ( aSig | 0x00800000 )<<7;
-    bSig = ( bSig | 0x00800000 )<<8;
-    if ( bSig <= ( aSig + aSig ) ) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = ( ( (bits64) aSig )<<32 ) / bSig;
-    if ( ( zSig & 0x3F ) == 0 ) {
-        zSig |= ( (bits64) bSig * zSig != ( (bits64) aSig )<<32 );
-    }
-    return roundAndPackFloat32( zSign, zExp, zSig );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the single-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_rem( float32 a, float32 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits32 aSig, bSig;
-    bits32 q;
-    bits64 aSig64, bSig64, q64;
-    bits32 alternateASig;
-    sbits32 sigMean;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    bSig = extractFloat32Frac( b );
-    bExp = extractFloat32Exp( b );
-    bSign = extractFloat32Sign( b );
-    if ( aExp == 0xFF ) {
-        if ( aSig || ( ( bExp == 0xFF ) && bSig ) ) {
-            return propagateFloat32NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( bExp == 0xFF ) {
-        if ( bSig ) return propagateFloat32NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            float_raise( float_flag_invalid );
-            return float32_default_nan;
-        }
-        normalizeFloat32Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return a;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    expDiff = aExp - bExp;
-    aSig |= 0x00800000;
-    bSig |= 0x00800000;
-    if ( expDiff < 32 ) {
-        aSig <<= 8;
-        bSig <<= 8;
-        if ( expDiff < 0 ) {
-            if ( expDiff < -1 ) return a;
-            aSig >>= 1;
-        }
-        q = ( bSig <= aSig );
-        if ( q ) aSig -= bSig;
-        if ( 0 < expDiff ) {
-            q = ( ( (bits64) aSig )<<32 ) / bSig;
-            q >>= 32 - expDiff;
-            bSig >>= 2;
-            aSig = ( ( aSig>>1 )<<( expDiff - 1 ) ) - bSig * q;
-        }
-        else {
-            aSig >>= 2;
-            bSig >>= 2;
-        }
-    }
-    else {
-        if ( bSig <= aSig ) aSig -= bSig;
-        aSig64 = ( (bits64) aSig )<<40;
-        bSig64 = ( (bits64) bSig )<<40;
-        expDiff -= 64;
-        while ( 0 < expDiff ) {
-            q64 = estimateDiv128To64( aSig64, 0, bSig64 );
-            q64 = ( 2 < q64 ) ? q64 - 2 : 0;
-            aSig64 = - ( ( bSig * q64 )<<38 );
-            expDiff -= 62;
-        }
-        expDiff += 64;
-        q64 = estimateDiv128To64( aSig64, 0, bSig64 );
-        q64 = ( 2 < q64 ) ? q64 - 2 : 0;
-        q = q64>>( 64 - expDiff );
-        bSig <<= 6;
-        aSig = ( ( aSig64>>33 )<<( expDiff - 1 ) ) - bSig * q;
-    }
-    do {
-        alternateASig = aSig;
-        ++q;
-        aSig -= bSig;
-    } while ( 0 <= (sbits32) aSig );
-    sigMean = aSig + alternateASig;
-    if ( ( sigMean < 0 ) || ( ( sigMean == 0 ) && ( q & 1 ) ) ) {
-        aSig = alternateASig;
-    }
-    zSign = ( (sbits32) aSig < 0 );
-    if ( zSign ) aSig = - aSig;
-    return normalizeRoundAndPackFloat32( aSign ^ zSign, bExp, aSig );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the square root of the single-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float32_sqrt( float32 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits32 aSig, zSig;
-    bits64 rem, term;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    if ( aExp == 0xFF ) {
-        if ( aSig ) return propagateFloat32NaN( a, 0 );
-        if ( ! aSign ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig ) == 0 ) return a;
-        float_raise( float_flag_invalid );
-        return float32_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return 0;
-        normalizeFloat32Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = ( ( aExp - 0x7F )>>1 ) + 0x7E;
-    aSig = ( aSig | 0x00800000 )<<8;
-    zSig = estimateSqrt32( aExp, aSig ) + 2;
-    if ( ( zSig & 0x7F ) <= 5 ) {
-        if ( zSig < 2 ) {
-            zSig = 0x7FFFFFFF;
-            goto roundAndPack;
-        }
-        aSig >>= aExp & 1;
-        term = ( (bits64) zSig ) * zSig;
-        rem = ( ( (bits64) aSig )<<32 ) - term;
-        while ( (sbits64) rem < 0 ) {
-            --zSig;
-            rem += ( ( (bits64) zSig )<<1 ) | 1;
-        }
-        zSig |= ( rem != 0 );
-    }
-    shift32RightJamming( zSig, 1, &zSig );
- roundAndPack:
-    return roundAndPackFloat32( 0, zExp, zSig );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_eq_signaling( float32 a, float32 b )
-{
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits32) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_le_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits32) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float32_lt_quiet( float32 a, float32 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
-         || ( ( extractFloat32Exp( b ) == 0xFF ) && extractFloat32Frac( b ) )
-       ) {
-        if ( float32_is_signaling_nan( a ) || float32_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat32Sign( a );
-    bSign = extractFloat32Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits32) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
-    if ( aExp ) aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x42C - aExp;
-    if ( 0 < shiftCount ) shift64RightJamming( aSig, shiftCount, &aSig );
-    return roundAndPackInt32( aSign, aSig );
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float64_to_int32_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig, savedASig;
-    int32 z;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( 0x41E < aExp ) {
-        if ( ( aExp == 0x7FF ) && aSig ) aSign = 0;
-        goto invalid;
-    }
-    else if ( aExp < 0x3FF ) {
-        if ( aExp || aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x433 - aExp;
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = aSig;
-    if ( aSign ) z = - z;
-    if ( ( z < 0 ) ^ aSign ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( ( aSig<<shiftCount ) != savedASig ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC /* Not needed */
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 64-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 float64_to_int64( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig, aSigExtra;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp ) aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x433 - aExp;
-    if ( shiftCount <= 0 ) {
-        if ( 0x43E < aExp ) {
-            float_raise( float_flag_invalid );
-            if (    ! aSign
-                 || (    ( aExp == 0x7FF )
-                      && ( aSig != LIT64( 0x0010000000000000 ) ) )
-               ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        aSigExtra = 0;
-        aSig <<= - shiftCount;
-    }
-    else {
-        shift64ExtraRightJamming( aSig, 0, shiftCount, &aSig, &aSigExtra );
-    }
-    return roundAndPackInt64( aSign, aSig, aSigExtra );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 64-bit two's complement integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int64 float64_to_int64_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig;
-    int64 z;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp ) aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = aExp - 0x433;
-    if ( 0 <= shiftCount ) {
-        if ( 0x43E <= aExp ) {
-            if ( a != LIT64( 0xC3E0000000000000 ) ) {
-                float_raise( float_flag_invalid );
-                if (    ! aSign
-                     || (    ( aExp == 0x7FF )
-                          && ( aSig != LIT64( 0x0010000000000000 ) ) )
-                   ) {
-                    return LIT64( 0x7FFFFFFFFFFFFFFF );
-                }
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        z = aSig<<shiftCount;
-    }
-    else {
-        if ( aExp < 0x3FE ) {
-            if ( aExp | aSig ) float_exception_flags |= float_flag_inexact;
-            return 0;
-        }
-        z = aSig>>( - shiftCount );
-        if ( (bits64) ( aSig<<( shiftCount & 63 ) ) ) {
-            float_exception_flags |= float_flag_inexact;
-        }
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-#endif /* !SOFTFLOAT_FOR_GCC */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the single-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float64_to_float32( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig;
-    bits32 zSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return commonNaNToFloat32( float64ToCommonNaN( a ) );
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    shift64RightJamming( aSig, 22, &aSig );
-    zSig = aSig;
-    if ( aExp || zSig ) {
-        zSig |= 0x40000000;
-        aExp -= 0x381;
-    }
-    return roundAndPackFloat32( aSign, aExp, zSig );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the extended double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 float64_to_floatx80( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return commonNaNToFloatx80( float64ToCommonNaN( a ) );
-        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( aSign, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    return
-        packFloatx80(
-            aSign, aExp + 0x3C00, ( aSig | LIT64( 0x0010000000000000 ) )<<11 );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the quadruple-precision floating-point format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float64_to_float128( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig, zSig0, zSig1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return commonNaNToFloat128( float64ToCommonNaN( a ) );
-        return packFloat128( aSign, 0x7FFF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat128( aSign, 0, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-        --aExp;
-    }
-    shift128Right( aSig, 0, 4, &zSig0, &zSig1 );
-    return packFloat128( aSign, aExp + 0x3C00, zSig0, zSig1 );
-
-}
-
-#endif
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Rounds the double-precision floating-point value `a' to an integer, and
-returns the result as a double-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float64 z;
-
-    aExp = extractFloat64Exp( a );
-    if ( 0x433 <= aExp ) {
-        if ( ( aExp == 0x7FF ) && extractFloat64Frac( a ) ) {
-            return propagateFloat64NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp < 0x3FF ) {
-        if ( (bits64) ( a<<1 ) == 0 ) return a;
-        float_exception_flags |= float_flag_inexact;
-        aSign = extractFloat64Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x3FE ) && extractFloat64Frac( a ) ) {
-                return packFloat64( aSign, 0x3FF, 0 );
-            }
-            break;
-	 case float_round_to_zero:
-	    break;
-         case float_round_down:
-            return aSign ? LIT64( 0xBFF0000000000000 ) : 0;
-         case float_round_up:
-            return
-            aSign ? LIT64( 0x8000000000000000 ) : LIT64( 0x3FF0000000000000 );
-        }
-        return packFloat64( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x433 - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z += lastBitMask>>1;
-        if ( ( z & roundBitsMask ) == 0 ) z &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloat64Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z += roundBitsMask;
-        }
-    }
-    z &= ~ roundBitsMask;
-    if ( z != a ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the double-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 addFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 9;
-    bSig <<= 9;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FF ) {
-            if ( aSig ) return propagateFloat64NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig |= LIT64( 0x2000000000000000 );
-        }
-        shift64RightJamming( bSig, expDiff, &bSig );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FF ) {
-            if ( bSig ) return propagateFloat64NaN( a, b );
-            return packFloat64( zSign, 0x7FF, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig |= LIT64( 0x2000000000000000 );
-        }
-        shift64RightJamming( aSig, - expDiff, &aSig );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FF ) {
-            if ( aSig | bSig ) return propagateFloat64NaN( a, b );
-            return a;
-        }
-        if ( aExp == 0 ) return packFloat64( zSign, 0, ( aSig + bSig )>>9 );
-        zSig = LIT64( 0x4000000000000000 ) + aSig + bSig;
-        zExp = aExp;
-        goto roundAndPack;
-    }
-    aSig |= LIT64( 0x2000000000000000 );
-    zSig = ( aSig + bSig )<<1;
-    --zExp;
-    if ( (sbits64) zSig < 0 ) {
-        zSig = aSig + bSig;
-        ++zExp;
-    }
- roundAndPack:
-    return roundAndPackFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the double-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float64 subFloat64Sigs( float64 a, float64 b, flag zSign )
-{
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig;
-    int16 expDiff;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    expDiff = aExp - bExp;
-    aSig <<= 10;
-    bSig <<= 10;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FF ) {
-        if ( aSig | bSig ) return propagateFloat64NaN( a, b );
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloat64( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign ^ 1, 0x7FF, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig |= LIT64( 0x4000000000000000 );
-    }
-    shift64RightJamming( aSig, - expDiff, &aSig );
-    bSig |= LIT64( 0x4000000000000000 );
- bBigger:
-    zSig = bSig - aSig;
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig |= LIT64( 0x4000000000000000 );
-    }
-    shift64RightJamming( bSig, expDiff, &bSig );
-    aSig |= LIT64( 0x4000000000000000 );
- aBigger:
-    zSig = aSig - bSig;
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat64( zSign, zExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the double-precision floating-point values `a'
-and `b'.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_add( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sub( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat64Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat64Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the double-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_mul( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if ( aSig || ( ( bExp == 0x7FF ) && bSig ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( zSign, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloat64( zSign, 0, 0 );
-        normalizeFloat64Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x3FF;
-    aSig = ( aSig | LIT64( 0x0010000000000000 ) )<<10;
-    bSig = ( bSig | LIT64( 0x0010000000000000 ) )<<11;
-    mul64To128( aSig, bSig, &zSig0, &zSig1 );
-    zSig0 |= ( zSig1 != 0 );
-    if ( 0 <= (sbits64) ( zSig0<<1 ) ) {
-        zSig0 <<= 1;
-        --zExp;
-    }
-    return roundAndPackFloat64( zSign, zExp, zSig0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the double-precision floating-point value `a'
-by the corresponding value `b'.  The operation is performed according to
-the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_div( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig;
-    bits64 rem0, rem1;
-    bits64 term0, term1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return propagateFloat64NaN( a, b );
-        if ( bExp == 0x7FF ) {
-            if ( bSig ) return propagateFloat64NaN( a, b );
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        return packFloat64( zSign, 0x7FF, 0 );
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        return packFloat64( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
-                float_raise( float_flag_invalid );
-                return float64_default_nan;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat64( zSign, 0x7FF, 0 );
-        }
-        normalizeFloat64Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloat64( zSign, 0, 0 );
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x3FD;
-    aSig = ( aSig | LIT64( 0x0010000000000000 ) )<<10;
-    bSig = ( bSig | LIT64( 0x0010000000000000 ) )<<11;
-    if ( bSig <= ( aSig + aSig ) ) {
-        aSig >>= 1;
-        ++zExp;
-    }
-    zSig = estimateDiv128To64( aSig, 0, bSig );
-    if ( ( zSig & 0x1FF ) <= 2 ) {
-        mul64To128( bSig, zSig, &term0, &term1 );
-        sub128( aSig, 0, term0, term1, &rem0, &rem1 );
-        while ( (sbits64) rem0 < 0 ) {
-            --zSig;
-            add128( rem0, rem1, 0, bSig, &rem0, &rem1 );
-        }
-        zSig |= ( rem1 != 0 );
-    }
-    return roundAndPackFloat64( zSign, zExp, zSig );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the double-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_rem( float64 a, float64 b )
-{
-    flag aSign, bSign, zSign;
-    int16 aExp, bExp, expDiff;
-    bits64 aSig, bSig;
-    bits64 q, alternateASig;
-    sbits64 sigMean;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    bSig = extractFloat64Frac( b );
-    bExp = extractFloat64Exp( b );
-    bSign = extractFloat64Sign( b );
-    if ( aExp == 0x7FF ) {
-        if ( aSig || ( ( bExp == 0x7FF ) && bSig ) ) {
-            return propagateFloat64NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( bExp == 0x7FF ) {
-        if ( bSig ) return propagateFloat64NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            float_raise( float_flag_invalid );
-            return float64_default_nan;
-        }
-        normalizeFloat64Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return a;
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    expDiff = aExp - bExp;
-    aSig = ( aSig | LIT64( 0x0010000000000000 ) )<<11;
-    bSig = ( bSig | LIT64( 0x0010000000000000 ) )<<11;
-    if ( expDiff < 0 ) {
-        if ( expDiff < -1 ) return a;
-        aSig >>= 1;
-    }
-    q = ( bSig <= aSig );
-    if ( q ) aSig -= bSig;
-    expDiff -= 64;
-    while ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        aSig = - ( ( bSig>>2 ) * q );
-        expDiff -= 62;
-    }
-    expDiff += 64;
-    if ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig, 0, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        q >>= 64 - expDiff;
-        bSig >>= 2;
-        aSig = ( ( aSig>>1 )<<( expDiff - 1 ) ) - bSig * q;
-    }
-    else {
-        aSig >>= 2;
-        bSig >>= 2;
-    }
-    do {
-        alternateASig = aSig;
-        ++q;
-        aSig -= bSig;
-    } while ( 0 <= (sbits64) aSig );
-    sigMean = aSig + alternateASig;
-    if ( ( sigMean < 0 ) || ( ( sigMean == 0 ) && ( q & 1 ) ) ) {
-        aSig = alternateASig;
-    }
-    zSign = ( (sbits64) aSig < 0 );
-    if ( zSign ) aSig = - aSig;
-    return normalizeRoundAndPackFloat64( aSign ^ zSign, bExp, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the square root of the double-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float64_sqrt( float64 a )
-{
-    flag aSign;
-    int16 aExp, zExp;
-    bits64 aSig, zSig, doubleZSig;
-    bits64 rem0, rem1, term0, term1;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-    if ( aExp == 0x7FF ) {
-        if ( aSig ) return propagateFloat64NaN( a, a );
-        if ( ! aSign ) return a;
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig ) == 0 ) return a;
-        float_raise( float_flag_invalid );
-        return float64_default_nan;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return 0;
-        normalizeFloat64Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = ( ( aExp - 0x3FF )>>1 ) + 0x3FE;
-    aSig |= LIT64( 0x0010000000000000 );
-    zSig = estimateSqrt32( aExp, aSig>>21 );
-    aSig <<= 9 - ( aExp & 1 );
-    zSig = estimateDiv128To64( aSig, 0, zSig<<32 ) + ( zSig<<30 );
-    if ( ( zSig & 0x1FF ) <= 5 ) {
-        doubleZSig = zSig<<1;
-        mul64To128( zSig, zSig, &term0, &term1 );
-        sub128( aSig, 0, term0, term1, &rem0, &rem1 );
-        while ( (sbits64) rem0 < 0 ) {
-            --zSig;
-            doubleZSig -= 2;
-            add128( rem0, rem1, zSig>>63, doubleZSig | 1, &rem0, &rem1 );
-        }
-        zSig |= ( ( rem0 | rem1 ) != 0 );
-    }
-    return roundAndPackFloat64( 0, zExp, zSig );
-
-}
-#endif
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to the
-corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq( float64 a, float64 b )
-{
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return ( a == b ) ||
-	( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  The comparison is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign )
-	return aSign ||
-	    ( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) ==
-	      0 );
-    return ( a == b ) ||
-	( aSign ^ ( FLOAT64_DEMANGLE(a) < FLOAT64_DEMANGLE(b) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign )
-	return aSign &&
-	    ( (bits64) ( ( FLOAT64_DEMANGLE(a) | FLOAT64_DEMANGLE(b) )<<1 ) !=
-	      0 );
-    return ( a != b ) &&
-	( aSign ^ ( FLOAT64_DEMANGLE(a) < FLOAT64_DEMANGLE(b) ) );
-
-}
-
-#ifndef SOFTFLOAT_FOR_GCC
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is equal to the
-corresponding value `b', and 0 otherwise.  The invalid exception is raised
-if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_eq_signaling( float64 a, float64 b )
-{
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return ( a == b ) || ( (bits64) ( ( a | b )<<1 ) == 0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than or
-equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_le_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign || ( (bits64) ( ( a | b )<<1 ) == 0 );
-    return ( a == b ) || ( aSign ^ ( a < b ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float64_lt_quiet( float64 a, float64 b )
-{
-    flag aSign, bSign;
-
-    if (    ( ( extractFloat64Exp( a ) == 0x7FF ) && extractFloat64Frac( a ) )
-         || ( ( extractFloat64Exp( b ) == 0x7FF ) && extractFloat64Frac( b ) )
-       ) {
-        if ( float64_is_signaling_nan( a ) || float64_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat64Sign( a );
-    bSign = extractFloat64Sign( b );
-    if ( aSign != bSign ) return aSign && ( (bits64) ( ( a | b )<<1 ) != 0 );
-    return ( a != b ) && ( aSign ^ ( a < b ) );
-
-}
-#endif
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 32-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic---which means in particular that the conversion
-is rounded according to the current rounding mode.  If `a' is a NaN, the
-largest positive integer is returned.  Otherwise, if the conversion
-overflows, the largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 floatx80_to_int32( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( ( aExp == 0x7FFF ) && (bits64) ( aSig<<1 ) ) aSign = 0;
-    shiftCount = 0x4037 - aExp;
-    if ( shiftCount <= 0 ) shiftCount = 1;
-    shift64RightJamming( aSig, shiftCount, &aSig );
-    return roundAndPackInt32( aSign, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 32-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic, except that the conversion is always rounded
-toward zero.  If `a' is a NaN, the largest positive integer is returned.
-Otherwise, if the conversion overflows, the largest integer with the same
-sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 floatx80_to_int32_round_to_zero( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig, savedASig;
-    int32 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( 0x401E < aExp ) {
-        if ( ( aExp == 0x7FFF ) && (bits64) ( aSig<<1 ) ) aSign = 0;
-        goto invalid;
-    }
-    else if ( aExp < 0x3FFF ) {
-        if ( aExp || aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    shiftCount = 0x403E - aExp;
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = aSig;
-    if ( aSign ) z = - z;
-    if ( ( z < 0 ) ^ aSign ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( ( aSig<<shiftCount ) != savedASig ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 64-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic---which means in particular that the conversion
-is rounded according to the current rounding mode.  If `a' is a NaN,
-the largest positive integer is returned.  Otherwise, if the conversion
-overflows, the largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 floatx80_to_int64( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig, aSigExtra;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    shiftCount = 0x403E - aExp;
-    if ( shiftCount <= 0 ) {
-        if ( shiftCount ) {
-            float_raise( float_flag_invalid );
-            if (    ! aSign
-                 || (    ( aExp == 0x7FFF )
-                      && ( aSig != LIT64( 0x8000000000000000 ) ) )
-               ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        aSigExtra = 0;
-    }
-    else {
-        shift64ExtraRightJamming( aSig, 0, shiftCount, &aSig, &aSigExtra );
-    }
-    return roundAndPackInt64( aSign, aSig, aSigExtra );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the 64-bit two's complement integer format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic, except that the conversion is always rounded
-toward zero.  If `a' is a NaN, the largest positive integer is returned.
-Otherwise, if the conversion overflows, the largest integer with the same
-sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 floatx80_to_int64_round_to_zero( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig;
-    int64 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    shiftCount = aExp - 0x403E;
-    if ( 0 <= shiftCount ) {
-        aSig &= LIT64( 0x7FFFFFFFFFFFFFFF );
-        if ( ( a.high != 0xC03E ) || aSig ) {
-            float_raise( float_flag_invalid );
-            if ( ! aSign || ( ( aExp == 0x7FFF ) && aSig ) ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-        }
-        return (sbits64) LIT64( 0x8000000000000000 );
-    }
-    else if ( aExp < 0x3FFF ) {
-        if ( aExp | aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    z = aSig>>( - shiftCount );
-    if ( (bits64) ( aSig<<( shiftCount & 63 ) ) ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the single-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 floatx80_to_float32( floatx80 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) {
-            return commonNaNToFloat32( floatx80ToCommonNaN( a ) );
-        }
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    shift64RightJamming( aSig, 33, &aSig );
-    if ( aExp || aSig ) aExp -= 0x3F81;
-    return roundAndPackFloat32( aSign, aExp, aSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the double-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 floatx80_to_float64( floatx80 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig, zSig;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) {
-            return commonNaNToFloat64( floatx80ToCommonNaN( a ) );
-        }
-        return packFloat64( aSign, 0x7FF, 0 );
-    }
-    shift64RightJamming( aSig, 1, &zSig );
-    if ( aExp || aSig ) aExp -= 0x3C01;
-    return roundAndPackFloat64( aSign, aExp, zSig );
-
-}
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point value `a' to the quadruple-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 floatx80_to_float128( floatx80 a )
-{
-    flag aSign;
-    int16 aExp;
-    bits64 aSig, zSig0, zSig1;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( ( aExp == 0x7FFF ) && (bits64) ( aSig<<1 ) ) {
-        return commonNaNToFloat128( floatx80ToCommonNaN( a ) );
-    }
-    shift128Right( aSig<<1, 0, 16, &zSig0, &zSig1 );
-    return packFloat128( aSign, aExp, zSig0, zSig1 );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Rounds the extended double-precision floating-point value `a' to an integer,
-and returns the result as an extended quadruple-precision floating-point
-value.  The operation is performed according to the IEC/IEEE Standard for
-Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    floatx80 z;
-
-    aExp = extractFloatx80Exp( a );
-    if ( 0x403E <= aExp ) {
-        if ( ( aExp == 0x7FFF ) && (bits64) ( extractFloatx80Frac( a )<<1 ) ) {
-            return propagateFloatx80NaN( a, a );
-        }
-        return a;
-    }
-    if ( aExp < 0x3FFF ) {
-        if (    ( aExp == 0 )
-             && ( (bits64) ( extractFloatx80Frac( a )<<1 ) == 0 ) ) {
-            return a;
-        }
-        float_exception_flags |= float_flag_inexact;
-        aSign = extractFloatx80Sign( a );
-        switch ( float_rounding_mode ) {
-         case float_round_nearest_even:
-            if ( ( aExp == 0x3FFE ) && (bits64) ( extractFloatx80Frac( a )<<1 )
-               ) {
-                return
-                    packFloatx80( aSign, 0x3FFF, LIT64( 0x8000000000000000 ) );
-            }
-            break;
-	 case float_round_to_zero:
-	    break;
-         case float_round_down:
-            return
-                  aSign ?
-                      packFloatx80( 1, 0x3FFF, LIT64( 0x8000000000000000 ) )
-                : packFloatx80( 0, 0, 0 );
-         case float_round_up:
-            return
-                  aSign ? packFloatx80( 1, 0, 0 )
-                : packFloatx80( 0, 0x3FFF, LIT64( 0x8000000000000000 ) );
-        }
-        return packFloatx80( aSign, 0, 0 );
-    }
-    lastBitMask = 1;
-    lastBitMask <<= 0x403E - aExp;
-    roundBitsMask = lastBitMask - 1;
-    z = a;
-    roundingMode = float_rounding_mode;
-    if ( roundingMode == float_round_nearest_even ) {
-        z.low += lastBitMask>>1;
-        if ( ( z.low & roundBitsMask ) == 0 ) z.low &= ~ lastBitMask;
-    }
-    else if ( roundingMode != float_round_to_zero ) {
-        if ( extractFloatx80Sign( z ) ^ ( roundingMode == float_round_up ) ) {
-            z.low += roundBitsMask;
-        }
-    }
-    z.low &= ~ roundBitsMask;
-    if ( z.low == 0 ) {
-        ++z.high;
-        z.low = LIT64( 0x8000000000000000 );
-    }
-    if ( z.low != a.low ) float_exception_flags |= float_flag_inexact;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the extended double-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the sum is
-negated before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static floatx80 addFloatx80Sigs( floatx80 a, floatx80 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    int32 expDiff;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FFF ) {
-            if ( (bits64) ( aSig<<1 ) ) return propagateFloatx80NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) --expDiff;
-        shift64ExtraRightJamming( bSig, 0, expDiff, &bSig, &zSig1 );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FFF ) {
-            if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-        }
-        if ( aExp == 0 ) ++expDiff;
-        shift64ExtraRightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FFF ) {
-            if ( (bits64) ( ( aSig | bSig )<<1 ) ) {
-                return propagateFloatx80NaN( a, b );
-            }
-            return a;
-        }
-        zSig1 = 0;
-        zSig0 = aSig + bSig;
-        if ( aExp == 0 ) {
-            normalizeFloatx80Subnormal( zSig0, &zExp, &zSig0 );
-            goto roundAndPack;
-        }
-        zExp = aExp;
-        goto shiftRight1;
-    }
-    zSig0 = aSig + bSig;
-    if ( (sbits64) zSig0 < 0 ) goto roundAndPack;
- shiftRight1:
-    shift64ExtraRightJamming( zSig0, zSig1, 1, &zSig0, &zSig1 );
-    zSig0 |= LIT64( 0x8000000000000000 );
-    ++zExp;
- roundAndPack:
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the extended
-double-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static floatx80 subFloatx80Sigs( floatx80 a, floatx80 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    int32 expDiff;
-    floatx80 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( ( aSig | bSig )<<1 ) ) {
-            return propagateFloatx80NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        z.low = floatx80_default_nan_low;
-        z.high = floatx80_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    zSig1 = 0;
-    if ( bSig < aSig ) goto aBigger;
-    if ( aSig < bSig ) goto bBigger;
-    return packFloatx80( float_rounding_mode == float_round_down, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return packFloatx80( zSign ^ 1, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) ++expDiff;
-    shift128RightJamming( aSig, 0, - expDiff, &aSig, &zSig1 );
- bBigger:
-    sub128( bSig, 0, aSig, zSig1, &zSig0, &zSig1 );
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) --expDiff;
-    shift128RightJamming( bSig, 0, expDiff, &bSig, &zSig1 );
- aBigger:
-    sub128( aSig, 0, bSig, zSig1, &zSig0, &zSig1 );
-    zExp = aExp;
- normalizeRoundAndPack:
-    return
-        normalizeRoundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the extended double-precision floating-point
-values `a' and `b'.  The operation is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_add( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign == bSign ) {
-        return addFloatx80Sigs( a, b, aSign );
-    }
-    else {
-        return subFloatx80Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the extended double-precision floating-
-point values `a' and `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_sub( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign == bSign ) {
-        return subFloatx80Sigs( a, b, aSign );
-    }
-    else {
-        return addFloatx80Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the extended double-precision floating-
-point values `a' and `b'.  The operation is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_mul( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    floatx80 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    bSign = extractFloatx80Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if (    (bits64) ( aSig<<1 )
-             || ( ( bExp == 0x7FFF ) && (bits64) ( bSig<<1 ) ) ) {
-            return propagateFloatx80NaN( a, b );
-        }
-        if ( ( bExp | bSig ) == 0 ) goto invalid;
-        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        if ( ( aExp | aSig ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = floatx80_default_nan_low;
-            z.high = floatx80_default_nan_high;
-            return z;
-        }
-        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( zSign, 0, 0 );
-        normalizeFloatx80Subnormal( aSig, &aExp, &aSig );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) return packFloatx80( zSign, 0, 0 );
-        normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
-    }
-    zExp = aExp + bExp - 0x3FFE;
-    mul64To128( aSig, bSig, &zSig0, &zSig1 );
-    if ( 0 < (sbits64) zSig0 ) {
-        shortShift128Left( zSig0, zSig1, 1, &zSig0, &zSig1 );
-        --zExp;
-    }
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the extended double-precision floating-point
-value `a' by the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_div( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig, bSig, zSig0, zSig1;
-    bits64 rem0, rem1, rem2, term0, term1, term2;
-    floatx80 z;
-
-    aSig = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    bSign = extractFloatx80Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        if ( bExp == 0x7FFF ) {
-            if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-            goto invalid;
-        }
-        return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return packFloatx80( zSign, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
-            if ( ( aExp | aSig ) == 0 ) {
- invalid:
-                float_raise( float_flag_invalid );
-                z.low = floatx80_default_nan_low;
-                z.high = floatx80_default_nan_high;
-                return z;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloatx80( zSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-        }
-        normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( aSig == 0 ) return packFloatx80( zSign, 0, 0 );
-        normalizeFloatx80Subnormal( aSig, &aExp, &aSig );
-    }
-    zExp = aExp - bExp + 0x3FFE;
-    rem1 = 0;
-    if ( bSig <= aSig ) {
-        shift128Right( aSig, 0, 1, &aSig, &rem1 );
-        ++zExp;
-    }
-    zSig0 = estimateDiv128To64( aSig, rem1, bSig );
-    mul64To128( bSig, zSig0, &term0, &term1 );
-    sub128( aSig, rem1, term0, term1, &rem0, &rem1 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        add128( rem0, rem1, 0, bSig, &rem0, &rem1 );
-    }
-    zSig1 = estimateDiv128To64( rem1, 0, bSig );
-    if ( (bits64) ( zSig1<<1 ) <= 8 ) {
-        mul64To128( bSig, zSig1, &term1, &term2 );
-        sub128( rem1, 0, term1, term2, &rem1, &rem2 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            add128( rem1, rem2, 0, bSig, &rem1, &rem2 );
-        }
-        zSig1 |= ( ( rem1 | rem2 ) != 0 );
-    }
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, zSign, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the extended double-precision floating-point value
-`a' with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_rem( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, expDiff;
-    bits64 aSig0, aSig1, bSig;
-    bits64 q, term0, term1, alternateASig0, alternateASig1;
-    floatx80 z;
-
-    aSig0 = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    bSig = extractFloatx80Frac( b );
-    bExp = extractFloatx80Exp( b );
-    bSign = extractFloatx80Sign( b );
-    if ( aExp == 0x7FFF ) {
-        if (    (bits64) ( aSig0<<1 )
-             || ( ( bExp == 0x7FFF ) && (bits64) ( bSig<<1 ) ) ) {
-            return propagateFloatx80NaN( a, b );
-        }
-        goto invalid;
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( (bits64) ( bSig<<1 ) ) return propagateFloatx80NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( bSig == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = floatx80_default_nan_low;
-            z.high = floatx80_default_nan_high;
-            return z;
-        }
-        normalizeFloatx80Subnormal( bSig, &bExp, &bSig );
-    }
-    if ( aExp == 0 ) {
-        if ( (bits64) ( aSig0<<1 ) == 0 ) return a;
-        normalizeFloatx80Subnormal( aSig0, &aExp, &aSig0 );
-    }
-    bSig |= LIT64( 0x8000000000000000 );
-    zSign = aSign;
-    expDiff = aExp - bExp;
-    aSig1 = 0;
-    if ( expDiff < 0 ) {
-        if ( expDiff < -1 ) return a;
-        shift128Right( aSig0, 0, 1, &aSig0, &aSig1 );
-        expDiff = 0;
-    }
-    q = ( bSig <= aSig0 );
-    if ( q ) aSig0 -= bSig;
-    expDiff -= 64;
-    while ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        mul64To128( bSig, q, &term0, &term1 );
-        sub128( aSig0, aSig1, term0, term1, &aSig0, &aSig1 );
-        shortShift128Left( aSig0, aSig1, 62, &aSig0, &aSig1 );
-        expDiff -= 62;
-    }
-    expDiff += 64;
-    if ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig );
-        q = ( 2 < q ) ? q - 2 : 0;
-        q >>= 64 - expDiff;
-        mul64To128( bSig, q<<( 64 - expDiff ), &term0, &term1 );
-        sub128( aSig0, aSig1, term0, term1, &aSig0, &aSig1 );
-        shortShift128Left( 0, bSig, 64 - expDiff, &term0, &term1 );
-        while ( le128( term0, term1, aSig0, aSig1 ) ) {
-            ++q;
-            sub128( aSig0, aSig1, term0, term1, &aSig0, &aSig1 );
-        }
-    }
-    else {
-        term1 = 0;
-        term0 = bSig;
-    }
-    sub128( term0, term1, aSig0, aSig1, &alternateASig0, &alternateASig1 );
-    if (    lt128( alternateASig0, alternateASig1, aSig0, aSig1 )
-         || (    eq128( alternateASig0, alternateASig1, aSig0, aSig1 )
-              && ( q & 1 ) )
-       ) {
-        aSig0 = alternateASig0;
-        aSig1 = alternateASig1;
-        zSign = ! zSign;
-    }
-    return
-        normalizeRoundAndPackFloatx80(
-            80, zSign, bExp + expDiff, aSig0, aSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the square root of the extended double-precision floating-point
-value `a'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_sqrt( floatx80 a )
-{
-    flag aSign;
-    int32 aExp, zExp;
-    bits64 aSig0, aSig1, zSig0, zSig1, doubleZSig0;
-    bits64 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-    floatx80 z;
-
-    aSig0 = extractFloatx80Frac( a );
-    aExp = extractFloatx80Exp( a );
-    aSign = extractFloatx80Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( (bits64) ( aSig0<<1 ) ) return propagateFloatx80NaN( a, a );
-        if ( ! aSign ) return a;
-        goto invalid;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig0 ) == 0 ) return a;
- invalid:
-        float_raise( float_flag_invalid );
-        z.low = floatx80_default_nan_low;
-        z.high = floatx80_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        if ( aSig0 == 0 ) return packFloatx80( 0, 0, 0 );
-        normalizeFloatx80Subnormal( aSig0, &aExp, &aSig0 );
-    }
-    zExp = ( ( aExp - 0x3FFF )>>1 ) + 0x3FFF;
-    zSig0 = estimateSqrt32( aExp, aSig0>>32 );
-    shift128Right( aSig0, 0, 2 + ( aExp & 1 ), &aSig0, &aSig1 );
-    zSig0 = estimateDiv128To64( aSig0, aSig1, zSig0<<32 ) + ( zSig0<<30 );
-    doubleZSig0 = zSig0<<1;
-    mul64To128( zSig0, zSig0, &term0, &term1 );
-    sub128( aSig0, aSig1, term0, term1, &rem0, &rem1 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        doubleZSig0 -= 2;
-        add128( rem0, rem1, zSig0>>63, doubleZSig0 | 1, &rem0, &rem1 );
-    }
-    zSig1 = estimateDiv128To64( rem1, 0, doubleZSig0 );
-    if ( ( zSig1 & LIT64( 0x3FFFFFFFFFFFFFFF ) ) <= 5 ) {
-        if ( zSig1 == 0 ) zSig1 = 1;
-        mul64To128( doubleZSig0, zSig1, &term1, &term2 );
-        sub128( rem1, 0, term1, term2, &rem1, &rem2 );
-        mul64To128( zSig1, zSig1, &term2, &term3 );
-        sub192( rem1, rem2, 0, 0, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            shortShift128Left( 0, zSig1, 1, &term2, &term3 );
-            term3 |= 1;
-            term2 |= doubleZSig0;
-            add192( rem1, rem2, rem3, 0, term2, term3, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shortShift128Left( 0, zSig1, 1, &zSig0, &zSig1 );
-    zSig0 |= doubleZSig0;
-    return
-        roundAndPackFloatx80(
-            floatx80_rounding_precision, 0, zExp, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is
-equal to the corresponding value `b', and 0 otherwise.  The comparison is
-performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_eq( floatx80 a, floatx80 b )
-{
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        if (    floatx80_is_signaling_nan( a )
-             || floatx80_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits16) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is
-less than or equal to the corresponding value `b', and 0 otherwise.  The
-comparison is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_le( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is
-less than the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_lt( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is equal
-to the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_eq_signaling( floatx80 a, floatx80 b )
-{
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits16) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is less
-than or equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs
-do not cause an exception.  Otherwise, the comparison is performed according
-to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_le_quiet( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        if (    floatx80_is_signaling_nan( a )
-             || floatx80_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is less
-than the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause
-an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag floatx80_lt_quiet( floatx80 a, floatx80 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloatx80Exp( a ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( a )<<1 ) )
-         || (    ( extractFloatx80Exp( b ) == 0x7FFF )
-              && (bits64) ( extractFloatx80Frac( b )<<1 ) )
-       ) {
-        if (    floatx80_is_signaling_nan( a )
-             || floatx80_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloatx80Sign( a );
-    bSign = extractFloatx80Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits16) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the 32-bit two's complement integer format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int32 float128_to_int32( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( ( aExp == 0x7FFF ) && ( aSig0 | aSig1 ) ) aSign = 0;
-    if ( aExp ) aSig0 |= LIT64( 0x0001000000000000 );
-    aSig0 |= ( aSig1 != 0 );
-    shiftCount = 0x4028 - aExp;
-    if ( 0 < shiftCount ) shift64RightJamming( aSig0, shiftCount, &aSig0 );
-    return roundAndPackInt32( aSign, aSig0 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the 32-bit two's complement integer format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  Otherwise, if the
-conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int32 float128_to_int32_round_to_zero( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1, savedASig;
-    int32 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    aSig0 |= ( aSig1 != 0 );
-    if ( 0x401E < aExp ) {
-        if ( ( aExp == 0x7FFF ) && aSig0 ) aSign = 0;
-        goto invalid;
-    }
-    else if ( aExp < 0x3FFF ) {
-        if ( aExp || aSig0 ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig0 |= LIT64( 0x0001000000000000 );
-    shiftCount = 0x402F - aExp;
-    savedASig = aSig0;
-    aSig0 >>= shiftCount;
-    z = aSig0;
-    if ( aSign ) z = - z;
-    if ( ( z < 0 ) ^ aSign ) {
- invalid:
-        float_raise( float_flag_invalid );
-        return aSign ? (sbits32) 0x80000000 : 0x7FFFFFFF;
-    }
-    if ( ( aSig0<<shiftCount ) != savedASig ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the 64-bit two's complement integer format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic---which means in particular that the conversion is rounded
-according to the current rounding mode.  If `a' is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as `a' is returned.
--------------------------------------------------------------------------------
-*/
-int64 float128_to_int64( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp ) aSig0 |= LIT64( 0x0001000000000000 );
-    shiftCount = 0x402F - aExp;
-    if ( shiftCount <= 0 ) {
-        if ( 0x403E < aExp ) {
-            float_raise( float_flag_invalid );
-            if (    ! aSign
-                 || (    ( aExp == 0x7FFF )
-                      && ( aSig1 || ( aSig0 != LIT64( 0x0001000000000000 ) ) )
-                    )
-               ) {
-                return LIT64( 0x7FFFFFFFFFFFFFFF );
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        shortShift128Left( aSig0, aSig1, - shiftCount, &aSig0, &aSig1 );
-    }
-    else {
-        shift64ExtraRightJamming( aSig0, aSig1, shiftCount, &aSig0, &aSig1 );
-    }
-    return roundAndPackInt64( aSign, aSig0, aSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the 64-bit two's complement integer format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic, except that the conversion is always rounded toward zero.
-If `a' is a NaN, the largest positive integer is returned.  Otherwise, if
-the conversion overflows, the largest integer with the same sign as `a' is
-returned.
--------------------------------------------------------------------------------
-*/
-int64 float128_to_int64_round_to_zero( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1;
-    int64 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp ) aSig0 |= LIT64( 0x0001000000000000 );
-    shiftCount = aExp - 0x402F;
-    if ( 0 < shiftCount ) {
-        if ( 0x403E <= aExp ) {
-            aSig0 &= LIT64( 0x0000FFFFFFFFFFFF );
-            if (    ( a.high == LIT64( 0xC03E000000000000 ) )
-                 && ( aSig1 < LIT64( 0x0002000000000000 ) ) ) {
-                if ( aSig1 ) float_exception_flags |= float_flag_inexact;
-            }
-            else {
-                float_raise( float_flag_invalid );
-                if ( ! aSign || ( ( aExp == 0x7FFF ) && ( aSig0 | aSig1 ) ) ) {
-                    return LIT64( 0x7FFFFFFFFFFFFFFF );
-                }
-            }
-            return (sbits64) LIT64( 0x8000000000000000 );
-        }
-        z = ( aSig0<<shiftCount ) | ( aSig1>>( ( - shiftCount ) & 63 ) );
-        if ( (bits64) ( aSig1<<shiftCount ) ) {
-            float_exception_flags |= float_flag_inexact;
-        }
-    }
-    else {
-        if ( aExp < 0x3FFF ) {
-            if ( aExp | aSig0 | aSig1 ) {
-                float_exception_flags |= float_flag_inexact;
-            }
-            return 0;
-        }
-        z = aSig0>>( - shiftCount );
-        if (    aSig1
-             || ( shiftCount && (bits64) ( aSig0<<( shiftCount & 63 ) ) ) ) {
-            float_exception_flags |= float_flag_inexact;
-        }
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-
-#if (defined(SOFTFLOATSPARC64_FOR_GCC) || defined(SOFTFLOAT_FOR_GCC)) \
-    && defined(SOFTFLOAT_NEED_FIXUNS)
-/*
- * just like above - but do not care for overflow of signed results
- */
-uint64 float128_to_uint64_round_to_zero( float128 a )
-{
-    flag aSign;
-    int32 aExp, shiftCount;
-    bits64 aSig0, aSig1;
-    uint64 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp ) aSig0 |= LIT64( 0x0001000000000000 );
-    shiftCount = aExp - 0x402F;
-    if ( 0 < shiftCount ) {
-        if ( 0x403F <= aExp ) {
-            aSig0 &= LIT64( 0x0000FFFFFFFFFFFF );
-            if (    ( a.high == LIT64( 0xC03E000000000000 ) )
-                 && ( aSig1 < LIT64( 0x0002000000000000 ) ) ) {
-                if ( aSig1 ) float_exception_flags |= float_flag_inexact;
-            }
-            else {
-                float_raise( float_flag_invalid );
-            }
-            return LIT64( 0xFFFFFFFFFFFFFFFF );
-        }
-        z = ( aSig0<<shiftCount ) | ( aSig1>>( ( - shiftCount ) & 63 ) );
-        if ( (bits64) ( aSig1<<shiftCount ) ) {
-            float_exception_flags |= float_flag_inexact;
-        }
-    }
-    else {
-        if ( aExp < 0x3FFF ) {
-            if ( aExp | aSig0 | aSig1 ) {
-                float_exception_flags |= float_flag_inexact;
-            }
-            return 0;
-        }
-        z = aSig0>>( - shiftCount );
-        if (aSig1 || ( shiftCount && (bits64) ( aSig0<<( shiftCount & 63 ) ) ) ) {
-            float_exception_flags |= float_flag_inexact;
-        }
-    }
-    if ( aSign ) z = - z;
-    return z;
-
-}
-#endif /* (SOFTFLOATSPARC64_FOR_GCC || SOFTFLOAT_FOR_GCC) && SOFTFLOAT_NEED_FIXUNS */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the single-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float32 float128_to_float32( float128 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig0, aSig1;
-    bits32 zSig;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) {
-            return commonNaNToFloat32( float128ToCommonNaN( a ) );
-        }
-        return packFloat32( aSign, 0xFF, 0 );
-    }
-    aSig0 |= ( aSig1 != 0 );
-    shift64RightJamming( aSig0, 18, &aSig0 );
-    zSig = aSig0;
-    if ( aExp || zSig ) {
-        zSig |= 0x40000000;
-        aExp -= 0x3F81;
-    }
-    return roundAndPackFloat32( aSign, aExp, zSig );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the double-precision floating-point format.  The conversion
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-float64 float128_to_float64( float128 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig0, aSig1;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) {
-            return commonNaNToFloat64( float128ToCommonNaN( a ) );
-        }
-        return packFloat64( aSign, 0x7FF, 0 );
-    }
-    shortShift128Left( aSig0, aSig1, 14, &aSig0, &aSig1 );
-    aSig0 |= ( aSig1 != 0 );
-    if ( aExp || aSig0 ) {
-        aSig0 |= LIT64( 0x4000000000000000 );
-        aExp -= 0x3C01;
-    }
-    return roundAndPackFloat64( aSign, aExp, aSig0 );
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point
-value `a' to the extended double-precision floating-point format.  The
-conversion is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-floatx80 float128_to_floatx80( float128 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 aSig0, aSig1;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) {
-            return commonNaNToFloatx80( float128ToCommonNaN( a ) );
-        }
-        return packFloatx80( aSign, 0x7FFF, LIT64( 0x8000000000000000 ) );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloatx80( aSign, 0, 0 );
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    else {
-        aSig0 |= LIT64( 0x0001000000000000 );
-    }
-    shortShift128Left( aSig0, aSig1, 15, &aSig0, &aSig1 );
-    return roundAndPackFloatx80( 80, aSign, aExp, aSig0, aSig1 );
-
-}
-
-#endif
-
-/*
--------------------------------------------------------------------------------
-Rounds the quadruple-precision floating-point value `a' to an integer, and
-returns the result as a quadruple-precision floating-point value.  The
-operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 a )
-{
-    flag aSign;
-    int32 aExp;
-    bits64 lastBitMask, roundBitsMask;
-    int8 roundingMode;
-    float128 z;
-
-    aExp = extractFloat128Exp( a );
-    if ( 0x402F <= aExp ) {
-        if ( 0x406F <= aExp ) {
-            if (    ( aExp == 0x7FFF )
-                 && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) )
-               ) {
-                return propagateFloat128NaN( a, a );
-            }
-            return a;
-        }
-        lastBitMask = 1;
-        lastBitMask = ( lastBitMask<<( 0x406E - aExp ) )<<1;
-        roundBitsMask = lastBitMask - 1;
-        z = a;
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            if ( lastBitMask ) {
-                add128( z.high, z.low, 0, lastBitMask>>1, &z.high, &z.low );
-                if ( ( z.low & roundBitsMask ) == 0 ) z.low &= ~ lastBitMask;
-            }
-            else {
-                if ( (sbits64) z.low < 0 ) {
-                    ++z.high;
-                    if ( (bits64) ( z.low<<1 ) == 0 ) z.high &= ~1;
-                }
-            }
-        }
-        else if ( roundingMode != float_round_to_zero ) {
-            if (   extractFloat128Sign( z )
-                 ^ ( roundingMode == float_round_up ) ) {
-                add128( z.high, z.low, 0, roundBitsMask, &z.high, &z.low );
-            }
-        }
-        z.low &= ~ roundBitsMask;
-    }
-    else {
-        if ( aExp < 0x3FFF ) {
-            if ( ( ( (bits64) ( a.high<<1 ) ) | a.low ) == 0 ) return a;
-            float_exception_flags |= float_flag_inexact;
-            aSign = extractFloat128Sign( a );
-            switch ( float_rounding_mode ) {
-             case float_round_nearest_even:
-                if (    ( aExp == 0x3FFE )
-                     && (   extractFloat128Frac0( a )
-                          | extractFloat128Frac1( a ) )
-                   ) {
-                    return packFloat128( aSign, 0x3FFF, 0, 0 );
-                }
-                break;
-	     case float_round_to_zero:
-		break;
-             case float_round_down:
-                return
-                      aSign ? packFloat128( 1, 0x3FFF, 0, 0 )
-                    : packFloat128( 0, 0, 0, 0 );
-             case float_round_up:
-                return
-                      aSign ? packFloat128( 1, 0, 0, 0 )
-                    : packFloat128( 0, 0x3FFF, 0, 0 );
-            }
-            return packFloat128( aSign, 0, 0, 0 );
-        }
-        lastBitMask = 1;
-        lastBitMask <<= 0x402F - aExp;
-        roundBitsMask = lastBitMask - 1;
-        z.low = 0;
-        z.high = a.high;
-        roundingMode = float_rounding_mode;
-        if ( roundingMode == float_round_nearest_even ) {
-            z.high += lastBitMask>>1;
-            if ( ( ( z.high & roundBitsMask ) | a.low ) == 0 ) {
-                z.high &= ~ lastBitMask;
-            }
-        }
-        else if ( roundingMode != float_round_to_zero ) {
-            if (   extractFloat128Sign( z )
-                 ^ ( roundingMode == float_round_up ) ) {
-                z.high |= ( a.low != 0 );
-                z.high += roundBitsMask;
-            }
-        }
-        z.high &= ~ roundBitsMask;
-    }
-    if ( ( z.low != a.low ) || ( z.high != a.high ) ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the absolute values of the quadruple-precision
-floating-point values `a' and `b'.  If `zSign' is 1, the sum is negated
-before being returned.  `zSign' is ignored if the result is a NaN.
-The addition is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float128 addFloat128Sigs( float128 a, float128 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    int32 expDiff;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    expDiff = aExp - bExp;
-    if ( 0 < expDiff ) {
-        if ( aExp == 0x7FFF ) {
-            if ( aSig0 | aSig1 ) return propagateFloat128NaN( a, b );
-            return a;
-        }
-        if ( bExp == 0 ) {
-            --expDiff;
-        }
-        else {
-            bSig0 |= LIT64( 0x0001000000000000 );
-        }
-        shift128ExtraRightJamming(
-            bSig0, bSig1, 0, expDiff, &bSig0, &bSig1, &zSig2 );
-        zExp = aExp;
-    }
-    else if ( expDiff < 0 ) {
-        if ( bExp == 0x7FFF ) {
-            if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-            return packFloat128( zSign, 0x7FFF, 0, 0 );
-        }
-        if ( aExp == 0 ) {
-            ++expDiff;
-        }
-        else {
-            aSig0 |= LIT64( 0x0001000000000000 );
-        }
-        shift128ExtraRightJamming(
-            aSig0, aSig1, 0, - expDiff, &aSig0, &aSig1, &zSig2 );
-        zExp = bExp;
-    }
-    else {
-        if ( aExp == 0x7FFF ) {
-            if ( aSig0 | aSig1 | bSig0 | bSig1 ) {
-                return propagateFloat128NaN( a, b );
-            }
-            return a;
-        }
-        add128( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-        if ( aExp == 0 ) return packFloat128( zSign, 0, zSig0, zSig1 );
-        zSig2 = 0;
-        zSig0 |= LIT64( 0x0002000000000000 );
-        zExp = aExp;
-        goto shiftRight1;
-    }
-    aSig0 |= LIT64( 0x0001000000000000 );
-    add128( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-    --zExp;
-    if ( zSig0 < LIT64( 0x0002000000000000 ) ) goto roundAndPack;
-    ++zExp;
- shiftRight1:
-    shift128ExtraRightJamming(
-        zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2 );
- roundAndPack:
-    return roundAndPackFloat128( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the absolute values of the quadruple-
-precision floating-point values `a' and `b'.  If `zSign' is 1, the
-difference is negated before being returned.  `zSign' is ignored if the
-result is a NaN.  The subtraction is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-static float128 subFloat128Sigs( float128 a, float128 b, flag zSign )
-{
-    int32 aExp, bExp, zExp;
-    bits64 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1;
-    int32 expDiff;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    expDiff = aExp - bExp;
-    shortShift128Left( aSig0, aSig1, 14, &aSig0, &aSig1 );
-    shortShift128Left( bSig0, bSig1, 14, &bSig0, &bSig1 );
-    if ( 0 < expDiff ) goto aExpBigger;
-    if ( expDiff < 0 ) goto bExpBigger;
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 | bSig0 | bSig1 ) {
-            return propagateFloat128NaN( a, b );
-        }
-        float_raise( float_flag_invalid );
-        z.low = float128_default_nan_low;
-        z.high = float128_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        aExp = 1;
-        bExp = 1;
-    }
-    if ( bSig0 < aSig0 ) goto aBigger;
-    if ( aSig0 < bSig0 ) goto bBigger;
-    if ( bSig1 < aSig1 ) goto aBigger;
-    if ( aSig1 < bSig1 ) goto bBigger;
-    return packFloat128( float_rounding_mode == float_round_down, 0, 0, 0 );
- bExpBigger:
-    if ( bExp == 0x7FFF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-        return packFloat128( zSign ^ 1, 0x7FFF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        ++expDiff;
-    }
-    else {
-        aSig0 |= LIT64( 0x4000000000000000 );
-    }
-    shift128RightJamming( aSig0, aSig1, - expDiff, &aSig0, &aSig1 );
-    bSig0 |= LIT64( 0x4000000000000000 );
- bBigger:
-    sub128( bSig0, bSig1, aSig0, aSig1, &zSig0, &zSig1 );
-    zExp = bExp;
-    zSign ^= 1;
-    goto normalizeRoundAndPack;
- aExpBigger:
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat128NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        --expDiff;
-    }
-    else {
-        bSig0 |= LIT64( 0x4000000000000000 );
-    }
-    shift128RightJamming( bSig0, bSig1, expDiff, &bSig0, &bSig1 );
-    aSig0 |= LIT64( 0x4000000000000000 );
- aBigger:
-    sub128( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1 );
-    zExp = aExp;
- normalizeRoundAndPack:
-    --zExp;
-    return normalizeRoundAndPackFloat128( zSign, zExp - 14, zSig0, zSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of adding the quadruple-precision floating-point values
-`a' and `b'.  The operation is performed according to the IEC/IEEE Standard
-for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_add( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign == bSign ) {
-        return addFloat128Sigs( a, b, aSign );
-    }
-    else {
-        return subFloat128Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of subtracting the quadruple-precision floating-point
-values `a' and `b'.  The operation is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_sub( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign == bSign ) {
-        return subFloat128Sigs( a, b, aSign );
-    }
-    else {
-        return addFloat128Sigs( a, b, aSign );
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of multiplying the quadruple-precision floating-point
-values `a' and `b'.  The operation is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_mul( float128 a, float128 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2, zSig3;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    bSign = extractFloat128Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if (    ( aSig0 | aSig1 )
-             || ( ( bExp == 0x7FFF ) && ( bSig0 | bSig1 ) ) ) {
-            return propagateFloat128NaN( a, b );
-        }
-        if ( ( bExp | bSig0 | bSig1 ) == 0 ) goto invalid;
-        return packFloat128( zSign, 0x7FFF, 0, 0 );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-        if ( ( aExp | aSig0 | aSig1 ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = float128_default_nan_low;
-            z.high = float128_default_nan_high;
-            return z;
-        }
-        return packFloat128( zSign, 0x7FFF, 0, 0 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat128( zSign, 0, 0, 0 );
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) return packFloat128( zSign, 0, 0, 0 );
-        normalizeFloat128Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    zExp = aExp + bExp - 0x4000;
-    aSig0 |= LIT64( 0x0001000000000000 );
-    shortShift128Left( bSig0, bSig1, 16, &bSig0, &bSig1 );
-    mul128To256( aSig0, aSig1, bSig0, bSig1, &zSig0, &zSig1, &zSig2, &zSig3 );
-    add128( zSig0, zSig1, aSig0, aSig1, &zSig0, &zSig1 );
-    zSig2 |= ( zSig3 != 0 );
-    if ( LIT64( 0x0002000000000000 ) <= zSig0 ) {
-        shift128ExtraRightJamming(
-            zSig0, zSig1, zSig2, 1, &zSig0, &zSig1, &zSig2 );
-        ++zExp;
-    }
-    return roundAndPackFloat128( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of dividing the quadruple-precision floating-point value
-`a' by the corresponding value `b'.  The operation is performed according to
-the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_div( float128 a, float128 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, zExp;
-    bits64 aSig0, aSig1, bSig0, bSig1, zSig0, zSig1, zSig2;
-    bits64 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    bSign = extractFloat128Sign( b );
-    zSign = aSign ^ bSign;
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat128NaN( a, b );
-        if ( bExp == 0x7FFF ) {
-            if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-            goto invalid;
-        }
-        return packFloat128( zSign, 0x7FFF, 0, 0 );
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-        return packFloat128( zSign, 0, 0, 0 );
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) {
-            if ( ( aExp | aSig0 | aSig1 ) == 0 ) {
- invalid:
-                float_raise( float_flag_invalid );
-                z.low = float128_default_nan_low;
-                z.high = float128_default_nan_high;
-                return z;
-            }
-            float_raise( float_flag_divbyzero );
-            return packFloat128( zSign, 0x7FFF, 0, 0 );
-        }
-        normalizeFloat128Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat128( zSign, 0, 0, 0 );
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    zExp = aExp - bExp + 0x3FFD;
-    shortShift128Left(
-        aSig0 | LIT64( 0x0001000000000000 ), aSig1, 15, &aSig0, &aSig1 );
-    shortShift128Left(
-        bSig0 | LIT64( 0x0001000000000000 ), bSig1, 15, &bSig0, &bSig1 );
-    if ( le128( bSig0, bSig1, aSig0, aSig1 ) ) {
-        shift128Right( aSig0, aSig1, 1, &aSig0, &aSig1 );
-        ++zExp;
-    }
-    zSig0 = estimateDiv128To64( aSig0, aSig1, bSig0 );
-    mul128By64To192( bSig0, bSig1, zSig0, &term0, &term1, &term2 );
-    sub192( aSig0, aSig1, 0, term0, term1, term2, &rem0, &rem1, &rem2 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        add192( rem0, rem1, rem2, 0, bSig0, bSig1, &rem0, &rem1, &rem2 );
-    }
-    zSig1 = estimateDiv128To64( rem1, rem2, bSig0 );
-    if ( ( zSig1 & 0x3FFF ) <= 4 ) {
-        mul128By64To192( bSig0, bSig1, zSig1, &term1, &term2, &term3 );
-        sub192( rem1, rem2, 0, term1, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            add192( rem1, rem2, rem3, 0, bSig0, bSig1, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shift128ExtraRightJamming( zSig0, zSig1, 0, 15, &zSig0, &zSig1, &zSig2 );
-    return roundAndPackFloat128( zSign, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the remainder of the quadruple-precision floating-point value `a'
-with respect to the corresponding value `b'.  The operation is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_rem( float128 a, float128 b )
-{
-    flag aSign, bSign, zSign;
-    int32 aExp, bExp, expDiff;
-    bits64 aSig0, aSig1, bSig0, bSig1, q, term0, term1, term2;
-    bits64 allZero, alternateASig0, alternateASig1, sigMean1;
-    sbits64 sigMean0;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    bSig1 = extractFloat128Frac1( b );
-    bSig0 = extractFloat128Frac0( b );
-    bExp = extractFloat128Exp( b );
-    bSign = extractFloat128Sign( b );
-    if ( aExp == 0x7FFF ) {
-        if (    ( aSig0 | aSig1 )
-             || ( ( bExp == 0x7FFF ) && ( bSig0 | bSig1 ) ) ) {
-            return propagateFloat128NaN( a, b );
-        }
-        goto invalid;
-    }
-    if ( bExp == 0x7FFF ) {
-        if ( bSig0 | bSig1 ) return propagateFloat128NaN( a, b );
-        return a;
-    }
-    if ( bExp == 0 ) {
-        if ( ( bSig0 | bSig1 ) == 0 ) {
- invalid:
-            float_raise( float_flag_invalid );
-            z.low = float128_default_nan_low;
-            z.high = float128_default_nan_high;
-            return z;
-        }
-        normalizeFloat128Subnormal( bSig0, bSig1, &bExp, &bSig0, &bSig1 );
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return a;
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    expDiff = aExp - bExp;
-    if ( expDiff < -1 ) return a;
-    shortShift128Left(
-        aSig0 | LIT64( 0x0001000000000000 ),
-        aSig1,
-        15 - ( expDiff < 0 ),
-        &aSig0,
-        &aSig1
-    );
-    shortShift128Left(
-        bSig0 | LIT64( 0x0001000000000000 ), bSig1, 15, &bSig0, &bSig1 );
-    q = le128( bSig0, bSig1, aSig0, aSig1 );
-    if ( q ) sub128( aSig0, aSig1, bSig0, bSig1, &aSig0, &aSig1 );
-    expDiff -= 64;
-    while ( 0 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig0 );
-        q = ( 4 < q ) ? q - 4 : 0;
-        mul128By64To192( bSig0, bSig1, q, &term0, &term1, &term2 );
-        shortShift192Left( term0, term1, term2, 61, &term1, &term2, &allZero );
-        shortShift128Left( aSig0, aSig1, 61, &aSig0, &allZero );
-        sub128( aSig0, 0, term1, term2, &aSig0, &aSig1 );
-        expDiff -= 61;
-    }
-    if ( -64 < expDiff ) {
-        q = estimateDiv128To64( aSig0, aSig1, bSig0 );
-        q = ( 4 < q ) ? q - 4 : 0;
-        q >>= - expDiff;
-        shift128Right( bSig0, bSig1, 12, &bSig0, &bSig1 );
-        expDiff += 52;
-        if ( expDiff < 0 ) {
-            shift128Right( aSig0, aSig1, - expDiff, &aSig0, &aSig1 );
-        }
-        else {
-            shortShift128Left( aSig0, aSig1, expDiff, &aSig0, &aSig1 );
-        }
-        mul128By64To192( bSig0, bSig1, q, &term0, &term1, &term2 );
-        sub128( aSig0, aSig1, term1, term2, &aSig0, &aSig1 );
-    }
-    else {
-        shift128Right( aSig0, aSig1, 12, &aSig0, &aSig1 );
-        shift128Right( bSig0, bSig1, 12, &bSig0, &bSig1 );
-    }
-    do {
-        alternateASig0 = aSig0;
-        alternateASig1 = aSig1;
-        ++q;
-        sub128( aSig0, aSig1, bSig0, bSig1, &aSig0, &aSig1 );
-    } while ( 0 <= (sbits64) aSig0 );
-    add128(
-        aSig0, aSig1, alternateASig0, alternateASig1, (bits64 *)&sigMean0, &sigMean1 );
-    if (    ( sigMean0 < 0 )
-         || ( ( ( sigMean0 | sigMean1 ) == 0 ) && ( q & 1 ) ) ) {
-        aSig0 = alternateASig0;
-        aSig1 = alternateASig1;
-    }
-    zSign = ( (sbits64) aSig0 < 0 );
-    if ( zSign ) sub128( 0, 0, aSig0, aSig1, &aSig0, &aSig1 );
-    return
-        normalizeRoundAndPackFloat128( aSign ^ zSign, bExp - 4, aSig0, aSig1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the square root of the quadruple-precision floating-point value `a'.
-The operation is performed according to the IEC/IEEE Standard for Binary
-Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-float128 float128_sqrt( float128 a )
-{
-    flag aSign;
-    int32 aExp, zExp;
-    bits64 aSig0, aSig1, zSig0, zSig1, zSig2, doubleZSig0;
-    bits64 rem0, rem1, rem2, rem3, term0, term1, term2, term3;
-    float128 z;
-
-    aSig1 = extractFloat128Frac1( a );
-    aSig0 = extractFloat128Frac0( a );
-    aExp = extractFloat128Exp( a );
-    aSign = extractFloat128Sign( a );
-    if ( aExp == 0x7FFF ) {
-        if ( aSig0 | aSig1 ) return propagateFloat128NaN( a, a );
-        if ( ! aSign ) return a;
-        goto invalid;
-    }
-    if ( aSign ) {
-        if ( ( aExp | aSig0 | aSig1 ) == 0 ) return a;
- invalid:
-        float_raise( float_flag_invalid );
-        z.low = float128_default_nan_low;
-        z.high = float128_default_nan_high;
-        return z;
-    }
-    if ( aExp == 0 ) {
-        if ( ( aSig0 | aSig1 ) == 0 ) return packFloat128( 0, 0, 0, 0 );
-        normalizeFloat128Subnormal( aSig0, aSig1, &aExp, &aSig0, &aSig1 );
-    }
-    zExp = ( ( aExp - 0x3FFF )>>1 ) + 0x3FFE;
-    aSig0 |= LIT64( 0x0001000000000000 );
-    zSig0 = estimateSqrt32( aExp, aSig0>>17 );
-    shortShift128Left( aSig0, aSig1, 13 - ( aExp & 1 ), &aSig0, &aSig1 );
-    zSig0 = estimateDiv128To64( aSig0, aSig1, zSig0<<32 ) + ( zSig0<<30 );
-    doubleZSig0 = zSig0<<1;
-    mul64To128( zSig0, zSig0, &term0, &term1 );
-    sub128( aSig0, aSig1, term0, term1, &rem0, &rem1 );
-    while ( (sbits64) rem0 < 0 ) {
-        --zSig0;
-        doubleZSig0 -= 2;
-        add128( rem0, rem1, zSig0>>63, doubleZSig0 | 1, &rem0, &rem1 );
-    }
-    zSig1 = estimateDiv128To64( rem1, 0, doubleZSig0 );
-    if ( ( zSig1 & 0x1FFF ) <= 5 ) {
-        if ( zSig1 == 0 ) zSig1 = 1;
-        mul64To128( doubleZSig0, zSig1, &term1, &term2 );
-        sub128( rem1, 0, term1, term2, &rem1, &rem2 );
-        mul64To128( zSig1, zSig1, &term2, &term3 );
-        sub192( rem1, rem2, 0, 0, term2, term3, &rem1, &rem2, &rem3 );
-        while ( (sbits64) rem1 < 0 ) {
-            --zSig1;
-            shortShift128Left( 0, zSig1, 1, &term2, &term3 );
-            term3 |= 1;
-            term2 |= doubleZSig0;
-            add192( rem1, rem2, rem3, 0, term2, term3, &rem1, &rem2, &rem3 );
-        }
-        zSig1 |= ( ( rem1 | rem2 | rem3 ) != 0 );
-    }
-    shift128ExtraRightJamming( zSig0, zSig1, 0, 14, &zSig0, &zSig1, &zSig2 );
-    return roundAndPackFloat128( 0, zExp, zSig0, zSig1, zSig2 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_eq( float128 a, float128 b )
-{
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        if (    float128_is_signaling_nan( a )
-             || float128_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits64) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  The comparison
-is performed according to the IEC/IEEE Standard for Binary Floating-Point
-Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_le( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits64) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  The comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_lt( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits64) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is equal to
-the corresponding value `b', and 0 otherwise.  The invalid exception is
-raised if either operand is a NaN.  Otherwise, the comparison is performed
-according to the IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_eq_signaling( float128 a, float128 b )
-{
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        float_raise( float_flag_invalid );
-        return 0;
-    }
-    return
-           ( a.low == b.low )
-        && (    ( a.high == b.high )
-             || (    ( a.low == 0 )
-                  && ( (bits64) ( ( a.high | b.high )<<1 ) == 0 ) )
-           );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is less than
-or equal to the corresponding value `b', and 0 otherwise.  Quiet NaNs do not
-cause an exception.  Otherwise, the comparison is performed according to the
-IEC/IEEE Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_le_quiet( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        if (    float128_is_signaling_nan( a )
-             || float128_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            || (    ( ( (bits64) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 == 0 );
-    }
-    return
-          aSign ? le128( b.high, b.low, a.high, a.low )
-        : le128( a.high, a.low, b.high, b.low );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is less than
-the corresponding value `b', and 0 otherwise.  Quiet NaNs do not cause an
-exception.  Otherwise, the comparison is performed according to the IEC/IEEE
-Standard for Binary Floating-Point Arithmetic.
--------------------------------------------------------------------------------
-*/
-flag float128_lt_quiet( float128 a, float128 b )
-{
-    flag aSign, bSign;
-
-    if (    (    ( extractFloat128Exp( a ) == 0x7FFF )
-              && ( extractFloat128Frac0( a ) | extractFloat128Frac1( a ) ) )
-         || (    ( extractFloat128Exp( b ) == 0x7FFF )
-              && ( extractFloat128Frac0( b ) | extractFloat128Frac1( b ) ) )
-       ) {
-        if (    float128_is_signaling_nan( a )
-             || float128_is_signaling_nan( b ) ) {
-            float_raise( float_flag_invalid );
-        }
-        return 0;
-    }
-    aSign = extractFloat128Sign( a );
-    bSign = extractFloat128Sign( b );
-    if ( aSign != bSign ) {
-        return
-               aSign
-            && (    ( ( (bits64) ( ( a.high | b.high )<<1 ) ) | a.low | b.low )
-                 != 0 );
-    }
-    return
-          aSign ? lt128( b.high, b.low, a.high, a.low )
-        : lt128( a.high, a.low, b.high, b.low );
-
-}
-
-#endif
-
-
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
-
-/*
- * These two routines are not part of the original softfloat distribution.
- *
- * They are based on the corresponding conversions to integer but return
- * unsigned numbers instead since these functions are required by GCC.
- *
- * Added by Mark Brinicombe <mark@NetBSD.org>	27/09/97
- *
- * float64 version overhauled for SoftFloat 2a [bjh21 2000-07-15]
- */
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point value
-`a' to the 32-bit unsigned integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  If the conversion
-overflows, the largest integer positive is returned.
--------------------------------------------------------------------------------
-*/
-uint32 float64_to_uint32_round_to_zero( float64 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits64 aSig, savedASig;
-    uint32 z;
-
-    aSig = extractFloat64Frac( a );
-    aExp = extractFloat64Exp( a );
-    aSign = extractFloat64Sign( a );
-
-    if (aSign) {
-        float_raise( float_flag_invalid );
-    	return(0);
-    }
-
-    if ( 0x41E < aExp ) {
-        float_raise( float_flag_invalid );
-        return 0xffffffff;
-    }
-    else if ( aExp < 0x3FF ) {
-        if ( aExp || aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig |= LIT64( 0x0010000000000000 );
-    shiftCount = 0x433 - aExp;
-    savedASig = aSig;
-    aSig >>= shiftCount;
-    z = aSig;
-    if ( ( aSig<<shiftCount ) != savedASig ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point value
-`a' to the 32-bit unsigned integer format.  The conversion is
-performed according to the IEC/IEEE Standard for Binary Floating-point
-Arithmetic, except that the conversion is always rounded toward zero.  If
-`a' is a NaN, the largest positive integer is returned.  If the conversion
-overflows, the largest positive integer is returned.
--------------------------------------------------------------------------------
-*/
-uint32 float32_to_uint32_round_to_zero( float32 a )
-{
-    flag aSign;
-    int16 aExp, shiftCount;
-    bits32 aSig;
-    uint32 z;
-
-    aSig = extractFloat32Frac( a );
-    aExp = extractFloat32Exp( a );
-    aSign = extractFloat32Sign( a );
-    shiftCount = aExp - 0x9E;
-
-    if (aSign) {
-        float_raise( float_flag_invalid );
-    	return(0);
-    }
-    if ( 0 < shiftCount ) {
-        float_raise( float_flag_invalid );
-        return 0xFFFFFFFF;
-    }
-    else if ( aExp <= 0x7E ) {
-        if ( aExp | aSig ) float_exception_flags |= float_flag_inexact;
-        return 0;
-    }
-    aSig = ( aSig | 0x800000 )<<8;
-    z = aSig>>( - shiftCount );
-    if ( aSig<<( shiftCount & 31 ) ) {
-        float_exception_flags |= float_flag_inexact;
-    }
-    return z;
-
-}
-
-#endif
diff --git a/lib/libc_bsd/softfloat/eqdf2.c b/lib/libc_bsd/softfloat/eqdf2.c
deleted file mode 100644
index 5832072..0000000
--- a/lib/libc_bsd/softfloat/eqdf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: eqdf2.c,v 1.1 2000/06/06 08:15:02 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/eqdf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-flag __eqdf2(float64, float64);
-
-flag
-__eqdf2(float64 a, float64 b)
-{
-
-	/* libgcc1.c says !(a == b) */
-	return !float64_eq(a, b);
-}
diff --git a/lib/libc_bsd/softfloat/eqsf2.c b/lib/libc_bsd/softfloat/eqsf2.c
deleted file mode 100644
index c6983d2..0000000
--- a/lib/libc_bsd/softfloat/eqsf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: eqsf2.c,v 1.1 2000/06/06 08:15:03 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/eqsf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-flag __eqsf2(float32, float32);
-
-flag
-__eqsf2(float32 a, float32 b)
-{
-
-	/* libgcc1.c says !(a == b) */
-	return !float32_eq(a, b);
-}
diff --git a/lib/libc_bsd/softfloat/eqtf2.c b/lib/libc_bsd/softfloat/eqtf2.c
deleted file mode 100644
index 3e16810..0000000
--- a/lib/libc_bsd/softfloat/eqtf2.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* $NetBSD: eqtf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/eqtf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef FLOAT128
-flag __eqtf2(float128, float128);
-
-flag
-__eqtf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says !(a == b) */
-	return !float128_eq(a, b);
-}
-#endif /* FLOAT128 */
diff --git a/lib/libc_bsd/softfloat/fpgetmask.c b/lib/libc_bsd/softfloat/fpgetmask.c
deleted file mode 100644
index 9da08c3..0000000
--- a/lib/libc_bsd/softfloat/fpgetmask.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $NetBSD: fpgetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and Mark Brinicombe
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/fpgetmask.c 189647 2009-03-10 21:13:26Z delphij $");
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpgetmask,_fpgetmask)
-#endif
-
-fp_except
-fpgetmask(void)
-{
-
-	return float_exception_mask;
-}
diff --git a/lib/libc_bsd/softfloat/fpgetround.c b/lib/libc_bsd/softfloat/fpgetround.c
deleted file mode 100644
index fda85cd..0000000
--- a/lib/libc_bsd/softfloat/fpgetround.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $NetBSD: fpgetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and Mark Brinicombe
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/fpgetround.c 189647 2009-03-10 21:13:26Z delphij $");
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpgetround,_fpgetround)
-#endif
-
-fp_rnd_t
-fpgetround(void)
-{
-
-	return float_rounding_mode;
-}
diff --git a/lib/libc_bsd/softfloat/fpgetsticky.c b/lib/libc_bsd/softfloat/fpgetsticky.c
deleted file mode 100644
index 2ce173e..0000000
--- a/lib/libc_bsd/softfloat/fpgetsticky.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* $NetBSD: fpgetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and Mark Brinicombe
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/fpgetsticky.c 189647 2009-03-10 21:13:26Z delphij $");
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpgetsticky,_fpgetsticky)
-#endif
-
-fp_except
-fpgetsticky(void)
-{
-
-	return float_exception_flags;
-}
diff --git a/lib/libc_bsd/softfloat/fpsetmask.c b/lib/libc_bsd/softfloat/fpsetmask.c
deleted file mode 100644
index 3638f3d..0000000
--- a/lib/libc_bsd/softfloat/fpsetmask.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $NetBSD: fpsetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and Mark Brinicombe
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/fpsetmask.c 189647 2009-03-10 21:13:26Z delphij $");
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpsetmask,_fpsetmask)
-#endif
-
-fp_except
-fpsetmask(fp_except mask)
-{
-	fp_except old;
-
-	old = float_exception_mask;
-	float_exception_mask = mask;
-	return old;
-}
diff --git a/lib/libc_bsd/softfloat/fpsetround.c b/lib/libc_bsd/softfloat/fpsetround.c
deleted file mode 100644
index dd337f4..0000000
--- a/lib/libc_bsd/softfloat/fpsetround.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $NetBSD: fpsetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and Mark Brinicombe
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/fpsetround.c 189647 2009-03-10 21:13:26Z delphij $");
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpsetround,_fpsetround)
-#endif
-
-fp_rnd_t
-fpsetround(fp_rnd_t rnd_dir)
-{
-	fp_rnd_t old;
-
-	old = float_rounding_mode;
-	float_rounding_mode = rnd_dir;
-	return old;
-}
diff --git a/lib/libc_bsd/softfloat/fpsetsticky.c b/lib/libc_bsd/softfloat/fpsetsticky.c
deleted file mode 100644
index bca3dcd..0000000
--- a/lib/libc_bsd/softfloat/fpsetsticky.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* $NetBSD: fpsetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
-
-/*-
- * Copyright (c) 1997 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Neil A. Carson and Mark Brinicombe
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/fpsetsticky.c 189647 2009-03-10 21:13:26Z delphij $");
-
-#include "namespace.h"
-
-#include <ieeefp.h>
-#ifdef SOFTFLOAT_FOR_GCC
-#include "softfloat-for-gcc.h"
-#endif
-#include "milieu.h"
-#include "softfloat.h"
-
-#ifdef __weak_alias
-__weak_alias(fpsetsticky,_fpsetsticky)
-#endif
-
-fp_except
-fpsetsticky(fp_except except)
-{
-	fp_except old;
-
-	old = float_exception_flags;
-	float_exception_flags = except;
-	return old;
-}
diff --git a/lib/libc_bsd/softfloat/gedf2.c b/lib/libc_bsd/softfloat/gedf2.c
deleted file mode 100644
index 4843026..0000000
--- a/lib/libc_bsd/softfloat/gedf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: gedf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/gedf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __gedf2(float64, float64);
-
-flag
-__gedf2(float64 a, float64 b)
-{
-
-	/* libgcc1.c says (a >= b) - 1 */
-	return float64_le(b, a) - 1;
-}
diff --git a/lib/libc_bsd/softfloat/gesf2.c b/lib/libc_bsd/softfloat/gesf2.c
deleted file mode 100644
index d71bda9..0000000
--- a/lib/libc_bsd/softfloat/gesf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: gesf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/gesf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __gesf2(float32, float32);
-
-flag
-__gesf2(float32 a, float32 b)
-{
-
-	/* libgcc1.c says (a >= b) - 1 */
-	return float32_le(b, a) - 1;
-}
diff --git a/lib/libc_bsd/softfloat/getf2.c b/lib/libc_bsd/softfloat/getf2.c
deleted file mode 100644
index 9092614..0000000
--- a/lib/libc_bsd/softfloat/getf2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $NetBSD: getf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/getf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOAT128
-
-flag __getf2(float128, float128);
-
-flag
-__getf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says (a >= b) - 1 */
-	return float128_le(b, a) - 1;
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc_bsd/softfloat/gexf2.c b/lib/libc_bsd/softfloat/gexf2.c
deleted file mode 100644
index ca648a2..0000000
--- a/lib/libc_bsd/softfloat/gexf2.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $NetBSD: gexf2.c,v 1.2 2004/09/27 10:16:24 he Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/gexf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOATX80
-
-flag __gexf2(floatx80, floatx80);
-
-flag
-__gexf2(floatx80 a, floatx80 b)
-{
-
-	/* libgcc1.c says (a >= b) - 1 */
-	return floatx80_le(b, a) - 1;
-}
-#endif /* FLOATX80 */
diff --git a/lib/libc_bsd/softfloat/gtdf2.c b/lib/libc_bsd/softfloat/gtdf2.c
deleted file mode 100644
index fe7c709..0000000
--- a/lib/libc_bsd/softfloat/gtdf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: gtdf2.c,v 1.1 2000/06/06 08:15:05 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/gtdf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __gtdf2(float64, float64);
-
-flag
-__gtdf2(float64 a, float64 b)
-{
-
-	/* libgcc1.c says a > b */
-	return float64_lt(b, a);
-}
diff --git a/lib/libc_bsd/softfloat/gtsf2.c b/lib/libc_bsd/softfloat/gtsf2.c
deleted file mode 100644
index f4de92b..0000000
--- a/lib/libc_bsd/softfloat/gtsf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: gtsf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/gtsf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __gtsf2(float32, float32);
-
-flag
-__gtsf2(float32 a, float32 b)
-{
-
-	/* libgcc1.c says a > b */
-	return float32_lt(b, a);
-}
diff --git a/lib/libc_bsd/softfloat/gttf2.c b/lib/libc_bsd/softfloat/gttf2.c
deleted file mode 100644
index 802eb72..0000000
--- a/lib/libc_bsd/softfloat/gttf2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $NetBSD: gttf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/gttf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOAT128
-
-flag __gttf2(float128, float128);
-
-flag
-__gttf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says a > b */
-	return float128_lt(b, a);
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc_bsd/softfloat/gtxf2.c b/lib/libc_bsd/softfloat/gtxf2.c
deleted file mode 100644
index 241b98c..0000000
--- a/lib/libc_bsd/softfloat/gtxf2.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $NetBSD: gtxf2.c,v 1.2 2004/09/27 10:16:24 he Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/gtxf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOATX80
-
-flag __gtxf2(floatx80, floatx80);
-
-flag
-__gtxf2(floatx80 a, floatx80 b)
-{
-
-	/* libgcc1.c says a > b */
-	return floatx80_lt(b, a);
-}
-#endif /* FLOATX80 */
diff --git a/lib/libc_bsd/softfloat/ledf2.c b/lib/libc_bsd/softfloat/ledf2.c
deleted file mode 100644
index 1207f00..0000000
--- a/lib/libc_bsd/softfloat/ledf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: ledf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/ledf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __ledf2(float64, float64);
-
-flag
-__ledf2(float64 a, float64 b)
-{
-
-	/* libgcc1.c says 1 - (a <= b) */
-	return 1 - float64_le(a, b);
-}
diff --git a/lib/libc_bsd/softfloat/lesf2.c b/lib/libc_bsd/softfloat/lesf2.c
deleted file mode 100644
index fe6244f..0000000
--- a/lib/libc_bsd/softfloat/lesf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: lesf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/lesf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __lesf2(float32, float32);
-
-flag
-__lesf2(float32 a, float32 b)
-{
-
-	/* libgcc1.c says 1 - (a <= b) */
-	return 1 - float32_le(a, b);
-}
diff --git a/lib/libc_bsd/softfloat/letf2.c b/lib/libc_bsd/softfloat/letf2.c
deleted file mode 100644
index 4e89122..0000000
--- a/lib/libc_bsd/softfloat/letf2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $NetBSD: letf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/letf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOAT128
-
-flag __letf2(float128, float128);
-
-flag
-__letf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says 1 - (a <= b) */
-	return 1 - float128_le(a, b);
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc_bsd/softfloat/ltdf2.c b/lib/libc_bsd/softfloat/ltdf2.c
deleted file mode 100644
index 9115d92..0000000
--- a/lib/libc_bsd/softfloat/ltdf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: ltdf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/ltdf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __ltdf2(float64, float64);
-
-flag
-__ltdf2(float64 a, float64 b)
-{
-
-	/* libgcc1.c says -(a < b) */
-	return -float64_lt(a, b);
-}
diff --git a/lib/libc_bsd/softfloat/ltsf2.c b/lib/libc_bsd/softfloat/ltsf2.c
deleted file mode 100644
index 4cefe35..0000000
--- a/lib/libc_bsd/softfloat/ltsf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: ltsf2.c,v 1.1 2000/06/06 08:15:06 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/ltsf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __ltsf2(float32, float32);
-
-flag
-__ltsf2(float32 a, float32 b)
-{
-
-	/* libgcc1.c says -(a < b) */
-	return -float32_lt(a, b);
-}
diff --git a/lib/libc_bsd/softfloat/lttf2.c b/lib/libc_bsd/softfloat/lttf2.c
deleted file mode 100644
index 22e46a0..0000000
--- a/lib/libc_bsd/softfloat/lttf2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $NetBSD: lttf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/lttf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOAT128
-
-flag __lttf2(float128, float128);
-
-flag
-__lttf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says -(a < b) */
-	return -float128_lt(a, b);
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc_bsd/softfloat/nedf2.c b/lib/libc_bsd/softfloat/nedf2.c
deleted file mode 100644
index bca6e8b..0000000
--- a/lib/libc_bsd/softfloat/nedf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: nedf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/nedf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __nedf2(float64, float64);
-
-flag
-__nedf2(float64 a, float64 b)
-{
-
-	/* libgcc1.c says a != b */
-	return !float64_eq(a, b);
-}
diff --git a/lib/libc_bsd/softfloat/negdf2.c b/lib/libc_bsd/softfloat/negdf2.c
deleted file mode 100644
index 32e4531..0000000
--- a/lib/libc_bsd/softfloat/negdf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: negdf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/negdf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-float64 __negdf2(float64);
-
-float64
-__negdf2(float64 a)
-{
-
-	/* libgcc1.c says -a */
-	return a ^ FLOAT64_MANGLE(0x8000000000000000ULL);
-}
diff --git a/lib/libc_bsd/softfloat/negsf2.c b/lib/libc_bsd/softfloat/negsf2.c
deleted file mode 100644
index 72ad793..0000000
--- a/lib/libc_bsd/softfloat/negsf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: negsf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/negsf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-float32 __negsf2(float32);
-
-float32
-__negsf2(float32 a)
-{
-
-	/* libgcc1.c says INTIFY(-a) */
-	return a ^ 0x80000000;
-}
diff --git a/lib/libc_bsd/softfloat/negtf2.c b/lib/libc_bsd/softfloat/negtf2.c
deleted file mode 100644
index a196225..0000000
--- a/lib/libc_bsd/softfloat/negtf2.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* $NetBSD: negtf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/negtf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOAT128
-
-float128 __negtf2(float128);
-
-float128
-__negtf2(float128 a)
-{
-
-	/* libgcc1.c says -a */
-	a.high ^= FLOAT64_MANGLE(0x8000000000000000ULL);
-	return a;
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc_bsd/softfloat/negxf2.c b/lib/libc_bsd/softfloat/negxf2.c
deleted file mode 100644
index b9534c0..0000000
--- a/lib/libc_bsd/softfloat/negxf2.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $NetBSD: negxf2.c,v 1.2 2004/09/27 10:16:24 he Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/negxf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOATX80
-
-floatx80 __negxf2(floatx80);
-
-floatx80
-__negxf2(floatx80 a)
-{
-
-	/* libgcc1.c says -a */
-	return __mulxf3(a,__floatsixf(-1));
-}
-#endif /* FLOATX80 */
diff --git a/lib/libc_bsd/softfloat/nesf2.c b/lib/libc_bsd/softfloat/nesf2.c
deleted file mode 100644
index 3e03d7e..0000000
--- a/lib/libc_bsd/softfloat/nesf2.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* $NetBSD: nesf2.c,v 1.1 2000/06/06 08:15:07 bjh21 Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/nesf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __nesf2(float32, float32);
-
-flag
-__nesf2(float32 a, float32 b)
-{
-
-	/* libgcc1.c says a != b */
-	return !float32_eq(a, b);
-}
diff --git a/lib/libc_bsd/softfloat/netf2.c b/lib/libc_bsd/softfloat/netf2.c
deleted file mode 100644
index 6176994..0000000
--- a/lib/libc_bsd/softfloat/netf2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $NetBSD: netf2.c,v 1.1 2011/01/17 10:08:35 matt Exp $ */
-
-/*
- * Written by Matt Thomas, 2011.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/netf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOAT128
-
-flag __netf2(float128, float128);
-
-flag
-__netf2(float128 a, float128 b)
-{
-
-	/* libgcc1.c says a != b */
-	return !float128_eq(a, b);
-}
-
-#endif /* FLOAT128 */
diff --git a/lib/libc_bsd/softfloat/nexf2.c b/lib/libc_bsd/softfloat/nexf2.c
deleted file mode 100644
index 3308c10..0000000
--- a/lib/libc_bsd/softfloat/nexf2.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $NetBSD: nexf2.c,v 1.2 2004/09/27 10:16:24 he Exp $ */
-
-/*
- * Written by Ben Harris, 2000.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/nexf2.c 230363 2012-01-20 06:16:14Z das $");
-
-#ifdef FLOATX80
-
-flag __nexf2(floatx80, floatx80);
-
-flag
-__nexf2(floatx80 a, floatx80 b)
-{
-
-	/* libgcc1.c says a != b */
-	return !floatx80_eq(a, b);
-}
-#endif /* FLOATX80 */
diff --git a/lib/libc_bsd/softfloat/softfloat-for-gcc.h b/lib/libc_bsd/softfloat/softfloat-for-gcc.h
deleted file mode 100644
index d0d1369..0000000
--- a/lib/libc_bsd/softfloat/softfloat-for-gcc.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* $NetBSD: softfloat-for-gcc.h,v 1.8 2009/12/14 01:07:42 matt Exp $ */
-/* $FreeBSD: releng/10.2/lib/libc/softfloat/softfloat-for-gcc.h 230363 2012-01-20 06:16:14Z das $ */
-
-/*
- * Move private identifiers with external linkage into implementation
- * namespace.  -- Klaus Klein <kleink@NetBSD.org>, May 5, 1999
- */
-#define float_exception_flags	__softfloat_float_exception_flags
-#define float_exception_mask	__softfloat_float_exception_mask
-#define float_rounding_mode	__softfloat_float_rounding_mode
-#define float_raise		__softfloat_float_raise
-/* The following batch are called by GCC through wrappers */
-#define float32_eq		__softfloat_float32_eq
-#define float32_le		__softfloat_float32_le
-#define float32_lt		__softfloat_float32_lt
-#define float64_eq		__softfloat_float64_eq
-#define float64_le		__softfloat_float64_le
-#define float64_lt		__softfloat_float64_lt
-#define float128_eq		__softfloat_float128_eq
-#define float128_le		__softfloat_float128_le
-#define float128_lt		__softfloat_float128_lt
-
-/*
- * Macros to define functions with the GCC expected names
- */
-
-#define float32_add			__addsf3
-#define float64_add			__adddf3
-#define floatx80_add			__addxf3
-#define float128_add			__addtf3
-
-#define float32_sub			__subsf3
-#define float64_sub			__subdf3
-#define floatx80_sub			__subxf3
-#define float128_sub			__subtf3
-
-#define float32_mul			__mulsf3
-#define float64_mul			__muldf3
-#define floatx80_mul			__mulxf3
-#define float128_mul			__multf3
-
-#define float32_div			__divsf3
-#define float64_div			__divdf3
-#define floatx80_div			__divxf3
-#define float128_div			__divtf3
-
-#if 0
-#define float32_neg			__negsf2
-#define float64_neg			__negdf2
-#define floatx80_neg			__negxf2
-#define float128_neg			__negtf2
-#endif
-
-#define int32_to_float32		__floatsisf
-#define int32_to_float64		__floatsidf
-#define int32_to_floatx80		__floatsixf
-#define int32_to_float128		__floatsitf
-
-#define int64_to_float32		__floatdisf
-#define int64_to_float64		__floatdidf
-#define int64_to_floatx80		__floatdixf
-#define int64_to_float128		__floatditf
-
-#define int128_to_float32		__floattisf
-#define int128_to_float64		__floattidf
-#define int128_to_floatx80		__floattixf
-#define int128_to_float128		__floattitf
-
-#define uint32_to_float32		__floatunsisf
-#define uint32_to_float64		__floatunsidf
-#define uint32_to_floatx80		__floatunsixf
-#define uint32_to_float128		__floatunsitf
-
-#define uint64_to_float32		__floatundisf
-#define uint64_to_float64		__floatundidf
-#define uint64_to_floatx80		__floatundixf
-#define uint64_to_float128		__floatunditf
-
-#define uint128_to_float32		__floatuntisf
-#define uint128_to_float64		__floatuntidf
-#define uint128_to_floatx80		__floatuntixf
-#define uint128_to_float128		__floatuntitf
-
-#define float32_to_int32_round_to_zero	__fixsfsi
-#define float64_to_int32_round_to_zero	__fixdfsi
-#define floatx80_to_int32_round_to_zero __fixxfsi
-#define float128_to_int32_round_to_zero __fixtfsi
-
-#define float32_to_int64_round_to_zero	__fixsfdi
-#define float64_to_int64_round_to_zero	__fixdfdi
-#define floatx80_to_int64_round_to_zero	__fixxfdi
-#define float128_to_int64_round_to_zero	__fixtfdi
-
-#define float32_to_int128_round_to_zero __fixsfti
-#define float64_to_int128_round_to_zero __fixdfti
-#define floatx80_to_int128_round_to_zero __fixxfti
-#define float128_to_int128_round_to_zero __fixtfti
-
-#define float32_to_uint32_round_to_zero	__fixunssfsi
-#define float64_to_uint32_round_to_zero	__fixunsdfsi
-#define floatx80_to_uint32_round_to_zero	__fixunsxfsi
-#define float128_to_uint32_round_to_zero	__fixunstfsi
-
-#define float32_to_uint64_round_to_zero	__fixunssfdi
-#define float64_to_uint64_round_to_zero	__fixunsdfdi
-#define floatx80_to_uint64_round_to_zero	__fixunsxfdi
-#define float128_to_uint64_round_to_zero	__fixunstfdi
-
-#define float32_to_uint128_round_to_zero	__fixunssfti
-#define float64_to_uint128_round_to_zero	__fixunsdfti
-#define floatx80_to_uint128_round_to_zero	__fixunsxfti
-#define float128_to_uint128_round_to_zero	__fixunstfti
-
-#define float32_to_float64		__extendsfdf2
-#define float32_to_floatx80		__extendsfxf2
-#define float32_to_float128		__extendsftf2
-#define float64_to_floatx80		__extenddfxf2
-#define float64_to_float128		__extenddftf2
-
-#define float128_to_float64		__trunctfdf2
-#define floatx80_to_float64		__truncxfdf2
-#define float128_to_float32		__trunctfsf2
-#define floatx80_to_float32		__truncxfsf2
-#define float64_to_float32		__truncdfsf2
-
-#if 0
-#define float32_cmp			__cmpsf2
-#define float32_unord			__unordsf2
-#define float32_eq			__eqsf2
-#define float32_ne			__nesf2
-#define float32_ge			__gesf2
-#define float32_lt			__ltsf2
-#define float32_le			__lesf2
-#define float32_gt			__gtsf2
-#endif
-
-#if 0
-#define float64_cmp			__cmpdf2
-#define float64_unord			__unorddf2
-#define float64_eq			__eqdf2
-#define float64_ne			__nedf2
-#define float64_ge			__gedf2
-#define float64_lt			__ltdf2
-#define float64_le			__ledf2
-#define float64_gt			__gtdf2
-#endif
-
-/* XXX not in libgcc */
-#if 1
-#define floatx80_cmp			__cmpxf2
-#define floatx80_unord			__unordxf2
-#define floatx80_eq			__eqxf2
-#define floatx80_ne			__nexf2
-#define floatx80_ge			__gexf2
-#define floatx80_lt			__ltxf2
-#define floatx80_le			__lexf2
-#define floatx80_gt			__gtxf2
-#endif
-
-#if 0
-#define float128_cmp			__cmptf2
-#define float128_unord			__unordtf2
-#define float128_eq			__eqtf2
-#define float128_ne			__netf2
-#define float128_ge			__getf2
-#define float128_lt			__lttf2
-#define float128_le			__letf2
-#define float128_gt			__gttf2
-#endif
diff --git a/lib/libc_bsd/softfloat/softfloat-history.txt b/lib/libc_bsd/softfloat/softfloat-history.txt
deleted file mode 100644
index 3b6cc41..0000000
--- a/lib/libc_bsd/softfloat/softfloat-history.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: softfloat-history.txt,v 1.1 2000/06/06 08:15:08 bjh21 Exp $
-$FreeBSD: releng/10.2/lib/libc/softfloat/softfloat-history.txt 129203 2004-05-14 12:13:06Z cognet $
-
-History of Major Changes to SoftFloat, up to Release 2a
-
-John R. Hauser
-1998 December 16
-
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Release 2a (1998 December)
-
--- Added functions to convert between 64-bit integers (int64) and all
-   supported floating-point formats.
-
--- Fixed a bug in all 64-bit-version square root functions except
-   `float32_sqrt' that caused the result sometimes to be off by 1 unit in
-   the last place (1 ulp) from what it should be.  (Bug discovered by Paul
-   Donahue.)
-
--- Improved the makefiles.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Release 2 (1997 June)
-
--- Created the 64-bit (bits64) version, adding the floatx80 and float128
-   formats.
-
--- Changed the source directory structure, splitting the sources into a
-   `bits32' and a `bits64' version.  Renamed `environment.h' to `milieu.h'
-   (to avoid confusion with environment variables).
-
--- Fixed a small error that caused `float64_round_to_int' often to round the
-   wrong way in nearest/even mode when the operand was between 2^20 and 2^21
-   and halfway between two integers.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Release 1a (1996 July)
-
--- Corrected a mistake that caused borderline underflow cases not to raise
-   the underflow flag when they should have.  (Problem reported by Doug
-   Priest.)
-
--- Added the `float_detect_tininess' variable to control whether tininess is
-   detected before or after rounding.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Release 1 (1996 July)
-
--- Original release.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
diff --git a/lib/libc_bsd/softfloat/softfloat-source.txt b/lib/libc_bsd/softfloat/softfloat-source.txt
deleted file mode 100644
index 9a3dceb..0000000
--- a/lib/libc_bsd/softfloat/softfloat-source.txt
+++ /dev/null
@@ -1,384 +0,0 @@
-$NetBSD: softfloat-source.txt,v 1.2 2006/11/24 19:46:58 christos Exp $
-$FreeBSD: releng/10.2/lib/libc/softfloat/softfloat-source.txt 230363 2012-01-20 06:16:14Z das $
-
-SoftFloat Release 2a Source Documentation
-
-John R. Hauser
-1998 December 14
-
-
--------------------------------------------------------------------------------
-Introduction
-
-SoftFloat is a software implementation of floating-point that conforms to
-the IEC/IEEE Standard for Binary Floating-Point Arithmetic.  SoftFloat can
-support four floating-point formats:  single precision, double precision,
-extended double precision, and quadruple precision.  All operations required
-by the IEEE Standard are implemented, except for conversions to and from
-decimal.  SoftFloat is distributed in the form of C source code, so a
-C compiler is needed to compile the code.  Support for the extended double-
-precision and quadruple-precision formats is dependent on the C compiler
-implementing a 64-bit integer type.
-
-This document gives information needed for compiling and/or porting
-SoftFloat.
-
-The source code for SoftFloat is intended to be relatively machine-
-independent and should be compilable using any ISO/ANSI C compiler.  At the
-time of this writing, SoftFloat has been successfully compiled with the GNU
-C Compiler (`gcc') for several platforms.
-
-
--------------------------------------------------------------------------------
-Limitations
-
-SoftFloat as written requires an ISO/ANSI-style C compiler.  No attempt has
-been made to accommodate compilers that are not ISO-conformant.  Older ``K&R-
-style'' compilers are not adequate for compiling SoftFloat.  All testing I
-have done so far has been with the GNU C Compiler.  Compilation with other
-compilers should be possible but has not been tested.
-
-The SoftFloat sources assume that source code file names can be longer than
-8 characters.  In order to compile under an MS-DOS-type system, many of the
-source files will need to be renamed, and the source and makefiles edited
-appropriately.  Once compiled, the SoftFloat binary does not depend on the
-existence of long file names.
-
-The underlying machine is assumed to be binary with a word size that is a
-power of 2.  Bytes are 8 bits.  Support for the extended double-precision
-and quadruple-precision formats depends on the C compiler implementing
-a 64-bit integer type.  If the largest integer type supported by the
-C compiler is 32 bits, SoftFloat is limited to the single- and double-
-precision formats.
-
-
--------------------------------------------------------------------------------
-Contents
-
-    Introduction
-    Limitations
-    Contents
-    Legal Notice
-    SoftFloat Source Directory Structure
-    SoftFloat Source Files
-        processors/*.h
-        softfloat/bits*/*/softfloat.h
-        softfloat/bits*/*/milieu.h
-        softfloat/bits*/*/softfloat-specialize
-        softfloat/bits*/softfloat-macros
-        softfloat/bits*/softfloat.c
-    Steps to Creating a `softfloat.o'
-    Making `softfloat.o' a Library
-    Testing SoftFloat
-    Timing SoftFloat
-    Compiler Options and Efficiency
-    Processor-Specific Optimization of `softfloat.c' Using `softfloat-macros'
-    Contact Information
-
-
-
--------------------------------------------------------------------------------
-Legal Notice
-
-SoftFloat was written by John R. Hauser.  This work was made possible in
-part by the International Computer Science Institute, located at Suite 600,
-1947 Center Street, Berkeley, California 94704.  Funding was partially
-provided by the National Science Foundation under grant MIP-9311980.  The
-original version of this code was written as part of a project to build
-a fixed-point vector processor in collaboration with the University of
-California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-
--------------------------------------------------------------------------------
-SoftFloat Source Directory Structure
-
-Because SoftFloat is targeted to multiple platforms, its source code
-is slightly scattered between target-specific and target-independent
-directories and files.  The directory structure is as follows:
-
-    processors
-    softfloat
-        bits64
-            templates
-            386-Win32-gcc
-            SPARC-Solaris-gcc
-        bits32
-            templates
-            386-Win32-gcc
-            SPARC-Solaris-gcc
-
-The two topmost directories and their contents are:
-
-    softfloat    - Most of the source code needed for SoftFloat.
-    processors   - Target-specific header files that are not specific to
-                       SoftFloat.
-
-The `softfloat' directory is further split into two parts:
-
-    bits64       - SoftFloat implementation using 64-bit integers.
-    bits32       - SoftFloat implementation using only 32-bit integers.
-
-Within these directories are subdirectories for each of the targeted
-platforms.  The SoftFloat source code is distributed with targets
-`386-Win32-gcc' and `SPARC-Solaris-gcc' (and perhaps others) already
-prepared for both the 32-bit and 64-bit implementations.  Source files that
-are not within these target-specific subdirectories are intended to be
-target-independent.
-
-The naming convention used for the target-specific directories is
-`<processor>-<executable-type>-<compiler>'.  The names of the supplied
-target directories should be interpreted as follows:
-
-  <processor>:
-    386          - Intel 386-compatible processor.
-    SPARC        - SPARC processor (as used by Sun machines).
-  <executable-type>:
-    Win32        - Microsoft Win32 executable.
-    Solaris      - Sun Solaris executable.
-  <compiler>:
-    gcc          - GNU C Compiler.
-
-You do not need to maintain this convention if you do not want to.
-
-Alongside the supplied target-specific directories is a `templates'
-directory containing a set of ``generic'' target-specific source files.  A
-new target directory can be created by copying the `templates' directory and
-editing the files inside.  (Complete instructions for porting SoftFloat to a
-new target are in the section _Steps_to_Creating_a_`softfloat.o'_.)  Note
-that the `templates' directory will not work as a target directory without
-some editing.  To avoid confusion, it would be wise to refrain from editing
-the files inside `templates' directly.
-
-
--------------------------------------------------------------------------------
-SoftFloat Source Files
-
-The purpose of each source file is described below.  In the following,
-the `*' symbol is used in place of the name of a specific target, such as
-`386-Win32-gcc' or `SPARC-Solaris-gcc', or in place of some other text, as
-in `bits*' for either `bits32' or `bits64'.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-processors/*.h
-
-The target-specific `processors' header file defines integer types
-of various sizes, and also defines certain C preprocessor macros that
-characterize the target.  The two examples supplied are `386-gcc.h' and
-`SPARC-gcc.h'.  The naming convention used for processor header files is
-`<processor>-<compiler>.h'.
-
-If 64-bit integers are supported by the compiler, the macro name `BITS64'
-should be defined here along with the corresponding 64-bit integer
-types.  In addition, the function-like macro `LIT64' must be defined for
-constructing 64-bit integer literals (constants).  The `LIT64' macro is used
-consistently in the SoftFloat code to annotate 64-bit literals.
-
-If `BITS64' is not defined, only the 32-bit version of SoftFloat can be
-compiled.  If `BITS64' _is_ defined, either can be compiled.
-
-If an inlining attribute (such as an `inline' keyword) is provided by the
-compiler, the macro `INLINE' should be defined to the appropriate keyword.
-If not, `INLINE' can be set to the keyword `static'.  The `INLINE' macro
-appears in the SoftFloat source code before every function that should
-be inlined by the compiler.  SoftFloat depends on inlining to obtain
-good speed.  Even if inlining cannot be forced with a language keyword,
-the compiler may still be able to perform inlining on its own as an
-optimization.  If a command-line option is needed to convince the compiler
-to perform this optimization, this should be assured in the makefile.  (See
-the section _Compiler_Options_and_Efficiency_ below.)
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/*/softfloat.h
-
-The target-specific `softfloat.h' header file defines the SoftFloat
-interface as seen by clients.
-
-Unlike the actual function definitions in `softfloat.c', the declarations
-in `softfloat.h' do not use any of the types defined by the `processors'
-header file.  This is done so that clients will not have to include the
-`processors' header file in order to use SoftFloat.  Nevertheless, the
-target-specific declarations in `softfloat.h' must match what `softfloat.c'
-expects.  For example, if `int32' is defined as `int' in the `processors'
-header file, then in `softfloat.h' the output of `float32_to_int32' should
-be stated as `int', although in `softfloat.c' it is given in target-
-independent form as `int32'.
-
-For the `bits64' implementation of SoftFloat, the macro names `FLOATX80' and
-`FLOAT128' must be defined in order for the extended double-precision and
-quadruple-precision formats to be enabled in the code.  Conversely, either
-or both of the extended formats can be disabled by simply removing the
-`#define' of the respective macro.  When an extended format is not enabled,
-none of the functions that either input or output the format are defined,
-and no space is taken up in `softfloat.o' by such functions.  There is no
-provision for disabling the usual single- and double-precision formats.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/*/milieu.h
-
-The target-specific `milieu.h' header file provides declarations that are
-needed to compile SoftFloat.  In addition, deviations from ISO/ANSI C by
-the compiler (such as names not properly declared in system header files)
-are corrected in this header if possible.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/*/softfloat-specialize
-
-This target-specific C source fragment defines:
-
--- whether tininess for underflow is detected before or after rounding by
-       default;
--- what (if anything) special happens when exceptions are raised;
--- how signaling NaNs are distinguished from quiet NaNs;
--- the default generated quiet NaNs; and
--- how NaNs are propagated from function inputs to output.
-
-These details are not decided by the IEC/IEEE Standard.  This fragment is
-included verbatim within `softfloat.c' when SoftFloat is compiled.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/softfloat-macros
-
-This target-independent C source fragment defines a number of arithmetic
-functions used as primitives within the `softfloat.c' source.  Most of the
-functions defined here are intended to be inlined for efficiency.  This
-fragment is included verbatim within `softfloat.c' when SoftFloat is
-compiled.
-
-Target-specific variations on this file are possible.  See the section
-_Processor-Specific_Optimization_of_`softfloat.c'_Using_`softfloat-macros'_
-below.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-softfloat/bits*/softfloat.c
-
-The target-independent `softfloat.c' source file contains the body of the
-SoftFloat implementation.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-The inclusion of the files above within each other (using `#include') can be
-shown graphically as follows:
-
-    softfloat/bits*/softfloat.c
-        softfloat/bits*/*/milieu.h
-            processors/*.h
-        softfloat/bits*/*/softfloat.h
-        softfloat/bits*/*/softfloat-specialize
-        softfloat/bits*/softfloat-macros
-
-Note in particular that `softfloat.c' does not include the `processors'
-header file directly.  Rather, `softfloat.c' includes the target-specific
-`milieu.h' header file, which in turn includes the processor header file.
-
-
--------------------------------------------------------------------------------
-Steps to Creating a `softfloat.o'
-
-Porting and/or compiling SoftFloat involves the following steps:
-
-1. If one does not already exist, create an appropriate `.h' file in the
-   `processors' directory.
-
-2. If `BITS64' is defined in the `processors' header file, choose whether
-   to compile the 32-bit or 64-bit implementation of SoftFloat.  If
-   `BITS64' is not defined, your only choice is the 32-bit implementation.
-   The remaining steps occur within either the `bits32' or `bits64'
-   subdirectories.
-
-3. If one does not already exist, create an appropriate target-specific
-   subdirectory by copying the given `templates' directory.
-
-4. In the target-specific subdirectory, edit the files `softfloat-specialize'
-   and `softfloat.h' to define the desired exception handling functions
-   and mode control values.  In the `softfloat.h' header file, ensure also
-   that all declarations give the proper target-specific type (such as
-   `int' or `long') corresponding to the target-independent type used in
-   `softfloat.c' (such as `int32').  None of the type names declared in the
-   `processors' header file should appear in `softfloat.h'.
-
-5. In the target-specific subdirectory, edit the files `milieu.h' and
-   `Makefile' to reflect the current environment.
-
-6. In the target-specific subdirectory, execute `make'.
-
-For the targets that are supplied, if the expected compiler is available
-(usually `gcc'), it should only be necessary to execute `make' in the
-target-specific subdirectory.
-
-
--------------------------------------------------------------------------------
-Making `softfloat.o' a Library
-
-SoftFloat is not made into a software library by the supplied makefile.
-If desired, `softfloat.o' can easily be put into its own library (in Unix,
-`softfloat.a') using the usual system tool (in Unix, `ar').
-
-
--------------------------------------------------------------------------------
-Testing SoftFloat
-
-SoftFloat can be tested using the `testsoftfloat' program by the same
-author.  The `testsoftfloat' program is part of the TestFloat package
-available at the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/
-TestFloat.html'.
-
-
--------------------------------------------------------------------------------
-Timing SoftFloat
-
-A program called `timesoftfloat' for timing the SoftFloat functions is
-included with the SoftFloat source code.  Compiling `timesoftfloat' should
-pose no difficulties once `softfloat.o' exists.  The supplied makefile
-will create a `timesoftfloat' executable by default after generating
-`softfloat.o'.  See `timesoftfloat.txt' for documentation about using
-`timesoftfloat'.
-
-
--------------------------------------------------------------------------------
-Compiler Options and Efficiency
-
-In order to get good speed with SoftFloat, it is important that the compiler
-inline the routines that have been marked `INLINE' in the code.  Even if
-inlining cannot be forced by an appropriate definition of the `INLINE'
-macro, the compiler may still be able to perform inlining on its own as
-an optimization.  In that case, the makefile should be edited to give the
-compiler whatever option is required to cause it to inline small functions.
-
-The ability of the processor to do fast shifts has been assumed.  Efficiency
-will not be as good on processors for which this is not the case (such as
-the original Motorola 68000 or Intel 8086 processors).
-
-
--------------------------------------------------------------------------------
-Processor-Specific Optimization of `softfloat.c' Using `softfloat-macros'
-
-The `softfloat-macros' source fragment defines arithmetic functions used
-as primitives by `softfloat.c'.  This file has been written in a target-
-independent form.  For a given target, it may be possible to improve on
-these functions using target-specific and/or non-ISO-C features (such
-as `asm' statements).  For example, one of the ``macro'' functions takes
-two word-size integers and returns their full product in two words.
-This operation can be done directly in hardware on many processors; but
-because it is not available through standard C, the function defined in
-`softfloat-macros' uses four multiplies to achieve the same result.
-
-To address these shortcomings, a customized version of `softfloat-macros'
-can be created in any of the target-specific subdirectories.  A simple
-modification to the target's makefile should be sufficient to ensure that
-the custom version is used instead of the generic one.
-
-
--------------------------------------------------------------------------------
-Contact Information
-
-At the time of this writing, the most up-to-date information about
-SoftFloat and the latest release can be found at the Web page `http://
-HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/SoftFloat.html'.
-
-
diff --git a/lib/libc_bsd/softfloat/softfloat-specialize b/lib/libc_bsd/softfloat/softfloat-specialize
deleted file mode 100644
index 628475d..0000000
--- a/lib/libc_bsd/softfloat/softfloat-specialize
+++ /dev/null
@@ -1,521 +0,0 @@
-/*	$NetBSD: softfloat-specialize,v 1.6 2011/03/06 10:27:37 martin Exp $	*/
-/* $FreeBSD: releng/10.2/lib/libc/softfloat/softfloat-specialize 230363 2012-01-20 06:16:14Z das $ */
-
-/* This is a derivative work. */
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#include <signal.h>
-#include <string.h>
-#include <unistd.h>
-
-/*
--------------------------------------------------------------------------------
-Underflow tininess-detection mode, statically initialized to default value.
-(The declaration in `softfloat.h' must match the `int8' type here.)
--------------------------------------------------------------------------------
-*/
-#ifdef SOFTFLOAT_FOR_GCC
-static
-#endif
-#ifdef __sparc64__
-int8 float_detect_tininess = float_tininess_before_rounding;
-#else
-int8 float_detect_tininess = float_tininess_after_rounding;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Raises the exceptions specified by `flags'.  Floating-point traps can be
-defined here if desired.  It is currently not possible for such a trap to
-substitute a result value.  If traps are not implemented, this routine
-should be simply `float_exception_flags |= flags;'.
--------------------------------------------------------------------------------
-*/
-#ifdef SOFTFLOAT_FOR_GCC
-#define float_exception_mask	__softfloat_float_exception_mask
-#endif
-int float_exception_mask = 0;
-void float_raise( int flags )
-{
-
-    float_exception_flags |= flags;
-
-    if ( flags & float_exception_mask ) {
-#if 0
-	siginfo_t info;
-	memset(&info, 0, sizeof info);
-	info.si_signo = SIGFPE;
-	info.si_pid = getpid();
-	info.si_uid = geteuid();
-	if (flags & float_flag_underflow)
-	    info.si_code = FPE_FLTUND;
-	else if (flags & float_flag_overflow)
-	    info.si_code = FPE_FLTOVF;
-	else if (flags & float_flag_divbyzero)
-	    info.si_code = FPE_FLTDIV;
-	else if (flags & float_flag_invalid)
-	    info.si_code = FPE_FLTINV;
-	else if (flags & float_flag_inexact)
-	    info.si_code = FPE_FLTRES;
-	sigqueueinfo(getpid(), &info);
-#else
-	raise( SIGFPE );
-#endif
-    }
-}
-#undef float_exception_mask
-
-/*
--------------------------------------------------------------------------------
-Internal canonical NaN format.
--------------------------------------------------------------------------------
-*/
-typedef struct {
-    flag sign;
-    bits64 high, low;
-} commonNaNT;
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated single-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float32_default_nan 0xFFFFFFFF
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-#ifdef SOFTFLOAT_FOR_GCC
-static
-#endif
-flag float32_is_nan( float32 a )
-{
-
-    return ( 0xFF000000 < (bits32) ( a<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-#if defined(SOFTFLOAT_FOR_GCC) && !defined(SOFTFLOATSPARC64_FOR_GCC) && \
-    !defined(SOFTFLOAT_M68K_FOR_GCC)
-static
-#endif
-flag float32_is_signaling_nan( float32 a )
-{
-
-    return ( ( ( a>>22 ) & 0x1FF ) == 0x1FE ) && ( a & 0x003FFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float32ToCommonNaN( float32 a )
-{
-    commonNaNT z;
-
-    if ( float32_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a>>31;
-    z.low = 0;
-    z.high = ( (bits64) a )<<41;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the single-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float32 commonNaNToFloat32( commonNaNT a )
-{
-
-    return ( ( (bits32) a.sign )<<31 ) | 0x7FC00000 | ( a.high>>41 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two single-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float32 propagateFloat32NaN( float32 a, float32 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float32_is_nan( a );
-    aIsSignalingNaN = float32_is_signaling_nan( a );
-    bIsNaN = float32_is_nan( b );
-    bIsSignalingNaN = float32_is_signaling_nan( b );
-    a |= 0x00400000;
-    b |= 0x00400000;
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated double-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float64_default_nan LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-#ifdef SOFTFLOAT_FOR_GCC
-static
-#endif
-flag float64_is_nan( float64 a )
-{
-
-    return ( LIT64( 0xFFE0000000000000 ) <
-	     (bits64) ( FLOAT64_DEMANGLE(a)<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-#if defined(SOFTFLOAT_FOR_GCC) && !defined(SOFTFLOATSPARC64_FOR_GCC) && \
-    !defined(SOFTFLOATM68K_FOR_GCC)
-static
-#endif
-flag float64_is_signaling_nan( float64 a )
-{
-
-    return
-           ( ( ( FLOAT64_DEMANGLE(a)>>51 ) & 0xFFF ) == 0xFFE )
-        && ( FLOAT64_DEMANGLE(a) & LIT64( 0x0007FFFFFFFFFFFF ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float64ToCommonNaN( float64 a )
-{
-    commonNaNT z;
-
-    if ( float64_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = FLOAT64_DEMANGLE(a)>>63;
-    z.low = 0;
-    z.high = FLOAT64_DEMANGLE(a)<<12;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the double-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float64 commonNaNToFloat64( commonNaNT a )
-{
-
-    return FLOAT64_MANGLE(
-	( ( (bits64) a.sign )<<63 )
-        | LIT64( 0x7FF8000000000000 )
-        | ( a.high>>12 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two double-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float64 propagateFloat64NaN( float64 a, float64 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float64_is_nan( a );
-    aIsSignalingNaN = float64_is_signaling_nan( a );
-    bIsNaN = float64_is_nan( b );
-    bIsSignalingNaN = float64_is_signaling_nan( b );
-    a |= FLOAT64_MANGLE(LIT64( 0x0008000000000000 ));
-    b |= FLOAT64_MANGLE(LIT64( 0x0008000000000000 ));
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated extended double-precision NaN.  The
-`high' and `low' values hold the most- and least-significant bits,
-respectively.
--------------------------------------------------------------------------------
-*/
-#define floatx80_default_nan_high 0xFFFF
-#define floatx80_default_nan_low  LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_nan( floatx80 a )
-{
-
-    return ( ( a.high & 0x7FFF ) == 0x7FFF ) && (bits64) ( a.low<<1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-signaling NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_signaling_nan( floatx80 a )
-{
-    bits64 aLow;
-
-    aLow = a.low & ~ LIT64( 0x4000000000000000 );
-    return
-           ( ( a.high & 0x7FFF ) == 0x7FFF )
-        && (bits64) ( aLow<<1 )
-        && ( a.low == aLow );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point NaN `a' to the canonical NaN format.  If `a' is a signaling NaN, the
-invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT floatx80ToCommonNaN( floatx80 a )
-{
-    commonNaNT z;
-
-    if ( floatx80_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a.high>>15;
-    z.low = 0;
-    z.high = a.low<<1;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the extended
-double-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static floatx80 commonNaNToFloatx80( commonNaNT a )
-{
-    floatx80 z;
-
-    z.low = LIT64( 0xC000000000000000 ) | ( a.high>>1 );
-    z.high = ( ( (bits16) a.sign )<<15 ) | 0x7FFF;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two extended double-precision floating-point values `a' and `b', one
-of which is a NaN, and returns the appropriate NaN result.  If either `a' or
-`b' is a signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static floatx80 propagateFloatx80NaN( floatx80 a, floatx80 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = floatx80_is_nan( a );
-    aIsSignalingNaN = floatx80_is_signaling_nan( a );
-    bIsNaN = floatx80_is_nan( b );
-    bIsSignalingNaN = floatx80_is_signaling_nan( b );
-    a.low |= LIT64( 0xC000000000000000 );
-    b.low |= LIT64( 0xC000000000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated quadruple-precision NaN.  The `high' and
-`low' values hold the most- and least-significant bits, respectively.
--------------------------------------------------------------------------------
-*/
-#define float128_default_nan_high LIT64( 0xFFFFFFFFFFFFFFFF )
-#define float128_default_nan_low  LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float128_is_nan( float128 a )
-{
-
-    return
-           ( LIT64( 0xFFFE000000000000 ) <= (bits64) ( a.high<<1 ) )
-        && ( a.low || ( a.high & LIT64( 0x0000FFFFFFFFFFFF ) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is a
-signaling NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float128_is_signaling_nan( float128 a )
-{
-
-    return
-           ( ( ( a.high>>47 ) & 0xFFFF ) == 0xFFFE )
-        && ( a.low || ( a.high & LIT64( 0x00007FFFFFFFFFFF ) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float128ToCommonNaN( float128 a )
-{
-    commonNaNT z;
-
-    if ( float128_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a.high>>63;
-    shortShift128Left( a.high, a.low, 16, &z.high, &z.low );
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the quadruple-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float128 commonNaNToFloat128( commonNaNT a )
-{
-    float128 z;
-
-    shift128Right( a.high, a.low, 16, &z.high, &z.low );
-    z.high |= ( ( (bits64) a.sign )<<63 ) | LIT64( 0x7FFF800000000000 );
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two quadruple-precision floating-point values `a' and `b', one of
-which is a NaN, and returns the appropriate NaN result.  If either `a' or
-`b' is a signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float128 propagateFloat128NaN( float128 a, float128 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float128_is_nan( a );
-    aIsSignalingNaN = float128_is_signaling_nan( a );
-    bIsNaN = float128_is_nan( b );
-    bIsSignalingNaN = float128_is_signaling_nan( b );
-    a.high |= LIT64( 0x0000800000000000 );
-    b.high |= LIT64( 0x0000800000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#endif
-
diff --git a/lib/libc_bsd/softfloat/softfloat.txt b/lib/libc_bsd/softfloat/softfloat.txt
deleted file mode 100644
index 577e852..0000000
--- a/lib/libc_bsd/softfloat/softfloat.txt
+++ /dev/null
@@ -1,373 +0,0 @@
-$NetBSD: softfloat.txt,v 1.2 2006/11/24 19:46:58 christos Exp $
-$FreeBSD: releng/10.2/lib/libc/softfloat/softfloat.txt 230363 2012-01-20 06:16:14Z das $
-
-SoftFloat Release 2a General Documentation
-
-John R. Hauser
-1998 December 13
-
-
--------------------------------------------------------------------------------
-Introduction
-
-SoftFloat is a software implementation of floating-point that conforms to
-the IEC/IEEE Standard for Binary Floating-Point Arithmetic.  As many as four
-formats are supported:  single precision, double precision, extended double
-precision, and quadruple precision.  All operations required by the standard
-are implemented, except for conversions to and from decimal.
-
-This document gives information about the types defined and the routines
-implemented by SoftFloat.  It does not attempt to define or explain the
-IEC/IEEE Floating-Point Standard.  Details about the standard are available
-elsewhere.
-
-
--------------------------------------------------------------------------------
-Limitations
-
-SoftFloat is written in C and is designed to work with other C code.  The
-SoftFloat header files assume an ISO/ANSI-style C compiler.  No attempt
-has been made to accommodate compilers that are not ISO-conformant.  In
-particular, the distributed header files will not be acceptable to any
-compiler that does not recognize function prototypes.
-
-Support for the extended double-precision and quadruple-precision formats
-depends on a C compiler that implements 64-bit integer arithmetic.  If the
-largest integer format supported by the C compiler is 32 bits, SoftFloat is
-limited to only single and double precisions.  When that is the case, all
-references in this document to the extended double precision, quadruple
-precision, and 64-bit integers should be ignored.
-
-
--------------------------------------------------------------------------------
-Contents
-
-    Introduction
-    Limitations
-    Contents
-    Legal Notice
-    Types and Functions
-    Rounding Modes
-    Extended Double-Precision Rounding Precision
-    Exceptions and Exception Flags
-    Function Details
-        Conversion Functions
-        Standard Arithmetic Functions
-        Remainder Functions
-        Round-to-Integer Functions
-        Comparison Functions
-        Signaling NaN Test Functions
-        Raise-Exception Function
-    Contact Information
-
-
-
--------------------------------------------------------------------------------
-Legal Notice
-
-SoftFloat was written by John R. Hauser.  This work was made possible in
-part by the International Computer Science Institute, located at Suite 600,
-1947 Center Street, Berkeley, California 94704.  Funding was partially
-provided by the National Science Foundation under grant MIP-9311980.  The
-original version of this code was written as part of a project to build
-a fixed-point vector processor in collaboration with the University of
-California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-
--------------------------------------------------------------------------------
-Types and Functions
-
-When 64-bit integers are supported by the compiler, the `softfloat.h' header
-file defines four types:  `float32' (single precision), `float64' (double
-precision), `floatx80' (extended double precision), and `float128'
-(quadruple precision).  The `float32' and `float64' types are defined in
-terms of 32-bit and 64-bit integer types, respectively, while the `float128'
-type is defined as a structure of two 64-bit integers, taking into account
-the byte order of the particular machine being used.  The `floatx80' type
-is defined as a structure containing one 16-bit and one 64-bit integer, with
-the machine's byte order again determining the order of the `high' and `low'
-fields.
-
-When 64-bit integers are _not_ supported by the compiler, the `softfloat.h'
-header file defines only two types:  `float32' and `float64'.  Because
-ISO/ANSI C guarantees at least one built-in integer type of 32 bits,
-the `float32' type is identified with an appropriate integer type.  The
-`float64' type is defined as a structure of two 32-bit integers, with the
-machine's byte order determining the order of the fields.
-
-In either case, the types in `softfloat.h' are defined such that if a system
-implements the usual C `float' and `double' types according to the IEC/IEEE
-Standard, then the `float32' and `float64' types should be indistinguishable
-in memory from the native `float' and `double' types.  (On the other hand,
-when `float32' or `float64' values are placed in processor registers by
-the compiler, the type of registers used may differ from those used for the
-native `float' and `double' types.)
-
-SoftFloat implements the following arithmetic operations:
-
--- Conversions among all the floating-point formats, and also between
-   integers (32-bit and 64-bit) and any of the floating-point formats.
-
--- The usual add, subtract, multiply, divide, and square root operations
-   for all floating-point formats.
-
--- For each format, the floating-point remainder operation defined by the
-   IEC/IEEE Standard.
-
--- For each floating-point format, a ``round to integer'' operation that
-   rounds to the nearest integer value in the same format.  (The floating-
-   point formats can hold integer values, of course.)
-
--- Comparisons between two values in the same floating-point format.
-
-The only functions required by the IEC/IEEE Standard that are not provided
-are conversions to and from decimal.
-
-
--------------------------------------------------------------------------------
-Rounding Modes
-
-All four rounding modes prescribed by the IEC/IEEE Standard are implemented
-for all operations that require rounding.  The rounding mode is selected
-by the global variable `float_rounding_mode'.  This variable may be set
-to one of the values `float_round_nearest_even', `float_round_to_zero',
-`float_round_down', or `float_round_up'.  The rounding mode is initialized
-to nearest/even.
-
-
--------------------------------------------------------------------------------
-Extended Double-Precision Rounding Precision
-
-For extended double precision (`floatx80') only, the rounding precision
-of the standard arithmetic operations is controlled by the global variable
-`floatx80_rounding_precision'.  The operations affected are:
-
-   floatx80_add   floatx80_sub   floatx80_mul   floatx80_div   floatx80_sqrt
-
-When `floatx80_rounding_precision' is set to its default value of 80, these
-operations are rounded (as usual) to the full precision of the extended
-double-precision format.  Setting `floatx80_rounding_precision' to 32
-or to 64 causes the operations listed to be rounded to reduced precision
-equivalent to single precision (`float32') or to double precision
-(`float64'), respectively.  When rounding to reduced precision, additional
-bits in the result significand beyond the rounding point are set to zero.
-The consequences of setting `floatx80_rounding_precision' to a value other
-than 32, 64, or 80 is not specified.  Operations other than the ones listed
-above are not affected by `floatx80_rounding_precision'.
-
-
--------------------------------------------------------------------------------
-Exceptions and Exception Flags
-
-All five exception flags required by the IEC/IEEE Standard are
-implemented.  Each flag is stored as a unique bit in the global variable
-`float_exception_flags'.  The positions of the exception flag bits within
-this variable are determined by the bit masks `float_flag_inexact',
-`float_flag_underflow', `float_flag_overflow', `float_flag_divbyzero', and
-`float_flag_invalid'.  The exception flags variable is initialized to all 0,
-meaning no exceptions.
-
-An individual exception flag can be cleared with the statement
-
-    float_exception_flags &= ~ float_flag_<exception>;
-
-where `<exception>' is the appropriate name.  To raise a floating-point
-exception, the SoftFloat function `float_raise' should be used (see below).
-
-In the terminology of the IEC/IEEE Standard, SoftFloat can detect tininess
-for underflow either before or after rounding.  The choice is made by
-the global variable `float_detect_tininess', which can be set to either
-`float_tininess_before_rounding' or `float_tininess_after_rounding'.
-Detecting tininess after rounding is better because it results in fewer
-spurious underflow signals.  The other option is provided for compatibility
-with some systems.  Like most systems, SoftFloat always detects loss of
-accuracy for underflow as an inexact result.
-
-
--------------------------------------------------------------------------------
-Function Details
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Conversion Functions
-
-All conversions among the floating-point formats are supported, as are all
-conversions between a floating-point format and 32-bit and 64-bit signed
-integers.  The complete set of conversion functions is:
-
-   int32_to_float32      int64_to_float32
-   int32_to_float64      int64_to_float32
-   int32_to_floatx80     int64_to_floatx80
-   int32_to_float128     int64_to_float128
-
-   float32_to_int32      float32_to_int64
-   float32_to_int32      float64_to_int64
-   floatx80_to_int32     floatx80_to_int64
-   float128_to_int32     float128_to_int64
-
-   float32_to_float64    float32_to_floatx80   float32_to_float128
-   float64_to_float32    float64_to_floatx80   float64_to_float128
-   floatx80_to_float32   floatx80_to_float64   floatx80_to_float128
-   float128_to_float32   float128_to_float64   float128_to_floatx80
-
-Each conversion function takes one operand of the appropriate type and
-returns one result.  Conversions from a smaller to a larger floating-point
-format are always exact and so require no rounding.  Conversions from 32-bit
-integers to double precision and larger formats are also exact, and likewise
-for conversions from 64-bit integers to extended double and quadruple
-precisions.
-
-Conversions from floating-point to integer raise the invalid exception if
-the source value cannot be rounded to a representable integer of the desired
-size (32 or 64 bits).  If the floating-point operand is a NaN, the largest
-positive integer is returned.  Otherwise, if the conversion overflows, the
-largest integer with the same sign as the operand is returned.
-
-On conversions to integer, if the floating-point operand is not already an
-integer value, the operand is rounded according to the current rounding
-mode as specified by `float_rounding_mode'.  Because C (and perhaps other
-languages) require that conversions to integers be rounded toward zero, the
-following functions are provided for improved speed and convenience:
-
-   float32_to_int32_round_to_zero    float32_to_int64_round_to_zero
-   float64_to_int32_round_to_zero    float64_to_int64_round_to_zero
-   floatx80_to_int32_round_to_zero   floatx80_to_int64_round_to_zero
-   float128_to_int32_round_to_zero   float128_to_int64_round_to_zero
-
-These variant functions ignore `float_rounding_mode' and always round toward
-zero.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Standard Arithmetic Functions
-
-The following standard arithmetic functions are provided:
-
-   float32_add    float32_sub    float32_mul    float32_div    float32_sqrt
-   float64_add    float64_sub    float64_mul    float64_div    float64_sqrt
-   floatx80_add   floatx80_sub   floatx80_mul   floatx80_div   floatx80_sqrt
-   float128_add   float128_sub   float128_mul   float128_div   float128_sqrt
-
-Each function takes two operands, except for `sqrt' which takes only one.
-The operands and result are all of the same type.
-
-Rounding of the extended double-precision (`floatx80') functions is affected
-by the `floatx80_rounding_precision' variable, as explained above in the
-section _Extended_Double-Precision_Rounding_Precision_.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Remainder Functions
-
-For each format, SoftFloat implements the remainder function according to
-the IEC/IEEE Standard.  The remainder functions are:
-
-   float32_rem
-   float64_rem
-   floatx80_rem
-   float128_rem
-
-Each remainder function takes two operands.  The operands and result are all
-of the same type.  Given operands x and y, the remainder functions return
-the value x - n*y, where n is the integer closest to x/y.  If x/y is exactly
-halfway between two integers, n is the even integer closest to x/y.  The
-remainder functions are always exact and so require no rounding.
-
-Depending on the relative magnitudes of the operands, the remainder
-functions can take considerably longer to execute than the other SoftFloat
-functions.  This is inherent in the remainder operation itself and is not a
-flaw in the SoftFloat implementation.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Round-to-Integer Functions
-
-For each format, SoftFloat implements the round-to-integer function
-specified by the IEC/IEEE Standard.  The functions are:
-
-   float32_round_to_int
-   float64_round_to_int
-   floatx80_round_to_int
-   float128_round_to_int
-
-Each function takes a single floating-point operand and returns a result of
-the same type.  (Note that the result is not an integer type.)  The operand
-is rounded to an exact integer according to the current rounding mode, and
-the resulting integer value is returned in the same floating-point format.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Comparison Functions
-
-The following floating-point comparison functions are provided:
-
-   float32_eq    float32_le    float32_lt
-   float64_eq    float64_le    float64_lt
-   floatx80_eq   floatx80_le   floatx80_lt
-   float128_eq   float128_le   float128_lt
-
-Each function takes two operands of the same type and returns a 1 or 0
-representing either _true_ or _false_.  The abbreviation `eq' stands for
-``equal'' (=); `le' stands for ``less than or equal'' (<=); and `lt' stands
-for ``less than'' (<).
-
-The standard greater-than (>), greater-than-or-equal (>=), and not-equal
-(!=) functions are easily obtained using the functions provided.  The
-not-equal function is just the logical complement of the equal function.
-The greater-than-or-equal function is identical to the less-than-or-equal
-function with the operands reversed; and the greater-than function can be
-obtained from the less-than function in the same way.
-
-The IEC/IEEE Standard specifies that the less-than-or-equal and less-than
-functions raise the invalid exception if either input is any kind of NaN.
-The equal functions, on the other hand, are defined not to raise the invalid
-exception on quiet NaNs.  For completeness, SoftFloat provides the following
-additional functions:
-
-   float32_eq_signaling    float32_le_quiet    float32_lt_quiet
-   float64_eq_signaling    float64_le_quiet    float64_lt_quiet
-   floatx80_eq_signaling   floatx80_le_quiet   floatx80_lt_quiet
-   float128_eq_signaling   float128_le_quiet   float128_lt_quiet
-
-The `signaling' equal functions are identical to the standard functions
-except that the invalid exception is raised for any NaN input.  Likewise,
-the `quiet' comparison functions are identical to their counterparts except
-that the invalid exception is not raised for quiet NaNs.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Signaling NaN Test Functions
-
-The following functions test whether a floating-point value is a signaling
-NaN:
-
-   float32_is_signaling_nan
-   float64_is_signaling_nan
-   floatx80_is_signaling_nan
-   float128_is_signaling_nan
-
-The functions take one operand and return 1 if the operand is a signaling
-NaN and 0 otherwise.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-Raise-Exception Function
-
-SoftFloat provides a function for raising floating-point exceptions:
-
-    float_raise
-
-The function takes a mask indicating the set of exceptions to raise.  No
-result is returned.  In addition to setting the specified exception flags,
-this function may cause a trap or abort appropriate for the current system.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
--------------------------------------------------------------------------------
-Contact Information
-
-At the time of this writing, the most up-to-date information about
-SoftFloat and the latest release can be found at the Web page `http://
-HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/SoftFloat.html'.
-
-
diff --git a/lib/libc_bsd/softfloat/templates/milieu.h b/lib/libc_bsd/softfloat/templates/milieu.h
deleted file mode 100644
index 9976f9e..0000000
--- a/lib/libc_bsd/softfloat/templates/milieu.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/softfloat/templates/milieu.h 129203 2004-05-14 12:13:06Z cognet $ */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Include common integer types and flags.
--------------------------------------------------------------------------------
-*/
-#include "../../../processors/!!!processor.h"
-
-/*
--------------------------------------------------------------------------------
-Symbolic Boolean literals.
--------------------------------------------------------------------------------
-*/
-enum {
-    FALSE = 0,
-    TRUE  = 1
-};
-
diff --git a/lib/libc_bsd/softfloat/templates/softfloat-specialize b/lib/libc_bsd/softfloat/templates/softfloat-specialize
deleted file mode 100644
index 14f22cb..0000000
--- a/lib/libc_bsd/softfloat/templates/softfloat-specialize
+++ /dev/null
@@ -1,465 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/softfloat/templates/softfloat-specialize 129203 2004-05-14 12:13:06Z cognet $ */
-
-/*
-===============================================================================
-
-This C source fragment is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-Underflow tininess-detection mode, statically initialized to default value.
-(The declaration in `softfloat.h' must match the `int8' type here.)
--------------------------------------------------------------------------------
-*/
-int8 float_detect_tininess = float_tininess_after_rounding;
-
-/*
--------------------------------------------------------------------------------
-Raises the exceptions specified by `flags'.  Floating-point traps can be
-defined here if desired.  It is currently not possible for such a trap to
-substitute a result value.  If traps are not implemented, this routine
-should be simply `float_exception_flags |= flags;'.
--------------------------------------------------------------------------------
-*/
-void float_raise( int8 flags )
-{
-
-    float_exception_flags |= flags;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Internal canonical NaN format.
--------------------------------------------------------------------------------
-*/
-typedef struct {
-    flag sign;
-    bits64 high, low;
-} commonNaNT;
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated single-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float32_default_nan 0xFFFFFFFF
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float32_is_nan( float32 a )
-{
-
-    return ( 0xFF000000 < (bits32) ( a<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the single-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float32_is_signaling_nan( float32 a )
-{
-
-    return ( ( ( a>>22 ) & 0x1FF ) == 0x1FE ) && ( a & 0x003FFFFF );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the single-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float32ToCommonNaN( float32 a )
-{
-    commonNaNT z;
-
-    if ( float32_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a>>31;
-    z.low = 0;
-    z.high = ( (bits64) a )<<41;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the single-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float32 commonNaNToFloat32( commonNaNT a )
-{
-
-    return ( ( (bits32) a.sign )<<31 ) | 0x7FC00000 | ( a.high>>41 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two single-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float32 propagateFloat32NaN( float32 a, float32 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float32_is_nan( a );
-    aIsSignalingNaN = float32_is_signaling_nan( a );
-    bIsNaN = float32_is_nan( b );
-    bIsSignalingNaN = float32_is_signaling_nan( b );
-    a |= 0x00400000;
-    b |= 0x00400000;
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated double-precision NaN.
--------------------------------------------------------------------------------
-*/
-#define float64_default_nan LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float64_is_nan( float64 a )
-{
-
-    return ( LIT64( 0xFFE0000000000000 ) < (bits64) ( a<<1 ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the double-precision floating-point value `a' is a signaling
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float64_is_signaling_nan( float64 a )
-{
-
-    return
-           ( ( ( a>>51 ) & 0xFFF ) == 0xFFE )
-        && ( a & LIT64( 0x0007FFFFFFFFFFFF ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the double-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float64ToCommonNaN( float64 a )
-{
-    commonNaNT z;
-
-    if ( float64_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a>>63;
-    z.low = 0;
-    z.high = a<<12;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the double-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float64 commonNaNToFloat64( commonNaNT a )
-{
-
-    return
-          ( ( (bits64) a.sign )<<63 )
-        | LIT64( 0x7FF8000000000000 )
-        | ( a.high>>12 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two double-precision floating-point values `a' and `b', one of which
-is a NaN, and returns the appropriate NaN result.  If either `a' or `b' is a
-signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float64 propagateFloat64NaN( float64 a, float64 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float64_is_nan( a );
-    aIsSignalingNaN = float64_is_signaling_nan( a );
-    bIsNaN = float64_is_nan( b );
-    bIsSignalingNaN = float64_is_signaling_nan( b );
-    a |= LIT64( 0x0008000000000000 );
-    b |= LIT64( 0x0008000000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated extended double-precision NaN.  The
-`high' and `low' values hold the most- and least-significant bits,
-respectively.
--------------------------------------------------------------------------------
-*/
-#define floatx80_default_nan_high 0xFFFF
-#define floatx80_default_nan_low  LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_nan( floatx80 a )
-{
-
-    return ( ( a.high & 0x7FFF ) == 0x7FFF ) && (bits64) ( a.low<<1 );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the extended double-precision floating-point value `a' is a
-signaling NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag floatx80_is_signaling_nan( floatx80 a )
-{
-    bits64 aLow;
-
-    aLow = a.low & ~ LIT64( 0x4000000000000000 );
-    return
-           ( ( a.high & 0x7FFF ) == 0x7FFF )
-        && (bits64) ( aLow<<1 )
-        && ( a.low == aLow );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the extended double-precision floating-
-point NaN `a' to the canonical NaN format.  If `a' is a signaling NaN, the
-invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT floatx80ToCommonNaN( floatx80 a )
-{
-    commonNaNT z;
-
-    if ( floatx80_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a.high>>15;
-    z.low = 0;
-    z.high = a.low<<1;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the extended
-double-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static floatx80 commonNaNToFloatx80( commonNaNT a )
-{
-    floatx80 z;
-
-    z.low = LIT64( 0xC000000000000000 ) | ( a.high>>1 );
-    z.high = ( ( (bits16) a.sign )<<15 ) | 0x7FFF;
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two extended double-precision floating-point values `a' and `b', one
-of which is a NaN, and returns the appropriate NaN result.  If either `a' or
-`b' is a signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static floatx80 propagateFloatx80NaN( floatx80 a, floatx80 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = floatx80_is_nan( a );
-    aIsSignalingNaN = floatx80_is_signaling_nan( a );
-    bIsNaN = floatx80_is_nan( b );
-    bIsSignalingNaN = floatx80_is_signaling_nan( b );
-    a.low |= LIT64( 0xC000000000000000 );
-    b.low |= LIT64( 0xC000000000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-The pattern for a default generated quadruple-precision NaN.  The `high' and
-`low' values hold the most- and least-significant bits, respectively.
--------------------------------------------------------------------------------
-*/
-#define float128_default_nan_high LIT64( 0xFFFFFFFFFFFFFFFF )
-#define float128_default_nan_low  LIT64( 0xFFFFFFFFFFFFFFFF )
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is a NaN;
-otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float128_is_nan( float128 a )
-{
-
-    return
-           ( LIT64( 0xFFFE000000000000 ) <= (bits64) ( a.high<<1 ) )
-        && ( a.low || ( a.high & LIT64( 0x0000FFFFFFFFFFFF ) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns 1 if the quadruple-precision floating-point value `a' is a
-signaling NaN; otherwise returns 0.
--------------------------------------------------------------------------------
-*/
-flag float128_is_signaling_nan( float128 a )
-{
-
-    return
-           ( ( ( a.high>>47 ) & 0xFFFF ) == 0xFFFE )
-        && ( a.low || ( a.high & LIT64( 0x00007FFFFFFFFFFF ) ) );
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the quadruple-precision floating-point NaN
-`a' to the canonical NaN format.  If `a' is a signaling NaN, the invalid
-exception is raised.
--------------------------------------------------------------------------------
-*/
-static commonNaNT float128ToCommonNaN( float128 a )
-{
-    commonNaNT z;
-
-    if ( float128_is_signaling_nan( a ) ) float_raise( float_flag_invalid );
-    z.sign = a.high>>63;
-    shortShift128Left( a.high, a.low, 16, &z.high, &z.low );
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Returns the result of converting the canonical NaN `a' to the quadruple-
-precision floating-point format.
--------------------------------------------------------------------------------
-*/
-static float128 commonNaNToFloat128( commonNaNT a )
-{
-    float128 z;
-
-    shift128Right( a.high, a.low, 16, &z.high, &z.low );
-    z.high |= ( ( (bits64) a.sign )<<63 ) | LIT64( 0x7FFF800000000000 );
-    return z;
-
-}
-
-/*
--------------------------------------------------------------------------------
-Takes two quadruple-precision floating-point values `a' and `b', one of
-which is a NaN, and returns the appropriate NaN result.  If either `a' or
-`b' is a signaling NaN, the invalid exception is raised.
--------------------------------------------------------------------------------
-*/
-static float128 propagateFloat128NaN( float128 a, float128 b )
-{
-    flag aIsNaN, aIsSignalingNaN, bIsNaN, bIsSignalingNaN;
-
-    aIsNaN = float128_is_nan( a );
-    aIsSignalingNaN = float128_is_signaling_nan( a );
-    bIsNaN = float128_is_nan( b );
-    bIsSignalingNaN = float128_is_signaling_nan( b );
-    a.high |= LIT64( 0x0000800000000000 );
-    b.high |= LIT64( 0x0000800000000000 );
-    if ( aIsSignalingNaN | bIsSignalingNaN ) float_raise( float_flag_invalid );
-    if ( aIsNaN ) {
-        return ( aIsSignalingNaN & bIsNaN ) ? b : a;
-    }
-    else {
-        return b;
-    }
-
-}
-
-#endif
-
diff --git a/lib/libc_bsd/softfloat/templates/softfloat.h b/lib/libc_bsd/softfloat/templates/softfloat.h
deleted file mode 100644
index aa61388..0000000
--- a/lib/libc_bsd/softfloat/templates/softfloat.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/* $FreeBSD: releng/10.2/lib/libc/softfloat/templates/softfloat.h 129203 2004-05-14 12:13:06Z cognet $ */
-
-/*
-===============================================================================
-
-This C header file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-/*
--------------------------------------------------------------------------------
-The macro `FLOATX80' must be defined to enable the extended double-precision
-floating-point format `floatx80'.  If this macro is not defined, the
-`floatx80' type will not be defined, and none of the functions that either
-input or output the `floatx80' type will be defined.  The same applies to
-the `FLOAT128' macro and the quadruple-precision format `float128'.
--------------------------------------------------------------------------------
-*/
-#define FLOATX80
-#define FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point types.
--------------------------------------------------------------------------------
-*/
-typedef !!!bits32 float32;
-typedef !!!bits64 float64;
-#ifdef FLOATX80
-typedef struct {
-    !!!bits16 high;
-    !!!bits64 low;
-} floatx80;
-#endif
-#ifdef FLOAT128
-typedef struct {
-    !!!bits64 high, low;
-} float128;
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point underflow tininess-detection mode.
--------------------------------------------------------------------------------
-*/
-extern !!!int8 float_detect_tininess;
-enum {
-    float_tininess_after_rounding  = 0,
-    float_tininess_before_rounding = 1
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point rounding mode.
--------------------------------------------------------------------------------
-*/
-extern !!!int8 float_rounding_mode;
-enum {
-    float_round_nearest_even = 0,
-    float_round_to_zero      = 1,
-    float_round_down         = 2,
-    float_round_up           = 3
-};
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE floating-point exception flags.
--------------------------------------------------------------------------------
-*/
-extern !!!int8 float_exception_flags;
-enum {
-    float_flag_inexact   =  1,
-    float_flag_underflow =  2,
-    float_flag_overflow  =  4,
-    float_flag_divbyzero =  8,
-    float_flag_invalid   = 16
-};
-
-/*
--------------------------------------------------------------------------------
-Routine to raise any or all of the software IEC/IEEE floating-point
-exception flags.
--------------------------------------------------------------------------------
-*/
-void float_raise( !!!int8 );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE integer-to-floating-point conversion routines.
--------------------------------------------------------------------------------
-*/
-float32 int32_to_float32( !!!int32 );
-float64 int32_to_float64( !!!int32 );
-#ifdef FLOATX80
-floatx80 int32_to_floatx80( !!!int32 );
-#endif
-#ifdef FLOAT128
-float128 int32_to_float128( !!!int32 );
-#endif
-float32 int64_to_float32( !!!int64 );
-float64 int64_to_float64( !!!int64 );
-#ifdef FLOATX80
-floatx80 int64_to_floatx80( !!!int64 );
-#endif
-#ifdef FLOAT128
-float128 int64_to_float128( !!!int64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-!!!int32 float32_to_int32( float32 );
-!!!int32 float32_to_int32_round_to_zero( float32 );
-!!!int64 float32_to_int64( float32 );
-!!!int64 float32_to_int64_round_to_zero( float32 );
-float64 float32_to_float64( float32 );
-#ifdef FLOATX80
-floatx80 float32_to_floatx80( float32 );
-#endif
-#ifdef FLOAT128
-float128 float32_to_float128( float32 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE single-precision operations.
--------------------------------------------------------------------------------
-*/
-float32 float32_round_to_int( float32 );
-float32 float32_add( float32, float32 );
-float32 float32_sub( float32, float32 );
-float32 float32_mul( float32, float32 );
-float32 float32_div( float32, float32 );
-float32 float32_rem( float32, float32 );
-float32 float32_sqrt( float32 );
-!!!flag float32_eq( float32, float32 );
-!!!flag float32_le( float32, float32 );
-!!!flag float32_lt( float32, float32 );
-!!!flag float32_eq_signaling( float32, float32 );
-!!!flag float32_le_quiet( float32, float32 );
-!!!flag float32_lt_quiet( float32, float32 );
-!!!flag float32_is_signaling_nan( float32 );
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-!!!int32 float64_to_int32( float64 );
-!!!int32 float64_to_int32_round_to_zero( float64 );
-!!!int64 float64_to_int64( float64 );
-!!!int64 float64_to_int64_round_to_zero( float64 );
-float32 float64_to_float32( float64 );
-#ifdef FLOATX80
-floatx80 float64_to_floatx80( float64 );
-#endif
-#ifdef FLOAT128
-float128 float64_to_float128( float64 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE double-precision operations.
--------------------------------------------------------------------------------
-*/
-float64 float64_round_to_int( float64 );
-float64 float64_add( float64, float64 );
-float64 float64_sub( float64, float64 );
-float64 float64_mul( float64, float64 );
-float64 float64_div( float64, float64 );
-float64 float64_rem( float64, float64 );
-float64 float64_sqrt( float64 );
-!!!flag float64_eq( float64, float64 );
-!!!flag float64_le( float64, float64 );
-!!!flag float64_lt( float64, float64 );
-!!!flag float64_eq_signaling( float64, float64 );
-!!!flag float64_le_quiet( float64, float64 );
-!!!flag float64_lt_quiet( float64, float64 );
-!!!flag float64_is_signaling_nan( float64 );
-
-#ifdef FLOATX80
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-!!!int32 floatx80_to_int32( floatx80 );
-!!!int32 floatx80_to_int32_round_to_zero( floatx80 );
-!!!int64 floatx80_to_int64( floatx80 );
-!!!int64 floatx80_to_int64_round_to_zero( floatx80 );
-float32 floatx80_to_float32( floatx80 );
-float64 floatx80_to_float64( floatx80 );
-#ifdef FLOAT128
-float128 floatx80_to_float128( floatx80 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision rounding precision.  Valid
-values are 32, 64, and 80.
--------------------------------------------------------------------------------
-*/
-extern !!!int8 floatx80_rounding_precision;
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE extended double-precision operations.
--------------------------------------------------------------------------------
-*/
-floatx80 floatx80_round_to_int( floatx80 );
-floatx80 floatx80_add( floatx80, floatx80 );
-floatx80 floatx80_sub( floatx80, floatx80 );
-floatx80 floatx80_mul( floatx80, floatx80 );
-floatx80 floatx80_div( floatx80, floatx80 );
-floatx80 floatx80_rem( floatx80, floatx80 );
-floatx80 floatx80_sqrt( floatx80 );
-!!!flag floatx80_eq( floatx80, floatx80 );
-!!!flag floatx80_le( floatx80, floatx80 );
-!!!flag floatx80_lt( floatx80, floatx80 );
-!!!flag floatx80_eq_signaling( floatx80, floatx80 );
-!!!flag floatx80_le_quiet( floatx80, floatx80 );
-!!!flag floatx80_lt_quiet( floatx80, floatx80 );
-!!!flag floatx80_is_signaling_nan( floatx80 );
-
-#endif
-
-#ifdef FLOAT128
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision conversion routines.
--------------------------------------------------------------------------------
-*/
-!!!int32 float128_to_int32( float128 );
-!!!int32 float128_to_int32_round_to_zero( float128 );
-!!!int64 float128_to_int64( float128 );
-!!!int64 float128_to_int64_round_to_zero( float128 );
-float32 float128_to_float32( float128 );
-float64 float128_to_float64( float128 );
-#ifdef FLOATX80
-floatx80 float128_to_floatx80( float128 );
-#endif
-
-/*
--------------------------------------------------------------------------------
-Software IEC/IEEE quadruple-precision operations.
--------------------------------------------------------------------------------
-*/
-float128 float128_round_to_int( float128 );
-float128 float128_add( float128, float128 );
-float128 float128_sub( float128, float128 );
-float128 float128_mul( float128, float128 );
-float128 float128_div( float128, float128 );
-float128 float128_rem( float128, float128 );
-float128 float128_sqrt( float128 );
-!!!flag float128_eq( float128, float128 );
-!!!flag float128_le( float128, float128 );
-!!!flag float128_lt( float128, float128 );
-!!!flag float128_eq_signaling( float128, float128 );
-!!!flag float128_le_quiet( float128, float128 );
-!!!flag float128_lt_quiet( float128, float128 );
-!!!flag float128_is_signaling_nan( float128 );
-
-#endif
-
diff --git a/lib/libc_bsd/softfloat/timesoftfloat.c b/lib/libc_bsd/softfloat/timesoftfloat.c
deleted file mode 100644
index 68b4ef1..0000000
--- a/lib/libc_bsd/softfloat/timesoftfloat.c
+++ /dev/null
@@ -1,2639 +0,0 @@
-/* $NetBSD: timesoftfloat.c,v 1.1 2000/06/06 08:15:11 bjh21 Exp $ */
-
-/*
-===============================================================================
-
-This C source file is part of the SoftFloat IEC/IEEE Floating-point
-Arithmetic Package, Release 2a.
-
-Written by John R. Hauser.  This work was made possible in part by the
-International Computer Science Institute, located at Suite 600, 1947 Center
-Street, Berkeley, California 94704.  Funding was partially provided by the
-National Science Foundation under grant MIP-9311980.  The original version
-of this code was written as part of a project to build a fixed-point vector
-processor in collaboration with the University of California at Berkeley,
-overseen by Profs. Nelson Morgan and John Wawrzynek.  More information
-is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/
-arithmetic/SoftFloat.html'.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-Derivative works are acceptable, even for commercial purposes, so long as
-(1) they include prominent notice that the work is derivative, and (2) they
-include prominent notice akin to these four paragraphs for those parts of
-this code that are retained.
-
-===============================================================================
-*/
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/timesoftfloat.c 129203 2004-05-14 12:13:06Z cognet $");
-
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include "milieu.h"
-#include "softfloat.h"
-
-enum {
-    minIterations = 1000
-};
-
-static void fail( const char *message, ... )
-{
-    va_list varArgs;
-
-    fputs( "timesoftfloat: ", stderr );
-    va_start( varArgs, message );
-    vfprintf( stderr, message, varArgs );
-    va_end( varArgs );
-    fputs( ".\n", stderr );
-    exit( EXIT_FAILURE );
-
-}
-
-static char *functionName;
-static char *roundingPrecisionName, *roundingModeName, *tininessModeName;
-
-static void reportTime( int32 count, long clocks )
-{
-
-    printf(
-        "%8.1f kops/s: %s",
-        ( count / ( ( (float) clocks ) / CLOCKS_PER_SEC ) ) / 1000,
-        functionName
-    );
-    if ( roundingModeName ) {
-        if ( roundingPrecisionName ) {
-            fputs( ", precision ", stdout );
-            fputs( roundingPrecisionName, stdout );
-        }
-        fputs( ", rounding ", stdout );
-        fputs( roundingModeName, stdout );
-        if ( tininessModeName ) {
-            fputs( ", tininess ", stdout );
-            fputs( tininessModeName, stdout );
-            fputs( " rounding", stdout );
-        }
-    }
-    fputc( '\n', stdout );
-
-}
-
-enum {
-    numInputs_int32 = 32
-};
-
-static const int32 inputs_int32[ numInputs_int32 ] = {
-    0xFFFFBB79, 0x405CF80F, 0x00000000, 0xFFFFFD04,
-    0xFFF20002, 0x0C8EF795, 0xF00011FF, 0x000006CA,
-    0x00009BFE, 0xFF4862E3, 0x9FFFEFFE, 0xFFFFFFB7,
-    0x0BFF7FFF, 0x0000F37A, 0x0011DFFE, 0x00000006,
-    0xFFF02006, 0xFFFFF7D1, 0x10200003, 0xDE8DF765,
-    0x00003E02, 0x000019E8, 0x0008FFFE, 0xFFFFFB5C,
-    0xFFDF7FFE, 0x07C42FBF, 0x0FFFE3FF, 0x040B9F13,
-    0xBFFFFFF8, 0x0001BF56, 0x000017F6, 0x000A908A
-};
-
-static void time_a_int32_z_float32( float32 function( int32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_int32_z_float64( float64 function( int32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_int32_z_floatx80( floatx80 function( int32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-static void time_a_int32_z_float128( float128 function( int32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-enum {
-    numInputs_int64 = 32
-};
-
-static const int64 inputs_int64[ numInputs_int64 ] = {
-    LIT64( 0xFBFFC3FFFFFFFFFF ),
-    LIT64( 0x0000000003C589BC ),
-    LIT64( 0x00000000400013FE ),
-    LIT64( 0x0000000000186171 ),
-    LIT64( 0xFFFFFFFFFFFEFBFA ),
-    LIT64( 0xFFFFFD79E6DFFC73 ),
-    LIT64( 0x0000000010001DFF ),
-    LIT64( 0xDD1A0F0C78513710 ),
-    LIT64( 0xFFFF83FFFFFEFFFE ),
-    LIT64( 0x00756EBD1AD0C1C7 ),
-    LIT64( 0x0003FDFFFFFFFFBE ),
-    LIT64( 0x0007D0FB2C2CA951 ),
-    LIT64( 0x0007FC0007FFFFFE ),
-    LIT64( 0x0000001F942B18BB ),
-    LIT64( 0x0000080101FFFFFE ),
-    LIT64( 0xFFFFFFFFFFFF0978 ),
-    LIT64( 0x000000000008BFFF ),
-    LIT64( 0x0000000006F5AF08 ),
-    LIT64( 0xFFDEFF7FFFFFFFFE ),
-    LIT64( 0x0000000000000003 ),
-    LIT64( 0x3FFFFFFFFF80007D ),
-    LIT64( 0x0000000000000078 ),
-    LIT64( 0xFFF80000007FDFFD ),
-    LIT64( 0x1BBC775B78016AB0 ),
-    LIT64( 0xFFF9001FFFFFFFFE ),
-    LIT64( 0xFFFD4767AB98E43F ),
-    LIT64( 0xFFFFFEFFFE00001E ),
-    LIT64( 0xFFFFFFFFFFF04EFD ),
-    LIT64( 0x07FFFFFFFFFFF7FF ),
-    LIT64( 0xFFFC9EAA38F89050 ),
-    LIT64( 0x00000020FBFFFFFE ),
-    LIT64( 0x0000099AE6455357 )
-};
-
-static void time_a_int64_z_float32( float32 function( int64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_int64_z_float64( float64 function( int64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_int64_z_floatx80( floatx80 function( int64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-static void time_a_int64_z_float128( float128 function( int64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_int64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_int64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_int64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-enum {
-    numInputs_float32 = 32
-};
-
-static const float32 inputs_float32[ numInputs_float32 ] = {
-    0x4EFA0000, 0xC1D0B328, 0x80000000, 0x3E69A31E,
-    0xAF803EFF, 0x3F800000, 0x17BF8000, 0xE74A301A,
-    0x4E010003, 0x7EE3C75D, 0xBD803FE0, 0xBFFEFF00,
-    0x7981F800, 0x431FFFFC, 0xC100C000, 0x3D87EFFF,
-    0x4103FEFE, 0xBC000007, 0xBF01F7FF, 0x4E6C6B5C,
-    0xC187FFFE, 0xC58B9F13, 0x4F88007F, 0xDF004007,
-    0xB7FFD7FE, 0x7E8001FB, 0x46EFFBFF, 0x31C10000,
-    0xDB428661, 0x33F89B1F, 0xA3BFEFFF, 0x537BFFBE
-};
-
-static void time_a_float32_z_int32( int32 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float32_z_int64( int64 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float32_z_float64( float64 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_float32_z_floatx80( floatx80 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-static void time_a_float32_z_float128( float128 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-static void time_az_float32( float32 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_ab_float32_z_flag( flag function( float32, float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function(
-                inputs_float32[ inputNumA ], inputs_float32[ inputNumB ] );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float32 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-            function(
-                inputs_float32[ inputNumA ], inputs_float32[ inputNumB ] );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float32 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_abz_float32( float32 function( float32, float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function(
-                inputs_float32[ inputNumA ], inputs_float32[ inputNumB ] );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float32 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-            function(
-                inputs_float32[ inputNumA ], inputs_float32[ inputNumB ] );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float32 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static const float32 inputs_float32_pos[ numInputs_float32 ] = {
-    0x4EFA0000, 0x41D0B328, 0x00000000, 0x3E69A31E,
-    0x2F803EFF, 0x3F800000, 0x17BF8000, 0x674A301A,
-    0x4E010003, 0x7EE3C75D, 0x3D803FE0, 0x3FFEFF00,
-    0x7981F800, 0x431FFFFC, 0x4100C000, 0x3D87EFFF,
-    0x4103FEFE, 0x3C000007, 0x3F01F7FF, 0x4E6C6B5C,
-    0x4187FFFE, 0x458B9F13, 0x4F88007F, 0x5F004007,
-    0x37FFD7FE, 0x7E8001FB, 0x46EFFBFF, 0x31C10000,
-    0x5B428661, 0x33F89B1F, 0x23BFEFFF, 0x537BFFBE
-};
-
-static void time_az_float32_pos( float32 function( float32 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float32_pos[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float32_pos[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float32 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-enum {
-    numInputs_float64 = 32
-};
-
-static const float64 inputs_float64[ numInputs_float64 ] = {
-    LIT64( 0x422FFFC008000000 ),
-    LIT64( 0xB7E0000480000000 ),
-    LIT64( 0xF3FD2546120B7935 ),
-    LIT64( 0x3FF0000000000000 ),
-    LIT64( 0xCE07F766F09588D6 ),
-    LIT64( 0x8000000000000000 ),
-    LIT64( 0x3FCE000400000000 ),
-    LIT64( 0x8313B60F0032BED8 ),
-    LIT64( 0xC1EFFFFFC0002000 ),
-    LIT64( 0x3FB3C75D224F2B0F ),
-    LIT64( 0x7FD00000004000FF ),
-    LIT64( 0xA12FFF8000001FFF ),
-    LIT64( 0x3EE0000000FE0000 ),
-    LIT64( 0x0010000080000004 ),
-    LIT64( 0x41CFFFFE00000020 ),
-    LIT64( 0x40303FFFFFFFFFFD ),
-    LIT64( 0x3FD000003FEFFFFF ),
-    LIT64( 0xBFD0000010000000 ),
-    LIT64( 0xB7FC6B5C16CA55CF ),
-    LIT64( 0x413EEB940B9D1301 ),
-    LIT64( 0xC7E00200001FFFFF ),
-    LIT64( 0x47F00021FFFFFFFE ),
-    LIT64( 0xBFFFFFFFF80000FF ),
-    LIT64( 0xC07FFFFFE00FFFFF ),
-    LIT64( 0x001497A63740C5E8 ),
-    LIT64( 0xC4BFFFE0001FFFFF ),
-    LIT64( 0x96FFDFFEFFFFFFFF ),
-    LIT64( 0x403FC000000001FE ),
-    LIT64( 0xFFD00000000001F6 ),
-    LIT64( 0x0640400002000000 ),
-    LIT64( 0x479CEE1E4F789FE0 ),
-    LIT64( 0xC237FFFFFFFFFDFE )
-};
-
-static void time_a_float64_z_int32( int32 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float64_z_int64( int64 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float64_z_float32( float32 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_float64_z_floatx80( floatx80 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-static void time_a_float64_z_float128( float128 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-static void time_az_float64( float64 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_ab_float64_z_flag( flag function( float64, float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function(
-                inputs_float64[ inputNumA ], inputs_float64[ inputNumB ] );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float64 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-            function(
-                inputs_float64[ inputNumA ], inputs_float64[ inputNumB ] );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float64 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_abz_float64( float64 function( float64, float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function(
-                inputs_float64[ inputNumA ], inputs_float64[ inputNumB ] );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float64 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-            function(
-                inputs_float64[ inputNumA ], inputs_float64[ inputNumB ] );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float64 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static const float64 inputs_float64_pos[ numInputs_float64 ] = {
-    LIT64( 0x422FFFC008000000 ),
-    LIT64( 0x37E0000480000000 ),
-    LIT64( 0x73FD2546120B7935 ),
-    LIT64( 0x3FF0000000000000 ),
-    LIT64( 0x4E07F766F09588D6 ),
-    LIT64( 0x0000000000000000 ),
-    LIT64( 0x3FCE000400000000 ),
-    LIT64( 0x0313B60F0032BED8 ),
-    LIT64( 0x41EFFFFFC0002000 ),
-    LIT64( 0x3FB3C75D224F2B0F ),
-    LIT64( 0x7FD00000004000FF ),
-    LIT64( 0x212FFF8000001FFF ),
-    LIT64( 0x3EE0000000FE0000 ),
-    LIT64( 0x0010000080000004 ),
-    LIT64( 0x41CFFFFE00000020 ),
-    LIT64( 0x40303FFFFFFFFFFD ),
-    LIT64( 0x3FD000003FEFFFFF ),
-    LIT64( 0x3FD0000010000000 ),
-    LIT64( 0x37FC6B5C16CA55CF ),
-    LIT64( 0x413EEB940B9D1301 ),
-    LIT64( 0x47E00200001FFFFF ),
-    LIT64( 0x47F00021FFFFFFFE ),
-    LIT64( 0x3FFFFFFFF80000FF ),
-    LIT64( 0x407FFFFFE00FFFFF ),
-    LIT64( 0x001497A63740C5E8 ),
-    LIT64( 0x44BFFFE0001FFFFF ),
-    LIT64( 0x16FFDFFEFFFFFFFF ),
-    LIT64( 0x403FC000000001FE ),
-    LIT64( 0x7FD00000000001F6 ),
-    LIT64( 0x0640400002000000 ),
-    LIT64( 0x479CEE1E4F789FE0 ),
-    LIT64( 0x4237FFFFFFFFFDFE )
-};
-
-static void time_az_float64_pos( float64 function( float64 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            function( inputs_float64_pos[ inputNum ] );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        function( inputs_float64_pos[ inputNum ] );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float64 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-enum {
-    numInputs_floatx80 = 32
-};
-
-static const struct {
-    bits16 high;
-    bits64 low;
-} inputs_floatx80[ numInputs_floatx80 ] = {
-    { 0xC03F, LIT64( 0xA9BE15A19C1E8B62 ) },
-    { 0x8000, LIT64( 0x0000000000000000 ) },
-    { 0x75A8, LIT64( 0xE59591E4788957A5 ) },
-    { 0xBFFF, LIT64( 0xFFF0000000000040 ) },
-    { 0x0CD8, LIT64( 0xFC000000000007FE ) },
-    { 0x43BA, LIT64( 0x99A4000000000000 ) },
-    { 0x3FFF, LIT64( 0x8000000000000000 ) },
-    { 0x4081, LIT64( 0x94FBF1BCEB5545F0 ) },
-    { 0x403E, LIT64( 0xFFF0000000002000 ) },
-    { 0x3FFE, LIT64( 0xC860E3C75D224F28 ) },
-    { 0x407E, LIT64( 0xFC00000FFFFFFFFE ) },
-    { 0x737A, LIT64( 0x800000007FFDFFFE ) },
-    { 0x4044, LIT64( 0xFFFFFF80000FFFFF ) },
-    { 0xBBFE, LIT64( 0x8000040000001FFE ) },
-    { 0xC002, LIT64( 0xFF80000000000020 ) },
-    { 0xDE8D, LIT64( 0xFFFFFFFFFFE00004 ) },
-    { 0xC004, LIT64( 0x8000000000003FFB ) },
-    { 0x407F, LIT64( 0x800000000003FFFE ) },
-    { 0xC000, LIT64( 0xA459EE6A5C16CA55 ) },
-    { 0x8003, LIT64( 0xC42CBF7399AEEB94 ) },
-    { 0xBF7F, LIT64( 0xF800000000000006 ) },
-    { 0xC07F, LIT64( 0xBF56BE8871F28FEA ) },
-    { 0xC07E, LIT64( 0xFFFF77FFFFFFFFFE ) },
-    { 0xADC9, LIT64( 0x8000000FFFFFFFDE ) },
-    { 0xC001, LIT64( 0xEFF7FFFFFFFFFFFF ) },
-    { 0x4001, LIT64( 0xBE84F30125C497A6 ) },
-    { 0xC06B, LIT64( 0xEFFFFFFFFFFFFFFF ) },
-    { 0x4080, LIT64( 0xFFFFFFFFBFFFFFFF ) },
-    { 0x87E9, LIT64( 0x81FFFFFFFFFFFBFF ) },
-    { 0xA63F, LIT64( 0x801FFFFFFEFFFFFE ) },
-    { 0x403C, LIT64( 0x801FFFFFFFF7FFFF ) },
-    { 0x4018, LIT64( 0x8000000000080003 ) }
-};
-
-static void time_a_floatx80_z_int32( int32 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_floatx80_z_int64( int64 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_floatx80_z_float32( float32 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_floatx80_z_float64( float64 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOAT128
-
-static void time_a_floatx80_z_float128( float128 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-static void time_az_floatx80( floatx80 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNum ].low;
-            a.high = inputs_floatx80[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNum ].low;
-        a.high = inputs_floatx80[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_ab_floatx80_z_flag( flag function( floatx80, floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-    floatx80 a, b;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNumA ].low;
-            a.high = inputs_floatx80[ inputNumA ].high;
-            b.low = inputs_floatx80[ inputNumB ].low;
-            b.high = inputs_floatx80[ inputNumB ].high;
-            function( a, b );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_floatx80 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNumA ].low;
-        a.high = inputs_floatx80[ inputNumA ].high;
-        b.low = inputs_floatx80[ inputNumB ].low;
-        b.high = inputs_floatx80[ inputNumB ].high;
-        function( a, b );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_floatx80 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_abz_floatx80( floatx80 function( floatx80, floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-    floatx80 a, b;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80[ inputNumA ].low;
-            a.high = inputs_floatx80[ inputNumA ].high;
-            b.low = inputs_floatx80[ inputNumB ].low;
-            b.high = inputs_floatx80[ inputNumB ].high;
-            function( a, b );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_floatx80 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80[ inputNumA ].low;
-        a.high = inputs_floatx80[ inputNumA ].high;
-        b.low = inputs_floatx80[ inputNumB ].low;
-        b.high = inputs_floatx80[ inputNumB ].high;
-        function( a, b );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_floatx80 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static const struct {
-    bits16 high;
-    bits64 low;
-} inputs_floatx80_pos[ numInputs_floatx80 ] = {
-    { 0x403F, LIT64( 0xA9BE15A19C1E8B62 ) },
-    { 0x0000, LIT64( 0x0000000000000000 ) },
-    { 0x75A8, LIT64( 0xE59591E4788957A5 ) },
-    { 0x3FFF, LIT64( 0xFFF0000000000040 ) },
-    { 0x0CD8, LIT64( 0xFC000000000007FE ) },
-    { 0x43BA, LIT64( 0x99A4000000000000 ) },
-    { 0x3FFF, LIT64( 0x8000000000000000 ) },
-    { 0x4081, LIT64( 0x94FBF1BCEB5545F0 ) },
-    { 0x403E, LIT64( 0xFFF0000000002000 ) },
-    { 0x3FFE, LIT64( 0xC860E3C75D224F28 ) },
-    { 0x407E, LIT64( 0xFC00000FFFFFFFFE ) },
-    { 0x737A, LIT64( 0x800000007FFDFFFE ) },
-    { 0x4044, LIT64( 0xFFFFFF80000FFFFF ) },
-    { 0x3BFE, LIT64( 0x8000040000001FFE ) },
-    { 0x4002, LIT64( 0xFF80000000000020 ) },
-    { 0x5E8D, LIT64( 0xFFFFFFFFFFE00004 ) },
-    { 0x4004, LIT64( 0x8000000000003FFB ) },
-    { 0x407F, LIT64( 0x800000000003FFFE ) },
-    { 0x4000, LIT64( 0xA459EE6A5C16CA55 ) },
-    { 0x0003, LIT64( 0xC42CBF7399AEEB94 ) },
-    { 0x3F7F, LIT64( 0xF800000000000006 ) },
-    { 0x407F, LIT64( 0xBF56BE8871F28FEA ) },
-    { 0x407E, LIT64( 0xFFFF77FFFFFFFFFE ) },
-    { 0x2DC9, LIT64( 0x8000000FFFFFFFDE ) },
-    { 0x4001, LIT64( 0xEFF7FFFFFFFFFFFF ) },
-    { 0x4001, LIT64( 0xBE84F30125C497A6 ) },
-    { 0x406B, LIT64( 0xEFFFFFFFFFFFFFFF ) },
-    { 0x4080, LIT64( 0xFFFFFFFFBFFFFFFF ) },
-    { 0x07E9, LIT64( 0x81FFFFFFFFFFFBFF ) },
-    { 0x263F, LIT64( 0x801FFFFFFEFFFFFE ) },
-    { 0x403C, LIT64( 0x801FFFFFFFF7FFFF ) },
-    { 0x4018, LIT64( 0x8000000000080003 ) }
-};
-
-static void time_az_floatx80_pos( floatx80 function( floatx80 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    floatx80 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_floatx80_pos[ inputNum ].low;
-            a.high = inputs_floatx80_pos[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_floatx80_pos[ inputNum ].low;
-        a.high = inputs_floatx80_pos[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_floatx80 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-#ifdef FLOAT128
-
-enum {
-    numInputs_float128 = 32
-};
-
-static const struct {
-    bits64 high, low;
-} inputs_float128[ numInputs_float128 ] = {
-    { LIT64( 0x3FDA200000100000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3FFF000000000000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x85F14776190C8306 ), LIT64( 0xD8715F4E3D54BB92 ) },
-    { LIT64( 0xF2B00000007FFFFF ), LIT64( 0xFFFFFFFFFFF7FFFF ) },
-    { LIT64( 0x8000000000000000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0xBFFFFFFFFFE00000 ), LIT64( 0x0000008000000000 ) },
-    { LIT64( 0x407F1719CE722F3E ), LIT64( 0xDA6B3FE5FF29425B ) },
-    { LIT64( 0x43FFFF8000000000 ), LIT64( 0x0000000000400000 ) },
-    { LIT64( 0x401E000000000100 ), LIT64( 0x0000000000002000 ) },
-    { LIT64( 0x3FFED71DACDA8E47 ), LIT64( 0x4860E3C75D224F28 ) },
-    { LIT64( 0xBF7ECFC1E90647D1 ), LIT64( 0x7A124FE55623EE44 ) },
-    { LIT64( 0x0DF7007FFFFFFFFF ), LIT64( 0xFFFFFFFFEFFFFFFF ) },
-    { LIT64( 0x3FE5FFEFFFFFFFFF ), LIT64( 0xFFFFFFFFFFFFEFFF ) },
-    { LIT64( 0x403FFFFFFFFFFFFF ), LIT64( 0xFFFFFFFFFFFFFBFE ) },
-    { LIT64( 0xBFFB2FBF7399AFEB ), LIT64( 0xA459EE6A5C16CA55 ) },
-    { LIT64( 0xBDB8FFFFFFFFFFFC ), LIT64( 0x0000000000000400 ) },
-    { LIT64( 0x3FC8FFDFFFFFFFFF ), LIT64( 0xFFFFFFFFF0000000 ) },
-    { LIT64( 0x3FFBFFFFFFDFFFFF ), LIT64( 0xFFF8000000000000 ) },
-    { LIT64( 0x407043C11737BE84 ), LIT64( 0xDDD58212ADC937F4 ) },
-    { LIT64( 0x8001000000000000 ), LIT64( 0x0000001000000001 ) },
-    { LIT64( 0xC036FFFFFFFFFFFF ), LIT64( 0xFE40000000000000 ) },
-    { LIT64( 0x4002FFFFFE000002 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x4000C3FEDE897773 ), LIT64( 0x326AC4FD8EFBE6DC ) },
-    { LIT64( 0xBFFF0000000FFFFF ), LIT64( 0xFFFFFE0000000000 ) },
-    { LIT64( 0x62C3E502146E426D ), LIT64( 0x43F3CAA0DC7DF1A0 ) },
-    { LIT64( 0xB5CBD32E52BB570E ), LIT64( 0xBCC477CB11C6236C ) },
-    { LIT64( 0xE228FFFFFFC00000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3F80000000000000 ), LIT64( 0x0000000080000008 ) },
-    { LIT64( 0xC1AFFFDFFFFFFFFF ), LIT64( 0xFFFC000000000000 ) },
-    { LIT64( 0xC96F000000000000 ), LIT64( 0x00000001FFFBFFFF ) },
-    { LIT64( 0x3DE09BFE7923A338 ), LIT64( 0xBCC8FBBD7CEC1F4F ) },
-    { LIT64( 0x401CFFFFFFFFFFFF ), LIT64( 0xFFFFFFFEFFFFFF80 ) }
-};
-
-static void time_a_float128_z_int32( int32 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float128_z_int64( int64 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float128_z_float32( float32 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_a_float128_z_float64( float64 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#ifdef FLOATX80
-
-static void time_a_float128_z_floatx80( floatx80 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-static void time_az_float128( float128 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNum ].low;
-            a.high = inputs_float128[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNum ].low;
-        a.high = inputs_float128[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_ab_float128_z_flag( flag function( float128, float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-    float128 a, b;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNumA ].low;
-            a.high = inputs_float128[ inputNumA ].high;
-            b.low = inputs_float128[ inputNumB ].low;
-            b.high = inputs_float128[ inputNumB ].high;
-            function( a, b );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float128 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNumA ].low;
-        a.high = inputs_float128[ inputNumA ].high;
-        b.low = inputs_float128[ inputNumB ].low;
-        b.high = inputs_float128[ inputNumB ].high;
-        function( a, b );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float128 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static void time_abz_float128( float128 function( float128, float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNumA, inputNumB;
-    float128 a, b;
-
-    count = 0;
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128[ inputNumA ].low;
-            a.high = inputs_float128[ inputNumA ].high;
-            b.low = inputs_float128[ inputNumB ].low;
-            b.high = inputs_float128[ inputNumB ].high;
-            function( a, b );
-            inputNumA = ( inputNumA + 1 ) & ( numInputs_float128 - 1 );
-            if ( inputNumA == 0 ) ++inputNumB;
-            inputNumB = ( inputNumB + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNumA = 0;
-    inputNumB = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128[ inputNumA ].low;
-        a.high = inputs_float128[ inputNumA ].high;
-        b.low = inputs_float128[ inputNumB ].low;
-        b.high = inputs_float128[ inputNumB ].high;
-        function( a, b );
-        inputNumA = ( inputNumA + 1 ) & ( numInputs_float128 - 1 );
-        if ( inputNumA == 0 ) ++inputNumB;
-        inputNumB = ( inputNumB + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-static const struct {
-    bits64 high, low;
-} inputs_float128_pos[ numInputs_float128 ] = {
-    { LIT64( 0x3FDA200000100000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3FFF000000000000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x05F14776190C8306 ), LIT64( 0xD8715F4E3D54BB92 ) },
-    { LIT64( 0x72B00000007FFFFF ), LIT64( 0xFFFFFFFFFFF7FFFF ) },
-    { LIT64( 0x0000000000000000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3FFFFFFFFFE00000 ), LIT64( 0x0000008000000000 ) },
-    { LIT64( 0x407F1719CE722F3E ), LIT64( 0xDA6B3FE5FF29425B ) },
-    { LIT64( 0x43FFFF8000000000 ), LIT64( 0x0000000000400000 ) },
-    { LIT64( 0x401E000000000100 ), LIT64( 0x0000000000002000 ) },
-    { LIT64( 0x3FFED71DACDA8E47 ), LIT64( 0x4860E3C75D224F28 ) },
-    { LIT64( 0x3F7ECFC1E90647D1 ), LIT64( 0x7A124FE55623EE44 ) },
-    { LIT64( 0x0DF7007FFFFFFFFF ), LIT64( 0xFFFFFFFFEFFFFFFF ) },
-    { LIT64( 0x3FE5FFEFFFFFFFFF ), LIT64( 0xFFFFFFFFFFFFEFFF ) },
-    { LIT64( 0x403FFFFFFFFFFFFF ), LIT64( 0xFFFFFFFFFFFFFBFE ) },
-    { LIT64( 0x3FFB2FBF7399AFEB ), LIT64( 0xA459EE6A5C16CA55 ) },
-    { LIT64( 0x3DB8FFFFFFFFFFFC ), LIT64( 0x0000000000000400 ) },
-    { LIT64( 0x3FC8FFDFFFFFFFFF ), LIT64( 0xFFFFFFFFF0000000 ) },
-    { LIT64( 0x3FFBFFFFFFDFFFFF ), LIT64( 0xFFF8000000000000 ) },
-    { LIT64( 0x407043C11737BE84 ), LIT64( 0xDDD58212ADC937F4 ) },
-    { LIT64( 0x0001000000000000 ), LIT64( 0x0000001000000001 ) },
-    { LIT64( 0x4036FFFFFFFFFFFF ), LIT64( 0xFE40000000000000 ) },
-    { LIT64( 0x4002FFFFFE000002 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x4000C3FEDE897773 ), LIT64( 0x326AC4FD8EFBE6DC ) },
-    { LIT64( 0x3FFF0000000FFFFF ), LIT64( 0xFFFFFE0000000000 ) },
-    { LIT64( 0x62C3E502146E426D ), LIT64( 0x43F3CAA0DC7DF1A0 ) },
-    { LIT64( 0x35CBD32E52BB570E ), LIT64( 0xBCC477CB11C6236C ) },
-    { LIT64( 0x6228FFFFFFC00000 ), LIT64( 0x0000000000000000 ) },
-    { LIT64( 0x3F80000000000000 ), LIT64( 0x0000000080000008 ) },
-    { LIT64( 0x41AFFFDFFFFFFFFF ), LIT64( 0xFFFC000000000000 ) },
-    { LIT64( 0x496F000000000000 ), LIT64( 0x00000001FFFBFFFF ) },
-    { LIT64( 0x3DE09BFE7923A338 ), LIT64( 0xBCC8FBBD7CEC1F4F ) },
-    { LIT64( 0x401CFFFFFFFFFFFF ), LIT64( 0xFFFFFFFEFFFFFF80 ) }
-};
-
-static void time_az_float128_pos( float128 function( float128 ) )
-{
-    clock_t startClock, endClock;
-    int32 count, i;
-    int8 inputNum;
-    float128 a;
-
-    count = 0;
-    inputNum = 0;
-    startClock = clock();
-    do {
-        for ( i = minIterations; i; --i ) {
-            a.low = inputs_float128_pos[ inputNum ].low;
-            a.high = inputs_float128_pos[ inputNum ].high;
-            function( a );
-            inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-        }
-        count += minIterations;
-    } while ( clock() - startClock < CLOCKS_PER_SEC );
-    inputNum = 0;
-    startClock = clock();
-    for ( i = count; i; --i ) {
-        a.low = inputs_float128_pos[ inputNum ].low;
-        a.high = inputs_float128_pos[ inputNum ].high;
-        function( a );
-        inputNum = ( inputNum + 1 ) & ( numInputs_float128 - 1 );
-    }
-    endClock = clock();
-    reportTime( count, endClock - startClock );
-
-}
-
-#endif
-
-enum {
-    INT32_TO_FLOAT32 = 1,
-    INT32_TO_FLOAT64,
-#ifdef FLOATX80
-    INT32_TO_FLOATX80,
-#endif
-#ifdef FLOAT128
-    INT32_TO_FLOAT128,
-#endif
-    INT64_TO_FLOAT32,
-    INT64_TO_FLOAT64,
-#ifdef FLOATX80
-    INT64_TO_FLOATX80,
-#endif
-#ifdef FLOAT128
-    INT64_TO_FLOAT128,
-#endif
-    FLOAT32_TO_INT32,
-    FLOAT32_TO_INT32_ROUND_TO_ZERO,
-    FLOAT32_TO_INT64,
-    FLOAT32_TO_INT64_ROUND_TO_ZERO,
-    FLOAT32_TO_FLOAT64,
-#ifdef FLOATX80
-    FLOAT32_TO_FLOATX80,
-#endif
-#ifdef FLOAT128
-    FLOAT32_TO_FLOAT128,
-#endif
-    FLOAT32_ROUND_TO_INT,
-    FLOAT32_ADD,
-    FLOAT32_SUB,
-    FLOAT32_MUL,
-    FLOAT32_DIV,
-    FLOAT32_REM,
-    FLOAT32_SQRT,
-    FLOAT32_EQ,
-    FLOAT32_LE,
-    FLOAT32_LT,
-    FLOAT32_EQ_SIGNALING,
-    FLOAT32_LE_QUIET,
-    FLOAT32_LT_QUIET,
-    FLOAT64_TO_INT32,
-    FLOAT64_TO_INT32_ROUND_TO_ZERO,
-    FLOAT64_TO_INT64,
-    FLOAT64_TO_INT64_ROUND_TO_ZERO,
-    FLOAT64_TO_FLOAT32,
-#ifdef FLOATX80
-    FLOAT64_TO_FLOATX80,
-#endif
-#ifdef FLOAT128
-    FLOAT64_TO_FLOAT128,
-#endif
-    FLOAT64_ROUND_TO_INT,
-    FLOAT64_ADD,
-    FLOAT64_SUB,
-    FLOAT64_MUL,
-    FLOAT64_DIV,
-    FLOAT64_REM,
-    FLOAT64_SQRT,
-    FLOAT64_EQ,
-    FLOAT64_LE,
-    FLOAT64_LT,
-    FLOAT64_EQ_SIGNALING,
-    FLOAT64_LE_QUIET,
-    FLOAT64_LT_QUIET,
-#ifdef FLOATX80
-    FLOATX80_TO_INT32,
-    FLOATX80_TO_INT32_ROUND_TO_ZERO,
-    FLOATX80_TO_INT64,
-    FLOATX80_TO_INT64_ROUND_TO_ZERO,
-    FLOATX80_TO_FLOAT32,
-    FLOATX80_TO_FLOAT64,
-#ifdef FLOAT128
-    FLOATX80_TO_FLOAT128,
-#endif
-    FLOATX80_ROUND_TO_INT,
-    FLOATX80_ADD,
-    FLOATX80_SUB,
-    FLOATX80_MUL,
-    FLOATX80_DIV,
-    FLOATX80_REM,
-    FLOATX80_SQRT,
-    FLOATX80_EQ,
-    FLOATX80_LE,
-    FLOATX80_LT,
-    FLOATX80_EQ_SIGNALING,
-    FLOATX80_LE_QUIET,
-    FLOATX80_LT_QUIET,
-#endif
-#ifdef FLOAT128
-    FLOAT128_TO_INT32,
-    FLOAT128_TO_INT32_ROUND_TO_ZERO,
-    FLOAT128_TO_INT64,
-    FLOAT128_TO_INT64_ROUND_TO_ZERO,
-    FLOAT128_TO_FLOAT32,
-    FLOAT128_TO_FLOAT64,
-#ifdef FLOATX80
-    FLOAT128_TO_FLOATX80,
-#endif
-    FLOAT128_ROUND_TO_INT,
-    FLOAT128_ADD,
-    FLOAT128_SUB,
-    FLOAT128_MUL,
-    FLOAT128_DIV,
-    FLOAT128_REM,
-    FLOAT128_SQRT,
-    FLOAT128_EQ,
-    FLOAT128_LE,
-    FLOAT128_LT,
-    FLOAT128_EQ_SIGNALING,
-    FLOAT128_LE_QUIET,
-    FLOAT128_LT_QUIET,
-#endif
-    NUM_FUNCTIONS
-};
-
-static struct {
-    char *name;
-    int8 numInputs;
-    flag roundingPrecision, roundingMode;
-    flag tininessMode, tininessModeAtReducedPrecision;
-} functions[ NUM_FUNCTIONS ] = {
-    { 0, 0, 0, 0, 0, 0 },
-    { "int32_to_float32",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "int32_to_float64",                1, FALSE, FALSE, FALSE, FALSE },
-#ifdef FLOATX80
-    { "int32_to_floatx80",               1, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "int32_to_float128",               1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "int64_to_float32",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "int64_to_float64",                1, FALSE, TRUE,  FALSE, FALSE },
-#ifdef FLOATX80
-    { "int64_to_floatx80",               1, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "int64_to_float128",               1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "float32_to_int32",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_to_int32_round_to_zero",  1, FALSE, FALSE, FALSE, FALSE },
-    { "float32_to_int64",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_to_int64_round_to_zero",  1, FALSE, FALSE, FALSE, FALSE },
-    { "float32_to_float64",              1, FALSE, FALSE, FALSE, FALSE },
-#ifdef FLOATX80
-    { "float32_to_floatx80",             1, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "float32_to_float128",             1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "float32_round_to_int",            1, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_add",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_sub",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_mul",                     2, FALSE, TRUE,  TRUE,  FALSE },
-    { "float32_div",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_rem",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_sqrt",                    1, FALSE, TRUE,  FALSE, FALSE },
-    { "float32_eq",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_le",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_lt",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_eq_signaling",            2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_le_quiet",                2, FALSE, FALSE, FALSE, FALSE },
-    { "float32_lt_quiet",                2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_to_int32",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_to_int32_round_to_zero",  1, FALSE, FALSE, FALSE, FALSE },
-    { "float64_to_int64",                1, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_to_int64_round_to_zero",  1, FALSE, FALSE, FALSE, FALSE },
-    { "float64_to_float32",              1, FALSE, TRUE,  TRUE,  FALSE },
-#ifdef FLOATX80
-    { "float64_to_floatx80",             1, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "float64_to_float128",             1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "float64_round_to_int",            1, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_add",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_sub",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_mul",                     2, FALSE, TRUE,  TRUE,  FALSE },
-    { "float64_div",                     2, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_rem",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_sqrt",                    1, FALSE, TRUE,  FALSE, FALSE },
-    { "float64_eq",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_le",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_lt",                      2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_eq_signaling",            2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_le_quiet",                2, FALSE, FALSE, FALSE, FALSE },
-    { "float64_lt_quiet",                2, FALSE, FALSE, FALSE, FALSE },
-#ifdef FLOATX80
-    { "floatx80_to_int32",               1, FALSE, TRUE,  FALSE, FALSE },
-    { "floatx80_to_int32_round_to_zero", 1, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_to_int64",               1, FALSE, TRUE,  FALSE, FALSE },
-    { "floatx80_to_int64_round_to_zero", 1, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_to_float32",             1, FALSE, TRUE,  TRUE,  FALSE },
-    { "floatx80_to_float64",             1, FALSE, TRUE,  TRUE,  FALSE },
-#ifdef FLOAT128
-    { "floatx80_to_float128",            1, FALSE, FALSE, FALSE, FALSE },
-#endif
-    { "floatx80_round_to_int",           1, FALSE, TRUE,  FALSE, FALSE },
-    { "floatx80_add",                    2, TRUE,  TRUE,  FALSE, TRUE  },
-    { "floatx80_sub",                    2, TRUE,  TRUE,  FALSE, TRUE  },
-    { "floatx80_mul",                    2, TRUE,  TRUE,  TRUE,  TRUE  },
-    { "floatx80_div",                    2, TRUE,  TRUE,  FALSE, TRUE  },
-    { "floatx80_rem",                    2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_sqrt",                   1, TRUE,  TRUE,  FALSE, FALSE },
-    { "floatx80_eq",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_le",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_lt",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_eq_signaling",           2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_le_quiet",               2, FALSE, FALSE, FALSE, FALSE },
-    { "floatx80_lt_quiet",               2, FALSE, FALSE, FALSE, FALSE },
-#endif
-#ifdef FLOAT128
-    { "float128_to_int32",               1, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_to_int32_round_to_zero", 1, FALSE, FALSE, FALSE, FALSE },
-    { "float128_to_int64",               1, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_to_int64_round_to_zero", 1, FALSE, FALSE, FALSE, FALSE },
-    { "float128_to_float32",             1, FALSE, TRUE,  TRUE,  FALSE },
-    { "float128_to_float64",             1, FALSE, TRUE,  TRUE,  FALSE },
-#ifdef FLOATX80
-    { "float128_to_floatx80",            1, FALSE, TRUE,  TRUE,  FALSE },
-#endif
-    { "float128_round_to_int",           1, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_add",                    2, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_sub",                    2, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_mul",                    2, FALSE, TRUE,  TRUE,  FALSE },
-    { "float128_div",                    2, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_rem",                    2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_sqrt",                   1, FALSE, TRUE,  FALSE, FALSE },
-    { "float128_eq",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_le",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_lt",                     2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_eq_signaling",           2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_le_quiet",               2, FALSE, FALSE, FALSE, FALSE },
-    { "float128_lt_quiet",               2, FALSE, FALSE, FALSE, FALSE },
-#endif
-};
-
-enum {
-    ROUND_NEAREST_EVEN = 1,
-    ROUND_TO_ZERO,
-    ROUND_DOWN,
-    ROUND_UP,
-    NUM_ROUNDINGMODES
-};
-enum {
-    TININESS_BEFORE_ROUNDING = 1,
-    TININESS_AFTER_ROUNDING,
-    NUM_TININESSMODES
-};
-
-static void
- timeFunctionVariety(
-     uint8 functionCode,
-     int8 roundingPrecision,
-     int8 roundingMode,
-     int8 tininessMode
- )
-{
-    uint8 roundingCode;
-    int8 tininessCode;
-
-    functionName = functions[ functionCode ].name;
-    if ( roundingPrecision == 32 ) {
-        roundingPrecisionName = "32";
-    }
-    else if ( roundingPrecision == 64 ) {
-        roundingPrecisionName = "64";
-    }
-    else if ( roundingPrecision == 80 ) {
-        roundingPrecisionName = "80";
-    }
-    else {
-        roundingPrecisionName = 0;
-    }
-#ifdef FLOATX80
-    floatx80_rounding_precision = roundingPrecision;
-#endif
-    switch ( roundingMode ) {
-     case 0:
-        roundingModeName = 0;
-        roundingCode = float_round_nearest_even;
-        break;
-     case ROUND_NEAREST_EVEN:
-        roundingModeName = "nearest_even";
-        roundingCode = float_round_nearest_even;
-        break;
-     case ROUND_TO_ZERO:
-        roundingModeName = "to_zero";
-        roundingCode = float_round_to_zero;
-        break;
-     case ROUND_DOWN:
-        roundingModeName = "down";
-        roundingCode = float_round_down;
-        break;
-     case ROUND_UP:
-        roundingModeName = "up";
-        roundingCode = float_round_up;
-        break;
-    }
-    float_rounding_mode = roundingCode;
-    switch ( tininessMode ) {
-     case 0:
-        tininessModeName = 0;
-        tininessCode = float_tininess_after_rounding;
-        break;
-     case TININESS_BEFORE_ROUNDING:
-        tininessModeName = "before";
-        tininessCode = float_tininess_before_rounding;
-        break;
-     case TININESS_AFTER_ROUNDING:
-        tininessModeName = "after";
-        tininessCode = float_tininess_after_rounding;
-        break;
-    }
-    float_detect_tininess = tininessCode;
-    switch ( functionCode ) {
-     case INT32_TO_FLOAT32:
-        time_a_int32_z_float32( int32_to_float32 );
-        break;
-     case INT32_TO_FLOAT64:
-        time_a_int32_z_float64( int32_to_float64 );
-        break;
-#ifdef FLOATX80
-     case INT32_TO_FLOATX80:
-        time_a_int32_z_floatx80( int32_to_floatx80 );
-        break;
-#endif
-#ifdef FLOAT128
-     case INT32_TO_FLOAT128:
-        time_a_int32_z_float128( int32_to_float128 );
-        break;
-#endif
-     case INT64_TO_FLOAT32:
-        time_a_int64_z_float32( int64_to_float32 );
-        break;
-     case INT64_TO_FLOAT64:
-        time_a_int64_z_float64( int64_to_float64 );
-        break;
-#ifdef FLOATX80
-     case INT64_TO_FLOATX80:
-        time_a_int64_z_floatx80( int64_to_floatx80 );
-        break;
-#endif
-#ifdef FLOAT128
-     case INT64_TO_FLOAT128:
-        time_a_int64_z_float128( int64_to_float128 );
-        break;
-#endif
-     case FLOAT32_TO_INT32:
-        time_a_float32_z_int32( float32_to_int32 );
-        break;
-     case FLOAT32_TO_INT32_ROUND_TO_ZERO:
-        time_a_float32_z_int32( float32_to_int32_round_to_zero );
-        break;
-     case FLOAT32_TO_INT64:
-        time_a_float32_z_int64( float32_to_int64 );
-        break;
-     case FLOAT32_TO_INT64_ROUND_TO_ZERO:
-        time_a_float32_z_int64( float32_to_int64_round_to_zero );
-        break;
-     case FLOAT32_TO_FLOAT64:
-        time_a_float32_z_float64( float32_to_float64 );
-        break;
-#ifdef FLOATX80
-     case FLOAT32_TO_FLOATX80:
-        time_a_float32_z_floatx80( float32_to_floatx80 );
-        break;
-#endif
-#ifdef FLOAT128
-     case FLOAT32_TO_FLOAT128:
-        time_a_float32_z_float128( float32_to_float128 );
-        break;
-#endif
-     case FLOAT32_ROUND_TO_INT:
-        time_az_float32( float32_round_to_int );
-        break;
-     case FLOAT32_ADD:
-        time_abz_float32( float32_add );
-        break;
-     case FLOAT32_SUB:
-        time_abz_float32( float32_sub );
-        break;
-     case FLOAT32_MUL:
-        time_abz_float32( float32_mul );
-        break;
-     case FLOAT32_DIV:
-        time_abz_float32( float32_div );
-        break;
-     case FLOAT32_REM:
-        time_abz_float32( float32_rem );
-        break;
-     case FLOAT32_SQRT:
-        time_az_float32_pos( float32_sqrt );
-        break;
-     case FLOAT32_EQ:
-        time_ab_float32_z_flag( float32_eq );
-        break;
-     case FLOAT32_LE:
-        time_ab_float32_z_flag( float32_le );
-        break;
-     case FLOAT32_LT:
-        time_ab_float32_z_flag( float32_lt );
-        break;
-     case FLOAT32_EQ_SIGNALING:
-        time_ab_float32_z_flag( float32_eq_signaling );
-        break;
-     case FLOAT32_LE_QUIET:
-        time_ab_float32_z_flag( float32_le_quiet );
-        break;
-     case FLOAT32_LT_QUIET:
-        time_ab_float32_z_flag( float32_lt_quiet );
-        break;
-     case FLOAT64_TO_INT32:
-        time_a_float64_z_int32( float64_to_int32 );
-        break;
-     case FLOAT64_TO_INT32_ROUND_TO_ZERO:
-        time_a_float64_z_int32( float64_to_int32_round_to_zero );
-        break;
-     case FLOAT64_TO_INT64:
-        time_a_float64_z_int64( float64_to_int64 );
-        break;
-     case FLOAT64_TO_INT64_ROUND_TO_ZERO:
-        time_a_float64_z_int64( float64_to_int64_round_to_zero );
-        break;
-     case FLOAT64_TO_FLOAT32:
-        time_a_float64_z_float32( float64_to_float32 );
-        break;
-#ifdef FLOATX80
-     case FLOAT64_TO_FLOATX80:
-        time_a_float64_z_floatx80( float64_to_floatx80 );
-        break;
-#endif
-#ifdef FLOAT128
-     case FLOAT64_TO_FLOAT128:
-        time_a_float64_z_float128( float64_to_float128 );
-        break;
-#endif
-     case FLOAT64_ROUND_TO_INT:
-        time_az_float64( float64_round_to_int );
-        break;
-     case FLOAT64_ADD:
-        time_abz_float64( float64_add );
-        break;
-     case FLOAT64_SUB:
-        time_abz_float64( float64_sub );
-        break;
-     case FLOAT64_MUL:
-        time_abz_float64( float64_mul );
-        break;
-     case FLOAT64_DIV:
-        time_abz_float64( float64_div );
-        break;
-     case FLOAT64_REM:
-        time_abz_float64( float64_rem );
-        break;
-     case FLOAT64_SQRT:
-        time_az_float64_pos( float64_sqrt );
-        break;
-     case FLOAT64_EQ:
-        time_ab_float64_z_flag( float64_eq );
-        break;
-     case FLOAT64_LE:
-        time_ab_float64_z_flag( float64_le );
-        break;
-     case FLOAT64_LT:
-        time_ab_float64_z_flag( float64_lt );
-        break;
-     case FLOAT64_EQ_SIGNALING:
-        time_ab_float64_z_flag( float64_eq_signaling );
-        break;
-     case FLOAT64_LE_QUIET:
-        time_ab_float64_z_flag( float64_le_quiet );
-        break;
-     case FLOAT64_LT_QUIET:
-        time_ab_float64_z_flag( float64_lt_quiet );
-        break;
-#ifdef FLOATX80
-     case FLOATX80_TO_INT32:
-        time_a_floatx80_z_int32( floatx80_to_int32 );
-        break;
-     case FLOATX80_TO_INT32_ROUND_TO_ZERO:
-        time_a_floatx80_z_int32( floatx80_to_int32_round_to_zero );
-        break;
-     case FLOATX80_TO_INT64:
-        time_a_floatx80_z_int64( floatx80_to_int64 );
-        break;
-     case FLOATX80_TO_INT64_ROUND_TO_ZERO:
-        time_a_floatx80_z_int64( floatx80_to_int64_round_to_zero );
-        break;
-     case FLOATX80_TO_FLOAT32:
-        time_a_floatx80_z_float32( floatx80_to_float32 );
-        break;
-     case FLOATX80_TO_FLOAT64:
-        time_a_floatx80_z_float64( floatx80_to_float64 );
-        break;
-#ifdef FLOAT128
-     case FLOATX80_TO_FLOAT128:
-        time_a_floatx80_z_float128( floatx80_to_float128 );
-        break;
-#endif
-     case FLOATX80_ROUND_TO_INT:
-        time_az_floatx80( floatx80_round_to_int );
-        break;
-     case FLOATX80_ADD:
-        time_abz_floatx80( floatx80_add );
-        break;
-     case FLOATX80_SUB:
-        time_abz_floatx80( floatx80_sub );
-        break;
-     case FLOATX80_MUL:
-        time_abz_floatx80( floatx80_mul );
-        break;
-     case FLOATX80_DIV:
-        time_abz_floatx80( floatx80_div );
-        break;
-     case FLOATX80_REM:
-        time_abz_floatx80( floatx80_rem );
-        break;
-     case FLOATX80_SQRT:
-        time_az_floatx80_pos( floatx80_sqrt );
-        break;
-     case FLOATX80_EQ:
-        time_ab_floatx80_z_flag( floatx80_eq );
-        break;
-     case FLOATX80_LE:
-        time_ab_floatx80_z_flag( floatx80_le );
-        break;
-     case FLOATX80_LT:
-        time_ab_floatx80_z_flag( floatx80_lt );
-        break;
-     case FLOATX80_EQ_SIGNALING:
-        time_ab_floatx80_z_flag( floatx80_eq_signaling );
-        break;
-     case FLOATX80_LE_QUIET:
-        time_ab_floatx80_z_flag( floatx80_le_quiet );
-        break;
-     case FLOATX80_LT_QUIET:
-        time_ab_floatx80_z_flag( floatx80_lt_quiet );
-        break;
-#endif
-#ifdef FLOAT128
-     case FLOAT128_TO_INT32:
-        time_a_float128_z_int32( float128_to_int32 );
-        break;
-     case FLOAT128_TO_INT32_ROUND_TO_ZERO:
-        time_a_float128_z_int32( float128_to_int32_round_to_zero );
-        break;
-     case FLOAT128_TO_INT64:
-        time_a_float128_z_int64( float128_to_int64 );
-        break;
-     case FLOAT128_TO_INT64_ROUND_TO_ZERO:
-        time_a_float128_z_int64( float128_to_int64_round_to_zero );
-        break;
-     case FLOAT128_TO_FLOAT32:
-        time_a_float128_z_float32( float128_to_float32 );
-        break;
-     case FLOAT128_TO_FLOAT64:
-        time_a_float128_z_float64( float128_to_float64 );
-        break;
-#ifdef FLOATX80
-     case FLOAT128_TO_FLOATX80:
-        time_a_float128_z_floatx80( float128_to_floatx80 );
-        break;
-#endif
-     case FLOAT128_ROUND_TO_INT:
-        time_az_float128( float128_round_to_int );
-        break;
-     case FLOAT128_ADD:
-        time_abz_float128( float128_add );
-        break;
-     case FLOAT128_SUB:
-        time_abz_float128( float128_sub );
-        break;
-     case FLOAT128_MUL:
-        time_abz_float128( float128_mul );
-        break;
-     case FLOAT128_DIV:
-        time_abz_float128( float128_div );
-        break;
-     case FLOAT128_REM:
-        time_abz_float128( float128_rem );
-        break;
-     case FLOAT128_SQRT:
-        time_az_float128_pos( float128_sqrt );
-        break;
-     case FLOAT128_EQ:
-        time_ab_float128_z_flag( float128_eq );
-        break;
-     case FLOAT128_LE:
-        time_ab_float128_z_flag( float128_le );
-        break;
-     case FLOAT128_LT:
-        time_ab_float128_z_flag( float128_lt );
-        break;
-     case FLOAT128_EQ_SIGNALING:
-        time_ab_float128_z_flag( float128_eq_signaling );
-        break;
-     case FLOAT128_LE_QUIET:
-        time_ab_float128_z_flag( float128_le_quiet );
-        break;
-     case FLOAT128_LT_QUIET:
-        time_ab_float128_z_flag( float128_lt_quiet );
-        break;
-#endif
-    }
-
-}
-
-static void
- timeFunction(
-     uint8 functionCode,
-     int8 roundingPrecisionIn,
-     int8 roundingModeIn,
-     int8 tininessModeIn
- )
-{
-    int8 roundingPrecision, roundingMode, tininessMode;
-
-    roundingPrecision = 32;
-    for (;;) {
-        if ( ! functions[ functionCode ].roundingPrecision ) {
-            roundingPrecision = 0;
-        }
-        else if ( roundingPrecisionIn ) {
-            roundingPrecision = roundingPrecisionIn;
-        }
-        for ( roundingMode = 1;
-              roundingMode < NUM_ROUNDINGMODES;
-              ++roundingMode
-            ) {
-            if ( ! functions[ functionCode ].roundingMode ) {
-                roundingMode = 0;
-            }
-            else if ( roundingModeIn ) {
-                roundingMode = roundingModeIn;
-            }
-            for ( tininessMode = 1;
-                  tininessMode < NUM_TININESSMODES;
-                  ++tininessMode
-                ) {
-                if (    ( roundingPrecision == 32 )
-                     || ( roundingPrecision == 64 ) ) {
-                    if ( ! functions[ functionCode ]
-                               .tininessModeAtReducedPrecision
-                       ) {
-                        tininessMode = 0;
-                    }
-                    else if ( tininessModeIn ) {
-                        tininessMode = tininessModeIn;
-                    }
-                }
-                else {
-                    if ( ! functions[ functionCode ].tininessMode ) {
-                        tininessMode = 0;
-                    }
-                    else if ( tininessModeIn ) {
-                        tininessMode = tininessModeIn;
-                    }
-                }
-                timeFunctionVariety(
-                    functionCode, roundingPrecision, roundingMode, tininessMode
-                );
-                if ( tininessModeIn || ! tininessMode ) break;
-            }
-            if ( roundingModeIn || ! roundingMode ) break;
-        }
-        if ( roundingPrecisionIn || ! roundingPrecision ) break;
-        if ( roundingPrecision == 80 ) {
-            break;
-        }
-        else if ( roundingPrecision == 64 ) {
-            roundingPrecision = 80;
-        }
-        else if ( roundingPrecision == 32 ) {
-            roundingPrecision = 64;
-        }
-    }
-
-}
-
-main( int argc, char **argv )
-{
-    char *argPtr;
-    flag functionArgument;
-    uint8 functionCode;
-    int8 operands, roundingPrecision, roundingMode, tininessMode;
-
-    if ( argc <= 1 ) goto writeHelpMessage;
-    functionArgument = FALSE;
-    functionCode = 0;
-    operands = 0;
-    roundingPrecision = 0;
-    roundingMode = 0;
-    tininessMode = 0;
-    --argc;
-    ++argv;
-    while ( argc && ( argPtr = argv[ 0 ] ) ) {
-        if ( argPtr[ 0 ] == '-' ) ++argPtr;
-        if ( strcmp( argPtr, "help" ) == 0 ) {
- writeHelpMessage:
-            fputs(
-"timesoftfloat [<option>...] <function>\n"
-"  <option>:  (* is default)\n"
-"    -help            --Write this message and exit.\n"
-#ifdef FLOATX80
-"    -precision32     --Only time rounding precision equivalent to float32.\n"
-"    -precision64     --Only time rounding precision equivalent to float64.\n"
-"    -precision80     --Only time maximum rounding precision.\n"
-#endif
-"    -nearesteven     --Only time rounding to nearest/even.\n"
-"    -tozero          --Only time rounding to zero.\n"
-"    -down            --Only time rounding down.\n"
-"    -up              --Only time rounding up.\n"
-"    -tininessbefore  --Only time underflow tininess before rounding.\n"
-"    -tininessafter   --Only time underflow tininess after rounding.\n"
-"  <function>:\n"
-"    int32_to_<float>                 <float>_add   <float>_eq\n"
-"    <float>_to_int32                 <float>_sub   <float>_le\n"
-"    <float>_to_int32_round_to_zero   <float>_mul   <float>_lt\n"
-"    int64_to_<float>                 <float>_div   <float>_eq_signaling\n"
-"    <float>_to_int64                 <float>_rem   <float>_le_quiet\n"
-"    <float>_to_int64_round_to_zero                 <float>_lt_quiet\n"
-"    <float>_to_<float>\n"
-"    <float>_round_to_int\n"
-"    <float>_sqrt\n"
-"    -all1            --All 1-operand functions.\n"
-"    -all2            --All 2-operand functions.\n"
-"    -all             --All functions.\n"
-"  <float>:\n"
-"    float32          --Single precision.\n"
-"    float64          --Double precision.\n"
-#ifdef FLOATX80
-"    floatx80         --Extended double precision.\n"
-#endif
-#ifdef FLOAT128
-"    float128         --Quadruple precision.\n"
-#endif
-                ,
-                stdout
-            );
-            return EXIT_SUCCESS;
-        }
-#ifdef FLOATX80
-        else if ( strcmp( argPtr, "precision32" ) == 0 ) {
-            roundingPrecision = 32;
-        }
-        else if ( strcmp( argPtr, "precision64" ) == 0 ) {
-            roundingPrecision = 64;
-        }
-        else if ( strcmp( argPtr, "precision80" ) == 0 ) {
-            roundingPrecision = 80;
-        }
-#endif
-        else if (    ( strcmp( argPtr, "nearesteven" ) == 0 )
-                  || ( strcmp( argPtr, "nearest_even" ) == 0 ) ) {
-            roundingMode = ROUND_NEAREST_EVEN;
-        }
-        else if (    ( strcmp( argPtr, "tozero" ) == 0 )
-                  || ( strcmp( argPtr, "to_zero" ) == 0 ) ) {
-            roundingMode = ROUND_TO_ZERO;
-        }
-        else if ( strcmp( argPtr, "down" ) == 0 ) {
-            roundingMode = ROUND_DOWN;
-        }
-        else if ( strcmp( argPtr, "up" ) == 0 ) {
-            roundingMode = ROUND_UP;
-        }
-        else if ( strcmp( argPtr, "tininessbefore" ) == 0 ) {
-            tininessMode = TININESS_BEFORE_ROUNDING;
-        }
-        else if ( strcmp( argPtr, "tininessafter" ) == 0 ) {
-            tininessMode = TININESS_AFTER_ROUNDING;
-        }
-        else if ( strcmp( argPtr, "all1" ) == 0 ) {
-            functionArgument = TRUE;
-            functionCode = 0;
-            operands = 1;
-        }
-        else if ( strcmp( argPtr, "all2" ) == 0 ) {
-            functionArgument = TRUE;
-            functionCode = 0;
-            operands = 2;
-        }
-        else if ( strcmp( argPtr, "all" ) == 0 ) {
-            functionArgument = TRUE;
-            functionCode = 0;
-            operands = 0;
-        }
-        else {
-            for ( functionCode = 1;
-                  functionCode < NUM_FUNCTIONS;
-                  ++functionCode 
-                ) {
-                if ( strcmp( argPtr, functions[ functionCode ].name ) == 0 ) {
-                    break;
-                }
-            }
-            if ( functionCode == NUM_FUNCTIONS ) {
-                fail( "Invalid option or function `%s'", argv[ 0 ] );
-            }
-            functionArgument = TRUE;
-        }
-        --argc;
-        ++argv;
-    }
-    if ( ! functionArgument ) fail( "Function argument required" );
-    if ( functionCode ) {
-        timeFunction(
-            functionCode, roundingPrecision, roundingMode, tininessMode );
-    }
-    else if ( operands == 1 ) {
-        for ( functionCode = 1; functionCode < NUM_FUNCTIONS; ++functionCode
-            ) {
-            if ( functions[ functionCode ].numInputs == 1 ) {
-                timeFunction(
-                    functionCode, roundingPrecision, roundingMode, tininessMode
-                );
-            }
-        }
-    }
-    else if ( operands == 2 ) {
-        for ( functionCode = 1; functionCode < NUM_FUNCTIONS; ++functionCode
-            ) {
-            if ( functions[ functionCode ].numInputs == 2 ) {
-                timeFunction(
-                    functionCode, roundingPrecision, roundingMode, tininessMode
-                );
-            }
-        }
-    }
-    else {
-        for ( functionCode = 1; functionCode < NUM_FUNCTIONS; ++functionCode
-            ) {
-            timeFunction(
-                functionCode, roundingPrecision, roundingMode, tininessMode );
-        }
-    }
-    return EXIT_SUCCESS;
-
-}
-
diff --git a/lib/libc_bsd/softfloat/timesoftfloat.txt b/lib/libc_bsd/softfloat/timesoftfloat.txt
deleted file mode 100644
index 0d86cb3..0000000
--- a/lib/libc_bsd/softfloat/timesoftfloat.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-$NetBSD: timesoftfloat.txt,v 1.1 2000/06/06 08:15:11 bjh21 Exp $
-$FreeBSD: releng/10.2/lib/libc/softfloat/timesoftfloat.txt 129203 2004-05-14 12:13:06Z cognet $
-
-Documentation for the `timesoftfloat' Program of SoftFloat Release 2a
-
-John R. Hauser
-1998 December 14
-
-
--------------------------------------------------------------------------------
-Introduction
-
-The `timesoftfloat' program evaluates the speed of SoftFloat's floating-
-point routines.  Each routine can be evaluated for every relevant rounding
-mode, tininess mode, and/or rounding precision.
-
-
--------------------------------------------------------------------------------
-Contents
-
-    Introduction
-    Contents
-    Legal Notice
-    Executing `timesoftfloat'
-    Options
-        -help
-        -precision32, -precision64, -precision80
-        -nearesteven, -tozero, -down, -up
-        -tininessbefore, -tininessafter
-    Function Sets
-
-
-
--------------------------------------------------------------------------------
-Legal Notice
-
-The `timesoftfloat' program was written by John R. Hauser.
-
-THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE.  Although reasonable effort
-has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
-TIMES RESULT IN INCORRECT BEHAVIOR.  USE OF THIS SOFTWARE IS RESTRICTED TO
-PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY
-AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE.
-
-
--------------------------------------------------------------------------------
-Executing `timesoftfloat'
-
-The `timesoftfloat' program is intended to be invoked from a command line
-interpreter as follows:
-
-    timesoftfloat [<option>...] <function>
-
-Here square brackets ([]) indicate optional items, while angled brackets
-(<>) denote parameters to be filled in.  The `<function>' argument is
-the name of the SoftFloat routine to evaluate, such as `float32_add' or
-`float64_to_int32'.  The allowed options are detailed in the next section,
-_Options_.  If `timesoftfloat' is executed without any arguments, a summary
-of usage is written.  It is also possible to evaluate all machine functions
-in a single invocation as explained in the section _Function_Sets_ later in
-this document.
-
-Ordinarily, a function's speed will be evaulated separately for each of
-the four rounding modes, one after the other.  If the rounding mode is not
-supposed to have any affect on the results of a function--for instance,
-some operations do not require rounding--only the nearest/even rounding mode
-is timed.  In the same way, if a function is affected by the way in which
-underflow tininess is detected, `timesoftfloat' times the function both with
-tininess detected before rounding and after rounding.  For extended double-
-precision operations affected by rounding precision control, `timesoftfloat'
-also times the function for all three rounding precision modes, one after
-the other.  Evaluation of a function can be limited to a single rounding
-mode, a single tininess mode, and/or a single rounding precision with
-appropriate options (see _Options_).
-
-For each function and mode evaluated, `timesoftfloat' reports the speed of
-the function in kops/s, or ``thousands of operations per second''.  This
-unit of measure differs from the traditional MFLOPS (``millions of floating-
-point operations per second'') only in being a factor of 1000 smaller.
-(1000 kops/s is exactly 1 MFLOPS.)  Speeds are reported in thousands instead
-of millions because software floating-point often executes at less than
-1 MFLOPS.
-
-The speeds reported by `timesoftfloat' may be affected somewhat by other
-programs executing at the same time as `timesoftfloat'.
-
-Note that the remainder operations (`float32_rem', `float64_rem',
-`floatx80_rem' and `float128_rem') will be markedly slower than other
-operations, particularly for extended double precision (`floatx80') and
-quadruple precision (`float128').  This is inherent to the remainder
-function itself and is not a failing of the SoftFloat implementation.
-
-
--------------------------------------------------------------------------------
-Options
-
-The `timesoftfloat' program accepts several command options.  If mutually
-contradictory options are given, the last one has priority.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--help
-
-The `-help' option causes a summary of program usage to be written, after
-which the program exits.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--precision32, -precision64, -precision80
-
-For extended double-precision functions affected by rounding precision
-control, the `-precision32' option restricts evaluation to only the cases
-in which rounding precision is equivalent to single precision.  The other
-rounding precision options are not timed.  Likewise, the `-precision64'
-and `-precision80' options fix the rounding precision equivalent to double
-precision or extended double precision, respectively.  These options are
-ignored for functions not affected by rounding precision control.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--nearesteven, -tozero, -down, -up
-
-The `-nearesteven' option restricts evaluation to only the cases in which
-the rounding mode is nearest/even.  The other rounding mode options are not
-timed.  Likewise, `-tozero' forces rounding to zero; `-down' forces rounding
-down; and `-up' forces rounding up.  These options are ignored for functions
-that are exact and thus do not round.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--tininessbefore, -tininessafter
-
-The `-tininessbefore' option restricts evaluation to only the cases
-detecting underflow tininess before rounding.  Tininess after rounding
-is not timed.  Likewise, `-tininessafter' forces underflow tininess to be
-detected after rounding only.  These options are ignored for functions not
-affected by the way in which underflow tininess is detected.
-
-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
--------------------------------------------------------------------------------
-Function Sets
-
-Just as `timesoftfloat' can test an operation for all four rounding modes in
-sequence, multiple operations can also be tested with a single invocation.
-Three sets are recognized:  `-all1', `-all2', and `-all'.  The set `-all1'
-comprises all one-operand functions; `-all2' is all two-operand functions;
-and `-all' is all functions.  A function set can be used in place of a
-function name in the command line, as in
-
-    timesoftfloat [<option>...] -all
-
-
diff --git a/lib/libc_bsd/softfloat/unorddf2.c b/lib/libc_bsd/softfloat/unorddf2.c
deleted file mode 100644
index 7df091b..0000000
--- a/lib/libc_bsd/softfloat/unorddf2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $NetBSD: unorddf2.c,v 1.1 2003/05/06 08:58:19 rearnsha Exp $ */
-
-/*
- * Written by Richard Earnshaw, 2003.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/unorddf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __unorddf2(float64, float64);
-
-flag
-__unorddf2(float64 a, float64 b)
-{
-	/*
-	 * The comparison is unordered if either input is a NaN.
-	 * Test for this by comparing each operand with itself.
-	 * We must perform both comparisons to correctly check for
-	 * signalling NaNs.
-	 */
-	return 1 ^ (float64_eq(a, a) & float64_eq(b, b));
-}
diff --git a/lib/libc_bsd/softfloat/unordsf2.c b/lib/libc_bsd/softfloat/unordsf2.c
deleted file mode 100644
index b2c3cc3..0000000
--- a/lib/libc_bsd/softfloat/unordsf2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* $NetBSD: unordsf2.c,v 1.1 2003/05/06 08:58:20 rearnsha Exp $ */
-
-/*
- * Written by Richard Earnshaw, 2003.  This file is in the Public Domain.
- */
-
-#include "softfloat-for-gcc.h"
-#include "milieu.h"
-#include "softfloat.h"
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/softfloat/unordsf2.c 129203 2004-05-14 12:13:06Z cognet $");
-
-flag __unordsf2(float32, float32);
-
-flag
-__unordsf2(float32 a, float32 b)
-{
-	/*
-	 * The comparison is unordered if either input is a NaN.
-	 * Test for this by comparing each operand with itself.
-	 * We must perform both comparisons to correctly check for
-	 * signalling NaNs.
-	 */
-	return 1 ^ (float32_eq(a, a) & float32_eq(b, b));
-}
diff --git a/lib/libc_bsd/sparc64/Makefile.inc b/lib/libc_bsd/sparc64/Makefile.inc
deleted file mode 100644
index f2e300d..0000000
--- a/lib/libc_bsd/sparc64/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Makefile.incl 246117 2013-01-30 12:48:16Z kib $
-#
-# Machine dependent definitions for the ultra sparc architecture.
-#
-
-Makefile.incl"
-
-SRCS+=	__vdso_gettc.c
-
-# Long double is quad precision
-GDTOASRCS+=strtorQ.c
-MDSRCS+=machdep_ldisQ.c
-SYM_MAPS+=${.CURDIR}/sparc64/Symbol.map
diff --git a/lib/libc_bsd/sparc64/SYS.h b/lib/libc_bsd/sparc64/SYS.h
deleted file mode 100644
index 74351f7..0000000
--- a/lib/libc_bsd/sparc64/SYS.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	@(#)SYS.h	5.5 (Berkeley) 5/7/91
- *	from: FreeBSD: src/lib/libc/i386/SYS.h,v 1.20 2001/01/29
- * $FreeBSD: releng/10.2/lib/libc/sparc64/SYS.h 171217 2007-07-04 23:18:38Z peter $
- */
-
-#include <sys/syscall.h>
-
-#include <machine/asm.h>
-#include <machine/utrap.h>
-
-#define	ERROR() \
-	mov	%o7, %g1 ; \
-	call	HIDENAME(cerror) ; \
-	 mov	%g1, %o7
-
-#define	_SYSENTRY(x) \
-ENTRY(__CONCAT(__sys_,x)) ; \
-	.weak	CNAME(x) ; \
-	.type	CNAME(x),@function ; \
-	.set	CNAME(x),CNAME(__CONCAT(__sys_,x)) ; \
-	.weak	CNAME(__CONCAT(_,x)) ; \
-	.type	CNAME(__CONCAT(_,x)), @function ; \
-	.set	CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x))
-
-#define	_SYSEND(x) \
-	.size	CNAME(__CONCAT(__sys_,x)), . - CNAME(__CONCAT(__sys_,x)) ; \
-	.size	CNAME(__CONCAT(_,x)), . - CNAME(__CONCAT(__sys_,x)) ; \
-	.size	CNAME(__CONCAT(,x)), . - CNAME(__CONCAT(__sys_,x))
-
-#define	_SYSCALL(x) \
-	mov	__CONCAT(SYS_,x), %g1 ; \
-	ta	%xcc, ST_SYSCALL ; \
-	bcc,a,pt %xcc, 1f ; \
-	 nop ; \
-	ERROR() ; \
-1:
-
-#define	RSYSCALL(x) \
-_SYSENTRY(x) ; \
-	_SYSCALL(x) ; \
-	retl ; \
-	 nop ; \
-	_SYSEND(x)
-
-#define	PSEUDO(x) \
-ENTRY(__CONCAT(__sys_,x)) ; \
-	.weak	CNAME(__CONCAT(_,x)) ; \
-	.type	CNAME(__CONCAT(_,x)),@function ; \
-	.set	CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)) ; \
-	_SYSCALL(x) ; \
-	retl ; \
-	 nop ; \
-	.size	CNAME(__CONCAT(__sys_,x)), . - CNAME(__CONCAT(__sys_,x)) ; \
-	.size	CNAME(__CONCAT(_,x)), . - CNAME(__CONCAT(__sys_,x))
diff --git a/lib/libc_bsd/sparc64/Symbol.map b/lib/libc_bsd/sparc64/Symbol.map
deleted file mode 100644
index 120ba78..0000000
--- a/lib/libc_bsd/sparc64/Symbol.map
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/sparc64/Symbol.map 226606 2011-10-21 06:40:36Z das $
- */
-
-/*
- * This only needs to contain symbols that are not listed in
- * symbol maps from other parts of libc (i.e., not found in
- * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...).
- */
-FBSD_1.0 {
-	/* PSEUDO syscalls */
-	_exit;
-
-	_mcount;
-	_setjmp;
-	_longjmp;
-	fabs;
-	__flt_rounds;
-	fpgetmask;
-	fpgetround;
-	fpgetsticky;
-	fpsetmask;
-	fpsetround;
-	__infinity;
-	__nan;
-	makecontext;
-	setjmp;
-	longjmp;
-	sigsetjmp;
-	siglongjmp;
-	htonl;
-	htons;
-	ntohl;
-	ntohs;
-	brk;
-	exect;
-	sbrk;
-	vfork;
-
-	/* SCD libc 64 psABI */
-	_Qp_sqrt;
-	_Qp_add;
-	_Qp_div;
-	_Qp_mul;
-	_Qp_sub;
-	_Qp_dtoq;
-	_Qp_itoq;
-	_Qp_stoq;
-	_Qp_xtoq;
-	_Qp_uitoq;
-	_Qp_uxtoq;
-	_Qp_qtod;
-	_Qp_qtoi;
-	_Qp_qtos;
-	_Qp_qtox;
-	_Qp_qtoui;
-	_Qp_qtoux;
-	_Qp_feq;
-	_Qp_fge;
-	_Qp_fgt;
-	_Qp_fle;
-	_Qp_flt;
-	_Qp_fne;
-	_Qp_cmp;
-	_Qp_cmpe;
-	__dtoul;
-	__sparc_utrap_install;
-};
-
-FBSDprivate_1.0 {
-	/* PSEUDO syscalls */
-	__sys_getlogin;
-	_getlogin;
-	__sys_exit;
-
-	_set_tp;
-	___longjmp;
-	__makecontext;
-	__longjmp;
-	signalcontext;
-	__signalcontext;
-	__siglongjmp;
-	.curbrk;
-	.minbrk;
-	__sys_brk;
-	_brk;
-	.cerror;
-	__sys_exect;
-	_exect;
-	_end;
-	__sys_sbrk;
-	_sbrk;
-	__sys_vfork;
-	_vfork;
-
-	/* used in src/lib/csu/sparc64/crt1.c */
-	__sparc_utrap_setup;
-};
diff --git a/lib/libc_bsd/sparc64/_fpmath.h b/lib/libc_bsd/sparc64/_fpmath.h
deleted file mode 100644
index ed66bda..0000000
--- a/lib/libc_bsd/sparc64/_fpmath.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 2002, 2003 David Schultz <das@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.
- *
- * 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: releng/10.2/lib/libc/sparc64/_fpmath.h 175459 2008-01-18 21:25:51Z das $
- */
-
-union IEEEl2bits {
-	long double	e;
-	struct {
-		unsigned int	sign	:1;
-		unsigned int	exp	:15;
-		unsigned long	manh	:48;
-		unsigned long	manl	:64;
-	} bits;
-	struct {
-		unsigned int	expsign	:16;
-		unsigned long	manh	:48;
-		unsigned long	manl	:64;
-	} xbits;
-};
-
-#define	mask_nbit_l(u)	((void)0)
-#define	LDBL_IMPLICIT_NBIT
-#define	LDBL_NBIT	0
-
-#define	LDBL_MANH_SIZE	48
-#define	LDBL_MANL_SIZE	64
-
-#define	LDBL_TO_ARRAY32(u, a) do {			\
-	(a)[0] = (uint32_t)(u).bits.manl;		\
-	(a)[1] = (uint32_t)((u).bits.manl >> 32);      	\
-	(a)[2] = (uint32_t)(u).bits.manh;		\
-	(a)[3] = (uint32_t)((u).bits.manh >> 32);	\
-} while(0)
diff --git a/lib/libc_bsd/sparc64/arith.h b/lib/libc_bsd/sparc64/arith.h
deleted file mode 100644
index 7a30443..0000000
--- a/lib/libc_bsd/sparc64/arith.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * $FreeBSD: releng/10.2/lib/libc/sparc64/arith.h 114839 2003-05-08 13:50:44Z das $
- */
-
-/*
- * NOTE: The definitions in this file must be correct or strtod(3) and
- * floating point formats in printf(3) will break!  The file can be
- * generated by running contrib/gdtoa/arithchk.c on the target
- * architecture.  See contrib/gdtoa/gdtoaimp.h for details.
- */
-
-#define IEEE_MC68k
-#define Arith_Kind_ASL 2
-#define Long int
-#define Intcast (int)(long)
-#define Double_Align
-#define X64_bit_pointers
diff --git a/lib/libc_bsd/sparc64/fpu/Makefile.inc b/lib/libc_bsd/sparc64/fpu/Makefile.inc
deleted file mode 100644
index 185dab1..0000000
--- a/lib/libc_bsd/sparc64/fpu/Makefile.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Makefile.incl 107052 2002-11-18 09:50:57Z ru $
-
-.PATH: ${.CURDIR}/sparc64/fpu
-
-CFLAGS+= -I${.CURDIR}/sparc64/sys
-
-SRCS+=	fpu.c fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c \
-	fpu_mul.c fpu_qp.c fpu_reg.S fpu_sqrt.c fpu_subr.c
diff --git a/lib/libc_bsd/sparc64/fpu/fpu.c b/lib/libc_bsd/sparc64/fpu/fpu.c
deleted file mode 100644
index 2b8a11c..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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, Lawrence Berkeley Laboratory.
- *
- * 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.
- * 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.
- */
-/*-
- * Copyright 2001 by Thomas Moestl <tmm@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- *
- *	@(#)fpu.c	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu.c,v 1.11 2000/12/06 01:47:50 mrg Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu.c 261455 2014-02-04 03:36:42Z eadler $");
-
-#include <sys/param.h>
-
-#include "namespace.h"
-#include <errno.h>
-#include <signal.h>
-#ifdef FPU_DEBUG
-#include <stdio.h>
-#endif
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#include <machine/fp.h>
-#include <machine/frame.h>
-#include <machine/fsr.h>
-#include <machine/instr.h>
-#include <machine/pcb.h>
-#include <machine/tstate.h>
-
-#include "__sparc_utrap_private.h"
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-
-/*
- * Translate current exceptions into `first' exception.  The
- * bits go the wrong way for ffs() (0x10 is most important, etc).
- * There are only 5, so do it the obvious way.
- */
-#define	X1(x) x
-#define	X2(x) x,x
-#define	X4(x) x,x,x,x
-#define	X8(x) X4(x),X4(x)
-#define	X16(x) X8(x),X8(x)
-
-static const char cx_to_trapx[] = {
-	X1(FSR_NX),
-	X2(FSR_DZ),
-	X4(FSR_UF),
-	X8(FSR_OF),
-	X16(FSR_NV)
-};
-
-#ifdef FPU_DEBUG
-#ifdef FPU_DEBUG_MASK
-int __fpe_debug = FPU_DEBUG_MASK;
-#else
-int __fpe_debug = 0;
-#endif
-#endif	/* FPU_DEBUG */
-
-static int __fpu_execute(struct utrapframe *, struct fpemu *, uint32_t,
-    u_long);
-
-/*
- * Need to use an fpstate on the stack; we could switch, so we cannot safely
- * modify the pcb one, it might get overwritten.
- */
-int
-__fpu_exception(struct utrapframe *uf)
-{
-	struct fpemu fe;
-	u_long fsr, tstate;
-	u_int insn;
-	int sig;
-
-	fsr = uf->uf_fsr;
-
-	switch (FSR_GET_FTT(fsr)) {
-	case FSR_FTT_NONE:
-		__utrap_write("lost FPU trap type\n");
-		return (0);
-	case FSR_FTT_IEEE:
-		return (SIGFPE);
-	case FSR_FTT_SEQERR:
-		__utrap_write("FPU sequence error\n");
-		return (SIGFPE);
-	case FSR_FTT_HWERR:
-		__utrap_write("FPU hardware error\n");
-		return (SIGFPE);
-	case FSR_FTT_UNFIN:
-	case FSR_FTT_UNIMP:
-		break;
-	default:
-		__utrap_write("unknown FPU error\n");
-		return (SIGFPE);
-	}
-
-	fe.fe_fsr = fsr & ~FSR_FTT_MASK;
-	insn = *(uint32_t *)uf->uf_pc;
-	if (IF_OP(insn) != IOP_MISC || (IF_F3_OP3(insn) != INS2_FPop1 &&
-	    IF_F3_OP3(insn) != INS2_FPop2))
-		__utrap_panic("bogus FP fault");
-	tstate = uf->uf_state;
-	sig = __fpu_execute(uf, &fe, insn, tstate);
-	if (sig != 0)
-		return (sig);
-	__asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr));
-	return (0);
-}
-
-#ifdef FPU_DEBUG
-/*
- * Dump a `fpn' structure.
- */
-void
-__fpu_dumpfpn(struct fpn *fp)
-{
-	static const char *const class[] = {
-		"SNAN", "QNAN", "ZERO", "NUM", "INF"
-	};
-
-	printf("%s %c.%x %x %x %xE%d", class[fp->fp_class + 2],
-		fp->fp_sign ? '-' : ' ',
-		fp->fp_mant[0],	fp->fp_mant[1],
-		fp->fp_mant[2], fp->fp_mant[3],
-		fp->fp_exp);
-}
-#endif
-
-static const int opmask[] = {0, 0, 1, 3, 1};
-
-/* Decode 5 bit register field depending on the type. */
-#define	RN_DECODE(tp, rn) \
-	((tp) >= FTYPE_DBL ? INSFPdq_RN(rn) & ~opmask[tp] : (rn))
-
-/*
- * Helper for forming the below case statements. Build only the op3 and opf
- * field of the instruction, these are the only ones that need to match.
- */
-#define	FOP(op3, opf) \
-	((op3) << IF_F3_OP3_SHIFT | (opf) << IF_F3_OPF_SHIFT)
-
-/*
- * Implement a move operation for all supported operand types. The additional
- * nand and xor parameters will be applied to the upper 32 bit word of the
- * source operand. This allows to implement fabs and fneg (for fp operands
- * only!) using this functions, too, by passing (1U << 31) for one of the
- * parameters, and 0 for the other.
- */
-static void
-__fpu_mov(struct fpemu *fe, int type, int rd, int rs2, uint32_t nand,
-    uint32_t xor)
-{
-
-	if (type == FTYPE_INT || type == FTYPE_SNG)
-		__fpu_setreg(rd, (__fpu_getreg(rs2) & ~nand) ^ xor);
-	else {
-		/*
-		 * Need to use the double versions to be able to access
-		 * the upper 32 fp registers.
-		 */
-		__fpu_setreg64(rd, (__fpu_getreg64(rs2) &
-		    ~((u_int64_t)nand << 32)) ^ ((u_int64_t)xor << 32));
-		if (type == FTYPE_EXT)
-			__fpu_setreg64(rd + 2, __fpu_getreg64(rs2 + 2));
-	}
-}
-
-static __inline void
-__fpu_ccmov(struct fpemu *fe, int type, int rd, int rs2,
-    uint32_t insn, int fcc)
-{
-
-	if (IF_F4_COND(insn) == fcc)
-		__fpu_mov(fe, type, rd, rs2, 0, 0);
-}
-
-static int
-__fpu_cmpck(struct fpemu *fe)
-{
-	u_long fsr;
-	int cx;
-
-	/*
-	 * The only possible exception here is NV; catch it
-	 * early and get out, as there is no result register.
-	 */
-	cx = fe->fe_cx;
-	fsr = fe->fe_fsr | (cx << FSR_CEXC_SHIFT);
-	if (cx != 0) {
-		if (fsr & (FSR_NV << FSR_TEM_SHIFT)) {
-			fe->fe_fsr = (fsr & ~FSR_FTT_MASK) |
-			    FSR_FTT(FSR_FTT_IEEE);
-			return (SIGFPE);
-		}
-		fsr |= FSR_NV << FSR_AEXC_SHIFT;
-	}
-	fe->fe_fsr = fsr;
-	return (0);
-}
-
-/*
- * Execute an FPU instruction (one that runs entirely in the FPU; not
- * FBfcc or STF, for instance).  On return, fe->fe_fs->fs_fsr will be
- * modified to reflect the setting the hardware would have left.
- *
- * Note that we do not catch all illegal opcodes, so you can, for instance,
- * multiply two integers this way.
- */
-static int
-__fpu_execute(struct utrapframe *uf, struct fpemu *fe, uint32_t insn,
-    u_long tstate)
-{
-	struct fpn *fp;
-	int opf, rs1, rs2, rd, type, mask, cx, cond;
-	u_long reg, fsr;
-	u_int space[4];
-
-	/*
-	 * `Decode' and execute instruction.  Start with no exceptions.
-	 * The type of almost any OPF opcode is in the bottom two bits, so we
-	 * squish them out here.
-	 */
-	opf = insn & (IF_MASK(IF_F3_OP3_SHIFT, IF_F3_OP3_BITS) |
-	    IF_MASK(IF_F3_OPF_SHIFT + 2, IF_F3_OPF_BITS - 2));
-	type = IF_F3_OPF(insn) & 3;
-	rs1 = RN_DECODE(type, IF_F3_RS1(insn));
-	rs2 = RN_DECODE(type, IF_F3_RS2(insn));
-	rd = RN_DECODE(type, IF_F3_RD(insn));
-	cond = 0;
-#ifdef notdef
-	if ((rs1 | rs2 | rd) & opmask[type])
-		return (SIGILL);
-#endif
-	fsr = fe->fe_fsr;
-	fe->fe_fsr &= ~FSR_CEXC_MASK;
-	fe->fe_cx = 0;
-	switch (opf) {
-	case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_FCC(0))):
-		__fpu_ccmov(fe, type, rd, rs2, insn, FSR_GET_FCC0(fsr));
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_FCC(1))):
-		__fpu_ccmov(fe, type, rd, rs2, insn, FSR_GET_FCC1(fsr));
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_FCC(2))):
-		__fpu_ccmov(fe, type, rd, rs2, insn, FSR_GET_FCC2(fsr));
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_FCC(3))):
-		__fpu_ccmov(fe, type, rd, rs2, insn, FSR_GET_FCC3(fsr));
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_ICC)):
-		__fpu_ccmov(fe, type, rd, rs2, insn,
-		    (tstate & TSTATE_ICC_MASK) >> TSTATE_ICC_SHIFT);
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_CC(IFCC_XCC)):
-		__fpu_ccmov(fe, type, rd, rs2, insn,
-		    (tstate & TSTATE_XCC_MASK) >> (TSTATE_XCC_SHIFT));
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_Z)):
-		reg = __emul_fetch_reg(uf, IF_F4_RS1(insn));
-		if (reg == 0)
-			__fpu_mov(fe, type, rd, rs2, 0, 0);
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_LEZ)):
-		reg = __emul_fetch_reg(uf, IF_F4_RS1(insn));
-		if (reg <= 0)
-			__fpu_mov(fe, type, rd, rs2, 0, 0);
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_LZ)):
-		reg = __emul_fetch_reg(uf, IF_F4_RS1(insn));
-		if (reg < 0)
-			__fpu_mov(fe, type, rd, rs2, 0, 0);
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_NZ)):
-		reg = __emul_fetch_reg(uf, IF_F4_RS1(insn));
-		if (reg != 0)
-			__fpu_mov(fe, type, rd, rs2, 0, 0);
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_GZ)):
-		reg = __emul_fetch_reg(uf, IF_F4_RS1(insn));
-		if (reg > 0)
-			__fpu_mov(fe, type, rd, rs2, 0, 0);
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FMOV_RC(IRCOND_GEZ)):
-		reg = __emul_fetch_reg(uf, IF_F4_RS1(insn));
-		if (reg >= 0)
-			__fpu_mov(fe, type, rd, rs2, 0, 0);
-		return (0);
-	case FOP(INS2_FPop2, INSFP2_FCMP):
-		__fpu_explode(fe, &fe->fe_f1, type, rs1);
-		__fpu_explode(fe, &fe->fe_f2, type, rs2);
-		__fpu_compare(fe, 0, IF_F3_CC(insn));
-		return (__fpu_cmpck(fe));
-	case FOP(INS2_FPop2, INSFP2_FCMPE):
-		__fpu_explode(fe, &fe->fe_f1, type, rs1);
-		__fpu_explode(fe, &fe->fe_f2, type, rs2);
-		__fpu_compare(fe, 1, IF_F3_CC(insn));
-		return (__fpu_cmpck(fe));
-	case FOP(INS2_FPop1, INSFP1_FMOV):
-		__fpu_mov(fe, type, rd, rs2, 0, 0);
-		return (0);
-	case FOP(INS2_FPop1, INSFP1_FNEG):
-		__fpu_mov(fe, type, rd, rs2, 0, (1U << 31));
-		return (0);
-	case FOP(INS2_FPop1, INSFP1_FABS):
-		__fpu_mov(fe, type, rd, rs2, (1U << 31), 0);
-		return (0);
-	case FOP(INS2_FPop1, INSFP1_FSQRT):
-		__fpu_explode(fe, &fe->fe_f1, type, rs2);
-		fp = __fpu_sqrt(fe);
-		break;
-	case FOP(INS2_FPop1, INSFP1_FADD):
-		__fpu_explode(fe, &fe->fe_f1, type, rs1);
-		__fpu_explode(fe, &fe->fe_f2, type, rs2);
-		fp = __fpu_add(fe);
-		break;
-	case FOP(INS2_FPop1, INSFP1_FSUB):
-		__fpu_explode(fe, &fe->fe_f1, type, rs1);
-		__fpu_explode(fe, &fe->fe_f2, type, rs2);
-		fp = __fpu_sub(fe);
-		break;
-	case FOP(INS2_FPop1, INSFP1_FMUL):
-		__fpu_explode(fe, &fe->fe_f1, type, rs1);
-		__fpu_explode(fe, &fe->fe_f2, type, rs2);
-		fp = __fpu_mul(fe);
-		break;
-	case FOP(INS2_FPop1, INSFP1_FDIV):
-		__fpu_explode(fe, &fe->fe_f1, type, rs1);
-		__fpu_explode(fe, &fe->fe_f2, type, rs2);
-		fp = __fpu_div(fe);
-		break;
-	case FOP(INS2_FPop1, INSFP1_FsMULd):
-	case FOP(INS2_FPop1, INSFP1_FdMULq):
-		if (type == FTYPE_EXT)
-			return (SIGILL);
-		__fpu_explode(fe, &fe->fe_f1, type, rs1);
-		__fpu_explode(fe, &fe->fe_f2, type, rs2);
-		type++;	/* single to double, or double to quad */
-		/*
-		 * Recalculate rd (the old type applied for the source regs
-		 * only, the target one has a different size).
-		 */
-		rd = RN_DECODE(type, IF_F3_RD(insn));
-		fp = __fpu_mul(fe);
-		break;
-	case FOP(INS2_FPop1, INSFP1_FxTOs):
-	case FOP(INS2_FPop1, INSFP1_FxTOd):
-	case FOP(INS2_FPop1, INSFP1_FxTOq):
-		type = FTYPE_LNG;
-		rs2 = RN_DECODE(type, IF_F3_RS2(insn));
-		__fpu_explode(fe, fp = &fe->fe_f1, type, rs2);
-		/* sneaky; depends on instruction encoding */
-		type = (IF_F3_OPF(insn) >> 2) & 3;
-		rd = RN_DECODE(type, IF_F3_RD(insn));
-		break;
-	case FOP(INS2_FPop1, INSFP1_FTOx):
-		__fpu_explode(fe, fp = &fe->fe_f1, type, rs2);
-		type = FTYPE_LNG;
-		rd = RN_DECODE(type, IF_F3_RD(insn));
-		break;
-	case FOP(INS2_FPop1, INSFP1_FTOs):
-	case FOP(INS2_FPop1, INSFP1_FTOd):
-	case FOP(INS2_FPop1, INSFP1_FTOq):
-	case FOP(INS2_FPop1, INSFP1_FTOi):
-		__fpu_explode(fe, fp = &fe->fe_f1, type, rs2);
-		/* sneaky; depends on instruction encoding */
-		type = (IF_F3_OPF(insn) >> 2) & 3;
-		rd = RN_DECODE(type, IF_F3_RD(insn));
-		break;
-	default:
-		return (SIGILL);
-	}
-
-	/*
-	 * ALU operation is complete.  Collapse the result and then check
-	 * for exceptions.  If we got any, and they are enabled, do not
-	 * alter the destination register, just stop with an exception.
-	 * Otherwise set new current exceptions and accrue.
-	 */
-	__fpu_implode(fe, fp, type, space);
-	cx = fe->fe_cx;
-	if (cx != 0) {
-		mask = (fsr >> FSR_TEM_SHIFT) & FSR_TEM_MASK;
-		if (cx & mask) {
-			/* not accrued??? */
-			fsr = (fsr & ~FSR_FTT_MASK) |
-			    FSR_FTT(FSR_FTT_IEEE) |
-			    FSR_CEXC(cx_to_trapx[(cx & mask) - 1]);
-			return (SIGFPE);
-		}
-		fsr |= (cx << FSR_CEXC_SHIFT) | (cx << FSR_AEXC_SHIFT);
-	}
-	fe->fe_fsr = fsr;
-	if (type == FTYPE_INT || type == FTYPE_SNG)
-		__fpu_setreg(rd, space[0]);
-	else {
-		__fpu_setreg64(rd, ((u_int64_t)space[0] << 32) | space[1]);
-		if (type == FTYPE_EXT)
-			__fpu_setreg64(rd + 2,
-			    ((u_int64_t)space[2] << 32) | space[3]);
-	}
-	return (0);	/* success */
-}
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_add.c b/lib/libc_bsd/sparc64/fpu/fpu_add.c
deleted file mode 100644
index 4d5733b..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_add.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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, Lawrence Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_add.c	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_add.c,v 1.3 1996/03/14 19:41:52 christos Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_add.c 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * Perform an FPU add (return x + y).
- *
- * To subtract, negate y and call add.
- */
-
-#include <sys/param.h>
-
-#include <machine/frame.h>
-#include <machine/fp.h>
-#include <machine/fsr.h>
-#include <machine/instr.h>
-
-#include "fpu_arith.h"
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-#include "__sparc_utrap_private.h"
-
-struct fpn *
-__fpu_add(fe)
-	struct fpemu *fe;
-{
-	struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2, *r;
-	u_int r0, r1, r2, r3;
-	int rd;
-
-	/*
-	 * Put the `heavier' operand on the right (see fpu_emu.h).
-	 * Then we will have one of the following cases, taken in the
-	 * following order:
-	 *
-	 *  - y = NaN.  Implied: if only one is a signalling NaN, y is.
-	 *	The result is y.
-	 *  - y = Inf.  Implied: x != NaN (is 0, number, or Inf: the NaN
-	 *    case was taken care of earlier).
-	 *	If x = -y, the result is NaN.  Otherwise the result
-	 *	is y (an Inf of whichever sign).
-	 *  - y is 0.  Implied: x = 0.
-	 *	If x and y differ in sign (one positive, one negative),
-	 *	the result is +0 except when rounding to -Inf.  If same:
-	 *	+0 + +0 = +0; -0 + -0 = -0.
-	 *  - x is 0.  Implied: y != 0.
-	 *	Result is y.
-	 *  - other.  Implied: both x and y are numbers.
-	 *	Do addition a la Hennessey & Patterson.
-	 */
-	ORDER(x, y);
-	if (ISNAN(y))
-		return (y);
-	if (ISINF(y)) {
-		if (ISINF(x) && x->fp_sign != y->fp_sign)
-			return (__fpu_newnan(fe));
-		return (y);
-	}
-	rd = FSR_GET_RD(fe->fe_fsr);
-	if (ISZERO(y)) {
-		if (rd != FSR_RD_NINF)	/* only -0 + -0 gives -0 */
-			y->fp_sign &= x->fp_sign;
-		else			/* any -0 operand gives -0 */
-			y->fp_sign |= x->fp_sign;
-		return (y);
-	}
-	if (ISZERO(x))
-		return (y);
-	/*
-	 * We really have two numbers to add, although their signs may
-	 * differ.  Make the exponents match, by shifting the smaller
-	 * number right (e.g., 1.011 => 0.1011) and increasing its
-	 * exponent (2^3 => 2^4).  Note that we do not alter the exponents
-	 * of x and y here.
-	 */
-	r = &fe->fe_f3;
-	r->fp_class = FPC_NUM;
-	if (x->fp_exp == y->fp_exp) {
-		r->fp_exp = x->fp_exp;
-		r->fp_sticky = 0;
-	} else {
-		if (x->fp_exp < y->fp_exp) {
-			/*
-			 * Try to avoid subtract case iii (see below).
-			 * This also guarantees that x->fp_sticky = 0.
-			 */
-			SWAP(x, y);
-		}
-		/* now x->fp_exp > y->fp_exp */
-		r->fp_exp = x->fp_exp;
-		r->fp_sticky = __fpu_shr(y, x->fp_exp - y->fp_exp);
-	}
-	r->fp_sign = x->fp_sign;
-	if (x->fp_sign == y->fp_sign) {
-		FPU_DECL_CARRY
-
-		/*
-		 * The signs match, so we simply add the numbers.  The result
-		 * may be `supernormal' (as big as 1.111...1 + 1.111...1, or
-		 * 11.111...0).  If so, a single bit shift-right will fix it
-		 * (but remember to adjust the exponent).
-		 */
-		/* r->fp_mant = x->fp_mant + y->fp_mant */
-		FPU_ADDS(r->fp_mant[3], x->fp_mant[3], y->fp_mant[3]);
-		FPU_ADDCS(r->fp_mant[2], x->fp_mant[2], y->fp_mant[2]);
-		FPU_ADDCS(r->fp_mant[1], x->fp_mant[1], y->fp_mant[1]);
-		FPU_ADDC(r0, x->fp_mant[0], y->fp_mant[0]);
-		if ((r->fp_mant[0] = r0) >= FP_2) {
-			(void) __fpu_shr(r, 1);
-			r->fp_exp++;
-		}
-	} else {
-		FPU_DECL_CARRY
-
-		/*
-		 * The signs differ, so things are rather more difficult.
-		 * H&P would have us negate the negative operand and add;
-		 * this is the same as subtracting the negative operand.
-		 * This is quite a headache.  Instead, we will subtract
-		 * y from x, regardless of whether y itself is the negative
-		 * operand.  When this is done one of three conditions will
-		 * hold, depending on the magnitudes of x and y:
-		 *   case i)   |x| > |y|.  The result is just x - y,
-		 *	with x's sign, but it may need to be normalized.
-		 *   case ii)  |x| = |y|.  The result is 0 (maybe -0)
-		 *	so must be fixed up.
-		 *   case iii) |x| < |y|.  We goofed; the result should
-		 *	be (y - x), with the same sign as y.
-		 * We could compare |x| and |y| here and avoid case iii,
-		 * but that would take just as much work as the subtract.
-		 * We can tell case iii has occurred by an overflow.
-		 *
-		 * N.B.: since x->fp_exp >= y->fp_exp, x->fp_sticky = 0.
-		 */
-		/* r->fp_mant = x->fp_mant - y->fp_mant */
-		FPU_SET_CARRY(y->fp_sticky);
-		FPU_SUBCS(r3, x->fp_mant[3], y->fp_mant[3]);
-		FPU_SUBCS(r2, x->fp_mant[2], y->fp_mant[2]);
-		FPU_SUBCS(r1, x->fp_mant[1], y->fp_mant[1]);
-		FPU_SUBC(r0, x->fp_mant[0], y->fp_mant[0]);
-		if (r0 < FP_2) {
-			/* cases i and ii */
-			if ((r0 | r1 | r2 | r3) == 0) {
-				/* case ii */
-				r->fp_class = FPC_ZERO;
-				r->fp_sign = rd == FSR_RD_NINF;
-				return (r);
-			}
-		} else {
-			/*
-			 * Oops, case iii.  This can only occur when the
-			 * exponents were equal, in which case neither
-			 * x nor y have sticky bits set.  Flip the sign
-			 * (to y's sign) and negate the result to get y - x.
-			 */
-#ifdef DIAGNOSTIC
-			if (x->fp_exp != y->fp_exp || r->fp_sticky)
-				__utrap_panic("fpu_add");
-#endif
-			r->fp_sign = y->fp_sign;
-			FPU_SUBS(r3, 0, r3);
-			FPU_SUBCS(r2, 0, r2);
-			FPU_SUBCS(r1, 0, r1);
-			FPU_SUBC(r0, 0, r0);
-		}
-		r->fp_mant[3] = r3;
-		r->fp_mant[2] = r2;
-		r->fp_mant[1] = r1;
-		r->fp_mant[0] = r0;
-		if (r0 < FP_1)
-			__fpu_norm(r);
-	}
-	return (r);
-}
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_arith.h b/lib/libc_bsd/sparc64/fpu/fpu_arith.h
deleted file mode 100644
index 308d119..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_arith.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_arith.h	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_arith.h,v 1.3 2000/07/24 04:11:03 mycroft Exp $
- * $FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_arith.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-/*
- * Extended-precision arithmetic.
- *
- * We hold the notion of a `carry register', which may or may not be a
- * machine carry bit or register.  On the SPARC, it is just the machine's
- * carry bit.
- *
- * In the worst case, you can compute the carry from x+y as
- *	(unsigned)(x + y) < (unsigned)x
- * and from x+y+c as
- *	((unsigned)(x + y + c) <= (unsigned)x && (y|c) != 0)
- * for example.
- */
-
-/* set up for extended-precision arithemtic */
-#define	FPU_DECL_CARRY
-
-/*
- * We have three kinds of add:
- *	add with carry:					  r = x + y + c
- *	add (ignoring current carry) and set carry:	c'r = x + y + 0
- *	add with carry and set carry:			c'r = x + y + c
- * The macros use `C' for `use carry' and `S' for `set carry'.
- * Note that the state of the carry is undefined after ADDC and SUBC,
- * so if all you have for these is `add with carry and set carry',
- * that is OK.
- *
- * The same goes for subtract, except that we compute x - y - c.
- *
- * Finally, we have a way to get the carry into a `regular' variable,
- * or set it from a value.  SET_CARRY turns 0 into no-carry, nonzero
- * into carry; GET_CARRY sets its argument to 0 or 1.
- */
-#define	FPU_ADDC(r, x, y) \
-	__asm __volatile("addx %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
-#define	FPU_ADDS(r, x, y) \
-	__asm __volatile("addcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
-#define	FPU_ADDCS(r, x, y) \
-	__asm __volatile("addxcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
-#define	FPU_SUBC(r, x, y) \
-	__asm __volatile("subx %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
-#define	FPU_SUBS(r, x, y) \
-	__asm __volatile("subcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
-#define	FPU_SUBCS(r, x, y) \
-	__asm __volatile("subxcc %1,%2,%0" : "=r"(r) : "r"(x), "r"(y))
-
-#define	FPU_GET_CARRY(r) __asm __volatile("addx %%g0,%%g0,%0" : "=r"(r))
-#define	FPU_SET_CARRY(v) __asm __volatile("addcc %0,-1,%%g0" : : "r"(v))
-
-#define	FPU_SHL1_BY_ADD	/* shift left 1 faster by ADDC than (a<<1)|(b>>31) */
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_compare.c b/lib/libc_bsd/sparc64/fpu/fpu_compare.c
deleted file mode 100644
index 0f9a6e0..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_compare.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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, Lawrence Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_compare.c	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_compare.c,v 1.3 2001/08/26 05:46:31 eeh Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_compare.c 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * CMP and CMPE instructions.
- *
- * These rely on the fact that our internal wide format is achieved by
- * adding zero bits to the end of narrower mantissas.
- */
-
-#include <sys/types.h>
-
-#include <machine/frame.h>
-#include <machine/fp.h>
-#include <machine/fsr.h>
-
-#include "fpu_arith.h"
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-
-static u_long fcc_nmask[] = {
-	~FSR_FCC0_MASK,
-	~FSR_FCC1_MASK,
-	~FSR_FCC2_MASK,
-	~FSR_FCC3_MASK
-};
-
-/* XXX: we don't use the FSR_FCCx macros here; it's much easier this way. */
-static int fcc_shift[] = {
-	FSR_FCC0_SHIFT,
-	FSR_FCC1_SHIFT,
-	FSR_FCC2_SHIFT,
-	FSR_FCC3_SHIFT
-};
-
-/*
- * Perform a compare instruction (with or without unordered exception).
- * This updates the fcc field in the fsr.
- *
- * If either operand is NaN, the result is unordered.  For cmpe, this
- * causes an NV exception.  Everything else is ordered:
- *	|Inf| > |numbers| > |0|.
- * We already arranged for fp_class(Inf) > fp_class(numbers) > fp_class(0),
- * so we get this directly.  Note, however, that two zeros compare equal
- * regardless of sign, while everything else depends on sign.
- *
- * Incidentally, two Infs of the same sign compare equal (per the 80387
- * manual---it would be nice if the SPARC documentation were more
- * complete).
- */
-void
-__fpu_compare(struct fpemu *fe, int cmpe, int fcc)
-{
-	struct fpn *a, *b;
-	int cc;
-	FPU_DECL_CARRY
-
-	a = &fe->fe_f1;
-	b = &fe->fe_f2;
-
-	if (ISNAN(a) || ISNAN(b)) {
-		/*
-		 * In any case, we already got an exception for signalling
-		 * NaNs; here we may replace that one with an identical
-		 * exception, but so what?.
-		 */
-		if (cmpe)
-			fe->fe_cx = FSR_NV;
-		cc = FSR_CC_UO;
-		goto done;
-	}
-
-	/*
-	 * Must handle both-zero early to avoid sign goofs.  Otherwise,
-	 * at most one is 0, and if the signs differ we are done.
-	 */
-	if (ISZERO(a) && ISZERO(b)) {
-		cc = FSR_CC_EQ;
-		goto done;
-	}
-	if (a->fp_sign) {		/* a < 0 (or -0) */
-		if (!b->fp_sign) {	/* b >= 0 (or if a = -0, b > 0) */
-			cc = FSR_CC_LT;
-			goto done;
-		}
-	} else {			/* a > 0 (or +0) */
-		if (b->fp_sign) {	/* b <= -0 (or if a = +0, b < 0) */
-			cc = FSR_CC_GT;
-			goto done;
-		}
-	}
-
-	/*
-	 * Now the signs are the same (but may both be negative).  All
-	 * we have left are these cases:
-	 *
-	 *	|a| < |b|		[classes or values differ]
-	 *	|a| > |b|		[classes or values differ]
-	 *	|a| == |b|		[classes and values identical]
-	 *
-	 * We define `diff' here to expand these as:
-	 *
-	 *	|a| < |b|, a,b >= 0: a < b => FSR_CC_LT
-	 *	|a| < |b|, a,b < 0:  a > b => FSR_CC_GT
-	 *	|a| > |b|, a,b >= 0: a > b => FSR_CC_GT
-	 *	|a| > |b|, a,b < 0:  a < b => FSR_CC_LT
-	 */
-#define opposite_cc(cc) ((cc) == FSR_CC_LT ? FSR_CC_GT : FSR_CC_LT)
-#define	diff(magnitude) (a->fp_sign ? opposite_cc(magnitude) :  (magnitude))
-	if (a->fp_class < b->fp_class) {	/* |a| < |b| */
-		cc = diff(FSR_CC_LT);
-		goto done;
-	}
-	if (a->fp_class > b->fp_class) {	/* |a| > |b| */
-		cc = diff(FSR_CC_GT);
-		goto done;
-	}
-	/* now none can be 0: only Inf and numbers remain */
-	if (ISINF(a)) {				/* |Inf| = |Inf| */
-		cc = FSR_CC_EQ;
-		goto done;
-	}
-	/*
-	 * Only numbers remain.  To compare two numbers in magnitude, we
-	 * simply subtract them.
-	 */
-	a = __fpu_sub(fe);
-	if (a->fp_class == FPC_ZERO)
-		cc = FSR_CC_EQ;
-	else
-		cc = diff(FSR_CC_GT);
-
-done:
-	fe->fe_fsr = (fe->fe_fsr & fcc_nmask[fcc]) |
-	    ((u_long)cc << fcc_shift[fcc]);
-}
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_div.c b/lib/libc_bsd/sparc64/fpu/fpu_div.c
deleted file mode 100644
index 8ae2ca1..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_div.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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, Lawrence Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_div.c	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_div.c,v 1.2 1994/11/20 20:52:38 deraadt Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_div.c 205396 2010-03-20 22:12:15Z marius $");
-
-/*
- * Perform an FPU divide (return x / y).
- */
-
-#include <sys/types.h>
-
-#include <machine/frame.h>
-#include <machine/fp.h>
-#include <machine/fsr.h>
-
-#include "fpu_arith.h"
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-
-/*
- * Division of normal numbers is done as follows:
- *
- * x and y are floating point numbers, i.e., in the form 1.bbbb * 2^e.
- * If X and Y are the mantissas (1.bbbb's), the quotient is then:
- *
- *	q = (X / Y) * 2^((x exponent) - (y exponent))
- *
- * Since X and Y are both in [1.0,2.0), the quotient's mantissa (X / Y)
- * will be in [0.5,2.0).  Moreover, it will be less than 1.0 if and only
- * if X < Y.  In that case, it will have to be shifted left one bit to
- * become a normal number, and the exponent decremented.  Thus, the
- * desired exponent is:
- *
- *	left_shift = x->fp_mant < y->fp_mant;
- *	result_exp = x->fp_exp - y->fp_exp - left_shift;
- *
- * The quotient mantissa X/Y can then be computed one bit at a time
- * using the following algorithm:
- *
- *	Q = 0;			-- Initial quotient.
- *	R = X;			-- Initial remainder,
- *	if (left_shift)		--   but fixed up in advance.
- *		R *= 2;
- *	for (bit = FP_NMANT; --bit >= 0; R *= 2) {
- *		if (R >= Y) {
- *			Q |= 1 << bit;
- *			R -= Y;
- *		}
- *	}
- *
- * The subtraction R -= Y always removes the uppermost bit from R (and
- * can sometimes remove additional lower-order 1 bits); this proof is
- * left to the reader.
- *
- * This loop correctly calculates the guard and round bits since they are
- * included in the expanded internal representation.  The sticky bit
- * is to be set if and only if any other bits beyond guard and round
- * would be set.  From the above it is obvious that this is true if and
- * only if the remainder R is nonzero when the loop terminates.
- *
- * Examining the loop above, we can see that the quotient Q is built
- * one bit at a time ``from the top down''.  This means that we can
- * dispense with the multi-word arithmetic and just build it one word
- * at a time, writing each result word when it is done.
- *
- * Furthermore, since X and Y are both in [1.0,2.0), we know that,
- * initially, R >= Y.  (Recall that, if X < Y, R is set to X * 2 and
- * is therefore at in [2.0,4.0).)  Thus Q is sure to have bit FP_NMANT-1
- * set, and R can be set initially to either X - Y (when X >= Y) or
- * 2X - Y (when X < Y).  In addition, comparing R and Y is difficult,
- * so we will simply calculate R - Y and see if that underflows.
- * This leads to the following revised version of the algorithm:
- *
- *	R = X;
- *	bit = FP_1;
- *	D = R - Y;
- *	if (D >= 0) {
- *		result_exp = x->fp_exp - y->fp_exp;
- *		R = D;
- *		q = bit;
- *		bit >>= 1;
- *	} else {
- *		result_exp = x->fp_exp - y->fp_exp - 1;
- *		q = 0;
- *	}
- *	R <<= 1;
- *	do  {
- *		D = R - Y;
- *		if (D >= 0) {
- *			q |= bit;
- *			R = D;
- *		}
- *		R <<= 1;
- *	} while ((bit >>= 1) != 0);
- *	Q[0] = q;
- *	for (i = 1; i < 4; i++) {
- *		q = 0, bit = 1 << 31;
- *		do {
- *			D = R - Y;
- *			if (D >= 0) {
- *				q |= bit;
- *				R = D;
- *			}
- *			R <<= 1;
- *		} while ((bit >>= 1) != 0);
- *		Q[i] = q;
- *	}
- *
- * This can be refined just a bit further by moving the `R <<= 1'
- * calculations to the front of the do-loops and eliding the first one.
- * The process can be terminated immediately whenever R becomes 0, but
- * this is relatively rare, and we do not bother.
- */
-
-struct fpn *
-__fpu_div(fe)
-	struct fpemu *fe;
-{
-	struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2;
-	u_int q, bit;
-	u_int r0, r1, r2, r3, d0, d1, d2, d3, y0, y1, y2, y3;
-	FPU_DECL_CARRY
-
-	/*
-	 * Since divide is not commutative, we cannot just use ORDER.
-	 * Check either operand for NaN first; if there is at least one,
-	 * order the signalling one (if only one) onto the right, then
-	 * return it.  Otherwise we have the following cases:
-	 *
-	 *	Inf / Inf = NaN, plus NV exception
-	 *	Inf / num = Inf [i.e., return x #]
-	 *	Inf / 0   = Inf [i.e., return x #]
-	 *	0 / Inf = 0 [i.e., return x #]
-	 *	0 / num = 0 [i.e., return x #]
-	 *	0 / 0   = NaN, plus NV exception
-	 *	num / Inf = 0 #
-	 *	num / num = num (do the divide)
-	 *	num / 0   = Inf #, plus DZ exception
-	 *
-	 * # Sign of result is XOR of operand signs.
-	 */
-	if (ISNAN(x) || ISNAN(y)) {
-		ORDER(x, y);
-		return (y);
-	}
-	if (ISINF(x) || ISZERO(x)) {
-		if (x->fp_class == y->fp_class)
-			return (__fpu_newnan(fe));
-		x->fp_sign ^= y->fp_sign;
-		return (x);
-	}
-
-	x->fp_sign ^= y->fp_sign;
-	if (ISINF(y)) {
-		x->fp_class = FPC_ZERO;
-		return (x);
-	}
-	if (ISZERO(y)) {
-		fe->fe_cx = FSR_DZ;
-		x->fp_class = FPC_INF;
-		return (x);
-	}
-
-	/*
-	 * Macros for the divide.  See comments at top for algorithm.
-	 * Note that we expand R, D, and Y here.
-	 */
-
-#define	SUBTRACT		/* D = R - Y */ \
-	FPU_SUBS(d3, r3, y3); FPU_SUBCS(d2, r2, y2); \
-	FPU_SUBCS(d1, r1, y1); FPU_SUBC(d0, r0, y0)
-
-#define	NONNEGATIVE		/* D >= 0 */ \
-	((int)d0 >= 0)
-
-#ifdef FPU_SHL1_BY_ADD
-#define	SHL1			/* R <<= 1 */ \
-	FPU_ADDS(r3, r3, r3); FPU_ADDCS(r2, r2, r2); \
-	FPU_ADDCS(r1, r1, r1); FPU_ADDC(r0, r0, r0)
-#else
-#define	SHL1 \
-	r0 = (r0 << 1) | (r1 >> 31), r1 = (r1 << 1) | (r2 >> 31), \
-	r2 = (r2 << 1) | (r3 >> 31), r3 <<= 1
-#endif
-
-#define	LOOP			/* do ... while (bit >>= 1) */ \
-	do { \
-		SHL1; \
-		SUBTRACT; \
-		if (NONNEGATIVE) { \
-			q |= bit; \
-			r0 = d0, r1 = d1, r2 = d2, r3 = d3; \
-		} \
-	} while ((bit >>= 1) != 0)
-
-#define	WORD(r, i)			/* calculate r->fp_mant[i] */ \
-	q = 0; \
-	bit = 1 << 31; \
-	LOOP; \
-	(x)->fp_mant[i] = q
-
-	/* Setup.  Note that we put our result in x. */
-	r0 = x->fp_mant[0];
-	r1 = x->fp_mant[1];
-	r2 = x->fp_mant[2];
-	r3 = x->fp_mant[3];
-	y0 = y->fp_mant[0];
-	y1 = y->fp_mant[1];
-	y2 = y->fp_mant[2];
-	y3 = y->fp_mant[3];
-
-	bit = FP_1;
-	SUBTRACT;
-	if (NONNEGATIVE) {
-		x->fp_exp -= y->fp_exp;
-		r0 = d0, r1 = d1, r2 = d2, r3 = d3;
-		q = bit;
-		bit >>= 1;
-	} else {
-		x->fp_exp -= y->fp_exp + 1;
-		q = 0;
-	}
-	LOOP;
-	x->fp_mant[0] = q;
-	WORD(x, 1);
-	WORD(x, 2);
-	WORD(x, 3);
-	x->fp_sticky = r0 | r1 | r2 | r3;
-
-	return (x);
-}
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_emu.h b/lib/libc_bsd/sparc64/fpu/fpu_emu.h
deleted file mode 100644
index 77f68f9..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_emu.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_emu.h	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_emu.h,v 1.4 2000/08/03 18:32:07 eeh Exp $
- * $FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_emu.h 230193 2012-01-16 04:09:45Z das $
- */
-
-/*
- * Floating point emulator (tailored for SPARC, but structurally
- * machine-independent).
- *
- * Floating point numbers are carried around internally in an `expanded'
- * or `unpacked' form consisting of:
- *	- sign
- *	- unbiased exponent
- *	- mantissa (`1.' + 112-bit fraction + guard + round)
- *	- sticky bit
- * Any implied `1' bit is inserted, giving a 113-bit mantissa that is
- * always nonzero.  Additional low-order `guard' and `round' bits are
- * scrunched in, making the entire mantissa 115 bits long.  This is divided
- * into four 32-bit words, with `spare' bits left over in the upper part
- * of the top word (the high bits of fp_mant[0]).  An internal `exploded'
- * number is thus kept within the half-open interval [1.0,2.0) (but see
- * the `number classes' below).  This holds even for denormalized numbers:
- * when we explode an external denorm, we normalize it, introducing low-order
- * zero bits, so that the rest of the code always sees normalized values.
- *
- * Note that a number of our algorithms use the `spare' bits at the top.
- * The most demanding algorithm---the one for sqrt---depends on two such
- * bits, so that it can represent values up to (but not including) 8.0,
- * and then it needs a carry on top of that, so that we need three `spares'.
- *
- * The sticky-word is 32 bits so that we can use `OR' operators to goosh
- * whole words from the mantissa into it.
- *
- * All operations are done in this internal extended precision.  According
- * to Hennesey & Patterson, Appendix A, rounding can be repeated---that is,
- * it is OK to do a+b in extended precision and then round the result to
- * single precision---provided single, double, and extended precisions are
- * `far enough apart' (they always are), but we will try to avoid any such
- * extra work where possible.
- */
-
-#ifndef _SPARC64_FPU_FPU_EMU_H_
-#define _SPARC64_FPU_FPU_EMU_H_
-
-#include "fpu_reg.h"
-
-struct fpn {
-	int	fp_class;		/* see below */
-	int	fp_sign;		/* 0 => positive, 1 => negative */
-	int	fp_exp;			/* exponent (unbiased) */
-	int	fp_sticky;		/* nonzero bits lost at right end */
-	u_int	fp_mant[4];		/* 115-bit mantissa */
-};
-
-#define	FP_NMANT	115		/* total bits in mantissa (incl g,r) */
-#define	FP_NG		2		/* number of low-order guard bits */
-#define	FP_LG		((FP_NMANT - 1) & 31)	/* log2(1.0) for fp_mant[0] */
-#define	FP_LG2		((FP_NMANT - 1) & 63)	/* log2(1.0) for fp_mant[0] and fp_mant[1] */
-#define	FP_QUIETBIT	(1 << (FP_LG - 1))	/* Quiet bit in NaNs (0.5) */
-#define	FP_1		(1 << FP_LG)		/* 1.0 in fp_mant[0] */
-#define	FP_2		(1 << (FP_LG + 1))	/* 2.0 in fp_mant[0] */
-
-/*
- * Number classes.  Since zero, Inf, and NaN cannot be represented using
- * the above layout, we distinguish these from other numbers via a class.
- * In addition, to make computation easier and to follow Appendix N of
- * the SPARC Version 8 standard, we give each kind of NaN a separate class.
- */
-#define	FPC_SNAN	-2		/* signalling NaN (sign irrelevant) */
-#define	FPC_QNAN	-1		/* quiet NaN (sign irrelevant) */
-#define	FPC_ZERO	0		/* zero (sign matters) */
-#define	FPC_NUM		1		/* number (sign matters) */
-#define	FPC_INF		2		/* infinity (sign matters) */
-
-#define	ISNAN(fp)	((fp)->fp_class < 0)
-#define	ISZERO(fp)	((fp)->fp_class == 0)
-#define	ISINF(fp)	((fp)->fp_class == FPC_INF)
-
-/*
- * ORDER(x,y) `sorts' a pair of `fpn *'s so that the right operand (y) points
- * to the `more significant' operand for our purposes.  Appendix N says that
- * the result of a computation involving two numbers are:
- *
- *	If both are SNaN: operand 2, converted to Quiet
- *	If only one is SNaN: the SNaN operand, converted to Quiet
- *	If both are QNaN: operand 2
- *	If only one is QNaN: the QNaN operand
- *
- * In addition, in operations with an Inf operand, the result is usually
- * Inf.  The class numbers are carefully arranged so that if
- *	(unsigned)class(op1) > (unsigned)class(op2)
- * then op1 is the one we want; otherwise op2 is the one we want.
- */
-#define	ORDER(x, y) { \
-	if ((u_int)(x)->fp_class > (u_int)(y)->fp_class) \
-		SWAP(x, y); \
-}
-#define	SWAP(x, y) { \
-	register struct fpn *swap; \
-	swap = (x), (x) = (y), (y) = swap; \
-}
-
-/*
- * Floating point operand types. FTYPE_LNG is syntethic (it does not occur in
- * instructions).
- */
-#define	FTYPE_INT	INSFP_i
-#define	FTYPE_SNG	INSFP_s
-#define	FTYPE_DBL	INSFP_d
-#define	FTYPE_EXT	INSFP_q
-#define	FTYPE_LNG	4
-
-/*
- * Emulator state.
- */
-struct fpemu {
-	u_long	fe_fsr;			/* fsr copy (modified during op) */
-	int	fe_cx;			/* exceptions */
-	int     pad;                    /* align access to following fields */
-	struct	fpn fe_f1;		/* operand 1 */
-	struct	fpn fe_f2;		/* operand 2, if required */
-	struct	fpn fe_f3;		/* available storage for result */
-};
-
-/*
- * Arithmetic functions.
- * Each of these may modify its inputs (f1,f2) and/or the temporary.
- * Each returns a pointer to the result and/or sets exceptions.
- */
-#define	__fpu_sub(fe)	(ISNAN(&(fe)->fe_f2) ? 0 : ((fe)->fe_f2.fp_sign ^= 1), \
-			    __fpu_add(fe))
-
-#ifdef FPU_DEBUG
-#define	FPE_INSN	0x1
-#define	FPE_REG		0x2
-extern int __fpe_debug;
-void	__fpu_dumpfpn(struct fpn *);
-#define	DPRINTF(x, y)	if (__fpe_debug & (x)) printf y
-#define DUMPFPN(x, f)	if (__fpe_debug & (x)) __fpu_dumpfpn((f))
-#else
-#define	DPRINTF(x, y)
-#define DUMPFPN(x, f)
-#endif
-
-#endif /* !_SPARC64_FPU_FPU_EXTERN_H_ */
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_explode.c b/lib/libc_bsd/sparc64/fpu/fpu_explode.c
deleted file mode 100644
index 12d1862..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_explode.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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, Lawrence Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_explode.c	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_explode.c,v 1.5 2000/08/03 18:32:08 eeh Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_explode.c 205410 2010-03-21 13:18:08Z marius $");
-
-/*
- * FPU subroutines: `explode' the machine's `packed binary' format numbers
- * into our internal format.
- */
-
-#include <sys/param.h>
-
-#ifdef FPU_DEBUG
-#include <stdio.h>
-#endif
-
-#include <machine/frame.h>
-#include <machine/fp.h>
-#include <machine/fsr.h>
-#include <machine/ieee.h>
-#include <machine/instr.h>
-
-#include "fpu_arith.h"
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-#include "__sparc_utrap_private.h"
-
-/*
- * N.B.: in all of the following, we assume the FP format is
- *
- *	---------------------------
- *	| s | exponent | fraction |
- *	---------------------------
- *
- * (which represents -1**s * 1.fraction * 2**exponent), so that the
- * sign bit is way at the top (bit 31), the exponent is next, and
- * then the remaining bits mark the fraction.  A zero exponent means
- * zero or denormalized (0.fraction rather than 1.fraction), and the
- * maximum possible exponent, 2bias+1, signals inf (fraction==0) or NaN.
- *
- * Since the sign bit is always the topmost bit---this holds even for
- * integers---we set that outside all the *tof functions.  Each function
- * returns the class code for the new number (but note that we use
- * FPC_QNAN for all NaNs; fpu_explode will fix this if appropriate).
- */
-
-/*
- * int -> fpn.
- */
-int
-__fpu_itof(fp, i)
-	struct fpn *fp;
-	u_int i;
-{
-
-	if (i == 0)
-		return (FPC_ZERO);
-	/*
-	 * The value FP_1 represents 2^FP_LG, so set the exponent
-	 * there and let normalization fix it up.  Convert negative
-	 * numbers to sign-and-magnitude.  Note that this relies on
-	 * fpu_norm()'s handling of `supernormals'; see fpu_subr.c.
-	 */
-	fp->fp_exp = FP_LG;
-	/*
-	 * The sign bit decides whether i should be interpreted as
-	 * a signed or unsigned entity.
-	 */
-	if (fp->fp_sign && (int)i < 0)
-		fp->fp_mant[0] = -i;
-	else
-		fp->fp_mant[0] = i;
-	fp->fp_mant[1] = 0;
-	fp->fp_mant[2] = 0;
-	fp->fp_mant[3] = 0;
-	__fpu_norm(fp);
-	return (FPC_NUM);
-}
-
-/*
- * 64-bit int -> fpn.
- */
-int
-__fpu_xtof(fp, i)
-	struct fpn *fp;
-	u_int64_t i;
-{
-
-	if (i == 0)
-		return (FPC_ZERO);
-	/*
-	 * The value FP_1 represents 2^FP_LG, so set the exponent
-	 * there and let normalization fix it up.  Convert negative
-	 * numbers to sign-and-magnitude.  Note that this relies on
-	 * fpu_norm()'s handling of `supernormals'; see fpu_subr.c.
-	 */
-	fp->fp_exp = FP_LG2;
-	/*
-	 * The sign bit decides whether i should be interpreted as
-	 * a signed or unsigned entity.
-	 */
-	if (fp->fp_sign && (int64_t)i < 0)
-		*((int64_t *)fp->fp_mant) = -i;
-	else
-		*((int64_t *)fp->fp_mant) = i;
-	fp->fp_mant[2] = 0;
-	fp->fp_mant[3] = 0;
-	__fpu_norm(fp);
-	return (FPC_NUM);
-}
-
-#define	mask(nbits) ((1L << (nbits)) - 1)
-
-/*
- * All external floating formats convert to internal in the same manner,
- * as defined here.  Note that only normals get an implied 1.0 inserted.
- */
-#define	FP_TOF(exp, expbias, allfrac, f0, f1, f2, f3) \
-	if (exp == 0) { \
-		if (allfrac == 0) \
-			return (FPC_ZERO); \
-		fp->fp_exp = 1 - expbias; \
-		fp->fp_mant[0] = f0; \
-		fp->fp_mant[1] = f1; \
-		fp->fp_mant[2] = f2; \
-		fp->fp_mant[3] = f3; \
-		__fpu_norm(fp); \
-		return (FPC_NUM); \
-	} \
-	if (exp == (2 * expbias + 1)) { \
-		if (allfrac == 0) \
-			return (FPC_INF); \
-		fp->fp_mant[0] = f0; \
-		fp->fp_mant[1] = f1; \
-		fp->fp_mant[2] = f2; \
-		fp->fp_mant[3] = f3; \
-		return (FPC_QNAN); \
-	} \
-	fp->fp_exp = exp - expbias; \
-	fp->fp_mant[0] = FP_1 | f0; \
-	fp->fp_mant[1] = f1; \
-	fp->fp_mant[2] = f2; \
-	fp->fp_mant[3] = f3; \
-	return (FPC_NUM)
-
-/*
- * 32-bit single precision -> fpn.
- * We assume a single occupies at most (64-FP_LG) bits in the internal
- * format: i.e., needs at most fp_mant[0] and fp_mant[1].
- */
-int
-__fpu_stof(fp, i)
-	struct fpn *fp;
-	u_int i;
-{
-	int exp;
-	u_int frac, f0, f1;
-#define SNG_SHIFT (SNG_FRACBITS - FP_LG)
-
-	exp = (i >> (32 - 1 - SNG_EXPBITS)) & mask(SNG_EXPBITS);
-	frac = i & mask(SNG_FRACBITS);
-	f0 = frac >> SNG_SHIFT;
-	f1 = frac << (32 - SNG_SHIFT);
-	FP_TOF(exp, SNG_EXP_BIAS, frac, f0, f1, 0, 0);
-}
-
-/*
- * 64-bit double -> fpn.
- * We assume this uses at most (96-FP_LG) bits.
- */
-int
-__fpu_dtof(fp, i, j)
-	struct fpn *fp;
-	u_int i, j;
-{
-	int exp;
-	u_int frac, f0, f1, f2;
-#define DBL_SHIFT (DBL_FRACBITS - 32 - FP_LG)
-
-	exp = (i >> (32 - 1 - DBL_EXPBITS)) & mask(DBL_EXPBITS);
-	frac = i & mask(DBL_FRACBITS - 32);
-	f0 = frac >> DBL_SHIFT;
-	f1 = (frac << (32 - DBL_SHIFT)) | (j >> DBL_SHIFT);
-	f2 = j << (32 - DBL_SHIFT);
-	frac |= j;
-	FP_TOF(exp, DBL_EXP_BIAS, frac, f0, f1, f2, 0);
-}
-
-/*
- * 128-bit extended -> fpn.
- */
-int
-__fpu_qtof(fp, i, j, k, l)
-	struct fpn *fp;
-	u_int i, j, k, l;
-{
-	int exp;
-	u_int frac, f0, f1, f2, f3;
-#define EXT_SHIFT (-(EXT_FRACBITS - 3 * 32 - FP_LG))	/* left shift! */
-
-	/*
-	 * Note that ext and fpn `line up', hence no shifting needed.
-	 */
-	exp = (i >> (32 - 1 - EXT_EXPBITS)) & mask(EXT_EXPBITS);
-	frac = i & mask(EXT_FRACBITS - 3 * 32);
-	f0 = (frac << EXT_SHIFT) | (j >> (32 - EXT_SHIFT));
-	f1 = (j << EXT_SHIFT) | (k >> (32 - EXT_SHIFT));
-	f2 = (k << EXT_SHIFT) | (l >> (32 - EXT_SHIFT));
-	f3 = l << EXT_SHIFT;
-	frac |= j | k | l;
-	FP_TOF(exp, EXT_EXP_BIAS, frac, f0, f1, f2, f3);
-}
-
-/*
- * Explode the contents of a / regpair / regquad.
- * If the input is a signalling NaN, an NV (invalid) exception
- * will be set.  (Note that nothing but NV can occur until ALU
- * operations are performed.)
- */
-void
-__fpu_explode(fe, fp, type, reg)
-	struct fpemu *fe;
-	struct fpn *fp;
-	int type, reg;
-{
-	u_int64_t l0, l1;
-	uint32_t s;
-
-	if (type == FTYPE_LNG || type == FTYPE_DBL || type == FTYPE_EXT) {
-		l0 = __fpu_getreg64(reg & ~1);
-		fp->fp_sign = l0 >> 63;
-	} else {
-		s = __fpu_getreg(reg);
-		fp->fp_sign = s >> 31;
-	}
-	fp->fp_sticky = 0;
-	switch (type) {
-	case FTYPE_LNG:
-		s = __fpu_xtof(fp, l0);
-		break;
-
-	case FTYPE_INT:
-		s = __fpu_itof(fp, s);
-		break;
-
-	case FTYPE_SNG:
-		s = __fpu_stof(fp, s);
-		break;
-
-	case FTYPE_DBL:
-		s = __fpu_dtof(fp, l0 >> 32, l0 & 0xffffffff);
-		break;
-
-	case FTYPE_EXT:
-		l1 = __fpu_getreg64((reg & ~1) + 2);
-		s = __fpu_qtof(fp, l0 >> 32, l0 & 0xffffffff, l1 >> 32,
-		    l1 & 0xffffffff);
-		break;
-
-	default:
-		__utrap_panic("fpu_explode");
-	}
-
-	if (s == FPC_QNAN && (fp->fp_mant[0] & FP_QUIETBIT) == 0) {
-		/*
-		 * Input is a signalling NaN.  All operations that return
-		 * an input NaN operand put it through a ``NaN conversion'',
-		 * which basically just means ``turn on the quiet bit''.
-		 * We do this here so that all NaNs internally look quiet
-		 * (we can tell signalling ones by their class).
-		 */
-		fp->fp_mant[0] |= FP_QUIETBIT;
-		fe->fe_cx = FSR_NV;	/* assert invalid operand */
-		s = FPC_SNAN;
-	}
-	fp->fp_class = s;
-	DPRINTF(FPE_REG, ("fpu_explode: %%%c%d => ", (type == FTYPE_LNG) ? 'x' :
-		((type == FTYPE_INT) ? 'i' :
-			((type == FTYPE_SNG) ? 's' :
-				((type == FTYPE_DBL) ? 'd' :
-					((type == FTYPE_EXT) ? 'q' : '?')))),
-		reg));
-	DUMPFPN(FPE_REG, fp);
-	DPRINTF(FPE_REG, ("\n"));
-}
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_extern.h b/lib/libc_bsd/sparc64/fpu/fpu_extern.h
deleted file mode 100644
index 7b875be..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_extern.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1995 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Christos Zoulas.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- *	$NetBSD: fpu_extern.h,v 1.4 2000/08/03 18:32:08 eeh Exp $
- * $FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_extern.h 205393 2010-03-20 21:04:47Z marius $
- */
-
-#ifndef _SPARC64_FPU_FPU_EXTERN_H_
-#define _SPARC64_FPU_FPU_EXTERN_H_
-
-struct utrapframe;
-struct fpemu;
-struct fpn;
-
-/* fpu.c */
-int __fpu_exception(struct utrapframe *tf);
-
-/* fpu_add.c */
-struct fpn *__fpu_add(struct fpemu *);
-
-/* fpu_compare.c */
-void __fpu_compare(struct fpemu *, int, int);
-
-/* fpu_div.c */
-struct fpn *__fpu_div(struct fpemu *);
-
-/* fpu_explode.c */
-int __fpu_itof(struct fpn *, u_int);
-int __fpu_xtof(struct fpn *, u_int64_t);
-int __fpu_stof(struct fpn *, u_int);
-int __fpu_dtof(struct fpn *, u_int, u_int);
-int __fpu_qtof(struct fpn *, u_int, u_int, u_int, u_int);
-void __fpu_explode(struct fpemu *, struct fpn *, int, int);
-
-/* fpu_implode.c */
-u_int __fpu_ftoi(struct fpemu *, struct fpn *);
-u_int __fpu_ftox(struct fpemu *, struct fpn *, u_int *);
-u_int __fpu_ftos(struct fpemu *, struct fpn *);
-u_int __fpu_ftod(struct fpemu *, struct fpn *, u_int *);
-u_int __fpu_ftoq(struct fpemu *, struct fpn *, u_int *);
-void __fpu_implode(struct fpemu *, struct fpn *, int, u_int *);
-
-/* fpu_mul.c */
-struct fpn *__fpu_mul(struct fpemu *);
-
-/* fpu_sqrt.c */
-struct fpn *__fpu_sqrt(struct fpemu *);
-
-/* fpu_subr.c */
-/*
- * Shift a number right some number of bits, taking care of round/sticky.
- * Note that the result is probably not a well-formed number (it will lack
- * the normal 1-bit mant[0]&FP_1).
- */
-int __fpu_shr(register struct fpn *, register int);
-void __fpu_norm(register struct fpn *);
-/* Build a new Quiet NaN (sign=0, frac=all 1's). */
-struct fpn *__fpu_newnan(register struct fpemu *);
-
-#endif /* !_SPARC64_FPU_FPU_EXTERN_H_ */
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_implode.c b/lib/libc_bsd/sparc64/fpu/fpu_implode.c
deleted file mode 100644
index 85b38f2..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_implode.c
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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, Lawrence Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_implode.c	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_implode.c,v 1.8 2001/08/26 05:44:46 eeh Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_implode.c 205397 2010-03-20 22:32:13Z marius $");
-
-/*
- * FPU subroutines: `implode' internal format numbers into the machine's
- * `packed binary' format.
- */
-
-#include <sys/param.h>
-
-#ifdef FPU_DEBUG
-#include <stdio.h>
-#endif
-
-#include <machine/frame.h>
-#include <machine/fp.h>
-#include <machine/fsr.h>
-#include <machine/ieee.h>
-#include <machine/instr.h>
-
-#include "fpu_arith.h"
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-#include "__sparc_utrap_private.h"
-
-static int fpround(struct fpemu *, struct fpn *);
-static int toinf(struct fpemu *, int);
-
-/*
- * Round a number (algorithm from Motorola MC68882 manual, modified for
- * our internal format).  Set inexact exception if rounding is required.
- * Return true iff we rounded up.
- *
- * After rounding, we discard the guard and round bits by shifting right
- * 2 bits (a la fpu_shr(), but we do not bother with fp->fp_sticky).
- * This saves effort later.
- *
- * Note that we may leave the value 2.0 in fp->fp_mant; it is the caller's
- * responsibility to fix this if necessary.
- */
-static int
-fpround(struct fpemu *fe, struct fpn *fp)
-{
-	u_int m0, m1, m2, m3;
-	int gr, s;
-
-	m0 = fp->fp_mant[0];
-	m1 = fp->fp_mant[1];
-	m2 = fp->fp_mant[2];
-	m3 = fp->fp_mant[3];
-	gr = m3 & 3;
-	s = fp->fp_sticky;
-
-	/* mant >>= FP_NG */
-	m3 = (m3 >> FP_NG) | (m2 << (32 - FP_NG));
-	m2 = (m2 >> FP_NG) | (m1 << (32 - FP_NG));
-	m1 = (m1 >> FP_NG) | (m0 << (32 - FP_NG));
-	m0 >>= FP_NG;
-
-	if ((gr | s) == 0)	/* result is exact: no rounding needed */
-		goto rounddown;
-
-	fe->fe_cx |= FSR_NX;	/* inexact */
-
-	/* Go to rounddown to round down; break to round up. */
-	switch (FSR_GET_RD(fe->fe_fsr)) {
-	case FSR_RD_N:
-	default:
-		/*
-		 * Round only if guard is set (gr & 2).  If guard is set,
-		 * but round & sticky both clear, then we want to round
-		 * but have a tie, so round to even, i.e., add 1 iff odd.
-		 */
-		if ((gr & 2) == 0)
-			goto rounddown;
-		if ((gr & 1) || fp->fp_sticky || (m3 & 1))
-			break;
-		goto rounddown;
-
-	case FSR_RD_Z:
-		/* Round towards zero, i.e., down. */
-		goto rounddown;
-
-	case FSR_RD_NINF:
-		/* Round towards -Inf: up if negative, down if positive. */
-		if (fp->fp_sign)
-			break;
-		goto rounddown;
-
-	case FSR_RD_PINF:
-		/* Round towards +Inf: up if positive, down otherwise. */
-		if (!fp->fp_sign)
-			break;
-		goto rounddown;
-	}
-
-	/* Bump low bit of mantissa, with carry. */
-	FPU_ADDS(m3, m3, 1);
-	FPU_ADDCS(m2, m2, 0);
-	FPU_ADDCS(m1, m1, 0);
-	FPU_ADDC(m0, m0, 0);
-	fp->fp_mant[0] = m0;
-	fp->fp_mant[1] = m1;
-	fp->fp_mant[2] = m2;
-	fp->fp_mant[3] = m3;
-	return (1);
-
-rounddown:
-	fp->fp_mant[0] = m0;
-	fp->fp_mant[1] = m1;
-	fp->fp_mant[2] = m2;
-	fp->fp_mant[3] = m3;
-	return (0);
-}
-
-/*
- * For overflow: return true if overflow is to go to +/-Inf, according
- * to the sign of the overflowing result.  If false, overflow is to go
- * to the largest magnitude value instead.
- */
-static int
-toinf(struct fpemu *fe, int sign)
-{
-	int inf;
-
-	/* look at rounding direction */
-	switch (FSR_GET_RD(fe->fe_fsr)) {
-	default:
-	case FSR_RD_N:		/* the nearest value is always Inf */
-		inf = 1;
-		break;
-
-	case FSR_RD_Z:		/* toward 0 => never towards Inf */
-		inf = 0;
-		break;
-
-	case FSR_RD_PINF:	/* toward +Inf iff positive */
-		inf = sign == 0;
-		break;
-
-	case FSR_RD_NINF:	/* toward -Inf iff negative */
-		inf = sign;
-		break;
-	}
-	return (inf);
-}
-
-/*
- * fpn -> int (int value returned as return value).
- *
- * N.B.: this conversion always rounds towards zero (this is a peculiarity
- * of the SPARC instruction set).
- */
-u_int
-__fpu_ftoi(fe, fp)
-	struct fpemu *fe;
-	struct fpn *fp;
-{
-	u_int i;
-	int sign, exp;
-
-	sign = fp->fp_sign;
-	switch (fp->fp_class) {
-	case FPC_ZERO:
-		return (0);
-
-	case FPC_NUM:
-		/*
-		 * If exp >= 2^32, overflow.  Otherwise shift value right
-		 * into last mantissa word (this will not exceed 0xffffffff),
-		 * shifting any guard and round bits out into the sticky
-		 * bit.  Then ``round'' towards zero, i.e., just set an
-		 * inexact exception if sticky is set (see round()).
-		 * If the result is > 0x80000000, or is positive and equals
-		 * 0x80000000, overflow; otherwise the last fraction word
-		 * is the result.
-		 */
-		if ((exp = fp->fp_exp) >= 32)
-			break;
-		/* NB: the following includes exp < 0 cases */
-		if (__fpu_shr(fp, FP_NMANT - 1 - exp) != 0)
-			fe->fe_cx |= FSR_NX;
-		i = fp->fp_mant[3];
-		if (i >= ((u_int)0x80000000 + sign))
-			break;
-		return (sign ? -i : i);
-
-	default:		/* Inf, qNaN, sNaN */
-		break;
-	}
-	/* overflow: replace any inexact exception with invalid */
-	fe->fe_cx = (fe->fe_cx & ~FSR_NX) | FSR_NV;
-	return (0x7fffffff + sign);
-}
-
-/*
- * fpn -> extended int (high bits of int value returned as return value).
- *
- * N.B.: this conversion always rounds towards zero (this is a peculiarity
- * of the SPARC instruction set).
- */
-u_int
-__fpu_ftox(fe, fp, res)
-	struct fpemu *fe;
-	struct fpn *fp;
-	u_int *res;
-{
-	u_int64_t i;
-	int sign, exp;
-
-	sign = fp->fp_sign;
-	switch (fp->fp_class) {
-	case FPC_ZERO:
-		i = 0;
-		goto done;
-
-	case FPC_NUM:
-		/*
-		 * If exp >= 2^64, overflow.  Otherwise shift value
-		 * right into last mantissa word (this will not exceed
-		 * 0xffffffffffffffff), shifting any guard and round
-		 * bits out into the sticky bit.  Then ``round'' towards
-		 * zero, i.e., just set an inexact exception if sticky
-		 * is set (see round()).
-		 * If the result is > 0x8000000000000000, or is positive
-		 * and equals 0x8000000000000000, overflow; otherwise
-		 * the last fraction word is the result.
-		 */
-		if ((exp = fp->fp_exp) >= 64)
-			break;
-		/* NB: the following includes exp < 0 cases */
-		if (__fpu_shr(fp, FP_NMANT - 1 - exp) != 0)
-			fe->fe_cx |= FSR_NX;
-		i = ((u_int64_t)fp->fp_mant[2]<<32)|fp->fp_mant[3];
-		if (i >= ((u_int64_t)0x8000000000000000LL + sign))
-			break;
-		if (sign)
-			i = -i;
-		goto done;
-
-	default:		/* Inf, qNaN, sNaN */
-		break;
-	}
-	/* overflow: replace any inexact exception with invalid */
-	fe->fe_cx = (fe->fe_cx & ~FSR_NX) | FSR_NV;
-	i = 0x7fffffffffffffffLL + sign;
-done:
-	res[1] = i & 0xffffffff;
-	return (i >> 32);
-}
-
-/*
- * fpn -> single (32 bit single returned as return value).
- * We assume <= 29 bits in a single-precision fraction (1.f part).
- */
-u_int
-__fpu_ftos(fe, fp)
-	struct fpemu *fe;
-	struct fpn *fp;
-{
-	u_int sign = fp->fp_sign << 31;
-	int exp;
-
-#define	SNG_EXP(e)	((e) << SNG_FRACBITS)	/* makes e an exponent */
-#define	SNG_MASK	(SNG_EXP(1) - 1)	/* mask for fraction */
-
-	/* Take care of non-numbers first. */
-	if (ISNAN(fp)) {
-		/*
-		 * Preserve upper bits of NaN, per SPARC V8 appendix N.
-		 * Note that fp->fp_mant[0] has the quiet bit set,
-		 * even if it is classified as a signalling NaN.
-		 */
-		(void) __fpu_shr(fp, FP_NMANT - 1 - SNG_FRACBITS);
-		exp = SNG_EXP_INFNAN;
-		goto done;
-	}
-	if (ISINF(fp))
-		return (sign | SNG_EXP(SNG_EXP_INFNAN));
-	if (ISZERO(fp))
-		return (sign);
-
-	/*
-	 * Normals (including subnormals).  Drop all the fraction bits
-	 * (including the explicit ``implied'' 1 bit) down into the
-	 * single-precision range.  If the number is subnormal, move
-	 * the ``implied'' 1 into the explicit range as well, and shift
-	 * right to introduce leading zeroes.  Rounding then acts
-	 * differently for normals and subnormals: the largest subnormal
-	 * may round to the smallest normal (1.0 x 2^minexp), or may
-	 * remain subnormal.  A number that is subnormal before rounding
-	 * will signal an underflow if the result is inexact or if underflow
-	 * traps are enabled.
-	 *
-	 * Rounding a normal, on the other hand, always produces another
-	 * normal (although either way the result might be too big for
-	 * single precision, and cause an overflow).  If rounding a
-	 * normal produces 2.0 in the fraction, we need not adjust that
-	 * fraction at all, since both 1.0 and 2.0 are zero under the
-	 * fraction mask.
-	 *
-	 * Note that the guard and round bits vanish from the number after
-	 * rounding.
-	 */
-	if ((exp = fp->fp_exp + SNG_EXP_BIAS) <= 0) {	/* subnormal */
-		/* -NG for g,r; -SNG_FRACBITS-exp for fraction */
-		(void) __fpu_shr(fp, FP_NMANT - FP_NG - SNG_FRACBITS - exp);
-		if (fpround(fe, fp) && fp->fp_mant[3] == SNG_EXP(1)) {
-			fe->fe_cx |= FSR_UF;
-			return (sign | SNG_EXP(1) | 0);
-		}
-		if ((fe->fe_cx & FSR_NX) ||
-		    (fe->fe_fsr & (FSR_UF << FSR_TEM_SHIFT)))
-			fe->fe_cx |= FSR_UF;
-		return (sign | SNG_EXP(0) | fp->fp_mant[3]);
-	}
-	/* -FP_NG for g,r; -1 for implied 1; -SNG_FRACBITS for fraction */
-	(void) __fpu_shr(fp, FP_NMANT - FP_NG - 1 - SNG_FRACBITS);
-#ifdef DIAGNOSTIC
-	if ((fp->fp_mant[3] & SNG_EXP(1 << FP_NG)) == 0)
-		__utrap_panic("fpu_ftos");
-#endif
-	if (fpround(fe, fp) && fp->fp_mant[3] == SNG_EXP(2))
-		exp++;
-	if (exp >= SNG_EXP_INFNAN) {
-		/* overflow to inf or to max single */
-		fe->fe_cx |= FSR_OF | FSR_NX;
-		if (toinf(fe, sign))
-			return (sign | SNG_EXP(SNG_EXP_INFNAN));
-		return (sign | SNG_EXP(SNG_EXP_INFNAN - 1) | SNG_MASK);
-	}
-done:
-	/* phew, made it */
-	return (sign | SNG_EXP(exp) | (fp->fp_mant[3] & SNG_MASK));
-}
-
-/*
- * fpn -> double (32 bit high-order result returned; 32-bit low order result
- * left in res[1]).  Assumes <= 61 bits in double precision fraction.
- *
- * This code mimics fpu_ftos; see it for comments.
- */
-u_int
-__fpu_ftod(fe, fp, res)
-	struct fpemu *fe;
-	struct fpn *fp;
-	u_int *res;
-{
-	u_int sign = fp->fp_sign << 31;
-	int exp;
-
-#define	DBL_EXP(e)	((e) << (DBL_FRACBITS & 31))
-#define	DBL_MASK	(DBL_EXP(1) - 1)
-
-	if (ISNAN(fp)) {
-		(void) __fpu_shr(fp, FP_NMANT - 1 - DBL_FRACBITS);
-		exp = DBL_EXP_INFNAN;
-		goto done;
-	}
-	if (ISINF(fp)) {
-		sign |= DBL_EXP(DBL_EXP_INFNAN);
-		goto zero;
-	}
-	if (ISZERO(fp)) {
-zero:		res[1] = 0;
-		return (sign);
-	}
-
-	if ((exp = fp->fp_exp + DBL_EXP_BIAS) <= 0) {
-		(void) __fpu_shr(fp, FP_NMANT - FP_NG - DBL_FRACBITS - exp);
-		if (fpround(fe, fp) && fp->fp_mant[2] == DBL_EXP(1)) {
-			fe->fe_cx |= FSR_UF;
-			res[1] = 0;
-			return (sign | DBL_EXP(1) | 0);
-		}
-		if ((fe->fe_cx & FSR_NX) ||
-		    (fe->fe_fsr & (FSR_UF << FSR_TEM_SHIFT)))
-			fe->fe_cx |= FSR_UF;
-		exp = 0;
-		goto done;
-	}
-	(void) __fpu_shr(fp, FP_NMANT - FP_NG - 1 - DBL_FRACBITS);
-	if (fpround(fe, fp) && fp->fp_mant[2] == DBL_EXP(2))
-		exp++;
-	if (exp >= DBL_EXP_INFNAN) {
-		fe->fe_cx |= FSR_OF | FSR_NX;
-		if (toinf(fe, sign)) {
-			res[1] = 0;
-			return (sign | DBL_EXP(DBL_EXP_INFNAN) | 0);
-		}
-		res[1] = ~0;
-		return (sign | DBL_EXP(DBL_EXP_INFNAN - 1) | DBL_MASK);
-	}
-done:
-	res[1] = fp->fp_mant[3];
-	return (sign | DBL_EXP(exp) | (fp->fp_mant[2] & DBL_MASK));
-}
-
-/*
- * fpn -> extended (32 bit high-order result returned; low-order fraction
- * words left in res[1]..res[3]).  Like ftod, which is like ftos ... but
- * our internal format *is* extended precision, plus 2 bits for guard/round,
- * so we can avoid a small bit of work.
- */
-u_int
-__fpu_ftoq(fe, fp, res)
-	struct fpemu *fe;
-	struct fpn *fp;
-	u_int *res;
-{
-	u_int sign = fp->fp_sign << 31;
-	int exp;
-
-#define	EXT_EXP(e)	((e) << (EXT_FRACBITS & 31))
-#define	EXT_MASK	(EXT_EXP(1) - 1)
-
-	if (ISNAN(fp)) {
-		(void) __fpu_shr(fp, 2);	/* since we are not rounding */
-		exp = EXT_EXP_INFNAN;
-		goto done;
-	}
-	if (ISINF(fp)) {
-		sign |= EXT_EXP(EXT_EXP_INFNAN);
-		goto zero;
-	}
-	if (ISZERO(fp)) {
-zero:		res[1] = res[2] = res[3] = 0;
-		return (sign);
-	}
-
-	if ((exp = fp->fp_exp + EXT_EXP_BIAS) <= 0) {
-		(void) __fpu_shr(fp, FP_NMANT - FP_NG - EXT_FRACBITS - exp);
-		if (fpround(fe, fp) && fp->fp_mant[0] == EXT_EXP(1)) {
-			fe->fe_cx |= FSR_UF;
-			res[1] = res[2] = res[3] = 0;
-			return (sign | EXT_EXP(1) | 0);
-		}
-		if ((fe->fe_cx & FSR_NX) ||
-		    (fe->fe_fsr & (FSR_UF << FSR_TEM_SHIFT)))
-			fe->fe_cx |= FSR_UF;
-		exp = 0;
-		goto done;
-	}
-	/* Since internal == extended, no need to shift here. */
-	if (fpround(fe, fp) && fp->fp_mant[0] == EXT_EXP(2))
-		exp++;
-	if (exp >= EXT_EXP_INFNAN) {
-		fe->fe_cx |= FSR_OF | FSR_NX;
-		if (toinf(fe, sign)) {
-			res[1] = res[2] = res[3] = 0;
-			return (sign | EXT_EXP(EXT_EXP_INFNAN) | 0);
-		}
-		res[1] = res[2] = res[3] = ~0;
-		return (sign | EXT_EXP(EXT_EXP_INFNAN - 1) | EXT_MASK);
-	}
-done:
-	res[1] = fp->fp_mant[1];
-	res[2] = fp->fp_mant[2];
-	res[3] = fp->fp_mant[3];
-	return (sign | EXT_EXP(exp) | (fp->fp_mant[0] & EXT_MASK));
-}
-
-/*
- * Implode an fpn, writing the result into the given space.
- */
-void
-__fpu_implode(fe, fp, type, space)
-	struct fpemu *fe;
-	struct fpn *fp;
-	int type;
-	u_int *space;
-{
-
-	switch (type) {
-	case FTYPE_LNG:
-		space[0] = __fpu_ftox(fe, fp, space);
-		break;
-
-	case FTYPE_INT:
-		space[0] = __fpu_ftoi(fe, fp);
-		break;
-
-	case FTYPE_SNG:
-		space[0] = __fpu_ftos(fe, fp);
-		break;
-
-	case FTYPE_DBL:
-		space[0] = __fpu_ftod(fe, fp, space);
-		break;
-
-	case FTYPE_EXT:
-		/* funky rounding precision options ?? */
-		space[0] = __fpu_ftoq(fe, fp, space);
-		break;
-
-	default:
-		__utrap_panic("fpu_implode");
-	}
-	DPRINTF(FPE_REG, ("fpu_implode: %x %x %x %x\n",
-		space[0], space[1], space[2], space[3]));
-}
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_mul.c b/lib/libc_bsd/sparc64/fpu/fpu_mul.c
deleted file mode 100644
index 6803ed9..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_mul.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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, Lawrence Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_mul.c	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_mul.c,v 1.2 1994/11/20 20:52:44 deraadt Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_mul.c 230193 2012-01-16 04:09:45Z das $");
-
-/*
- * Perform an FPU multiply (return x * y).
- */
-
-#include <sys/types.h>
-
-#include <machine/frame.h>
-#include <machine/fp.h>
-
-#include "fpu_arith.h"
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-
-/*
- * The multiplication algorithm for normal numbers is as follows:
- *
- * The fraction of the product is built in the usual stepwise fashion.
- * Each step consists of shifting the accumulator right one bit
- * (maintaining any guard bits) and, if the next bit in y is set,
- * adding the multiplicand (x) to the accumulator.  Then, in any case,
- * we advance one bit leftward in y.  Algorithmically:
- *
- *	A = 0;
- *	for (bit = 0; bit < FP_NMANT; bit++) {
- *		sticky |= A & 1, A >>= 1;
- *		if (Y & (1 << bit))
- *			A += X;
- *	}
- *
- * (X and Y here represent the mantissas of x and y respectively.)
- * The resultant accumulator (A) is the product's mantissa.  It may
- * be as large as 11.11111... in binary and hence may need to be
- * shifted right, but at most one bit.
- *
- * Since we do not have efficient multiword arithmetic, we code the
- * accumulator as four separate words, just like any other mantissa.
- * We use local `register' variables in the hope that this is faster
- * than memory.  We keep x->fp_mant in locals for the same reason.
- *
- * In the algorithm above, the bits in y are inspected one at a time.
- * We will pick them up 32 at a time and then deal with those 32, one
- * at a time.  Note, however, that we know several things about y:
- *
- *    - the guard and round bits at the bottom are sure to be zero;
- *
- *    - often many low bits are zero (y is often from a single or double
- *	precision source);
- *
- *    - bit FP_NMANT-1 is set, and FP_1*2 fits in a word.
- *
- * We can also test for 32-zero-bits swiftly.  In this case, the center
- * part of the loop---setting sticky, shifting A, and not adding---will
- * run 32 times without adding X to A.  We can do a 32-bit shift faster
- * by simply moving words.  Since zeros are common, we optimize this case.
- * Furthermore, since A is initially zero, we can omit the shift as well
- * until we reach a nonzero word.
- */
-struct fpn *
-__fpu_mul(fe)
-	struct fpemu *fe;
-{
-	struct fpn *x = &fe->fe_f1, *y = &fe->fe_f2;
-	u_int a3, a2, a1, a0, x3, x2, x1, x0, bit, m;
-	int sticky;
-	FPU_DECL_CARRY
-
-	/*
-	 * Put the `heavier' operand on the right (see fpu_emu.h).
-	 * Then we will have one of the following cases, taken in the
-	 * following order:
-	 *
-	 *  - y = NaN.  Implied: if only one is a signalling NaN, y is.
-	 *	The result is y.
-	 *  - y = Inf.  Implied: x != NaN (is 0, number, or Inf: the NaN
-	 *    case was taken care of earlier).
-	 *	If x = 0, the result is NaN.  Otherwise the result
-	 *	is y, with its sign reversed if x is negative.
-	 *  - x = 0.  Implied: y is 0 or number.
-	 *	The result is 0 (with XORed sign as usual).
-	 *  - other.  Implied: both x and y are numbers.
-	 *	The result is x * y (XOR sign, multiply bits, add exponents).
-	 */
-	ORDER(x, y);
-	if (ISNAN(y))
-		return (y);
-	if (ISINF(y)) {
-		if (ISZERO(x))
-			return (__fpu_newnan(fe));
-		y->fp_sign ^= x->fp_sign;
-		return (y);
-	}
-	if (ISZERO(x)) {
-		x->fp_sign ^= y->fp_sign;
-		return (x);
-	}
-
-	/*
-	 * Setup.  In the code below, the mask `m' will hold the current
-	 * mantissa byte from y.  The variable `bit' denotes the bit
-	 * within m.  We also define some macros to deal with everything.
-	 */
-	x3 = x->fp_mant[3];
-	x2 = x->fp_mant[2];
-	x1 = x->fp_mant[1];
-	x0 = x->fp_mant[0];
-	sticky = a3 = a2 = a1 = a0 = 0;
-
-#define	ADD	/* A += X */ \
-	FPU_ADDS(a3, a3, x3); \
-	FPU_ADDCS(a2, a2, x2); \
-	FPU_ADDCS(a1, a1, x1); \
-	FPU_ADDC(a0, a0, x0)
-
-#define	SHR1	/* A >>= 1, with sticky */ \
-	sticky |= a3 & 1, a3 = (a3 >> 1) | (a2 << 31), \
-	a2 = (a2 >> 1) | (a1 << 31), a1 = (a1 >> 1) | (a0 << 31), a0 >>= 1
-
-#define	SHR32	/* A >>= 32, with sticky */ \
-	sticky |= a3, a3 = a2, a2 = a1, a1 = a0, a0 = 0
-
-#define	STEP	/* each 1-bit step of the multiplication */ \
-	SHR1; if (bit & m) { ADD; }; bit <<= 1
-
-	/*
-	 * We are ready to begin.  The multiply loop runs once for each
-	 * of the four 32-bit words.  Some words, however, are special.
-	 * As noted above, the low order bits of Y are often zero.  Even
-	 * if not, the first loop can certainly skip the guard bits.
-	 * The last word of y has its highest 1-bit in position FP_NMANT-1,
-	 * so we stop the loop when we move past that bit.
-	 */
-	if ((m = y->fp_mant[3]) == 0) {
-		/* SHR32; */			/* unneeded since A==0 */
-	} else {
-		bit = 1 << FP_NG;
-		do {
-			STEP;
-		} while (bit != 0);
-	}
-	if ((m = y->fp_mant[2]) == 0) {
-		SHR32;
-	} else {
-		bit = 1;
-		do {
-			STEP;
-		} while (bit != 0);
-	}
-	if ((m = y->fp_mant[1]) == 0) {
-		SHR32;
-	} else {
-		bit = 1;
-		do {
-			STEP;
-		} while (bit != 0);
-	}
-	m = y->fp_mant[0];		/* definitely != 0 */
-	bit = 1;
-	do {
-		STEP;
-	} while (bit <= m);
-
-	/*
-	 * Done with mantissa calculation.  Get exponent and handle
-	 * 11.111...1 case, then put result in place.  We reuse x since
-	 * it already has the right class (FP_NUM).
-	 */
-	m = x->fp_exp + y->fp_exp;
-	if (a0 >= FP_2) {
-		SHR1;
-		m++;
-	}
-	x->fp_sign ^= y->fp_sign;
-	x->fp_exp = m;
-	x->fp_sticky = sticky;
-	x->fp_mant[3] = a3;
-	x->fp_mant[2] = a2;
-	x->fp_mant[1] = a1;
-	x->fp_mant[0] = a0;
-	return (x);
-}
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_qp.c b/lib/libc_bsd/sparc64/fpu/fpu_qp.c
deleted file mode 100644
index f107bc0..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_qp.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*-
- * Copyright (c) 2002 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_qp.c 178138 2008-04-12 03:09:51Z das $");
-
-#include <sys/types.h>
-#include <machine/fsr.h>
-
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-
-#define	_QP_OP(op) \
-void _Qp_ ## op(u_int *c, u_int *a, u_int *b); \
-void \
-_Qp_ ## op(u_int *c, u_int *a, u_int *b) \
-{ \
-	struct fpemu fe; \
-	struct fpn *r; \
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
-	fe.fe_cx = 0; \
-	fe.fe_f1.fp_sign = a[0] >> 31; \
-	fe.fe_f1.fp_sticky = 0; \
-	fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \
-	fe.fe_f2.fp_sign = b[0] >> 31; \
-	fe.fe_f2.fp_sticky = 0; \
-	fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \
-	r = __fpu_ ## op(&fe); \
-	c[0] = __fpu_ftoq(&fe, r, c); \
-	fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \
-	__asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \
-}
-
-#define	_QP_TTOQ(qname, fname, ntype, signpos, atype, ...) \
-void _Qp_ ## qname ## toq(u_int *c, ntype n); \
-void \
-_Qp_ ## qname ## toq(u_int *c, ntype n) \
-{ \
-	struct fpemu fe; \
-	union { atype a[2]; ntype n; } u = { .n = n }; \
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
-	fe.fe_cx = 0; \
-	fe.fe_f1.fp_sign = (signpos >= 0) ? u.a[0] >> signpos : 0; \
-	fe.fe_f1.fp_sticky = 0; \
-	fe.fe_f1.fp_class = __fpu_ ## fname ## tof(&fe.fe_f1, __VA_ARGS__); \
-	c[0] = __fpu_ftoq(&fe, &fe.fe_f1, c); \
-	fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \
-	__asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \
-}
-
-#define	_QP_QTOT(qname, fname, type, ...) \
-type _Qp_qto ## qname(u_int *c); \
-type \
-_Qp_qto ## qname(u_int *c) \
-{ \
-	struct fpemu fe; \
-	union { u_int a; type n; } u; \
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
-	fe.fe_cx = 0; \
-	fe.fe_f1.fp_sign = c[0] >> 31; \
-	fe.fe_f1.fp_sticky = 0; \
-	fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, c[0], c[1], c[2], c[3]); \
-	u.a = __fpu_fto ## fname(&fe, &fe.fe_f1, ## __VA_ARGS__); \
-	fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \
-	__asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \
-	return (u.n); \
-}
-
-#define	FCC_EQ(fcc)	((fcc) == FSR_CC_EQ)
-#define	FCC_GE(fcc)	((fcc) == FSR_CC_EQ || (fcc) == FSR_CC_GT)
-#define	FCC_GT(fcc)	((fcc) == FSR_CC_GT)
-#define	FCC_LE(fcc)	((fcc) == FSR_CC_EQ || (fcc) == FSR_CC_LT)
-#define	FCC_LT(fcc)	((fcc) == FSR_CC_LT)
-#define	FCC_NE(fcc)	((fcc) != FSR_CC_EQ)
-#define	FCC_ID(fcc)	(fcc)
-
-#define	_QP_CMP(name, cmpe, test) \
-int _Qp_ ## name(u_int *a, u_int *b) ; \
-int \
-_Qp_ ## name(u_int *a, u_int *b) \
-{ \
-	struct fpemu fe; \
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
-	fe.fe_cx = 0; \
-	fe.fe_f1.fp_sign = a[0] >> 31; \
-	fe.fe_f1.fp_sticky = 0; \
-	fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]); \
-	fe.fe_f2.fp_sign = b[0] >> 31; \
-	fe.fe_f2.fp_sticky = 0; \
-	fe.fe_f2.fp_class = __fpu_qtof(&fe.fe_f2, b[0], b[1], b[2], b[3]); \
-	__fpu_compare(&fe, cmpe, 0); \
-	fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT; \
-	__asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr)); \
-	return (test(FSR_GET_FCC0(fe.fe_fsr))); \
-}
-
-void _Qp_sqrt(u_int *c, u_int *a);
-void
-_Qp_sqrt(u_int *c, u_int *a)
-{
-	struct fpemu fe;
-	struct fpn *r;
-	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :);
-	fe.fe_cx = 0;
-	fe.fe_f1.fp_sign = a[0] >> 31;
-	fe.fe_f1.fp_sticky = 0;
-	fe.fe_f1.fp_class = __fpu_qtof(&fe.fe_f1, a[0], a[1], a[2], a[3]);
-	r = __fpu_sqrt(&fe);
-	c[0] = __fpu_ftoq(&fe, r, c);
-	fe.fe_fsr |= fe.fe_cx << FSR_AEXC_SHIFT;
-	__asm __volatile("ldx %0, %%fsr" : : "m" (fe.fe_fsr));
-}
-
-_QP_OP(add)
-_QP_OP(div)
-_QP_OP(mul)
-_QP_OP(sub)
-
-_QP_TTOQ(d,	d,	double,	31, u_int,  u.a[0], u.a[1])
-_QP_TTOQ(i,	i,	int,	31, u_int,  u.a[0])
-_QP_TTOQ(s,	s,	float,	31, u_int,  u.a[0])
-_QP_TTOQ(x,	x,	long,	63, u_long, u.a[0])
-_QP_TTOQ(ui,	i,	u_int,	-1, u_int,  u.a[0])
-_QP_TTOQ(ux,	x,	u_long,	-1, u_long, u.a[0])
-
-_QP_QTOT(d,	d,	double,	&u.a)
-_QP_QTOT(i,	i,	int)
-_QP_QTOT(s,	s,	float)
-_QP_QTOT(x,	x,	long,	&u.a)
-_QP_QTOT(ui,	i,	u_int)
-_QP_QTOT(ux,	x,	u_long,	&u.a)
-
-_QP_CMP(feq,	0,	FCC_EQ)
-_QP_CMP(fge,	1,	FCC_GE)
-_QP_CMP(fgt,	1,	FCC_GT)
-_QP_CMP(fle,	1,	FCC_LE)
-_QP_CMP(flt,	1,	FCC_LT)
-_QP_CMP(fne,	0, 	FCC_NE)
-_QP_CMP(cmp,	0, 	FCC_ID)
-_QP_CMP(cmpe,	1, 	FCC_ID)
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_reg.S b/lib/libc_bsd/sparc64/fpu/fpu_reg.S
deleted file mode 100644
index d15d939..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_reg.S
+++ /dev/null
@@ -1,194 +0,0 @@
-/*-
- * Copyright (c) 2002 by Thomas Moestl <tmm@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_reg.S 96129 2002-05-06 23:24:39Z obrien $");
-
-/*
- * Define arrays of leaf functions to load/store fp registers to memory. See
- * fpu_reg.h for the definitions to use this from C code. The function sizes
- * defines there must be kept in sync with this file!
- */
-
-.macro ld32	reg
-	retl
-	 ld	[%o0], %f\reg
-.endm
-
-.macro st32	reg
-	retl
-	 st	%f\reg, [%o0]
-.endm
-
-.macro ld64	reg
-	retl
-	 ldd	[%o0], %f\reg
-.endm
-
-.macro st64	reg
-	retl
-	 std	%f\reg, [%o0]
-.endm
-
-/* The actual function arrays. */
-	.globl	__fpu_ld32
-__fpu_ld32:
-	ld32	0
-	ld32	1
-	ld32	2
-	ld32	3
-	ld32	4
-	ld32	5
-	ld32	6
-	ld32	7
-	ld32	8
-	ld32	9
-	ld32	10
-	ld32	11
-	ld32	12
-	ld32	13
-	ld32	14
-	ld32	15
-	ld32	16
-	ld32	17
-	ld32	18
-	ld32	19
-	ld32	20
-	ld32	21
-	ld32	22
-	ld32	23
-	ld32	24
-	ld32	25
-	ld32	26
-	ld32	27
-	ld32	28
-	ld32	29
-	ld32	30
-	ld32	31
-
-	.globl	__fpu_st32
-__fpu_st32:
-	st32	0
-	st32	1
-	st32	2
-	st32	3
-	st32	4
-	st32	5
-	st32	6
-	st32	7
-	st32	8
-	st32	9
-	st32	10
-	st32	11
-	st32	12
-	st32	13
-	st32	14
-	st32	15
-	st32	16
-	st32	17
-	st32	18
-	st32	19
-	st32	20
-	st32	21
-	st32	22
-	st32	23
-	st32	24
-	st32	25
-	st32	26
-	st32	27
-	st32	28
-	st32	29
-	st32	30
-	st32	31
-
-	.globl	__fpu_ld64
-__fpu_ld64:
-	ld64	0
-	ld64	2
-	ld64	4
-	ld64	6
-	ld64	8
-	ld64	10
-	ld64	12
-	ld64	14
-	ld64	16
-	ld64	18
-	ld64	20
-	ld64	22
-	ld64	24
-	ld64	26
-	ld64	28
-	ld64	30
-	ld64	32
-	ld64	34
-	ld64	36
-	ld64	38
-	ld64	40
-	ld64	42
-	ld64	44
-	ld64	46
-	ld64	48
-	ld64	50
-	ld64	52
-	ld64	54
-	ld64	56
-	ld64	58
-	ld64	60
-	ld64	62
-
-	.globl	__fpu_st64
-__fpu_st64:
-	st64	0
-	st64	2
-	st64	4
-	st64	6
-	st64	8
-	st64	10
-	st64	12
-	st64	14
-	st64	16
-	st64	18
-	st64	20
-	st64	22
-	st64	24
-	st64	26
-	st64	28
-	st64	30
-	st64	32
-	st64	34
-	st64	36
-	st64	38
-	st64	40
-	st64	42
-	st64	44
-	st64	46
-	st64	48
-	st64	50
-	st64	52
-	st64	54
-	st64	56
-	st64	58
-	st64	60
-	st64	62
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_reg.h b/lib/libc_bsd/sparc64/fpu/fpu_reg.h
deleted file mode 100644
index b88016d..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_reg.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * Copyright (c) 2002 by Thomas Moestl <tmm@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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: releng/10.2/lib/libc/sparc64/fpu/fpu_reg.h 91174 2002-02-23 21:37:18Z tmm $
- */
-
-#ifndef _LIBC_SPARC64_FPU_FPU_REG_H_
-#define _LIBC_SPARC64_FPU_FPU_REG_H_
-
-/*
- * These are not really of type char[]. They are are arrays of functions defined
- * in fpu_reg.S; each array member loads/stores a certain fpu register of the
- * given size.
- */
-extern char __fpu_ld32[];
-extern char __fpu_st32[];
-extern char __fpu_ld64[];
-extern char __fpu_st64[];
-
-/* Size of the functions in the arrays. */
-#define	FPU_LD32_SZ	8
-#define	FPU_ST32_SZ	8
-#define	FPU_LD64_SZ	8
-#define	FPU_ST64_SZ	8
-
-/* Typedefs for convenient casts in the functions below. */
-typedef void (fp_ldst32_fn)(uint32_t *);
-typedef void (fp_ldst64_fn)(u_int64_t *);
-
-/*
- * These are the functions that are actually used in the fpu emulation code to
- * access the fp registers. They are usually not used more than once, so
- * cacheing needs not be done here.
- */
-static __inline uint32_t
-__fpu_getreg(int r)
-{
-	uint32_t rv;
-
-	((fp_ldst32_fn *)&__fpu_st32[r * FPU_ST32_SZ])(&rv);
-	return (rv);
-}
-
-static __inline u_int64_t
-__fpu_getreg64(int r)
-{
-	u_int64_t rv;
-
-	((fp_ldst64_fn *)&__fpu_st64[(r >> 1) * FPU_ST64_SZ])(&rv);
-	return (rv);
-}
-
-static __inline void
-__fpu_setreg(int r, uint32_t v)
-{
-
-	((fp_ldst32_fn *)&__fpu_ld32[r * FPU_LD32_SZ])(&v);
-}
-
-static __inline void
-__fpu_setreg64(int r, u_int64_t v)
-{
-
-	((fp_ldst64_fn *)&__fpu_ld64[(r >> 1) * FPU_LD64_SZ])(&v);
-}
-
-#endif /* _LIBC_SPARC64_FPU_FPU_REG_H_ */
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_sqrt.c b/lib/libc_bsd/sparc64/fpu/fpu_sqrt.c
deleted file mode 100644
index 497d6c3..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_sqrt.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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, Lawrence Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_sqrt.c	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_sqrt.c,v 1.2 1994/11/20 20:52:46 deraadt Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_sqrt.c 261455 2014-02-04 03:36:42Z eadler $");
-
-/*
- * Perform an FPU square root (return sqrt(x)).
- */
-
-#include <sys/types.h>
-
-#include <machine/frame.h>
-#include <machine/fp.h>
-
-#include "fpu_arith.h"
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-
-/*
- * Our task is to calculate the square root of a floating point number x0.
- * This number x normally has the form:
- *
- *		    exp
- *	x = mant * 2		(where 1 <= mant < 2 and exp is an integer)
- *
- * This can be left as it stands, or the mantissa can be doubled and the
- * exponent decremented:
- *
- *			  exp-1
- *	x = (2 * mant) * 2	(where 2 <= 2 * mant < 4)
- *
- * If the exponent `exp' is even, the square root of the number is best
- * handled using the first form, and is by definition equal to:
- *
- *				exp/2
- *	sqrt(x) = sqrt(mant) * 2
- *
- * If exp is odd, on the other hand, it is convenient to use the second
- * form, giving:
- *
- *				    (exp-1)/2
- *	sqrt(x) = sqrt(2 * mant) * 2
- *
- * In the first case, we have
- *
- *	1 <= mant < 2
- *
- * and therefore
- *
- *	sqrt(1) <= sqrt(mant) < sqrt(2)
- *
- * while in the second case we have
- *
- *	2 <= 2*mant < 4
- *
- * and therefore
- *
- *	sqrt(2) <= sqrt(2*mant) < sqrt(4)
- *
- * so that in any case, we are sure that
- *
- *	sqrt(1) <= sqrt(n * mant) < sqrt(4),	n = 1 or 2
- *
- * or
- *
- *	1 <= sqrt(n * mant) < 2,		n = 1 or 2.
- *
- * This root is therefore a properly formed mantissa for a floating
- * point number.  The exponent of sqrt(x) is either exp/2 or (exp-1)/2
- * as above.  This leaves us with the problem of finding the square root
- * of a fixed-point number in the range [1..4).
- *
- * Though it may not be instantly obvious, the following square root
- * algorithm works for any integer x of an even number of bits, provided
- * that no overflows occur:
- *
- *	let q = 0
- *	for k = NBITS-1 to 0 step -1 do -- for each digit in the answer...
- *		x *= 2			-- multiply by radix, for next digit
- *		if x >= 2q + 2^k then	-- if adding 2^k does not
- *			x -= 2q + 2^k	-- exceed the correct root,
- *			q += 2^k	-- add 2^k and adjust x
- *		fi
- *	done
- *	sqrt = q / 2^(NBITS/2)		-- (and any remainder is in x)
- *
- * If NBITS is odd (so that k is initially even), we can just add another
- * zero bit at the top of x.  Doing so means that q is not going to acquire
- * a 1 bit in the first trip around the loop (since x0 < 2^NBITS).  If the
- * final value in x is not needed, or can be off by a factor of 2, this is
- * equivalant to moving the `x *= 2' step to the bottom of the loop:
- *
- *	for k = NBITS-1 to 0 step -1 do if ... fi; x *= 2; done
- *
- * and the result q will then be sqrt(x0) * 2^floor(NBITS / 2).
- * (Since the algorithm is destructive on x, we will call x's initial
- * value, for which q is some power of two times its square root, x0.)
- *
- * If we insert a loop invariant y = 2q, we can then rewrite this using
- * C notation as:
- *
- *	q = y = 0; x = x0;
- *	for (k = NBITS; --k >= 0;) {
- * #if (NBITS is even)
- *		x *= 2;
- * #endif
- *		t = y + (1 << k);
- *		if (x >= t) {
- *			x -= t;
- *			q += 1 << k;
- *			y += 1 << (k + 1);
- *		}
- * #if (NBITS is odd)
- *		x *= 2;
- * #endif
- *	}
- *
- * If x0 is fixed point, rather than an integer, we can simply alter the
- * scale factor between q and sqrt(x0).  As it happens, we can easily arrange
- * for the scale factor to be 2**0 or 1, so that sqrt(x0) == q.
- *
- * In our case, however, x0 (and therefore x, y, q, and t) are multiword
- * integers, which adds some complication.  But note that q is built one
- * bit at a time, from the top down, and is not used itself in the loop
- * (we use 2q as held in y instead).  This means we can build our answer
- * in an integer, one word at a time, which saves a bit of work.  Also,
- * since 1 << k is always a `new' bit in q, 1 << k and 1 << (k+1) are
- * `new' bits in y and we can set them with an `or' operation rather than
- * a full-blown multiword add.
- *
- * We are almost done, except for one snag.  We must prove that none of our
- * intermediate calculations can overflow.  We know that x0 is in [1..4)
- * and therefore the square root in q will be in [1..2), but what about x,
- * y, and t?
- *
- * We know that y = 2q at the beginning of each loop.  (The relation only
- * fails temporarily while y and q are being updated.)  Since q < 2, y < 4.
- * The sum in t can, in our case, be as much as y+(1<<1) = y+2 < 6, and.
- * Furthermore, we can prove with a bit of work that x never exceeds y by
- * more than 2, so that even after doubling, 0 <= x < 8.  (This is left as
- * an exercise to the reader, mostly because I have become tired of working
- * on this comment.)
- *
- * If our floating point mantissas (which are of the form 1.frac) occupy
- * B+1 bits, our largest intermediary needs at most B+3 bits, or two extra.
- * In fact, we want even one more bit (for a carry, to avoid compares), or
- * three extra.  There is a comment in fpu_emu.h reminding maintainers of
- * this, so we have some justification in assuming it.
- */
-struct fpn *
-__fpu_sqrt(fe)
-	struct fpemu *fe;
-{
-	struct fpn *x = &fe->fe_f1;
-	u_int bit, q, tt;
-	u_int x0, x1, x2, x3;
-	u_int y0, y1, y2, y3;
-	u_int d0, d1, d2, d3;
-	int e;
-
-	/*
-	 * Take care of special cases first.  In order:
-	 *
-	 *	sqrt(NaN) = NaN
-	 *	sqrt(+0) = +0
-	 *	sqrt(-0) = -0
-	 *	sqrt(x < 0) = NaN	(including sqrt(-Inf))
-	 *	sqrt(+Inf) = +Inf
-	 *
-	 * Then all that remains are numbers with mantissas in [1..2).
-	 */
-	if (ISNAN(x) || ISZERO(x))
-		return (x);
-	if (x->fp_sign)
-		return (__fpu_newnan(fe));
-	if (ISINF(x))
-		return (x);
-
-	/*
-	 * Calculate result exponent.  As noted above, this may involve
-	 * doubling the mantissa.  We will also need to double x each
-	 * time around the loop, so we define a macro for this here, and
-	 * we break out the multiword mantissa.
-	 */
-#ifdef FPU_SHL1_BY_ADD
-#define	DOUBLE_X { \
-	FPU_ADDS(x3, x3, x3); FPU_ADDCS(x2, x2, x2); \
-	FPU_ADDCS(x1, x1, x1); FPU_ADDC(x0, x0, x0); \
-}
-#else
-#define	DOUBLE_X { \
-	x0 = (x0 << 1) | (x1 >> 31); x1 = (x1 << 1) | (x2 >> 31); \
-	x2 = (x2 << 1) | (x3 >> 31); x3 <<= 1; \
-}
-#endif
-#if (FP_NMANT & 1) != 0
-# define ODD_DOUBLE	DOUBLE_X
-# define EVEN_DOUBLE	/* nothing */
-#else
-# define ODD_DOUBLE	/* nothing */
-# define EVEN_DOUBLE	DOUBLE_X
-#endif
-	x0 = x->fp_mant[0];
-	x1 = x->fp_mant[1];
-	x2 = x->fp_mant[2];
-	x3 = x->fp_mant[3];
-	e = x->fp_exp;
-	if (e & 1)		/* exponent is odd; use sqrt(2mant) */
-		DOUBLE_X;
-	/* THE FOLLOWING ASSUMES THAT RIGHT SHIFT DOES SIGN EXTENSION */
-	x->fp_exp = e >> 1;	/* calculates (e&1 ? (e-1)/2 : e/2 */
-
-	/*
-	 * Now calculate the mantissa root.  Since x is now in [1..4),
-	 * we know that the first trip around the loop will definitely
-	 * set the top bit in q, so we can do that manually and start
-	 * the loop at the next bit down instead.  We must be sure to
-	 * double x correctly while doing the `known q=1.0'.
-	 *
-	 * We do this one mantissa-word at a time, as noted above, to
-	 * save work.  To avoid `(1U << 31) << 1', we also do the top bit
-	 * outside of each per-word loop.
-	 *
-	 * The calculation `t = y + bit' breaks down into `t0 = y0, ...,
-	 * t3 = y3, t? |= bit' for the appropriate word.  Since the bit
-	 * is always a `new' one, this means that three of the `t?'s are
-	 * just the corresponding `y?'; we use `#define's here for this.
-	 * The variable `tt' holds the actual `t?' variable.
-	 */
-
-	/* calculate q0 */
-#define	t0 tt
-	bit = FP_1;
-	EVEN_DOUBLE;
-	/* if (x >= (t0 = y0 | bit)) { */	/* always true */
-		q = bit;
-		x0 -= bit;
-		y0 = bit << 1;
-	/* } */
-	ODD_DOUBLE;
-	while ((bit >>= 1) != 0) {	/* for remaining bits in q0 */
-		EVEN_DOUBLE;
-		t0 = y0 | bit;		/* t = y + bit */
-		if (x0 >= t0) {		/* if x >= t then */
-			x0 -= t0;	/*	x -= t */
-			q |= bit;	/*	q += bit */
-			y0 |= bit << 1;	/*	y += bit << 1 */
-		}
-		ODD_DOUBLE;
-	}
-	x->fp_mant[0] = q;
-#undef t0
-
-	/* calculate q1.  note (y0&1)==0. */
-#define t0 y0
-#define t1 tt
-	q = 0;
-	y1 = 0;
-	bit = 1 << 31;
-	EVEN_DOUBLE;
-	t1 = bit;
-	FPU_SUBS(d1, x1, t1);
-	FPU_SUBC(d0, x0, t0);		/* d = x - t */
-	if ((int)d0 >= 0) {		/* if d >= 0 (i.e., x >= t) then */
-		x0 = d0, x1 = d1;	/*	x -= t */
-		q = bit;		/*	q += bit */
-		y0 |= 1;		/*	y += bit << 1 */
-	}
-	ODD_DOUBLE;
-	while ((bit >>= 1) != 0) {	/* for remaining bits in q1 */
-		EVEN_DOUBLE;		/* as before */
-		t1 = y1 | bit;
-		FPU_SUBS(d1, x1, t1);
-		FPU_SUBC(d0, x0, t0);
-		if ((int)d0 >= 0) {
-			x0 = d0, x1 = d1;
-			q |= bit;
-			y1 |= bit << 1;
-		}
-		ODD_DOUBLE;
-	}
-	x->fp_mant[1] = q;
-#undef t1
-
-	/* calculate q2.  note (y1&1)==0; y0 (aka t0) is fixed. */
-#define t1 y1
-#define t2 tt
-	q = 0;
-	y2 = 0;
-	bit = 1 << 31;
-	EVEN_DOUBLE;
-	t2 = bit;
-	FPU_SUBS(d2, x2, t2);
-	FPU_SUBCS(d1, x1, t1);
-	FPU_SUBC(d0, x0, t0);
-	if ((int)d0 >= 0) {
-		x0 = d0, x1 = d1, x2 = d2;
-		q = bit;
-		y1 |= 1;		/* now t1, y1 are set in concrete */
-	}
-	ODD_DOUBLE;
-	while ((bit >>= 1) != 0) {
-		EVEN_DOUBLE;
-		t2 = y2 | bit;
-		FPU_SUBS(d2, x2, t2);
-		FPU_SUBCS(d1, x1, t1);
-		FPU_SUBC(d0, x0, t0);
-		if ((int)d0 >= 0) {
-			x0 = d0, x1 = d1, x2 = d2;
-			q |= bit;
-			y2 |= bit << 1;
-		}
-		ODD_DOUBLE;
-	}
-	x->fp_mant[2] = q;
-#undef t2
-
-	/* calculate q3.  y0, t0, y1, t1 all fixed; y2, t2, almost done. */
-#define t2 y2
-#define t3 tt
-	q = 0;
-	y3 = 0;
-	bit = 1 << 31;
-	EVEN_DOUBLE;
-	t3 = bit;
-	FPU_SUBS(d3, x3, t3);
-	FPU_SUBCS(d2, x2, t2);
-	FPU_SUBCS(d1, x1, t1);
-	FPU_SUBC(d0, x0, t0);
-	if ((int)d0 >= 0) {
-		x0 = d0, x1 = d1, x2 = d2; x3 = d3;
-		q = bit;
-		y2 |= 1;
-	}
-	ODD_DOUBLE;
-	while ((bit >>= 1) != 0) {
-		EVEN_DOUBLE;
-		t3 = y3 | bit;
-		FPU_SUBS(d3, x3, t3);
-		FPU_SUBCS(d2, x2, t2);
-		FPU_SUBCS(d1, x1, t1);
-		FPU_SUBC(d0, x0, t0);
-		if ((int)d0 >= 0) {
-			x0 = d0, x1 = d1, x2 = d2; x3 = d3;
-			q |= bit;
-			y3 |= bit << 1;
-		}
-		ODD_DOUBLE;
-	}
-	x->fp_mant[3] = q;
-
-	/*
-	 * The result, which includes guard and round bits, is exact iff
-	 * x is now zero; any nonzero bits in x represent sticky bits.
-	 */
-	x->fp_sticky = x0 | x1 | x2 | x3;
-	return (x);
-}
diff --git a/lib/libc_bsd/sparc64/fpu/fpu_subr.c b/lib/libc_bsd/sparc64/fpu/fpu_subr.c
deleted file mode 100644
index e21574d..0000000
--- a/lib/libc_bsd/sparc64/fpu/fpu_subr.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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, Lawrence Berkeley Laboratory.
- *
- * 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.
- * 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.
- *
- *	@(#)fpu_subr.c	8.1 (Berkeley) 6/11/93
- *	$NetBSD: fpu_subr.c,v 1.3 1996/03/14 19:42:01 christos Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/fpu/fpu_subr.c 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * FPU subroutines.
- */
-
-#include <sys/param.h>
-
-#include <machine/frame.h>
-#include <machine/fp.h>
-#include <machine/fsr.h>
-#include <machine/instr.h>
-
-#include "fpu_arith.h"
-#include "fpu_emu.h"
-#include "fpu_extern.h"
-#include "__sparc_utrap_private.h"
-
-/*
- * Shift the given number right rsh bits.  Any bits that `fall off' will get
- * shoved into the sticky field; we return the resulting sticky.  Note that
- * shifting NaNs is legal (this will never shift all bits out); a NaN's
- * sticky field is ignored anyway.
- */
-int
-__fpu_shr(struct fpn *fp, int rsh)
-{
-	u_int m0, m1, m2, m3, s;
-	int lsh;
-
-#ifdef DIAGNOSTIC
-	if (rsh <= 0 || (fp->fp_class != FPC_NUM && !ISNAN(fp)))
-		__utrap_panic("fpu_rightshift 1");
-#endif
-
-	m0 = fp->fp_mant[0];
-	m1 = fp->fp_mant[1];
-	m2 = fp->fp_mant[2];
-	m3 = fp->fp_mant[3];
-
-	/* If shifting all the bits out, take a shortcut. */
-	if (rsh >= FP_NMANT) {
-#ifdef DIAGNOSTIC
-		if ((m0 | m1 | m2 | m3) == 0)
-			__utrap_panic("fpu_rightshift 2");
-#endif
-		fp->fp_mant[0] = 0;
-		fp->fp_mant[1] = 0;
-		fp->fp_mant[2] = 0;
-		fp->fp_mant[3] = 0;
-#ifdef notdef
-		if ((m0 | m1 | m2 | m3) == 0)
-			fp->fp_class = FPC_ZERO;
-		else
-#endif
-			fp->fp_sticky = 1;
-		return (1);
-	}
-
-	/* Squish out full words. */
-	s = fp->fp_sticky;
-	if (rsh >= 32 * 3) {
-		s |= m3 | m2 | m1;
-		m3 = m0, m2 = 0, m1 = 0, m0 = 0;
-	} else if (rsh >= 32 * 2) {
-		s |= m3 | m2;
-		m3 = m1, m2 = m0, m1 = 0, m0 = 0;
-	} else if (rsh >= 32) {
-		s |= m3;
-		m3 = m2, m2 = m1, m1 = m0, m0 = 0;
-	}
-
-	/* Handle any remaining partial word. */
-	if ((rsh &= 31) != 0) {
-		lsh = 32 - rsh;
-		s |= m3 << lsh;
-		m3 = (m3 >> rsh) | (m2 << lsh);
-		m2 = (m2 >> rsh) | (m1 << lsh);
-		m1 = (m1 >> rsh) | (m0 << lsh);
-		m0 >>= rsh;
-	}
-	fp->fp_mant[0] = m0;
-	fp->fp_mant[1] = m1;
-	fp->fp_mant[2] = m2;
-	fp->fp_mant[3] = m3;
-	fp->fp_sticky = s;
-	return (s);
-}
-
-/*
- * Force a number to be normal, i.e., make its fraction have all zero
- * bits before FP_1, then FP_1, then all 1 bits.  This is used for denorms
- * and (sometimes) for intermediate results.
- *
- * Internally, this may use a `supernormal' -- a number whose fp_mant
- * is greater than or equal to 2.0 -- so as a side effect you can hand it
- * a supernormal and it will fix it (provided fp->fp_mant[3] == 0).
- */
-void
-__fpu_norm(struct fpn *fp)
-{
-	u_int m0, m1, m2, m3, top, sup, nrm;
-	int lsh, rsh, exp;
-
-	exp = fp->fp_exp;
-	m0 = fp->fp_mant[0];
-	m1 = fp->fp_mant[1];
-	m2 = fp->fp_mant[2];
-	m3 = fp->fp_mant[3];
-
-	/* Handle severe subnormals with 32-bit moves. */
-	if (m0 == 0) {
-		if (m1)
-			m0 = m1, m1 = m2, m2 = m3, m3 = 0, exp -= 32;
-		else if (m2)
-			m0 = m2, m1 = m3, m2 = 0, m3 = 0, exp -= 2 * 32;
-		else if (m3)
-			m0 = m3, m1 = 0, m2 = 0, m3 = 0, exp -= 3 * 32;
-		else {
-			fp->fp_class = FPC_ZERO;
-			return;
-		}
-	}
-
-	/* Now fix any supernormal or remaining subnormal. */
-	nrm = FP_1;
-	sup = nrm << 1;
-	if (m0 >= sup) {
-		/*
-		 * We have a supernormal number.  We need to shift it right.
-		 * We may assume m3==0.
-		 */
-		for (rsh = 1, top = m0 >> 1; top >= sup; rsh++)	/* XXX slow */
-			top >>= 1;
-		exp += rsh;
-		lsh = 32 - rsh;
-		m3 = m2 << lsh;
-		m2 = (m2 >> rsh) | (m1 << lsh);
-		m1 = (m1 >> rsh) | (m0 << lsh);
-		m0 = top;
-	} else if (m0 < nrm) {
-		/*
-		 * We have a regular denorm (a subnormal number), and need
-		 * to shift it left.
-		 */
-		for (lsh = 1, top = m0 << 1; top < nrm; lsh++)	/* XXX slow */
-			top <<= 1;
-		exp -= lsh;
-		rsh = 32 - lsh;
-		m0 = top | (m1 >> rsh);
-		m1 = (m1 << lsh) | (m2 >> rsh);
-		m2 = (m2 << lsh) | (m3 >> rsh);
-		m3 <<= lsh;
-	}
-
-	fp->fp_exp = exp;
-	fp->fp_mant[0] = m0;
-	fp->fp_mant[1] = m1;
-	fp->fp_mant[2] = m2;
-	fp->fp_mant[3] = m3;
-}
-
-/*
- * Concoct a `fresh' Quiet NaN per Appendix N.
- * As a side effect, we set NV (invalid) for the current exceptions.
- */
-struct fpn *
-__fpu_newnan(struct fpemu *fe)
-{
-	struct fpn *fp;
-
-	fe->fe_cx = FSR_NV;
-	fp = &fe->fe_f3;
-	fp->fp_class = FPC_QNAN;
-	fp->fp_sign = 0;
-	fp->fp_mant[0] = FP_1 - 1;
-	fp->fp_mant[1] = fp->fp_mant[2] = fp->fp_mant[3] = ~0;
-	return (fp);
-}
diff --git a/lib/libc_bsd/sparc64/gd_qnan.h b/lib/libc_bsd/sparc64/gd_qnan.h
deleted file mode 100644
index d67e4c8..0000000
--- a/lib/libc_bsd/sparc64/gd_qnan.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * MD header for contrib/gdtoa
- *
- * This file can be generated by compiling and running contrib/gdtoa/qnan.c
- * on the target architecture after arith.h has been generated.
- *
- * $FreeBSD: releng/10.2/lib/libc/sparc64/gd_qnan.h 174680 2007-12-16 21:15:09Z das $
- */
-
-#define f_QNAN 0x7fc00000
-#define d_QNAN0 0x7ff80000
-#define d_QNAN1 0x00000000
-#define ld_QNAN0 0x7fff8000
-#define ld_QNAN1 0x00000000
-#define ld_QNAN2 0x00000000
-#define ld_QNAN3 0x00000000
-#define ldus_QNAN0 0x7fff
-#define ldus_QNAN1 0x8000
-#define ldus_QNAN2 0x0000
-#define ldus_QNAN3 0x0000
-#define ldus_QNAN4 0x0000
diff --git a/lib/libc_bsd/sparc64/gen/Makefile.inc b/lib/libc_bsd/sparc64/gen/Makefile.inc
deleted file mode 100644
index 67bae35..0000000
--- a/lib/libc_bsd/sparc64/gen/Makefile.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.incl 230429 2012-01-21 18:00:28Z kib $
-
-SRCS+=	_ctx_start.S _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpgetmask.c \
-	fpgetround.c fpgetsticky.c fpsetmask.c fpsetround.c \
-	getcontextx.c infinity.c ldexp.c makecontext.c \
-	signalcontext.c setjmp.S sigsetjmp.S _set_tp.c
diff --git a/lib/libc_bsd/sparc64/gen/_ctx_start.S b/lib/libc_bsd/sparc64/gen/_ctx_start.S
deleted file mode 100644
index ffec144..0000000
--- a/lib/libc_bsd/sparc64/gen/_ctx_start.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2003 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/_ctx_start.S 112963 2003-04-01 23:28:50Z jake $");
-
-ENTRY(_ctx_start)
-	call	%g1
-	 mov	%g2, %l0
-	call	_ctx_done
-	 mov	%l0, %o0
-	illtrap
-END(_ctx_start)
diff --git a/lib/libc_bsd/sparc64/gen/_set_tp.c b/lib/libc_bsd/sparc64/gen/_set_tp.c
deleted file mode 100644
index f203f4a..0000000
--- a/lib/libc_bsd/sparc64/gen/_set_tp.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * Copyright (c) 2004 Doug Rabson
- * 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.
- *
- * 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: releng/10.2/lib/libc/sparc64/gen/_set_tp.c 163118 2006-10-08 02:50:34Z kmacy $
- */
-
-void
-_set_tp(void *tpval)
-{
-
-	__asm __volatile("mov %0, %%g7" : : "r" (tpval));
-}
diff --git a/lib/libc_bsd/sparc64/gen/_setjmp.S b/lib/libc_bsd/sparc64/gen/_setjmp.S
deleted file mode 100644
index fdd58a6..0000000
--- a/lib/libc_bsd/sparc64/gen/_setjmp.S
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- *	from: Header: _setjmp.s,v 1.1 91/07/06 16:45:53 torek Exp
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)_setjmp.s	8.1 (Berkeley) 6/4/93"
-#if 0
-	RCSID("$NetBSD: _setjmp.S,v 1.4 1998/10/08 02:27:59 eeh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/_setjmp.S 165903 2007-01-09 00:28:16Z imp $");
-
-#include "assym.s"
-
-	.register %g2,#ignore
-	.register %g3,#ignore
-
-/*
- * C library -- _setjmp, _longjmp
- *
- *	_longjmp(a,v)
- * will generate a "return(v?v:1)" from
- * the last call to
- *	_setjmp(a)
- * by restoring the previous context.
- * The previous signal state is NOT restored.
- */
-
-ENTRY(_setjmp)
-	stx	%sp, [%o0 + _JB_SP]
-	stx	%o7, [%o0 + _JB_PC]
-	retl
-	 clr	%o0
-END(_setjmp)
-
-	.weak	CNAME(_longjmp)
-	.set	CNAME(_longjmp),CNAME(___longjmp)
-ENTRY(___longjmp)
-	save	%sp, -CCFSZ, %sp
-	flushw
-	ldx	[%i0 + _JB_SP], %fp
-	ldx	[%i0 + _JB_PC], %i7
-	mov	1, %i0
-	movrnz	%i1, %i1, %i0
-	ret
-	 restore
-END(___longjmp)
diff --git a/lib/libc_bsd/sparc64/gen/assym.s b/lib/libc_bsd/sparc64/gen/assym.s
deleted file mode 100644
index 7ef826d..0000000
--- a/lib/libc_bsd/sparc64/gen/assym.s
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Offsets into into structures used from asm.  Must be kept in sync with
- * appropriate headers.
- *
- * $FreeBSD: releng/10.2/lib/libc/sparc64/gen/assym.s 92054 2002-03-11 03:13:02Z tmm $
- */
-
-#define	_JB_FP		0x0
-#define	_JB_PC		0x8
-#define	_JB_SP		0x10
-#define	_JB_SIGMASK	0x18
-#define	_JB_SIGFLAG	0x28
-
-#define	SIG_BLOCK	1
-#define	SIG_SETMASK	3
-
-#define	FSR_RD_MASK	0xc0000000
-#define	FSR_RD_RD_Z	0x40000000
diff --git a/lib/libc_bsd/sparc64/gen/fabs.S b/lib/libc_bsd/sparc64/gen/fabs.S
deleted file mode 100644
index 51b750f..0000000
--- a/lib/libc_bsd/sparc64/gen/fabs.S
+++ /dev/null
@@ -1,35 +0,0 @@
-/*-
- * Copyright (c) 2002 by Thomas Moestl <tmm@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/fabs.S 125669 2004-02-10 20:45:28Z cperciva $");
-
-/*
- * double fabs(double);
- */ 
-ENTRY(fabs)
-	retl
-	 fabsd	%f0, %f0
-END(fabs)
diff --git a/lib/libc_bsd/sparc64/gen/fixunsdfsi.S b/lib/libc_bsd/sparc64/gen/fixunsdfsi.S
deleted file mode 100644
index 70ac993..0000000
--- a/lib/libc_bsd/sparc64/gen/fixunsdfsi.S
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- * from: Header: fixunsdfsi.s,v 1.3 91/10/08 00:03:15 torek Exp
- */
-
-#include <machine/asm.h>
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)fixunsdfsi.s	8.1 (Berkeley) 6/4/93"
-#if 0
-	RCSID("$NetBSD: fixunsdfsi.S,v 1.3 2000/07/25 04:26:12 mycroft Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/fixunsdfsi.S 165903 2007-01-09 00:28:16Z imp $");
-
-/*
- * Convert double to unsigned integer (for gcc).
- *
- * I have made the output for NaN agree with the Sun compiler, not
- * that it really matters, by using `fbul,a'.
- */
-
-
-	.align	8
-.Lbig:
-	.word	0x43e00000		! .double 2^63
-	.word	0			! (who me, not trust the assembler?)
-
-/*
- * Same as above but to unsigned long
- */
-ENTRY(__dtoul)
-	PIC_PROLOGUE(%o4, %o5)
-	sub	%sp, 16, %sp
-	std	%f2, [%sp + CCFSZ + SPOFF + 8]
-	SET(.Lbig, %o5, %o3)
-	ldd	[%o3], %f2
-	fcmped	%f0, %f2		! d < 2^63, or NaN, or -Inf?
-	fbul,a	1f			! if so, use fdtox to convert to long
-	 fdtox	%f0, %f0		!        (this includes negatives!)
-
-	! d does not fit in a long, so subtract 2^63, convert,
-	! and add 2^63 again (sigh).  Just hope the intermediate
-	! fits (if not, the result is undefined anyway).
-
-	fsubd	%f0, %f2, %f0		! d -= 2^63
-	fdtox	%f0, %f0		! convert to long
-	std	%f0, [%sp + CCFSZ + SPOFF]	! move into return reg
-	ldx	[%sp + CCFSZ + SPOFF], %o0
-	sethi	%hi(0x80000000), %o1
-	sllx	%o1, 32, %o1
-	add	%o0, %o1, %o0		! add 2^63
-	ldd	[%sp + CCFSZ + SPOFF + 8], %f2
-	retl
-	 add	%sp, 16, %sp
-
-1:
-	std	%f0, [%sp + CCFSZ + SPOFF]	! return result
-	ldx	[%sp + CCFSZ + SPOFF], %o0
-	ldd	[%sp + CCFSZ + SPOFF + 8], %f2
-	retl
-	 add	%sp, 16, %sp
-END(__dtoul)
diff --git a/lib/libc_bsd/sparc64/gen/flt_rounds.c b/lib/libc_bsd/sparc64/gen/flt_rounds.c
deleted file mode 100644
index 9dfed16..0000000
--- a/lib/libc_bsd/sparc64/gen/flt_rounds.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/flt_rounds.c 140424 2005-01-18 15:29:28Z das $");
-
-#include <sys/types.h>
-#include <machine/float.h>
-
-static const int map[] = {
-	1,	/* round to nearest */
-	0,	/* round to zero */
-	2,	/* round to positive infinity */
-	3	/* round to negative infinity */
-};
-
-int
-__flt_rounds()
-{
-	int x;
-
-	__asm("st %%fsr,%0" : "=m" (*&x));
-	return map[(x >> 30) & 0x03];
-}
diff --git a/lib/libc_bsd/sparc64/gen/fpgetmask.c b/lib/libc_bsd/sparc64/gen/fpgetmask.c
deleted file mode 100644
index f26dbc3..0000000
--- a/lib/libc_bsd/sparc64/gen/fpgetmask.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*	$NetBSD: fpgetmask.c,v 1.2 2002/01/13 21:45:50 thorpej Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/fpgetmask.c 103323 2002-09-14 18:06:21Z tmm $");
-
-
-#include <machine/fsr.h>
-#include <ieeefp.h>
-
-fp_except_t
-fpgetmask()
-{
-	unsigned int x;
-
-	__asm__("st %%fsr,%0" : "=m" (x));
-	return (FSR_GET_TEM(x));
-}
diff --git a/lib/libc_bsd/sparc64/gen/fpgetround.c b/lib/libc_bsd/sparc64/gen/fpgetround.c
deleted file mode 100644
index a189ab1..0000000
--- a/lib/libc_bsd/sparc64/gen/fpgetround.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*	$NetBSD: fpgetround.c,v 1.2 2002/01/13 21:45:50 thorpej Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/fpgetround.c 103323 2002-09-14 18:06:21Z tmm $");
-
-#include <machine/fsr.h>
-#include <ieeefp.h>
-
-fp_rnd_t
-fpgetround()
-{
-	unsigned int x;
-
-	__asm__("st %%fsr,%0" : "=m" (x));
-	return ((fp_rnd_t)FSR_GET_RD(x));
-}
diff --git a/lib/libc_bsd/sparc64/gen/fpgetsticky.c b/lib/libc_bsd/sparc64/gen/fpgetsticky.c
deleted file mode 100644
index 48ed701..0000000
--- a/lib/libc_bsd/sparc64/gen/fpgetsticky.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*	$NetBSD: fpgetsticky.c,v 1.2 2002/01/13 21:45:50 thorpej Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/fpgetsticky.c 103323 2002-09-14 18:06:21Z tmm $");
-
-#include <machine/fsr.h>
-#include <ieeefp.h>
-
-fp_except_t
-fpgetsticky()
-{
-	unsigned int x;
-
-	__asm__("st %%fsr,%0" : "=m" (x));
-	return (FSR_GET_AEXC(x));
-}
diff --git a/lib/libc_bsd/sparc64/gen/fpsetmask.c b/lib/libc_bsd/sparc64/gen/fpsetmask.c
deleted file mode 100644
index 3ef4c7f..0000000
--- a/lib/libc_bsd/sparc64/gen/fpsetmask.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/fpsetmask.c 103324 2002-09-14 18:07:03Z tmm $");
-
-#include <machine/fsr.h>
-#include <ieeefp.h>
-
-fp_except_t
-fpsetmask(mask)
-	fp_except_t mask;
-{
-	fp_except_t old;
-	fp_except_t new;
-
-	__asm__("st %%fsr,%0" : "=m" (old));
-
-	new = old;
-	new &= ~FSR_TEM_MASK;
-	new |= FSR_TEM(mask & FSR_EXC_MASK);
-
-	__asm__("ld %0,%%fsr" : : "m" (new));
-
-	return (FSR_GET_TEM(old));
-}
diff --git a/lib/libc_bsd/sparc64/gen/fpsetround.c b/lib/libc_bsd/sparc64/gen/fpsetround.c
deleted file mode 100644
index dfc6161..0000000
--- a/lib/libc_bsd/sparc64/gen/fpsetround.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*	$NetBSD: fpsetround.c,v 1.2 2002/01/13 21:45:51 thorpej Exp $	*/
-
-/*
- * Written by J.T. Conklin, Apr 10, 1995
- * Public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/fpsetround.c 103323 2002-09-14 18:06:21Z tmm $");
-
-#include <machine/fsr.h>
-#include <ieeefp.h>
-
-fp_rnd_t
-fpsetround(rnd_dir)
-	fp_rnd_t rnd_dir;
-{
-	unsigned int old;
-	unsigned int new;
-
-	__asm__("st %%fsr,%0" : "=m" (old));
-
-	new = old;
-	new &= ~FSR_RD_MASK;
-	new |= FSR_RD((unsigned int)rnd_dir & 0x03);
-
-	__asm__("ld %0,%%fsr" : : "m" (new));
-
-	return ((fp_rnd_t)FSR_GET_RD(old));
-}
diff --git a/lib/libc_bsd/sparc64/gen/getcontextx.c b/lib/libc_bsd/sparc64/gen/getcontextx.c
deleted file mode 100644
index f60a560..0000000
--- a/lib/libc_bsd/sparc64/gen/getcontextx.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2011 Konstantin Belousov <kib@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/getcontextx.c 251047 2013-05-28 04:54:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stdlib.h>
-
-int
-__getcontextx_size(void)
-{
-
-	return (sizeof(ucontext_t));
-}
-
-int
-__fillcontextx2(char *ctx)
-{
-
-	return (0);
-}
-
-int
-__fillcontextx(char *ctx)
-{
-	ucontext_t *ucp;
-
-	ucp = (ucontext_t *)ctx;
-	return (getcontext(ucp));
-}
-
-__weak_reference(__getcontextx, getcontextx);
-
-ucontext_t *
-__getcontextx(void)
-{
-	char *ctx;
-	int error;
-
-	ctx = malloc(__getcontextx_size());
-	if (ctx == NULL)
-		return (NULL);
-	if (__fillcontextx(ctx) == -1) {
-		error = errno;
-		free(ctx);
-		errno = error;
-		return (NULL);
-	}
-	return ((ucontext_t *)ctx);
-}
diff --git a/lib/libc_bsd/sparc64/gen/infinity.c b/lib/libc_bsd/sparc64/gen/infinity.c
deleted file mode 100644
index 96653cb..0000000
--- a/lib/libc_bsd/sparc64/gen/infinity.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: infinity.c,v 1.2 1998/11/14 19:31:02 christos Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/infinity.c 110566 2003-02-08 20:37:55Z mike $");
-
-/* infinity.c */
-
-#include <math.h>
-
-/* bytes for +Infinity on a sparc */
-const union __infinity_un __infinity = { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } };
-
-/* bytes for NaN */
-const union __nan_un __nan = { { 0xff, 0xc0, 0, 0 } };
diff --git a/lib/libc_bsd/sparc64/gen/makecontext.c b/lib/libc_bsd/sparc64/gen/makecontext.c
deleted file mode 100644
index e3c6496..0000000
--- a/lib/libc_bsd/sparc64/gen/makecontext.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 2003 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/makecontext.c 253266 2013-07-12 14:24:52Z marius $");
-
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/ucontext.h>
-
-#include <machine/frame.h>
-#include <machine/tstate.h>
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-__weak_reference(__makecontext, makecontext);
-
-void _ctx_done(ucontext_t *ucp);
-void _ctx_start(void);
-
-void
-__makecontext(ucontext_t *ucp, void (*start)(void), int argc, ...)
-{
-	mcontext_t *mc;
-	uint64_t sp;
-	va_list ap;
-	int i;
-
-	mc = &ucp->uc_mcontext;
-	if (ucp == NULL ||
-	    (mc->_mc_flags & ((1L << _MC_VERSION_BITS) - 1)) != _MC_VERSION)
-		return;
-	if ((argc < 0) || (argc > 6) ||
-	    (ucp->uc_stack.ss_sp == NULL) ||
-	    (ucp->uc_stack.ss_size < MINSIGSTKSZ)) {
-		mc->_mc_flags = 0;
-		return;
-	}
-	mc = &ucp->uc_mcontext;
-	sp = (uint64_t)ucp->uc_stack.ss_sp + ucp->uc_stack.ss_size;
-	va_start(ap, argc);
-	for (i = 0; i < argc; i++)
-		mc->mc_out[i] = va_arg(ap, uint64_t);
-	va_end(ap);
-	mc->mc_global[1] = (uint64_t)start;
-	mc->mc_global[2] = (uint64_t)ucp;
-	mc->mc_out[6] = sp - SPOFF - sizeof(struct frame);
-	mc->_mc_tnpc = (uint64_t)_ctx_start + 4;
-	mc->_mc_tpc = (uint64_t)_ctx_start;
-}
-
-void
-_ctx_done(ucontext_t *ucp)
-{
-
-	if (ucp->uc_link == NULL)
-		exit(0);
-	else {
-		ucp->uc_mcontext._mc_flags = 0;
-		setcontext((const ucontext_t *)ucp->uc_link);
-		abort();
-	}
-}
diff --git a/lib/libc_bsd/sparc64/gen/setjmp.S b/lib/libc_bsd/sparc64/gen/setjmp.S
deleted file mode 100644
index a7880b9..0000000
--- a/lib/libc_bsd/sparc64/gen/setjmp.S
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- *	from: Header: _setjmp.s,v 1.1 91/07/06 16:45:53 torek Exp
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)_setjmp.s	8.1 (Berkeley) 6/4/93"
-#if 0
-	RCSID("$NetBSD: _setjmp.S,v 1.4 1998/10/08 02:27:59 eeh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/setjmp.S 165903 2007-01-09 00:28:16Z imp $");
-
-#include "assym.s"
-
-	.register %g2,#ignore
-	.register %g3,#ignore
-
-/*
- * C library -- setjmp, longjmp
- *
- *	longjmp(a,v)
- * will generate a "return(v?v:1)" from
- * the last call to
- *	setjmp(a)
- * by restoring the previous context.
- */
-
-ENTRY(setjmp)
-	save	%sp, -CCFSZ, %sp
-	mov	SIG_BLOCK, %o0
-	clr	%o1
-	call	CNAME(sigprocmask)
-	 add	%i0, _JB_SIGMASK, %o2
-	restore
-	stx	%sp, [%o0 + _JB_SP]
-	stx	%o7, [%o0 + _JB_PC]
-	retl
-	 clr	%o0
-END(setjmp)
-
-	.weak	CNAME(longjmp)
-	.set	CNAME(longjmp),CNAME(__longjmp)
-ENTRY(__longjmp)
-	save	%sp, -CCFSZ, %sp
-	flushw
-	mov	SIG_SETMASK, %o0
-	add	%i0, _JB_SIGMASK, %o1
-	call	CNAME(sigprocmask)
-	 clr	%o2
-	ldx	[%i0 + _JB_SP], %fp
-	ldx	[%i0 + _JB_PC], %i7
-	mov	1, %i0
-	movrnz	%i1, %i1, %i0
-	ret
-	 restore
-END(__longjmp)
diff --git a/lib/libc_bsd/sparc64/gen/signalcontext.c b/lib/libc_bsd/sparc64/gen/signalcontext.c
deleted file mode 100644
index 83eda9a..0000000
--- a/lib/libc_bsd/sparc64/gen/signalcontext.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2003 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/signalcontext.c 253266 2013-07-12 14:24:52Z marius $");
-
-#include <sys/param.h>
-#include <sys/ucontext.h>
-
-#include <machine/frame.h>
-#include <machine/sigframe.h>
-
-#include <errno.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <strings.h>
-#include <unistd.h>
-
-__weak_reference(__signalcontext, signalcontext);
-
-extern void _ctx_start(void);
-
-int
-__signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func)
-{
-	struct sigframe *sfp;
-	struct frame *fp;
-	mcontext_t *mc;
-
-	mc = &ucp->uc_mcontext;
-	sfp = (struct sigframe *)(mc->_mc_sp + SPOFF) - 1;
-	fp = (struct frame *)sfp - 1;
-
-	bzero(fp, sizeof(*fp));
-
-	bzero(sfp, sizeof(*sfp));
-	bcopy(ucp, &sfp->sf_uc, sizeof(*ucp));
-	sfp->sf_si.si_signo = sig;
-
-	mc->mc_global[1] = (uint64_t)func;
-	mc->mc_global[2] = (uint64_t)ucp;
-	mc->mc_out[0] = sig;
-	mc->mc_out[1] = (uint64_t)&sfp->sf_si;
-	mc->mc_out[2] = (uint64_t)&sfp->sf_uc;
-	mc->mc_out[6] = (uint64_t)fp - SPOFF;
-	mc->_mc_tnpc = (uint64_t)_ctx_start + 4;
-	mc->_mc_tpc = (uint64_t)_ctx_start;
-
-	ucp->uc_link = &sfp->sf_uc;
-	sigdelset(&ucp->uc_sigmask, sig);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/sparc64/gen/sigsetjmp.S b/lib/libc_bsd/sparc64/gen/sigsetjmp.S
deleted file mode 100644
index 279f798..0000000
--- a/lib/libc_bsd/sparc64/gen/sigsetjmp.S
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1995 Paul Kranenburg
- * 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 Paul Kranenburg.
- * 4. 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 ``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 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.
- *
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/gen/sigsetjmp.S 108736 2003-01-05 22:10:06Z tmm $");
-
-#include "assym.s"
-
-ENTRY(sigsetjmp)
-	PIC_PROLOGUE(%o3, %o2)
-	SET(CNAME(setjmp), %o2, %o3)
-	SET(CNAME(_setjmp), %o2, %o4)
-	movrnz	%o1, %o3, %o4
-	jmp	%o4
-	 stx	%o1, [%o0 + _JB_SIGFLAG]
-END(sigsetjmp)
-
-	.weak CNAME(siglongjmp);
-	.set CNAME(siglongjmp),CNAME(__siglongjmp);
-ENTRY(__siglongjmp)
-	PIC_PROLOGUE(%o3, %o2)
-	SET(CNAME(longjmp), %o2, %o3)
-	SET(CNAME(_longjmp), %o2, %o4)
-	ldx	[%o0 + _JB_SIGFLAG], %o2
-	movrnz	%o2, %o3, %o4
-	jmp	%o4
-	 nop
-END(__siglongjmp)
diff --git a/lib/libc_bsd/sparc64/string/Makefile.inc b/lib/libc_bsd/sparc64/string/Makefile.inc
deleted file mode 100644
index ee3445c..0000000
--- a/lib/libc_bsd/sparc64/string/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.incl 85518 2001-10-26 05:40:07Z jake $
diff --git a/lib/libc_bsd/sparc64/sys/Makefile.inc b/lib/libc_bsd/sparc64/sys/Makefile.inc
deleted file mode 100644
index 8edd60b..0000000
--- a/lib/libc_bsd/sparc64/sys/Makefile.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Makefile.incl 279258 2015-02-24 22:28:44Z marius $
-
-SRCS+=	__sparc_sigtramp_setup.c \
-	__sparc_utrap.c \
-	__sparc_utrap_align.c \
-	__sparc_utrap_emul.c \
-	__sparc_utrap_fp_disabled.S \
-	__sparc_utrap_gen.S \
-	__sparc_utrap_install.c \
-	__sparc_utrap_setup.c \
-	sigcode.S
-
-CFLAGS+= -I${.CURDIR}/sparc64/fpu
-
-MDASM+=	brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction1.S
-
-# Don't generate default code for these syscalls:
-NOASM=	break.o exit.o getlogin.o openbsd_poll.o sstk.o yield.o
-
-PSEUDO=	_getlogin.o _exit.o
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-PSEUDO+= _pread.o _pwrite.o _lseek.o _mmap.o _ftruncate.o _truncate.o
-.endif
diff --git a/lib/libc_bsd/sparc64/sys/__sparc_sigtramp_setup.c b/lib/libc_bsd/sparc64/sys/__sparc_sigtramp_setup.c
deleted file mode 100644
index 36ad172..0000000
--- a/lib/libc_bsd/sparc64/sys/__sparc_sigtramp_setup.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2002 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c 124342 2004-01-10 15:57:06Z nectar $");
-
-#include <sys/types.h>
-
-#include <machine/utrap.h>
-#include <machine/sysarch.h>
-
-#include <stdlib.h>
-
-extern char __sigtramp[];
-
-static const struct sparc_sigtramp_install_args sia = { __sigtramp, NULL };
-
-void
-__sparc_sigtramp_setup(void)
-{
-
-	sysarch(SPARC_SIGTRAMP_INSTALL, (void *)&sia);
-}
diff --git a/lib/libc_bsd/sparc64/sys/__sparc_utrap.c b/lib/libc_bsd/sparc64/sys/__sparc_utrap.c
deleted file mode 100644
index d416cb1..0000000
--- a/lib/libc_bsd/sparc64/sys/__sparc_utrap.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * Copyright (c) 2001 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/__sparc_utrap.c 188031 2009-02-02 21:51:52Z rdivacky $");
-
-#include <sys/types.h>
-
-#include <machine/utrap.h>
-#include <machine/sysarch.h>
-
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "fpu_extern.h"
-#include "__sparc_utrap_private.h"
-
-extern ssize_t __sys_write(int, const void *, size_t);
-extern int __sys_kill(pid_t, int);
-extern pid_t __sys_getpid(void);
-
-static const char *utrap_msg[] = {
-	"reserved",
-	"instruction access exception",
-	"instruction access error",
-	"instruction access protection",
-	"illtrap instruction",
-	"illegal instruction",
-	"privileged opcode",
-	"floating point disabled",
-	"floating point exception ieee 754",
-	"floating point exception other",
-	"tag overflow",
-	"division by zero",
-	"data access exception",
-	"data access error",
-	"data access protection",
-	"memory address not aligned",
-	"privileged action",
-	"async data error",
-	"trap instruction 16",
-	"trap instruction 17",
-	"trap instruction 18",
-	"trap instruction 19",
-	"trap instruction 20",
-	"trap instruction 21",
-	"trap instruction 22",
-	"trap instruction 23",
-	"trap instruction 24",
-	"trap instruction 25",
-	"trap instruction 26",
-	"trap instruction 27",
-	"trap instruction 28",
-	"trap instruction 29",
-	"trap instruction 30",
-	"trap instruction 31",
-};
-
-void
-__sparc_utrap(struct utrapframe *uf)
-{
-	int sig;
-
-	switch (uf->uf_type) {
-	case UT_FP_EXCEPTION_IEEE_754:
-	case UT_FP_EXCEPTION_OTHER:
-		sig = __fpu_exception(uf);
-		break;
-	case UT_ILLEGAL_INSTRUCTION:
-		sig = __emul_insn(uf);
-		break;
-	case UT_MEM_ADDRESS_NOT_ALIGNED:
-		sig = __unaligned_fixup(uf);
-		break;
-	default:
-		break;
-	}
-	if (sig) {
-		__utrap_write("__sparc_utrap: fatal ");
-		__utrap_write(utrap_msg[uf->uf_type]);
-		__utrap_write("\n");
-		__utrap_kill_self(sig);
-	}
-	UF_DONE(uf);
-}
-
-void
-__utrap_write(const char *str)
-{
-	int berrno;
-
-	berrno = errno;
-	__sys_write(STDERR_FILENO, str, strlen(str));
-	errno = berrno;
-}
-
-void
-__utrap_kill_self(int sig)
-{
-	int berrno;
-
-	berrno = errno;
-	__sys_kill(__sys_getpid(), sig);
-	errno = berrno;
-}
-
-void
-__utrap_panic(const char *msg)
-{
-
-	__utrap_write(msg);
-	__utrap_write("\n");
-	__utrap_kill_self(SIGKILL);
-}
diff --git a/lib/libc_bsd/sparc64/sys/__sparc_utrap_align.c b/lib/libc_bsd/sparc64/sys/__sparc_utrap_align.c
deleted file mode 100644
index 0f89e1e..0000000
--- a/lib/libc_bsd/sparc64/sys/__sparc_utrap_align.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 2002 Jake Burkholder.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/__sparc_utrap_align.c 96548 2002-05-13 22:48:01Z jake $");
-
-#include <sys/types.h>
-#include <machine/cpufunc.h>
-#include <machine/instr.h>
-
-#include <signal.h>
-
-#include "__sparc_utrap_private.h"
-
-static u_long
-__unaligned_load(u_char *p, int size)
-{
-	u_long val;
-	int i;
-
-	val = 0;
-	for (i = 0; i < size; i++)
-		val = (val << 8) | p[i];
-	return (val);
-}
-
-static void
-__unaligned_store(u_char *p, u_long val, int size)
-{
-	int i;
-
-	for (i = 0; i < size; i++)
-		p[i] = val >> ((size - i - 1) * 8);
-}
-
-int
-__unaligned_fixup(struct utrapframe *uf)
-{
-	u_char *addr;
-	u_long val;
-	u_int insn;
-	int sig;
-
-	sig = 0;
-	addr = (u_char *)uf->uf_sfar;
-	insn = *(u_int *)uf->uf_pc;
-	flushw();
-	switch (IF_OP(insn)) {
-	case IOP_LDST:
-		switch (IF_F3_OP3(insn)) {
-		case INS3_LDUH:
-			val = __unaligned_load(addr, 2);
-			__emul_store_reg(uf, IF_F3_RD(insn), val);
-			break;
-		case INS3_LDUW:
-			val = __unaligned_load(addr, 4);
-			__emul_store_reg(uf, IF_F3_RD(insn), val);
-			break;
-		case INS3_LDX:
-			val = __unaligned_load(addr, 8);
-			__emul_store_reg(uf, IF_F3_RD(insn), val);
-			break;
-		case INS3_LDSH:
-			val = __unaligned_load(addr, 2);
-			__emul_store_reg(uf, IF_F3_RD(insn),
-			    IF_SEXT(val, 16));
-			break;
-		case INS3_LDSW:
-			val = __unaligned_load(addr, 4);
-			__emul_store_reg(uf, IF_F3_RD(insn),
-			    IF_SEXT(val, 32));
-			break;
-		case INS3_STH:
-			val = __emul_fetch_reg(uf, IF_F3_RD(insn));
-			__unaligned_store(addr, val, 2);
-			break;
-		case INS3_STW:
-			val = __emul_fetch_reg(uf, IF_F3_RD(insn));
-			__unaligned_store(addr, val, 4);
-			break;
-		case INS3_STX:
-			val = __emul_fetch_reg(uf, IF_F3_RD(insn));
-			__unaligned_store(addr, val, 8);
-			break;
-		default:
-			sig = SIGILL;
-			break;
-		}
-		break;
-	default:
-		sig = SIGILL;
-		break;
-	}
-	return (sig);
-}
diff --git a/lib/libc_bsd/sparc64/sys/__sparc_utrap_emul.c b/lib/libc_bsd/sparc64/sys/__sparc_utrap_emul.c
deleted file mode 100644
index 1fc35b9..0000000
--- a/lib/libc_bsd/sparc64/sys/__sparc_utrap_emul.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*-
- * Copyright (c) 2001 by Thomas Moestl <tmm@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/__sparc_utrap_emul.c 96422 2002-05-11 21:20:05Z jake $");
-
-#include <sys/types.h>
-#include <machine/cpufunc.h>
-#include <machine/frame.h>
-#include <machine/instr.h>
-
-#include <signal.h>
-
-#include "__sparc_utrap_private.h"
-#include "fpu_reg.h"
-
-int
-__emul_insn(struct utrapframe *uf)
-{
-	u_long reg, res;
-	u_long *addr;
-	u_int insn;
-	int sig;
-	int rd;
-	int i;
-
-	sig = 0;
-	insn = *(u_int *)uf->uf_pc;
-	flushw();
-	switch (IF_OP(insn)) {
-	case IOP_MISC:
-		switch (IF_F3_OP3(insn)) {
-		case INS2_POPC:
-			if (IF_F3_RS1(insn) != 0) {
-				sig = SIGILL;
-				break;
-			}
-			reg = __emul_f3_op2(uf, insn);
-			for (i = 0; i < 64; i++)
-				res += (reg >> i) & 1;
-			__emul_store_reg(uf, IF_F3_RD(insn), res);
-			break;
-		default:
-			sig = SIGILL;
-			break;
-		}
-		break;
-	case IOP_LDST:
-		switch (IF_F3_OP3(insn)) {
-		case INS3_LDQF:
-			rd = INSFPdq_RN(IF_F3_RD(insn));
-			addr = (u_long *)__emul_f3_memop_addr(uf, insn);
-			__fpu_setreg64(rd, addr[0]);
-			__fpu_setreg64(rd + 2, addr[1]);
-			break;
-		case INS3_STQF:
-			rd = INSFPdq_RN(IF_F3_RD(insn));
-			addr = (u_long *)__emul_f3_memop_addr(uf, insn);
-			addr[0] = __fpu_getreg64(rd);
-			addr[1] = __fpu_getreg64(rd + 2);
-			break;
-		default:
-			sig = SIGILL;
-			break;
-		}
-		break;
-	default:
-		sig = SIGILL;
-		break;
-	}
-	return (sig);
-}
-
-u_long
-__emul_fetch_reg(struct utrapframe *uf, int reg)
-{
-	struct frame *frm;
-
-	if (reg == IREG_G0)
-		return (0);
-	else if (reg < IREG_O0)	/* global */
-		return (uf->uf_global[reg]);
-	else if (reg < IREG_L0)	/* out */
-		return (uf->uf_out[reg - IREG_O0]);
-	else {			/* local, in */
-		/*
-		 * The in registers are immediately after the locals in
-		 * the frame.
-		 */
-		frm = (struct frame *)(uf->uf_out[6] + SPOFF);
-		return (frm->fr_local[reg - IREG_L0]);
-	}
-}
-
-void
-__emul_store_reg(struct utrapframe *uf, int reg, u_long val)
-{
-	struct frame *frm;
-
-	if (reg == IREG_G0)
-		return;
-	if (reg < IREG_O0)	/* global */
-		uf->uf_global[reg] = val;
-	else if (reg < IREG_L0)	/* out */
-		uf->uf_out[reg - IREG_O0] = val;
-	else {
-		/*
-		 * The in registers are immediately after the locals in
-		 * the frame.
-		 */
-		frm = (struct frame *)(uf->uf_out[6] + SPOFF);
-		frm->fr_local[reg - IREG_L0] = val;
-	}
-}
-
-u_long
-__emul_f3_op2(struct utrapframe *uf, u_int insn)
-{
-
-	if (IF_F3_I(insn) != 0)
-		return (IF_SIMM(insn, 13));
-	else
-		return (__emul_fetch_reg(uf, IF_F3_RS2(insn)));
-}
-
-u_long
-__emul_f3_memop_addr(struct utrapframe *uf, u_int insn)
-{
-	u_long addr;
-
-	addr = __emul_f3_op2(uf, insn) + __emul_fetch_reg(uf, IF_F3_RS1(insn));
-	return (addr);
-}
diff --git a/lib/libc_bsd/sparc64/sys/__sparc_utrap_fp_disabled.S b/lib/libc_bsd/sparc64/sys/__sparc_utrap_fp_disabled.S
deleted file mode 100644
index e15ad13..0000000
--- a/lib/libc_bsd/sparc64/sys/__sparc_utrap_fp_disabled.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2001 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/__sparc_utrap_fp_disabled.S 99116 2002-06-30 05:36:49Z obrien $");
-
-#include <machine/utrap.h>
-
-ENTRY(__sparc_utrap_fp_disabled)
-	ta	%xcc, ST_FP_RESTORE
-	jmpl	%l6, %g0
-	 return	%l7
-END(__sparc_utrap_fp_disabled)
diff --git a/lib/libc_bsd/sparc64/sys/__sparc_utrap_gen.S b/lib/libc_bsd/sparc64/sys/__sparc_utrap_gen.S
deleted file mode 100644
index 3111761..0000000
--- a/lib/libc_bsd/sparc64/sys/__sparc_utrap_gen.S
+++ /dev/null
@@ -1,107 +0,0 @@
-/*-
- * Copyright (c) 2001 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/__sparc_utrap_gen.S 221869 2011-05-14 01:53:38Z attilio $");
-
-	.register	%g2, #ignore
-	.register	%g3, #ignore
-	.register	%g6, #ignore
-	.register	%g7, #ignore
-
-#include <machine/tstate.h>
-#include <machine/utrap.h>
-
-#include "assym.s"
-
-ENTRY(__sparc_utrap_gen)
-	sub	%sp, UF_SIZEOF, %sp
-
-	stx	%o0, [%sp + SPOFF + CCFSZ + UF_TYPE]
-	stx	%o3, [%sp + SPOFF + CCFSZ + UF_TAR]
-	stx	%o4, [%sp + SPOFF + CCFSZ + UF_SFAR]
-	stx	%o5, [%sp + SPOFF + CCFSZ + UF_SFSR]
-
-	stx	%l4, [%sp + SPOFF + CCFSZ + UF_FSR]
-	stx	%l5, [%sp + SPOFF + CCFSZ + UF_STATE]
-	stx	%l6, [%sp + SPOFF + CCFSZ + UF_PC]
-	stx	%l7, [%sp + SPOFF + CCFSZ + UF_NPC]
-
-	stx	%g1, [%sp + SPOFF + CCFSZ + UF_G1]
-	stx	%g2, [%sp + SPOFF + CCFSZ + UF_G2]
-	stx	%g3, [%sp + SPOFF + CCFSZ + UF_G3]
-	stx	%g4, [%sp + SPOFF + CCFSZ + UF_G4]
-	stx	%g5, [%sp + SPOFF + CCFSZ + UF_G5]
-	stx	%g6, [%sp + SPOFF + CCFSZ + UF_G6]
-	stx	%g7, [%sp + SPOFF + CCFSZ + UF_G7]
-
-	stx	%i0, [%sp + SPOFF + CCFSZ + UF_O0]
-	stx	%i1, [%sp + SPOFF + CCFSZ + UF_O1]
-	stx	%i2, [%sp + SPOFF + CCFSZ + UF_O2]
-	stx	%i3, [%sp + SPOFF + CCFSZ + UF_O3]
-	stx	%i4, [%sp + SPOFF + CCFSZ + UF_O4]
-	stx	%i5, [%sp + SPOFF + CCFSZ + UF_O5]
-	stx	%i6, [%sp + SPOFF + CCFSZ + UF_O6]
-	stx	%i7, [%sp + SPOFF + CCFSZ + UF_O7]
-
-	rd	%y, %l6
-
-	call	__sparc_utrap
-	 add	%sp, SPOFF + CCFSZ, %o0
-
-	wr	%l6, 0, %y	
-
-	ldx	[%sp + SPOFF + CCFSZ + UF_G1], %g1
-	ldx	[%sp + SPOFF + CCFSZ + UF_G2], %g2
-	ldx	[%sp + SPOFF + CCFSZ + UF_G3], %g3
-	ldx	[%sp + SPOFF + CCFSZ + UF_G4], %g4
-	ldx	[%sp + SPOFF + CCFSZ + UF_G5], %g5
-	ldx	[%sp + SPOFF + CCFSZ + UF_G6], %g6
-	ldx	[%sp + SPOFF + CCFSZ + UF_G7], %g7
-
-	ldx	[%sp + SPOFF + CCFSZ + UF_O0], %i0
-	ldx	[%sp + SPOFF + CCFSZ + UF_O1], %i1
-	ldx	[%sp + SPOFF + CCFSZ + UF_O2], %i2
-	ldx	[%sp + SPOFF + CCFSZ + UF_O3], %i3
-	ldx	[%sp + SPOFF + CCFSZ + UF_O4], %i4
-	ldx	[%sp + SPOFF + CCFSZ + UF_O5], %i5
-	ldx	[%sp + SPOFF + CCFSZ + UF_O6], %i6
-	ldx	[%sp + SPOFF + CCFSZ + UF_O7], %i7
-
-	ldx	[%sp + SPOFF + CCFSZ + UF_STATE], %l5
-	! Restore %asi and %ccr from the passed tstate
-	srlx	%l5, TSTATE_CCR_SHIFT, %l4
-	and	%l4, CCR_MASK, %l4
-	wr	%l4, 0, %ccr
-	srlx	%l5, TSTATE_ASI_SHIFT, %l4
-	and	%l4, ASI_MASK, %l4
-	wr	%l4, 0, %asi
-	ldx	[%sp + SPOFF + CCFSZ + UF_PC], %l6
-	ldx	[%sp + SPOFF + CCFSZ + UF_NPC], %l7
-
-	jmpl	%l6, %g0
-	 return	%l7
-END(__sparc_utrap_gen)
diff --git a/lib/libc_bsd/sparc64/sys/__sparc_utrap_install.c b/lib/libc_bsd/sparc64/sys/__sparc_utrap_install.c
deleted file mode 100644
index 6cf14aa..0000000
--- a/lib/libc_bsd/sparc64/sys/__sparc_utrap_install.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2001 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/__sparc_utrap_install.c 124296 2004-01-09 16:52:09Z nectar $");
-
-#include <machine/utrap.h>
-#include <machine/sysarch.h>
-
-int
-__sparc_utrap_install(utrap_entry_t type, utrap_handler_t new_precise,
-    utrap_handler_t new_deferred, utrap_handler_t *old_precise,
-    utrap_handler_t *old_deferred)
-{
-	struct sparc_utrap_install_args uia;
-	struct sparc_utrap_args ua[1];
-
-	ua[0].type = type;
-	ua[0].new_precise = new_precise;
-	ua[0].new_deferred = new_deferred;
-	ua[0].old_precise = old_precise;
-	ua[0].old_deferred = old_deferred;
-	uia.num = 1;
-	uia.handlers = ua;
-	return (sysarch(SPARC_UTRAP_INSTALL, &uia));
-}
diff --git a/lib/libc_bsd/sparc64/sys/__sparc_utrap_private.h b/lib/libc_bsd/sparc64/sys/__sparc_utrap_private.h
deleted file mode 100644
index e17852e..0000000
--- a/lib/libc_bsd/sparc64/sys/__sparc_utrap_private.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 2001 Jake Burkholder.
- * 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.
- *
- * 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: releng/10.2/lib/libc/sparc64/sys/__sparc_utrap_private.h 96492 2002-05-13 04:35:08Z jake $
- */
-
-#ifndef	___SPARC_UTRAP_PRIVATE_H_
-#define	___SPARC_UTRAP_PRIVATE_H_
-
-#define	UF_DONE(uf) do {						\
-	uf->uf_pc = uf->uf_npc;						\
-	uf->uf_npc = uf->uf_pc + 4;					\
-} while (0)
-
-struct utrapframe {
-	u_long	uf_global[8];
-	u_long	uf_out[8];
-	u_long	uf_pc;
-	u_long	uf_npc;
-	u_long	uf_sfar;
-	u_long	uf_sfsr;
-	u_long	uf_tar;
-	u_long	uf_type;
-	u_long	uf_state;
-	u_long	uf_fsr;
-};
-
-extern char __sparc_utrap_fp_disabled[];
-extern char __sparc_utrap_gen[];
-
-int __emul_insn(struct utrapframe *uf);
-u_long __emul_fetch_reg(struct utrapframe *uf, int reg);
-void __emul_store_reg(struct utrapframe *uf, int reg, u_long val);
-u_long __emul_f3_op2(struct utrapframe *uf, u_int insn);
-u_long __emul_f3_memop_addr(struct utrapframe *uf, u_int insn);
-int __unaligned_fixup(struct utrapframe *uf);
-
-void __sparc_utrap(struct utrapframe *);
-
-void __utrap_write(const char *);
-void __utrap_kill_self(int);
-void __utrap_panic(const char *);
-
-#endif
diff --git a/lib/libc_bsd/sparc64/sys/__sparc_utrap_setup.c b/lib/libc_bsd/sparc64/sys/__sparc_utrap_setup.c
deleted file mode 100644
index 139618d..0000000
--- a/lib/libc_bsd/sparc64/sys/__sparc_utrap_setup.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 2001 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/__sparc_utrap_setup.c 263763 2014-03-26 07:31:57Z dim $");
-
-#include <sys/types.h>
-
-#include <machine/utrap.h>
-#include <machine/sysarch.h>
-
-#include <stdlib.h>
-
-#include "__sparc_utrap_private.h"
-
-static const struct sparc_utrap_args ua[] = {
-	{ UT_FP_DISABLED, __sparc_utrap_fp_disabled, NULL, NULL, NULL },
-	{ UT_FP_EXCEPTION_IEEE_754, __sparc_utrap_gen, NULL, NULL, NULL },
-	{ UT_FP_EXCEPTION_OTHER, __sparc_utrap_gen, NULL, NULL, NULL },
-	{ UT_ILLEGAL_INSTRUCTION, __sparc_utrap_gen, NULL, NULL, NULL },
-	{ UT_MEM_ADDRESS_NOT_ALIGNED, __sparc_utrap_gen, NULL, NULL, NULL },
-};
-
-static const struct sparc_utrap_install_args uia[] = {
-	{ sizeof (ua) / sizeof (*ua), ua }
-};
-
-void __sparc_utrap_setup(void) __attribute__((constructor));
-
-void
-__sparc_utrap_setup(void)
-{
-
-	sysarch(SPARC_UTRAP_INSTALL, (void *)&uia);
-}
diff --git a/lib/libc_bsd/sparc64/sys/__vdso_gettc.c b/lib/libc_bsd/sparc64/sys/__vdso_gettc.c
deleted file mode 100644
index f6445f0..0000000
--- a/lib/libc_bsd/sparc64/sys/__vdso_gettc.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2013 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/__vdso_gettc.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-
-#pragma weak __vdso_gettc
-u_int
-__vdso_gettc(const struct vdso_timehands *th)
-{
-
-	return (0);
-}
-
-#pragma weak __vdso_gettimekeep
-int
-__vdso_gettimekeep(struct vdso_timekeep **tk)
-{
-
-	return (ENOSYS);
-}
diff --git a/lib/libc_bsd/sparc64/sys/assym.s b/lib/libc_bsd/sparc64/sys/assym.s
deleted file mode 100644
index f0ed009..0000000
--- a/lib/libc_bsd/sparc64/sys/assym.s
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Offsets into structures used from asm.  Must be kept in sync with
- * appropriate headers.
- *
- * $FreeBSD: releng/10.2/lib/libc/sparc64/sys/assym.s 95745 2002-04-29 18:14:44Z jake $
- */
-
-#define	FPRS_FEF	0x4
-
-#define	CCR_MASK	0xff
-#define	ASI_MASK	0xff
-
-#define	UF_G0		0x0
-#define	UF_G1		0x8
-#define	UF_G2		0x10
-#define	UF_G3		0x18
-#define	UF_G4		0x20
-#define	UF_G5		0x28
-#define	UF_G6		0x30
-#define	UF_G7		0x38
-#define	UF_O0		0x40
-#define	UF_O1		0x48
-#define	UF_O2		0x50
-#define	UF_O3		0x58
-#define	UF_O4		0x60
-#define	UF_O5		0x68
-#define	UF_O6		0x70
-#define	UF_O7		0x78
-#define	UF_PC		0x80
-#define	UF_NPC		0x88
-#define	UF_SFAR		0x90
-#define	UF_SFSR		0x98
-#define	UF_TAR		0xa0
-#define	UF_TYPE		0xa8
-#define	UF_STATE	0xb0
-#define	UF_FSR		0xb8
-#define	UF_SIZEOF	0xc0
-
-#define	SF_UC		0x0
diff --git a/lib/libc_bsd/sparc64/sys/brk.S b/lib/libc_bsd/sparc64/sys/brk.S
deleted file mode 100644
index b9ebb1c..0000000
--- a/lib/libc_bsd/sparc64/sys/brk.S
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- * from: Header: brk.s,v 1.3 92/06/25 12:56:05 mccanne Exp
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)brk.s	8.1 (Berkeley) 6/4/93"
-#if 0
-	RCSID("$NetBSD: brk.S,v 1.9 2000/07/25 20:15:40 mycroft Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/brk.S 165903 2007-01-09 00:28:16Z imp $");
-
-#include "SYS.h"
-
-	.globl	HIDENAME(curbrk)
-	.globl	HIDENAME(minbrk)
-
-_SYSENTRY(brk)
-	PIC_PROLOGUE(%o3, %o2)
-	SET(HIDENAME(minbrk), %o2, %o3)
-	ldx	[%o3], %o4
-	cmp	%o4, %o0
-	movg	%xcc, %o4, %o0
-	mov	%o0, %o4
-	mov	SYS_break, %g1
-	ta	%xcc, ST_SYSCALL
-	bcc,a,pt %xcc, 1f
-	 nop
-	ERROR()
-1:	SET(HIDENAME(curbrk), %o2, %o3)
-	retl
-	 stx	%o4, [%o3]
-_SYSEND(brk)
diff --git a/lib/libc_bsd/sparc64/sys/cerror.S b/lib/libc_bsd/sparc64/sys/cerror.S
deleted file mode 100644
index d9bcebc..0000000
--- a/lib/libc_bsd/sparc64/sys/cerror.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * 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.
- * 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.
- *
- *	from: FreeBSD: src/lib/libc/i386/sys/cerror.S,v 1.11 2001/08/13
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/cerror.S 165903 2007-01-09 00:28:16Z imp $");
-
-#include "SYS.h"
-
-	.text
-	.align	16
-	.globl	HIDENAME(cerror)
-	.type	HIDENAME(cerror),@function
-
-	/*
-	 * The __error() function is thread aware. For non-threaded
-	 * programs and the initial threaded in threaded programs,
-	 * it returns a pointer to the global errno variable.
-	 */
-	.globl	CNAME(__error)
-HIDENAME(cerror):
-	save	%sp, -CCFSZ, %sp
-	call	CNAME(__error)
-	 nop
-	stw	%i0, [%o0]
-	mov	-1, %i0
-	ret
-	 restore %g0, -1, %o1
-END(HIDENAME(cerror))
diff --git a/lib/libc_bsd/sparc64/sys/exect.S b/lib/libc_bsd/sparc64/sys/exect.S
deleted file mode 100644
index 7ba26f0..0000000
--- a/lib/libc_bsd/sparc64/sys/exect.S
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- * from: Header: exect.s,v 1.1 91/07/06 13:05:57 torek Exp
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-	.asciz "@(#)exect.s	8.1 (Berkeley) 6/4/93"
-#if 0
-	RCSID("$NetBSD: exect.S,v 1.1 1998/09/11 04:56:34 eeh Exp $")
-#endif
-#endif /* LIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/exect.S 165903 2007-01-09 00:28:16Z imp $");
-
-#include "SYS.h"
-
-_SYSENTRY(exect)
-	mov	SYS_execve, %g1
-	ta	%xcc, ST_SYSCALL
-	ERROR()
-_SYSEND(exect)
diff --git a/lib/libc_bsd/sparc64/sys/pipe.S b/lib/libc_bsd/sparc64/sys/pipe.S
deleted file mode 100644
index 447f3ea..0000000
--- a/lib/libc_bsd/sparc64/sys/pipe.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- * from: Header: pipe.s,v 1.1 91/07/06 13:05:58 torek Exp
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)pipe.s	8.1 (Berkeley) 6/4/93"
-#if 0
-	RCSID("$NetBSD: pipe.S,v 1.3 2000/09/28 08:38:55 kleink Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/pipe.S 165903 2007-01-09 00:28:16Z imp $");
-
-#include "SYS.h"
-
-_SYSENTRY(pipe)
-	mov	%o0, %o2
-	mov	SYS_pipe, %g1
-	ta	%xcc, ST_SYSCALL
-	bcc,a,pt %xcc, 1f
-	 stw	%o0, [%o2]
-	ERROR()
-1:	stw	%o1, [%o2 + 4]
-	retl
-	 clr	%o0
-_SYSEND(pipe)
diff --git a/lib/libc_bsd/sparc64/sys/ptrace.S b/lib/libc_bsd/sparc64/sys/ptrace.S
deleted file mode 100644
index 2ae8290..0000000
--- a/lib/libc_bsd/sparc64/sys/ptrace.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- *	from: Header: ptrace.s,v 1.2 91/12/20 01:59:00 leres Exp
- *	from: NetBSD: ptrace.S,v 1.4 2000/07/24 00:11:10 mycroft Exp
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)ptrace.s	8.1 (Berkeley) 6/4/93"
-#if 0
-	RCSID("$NetBSD: ptrace.S,v 1.4 2000/07/24 00:11:10 mycroft Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/ptrace.S 165903 2007-01-09 00:28:16Z imp $");
-
-#include "SYS.h"
-
-_SYSENTRY(ptrace)
-	save	%sp, -CCFSZ, %sp
-	call	CNAME(__error)
-	 nop
-	stw	%g0, [%o0]
-	restore
-	_SYSCALL(ptrace)
-	retl
-	 nop
-_SYSEND(ptrace)
diff --git a/lib/libc_bsd/sparc64/sys/sbrk.S b/lib/libc_bsd/sparc64/sys/sbrk.S
deleted file mode 100644
index c540628..0000000
--- a/lib/libc_bsd/sparc64/sys/sbrk.S
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- * from: Header: brk.s,v 1.3 92/06/25 12:56:05 mccanne Exp
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)sbrk.s	8.1 (Berkeley) 6/4/93"
-#if 0
-	RCSID("$NetBSD: sbrk.S,v 1.7 2000/07/25 15:14:46 mycroft Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/sbrk.S 165903 2007-01-09 00:28:16Z imp $");
-
-#include "SYS.h"
-
-	.data
-	.globl	HIDENAME(curbrk)
-	.globl	HIDENAME(minbrk)
-	.type	HIDENAME(curbrk),@object
-	.type	HIDENAME(minbrk),@object
-	.align	8
-HIDENAME(curbrk):
-	.xword	CNAME(_end)
-HIDENAME(minbrk):
-	.xword	CNAME(_end)
-
-_SYSENTRY(sbrk)
-	PIC_PROLOGUE(%o3, %o2)
-	SET(HIDENAME(curbrk), %o2, %o3)
-	ldx	[%o3], %o4
-	add	%o4, %o0, %o5
-	mov	%o5, %o0
-	mov	SYS_break, %g1
-	ta	%xcc, ST_SYSCALL
-	bcc,a,pt %xcc, 1f
-	 mov	%o4, %o0
-	ERROR()
-1:	retl
-	 stx	%o5, [%o3]
-_SYSEND(sbrk)
diff --git a/lib/libc_bsd/sparc64/sys/setlogin.S b/lib/libc_bsd/sparc64/sys/setlogin.S
deleted file mode 100644
index fc94008..0000000
--- a/lib/libc_bsd/sparc64/sys/setlogin.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * 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.
- * 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.
- *
- * from: Header: setlogin.s,v 1.1 91/07/06 13:06:00 torek Exp
- */
-
-#if defined(SYSLIBC_SCCS) && !defined(lint)
-	.asciz "@(#)setlogin.s	8.1 (Berkeley) 6/4/93"
-#if 0
-	RCSID("$NetBSD: setlogin.S,v 1.3 2000/07/21 03:14:15 eeh Exp $")
-#endif
-#endif /* SYSLIBC_SCCS and not lint */
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/setlogin.S 165903 2007-01-09 00:28:16Z imp $");
-
-#include "SYS.h"
-
-	.globl	CNAME(_logname_valid)	/* in _getlogin() */
-
-_SYSENTRY(setlogin)
-	_SYSCALL(setlogin)
-	PIC_PROLOGUE(%o3, %o2)
-	SET(CNAME(_logname_valid), %o2, %o3)
-	retl
-	 stw	%g0, [%o3]
-_SYSEND(setlogin)
diff --git a/lib/libc_bsd/sparc64/sys/sigaction1.S b/lib/libc_bsd/sparc64/sys/sigaction1.S
deleted file mode 100644
index 0e3cdb1..0000000
--- a/lib/libc_bsd/sparc64/sys/sigaction1.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * Copyright (c) 2002 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/sigaction1.S 279258 2015-02-24 22:28:44Z marius $");
-
-#include "SYS.h"
-
-	WEAK_REFERENCE(__sys_sigaction, _sigaction)
-ENTRY(__sys_sigaction)
-	PIC_PROLOGUE(%o3, %o4)
-	SET(sigcode_installed, %o4, %o3)
-	lduw	[%o3], %o4
-	brnz,a,pt %o4, 1f
-	 nop
-	save	%sp, -CCFSZ, %sp
-	call	__sparc_sigtramp_setup
-	 nop
-	restore
-	mov	1, %o4
-	stw	%o4, [%o3]
-1:	_SYSCALL(sigaction)
-	retl
-	 nop
-END(__sys_sigaction)
-
-	.comm	sigcode_installed, 4, 4
diff --git a/lib/libc_bsd/sparc64/sys/sigcode.S b/lib/libc_bsd/sparc64/sys/sigcode.S
deleted file mode 100644
index 7ca9d35..0000000
--- a/lib/libc_bsd/sparc64/sys/sigcode.S
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 2002 Jake Burkholder.
- * 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.
- *
- * 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.
- */
-
-#include <machine/asm.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sparc64/sys/sigcode.S 105709 2002-10-22 15:15:39Z jake $");
-
-#include "assym.s"
-
-ENTRY(__sigtramp)
-	call	%o4
-	 nop
-	call	sigreturn
-	 add	%sp, SPOFF + CCFSZ + SF_UC, %o0
-	call	exit
-	 mov	1, %o0
-	illtrap
-END(__sigtramp)
diff --git a/lib/libc_bsd/stdio/Makefile.inc b/lib/libc_bsd/stdio/Makefile.inc
deleted file mode 100644
index 913182d..0000000
--- a/lib/libc_bsd/stdio/Makefile.inc
+++ /dev/null
@@ -1,86 +0,0 @@
-#	@(#)Makefile.inc	8.3 (Berkeley) 4/17/94
-Makefile.incl 254151 2013-08-09 17:24:23Z jilles $
-
-# stdio sources
-.PATH: ${.CURDIR}/stdio
-
-SRCS+=	_flock_stub.c asprintf.c clrerr.c dprintf.c \
-	fclose.c fcloseall.c fdopen.c \
-	feof.c ferror.c fflush.c fgetc.c fgetln.c fgetpos.c fgets.c fgetwc.c \
-	fgetwln.c fgetws.c \
-	fileno.c findfp.c flags.c fmemopen.c fopen.c fprintf.c fpurge.c \
-	fputc.c fputs.c \
-	fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \
-	ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \
-	fwrite.c getc.c getchar.c getdelim.c getline.c \
-	gets.c getw.c getwc.c getwchar.c makebuf.c mktemp.c \
-	open_memstream.c open_wmemstream.c \
-	perror.c printf.c printf-pos.c putc.c putchar.c \
-	puts.c putw.c putwc.c putwchar.c \
-	refill.c remove.c rewind.c rget.c scanf.c setbuf.c setbuffer.c \
-	setvbuf.c snprintf.c sprintf.c sscanf.c stdio.c swprintf.c swscanf.c \
-	tempnam.c tmpfile.c \
-	tmpnam.c ungetc.c ungetwc.c vasprintf.c vdprintf.c vfprintf.c \
-	vfscanf.c \
-	vfwprintf.c vfwscanf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c \
-	vsscanf.c \
-	vswprintf.c vswscanf.c vwprintf.c vwscanf.c wbuf.c wprintf.c wscanf.c \
-	wsetup.c
-
-SRCS+=	xprintf.c xprintf_float.c xprintf_int.c xprintf_str.c
-SRCS+=	xprintf_errno.c xprintf_hexdump.c xprintf_quote.c 
-SRCS+=	xprintf_time.c xprintf_vis.c
-
-SYM_MAPS+=	${.CURDIR}/stdio/Symbol.map
-
-MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \
-	flockfile.3 \
-	fopen.3 fputs.3 \
-	fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 \
-	getline.3 getwc.3 mktemp.3 open_memstream.3 \
-	printf.3 printf_l.3 putc.3 putwc.3 remove.3 scanf.3 scanf_l.3 setbuf.3 \
-	stdio.3 tmpnam.3 \
-	ungetc.3 ungetwc.3 wprintf.3 wscanf.3
-
-MLINKS+=fclose.3 fcloseall.3
-MLINKS+=ferror.3 ferror_unlocked.3 \
-	ferror.3 clearerr.3 ferror.3 clearerr_unlocked.3 \
-	ferror.3 feof.3 ferror.3 feof_unlocked.3 \
-	ferror.3 fileno.3 ferror.3 fileno_unlocked.3
-MLINKS+=fflush.3 fpurge.3
-MLINKS+=fgets.3 gets.3
-MLINKS+=flockfile.3 ftrylockfile.3 flockfile.3 funlockfile.3
-MLINKS+=fopen.3 fdopen.3 fopen.3 freopen.3 fopen.3 fmemopen.3
-MLINKS+=fputs.3 puts.3
-MLINKS+=fread.3 fwrite.3
-MLINKS+=fseek.3 fgetpos.3 fseek.3 fseeko.3 fseek.3 fsetpos.3 fseek.3 ftell.3 \
-	fseek.3 ftello.3 fseek.3 rewind.3
-MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3
-MLINKS+=getc.3 fgetc.3 getc.3 getc_unlocked.3 getc.3 getchar.3 \
-	getc.3 getchar_unlocked.3 getc.3 getw.3
-MLINKS+=getline.3 getdelim.3
-MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3
-MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3 mktemp.3 mkstemps.3 \
-	mktemp.3 mkostemp.3 mktemp.3 mkostemps.3
-MLINKS+=open_memstream.3 open_wmemstream.3
-MLINKS+=printf.3 asprintf.3 printf.3 dprintf.3 printf.3 fprintf.3 \
-	printf.3 snprintf.3 printf.3 sprintf.3 \
-	printf.3 vasprintf.3 printf.3 vdprintf.3 \
-	printf.3 vfprintf.3 printf.3 vprintf.3 printf.3 vsnprintf.3 \
-	printf.3 vsprintf.3
-MLINKS+=printf_l.3 asprintf_l.3 printf_l.3 fprintf_l.3 printf_l.3 snprintf_l.3 \
-	printf_l.3 sprintf_l.3 printf_l.3 vasprintf_l.3 printf_l.3 vfprintf_l.3 \
-	printf_l.3 vprintf_l.3 printf_l.3 vsnprintf_l.3 printf_l.3 vsprintf_l.3
-MLINKS+=putc.3 fputc.3 putc.3 putc_unlocked.3 putc.3 putchar.3 \
-	putc.3 putchar_unlocked.3 putc.3 putw.3
-MLINKS+=putwc.3 fputwc.3 putwc.3 putwchar.3
-MLINKS+=scanf.3 fscanf.3 scanf.3 sscanf.3 scanf.3 vfscanf.3 scanf.3 vscanf.3 \
-	scanf.3 vsscanf.3
-MLINKS+=scanf_l.3 fscanf_l.3 scanf_l.3 sscanf_l.3 scanf_l.3 vfscanf_l.3 \
-	scanf_l.3 vscanf_l.3 scanf_l.3 vsscanf_l.3
-MLINKS+=setbuf.3 setbuffer.3 setbuf.3 setlinebuf.3 setbuf.3 setvbuf.3
-MLINKS+=tmpnam.3 tempnam.3 tmpnam.3 tmpfile.3
-MLINKS+=wprintf.3 fwprintf.3 wprintf.3 swprintf.3 \
-	wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3
-MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \
-	wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3
diff --git a/lib/libc_bsd/stdio/Symbol.map b/lib/libc_bsd/stdio/Symbol.map
deleted file mode 100644
index 9169641..0000000
--- a/lib/libc_bsd/stdio/Symbol.map
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/stdio/Symbol.map 254151 2013-08-09 17:24:23Z jilles $
- */
-
-FBSD_1.0 {
-	flockfile;
-	ftrylockfile;
-	funlockfile;
-	asprintf;
-	clearerr;
-	fclose;
-	fcloseall;
-	fdopen;
-	feof;
-	ferror;
-	fflush;
-	fgetc;
-	fgetln;
-	fgetpos;
-	fgets;
-	fgetwc;
-	fgetwln;
-	fgetws;
-	fileno;
-	__sF;
-	__stdinp;
-	__stdoutp;
-	__stderrp;
-	f_prealloc;	/* deprecated??? */
-	fopen;
-	fprintf;
-	fpurge;
-	fputc;
-	fputs;
-	fputwc;
-	fputws;
-	fread;
-	freopen;
-	fscanf;
-	fseek;
-	fseeko;
-	fsetpos;
-	ftell;
-	ftello;
-	funopen;
-	fwide;
-	fwprintf;
-	fwrite;
-	fwscanf;
-	getc;
-	getchar;
-	gets;
-	getw;
-	getwc;
-	getwchar;
-	mkstemps;
-	mkstemp;
-	mkdtemp;
-	mktemp;
-	perror;
-	printf;
-	putc;
-	putchar;
-	puts;
-	putw;
-	putwc;
-	putwchar;
-	remove;
-	rewind;
-	__srget;
-	scanf;
-	setbuf;
-	setbuffer;
-	setlinebuf;
-	setvbuf;
-	snprintf;
-	sprintf;
-	sscanf;
-	swprintf;
-	swscanf;
-	tempnam;
-	tmpfile;
-	tmpnam;
-	ungetc;
-	ungetwc;
-	getchar_unlocked;
-	getc_unlocked;
-	putchar_unlocked;
-	putc_unlocked;
-	feof_unlocked;
-	ferror_unlocked;
-	clearerr_unlocked;
-	fileno_unlocked;
-	vasprintf;
-	vfprintf;
-	vfscanf;
-	vfwprintf;
-	vfwscanf;
-	vprintf;
-	vscanf;
-	vsnprintf;
-	vsprintf;
-	vsscanf;
-	vswprintf;
-	vswscanf;
-	vwprintf;
-	vwscanf;
-	__swbuf;
-	wprintf;
-	wscanf;
-};
-
-FBSD_1.1 {
-	 dprintf;
-	 getdelim;
-	 getline;
-	 vdprintf;
-};
-
-FBSD_1.3 {
-	asprintf_l;
-	fprintf_l;
-	fwprintf_l;
-	printf_l;
-	snprintf_l;
-	sprintf_l;
-	swprintf_l;
-	vasprintf_l;
-	vfprintf_l;
-	vfwprintf_l;
-	vprintf_l;
-	vsnprintf_l;
-	vsprintf_l;
-	vswprintf_l;
-	vwprintf_l;
-	wprintf_l;
-	fgetwc_l;
-	fputwc_l;
-	ungetwc_l;
-	vfwscanf_l;
-	vswscanf_l;
-	fscanf_l;
-	fwscanf_l;
-	scanf_l;
-	sscanf_l;
-	swscanf_l;
-	vfscanf_l;
-	vscanf_l;
-	vsscanf_l;
-	vwscanf_l;
-	wscanf_l;
-	fgetws_l;
-	fputws_l;
-	getwc_l;
-	getwchar_l;
-	putwc_l;
-	putwchar_l;
-	fmemopen;
-	open_memstream;
-	open_wmemstream;
-	mkostemp;
-	mkostemps;
-};
-
-FBSDprivate_1.0 {
-	_flockfile;
-	_flockfile_debug_stub;
-	_flockfile_debug;
-	_ftrylockfile;
-	_funlockfile;
-	__vfscanf;
-
-	/*
-	 * xprintf support
-	 */
-	__use_xprintf;
-	__lowercase_hex;
-	__uppercase_hex;
-	__printf_flush;
-	__printf_puts;
-	__printf_pad;
-	__printf_out;
-	__xvprintf;
-	register_printf_function;
-	register_printf_render;
-	register_printf_render_std;
-	__printf_arginfo_float;
-	__printf_render_float;
-	__printf_arginfo_hexdump;
-	__printf_render_hexdump;
-	__printf_arginfo_int;
-	__printf_render_int;
-	__printf_arginfo_ptr;
-	__printf_render_ptr;
-	__printf_arginfo_str;
-	__printf_render_str;
-	__printf_arginfo_chr;
-	__printf_render_chr;
-	__printf_arginfo_time;
-	__printf_render_time;
-	__printf_arginfo_vis;
-	__printf_render_vis;
-};
diff --git a/lib/libc_bsd/stdio/_flock_stub.c b/lib/libc_bsd/stdio/_flock_stub.c
deleted file mode 100644
index 5ed18e6..0000000
--- a/lib/libc_bsd/stdio/_flock_stub.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- */
-
-/*
- * POSIX stdio FILE locking functions. These assume that the locking
- * is only required at FILE structure level, not at file descriptor
- * level too.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/_flock_stub.c 178287 2008-04-17 22:17:54Z jhb $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "local.h"
-
-
-/*
- * Weak symbols for externally visible functions in this file:
- */
-__weak_reference(_flockfile, flockfile);
-__weak_reference(_flockfile_debug_stub, _flockfile_debug);
-__weak_reference(_ftrylockfile, ftrylockfile);
-__weak_reference(_funlockfile, funlockfile);
-
-void
-_flockfile(FILE *fp)
-{
-	pthread_t curthread = _pthread_self();
-
-	if (fp->_fl_owner == curthread)
-		fp->_fl_count++;
-	else {
-		/*
-		 * Make sure this mutex is treated as a private
-		 * internal mutex:
-		 */
-		_pthread_mutex_lock(&fp->_fl_mutex);
-		fp->_fl_owner = curthread;
-		fp->_fl_count = 1;
-	}
-}
-
-/*
- * This can be overriden by the threads library if it is linked in.
- */
-void
-_flockfile_debug_stub(FILE *fp, char *fname, int lineno)
-{
-	_flockfile(fp);
-}
-
-int
-_ftrylockfile(FILE *fp)
-{
-	pthread_t curthread = _pthread_self();
-	int	ret = 0;
-
-	if (fp->_fl_owner == curthread)
-		fp->_fl_count++;
-	/*
-	 * Make sure this mutex is treated as a private
-	 * internal mutex:
-	 */
-	else if (_pthread_mutex_trylock(&fp->_fl_mutex) == 0) {
-		fp->_fl_owner = curthread;
-		fp->_fl_count = 1;
-	}
-	else
-		ret = -1;
-	return (ret);
-}
-
-void 
-_funlockfile(FILE *fp)
-{
-	pthread_t	curthread = _pthread_self();
-
-	/*
-	 * Check if this file is owned by the current thread:
-	 */
-	if (fp->_fl_owner == curthread) {
-		/*
-		 * Check if this thread has locked the FILE
-		 * more than once:
-		 */
-		if (fp->_fl_count > 1)
-			/*
-			 * Decrement the count of the number of
-			 * times the running thread has locked this
-			 * file:
-			 */
-			fp->_fl_count--;
-		else {
-			/*
-			 * The running thread will release the
-			 * lock now:
-			 */
-			fp->_fl_count = 0;
-			fp->_fl_owner = NULL;
-			_pthread_mutex_unlock(&fp->_fl_mutex);
-		}
-	}
-}
diff --git a/lib/libc_bsd/stdio/asprintf.c b/lib/libc_bsd/stdio/asprintf.c
deleted file mode 100644
index 032521c..0000000
--- a/lib/libc_bsd/stdio/asprintf.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/asprintf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <xlocale.h>
-
-int
-asprintf(char ** __restrict s, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vasprintf(s, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-int
-asprintf_l(char ** __restrict s, locale_t locale, char const * __restrict fmt,
-		...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vasprintf_l(s, locale, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/clrerr.c b/lib/libc_bsd/stdio/clrerr.c
deleted file mode 100644
index 5281d9e..0000000
--- a/lib/libc_bsd/stdio/clrerr.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)clrerr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/clrerr.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#undef clearerr
-#undef clearerr_unlocked
-
-void
-clearerr(FILE *fp)
-{
-	FLOCKFILE(fp);
-	__sclearerr(fp);
-	FUNLOCKFILE(fp);
-}
-
-void
-clearerr_unlocked(FILE *fp)
-{
-
-	__sclearerr(fp);
-}
diff --git a/lib/libc_bsd/stdio/dprintf.c b/lib/libc_bsd/stdio/dprintf.c
deleted file mode 100644
index 0ad1918..0000000
--- a/lib/libc_bsd/stdio/dprintf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/dprintf.c 189356 2009-03-04 03:38:51Z das $");
-
-#define	_WITH_DPRINTF
-#include "namespace.h"
-#include <stdarg.h>
-#include <stdio.h>
-#include "un-namespace.h"
-
-int
-dprintf(int fd, const char * __restrict fmt, ...)
-{
-	va_list ap;
-	int ret;
-
-	va_start(ap, fmt);
-	ret = vdprintf(fd, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/fclose.3 b/lib/libc_bsd/stdio/fclose.3
deleted file mode 100644
index 9ff549f..0000000
--- a/lib/libc_bsd/stdio/fclose.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fclose.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fclose.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 22, 2006
-.Dt FCLOSE 3
-.Os
-.Sh NAME
-.Nm fclose ,
-.Nm fcloseall
-.Nd close a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fclose "FILE *stream"
-.Ft void
-.Fn fcloseall void
-.Sh DESCRIPTION
-The
-.Fn fclose
-function
-dissociates the named
-.Fa stream
-from its underlying file or set of functions.
-If the stream was being used for output, any buffered data is written
-first, using
-.Xr fflush 3 .
-.Pp
-The
-.Fn fcloseall
-function calls
-.Fn fclose
-on all open streams.
-.Sh RETURN VALUES
-Upon successful completion 0 is returned.
-Otherwise,
-.Dv EOF
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-In either case no further access to the stream is possible.
-.Sh ERRORS
-The
-.Fn fclose
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr close 2
-or
-.Xr fflush 3 .
-.Sh NOTES
-The
-.Fn fclose
-function
-does not handle NULL arguments; they will result in a segmentation
-violation.
-This is intentional - it makes it easier to make sure programs written
-under
-.Fx
-are bug free.
-This behaviour is an implementation detail, and programs should not
-rely upon it.
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr fflush 3 ,
-.Xr fopen 3 ,
-.Xr setbuf 3
-.Sh STANDARDS
-The
-.Fn fclose
-function
-conforms to
-.St -isoC .
-.Pp
-The
-.Fn fcloseall
-function first appeared in
-.Fx 7.0 .
diff --git a/lib/libc_bsd/stdio/fclose.c b/lib/libc_bsd/stdio/fclose.c
deleted file mode 100644
index e5743da..0000000
--- a/lib/libc_bsd/stdio/fclose.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fclose.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fclose.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include <spinlock.h>
-#include "libc_private.h"
-#include "local.h"
-
-int
-fclose(FILE *fp)
-{
-	int r;
-
-	if (fp->_flags == 0) {	/* not open! */
-		errno = EBADF;
-		return (EOF);
-	}
-	FLOCKFILE(fp);
-	r = fp->_flags & __SWR ? __sflush(fp) : 0;
-	if (fp->_close != NULL && (*fp->_close)(fp->_cookie) < 0)
-		r = EOF;
-	if (fp->_flags & __SMBF)
-		free((char *)fp->_bf._base);
-	if (HASUB(fp))
-		FREEUB(fp);
-	if (HASLB(fp))
-		FREELB(fp);
-	fp->_file = -1;
-	fp->_r = fp->_w = 0;	/* Mess up if reaccessed. */
-
-	/*
-	 * Lock the spinlock used to protect __sglue list walk in
-	 * __sfp().  The __sfp() uses fp->_flags == 0 test as an
-	 * indication of the unused FILE.
-	 *
-	 * Taking the lock prevents possible compiler or processor
-	 * reordering of the writes performed before the final _flags
-	 * cleanup, making sure that we are done with the FILE before
-	 * it is considered available.
-	 */
-	STDIO_THREAD_LOCK();
-	fp->_flags = 0;		/* Release this FILE for reuse. */
-	STDIO_THREAD_UNLOCK();
-	FUNLOCKFILE(fp);
-	return (r);
-}
diff --git a/lib/libc_bsd/stdio/fcloseall.c b/lib/libc_bsd/stdio/fcloseall.c
deleted file mode 100644
index 543b8ce..0000000
--- a/lib/libc_bsd/stdio/fcloseall.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (C) 2006 Daniel M. Eischen.  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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fcloseall.c 157963 2006-04-22 16:47:59Z deischen $");
-
-#include <stdio.h>
-#include "local.h"
-
-__weak_reference(__fcloseall, fcloseall);
-
-void
-__fcloseall(void)
-{
-
-	(void)_fwalk(fclose);
-}
diff --git a/lib/libc_bsd/stdio/fdopen.c b/lib/libc_bsd/stdio/fdopen.c
deleted file mode 100644
index 49e4d61..0000000
--- a/lib/libc_bsd/stdio/fdopen.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fdopen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fdopen.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <limits.h>
-#include "un-namespace.h"
-#include "local.h"
-
-FILE *
-fdopen(int fd, const char *mode)
-{
-	FILE *fp;
-	int flags, oflags, fdflags, tmp;
-
-	/*
-	 * File descriptors are a full int, but _file is only a short.
-	 * If we get a valid file descriptor that is greater than
-	 * SHRT_MAX, then the fd will get sign-extended into an
-	 * invalid file descriptor.  Handle this case by failing the
-	 * open.
-	 */
-	if (fd > SHRT_MAX) {
-		errno = EMFILE;
-		return (NULL);
-	}
-
-	if ((flags = __sflags(mode, &oflags)) == 0)
-		return (NULL);
-
-	/* Make sure the mode the user wants is a subset of the actual mode. */
-	if ((fdflags = _fcntl(fd, F_GETFL, 0)) < 0)
-		return (NULL);
-	tmp = fdflags & O_ACCMODE;
-	if (tmp != O_RDWR && (tmp != (oflags & O_ACCMODE))) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	if ((fp = __sfp()) == NULL)
-		return (NULL);
-
-	if ((oflags & O_CLOEXEC) && _fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {
-		fp->_flags = 0;
-		return (NULL);
-	}
-
-	fp->_flags = flags;
-	/*
-	 * If opened for appending, but underlying descriptor does not have
-	 * O_APPEND bit set, assert __SAPP so that __swrite() caller
-	 * will _sseek() to the end before write.
-	 */
-	if ((oflags & O_APPEND) && !(fdflags & O_APPEND))
-		fp->_flags |= __SAPP;
-	fp->_file = fd;
-	fp->_cookie = fp;
-	fp->_read = __sread;
-	fp->_write = __swrite;
-	fp->_seek = __sseek;
-	fp->_close = __sclose;
-	return (fp);
-}
diff --git a/lib/libc_bsd/stdio/feof.c b/lib/libc_bsd/stdio/feof.c
deleted file mode 100644
index 0f2bbb0..0000000
--- a/lib/libc_bsd/stdio/feof.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)feof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/feof.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#undef feof
-#undef feof_unlocked
-
-int
-feof(FILE *fp)
-{
-	int	ret;
-
-	FLOCKFILE(fp);
-	ret= __sfeof(fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-int
-feof_unlocked(FILE *fp)
-{
-
-	return (__sfeof(fp));
-}
diff --git a/lib/libc_bsd/stdio/ferror.3 b/lib/libc_bsd/stdio/ferror.3
deleted file mode 100644
index 536e7d4..0000000
--- a/lib/libc_bsd/stdio/ferror.3
+++ /dev/null
@@ -1,131 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)ferror.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/ferror.3 187823 2009-01-28 14:38:41Z trhodes $
-.\"
-.Dd January 28, 2009
-.Dt FERROR 3
-.Os
-.Sh NAME
-.Nm clearerr ,
-.Nm clearerr_unlocked ,
-.Nm feof ,
-.Nm feof_unlocked ,
-.Nm ferror ,
-.Nm ferror_unlocked ,
-.Nm fileno ,
-.Nm fileno_unlocked
-.Nd check and reset stream status
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft void
-.Fn clearerr "FILE *stream"
-.Ft void
-.Fn clearerr_unlocked "FILE *stream"
-.Ft int
-.Fn feof "FILE *stream"
-.Ft int
-.Fn feof_unlocked "FILE *stream"
-.Ft int
-.Fn ferror "FILE *stream"
-.Ft int
-.Fn ferror_unlocked "FILE *stream"
-.Ft int
-.Fn fileno "FILE *stream"
-.Ft int
-.Fn fileno_unlocked "FILE *stream"
-.Sh DESCRIPTION
-The function
-.Fn clearerr
-clears the end-of-file and error indicators for the stream pointed
-to by
-.Fa stream .
-.Pp
-The function
-.Fn feof
-tests the end-of-file indicator for the stream pointed to by
-.Fa stream ,
-returning non-zero if it is set.
-The end-of-file indicator may be cleared by explicitly calling
-.Fn clearerr ,
-or as a side-effect of other operations, e.g.\&
-.Fn fseek .
-.Pp
-The function
-.Fn ferror
-tests the error indicator for the stream pointed to by
-.Fa stream ,
-returning non-zero if it is set.
-.Pp
-The function
-.Fn fileno
-examines the argument
-.Fa stream
-and returns its integer descriptor.
-.Pp
-The
-.Fn clearerr_unlocked ,
-.Fn feof_unlocked ,
-.Fn ferror_unlocked ,
-and
-.Fn fileno_unlocked
-functions are equivalent to
-.Fn clearerr ,
-.Fn feof ,
-.Fn ferror ,
-and
-.Fn fileno
-respectively, except that the caller is responsible for locking the stream
-with
-.Xr flockfile 3
-before calling them.
-These functions may be used to avoid the overhead of locking the stream
-and to prevent races when multiple threads are operating on the same stream.
-.Sh ERRORS
-These functions should not fail and do not set the external
-variable
-.Va errno .
-.Sh SEE ALSO
-.Xr open 2 ,
-.Xr fdopen 3 ,
-.Xr flockfile 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The functions
-.Fn clearerr ,
-.Fn feof ,
-and
-.Fn ferror
-conform to
-.St -isoC .
diff --git a/lib/libc_bsd/stdio/ferror.c b/lib/libc_bsd/stdio/ferror.c
deleted file mode 100644
index f1c8682..0000000
--- a/lib/libc_bsd/stdio/ferror.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ferror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/ferror.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#undef ferror
-#undef ferror_unlocked
-
-int
-ferror(FILE *fp)
-{
-	int	ret;
-
-	FLOCKFILE(fp);
-	ret = __sferror(fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-int
-ferror_unlocked(FILE *fp)
-{
-
-	return (__sferror(fp));
-}
diff --git a/lib/libc_bsd/stdio/fflush.3 b/lib/libc_bsd/stdio/fflush.3
deleted file mode 100644
index 3c05c70..0000000
--- a/lib/libc_bsd/stdio/fflush.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fflush.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fflush.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt FFLUSH 3
-.Os
-.Sh NAME
-.Nm fflush ,
-.Nm fpurge
-.Nd flush a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fflush "FILE *stream"
-.Ft int
-.Fn fpurge "FILE *stream"
-.Sh DESCRIPTION
-The function
-.Fn fflush
-forces a write of all buffered data for the given output or update
-.Fa stream
-via the stream's underlying write function.
-The open status of the stream is unaffected.
-.Pp
-If the
-.Fa stream
-argument is
-.Dv NULL ,
-.Fn fflush
-flushes
-.Em all
-open output streams.
-.Pp
-The function
-.Fn fpurge
-erases any input or output buffered in the given
-.Fa stream .
-For output streams this discards any unwritten output.
-For input streams this discards any input read from the underlying object
-but not yet obtained via
-.Xr getc 3 ;
-this includes any text pushed back via
-.Xr ungetc 3 .
-.Sh RETURN VALUES
-Upon successful completion 0 is returned.
-Otherwise,
-.Dv EOF
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa stream
-argument
-is not an open stream, or, in the case of
-.Fn fflush ,
-not a stream open for writing.
-.El
-.Pp
-The function
-.Fn fflush
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr write 2 .
-.Sh SEE ALSO
-.Xr write 2 ,
-.Xr fclose 3 ,
-.Xr fopen 3 ,
-.Xr setbuf 3
-.Sh STANDARDS
-The
-.Fn fflush
-function
-conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/stdio/fflush.c b/lib/libc_bsd/stdio/fflush.c
deleted file mode 100644
index 2a128da..0000000
--- a/lib/libc_bsd/stdio/fflush.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fflush.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fflush.c 275667 2014-12-10 08:24:02Z delphij $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-static int	sflush_locked(FILE *);
-
-/*
- * Flush a single file, or (if fp is NULL) all files.
- * MT-safe version
- */
-int
-fflush(FILE *fp)
-{
-	int retval;
-
-	if (fp == NULL)
-		return (_fwalk(sflush_locked));
-	FLOCKFILE(fp);
-
-	/*
-	 * There is disagreement about the correct behaviour of fflush()
-	 * when passed a file which is not open for writing.  According to
-	 * the ISO C standard, the behaviour is undefined.
-	 * Under linux, such an fflush returns success and has no effect;
-	 * under Windows, such an fflush is documented as behaving instead
-	 * as fpurge().
-	 * Given that applications may be written with the expectation of
-	 * either of these two behaviours, the only safe (non-astonishing)
-	 * option is to return EBADF and ask that applications be fixed.
-	 * SUSv3 now requires that fflush() returns success on a read-only
-	 * stream.
-	 *
-	 */
-	if ((fp->_flags & (__SWR | __SRW)) == 0)
-		retval = 0;
-	else
-		retval = __sflush(fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
-
-/*
- * Flush a single file, or (if fp is NULL) all files.
- * Non-MT-safe version
- */
-int
-__fflush(FILE *fp)
-{
-	int retval;
-
-	if (fp == NULL)
-		return (_fwalk(sflush_locked));
-	if ((fp->_flags & (__SWR | __SRW)) == 0)
-		retval = 0;
-	else
-		retval = __sflush(fp);
-	return (retval);
-}
-
-int
-__sflush(FILE *fp)
-{
-	unsigned char *p;
-	int n, t;
-
-	t = fp->_flags;
-	if ((t & __SWR) == 0)
-		return (0);
-
-	if ((p = fp->_bf._base) == NULL)
-		return (0);
-
-	n = fp->_p - p;		/* write this much */
-
-	/*
-	 * Set these immediately to avoid problems with longjmp and to allow
-	 * exchange buffering (via setvbuf) in user write function.
-	 */
-	fp->_p = p;
-	fp->_w = t & (__SLBF|__SNBF) ? 0 : fp->_bf._size;
-
-	for (; n > 0; n -= t, p += t) {
-		t = _swrite(fp, (char *)p, n);
-		if (t <= 0) {
-			/* Reset _p and _w. */
-			if (p > fp->_p) {
-				/* Some was written. */
-				memmove(fp->_p, p, n);
-				fp->_p += n;
-				if ((fp->_flags & (__SLBF | __SNBF)) == 0)
-					fp->_w -= n;
-			}
-			fp->_flags |= __SERR;
-			return (EOF);
-		}
-	}
-	return (0);
-}
-
-static int
-sflush_locked(FILE *fp)
-{
-	int	ret;
-
-	FLOCKFILE(fp);
-	ret = __sflush(fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/fgetc.c b/lib/libc_bsd/stdio/fgetc.c
deleted file mode 100644
index 8b558c3..0000000
--- a/lib/libc_bsd/stdio/fgetc.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fgetc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fgetc.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-int
-fgetc(FILE *fp)
-{
-	int retval;
-	FLOCKFILE(fp);
-	/* Orientation set by __sgetc() when buffer is empty. */
-	/* ORIENT(fp, -1); */
-	retval = __sgetc(fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc_bsd/stdio/fgetln.3 b/lib/libc_bsd/stdio/fgetln.3
deleted file mode 100644
index 2b5956f..0000000
--- a/lib/libc_bsd/stdio/fgetln.3
+++ /dev/null
@@ -1,125 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fgetln.3 189136 2009-02-28 06:00:58Z das $
-.\"
-.Dd April 19, 1994
-.Dt FGETLN 3
-.Os
-.Sh NAME
-.Nm fgetln
-.Nd get a line from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft char *
-.Fn fgetln "FILE *stream" "size_t *len"
-.Sh DESCRIPTION
-The
-.Fn fgetln
-function
-returns a pointer to the next line from the stream referenced by
-.Fa stream .
-This line is
-.Em not
-a C string as it does not end with a terminating
-.Dv NUL
-character.
-The length of the line, including the final newline,
-is stored in the memory location to which
-.Fa len
-points.
-(Note, however, that if the line is the last
-in a file that does not end in a newline,
-the returned text will not contain a newline.)
-.Sh RETURN VALUES
-Upon successful completion a pointer is returned;
-this pointer becomes invalid after the next
-.Tn I/O
-operation on
-.Fa stream
-(whether successful or not)
-or as soon as the stream is closed.
-Otherwise,
-.Dv NULL
-is returned.
-The
-.Fn fgetln
-function
-does not distinguish between end-of-file and error; the routines
-.Xr feof 3
-and
-.Xr ferror 3
-must be used
-to determine which occurred.
-If an error occurs, the global variable
-.Va errno
-is set to indicate the error.
-The end-of-file condition is remembered, even on a terminal, and all
-subsequent attempts to read will return
-.Dv NULL
-until the condition is
-cleared with
-.Xr clearerr 3 .
-.Pp
-The text to which the returned pointer points may be modified,
-provided that no changes are made beyond the returned size.
-These changes are lost as soon as the pointer becomes invalid.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa stream
-is not a stream open for reading.
-.El
-.Pp
-The
-.Fn fgetln
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr fflush 3 ,
-.Xr malloc 3 ,
-.Xr read 2 ,
-.Xr stat 2 ,
-or
-.Xr realloc 3 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fgets 3 ,
-.Xr fgetwln 3 ,
-.Xr fopen 3 ,
-.Xr getline 3 ,
-.Xr putc 3
-.Sh HISTORY
-The
-.Fn fgetln
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/stdio/fgetln.c b/lib/libc_bsd/stdio/fgetln.c
deleted file mode 100644
index 63ec5d7..0000000
--- a/lib/libc_bsd/stdio/fgetln.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fgetln.c	8.2 (Berkeley) 1/2/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fgetln.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-/*
- * Expand the line buffer.  Return -1 on error.
-#ifdef notdef
- * The `new size' does not account for a terminating '\0',
- * so we add 1 here.
-#endif
- */
-int
-__slbexpand(FILE *fp, size_t newsize)
-{
-	void *p;
-
-#ifdef notdef
-	++newsize;
-#endif
-	if (fp->_lb._size >= newsize)
-		return (0);
-	if ((p = realloc(fp->_lb._base, newsize)) == NULL)
-		return (-1);
-	fp->_lb._base = p;
-	fp->_lb._size = newsize;
-	return (0);
-}
-
-/*
- * Get an input line.  The returned pointer often (but not always)
- * points into a stdio buffer.  Fgetln does not alter the text of
- * the returned line (which is thus not a C string because it will
- * not necessarily end with '\0'), but does allow callers to modify
- * it if they wish.  Thus, we set __SMOD in case the caller does.
- */
-char *
-fgetln(FILE *fp, size_t *lenp)
-{
-	unsigned char *p;
-	size_t len;
-	size_t off;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	/* make sure there is input */
-	if (fp->_r <= 0 && __srefill(fp)) {
-		*lenp = 0;
-		FUNLOCKFILE(fp);
-		return (NULL);
-	}
-
-	/* look for a newline in the input */
-	if ((p = memchr((void *)fp->_p, '\n', (size_t)fp->_r)) != NULL) {
-		char *ret;
-
-		/*
-		 * Found one.  Flag buffer as modified to keep fseek from
-		 * `optimising' a backward seek, in case the user stomps on
-		 * the text.
-		 */
-		p++;		/* advance over it */
-		ret = (char *)fp->_p;
-		*lenp = len = p - fp->_p;
-		fp->_flags |= __SMOD;
-		fp->_r -= len;
-		fp->_p = p;
-		FUNLOCKFILE(fp);
-		return (ret);
-	}
-
-	/*
-	 * We have to copy the current buffered data to the line buffer.
-	 * As a bonus, though, we can leave off the __SMOD.
-	 *
-	 * OPTIMISTIC is length that we (optimistically) expect will
-	 * accommodate the `rest' of the string, on each trip through the
-	 * loop below.
-	 */
-#define OPTIMISTIC 80
-
-	for (len = fp->_r, off = 0;; len += fp->_r) {
-		size_t diff;
-
-		/*
-		 * Make sure there is room for more bytes.  Copy data from
-		 * file buffer to line buffer, refill file and look for
-		 * newline.  The loop stops only when we find a newline.
-		 */
-		if (__slbexpand(fp, len + OPTIMISTIC))
-			goto error;
-		(void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
-		    len - off);
-		off = len;
-		if (__srefill(fp))
-			break;	/* EOF or error: return partial line */
-		if ((p = memchr((void *)fp->_p, '\n', (size_t)fp->_r)) == NULL)
-			continue;
-
-		/* got it: finish up the line (like code above) */
-		p++;
-		diff = p - fp->_p;
-		len += diff;
-		if (__slbexpand(fp, len))
-			goto error;
-		(void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
-		    diff);
-		fp->_r -= diff;
-		fp->_p = p;
-		break;
-	}
-	*lenp = len;
-#ifdef notdef
-	fp->_lb._base[len] = 0;
-#endif
-	FUNLOCKFILE(fp);
-	return ((char *)fp->_lb._base);
-
-error:
-	*lenp = 0;		/* ??? */
-	FUNLOCKFILE(fp);
-	return (NULL);		/* ??? */
-}
diff --git a/lib/libc_bsd/stdio/fgetpos.c b/lib/libc_bsd/stdio/fgetpos.c
deleted file mode 100644
index a03c699..0000000
--- a/lib/libc_bsd/stdio/fgetpos.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fgetpos.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fgetpos.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-
-int
-fgetpos(FILE * __restrict fp, fpos_t * __restrict pos)
-{
-	/*
-	 * ftello is thread-safe; no need to lock fp.
-	 */
-	if ((*pos = ftello(fp)) == (fpos_t)-1)
-		return (-1);
-	else
-		return (0);
-}
diff --git a/lib/libc_bsd/stdio/fgets.3 b/lib/libc_bsd/stdio/fgets.3
deleted file mode 100644
index 4e25d4f..0000000
--- a/lib/libc_bsd/stdio/fgets.3
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fgets.3 235202 2012-05-09 17:27:49Z eadler $
-.\"
-.Dd May 5, 2012
-.Dt FGETS 3
-.Os
-.Sh NAME
-.Nm fgets ,
-.Nm gets
-.Nd get a line from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft char *
-.Fn fgets "char * restrict str" "int size" "FILE * restrict stream"
-.Ft char *
-.Fn gets "char *str"
-.Sh DESCRIPTION
-The
-.Fn fgets
-function
-reads at most one less than the number of characters specified by
-.Fa size
-from the given
-.Fa stream
-and stores them in the string
-.Fa str .
-Reading stops when a newline character is found,
-at end-of-file or error.
-The newline, if any, is retained.
-If any characters are read and there is no error, a
-.Ql \e0
-character is appended to end the string.
-.Pp
-The
-.Fn gets
-function
-is equivalent to
-.Fn fgets
-with an infinite
-.Fa size
-and a
-.Fa stream
-of
-.Dv stdin ,
-except that the newline character (if any) is not stored in the string.
-It is the caller's responsibility to ensure that the input line,
-if any, is sufficiently short to fit in the string.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn fgets
-and
-.Fn gets
-return
-a pointer to the string.
-If end-of-file occurs before any characters are read,
-they return
-.Dv NULL
-and the buffer contents remain unchanged.
-If an error occurs,
-they return
-.Dv NULL
-and the buffer contents are indeterminate.
-The
-.Fn fgets
-and
-.Fn gets
-functions
-do not distinguish between end-of-file and error, and callers must use
-.Xr feof 3
-and
-.Xr ferror 3
-to determine which occurred.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The given
-.Fa stream
-is not a readable stream.
-.El
-.Pp
-The function
-.Fn fgets
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr fflush 3 ,
-.Xr fstat 2 ,
-.Xr read 2 ,
-or
-.Xr malloc 3 .
-.Pp
-The function
-.Fn gets
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr getchar 3 .
-.Sh SEE ALSO
-.Xr feof 3 ,
-.Xr ferror 3 ,
-.Xr fgetln 3 ,
-.Xr fgetws 3 ,
-.Xr getline 3
-.Sh STANDARDS
-The functions
-.Fn fgets
-and
-.Fn gets
-conform to
-.St -isoC-99 .
-.Sh SECURITY CONSIDERATIONS
-The
-.Fn gets
-function cannot be used securely.
-Because of its lack of bounds checking,
-and the inability for the calling program
-to reliably determine the length of the next incoming line,
-the use of this function enables malicious users
-to arbitrarily change a running program's functionality through
-a buffer overflow attack.
-It is strongly suggested that the
-.Fn fgets
-function be used in all cases.
diff --git a/lib/libc_bsd/stdio/fgets.c b/lib/libc_bsd/stdio/fgets.c
deleted file mode 100644
index 63e37ca..0000000
--- a/lib/libc_bsd/stdio/fgets.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fgets.c	8.2 (Berkeley) 12/22/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fgets.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * Read at most n-1 characters from the given file.
- * Stop when a newline has been read, or the count runs out.
- * Return first argument, or NULL if no characters were read.
- */
-char *
-fgets(char * __restrict buf, int n, FILE * __restrict fp)
-{
-	size_t len;
-	char *s;
-	unsigned char *p, *t;
-
-	if (n <= 0)		/* sanity check */
-		return (NULL);
-
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	s = buf;
-	n--;			/* leave space for NUL */
-	while (n != 0) {
-		/*
-		 * If the buffer is empty, refill it.
-		 */
-		if ((len = fp->_r) <= 0) {
-			if (__srefill(fp)) {
-				/* EOF/error: stop with partial or no line */
-				if (s == buf) {
-					FUNLOCKFILE(fp);
-					return (NULL);
-				}
-				break;
-			}
-			len = fp->_r;
-		}
-		p = fp->_p;
-
-		/*
-		 * Scan through at most n bytes of the current buffer,
-		 * looking for '\n'.  If found, copy up to and including
-		 * newline, and stop.  Otherwise, copy entire chunk
-		 * and loop.
-		 */
-		if (len > n)
-			len = n;
-		t = memchr((void *)p, '\n', len);
-		if (t != NULL) {
-			len = ++t - p;
-			fp->_r -= len;
-			fp->_p = t;
-			(void)memcpy((void *)s, (void *)p, len);
-			s[len] = 0;
-			FUNLOCKFILE(fp);
-			return (buf);
-		}
-		fp->_r -= len;
-		fp->_p += len;
-		(void)memcpy((void *)s, (void *)p, len);
-		s += len;
-		n -= len;
-	}
-	*s = 0;
-	FUNLOCKFILE(fp);
-	return (buf);
-}
diff --git a/lib/libc_bsd/stdio/fgetwc.c b/lib/libc_bsd/stdio/fgetwc.c
deleted file mode 100644
index d025be5..0000000
--- a/lib/libc_bsd/stdio/fgetwc.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fgetwc.c 234799 2012-04-29 16:28:39Z das $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-#include "xlocale_private.h"
-
-/*
- * MT-safe version.
- */
-wint_t
-fgetwc_l(FILE *fp, locale_t locale)
-{
-	wint_t r;
-	FIX_LOCALE(locale);
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	r = __fgetwc(fp, locale);
-	FUNLOCKFILE(fp);
-
-	return (r);
-}
-
-wint_t
-fgetwc(FILE *fp)
-{
-	return fgetwc_l(fp, __get_locale());
-}
-
-/*
- * Internal (non-MPSAFE) version of fgetwc().  This version takes an
- * mbstate_t argument specifying the initial conversion state.  For
- * wide streams, this should always be fp->_mbstate.  On return, *nread
- * is set to the number of bytes read.
- */
-wint_t 
-__fgetwc_mbs(FILE *fp, mbstate_t *mbs, int *nread, locale_t locale)
-{
-	wchar_t wc;
-	size_t nconv;
-	struct xlocale_ctype *l = XLOCALE_CTYPE(locale);
-
-	if (fp->_r <= 0 && __srefill(fp)) {
-		*nread = 0;
-		return (WEOF);
-	}
-	if (MB_CUR_MAX == 1) {
-		/* Fast path for single-byte encodings. */
-		wc = *fp->_p++;
-		fp->_r--;
-		*nread = 1;
-		return (wc);
-	}
-	*nread = 0;
-	do {
-		nconv = l->__mbrtowc(&wc, fp->_p, fp->_r, mbs);
-		if (nconv == (size_t)-1)
-			break;
-		else if (nconv == (size_t)-2)
-			continue;
-		else if (nconv == 0) {
-			fp->_p++;
-			fp->_r--;
-			(*nread)++;
-			return (L'\0');
-		} else {
-			fp->_p += nconv;
-			fp->_r -= nconv;
-			*nread += nconv;
-			return (wc);
-		}
-	} while (__srefill(fp) == 0);
-	fp->_flags |= __SERR;
-	errno = EILSEQ;
-	return (WEOF);
-}
diff --git a/lib/libc_bsd/stdio/fgetwln.3 b/lib/libc_bsd/stdio/fgetwln.3
deleted file mode 100644
index 6c7d563..0000000
--- a/lib/libc_bsd/stdio/fgetwln.3
+++ /dev/null
@@ -1,116 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)fgetln.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fgetwln.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd July 16, 2004
-.Dt FGETWLN 3
-.Os
-.Sh NAME
-.Nm fgetwln
-.Nd get a line of wide characters from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft wchar_t *
-.Fn fgetwln "FILE * restrict stream" "size_t * restrict len"
-.Sh DESCRIPTION
-The
-.Fn fgetwln
-function
-returns a pointer to the next line from the stream referenced by
-.Fa stream .
-This line is
-.Em not
-a standard wide character string as it does not end with a terminating
-null wide character.
-The length of the line, including the final newline,
-is stored in the memory location to which
-.Fa len
-points.
-(Note, however, that if the line is the last
-in a file that does not end in a newline,
-the returned text will not contain a newline.)
-.Sh RETURN VALUES
-Upon successful completion a pointer is returned;
-this pointer becomes invalid after the next
-.Tn I/O
-operation on
-.Fa stream
-(whether successful or not)
-or as soon as the stream is closed.
-Otherwise,
-.Dv NULL
-is returned.
-The
-.Fn fgetwln
-function
-does not distinguish between end-of-file and error; the routines
-.Xr feof 3
-and
-.Xr ferror 3
-must be used
-to determine which occurred.
-If an error occurs, the global variable
-.Va errno
-is set to indicate the error.
-The end-of-file condition is remembered, even on a terminal, and all
-subsequent attempts to read will return
-.Dv NULL
-until the condition is
-cleared with
-.Xr clearerr 3 .
-.Pp
-The text to which the returned pointer points may be modified,
-provided that no changes are made beyond the returned size.
-These changes are lost as soon as the pointer becomes invalid.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa stream
-is not a stream open for reading.
-.El
-.Pp
-The
-.Fn fgetwln
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr mbrtowc 3 ,
-.Xr realloc 3 ,
-or
-.Xr read 2 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fgetln 3 ,
-.Xr fgetws 3 ,
-.Xr fopen 3
diff --git a/lib/libc_bsd/stdio/fgetwln.c b/lib/libc_bsd/stdio/fgetwln.c
deleted file mode 100644
index be17fa7..0000000
--- a/lib/libc_bsd/stdio/fgetwln.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fgetwln.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "xlocale_private.h"
-
-wchar_t *
-fgetwln_l(FILE * __restrict fp, size_t *lenp, locale_t locale)
-{
-	wint_t wc;
-	size_t len;
-	FIX_LOCALE(locale);
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-
-	len = 0;
-	while ((wc = __fgetwc(fp, locale)) != WEOF) {
-#define	GROW	512
-		if (len * sizeof(wchar_t) >= fp->_lb._size &&
-		    __slbexpand(fp, (len + GROW) * sizeof(wchar_t)))
-			goto error;
-		*((wchar_t *)fp->_lb._base + len++) = wc;
-		if (wc == L'\n')
-			break;
-	}
-	if (len == 0)
-		goto error;
-
-	FUNLOCKFILE(fp);
-	*lenp = len;
-	return ((wchar_t *)fp->_lb._base);
-
-error:
-	FUNLOCKFILE(fp);
-	*lenp = 0;
-	return (NULL);
-}
-wchar_t *
-fgetwln(FILE * __restrict fp, size_t *lenp)
-{
-	return fgetwln_l(fp, lenp, __get_locale());
-}
diff --git a/lib/libc_bsd/stdio/fgetws.3 b/lib/libc_bsd/stdio/fgetws.3
deleted file mode 100644
index 447ad9c..0000000
--- a/lib/libc_bsd/stdio/fgetws.3
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fgets.3	8.1 (Berkeley) 6/4/93
-.\" FreeBSD: src/lib/libc/stdio/fgets.3,v 1.16 2002/05/31 05:01:17 archie Exp
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fgetws.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd August 6, 2002
-.Dt FGETWS 3
-.Os
-.Sh NAME
-.Nm fgetws
-.Nd get a line of wide characters from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft "wchar_t *"
-.Fn fgetws "wchar_t * restrict ws" "int n" "FILE * restrict fp"
-.Sh DESCRIPTION
-The
-.Fn fgetws
-function
-reads at most one less than the number of characters specified by
-.Fa n
-from the given
-.Fa fp
-and stores them in the wide character string
-.Fa ws .
-Reading stops when a newline character is found,
-at end-of-file or error.
-The newline, if any, is retained.
-If any characters are read and there is no error, a
-.Ql \e0
-character is appended to end the string.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn fgetws
-returns
-.Fa ws .
-If end-of-file occurs before any characters are read,
-.Fn fgetws
-returns
-.Dv NULL
-and the buffer contents remain unchanged.
-If an error occurs,
-.Fn fgetws
-returns
-.Dv NULL
-and the buffer contents are indeterminate.
-The
-.Fn fgetws
-function
-does not distinguish between end-of-file and error, and callers must use
-.Xr feof 3
-and
-.Xr ferror 3
-to determine which occurred.
-.Sh ERRORS
-The
-.Fn fgetws
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The given
-.Fa fp
-argument is not a readable stream.
-.It Bq Er EILSEQ
-The data obtained from the input stream does not form a valid
-multibyte character.
-.El
-.Pp
-The function
-.Fn fgetws
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr fflush 3 ,
-.Xr fstat 2 ,
-.Xr read 2 ,
-or
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr feof 3 ,
-.Xr ferror 3 ,
-.Xr fgets 3
-.Sh STANDARDS
-The
-.Fn fgetws
-function
-conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/stdio/fgetws.c b/lib/libc_bsd/stdio/fgetws.c
deleted file mode 100644
index 51cb530..0000000
--- a/lib/libc_bsd/stdio/fgetws.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fgetws.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-
-wchar_t *
-fgetws_l(wchar_t * __restrict ws, int n, FILE * __restrict fp, locale_t locale)
-{
-	wchar_t *wsp;
-	size_t nconv;
-	const char *src;
-	unsigned char *nl;
-	FIX_LOCALE(locale);
-	struct xlocale_ctype *l = XLOCALE_CTYPE(locale);
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-
-	if (n <= 0) {
-		errno = EINVAL;
-		goto error;
-	}
-
-	if (fp->_r <= 0 && __srefill(fp))
-		/* EOF */
-		goto error;
-	wsp = ws;
-	do {
-		src = fp->_p;
-		nl = memchr(fp->_p, '\n', fp->_r);
-		nconv = l->__mbsnrtowcs(wsp, &src,
-		    nl != NULL ? (nl - fp->_p + 1) : fp->_r,
-		    n - 1, &fp->_mbstate);
-		if (nconv == (size_t)-1)
-			/* Conversion error */
-			goto error;
-		if (src == NULL) {
-			/*
-			 * We hit a null byte. Increment the character count,
-			 * since mbsnrtowcs()'s return value doesn't include
-			 * the terminating null, then resume conversion
-			 * after the null.
-			 */
-			nconv++;
-			src = memchr(fp->_p, '\0', fp->_r);
-			src++;
-		}
-		fp->_r -= (unsigned char *)src - fp->_p;
-		fp->_p = (unsigned char *)src;
-		n -= nconv;
-		wsp += nconv;
-	} while (wsp[-1] != L'\n' && n > 1 && (fp->_r > 0 ||
-	    __srefill(fp) == 0));
-	if (wsp == ws)
-		/* EOF */
-		goto error;
-	if (!l->__mbsinit(&fp->_mbstate))
-		/* Incomplete character */
-		goto error;
-	*wsp = L'\0';
-	FUNLOCKFILE(fp);
-
-	return (ws);
-
-error:
-	FUNLOCKFILE(fp);
-	return (NULL);
-}
-wchar_t *
-fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
-{
-	return fgetws_l(ws, n, fp, __get_locale());
-}
diff --git a/lib/libc_bsd/stdio/fileno.c b/lib/libc_bsd/stdio/fileno.c
deleted file mode 100644
index 5c3c5d1..0000000
--- a/lib/libc_bsd/stdio/fileno.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fileno.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fileno.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#undef fileno
-#undef fileno_unlocked
-
-int
-fileno(FILE *fp)
-{
-	int fd;
-
-	FLOCKFILE(fp);
-	fd = __sfileno(fp);
-	FUNLOCKFILE(fp);
-
-	return (fd);
-}
-
-int
-fileno_unlocked(FILE *fp)
-{
-
-	return (__sfileno(fp));
-}
diff --git a/lib/libc_bsd/stdio/findfp.c b/lib/libc_bsd/stdio/findfp.c
deleted file mode 100644
index 4e1a140..0000000
--- a/lib/libc_bsd/stdio/findfp.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)findfp.c	8.2 (Berkeley) 1/4/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/findfp.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <sys/param.h>
-#include <machine/atomic.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <spinlock.h>
-
-#include "libc_private.h"
-#include "local.h"
-#include "glue.h"
-
-int	__sdidinit;
-
-#define	NDYNAMIC 10		/* add ten more whenever necessary */
-
-#define	std(flags, file) {		\
-	._flags = (flags),		\
-	._file = (file),		\
-	._cookie = __sF + (file),	\
-	._close = __sclose,		\
-	._read = __sread,		\
-	._seek = __sseek,		\
-	._write = __swrite,		\
-	._fl_mutex = PTHREAD_MUTEX_INITIALIZER, \
-}
-				/* the usual - (stdin + stdout + stderr) */
-static FILE usual[FOPEN_MAX - 3];
-static struct glue uglue = { NULL, FOPEN_MAX - 3, usual };
-
-static FILE __sF[3] = {
-	std(__SRD, STDIN_FILENO),
-	std(__SWR, STDOUT_FILENO),
-	std(__SWR|__SNBF, STDERR_FILENO)
-};
-
-FILE *__stdinp = &__sF[0];
-FILE *__stdoutp = &__sF[1];
-FILE *__stderrp = &__sF[2];
-
-struct glue __sglue = { &uglue, 3, __sF };
-static struct glue *lastglue = &uglue;
-
-static struct glue *	moreglue(int);
-
-spinlock_t __stdio_thread_lock = _SPINLOCK_INITIALIZER;
-
-#if NOT_YET
-#define	SET_GLUE_PTR(ptr, val)	atomic_set_rel_ptr(&(ptr), (uintptr_t)(val))
-#else
-#define	SET_GLUE_PTR(ptr, val)	ptr = val
-#endif
-
-static struct glue *
-moreglue(int n)
-{
-	struct glue *g;
-	static FILE empty = { ._fl_mutex = PTHREAD_MUTEX_INITIALIZER };
-	FILE *p;
-
-	g = (struct glue *)malloc(sizeof(*g) + ALIGNBYTES + n * sizeof(FILE));
-	if (g == NULL)
-		return (NULL);
-	p = (FILE *)ALIGN(g + 1);
-	g->next = NULL;
-	g->niobs = n;
-	g->iobs = p;
-	while (--n >= 0)
-		*p++ = empty;
-	return (g);
-}
-
-/*
- * Find a free FILE for fopen et al.
- */
-FILE *
-__sfp()
-{
-	FILE	*fp;
-	int	n;
-	struct glue *g;
-
-	if (!__sdidinit)
-		__sinit();
-	/*
-	 * The list must be locked because a FILE may be updated.
-	 */
-	STDIO_THREAD_LOCK();
-	for (g = &__sglue; g != NULL; g = g->next) {
-		for (fp = g->iobs, n = g->niobs; --n >= 0; fp++)
-			if (fp->_flags == 0)
-				goto found;
-	}
-	STDIO_THREAD_UNLOCK();	/* don't hold lock while malloc()ing. */
-	if ((g = moreglue(NDYNAMIC)) == NULL)
-		return (NULL);
-	STDIO_THREAD_LOCK();	/* reacquire the lock */
-	SET_GLUE_PTR(lastglue->next, g); /* atomically append glue to list */
-	lastglue = g;		/* not atomic; only accessed when locked */
-	fp = g->iobs;
-found:
-	fp->_flags = 1;		/* reserve this slot; caller sets real flags */
-	STDIO_THREAD_UNLOCK();
-	fp->_p = NULL;		/* no current pointer */
-	fp->_w = 0;		/* nothing to read or write */
-	fp->_r = 0;
-	fp->_bf._base = NULL;	/* no buffer */
-	fp->_bf._size = 0;
-	fp->_lbfsize = 0;	/* not line buffered */
-	fp->_file = -1;		/* no file */
-/*	fp->_cookie = <any>; */	/* caller sets cookie, _read/_write etc */
-	fp->_ub._base = NULL;	/* no ungetc buffer */
-	fp->_ub._size = 0;
-	fp->_lb._base = NULL;	/* no line buffer */
-	fp->_lb._size = 0;
-/*	fp->_fl_mutex = NULL; */ /* once set always set (reused) */
-	fp->_orientation = 0;
-	memset(&fp->_mbstate, 0, sizeof(mbstate_t));
-	return (fp);
-}
-
-/*
- * XXX.  Force immediate allocation of internal memory.  Not used by stdio,
- * but documented historically for certain applications.  Bad applications.
- */
-__warn_references(f_prealloc, 
-	"warning: this program uses f_prealloc(), which is not recommended.");
-
-void
-f_prealloc(void)
-{
-	struct glue *g;
-	int n;
-
-	n = getdtablesize() - FOPEN_MAX + 20;		/* 20 for slop. */
-	/*
-	 * It should be safe to walk the list without locking it;
-	 * new nodes are only added to the end and none are ever
-	 * removed.
-	 */
-	for (g = &__sglue; (n -= g->niobs) > 0 && g->next; g = g->next)
-		/* void */;
-	if ((n > 0) && ((g = moreglue(n)) != NULL)) {
-		STDIO_THREAD_LOCK();
-		SET_GLUE_PTR(lastglue->next, g);
-		lastglue = g;
-		STDIO_THREAD_UNLOCK();
-	}
-}
-
-/*
- * exit() calls _cleanup() through *__cleanup, set whenever we
- * open or buffer a file.  This chicanery is done so that programs
- * that do not use stdio need not link it all in.
- *
- * The name `_cleanup' is, alas, fairly well known outside stdio.
- */
-void
-_cleanup()
-{
-	/* (void) _fwalk(fclose); */
-	(void) _fwalk(__sflush);		/* `cheating' */
-}
-
-/*
- * __sinit() is called whenever stdio's internal variables must be set up.
- */
-void
-__sinit()
-{
-
-	/* Make sure we clean up on exit. */
-	__cleanup = _cleanup;		/* conservative */
-	__sdidinit = 1;
-}
diff --git a/lib/libc_bsd/stdio/flags.c b/lib/libc_bsd/stdio/flags.c
deleted file mode 100644
index b76fe6e..0000000
--- a/lib/libc_bsd/stdio/flags.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)flags.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/flags.c 255303 2013-09-06 13:47:16Z jilles $");
-
-#include <sys/types.h>
-#include <sys/file.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include "local.h"
-
-/*
- * Return the (stdio) flags for a given mode.  Store the flags
- * to be passed to an _open() syscall through *optr.
- * Return 0 on error.
- */
-int
-__sflags(const char *mode, int *optr)
-{
-	int ret, m, o, known;
-
-	switch (*mode++) {
-
-	case 'r':	/* open for reading */
-		ret = __SRD;
-		m = O_RDONLY;
-		o = 0;
-		break;
-
-	case 'w':	/* open for writing */
-		ret = __SWR;
-		m = O_WRONLY;
-		o = O_CREAT | O_TRUNC;
-		break;
-
-	case 'a':	/* open for appending */
-		ret = __SWR;
-		m = O_WRONLY;
-		o = O_CREAT | O_APPEND;
-		break;
-
-	default:	/* illegal mode */
-		errno = EINVAL;
-		return (0);
-	}
-
-	do {
-		known = 1;
-		switch (*mode++) {
-		case 'b':
-			/* 'b' (binary) is ignored */
-			break;
-		case '+':
-			/* [rwa][b]\+ means read and write */
-			ret = __SRW;
-			m = O_RDWR;
-			break;
-		case 'x':
-			/* 'x' means exclusive (fail if the file exists) */
-			o |= O_EXCL;
-			break;
-		case 'e':
-			/* set close-on-exec */
-			o |= O_CLOEXEC;
-			break;
-		default:
-			known = 0;
-			break;
-		}
-	} while (known);
-
-	if ((o & O_EXCL) != 0 && m == O_RDONLY) {
-		errno = EINVAL;
-		return (0);
-	}
-
-	*optr = m | o;
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/floatio.h b/lib/libc_bsd/stdio/floatio.h
deleted file mode 100644
index 4784feb..0000000
--- a/lib/libc_bsd/stdio/floatio.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- * 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.
- *
- *	@(#)floatio.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: releng/10.2/lib/libc/stdio/floatio.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-/*
- * Floating point scanf/printf (input/output) definitions.
- */
-
-/*
- * MAXEXPDIG is the maximum number of decimal digits needed to store a
- * floating point exponent in the largest supported format.  It should
- * be ceil(log10(LDBL_MAX_10_EXP)) or, if hexadecimal floating point
- * conversions are supported, ceil(log10(LDBL_MAX_EXP)).  But since it
- * is presently never greater than 5 in practice, we fudge it.
- */
-#define	MAXEXPDIG	6
-#if LDBL_MAX_EXP > 999999
-#error "floating point buffers too small"
-#endif
-
-char *__hdtoa(double, const char *, int, int *, int *, char **);
-char *__hldtoa(long double, const char *, int, int *, int *, char **);
-char *__ldtoa(long double *, int, int, int *, int *, char **);
diff --git a/lib/libc_bsd/stdio/flockfile.3 b/lib/libc_bsd/stdio/flockfile.3
deleted file mode 100644
index b3b5f67..0000000
--- a/lib/libc_bsd/stdio/flockfile.3
+++ /dev/null
@@ -1,104 +0,0 @@
-.\" Copyright (c) 2003 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/stdio/flockfile.3 109154 2003-01-13 01:29:14Z tjr $
-.\"
-.Dd January 10, 2003
-.Dt FLOCKFILE 3
-.Os
-.Sh NAME
-.Nm flockfile ,
-.Nm ftrylockfile ,
-.Nm funlockfile
-.Nd "stdio locking functions"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft void
-.Fn flockfile "FILE *stream"
-.Ft int
-.Fn ftrylockfile "FILE *stream"
-.Ft void
-.Fn funlockfile "FILE *stream"
-.Sh DESCRIPTION
-These functions provide explicit application-level locking of stdio streams.
-They can be used to avoid output from multiple threads being interspersed,
-input being dispersed among multiple readers, and to avoid the overhead
-of locking the stream for each operation.
-.Pp
-The
-.Fn flockfile
-function acquires an exclusive lock on the specified stream.
-If another thread has already locked the stream,
-.Fn flockfile
-will block until the lock is released.
-.Pp
-The
-.Fn ftrylockfile
-function is a non-blocking version of
-.Fn flockfile ;
-if the lock cannot be acquired immediately,
-.Fn ftrylockfile
-returns non-zero instead of blocking.
-.Pp
-The
-.Fn funlockfile
-function releases the lock on a stream acquired by an earlier call to
-.Fn flockfile
-or
-.Fn ftrylockfile .
-.Pp
-These functions behave as if there is a lock count associated
-with each stream.
-Each time
-.Fn flockfile
-is called on the stream, the count is incremented,
-and each time
-.Fn funlockfile
-is called on the stream, the count is decremented.
-The lock is only actually released when the count reaches zero.
-.Sh RETURN VALUES
-The
-.Fn flockfile
-and
-.Fn funlockfile
-functions return no value.
-.Pp
-The
-.Fn ftrylockfile
-function
-returns zero if the stream was successfully locked,
-non-zero otherwise.
-.Sh SEE ALSO
-.Xr getc_unlocked 3 ,
-.Xr putc_unlocked 3
-.Sh STANDARDS
-The
-.Fn flockfile ,
-.Fn ftrylockfile
-and
-.Fn funlockfile
-functions conform to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/stdio/fmemopen.c b/lib/libc_bsd/stdio/fmemopen.c
deleted file mode 100644
index 456c7b6..0000000
--- a/lib/libc_bsd/stdio/fmemopen.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*-
- * Copyright (C) 2013 Pietro Cerutti <gahr@FreeBSD.org>
- * 
- * 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.
- * 
- * THIS SOFTWARE IS PROVIDED BY 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fmemopen.c 277016 2015-01-11 19:15:28Z ngie $");
-
-#include <fcntl.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include "local.h"
-
-struct fmemopen_cookie
-{
-	char	*buf;	/* pointer to the memory region */
-	bool	 own;	/* did we allocate the buffer ourselves? */
-	char     bin;   /* is this a binary buffer? */
-	size_t	 size;	/* buffer length in bytes */
-	size_t	 len;	/* data length in bytes */
-	size_t	 off;	/* current offset into the buffer */
-};
-
-static int	fmemopen_read(void *cookie, char *buf, int nbytes);
-static int	fmemopen_write(void *cookie, const char *buf, int nbytes);
-static fpos_t	fmemopen_seek(void *cookie, fpos_t offset, int whence);
-static int	fmemopen_close(void *cookie);
-
-FILE *
-fmemopen(void * __restrict buf, size_t size, const char * __restrict mode)
-{
-	struct fmemopen_cookie *ck;
-	FILE *f;
-	int flags, rc;
-
-	/*
-	 * POSIX says we shall return EINVAL if size is 0.
-	 */
-	if (size == 0) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/*
-	 * Retrieve the flags as used by open(2) from the mode argument, and
-	 * validate them.
-	 */
-	rc = __sflags(mode, &flags);
-	if (rc == 0) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/*
-	 * There's no point in requiring an automatically allocated buffer
-	 * in write-only mode.
-	 */
-	if (!(flags & O_RDWR) && buf == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	
-	ck = malloc(sizeof(struct fmemopen_cookie));
-	if (ck == NULL) {
-		return (NULL);
-	}
-
-	ck->off  = 0;
-	ck->size = size;
-
-	/* Check whether we have to allocate the buffer ourselves. */
-	ck->own = ((ck->buf = buf) == NULL);
-	if (ck->own) {
-		ck->buf = malloc(size);
-		if (ck->buf == NULL) {
-			free(ck);
-			return (NULL);
-		}
-	}
-
-	/*
-	 * POSIX distinguishes between w+ and r+, in that w+ is supposed to
-	 * truncate the buffer.
-	 */
-	if (ck->own || mode[0] == 'w') {
-		ck->buf[0] = '\0';
-	}
-
-	/* Check for binary mode. */
-	ck->bin = strchr(mode, 'b') != NULL;
-
-	/*
-	 * The size of the current buffer contents is set depending on the
-	 * mode:
-	 * 
-	 * for append (text-mode), the position of the first NULL byte, or the
-	 * size of the buffer if none is found
-	 *
-	 * for append (binary-mode), the size of the buffer
-	 * 
-	 * for read, the size of the buffer
-	 * 
-	 * for write, 0
-	 */
-	switch (mode[0]) {
-	case 'a':
-		ck->off = ck->len = strnlen(ck->buf, ck->size);
-		break;
-	case 'r':
-		ck->len = size;
-		break;
-	case 'w':
-		ck->len = 0;
-		break;
-	}
-
-	f = funopen(ck,
-	    flags & O_WRONLY ? NULL : fmemopen_read, 
-	    flags & O_RDONLY ? NULL : fmemopen_write,
-	    fmemopen_seek, fmemopen_close);
-
-	if (f == NULL) {
-		if (ck->own)
-			free(ck->buf);
-		free(ck);
-		return (NULL);
-	}
-
-	/*
-	 * Turn off buffering, so a write past the end of the buffer
-	 * correctly returns a short object count.
-	 */
-	setvbuf(f, NULL, _IONBF, 0);
-
-	return (f);
-}
-
-static int
-fmemopen_read(void *cookie, char *buf, int nbytes)
-{
-	struct fmemopen_cookie *ck = cookie;
-
-	if (nbytes > ck->len - ck->off)
-		nbytes = ck->len - ck->off;
-
-	if (nbytes == 0)
-		return (0);
-
-	memcpy(buf, ck->buf + ck->off, nbytes);
-
-	ck->off += nbytes;
-
-	return (nbytes);
-}
-
-static int
-fmemopen_write(void *cookie, const char *buf, int nbytes)
-{
-	struct fmemopen_cookie *ck = cookie;
-
-	if (nbytes > ck->size - ck->off)
-		nbytes = ck->size - ck->off;
-
-	if (nbytes == 0)
-		return (0);
-
-	memcpy(ck->buf + ck->off, buf, nbytes);
-
-	ck->off += nbytes;
-
-	if (ck->off > ck->len)
-		ck->len = ck->off;
-
-	/*
-	 * We append a NULL byte if all these conditions are met:
-	 * - the buffer is not binary
-	 * - the buffer is not full
-	 * - the data just written doesn't already end with a NULL byte
-	 */
-	if (!ck->bin && ck->off < ck->size && ck->buf[ck->off - 1] != '\0')
-		ck->buf[ck->off] = '\0';
-
-	return (nbytes);
-}
-
-static fpos_t
-fmemopen_seek(void *cookie, fpos_t offset, int whence)
-{
-	struct fmemopen_cookie *ck = cookie;
-
-
-	switch (whence) {
-	case SEEK_SET:
-		if (offset > ck->size) {
-			errno = EINVAL;
-			return (-1);
-		}
-		ck->off = offset;
-		break;
-
-	case SEEK_CUR:
-		if (ck->off + offset > ck->size) {
-			errno = EINVAL;
-			return (-1);
-		}
-		ck->off += offset;
-		break;
-
-	case SEEK_END:
-		if (offset > 0 || -offset > ck->len) {
-			errno = EINVAL;
-			return (-1);
-		}
-		ck->off = ck->len + offset;
-		break;
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-
-	return (ck->off);
-}
-
-static int
-fmemopen_close(void *cookie)
-{
-	struct fmemopen_cookie *ck = cookie;
-
-	if (ck->own)
-		free(ck->buf);
-
-	free(ck);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/stdio/fopen.3 b/lib/libc_bsd/stdio/fopen.3
deleted file mode 100644
index a1c16e2..0000000
--- a/lib/libc_bsd/stdio/fopen.3
+++ /dev/null
@@ -1,347 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fopen.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fopen.3 277016 2015-01-11 19:15:28Z ngie $
-.\"
-.Dd January 30, 2013
-.Dt FOPEN 3
-.Os
-.Sh NAME
-.Nm fopen ,
-.Nm fdopen ,
-.Nm freopen ,
-.Nm fmemopen
-.Nd stream open functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn fopen "const char * restrict path" "const char * restrict mode"
-.Ft FILE *
-.Fn fdopen "int fildes" "const char *mode"
-.Ft FILE *
-.Fn freopen "const char *path" "const char *mode" "FILE *stream"
-.Ft FILE *
-.Fn fmemopen "void *restrict *buf" "size_t size" "const char * restrict mode"
-.Sh DESCRIPTION
-The
-.Fn fopen
-function
-opens the file whose name is the string pointed to by
-.Fa path
-and associates a stream with it.
-.Pp
-The argument
-.Fa mode
-points to a string beginning with one of the following letters:
-.Bl -tag -width indent
-.It Dq Li r
-Open for reading.
-The stream is positioned at the beginning of the file.
-Fail if the file does not exist.
-.It Dq Li w
-Open for writing.
-The stream is positioned at the beginning of the file.
-Create the file if it does not exist.
-.It Dq Li a
-Open for writing.
-The stream is positioned at the end of the file.
-Subsequent writes to the file will always end up at the then current
-end of file, irrespective of any intervening
-.Xr fseek 3
-or similar.
-Create the file if it does not exist.
-.El
-.Pp
-An optional
-.Dq Li +
-following
-.Dq Li r ,
-.Dq Li w ,
-or
-.Dq Li a
-opens the file for both reading and writing.
-An optional
-.Dq Li x
-following
-.Dq Li w
-or
-.Dq Li w+
-causes the
-.Fn fopen
-call to fail if the file already exists.
-An optional
-.Dq Li e
-following the above
-causes the
-.Fn fopen
-call to set the
-.Dv FD_CLOEXEC
-flag on the underlying file descriptor.
-.Pp
-The
-.Fa mode
-string can also include the letter
-.Dq Li b
-after either the
-.Dq Li +
-or the first letter.
-This is strictly for compatibility with
-.St -isoC
-and has effect only for
-.Fn fmemopen
-; otherwise the ``b'' is ignored.
-.Pp
-Any created files will have mode
-.Do Dv S_IRUSR
-\&|
-.Dv S_IWUSR
-\&|
-.Dv S_IRGRP
-\&|
-.Dv S_IWGRP
-\&|
-.Dv S_IROTH
-\&|
-.Dv S_IWOTH Dc
-.Pq Li 0666 ,
-as modified by the process'
-umask value (see
-.Xr umask 2 ) .
-.Pp
-Reads and writes may be intermixed on read/write streams in any order,
-and do not require an intermediate seek as in previous versions of
-.Em stdio .
-This is not portable to other systems, however;
-.Tn ANSI C
-requires that
-a file positioning function intervene between output and input, unless
-an input operation encounters end-of-file.
-.Pp
-The
-.Fn fdopen
-function associates a stream with the existing file descriptor,
-.Fa fildes .
-The mode
-of the stream must be compatible with the mode of the file descriptor.
-The
-.Dq Li x
-mode option is ignored.
-If the
-.Dq Li e
-mode option is present, the
-.Dv FD_CLOEXEC
-flag is set, otherwise it remains unchanged.
-When the stream is closed via
-.Xr fclose 3 ,
-.Fa fildes
-is closed also.
-.Pp
-The
-.Fn freopen
-function
-opens the file whose name is the string pointed to by
-.Fa path
-and associates the stream pointed to by
-.Fa stream
-with it.
-The original stream (if it exists) is closed.
-The
-.Fa mode
-argument is used just as in the
-.Fn fopen
-function.
-.Pp
-If the
-.Fa path
-argument is
-.Dv NULL ,
-.Fn freopen
-attempts to re-open the file associated with
-.Fa stream
-with a new mode.
-The new mode must be compatible with the mode that the stream was originally
-opened with:
-Streams open for reading can only be re-opened for reading,
-streams open for writing can only be re-opened for writing,
-and streams open for reading and writing can be re-opened in any mode.
-The
-.Dq Li x
-mode option is not meaningful in this context.
-.Pp
-The primary use of the
-.Fn freopen
-function
-is to change the file associated with a
-standard text stream
-.Dv ( stderr , stdin ,
-or
-.Dv stdout ) .
-.Pp
-The
-.Fn fmemopen
-function
-associates the buffer given by the
-.Fa buf
-and
-.Fa size
-arguments with a stream.
-The
-.Fa buf
-argument is either a null pointer or point to a buffer that
-is at least
-.Fa size
-bytes long.
-If a null pointer is specified as the
-.Fa buf
-argument,
-.Fn fmemopen
-allocates
-.Fa size
-bytes of memory. This buffer is automatically freed when the
-stream is closed. Buffers can be opened in text-mode (default) or binary-mode
-(if ``b'' is present in the second or third position of the
-.Fa mode
-argument). Buffers opened in text-mode make sure that writes are terminated with
-a NULL byte, if the last write hasn't filled up the whole buffer. Buffers
-opened in binary-mode never append a NULL byte.
-.Sh RETURN VALUES
-Upon successful completion
-.Fn fopen ,
-.Fn fdopen
-and
-.Fn freopen
-return a
-.Tn FILE
-pointer.
-Otherwise,
-.Dv NULL
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa mode
-argument
-to
-.Fn fopen ,
-.Fn fdopen ,
-.Fn freopen ,
-or
-.Fn fmemopen
-was invalid.
-.El
-.Pp
-The
-.Fn fopen ,
-.Fn fdopen ,
-.Fn freopen
-and
-.Fn fmemopen
-functions
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr malloc 3 .
-.Pp
-The
-.Fn fopen
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr open 2 .
-.Pp
-The
-.Fn fdopen
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr fcntl 2 .
-.Pp
-The
-.Fn freopen
-function
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr open 2 ,
-.Xr fclose 3
-and
-.Xr fflush 3 .
-.Pp
-The
-.Fn fmemopen
-function
-may also fail and set
-.Va errno
-if the
-.Fa size
-argument is 0.
-.Sh SEE ALSO
-.Xr open 2 ,
-.Xr fclose 3 ,
-.Xr fileno 3 ,
-.Xr fseek 3 ,
-.Xr funopen 3
-.Sh STANDARDS
-The
-.Fn fopen
-and
-.Fn freopen
-functions
-conform to
-.St -isoC ,
-with the exception of the
-.Dq Li x
-mode option which conforms to
-.St -isoC-2011 .
-The
-.Fn fdopen
-function
-conforms to
-.St -p1003.1-88 .
-The
-.Dq Li e
-mode option does not conform to any standard
-but is also supported by glibc.
-The
-.Fn fmemopen
-function
-conforms to
-.St -p1003.1-2008 .
-The ``b'' mode does not conform to any standard
-but is also supported by glibc.
diff --git a/lib/libc_bsd/stdio/fopen.c b/lib/libc_bsd/stdio/fopen.c
deleted file mode 100644
index f9217ff..0000000
--- a/lib/libc_bsd/stdio/fopen.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fopen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fopen.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <errno.h>
-#include <limits.h>
-#include "un-namespace.h"
-
-#include "local.h"
-
-FILE *
-fopen(const char * __restrict file, const char * __restrict mode)
-{
-	FILE *fp;
-	int f;
-	int flags, oflags;
-
-	if ((flags = __sflags(mode, &oflags)) == 0)
-		return (NULL);
-	if ((fp = __sfp()) == NULL)
-		return (NULL);
-	if ((f = _open(file, oflags, DEFFILEMODE)) < 0) {
-		fp->_flags = 0;			/* release */
-		return (NULL);
-	}
-	/*
-	 * File descriptors are a full int, but _file is only a short.
-	 * If we get a valid file descriptor that is greater than
-	 * SHRT_MAX, then the fd will get sign-extended into an
-	 * invalid file descriptor.  Handle this case by failing the
-	 * open.
-	 */
-	if (f > SHRT_MAX) {
-		fp->_flags = 0;			/* release */
-		_close(f);
-		errno = EMFILE;
-		return (NULL);
-	}
-	fp->_file = f;
-	fp->_flags = flags;
-	fp->_cookie = fp;
-	fp->_read = __sread;
-	fp->_write = __swrite;
-	fp->_seek = __sseek;
-	fp->_close = __sclose;
-	/*
-	 * When opening in append mode, even though we use O_APPEND,
-	 * we need to seek to the end so that ftell() gets the right
-	 * answer.  If the user then alters the seek pointer, or
-	 * the file extends, this will fail, but there is not much
-	 * we can do about this.  (We could set __SAPP and check in
-	 * fseek and ftell.)
-	 */
-	if (oflags & O_APPEND)
-		(void)_sseek(fp, (fpos_t)0, SEEK_END);
-	return (fp);
-}
diff --git a/lib/libc_bsd/stdio/fprintf.c b/lib/libc_bsd/stdio/fprintf.c
deleted file mode 100644
index a37b7b2..0000000
--- a/lib/libc_bsd/stdio/fprintf.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fprintf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include <stdarg.h>
-#include "xlocale_private.h"
-
-int
-fprintf(FILE * __restrict fp, const char * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfprintf_l(fp, __get_locale(), fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-int
-fprintf_l(FILE * __restrict fp, locale_t locale, const char * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-	FIX_LOCALE(locale);
-
-	va_start(ap, fmt);
-	ret = vfprintf_l(fp, locale, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/fpurge.c b/lib/libc_bsd/stdio/fpurge.c
deleted file mode 100644
index b9dc1d6..0000000
--- a/lib/libc_bsd/stdio/fpurge.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fpurge.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fpurge.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * fpurge: like fflush, but without writing anything: leave the
- * given FILE's buffer empty.
- */
-int
-fpurge(FILE *fp)
-{
-	int retval;
-	FLOCKFILE(fp);
-	if (!fp->_flags) {
-		errno = EBADF;
-		retval = EOF;
-	} else {
-		if (HASUB(fp))
-			FREEUB(fp);
-		fp->_p = fp->_bf._base;
-		fp->_r = 0;
-		fp->_w = fp->_flags & (__SLBF|__SNBF|__SRD) ? 0 : fp->_bf._size;
-		retval = 0;
-	}
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc_bsd/stdio/fputc.c b/lib/libc_bsd/stdio/fputc.c
deleted file mode 100644
index d0818ea..0000000
--- a/lib/libc_bsd/stdio/fputc.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fputc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fputc.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-int
-fputc(int c, FILE *fp)
-{
-	int retval;
-	FLOCKFILE(fp);
-	/* Orientation set by __sputc() when buffer is full. */
-	/* ORIENT(fp, -1); */
-	retval = __sputc(c, fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc_bsd/stdio/fputs.3 b/lib/libc_bsd/stdio/fputs.3
deleted file mode 100644
index 62d59d7..0000000
--- a/lib/libc_bsd/stdio/fputs.3
+++ /dev/null
@@ -1,104 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fputs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fputs.3 168862 2007-04-19 14:01:04Z phk $
-.\"
-.Dd June 4, 1993
-.Dt FPUTS 3
-.Os
-.Sh NAME
-.Nm fputs ,
-.Nm puts
-.Nd output a line to a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fputs "const char *str" "FILE *stream"
-.Ft int
-.Fn puts "const char *str"
-.Sh DESCRIPTION
-The function
-.Fn fputs
-writes the string pointed to by
-.Fa str
-to the stream pointed to by
-.Fa stream .
-.\" The terminating
-.\" .Dv NUL
-.\" character is not written.
-.Pp
-The function
-.Fn puts
-writes the string
-.Fa str ,
-and a terminating newline character,
-to the stream
-.Dv stdout .
-.Sh RETURN VALUES
-The functions
-.Fn fputs
-and
-.Fn puts
-return a nonnegative integer on success and
-.Dv EOF
-on error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa stream
-argument
-is not a writable stream.
-.El
-.Pp
-The functions
-.Fn fputs
-and
-.Fn puts
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr write 2 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fputws 3 ,
-.Xr putc 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The functions
-.Fn fputs
-and
-.Fn puts
-conform to
-.St -isoC .
diff --git a/lib/libc_bsd/stdio/fputs.c b/lib/libc_bsd/stdio/fputs.c
deleted file mode 100644
index 028a387..0000000
--- a/lib/libc_bsd/stdio/fputs.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fputs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fputs.c 269085 2014-07-25 03:24:00Z pfg $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-#include "local.h"
-
-/*
- * Write the given string to the given file.
- */
-int
-fputs(const char * __restrict s, FILE * __restrict fp)
-{
-	int retval;
-	struct __suio uio;
-	struct __siov iov;
-
-	iov.iov_base = (void *)s;
-	uio.uio_resid = iov.iov_len = strlen(s);
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	retval = __sfvwrite(fp, &uio);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc_bsd/stdio/fputwc.c b/lib/libc_bsd/stdio/fputwc.c
deleted file mode 100644
index af83f5e..0000000
--- a/lib/libc_bsd/stdio/fputwc.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fputwc.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-
-/*
- * Non-MT-safe version.
- */
-wint_t
-__fputwc(wchar_t wc, FILE *fp, locale_t locale)
-{
-	char buf[MB_LEN_MAX];
-	size_t i, len;
-	struct xlocale_ctype *l = XLOCALE_CTYPE(locale);
-
-	if (MB_CUR_MAX == 1 && wc > 0 && wc <= UCHAR_MAX) {
-		/*
-		 * Assume single-byte locale with no special encoding.
-		 * A more careful test would be to check
-		 * _CurrentRuneLocale->encoding.
-		 */
-		*buf = (unsigned char)wc;
-		len = 1;
-	} else {
-		if ((len = l->__wcrtomb(buf, wc, &fp->_mbstate)) == (size_t)-1) {
-			fp->_flags |= __SERR;
-			return (WEOF);
-		}
-	}
-
-	for (i = 0; i < len; i++)
-		if (__sputc((unsigned char)buf[i], fp) == EOF)
-			return (WEOF);
-
-	return ((wint_t)wc);
-}
-
-/*
- * MT-safe version.
- */
-wint_t
-fputwc_l(wchar_t wc, FILE *fp, locale_t locale)
-{
-	wint_t r;
-	FIX_LOCALE(locale);
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	r = __fputwc(wc, fp, locale);
-	FUNLOCKFILE(fp);
-
-	return (r);
-}
-wint_t
-fputwc(wchar_t wc, FILE *fp)
-{
-	return fputwc_l(wc, fp, __get_locale());
-}
diff --git a/lib/libc_bsd/stdio/fputws.3 b/lib/libc_bsd/stdio/fputws.3
deleted file mode 100644
index ae55ef7..0000000
--- a/lib/libc_bsd/stdio/fputws.3
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fputs.3	8.1 (Berkeley) 6/4/93
-.\" FreeBSD: src/lib/libc/stdio/fputs.3,v 1.8 2001/10/01 16:08:59 ru Exp
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fputws.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd August 6, 2002
-.Dt FPUTWS 3
-.Os
-.Sh NAME
-.Nm fputws
-.Nd output a line of wide characters to a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft int
-.Fn fputws "const wchar_t * restrict ws" "FILE * restrict fp"
-.Sh DESCRIPTION
-The
-.Fn fputws
-function writes the wide character string pointed to by
-.Fa ws
-to the stream pointed to by
-.Fa fp .
-.Sh RETURN VALUES
-The
-.Fn fputws
-function
-returns 0 on success and \-1 on error.
-.Sh ERRORS
-The
-.Fn fputws
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fp
-argument supplied
-is not a writable stream.
-.El
-.Pp
-The
-.Fn fputws
-function may also fail and set
-.Va errno
-for any of the errors specified for the routine
-.Xr write 2 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fputs 3 ,
-.Xr putwc 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The
-.Fn fputws
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/stdio/fputws.c b/lib/libc_bsd/stdio/fputws.c
deleted file mode 100644
index d9c37b8..0000000
--- a/lib/libc_bsd/stdio/fputws.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fputws.c 269085 2014-07-25 03:24:00Z pfg $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-
-int
-fputws_l(const wchar_t * __restrict ws, FILE * __restrict fp, locale_t locale)
-{
-	size_t nbytes;
-	char buf[BUFSIZ];
-	struct __suio uio;
-	struct __siov iov;
-	const wchar_t *wsp;
-	FIX_LOCALE(locale);
-	struct xlocale_ctype *l = XLOCALE_CTYPE(locale);
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	if (prepwrite(fp) != 0)
-		goto error;
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-	iov.iov_base = buf;
-	wsp = ws;
-	do {
-		nbytes = l->__wcsnrtombs(buf, &wsp, SIZE_T_MAX, sizeof(buf),
-		    &fp->_mbstate);
-		if (nbytes == (size_t)-1)
-			goto error;
-		uio.uio_resid = iov.iov_len = nbytes;
-		if (__sfvwrite(fp, &uio) != 0)
-			goto error;
-	} while (wsp != NULL);
-	FUNLOCKFILE(fp);
-	return (0);
-
-error:
-	FUNLOCKFILE(fp);
-	return (-1);
-}
-
-int
-fputws(const wchar_t * __restrict ws, FILE * __restrict fp)
-{
-	return fputws_l(ws, fp, __get_locale());
-}
diff --git a/lib/libc_bsd/stdio/fread.3 b/lib/libc_bsd/stdio/fread.3
deleted file mode 100644
index c2f6a71..0000000
--- a/lib/libc_bsd/stdio/fread.3
+++ /dev/null
@@ -1,105 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fread.3	8.2 (Berkeley) 3/8/94
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fread.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd March 8, 1994
-.Dt FREAD 3
-.Os
-.Sh NAME
-.Nm fread ,
-.Nm fwrite
-.Nd binary stream input/output
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft size_t
-.Fn fread "void * restrict ptr" "size_t size" "size_t nmemb" "FILE * restrict stream"
-.Ft size_t
-.Fn fwrite "const void * restrict ptr" "size_t size" "size_t nmemb" "FILE * restrict stream"
-.Sh DESCRIPTION
-The function
-.Fn fread
-reads
-.Fa nmemb
-objects, each
-.Fa size
-bytes long, from the stream pointed to by
-.Fa stream ,
-storing them at the location given by
-.Fa ptr .
-.Pp
-The function
-.Fn fwrite
-writes
-.Fa nmemb
-objects, each
-.Fa size
-bytes long, to the stream pointed to by
-.Fa stream ,
-obtaining them from the location given by
-.Fa ptr .
-.Sh RETURN VALUES
-The functions
-.Fn fread
-and
-.Fn fwrite
-advance the file position indicator for the stream
-by the number of bytes read or written.
-They return the number of objects read or written.
-If an error occurs, or the end-of-file is reached,
-the return value is a short object count (or zero).
-.Pp
-The function
-.Fn fread
-does not distinguish between end-of-file and error, and callers
-must use
-.Xr feof 3
-and
-.Xr ferror 3
-to determine which occurred.
-The function
-.Fn fwrite
-returns a value less than
-.Fa nmemb
-only if a write error has occurred.
-.Sh SEE ALSO
-.Xr read 2 ,
-.Xr write 2
-.Sh STANDARDS
-The functions
-.Fn fread
-and
-.Fn fwrite
-conform to
-.St -isoC .
diff --git a/lib/libc_bsd/stdio/fread.c b/lib/libc_bsd/stdio/fread.c
deleted file mode 100644
index 675fdac..0000000
--- a/lib/libc_bsd/stdio/fread.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fread.c	8.2 (Berkeley) 12/11/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fread.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * MT-safe version
- */
-
-size_t
-fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
-{
-	size_t ret;
-
-	FLOCKFILE(fp);
-	ret = __fread(buf, size, count, fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-size_t
-__fread(void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
-{
-	size_t resid;
-	char *p;
-	int r;
-	size_t total;
-
-	/*
-	 * ANSI and SUSv2 require a return value of 0 if size or count are 0.
-	 */
-	if ((count == 0) || (size == 0))
-		return (0);
-
-	/*
-	 * Check for integer overflow.  As an optimization, first check that
-	 * at least one of {count, size} is at least 2^16, since if both
-	 * values are less than that, their product can't possible overflow
-	 * (size_t is always at least 32 bits on FreeBSD).
-	 */
-	if (((count | size) > 0xFFFF) &&
-	    (count > SIZE_MAX / size)) {
-		errno = EINVAL;
-		fp->_flags |= __SERR;
-		return (0);
-	}
-
-	/*
-	 * Compute the (now required to not overflow) number of bytes to
-	 * read and actually do the work.
-	 */
-	resid = count * size;
-	ORIENT(fp, -1);
-	if (fp->_r < 0)
-		fp->_r = 0;
-	total = resid;
-	p = buf;
-	while (resid > (r = fp->_r)) {
-		(void)memcpy((void *)p, (void *)fp->_p, (size_t)r);
-		fp->_p += r;
-		/* fp->_r = 0 ... done in __srefill */
-		p += r;
-		resid -= r;
-		if (__srefill(fp)) {
-			/* no more input: return partial result */
-			return ((total - resid) / size);
-		}
-	}
-	(void)memcpy((void *)p, (void *)fp->_p, resid);
-	fp->_r -= resid;
-	fp->_p += resid;
-	return (count);
-}
diff --git a/lib/libc_bsd/stdio/freopen.c b/lib/libc_bsd/stdio/freopen.c
deleted file mode 100644
index 36479ee..0000000
--- a/lib/libc_bsd/stdio/freopen.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)freopen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/freopen.c 269624 2014-08-06 10:38:06Z ache $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <limits.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-/*
- * Re-direct an existing, open (probably) file to some other file.
- * ANSI is written such that the original file gets closed if at
- * all possible, no matter what.
- */
-FILE *
-freopen(const char * __restrict file, const char * __restrict mode,
-    FILE * __restrict fp)
-{
-	int f;
-	int dflags, flags, isopen, oflags, sverrno, wantfd;
-
-	if ((flags = __sflags(mode, &oflags)) == 0) {
-		sverrno = errno;
-		(void) fclose(fp);
-		errno = sverrno;
-		return (NULL);
-	}
-
-	FLOCKFILE(fp);
-
-	if (!__sdidinit)
-		__sinit();
-
-	/*
-	 * If the filename is a NULL pointer, the caller is asking us to
-	 * re-open the same file with a different mode. We allow this only
-	 * if the modes are compatible.
-	 */
-	if (file == NULL) {
-		/* See comment below regarding freopen() of closed files. */
-		if (fp->_flags == 0) {
-			FUNLOCKFILE(fp);
-			errno = EINVAL;
-			return (NULL);
-		}
-		if ((dflags = _fcntl(fp->_file, F_GETFL)) < 0) {
-			sverrno = errno;
-			fclose(fp);
-			FUNLOCKFILE(fp);
-			errno = sverrno;
-			return (NULL);
-		}
-		if ((dflags & O_ACCMODE) != O_RDWR && (dflags & O_ACCMODE) !=
-		    (oflags & O_ACCMODE)) {
-			fclose(fp);
-			FUNLOCKFILE(fp);
-			errno = EBADF;
-			return (NULL);
-		}
-		if (fp->_flags & __SWR)
-			(void) __sflush(fp);
-		if ((oflags ^ dflags) & O_APPEND) {
-			dflags &= ~O_APPEND;
-			dflags |= oflags & O_APPEND;
-			if (_fcntl(fp->_file, F_SETFL, dflags) < 0) {
-				sverrno = errno;
-				fclose(fp);
-				FUNLOCKFILE(fp);
-				errno = sverrno;
-				return (NULL);
-			}
-		}
-		if (oflags & O_TRUNC)
-			(void) ftruncate(fp->_file, (off_t)0);
-		if (!(oflags & O_APPEND))
-			(void) _sseek(fp, (fpos_t)0, SEEK_SET);
-		if (oflags & O_CLOEXEC)
-			(void) _fcntl(fp->_file, F_SETFD, FD_CLOEXEC);
-		f = fp->_file;
-		isopen = 0;
-		wantfd = -1;
-		goto finish;
-	}
-
-	/*
-	 * There are actually programs that depend on being able to "freopen"
-	 * descriptors that weren't originally open.  Keep this from breaking.
-	 * Remember whether the stream was open to begin with, and which file
-	 * descriptor (if any) was associated with it.  If it was attached to
-	 * a descriptor, defer closing it; freopen("/dev/stdin", "r", stdin)
-	 * should work.  This is unnecessary if it was not a Unix file.
-	 */
-	if (fp->_flags == 0) {
-		fp->_flags = __SEOF;	/* hold on to it */
-		isopen = 0;
-		wantfd = -1;
-	} else {
-		/* flush the stream; ANSI doesn't require this. */
-		if (fp->_flags & __SWR)
-			(void) __sflush(fp);
-		/* if close is NULL, closing is a no-op, hence pointless */
-		isopen = fp->_close != NULL;
-		if ((wantfd = fp->_file) < 0 && isopen) {
-			(void) (*fp->_close)(fp->_cookie);
-			isopen = 0;
-		}
-	}
-
-	/* Get a new descriptor to refer to the new file. */
-	f = _open(file, oflags, DEFFILEMODE);
-	/* If out of fd's close the old one and try again. */
-	if (f < 0 && isopen && wantfd > STDERR_FILENO &&
-	    (errno == ENFILE || errno == EMFILE)) {
-		(void) (*fp->_close)(fp->_cookie);
-		isopen = 0;
-		wantfd = -1;
-		f = _open(file, oflags, DEFFILEMODE);
-	}
-	sverrno = errno;
-
-finish:
-	/*
-	 * Finish closing fp.  Even if the open succeeded above, we cannot
-	 * keep fp->_base: it may be the wrong size.  This loses the effect
-	 * of any setbuffer calls, but stdio has always done this before.
-	 *
-	 * Leave the existing file descriptor open until dup2() is called
-	 * below to avoid races where a concurrent open() in another thread
-	 * could claim the existing descriptor.
-	 */
-	if (fp->_flags & __SMBF)
-		free((char *)fp->_bf._base);
-	fp->_w = 0;
-	fp->_r = 0;
-	fp->_p = NULL;
-	fp->_bf._base = NULL;
-	fp->_bf._size = 0;
-	fp->_lbfsize = 0;
-	if (HASUB(fp))
-		FREEUB(fp);
-	fp->_ub._size = 0;
-	if (HASLB(fp))
-		FREELB(fp);
-	fp->_lb._size = 0;
-	fp->_orientation = 0;
-	memset(&fp->_mbstate, 0, sizeof(mbstate_t));
-
-	if (f < 0) {			/* did not get it after all */
-		if (isopen)
-			(void) (*fp->_close)(fp->_cookie);
-		fp->_flags = 0;		/* set it free */
-		FUNLOCKFILE(fp);
-		errno = sverrno;	/* restore in case _close clobbered */
-		return (NULL);
-	}
-
-	/*
-	 * If reopening something that was open before on a real file, try
-	 * to maintain the descriptor.  Various C library routines (perror)
-	 * assume stderr is always fd STDERR_FILENO, even if being freopen'd.
-	 */
-	if (wantfd >= 0) {
-		if ((oflags & O_CLOEXEC ? _fcntl(f, F_DUP2FD_CLOEXEC, wantfd) :
-		    _dup2(f, wantfd)) >= 0) {
-			(void)_close(f);
-			f = wantfd;
-		} else
-			(void)_close(fp->_file);
-	}
-
-	/*
-	 * File descriptors are a full int, but _file is only a short.
-	 * If we get a valid file descriptor that is greater than
-	 * SHRT_MAX, then the fd will get sign-extended into an
-	 * invalid file descriptor.  Handle this case by failing the
-	 * open.
-	 */
-	if (f > SHRT_MAX) {
-		fp->_flags = 0;		/* set it free */
-		FUNLOCKFILE(fp);
-		errno = EMFILE;
-		return (NULL);
-	}
-
-	fp->_flags = flags;
-	fp->_file = f;
-	fp->_cookie = fp;
-	fp->_read = __sread;
-	fp->_write = __swrite;
-	fp->_seek = __sseek;
-	fp->_close = __sclose;
-	/*
-	 * When opening in append mode, even though we use O_APPEND,
-	 * we need to seek to the end so that ftell() gets the right
-	 * answer.  If the user then alters the seek pointer, or
-	 * the file extends, this will fail, but there is not much
-	 * we can do about this.  (We could set __SAPP and check in
-	 * fseek and ftell.)
-	 */
-	if (oflags & O_APPEND)
-		(void) _sseek(fp, (fpos_t)0, SEEK_END);
-	FUNLOCKFILE(fp);
-	return (fp);
-}
diff --git a/lib/libc_bsd/stdio/fscanf.c b/lib/libc_bsd/stdio/fscanf.c
deleted file mode 100644
index f24ecc7..0000000
--- a/lib/libc_bsd/stdio/fscanf.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fscanf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "xlocale_private.h"
-
-int
-fscanf(FILE * __restrict fp, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	FLOCKFILE(fp);
-	ret = __svfscanf(fp, __get_locale(), fmt, ap);
-	va_end(ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-int
-fscanf_l(FILE * __restrict fp, locale_t locale, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-	FIX_LOCALE(locale);
-
-	va_start(ap, fmt);
-	FLOCKFILE(fp);
-	ret = __svfscanf(fp, locale, fmt, ap);
-	va_end(ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/fseek.3 b/lib/libc_bsd/stdio/fseek.3
deleted file mode 100644
index a5b575c..0000000
--- a/lib/libc_bsd/stdio/fseek.3
+++ /dev/null
@@ -1,269 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)fseek.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fseek.3 170908 2007-06-18 02:13:04Z ache $
-.\"
-.Dd March 19, 2004
-.Dt FSEEK 3
-.Os
-.Sh NAME
-.Nm fgetpos ,
-.Nm fseek ,
-.Nm fseeko ,
-.Nm fsetpos ,
-.Nm ftell ,
-.Nm ftello ,
-.Nm rewind
-.Nd reposition a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fseek "FILE *stream" "long offset" "int whence"
-.Ft long
-.Fn ftell "FILE *stream"
-.Ft void
-.Fn rewind "FILE *stream"
-.Ft int
-.Fn fgetpos "FILE * restrict stream" "fpos_t * restrict pos"
-.Ft int
-.Fn fsetpos "FILE *stream" "const fpos_t *pos"
-.In sys/types.h
-.Ft int
-.Fn fseeko "FILE *stream" "off_t offset" "int whence"
-.Ft off_t
-.Fn ftello "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn fseek
-function sets the file position indicator for the stream pointed
-to by
-.Fa stream .
-The new position, measured in bytes, is obtained by adding
-.Fa offset
-bytes to the position specified by
-.Fa whence .
-If
-.Fa whence
-is set to
-.Dv SEEK_SET ,
-.Dv SEEK_CUR ,
-or
-.Dv SEEK_END ,
-the offset is relative to the
-start of the file, the current position indicator, or end-of-file,
-respectively.
-A successful call to the
-.Fn fseek
-function clears the end-of-file indicator for the stream and undoes
-any effects of the
-.Xr ungetc 3
-and
-.Xr ungetwc 3
-functions on the same stream.
-.Pp
-The
-.Fn ftell
-function
-obtains the current value of the file position indicator for the
-stream pointed to by
-.Fa stream .
-.Pp
-The
-.Fn rewind
-function sets the file position indicator for the stream pointed
-to by
-.Fa stream
-to the beginning of the file.
-It is equivalent to:
-.Pp
-.Dl (void)fseek(stream, 0L, SEEK_SET)
-.Pp
-except that the error indicator for the stream is also cleared
-(see
-.Xr clearerr 3 ) .
-.Pp
-Since
-.Fn rewind
-does not return a value,
-an application wishing to detect errors should clear
-.Va errno ,
-then call
-.Fn rewind ,
-and if
-.Va errno
-is non-zero, assume an error has occurred.
-.Pp
-The
-.Fn fseeko
-function is identical to
-.Fn fseek ,
-except it takes an
-.Fa off_t
-argument
-instead of a
-.Fa long .
-Likewise, the
-.Fn ftello
-function is identical to
-.Fn ftell ,
-except it returns an
-.Fa off_t .
-.Pp
-The
-.Fn fgetpos
-and
-.Fn fsetpos
-functions
-are alternate interfaces for retrieving and setting the current position in
-the file, similar to
-.Fn ftell
-and
-.Fn fseek ,
-except that the current position is stored in an opaque object of
-type
-.Vt fpos_t
-pointed to by
-.Fa pos .
-These functions provide a portable way to seek to offsets larger than
-those that can be represented by a
-.Vt long int .
-They may also store additional state information in the
-.Vt fpos_t
-object to facilitate seeking within files containing multibyte
-characters with state-dependent encodings.
-Although
-.Vt fpos_t
-has traditionally been an integral type,
-applications cannot assume that it is;
-in particular, they must not perform arithmetic on objects
-of this type.
-.Pp
-If the stream is a wide character stream (see
-.Xr fwide 3 ) ,
-the position specified by the combination of
-.Fa offset
-and
-.Fa whence
-must contain the first byte of a multibyte sequence.
-.Sh RETURN VALUES
-The
-.Fn rewind
-function
-returns no value.
-.Pp
-.Rv -std fgetpos fseek fseeko fsetpos
-.Pp
-Upon successful completion,
-.Fn ftell
-and
-.Fn ftello
-return the current offset.
-Otherwise, \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa stream
-argument
-is not a seekable stream.
-.It Bq Er EINVAL
-The
-.Fa whence
-argument is invalid or
-the resulting file-position
-indicator would be set to a negative value.
-.It Bq Er EOVERFLOW
-The resulting file offset would be a value which
-cannot be represented correctly in an object of type
-.Fa off_t
-for
-.Fn fseeko
-and
-.Fn ftello
-or
-.Fa long
-for
-.Fn fseek
-and
-.Fn ftell .
-.It Bq Er ESPIPE
-The file descriptor underlying stream is associated with a pipe or FIFO
-or file-position indicator value is unspecified
-(see
-.Xr ungetc 3 ) .
-.El
-.Pp
-The functions
-.Fn fgetpos ,
-.Fn fseek ,
-.Fn fseeko ,
-.Fn fsetpos ,
-.Fn ftell ,
-.Fn ftello ,
-and
-.Fn rewind
-may also fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr fflush 3 ,
-.Xr fstat 2 ,
-.Xr lseek 2 ,
-and
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr lseek 2 ,
-.Xr clearerr 3 ,
-.Xr fwide 3 ,
-.Xr ungetc 3 ,
-.Xr ungetwc 3
-.Sh STANDARDS
-The
-.Fn fgetpos ,
-.Fn fsetpos ,
-.Fn fseek ,
-.Fn ftell ,
-and
-.Fn rewind
-functions
-conform to
-.St -isoC .
-.Pp
-The
-.Fn fseeko
-and
-.Fn ftello
-functions conform to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/stdio/fseek.c b/lib/libc_bsd/stdio/fseek.c
deleted file mode 100644
index 0b44837..0000000
--- a/lib/libc_bsd/stdio/fseek.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fseek.c	8.3 (Berkeley) 1/2/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fseek.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-#define	POS_ERR	(-(fpos_t)1)
-
-int
-fseek(FILE *fp, long offset, int whence)
-{
-	int ret;
-	int serrno = errno;
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	FLOCKFILE(fp);
-	ret = _fseeko(fp, (off_t)offset, whence, 1);
-	FUNLOCKFILE(fp);
-	if (ret == 0)
-		errno = serrno;
-	return (ret);
-}
-
-int
-fseeko(FILE *fp, off_t offset, int whence)
-{
-	int ret;
-	int serrno = errno;
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	FLOCKFILE(fp);
-	ret = _fseeko(fp, offset, whence, 0);
-	FUNLOCKFILE(fp);
-	if (ret == 0)
-		errno = serrno;
-	return (ret);
-}
-
-/*
- * Seek the given file to the given offset.
- * `Whence' must be one of the three SEEK_* macros.
- */
-int
-_fseeko(FILE *fp, off_t offset, int whence, int ltest)
-{
-	fpos_t (*seekfn)(void *, fpos_t, int);
-	fpos_t target, curoff, ret;
-	size_t n;
-	struct stat st;
-	int havepos;
-
-	/*
-	 * Have to be able to seek.
-	 */
-	if ((seekfn = fp->_seek) == NULL) {
-		errno = ESPIPE;		/* historic practice */
-		return (-1);
-	}
-
-	/*
-	 * Change any SEEK_CUR to SEEK_SET, and check `whence' argument.
-	 * After this, whence is either SEEK_SET or SEEK_END.
-	 */
-	switch (whence) {
-
-	case SEEK_CUR:
-		/*
-		 * In order to seek relative to the current stream offset,
-		 * we have to first find the current stream offset via
-		 * ftell (see ftell for details).
-		 */
-		if (_ftello(fp, &curoff))
-			return (-1);
-		if (curoff < 0) {
-			/* Unspecified position because of ungetc() at 0 */
-			errno = ESPIPE;
-			return (-1);
-		}
-		if (offset > 0 && curoff > OFF_MAX - offset) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		offset += curoff;
-		if (offset < 0) {
-			errno = EINVAL;
-			return (-1);
-		}
-		if (ltest && offset > LONG_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		whence = SEEK_SET;
-		havepos = 1;
-		break;
-
-	case SEEK_SET:
-		if (offset < 0) {
-			errno = EINVAL;
-			return (-1);
-		}
-	case SEEK_END:
-		curoff = 0;		/* XXX just to keep gcc quiet */
-		havepos = 0;
-		break;
-
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/*
-	 * Can only optimise if:
-	 *	reading (and not reading-and-writing);
-	 *	not unbuffered; and
-	 *	this is a `regular' Unix file (and hence seekfn==__sseek).
-	 * We must check __NBF first, because it is possible to have __NBF
-	 * and __SOPT both set.
-	 */
-	if (fp->_bf._base == NULL)
-		__smakebuf(fp);
-	if (fp->_flags & (__SWR | __SRW | __SNBF | __SNPT))
-		goto dumb;
-	if ((fp->_flags & __SOPT) == 0) {
-		if (seekfn != __sseek ||
-		    fp->_file < 0 || _fstat(fp->_file, &st) ||
-		    (st.st_mode & S_IFMT) != S_IFREG) {
-			fp->_flags |= __SNPT;
-			goto dumb;
-		}
-		fp->_blksize = st.st_blksize;
-		fp->_flags |= __SOPT;
-	}
-
-	/*
-	 * We are reading; we can try to optimise.
-	 * Figure out where we are going and where we are now.
-	 */
-	if (whence == SEEK_SET)
-		target = offset;
-	else {
-		if (_fstat(fp->_file, &st))
-			goto dumb;
-		if (offset > 0 && st.st_size > OFF_MAX - offset) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-		target = st.st_size + offset;
-		if ((off_t)target < 0) {
-			errno = EINVAL;
-			return (-1);
-		}
-		if (ltest && (off_t)target > LONG_MAX) {
-			errno = EOVERFLOW;
-			return (-1);
-		}
-	}
-
-	if (!havepos && _ftello(fp, &curoff))
-		goto dumb;
-
-	/*
-	 * (If the buffer was modified, we have to
-	 * skip this; see fgetln.c.)
-	 */
-	if (fp->_flags & __SMOD)
-		goto abspos;
-
-	/*
-	 * Compute the number of bytes in the input buffer (pretending
-	 * that any ungetc() input has been discarded).  Adjust current
-	 * offset backwards by this count so that it represents the
-	 * file offset for the first byte in the current input buffer.
-	 */
-	if (HASUB(fp)) {
-		curoff += fp->_r;	/* kill off ungetc */
-		n = fp->_up - fp->_bf._base;
-		curoff -= n;
-		n += fp->_ur;
-	} else {
-		n = fp->_p - fp->_bf._base;
-		curoff -= n;
-		n += fp->_r;
-	}
-
-	/*
-	 * If the target offset is within the current buffer,
-	 * simply adjust the pointers, clear EOF, undo ungetc(),
-	 * and return.
-	 */
-	if (target >= curoff && target < curoff + n) {
-		size_t o = target - curoff;
-
-		fp->_p = fp->_bf._base + o;
-		fp->_r = n - o;
-		if (HASUB(fp))
-			FREEUB(fp);
-		fp->_flags &= ~__SEOF;
-		memset(&fp->_mbstate, 0, sizeof(mbstate_t));
-		return (0);
-	}
-
-abspos:
-	/*
-	 * The place we want to get to is not within the current buffer,
-	 * but we can still be kind to the kernel copyout mechanism.
-	 * By aligning the file offset to a block boundary, we can let
-	 * the kernel use the VM hardware to map pages instead of
-	 * copying bytes laboriously.  Using a block boundary also
-	 * ensures that we only read one block, rather than two.
-	 */
-	curoff = target & ~(fp->_blksize - 1);
-	if (_sseek(fp, curoff, SEEK_SET) == POS_ERR)
-		goto dumb;
-	fp->_r = 0;
-	fp->_p = fp->_bf._base;
-	if (HASUB(fp))
-		FREEUB(fp);
-	n = target - curoff;
-	if (n) {
-		if (__srefill(fp) || fp->_r < n)
-			goto dumb;
-		fp->_p += n;
-		fp->_r -= n;
-	}
-	fp->_flags &= ~__SEOF;
-	memset(&fp->_mbstate, 0, sizeof(mbstate_t));
-	return (0);
-
-	/*
-	 * We get here if we cannot optimise the seek ... just
-	 * do it.  Allow the seek function to change fp->_bf._base.
-	 */
-dumb:
-	if (__sflush(fp) ||
-	    (ret = _sseek(fp, (fpos_t)offset, whence)) == POS_ERR)
-		return (-1);
-	if (ltest && ret > LONG_MAX) {
-		fp->_flags |= __SERR;
-		errno = EOVERFLOW;
-		return (-1);
-	}
-	/* success: clear EOF indicator and discard ungetc() data */
-	if (HASUB(fp))
-		FREEUB(fp);
-	fp->_p = fp->_bf._base;
-	fp->_r = 0;
-	/* fp->_w = 0; */	/* unnecessary (I think...) */
-	fp->_flags &= ~__SEOF;
-	memset(&fp->_mbstate, 0, sizeof(mbstate_t));
-	return (0);
-}
diff --git a/lib/libc_bsd/stdio/fsetpos.c b/lib/libc_bsd/stdio/fsetpos.c
deleted file mode 100644
index 2155b35..0000000
--- a/lib/libc_bsd/stdio/fsetpos.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fsetpos.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fsetpos.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <sys/types.h>
-#include <stdio.h>
-
-/*
- * fsetpos: like fseek.
- */
-int
-fsetpos(FILE *iop, const fpos_t *pos)
-{
-	return (fseeko(iop, (off_t)*pos, SEEK_SET));
-}
diff --git a/lib/libc_bsd/stdio/ftell.c b/lib/libc_bsd/stdio/ftell.c
deleted file mode 100644
index a9f7997..0000000
--- a/lib/libc_bsd/stdio/ftell.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ftell.c	8.2 (Berkeley) 5/4/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/ftell.c 269623 2014-08-06 10:33:43Z ache $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * standard ftell function.
- */
-long
-ftell(FILE *fp)
-{
-	off_t rv;
-
-	rv = ftello(fp);
-	if (rv > LONG_MAX) {
-		errno = EOVERFLOW;
-		return (-1);
-	}
-	return (rv);
-}
-
-/*
- * ftello: return current offset.
- */
-off_t
-ftello(FILE *fp)
-{
-	fpos_t rv;
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = _ftello(fp, &rv);
-	FUNLOCKFILE(fp);
-	if (ret)
-		return (-1);
-	if (rv < 0) {   /* Unspecified value because of ungetc() at 0 */
-		errno = ESPIPE;
-		return (-1);
-	}
-	return (rv);
-}
-
-int
-_ftello(FILE *fp, fpos_t *offset)
-{
-	fpos_t pos;
-	size_t n;
-	int dflags;
-
-	if (fp->_seek == NULL) {
-		errno = ESPIPE;			/* historic practice */
-		return (1);
-	}
-
-	/*
-	 * Find offset of underlying I/O object, then
-	 * adjust for buffered bytes.
-	 */
-	if (fp->_flags & __SOFF)
-		pos = fp->_offset;
-	else {
-		pos = _sseek(fp, (fpos_t)0, SEEK_CUR);
-		if (pos == -1)
-			return (1);
-	}
-	if (fp->_flags & __SRD) {
-		/*
-		 * Reading.  Any unread characters (including
-		 * those from ungetc) cause the position to be
-		 * smaller than that in the underlying object.
-		 */
-		if ((pos -= (HASUB(fp) ? fp->_ur : fp->_r)) < 0) {
-			fp->_flags |= __SERR;
-			errno = EIO;
-			return (1);
-		}
-		if (HASUB(fp))
-			pos -= fp->_r;  /* Can be negative at this point. */
-	} else if ((fp->_flags & __SWR) && fp->_p != NULL) {
-		dflags = 0;
-		if (fp->_flags & __SAPP)
-			dflags = O_APPEND;
-		else if (fp->_file != -1 &&
-			 (dflags = _fcntl(fp->_file, F_GETFL)) < 0)
-			return (1);
-		if ((dflags & O_APPEND) &&
-		    (pos = _sseek(fp, (fpos_t)0, SEEK_END)) == -1) {
-			if ((fp->_flags & __SOPT) || __sflush(fp) ||
-			    (pos = _sseek(fp, (fpos_t)0, SEEK_CUR)) == -1)
-				return (1);
-			else {
-				*offset = pos;
-				return (0);
-			}
-		}
-		/*
-		 * Writing.  Any buffered characters cause the
-		 * position to be greater than that in the
-		 * underlying object.
-		 */
-		n = fp->_p - fp->_bf._base;
-		if (pos > OFF_MAX - n) {
-			errno = EOVERFLOW;
-			return (1);
-		}
-		pos += n;
-	}
-	*offset = pos;
-	return (0);
-}
diff --git a/lib/libc_bsd/stdio/funopen.3 b/lib/libc_bsd/stdio/funopen.3
deleted file mode 100644
index 7a7c3da..0000000
--- a/lib/libc_bsd/stdio/funopen.3
+++ /dev/null
@@ -1,176 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)funopen.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/funopen.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd March 19, 2004
-.Dt FUNOPEN 3
-.Os
-.Sh NAME
-.Nm funopen ,
-.Nm fropen ,
-.Nm fwopen
-.Nd open a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn funopen "const void *cookie" "int (*readfn)(void *, char *, int)" "int (*writefn)(void *, const char *, int)" "fpos_t (*seekfn)(void *, fpos_t, int)" "int (*closefn)(void *)"
-.Ft FILE *
-.Fn fropen "void *cookie" "int (*readfn)(void *, char *, int)"
-.Ft FILE *
-.Fn fwopen "void *cookie" "int (*writefn)(void *, const char *, int)"
-.Sh DESCRIPTION
-The
-.Fn funopen
-function
-associates a stream with up to four
-.Dq Tn I/O No functions .
-Either
-.Fa readfn
-or
-.Fa writefn
-must be specified;
-the others can be given as an appropriately-typed
-.Dv NULL
-pointer.
-These
-.Tn I/O
-functions will be used to read, write, seek and
-close the new stream.
-.Pp
-In general, omitting a function means that any attempt to perform the
-associated operation on the resulting stream will fail.
-If the close function is omitted, closing the stream will flush
-any buffered output and then succeed.
-.Pp
-The calling conventions of
-.Fa readfn ,
-.Fa writefn ,
-.Fa seekfn
-and
-.Fa closefn
-must match those, respectively, of
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr lseek 2 ,
-and
-.Xr close 2
-with the single exception that they are passed the
-.Fa cookie
-argument specified to
-.Fn funopen
-in place of the traditional file descriptor argument.
-.Pp
-Read and write
-.Tn I/O
-functions are allowed to change the underlying buffer
-on fully buffered or line buffered streams by calling
-.Xr setvbuf 3 .
-They are also not required to completely fill or empty the buffer.
-They are not, however, allowed to change streams from unbuffered to buffered
-or to change the state of the line buffering flag.
-They must also be prepared to have read or write calls occur on buffers other
-than the one most recently specified.
-.Pp
-All user
-.Tn I/O
-functions can report an error by returning \-1.
-Additionally, all of the functions should set the external variable
-.Va errno
-appropriately if an error occurs.
-.Pp
-An error on
-.Fn closefn
-does not keep the stream open.
-.Pp
-As a convenience, the include file
-.In stdio.h
-defines the macros
-.Fn fropen
-and
-.Fn fwopen
-as calls to
-.Fn funopen
-with only a read or write function specified.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn funopen
-returns a
-.Dv FILE
-pointer.
-Otherwise,
-.Dv NULL
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fn funopen
-function
-was called without either a read or write function.
-The
-.Fn funopen
-function
-may also fail and set
-.Va errno
-for any of the errors
-specified for the routine
-.Xr malloc 3 .
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr open 2 ,
-.Xr fclose 3 ,
-.Xr fopen 3 ,
-.Xr fseek 3 ,
-.Xr setbuf 3
-.Sh HISTORY
-The
-.Fn funopen
-functions first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The
-.Fn funopen
-function
-may not be portable to systems other than
-.Bx .
-.Pp
-The
-.Fn funopen
-interface erroneously assumes that
-.Vt fpos_t
-is an integral type; see
-.Xr fseek 3
-for a discussion of this issue.
diff --git a/lib/libc_bsd/stdio/funopen.c b/lib/libc_bsd/stdio/funopen.c
deleted file mode 100644
index b2ce3c9..0000000
--- a/lib/libc_bsd/stdio/funopen.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)funopen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/funopen.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include <errno.h>
-
-#include "local.h"
-
-FILE *
-funopen(const void *cookie,
-	int (*readfn)(void *, char *, int),
-	int (*writefn)(void *, const char *, int),
-	fpos_t (*seekfn)(void *, fpos_t, int),
-	int (*closefn)(void *))
-{
-	FILE *fp;
-	int flags;
-
-	if (readfn == NULL) {
-		if (writefn == NULL) {		/* illegal */
-			errno = EINVAL;
-			return (NULL);
-		} else
-			flags = __SWR;		/* write only */
-	} else {
-		if (writefn == NULL)
-			flags = __SRD;		/* read only */
-		else
-			flags = __SRW;		/* read-write */
-	}
-	if ((fp = __sfp()) == NULL)
-		return (NULL);
-	fp->_flags = flags;
-	fp->_file = -1;
-	fp->_cookie = (void *)cookie;
-	fp->_read = readfn;
-	fp->_write = writefn;
-	fp->_seek = seekfn;
-	fp->_close = closefn;
-	return (fp);
-}
diff --git a/lib/libc_bsd/stdio/fvwrite.c b/lib/libc_bsd/stdio/fvwrite.c
deleted file mode 100644
index 11f5c13..0000000
--- a/lib/libc_bsd/stdio/fvwrite.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fvwrite.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fvwrite.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "local.h"
-#include "fvwrite.h"
-
-/*
- * Write some memory regions.  Return zero on success, EOF on error.
- *
- * This routine is large and unsightly, but most of the ugliness due
- * to the three different kinds of output buffering is handled here.
- */
-int
-__sfvwrite(FILE *fp, struct __suio *uio)
-{
-	size_t len;
-	char *p;
-	struct __siov *iov;
-	int w, s;
-	char *nl;
-	int nlknown, nldist;
-
-	if (uio->uio_resid == 0)
-		return (0);
-	/* make sure we can write */
-	if (prepwrite(fp) != 0)
-		return (EOF);
-
-#define	MIN(a, b) ((a) < (b) ? (a) : (b))
-#define	COPY(n)	  (void)memcpy((void *)fp->_p, (void *)p, (size_t)(n))
-
-	iov = uio->uio_iov;
-	p = iov->iov_base;
-	len = iov->iov_len;
-	iov++;
-#define GETIOV(extra_work) \
-	while (len == 0) { \
-		extra_work; \
-		p = iov->iov_base; \
-		len = iov->iov_len; \
-		iov++; \
-	}
-	if (fp->_flags & __SNBF) {
-		/*
-		 * Unbuffered: write up to BUFSIZ bytes at a time.
-		 */
-		do {
-			GETIOV(;);
-			w = _swrite(fp, p, MIN(len, BUFSIZ));
-			if (w <= 0)
-				goto err;
-			p += w;
-			len -= w;
-		} while ((uio->uio_resid -= w) != 0);
-	} else if ((fp->_flags & __SLBF) == 0) {
-		/*
-		 * Fully buffered: fill partially full buffer, if any,
-		 * and then flush.  If there is no partial buffer, write
-		 * one _bf._size byte chunk directly (without copying).
-		 *
-		 * String output is a special case: write as many bytes
-		 * as fit, but pretend we wrote everything.  This makes
-		 * snprintf() return the number of bytes needed, rather
-		 * than the number used, and avoids its write function
-		 * (so that the write function can be invalid).
-		 */
-		do {
-			GETIOV(;);
-			if ((fp->_flags & (__SALC | __SSTR)) ==
-			    (__SALC | __SSTR) && fp->_w < len) {
-				size_t blen = fp->_p - fp->_bf._base;
-
-				/*
-				 * Alloc an extra 128 bytes (+ 1 for NULL)
-				 * so we don't call realloc(3) so often.
-				 */
-				fp->_w = len + 128;
-				fp->_bf._size = blen + len + 128;
-				fp->_bf._base =
-				    reallocf(fp->_bf._base, fp->_bf._size + 1);
-				if (fp->_bf._base == NULL)
-					goto err;
-				fp->_p = fp->_bf._base + blen;
-			}
-			w = fp->_w;
-			if (fp->_flags & __SSTR) {
-				if (len < w)
-					w = len;
-				if (w > 0) {
-					COPY(w);        /* copy MIN(fp->_w,len), */
-					fp->_w -= w;
-					fp->_p += w;
-				}
-				w = len;	/* but pretend copied all */
-			} else if (fp->_p > fp->_bf._base && len > w) {
-				/* fill and flush */
-				COPY(w);
-				/* fp->_w -= w; */ /* unneeded */
-				fp->_p += w;
-				if (__fflush(fp))
-					goto err;
-			} else if (len >= (w = fp->_bf._size)) {
-				/* write directly */
-				w = _swrite(fp, p, w);
-				if (w <= 0)
-					goto err;
-			} else {
-				/* fill and done */
-				w = len;
-				COPY(w);
-				fp->_w -= w;
-				fp->_p += w;
-			}
-			p += w;
-			len -= w;
-		} while ((uio->uio_resid -= w) != 0);
-	} else {
-		/*
-		 * Line buffered: like fully buffered, but we
-		 * must check for newlines.  Compute the distance
-		 * to the first newline (including the newline),
-		 * or `infinity' if there is none, then pretend
-		 * that the amount to write is MIN(len,nldist).
-		 */
-		nlknown = 0;
-		nldist = 0;	/* XXX just to keep gcc happy */
-		do {
-			GETIOV(nlknown = 0);
-			if (!nlknown) {
-				nl = memchr((void *)p, '\n', len);
-				nldist = nl ? nl + 1 - p : len + 1;
-				nlknown = 1;
-			}
-			s = MIN(len, nldist);
-			w = fp->_w + fp->_bf._size;
-			if (fp->_p > fp->_bf._base && s > w) {
-				COPY(w);
-				/* fp->_w -= w; */
-				fp->_p += w;
-				if (__fflush(fp))
-					goto err;
-			} else if (s >= (w = fp->_bf._size)) {
-				w = _swrite(fp, p, w);
-				if (w <= 0)
-				 	goto err;
-			} else {
-				w = s;
-				COPY(w);
-				fp->_w -= w;
-				fp->_p += w;
-			}
-			if ((nldist -= w) == 0) {
-				/* copied the newline: flush and forget */
-				if (__fflush(fp))
-					goto err;
-				nlknown = 0;
-			}
-			p += w;
-			len -= w;
-		} while ((uio->uio_resid -= w) != 0);
-	}
-	return (0);
-
-err:
-	fp->_flags |= __SERR;
-	return (EOF);
-}
diff --git a/lib/libc_bsd/stdio/fvwrite.h b/lib/libc_bsd/stdio/fvwrite.h
deleted file mode 100644
index 1b381f3..0000000
--- a/lib/libc_bsd/stdio/fvwrite.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- * 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.
- *
- *	@(#)fvwrite.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: releng/10.2/lib/libc/stdio/fvwrite.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-/*
- * I/O descriptors for __sfvwrite().
- */
-struct __siov {
-	void	*iov_base;
-	size_t	iov_len;
-};
-struct __suio {
-	struct	__siov *uio_iov;
-	int	uio_iovcnt;
-	int	uio_resid;
-};
-
-extern int __sfvwrite(FILE *, struct __suio *);
diff --git a/lib/libc_bsd/stdio/fwalk.c b/lib/libc_bsd/stdio/fwalk.c
deleted file mode 100644
index 055d9a3..0000000
--- a/lib/libc_bsd/stdio/fwalk.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fwalk.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fwalk.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <sys/types.h>
-#include <stdio.h>
-#include "local.h"
-#include "glue.h"
-
-int
-_fwalk(int (*function)(FILE *))
-{
-	FILE *fp;
-	int n, ret;
-	struct glue *g;
-
-	ret = 0;
-	/*
-	 * It should be safe to walk the list without locking it;
-	 * new nodes are only added to the end and none are ever
-	 * removed.
-	 *
-	 * Avoid locking this list while walking it or else you will
-	 * introduce a potential deadlock in [at least] refill.c.
-	 */
-	for (g = &__sglue; g != NULL; g = g->next)
-		for (fp = g->iobs, n = g->niobs; --n >= 0; fp++)
-			if ((fp->_flags != 0) && ((fp->_flags & __SIGN) == 0))
-				ret |= (*function)(fp);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/fwide.3 b/lib/libc_bsd/stdio/fwide.3
deleted file mode 100644
index d26f9fa..0000000
--- a/lib/libc_bsd/stdio/fwide.3
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"	$NetBSD: fwide.3,v 1.3 2002/02/07 07:00:25 ross Exp $
-.\"
-.\" Copyright (c)2001 Citrus Project,
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" $Citrus: xpg4dl/FreeBSD/lib/libc/stdio/fwide.3,v 1.2 2001/12/07 04:47:08 yamt Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/fwide.3 108037 2002-12-18 12:45:11Z ru $
-.\"
-.Dd October 24, 2001
-.Dt FWIDE 3
-.Os
-.Sh NAME
-.Nm fwide
-.Nd get/set orientation of a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft int
-.Fn fwide "FILE *stream" "int mode"
-.Sh DESCRIPTION
-The
-.Fn fwide
-function
-determines the orientation of the stream pointed at by
-.Fa stream .
-.Pp
-If the orientation of
-.Fa stream
-has already been determined,
-.Fn fwide
-leaves it unchanged.
-Otherwise,
-.Fn fwide
-sets the orientation of
-.Fa stream
-according to
-.Fa mode .
-.Pp
-If
-.Fa mode
-is less than zero,
-.Fa stream
-is set to byte-oriented.
-If it is greater than zero,
-.Fa stream
-is set to wide-oriented.
-Otherwise,
-.Fa mode
-is zero, and
-.Fa stream
-is unchanged.
-.Sh RETURN VALUES
-The
-.Fn fwide
-function
-returns a value according to orientation after the call of
-.Fn fwide ;
-a value less than zero if byte-oriented, a value greater than zero
-if wide-oriented, and zero if the stream has no orientation.
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fgetc 3 ,
-.Xr fgetwc 3 ,
-.Xr fopen 3 ,
-.Xr fputc 3 ,
-.Xr fputwc 3 ,
-.Xr freopen 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The
-.Fn fwide
-function
-conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdio/fwide.c b/lib/libc_bsd/stdio/fwide.c
deleted file mode 100644
index 8f8a852..0000000
--- a/lib/libc_bsd/stdio/fwide.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fwide.c 178287 2008-04-17 22:17:54Z jhb $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-int
-fwide(FILE *fp, int mode)
-{
-	int m;
-
-	FLOCKFILE(fp);
-	/* Only change the orientation if the stream is not oriented yet. */
-	if (mode != 0 && fp->_orientation == 0)
-		fp->_orientation = mode > 0 ? 1 : -1;
-	m = fp->_orientation;
-	FUNLOCKFILE(fp);
-
-	return (m);
-}
diff --git a/lib/libc_bsd/stdio/fwprintf.c b/lib/libc_bsd/stdio/fwprintf.c
deleted file mode 100644
index ffc9335..0000000
--- a/lib/libc_bsd/stdio/fwprintf.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fwprintf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-
-int
-fwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf(fp, fmt, ap);
-	va_end(ap);
-
-	return (ret);
-}
-int
-fwprintf_l(FILE * __restrict fp, locale_t locale, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf_l(fp, locale, fmt, ap);
-	va_end(ap);
-
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/fwrite.c b/lib/libc_bsd/stdio/fwrite.c
deleted file mode 100644
index 73bc1ca..0000000
--- a/lib/libc_bsd/stdio/fwrite.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)fwrite.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fwrite.c 253277 2013-07-12 17:37:05Z schweikh $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdint.h>
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-
-/*
- * Write `count' objects (each size `size') from memory to the given file.
- * Return the number of whole objects written.
- */
-size_t
-fwrite(const void * __restrict buf, size_t size, size_t count, FILE * __restrict fp)
-{
-	size_t n;
-	struct __suio uio;
-	struct __siov iov;
-
-	/*
-	 * ANSI and SUSv2 require a return value of 0 if size or count are 0.
-	 */
-	if ((count == 0) || (size == 0))
-		return (0);
-
-	/*
-	 * Check for integer overflow.  As an optimization, first check that
-	 * at least one of {count, size} is at least 2^16, since if both
-	 * values are less than that, their product can't possibly overflow
-	 * (size_t is always at least 32 bits on FreeBSD).
-	 */
-	if (((count | size) > 0xFFFF) &&
-	    (count > SIZE_MAX / size)) {
-		errno = EINVAL;
-		fp->_flags |= __SERR;
-		return (0);
-	}
-
-	n = count * size;
-
-	iov.iov_base = (void *)buf;
-	uio.uio_resid = iov.iov_len = n;
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	/*
-	 * The usual case is success (__sfvwrite returns 0);
-	 * skip the divide if this happens, since divides are
-	 * generally slow and since this occurs whenever size==0.
-	 */
-	if (__sfvwrite(fp, &uio) != 0)
-	    count = (n - uio.uio_resid) / size;
-	FUNLOCKFILE(fp);
-	return (count);
-}
diff --git a/lib/libc_bsd/stdio/fwscanf.c b/lib/libc_bsd/stdio/fwscanf.c
deleted file mode 100644
index e865882..0000000
--- a/lib/libc_bsd/stdio/fwscanf.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/fwscanf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-
-int
-fwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf(fp, fmt, ap);
-	va_end(ap);
-
-	return (r);
-}
-int
-fwscanf_l(FILE * __restrict fp, locale_t locale, const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf_l(fp, locale, fmt, ap);
-	va_end(ap);
-
-	return (r);
-}
diff --git a/lib/libc_bsd/stdio/getc.3 b/lib/libc_bsd/stdio/getc.3
deleted file mode 100644
index 9ed6462..0000000
--- a/lib/libc_bsd/stdio/getc.3
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/getc.3 201836 2010-01-08 22:02:42Z brueffer $
-.\"
-.Dd January 10, 2003
-.Dt GETC 3
-.Os
-.Sh NAME
-.Nm fgetc ,
-.Nm getc ,
-.Nm getc_unlocked ,
-.Nm getchar ,
-.Nm getchar_unlocked ,
-.Nm getw
-.Nd get next character or word from input stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fgetc "FILE *stream"
-.Ft int
-.Fn getc "FILE *stream"
-.Ft int
-.Fn getc_unlocked "FILE *stream"
-.Ft int
-.Fn getchar void
-.Ft int
-.Fn getchar_unlocked void
-.Ft int
-.Fn getw "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn fgetc
-function
-obtains the next input character (if present) from the stream pointed at by
-.Fa stream ,
-or the next character pushed back on the stream via
-.Xr ungetc 3 .
-.Pp
-The
-.Fn getc
-function
-acts essentially identically to
-.Fn fgetc ,
-but is a macro that expands in-line.
-.Pp
-The
-.Fn getchar
-function
-is equivalent to
-.Fn getc stdin .
-.Pp
-The
-.Fn getw
-function
-obtains the next
-.Vt int
-(if present)
-from the stream pointed at by
-.Fa stream .
-.Pp
-The
-.Fn getc_unlocked
-and
-.Fn getchar_unlocked
-functions are equivalent to
-.Fn getc
-and
-.Fn getchar
-respectively,
-except that the caller is responsible for locking the stream
-with
-.Xr flockfile 3
-before calling them.
-These functions may be used to avoid the overhead of locking the stream
-for each character, and to avoid input being dispersed among multiple
-threads reading from the same stream.
-.Sh RETURN VALUES
-If successful, these routines return the next requested object
-from the
-.Fa stream .
-Character values are returned as an
-.Vt "unsigned char"
-converted to an
-.Vt int .
-If the stream is at end-of-file or a read error occurs,
-the routines return
-.Dv EOF .
-The routines
-.Xr feof 3
-and
-.Xr ferror 3
-must be used to distinguish between end-of-file and error.
-If an error occurs, the global variable
-.Va errno
-is set to indicate the error.
-The end-of-file condition is remembered, even on a terminal, and all
-subsequent attempts to read will return
-.Dv EOF
-until the condition is cleared with
-.Xr clearerr 3 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr flockfile 3 ,
-.Xr fopen 3 ,
-.Xr fread 3 ,
-.Xr getwc 3 ,
-.Xr putc 3 ,
-.Xr ungetc 3
-.Sh STANDARDS
-The
-.Fn fgetc ,
-.Fn getc ,
-and
-.Fn getchar
-functions
-conform to
-.St -isoC .
-The
-.Fn getc_unlocked
-and
-.Fn getchar_unlocked
-functions conform to
-.St -p1003.1-2001 .
-.Sh BUGS
-Since
-.Dv EOF
-is a valid integer value,
-.Xr feof 3
-and
-.Xr ferror 3
-must be used to check for failure after calling
-.Fn getw .
-The size and byte order of an
-.Vt int
-varies from one machine to another, and
-.Fn getw
-is not recommended for portable applications.
diff --git a/lib/libc_bsd/stdio/getc.c b/lib/libc_bsd/stdio/getc.c
deleted file mode 100644
index cad606d..0000000
--- a/lib/libc_bsd/stdio/getc.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/getc.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-#undef getc
-#undef getc_unlocked
-
-int
-getc(FILE *fp)
-{
-	int retval;
-	FLOCKFILE(fp);
-	/* Orientation set by __sgetc() when buffer is empty. */
-	/* ORIENT(fp, -1); */
-	retval = __sgetc(fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
-
-int
-getc_unlocked(FILE *fp)
-{
-
-	return (__sgetc(fp));
-}
diff --git a/lib/libc_bsd/stdio/getchar.c b/lib/libc_bsd/stdio/getchar.c
deleted file mode 100644
index 9c3f2c3..0000000
--- a/lib/libc_bsd/stdio/getchar.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getchar.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/getchar.c 249808 2013-04-23 13:33:13Z emaste $");
-
-/*
- * A subroutine version of the macro getchar.
- */
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-#undef getchar
-#undef getchar_unlocked
-
-int
-getchar()
-{
-	int retval;
-	FLOCKFILE(stdin);
-	/* Orientation set by __sgetc() when buffer is empty. */
-	/* ORIENT(stdin, -1); */
-	retval = __sgetc(stdin);
-	FUNLOCKFILE(stdin);
-	return (retval);
-}
-
-int
-getchar_unlocked(void)
-{
-
-	return (__sgetc(stdin));
-}
diff --git a/lib/libc_bsd/stdio/getdelim.c b/lib/libc_bsd/stdio/getdelim.c
deleted file mode 100644
index 21d9611..0000000
--- a/lib/libc_bsd/stdio/getdelim.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/getdelim.c 197752 2009-10-04 19:43:36Z das $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-
-static inline size_t
-p2roundup(size_t n)
-{
-
-	if (!powerof2(n)) {
-		n--;
-		n |= n >> 1;
-		n |= n >> 2;
-		n |= n >> 4;
-		n |= n >> 8;
-		n |= n >> 16;
-#if SIZE_T_MAX > 0xffffffffU
-		n |= n >> 32;
-#endif
-		n++;
-	}
-	return (n);
-}
-
-/*
- * Expand *linep to hold len bytes (up to SSIZE_MAX + 1).
- */
-static inline int
-expandtofit(char ** __restrict linep, size_t len, size_t * __restrict capp)
-{
-	char *newline;
-	size_t newcap;
-
-	if (len > (size_t)SSIZE_MAX + 1) {
-		errno = EOVERFLOW;
-		return (-1);
-	}
-	if (len > *capp) {
-		if (len == (size_t)SSIZE_MAX + 1)	/* avoid overflow */
-			newcap = (size_t)SSIZE_MAX + 1;
-		else
-			newcap = p2roundup(len);
-		newline = realloc(*linep, newcap);
-		if (newline == NULL)
-			return (-1);
-		*capp = newcap;
-		*linep = newline;
-	}
-	return (0);
-}
-
-/*
- * Append the src buffer to the *dstp buffer. The buffers are of
- * length srclen and *dstlenp, respectively, and dst has space for
- * *dstlenp bytes. After the call, *dstlenp and *dstcapp are updated
- * appropriately, and *dstp is reallocated if needed. Returns 0 on
- * success, -1 on allocation failure.
- */
-static int
-sappend(char ** __restrict dstp, size_t * __restrict dstlenp,
-	size_t * __restrict dstcapp, char * __restrict src, size_t srclen)
-{
-
-	/* ensure room for srclen + dstlen + terminating NUL */
-	if (expandtofit(dstp, srclen + *dstlenp + 1, dstcapp))
-		return (-1);
-	memcpy(*dstp + *dstlenp, src, srclen);
-	*dstlenp += srclen;
-	return (0);
-}
-
-ssize_t
-getdelim(char ** __restrict linep, size_t * __restrict linecapp, int delim,
-	 FILE * __restrict fp)
-{
-	u_char *endp;
-	size_t linelen;
-
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-
-	if (linep == NULL || linecapp == NULL) {
-		errno = EINVAL;
-		goto error;
-	}
-
-	if (*linep == NULL)
-		*linecapp = 0;
-
-	if (fp->_r <= 0 && __srefill(fp)) {
-		/* If fp is at EOF already, we just need space for the NUL. */
-		if (__sferror(fp) || expandtofit(linep, 1, linecapp))
-			goto error;
-		FUNLOCKFILE(fp);
-		(*linep)[0] = '\0';
-		return (-1);
-	}
-
-	linelen = 0;
-	while ((endp = memchr(fp->_p, delim, fp->_r)) == NULL) {
-		if (sappend(linep, &linelen, linecapp, fp->_p, fp->_r))
-			goto error;
-		if (__srefill(fp)) {
-			if (__sferror(fp))
-				goto error;
-			goto done;	/* hit EOF */
-		}
-	}
-	endp++;	/* snarf the delimiter, too */
-	if (sappend(linep, &linelen, linecapp, fp->_p, endp - fp->_p))
-		goto error;
-	fp->_r -= endp - fp->_p;
-	fp->_p = endp;
-done:
-	/* Invariant: *linep has space for at least linelen+1 bytes. */
-	(*linep)[linelen] = '\0';
-	FUNLOCKFILE(fp);
-	return (linelen);
-
-error:
-	fp->_flags |= __SERR;
-	FUNLOCKFILE(fp);
-	return (-1);
-}
diff --git a/lib/libc_bsd/stdio/getline.3 b/lib/libc_bsd/stdio/getline.3
deleted file mode 100644
index 95f4565..0000000
--- a/lib/libc_bsd/stdio/getline.3
+++ /dev/null
@@ -1,165 +0,0 @@
-.\" Copyright (c) 2009 David Schultz <das@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.
-.\"
-.\" 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: releng/10.2/lib/libc/stdio/getline.3 243753 2012-12-01 15:25:41Z eadler $
-.\"
-.Dd November 30, 2012
-.Dt GETLINE 3
-.Os
-.Sh NAME
-.Nm getdelim ,
-.Nm getline
-.Nd get a line from a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.Fd "#define _WITH_GETLINE"
-.In stdio.h
-.Ft ssize_t
-.Fn getdelim "char ** restrict linep" "size_t * restrict linecapp" "int delimiter" " FILE * restrict stream"
-.Ft ssize_t
-.Fn getline "char ** restrict linep" "size_t * restrict linecapp" " FILE * restrict stream"
-.Sh DESCRIPTION
-The
-.Fn getdelim
-function reads a line from
-.Fa stream ,
-delimited by the character
-.Fa delimiter .
-The
-.Fn getline
-function is equivalent to
-.Fn getdelim
-with the newline character as the delimiter.
-The delimiter character is included as part of the line, unless
-the end of the file is reached.
-.Pp
-The caller may provide a pointer to a malloced buffer for the line in
-.Fa *linep ,
-and the capacity of that buffer in
-.Fa *linecapp .
-These functions expand the buffer as needed, as if via
-.Fn realloc .
-If
-.Fa linep
-points to a
-.Dv NULL
-pointer, a new buffer will be allocated.
-In either case,
-.Fa *linep
-and
-.Fa *linecapp
-will be updated accordingly.
-.Sh RETURN VALUES
-The
-.Fn getdelim
-and
-.Fn getline
-functions return the number of characters stored in the buffer, excluding the
-terminating
-.Dv NUL
-character.
-The value \-1 is returned if an error occurs, or if end-of-file is reached.
-.Sh EXAMPLES
-The following code fragment reads lines from a file and
-writes them to standard output.
-The
-.Fn fwrite
-function is used in case the line contains embedded
-.Dv NUL
-characters.
-.Bd -literal -offset indent
-char *line = NULL;
-size_t linecap = 0;
-ssize_t linelen;
-while ((linelen = getline(&line, &linecap, fp)) > 0)
-	fwrite(line, linelen, 1, stdout);
-.Ed
-.Sh COMPATIBILITY
-Many application writers used the name
-.Va getline
-before the
-.Fn getline
-function was introduced in
-.St -p1003.1 ,
-so a prototype is not provided by default in order to avoid
-compatibility problems.
-Applications that wish to use the
-.Fn getline
-function described herein should either request a strict
-.St -p1003.1-2008
-environment by defining the macro
-.Dv _POSIX_C_SOURCE
-to the value 200809 or greater, or by defining the macro
-.Dv _WITH_GETLINE ,
-prior to the inclusion of
-.In stdio.h .
-For compatibility with GNU libc, defining either
-.Dv _BSD_SOURCE
-or
-.Dv _GNU_SOURCE
-prior to the inclusion of
-.In stdio.h
-will also make
-.Fn getline
-available.
-.Sh ERRORS
-These functions may fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Either
-.Fa linep
-or
-.Fa linecapp
-is
-.Dv NULL .
-.It Bq Er EOVERFLOW
-No delimiter was found in the first
-.Dv SSIZE_MAX
-characters.
-.El
-.Pp
-These functions may also fail due to any of the errors specified for
-.Fn fgets
-and
-.Fn malloc .
-.Sh SEE ALSO
-.Xr fgetln 3 ,
-.Xr fgets 3 ,
-.Xr malloc 3
-.Sh STANDARDS
-The
-.Fn getdelim
-and
-.Fn getline
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-These routines first appeared in
-.Fx 8.0 .
-.Sh BUGS
-There are no wide character versions of
-.Fn getdelim
-or
-.Fn getline .
diff --git a/lib/libc_bsd/stdio/getline.c b/lib/libc_bsd/stdio/getline.c
deleted file mode 100644
index 371a545..0000000
--- a/lib/libc_bsd/stdio/getline.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/getline.c 189136 2009-02-28 06:00:58Z das $");
-
-#define	_WITH_GETLINE
-#include <stdio.h>
-
-ssize_t
-getline(char ** __restrict linep, size_t * __restrict linecapp,
-	FILE * __restrict fp)
-{
-
-	return (getdelim(linep, linecapp, '\n', fp));
-}
diff --git a/lib/libc_bsd/stdio/gets.c b/lib/libc_bsd/stdio/gets.c
deleted file mode 100644
index ec57632..0000000
--- a/lib/libc_bsd/stdio/gets.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)gets.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/gets.c 269007 2014-07-23 02:55:03Z pfg $");
-
-#include "namespace.h"
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/cdefs.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-__warn_references(gets, "warning: this program uses gets(), which is unsafe.");
-
-char *
-gets(char *buf)
-{
-	int c;
-	char *s;
-	static int warned;
-	static const char w[] =
-	    "warning: this program uses gets(), which is unsafe.\n";
-
-	FLOCKFILE(stdin);
-	ORIENT(stdin, -1);
-	if (!warned) {
-		(void) _write(STDERR_FILENO, w, sizeof(w) - 1);
-		warned = 1;
-	}
-	for (s = buf; (c = __sgetc(stdin)) != '\n';)
-		if (c == EOF)
-			if (s == buf) {
-				FUNLOCKFILE(stdin);
-				return (NULL);
-			} else
-				break;
-		else
-			*s++ = c;
-	*s = 0;
-	FUNLOCKFILE(stdin);
-	return (buf);
-}
diff --git a/lib/libc_bsd/stdio/getw.c b/lib/libc_bsd/stdio/getw.c
deleted file mode 100644
index 97919b8..0000000
--- a/lib/libc_bsd/stdio/getw.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getw.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/getw.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <stdio.h>
-
-int
-getw(FILE *fp)
-{
-	int x;
-
-	return (fread((void *)&x, sizeof(x), 1, fp) == 1 ? x : EOF);
-}
diff --git a/lib/libc_bsd/stdio/getwc.3 b/lib/libc_bsd/stdio/getwc.3
deleted file mode 100644
index 1a5c5ce..0000000
--- a/lib/libc_bsd/stdio/getwc.3
+++ /dev/null
@@ -1,114 +0,0 @@
-.\"	$NetBSD: getwc.3,v 1.3 2002/02/07 07:00:26 ross Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)getc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/getwc.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd March 3, 2004
-.Dt GETWC 3
-.Os
-.Sh NAME
-.Nm fgetwc ,
-.Nm getwc ,
-.Nm getwchar
-.Nd get next wide character from input stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft wint_t
-.Fn fgetwc "FILE *stream"
-.Ft wint_t
-.Fn getwc "FILE *stream"
-.Ft wint_t
-.Fn getwchar void
-.Sh DESCRIPTION
-The
-.Fn fgetwc
-function
-obtains the next input wide character (if present) from the stream pointed at by
-.Fa stream ,
-or the next character pushed back on the stream via
-.Xr ungetwc 3 .
-.Pp
-The
-.Fn getwc
-function
-acts essentially identically to
-.Fn fgetwc .
-.Pp
-The
-.Fn getwchar
-function
-is equivalent to
-.Fn getwc
-with the argument
-.Dv stdin .
-.Sh RETURN VALUES
-If successful, these routines return the next wide character
-from the
-.Fa stream .
-If the stream is at end-of-file or a read error occurs,
-the routines return
-.Dv WEOF .
-The routines
-.Xr feof 3
-and
-.Xr ferror 3
-must be used to distinguish between end-of-file and error.
-If an error occurs, the global variable
-.Va errno
-is set to indicate the error.
-The end-of-file condition is remembered, even on a terminal, and all
-subsequent attempts to read will return
-.Dv WEOF
-until the condition is cleared with
-.Xr clearerr 3 .
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fopen 3 ,
-.Xr fread 3 ,
-.Xr getc 3 ,
-.Xr putwc 3 ,
-.Xr stdio 3 ,
-.Xr ungetwc 3
-.Sh STANDARDS
-The
-.Fn fgetwc ,
-.Fn getwc
-and
-.Fn getwchar
-functions
-conform to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdio/getwc.c b/lib/libc_bsd/stdio/getwc.c
deleted file mode 100644
index 20b96a6..0000000
--- a/lib/libc_bsd/stdio/getwc.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/getwc.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-#undef getwc
-
-/*
- * Synonym for fgetwc(). The only difference is that getwc(), if it is a
- * macro, may evaluate `fp' more than once.
- */
-wint_t
-getwc(FILE *fp)
-{
-
-	return (fgetwc(fp));
-}
-wint_t
-getwc_l(FILE *fp, locale_t locale)
-{
-
-	return (fgetwc_l(fp, locale));
-}
diff --git a/lib/libc_bsd/stdio/getwchar.c b/lib/libc_bsd/stdio/getwchar.c
deleted file mode 100644
index 89aa1e2..0000000
--- a/lib/libc_bsd/stdio/getwchar.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/getwchar.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-#undef getwchar
-
-/*
- * Synonym for fgetwc(stdin).
- */
-wint_t
-getwchar(void)
-{
-	return (fgetwc(stdin));
-}
-wint_t
-getwchar_l(locale_t locale)
-{
-	return (fgetwc_l(stdin, locale));
-}
diff --git a/lib/libc_bsd/stdio/glue.h b/lib/libc_bsd/stdio/glue.h
deleted file mode 100644
index 93ae80d..0000000
--- a/lib/libc_bsd/stdio/glue.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- * 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.
- *
- *	@(#)glue.h	8.1 (Berkeley) 6/4/93
- * $FreeBSD: releng/10.2/lib/libc/stdio/glue.h 165903 2007-01-09 00:28:16Z imp $
- */
-
-/*
- * The first few FILEs are statically allocated; others are dynamically
- * allocated and linked in via this glue structure.
- */
-struct glue {
-	struct	glue *next;
-	int	niobs;
-	FILE	*iobs;
-};
-extern struct glue __sglue;
diff --git a/lib/libc_bsd/stdio/local.h b/lib/libc_bsd/stdio/local.h
deleted file mode 100644
index e91dea1..0000000
--- a/lib/libc_bsd/stdio/local.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- *
- *	@(#)local.h	8.3 (Berkeley) 7/3/94
- * $FreeBSD: releng/10.2/lib/libc/stdio/local.h 234799 2012-04-29 16:28:39Z das $
- */
-
-#include <sys/types.h>	/* for off_t */
-#include <pthread.h>
-#include <string.h>
-#include <wchar.h>
-#include <locale.h>
-
-/*
- * Information local to this implementation of stdio,
- * in particular, macros and private variables.
- */
-
-extern int	_sread(FILE *, char *, int);
-extern int	_swrite(FILE *, char const *, int);
-extern fpos_t	_sseek(FILE *, fpos_t, int);
-extern int	_ftello(FILE *, fpos_t *);
-extern int	_fseeko(FILE *, off_t, int, int);
-extern int	__fflush(FILE *fp);
-extern void	__fcloseall(void);
-extern wint_t	__fgetwc_mbs(FILE *, mbstate_t *, int *, locale_t);
-extern wint_t	__fputwc(wchar_t, FILE *, locale_t);
-extern int	__sflush(FILE *);
-extern FILE	*__sfp(void);
-extern int	__slbexpand(FILE *, size_t);
-extern int	__srefill(FILE *);
-extern int	__sread(void *, char *, int);
-extern int	__swrite(void *, char const *, int);
-extern fpos_t	__sseek(void *, fpos_t, int);
-extern int	__sclose(void *);
-extern void	__sinit(void);
-extern void	_cleanup(void);
-extern void	__smakebuf(FILE *);
-extern int	__swhatbuf(FILE *, size_t *, int *);
-extern int	_fwalk(int (*)(FILE *));
-extern int	__svfscanf(FILE *, locale_t, const char *, __va_list);
-extern int	__swsetup(FILE *);
-extern int	__sflags(const char *, int *);
-extern int	__ungetc(int, FILE *);
-extern wint_t	__ungetwc(wint_t, FILE *, locale_t);
-extern int	__vfprintf(FILE *, locale_t, const char *, __va_list);
-extern int	__vfscanf(FILE *, const char *, __va_list);
-extern int	__vfwprintf(FILE *, locale_t, const wchar_t *, __va_list);
-extern int	__vfwscanf(FILE * __restrict, locale_t, const wchar_t * __restrict,
-		    __va_list);
-extern size_t	__fread(void * __restrict buf, size_t size, size_t count,
-		FILE * __restrict fp);
-extern int	__sdidinit;
-
-static inline wint_t
-__fgetwc(FILE *fp, locale_t locale)
-{
-	int nread;
-
-	return (__fgetwc_mbs(fp, &fp->_mbstate, &nread, locale));
-}
-
-/*
- * Prepare the given FILE for writing, and return 0 iff it
- * can be written now.  Otherwise, return EOF and set errno.
- */
-#define	prepwrite(fp) \
- 	((((fp)->_flags & __SWR) == 0 || \
- 	    ((fp)->_bf._base == NULL && ((fp)->_flags & __SSTR) == 0)) && \
-	 __swsetup(fp))
-
-/*
- * Test whether the given stdio file has an active ungetc buffer;
- * release such a buffer, without restoring ordinary unread data.
- */
-#define	HASUB(fp) ((fp)->_ub._base != NULL)
-#define	FREEUB(fp) { \
-	if ((fp)->_ub._base != (fp)->_ubuf) \
-		free((char *)(fp)->_ub._base); \
-	(fp)->_ub._base = NULL; \
-}
-
-/*
- * test for an fgetln() buffer.
- */
-#define	HASLB(fp) ((fp)->_lb._base != NULL)
-#define	FREELB(fp) { \
-	free((char *)(fp)->_lb._base); \
-	(fp)->_lb._base = NULL; \
-}
-
-/*
- * Structure initializations for 'fake' FILE objects.
- */
-#define	FAKE_FILE {				\
-	._file = -1,				\
-	._fl_mutex = PTHREAD_MUTEX_INITIALIZER, \
-}
-
-/*
- * Set the orientation for a stream. If o > 0, the stream has wide-
- * orientation. If o < 0, the stream has byte-orientation.
- */
-#define	ORIENT(fp, o)	do {				\
-	if ((fp)->_orientation == 0)			\
-		(fp)->_orientation = (o);		\
-} while (0)
diff --git a/lib/libc_bsd/stdio/makebuf.c b/lib/libc_bsd/stdio/makebuf.c
deleted file mode 100644
index 20c374e..0000000
--- a/lib/libc_bsd/stdio/makebuf.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)makebuf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/makebuf.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-
-/*
- * Allocate a file buffer, or switch to unbuffered I/O.
- * Per the ANSI C standard, ALL tty devices default to line buffered.
- *
- * As a side effect, we set __SOPT or __SNPT (en/dis-able fseek
- * optimisation) right after the _fstat() that finds the buffer size.
- */
-void
-__smakebuf(FILE *fp)
-{
-	void *p;
-	int flags;
-	size_t size;
-	int couldbetty;
-
-	if (fp->_flags & __SNBF) {
-		fp->_bf._base = fp->_p = fp->_nbuf;
-		fp->_bf._size = 1;
-		return;
-	}
-	flags = __swhatbuf(fp, &size, &couldbetty);
-	if ((p = malloc(size)) == NULL) {
-		fp->_flags |= __SNBF;
-		fp->_bf._base = fp->_p = fp->_nbuf;
-		fp->_bf._size = 1;
-		return;
-	}
-	__cleanup = _cleanup;
-	flags |= __SMBF;
-	fp->_bf._base = fp->_p = p;
-	fp->_bf._size = size;
-	if (couldbetty && isatty(fp->_file))
-		flags |= __SLBF;
-	fp->_flags |= flags;
-}
-
-/*
- * Internal routine to determine `proper' buffering for a file.
- */
-int
-__swhatbuf(FILE *fp, size_t *bufsize, int *couldbetty)
-{
-	struct stat st;
-
-	if (fp->_file < 0 || _fstat(fp->_file, &st) < 0) {
-		*couldbetty = 0;
-		*bufsize = BUFSIZ;
-		return (__SNPT);
-	}
-
-	/* could be a tty iff it is a character device */
-	*couldbetty = (st.st_mode & S_IFMT) == S_IFCHR;
-	if (st.st_blksize <= 0) {
-		*bufsize = BUFSIZ;
-		return (__SNPT);
-	}
-
-	/*
-	 * Optimise fseek() only if it is a regular file.  (The test for
-	 * __sseek is mainly paranoia.)  It is safe to set _blksize
-	 * unconditionally; it will only be used if __SOPT is also set.
-	 */
-	*bufsize = st.st_blksize;
-	fp->_blksize = st.st_blksize;
-	return ((st.st_mode & S_IFMT) == S_IFREG && fp->_seek == __sseek ?
-	    __SOPT : __SNPT);
-}
diff --git a/lib/libc_bsd/stdio/mktemp.3 b/lib/libc_bsd/stdio/mktemp.3
deleted file mode 100644
index d222feb..0000000
--- a/lib/libc_bsd/stdio/mktemp.3
+++ /dev/null
@@ -1,326 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)mktemp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/mktemp.3 254151 2013-08-09 17:24:23Z jilles $
-.\"
-.Dd August 8, 2013
-.Dt MKTEMP 3
-.Os
-.Sh NAME
-.Nm mktemp
-.Nd make temporary file name (unique)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft char *
-.Fn mktemp "char *template"
-.Ft int
-.Fn mkstemp "char *template"
-.Ft int
-.Fn mkostemp "char *template" "int oflags"
-.Ft int
-.Fn mkostemps "char *template" "int suffixlen" "int oflags"
-.Ft char *
-.Fn mkdtemp "char *template"
-.In unistd.h
-.Ft int
-.Fn mkstemps "char *template" "int suffixlen"
-.Sh DESCRIPTION
-The
-.Fn mktemp
-function
-takes the given file name template and overwrites a portion of it
-to create a file name.
-This file name is guaranteed not to exist at the time of function invocation
-and is suitable for use
-by the application.
-The template may be any file name with some number of
-.Ql X Ns s
-appended
-to it, for example
-.Pa /tmp/temp.XXXXXX .
-The trailing
-.Ql X Ns s
-are replaced with a
-unique alphanumeric combination.
-The number of unique file names
-.Fn mktemp
-can return depends on the number of
-.Ql X Ns s
-provided; six
-.Ql X Ns s
-will
-result in
-.Fn mktemp
-selecting one of 56800235584 (62 ** 6) possible temporary file names.
-.Pp
-The
-.Fn mkstemp
-function
-makes the same replacement to the template and creates the template file,
-mode 0600, returning a file descriptor opened for reading and writing.
-This avoids the race between testing for a file's existence and opening it
-for use.
-.Pp
-The
-.Fn mkostemp
-function
-is like
-.Fn mkstemp
-but allows specifying additional
-.Xr open 2
-flags (defined in
-.In fcntl.h ) .
-The permitted flags are
-.Dv O_APPEND ,
-.Dv O_DIRECT ,
-.Dv O_SHLOCK ,
-.Dv O_EXLOCK ,
-.Dv O_SYNC
-and
-.Dv O_CLOEXEC .
-.Pp
-The
-.Fn mkstemps
-and
-.Fn mkostemps
-functions act the same as
-.Fn mkstemp
-and
-.Fn mkostemp
-respectively,
-except they permit a suffix to exist in the template.
-The template should be of the form
-.Pa /tmp/tmpXXXXXXsuffix .
-The
-.Fn mkstemps
-and
-.Fn mkostemps
-function
-are told the length of the suffix string.
-.Pp
-The
-.Fn mkdtemp
-function makes the same replacement to the template as in
-.Fn mktemp
-and creates the template directory, mode 0700.
-.Sh RETURN VALUES
-The
-.Fn mktemp
-and
-.Fn mkdtemp
-functions return a pointer to the template on success and
-.Dv NULL
-on failure.
-The
-.Fn mkstemp ,
-.Fn mkostemp
-.Fn mkstemps
-and
-.Fn mkostemps
-functions
-return \-1 if no suitable file could be created.
-If either call fails an error code is placed in the global variable
-.Va errno .
-.Sh ERRORS
-The
-.Fn mkstemp ,
-.Fn mkostemp ,
-.Fn mkstemps ,
-.Fn mkostemps
-and
-.Fn mkdtemp
-functions
-may set
-.Va errno
-to one of the following values:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-The pathname portion of the template is not an existing directory.
-.El
-.Pp
-The
-.Fn mkostemp
-and
-.Fn mkostemps
-functions
-may also set
-.Va errno
-to the following value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa oflags
-argument is invalid.
-.El
-.Pp
-The
-.Fn mkstemp ,
-.Fn mkostemp ,
-.Fn mkstemps ,
-.Fn mkostemps
-and
-.Fn mkdtemp
-functions
-may also set
-.Va errno
-to any value specified by the
-.Xr stat 2
-function.
-.Pp
-The
-.Fn mkstemp ,
-.Fn mkostemp ,
-.Fn mkstemps
-and
-.Fn mkostemps
-functions
-may also set
-.Va errno
-to any value specified by the
-.Xr open 2
-function.
-.Pp
-The
-.Fn mkdtemp
-function
-may also set
-.Va errno
-to any value specified by the
-.Xr mkdir 2
-function.
-.Sh NOTES
-A common problem that results in a core dump is that the programmer
-passes in a read-only string to
-.Fn mktemp ,
-.Fn mkstemp ,
-.Fn mkstemps
-or
-.Fn mkdtemp .
-This is common with programs that were developed before
-.St -isoC
-compilers were common.
-For example, calling
-.Fn mkstemp
-with an argument of
-.Qq /tmp/tempfile.XXXXXX
-will result in a core dump due to
-.Fn mkstemp
-attempting to modify the string constant that was given.
-.Pp
-The
-.Fn mkdtemp ,
-.Fn mkstemp
-and
-.Fn mktemp
-function prototypes are also available from
-.In unistd.h .
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr getpid 2 ,
-.Xr mkdir 2 ,
-.Xr open 2 ,
-.Xr stat 2
-.Sh STANDARDS
-The
-.Fn mkstemp
-and
-.Fn mkdtemp
-functions are expected to conform to
-.St -p1003.1-2008 .
-The
-.Fn mktemp
-function is expected to conform to
-.St -p1003.1-2001
-and is not specified by
-.St -p1003.1-2008 .
-The
-.Fn mkostemp ,
-.Fn mkstemps
-and
-.Fn mkostemps
-functions do not conform to any standard.
-.Sh HISTORY
-A
-.Fn mktemp
-function appeared in
-.At v7 .
-The
-.Fn mkstemp
-function appeared in
-.Bx 4.4 .
-The
-.Fn mkdtemp
-function first appeared in
-.Ox 2.2 ,
-and later in
-.Fx 3.2 .
-The
-.Fn mkstemps
-function first appeared in
-.Ox 2.4 ,
-and later in
-.Fx 3.4 .
-The
-.Fn mkostemp
-and
-.Fn mkostemps
-functions appeared in
-.Fx 10.0 .
-.Sh BUGS
-This family of functions produces filenames which can be guessed,
-though the risk is minimized when large numbers of
-.Ql X Ns s
-are used to
-increase the number of possible temporary filenames.
-This makes the race in
-.Fn mktemp ,
-between testing for a file's existence (in the
-.Fn mktemp
-function call)
-and opening it for use
-(later in the user application)
-particularly dangerous from a security perspective.
-Whenever it is possible,
-.Fn mkstemp
-or
-.Fn mkostemp
-should be used instead, since it does not have the race condition.
-If
-.Fn mkstemp
-cannot be used, the filename created by
-.Fn mktemp
-should be created using the
-.Dv O_EXCL
-flag to
-.Xr open 2
-and the return status of the call should be tested for failure.
-This will ensure that the program does not continue blindly
-in the event that an attacker has already created the file
-with the intention of manipulating or reading its contents.
diff --git a/lib/libc_bsd/stdio/mktemp.c b/lib/libc_bsd/stdio/mktemp.c
deleted file mode 100644
index 4ee6209..0000000
--- a/lib/libc_bsd/stdio/mktemp.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 1987, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mktemp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/mktemp.c 254151 2013-08-09 17:24:23Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-char *_mktemp(char *);
-
-static int _gettemp(char *, int *, int, int, int);
-
-static const unsigned char padchar[] =
-"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-int
-mkostemps(char *path, int slen, int oflags)
-{
-	int fd;
-
-	return (_gettemp(path, &fd, 0, slen, oflags) ? fd : -1);
-}
-
-int
-mkstemps(char *path, int slen)
-{
-	int fd;
-
-	return (_gettemp(path, &fd, 0, slen, 0) ? fd : -1);
-}
-
-int
-mkostemp(char *path, int oflags)
-{
-	int fd;
-
-	return (_gettemp(path, &fd, 0, 0, oflags) ? fd : -1);
-}
-
-int
-mkstemp(char *path)
-{
-	int fd;
-
-	return (_gettemp(path, &fd, 0, 0, 0) ? fd : -1);
-}
-
-char *
-mkdtemp(char *path)
-{
-	return (_gettemp(path, (int *)NULL, 1, 0, 0) ? path : (char *)NULL);
-}
-
-char *
-_mktemp(char *path)
-{
-	return (_gettemp(path, (int *)NULL, 0, 0, 0) ? path : (char *)NULL);
-}
-
-__warn_references(mktemp,
-    "warning: mktemp() possibly used unsafely; consider using mkstemp()");
-
-char *
-mktemp(char *path)
-{
-	return (_mktemp(path));
-}
-
-static int
-_gettemp(char *path, int *doopen, int domkdir, int slen, int oflags)
-{
-	char *start, *trv, *suffp, *carryp;
-	char *pad;
-	struct stat sbuf;
-	int rval;
-	uint32_t rand;
-	char carrybuf[MAXPATHLEN];
-
-	if ((doopen != NULL && domkdir) || slen < 0 ||
-	    (oflags & ~(O_APPEND | O_DIRECT | O_SHLOCK | O_EXLOCK | O_SYNC |
-	    O_CLOEXEC)) != 0) {
-		errno = EINVAL;
-		return (0);
-	}
-
-	for (trv = path; *trv != '\0'; ++trv)
-		;
-	if (trv - path >= MAXPATHLEN) {
-		errno = ENAMETOOLONG;
-		return (0);
-	}
-	trv -= slen;
-	suffp = trv;
-	--trv;
-	if (trv < path || NULL != strchr(suffp, '/')) {
-		errno = EINVAL;
-		return (0);
-	}
-
-	/* Fill space with random characters */
-	while (trv >= path && *trv == 'X') {
-		rand = arc4random_uniform(sizeof(padchar) - 1);
-		*trv-- = padchar[rand];
-	}
-	start = trv + 1;
-
-	/* save first combination of random characters */
-	memcpy(carrybuf, start, suffp - start);
-
-	/*
-	 * check the target directory.
-	 */
-	if (doopen != NULL || domkdir) {
-		for (; trv > path; --trv) {
-			if (*trv == '/') {
-				*trv = '\0';
-				rval = stat(path, &sbuf);
-				*trv = '/';
-				if (rval != 0)
-					return (0);
-				if (!S_ISDIR(sbuf.st_mode)) {
-					errno = ENOTDIR;
-					return (0);
-				}
-				break;
-			}
-		}
-	}
-
-	for (;;) {
-		if (doopen) {
-			if ((*doopen =
-			    _open(path, O_CREAT|O_EXCL|O_RDWR|oflags, 0600)) >=
-			    0)
-				return (1);
-			if (errno != EEXIST)
-				return (0);
-		} else if (domkdir) {
-			if (mkdir(path, 0700) == 0)
-				return (1);
-			if (errno != EEXIST)
-				return (0);
-		} else if (lstat(path, &sbuf))
-			return (errno == ENOENT);
-
-		/* If we have a collision, cycle through the space of filenames */
-		for (trv = start, carryp = carrybuf;;) {
-			/* have we tried all possible permutations? */
-			if (trv == suffp)
-				return (0); /* yes - exit with EEXIST */
-			pad = strchr(padchar, *trv);
-			if (pad == NULL) {
-				/* this should never happen */
-				errno = EIO;
-				return (0);
-			}
-			/* increment character */
-			*trv = (*++pad == '\0') ? padchar[0] : *pad;
-			/* carry to next position? */
-			if (*trv == *carryp) {
-				/* increment position and loop */
-				++trv;
-				++carryp;
-			} else {
-				/* try with new name */
-				break;
-			}
-		}
-	}
-	/*NOTREACHED*/
-}
diff --git a/lib/libc_bsd/stdio/open_memstream.3 b/lib/libc_bsd/stdio/open_memstream.3
deleted file mode 100644
index abf68be..0000000
--- a/lib/libc_bsd/stdio/open_memstream.3
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" Copyright (c) 2013 Hudson River Trading LLC
-.\" Written by: John H. Baldwin <jhb@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.
-.\"
-.\" 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: releng/10.2/lib/libc/stdio/open_memstream.3 283927 2015-06-02 19:20:39Z jhb $
-.\"
-.Dd October 28, 2014
-.Dt OPEN_MEMSTREAM 3
-.Os
-.Sh NAME
-.Nm open_memstream ,
-.Nm open_wmemstream
-.Nd dynamic memory buffer stream open functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn open_memstream "char **bufp" "size_t *sizep"
-.In wchar.h
-.Ft FILE *
-.Fn open_wmemstream "wchar_t **bufp" "size_t *sizep"
-.Sh DESCRIPTION
-The
-.Fn open_memstream
-and
-.Fn open_wmemstream
-functions create a write-only, seekable stream backed by a dynamically
-allocated memory buffer.
-The
-.Fn open_memstream
-function creates a byte-oriented stream,
-while the
-.Fn open_wmemstream
-function creates a wide-oriented stream.
-.Pp
-Each stream maintains a current position and size.
-Initially,
-the position and size are set to zero.
-Each write begins at the current position and advances it the number of
-successfully written bytes for
-.Fn open_memstream
-or wide characters for
-.Fn open_wmemstream .
-If a write moves the current position beyond the length of the buffer,
-the length of the buffer is extended and a null character is appended to the
-buffer.
-.Pp
-A stream's buffer always contains a null character at the end of the buffer
-that is not included in the current length.
-.Pp
-If a stream's current position is moved beyond the current length via a
-seek operation and a write is performed,
-the characters between the current length and the current position are filled
-with null characters before the write is performed.
-.Pp
-After a successful call to
-.Xr fclose 3
-or
-.Xr fflush 3 ,
-the pointer referenced by
-.Fa bufp
-will contain the start of the memory buffer and the variable referenced by
-.Fa sizep
-will contain the smaller of the current position and the current buffer length.
-.Pp
-After a successful call to
-.Xr fflush 3,
-the pointer referenced by
-.Fa bufp
-and the variable referenced by
-.Fa sizep
-are only valid until the next write operation or a call to
-.Xr fclose 3.
-.Pp
-Once a stream is closed,
-the allocated buffer referenced by
-.Fa bufp
-should be released via a call to
-.Xr free 3
-when it is no longer needed.
-.Sh IMPLEMENTATION NOTES
-Internally all I/O streams are effectively byte-oriented,
-so using wide-oriented operations to write to a stream opened via
-.Fn open_wmemstream
-results in wide characters being expanded to a stream of multibyte characters
-in stdio's internal buffers.
-These multibyte characters are then converted back to wide characters when
-written into the stream.
-As a result,
-the wide-oriented streams maintain an internal multibyte character conversion
-state that is cleared on any seek opertion that changes the current position.
-This should have no effect as long as wide-oriented output operations are used
-on a wide-oriented stream.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn open_memstream
-and
-.Fn open_wmemstream
-return a
-.Tn FILE
-pointer.
-Otherwise,
-.Dv NULL
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa bufp
-or
-.Fa sizep
-argument was
-.Dv NULL .
-.It Bq Er ENOMEM
-Memory for the stream or buffer could not be allocated.
-.El
-.Sh SEE ALSO
-.Xr fclose 3 ,
-.Xr fflush 3 ,
-.Xr fopen 3 ,
-.Xr free 3 ,
-.Xr fseek 3 ,
-.Xr sbuf 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The
-.Fn open_memstream
-and
-.Fn open_wmemstream
-functions conform to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/stdio/open_memstream.c b/lib/libc_bsd/stdio/open_memstream.c
deleted file mode 100644
index 8f6d60c..0000000
--- a/lib/libc_bsd/stdio/open_memstream.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*-
- * Copyright (c) 2013 Hudson River Trading LLC
- * Written by: John H. Baldwin <jhb@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/open_memstream.c 283927 2015-06-02 19:20:39Z jhb $");
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "un-namespace.h"
-
-/* XXX: There is no FPOS_MAX.  This assumes fpos_t is an off_t. */
-#define	FPOS_MAX	OFF_MAX
-
-struct memstream {
-	char **bufp;
-	size_t *sizep;
-	ssize_t len;
-	fpos_t offset;
-};
-
-static int
-memstream_grow(struct memstream *ms, fpos_t newoff)
-{
-	char *buf;
-	ssize_t newsize;
-
-	if (newoff < 0 || newoff >= SSIZE_MAX)
-		newsize = SSIZE_MAX - 1;
-	else
-		newsize = newoff;
-	if (newsize > ms->len) {
-		buf = realloc(*ms->bufp, newsize + 1);
-		if (buf != NULL) {
-#ifdef DEBUG
-			fprintf(stderr, "MS: %p growing from %zd to %zd\n",
-			    ms, ms->len, newsize);
-#endif
-			memset(buf + ms->len + 1, 0, newsize - ms->len);
-			*ms->bufp = buf;
-			ms->len = newsize;
-			return (1);
-		}
-		return (0);
-	}
-	return (1);
-}
-
-static void
-memstream_update(struct memstream *ms)
-{
-
-	assert(ms->len >= 0 && ms->offset >= 0);
-	*ms->sizep = ms->len < ms->offset ? ms->len : ms->offset;
-}
-
-static int
-memstream_write(void *cookie, const char *buf, int len)
-{
-	struct memstream *ms;
-	ssize_t tocopy;
-
-	ms = cookie;
-	if (!memstream_grow(ms, ms->offset + len))
-		return (-1);
-	tocopy = ms->len - ms->offset;
-	if (len < tocopy)
-		tocopy = len;
-	memcpy(*ms->bufp + ms->offset, buf, tocopy);
-	ms->offset += tocopy;
-	memstream_update(ms);
-#ifdef DEBUG
-	fprintf(stderr, "MS: write(%p, %d) = %zd\n", ms, len, tocopy);
-#endif
-	return (tocopy);
-}
-
-static fpos_t
-memstream_seek(void *cookie, fpos_t pos, int whence)
-{
-	struct memstream *ms;
-#ifdef DEBUG
-	fpos_t old;
-#endif
-
-	ms = cookie;
-#ifdef DEBUG
-	old = ms->offset;
-#endif
-	switch (whence) {
-	case SEEK_SET:
-		/* _fseeko() checks for negative offsets. */
-		assert(pos >= 0);
-		ms->offset = pos;
-		break;
-	case SEEK_CUR:
-		/* This is only called by _ftello(). */
-		assert(pos == 0);
-		break;
-	case SEEK_END:
-		if (pos < 0) {
-			if (pos + ms->len < 0) {
-#ifdef DEBUG
-				fprintf(stderr,
-				    "MS: bad SEEK_END: pos %jd, len %zd\n",
-				    (intmax_t)pos, ms->len);
-#endif
-				errno = EINVAL;
-				return (-1);
-			}
-		} else {
-			if (FPOS_MAX - ms->len < pos) {
-#ifdef DEBUG
-				fprintf(stderr,
-				    "MS: bad SEEK_END: pos %jd, len %zd\n",
-				    (intmax_t)pos, ms->len);
-#endif
-				errno = EOVERFLOW;
-				return (-1);
-			}
-		}
-		ms->offset = ms->len + pos;
-		break;
-	}
-	memstream_update(ms);
-#ifdef DEBUG
-	fprintf(stderr, "MS: seek(%p, %jd, %d) %jd -> %jd\n", ms, (intmax_t)pos,
-	    whence, (intmax_t)old, (intmax_t)ms->offset);
-#endif
-	return (ms->offset);
-}
-
-static int
-memstream_close(void *cookie)
-{
-
-	free(cookie);
-	return (0);
-}
-
-FILE *
-open_memstream(char **bufp, size_t *sizep)
-{
-	struct memstream *ms;
-	int save_errno;
-	FILE *fp;
-
-	if (bufp == NULL || sizep == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	*bufp = calloc(1, 1);
-	if (*bufp == NULL)
-		return (NULL);
-	ms = malloc(sizeof(*ms));
-	if (ms == NULL) {
-		save_errno = errno;
-		free(*bufp);
-		*bufp = NULL;
-		errno = save_errno;
-		return (NULL);
-	}
-	ms->bufp = bufp;
-	ms->sizep = sizep;
-	ms->len = 0;
-	ms->offset = 0;
-	memstream_update(ms);
-	fp = funopen(ms, NULL, memstream_write, memstream_seek,
-	    memstream_close);
-	if (fp == NULL) {
-		save_errno = errno;
-		free(ms);
-		free(*bufp);
-		*bufp = NULL;
-		errno = save_errno;
-		return (NULL);
-	}
-	fwide(fp, -1);
-	return (fp);
-}
diff --git a/lib/libc_bsd/stdio/open_wmemstream.c b/lib/libc_bsd/stdio/open_wmemstream.c
deleted file mode 100644
index c5cd314..0000000
--- a/lib/libc_bsd/stdio/open_wmemstream.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*-
- * Copyright (c) 2013 Hudson River Trading LLC
- * Written by: John H. Baldwin <jhb@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/open_wmemstream.c 283927 2015-06-02 19:20:39Z jhb $");
-
-#include "namespace.h"
-#include <assert.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "un-namespace.h"
-
-/* XXX: There is no FPOS_MAX.  This assumes fpos_t is an off_t. */
-#define	FPOS_MAX	OFF_MAX
-
-struct wmemstream {
-	wchar_t **bufp;
-	size_t *sizep;
-	ssize_t len;
-	fpos_t offset;
-	mbstate_t mbstate;
-};
-
-static int
-wmemstream_grow(struct wmemstream *ms, fpos_t newoff)
-{
-	wchar_t *buf;
-	ssize_t newsize;
-
-	if (newoff < 0 || newoff >= SSIZE_MAX / sizeof(wchar_t))
-		newsize = SSIZE_MAX / sizeof(wchar_t) - 1;
-	else
-		newsize = newoff;
-	if (newsize > ms->len) {
-		buf = realloc(*ms->bufp, (newsize + 1) * sizeof(wchar_t));
-		if (buf != NULL) {
-#ifdef DEBUG
-			fprintf(stderr, "WMS: %p growing from %zd to %zd\n",
-			    ms, ms->len, newsize);
-#endif
-			wmemset(buf + ms->len + 1, 0, newsize - ms->len);
-			*ms->bufp = buf;
-			ms->len = newsize;
-			return (1);
-		}
-		return (0);
-	}
-	return (1);
-}
-
-static void
-wmemstream_update(struct wmemstream *ms)
-{
-
-	assert(ms->len >= 0 && ms->offset >= 0);
-	*ms->sizep = ms->len < ms->offset ? ms->len : ms->offset;
-}
-
-/*
- * Based on a starting multibyte state and an input buffer, determine
- * how many wchar_t's would be output.  This doesn't use mbsnrtowcs()
- * so that it can handle embedded null characters.
- */
-static size_t
-wbuflen(const mbstate_t *state, const char *buf, int len)
-{
-	mbstate_t lenstate;
-	size_t charlen, count;
-
-	count = 0;
-	lenstate = *state;
-	while (len > 0) {
-		charlen = mbrlen(buf, len, &lenstate);
-		if (charlen == (size_t)-1)
-			return (-1);
-		if (charlen == (size_t)-2)
-			break;
-		if (charlen == 0)
-			/* XXX: Not sure how else to handle this. */
-			charlen = 1;
-		len -= charlen;
-		buf += charlen;
-		count++;
-	}
-	return (count);
-}
-
-static int
-wmemstream_write(void *cookie, const char *buf, int len)
-{
-	struct wmemstream *ms;
-	ssize_t consumed, wlen;
-	size_t charlen;
-
-	ms = cookie;
-	wlen = wbuflen(&ms->mbstate, buf, len);
-	if (wlen < 0) {
-		errno = EILSEQ;
-		return (-1);
-	}
-	if (!wmemstream_grow(ms, ms->offset + wlen))
-		return (-1);
-
-	/*
-	 * This copies characters one at a time rather than using
-	 * mbsnrtowcs() so it can properly handle embedded null
-	 * characters.
-	 */
-	consumed = 0;
-	while (len > 0 && ms->offset < ms->len) {
-		charlen = mbrtowc(*ms->bufp + ms->offset, buf, len,
-		    &ms->mbstate);
-		if (charlen == (size_t)-1) {
-			if (consumed == 0) {
-				errno = EILSEQ;
-				return (-1);
-			}
-			/* Treat it as a successful short write. */
-			break;
-		}
-		if (charlen == 0)
-			/* XXX: Not sure how else to handle this. */
-			charlen = 1;
-		if (charlen == (size_t)-2) {
-			consumed += len;
-			len = 0;
-		} else {
-			consumed += charlen;
-			buf += charlen;
-			len -= charlen;
-			ms->offset++;
-		}
-	}
-	wmemstream_update(ms);
-#ifdef DEBUG
-	fprintf(stderr, "WMS: write(%p, %d) = %zd\n", ms, len, consumed);
-#endif
-	return (consumed);
-}
-
-static fpos_t
-wmemstream_seek(void *cookie, fpos_t pos, int whence)
-{
-	struct wmemstream *ms;
-	fpos_t old;
-
-	ms = cookie;
-	old = ms->offset;
-	switch (whence) {
-	case SEEK_SET:
-		/* _fseeko() checks for negative offsets. */
-		assert(pos >= 0);
-		ms->offset = pos;
-		break;
-	case SEEK_CUR:
-		/* This is only called by _ftello(). */
-		assert(pos == 0);
-		break;
-	case SEEK_END:
-		if (pos < 0) {
-			if (pos + ms->len < 0) {
-#ifdef DEBUG
-				fprintf(stderr,
-				    "WMS: bad SEEK_END: pos %jd, len %zd\n",
-				    (intmax_t)pos, ms->len);
-#endif
-				errno = EINVAL;
-				return (-1);
-			}
-		} else {
-			if (FPOS_MAX - ms->len < pos) {
-#ifdef DEBUG
-				fprintf(stderr,
-				    "WMS: bad SEEK_END: pos %jd, len %zd\n",
-				    (intmax_t)pos, ms->len);
-#endif
-				errno = EOVERFLOW;
-				return (-1);
-			}
-		}
-		ms->offset = ms->len + pos;
-		break;
-	}
-	/* Reset the multibyte state if a seek changes the position. */
-	if (ms->offset != old)
-		memset(&ms->mbstate, 0, sizeof(ms->mbstate));
-	wmemstream_update(ms);
-#ifdef DEBUG
-	fprintf(stderr, "WMS: seek(%p, %jd, %d) %jd -> %jd\n", ms,
-	    (intmax_t)pos, whence, (intmax_t)old, (intmax_t)ms->offset);
-#endif
-	return (ms->offset);
-}
-
-static int
-wmemstream_close(void *cookie)
-{
-
-	free(cookie);
-	return (0);
-}
-
-FILE *
-open_wmemstream(wchar_t **bufp, size_t *sizep)
-{
-	struct wmemstream *ms;
-	int save_errno;
-	FILE *fp;
-
-	if (bufp == NULL || sizep == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	*bufp = calloc(1, sizeof(wchar_t));
-	if (*bufp == NULL)
-		return (NULL);
-	ms = malloc(sizeof(*ms));
-	if (ms == NULL) {
-		save_errno = errno;
-		free(*bufp);
-		*bufp = NULL;
-		errno = save_errno;
-		return (NULL);
-	}
-	ms->bufp = bufp;
-	ms->sizep = sizep;
-	ms->len = 0;
-	ms->offset = 0;
-	memset(&ms->mbstate, 0, sizeof(mbstate_t));
-	wmemstream_update(ms);
-	fp = funopen(ms, NULL, wmemstream_write, wmemstream_seek,
-	    wmemstream_close);
-	if (fp == NULL) {
-		save_errno = errno;
-		free(ms);
-		free(*bufp);
-		*bufp = NULL;
-		errno = save_errno;
-		return (NULL);
-	}
-	fwide(fp, 1);
-	return (fp);
-}
diff --git a/lib/libc_bsd/stdio/perror.c b/lib/libc_bsd/stdio/perror.c
deleted file mode 100644
index 4034103..0000000
--- a/lib/libc_bsd/stdio/perror.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)perror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/perror.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-void
-perror(const char *s)
-{
-	char msgbuf[NL_TEXTMAX];
-	struct iovec *v;
-	struct iovec iov[4];
-
-	v = iov;
-	if (s != NULL && *s != '\0') {
-		v->iov_base = (char *)s;
-		v->iov_len = strlen(s);
-		v++;
-		v->iov_base = ": ";
-		v->iov_len = 2;
-		v++;
-	}
-	strerror_r(errno, msgbuf, sizeof(msgbuf));
-	v->iov_base = msgbuf;
-	v->iov_len = strlen(v->iov_base);
-	v++;
-	v->iov_base = "\n";
-	v->iov_len = 1;
-	FLOCKFILE(stderr);
-	__sflush(stderr);
-	(void)_writev(stderr->_file, iov, (v - iov) + 1);
-	stderr->_flags &= ~__SOFF;
-	FUNLOCKFILE(stderr);
-}
diff --git a/lib/libc_bsd/stdio/printf-pos.c b/lib/libc_bsd/stdio/printf-pos.c
deleted file mode 100644
index cabc1e1..0000000
--- a/lib/libc_bsd/stdio/printf-pos.c
+++ /dev/null
@@ -1,752 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/printf-pos.c 249808 2013-04-23 13:33:13Z emaste $");
-
-/*
- * This is the code responsible for handling positional arguments
- * (%m$ and %m$.n$) for vfprintf() and vfwprintf().
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-
-#include "un-namespace.h"
-#include "printflocal.h"
-
-/*
- * Type ids for argument type table.
- */
-enum typeid {
-	T_UNUSED, TP_SHORT, T_INT, T_U_INT, TP_INT,
-	T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
-	T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SSIZET,
-	T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
-	T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
-};
-
-/* An expandable array of types. */
-struct typetable {
-	enum typeid *table; /* table of types */
-	enum typeid stattable[STATIC_ARG_TBL_SIZE];
-	int tablesize;		/* current size of type table */
-	int tablemax;		/* largest used index in table */
-	int nextarg;		/* 1-based argument index */
-};
-
-static int	__grow_type_table(struct typetable *);
-static void	build_arg_table (struct typetable *, va_list, union arg **);
-
-/*
- * Initialize a struct typetable.
- */
-static inline void
-inittypes(struct typetable *types)
-{
-	int n;
-
-	types->table = types->stattable;
-	types->tablesize = STATIC_ARG_TBL_SIZE;
-	types->tablemax = 0; 
-	types->nextarg = 1;
-	for (n = 0; n < STATIC_ARG_TBL_SIZE; n++)
-		types->table[n] = T_UNUSED;
-}
-
-/*
- * struct typetable destructor.
- */ 
-static inline void
-freetypes(struct typetable *types)
-{
-
-	if (types->table != types->stattable)
-		free (types->table);
-}
-
-/*
- * Ensure that there is space to add a new argument type to the type table.
- * Expand the table if necessary. Returns 0 on success.
- */
-static inline int
-_ensurespace(struct typetable *types)
-{
-
-	if (types->nextarg >= types->tablesize) {
-		if (__grow_type_table(types))
-			return (-1);
-	}
-	if (types->nextarg > types->tablemax)
-		types->tablemax = types->nextarg;
-	return (0);
-}
-
-/*
- * Add an argument type to the table, expanding if necessary.
- * Returns 0 on success.
- */
-static inline int
-addtype(struct typetable *types, enum typeid type)
-{
-
-	if (_ensurespace(types))
-		return (-1);
-	types->table[types->nextarg++] = type;
-	return (0);
-}
-
-static inline int
-addsarg(struct typetable *types, int flags)
-{
-
-	if (_ensurespace(types))
-		return (-1);
-	if (flags & INTMAXT)
-		types->table[types->nextarg++] = T_INTMAXT;
-	else if (flags & SIZET)
-		types->table[types->nextarg++] = T_SSIZET;
-	else if (flags & PTRDIFFT)
-		types->table[types->nextarg++] = T_PTRDIFFT;
-	else if (flags & LLONGINT)
-		types->table[types->nextarg++] = T_LLONG;
-	else if (flags & LONGINT)
-		types->table[types->nextarg++] = T_LONG;
-	else
-		types->table[types->nextarg++] = T_INT;
-	return (0);
-}
-
-static inline int
-adduarg(struct typetable *types, int flags)
-{
-
-	if (_ensurespace(types))
-		return (-1);
-	if (flags & INTMAXT)
-		types->table[types->nextarg++] = T_UINTMAXT;
-	else if (flags & SIZET)
-		types->table[types->nextarg++] = T_SIZET;
-	else if (flags & PTRDIFFT)
-		types->table[types->nextarg++] = T_SIZET;
-	else if (flags & LLONGINT)
-		types->table[types->nextarg++] = T_U_LLONG;
-	else if (flags & LONGINT)
-		types->table[types->nextarg++] = T_U_LONG;
-	else
-		types->table[types->nextarg++] = T_U_INT;
-	return (0);
-}
-
-/*
- * Add * arguments to the type array.
- */
-static inline int
-addaster(struct typetable *types, char **fmtp)
-{
-	char *cp;
-	int n2;
-
-	n2 = 0;
-	cp = *fmtp;
-	while (is_digit(*cp)) {
-		n2 = 10 * n2 + to_digit(*cp);
-		cp++;
-	}
-	if (*cp == '$') {
-		int hold = types->nextarg;
-		types->nextarg = n2;
-		if (addtype(types, T_INT))
-			return (-1);
-		types->nextarg = hold;
-		*fmtp = ++cp;
-	} else {
-		if (addtype(types, T_INT))
-			return (-1);
-	}
-	return (0);
-}
-
-static inline int
-addwaster(struct typetable *types, wchar_t **fmtp)
-{
-	wchar_t *cp;
-	int n2;
-
-	n2 = 0;
-	cp = *fmtp;
-	while (is_digit(*cp)) {
-		n2 = 10 * n2 + to_digit(*cp);
-		cp++;
-	}
-	if (*cp == '$') {
-		int hold = types->nextarg;
-		types->nextarg = n2;
-		if (addtype(types, T_INT))
-			return (-1);
-		types->nextarg = hold;
-		*fmtp = ++cp;
-	} else {
-		if (addtype(types, T_INT))
-			return (-1);
-	}
-	return (0);
-}
-
-/*
- * Find all arguments when a positional parameter is encountered.  Returns a
- * table, indexed by argument number, of pointers to each arguments.  The
- * initial argument table should be an array of STATIC_ARG_TBL_SIZE entries.
- * It will be replaces with a malloc-ed one if it overflows.
- * Returns 0 on success. On failure, returns nonzero and sets errno.
- */ 
-int
-__find_arguments (const char *fmt0, va_list ap, union arg **argtable)
-{
-	char *fmt;		/* format string */
-	int ch;			/* character from fmt */
-	int n;			/* handy integer (short term usage) */
-	int error;
-	int flags;		/* flags as above */
-	struct typetable types;	/* table of types */
-
-	fmt = (char *)fmt0;
-	inittypes(&types);
-	error = 0;
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		while ((ch = *fmt) != '\0' && ch != '%')
-			fmt++;
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-		case '#':
-			goto rflag;
-		case '*':
-			if ((error = addaster(&types, &fmt)))
-				goto error;
-			goto rflag;
-		case '-':
-		case '+':
-		case '\'':
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				if ((error = addaster(&types, &fmt)))
-					goto error;
-				goto rflag;
-			}
-			while (is_digit(ch)) {
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				types.nextarg = n;
-				goto rflag;
-			}
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-			error = addtype(&types,
-					(flags & LONGINT) ? T_WINT : T_INT);
-			if (error)
-				goto error;
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			if ((error = addsarg(&types, flags)))
-				goto error;
-			break;
-#ifndef NO_FLOATING_POINT
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'g':
-		case 'G':
-			error = addtype(&types,
-			    (flags & LONGDBL) ? T_LONG_DOUBLE : T_DOUBLE);
-			if (error)
-				goto error;
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			if (flags & INTMAXT)
-				error = addtype(&types, TP_INTMAXT);
-			else if (flags & PTRDIFFT)
-				error = addtype(&types, TP_PTRDIFFT);
-			else if (flags & SIZET)
-				error = addtype(&types, TP_SSIZET);
-			else if (flags & LLONGINT)
-				error = addtype(&types, TP_LLONG);
-			else if (flags & LONGINT)
-				error = addtype(&types, TP_LONG);
-			else if (flags & SHORTINT)
-				error = addtype(&types, TP_SHORT);
-			else if (flags & CHARINT)
-				error = addtype(&types, TP_SCHAR);
-			else
-				error = addtype(&types, TP_INT);
-			if (error)
-				goto error;
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			if ((error = adduarg(&types, flags)))
-				goto error;
-			break;
-		case 'p':
-			if ((error = addtype(&types, TP_VOID)))
-				goto error;
-			break;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			error = addtype(&types,
-					(flags & LONGINT) ? TP_WCHAR : TP_CHAR);
-			if (error)
-				goto error;
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-		case 'X':
-		case 'x':
-			if ((error = adduarg(&types, flags)))
-				goto error;
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			break;
-		}
-	}
-done:
-	build_arg_table(&types, ap, argtable);
-error:
-	freetypes(&types);
-	return (error || *argtable == NULL);
-}
-
-/* wchar version of __find_arguments. */
-int
-__find_warguments (const wchar_t *fmt0, va_list ap, union arg **argtable)
-{
-	wchar_t *fmt;		/* format string */
-	wchar_t ch;		/* character from fmt */
-	int n;			/* handy integer (short term usage) */
-	int error;
-	int flags;		/* flags as above */
-	struct typetable types;	/* table of types */
-
-	fmt = (wchar_t *)fmt0;
-	inittypes(&types);
-	error = 0;
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		while ((ch = *fmt) != '\0' && ch != '%')
-			fmt++;
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-		case '#':
-			goto rflag;
-		case '*':
-			if ((error = addwaster(&types, &fmt)))
-				goto error;
-			goto rflag;
-		case '-':
-		case '+':
-		case '\'':
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				if ((error = addwaster(&types, &fmt)))
-					goto error;
-				goto rflag;
-			}
-			while (is_digit(ch)) {
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				types.nextarg = n;
-				goto rflag;
-			}
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-			error = addtype(&types,
-					(flags & LONGINT) ? T_WINT : T_INT);
-			if (error)
-				goto error;
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			if ((error = addsarg(&types, flags)))
-				goto error;
-			break;
-#ifndef NO_FLOATING_POINT
-		case 'a':
-		case 'A':
-		case 'e':
-		case 'E':
-		case 'f':
-		case 'g':
-		case 'G':
-			error = addtype(&types,
-			    (flags & LONGDBL) ? T_LONG_DOUBLE : T_DOUBLE);
-			if (error)
-				goto error;
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			if (flags & INTMAXT)
-				error = addtype(&types, TP_INTMAXT);
-			else if (flags & PTRDIFFT)
-				error = addtype(&types, TP_PTRDIFFT);
-			else if (flags & SIZET)
-				error = addtype(&types, TP_SSIZET);
-			else if (flags & LLONGINT)
-				error = addtype(&types, TP_LLONG);
-			else if (flags & LONGINT)
-				error = addtype(&types, TP_LONG);
-			else if (flags & SHORTINT)
-				error = addtype(&types, TP_SHORT);
-			else if (flags & CHARINT)
-				error = addtype(&types, TP_SCHAR);
-			else
-				error = addtype(&types, TP_INT);
-			if (error)
-				goto error;
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			if ((error = adduarg(&types, flags)))
-				goto error;
-			break;
-		case 'p':
-			if ((error = addtype(&types, TP_VOID)))
-				goto error;
-			break;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			error = addtype(&types,
-			    (flags & LONGINT) ? TP_WCHAR : TP_CHAR);
-			if (error)
-				goto error;
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-		case 'X':
-		case 'x':
-			if ((error = adduarg(&types, flags)))
-				goto error;
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			break;
-		}
-	}
-done:
-	build_arg_table(&types, ap, argtable);
-error:
-	freetypes(&types);
-	return (error || *argtable == NULL);
-}
-
-/*
- * Increase the size of the type table. Returns 0 on success.
- */
-static int
-__grow_type_table(struct typetable *types)
-{
-	enum typeid *const oldtable = types->table;
-	const int oldsize = types->tablesize;
-	enum typeid *newtable;
-	int n, newsize = oldsize * 2;
-
-	if (newsize < types->nextarg + 1)
-		newsize = types->nextarg + 1;
-	if (oldsize == STATIC_ARG_TBL_SIZE) {
-		if ((newtable = malloc(newsize * sizeof(enum typeid))) == NULL)
-			return (-1);
-		bcopy(oldtable, newtable, oldsize * sizeof(enum typeid));
-	} else {
-		newtable = realloc(oldtable, newsize * sizeof(enum typeid));
-		if (newtable == NULL)
-			return (-1);
-	}
-	for (n = oldsize; n < newsize; n++)
-		newtable[n] = T_UNUSED;
-
-	types->table = newtable;
-	types->tablesize = newsize;
-
-	return (0);
-}
-
-/*
- * Build the argument table from the completed type table.
- * On malloc failure, *argtable is set to NULL.
- */
-static void
-build_arg_table(struct typetable *types, va_list ap, union arg **argtable)
-{
-	int n;
-
-	if (types->tablemax >= STATIC_ARG_TBL_SIZE) {
-		*argtable = (union arg *)
-		    malloc (sizeof (union arg) * (types->tablemax + 1));
-		if (*argtable == NULL)
-			return;
-	}
-
-	(*argtable) [0].intarg = 0;
-	for (n = 1; n <= types->tablemax; n++) {
-		switch (types->table[n]) {
-		    case T_UNUSED: /* whoops! */
-			(*argtable) [n].intarg = va_arg (ap, int);
-			break;
-		    case TP_SCHAR:
-			(*argtable) [n].pschararg = va_arg (ap, signed char *);
-			break;
-		    case TP_SHORT:
-			(*argtable) [n].pshortarg = va_arg (ap, short *);
-			break;
-		    case T_INT:
-			(*argtable) [n].intarg = va_arg (ap, int);
-			break;
-		    case T_U_INT:
-			(*argtable) [n].uintarg = va_arg (ap, unsigned int);
-			break;
-		    case TP_INT:
-			(*argtable) [n].pintarg = va_arg (ap, int *);
-			break;
-		    case T_LONG:
-			(*argtable) [n].longarg = va_arg (ap, long);
-			break;
-		    case T_U_LONG:
-			(*argtable) [n].ulongarg = va_arg (ap, unsigned long);
-			break;
-		    case TP_LONG:
-			(*argtable) [n].plongarg = va_arg (ap, long *);
-			break;
-		    case T_LLONG:
-			(*argtable) [n].longlongarg = va_arg (ap, long long);
-			break;
-		    case T_U_LLONG:
-			(*argtable) [n].ulonglongarg = va_arg (ap, unsigned long long);
-			break;
-		    case TP_LLONG:
-			(*argtable) [n].plonglongarg = va_arg (ap, long long *);
-			break;
-		    case T_PTRDIFFT:
-			(*argtable) [n].ptrdiffarg = va_arg (ap, ptrdiff_t);
-			break;
-		    case TP_PTRDIFFT:
-			(*argtable) [n].pptrdiffarg = va_arg (ap, ptrdiff_t *);
-			break;
-		    case T_SIZET:
-			(*argtable) [n].sizearg = va_arg (ap, size_t);
-			break;
-		    case T_SSIZET:
-			(*argtable) [n].sizearg = va_arg (ap, ssize_t);
-			break;
-		    case TP_SSIZET:
-			(*argtable) [n].pssizearg = va_arg (ap, ssize_t *);
-			break;
-		    case T_INTMAXT:
-			(*argtable) [n].intmaxarg = va_arg (ap, intmax_t);
-			break;
-		    case T_UINTMAXT:
-			(*argtable) [n].uintmaxarg = va_arg (ap, uintmax_t);
-			break;
-		    case TP_INTMAXT:
-			(*argtable) [n].pintmaxarg = va_arg (ap, intmax_t *);
-			break;
-		    case T_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			(*argtable) [n].doublearg = va_arg (ap, double);
-#endif
-			break;
-		    case T_LONG_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			(*argtable) [n].longdoublearg = va_arg (ap, long double);
-#endif
-			break;
-		    case TP_CHAR:
-			(*argtable) [n].pchararg = va_arg (ap, char *);
-			break;
-		    case TP_VOID:
-			(*argtable) [n].pvoidarg = va_arg (ap, void *);
-			break;
-		    case T_WINT:
-			(*argtable) [n].wintarg = va_arg (ap, wint_t);
-			break;
-		    case TP_WCHAR:
-			(*argtable) [n].pwchararg = va_arg (ap, wchar_t *);
-			break;
-		}
-	}
-}
diff --git a/lib/libc_bsd/stdio/printf.3 b/lib/libc_bsd/stdio/printf.3
deleted file mode 100644
index 75c7b25..0000000
--- a/lib/libc_bsd/stdio/printf.3
+++ /dev/null
@@ -1,920 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/printf.3 242738 2012-11-08 02:01:04Z grog $
-.\"
-.Dd December 2, 2009
-.Dt PRINTF 3
-.Os
-.Sh NAME
-.Nm printf , fprintf , sprintf , snprintf , asprintf , dprintf ,
-.Nm vprintf , vfprintf, vsprintf , vsnprintf , vasprintf, vdprintf
-.Nd formatted output conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.Fd "#define _WITH_DPRINTF"
-.In stdio.h
-.Ft int
-.Fn printf "const char * restrict format" ...
-.Ft int
-.Fn fprintf "FILE * restrict stream" "const char * restrict format" ...
-.Ft int
-.Fn sprintf "char * restrict str" "const char * restrict format" ...
-.Ft int
-.Fn snprintf "char * restrict str" "size_t size" "const char * restrict format" ...
-.Ft int
-.Fn asprintf "char **ret" "const char *format" ...
-.Ft int
-.Fn dprintf "int fd" "const char * restrict format" ...
-.In stdarg.h
-.Ft int
-.Fn vprintf "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vfprintf "FILE * restrict stream" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsprintf "char * restrict str" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsnprintf "char * restrict str" "size_t size" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vasprintf "char **ret" "const char *format" "va_list ap"
-.Ft int
-.Fn vdprintf "int fd" "const char * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The
-.Fn printf
-family of functions produces output according to a
-.Fa format
-as described below.
-The
-.Fn printf
-and
-.Fn vprintf
-functions
-write output to
-.Dv stdout ,
-the standard output stream;
-.Fn fprintf
-and
-.Fn vfprintf
-write output to the given output
-.Fa stream ;
-.Fn dprintf
-and
-.Fn vdprintf
-write output to the given file descriptor;
-.Fn sprintf ,
-.Fn snprintf ,
-.Fn vsprintf ,
-and
-.Fn vsnprintf
-write to the character string
-.Fa str ;
-and
-.Fn asprintf
-and
-.Fn vasprintf
-dynamically allocate a new string with
-.Xr malloc 3 .
-.Pp
-These functions write the output under the control of a
-.Fa format
-string that specifies how subsequent arguments
-(or arguments accessed via the variable-length argument facilities of
-.Xr stdarg 3 )
-are converted for output.
-.Pp
-The
-.Fn asprintf
-and
-.Fn vasprintf
-functions
-set
-.Fa *ret
-to be a pointer to a buffer sufficiently large to hold the formatted string.
-This pointer should be passed to
-.Xr free 3
-to release the allocated storage when it is no longer needed.
-If sufficient space cannot be allocated,
-.Fn asprintf
-and
-.Fn vasprintf
-will return \-1 and set
-.Fa ret
-to be a
-.Dv NULL
-pointer.
-.Pp
-The
-.Fn snprintf
-and
-.Fn vsnprintf
-functions
-will write at most
-.Fa size Ns \-1
-of the characters printed into the output string
-(the
-.Fa size Ns 'th
-character then gets the terminating
-.Ql \e0 ) ;
-if the return value is greater than or equal to the
-.Fa size
-argument, the string was too short
-and some of the printed characters were discarded.
-The output is always null-terminated, unless
-.Fa size
-is 0.
-.Pp
-The
-.Fn sprintf
-and
-.Fn vsprintf
-functions
-effectively assume a
-.Fa size
-of
-.Dv INT_MAX + 1.
-.Pp
-The format string is composed of zero or more directives:
-ordinary
-.\" multibyte
-characters (not
-.Cm % ) ,
-which are copied unchanged to the output stream;
-and conversion specifications, each of which results
-in fetching zero or more subsequent arguments.
-Each conversion specification is introduced by
-the
-.Cm %
-character.
-The arguments must correspond properly (after type promotion)
-with the conversion specifier.
-After the
-.Cm % ,
-the following appear in sequence:
-.Bl -bullet
-.It
-An optional field, consisting of a decimal digit string followed by a
-.Cm $ ,
-specifying the next argument to access.
-If this field is not provided, the argument following the last
-argument accessed will be used.
-Arguments are numbered starting at
-.Cm 1 .
-If unaccessed arguments in the format string are interspersed with ones that
-are accessed the results will be indeterminate.
-.It
-Zero or more of the following flags:
-.Bl -tag -width ".So \  Sc (space)"
-.It Sq Cm #
-The value should be converted to an
-.Dq alternate form .
-For
-.Cm c , d , i , n , p , s ,
-and
-.Cm u
-conversions, this option has no effect.
-For
-.Cm o
-conversions, the precision of the number is increased to force the first
-character of the output string to a zero.
-For
-.Cm x
-and
-.Cm X
-conversions, a non-zero result has the string
-.Ql 0x
-(or
-.Ql 0X
-for
-.Cm X
-conversions) prepended to it.
-For
-.Cm a , A , e , E , f , F , g ,
-and
-.Cm G
-conversions, the result will always contain a decimal point, even if no
-digits follow it (normally, a decimal point appears in the results of
-those conversions only if a digit follows).
-For
-.Cm g
-and
-.Cm G
-conversions, trailing zeros are not removed from the result as they
-would otherwise be.
-.It So Cm 0 Sc (zero)
-Zero padding.
-For all conversions except
-.Cm n ,
-the converted value is padded on the left with zeros rather than blanks.
-If a precision is given with a numeric conversion
-.Cm ( d , i , o , u , i , x ,
-and
-.Cm X ) ,
-the
-.Cm 0
-flag is ignored.
-.It Sq Cm \-
-A negative field width flag;
-the converted value is to be left adjusted on the field boundary.
-Except for
-.Cm n
-conversions, the converted value is padded on the right with blanks,
-rather than on the left with blanks or zeros.
-A
-.Cm \-
-overrides a
-.Cm 0
-if both are given.
-.It So "\ " Sc (space)
-A blank should be left before a positive number
-produced by a signed conversion
-.Cm ( a , A , d , e , E , f , F , g , G ,
-or
-.Cm i ) .
-.It Sq Cm +
-A sign must always be placed before a
-number produced by a signed conversion.
-A
-.Cm +
-overrides a space if both are used.
-.It So "'" Sc (apostrophe)
-Decimal conversions
-.Cm ( d , u ,
-or
-.Cm i )
-or the integral portion of a floating point conversion
-.Cm ( f
-or
-.Cm F )
-should be grouped and separated by thousands using
-the non-monetary separator returned by
-.Xr localeconv 3 .
-.El
-.It
-An optional decimal digit string specifying a minimum field width.
-If the converted value has fewer characters than the field width, it will
-be padded with spaces on the left (or right, if the left-adjustment
-flag has been given) to fill out
-the field width.
-.It
-An optional precision, in the form of a period
-.Cm \&.
-followed by an
-optional digit string.
-If the digit string is omitted, the precision is taken as zero.
-This gives the minimum number of digits to appear for
-.Cm d , i , o , u , x ,
-and
-.Cm X
-conversions, the number of digits to appear after the decimal-point for
-.Cm a , A , e , E , f ,
-and
-.Cm F
-conversions, the maximum number of significant digits for
-.Cm g
-and
-.Cm G
-conversions, or the maximum number of characters to be printed from a
-string for
-.Cm s
-conversions.
-.It
-An optional length modifier, that specifies the size of the argument.
-The following length modifiers are valid for the
-.Cm d , i , n , o , u , x ,
-or
-.Cm X
-conversion:
-.Bl -column ".Cm q Em (deprecated)" ".Vt signed char" ".Vt unsigned long long" ".Vt long long *"
-.It Sy Modifier Ta Cm d , i Ta Cm o , u , x , X Ta Cm n
-.It Cm hh Ta Vt "signed char" Ta Vt "unsigned char" Ta Vt "signed char *"
-.It Cm h Ta Vt short Ta Vt "unsigned short" Ta Vt "short *"
-.It Cm l No (ell) Ta Vt long Ta Vt "unsigned long" Ta Vt "long *"
-.It Cm ll No (ell ell) Ta Vt "long long" Ta Vt "unsigned long long" Ta Vt "long long *"
-.It Cm j Ta Vt intmax_t Ta Vt uintmax_t Ta Vt "intmax_t *"
-.It Cm t Ta Vt ptrdiff_t Ta (see note) Ta Vt "ptrdiff_t *"
-.It Cm z Ta (see note) Ta Vt size_t Ta (see note)
-.It Cm q Em (deprecated) Ta Vt quad_t Ta Vt u_quad_t Ta Vt "quad_t *"
-.El
-.Pp
-Note:
-the
-.Cm t
-modifier, when applied to a
-.Cm o , u , x ,
-or
-.Cm X
-conversion, indicates that the argument is of an unsigned type
-equivalent in size to a
-.Vt ptrdiff_t .
-The
-.Cm z
-modifier, when applied to a
-.Cm d
-or
-.Cm i
-conversion, indicates that the argument is of a signed type equivalent in
-size to a
-.Vt size_t .
-Similarly, when applied to an
-.Cm n
-conversion, it indicates that the argument is a pointer to a signed type
-equivalent in size to a
-.Vt size_t .
-.Pp
-The following length modifier is valid for the
-.Cm a , A , e , E , f , F , g ,
-or
-.Cm G
-conversion:
-.Bl -column ".Sy Modifier" ".Cm a , A , e , E , f , F , g , G"
-.It Sy Modifier Ta Cm a , A , e , E , f , F , g , G
-.It Cm l No (ell) Ta Vt double
-(ignored, same behavior as without it)
-.It Cm L Ta Vt "long double"
-.El
-.Pp
-The following length modifier is valid for the
-.Cm c
-or
-.Cm s
-conversion:
-.Bl -column ".Sy Modifier" ".Vt wint_t" ".Vt wchar_t *"
-.It Sy Modifier Ta Cm c Ta Cm s
-.It Cm l No (ell) Ta Vt wint_t Ta Vt "wchar_t *"
-.El
-.It
-A character that specifies the type of conversion to be applied.
-.El
-.Pp
-A field width or precision, or both, may be indicated by
-an asterisk
-.Ql *
-or an asterisk followed by one or more decimal digits and a
-.Ql $
-instead of a
-digit string.
-In this case, an
-.Vt int
-argument supplies the field width or precision.
-A negative field width is treated as a left adjustment flag followed by a
-positive field width; a negative precision is treated as though it were
-missing.
-If a single format directive mixes positional
-.Pq Li nn$
-and non-positional arguments, the results are undefined.
-.Pp
-The conversion specifiers and their meanings are:
-.Bl -tag -width ".Cm diouxX"
-.It Cm diouxX
-The
-.Vt int
-(or appropriate variant) argument is converted to signed decimal
-.Cm ( d
-and
-.Cm i ) ,
-unsigned octal
-.Pq Cm o ,
-unsigned decimal
-.Pq Cm u ,
-or unsigned hexadecimal
-.Cm ( x
-and
-.Cm X )
-notation.
-The letters
-.Dq Li abcdef
-are used for
-.Cm x
-conversions; the letters
-.Dq Li ABCDEF
-are used for
-.Cm X
-conversions.
-The precision, if any, gives the minimum number of digits that must
-appear; if the converted value requires fewer digits, it is padded on
-the left with zeros.
-.It Cm DOU
-The
-.Vt "long int"
-argument is converted to signed decimal, unsigned octal, or unsigned
-decimal, as if the format had been
-.Cm ld , lo ,
-or
-.Cm lu
-respectively.
-These conversion characters are deprecated, and will eventually disappear.
-.It Cm eE
-The
-.Vt double
-argument is rounded and converted in the style
-.Sm off
-.Oo \- Oc Ar d Li \&. Ar ddd Li e \(+- Ar dd
-.Sm on
-where there is one digit before the
-decimal-point character
-and the number of digits after it is equal to the precision;
-if the precision is missing,
-it is taken as 6; if the precision is
-zero, no decimal-point character appears.
-An
-.Cm E
-conversion uses the letter
-.Ql E
-(rather than
-.Ql e )
-to introduce the exponent.
-The exponent always contains at least two digits; if the value is zero,
-the exponent is 00.
-.Pp
-For
-.Cm a , A , e , E , f , F , g ,
-and
-.Cm G
-conversions, positive and negative infinity are represented as
-.Li inf
-and
-.Li -inf
-respectively when using the lowercase conversion character, and
-.Li INF
-and
-.Li -INF
-respectively when using the uppercase conversion character.
-Similarly, NaN is represented as
-.Li nan
-when using the lowercase conversion, and
-.Li NAN
-when using the uppercase conversion.
-.It Cm fF
-The
-.Vt double
-argument is rounded and converted to decimal notation in the style
-.Sm off
-.Oo \- Oc Ar ddd Li \&. Ar ddd ,
-.Sm on
-where the number of digits after the decimal-point character
-is equal to the precision specification.
-If the precision is missing, it is taken as 6; if the precision is
-explicitly zero, no decimal-point character appears.
-If a decimal point appears, at least one digit appears before it.
-.It Cm gG
-The
-.Vt double
-argument is converted in style
-.Cm f
-or
-.Cm e
-(or
-.Cm F
-or
-.Cm E
-for
-.Cm G
-conversions).
-The precision specifies the number of significant digits.
-If the precision is missing, 6 digits are given; if the precision is zero,
-it is treated as 1.
-Style
-.Cm e
-is used if the exponent from its conversion is less than \-4 or greater than
-or equal to the precision.
-Trailing zeros are removed from the fractional part of the result; a
-decimal point appears only if it is followed by at least one digit.
-.It Cm aA
-The
-.Vt double
-argument is rounded and converted to hexadecimal notation in the style
-.Sm off
-.Oo \- Oc Li 0x Ar h Li \&. Ar hhhp Oo \(+- Oc Ar d ,
-.Sm on
-where the number of digits after the hexadecimal-point character
-is equal to the precision specification.
-If the precision is missing, it is taken as enough to represent
-the floating-point number exactly, and no rounding occurs.
-If the precision is zero, no hexadecimal-point character appears.
-The
-.Cm p
-is a literal character
-.Ql p ,
-and the exponent consists of a positive or negative sign
-followed by a decimal number representing an exponent of 2.
-The
-.Cm A
-conversion uses the prefix
-.Dq Li 0X
-(rather than
-.Dq Li 0x ) ,
-the letters
-.Dq Li ABCDEF
-(rather than
-.Dq Li abcdef )
-to represent the hex digits, and the letter
-.Ql P
-(rather than
-.Ql p )
-to separate the mantissa and exponent.
-.Pp
-Note that there may be multiple valid ways to represent floating-point
-numbers in this hexadecimal format.
-For example,
-.Li 0x1.92p+1 , 0x3.24p+0 , 0x6.48p-1 ,
-and
-.Li 0xc.9p-2
-are all equivalent.
-.Fx 8.0
-and later always prints finite non-zero numbers using
-.Ql 1
-as the digit before the hexadecimal point.
-Zeroes are always represented with a mantissa of 0 (preceded by a
-.Ql -
-if appropriate) and an exponent of
-.Li +0 .
-.It Cm C
-Treated as
-.Cm c
-with the
-.Cm l
-(ell) modifier.
-.It Cm c
-The
-.Vt int
-argument is converted to an
-.Vt "unsigned char" ,
-and the resulting character is written.
-.Pp
-If the
-.Cm l
-(ell) modifier is used, the
-.Vt wint_t
-argument shall be converted to a
-.Vt wchar_t ,
-and the (potentially multi-byte) sequence representing the
-single wide character is written, including any shift sequences.
-If a shift sequence is used, the shift state is also restored
-to the original state after the character.
-.It Cm S
-Treated as
-.Cm s
-with the
-.Cm l
-(ell) modifier.
-.It Cm s
-The
-.Vt "char *"
-argument is expected to be a pointer to an array of character type (pointer
-to a string).
-Characters from the array are written up to (but not including)
-a terminating
-.Dv NUL
-character;
-if a precision is specified, no more than the number specified are
-written.
-If a precision is given, no null character
-need be present; if the precision is not specified, or is greater than
-the size of the array, the array must contain a terminating
-.Dv NUL
-character.
-.Pp
-If the
-.Cm l
-(ell) modifier is used, the
-.Vt "wchar_t *"
-argument is expected to be a pointer to an array of wide characters
-(pointer to a wide string).
-For each wide character in the string, the (potentially multi-byte)
-sequence representing the
-wide character is written, including any shift sequences.
-If any shift sequence is used, the shift state is also restored
-to the original state after the string.
-Wide characters from the array are written up to (but not including)
-a terminating wide
-.Dv NUL
-character;
-if a precision is specified, no more than the number of bytes specified are
-written (including shift sequences).
-Partial characters are never written.
-If a precision is given, no null character
-need be present; if the precision is not specified, or is greater than
-the number of bytes required to render the multibyte representation of
-the string, the array must contain a terminating wide
-.Dv NUL
-character.
-.It Cm p
-The
-.Vt "void *"
-pointer argument is printed in hexadecimal (as if by
-.Ql %#x
-or
-.Ql %#lx ) .
-.It Cm n
-The number of characters written so far is stored into the
-integer indicated by the
-.Vt "int *"
-(or variant) pointer argument.
-No argument is converted.
-.It Cm %
-A
-.Ql %
-is written.
-No argument is converted.
-The complete conversion specification
-is
-.Ql %% .
-.El
-.Pp
-The decimal point
-character is defined in the program's locale (category
-.Dv LC_NUMERIC ) .
-.Pp
-In no case does a non-existent or small field width cause truncation of
-a numeric field; if the result of a conversion is wider than the field
-width, the
-field is expanded to contain the conversion result.
-.Sh RETURN VALUES
-These functions return the number of characters printed
-(not including the trailing
-.Ql \e0
-used to end output to strings),
-except for
-.Fn snprintf
-and
-.Fn vsnprintf ,
-which return the number of characters that would have been printed if the
-.Fa size
-were unlimited
-(again, not including the final
-.Ql \e0 ) .
-These functions return a negative value if an error occurs.
-.Sh EXAMPLES
-To print a date and time in the form
-.Dq Li "Sunday, July 3, 10:02" ,
-where
-.Fa weekday
-and
-.Fa month
-are pointers to strings:
-.Bd -literal -offset indent
-#include <stdio.h>
-fprintf(stdout, "%s, %s %d, %.2d:%.2d\en",
-	weekday, month, day, hour, min);
-.Ed
-.Pp
-To print \*(Pi
-to five decimal places:
-.Bd -literal -offset indent
-#include <math.h>
-#include <stdio.h>
-fprintf(stdout, "pi = %.5f\en", 4 * atan(1.0));
-.Ed
-.Pp
-To allocate a 128 byte string and print into it:
-.Bd -literal -offset indent
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-char *newfmt(const char *fmt, ...)
-{
-	char *p;
-	va_list ap;
-	if ((p = malloc(128)) == NULL)
-		return (NULL);
-	va_start(ap, fmt);
-	(void) vsnprintf(p, 128, fmt, ap);
-	va_end(ap);
-	return (p);
-}
-.Ed
-.Sh COMPATIBILITY
-Many application writers used the name
-.Va dprintf
-before the
-.Fn dprintf
-function was introduced in
-.St -p1003.1 ,
-so a prototype is not provided by default in order to avoid
-compatibility problems.
-Applications that wish to use the
-.Fn dprintf
-function described herein should either request a strict
-.St -p1003.1-2008
-environment by defining the macro
-.Dv _POSIX_C_SOURCE
-to the value 200809 or greater, or by defining the macro
-.Dv _WITH_DPRINTF ,
-prior to the inclusion of
-.In stdio.h .
-For compatibility with GNU libc, defining either
-.Dv _BSD_SOURCE
-or
-.Dv _GNU_SOURCE
-prior to the inclusion of
-.In stdio.h
-will also make
-.Fn dprintf
-available.
-.Pp
-The conversion formats
-.Cm \&%D , \&%O ,
-and
-.Cm \&%U
-are not standard and
-are provided only for backward compatibility.
-The effect of padding the
-.Cm %p
-format with zeros (either by the
-.Cm 0
-flag or by specifying a precision), and the benign effect (i.e., none)
-of the
-.Cm #
-flag on
-.Cm %n
-and
-.Cm %p
-conversions, as well as other
-nonsensical combinations such as
-.Cm %Ld ,
-are not standard; such combinations
-should be avoided.
-.Sh ERRORS
-In addition to the errors documented for the
-.Xr write 2
-system call, the
-.Fn printf
-family of functions may fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid wide character code was encountered.
-.It Bq Er ENOMEM
-Insufficient storage space is available.
-.It Bq Er EOVERFLOW
-The
-.Fa size
-argument exceeds
-.Dv INT_MAX + 1 ,
-or the return value would be too large to be represented by an
-.Vt int .
-.El
-.Sh SEE ALSO
-.Xr printf 1 ,
-.Xr fmtcheck 3 ,
-.Xr scanf 3 ,
-.Xr setlocale 3 ,
-.Xr wprintf 3
-.Sh STANDARDS
-Subject to the caveats noted in the
-.Sx BUGS
-section below, the
-.Fn fprintf ,
-.Fn printf ,
-.Fn sprintf ,
-.Fn vprintf ,
-.Fn vfprintf ,
-and
-.Fn vsprintf
-functions
-conform to
-.St -ansiC
-and
-.St -isoC-99 .
-With the same reservation, the
-.Fn snprintf
-and
-.Fn vsnprintf
-functions conform to
-.St -isoC-99 ,
-while
-.Fn dprintf
-and
-.Fn vdprintf
-conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The functions
-.Fn asprintf
-and
-.Fn vasprintf
-first appeared in the
-.Tn GNU C
-library.
-These were implemented by
-.An Peter Wemm Aq peter@FreeBSD.org
-in
-.Fx 2.2 ,
-but were later replaced with a different implementation
-from
-.Ox 2.3
-by
-.An Todd C. Miller Aq Todd.Miller@courtesan.com .
-The
-.Fn dprintf
-and
-.Fn vdprintf
-functions were added in
-.Fx 8.0 .
-.Sh BUGS
-The
-.Nm
-family of functions do not correctly handle multibyte characters in the
-.Fa format
-argument.
-.Sh SECURITY CONSIDERATIONS
-The
-.Fn sprintf
-and
-.Fn vsprintf
-functions are easily misused in a manner which enables malicious users
-to arbitrarily change a running program's functionality through
-a buffer overflow attack.
-Because
-.Fn sprintf
-and
-.Fn vsprintf
-assume an infinitely long string,
-callers must be careful not to overflow the actual space;
-this is often hard to assure.
-For safety, programmers should use the
-.Fn snprintf
-interface instead.
-For example:
-.Bd -literal
-void
-foo(const char *arbitrary_string, const char *and_another)
-{
-	char onstack[8];
-
-#ifdef BAD
-	/*
-	 * This first sprintf is bad behavior.  Do not use sprintf!
-	 */
-	sprintf(onstack, "%s, %s", arbitrary_string, and_another);
-#else
-	/*
-	 * The following two lines demonstrate better use of
-	 * snprintf().
-	 */
-	snprintf(onstack, sizeof(onstack), "%s, %s", arbitrary_string,
-	    and_another);
-#endif
-}
-.Ed
-.Pp
-The
-.Fn printf
-and
-.Fn sprintf
-family of functions are also easily misused in a manner
-allowing malicious users to arbitrarily change a running program's
-functionality by either causing the program
-to print potentially sensitive data
-.Dq "left on the stack" ,
-or causing it to generate a memory fault or bus error
-by dereferencing an invalid pointer.
-.Pp
-.Cm %n
-can be used to write arbitrary data to potentially carefully-selected
-addresses.
-Programmers are therefore strongly advised to never pass untrusted strings
-as the
-.Fa format
-argument, as an attacker can put format specifiers in the string
-to mangle your stack,
-leading to a possible security hole.
-This holds true even if the string was built using a function like
-.Fn snprintf ,
-as the resulting string may still contain user-supplied conversion specifiers
-for later interpolation by
-.Fn printf .
-.Pp
-Always use the proper secure idiom:
-.Pp
-.Dl "snprintf(buffer, sizeof(buffer), \*q%s\*q, string);"
diff --git a/lib/libc_bsd/stdio/printf.c b/lib/libc_bsd/stdio/printf.c
deleted file mode 100644
index 5a748f5..0000000
--- a/lib/libc_bsd/stdio/printf.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)printf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/printf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <xlocale.h>
-
-int
-printf(char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfprintf(stdout, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-int
-printf_l(locale_t locale, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfprintf_l(stdout, locale, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/printf_l.3 b/lib/libc_bsd/stdio/printf_l.3
deleted file mode 100644
index ee521b1..0000000
--- a/lib/libc_bsd/stdio/printf_l.3
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" Copyright (c) 2012 Isabell Long <issyl0@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.
-.\"
-.\" 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: releng/10.2/lib/libc/stdio/printf_l.3 235848 2012-05-23 17:13:30Z issyl0 $
-.\"
-.Dd April 7, 2012
-.Dt PRINTF_L 3
-.Os
-.Sh NAME
-.Nm printf_l ,
-.Nm asprintf_l ,
-.Nm fprintf_l ,
-.Nm snprintf_l ,
-.Nm sprintf_l ,
-.Nm vasprintf_l ,
-.Nm vfprintf_l ,
-.Nm vprintf_l ,
-.Nm vsnprintf_l ,
-.Nm vsprintf_l
-.Nd formatted output conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn printf_l "locale_t loc" "const char * restrict format" "..."
-.Ft int
-.Fn asprintf_l "char **ret" "locale_t loc" "const char * format" "..."
-.Ft int
-.Fn fprintf_l "FILE * restrict stream" "locale_t loc" "const char * restrict format" "..."
-.Ft int
-.Fn snprintf_l "char * restrict str" "size_t size" "locale_t loc" "const char * restrict format" "..."
-.Ft int
-.Fn sprintf_l "char * restrict str" "locale_t loc" "const char * restrict format" "..."
-.Ft int
-.Fn vasprintf_l "char **ret" "locale_t loc" "const char *format" "va_list ap"
-.Ft int
-.Fn vfprintf_l "FILE * restrict stream" "locale_t loc" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vprintf_l "locale_t loc" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsnprintf_l "char * restrict str" "size_t size" "locale_t loc" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsprintf_l "char * restrict str" "locale_t loc" "const char * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The above functions are used to convert formatted output in the locale
-.Fa loc .
-They behave in the same way as the versions without the _l suffix, but use
-the specified locale rather than the global or per-thread locale.
-See the specific manual pages for more information.
-.Sh SEE ALSO
-.Xr printf 3 ,
-.Xr xlocale 3
-.Sh STANDARDS
-These functions do not conform to any specific standard so they should be
-considered as non-portable local extensions.
-.Sh HISTORY
-These functions first appeared in Darwin and were first implemented in
-.Fx 9.1 .
diff --git a/lib/libc_bsd/stdio/printfcommon.h b/lib/libc_bsd/stdio/printfcommon.h
deleted file mode 100644
index 521563e..0000000
--- a/lib/libc_bsd/stdio/printfcommon.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdio/printfcommon.h 227753 2011-11-20 14:45:42Z theraven $
- */
-
-/*
- * This file defines common routines used by both printf and wprintf.
- * You must define CHAR to either char or wchar_t prior to including this.
- */
-
-
-#ifndef NO_FLOATING_POINT
-
-#define	dtoa		__dtoa
-#define	freedtoa	__freedtoa
-
-#include <float.h>
-#include <math.h>
-#include "floatio.h"
-#include "gdtoa.h"
-
-#define	DEFPREC		6
-
-static int exponent(CHAR *, int, CHAR);
-
-#endif /* !NO_FLOATING_POINT */
-
-static CHAR	*__ujtoa(uintmax_t, CHAR *, int, int, const char *);
-static CHAR	*__ultoa(u_long, CHAR *, int, int, const char *);
-
-#define NIOV 8
-struct io_state {
-	FILE *fp;
-	struct __suio uio;	/* output information: summary */
-	struct __siov iov[NIOV];/* ... and individual io vectors */
-};
-
-static inline void
-io_init(struct io_state *iop, FILE *fp)
-{
-
-	iop->uio.uio_iov = iop->iov;
-	iop->uio.uio_resid = 0;
-	iop->uio.uio_iovcnt = 0;
-	iop->fp = fp;
-}
-
-/*
- * WARNING: The buffer passed to io_print() is not copied immediately; it must
- * remain valid until io_flush() is called.
- */
-static inline int
-io_print(struct io_state *iop, const CHAR * __restrict ptr, int len, locale_t locale)
-{
-
-	iop->iov[iop->uio.uio_iovcnt].iov_base = (char *)ptr;
-	iop->iov[iop->uio.uio_iovcnt].iov_len = len;
-	iop->uio.uio_resid += len;
-	if (++iop->uio.uio_iovcnt >= NIOV)
-		return (__sprint(iop->fp, &iop->uio, locale));
-	else
-		return (0);
-}
-
-/*
- * Choose PADSIZE to trade efficiency vs. size.  If larger printf
- * fields occur frequently, increase PADSIZE and make the initialisers
- * below longer.
- */
-#define	PADSIZE	16		/* pad chunk size */
-static const CHAR blanks[PADSIZE] =
-{' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
-static const CHAR zeroes[PADSIZE] =
-{'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
-
-/*
- * Pad with blanks or zeroes. 'with' should point to either the blanks array
- * or the zeroes array.
- */
-static inline int
-io_pad(struct io_state *iop, int howmany, const CHAR * __restrict with,
-		locale_t locale)
-{
-	int n;
-
-	while (howmany > 0) {
-		n = (howmany >= PADSIZE) ? PADSIZE : howmany;
-		if (io_print(iop, with, n, locale))
-			return (-1);
-		howmany -= n;
-	}
-	return (0);
-}
-
-/*
- * Print exactly len characters of the string spanning p to ep, truncating
- * or padding with 'with' as necessary.
- */
-static inline int
-io_printandpad(struct io_state *iop, const CHAR *p, const CHAR *ep,
-	       int len, const CHAR * __restrict with, locale_t locale)
-{
-	int p_len;
-
-	p_len = ep - p;
-	if (p_len > len)
-		p_len = len;
-	if (p_len > 0) {
-		if (io_print(iop, p, p_len, locale))
-			return (-1);
-	} else {
-		p_len = 0;
-	}
-	return (io_pad(iop, len - p_len, with, locale));
-}
-
-static inline int
-io_flush(struct io_state *iop, locale_t locale)
-{
-
-	return (__sprint(iop->fp, &iop->uio, locale));
-}
-
-/*
- * Convert an unsigned long to ASCII for printf purposes, returning
- * a pointer to the first character of the string representation.
- * Octal numbers can be forced to have a leading zero; hex numbers
- * use the given digits.
- */
-static CHAR *
-__ultoa(u_long val, CHAR *endp, int base, int octzero, const char *xdigs)
-{
-	CHAR *cp = endp;
-	long sval;
-
-	/*
-	 * Handle the three cases separately, in the hope of getting
-	 * better/faster code.
-	 */
-	switch (base) {
-	case 10:
-		if (val < 10) {	/* many numbers are 1 digit */
-			*--cp = to_char(val);
-			return (cp);
-		}
-		/*
-		 * On many machines, unsigned arithmetic is harder than
-		 * signed arithmetic, so we do at most one unsigned mod and
-		 * divide; this is sufficient to reduce the range of
-		 * the incoming value to where signed arithmetic works.
-		 */
-		if (val > LONG_MAX) {
-			*--cp = to_char(val % 10);
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		if (octzero && *cp != '0')
-			*--cp = '0';
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:			/* oops */
-		abort();
-	}
-	return (cp);
-}
-
-/* Identical to __ultoa, but for intmax_t. */
-static CHAR *
-__ujtoa(uintmax_t val, CHAR *endp, int base, int octzero, const char *xdigs)
-{
-	CHAR *cp = endp;
-	intmax_t sval;
-
-	/* quick test for small values; __ultoa is typically much faster */
-	/* (perhaps instead we should run until small, then call __ultoa?) */
-	if (val <= ULONG_MAX)
-		return (__ultoa((u_long)val, endp, base, octzero, xdigs));
-	switch (base) {
-	case 10:
-		if (val < 10) {
-			*--cp = to_char(val % 10);
-			return (cp);
-		}
-		if (val > INTMAX_MAX) {
-			*--cp = to_char(val % 10);
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		if (octzero && *cp != '0')
-			*--cp = '0';
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:
-		abort();
-	}
-	return (cp);
-}
-
-#ifndef NO_FLOATING_POINT
-
-static int
-exponent(CHAR *p0, int exp, CHAR fmtch)
-{
-	CHAR *p, *t;
-	CHAR expbuf[MAXEXPDIG];
-
-	p = p0;
-	*p++ = fmtch;
-	if (exp < 0) {
-		exp = -exp;
-		*p++ = '-';
-	}
-	else
-		*p++ = '+';
-	t = expbuf + MAXEXPDIG;
-	if (exp > 9) {
-		do {
-			*--t = to_char(exp % 10);
-		} while ((exp /= 10) > 9);
-		*--t = to_char(exp);
-		for (; t < expbuf + MAXEXPDIG; *p++ = *t++);
-	}
-	else {
-		/*
-		 * Exponents for decimal floating point conversions
-		 * (%[eEgG]) must be at least two characters long,
-		 * whereas exponents for hexadecimal conversions can
-		 * be only one character long.
-		 */
-		if (fmtch == 'e' || fmtch == 'E')
-			*p++ = '0';
-		*p++ = to_char(exp);
-	}
-	return (p - p0);
-}
-
-#endif /* !NO_FLOATING_POINT */
diff --git a/lib/libc_bsd/stdio/printflocal.h b/lib/libc_bsd/stdio/printflocal.h
deleted file mode 100644
index 5f698e1..0000000
--- a/lib/libc_bsd/stdio/printflocal.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- * 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdio/printflocal.h 189268 2009-03-02 04:07:58Z das $
- */
-
-/*
- * Flags used during conversion.
- */
-#define	ALT		0x001		/* alternate form */
-#define	LADJUST		0x004		/* left adjustment */
-#define	LONGDBL		0x008		/* long double */
-#define	LONGINT		0x010		/* long integer */
-#define	LLONGINT	0x020		/* long long integer */
-#define	SHORTINT	0x040		/* short integer */
-#define	ZEROPAD		0x080		/* zero (as opposed to blank) pad */
-#define	FPT		0x100		/* Floating point number */
-#define	GROUPING	0x200		/* use grouping ("'" flag) */
-					/* C99 additional size modifiers: */
-#define	SIZET		0x400		/* size_t */
-#define	PTRDIFFT	0x800		/* ptrdiff_t */
-#define	INTMAXT		0x1000		/* intmax_t */
-#define	CHARINT		0x2000		/* print char using int format */
-
-/*
- * Macros for converting digits to letters and vice versa
- */
-#define	to_digit(c)	((c) - '0')
-#define is_digit(c)	((unsigned)to_digit(c) <= 9)
-#define	to_char(n)	((n) + '0')
-
-/* Size of the static argument table. */
-#define STATIC_ARG_TBL_SIZE 8
-
-union arg {
-	int	intarg;
-	u_int	uintarg;
-	long	longarg;
-	u_long	ulongarg;
-	long long longlongarg;
-	unsigned long long ulonglongarg;
-	ptrdiff_t ptrdiffarg;
-	size_t	sizearg;
-	intmax_t intmaxarg;
-	uintmax_t uintmaxarg;
-	void	*pvoidarg;
-	char	*pchararg;
-	signed char *pschararg;
-	short	*pshortarg;
-	int	*pintarg;
-	long	*plongarg;
-	long long *plonglongarg;
-	ptrdiff_t *pptrdiffarg;
-	ssize_t	*pssizearg;
-	intmax_t *pintmaxarg;
-#ifndef NO_FLOATING_POINT
-	double	doublearg;
-	long double longdoublearg;
-#endif
-	wint_t	wintarg;
-	wchar_t	*pwchararg;
-};
-
-/* Handle positional parameters. */
-int	__find_arguments(const char *, va_list, union arg **);
-int	__find_warguments(const wchar_t *, va_list, union arg **);
diff --git a/lib/libc_bsd/stdio/putc.3 b/lib/libc_bsd/stdio/putc.3
deleted file mode 100644
index f92ca62..0000000
--- a/lib/libc_bsd/stdio/putc.3
+++ /dev/null
@@ -1,165 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/putc.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd January 10, 2003
-.Dt PUTC 3
-.Os
-.Sh NAME
-.Nm fputc ,
-.Nm putc ,
-.Nm putc_unlocked ,
-.Nm putchar ,
-.Nm putchar_unlocked ,
-.Nm putw
-.Nd output a character or word to a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn fputc "int c" "FILE *stream"
-.Ft int
-.Fn putc "int c" "FILE *stream"
-.Ft int
-.Fn putc_unlocked "int c" "FILE *stream"
-.Ft int
-.Fn putchar "int c"
-.Ft int
-.Fn putchar_unlocked "int c"
-.Ft int
-.Fn putw "int w" "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn fputc
-function
-writes the character
-.Fa c
-(converted to an ``unsigned char'')
-to the output stream pointed to by
-.Fa stream .
-.Pp
-The
-.Fn putc
-macro acts essentially identically to
-.Fn fputc ,
-but is a macro that expands in-line.
-It may evaluate
-.Fa stream
-more than once, so arguments given to
-.Fn putc
-should not be expressions with potential side effects.
-.Pp
-The
-.Fn putchar
-function
-is identical to
-.Fn putc
-with an output stream of
-.Dv stdout .
-.Pp
-The
-.Fn putw
-function
-writes the specified
-.Vt int
-to the named output
-.Fa stream .
-.Pp
-The
-.Fn putc_unlocked
-and
-.Fn putchar_unlocked
-functions are equivalent to
-.Fn putc
-and
-.Fn putchar
-respectively,
-except that the caller is responsible for locking the stream
-with
-.Xr flockfile 3
-before calling them.
-These functions may be used to avoid the overhead of locking the stream
-for each character, and to avoid output being interspersed from multiple
-threads writing to the same stream.
-.Sh RETURN VALUES
-The functions,
-.Fn fputc ,
-.Fn putc ,
-.Fn putchar ,
-.Fn putc_unlocked
-and
-.Fn putchar_unlocked
-return the character written.
-If an error occurs, the value
-.Dv EOF
-is returned.
-The
-.Fn putw
-function
-returns 0 on success;
-.Dv EOF
-is returned if
-a write error occurs,
-or if an attempt is made to write a read-only stream.
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr flockfile 3 ,
-.Xr fopen 3 ,
-.Xr getc 3 ,
-.Xr putwc 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The functions
-.Fn fputc ,
-.Fn putc ,
-and
-.Fn putchar ,
-conform to
-.St -isoC .
-The
-.Fn putc_unlocked
-and
-.Fn putchar_unlocked
-functions conform to
-.St -p1003.1-2001 .
-A function
-.Fn putw
-function appeared in
-.At v6 .
-.Sh BUGS
-The size and byte order of an
-.Vt int
-varies from one machine to another, and
-.Fn putw
-is not recommended for portable applications.
diff --git a/lib/libc_bsd/stdio/putc.c b/lib/libc_bsd/stdio/putc.c
deleted file mode 100644
index 97a96b5..0000000
--- a/lib/libc_bsd/stdio/putc.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)putc.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/putc.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-#undef putc
-#undef putc_unlocked
-
-int
-putc(int c, FILE *fp)
-{
-	int retval;
-	FLOCKFILE(fp);
-	/* Orientation set by __sputc() when buffer is full. */
-	/* ORIENT(fp, -1); */
-	retval = __sputc(c, fp);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
-
-int
-putc_unlocked(int ch, FILE *fp)
-{
-
-	return (__sputc(ch, fp));
-}
diff --git a/lib/libc_bsd/stdio/putchar.c b/lib/libc_bsd/stdio/putchar.c
deleted file mode 100644
index f6625a7..0000000
--- a/lib/libc_bsd/stdio/putchar.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)putchar.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/putchar.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-#undef putchar
-#undef putchar_unlocked
-
-/*
- * A subroutine version of the macro putchar
- */
-int
-putchar(int c)
-{
-	int retval;
-	FILE *so = stdout;
-
-	FLOCKFILE(so);
-	/* Orientation set by __sputc() when buffer is full. */
-	/* ORIENT(so, -1); */
-	retval = __sputc(c, so);
-	FUNLOCKFILE(so);
-	return (retval);
-}
-
-int
-putchar_unlocked(int ch)
-{
-
-	return (__sputc(ch, stdout));
-}
diff --git a/lib/libc_bsd/stdio/puts.c b/lib/libc_bsd/stdio/puts.c
deleted file mode 100644
index bf7aea2..0000000
--- a/lib/libc_bsd/stdio/puts.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)puts.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/puts.c 269085 2014-07-25 03:24:00Z pfg $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-#include "local.h"
-
-/*
- * Write the given string to stdout, appending a newline.
- */
-int
-puts(char const *s)
-{
-	int retval;
-	size_t c;
-	struct __suio uio;
-	struct __siov iov[2];
-
-	iov[0].iov_base = (void *)s;
-	iov[0].iov_len = c = strlen(s);
-	iov[1].iov_base = "\n";
-	iov[1].iov_len = 1;
-	uio.uio_resid = c + 1;
-	uio.uio_iov = &iov[0];
-	uio.uio_iovcnt = 2;
-	FLOCKFILE(stdout);
-	ORIENT(stdout, -1);
-	retval = __sfvwrite(stdout, &uio) ? EOF : '\n';
-	FUNLOCKFILE(stdout);
-	return (retval);
-}
diff --git a/lib/libc_bsd/stdio/putw.c b/lib/libc_bsd/stdio/putw.c
deleted file mode 100644
index c3ae150..0000000
--- a/lib/libc_bsd/stdio/putw.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)putw.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/putw.c 269085 2014-07-25 03:24:00Z pfg $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "fvwrite.h"
-#include "libc_private.h"
-
-int
-putw(int w, FILE *fp)
-{
-	int retval;
-	struct __suio uio;
-	struct __siov iov;
-
-	iov.iov_base = &w;
-	uio.uio_resid = iov.iov_len = sizeof(w);
-	uio.uio_iov = &iov;
-	uio.uio_iovcnt = 1;
-	FLOCKFILE(fp);
-	retval = __sfvwrite(fp, &uio);
-	FUNLOCKFILE(fp);
-	return (retval);
-}
diff --git a/lib/libc_bsd/stdio/putwc.3 b/lib/libc_bsd/stdio/putwc.3
deleted file mode 100644
index f243724..0000000
--- a/lib/libc_bsd/stdio/putwc.3
+++ /dev/null
@@ -1,103 +0,0 @@
-.\"	$NetBSD: putwc.3,v 1.2 2002/02/07 07:00:26 ross Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)putc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/putwc.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd March 3, 2004
-.Dt PUTWC 3
-.Os
-.Sh NAME
-.Nm fputwc ,
-.Nm putwc ,
-.Nm putwchar
-.Nd output a wide character to a stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft wint_t
-.Fn fputwc "wchar_t wc" "FILE *stream"
-.Ft wint_t
-.Fn putwc "wchar_t wc" "FILE *stream"
-.Ft wint_t
-.Fn putwchar "wchar_t wc"
-.Sh DESCRIPTION
-The
-.Fn fputwc
-function
-writes the wide character
-.Fa wc
-to the output stream pointed to by
-.Fa stream .
-.Pp
-The
-.Fn putwc
-function
-acts essentially identically to
-.Fn fputwc .
-.Pp
-The
-.Fn putwchar
-function
-is identical to
-.Fn putwc
-with an output stream of
-.Dv stdout .
-.Sh RETURN VALUES
-The
-.Fn fputwc ,
-.Fn putwc ,
-and
-.Fn putwchar
-functions
-return the wide character written.
-If an error occurs, the value
-.Dv WEOF
-is returned.
-.Sh SEE ALSO
-.Xr ferror 3 ,
-.Xr fopen 3 ,
-.Xr getwc 3 ,
-.Xr putc 3 ,
-.Xr stdio 3
-.Sh STANDARDS
-The
-.Fn fputwc ,
-.Fn putwc ,
-and
-.Fn putwchar
-functions
-conform to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdio/putwc.c b/lib/libc_bsd/stdio/putwc.c
deleted file mode 100644
index 8647b67..0000000
--- a/lib/libc_bsd/stdio/putwc.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/putwc.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "xlocale_private.h"
-
-#undef putwc
-
-/*
- * Synonym for fputwc(). The only difference is that putwc(), if it is a
- * macro, may evaluate `fp' more than once.
- */
-wint_t
-putwc_l(wchar_t wc, FILE *fp, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	return (fputwc_l(wc, fp, locale));
-}
-wint_t
-putwc(wchar_t wc, FILE *fp)
-{
-	return putwc_l(wc, fp, __get_locale());
-}
diff --git a/lib/libc_bsd/stdio/putwchar.c b/lib/libc_bsd/stdio/putwchar.c
deleted file mode 100644
index 87b7495..0000000
--- a/lib/libc_bsd/stdio/putwchar.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/putwchar.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "xlocale_private.h"
-
-#undef putwchar
-
-/*
- * Synonym for fputwc(wc, stdout).
- */
-wint_t
-putwchar_l(wchar_t wc, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	return (fputwc_l(wc, stdout, locale));
-}
-wint_t
-putwchar(wchar_t wc)
-{
-	return putwchar_l(wc, __get_locale());
-}
diff --git a/lib/libc_bsd/stdio/refill.c b/lib/libc_bsd/stdio/refill.c
deleted file mode 100644
index 4432ee9..0000000
--- a/lib/libc_bsd/stdio/refill.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)refill.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/refill.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-
-static int lflush(FILE *);
-
-static int
-lflush(FILE *fp)
-{
-	int	ret = 0;
-
-	if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR)) {
-		FLOCKFILE(fp);
-		ret = __sflush(fp);
-		FUNLOCKFILE(fp);
-	}
-	return (ret);
-}
-
-/*
- * Refill a stdio buffer.
- * Return EOF on eof or error, 0 otherwise.
- */
-int
-__srefill(FILE *fp)
-{
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	ORIENT(fp, -1);
-
-	fp->_r = 0;		/* largely a convenience for callers */
-
-	/* SysV does not make this test; take it out for compatibility */
-	if (fp->_flags & __SEOF)
-		return (EOF);
-
-	/* if not already reading, have to be reading and writing */
-	if ((fp->_flags & __SRD) == 0) {
-		if ((fp->_flags & __SRW) == 0) {
-			errno = EBADF;
-			fp->_flags |= __SERR;
-			return (EOF);
-		}
-		/* switch to reading */
-		if (fp->_flags & __SWR) {
-			if (__sflush(fp))
-				return (EOF);
-			fp->_flags &= ~__SWR;
-			fp->_w = 0;
-			fp->_lbfsize = 0;
-		}
-		fp->_flags |= __SRD;
-	} else {
-		/*
-		 * We were reading.  If there is an ungetc buffer,
-		 * we must have been reading from that.  Drop it,
-		 * restoring the previous buffer (if any).  If there
-		 * is anything in that buffer, return.
-		 */
-		if (HASUB(fp)) {
-			FREEUB(fp);
-			if ((fp->_r = fp->_ur) != 0) {
-				fp->_p = fp->_up;
-				return (0);
-			}
-		}
-	}
-
-	if (fp->_bf._base == NULL)
-		__smakebuf(fp);
-
-	/*
-	 * Before reading from a line buffered or unbuffered file,
-	 * flush all line buffered output files, per the ANSI C
-	 * standard.
-	 */
-	if (fp->_flags & (__SLBF|__SNBF)) {
-		/* Ignore this file in _fwalk to avoid potential deadlock. */
-		fp->_flags |= __SIGN;
-		(void) _fwalk(lflush);
-		fp->_flags &= ~__SIGN;
-
-		/* Now flush this file without locking it. */
-		if ((fp->_flags & (__SLBF|__SWR)) == (__SLBF|__SWR))
-			__sflush(fp);
-	}
-	fp->_p = fp->_bf._base;
-	fp->_r = _sread(fp, (char *)fp->_p, fp->_bf._size);
-	fp->_flags &= ~__SMOD;	/* buffer contents are again pristine */
-	if (fp->_r <= 0) {
-		if (fp->_r == 0)
-			fp->_flags |= __SEOF;
-		else {
-			fp->_r = 0;
-			fp->_flags |= __SERR;
-		}
-		return (EOF);
-	}
-	return (0);
-}
diff --git a/lib/libc_bsd/stdio/remove.3 b/lib/libc_bsd/stdio/remove.3
deleted file mode 100644
index ac545d1..0000000
--- a/lib/libc_bsd/stdio/remove.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)remove.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/remove.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt REMOVE 3
-.Os
-.Sh NAME
-.Nm remove
-.Nd remove directory entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn remove "const char *path"
-.Sh DESCRIPTION
-The
-.Fn remove
-function removes the file or directory specified by
-.Fa path .
-.Pp
-If
-.Fa path
-specifies a directory,
-.Fn remove "path"
-is the equivalent of
-.Fn rmdir "path" .
-Otherwise, it is the equivalent of
-.Fn unlink "path" .
-.Sh RETURN VALUES
-.Rv -std remove
-.Sh ERRORS
-The
-.Fn remove
-function
-may fail and set
-.Va errno
-for any of the errors specified for the routines
-.Xr lstat 2 ,
-.Xr rmdir 2
-or
-.Xr unlink 2 .
-.Sh SEE ALSO
-.Xr rmdir 2 ,
-.Xr unlink 2
-.Sh STANDARDS
-The
-.Fn remove
-function conforms to
-.St -isoC
-and
-.St -xpg4.2 .
diff --git a/lib/libc_bsd/stdio/remove.c b/lib/libc_bsd/stdio/remove.c
deleted file mode 100644
index 2884d28..0000000
--- a/lib/libc_bsd/stdio/remove.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)remove.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/remove.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <stdio.h>
-
-int
-remove(const char *file)
-{
-	struct stat sb;
-
-	if (lstat(file, &sb) < 0)
-		return (-1);
-	if (S_ISDIR(sb.st_mode))
-		return (rmdir(file));
-	return (unlink(file));
-}
diff --git a/lib/libc_bsd/stdio/rewind.c b/lib/libc_bsd/stdio/rewind.c
deleted file mode 100644
index 5b89b6d..0000000
--- a/lib/libc_bsd/stdio/rewind.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rewind.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/rewind.c 269482 2014-08-03 18:28:10Z pfg $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-
-void
-rewind(FILE *fp)
-{
-	int serrno = errno;
-
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	FLOCKFILE(fp);
-	if (_fseeko(fp, (off_t)0, SEEK_SET, 1) == 0)
-		errno = serrno;
-	clearerr_unlocked(fp);	/* POSIX: clear stdio error regardless */
-	FUNLOCKFILE(fp);
-}
diff --git a/lib/libc_bsd/stdio/rget.c b/lib/libc_bsd/stdio/rget.c
deleted file mode 100644
index f56cea8..0000000
--- a/lib/libc_bsd/stdio/rget.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rget.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/rget.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include "local.h"
-
-/*
- * Handle getc() when the buffer ran out:
- * Refill, then return the first character
- * in the newly-filled buffer.
- */
-int
-__srget(FILE *fp)
-{
-	if (__srefill(fp) == 0) {
-		fp->_r--;
-		return (*fp->_p++);
-	}
-	return (EOF);
-}
diff --git a/lib/libc_bsd/stdio/scanf.3 b/lib/libc_bsd/stdio/scanf.3
deleted file mode 100644
index c19c6f6..0000000
--- a/lib/libc_bsd/stdio/scanf.3
+++ /dev/null
@@ -1,513 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/scanf.3 235363 2012-05-12 20:27:13Z joel $
-.\"
-.Dd January 4, 2003
-.Dt SCANF 3
-.Os
-.Sh NAME
-.Nm scanf ,
-.Nm fscanf ,
-.Nm sscanf ,
-.Nm vscanf ,
-.Nm vsscanf ,
-.Nm vfscanf
-.Nd input format conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn scanf "const char * restrict format" ...
-.Ft int
-.Fn fscanf "FILE * restrict stream" "const char * restrict format" ...
-.Ft int
-.Fn sscanf "const char * restrict str" "const char * restrict format" ...
-.In stdarg.h
-.Ft int
-.Fn vscanf "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsscanf "const char * restrict str" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vfscanf "FILE * restrict stream" "const char * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The
-.Fn scanf
-family of functions scans input according to a
-.Fa format
-as described below.
-This format may contain
-.Em conversion specifiers ;
-the results from such conversions, if any,
-are stored through the
-.Em pointer
-arguments.
-The
-.Fn scanf
-function
-reads input from the standard input stream
-.Dv stdin ,
-.Fn fscanf
-reads input from the stream pointer
-.Fa stream ,
-and
-.Fn sscanf
-reads its input from the character string pointed to by
-.Fa str .
-The
-.Fn vfscanf
-function
-is analogous to
-.Xr vfprintf 3
-and reads input from the stream pointer
-.Fa stream
-using a variable argument list of pointers (see
-.Xr stdarg 3 ) .
-The
-.Fn vscanf
-function scans a variable argument list from the standard input and
-the
-.Fn vsscanf
-function scans it from a string;
-these are analogous to
-the
-.Fn vprintf
-and
-.Fn vsprintf
-functions respectively.
-Each successive
-.Em pointer
-argument must correspond properly with
-each successive conversion specifier
-(but see the
-.Cm *
-conversion below).
-All conversions are introduced by the
-.Cm %
-(percent sign) character.
-The
-.Fa format
-string
-may also contain other characters.
-White space (such as blanks, tabs, or newlines) in the
-.Fa format
-string match any amount of white space, including none, in the input.
-Everything else
-matches only itself.
-Scanning stops
-when an input character does not match such a format character.
-Scanning also stops
-when an input conversion cannot be made (see below).
-.Sh CONVERSIONS
-Following the
-.Cm %
-character introducing a conversion
-there may be a number of
-.Em flag
-characters, as follows:
-.Bl -tag -width ".Cm l No (ell)"
-.It Cm *
-Suppresses assignment.
-The conversion that follows occurs as usual, but no pointer is used;
-the result of the conversion is simply discarded.
-.It Cm hh
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt char
-(rather than
-.Vt int ) .
-.It Cm h
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "short int"
-(rather than
-.Vt int ) .
-.It Cm l No (ell)
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "long int"
-(rather than
-.Vt int ) ,
-that the conversion will be one of
-.Cm a , e , f ,
-or
-.Cm g
-and the next pointer is a pointer to
-.Vt double
-(rather than
-.Vt float ) ,
-or that the conversion will be one of
-.Cm c ,
-.Cm s
-or
-.Cm \&[
-and the next pointer is a pointer to an array of
-.Vt wchar_t
-(rather than
-.Vt char ) .
-.It Cm ll No (ell ell)
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "long long int"
-(rather than
-.Vt int ) .
-.It Cm L
-Indicates that the conversion will be one of
-.Cm a , e , f ,
-or
-.Cm g
-and the next pointer is a pointer to
-.Vt "long double" .
-.It Cm j
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt intmax_t
-(rather than
-.Vt int ) .
-.It Cm t
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt ptrdiff_t
-(rather than
-.Vt int ) .
-.It Cm z
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt size_t
-(rather than
-.Vt int ) .
-.It Cm q
-(deprecated.)
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "long long int"
-(rather than
-.Vt int ) .
-.El
-.Pp
-In addition to these flags,
-there may be an optional maximum field width,
-expressed as a decimal integer,
-between the
-.Cm %
-and the conversion.
-If no width is given,
-a default of
-.Dq infinity
-is used (with one exception, below);
-otherwise at most this many bytes are scanned
-in processing the conversion.
-In the case of the
-.Cm lc ,
-.Cm ls
-and
-.Cm l[
-conversions, the field width specifies the maximum number
-of multibyte characters that will be scanned.
-Before conversion begins,
-most conversions skip white space;
-this white space is not counted against the field width.
-.Pp
-The following conversions are available:
-.Bl -tag -width XXXX
-.It Cm %
-Matches a literal
-.Ql % .
-That is,
-.Dq Li %%
-in the format string
-matches a single input
-.Ql %
-character.
-No conversion is done, and assignment does not occur.
-.It Cm d
-Matches an optionally signed decimal integer;
-the next pointer must be a pointer to
-.Vt int .
-.It Cm i
-Matches an optionally signed integer;
-the next pointer must be a pointer to
-.Vt int .
-The integer is read in base 16 if it begins
-with
-.Ql 0x
-or
-.Ql 0X ,
-in base 8 if it begins with
-.Ql 0 ,
-and in base 10 otherwise.
-Only characters that correspond to the base are used.
-.It Cm o
-Matches an octal integer;
-the next pointer must be a pointer to
-.Vt "unsigned int" .
-.It Cm u
-Matches an optionally signed decimal integer;
-the next pointer must be a pointer to
-.Vt "unsigned int" .
-.It Cm x , X
-Matches an optionally signed hexadecimal integer;
-the next pointer must be a pointer to
-.Vt "unsigned int" .
-.It Cm a , A , e , E , f , F , g , G
-Matches a floating-point number in the style of
-.Xr strtod 3 .
-The next pointer must be a pointer to
-.Vt float
-(unless
-.Cm l
-or
-.Cm L
-is specified.)
-.It Cm s
-Matches a sequence of non-white-space characters;
-the next pointer must be a pointer to
-.Vt char ,
-and the array must be large enough to accept all the sequence and the
-terminating
-.Dv NUL
-character.
-The input string stops at white space
-or at the maximum field width, whichever occurs first.
-.Pp
-If an
-.Cm l
-qualifier is present, the next pointer must be a pointer to
-.Vt wchar_t ,
-into which the input will be placed after conversion by
-.Xr mbrtowc 3 .
-.It Cm S
-The same as
-.Cm ls .
-.It Cm c
-Matches a sequence of
-.Em width
-count
-characters (default 1);
-the next pointer must be a pointer to
-.Vt char ,
-and there must be enough room for all the characters
-(no terminating
-.Dv NUL
-is added).
-The usual skip of leading white space is suppressed.
-To skip white space first, use an explicit space in the format.
-.Pp
-If an
-.Cm l
-qualifier is present, the next pointer must be a pointer to
-.Vt wchar_t ,
-into which the input will be placed after conversion by
-.Xr mbrtowc 3 .
-.It Cm C
-The same as
-.Cm lc .
-.It Cm \&[
-Matches a nonempty sequence of characters from the specified set
-of accepted characters;
-the next pointer must be a pointer to
-.Vt char ,
-and there must be enough room for all the characters in the string,
-plus a terminating
-.Dv NUL
-character.
-The usual skip of leading white space is suppressed.
-The string is to be made up of characters in
-(or not in)
-a particular set;
-the set is defined by the characters between the open bracket
-.Cm \&[
-character
-and a close bracket
-.Cm \&]
-character.
-The set
-.Em excludes
-those characters
-if the first character after the open bracket is a circumflex
-.Cm ^ .
-To include a close bracket in the set,
-make it the first character after the open bracket
-or the circumflex;
-any other position will end the set.
-The hyphen character
-.Cm -
-is also special;
-when placed between two other characters,
-it adds all intervening characters to the set.
-To include a hyphen,
-make it the last character before the final close bracket.
-For instance,
-.Ql [^]0-9-]
-means the set
-.Dq "everything except close bracket, zero through nine, and hyphen" .
-The string ends with the appearance of a character not in the
-(or, with a circumflex, in) set
-or when the field width runs out.
-.Pp
-If an
-.Cm l
-qualifier is present, the next pointer must be a pointer to
-.Vt wchar_t ,
-into which the input will be placed after conversion by
-.Xr mbrtowc 3 .
-.It Cm p
-Matches a pointer value (as printed by
-.Ql %p
-in
-.Xr printf 3 ) ;
-the next pointer must be a pointer to
-.Vt void .
-.It Cm n
-Nothing is expected;
-instead, the number of characters consumed thus far from the input
-is stored through the next pointer,
-which must be a pointer to
-.Vt int .
-This is
-.Em not
-a conversion, although it can be suppressed with the
-.Cm *
-flag.
-.El
-.Pp
-The decimal point
-character is defined in the program's locale (category
-.Dv LC_NUMERIC ) .
-.Pp
-For backwards compatibility, a
-.Dq conversion
-of
-.Ql %\e0
-causes an immediate return of
-.Dv EOF .
-.Sh RETURN VALUES
-These
-functions
-return
-the number of input items assigned, which can be fewer than provided
-for, or even zero, in the event of a matching failure.
-Zero
-indicates that, while there was input available,
-no conversions were assigned;
-typically this is due to an invalid input character,
-such as an alphabetic character for a
-.Ql %d
-conversion.
-The value
-.Dv EOF
-is returned if an input failure occurs before any conversion such as an
-end-of-file occurs.
-If an error or end-of-file occurs after conversion
-has begun,
-the number of conversions which were successfully completed is returned.
-.Sh SEE ALSO
-.Xr getc 3 ,
-.Xr mbrtowc 3 ,
-.Xr printf 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3 ,
-.Xr wscanf 3
-.Sh STANDARDS
-The functions
-.Fn fscanf ,
-.Fn scanf ,
-.Fn sscanf ,
-.Fn vfscanf ,
-.Fn vscanf
-and
-.Fn vsscanf
-conform to
-.St -isoC-99 .
-.Sh BUGS
-Earlier implementations of
-.Nm
-treated
-.Cm \&%D , \&%E , \&%F , \&%O
-and
-.Cm \&%X
-as their lowercase equivalents with an
-.Cm l
-modifier.
-In addition,
-.Nm
-treated an unknown conversion character as
-.Cm \&%d
-or
-.Cm \&%D ,
-depending on its case.
-This functionality has been removed.
-.Pp
-Numerical strings are truncated to 512 characters; for example,
-.Cm %f
-and
-.Cm %d
-are implicitly
-.Cm %512f
-and
-.Cm %512d .
-.Pp
-The
-.Cm %n$
-modifiers for positional arguments are not implemented.
-.Pp
-The
-.Nm
-family of functions do not correctly handle multibyte characters in the
-.Fa format
-argument.
diff --git a/lib/libc_bsd/stdio/scanf.c b/lib/libc_bsd/stdio/scanf.c
deleted file mode 100644
index 7075401..0000000
--- a/lib/libc_bsd/stdio/scanf.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)scanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/scanf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "xlocale_private.h"
-
-int
-scanf(char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	FLOCKFILE(stdin);
-	ret = __svfscanf(stdin, __get_locale(), fmt, ap);
-	FUNLOCKFILE(stdin);
-	va_end(ap);
-	return (ret);
-}
-int
-scanf_l(locale_t locale, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-	FIX_LOCALE(locale);
-
-	va_start(ap, fmt);
-	FLOCKFILE(stdin);
-	ret = __svfscanf(stdin, locale, fmt, ap);
-	FUNLOCKFILE(stdin);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/scanf_l.3 b/lib/libc_bsd/stdio/scanf_l.3
deleted file mode 100644
index 4ad1f53..0000000
--- a/lib/libc_bsd/stdio/scanf_l.3
+++ /dev/null
@@ -1,70 +0,0 @@
-.\" Copyright (c) 2012 Isabell Long <issyl0@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.
-.\"
-.\" 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: releng/10.2/lib/libc/stdio/scanf_l.3 240518 2012-09-14 21:28:56Z eadler $
-.\"
-.Dd April 8, 2012
-.Dt SCANF_L 3
-.Os
-.Sh NAME
-.Nm scanf_l ,
-.Nm fscanf_l ,
-.Nm sscanf_l ,
-.Nm vfscanf_l ,
-.Nm vscanf_l ,
-.Nm vsscanf_l
-.Nd input format conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn scanf_l "locale_t loc" "const char * restrict format" "..."
-.Ft int
-.Fn fscanf_l "FILE * restrict stream" "locale_t loc" "const char * restrict format" "..."
-.Ft int
-.Fn sscanf_l "const char * restrict str" "locale_t loc" "const char * restrict format" "..."
-.Ft int
-.Fn vfscanf_l "FILE * restrict stream" "locale_t loc" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vscanf_l "locale_t loc" "const char * restrict format" "va_list ap"
-.Ft int
-.Fn vsscanf_l "const char * restrict str" "locale_t loc" "const char * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The above functions scan input according to a specified
-.Fa format
-in the locale
-.Fa loc .
-They behave in the same way as the versions without the _l suffix, but use
-the specific locale rather than the global or per-thread locale.
-See the specific manual pages for more information.
-.Sh SEE ALSO
-.Xr scanf 3 ,
-.Xr xlocale 3
-.Sh STANDARDS
-These functions do not conform to any specific standard so they should be
-considered as non-portable local extensions.
-.Sh HISTORY
-These functions first appeared in Darwin and were first implemented in
-.Fx 9.1 .
diff --git a/lib/libc_bsd/stdio/setbuf.3 b/lib/libc_bsd/stdio/setbuf.3
deleted file mode 100644
index 28d56c9..0000000
--- a/lib/libc_bsd/stdio/setbuf.3
+++ /dev/null
@@ -1,200 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)setbuf.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/setbuf.3 246952 2013-02-18 22:47:59Z jilles $
-.\"
-.Dd February 18, 2013
-.Dt SETBUF 3
-.Os
-.Sh NAME
-.Nm setbuf ,
-.Nm setbuffer ,
-.Nm setlinebuf ,
-.Nm setvbuf
-.Nd stream buffering operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft void
-.Fn setbuf "FILE * restrict stream" "char * restrict buf"
-.Ft void
-.Fn setbuffer "FILE *stream" "char *buf" "int size"
-.Ft int
-.Fn setlinebuf "FILE *stream"
-.Ft int
-.Fn setvbuf "FILE * restrict stream" "char * restrict buf" "int mode" "size_t size"
-.Sh DESCRIPTION
-The three types of buffering available are unbuffered, block buffered,
-and line buffered.
-When an output stream is unbuffered, information appears on the
-destination file or terminal as soon as written;
-when it is block buffered many characters are saved up and written as a block;
-when it is line buffered characters are saved up until a newline is
-output or input is read from any stream attached to a terminal device
-(typically
-.Dv stdin ) .
-The function
-.Xr fflush 3
-may be used to force the block out early.
-(See
-.Xr fclose 3 . )
-.Pp
-Normally all files are block buffered.
-When the first
-.Tn I/O
-operation occurs on a file,
-.Xr malloc 3
-is called,
-and an optimally-sized buffer is obtained.
-If a stream refers to a terminal
-(as
-.Dv stdout
-normally does) it is line buffered.
-The standard error stream
-.Dv stderr
-is always unbuffered.
-Note that these defaults may be altered using the
-.Xr stdbuf 1
-utility.
-.Pp
-The
-.Fn setvbuf
-function
-may be used to alter the buffering behavior of a stream.
-The
-.Fa mode
-argument must be one of the following three macros:
-.Bl -tag -width _IOFBF -offset indent
-.It Dv _IONBF
-unbuffered
-.It Dv _IOLBF
-line buffered
-.It Dv _IOFBF
-fully buffered
-.El
-.Pp
-The
-.Fa size
-argument may be given as zero
-to obtain deferred optimal-size buffer allocation as usual.
-If it is not zero,
-then except for unbuffered files, the
-.Fa buf
-argument should point to a buffer at least
-.Fa size
-bytes long;
-this buffer will be used instead of the current buffer.
-If
-.Fa buf
-is not
-.Dv NULL ,
-it is the caller's responsibility to
-.Xr free 3
-this buffer after closing the stream.
-(If the
-.Fa size
-argument
-is not zero but
-.Fa buf
-is
-.Dv NULL ,
-a buffer of the given size will be allocated immediately,
-and released on close.
-This is an extension to ANSI C;
-portable code should use a size of 0 with any
-.Dv NULL
-buffer.)
-.Pp
-The
-.Fn setvbuf
-function may be used at any time,
-but may have peculiar side effects
-(such as discarding input or flushing output)
-if the stream is ``active''.
-Portable applications should call it only once on any given stream,
-and before any
-.Tn I/O
-is performed.
-.Pp
-The other three calls are, in effect, simply aliases for calls to
-.Fn setvbuf .
-Except for the lack of a return value, the
-.Fn setbuf
-function is exactly equivalent to the call
-.Pp
-.Dl "setvbuf(stream, buf, buf ? _IOFBF : _IONBF, BUFSIZ);"
-.Pp
-The
-.Fn setbuffer
-function
-is the same, except that the size of the buffer is up to the caller,
-rather than being determined by the default
-.Dv BUFSIZ .
-The
-.Fn setlinebuf
-function
-is exactly equivalent to the call:
-.Pp
-.Dl "setvbuf(stream, (char *)NULL, _IOLBF, 0);"
-.Sh RETURN VALUES
-The
-.Fn setvbuf
-function returns 0 on success, or
-.Dv EOF
-if the request cannot be honored
-(note that the stream is still functional in this case).
-.Pp
-The
-.Fn setlinebuf
-function returns what the equivalent
-.Fn setvbuf
-would have returned.
-.Sh SEE ALSO
-.Xr stdbuf 1 ,
-.Xr fclose 3 ,
-.Xr fopen 3 ,
-.Xr fread 3 ,
-.Xr malloc 3 ,
-.Xr printf 3 ,
-.Xr puts 3
-.Sh STANDARDS
-The
-.Fn setbuf
-and
-.Fn setvbuf
-functions
-conform to
-.St -isoC .
-.Sh BUGS
-.Fn setbuf
-usually uses a suboptimal buffer size and should be avoided.
diff --git a/lib/libc_bsd/stdio/setbuf.c b/lib/libc_bsd/stdio/setbuf.c
deleted file mode 100644
index 8a6dd04..0000000
--- a/lib/libc_bsd/stdio/setbuf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setbuf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/setbuf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include "local.h"
-
-void
-setbuf(FILE * __restrict fp, char * __restrict buf)
-{
-	(void) setvbuf(fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
-}
diff --git a/lib/libc_bsd/stdio/setbuffer.c b/lib/libc_bsd/stdio/setbuffer.c
deleted file mode 100644
index bf08030..0000000
--- a/lib/libc_bsd/stdio/setbuffer.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setbuffer.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/setbuffer.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <stdio.h>
-
-void
-setbuffer(FILE *fp, char *buf, int size)
-{
-
-	(void)setvbuf(fp, buf, buf ? _IOFBF : _IONBF, (size_t)size);
-}
-
-/*
- * set line buffering
- */
-int
-setlinebuf(FILE *fp)
-{
-
-	return (setvbuf(fp, (char *)NULL, _IOLBF, (size_t)0));
-}
diff --git a/lib/libc_bsd/stdio/setvbuf.c b/lib/libc_bsd/stdio/setvbuf.c
deleted file mode 100644
index 16cf2eb..0000000
--- a/lib/libc_bsd/stdio/setvbuf.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)setvbuf.c	8.2 (Berkeley) 11/16/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/setvbuf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-/*
- * Set one of the three kinds of buffering, optionally including
- * a buffer.
- */
-int
-setvbuf(FILE * __restrict fp, char * __restrict buf, int mode, size_t size)
-{
-	int ret, flags;
-	size_t iosize;
-	int ttyflag;
-
-	/*
-	 * Verify arguments.  The `int' limit on `size' is due to this
-	 * particular implementation.  Note, buf and size are ignored
-	 * when setting _IONBF.
-	 */
-	if (mode != _IONBF)
-		if ((mode != _IOFBF && mode != _IOLBF) || (int)size < 0)
-			return (EOF);
-
-	FLOCKFILE(fp);
-	/*
-	 * Write current buffer, if any.  Discard unread input (including
-	 * ungetc data), cancel line buffering, and free old buffer if
-	 * malloc()ed.  We also clear any eof condition, as if this were
-	 * a seek.
-	 */
-	ret = 0;
-	(void)__sflush(fp);
-	if (HASUB(fp))
-		FREEUB(fp);
-	fp->_r = fp->_lbfsize = 0;
-	flags = fp->_flags;
-	if (flags & __SMBF)
-		free((void *)fp->_bf._base);
-	flags &= ~(__SLBF | __SNBF | __SMBF | __SOPT | __SOFF | __SNPT | __SEOF);
-
-	/* If setting unbuffered mode, skip all the hard work. */
-	if (mode == _IONBF)
-		goto nbf;
-
-	/*
-	 * Find optimal I/O size for seek optimization.  This also returns
-	 * a `tty flag' to suggest that we check isatty(fd), but we do not
-	 * care since our caller told us how to buffer.
-	 */
-	flags |= __swhatbuf(fp, &iosize, &ttyflag);
-	if (size == 0) {
-		buf = NULL;	/* force local allocation */
-		size = iosize;
-	}
-
-	/* Allocate buffer if needed. */
-	if (buf == NULL) {
-		if ((buf = malloc(size)) == NULL) {
-			/*
-			 * Unable to honor user's request.  We will return
-			 * failure, but try again with file system size.
-			 */
-			ret = EOF;
-			if (size != iosize) {
-				size = iosize;
-				buf = malloc(size);
-			}
-		}
-		if (buf == NULL) {
-			/* No luck; switch to unbuffered I/O. */
-nbf:
-			fp->_flags = flags | __SNBF;
-			fp->_w = 0;
-			fp->_bf._base = fp->_p = fp->_nbuf;
-			fp->_bf._size = 1;
-			FUNLOCKFILE(fp);
-			return (ret);
-		}
-		flags |= __SMBF;
-	}
-
-	/*
-	 * Kill any seek optimization if the buffer is not the
-	 * right size.
-	 *
-	 * SHOULD WE ALLOW MULTIPLES HERE (i.e., ok iff (size % iosize) == 0)?
-	 */
-	if (size != iosize)
-		flags |= __SNPT;
-
-	/*
-	 * Fix up the FILE fields, and set __cleanup for output flush on
-	 * exit (since we are buffered in some way).
-	 */
-	if (mode == _IOLBF)
-		flags |= __SLBF;
-	fp->_flags = flags;
-	fp->_bf._base = fp->_p = (unsigned char *)buf;
-	fp->_bf._size = size;
-	/* fp->_lbfsize is still 0 */
-	if (flags & __SWR) {
-		/*
-		 * Begin or continue writing: see __swsetup().  Note
-		 * that __SNBF is impossible (it was handled earlier).
-		 */
-		if (flags & __SLBF) {
-			fp->_w = 0;
-			fp->_lbfsize = -fp->_bf._size;
-		} else
-			fp->_w = size;
-	} else {
-		/* begin/continue reading, or stay in intermediate state */
-		fp->_w = 0;
-	}
-	__cleanup = _cleanup;
-
-	FUNLOCKFILE(fp);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/snprintf.c b/lib/libc_bsd/stdio/snprintf.c
deleted file mode 100644
index 51b7b03..0000000
--- a/lib/libc_bsd/stdio/snprintf.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/snprintf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include "xlocale_private.h"
-
-#include "local.h"
-
-int
-snprintf(char * __restrict str, size_t n, char const * __restrict fmt, ...)
-{
-	size_t on;
-	int ret;
-	va_list ap;
-	FILE f = FAKE_FILE;
-
-	on = n;
-	if (n != 0)
-		n--;
-	if (n > INT_MAX) {
-		errno = EOVERFLOW;
-		*str = '\0';
-		return (EOF);
-	}
-	va_start(ap, fmt);
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = n;
-	ret = __vfprintf(&f, __get_locale(), fmt, ap);
-	if (on > 0)
-		*f._p = '\0';
-	va_end(ap);
-	return (ret);
-}
-int
-snprintf_l(char * __restrict str, size_t n, locale_t locale,
-		char const * __restrict fmt, ...)
-{
-	size_t on;
-	int ret;
-	va_list ap;
-	FILE f = FAKE_FILE;
-	FIX_LOCALE(locale);
-
-	on = n;
-	if (n != 0)
-		n--;
-	if (n > INT_MAX) {
-		errno = EOVERFLOW;
-		*str = '\0';
-		return (EOF);
-	}
-	va_start(ap, fmt);
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = n;
-	ret = __vfprintf(&f, locale, fmt, ap);
-	if (on > 0)
-		*f._p = '\0';
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/sprintf.c b/lib/libc_bsd/stdio/sprintf.c
deleted file mode 100644
index 640289c..0000000
--- a/lib/libc_bsd/stdio/sprintf.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/sprintf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <limits.h>
-#include "local.h"
-#include "xlocale_private.h"
-
-int
-sprintf(char * __restrict str, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vsprintf(str, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-int
-sprintf_l(char * __restrict str, locale_t locale, char const * __restrict fmt,
-		...)
-{
-	int ret;
-	va_list ap;
-	FIX_LOCALE(locale);
-
-	va_start(ap, fmt);
-	ret = vsprintf_l(str, locale, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/sscanf.c b/lib/libc_bsd/stdio/sscanf.c
deleted file mode 100644
index b6e960c..0000000
--- a/lib/libc_bsd/stdio/sscanf.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)sscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/sscanf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <xlocale.h>
-#include "local.h"
-
-int
-sscanf(const char * __restrict str, char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vsscanf(str, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
-int
-sscanf_l(const char * __restrict str, locale_t locale,
-		char const * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vsscanf_l(str, locale, fmt, ap);
-	va_end(ap);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/stdio.3 b/lib/libc_bsd/stdio/stdio.3
deleted file mode 100644
index 77d5f07..0000000
--- a/lib/libc_bsd/stdio/stdio.3
+++ /dev/null
@@ -1,333 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)stdio.3	8.7 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/stdio.3 189356 2009-03-04 03:38:51Z das $
-.\"
-.Dd March 3, 2009
-.Dt STDIO 3
-.Os
-.Sh NAME
-.Nm stdio
-.Nd standard input/output library functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Vt FILE *stdin ;
-.Vt FILE *stdout ;
-.Vt FILE *stderr ;
-.Sh DESCRIPTION
-The standard
-.Tn I/O
-library provides a simple and efficient buffered stream
-.Tn I/O
-interface.
-Input and output is mapped into logical data streams
-and the physical
-.Tn I/O
-characteristics are concealed.
-The functions and macros are listed
-below; more information is available from the individual man pages.
-.Pp
-A stream is associated with an external file (which may be a physical
-device) by
-.Em opening
-a file, which may involve creating a new file.
-Creating an
-existing file causes its former contents to be discarded.
-If a file can support positioning requests (such as a disk file, as opposed
-to a terminal) then a
-.Em file position indicator
-associated with the stream is positioned at the start of the file (byte
-zero), unless the file is opened with append mode.
-If append mode
-is used, the position indicator will be placed at the end-of-file.
-The position indicator is maintained by subsequent reads, writes
-and positioning requests.
-All input occurs as if the characters
-were read by successive calls to the
-.Xr fgetc 3
-function; all output takes place as if all characters were
-written by successive calls to the
-.Xr fputc 3
-function.
-.Pp
-A file is disassociated from a stream by
-.Em closing
-the file.
-Output streams are flushed (any unwritten buffer contents are transferred
-to the host environment) before the stream is disassociated from the file.
-The value of a pointer to a
-.Dv FILE
-object is indeterminate (garbage) after a file is closed.
-.Pp
-A file may be subsequently reopened, by the same or another program
-execution, and its contents reclaimed or modified (if it can be repositioned
-at the start).
-If the main function returns to its original caller, or
-the
-.Xr exit 3
-function is called, all open files are closed (hence all output
-streams are flushed) before program termination.
-Other methods
-of program termination may not close files properly and hence
-buffered output may be lost.
-In particular,
-.Xr _exit 2
-does not flush stdio files.
-Neither does an exit due to a signal.
-Buffers are flushed by
-.Xr abort 3
-as required by POSIX, although previous implementations did not.
-.Pp
-This implementation makes no distinction between
-.Dq text
-and
-.Dq binary
-streams.
-In effect, all streams are binary.
-No translation is performed and no extra padding appears on any stream.
-.Pp
-At program startup, three streams are predefined and need not be
-opened explicitly:
-.Bl -bullet -compact -offset indent
-.It
-.Em standard input
-(for reading conventional input),
-.It
-.Em standard output
-(for writing conventional output), and
-.It
-.Em standard error
-(for writing diagnostic output).
-.El
-These streams are abbreviated
-.Dv stdin , stdout
-and
-.Dv stderr .
-Initially, the standard error stream
-is unbuffered; the standard input and output streams are
-fully buffered if and only if the streams do not refer to
-an interactive or
-.Dq terminal
-device, as determined by the
-.Xr isatty 3
-function.
-In fact,
-.Em all
-freshly-opened streams that refer to terminal devices
-default to line buffering, and
-pending output to such streams is written automatically
-whenever such an input stream is read.
-Note that this applies only to
-.Dq "true reads" ;
-if the read request can be satisfied by existing buffered data,
-no automatic flush will occur.
-In these cases,
-or when a large amount of computation is done after printing
-part of a line on an output terminal, it is necessary to
-.Xr fflush 3
-the standard output before going off and computing so that the output
-will appear.
-Alternatively, these defaults may be modified via the
-.Xr setvbuf 3
-function.
-.Pp
-The
-.Nm
-library is a part of the library
-.Nm libc
-and routines are automatically loaded as needed by the C compiler.
-The
-.Tn SYNOPSIS
-sections of the following manual pages indicate which include files
-are to be used, what the compiler declaration for the function
-looks like and which external variables are of interest.
-.Pp
-The following are defined as macros;
-these names may not be re-used
-without first removing their current definitions with
-.Ic #undef :
-.Dv BUFSIZ ,
-.Dv EOF ,
-.Dv FILENAME_MAX ,
-.Dv FOPEN_MAX ,
-.Dv L_ctermid ,
-.Dv L_cuserid ,
-.Dv L_tmpnam ,
-.Dv NULL ,
-.Dv P_tmpdir ,
-.Dv SEEK_CUR ,
-.Dv SEEK_END ,
-.Dv SEEK_SET ,
-.Dv TMP_MAX ,
-.Dv clearerr ,
-.Dv clearerr_unlocked ,
-.Dv feof ,
-.Dv feof_unlocked ,
-.Dv ferror ,
-.Dv ferror_unlocked ,
-.Dv fileno ,
-.Dv fileno_unlocked ,
-.Dv fropen ,
-.Dv fwopen ,
-.Dv getc ,
-.Dv getc_unlocked ,
-.Dv getchar ,
-.Dv getchar_unlocked ,
-.Dv putc ,
-.Dv putc_unlocked ,
-.Dv putchar ,
-.Dv putchar_unlocked ,
-.Dv stderr ,
-.Dv stdin
-and
-.Dv stdout .
-Function versions of the macro functions
-.Dv clearerr ,
-.Dv clearerr_unlocked ,
-.Dv feof ,
-.Dv feof_unlocked ,
-.Dv ferror ,
-.Dv ferror_unlocked ,
-.Dv fileno ,
-.Dv fileno_unlocked ,
-.Dv getc ,
-.Dv getc_unlocked ,
-.Dv getchar ,
-.Dv getchar_unlocked ,
-.Dv putc ,
-.Dv putc_unlocked ,
-.Dv putchar ,
-and
-.Dv putchar_unlocked
-exist and will be used if the macro
-definitions are explicitly removed.
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr open 2 ,
-.Xr read 2 ,
-.Xr write 2
-.Sh STANDARDS
-The
-.Nm
-library conforms to
-.St -isoC-99 .
-.Sh LIST OF FUNCTIONS
-.Bl -column "Description"
-.It Sy "Function	Description"
-.It "asprintf	formatted output conversion"
-.It "clearerr	check and reset stream status"
-.It "dprintf	formatted output conversion"
-.It "fclose	close a stream"
-.It "fdopen	stream open functions"
-.It "feof	check and reset stream status"
-.It "ferror	check and reset stream status"
-.It "fflush	flush a stream"
-.It "fgetc	get next character or word from input stream"
-.It "fgetln	get a line from a stream"
-.It "fgetpos	reposition a stream"
-.It "fgets	get a line from a stream"
-.It "fgetwc	get next wide character from input stream"
-.It "fgetws	get a line of wide characters from a stream"
-.It "fileno	check and reset stream status"
-.It "fopen	stream open functions"
-.It "fprintf	formatted output conversion"
-.It "fpurge	flush a stream"
-.It "fputc	output a character or word to a stream"
-.It "fputs	output a line to a stream"
-.It "fputwc	output a wide character to a stream"
-.It "fputws	output a line of wide characters to a stream"
-.It "fread	binary stream input/output"
-.It "freopen	stream open functions"
-.It "fropen	open a stream"
-.It "fscanf	input format conversion"
-.It "fseek	reposition a stream"
-.It "fsetpos	reposition a stream"
-.It "ftell	reposition a stream"
-.It "funopen	open a stream"
-.It "fwide	set/get orientation of stream"
-.It "fwopen	open a stream"
-.It "fwprintf	formatted wide character output conversion"
-.It "fwrite	binary stream input/output"
-.It "getc	get next character or word from input stream"
-.It "getchar	get next character or word from input stream"
-.It "getdelim	get a line from a stream"
-.It "getline	get a line from a stream"
-.It "gets	get a line from a stream"
-.It "getw	get next character or word from input stream"
-.It "getwc	get next wide character from input stream"
-.It "getwchar	get next wide character from input stream"
-.It "mkdtemp	create unique temporary directory"
-.It "mkstemp	create unique temporary file"
-.It "mktemp	create unique temporary file"
-.It "perror	system error messages"
-.It "printf	formatted output conversion"
-.It "putc	output a character or word to a stream"
-.It "putchar	output a character or word to a stream"
-.It "puts	output a line to a stream"
-.It "putw	output a character or word to a stream"
-.It "putwc	output a wide character to a stream"
-.It "putwchar	output a wide character to a stream"
-.It "remove	remove directory entry"
-.It "rewind	reposition a stream"
-.It "scanf	input format conversion"
-.It "setbuf	stream buffering operations"
-.It "setbuffer	stream buffering operations"
-.It "setlinebuf	stream buffering operations"
-.It "setvbuf	stream buffering operations"
-.It "snprintf	formatted output conversion"
-.It "sprintf	formatted output conversion"
-.It "sscanf	input format conversion"
-.It "strerror	system error messages"
-.It "swprintf	formatted wide character output conversion"
-.It "sys_errlist	system error messages"
-.It "sys_nerr	system error messages"
-.It "tempnam	temporary file routines"
-.It "tmpfile	temporary file routines"
-.It "tmpnam	temporary file routines"
-.It "ungetc	un-get character from input stream"
-.It "ungetwc	un-get wide character from input stream"
-.It "vasprintf	formatted output conversion"
-.It "vdprintf	formatted output conversion"
-.It "vfprintf	formatted output conversion"
-.It "vfscanf	input format conversion"
-.It "vfwprintf	formatted wide character output conversion"
-.It "vprintf	formatted output conversion"
-.It "vscanf	input format conversion"
-.It "vsnprintf	formatted output conversion"
-.It "vsprintf	formatted output conversion"
-.It "vsscanf	input format conversion"
-.It "vswprintf	formatted wide character output conversion"
-.It "vwprintf	formatted wide character output conversion"
-.It "wprintf	formatted wide character output conversion"
-.El
-.Sh BUGS
-The standard buffered functions do not interact well with certain other
-library and system functions, especially
-.Xr vfork 2 .
diff --git a/lib/libc_bsd/stdio/stdio.c b/lib/libc_bsd/stdio/stdio.c
deleted file mode 100644
index 056a9a2..0000000
--- a/lib/libc_bsd/stdio/stdio.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)stdio.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/stdio.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-#include "local.h"
-
-/*
- * Small standard I/O/seek/close functions.
- */
-int
-__sread(void *cookie, char *buf, int n)
-{
-	FILE *fp = cookie;
-
-	return(_read(fp->_file, buf, (size_t)n));
-}
-
-int
-__swrite(void *cookie, char const *buf, int n)
-{
-	FILE *fp = cookie;
-
-	return (_write(fp->_file, buf, (size_t)n));
-}
-
-fpos_t
-__sseek(void *cookie, fpos_t offset, int whence)
-{
-	FILE *fp = cookie;
-
-	return (lseek(fp->_file, (off_t)offset, whence));
-}
-
-int
-__sclose(void *cookie)
-{
-
-	return (_close(((FILE *)cookie)->_file));
-}
-
-/*
- * Higher level wrappers.
- */
-int
-_sread(FILE *fp, char *buf, int n)
-{
-	int ret;
-
-	ret = (*fp->_read)(fp->_cookie, buf, n);
-	if (ret > 0) {
-		if (fp->_flags & __SOFF) {
-			if (fp->_offset <= OFF_MAX - ret)
-				fp->_offset += ret;
-			else
-				fp->_flags &= ~__SOFF;
-		}
-	} else if (ret < 0)
-		fp->_flags &= ~__SOFF;
-	return (ret);
-}
-
-int
-_swrite(FILE *fp, char const *buf, int n)
-{
-	int ret;
-	int serrno;
-
-	if (fp->_flags & __SAPP) {
-		serrno = errno;
-		if (_sseek(fp, (fpos_t)0, SEEK_END) == -1 &&
-		    (fp->_flags & __SOPT))
-			return (-1);
-		errno = serrno;
-	}
-	ret = (*fp->_write)(fp->_cookie, buf, n);
-	/* __SOFF removed even on success in case O_APPEND mode is set. */
-	if (ret >= 0) {
-		if ((fp->_flags & (__SAPP|__SOFF)) == (__SAPP|__SOFF) &&
-		    fp->_offset <= OFF_MAX - ret)
-			fp->_offset += ret;
-		else
-			fp->_flags &= ~__SOFF;
-
-	} else if (ret < 0)
-		fp->_flags &= ~__SOFF;
-	return (ret);
-}
-
-fpos_t
-_sseek(FILE *fp, fpos_t offset, int whence)
-{
-	fpos_t ret;
-	int serrno, errret;
-
-	serrno = errno;
-	errno = 0;
-	ret = (*fp->_seek)(fp->_cookie, offset, whence);
-	errret = errno;
-	if (errno == 0)
-		errno = serrno;
-	/*
-	 * Disallow negative seeks per POSIX.
-	 * It is needed here to help upper level caller
-	 * in the cases it can't detect.
-	 */
-	if (ret < 0) {
-		if (errret == 0) {
-			if (offset != 0 || whence != SEEK_CUR) {
-				if (HASUB(fp))
-					FREEUB(fp);
-				fp->_p = fp->_bf._base;
-				fp->_r = 0;
-				fp->_flags &= ~__SEOF;
-			}
-			fp->_flags |= __SERR;
-			errno = EINVAL;
-		} else if (errret == ESPIPE)
-			fp->_flags &= ~__SAPP;
-		fp->_flags &= ~__SOFF;
-		ret = -1;
-	} else if (fp->_flags & __SOPT) {
-		fp->_flags |= __SOFF;
-		fp->_offset = ret;
-	}
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/swprintf.c b/lib/libc_bsd/stdio/swprintf.c
deleted file mode 100644
index 18912f0..0000000
--- a/lib/libc_bsd/stdio/swprintf.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/swprintf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-
-int
-swprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vswprintf(s, n, fmt, ap);
-	va_end(ap);
-
-	return (ret);
-}
-int
-swprintf_l(wchar_t * __restrict s, size_t n, locale_t locale,
-		const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vswprintf_l(s, n, locale, fmt, ap);
-	va_end(ap);
-
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/swscanf.c b/lib/libc_bsd/stdio/swscanf.c
deleted file mode 100644
index 79eb5da..0000000
--- a/lib/libc_bsd/stdio/swscanf.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/swscanf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-
-int
-swscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vswscanf(str, fmt, ap);
-	va_end(ap);
-
-	return (r);
-}
-int
-swscanf_l(const wchar_t * __restrict str, locale_t locale,
-		const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vswscanf_l(str, locale, fmt, ap);
-	va_end(ap);
-
-	return (r);
-}
diff --git a/lib/libc_bsd/stdio/tempnam.c b/lib/libc_bsd/stdio/tempnam.c
deleted file mode 100644
index fe72f2c..0000000
--- a/lib/libc_bsd/stdio/tempnam.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tempnam.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/tempnam.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <sys/param.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <paths.h>
-
-__warn_references(tempnam,
-    "warning: tempnam() possibly used unsafely; consider using mkstemp()");
-
-extern char *_mktemp(char *);
-
-char *
-tempnam(const char *dir, const char *pfx)
-{
-	int sverrno;
-	char *f, *name;
-
-	if (!(name = malloc(MAXPATHLEN)))
-		return(NULL);
-
-	if (!pfx)
-		pfx = "tmp.";
-
-	if (issetugid() == 0 && (f = getenv("TMPDIR"))) {
-		(void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f,
-		    *(f + strlen(f) - 1) == '/'? "": "/", pfx);
-		if ((f = _mktemp(name)))
-			return(f);
-	}
-
-	if ((f = (char *)dir)) {
-		(void)snprintf(name, MAXPATHLEN, "%s%s%sXXXXXX", f,
-		    *(f + strlen(f) - 1) == '/'? "": "/", pfx);
-		if ((f = _mktemp(name)))
-			return(f);
-	}
-
-	f = P_tmpdir;
-	(void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx);
-	if ((f = _mktemp(name)))
-		return(f);
-
-	f = _PATH_TMP;
-	(void)snprintf(name, MAXPATHLEN, "%s%sXXXXXX", f, pfx);
-	if ((f = _mktemp(name)))
-		return(f);
-
-	sverrno = errno;
-	free(name);
-	errno = sverrno;
-	return(NULL);
-}
diff --git a/lib/libc_bsd/stdio/tmpfile.c b/lib/libc_bsd/stdio/tmpfile.c
deleted file mode 100644
index 7b6a5fa..0000000
--- a/lib/libc_bsd/stdio/tmpfile.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tmpfile.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/tmpfile.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <signal.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <paths.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-FILE *
-tmpfile(void)
-{
-	sigset_t set, oset;
-	FILE *fp;
-	int fd, sverrno;
-#define	TRAILER	"tmp.XXXXXX"
-	char *buf;
-	const char *tmpdir;
-
-	tmpdir = NULL;
-	if (issetugid() == 0)
-		tmpdir = getenv("TMPDIR");
-	if (tmpdir == NULL)
-		tmpdir = _PATH_TMP;
-
-	(void)asprintf(&buf, "%s%s%s", tmpdir,
-	    (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", TRAILER);
-	if (buf == NULL)
-		return (NULL);
-
-	sigfillset(&set);
-	(void)__libc_sigprocmask(SIG_BLOCK, &set, &oset);
-
-	fd = mkstemp(buf);
-	if (fd != -1)
-		(void)unlink(buf);
-
-	free(buf);
-
-	(void)__libc_sigprocmask(SIG_SETMASK, &oset, NULL);
-
-	if (fd == -1)
-		return (NULL);
-
-	if ((fp = fdopen(fd, "w+")) == NULL) {
-		sverrno = errno;
-		(void)_close(fd);
-		errno = sverrno;
-		return (NULL);
-	}
-	return (fp);
-}
diff --git a/lib/libc_bsd/stdio/tmpnam.3 b/lib/libc_bsd/stdio/tmpnam.3
deleted file mode 100644
index 27c1a9a..0000000
--- a/lib/libc_bsd/stdio/tmpnam.3
+++ /dev/null
@@ -1,246 +0,0 @@
-.\" Copyright (c) 1988, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)tmpnam.3	8.2 (Berkeley) 11/17/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/tmpnam.3 262965 2014-03-10 00:53:37Z eadler $
-.\"
-.Dd March 18, 2007
-.Dt TMPFILE 3
-.Os
-.Sh NAME
-.Nm tempnam ,
-.Nm tmpfile ,
-.Nm tmpnam
-.Nd temporary file routines
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft FILE *
-.Fn tmpfile void
-.Ft char *
-.Fn tmpnam "char *str"
-.Ft char *
-.Fn tempnam "const char *tmpdir" "const char *prefix"
-.Sh DESCRIPTION
-The
-.Fn tmpfile
-function
-returns a pointer to a stream associated with a file descriptor returned
-by the routine
-.Xr mkstemp 3 .
-The created file is unlinked before
-.Fn tmpfile
-returns, causing the file to be automatically deleted when the last
-reference to it is closed.
-The file is opened with the access value
-.Ql w+ .
-The file is created in the directory determined by the environment variable
-.Ev TMPDIR
-if set.
-The default location if
-.Ev TMPDIR
-is not set is
-.Pa /tmp .
-.Pp
-The
-.Fn tmpnam
-function
-returns a pointer to a file name, in the
-.Dv P_tmpdir
-directory, which
-did not reference an existing file at some indeterminate point in the
-past.
-.Dv P_tmpdir
-is defined in the include file
-.In stdio.h .
-If the argument
-.Fa str
-is
-.Pf non- Dv NULL ,
-the file name is copied to the buffer it references.
-Otherwise, the file name is copied to a static buffer.
-In either case,
-.Fn tmpnam
-returns a pointer to the file name.
-.Pp
-The buffer referenced by
-.Fa str
-is expected to be at least
-.Dv L_tmpnam
-bytes in length.
-.Dv L_tmpnam
-is defined in the include file
-.In stdio.h .
-.Pp
-The
-.Fn tempnam
-function
-is similar to
-.Fn tmpnam ,
-but provides the ability to specify the directory which will
-contain the temporary file and the file name prefix.
-.Pp
-The environment variable
-.Ev TMPDIR
-(if set), the argument
-.Fa tmpdir
-(if
-.Pf non- Dv NULL ) ,
-the directory
-.Dv P_tmpdir ,
-and the directory
-.Pa /tmp
-are tried, in the listed order, as directories in which to store the
-temporary file.
-.Pp
-The argument
-.Fa prefix ,
-if
-.Pf non- Dv NULL ,
-is used to specify a file name prefix, which will be the
-first part of the created file name.
-The
-.Fn tempnam
-function
-allocates memory in which to store the file name; the returned pointer
-may be used as a subsequent argument to
-.Xr free 3 .
-.Sh RETURN VALUES
-The
-.Fn tmpfile
-function
-returns a pointer to an open file stream on success, and a
-.Dv NULL
-pointer
-on error.
-.Pp
-The
-.Fn tmpnam
-and
-.Fn tempfile
-functions
-return a pointer to a file name on success, and a
-.Dv NULL
-pointer
-on error.
-.Sh ENVIRONMENT
-.Bl -tag -width Ds
-.It Ev TMPDIR
-.Pf [ Fn tempnam
-only]
-If set,
-the directory in which the temporary file is stored.
-.Ev TMPDIR
-is ignored for processes
-for which
-.Xr issetugid 2
-is true.
-.El
-.Sh COMPATIBILITY
-These interfaces are provided from System V and
-.Tn ANSI
-compatibility only.
-.Pp
-Most historic implementations of these functions provide
-only a limited number of possible temporary file names
-(usually 26)
-before file names will start being recycled.
-System V implementations of these functions
-(and of
-.Xr mktemp 3 )
-use the
-.Xr access 2
-system call to determine whether or not the temporary file
-may be created.
-This has obvious ramifications for setuid or setgid programs,
-complicating the portable use of these interfaces in such programs.
-.Pp
-The
-.Fn tmpfile
-interface should not be used in software expected to be used on other systems
-if there is any possibility that the user does not wish the temporary file to
-be publicly readable and writable.
-.Sh ERRORS
-The
-.Fn tmpfile
-function
-may fail and set the global variable
-.Va errno
-for any of the errors specified for the library functions
-.Xr fdopen 3
-or
-.Xr mkstemp 3 .
-.Pp
-The
-.Fn tmpnam
-function
-may fail and set
-.Va errno
-for any of the errors specified for the library function
-.Xr mktemp 3 .
-.Pp
-The
-.Fn tempnam
-function
-may fail and set
-.Va errno
-for any of the errors specified for the library functions
-.Xr malloc 3
-or
-.Xr mktemp 3 .
-.Sh SEE ALSO
-.Xr mkstemp 3 ,
-.Xr mktemp 3
-.Sh STANDARDS
-The
-.Fn tmpfile
-and
-.Fn tmpnam
-functions
-conform to
-.St -isoC .
-.Sh SECURITY CONSIDERATIONS
-The
-.Fn tmpnam
-and
-.Fn tempnam
-functions are susceptible to a race condition
-occurring between the selection of the file name
-and the creation of the file,
-which allows malicious users
-to potentially overwrite arbitrary files in the system,
-depending on the level of privilege of the running program.
-Additionally, there is no means by which
-file permissions may be specified.
-It is strongly suggested that
-.Xr mkstemp 3
-be used in place of these functions.
diff --git a/lib/libc_bsd/stdio/tmpnam.c b/lib/libc_bsd/stdio/tmpnam.c
deleted file mode 100644
index 2db8973..0000000
--- a/lib/libc_bsd/stdio/tmpnam.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)tmpnam.c	8.3 (Berkeley) 3/28/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/tmpnam.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <unistd.h>
-
-__warn_references(tmpnam,
-    "warning: tmpnam() possibly used unsafely; consider using mkstemp()");
-
-extern char *_mktemp(char *);
-
-char *
-tmpnam(char *s)
-{
-	static u_long tmpcount;
-	static char buf[L_tmpnam];
-
-	if (s == NULL)
-		s = buf;
-	(void)snprintf(s, L_tmpnam, "%stmp.%lu.XXXXXX", P_tmpdir, tmpcount);
-	++tmpcount;
-	return (_mktemp(s));
-}
diff --git a/lib/libc_bsd/stdio/ungetc.3 b/lib/libc_bsd/stdio/ungetc.3
deleted file mode 100644
index 0d50312..0000000
--- a/lib/libc_bsd/stdio/ungetc.3
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/ungetc.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt UNGETC 3
-.Os
-.Sh NAME
-.Nm ungetc
-.Nd un-get character from input stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn ungetc "int c" "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn ungetc
-function pushes the character
-.Fa c
-(converted to an unsigned char)
-back onto the input stream pointed to by
-.Fa stream .
-The pushed-back characters will be returned by subsequent reads on the
-stream (in reverse order).
-A successful intervening call,
-using the same stream,
-to one of the file positioning functions
-.Xr ( fseek 3 ,
-.Xr fsetpos 3 ,
-or
-.Xr rewind 3 )
-will discard the pushed back characters.
-.Pp
-One character of push-back is guaranteed,
-but as long as there is sufficient memory,
-an effectively infinite amount of pushback is allowed.
-.Pp
-If a character is successfully pushed-back,
-the end-of-file indicator for the stream is cleared.
-The file-position indicator is decremented
-by each successful call to
-.Fn ungetc ;
-if its value was 0 before a call, its value is unspecified after
-the call.
-.Sh RETURN VALUES
-The
-.Fn ungetc
-function returns the character pushed-back after the conversion,
-or
-.Dv EOF
-if the operation fails.
-If the value of the argument
-.Fa c
-character equals
-.Dv EOF ,
-the operation will fail and the stream will remain unchanged.
-.Sh SEE ALSO
-.Xr fseek 3 ,
-.Xr getc 3 ,
-.Xr setvbuf 3 ,
-.Xr ungetwc 3
-.Sh STANDARDS
-The
-.Fn ungetc
-function conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/stdio/ungetc.c b/lib/libc_bsd/stdio/ungetc.c
deleted file mode 100644
index bab2a85..0000000
--- a/lib/libc_bsd/stdio/ungetc.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ungetc.c	8.2 (Berkeley) 11/3/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/ungetc.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "un-namespace.h"
-#include "local.h"
-#include "libc_private.h"
-
-static int __submore(FILE *);
-
-/*
- * Expand the ungetc buffer `in place'.  That is, adjust fp->_p when
- * the buffer moves, so that it points the same distance from the end,
- * and move the bytes in the buffer around as necessary so that they
- * are all at the end (stack-style).
- */
-static int
-__submore(FILE *fp)
-{
-	int i;
-	unsigned char *p;
-
-	if (fp->_ub._base == fp->_ubuf) {
-		/*
-		 * Get a new buffer (rather than expanding the old one).
-		 */
-		if ((p = malloc((size_t)BUFSIZ)) == NULL)
-			return (EOF);
-		fp->_ub._base = p;
-		fp->_ub._size = BUFSIZ;
-		p += BUFSIZ - sizeof(fp->_ubuf);
-		for (i = sizeof(fp->_ubuf); --i >= 0;)
-			p[i] = fp->_ubuf[i];
-		fp->_p = p;
-		return (0);
-	}
-	i = fp->_ub._size;
-	p = realloc(fp->_ub._base, (size_t)(i << 1));
-	if (p == NULL)
-		return (EOF);
-	/* no overlap (hence can use memcpy) because we doubled the size */
-	(void)memcpy((void *)(p + i), (void *)p, (size_t)i);
-	fp->_p = p + i;
-	fp->_ub._base = p;
-	fp->_ub._size = i << 1;
-	return (0);
-}
-
-/*
- * MT-safe version
- */
-int
-ungetc(int c, FILE *fp)
-{
-	int ret;
-
-	if (!__sdidinit)
-		__sinit();
-	FLOCKFILE(fp);
-	ORIENT(fp, -1);
-	ret = __ungetc(c, fp);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-/*
- * Non-MT-safe version
- */
-int
-__ungetc(int c, FILE *fp)
-{
-
-	if (c == EOF)
-		return (EOF);
-	if ((fp->_flags & __SRD) == 0) {
-		/*
-		 * Not already reading: no good unless reading-and-writing.
-		 * Otherwise, flush any current write stuff.
-		 */
-		if ((fp->_flags & __SRW) == 0)
-			return (EOF);
-		if (fp->_flags & __SWR) {
-			if (__sflush(fp))
-				return (EOF);
-			fp->_flags &= ~__SWR;
-			fp->_w = 0;
-			fp->_lbfsize = 0;
-		}
-		fp->_flags |= __SRD;
-	}
-	c = (unsigned char)c;
-
-	/*
-	 * If we are in the middle of ungetc'ing, just continue.
-	 * This may require expanding the current ungetc buffer.
-	 */
-	if (HASUB(fp)) {
-		if (fp->_r >= fp->_ub._size && __submore(fp))
-			return (EOF);
-		*--fp->_p = c;
-		fp->_r++;
-		return (c);
-	}
-	fp->_flags &= ~__SEOF;
-
-	/*
-	 * If we can handle this by simply backing up, do so,
-	 * but never replace the original character.
-	 * (This makes sscanf() work when scanning `const' data.)
-	 */
-	if (fp->_bf._base != NULL && fp->_p > fp->_bf._base &&
-	    fp->_p[-1] == c) {
-		fp->_p--;
-		fp->_r++;
-		return (c);
-	}
-
-	/*
-	 * Create an ungetc buffer.
-	 * Initially, we will use the `reserve' buffer.
-	 */
-	fp->_ur = fp->_r;
-	fp->_up = fp->_p;
-	fp->_ub._base = fp->_ubuf;
-	fp->_ub._size = sizeof(fp->_ubuf);
-	fp->_ubuf[sizeof(fp->_ubuf) - 1] = c;
-	fp->_p = &fp->_ubuf[sizeof(fp->_ubuf) - 1];
-	fp->_r = 1;
-	return (c);
-}
diff --git a/lib/libc_bsd/stdio/ungetwc.3 b/lib/libc_bsd/stdio/ungetwc.3
deleted file mode 100644
index 4cc4f94..0000000
--- a/lib/libc_bsd/stdio/ungetwc.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\"	$NetBSD: ungetwc.3,v 1.3 2002/02/07 07:00:27 ross Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)ungetc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/ungetwc.3 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd March 3, 2004
-.Dt UNGETWC 3
-.Os
-.Sh NAME
-.Nm ungetwc
-.Nd un-get wide character from input stream
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft wint_t
-.Fn ungetwc "wint_t wc" "FILE *stream"
-.Sh DESCRIPTION
-The
-.Fn ungetwc
-function pushes the wide character
-.Fa wc
-(converted to an
-.Vt wchar_t )
-back onto the input stream pointed to by
-.Fa stream .
-The pushed-backed wide characters will be returned by subsequent reads on the
-stream (in reverse order).
-A successful intervening call, using the same stream, to one of the file
-positioning functions
-.Xr fseek 3 ,
-.Xr fsetpos 3 ,
-or
-.Xr rewind 3
-will discard the pushed back wide characters.
-.Pp
-One wide character of push-back is guaranteed,
-but as long as there is
-sufficient memory, an effectively infinite amount of pushback is allowed.
-.Pp
-If a character is successfully pushed-back,
-the end-of-file indicator for the stream is cleared.
-.Sh RETURN VALUES
-The
-.Fn ungetwc
-function
-returns
-the wide character pushed-back after the conversion, or
-.Dv WEOF
-if the operation fails.
-If the value of the argument
-.Fa c
-character equals
-.Dv WEOF ,
-the operation will fail and the stream will remain unchanged.
-.Sh SEE ALSO
-.Xr fseek 3 ,
-.Xr getwc 3
-.Sh STANDARDS
-The
-.Fn ungetwc
-function conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdio/ungetwc.c b/lib/libc_bsd/stdio/ungetwc.c
deleted file mode 100644
index 0475e5d..0000000
--- a/lib/libc_bsd/stdio/ungetwc.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 Tim J. Robbins.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/ungetwc.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "mblocal.h"
-#include "xlocale_private.h"
-
-/*
- * Non-MT-safe version.
- */
-wint_t
-__ungetwc(wint_t wc, FILE *fp, locale_t locale)
-{
-	char buf[MB_LEN_MAX];
-	size_t len;
-	struct xlocale_ctype *l = XLOCALE_CTYPE(locale);
-
-	if (wc == WEOF)
-		return (WEOF);
-	if ((len = l->__wcrtomb(buf, wc, &fp->_mbstate)) == (size_t)-1) {
-		fp->_flags |= __SERR;
-		return (WEOF);
-	}
-	while (len-- != 0)
-		if (__ungetc((unsigned char)buf[len], fp) == EOF)
-			return (WEOF);
-
-	return (wc);
-}
-
-/*
- * MT-safe version.
- */
-wint_t
-ungetwc_l(wint_t wc, FILE *fp, locale_t locale)
-{
-	wint_t r;
-	FIX_LOCALE(locale);
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	r = __ungetwc(wc, fp, locale);
-	FUNLOCKFILE(fp);
-
-	return (r);
-}
-wint_t
-ungetwc(wint_t wc, FILE *fp)
-{
-	return ungetwc_l(wc, fp, __get_locale());
-}
diff --git a/lib/libc_bsd/stdio/vasprintf.c b/lib/libc_bsd/stdio/vasprintf.c
deleted file mode 100644
index 1de031d..0000000
--- a/lib/libc_bsd/stdio/vasprintf.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*	$OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $	*/
-
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vasprintf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include "xlocale_private.h"
-#include "local.h"
-
-int
-vasprintf_l(char **str, locale_t locale, const char *fmt, __va_list ap)
-{
-	FILE f = FAKE_FILE;
-	int ret;
-	FIX_LOCALE(locale);
-
-	f._flags = __SWR | __SSTR | __SALC;
-	f._bf._base = f._p = malloc(128);
-	if (f._bf._base == NULL) {
-		*str = NULL;
-		errno = ENOMEM;
-		return (-1);
-	}
-	f._bf._size = f._w = 127;		/* Leave room for the NUL */
-	ret = __vfprintf(&f, locale, fmt, ap);
-	if (ret < 0) {
-		free(f._bf._base);
-		*str = NULL;
-		errno = ENOMEM;
-		return (-1);
-	}
-	*f._p = '\0';
-	*str = (char *)f._bf._base;
-	return (ret);
-}
-int
-vasprintf(char **str, const char *fmt, __va_list ap)
-{
-	return vasprintf_l(str, __get_locale(), fmt, ap);
-}
diff --git a/lib/libc_bsd/stdio/vdprintf.c b/lib/libc_bsd/stdio/vdprintf.c
deleted file mode 100644
index 5733060..0000000
--- a/lib/libc_bsd/stdio/vdprintf.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vdprintf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include "namespace.h"
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include "un-namespace.h"
-
-#include "local.h"
-#include "xlocale_private.h"
-
-int
-vdprintf(int fd, const char * __restrict fmt, va_list ap)
-{
-	FILE f = FAKE_FILE;
-	unsigned char buf[BUFSIZ];
-	int ret;
-
-	if (fd > SHRT_MAX) {
-		errno = EMFILE;
-		return (EOF);
-	}
-
-	f._p = buf;
-	f._w = sizeof(buf);
-	f._flags = __SWR;
-	f._file = fd;
-	f._cookie = &f;
-	f._write = __swrite;
-	f._bf._base = buf;
-	f._bf._size = sizeof(buf);
-
-	if ((ret = __vfprintf(&f, __get_locale(), fmt, ap)) < 0)
-		return (ret);
-
-	return (__fflush(&f) ? EOF : ret);
-}
diff --git a/lib/libc_bsd/stdio/vfprintf.c b/lib/libc_bsd/stdio/vfprintf.c
deleted file mode 100644
index ae5f39d..0000000
--- a/lib/libc_bsd/stdio/vfprintf.c
+++ /dev/null
@@ -1,1039 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vfprintf.c 269482 2014-08-03 18:28:10Z pfg $");
-
-/*
- * Actual printf innards.
- *
- * This code is large and complicated...
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <printf.h>
-
-#include <stdarg.h>
-#include "xlocale_private.h"
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-#include "fvwrite.h"
-#include "printflocal.h"
-
-static int	__sprint(FILE *, struct __suio *, locale_t);
-static int	__sbprintf(FILE *, locale_t, const char *, va_list) __printflike(3, 0)
-	__noinline;
-static char	*__wcsconv(wchar_t *, int);
-
-#define	CHAR	char
-#include "printfcommon.h"
-
-struct grouping_state {
-	char *thousands_sep;	/* locale-specific thousands separator */
-	int thousep_len;	/* length of thousands_sep */
-	const char *grouping;	/* locale-specific numeric grouping rules */
-	int lead;		/* sig figs before decimal or group sep */
-	int nseps;		/* number of group separators with ' */
-	int nrepeats;		/* number of repeats of the last group */
-};
-
-/*
- * Initialize the thousands' grouping state in preparation to print a
- * number with ndigits digits. This routine returns the total number
- * of bytes that will be needed.
- */
-static int
-grouping_init(struct grouping_state *gs, int ndigits, locale_t loc)
-{
-	struct lconv *locale;
-
-	locale = localeconv_l(loc);
-	gs->grouping = locale->grouping;
-	gs->thousands_sep = locale->thousands_sep;
-	gs->thousep_len = strlen(gs->thousands_sep);
-
-	gs->nseps = gs->nrepeats = 0;
-	gs->lead = ndigits;
-	while (*gs->grouping != CHAR_MAX) {
-		if (gs->lead <= *gs->grouping)
-			break;
-		gs->lead -= *gs->grouping;
-		if (*(gs->grouping+1)) {
-			gs->nseps++;
-			gs->grouping++;
-		} else
-			gs->nrepeats++;
-	}
-	return ((gs->nseps + gs->nrepeats) * gs->thousep_len);
-}
-
-/*
- * Print a number with thousands' separators.
- */
-static int
-grouping_print(struct grouping_state *gs, struct io_state *iop,
-	       const CHAR *cp, const CHAR *ep, locale_t locale)
-{
-	const CHAR *cp0 = cp;
-
-	if (io_printandpad(iop, cp, ep, gs->lead, zeroes, locale))
-		return (-1);
-	cp += gs->lead;
-	while (gs->nseps > 0 || gs->nrepeats > 0) {
-		if (gs->nrepeats > 0)
-			gs->nrepeats--;
-		else {
-			gs->grouping--;
-			gs->nseps--;
-		}
-		if (io_print(iop, gs->thousands_sep, gs->thousep_len, locale))
-			return (-1);
-		if (io_printandpad(iop, cp, ep, *gs->grouping, zeroes, locale))
-			return (-1);
-		cp += *gs->grouping;
-	}
-	if (cp > ep)
-		cp = ep;
-	return (cp - cp0);
-}
-
-/*
- * Flush out all the vectors defined by the given uio,
- * then reset it so that it can be reused.
- */
-static int
-__sprint(FILE *fp, struct __suio *uio, locale_t locale)
-{
-	int err;
-
-	if (uio->uio_resid == 0) {
-		uio->uio_iovcnt = 0;
-		return (0);
-	}
-	err = __sfvwrite(fp, uio);
-	uio->uio_resid = 0;
-	uio->uio_iovcnt = 0;
-	return (err);
-}
-
-/*
- * Helper function for `fprintf to unbuffered unix file': creates a
- * temporary buffer.  We only work on write-only files; this avoids
- * worries about ungetc buffers and so forth.
- */
-static int
-__sbprintf(FILE *fp, locale_t locale, const char *fmt, va_list ap)
-{
-	int ret;
-	FILE fake = FAKE_FILE;
-	unsigned char buf[BUFSIZ];
-
-	/* XXX This is probably not needed. */
-	if (prepwrite(fp) != 0)
-		return (EOF);
-
-	/* copy the important variables */
-	fake._flags = fp->_flags & ~__SNBF;
-	fake._file = fp->_file;
-	fake._cookie = fp->_cookie;
-	fake._write = fp->_write;
-	fake._orientation = fp->_orientation;
-	fake._mbstate = fp->_mbstate;
-
-	/* set up the buffer */
-	fake._bf._base = fake._p = buf;
-	fake._bf._size = fake._w = sizeof(buf);
-	fake._lbfsize = 0;	/* not actually used, but Just In Case */
-
-	/* do the work, then copy any error status */
-	ret = __vfprintf(&fake, locale, fmt, ap);
-	if (ret >= 0 && __fflush(&fake))
-		ret = EOF;
-	if (fake._flags & __SERR)
-		fp->_flags |= __SERR;
-	return (ret);
-}
-
-/*
- * Convert a wide character string argument for the %ls format to a multibyte
- * string representation. If not -1, prec specifies the maximum number of
- * bytes to output, and also means that we can't assume that the wide char.
- * string ends is null-terminated.
- */
-static char *
-__wcsconv(wchar_t *wcsarg, int prec)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char buf[MB_LEN_MAX];
-	wchar_t *p;
-	char *convbuf;
-	size_t clen, nbytes;
-
-	/* Allocate space for the maximum number of bytes we could output. */
-	if (prec < 0) {
-		p = wcsarg;
-		mbs = initial;
-		nbytes = wcsrtombs(NULL, (const wchar_t **)&p, 0, &mbs);
-		if (nbytes == (size_t)-1)
-			return (NULL);
-	} else {
-		/*
-		 * Optimisation: if the output precision is small enough,
-		 * just allocate enough memory for the maximum instead of
-		 * scanning the string.
-		 */
-		if (prec < 128)
-			nbytes = prec;
-		else {
-			nbytes = 0;
-			p = wcsarg;
-			mbs = initial;
-			for (;;) {
-				clen = wcrtomb(buf, *p++, &mbs);
-				if (clen == 0 || clen == (size_t)-1 ||
-				    nbytes + clen > prec)
-					break;
-				nbytes += clen;
-			}
-		}
-	}
-	if ((convbuf = malloc(nbytes + 1)) == NULL)
-		return (NULL);
-
-	/* Fill the output buffer. */
-	p = wcsarg;
-	mbs = initial;
-	if ((nbytes = wcsrtombs(convbuf, (const wchar_t **)&p,
-	    nbytes, &mbs)) == (size_t)-1) {
-		free(convbuf);
-		return (NULL);
-	}
-	convbuf[nbytes] = '\0';
-	return (convbuf);
-}
-
-/*
- * MT-safe version
- */
-int
-vfprintf_l(FILE * __restrict fp, locale_t locale, const char * __restrict fmt0,
-		va_list ap)
-{
-	int ret;
-	FIX_LOCALE(locale);
-
-	FLOCKFILE(fp);
-	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
-	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-	    fp->_file >= 0)
-		ret = __sbprintf(fp, locale, fmt0, ap);
-	else
-		ret = __vfprintf(fp, locale, fmt0, ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-int
-vfprintf(FILE * __restrict fp, const char * __restrict fmt0, va_list ap)
-{
-	return vfprintf_l(fp, __get_locale(), fmt0, ap);
-}
-
-/*
- * The size of the buffer we use as scratch space for integer
- * conversions, among other things.  We need enough space to
- * write a uintmax_t in octal (plus one byte).
- */
-#if UINTMAX_MAX <= UINT64_MAX
-#define	BUF	32
-#else
-#error "BUF must be large enough to format a uintmax_t"
-#endif
-
-/*
- * Non-MT-safe version
- */
-int
-__vfprintf(FILE *fp, locale_t locale, const char *fmt0, va_list ap)
-{
-	char *fmt;		/* format string */
-	int ch;			/* character from fmt */
-	int n, n2;		/* handy integer (short term usage) */
-	char *cp;		/* handy char pointer (short term usage) */
-	int flags;		/* flags as above */
-	int ret;		/* return value accumulator */
-	int width;		/* width from format (%8d), or 0 */
-	int prec;		/* precision from format; <0 for N/A */
-	char sign;		/* sign prefix (' ', '+', '-', or \0) */
-	struct grouping_state gs; /* thousands' grouping info */
-
-#ifndef NO_FLOATING_POINT
-	/*
-	 * We can decompose the printed representation of floating
-	 * point numbers into several parts, some of which may be empty:
-	 *
-	 * [+|-| ] [0x|0X] MMM . NNN [e|E|p|P] [+|-] ZZ
-	 *    A       B     ---C---      D       E   F
-	 *
-	 * A:	'sign' holds this value if present; '\0' otherwise
-	 * B:	ox[1] holds the 'x' or 'X'; '\0' if not hexadecimal
-	 * C:	cp points to the string MMMNNN.  Leading and trailing
-	 *	zeros are not in the string and must be added.
-	 * D:	expchar holds this character; '\0' if no exponent, e.g. %f
-	 * F:	at least two digits for decimal, at least one digit for hex
-	 */
-	char *decimal_point;	/* locale specific decimal point */
-	int decpt_len;		/* length of decimal_point */
-	int signflag;		/* true if float is negative */
-	union {			/* floating point arguments %[aAeEfFgG] */
-		double dbl;
-		long double ldbl;
-	} fparg;
-	int expt;		/* integer value of exponent */
-	char expchar;		/* exponent character: [eEpP\0] */
-	char *dtoaend;		/* pointer to end of converted digits */
-	int expsize;		/* character count for expstr */
-	int ndig;		/* actual number of digits returned by dtoa */
-	char expstr[MAXEXPDIG+2];	/* buffer for exponent string: e+ZZZ */
-	char *dtoaresult;	/* buffer allocated by dtoa */
-#endif
-	u_long	ulval;		/* integer arguments %[diouxX] */
-	uintmax_t ujval;	/* %j, %ll, %q, %t, %z integers */
-	int base;		/* base for [diouxX] conversion */
-	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
-	int realsz;		/* field size expanded by dprec, sign, etc */
-	int size;		/* size of converted field or string */
-	int prsize;             /* max size of printed field */
-	const char *xdigs;     	/* digits for %[xX] conversion */
-	struct io_state io;	/* I/O buffering state */
-	char buf[BUF];		/* buffer with space for digits of uintmax_t */
-	char ox[2];		/* space for 0x; ox[1] is either x, X, or \0 */
-	union arg *argtable;    /* args, built due to positional arg */
-	union arg statargtable [STATIC_ARG_TBL_SIZE];
-	int nextarg;            /* 1-based argument index */
-	va_list orgap;          /* original argument pointer */
-	char *convbuf;		/* wide to multibyte conversion result */
-
-	static const char xdigs_lower[16] = "0123456789abcdef";
-	static const char xdigs_upper[16] = "0123456789ABCDEF";
-
-	/* BEWARE, these `goto error' on error. */
-#define	PRINT(ptr, len) { \
-	if (io_print(&io, (ptr), (len), locale))	\
-		goto error; \
-}
-#define	PAD(howmany, with) { \
-	if (io_pad(&io, (howmany), (with), locale)) \
-		goto error; \
-}
-#define	PRINTANDPAD(p, ep, len, with) {	\
-	if (io_printandpad(&io, (p), (ep), (len), (with), locale)) \
-		goto error; \
-}
-#define	FLUSH() { \
-	if (io_flush(&io, locale)) \
-		goto error; \
-}
-
-	/*
-	 * Get the argument indexed by nextarg.   If the argument table is
-	 * built, use it to get the argument.  If its not, get the next
-	 * argument (and arguments must be gotten sequentially).
-	 */
-#define GETARG(type) \
-	((argtable != NULL) ? *((type*)(&argtable[nextarg++])) : \
-	    (nextarg++, va_arg(ap, type)))
-
-	/*
-	 * To extend shorts properly, we need both signed and unsigned
-	 * argument extraction methods.
-	 */
-#define	SARG() \
-	(flags&LONGINT ? GETARG(long) : \
-	    flags&SHORTINT ? (long)(short)GETARG(int) : \
-	    flags&CHARINT ? (long)(signed char)GETARG(int) : \
-	    (long)GETARG(int))
-#define	UARG() \
-	(flags&LONGINT ? GETARG(u_long) : \
-	    flags&SHORTINT ? (u_long)(u_short)GETARG(int) : \
-	    flags&CHARINT ? (u_long)(u_char)GETARG(int) : \
-	    (u_long)GETARG(u_int))
-#define	INTMAX_SIZE	(INTMAXT|SIZET|PTRDIFFT|LLONGINT)
-#define SJARG() \
-	(flags&INTMAXT ? GETARG(intmax_t) : \
-	    flags&SIZET ? (intmax_t)GETARG(ssize_t) : \
-	    flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
-	    (intmax_t)GETARG(long long))
-#define	UJARG() \
-	(flags&INTMAXT ? GETARG(uintmax_t) : \
-	    flags&SIZET ? (uintmax_t)GETARG(size_t) : \
-	    flags&PTRDIFFT ? (uintmax_t)GETARG(ptrdiff_t) : \
-	    (uintmax_t)GETARG(unsigned long long))
-
-	/*
-	 * Get * arguments, including the form *nn$.  Preserve the nextarg
-	 * that the argument can be gotten once the type is determined.
-	 */
-#define GETASTER(val) \
-	n2 = 0; \
-	cp = fmt; \
-	while (is_digit(*cp)) { \
-		n2 = 10 * n2 + to_digit(*cp); \
-		cp++; \
-	} \
-	if (*cp == '$') { \
-		int hold = nextarg; \
-		if (argtable == NULL) { \
-			argtable = statargtable; \
-			if (__find_arguments (fmt0, orgap, &argtable)) { \
-				ret = EOF; \
-				goto error; \
-			} \
-		} \
-		nextarg = n2; \
-		val = GETARG (int); \
-		nextarg = hold; \
-		fmt = ++cp; \
-	} else { \
-		val = GETARG (int); \
-	}
-
-	if (__use_xprintf == 0 && getenv("USE_XPRINTF"))
-		__use_xprintf = 1;
-	if (__use_xprintf > 0)
-		return (__xvprintf(fp, fmt0, ap));
-
-	/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
-	if (prepwrite(fp) != 0) {
-		errno = EBADF;
-		return (EOF);
-	}
-
-	convbuf = NULL;
-	fmt = (char *)fmt0;
-	argtable = NULL;
-	nextarg = 1;
-	va_copy(orgap, ap);
-	io_init(&io, fp);
-	ret = 0;
-#ifndef NO_FLOATING_POINT
-	dtoaresult = NULL;
-	decimal_point = localeconv_l(locale)->decimal_point;
-	/* The overwhelmingly common case is decpt_len == 1. */
-	decpt_len = (decimal_point[1] == '\0' ? 1 : strlen(decimal_point));
-#endif
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
-			/* void */;
-		if ((n = fmt - cp) != 0) {
-			if ((unsigned)ret + n > INT_MAX) {
-				ret = EOF;
-				errno = EOVERFLOW;
-				goto error;
-			}
-			PRINT(cp, n);
-			ret += n;
-		}
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-		dprec = 0;
-		width = 0;
-		prec = -1;
-		gs.grouping = NULL;
-		sign = '\0';
-		ox[1] = '\0';
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-			/*-
-			 * ``If the space and + flags both appear, the space
-			 * flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-			if (!sign)
-				sign = ' ';
-			goto rflag;
-		case '#':
-			flags |= ALT;
-			goto rflag;
-		case '*':
-			/*-
-			 * ``A negative field width argument is taken as a
-			 * - flag followed by a positive field width.''
-			 *	-- ANSI X3J11
-			 * They don't exclude field widths read from args.
-			 */
-			GETASTER (width);
-			if (width >= 0)
-				goto rflag;
-			width = -width;
-			/* FALLTHROUGH */
-		case '-':
-			flags |= LADJUST;
-			goto rflag;
-		case '+':
-			sign = '+';
-			goto rflag;
-		case '\'':
-			flags |= GROUPING;
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				GETASTER (prec);
-				goto rflag;
-			}
-			prec = 0;
-			while (is_digit(ch)) {
-				prec = 10 * prec + to_digit(ch);
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			/*-
-			 * ``Note that 0 is taken as a flag, not as the
-			 * beginning of a field width.''
-			 *	-- ANSI X3J11
-			 */
-			flags |= ZEROPAD;
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				nextarg = n;
-				if (argtable == NULL) {
-					argtable = statargtable;
-					if (__find_arguments (fmt0, orgap,
-							      &argtable)) {
-						ret = EOF;
-						goto error;
-					}
-				}
-				goto rflag;
-			}
-			width = n;
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-			if (flags & LONGINT) {
-				static const mbstate_t initial;
-				mbstate_t mbs;
-				size_t mbseqlen;
-
-				mbs = initial;
-				mbseqlen = wcrtomb(cp = buf,
-				    (wchar_t)GETARG(wint_t), &mbs);
-				if (mbseqlen == (size_t)-1) {
-					fp->_flags |= __SERR;
-					goto error;
-				}
-				size = (int)mbseqlen;
-			} else {
-				*(cp = buf) = GETARG(int);
-				size = 1;
-			}
-			sign = '\0';
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			if (flags & INTMAX_SIZE) {
-				ujval = SJARG();
-				if ((intmax_t)ujval < 0) {
-					ujval = -ujval;
-					sign = '-';
-				}
-			} else {
-				ulval = SARG();
-				if ((long)ulval < 0) {
-					ulval = -ulval;
-					sign = '-';
-				}
-			}
-			base = 10;
-			goto number;
-#ifndef NO_FLOATING_POINT
-		case 'a':
-		case 'A':
-			if (ch == 'a') {
-				ox[1] = 'x';
-				xdigs = xdigs_lower;
-				expchar = 'p';
-			} else {
-				ox[1] = 'X';
-				xdigs = xdigs_upper;
-				expchar = 'P';
-			}
-			if (prec >= 0)
-				prec++;
-			if (dtoaresult != NULL)
-				freedtoa(dtoaresult);
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult = cp =
-				    __hldtoa(fparg.ldbl, xdigs, prec,
-				    &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult = cp =
-				    __hdtoa(fparg.dbl, xdigs, prec,
-				    &expt, &signflag, &dtoaend);
-			}
-			if (prec < 0)
-				prec = dtoaend - cp;
-			if (expt == INT_MAX)
-				ox[1] = '\0';
-			goto fp_common;
-		case 'e':
-		case 'E':
-			expchar = ch;
-			if (prec < 0)	/* account for digit before decpt */
-				prec = DEFPREC + 1;
-			else
-				prec++;
-			goto fp_begin;
-		case 'f':
-		case 'F':
-			expchar = '\0';
-			goto fp_begin;
-		case 'g':
-		case 'G':
-			expchar = ch - ('g' - 'e');
-			if (prec == 0)
-				prec = 1;
-fp_begin:
-			if (prec < 0)
-				prec = DEFPREC;
-			if (dtoaresult != NULL)
-				freedtoa(dtoaresult);
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult = cp =
-				    __ldtoa(&fparg.ldbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult = cp =
-				    dtoa(fparg.dbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-				if (expt == 9999)
-					expt = INT_MAX;
-			}
-fp_common:
-			if (signflag)
-				sign = '-';
-			if (expt == INT_MAX) {	/* inf or nan */
-				if (*cp == 'N') {
-					cp = (ch >= 'a') ? "nan" : "NAN";
-					sign = '\0';
-				} else
-					cp = (ch >= 'a') ? "inf" : "INF";
-				size = 3;
-				flags &= ~ZEROPAD;
-				break;
-			}
-			flags |= FPT;
-			ndig = dtoaend - cp;
-			if (ch == 'g' || ch == 'G') {
-				if (expt > -4 && expt <= prec) {
-					/* Make %[gG] smell like %[fF] */
-					expchar = '\0';
-					if (flags & ALT)
-						prec -= expt;
-					else
-						prec = ndig - expt;
-					if (prec < 0)
-						prec = 0;
-				} else {
-					/*
-					 * Make %[gG] smell like %[eE], but
-					 * trim trailing zeroes if no # flag.
-					 */
-					if (!(flags & ALT))
-						prec = ndig;
-				}
-			}
-			if (expchar) {
-				expsize = exponent(expstr, expt - 1, expchar);
-				size = expsize + prec;
-				if (prec > 1 || flags & ALT)
-					size += decpt_len;
-			} else {
-				/* space for digits before decimal point */
-				if (expt > 0)
-					size = expt;
-				else	/* "0" */
-					size = 1;
-				/* space for decimal pt and following digits */
-				if (prec || flags & ALT)
-					size += prec + decpt_len;
-				if ((flags & GROUPING) && expt > 0)
-					size += grouping_init(&gs, expt, locale);
-			}
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			/*
-			 * Assignment-like behavior is specified if the
-			 * value overflows or is otherwise unrepresentable.
-			 * C99 says to use `signed char' for %hhn conversions.
-			 */
-			if (flags & LLONGINT)
-				*GETARG(long long *) = ret;
-			else if (flags & SIZET)
-				*GETARG(ssize_t *) = (ssize_t)ret;
-			else if (flags & PTRDIFFT)
-				*GETARG(ptrdiff_t *) = ret;
-			else if (flags & INTMAXT)
-				*GETARG(intmax_t *) = ret;
-			else if (flags & LONGINT)
-				*GETARG(long *) = ret;
-			else if (flags & SHORTINT)
-				*GETARG(short *) = ret;
-			else if (flags & CHARINT)
-				*GETARG(signed char *) = ret;
-			else
-				*GETARG(int *) = ret;
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 8;
-			goto nosign;
-		case 'p':
-			/*-
-			 * ``The argument shall be a pointer to void.  The
-			 * value of the pointer is converted to a sequence
-			 * of printable characters, in an implementation-
-			 * defined manner.''
-			 *	-- ANSI X3J11
-			 */
-			ujval = (uintmax_t)(uintptr_t)GETARG(void *);
-			base = 16;
-			xdigs = xdigs_lower;
-			flags = flags | INTMAXT;
-			ox[1] = 'x';
-			goto nosign;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			if (flags & LONGINT) {
-				wchar_t *wcp;
-
-				if (convbuf != NULL)
-					free(convbuf);
-				if ((wcp = GETARG(wchar_t *)) == NULL)
-					cp = "(null)";
-				else {
-					convbuf = __wcsconv(wcp, prec);
-					if (convbuf == NULL) {
-						fp->_flags |= __SERR;
-						goto error;
-					}
-					cp = convbuf;
-				}
-			} else if ((cp = GETARG(char *)) == NULL)
-				cp = "(null)";
-			size = (prec >= 0) ? strnlen(cp, prec) : strlen(cp);
-			sign = '\0';
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 10;
-			goto nosign;
-		case 'X':
-			xdigs = xdigs_upper;
-			goto hex;
-		case 'x':
-			xdigs = xdigs_lower;
-hex:
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 16;
-			/* leading 0x/X only if non-zero */
-			if (flags & ALT &&
-			    (flags & INTMAX_SIZE ? ujval != 0 : ulval != 0))
-				ox[1] = ch;
-
-			flags &= ~GROUPING;
-			/* unsigned conversions */
-nosign:			sign = '\0';
-			/*-
-			 * ``... diouXx conversions ... if a precision is
-			 * specified, the 0 flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-number:			if ((dprec = prec) >= 0)
-				flags &= ~ZEROPAD;
-
-			/*-
-			 * ``The result of converting a zero value with an
-			 * explicit precision of zero is no characters.''
-			 *	-- ANSI X3J11
-			 *
-			 * ``The C Standard is clear enough as is.  The call
-			 * printf("%#.0o", 0) should print 0.''
-			 *	-- Defect Report #151
-			 */
-			cp = buf + BUF;
-			if (flags & INTMAX_SIZE) {
-				if (ujval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					cp = __ujtoa(ujval, cp, base,
-					    flags & ALT, xdigs);
-			} else {
-				if (ulval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					cp = __ultoa(ulval, cp, base,
-					    flags & ALT, xdigs);
-			}
-			size = buf + BUF - cp;
-			if (size > BUF)	/* should never happen */
-				abort();
-			if ((flags & GROUPING) && size != 0)
-				size += grouping_init(&gs, size, locale);
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			/* pretend it was %c with argument ch */
-			cp = buf;
-			*cp = ch;
-			size = 1;
-			sign = '\0';
-			break;
-		}
-
-		/*
-		 * All reasonable formats wind up here.  At this point, `cp'
-		 * points to a string which (if not flags&LADJUST) should be
-		 * padded out to `width' places.  If flags&ZEROPAD, it should
-		 * first be prefixed by any sign or other prefix; otherwise,
-		 * it should be blank padded before the prefix is emitted.
-		 * After any left-hand padding and prefixing, emit zeroes
-		 * required by a decimal [diouxX] precision, then print the
-		 * string proper, then emit zeroes required by any leftover
-		 * floating precision; finally, if LADJUST, pad with blanks.
-		 *
-		 * Compute actual size, so we know how much to pad.
-		 * size excludes decimal prec; realsz includes it.
-		 */
-		realsz = dprec > size ? dprec : size;
-		if (sign)
-			realsz++;
-		if (ox[1])
-			realsz += 2;
-
-		prsize = width > realsz ? width : realsz;
-		if ((unsigned)ret + prsize > INT_MAX) {
-			ret = EOF;
-			errno = EOVERFLOW;
-			goto error;
-		}
-
-		/* right-adjusting blank padding */
-		if ((flags & (LADJUST|ZEROPAD)) == 0)
-			PAD(width - realsz, blanks);
-
-		/* prefix */
-		if (sign)
-			PRINT(&sign, 1);
-
-		if (ox[1]) {	/* ox[1] is either x, X, or \0 */
-			ox[0] = '0';
-			PRINT(ox, 2);
-		}
-
-		/* right-adjusting zero padding */
-		if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
-			PAD(width - realsz, zeroes);
-
-		/* the string or number proper */
-#ifndef NO_FLOATING_POINT
-		if ((flags & FPT) == 0) {
-#endif
-			/* leading zeroes from decimal precision */
-			PAD(dprec - size, zeroes);
-			if (gs.grouping) {
-				if (grouping_print(&gs, &io, cp, buf+BUF, locale) < 0)
-					goto error;
-			} else {
-				PRINT(cp, size);
-			}
-#ifndef NO_FLOATING_POINT
-		} else {	/* glue together f_p fragments */
-			if (!expchar) {	/* %[fF] or sufficiently short %[gG] */
-				if (expt <= 0) {
-					PRINT(zeroes, 1);
-					if (prec || flags & ALT)
-						PRINT(decimal_point,decpt_len);
-					PAD(-expt, zeroes);
-					/* already handled initial 0's */
-					prec += expt;
-				} else {
-					if (gs.grouping) {
-						n = grouping_print(&gs, &io,
-						    cp, dtoaend, locale);
-						if (n < 0)
-							goto error;
-						cp += n;
-					} else {
-						PRINTANDPAD(cp, dtoaend,
-						    expt, zeroes);
-						cp += expt;
-					}
-					if (prec || flags & ALT)
-						PRINT(decimal_point,decpt_len);
-				}
-				PRINTANDPAD(cp, dtoaend, prec, zeroes);
-			} else {	/* %[eE] or sufficiently long %[gG] */
-				if (prec > 1 || flags & ALT) {
-					PRINT(cp++, 1);
-					PRINT(decimal_point, decpt_len);
-					PRINT(cp, ndig-1);
-					PAD(prec - ndig, zeroes);
-				} else	/* XeYYY */
-					PRINT(cp, 1);
-				PRINT(expstr, expsize);
-			}
-		}
-#endif
-		/* left-adjusting padding (always blank) */
-		if (flags & LADJUST)
-			PAD(width - realsz, blanks);
-
-		/* finally, adjust ret */
-		ret += prsize;
-
-		FLUSH();	/* copy out the I/O vectors */
-	}
-done:
-	FLUSH();
-error:
-	va_end(orgap);
-#ifndef NO_FLOATING_POINT
-	if (dtoaresult != NULL)
-		freedtoa(dtoaresult);
-#endif
-	if (convbuf != NULL)
-		free(convbuf);
-	if (__sferror(fp))
-		ret = EOF;
-	if ((argtable != NULL) && (argtable != statargtable))
-		free (argtable);
-	return (ret);
-	/* NOTREACHED */
-}
-
diff --git a/lib/libc_bsd/stdio/vfscanf.c b/lib/libc_bsd/stdio/vfscanf.c
deleted file mode 100644
index 3a92ae2..0000000
--- a/lib/libc_bsd/stdio/vfscanf.c
+++ /dev/null
@@ -1,1094 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vfscanf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <ctype.h>
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "un-namespace.h"
-
-#include "collate.h"
-#include "libc_private.h"
-#include "local.h"
-#include "xlocale_private.h"
-
-#ifndef NO_FLOATING_POINT
-#include <locale.h>
-#endif
-
-#define	BUF		513	/* Maximum length of numeric string. */
-
-/*
- * Flags used during conversion.
- */
-#define	LONG		0x01	/* l: long or double */
-#define	LONGDBL		0x02	/* L: long double */
-#define	SHORT		0x04	/* h: short */
-#define	SUPPRESS	0x08	/* *: suppress assignment */
-#define	POINTER		0x10	/* p: void * (as hex) */
-#define	NOSKIP		0x20	/* [ or c: do not skip blanks */
-#define	LONGLONG	0x400	/* ll: long long (+ deprecated q: quad) */
-#define	INTMAXT		0x800	/* j: intmax_t */
-#define	PTRDIFFT	0x1000	/* t: ptrdiff_t */
-#define	SIZET		0x2000	/* z: size_t */
-#define	SHORTSHORT	0x4000	/* hh: char */
-#define	UNSIGNED	0x8000	/* %[oupxX] conversions */
-
-/*
- * The following are used in integral conversions only:
- * SIGNOK, NDIGITS, PFXOK, and NZDIGITS
- */
-#define	SIGNOK		0x40	/* +/- is (still) legal */
-#define	NDIGITS		0x80	/* no digits detected */
-#define	PFXOK		0x100	/* 0x prefix is (still) legal */
-#define	NZDIGITS	0x200	/* no zero digits detected */
-#define	HAVESIGN	0x10000	/* sign detected */
-
-/*
- * Conversion types.
- */
-#define	CT_CHAR		0	/* %c conversion */
-#define	CT_CCL		1	/* %[...] conversion */
-#define	CT_STRING	2	/* %s conversion */
-#define	CT_INT		3	/* %[dioupxX] conversion */
-#define	CT_FLOAT	4	/* %[efgEFG] conversion */
-
-static const u_char *__sccl(char *, const u_char *);
-#ifndef NO_FLOATING_POINT
-static int parsefloat(FILE *, char *, char *, locale_t);
-#endif
-
-__weak_reference(__vfscanf, vfscanf);
-
-/*
- * Conversion functions are passed a pointer to this object instead of
- * a real parameter to indicate that the assignment-suppression (*)
- * flag was specified.  We could use a NULL pointer to indicate this,
- * but that would mask bugs in applications that call scanf() with a
- * NULL pointer.
- */
-static const int suppress;
-#define	SUPPRESS_PTR	((void *)&suppress)
-
-static const mbstate_t initial_mbs;
-
-/*
- * The following conversion functions return the number of characters consumed,
- * or -1 on input failure.  Character class conversion returns 0 on match
- * failure.
- */
-
-static __inline int
-convert_char(FILE *fp, char * p, int width)
-{
-	int n;
-
-	if (p == SUPPRESS_PTR) {
-		size_t sum = 0;
-		for (;;) {
-			if ((n = fp->_r) < width) {
-				sum += n;
-				width -= n;
-				fp->_p += n;
-				if (__srefill(fp)) {
-					if (sum == 0)
-						return (-1);
-					break;
-				}
-			} else {
-				sum += width;
-				fp->_r -= width;
-				fp->_p += width;
-				break;
-			}
-		}
-		return (sum);
-	} else {
-		size_t r = __fread(p, 1, width, fp);
-
-		if (r == 0)
-			return (-1);
-		return (r);
-	}
-}
-
-static __inline int
-convert_wchar(FILE *fp, wchar_t *wcp, int width, locale_t locale)
-{
-	mbstate_t mbs;
-	int n, nread;
-	wint_t wi;
-
-	mbs = initial_mbs;
-	n = 0;
-	while (width-- != 0 &&
-	    (wi = __fgetwc_mbs(fp, &mbs, &nread, locale)) != WEOF) {
-		if (wcp != SUPPRESS_PTR)
-			*wcp++ = (wchar_t)wi;
-		n += nread;
-	}
-	if (n == 0)
-		return (-1);
-	return (n);
-}
-
-static __inline int
-convert_ccl(FILE *fp, char * p, int width, const char *ccltab)
-{
-	char *p0;
-	int n;
-
-	if (p == SUPPRESS_PTR) {
-		n = 0;
-		while (ccltab[*fp->_p]) {
-			n++, fp->_r--, fp->_p++;
-			if (--width == 0)
-				break;
-			if (fp->_r <= 0 && __srefill(fp)) {
-				if (n == 0)
-					return (-1);
-				break;
-			}
-		}
-	} else {
-		p0 = p;
-		while (ccltab[*fp->_p]) {
-			fp->_r--;
-			*p++ = *fp->_p++;
-			if (--width == 0)
-				break;
-			if (fp->_r <= 0 && __srefill(fp)) {
-				if (p == p0)
-					return (-1);
-				break;
-			}
-		}
-		n = p - p0;
-		if (n == 0)
-			return (0);
-		*p = 0;
-	}
-	return (n);
-}
-
-static __inline int
-convert_wccl(FILE *fp, wchar_t *wcp, int width, const char *ccltab,
-    locale_t locale)
-{
-	mbstate_t mbs;
-	wint_t wi;
-	int n, nread;
-
-	mbs = initial_mbs;
-	n = 0;
-	if (wcp == SUPPRESS_PTR) {
-		while ((wi = __fgetwc_mbs(fp, &mbs, &nread, locale)) != WEOF &&
-		    width-- != 0 && ccltab[wctob(wi)])
-			n += nread;
-		if (wi != WEOF)
-			__ungetwc(wi, fp, __get_locale());
-	} else {
-		while ((wi = __fgetwc_mbs(fp, &mbs, &nread, locale)) != WEOF &&
-		    width-- != 0 && ccltab[wctob(wi)]) {
-			*wcp++ = (wchar_t)wi;
-			n += nread;
-		}
-		if (wi != WEOF)
-			__ungetwc(wi, fp, __get_locale());
-		if (n == 0)
-			return (0);
-		*wcp = 0;
-	}
-	return (n);
-}
-
-static __inline int
-convert_string(FILE *fp, char * p, int width)
-{
-	char *p0;
-	int n;
-
-	if (p == SUPPRESS_PTR) {
-		n = 0;
-		while (!isspace(*fp->_p)) {
-			n++, fp->_r--, fp->_p++;
-			if (--width == 0)
-				break;
-			if (fp->_r <= 0 && __srefill(fp))
-				break;
-		}
-	} else {
-		p0 = p;
-		while (!isspace(*fp->_p)) {
-			fp->_r--;
-			*p++ = *fp->_p++;
-			if (--width == 0)
-				break;
-			if (fp->_r <= 0 && __srefill(fp))
-				break;
-		}
-		*p = 0;
-		n = p - p0;
-	}
-	return (n);
-}
-
-static __inline int
-convert_wstring(FILE *fp, wchar_t *wcp, int width, locale_t locale)
-{
-	mbstate_t mbs;
-	wint_t wi;
-	int n, nread;
-
-	mbs = initial_mbs;
-	n = 0;
-	if (wcp == SUPPRESS_PTR) {
-		while ((wi = __fgetwc_mbs(fp, &mbs, &nread, locale)) != WEOF &&
-		    width-- != 0 && !iswspace(wi))
-			n += nread;
-		if (wi != WEOF)
-			__ungetwc(wi, fp, __get_locale());
-	} else {
-		while ((wi = __fgetwc_mbs(fp, &mbs, &nread, locale)) != WEOF &&
-		    width-- != 0 && !iswspace(wi)) {
-			*wcp++ = (wchar_t)wi;
-			n += nread;
-		}
-		if (wi != WEOF)
-			__ungetwc(wi, fp, __get_locale());
-		*wcp = '\0';
-	}
-	return (n);
-}
-
-/*
- * Read an integer, storing it in buf.  The only relevant bit in the
- * flags argument is PFXOK.
- *
- * Return 0 on a match failure, and the number of characters read
- * otherwise.
- */
-static __inline int
-parseint(FILE *fp, char * __restrict buf, int width, int base, int flags)
-{
-	/* `basefix' is used to avoid `if' tests */
-	static const short basefix[17] =
-		{ 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-	char *p;
-	int c;
-
-	flags |= SIGNOK | NDIGITS | NZDIGITS;
-	for (p = buf; width; width--) {
-		c = *fp->_p;
-		/*
-		 * Switch on the character; `goto ok' if we accept it
-		 * as a part of number.
-		 */
-		switch (c) {
-
-		/*
-		 * The digit 0 is always legal, but is special.  For
-		 * %i conversions, if no digits (zero or nonzero) have
-		 * been scanned (only signs), we will have base==0.
-		 * In that case, we should set it to 8 and enable 0x
-		 * prefixing.  Also, if we have not scanned zero
-		 * digits before this, do not turn off prefixing
-		 * (someone else will turn it off if we have scanned
-		 * any nonzero digits).
-		 */
-		case '0':
-			if (base == 0) {
-				base = 8;
-				flags |= PFXOK;
-			}
-			if (flags & NZDIGITS)
-				flags &= ~(SIGNOK|NZDIGITS|NDIGITS);
-			else
-				flags &= ~(SIGNOK|PFXOK|NDIGITS);
-			goto ok;
-
-		/* 1 through 7 always legal */
-		case '1': case '2': case '3':
-		case '4': case '5': case '6': case '7':
-			base = basefix[base];
-			flags &= ~(SIGNOK | PFXOK | NDIGITS);
-			goto ok;
-
-		/* digits 8 and 9 ok iff decimal or hex */
-		case '8': case '9':
-			base = basefix[base];
-			if (base <= 8)
-				break;	/* not legal here */
-			flags &= ~(SIGNOK | PFXOK | NDIGITS);
-			goto ok;
-
-		/* letters ok iff hex */
-		case 'A': case 'B': case 'C':
-		case 'D': case 'E': case 'F':
-		case 'a': case 'b': case 'c':
-		case 'd': case 'e': case 'f':
-			/* no need to fix base here */
-			if (base <= 10)
-				break;	/* not legal here */
-			flags &= ~(SIGNOK | PFXOK | NDIGITS);
-			goto ok;
-
-		/* sign ok only as first character */
-		case '+': case '-':
-			if (flags & SIGNOK) {
-				flags &= ~SIGNOK;
-				flags |= HAVESIGN;
-				goto ok;
-			}
-			break;
-
-		/*
-		 * x ok iff flag still set & 2nd char (or 3rd char if
-		 * we have a sign).
-		 */
-		case 'x': case 'X':
-			if (flags & PFXOK && p ==
-			    buf + 1 + !!(flags & HAVESIGN)) {
-				base = 16;	/* if %i */
-				flags &= ~PFXOK;
-				goto ok;
-			}
-			break;
-		}
-
-		/*
-		 * If we got here, c is not a legal character for a
-		 * number.  Stop accumulating digits.
-		 */
-		break;
-	ok:
-		/*
-		 * c is legal: store it and look at the next.
-		 */
-		*p++ = c;
-		if (--fp->_r > 0)
-			fp->_p++;
-		else if (__srefill(fp))
-			break;		/* EOF */
-	}
-	/*
-	 * If we had only a sign, it is no good; push back the sign.
-	 * If the number ends in `x', it was [sign] '0' 'x', so push
-	 * back the x and treat it as [sign] '0'.
-	 */
-	if (flags & NDIGITS) {
-		if (p > buf)
-			(void) __ungetc(*(u_char *)--p, fp);
-		return (0);
-	}
-	c = ((u_char *)p)[-1];
-	if (c == 'x' || c == 'X') {
-		--p;
-		(void) __ungetc(c, fp);
-	}
-	return (p - buf);
-}
-
-/*
- * __vfscanf - MT-safe version
- */
-int
-__vfscanf(FILE *fp, char const *fmt0, va_list ap)
-{
-	int ret;
-
-	FLOCKFILE(fp);
-	ret = __svfscanf(fp, __get_locale(), fmt0, ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-int
-vfscanf_l(FILE *fp, locale_t locale, char const *fmt0, va_list ap)
-{
-	int ret;
-	FIX_LOCALE(locale);
-
-	FLOCKFILE(fp);
-	ret = __svfscanf(fp, locale, fmt0, ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-
-/*
- * __svfscanf - non-MT-safe version of __vfscanf
- */
-int
-__svfscanf(FILE *fp, locale_t locale, const char *fmt0, va_list ap)
-{
-#define	GETARG(type)	((flags & SUPPRESS) ? SUPPRESS_PTR : va_arg(ap, type))
-	const u_char *fmt = (const u_char *)fmt0;
-	int c;			/* character from format, or conversion */
-	size_t width;		/* field width, or 0 */
-	int flags;		/* flags as defined above */
-	int nassigned;		/* number of fields assigned */
-	int nconversions;	/* number of conversions */
-	int nr;			/* characters read by the current conversion */
-	int nread;		/* number of characters consumed from fp */
-	int base;		/* base argument to conversion function */
-	char ccltab[256];	/* character class table for %[...] */
-	char buf[BUF];		/* buffer for numeric conversions */
-
-	ORIENT(fp, -1);
-
-	nassigned = 0;
-	nconversions = 0;
-	nread = 0;
-	for (;;) {
-		c = *fmt++;
-		if (c == 0)
-			return (nassigned);
-		if (isspace(c)) {
-			while ((fp->_r > 0 || __srefill(fp) == 0) && isspace(*fp->_p))
-				nread++, fp->_r--, fp->_p++;
-			continue;
-		}
-		if (c != '%')
-			goto literal;
-		width = 0;
-		flags = 0;
-		/*
-		 * switch on the format.  continue if done;
-		 * break once format type is derived.
-		 */
-again:		c = *fmt++;
-		switch (c) {
-		case '%':
-literal:
-			if (fp->_r <= 0 && __srefill(fp))
-				goto input_failure;
-			if (*fp->_p != c)
-				goto match_failure;
-			fp->_r--, fp->_p++;
-			nread++;
-			continue;
-
-		case '*':
-			flags |= SUPPRESS;
-			goto again;
-		case 'j':
-			flags |= INTMAXT;
-			goto again;
-		case 'l':
-			if (flags & LONG) {
-				flags &= ~LONG;
-				flags |= LONGLONG;
-			} else
-				flags |= LONG;
-			goto again;
-		case 'q':
-			flags |= LONGLONG;	/* not quite */
-			goto again;
-		case 't':
-			flags |= PTRDIFFT;
-			goto again;
-		case 'z':
-			flags |= SIZET;
-			goto again;
-		case 'L':
-			flags |= LONGDBL;
-			goto again;
-		case 'h':
-			if (flags & SHORT) {
-				flags &= ~SHORT;
-				flags |= SHORTSHORT;
-			} else
-				flags |= SHORT;
-			goto again;
-
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			width = width * 10 + c - '0';
-			goto again;
-
-		/*
-		 * Conversions.
-		 */
-		case 'd':
-			c = CT_INT;
-			base = 10;
-			break;
-
-		case 'i':
-			c = CT_INT;
-			base = 0;
-			break;
-
-		case 'o':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 8;
-			break;
-
-		case 'u':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 10;
-			break;
-
-		case 'X':
-		case 'x':
-			flags |= PFXOK;	/* enable 0x prefixing */
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 16;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case 'A': case 'E': case 'F': case 'G':
-		case 'a': case 'e': case 'f': case 'g':
-			c = CT_FLOAT;
-			break;
-#endif
-
-		case 'S':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 's':
-			c = CT_STRING;
-			break;
-
-		case '[':
-			fmt = __sccl(ccltab, fmt);
-			flags |= NOSKIP;
-			c = CT_CCL;
-			break;
-
-		case 'C':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 'c':
-			flags |= NOSKIP;
-			c = CT_CHAR;
-			break;
-
-		case 'p':	/* pointer format is like hex */
-			flags |= POINTER | PFXOK;
-			c = CT_INT;		/* assumes sizeof(uintmax_t) */
-			flags |= UNSIGNED;	/*      >= sizeof(uintptr_t) */
-			base = 16;
-			break;
-
-		case 'n':
-			if (flags & SUPPRESS)	/* ??? */
-				continue;
-			if (flags & SHORTSHORT)
-				*va_arg(ap, char *) = nread;
-			else if (flags & SHORT)
-				*va_arg(ap, short *) = nread;
-			else if (flags & LONG)
-				*va_arg(ap, long *) = nread;
-			else if (flags & LONGLONG)
-				*va_arg(ap, long long *) = nread;
-			else if (flags & INTMAXT)
-				*va_arg(ap, intmax_t *) = nread;
-			else if (flags & SIZET)
-				*va_arg(ap, size_t *) = nread;
-			else if (flags & PTRDIFFT)
-				*va_arg(ap, ptrdiff_t *) = nread;
-			else
-				*va_arg(ap, int *) = nread;
-			continue;
-
-		default:
-			goto match_failure;
-
-		/*
-		 * Disgusting backwards compatibility hack.	XXX
-		 */
-		case '\0':	/* compat */
-			return (EOF);
-		}
-
-		/*
-		 * We have a conversion that requires input.
-		 */
-		if (fp->_r <= 0 && __srefill(fp))
-			goto input_failure;
-
-		/*
-		 * Consume leading white space, except for formats
-		 * that suppress this.
-		 */
-		if ((flags & NOSKIP) == 0) {
-			while (isspace(*fp->_p)) {
-				nread++;
-				if (--fp->_r > 0)
-					fp->_p++;
-				else if (__srefill(fp))
-					goto input_failure;
-			}
-			/*
-			 * Note that there is at least one character in
-			 * the buffer, so conversions that do not set NOSKIP
-			 * ca no longer result in an input failure.
-			 */
-		}
-
-		/*
-		 * Do the conversion.
-		 */
-		switch (c) {
-
-		case CT_CHAR:
-			/* scan arbitrary characters (sets NOSKIP) */
-			if (width == 0)
-				width = 1;
-			if (flags & LONG) {
-				nr = convert_wchar(fp, GETARG(wchar_t *),
-				    width, locale);
-			} else {
-				nr = convert_char(fp, GETARG(char *), width);
-			}
-			if (nr < 0)
-				goto input_failure;
-			break;
-
-		case CT_CCL:
-			/* scan a (nonempty) character class (sets NOSKIP) */
-			if (width == 0)
-				width = (size_t)~0;	/* `infinity' */
-			if (flags & LONG) {
-				nr = convert_wccl(fp, GETARG(wchar_t *), width,
-				    ccltab, locale);
-			} else {
-				nr = convert_ccl(fp, GETARG(char *), width,
-				    ccltab);
-			}
-			if (nr <= 0) {
-				if (nr < 0)
-					goto input_failure;
-				else /* nr == 0 */
-					goto match_failure;
-			}
-			break;
-
-		case CT_STRING:
-			/* like CCL, but zero-length string OK, & no NOSKIP */
-			if (width == 0)
-				width = (size_t)~0;
-			if (flags & LONG) {
-				nr = convert_wstring(fp, GETARG(wchar_t *),
-				    width, locale);
-			} else {
-				nr = convert_string(fp, GETARG(char *), width);
-			}
-			if (nr < 0)
-				goto input_failure;
-			break;
-
-		case CT_INT:
-			/* scan an integer as if by the conversion function */
-#ifdef hardway
-			if (width == 0 || width > sizeof(buf) - 1)
-				width = sizeof(buf) - 1;
-#else
-			/* size_t is unsigned, hence this optimisation */
-			if (--width > sizeof(buf) - 2)
-				width = sizeof(buf) - 2;
-			width++;
-#endif
-			nr = parseint(fp, buf, width, base, flags);
-			if (nr == 0)
-				goto match_failure;
-			if ((flags & SUPPRESS) == 0) {
-				uintmax_t res;
-
-				buf[nr] = '\0';
-				if ((flags & UNSIGNED) == 0)
-				    res = strtoimax_l(buf, (char **)NULL, base, locale);
-				else
-				    res = strtoumax_l(buf, (char **)NULL, base, locale);
-				if (flags & POINTER)
-					*va_arg(ap, void **) =
-							(void *)(uintptr_t)res;
-				else if (flags & SHORTSHORT)
-					*va_arg(ap, char *) = res;
-				else if (flags & SHORT)
-					*va_arg(ap, short *) = res;
-				else if (flags & LONG)
-					*va_arg(ap, long *) = res;
-				else if (flags & LONGLONG)
-					*va_arg(ap, long long *) = res;
-				else if (flags & INTMAXT)
-					*va_arg(ap, intmax_t *) = res;
-				else if (flags & PTRDIFFT)
-					*va_arg(ap, ptrdiff_t *) = res;
-				else if (flags & SIZET)
-					*va_arg(ap, size_t *) = res;
-				else
-					*va_arg(ap, int *) = res;
-			}
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case CT_FLOAT:
-			/* scan a floating point number as if by strtod */
-			if (width == 0 || width > sizeof(buf) - 1)
-				width = sizeof(buf) - 1;
-			nr = parsefloat(fp, buf, buf + width, locale);
-			if (nr == 0)
-				goto match_failure;
-			if ((flags & SUPPRESS) == 0) {
-				if (flags & LONGDBL) {
-					long double res = strtold_l(buf, NULL,
-					    locale);
-					*va_arg(ap, long double *) = res;
-				} else if (flags & LONG) {
-					double res = strtod_l(buf, NULL,
-					    locale);
-					*va_arg(ap, double *) = res;
-				} else {
-					float res = strtof_l(buf, NULL, locale);
-					*va_arg(ap, float *) = res;
-				}
-			}
-			break;
-#endif /* !NO_FLOATING_POINT */
-		}
-		if (!(flags & SUPPRESS))
-			nassigned++;
-		nread += nr;
-		nconversions++;
-	}
-input_failure:
-	return (nconversions != 0 ? nassigned : EOF);
-match_failure:
-	return (nassigned);
-}
-
-/*
- * Fill in the given table from the scanset at the given format
- * (just after `[').  Return a pointer to the character past the
- * closing `]'.  The table has a 1 wherever characters should be
- * considered part of the scanset.
- */
-static const u_char *
-__sccl(tab, fmt)
-	char *tab;
-	const u_char *fmt;
-{
-	int c, n, v, i;
-	struct xlocale_collate *table =
-		(struct xlocale_collate*)__get_locale()->components[XLC_COLLATE];
-
-	/* first `clear' the whole table */
-	c = *fmt++;		/* first char hat => negated scanset */
-	if (c == '^') {
-		v = 1;		/* default => accept */
-		c = *fmt++;	/* get new first char */
-	} else
-		v = 0;		/* default => reject */
-
-	/* XXX: Will not work if sizeof(tab*) > sizeof(char) */
-	(void) memset(tab, v, 256);
-
-	if (c == 0)
-		return (fmt - 1);/* format ended before closing ] */
-
-	/*
-	 * Now set the entries corresponding to the actual scanset
-	 * to the opposite of the above.
-	 *
-	 * The first character may be ']' (or '-') without being special;
-	 * the last character may be '-'.
-	 */
-	v = 1 - v;
-	for (;;) {
-		tab[c] = v;		/* take character c */
-doswitch:
-		n = *fmt++;		/* and examine the next */
-		switch (n) {
-
-		case 0:			/* format ended too soon */
-			return (fmt - 1);
-
-		case '-':
-			/*
-			 * A scanset of the form
-			 *	[01+-]
-			 * is defined as `the digit 0, the digit 1,
-			 * the character +, the character -', but
-			 * the effect of a scanset such as
-			 *	[a-zA-Z0-9]
-			 * is implementation defined.  The V7 Unix
-			 * scanf treats `a-z' as `the letters a through
-			 * z', but treats `a-a' as `the letter a, the
-			 * character -, and the letter a'.
-			 *
-			 * For compatibility, the `-' is not considerd
-			 * to define a range if the character following
-			 * it is either a close bracket (required by ANSI)
-			 * or is not numerically greater than the character
-			 * we just stored in the table (c).
-			 */
-			n = *fmt;
-			if (n == ']'
-			    || (table->__collate_load_error ? n < c :
-				__collate_range_cmp (table, n, c) < 0
-			       )
-			   ) {
-				c = '-';
-				break;	/* resume the for(;;) */
-			}
-			fmt++;
-			/* fill in the range */
-			if (table->__collate_load_error) {
-				do {
-					tab[++c] = v;
-				} while (c < n);
-			} else {
-				for (i = 0; i < 256; i ++)
-					if (   __collate_range_cmp (table, c, i) < 0
-					    && __collate_range_cmp (table, i, n) <= 0
-					   )
-						tab[i] = v;
-			}
-#if 1	/* XXX another disgusting compatibility hack */
-			c = n;
-			/*
-			 * Alas, the V7 Unix scanf also treats formats
-			 * such as [a-c-e] as `the letters a through e'.
-			 * This too is permitted by the standard....
-			 */
-			goto doswitch;
-#else
-			c = *fmt++;
-			if (c == 0)
-				return (fmt - 1);
-			if (c == ']')
-				return (fmt);
-#endif
-			break;
-
-		case ']':		/* end of scanset */
-			return (fmt);
-
-		default:		/* just another character */
-			c = n;
-			break;
-		}
-	}
-	/* NOTREACHED */
-}
-
-#ifndef NO_FLOATING_POINT
-static int
-parsefloat(FILE *fp, char *buf, char *end, locale_t locale)
-{
-	char *commit, *p;
-	int infnanpos = 0, decptpos = 0;
-	enum {
-		S_START, S_GOTSIGN, S_INF, S_NAN, S_DONE, S_MAYBEHEX,
-		S_DIGITS, S_DECPT, S_FRAC, S_EXP, S_EXPDIGITS
-	} state = S_START;
-	unsigned char c;
-	const char *decpt = localeconv_l(locale)->decimal_point;
-	_Bool gotmantdig = 0, ishex = 0;
-
-	/*
-	 * We set commit = p whenever the string we have read so far
-	 * constitutes a valid representation of a floating point
-	 * number by itself.  At some point, the parse will complete
-	 * or fail, and we will ungetc() back to the last commit point.
-	 * To ensure that the file offset gets updated properly, it is
-	 * always necessary to read at least one character that doesn't
-	 * match; thus, we can't short-circuit "infinity" or "nan(...)".
-	 */
-	commit = buf - 1;
-	for (p = buf; p < end; ) {
-		c = *fp->_p;
-reswitch:
-		switch (state) {
-		case S_START:
-			state = S_GOTSIGN;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_GOTSIGN:
-			switch (c) {
-			case '0':
-				state = S_MAYBEHEX;
-				commit = p;
-				break;
-			case 'I':
-			case 'i':
-				state = S_INF;
-				break;
-			case 'N':
-			case 'n':
-				state = S_NAN;
-				break;
-			default:
-				state = S_DIGITS;
-				goto reswitch;
-			}
-			break;
-		case S_INF:
-			if (infnanpos > 6 ||
-			    (c != "nfinity"[infnanpos] &&
-			     c != "NFINITY"[infnanpos]))
-				goto parsedone;
-			if (infnanpos == 1 || infnanpos == 6)
-				commit = p;	/* inf or infinity */
-			infnanpos++;
-			break;
-		case S_NAN:
-			switch (infnanpos) {
-			case 0:
-				if (c != 'A' && c != 'a')
-					goto parsedone;
-				break;
-			case 1:
-				if (c != 'N' && c != 'n')
-					goto parsedone;
-				else
-					commit = p;
-				break;
-			case 2:
-				if (c != '(')
-					goto parsedone;
-				break;
-			default:
-				if (c == ')') {
-					commit = p;
-					state = S_DONE;
-				} else if (!isalnum(c) && c != '_')
-					goto parsedone;
-				break;
-			}
-			infnanpos++;
-			break;
-		case S_DONE:
-			goto parsedone;
-		case S_MAYBEHEX:
-			state = S_DIGITS;
-			if (c == 'X' || c == 'x') {
-				ishex = 1;
-				break;
-			} else {	/* we saw a '0', but no 'x' */
-				gotmantdig = 1;
-				goto reswitch;
-			}
-		case S_DIGITS:
-			if ((ishex && isxdigit(c)) || isdigit(c)) {
-				gotmantdig = 1;
-				commit = p;
-				break;
-			} else {
-				state = S_DECPT;
-				goto reswitch;
-			}
-		case S_DECPT:
-			if (c == decpt[decptpos]) {
-				if (decpt[++decptpos] == '\0') {
-					/* We read the complete decpt seq. */
-					state = S_FRAC;
-					if (gotmantdig)
-						commit = p;
-				}
-				break;
-			} else if (!decptpos) {
-				/* We didn't read any decpt characters. */
-				state = S_FRAC;
-				goto reswitch;
-			} else {
-				/*
-				 * We read part of a multibyte decimal point,
-				 * but the rest is invalid, so bail.
-				 */
-				goto parsedone;
-			}
-		case S_FRAC:
-			if (((c == 'E' || c == 'e') && !ishex) ||
-			    ((c == 'P' || c == 'p') && ishex)) {
-				if (!gotmantdig)
-					goto parsedone;
-				else
-					state = S_EXP;
-			} else if ((ishex && isxdigit(c)) || isdigit(c)) {
-				commit = p;
-				gotmantdig = 1;
-			} else
-				goto parsedone;
-			break;
-		case S_EXP:
-			state = S_EXPDIGITS;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_EXPDIGITS:
-			if (isdigit(c))
-				commit = p;
-			else
-				goto parsedone;
-			break;
-		default:
-			abort();
-		}
-		*p++ = c;
-		if (--fp->_r > 0)
-			fp->_p++;
-		else if (__srefill(fp))
-			break;	/* EOF */
-	}
-
-parsedone:
-	while (commit < --p)
-		__ungetc(*(u_char *)p, fp);
-	*++commit = '\0';
-	return (commit - buf);
-}
-#endif
diff --git a/lib/libc_bsd/stdio/vfwprintf.c b/lib/libc_bsd/stdio/vfwprintf.c
deleted file mode 100644
index 2255cea..0000000
--- a/lib/libc_bsd/stdio/vfwprintf.c
+++ /dev/null
@@ -1,1103 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vfwprintf.c 269482 2014-08-03 18:28:10Z pfg $");
-
-/*
- * Actual wprintf innards.
- *
- * Avoid making gratuitous changes to this source file; it should be kept
- * as close as possible to vfprintf.c for ease of maintenance.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-#include "fvwrite.h"
-#include "printflocal.h"
-#include "xlocale_private.h"
-
-static int	__sprint(FILE *, struct __suio *, locale_t);
-static int	__sbprintf(FILE *, locale_t, const wchar_t *, va_list) __noinline;
-static wint_t	__xfputwc(wchar_t, FILE *, locale_t);
-static wchar_t	*__mbsconv(char *, int);
-
-#define	CHAR	wchar_t
-#include "printfcommon.h"
-
-struct grouping_state {
-	wchar_t thousands_sep;	/* locale-specific thousands separator */
-	const char *grouping;	/* locale-specific numeric grouping rules */
-	int lead;		/* sig figs before decimal or group sep */
-	int nseps;		/* number of group separators with ' */
-	int nrepeats;		/* number of repeats of the last group */
-};
-
-static const mbstate_t initial_mbs;
-
-static inline wchar_t
-get_decpt(locale_t locale)
-{
-	mbstate_t mbs;
-	wchar_t decpt;
-	int nconv;
-
-	mbs = initial_mbs;
-	nconv = mbrtowc(&decpt, localeconv_l(locale)->decimal_point, MB_CUR_MAX, &mbs);
-	if (nconv == (size_t)-1 || nconv == (size_t)-2)
-		decpt = '.';    /* failsafe */
-	return (decpt);
-}
-
-static inline wchar_t
-get_thousep(locale_t locale)
-{
-	mbstate_t mbs;
-	wchar_t thousep;
-	int nconv;
-
-	mbs = initial_mbs;
-	nconv = mbrtowc(&thousep, localeconv_l(locale)->thousands_sep,
-	    MB_CUR_MAX, &mbs);
-	if (nconv == (size_t)-1 || nconv == (size_t)-2)
-		thousep = '\0';    /* failsafe */
-	return (thousep);
-}
-
-/*
- * Initialize the thousands' grouping state in preparation to print a
- * number with ndigits digits. This routine returns the total number
- * of wide characters that will be printed.
- */
-static int
-grouping_init(struct grouping_state *gs, int ndigits, locale_t locale)
-{
-
-	gs->grouping = localeconv_l(locale)->grouping;
-	gs->thousands_sep = get_thousep(locale);
-
-	gs->nseps = gs->nrepeats = 0;
-	gs->lead = ndigits;
-	while (*gs->grouping != CHAR_MAX) {
-		if (gs->lead <= *gs->grouping)
-			break;
-		gs->lead -= *gs->grouping;
-		if (*(gs->grouping+1)) {
-			gs->nseps++;
-			gs->grouping++;
-		} else
-			gs->nrepeats++;
-	}
-	return (gs->nseps + gs->nrepeats);
-}
-
-/*
- * Print a number with thousands' separators.
- */
-static int
-grouping_print(struct grouping_state *gs, struct io_state *iop,
-	       const CHAR *cp, const CHAR *ep, locale_t locale)
-{
-	const CHAR *cp0 = cp;
-
-	if (io_printandpad(iop, cp, ep, gs->lead, zeroes, locale))
-		return (-1);
-	cp += gs->lead;
-	while (gs->nseps > 0 || gs->nrepeats > 0) {
-		if (gs->nrepeats > 0)
-			gs->nrepeats--;
-		else {
-			gs->grouping--;
-			gs->nseps--;
-		}
-		if (io_print(iop, &gs->thousands_sep, 1, locale))
-			return (-1);
-		if (io_printandpad(iop, cp, ep, *gs->grouping, zeroes, locale))
-			return (-1);
-		cp += *gs->grouping;
-	}
-	if (cp > ep)
-		cp = ep;
-	return (cp - cp0);
-}
-
-
-/*
- * Flush out all the vectors defined by the given uio,
- * then reset it so that it can be reused.
- *
- * XXX The fact that we do this a character at a time and convert to a
- * multibyte character sequence even if the destination is a wide
- * string eclipses the benefits of buffering.
- */
-static int
-__sprint(FILE *fp, struct __suio *uio, locale_t locale)
-{
-	struct __siov *iov;
-	wchar_t *p;
-	int i, len;
-
-	iov = uio->uio_iov;
-	for (; uio->uio_resid != 0; uio->uio_resid -= len, iov++) {
-		p = (wchar_t *)iov->iov_base;
-		len = iov->iov_len;
-		for (i = 0; i < len; i++) {
-			if (__xfputwc(p[i], fp, locale) == WEOF)
-				return (-1);
-		}
-	}
-	uio->uio_iovcnt = 0;
-	return (0);
-}
-
-/*
- * Helper function for `fprintf to unbuffered unix file': creates a
- * temporary buffer.  We only work on write-only files; this avoids
- * worries about ungetc buffers and so forth.
- */
-static int
-__sbprintf(FILE *fp, locale_t locale, const wchar_t *fmt, va_list ap)
-{
-	int ret;
-	FILE fake;
-	unsigned char buf[BUFSIZ];
-
-	/* XXX This is probably not needed. */
-	if (prepwrite(fp) != 0)
-		return (EOF);
-
-	/* copy the important variables */
-	fake._flags = fp->_flags & ~__SNBF;
-	fake._file = fp->_file;
-	fake._cookie = fp->_cookie;
-	fake._write = fp->_write;
-	fake._orientation = fp->_orientation;
-	fake._mbstate = fp->_mbstate;
-
-	/* set up the buffer */
-	fake._bf._base = fake._p = buf;
-	fake._bf._size = fake._w = sizeof(buf);
-	fake._lbfsize = 0;	/* not actually used, but Just In Case */
-
-	/* do the work, then copy any error status */
-	ret = __vfwprintf(&fake, locale, fmt, ap);
-	if (ret >= 0 && __fflush(&fake))
-		ret = WEOF;
-	if (fake._flags & __SERR)
-		fp->_flags |= __SERR;
-	return (ret);
-}
-
-/*
- * Like __fputwc, but handles fake string (__SSTR) files properly.
- * File must already be locked.
- */
-static wint_t
-__xfputwc(wchar_t wc, FILE *fp, locale_t locale)
-{
-	mbstate_t mbs;
-	char buf[MB_LEN_MAX];
-	struct __suio uio;
-	struct __siov iov;
-	size_t len;
-
-	if ((fp->_flags & __SSTR) == 0)
-		return (__fputwc(wc, fp, locale));
-
-	mbs = initial_mbs;
-	if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) {
-		fp->_flags |= __SERR;
-		return (WEOF);
-	}
-	uio.uio_iov = &iov;
-	uio.uio_resid = len;
-	uio.uio_iovcnt = 1;
-	iov.iov_base = buf;
-	iov.iov_len = len;
-	return (__sfvwrite(fp, &uio) != EOF ? (wint_t)wc : WEOF);
-}
-
-/*
- * Convert a multibyte character string argument for the %s format to a wide
- * string representation. ``prec'' specifies the maximum number of bytes
- * to output. If ``prec'' is greater than or equal to zero, we can't assume
- * that the multibyte char. string ends in a null character.
- */
-static wchar_t *
-__mbsconv(char *mbsarg, int prec)
-{
-	mbstate_t mbs;
-	wchar_t *convbuf, *wcp;
-	const char *p;
-	size_t insize, nchars, nconv;
-
-	if (mbsarg == NULL)
-		return (NULL);
-
-	/*
-	 * Supplied argument is a multibyte string; convert it to wide
-	 * characters first.
-	 */
-	if (prec >= 0) {
-		/*
-		 * String is not guaranteed to be NUL-terminated. Find the
-		 * number of characters to print.
-		 */
-		p = mbsarg;
-		insize = nchars = nconv = 0;
-		mbs = initial_mbs;
-		while (nchars != (size_t)prec) {
-			nconv = mbrlen(p, MB_CUR_MAX, &mbs);
-			if (nconv == 0 || nconv == (size_t)-1 ||
-			    nconv == (size_t)-2)
-				break;
-			p += nconv;
-			nchars++;
-			insize += nconv;
-		}
-		if (nconv == (size_t)-1 || nconv == (size_t)-2)
-			return (NULL);
-	} else {
-		insize = strlen(mbsarg);
-		nconv = 0;
-	}
-
-	/*
-	 * Allocate buffer for the result and perform the conversion,
-	 * converting at most `size' bytes of the input multibyte string to
-	 * wide characters for printing.
-	 */
-	convbuf = malloc((insize + 1) * sizeof(*convbuf));
-	if (convbuf == NULL)
-		return (NULL);
-	wcp = convbuf;
-	p = mbsarg;
-	mbs = initial_mbs;
-	while (insize != 0) {
-		nconv = mbrtowc(wcp, p, insize, &mbs);
-		if (nconv == 0 || nconv == (size_t)-1 || nconv == (size_t)-2)
-			break;
-		wcp++;
-		p += nconv;
-		insize -= nconv;
-	}
-	if (nconv == (size_t)-1 || nconv == (size_t)-2) {
-		free(convbuf);
-		return (NULL);
-	}
-	*wcp = L'\0';
-
-	return (convbuf);
-}
-
-/*
- * MT-safe version
- */
-int
-vfwprintf_l(FILE * __restrict fp, locale_t locale,
-		const wchar_t * __restrict fmt0, va_list ap)
-
-{
-	int ret;
-	FIX_LOCALE(locale);
-	FLOCKFILE(fp);
-	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
-	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-	    fp->_file >= 0)
-		ret = __sbprintf(fp, locale, fmt0, ap);
-	else
-		ret = __vfwprintf(fp, locale, fmt0, ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-int
-vfwprintf(FILE * __restrict fp, const wchar_t * __restrict fmt0, va_list ap)
-{
-	return vfwprintf_l(fp, __get_locale(), fmt0, ap);
-}
-
-/*
- * The size of the buffer we use as scratch space for integer
- * conversions, among other things.  We need enough space to
- * write a uintmax_t in octal (plus one byte).
- */
-#if UINTMAX_MAX <= UINT64_MAX
-#define	BUF	32
-#else
-#error "BUF must be large enough to format a uintmax_t"
-#endif
-
-/*
- * Non-MT-safe version
- */
-int
-__vfwprintf(FILE *fp, locale_t locale, const wchar_t *fmt0, va_list ap)
-{
-	wchar_t *fmt;		/* format string */
-	wchar_t ch;		/* character from fmt */
-	int n, n2;		/* handy integer (short term usage) */
-	wchar_t *cp;		/* handy char pointer (short term usage) */
-	int flags;		/* flags as above */
-	int ret;		/* return value accumulator */
-	int width;		/* width from format (%8d), or 0 */
-	int prec;		/* precision from format; <0 for N/A */
-	wchar_t sign;		/* sign prefix (' ', '+', '-', or \0) */
-	struct grouping_state gs; /* thousands' grouping info */
-#ifndef NO_FLOATING_POINT
-	/*
-	 * We can decompose the printed representation of floating
-	 * point numbers into several parts, some of which may be empty:
-	 *
-	 * [+|-| ] [0x|0X] MMM . NNN [e|E|p|P] [+|-] ZZ
-	 *    A       B     ---C---      D       E   F
-	 *
-	 * A:	'sign' holds this value if present; '\0' otherwise
-	 * B:	ox[1] holds the 'x' or 'X'; '\0' if not hexadecimal
-	 * C:	cp points to the string MMMNNN.  Leading and trailing
-	 *	zeros are not in the string and must be added.
-	 * D:	expchar holds this character; '\0' if no exponent, e.g. %f
-	 * F:	at least two digits for decimal, at least one digit for hex
-	 */
-	wchar_t decimal_point;	/* locale specific decimal point */
-	int signflag;		/* true if float is negative */
-	union {			/* floating point arguments %[aAeEfFgG] */
-		double dbl;
-		long double ldbl;
-	} fparg;
-	int expt;		/* integer value of exponent */
-	char expchar;		/* exponent character: [eEpP\0] */
-	char *dtoaend;		/* pointer to end of converted digits */
-	int expsize;		/* character count for expstr */
-	int ndig;		/* actual number of digits returned by dtoa */
-	wchar_t expstr[MAXEXPDIG+2];	/* buffer for exponent string: e+ZZZ */
-	char *dtoaresult;	/* buffer allocated by dtoa */
-#endif
-	u_long	ulval;		/* integer arguments %[diouxX] */
-	uintmax_t ujval;	/* %j, %ll, %q, %t, %z integers */
-	int base;		/* base for [diouxX] conversion */
-	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
-	int realsz;		/* field size expanded by dprec, sign, etc */
-	int size;		/* size of converted field or string */
-	int prsize;             /* max size of printed field */
-	const char *xdigs;	/* digits for [xX] conversion */
-	struct io_state io;	/* I/O buffering state */
-	wchar_t buf[BUF];	/* buffer with space for digits of uintmax_t */
-	wchar_t ox[2];		/* space for 0x hex-prefix */
-	union arg *argtable;	/* args, built due to positional arg */
-	union arg statargtable [STATIC_ARG_TBL_SIZE];
-	int nextarg;		/* 1-based argument index */
-	va_list orgap;		/* original argument pointer */
-	wchar_t *convbuf;	/* multibyte to wide conversion result */
-
-	static const char xdigs_lower[16] = "0123456789abcdef";
-	static const char xdigs_upper[16] = "0123456789ABCDEF";
-
-	/* BEWARE, these `goto error' on error. */
-#define	PRINT(ptr, len)	do {			\
-	if (io_print(&io, (ptr), (len), locale))	\
-		goto error; \
-} while (0)
-#define	PAD(howmany, with) { \
-	if (io_pad(&io, (howmany), (with), locale)) \
-		goto error; \
-}
-#define	PRINTANDPAD(p, ep, len, with) {	\
-	if (io_printandpad(&io, (p), (ep), (len), (with), locale)) \
-		goto error; \
-}
-#define	FLUSH() { \
-	if (io_flush(&io, locale)) \
-		goto error; \
-}
-
-	/*
-	 * Get the argument indexed by nextarg.   If the argument table is
-	 * built, use it to get the argument.  If its not, get the next
-	 * argument (and arguments must be gotten sequentially).
-	 */
-#define GETARG(type) \
-	((argtable != NULL) ? *((type*)(&argtable[nextarg++])) : \
-	    (nextarg++, va_arg(ap, type)))
-
-	/*
-	 * To extend shorts properly, we need both signed and unsigned
-	 * argument extraction methods.
-	 */
-#define	SARG() \
-	(flags&LONGINT ? GETARG(long) : \
-	    flags&SHORTINT ? (long)(short)GETARG(int) : \
-	    flags&CHARINT ? (long)(signed char)GETARG(int) : \
-	    (long)GETARG(int))
-#define	UARG() \
-	(flags&LONGINT ? GETARG(u_long) : \
-	    flags&SHORTINT ? (u_long)(u_short)GETARG(int) : \
-	    flags&CHARINT ? (u_long)(u_char)GETARG(int) : \
-	    (u_long)GETARG(u_int))
-#define	INTMAX_SIZE	(INTMAXT|SIZET|PTRDIFFT|LLONGINT)
-#define SJARG() \
-	(flags&INTMAXT ? GETARG(intmax_t) : \
-	    flags&SIZET ? (intmax_t)GETARG(ssize_t) : \
-	    flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
-	    (intmax_t)GETARG(long long))
-#define	UJARG() \
-	(flags&INTMAXT ? GETARG(uintmax_t) : \
-	    flags&SIZET ? (uintmax_t)GETARG(size_t) : \
-	    flags&PTRDIFFT ? (uintmax_t)GETARG(ptrdiff_t) : \
-	    (uintmax_t)GETARG(unsigned long long))
-
-	/*
-	 * Get * arguments, including the form *nn$.  Preserve the nextarg
-	 * that the argument can be gotten once the type is determined.
-	 */
-#define GETASTER(val) \
-	n2 = 0; \
-	cp = fmt; \
-	while (is_digit(*cp)) { \
-		n2 = 10 * n2 + to_digit(*cp); \
-		cp++; \
-	} \
-	if (*cp == '$') { \
-		int hold = nextarg; \
-		if (argtable == NULL) { \
-			argtable = statargtable; \
-			if (__find_warguments (fmt0, orgap, &argtable)) { \
-				ret = EOF; \
-				goto error; \
-			} \
-		} \
-		nextarg = n2; \
-		val = GETARG (int); \
-		nextarg = hold; \
-		fmt = ++cp; \
-	} else { \
-		val = GETARG (int); \
-	}
-
-
-	/* sorry, fwprintf(read_only_file, L"") returns WEOF, not 0 */
-	if (prepwrite(fp) != 0) {
-		errno = EBADF;
-		return (EOF);
-	}
-
-	convbuf = NULL;
-	fmt = (wchar_t *)fmt0;
-	argtable = NULL;
-	nextarg = 1;
-	va_copy(orgap, ap);
-	io_init(&io, fp);
-	ret = 0;
-#ifndef NO_FLOATING_POINT
-	decimal_point = get_decpt(locale);
-#endif
-
-	/*
-	 * Scan the format for conversions (`%' character).
-	 */
-	for (;;) {
-		for (cp = fmt; (ch = *fmt) != '\0' && ch != '%'; fmt++)
-			/* void */;
-		if ((n = fmt - cp) != 0) {
-			if ((unsigned)ret + n > INT_MAX) {
-				ret = EOF;
-				errno = EOVERFLOW;
-				goto error;
-			}
-			PRINT(cp, n);
-			ret += n;
-		}
-		if (ch == '\0')
-			goto done;
-		fmt++;		/* skip over '%' */
-
-		flags = 0;
-		dprec = 0;
-		width = 0;
-		prec = -1;
-		gs.grouping = NULL;
-		sign = '\0';
-		ox[1] = '\0';
-
-rflag:		ch = *fmt++;
-reswitch:	switch (ch) {
-		case ' ':
-			/*-
-			 * ``If the space and + flags both appear, the space
-			 * flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-			if (!sign)
-				sign = ' ';
-			goto rflag;
-		case '#':
-			flags |= ALT;
-			goto rflag;
-		case '*':
-			/*-
-			 * ``A negative field width argument is taken as a
-			 * - flag followed by a positive field width.''
-			 *	-- ANSI X3J11
-			 * They don't exclude field widths read from args.
-			 */
-			GETASTER (width);
-			if (width >= 0)
-				goto rflag;
-			width = -width;
-			/* FALLTHROUGH */
-		case '-':
-			flags |= LADJUST;
-			goto rflag;
-		case '+':
-			sign = '+';
-			goto rflag;
-		case '\'':
-			flags |= GROUPING;
-			goto rflag;
-		case '.':
-			if ((ch = *fmt++) == '*') {
-				GETASTER (prec);
-				goto rflag;
-			}
-			prec = 0;
-			while (is_digit(ch)) {
-				prec = 10 * prec + to_digit(ch);
-				ch = *fmt++;
-			}
-			goto reswitch;
-		case '0':
-			/*-
-			 * ``Note that 0 is taken as a flag, not as the
-			 * beginning of a field width.''
-			 *	-- ANSI X3J11
-			 */
-			flags |= ZEROPAD;
-			goto rflag;
-		case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			n = 0;
-			do {
-				n = 10 * n + to_digit(ch);
-				ch = *fmt++;
-			} while (is_digit(ch));
-			if (ch == '$') {
-				nextarg = n;
-				if (argtable == NULL) {
-					argtable = statargtable;
-					if (__find_warguments (fmt0, orgap,
-							       &argtable)) {
-						ret = EOF;
-						goto error;
-					}
-				}
-				goto rflag;
-			}
-			width = n;
-			goto reswitch;
-#ifndef NO_FLOATING_POINT
-		case 'L':
-			flags |= LONGDBL;
-			goto rflag;
-#endif
-		case 'h':
-			if (flags & SHORTINT) {
-				flags &= ~SHORTINT;
-				flags |= CHARINT;
-			} else
-				flags |= SHORTINT;
-			goto rflag;
-		case 'j':
-			flags |= INTMAXT;
-			goto rflag;
-		case 'l':
-			if (flags & LONGINT) {
-				flags &= ~LONGINT;
-				flags |= LLONGINT;
-			} else
-				flags |= LONGINT;
-			goto rflag;
-		case 'q':
-			flags |= LLONGINT;	/* not necessarily */
-			goto rflag;
-		case 't':
-			flags |= PTRDIFFT;
-			goto rflag;
-		case 'z':
-			flags |= SIZET;
-			goto rflag;
-		case 'C':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'c':
-			if (flags & LONGINT)
-				*(cp = buf) = (wchar_t)GETARG(wint_t);
-			else
-				*(cp = buf) = (wchar_t)btowc(GETARG(int));
-			size = 1;
-			sign = '\0';
-			break;
-		case 'D':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'd':
-		case 'i':
-			if (flags & INTMAX_SIZE) {
-				ujval = SJARG();
-				if ((intmax_t)ujval < 0) {
-					ujval = -ujval;
-					sign = '-';
-				}
-			} else {
-				ulval = SARG();
-				if ((long)ulval < 0) {
-					ulval = -ulval;
-					sign = '-';
-				}
-			}
-			base = 10;
-			goto number;
-#ifndef NO_FLOATING_POINT
-		case 'a':
-		case 'A':
-			if (ch == 'a') {
-				ox[1] = 'x';
-				xdigs = xdigs_lower;
-				expchar = 'p';
-			} else {
-				ox[1] = 'X';
-				xdigs = xdigs_upper;
-				expchar = 'P';
-			}
-			if (prec >= 0)
-				prec++;
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult =
-				    __hldtoa(fparg.ldbl, xdigs, prec,
-				        &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult =
-				    __hdtoa(fparg.dbl, xdigs, prec,
-				        &expt, &signflag, &dtoaend);
-			}
-			if (prec < 0)
-				prec = dtoaend - dtoaresult;
-			if (expt == INT_MAX)
-				ox[1] = '\0';
-			if (convbuf != NULL)
-				free(convbuf);
-			ndig = dtoaend - dtoaresult;
-			cp = convbuf = __mbsconv(dtoaresult, -1);
-			freedtoa(dtoaresult);
-			goto fp_common;
-		case 'e':
-		case 'E':
-			expchar = ch;
-			if (prec < 0)	/* account for digit before decpt */
-				prec = DEFPREC + 1;
-			else
-				prec++;
-			goto fp_begin;
-		case 'f':
-		case 'F':
-			expchar = '\0';
-			goto fp_begin;
-		case 'g':
-		case 'G':
-			expchar = ch - ('g' - 'e');
-			if (prec == 0)
-				prec = 1;
-fp_begin:
-			if (prec < 0)
-				prec = DEFPREC;
-			if (convbuf != NULL)
-				free(convbuf);
-			if (flags & LONGDBL) {
-				fparg.ldbl = GETARG(long double);
-				dtoaresult =
-				    __ldtoa(&fparg.ldbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-			} else {
-				fparg.dbl = GETARG(double);
-				dtoaresult =
-				    dtoa(fparg.dbl, expchar ? 2 : 3, prec,
-				    &expt, &signflag, &dtoaend);
-				if (expt == 9999)
-					expt = INT_MAX;
-			}
-			ndig = dtoaend - dtoaresult;
-			cp = convbuf = __mbsconv(dtoaresult, -1);
-			freedtoa(dtoaresult);
-fp_common:
-			if (signflag)
-				sign = '-';
-			if (expt == INT_MAX) {	/* inf or nan */
-				if (*cp == 'N') {
-					cp = (ch >= 'a') ? L"nan" : L"NAN";
-					sign = '\0';
-				} else
-					cp = (ch >= 'a') ? L"inf" : L"INF";
-				size = 3;
-				flags &= ~ZEROPAD;
-				break;
-			}
-			flags |= FPT;
-			if (ch == 'g' || ch == 'G') {
-				if (expt > -4 && expt <= prec) {
-					/* Make %[gG] smell like %[fF] */
-					expchar = '\0';
-					if (flags & ALT)
-						prec -= expt;
-					else
-						prec = ndig - expt;
-					if (prec < 0)
-						prec = 0;
-				} else {
-					/*
-					 * Make %[gG] smell like %[eE], but
-					 * trim trailing zeroes if no # flag.
-					 */
-					if (!(flags & ALT))
-						prec = ndig;
-				}
-			}
-			if (expchar) {
-				expsize = exponent(expstr, expt - 1, expchar);
-				size = expsize + prec;
-				if (prec > 1 || flags & ALT)
-					++size;
-			} else {
-				/* space for digits before decimal point */
-				if (expt > 0)
-					size = expt;
-				else	/* "0" */
-					size = 1;
-				/* space for decimal pt and following digits */
-				if (prec || flags & ALT)
-					size += prec + 1;
-				if ((flags & GROUPING) && expt > 0)
-					size += grouping_init(&gs, expt, locale);
-			}
-			break;
-#endif /* !NO_FLOATING_POINT */
-		case 'n':
-			/*
-			 * Assignment-like behavior is specified if the
-			 * value overflows or is otherwise unrepresentable.
-			 * C99 says to use `signed char' for %hhn conversions.
-			 */
-			if (flags & LLONGINT)
-				*GETARG(long long *) = ret;
-			else if (flags & SIZET)
-				*GETARG(ssize_t *) = (ssize_t)ret;
-			else if (flags & PTRDIFFT)
-				*GETARG(ptrdiff_t *) = ret;
-			else if (flags & INTMAXT)
-				*GETARG(intmax_t *) = ret;
-			else if (flags & LONGINT)
-				*GETARG(long *) = ret;
-			else if (flags & SHORTINT)
-				*GETARG(short *) = ret;
-			else if (flags & CHARINT)
-				*GETARG(signed char *) = ret;
-			else
-				*GETARG(int *) = ret;
-			continue;	/* no output */
-		case 'O':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'o':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 8;
-			goto nosign;
-		case 'p':
-			/*-
-			 * ``The argument shall be a pointer to void.  The
-			 * value of the pointer is converted to a sequence
-			 * of printable characters, in an implementation-
-			 * defined manner.''
-			 *	-- ANSI X3J11
-			 */
-			ujval = (uintmax_t)(uintptr_t)GETARG(void *);
-			base = 16;
-			xdigs = xdigs_lower;
-			flags = flags | INTMAXT;
-			ox[1] = 'x';
-			goto nosign;
-		case 'S':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 's':
-			if (flags & LONGINT) {
-				if ((cp = GETARG(wchar_t *)) == NULL)
-					cp = L"(null)";
-			} else {
-				char *mbp;
-
-				if (convbuf != NULL)
-					free(convbuf);
-				if ((mbp = GETARG(char *)) == NULL)
-					cp = L"(null)";
-				else {
-					convbuf = __mbsconv(mbp, prec);
-					if (convbuf == NULL) {
-						fp->_flags |= __SERR;
-						goto error;
-					}
-					cp = convbuf;
-				}
-			}
-			size = (prec >= 0) ? wcsnlen(cp, prec) : wcslen(cp);
-			sign = '\0';
-			break;
-		case 'U':
-			flags |= LONGINT;
-			/*FALLTHROUGH*/
-		case 'u':
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 10;
-			goto nosign;
-		case 'X':
-			xdigs = xdigs_upper;
-			goto hex;
-		case 'x':
-			xdigs = xdigs_lower;
-hex:
-			if (flags & INTMAX_SIZE)
-				ujval = UJARG();
-			else
-				ulval = UARG();
-			base = 16;
-			/* leading 0x/X only if non-zero */
-			if (flags & ALT &&
-			    (flags & INTMAX_SIZE ? ujval != 0 : ulval != 0))
-				ox[1] = ch;
-
-			flags &= ~GROUPING;
-			/* unsigned conversions */
-nosign:			sign = '\0';
-			/*-
-			 * ``... diouXx conversions ... if a precision is
-			 * specified, the 0 flag will be ignored.''
-			 *	-- ANSI X3J11
-			 */
-number:			if ((dprec = prec) >= 0)
-				flags &= ~ZEROPAD;
-
-			/*-
-			 * ``The result of converting a zero value with an
-			 * explicit precision of zero is no characters.''
-			 *	-- ANSI X3J11
-			 *
-			 * ``The C Standard is clear enough as is.  The call
-			 * printf("%#.0o", 0) should print 0.''
-			 *	-- Defect Report #151
-			 */
-			cp = buf + BUF;
-			if (flags & INTMAX_SIZE) {
-				if (ujval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					cp = __ujtoa(ujval, cp, base,
-					    flags & ALT, xdigs);
-			} else {
-				if (ulval != 0 || prec != 0 ||
-				    (flags & ALT && base == 8))
-					cp = __ultoa(ulval, cp, base,
-					    flags & ALT, xdigs);
-			}
-			size = buf + BUF - cp;
-			if (size > BUF)	/* should never happen */
-				abort();
-			if ((flags & GROUPING) && size != 0)
-				size += grouping_init(&gs, size, locale);
-			break;
-		default:	/* "%?" prints ?, unless ? is NUL */
-			if (ch == '\0')
-				goto done;
-			/* pretend it was %c with argument ch */
-			cp = buf;
-			*cp = ch;
-			size = 1;
-			sign = '\0';
-			break;
-		}
-
-		/*
-		 * All reasonable formats wind up here.  At this point, `cp'
-		 * points to a string which (if not flags&LADJUST) should be
-		 * padded out to `width' places.  If flags&ZEROPAD, it should
-		 * first be prefixed by any sign or other prefix; otherwise,
-		 * it should be blank padded before the prefix is emitted.
-		 * After any left-hand padding and prefixing, emit zeroes
-		 * required by a decimal [diouxX] precision, then print the
-		 * string proper, then emit zeroes required by any leftover
-		 * floating precision; finally, if LADJUST, pad with blanks.
-		 *
-		 * Compute actual size, so we know how much to pad.
-		 * size excludes decimal prec; realsz includes it.
-		 */
-		realsz = dprec > size ? dprec : size;
-		if (sign)
-			realsz++;
-		if (ox[1])
-			realsz += 2;
-
-		prsize = width > realsz ? width : realsz;
-		if ((unsigned)ret + prsize > INT_MAX) {
-			ret = EOF;
-			errno = EOVERFLOW;
-			goto error;
-		}
-
-		/* right-adjusting blank padding */
-		if ((flags & (LADJUST|ZEROPAD)) == 0)
-			PAD(width - realsz, blanks);
-
-		/* prefix */
-		if (sign)
-			PRINT(&sign, 1);
-
-		if (ox[1]) {	/* ox[1] is either x, X, or \0 */
-			ox[0] = '0';
-			PRINT(ox, 2);
-		}
-
-		/* right-adjusting zero padding */
-		if ((flags & (LADJUST|ZEROPAD)) == ZEROPAD)
-			PAD(width - realsz, zeroes);
-
-		/* the string or number proper */
-#ifndef NO_FLOATING_POINT
-		if ((flags & FPT) == 0) {
-#endif
-			/* leading zeroes from decimal precision */
-			PAD(dprec - size, zeroes);
-			if (gs.grouping) {
-				if (grouping_print(&gs, &io, cp, buf+BUF, locale) < 0)
-					goto error;
-			} else {
-				PRINT(cp, size);
-			}
-#ifndef NO_FLOATING_POINT
-		} else {	/* glue together f_p fragments */
-			if (!expchar) {	/* %[fF] or sufficiently short %[gG] */
-				if (expt <= 0) {
-					PRINT(zeroes, 1);
-					if (prec || flags & ALT)
-						PRINT(&decimal_point, 1);
-					PAD(-expt, zeroes);
-					/* already handled initial 0's */
-					prec += expt;
-				} else {
-					if (gs.grouping) {
-						n = grouping_print(&gs, &io,
-						    cp, convbuf + ndig, locale);
-						if (n < 0)
-							goto error;
-						cp += n;
-					} else {
-						PRINTANDPAD(cp, convbuf + ndig,
-						    expt, zeroes);
-						cp += expt;
-					}
-					if (prec || flags & ALT)
-						PRINT(&decimal_point, 1);
-				}
-				PRINTANDPAD(cp, convbuf + ndig, prec, zeroes);
-			} else {	/* %[eE] or sufficiently long %[gG] */
-				if (prec > 1 || flags & ALT) {
-					buf[0] = *cp++;
-					buf[1] = decimal_point;
-					PRINT(buf, 2);
-					PRINT(cp, ndig-1);
-					PAD(prec - ndig, zeroes);
-				} else	/* XeYYY */
-					PRINT(cp, 1);
-				PRINT(expstr, expsize);
-			}
-		}
-#endif
-		/* left-adjusting padding (always blank) */
-		if (flags & LADJUST)
-			PAD(width - realsz, blanks);
-
-		/* finally, adjust ret */
-		ret += prsize;
-
-		FLUSH();	/* copy out the I/O vectors */
-	}
-done:
-	FLUSH();
-error:
-	va_end(orgap);
-	if (convbuf != NULL)
-		free(convbuf);
-	if (__sferror(fp))
-		ret = EOF;
-	if ((argtable != NULL) && (argtable != statargtable))
-		free (argtable);
-	return (ret);
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/stdio/vfwscanf.c b/lib/libc_bsd/stdio/vfwscanf.c
deleted file mode 100644
index 658541f..0000000
--- a/lib/libc_bsd/stdio/vfwscanf.c
+++ /dev/null
@@ -1,948 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vfscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vfwscanf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include "namespace.h"
-#include <ctype.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <wchar.h>
-#include <wctype.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-#include "local.h"
-#include "xlocale_private.h"
-
-#define	BUF		513	/* Maximum length of numeric string. */
-
-/*
- * Flags used during conversion.
- */
-#define	LONG		0x01	/* l: long or double */
-#define	LONGDBL		0x02	/* L: long double */
-#define	SHORT		0x04	/* h: short */
-#define	SUPPRESS	0x08	/* *: suppress assignment */
-#define	POINTER		0x10	/* p: void * (as hex) */
-#define	NOSKIP		0x20	/* [ or c: do not skip blanks */
-#define	LONGLONG	0x400	/* ll: long long (+ deprecated q: quad) */
-#define	INTMAXT		0x800	/* j: intmax_t */
-#define	PTRDIFFT	0x1000	/* t: ptrdiff_t */
-#define	SIZET		0x2000	/* z: size_t */
-#define	SHORTSHORT	0x4000	/* hh: char */
-#define	UNSIGNED	0x8000	/* %[oupxX] conversions */
-
-/*
- * The following are used in integral conversions only:
- * SIGNOK, NDIGITS, PFXOK, and NZDIGITS
- */
-#define	SIGNOK		0x40	/* +/- is (still) legal */
-#define	NDIGITS		0x80	/* no digits detected */
-#define	PFXOK		0x100	/* 0x prefix is (still) legal */
-#define	NZDIGITS	0x200	/* no zero digits detected */
-#define	HAVESIGN	0x10000	/* sign detected */
-
-/*
- * Conversion types.
- */
-#define	CT_CHAR		0	/* %c conversion */
-#define	CT_CCL		1	/* %[...] conversion */
-#define	CT_STRING	2	/* %s conversion */
-#define	CT_INT		3	/* %[dioupxX] conversion */
-#define	CT_FLOAT	4	/* %[efgEFG] conversion */
-
-#ifndef NO_FLOATING_POINT
-static int parsefloat(FILE *, wchar_t *, wchar_t *, locale_t);
-#endif
-
-struct ccl {
-	const wchar_t *start;	/* character class start */
-	const wchar_t *end;	/* character class end */
-	int compl;		/* ccl is complemented? */
-};
-
-static __inline int
-inccl(const struct ccl *ccl, wint_t wi)
-{
-
-	if (ccl->compl) {
-		return (wmemchr(ccl->start, wi, ccl->end - ccl->start)
-		    == NULL);
-	} else {
-		return (wmemchr(ccl->start, wi, ccl->end - ccl->start) != NULL);
-	}
-}
-
-/*
- * Conversion functions are passed a pointer to this object instead of
- * a real parameter to indicate that the assignment-suppression (*)
- * flag was specified.  We could use a NULL pointer to indicate this,
- * but that would mask bugs in applications that call scanf() with a
- * NULL pointer.
- */
-static const int suppress;
-#define	SUPPRESS_PTR	((void *)&suppress)
-
-static const mbstate_t initial_mbs;
-
-/*
- * The following conversion functions return the number of characters consumed,
- * or -1 on input failure.  Character class conversion returns 0 on match
- * failure.
- */
-
-static __inline int
-convert_char(FILE *fp, char * mbp, int width, locale_t locale)
-{
-	mbstate_t mbs;
-	size_t nconv;
-	wint_t wi;
-	int n;
-
-	n = 0;
-	mbs = initial_mbs;
-	while (width-- != 0 && (wi = __fgetwc(fp, locale)) != WEOF) {
-		if (mbp != SUPPRESS_PTR) {
-			nconv = wcrtomb(mbp, wi, &mbs);
-			if (nconv == (size_t)-1)
-				return (-1);
-			mbp += nconv;
-		}
-		n++;
-	}
-	if (n == 0)
-		return (-1);
-	return (n);
-}
-
-static __inline int
-convert_wchar(FILE *fp, wchar_t *wcp, int width, locale_t locale)
-{
-	wint_t wi;
-	int n;
-
-	n = 0;
-	while (width-- != 0 && (wi = __fgetwc(fp, locale)) != WEOF) {
-		if (wcp != SUPPRESS_PTR)
-			*wcp++ = (wchar_t)wi;
-		n++;
-	}
-	if (n == 0)
-		return (-1);
-	return (n);
-}
-
-static __inline int
-convert_ccl(FILE *fp, char * mbp, int width, const struct ccl *ccl,
-    locale_t locale)
-{
-	mbstate_t mbs;
-	size_t nconv;
-	wint_t wi;
-	int n;
-
-	n = 0;
-	mbs = initial_mbs;
-	while ((wi = __fgetwc(fp, locale)) != WEOF &&
-	    width-- != 0 && inccl(ccl, wi)) {
-		if (mbp != SUPPRESS_PTR) {
-			nconv = wcrtomb(mbp, wi, &mbs);
-			if (nconv == (size_t)-1)
-				return (-1);
-			mbp += nconv;
-		}
-		n++;
-	}
-	if (wi != WEOF)
-		__ungetwc(wi, fp, locale);
-	if (mbp != SUPPRESS_PTR)
-		*mbp = 0;
-	return (n);
-}
-
-static __inline int
-convert_wccl(FILE *fp, wchar_t *wcp, int width, const struct ccl *ccl,
-    locale_t locale)
-{
-	wchar_t *wcp0;
-	wint_t wi;
-	int n;
-
-	if (wcp == SUPPRESS_PTR) {
-		n = 0;
-		while ((wi = __fgetwc(fp, locale)) != WEOF &&
-		    width-- != 0 && inccl(ccl, wi))
-			n++;
-		if (wi != WEOF)
-			__ungetwc(wi, fp, locale);
-	} else {
-		wcp0 = wcp;
-		while ((wi = __fgetwc(fp, locale)) != WEOF &&
-		    width-- != 0 && inccl(ccl, wi))
-			*wcp++ = (wchar_t)wi;
-		if (wi != WEOF)
-			__ungetwc(wi, fp, locale);
-		n = wcp - wcp0;
-		if (n == 0)
-			return (0);
-		*wcp = 0;
-	}
-	return (n);
-}
-
-static __inline int
-convert_string(FILE *fp, char * mbp, int width, locale_t locale)
-{
-	mbstate_t mbs;
-	size_t nconv;
-	wint_t wi;
-	int nread;
-
-	mbs = initial_mbs;
-	nread = 0;
-	while ((wi = __fgetwc(fp, locale)) != WEOF && width-- != 0 &&
-	    !iswspace(wi)) {
-		if (mbp != SUPPRESS_PTR) {
-			nconv = wcrtomb(mbp, wi, &mbs);
-			if (nconv == (size_t)-1)
-				return (-1);
-			mbp += nconv;
-		}
-		nread++;
-	}
-	if (wi != WEOF)
-		__ungetwc(wi, fp, locale);
-	if (mbp != SUPPRESS_PTR)
-		*mbp = 0;
-	return (nread);
-}
-
-static __inline int
-convert_wstring(FILE *fp, wchar_t *wcp, int width, locale_t locale)
-{
-	wchar_t *wcp0;
-	wint_t wi;
-	int nread;
-
-	nread = 0;
-	if (wcp == SUPPRESS_PTR) {
-		while ((wi = __fgetwc(fp, locale)) != WEOF &&
-		    width-- != 0 && !iswspace(wi))
-			nread++;
-		if (wi != WEOF)
-			__ungetwc(wi, fp, locale);
-	} else {
-		wcp0 = wcp;
-		while ((wi = __fgetwc(fp, locale)) != WEOF &&
-		    width-- != 0 && !iswspace(wi)) {
-			*wcp++ = (wchar_t)wi;
-			nread++;
-		}
-		if (wi != WEOF)
-			__ungetwc(wi, fp, locale);
-		*wcp = '\0';
-	}
-	return (nread);
-}
-
-/*
- * Read an integer, storing it in buf.  The only relevant bit in the
- * flags argument is PFXOK.
- *
- * Return 0 on a match failure, and the number of characters read
- * otherwise.
- */
-static __inline int
-parseint(FILE *fp, wchar_t *buf, int width, int base, int flags,
-    locale_t locale)
-{
-	/* `basefix' is used to avoid `if' tests */
-	static const short basefix[17] =
-		{ 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-	wchar_t *wcp;
-	int c;
-
-	flags |= SIGNOK | NDIGITS | NZDIGITS;
-	for (wcp = buf; width; width--) {
-		c = __fgetwc(fp, locale);
-		/*
-		 * Switch on the character; `goto ok' if we accept it
-		 * as a part of number.
-		 */
-		switch (c) {
-
-		/*
-		 * The digit 0 is always legal, but is special.  For
-		 * %i conversions, if no digits (zero or nonzero) have
-		 * been scanned (only signs), we will have base==0.
-		 * In that case, we should set it to 8 and enable 0x
-		 * prefixing.  Also, if we have not scanned zero
-		 * digits before this, do not turn off prefixing
-		 * (someone else will turn it off if we have scanned
-		 * any nonzero digits).
-		 */
-		case '0':
-			if (base == 0) {
-				base = 8;
-				flags |= PFXOK;
-			}
-			if (flags & NZDIGITS)
-				flags &= ~(SIGNOK|NZDIGITS|NDIGITS);
-			else
-				flags &= ~(SIGNOK|PFXOK|NDIGITS);
-			goto ok;
-
-		/* 1 through 7 always legal */
-		case '1': case '2': case '3':
-		case '4': case '5': case '6': case '7':
-			base = basefix[base];
-			flags &= ~(SIGNOK | PFXOK | NDIGITS);
-			goto ok;
-
-		/* digits 8 and 9 ok iff decimal or hex */
-		case '8': case '9':
-			base = basefix[base];
-			if (base <= 8)
-				break;	/* not legal here */
-			flags &= ~(SIGNOK | PFXOK | NDIGITS);
-			goto ok;
-
-		/* letters ok iff hex */
-		case 'A': case 'B': case 'C':
-		case 'D': case 'E': case 'F':
-		case 'a': case 'b': case 'c':
-		case 'd': case 'e': case 'f':
-			/* no need to fix base here */
-			if (base <= 10)
-				break;	/* not legal here */
-			flags &= ~(SIGNOK | PFXOK | NDIGITS);
-			goto ok;
-
-		/* sign ok only as first character */
-		case '+': case '-':
-			if (flags & SIGNOK) {
-				flags &= ~SIGNOK;
-				flags |= HAVESIGN;
-				goto ok;
-			}
-			break;
-
-		/*
-		 * x ok iff flag still set & 2nd char (or 3rd char if
-		 * we have a sign).
-		 */
-		case 'x': case 'X':
-			if (flags & PFXOK && wcp ==
-			    buf + 1 + !!(flags & HAVESIGN)) {
-				base = 16;	/* if %i */
-				flags &= ~PFXOK;
-				goto ok;
-			}
-			break;
-		}
-
-		/*
-		 * If we got here, c is not a legal character for a
-		 * number.  Stop accumulating digits.
-		 */
-		if (c != WEOF)
-			__ungetwc(c, fp, locale);
-		break;
-	ok:
-		/*
-		 * c is legal: store it and look at the next.
-		 */
-		*wcp++ = (wchar_t)c;
-	}
-	/*
-	 * If we had only a sign, it is no good; push back the sign.
-	 * If the number ends in `x', it was [sign] '0' 'x', so push
-	 * back the x and treat it as [sign] '0'.
-	 */
-	if (flags & NDIGITS) {
-		if (wcp > buf)
-			__ungetwc(*--wcp, fp, locale);
-		return (0);
-	}
-	c = wcp[-1];
-	if (c == 'x' || c == 'X') {
-		--wcp;
-		__ungetwc(c, fp, locale);
-	}
-	return (wcp - buf);
-}
-
-/*
- * MT-safe version.
- */
-int
-vfwscanf_l(FILE * __restrict fp, locale_t locale,
-		const wchar_t * __restrict fmt, va_list ap)
-{
-	int ret;
-	FIX_LOCALE(locale);
-
-	FLOCKFILE(fp);
-	ORIENT(fp, 1);
-	ret = __vfwscanf(fp, locale, fmt, ap);
-	FUNLOCKFILE(fp);
-	return (ret);
-}
-int
-vfwscanf(FILE * __restrict fp, const wchar_t * __restrict fmt, va_list ap)
-{
-	return vfwscanf_l(fp, __get_locale(), fmt, ap);
-}
-
-/*
- * Non-MT-safe version.
- */
-int
-__vfwscanf(FILE * __restrict fp, locale_t locale,
-		const wchar_t * __restrict fmt, va_list ap)
-{
-#define	GETARG(type)	((flags & SUPPRESS) ? SUPPRESS_PTR : va_arg(ap, type))
-	wint_t c;		/* character from format, or conversion */
-	size_t width;		/* field width, or 0 */
-	int flags;		/* flags as defined above */
-	int nassigned;		/* number of fields assigned */
-	int nconversions;	/* number of conversions */
-	int nr;			/* characters read by the current conversion */
-	int nread;		/* number of characters consumed from fp */
-	int base;		/* base argument to conversion function */
-	struct ccl ccl;		/* character class info */
-	wchar_t buf[BUF];	/* buffer for numeric conversions */
-	wint_t wi;		/* handy wint_t */
-
-	nassigned = 0;
-	nconversions = 0;
-	nread = 0;
-	ccl.start = ccl.end = NULL;
-	for (;;) {
-		c = *fmt++;
-		if (c == 0)
-			return (nassigned);
-		if (iswspace(c)) {
-			while ((c = __fgetwc(fp, locale)) != WEOF &&
-			    iswspace_l(c, locale))
-				nread++;
-			if (c != WEOF)
-				__ungetwc(c, fp, locale);
-			continue;
-		}
-		if (c != '%')
-			goto literal;
-		width = 0;
-		flags = 0;
-		/*
-		 * switch on the format.  continue if done;
-		 * break once format type is derived.
-		 */
-again:		c = *fmt++;
-		switch (c) {
-		case '%':
-literal:
-			if ((wi = __fgetwc(fp, locale)) == WEOF)
-				goto input_failure;
-			if (wi != c) {
-				__ungetwc(wi, fp, locale);
-				goto input_failure;
-			}
-			nread++;
-			continue;
-
-		case '*':
-			flags |= SUPPRESS;
-			goto again;
-		case 'j':
-			flags |= INTMAXT;
-			goto again;
-		case 'l':
-			if (flags & LONG) {
-				flags &= ~LONG;
-				flags |= LONGLONG;
-			} else
-				flags |= LONG;
-			goto again;
-		case 'q':
-			flags |= LONGLONG;	/* not quite */
-			goto again;
-		case 't':
-			flags |= PTRDIFFT;
-			goto again;
-		case 'z':
-			flags |= SIZET;
-			goto again;
-		case 'L':
-			flags |= LONGDBL;
-			goto again;
-		case 'h':
-			if (flags & SHORT) {
-				flags &= ~SHORT;
-				flags |= SHORTSHORT;
-			} else
-				flags |= SHORT;
-			goto again;
-
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			width = width * 10 + c - '0';
-			goto again;
-
-		/*
-		 * Conversions.
-		 */
-		case 'd':
-			c = CT_INT;
-			base = 10;
-			break;
-
-		case 'i':
-			c = CT_INT;
-			base = 0;
-			break;
-
-		case 'o':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 8;
-			break;
-
-		case 'u':
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 10;
-			break;
-
-		case 'X':
-		case 'x':
-			flags |= PFXOK;	/* enable 0x prefixing */
-			c = CT_INT;
-			flags |= UNSIGNED;
-			base = 16;
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case 'A': case 'E': case 'F': case 'G':
-		case 'a': case 'e': case 'f': case 'g':
-			c = CT_FLOAT;
-			break;
-#endif
-
-		case 'S':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 's':
-			c = CT_STRING;
-			break;
-
-		case '[':
-			ccl.start = fmt;
-			if (*fmt == '^') {
-				ccl.compl = 1;
-				fmt++;
-			} else
-				ccl.compl = 0;
-			if (*fmt == ']')
-				fmt++;
-			while (*fmt != '\0' && *fmt != ']')
-				fmt++;
-			ccl.end = fmt;
-			fmt++;
-			flags |= NOSKIP;
-			c = CT_CCL;
-			break;
-
-		case 'C':
-			flags |= LONG;
-			/* FALLTHROUGH */
-		case 'c':
-			flags |= NOSKIP;
-			c = CT_CHAR;
-			break;
-
-		case 'p':	/* pointer format is like hex */
-			flags |= POINTER | PFXOK;
-			c = CT_INT;		/* assumes sizeof(uintmax_t) */
-			flags |= UNSIGNED;	/*      >= sizeof(uintptr_t) */
-			base = 16;
-			break;
-
-		case 'n':
-			if (flags & SUPPRESS)	/* ??? */
-				continue;
-			if (flags & SHORTSHORT)
-				*va_arg(ap, char *) = nread;
-			else if (flags & SHORT)
-				*va_arg(ap, short *) = nread;
-			else if (flags & LONG)
-				*va_arg(ap, long *) = nread;
-			else if (flags & LONGLONG)
-				*va_arg(ap, long long *) = nread;
-			else if (flags & INTMAXT)
-				*va_arg(ap, intmax_t *) = nread;
-			else if (flags & SIZET)
-				*va_arg(ap, size_t *) = nread;
-			else if (flags & PTRDIFFT)
-				*va_arg(ap, ptrdiff_t *) = nread;
-			else
-				*va_arg(ap, int *) = nread;
-			continue;
-
-		default:
-			goto match_failure;
-
-		/*
-		 * Disgusting backwards compatibility hack.	XXX
-		 */
-		case '\0':	/* compat */
-			return (EOF);
-		}
-
-		/*
-		 * Consume leading white space, except for formats
-		 * that suppress this.
-		 */
-		if ((flags & NOSKIP) == 0) {
-			while ((wi = __fgetwc(fp, locale)) != WEOF && iswspace(wi))
-				nread++;
-			if (wi == WEOF)
-				goto input_failure;
-			__ungetwc(wi, fp, locale);
-		}
-
-		/*
-		 * Do the conversion.
-		 */
-		switch (c) {
-
-		case CT_CHAR:
-			/* scan arbitrary characters (sets NOSKIP) */
-			if (width == 0)
-				width = 1;
-			if (flags & LONG) {
-				nr = convert_wchar(fp, GETARG(wchar_t *), width,
-				    locale);
-			} else {
-				nr = convert_char(fp, GETARG(char *), width,
-				    locale);
-			}
-			if (nr < 0)
-				goto input_failure;
-			break;
-
-		case CT_CCL:
-			/* scan a (nonempty) character class (sets NOSKIP) */
-			if (width == 0)
-				width = (size_t)~0;	/* `infinity' */
-			/* take only those things in the class */
-			if (flags & LONG) {
-				nr = convert_wccl(fp, GETARG(wchar_t *), width,
-				    &ccl, locale);
-			} else {
-				nr = convert_ccl(fp, GETARG(char *), width,
-				    &ccl, locale);
-			}
-			if (nr <= 0) {
-				if (nr < 0)
-					goto input_failure;
-				else /* nr == 0 */
-					goto match_failure;
-			}
-			break;
-
-		case CT_STRING:
-			/* like CCL, but zero-length string OK, & no NOSKIP */
-			if (width == 0)
-				width = (size_t)~0;
-			if (flags & LONG) {
-				nr = convert_wstring(fp, GETARG(wchar_t *),
-				    width, locale);
-			} else {
-				nr = convert_string(fp, GETARG(char *), width,
-				    locale);
-			}
-			if (nr < 0)
-				goto input_failure;
-			break;
-
-		case CT_INT:
-			/* scan an integer as if by the conversion function */
-			if (width == 0 || width > sizeof(buf) /
-			    sizeof(*buf) - 1)
-				width = sizeof(buf) / sizeof(*buf) - 1;
-
-			nr = parseint(fp, buf, width, base, flags, locale);
-			if (nr == 0)
-				goto match_failure;
-			if ((flags & SUPPRESS) == 0) {
-				uintmax_t res;
-
-				buf[nr] = L'\0';
-				if ((flags & UNSIGNED) == 0)
-				    res = wcstoimax(buf, NULL, base);
-				else
-				    res = wcstoumax(buf, NULL, base);
-				if (flags & POINTER)
-					*va_arg(ap, void **) =
-							(void *)(uintptr_t)res;
-				else if (flags & SHORTSHORT)
-					*va_arg(ap, char *) = res;
-				else if (flags & SHORT)
-					*va_arg(ap, short *) = res;
-				else if (flags & LONG)
-					*va_arg(ap, long *) = res;
-				else if (flags & LONGLONG)
-					*va_arg(ap, long long *) = res;
-				else if (flags & INTMAXT)
-					*va_arg(ap, intmax_t *) = res;
-				else if (flags & PTRDIFFT)
-					*va_arg(ap, ptrdiff_t *) = res;
-				else if (flags & SIZET)
-					*va_arg(ap, size_t *) = res;
-				else
-					*va_arg(ap, int *) = res;
-			}
-			break;
-
-#ifndef NO_FLOATING_POINT
-		case CT_FLOAT:
-			/* scan a floating point number as if by strtod */
-			if (width == 0 || width > sizeof(buf) /
-			    sizeof(*buf) - 1)
-				width = sizeof(buf) / sizeof(*buf) - 1;
-			nr = parsefloat(fp, buf, buf + width, locale);
-			if (nr == 0)
-				goto match_failure;
-			if ((flags & SUPPRESS) == 0) {
-				if (flags & LONGDBL) {
-					long double res = wcstold(buf, NULL);
-					*va_arg(ap, long double *) = res;
-				} else if (flags & LONG) {
-					double res = wcstod(buf, NULL);
-					*va_arg(ap, double *) = res;
-				} else {
-					float res = wcstof(buf, NULL);
-					*va_arg(ap, float *) = res;
-				}
-			}
-			break;
-#endif /* !NO_FLOATING_POINT */
-		}
-		if (!(flags & SUPPRESS))
-			nassigned++;
-		nread += nr;
-		nconversions++;
-	}
-input_failure:
-	return (nconversions != 0 ? nassigned : EOF);
-match_failure:
-	return (nassigned);
-}
-
-#ifndef NO_FLOATING_POINT
-static int
-parsefloat(FILE *fp, wchar_t *buf, wchar_t *end, locale_t locale)
-{
-	mbstate_t mbs;
-	size_t nconv;
-	wchar_t *commit, *p;
-	int infnanpos = 0;
-	enum {
-		S_START, S_GOTSIGN, S_INF, S_NAN, S_DONE, S_MAYBEHEX,
-		S_DIGITS, S_FRAC, S_EXP, S_EXPDIGITS
-	} state = S_START;
-	wchar_t c;
-	wchar_t decpt;
-	_Bool gotmantdig = 0, ishex = 0;
-
-	mbs = initial_mbs;
-	nconv = mbrtowc(&decpt, localeconv()->decimal_point, MB_CUR_MAX, &mbs);
-	if (nconv == (size_t)-1 || nconv == (size_t)-2)
-		decpt = '.';	/* failsafe */
-
-	/*
-	 * We set commit = p whenever the string we have read so far
-	 * constitutes a valid representation of a floating point
-	 * number by itself.  At some point, the parse will complete
-	 * or fail, and we will ungetc() back to the last commit point.
-	 * To ensure that the file offset gets updated properly, it is
-	 * always necessary to read at least one character that doesn't
-	 * match; thus, we can't short-circuit "infinity" or "nan(...)".
-	 */
-	commit = buf - 1;
-	c = WEOF;
-	for (p = buf; p < end; ) {
-		if ((c = __fgetwc(fp, locale)) == WEOF)
-			break;
-reswitch:
-		switch (state) {
-		case S_START:
-			state = S_GOTSIGN;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_GOTSIGN:
-			switch (c) {
-			case '0':
-				state = S_MAYBEHEX;
-				commit = p;
-				break;
-			case 'I':
-			case 'i':
-				state = S_INF;
-				break;
-			case 'N':
-			case 'n':
-				state = S_NAN;
-				break;
-			default:
-				state = S_DIGITS;
-				goto reswitch;
-			}
-			break;
-		case S_INF:
-			if (infnanpos > 6 ||
-			    (c != "nfinity"[infnanpos] &&
-			     c != "NFINITY"[infnanpos]))
-				goto parsedone;
-			if (infnanpos == 1 || infnanpos == 6)
-				commit = p;	/* inf or infinity */
-			infnanpos++;
-			break;
-		case S_NAN:
-			switch (infnanpos) {
-			case 0:
-				if (c != 'A' && c != 'a')
-					goto parsedone;
-				break;
-			case 1:
-				if (c != 'N' && c != 'n')
-					goto parsedone;
-				else
-					commit = p;
-				break;
-			case 2:
-				if (c != '(')
-					goto parsedone;
-				break;
-			default:
-				if (c == ')') {
-					commit = p;
-					state = S_DONE;
-				} else if (!iswalnum(c) && c != '_')
-					goto parsedone;
-				break;
-			}
-			infnanpos++;
-			break;
-		case S_DONE:
-			goto parsedone;
-		case S_MAYBEHEX:
-			state = S_DIGITS;
-			if (c == 'X' || c == 'x') {
-				ishex = 1;
-				break;
-			} else {	/* we saw a '0', but no 'x' */
-				gotmantdig = 1;
-				goto reswitch;
-			}
-		case S_DIGITS:
-			if ((ishex && iswxdigit(c)) || iswdigit(c))
-				gotmantdig = 1;
-			else {
-				state = S_FRAC;
-				if (c != decpt)
-					goto reswitch;
-			}
-			if (gotmantdig)
-				commit = p;
-			break;
-		case S_FRAC:
-			if (((c == 'E' || c == 'e') && !ishex) ||
-			    ((c == 'P' || c == 'p') && ishex)) {
-				if (!gotmantdig)
-					goto parsedone;
-				else
-					state = S_EXP;
-			} else if ((ishex && iswxdigit(c)) || iswdigit(c)) {
-				commit = p;
-				gotmantdig = 1;
-			} else
-				goto parsedone;
-			break;
-		case S_EXP:
-			state = S_EXPDIGITS;
-			if (c == '-' || c == '+')
-				break;
-			else
-				goto reswitch;
-		case S_EXPDIGITS:
-			if (iswdigit(c))
-				commit = p;
-			else
-				goto parsedone;
-			break;
-		default:
-			abort();
-		}
-		*p++ = c;
-		c = WEOF;
-	}
-
-parsedone:
-	if (c != WEOF)
-		__ungetwc(c, fp, locale);
-	while (commit < --p)
-		__ungetwc(*p, fp, locale);
-	*++commit = '\0';
-	return (commit - buf);
-}
-#endif
diff --git a/lib/libc_bsd/stdio/vprintf.c b/lib/libc_bsd/stdio/vprintf.c
deleted file mode 100644
index 84c35d2..0000000
--- a/lib/libc_bsd/stdio/vprintf.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vprintf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include <xlocale.h>
-
-int
-vprintf(const char * __restrict fmt, __va_list ap)
-{
-	return (vfprintf(stdout, fmt, ap));
-}
-int
-vprintf_l(locale_t locale, const char * __restrict fmt, __va_list ap)
-{
-	return (vfprintf_l(stdout, locale, fmt, ap));
-}
diff --git a/lib/libc_bsd/stdio/vscanf.c b/lib/libc_bsd/stdio/vscanf.c
deleted file mode 100644
index 79cc3db..0000000
--- a/lib/libc_bsd/stdio/vscanf.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Donn Seeley at UUNET Technologies, Inc.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vscanf.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "local.h"
-#include "xlocale_private.h"
-
-int
-vscanf_l(locale_t locale, const char * __restrict fmt, __va_list ap)
-{
-	int retval;
-	FIX_LOCALE(locale);
-
-	FLOCKFILE(stdin);
-	retval = __svfscanf(stdin, locale, fmt, ap);
-	FUNLOCKFILE(stdin);
-	return (retval);
-}
-int
-vscanf(const char * __restrict fmt, __va_list ap)
-{
-	return vscanf_l(__get_locale(), fmt, ap);
-}
diff --git a/lib/libc_bsd/stdio/vsnprintf.c b/lib/libc_bsd/stdio/vsnprintf.c
deleted file mode 100644
index 4408081..0000000
--- a/lib/libc_bsd/stdio/vsnprintf.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vsnprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vsnprintf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include "local.h"
-#include "xlocale_private.h"
-
-int
-vsnprintf_l(char * __restrict str, size_t n, locale_t locale, 
-		const char * __restrict fmt, __va_list ap)
-{
-	size_t on;
-	int ret;
-	char dummy[2];
-	FILE f = FAKE_FILE;
-	FIX_LOCALE(locale);
-
-	on = n;
-	if (n != 0)
-		n--;
-	if (n > INT_MAX) {
-		errno = EOVERFLOW;
-		*str = '\0';
-		return (EOF);
-	}
-	/* Stdio internals do not deal correctly with zero length buffer */
-	if (n == 0) {
-		if (on > 0)
-	  		*str = '\0';
-		str = dummy;
-		n = 1;
-	}
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = n;
-	ret = __vfprintf(&f, locale, fmt, ap);
-	if (on > 0)
-		*f._p = '\0';
-	return (ret);
-}
-int
-vsnprintf(char * __restrict str, size_t n, const char * __restrict fmt,
-    __va_list ap)
-{
-	return vsnprintf_l(str, n, __get_locale(), fmt, ap);
-}
diff --git a/lib/libc_bsd/stdio/vsprintf.c b/lib/libc_bsd/stdio/vsprintf.c
deleted file mode 100644
index 5bdabf1..0000000
--- a/lib/libc_bsd/stdio/vsprintf.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vsprintf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vsprintf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include <limits.h>
-#include "local.h"
-#include "xlocale_private.h"
-
-int
-vsprintf_l(char * __restrict str, locale_t locale,
-		const char * __restrict fmt, __va_list ap)
-{
-	int ret;
-	FILE f = FAKE_FILE;
-	FIX_LOCALE(locale);
-
-	f._flags = __SWR | __SSTR;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._w = INT_MAX;
-	ret = __vfprintf(&f, locale, fmt, ap);
-	*f._p = 0;
-	return (ret);
-}
-int
-vsprintf(char * __restrict str, const char * __restrict fmt, __va_list ap)
-{
-	return vsprintf_l(str, __get_locale(), fmt, ap);
-}
diff --git a/lib/libc_bsd/stdio/vsscanf.c b/lib/libc_bsd/stdio/vsscanf.c
deleted file mode 100644
index b88f94c..0000000
--- a/lib/libc_bsd/stdio/vsscanf.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * This code is derived from software contributed to Berkeley by
- * Donn Seeley at UUNET Technologies, Inc.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vsscanf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <stdio.h>
-#include <string.h>
-#include "local.h"
-#include "xlocale_private.h"
-
-static int
-eofread(void *, char *, int);
-
-/* ARGSUSED */
-static int
-eofread(void *cookie, char *buf, int len)
-{
-
-	return (0);
-}
-
-int
-vsscanf_l(const char * __restrict str, locale_t locale,
-		const char * __restrict fmt, __va_list ap)
-{
-	FILE f = FAKE_FILE;
-	FIX_LOCALE(locale);
-
-	f._flags = __SRD;
-	f._bf._base = f._p = (unsigned char *)str;
-	f._bf._size = f._r = strlen(str);
-	f._read = eofread;
-	return (__svfscanf(&f, locale, fmt, ap));
-}
-int
-vsscanf(const char * __restrict str, const char * __restrict fmt,
-	__va_list ap)
-{
-	return vsscanf_l(str, __get_locale(), fmt, ap);
-}
diff --git a/lib/libc_bsd/stdio/vswprintf.c b/lib/libc_bsd/stdio/vswprintf.c
deleted file mode 100644
index 8473e76..0000000
--- a/lib/libc_bsd/stdio/vswprintf.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*	$OpenBSD: vasprintf.c,v 1.4 1998/06/21 22:13:47 millert Exp $	*/
-
-/*
- * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp ");
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vswprintf.c 234531 2012-04-21 06:10:18Z das $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include "local.h"
-#include "xlocale_private.h"
-
-int
-vswprintf_l(wchar_t * __restrict s, size_t n, locale_t locale,
-		const wchar_t * __restrict fmt, __va_list ap)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	FILE f = FAKE_FILE;
-	char *mbp;
-	int ret, sverrno;
-	size_t nwc;
-	FIX_LOCALE(locale);
-
-	if (n == 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-	if (n - 1 > INT_MAX) {
-		errno = EOVERFLOW;
-		*s = L'\0';
-		return (-1);
-	}
-
-	f._flags = __SWR | __SSTR | __SALC;
-	f._bf._base = f._p = (unsigned char *)malloc(128);
-	if (f._bf._base == NULL) {
-		errno = ENOMEM;
-		*s = L'\0';
-		return (-1);
-	}
-	f._bf._size = f._w = 127;		/* Leave room for the NUL */
-	ret = __vfwprintf(&f, locale, fmt, ap);
-	if (ret < 0) {
-		sverrno = errno;
-		free(f._bf._base);
-		errno = sverrno;
-		*s = L'\0';
-		return (-1);
-	}
-	*f._p = '\0';
-	mbp = f._bf._base;
-	/*
-	 * XXX Undo the conversion from wide characters to multibyte that
-	 * fputwc() did in __vfwprintf().
-	 */
-	mbs = initial;
-	nwc = mbsrtowcs_l(s, (const char **)&mbp, n, &mbs, locale);
-	free(f._bf._base);
-	if (nwc == (size_t)-1) {
-		errno = EILSEQ;
-		*s = L'\0';
-		return (-1);
-	}
-	if (nwc == n) {
-		s[n - 1] = L'\0';
-		errno = EOVERFLOW;
-		return (-1);
-	}
-
-	return (ret);
-}
-int
-vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
-    __va_list ap)
-{
-	return vswprintf_l(s, n, __get_locale(), fmt, ap);
-}
diff --git a/lib/libc_bsd/stdio/vswscanf.c b/lib/libc_bsd/stdio/vswscanf.c
deleted file mode 100644
index e6076be..0000000
--- a/lib/libc_bsd/stdio/vswscanf.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Donn Seeley at UUNET Technologies, Inc.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)vsscanf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.11 2002/08/21 16:19:57 mike Exp ");
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vswscanf.c 249808 2013-04-23 13:33:13Z emaste $");
-
-#include <limits.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "local.h"
-#include "xlocale_private.h"
-
-static int	eofread(void *, char *, int);
-
-static int
-eofread(void *cookie, char *buf, int len)
-{
-
-	return (0);
-}
-
-int
-vswscanf_l(const wchar_t * __restrict str, locale_t locale,
-		const wchar_t * __restrict fmt, va_list ap)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	FILE f = FAKE_FILE;
-	char *mbstr;
-	size_t mlen;
-	int r;
-	const wchar_t *strp;
-	FIX_LOCALE(locale);
-
-	/*
-	 * XXX Convert the wide character string to multibyte, which
-	 * __vfwscanf() will convert back to wide characters.
-	 */
-	if ((mbstr = malloc(wcslen(str) * MB_CUR_MAX + 1)) == NULL)
-		return (EOF);
-	mbs = initial;
-	strp = str;
-	if ((mlen = wcsrtombs_l(mbstr, &strp, SIZE_T_MAX, &mbs, locale)) == (size_t)-1) {
-		free(mbstr);
-		return (EOF);
-	}
-	f._flags = __SRD;
-	f._bf._base = f._p = (unsigned char *)mbstr;
-	f._bf._size = f._r = mlen;
-	f._read = eofread;
-	r = __vfwscanf(&f, locale, fmt, ap);
-	free(mbstr);
-
-	return (r);
-}
-int
-vswscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt,
-    va_list ap)
-{
-	return vswscanf_l(str, __get_locale(), fmt, ap);
-}
diff --git a/lib/libc_bsd/stdio/vwprintf.c b/lib/libc_bsd/stdio/vwprintf.c
deleted file mode 100644
index c3b0a84..0000000
--- a/lib/libc_bsd/stdio/vwprintf.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vwprintf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-
-int
-vwprintf(const wchar_t * __restrict fmt, va_list ap)
-{
-	return (vfwprintf(stdout, fmt, ap));
-}
-int
-vwprintf_l(locale_t locale, const wchar_t * __restrict fmt, va_list ap)
-{
-	return (vfwprintf_l(stdout, locale, fmt, ap));
-}
diff --git a/lib/libc_bsd/stdio/vwscanf.c b/lib/libc_bsd/stdio/vwscanf.c
deleted file mode 100644
index 0369fdf..0000000
--- a/lib/libc_bsd/stdio/vwscanf.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/vwscanf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-
-int
-vwscanf(const wchar_t * __restrict fmt, va_list ap)
-{
-	return (vfwscanf(stdin, fmt, ap));
-}
-int
-vwscanf_l(locale_t locale, const wchar_t * __restrict fmt, va_list ap)
-{
-	return (vfwscanf_l(stdin, locale, fmt, ap));
-}
diff --git a/lib/libc_bsd/stdio/wbuf.c b/lib/libc_bsd/stdio/wbuf.c
deleted file mode 100644
index 428c501..0000000
--- a/lib/libc_bsd/stdio/wbuf.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wbuf.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/wbuf.c 269482 2014-08-03 18:28:10Z pfg $");
-
-#include <errno.h>
-#include <stdio.h>
-#include "local.h"
-
-/*
- * Write the given character into the (probably full) buffer for
- * the given file.  Flush the buffer out if it is or becomes full,
- * or if c=='\n' and the file is line buffered.
- *
- * Non-MT-safe
- */
-int
-__swbuf(int c, FILE *fp)
-{
-	int n;
-
-	/*
-	 * In case we cannot write, or longjmp takes us out early,
-	 * make sure _w is 0 (if fully- or un-buffered) or -_bf._size
-	 * (if line buffered) so that we will get called again.
-	 * If we did not do this, a sufficient number of putc()
-	 * calls might wrap _w from negative to positive.
-	 */
-	fp->_w = fp->_lbfsize;
-	if (prepwrite(fp) != 0) {
-		errno = EBADF;
-		return (EOF);
-	}
-	c = (unsigned char)c;
-
-	ORIENT(fp, -1);
-
-	/*
-	 * If it is completely full, flush it out.  Then, in any case,
-	 * stuff c into the buffer.  If this causes the buffer to fill
-	 * completely, or if c is '\n' and the file is line buffered,
-	 * flush it (perhaps a second time).  The second flush will always
-	 * happen on unbuffered streams, where _bf._size==1; fflush()
-	 * guarantees that putc() will always call wbuf() by setting _w
-	 * to 0, so we need not do anything else.
-	 */
-	n = fp->_p - fp->_bf._base;
-	if (n >= fp->_bf._size) {
-		if (__fflush(fp))
-			return (EOF);
-		n = 0;
-	}
-	fp->_w--;
-	*fp->_p++ = c;
-	if (++n == fp->_bf._size || (fp->_flags & __SLBF && c == '\n'))
-		if (__fflush(fp))
-			return (EOF);
-	return (c);
-}
diff --git a/lib/libc_bsd/stdio/wprintf.3 b/lib/libc_bsd/stdio/wprintf.3
deleted file mode 100644
index 48910d1..0000000
--- a/lib/libc_bsd/stdio/wprintf.3
+++ /dev/null
@@ -1,618 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)printf.3	8.1 (Berkeley) 6/4/93
-.\" FreeBSD: src/lib/libc/stdio/printf.3,v 1.47 2002/09/06 11:23:55 tjr Exp
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/wprintf.3 208027 2010-05-13 12:07:55Z uqs $
-.\"
-.Dd July 5, 2003
-.Dt WPRINTF 3
-.Os
-.Sh NAME
-.Nm wprintf , fwprintf , swprintf ,
-.Nm vwprintf , vfwprintf , vswprintf
-.Nd formatted wide character output conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft int
-.Fn fwprintf "FILE * restrict stream" "const wchar_t * restrict format" ...
-.Ft int
-.Fn swprintf "wchar_t * restrict ws" "size_t n" "const wchar_t * restrict format" ...
-.Ft int
-.Fn wprintf "const wchar_t * restrict format" ...
-.In stdarg.h
-.Ft int
-.Fn vfwprintf "FILE * restrict stream" "const wchar_t * restrict" "va_list ap"
-.Ft int
-.Fn vswprintf "wchar_t * restrict ws" "size_t n" "const wchar_t *restrict format" "va_list ap"
-.Ft int
-.Fn vwprintf "const wchar_t * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The
-.Fn wprintf
-family of functions produces output according to a
-.Fa format
-as described below.
-The
-.Fn wprintf
-and
-.Fn vwprintf
-functions
-write output to
-.Dv stdout ,
-the standard output stream;
-.Fn fwprintf
-and
-.Fn vfwprintf
-write output to the given output
-.Fa stream ;
-.Fn swprintf
-and
-.Fn vswprintf
-write to the wide character string
-.Fa ws .
-.Pp
-These functions write the output under the control of a
-.Fa format
-string that specifies how subsequent arguments
-(or arguments accessed via the variable-length argument facilities of
-.Xr stdarg 3 )
-are converted for output.
-.Pp
-These functions return the number of characters printed
-(not including the trailing
-.Ql \e0
-used to end output to strings).
-.Pp
-The
-.Fn swprintf
-and
-.Fn vswprintf
-functions will fail if
-.Fa n
-or more wide characters were requested to be written,
-.Pp
-The format string is composed of zero or more directives:
-ordinary
-characters (not
-.Cm % ) ,
-which are copied unchanged to the output stream;
-and conversion specifications, each of which results
-in fetching zero or more subsequent arguments.
-Each conversion specification is introduced by
-the
-.Cm %
-character.
-The arguments must correspond properly (after type promotion)
-with the conversion specifier.
-After the
-.Cm % ,
-the following appear in sequence:
-.Bl -bullet
-.It
-An optional field, consisting of a decimal digit string followed by a
-.Cm $ ,
-specifying the next argument to access.
-If this field is not provided, the argument following the last
-argument accessed will be used.
-Arguments are numbered starting at
-.Cm 1 .
-If unaccessed arguments in the format string are interspersed with ones that
-are accessed the results will be indeterminate.
-.It
-Zero or more of the following flags:
-.Bl -tag -width ".So \  Sc (space)"
-.It Sq Cm #
-The value should be converted to an
-.Dq alternate form .
-For
-.Cm c , d , i , n , p , s ,
-and
-.Cm u
-conversions, this option has no effect.
-For
-.Cm o
-conversions, the precision of the number is increased to force the first
-character of the output string to a zero (except if a zero value is printed
-with an explicit precision of zero).
-For
-.Cm x
-and
-.Cm X
-conversions, a non-zero result has the string
-.Ql 0x
-(or
-.Ql 0X
-for
-.Cm X
-conversions) prepended to it.
-For
-.Cm a , A , e , E , f , F , g ,
-and
-.Cm G
-conversions, the result will always contain a decimal point, even if no
-digits follow it (normally, a decimal point appears in the results of
-those conversions only if a digit follows).
-For
-.Cm g
-and
-.Cm G
-conversions, trailing zeros are not removed from the result as they
-would otherwise be.
-.It So Cm 0 Sc (zero)
-Zero padding.
-For all conversions except
-.Cm n ,
-the converted value is padded on the left with zeros rather than blanks.
-If a precision is given with a numeric conversion
-.Cm ( d , i , o , u , i , x ,
-and
-.Cm X ) ,
-the
-.Cm 0
-flag is ignored.
-.It Sq Cm \-
-A negative field width flag;
-the converted value is to be left adjusted on the field boundary.
-Except for
-.Cm n
-conversions, the converted value is padded on the right with blanks,
-rather than on the left with blanks or zeros.
-A
-.Cm \-
-overrides a
-.Cm 0
-if both are given.
-.It So "\ " Sc (space)
-A blank should be left before a positive number
-produced by a signed conversion
-.Cm ( a , A , d , e , E , f , F , g , G ,
-or
-.Cm i ) .
-.It Sq Cm +
-A sign must always be placed before a
-number produced by a signed conversion.
-A
-.Cm +
-overrides a space if both are used.
-.It Sq Cm '
-Decimal conversions
-.Cm ( d , u ,
-or
-.Cm i )
-or the integral portion of a floating point conversion
-.Cm ( f
-or
-.Cm F )
-should be grouped and separated by thousands using
-the non-monetary separator returned by
-.Xr localeconv 3 .
-.El
-.It
-An optional decimal digit string specifying a minimum field width.
-If the converted value has fewer characters than the field width, it will
-be padded with spaces on the left (or right, if the left-adjustment
-flag has been given) to fill out
-the field width.
-.It
-An optional precision, in the form of a period
-.Cm \&.
-followed by an
-optional digit string.
-If the digit string is omitted, the precision is taken as zero.
-This gives the minimum number of digits to appear for
-.Cm d , i , o , u , x ,
-and
-.Cm X
-conversions, the number of digits to appear after the decimal-point for
-.Cm a , A , e , E , f ,
-and
-.Cm F
-conversions, the maximum number of significant digits for
-.Cm g
-and
-.Cm G
-conversions, or the maximum number of characters to be printed from a
-string for
-.Cm s
-conversions.
-.It
-An optional length modifier, that specifies the size of the argument.
-The following length modifiers are valid for the
-.Cm d , i , n , o , u , x ,
-or
-.Cm X
-conversion:
-.Bl -column ".Cm q Em (deprecated)" ".Vt signed char" ".Vt unsigned long long" ".Vt long long *"
-.It Sy Modifier Ta Cm d , i Ta Cm o , u , x , X Ta Cm n
-.It Cm hh Ta Vt "signed char" Ta Vt "unsigned char" Ta Vt "signed char *"
-.It Cm h Ta Vt short Ta Vt "unsigned short" Ta Vt "short *"
-.It Cm l No (ell) Ta Vt long Ta Vt "unsigned long" Ta Vt "long *"
-.It Cm ll No (ell ell) Ta Vt "long long" Ta Vt "unsigned long long" Ta Vt "long long *"
-.It Cm j Ta Vt intmax_t Ta Vt uintmax_t Ta Vt "intmax_t *"
-.It Cm t Ta Vt ptrdiff_t Ta (see note) Ta Vt "ptrdiff_t *"
-.It Cm z Ta (see note) Ta Vt size_t Ta (see note)
-.It Cm q Em (deprecated) Ta Vt quad_t Ta Vt u_quad_t Ta Vt "quad_t *"
-.El
-.Pp
-Note:
-the
-.Cm t
-modifier, when applied to a
-.Cm o , u , x ,
-or
-.Cm X
-conversion, indicates that the argument is of an unsigned type
-equivalent in size to a
-.Vt ptrdiff_t .
-The
-.Cm z
-modifier, when applied to a
-.Cm d
-or
-.Cm i
-conversion, indicates that the argument is of a signed type equivalent in
-size to a
-.Vt size_t .
-Similarly, when applied to an
-.Cm n
-conversion, it indicates that the argument is a pointer to a signed type
-equivalent in size to a
-.Vt size_t .
-.Pp
-The following length modifier is valid for the
-.Cm a , A , e , E , f , F , g ,
-or
-.Cm G
-conversion:
-.Bl -column ".Sy Modifier" ".Cm a , A , e , E , f , F , g , G"
-.It Sy Modifier Ta Cm a , A , e , E , f , F , g , G
-.It Cm L Ta Vt "long double"
-.El
-.Pp
-The following length modifier is valid for the
-.Cm c
-or
-.Cm s
-conversion:
-.Bl -column ".Sy Modifier" ".Vt wint_t" ".Vt wchar_t *"
-.It Sy Modifier Ta Cm c Ta Cm s
-.It Cm l No (ell) Ta Vt wint_t Ta Vt "wchar_t *"
-.El
-.It
-A character that specifies the type of conversion to be applied.
-.El
-.Pp
-A field width or precision, or both, may be indicated by
-an asterisk
-.Ql *
-or an asterisk followed by one or more decimal digits and a
-.Ql $
-instead of a
-digit string.
-In this case, an
-.Vt int
-argument supplies the field width or precision.
-A negative field width is treated as a left adjustment flag followed by a
-positive field width; a negative precision is treated as though it were
-missing.
-If a single format directive mixes positional
-.Pq Li nn$
-and non-positional arguments, the results are undefined.
-.Pp
-The conversion specifiers and their meanings are:
-.Bl -tag -width ".Cm diouxX"
-.It Cm diouxX
-The
-.Vt int
-(or appropriate variant) argument is converted to signed decimal
-.Cm ( d
-and
-.Cm i ) ,
-unsigned octal
-.Pq Cm o ,
-unsigned decimal
-.Pq Cm u ,
-or unsigned hexadecimal
-.Cm ( x
-and
-.Cm X )
-notation.
-The letters
-.Dq Li abcdef
-are used for
-.Cm x
-conversions; the letters
-.Dq Li ABCDEF
-are used for
-.Cm X
-conversions.
-The precision, if any, gives the minimum number of digits that must
-appear; if the converted value requires fewer digits, it is padded on
-the left with zeros.
-.It Cm DOU
-The
-.Vt "long int"
-argument is converted to signed decimal, unsigned octal, or unsigned
-decimal, as if the format had been
-.Cm ld , lo ,
-or
-.Cm lu
-respectively.
-These conversion characters are deprecated, and will eventually disappear.
-.It Cm eE
-The
-.Vt double
-argument is rounded and converted in the style
-.Sm off
-.Oo \- Oc Ar d Li \&. Ar ddd Li e \(+- Ar dd
-.Sm on
-where there is one digit before the
-decimal-point character
-and the number of digits after it is equal to the precision;
-if the precision is missing,
-it is taken as 6; if the precision is
-zero, no decimal-point character appears.
-An
-.Cm E
-conversion uses the letter
-.Ql E
-(rather than
-.Ql e )
-to introduce the exponent.
-The exponent always contains at least two digits; if the value is zero,
-the exponent is 00.
-.Pp
-For
-.Cm a , A , e , E , f , F , g ,
-and
-.Cm G
-conversions, positive and negative infinity are represented as
-.Li inf
-and
-.Li -inf
-respectively when using the lowercase conversion character, and
-.Li INF
-and
-.Li -INF
-respectively when using the uppercase conversion character.
-Similarly, NaN is represented as
-.Li nan
-when using the lowercase conversion, and
-.Li NAN
-when using the uppercase conversion.
-.It Cm fF
-The
-.Vt double
-argument is rounded and converted to decimal notation in the style
-.Sm off
-.Oo \- Oc Ar ddd Li \&. Ar ddd ,
-.Sm on
-where the number of digits after the decimal-point character
-is equal to the precision specification.
-If the precision is missing, it is taken as 6; if the precision is
-explicitly zero, no decimal-point character appears.
-If a decimal point appears, at least one digit appears before it.
-.It Cm gG
-The
-.Vt double
-argument is converted in style
-.Cm f
-or
-.Cm e
-(or
-.Cm F
-or
-.Cm E
-for
-.Cm G
-conversions).
-The precision specifies the number of significant digits.
-If the precision is missing, 6 digits are given; if the precision is zero,
-it is treated as 1.
-Style
-.Cm e
-is used if the exponent from its conversion is less than \-4 or greater than
-or equal to the precision.
-Trailing zeros are removed from the fractional part of the result; a
-decimal point appears only if it is followed by at least one digit.
-.It Cm aA
-The
-.Vt double
-argument is converted to hexadecimal notation in the style
-.Sm off
-.Oo \- Oc Li 0x Ar h Li \&. Ar hhhp Oo \(+- Oc Ar d ,
-.Sm on
-where the number of digits after the hexadecimal-point character
-is equal to the precision specification.
-If the precision is missing, it is taken as enough to exactly
-represent the floating-point number; if the precision is
-explicitly zero, no hexadecimal-point character appears.
-This is an exact conversion of the mantissa+exponent internal
-floating point representation; the
-.Sm off
-.Oo \- Oc Li 0x Ar h Li \&. Ar hhh
-.Sm on
-portion represents exactly the mantissa; only denormalized
-mantissas have a zero value to the left of the hexadecimal
-point.
-The
-.Cm p
-is a literal character
-.Ql p ;
-the exponent is preceded by a positive or negative sign
-and is represented in decimal, using only enough characters
-to represent the exponent.
-The
-.Cm A
-conversion uses the prefix
-.Dq Li 0X
-(rather than
-.Dq Li 0x ) ,
-the letters
-.Dq Li ABCDEF
-(rather than
-.Dq Li abcdef )
-to represent the hex digits, and the letter
-.Ql P
-(rather than
-.Ql p )
-to separate the mantissa and exponent.
-.It Cm C
-Treated as
-.Cm c
-with the
-.Cm l
-(ell) modifier.
-.It Cm c
-The
-.Vt int
-argument is converted to an
-.Vt "unsigned char" ,
-then to a
-.Vt wchar_t
-as if by
-.Xr btowc 3 ,
-and the resulting character is written.
-.Pp
-If the
-.Cm l
-(ell) modifier is used, the
-.Vt wint_t
-argument is converted to a
-.Vt wchar_t
-and written.
-.It Cm S
-Treated as
-.Cm s
-with the
-.Cm l
-(ell) modifier.
-.It Cm s
-The
-.Vt "char *"
-argument is expected to be a pointer to an array of character type (pointer
-to a string) containing a multibyte sequence.
-Characters from the array are converted to wide characters and written up to
-(but not including)
-a terminating
-.Dv NUL
-character;
-if a precision is specified, no more than the number specified are
-written.
-If a precision is given, no null character
-need be present; if the precision is not specified, or is greater than
-the size of the array, the array must contain a terminating
-.Dv NUL
-character.
-.Pp
-If the
-.Cm l
-(ell) modifier is used, the
-.Vt "wchar_t *"
-argument is expected to be a pointer to an array of wide characters
-(pointer to a wide string).
-Each wide character in the string
-is written.
-Wide characters from the array are written up to (but not including)
-a terminating wide
-.Dv NUL
-character;
-if a precision is specified, no more than the number specified are
-written (including shift sequences).
-If a precision is given, no null character
-need be present; if the precision is not specified, or is greater than
-the number of characters in
-the string, the array must contain a terminating wide
-.Dv NUL
-character.
-.It Cm p
-The
-.Vt "void *"
-pointer argument is printed in hexadecimal (as if by
-.Ql %#x
-or
-.Ql %#lx ) .
-.It Cm n
-The number of characters written so far is stored into the
-integer indicated by the
-.Vt "int *"
-(or variant) pointer argument.
-No argument is converted.
-.It Cm %
-A
-.Ql %
-is written.
-No argument is converted.
-The complete conversion specification
-is
-.Ql %% .
-.El
-.Pp
-The decimal point
-character is defined in the program's locale (category
-.Dv LC_NUMERIC ) .
-.Pp
-In no case does a non-existent or small field width cause truncation of
-a numeric field; if the result of a conversion is wider than the field
-width, the
-field is expanded to contain the conversion result.
-.Sh SEE ALSO
-.Xr btowc 3 ,
-.Xr fputws 3 ,
-.Xr printf 3 ,
-.Xr putwc 3 ,
-.Xr setlocale 3 ,
-.Xr wcsrtombs 3 ,
-.Xr wscanf 3
-.Sh STANDARDS
-Subject to the caveats noted in the
-.Sx BUGS
-section
-of
-.Xr printf 3 ,
-the
-.Fn wprintf ,
-.Fn fwprintf ,
-.Fn swprintf ,
-.Fn vwprintf ,
-.Fn vfwprintf
-and
-.Fn vswprintf
-functions
-conform to
-.St -isoC-99 .
-.Sh SECURITY CONSIDERATIONS
-Refer to
-.Xr printf 3 .
diff --git a/lib/libc_bsd/stdio/wprintf.c b/lib/libc_bsd/stdio/wprintf.c
deleted file mode 100644
index 3a2c5dd..0000000
--- a/lib/libc_bsd/stdio/wprintf.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/wprintf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-
-int
-wprintf(const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf(stdout, fmt, ap);
-	va_end(ap);
-
-	return (ret);
-}
-int
-wprintf_l(locale_t locale, const wchar_t * __restrict fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = vfwprintf_l(stdout, locale, fmt, ap);
-	va_end(ap);
-
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/wscanf.3 b/lib/libc_bsd/stdio/wscanf.3
deleted file mode 100644
index 44b5205..0000000
--- a/lib/libc_bsd/stdio/wscanf.3
+++ /dev/null
@@ -1,479 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)scanf.3	8.2 (Berkeley) 12/11/93
-.\" FreeBSD: src/lib/libc/stdio/scanf.3,v 1.24 2003/06/28 09:03:25 das Exp
-.\" $FreeBSD: releng/10.2/lib/libc/stdio/wscanf.3 235363 2012-05-12 20:27:13Z joel $
-.\"
-.Dd July 5, 2003
-.Dt WSCANF 3
-.Os
-.Sh NAME
-.Nm wscanf ,
-.Nm fwscanf ,
-.Nm swscanf ,
-.Nm vwscanf ,
-.Nm vswscanf ,
-.Nm vfwscanf
-.Nd wide character input format conversion
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.In wchar.h
-.Ft int
-.Fn wscanf "const wchar_t * restrict format" ...
-.Ft int
-.Fn fwscanf "FILE * restrict stream" "const wchar_t * restrict format" ...
-.Ft int
-.Fn swscanf "const wchar_t * restrict str" "const wchar_t * restrict format" ...
-.In stdarg.h
-.Ft int
-.Fn vwscanf "const wchar_t * restrict format" "va_list ap"
-.Ft int
-.Fn vswscanf "const wchar_t * restrict str" "const wchar_t * restrict format" "va_list ap"
-.Ft int
-.Fn vfwscanf "FILE * restrict stream" "const wchar_t * restrict format" "va_list ap"
-.Sh DESCRIPTION
-The
-.Fn wscanf
-family of functions scans input according to a
-.Fa format
-as described below.
-This format may contain
-.Em conversion specifiers ;
-the results from such conversions, if any,
-are stored through the
-.Em pointer
-arguments.
-The
-.Fn wscanf
-function
-reads input from the standard input stream
-.Dv stdin ,
-.Fn fwscanf
-reads input from the stream pointer
-.Fa stream ,
-and
-.Fn swscanf
-reads its input from the wide character string pointed to by
-.Fa str .
-The
-.Fn vfwscanf
-function
-is analogous to
-.Xr vfwprintf 3
-and reads input from the stream pointer
-.Fa stream
-using a variable argument list of pointers (see
-.Xr stdarg 3 ) .
-The
-.Fn vwscanf
-function scans a variable argument list from the standard input and
-the
-.Fn vswscanf
-function scans it from a wide character string;
-these are analogous to
-the
-.Fn vwprintf
-and
-.Fn vswprintf
-functions respectively.
-Each successive
-.Em pointer
-argument must correspond properly with
-each successive conversion specifier
-(but see the
-.Cm *
-conversion below).
-All conversions are introduced by the
-.Cm %
-(percent sign) character.
-The
-.Fa format
-string
-may also contain other characters.
-White space (such as blanks, tabs, or newlines) in the
-.Fa format
-string match any amount of white space, including none, in the input.
-Everything else
-matches only itself.
-Scanning stops
-when an input character does not match such a format character.
-Scanning also stops
-when an input conversion cannot be made (see below).
-.Sh CONVERSIONS
-Following the
-.Cm %
-character introducing a conversion
-there may be a number of
-.Em flag
-characters, as follows:
-.Bl -tag -width ".Cm l No (ell)"
-.It Cm *
-Suppresses assignment.
-The conversion that follows occurs as usual, but no pointer is used;
-the result of the conversion is simply discarded.
-.It Cm hh
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt char
-(rather than
-.Vt int ) .
-.It Cm h
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "short int"
-(rather than
-.Vt int ) .
-.It Cm l No (ell)
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "long int"
-(rather than
-.Vt int ) ,
-that the conversion will be one of
-.Cm a , e , f ,
-or
-.Cm g
-and the next pointer is a pointer to
-.Vt double
-(rather than
-.Vt float ) ,
-or that the conversion will be one of
-.Cm c
-or
-.Cm s
-and the next pointer is a pointer to an array of
-.Vt wchar_t
-(rather than
-.Vt char ) .
-.It Cm ll No (ell ell)
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "long long int"
-(rather than
-.Vt int ) .
-.It Cm L
-Indicates that the conversion will be one of
-.Cm a , e , f ,
-or
-.Cm g
-and the next pointer is a pointer to
-.Vt "long double" .
-.It Cm j
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt intmax_t
-(rather than
-.Vt int ) .
-.It Cm t
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt ptrdiff_t
-(rather than
-.Vt int ) .
-.It Cm z
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt size_t
-(rather than
-.Vt int ) .
-.It Cm q
-(deprecated.)
-Indicates that the conversion will be one of
-.Cm dioux
-or
-.Cm n
-and the next pointer is a pointer to a
-.Vt "long long int"
-(rather than
-.Vt int ) .
-.El
-.Pp
-In addition to these flags,
-there may be an optional maximum field width,
-expressed as a decimal integer,
-between the
-.Cm %
-and the conversion.
-If no width is given,
-a default of
-.Dq infinity
-is used (with one exception, below);
-otherwise at most this many characters are scanned
-in processing the conversion.
-Before conversion begins,
-most conversions skip white space;
-this white space is not counted against the field width.
-.Pp
-The following conversions are available:
-.Bl -tag -width XXXX
-.It Cm %
-Matches a literal
-.Ql % .
-That is,
-.Dq Li %%
-in the format string
-matches a single input
-.Ql %
-character.
-No conversion is done, and assignment does not occur.
-.It Cm d
-Matches an optionally signed decimal integer;
-the next pointer must be a pointer to
-.Vt int .
-.It Cm i
-Matches an optionally signed integer;
-the next pointer must be a pointer to
-.Vt int .
-The integer is read in base 16 if it begins
-with
-.Ql 0x
-or
-.Ql 0X ,
-in base 8 if it begins with
-.Ql 0 ,
-and in base 10 otherwise.
-Only characters that correspond to the base are used.
-.It Cm o
-Matches an octal integer;
-the next pointer must be a pointer to
-.Vt "unsigned int" .
-.It Cm u
-Matches an optionally signed decimal integer;
-the next pointer must be a pointer to
-.Vt "unsigned int" .
-.It Cm x , X
-Matches an optionally signed hexadecimal integer;
-the next pointer must be a pointer to
-.Vt "unsigned int" .
-.It Cm a , A , e , E , f , F , g , G
-Matches a floating-point number in the style of
-.Xr wcstod 3 .
-The next pointer must be a pointer to
-.Vt float
-(unless
-.Cm l
-or
-.Cm L
-is specified.)
-.It Cm s
-Matches a sequence of non-white-space wide characters;
-the next pointer must be a pointer to
-.Vt char ,
-and the array must be large enough to accept the multibyte representation
-of all the sequence and the
-terminating
-.Dv NUL
-character.
-The input string stops at white space
-or at the maximum field width, whichever occurs first.
-.Pp
-If an
-.Cm l
-qualifier is present, the next pointer must be a pointer to
-.Vt wchar_t ,
-into which the input will be placed.
-.It Cm S
-The same as
-.Cm ls .
-.It Cm c
-Matches a sequence of
-.Em width
-count
-wide characters (default 1);
-the next pointer must be a pointer to
-.Vt char ,
-and there must be enough room for the multibyte representation
-of all the characters
-(no terminating
-.Dv NUL
-is added).
-The usual skip of leading white space is suppressed.
-To skip white space first, use an explicit space in the format.
-.Pp
-If an
-.Cm l
-qualifier is present, the next pointer must be a pointer to
-.Vt wchar_t ,
-into which the input will be placed.
-.It Cm C
-The same as
-.Cm lc .
-.It Cm \&[
-Matches a nonempty sequence of characters from the specified set
-of accepted characters;
-the next pointer must be a pointer to
-.Vt char ,
-and there must be enough room for the multibyte representation of
-all the characters in the string,
-plus a terminating
-.Dv NUL
-character.
-The usual skip of leading white space is suppressed.
-The string is to be made up of characters in
-(or not in)
-a particular set;
-the set is defined by the characters between the open bracket
-.Cm \&[
-character
-and a close bracket
-.Cm \&]
-character.
-The set
-.Em excludes
-those characters
-if the first character after the open bracket is a circumflex
-.Cm ^ .
-To include a close bracket in the set,
-make it the first character after the open bracket
-or the circumflex;
-any other position will end the set.
-To include a hyphen in the set,
-make it the last character before the final close bracket;
-some implementations of
-.Fn wscanf
-use
-.Dq Li A-Z
-to represent the range of characters between
-.Ql A
-and
-.Ql Z .
-The string ends with the appearance of a character not in the
-(or, with a circumflex, in) set
-or when the field width runs out.
-.Pp
-If an
-.Cm l
-qualifier is present, the next pointer must be a pointer to
-.Vt wchar_t ,
-into which the input will be placed.
-.It Cm p
-Matches a pointer value (as printed by
-.Ql %p
-in
-.Xr wprintf 3 ) ;
-the next pointer must be a pointer to
-.Vt void .
-.It Cm n
-Nothing is expected;
-instead, the number of characters consumed thus far from the input
-is stored through the next pointer,
-which must be a pointer to
-.Vt int .
-This is
-.Em not
-a conversion, although it can be suppressed with the
-.Cm *
-flag.
-.El
-.Pp
-The decimal point
-character is defined in the program's locale (category
-.Dv LC_NUMERIC ) .
-.Pp
-For backwards compatibility, a
-.Dq conversion
-of
-.Ql %\e0
-causes an immediate return of
-.Dv EOF .
-.Sh RETURN VALUES
-These
-functions
-return
-the number of input items assigned, which can be fewer than provided
-for, or even zero, in the event of a matching failure.
-Zero
-indicates that, while there was input available,
-no conversions were assigned;
-typically this is due to an invalid input character,
-such as an alphabetic character for a
-.Ql %d
-conversion.
-The value
-.Dv EOF
-is returned if an input failure occurs before any conversion such as an
-end-of-file occurs.
-If an error or end-of-file occurs after conversion
-has begun,
-the number of conversions which were successfully completed is returned.
-.Sh SEE ALSO
-.Xr fgetwc 3 ,
-.Xr scanf 3 ,
-.Xr wcrtomb 3 ,
-.Xr wcstod 3 ,
-.Xr wcstol 3 ,
-.Xr wcstoul 3 ,
-.Xr wprintf 3
-.Sh STANDARDS
-The
-.Fn fwscanf ,
-.Fn wscanf ,
-.Fn swscanf ,
-.Fn vfwscanf ,
-.Fn vwscanf
-and
-.Fn vswscanf
-functions
-conform to
-.St -isoC-99 .
-.Sh BUGS
-In addition to the bugs documented in
-.Xr scanf 3 ,
-.Fn wscanf
-does not support the
-.Dq Li A-Z
-notation for specifying character ranges with the character
-class conversion
-.Pq Sq Cm %[ .
diff --git a/lib/libc_bsd/stdio/wscanf.c b/lib/libc_bsd/stdio/wscanf.c
deleted file mode 100644
index 7cec287..0000000
--- a/lib/libc_bsd/stdio/wscanf.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/wscanf.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <xlocale.h>
-
-int
-wscanf(const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf(stdin, fmt, ap);
-	va_end(ap);
-
-	return (r);
-}
-int
-wscanf_l(locale_t locale, const wchar_t * __restrict fmt, ...)
-{
-	va_list ap;
-	int r;
-
-	va_start(ap, fmt);
-	r = vfwscanf_l(stdin, locale, fmt, ap);
-	va_end(ap);
-
-	return (r);
-}
diff --git a/lib/libc_bsd/stdio/wsetup.c b/lib/libc_bsd/stdio/wsetup.c
deleted file mode 100644
index b1983e5..0000000
--- a/lib/libc_bsd/stdio/wsetup.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)wsetup.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdio/wsetup.c 249810 2013-04-23 14:36:44Z emaste $");
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "local.h"
-
-/*
- * Various output routines call wsetup to be sure it is safe to write,
- * because either _flags does not include __SWR, or _buf is NULL.
- * _wsetup returns 0 if OK to write; otherwise, it returns EOF and sets errno.
- */
-int
-__swsetup(FILE *fp)
-{
-	/* make sure stdio is set up */
-	if (!__sdidinit)
-		__sinit();
-
-	/*
-	 * If we are not writing, we had better be reading and writing.
-	 */
-	if ((fp->_flags & __SWR) == 0) {
-		if ((fp->_flags & __SRW) == 0) {
-			errno = EBADF;
-			fp->_flags |= __SERR;
-			return (EOF);
-		}
-		if (fp->_flags & __SRD) {
-			/* clobber any ungetc data */
-			if (HASUB(fp))
-				FREEUB(fp);
-			fp->_flags &= ~(__SRD|__SEOF);
-			fp->_r = 0;
-			fp->_p = fp->_bf._base;
-		}
-		fp->_flags |= __SWR;
-	}
-
-	/*
-	 * Make a buffer if necessary, then set _w.
-	 */
-	if (fp->_bf._base == NULL)
-		__smakebuf(fp);
-	if (fp->_flags & __SLBF) {
-		/*
-		 * It is line buffered, so make _lbfsize be -_bufsize
-		 * for the putc() macro.  We will change _lbfsize back
-		 * to 0 whenever we turn off __SWR.
-		 */
-		fp->_w = 0;
-		fp->_lbfsize = -fp->_bf._size;
-	} else
-		fp->_w = fp->_flags & __SNBF ? 0 : fp->_bf._size;
-	return (0);
-}
diff --git a/lib/libc_bsd/stdio/xprintf.c b/lib/libc_bsd/stdio/xprintf.c
deleted file mode 100644
index 3f62890..0000000
--- a/lib/libc_bsd/stdio/xprintf.c
+++ /dev/null
@@ -1,690 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdio/xprintf.c 238111 2012-07-04 17:35:07Z pjd $
- */
-
-#include "namespace.h"
-#include <err.h>
-#include <sys/types.h>
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <locale.h>
-#include <stdint.h>
-#include <assert.h>
-#include <stdarg.h>
-#include <namespace.h>
-#include <string.h>
-#include <wchar.h>
-#include "un-namespace.h"
-
-#include "local.h"
-#include "printf.h"
-#include "fvwrite.h"
-
-int __use_xprintf = -1;
-
-/* private stuff -----------------------------------------------------*/
-
-union arg {
-	int			intarg;
-	long			longarg;
-	intmax_t 		intmaxarg;
-#ifndef NO_FLOATING_POINT
-	double			doublearg;
-	long double 		longdoublearg;
-#endif
-	wint_t			wintarg;
-	char			*pchararg;
-	wchar_t			*pwchararg;
-	void			*pvoidarg;
-};
-
-/*
- * Macros for converting digits to letters and vice versa
- */
-#define	to_digit(c)	((c) - '0')
-#define is_digit(c)	(((unsigned)to_digit(c)) <= 9)
-
-/* various globals ---------------------------------------------------*/
-
-const char __lowercase_hex[17] = "0123456789abcdef?";	/*lint !e784 */
-const char __uppercase_hex[17] = "0123456789ABCDEF?";	/*lint !e784 */
-
-#define PADSIZE 16
-static char blanks[PADSIZE] =
-	 {' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
-static char zeroes[PADSIZE] =
-	 {'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
-
-/* printing and padding functions ------------------------------------*/
-
-#define NIOV 8
-
-struct __printf_io {
-	FILE		*fp;
-	struct __suio	uio;
-	struct __siov	iov[NIOV];
-	struct __siov	*iovp;
-};
-
-static void
-__printf_init(struct __printf_io *io)
-{
-
-	io->uio.uio_iov = io->iovp = &io->iov[0];
-	io->uio.uio_resid = 0;
-	io->uio.uio_iovcnt = 0;
-}
-
-void
-__printf_flush(struct __printf_io *io)
-{
-
-	__sfvwrite(io->fp, &io->uio);
-	__printf_init(io);
-}
-
-int
-__printf_puts(struct __printf_io *io, const void *ptr, int len)
-{
-
-
-	if (io->fp->_flags & __SERR)
-		return (0);
-	if (len == 0)
-		return (0);
-	io->iovp->iov_base = __DECONST(void *, ptr);
-	io->iovp->iov_len = len;
-	io->uio.uio_resid += len;
-	io->iovp++;
-	io->uio.uio_iovcnt++;
-	if (io->uio.uio_iovcnt >= NIOV)
-		__printf_flush(io);
-	return (len);
-}
-
-int
-__printf_pad(struct __printf_io *io, int howmany, int zero)
-{
-	int n;
-	const char *with;
-	int ret = 0;
-
-	if (zero)
-		with = zeroes;
-	else
-		with = blanks;
-
-	if ((n = (howmany)) > 0) {
-		while (n > PADSIZE) { 
-			ret += __printf_puts(io, with, PADSIZE);
-			n -= PADSIZE;
-		}
-		ret += __printf_puts(io, with, n);
-	}
-	return (ret);
-}
-
-int
-__printf_out(struct __printf_io *io, const struct printf_info *pi, const void *ptr, int len)
-{
-	int ret = 0;
-
-	if ((!pi->left) && pi->width > len)
-		ret += __printf_pad(io, pi->width - len, pi->pad == '0');
-	ret += __printf_puts(io, ptr, len);
-	if (pi->left && pi->width > len)
-		ret += __printf_pad(io, pi->width - len, pi->pad == '0');
-	return (ret);
-}
-
-
-/* percent handling  -------------------------------------------------*/
-
-static int
-__printf_arginfo_pct(const struct printf_info *pi __unused, size_t n __unused, int *argt __unused)
-{
-
-	return (0);
-}
-
-static int
-__printf_render_pct(struct __printf_io *io, const struct printf_info *pi __unused, const void *const *arg __unused)
-{
-
-	return (__printf_puts(io, "%", 1));
-}
-
-/* 'n' ---------------------------------------------------------------*/
-
-static int
-__printf_arginfo_n(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-
-/*
- * This is a printf_render so that all output has been flushed before it
- * gets called.
- */
-
-static int
-__printf_render_n(FILE *io __unused, const struct printf_info *pi, const void *const *arg)
-{
-
-	if (pi->is_char)
-		**((signed char **)arg[0]) = (signed char)pi->sofar;
-	else if (pi->is_short)
-		**((short **)arg[0]) = (short)pi->sofar;
-	else if (pi->is_long)
-		**((long **)arg[0]) = pi->sofar;
-	else if (pi->is_long_double)
-		**((long long **)arg[0]) = pi->sofar;
-	else if (pi->is_intmax)
-		**((intmax_t **)arg[0]) = pi->sofar;
-	else if (pi->is_ptrdiff)
-		**((ptrdiff_t **)arg[0]) = pi->sofar;
-	else if (pi->is_quad)
-		**((quad_t **)arg[0]) = pi->sofar;
-	else if (pi->is_size)
-		**((size_t **)arg[0]) = pi->sofar;
-	else
-		**((int **)arg[0]) = pi->sofar;
-
-	return (0);
-}
-
-/* table -------------------------------------------------------------*/
-
-/*lint -esym(785, printf_tbl) */
-static struct {
-	printf_arginfo_function	*arginfo;
-	printf_function		*gnurender;
-	printf_render		*render;
-} printf_tbl[256] = {
-	['%'] = { __printf_arginfo_pct,		NULL,	__printf_render_pct },
-	['A'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['C'] = { __printf_arginfo_chr,		NULL,	__printf_render_chr },
-	['E'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['F'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['G'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['S'] = { __printf_arginfo_str,		NULL,	__printf_render_str },
-	['X'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['a'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['c'] = { __printf_arginfo_chr,		NULL,	__printf_render_chr },
-	['d'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['e'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['f'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['g'] = { __printf_arginfo_float,	NULL,	__printf_render_float },
-	['i'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['n'] = { __printf_arginfo_n,		__printf_render_n, NULL },
-	['o'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['p'] = { __printf_arginfo_ptr,		NULL,	__printf_render_ptr },
-	['q'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['s'] = { __printf_arginfo_str,		NULL,	__printf_render_str },
-	['u'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-	['x'] = { __printf_arginfo_int,		NULL,	__printf_render_int },
-};
-
-
-static int
-__v2printf(FILE *fp, const char *fmt0, unsigned pct, va_list ap)
-{
-	struct printf_info	*pi, *pil;
-	const char		*fmt;
-	int			ch;
-	struct printf_info	pia[pct + 10];
-	int			argt[pct + 10];
-	union arg		args[pct + 10];
-	int			nextarg;
-	int			maxarg;
-	int			ret = 0;
-	int			n;
-	struct __printf_io	io;
-
-	__printf_init(&io);
-	io.fp = fp;
-
-	fmt = fmt0;
-	maxarg = 0;
-	nextarg = 1;
-	memset(argt, 0, sizeof argt);
-	for (pi = pia; ; pi++) {
-		memset(pi, 0, sizeof *pi);
-		pil = pi;
-		if (*fmt == '\0')
-			break;
-		pil = pi + 1;
-		pi->prec = -1;
-		pi->pad = ' ';
-		pi->begin = pi->end = fmt;
-		while (*fmt != '\0' && *fmt != '%')
-			pi->end = ++fmt;
-		if (*fmt == '\0') 
-			break;
-		fmt++;
-		for (;;) {
-			pi->spec = *fmt;
-			switch (pi->spec) {
-			case ' ':
-				/*-
-				 * ``If the space and + flags both appear, the space
-				 * flag will be ignored.''
-				 *      -- ANSI X3J11
-				 */
-				if (pi->showsign == 0)
-					pi->showsign = ' ';
-				fmt++;
-				continue;
-			case '#':
-				pi->alt = 1;
-				fmt++;
-				continue;
-			case '.':
-				pi->prec = 0;
-				fmt++;
-				if (*fmt == '*') {
-					fmt++;
-					pi->get_prec = nextarg;
-					argt[nextarg++] = PA_INT;
-					continue;
-				}
-				while (*fmt != '\0' && is_digit(*fmt)) {
-					pi->prec *= 10;
-					pi->prec += to_digit(*fmt);
-					fmt++;
-				}
-				continue;
-			case '-':
-				pi->left = 1;
-				fmt++;
-				continue;
-			case '+':
-				pi->showsign = '+';
-				fmt++;
-				continue;
-			case '*':
-				fmt++;
-				pi->get_width = nextarg;
-				argt[nextarg++] = PA_INT;
-				continue;
-			case '%':
-				fmt++;
-				break;
-			case '\'':
-				pi->group = 1;
-				fmt++;
-				continue;
-			case '0':
-				/*-
-				 * ``Note that 0 is taken as a flag, not as the
-				 * beginning of a field width.''
-				 *      -- ANSI X3J11
-				 */
-				pi->pad = '0';
-				fmt++;
-				continue;
-			case '1': case '2': case '3':
-			case '4': case '5': case '6':
-			case '7': case '8': case '9':
-				n = 0;
-				while (*fmt != '\0' && is_digit(*fmt)) {
-					n *= 10;
-					n += to_digit(*fmt);
-					fmt++;
-				}
-				if (*fmt == '$') {
-					if (nextarg > maxarg)
-						maxarg = nextarg;
-					nextarg = n;
-					fmt++;
-				} else 
-					pi->width = n;
-				continue;
-			case 'D':
-			case 'O':
-			case 'U':
-				pi->spec += ('a' - 'A');
-				pi->is_intmax = 0;
-				if (pi->is_long_double || pi->is_quad) {
-					pi->is_long = 0;
-					pi->is_long_double = 1;
-				} else {
-					pi->is_long = 1;
-					pi->is_long_double = 0;
-				}
-				fmt++;
-				break;
-			case 'j':
-				pi->is_intmax = 1;
-				fmt++;
-				continue;
-			case 'q':
-				pi->is_long = 0;
-				pi->is_quad = 1;
-				fmt++;
-				continue;
-			case 'L':
-				pi->is_long_double = 1;
-				fmt++;
-				continue;
-			case 'h':
-				fmt++;
-				if (*fmt == 'h') {
-					fmt++;
-					pi->is_char = 1;
-				} else {
-					pi->is_short = 1;
-				}
-				continue;
-			case 'l':
-				fmt++;
-				if (*fmt == 'l') {
-					fmt++;
-					pi->is_long_double = 1;
-					pi->is_quad = 0;
-				} else {
-					pi->is_quad = 0;
-					pi->is_long = 1;
-				}
-				continue;
-			case 't':
-				pi->is_ptrdiff = 1;
-				fmt++;
-				continue;
-			case 'z':
-				pi->is_size = 1;
-				fmt++;
-				continue;
-			default:
-				fmt++;
-				break;
-			}
-			if (printf_tbl[pi->spec].arginfo == NULL)
-				errx(1, "arginfo[%c] = NULL", pi->spec);
-			ch = printf_tbl[pi->spec].arginfo(
-			    pi, __PRINTFMAXARG, &argt[nextarg]);
-			if (ch > 0)
-				pi->arg[0] = &args[nextarg];
-			if (ch > 1)
-				pi->arg[1] = &args[nextarg + 1];
-			nextarg += ch;
-			break;
-		}
-	}
-	if (nextarg > maxarg)
-		maxarg = nextarg;
-#if 0
-	fprintf(stderr, "fmt0 <%s>\n", fmt0);
-	fprintf(stderr, "pil %p\n", pil);
-#endif
-	for (ch = 1; ch < maxarg; ch++) {
-#if 0
-		fprintf(stderr, "arg %d %x\n", ch, argt[ch]);
-#endif
-		switch(argt[ch]) {
-		case PA_CHAR:
-			args[ch].intarg = (char)va_arg (ap, int);
-			break;
-		case PA_INT:
-			args[ch].intarg = va_arg (ap, int);
-			break;
-		case PA_INT | PA_FLAG_SHORT:
-			args[ch].intarg = (short)va_arg (ap, int);
-			break;
-		case PA_INT | PA_FLAG_LONG:
-			args[ch].longarg = va_arg (ap, long);
-			break;
-		case PA_INT | PA_FLAG_INTMAX:
-			args[ch].intmaxarg = va_arg (ap, intmax_t);
-			break;
-		case PA_INT | PA_FLAG_QUAD:
-			args[ch].intmaxarg = va_arg (ap, quad_t);
-			break;
-		case PA_INT | PA_FLAG_LONG_LONG:
-			args[ch].intmaxarg = va_arg (ap, long long);
-			break;
-		case PA_INT | PA_FLAG_SIZE:
-			args[ch].intmaxarg = va_arg (ap, size_t);
-			break;
-		case PA_INT | PA_FLAG_PTRDIFF:
-			args[ch].intmaxarg = va_arg (ap, ptrdiff_t);
-			break;
-		case PA_WCHAR:
-			args[ch].wintarg = va_arg (ap, wint_t);
-			break;
-		case PA_POINTER:
-			args[ch].pvoidarg = va_arg (ap, void *);
-			break;
-		case PA_STRING:
-			args[ch].pchararg = va_arg (ap, char *);
-			break;
-		case PA_WSTRING:
-			args[ch].pwchararg = va_arg (ap, wchar_t *);
-			break;
-		case PA_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			args[ch].doublearg = va_arg (ap, double);
-#endif
-			break;
-		case PA_DOUBLE | PA_FLAG_LONG_DOUBLE:
-#ifndef NO_FLOATING_POINT
-			args[ch].longdoublearg = va_arg (ap, long double);
-#endif
-			break;
-		default:
-			errx(1, "argtype = %x (fmt = \"%s\")\n",
-			    argt[ch], fmt0);
-		}
-	}
-	for (pi = pia; pi < pil; pi++) {
-#if 0
-		fprintf(stderr, "pi %p", pi);
-		fprintf(stderr, " spec '%c'", pi->spec);
-		fprintf(stderr, " args %d",
-		    ((uintptr_t)pi->arg[0] - (uintptr_t)args) / sizeof args[0]);
-		if (pi->width) fprintf(stderr, " width %d", pi->width);
-		if (pi->pad) fprintf(stderr, " pad 0x%x", pi->pad);
-		if (pi->left) fprintf(stderr, " left");
-		if (pi->showsign) fprintf(stderr, " showsign");
-		if (pi->prec != -1) fprintf(stderr, " prec %d", pi->prec);
-		if (pi->is_char) fprintf(stderr, " char");
-		if (pi->is_short) fprintf(stderr, " short");
-		if (pi->is_long) fprintf(stderr, " long");
-		if (pi->is_long_double) fprintf(stderr, " long_double");
-		fprintf(stderr, "\n");
-		fprintf(stderr, "\t\"%.*s\"\n", pi->end - pi->begin, pi->begin);
-#endif
-		if (pi->get_width) {
-			pi->width = args[pi->get_width].intarg;
-			/*-
-			 * ``A negative field width argument is taken as a
-			 * - flag followed by a positive field width.''
-			 *      -- ANSI X3J11
-			 * They don't exclude field widths read from args.
-			 */
-			if (pi->width < 0) {
-				pi->left = 1;
-				pi->width = -pi->width;
-			}
-		}
-		if (pi->get_prec) 
-			pi->prec = args[pi->get_prec].intarg;
-		ret += __printf_puts(&io, pi->begin, pi->end - pi->begin);
-		if (printf_tbl[pi->spec].gnurender != NULL) {
-			__printf_flush(&io);
-			pi->sofar = ret;
-			ret += printf_tbl[pi->spec].gnurender(
-			    fp, pi, (const void *)pi->arg);
-		} else if (printf_tbl[pi->spec].render != NULL) {
-			pi->sofar = ret;
-			n = printf_tbl[pi->spec].render(
-			    &io, pi, (const void *)pi->arg);
-			if (n < 0)
-				io.fp->_flags |= __SERR;
-			else
-				ret += n;
-		} else if (pi->begin == pi->end)
-			errx(1, "render[%c] = NULL", *fmt);
-	}
-	__printf_flush(&io);
-	return (ret);
-}
-
-extern int      __fflush(FILE *fp);
-
-/*
- * Helper function for `fprintf to unbuffered unix file': creates a
- * temporary buffer.  We only work on write-only files; this avoids
- * worries about ungetc buffers and so forth.
- */
-static int
-__v3printf(FILE *fp, const char *fmt, int pct, va_list ap)
-{
-	int ret;
-	FILE fake = FAKE_FILE;
-	unsigned char buf[BUFSIZ];
-
-	/* copy the important variables */
-	fake._flags = fp->_flags & ~__SNBF;
-	fake._file = fp->_file;
-	fake._cookie = fp->_cookie;
-	fake._write = fp->_write;
-	fake._orientation = fp->_orientation;
-	fake._mbstate = fp->_mbstate;
-
-	/* set up the buffer */
-	fake._bf._base = fake._p = buf;
-	fake._bf._size = fake._w = sizeof(buf);
-	fake._lbfsize = 0;	/* not actually used, but Just In Case */
-
-	/* do the work, then copy any error status */
-	ret = __v2printf(&fake, fmt, pct, ap);
-	if (ret >= 0 && __fflush(&fake))
-		ret = EOF;
-	if (fake._flags & __SERR)
-		fp->_flags |= __SERR;
-	return (ret);
-}
-
-int
-__xvprintf(FILE *fp, const char *fmt0, va_list ap)
-{
-	unsigned u;
-	const char *p;
-
-	/* Count number of '%' signs handling double '%' signs */
-	for (p = fmt0, u = 0; *p; p++) {
-		if (*p != '%')
-			continue;
-		u++;
-		if (p[1] == '%')
-			p++;
-	}
-
-	/* optimise fprintf(stderr) (and other unbuffered Unix files) */
-	if ((fp->_flags & (__SNBF|__SWR|__SRW)) == (__SNBF|__SWR) &&
-	    fp->_file >= 0)
-		return (__v3printf(fp, fmt0, u, ap));
-	else
-		return (__v2printf(fp, fmt0, u, ap));
-}
-
-/* extending ---------------------------------------------------------*/
-
-int
-register_printf_function(int spec, printf_function *render, printf_arginfo_function *arginfo)
-{
-
-	if (spec > 255 || spec < 0)
-		return (-1);
-	printf_tbl[spec].gnurender = render;
-	printf_tbl[spec].arginfo = arginfo;
-	__use_xprintf = 1;
-	return (0);
-}
-
-int
-register_printf_render(int spec, printf_render *render, printf_arginfo_function *arginfo)
-{
-
-	if (spec > 255 || spec < 0)
-		return (-1);
-	printf_tbl[spec].render = render;
-	printf_tbl[spec].arginfo = arginfo;
-	__use_xprintf = 1;
-	return (0);
-}
-
-int
-register_printf_render_std(const char *specs)
-{
-
-	for (; *specs != '\0'; specs++) {
-		switch (*specs) {
-		case 'H':
-			register_printf_render(*specs,
-			    __printf_render_hexdump,
-			    __printf_arginfo_hexdump);
-			break;
-		case 'M':
-			register_printf_render(*specs,
-			    __printf_render_errno,
-			    __printf_arginfo_errno);
-			break;
-		case 'Q':
-			register_printf_render(*specs,
-			    __printf_render_quote,
-			    __printf_arginfo_quote);
-			break;
-		case 'T':
-			register_printf_render(*specs,
-			    __printf_render_time,
-			    __printf_arginfo_time);
-			break;
-		case 'V':
-			register_printf_render(*specs,
-			    __printf_render_vis,
-			    __printf_arginfo_vis);
-			break;
-		default:
-			return (-1);
-		}
-	}
-	return (0);
-}
-
diff --git a/lib/libc_bsd/stdio/xprintf_errno.c b/lib/libc_bsd/stdio/xprintf_errno.c
deleted file mode 100644
index 02da161..0000000
--- a/lib/libc_bsd/stdio/xprintf_errno.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/lib/libc/stdio/xprintf_errno.c 255108 2013-08-31 22:32:42Z jilles $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <vis.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "errlst.h"
-#include "printf.h"
-
-int
-__printf_arginfo_errno(const struct printf_info *pi __unused, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_INT;
-	return (1);
-}
-
-int
-__printf_render_errno(struct __printf_io *io, const struct printf_info *pi __unused, const void *const *arg)
-{
-	int ret, error;
-	char buf[64];
-	const char *p;
-
-	ret = 0;
-	error = *((const int *)arg[0]);
-	if (error >= 0 && error < __hidden_sys_nerr) {
-		p = strerror(error);
-		return (__printf_out(io, pi, p, strlen(p)));
-	}
-	sprintf(buf, "errno=%d/0x%x", error, error);
-	ret += __printf_out(io, pi, buf, strlen(buf));
-	__printf_flush(io);
-	return(ret);
-}
diff --git a/lib/libc_bsd/stdio/xprintf_float.c b/lib/libc_bsd/stdio/xprintf_float.c
deleted file mode 100644
index a33bf9e..0000000
--- a/lib/libc_bsd/stdio/xprintf_float.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdio/xprintf_float.c 153486 2005-12-16 18:56:39Z phk $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <assert.h>
-#include <locale.h>
-#include <limits.h>
-
-#define	dtoa		__dtoa
-#define	freedtoa	__freedtoa
-
-#include <float.h>
-#include <math.h>
-#include "gdtoa.h"
-#include "floatio.h"
-#include "printf.h"
-#include <un-namespace.h>
-
-/*
- * The size of the buffer we use as scratch space for integer
- * conversions, among other things.  Technically, we would need the
- * most space for base 10 conversions with thousands' grouping
- * characters between each pair of digits.  100 bytes is a
- * conservative overestimate even for a 128-bit uintmax_t.
- */
-#define	BUF	100
-
-#define	DEFPREC		6	/* Default FP precision */
-
-
-/* various globals ---------------------------------------------------*/
-
-
-/* padding function---------------------------------------------------*/
-
-#define	PRINTANDPAD(p, ep, len, with) do {		\
-	n2 = (ep) - (p);       				\
-	if (n2 > (len))					\
-		n2 = (len);				\
-	if (n2 > 0)					\
-		ret += __printf_puts(io, (p), n2);		\
-	ret += __printf_pad(io, (len) - (n2 > 0 ? n2 : 0), (with));	\
-} while(0)
-
-/* misc --------------------------------------------------------------*/
-
-#define	to_char(n)	((n) + '0')
-
-static int
-exponent(char *p0, int expo, int fmtch)
-{
-	char *p, *t;
-	char expbuf[MAXEXPDIG];
-
-	p = p0;
-	*p++ = fmtch;
-	if (expo < 0) {
-		expo = -expo;
-		*p++ = '-';
-	}
-	else
-		*p++ = '+';
-	t = expbuf + MAXEXPDIG;
-	if (expo > 9) {
-		do {
-			*--t = to_char(expo % 10);
-		} while ((expo /= 10) > 9);
-		*--t = to_char(expo);
-		for (; t < expbuf + MAXEXPDIG; *p++ = *t++)
-			;
-	}
-	else {
-		/*
-		 * Exponents for decimal floating point conversions
-		 * (%[eEgG]) must be at least two characters long,
-		 * whereas exponents for hexadecimal conversions can
-		 * be only one character long.
-		 */
-		if (fmtch == 'e' || fmtch == 'E')
-			*p++ = '0';
-		*p++ = to_char(expo);
-	}
-	return (p - p0);
-}
-
-/* 'f' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_float(const struct printf_info *pi, size_t n, int *argt)
-{
-	assert (n > 0);
-	argt[0] = PA_DOUBLE;
-	if (pi->is_long_double)
-		argt[0] |= PA_FLAG_LONG_DOUBLE;
-	return (1);
-}
-
-/*
- * We can decompose the printed representation of floating
- * point numbers into several parts, some of which may be empty:
- *
- * [+|-| ] [0x|0X] MMM . NNN [e|E|p|P] [+|-] ZZ
- *    A       B     ---C---      D       E   F
- *
- * A:	'sign' holds this value if present; '\0' otherwise
- * B:	ox[1] holds the 'x' or 'X'; '\0' if not hexadecimal
- * C:	cp points to the string MMMNNN.  Leading and trailing
- *	zeros are not in the string and must be added.
- * D:	expchar holds this character; '\0' if no exponent, e.g. %f
- * F:	at least two digits for decimal, at least one digit for hex
- */
-
-int
-__printf_render_float(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	int prec;		/* precision from format; <0 for N/A */
-	char *dtoaresult;	/* buffer allocated by dtoa */
-	char expchar;		/* exponent character: [eEpP\0] */
-	char *cp;
-	int expt;		/* integer value of exponent */
-	int signflag;		/* true if float is negative */
-	char *dtoaend;		/* pointer to end of converted digits */
-	char sign;		/* sign prefix (' ', '+', '-', or \0) */
-	int size;		/* size of converted field or string */
-	int ndig;		/* actual number of digits returned by dtoa */
-	int expsize;		/* character count for expstr */
-	char expstr[MAXEXPDIG+2];	/* buffer for exponent string: e+ZZZ */
-	int nseps;		/* number of group separators with ' */
-	int nrepeats;		/* number of repeats of the last group */
-	const char *grouping;	/* locale specific numeric grouping rules */
-	int lead;		/* sig figs before decimal or group sep */
-	long double ld;
-	double d;
-	int realsz;		/* field size expanded by dprec, sign, etc */
-	int dprec;		/* a copy of prec if [diouxX], 0 otherwise */
-	char ox[2];		/* space for 0x; ox[1] is either x, X, or \0 */
-	int prsize;             /* max size of printed field */
-	int ret;		/* return value accumulator */
-	char *decimal_point;	/* locale specific decimal point */
-	int n2;			/* XXX: for PRINTANDPAD */
-	char thousands_sep;	/* locale specific thousands separator */
-	char buf[BUF];		/* buffer with space for digits of uintmax_t */
-	const char *xdigs;
-	int flag;
-
-	prec = pi->prec;
-	ox[1] = '\0';
-	sign = pi->showsign;
-	flag = 0;
-	ret = 0;
-
-	thousands_sep = *(localeconv()->thousands_sep);
-	grouping = NULL;
-	if (pi->alt)
-		grouping = localeconv()->grouping;
-	decimal_point = localeconv()->decimal_point;
-	dprec = -1;
-
-	switch(pi->spec) {
-	case 'a':
-	case 'A':
-		if (pi->spec == 'a') {
-			ox[1] = 'x';
-			xdigs = __lowercase_hex;
-			expchar = 'p';
-		} else {
-			ox[1] = 'X';
-			xdigs = __uppercase_hex;
-			expchar = 'P';
-		}
-		if (prec >= 0)
-			prec++;
-		if (pi->is_long_double) {
-			ld = *((long double *)arg[0]);
-			dtoaresult = cp =
-			    __hldtoa(ld, xdigs, prec,
-			    &expt, &signflag, &dtoaend);
-		} else {
-			d = *((double *)arg[0]);
-			dtoaresult = cp =
-			    __hdtoa(d, xdigs, prec,
-			    &expt, &signflag, &dtoaend);
-		}
-		if (prec < 0)
-			prec = dtoaend - cp;
-		if (expt == INT_MAX)
-			ox[1] = '\0';
-		goto fp_common;
-	case 'e':
-	case 'E':
-		expchar = pi->spec;
-		if (prec < 0)	/* account for digit before decpt */
-			prec = DEFPREC + 1;
-		else
-			prec++;
-		break;
-	case 'f':
-	case 'F':
-		expchar = '\0';
-		break;
-	case 'g':
-	case 'G':
-		expchar = pi->spec - ('g' - 'e');
-		if (prec == 0)
-			prec = 1;
-		break;
-	default:
-		assert(pi->spec == 'f');
-	}
-
-	if (prec < 0)
-		prec = DEFPREC;
-	if (pi->is_long_double) {
-		ld = *((long double *)arg[0]);
-		dtoaresult = cp =
-		    __ldtoa(&ld, expchar ? 2 : 3, prec,
-		    &expt, &signflag, &dtoaend);
-	} else {
-		d = *((double *)arg[0]);
-		dtoaresult = cp =
-		    dtoa(d, expchar ? 2 : 3, prec,
-		    &expt, &signflag, &dtoaend);
-		if (expt == 9999)
-			expt = INT_MAX;
-	}
-fp_common:
-	if (signflag)
-		sign = '-';
-	if (expt == INT_MAX) {	/* inf or nan */
-		if (*cp == 'N') {
-			cp = (pi->spec >= 'a') ? "nan" : "NAN";
-			sign = '\0';
-		} else
-			cp = (pi->spec >= 'a') ? "inf" : "INF";
-		size = 3;
-		flag = 1;
-		goto here;
-	}
-	ndig = dtoaend - cp;
-	if (pi->spec == 'g' || pi->spec == 'G') {
-		if (expt > -4 && expt <= prec) {
-			/* Make %[gG] smell like %[fF] */
-			expchar = '\0';
-			if (pi->alt)
-				prec -= expt;
-			else
-				prec = ndig - expt;
-			if (prec < 0)
-				prec = 0;
-		} else {
-			/*
-			 * Make %[gG] smell like %[eE], but
-			 * trim trailing zeroes if no # flag.
-			 */
-			if (!pi->alt)
-				prec = ndig;
-		}
-	}
-	if (expchar) {
-		expsize = exponent(expstr, expt - 1, expchar);
-		size = expsize + prec;
-		if (prec > 1 || pi->alt)
-			++size;
-	} else {
-		/* space for digits before decimal point */
-		if (expt > 0)
-			size = expt;
-		else	/* "0" */
-			size = 1;
-		/* space for decimal pt and following digits */
-		if (prec || pi->alt)
-			size += prec + 1;
-		if (grouping && expt > 0) {
-			/* space for thousands' grouping */
-			nseps = nrepeats = 0;
-			lead = expt;
-			while (*grouping != CHAR_MAX) {
-				if (lead <= *grouping)
-					break;
-				lead -= *grouping;
-				if (*(grouping+1)) {
-					nseps++;
-					grouping++;
-				} else
-					nrepeats++;
-			}
-			size += nseps + nrepeats;
-		} else
-			lead = expt;
-	}
-
-here:
-	/*
-	 * All reasonable formats wind up here.  At this point, `cp'
-	 * points to a string which (if not flags&LADJUST) should be
-	 * padded out to `width' places.  If flags&ZEROPAD, it should
-	 * first be prefixed by any sign or other prefix; otherwise,
-	 * it should be blank padded before the prefix is emitted.
-	 * After any left-hand padding and prefixing, emit zeroes
-	 * required by a decimal [diouxX] precision, then print the
-	 * string proper, then emit zeroes required by any leftover
-	 * floating precision; finally, if LADJUST, pad with blanks.
-	 *
-	 * Compute actual size, so we know how much to pad.
-	 * size excludes decimal prec; realsz includes it.
-	 */
-	realsz = dprec > size ? dprec : size;
-	if (sign)
-		realsz++;
-	if (ox[1])
-		realsz += 2;
-
-	prsize = pi->width > realsz ? pi->width : realsz;
-
-	/* right-adjusting blank padding */
-	if (pi->pad != '0' && pi->left == 0)
-		ret += __printf_pad(io, pi->width - realsz, 0);
-
-	/* prefix */
-	if (sign)
-		ret += __printf_puts(io, &sign, 1);
-
-	if (ox[1]) {	/* ox[1] is either x, X, or \0 */
-		ox[0] = '0';
-		ret += __printf_puts(io, ox, 2);
-	}
-
-	/* right-adjusting zero padding */
-	if (pi->pad == '0' && pi->left == 0)
-		ret += __printf_pad(io, pi->width - realsz, 1);
-
-	/* leading zeroes from decimal precision */
-	ret += __printf_pad(io, dprec - size, 1);
-
-	if (flag)
-		ret += __printf_puts(io, cp, size);
-	else {
-		/* glue together f_p fragments */
-		if (!expchar) {	/* %[fF] or sufficiently short %[gG] */
-			if (expt <= 0) {
-				ret += __printf_puts(io, "0", 1);
-				if (prec || pi->alt)
-					ret += __printf_puts(io, decimal_point, 1);
-				ret += __printf_pad(io, -expt, 1);
-				/* already handled initial 0's */
-				prec += expt;
-			} else {
-				PRINTANDPAD(cp, dtoaend, lead, 1);
-				cp += lead;
-				if (grouping) {
-					while (nseps>0 || nrepeats>0) {
-						if (nrepeats > 0)
-							nrepeats--;
-						else {
-							grouping--;
-							nseps--;
-						}
-						ret += __printf_puts(io, &thousands_sep, 1);
-						PRINTANDPAD(cp,dtoaend,
-						    *grouping, 1);
-						cp += *grouping;
-					}
-					if (cp > dtoaend)
-						cp = dtoaend;
-				}
-				if (prec || pi->alt)
-					ret += __printf_puts(io, decimal_point,1);
-			}
-			PRINTANDPAD(cp, dtoaend, prec, 1);
-		} else {	/* %[eE] or sufficiently long %[gG] */
-			if (prec > 1 || pi->alt) {
-				buf[0] = *cp++;
-				buf[1] = *decimal_point;
-				ret += __printf_puts(io, buf, 2);
-				ret += __printf_puts(io, cp, ndig-1);
-				ret += __printf_pad(io, prec - ndig, 1);
-			} else	/* XeYYY */
-				ret += __printf_puts(io, cp, 1);
-			ret += __printf_puts(io, expstr, expsize);
-		}
-	}
-	/* left-adjusting padding (always blank) */
-	if (pi->left)
-		ret += __printf_pad(io, pi->width - realsz, 0);
-
-	__printf_flush(io);
-	if (dtoaresult != NULL)
-		freedtoa(dtoaresult);
-
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/xprintf_hexdump.c b/lib/libc_bsd/stdio/xprintf_hexdump.c
deleted file mode 100644
index e488ccc..0000000
--- a/lib/libc_bsd/stdio/xprintf_hexdump.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/lib/libc/stdio/xprintf_hexdump.c 153486 2005-12-16 18:56:39Z phk $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <stdint.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "printf.h"
-
-int
-__printf_arginfo_hexdump(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert(n >= 2);
-	argt[0] = PA_POINTER;
-	argt[1] = PA_INT;
-	return (2);
-}
-
-int
-__printf_render_hexdump(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	unsigned char *p;
-	unsigned u, l, j, a;
-	char buf[100], *q;
-	int ret;
-
-	if (pi->width > 0 && pi->width < 16)
-		l = pi->width;
-	else
-		l = 16;
-	p = *((unsigned char **)arg[0]);
-	u = *((unsigned *)arg[1]);
-
-	ret = 0;
-	a = 0;
-	while (u > 0) {
-		q = buf;
-		if (pi->showsign)
-			q += sprintf(q, " %04x", a);
-		for (j = 0; j < l && j < u; j++)
-			q += sprintf(q, " %02x", p[j]);
-		if (pi->alt) {
-			for (; j < l; j++)
-				q += sprintf(q, "   ");
-			q += sprintf(q, "  |");
-			for (j = 0; j < l && j < u; j++) {
-				if (p[j] < ' ' || p[j] > '~')
-					*q++ = '.';
-				else
-					*q++ = p[j];
-			}
-			for (; j < l; j++)
-				*q++ = ' ';
-			*q++ = '|';
-		}
-		if (l < u)
-			j = l;
-		else
-			j = u;
-		p += j;
-		u -= j;
-		a += j;
-		if (u > 0)
-			*q++ = '\n';
-		ret += __printf_puts(io, buf + 1, q - (buf + 1));
-		__printf_flush(io);
-	}
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/xprintf_int.c b/lib/libc_bsd/stdio/xprintf_int.c
deleted file mode 100644
index 08e22b6..0000000
--- a/lib/libc_bsd/stdio/xprintf_int.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdio/xprintf_int.c 153641 2005-12-22 14:23:54Z cognet $
- */
-
-#include <namespace.h>
-#include <err.h>
-#include <sys/types.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
-#include <locale.h>
-#include <stdint.h>
-#include <assert.h>
-#include <namespace.h>
-#include <string.h>
-#include <wchar.h>
-#include <un-namespace.h>
-
-#include "printf.h"
-
-/* private stuff -----------------------------------------------------*/
-
-union arg {
-	int			intarg;
-	u_int			uintarg;
-	long			longarg;
-	u_long			ulongarg;
-	intmax_t 		intmaxarg;
-	uintmax_t 		uintmaxarg;
-};
-
-/*
- * Macros for converting digits to letters and vice versa
- */
-#define	to_char(n)	((n) + '0')
-
-/* various globals ---------------------------------------------------*/
-
-/*
- * The size of the buffer we use for integer conversions.
- * Technically, we would need the most space for base 10
- * conversions with thousands' grouping characters between
- * each pair of digits: 60 digits for 128 bit intmax_t.
- * Use a bit more for better alignment of stuff.
- */
-#define	BUF	64
-
-/* misc --------------------------------------------------------------*/
-
-/*
- * Convert an unsigned long to ASCII for printf purposes, returning
- * a pointer to the first character of the string representation.
- * Octal numbers can be forced to have a leading zero; hex numbers
- * use the given digits.
- */
-static char *
-__ultoa(u_long val, char *endp, int base, const char *xdigs,
-	int needgrp, char thousep, const char *grp)
-{
-	char *cp = endp;
-	long sval;
-	int ndig;
-
-	/*
-	 * Handle the three cases separately, in the hope of getting
-	 * better/faster code.
-	 */
-	switch (base) {
-	case 10:
-		if (val < 10) {	/* many numbers are 1 digit */
-			*--cp = to_char(val);
-			return (cp);
-		}
-		ndig = 0;
-		/*
-		 * On many machines, unsigned arithmetic is harder than
-		 * signed arithmetic, so we do at most one unsigned mod and
-		 * divide; this is sufficient to reduce the range of
-		 * the incoming value to where signed arithmetic works.
-		 */
-		if (val > LONG_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp && ndig == *grp && *grp != CHAR_MAX
-					&& sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:			/* oops */
-		assert(base == 16);
-	}
-	return (cp);
-}
-
-
-/* Identical to __ultoa, but for intmax_t. */
-static char *
-__ujtoa(uintmax_t val, char *endp, int base, const char *xdigs, 
-	int needgrp, char thousep, const char *grp)
-{
-	char *cp = endp;
-	intmax_t sval;
-	int ndig;
-
-	switch (base) {
-	case 10:
-		if (val < 10) {
-			*--cp = to_char(val % 10);
-			return (cp);
-		}
-		ndig = 0;
-		if (val > INTMAX_MAX) {
-			*--cp = to_char(val % 10);
-			ndig++;
-			sval = val / 10;
-		} else
-			sval = val;
-		do {
-			*--cp = to_char(sval % 10);
-			ndig++;
-			/*
-			 * If (*grp == CHAR_MAX) then no more grouping
-			 * should be performed.
-			 */
-			if (needgrp && *grp != CHAR_MAX && ndig == *grp
-					&& sval > 9) {
-				*--cp = thousep;
-				ndig = 0;
-				/*
-				 * If (*(grp+1) == '\0') then we have to
-				 * use *grp character (last grouping rule)
-				 * for all next cases
-				 */
-				if (*(grp+1) != '\0')
-					grp++;
-			}
-			sval /= 10;
-		} while (sval != 0);
-		break;
-
-	case 8:
-		do {
-			*--cp = to_char(val & 7);
-			val >>= 3;
-		} while (val);
-		break;
-
-	case 16:
-		do {
-			*--cp = xdigs[val & 15];
-			val >>= 4;
-		} while (val);
-		break;
-
-	default:
-		abort();
-	}
-	return (cp);
-}
-
-
-/* 'd' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_int(const struct printf_info *pi, size_t n, int *argt)
-{
-	assert (n > 0);
-	argt[0] = PA_INT;
-	if (pi->is_ptrdiff)
-		argt[0] |= PA_FLAG_PTRDIFF;
-	else if (pi->is_size)
-		argt[0] |= PA_FLAG_SIZE;
-	else if (pi->is_long)
-		argt[0] |= PA_FLAG_LONG;
-	else if (pi->is_intmax)
-		argt[0] |= PA_FLAG_INTMAX;
-	else if (pi->is_quad)
-		argt[0] |= PA_FLAG_QUAD;
-	else if (pi->is_long_double)
-		argt[0] |= PA_FLAG_LONG_LONG;
-	else if (pi->is_short)
-		argt[0] |= PA_FLAG_SHORT;
-	else if (pi->is_char)
-		argt[0] = PA_CHAR;
-	return (1);
-}
-
-int
-__printf_render_int(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	const union arg *argp;
-	char buf[BUF];
-	char *p, *pe;
-	char ns, l;
-	int rdx, sign, zext, ngrp;
-	const char *nalt, *digit;
-	char thousands_sep;	/* locale specific thousands separator */
-	const char *grouping;	/* locale specific numeric grouping rules */
-	uintmax_t uu;
-	int ret;
-
-	ret = 0;
-	nalt = NULL;
-	digit = __lowercase_hex;
-	ns = '\0';
-	pe = buf + sizeof buf - 1;
-
-	if (pi->group) {
-		thousands_sep = *(localeconv()->thousands_sep);
-		grouping = localeconv()->grouping;
-		ngrp = 1;
-	} else {
-		thousands_sep = 0;
-		grouping = NULL;
-		ngrp = 0;
-	}
-
-	switch(pi->spec) {
-	case 'd':
-	case 'i':
-		rdx = 10;
-		sign = 1;
-		break;
-	case 'X':
-		digit = __uppercase_hex;
-		/*FALLTHOUGH*/
-	case 'x':
-		rdx = 16;
-		sign = 0;
-		break;
-	case 'u':
-	case 'U':
-		rdx = 10;
-		sign = 0;
-		break;
-	case 'o':
-	case 'O':
-		rdx = 8;
-		sign = 0;
-		break;
-	default:
-		fprintf(stderr, "pi->spec = '%c'\n", pi->spec);
-		assert(1 == 0);
-	}
-	argp = arg[0];
-
-	if (sign)
-		ns = pi->showsign;
-
-	if (pi->is_long_double || pi->is_quad || pi->is_intmax ||
-	    pi->is_size || pi->is_ptrdiff) {
-		if (sign && argp->intmaxarg < 0) {
-			uu = -argp->intmaxarg;
-			ns = '-';
-		} else
-			uu = argp->uintmaxarg;
-	} else if (pi->is_long) {
-		if (sign && argp->longarg < 0) {
-			uu = (u_long)-argp->longarg;
-			ns = '-';
-		} else 
-			uu = argp->ulongarg;
-	} else if (pi->is_short) {
-		if (sign && (short)argp->intarg < 0) {
-			uu = -(short)argp->intarg;
-			ns = '-';
-		} else 
-			uu = (unsigned short)argp->uintarg;
-	} else if (pi->is_char) {
-		if (sign && (signed char)argp->intarg < 0) {
-			uu = -(signed char)argp->intarg;
-			ns = '-';
-		} else 
-			uu = (unsigned char)argp->uintarg;
-	} else {
-		if (sign && argp->intarg < 0) {
-			uu = (unsigned)-argp->intarg;
-			ns = '-';
-		} else
-			uu = argp->uintarg;
-	}
-	if (uu <= ULONG_MAX)
-		p = __ultoa(uu, pe, rdx, digit, ngrp, thousands_sep, grouping);
-	else
-		p = __ujtoa(uu, pe, rdx, digit, ngrp, thousands_sep, grouping);
-
-	l = 0;
-	if (uu == 0) {
-		/*-
-		 * ``The result of converting a zero value with an
-		 * explicit precision of zero is no characters.''
-		 *      -- ANSI X3J11
-		 *
-		 * ``The C Standard is clear enough as is.  The call
-		 * printf("%#.0o", 0) should print 0.''
-		 *      -- Defect Report #151
-		 */
-			;
-		if (pi->prec == 0 && !(pi->alt && rdx == 8))
-			p = pe;
-	} else if (pi->alt) {
-		if (rdx == 8) 
-			*--p = '0';
-		if (rdx == 16) {
-			if (pi->spec == 'x')
-				nalt = "0x";
-			else
-				nalt = "0X";
-			l += 2;
-		}
-	}
-	l += pe - p;
-	if (ns)
-		l++;
-
-	/*-
-	 * ``... diouXx conversions ... if a precision is
-	 * specified, the 0 flag will be ignored.''
-	 *      -- ANSI X3J11
-	 */
-	if (pi->prec > (pe - p))
-		zext = pi->prec - (pe - p);
-	else if (pi->prec != -1)
-		zext = 0;
-	else if (pi->pad == '0' && pi->width > l && !pi->left)
-		zext = pi->width - l;
-	else
-		zext = 0;
-
-	l += zext;
-
-	while (zext > 0 && p > buf) {
-		*--p = '0';
-		zext--;
-	}
-
-	if (l < BUF) {
-		if (ns) {
-			*--p = ns;
-		} else if (nalt != NULL) {
-			*--p = nalt[1];
-			*--p = nalt[0];
-		}
-		if (pi->width > (pe - p) && !pi->left) {
-			l = pi->width - (pe - p);
-			while (l > 0 && p > buf) {
-				*--p = ' ';
-				l--;
-			}
-			if (l)
-				ret += __printf_pad(io, l, 0);
-		}
-	} else {
-		if (!pi->left && pi->width > l)
-			ret += __printf_pad(io, pi->width - l, 0);
-		if (ns != '\0')
-			ret += __printf_puts(io, &ns, 1);
-		else if (nalt != NULL)
-			ret += __printf_puts(io, nalt, 2);
-		if (zext > 0)
-			ret += __printf_pad(io, zext, 1);
-	}
-	
-	ret += __printf_puts(io, p, pe - p);
-	if (pi->width > ret && pi->left) 
-		ret += __printf_pad(io, pi->width - ret, 0);
-	__printf_flush(io);
-	return (ret);
-}
-
-/* 'p' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_ptr(const struct printf_info *pi __unused, size_t n, int *argt)
-{
-
-	assert (n > 0);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-
-int
-__printf_render_ptr(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	struct printf_info p2;
-	uintmax_t u;
-	const void *p;
-
-	/*-
-	 * ``The argument shall be a pointer to void.  The
-	 * value of the pointer is converted to a sequence
-	 * of printable characters, in an implementation-
-	 * defined manner.''
-	 *      -- ANSI X3J11
-	 */
-	u = (uintmax_t)(uintptr_t) *((void **)arg[0]);
-	p2 = *pi;
-
-	p2.spec = 'x';
-	p2.alt = 1;
-	p2.is_long_double = 1;
-	p = &u;
-	return (__printf_render_int(io, &p2, &p));
-}
diff --git a/lib/libc_bsd/stdio/xprintf_quote.c b/lib/libc_bsd/stdio/xprintf_quote.c
deleted file mode 100644
index 2e07f76..0000000
--- a/lib/libc_bsd/stdio/xprintf_quote.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/lib/libc/stdio/xprintf_quote.c 156207 2006-03-02 08:53:45Z phk $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <wchar.h>
-#include <vis.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "printf.h"
-
-int
-__printf_arginfo_quote(const struct printf_info *pi __unused, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-
-int
-__printf_render_quote(struct __printf_io *io, const struct printf_info *pi __unused, const void *const *arg)
-{
-	const char *str, *p, *t, *o;
-	char r[5];
-	int i, ret;
-
-	str = *((const char *const *)arg[0]);
-	if (str == NULL)
-		return (__printf_out(io, pi, "\"(null)\"", 8));
-	if (*str == '\0')
-		return (__printf_out(io, pi, "\"\"", 2));
-
-	for (i = 0, p = str; *p; p++)
-		if (isspace(*p) || *p == '\\' || *p == '"')
-			i++;
-	if (!i) 
-		return (__printf_out(io, pi, str, strlen(str)));
-	
-	ret = __printf_out(io, pi, "\"", 1);
-	for (t = p = str; *p; p++) {
-		o = NULL;
-		if (*p == '\\')
-			o = "\\\\";
-		else if (*p == '\n')
-			o = "\\n";
-		else if (*p == '\r')
-			o = "\\r";
-		else if (*p == '\t')
-			o = "\\t";
-		else if (*p == ' ')
-			o = " ";
-		else if (*p == '"')
-			o = "\\\"";
-		else if (isspace(*p)) {
-			sprintf(r, "\\%03o", *p);
-			o = r;
-		} else
-			continue;
-		if (p != t)
-			ret += __printf_out(io, pi, t, p - t);
-		ret += __printf_out(io, pi, o, strlen(o));
-		t = p + 1;
-	}
-	if (p != t)
-		ret += __printf_out(io, pi, t, p - t);
-	ret += __printf_out(io, pi, "\"", 1);
-	__printf_flush(io);
-	return(ret);
-}
diff --git a/lib/libc_bsd/stdio/xprintf_str.c b/lib/libc_bsd/stdio/xprintf_str.c
deleted file mode 100644
index d9e1d38..0000000
--- a/lib/libc_bsd/stdio/xprintf_str.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdio/xprintf_str.c 153486 2005-12-16 18:56:39Z phk $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include <stdint.h>
-#include <assert.h>
-#include <wchar.h>
-#include "printf.h"
-
-/*
- * Convert a wide character string argument for the %ls format to a multibyte
- * string representation. If not -1, prec specifies the maximum number of
- * bytes to output, and also means that we can't assume that the wide char.
- * string ends is null-terminated.
- */
-static char *
-__wcsconv(wchar_t *wcsarg, int prec)
-{
-	static const mbstate_t initial;
-	mbstate_t mbs;
-	char buf[MB_LEN_MAX];
-	wchar_t *p;
-	char *convbuf;
-	size_t clen, nbytes;
-
-	/* Allocate space for the maximum number of bytes we could output. */
-	if (prec < 0) {
-		p = wcsarg;
-		mbs = initial;
-		nbytes = wcsrtombs(NULL, (const wchar_t **)&p, 0, &mbs);
-		if (nbytes == (size_t)-1)
-			return (NULL);
-	} else {
-		/*
-		 * Optimisation: if the output precision is small enough,
-		 * just allocate enough memory for the maximum instead of
-		 * scanning the string.
-		 */
-		if (prec < 128)
-			nbytes = prec;
-		else {
-			nbytes = 0;
-			p = wcsarg;
-			mbs = initial;
-			for (;;) {
-				clen = wcrtomb(buf, *p++, &mbs);
-				if (clen == 0 || clen == (size_t)-1 ||
-				    (int)(nbytes + clen) > prec)
-					break;
-				nbytes += clen;
-			}
-		}
-	}
-	if ((convbuf = malloc(nbytes + 1)) == NULL)
-		return (NULL);
-
-	/* Fill the output buffer. */
-	p = wcsarg;
-	mbs = initial;
-	if ((nbytes = wcsrtombs(convbuf, (const wchar_t **)&p,
-	    nbytes, &mbs)) == (size_t)-1) {
-		free(convbuf);
-		return (NULL);
-	}
-	convbuf[nbytes] = '\0';
-	return (convbuf);
-}
-
-
-/* 's' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_str(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert (n > 0);
-	if (pi->is_long || pi->spec == 'C')
-		argt[0] = PA_WSTRING;
-	else
-		argt[0] = PA_STRING;
-	return (1);
-}
-
-int
-__printf_render_str(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	const char *p;
-	wchar_t *wcp;
-	char *convbuf;
-	int l;
-
-	if (pi->is_long || pi->spec == 'S') {
-		wcp = *((wint_t **)arg[0]);
-		if (wcp == NULL)
-			return (__printf_out(io, pi, "(null)", 6));
-		convbuf = __wcsconv(wcp, pi->prec);
-		if (convbuf == NULL) 
-			return (-1);
-		l = __printf_out(io, pi, convbuf, strlen(convbuf));
-		free(convbuf);
-		return (l);
-	} 
-	p = *((char **)arg[0]);
-	if (p == NULL)
-		return (__printf_out(io, pi, "(null)", 6));
-	l = strlen(p);
-	if (pi->prec >= 0 && pi->prec < l)
-		l = pi->prec;
-	return (__printf_out(io, pi, p, l));
-}
-
-/* 'c' ---------------------------------------------------------------*/
-
-int
-__printf_arginfo_chr(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert (n > 0);
-	if (pi->is_long || pi->spec == 'C')
-		argt[0] = PA_WCHAR;
-	else
-		argt[0] = PA_INT;
-	return (1);
-}
-
-int
-__printf_render_chr(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	int i;
-	wint_t ii;
-	unsigned char c;
-	static const mbstate_t initial;		/* XXX: this is bogus! */
-	mbstate_t mbs;
-	size_t mbseqlen;
-	char buf[MB_CUR_MAX];
-
-	if (pi->is_long || pi->spec == 'C') {
-		ii = *((wint_t *)arg[0]);
-
-		mbs = initial;
-		mbseqlen = wcrtomb(buf, (wchar_t)ii, &mbs);
-		if (mbseqlen == (size_t) -1)
-			return (-1);
-		return (__printf_out(io, pi, buf, mbseqlen));
-	}
-	i = *((int *)arg[0]);
-	c = i;
-	i = __printf_out(io, pi, &c, 1);
-	__printf_flush(io);
-	return (i);
-}
diff --git a/lib/libc_bsd/stdio/xprintf_time.c b/lib/libc_bsd/stdio/xprintf_time.c
deleted file mode 100644
index 1703692..0000000
--- a/lib/libc_bsd/stdio/xprintf_time.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdio/xprintf_time.c 219346 2011-03-06 19:47:46Z pjd $
- */
-#include <namespace.h>
-#include <stdio.h>
-#include <wchar.h>
-#include <stdint.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "printf.h"
-
-int
-__printf_arginfo_time(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-#define MINUTE 60
-#define HOUR	(60 * MINUTE)
-#define DAY	(24 * HOUR)
-#define YEAR	(365 * DAY)
-
-int
-__printf_render_time(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	char buf[100];
-	char *p;
-	struct timeval *tv;
-	struct timespec *ts;
-	time_t *tp;
-	intmax_t t, tx;
-	int i, prec, nsec, ret;
-
-	if (pi->is_long) {
-		tv = *((struct timeval **)arg[0]);
-		t = tv->tv_sec;
-		nsec = tv->tv_usec * 1000;
-		prec = 6;
-	} else if (pi->is_long_double) {
-		ts = *((struct timespec **)arg[0]);
-		t = ts->tv_sec;
-		nsec = ts->tv_nsec;
-		prec = 9;
-	} else {
-		tp = *((time_t **)arg[0]);
-		t = *tp;
-		nsec = 0;
-		prec = 0;
-	}
-	if (pi->is_long || pi->is_long_double) {
-		if (pi->prec >= 0) 
-			prec = pi->prec;
-		if (prec == 0)
-			nsec = 0;
-	}
-
-	p = buf;
-	if (pi->alt) {
-		tx = t;
-		if (t >= YEAR) {
-			p += sprintf(p, "%jdy", t / YEAR);
-			t %= YEAR;
-		}
-		if (tx >= DAY && (t != 0 || prec != 0)) {
-			p += sprintf(p, "%jdd", t / DAY);
-			t %= DAY;
-		}
-		if (tx >= HOUR && (t != 0 || prec != 0)) {
-			p += sprintf(p, "%jdh", t / HOUR);
-			t %= HOUR;
-		}
-		if (tx >= MINUTE && (t != 0 || prec != 0)) {
-			p += sprintf(p, "%jdm", t / MINUTE);
-			t %= MINUTE;
-		}
-		if (t != 0 || tx == 0 || prec != 0)
-			p += sprintf(p, "%jds", t);
-	} else  {
-		p += sprintf(p, "%jd", (intmax_t)t);
-	}
-	if (prec != 0) {
-		for (i = prec; i < 9; i++)
-			nsec /= 10;
-		p += sprintf(p, ".%.*d", prec, nsec);
-	}
-	ret = __printf_out(io, pi, buf, p - buf);
-	__printf_flush(io);
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdio/xprintf_vis.c b/lib/libc_bsd/stdio/xprintf_vis.c
deleted file mode 100644
index dccf33f..0000000
--- a/lib/libc_bsd/stdio/xprintf_vis.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*-
- * Copyright (c) 2005 Poul-Henning Kamp
- * 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.
- *
- * 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: releng/10.2/lib/libc/stdio/xprintf_vis.c 154815 2006-01-25 12:45:24Z phk $
- */
-
-#include <namespace.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <wchar.h>
-#include <vis.h>
-#include <assert.h>
-#include <sys/time.h>
-#include "printf.h"
-
-int
-__printf_arginfo_vis(const struct printf_info *pi, size_t n, int *argt)
-{
-
-	assert(n >= 1);
-	argt[0] = PA_POINTER;
-	return (1);
-}
-
-int
-__printf_render_vis(struct __printf_io *io, const struct printf_info *pi, const void *const *arg)
-{
-	char *p, *buf;
-	unsigned l;
-	int ret;
-
-	ret = 0;
-	p = *((char **)arg[0]);
-	if (p == NULL)
-		return (__printf_out(io, pi, "(null)", 6));
-	if (pi->prec >= 0)
-		l = pi->prec;
-	else
-		l = strlen(p);
-	buf = malloc(l * 4 + 1);
-	if (buf == NULL)
-		return (-1);
-	if (pi->showsign)
-		ret = strvisx(buf, p, l, VIS_WHITE | VIS_HTTPSTYLE);
-	else if (pi->pad == '0')
-		ret = strvisx(buf, p, l, VIS_WHITE | VIS_OCTAL);
-	else if (pi->alt)
-		ret = strvisx(buf, p, l, VIS_WHITE);
-	else
-		ret = strvisx(buf, p, l, VIS_WHITE | VIS_CSTYLE | VIS_OCTAL);
-	ret += __printf_out(io, pi, buf, ret);
-	__printf_flush(io);
-	free(buf);
-	return(ret);
-}
diff --git a/lib/libc_bsd/stdlib/Makefile.inc b/lib/libc_bsd/stdlib/Makefile.inc
deleted file mode 100644
index 18ed473..0000000
--- a/lib/libc_bsd/stdlib/Makefile.inc
+++ /dev/null
@@ -1,49 +0,0 @@
-#	from @(#)Makefile.inc	8.3 (Berkeley) 2/4/95
-Makefile.incl 237573 2012-06-25 21:51:40Z issyl0 $
-
-# machine-independent stdlib sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/stdlib ${.CURDIR}/stdlib
-
-MISRCS+=_Exit.c a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \
-	bsearch.c div.c exit.c getenv.c getopt.c getopt_long.c \
-	getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c \
-	insque.c l64a.c labs.c ldiv.c llabs.c lldiv.c lsearch.c \
-	merge.c ptsname.c qsort.c qsort_r.c quick_exit.c radixsort.c rand.c \
-	random.c reallocf.c realpath.c remque.c strfmon.c strtoimax.c \
-	strtol.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \
-        strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c
-
-SYM_MAPS+= ${.CURDIR}/stdlib/Symbol.map
-
-# machine-dependent stdlib sources
-Makefile.incl"
-
-MAN+=	a64l.3 abort.3 abs.3 alloca.3 atexit.3 atof.3 \
-	atoi.3 atol.3 at_quick_exit.3 bsearch.3 \
-	div.3 exit.3 getenv.3 getopt.3 getopt_long.3 getsubopt.3 \
-	hcreate.3 imaxabs.3 imaxdiv.3 insque.3 labs.3 ldiv.3 llabs.3 lldiv.3 \
-	lsearch.3 memory.3 ptsname.3 qsort.3 \
-	quick_exit.3 \
-	radixsort.3 rand.3 random.3 reallocf.3 \
-	realpath.3 strfmon.3 strtod.3 strtol.3 strtonum.3 strtoul.3 system.3 \
-	tsearch.3
-
-MLINKS+=a64l.3 l64a.3 a64l.3 l64a_r.3
-MLINKS+=atol.3 atoll.3
-MLINKS+=exit.3 _Exit.3
-MLINKS+=getenv.3 putenv.3 getenv.3 setenv.3 getenv.3 unsetenv.3
-MLINKS+=getopt_long.3 getopt_long_only.3
-MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3
-MLINKS+=insque.3 remque.3
-MLINKS+=lsearch.3 lfind.3
-MLINKS+=ptsname.3 grantpt.3 ptsname.3 unlockpt.3
-MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 qsort.3 qsort_r.3
-MLINKS+=rand.3 rand_r.3 rand.3 srand.3 rand.3 sranddev.3
-MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \
-	random.3 srandomdev.3
-MLINKS+=radixsort.3 sradixsort.3
-MLINKS+=strfmon.3 strfmon_l.3
-MLINKS+=strtod.3 strtof.3 strtod.3 strtold.3
-MLINKS+=strtol.3 strtoll.3 strtol.3 strtoq.3 strtol.3 strtoimax.3
-MLINKS+=strtoul.3 strtoull.3 strtoul.3 strtouq.3 strtoul.3 strtoumax.3
-MLINKS+=tsearch.3 tdelete.3 tsearch.3 tfind.3 tsearch.3 twalk.3
diff --git a/lib/libc_bsd/stdlib/Symbol.map b/lib/libc_bsd/stdlib/Symbol.map
deleted file mode 100644
index 503464e..0000000
--- a/lib/libc_bsd/stdlib/Symbol.map
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/stdlib/Symbol.map 277317 2015-01-18 11:54:20Z kib $
- */
-
-FBSD_1.0 {
-	_Exit;
-	a64l;
-	abort;
-	abs;
-	atexit;
-	__cxa_atexit;
-	__cxa_finalize;
-	atof;
-	atoi;
-	atol;
-	atoll;
-	bsearch;
-	div;
-	__isthreaded;
-	exit;
-	getenv;
-	opterr;
-	optind;
-	optopt;
-	optreset;
-	optarg;
-	getopt;
-	getopt_long;
-	getopt_long_only;
-	suboptarg;
-	getsubopt;
-	grantpt;
-	ptsname;
-	unlockpt;
-	hcreate;
-	hdestroy;
-	hsearch;
-	heapsort;
-	imaxabs;
-	imaxdiv;
-	insque;
-	l64a;
-	l64a_r;
-	labs;
-	ldiv;
-	llabs;
-	lldiv;
-	lsearch;
-	lfind;
-	mergesort;
-	putenv;
-	qsort_r;
-	qsort;
-	radixsort;
-	sradixsort;
-	rand_r;
-	rand;
-	srand;
-	sranddev;
-	srandom;
-	srandomdev;
-	initstate;
-	setstate;
-	random;
-	reallocf;
-	realpath;
-	remque;
-	setenv;
-	unsetenv;
-	strfmon;
-	strtoimax;
-	strtol;
-	strtoll;
-	strtonum;
-	strtoq;
-	strtoul;
-	strtoull;
-	strtoumax;
-	strtouq;
-	system;
-	tdelete;
-	tfind;
-	tsearch;
-	twalk;
-};
-
-FBSD_1.3 {
-	at_quick_exit;
-	atof_l;
-	atoi_l;
-	atol_l;
-	atoll_l;
-	quick_exit;
-	strtod_l;
-	strtof_l;
-	strtoimax_l;
-	strtol_l;
-	strtold_l;
-	strtoll_l;
-	strtoq_l;
-	strtoul_l;
-	strtoull_l;
-	strtoumax_l;
-	strtouq_l;
-};
-
-FBSDprivate_1.0 {
-	__system;
-	_system;
-	__libc_system;
-};
diff --git a/lib/libc_bsd/stdlib/_Exit.c b/lib/libc_bsd/stdlib/_Exit.c
deleted file mode 100644
index 9ce077c..0000000
--- a/lib/libc_bsd/stdlib/_Exit.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This file is in the public domain.  Written by Garrett A. Wollman,
- * 2002-09-07.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdlib/_Exit.c 103165 2002-09-10 02:04:49Z wollman $
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-
-/*
- * ISO C99 added this function to provide for Standard C applications
- * which needed something like POSIX _exit().  A new interface was created
- * in case it turned out that _exit() was insufficient to meet the
- * requirements of ISO C.  (That's probably not the case, but here
- * is where you would put the extra code if it were.)
- */
-void
-_Exit(int code)
-{
-	_exit(code);
-}
diff --git a/lib/libc_bsd/stdlib/a64l.3 b/lib/libc_bsd/stdlib/a64l.3
deleted file mode 100644
index 9e138d7..0000000
--- a/lib/libc_bsd/stdlib/a64l.3
+++ /dev/null
@@ -1,187 +0,0 @@
-.\" Copyright (c) 2005 Tom Rhodes
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/a64l.3 162841 2006-09-30 10:34:13Z ru $
-.\"
-.Dd November 20, 2005
-.Dt A64L 3
-.Os
-.Sh NAME
-.Nm a64l ,
-.Nm l64a ,
-.Nm l64a_r
-.Nd "convert between a long integer and a base-64 ASCII string"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long
-.Fn a64l "const char *s"
-.Ft char *
-.Fn l64a "long int l"
-.Ft int
-.Fn l64a_r "long int l" "char *buffer" "int buflen"
-.Sh DESCRIPTION
-These functions are used to maintain numbers stored in radix-64
-.Tn ASCII
-characters.
-This is a notation by which 32-bit integers can be represented by
-up to six characters; each character represents a digit in
-radix-64 notation.
-If the type long contains more than 32 bits, only the low-order
-32 bits are used for these operations.
-.Pp
-The characters used to represent
-.Dq digits
-are
-.Ql .\&
-for 0,
-.Ql /
-for 1,
-.Ql 0
--
-.Ql 9
-for 2 - 11,
-.Ql A
--
-.Ql Z
-for 12 - 37, and
-.Ql a
--
-.Ql z
-for 38 - 63.
-.Pp
-The
-.Fn a64l
-function takes a pointer to a radix-64 representation, in which the first
-digit is the least significant, and returns a corresponding
-.Vt long
-value.
-If the string pointed to by
-.Fa s
-contains more than six characters,
-.Fn a64l
-uses the first six.
-If the first six characters of the string contain a null terminator,
-.Fn a64l
-uses only characters preceding the null terminator.
-The
-.Fn a64l
-function scans the character string from left to right with the least
-significant digit on the left, decoding each character as a 6-bit
-radix-64 number.
-If the type long contains more than 32 bits, the resulting value is
-sign-extended.
-The behavior of
-.Fn a64l
-is unspecified if
-.Fa s
-is a null pointer or the string pointed to by
-.Fa s
-was not generated by a previous call to
-.Fn l64a .
-.Pp
-The
-.Fn l64a
-function takes a
-.Vt long
-argument and returns a pointer to the corresponding
-radix-64 representation.
-The behavior of
-.Fn l64a
-is unspecified if value is negative.
-.Pp
-The value returned by
-.Fn l64a
-is a pointer into a static buffer.
-Subsequent calls to
-.Fn l64a
-may overwrite the buffer.
-.Pp
-The
-.Fn l64a_r
-function performs a conversion identical to that of
-.Fn l64a
-and stores the resulting representation in the memory area pointed to by
-.Fa buffer ,
-consuming at most
-.Fa buflen
-characters including the terminating
-.Dv NUL
-character.
-.Sh RETURN VALUES
-On successful completion,
-.Fn a64l
-returns the
-.Vt long
-value resulting from conversion of the input string.
-If a string pointed to by
-.Fa s
-is an empty string,
-.Fn a64l
-returns 0.
-.Pp
-The
-.Fn l64a
-function returns a pointer to the radix-64 representation.
-If value is 0,
-.Fn l64a
-returns a pointer to an empty string.
-.Sh SEE ALSO
-.Xr strtoul 3
-.Sh HISTORY
-The
-.Fn a64l ,
-.Fn l64a ,
-and
-.Fn l64a_r
-functions are derived from
-.Nx
-with modifications.
-They appeared in
-.Fx 6.1 .
-.Sh AUTHORS
-The
-.Fn a64l ,
-.Fn l64a ,
-and
-.Fn l64a_r
-functions
-were added to
-.Fx
-by
-.An Tom Rhodes Aq trhodes@FreeBSD.org .
-Almost all of this manual page came from the
-.Tn POSIX
-standard.
diff --git a/lib/libc_bsd/stdlib/a64l.c b/lib/libc_bsd/stdlib/a64l.c
deleted file mode 100644
index 22b724b..0000000
--- a/lib/libc_bsd/stdlib/a64l.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Written by J.T. Conklin <jtc@netbsd.org>.
- * Public domain.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: a64l.c,v 1.8 2000/01/22 22:19:19 mycroft Exp $");
-#endif /* not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/a64l.c 158749 2006-05-19 19:06:38Z jkim $");
-
-#include <stdlib.h>
-#include <inttypes.h>
-
-#define	ADOT	46		/* ASCII '.' */
-#define	ASLASH	47		/* ASCII '/' */
-#define	A0	48		/* ASCII '0' */
-#define	AA	65		/* ASCII 'A' */
-#define	Aa	97		/* ASCII 'a' */
-
-long
-a64l(const char *s)
-{
-	long shift;
-	int digit, i, value;
-
-	value = 0;
-	shift = 0;
-	for (i = 0; *s != '\0' && i < 6; i++, s++) {
-		if (*s <= ASLASH)
-			digit = *s - ASLASH + 1;
-		else if (*s <= A0 + 9)
-			digit = *s - A0 + 2;
-		else if (*s <= AA + 25)
-			digit = *s - AA + 12;
-		else
-			digit = *s - Aa + 38;
-
-		value |= digit << shift;
-		shift += 6;
-	}
-	return (value);
-}
diff --git a/lib/libc_bsd/stdlib/abort.3 b/lib/libc_bsd/stdlib/abort.3
deleted file mode 100644
index d3e316c..0000000
--- a/lib/libc_bsd/stdlib/abort.3
+++ /dev/null
@@ -1,79 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)abort.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/abort.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt ABORT 3
-.Os
-.Sh NAME
-.Nm abort
-.Nd cause abnormal program termination
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn abort void
-.Sh DESCRIPTION
-The
-.Fn abort
-function causes abnormal program termination to occur, unless the
-signal
-.Dv SIGABRT
-is being caught and the signal handler does not return.
-.Pp
-Any open streams are flushed and closed.
-.Sh IMPLEMENTATION NOTES
-The
-.Fn abort
-function is thread-safe.
-It is unknown if it is async-cancel-safe.
-.Sh RETURN VALUES
-The
-.Fn abort
-function
-never returns.
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr exit 3
-.Sh STANDARDS
-The
-.Fn abort
-function
-conforms to
-.St -p1003.1-90 .
-The
-.Fn abort
-function also conforms to
-.St -isoC-99
-with the implementation specific details as noted above.
diff --git a/lib/libc_bsd/stdlib/abort.c b/lib/libc_bsd/stdlib/abort.c
deleted file mode 100644
index 07bfa8b..0000000
--- a/lib/libc_bsd/stdlib/abort.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1985, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)abort.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/abort.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <signal.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-void
-abort()
-{
-	struct sigaction act;
-
-	/*
-	 * POSIX requires we flush stdio buffers on abort.
-	 * XXX ISO C requires that abort() be async-signal-safe.
-	 */
-	if (__cleanup)
-		(*__cleanup)();
-
-	sigfillset(&act.sa_mask);
-	/*
-	 * Don't block SIGABRT to give any handler a chance; we ignore
-	 * any errors -- ISO C doesn't allow abort to return anyway.
-	 */
-	sigdelset(&act.sa_mask, SIGABRT);
-	(void)__libc_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
-	(void)raise(SIGABRT);
-
-	/*
-	 * If SIGABRT was ignored, or caught and the handler returns, do
-	 * it again, only harder.
-	 */
-	act.sa_handler = SIG_DFL;
-	act.sa_flags = 0;
-	sigfillset(&act.sa_mask);
-	(void)__libc_sigaction(SIGABRT, &act, NULL);
-	sigdelset(&act.sa_mask, SIGABRT);
-	(void)__libc_sigprocmask(SIG_SETMASK, &act.sa_mask, NULL);
-	(void)raise(SIGABRT);
-	exit(1);
-}
diff --git a/lib/libc_bsd/stdlib/abs.3 b/lib/libc_bsd/stdlib/abs.3
deleted file mode 100644
index ba2ef7d..0000000
--- a/lib/libc_bsd/stdlib/abs.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)abs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/abs.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd November 14, 2001
-.Dt ABS 3
-.Os
-.Sh NAME
-.Nm abs
-.Nd integer absolute value function
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn abs "int j"
-.Sh DESCRIPTION
-The
-.Fn abs
-function
-computes
-the absolute value of the integer
-.Fa j .
-.Sh RETURN VALUES
-The
-.Fn abs
-function
-returns
-the absolute value.
-.Sh SEE ALSO
-.Xr cabs 3 ,
-.Xr fabs 3 ,
-.Xr floor 3 ,
-.Xr hypot 3 ,
-.Xr imaxabs 3 ,
-.Xr labs 3 ,
-.Xr llabs 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn abs
-function conforms to
-.St -isoC-99 .
-.Sh BUGS
-The absolute value of the most negative integer remains negative.
diff --git a/lib/libc_bsd/stdlib/abs.c b/lib/libc_bsd/stdlib/abs.c
deleted file mode 100644
index a81ddaa..0000000
--- a/lib/libc_bsd/stdlib/abs.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)abs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/abs.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stdlib.h>
-
-int
-abs(j)
-	int j;
-{
-	return(j < 0 ? -j : j);
-}
diff --git a/lib/libc_bsd/stdlib/alloca.3 b/lib/libc_bsd/stdlib/alloca.3
deleted file mode 100644
index 5b6b4c9..0000000
--- a/lib/libc_bsd/stdlib/alloca.3
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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. 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.
-.\"
-.\"     @(#)alloca.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/alloca.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd September 5, 2006
-.Dt ALLOCA 3
-.Os
-.Sh NAME
-.Nm alloca
-.Nd memory allocator
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn alloca "size_t size"
-.Sh DESCRIPTION
-The
-.Fn alloca
-function
-allocates
-.Fa size
-bytes of space in the stack frame of the caller.
-This temporary space is automatically freed on
-return.
-.Sh RETURN VALUES
-The
-.Fn alloca
-function returns a pointer to the beginning of the allocated space.
-.Sh SEE ALSO
-.Xr brk 2 ,
-.Xr calloc 3 ,
-.Xr getpagesize 3 ,
-.Xr malloc 3 ,
-.Xr realloc 3
-.Sh HISTORY
-The
-.Fn alloca
-function appeared in
-.At 32v .
-.\" .Bx ?? .
-.\" The function appeared in 32v, pwb and pwb.2 and in 3bsd 4bsd
-.\" The first man page (or link to a man page that I can find at the
-.\" moment is 4.3...
-.Sh BUGS
-The
-.Fn alloca
-function
-is machine and compiler dependent;
-its use is discouraged.
-.Pp
-The
-.Fn alloca
-function is slightly unsafe because it cannot ensure that the pointer
-returned points to a valid and usable block of memory.
-The allocation made may exceed the bounds of the stack, or even go
-further into other objects in memory, and
-.Fn alloca
-cannot determine such an error.
-Avoid
-.Fn alloca
-with large unbounded allocations.
diff --git a/lib/libc_bsd/stdlib/at_quick_exit.3 b/lib/libc_bsd/stdlib/at_quick_exit.3
deleted file mode 100644
index 7d1dabe..0000000
--- a/lib/libc_bsd/stdlib/at_quick_exit.3
+++ /dev/null
@@ -1,62 +0,0 @@
-.\"  Copyright (c) 2011 David Chisnall
-.\"  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.
-.\"
-.\"  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: releng/10.2/lib/libc/stdlib/at_quick_exit.3 238802 2012-07-26 12:04:11Z pluknet $
-.\"
-.Dd December 7, 2011
-.Dt AT_QUICK_EXIT 3
-.Os
-.Sh NAME
-.Nm at_quick_exit
-.Nd registers a cleanup function to run on quick exit
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn at_quick_exit "void (*func)(void)"
-.Sh DESCRIPTION
-The
-.Fn at_quick_exit
-function registers a cleanup function to be called when the program exits as a
-result of calling
-.Xr quick_exit 3 .
-The cleanup functions are called in the reverse order and will not be called if
-the program exits by calling
-.Xr exit 3 ,
-.Xr _Exit 3 ,
-or
-.Xr abort 3 .
-.Sh RETURN VALUES
-The
-.Fn at_quick_exit
-function returns the value 0 if successful and a non-zero value on failure.
-.Sh SEE ALSO
-.Xr exit 3 ,
-.Xr quick_exit 3
-.Sh STANDARDS
-The
-.Fn at_quick_exit
-function conforms to
-.St -isoC-2011 .
diff --git a/lib/libc_bsd/stdlib/atexit.3 b/lib/libc_bsd/stdlib/atexit.3
deleted file mode 100644
index d6e14c5..0000000
--- a/lib/libc_bsd/stdlib/atexit.3
+++ /dev/null
@@ -1,89 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)atexit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/atexit.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd September 6, 2002
-.Dt ATEXIT 3
-.Os
-.Sh NAME
-.Nm atexit
-.Nd register a function to be called on exit
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn atexit "void (*function)(void)"
-.Sh DESCRIPTION
-The
-.Fn atexit
-function
-registers the given
-.Fa function
-to be called at program exit, whether via
-.Xr exit 3
-or via return from the program's
-.Fn main .
-Functions so registered are called in reverse order;
-no arguments are passed.
-.Pp
-These functions must not call
-.Fn exit ;
-if it should be necessary to terminate the process while in such a
-function, the
-.Xr _exit 2
-function should be used.
-(Alternatively, the function may cause abnormal
-process termination, for example by calling
-.Xr abort 3 . )
-.Pp
-At least 32 functions can always be registered,
-and more are allowed as long as sufficient memory can be allocated.
-.\" XXX {ATEXIT_MAX} is not implemented yet
-.Sh RETURN VALUES
-.Rv -std atexit
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-No memory was available to add the function to the list.
-The existing list of functions is unmodified.
-.El
-.Sh SEE ALSO
-.Xr at_quick_exit 3
-.Xr exit 3
-.Sh STANDARDS
-The
-.Fn atexit
-function
-conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/stdlib/atexit.c b/lib/libc_bsd/stdlib/atexit.c
deleted file mode 100644
index f3e5140..0000000
--- a/lib/libc_bsd/stdlib/atexit.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)atexit.c	8.2 (Berkeley) 7/3/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/atexit.c 259288 2013-12-13 05:54:30Z kib $");
-
-#include "namespace.h"
-#include <link.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <pthread.h>
-#include "atexit.h"
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-#define	ATEXIT_FN_EMPTY	0
-#define	ATEXIT_FN_STD	1
-#define	ATEXIT_FN_CXA	2
-
-static pthread_mutex_t atexit_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-#define _MUTEX_LOCK(x)		if (__isthreaded) _pthread_mutex_lock(x)
-#define _MUTEX_UNLOCK(x)	if (__isthreaded) _pthread_mutex_unlock(x)
-#define _MUTEX_DESTROY(x)	if (__isthreaded) _pthread_mutex_destroy(x)
-
-struct atexit {
-	struct atexit *next;			/* next in list */
-	int ind;				/* next index in this table */
-	struct atexit_fn {
-		int fn_type;			/* ATEXIT_? from above */
-		union {
-			void (*std_func)(void);
-			void (*cxa_func)(void *);
-		} fn_ptr;			/* function pointer */
-		void *fn_arg;			/* argument for CXA callback */
-		void *fn_dso;			/* shared module handle */
-	} fns[ATEXIT_SIZE];			/* the table itself */
-};
-
-static struct atexit *__atexit;		/* points to head of LIFO stack */
-
-/*
- * Register the function described by 'fptr' to be called at application
- * exit or owning shared object unload time. This is a helper function
- * for atexit and __cxa_atexit.
- */
-static int
-atexit_register(struct atexit_fn *fptr)
-{
-	static struct atexit __atexit0;	/* one guaranteed table */
-	struct atexit *p;
-
-	_MUTEX_LOCK(&atexit_mutex);
-	if ((p = __atexit) == NULL)
-		__atexit = p = &__atexit0;
-	else while (p->ind >= ATEXIT_SIZE) {
-		struct atexit *old__atexit;
-		old__atexit = __atexit;
-	        _MUTEX_UNLOCK(&atexit_mutex);
-		if ((p = (struct atexit *)malloc(sizeof(*p))) == NULL)
-			return (-1);
-		_MUTEX_LOCK(&atexit_mutex);
-		if (old__atexit != __atexit) {
-			/* Lost race, retry operation */
-			_MUTEX_UNLOCK(&atexit_mutex);
-			free(p);
-			_MUTEX_LOCK(&atexit_mutex);
-			p = __atexit;
-			continue;
-		}
-		p->ind = 0;
-		p->next = __atexit;
-		__atexit = p;
-	}
-	p->fns[p->ind++] = *fptr;
-	_MUTEX_UNLOCK(&atexit_mutex);
-	return 0;
-}
-
-/*
- * Register a function to be performed at exit.
- */
-int
-atexit(void (*func)(void))
-{
-	struct atexit_fn fn;
-	int error;
-
-	fn.fn_type = ATEXIT_FN_STD;
-	fn.fn_ptr.std_func = func;
-	fn.fn_arg = NULL;
-	fn.fn_dso = NULL;
-
- 	error = atexit_register(&fn);	
-	return (error);
-}
-
-/*
- * Register a function to be performed at exit or when an shared object
- * with given dso handle is unloaded dynamically.
- */
-int
-__cxa_atexit(void (*func)(void *), void *arg, void *dso)
-{
-	struct atexit_fn fn;
-	int error;
-
-	fn.fn_type = ATEXIT_FN_CXA;
-	fn.fn_ptr.cxa_func = func;
-	fn.fn_arg = arg;
-	fn.fn_dso = dso;
-
- 	error = atexit_register(&fn);	
-	return (error);
-}
-
-#pragma weak __pthread_cxa_finalize
-void __pthread_cxa_finalize(const struct dl_phdr_info *);
-
-static int global_exit;
-
-/*
- * Call all handlers registered with __cxa_atexit for the shared
- * object owning 'dso'.  Note: if 'dso' is NULL, then all remaining
- * handlers are called.
- */
-void
-__cxa_finalize(void *dso)
-{
-	struct dl_phdr_info phdr_info;
-	struct atexit *p;
-	struct atexit_fn fn;
-	int n, has_phdr;
-
-	if (dso != NULL) {
-		has_phdr = _rtld_addr_phdr(dso, &phdr_info);
-	} else {
-		has_phdr = 0;
-		global_exit = 1;
-	}
-
-	_MUTEX_LOCK(&atexit_mutex);
-	for (p = __atexit; p; p = p->next) {
-		for (n = p->ind; --n >= 0;) {
-			if (p->fns[n].fn_type == ATEXIT_FN_EMPTY)
-				continue; /* already been called */
-			fn = p->fns[n];
-			if (dso != NULL && dso != fn.fn_dso) {
-				/* wrong DSO ? */
-				if (!has_phdr || global_exit ||
-				    !__elf_phdr_match_addr(&phdr_info,
-				    fn.fn_ptr.cxa_func))
-					continue;
-			}
-			/*
-			  Mark entry to indicate that this particular handler
-			  has already been called.
-			*/
-			p->fns[n].fn_type = ATEXIT_FN_EMPTY;
-		        _MUTEX_UNLOCK(&atexit_mutex);
-		
-			/* Call the function of correct type. */
-			if (fn.fn_type == ATEXIT_FN_CXA)
-				fn.fn_ptr.cxa_func(fn.fn_arg);
-			else if (fn.fn_type == ATEXIT_FN_STD)
-				fn.fn_ptr.std_func();
-			_MUTEX_LOCK(&atexit_mutex);
-		}
-	}
-	_MUTEX_UNLOCK(&atexit_mutex);
-	if (dso == NULL)
-		_MUTEX_DESTROY(&atexit_mutex);
-
-	if (has_phdr && !global_exit && &__pthread_cxa_finalize != NULL)
-		__pthread_cxa_finalize(&phdr_info);
-}
diff --git a/lib/libc_bsd/stdlib/atexit.h b/lib/libc_bsd/stdlib/atexit.h
deleted file mode 100644
index 5951b21..0000000
--- a/lib/libc_bsd/stdlib/atexit.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- *	@(#)atexit.h	8.2 (Berkeley) 7/3/94
- * $FreeBSD: releng/10.2/lib/libc/stdlib/atexit.h 251069 2013-05-28 20:57:40Z emaste $
- */
-
-/* must be at least 32 to guarantee ANSI conformance */
-#define	ATEXIT_SIZE	32
-
-void __cxa_finalize(void *dso);
diff --git a/lib/libc_bsd/stdlib/atof.3 b/lib/libc_bsd/stdlib/atof.3
deleted file mode 100644
index c65310b..0000000
--- a/lib/libc_bsd/stdlib/atof.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" Copyright (c) 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)atof.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/atof.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt ATOF 3
-.Os
-.Sh NAME
-.Nm atof
-.Nd convert
-.Tn ASCII
-string to double
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft double
-.Fn atof "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atof
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Vt double
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-strtod(nptr, (char **)NULL);
-.Ed
-.Pp
-The decimal point
-character is defined in the program's locale (category
-.Dv LC_NUMERIC ) .
-.Sh IMPLEMENTATION NOTES
-The
-.Fn atof
-function is not thread-safe and also not async-cancel-safe.
-.Pp
-The
-.Fn atof
-function has been deprecated by
-.Fn strtod
-and should not be used in new code.
-.Sh ERRORS
-The function
-.Fn atof
-need not affect the value of
-.Va errno
-on an error.
-.Sh SEE ALSO
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn atof
-function conforms to
-.St -p1003.1-90 ,
-.St -isoC ,
-and
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdlib/atof.c b/lib/libc_bsd/stdlib/atof.c
deleted file mode 100644
index d917cb7..0000000
--- a/lib/libc_bsd/stdlib/atof.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)atof.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/atof.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stdlib.h>
-#include <xlocale.h>
-
-double
-atof(ascii)
-	const char *ascii;
-{
-	return strtod(ascii, (char **)NULL);
-}
-
-double
-atof_l(ascii, locale)
-	const char *ascii;
-	locale_t locale;
-{
-	return strtod_l(ascii, (char **)NULL, locale);
-}
diff --git a/lib/libc_bsd/stdlib/atoi.3 b/lib/libc_bsd/stdlib/atoi.3
deleted file mode 100644
index 3751f17..0000000
--- a/lib/libc_bsd/stdlib/atoi.3
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)atoi.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/atoi.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt ATOI 3
-.Os
-.Sh NAME
-.Nm atoi
-.Nd convert
-.Tn ASCII
-string to integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn atoi "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atoi
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Vt int
-representation.
-.Pp
-It is equivalent to:
-.Bd -literal -offset indent
-(int)strtol(nptr, (char **)NULL, 10);
-.Ed
-.Pp
-The
-.Fn atoi
-function has been deprecated by
-.Fn strtol
-and should not be used in new code.
-.Sh ERRORS
-The function
-.Fn atoi
-need not affect the value of
-.Va errno
-on an error.
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atol 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn atoi
-function conforms to
-.St -p1003.1-90 ,
-.St -isoC ,
-and
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdlib/atoi.c b/lib/libc_bsd/stdlib/atoi.c
deleted file mode 100644
index 5dda724..0000000
--- a/lib/libc_bsd/stdlib/atoi.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)atoi.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/atoi.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stdlib.h>
-#include <xlocale.h>
-
-int
-atoi(str)
-	const char *str;
-{
-	return (int)strtol(str, (char **)NULL, 10);
-}
-
-int
-atoi_l(str, locale)
-	const char *str;
-	locale_t locale;
-{
-	return (int)strtol_l(str, (char **)NULL, 10, locale);
-}
diff --git a/lib/libc_bsd/stdlib/atol.3 b/lib/libc_bsd/stdlib/atol.3
deleted file mode 100644
index 2d0c593..0000000
--- a/lib/libc_bsd/stdlib/atol.3
+++ /dev/null
@@ -1,135 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)atol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/atol.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd May 14, 2013
-.Dt ATOL 3
-.Os
-.Sh NAME
-.Nm atol , atoll
-.Nd convert
-.Tn ASCII
-string to
-.Vt long
-or
-.Vt "long long"
-integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long
-.Fn atol "const char *nptr"
-.Ft "long long"
-.Fn atoll "const char *nptr"
-.Sh DESCRIPTION
-The
-.Fn atol
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Vt long
-integer
-representation.
-.Pp
-It is equivalent to:
-.Pp
-.Dl "strtol(nptr, (char **)NULL, 10);"
-.Pp
-The
-.Fn atoll
-function converts the initial portion of the string pointed to by
-.Fa nptr
-to
-.Vt "long long"
-integer
-representation.
-.Pp
-It is equivalent to:
-.Pp
-.Dl "strtoll(nptr, (char **)NULL, 10);"
-.Sh COMPATIBILITY
-The
-.Fx
-implementations of the
-.Fn atol
-and
-.Fn atoll
-functions are thin wrappers around
-.Fn strtol
-and
-.Fn strtoll
-respectively, so these functions will affect the value of
-.Va errno
-in the same way that the
-.Fn strtol
-and
-.Fn strtoll
-functions are able to.
-This behavior of
-.Fn atol
-and
-.Fn atoll
-is not required by
-.St -isoC
-or
-.St -isoC-99 ,
-but it is allowed by all of
-.St -isoC , St -isoC-99
-and
-.St -p1003.1-2001 .
-.Sh ERRORS
-The functions
-.Fn atol
-and
-.Fn atoll
-may affect the value of
-.Va errno
-on an error.
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn atol
-function
-conforms to
-.St -isoC .
-The
-.Fn atoll
-function
-conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdlib/atol.c b/lib/libc_bsd/stdlib/atol.c
deleted file mode 100644
index 5b6e3f5..0000000
--- a/lib/libc_bsd/stdlib/atol.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)atol.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/atol.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stdlib.h>
-#include <xlocale.h>
-
-long
-atol(str)
-	const char *str;
-{
-	return strtol(str, (char **)NULL, 10);
-}
-
-long
-atol_l(str, locale)
-	const char *str;
-	locale_t locale;
-{
-	return strtol_l(str, (char **)NULL, 10, locale);
-}
diff --git a/lib/libc_bsd/stdlib/atoll.c b/lib/libc_bsd/stdlib/atoll.c
deleted file mode 100644
index 4d9153a..0000000
--- a/lib/libc_bsd/stdlib/atoll.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/atoll.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stdlib.h>
-#include <xlocale.h>
-
-long long
-atoll(str)
-	const char *str;
-{
-	return strtoll(str, (char **)NULL, 10);
-}
-
-long long
-atoll_l(str, locale)
-	const char *str;
-	locale_t locale;
-{
-	return strtoll_l(str, (char **)NULL, 10, locale);
-}
diff --git a/lib/libc_bsd/stdlib/bsearch.3 b/lib/libc_bsd/stdlib/bsearch.3
deleted file mode 100644
index 676d2c3..0000000
--- a/lib/libc_bsd/stdlib/bsearch.3
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)bsearch.3	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/bsearch.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd February 22, 2013
-.Dt BSEARCH 3
-.Os
-.Sh NAME
-.Nm bsearch
-.Nd binary search of a sorted table
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn bsearch "const void *key" "const void *base" "size_t nmemb" "size_t size" "int (*compar) (const void *, const void *)"
-.Sh DESCRIPTION
-The
-.Fn bsearch
-function searches an array of
-.Fa nmemb
-objects, the initial member of which is
-pointed to by
-.Fa base ,
-for a member that matches the object pointed to by
-.Fa key .
-The size of each member of the array is specified by
-.Fa size .
-.Pp
-The contents of the array should be in ascending sorted order according
-to the comparison function referenced by
-.Fa compar .
-The
-.Fa compar
-routine
-is expected to have
-two arguments which point to the
-.Fa key
-object and to an array member, in that order, and should return an integer
-less than, equal to, or greater than zero if the
-.Fa key
-object is found, respectively, to be less than, to match, or be
-greater than the array member.
-See the
-.Fa int_compare
-sample function in
-.Xr qsort 3
-for a comparison function that is also compatible with
-.Fn bsearch .
-.Sh RETURN VALUES
-The
-.Fn bsearch
-function returns a pointer to a matching member of the array, or a null
-pointer if no match is found.
-If two members compare as equal, which member is matched is unspecified.
-.Sh SEE ALSO
-.Xr db 3 ,
-.Xr lsearch 3 ,
-.Xr qsort 3
-.\" .Xr tsearch 3
-.Sh STANDARDS
-The
-.Fn bsearch
-function conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/stdlib/bsearch.c b/lib/libc_bsd/stdlib/bsearch.c
deleted file mode 100644
index 254ca4f..0000000
--- a/lib/libc_bsd/stdlib/bsearch.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bsearch.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/bsearch.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stddef.h>
-#include <stdlib.h>
-
-/*
- * Perform a binary search.
- *
- * The code below is a bit sneaky.  After a comparison fails, we
- * divide the work in half by moving either left or right. If lim
- * is odd, moving left simply involves halving lim: e.g., when lim
- * is 5 we look at item 2, so we change lim to 2 so that we will
- * look at items 0 & 1.  If lim is even, the same applies.  If lim
- * is odd, moving right again involes halving lim, this time moving
- * the base up one item past p: e.g., when lim is 5 we change base
- * to item 3 and make lim 2 so that we will look at items 3 and 4.
- * If lim is even, however, we have to shrink it by one before
- * halving: e.g., when lim is 4, we still looked at item 2, so we
- * have to make lim 3, then halve, obtaining 1, so that we will only
- * look at item 3.
- */
-void *
-bsearch(key, base0, nmemb, size, compar)
-	const void *key;
-	const void *base0;
-	size_t nmemb;
-	size_t size;
-	int (*compar)(const void *, const void *);
-{
-	const char *base = base0;
-	size_t lim;
-	int cmp;
-	const void *p;
-
-	for (lim = nmemb; lim != 0; lim >>= 1) {
-		p = base + (lim >> 1) * size;
-		cmp = (*compar)(key, p);
-		if (cmp == 0)
-			return ((void *)p);
-		if (cmp > 0) {	/* key > p: move right */
-			base = (char *)p + size;
-			lim--;
-		}		/* else move left */
-	}
-	return (NULL);
-}
diff --git a/lib/libc_bsd/stdlib/div.3 b/lib/libc_bsd/stdlib/div.3
deleted file mode 100644
index 77aa88c..0000000
--- a/lib/libc_bsd/stdlib/div.3
+++ /dev/null
@@ -1,68 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" 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. 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.
-.\"
-.\"     @(#)div.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/div.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd November 14, 2001
-.Dt DIV 3
-.Os
-.Sh NAME
-.Nm div
-.Nd return quotient and remainder from division
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft div_t
-.Fn div "int num" "int denom"
-.Sh DESCRIPTION
-The
-.Fn div
-function
-computes the value
-.Fa num/denom
-and returns the quotient and remainder in a structure named
-.Fa div_t
-that contains two
-.Vt int
-members named
-.Va quot
-and
-.Va rem .
-.Sh SEE ALSO
-.Xr imaxdiv 3 ,
-.Xr ldiv 3 ,
-.Xr lldiv 3
-.Sh STANDARDS
-The
-.Fn div
-function
-conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdlib/div.c b/lib/libc_bsd/stdlib/div.c
deleted file mode 100644
index 599681c..0000000
--- a/lib/libc_bsd/stdlib/div.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)div.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/div.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stdlib.h>		/* div_t */
-
-div_t
-div(num, denom)
-	int num, denom;
-{
-	div_t r;
-
-	r.quot = num / denom;
-	r.rem = num % denom;
-	/*
-	 * The ANSI standard says that |r.quot| <= |n/d|, where
-	 * n/d is to be computed in infinite precision.  In other
-	 * words, we should always truncate the quotient towards
-	 * 0, never -infinity.
-	 *
-	 * Machine division and remainer may work either way when
-	 * one or both of n or d is negative.  If only one is
-	 * negative and r.quot has been truncated towards -inf,
-	 * r.rem will have the same sign as denom and the opposite
-	 * sign of num; if both are negative and r.quot has been
-	 * truncated towards -inf, r.rem will be positive (will
-	 * have the opposite sign of num).  These are considered
-	 * `wrong'.
-	 *
-	 * If both are num and denom are positive, r will always
-	 * be positive.
-	 *
-	 * This all boils down to:
-	 *	if num >= 0, but r.rem < 0, we got the wrong answer.
-	 * In that case, to get the right answer, add 1 to r.quot and
-	 * subtract denom from r.rem.
-	 */
-	if (num >= 0 && r.rem < 0) {
-		r.quot++;
-		r.rem -= denom;
-	}
-	return (r);
-}
diff --git a/lib/libc_bsd/stdlib/exit.3 b/lib/libc_bsd/stdlib/exit.3
deleted file mode 100644
index 973b8f7..0000000
--- a/lib/libc_bsd/stdlib/exit.3
+++ /dev/null
@@ -1,132 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)exit.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/exit.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd September 9, 2002
-.Dt EXIT 3
-.Os
-.Sh NAME
-.Nm exit , _Exit
-.Nd perform normal program termination
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn exit "int status"
-.Ft void
-.Fn _Exit "int status"
-.Sh DESCRIPTION
-The
-.Fn exit
-and
-.Fn _Exit
-functions terminate a process.
-.Pp
-Before termination,
-.Fn exit
-performs the following functions in the order listed:
-.Bl -enum -offset indent
-.It
-Call the functions registered with the
-.Xr atexit 3
-function, in the reverse order of their registration.
-.It
-Flush all open output streams.
-.It
-Close all open streams.
-.It
-Unlink all files created with the
-.Xr tmpfile 3
-function.
-.El
-.Pp
-The
-.Fn _Exit
-function terminates without calling the functions registered with the
-.Xr atexit 3
-function, and may or may not perform the other actions listed.
-Both functions make the low-order eight bits of the
-.Fa status
-argument available to a parent process which has called a
-.Xr wait 2 Ns -family
-function.
-.Pp
-The C Standard
-.Pq St -isoC-99
-defines the values
-.Li 0 ,
-.Dv EXIT_SUCCESS ,
-and
-.Dv EXIT_FAILURE
-as possible values of
-.Fa status .
-Cooperating processes may use other values;
-in a program which might be called by a mail transfer agent, the
-values described in
-.Xr sysexits 3
-may be used to provide more information to the parent process.
-.Pp
-Note that
-.Fn exit
-does nothing to prevent bottomless recursion should a function registered
-using
-.Xr atexit 3
-itself call
-.Fn exit .
-Such functions must call
-.Fn _Exit
-instead (although this has other effects as well which may not be desired).
-.Sh RETURN VALUES
-The
-.Fn exit
-and
-.Fn _Exit
-functions
-never return.
-.Sh SEE ALSO
-.Xr _exit 2 ,
-.Xr wait 2 ,
-.Xr atexit 3 ,
-.Xr at_quick_exit 3 ,
-.Xr intro 3 ,
-.Xr quick_exit 3 ,
-.Xr sysexits 3 ,
-.Xr tmpfile 3
-.Sh STANDARDS
-The
-.Fn exit
-and
-.Fn _Exit
-functions conform to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdlib/exit.c b/lib/libc_bsd/stdlib/exit.c
deleted file mode 100644
index de6682b..0000000
--- a/lib/libc_bsd/stdlib/exit.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)exit.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/exit.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include "namespace.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "atexit.h"
-#include "libc_private.h"
-
-void (*__cleanup)(void);
-
-/*
- * This variable is zero until a process has created a thread.
- * It is used to avoid calling locking functions in libc when they
- * are not required. By default, libc is intended to be(come)
- * thread-safe, but without a (significant) penalty to non-threaded
- * processes.
- */
-int	__isthreaded	= 0;
-
-/*
- * Exit, flushing stdio buffers if necessary.
- */
-void
-exit(status)
-	int status;
-{
-	/* Ensure that the auto-initialization routine is linked in: */
-	extern int _thread_autoinit_dummy_decl;
-
-	_thread_autoinit_dummy_decl = 1;
-
-	__cxa_finalize(NULL);
-	if (__cleanup)
-		(*__cleanup)();
-	_exit(status);
-}
diff --git a/lib/libc_bsd/stdlib/getenv.3 b/lib/libc_bsd/stdlib/getenv.3
deleted file mode 100644
index 1e0d0b0..0000000
--- a/lib/libc_bsd/stdlib/getenv.3
+++ /dev/null
@@ -1,230 +0,0 @@
-.\" Copyright (c) 1988, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)getenv.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/getenv.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 20, 2007
-.Dt GETENV 3
-.Os
-.Sh NAME
-.Nm getenv ,
-.Nm putenv ,
-.Nm setenv ,
-.Nm unsetenv
-.Nd environment variable functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft char *
-.Fn getenv "const char *name"
-.Ft int
-.Fn setenv "const char *name" "const char *value" "int overwrite"
-.Ft int
-.Fn putenv "char *string"
-.Ft int
-.Fn unsetenv "const char *name"
-.Sh DESCRIPTION
-These functions set, unset and fetch environment variables from the
-host
-.Em environment list .
-.Pp
-The
-.Fn getenv
-function obtains the current value of the environment variable,
-.Fa name .
-The application should not modify the string pointed
-to by the
-.Fn getenv
-function.
-.Pp
-The
-.Fn setenv
-function inserts or resets the environment variable
-.Fa name
-in the current environment list.
-If the variable
-.Fa name
-does not exist in the list,
-it is inserted with the given
-.Fa value .
-If the variable does exist, the argument
-.Fa overwrite
-is tested; if
-.Fa overwrite
-is zero, the
-variable is not reset, otherwise it is reset
-to the given
-.Fa value .
-.Pp
-The
-.Fn putenv
-function takes an argument of the form ``name=value'' and
-puts it directly into the current environment,
-so altering the argument shall change the environment.
-If the variable
-.Fa name
-does not exist in the list,
-it is inserted with the given
-.Fa value .
-If the variable
-.Fa name
-does exist, it is reset to the given
-.Fa value .
-.Pp
-The
-.Fn unsetenv
-function
-deletes all instances of the variable name pointed to by
-.Fa name
-from the list.
-.Pp
-If corruption (e.g., a name without a value) is detected while making a copy of
-environ for internal usage, then
-.Fn setenv ,
-.Fn unsetenv
-and
-.Fn putenv
-will output a warning to stderr about the issue, drop the corrupt entry and
-complete the task without error.
-.Sh RETURN VALUES
-The
-.Fn getenv
-function returns the value of the environment variable as a
-.Dv NUL Ns
--terminated string.
-If the variable
-.Fa name
-is not in the current environment,
-.Dv NULL
-is returned.
-.Pp
-.Rv -std setenv putenv unsetenv
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The function
-.Fn getenv ,
-.Fn setenv
-or
-.Fn unsetenv
-failed because the
-.Fa name
-is a
-.Dv NULL
-pointer, points to an empty string, or points to a string containing an
-.Dq Li \&=
-character.
-.Pp
-The function
-.Fn putenv
-failed because
-.Fa string
-is a
-.Dv NULL
-pointer,
-.Fa string
-is without an
-.Dq Li \&=
-character or
-.Dq Li \&=
-is the first character in
-.Fa string .
-This does not follow the
-.Tn POSIX
-specification.
-.It Bq Er ENOMEM
-The function
-.Fn setenv ,
-.Fn unsetenv
-or
-.Fn putenv
-failed because they were unable to allocate memory for the environment.
-.El
-.Sh SEE ALSO
-.Xr csh 1 ,
-.Xr sh 1 ,
-.Xr execve 2 ,
-.Xr environ 7
-.Sh STANDARDS
-The
-.Fn getenv
-function conforms to
-.St -isoC .
-The
-.Fn setenv ,
-.Fn putenv
-and
-.Fn unsetenv
-functions conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The functions
-.Fn setenv
-and
-.Fn unsetenv
-appeared in
-.At v7 .
-The
-.Fn putenv
-function appeared in
-.Bx 4.3 Reno .
-.Pp
-Until
-.Fx 7.0 ,
-.Fn putenv
-would make a copy of
-.Fa string
-and insert it into the environment using
-.Fn setenv .
-This was changed to use
-.Fa string
-as the memory location of the ``name=value'' pair to follow the
-.Tn POSIX
-specification.
-.Sh BUGS
-Successive calls to
-.Fn setenv
-that assign a larger-sized
-.Fa value
-than any previous value to the same
-.Fa name
-will result in a memory leak.
-The
-.Fx
-semantics for this function
-(namely, that the contents of
-.Fa value
-are copied and that old values remain accessible indefinitely) make this
-bug unavoidable.
-Future versions may eliminate one or both of these
-semantic guarantees in order to fix the bug.
diff --git a/lib/libc_bsd/stdlib/getenv.c b/lib/libc_bsd/stdlib/getenv.c
deleted file mode 100644
index 444d33a..0000000
--- a/lib/libc_bsd/stdlib/getenv.c
+++ /dev/null
@@ -1,691 +0,0 @@
-/*-
- * Copyright (c) 2007-2009 Sean C. Farley <scf@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,
- *    without modification, immediately at the beginning of the file.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/getenv.c 253413 2013-07-17 08:45:27Z avg $");
-
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <errno.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-
-static const char CorruptEnvFindMsg[] = "environment corrupt; unable to find ";
-static const char CorruptEnvValueMsg[] =
-    "environment corrupt; missing value for ";
-
-
-/*
- * Standard environ.  environ variable is exposed to entire process.
- *
- *	origEnviron:	Upon cleanup on unloading of library or failure, this
- *			allows environ to return to as it was before.
- *	environSize:	Number of variables environ can hold.  Can only
- *			increase.
- *	intEnviron:	Internally-built environ.  Exposed via environ during
- *			(re)builds of the environment.
- */
-extern char **environ;
-static char **origEnviron;
-static char **intEnviron = NULL;
-static int environSize = 0;
-
-/*
- * Array of environment variables built from environ.  Each element records:
- *	name:		Pointer to name=value string
- *	name length:	Length of name not counting '=' character
- *	value:		Pointer to value within same string as name
- *	value size:	Size (not length) of space for value not counting the
- *			nul character
- *	active state:	true/false value to signify whether variable is active.
- *			Useful since multiple variables with the same name can
- *			co-exist.  At most, one variable can be active at any
- *			one time.
- *	putenv:		Created from putenv() call.  This memory must not be
- *			reused.
- */
-static struct envVars {
-	size_t nameLen;
-	size_t valueSize;
-	char *name;
-	char *value;
-	bool active;
-	bool putenv;
-} *envVars = NULL;
-
-/*
- * Environment array information.
- *
- *	envActive:	Number of active variables in array.
- *	envVarsSize:	Size of array.
- *	envVarsTotal:	Number of total variables in array (active or not).
- */
-static int envActive = 0;
-static int envVarsSize = 0;
-static int envVarsTotal = 0;
-
-
-/* Deinitialization of new environment. */
-static void __attribute__ ((destructor)) __clean_env_destructor(void);
-
-
-/*
- * A simple version of warnx() to avoid the bloat of including stdio in static
- * binaries.
- */
-static void
-__env_warnx(const char *msg, const char *name, size_t nameLen)
-{
-	static const char nl[] = "\n";
-	static const char progSep[] = ": ";
-
-	_write(STDERR_FILENO, _getprogname(), strlen(_getprogname()));
-	_write(STDERR_FILENO, progSep, sizeof(progSep) - 1);
-	_write(STDERR_FILENO, msg, strlen(msg));
-	_write(STDERR_FILENO, name, nameLen);
-	_write(STDERR_FILENO, nl, sizeof(nl) - 1);
-
-	return;
-}
-
-
-/*
- * Inline strlen() for performance.  Also, perform check for an equals sign.
- * Cheaper here than peforming a strchr() later.
- */
-static inline size_t
-__strleneq(const char *str)
-{
-	const char *s;
-
-	for (s = str; *s != '\0'; ++s)
-		if (*s == '=')
-			return (0);
-
-	return (s - str);
-}
-
-
-/*
- * Comparison of an environment name=value to a name.
- */
-static inline bool
-strncmpeq(const char *nameValue, const char *name, size_t nameLen)
-{
-	if (strncmp(nameValue, name, nameLen) == 0 && nameValue[nameLen] == '=')
-		return (true);
-
-	return (false);
-}
-
-
-/*
- * Using environment, returns pointer to value associated with name, if any,
- * else NULL.  If the onlyActive flag is set to true, only variables that are
- * active are returned else all are.
- */
-static inline char *
-__findenv(const char *name, size_t nameLen, int *envNdx, bool onlyActive)
-{
-	int ndx;
-
-	/*
-	 * Find environment variable from end of array (more likely to be
-	 * active).  A variable created by putenv is always active, or it is not
-	 * tracked in the array.
-	 */
-	for (ndx = *envNdx; ndx >= 0; ndx--)
-		if (envVars[ndx].putenv) {
-			if (strncmpeq(envVars[ndx].name, name, nameLen)) {
-				*envNdx = ndx;
-				return (envVars[ndx].name + nameLen +
-				    sizeof ("=") - 1);
-			}
-		} else if ((!onlyActive || envVars[ndx].active) &&
-		    (envVars[ndx].nameLen == nameLen &&
-		    strncmpeq(envVars[ndx].name, name, nameLen))) {
-			*envNdx = ndx;
-			return (envVars[ndx].value);
-		}
-
-	return (NULL);
-}
-
-
-/*
- * Using environ, returns pointer to value associated with name, if any, else
- * NULL.  Used on the original environ passed into the program.
- */
-static char *
-__findenv_environ(const char *name, size_t nameLen)
-{
-	int envNdx;
-
-	/* Find variable within environ. */
-	for (envNdx = 0; environ[envNdx] != NULL; envNdx++)
-		if (strncmpeq(environ[envNdx], name, nameLen))
-			return (&(environ[envNdx][nameLen + sizeof("=") - 1]));
-
-	return (NULL);
-}
-
-
-/*
- * Remove variable added by putenv() from variable tracking array.
- */
-static void
-__remove_putenv(int envNdx)
-{
-	envVarsTotal--;
-	if (envVarsTotal > envNdx)
-		memmove(&(envVars[envNdx]), &(envVars[envNdx + 1]),
-		    (envVarsTotal - envNdx) * sizeof (*envVars));
-	memset(&(envVars[envVarsTotal]), 0, sizeof (*envVars));
-
-	return;
-}
-
-
-/*
- * Deallocate the environment built from environ as well as environ then set
- * both to NULL.  Eases debugging of memory leaks.
- */
-static void
-__clean_env(bool freeVars)
-{
-	int envNdx;
-
-	/* Deallocate environment and environ if created by *env(). */
-	if (envVars != NULL) {
-		for (envNdx = envVarsTotal - 1; envNdx >= 0; envNdx--)
-			/* Free variables or deactivate them. */
-			if (envVars[envNdx].putenv) {
-				if (!freeVars)
-					__remove_putenv(envNdx);
-			} else {
-				if (freeVars)
-					free(envVars[envNdx].name);
-				else
-					envVars[envNdx].active = false;
-			}
-		if (freeVars) {
-			free(envVars);
-			envVars = NULL;
-		} else
-			envActive = 0;
-
-		/* Restore original environ if it has not updated by program. */
-		if (origEnviron != NULL) {
-			if (environ == intEnviron)
-				environ = origEnviron;
-			free(intEnviron);
-			intEnviron = NULL;
-			environSize = 0;
-		}
-	}
-
-	return;
-}
-
-
-/*
- * Using the environment, rebuild the environ array for use by other C library
- * calls that depend upon it.
- */
-static int
-__rebuild_environ(int newEnvironSize)
-{
-	char **tmpEnviron;
-	int envNdx;
-	int environNdx;
-	int tmpEnvironSize;
-
-	/* Resize environ. */
-	if (newEnvironSize > environSize) {
-		tmpEnvironSize = newEnvironSize * 2;
-		tmpEnviron = realloc(intEnviron, sizeof (*intEnviron) *
-		    (tmpEnvironSize + 1));
-		if (tmpEnviron == NULL)
-			return (-1);
-		environSize = tmpEnvironSize;
-		intEnviron = tmpEnviron;
-	}
-	envActive = newEnvironSize;
-
-	/* Assign active variables to environ. */
-	for (envNdx = envVarsTotal - 1, environNdx = 0; envNdx >= 0; envNdx--)
-		if (envVars[envNdx].active)
-			intEnviron[environNdx++] = envVars[envNdx].name;
-	intEnviron[environNdx] = NULL;
-
-	/* Always set environ which may have been replaced by program. */
-	environ = intEnviron;
-
-	return (0);
-}
-
-
-/*
- * Enlarge new environment.
- */
-static inline bool
-__enlarge_env(void)
-{
-	int newEnvVarsSize;
-	struct envVars *tmpEnvVars;
-
-	envVarsTotal++;
-	if (envVarsTotal > envVarsSize) {
-		newEnvVarsSize = envVarsTotal * 2;
-		tmpEnvVars = realloc(envVars, sizeof (*envVars) *
-		    newEnvVarsSize);
-		if (tmpEnvVars == NULL) {
-			envVarsTotal--;
-			return (false);
-		}
-		envVarsSize = newEnvVarsSize;
-		envVars = tmpEnvVars;
-	}
-
-	return (true);
-}
-
-
-/*
- * Using environ, build an environment for use by standard C library calls.
- */
-static int
-__build_env(void)
-{
-	char **env;
-	int activeNdx;
-	int envNdx;
-	int savedErrno;
-	size_t nameLen;
-
-	/* Check for non-existant environment. */
-	if (environ == NULL || environ[0] == NULL)
-		return (0);
-
-	/* Count environment variables. */
-	for (env = environ, envVarsTotal = 0; *env != NULL; env++)
-		envVarsTotal++;
-	envVarsSize = envVarsTotal * 2;
-
-	/* Create new environment. */
-	envVars = calloc(1, sizeof (*envVars) * envVarsSize);
-	if (envVars == NULL)
-		goto Failure;
-
-	/* Copy environ values and keep track of them. */
-	for (envNdx = envVarsTotal - 1; envNdx >= 0; envNdx--) {
-		envVars[envNdx].putenv = false;
-		envVars[envNdx].name =
-		    strdup(environ[envVarsTotal - envNdx - 1]);
-		if (envVars[envNdx].name == NULL)
-			goto Failure;
-		envVars[envNdx].value = strchr(envVars[envNdx].name, '=');
-		if (envVars[envNdx].value != NULL) {
-			envVars[envNdx].value++;
-			envVars[envNdx].valueSize =
-			    strlen(envVars[envNdx].value);
-		} else {
-			__env_warnx(CorruptEnvValueMsg, envVars[envNdx].name,
-			    strlen(envVars[envNdx].name));
-			errno = EFAULT;
-			goto Failure;
-		}
-
-		/*
-		 * Find most current version of variable to make active.  This
-		 * will prevent multiple active variables from being created
-		 * during this initialization phase.
-		 */
-		nameLen = envVars[envNdx].value - envVars[envNdx].name - 1;
-		envVars[envNdx].nameLen = nameLen;
-		activeNdx = envVarsTotal - 1;
-		if (__findenv(envVars[envNdx].name, nameLen, &activeNdx,
-		    false) == NULL) {
-			__env_warnx(CorruptEnvFindMsg, envVars[envNdx].name,
-			    nameLen);
-			errno = EFAULT;
-			goto Failure;
-		}
-		envVars[activeNdx].active = true;
-	}
-
-	/* Create a new environ. */
-	origEnviron = environ;
-	environ = NULL;
-	if (__rebuild_environ(envVarsTotal) == 0)
-		return (0);
-
-Failure:
-	savedErrno = errno;
-	__clean_env(true);
-	errno = savedErrno;
-
-	return (-1);
-}
-
-
-/*
- * Destructor function with default argument to __clean_env().
- */
-static void
-__clean_env_destructor(void)
-{
-	__clean_env(true);
-
-	return;
-}
-
-
-/*
- * Returns the value of a variable or NULL if none are found.
- */
-char *
-getenv(const char *name)
-{
-	int envNdx;
-	size_t nameLen;
-
-	/* Check for malformed name. */
-	if (name == NULL || (nameLen = __strleneq(name)) == 0) {
-		errno = EINVAL;
-		return (NULL);
-	}
-
-	/*
-	 * Variable search order:
-	 * 1. Check for an empty environ.  This allows an application to clear
-	 *    the environment.
-	 * 2. Search the external environ array.
-	 * 3. Search the internal environment.
-	 *
-	 * Since malloc() depends upon getenv(), getenv() must never cause the
-	 * internal environment storage to be generated.
-	 */
-	if (environ == NULL || environ[0] == NULL)
-		return (NULL);
-	else if (envVars == NULL || environ != intEnviron)
-		return (__findenv_environ(name, nameLen));
-	else {
-		envNdx = envVarsTotal - 1;
-		return (__findenv(name, nameLen, &envNdx, true));
-	}
-}
-
-
-/*
- * Set the value of a variable.  Older settings are labeled as inactive.  If an
- * older setting has enough room to store the new value, it will be reused.  No
- * previous variables are ever freed here to avoid causing a segmentation fault
- * in a user's code.
- *
- * The variables nameLen and valueLen are passed into here to allow the caller
- * to calculate the length by means besides just strlen().
- */
-static int
-__setenv(const char *name, size_t nameLen, const char *value, int overwrite)
-{
-	bool reuse;
-	char *env;
-	int envNdx;
-	int newEnvActive;
-	size_t valueLen;
-
-	/* Find existing environment variable large enough to use. */
-	envNdx = envVarsTotal - 1;
-	newEnvActive = envActive;
-	valueLen = strlen(value);
-	reuse = false;
-	if (__findenv(name, nameLen, &envNdx, false) != NULL) {
-		/* Deactivate entry if overwrite is allowed. */
-		if (envVars[envNdx].active) {
-			if (overwrite == 0)
-				return (0);
-			envVars[envNdx].active = false;
-			newEnvActive--;
-		}
-
-		/* putenv() created variable cannot be reused. */
-		if (envVars[envNdx].putenv)
-			__remove_putenv(envNdx);
-
-		/* Entry is large enough to reuse. */
-		else if (envVars[envNdx].valueSize >= valueLen)
-			reuse = true;
-	}
-
-	/* Create new variable if none was found of sufficient size. */
-	if (! reuse) {
-		/* Enlarge environment. */
-		envNdx = envVarsTotal;
-		if (!__enlarge_env())
-			return (-1);
-
-		/* Create environment entry. */
-		envVars[envNdx].name = malloc(nameLen + sizeof ("=") +
-		    valueLen);
-		if (envVars[envNdx].name == NULL) {
-			envVarsTotal--;
-			return (-1);
-		}
-		envVars[envNdx].nameLen = nameLen;
-		envVars[envNdx].valueSize = valueLen;
-
-		/* Save name of name/value pair. */
-		env = stpncpy(envVars[envNdx].name, name, nameLen);
-		*env++ = '=';
-	}
-	else
-		env = envVars[envNdx].value;
-
-	/* Save value of name/value pair. */
-	strcpy(env, value);
-	envVars[envNdx].value = env;
-	envVars[envNdx].active = true;
-	newEnvActive++;
-
-	/* No need to rebuild environ if an active variable was reused. */
-	if (reuse && newEnvActive == envActive)
-		return (0);
-	else
-		return (__rebuild_environ(newEnvActive));
-}
-
-
-/*
- * If the program attempts to replace the array of environment variables
- * (environ) environ or sets the first varible to NULL, then deactivate all
- * variables and merge in the new list from environ.
- */
-static int
-__merge_environ(void)
-{
-	char **env;
-	char *equals;
-
-	/*
-	 * Internally-built environ has been replaced or cleared (detected by
-	 * using the count of active variables against a NULL as the first value
-	 * in environ).  Clean up everything.
-	 */
-	if (intEnviron != NULL && (environ != intEnviron || (envActive > 0 &&
-	    environ[0] == NULL))) {
-		/* Deactivate all environment variables. */
-		if (envActive > 0) {
-			origEnviron = NULL;
-			__clean_env(false);
-		}
-
-		/*
-		 * Insert new environ into existing, yet deactivated,
-		 * environment array.
-		 */
-		origEnviron = environ;
-		if (origEnviron != NULL)
-			for (env = origEnviron; *env != NULL; env++) {
-				if ((equals = strchr(*env, '=')) == NULL) {
-					__env_warnx(CorruptEnvValueMsg, *env,
-					    strlen(*env));
-					errno = EFAULT;
-					return (-1);
-				}
-				if (__setenv(*env, equals - *env, equals + 1,
-				    1) == -1)
-					return (-1);
-			}
-	}
-
-	return (0);
-}
-
-
-/*
- * The exposed setenv() that peforms a few tests before calling the function
- * (__setenv()) that does the actual work of inserting a variable into the
- * environment.
- */
-int
-setenv(const char *name, const char *value, int overwrite)
-{
-	size_t nameLen;
-
-	/* Check for malformed name. */
-	if (name == NULL || (nameLen = __strleneq(name)) == 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/* Initialize environment. */
-	if (__merge_environ() == -1 || (envVars == NULL && __build_env() == -1))
-		return (-1);
-
-	return (__setenv(name, nameLen, value, overwrite));
-}
-
-
-/*
- * Insert a "name=value" string into the environment.  Special settings must be
- * made to keep setenv() from reusing this memory block and unsetenv() from
- * allowing it to be tracked.
- */
-int
-putenv(char *string)
-{
-	char *equals;
-	int envNdx;
-	int newEnvActive;
-	size_t nameLen;
-
-	/* Check for malformed argument. */
-	if (string == NULL || (equals = strchr(string, '=')) == NULL ||
-	    (nameLen = equals - string) == 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/* Initialize environment. */
-	if (__merge_environ() == -1 || (envVars == NULL && __build_env() == -1))
-		return (-1);
-
-	/* Deactivate previous environment variable. */
-	envNdx = envVarsTotal - 1;
-	newEnvActive = envActive;
-	if (__findenv(string, nameLen, &envNdx, true) != NULL) {
-		/* Reuse previous putenv slot. */
-		if (envVars[envNdx].putenv) {
-			envVars[envNdx].name = string;
-			return (__rebuild_environ(envActive));
-		} else {
-			newEnvActive--;
-			envVars[envNdx].active = false;
-		}
-	}
-
-	/* Enlarge environment. */
-	envNdx = envVarsTotal;
-	if (!__enlarge_env())
-		return (-1);
-
-	/* Create environment entry. */
-	envVars[envNdx].name = string;
-	envVars[envNdx].nameLen = -1;
-	envVars[envNdx].value = NULL;
-	envVars[envNdx].valueSize = -1;
-	envVars[envNdx].putenv = true;
-	envVars[envNdx].active = true;
-	newEnvActive++;
-
-	return (__rebuild_environ(newEnvActive));
-}
-
-
-/*
- * Unset variable with the same name by flagging it as inactive.  No variable is
- * ever freed.
- */
-int
-unsetenv(const char *name)
-{
-	int envNdx;
-	size_t nameLen;
-	int newEnvActive;
-
-	/* Check for malformed name. */
-	if (name == NULL || (nameLen = __strleneq(name)) == 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	/* Initialize environment. */
-	if (__merge_environ() == -1 || (envVars == NULL && __build_env() == -1))
-		return (-1);
-
-	/* Deactivate specified variable. */
-	/* Remove all occurrences. */
-	envNdx = envVarsTotal - 1;
-	newEnvActive = envActive;
-	while (__findenv(name, nameLen, &envNdx, true) != NULL) {
-		envVars[envNdx].active = false;
-		if (envVars[envNdx].putenv)
-			__remove_putenv(envNdx);
-		envNdx--;
-		newEnvActive--;
-	}
-	if (newEnvActive != envActive)
-		__rebuild_environ(newEnvActive);
-
-	return (0);
-}
diff --git a/lib/libc_bsd/stdlib/getopt.3 b/lib/libc_bsd/stdlib/getopt.3
deleted file mode 100644
index 41e9f1b..0000000
--- a/lib/libc_bsd/stdlib/getopt.3
+++ /dev/null
@@ -1,317 +0,0 @@
-.\"	$NetBSD: getopt.3,v 1.34 2014/06/05 22:09:50 wiz Exp $
-.\"
-.\" Copyright (c) 1988, 1991, 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. 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.
-.\"
-.\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/getopt.3 268396 2014-07-08 13:16:03Z pluknet $
-.\"
-.Dd June 5, 2014
-.Dt GETOPT 3
-.Os
-.Sh NAME
-.Nm getopt
-.Nd get option character from command line argument list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Vt extern char *optarg ;
-.Vt extern int optind ;
-.Vt extern int optopt ;
-.Vt extern int opterr ;
-.Vt extern int optreset ;
-.Ft int
-.Fn getopt "int argc" "char * const argv[]" "const char *optstring"
-.Sh DESCRIPTION
-The
-.Fn getopt
-function incrementally parses a command line argument list
-.Fa argv
-and returns the next
-.Em known
-option character.
-An option character is
-.Em known
-if it has been specified in the string of accepted option characters,
-.Fa optstring .
-.Pp
-The option string
-.Fa optstring
-may contain the following elements: individual characters, and
-characters followed by a colon to indicate an option argument
-is to follow.
-If an individual character is followed by two colons, then the
-option argument is optional;
-.Va optarg
-is set to the rest of the current
-.Va argv
-word, or
-.Dv NULL
-if there were no more characters in the current word.
-This is a
-.Tn GNU
-extension.
-For example, an option string
-.Li \&"x"
-recognizes an option
-.Dq Fl x ,
-and an option string
-.Li \&"x:"
-recognizes an option and argument
-.Dq Fl x Ar argument .
-It does not matter to
-.Fn getopt
-if a following argument has leading white space.
-.Pp
-On return from
-.Fn getopt ,
-.Va optarg
-points to an option argument, if it is anticipated,
-and the variable
-.Va optind
-contains the index to the next
-.Fa argv
-argument for a subsequent call
-to
-.Fn getopt .
-The variable
-.Va optopt
-saves the last
-.Em known
-option character returned by
-.Fn getopt .
-.Pp
-The variables
-.Va opterr
-and
-.Va optind
-are both initialized to 1.
-The
-.Va optind
-variable may be set to another value before a set of calls to
-.Fn getopt
-in order to skip over more or less argv entries.
-.Pp
-In order to use
-.Fn getopt
-to evaluate multiple sets of arguments, or to evaluate a single set of
-arguments multiple times,
-the variable
-.Va optreset
-must be set to 1 before the second and each additional set of calls to
-.Fn getopt ,
-and the variable
-.Va optind
-must be reinitialized.
-.Pp
-The
-.Fn getopt
-function returns \-1 when the argument list is exhausted.
-The interpretation of options in the argument list may be cancelled
-by the option
-.Ql --
-(double dash) which causes
-.Fn getopt
-to signal the end of argument processing and return \-1.
-When all options have been processed (i.e., up to the first non-option
-argument),
-.Fn getopt
-returns \-1.
-.Sh RETURN VALUES
-The
-.Fn getopt
-function returns the next known option character in
-.Fa optstring .
-If
-.Fn getopt
-encounters a character not found in
-.Fa optstring
-or if it detects a missing option argument,
-it returns
-.Ql \&?
-(question mark).
-If
-.Fa optstring
-has a leading
-.Ql \&:
-then a missing option argument causes
-.Ql \&:
-to be returned instead of
-.Ql \&? .
-In either case, the variable
-.Va optopt
-is set to the character that caused the error.
-The
-.Fn getopt
-function returns \-1 when the argument list is exhausted.
-.Sh EXAMPLES
-.Bd -literal -compact
-#include <unistd.h>
-int bflag, ch, fd;
-
-bflag = 0;
-while ((ch = getopt(argc, argv, "bf:")) != -1) {
-	switch (ch) {
-	case 'b':
-		bflag = 1;
-		break;
-	case 'f':
-		if ((fd = open(optarg, O_RDONLY, 0)) \*[Lt] 0) {
-			(void)fprintf(stderr,
-			    "myname: %s: %s\en", optarg, strerror(errno));
-			exit(1);
-		}
-		break;
-	case '?':
-	default:
-		usage();
-	}
-}
-argc -= optind;
-argv += optind;
-.Ed
-.Sh DIAGNOSTICS
-If the
-.Fn getopt
-function encounters a character not found in the string
-.Fa optstring
-or detects
-a missing option argument it writes an error message to the
-.Dv stderr
-and returns
-.Ql \&? .
-Setting
-.Va opterr
-to a zero will disable these error messages.
-If
-.Fa optstring
-has a leading
-.Ql \&:
-then a missing option argument causes a
-.Ql \&:
-to be returned in addition to suppressing any error messages.
-.Pp
-Option arguments are allowed to begin with
-.Dq Li \- ;
-this is reasonable but reduces the amount of error checking possible.
-.Sh SEE ALSO
-.Xr getopt 1 ,
-.Xr getopt_long 3 ,
-.Xr getsubopt 3
-.Sh STANDARDS
-The
-.Va optreset
-variable was added to make it possible to call the
-.Fn getopt
-function multiple times.
-This is an extension to the
-.St -p1003.2
-specification.
-.Sh HISTORY
-The
-.Fn getopt
-function appeared in
-.Bx 4.3 .
-.Sh BUGS
-The
-.Fn getopt
-function was once specified to return
-.Dv EOF
-instead of \-1.
-This was changed by
-.St -p1003.2-92
-to decouple
-.Fn getopt
-from
-.In stdio.h .
-.Pp
-A single dash
-.Dq Li -
-may be specified as a character in
-.Fa optstring ,
-however it should
-.Em never
-have an argument associated with it.
-This allows
-.Fn getopt
-to be used with programs that expect
-.Dq Li -
-as an option flag.
-This practice is wrong, and should not be used in any current development.
-It is provided for backward compatibility
-.Em only .
-Care should be taken not to use
-.Ql \&-
-as the first character in
-.Fa optstring
-to avoid a semantic conflict with
-.Tn GNU
-.Fn getopt ,
-which assigns different meaning to an
-.Fa optstring
-that begins with a
-.Ql \&- .
-By default, a single dash causes
-.Fn getopt
-to return \-1.
-.Pp
-It is also possible to handle digits as option letters.
-This allows
-.Fn getopt
-to be used with programs that expect a number
-.Pq Dq Li \&-\&3
-as an option.
-This practice is wrong, and should not be used in any current development.
-It is provided for backward compatibility
-.Em only .
-The following code fragment works in most cases.
-.Bd -literal -offset indent
-int ch;
-long length;
-char *p, *ep;
-
-while ((ch = getopt(argc, argv, "0123456789")) != -1)
-	switch (ch) {
-	case '0': case '1': case '2': case '3': case '4':
-	case '5': case '6': case '7': case '8': case '9':
-		p = argv[optind - 1];
-		if (p[0] == '-' \*[Am]\*[Am] p[1] == ch \*[Am]\*[Am] !p[2]) {
-			length = ch - '0';
-			ep = "";
-		} else if (argv[optind] \*[Am]\*[Am] argv[optind][1] == ch) {
-			length = strtol((p = argv[optind] + 1),
-			    \*[Am]ep, 10);
-			optind++;
-			optreset = 1;
-		} else
-			usage();
-		if (*ep != '\e0')
-			errx(EX_USAGE, "illegal number -- %s", p);
-		break;
-	}
-.Ed
diff --git a/lib/libc_bsd/stdlib/getopt.c b/lib/libc_bsd/stdlib/getopt.c
deleted file mode 100644
index b171853..0000000
--- a/lib/libc_bsd/stdlib/getopt.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*	$NetBSD: getopt.c,v 1.29 2014/06/05 22:00:22 christos Exp $	*/
-
-/*
- * Copyright (c) 1987, 1993, 1994
- *	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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getopt.c	8.3 (Berkeley) 4/27/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/getopt.c 268352 2014-07-07 02:47:41Z pfg $");
-
-#include "namespace.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-#include "libc_private.h"
-
-int	opterr = 1,		/* if error message should be printed */
-	optind = 1,		/* index into parent argv vector */
-	optopt,			/* character checked for validity */
-	optreset;		/* reset getopt */
-char	*optarg;		/* argument associated with option */
-
-#define	BADCH	(int)'?'
-#define	BADARG	(int)':'
-#define	EMSG	""
-
-/*
- * getopt --
- *	Parse argc/argv argument vector.
- */
-int
-getopt(int nargc, char * const nargv[], const char *ostr)
-{
-	static char *place = EMSG;		/* option letter processing */
-	char *oli;				/* option letter list index */
-
-	if (optreset || *place == 0) {		/* update scanning pointer */
-		optreset = 0;
-		place = nargv[optind];
-		if (optind >= nargc || *place++ != '-') {
-			/* Argument is absent or is not an option */
-			place = EMSG;
-			return (-1);
-		}
-		optopt = *place++;
-		if (optopt == '-' && *place == 0) {
-			/* "--" => end of options */
-			++optind;
-			place = EMSG;
-			return (-1);
-		}
-		if (optopt == 0) {
-			/* Solitary '-', treat as a '-' option
-			   if the program (eg su) is looking for it. */
-			place = EMSG;
-			if (strchr(ostr, '-') == NULL)
-				return (-1);
-			optopt = '-';
-		}
-	} else
-		optopt = *place++;
-
-	/* See if option letter is one the caller wanted... */
-	if (optopt == ':' || (oli = strchr(ostr, optopt)) == NULL) {
-		if (*place == 0)
-			++optind;
-		if (opterr && *ostr != ':')
-			(void)fprintf(stderr,
-			    "%s: illegal option -- %c\n", _getprogname(),
-			    optopt);
-		return (BADCH);
-	}
-
-	/* Does this option need an argument? */
-	if (oli[1] != ':') {
-		/* don't need argument */
-		optarg = NULL;
-		if (*place == 0)
-			++optind;
-	} else {
-		/* Option-argument is either the rest of this argument or the
-		   entire next argument. */
-		if (*place)
-			optarg = place;
-		else if (oli[2] == ':')
-			/*
-			 * GNU Extension, for optional arguments if the rest of
-			 * the argument is empty, we return NULL
-			 */
-			optarg = NULL;
-		else if (nargc > ++optind)
-			optarg = nargv[optind];
-		else {
-			/* option-argument absent */
-			place = EMSG;
-			if (*ostr == ':')
-				return (BADARG);
-			if (opterr)
-				(void)fprintf(stderr,
-				    "%s: option requires an argument -- %c\n",
-				    _getprogname(), optopt);
-			return (BADCH);
-		}
-		place = EMSG;
-		++optind;
-	}
-	return (optopt);			/* return option letter */
-}
diff --git a/lib/libc_bsd/stdlib/getopt_long.3 b/lib/libc_bsd/stdlib/getopt_long.3
deleted file mode 100644
index 52a0056..0000000
--- a/lib/libc_bsd/stdlib/getopt_long.3
+++ /dev/null
@@ -1,507 +0,0 @@
-.\"	$OpenBSD: getopt_long.3,v 1.10 2004/01/06 23:44:28 fgsch Exp $
-.\"	$NetBSD: getopt_long.3,v 1.14 2003/08/07 16:43:40 agc Exp $
-.\"
-.\" Copyright (c) 1988, 1991, 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. 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.
-.\"
-.\"     @(#)getopt.3	8.5 (Berkeley) 4/27/95
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/getopt_long.3 228885 2011-12-26 03:14:37Z gjb $
-.\"
-.Dd December 25, 2011
-.Dt GETOPT_LONG 3
-.Os
-.Sh NAME
-.Nm getopt_long ,
-.Nm getopt_long_only
-.Nd get long options from command line argument list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In getopt.h
-.Vt extern char *optarg ;
-.Vt extern int optind ;
-.Vt extern int optopt ;
-.Vt extern int opterr ;
-.Vt extern int optreset ;
-.Ft int
-.Fo getopt_long
-.Fa "int argc" "char * const *argv" "const char *optstring"
-.Fa "const struct option *longopts" "int *longindex"
-.Fc
-.Ft int
-.Fo getopt_long_only
-.Fa "int argc" "char * const *argv" "const char *optstring"
-.Fa "const struct option *longopts" "int *longindex"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn getopt_long
-function is similar to
-.Xr getopt 3
-but it accepts options in two forms: words and characters.
-The
-.Fn getopt_long
-function provides a superset of the functionality of
-.Xr getopt 3 .
-The
-.Fn getopt_long
-function
-can be used in two ways.
-In the first way, every long option understood
-by the program has a corresponding short option, and the option
-structure is only used to translate from long options to short
-options.
-When used in this fashion,
-.Fn getopt_long
-behaves identically to
-.Xr getopt 3 .
-This is a good way to add long option processing to an existing program
-with the minimum of rewriting.
-.Pp
-In the second mechanism, a long option sets a flag in the
-.Vt option
-structure passed, or will store a pointer to the command line argument
-in the
-.Vt option
-structure passed to it for options that take arguments.
-Additionally,
-the long option's argument may be specified as a single argument with
-an equal sign, e.g.,
-.Pp
-.Dl "myprogram --myoption=somevalue"
-.Pp
-When a long option is processed, the call to
-.Fn getopt_long
-will return 0.
-For this reason, long option processing without
-shortcuts is not backwards compatible with
-.Xr getopt 3 .
-.Pp
-It is possible to combine these methods, providing for long options
-processing with short option equivalents for some options.
-Less
-frequently used options would be processed as long options only.
-.Pp
-The
-.Fn getopt_long
-call requires a structure to be initialized describing the long
-options.
-The structure is:
-.Bd -literal -offset indent
-struct option {
-	char *name;
-	int has_arg;
-	int *flag;
-	int val;
-};
-.Ed
-.Pp
-The
-.Va name
-field should contain the option name without the leading double dash.
-.Pp
-The
-.Va has_arg
-field should be one of:
-.Pp
-.Bl -tag -width ".Dv optional_argument" -offset indent -compact
-.It Dv no_argument
-no argument to the option is expect
-.It Dv required_argument
-an argument to the option is required
-.It Dv optional_argument
-an argument to the option may be presented.
-.El
-.Pp
-If
-.Va flag
-is not
-.Dv NULL ,
-then the integer pointed to by it will be set to the
-value in the
-.Va val
-field.
-If the
-.Va flag
-field is
-.Dv NULL ,
-then the
-.Va val
-field will be returned.
-Setting
-.Va flag
-to
-.Dv NULL
-and setting
-.Va val
-to the corresponding short option will make this function act just
-like
-.Xr getopt 3 .
-.Pp
-If the
-.Fa longindex
-field is not
-.Dv NULL ,
-then the integer pointed to by it will be set to the index of the long
-option relative to
-.Fa longopts .
-.Pp
-The last element of the
-.Fa longopts
-array has to be filled with zeroes.
-.Pp
-The
-.Fn getopt_long_only
-function behaves identically to
-.Fn getopt_long
-with the exception that long options may start with
-.Ql -
-in addition to
-.Ql -- .
-If an option starting with
-.Ql -
-does not match a long option but does match a single-character option,
-the single-character option is returned.
-.Sh RETURN VALUES
-If the
-.Fa flag
-field in
-.Vt "struct option"
-is
-.Dv NULL ,
-.Fn getopt_long
-and
-.Fn getopt_long_only
-return the value specified in the
-.Fa val
-field, which is usually just the corresponding short option.
-If
-.Fa flag
-is not
-.Dv NULL ,
-these functions return 0 and store
-.Fa val
-in the location pointed to by
-.Fa flag .
-These functions return
-.Ql \&:
-if there was a missing option argument,
-.Ql \&?
-if the user specified an unknown or ambiguous option, and
-\-1 when the argument list has been exhausted.
-.Sh ENVIRONMENT
-.Bl -tag -width ".Ev POSIXLY_CORRECT"
-.It Ev POSIXLY_CORRECT
-If set, option processing stops when the first non-option is found and
-a leading
-.Ql -
-or
-.Ql +
-in the
-.Fa optstring
-is ignored.
-.El
-.Sh EXAMPLES
-.Bd -literal -compact
-int bflag, ch, fd;
-int daggerset;
-
-/* options descriptor */
-static struct option longopts[] = {
-	{ "buffy",	no_argument,		NULL, 		'b' },
-	{ "fluoride",	required_argument,	NULL, 	       	'f' },
-	{ "daggerset",	no_argument,		\*[Am]daggerset,	1 },
-	{ NULL,		0,			NULL, 		0 }
-};
-
-bflag = 0;
-while ((ch = getopt_long(argc, argv, "bf:", longopts, NULL)) != -1) {
-	switch (ch) {
-	case 'b':
-		bflag = 1;
-		break;
-	case 'f':
-		if ((fd = open(optarg, O_RDONLY, 0)) == -1)
-			err(1, "unable to open %s", optarg);
-		break;
-	case 0:
-		if (daggerset) {
-			fprintf(stderr,"Buffy will use her dagger to "
-			    "apply fluoride to dracula's teeth\en");
-		}
-		break;
-	default:
-		usage();
-	}
-}
-argc -= optind;
-argv += optind;
-.Ed
-.Sh IMPLEMENTATION DIFFERENCES
-This section describes differences to the
-.Tn GNU
-implementation
-found in glibc-2.1.3:
-.Bl -bullet
-.\" .It
-.\" Handling of
-.\" .Ql -
-.\" as first char of option string in presence of
-.\" environment variable
-.\" .Ev POSIXLY_CORRECT :
-.\" .Bl -tag -width ".Bx"
-.\" .It Tn GNU
-.\" ignores
-.\" .Ev POSIXLY_CORRECT
-.\" and returns non-options as
-.\" arguments to option '\e1'.
-.\" .It Bx
-.\" honors
-.\" .Ev POSIXLY_CORRECT
-.\" and stops at the first non-option.
-.\" .El
-.\" .It
-.\" Handling of
-.\" .Ql -
-.\" within the option string (not the first character):
-.\" .Bl -tag -width ".Bx"
-.\" .It Tn GNU
-.\" treats a
-.\" .Ql -
-.\" on the command line as a non-argument.
-.\" .It Bx
-.\" a
-.\" .Ql -
-.\" within the option string matches a
-.\" .Ql -
-.\" (single dash) on the command line.
-.\" This functionality is provided for backward compatibility with
-.\" programs, such as
-.\" .Xr su 1 ,
-.\" that use
-.\" .Ql -
-.\" as an option flag.
-.\" This practice is wrong, and should not be used in any current development.
-.\" .El
-.\" .It
-.\" Handling of
-.\" .Ql ::
-.\" in options string in presence of
-.\" .Ev POSIXLY_CORRECT :
-.\" .Bl -tag -width ".Bx"
-.\" .It Both
-.\" .Tn GNU
-.\" and
-.\" .Bx
-.\" ignore
-.\" .Ev POSIXLY_CORRECT
-.\" here and take
-.\" .Ql ::
-.\" to
-.\" mean the preceding option takes an optional argument.
-.\" .El
-.\" .It
-.\" Return value in case of missing argument if first character
-.\" (after
-.\" .Ql +
-.\" or
-.\" .Ql - )
-.\" in option string is not
-.\" .Ql \&: :
-.\" .Bl -tag -width ".Bx"
-.\" .It Tn GNU
-.\" returns
-.\" .Ql \&?
-.\" .It Bx
-.\" returns
-.\" .Ql \&:
-.\" (since
-.\" .Bx Ns 's
-.\" .Fn getopt
-.\" does).
-.\" .El
-.\" .It
-.\" Handling of
-.\" .Ql --a
-.\" in getopt:
-.\" .Bl -tag -width ".Bx"
-.\" .It Tn GNU
-.\" parses this as option
-.\" .Ql - ,
-.\" option
-.\" .Ql a .
-.\" .It Bx
-.\" parses this as
-.\" .Ql -- ,
-.\" and returns \-1 (ignoring the
-.\" .Ql a ) .
-.\" (Because the original
-.\" .Fn getopt
-.\" does.)
-.\" .El
-.It
-Setting of
-.Va optopt
-for long options with
-.Va flag
-!=
-.Dv NULL :
-.Bl -tag -width ".Bx"
-.It Tn GNU
-sets
-.Va optopt
-to
-.Va val .
-.It Bx
-sets
-.Va optopt
-to 0 (since
-.Va val
-would never be returned).
-.El
-.\" .It
-.\" Handling of
-.\" .Ql -W
-.\" with
-.\" .Ql W;
-.\" in option string in
-.\" .Fn getopt
-.\" (not
-.\" .Fn getopt_long ) :
-.\" .Bl -tag -width ".Bx"
-.\" .It Tn GNU
-.\" causes a segfault.
-.\" .It Bx
-.\" no special handling is done;
-.\" .Ql W;
-.\" is interpreted as two separate options, neither of which take an argument.
-.\" .El
-.It
-Setting of
-.Va optarg
-for long options without an argument that are
-invoked via
-.Ql -W
-.Ql ( W;
-in option string):
-.Bl -tag -width ".Bx"
-.It Tn GNU
-sets
-.Va optarg
-to the option name (the argument of
-.Ql -W ) .
-.It Bx
-sets
-.Va optarg
-to
-.Dv NULL
-(the argument of the long option).
-.El
-.It
-Handling of
-.Ql -W
-with an argument that is not (a prefix to) a known
-long option
-.Ql ( W;
-in option string):
-.Bl -tag -width ".Bx"
-.It Tn GNU
-returns
-.Ql -W
-with
-.Va optarg
-set to the unknown option.
-.It Bx
-treats this as an error (unknown option) and returns
-.Ql \&?
-with
-.Va optopt
-set to 0 and
-.Va optarg
-set to
-.Dv NULL
-(as
-.Tn GNU Ns 's
-man page documents).
-.El
-.\" .It
-.\" The error messages are different.
-.It
-.Bx
-does not permute the argument vector at the same points in
-the calling sequence as
-.Tn GNU
-does.
-The aspects normally used by
-the caller (ordering after \-1 is returned, value of
-.Va optind
-relative
-to current positions) are the same, though.
-(We do fewer variable swaps.)
-.El
-.Sh SEE ALSO
-.Xr getopt 3
-.Sh HISTORY
-The
-.Fn getopt_long
-and
-.Fn getopt_long_only
-functions first appeared in the
-.Tn GNU
-libiberty library.
-The first
-.Bx
-implementation of
-.Fn getopt_long
-appeared in
-.Nx 1.5 ,
-the first
-.Bx
-implementation of
-.Fn getopt_long_only
-in
-.Ox 3.3 .
-.Fx
-first included
-.Fn getopt_long
-in
-.Fx 5.0 ,
-.Fn getopt_long_only
-in
-.Fx 5.2 .
-.Sh BUGS
-The
-.Fa argv
-argument is not really
-.Vt const
-as its elements may be permuted (unless
-.Ev POSIXLY_CORRECT
-is set).
-.Pp
-The implementation can completely replace
-.Xr getopt 3 ,
-but right now we are using separate code.
diff --git a/lib/libc_bsd/stdlib/getopt_long.c b/lib/libc_bsd/stdlib/getopt_long.c
deleted file mode 100644
index bd38b37..0000000
--- a/lib/libc_bsd/stdlib/getopt_long.c
+++ /dev/null
@@ -1,612 +0,0 @@
-/*	$OpenBSD: getopt_long.c,v 1.26 2013/06/08 22:47:56 millert Exp $	*/
-/*	$NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $	*/
-
-/*
- * Copyright (c) 2002 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Sponsored in part by the Defense Advanced Research Projects
- * Agency (DARPA) and Air Force Research Laboratory, Air Force
- * Materiel Command, USAF, under agreement number F39502-99-1-0512.
- */
-/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Dieter Baron and Thomas Klausner.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: getopt_long.c,v 1.16 2004/02/04 18:17:25 millert Exp $";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/getopt_long.c 268355 2014-07-07 05:31:50Z ache $");
-
-#include <err.h>
-#include <errno.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define GNU_COMPATIBLE		/* Be more compatible, configure's use us! */
-
-#if 0				/* we prefer to keep our getopt(3) */
-#define	REPLACE_GETOPT		/* use this getopt as the system getopt(3) */
-#endif
-
-#ifdef REPLACE_GETOPT
-int	opterr = 1;		/* if error message should be printed */
-int	optind = 1;		/* index into parent argv vector */
-int	optopt = '?';		/* character checked for validity */
-int	optreset;		/* reset getopt */
-char    *optarg;		/* argument associated with option */
-#endif
-
-#define PRINT_ERROR	((opterr) && (*options != ':'))
-
-#define FLAG_PERMUTE	0x01	/* permute non-options to the end of argv */
-#define FLAG_ALLARGS	0x02	/* treat non-options as args to option "-1" */
-#define FLAG_LONGONLY	0x04	/* operate as getopt_long_only */
-
-/* return values */
-#define	BADCH		(int)'?'
-#define	BADARG		((*options == ':') ? (int)':' : (int)'?')
-#define	INORDER 	(int)1
-
-#define	EMSG		""
-
-#ifdef GNU_COMPATIBLE
-#define NO_PREFIX	(-1)
-#define D_PREFIX	0
-#define DD_PREFIX	1
-#define W_PREFIX	2
-#endif
-
-static int getopt_internal(int, char * const *, const char *,
-			   const struct option *, int *, int);
-static int parse_long_options(char * const *, const char *,
-			      const struct option *, int *, int, int);
-static int gcd(int, int);
-static void permute_args(int, int, int, char * const *);
-
-static char *place = EMSG; /* option letter processing */
-
-/* XXX: set optreset to 1 rather than these two */
-static int nonopt_start = -1; /* first non option argument (for permute) */
-static int nonopt_end = -1;   /* first option after non options (for permute) */
-
-/* Error messages */
-static const char recargchar[] = "option requires an argument -- %c";
-static const char illoptchar[] = "illegal option -- %c"; /* From P1003.2 */
-#ifdef GNU_COMPATIBLE
-static int dash_prefix = NO_PREFIX;
-static const char gnuoptchar[] = "invalid option -- %c";
-
-static const char recargstring[] = "option `%s%s' requires an argument";
-static const char ambig[] = "option `%s%.*s' is ambiguous";
-static const char noarg[] = "option `%s%.*s' doesn't allow an argument";
-static const char illoptstring[] = "unrecognized option `%s%s'";
-#else
-static const char recargstring[] = "option requires an argument -- %s";
-static const char ambig[] = "ambiguous option -- %.*s";
-static const char noarg[] = "option doesn't take an argument -- %.*s";
-static const char illoptstring[] = "unknown option -- %s";
-#endif
-
-/*
- * Compute the greatest common divisor of a and b.
- */
-static int
-gcd(int a, int b)
-{
-	int c;
-
-	c = a % b;
-	while (c != 0) {
-		a = b;
-		b = c;
-		c = a % b;
-	}
-
-	return (b);
-}
-
-/*
- * Exchange the block from nonopt_start to nonopt_end with the block
- * from nonopt_end to opt_end (keeping the same order of arguments
- * in each block).
- */
-static void
-permute_args(int panonopt_start, int panonopt_end, int opt_end,
-	char * const *nargv)
-{
-	int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos;
-	char *swap;
-
-	/*
-	 * compute lengths of blocks and number and size of cycles
-	 */
-	nnonopts = panonopt_end - panonopt_start;
-	nopts = opt_end - panonopt_end;
-	ncycle = gcd(nnonopts, nopts);
-	cyclelen = (opt_end - panonopt_start) / ncycle;
-
-	for (i = 0; i < ncycle; i++) {
-		cstart = panonopt_end+i;
-		pos = cstart;
-		for (j = 0; j < cyclelen; j++) {
-			if (pos >= panonopt_end)
-				pos -= nnonopts;
-			else
-				pos += nopts;
-			swap = nargv[pos];
-			/* LINTED const cast */
-			((char **) nargv)[pos] = nargv[cstart];
-			/* LINTED const cast */
-			((char **)nargv)[cstart] = swap;
-		}
-	}
-}
-
-/*
- * parse_long_options --
- *	Parse long options in argc/argv argument vector.
- * Returns -1 if short_too is set and the option does not match long_options.
- */
-static int
-parse_long_options(char * const *nargv, const char *options,
-	const struct option *long_options, int *idx, int short_too, int flags)
-{
-	char *current_argv, *has_equal;
-#ifdef GNU_COMPATIBLE
-	char *current_dash;
-#endif
-	size_t current_argv_len;
-	int i, match, exact_match, second_partial_match;
-
-	current_argv = place;
-#ifdef GNU_COMPATIBLE
-	switch (dash_prefix) {
-		case D_PREFIX:
-			current_dash = "-";
-			break;
-		case DD_PREFIX:
-			current_dash = "--";
-			break;
-		case W_PREFIX:
-			current_dash = "-W ";
-			break;
-		default:
-			current_dash = "";
-			break;
-	}
-#endif
-	match = -1;
-	exact_match = 0;
-	second_partial_match = 0;
-
-	optind++;
-
-	if ((has_equal = strchr(current_argv, '=')) != NULL) {
-		/* argument found (--option=arg) */
-		current_argv_len = has_equal - current_argv;
-		has_equal++;
-	} else
-		current_argv_len = strlen(current_argv);
-
-	for (i = 0; long_options[i].name; i++) {
-		/* find matching long option */
-		if (strncmp(current_argv, long_options[i].name,
-		    current_argv_len))
-			continue;
-
-		if (strlen(long_options[i].name) == current_argv_len) {
-			/* exact match */
-			match = i;
-			exact_match = 1;
-			break;
-		}
-		/*
-		 * If this is a known short option, don't allow
-		 * a partial match of a single character.
-		 */
-		if (short_too && current_argv_len == 1)
-			continue;
-
-		if (match == -1)	/* first partial match */
-			match = i;
-		else if ((flags & FLAG_LONGONLY) ||
-			 long_options[i].has_arg !=
-			     long_options[match].has_arg ||
-			 long_options[i].flag != long_options[match].flag ||
-			 long_options[i].val != long_options[match].val)
-			second_partial_match = 1;
-	}
-	if (!exact_match && second_partial_match) {
-		/* ambiguous abbreviation */
-		if (PRINT_ERROR)
-			warnx(ambig,
-#ifdef GNU_COMPATIBLE
-			     current_dash,
-#endif
-			     (int)current_argv_len,
-			     current_argv);
-		optopt = 0;
-		return (BADCH);
-	}
-	if (match != -1) {		/* option found */
-		if (long_options[match].has_arg == no_argument
-		    && has_equal) {
-			if (PRINT_ERROR)
-				warnx(noarg,
-#ifdef GNU_COMPATIBLE
-				     current_dash,
-#endif
-				     (int)current_argv_len,
-				     current_argv);
-			/*
-			 * XXX: GNU sets optopt to val regardless of flag
-			 */
-			if (long_options[match].flag == NULL)
-				optopt = long_options[match].val;
-			else
-				optopt = 0;
-#ifdef GNU_COMPATIBLE
-			return (BADCH);
-#else
-			return (BADARG);
-#endif
-		}
-		if (long_options[match].has_arg == required_argument ||
-		    long_options[match].has_arg == optional_argument) {
-			if (has_equal)
-				optarg = has_equal;
-			else if (long_options[match].has_arg ==
-			    required_argument) {
-				/*
-				 * optional argument doesn't use next nargv
-				 */
-				optarg = nargv[optind++];
-			}
-		}
-		if ((long_options[match].has_arg == required_argument)
-		    && (optarg == NULL)) {
-			/*
-			 * Missing argument; leading ':' indicates no error
-			 * should be generated.
-			 */
-			if (PRINT_ERROR)
-				warnx(recargstring,
-#ifdef GNU_COMPATIBLE
-				    current_dash,
-#endif
-				    current_argv);
-			/*
-			 * XXX: GNU sets optopt to val regardless of flag
-			 */
-			if (long_options[match].flag == NULL)
-				optopt = long_options[match].val;
-			else
-				optopt = 0;
-			--optind;
-			return (BADARG);
-		}
-	} else {			/* unknown option */
-		if (short_too) {
-			--optind;
-			return (-1);
-		}
-		if (PRINT_ERROR)
-			warnx(illoptstring,
-#ifdef GNU_COMPATIBLE
-			      current_dash,
-#endif
-			      current_argv);
-		optopt = 0;
-		return (BADCH);
-	}
-	if (idx)
-		*idx = match;
-	if (long_options[match].flag) {
-		*long_options[match].flag = long_options[match].val;
-		return (0);
-	} else
-		return (long_options[match].val);
-}
-
-/*
- * getopt_internal --
- *	Parse argc/argv argument vector.  Called by user level routines.
- */
-static int
-getopt_internal(int nargc, char * const *nargv, const char *options,
-	const struct option *long_options, int *idx, int flags)
-{
-	char *oli;				/* option letter list index */
-	int optchar, short_too;
-	static int posixly_correct = -1;
-
-	if (options == NULL)
-		return (-1);
-
-	/*
-	 * XXX Some GNU programs (like cvs) set optind to 0 instead of
-	 * XXX using optreset.  Work around this braindamage.
-	 */
-	if (optind == 0)
-		optind = optreset = 1;
-
-	/*
-	 * Disable GNU extensions if POSIXLY_CORRECT is set or options
-	 * string begins with a '+'.
-	 */
-	if (posixly_correct == -1 || optreset)
-		posixly_correct = (getenv("POSIXLY_CORRECT") != NULL);
-	if (*options == '-')
-		flags |= FLAG_ALLARGS;
-	else if (posixly_correct || *options == '+')
-		flags &= ~FLAG_PERMUTE;
-	if (*options == '+' || *options == '-')
-		options++;
-
-	optarg = NULL;
-	if (optreset)
-		nonopt_start = nonopt_end = -1;
-start:
-	if (optreset || !*place) {		/* update scanning pointer */
-		optreset = 0;
-		if (optind >= nargc) {          /* end of argument vector */
-			place = EMSG;
-			if (nonopt_end != -1) {
-				/* do permutation, if we have to */
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			else if (nonopt_start != -1) {
-				/*
-				 * If we skipped non-options, set optind
-				 * to the first of them.
-				 */
-				optind = nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return (-1);
-		}
-		if (*(place = nargv[optind]) != '-' ||
-#ifdef GNU_COMPATIBLE
-		    place[1] == '\0') {
-#else
-		    (place[1] == '\0' && strchr(options, '-') == NULL)) {
-#endif
-			place = EMSG;		/* found non-option */
-			if (flags & FLAG_ALLARGS) {
-				/*
-				 * GNU extension:
-				 * return non-option as argument to option 1
-				 */
-				optarg = nargv[optind++];
-				return (INORDER);
-			}
-			if (!(flags & FLAG_PERMUTE)) {
-				/*
-				 * If no permutation wanted, stop parsing
-				 * at first non-option.
-				 */
-				return (-1);
-			}
-			/* do permutation */
-			if (nonopt_start == -1)
-				nonopt_start = optind;
-			else if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				nonopt_start = optind -
-				    (nonopt_end - nonopt_start);
-				nonopt_end = -1;
-			}
-			optind++;
-			/* process next argument */
-			goto start;
-		}
-		if (nonopt_start != -1 && nonopt_end == -1)
-			nonopt_end = optind;
-
-		/*
-		 * If we have "-" do nothing, if "--" we are done.
-		 */
-		if (place[1] != '\0' && *++place == '-' && place[1] == '\0') {
-			optind++;
-			place = EMSG;
-			/*
-			 * We found an option (--), so if we skipped
-			 * non-options, we have to permute.
-			 */
-			if (nonopt_end != -1) {
-				permute_args(nonopt_start, nonopt_end,
-				    optind, nargv);
-				optind -= nonopt_end - nonopt_start;
-			}
-			nonopt_start = nonopt_end = -1;
-			return (-1);
-		}
-	}
-
-	/*
-	 * Check long options if:
-	 *  1) we were passed some
-	 *  2) the arg is not just "-"
-	 *  3) either the arg starts with -- we are getopt_long_only()
-	 */
-	if (long_options != NULL && place != nargv[optind] &&
-	    (*place == '-' || (flags & FLAG_LONGONLY))) {
-		short_too = 0;
-#ifdef GNU_COMPATIBLE
-		dash_prefix = D_PREFIX;
-#endif
-		if (*place == '-') {
-			place++;		/* --foo long option */
-#ifdef GNU_COMPATIBLE
-			dash_prefix = DD_PREFIX;
-#endif
-		} else if (*place != ':' && strchr(options, *place) != NULL)
-			short_too = 1;		/* could be short option too */
-
-		optchar = parse_long_options(nargv, options, long_options,
-		    idx, short_too, flags);
-		if (optchar != -1) {
-			place = EMSG;
-			return (optchar);
-		}
-	}
-
-	if ((optchar = (int)*place++) == (int)':' ||
-	    (optchar == (int)'-' && *place != '\0') ||
-	    (oli = strchr(options, optchar)) == NULL) {
-		/*
-		 * If the user specified "-" and  '-' isn't listed in
-		 * options, return -1 (non-option) as per POSIX.
-		 * Otherwise, it is an unknown option character (or ':').
-		 */
-		if (optchar == (int)'-' && *place == '\0')
-			return (-1);
-		if (!*place)
-			++optind;
-#ifdef GNU_COMPATIBLE
-		if (PRINT_ERROR)
-			warnx(posixly_correct ? illoptchar : gnuoptchar,
-			      optchar);
-#else
-		if (PRINT_ERROR)
-			warnx(illoptchar, optchar);
-#endif
-		optopt = optchar;
-		return (BADCH);
-	}
-	if (long_options != NULL && optchar == 'W' && oli[1] == ';') {
-		/* -W long-option */
-		if (*place)			/* no space */
-			/* NOTHING */;
-		else if (++optind >= nargc) {	/* no arg */
-			place = EMSG;
-			if (PRINT_ERROR)
-				warnx(recargchar, optchar);
-			optopt = optchar;
-			return (BADARG);
-		} else				/* white space */
-			place = nargv[optind];
-#ifdef GNU_COMPATIBLE
-		dash_prefix = W_PREFIX;
-#endif
-		optchar = parse_long_options(nargv, options, long_options,
-		    idx, 0, flags);
-		place = EMSG;
-		return (optchar);
-	}
-	if (*++oli != ':') {			/* doesn't take argument */
-		if (!*place)
-			++optind;
-	} else {				/* takes (optional) argument */
-		optarg = NULL;
-		if (*place)			/* no white space */
-			optarg = place;
-		else if (oli[1] != ':') {	/* arg not optional */
-			if (++optind >= nargc) {	/* no arg */
-				place = EMSG;
-				if (PRINT_ERROR)
-					warnx(recargchar, optchar);
-				optopt = optchar;
-				return (BADARG);
-			} else
-				optarg = nargv[optind];
-		}
-		place = EMSG;
-		++optind;
-	}
-	/* dump back option letter */
-	return (optchar);
-}
-
-#ifdef REPLACE_GETOPT
-/*
- * getopt --
- *	Parse argc/argv argument vector.
- *
- * [eventually this will replace the BSD getopt]
- */
-int
-getopt(int nargc, char * const *nargv, const char *options)
-{
-
-	/*
-	 * We don't pass FLAG_PERMUTE to getopt_internal() since
-	 * the BSD getopt(3) (unlike GNU) has never done this.
-	 *
-	 * Furthermore, since many privileged programs call getopt()
-	 * before dropping privileges it makes sense to keep things
-	 * as simple (and bug-free) as possible.
-	 */
-	return (getopt_internal(nargc, nargv, options, NULL, NULL, 0));
-}
-#endif /* REPLACE_GETOPT */
-
-/*
- * getopt_long --
- *	Parse argc/argv argument vector.
- */
-int
-getopt_long(int nargc, char * const *nargv, const char *options,
-	const struct option *long_options, int *idx)
-{
-
-	return (getopt_internal(nargc, nargv, options, long_options, idx,
-	    FLAG_PERMUTE));
-}
-
-/*
- * getopt_long_only --
- *	Parse argc/argv argument vector.
- */
-int
-getopt_long_only(int nargc, char * const *nargv, const char *options,
-	const struct option *long_options, int *idx)
-{
-
-	return (getopt_internal(nargc, nargv, options, long_options, idx,
-	    FLAG_PERMUTE|FLAG_LONGONLY));
-}
diff --git a/lib/libc_bsd/stdlib/getsubopt.3 b/lib/libc_bsd/stdlib/getsubopt.3
deleted file mode 100644
index 0b86c7f..0000000
--- a/lib/libc_bsd/stdlib/getsubopt.3
+++ /dev/null
@@ -1,147 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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. 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.
-.\"
-.\"     @(#)getsubopt.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/getsubopt.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd December 25, 2011
-.Dt GETSUBOPT 3
-.Os
-.Sh NAME
-.Nm getsubopt
-.Nd get sub options from an argument
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Vt extern char *suboptarg ;
-.Ft int
-.Fn getsubopt "char **optionp" "char * const *tokens" "char **valuep"
-.Sh DESCRIPTION
-The
-.Fn getsubopt
-function
-parses a string containing tokens delimited by one or more tab, space or
-comma
-.Pq Ql \&,
-characters.
-It is intended for use in parsing groups of option arguments provided
-as part of a utility command line.
-.Pp
-The argument
-.Fa optionp
-is a pointer to a pointer to the string.
-The argument
-.Fa tokens
-is a pointer to a
-.Dv NULL Ns -terminated
-array of pointers to strings.
-.Pp
-The
-.Fn getsubopt
-function
-returns the zero-based offset of the pointer in the
-.Fa tokens
-array referencing a string which matches the first token
-in the string, or, \-1 if the string contains no tokens or
-.Fa tokens
-does not contain a matching string.
-.Pp
-If the token is of the form ``name=value'', the location referenced by
-.Fa valuep
-will be set to point to the start of the ``value'' portion of the token.
-.Pp
-On return from
-.Fn getsubopt ,
-.Fa optionp
-will be set to point to the start of the next token in the string,
-or the null at the end of the string if no more tokens are present.
-The external variable
-.Fa suboptarg
-will be set to point to the start of the current token, or
-.Dv NULL
-if no
-tokens were present.
-The argument
-.Fa valuep
-will be set to point to the ``value'' portion of the token, or
-.Dv NULL
-if no ``value'' portion was present.
-.Sh EXAMPLES
-.Bd -literal -compact
-char *tokens[] = {
-	#define	ONE	0
-		"one",
-	#define	TWO	1
-		"two",
-	NULL
-};
-
-\&...
-
-extern char *optarg, *suboptarg;
-char *options, *value;
-
-while ((ch = getopt(argc, argv, "ab:")) != \-1) {
-	switch(ch) {
-	case 'a':
-		/* process ``a'' option */
-		break;
-	case 'b':
-		options = optarg;
-		while (*options) {
-			switch(getsubopt(&options, tokens, &value)) {
-			case ONE:
-				/* process ``one'' sub option */
-				break;
-			case TWO:
-				/* process ``two'' sub option */
-				if (!value)
-					error("no value for two");
-				i = atoi(value);
-				break;
-			case \-1:
-				if (suboptarg)
-					error("illegal sub option %s",
-					  suboptarg);
-				else
-					error("missing sub option");
-				break;
-			}
-		}
-		break;
-	}
-}
-.Ed
-.Sh SEE ALSO
-.Xr getopt 3 ,
-.Xr strsep 3
-.Sh HISTORY
-The
-.Fn getsubopt
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/stdlib/getsubopt.c b/lib/libc_bsd/stdlib/getsubopt.c
deleted file mode 100644
index 6315b62..0000000
--- a/lib/libc_bsd/stdlib/getsubopt.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)getsubopt.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/getsubopt.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * The SVID interface to getsubopt provides no way of figuring out which
- * part of the suboptions list wasn't matched.  This makes error messages
- * tricky...  The extern variable suboptarg is a pointer to the token
- * which didn't match.
- */
-char *suboptarg;
-
-int
-getsubopt(optionp, tokens, valuep)
-	char **optionp, **valuep;
-	char * const *tokens;
-{
-	int cnt;
-	char *p;
-
-	suboptarg = *valuep = NULL;
-
-	if (!optionp || !*optionp)
-		return(-1);
-
-	/* skip leading white-space, commas */
-	for (p = *optionp; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
-
-	if (!*p) {
-		*optionp = p;
-		return(-1);
-	}
-
-	/* save the start of the token, and skip the rest of the token. */
-	for (suboptarg = p;
-	    *++p && *p != ',' && *p != '=' && *p != ' ' && *p != '\t';);
-
-	if (*p) {
-		/*
-		 * If there's an equals sign, set the value pointer, and
-		 * skip over the value part of the token.  Terminate the
-		 * token.
-		 */
-		if (*p == '=') {
-			*p = '\0';
-			for (*valuep = ++p;
-			    *p && *p != ',' && *p != ' ' && *p != '\t'; ++p);
-			if (*p)
-				*p++ = '\0';
-		} else
-			*p++ = '\0';
-		/* Skip any whitespace or commas after this token. */
-		for (; *p && (*p == ',' || *p == ' ' || *p == '\t'); ++p);
-	}
-
-	/* set optionp for next round. */
-	*optionp = p;
-
-	for (cnt = 0; *tokens; ++tokens, ++cnt)
-		if (!strcmp(suboptarg, *tokens))
-			return(cnt);
-	return(-1);
-}
diff --git a/lib/libc_bsd/stdlib/hcreate.3 b/lib/libc_bsd/stdlib/hcreate.3
deleted file mode 100644
index a370907..0000000
--- a/lib/libc_bsd/stdlib/hcreate.3
+++ /dev/null
@@ -1,258 +0,0 @@
-.\"-
-.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Klaus Klein.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libc/stdlib/hcreate.3 206622 2010-04-14 19:08:06Z uqs $
-.\"
-.Dd July 6, 2008
-.Dt HCREATE 3
-.Os
-.Sh NAME
-.Nm hcreate , hdestroy , hsearch
-.Nd manage hash search table
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In search.h
-.Ft int
-.Fn hcreate "size_t nel"
-.Ft void
-.Fn hdestroy void
-.Ft ENTRY *
-.Fn hsearch "ENTRY item" "ACTION action"
-.Sh DESCRIPTION
-The
-.Fn hcreate ,
-.Fn hdestroy ,
-and
-.Fn hsearch
-functions manage hash search tables.
-.Pp
-The
-.Fn hcreate
-function allocates sufficient space for the table, and the application should
-ensure it is called before
-.Fn hsearch
-is used.
-The
-.Fa nel
-argument is an estimate of the maximum
-number of entries that the table should contain.
-This number may be adjusted upward by the
-algorithm in order to obtain certain mathematically favorable circumstances.
-.Pp
-The
-.Fn hdestroy
-function disposes of the search table, and may be followed by another call to
-.Fn hcreate .
-After the call to
-.Fn hdestroy ,
-the data can no longer be considered accessible.
-The
-.Fn hdestroy
-function calls
-.Xr free 3
-for each comparison key in the search table
-but not the data item associated with the key.
-.Pp
-The
-.Fn hsearch
-function is a hash-table search routine.
-It returns a pointer into a hash table
-indicating the location at which an entry can be found.
-The
-.Fa item
-argument is a structure of type
-.Vt ENTRY
-(defined in the
-.In search.h
-header) containing two pointers:
-.Fa item.key
-points to the comparison key (a
-.Vt "char *" ) ,
-and
-.Fa item.data
-(a
-.Vt "void *" )
-points to any other data to be associated with
-that key.
-The comparison function used by
-.Fn hsearch
-is
-.Xr strcmp 3 .
-The
-.Fa action
-argument is a
-member of an enumeration type
-.Vt ACTION
-indicating the disposition of the entry if it cannot be
-found in the table.
-.Dv ENTER
-indicates that the
-.Fa item
-should be inserted in the table at an
-appropriate point.
-.Dv FIND
-indicates that no entry should be made.
-Unsuccessful resolution is
-indicated by the return of a
-.Dv NULL
-pointer.
-.Pp
-The comparison key (passed to
-.Fn hsearch
-as
-.Fa item.key )
-must be allocated using
-.Xr malloc 3
-if
-.Fa action
-is
-.Dv ENTER
-and
-.Fn hdestroy
-is called.
-.Sh RETURN VALUES
-The
-.Fn hcreate
-function returns 0 if the table creation failed and the global variable
-.Va errno
-is set to indicate the error;
-otherwise, a non-zero value is returned.
-.Pp
-The
-.Fn hdestroy
-function does not return a value.
-.Pp
-The
-.Fn hsearch
-function returns a
-.Dv NULL
-pointer if either the
-.Fa action
-is
-.Dv FIND
-and the
-.Fa item
-could not be found or the
-.Fa action
-is
-.Dv ENTER
-and the table is full.
-.Sh EXAMPLES
-The following example reads in strings followed by two numbers
-and stores them in a hash table, discarding duplicates.
-It then reads in strings and finds the matching entry in the hash
-table and prints it out.
-.Bd -literal
-#include <stdio.h>
-#include <search.h>
-#include <string.h>
-#include <stdlib.h>
-
-struct info {			/* This is the info stored in the table */
-	int age, room;		/* other than the key. */
-};
-
-#define NUM_EMPL	5000	/* # of elements in search table. */
-
-int
-main(void)
-{
-	char str[BUFSIZ]; /* Space to read string */
-	struct info info_space[NUM_EMPL]; /* Space to store employee info. */
-	struct info *info_ptr = info_space; /* Next space in info_space. */
-	ENTRY item;
-	ENTRY *found_item; /* Name to look for in table. */
-	char name_to_find[30];
-	int i = 0;
-
-	/* Create table; no error checking is performed. */
-	(void) hcreate(NUM_EMPL);
-
-	while (scanf("%s%d%d", str, &info_ptr->age,
-	    &info_ptr->room) != EOF && i++ < NUM_EMPL) {
-		/* Put information in structure, and structure in item. */
-		item.key = strdup(str);
-		item.data = info_ptr;
-		info_ptr++;
-		/* Put item into table. */
-		(void) hsearch(item, ENTER);
-	}
-
-	/* Access table. */
-	item.key = name_to_find;
-	while (scanf("%s", item.key) != EOF) {
-		if ((found_item = hsearch(item, FIND)) != NULL) {
-			/* If item is in the table. */
-			(void)printf("found %s, age = %d, room = %d\en",
-			    found_item->key,
-			    ((struct info *)found_item->data)->age,
-			    ((struct info *)found_item->data)->room);
-		} else
-			(void)printf("no such employee %s\en", name_to_find);
-	}
-	hdestroy();
-	return 0;
-}
-.Ed
-.Sh ERRORS
-The
-.Fn hcreate
-and
-.Fn hsearch
-functions may fail if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-Insufficient storage space is available.
-.It Bq Er EINVAL
-A table already exists.
-.El
-.Sh SEE ALSO
-.Xr bsearch 3 ,
-.Xr lsearch 3 ,
-.Xr malloc 3 ,
-.Xr strcmp 3 ,
-.Xr tsearch 3
-.Sh STANDARDS
-The
-.Fn hcreate ,
-.Fn hdestroy ,
-and
-.Fn hsearch
-functions conform to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn hcreate ,
-.Fn hdestroy ,
-and
-.Fn hsearch
-functions first appeared in
-.At V .
-.Sh BUGS
-The interface permits the use of only one hash table at a time.
diff --git a/lib/libc_bsd/stdlib/hcreate.c b/lib/libc_bsd/stdlib/hcreate.c
deleted file mode 100644
index 8ed2d21..0000000
--- a/lib/libc_bsd/stdlib/hcreate.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/* $NetBSD: hcreate.c,v 1.6 2008/07/21 12:05:43 lukem Exp $ */
-
-/*
- * Copyright (c) 2001 Christopher G. Demetriou
- * 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 for the
- *          NetBSD Project.  See http://www.NetBSD.org/ for
- *          information about NetBSD.
- * 4. 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 ``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 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.
- * 
- * <<Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp>>
- */
-
-/*
- * hcreate() / hsearch() / hdestroy()
- *
- * SysV/XPG4 hash table functions.
- *
- * Implementation done based on NetBSD manual page and Solaris manual page,
- * plus my own personal experience about how they're supposed to work.
- *
- * I tried to look at Knuth (as cited by the Solaris manual page), but
- * nobody had a copy in the office, so...
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: hcreate.c,v 1.6 2008/07/21 12:05:43 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/hcreate.c 269491 2014-08-04 00:51:57Z pfg $");
-
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <errno.h>
-#include <search.h>
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * DO NOT MAKE THIS STRUCTURE LARGER THAN 32 BYTES (4 ptrs on 64-bit
- * ptr machine) without adjusting MAX_BUCKETS_LG2 below.
- */
-struct internal_entry {
-	SLIST_ENTRY(internal_entry) link;
-	ENTRY ent;
-};
-SLIST_HEAD(internal_head, internal_entry);
-
-#define	MIN_BUCKETS_LG2	4
-#define	MIN_BUCKETS	(1 << MIN_BUCKETS_LG2)
-
-/*
- * max * sizeof internal_entry must fit into size_t.
- * assumes internal_entry is <= 32 (2^5) bytes.
- */
-#define	MAX_BUCKETS_LG2	(sizeof (size_t) * 8 - 1 - 5)
-#define	MAX_BUCKETS	((size_t)1 << MAX_BUCKETS_LG2)
-
-/* Default hash function, from db/hash/hash_func.c */
-extern uint32_t (*__default_hash)(const void *, size_t);
-
-static struct internal_head *htable;
-static size_t htablesize;
-
-int
-hcreate(size_t nel)
-{
-	size_t idx;
-	unsigned int p2;
-
-	/* Make sure this is not called when a table already exists. */
-	if (htable != NULL) {
-		errno = EINVAL;
-		return 0;
-	}
-
-	/* If nel is too small, make it min sized. */
-	if (nel < MIN_BUCKETS)
-		nel = MIN_BUCKETS;
-
-	/* If it is too large, cap it. */
-	if (nel > MAX_BUCKETS)
-		nel = MAX_BUCKETS;
-
-	/* If it is not a power of two in size, round up. */
-	if ((nel & (nel - 1)) != 0) {
-		for (p2 = 0; nel != 0; p2++)
-			nel >>= 1;
-		nel = 1 << p2;
-	}
-	
-	/* Allocate the table. */
-	htablesize = nel;
-	htable = malloc(htablesize * sizeof htable[0]);
-	if (htable == NULL) {
-		errno = ENOMEM;
-		return 0;
-	}
-
-	/* Initialize it. */
-	for (idx = 0; idx < htablesize; idx++)
-		SLIST_INIT(&htable[idx]);
-
-	return 1;
-}
-
-void
-hdestroy(void)
-{
-	struct internal_entry *ie;
-	size_t idx;
-
-	if (htable == NULL)
-		return;
-
-	for (idx = 0; idx < htablesize; idx++) {
-		while (!SLIST_EMPTY(&htable[idx])) {
-			ie = SLIST_FIRST(&htable[idx]);
-			SLIST_REMOVE_HEAD(&htable[idx], link);
-			free(ie);
-		}
-	}
-	free(htable);
-	htable = NULL;
-}
-
-ENTRY *
-hsearch(ENTRY item, ACTION action)
-{
-	struct internal_head *head;
-	struct internal_entry *ie;
-	uint32_t hashval;
-	size_t len;
-
-	len = strlen(item.key);
-	hashval = (*__default_hash)(item.key, len);
-
-	head = &htable[hashval & (htablesize - 1)];
-	ie = SLIST_FIRST(head);
-	while (ie != NULL) {
-		if (strcmp(ie->ent.key, item.key) == 0)
-			break;
-		ie = SLIST_NEXT(ie, link);
-	}
-
-	if (ie != NULL)
-		return &ie->ent;
-	else if (action == FIND)
-		return NULL;
-
-	ie = malloc(sizeof *ie);
-	if (ie == NULL)
-		return NULL;
-	ie->ent.key = item.key;
-	ie->ent.data = item.data;
-
-	SLIST_INSERT_HEAD(head, ie, link);
-	return &ie->ent;
-}
diff --git a/lib/libc_bsd/stdlib/heapsort.c b/lib/libc_bsd/stdlib/heapsort.c
deleted file mode 100644
index d4de5b2..0000000
--- a/lib/libc_bsd/stdlib/heapsort.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ronnie Kon at Mindcraft Inc., Kevin Lew and Elmer Yglesias.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)heapsort.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/heapsort.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <errno.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-/*
- * Swap two areas of size number of bytes.  Although qsort(3) permits random
- * blocks of memory to be sorted, sorting pointers is almost certainly the
- * common case (and, were it not, could easily be made so).  Regardless, it
- * isn't worth optimizing; the SWAP's get sped up by the cache, and pointer
- * arithmetic gets lost in the time required for comparison function calls.
- */
-#define	SWAP(a, b, count, size, tmp) { \
-	count = size; \
-	do { \
-		tmp = *a; \
-		*a++ = *b; \
-		*b++ = tmp; \
-	} while (--count); \
-}
-
-/* Copy one block of size size to another. */
-#define COPY(a, b, count, size, tmp1, tmp2) { \
-	count = size; \
-	tmp1 = a; \
-	tmp2 = b; \
-	do { \
-		*tmp1++ = *tmp2++; \
-	} while (--count); \
-}
-
-/*
- * Build the list into a heap, where a heap is defined such that for
- * the records K1 ... KN, Kj/2 >= Kj for 1 <= j/2 <= j <= N.
- *
- * There two cases.  If j == nmemb, select largest of Ki and Kj.  If
- * j < nmemb, select largest of Ki, Kj and Kj+1.
- */
-#define CREATE(initval, nmemb, par_i, child_i, par, child, size, count, tmp) { \
-	for (par_i = initval; (child_i = par_i * 2) <= nmemb; \
-	    par_i = child_i) { \
-		child = base + child_i * size; \
-		if (child_i < nmemb && compar(child, child + size) < 0) { \
-			child += size; \
-			++child_i; \
-		} \
-		par = base + par_i * size; \
-		if (compar(child, par) <= 0) \
-			break; \
-		SWAP(par, child, count, size, tmp); \
-	} \
-}
-
-/*
- * Select the top of the heap and 'heapify'.  Since by far the most expensive
- * action is the call to the compar function, a considerable optimization
- * in the average case can be achieved due to the fact that k, the displaced
- * elememt, is ususally quite small, so it would be preferable to first
- * heapify, always maintaining the invariant that the larger child is copied
- * over its parent's record.
- *
- * Then, starting from the *bottom* of the heap, finding k's correct place,
- * again maintianing the invariant.  As a result of the invariant no element
- * is 'lost' when k is assigned its correct place in the heap.
- *
- * The time savings from this optimization are on the order of 15-20% for the
- * average case. See Knuth, Vol. 3, page 158, problem 18.
- *
- * XXX Don't break the #define SELECT line, below.  Reiser cpp gets upset.
- */
-#define SELECT(par_i, child_i, nmemb, par, child, size, k, count, tmp1, tmp2) { \
-	for (par_i = 1; (child_i = par_i * 2) <= nmemb; par_i = child_i) { \
-		child = base + child_i * size; \
-		if (child_i < nmemb && compar(child, child + size) < 0) { \
-			child += size; \
-			++child_i; \
-		} \
-		par = base + par_i * size; \
-		COPY(par, child, count, size, tmp1, tmp2); \
-	} \
-	for (;;) { \
-		child_i = par_i; \
-		par_i = child_i / 2; \
-		child = base + child_i * size; \
-		par = base + par_i * size; \
-		if (child_i == 1 || compar(k, par) < 0) { \
-			COPY(child, k, count, size, tmp1, tmp2); \
-			break; \
-		} \
-		COPY(child, par, count, size, tmp1, tmp2); \
-	} \
-}
-
-/*
- * Heapsort -- Knuth, Vol. 3, page 145.  Runs in O (N lg N), both average
- * and worst.  While heapsort is faster than the worst case of quicksort,
- * the BSD quicksort does median selection so that the chance of finding
- * a data set that will trigger the worst case is nonexistent.  Heapsort's
- * only advantage over quicksort is that it requires little additional memory.
- */
-int
-heapsort(vbase, nmemb, size, compar)
-	void *vbase;
-	size_t nmemb, size;
-	int (*compar)(const void *, const void *);
-{
-	size_t cnt, i, j, l;
-	char tmp, *tmp1, *tmp2;
-	char *base, *k, *p, *t;
-
-	if (nmemb <= 1)
-		return (0);
-
-	if (!size) {
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if ((k = malloc(size)) == NULL)
-		return (-1);
-
-	/*
-	 * Items are numbered from 1 to nmemb, so offset from size bytes
-	 * below the starting address.
-	 */
-	base = (char *)vbase - size;
-
-	for (l = nmemb / 2 + 1; --l;)
-		CREATE(l, nmemb, i, j, t, p, size, cnt, tmp);
-
-	/*
-	 * For each element of the heap, save the largest element into its
-	 * final slot, save the displaced element (k), then recreate the
-	 * heap.
-	 */
-	while (nmemb > 1) {
-		COPY(k, base + nmemb * size, cnt, size, tmp1, tmp2);
-		COPY(base + nmemb * size, base + size, cnt, size, tmp1, tmp2);
-		--nmemb;
-		SELECT(i, j, nmemb, t, p, size, k, cnt, tmp1, tmp2);
-	}
-	free(k);
-	return (0);
-}
diff --git a/lib/libc_bsd/stdlib/imaxabs.3 b/lib/libc_bsd/stdlib/imaxabs.3
deleted file mode 100644
index 782b59d..0000000
--- a/lib/libc_bsd/stdlib/imaxabs.3
+++ /dev/null
@@ -1,62 +0,0 @@
-.\" Copyright (c) 2001 Mike Barcroft <mike@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.
-.\"
-.\" 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: releng/10.2/lib/libc/stdlib/imaxabs.3 86737 2001-11-21 16:19:50Z ru $
-.\"
-.Dd November 14, 2001
-.Dt IMAXABS 3
-.Os
-.Sh NAME
-.Nm imaxabs
-.Nd returns absolute value
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In inttypes.h
-.Ft intmax_t
-.Fn imaxabs "intmax_t j"
-.Sh DESCRIPTION
-The
-.Fn imaxabs
-function returns the absolute value of
-.Fa j .
-.Sh SEE ALSO
-.Xr abs 3 ,
-.Xr fabs 3 ,
-.Xr hypot 3 ,
-.Xr labs 3 ,
-.Xr llabs 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn imaxabs
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn imaxabs
-function first appeared in
-.Fx 5.0 .
-.Sh BUGS
-The absolute value of the most negative integer remains negative.
diff --git a/lib/libc_bsd/stdlib/imaxabs.c b/lib/libc_bsd/stdlib/imaxabs.c
deleted file mode 100644
index 66936d2..0000000
--- a/lib/libc_bsd/stdlib/imaxabs.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/imaxabs.c 86368 2001-11-15 02:05:03Z mike $");
-
-#include <inttypes.h>
-
-intmax_t
-imaxabs(intmax_t j)
-{
-	return (j < 0 ? -j : j);
-}
diff --git a/lib/libc_bsd/stdlib/imaxdiv.3 b/lib/libc_bsd/stdlib/imaxdiv.3
deleted file mode 100644
index 6d4afe3..0000000
--- a/lib/libc_bsd/stdlib/imaxdiv.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" Copyright (c) 2001 Mike Barcroft <mike@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.
-.\"
-.\" 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: releng/10.2/lib/libc/stdlib/imaxdiv.3 86737 2001-11-21 16:19:50Z ru $
-.\"
-.Dd November 14, 2001
-.Dt IMAXDIV 3
-.Os
-.Sh NAME
-.Nm imaxdiv
-.Nd returns quotient and remainder
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In inttypes.h
-.Ft imaxdiv_t
-.Fn imaxdiv "intmax_t numer" "intmax_t denom"
-.Sh DESCRIPTION
-The
-.Fn imaxdiv
-function computes the value of
-.Fa numer
-divided by
-.Fa denom
-and returns the stored result in the form of the
-.Vt imaxdiv_t
-type.
-.Pp
-The
-.Vt imaxdiv_t
-type is defined as:
-.Bd -literal -offset indent
-typedef struct {
-	intmax_t quot; /* Quotient. */
-	intmax_t rem;  /* Remainder. */
-} imaxdiv_t;
-.Ed
-.Sh SEE ALSO
-.Xr div 3 ,
-.Xr ldiv 3 ,
-.Xr lldiv 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn imaxdiv
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn imaxdiv
-function first appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/stdlib/imaxdiv.c b/lib/libc_bsd/stdlib/imaxdiv.c
deleted file mode 100644
index b535864..0000000
--- a/lib/libc_bsd/stdlib/imaxdiv.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/imaxdiv.c 86368 2001-11-15 02:05:03Z mike $");
-
-#include <inttypes.h>
-
-/* See comments in div.c for implementation details. */
-imaxdiv_t
-imaxdiv(intmax_t numer, intmax_t denom)
-{
-	imaxdiv_t retval;
-
-	retval.quot = numer / denom;
-	retval.rem = numer % denom;
-	if (numer >= 0 && retval.rem < 0) {
-		retval.quot++;
-		retval.rem -= denom;
-	}
-	return (retval);
-}
diff --git a/lib/libc_bsd/stdlib/insque.3 b/lib/libc_bsd/stdlib/insque.3
deleted file mode 100644
index 7849b10..0000000
--- a/lib/libc_bsd/stdlib/insque.3
+++ /dev/null
@@ -1,61 +0,0 @@
-.\"
-.\" Initial implementation:
-.\" Copyright (c) 2002 Robert Drehmel
-.\" All rights reserved.
-.\"
-.\" As long as the above copyright statement and this notice remain
-.\" unchanged, you can do what ever you want with this file.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/insque.3 111503 2003-02-25 21:59:36Z robert $
-.\"
-.Dd October 10, 2002
-.Dt INSQUE 3
-.Os
-.Sh NAME
-.Nm insque ,
-.Nm remque
-.Nd doubly-linked list management
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In search.h
-.Ft void
-.Fn insque "void *element1" "void *pred"
-.Ft void
-.Fn remque "void *element"
-.Sh DESCRIPTION
-The
-.Fn insque
-and
-.Fn remque
-functions encapsulate the ever-repeating task of doing insertion and
-removal operations on doubly linked lists.
-The functions expect their
-arguments to point to a structure whose first and second members are
-pointers to the next and previous element, respectively.
-The
-.Fn insque
-function also allows the
-.Fa pred
-argument to be a
-.Dv NULL
-pointer for the initialization of a new list's
-head element.
-.Sh STANDARDS
-The
-.Fn insque
-and
-.Fn remque
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn insque
-and
-.Fn remque
-functions appeared in
-.Bx 4.2 .
-In
-.Fx 5.0 ,
-they reappeared conforming to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/stdlib/insque.c b/lib/libc_bsd/stdlib/insque.c
deleted file mode 100644
index 1245e4f..0000000
--- a/lib/libc_bsd/stdlib/insque.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Initial implementation:
- * Copyright (c) 2002 Robert Drehmel
- * All rights reserved.
- *
- * As long as the above copyright statement and this notice remain
- * unchanged, you can do what ever you want with this file. 
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/insque.c 108644 2003-01-04 07:34:41Z tjr $");
-
-#define	_SEARCH_PRIVATE
-#include <search.h>
-#ifdef DEBUG
-#include <stdio.h>
-#else
-#include <stdlib.h>	/* for NULL */
-#endif
-
-void
-insque(void *element, void *pred)
-{
-	struct que_elem *prev, *next, *elem;
-
-	elem = (struct que_elem *)element;
-	prev = (struct que_elem *)pred;
-
-	if (prev == NULL) {
-		elem->prev = elem->next = NULL;
-		return;
-	}
-
-	next = prev->next;
-	if (next != NULL) {
-#ifdef DEBUG
-		if (next->prev != prev) {
-			fprintf(stderr, "insque: Inconsistency detected:"
-			    " next(%p)->prev(%p) != prev(%p)\n",
-			    next, next->prev, prev);
-		}
-#endif
-		next->prev = elem;
-	}
-	prev->next = elem;
-	elem->prev = prev;
-	elem->next = next;
-}
diff --git a/lib/libc_bsd/stdlib/jemalloc/Makefile.inc b/lib/libc_bsd/stdlib/jemalloc/Makefile.inc
deleted file mode 100644
index d18eb4a..0000000
--- a/lib/libc_bsd/stdlib/jemalloc/Makefile.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-Makefile.incl 234370 2012-04-17 07:22:14Z jasone $
-
-.PATH: ${.CURDIR}/stdlib/jemalloc
-
-JEMALLOCSRCS:= jemalloc.c arena.c atomic.c base.c bitmap.c chunk.c \
-	chunk_dss.c chunk_mmap.c ckh.c ctl.c extent.c hash.c huge.c mb.c \
-	mutex.c prof.c quarantine.c rtree.c stats.c tcache.c util.c tsd.c
-
-SYM_MAPS+=${.CURDIR}/stdlib/jemalloc/Symbol.map
-
-CFLAGS+=-I${.CURDIR}/../../contrib/jemalloc/include
-
-.for src in ${JEMALLOCSRCS}
-MISRCS+=jemalloc_${src}
-CLEANFILES+=jemalloc_${src}
-jemalloc_${src}:
-	ln -sf ${.CURDIR}/../../contrib/jemalloc/src/${src} ${.TARGET}
-.endfor
-
-MAN+=jemalloc.3
-CLEANFILES+=jemalloc.3
-jemalloc.3:
-	ln -sf ${.CURDIR}/../../contrib/jemalloc/doc/jemalloc.3 ${.TARGET}
-
-MLINKS+= \
-	jemalloc.3 malloc.3 \
-	jemalloc.3 calloc.3 \
-	jemalloc.3 posix_memalign.3 \
-	jemalloc.3 aligned_alloc.3 \
-	jemalloc.3 realloc.3 \
-	jemalloc.3 free.3 \
-	jemalloc.3 malloc_usable_size.3 \
-	jemalloc.3 malloc_stats_print.3 \
-	jemalloc.3 mallctl.3 \
-	jemalloc.3 mallctlnametomib.3 \
-	jemalloc.3 mallctlbymib.3 \
-	jemalloc.3 allocm.3 \
-	jemalloc.3 rallocm.3 \
-	jemalloc.3 sallocm.3 \
-	jemalloc.3 dallocm.3 \
-	jemalloc.3 nallocm.3 \
-	jemalloc.3 malloc.conf.5
-
-.if defined(MALLOC_PRODUCTION)
-CFLAGS+=	-DMALLOC_PRODUCTION
-.endif
diff --git a/lib/libc_bsd/stdlib/jemalloc/Symbol.map b/lib/libc_bsd/stdlib/jemalloc/Symbol.map
deleted file mode 100644
index 4f8872a..0000000
--- a/lib/libc_bsd/stdlib/jemalloc/Symbol.map
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/stdlib/jemalloc/Symbol.map 277317 2015-01-18 11:54:20Z kib $
- */
-
-FBSD_1.0 {
-	_malloc_options;
-	_malloc_message;
-	malloc;
-	posix_memalign;
-	calloc;
-	realloc;
-	free;
-	malloc_usable_size;
-};
-
-FBSD_1.3 {
-	malloc_conf;
-	malloc_message;
-	aligned_alloc;
-	malloc_stats_print;
-	mallctl;
-	mallctlnametomib;
-	mallctlbymib;
-	allocm;
-	rallocm;
-	sallocm;
-	dallocm;
-	nallocm;
-	__malloc;
-	__calloc;
-	__realloc;
-	__free;
-	__posix_memalign;
-	__malloc_usable_size;
-	__allocm;
-	__rallocm;
-	__sallocm;
-	__dallocm;
-	__nallocm;
-};
-
-FBSDprivate_1.0 {
-	_malloc_thread_cleanup;
-	_malloc_prefork;
-	_malloc_postfork;
-	_malloc_first_thread;
-};
diff --git a/lib/libc_bsd/stdlib/l64a.c b/lib/libc_bsd/stdlib/l64a.c
deleted file mode 100644
index f4ce177..0000000
--- a/lib/libc_bsd/stdlib/l64a.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Written by J.T. Conklin <jtc@NetBSD.org>.
- * Public domain.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: l64a.c,v 1.13 2003/07/26 19:24:54 salo Exp $");
-#endif /* not lint */
-#endif
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/l64a.c 153707 2005-12-24 22:37:59Z trhodes $");
-
-#include <stdlib.h>
-
-#define	ADOT	46		/* ASCII '.' */
-#define	ASLASH	ADOT + 1	/* ASCII '/' */
-#define	A0	48		/* ASCII '0' */
-#define	AA	65		/* ASCII 'A' */
-#define	Aa	97		/* ASCII 'a' */
-
-char *
-l64a(long value)
-{
-	static char buf[8];
-
-	(void)l64a_r(value, buf, sizeof(buf));
-	return (buf);
-}
-
-int
-l64a_r(long value, char *buffer, int buflen)
-{
-	long v;
-	int digit;
-
-	v = value & (long)0xffffffff;
-	for (; v != 0 && buflen > 1; buffer++, buflen--) {
-		digit = v & 0x3f;
-		if (digit < 2)
-			*buffer = digit + ADOT;
-		else if (digit < 12)
-			*buffer = digit + A0 - 2;
-		else if (digit < 38)
-			*buffer = digit + AA - 12;
-		else
-			*buffer = digit + Aa - 38;
-		v >>= 6;
-	}
-	return (v == 0 ? 0 : -1);
-}
diff --git a/lib/libc_bsd/stdlib/labs.3 b/lib/libc_bsd/stdlib/labs.3
deleted file mode 100644
index 66565d4..0000000
--- a/lib/libc_bsd/stdlib/labs.3
+++ /dev/null
@@ -1,67 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)labs.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/labs.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd November 14, 2001
-.Dt LABS 3
-.Os
-.Sh NAME
-.Nm labs
-.Nd return the absolute value of a long integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long
-.Fn labs "long j"
-.Sh DESCRIPTION
-The
-.Fn labs
-function
-returns the absolute value of the long integer
-.Fa j .
-.Sh SEE ALSO
-.Xr abs 3 ,
-.Xr cabs 3 ,
-.Xr floor 3 ,
-.Xr imaxabs 3 ,
-.Xr llabs 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn labs
-function
-conforms to
-.St -isoC .
-.Sh BUGS
-The absolute value of the most negative integer remains negative.
diff --git a/lib/libc_bsd/stdlib/labs.c b/lib/libc_bsd/stdlib/labs.c
deleted file mode 100644
index 9def1e5..0000000
--- a/lib/libc_bsd/stdlib/labs.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)labs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/labs.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <stdlib.h>
-
-long
-labs(j)
-	long j;
-{
-	return(j < 0 ? -j : j);
-}
diff --git a/lib/libc_bsd/stdlib/ldiv.3 b/lib/libc_bsd/stdlib/ldiv.3
deleted file mode 100644
index bfd161a..0000000
--- a/lib/libc_bsd/stdlib/ldiv.3
+++ /dev/null
@@ -1,71 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)ldiv.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/ldiv.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd November 14, 2001
-.Dt LDIV 3
-.Os
-.Sh NAME
-.Nm ldiv
-.Nd return quotient and remainder from division
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft ldiv_t
-.Fn ldiv "long num" "long denom"
-.Sh DESCRIPTION
-The
-.Fn ldiv
-function
-computes the value
-.Fa num Ns / Ns Fa denom
-and returns the quotient and remainder in a structure named
-.Vt ldiv_t
-that contains two
-.Vt long
-members named
-.Va quot
-and
-.Va rem .
-.Sh SEE ALSO
-.Xr div 3 ,
-.Xr imaxdiv 3 ,
-.Xr lldiv 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn ldiv
-function
-conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/stdlib/ldiv.c b/lib/libc_bsd/stdlib/ldiv.c
deleted file mode 100644
index 1eb6033..0000000
--- a/lib/libc_bsd/stdlib/ldiv.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ldiv.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/ldiv.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <stdlib.h>		/* ldiv_t */
-
-ldiv_t
-ldiv(num, denom)
-	long num, denom;
-{
-	ldiv_t r;
-
-	/* see div.c for comments */
-
-	r.quot = num / denom;
-	r.rem = num % denom;
-	if (num >= 0 && r.rem < 0) {
-		r.quot++;
-		r.rem -= denom;
-	}
-	return (r);
-}
diff --git a/lib/libc_bsd/stdlib/llabs.3 b/lib/libc_bsd/stdlib/llabs.3
deleted file mode 100644
index 841339b..0000000
--- a/lib/libc_bsd/stdlib/llabs.3
+++ /dev/null
@@ -1,62 +0,0 @@
-.\" Copyright (c) 2001 Mike Barcroft <mike@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.
-.\"
-.\" 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: releng/10.2/lib/libc/stdlib/llabs.3 86737 2001-11-21 16:19:50Z ru $
-.\"
-.Dd November 14, 2001
-.Dt LLABS 3
-.Os
-.Sh NAME
-.Nm llabs
-.Nd returns absolute value
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft "long long"
-.Fn llabs "long long j"
-.Sh DESCRIPTION
-The
-.Fn llabs
-function returns the absolute value of
-.Fa j .
-.Sh SEE ALSO
-.Xr abs 3 ,
-.Xr fabs 3 ,
-.Xr hypot 3 ,
-.Xr imaxabs 3 ,
-.Xr labs 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn llabs
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn llabs
-function first appeared in
-.Fx 5.0 .
-.Sh BUGS
-The absolute value of the most negative integer remains negative.
diff --git a/lib/libc_bsd/stdlib/llabs.c b/lib/libc_bsd/stdlib/llabs.c
deleted file mode 100644
index c45bd63..0000000
--- a/lib/libc_bsd/stdlib/llabs.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/llabs.c 86368 2001-11-15 02:05:03Z mike $");
-
-#include <stdlib.h>
-
-long long
-llabs(long long j)
-{
-	return (j < 0 ? -j : j);
-}
diff --git a/lib/libc_bsd/stdlib/lldiv.3 b/lib/libc_bsd/stdlib/lldiv.3
deleted file mode 100644
index 144e04a..0000000
--- a/lib/libc_bsd/stdlib/lldiv.3
+++ /dev/null
@@ -1,73 +0,0 @@
-.\" Copyright (c) 2001 Mike Barcroft <mike@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.
-.\"
-.\" 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: releng/10.2/lib/libc/stdlib/lldiv.3 86737 2001-11-21 16:19:50Z ru $
-.\"
-.Dd November 14, 2001
-.Dt LLDIV 3
-.Os
-.Sh NAME
-.Nm lldiv
-.Nd returns quotient and remainder
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft lldiv_t
-.Fn lldiv "long long numer" "long long denom"
-.Sh DESCRIPTION
-The
-.Fn lldiv
-function computes the value of
-.Fa numer
-divided by
-.Fa denom
-and returns the stored result in the form of the
-.Vt lldiv_t
-type.
-.Pp
-The
-.Vt lldiv_t
-type is defined as:
-.Bd -literal -offset indent
-typedef struct {
-	long long quot; /* Quotient. */
-	long long rem;  /* Remainder. */
-} lldiv_t;
-.Ed
-.Sh SEE ALSO
-.Xr div 3 ,
-.Xr imaxdiv 3 ,
-.Xr ldiv 3 ,
-.Xr math 3
-.Sh STANDARDS
-The
-.Fn lldiv
-function conforms to
-.St -isoC-99 .
-.Sh HISTORY
-The
-.Fn lldiv
-function first appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/stdlib/lldiv.c b/lib/libc_bsd/stdlib/lldiv.c
deleted file mode 100644
index cc173d3..0000000
--- a/lib/libc_bsd/stdlib/lldiv.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/lldiv.c 86368 2001-11-15 02:05:03Z mike $");
-
-#include <stdlib.h>
-
-/* See comments in div.c for implementation details. */
-lldiv_t
-lldiv(long long numer, long long denom)
-{
-	lldiv_t retval;
-
-	retval.quot = numer / denom;
-	retval.rem = numer % denom;
-	if (numer >= 0 && retval.rem < 0) {
-		retval.quot++;
-		retval.rem -= denom;
-	}
-	return (retval);
-}
diff --git a/lib/libc_bsd/stdlib/lsearch.3 b/lib/libc_bsd/stdlib/lsearch.3
deleted file mode 100644
index 188994c..0000000
--- a/lib/libc_bsd/stdlib/lsearch.3
+++ /dev/null
@@ -1,146 +0,0 @@
-.\"
-.\" Initial implementation:
-.\" Copyright (c) 2002 Robert Drehmel
-.\" All rights reserved.
-.\"
-.\" As long as the above copyright statement and this notice remain
-.\" unchanged, you can do what ever you want with this file.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/lsearch.3 249721 2013-04-21 10:30:19Z joel $
-.\"
-.Dd April 21, 2013
-.Dt LSEARCH 3
-.Os
-.Sh NAME
-.Nm lsearch ,
-.Nm lfind
-.Nd linear search and append
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In search.h
-.Ft "void *"
-.Fo lsearch
-.Fa "const void *key" "void *base" "size_t *nelp" "size_t width"
-.Fa "int \*[lp]*compar\*[rp]\*[lp]const void *, const void *\*[rp]"
-.Fc
-.Ft "void *"
-.Fo lfind
-.Fa "const void *key" "const void *base" "size_t *nelp" "size_t width"
-.Fa "int \*[lp]*compar\*[rp]\*[lp]const void *, const void *\*[rp]"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn lsearch
-and
-.Fn lfind
-functions walk linearly through an array and compare each element with
-the one to be sought using a supplied comparison function.
-.Pp
-The
-.Fa key
-argument
-points to an element that matches the one that is searched.
-The array's address in memory is denoted by the
-.Fa base
-argument.
-The width of one element (i.e., the size as returned by
-.Fn sizeof )
-is passed as the
-.Fa width
-argument.
-The number of valid elements contained in the array (not the number of
-elements the array has space reserved for) is given in the integer pointed
-to by
-.Fa nelp .
-The
-.Fa compar
-argument points to a function which compares its two arguments and returns
-zero if they are matching, and non-zero otherwise.
-.Pp
-If no matching element was found in the array,
-.Fn lsearch
-copies
-.Fa key
-into the position after the last element and increments the
-integer pointed to by
-.Fa nelp .
-.Sh RETURN VALUES
-The
-.Fn lsearch
-and
-.Fn lfind
-functions
-return a pointer to the first element found.
-If no element was found,
-.Fn lsearch
-returns a pointer to the newly added element, whereas
-.Fn lfind
-returns
-.Dv NULL .
-Both functions return
-.Dv NULL
-if an error occurs.
-.Sh EXAMPLES
-.Bd -literal
-#include <search.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-static int
-element_compare(const void *p1, const void *p2)
-{
-	int left = *(const int *)p1;
-	int right = *(const int *)p2;
-
-	return (left - right);
-}
-
-int
-main(int argc, char **argv)
-{
-	const int array[10] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
-	size_t element_size = sizeof(array[0]);
-	size_t array_size = sizeof(array) / element_size;
-	int key;
-	void *element;
-
-	printf("Enter a number: ");
-	if (scanf("%d", &key) != 1) {
-		printf("Bad input\n");
-		return (EXIT_FAILURE);
-	}
-
-	element = lfind(&key, array, &array_size, element_size,
-	    element_compare);
-
-	if (element != NULL)
-		printf("Element found: %d\n", *(int *)element);
-	else
-		printf("Element not found\n");
-
-	return (EXIT_SUCCESS);
-}
-.Ed
-.Sh SEE ALSO
-.Xr bsearch 3 ,
-.Xr hsearch 3 ,
-.Xr tsearch 3
-.Sh STANDARDS
-The
-.Fn lsearch
-and
-.Fn lfind
-functions conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn lsearch
-and
-.Fn lfind
-functions appeared in
-.Bx 4.2 .
-In
-.Fx 5.0 ,
-they reappeared conforming to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/stdlib/lsearch.c b/lib/libc_bsd/stdlib/lsearch.c
deleted file mode 100644
index 90cb3ec..0000000
--- a/lib/libc_bsd/stdlib/lsearch.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Initial implementation:
- * Copyright (c) 2002 Robert Drehmel
- * All rights reserved.
- *
- * As long as the above copyright statement and this notice remain
- * unchanged, you can do what ever you want with this file. 
- */
-#include <sys/types.h>
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/lsearch.c 105250 2002-10-16 14:29:23Z robert $");
-
-#define	_SEARCH_PRIVATE
-#include <search.h>
-#include <stdint.h>	/* for uint8_t */
-#include <stdlib.h>	/* for NULL */
-#include <string.h>	/* for memcpy() prototype */
-
-static void *lwork(const void *, const void *, size_t *, size_t,
-    int (*)(const void *, const void *), int);
-
-void *lsearch(const void *key, void *base, size_t *nelp, size_t width,
-    int (*compar)(const void *, const void *))
-{
-
-	return (lwork(key, base, nelp, width, compar, 1));
-}
-
-void *lfind(const void *key, const void *base, size_t *nelp, size_t width,
-    int (*compar)(const void *, const void *))
-{
-
-	return (lwork(key, base, nelp, width, compar, 0));
-}
-
-static void *
-lwork(const void *key, const void *base, size_t *nelp, size_t width,
-    int (*compar)(const void *, const void *), int addelem)
-{
-	uint8_t *ep, *endp;
-
-	/*
-	 * Cast to an integer value first to avoid the warning for removing
-	 * 'const' via a cast.
-	 */
-	ep = (uint8_t *)(uintptr_t)base;
-	for (endp = (uint8_t *)(ep + width * *nelp); ep < endp; ep += width) {
-		if (compar(key, ep) == 0)
-			return (ep);
-	}
-
-	/* lfind() shall return when the key was not found. */
-	if (!addelem)
-		return (NULL);
-
-	/*
-	 * lsearch() adds the key to the end of the table and increments
-	 * the number of elements.
-	 */
-	memcpy(endp, key, width);
-	++*nelp;
-
-	return (endp);
-}
diff --git a/lib/libc_bsd/stdlib/memory.3 b/lib/libc_bsd/stdlib/memory.3
deleted file mode 100644
index 31a462d..0000000
--- a/lib/libc_bsd/stdlib/memory.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1991, 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. 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.
-.\"
-.\"     @(#)memory.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/memory.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt MEMORY 3
-.Os
-.Sh NAME
-.Nm malloc ,
-.Nm free ,
-.Nm realloc ,
-.Nm calloc ,
-.Nm alloca ,
-.Nm mmap
-.Nd general memory allocation operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn malloc "size_t size"
-.Ft void
-.Fn free "void *ptr"
-.Ft void *
-.Fn realloc "void *ptr" "size_t size"
-.Ft void *
-.Fn calloc "size_t nelem" "size_t elsize"
-.Ft void *
-.Fn alloca "size_t size"
-.In sys/types.h
-.In sys/mman.h
-.Ft void *
-.Fn mmap "void * addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset"
-.Sh DESCRIPTION
-These functions allocate and free memory for the calling process.
-They are described in the
-individual manual pages.
-.Sh SEE ALSO
-.Xr mmap 2 ,
-.Xr alloca 3 ,
-.Xr calloc 3 ,
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr realloc 3
-.Sh STANDARDS
-These functions, with the exception of
-.Fn alloca
-and
-.Fn mmap
-conform to
-.St -isoC .
diff --git a/lib/libc_bsd/stdlib/merge.c b/lib/libc_bsd/stdlib/merge.c
deleted file mode 100644
index 549060f..0000000
--- a/lib/libc_bsd/stdlib/merge.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Peter McIlroy.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)merge.c	8.2 (Berkeley) 2/14/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/merge.c 251672 2013-06-13 00:19:30Z emaste $");
-
-/*
- * Hybrid exponential search/linear search merge sort with hybrid
- * natural/pairwise first pass.  Requires about .3% more comparisons
- * for random data than LSMS with pairwise first pass alone.
- * It works for objects as small as two bytes.
- */
-
-#define NATURAL
-#define THRESHOLD 16	/* Best choice for natural merge cut-off. */
-
-/* #define NATURAL to get hybrid natural merge.
- * (The default is pairwise merging.)
- */
-
-#include <sys/types.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
-static void setup(u_char *, u_char *, size_t, size_t,
-    int (*)(const void *, const void *));
-static void insertionsort(u_char *, size_t, size_t,
-    int (*)(const void *, const void *));
-
-#define ISIZE sizeof(int)
-#define PSIZE sizeof(u_char *)
-#define ICOPY_LIST(src, dst, last)				\
-	do							\
-	*(int*)dst = *(int*)src, src += ISIZE, dst += ISIZE;	\
-	while(src < last)
-#define ICOPY_ELT(src, dst, i)					\
-	do							\
-	*(int*) dst = *(int*) src, src += ISIZE, dst += ISIZE;	\
-	while (i -= ISIZE)
-
-#define CCOPY_LIST(src, dst, last)		\
-	do					\
-		*dst++ = *src++;		\
-	while (src < last)
-#define CCOPY_ELT(src, dst, i)			\
-	do					\
-		*dst++ = *src++;		\
-	while (i -= 1)
-
-/*
- * Find the next possible pointer head.  (Trickery for forcing an array
- * to do double duty as a linked list when objects do not align with word
- * boundaries.
- */
-/* Assumption: PSIZE is a power of 2. */
-#define EVAL(p) (u_char **)						\
-	((u_char *)0 +							\
-	    (((u_char *)p + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1)))
-
-/*
- * Arguments are as for qsort.
- */
-int
-mergesort(base, nmemb, size, cmp)
-	void *base;
-	size_t nmemb;
-	size_t size;
-	int (*cmp)(const void *, const void *);
-{
-	size_t i;
-	int sense;
-	int big, iflag;
-	u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
-	u_char *list2, *list1, *p2, *p, *last, **p1;
-
-	if (size < PSIZE / 2) {		/* Pointers must fit into 2 * size. */
-		errno = EINVAL;
-		return (-1);
-	}
-
-	if (nmemb == 0)
-		return (0);
-
-	/*
-	 * XXX
-	 * Stupid subtraction for the Cray.
-	 */
-	iflag = 0;
-	if (!(size % ISIZE) && !(((char *)base - (char *)0) % ISIZE))
-		iflag = 1;
-
-	if ((list2 = malloc(nmemb * size + PSIZE)) == NULL)
-		return (-1);
-
-	list1 = base;
-	setup(list1, list2, nmemb, size, cmp);
-	last = list2 + nmemb * size;
-	i = big = 0;
-	while (*EVAL(list2) != last) {
-	    l2 = list1;
-	    p1 = EVAL(list1);
-	    for (tp2 = p2 = list2; p2 != last; p1 = EVAL(l2)) {
-	    	p2 = *EVAL(p2);
-	    	f1 = l2;
-	    	f2 = l1 = list1 + (p2 - list2);
-	    	if (p2 != last)
-	    		p2 = *EVAL(p2);
-	    	l2 = list1 + (p2 - list2);
-	    	while (f1 < l1 && f2 < l2) {
-	    		if ((*cmp)(f1, f2) <= 0) {
-	    			q = f2;
-	    			b = f1, t = l1;
-	    			sense = -1;
-	    		} else {
-	    			q = f1;
-	    			b = f2, t = l2;
-	    			sense = 0;
-	    		}
-	    		if (!big) {	/* here i = 0 */
-				while ((b += size) < t && cmp(q, b) >sense)
-	    				if (++i == 6) {
-	    					big = 1;
-	    					goto EXPONENTIAL;
-	    				}
-	    		} else {
-EXPONENTIAL:	    		for (i = size; ; i <<= 1)
-	    				if ((p = (b + i)) >= t) {
-	    					if ((p = t - size) > b &&
-						    (*cmp)(q, p) <= sense)
-	    						t = p;
-	    					else
-	    						b = p;
-	    					break;
-	    				} else if ((*cmp)(q, p) <= sense) {
-	    					t = p;
-	    					if (i == size)
-	    						big = 0;
-	    					goto FASTCASE;
-	    				} else
-	    					b = p;
-				while (t > b+size) {
-	    				i = (((t - b) / size) >> 1) * size;
-	    				if ((*cmp)(q, p = b + i) <= sense)
-	    					t = p;
-	    				else
-	    					b = p;
-	    			}
-	    			goto COPY;
-FASTCASE:	    		while (i > size)
-	    				if ((*cmp)(q,
-	    					p = b + (i >>= 1)) <= sense)
-	    					t = p;
-	    				else
-	    					b = p;
-COPY:	    			b = t;
-	    		}
-	    		i = size;
-	    		if (q == f1) {
-	    			if (iflag) {
-	    				ICOPY_LIST(f2, tp2, b);
-	    				ICOPY_ELT(f1, tp2, i);
-	    			} else {
-	    				CCOPY_LIST(f2, tp2, b);
-	    				CCOPY_ELT(f1, tp2, i);
-	    			}
-	    		} else {
-	    			if (iflag) {
-	    				ICOPY_LIST(f1, tp2, b);
-	    				ICOPY_ELT(f2, tp2, i);
-	    			} else {
-	    				CCOPY_LIST(f1, tp2, b);
-	    				CCOPY_ELT(f2, tp2, i);
-	    			}
-	    		}
-	    	}
-	    	if (f2 < l2) {
-	    		if (iflag)
-	    			ICOPY_LIST(f2, tp2, l2);
-	    		else
-	    			CCOPY_LIST(f2, tp2, l2);
-	    	} else if (f1 < l1) {
-	    		if (iflag)
-	    			ICOPY_LIST(f1, tp2, l1);
-	    		else
-	    			CCOPY_LIST(f1, tp2, l1);
-	    	}
-	    	*p1 = l2;
-	    }
-	    tp2 = list1;	/* swap list1, list2 */
-	    list1 = list2;
-	    list2 = tp2;
-	    last = list2 + nmemb*size;
-	}
-	if (base == list2) {
-		memmove(list2, list1, nmemb*size);
-		list2 = list1;
-	}
-	free(list2);
-	return (0);
-}
-
-#define	swap(a, b) {					\
-		s = b;					\
-		i = size;				\
-		do {					\
-			tmp = *a; *a++ = *s; *s++ = tmp; \
-		} while (--i);				\
-		a -= size;				\
-	}
-#define reverse(bot, top) {				\
-	s = top;					\
-	do {						\
-		i = size;				\
-		do {					\
-			tmp = *bot; *bot++ = *s; *s++ = tmp; \
-		} while (--i);				\
-		s -= size2;				\
-	} while(bot < s);				\
-}
-
-/*
- * Optional hybrid natural/pairwise first pass.  Eats up list1 in runs of
- * increasing order, list2 in a corresponding linked list.  Checks for runs
- * when THRESHOLD/2 pairs compare with same sense.  (Only used when NATURAL
- * is defined.  Otherwise simple pairwise merging is used.)
- */
-void
-setup(list1, list2, n, size, cmp)
-	size_t n, size;
-	int (*cmp)(const void *, const void *);
-	u_char *list1, *list2;
-{
-	int i, length, size2, tmp, sense;
-	u_char *f1, *f2, *s, *l2, *last, *p2;
-
-	size2 = size*2;
-	if (n <= 5) {
-		insertionsort(list1, n, size, cmp);
-		*EVAL(list2) = (u_char*) list2 + n*size;
-		return;
-	}
-	/*
-	 * Avoid running pointers out of bounds; limit n to evens
-	 * for simplicity.
-	 */
-	i = 4 + (n & 1);
-	insertionsort(list1 + (n - i) * size, i, size, cmp);
-	last = list1 + size * (n - i);
-	*EVAL(list2 + (last - list1)) = list2 + n * size;
-
-#ifdef NATURAL
-	p2 = list2;
-	f1 = list1;
-	sense = (cmp(f1, f1 + size) > 0);
-	for (; f1 < last; sense = !sense) {
-		length = 2;
-					/* Find pairs with same sense. */
-		for (f2 = f1 + size2; f2 < last; f2 += size2) {
-			if ((cmp(f2, f2+ size) > 0) != sense)
-				break;
-			length += 2;
-		}
-		if (length < THRESHOLD) {		/* Pairwise merge */
-			do {
-				p2 = *EVAL(p2) = f1 + size2 - list1 + list2;
-				if (sense > 0)
-					swap (f1, f1 + size);
-			} while ((f1 += size2) < f2);
-		} else {				/* Natural merge */
-			l2 = f2;
-			for (f2 = f1 + size2; f2 < l2; f2 += size2) {
-				if ((cmp(f2-size, f2) > 0) != sense) {
-					p2 = *EVAL(p2) = f2 - list1 + list2;
-					if (sense > 0)
-						reverse(f1, f2-size);
-					f1 = f2;
-				}
-			}
-			if (sense > 0)
-				reverse (f1, f2-size);
-			f1 = f2;
-			if (f2 < last || cmp(f2 - size, f2) > 0)
-				p2 = *EVAL(p2) = f2 - list1 + list2;
-			else
-				p2 = *EVAL(p2) = list2 + n*size;
-		}
-	}
-#else		/* pairwise merge only. */
-	for (f1 = list1, p2 = list2; f1 < last; f1 += size2) {
-		p2 = *EVAL(p2) = p2 + size2;
-		if (cmp (f1, f1 + size) > 0)
-			swap(f1, f1 + size);
-	}
-#endif /* NATURAL */
-}
-
-/*
- * This is to avoid out-of-bounds addresses in sorting the
- * last 4 elements.
- */
-static void
-insertionsort(a, n, size, cmp)
-	u_char *a;
-	size_t n, size;
-	int (*cmp)(const void *, const void *);
-{
-	u_char *ai, *s, *t, *u, tmp;
-	int i;
-
-	for (ai = a+size; --n >= 1; ai += size)
-		for (t = ai; t > a; t -= size) {
-			u = t - size;
-			if (cmp(u, t) <= 0)
-				break;
-			swap(u, t);
-		}
-}
diff --git a/lib/libc_bsd/stdlib/ptsname.3 b/lib/libc_bsd/stdlib/ptsname.3
deleted file mode 100644
index 3e0b9aa..0000000
--- a/lib/libc_bsd/stdlib/ptsname.3
+++ /dev/null
@@ -1,161 +0,0 @@
-.\"
-.\" Copyright (c) 2002 The FreeBSD Project, Inc.
-.\" All rights reserved.
-.\"
-.\" This software includes code contributed to the FreeBSD Project
-.\" by Ryan Younce of North Carolina State University.
-.\"
-.\" 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. Neither the name of the FreeBSD Project 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 FREEBSD PROJECT 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 FREEBSD PROJECT
-.\" OR ITS 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: releng/10.2/lib/libc/stdlib/ptsname.3 240412 2012-09-12 17:54:09Z emaste $
-.\"
-.Dd August 20, 2008
-.Dt PTSNAME 3
-.Os
-.Sh NAME
-.Nm grantpt ,
-.Nm ptsname ,
-.Nm unlockpt
-.Nd pseudo-terminal access functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn grantpt "int fildes"
-.Ft "char *"
-.Fn ptsname "int fildes"
-.Ft int
-.Fn unlockpt "int fildes"
-.Sh DESCRIPTION
-The
-.Fn grantpt ,
-.Fn ptsname ,
-and
-.Fn unlockpt
-functions allow access to pseudo-terminal devices.
-These three functions accept a file descriptor that references the
-master half of a pseudo-terminal pair.
-This file descriptor is created with
-.Xr posix_openpt 2 .
-.Pp
-The
-.Fn grantpt
-function is used to establish ownership and permissions
-of the slave device counterpart to the master device
-specified with
-.Fa fildes .
-The slave device's ownership is set to the real user ID
-of the calling process, and the permissions are set to
-user readable-writable and group writable.
-The group owner of the slave device is also set to the
-group
-.Dq Li tty .
-.Pp
-The
-.Fn ptsname
-function returns the full pathname of the slave device
-counterpart to the master device specified with
-.Fa fildes .
-This value can be used
-to subsequently open the appropriate slave after
-.Xr posix_openpt 2
-and
-.Fn grantpt
-have been called.
-.Pp
-The
-.Fn unlockpt
-function clears the lock held on the pseudo-terminal pair
-for the master device specified with
-.Fa fildes .
-.Sh RETURN VALUES
-.Rv -std grantpt unlockpt
-.Pp
-The
-.Fn ptsname
-function returns a pointer to the name
-of the slave device on success; otherwise a
-.Dv NULL
-pointer is returned.
-.Sh ERRORS
-The
-.Fn grantpt ,
-.Fn ptsname
-and
-.Fn unlockpt
-functions may fail and set
-.Va errno
-to:
-.Bl -tag -width Er
-.It Bq Er EBADF
-.Fa fildes
-is not a valid open file descriptor.
-.It Bq Er EINVAL
-.Fa fildes
-is not a master pseudo-terminal device.
-.El
-.Pp
-In addition, the
-.Fn grantpt
-function may set
-.Va errno
-to:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The slave pseudo-terminal device could not be accessed.
-.El
-.Sh SEE ALSO
-.Xr posix_openpt 2 ,
-.Xr pts 4 ,
-.Xr tty 4
-.Sh STANDARDS
-The
-.Fn ptsname
-function conforms to
-.St -p1003.1-2008 .
-.Pp
-This implementation of
-.Fn grantpt
-and
-.Fn unlockpt
-does not conform to
-.St -p1003.1-2008 ,
-because it depends on
-.Xr posix_openpt 2
-to create the pseudo-terminal device with proper permissions in place.
-It only validates whether
-.Fa fildes
-is a valid pseudo-terminal master device.
-Future revisions of the specification will likely allow this behaviour,
-as stated by the Austin Group.
-.Sh HISTORY
-The
-.Fn grantpt ,
-.Fn ptsname
-and
-.Fn unlockpt
-functions appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/stdlib/ptsname.c b/lib/libc_bsd/stdlib/ptsname.c
deleted file mode 100644
index cd31f28..0000000
--- a/lib/libc_bsd/stdlib/ptsname.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*-
- * Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
- * All rights reserved.
- *
- * Portions of this software were developed under sponsorship from Snow
- * B.V., the Netherlands.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/ptsname.c 240412 2012-09-12 17:54:09Z emaste $");
-#endif /* not lint */
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/ioctl.h>
-
-#include <errno.h>
-#include <paths.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-/*
- * __isptmaster():  return whether the file descriptor refers to a
- *                  pseudo-terminal master device.
- */
-static int
-__isptmaster(int fildes)
-{
-
-	if (_ioctl(fildes, TIOCPTMASTER) == 0)
-		return (0);
-
-	if (errno != EBADF)
-		errno = EINVAL;
-
-	return (-1);
-}
-
-/*
- * In our implementation, grantpt() and unlockpt() don't actually have
- * any use, because PTY's are created on the fly and already have proper
- * permissions upon creation.
- *
- * Just make sure `fildes' actually points to a real PTY master device.
- */
-__strong_reference(__isptmaster, grantpt);
-__strong_reference(__isptmaster, unlockpt);
-
-/*
- * ptsname():  return the pathname of the slave pseudo-terminal device
- *             associated with the specified master.
- */
-char *
-ptsname(int fildes)
-{
-	static char pt_slave[sizeof _PATH_DEV + SPECNAMELEN] = _PATH_DEV;
-	char *ret = NULL;
-
-	/* Make sure fildes points to a master device. */
-	if (__isptmaster(fildes) != 0)
-		goto done;
-
-	if (fdevname_r(fildes, pt_slave + (sizeof _PATH_DEV - 1),
-	    sizeof pt_slave - (sizeof _PATH_DEV - 1)) != NULL)
-		ret = pt_slave;
-
-done:
-	return (ret);
-}
diff --git a/lib/libc_bsd/stdlib/qsort.3 b/lib/libc_bsd/stdlib/qsort.3
deleted file mode 100644
index 6e97d49..0000000
--- a/lib/libc_bsd/stdlib/qsort.3
+++ /dev/null
@@ -1,326 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)qsort.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/qsort.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd February 20, 2013
-.Dt QSORT 3
-.Os
-.Sh NAME
-.Nm qsort , qsort_r , heapsort , mergesort
-.Nd sort functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fo qsort
-.Fa "void *base"
-.Fa "size_t nmemb"
-.Fa "size_t size"
-.Fa "int \*[lp]*compar\*[rp]\*[lp]const void *, const void *\*[rp]"
-.Fc
-.Ft void
-.Fo qsort_r
-.Fa "void *base"
-.Fa "size_t nmemb"
-.Fa "size_t size"
-.Fa "void *thunk"
-.Fa "int \*[lp]*compar\*[rp]\*[lp]void *, const void *, const void *\*[rp]"
-.Fc
-.Ft int
-.Fo heapsort
-.Fa "void *base"
-.Fa "size_t nmemb"
-.Fa "size_t size"
-.Fa "int \*[lp]*compar\*[rp]\*[lp]const void *, const void *\*[rp]"
-.Fc
-.Ft int
-.Fo mergesort
-.Fa "void *base"
-.Fa "size_t nmemb"
-.Fa "size_t size"
-.Fa "int \*[lp]*compar\*[rp]\*[lp]const void *, const void *\*[rp]"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn qsort
-function is a modified partition-exchange sort, or quicksort.
-The
-.Fn heapsort
-function is a modified selection sort.
-The
-.Fn mergesort
-function is a modified merge sort with exponential search
-intended for sorting data with pre-existing order.
-.Pp
-The
-.Fn qsort
-and
-.Fn heapsort
-functions sort an array of
-.Fa nmemb
-objects, the initial member of which is pointed to by
-.Fa base .
-The size of each object is specified by
-.Fa size .
-The
-.Fn mergesort
-function
-behaves similarly, but
-.Em requires
-that
-.Fa size
-be greater than
-.Dq "sizeof(void *) / 2" .
-.Pp
-The contents of the array
-.Fa base
-are sorted in ascending order according to
-a comparison function pointed to by
-.Fa compar ,
-which requires two arguments pointing to the objects being
-compared.
-.Pp
-The comparison function must return an integer less than, equal to, or
-greater than zero if the first argument is considered to be respectively
-less than, equal to, or greater than the second.
-.Pp
-The
-.Fn qsort_r
-function behaves identically to
-.Fn qsort ,
-except that it takes an additional argument,
-.Fa thunk ,
-which is passed unchanged as the first argument to function pointed to
-.Fa compar .
-This allows the comparison function to access additional
-data without using global variables, and thus
-.Fn qsort_r
-is suitable for use in functions which must be reentrant.
-.Pp
-The algorithms implemented by
-.Fn qsort ,
-.Fn qsort_r ,
-and
-.Fn heapsort
-are
-.Em not
-stable, that is, if two members compare as equal, their order in
-the sorted array is undefined.
-The
-.Fn mergesort
-algorithm is stable.
-.Pp
-The
-.Fn qsort
-and
-.Fn qsort_r
-functions are an implementation of C.A.R.
-Hoare's
-.Dq quicksort
-algorithm,
-a variant of partition-exchange sorting; in particular, see
-.An D.E. Knuth Ns 's
-.%T "Algorithm Q" .
-.Sy Quicksort
-takes O N lg N average time.
-This implementation uses median selection to avoid its
-O N**2 worst-case behavior.
-.Pp
-The
-.Fn heapsort
-function is an implementation of
-.An "J.W.J. William" Ns 's
-.Dq heapsort
-algorithm,
-a variant of selection sorting; in particular, see
-.An "D.E. Knuth" Ns 's
-.%T "Algorithm H" .
-.Sy Heapsort
-takes O N lg N worst-case time.
-Its
-.Em only
-advantage over
-.Fn qsort
-is that it uses almost no additional memory; while
-.Fn qsort
-does not allocate memory, it is implemented using recursion.
-.Pp
-The function
-.Fn mergesort
-requires additional memory of size
-.Fa nmemb *
-.Fa size
-bytes; it should be used only when space is not at a premium.
-The
-.Fn mergesort
-function
-is optimized for data with pre-existing order; its worst case
-time is O N lg N; its best case is O N.
-.Pp
-Normally,
-.Fn qsort
-is faster than
-.Fn mergesort
-is faster than
-.Fn heapsort .
-Memory availability and pre-existing order in the data can make this
-untrue.
-.Sh RETURN VALUES
-The
-.Fn qsort
-and
-.Fn qsort_r
-functions
-return no value.
-.Pp
-.Rv -std heapsort mergesort
-.Sh EXAMPLES
-A sample program that sorts an array of
-.Vt int
-values in place using
-.Fn qsort ,
-and then prints the sorted array to standard output is:
-.Bd -literal
-#include <stdio.h>
-#include <stdlib.h>
-
-/*
- * Custom comparison function that can compare 'int' values through pointers
- * passed by qsort(3).
- */
-static int
-int_compare(const void *p1, const void *p2)
-{
-        int left = *(const int *)p1;
-        int right = *(const int *)p2;
-
-        return ((left > right) - (left < right));
-}
-
-/*
- * Sort an array of 'int' values and print it to standard output.
- */
-int
-main(void)
-{
-       int int_array[] = { 4, 5, 9, 3, 0, 1, 7, 2, 8, 6 };
-       const size_t array_size = sizeof(int_array) / sizeof(int_array[0]);
-       size_t k;
-
-       qsort(&int_array, array_size, sizeof(int_array[0]), int_compare);
-       for (k = 0; k < array_size; k++)
-                printf(" %d", int_array[k]);
-        puts("");
-        return (EXIT_SUCCESS);
-}
-.Ed
-.Sh COMPATIBILITY
-Previous versions of
-.Fn qsort
-did not permit the comparison routine itself to call
-.Fn qsort 3 .
-This is no longer true.
-.Sh ERRORS
-The
-.Fn heapsort
-and
-.Fn mergesort
-functions succeed unless:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa size
-argument is zero, or,
-the
-.Fa size
-argument to
-.Fn mergesort
-is less than
-.Dq "sizeof(void *) / 2" .
-.It Bq Er ENOMEM
-The
-.Fn heapsort
-or
-.Fn mergesort
-functions
-were unable to allocate memory.
-.El
-.Sh SEE ALSO
-.Xr sort 1 ,
-.Xr radixsort 3
-.Rs
-.%A Hoare, C.A.R.
-.%D 1962
-.%T "Quicksort"
-.%J "The Computer Journal"
-.%V 5:1
-.%P pp. 10-15
-.Re
-.Rs
-.%A Williams, J.W.J
-.%D 1964
-.%T "Heapsort"
-.%J "Communications of the ACM"
-.%V 7:1
-.%P pp. 347-348
-.Re
-.Rs
-.%A Knuth, D.E.
-.%D 1968
-.%B "The Art of Computer Programming"
-.%V Vol. 3
-.%T "Sorting and Searching"
-.%P pp. 114-123, 145-149
-.Re
-.Rs
-.%A McIlroy, P.M.
-.%T "Optimistic Sorting and Information Theoretic Complexity"
-.%J "Fourth Annual ACM-SIAM Symposium on Discrete Algorithms"
-.%V January 1992
-.Re
-.Rs
-.%A Bentley, J.L.
-.%A McIlroy, M.D.
-.%T "Engineering a Sort Function"
-.%J "Software--Practice and Experience"
-.%V Vol. 23(11)
-.%P pp. 1249-1265
-.%D November\ 1993
-.Re
-.Sh STANDARDS
-The
-.Fn qsort
-function
-conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/stdlib/qsort.c b/lib/libc_bsd/stdlib/qsort.c
deleted file mode 100644
index 46b9c07..0000000
--- a/lib/libc_bsd/stdlib/qsort.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*-
- * Copyright (c) 1992, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/qsort.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <stdlib.h>
-
-#ifdef I_AM_QSORT_R
-typedef int		 cmp_t(void *, const void *, const void *);
-#else
-typedef int		 cmp_t(const void *, const void *);
-#endif
-static inline char	*med3(char *, char *, char *, cmp_t *, void *);
-static inline void	 swapfunc(char *, char *, int, int);
-
-#define min(a, b)	(a) < (b) ? a : b
-
-/*
- * Qsort routine from Bentley & McIlroy's "Engineering a Sort Function".
- */
-#define swapcode(TYPE, parmi, parmj, n) { 		\
-	long i = (n) / sizeof (TYPE); 			\
-	TYPE *pi = (TYPE *) (parmi); 		\
-	TYPE *pj = (TYPE *) (parmj); 		\
-	do { 						\
-		TYPE	t = *pi;		\
-		*pi++ = *pj;				\
-		*pj++ = t;				\
-        } while (--i > 0);				\
-}
-
-#define SWAPINIT(a, es) swaptype = ((char *)a - (char *)0) % sizeof(long) || \
-	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
-
-static inline void
-swapfunc(a, b, n, swaptype)
-	char *a, *b;
-	int n, swaptype;
-{
-	if(swaptype <= 1)
-		swapcode(long, a, b, n)
-	else
-		swapcode(char, a, b, n)
-}
-
-#define swap(a, b)					\
-	if (swaptype == 0) {				\
-		long t = *(long *)(a);			\
-		*(long *)(a) = *(long *)(b);		\
-		*(long *)(b) = t;			\
-	} else						\
-		swapfunc(a, b, es, swaptype)
-
-#define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
-
-#ifdef I_AM_QSORT_R
-#define	CMP(t, x, y) (cmp((t), (x), (y)))
-#else
-#define	CMP(t, x, y) (cmp((x), (y)))
-#endif
-
-static inline char *
-med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk
-#ifndef I_AM_QSORT_R
-__unused
-#endif
-)
-{
-	return CMP(thunk, a, b) < 0 ?
-	       (CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a ))
-              :(CMP(thunk, b, c) > 0 ? b : (CMP(thunk, a, c) < 0 ? a : c ));
-}
-
-#ifdef I_AM_QSORT_R
-void
-qsort_r(void *a, size_t n, size_t es, void *thunk, cmp_t *cmp)
-#else
-#define thunk NULL
-void
-qsort(void *a, size_t n, size_t es, cmp_t *cmp)
-#endif
-{
-	char *pa, *pb, *pc, *pd, *pl, *pm, *pn;
-	size_t d, r;
-	int cmp_result;
-	int swaptype, swap_cnt;
-
-loop:	SWAPINIT(a, es);
-	swap_cnt = 0;
-	if (n < 7) {
-		for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
-			for (pl = pm; 
-			     pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
-			     pl -= es)
-				swap(pl, pl - es);
-		return;
-	}
-	pm = (char *)a + (n / 2) * es;
-	if (n > 7) {
-		pl = a;
-		pn = (char *)a + (n - 1) * es;
-		if (n > 40) {
-			d = (n / 8) * es;
-			pl = med3(pl, pl + d, pl + 2 * d, cmp, thunk);
-			pm = med3(pm - d, pm, pm + d, cmp, thunk);
-			pn = med3(pn - 2 * d, pn - d, pn, cmp, thunk);
-		}
-		pm = med3(pl, pm, pn, cmp, thunk);
-	}
-	swap(a, pm);
-	pa = pb = (char *)a + es;
-
-	pc = pd = (char *)a + (n - 1) * es;
-	for (;;) {
-		while (pb <= pc && (cmp_result = CMP(thunk, pb, a)) <= 0) {
-			if (cmp_result == 0) {
-				swap_cnt = 1;
-				swap(pa, pb);
-				pa += es;
-			}
-			pb += es;
-		}
-		while (pb <= pc && (cmp_result = CMP(thunk, pc, a)) >= 0) {
-			if (cmp_result == 0) {
-				swap_cnt = 1;
-				swap(pc, pd);
-				pd -= es;
-			}
-			pc -= es;
-		}
-		if (pb > pc)
-			break;
-		swap(pb, pc);
-		swap_cnt = 1;
-		pb += es;
-		pc -= es;
-	}
-	if (swap_cnt == 0) {  /* Switch to insertion sort */
-		for (pm = (char *)a + es; pm < (char *)a + n * es; pm += es)
-			for (pl = pm; 
-			     pl > (char *)a && CMP(thunk, pl - es, pl) > 0;
-			     pl -= es)
-				swap(pl, pl - es);
-		return;
-	}
-
-	pn = (char *)a + n * es;
-	r = min(pa - (char *)a, pb - pa);
-	vecswap(a, pb - r, r);
-	r = min(pd - pc, pn - pd - es);
-	vecswap(pb, pn - r, r);
-	if ((r = pb - pa) > es)
-#ifdef I_AM_QSORT_R
-		qsort_r(a, r / es, es, thunk, cmp);
-#else
-		qsort(a, r / es, es, cmp);
-#endif
-	if ((r = pd - pc) > es) {
-		/* Iterate rather than recurse to save stack space */
-		a = pn - r;
-		n = r / es;
-		goto loop;
-	}
-/*		qsort(pn - r, r / es, es, cmp);*/
-}
diff --git a/lib/libc_bsd/stdlib/qsort_r.c b/lib/libc_bsd/stdlib/qsort_r.c
deleted file mode 100644
index 862d41b..0000000
--- a/lib/libc_bsd/stdlib/qsort_r.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * This file is in the public domain.  Originally written by Garrett
- * A. Wollman.
- *
- * $FreeBSD: releng/10.2/lib/libc/stdlib/qsort_r.c 103165 2002-09-10 02:04:49Z wollman $
- */
-#define I_AM_QSORT_R
-#include "qsort.c"
diff --git a/lib/libc_bsd/stdlib/quick_exit.3 b/lib/libc_bsd/stdlib/quick_exit.3
deleted file mode 100644
index 5678d0c..0000000
--- a/lib/libc_bsd/stdlib/quick_exit.3
+++ /dev/null
@@ -1,58 +0,0 @@
-.\"  Copyright (c) 2011 David Chisnall
-.\"  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.
-.\" 
-.\"  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: releng/10.2/lib/libc/stdlib/quick_exit.3 277174 2015-01-14 11:31:31Z trasz $
-.\"
-.Dd December 13, 2014
-.Dt QUICK_EXIT 3
-.Os
-.Sh NAME
-.Nm quick_exit
-.Nd exits a program quickly, running minimal cleanup
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft _Noreturn void
-.Fn quick_exit "int status"
-.Sh DESCRIPTION
-The
-.Fn quick_exit
-function exits the program quickly calling any cleanup functions registered
-with
-.Xr at_quick_exit 3
-but not any C++ destructors or cleanup code registered with
-.Xr atexit 3 .
-.Sh RETURN VALUES
-The
-.Fn quick_exit
-function does not return.
-.Sh SEE ALSO
-.Xr at_quick_exit 3 ,
-.Xr exit 3
-.Sh STANDARDS
-The
-.Fn quick_exit
-function conforms to
-.St -isoC-2011 .
diff --git a/lib/libc_bsd/stdlib/quick_exit.c b/lib/libc_bsd/stdlib/quick_exit.c
deleted file mode 100644
index 17e690f..0000000
--- a/lib/libc_bsd/stdlib/quick_exit.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*-
- * Copyright (c) 2011 David Chisnall
- * 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.
- *
- * 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: releng/10.2/lib/libc/stdlib/quick_exit.c 228528 2011-12-15 11:16:41Z theraven $
- */
-
-#include <stdlib.h>
-#include <pthread.h>
-
-/**
- * Linked list of quick exit handlers.  This is simpler than the atexit()
- * version, because it is not required to support C++ destructors or
- * DSO-specific cleanups.
- */
-struct quick_exit_handler {
-	struct quick_exit_handler *next;
-	void (*cleanup)(void);
-};
-
-/**
- * Lock protecting the handlers list.
- */
-static pthread_mutex_t atexit_mutex = PTHREAD_MUTEX_INITIALIZER;
-/**
- * Stack of cleanup handlers.  These will be invoked in reverse order when 
- */
-static struct quick_exit_handler *handlers;
-
-int
-at_quick_exit(void (*func)(void))
-{
-	struct quick_exit_handler *h;
-	
-	h = malloc(sizeof(*h));
-
-	if (NULL == h)
-		return (1);
-	h->cleanup = func;
-	pthread_mutex_lock(&atexit_mutex);
-	h->next = handlers;
-	handlers = h;
-	pthread_mutex_unlock(&atexit_mutex);
-	return (0);
-}
-
-void
-quick_exit(int status)
-{
-	struct quick_exit_handler *h;
-
-	/*
-	 * XXX: The C++ spec requires us to call std::terminate if there is an
-	 * exception here.
-	 */
-	for (h = handlers; NULL != h; h = h->next)
-		h->cleanup();
-	_Exit(status);
-}
diff --git a/lib/libc_bsd/stdlib/radixsort.3 b/lib/libc_bsd/stdlib/radixsort.3
deleted file mode 100644
index 73007f7..0000000
--- a/lib/libc_bsd/stdlib/radixsort.3
+++ /dev/null
@@ -1,160 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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. 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.
-.\"
-.\"     @(#)radixsort.3	8.2 (Berkeley) 1/27/94
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/radixsort.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd January 27, 1994
-.Dt RADIXSORT 3
-.Os
-.Sh NAME
-.Nm radixsort , sradixsort
-.Nd radix sort
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In limits.h
-.In stdlib.h
-.Ft int
-.Fn radixsort "const unsigned char **base" "int nmemb" "const unsigned char *table" "unsigned endbyte"
-.Ft int
-.Fn sradixsort "const unsigned char **base" "int nmemb" "const unsigned char *table" "unsigned endbyte"
-.Sh DESCRIPTION
-The
-.Fn radixsort
-and
-.Fn sradixsort
-functions
-are implementations of radix sort.
-.Pp
-These functions sort an array of pointers to byte strings, the initial
-member of which is referenced by
-.Fa base .
-The byte strings may contain any values; the end of each string
-is denoted by the user-specified value
-.Fa endbyte .
-.Pp
-Applications may specify a sort order by providing the
-.Fa table
-argument.
-If
-.Pf non- Dv NULL ,
-.Fa table
-must reference an array of
-.Dv UCHAR_MAX
-+ 1 bytes which contains the sort
-weight of each possible byte value.
-The end-of-string byte must have a sort weight of 0 or 255
-(for sorting in reverse order).
-More than one byte may have the same sort weight.
-The
-.Fa table
-argument
-is useful for applications which wish to sort different characters
-equally, for example, providing a table with the same weights
-for A-Z as for a-z will result in a case-insensitive sort.
-If
-.Fa table
-is NULL, the contents of the array are sorted in ascending order
-according to the
-.Tn ASCII
-order of the byte strings they reference and
-.Fa endbyte
-has a sorting weight of 0.
-.Pp
-The
-.Fn sradixsort
-function is stable, that is, if two elements compare as equal, their
-order in the sorted array is unchanged.
-The
-.Fn sradixsort
-function uses additional memory sufficient to hold
-.Fa nmemb
-pointers.
-.Pp
-The
-.Fn radixsort
-function is not stable, but uses no additional memory.
-.Pp
-These functions are variants of most-significant-byte radix sorting; in
-particular, see
-.An "D.E. Knuth" Ns 's
-.%T "Algorithm R"
-and section 5.2.5, exercise 10.
-They take linear time relative to the number of bytes in the strings.
-.Sh RETURN VALUES
-.Rv -std radixsort
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa endbyte
-element of
-.Fa table
-is not 0 or 255.
-.El
-.Pp
-Additionally, the
-.Fn sradixsort
-function
-may fail and set
-.Va errno
-for any of the errors specified for the library routine
-.Xr malloc 3 .
-.Sh SEE ALSO
-.Xr sort 1 ,
-.Xr qsort 3
-.Pp
-.Rs
-.%A Knuth, D.E.
-.%D 1968
-.%B "The Art of Computer Programming"
-.%T "Sorting and Searching"
-.%V Vol. 3
-.%P pp. 170-178
-.Re
-.Rs
-.%A Paige, R.
-.%D 1987
-.%T "Three Partition Refinement Algorithms"
-.%J "SIAM J. Comput."
-.%V Vol. 16
-.%N No. 6
-.Re
-.Rs
-.%A McIlroy, P.
-.%D 1993
-.%B "Engineering Radix Sort"
-.%T "Computing Systems"
-.%V Vol. 6:1
-.%P pp. 5-27
-.Re
-.Sh HISTORY
-The
-.Fn radixsort
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/stdlib/radixsort.c b/lib/libc_bsd/stdlib/radixsort.c
deleted file mode 100644
index 48cc43a..0000000
--- a/lib/libc_bsd/stdlib/radixsort.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Peter McIlroy and by Dan Bernstein at New York University,
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)radixsort.c	8.2 (Berkeley) 4/28/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/radixsort.c 251672 2013-06-13 00:19:30Z emaste $");
-
-/*
- * Radixsort routines.
- *
- * Program r_sort_a() is unstable but uses O(logN) extra memory for a stack.
- * Use radixsort(a, n, trace, endchar) for this case.
- *
- * For stable sorting (using N extra pointers) use sradixsort(), which calls
- * r_sort_b().
- *
- * For a description of this code, see D. McIlroy, P. McIlroy, K. Bostic,
- * "Engineering Radix Sort".
- */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <errno.h>
-
-typedef struct {
-	const u_char **sa;
-	int sn, si;
-} stack;
-
-static inline void simplesort
-(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_a(const u_char **, int, int, const u_char *, u_int);
-static void r_sort_b(const u_char **, const u_char **, int, int,
-    const u_char *, u_int);
-
-#define	THRESHOLD	20		/* Divert to simplesort(). */
-#define	SIZE		512		/* Default stack size. */
-
-#define SETUP {								\
-	if (tab == NULL) {						\
-		tr = tr0;						\
-		for (c = 0; c < endch; c++)				\
-			tr0[c] = c + 1;					\
-		tr0[c] = 0;						\
-		for (c++; c < 256; c++)					\
-			tr0[c] = c;					\
-		endch = 0;						\
-	} else {							\
-		endch = tab[endch];					\
-		tr = tab;						\
-		if (endch != 0 && endch != 255) {			\
-			errno = EINVAL;					\
-			return (-1);					\
-		}							\
-	}								\
-}
-
-int
-radixsort(a, n, tab, endch)
-	const u_char **a, *tab;
-	int n;
-	u_int endch;
-{
-	const u_char *tr;
-	int c;
-	u_char tr0[256];
-
-	SETUP;
-	r_sort_a(a, n, 0, tr, endch);
-	return (0);
-}
-
-int
-sradixsort(a, n, tab, endch)
-	const u_char **a, *tab;
-	int n;
-	u_int endch;
-{
-	const u_char *tr, **ta;
-	int c;
-	u_char tr0[256];
-
-	SETUP;
-	if (n < THRESHOLD)
-		simplesort(a, n, 0, tr, endch);
-	else {
-		if ((ta = malloc(n * sizeof(a))) == NULL)
-			return (-1);
-		r_sort_b(a, ta, n, 0, tr, endch);
-		free(ta);
-	}
-	return (0);
-}
-
-#define empty(s)	(s >= sp)
-#define pop(a, n, i)	a = (--sp)->sa, n = sp->sn, i = sp->si
-#define push(a, n, i)	sp->sa = a, sp->sn = n, (sp++)->si = i
-#define swap(a, b, t)	t = a, a = b, b = t
-
-/* Unstable, in-place sort. */
-static void
-r_sort_a(a, n, i, tr, endch)
-	const u_char **a;
-	int n, i;
-	const u_char *tr;
-	u_int endch;
-{
-	static int count[256], nc, bmin;
-	int c;
-	const u_char **ak, *r;
-	stack s[SIZE], *sp, *sp0, *sp1, temp;
-	int *cp, bigc;
-	const u_char **an, *t, **aj, **top[256];
-
-	/* Set up stack. */
-	sp = s;
-	push(a, n, i);
-	while (!empty(s)) {
-		pop(a, n, i);
-		if (n < THRESHOLD) {
-			simplesort(a, n, i, tr, endch);
-			continue;
-		}
-		an = a + n;
-
-		/* Make character histogram. */
-		if (nc == 0) {
-			bmin = 255;	/* First occupied bin, excluding eos. */
-			for (ak = a; ak < an;) {
-				c = tr[(*ak++)[i]];
-				if (++count[c] == 1 && c != endch) {
-					if (c < bmin)
-						bmin = c;
-					nc++;
-				}
-			}
-			if (sp + nc > s + SIZE) {	/* Get more stack. */
-				r_sort_a(a, n, i, tr, endch);
-				continue;
-			}
-		}
-
-		/*
-		 * Special case: if all strings have the same
-		 * character at position i, move on to the next
-		 * character.
-		 */
-		if (nc == 1 && count[bmin] == n) {
-			push(a, n, i+1);
-			nc = count[bmin] = 0;
-			continue;
-		}
-
-		/*
-		 * Set top[]; push incompletely sorted bins onto stack.
-		 * top[] = pointers to last out-of-place element in bins.
-		 * count[] = counts of elements in bins.
-		 * Before permuting: top[c-1] + count[c] = top[c];
-		 * during deal: top[c] counts down to top[c-1].
-		 */
-		sp0 = sp1 = sp;		/* Stack position of biggest bin. */
-		bigc = 2;		/* Size of biggest bin. */
-		if (endch == 0)		/* Special case: set top[eos]. */
-			top[0] = ak = a + count[0];
-		else {
-			ak = a;
-			top[255] = an;
-		}
-		for (cp = count + bmin; nc > 0; cp++) {
-			while (*cp == 0)	/* Find next non-empty pile. */
-				cp++;
-			if (*cp > 1) {
-				if (*cp > bigc) {
-					bigc = *cp;
-					sp1 = sp;
-				}
-				push(ak, *cp, i+1);
-			}
-			top[cp-count] = ak += *cp;
-			nc--;
-		}
-		swap(*sp0, *sp1, temp);	/* Play it safe -- biggest bin last. */
-
-		/*
-		 * Permute misplacements home.  Already home: everything
-		 * before aj, and in bin[c], items from top[c] on.
-		 * Inner loop:
-		 *	r = next element to put in place;
-		 *	ak = top[r[i]] = location to put the next element.
-		 *	aj = bottom of 1st disordered bin.
-		 * Outer loop:
-		 *	Once the 1st disordered bin is done, ie. aj >= ak,
-		 *	aj<-aj + count[c] connects the bins in a linked list;
-		 *	reset count[c].
-		 */
-		for (aj = a; aj < an;  *aj = r, aj += count[c], count[c] = 0)
-			for (r = *aj;  aj < (ak = --top[c = tr[r[i]]]);)
-				swap(*ak, r, t);
-	}
-}
-
-/* Stable sort, requiring additional memory. */
-static void
-r_sort_b(a, ta, n, i, tr, endch)
-	const u_char **a, **ta;
-	int n, i;
-	const u_char *tr;
-	u_int endch;
-{
-	static int count[256], nc, bmin;
-	int c;
-	const u_char **ak, **ai;
-	stack s[512], *sp, *sp0, *sp1, temp;
-	const u_char **top[256];
-	int *cp, bigc;
-
-	sp = s;
-	push(a, n, i);
-	while (!empty(s)) {
-		pop(a, n, i);
-		if (n < THRESHOLD) {
-			simplesort(a, n, i, tr, endch);
-			continue;
-		}
-
-		if (nc == 0) {
-			bmin = 255;
-			for (ak = a + n; --ak >= a;) {
-				c = tr[(*ak)[i]];
-				if (++count[c] == 1 && c != endch) {
-					if (c < bmin)
-						bmin = c;
-					nc++;
-				}
-			}
-			if (sp + nc > s + SIZE) {
-				r_sort_b(a, ta, n, i, tr, endch);
-				continue;
-			}
-		}
-
-		sp0 = sp1 = sp;
-		bigc = 2;
-		if (endch == 0) {
-			top[0] = ak = a + count[0];
-			count[0] = 0;
-		} else {
-			ak = a;
-			top[255] = a + n;
-			count[255] = 0;
-		}
-		for (cp = count + bmin; nc > 0; cp++) {
-			while (*cp == 0)
-				cp++;
-			if ((c = *cp) > 1) {
-				if (c > bigc) {
-					bigc = c;
-					sp1 = sp;
-				}
-				push(ak, c, i+1);
-			}
-			top[cp-count] = ak += c;
-			*cp = 0;			/* Reset count[]. */
-			nc--;
-		}
-		swap(*sp0, *sp1, temp);
-
-		for (ak = ta + n, ai = a+n; ak > ta;)	/* Copy to temp. */
-			*--ak = *--ai;
-		for (ak = ta+n; --ak >= ta;)		/* Deal to piles. */
-			*--top[tr[(*ak)[i]]] = *ak;
-	}
-}
-
-static inline void
-simplesort(a, n, b, tr, endch)	/* insertion sort */
-	const u_char **a;
-	int n, b;
-	const u_char *tr;
-	u_int endch;
-{
-	u_char ch;
-	const u_char  **ak, **ai, *s, *t;
-
-	for (ak = a+1; --n >= 1; ak++)
-		for (ai = ak; ai > a; ai--) {
-			for (s = ai[0] + b, t = ai[-1] + b;
-			    (ch = tr[*s]) != endch; s++, t++)
-				if (ch != tr[*t])
-					break;
-			if (ch >= tr[*t])
-				break;
-			swap(ai[0], ai[-1], s);
-		}
-}
diff --git a/lib/libc_bsd/stdlib/rand.3 b/lib/libc_bsd/stdlib/rand.3
deleted file mode 100644
index bcdca5a..0000000
--- a/lib/libc_bsd/stdlib/rand.3
+++ /dev/null
@@ -1,125 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)rand.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/rand.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd April 2, 2013
-.Dt RAND 3
-.Os
-.Sh NAME
-.Nm rand ,
-.Nm srand ,
-.Nm sranddev ,
-.Nm rand_r
-.Nd bad random number generator
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn srand "unsigned seed"
-.Ft void
-.Fn sranddev void
-.Ft int
-.Fn rand void
-.Ft int
-.Fn rand_r "unsigned *ctx"
-.Sh DESCRIPTION
-.Bf -symbolic
-The functions described in this manual page are not cryptographically
-secure.
-Cryptographic applications should use
-.Xr arc4random 3
-instead.
-.Ef
-.Pp
-These interfaces are obsoleted by
-.Xr random 3 .
-.Pp
-The
-.Fn rand
-function computes a sequence of pseudo-random integers in the range
-of 0 to
-.Dv RAND_MAX
-(as defined by the header file
-.In stdlib.h ) .
-.Pp
-The
-.Fn srand
-function sets its argument
-.Fa seed
-as the seed for a new sequence of
-pseudo-random numbers to be returned by
-.Fn rand .
-These sequences are repeatable by calling
-.Fn srand
-with the same seed value.
-.Pp
-If no
-.Fa seed
-value is provided, the functions are automatically
-seeded with a value of 1.
-.Pp
-The
-.Fn sranddev
-function initializes a seed using pseudo-random numbers obtained from the kernel.
-.Pp
-The
-.Fn rand_r
-function
-provides the same functionality as
-.Fn rand .
-A pointer to the context value
-.Fa ctx
-must be supplied by the caller.
-.Pp
-For better generator quality, use
-.Xr random 3
-or
-.Xr lrand48 3 .
-.Sh SEE ALSO
-.Xr arc4random 3 ,
-.Xr lrand48 3 ,
-.Xr random 3 ,
-.Xr random 4
-.Sh STANDARDS
-The
-.Fn rand
-and
-.Fn srand
-functions
-conform to
-.St -isoC .
-.Pp
-The
-.Fn rand_r
-function is as proposed in the POSIX.4a Draft #6 document.
diff --git a/lib/libc_bsd/stdlib/rand.c b/lib/libc_bsd/stdlib/rand.c
deleted file mode 100644
index f28f1dc..0000000
--- a/lib/libc_bsd/stdlib/rand.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- *
- * Posix rand_r function added May 1999 by Wes Peters <wes@softweyr.com>.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rand.c	8.1 (Berkeley) 6/14/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/rand.c 252698 2013-07-04 12:35:39Z ache $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-#ifdef TEST
-#include <stdio.h>
-#endif /* TEST */
-
-static int
-do_rand(unsigned long *ctx)
-{
-#ifdef  USE_WEAK_SEEDING
-/*
- * Historic implementation compatibility.
- * The random sequences do not vary much with the seed,
- * even with overflowing.
- */
-	return ((*ctx = *ctx * 1103515245 + 12345) % ((u_long)RAND_MAX + 1));
-#else   /* !USE_WEAK_SEEDING */
-/*
- * Compute x = (7^5 * x) mod (2^31 - 1)
- * without overflowing 31 bits:
- *      (2^31 - 1) = 127773 * (7^5) + 2836
- * From "Random number generators: good ones are hard to find",
- * Park and Miller, Communications of the ACM, vol. 31, no. 10,
- * October 1988, p. 1195.
- */
-	long hi, lo, x;
-
-	/* Must be in [1, 0x7ffffffe] range at this point. */
-	hi = *ctx / 127773;
-	lo = *ctx % 127773;
-	x = 16807 * lo - 2836 * hi;
-	if (x < 0)
-		x += 0x7fffffff;
-	*ctx = x;
-	/* Transform to [0, 0x7ffffffd] range. */
-	return (x - 1);
-#endif  /* !USE_WEAK_SEEDING */
-}
-
-
-int
-rand_r(unsigned int *ctx)
-{
-	u_long val;
-	int r;
-
-#ifdef  USE_WEAK_SEEDING
-	val = *ctx;
-#else
-	/* Transform to [1, 0x7ffffffe] range. */
-	val = (*ctx % 0x7ffffffe) + 1;
-#endif
-	r = do_rand(&val);
-
-#ifdef  USE_WEAK_SEEDING
-	*ctx = (unsigned int)val;
-#else
-	*ctx = (unsigned int)(val - 1);
-#endif
-	return (r);
-}
-
-
-static u_long next =
-#ifdef  USE_WEAK_SEEDING
-    1;
-#else
-    2;
-#endif
-
-int
-rand()
-{
-	return (do_rand(&next));
-}
-
-void
-srand(seed)
-u_int seed;
-{
-	next = seed;
-#ifndef USE_WEAK_SEEDING
-	/* Transform to [1, 0x7ffffffe] range. */
-	next = (next % 0x7ffffffe) + 1;
-#endif
-}
-
-
-/*
- * sranddev:
- *
- * Many programs choose the seed value in a totally predictable manner.
- * This often causes problems.  We seed the generator using pseudo-random
- * data from the kernel.
- */
-void
-sranddev()
-{
-	int mib[2];
-	size_t len;
-
-	len = sizeof(next);
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_ARND;
-	sysctl(mib, 2, (void *)&next, &len, NULL, 0);
-#ifndef USE_WEAK_SEEDING
-	/* Transform to [1, 0x7ffffffe] range. */
-	next = (next % 0x7ffffffe) + 1;
-#endif
-}
-
-
-#ifdef TEST
-
-main()
-{
-    int i;
-    unsigned myseed;
-
-    printf("seeding rand with 0x19610910: \n");
-    srand(0x19610910);
-
-    printf("generating three pseudo-random numbers:\n");
-    for (i = 0; i < 3; i++)
-    {
-	printf("next random number = %d\n", rand());
-    }
-
-    printf("generating the same sequence with rand_r:\n");
-    myseed = 0x19610910;
-    for (i = 0; i < 3; i++)
-    {
-	printf("next random number = %d\n", rand_r(&myseed));
-    }
-
-    return 0;
-}
-
-#endif /* TEST */
-
diff --git a/lib/libc_bsd/stdlib/random.3 b/lib/libc_bsd/stdlib/random.3
deleted file mode 100644
index 39adadb..0000000
--- a/lib/libc_bsd/stdlib/random.3
+++ /dev/null
@@ -1,198 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\"     @(#)random.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/random.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd April 2, 2013
-.Dt RANDOM 3
-.Os
-.Sh NAME
-.Nm random ,
-.Nm srandom ,
-.Nm srandomdev ,
-.Nm initstate ,
-.Nm setstate
-.Nd better random number generator; routines for changing generators
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long
-.Fn random void
-.Ft void
-.Fn srandom "unsigned long seed"
-.Ft void
-.Fn srandomdev void
-.Ft char *
-.Fn initstate "unsigned long seed" "char *state" "long n"
-.Ft char *
-.Fn setstate "char *state"
-.Sh DESCRIPTION
-.Bf -symbolic
-The functions described in this manual page are not cryptographically
-secure.
-Cryptographic applications should use
-.Xr arc4random 3
-instead.
-.Ef
-.Pp
-The
-.Fn random
-function
-uses a non-linear additive feedback random number generator employing a
-default table of size 31 long integers to return successive pseudo-random
-numbers in the range from 0 to
-.if t 2\u\s731\s10\d\(mi1.
-.if n (2**31)\(mi1.
-The period of this random number generator is very large, approximately
-.if t 16\(mu(2\u\s731\s10\d\(mi1).
-.if n 16*((2**31)\(mi1).
-.Pp
-The
-.Fn random
-and
-.Fn srandom
-functions have (almost) the same calling sequence and initialization properties as the
-.Xr rand 3
-and
-.Xr srand 3
-functions.
-The difference is that
-.Xr rand 3
-produces a much less random sequence \(em in fact, the low dozen bits
-generated by rand go through a cyclic pattern.
-All the bits generated by
-.Fn random
-are usable.
-For example,
-.Sq Li random()&01
-will produce a random binary
-value.
-.Pp
-Like
-.Xr rand 3 ,
-.Fn random
-will by default produce a sequence of numbers that can be duplicated
-by calling
-.Fn srandom
-with
-.Ql 1
-as the seed.
-.Pp
-The
-.Fn srandomdev
-routine initializes a state array using
-pseudo-random numbers obtained from the kernel.
-Note that this particular seeding
-procedure can generate states which are impossible to reproduce by
-calling
-.Fn srandom
-with any value, since the succeeding terms in the
-state buffer are no longer derived from the LC algorithm applied to
-a fixed seed.
-.Pp
-The
-.Fn initstate
-routine allows a state array, passed in as an argument, to be initialized
-for future use.
-The size of the state array (in bytes) is used by
-.Fn initstate
-to decide how sophisticated a random number generator it should use \(em the
-more state, the better the random numbers will be.
-(Current "optimal" values for the amount of state information are
-8, 32, 64, 128, and 256 bytes; other amounts will be rounded down to
-the nearest known amount.
-Using less than 8 bytes will cause an error.)
-The seed for the initialization (which specifies a starting point for
-the random number sequence, and provides for restarting at the same
-point) is also an argument.
-The
-.Fn initstate
-function
-returns a pointer to the previous state information array.
-.Pp
-Once a state has been initialized, the
-.Fn setstate
-routine provides for rapid switching between states.
-The
-.Fn setstate
-function
-returns a pointer to the previous state array; its
-argument state array is used for further random number generation
-until the next call to
-.Fn initstate
-or
-.Fn setstate .
-.Pp
-Once a state array has been initialized, it may be restarted at a
-different point either by calling
-.Fn initstate
-(with the desired seed, the state array, and its size) or by calling
-both
-.Fn setstate
-(with the state array) and
-.Fn srandom
-(with the desired seed).
-The advantage of calling both
-.Fn setstate
-and
-.Fn srandom
-is that the size of the state array does not have to be remembered after
-it is initialized.
-.Pp
-With 256 bytes of state information, the period of the random number
-generator is greater than
-.if t 2\u\s769\s10\d,
-.if n 2**69
-which should be sufficient for most purposes.
-.Sh DIAGNOSTICS
-If
-.Fn initstate
-is called with less than 8 bytes of state information, or if
-.Fn setstate
-detects that the state information has been garbled, error
-messages are printed on the standard error output.
-.Sh SEE ALSO
-.Xr arc4random 3 ,
-.Xr lrand48 3 ,
-.Xr rand 3 ,
-.Xr random 4
-.Sh HISTORY
-These
-functions appeared in
-.Bx 4.2 .
-.Sh AUTHORS
-.An Earl T. Cohen
-.Sh BUGS
-About 2/3 the speed of
-.Xr rand 3 .
-.Pp
-The historical implementation used to have a very weak seeding; the
-random sequence did not vary much with the seed.
-The current implementation employs a better pseudo-random number
-generator for the initial state calculation.
diff --git a/lib/libc_bsd/stdlib/random.c b/lib/libc_bsd/stdlib/random.c
deleted file mode 100644
index a0346bc..0000000
--- a/lib/libc_bsd/stdlib/random.c
+++ /dev/null
@@ -1,482 +0,0 @@
-/*
- * Copyright (c) 1983, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)random.c	8.2 (Berkeley) 5/19/95";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/random.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-/*
- * random.c:
- *
- * An improved random number generation package.  In addition to the standard
- * rand()/srand() like interface, this package also has a special state info
- * interface.  The initstate() routine is called with a seed, an array of
- * bytes, and a count of how many bytes are being passed in; this array is
- * then initialized to contain information for random number generation with
- * that much state information.  Good sizes for the amount of state
- * information are 32, 64, 128, and 256 bytes.  The state can be switched by
- * calling the setstate() routine with the same array as was initiallized
- * with initstate().  By default, the package runs with 128 bytes of state
- * information and generates far better random numbers than a linear
- * congruential generator.  If the amount of state information is less than
- * 32 bytes, a simple linear congruential R.N.G. is used.
- *
- * Internally, the state information is treated as an array of uint32_t's; the
- * zeroeth element of the array is the type of R.N.G. being used (small
- * integer); the remainder of the array is the state information for the
- * R.N.G.  Thus, 32 bytes of state information will give 7 ints worth of
- * state information, which will allow a degree seven polynomial.  (Note:
- * the zeroeth word of state information also has some other information
- * stored in it -- see setstate() for details).
- *
- * The random number generation technique is a linear feedback shift register
- * approach, employing trinomials (since there are fewer terms to sum up that
- * way).  In this approach, the least significant bit of all the numbers in
- * the state table will act as a linear feedback shift register, and will
- * have period 2^deg - 1 (where deg is the degree of the polynomial being
- * used, assuming that the polynomial is irreducible and primitive).  The
- * higher order bits will have longer periods, since their values are also
- * influenced by pseudo-random carries out of the lower bits.  The total
- * period of the generator is approximately deg*(2**deg - 1); thus doubling
- * the amount of state information has a vast influence on the period of the
- * generator.  Note: the deg*(2**deg - 1) is an approximation only good for
- * large deg, when the period of the shift is the dominant factor.
- * With deg equal to seven, the period is actually much longer than the
- * 7*(2**7 - 1) predicted by this formula.
- *
- * Modified 28 December 1994 by Jacob S. Rosenberg.
- * The following changes have been made:
- * All references to the type u_int have been changed to unsigned long.
- * All references to type int have been changed to type long.  Other
- * cleanups have been made as well.  A warning for both initstate and
- * setstate has been inserted to the effect that on Sparc platforms
- * the 'arg_state' variable must be forced to begin on word boundaries.
- * This can be easily done by casting a long integer array to char *.
- * The overall logic has been left STRICTLY alone.  This software was
- * tested on both a VAX and Sun SpacsStation with exactly the same
- * results.  The new version and the original give IDENTICAL results.
- * The new version is somewhat faster than the original.  As the
- * documentation says:  "By default, the package runs with 128 bytes of
- * state information and generates far better random numbers than a linear
- * congruential generator.  If the amount of state information is less than
- * 32 bytes, a simple linear congruential R.N.G. is used."  For a buffer of
- * 128 bytes, this new version runs about 19 percent faster and for a 16
- * byte buffer it is about 5 percent faster.
- */
-
-/*
- * For each of the currently supported random number generators, we have a
- * break value on the amount of state information (you need at least this
- * many bytes of state info to support this random number generator), a degree
- * for the polynomial (actually a trinomial) that the R.N.G. is based on, and
- * the separation between the two lower order coefficients of the trinomial.
- */
-#define	TYPE_0		0		/* linear congruential */
-#define	BREAK_0		8
-#define	DEG_0		0
-#define	SEP_0		0
-
-#define	TYPE_1		1		/* x**7 + x**3 + 1 */
-#define	BREAK_1		32
-#define	DEG_1		7
-#define	SEP_1		3
-
-#define	TYPE_2		2		/* x**15 + x + 1 */
-#define	BREAK_2		64
-#define	DEG_2		15
-#define	SEP_2		1
-
-#define	TYPE_3		3		/* x**31 + x**3 + 1 */
-#define	BREAK_3		128
-#define	DEG_3		31
-#define	SEP_3		3
-
-#define	TYPE_4		4		/* x**63 + x + 1 */
-#define	BREAK_4		256
-#define	DEG_4		63
-#define	SEP_4		1
-
-/*
- * Array versions of the above information to make code run faster --
- * relies on fact that TYPE_i == i.
- */
-#define	MAX_TYPES	5		/* max number of types above */
-
-#ifdef  USE_WEAK_SEEDING
-#define NSHUFF 0
-#else   /* !USE_WEAK_SEEDING */
-#define NSHUFF 50       /* to drop some "seed -> 1st value" linearity */
-#endif  /* !USE_WEAK_SEEDING */
-
-static const int degrees[MAX_TYPES] =	{ DEG_0, DEG_1, DEG_2, DEG_3, DEG_4 };
-static const int seps [MAX_TYPES] =	{ SEP_0, SEP_1, SEP_2, SEP_3, SEP_4 };
-
-/*
- * Initially, everything is set up as if from:
- *
- *	initstate(1, randtbl, 128);
- *
- * Note that this initialization takes advantage of the fact that srandom()
- * advances the front and rear pointers 10*rand_deg times, and hence the
- * rear pointer which starts at 0 will also end up at zero; thus the zeroeth
- * element of the state information, which contains info about the current
- * position of the rear pointer is just
- *
- *	MAX_TYPES * (rptr - state) + TYPE_3 == TYPE_3.
- */
-
-static uint32_t randtbl[DEG_3 + 1] = {
-	TYPE_3,
-#ifdef  USE_WEAK_SEEDING
-/* Historic implementation compatibility */
-/* The random sequences do not vary much with the seed */
-	0x9a319039, 0x32d9c024, 0x9b663182, 0x5da1f342, 0xde3b81e0, 0xdf0a6fb5,
-	0xf103bc02, 0x48f340fb, 0x7449e56b, 0xbeb1dbb0, 0xab5c5918, 0x946554fd,
-	0x8c2e680f, 0xeb3d799f, 0xb11ee0b7, 0x2d436b86, 0xda672e2a, 0x1588ca88,
-	0xe369735d, 0x904f35f7, 0xd7158fd6, 0x6fa6f051, 0x616e6b96, 0xac94efdc,
-	0x36413f93, 0xc622c298, 0xf5a42ab8, 0x8a88d77b, 0xf5ad9d0e, 0x8999220b,
-	0x27fb47b9,
-#else   /* !USE_WEAK_SEEDING */
-	0x991539b1, 0x16a5bce3, 0x6774a4cd, 0x3e01511e, 0x4e508aaa, 0x61048c05,
-	0xf5500617, 0x846b7115, 0x6a19892c, 0x896a97af, 0xdb48f936, 0x14898454,
-	0x37ffd106, 0xb58bff9c, 0x59e17104, 0xcf918a49, 0x09378c83, 0x52c7a471,
-	0x8d293ea9, 0x1f4fc301, 0xc3db71be, 0x39b44e1c, 0xf8a44ef9, 0x4c8b80b1,
-	0x19edc328, 0x87bf4bdd, 0xc9b240e5, 0xe9ee4b1b, 0x4382aee7, 0x535b6b41,
-	0xf3bec5da
-#endif  /* !USE_WEAK_SEEDING */
-};
-
-/*
- * fptr and rptr are two pointers into the state info, a front and a rear
- * pointer.  These two pointers are always rand_sep places aparts, as they
- * cycle cyclically through the state information.  (Yes, this does mean we
- * could get away with just one pointer, but the code for random() is more
- * efficient this way).  The pointers are left positioned as they would be
- * from the call
- *
- *	initstate(1, randtbl, 128);
- *
- * (The position of the rear pointer, rptr, is really 0 (as explained above
- * in the initialization of randtbl) because the state table pointer is set
- * to point to randtbl[1] (as explained below).
- */
-static uint32_t *fptr = &randtbl[SEP_3 + 1];
-static uint32_t *rptr = &randtbl[1];
-
-/*
- * The following things are the pointer to the state information table, the
- * type of the current generator, the degree of the current polynomial being
- * used, and the separation between the two pointers.  Note that for efficiency
- * of random(), we remember the first location of the state information, not
- * the zeroeth.  Hence it is valid to access state[-1], which is used to
- * store the type of the R.N.G.  Also, we remember the last location, since
- * this is more efficient than indexing every time to find the address of
- * the last element to see if the front and rear pointers have wrapped.
- */
-static uint32_t *state = &randtbl[1];
-static int rand_type = TYPE_3;
-static int rand_deg = DEG_3;
-static int rand_sep = SEP_3;
-static uint32_t *end_ptr = &randtbl[DEG_3 + 1];
-
-static inline uint32_t
-good_rand(int32_t x)
-{
-#ifdef  USE_WEAK_SEEDING
-/*
- * Historic implementation compatibility.
- * The random sequences do not vary much with the seed,
- * even with overflowing.
- */
-	return (1103515245 * x + 12345);
-#else   /* !USE_WEAK_SEEDING */
-/*
- * Compute x = (7^5 * x) mod (2^31 - 1)
- * wihout overflowing 31 bits:
- *      (2^31 - 1) = 127773 * (7^5) + 2836
- * From "Random number generators: good ones are hard to find",
- * Park and Miller, Communications of the ACM, vol. 31, no. 10,
- * October 1988, p. 1195.
- */
-	int32_t hi, lo;
-
-	/* Can't be initialized with 0, so use another value. */
-	if (x == 0)
-		x = 123459876;
-	hi = x / 127773;
-	lo = x % 127773;
-	x = 16807 * lo - 2836 * hi;
-	if (x < 0)
-		x += 0x7fffffff;
-	return (x);
-#endif  /* !USE_WEAK_SEEDING */
-}
-
-/*
- * srandom:
- *
- * Initialize the random number generator based on the given seed.  If the
- * type is the trivial no-state-information type, just remember the seed.
- * Otherwise, initializes state[] based on the given "seed" via a linear
- * congruential generator.  Then, the pointers are set to known locations
- * that are exactly rand_sep places apart.  Lastly, it cycles the state
- * information a given number of times to get rid of any initial dependencies
- * introduced by the L.C.R.N.G.  Note that the initialization of randtbl[]
- * for default usage relies on values produced by this routine.
- */
-void
-srandom(unsigned long x)
-{
-	int i, lim;
-
-	state[0] = (uint32_t)x;
-	if (rand_type == TYPE_0)
-		lim = NSHUFF;
-	else {
-		for (i = 1; i < rand_deg; i++)
-			state[i] = good_rand(state[i - 1]);
-		fptr = &state[rand_sep];
-		rptr = &state[0];
-		lim = 10 * rand_deg;
-	}
-	for (i = 0; i < lim; i++)
-		(void)random();
-}
-
-/*
- * srandomdev:
- *
- * Many programs choose the seed value in a totally predictable manner.
- * This often causes problems.  We seed the generator using pseudo-random
- * data from the kernel.
- *
- * Note that this particular seeding procedure can generate states
- * which are impossible to reproduce by calling srandom() with any
- * value, since the succeeding terms in the state buffer are no longer
- * derived from the LC algorithm applied to a fixed seed.
- */
-void
-srandomdev(void)
-{
-	int mib[2];
-	size_t len;
-
-	if (rand_type == TYPE_0)
-		len = sizeof(state[0]);
-	else
-		len = rand_deg * sizeof(state[0]);
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_ARND;
-	sysctl(mib, 2, state, &len, NULL, 0);
-
-	if (rand_type != TYPE_0) {
-		fptr = &state[rand_sep];
-		rptr = &state[0];
-	}
-}
-
-/*
- * initstate:
- *
- * Initialize the state information in the given array of n bytes for future
- * random number generation.  Based on the number of bytes we are given, and
- * the break values for the different R.N.G.'s, we choose the best (largest)
- * one we can and set things up for it.  srandom() is then called to
- * initialize the state information.
- *
- * Note that on return from srandom(), we set state[-1] to be the type
- * multiplexed with the current value of the rear pointer; this is so
- * successive calls to initstate() won't lose this information and will be
- * able to restart with setstate().
- *
- * Note: the first thing we do is save the current state, if any, just like
- * setstate() so that it doesn't matter when initstate is called.
- *
- * Returns a pointer to the old state.
- *
- * Note: The Sparc platform requires that arg_state begin on an int
- * word boundary; otherwise a bus error will occur. Even so, lint will
- * complain about mis-alignment, but you should disregard these messages.
- */
-char *
-initstate(unsigned long seed, char *arg_state, long n)
-{
-	char *ostate = (char *)(&state[-1]);
-	uint32_t *int_arg_state = (uint32_t *)arg_state;
-
-	if (rand_type == TYPE_0)
-		state[-1] = rand_type;
-	else
-		state[-1] = MAX_TYPES * (rptr - state) + rand_type;
-	if (n < BREAK_0) {
-		(void)fprintf(stderr,
-		    "random: not enough state (%ld bytes); ignored.\n", n);
-		return (0);
-	}
-	if (n < BREAK_1) {
-		rand_type = TYPE_0;
-		rand_deg = DEG_0;
-		rand_sep = SEP_0;
-	} else if (n < BREAK_2) {
-		rand_type = TYPE_1;
-		rand_deg = DEG_1;
-		rand_sep = SEP_1;
-	} else if (n < BREAK_3) {
-		rand_type = TYPE_2;
-		rand_deg = DEG_2;
-		rand_sep = SEP_2;
-	} else if (n < BREAK_4) {
-		rand_type = TYPE_3;
-		rand_deg = DEG_3;
-		rand_sep = SEP_3;
-	} else {
-		rand_type = TYPE_4;
-		rand_deg = DEG_4;
-		rand_sep = SEP_4;
-	}
-	state = int_arg_state + 1; /* first location */
-	end_ptr = &state[rand_deg];	/* must set end_ptr before srandom */
-	srandom(seed);
-	if (rand_type == TYPE_0)
-		int_arg_state[0] = rand_type;
-	else
-		int_arg_state[0] = MAX_TYPES * (rptr - state) + rand_type;
-	return (ostate);
-}
-
-/*
- * setstate:
- *
- * Restore the state from the given state array.
- *
- * Note: it is important that we also remember the locations of the pointers
- * in the current state information, and restore the locations of the pointers
- * from the old state information.  This is done by multiplexing the pointer
- * location into the zeroeth word of the state information.
- *
- * Note that due to the order in which things are done, it is OK to call
- * setstate() with the same state as the current state.
- *
- * Returns a pointer to the old state information.
- *
- * Note: The Sparc platform requires that arg_state begin on an int
- * word boundary; otherwise a bus error will occur. Even so, lint will
- * complain about mis-alignment, but you should disregard these messages.
- */
-char *
-setstate(char *arg_state)
-{
-	uint32_t *new_state = (uint32_t *)arg_state;
-	uint32_t type = new_state[0] % MAX_TYPES;
-	uint32_t rear = new_state[0] / MAX_TYPES;
-	char *ostate = (char *)(&state[-1]);
-
-	if (rand_type == TYPE_0)
-		state[-1] = rand_type;
-	else
-		state[-1] = MAX_TYPES * (rptr - state) + rand_type;
-	switch(type) {
-	case TYPE_0:
-	case TYPE_1:
-	case TYPE_2:
-	case TYPE_3:
-	case TYPE_4:
-		rand_type = type;
-		rand_deg = degrees[type];
-		rand_sep = seps[type];
-		break;
-	default:
-		(void)fprintf(stderr,
-		    "random: state info corrupted; not changed.\n");
-	}
-	state = new_state + 1;
-	if (rand_type != TYPE_0) {
-		rptr = &state[rear];
-		fptr = &state[(rear + rand_sep) % rand_deg];
-	}
-	end_ptr = &state[rand_deg];		/* set end_ptr too */
-	return (ostate);
-}
-
-/*
- * random:
- *
- * If we are using the trivial TYPE_0 R.N.G., just do the old linear
- * congruential bit.  Otherwise, we do our fancy trinomial stuff, which is
- * the same in all the other cases due to all the global variables that have
- * been set up.  The basic operation is to add the number at the rear pointer
- * into the one at the front pointer.  Then both pointers are advanced to
- * the next location cyclically in the table.  The value returned is the sum
- * generated, reduced to 31 bits by throwing away the "least random" low bit.
- *
- * Note: the code takes advantage of the fact that both the front and
- * rear pointers can't wrap on the same call by not testing the rear
- * pointer if the front one has wrapped.
- *
- * Returns a 31-bit random number.
- */
-long
-random(void)
-{
-	uint32_t i;
-	uint32_t *f, *r;
-
-	if (rand_type == TYPE_0) {
-		i = state[0];
-		state[0] = i = (good_rand(i)) & 0x7fffffff;
-	} else {
-		/*
-		 * Use local variables rather than static variables for speed.
-		 */
-		f = fptr; r = rptr;
-		*f += *r;
-		i = (*f >> 1) & 0x7fffffff;	/* chucking least random bit */
-		if (++f >= end_ptr) {
-			f = state;
-			++r;
-		}
-		else if (++r >= end_ptr) {
-			r = state;
-		}
-
-		fptr = f; rptr = r;
-	}
-	return ((long)i);
-}
diff --git a/lib/libc_bsd/stdlib/reallocf.3 b/lib/libc_bsd/stdlib/reallocf.3
deleted file mode 100644
index ca98456..0000000
--- a/lib/libc_bsd/stdlib/reallocf.3
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/reallocf.3 234370 2012-04-17 07:22:14Z jasone $
-.\"
-.Dd January 31, 2010
-.Dt MALLOC 3
-.Os
-.Sh NAME
-.Nm reallocf
-.Nd memory reallocation function
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void *
-.Fn reallocf "void *ptr" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn reallocf
-function is identical to the
-.Fn realloc
-function, except that it
-will free the passed pointer when the requested memory cannot be allocated.
-This is a
-.Fx
-specific API designed to ease the problems with traditional coding styles
-for
-.Fn realloc
-causing memory leaks in libraries.
-.Sh RETURN VALUES
-The
-.Fn reallocf
-function returns a pointer, possibly identical to
-.Fa ptr ,
-to the allocated memory
-if successful; otherwise a
-.Dv NULL
-pointer is returned, and
-.Va errno
-is set to
-.Er ENOMEM
-if the error was the result of an allocation failure.
-The
-.Fn reallocf
-function deletes the original buffer when an error occurs.
-.Sh SEE ALSO
-.Xr realloc 3
-.Sh HISTORY
-The
-.Fn reallocf
-function first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/stdlib/reallocf.c b/lib/libc_bsd/stdlib/reallocf.c
deleted file mode 100644
index 53df2ea..0000000
--- a/lib/libc_bsd/stdlib/reallocf.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1998, M. Warner Losh <imp@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/reallocf.c 204636 2010-03-03 15:43:26Z jh $");
-
-#include <stdlib.h>
-
-void *
-reallocf(void *ptr, size_t size)
-{
-	void *nptr;
-
-	nptr = realloc(ptr, size);
-
-	/*
-	 * When the System V compatibility option (malloc "V" flag) is
-	 * in effect, realloc(ptr, 0) frees the memory and returns NULL.
-	 * So, to avoid double free, call free() only when size != 0.
-	 * realloc(ptr, 0) can't fail when ptr != NULL.
-	 */
-	if (!nptr && ptr && size != 0)
-		free(ptr);
-	return (nptr);
-}
diff --git a/lib/libc_bsd/stdlib/realpath.3 b/lib/libc_bsd/stdlib/realpath.3
deleted file mode 100644
index 246f178..0000000
--- a/lib/libc_bsd/stdlib/realpath.3
+++ /dev/null
@@ -1,135 +0,0 @@
-.\" Copyright (c) 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Jan-Simon Pendry.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)realpath.3	8.2 (Berkeley) 2/16/94
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/realpath.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd May 11, 2012
-.Dt REALPATH 3
-.Os
-.Sh NAME
-.Nm realpath
-.Nd returns the canonicalized absolute pathname
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft "char *"
-.Fn realpath "const char * restrict pathname" "char * restrict resolved_path"
-.Sh DESCRIPTION
-The
-.Fn realpath
-function resolves all symbolic links, extra
-.Dq /
-characters and references to
-.Pa /./
-and
-.Pa /../
-in
-.Fa pathname ,
-and copies the resulting absolute pathname into
-the memory pointed to by
-.Fa resolved_path .
-The
-.Fa resolved_path
-argument
-.Em must
-point to a buffer capable of storing at least
-.Dv PATH_MAX
-characters, or be
-.Dv NULL .
-.Pp
-The
-.Fn realpath
-function will resolve both absolute and relative paths
-and return the absolute pathname corresponding to
-.Fa pathname .
-All components of
-.Fa pathname
-must exist when
-.Fn realpath
-is called, and all but the last component must name either directories or
-symlinks pointing to the directories.
-.Sh "RETURN VALUES"
-The
-.Fn realpath
-function returns
-.Fa resolved_path
-on success.
-If the function was supplied
-.Dv NULL
-as
-.Fa resolved_path ,
-and operation did not cause errors, the returned value is
-a null-terminated string in a buffer allocated by a call to
-.Fn malloc 3 .
-If an error occurs,
-.Fn realpath
-returns
-.Dv NULL ,
-and if
-.Fa resolved_path
-is not
-.Dv NULL ,
-the array that it points to contains the pathname which caused the problem.
-.Sh ERRORS
-The function
-.Fn realpath
-may fail and set the external variable
-.Va errno
-for any of the errors specified for the library functions
-.Xr lstat 2 ,
-.Xr readlink 2
-and
-.Xr getcwd 3 .
-.Sh SEE ALSO
-.Xr getcwd 3
-.\" .Sh STANDARDS
-.\" The
-.\" .Fn realpath
-.\" function conforms to
-.\" .St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn realpath
-function first appeared in
-.Bx 4.4 .
-.Sh CAVEATS
-This implementation of
-.Fn realpath
-differs slightly from the Solaris implementation.
-The
-.Bx 4.4
-version always returns absolute pathnames,
-whereas the Solaris implementation will,
-under certain circumstances, return a relative
-.Fa resolved_path
-when given a relative
-.Fa pathname .
diff --git a/lib/libc_bsd/stdlib/realpath.c b/lib/libc_bsd/stdlib/realpath.c
deleted file mode 100644
index 3e19c03..0000000
--- a/lib/libc_bsd/stdlib/realpath.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
- *
- * 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 names of the authors 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)realpath.c	8.1 (Berkeley) 2/16/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/realpath.c 267161 2014-06-06 13:37:40Z jilles $");
-
-#include "namespace.h"
-#include <sys/param.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include "un-namespace.h"
-
-/*
- * Find the real name of path, by removing all ".", ".." and symlink
- * components.  Returns (resolved) on success, or (NULL) on failure,
- * in which case the path which caused trouble is left in (resolved).
- */
-char *
-realpath(const char * __restrict path, char * __restrict resolved)
-{
-	struct stat sb;
-	char *p, *q, *s;
-	size_t left_len, resolved_len;
-	unsigned symlinks;
-	int m, slen;
-	char left[PATH_MAX], next_token[PATH_MAX], symlink[PATH_MAX];
-
-	if (path == NULL) {
-		errno = EINVAL;
-		return (NULL);
-	}
-	if (path[0] == '\0') {
-		errno = ENOENT;
-		return (NULL);
-	}
-	if (resolved == NULL) {
-		resolved = malloc(PATH_MAX);
-		if (resolved == NULL)
-			return (NULL);
-		m = 1;
-	} else
-		m = 0;
-	symlinks = 0;
-	if (path[0] == '/') {
-		resolved[0] = '/';
-		resolved[1] = '\0';
-		if (path[1] == '\0')
-			return (resolved);
-		resolved_len = 1;
-		left_len = strlcpy(left, path + 1, sizeof(left));
-	} else {
-		if (getcwd(resolved, PATH_MAX) == NULL) {
-			if (m)
-				free(resolved);
-			else {
-				resolved[0] = '.';
-				resolved[1] = '\0';
-			}
-			return (NULL);
-		}
-		resolved_len = strlen(resolved);
-		left_len = strlcpy(left, path, sizeof(left));
-	}
-	if (left_len >= sizeof(left) || resolved_len >= PATH_MAX) {
-		if (m)
-			free(resolved);
-		errno = ENAMETOOLONG;
-		return (NULL);
-	}
-
-	/*
-	 * Iterate over path components in `left'.
-	 */
-	while (left_len != 0) {
-		/*
-		 * Extract the next path component and adjust `left'
-		 * and its length.
-		 */
-		p = strchr(left, '/');
-		s = p ? p : left + left_len;
-		if (s - left >= sizeof(next_token)) {
-			if (m)
-				free(resolved);
-			errno = ENAMETOOLONG;
-			return (NULL);
-		}
-		memcpy(next_token, left, s - left);
-		next_token[s - left] = '\0';
-		left_len -= s - left;
-		if (p != NULL)
-			memmove(left, s + 1, left_len + 1);
-		if (resolved[resolved_len - 1] != '/') {
-			if (resolved_len + 1 >= PATH_MAX) {
-				if (m)
-					free(resolved);
-				errno = ENAMETOOLONG;
-				return (NULL);
-			}
-			resolved[resolved_len++] = '/';
-			resolved[resolved_len] = '\0';
-		}
-		if (next_token[0] == '\0') {
-			/* Handle consequential slashes. */
-			continue;
-		}
-		else if (strcmp(next_token, ".") == 0)
-			continue;
-		else if (strcmp(next_token, "..") == 0) {
-			/*
-			 * Strip the last path component except when we have
-			 * single "/"
-			 */
-			if (resolved_len > 1) {
-				resolved[resolved_len - 1] = '\0';
-				q = strrchr(resolved, '/') + 1;
-				*q = '\0';
-				resolved_len = q - resolved;
-			}
-			continue;
-		}
-
-		/*
-		 * Append the next path component and lstat() it.
-		 */
-		resolved_len = strlcat(resolved, next_token, PATH_MAX);
-		if (resolved_len >= PATH_MAX) {
-			if (m)
-				free(resolved);
-			errno = ENAMETOOLONG;
-			return (NULL);
-		}
-		if (lstat(resolved, &sb) != 0) {
-			if (m)
-				free(resolved);
-			return (NULL);
-		}
-		if (S_ISLNK(sb.st_mode)) {
-			if (symlinks++ > MAXSYMLINKS) {
-				if (m)
-					free(resolved);
-				errno = ELOOP;
-				return (NULL);
-			}
-			slen = readlink(resolved, symlink, sizeof(symlink) - 1);
-			if (slen < 0) {
-				if (m)
-					free(resolved);
-				return (NULL);
-			}
-			symlink[slen] = '\0';
-			if (symlink[0] == '/') {
-				resolved[1] = 0;
-				resolved_len = 1;
-			} else if (resolved_len > 1) {
-				/* Strip the last path component. */
-				resolved[resolved_len - 1] = '\0';
-				q = strrchr(resolved, '/') + 1;
-				*q = '\0';
-				resolved_len = q - resolved;
-			}
-
-			/*
-			 * If there are any path components left, then
-			 * append them to symlink. The result is placed
-			 * in `left'.
-			 */
-			if (p != NULL) {
-				if (symlink[slen - 1] != '/') {
-					if (slen + 1 >= sizeof(symlink)) {
-						if (m)
-							free(resolved);
-						errno = ENAMETOOLONG;
-						return (NULL);
-					}
-					symlink[slen] = '/';
-					symlink[slen + 1] = 0;
-				}
-				left_len = strlcat(symlink, left,
-				    sizeof(symlink));
-				if (left_len >= sizeof(left)) {
-					if (m)
-						free(resolved);
-					errno = ENAMETOOLONG;
-					return (NULL);
-				}
-			}
-			left_len = strlcpy(left, symlink, sizeof(left));
-		} else if (!S_ISDIR(sb.st_mode) && p != NULL) {
-			if (m)
-				free(resolved);
-			errno = ENOTDIR;
-			return (NULL);
-		}
-	}
-
-	/*
-	 * Remove trailing slash except when the resolved pathname
-	 * is a single "/".
-	 */
-	if (resolved_len > 1 && resolved[resolved_len - 1] == '/')
-		resolved[resolved_len - 1] = '\0';
-	return (resolved);
-}
diff --git a/lib/libc_bsd/stdlib/remque.c b/lib/libc_bsd/stdlib/remque.c
deleted file mode 100644
index f81f887..0000000
--- a/lib/libc_bsd/stdlib/remque.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Initial implementation:
- * Copyright (c) 2002 Robert Drehmel
- * All rights reserved.
- *
- * As long as the above copyright statement and this notice remain
- * unchanged, you can do what ever you want with this file. 
- */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/remque.c 108644 2003-01-04 07:34:41Z tjr $");
-
-#define	_SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>	/* for NULL */
-
-void
-remque(void *element)
-{
-	struct que_elem *prev, *next, *elem;
-
-	elem = (struct que_elem *)element;
-
-	prev = elem->prev;
-	next = elem->next;
-
-	if (prev != NULL)
-		prev->next = next;
-	if (next != NULL)
-		next->prev = prev;
-}
diff --git a/lib/libc_bsd/stdlib/strfmon.3 b/lib/libc_bsd/stdlib/strfmon.3
deleted file mode 100644
index 2277359..0000000
--- a/lib/libc_bsd/stdlib/strfmon.3
+++ /dev/null
@@ -1,184 +0,0 @@
-.\" Copyright (c) 2001 Jeroen Ruigrok van der Werven <asmodai@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.
-.\"
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/strfmon.3 237591 2012-06-26 05:34:31Z joel $
-.\"
-.Dd June 25, 2012
-.Dt STRFMON 3
-.Os
-.Sh NAME
-.Nm strfmon
-.Nd convert monetary value to string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In monetary.h
-.Ft ssize_t
-.Fn strfmon "char * restrict s" "size_t maxsize" "const char * restrict format" "..."
-.Ft ssize_t
-.Fn strfmon_l "char * restrict s" "size_t maxsize" "locale_t loc" "const char * restrict format" "..."
-.Sh DESCRIPTION
-The
-.Fn strfmon
-function places characters into the array pointed to by
-.Fa s
-as controlled by the string pointed to by
-.Fa format .
-No more than
-.Fa maxsize
-bytes are placed into the array.
-.Pp
-The
-.Fn strfmon_l
-function does the same as
-.Fn strfmon
-but takes an explicit locale rather than using the current locale.
-.Pp
-The format string is composed of zero or more directives:
-ordinary characters (not
-.Cm % ) ,
-which are copied unchanged to the output stream; and conversion
-specifications, each of which results in fetching zero or more subsequent
-arguments.
-Each conversion specification is introduced by the
-.Cm %
-character.
-After the
-.Cm % ,
-the following appear in sequence:
-.Bl -bullet
-.It
-Zero or more of the following flags:
-.Bl -tag -width "XXX"
-.It Cm = Ns Ar f
-A
-.Sq Cm =
-character followed by another character
-.Ar f
-which is used as the numeric fill character.
-.It Cm ^
-Do not use grouping characters, regardless of the current locale default.
-.It Cm +
-Represent positive values by prefixing them with a positive sign,
-and negative values by prefixing them with a negative sign.
-This is the default.
-.It Cm \&(
-Enclose negative values in parentheses.
-.It Cm \&!
-Do not include a currency symbol in the output.
-.It Cm \-
-Left justify the result.
-Only valid when a field width is specified.
-.El
-.It
-An optional minimum field width as a decimal number.
-By default, there is no minimum width.
-.It
-A
-.Sq Cm #
-sign followed by a decimal number specifying the maximum
-expected number of digits after the radix character.
-.It
-A
-.Sq Cm \&.
-character followed by a decimal number specifying the number
-the number of digits after the radix character.
-.It
-One of the following conversion specifiers:
-.Bl -tag -width "XXX"
-.It Cm i
-The
-.Vt double
-argument is formatted as an international monetary amount.
-.It Cm n
-The
-.Vt double
-argument is formatted as a national monetary amount.
-.It Cm %
-A
-.Sq Li %
-character is written.
-.El
-.El
-.Sh RETURN VALUES
-If the total number of resulting bytes including the terminating
-.Dv NUL
-byte is not more than
-.Fa maxsize ,
-.Fn strfmon
-returns the number of bytes placed into the array pointed to by
-.Fa s ,
-not including the terminating
-.Dv NUL
-byte.
-Otherwise, \-1 is returned,
-the contents of the array are indeterminate,
-and
-.Va errno
-is set to indicate the error.
-.Pp
-The
-.Fn strfmon_l
-function returns the same values as
-.Fn strfmon .
-.Sh ERRORS
-The
-.Fn strfmon
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er E2BIG
-Conversion stopped due to lack of space in the buffer.
-.It Bq Er EINVAL
-The format string is invalid.
-.It Bq Er ENOMEM
-Not enough memory for temporary buffers.
-.El
-.Sh SEE ALSO
-.Xr localeconv 3
-.Sh STANDARDS
-The
-.Fn strfmon
-function
-conforms to
-.St -p1003.1-2001 .
-The
-.Fn strfmon_l
-function conforms to
-.St -p1003.1-2008 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Fn strfmon
-function was implemented by
-.An Alexey Zelkin Aq phantom@FreeBSD.org .
-.Pp
-This manual page was written by
-.An Jeroen Ruigrok van der Werven Aq asmodai@FreeBSD.org
-based on the standards' text.
-.Sh BUGS
-The
-.Fn strfmon
-function does not correctly handle multibyte characters in the
-.Fa format
-argument.
diff --git a/lib/libc_bsd/stdlib/strfmon.c b/lib/libc_bsd/stdlib/strfmon.c
deleted file mode 100644
index be64b79..0000000
--- a/lib/libc_bsd/stdlib/strfmon.c
+++ /dev/null
@@ -1,641 +0,0 @@
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strfmon.c 268881 2014-07-19 15:12:38Z pfg $");
-
-#include <sys/types.h>
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <locale.h>
-#include <monetary.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "xlocale_private.h"
-
-/* internal flags */
-#define	NEED_GROUPING		0x01	/* print digits grouped (default) */
-#define	SIGN_POSN_USED		0x02	/* '+' or '(' usage flag */
-#define	LOCALE_POSN		0x04	/* use locale defined +/- (default) */
-#define	PARENTH_POSN		0x08	/* enclose negative amount in () */
-#define	SUPRESS_CURR_SYMBOL	0x10	/* supress the currency from output */
-#define	LEFT_JUSTIFY		0x20	/* left justify */
-#define	USE_INTL_CURRENCY	0x40	/* use international currency symbol */
-#define IS_NEGATIVE		0x80	/* is argument value negative ? */
-
-/* internal macros */
-#define PRINT(CH) do {						\
-	if (dst >= s + maxsize) 				\
-		goto e2big_error;				\
-	*dst++ = CH;						\
-} while (0)
-
-#define PRINTS(STR) do {					\
-	char *tmps = STR;					\
-	while (*tmps != '\0')					\
-		PRINT(*tmps++);					\
-} while (0)
-
-#define GET_NUMBER(VAR)	do {					\
-	VAR = 0;						\
-	while (isdigit((unsigned char)*fmt)) {			\
-		if (VAR > INT_MAX / 10)				\
-			goto e2big_error;			\
-		VAR *= 10;					\
-		VAR += *fmt - '0';				\
-		if (VAR < 0)					\
-			goto e2big_error;			\
-		fmt++;						\
-	}							\
-} while (0)
-
-#define GRPCPY(howmany) do {					\
-	int i = howmany;					\
-	while (i-- > 0) {					\
-		avalue_size--;					\
-		*--bufend = *(avalue+avalue_size+padded);	\
-	}							\
-} while (0)
-
-#define GRPSEP do {						\
-	*--bufend = thousands_sep;				\
-	groups++;						\
-} while (0)
-
-static void __setup_vars(int, char *, char *, char *, char **);
-static int __calc_left_pad(int, char *);
-static char *__format_grouped_double(double, int *, int, int, int);
-
-static ssize_t
-vstrfmon_l(char * __restrict s, size_t maxsize, locale_t loc,
-		const char * __restrict format, va_list ap)
-{
-	char 		*dst;		/* output destination pointer */
-	const char 	*fmt;		/* current format poistion pointer */
-	struct lconv 	*lc;		/* pointer to lconv structure */
-	char		*asciivalue;	/* formatted double pointer */
-
-	int		flags;		/* formatting options */
-	int		pad_char;	/* padding character */
-	int		pad_size;	/* pad size */
-	int		width;		/* field width */
-	int		left_prec;	/* left precision */
-	int		right_prec;	/* right precision */
-	double		value;		/* just value */
-	char		space_char = ' '; /* space after currency */
-
-	char		cs_precedes,	/* values gathered from struct lconv */
-			sep_by_space,
-			sign_posn,
-			*signstr,
-			*currency_symbol;
-
-	char		*tmpptr;	/* temporary vars */
-	int		sverrno;
-	FIX_LOCALE(loc);
-
-
-	lc = localeconv_l(loc);
-	dst = s;
-	fmt = format;
-	asciivalue = NULL;
-	currency_symbol = NULL;
-	pad_size = 0;
-
-	while (*fmt) {
-		/* pass nonformating characters AS IS */
-		if (*fmt != '%')
-			goto literal;
-
-		/* '%' found ! */
-
-		/* "%%" mean just '%' */
-		if (*(fmt+1) == '%') {
-			fmt++;
-	literal:
-			PRINT(*fmt++);
-			continue;
-		}
-
-		/* set up initial values */
-		flags = (NEED_GROUPING|LOCALE_POSN);
-		pad_char = ' ';		/* padding character is "space" */
-		left_prec = -1;		/* no left precision specified */
-		right_prec = -1;	/* no right precision specified */
-		width = -1;		/* no width specified */
-		value = 0;		/* we have no value to print now */
-
-		/* Flags */
-		while (1) {
-			switch (*++fmt) {
-				case '=':	/* fill character */
-					pad_char = *++fmt;
-					if (pad_char == '\0')
-						goto format_error;
-					continue;
-				case '^':	/* not group currency  */
-					flags &= ~(NEED_GROUPING);
-					continue;
-				case '+':	/* use locale defined signs */
-					if (flags & SIGN_POSN_USED)
-						goto format_error;
-					flags |= (SIGN_POSN_USED|LOCALE_POSN);
-					continue;
-				case '(':	/* enclose negatives with () */
-					if (flags & SIGN_POSN_USED)
-						goto format_error;
-					flags |= (SIGN_POSN_USED|PARENTH_POSN);
-					continue;
-				case '!':	/* suppress currency symbol */
-					flags |= SUPRESS_CURR_SYMBOL;
-					continue;
-				case '-':	/* alignment (left)  */
-					flags |= LEFT_JUSTIFY;
-					continue;
-				default:
-					break;
-			}
-			break;
-		}
-
-		/* field Width */
-		if (isdigit((unsigned char)*fmt)) {
-			GET_NUMBER(width);
-			/* Do we have enough space to put number with
-			 * required width ?
-			 */
-			if ((unsigned int)width >= maxsize - (dst - s))
-				goto e2big_error;
-		}
-
-		/* Left precision */
-		if (*fmt == '#') {
-			if (!isdigit((unsigned char)*++fmt))
-				goto format_error;
-			GET_NUMBER(left_prec);
-			if ((unsigned int)left_prec >= maxsize - (dst - s))
-				goto e2big_error;
-		}
-
-		/* Right precision */
-		if (*fmt == '.') {
-			if (!isdigit((unsigned char)*++fmt))
-				goto format_error;
-			GET_NUMBER(right_prec);
-			if ((unsigned int)right_prec >= maxsize - (dst - s) -
-			    left_prec)
-				goto e2big_error;
-		}
-
-		/* Conversion Characters */
-		switch (*fmt++) {
-			case 'i':	/* use internaltion currency format */
-				flags |= USE_INTL_CURRENCY;
-				break;
-			case 'n':	/* use national currency format */
-				flags &= ~(USE_INTL_CURRENCY);
-				break;
-			default:	/* required character is missing or
-					   premature EOS */
-				goto format_error;
-		}
-
-		if (currency_symbol != NULL)
-			free(currency_symbol);
-		if (flags & USE_INTL_CURRENCY) {
-			currency_symbol = strdup(lc->int_curr_symbol);
-			if (currency_symbol != NULL)
-				space_char = *(currency_symbol+3);
-		} else
-			currency_symbol = strdup(lc->currency_symbol);
-
-		if (currency_symbol == NULL)
-			goto end_error;			/* ENOMEM. */
-
-		/* value itself */
-		value = va_arg(ap, double);
-
-		/* detect sign */
-		if (value < 0) {
-			flags |= IS_NEGATIVE;
-			value = -value;
-		}
-
-		/* fill left_prec with amount of padding chars */
-		if (left_prec >= 0) {
-			pad_size = __calc_left_pad((flags ^ IS_NEGATIVE),
-							currency_symbol) -
-				   __calc_left_pad(flags, currency_symbol);
-			if (pad_size < 0)
-				pad_size = 0;
-		}
-
-		if (asciivalue != NULL)
-			free(asciivalue);
-		asciivalue = __format_grouped_double(value, &flags,
-				left_prec, right_prec, pad_char);
-		if (asciivalue == NULL)
-			goto end_error;		/* errno already set     */
-						/* to ENOMEM by malloc() */
-
-		/* set some variables for later use */
-		__setup_vars(flags, &cs_precedes, &sep_by_space,
-				&sign_posn, &signstr);
-
-		/*
-		 * Description of some LC_MONETARY's values:
-		 *
-		 * p_cs_precedes & n_cs_precedes
-		 *
-		 * = 1 - $currency_symbol precedes the value
-		 *       for a monetary quantity with a non-negative value
-		 * = 0 - symbol succeeds the value
-		 *
-		 * p_sep_by_space & n_sep_by_space
-                 *
-		 * = 0 - no space separates $currency_symbol
-		 *       from the value for a monetary quantity with a
-		 *	 non-negative value
-		 * = 1 - space separates the symbol from the value
-		 * = 2 - space separates the symbol and the sign string,
-		 *       if adjacent.
-                 *
-		 * p_sign_posn & n_sign_posn
-                 *
-		 * = 0 - parentheses enclose the quantity and the
-		 *	 $currency_symbol
-		 * = 1 - the sign string precedes the quantity and the 
-		 *       $currency_symbol
-		 * = 2 - the sign string succeeds the quantity and the 
-		 *       $currency_symbol
-		 * = 3 - the sign string precedes the $currency_symbol
-		 * = 4 - the sign string succeeds the $currency_symbol
-                 *
-		 */
-
-		tmpptr = dst;
-
-		while (pad_size-- > 0)
-			PRINT(' ');
-
-		if (sign_posn == 0 && (flags & IS_NEGATIVE))
-			PRINT('(');
-
-		if (cs_precedes == 1) {
-			if (sign_posn == 1 || sign_posn == 3) {
-				PRINTS(signstr);
-				if (sep_by_space == 2)		/* XXX: ? */
-					PRINT(' ');
-			}
-
-			if (!(flags & SUPRESS_CURR_SYMBOL)) {
-				PRINTS(currency_symbol);
-
-				if (sign_posn == 4) {
-					if (sep_by_space == 2)
-						PRINT(space_char);
-					PRINTS(signstr);
-					if (sep_by_space == 1)
-						PRINT(' ');
-				} else if (sep_by_space == 1)
-					PRINT(space_char);
-			}
-		} else if (sign_posn == 1)
-			PRINTS(signstr);
-
-		PRINTS(asciivalue);
-
-		if (cs_precedes == 0) {
-			if (sign_posn == 3) {
-				if (sep_by_space == 1)
-					PRINT(' ');
-				PRINTS(signstr);
-			}
-
-			if (!(flags & SUPRESS_CURR_SYMBOL)) {
-				if ((sign_posn == 3 && sep_by_space == 2)
-				    || (sep_by_space == 1
-				    && (sign_posn == 0
-				    || sign_posn == 1
-				    || sign_posn == 2
-				    || sign_posn == 4)))
-					PRINT(space_char);
-				PRINTS(currency_symbol); /* XXX: len */
-				if (sign_posn == 4) {
-					if (sep_by_space == 2)
-						PRINT(' ');
-					PRINTS(signstr);
-				}
-			}
-		}
-
-		if (sign_posn == 2) {
-			if (sep_by_space == 2)
-				PRINT(' ');
-			PRINTS(signstr);
-		}
-
-		if (sign_posn == 0 && (flags & IS_NEGATIVE))
-			PRINT(')');
-
-		if (dst - tmpptr < width) {
-			if (flags & LEFT_JUSTIFY) {
-				while (dst - tmpptr < width)
-					PRINT(' ');
-			} else {
-				pad_size = dst-tmpptr;
-				memmove(tmpptr + width-pad_size, tmpptr,
-				    pad_size);
-				memset(tmpptr, ' ', width-pad_size);
-				dst += width-pad_size;
-			}
-		}
-	}
-
-	PRINT('\0');
-	free(asciivalue);
-	free(currency_symbol);
-	return (dst - s - 1);	/* return size of put data except trailing '\0' */
-
-e2big_error:
-	errno = E2BIG;
-	goto end_error;
-
-format_error:
-	errno = EINVAL;
-
-end_error:
-	sverrno = errno;
-	if (asciivalue != NULL)
-		free(asciivalue);
-	if (currency_symbol != NULL)
-		free(currency_symbol);
-	errno = sverrno;
-	return (-1);
-}
-ssize_t
-strfmon_l(char * __restrict s, size_t maxsize, locale_t loc, const char * __restrict format,
-    ...)
-{
-	size_t ret;
-	va_list ap;
-	va_start(ap, format);
-	ret = vstrfmon_l(s, maxsize, loc, format, ap);
-	va_end(ap);
-	return ret;
-}
-
-ssize_t
-strfmon(char * __restrict s, size_t maxsize, const char * __restrict format,
-    ...)
-{
-	size_t ret;
-	va_list ap;
-	va_start(ap, format);
-	ret = vstrfmon_l(s, maxsize, __get_locale(), format, ap);
-	va_end(ap);
-	return ret;
-}
-
-
-static void
-__setup_vars(int flags, char *cs_precedes, char *sep_by_space,
-		char *sign_posn, char **signstr) {
-
-	struct lconv *lc = localeconv();
-
-	if ((flags & IS_NEGATIVE) && (flags & USE_INTL_CURRENCY)) {
-		*cs_precedes = lc->int_n_cs_precedes;
-		*sep_by_space = lc->int_n_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_n_sign_posn;
-		*signstr = (lc->negative_sign[0] == '\0') ? "-"
-		    : lc->negative_sign;
-	} else if (flags & USE_INTL_CURRENCY) {
-		*cs_precedes = lc->int_p_cs_precedes;
-		*sep_by_space = lc->int_p_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->int_p_sign_posn;
-		*signstr = lc->positive_sign;
-	} else if (flags & IS_NEGATIVE) {
-		*cs_precedes = lc->n_cs_precedes;
-		*sep_by_space = lc->n_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->n_sign_posn;
-		*signstr = (lc->negative_sign[0] == '\0') ? "-"
-		    : lc->negative_sign;
-	} else {
-		*cs_precedes = lc->p_cs_precedes;
-		*sep_by_space = lc->p_sep_by_space;
-		*sign_posn = (flags & PARENTH_POSN) ? 0 : lc->p_sign_posn;
-		*signstr = lc->positive_sign;
-	}
-
-	/* Set defult values for unspecified information. */
-	if (*cs_precedes != 0)
-		*cs_precedes = 1;
-	if (*sep_by_space == CHAR_MAX)
-		*sep_by_space = 0;
-	if (*sign_posn == CHAR_MAX)
-		*sign_posn = 0;
-}
-
-static int
-__calc_left_pad(int flags, char *cur_symb) {
-
-	char cs_precedes, sep_by_space, sign_posn, *signstr;
-	int left_chars = 0;
-
-	__setup_vars(flags, &cs_precedes, &sep_by_space, &sign_posn, &signstr);
-
-	if (cs_precedes != 0) {
-		left_chars += strlen(cur_symb);
-		if (sep_by_space != 0)
-			left_chars++;
-	}
-
-	switch (sign_posn) {
-		case 1:
-			left_chars += strlen(signstr);
-			break;
-		case 3:
-		case 4:
-			if (cs_precedes != 0)
-				left_chars += strlen(signstr);
-	}
-	return (left_chars);
-}
-
-static int
-get_groups(int size, char *grouping) {
-
-	int	chars = 0;
-
-	if (*grouping == CHAR_MAX || *grouping <= 0)	/* no grouping ? */
-		return (0);
-
-	while (size > (int)*grouping) {
-		chars++;
-		size -= (int)*grouping++;
-		/* no more grouping ? */
-		if (*grouping == CHAR_MAX)
-			break;
-		/* rest grouping with same value ? */
-		if (*grouping == 0) {
-			chars += (size - 1) / *(grouping - 1);
-			break;
-		}
-	}
-	return (chars);
-}
-
-/* convert double to ASCII */
-static char *
-__format_grouped_double(double value, int *flags,
-			int left_prec, int right_prec, int pad_char) {
-
-	char		*rslt;
-	char		*avalue;
-	int		avalue_size;
-
-	size_t		bufsize;
-	char		*bufend;
-
-	int		padded;
-
-	struct lconv	*lc = localeconv();
-	char		*grouping;
-	char		decimal_point;
-	char		thousands_sep;
-
-	int groups = 0;
-
-	grouping = lc->mon_grouping;
-	decimal_point = *lc->mon_decimal_point;
-	if (decimal_point == '\0')
-		decimal_point = *lc->decimal_point;
-	thousands_sep = *lc->mon_thousands_sep;
-	if (thousands_sep == '\0')
-		thousands_sep = *lc->thousands_sep;
-
-	/* fill left_prec with default value */
-	if (left_prec == -1)
-		left_prec = 0;
-
-	/* fill right_prec with default value */
-	if (right_prec == -1) {
-                if (*flags & USE_INTL_CURRENCY)
-                        right_prec = lc->int_frac_digits;
-                else
-                        right_prec = lc->frac_digits;
-
-		if (right_prec == CHAR_MAX)	/* POSIX locale ? */
-			right_prec = 2;
-	}
-
-	if (*flags & NEED_GROUPING)
-		left_prec += get_groups(left_prec, grouping);
-
-	/* convert to string */
-	avalue_size = asprintf(&avalue, "%*.*f", left_prec + right_prec + 1,
-	    right_prec, value);
-	if (avalue_size < 0)
-		return (NULL);
-
-	/* make sure that we've enough space for result string */
-	bufsize = avalue_size * 2 + 1;
-	rslt = calloc(1, bufsize);
-	if (rslt == NULL) {
-		free(avalue);
-		return (NULL);
-	}
-	bufend = rslt + bufsize - 1;	/* reserve space for trailing '\0' */
-
-	/* skip spaces at beggining */
-	padded = 0;
-	while (avalue[padded] == ' ') {
-		padded++;
-		avalue_size--;
-	}
-
-	if (right_prec > 0) {
-		bufend -= right_prec;
-		memcpy(bufend, avalue + avalue_size+padded-right_prec,
-		    right_prec);
-		*--bufend = decimal_point;
-		avalue_size -= (right_prec + 1);
-	}
-
-	if ((*flags & NEED_GROUPING) &&
-	    thousands_sep != '\0' &&	/* XXX: need investigation */
-	    *grouping != CHAR_MAX &&
-	    *grouping > 0) {
-		while (avalue_size > (int)*grouping) {
-			GRPCPY(*grouping);
-			GRPSEP;
-			grouping++;
-
-			/* no more grouping ? */
-			if (*grouping == CHAR_MAX)
-				break;
-
-			/* rest grouping with same value ? */
-			if (*grouping == 0) {
-				grouping--;
-				while (avalue_size > *grouping) {
-					GRPCPY(*grouping);
-					GRPSEP;
-				}
-			}
-		}
-		if (avalue_size != 0)
-			GRPCPY(avalue_size);
-		padded -= groups;
-
-	} else {
-		bufend -= avalue_size;
-		memcpy(bufend, avalue+padded, avalue_size);
-		if (right_prec == 0)
-			padded--;	/* decrease assumed $decimal_point */
-	}
-
-	/* do padding with pad_char */
-	if (padded > 0) {
-		bufend -= padded;
-		memset(bufend, pad_char, padded);
-	}
-
-	bufsize = bufsize - (bufend - rslt) + 1;
-	memmove(rslt, bufend, bufsize);
-	free(avalue);
-	return (rslt);
-}
diff --git a/lib/libc_bsd/stdlib/strtod.3 b/lib/libc_bsd/stdlib/strtod.3
deleted file mode 100644
index 9951d4c..0000000
--- a/lib/libc_bsd/stdlib/strtod.3
+++ /dev/null
@@ -1,198 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strtod.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/strtod.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd May 11, 2010
-.Dt STRTOD 3
-.Os
-.Sh NAME
-.Nm strtod , strtof , strtold
-.Nd convert
-.Tn ASCII
-string to floating point
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft double
-.Fn strtod "const char * restrict nptr" "char ** restrict endptr"
-.Ft float
-.Fn strtof "const char * restrict nptr" "char ** restrict endptr"
-.Ft "long double"
-.Fn strtold "const char * restrict nptr" "char ** restrict endptr"
-.Sh DESCRIPTION
-These conversion
-functions convert the initial portion of the string
-pointed to by
-.Fa nptr
-to
-.Vt double ,
-.Vt float ,
-and
-.Vt "long double"
-representation, respectively.
-.Pp
-The expected form of the string is an optional plus (``+'') or minus
-sign (``\-'') followed by either:
-.Bl -bullet
-.It
-a decimal significand consisting of a sequence of decimal digits
-optionally containing a decimal-point character, or
-.It
-a hexadecimal significand consisting of a ``0X'' or ``0x'' followed
-by a sequence of hexadecimal digits optionally containing a
-decimal-point character.
-.El
-.Pp
-In both cases, the significand may be optionally followed by an
-exponent.
-An exponent consists of an ``E'' or ``e'' (for decimal
-constants) or a ``P'' or ``p'' (for hexadecimal constants),
-followed by an optional plus or minus sign, followed by a
-sequence of decimal digits.
-For decimal constants, the exponent indicates the power of 10 by
-which the significand should be scaled.
-For hexadecimal constants, the scaling is instead done by powers
-of 2.
-.Pp
-Alternatively, if the portion of the string following the optional
-plus or minus sign begins with
-.Dq INFINITY
-or
-.Dq NAN ,
-ignoring case, it is interpreted as an infinity or a quiet \*(Na,
-respectively.
-The syntax
-.Dq Xo Pf NAN( Ar "s" ) Xc ,
-where
-.Ar s
-is an alphanumeric string, produces the same value as the call
-.Fo nan
-.Qq Ar s Ns
-.Fc
-(respectively,
-.Fo nanf
-.Qq Ar s Ns
-.Fc
-and
-.Fo nanl
-.Qq Ar s Ns
-.Fc . )
-.Pp
-In any of the above cases, leading white-space characters in the
-string (as defined by the
-.Xr isspace 3
-function) are skipped.
-The decimal point
-character is defined in the program's locale (category
-.Dv LC_NUMERIC ) .
-.Sh RETURN VALUES
-The
-.Fn strtod ,
-.Fn strtof ,
-and
-.Fn strtold
-functions return the converted value, if any.
-.Pp
-If
-.Fa endptr
-is not
-.Dv NULL ,
-a pointer to the character after the last character used
-in the conversion is stored in the location referenced by
-.Fa endptr .
-.Pp
-If no conversion is performed, zero is returned and the value of
-.Fa nptr
-is stored in the location referenced by
-.Fa endptr .
-.Pp
-If the correct value would cause overflow, plus or minus
-.Dv HUGE_VAL ,
-.Dv HUGE_VALF ,
-or
-.Dv HUGE_VALL
-is returned (according to the sign and type of the return value), and
-.Er ERANGE
-is stored in
-.Va errno .
-If the correct value would cause underflow, zero is
-returned and
-.Er ERANGE
-is stored in
-.Va errno .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ERANGE
-Overflow or underflow occurred.
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr nan 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3 ,
-.Xr wcstod 3
-.Sh STANDARDS
-The
-.Fn strtod
-function
-conforms to
-.St -isoC-99 .
-.Sh AUTHORS
-The author of this software is
-.An David M. Gay .
-.Bd -literal
-Copyright (c) 1998 by Lucent Technologies
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appear in all
-copies and that both that the copyright notice and this
-permission notice and warranty disclaimer appear in supporting
-documentation, and that the name of Lucent or any of its entities
-not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
-IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
-IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-.Ed
diff --git a/lib/libc_bsd/stdlib/strtoimax.c b/lib/libc_bsd/stdlib/strtoimax.c
deleted file mode 100644
index a15d119..0000000
--- a/lib/libc_bsd/stdlib/strtoimax.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "from @(#)strtol.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strtoimax.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a string to an intmax_t integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-intmax_t
-strtoimax_l(const char * __restrict nptr, char ** __restrict endptr, int base,
-		locale_t locale)
-{
-	const char *s;
-	uintmax_t acc;
-	char c;
-	uintmax_t cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace_l((unsigned char)c, locale));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	/*
-	 * Compute the cutoff value between legal numbers and illegal
-	 * numbers.  That is the largest legal value, divided by the
-	 * base.  An input number that is greater than this value, if
-	 * followed by a legal input character, is too big.  One that
-	 * is equal to this value may be valid or not; the limit
-	 * between valid and invalid numbers is then based on the last
-	 * digit.  For instance, if the range for intmax_t is
-	 * [-9223372036854775808..9223372036854775807] and the input base
-	 * is 10, cutoff will be set to 922337203685477580 and cutlim to
-	 * either 7 (neg==0) or 8 (neg==1), meaning that if we have
-	 * accumulated a value > 922337203685477580, or equal but the
-	 * next digit is > 7 (or 8), the number is too big, and we will
-	 * return a range error.
-	 *
-	 * Set 'any' if any `digits' consumed; make it negative to indicate
-	 * overflow.
-	 */
-	cutoff = neg ? (uintmax_t)-(INTMAX_MIN + INTMAX_MAX) + INTMAX_MAX
-	    : INTMAX_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? INTMAX_MIN : INTMAX_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
-intmax_t
-strtoimax(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	return strtoimax_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/stdlib/strtol.3 b/lib/libc_bsd/stdlib/strtol.3
deleted file mode 100644
index cceb0f0..0000000
--- a/lib/libc_bsd/stdlib/strtol.3
+++ /dev/null
@@ -1,222 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strtol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/strtol.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd November 28, 2001
-.Dt STRTOL 3
-.Os
-.Sh NAME
-.Nm strtol , strtoll , strtoimax , strtoq
-.Nd "convert a string value to a"
-.Vt long , "long long" , intmax_t
-or
-.Vt quad_t
-integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.In limits.h
-.Ft long
-.Fn strtol "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Ft long long
-.Fn strtoll "const char * restrict nptr" "char ** restrict endptr" "int base"
-.In inttypes.h
-.Ft intmax_t
-.Fn strtoimax "const char * restrict nptr" "char ** restrict endptr" "int base"
-.In sys/types.h
-.In stdlib.h
-.In limits.h
-.Ft quad_t
-.Fn strtoq "const char *nptr" "char **endptr" "int base"
-.Sh DESCRIPTION
-The
-.Fn strtol
-function
-converts the string in
-.Fa nptr
-to a
-.Vt long
-value.
-The
-.Fn strtoll
-function
-converts the string in
-.Fa nptr
-to a
-.Vt "long long"
-value.
-The
-.Fn strtoimax
-function
-converts the string in
-.Fa nptr
-to an
-.Vt intmax_t
-value.
-The
-.Fn strtoq
-function
-converts the string in
-.Fa nptr
-to a
-.Vt quad_t
-value.
-The conversion is done according to the given
-.Fa base ,
-which must be between 2 and 36 inclusive,
-or be the special value 0.
-.Pp
-The string may begin with an arbitrary amount of white space
-(as determined by
-.Xr isspace 3 )
-followed by a single optional
-.Ql +
-or
-.Ql -
-sign.
-If
-.Fa base
-is zero or 16,
-the string may then include a
-.Dq Li 0x
-prefix,
-and the number will be read in base 16; otherwise, a zero
-.Fa base
-is taken as 10 (decimal) unless the next character is
-.Ql 0 ,
-in which case it is taken as 8 (octal).
-.Pp
-The remainder of the string is converted to a
-.Vt long , "long long" , intmax_t
-or
-.Vt quad_t
-value in the obvious manner,
-stopping at the first character which is not a valid digit
-in the given base.
-(In bases above 10, the letter
-.Ql A
-in either upper or lower case
-represents 10,
-.Ql B
-represents 11, and so forth, with
-.Ql Z
-representing 35.)
-.Pp
-If
-.Fa endptr
-is not
-.Dv NULL ,
-.Fn strtol
-stores the address of the first invalid character in
-.Fa *endptr .
-If there were no digits at all, however,
-.Fn strtol
-stores the original value of
-.Fa nptr
-in
-.Fa *endptr .
-(Thus, if
-.Fa *nptr
-is not
-.Ql \e0
-but
-.Fa **endptr
-is
-.Ql \e0
-on return, the entire string was valid.)
-.Sh RETURN VALUES
-The
-.Fn strtol ,
-.Fn strtoll ,
-.Fn strtoimax
-and
-.Fn strtoq
-functions
-return the result of the conversion,
-unless the value would underflow or overflow.
-If no conversion could be performed, 0 is returned and
-the global variable
-.Va errno
-is set to
-.Er EINVAL
-(the last feature is not portable across all platforms).
-If an overflow or underflow occurs,
-.Va errno
-is set to
-.Er ERANGE
-and the function return value is clamped according
-to the following table.
-.Bl -column -offset indent ".Fn strtoimax" ".Sy underflow" ".Sy overflow"
-.It Sy Function Ta Sy underflow Ta Sy overflow
-.It Fn strtol Ta Dv LONG_MIN Ta Dv LONG_MAX
-.It Fn strtoll Ta Dv LLONG_MIN Ta Dv LLONG_MAX
-.It Fn strtoimax Ta Dv INTMAX_MIN Ta Dv INTMAX_MAX
-.It Fn strtoq Ta Dv LLONG_MIN Ta Dv LLONG_MAX
-.El
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of
-.Fa base
-is not supported or
-no conversion could be performed
-(the last feature is not portable across all platforms).
-.It Bq Er ERANGE
-The given string was out of range; the value converted has been clamped.
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr strtod 3 ,
-.Xr strtonum 3 ,
-.Xr strtoul 3 ,
-.Xr wcstol 3
-.Sh STANDARDS
-The
-.Fn strtol
-function
-conforms to
-.St -isoC .
-The
-.Fn strtoll
-and
-.Fn strtoimax
-functions
-conform to
-.St -isoC-99 .
-The
-.Bx
-.Fn strtoq
-function is deprecated.
diff --git a/lib/libc_bsd/stdlib/strtol.c b/lib/libc_bsd/stdlib/strtol.c
deleted file mode 100644
index c3f50e1..0000000
--- a/lib/libc_bsd/stdlib/strtol.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strtol.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <limits.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include "xlocale_private.h"
-
-
-/*
- * Convert a string to a long integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-long
-strtol_l(const char * __restrict nptr, char ** __restrict endptr, int base,
-		locale_t locale)
-{
-	const char *s;
-	unsigned long acc;
-	char c;
-	unsigned long cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace_l((unsigned char)c, locale));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	/*
-	 * Compute the cutoff value between legal numbers and illegal
-	 * numbers.  That is the largest legal value, divided by the
-	 * base.  An input number that is greater than this value, if
-	 * followed by a legal input character, is too big.  One that
-	 * is equal to this value may be valid or not; the limit
-	 * between valid and invalid numbers is then based on the last
-	 * digit.  For instance, if the range for longs is
-	 * [-2147483648..2147483647] and the input base is 10,
-	 * cutoff will be set to 214748364 and cutlim to either
-	 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
-	 * a value > 214748364, or equal but the next digit is > 7 (or 8),
-	 * the number is too big, and we will return a range error.
-	 *
-	 * Set 'any' if any `digits' consumed; make it negative to indicate
-	 * overflow.
-	 */
-	cutoff = neg ? (unsigned long)-(LONG_MIN + LONG_MAX) + LONG_MAX
-	    : LONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LONG_MIN : LONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
-long
-strtol(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	return strtol_l(nptr, endptr, base, __get_locale());
-}
-long double
-strtold(const char * __restrict nptr, char ** __restrict endptr)
-{
-	return strtold_l(nptr, endptr, __get_locale());
-}
diff --git a/lib/libc_bsd/stdlib/strtoll.c b/lib/libc_bsd/stdlib/strtoll.c
deleted file mode 100644
index 2473871..0000000
--- a/lib/libc_bsd/stdlib/strtoll.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strtoll.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <limits.h>
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a string to a long long integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-long long
-strtoll_l(const char * __restrict nptr, char ** __restrict endptr, int base,
-		locale_t locale)
-{
-	const char *s;
-	unsigned long long acc;
-	char c;
-	unsigned long long cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace_l((unsigned char)c, locale));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	/*
-	 * Compute the cutoff value between legal numbers and illegal
-	 * numbers.  That is the largest legal value, divided by the
-	 * base.  An input number that is greater than this value, if
-	 * followed by a legal input character, is too big.  One that
-	 * is equal to this value may be valid or not; the limit
-	 * between valid and invalid numbers is then based on the last
-	 * digit.  For instance, if the range for quads is
-	 * [-9223372036854775808..9223372036854775807] and the input base
-	 * is 10, cutoff will be set to 922337203685477580 and cutlim to
-	 * either 7 (neg==0) or 8 (neg==1), meaning that if we have
-	 * accumulated a value > 922337203685477580, or equal but the
-	 * next digit is > 7 (or 8), the number is too big, and we will
-	 * return a range error.
-	 *
-	 * Set 'any' if any `digits' consumed; make it negative to indicate
-	 * overflow.
-	 */
-	cutoff = neg ? (unsigned long long)-(LLONG_MIN + LLONG_MAX) + LLONG_MAX
-	    : LLONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LLONG_MIN : LLONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
-long long
-strtoll(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	return strtoll_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/stdlib/strtonum.3 b/lib/libc_bsd/stdlib/strtonum.3
deleted file mode 100644
index 2168cf7..0000000
--- a/lib/libc_bsd/stdlib/strtonum.3
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" Copyright (c) 2004 Ted Unangst
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" $OpenBSD: strtonum.3,v 1.13 2006/04/25 05:15:42 tedu Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/strtonum.3 254483 2013-08-18 10:33:46Z pjd $
-.\"
-.Dd April 29, 2004
-.Dt STRTONUM 3
-.Os
-.Sh NAME
-.Nm strtonum
-.Nd "reliably convert string value to an integer"
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft long long
-.Fo strtonum
-.Fa "const char *nptr"
-.Fa "long long minval"
-.Fa "long long maxval"
-.Fa "const char **errstr"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn strtonum
-function converts the string in
-.Fa nptr
-to a
-.Vt "long long"
-value.
-The
-.Fn strtonum
-function was designed to facilitate safe, robust programming
-and overcome the shortcomings of the
-.Xr atoi 3
-and
-.Xr strtol 3
-family of interfaces.
-.Pp
-The string may begin with an arbitrary amount of whitespace
-(as determined by
-.Xr isspace 3 )
-followed by a single optional
-.Ql +
-or
-.Ql -
-sign.
-.Pp
-The remainder of the string is converted to a
-.Vt "long long"
-value according to base 10.
-.Pp
-The value obtained is then checked against the provided
-.Fa minval
-and
-.Fa maxval
-bounds.
-If
-.Fa errstr
-is non-null,
-.Fn strtonum
-stores an error string in
-.Fa *errstr
-indicating the failure.
-.Sh RETURN VALUES
-The
-.Fn strtonum
-function returns the result of the conversion,
-unless the value would exceed the provided bounds or is invalid.
-On error, 0 is returned,
-.Va errno
-is set, and
-.Fa errstr
-will point to an error message.
-On success,
-.Fa *errstr
-will be set to
-.Dv NULL ;
-this fact can be used to differentiate
-a successful return of 0 from an error.
-.Sh EXAMPLES
-Using
-.Fn strtonum
-correctly is meant to be simpler than the alternative functions.
-.Bd -literal -offset indent
-int iterations;
-const char *errstr;
-
-iterations = strtonum(optarg, 1, 64, &errstr);
-if (errstr != NULL)
-	errx(1, "number of iterations is %s: %s", errstr, optarg);
-.Ed
-.Pp
-The above example will guarantee that the value of iterations is between
-1 and 64 (inclusive).
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ERANGE
-The given string was out of range.
-.It Bq Er EINVAL
-The given string did not consist solely of digit characters.
-.It Bq Er EINVAL
-The supplied
-.Fa minval
-was larger than
-.Fa maxval .
-.El
-.Pp
-If an error occurs,
-.Fa errstr
-will be set to one of the following strings:
-.Pp
-.Bl -tag -width ".Li too large" -compact
-.It Li "too large"
-The result was larger than the provided maximum value.
-.It Li "too small"
-The result was smaller than the provided minimum value.
-.It Li invalid
-The string did not consist solely of digit characters.
-.El
-.Sh SEE ALSO
-.Xr atof 3 ,
-.Xr atoi 3 ,
-.Xr atol 3 ,
-.Xr atoll 3 ,
-.Xr sscanf 3 ,
-.Xr strtod 3 ,
-.Xr strtol 3 ,
-.Xr strtoul 3
-.Sh STANDARDS
-The
-.Fn strtonum
-function is a
-.Bx
-extension.
-The existing alternatives, such as
-.Xr atoi 3
-and
-.Xr strtol 3 ,
-are either impossible or difficult to use safely.
-.Sh HISTORY
-The
-.Fn strtonum
-function first appeared in
-.Ox 3.6 .
diff --git a/lib/libc_bsd/stdlib/strtonum.c b/lib/libc_bsd/stdlib/strtonum.c
deleted file mode 100644
index 31a0cb9..0000000
--- a/lib/libc_bsd/stdlib/strtonum.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * Copyright (c) 2004 Ted Unangst and Todd Miller
- * All rights reserved.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- *	$OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strtonum.c 270033 2014-08-16 01:03:51Z pfg $");
-
-#include <errno.h>
-#include <limits.h>
-#include <stdlib.h>
-
-#define	INVALID		1
-#define	TOOSMALL	2
-#define	TOOLARGE	3
-
-long long
-strtonum(const char *numstr, long long minval, long long maxval,
-    const char **errstrp)
-{
-	long long ll = 0;
-	int error = 0;
-	char *ep;
-	struct errval {
-		const char *errstr;
-		int err;
-	} ev[4] = {
-		{ NULL,		0 },
-		{ "invalid",	EINVAL },
-		{ "too small",	ERANGE },
-		{ "too large",	ERANGE },
-	};
-
-	ev[0].err = errno;
-	errno = 0;
-	if (minval > maxval) {
-		error = INVALID;
-	} else {
-		ll = strtoll(numstr, &ep, 10);
-		if (errno == EINVAL || numstr == ep || *ep != '\0')
-			error = INVALID;
-		else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval)
-			error = TOOSMALL;
-		else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval)
-			error = TOOLARGE;
-	}
-	if (errstrp != NULL)
-		*errstrp = ev[error].errstr;
-	errno = ev[error].err;
-	if (error)
-		ll = 0;
-
-	return (ll);
-}
diff --git a/lib/libc_bsd/stdlib/strtoq.c b/lib/libc_bsd/stdlib/strtoq.c
deleted file mode 100644
index 7b263e2..0000000
--- a/lib/libc_bsd/stdlib/strtoq.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1992, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strtoq.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-
-/*
- * Convert a string to a quad integer.
- */
-quad_t
-strtoq(const char *nptr, char **endptr, int base)
-{
-
-	return strtoll(nptr, endptr, base);
-}
diff --git a/lib/libc_bsd/stdlib/strtoul.3 b/lib/libc_bsd/stdlib/strtoul.3
deleted file mode 100644
index 2524d6b..0000000
--- a/lib/libc_bsd/stdlib/strtoul.3
+++ /dev/null
@@ -1,224 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strtoul.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/strtoul.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd November 28, 2001
-.Dt STRTOUL 3
-.Os
-.Sh NAME
-.Nm strtoul , strtoull , strtoumax , strtouq
-.Nd "convert a string to an"
-.Vt "unsigned long" , "unsigned long long" , uintmax_t ,
-or
-.Vt u_quad_t
-integer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.In limits.h
-.Ft "unsigned long"
-.Fn strtoul "const char * restrict nptr" "char ** restrict endptr" "int base"
-.Ft "unsigned long long"
-.Fn strtoull "const char * restrict nptr" "char ** restrict endptr" "int base"
-.In inttypes.h
-.Ft uintmax_t
-.Fn strtoumax "const char * restrict nptr" "char ** restrict endptr" "int base"
-.In sys/types.h
-.In stdlib.h
-.In limits.h
-.Ft u_quad_t
-.Fn strtouq "const char *nptr" "char **endptr" "int base"
-.Sh DESCRIPTION
-The
-.Fn strtoul
-function
-converts the string in
-.Fa nptr
-to an
-.Vt "unsigned long"
-value.
-The
-.Fn strtoull
-function
-converts the string in
-.Fa nptr
-to an
-.Vt "unsigned long long"
-value.
-The
-.Fn strtoumax
-function
-converts the string in
-.Fa nptr
-to an
-.Vt uintmax_t
-value.
-The
-.Fn strtouq
-function
-converts the string in
-.Fa nptr
-to a
-.Vt u_quad_t
-value.
-The conversion is done according to the given
-.Fa base ,
-which must be between 2 and 36 inclusive,
-or be the special value 0.
-.Pp
-The string may begin with an arbitrary amount of white space
-(as determined by
-.Xr isspace 3 )
-followed by a single optional
-.Ql +
-or
-.Ql -
-sign.
-If
-.Fa base
-is zero or 16,
-the string may then include a
-.Dq Li 0x
-prefix,
-and the number will be read in base 16; otherwise, a zero
-.Fa base
-is taken as 10 (decimal) unless the next character is
-.Ql 0 ,
-in which case it is taken as 8 (octal).
-.Pp
-The remainder of the string is converted to an
-.Vt "unsigned long"
-value in the obvious manner,
-stopping at the end of the string
-or at the first character that does not produce a valid digit
-in the given base.
-(In bases above 10, the letter
-.Ql A
-in either upper or lower case
-represents 10,
-.Ql B
-represents 11, and so forth, with
-.Ql Z
-representing 35.)
-.Pp
-If
-.Fa endptr
-is not
-.Dv NULL ,
-.Fn strtoul
-stores the address of the first invalid character in
-.Fa *endptr .
-If there were no digits at all, however,
-.Fn strtoul
-stores the original value of
-.Fa nptr
-in
-.Fa *endptr .
-(Thus, if
-.Fa *nptr
-is not
-.Ql \e0
-but
-.Fa **endptr
-is
-.Ql \e0
-on return, the entire string was valid.)
-.Sh RETURN VALUES
-The
-.Fn strtoul ,
-.Fn strtoull ,
-.Fn strtoumax
-and
-.Fn strtouq
-functions
-return either the result of the conversion
-or, if there was a leading minus sign,
-the negation of the result of the conversion,
-unless the original (non-negated) value would overflow;
-in the latter case,
-.Fn strtoul
-returns
-.Dv ULONG_MAX ,
-.Fn strtoull
-returns
-.Dv ULLONG_MAX ,
-.Fn strtoumax
-returns
-.Dv UINTMAX_MAX ,
-and
-.Fn strtouq
-returns
-.Dv ULLONG_MAX .
-In all cases,
-.Va errno
-is set to
-.Er ERANGE .
-If no conversion could be performed, 0 is returned and
-the global variable
-.Va errno
-is set to
-.Er EINVAL
-(the last feature is not portable across all platforms).
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of
-.Fa base
-is not supported or
-no conversion could be performed
-(the last feature is not portable across all platforms).
-.It Bq Er ERANGE
-The given string was out of range; the value converted has been clamped.
-.El
-.Sh SEE ALSO
-.Xr strtol 3 ,
-.Xr strtonum 3 ,
-.Xr wcstoul 3
-.Sh STANDARDS
-The
-.Fn strtoul
-function
-conforms to
-.St -isoC .
-The
-.Fn strtoull
-and
-.Fn strtoumax
-functions
-conform to
-.St -isoC-99 .
-The
-.Bx
-.Fn strtouq
-function is deprecated.
diff --git a/lib/libc_bsd/stdlib/strtoul.c b/lib/libc_bsd/stdlib/strtoul.c
deleted file mode 100644
index 290e9aa..0000000
--- a/lib/libc_bsd/stdlib/strtoul.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtoul.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strtoul.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <limits.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a string to an unsigned long integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-unsigned long
-strtoul_l(const char * __restrict nptr, char ** __restrict endptr, int base, locale_t locale)
-{
-	const char *s;
-	unsigned long acc;
-	char c;
-	unsigned long cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * See strtol for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace_l((unsigned char)c, locale));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = ULONG_MAX / base;
-	cutlim = ULONG_MAX % base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = ULONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
-unsigned long
-strtoul(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	return strtoul_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/stdlib/strtoull.c b/lib/libc_bsd/stdlib/strtoull.c
deleted file mode 100644
index dd88883..0000000
--- a/lib/libc_bsd/stdlib/strtoull.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strtoull.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <limits.h>
-#include <errno.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a string to an unsigned long long integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-unsigned long long
-strtoull_l(const char * __restrict nptr, char ** __restrict endptr, int base,
-		locale_t locale)
-{
-	const char *s;
-	unsigned long long acc;
-	char c;
-	unsigned long long cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * See strtoq for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace_l((unsigned char)c, locale));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = ULLONG_MAX / base;
-	cutlim = ULLONG_MAX % base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = ULLONG_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
-unsigned long long
-strtoull(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	return strtoull_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/stdlib/strtoumax.c b/lib/libc_bsd/stdlib/strtoumax.c
deleted file mode 100644
index ea72fcc..0000000
--- a/lib/libc_bsd/stdlib/strtoumax.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "from @(#)strtoul.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strtoumax.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include "xlocale_private.h"
-
-/*
- * Convert a string to a uintmax_t integer.
- *
- * Assumes that the upper and lower case
- * alphabets and digits are each contiguous.
- */
-uintmax_t
-strtoumax_l(const char * __restrict nptr, char ** __restrict endptr, int base,
-		locale_t locale)
-{
-	const char *s;
-	uintmax_t acc;
-	char c;
-	uintmax_t cutoff;
-	int neg, any, cutlim;
-	FIX_LOCALE(locale);
-
-	/*
-	 * See strtoimax for comments as to the logic used.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace_l((unsigned char)c, locale));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X') &&
-	    ((s[1] >= '0' && s[1] <= '9') ||
-	    (s[1] >= 'A' && s[1] <= 'F') ||
-	    (s[1] >= 'a' && s[1] <= 'f'))) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	cutoff = UINTMAX_MAX / base;
-	cutlim = UINTMAX_MAX % base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = UINTMAX_MAX;
-		errno = ERANGE;
-	} else if (!any) {
-noconv:
-		errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
-uintmax_t
-strtoumax(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	return strtoumax_l(nptr, endptr, base, __get_locale());
-}
diff --git a/lib/libc_bsd/stdlib/strtouq.c b/lib/libc_bsd/stdlib/strtouq.c
deleted file mode 100644
index 6e485b7..0000000
--- a/lib/libc_bsd/stdlib/strtouq.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1992, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtouq.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/strtouq.c 251672 2013-06-13 00:19:30Z emaste $");
-
-#include <sys/types.h>
-
-#include <stdlib.h>
-
-/*
- * Convert a string to an unsigned quad integer.
- */
-u_quad_t
-strtouq(const char *nptr, char **endptr, int base)
-{
-
-	return strtoull(nptr, endptr, base);
-}
diff --git a/lib/libc_bsd/stdlib/system.3 b/lib/libc_bsd/stdlib/system.3
deleted file mode 100644
index d92bc3e..0000000
--- a/lib/libc_bsd/stdlib/system.3
+++ /dev/null
@@ -1,99 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)system.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/system.3 251672 2013-06-13 00:19:30Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt SYSTEM 3
-.Os
-.Sh NAME
-.Nm system
-.Nd pass a command to the shell
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft int
-.Fn system "const char *string"
-.Sh DESCRIPTION
-The
-.Fn system
-function
-hands the argument
-.Fa string
-to the command interpreter
-.Xr sh 1 .
-The calling process waits for the shell
-to finish executing the command,
-ignoring
-.Dv SIGINT
-and
-.Dv SIGQUIT ,
-and blocking
-.Dv SIGCHLD .
-.Pp
-If
-.Fa string
-is a
-.Dv NULL
-pointer,
-.Fn system
-will return non-zero if the command interpreter
-.Xr sh 1
-is available, and zero if it is not.
-.Sh RETURN VALUES
-The
-.Fn system
-function
-returns the exit status of the shell as returned by
-.Xr waitpid 2 ,
-or \-1 if an error occurred when invoking
-.Xr fork 2
-or
-.Xr waitpid 2 .
-A return value of 127 means the execution of the shell
-failed.
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr execve 2 ,
-.Xr fork 2 ,
-.Xr waitpid 2 ,
-.Xr popen 3
-.Sh STANDARDS
-The
-.Fn system
-function
-conforms to
-.St -isoC
-and is expected to be
-.St -p1003.2
-compatible.
diff --git a/lib/libc_bsd/stdlib/system.c b/lib/libc_bsd/stdlib/system.c
deleted file mode 100644
index 2281390..0000000
--- a/lib/libc_bsd/stdlib/system.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)system.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/system.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-#include <unistd.h>
-#include <paths.h>
-#include <errno.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-#pragma weak system
-int
-system(const char *command)
-{
-
-	return (((int (*)(const char *))
-	    __libc_interposing[INTERPOS_system])(command));
-}
-
-int
-__libc_system(const char *command)
-{
-	pid_t pid, savedpid;
-	int pstat;
-	struct sigaction ign, intact, quitact;
-	sigset_t newsigblock, oldsigblock;
-
-	if (!command)		/* just checking... */
-		return(1);
-
-	(void)sigemptyset(&newsigblock);
-	(void)sigaddset(&newsigblock, SIGCHLD);
-	(void)sigaddset(&newsigblock, SIGINT);
-	(void)sigaddset(&newsigblock, SIGQUIT);
-	(void)__libc_sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock);
-	switch(pid = vfork()) {
-	/*
-	 * In the child, use unwrapped syscalls.  libthr is in
-	 * undefined state after vfork().
-	 */
-	case -1:			/* error */
-		(void)__libc_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-		return (-1);
-	case 0:				/* child */
-		/*
-		 * Restore original signal dispositions and exec the command.
-		 */
-		(void)__sys_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-		execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL);
-		_exit(127);
-	}
-	/* 
-	 * If we are running means that the child has either completed
-	 * its execve, or has failed.
-	 * Block SIGINT/QUIT because sh -c handles it and wait for
-	 * it to clean up.
-	 */
-	memset(&ign, 0, sizeof(ign));
-	ign.sa_handler = SIG_IGN;
-	(void)sigemptyset(&ign.sa_mask);
-	(void)__libc_sigaction(SIGINT, &ign, &intact);
-	(void)__libc_sigaction(SIGQUIT, &ign, &quitact);
-	savedpid = pid;
-	do {
-		pid = _wait4(savedpid, &pstat, 0, (struct rusage *)0);
-	} while (pid == -1 && errno == EINTR);
-	(void)__libc_sigaction(SIGINT, &intact, NULL);
-	(void)__libc_sigaction(SIGQUIT,  &quitact, NULL);
-	(void)__libc_sigprocmask(SIG_SETMASK, &oldsigblock, NULL);
-	return (pid == -1 ? -1 : pstat);
-}
-
-__weak_reference(__libc_system, __system);
-__weak_reference(__libc_system, _system);
diff --git a/lib/libc_bsd/stdlib/tdelete.c b/lib/libc_bsd/stdlib/tdelete.c
deleted file mode 100644
index 986a772..0000000
--- a/lib/libc_bsd/stdlib/tdelete.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*	$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tdelete.c,v 1.6 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/tdelete.c 279010 2015-02-19 16:24:27Z pfg $");
-
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-
-/*
- * find a node with given key
- *
- * vkey:   key to be found
- * vrootp: address of the root of the tree
- * compar: function to carry out node comparisons
- */
-void *
-tdelete(const void * __restrict vkey, void ** __restrict vrootp,
-    int (*compar)(const void *, const void *))
-{
-	node_t **rootp = (node_t **)vrootp;
-	node_t *p, *q, *r;
-	int cmp;
-
-	if (rootp == NULL || (p = *rootp) == NULL)
-		return NULL;
-
-	while ((cmp = (*compar)(vkey, (*rootp)->key)) != 0) {
-		p = *rootp;
-		rootp = (cmp < 0) ?
-		    &(*rootp)->llink :		/* follow llink branch */
-		    &(*rootp)->rlink;		/* follow rlink branch */
-		if (*rootp == NULL)
-			return NULL;		/* key not found */
-	}
-	r = (*rootp)->rlink;			/* D1: */
-	if ((q = (*rootp)->llink) == NULL)	/* Left NULL? */
-		q = r;
-	else if (r != NULL) {			/* Right link is NULL? */
-		if (r->llink == NULL) {		/* D2: Find successor */
-			r->llink = q;
-			q = r;
-		} else {			/* D3: Find NULL link */
-			for (q = r->llink; q->llink != NULL; q = r->llink)
-				r = q;
-			r->llink = q->rlink;
-			q->llink = (*rootp)->llink;
-			q->rlink = (*rootp)->rlink;
-		}
-	}
-	if (p != *rootp)
-		free(*rootp);			/* D4: Free node */
-	*rootp = q;				/* link parent to new node */
-	return p;
-}
diff --git a/lib/libc_bsd/stdlib/tfind.c b/lib/libc_bsd/stdlib/tfind.c
deleted file mode 100644
index 6a00c1d..0000000
--- a/lib/libc_bsd/stdlib/tfind.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/tfind.c 108694 2003-01-05 02:43:18Z tjr $");
-
-#define _SEARCH_PRIVATE
-#include <stdlib.h>
-#include <search.h>
-
-/* find a node, or return 0 */
-void *
-tfind(vkey, vrootp, compar)
-	const void *vkey;		/* key to be found */
-	void * const *vrootp;		/* address of the tree root */
-	int (*compar)(const void *, const void *);
-{
-	node_t **rootp = (node_t **)vrootp;
-
-	if (rootp == NULL)
-		return NULL;
-
-	while (*rootp != NULL) {		/* T1: */
-		int r;
-
-		if ((r = (*compar)(vkey, (*rootp)->key)) == 0)	/* T2: */
-			return *rootp;		/* key found */
-		rootp = (r < 0) ?
-		    &(*rootp)->llink :		/* T3: follow left branch */
-		    &(*rootp)->rlink;		/* T4: follow right branch */
-	}
-	return NULL;
-}
diff --git a/lib/libc_bsd/stdlib/tsearch.3 b/lib/libc_bsd/stdlib/tsearch.3
deleted file mode 100644
index b4e5cc0..0000000
--- a/lib/libc_bsd/stdlib/tsearch.3
+++ /dev/null
@@ -1,132 +0,0 @@
-.\" $NetBSD$
-.\" Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
-.\" 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 ``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 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.
-.\"
-.\"	OpenBSD: tsearch.3,v 1.2 1998/06/21 22:13:49 millert Exp
-.\" $FreeBSD: releng/10.2/lib/libc/stdlib/tsearch.3 159879 2006-06-23 13:36:33Z keramida $
-.\"
-.Dd June 15, 1997
-.Dt TSEARCH 3
-.Os
-.Sh NAME
-.Nm tsearch , tfind , tdelete , twalk
-.Nd manipulate binary search trees
-.Sh SYNOPSIS
-.In search.h
-.Ft void *
-.Fn tdelete "const void * restrict key" "void ** restrict rootp" "int (*compar) (const void *, const void *)"
-.Ft void *
-.Fn tfind "const void *key" "void * const *rootp" "int (*compar) (const void *, const void *)"
-.Ft void *
-.Fn tsearch "const void *key" "void **rootp" "int (*compar) (const void *, const void *)"
-.Ft void
-.Fn twalk "const void *root" "void (*action) (const void *, VISIT, int)"
-.Sh DESCRIPTION
-The
-.Fn tdelete ,
-.Fn tfind ,
-.Fn tsearch ,
-and
-.Fn twalk
-functions manage binary search trees based on algorithms T and D
-from Knuth (6.2.2).
-The comparison function passed in by
-the user has the same style of return values as
-.Xr strcmp 3 .
-.Pp
-The
-.Fn tfind
-function
-searches for the datum matched by the argument
-.Fa key
-in the binary tree rooted at
-.Fa rootp ,
-returning a pointer to the datum if it is found and NULL
-if it is not.
-.Pp
-The
-.Fn tsearch
-function
-is identical to
-.Fn tfind
-except that if no match is found,
-.Fa key
-is inserted into the tree and a pointer to it is returned.
-If
-.Fa rootp
-points to a NULL value a new binary search tree is created.
-.Pp
-The
-.Fn tdelete
-function
-deletes a node from the specified binary search tree and returns
-a pointer to the parent of the node to be deleted.
-It takes the same arguments as
-.Fn tfind
-and
-.Fn tsearch .
-If the node to be deleted is the root of the binary search tree,
-.Fa rootp
-will be adjusted.
-.Pp
-The
-.Fn twalk
-function
-walks the binary search tree rooted in
-.Fa root
-and calls the function
-.Fa action
-on each node.
-The
-.Fa action
-function
-is called with three arguments: a pointer to the current node,
-a value from the enum
-.Sy "typedef enum { preorder, postorder, endorder, leaf } VISIT;"
-specifying the traversal type, and a node level (where level
-zero is the root of the tree).
-.Sh RETURN VALUES
-The
-.Fn tsearch
-function returns NULL if allocation of a new node fails (usually
-due to a lack of free memory).
-.Pp
-The
-.Fn tfind ,
-.Fn tsearch ,
-and
-.Fn tdelete
-functions
-return NULL if
-.Fa rootp
-is NULL or the datum cannot be found.
-.Pp
-The
-.Fn twalk
-function returns no value.
-.Sh SEE ALSO
-.Xr bsearch 3 ,
-.Xr hsearch 3 ,
-.Xr lsearch 3
diff --git a/lib/libc_bsd/stdlib/tsearch.c b/lib/libc_bsd/stdlib/tsearch.c
deleted file mode 100644
index 5ebe949..0000000
--- a/lib/libc_bsd/stdlib/tsearch.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*	$NetBSD: tsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: tsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/tsearch.c 268964 2014-07-21 22:47:59Z pfg $");
-
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-/* find or insert datum into search tree */
-void *
-tsearch(const void *vkey, void **vrootp,
-    int (*compar)(const void *, const void *))
-{
-	node_t *q;
-	node_t **rootp = (node_t **)vrootp;
-
-	if (rootp == NULL)
-		return NULL;
-
-	while (*rootp != NULL) {	/* Knuth's T1: */
-		int r;
-
-		if ((r = (*compar)(vkey, (*rootp)->key)) == 0)	/* T2: */
-			return *rootp;		/* we found it! */
-
-		rootp = (r < 0) ?
-		    &(*rootp)->llink :		/* T3: follow left branch */
-		    &(*rootp)->rlink;		/* T4: follow right branch */
-	}
-
-	q = malloc(sizeof(node_t));		/* T5: key not found */
-	if (q != 0) {				/* make new node */
-		*rootp = q;			/* link new node to old */
-		q->key = __DECONST(void *, vkey);/* initialize new node */
-		q->llink = q->rlink = NULL;
-	}
-	return q;
-}
diff --git a/lib/libc_bsd/stdlib/twalk.c b/lib/libc_bsd/stdlib/twalk.c
deleted file mode 100644
index 4875169..0000000
--- a/lib/libc_bsd/stdlib/twalk.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*	$NetBSD: twalk.c,v 1.4 2012/03/20 16:38:45 matt Exp $	*/
-
-/*
- * Tree search generalized from Knuth (6.2.2) Algorithm T just like
- * the AT&T man page says.
- *
- * The node_t structure is for internal use only, lint doesn't grok it.
- *
- * Written by reading the System V Interface Definition, not the code.
- *
- * Totally public domain.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: twalk.c,v 1.4 2012/03/20 16:38:45 matt Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdlib/twalk.c 268964 2014-07-21 22:47:59Z pfg $");
-
-#define _SEARCH_PRIVATE
-#include <search.h>
-#include <stdlib.h>
-
-typedef void (*cmp_fn_t)(const void *, VISIT, int);
-
-/* Walk the nodes of a tree */
-static void
-trecurse(const node_t *root,	/* Root of the tree to be walked */
-	cmp_fn_t action, int level)
-{
-
-	if (root->llink == NULL && root->rlink == NULL)
-		(*action)(root, leaf, level);
-	else {
-		(*action)(root, preorder, level);
-		if (root->llink != NULL)
-			trecurse(root->llink, action, level + 1);
-		(*action)(root, postorder, level);
-		if (root->rlink != NULL)
-			trecurse(root->rlink, action, level + 1);
-		(*action)(root, endorder, level);
-	}
-}
-
-/* Walk the nodes of a tree */
-void
-twalk(const void *vroot, cmp_fn_t action) /* Root of the tree to be walked */
-{
-	if (vroot != NULL && action != NULL)
-		trecurse(vroot, action, 0);
-}
diff --git a/lib/libc_bsd/stdtime/Makefile.inc b/lib/libc_bsd/stdtime/Makefile.inc
deleted file mode 100644
index f6a5f38..0000000
--- a/lib/libc_bsd/stdtime/Makefile.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-#	Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
-Makefile.incl 248672 2013-03-24 01:35:37Z dim $
-
-.PATH:	${.CURDIR}/stdtime ${.CURDIR}/../locale \
-	${.CURDIR}/../../contrib/tzcode/stdtime
-
-SRCS+=	asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
-	time32.c
-
-SYM_MAPS+= ${.CURDIR}/stdtime/Symbol.map
-
-CFLAGS+= -I${.CURDIR}/../../contrib/tzcode/stdtime -I${.CURDIR}/stdtime
-
-CFLAGS.localtime.c= -fwrapv
-CFLAGS+= ${CFLAGS.${.IMPSRC:T}}
-
-MAN+=	ctime.3 strftime.3 strptime.3 time2posix.3
-MAN+=	tzfile.5
-
-MLINKS+=ctime.3 asctime.3 ctime.3 difftime.3 ctime.3 gmtime.3 \
-	ctime.3 localtime.3 ctime.3 mktime.3 ctime.3 timegm.3 \
-	ctime.3 ctime_r.3 ctime.3 localtime_r.3 ctime.3 gmtime_r.3 \
-	ctime.3 asctime_r.3
-MLINKS+=strftime.3 strftime_l.3
-MLINKS+=strptime.3 strptime_l.3
-MLINKS+=time2posix.3 posix2time.3
diff --git a/lib/libc_bsd/stdtime/Symbol.map b/lib/libc_bsd/stdtime/Symbol.map
deleted file mode 100644
index fdd5316..0000000
--- a/lib/libc_bsd/stdtime/Symbol.map
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/stdtime/Symbol.map 170154 2007-05-31 13:01:34Z deischen $
- */
-
-FBSD_1.0 {
-	_time32_to_time;
-	_time_to_time32;
-	_time64_to_time;
-	_time_to_time64;
-	_time_to_long;
-	_long_to_time;
-	_time_to_int;
-	_int_to_time;
-	strptime;
-	strftime;
-	tzname;
-	tzsetwall;
-	tzset;
-	localtime;
-	localtime_r;
-	gmtime;
-	gmtime_r;
-	offtime;
-	ctime;
-	ctime_r;
-	mktime;
-	timelocal;
-	timegm;
-	timeoff;
-	time2posix;
-	posix2time;
-	difftime;
-	asctime_r;
-	asctime;
-};
diff --git a/lib/libc_bsd/stdtime/strftime.3 b/lib/libc_bsd/stdtime/strftime.3
deleted file mode 100644
index 7f83018..0000000
--- a/lib/libc_bsd/stdtime/strftime.3
+++ /dev/null
@@ -1,289 +0,0 @@
-.\" Copyright (c) 1989, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)strftime.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/stdtime/strftime.3 268721 2014-07-15 22:44:10Z wblock $
-.\"
-.Dd June 25, 2012
-.Dt STRFTIME 3
-.Os
-.Sh NAME
-.Nm strftime
-.Nd format date and time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft size_t
-.Fo strftime
-.Fa "char * restrict buf"
-.Fa "size_t maxsize"
-.Fa "const char * restrict format"
-.Fa "const struct tm * restrict timeptr"
-.Fc
-.Ft size_t
-.Fn strftime_l "char *restrict buf" "size_t maxsize" "const char * restrict format" "const struct tm *restrict timeptr" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn strftime
-function formats the information from
-.Fa timeptr
-into the buffer
-.Fa buf
-according to the string pointed to by
-.Fa format .
-The function
-.Fn strftime_l
-does the same as
-.Fn strftime
-but takes an explicit locale rather than using the current locale.
-.Pp
-The
-.Fa format
-string consists of zero or more conversion specifications and
-ordinary characters.
-All ordinary characters are copied directly into the buffer.
-A conversion specification consists of a percent sign
-.Dq Ql %
-and one other character.
-.Pp
-No more than
-.Fa maxsize
-characters will be placed into the array.
-If the total number of resulting characters, including the terminating
-NUL character, is not more than
-.Fa maxsize ,
-.Fn strftime
-returns the number of characters in the array, not counting the
-terminating NUL.
-Otherwise, zero is returned and the buffer contents are indeterminate.
-.Pp
-The conversion specifications are copied to the buffer after expansion
-as follows:-
-.Bl -tag -width "xxxx"
-.It Cm \&%A
-is replaced by national representation of the full weekday name.
-.It Cm %a
-is replaced by national representation of
-the abbreviated weekday name.
-.It Cm \&%B
-is replaced by national representation of the full month name.
-.It Cm %b
-is replaced by national representation of
-the abbreviated month name.
-.It Cm \&%C
-is replaced by (year / 100) as decimal number; single
-digits are preceded by a zero.
-.It Cm %c
-is replaced by national representation of time and date.
-.It Cm \&%D
-is equivalent to
-.Dq Li %m/%d/%y .
-.It Cm %d
-is replaced by the day of the month as a decimal number (01-31).
-.It Cm %E* %O*
-POSIX locale extensions.
-The sequences
-%Ec %EC %Ex %EX %Ey %EY
-%Od %Oe %OH %OI %Om %OM
-%OS %Ou %OU %OV %Ow %OW %Oy
-are supposed to provide alternate
-representations.
-.Pp
-Additionally %OB implemented
-to represent alternative months names
-(used standalone, without day mentioned).
-.It Cm %e
-is replaced by the day of the month as a decimal number (1-31); single
-digits are preceded by a blank.
-.It Cm \&%F
-is equivalent to
-.Dq Li %Y-%m-%d .
-.It Cm \&%G
-is replaced by a year as a decimal number with century.
-This year is the one that contains the greater part of
-the week (Monday as the first day of the week).
-.It Cm %g
-is replaced by the same year as in
-.Dq Li %G ,
-but as a decimal number without century (00-99).
-.It Cm \&%H
-is replaced by the hour (24-hour clock) as a decimal number (00-23).
-.It Cm %h
-the same as
-.Cm %b .
-.It Cm \&%I
-is replaced by the hour (12-hour clock) as a decimal number (01-12).
-.It Cm %j
-is replaced by the day of the year as a decimal number (001-366).
-.It Cm %k
-is replaced by the hour (24-hour clock) as a decimal number (0-23);
-single digits are preceded by a blank.
-.It Cm %l
-is replaced by the hour (12-hour clock) as a decimal number (1-12);
-single digits are preceded by a blank.
-.It Cm \&%M
-is replaced by the minute as a decimal number (00-59).
-.It Cm %m
-is replaced by the month as a decimal number (01-12).
-.It Cm %n
-is replaced by a newline.
-.It Cm %O*
-the same as
-.Cm %E* .
-.It Cm %p
-is replaced by national representation of either
-"ante meridiem" (a.m.)
-or
-"post meridiem" (p.m.)
-as appropriate.
-.It Cm \&%R
-is equivalent to
-.Dq Li %H:%M .
-.It Cm %r
-is equivalent to
-.Dq Li %I:%M:%S %p .
-.It Cm \&%S
-is replaced by the second as a decimal number (00-60).
-.It Cm %s
-is replaced by the number of seconds since the Epoch, UTC (see
-.Xr mktime 3 ) .
-.It Cm \&%T
-is equivalent to
-.Dq Li %H:%M:%S .
-.It Cm %t
-is replaced by a tab.
-.It Cm \&%U
-is replaced by the week number of the year (Sunday as the first day of
-the week) as a decimal number (00-53).
-.It Cm %u
-is replaced by the weekday (Monday as the first day of the week)
-as a decimal number (1-7).
-.It Cm \&%V
-is replaced by the week number of the year (Monday as the first day of
-the week) as a decimal number (01-53).
-If the week containing January
-1 has four or more days in the new year, then it is week 1; otherwise
-it is the last week of the previous year, and the next week is week 1.
-.It Cm %v
-is equivalent to
-.Dq Li %e-%b-%Y .
-.It Cm \&%W
-is replaced by the week number of the year (Monday as the first day of
-the week) as a decimal number (00-53).
-.It Cm %w
-is replaced by the weekday (Sunday as the first day of the week)
-as a decimal number (0-6).
-.It Cm \&%X
-is replaced by national representation of the time.
-.It Cm %x
-is replaced by national representation of the date.
-.It Cm \&%Y
-is replaced by the year with century as a decimal number.
-.It Cm %y
-is replaced by the year without century as a decimal number (00-99).
-.It Cm \&%Z
-is replaced by the time zone name.
-.It Cm %z
-is replaced by the time zone offset from UTC; a leading plus sign stands for
-east of UTC, a minus sign for west of UTC, hours and minutes follow
-with two digits each and no delimiter between them (common form for
-RFC 822 date headers).
-.It Cm %+
-is replaced by national representation of the date and time
-(the format is similar to that produced by
-.Xr date 1 ) .
-.It Cm %-*
-GNU libc extension.
-Do not do any padding when performing numerical outputs.
-.It Cm %_*
-GNU libc extension.
-Explicitly specify space for padding.
-.It Cm %0*
-GNU libc extension.
-Explicitly specify zero for padding.
-.It Cm %%
-is replaced by
-.Ql % .
-.El
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr printf 1 ,
-.Xr ctime 3 ,
-.Xr printf 3 ,
-.Xr strptime 3 ,
-.Xr wcsftime 3
-.Sh STANDARDS
-The
-.Fn strftime
-function
-conforms to
-.St -isoC
-with a lot of extensions including
-.Ql \&%C ,
-.Ql \&%D ,
-.Ql %E* ,
-.Ql %e ,
-.Ql %G ,
-.Ql %g ,
-.Ql %h ,
-.Ql %k ,
-.Ql %l ,
-.Ql %n ,
-.Ql %O* ,
-.Ql \&%R ,
-.Ql %r ,
-.Ql %s ,
-.Ql \&%T ,
-.Ql %t ,
-.Ql %u ,
-.Ql \&%V ,
-.Ql %z ,
-.Ql %+ .
-.Pp
-The peculiar week number and year in the replacements of
-.Ql %G ,
-.Ql %g
-and
-.Ql \&%V
-are defined in ISO 8601: 1988.
-The
-.Fn strftime_l
-function conforms to
-.St -p1003.1-2008 .
-.Sh BUGS
-There is no conversion specification for the phase of the moon.
-.Pp
-The
-.Fn strftime
-function does not correctly handle multibyte characters in the
-.Fa format
-argument.
diff --git a/lib/libc_bsd/stdtime/strftime.c b/lib/libc_bsd/stdtime/strftime.c
deleted file mode 100644
index 95d62a6..0000000
--- a/lib/libc_bsd/stdtime/strftime.c
+++ /dev/null
@@ -1,660 +0,0 @@
-/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley. The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef lint
-#ifndef NOID
-static const char	elsieid[] = "@(#)strftime.3	8.3";
-/*
- * Based on the UCB version with the ID appearing below.
- * This is ANSIish only when "multibyte character == plain character".
- */
-#endif /* !defined NOID */
-#endif /* !defined lint */
-
-#include "namespace.h"
-#include "private.h"
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char	sccsid[] = "@(#)strftime.c	5.4 (Berkeley) 3/14/89";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdtime/strftime.c 269483 2014-08-03 18:31:52Z pfg $");
-
-#include "tzfile.h"
-#include <fcntl.h>
-#include <sys/stat.h>
-#include "un-namespace.h"
-#include "timelocal.h"
-
-static char *	_add(const char *, char *, const char *);
-static char *	_conv(int, const char *, char *, const char *, locale_t);
-static char *	_fmt(const char *, const struct tm *, char *, const char *,
-			int *, locale_t);
-static char *	_yconv(int, int, int, int, char *, const char *, locale_t);
-
-extern char *	tzname[];
-
-#ifndef YEAR_2000_NAME
-#define YEAR_2000_NAME	"CHECK_STRFTIME_FORMATS_FOR_TWO_DIGIT_YEARS"
-#endif /* !defined YEAR_2000_NAME */
-
-#define	IN_NONE	0
-#define	IN_SOME	1
-#define	IN_THIS	2
-#define	IN_ALL	3
-
-#define	PAD_DEFAULT	0
-#define	PAD_LESS	1
-#define	PAD_SPACE	2
-#define	PAD_ZERO	3
-
-static const char fmt_padding[][4][5] = {
-	/* DEFAULT,	LESS,	SPACE,	ZERO */
-#define	PAD_FMT_MONTHDAY	0
-#define	PAD_FMT_HMS		0
-#define	PAD_FMT_CENTURY		0
-#define	PAD_FMT_SHORTYEAR	0
-#define	PAD_FMT_MONTH		0
-#define	PAD_FMT_WEEKOFYEAR	0
-#define	PAD_FMT_DAYOFMONTH	0
-	{ "%02d",	"%d",	"%2d",	"%02d" },
-#define	PAD_FMT_SDAYOFMONTH	1
-#define	PAD_FMT_SHMS		1
-	{ "%2d",	"%d",	"%2d",	"%02d" },
-#define	PAD_FMT_DAYOFYEAR	2
-	{ "%03d",	"%d",	"%3d",	"%03d" },
-#define	PAD_FMT_YEAR		3
-	{ "%04d",	"%d",	"%4d",	"%04d" }
-};
-
-size_t
-strftime_l(char * __restrict s, size_t maxsize, const char * __restrict format,
-    const struct tm * __restrict t, locale_t loc)
-{
-	char *	p;
-	int	warn;
-	FIX_LOCALE(loc);
-
-	tzset();
-	warn = IN_NONE;
-	p = _fmt(((format == NULL) ? "%c" : format), t, s, s + maxsize, &warn, loc);
-#ifndef NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU
-	if (warn != IN_NONE && getenv(YEAR_2000_NAME) != NULL) {
-		(void) fprintf_l(stderr, loc, "\n");
-		if (format == NULL)
-			(void) fputs("NULL strftime format ", stderr);
-		else	(void) fprintf_l(stderr, loc, "strftime format \"%s\" ",
-				format);
-		(void) fputs("yields only two digits of years in ", stderr);
-		if (warn == IN_SOME)
-			(void) fputs("some locales", stderr);
-		else if (warn == IN_THIS)
-			(void) fputs("the current locale", stderr);
-		else	(void) fputs("all locales", stderr);
-		(void) fputs("\n", stderr);
-	}
-#endif /* !defined NO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU */
-	if (p == s + maxsize)
-		return (0);
-	*p = '\0';
-	return p - s;
-}
-
-size_t
-strftime(char * __restrict s, size_t maxsize, const char * __restrict format,
-    const struct tm * __restrict t)
-{
-	return strftime_l(s, maxsize, format, t, __get_locale());
-}
-
-static char *
-_fmt(format, t, pt, ptlim, warnp, loc)
-const char *		format;
-const struct tm * const	t;
-char *			pt;
-const char * const	ptlim;
-int *			warnp;
-locale_t	loc;
-{
-	int Ealternative, Oalternative, PadIndex;
-	struct lc_time_T *tptr = __get_current_time_locale(loc);
-
-	for ( ; *format; ++format) {
-		if (*format == '%') {
-			Ealternative = 0;
-			Oalternative = 0;
-			PadIndex	 = PAD_DEFAULT;
-label:
-			switch (*++format) {
-			case '\0':
-				--format;
-				break;
-			case 'A':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : tptr->weekday[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'a':
-				pt = _add((t->tm_wday < 0 ||
-					t->tm_wday >= DAYSPERWEEK) ?
-					"?" : tptr->wday[t->tm_wday],
-					pt, ptlim);
-				continue;
-			case 'B':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : (Oalternative ? tptr->alt_month :
-					tptr->month)[t->tm_mon],
-					pt, ptlim);
-				continue;
-			case 'b':
-			case 'h':
-				pt = _add((t->tm_mon < 0 ||
-					t->tm_mon >= MONSPERYEAR) ?
-					"?" : tptr->mon[t->tm_mon],
-					pt, ptlim);
-				continue;
-			case 'C':
-				/*
-				 * %C used to do a...
-				 *	_fmt("%a %b %e %X %Y", t);
-				 * ...whereas now POSIX 1003.2 calls for
-				 * something completely different.
-				 * (ado, 1993-05-24)
-				 */
-				pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 0,
-					pt, ptlim, loc);
-				continue;
-			case 'c':
-				{
-				int warn2 = IN_SOME;
-
-				pt = _fmt(tptr->c_fmt, t, pt, ptlim, &warn2, loc);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'D':
-				pt = _fmt("%m/%d/%y", t, pt, ptlim, warnp, loc);
-				continue;
-			case 'd':
-				pt = _conv(t->tm_mday,
-					fmt_padding[PAD_FMT_DAYOFMONTH][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'E':
-				if (Ealternative || Oalternative)
-					break;
-				Ealternative++;
-				goto label;
-			case 'O':
-				/*
-				 * C99 locale modifiers.
-				 * The sequences
-				 *	%Ec %EC %Ex %EX %Ey %EY
-				 *	%Od %oe %OH %OI %Om %OM
-				 *	%OS %Ou %OU %OV %Ow %OW %Oy
-				 * are supposed to provide alternate
-				 * representations.
-				 *
-				 * FreeBSD extension
-				 *      %OB
-				 */
-				if (Ealternative || Oalternative)
-					break;
-				Oalternative++;
-				goto label;
-			case 'e':
-				pt = _conv(t->tm_mday,
-					fmt_padding[PAD_FMT_SDAYOFMONTH][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'F':
-				pt = _fmt("%Y-%m-%d", t, pt, ptlim, warnp, loc);
-				continue;
-			case 'H':
-				pt = _conv(t->tm_hour, fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'I':
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'j':
-				pt = _conv(t->tm_yday + 1,
-					fmt_padding[PAD_FMT_DAYOFYEAR][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'k':
-				/*
-				 * This used to be...
-				 *	_conv(t->tm_hour % 12 ?
-				 *		t->tm_hour % 12 : 12, 2, ' ');
-				 * ...and has been changed to the below to
-				 * match SunOS 4.1.1 and Arnold Robbins'
-				 * strftime version 3.0. That is, "%k" and
-				 * "%l" have been swapped.
-				 * (ado, 1993-05-24)
-				 */
-				pt = _conv(t->tm_hour, fmt_padding[PAD_FMT_SHMS][PadIndex],
-					pt, ptlim, loc);
-				continue;
-#ifdef KITCHEN_SINK
-			case 'K':
-				/*
-				** After all this time, still unclaimed!
-				*/
-				pt = _add("kitchen sink", pt, ptlim);
-				continue;
-#endif /* defined KITCHEN_SINK */
-			case 'l':
-				/*
-				 * This used to be...
-				 *	_conv(t->tm_hour, 2, ' ');
-				 * ...and has been changed to the below to
-				 * match SunOS 4.1.1 and Arnold Robbin's
-				 * strftime version 3.0. That is, "%k" and
-				 * "%l" have been swapped.
-				 * (ado, 1993-05-24)
-				 */
-				pt = _conv((t->tm_hour % 12) ?
-					(t->tm_hour % 12) : 12,
-					fmt_padding[PAD_FMT_SHMS][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'M':
-				pt = _conv(t->tm_min, fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'm':
-				pt = _conv(t->tm_mon + 1,
-					fmt_padding[PAD_FMT_MONTH][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'n':
-				pt = _add("\n", pt, ptlim);
-				continue;
-			case 'p':
-				pt = _add((t->tm_hour >= (HOURSPERDAY / 2)) ?
-					tptr->pm : tptr->am,
-					pt, ptlim);
-				continue;
-			case 'R':
-				pt = _fmt("%H:%M", t, pt, ptlim, warnp, loc);
-				continue;
-			case 'r':
-				pt = _fmt(tptr->ampm_fmt, t, pt, ptlim,
-					warnp, loc);
-				continue;
-			case 'S':
-				pt = _conv(t->tm_sec, fmt_padding[PAD_FMT_HMS][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 's':
-				{
-					struct tm	tm;
-					char		buf[INT_STRLEN_MAXIMUM(
-								time_t) + 1];
-					time_t		mkt;
-
-					tm = *t;
-					mkt = mktime(&tm);
-					if (TYPE_SIGNED(time_t))
-						(void) sprintf_l(buf, loc, "%ld",
-							(long) mkt);
-					else	(void) sprintf_l(buf, loc, "%lu",
-							(unsigned long) mkt);
-					pt = _add(buf, pt, ptlim);
-				}
-				continue;
-			case 'T':
-				pt = _fmt("%H:%M:%S", t, pt, ptlim, warnp, loc);
-				continue;
-			case 't':
-				pt = _add("\t", pt, ptlim);
-				continue;
-			case 'U':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					t->tm_wday) / DAYSPERWEEK,
-					fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'u':
-				/*
-				 * From Arnold Robbins' strftime version 3.0:
-				 * "ISO 8601: Weekday as a decimal number
-				 * [1 (Monday) - 7]"
-				 * (ado, 1993-05-24)
-				 */
-				pt = _conv((t->tm_wday == 0) ?
-					DAYSPERWEEK : t->tm_wday,
-					"%d", pt, ptlim, loc);
-				continue;
-			case 'V':	/* ISO 8601 week number */
-			case 'G':	/* ISO 8601 year (four digits) */
-			case 'g':	/* ISO 8601 year (two digits) */
-/*
- * From Arnold Robbins' strftime version 3.0: "the week number of the
- * year (the first Monday as the first day of week 1) as a decimal number
- * (01-53)."
- * (ado, 1993-05-24)
- *
- * From "http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html" by Markus Kuhn:
- * "Week 01 of a year is per definition the first week which has the
- * Thursday in this year, which is equivalent to the week which contains
- * the fourth day of January. In other words, the first week of a new year
- * is the week which has the majority of its days in the new year. Week 01
- * might also contain days from the previous year and the week before week
- * 01 of a year is the last week (52 or 53) of the previous year even if
- * it contains days from the new year. A week starts with Monday (day 1)
- * and ends with Sunday (day 7). For example, the first week of the year
- * 1997 lasts from 1996-12-30 to 1997-01-05..."
- * (ado, 1996-01-02)
- */
-				{
-					int	year;
-					int	base;
-					int	yday;
-					int	wday;
-					int	w;
-
-					year = t->tm_year;
-					base = TM_YEAR_BASE;
-					yday = t->tm_yday;
-					wday = t->tm_wday;
-					for ( ; ; ) {
-						int	len;
-						int	bot;
-						int	top;
-
-						len = isleap_sum(year, base) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
-						/*
-						 * What yday (-3 ... 3) does
-						 * the ISO year begin on?
-						 */
-						bot = ((yday + 11 - wday) %
-							DAYSPERWEEK) - 3;
-						/*
-						 * What yday does the NEXT
-						 * ISO year begin on?
-						 */
-						top = bot -
-							(len % DAYSPERWEEK);
-						if (top < -3)
-							top += DAYSPERWEEK;
-						top += len;
-						if (yday >= top) {
-							++base;
-							w = 1;
-							break;
-						}
-						if (yday >= bot) {
-							w = 1 + ((yday - bot) /
-								DAYSPERWEEK);
-							break;
-						}
-						--base;
-						yday += isleap_sum(year, base) ?
-							DAYSPERLYEAR :
-							DAYSPERNYEAR;
-					}
-#ifdef XPG4_1994_04_09
-					if ((w == 52 &&
-						t->tm_mon == TM_JANUARY) ||
-						(w == 1 &&
-						t->tm_mon == TM_DECEMBER))
-							w = 53;
-#endif /* defined XPG4_1994_04_09 */
-					if (*format == 'V')
-						pt = _conv(w, fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex],
-							pt, ptlim, loc);
-					else if (*format == 'g') {
-						*warnp = IN_ALL;
-						pt = _yconv(year, base, 0, 1,
-							pt, ptlim, loc);
-					} else	pt = _yconv(year, base, 1, 1,
-							pt, ptlim, loc);
-				}
-				continue;
-			case 'v':
-				/*
-				 * From Arnold Robbins' strftime version 3.0:
-				 * "date as dd-bbb-YYYY"
-				 * (ado, 1993-05-24)
-				 */
-				pt = _fmt("%e-%b-%Y", t, pt, ptlim, warnp, loc);
-				continue;
-			case 'W':
-				pt = _conv((t->tm_yday + DAYSPERWEEK -
-					(t->tm_wday ?
-					(t->tm_wday - 1) :
-					(DAYSPERWEEK - 1))) / DAYSPERWEEK,
-					fmt_padding[PAD_FMT_WEEKOFYEAR][PadIndex],
-					pt, ptlim, loc);
-				continue;
-			case 'w':
-				pt = _conv(t->tm_wday, "%d", pt, ptlim, loc);
-				continue;
-			case 'X':
-				pt = _fmt(tptr->X_fmt, t, pt, ptlim, warnp, loc);
-				continue;
-			case 'x':
-				{
-				int	warn2 = IN_SOME;
-
-				pt = _fmt(tptr->x_fmt, t, pt, ptlim, &warn2, loc);
-				if (warn2 == IN_ALL)
-					warn2 = IN_THIS;
-				if (warn2 > *warnp)
-					*warnp = warn2;
-				}
-				continue;
-			case 'y':
-				*warnp = IN_ALL;
-				pt = _yconv(t->tm_year, TM_YEAR_BASE, 0, 1,
-					pt, ptlim, loc);
-				continue;
-			case 'Y':
-				pt = _yconv(t->tm_year, TM_YEAR_BASE, 1, 1,
-					pt, ptlim, loc);
-				continue;
-			case 'Z':
-#ifdef TM_ZONE
-				if (t->TM_ZONE != NULL)
-					pt = _add(t->TM_ZONE, pt, ptlim);
-				else
-#endif /* defined TM_ZONE */
-				if (t->tm_isdst >= 0)
-					pt = _add(tzname[t->tm_isdst != 0],
-						pt, ptlim);
-				/*
-				 * C99 says that %Z must be replaced by the
-				 * empty string if the time zone is not
-				 * determinable.
-				 */
-				continue;
-			case 'z':
-				{
-				int		diff;
-				char const *	sign;
-
-				if (t->tm_isdst < 0)
-					continue;
-#ifdef TM_GMTOFF
-				diff = t->TM_GMTOFF;
-#else /* !defined TM_GMTOFF */
-				/*
-				 * C99 says that the UTC offset must
-				 * be computed by looking only at
-				 * tm_isdst. This requirement is
-				 * incorrect, since it means the code
-				 * must rely on magic (in this case
-				 * altzone and timezone), and the
-				 * magic might not have the correct
-				 * offset. Doing things correctly is
-				 * tricky and requires disobeying C99;
-				 * see GNU C strftime for details.
-				 * For now, punt and conform to the
-				 * standard, even though it's incorrect.
-				 *
-				 * C99 says that %z must be replaced by the
-				 * empty string if the time zone is not
-				 * determinable, so output nothing if the
-				 * appropriate variables are not available.
-				 */
-				if (t->tm_isdst == 0)
-#ifdef USG_COMPAT
-					diff = -timezone;
-#else /* !defined USG_COMPAT */
-					continue;
-#endif /* !defined USG_COMPAT */
-				else
-#ifdef ALTZONE
-					diff = -altzone;
-#else /* !defined ALTZONE */
-					continue;
-#endif /* !defined ALTZONE */
-#endif /* !defined TM_GMTOFF */
-				if (diff < 0) {
-					sign = "-";
-					diff = -diff;
-				} else
-					sign = "+";
-				pt = _add(sign, pt, ptlim);
-				diff /= SECSPERMIN;
-				diff = (diff / MINSPERHOUR) * 100 +
-					(diff % MINSPERHOUR);
-				pt = _conv(diff,
-					fmt_padding[PAD_FMT_YEAR][PadIndex],
-					pt, ptlim, loc);
-				}
-				continue;
-			case '+':
-				pt = _fmt(tptr->date_fmt, t, pt, ptlim,
-					warnp, loc);
-				continue;
-			case '-':
-				if (PadIndex != PAD_DEFAULT)
-					break;
-				PadIndex = PAD_LESS;
-				goto label;
-			case '_':
-				if (PadIndex != PAD_DEFAULT)
-					break;
-				PadIndex = PAD_SPACE;
-				goto label;
-			case '0':
-				if (PadIndex != PAD_DEFAULT)
-					break;
-				PadIndex = PAD_ZERO;
-				goto label;
-			case '%':
-			/*
-			 * X311J/88-090 (4.12.3.5): if conversion char is
-			 * undefined, behavior is undefined. Print out the
-			 * character itself as printf(3) also does.
-			 */
-			default:
-				break;
-			}
-		}
-		if (pt == ptlim)
-			break;
-		*pt++ = *format;
-	}
-	return (pt);
-}
-
-static char *
-_conv(n, format, pt, ptlim, loc)
-const int		n;
-const char * const	format;
-char * const		pt;
-const char * const	ptlim;
-locale_t		loc;
-{
-	char	buf[INT_STRLEN_MAXIMUM(int) + 1];
-
-	(void) sprintf_l(buf, loc, format, n);
-	return _add(buf, pt, ptlim);
-}
-
-static char *
-_add(str, pt, ptlim)
-const char *		str;
-char *			pt;
-const char * const	ptlim;
-{
-	while (pt < ptlim && (*pt = *str++) != '\0')
-		++pt;
-	return (pt);
-}
-
-/*
- * POSIX and the C Standard are unclear or inconsistent about
- * what %C and %y do if the year is negative or exceeds 9999.
- * Use the convention that %C concatenated with %y yields the
- * same output as %Y, and that %Y contains at least 4 bytes,
- * with more only if necessary.
- */
-
-static char *
-_yconv(a, b, convert_top, convert_yy, pt, ptlim, loc)
-const int		a;
-const int		b;
-const int		convert_top;
-const int		convert_yy;
-char *			pt;
-const char * const	ptlim;
-locale_t		loc;
-{
-	register int	lead;
-	register int	trail;
-
-#define	DIVISOR	100
-	trail = a % DIVISOR + b % DIVISOR;
-	lead = a / DIVISOR + b / DIVISOR + trail / DIVISOR;
-	trail %= DIVISOR;
-	if (trail < 0 && lead > 0) {
-		trail += DIVISOR;
-		--lead;
-	} else if (lead < 0 && trail > 0) {
-		trail -= DIVISOR;
-		++lead;
-	}
-	if (convert_top) {
-		if (lead == 0 && trail < 0)
-			pt = _add("-0", pt, ptlim);
-		else	pt = _conv(lead, "%02d", pt, ptlim, loc);
-	}
-	if (convert_yy)
-		pt = _conv(((trail < 0) ? -trail : trail), "%02d", pt,
-		     ptlim, loc);
-	return (pt);
-}
diff --git a/lib/libc_bsd/stdtime/strptime.3 b/lib/libc_bsd/stdtime/strptime.3
deleted file mode 100644
index 31feb6b..0000000
--- a/lib/libc_bsd/stdtime/strptime.3
+++ /dev/null
@@ -1,182 +0,0 @@
-.\"
-.\" Copyright (c) 1997 Joerg Wunsch
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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: releng/10.2/lib/libc/stdtime/strptime.3 272758 2014-10-08 16:29:46Z pfg $
-.\" "
-.Dd October 2, 2014
-.Dt STRPTIME 3
-.Os
-.Sh NAME
-.Nm strptime
-.Nd parse date and time string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft char *
-.Fo strptime
-.Fa "const char * restrict buf"
-.Fa "const char * restrict format"
-.Fa "struct tm * restrict timeptr"
-.Fc
-.In time.h
-.In xlocale.h
-.Ft char *
-.Fn strptime_l "const char * restrict buf" "const char * restrict format" "struct tm * restrict timeptr" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn strptime
-function parses the string in the buffer
-.Fa buf
-according to the string pointed to by
-.Fa format ,
-and fills in the elements of the structure pointed to by
-.Fa timeptr .
-The resulting values will be relative to the local time zone.
-Thus, it can be considered the reverse operation of
-.Xr strftime 3 .
-The
-.Fn strptime_l
-function does the same as
-.Fn strptime ,
-but takes an explicit locale rather than using the current locale.
-.Pp
-The
-.Fa format
-string consists of zero or more conversion specifications and
-ordinary characters.
-All ordinary characters are matched exactly with the buffer, where
-white space in the format string will match any amount of white space
-in the buffer.
-All conversion specifications are identical to those described in
-.Xr strftime 3 .
-.Pp
-Two-digit year values, including formats
-.Fa %y
-and
-.Fa \&%D ,
-are now interpreted as beginning at 1969 per POSIX requirements.
-Years 69-00 are interpreted in the 20th century (1969-2000), years
-01-68 in the 21st century (2001-2068).
-The
-.Fa \&%U
-and
-.Fa %W
-format specifiers accept any value within the range 00 to 53.
-.Pp
-If the
-.Fa format
-string does not contain enough conversion specifications to completely
-specify the resulting
-.Vt struct tm ,
-the unspecified members of
-.Va timeptr
-are left untouched.
-For example, if
-.Fa format
-is
-.Dq Li "%H:%M:%S" ,
-only
-.Va tm_hour ,
-.Va tm_sec
-and
-.Va tm_min
-will be modified.
-If time relative to today is desired, initialize the
-.Fa timeptr
-structure with today's date before passing it to
-.Fn strptime .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn strptime
-returns the pointer to the first character in
-.Fa buf
-that has not been required to satisfy the specified conversions in
-.Fa format .
-It returns
-.Dv NULL
-if one of the conversions failed.
-.Fn strptime_l
-returns the same values as
-.Fn strptime .
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr scanf 3 ,
-.Xr strftime 3
-.Sh HISTORY
-The
-.Fn strptime
-function appeared in
-.Fx 3.0 .
-.Sh AUTHORS
-The
-.Fn strptime
-function has been contributed by Powerdog Industries.
-.Pp
-This man page was written by
-.An J\(:org Wunsch .
-.Sh BUGS
-Both the
-.Fa %e
-and
-.Fa %l
-format specifiers may incorrectly scan one too many digits
-if the intended values comprise only a single digit
-and that digit is followed immediately by another digit.
-Both specifiers accept zero-padded values,
-even though they are both defined as taking unpadded values.
-.Pp
-The
-.Fa %p
-format specifier has no effect unless it is parsed
-.Em after
-hour-related specifiers.
-Specifying
-.Fa %l
-without
-.Fa %p
-will produce undefined results.
-Note that 12AM
-(ante meridiem)
-is taken as midnight
-and 12PM
-(post meridiem)
-is taken as noon.
-.Pp
-The
-.Fa %Z
-format specifier only accepts time zone abbreviations of the local time zone,
-or the value "GMT".
-This limitation is because of ambiguity due to of the over loading of time
-zone abbreviations.
-One such example is
-.Fa EST
-which is both Eastern Standard Time and Eastern Australia Summer Time.
-.Pp
-The
-.Fn strptime
-function does not correctly handle multibyte characters in the
-.Fa format
-argument.
diff --git a/lib/libc_bsd/stdtime/strptime.c b/lib/libc_bsd/stdtime/strptime.c
deleted file mode 100644
index 054d630..0000000
--- a/lib/libc_bsd/stdtime/strptime.c
+++ /dev/null
@@ -1,689 +0,0 @@
-/*-
- * Copyright (c) 2014 Gary Mills
- * Copyright 2011, Nexenta Systems, Inc.  All rights reserved.
- * Copyright (c) 1994 Powerdog Industries.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY POWERDOG INDUSTRIES ``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 POWERDOG INDUSTRIES 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.
- *
- * The views and conclusions contained in the software and documentation
- * are those of the authors and should not be interpreted as representing
- * official policies, either expressed or implied, of Powerdog Industries.
- */
-
-#include <sys/cdefs.h>
-#ifndef lint
-#ifndef NOID
-static char copyright[] __unused =
-"@(#) Copyright (c) 1994 Powerdog Industries.  All rights reserved.";
-static char sccsid[] __unused = "@(#)strptime.c	0.1 (Powerdog) 94/03/27";
-#endif /* !defined NOID */
-#endif /* not lint */
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdtime/strptime.c 273290 2014-10-19 21:16:24Z ache $");
-
-#include "namespace.h"
-#include <time.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-#include "timelocal.h"
-#include "tzfile.h"
-
-static char * _strptime(const char *, const char *, struct tm *, int *, locale_t);
-
-#define	asizeof(a)	(sizeof(a) / sizeof((a)[0]))
-
-#define	FLAG_NONE	(1 << 0)
-#define	FLAG_YEAR	(1 << 1)
-#define	FLAG_MONTH	(1 << 2)
-#define	FLAG_YDAY	(1 << 3)
-#define	FLAG_MDAY	(1 << 4)
-#define	FLAG_WDAY	(1 << 5)
-
-/*
- * Calculate the week day of the first day of a year. Valid for
- * the Gregorian calendar, which began Sept 14, 1752 in the UK
- * and its colonies. Ref:
- * http://en.wikipedia.org/wiki/Determination_of_the_day_of_the_week
- */
-
-static int
-first_wday_of(int year)
-{
-	return (((2 * (3 - (year / 100) % 4)) + (year % 100) +
-		((year % 100) / 4) + (isleap(year) ? 6 : 0) + 1) % 7);
-}
-
-static char *
-_strptime(const char *buf, const char *fmt, struct tm *tm, int *GMTp,
-		locale_t locale)
-{
-	char	c;
-	const char *ptr;
-	int	day_offset = -1, wday_offset;
-	int week_offset;
-	int	i, len;
-	int flags;
-	int Ealternative, Oalternative;
-	const struct lc_time_T *tptr = __get_current_time_locale(locale);
-	static int start_of_month[2][13] = {
-		{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
-		{0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366}
-	};
-
-	flags = FLAG_NONE;
-
-	ptr = fmt;
-	while (*ptr != 0) {
-		c = *ptr++;
-
-		if (c != '%') {
-			if (isspace_l((unsigned char)c, locale))
-				while (*buf != 0 && 
-				       isspace_l((unsigned char)*buf, locale))
-					buf++;
-			else if (c != *buf++)
-				return (NULL);
-			continue;
-		}
-
-		Ealternative = 0;
-		Oalternative = 0;
-label:
-		c = *ptr++;
-		switch (c) {
-		case '%':
-			if (*buf++ != '%')
-				return (NULL);
-			break;
-
-		case '+':
-			buf = _strptime(buf, tptr->date_fmt, tm, GMTp, locale);
-			if (buf == NULL)
-				return (NULL);
-			flags |= FLAG_WDAY | FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
-			break;
-
-		case 'C':
-			if (!isdigit_l((unsigned char)*buf, locale))
-				return (NULL);
-
-			/* XXX This will break for 3-digit centuries. */
-			len = 2;
-			for (i = 0; len && *buf != 0 &&
-			     isdigit_l((unsigned char)*buf, locale); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i < 19)
-				return (NULL);
-
-			tm->tm_year = i * 100 - TM_YEAR_BASE;
-			flags |= FLAG_YEAR;
-
-			break;
-
-		case 'c':
-			buf = _strptime(buf, tptr->c_fmt, tm, GMTp, locale);
-			if (buf == NULL)
-				return (NULL);
-			flags |= FLAG_WDAY | FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
-			break;
-
-		case 'D':
-			buf = _strptime(buf, "%m/%d/%y", tm, GMTp, locale);
-			if (buf == NULL)
-				return (NULL);
-			flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
-			break;
-
-		case 'E':
-			if (Ealternative || Oalternative)
-				break;
-			Ealternative++;
-			goto label;
-
-		case 'O':
-			if (Ealternative || Oalternative)
-				break;
-			Oalternative++;
-			goto label;
-
-		case 'F':
-			buf = _strptime(buf, "%Y-%m-%d", tm, GMTp, locale);
-			if (buf == NULL)
-				return (NULL);
-			flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
-			break;
-
-		case 'R':
-			buf = _strptime(buf, "%H:%M", tm, GMTp, locale);
-			if (buf == NULL)
-				return (NULL);
-			break;
-
-		case 'r':
-			buf = _strptime(buf, tptr->ampm_fmt, tm, GMTp, locale);
-			if (buf == NULL)
-				return (NULL);
-			break;
-
-		case 'T':
-			buf = _strptime(buf, "%H:%M:%S", tm, GMTp, locale);
-			if (buf == NULL)
-				return (NULL);
-			break;
-
-		case 'X':
-			buf = _strptime(buf, tptr->X_fmt, tm, GMTp, locale);
-			if (buf == NULL)
-				return (NULL);
-			break;
-
-		case 'x':
-			buf = _strptime(buf, tptr->x_fmt, tm, GMTp, locale);
-			if (buf == NULL)
-				return (NULL);
-			flags |= FLAG_MONTH | FLAG_MDAY | FLAG_YEAR;
-			break;
-
-		case 'j':
-			if (!isdigit_l((unsigned char)*buf, locale))
-				return (NULL);
-
-			len = 3;
-			for (i = 0; len && *buf != 0 &&
-			     isdigit_l((unsigned char)*buf, locale); buf++){
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i < 1 || i > 366)
-				return (NULL);
-
-			tm->tm_yday = i - 1;
-			flags |= FLAG_YDAY;
-
-			break;
-
-		case 'M':
-		case 'S':
-			if (*buf == 0 ||
-				isspace_l((unsigned char)*buf, locale))
-				break;
-
-			if (!isdigit_l((unsigned char)*buf, locale))
-				return (NULL);
-
-			len = 2;
-			for (i = 0; len && *buf != 0 &&
-				isdigit_l((unsigned char)*buf, locale); buf++){
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-
-			if (c == 'M') {
-				if (i > 59)
-					return (NULL);
-				tm->tm_min = i;
-			} else {
-				if (i > 60)
-					return (NULL);
-				tm->tm_sec = i;
-			}
-
-			break;
-
-		case 'H':
-		case 'I':
-		case 'k':
-		case 'l':
-			/*
-			 * Of these, %l is the only specifier explicitly
-			 * documented as not being zero-padded.  However,
-			 * there is no harm in allowing zero-padding.
-			 *
-			 * XXX The %l specifier may gobble one too many
-			 * digits if used incorrectly.
-			 */
-			if (!isdigit_l((unsigned char)*buf, locale))
-				return (NULL);
-
-			len = 2;
-			for (i = 0; len && *buf != 0 &&
-			     isdigit_l((unsigned char)*buf, locale); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (c == 'H' || c == 'k') {
-				if (i > 23)
-					return (NULL);
-			} else if (i > 12)
-				return (NULL);
-
-			tm->tm_hour = i;
-
-			break;
-
-		case 'p':
-			/*
-			 * XXX This is bogus if parsed before hour-related
-			 * specifiers.
-			 */
-			len = strlen(tptr->am);
-			if (strncasecmp_l(buf, tptr->am, len, locale) == 0) {
-				if (tm->tm_hour > 12)
-					return (NULL);
-				if (tm->tm_hour == 12)
-					tm->tm_hour = 0;
-				buf += len;
-				break;
-			}
-
-			len = strlen(tptr->pm);
-			if (strncasecmp_l(buf, tptr->pm, len, locale) == 0) {
-				if (tm->tm_hour > 12)
-					return (NULL);
-				if (tm->tm_hour != 12)
-					tm->tm_hour += 12;
-				buf += len;
-				break;
-			}
-
-			return (NULL);
-
-		case 'A':
-		case 'a':
-			for (i = 0; i < asizeof(tptr->weekday); i++) {
-				len = strlen(tptr->weekday[i]);
-				if (strncasecmp_l(buf, tptr->weekday[i],
-						len, locale) == 0)
-					break;
-				len = strlen(tptr->wday[i]);
-				if (strncasecmp_l(buf, tptr->wday[i],
-						len, locale) == 0)
-					break;
-			}
-			if (i == asizeof(tptr->weekday))
-				return (NULL);
-
-			buf += len;
-			tm->tm_wday = i;
-			flags |= FLAG_WDAY;
-			break;
-
-		case 'U':
-		case 'W':
-			/*
-			 * XXX This is bogus, as we can not assume any valid
-			 * information present in the tm structure at this
-			 * point to calculate a real value, so just check the
-			 * range for now.
-			 */
-			if (!isdigit_l((unsigned char)*buf, locale))
-				return (NULL);
-
-			len = 2;
-			for (i = 0; len && *buf != 0 &&
-			     isdigit_l((unsigned char)*buf, locale); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i > 53)
-				return (NULL);
-
-			if (c == 'U')
-				day_offset = TM_SUNDAY;
-			else
-				day_offset = TM_MONDAY;
-
-
-			week_offset = i;
-
-			break;
-
-		case 'w':
-			if (!isdigit_l((unsigned char)*buf, locale))
-				return (NULL);
-
-			i = *buf - '0';
-			if (i > 6)
-				return (NULL);
-
-			tm->tm_wday = i;
-			flags |= FLAG_WDAY;
-
-			break;
-
-		case 'e':
-			/*
-			 * With %e format, our strftime(3) adds a blank space
-			 * before single digits.
-			 */
-			if (*buf != 0 &&
-			    isspace_l((unsigned char)*buf, locale))
-			       buf++;
-			/* FALLTHROUGH */
-		case 'd':
-			/*
-			 * The %e specifier was once explicitly documented as
-			 * not being zero-padded but was later changed to
-			 * equivalent to %d.  There is no harm in allowing
-			 * such padding.
-			 *
-			 * XXX The %e specifier may gobble one too many
-			 * digits if used incorrectly.
-			 */
-			if (!isdigit_l((unsigned char)*buf, locale))
-				return (NULL);
-
-			len = 2;
-			for (i = 0; len && *buf != 0 &&
-			     isdigit_l((unsigned char)*buf, locale); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i > 31)
-				return (NULL);
-
-			tm->tm_mday = i;
-			flags |= FLAG_MDAY;
-
-			break;
-
-		case 'B':
-		case 'b':
-		case 'h':
-			for (i = 0; i < asizeof(tptr->month); i++) {
-				if (Oalternative) {
-					if (c == 'B') {
-						len = strlen(tptr->alt_month[i]);
-						if (strncasecmp_l(buf,
-								tptr->alt_month[i],
-								len, locale) == 0)
-							break;
-					}
-				} else {
-					len = strlen(tptr->month[i]);
-					if (strncasecmp_l(buf, tptr->month[i],
-							len, locale) == 0)
-						break;
-				}
-			}
-			/*
-			 * Try the abbreviated month name if the full name
-			 * wasn't found and Oalternative was not requested.
-			 */
-			if (i == asizeof(tptr->month) && !Oalternative) {
-				for (i = 0; i < asizeof(tptr->month); i++) {
-					len = strlen(tptr->mon[i]);
-					if (strncasecmp_l(buf, tptr->mon[i],
-							len, locale) == 0)
-						break;
-				}
-			}
-			if (i == asizeof(tptr->month))
-				return (NULL);
-
-			tm->tm_mon = i;
-			buf += len;
-			flags |= FLAG_MONTH;
-
-			break;
-
-		case 'm':
-			if (!isdigit_l((unsigned char)*buf, locale))
-				return (NULL);
-
-			len = 2;
-			for (i = 0; len && *buf != 0 &&
-			     isdigit_l((unsigned char)*buf, locale); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (i < 1 || i > 12)
-				return (NULL);
-
-			tm->tm_mon = i - 1;
-			flags |= FLAG_MONTH;
-
-			break;
-
-		case 's':
-			{
-			char *cp;
-			int sverrno;
-			long n;
-			time_t t;
-
-			sverrno = errno;
-			errno = 0;
-			n = strtol_l(buf, &cp, 10, locale);
-			if (errno == ERANGE || (long)(t = n) != n) {
-				errno = sverrno;
-				return (NULL);
-			}
-			errno = sverrno;
-			buf = cp;
-			if (gmtime_r(&t, tm) == NULL)
-				return (NULL);
-			*GMTp = 1;
-			flags |= FLAG_YDAY | FLAG_WDAY | FLAG_MONTH |
-			    FLAG_MDAY | FLAG_YEAR;
-			}
-			break;
-
-		case 'Y':
-		case 'y':
-			if (*buf == 0 ||
-			    isspace_l((unsigned char)*buf, locale))
-				break;
-
-			if (!isdigit_l((unsigned char)*buf, locale))
-				return (NULL);
-
-			len = (c == 'Y') ? 4 : 2;
-			for (i = 0; len && *buf != 0 &&
-			     isdigit_l((unsigned char)*buf, locale); buf++) {
-				i *= 10;
-				i += *buf - '0';
-				len--;
-			}
-			if (c == 'Y')
-				i -= TM_YEAR_BASE;
-			if (c == 'y' && i < 69)
-				i += 100;
-			if (i < 0)
-				return (NULL);
-
-			tm->tm_year = i;
-			flags |= FLAG_YEAR;
-
-			break;
-
-		case 'Z':
-			{
-			const char *cp;
-			char *zonestr;
-
-			for (cp = buf; *cp &&
-			     isupper_l((unsigned char)*cp, locale); ++cp) {
-				/*empty*/}
-			if (cp - buf) {
-				zonestr = alloca(cp - buf + 1);
-				strncpy(zonestr, buf, cp - buf);
-				zonestr[cp - buf] = '\0';
-				tzset();
-				if (0 == strcmp(zonestr, "GMT") ||
-				    0 == strcmp(zonestr, "UTC")) {
-				    *GMTp = 1;
-				} else if (0 == strcmp(zonestr, tzname[0])) {
-				    tm->tm_isdst = 0;
-				} else if (0 == strcmp(zonestr, tzname[1])) {
-				    tm->tm_isdst = 1;
-				} else {
-				    return (NULL);
-				}
-				buf += cp - buf;
-			}
-			}
-			break;
-
-		case 'z':
-			{
-			int sign = 1;
-
-			if (*buf != '+') {
-				if (*buf == '-')
-					sign = -1;
-				else
-					return (NULL);
-			}
-
-			buf++;
-			i = 0;
-			for (len = 4; len > 0; len--) {
-				if (isdigit_l((unsigned char)*buf, locale)) {
-					i *= 10;
-					i += *buf - '0';
-					buf++;
-				} else
-					return (NULL);
-			}
-
-			tm->tm_hour -= sign * (i / 100);
-			tm->tm_min  -= sign * (i % 100);
-			*GMTp = 1;
-			}
-			break;
-
-		case 'n':
-		case 't':
-			while (isspace_l((unsigned char)*buf, locale))
-				buf++;
-			break;
-
-		default:
-			return (NULL);
-		}
-	}
-
-	if (!(flags & FLAG_YDAY) && (flags & FLAG_YEAR)) {
-		if ((flags & (FLAG_MONTH | FLAG_MDAY)) ==
-		    (FLAG_MONTH | FLAG_MDAY)) {
-			tm->tm_yday = start_of_month[isleap(tm->tm_year +
-			    TM_YEAR_BASE)][tm->tm_mon] + (tm->tm_mday - 1);
-			flags |= FLAG_YDAY;
-		} else if (day_offset != -1) {
-			/* Set the date to the first Sunday (or Monday)
-			 * of the specified week of the year.
-			 */
-			if (!(flags & FLAG_WDAY)) {
-				tm->tm_wday = day_offset;
-				flags |= FLAG_WDAY;
-			}
-			tm->tm_yday = (7 -
-			    first_wday_of(tm->tm_year + TM_YEAR_BASE) +
-			    day_offset) % 7 + (week_offset - 1) * 7 +
-			    tm->tm_wday - day_offset;
-			flags |= FLAG_YDAY;
-		}
-	}
-
-	if ((flags & (FLAG_YEAR | FLAG_YDAY)) == (FLAG_YEAR | FLAG_YDAY)) {
-		if (!(flags & FLAG_MONTH)) {
-			i = 0;
-			while (tm->tm_yday >=
-			    start_of_month[isleap(tm->tm_year +
-			    TM_YEAR_BASE)][i])
-				i++;
-			if (i > 12) {
-				i = 1;
-				tm->tm_yday -=
-				    start_of_month[isleap(tm->tm_year +
-				    TM_YEAR_BASE)][12];
-				tm->tm_year++;
-			}
-			tm->tm_mon = i - 1;
-			flags |= FLAG_MONTH;
-		}
-		if (!(flags & FLAG_MDAY)) {
-			tm->tm_mday = tm->tm_yday -
-			    start_of_month[isleap(tm->tm_year + TM_YEAR_BASE)]
-			    [tm->tm_mon] + 1;
-			flags |= FLAG_MDAY;
-		}
-		if (!(flags & FLAG_WDAY)) {
-			i = 0;
-			wday_offset = first_wday_of(tm->tm_year);
-			while (i++ <= tm->tm_yday) {
-				if (wday_offset++ >= 6)
-					wday_offset = 0;
-			}
-			tm->tm_wday = wday_offset;
-			flags |= FLAG_WDAY;
-		}
-	}
-
-	return ((char *)buf);
-}
-
-char *
-strptime_l(const char * __restrict buf, const char * __restrict fmt,
-    struct tm * __restrict tm, locale_t loc)
-{
-	char *ret;
-	int gmt;
-	FIX_LOCALE(loc);
-
-	gmt = 0;
-	ret = _strptime(buf, fmt, tm, &gmt, loc);
-	if (ret && gmt) {
-		time_t t = timegm(tm);
-
-		localtime_r(&t, tm);
-	}
-
-	return (ret);
-}
-
-char *
-strptime(const char * __restrict buf, const char * __restrict fmt,
-    struct tm * __restrict tm)
-{
-	return strptime_l(buf, fmt, tm, __get_locale());
-}
diff --git a/lib/libc_bsd/stdtime/time32.c b/lib/libc_bsd/stdtime/time32.c
deleted file mode 100644
index cc105c1..0000000
--- a/lib/libc_bsd/stdtime/time32.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * Copyright (c) 2001 FreeBSD Inc.
- * All rights reserved.
- *
- * These routines are for converting time_t to fixed-bit representations
- * for use in protocols or storage.  When converting time to a larger
- * representation of time_t these routines are expected to assume temporal
- * locality and use the 50-year rule to properly set the msb bits.  XXX
- *
- * Redistribution and use under the terms of the COPYRIGHT file at the
- * base of the source tree.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdtime/time32.c 98313 2002-06-17 01:42:33Z wollman $");
-
-#include <sys/types.h>
-#include <timeconv.h>
-
-/*
- * Convert a 32 bit representation of time_t into time_t.  XXX needs to
- * implement the 50-year rule to handle post-2038 conversions.
- */
-time_t
-_time32_to_time(__int32_t t32)
-{
-    return((time_t)t32);
-}
-
-/*
- * Convert time_t to a 32 bit representation.  If time_t is 64 bits we can
- * simply chop it down.   The resulting 32 bit representation can be 
- * converted back to a temporally local 64 bit time_t using time32_to_time.
- */
-__int32_t
-_time_to_time32(time_t t)
-{
-    return((__int32_t)t);
-}
-
-/*
- * Convert a 64 bit representation of time_t into time_t.  If time_t is
- * represented as 32 bits we can simply chop it and not support times
- * past 2038.
- */
-time_t
-_time64_to_time(__int64_t t64)
-{
-    return((time_t)t64);
-}
-
-/*
- * Convert time_t to a 64 bit representation.  If time_t is represented
- * as 32 bits we simply sign-extend and do not support times past 2038.
- */
-__int64_t
-_time_to_time64(time_t t)
-{
-    return((__int64_t)t);
-}
-
-/*
- * Convert to/from 'long'.  Depending on the sizeof(long) this may or 
- * may not require using the 50-year rule.
- */
-long
-_time_to_long(time_t t)
-{
-    if (sizeof(long) == sizeof(__int64_t))
-	return(_time_to_time64(t));
-    return((long)t);
-}
-
-time_t
-_long_to_time(long tlong)
-{
-    if (sizeof(long) == sizeof(__int32_t))
-	return(_time32_to_time(tlong));
-    return((time_t)tlong);
-}
-
-/*
- * Convert to/from 'int'.  Depending on the sizeof(int) this may or 
- * may not require using the 50-year rule.
- */
-int
-_time_to_int(time_t t)
-{
-    if (sizeof(int) == sizeof(__int64_t))
-	return(_time_to_time64(t));
-    return((int)t);
-}
-
-time_t
-_int_to_time(int tint)
-{
-    if (sizeof(int) == sizeof(__int32_t))
-	return(_time32_to_time(tint));
-    return((time_t)tint);
-}
diff --git a/lib/libc_bsd/stdtime/timelocal.c b/lib/libc_bsd/stdtime/timelocal.c
deleted file mode 100644
index 3860956..0000000
--- a/lib/libc_bsd/stdtime/timelocal.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * Copyright (c) 2001 Alexey Zelkin <phantom@FreeBSD.org>
- * Copyright (c) 1997 FreeBSD Inc.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/stdtime/timelocal.c 267798 2014-06-23 15:03:51Z pfg $");
-
-#include <stddef.h>
-
-#include "ldpart.h"
-#include "timelocal.h"
-
-struct xlocale_time {
-	struct xlocale_component header;
-	char *buffer;
-	struct lc_time_T locale;
-};
-
-struct xlocale_time __xlocale_global_time;
-
-#define	LCTIME_SIZE (sizeof(struct lc_time_T) / sizeof(char *))
-
-static const struct lc_time_T	_C_time_locale = {
-	{
-		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
-		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
-	}, {
-		"January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"
-	}, {
-		"Sun", "Mon", "Tue", "Wed",
-		"Thu", "Fri", "Sat"
-	}, {
-		"Sunday", "Monday", "Tuesday", "Wednesday",
-		"Thursday", "Friday", "Saturday"
-	},
-
-	/* X_fmt */
-	"%H:%M:%S",
-
-	/*
-	 * x_fmt
-	 * Since the C language standard calls for
-	 * "date, using locale's date format," anything goes.
-	 * Using just numbers (as here) makes Quakers happier;
-	 * it's also compatible with SVR4.
-	 */
-	"%m/%d/%y",
-
-	/*
-	 * c_fmt
-	 */
-	"%a %b %e %H:%M:%S %Y",
-
-	/* am */
-	"AM",
-
-	/* pm */
-	"PM",
-
-	/* date_fmt */
-	"%a %b %e %H:%M:%S %Z %Y",
-	
-	/* alt_month
-	 * Standalone months forms for %OB
-	 */
-	{
-		"January", "February", "March", "April", "May", "June",
-		"July", "August", "September", "October", "November", "December"
-	},
-
-	/* md_order
-	 * Month / day order in dates
-	 */
-	"md",
-
-	/* ampm_fmt
-	 * To determine 12-hour clock format time (empty, if N/A)
-	 */
-	"%I:%M:%S %p"
-};
-
-static void destruct_time(void *v)
-{
-	struct xlocale_time *l = v;
-	if (l->buffer)
-		free(l->buffer);
-	free(l);
-}
-
-#include <stdio.h>
-struct lc_time_T *
-__get_current_time_locale(locale_t loc)
-{
-	return (loc->using_time_locale
-		? &((struct xlocale_time *)loc->components[XLC_TIME])->locale
-		: (struct lc_time_T *)&_C_time_locale);
-}
-
-static int
-time_load_locale(struct xlocale_time *l, int *using_locale, const char *name)
-{
-	struct lc_time_T *time_locale = &l->locale;
-	return (__part_load_locale(name, using_locale,
-			&l->buffer, "LC_TIME",
-			LCTIME_SIZE, LCTIME_SIZE,
-			(const char **)time_locale));
-}
-int
-__time_load_locale(const char *name)
-{
-	return time_load_locale(&__xlocale_global_time,
-			&__xlocale_global_locale.using_time_locale, name);
-}
-void* __time_load(const char* name, locale_t loc)
-{
-	struct xlocale_time *new = calloc(sizeof(struct xlocale_time), 1);
-	new->header.header.destructor = destruct_time;
-	if (time_load_locale(new, &loc->using_time_locale, name) == _LDP_ERROR)
-	{
-		xlocale_release(new);
-		return NULL;
-	}
-	return new;
-}
-
diff --git a/lib/libc_bsd/stdtime/timelocal.h b/lib/libc_bsd/stdtime/timelocal.h
deleted file mode 100644
index fdcafd0..0000000
--- a/lib/libc_bsd/stdtime/timelocal.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1997-2002 FreeBSD Project.
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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: releng/10.2/lib/libc/stdtime/timelocal.h 227753 2011-11-20 14:45:42Z theraven $
- */
-
-#ifndef _TIMELOCAL_H_
-#define	_TIMELOCAL_H_
-#include "xlocale_private.h"
-
-/*
- * Private header file for the strftime and strptime localization
- * stuff.
- */
-struct lc_time_T {
-	const char	*mon[12];
-	const char	*month[12];
-	const char	*wday[7];
-	const char	*weekday[7];
-	const char	*X_fmt;
-	const char	*x_fmt;
-	const char	*c_fmt;
-	const char	*am;
-	const char	*pm;
-	const char	*date_fmt;
-	const char	*alt_month[12];
-	const char	*md_order;
-	const char	*ampm_fmt;
-};
-
-struct lc_time_T *__get_current_time_locale(locale_t);
-int	__time_load_locale(const char *);
-
-#endif /* !_TIMELOCAL_H_ */
diff --git a/lib/libc_bsd/string/Makefile.inc b/lib/libc_bsd/string/Makefile.inc
deleted file mode 100644
index 2cdcbec..0000000
--- a/lib/libc_bsd/string/Makefile.inc
+++ /dev/null
@@ -1,93 +0,0 @@
-#	@(#)Makefile.inc	8.1 (Berkeley) 6/4/93
-Makefile.incl 281570 2015-04-16 00:24:21Z allanjude $
-
-.PATH: ${.CURDIR}/${LIBC_ARCH}/string ${.CURDIR}/string
-
-CFLAGS+= -I${.CURDIR}/locale
-
-# machine-independent string sources
-MISRCS+=bcmp.c bcopy.c bzero.c ffs.c ffsl.c ffsll.c fls.c flsl.c flsll.c \
-	memccpy.c memchr.c memrchr.c memcmp.c \
-	memcpy.c memmem.c memmove.c memset.c \
-	stpcpy.c stpncpy.c strcasecmp.c \
-	strcat.c strcasestr.c strchr.c strchrnul.c strcmp.c strcoll.c strcpy.c\
-	strcspn.c strdup.c strerror.c strlcat.c strlcpy.c strlen.c strmode.c \
-	strncat.c strncmp.c strncpy.c strndup.c strnlen.c strnstr.c \
-	strpbrk.c strrchr.c strsep.c strsignal.c strspn.c strstr.c strtok.c \
-	strxfrm.c swab.c wcpcpy.c wcpncpy.c wcscasecmp.c wcscat.c \
-	wcschr.c wcscmp.c wcscoll.c wcscpy.c wcscspn.c wcsdup.c \
-	wcslcat.c wcslcpy.c wcslen.c wcsncasecmp.c wcsncat.c wcsncmp.c \
-	wcsncpy.c wcsnlen.c wcspbrk.c \
-	wcsrchr.c wcsspn.c wcsstr.c wcstok.c wcswidth.c wcsxfrm.c wmemchr.c \
-	wmemcmp.c \
-	wmemcpy.c wmemmove.c wmemset.c
-
-SYM_MAPS+=	${.CURDIR}/string/Symbol.map
-
-
-# machine-dependent string sources
-Makefile.incl"
-
-MAN+=	bcmp.3 bcopy.3 bstring.3 bzero.3 ffs.3 index.3 memccpy.3 memchr.3 \
-	memcmp.3 memcpy.3 memmem.3 memmove.3 memset.3 strcasecmp.3 strcat.3 \
-	strchr.3 strcmp.3 strcoll.3 strcpy.3 strdup.3 strerror.3 \
-	string.3 strlcpy.3 strlen.3 strmode.3 strpbrk.3 strsep.3 \
-	strspn.3 strstr.3 strtok.3 strxfrm.3 swab.3 wcscoll.3 wcstok.3 \
-	wcswidth.3 wcsxfrm.3 wmemchr.3
-
-MLINKS+=ffs.3 ffsl.3 \
-	ffs.3 ffsll.3 \
-	ffs.3 fls.3 \
-	ffs.3 flsl.3 \
-	ffs.3 flsll.3
-MLINKS+=index.3 rindex.3
-MLINKS+=memchr.3 memrchr.3
-MLINKS+=strcasecmp.3 strncasecmp.3 \
-	strcasecmp.3 strcasecmp_l.3 \
-	strcasecmp.3 strncasecmp_l.3
-MLINKS+=strcat.3 strncat.3
-MLINKS+=strchr.3 strrchr.3 \
-	strchr.3 strchrnul.3
-MLINKS+=strcmp.3 strncmp.3
-MLINKS+=strcoll.3 strcoll_l.3
-MLINKS+=strcpy.3 stpcpy.3 \
-	strcpy.3 stpncpy.3 \
-	strcpy.3 strncpy.3
-MLINKS+=strdup.3 strndup.3
-MLINKS+=strerror.3 perror.3 \
-	strerror.3 strerror_r.3 \
-	strerror.3 sys_errlist.3 \
-	strerror.3 sys_nerr.3
-MLINKS+=strlcpy.3 strlcat.3
-MLINKS+=strlen.3 strnlen.3
-MLINKS+=strspn.3 strcspn.3
-MLINKS+=strstr.3 strcasestr.3 \
-	strstr.3 strnstr.3 \
-	strstr.3 strcasestr_l.3
-MLINKS+=strtok.3 strtok_r.3
-MLINKS+=strxfrm.3 strxfrm_l.3
-MLINKS+=wmemchr.3 wcpcpy.3 \
-	wmemchr.3 wcpncpy.3 \
-	wmemchr.3 wcscasecmp.3 \
-	wmemchr.3 wcscat.3 \
-	wmemchr.3 wcschr.3 \
-	wmemchr.3 wcscmp.3 \
-	wmemchr.3 wcscpy.3 \
-	wmemchr.3 wcscspn.3 \
-	wmemchr.3 wcsdup.3 \
-	wmemchr.3 wcslcat.3 \
-	wmemchr.3 wcslcpy.3 \
-	wmemchr.3 wcslen.3 \
-	wmemchr.3 wcsncasecmp.3 \
-	wmemchr.3 wcsncat.3 \
-	wmemchr.3 wcsncmp.3 \
-	wmemchr.3 wcsncpy.3 \
-	wmemchr.3 wcsnlen.3 \
-	wmemchr.3 wcspbrk.3 \
-	wmemchr.3 wcsrchr.3 \
-	wmemchr.3 wcsspn.3 \
-	wmemchr.3 wcsstr.3 \
-	wmemchr.3 wmemcmp.3 \
-	wmemchr.3 wmemcpy.3 \
-	wmemchr.3 wmemmove.3 \
-	wmemchr.3 wmemset.3
diff --git a/lib/libc_bsd/string/Symbol.map b/lib/libc_bsd/string/Symbol.map
deleted file mode 100644
index 2cdae83..0000000
--- a/lib/libc_bsd/string/Symbol.map
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/string/Symbol.map 246766 2013-02-13 15:46:33Z zeising $
- */
-
-FBSD_1.0 {
-	bcmp;
-	bcopy;
-	memcpy;
-	memmove;
-	ffs;
-	ffsl;
-	fls;
-	flsl;
-	index;
-	strchr;
-	memccpy;
-	memchr;
-	memcmp;
-	memmem;
-	bzero;
-	memset;
-	strrchr;
-	rindex;
-	stpcpy;
-	strcasecmp;
-	strncasecmp;
-	strcasestr;
-	strcat;
-	strcmp;
-	strcoll;
-	strcpy;
-	strcspn;
-	strdup;
-	strerror_r;
-	strerror;
-	strlcat;
-	strlcpy;
-	strlen;
-	strmode;
-	strncat;
-	strncmp;
-	strncpy;
-	strnstr;
-	strpbrk;
-	strsep;
-	strsignal;
-	strspn;
-	strstr;
-	strtok_r;
-	strtok;
-	strxfrm;
-	swab;
-	wcscat;
-	wcschr;
-	wcscmp;
-	wcscoll;
-	wcscpy;
-	wcscspn;
-	wcsdup;
-	wcslcat;
-	wcslcpy;
-	wcslen;
-	wcsncat;
-	wcsncmp;
-	wcsncpy;
-	wcspbrk;
-	wcsrchr;
-	wcsspn;
-	wcsstr;
-	wcstok;
-	wcswidth;
-	wcsxfrm;
-	wmemchr;
-	wmemcmp;
-	wmemcpy;
-	wmemmove;
-	wmemset;
-};
-
-FBSD_1.1 {
-	ffsll;
-	flsll;
-	memrchr;
-	stpncpy;
-	strndup;
-	strnlen;
-	wcpcpy;
-	wcpncpy;
-	wcscasecmp;
-	wcsncasecmp;
-	wcsnlen;
-};
-
-FBSD_1.3 {
-	strcasecmp_l;
-	strcasestr_l;
-	strchrnul;
-	strncasecmp_l;
-	wcswidth_l;
-	wcwidth_l;
-};
-
-FBSDprivate_1.0 {
-	__strtok_r;
-};
diff --git a/lib/libc_bsd/string/bcmp.3 b/lib/libc_bsd/string/bcmp.3
deleted file mode 100644
index 7d9cc27..0000000
--- a/lib/libc_bsd/string/bcmp.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" 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. 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.
-.\"
-.\"     @(#)bcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/bcmp.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt BCMP 3
-.Os
-.Sh NAME
-.Nm bcmp
-.Nd compare byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fn bcmp "const void *b1" "const void *b2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn bcmp
-function
-compares byte string
-.Fa b1
-against byte string
-.Fa b2 ,
-returning zero if they are identical, non-zero otherwise.
-Both strings are assumed to be
-.Fa len
-bytes long.
-Zero-length strings are always identical.
-.Pp
-The strings may overlap.
-.Sh SEE ALSO
-.Xr memcmp 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3
-.Sh HISTORY
-A
-.Fn bcmp
-function first appeared in
-.Bx 4.2 .
-Its prototype existed previously in
-.In string.h
-before it was moved to
-.In strings.h
-for
-.St -p1003.1-2001
-compliance.
diff --git a/lib/libc_bsd/string/bcmp.c b/lib/libc_bsd/string/bcmp.c
deleted file mode 100644
index 9157b42..0000000
--- a/lib/libc_bsd/string/bcmp.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1987, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/bcmp.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <strings.h>
-
-/*
- * bcmp -- vax cmpc3 instruction
- */
-int
-bcmp(const void *b1, const void *b2, size_t length)
-{
-	char *p1, *p2;
-
-	if (length == 0)
-		return (0);
-	p1 = (char *)b1;
-	p2 = (char *)b2;
-	do
-		if (*p1++ != *p2++)
-			break;
-	while (--length);
-	return (length);
-}
diff --git a/lib/libc_bsd/string/bcopy.3 b/lib/libc_bsd/string/bcopy.3
deleted file mode 100644
index 9922bd6..0000000
--- a/lib/libc_bsd/string/bcopy.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)bcopy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/bcopy.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt BCOPY 3
-.Os
-.Sh NAME
-.Nm bcopy
-.Nd copy byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft void
-.Fn bcopy "const void *src" "void *dst" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn bcopy
-function
-copies
-.Fa len
-bytes from string
-.Fa src
-to string
-.Fa dst .
-The two strings may overlap.
-If
-.Fa len
-is zero, no bytes are copied.
-.Sh SEE ALSO
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3 ,
-.Xr strncpy 3
-.Sh HISTORY
-A
-.Fn bcopy
-function appeared in
-.Bx 4.2 .
-Its prototype existed previously in
-.In string.h
-before it was moved to
-.In strings.h
-for
-.St -p1003.1-2001
-compliance.
diff --git a/lib/libc_bsd/string/bcopy.c b/lib/libc_bsd/string/bcopy.c
deleted file mode 100644
index c41295c..0000000
--- a/lib/libc_bsd/string/bcopy.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bcopy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/bcopy.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <sys/types.h>
-
-/*
- * sizeof(word) MUST BE A POWER OF TWO
- * SO THAT wmask BELOW IS ALL ONES
- */
-typedef	int word;		/* "word" used for optimal copy speed */
-
-#define	wsize	sizeof(word)
-#define	wmask	(wsize - 1)
-
-/*
- * Copy a block of memory, handling overlap.
- * This is the routine that actually implements
- * (the portable versions of) bcopy, memcpy, and memmove.
- */
-#if defined(MEMCOPY) || defined(MEMMOVE)
-#include <string.h>
-
-void *
-#ifdef MEMCOPY
-memcpy
-#else
-memmove
-#endif
-(void *dst0, const void *src0, size_t length)
-#else
-#include <strings.h>
-
-void
-bcopy(const void *src0, void *dst0, size_t length)
-#endif
-{
-	char *dst = dst0;
-	const char *src = src0;
-	size_t t;
-
-	if (length == 0 || dst == src)		/* nothing to do */
-		goto done;
-
-	/*
-	 * Macros: loop-t-times; and loop-t-times, t>0
-	 */
-#define	TLOOP(s) if (t) TLOOP1(s)
-#define	TLOOP1(s) do { s; } while (--t)
-
-	if ((unsigned long)dst < (unsigned long)src) {
-		/*
-		 * Copy forward.
-		 */
-		t = (uintptr_t)src;	/* only need low bits */
-		if ((t | (uintptr_t)dst) & wmask) {
-			/*
-			 * Try to align operands.  This cannot be done
-			 * unless the low bits match.
-			 */
-			if ((t ^ (uintptr_t)dst) & wmask || length < wsize)
-				t = length;
-			else
-				t = wsize - (t & wmask);
-			length -= t;
-			TLOOP1(*dst++ = *src++);
-		}
-		/*
-		 * Copy whole words, then mop up any trailing bytes.
-		 */
-		t = length / wsize;
-		TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
-		t = length & wmask;
-		TLOOP(*dst++ = *src++);
-	} else {
-		/*
-		 * Copy backwards.  Otherwise essentially the same.
-		 * Alignment works as before, except that it takes
-		 * (t&wmask) bytes to align, not wsize-(t&wmask).
-		 */
-		src += length;
-		dst += length;
-		t = (uintptr_t)src;
-		if ((t | (uintptr_t)dst) & wmask) {
-			if ((t ^ (uintptr_t)dst) & wmask || length <= wsize)
-				t = length;
-			else
-				t &= wmask;
-			length -= t;
-			TLOOP1(*--dst = *--src);
-		}
-		t = length / wsize;
-		TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
-		t = length & wmask;
-		TLOOP(*--dst = *--src);
-	}
-done:
-#if defined(MEMCOPY) || defined(MEMMOVE)
-	return (dst0);
-#else
-	return;
-#endif
-}
diff --git a/lib/libc_bsd/string/bstring.3 b/lib/libc_bsd/string/bstring.3
deleted file mode 100644
index dfda14b..0000000
--- a/lib/libc_bsd/string/bstring.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" 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. 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.
-.\"
-.\"     @(#)bstring.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/bstring.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt BSTRING 3
-.Os
-.Sh NAME
-.Nm bcmp ,
-.Nm bcopy ,
-.Nm bzero ,
-.Nm memccpy ,
-.Nm memchr ,
-.Nm memcmp ,
-.Nm memcpy ,
-.Nm memmove ,
-.Nm memset
-.Nd byte string operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn bcmp "const void *b1" "const void *b2" "size_t len"
-.Ft void
-.Fn bcopy "const void *src" "void *dst" "size_t len"
-.Ft void
-.Fn bzero "void *b" "size_t len"
-.Ft void *
-.Fn memchr "const void *b" "int c" "size_t len"
-.Ft int
-.Fn memcmp "const void *b1" "const void *b2" "size_t len"
-.Ft void *
-.Fn memccpy "void *dst" "const void *src" "int c" "size_t len"
-.Ft void *
-.Fn memcpy "void *dst" "const void *src" "size_t len"
-.Ft void *
-.Fn memmove "void *dst" "const void *src" "size_t len"
-.Ft void *
-.Fn memset "void *b" "int c" "size_t len"
-.Sh DESCRIPTION
-These functions operate on variable length strings of bytes.
-They do not check for terminating null bytes as the routines
-listed in
-.Xr string 3
-do.
-.Pp
-See the specific manual pages for more information.
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr bcopy 3 ,
-.Xr bzero 3 ,
-.Xr memccpy 3 ,
-.Xr memchr 3 ,
-.Xr memcmp 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr memset 3
-.Sh STANDARDS
-The functions
-.Fn memchr ,
-.Fn memcmp ,
-.Fn memcpy ,
-.Fn memmove ,
-and
-.Fn memset
-conform to
-.St -isoC .
-.Sh HISTORY
-The functions
-.Fn bzero
-and
-.Fn memccpy
-appeared in
-.Bx 4.3 ;
-the functions
-.Fn bcmp ,
-.Fn bcopy ,
-appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/string/bzero.3 b/lib/libc_bsd/string/bzero.3
deleted file mode 100644
index cfb746b..0000000
--- a/lib/libc_bsd/string/bzero.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)bzero.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/bzero.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt BZERO 3
-.Os
-.Sh NAME
-.Nm bzero
-.Nd write zeroes to a byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft void
-.Fn bzero "void *b" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn bzero
-function
-writes
-.Fa len
-zero bytes to the string
-.Fa b .
-If
-.Fa len
-is zero,
-.Fn bzero
-does nothing.
-.Sh SEE ALSO
-.Xr memset 3 ,
-.Xr swab 3
-.Sh HISTORY
-A
-.Fn bzero
-function
-appeared in
-.Bx 4.3 .
-Its prototype existed previously in
-.In string.h
-before it was moved to
-.In strings.h
-for
-.St -p1003.1-2001
-compliance.
diff --git a/lib/libc_bsd/string/bzero.c b/lib/libc_bsd/string/bzero.c
deleted file mode 100644
index 9700ecc..0000000
--- a/lib/libc_bsd/string/bzero.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/bzero.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#define	BZERO
-#include "memset.c"
diff --git a/lib/libc_bsd/string/ffs.3 b/lib/libc_bsd/string/ffs.3
deleted file mode 100644
index 13867b7..0000000
--- a/lib/libc_bsd/string/ffs.3
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" 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. 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.
-.\"
-.\"     @(#)ffs.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/string/ffs.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd September 29, 2012
-.Dt FFS 3
-.Os
-.Sh NAME
-.Nm ffs ,
-.Nm ffsl ,
-.Nm ffsll ,
-.Nm fls ,
-.Nm flsl ,
-.Nm flsll
-.Nd find first or last bit set in a bit string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fn ffs "int value"
-.Ft int
-.Fn ffsl "long value"
-.Ft int
-.Fn ffsll "long long value"
-.Ft int
-.Fn fls "int value"
-.Ft int
-.Fn flsl "long value"
-.Ft int
-.Fn flsll "long long value"
-.Sh DESCRIPTION
-The
-.Fn ffs ,
-.Fn ffsl
-and
-.Fn ffsll
-functions find the first (least significant) bit set
-in
-.Fa value
-and return the index of that bit.
-.Pp
-The
-.Fn fls ,
-.Fn flsl
-and
-.Fn flsll
-functions find the last (most significant) bit set in
-.Fa value
-and return the index of that bit.
-.Pp
-Bits are numbered starting at 1, the least significant bit.
-A return value of zero from any of these functions means that the
-argument was zero.
-.Sh SEE ALSO
-.Xr bitstring 3
-.Sh HISTORY
-The
-.Fn ffs
-function appeared in
-.Bx 4.3 .
-Its prototype existed previously in
-.In string.h
-before it was moved to
-.In strings.h
-for
-.St -p1003.1-2001
-compliance.
-.Pp
-The
-.Fn ffsl ,
-.Fn fls
-and
-.Fn flsl
-functions appeared in
-.Fx 5.3 .
-The
-.Fn ffsll
-and
-.Fn flsll
-functions appeared in
-.Fx 7.1 .
diff --git a/lib/libc_bsd/string/ffs.c b/lib/libc_bsd/string/ffs.c
deleted file mode 100644
index bab3d11..0000000
--- a/lib/libc_bsd/string/ffs.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ffs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/ffs.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <strings.h>
-
-/*
- * Find First Set bit
- */
-int
-ffs(int mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return(0);
-	for (bit = 1; !(mask & 1); bit++)
-		mask = (unsigned int)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc_bsd/string/ffsl.c b/lib/libc_bsd/string/ffsl.c
deleted file mode 100644
index fffb614..0000000
--- a/lib/libc_bsd/string/ffsl.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/ffsl.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <strings.h>
-
-/*
- * Find First Set bit
- */
-int
-ffsl(long mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return (0);
-	for (bit = 1; !(mask & 1); bit++)
-		mask = (unsigned long)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc_bsd/string/ffsll.c b/lib/libc_bsd/string/ffsll.c
deleted file mode 100644
index 160f379..0000000
--- a/lib/libc_bsd/string/ffsll.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/ffsll.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <strings.h>
-
-/*
- * Find First Set bit
- */
-int
-ffsll(long long mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return (0);
-	for (bit = 1; !(mask & 1); bit++)
-		mask = (unsigned long long)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc_bsd/string/fls.c b/lib/libc_bsd/string/fls.c
deleted file mode 100644
index ac567fb..0000000
--- a/lib/libc_bsd/string/fls.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/fls.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <strings.h>
-
-/*
- * Find Last Set bit
- */
-int
-fls(int mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return (0);
-	for (bit = 1; mask != 1; bit++)
-		mask = (unsigned int)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc_bsd/string/flsl.c b/lib/libc_bsd/string/flsl.c
deleted file mode 100644
index 2bfe0c5..0000000
--- a/lib/libc_bsd/string/flsl.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/flsl.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <strings.h>
-
-/*
- * Find Last Set bit
- */
-int
-flsl(long mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return (0);
-	for (bit = 1; mask != 1; bit++)
-		mask = (unsigned long)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc_bsd/string/flsll.c b/lib/libc_bsd/string/flsll.c
deleted file mode 100644
index a416ac3..0000000
--- a/lib/libc_bsd/string/flsll.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/flsll.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <strings.h>
-
-/*
- * Find Last Set bit
- */
-int
-flsll(long long mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return (0);
-	for (bit = 1; mask != 1; bit++)
-		mask = (unsigned long long)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc_bsd/string/index.3 b/lib/libc_bsd/string/index.3
deleted file mode 100644
index 55ce63d..0000000
--- a/lib/libc_bsd/string/index.3
+++ /dev/null
@@ -1,115 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" 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. 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.
-.\"
-.\"     @(#)index.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/index.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd March 20, 2011
-.Dt INDEX 3
-.Os
-.Sh NAME
-.Nm index , rindex
-.Nd locate character in string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft "char *"
-.Fn index "const char *s" "int c"
-.Ft "char *"
-.Fn rindex "const char *s" "int c"
-.Sh DESCRIPTION
-.Bf -symbolic
-The
-.Fn index
-and
-.Fn rindex
-functions have been deprecated in favor of
-.Xr strchr 3
-and
-.Xr strrchr 3 .
-.Ef
-.Pp
-The
-.Fn index
-function
-locates the first occurrence of
-.Fa c
-(converted to a
-.Vt char )
-in the string pointed to by
-.Fa s .
-The terminating null character is considered part of the string;
-therefore if
-.Fa c
-is
-.Ql \e0 ,
-the functions locate the terminating
-.Ql \e0 .
-.Pp
-The
-.Fn rindex
-function is identical to
-.Fn index ,
-except it locates the last occurrence of
-.Fa c .
-.Sh RETURN VALUES
-The functions
-.Fn index
-and
-.Fn rindex
-return a pointer to the located character, or
-.Dv NULL
-if the character does not appear in the string.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh HISTORY
-The
-.Fn index
-and
-.Fn rindex
-functions appeared in
-.At v6 .
-Their prototypes existed previously in
-.In string.h
-before they were moved to
-.In strings.h
-for
-.St -p1003.1-2001
-compliance.
-The functions are not specified by
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/string/memccpy.3 b/lib/libc_bsd/string/memccpy.3
deleted file mode 100644
index f66d34e..0000000
--- a/lib/libc_bsd/string/memccpy.3
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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. 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.
-.\"
-.\"     @(#)memccpy.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/memccpy.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 9, 1993
-.Dt MEMCCPY 3
-.Os
-.Sh NAME
-.Nm memccpy
-.Nd copy string until character found
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memccpy "void *dst" "const void *src" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memccpy
-function
-copies bytes from string
-.Fa src
-to string
-.Fa dst .
-If the character
-.Fa c
-(as converted to an
-.Vt "unsigned char" )
-occurs in the string
-.Fa src ,
-the copy stops and a pointer to the byte after the copy of
-.Fa c
-in the string
-.Fa dst
-is returned.
-Otherwise,
-.Fa len
-bytes are copied, and a NULL pointer is returned.
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3
-.Sh HISTORY
-The
-.Fn memccpy
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/string/memccpy.c b/lib/libc_bsd/string/memccpy.c
deleted file mode 100644
index 6852986..0000000
--- a/lib/libc_bsd/string/memccpy.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memccpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/memccpy.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-void *
-memccpy(void *t, const void *f, int c, size_t n)
-{
-
-	if (n) {
-		unsigned char *tp = t;
-		const unsigned char *fp = f;
-		unsigned char uc = c;
-		do {
-			if ((*tp++ = *fp++) == uc)
-				return (tp);
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/lib/libc_bsd/string/memchr.3 b/lib/libc_bsd/string/memchr.3
deleted file mode 100644
index c772ff4..0000000
--- a/lib/libc_bsd/string/memchr.3
+++ /dev/null
@@ -1,106 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)memchr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/memchr.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd April 9, 2008
-.Dt MEMCHR 3
-.Os
-.Sh NAME
-.Nm memchr
-.Nd locate byte in byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memchr "const void *b" "int c" "size_t len"
-.Ft void *
-.Fn memrchr "const void *b" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memchr
-function
-locates the first occurrence of
-.Fa c
-(converted to an
-.Vt "unsigned char" )
-in string
-.Fa b .
-.Pp
-The
-.Fn memrchr
-function behaves like
-.Fn memchr ,
-except that it locates the last occurrence of
-.Fa c
-in string
-.Fa b .
-.Sh RETURN VALUES
-The
-.Fn memchr
-and
-.Fn memrchr
-functions
-return a pointer to the byte located,
-or NULL if no such byte exists within
-.Fa len
-bytes.
-.Sh SEE ALSO
-.Xr memmem 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wmemchr 3
-.Sh STANDARDS
-The
-.Fn memchr
-function
-conforms to
-.St -isoC .
-.Pp
-The
-.Fn memrchr
-function is a GNU extension and conforms to no standard.
-.Sh HISTORY
-The
-.Fn memrchr
-function first appeared in GNU libc 2.1.91, this implementation
-first appeared in
-.Fx 6.4 ,
-coming from
-.Ox 4.3 .
diff --git a/lib/libc_bsd/string/memchr.c b/lib/libc_bsd/string/memchr.c
deleted file mode 100644
index 3565676..0000000
--- a/lib/libc_bsd/string/memchr.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memchr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/memchr.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-void *
-memchr(const void *s, int c, size_t n)
-{
-	if (n != 0) {
-		const unsigned char *p = s;
-
-		do {
-			if (*p++ == (unsigned char)c)
-				return ((void *)(p - 1));
-		} while (--n != 0);
-	}
-	return (NULL);
-}
diff --git a/lib/libc_bsd/string/memcmp.3 b/lib/libc_bsd/string/memcmp.3
deleted file mode 100644
index 99d871e..0000000
--- a/lib/libc_bsd/string/memcmp.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)memcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/memcmp.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt MEMCMP 3
-.Os
-.Sh NAME
-.Nm memcmp
-.Nd compare byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn memcmp "const void *b1" "const void *b2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memcmp
-function
-compares byte string
-.Fa b1
-against byte string
-.Fa b2 .
-Both strings are assumed to be
-.Fa len
-bytes long.
-.Sh RETURN VALUES
-The
-.Fn memcmp
-function
-returns zero if the two strings are identical,
-otherwise returns the difference between the first two differing bytes
-(treated as
-.Vt "unsigned char"
-values, so that
-.Sq Li \e200
-is greater than
-.Sq Li \&\e0 ,
-for example).
-Zero-length strings are always identical.
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3 ,
-.Xr wmemcmp 3
-.Sh STANDARDS
-The
-.Fn memcmp
-function
-conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/string/memcmp.c b/lib/libc_bsd/string/memcmp.c
deleted file mode 100644
index 1690e90..0000000
--- a/lib/libc_bsd/string/memcmp.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/memcmp.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-/*
- * Compare memory regions.
- */
-int
-memcmp(const void *s1, const void *s2, size_t n)
-{
-	if (n != 0) {
-		const unsigned char *p1 = s1, *p2 = s2;
-
-		do {
-			if (*p1++ != *p2++)
-				return (*--p1 - *--p2);
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/lib/libc_bsd/string/memcpy.3 b/lib/libc_bsd/string/memcpy.3
deleted file mode 100644
index ff56f08..0000000
--- a/lib/libc_bsd/string/memcpy.3
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)memcpy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/memcpy.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt MEMCPY 3
-.Os
-.Sh NAME
-.Nm memcpy
-.Nd copy byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memcpy "void *dst" "const void *src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memcpy
-function
-copies
-.Fa len
-bytes from string
-.Fa src
-to string
-.Fa dst .
-.Sh RETURN VALUES
-The
-.Fn memcpy
-function
-returns the original value of
-.Fa dst .
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3 ,
-.Xr wmemcpy 3
-.Sh STANDARDS
-The
-.Fn memcpy
-function
-conforms to
-.St -isoC .
-.Sh BUGS
-In this implementation
-.Fn memcpy
-is implemented using
-.Xr bcopy 3 ,
-and therefore the strings may overlap.
-On other systems, copying overlapping strings may produce surprises.
-Programs intended to be portable should use
-.Xr memmove 3
-when
-.Fa src
-and
-.Fa dst
-may overlap.
diff --git a/lib/libc_bsd/string/memcpy.c b/lib/libc_bsd/string/memcpy.c
deleted file mode 100644
index 8cc727d..0000000
--- a/lib/libc_bsd/string/memcpy.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/memcpy.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#define	MEMCOPY
-#include "bcopy.c"
diff --git a/lib/libc_bsd/string/memmem.3 b/lib/libc_bsd/string/memmem.3
deleted file mode 100644
index 0eac65b..0000000
--- a/lib/libc_bsd/string/memmem.3
+++ /dev/null
@@ -1,86 +0,0 @@
-.\" Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
-.\"
-.\" 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: releng/10.2/lib/libc/string/memmem.3 152746 2005-11-24 06:56:21Z ru $
-.\"
-.Dd August 24, 2005
-.Dt MEMMEM 3
-.Os
-.Sh NAME
-.Nm memmem
-.Nd "locate a byte substring in a byte string"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft "void *"
-.Fo memmem
-.Fa "const void *big" "size_t big_len"
-.Fa "const void *little" "size_t little_len"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn memmem
-function
-locates the first occurrence of the byte string
-.Fa little
-in the byte string
-.Fa big .
-.Sh RETURN VALUES
-If
-.Fa big_len
-is smaller than
-.Fa little_len ,
-if
-.Fa little_len
-is 0, if
-.Fa big_len
-is 0 or if
-.Fa little
-occurs nowhere in
-.Fa big ,
-.Dv NULL
-is returned;
-otherwise a pointer to the first character of the first occurrence of
-.Fa little
-is returned.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strstr 3
-.Sh CONFORMING TO
-.Fn memmem
-is a GNU extension.
-.Sh HISTORY
-The
-.Fn memmem
-function first appeared in
-.Fx 6.0 .
-.Sh AUTHORS
-.An Pascal Gloor Aq pascal.gloor@spale.com
-.Sh BUGS
-This function was broken in Linux libc up to and including version 5.0.9
-and in GNU libc prior to version 2.1.
diff --git a/lib/libc_bsd/string/memmem.c b/lib/libc_bsd/string/memmem.c
deleted file mode 100644
index 8723264..0000000
--- a/lib/libc_bsd/string/memmem.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/memmem.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence of the byte string s in byte string l.
- */
-
-void *
-memmem(const void *l, size_t l_len, const void *s, size_t s_len)
-{
-	register char *cur, *last;
-	const char *cl = (const char *)l;
-	const char *cs = (const char *)s;
-
-	/* we need something to compare */
-	if (l_len == 0 || s_len == 0)
-		return NULL;
-
-	/* "s" must be smaller or equal to "l" */
-	if (l_len < s_len)
-		return NULL;
-
-	/* special case where s_len == 1 */
-	if (s_len == 1)
-		return memchr(l, (int)*cs, l_len);
-
-	/* the last position where its possible to find "s" in "l" */
-	last = (char *)cl + l_len - s_len;
-
-	for (cur = (char *)cl; cur <= last; cur++)
-		if (cur[0] == cs[0] && memcmp(cur, cs, s_len) == 0)
-			return cur;
-
-	return NULL;
-}
diff --git a/lib/libc_bsd/string/memmove.3 b/lib/libc_bsd/string/memmove.3
deleted file mode 100644
index ca9fe64..0000000
--- a/lib/libc_bsd/string/memmove.3
+++ /dev/null
@@ -1,75 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)memmove.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/memmove.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt MEMMOVE 3
-.Os
-.Sh NAME
-.Nm memmove
-.Nd copy byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memmove "void *dst" "const void *src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memmove
-function
-copies
-.Fa len
-bytes from string
-.Fa src
-to string
-.Fa dst .
-The two strings may overlap;
-the copy is always done in a non-destructive manner.
-.Sh RETURN VALUES
-The
-.Fn memmove
-function returns the original value of
-.Fa dst .
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr strcpy 3 ,
-.Xr wmemmove 3
-.Sh STANDARDS
-The
-.Fn memmove
-function
-conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/string/memmove.c b/lib/libc_bsd/string/memmove.c
deleted file mode 100644
index 28425d0..0000000
--- a/lib/libc_bsd/string/memmove.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/memmove.c 92986 2002-03-22 21:53:29Z obrien $");
-
-#define	MEMMOVE
-#include "bcopy.c"
diff --git a/lib/libc_bsd/string/memrchr.c b/lib/libc_bsd/string/memrchr.c
deleted file mode 100644
index c48cc73..0000000
--- a/lib/libc_bsd/string/memrchr.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*	$OpenBSD: memrchr.c,v 1.2 2007/11/27 16:22:12 martynas Exp $	*/
-
-/*
- * Copyright (c) 2007 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $FreeBSD: releng/10.2/lib/libc/string/memrchr.c 178051 2008-04-10 00:12:44Z delphij $
- */
-
-#include <string.h>
-
-/*
- * Reverse memchr()
- * Find the last occurrence of 'c' in the buffer 's' of size 'n'.
- */
-void *
-memrchr(const void *s, int c, size_t n)
-{
-	const unsigned char *cp;
-
-	if (n != 0) {
-		cp = (unsigned char *)s + n;
-		do {
-			if (*(--cp) == (unsigned char)c)
-				return((void *)cp);
-		} while (--n != 0);
-	}
-	return(NULL);
-}
diff --git a/lib/libc_bsd/string/memset.3 b/lib/libc_bsd/string/memset.3
deleted file mode 100644
index 365fff5..0000000
--- a/lib/libc_bsd/string/memset.3
+++ /dev/null
@@ -1,72 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)memset.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/memset.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt MEMSET 3
-.Os
-.Sh NAME
-.Nm memset
-.Nd write a byte to byte string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void *
-.Fn memset "void *b" "int c" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn memset
-function
-writes
-.Fa len
-bytes of value
-.Fa c
-(converted to an
-.Vt "unsigned char" )
-to the string
-.Fa b .
-.Sh RETURN VALUES
-The
-.Fn memset
-function returns its first argument.
-.Sh SEE ALSO
-.Xr bzero 3 ,
-.Xr swab 3 ,
-.Xr wmemset 3
-.Sh STANDARDS
-The
-.Fn memset
-function
-conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/string/memset.c b/lib/libc_bsd/string/memset.c
deleted file mode 100644
index bc3749c..0000000
--- a/lib/libc_bsd/string/memset.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Hibler and Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memset.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/memset.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <sys/types.h>
-
-#include <limits.h>
-
-#define	wsize	sizeof(u_int)
-#define	wmask	(wsize - 1)
-
-#ifdef BZERO
-#include <strings.h>
-
-#define	RETURN	return
-#define	VAL	0
-#define	WIDEVAL	0
-
-void
-bzero(void *dst0, size_t length)
-#else
-#include <string.h>
-
-#define	RETURN	return (dst0)
-#define	VAL	c0
-#define	WIDEVAL	c
-
-void *
-memset(void *dst0, int c0, size_t length)
-#endif
-{
-	size_t t;
-#ifndef BZERO
-	u_int c;
-#endif
-	u_char *dst;
-
-	dst = dst0;
-	/*
-	 * If not enough words, just fill bytes.  A length >= 2 words
-	 * guarantees that at least one of them is `complete' after
-	 * any necessary alignment.  For instance:
-	 *
-	 *	|-----------|-----------|-----------|
-	 *	|00|01|02|03|04|05|06|07|08|09|0A|00|
-	 *	          ^---------------------^
-	 *		 dst		 dst+length-1
-	 *
-	 * but we use a minimum of 3 here since the overhead of the code
-	 * to do word writes is substantial.
-	 */
-	if (length < 3 * wsize) {
-		while (length != 0) {
-			*dst++ = VAL;
-			--length;
-		}
-		RETURN;
-	}
-
-#ifndef BZERO
-	if ((c = (u_char)c0) != 0) {	/* Fill the word. */
-		c = (c << 8) | c;	/* u_int is 16 bits. */
-#if UINT_MAX > 0xffff
-		c = (c << 16) | c;	/* u_int is 32 bits. */
-#endif
-#if UINT_MAX > 0xffffffff
-		c = (c << 32) | c;	/* u_int is 64 bits. */
-#endif
-	}
-#endif
-	/* Align destination by filling in bytes. */
-	if ((t = (long)dst & wmask) != 0) {
-		t = wsize - t;
-		length -= t;
-		do {
-			*dst++ = VAL;
-		} while (--t != 0);
-	}
-
-	/* Fill words.  Length was >= 2*words so we know t >= 1 here. */
-	t = length / wsize;
-	do {
-		*(u_int *)dst = WIDEVAL;
-		dst += wsize;
-	} while (--t != 0);
-
-	/* Mop up trailing bytes, if any. */
-	t = length & wmask;
-	if (t != 0)
-		do {
-			*dst++ = VAL;
-		} while (--t != 0);
-	RETURN;
-}
diff --git a/lib/libc_bsd/string/stpcpy.c b/lib/libc_bsd/string/stpcpy.c
deleted file mode 100644
index b0938ac..0000000
--- a/lib/libc_bsd/string/stpcpy.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1999
- *	David E. O'Brien
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/stpcpy.c 189137 2009-02-28 06:05:37Z das $");
-
-#include <string.h>
-
-char *
-stpcpy(char * __restrict to, const char * __restrict from)
-{
-
-	for (; (*to = *from); ++from, ++to);
-	return(to);
-}
diff --git a/lib/libc_bsd/string/stpncpy.c b/lib/libc_bsd/string/stpncpy.c
deleted file mode 100644
index a8cc32a..0000000
--- a/lib/libc_bsd/string/stpncpy.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/stpncpy.c 189136 2009-02-28 06:00:58Z das $");
-
-#include <string.h>
-
-char *
-stpncpy(char * __restrict dst, const char * __restrict src, size_t n)
-{
-
-	for (; n--; dst++, src++) {
-		if (!(*dst = *src)) {
-			char *ret = dst;
-			while (n--)
-				*++dst = '\0';
-			return (ret);
-		}
-	}
-	return (dst);
-}
diff --git a/lib/libc_bsd/string/strcasecmp.3 b/lib/libc_bsd/string/strcasecmp.3
deleted file mode 100644
index 2a6ed98..0000000
--- a/lib/libc_bsd/string/strcasecmp.3
+++ /dev/null
@@ -1,118 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" 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. 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.
-.\"
-.\"     @(#)strcasecmp.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strcasecmp.3 267465 2014-06-14 02:57:40Z pfg $
-.\"
-.Dd May 29, 2014
-.Dt STRCASECMP 3
-.Os
-.Sh NAME
-.Nm strcasecmp ,
-.Nm strncasecmp
-.Nd compare strings, ignoring case
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In strings.h
-.Ft int
-.Fn strcasecmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncasecmp "const char *s1" "const char *s2" "size_t len"
-.In strings.h
-.In xlocale.h
-.Ft int
-.Fn strcasecmp_l "const char *s1" "const char *s2" "locale_t loc"
-.Ft int
-.Fn strncasecmp_l "const char *s1" "const char *s2" "site_t len" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn strcasecmp
-and
-.Fn strncasecmp
-functions
-compare the null-terminated strings
-.Fa s1
-and
-.Fa s2 .
-.Pp
-The
-.Fn strncasecmp
-function compares at most
-.Fa len
-characters.
-The
-.Fn strcasecmp_l
-and
-.Fn strncasecmp_l
-functions do the same as their non-locale versions above, but take an
-explicit locale rather than using the current locale.
-.Sh RETURN VALUES
-The functions
-.Fn strcasecmp
-and
-.Fn strncasecmp
-return an integer greater than, equal to, or less than 0,
-depending on whether
-.Fa s1
-is lexicographically greater than, equal to, or less than
-.Fa s2
-after translation of each corresponding character to lower-case.
-The strings themselves are not modified.
-The comparison is done using unsigned characters, so that
-.Sq Li \e200
-is greater than
-.Ql \e0 .
-The functions
-.Fn strcasecmp_l
-and
-.Fn strncasecmp_l
-do the same but take explicit locales.
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr memcmp 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3 ,
-.Xr tolower 3 ,
-.Xr wcscasecmp 3
-.Sh HISTORY
-The
-.Fn strcasecmp
-and
-.Fn strncasecmp
-functions first appeared in
-.Bx 4.4 .
-Their prototypes existed previously in
-.In string.h
-before they were moved to
-.In strings.h
-for
-.St -p1003.1-2001
-compliance.
diff --git a/lib/libc_bsd/string/strcasecmp.c b/lib/libc_bsd/string/strcasecmp.c
deleted file mode 100644
index ff37462..0000000
--- a/lib/libc_bsd/string/strcasecmp.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 1987, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcasecmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strcasecmp.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <strings.h>
-#include <ctype.h>
-#include "xlocale_private.h"
-
-int
-strcasecmp_l(const char *s1, const char *s2, locale_t locale)
-{
-	const u_char
-			*us1 = (const u_char *)s1,
-			*us2 = (const u_char *)s2;
-	FIX_LOCALE(locale);
-
-	while (tolower_l(*us1, locale) == tolower_l(*us2++, locale))
-		if (*us1++ == '\0')
-			return (0);
-	return (tolower_l(*us1, locale) - tolower_l(*--us2, locale));
-}
-int
-strcasecmp(const char *s1, const char *s2)
-{
-	return strcasecmp_l(s1, s2, __get_locale());
-}
-
-int
-strncasecmp_l(const char *s1, const char *s2, size_t n, locale_t locale)
-{
-	FIX_LOCALE(locale);
-	if (n != 0) {
-		const u_char
-				*us1 = (const u_char *)s1,
-				*us2 = (const u_char *)s2;
-
-		do {
-			if (tolower_l(*us1, locale) != tolower_l(*us2++, locale))
-				return (tolower_l(*us1, locale) - tolower_l(*--us2, locale));
-			if (*us1++ == '\0')
-				break;
-		} while (--n != 0);
-	}
-	return (0);
-}
-
-int
-strncasecmp(const char *s1, const char *s2, size_t n)
-{
-	return strncasecmp_l(s1, s2, n, __get_locale());
-}
diff --git a/lib/libc_bsd/string/strcasestr.c b/lib/libc_bsd/string/strcasestr.c
deleted file mode 100644
index 9ffc496..0000000
--- a/lib/libc_bsd/string/strcasestr.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strcasestr.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <ctype.h>
-#include <string.h>
-#include "xlocale_private.h"
-
-/*
- * Find the first occurrence of find in s, ignore case.
- */
-char *
-strcasestr_l(const char *s, const char *find, locale_t locale)
-{
-	char c, sc;
-	size_t len;
-	FIX_LOCALE(locale);
-
-	if ((c = *find++) != 0) {
-		c = tolower_l((unsigned char)c, locale);
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == 0)
-					return (NULL);
-			} while ((char)tolower_l((unsigned char)sc, locale) != c);
-		} while (strncasecmp_l(s, find, len, locale) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
-char *
-strcasestr(const char *s, const char *find)
-{
-	return strcasestr_l(s, find, __get_locale());
-}
diff --git a/lib/libc_bsd/string/strcat.3 b/lib/libc_bsd/string/strcat.3
deleted file mode 100644
index a60ab1d..0000000
--- a/lib/libc_bsd/string/strcat.3
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strcat.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strcat.3 262965 2014-03-10 00:53:37Z eadler $
-.\"
-.Dd December 1, 2009
-.Dt STRCAT 3
-.Os
-.Sh NAME
-.Nm strcat ,
-.Nm strncat
-.Nd concatenate strings
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strcat "char * restrict s" "const char * restrict append"
-.Ft char *
-.Fn strncat "char * restrict s" "const char * restrict append" "size_t count"
-.Sh DESCRIPTION
-The
-.Fn strcat
-and
-.Fn strncat
-functions
-append a copy of the null-terminated string
-.Fa append
-to the end of the null-terminated string
-.Fa s ,
-then add a terminating
-.Ql \e0 .
-The string
-.Fa s
-must have sufficient space to hold the result.
-.Pp
-The
-.Fn strncat
-function
-appends not more than
-.Fa count
-characters from
-.Fa append ,
-and then adds a terminating
-.Ql \e0 .
-.Sh RETURN VALUES
-The
-.Fn strcat
-and
-.Fn strncat
-functions
-return the pointer
-.Fa s .
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strcpy 3 ,
-.Xr strlcat 3 ,
-.Xr strlcpy 3 ,
-.Xr wcscat 3
-.Sh STANDARDS
-The
-.Fn strcat
-and
-.Fn strncat
-functions
-conform to
-.St -isoC .
-.Sh SECURITY CONSIDERATIONS
-The
-.Fn strcat
-function is easily misused in a manner
-which enables malicious users to arbitrarily change
-a running program's functionality through a buffer overflow attack.
-.Pp
-Avoid using
-.Fn strcat .
-Instead, use
-.Fn strncat
-or
-.Fn strlcat
-and ensure that no more characters are copied to the destination buffer
-than it can hold.
-.Pp
-Note that
-.Fn strncat
-can also be problematic.
-It may be a security concern for a string to be truncated at all.
-Since the truncated string will not be as long as the original,
-it may refer to a completely different resource
-and usage of the truncated resource
-could result in very incorrect behavior.
-Example:
-.Bd -literal
-void
-foo(const char *arbitrary_string)
-{
-	char onstack[8];
-
-#if defined(BAD)
-	/*
-	 * This first strcat is bad behavior.  Do not use strcat!
-	 */
-	(void)strcat(onstack, arbitrary_string);	/* BAD! */
-#elif defined(BETTER)
-	/*
-	 * The following two lines demonstrate better use of
-	 * strncat().
-	 */
-	(void)strncat(onstack, arbitrary_string,
-	    sizeof(onstack) - strlen(onstack) - 1);
-#elif defined(BEST)
-	/*
-	 * These lines are even more robust due to testing for
-	 * truncation.
-	 */
-	if (strlen(arbitrary_string) + 1 >
-	    sizeof(onstack) - strlen(onstack))
-		err(1, "onstack would be truncated");
-	(void)strncat(onstack, arbitrary_string,
-	    sizeof(onstack) - strlen(onstack) - 1);
-#endif
-}
-.Ed
diff --git a/lib/libc_bsd/string/strcat.c b/lib/libc_bsd/string/strcat.c
deleted file mode 100644
index 921d4bd..0000000
--- a/lib/libc_bsd/string/strcat.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcat.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strcat.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-char *
-strcat(char * __restrict s, const char * __restrict append)
-{
-	char *save = s;
-
-	for (; *s; ++s);
-	while ((*s++ = *append++));
-	return(save);
-}
diff --git a/lib/libc_bsd/string/strchr.3 b/lib/libc_bsd/string/strchr.3
deleted file mode 100644
index d972ca2..0000000
--- a/lib/libc_bsd/string/strchr.3
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strchr.3	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/string/strchr.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd February 13, 2013
-.Dt STRCHR 3
-.Os
-.Sh NAME
-.Nm strchr , strrchr , strchrnul
-.Nd locate character in string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft "char *"
-.Fn strchr "const char *s" "int c"
-.Ft "char *"
-.Fn strrchr "const char *s" "int c"
-.Ft "char *"
-.Fn strchrnul "const char *s" "int c"
-.Sh DESCRIPTION
-The
-.Fn strchr
-function locates the first occurrence of
-.Fa c
-(converted to a
-.Vt char )
-in the string pointed to by
-.Fa s .
-The terminating null character is considered part of the string;
-therefore if
-.Fa c
-is
-.Ql \e0 ,
-the functions locate the terminating
-.Ql \e0 .
-.Pp
-The
-.Fn strrchr
-function is identical to
-.Fn strchr
-except it locates the last occurrence of
-.Fa c .
-.Pp
-The
-.Fn strchrnul
-function is identical to
-.Fn strchr
-except that if
-.Fa c
-is not found in
-.Fa s
-a pointer to the terminating
-.Ql \e0
-is returned.
-.Sh RETURN VALUES
-The functions
-.Fn strchr
-and
-.Fn strrchr
-return a pointer to the located character, or
-.Dv NULL
-if the character does not appear in the string.
-.Pp
-.Fn strchrnul
-returns a pointer to the terminating
-.Ql \e0
-if the character does not appear in the string.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr memmem 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wcschr 3
-.Sh STANDARDS
-The functions
-.Fn strchr
-and
-.Fn strrchr
-conform to
-.St -isoC .
-The
-.Fn strchrnul
-is a GNU extension .
-.Sh History
-The
-.Fn strchrnul
-function first appeared in glibc 2.1.1 and was added in
-.Fx 10.0 .
diff --git a/lib/libc_bsd/string/strchr.c b/lib/libc_bsd/string/strchr.c
deleted file mode 100644
index b46a5e3..0000000
--- a/lib/libc_bsd/string/strchr.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)index.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strchr.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stddef.h>
-#include <string.h>
-
-char *
-strchr(const char *p, int ch)
-{
-	char c;
-
-	c = ch;
-	for (;; ++p) {
-		if (*p == c)
-			return ((char *)p);
-		if (*p == '\0')
-			return (NULL);
-	}
-	/* NOTREACHED */
-}
-
-__weak_reference(strchr, index);
diff --git a/lib/libc_bsd/string/strchrnul.c b/lib/libc_bsd/string/strchrnul.c
deleted file mode 100644
index c55b3d9..0000000
--- a/lib/libc_bsd/string/strchrnul.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2013 Niclas Zeising
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strchrnul.c 246766 2013-02-13 15:46:33Z zeising $");
-
-#include <stddef.h>
-#include <string.h>
-
-__weak_reference(__strchrnul, strchrnul);
-
-char *
-__strchrnul(const char *p, int ch)
-{
-	char c;
-
-	c = ch;
-	for (;; ++p) {
-		if (*p == c || *p == '\0')
-			return ((char *)p);
-	}
-	/* NOTREACHED */
-}
-
diff --git a/lib/libc_bsd/string/strcmp.3 b/lib/libc_bsd/string/strcmp.3
deleted file mode 100644
index 2c3b5e0..0000000
--- a/lib/libc_bsd/string/strcmp.3
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strcmp.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strcmp.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd October 11, 2001
-.Dt STRCMP 3
-.Os
-.Sh NAME
-.Nm strcmp ,
-.Nm strncmp
-.Nd compare strings
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn strcmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncmp "const char *s1" "const char *s2" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn strcmp
-and
-.Fn strncmp
-functions
-lexicographically compare the null-terminated strings
-.Fa s1
-and
-.Fa s2 .
-.Pp
-The
-.Fn strncmp
-function
-compares not more than
-.Fa len
-characters.
-Because
-.Fn strncmp
-is designed for comparing strings rather than binary data,
-characters that appear after a
-.Ql \e0
-character are not compared.
-.Sh RETURN VALUES
-The
-.Fn strcmp
-and
-.Fn strncmp
-functions return an integer greater than, equal to, or less than 0, according
-as the string
-.Fa s1
-is greater than, equal to, or less than the string
-.Fa s2 .
-The comparison is done using unsigned characters, so that
-.Ql \e200
-is greater than
-.Ql \e0 .
-.Sh SEE ALSO
-.Xr bcmp 3 ,
-.Xr memcmp 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcoll 3 ,
-.Xr strxfrm 3 ,
-.Xr wcscmp 3
-.Sh STANDARDS
-The
-.Fn strcmp
-and
-.Fn strncmp
-functions
-conform to
-.St -isoC .
diff --git a/lib/libc_bsd/string/strcmp.c b/lib/libc_bsd/string/strcmp.c
deleted file mode 100644
index ce73850..0000000
--- a/lib/libc_bsd/string/strcmp.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strcmp.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-/*
- * Compare strings.
- */
-int
-strcmp(const char *s1, const char *s2)
-{
-	while (*s1 == *s2++)
-		if (*s1++ == '\0')
-			return (0);
-	return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1));
-}
diff --git a/lib/libc_bsd/string/strcoll.3 b/lib/libc_bsd/string/strcoll.3
deleted file mode 100644
index bbf4e37..0000000
--- a/lib/libc_bsd/string/strcoll.3
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strcoll.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strcoll.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt STRCOLL 3
-.Os
-.Sh NAME
-.Nm strcoll
-.Nd compare strings according to current collation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft int
-.Fn strcoll "const char *s1" "const char *s2"
-.Ft int
-.Fn strcoll_l "const char *s1" "const char *s2" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn strcoll
-function
-lexicographically compares the null-terminated strings
-.Fa s1
-and
-.Fa s2
-according to the current locale collation
-and returns an integer greater than, equal to, or less than 0,
-depending on whether
-.Fa s1
-is greater than, equal to, or less than
-.Fa s2 .
-If information about the current locale collation is not available,
-the value of
-.Fn strcmp s1 s2
-is returned.
-The
-.Fn strcoll_l
-function uses an explicit locale argument rather than the system locale.
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr strcmp 3 ,
-.Xr strxfrm 3 ,
-.Xr wcscoll 3
-.Sh STANDARDS
-The
-.Fn strcoll
-function conforms to
-.St -isoC .
-The
-.Fn strcoll_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/string/strcoll.c b/lib/libc_bsd/string/strcoll.c
deleted file mode 100644
index 5cab67a..0000000
--- a/lib/libc_bsd/string/strcoll.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strcoll.c 228202 2011-12-02 15:41:09Z eadler $");
-
-#include <stdlib.h>
-#include <string.h>
-#include "collate.h"
-
-#include <stdio.h>
-
-int
-strcoll_l(const char *s, const char *s2, locale_t locale)
-{
-	int len, len2, prim, prim2, sec, sec2, ret, ret2;
-	const char *t, *t2;
-	char *tt, *tt2;
-	FIX_LOCALE(locale);
-	struct xlocale_collate *table =
-		(struct xlocale_collate*)locale->components[XLC_COLLATE];
-
-	if (table->__collate_load_error)
-		return strcmp(s, s2);
-
-	len = len2 = 1;
-	ret = ret2 = 0;
-	if (table->__collate_substitute_nontrivial) {
-		t = tt = __collate_substitute(table, s);
-		t2 = tt2 = __collate_substitute(table, s2);
-	} else {
-		tt = tt2 = NULL;
-		t = s;
-		t2 = s2;
-	}
-	while(*t && *t2) {
-		prim = prim2 = 0;
-		while(*t && !prim) {
-			__collate_lookup(table, t, &len, &prim, &sec);
-			t += len;
-		}
-		while(*t2 && !prim2) {
-			__collate_lookup(table, t2, &len2, &prim2, &sec2);
-			t2 += len2;
-		}
-		if(!prim || !prim2)
-			break;
-		if(prim != prim2) {
-			ret = prim - prim2;
-			goto end;
-		}
-		if(!ret2)
-			ret2 = sec - sec2;
-	}
-	if(!*t && *t2)
-		ret = -(int)((u_char)*t2);
-	else if(*t && !*t2)
-		ret = (u_char)*t;
-	else if(!*t && !*t2)
-		ret = ret2;
-  end:
-	free(tt);
-	free(tt2);
-
-	return ret;
-}
-
-int
-strcoll(const char *s, const char *s2)
-{
-	return strcoll_l(s, s2, __get_locale());
-}
-
diff --git a/lib/libc_bsd/string/strcpy.3 b/lib/libc_bsd/string/strcpy.3
deleted file mode 100644
index 6d576a2..0000000
--- a/lib/libc_bsd/string/strcpy.3
+++ /dev/null
@@ -1,212 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strcpy.3 262965 2014-03-10 00:53:37Z eadler $
-.\"
-.Dd February 28, 2009
-.Dt STRCPY 3
-.Os
-.Sh NAME
-.Nm stpcpy, stpncpy, strcpy , strncpy
-.Nd copy strings
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn stpcpy "char * restrict dst" "const char * restrict src"
-.Ft char *
-.Fn stpncpy "char * restrict dst" "const char * restrict src" "size_t len"
-.Ft char *
-.Fn strcpy "char * restrict dst" "const char * restrict src"
-.Ft char *
-.Fn strncpy "char * restrict dst" "const char * restrict src" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn stpcpy
-and
-.Fn strcpy
-functions
-copy the string
-.Fa src
-to
-.Fa dst
-(including the terminating
-.Ql \e0
-character.)
-.Pp
-The
-.Fn stpncpy
-and
-.Fn strncpy
-functions copy at most
-.Fa len
-characters from
-.Fa src
-into
-.Fa dst .
-If
-.Fa src
-is less than
-.Fa len
-characters long,
-the remainder of
-.Fa dst
-is filled with
-.Ql \e0
-characters.
-Otherwise,
-.Fa dst
-is
-.Em not
-terminated.
-.Sh RETURN VALUES
-The
-.Fn strcpy
-and
-.Fn strncpy
-functions
-return
-.Fa dst .
-The
-.Fn stpcpy
-and
-.Fn stpncpy
-functions return a pointer to the terminating
-.Ql \e0
-character of
-.Fa dst .
-If
-.Fn stpncpy
-does not terminate
-.Fa dst
-with a
-.Dv NUL
-character, it instead returns a pointer to
-.Li dst[n]
-(which does not necessarily refer to a valid memory location.)
-.Sh EXAMPLES
-The following sets
-.Va chararray
-to
-.Dq Li abc\e0\e0\e0 :
-.Bd -literal -offset indent
-char chararray[6];
-
-(void)strncpy(chararray, "abc", sizeof(chararray));
-.Ed
-.Pp
-The following sets
-.Va chararray
-to
-.Dq Li abcdef :
-.Bd -literal -offset indent
-char chararray[6];
-
-(void)strncpy(chararray, "abcdefgh", sizeof(chararray));
-.Ed
-.Pp
-Note that it does
-.Em not
-.Tn NUL
-terminate
-.Va chararray
-because the length of the source string is greater than or equal
-to the length argument.
-.Pp
-The following copies as many characters from
-.Va input
-to
-.Va buf
-as will fit and
-.Tn NUL
-terminates the result.
-Because
-.Fn strncpy
-does
-.Em not
-guarantee to
-.Tn NUL
-terminate the string itself, this must be done explicitly.
-.Bd -literal -offset indent
-char buf[1024];
-
-(void)strncpy(buf, input, sizeof(buf) - 1);
-buf[sizeof(buf) - 1] = '\e0';
-.Ed
-.Pp
-This could be better achieved using
-.Xr strlcpy 3 ,
-as shown in the following example:
-.Pp
-.Dl "(void)strlcpy(buf, input, sizeof(buf));"
-.Pp
-Note that because
-.Xr strlcpy 3
-is not defined in any standards, it should
-only be used when portability is not a concern.
-.Sh SEE ALSO
-.Xr bcopy 3 ,
-.Xr memccpy 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr strlcpy 3 ,
-.Xr wcscpy 3
-.Sh STANDARDS
-The
-.Fn strcpy
-and
-.Fn strncpy
-functions
-conform to
-.St -isoC .
-The
-.Fn stpcpy
-and
-.Fn stpncpy
-functions conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn stpcpy
-function first appeared in
-.Fx 4.4 ,
-and
-.Fn stpncpy
-was added in
-.Fx 8.0 .
-.Sh SECURITY CONSIDERATIONS
-The
-.Fn strcpy
-function is easily misused in a manner which enables malicious users
-to arbitrarily change a running program's functionality through a
-buffer overflow attack.
diff --git a/lib/libc_bsd/string/strcpy.c b/lib/libc_bsd/string/strcpy.c
deleted file mode 100644
index 7983bfa..0000000
--- a/lib/libc_bsd/string/strcpy.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strcpy.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-char *
-strcpy(char * __restrict to, const char * __restrict from)
-{
-	char *save = to;
-
-	for (; (*to = *from); ++from, ++to);
-	return(save);
-}
diff --git a/lib/libc_bsd/string/strcspn.c b/lib/libc_bsd/string/strcspn.c
deleted file mode 100644
index eb725f3..0000000
--- a/lib/libc_bsd/string/strcspn.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 2005 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strcspn.c 144545 2005-04-02 18:52:44Z das $");
-
-#include <sys/types.h>
-#include <limits.h>
-#include <string.h>
-
-#define	IDX(c)	((u_char)(c) / LONG_BIT)
-#define	BIT(c)	((u_long)1 << ((u_char)(c) % LONG_BIT))
-
-size_t
-strcspn(const char *s, const char *charset)
-{
-	/*
-	 * NB: idx and bit are temporaries whose use causes gcc 3.4.2 to
-	 * generate better code.  Without them, gcc gets a little confused.
-	 */
-	const char *s1;
-	u_long bit;
-	u_long tbl[(UCHAR_MAX + 1) / LONG_BIT];
-	int idx;
-
-	if(*s == '\0')
-		return (0);
-
-#if LONG_BIT == 64	/* always better to unroll on 64-bit architectures */
-	tbl[0] = 1;
-	tbl[3] = tbl[2] = tbl[1] = 0;
-#else
-	for (tbl[0] = idx = 1; idx < sizeof(tbl) / sizeof(tbl[0]); idx++)
-		tbl[idx] = 0;
-#endif
-	for (; *charset != '\0'; charset++) {
-		idx = IDX(*charset);
-		bit = BIT(*charset);
-		tbl[idx] |= bit;
-	}
-
-	for(s1 = s; ; s1++) {
-		idx = IDX(*s1);
-		bit = BIT(*s1);
-		if ((tbl[idx] & bit) != 0)
-			break;
-	}
-	return (s1 - s);
-}
diff --git a/lib/libc_bsd/string/strdup.3 b/lib/libc_bsd/string/strdup.3
deleted file mode 100644
index 2e5ac27..0000000
--- a/lib/libc_bsd/string/strdup.3
+++ /dev/null
@@ -1,84 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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. 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.
-.\"
-.\"     @(#)strdup.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strdup.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd December 5, 2008
-.Dt STRDUP 3
-.Os
-.Sh NAME
-.Nm strdup ,
-.Nm strndup
-.Nd save a copy of a string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strdup "const char *str"
-.Ft char *
-.Fn strndup "const char *str" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn strdup
-function
-allocates sufficient memory for a copy
-of the string
-.Fa str ,
-does the copy, and returns a pointer to it.
-The pointer may subsequently be used as an
-argument to the function
-.Xr free 3 .
-.Pp
-If insufficient memory is available, NULL is returned and
-.Va errno
-is set to
-.Er ENOMEM .
-.Pp
-The
-.Fn strndup
-function copies at most
-.Fa len
-characters from the string
-.Fa str
-always
-.Dv NUL
-terminating the copied string.
-.Sh SEE ALSO
-.Xr free 3 ,
-.Xr malloc 3 ,
-.Xr wcsdup 3
-.Sh HISTORY
-The
-.Fn strdup
-function first appeared in
-.Bx 4.4 .
-The
-.Fn strndup
-function was added in
-.Fx 7.2 .
diff --git a/lib/libc_bsd/string/strdup.c b/lib/libc_bsd/string/strdup.c
deleted file mode 100644
index da419bc..0000000
--- a/lib/libc_bsd/string/strdup.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strdup.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-strdup(const char *str)
-{
-	size_t len;
-	char *copy;
-
-	len = strlen(str) + 1;
-	if ((copy = malloc(len)) == NULL)
-		return (NULL);
-	memcpy(copy, str, len);
-	return (copy);
-}
diff --git a/lib/libc_bsd/string/strerror.3 b/lib/libc_bsd/string/strerror.3
deleted file mode 100644
index 84067ad..0000000
--- a/lib/libc_bsd/string/strerror.3
+++ /dev/null
@@ -1,190 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strerror.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strerror.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd April 5, 2011
-.Dt STRERROR 3
-.Os
-.Sh NAME
-.Nm perror ,
-.Nm strerror ,
-.Nm strerror_r ,
-.Nm sys_errlist ,
-.Nm sys_nerr
-.Nd system error messages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft void
-.Fn perror "const char *string"
-.Vt extern const char * const sys_errlist[] ;
-.Vt extern const int sys_nerr ;
-.In string.h
-.Ft "char *"
-.Fn strerror "int errnum"
-.Ft int
-.Fn strerror_r "int errnum" "char *strerrbuf" "size_t buflen"
-.Sh DESCRIPTION
-The
-.Fn strerror ,
-.Fn strerror_r
-and
-.Fn perror
-functions look up the error message string corresponding to an
-error number.
-.Pp
-The
-.Fn strerror
-function accepts an error number argument
-.Fa errnum
-and returns a pointer to the corresponding
-message string.
-.Pp
-The
-.Fn strerror_r
-function renders the same result into
-.Fa strerrbuf
-for a maximum of
-.Fa buflen
-characters and returns 0 upon success.
-.Pp
-The
-.Fn perror
-function finds the error message corresponding to the current
-value of the global variable
-.Va errno
-.Pq Xr intro 2
-and writes it, followed by a newline, to the
-standard error file descriptor.
-If the argument
-.Fa string
-is
-.Pf non- Dv NULL
-and does not point to the null character,
-this string is prepended to the message
-string and separated from it by
-a colon and space
-.Pq Dq Li ":\ " ;
-otherwise, only the error message string is printed.
-.Pp
-If the error number is not recognized, these functions return an error message
-string containing
-.Dq Li "Unknown error:\ "
-followed by the error number in decimal.
-The
-.Fn strerror
-and
-.Fn strerror_r
-functions return
-.Er EINVAL
-as a warning.
-Error numbers recognized by this implementation fall in
-the range 0 <
-.Fa errnum
-<
-.Fa sys_nerr .
-The number 0 is also recognized, although applications that take advantage of
-this are likely to use unspecified values of
-.Va errno .
-.Pp
-If insufficient storage is provided in
-.Fa strerrbuf
-(as specified in
-.Fa buflen )
-to contain the error string,
-.Fn strerror_r
-returns
-.Er ERANGE
-and
-.Fa strerrbuf
-will contain an error message that has been truncated and
-.Dv NUL
-terminated to fit the length specified by
-.Fa buflen .
-.Pp
-The message strings can be accessed directly using the external
-array
-.Va sys_errlist .
-The external value
-.Va sys_nerr
-contains a count of the messages in
-.Va sys_errlist .
-The use of these variables is deprecated;
-.Fn strerror
-or
-.Fn strerror_r
-should be used instead.
-.Sh SEE ALSO
-.Xr intro 2 ,
-.Xr err 3 ,
-.Xr psignal 3
-.Sh STANDARDS
-The
-.Fn perror
-and
-.Fn strerror
-functions conform to
-.St -isoC-99 .
-The
-.Fn strerror_r
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn strerror
-and
-.Fn perror
-functions first appeared in
-.Bx 4.4 .
-The
-.Fn strerror_r
-function was implemented in
-.Fx 4.4
-by
-.An Wes Peters Aq wes@FreeBSD.org .
-.Sh BUGS
-The
-.Fn strerror
-function returns its result in a static buffer which
-will be overwritten by subsequent calls.
-.Pp
-The return type for
-.Fn strerror
-is missing a type-qualifier; it should actually be
-.Vt const char * .
-.Pp
-Programs that use the deprecated
-.Va sys_errlist
-variable often fail to compile because they declare it
-inconsistently.
diff --git a/lib/libc_bsd/string/strerror.c b/lib/libc_bsd/string/strerror.c
deleted file mode 100644
index 2978bdb..0000000
--- a/lib/libc_bsd/string/strerror.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*-
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strerror.c 255108 2013-08-31 22:32:42Z jilles $");
-
-#if defined(NLS)
-#include <nl_types.h>
-#endif
-
-#include <limits.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "errlst.h"
-
-#define	UPREFIX		"Unknown error"
-
-/*
- * Define a buffer size big enough to describe a 64-bit signed integer
- * converted to ASCII decimal (19 bytes), with an optional leading sign
- * (1 byte); finally, we get the prefix, delimiter (": ") and a trailing
- * NUL from UPREFIX.
- */
-#define	EBUFSIZE	(20 + 2 + sizeof(UPREFIX))
-
-/*
- * Doing this by hand instead of linking with stdio(3) avoids bloat for
- * statically linked binaries.
- */
-static void
-errstr(int num, char *uprefix, char *buf, size_t len)
-{
-	char *t;
-	unsigned int uerr;
-	char tmp[EBUFSIZE];
-
-	t = tmp + sizeof(tmp);
-	*--t = '\0';
-	uerr = (num >= 0) ? num : -num;
-	do {
-		*--t = "0123456789"[uerr % 10];
-	} while (uerr /= 10);
-	if (num < 0)
-		*--t = '-';
-	*--t = ' ';
-	*--t = ':';
-	strlcpy(buf, uprefix, len);
-	strlcat(buf, t, len);
-}
-
-int
-strerror_r(int errnum, char *strerrbuf, size_t buflen)
-{
-	int retval = 0;
-#if defined(NLS)
-	int saved_errno = errno;
-	nl_catd catd;
-	catd = catopen("libc", NL_CAT_LOCALE);
-#endif
-
-	if (errnum < 0 || errnum >= __hidden_sys_nerr) {
-		errstr(errnum,
-#if defined(NLS)
-			catgets(catd, 1, 0xffff, UPREFIX),
-#else
-			UPREFIX,
-#endif
-			strerrbuf, buflen);
-		retval = EINVAL;
-	} else {
-		if (strlcpy(strerrbuf,
-#if defined(NLS)
-			catgets(catd, 1, errnum, __hidden_sys_errlist[errnum]),
-#else
-			__hidden_sys_errlist[errnum],
-#endif
-			buflen) >= buflen)
-		retval = ERANGE;
-	}
-
-#if defined(NLS)
-	catclose(catd);
-	errno = saved_errno;
-#endif
-
-	return (retval);
-}
-
-char *
-strerror(int num)
-{
-	static char ebuf[NL_TEXTMAX];
-
-	if (strerror_r(num, ebuf, sizeof(ebuf)) != 0)
-		errno = EINVAL;
-	return (ebuf);
-}
diff --git a/lib/libc_bsd/string/string.3 b/lib/libc_bsd/string/string.3
deleted file mode 100644
index 320041b..0000000
--- a/lib/libc_bsd/string/string.3
+++ /dev/null
@@ -1,157 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\" 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. 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.
-.\"
-.\"     @(#)string.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/string.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd December 11, 1993
-.Dt STRING 3
-.Os
-.Sh NAME
-.Nm stpcpy ,
-.Nm strcat ,
-.Nm strncat ,
-.Nm strchr ,
-.Nm strrchr ,
-.Nm strcmp ,
-.Nm strncmp ,
-.Nm strcasecmp ,
-.Nm strncasecmp ,
-.Nm strcpy ,
-.Nm strncpy ,
-.Nm strerror ,
-.Nm strlen ,
-.Nm strpbrk ,
-.Nm strsep ,
-.Nm strspn ,
-.Nm strcspn ,
-.Nm strstr ,
-.Nm strtok ,
-.Nm index ,
-.Nm rindex
-.Nd string specific functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn stpcpy "char *dst" "const char *src"
-.Ft char *
-.Fn strcat "char *s" "const char * append"
-.Ft char *
-.Fn strncat "char *s" "const char *append" "size_t count"
-.Ft char *
-.Fn strchr "const char *s" "int c"
-.Ft char *
-.Fn strrchr "const char *s" "int c"
-.Ft int
-.Fn strcmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncmp "const char *s1" "const char *s2" "size_t count"
-.Ft int
-.Fn strcasecmp "const char *s1" "const char *s2"
-.Ft int
-.Fn strncasecmp "const char *s1" "const char *s2" "size_t count"
-.Ft char *
-.Fn strcpy "char *dst" "const char *src"
-.Ft char *
-.Fn strncpy "char *dst" "const char *src" "size_t count"
-.Ft char *
-.Fn strerror "int errno"
-.Ft size_t
-.Fn strlen "const char *s"
-.Ft char *
-.Fn strpbrk "const char *s" "const char *charset"
-.Ft char *
-.Fn strsep "char **stringp" "const char *delim"
-.Ft size_t
-.Fn strspn "const char *s" "const char *charset"
-.Ft size_t
-.Fn strcspn "const char *s" "const char *charset"
-.Ft char *
-.Fn strstr "const char *big" "const char *little"
-.Ft char *
-.Fn strtok "char *s" "const char *delim"
-.Ft char *
-.Fn index "const char *s" "int c"
-.Ft char *
-.Fn rindex "const char *s" "int c"
-.Sh DESCRIPTION
-The string
-functions manipulate strings terminated by a
-null byte.
-.Pp
-See the specific manual pages for more information.
-For manipulating variable length generic objects as byte
-strings (without the null byte check), see
-.Xr bstring 3 .
-.Pp
-Except as noted in their specific manual pages,
-the string functions do not test the destination
-for size limitations.
-.Sh SEE ALSO
-.Xr bstring 3 ,
-.Xr index 3 ,
-.Xr rindex 3 ,
-.Xr stpcpy 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcat 3 ,
-.Xr strchr 3 ,
-.Xr strcmp 3 ,
-.Xr strcpy 3 ,
-.Xr strcspn 3 ,
-.Xr strerror 3 ,
-.Xr strlen 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh STANDARDS
-The
-.Fn strcat ,
-.Fn strncat ,
-.Fn strchr ,
-.Fn strrchr ,
-.Fn strcmp ,
-.Fn strncmp ,
-.Fn strcpy ,
-.Fn strncpy ,
-.Fn strerror ,
-.Fn strlen ,
-.Fn strpbrk ,
-.Fn strspn ,
-.Fn strcspn ,
-.Fn strstr ,
-and
-.Fn strtok
-functions
-conform to
-.St -isoC .
diff --git a/lib/libc_bsd/string/strlcat.c b/lib/libc_bsd/string/strlcat.c
deleted file mode 100644
index 9da9bc3..0000000
--- a/lib/libc_bsd/string/strlcat.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strlcat.c 189133 2009-02-28 05:15:02Z das $");
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-strlcat(char * __restrict dst, const char * __restrict src, size_t siz)
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-	size_t dlen;
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (n-- != 0 && *d != '\0')
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + strlen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
-	}
-	*d = '\0';
-
-	return(dlen + (s - src));	/* count does not include NUL */
-}
diff --git a/lib/libc_bsd/string/strlcpy.3 b/lib/libc_bsd/string/strlcpy.3
deleted file mode 100644
index a74a179..0000000
--- a/lib/libc_bsd/string/strlcpy.3
+++ /dev/null
@@ -1,205 +0,0 @@
-.\" $OpenBSD: strlcpy.3,v 1.19 2007/05/31 19:19:32 jmc Exp $
-.\"
-.\" Copyright (c) 1998, 2000 Todd C. Miller <Todd.Miller@courtesan.com>
-.\"
-.\" Permission to use, copy, modify, and distribute this software for any
-.\" purpose with or without fee is hereby granted, provided that the above
-.\" copyright notice and this permission notice appear in all copies.
-.\"
-.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``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 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: releng/10.2/lib/libc/string/strlcpy.3 235286 2012-05-11 20:06:46Z gjb $
-.\"
-.Dd June 22, 1998
-.Dt STRLCPY 3
-.Os
-.Sh NAME
-.Nm strlcpy ,
-.Nm strlcat
-.Nd size-bounded string copying and concatenation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strlcpy "char * restrict dst" "const char * restrict src" "size_t size"
-.Ft size_t
-.Fn strlcat "char * restrict dst" "const char * restrict src" "size_t size"
-.Sh DESCRIPTION
-The
-.Fn strlcpy
-and
-.Fn strlcat
-functions copy and concatenate strings respectively.
-They are designed
-to be safer, more consistent, and less error prone replacements for
-.Xr strncpy 3
-and
-.Xr strncat 3 .
-Unlike those functions,
-.Fn strlcpy
-and
-.Fn strlcat
-take the full size of the buffer (not just the length) and guarantee to
-NUL-terminate the result (as long as
-.Fa size
-is larger than 0 or, in the case of
-.Fn strlcat ,
-as long as there is at least one byte free in
-.Fa dst ) .
-Note that a byte for the NUL should be included in
-.Fa size .
-Also note that
-.Fn strlcpy
-and
-.Fn strlcat
-only operate on true
-.Dq C
-strings.
-This means that for
-.Fn strlcpy
-.Fa src
-must be NUL-terminated and for
-.Fn strlcat
-both
-.Fa src
-and
-.Fa dst
-must be NUL-terminated.
-.Pp
-The
-.Fn strlcpy
-function copies up to
-.Fa size
-- 1 characters from the NUL-terminated string
-.Fa src
-to
-.Fa dst ,
-NUL-terminating the result.
-.Pp
-The
-.Fn strlcat
-function appends the NUL-terminated string
-.Fa src
-to the end of
-.Fa dst .
-It will append at most
-.Fa size
-- strlen(dst) - 1 bytes, NUL-terminating the result.
-.Sh RETURN VALUES
-The
-.Fn strlcpy
-and
-.Fn strlcat
-functions return the total length of the string they tried to
-create.
-For
-.Fn strlcpy
-that means the length of
-.Fa src .
-For
-.Fn strlcat
-that means the initial length of
-.Fa dst
-plus
-the length of
-.Fa src .
-While this may seem somewhat confusing, it was done to make
-truncation detection simple.
-.Pp
-Note however, that if
-.Fn strlcat
-traverses
-.Fa size
-characters without finding a NUL, the length of the string is considered
-to be
-.Fa size
-and the destination string will not be NUL-terminated (since there was
-no space for the NUL).
-This keeps
-.Fn strlcat
-from running off the end of a string.
-In practice this should not happen (as it means that either
-.Fa size
-is incorrect or that
-.Fa dst
-is not a proper
-.Dq C
-string).
-The check exists to prevent potential security problems in incorrect code.
-.Sh EXAMPLES
-The following code fragment illustrates the simple case:
-.Bd -literal -offset indent
-char *s, *p, buf[BUFSIZ];
-
-\&...
-
-(void)strlcpy(buf, s, sizeof(buf));
-(void)strlcat(buf, p, sizeof(buf));
-.Ed
-.Pp
-To detect truncation, perhaps while building a pathname, something
-like the following might be used:
-.Bd -literal -offset indent
-char *dir, *file, pname[MAXPATHLEN];
-
-\&...
-
-if (strlcpy(pname, dir, sizeof(pname)) >= sizeof(pname))
-	goto toolong;
-if (strlcat(pname, file, sizeof(pname)) >= sizeof(pname))
-	goto toolong;
-.Ed
-.Pp
-Since it is known how many characters were copied the first time, things
-can be sped up a bit by using a copy instead of an append.
-.Bd -literal -offset indent
-char *dir, *file, pname[MAXPATHLEN];
-size_t n;
-
-\&...
-
-n = strlcpy(pname, dir, sizeof(pname));
-if (n >= sizeof(pname))
-	goto toolong;
-if (strlcpy(pname + n, file, sizeof(pname) - n) >= sizeof(pname) - n)
-	goto toolong;
-.Ed
-.Pp
-However, one may question the validity of such optimizations, as they
-defeat the whole purpose of
-.Fn strlcpy
-and
-.Fn strlcat .
-As a matter of fact, the first version of this manual page got it wrong.
-.Sh SEE ALSO
-.Xr snprintf 3 ,
-.Xr strncat 3 ,
-.Xr strncpy 3 ,
-.Xr wcslcpy 3
-.Sh HISTORY
-The
-.Fn strlcpy
-and
-.Fn strlcat
-functions first appeared in
-.Ox 2.4 ,
-and made their appearance in
-.Fx 3.3 .
diff --git a/lib/libc_bsd/string/strlcpy.c b/lib/libc_bsd/string/strlcpy.c
deleted file mode 100644
index 7056aba..0000000
--- a/lib/libc_bsd/string/strlcpy.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strlcpy.c 189133 2009-02-28 05:15:02Z das $");
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-strlcpy(char * __restrict dst, const char * __restrict src, size_t siz)
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0) {
-		while (--n != 0) {
-			if ((*d++ = *s++) == '\0')
-				break;
-		}
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
diff --git a/lib/libc_bsd/string/strlen.3 b/lib/libc_bsd/string/strlen.3
deleted file mode 100644
index 05058b9..0000000
--- a/lib/libc_bsd/string/strlen.3
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strlen.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strlen.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd February 28, 2009
-.Dt STRLEN 3
-.Os
-.Sh NAME
-.Nm strlen, strnlen
-.Nd find length of string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strlen "const char *s"
-.Ft size_t
-.Fn strnlen "const char *s" "size_t maxlen"
-.Sh DESCRIPTION
-The
-.Fn strlen
-function
-computes the length of the string
-.Fa s .
-The
-.Fn strnlen
-function attempts to compute the length of
-.Fa s ,
-but never scans beyond the first
-.Fa maxlen
-bytes of
-.Fa s .
-.Sh RETURN VALUES
-The
-.Fn strlen
-function
-returns
-the number of characters that precede the
-terminating
-.Dv NUL
-character.
-The
-.Fn strnlen
-function returns either the same result as
-.Fn strlen
-or
-.Fa maxlen ,
-whichever is smaller.
-.Sh SEE ALSO
-.Xr string 3 ,
-.Xr wcslen 3 ,
-.Xr wcswidth 3
-.Sh STANDARDS
-The
-.Fn strlen
-function
-conforms to
-.St -isoC .
-The
-.Fn strnlen
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/string/strlen.c b/lib/libc_bsd/string/strlen.c
deleted file mode 100644
index 2d69bb2..0000000
--- a/lib/libc_bsd/string/strlen.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 2009, 2010 Xin LI <delphij@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strlen.c 205108 2010-03-13 00:15:06Z delphij $");
-
-#include <sys/limits.h>
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Portable strlen() for 32-bit and 64-bit systems.
- *
- * Rationale: it is generally much more efficient to do word length
- * operations and avoid branches on modern computer systems, as
- * compared to byte-length operations with a lot of branches.
- *
- * The expression:
- *
- *	((x - 0x01....01) & ~x & 0x80....80)
- *
- * would evaluate to a non-zero value iff any of the bytes in the
- * original word is zero.
- *
- * On multi-issue processors, we can divide the above expression into:
- *	a)  (x - 0x01....01)
- *	b) (~x & 0x80....80)
- *	c) a & b
- *
- * Where, a) and b) can be partially computed in parallel.
- *
- * The algorithm above is found on "Hacker's Delight" by
- * Henry S. Warren, Jr.
- */
-
-/* Magic numbers for the algorithm */
-#if LONG_BIT == 32
-static const unsigned long mask01 = 0x01010101;
-static const unsigned long mask80 = 0x80808080;
-#elif LONG_BIT == 64
-static const unsigned long mask01 = 0x0101010101010101;
-static const unsigned long mask80 = 0x8080808080808080;
-#else
-#error Unsupported word size
-#endif
-
-#define	LONGPTR_MASK (sizeof(long) - 1)
-
-/*
- * Helper macro to return string length if we caught the zero
- * byte.
- */
-#define testbyte(x)				\
-	do {					\
-		if (p[x] == '\0')		\
-		    return (p - str + x);	\
-	} while (0)
-
-size_t
-strlen(const char *str)
-{
-	const char *p;
-	const unsigned long *lp;
-	long va, vb;
-
-	/*
-	 * Before trying the hard (unaligned byte-by-byte access) way
-	 * to figure out whether there is a nul character, try to see
-	 * if there is a nul character is within this accessible word
-	 * first.
-	 *
-	 * p and (p & ~LONGPTR_MASK) must be equally accessible since
-	 * they always fall in the same memory page, as long as page
-	 * boundaries is integral multiple of word size.
-	 */
-	lp = (const unsigned long *)((uintptr_t)str & ~LONGPTR_MASK);
-	va = (*lp - mask01);
-	vb = ((~*lp) & mask80);
-	lp++;
-	if (va & vb)
-		/* Check if we have \0 in the first part */
-		for (p = str; p < (const char *)lp; p++)
-			if (*p == '\0')
-				return (p - str);
-
-	/* Scan the rest of the string using word sized operation */
-	for (; ; lp++) {
-		va = (*lp - mask01);
-		vb = ((~*lp) & mask80);
-		if (va & vb) {
-			p = (const char *)(lp);
-			testbyte(0);
-			testbyte(1);
-			testbyte(2);
-			testbyte(3);
-#if (LONG_BIT >= 64)
-			testbyte(4);
-			testbyte(5);
-			testbyte(6);
-			testbyte(7);
-#endif
-		}
-	}
-
-	/* NOTREACHED */
-	return (0);
-}
diff --git a/lib/libc_bsd/string/strmode.3 b/lib/libc_bsd/string/strmode.3
deleted file mode 100644
index 76d2aac..0000000
--- a/lib/libc_bsd/string/strmode.3
+++ /dev/null
@@ -1,142 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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. 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.
-.\"
-.\"     @(#)strmode.3	8.3 (Berkeley) 7/28/94
-.\" $FreeBSD: releng/10.2/lib/libc/string/strmode.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd July 28, 1994
-.Dt STRMODE 3
-.Os
-.Sh NAME
-.Nm strmode
-.Nd convert inode status information into a symbolic string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft void
-.Fn strmode "mode_t mode" "char *bp"
-.Sh DESCRIPTION
-The
-.Fn strmode
-function
-converts a file
-.Fa mode
-(the type and permission information associated with an inode, see
-.Xr stat 2 )
-into a symbolic string which is stored in the location referenced by
-.Fa bp .
-This stored string is eleven characters in length plus a trailing
-.Dv NUL .
-.Pp
-The first character is the inode type, and will be one of the following:
-.Pp
-.Bl -tag -width flag -offset indent -compact
-.It \-
-regular file
-.It b
-block special
-.It c
-character special
-.It d
-directory
-.It l
-symbolic link
-.It p
-fifo
-.It s
-socket
-.It w
-whiteout
-.It ?
-unknown inode type
-.El
-.Pp
-The next nine characters encode three sets of permissions, in three
-characters each.
-The first three characters are the permissions for the owner of the
-file, the second three for the group the file belongs to, and the
-third for the ``other'', or default, set of users.
-.Pp
-Permission checking is done as specifically as possible.
-If read permission is denied to the owner of a file in the first set
-of permissions, the owner of the file will not be able to read the file.
-This is true even if the owner is in the file's group and the group
-permissions allow reading or the ``other'' permissions allow reading.
-.Pp
-If the first character of the three character set is an ``r'', the file is
-readable for that set of users; if a dash ``\-'', it is not readable.
-.Pp
-If the second character of the three character set is a ``w'', the file is
-writable for that set of users; if a dash ``\-'', it is not writable.
-.Pp
-The third character is the first of the following characters that apply:
-.Bl -tag -width xxxx
-.It S
-If the character is part of the owner permissions and the file is not
-executable or the directory is not searchable by the owner, and the
-set-user-id bit is set.
-.It S
-If the character is part of the group permissions and the file is not
-executable or the directory is not searchable by the group, and the
-set-group-id bit is set.
-.It T
-If the character is part of the other permissions and the file is not
-executable or the directory is not searchable by others, and the ``sticky''
-.Pq Dv S_ISVTX
-bit is set.
-.It s
-If the character is part of the owner permissions and the file is
-executable or the directory searchable by the owner, and the set-user-id
-bit is set.
-.It s
-If the character is part of the group permissions and the file is
-executable or the directory searchable by the group, and the set-group-id
-bit is set.
-.It t
-If the character is part of the other permissions and the file is
-executable or the directory searchable by others, and the ``sticky''
-.Pq Dv S_ISVTX
-bit is set.
-.It x
-The file is executable or the directory is searchable.
-.It \-
-None of the above apply.
-.El
-.Pp
-The last character will always be a space.
-.Sh SEE ALSO
-.Xr chmod 1 ,
-.Xr find 1 ,
-.Xr stat 2 ,
-.Xr getmode 3 ,
-.Xr setmode 3
-.Sh HISTORY
-The
-.Fn strmode
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/string/strmode.c b/lib/libc_bsd/string/strmode.c
deleted file mode 100644
index 665ad49..0000000
--- a/lib/libc_bsd/string/strmode.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strmode.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-
-void
-strmode(/* mode_t */ int mode, char *p)
-{
-	 /* print type */
-	switch (mode & S_IFMT) {
-	case S_IFDIR:			/* directory */
-		*p++ = 'd';
-		break;
-	case S_IFCHR:			/* character special */
-		*p++ = 'c';
-		break;
-	case S_IFBLK:			/* block special */
-		*p++ = 'b';
-		break;
-	case S_IFREG:			/* regular */
-		*p++ = '-';
-		break;
-	case S_IFLNK:			/* symbolic link */
-		*p++ = 'l';
-		break;
-	case S_IFSOCK:			/* socket */
-		*p++ = 's';
-		break;
-#ifdef S_IFIFO
-	case S_IFIFO:			/* fifo */
-		*p++ = 'p';
-		break;
-#endif
-#ifdef S_IFWHT
-	case S_IFWHT:			/* whiteout */
-		*p++ = 'w';
-		break;
-#endif
-	default:			/* unknown */
-		*p++ = '?';
-		break;
-	}
-	/* usr */
-	if (mode & S_IRUSR)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWUSR)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXUSR | S_ISUID)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXUSR:
-		*p++ = 'x';
-		break;
-	case S_ISUID:
-		*p++ = 'S';
-		break;
-	case S_IXUSR | S_ISUID:
-		*p++ = 's';
-		break;
-	}
-	/* group */
-	if (mode & S_IRGRP)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWGRP)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXGRP | S_ISGID)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXGRP:
-		*p++ = 'x';
-		break;
-	case S_ISGID:
-		*p++ = 'S';
-		break;
-	case S_IXGRP | S_ISGID:
-		*p++ = 's';
-		break;
-	}
-	/* other */
-	if (mode & S_IROTH)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWOTH)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXOTH | S_ISVTX)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXOTH:
-		*p++ = 'x';
-		break;
-	case S_ISVTX:
-		*p++ = 'T';
-		break;
-	case S_IXOTH | S_ISVTX:
-		*p++ = 't';
-		break;
-	}
-	*p++ = ' ';
-	*p = '\0';
-}
diff --git a/lib/libc_bsd/string/strncat.c b/lib/libc_bsd/string/strncat.c
deleted file mode 100644
index efd32b9..0000000
--- a/lib/libc_bsd/string/strncat.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncat.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strncat.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-/*
- * Concatenate src on the end of dst.  At most strlen(dst)+n+1 bytes
- * are written at dst (at most n+1 bytes being appended).  Return dst.
- */
-char *
-strncat(char * __restrict dst, const char * __restrict src, size_t n)
-{
-	if (n != 0) {
-		char *d = dst;
-		const char *s = src;
-
-		while (*d != 0)
-			d++;
-		do {
-			if ((*d = *s++) == 0)
-				break;
-			d++;
-		} while (--n != 0);
-		*d = 0;
-	}
-	return (dst);
-}
diff --git a/lib/libc_bsd/string/strncmp.c b/lib/libc_bsd/string/strncmp.c
deleted file mode 100644
index d050f57..0000000
--- a/lib/libc_bsd/string/strncmp.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 1989, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strncmp.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-int
-strncmp(const char *s1, const char *s2, size_t n)
-{
-
-	if (n == 0)
-		return (0);
-	do {
-		if (*s1 != *s2++)
-			return (*(const unsigned char *)s1 -
-				*(const unsigned char *)(s2 - 1));
-		if (*s1++ == '\0')
-			break;
-	} while (--n != 0);
-	return (0);
-}
diff --git a/lib/libc_bsd/string/strncpy.c b/lib/libc_bsd/string/strncpy.c
deleted file mode 100644
index 999f487..0000000
--- a/lib/libc_bsd/string/strncpy.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strncpy.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-/*
- * Copy src to dst, truncating or null-padding to always copy n bytes.
- * Return dst.
- */
-char *
-strncpy(char * __restrict dst, const char * __restrict src, size_t n)
-{
-	if (n != 0) {
-		char *d = dst;
-		const char *s = src;
-
-		do {
-			if ((*d++ = *s++) == '\0') {
-				/* NUL pad the remaining n-1 bytes */
-				while (--n != 0)
-					*d++ = '\0';
-				break;
-			}
-		} while (--n != 0);
-	}
-	return (dst);
-}
diff --git a/lib/libc_bsd/string/strndup.c b/lib/libc_bsd/string/strndup.c
deleted file mode 100644
index c214497..0000000
--- a/lib/libc_bsd/string/strndup.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*      $NetBSD: strndup.c,v 1.3 2007/01/14 23:41:24 cbiere Exp $       */
-
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strndup.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-strndup(const char *str, size_t n)
-{
-	size_t len;
-	char *copy;
-
-	len = strnlen(str, n);
-	if ((copy = malloc(len + 1)) == NULL)
-		return (NULL);
-	memcpy(copy, str, len);
-	copy[len] = '\0';
-	return (copy);
-}
diff --git a/lib/libc_bsd/string/strnlen.c b/lib/libc_bsd/string/strnlen.c
deleted file mode 100644
index 4a8fbf4..0000000
--- a/lib/libc_bsd/string/strnlen.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strnlen.c 189136 2009-02-28 06:00:58Z das $");
-
-#include <string.h>
-
-size_t
-strnlen(const char *s, size_t maxlen)
-{
-	size_t len;
-
-	for (len = 0; len < maxlen; len++, s++) {
-		if (!*s)
-			break;
-	}
-	return (len);
-}
diff --git a/lib/libc_bsd/string/strnstr.c b/lib/libc_bsd/string/strnstr.c
deleted file mode 100644
index af6c397..0000000
--- a/lib/libc_bsd/string/strnstr.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strnstr.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s, where the search is limited to the
- * first slen characters of s.
- */
-char *
-strnstr(const char *s, const char *find, size_t slen)
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != '\0') {
-		len = strlen(find);
-		do {
-			do {
-				if (slen-- < 1 || (sc = *s++) == '\0')
-					return (NULL);
-			} while (sc != c);
-			if (len > slen)
-				return (NULL);
-		} while (strncmp(s, find, len) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
diff --git a/lib/libc_bsd/string/strpbrk.3 b/lib/libc_bsd/string/strpbrk.3
deleted file mode 100644
index 4758412..0000000
--- a/lib/libc_bsd/string/strpbrk.3
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strpbrk.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strpbrk.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt STRPBRK 3
-.Os
-.Sh NAME
-.Nm strpbrk
-.Nd locate multiple characters in string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strpbrk "const char *s" "const char *charset"
-.Sh DESCRIPTION
-The
-.Fn strpbrk
-function
-locates in the null-terminated string
-.Fa s
-the first occurrence of any character in the string
-.Fa charset
-and returns a pointer to this character.
-If no characters from
-.Fa charset
-occur anywhere in
-.Fa s
-.Fn strpbrk
-returns NULL.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wcspbrk 3
-.Sh STANDARDS
-The
-.Fn strpbrk
-function
-conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/string/strpbrk.c b/lib/libc_bsd/string/strpbrk.c
deleted file mode 100644
index 584466a..0000000
--- a/lib/libc_bsd/string/strpbrk.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1985, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strpbrk.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strpbrk.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence in s1 of a character in s2 (excluding NUL).
- */
-char *
-strpbrk(const char *s1, const char *s2)
-{
-	const char *scanp;
-	int c, sc;
-
-	while ((c = *s1++) != 0) {
-		for (scanp = s2; (sc = *scanp++) != '\0';)
-			if (sc == c)
-				return ((char *)(s1 - 1));
-	}
-	return (NULL);
-}
diff --git a/lib/libc_bsd/string/strrchr.c b/lib/libc_bsd/string/strrchr.c
deleted file mode 100644
index 48f83b7..0000000
--- a/lib/libc_bsd/string/strrchr.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rindex.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strrchr.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stddef.h>
-#include <string.h>
-
-char *
-strrchr(const char *p, int ch)
-{
-	char *save;
-	char c;
-
-	c = ch;
-	for (save = NULL;; ++p) {
-		if (*p == c)
-			save = (char *)p;
-		if (*p == '\0')
-			return (save);
-	}
-	/* NOTREACHED */
-}
-
-__weak_reference(strrchr, rindex);
diff --git a/lib/libc_bsd/string/strsep.3 b/lib/libc_bsd/string/strsep.3
deleted file mode 100644
index ebbadcd..0000000
--- a/lib/libc_bsd/string/strsep.3
+++ /dev/null
@@ -1,135 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek.
-.\"
-.\" 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. 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.
-.\"
-.\"	@(#)strsep.3	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strsep.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd December 5, 2008
-.Dt STRSEP 3
-.Os
-.Sh NAME
-.Nm strsep
-.Nd separate strings
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strsep "char **stringp" "const char *delim"
-.Sh DESCRIPTION
-The
-.Fn strsep
-function locates, in the string referenced by
-.Fa *stringp ,
-the first occurrence of any character in the string
-.Fa delim
-(or the terminating
-.Ql \e0
-character) and replaces it with a
-.Ql \e0 .
-The location of the next character after the delimiter character
-(or NULL, if the end of the string was reached) is stored in
-.Fa *stringp .
-The original value of
-.Fa *stringp
-is returned.
-.Pp
-An
-.Dq empty
-field (i.e., a character in the string
-.Fa delim
-occurs as the first character of
-.Fa *stringp )
-can be detected by comparing the location referenced by the returned pointer
-to
-.Ql \e0 .
-.Pp
-If
-.Fa *stringp
-is initially
-.Dv NULL ,
-.Fn strsep
-returns
-.Dv NULL .
-.Sh EXAMPLES
-The following uses
-.Fn strsep
-to parse a string, and prints each token in separate line:
-.Bd -literal -offset indent
-char *token, *string, *tofree;
-
-tofree = string = strdup("abc,def,ghi");
-assert(string != NULL);
-
-while ((token = strsep(&string, ",")) != NULL)
-	printf("%s\en", token);
-
-free(tofree);
-.Ed
-.Pp
-The following uses
-.Fn strsep
-to parse a string, containing tokens delimited by white space, into an
-argument vector:
-.Bd -literal -offset indent
-char **ap, *argv[10], *inputstring;
-
-for (ap = argv; (*ap = strsep(&inputstring, " \et")) != NULL;)
-	if (**ap != '\e0')
-		if (++ap >= &argv[10])
-			break;
-.Ed
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3
-.Sh HISTORY
-The
-.Fn strsep
-function
-is intended as a replacement for the
-.Fn strtok
-function.
-While the
-.Fn strtok
-function should be preferred for portability reasons (it conforms to
-.St -isoC )
-it is unable to handle empty fields, i.e., detect fields delimited by
-two adjacent delimiter characters, or to be used for more than a single
-string at a time.
-The
-.Fn strsep
-function first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/string/strsep.c b/lib/libc_bsd/string/strsep.c
deleted file mode 100644
index 9f9eb1e..0000000
--- a/lib/libc_bsd/string/strsep.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1990, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strsep.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- */
-char *
-strsep(char **stringp, const char *delim)
-{
-	char *s;
-	const char *spanp;
-	int c, sc;
-	char *tok;
-
-	if ((s = *stringp) == NULL)
-		return (NULL);
-	for (tok = s;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/string/strsignal.c b/lib/libc_bsd/string/strsignal.c
deleted file mode 100644
index c1ca15a..0000000
--- a/lib/libc_bsd/string/strsignal.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strsignal.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include "namespace.h"
-#if defined(NLS)
-#include <nl_types.h>
-#endif
-#include <limits.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include "reentrant.h"
-#include "un-namespace.h"
-
-#define	UPREFIX		"Unknown signal"
-
-static char		sig_ebuf[NL_TEXTMAX];
-static char		sig_ebuf_err[NL_TEXTMAX];
-static once_t		sig_init_once = ONCE_INITIALIZER;
-static thread_key_t	sig_key;
-static int		sig_keycreated = 0;
-
-static void
-sig_keycreate(void)
-{
-	sig_keycreated = (thr_keycreate(&sig_key, free) == 0);
-}
-
-static char *
-sig_tlsalloc(void)
-{
-	char *ebuf = NULL;
-
-	if (thr_main() != 0)
-		ebuf = sig_ebuf;
-	else {
-		if (thr_once(&sig_init_once, sig_keycreate) != 0 ||
-		    !sig_keycreated)
-			goto thr_err;
-		if ((ebuf = thr_getspecific(sig_key)) == NULL) {
-			if ((ebuf = malloc(sizeof(sig_ebuf))) == NULL)
-				goto thr_err;
-			if (thr_setspecific(sig_key, ebuf) != 0) {
-				free(ebuf);
-				ebuf = NULL;
-				goto thr_err;
-			}
-		}
-	}
-thr_err:
-	if (ebuf == NULL)
-		ebuf = sig_ebuf_err;
-	return (ebuf);
-}
-
-/* XXX: negative 'num' ? (REGR) */
-char *
-strsignal(int num)
-{
-	char *ebuf;
-	char tmp[20];
-	size_t n;
-	int signum;
-	char *t, *p;
-
-#if defined(NLS)
-	int saved_errno = errno;
-	nl_catd catd;
-	catd = catopen("libc", NL_CAT_LOCALE);
-#endif
-
-	ebuf = sig_tlsalloc();
-
-	if (num > 0 && num < sys_nsig) {
-		n = strlcpy(ebuf,
-#if defined(NLS)
-			catgets(catd, 2, num, sys_siglist[num]),
-#else
-			sys_siglist[num],
-#endif
-			sizeof(sig_ebuf));
-	} else {
-		n = strlcpy(ebuf,
-#if defined(NLS)
-			catgets(catd, 2, 0xffff, UPREFIX),
-#else
-			UPREFIX,
-#endif
-			sizeof(sig_ebuf));
-
-		signum = num;
-		if (num < 0)
-			signum = -signum;
-
-		t = tmp;
-		do {
-			*t++ = "0123456789"[signum % 10];
-		} while (signum /= 10);
-		if (num < 0)
-			*t++ = '-';
-
-		p = (ebuf + n);
-		*p++ = ':';
-		*p++ = ' ';
-
-		for (;;) {
-			*p++ = *--t;
-			if (t <= tmp)
-				break;
-		}
-		*p = '\0';
-	}
-
-#if defined(NLS)
-	catclose(catd);
-	errno = saved_errno;
-#endif
-	return (ebuf);
-}
diff --git a/lib/libc_bsd/string/strspn.3 b/lib/libc_bsd/string/strspn.3
deleted file mode 100644
index 4f4fa48..0000000
--- a/lib/libc_bsd/string/strspn.3
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strspn.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strspn.3 281570 2015-04-16 00:24:21Z allanjude $
-.\"
-.Dd May 24, 2014
-.Dt STRSPN 3
-.Os
-.Sh NAME
-.Nm strspn ,
-.Nm strcspn
-.Nd span a string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strspn "const char *s" "const char *charset"
-.Ft size_t
-.Fn strcspn "const char *s" "const char *charset"
-.Sh DESCRIPTION
-The
-.Fn strspn
-function
-spans the initial part of the null-terminated string
-.Fa s
-as long as the characters from
-.Fa s
-occur in the null-terminated string
-.Fa charset .
-In other words, it computes the string array index
-of the first character of
-.Fa s
-which is not in
-.Fa charset ,
-else the index of the first null character.
-.Pp
-The
-.Fn strcspn
-function
-spans the initial part of the null-terminated string
-.Fa s
-as long as the characters from
-.Fa s
-.Sy do not 
-occur in the null-terminated string
-.Fa charset
-.Po it spans the
-.Sy complement
-of
-.Fa charset
-.Pc .
-In other words, it computes the string array index
-of the first character of
-.Fa s
-which is also in
-.Fa charset ,
-else the index of the first null character.
-.Sh RETURN VALUES
-The
-.Fn strspn
-and
-.Fn strcspn
-functions
-return the number of characters spanned.
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strstr 3 ,
-.Xr strtok 3 ,
-.Xr wcsspn 3
-.Sh STANDARDS
-The
-.Fn strspn
-and
-.Fn strcspn
-functions
-conform to
-.St -isoC .
diff --git a/lib/libc_bsd/string/strspn.c b/lib/libc_bsd/string/strspn.c
deleted file mode 100644
index 0dac669..0000000
--- a/lib/libc_bsd/string/strspn.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*-
- * Copyright (c) 2005 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strspn.c 144545 2005-04-02 18:52:44Z das $");
-
-#include <sys/types.h>
-#include <limits.h>
-#include <string.h>
-
-#define	IDX(c)	((u_char)(c) / LONG_BIT)
-#define	BIT(c)	((u_long)1 << ((u_char)(c) % LONG_BIT))
-
-size_t
-strspn(const char *s, const char *charset)
-{
-	/*
-	 * NB: idx and bit are temporaries whose use causes gcc 3.4.2 to
-	 * generate better code.  Without them, gcc gets a little confused.
-	 */
-	const char *s1;
-	u_long bit;
-	u_long tbl[(UCHAR_MAX + 1) / LONG_BIT];
-	int idx;
-
-	if(*s == '\0')
-		return (0);
-
-#if LONG_BIT == 64	/* always better to unroll on 64-bit architectures */
-	tbl[3] = tbl[2] = tbl[1] = tbl[0] = 0;
-#else
-	for (idx = 0; idx < sizeof(tbl) / sizeof(tbl[0]); idx++)
-		tbl[idx] = 0;
-#endif
-	for (; *charset != '\0'; charset++) {
-		idx = IDX(*charset);
-		bit = BIT(*charset);
-		tbl[idx] |= bit;
-	}
-
-	for(s1 = s; ; s1++) {
-		idx = IDX(*s1);
-		bit = BIT(*s1);
-		if ((tbl[idx] & bit) == 0)
-			break;
-	}
-	return (s1 - s);
-}
diff --git a/lib/libc_bsd/string/strstr.3 b/lib/libc_bsd/string/strstr.3
deleted file mode 100644
index 3f161c0..0000000
--- a/lib/libc_bsd/string/strstr.3
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strstr.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strstr.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd October 11, 2001
-.Dt STRSTR 3
-.Os
-.Sh NAME
-.Nm strstr , strcasestr , strnstr
-.Nd locate a substring in a string
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strstr "const char *big" "const char *little"
-.Ft char *
-.Fn strcasestr "const char *big" "const char *little"
-.Ft char *
-.Fn strnstr "const char *big" "const char *little" "size_t len"
-.In string.h
-.In xlocale.h
-.Ft char *
-.Fn strcasestr_l "const char *big" "const char *little" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn strstr
-function
-locates the first occurrence of the null-terminated string
-.Fa little
-in the null-terminated string
-.Fa big .
-.Pp
-The
-.Fn strcasestr
-function is similar to
-.Fn strstr ,
-but ignores the case of both strings.
-.Pp
-The
-.Fn strcasestr_l
-function does the same as
-.Fn strcasestr
-but takes an explicit locale rather than using the current locale.
-.Pp
-The
-.Fn strnstr
-function
-locates the first occurrence of the null-terminated string
-.Fa little
-in the string
-.Fa big ,
-where not more than
-.Fa len
-characters are searched.
-Characters that appear after a
-.Ql \e0
-character are not searched.
-Since the
-.Fn strnstr
-function is a
-.Fx
-specific API, it should only be used when portability is not a concern.
-.Sh RETURN VALUES
-If
-.Fa little
-is an empty string,
-.Fa big
-is returned;
-if
-.Fa little
-occurs nowhere in
-.Fa big ,
-.Dv NULL
-is returned;
-otherwise a pointer to the first character of the first occurrence of
-.Fa little
-is returned.
-.Sh EXAMPLES
-The following sets the pointer
-.Va ptr
-to the
-.Qq Li Bar Baz
-portion of
-.Va largestring :
-.Bd -literal -offset indent
-const char *largestring = "Foo Bar Baz";
-const char *smallstring = "Bar";
-char *ptr;
-
-ptr = strstr(largestring, smallstring);
-.Ed
-.Pp
-The following sets the pointer
-.Va ptr
-to
-.Dv NULL ,
-because only the first 4 characters of
-.Va largestring
-are searched:
-.Bd -literal -offset indent
-const char *largestring = "Foo Bar Baz";
-const char *smallstring = "Bar";
-char *ptr;
-
-ptr = strnstr(largestring, smallstring, 4);
-.Ed
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr memmem 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strtok 3 ,
-.Xr wcsstr 3
-.Sh STANDARDS
-The
-.Fn strstr
-function
-conforms to
-.St -isoC .
diff --git a/lib/libc_bsd/string/strstr.c b/lib/libc_bsd/string/strstr.c
deleted file mode 100644
index e30b237..0000000
--- a/lib/libc_bsd/string/strstr.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strstr.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s.
- */
-char *
-strstr(const char *s, const char *find)
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != '\0') {
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == '\0')
-					return (NULL);
-			} while (sc != c);
-		} while (strncmp(s, find, len) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
diff --git a/lib/libc_bsd/string/strtok.3 b/lib/libc_bsd/string/strtok.3
deleted file mode 100644
index f4e2dbc..0000000
--- a/lib/libc_bsd/string/strtok.3
+++ /dev/null
@@ -1,172 +0,0 @@
-.\" Copyright (c) 1998 Softweyr LLC.  All rights reserved.
-.\"
-.\" strtok_r, from Berkeley strtok
-.\" Oct 13, 1998 by Wes Peters <wes@softweyr.com>
-.\"
-.\" Copyright (c) 1988, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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
-.\"    notices, this list of conditions and the following disclaimer.
-.\"
-.\" 2. Redistributions in binary form must reproduce the above
-.\"    copyright notices, this list of conditions and the following
-.\"    disclaimer in the documentation and/or other materials provided
-.\"    with the distribution.
-.\"
-.\" 3. Neither the name of Softweyr LLC, 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
-.\"
-.\"     @(#)strtok.3	8.2 (Berkeley) 2/3/94
-.\" $FreeBSD: releng/10.2/lib/libc/string/strtok.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd November 27, 1998
-.Dt STRTOK 3
-.Os
-.Sh NAME
-.Nm strtok , strtok_r
-.Nd string tokens
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft char *
-.Fn strtok "char *str" "const char *sep"
-.Ft char *
-.Fn strtok_r "char *str" "const char *sep" "char **last"
-.Sh DESCRIPTION
-.Bf -symbolic
-This interface is obsoleted by
-.Xr strsep 3 .
-.Ef
-.Pp
-The
-.Fn strtok
-function
-is used to isolate sequential tokens in a null-terminated string,
-.Fa str .
-These tokens are separated in the string by at least one of the
-characters in
-.Fa sep .
-The first time that
-.Fn strtok
-is called,
-.Fa str
-should be specified; subsequent calls, wishing to obtain further tokens
-from the same string, should pass a null pointer instead.
-The separator string,
-.Fa sep ,
-must be supplied each time, and may change between calls.
-.Pp
-The implementation will behave as if no library function calls
-.Fn strtok .
-.Pp
-The
-.Fn strtok_r
-function is a reentrant version of
-.Fn strtok .
-The context pointer
-.Fa last
-must be provided on each call.
-The
-.Fn strtok_r
-function
-may also be used to nest two parsing loops within one another, as
-long as separate context pointers are used.
-.Pp
-The
-.Fn strtok
-and
-.Fn strtok_r
-functions
-return a pointer to the beginning of each subsequent token in the string,
-after replacing the token itself with a
-.Dv NUL
-character.
-When no more tokens remain, a null pointer is returned.
-.Sh EXAMPLES
-The following uses
-.Fn strtok_r
-to parse two strings using separate contexts:
-.Bd -literal
-char test[80], blah[80];
-char *sep = "\e\e/:;=-";
-char *word, *phrase, *brkt, *brkb;
-
-strcpy(test, "This;is.a:test:of=the/string\e\etokenizer-function.");
-
-for (word = strtok_r(test, sep, &brkt);
-     word;
-     word = strtok_r(NULL, sep, &brkt))
-{
-    strcpy(blah, "blah:blat:blab:blag");
-
-    for (phrase = strtok_r(blah, sep, &brkb);
-         phrase;
-         phrase = strtok_r(NULL, sep, &brkb))
-    {
-        printf("So far we're at %s:%s\en", word, phrase);
-    }
-}
-.Ed
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr strchr 3 ,
-.Xr strcspn 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strsep 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3 ,
-.Xr wcstok 3
-.Sh STANDARDS
-The
-.Fn strtok
-function
-conforms to
-.St -isoC .
-.Sh AUTHORS
-.An Wes Peters ,
-Softweyr LLC:
-.Aq wes@softweyr.com
-.Pp
-Based on the
-.Fx 3.0
-implementation.
-.Sh BUGS
-The System V
-.Fn strtok ,
-if handed a string containing only delimiter characters,
-will not alter the next starting point, so that a call to
-.Fn strtok
-with a different (or empty) delimiter string
-may return a
-.Pf non- Dv NULL
-value.
-Since this implementation always alters the next starting point,
-such a sequence of calls would always return
-.Dv NULL .
diff --git a/lib/libc_bsd/string/strtok.c b/lib/libc_bsd/string/strtok.c
deleted file mode 100644
index 12ee7fb..0000000
--- a/lib/libc_bsd/string/strtok.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
- *
- * strtok_r, from Berkeley strtok
- * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
- *
- * Copyright (c) 1988, 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
- *    notices, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notices, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtok.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strtok.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <stddef.h>
-#ifdef DEBUG_STRTOK
-#include <stdio.h>
-#endif
-#include <string.h>
-
-char	*__strtok_r(char *, const char *, char **);
-
-__weak_reference(__strtok_r, strtok_r);
-
-char *
-__strtok_r(char *s, const char *delim, char **last)
-{
-	char *spanp, *tok;
-	int c, sc;
-
-	if (s == NULL && (s = *last) == NULL)
-		return (NULL);
-
-	/*
-	 * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
-	 */
-cont:
-	c = *s++;
-	for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
-		if (c == sc)
-			goto cont;
-	}
-
-	if (c == 0) {		/* no non-delimiter characters */
-		*last = NULL;
-		return (NULL);
-	}
-	tok = s - 1;
-
-	/*
-	 * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
-	 * Note that delim must have one NUL; we stop if we see that, too.
-	 */
-	for (;;) {
-		c = *s++;
-		spanp = (char *)delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = '\0';
-				*last = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
-
-char *
-strtok(char *s, const char *delim)
-{
-	static char *last;
-
-	return (__strtok_r(s, delim, &last));
-}
-
-#ifdef DEBUG_STRTOK
-/*
- * Test the tokenizer.
- */
-int
-main(void)
-{
-	char blah[80], test[80];
-	char *brkb, *brkt, *phrase, *sep, *word;
-
-	sep = "\\/:;=-";
-	phrase = "foo";
-
-	printf("String tokenizer test:\n");
-	strcpy(test, "This;is.a:test:of=the/string\\tokenizer-function.");
-	for (word = strtok(test, sep); word; word = strtok(NULL, sep))
-		printf("Next word is \"%s\".\n", word);
-	strcpy(test, "This;is.a:test:of=the/string\\tokenizer-function.");
-
-	for (word = strtok_r(test, sep, &brkt); word;
-	    word = strtok_r(NULL, sep, &brkt)) {
-		strcpy(blah, "blah:blat:blab:blag");
-
-		for (phrase = strtok_r(blah, sep, &brkb); phrase;
-		    phrase = strtok_r(NULL, sep, &brkb))
-			printf("So far we're at %s:%s\n", word, phrase);
-	}
-
-	return (0);
-}
-
-#endif /* DEBUG_STRTOK */
diff --git a/lib/libc_bsd/string/strxfrm.3 b/lib/libc_bsd/string/strxfrm.3
deleted file mode 100644
index 9d6afec..0000000
--- a/lib/libc_bsd/string/strxfrm.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strxfrm.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/strxfrm.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd June 4, 1993
-.Dt STRXFRM 3
-.Os
-.Sh NAME
-.Nm strxfrm
-.Nd transform a string under locale
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In string.h
-.Ft size_t
-.Fn strxfrm "char * restrict dst" "const char * restrict src" "size_t n"
-.Ft size_t
-.Fn strxfrm_l "char * restrict dst" "const char *restrict src" "size_t n" "locale_t loc"
-.Sh DESCRIPTION
-The
-.Fn strxfrm
-function transforms a null-terminated string pointed to by
-.Fa src
-according to the current locale collation if any,
-then copies the transformed string
-into
-.Fa dst .
-Not more than
-.Fa n
-characters are copied into
-.Fa dst ,
-including the terminating null character added.
-If
-.Fa n
-is set to 0
-(it helps to determine an actual size needed
-for transformation),
-.Fa dst
-is permitted to be a NULL pointer.
-.Pp
-Comparing two strings using
-.Fn strcmp
-after
-.Fn strxfrm
-is equal to comparing
-two original strings with
-.Fn strcoll .
-.Pp
-.Fn strxfrm_l
-does the same, however takes an explicit locale rather than the global
-locale.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn strxfrm
-and
-.Fn strxfrm_l
-return the length of the transformed string not including
-the terminating null character.
-If this value is
-.Fa n
-or more, the contents of
-.Fa dst
-are indeterminate.
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr strcmp 3 ,
-.Xr strcoll 3 ,
-.Xr wcsxfrm 3
-.Sh STANDARDS
-The
-.Fn strxfrm
-function
-conforms to
-.St -isoC .
-The
-.Fn strxfrm_l
-function conforms to
-.St -p1003.1-2008 .
diff --git a/lib/libc_bsd/string/strxfrm.c b/lib/libc_bsd/string/strxfrm.c
deleted file mode 100644
index 4cffa29..0000000
--- a/lib/libc_bsd/string/strxfrm.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/strxfrm.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdlib.h>
-#include <string.h>
-#include "collate.h"
-
-size_t
-strxfrm_l(char * __restrict dest, const char * __restrict src, size_t len, locale_t loc);
-size_t
-strxfrm(char * __restrict dest, const char * __restrict src, size_t len)
-{
-	return strxfrm_l(dest, src, len, __get_locale());
-}
-
-size_t
-strxfrm_l(char * __restrict dest, const char * __restrict src, size_t len, locale_t locale)
-{
-	int prim, sec, l;
-	size_t slen;
-	char *s, *ss;
-	FIX_LOCALE(locale);
-	struct xlocale_collate *table =
-		(struct xlocale_collate*)locale->components[XLC_COLLATE];
-
-	if (!*src) {
-		if (len > 0)
-			*dest = '\0';
-		return 0;
-	}
-
-	if (table->__collate_load_error)
-		return strlcpy(dest, src, len);
-
-	slen = 0;
-	prim = sec = 0;
-	ss = s = __collate_substitute(table, src);
-	while (*s) {
-		while (*s && !prim) {
-			__collate_lookup(table, s, &l, &prim, &sec);
-			s += l;
-		}
-		if (prim) {
-			if (len > 1) {
-				*dest++ = (char)prim;
-				len--;
-			}
-			slen++;
-			prim = 0;
-		}
-	}
-	free(ss);
-	if (len > 0)
-		*dest = '\0';
-
-	return slen;
-}
diff --git a/lib/libc_bsd/string/swab.3 b/lib/libc_bsd/string/swab.3
deleted file mode 100644
index 09eae37..0000000
--- a/lib/libc_bsd/string/swab.3
+++ /dev/null
@@ -1,67 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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. 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.
-.\"
-.\"     @(#)swab.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/string/swab.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd March 4, 2012
-.Dt SWAB 3
-.Os
-.Sh NAME
-.Nm swab
-.Nd swap adjacent bytes
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void
-.Fn swab "const void * restrict src" "void * restrict dst" "ssize_t len"
-.Sh DESCRIPTION
-The function
-.Fn swab
-copies
-.Fa len
-bytes from the location referenced by
-.Fa src
-to the location referenced by
-.Fa dst ,
-swapping adjacent bytes.
-.Pp
-The argument
-.Fa len
-must be an even number.
-If
-.Fa len
-is less than zero, nothing will be done.
-.Sh SEE ALSO
-.Xr bzero 3 ,
-.Xr memset 3
-.Sh HISTORY
-A
-.Fn swab
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/string/swab.c b/lib/libc_bsd/string/swab.c
deleted file mode 100644
index 6aaa198..0000000
--- a/lib/libc_bsd/string/swab.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jeffrey Mogul.
- *
- * 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)swab.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/swab.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <unistd.h>
-
-void
-swab(const void * __restrict from, void * __restrict to, ssize_t len)
-{
-	unsigned long temp;
-	int n;
-	char *fp, *tp;
-
-	if (len <= 0)
-		return;
-	n = len >> 1;
-	fp = (char *)from;
-	tp = (char *)to;
-#define	STEP	temp = *fp++,*tp++ = *fp++,*tp++ = temp
-	/* round to multiple of 8 */
-	for (; n & 0x7; --n)
-		STEP;
-	for (n >>= 3; n > 0; --n) {
-		STEP; STEP; STEP; STEP;
-		STEP; STEP; STEP; STEP;
-	}
-}
diff --git a/lib/libc_bsd/string/wcpcpy.c b/lib/libc_bsd/string/wcpcpy.c
deleted file mode 100644
index 9b1be27..0000000
--- a/lib/libc_bsd/string/wcpcpy.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1999
- *	David E. O'Brien
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcpcpy.c 199096 2009-11-09 18:50:34Z jhb $");
-
-#include <wchar.h>
-
-wchar_t *
-wcpcpy(wchar_t * __restrict to, const wchar_t * __restrict from)
-{
-
-	for (; (*to = *from); ++from, ++to);
-	return(to);
-}
diff --git a/lib/libc_bsd/string/wcpncpy.c b/lib/libc_bsd/string/wcpncpy.c
deleted file mode 100644
index 26aa5a2..0000000
--- a/lib/libc_bsd/string/wcpncpy.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcpncpy.c 199096 2009-11-09 18:50:34Z jhb $");
-
-#include <wchar.h>
-
-wchar_t *
-wcpncpy(wchar_t * __restrict dst, const wchar_t * __restrict src, size_t n)
-{
-
-	for (; n--; dst++, src++) {
-		if (!(*dst = *src)) {
-			wchar_t *ret = dst;
-			while (n--)
-				*++dst = L'\0';
-			return (ret);
-		}
-	}
-	return (dst);
-}
diff --git a/lib/libc_bsd/string/wcscasecmp.c b/lib/libc_bsd/string/wcscasecmp.c
deleted file mode 100644
index 02534e7..0000000
--- a/lib/libc_bsd/string/wcscasecmp.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcscasecmp.c 189136 2009-02-28 06:00:58Z das $");
-
-#include <wchar.h>
-#include <wctype.h>
-
-int
-wcscasecmp(const wchar_t *s1, const wchar_t *s2)
-{
-	wchar_t c1, c2;
-
-	for (; *s1; s1++, s2++) {
-		c1 = towlower(*s1);
-		c2 = towlower(*s2);
-		if (c1 != c2)
-			return ((int)c1 - c2);
-	}
-	return (-*s2);
-}
diff --git a/lib/libc_bsd/string/wcscat.c b/lib/libc_bsd/string/wcscat.c
deleted file mode 100644
index 0174687..0000000
--- a/lib/libc_bsd/string/wcscat.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcscat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcscat.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <wchar.h>
-
-wchar_t *
-wcscat(wchar_t * __restrict s1, const wchar_t * __restrict s2)
-{
-	wchar_t *cp;
-
-	cp = s1;
-	while (*cp != L'\0')
-		cp++;
-	while ((*cp++ = *s2++) != L'\0')
-		;
-
-	return (s1);
-}
diff --git a/lib/libc_bsd/string/wcschr.c b/lib/libc_bsd/string/wcschr.c
deleted file mode 100644
index 17dfd0f..0000000
--- a/lib/libc_bsd/string/wcschr.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcschr.c 105785 2002-10-23 10:47:47Z tjr $");
-
-#include <wchar.h>
-
-wchar_t *
-wcschr(const wchar_t *s, wchar_t c)
-{
-
-	while (*s != c && *s != L'\0')
-		s++;
-	if (*s == c)
-		return ((wchar_t *)s);
-	return (NULL);
-}
diff --git a/lib/libc_bsd/string/wcscmp.c b/lib/libc_bsd/string/wcscmp.c
deleted file mode 100644
index 09de51e..0000000
--- a/lib/libc_bsd/string/wcscmp.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#include <sys/cdefs.h>
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
-#if 0
-__RCSID("$NetBSD: wcscmp.c,v 1.3 2001/01/05 12:13:12 itojun Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcscmp.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <wchar.h>
-
-/*
- * Compare strings.
- */
-int
-wcscmp(const wchar_t *s1, const wchar_t *s2)
-{
-
-	while (*s1 == *s2++)
-		if (*s1++ == '\0')
-			return (0);
-	/* XXX assumes wchar_t = int */
-	return (*(const unsigned int *)s1 - *(const unsigned int *)--s2);
-}
diff --git a/lib/libc_bsd/string/wcscoll.3 b/lib/libc_bsd/string/wcscoll.3
deleted file mode 100644
index d35c128..0000000
--- a/lib/libc_bsd/string/wcscoll.3
+++ /dev/null
@@ -1,108 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strcoll.3	8.1 (Berkeley) 6/4/93
-.\" FreeBSD: src/lib/libc/string/strcoll.3,v 1.11 2001/10/01 16:09:00 ru Exp
-.\" $FreeBSD: releng/10.2/lib/libc/string/wcscoll.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd October 4, 2002
-.Dt WCSCOLL 3
-.Os
-.Sh NAME
-.Nm wcscoll
-.Nd compare wide strings according to current collation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wcscoll "const wchar_t *s1" "const wchar_t *s2"
-.Sh DESCRIPTION
-The
-.Fn wcscoll
-function compares the null-terminated strings
-.Fa s1
-and
-.Fa s2
-according to the current locale collation order.
-In the
-.Dq Li C
-locale,
-.Fn wcscoll
-is equivalent to
-.Fn wcscmp .
-.Sh RETURN VALUES
-The
-.Fn wcscoll
-function
-returns an integer greater than, equal to, or less than 0,
-if
-.Fa s1
-is greater than, equal to, or less than
-.Fa s2 .
-.Pp
-No return value is reserved to indicate errors;
-callers should set
-.Va errno
-to 0 before calling
-.Fn wcscoll .
-If it is non-zero upon return from
-.Fn wcscoll ,
-an error has occurred.
-.Sh ERRORS
-The
-.Fn wcscoll
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EILSEQ
-An invalid wide character code was specified.
-.It Bq Er ENOMEM
-Cannot allocate enough memory for temporary buffers.
-.El
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr strcoll 3 ,
-.Xr wcscmp 3 ,
-.Xr wcsxfrm 3
-.Sh STANDARDS
-The
-.Fn wcscoll
-function
-conforms to
-.St -isoC-99 .
-.Sh BUGS
-The current implementation of
-.Fn wcscoll
-only works in single-byte
-.Dv LC_CTYPE
-locales, and falls back to using
-.Fn wcscmp
-in locales with extended character sets.
diff --git a/lib/libc_bsd/string/wcscoll.c b/lib/libc_bsd/string/wcscoll.c
deleted file mode 100644
index a5d0e17..0000000
--- a/lib/libc_bsd/string/wcscoll.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcscoll.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "collate.h"
-
-static char *__mbsdup(const wchar_t *);
-
-/*
- * Placeholder implementation of wcscoll(). Attempts to use the single-byte
- * collation ordering where possible, and falls back on wcscmp() in locales
- * with extended character sets.
- */
-int
-wcscoll_l(const wchar_t *ws1, const wchar_t *ws2, locale_t locale)
-{
-	char *mbs1, *mbs2;
-	int diff, sverrno;
-	FIX_LOCALE(locale);
-	struct xlocale_collate *table =
-		(struct xlocale_collate*)locale->components[XLC_COLLATE];
-
-	if (table->__collate_load_error || MB_CUR_MAX > 1)
-		/*
-		 * Locale has no special collating order, could not be
-		 * loaded, or has an extended character set; do a fast binary
-		 * comparison.
-		 */
-		return (wcscmp(ws1, ws2));
-
-	if ((mbs1 = __mbsdup(ws1)) == NULL || (mbs2 = __mbsdup(ws2)) == NULL) {
-		/*
-		 * Out of memory or illegal wide chars; fall back to wcscmp()
-		 * but leave errno indicating the error. Callers that don't
-		 * check for error will get a reasonable but often slightly
-		 * incorrect result.
-		 */
-		sverrno = errno;
-		free(mbs1);
-		errno = sverrno;
-		return (wcscmp(ws1, ws2));
-	}
-
-	diff = strcoll_l(mbs1, mbs2, locale);
-	sverrno = errno;
-	free(mbs1);
-	free(mbs2);
-	errno = sverrno;
-
-	return (diff);
-}
-
-int
-wcscoll(const wchar_t *ws1, const wchar_t *ws2)
-{
-	return wcscoll_l(ws1, ws2, __get_locale());
-}
-
-static char *
-__mbsdup(const wchar_t *ws)
-{
-	static const mbstate_t initial;
-	mbstate_t st;
-	const wchar_t *wcp;
-	size_t len;
-	char *mbs;
-
-	wcp = ws;
-	st = initial;
-	if ((len = wcsrtombs(NULL, &wcp, 0, &st)) == (size_t)-1)
-		return (NULL);
-	if ((mbs = malloc(len + 1)) == NULL)
-		return (NULL);
-	st = initial;
-	wcsrtombs(mbs, &ws, len + 1, &st);
-
-	return (mbs);
-}
diff --git a/lib/libc_bsd/string/wcscpy.c b/lib/libc_bsd/string/wcscpy.c
deleted file mode 100644
index 1bb7282..0000000
--- a/lib/libc_bsd/string/wcscpy.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcscpy.c,v 1.2 2000/12/21 04:51:09 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcscpy.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <wchar.h>
-
-wchar_t *
-wcscpy(wchar_t * __restrict s1, const wchar_t * __restrict s2)
-{
-	wchar_t *cp;
-
-	cp = s1;
-	while ((*cp++ = *s2++) != L'\0')
-		;
-
-	return (s1);
-}
diff --git a/lib/libc_bsd/string/wcscspn.c b/lib/libc_bsd/string/wcscspn.c
deleted file mode 100644
index e218883..0000000
--- a/lib/libc_bsd/string/wcscspn.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcscspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcscspn.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcscspn.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <wchar.h>
-
-size_t
-wcscspn(const wchar_t *s, const wchar_t *set)
-{
-	const wchar_t *p;
-	const wchar_t *q;
-
-	p = s;
-	while (*p) {
-		q = set;
-		while (*q) {
-			if (*p == *q)
-				goto done;
-			q++;
-		}
-		p++;
-	}
-
-done:
-	return (p - s);
-}
diff --git a/lib/libc_bsd/string/wcsdup.c b/lib/libc_bsd/string/wcsdup.c
deleted file mode 100644
index af5e70c..0000000
--- a/lib/libc_bsd/string/wcsdup.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*-
- * Copyright (c) 2005 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsdup.c 149011 2005-08-13 05:54:33Z tjr $");
-
-#include <stdlib.h>
-#include <wchar.h>
-
-wchar_t *
-wcsdup(const wchar_t *s)
-{
-	wchar_t *copy;
-	size_t len;
-
-	len = wcslen(s) + 1;
-	if ((copy = malloc(len * sizeof(wchar_t))) == NULL)
-		return (NULL);
-	return (wmemcpy(copy, s, len));
-}
diff --git a/lib/libc_bsd/string/wcslcat.c b/lib/libc_bsd/string/wcslcat.c
deleted file mode 100644
index 149c7ec..0000000
--- a/lib/libc_bsd/string/wcslcat.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- *
- *	from OpenBSD: strlcat.c,v 1.3 2000/11/24 11:10:02 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslcat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcslcat.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <sys/types.h>
-#include <wchar.h>
-
-/*
- * Appends src to string dst of size siz (unlike wcsncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns wcslen(initial dst) + wcslen(src); if retval >= siz,
- * truncation occurred.
- */
-size_t
-wcslcat(wchar_t *dst, const wchar_t *src, size_t siz)
-{
-	wchar_t *d = dst;
-	const wchar_t *s = src;
-	size_t n = siz;
-	size_t dlen;
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (*d != '\0' && n-- != 0)
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + wcslen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
-	}
-	*d = '\0';
-
-	return(dlen + (s - src));	/* count does not include NUL */
-}
diff --git a/lib/libc_bsd/string/wcslcpy.c b/lib/libc_bsd/string/wcslcpy.c
deleted file mode 100644
index 8c79b00..0000000
--- a/lib/libc_bsd/string/wcslcpy.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- *
- *	from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslcpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcslcpy.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <sys/types.h>
-#include <wchar.h>
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns wcslen(src); if retval >= siz, truncation occurred.
- */
-size_t
-wcslcpy(wchar_t *dst, const wchar_t *src, size_t siz)
-{
-	wchar_t *d = dst;
-	const wchar_t *s = src;
-	size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
diff --git a/lib/libc_bsd/string/wcslen.c b/lib/libc_bsd/string/wcslen.c
deleted file mode 100644
index 05369cd..0000000
--- a/lib/libc_bsd/string/wcslen.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcslen.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcslen.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcslen.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <wchar.h>
-
-size_t
-wcslen(const wchar_t *s)
-{
-	const wchar_t *p;
-
-	p = s;
-	while (*p)
-		p++;
-
-	return p - s;
-}
diff --git a/lib/libc_bsd/string/wcsncasecmp.c b/lib/libc_bsd/string/wcsncasecmp.c
deleted file mode 100644
index 62374d3..0000000
--- a/lib/libc_bsd/string/wcsncasecmp.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsncasecmp.c 189136 2009-02-28 06:00:58Z das $");
-
-#include <wchar.h>
-#include <wctype.h>
-
-int
-wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-	wchar_t c1, c2;
-
-	if (n == 0)
-		return (0);
-	for (; *s1; s1++, s2++) {
-		c1 = towlower(*s1);
-		c2 = towlower(*s2);
-		if (c1 != c2)
-			return ((int)c1 - c2);
-		if (--n == 0)
-			return (0);
-	}
-	return (-*s2);
-}
diff --git a/lib/libc_bsd/string/wcsncat.c b/lib/libc_bsd/string/wcsncat.c
deleted file mode 100644
index f18ceef..0000000
--- a/lib/libc_bsd/string/wcsncat.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcsncat.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcsncat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsncat.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <wchar.h>
-
-wchar_t *
-wcsncat(wchar_t * __restrict s1, const wchar_t * __restrict s2, size_t n)
-{
-	wchar_t *p;
-	wchar_t *q;
-	const wchar_t *r;
-
-	p = s1;
-	while (*p)
-		p++;
-	q = p;
-	r = s2;
-	while (*r && n) {
-		*q++ = *r++;
-		n--;
-	}
-	*q = '\0';
-	return s1;
-}
diff --git a/lib/libc_bsd/string/wcsncmp.c b/lib/libc_bsd/string/wcsncmp.c
deleted file mode 100644
index f9d1777..0000000
--- a/lib/libc_bsd/string/wcsncmp.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1989, 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. 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
-__RCSID("$NetBSD: wcsncmp.c,v 1.3 2001/01/05 12:13:13 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsncmp.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <wchar.h>
-
-int
-wcsncmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-
-	if (n == 0)
-		return (0);
-	do {
-		if (*s1 != *s2++) {
-			/* XXX assumes wchar_t = int */
-			return (*(const unsigned int *)s1 -
-			    *(const unsigned int *)--s2);
-		}
-		if (*s1++ == 0)
-			break;
-	} while (--n != 0);
-	return (0);
-}
diff --git a/lib/libc_bsd/string/wcsncpy.c b/lib/libc_bsd/string/wcsncpy.c
deleted file mode 100644
index 56bbf3a..0000000
--- a/lib/libc_bsd/string/wcsncpy.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsncpy.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <wchar.h>
-
-/*
- * Copy src to dst, truncating or null-padding to always copy n bytes.
- * Return dst.
- */
-wchar_t *
-wcsncpy(wchar_t * __restrict dst, const wchar_t * __restrict src, size_t n)
-{
-	if (n != 0) {
-		wchar_t *d = dst;
-		const wchar_t *s = src;
-
-		do {
-			if ((*d++ = *s++) == L'\0') {
-				/* NUL pad the remaining n-1 bytes */
-				while (--n != 0)
-					*d++ = L'\0';
-				break;
-			}
-		} while (--n != 0);
-	}
-	return (dst);
-}
diff --git a/lib/libc_bsd/string/wcsnlen.c b/lib/libc_bsd/string/wcsnlen.c
deleted file mode 100644
index cb08ed9..0000000
--- a/lib/libc_bsd/string/wcsnlen.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*-
- * Copyright (c) 2009 David Schultz <das@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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsnlen.c 189136 2009-02-28 06:00:58Z das $");
-
-#include <wchar.h>
-
-size_t
-wcsnlen(const wchar_t *s, size_t maxlen)
-{
-	size_t len;
-
-	for (len = 0; len < maxlen; len++, s++) {
-		if (!*s)
-			break;
-	}
-	return (len);
-}
diff --git a/lib/libc_bsd/string/wcspbrk.c b/lib/libc_bsd/string/wcspbrk.c
deleted file mode 100644
index f73f4f8..0000000
--- a/lib/libc_bsd/string/wcspbrk.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcspbrk.c,v 1.2 2000/12/21 05:07:25 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcspbrk.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcspbrk.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <wchar.h>
-
-wchar_t *
-wcspbrk(const wchar_t *s, const wchar_t *set)
-{
-	const wchar_t *p;
-	const wchar_t *q;
-
-	p = s;
-	while (*p) {
-		q = set;
-		while (*q) {
-			if (*p == *q) {
-				/* LINTED interface specification */
-				return (wchar_t *)p;
-			}
-			q++;
-		}
-		p++;
-	}
-	return NULL;
-}
diff --git a/lib/libc_bsd/string/wcsrchr.c b/lib/libc_bsd/string/wcsrchr.c
deleted file mode 100644
index d00e42b..0000000
--- a/lib/libc_bsd/string/wcsrchr.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * Copyright (c) 2002 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsrchr.c 105786 2002-10-23 10:52:04Z tjr $");
-
-#include <wchar.h>
-
-wchar_t *
-wcsrchr(const wchar_t *s, wchar_t c)
-{
-	const wchar_t *last;
-
-	last = NULL;
-	for (;;) {
-		if (*s == c)
-			last = s;
-		if (*s == L'\0')
-			break;
-		s++;
-	}
-
-	return ((wchar_t *)last);
-}
diff --git a/lib/libc_bsd/string/wcsspn.c b/lib/libc_bsd/string/wcsspn.c
deleted file mode 100644
index 3af1ee0..0000000
--- a/lib/libc_bsd/string/wcsspn.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wcsspn.c,v 1.1 1999/12/29 21:47:45 tshiozak Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wcsspn.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsspn.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <wchar.h>
-
-size_t
-wcsspn(const wchar_t *s, const wchar_t *set)
-{
-	const wchar_t *p;
-	const wchar_t *q;
-
-	p = s;
-	while (*p) {
-		q = set;
-		while (*q) {
-			if (*p == *q)
-				break;
-			q++;
-		}
-		if (!*q)
-			goto done;
-		p++;
-	}
-
-done:
-	return (p - s);
-}
diff --git a/lib/libc_bsd/string/wcsstr.c b/lib/libc_bsd/string/wcsstr.c
deleted file mode 100644
index ca5812d..0000000
--- a/lib/libc_bsd/string/wcsstr.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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. 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.
- */
-
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsstr.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <wchar.h>
-
-/*
- * Find the first occurrence of find in s.
- */
-wchar_t *
-wcsstr(const wchar_t * __restrict s, const wchar_t * __restrict find)
-{
-	wchar_t c, sc;
-	size_t len;
-
-	if ((c = *find++) != L'\0') {
-		len = wcslen(find);
-		do {
-			do {
-				if ((sc = *s++) == L'\0')
-					return (NULL);
-			} while (sc != c);
-		} while (wcsncmp(s, find, len) != 0);
-		s--;
-	}
-	return ((wchar_t *)s);
-}
diff --git a/lib/libc_bsd/string/wcstok.3 b/lib/libc_bsd/string/wcstok.3
deleted file mode 100644
index f7a4e3d..0000000
--- a/lib/libc_bsd/string/wcstok.3
+++ /dev/null
@@ -1,133 +0,0 @@
-.\" Copyright (c) 1998 Softweyr LLC.  All rights reserved.
-.\"
-.\" strtok_r, from Berkeley strtok
-.\" Oct 13, 1998 by Wes Peters <wes@softweyr.com>
-.\"
-.\" Copyright (c) 1988, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the American National Standards Committee X3, on Information
-.\" Processing Systems.
-.\"
-.\" 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
-.\"    notices, this list of conditions and the following disclaimer.
-.\"
-.\" 2. Redistributions in binary form must reproduce the above
-.\"    copyright notices, 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 Softweyr LLC, the
-.\"      University of California, Berkeley, and its contributors.
-.\"
-.\" 4. Neither the name of Softweyr LLC, 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/string/wcstok.3 105148 2002-10-15 09:49:54Z tjr $
-.\"
-.Dd October 3, 2002
-.Dt WCSTOK 3
-.Os
-.Sh NAME
-.Nm wcstok
-.Nd split wide-character string into tokens
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wcstok "wchar_t * restrict str" "const wchar_t * restrict sep" "wchar_t ** restrict last"
-.Sh DESCRIPTION
-The
-.Fn wcstok
-function
-is used to isolate sequential tokens in a null-terminated wide character
-string,
-.Fa str .
-These tokens are separated in the string by at least one of the
-characters in
-.Fa sep .
-The first time that
-.Fn wcstok
-is called,
-.Fa str
-should be specified; subsequent calls, wishing to obtain further tokens
-from the same string, should pass a null pointer instead.
-The separator string,
-.Fa sep ,
-must be supplied each time, and may change between calls.
-The context pointer
-.Fa last
-must be provided on each call.
-.Pp
-The
-.Fn wcstok
-function is the wide character counterpart of the
-.Fn strtok_r
-function.
-.Sh RETURN VALUES
-The
-.Fn wcstok
-function
-returns a pointer to the beginning of each subsequent token in the string,
-after replacing the token itself with a null wide character (L'\e0').
-When no more tokens remain, a null pointer is returned.
-.Sh EXAMPLES
-The following code fragment splits a wide character string on
-.Tn ASCII
-space, tab and newline characters and writes the tokens to
-standard output:
-.Bd -literal -offset indent
-const wchar_t *seps = L" \et\en";
-wchar_t *last, *tok, text[] = L" \enone\ettwo\et\etthree  \en";
-
-for (tok = wcstok(text, seps, &last); tok != NULL;
-    tok = wcstok(NULL, seps, &last))
-	wprintf(L"%ls\en", tok);
-.Ed
-.Sh COMPATIBILITY
-Some early implementations of
-.Fn wcstok
-omit the
-context pointer argument,
-.Fa last ,
-and maintain state across calls in a static variable like
-.Fn strtok
-does.
-.Sh SEE ALSO
-.Xr strtok 3 ,
-.Xr wcschr 3 ,
-.Xr wcscspn 3 ,
-.Xr wcspbrk 3 ,
-.Xr wcsrchr 3 ,
-.Xr wcsspn 3
-.Sh STANDARDS
-The
-.Fn wcstok
-function
-conforms to
-.St -isoC-99 .
diff --git a/lib/libc_bsd/string/wcstok.c b/lib/libc_bsd/string/wcstok.c
deleted file mode 100644
index 90882c8..0000000
--- a/lib/libc_bsd/string/wcstok.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
- *
- * strtok_r, from Berkeley strtok
- * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
- *
- * Copyright (c) 1988, 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
- *    notices, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notices, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcstok.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <wchar.h>
-
-wchar_t *
-wcstok(wchar_t * __restrict s, const wchar_t * __restrict delim,
-    wchar_t ** __restrict last)
-{
-	const wchar_t *spanp;
-	wchar_t *tok;
-	wchar_t c, sc;
-
-	if (s == NULL && (s = *last) == NULL)
-		return (NULL);
-
-	/*
-	 * Skip (span) leading delimiters (s += wcsspn(s, delim), sort of).
-	 */
-cont:
-	c = *s++;
-	for (spanp = delim; (sc = *spanp++) != L'\0';) {
-		if (c == sc)
-			goto cont;
-	}
-
-	if (c == L'\0') {	/* no non-delimiter characters */
-		*last = NULL;
-		return (NULL);
-	}
-	tok = s - 1;
-
-	/*
-	 * Scan token (scan for delimiters: s += wcscspn(s, delim), sort of).
-	 * Note that delim must have one NUL; we stop if we see that, too.
-	 */
-	for (;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == L'\0')
-					s = NULL;
-				else
-					s[-1] = L'\0';
-				*last = s;
-				return (tok);
-			}
-		} while (sc != L'\0');
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_bsd/string/wcswidth.3 b/lib/libc_bsd/string/wcswidth.3
deleted file mode 100644
index 1283178..0000000
--- a/lib/libc_bsd/string/wcswidth.3
+++ /dev/null
@@ -1,62 +0,0 @@
-.\" Copyright (c) 2002 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/string/wcswidth.3 107706 2002-12-09 14:04:05Z ru $
-.\"
-.Dd August 20, 2002
-.Dt WCSWIDTH 3
-.Os
-.Sh NAME
-.Nm wcswidth
-.Nd "number of column positions in wide-character string"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft int
-.Fn wcswidth "const wchar_t *pwcs" "size_t n"
-.Sh DESCRIPTION
-The
-.Fn wcswidth
-function determines the number of column positions required for the first
-.Fa n
-characters of
-.Fa pwcs ,
-or until a null wide character (L'\e0') is encountered.
-.Sh RETURN VALUES
-The
-.Fn wcswidth
-function returns 0 if
-.Fa pwcs
-is an empty string (L""),
-\-1 if a non-printing wide character is encountered,
-otherwise it returns the number of column positions occupied.
-.Sh SEE ALSO
-.Xr iswprint 3 ,
-.Xr wcwidth 3
-.Sh STANDARDS
-The
-.Fn wcswidth
-function conforms to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/string/wcswidth.c b/lib/libc_bsd/string/wcswidth.c
deleted file mode 100644
index cc49e64..0000000
--- a/lib/libc_bsd/string/wcswidth.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1989, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcswidth.c 251069 2013-05-28 20:57:40Z emaste $");
-
-#include <wchar.h>
-#include "xlocale_private.h"
-
-int
-wcswidth_l(const wchar_t *pwcs, size_t n, locale_t locale)
-{
-	wchar_t wc;
-	int len, l;
-	FIX_LOCALE(locale);
-
-	len = 0;
-	while (n-- > 0 && (wc = *pwcs++) != L'\0') {
-		if ((l = wcwidth_l(wc, locale)) < 0)
-			return (-1);
-		len += l;
-	}
-	return (len);
-}
-
-int
-wcswidth(const wchar_t *pwcs, size_t n)
-{
-	return wcswidth_l(pwcs, n, __get_locale());
-}
diff --git a/lib/libc_bsd/string/wcsxfrm.3 b/lib/libc_bsd/string/wcsxfrm.3
deleted file mode 100644
index 75ae1f1..0000000
--- a/lib/libc_bsd/string/wcsxfrm.3
+++ /dev/null
@@ -1,122 +0,0 @@
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     @(#)strxfrm.3	8.1 (Berkeley) 6/4/93
-.\" FreeBSD: src/lib/libc/string/strxfrm.3,v 1.16 2002/09/06 11:24:06 tjr Exp
-.\" $FreeBSD: releng/10.2/lib/libc/string/wcsxfrm.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd October 4, 2002
-.Dt WCSXFRM 3
-.Os
-.Sh NAME
-.Nm wcsxfrm
-.Nd transform a wide string under locale
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft size_t
-.Fn wcsxfrm "wchar_t * restrict dst" "const wchar_t * restrict src" "size_t n"
-.Sh DESCRIPTION
-The
-.Fn wcsxfrm
-function transforms a null-terminated wide character string pointed to by
-.Fa src
-according to the current locale collation order
-then copies the transformed string
-into
-.Fa dst .
-No more than
-.Fa n
-wide characters are copied into
-.Fa dst ,
-including the terminating null character added.
-If
-.Fa n
-is set to 0
-(it helps to determine an actual size needed
-for transformation),
-.Fa dst
-is permitted to be a
-.Dv NULL
-pointer.
-.Pp
-Comparing two strings using
-.Fn wcscmp
-after
-.Fn wcsxfrm
-is equivalent to comparing
-two original strings with
-.Fn wcscoll .
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn wcsxfrm
-returns the length of the transformed string not including
-the terminating null character.
-If this value is
-.Fa n
-or more, the contents of
-.Fa dst
-are indeterminate.
-.Sh SEE ALSO
-.Xr setlocale 3 ,
-.Xr strxfrm 3 ,
-.Xr wcscmp 3 ,
-.Xr wcscoll 3
-.Sh STANDARDS
-The
-.Fn wcsxfrm
-function
-conforms to
-.St -isoC-99 .
-.Sh BUGS
-The current implementation of
-.Fn wcsxfrm
-only works in single-byte
-.Dv LC_CTYPE
-locales, and falls back to using
-.Fn wcsncpy
-in locales with extended character sets.
-.Pp
-Comparing two strings using
-.Fn wcscmp
-after
-.Fn wcsxfrm
-is
-.Em not
-always equivalent to comparison with
-.Fn wcscoll ;
-.Fn wcsxfrm
-only stores information about primary collation weights into
-.Fa dst ,
-whereas
-.Fn wcscoll
-compares characters using both primary and secondary weights.
diff --git a/lib/libc_bsd/string/wcsxfrm.c b/lib/libc_bsd/string/wcsxfrm.c
deleted file mode 100644
index abd6d85..0000000
--- a/lib/libc_bsd/string/wcsxfrm.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			All rights reserved.
- *
- * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
- * Portions of this software were developed by David Chisnall
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-#if 0
-__FBSDID("FreeBSD: src/lib/libc/string/strxfrm.c,v 1.15 2002/09/06 11:24:06 tjr Exp ");
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wcsxfrm.c 227753 2011-11-20 14:45:42Z theraven $");
-
-#include <stdlib.h>
-#include <string.h>
-#include <wchar.h>
-#include "collate.h"
-
-static char *__mbsdup(const wchar_t *);
-
-/*
- * Placeholder wcsxfrm() implementation. See wcscoll.c for a description of
- * the logic used.
- */
-size_t
-wcsxfrm_l(wchar_t * __restrict dest, const wchar_t * __restrict src, size_t len, locale_t locale)
-{
-	int prim, sec, l;
-	size_t slen;
-	char *mbsrc, *s, *ss;
-	FIX_LOCALE(locale);
-	struct xlocale_collate *table =
-		(struct xlocale_collate*)locale->components[XLC_COLLATE];
-
-	if (*src == L'\0') {
-		if (len != 0)
-			*dest = L'\0';
-		return (0);
-	}
-
-	if (table->__collate_load_error || MB_CUR_MAX > 1) {
-		slen = wcslen(src);
-		if (len > 0) {
-			if (slen < len)
-				wcscpy(dest, src);
-			else {
-				wcsncpy(dest, src, len - 1);
-				dest[len - 1] = L'\0';
-			}
-		}
-		return (slen);
-	}
-
-	mbsrc = __mbsdup(src);
-	slen = 0;
-	prim = sec = 0;
-	ss = s = __collate_substitute(table, mbsrc);
-	while (*s != '\0') {
-		while (*s != '\0' && prim == 0) {
-			__collate_lookup(table, s, &l, &prim, &sec);
-			s += l;
-		}
-		if (prim != 0) {
-			if (len > 1) {
-				*dest++ = (wchar_t)prim;
-				len--;
-			}
-			slen++;
-			prim = 0;
-		}
-	}
-	free(ss);
-	free(mbsrc);
-	if (len != 0)
-		*dest = L'\0';
-
-	return (slen);
-}
-size_t
-wcsxfrm(wchar_t * __restrict dest, const wchar_t * __restrict src, size_t len)
-{
-	return wcsxfrm_l(dest, src, len, __get_locale());
-}
-
-static char *
-__mbsdup(const wchar_t *ws)
-{
-	static const mbstate_t initial;
-	mbstate_t st;
-	const wchar_t *wcp;
-	size_t len;
-	char *mbs;
-
-	wcp = ws;
-	st = initial;
-	if ((len = wcsrtombs(NULL, &wcp, 0, &st)) == (size_t)-1)
-		return (NULL);
-	if ((mbs = malloc(len + 1)) == NULL)
-		return (NULL);
-	st = initial;
-	wcsrtombs(mbs, &ws, len + 1, &st);
-
-	return (mbs);
-}
diff --git a/lib/libc_bsd/string/wmemchr.3 b/lib/libc_bsd/string/wmemchr.3
deleted file mode 100644
index 4413355..0000000
--- a/lib/libc_bsd/string/wmemchr.3
+++ /dev/null
@@ -1,174 +0,0 @@
-.\"	$NetBSD: wmemchr.3,v 1.4 2001/01/02 11:26:23 itojun Exp $
-.\"
-.\" Copyright (c) 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Chris Torek and the American National Standards Committee X3,
-.\" on Information Processing Systems.
-.\"
-.\" 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. 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.
-.\"
-.\"     from: @(#)strcpy.3	8.1 (Berkeley) 6/4/93
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/string/wmemchr.3 251069 2013-05-28 20:57:40Z emaste $
-.\"
-.Dd March 4, 2009
-.Dt WMEMCHR 3
-.Os
-.Sh NAME
-.Nm wmemchr ,
-.Nm wmemcmp ,
-.Nm wmemcpy ,
-.Nm wmemmove ,
-.Nm wmemset ,
-.Nm wcpcpy ,
-.Nm wcpncpy ,
-.Nm wcscasecmp ,
-.Nm wcscat ,
-.Nm wcschr ,
-.Nm wcscmp ,
-.Nm wcscpy ,
-.Nm wcscspn ,
-.Nm wcsdup ,
-.Nm wcslcat ,
-.Nm wcslcpy ,
-.Nm wcslen ,
-.Nm wcsncasecmp ,
-.Nm wcsncat ,
-.Nm wcsncmp ,
-.Nm wcsncpy ,
-.Nm wcsnlen ,
-.Nm wcspbrk ,
-.Nm wcsrchr ,
-.Nm wcsspn ,
-.Nm wcsstr
-.Nd wide character string manipulation operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In wchar.h
-.Ft wchar_t *
-.Fn wmemchr "const wchar_t *s" "wchar_t c" "size_t n"
-.Ft int
-.Fn wmemcmp "const wchar_t *s1" "const wchar_t *s2" "size_t n"
-.Ft wchar_t *
-.Fn wmemcpy "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n"
-.Ft wchar_t *
-.Fn wmemmove "wchar_t *s1" "const wchar_t *s2" "size_t n"
-.Ft wchar_t *
-.Fn wmemset "wchar_t *s" "wchar_t c" "size_t n"
-.Ft wchar_t *
-.Fn wcpcpy "wchar_t *s1" "wchar_t *s2"
-.Ft wchar_t *
-.Fn wcpncpy "wchar_t *s1" "wchar_t *s2" "size_t n"
-.Ft int
-.Fn wcscasecmp "const wchar_t *s1" "const wchar_t *s2"
-.Ft wchar_t *
-.Fn wcscat "wchar_t * restrict s1" "const wchar_t * restrict s2"
-.Ft wchar_t *
-.Fn wcschr "const wchar_t *s" "wchar_t c"
-.Ft int
-.Fn wcscmp "const wchar_t *s1" "const wchar_t *s2"
-.Ft wchar_t *
-.Fn wcscpy "wchar_t * restrict s1" "const wchar_t * restrict s2"
-.Ft size_t
-.Fn wcscspn "const wchar_t *s1" "const wchar_t *s2"
-.Ft wchar_t *
-.Fn wcsdup "const wchar_t *s"
-.Ft size_t
-.Fn wcslcat "wchar_t *s1" "const wchar_t *s2" "size_t n"
-.Ft size_t
-.Fn wcslcpy "wchar_t *s1" "const wchar_t *s2" "size_t n"
-.Ft size_t
-.Fn wcslen "const wchar_t *s"
-.Ft int
-.Fn wcsncasecmp "const wchar_t *s1" "const wchar_t *s2" "size_t n"
-.Ft wchar_t *
-.Fn wcsncat "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n"
-.Ft int
-.Fn wcsncmp "const wchar_t *s1" "const wchar_t * s2" "size_t n"
-.Ft wchar_t *
-.Fn wcsncpy "wchar_t * restrict s1" "const wchar_t * restrict s2" "size_t n"
-.Ft size_t
-.Fn wcsnlen "const wchar_t *s" "size_t maxlen"
-.Ft wchar_t *
-.Fn wcspbrk "const wchar_t *s1" "const wchar_t *s2"
-.Ft wchar_t *
-.Fn wcsrchr "const wchar_t *s" "wchar_t c"
-.Ft size_t
-.Fn wcsspn "const wchar_t *s1" "const wchar_t *s2"
-.Ft wchar_t *
-.Fn wcsstr "const wchar_t * restrict s1" "const wchar_t * restrict s2"
-.Sh DESCRIPTION
-The functions implement string manipulation operations over wide character
-strings.
-For a detailed description, refer to documents for the respective single-byte
-counterpart, such as
-.Xr memchr 3 .
-.Sh SEE ALSO
-.Xr memchr 3 ,
-.Xr memcmp 3 ,
-.Xr memcpy 3 ,
-.Xr memmove 3 ,
-.Xr memset 3 ,
-.Xr stpcpy 3 ,
-.Xr stpncpy 3 ,
-.Xr strcasecmp 3 ,
-.Xr strcat 3 ,
-.Xr strchr 3 ,
-.Xr strcmp 3 ,
-.Xr strcpy 3 ,
-.Xr strcspn 3 ,
-.Xr strdup 3 ,
-.Xr strlcat 3 ,
-.Xr strlcpy 3 ,
-.Xr strlen 3 ,
-.Xr strncat 3 ,
-.Xr strncmp 3 ,
-.Xr strncpy 3 ,
-.Xr strnlen 3 ,
-.Xr strpbrk 3 ,
-.Xr strrchr 3 ,
-.Xr strspn 3 ,
-.Xr strstr 3
-.Sh STANDARDS
-These functions conform to
-.St -isoC-99 ,
-with the exception of
-.Fn wcpcpy ,
-.Fn wcpncpy ,
-.Fn wcscasecmp ,
-.Fn wcsdup ,
-.Fn wcsncasecmp ,
-and
-.Fn wcsnlen ,
-which conform to
-.St -p1003.1-2008 ;
-and
-.Fn wcslcat
-and
-.Fn wcslcpy ,
-which are extensions.
diff --git a/lib/libc_bsd/string/wmemchr.c b/lib/libc_bsd/string/wmemchr.c
deleted file mode 100644
index b651d66..0000000
--- a/lib/libc_bsd/string/wmemchr.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemchr.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemchr.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wmemchr.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <wchar.h>
-
-wchar_t	*
-wmemchr(const wchar_t *s, wchar_t c, size_t n)
-{
-	size_t i;
-
-	for (i = 0; i < n; i++) {
-		if (*s == c) {
-			/* LINTED const castaway */
-			return (wchar_t *)s;
-		}
-		s++;
-	}
-	return NULL;
-}
diff --git a/lib/libc_bsd/string/wmemcmp.c b/lib/libc_bsd/string/wmemcmp.c
deleted file mode 100644
index bdf623f..0000000
--- a/lib/libc_bsd/string/wmemcmp.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemcmp.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemcmp.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wmemcmp.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <wchar.h>
-
-int
-wmemcmp(const wchar_t *s1, const wchar_t *s2, size_t n)
-{
-	size_t i;
-
-	for (i = 0; i < n; i++) {
-		if (*s1 != *s2) {
-			/* wchar might be unsigned */
-			return *s1 > *s2 ? 1 : -1; 
-		}
-		s1++;
-		s2++;
-	}
-	return 0;
-}
diff --git a/lib/libc_bsd/string/wmemcpy.c b/lib/libc_bsd/string/wmemcpy.c
deleted file mode 100644
index 53a0b6b..0000000
--- a/lib/libc_bsd/string/wmemcpy.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemcpy.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemcpy.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wmemcpy.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-wmemcpy(wchar_t * __restrict d, const wchar_t * __restrict s, size_t n)
-{
-	return (wchar_t *)memcpy(d, s, n * sizeof(wchar_t));
-}
diff --git a/lib/libc_bsd/string/wmemmove.c b/lib/libc_bsd/string/wmemmove.c
deleted file mode 100644
index b7ac752..0000000
--- a/lib/libc_bsd/string/wmemmove.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemmove.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemmove.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wmemmove.c 188080 2009-02-03 17:58:20Z danger $");
-
-#include <string.h>
-#include <wchar.h>
-
-wchar_t *
-wmemmove(wchar_t *d, const wchar_t *s, size_t n)
-{
-	return (wchar_t *)memmove(d, s, n * sizeof(wchar_t));
-}
diff --git a/lib/libc_bsd/string/wmemset.c b/lib/libc_bsd/string/wmemset.c
deleted file mode 100644
index 684c164..0000000
--- a/lib/libc_bsd/string/wmemset.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c)1999 Citrus Project,
- * 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.
- *
- * 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.
- *
- *	citrus Id: wmemset.c,v 1.2 2000/12/20 14:08:31 itojun Exp
- */
-
-#include <sys/cdefs.h>
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: wmemset.c,v 1.1 2000/12/23 23:14:37 itojun Exp $");
-#endif /* LIBC_SCCS and not lint */
-#endif
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/string/wmemset.c 188098 2009-02-03 20:25:36Z imp $");
-
-#include <wchar.h>
-
-wchar_t	*
-wmemset(wchar_t *s, wchar_t c, size_t n)
-{
-	size_t i;
-	wchar_t *p;
-
-	p = (wchar_t *)s;
-	for (i = 0; i < n; i++) {
-		*p = c;
-		p++;
-	}
-	return s;
-}
diff --git a/lib/libc_bsd/sys/Makefile.incl b/lib/libc_bsd/sys/Makefile.incl
deleted file mode 100644
index fa209d4..0000000
--- a/lib/libc_bsd/sys/Makefile.incl
+++ /dev/null
@@ -1,460 +0,0 @@
-#	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-Makefile.incl 281981 2015-04-25 08:14:08Z kib $
-
-# sys sources
-.PATH: ${.CURDIR}/${LIBC_ARCH}/sys ${.CURDIR}/sys
-
-# Include the generated makefile containing the *complete* list
-# of syscall names in MIASM.
-.include "${.CURDIR}/../../sys/sys/syscall.mk"
-
-# Include machine dependent definitions.
-#
-# MDASM names override the default syscall names in MIASM.
-# NOASM will prevent the default syscall code from being generated.
-#
-Makefile.incl"
-
-SRCS+= clock_gettime.c gettimeofday.c __vdso_gettimeofday.c
-NOASM+=  clock_gettime.o gettimeofday.o
-PSEUDO+= _clock_gettime.o _gettimeofday.o
-
-# Sources common to both syscall interfaces:
-SRCS+=	\
-	stack_protector.c \
-	stack_protector_compat.c \
-	__error.c \
-	interposing_table.c
-
-.if !defined(WITHOUT_SYSCALL_COMPAT)
-SYSCALL_COMPAT_SRCS= \
-	ftruncate.c \
-	lseek.c \
-	mmap.c \
-	pread.c \
-	pwrite.c \
-	truncate.c
-SRCS+=	${SYSCALL_COMPAT_SRCS}
-NOASM+=	${SYSCALL_COMPAT_SRCS:S/.c/.o/}
-.endif
-
-INTERPOSED = \
-	accept \
-	accept4 \
-	aio_suspend \
-	close \
-	connect \
-	fcntl \
-	fsync \
-	fork \
-	kevent \
-	msync \
-	nanosleep \
-	open \
-	openat \
-	poll \
-	ppoll \
-	pselect \
-	read \
-	readv \
-	recvfrom \
-	recvmsg \
-	select \
-	sendmsg \
-	sendto \
-	setcontext \
-	sigprocmask \
-	sigsuspend \
-	sigtimedwait \
-	sigwait \
-	sigwaitinfo \
-	swapcontext \
-	wait4 \
-	wait6 \
-	write \
-	writev
-
-.if ${MACHINE_CPUARCH} == "sparc64"
-SRCS+=	sigaction.c
-NOASM+=	sigaction.o
-.else
-INTERPOSED+= sigaction
-.endif
-
-SRCS+=	${INTERPOSED:S/$/.c/}
-NOASM+=	${INTERPOSED:S/$/.o/}
-PSEUDO+=	${INTERPOSED:C/^.*$/_&.o/}
-
-# Add machine dependent asm sources:
-SRCS+=${MDASM}
-
-.for _asm in ${MIASM}
-.if (${MDASM:R:M${_asm:R}} == "")
-.if (${NOASM:R:M${_asm:R}} == "")
-ASM+=$(_asm)
-.endif
-.endif
-.endfor
-
-OBJS+=	${ASM} ${PSEUDO}
-
-SASM=	${ASM:S/.o/.S/}
-
-SPSEUDO= ${PSEUDO:S/.o/.S/}
-
-SRCS+=	${SASM} ${SPSEUDO}
-
-SYM_MAPS+=	${.CURDIR}/sys/Symbol.map
-
-# Generated files
-CLEANFILES+=	${SASM} ${SPSEUDO}
-
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
-    ${MACHINE_CPUARCH} == "powerpc"
-NOTE_GNU_STACK='\t.section .note.GNU-stack,"",%%progbits\n'
-.else
-NOTE_GNU_STACK=''
-.endif
-
-${SASM}:
-	printf '#include "compat.h"\n' > ${.TARGET}
-	printf '#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' >> ${.TARGET}
-	printf  ${NOTE_GNU_STACK} >>${.TARGET}
-
-${SPSEUDO}:
-	printf '#include "compat.h"\n' > ${.TARGET}
-	printf '#include "SYS.h"\nPSEUDO(${.PREFIX:S/_//})\n' \
-	    >> ${.TARGET}
-	printf ${NOTE_GNU_STACK} >>${.TARGET}
-
-MAN+=	abort2.2 \
-	accept.2 \
-	access.2 \
-	acct.2 \
-	adjtime.2 \
-	aio_cancel.2 \
-	aio_error.2 \
-	aio_fsync.2 \
-	aio_mlock.2 \
-	aio_read.2 \
-	aio_return.2 \
-	aio_suspend.2 \
-	aio_waitcomplete.2 \
-	aio_write.2 \
-	bind.2 \
-	bindat.2 \
-	brk.2 \
-	cap_enter.2 \
-	cap_fcntls_limit.2 \
-	cap_ioctls_limit.2 \
-	cap_rights_limit.2 \
-	chdir.2 \
-	chflags.2 \
-	chmod.2 \
-	chown.2 \
-	chroot.2 \
-	clock_gettime.2 \
-	close.2 \
-	closefrom.2 \
-	connect.2 \
-	connectat.2 \
-	cpuset.2 \
-	cpuset_getaffinity.2 \
-	dup.2 \
-	execve.2 \
-	_exit.2 \
-	extattr_get_file.2 \
-	fcntl.2 \
-	ffclock.2 \
-	fhopen.2 \
-	flock.2 \
-	fork.2 \
-	fsync.2 \
-	getdirentries.2 \
-	getdtablesize.2 \
-	getfh.2 \
-	getfsstat.2 \
-	getgid.2 \
-	getgroups.2 \
-	getitimer.2 \
-	getlogin.2 \
-	getloginclass.2 \
-	getpeername.2 \
-	getpgrp.2 \
-	getpid.2 \
-	getpriority.2 \
-	getrlimit.2 \
-	getrusage.2 \
-	getsid.2 \
-	getsockname.2 \
-	getsockopt.2 \
-	gettimeofday.2 \
-	getuid.2 \
-	intro.2 \
-	ioctl.2 \
-	issetugid.2 \
-	jail.2 \
-	kenv.2 \
-	kill.2 \
-	kldfind.2 \
-	kldfirstmod.2 \
-	kldload.2 \
-	kldnext.2 \
-	kldstat.2 \
-	kldsym.2 \
-	kldunload.2 \
-	kqueue.2 \
-	ktrace.2 \
-	link.2 \
-	lio_listio.2 \
-	listen.2 \
-	lseek.2 \
-	madvise.2 \
-	mincore.2 \
-	minherit.2 \
-	mkdir.2 \
-	mkfifo.2 \
-	mknod.2 \
-	mlock.2 \
-	mlockall.2 \
-	mmap.2 \
-	modfind.2 \
-	modnext.2 \
-	modstat.2 \
-	mount.2 \
-	mprotect.2 \
-	mq_close.2 \
-	mq_getattr.2 \
-	mq_notify.2 \
-	mq_open.2 \
-	mq_receive.2 \
-	mq_send.2 \
-	mq_setattr.2 \
-	msgctl.2 \
-	msgget.2 \
-	msgrcv.2 \
-	msgsnd.2 \
-	msync.2 \
-	munmap.2 \
-	nanosleep.2 \
-	nfssvc.2 \
-	ntp_adjtime.2 \
-	open.2 \
-	pathconf.2 \
-	pdfork.2 \
-	pipe.2 \
-	poll.2 \
-	posix_fadvise.2 \
-	posix_fallocate.2 \
-	posix_openpt.2 \
-	procctl.2 \
-	profil.2 \
-	pselect.2 \
-	ptrace.2 \
-	quotactl.2 \
-	read.2 \
-	readlink.2 \
-	reboot.2 \
-	recv.2 \
-	rename.2 \
-	revoke.2 \
-	rfork.2 \
-	rmdir.2 \
-	rtprio.2
-.if !defined(NO_P1003_1B)
-MAN+=	sched_get_priority_max.2 \
-	sched_setparam.2 \
-	sched_setscheduler.2 \
-	sched_yield.2
-.endif
-MAN+=	sctp_generic_recvmsg.2 \
-	sctp_generic_sendmsg.2 \
-	sctp_peeloff.2 \
-	select.2 \
-	semctl.2 \
-	semget.2 \
-	semop.2 \
-	send.2 \
-	setfib.2 \
-	sendfile.2 \
-	setgroups.2 \
-	setpgid.2 \
-	setregid.2 \
-	setresuid.2 \
-	setreuid.2 \
-	setsid.2 \
-	setuid.2 \
-	shmat.2 \
-	shmctl.2 \
-	shmget.2 \
-	shm_open.2 \
-	shutdown.2 \
-	sigaction.2 \
-	sigaltstack.2 \
-	sigpending.2 \
-	sigprocmask.2 \
-	sigqueue.2 \
-	sigreturn.2 \
-	sigstack.2 \
-	sigsuspend.2 \
-	sigwait.2 \
-	sigwaitinfo.2 \
-	socket.2 \
-	socketpair.2 \
-	stat.2 \
-	statfs.2 \
-	swapon.2 \
-	symlink.2 \
-	sync.2 \
-	sysarch.2 \
-	syscall.2 \
-	timer_create.2 \
-	timer_delete.2 \
-	timer_settime.2 \
-	truncate.2 \
-	umask.2 \
-	undelete.2 \
-	unlink.2 \
-	utimes.2 \
-	utrace.2 \
-	uuidgen.2 \
-	vfork.2 \
-	wait.2 \
-	write.2
-
-MLINKS+=accept.2 accept4.2
-MLINKS+=access.2 eaccess.2 \
-	access.2 faccessat.2
-MLINKS+=brk.2 sbrk.2
-MLINKS+=cap_enter.2 cap_getmode.2
-MLINKS+=cap_fcntls_limit.2 cap_fcntls_get.2
-MLINKS+=cap_ioctls_limit.2 cap_ioctls_get.2
-MLINKS+=cap_rights_limit.2 cap_rights_get.2
-MLINKS+=chdir.2 fchdir.2
-MLINKS+=chflags.2 chflagsat.2 \
-	chflags.2 fchflags.2 \
-	chflags.2 lchflags.2
-MLINKS+=chmod.2 fchmod.2 \
-	chmod.2 fchmodat.2 \
-	chmod.2 lchmod.2
-MLINKS+=chown.2 fchown.2 \
-	chown.2 fchownat.2 \
-	chown.2 lchown.2
-MLINKS+=clock_gettime.2 clock_getres.2 \
-	clock_gettime.2 clock_settime.2
-MLINKS+=cpuset.2 cpuset_getid.2 \
-	cpuset.2 cpuset_setid.2
-MLINKS+=cpuset_getaffinity.2 cpuset_setaffinity.2
-MLINKS+=dup.2 dup2.2
-MLINKS+=execve.2 fexecve.2
-MLINKS+=extattr_get_file.2 extattr.2 \
-	extattr_get_file.2 extattr_delete_fd.2 \
-	extattr_get_file.2 extattr_delete_file.2 \
-	extattr_get_file.2 extattr_delete_link.2 \
-	extattr_get_file.2 extattr_get_fd.2 \
-	extattr_get_file.2 extattr_get_link.2 \
-	extattr_get_file.2 extattr_list_fd.2 \
-	extattr_get_file.2 extattr_list_file.2 \
-	extattr_get_file.2 extattr_list_link.2 \
-	extattr_get_file.2 extattr_set_fd.2 \
-	extattr_get_file.2 extattr_set_file.2 \
-	extattr_get_file.2 extattr_set_link.2
-MLINKS+=ffclock.2 ffclock_getcounter.2 \
-	ffclock.2 ffclock_getestimate.2 \
-	ffclock.2 ffclock_setestimate.2
-MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatfs.2
-MLINKS+=getdirentries.2 getdents.2
-MLINKS+=getfh.2 lgetfh.2
-MLINKS+=getgid.2 getegid.2
-MLINKS+=getitimer.2 setitimer.2
-MLINKS+=getlogin.2 getlogin_r.3
-MLINKS+=getlogin.2 setlogin.2
-MLINKS+=getloginclass.2 setloginclass.2
-MLINKS+=getpgrp.2 getpgid.2
-MLINKS+=getpid.2 getppid.2
-MLINKS+=getpriority.2 setpriority.2
-MLINKS+=getrlimit.2 setrlimit.2
-MLINKS+=getsockopt.2 setsockopt.2
-MLINKS+=gettimeofday.2 settimeofday.2
-MLINKS+=getuid.2 geteuid.2
-MLINKS+=intro.2 errno.2
-MLINKS+=jail.2 jail_attach.2 \
-	jail.2 jail_get.2 \
-	jail.2 jail_remove.2 \
-	jail.2 jail_set.2
-MLINKS+=kldunload.2 kldunloadf.2
-MLINKS+=kqueue.2 kevent.2 \
-	kqueue.2 EV_SET.3
-MLINKS+=link.2 linkat.2
-MLINKS+=madvise.2 posix_madvise.2
-MLINKS+=mkdir.2 mkdirat.2
-MLINKS+=mkfifo.2 mkfifoat.2
-MLINKS+=mknod.2 mknodat.2
-MLINKS+=mlock.2 munlock.2
-MLINKS+=mlockall.2 munlockall.2
-MLINKS+=modnext.2 modfnext.2
-MLINKS+=mount.2 nmount.2 \
-	mount.2 unmount.2
-MLINKS+=mq_receive.2 mq_timedreceive.2
-MLINKS+=mq_send.2 mq_timedsend.2
-MLINKS+=ntp_adjtime.2 ntp_gettime.2
-MLINKS+=open.2 openat.2
-MLINKS+=pathconf.2 fpathconf.2
-MLINKS+=pathconf.2 lpathconf.2
-MLINKS+=pdfork.2 pdgetpid.2\
-	pdfork.2 pdkill.2 \
-	pdfork.2 pdwait4.2
-MLINKS+=pipe.2 pipe2.2
-MLINKS+=poll.2 ppoll.2
-MLINKS+=read.2 pread.2 \
-	read.2 preadv.2 \
-	read.2 readv.2
-MLINKS+=readlink.2 readlinkat.2
-MLINKS+=recv.2 recvfrom.2 \
-	recv.2 recvmsg.2
-MLINKS+=rename.2 renameat.2
-MLINKS+=rtprio.2 rtprio_thread.2
-.if !defined(NO_P1003_1B)
-MLINKS+=sched_get_priority_max.2 sched_get_priority_min.2 \
-	sched_get_priority_max.2 sched_rr_get_interval.2
-MLINKS+=sched_setparam.2 sched_getparam.2
-MLINKS+=sched_setscheduler.2 sched_getscheduler.2
-.endif
-MLINKS+=select.2 FD_CLR.3 \
-	select.2 FD_ISSET.3 \
-	select.2 FD_SET.3 \
-	select.2 FD_ZERO.3
-MLINKS+=send.2 sendmsg.2 \
-	send.2 sendto.2
-MLINKS+=setpgid.2 setpgrp.2
-MLINKS+=setresuid.2 getresgid.2 \
-	setresuid.2 getresuid.2 \
-	setresuid.2 setresgid.2
-MLINKS+=setuid.2 setegid.2 \
-	setuid.2 seteuid.2 \
-	setuid.2 setgid.2
-MLINKS+=shmat.2 shmdt.2
-MLINKS+=shm_open.2 shm_unlink.2
-MLINKS+=sigwaitinfo.2 sigtimedwait.2
-MLINKS+=stat.2 fstat.2 \
-	stat.2 fstatat.2 \
-	stat.2 lstat.2
-MLINKS+=statfs.2 fstatfs.2
-MLINKS+=swapon.2 swapoff.2
-MLINKS+=symlink.2 symlinkat.2
-MLINKS+=syscall.2 __syscall.2
-MLINKS+=timer_settime.2 timer_getoverrun.2 \
-	timer_settime.2 timer_gettime.2
-MLINKS+=truncate.2 ftruncate.2
-MLINKS+=unlink.2 unlinkat.2
-MLINKS+=utimes.2 futimes.2 \
-	utimes.2 futimesat.2 \
-	utimes.2 lutimes.2
-MLINKS+=wait.2 wait3.2 \
-	wait.2 wait4.2 \
-	wait.2 waitpid.2 \
-	wait.2 waitid.2 \
-	wait.2 wait6.2
-MLINKS+=write.2 pwrite.2 \
-	write.2 pwritev.2 \
-	write.2 writev.2
\ No newline at end of file
diff --git a/lib/libc_bsd/sys/Symbol.map b/lib/libc_bsd/sys/Symbol.map
deleted file mode 100644
index 33e85a4..0000000
--- a/lib/libc_bsd/sys/Symbol.map
+++ /dev/null
@@ -1,1053 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/sys/Symbol.map 277317 2015-01-18 11:54:20Z kib $
- */
-
-/*
- * It'd be nice to have this automatically generated, but we don't
- * know to what version they will eventually belong, so for now
- * it has to be manual.
- */
-FBSD_1.0 {
-	__acl_aclcheck_fd;
-	__acl_aclcheck_file;
-	__acl_aclcheck_link;
-	__acl_delete_fd;
-	__acl_delete_file;
-	__acl_delete_link;
-	__acl_get_fd;
-	__acl_get_file;
-	__acl_get_link;
-	__acl_set_fd;
-	__acl_set_file;
-	__acl_set_link;
-	__getcwd;
-	__mac_execve;
-	__mac_get_fd;
-	__mac_get_file;
-	__mac_get_link;
-	__mac_get_pid;
-	__mac_get_proc;
-	__mac_set_fd;
-	__mac_set_file;
-	__mac_set_link;
-	__mac_set_proc;
-	__setugid;
-	__syscall;
-	__sysctl;
-	_umtx_lock;
-	_umtx_op;
-	_umtx_unlock;
-	abort2;
-	accept;
-	access;
-	acct;
-	adjtime;
-	aio_cancel;
-	aio_error;
-	aio_fsync;
-	aio_read;
-	aio_return;
-	aio_suspend;
-	aio_waitcomplete;
-	aio_write;
-	audit;
-	auditctl;
-	auditon;
-	bind;
-	chdir;
-	chflags;
-	__chk_fail;
-	chmod;
-	chown;
-	chroot;
-	clock_getres;
-	clock_gettime;
-	clock_settime;
-	close;
-	connect;
-	dup;
-	dup2;
-	eaccess;
-	execve;
-	extattr_delete_fd;
-	extattr_delete_file;
-	extattr_delete_link;
-	extattr_get_fd;
-	extattr_get_file;
-	extattr_get_link;
-	extattr_list_fd;
-	extattr_list_file;
-	extattr_list_link;
-	extattr_set_fd;
-	extattr_set_file;
-	extattr_set_link;
-	extattrctl;
-	fchdir;
-	fchflags;
-	fchmod;
-	fchown;
-	fcntl;
-	fhopen;
-	fhstat;
-	fhstatfs;
-	flock;
-	fork;
-	fpathconf;
-	fstat;
-	fstatfs;
-	fsync;
-	futimes;
-	getaudit;
-	getaudit_addr;
-	getauid;
-	getcontext;
-	getdents;
-	getdirentries;
-	getdtablesize;
-	getegid;
-	geteuid;
-	getfh;
-	getfsstat;
-	getgid;
-	getgroups;
-	getitimer;
-	getpeername;
-	getpgid;
-	getpgrp;
-	getpid;
-	getppid;
-	getpriority;
-	getresgid;
-	getresuid;
-	getrlimit;
-	getrusage;
-	getsid;
-	getsockname;
-	getsockopt;
-	gettimeofday;
-	getuid;
-	ioctl;
-	issetugid;
-	jail;
-	jail_attach;
-	kenv;
-	kevent;
-	kill;
-	kldfind;
-	kldfirstmod;
-	kldload;
-	kldnext;
-	kldstat;
-	kldsym;
-	kldunload;
-	kldunloadf;
-	kqueue;
-	kmq_notify;		/* Do we want these to be public interfaces? */
-	kmq_open;		/* librt uses them to provide mq_xxx. */
-	kmq_setattr;
-	kmq_timedreceive;
-	kmq_timedsend;
-	kmq_unlink;
-	ksem_close;
-	ksem_destroy;
-	ksem_getvalue;
-	ksem_init;
-	ksem_open;
-	ksem_post;
-	ksem_timedwait;
-	ksem_trywait;
-	ksem_unlink;
-	ksem_wait;
-	ktrace;
-	lchflags;
-	lchmod;
-	lchown;
-	lgetfh;
-	link;
-	lio_listio;
-	listen;
-	lstat;
-	lutimes;
-	mac_syscall;
-	madvise;
-	mincore;
-	minherit;
-	mkdir;
-	mkfifo;
-	mknod;
-	mlock;
-	mlockall;
-	modfind;
-	modfnext;
-	modnext;
-	modstat;
-	mount;
-	mprotect;
-	msgget;
-	msgrcv;
-	msgsnd;
-	msgsys;
-	msync;
-	munlock;
-	munlockall;
-	munmap;
-	nanosleep;
-	netbsd_lchown;
-	netbsd_msync;
-	nfssvc;
-	nfstat;
-	nlstat;
-	nmount;
-	nstat;
-	ntp_adjtime;
-	ntp_gettime;
-	oaio_read;
-	oaio_write;
-	olio_listio;
-	open;
-	pathconf;
-	pipe;
-	poll;
-	posix_openpt;
-	preadv;
-	profil;
-	pselect;
-	ptrace;
-	pwritev;
-	quotactl;
-	read;
-	readlink;
-	readv;
-	reboot;
-	recvfrom;
-	recvmsg;
-	rename;
-	revoke;
-	rfork;
-	rmdir;
-	rtprio;
-	rtprio_thread;
-	sched_get_priority_max;
-	sched_get_priority_min;
-	sched_getparam;
-	sched_getscheduler;
-	sched_rr_get_interval;
-	sched_setparam;
-	sched_setscheduler;
-	sched_yield;
-	select;
-	semget;
-	semop;
-	semsys;
-	sendfile;
-	sendmsg;
-	sendto;
-	setaudit;
-	setaudit_addr;
-	setauid;
-	setegid;
-	seteuid;
-	setgid;
-	setgroups;
-	setitimer;
-	setlogin;
-	setpgid;
-	setpriority;
-	setregid;
-	setresgid;
-	setresuid;
-	setreuid;
-	setrlimit;
-	setsid;
-	setsockopt;
-	settimeofday;
-	setuid;
-	shm_open;
-	shm_unlink;
-	shmat;
-	shmdt;
-	shmget;
-	shmsys;
-	shutdown;
-	sigaction;
-	sigaltstack;
-	sigpending;
-	sigprocmask;
-	sigqueue;
-	sigreturn;
-	sigsuspend;
-	sigtimedwait;
-	sigwait;
-	sigwaitinfo;
-	socket;
-	socketpair;
-	__stack_chk_fail;
-	__stack_chk_guard;
-	stat;
-	statfs;
-	swapoff;
-	swapon;
-	symlink;
-	sync;
-	sysarch;
-	syscall;
-	thr_create;
-	thr_exit;
-	thr_kill;
-	thr_kill2;
-	thr_new;
-	thr_self;
-	thr_set_name;
-	thr_suspend;
-	thr_wake;
-	ktimer_create;		/* Do we want these to be public interfaces? */
-	ktimer_delete;		/* librt uses them to provide timer_xxx. */
-	ktimer_getoverrun;
-	ktimer_gettime;
-	ktimer_settime;
-	umask;
-	undelete;
-	unlink;
-	unmount;
-	utimes;
-	utrace;
-	uuidgen;
-	vadvise;
-	wait4;
-	write;
-	writev;
-
-	__error;
-	ftruncate;
-	lseek;
-	mmap;
-	pread;
-	pwrite;
-	truncate;
-};
-
-FBSD_1.1 {
-	__semctl;
-	closefrom;
-	cpuset;
-	cpuset_getid;
-	cpuset_setid;
-	cpuset_getaffinity;
-	cpuset_setaffinity;
-	faccessat;
-	fchmodat;
-	fchownat;
-	fexecve;
-	fstatat;
-	futimesat;
-	jail_get;
-	jail_set;
-	jail_remove;
-	linkat;
-	lpathconf;
-	mkdirat;
-	mkfifoat;
-	mknodat;
-	msgctl;
-	readlinkat;
-	renameat;
-	setfib;
-	shmctl;
-	symlinkat;
-	unlinkat;
-};
-
-FBSD_1.2 {
-	cap_enter;
-	cap_getmode;
-	getloginclass;
-	pdfork;
-	pdgetpid;
-	pdkill;
-	posix_fallocate;
-	rctl_get_racct;
-	rctl_get_rules;
-	rctl_get_limits;
-	rctl_add_rule;
-	rctl_remove_rule;
-	setloginclass;
-};
-
-FBSD_1.3 {
-	accept4;
-	aio_mlock;
-	bindat;
-	cap_fcntls_get;
-	cap_fcntls_limit;
-	cap_ioctls_get;
-	cap_ioctls_limit;
-	__cap_rights_get;
-	cap_rights_limit;
-	cap_sandboxed;
-	chflagsat;
-	clock_getcpuclockid2;
-	connectat;
-	ffclock_getcounter;
-	ffclock_getestimate;
-	ffclock_setestimate;
-	pipe2;
-	posix_fadvise;
-	procctl;
-	wait6;
-};
-
-FBSD_1.4 {
-	ppoll;
-};
-
-FBSDprivate_1.0 {
-	___acl_aclcheck_fd;
-	__sys___acl_aclcheck_fd;
-	___acl_aclcheck_file;
-	__sys___acl_aclcheck_file;
-	___acl_aclcheck_link;
-	__sys___acl_aclcheck_link;
-	___acl_delete_fd;
-	__sys___acl_delete_fd;
-	___acl_delete_file;
-	__sys___acl_delete_file;
-	___acl_delete_link;
-	__sys___acl_delete_link;
-	___acl_get_fd;
-	__sys___acl_get_fd;
-	___acl_get_file;
-	__sys___acl_get_file;
-	___acl_get_link;
-	__sys___acl_get_link;
-	___acl_set_fd;
-	__sys___acl_set_fd;
-	___acl_set_file;
-	__sys___acl_set_file;
-	___acl_set_link;
-	__sys___acl_set_link;
-	___getcwd;
-	__sys___getcwd;
-	___mac_execve;
-	__sys___mac_execve;
-	___mac_get_fd;
-	__sys___mac_get_fd;
-	___mac_get_file;
-	__sys___mac_get_file;
-	___mac_get_link;
-	__sys___mac_get_link;
-	___mac_get_pid;
-	__sys___mac_get_pid;
-	___mac_get_proc;
-	__sys___mac_get_proc;
-	___mac_set_fd;
-	__sys___mac_set_fd;
-	___mac_set_file;
-	__sys___mac_set_file;
-	___mac_set_link;
-	__sys___mac_set_link;
-	___mac_set_proc;
-	__sys___mac_set_proc;
-	___semctl;
-	__sys___semctl;
-	___setugid;
-	__sys___setugid;
-	___syscall;
-	__sys___syscall;
-	___sysctl;
-	__sys___sysctl;
-	__umtx_lock;
-	__sys__umtx_lock;
-	__umtx_op;
-	__sys__umtx_op;
-	__umtx_unlock;
-	__sys__umtx_unlock;
-	_abort2;
-	__sys_abort2;
-	_accept;
-	__sys_accept;
-	_accept4;
-	__sys_accept4;
-	_access;
-	__sys_access;
-	_acct;
-	__sys_acct;
-	_adjtime;
-	__sys_adjtime;
-	_aio_cancel;
-	__sys_aio_cancel;
-	_aio_error;
-	__sys_aio_error;
-	_aio_fsync;
-	__sys_aio_fsync;
-	_aio_read;
-	__sys_aio_read;
-	_aio_return;
-	__sys_aio_return;
-	_aio_suspend;
-	__sys_aio_suspend;
-	_aio_waitcomplete;
-	__sys_aio_waitcomplete;
-	_aio_write;
-	__sys_aio_write;
-	_audit;
-	__sys_audit;
-	_auditctl;
-	__sys_auditctl;
-	_auditon;
-	__sys_auditon;
-	_bind;
-	__sys_bind;
-	_chdir;
-	__sys_chdir;
-	_chflags;
-	__sys_chflags;
-	_chmod;
-	__sys_chmod;
-	_chown;
-	__sys_chown;
-	_chroot;
-	__sys_chroot;
-	_clock_getcpuclockid2;
-	__sys_clock_getcpuclockid2;
-	_clock_getres;
-	__sys_clock_getres;
-	_clock_gettime;
-	__sys_clock_gettime;
-	_clock_settime;
-	__sys_clock_settime;
-	_close;
-	__sys_close;
-	_closefrom;
-	__sys_closefrom;
-	_connect;
-	__sys_connect;
-	_cpuset;
-	__sys_cpuset;
-	_cpuset_getid;
-	__sys_cpuset_getid;
-	_cpuset_setid;
-	__sys_cpuset_setid;
-	_cpuset_getaffinity;
-	__sys_cpuset_getaffinity;
-	_cpuset_setaffinity;
-	__sys_cpuset_setaffinity;
-	_dup;
-	__sys_dup;
-	_dup2;
-	__sys_dup2;
-	_eaccess;
-	__sys_eaccess;
-	_execve;
-	__sys_execve;
-	_extattr_delete_fd;
-	__sys_extattr_delete_fd;
-	_extattr_delete_file;
-	__sys_extattr_delete_file;
-	_extattr_delete_link;
-	__sys_extattr_delete_link;
-	_extattr_get_fd;
-	__sys_extattr_get_fd;
-	_extattr_get_file;
-	__sys_extattr_get_file;
-	_extattr_get_link;
-	__sys_extattr_get_link;
-	_extattr_list_fd;
-	__sys_extattr_list_fd;
-	_extattr_list_file;
-	__sys_extattr_list_file;
-	_extattr_list_link;
-	__sys_extattr_list_link;
-	_extattr_set_fd;
-	__sys_extattr_set_fd;
-	_extattr_set_file;
-	__sys_extattr_set_file;
-	_extattr_set_link;
-	__sys_extattr_set_link;
-	_extattrctl;
-	__sys_extattrctl;
-	_fchdir;
-	__sys_fchdir;
-	_fchflags;
-	__sys_fchflags;
-	_fchmod;
-	__sys_fchmod;
-	_fchown;
-	__sys_fchown;
-	_fcntl;
-	__sys_fcntl;
-	__fcntl_compat;
-	_fhopen;
-	__sys_fhopen;
-	_fhstat;
-	__sys_fhstat;
-	_fhstatfs;
-	__sys_fhstatfs;
-	_flock;
-	__sys_flock;
-	_fork;
-	__sys_fork;
-	_fpathconf;
-	__sys_fpathconf;
-	_fstat;
-	__sys_fstat;
-	_fstatfs;
-	__sys_fstatfs;
-	_fsync;
-	__sys_fsync;
-	_futimes;
-	__sys_futimes;
-	_getaudit;
-	__sys_getaudit;
-	_getaudit_addr;
-	__sys_getaudit_addr;
-	_getauid;
-	__sys_getauid;
-	_getcontext;
-	__sys_getcontext;
-	_getdents;
-	__sys_getdents;
-	_getdirentries;
-	__sys_getdirentries;
-	_getdtablesize;
-	__sys_getdtablesize;
-	_getegid;
-	__sys_getegid;
-	_geteuid;
-	__sys_geteuid;
-	_getfh;
-	__sys_getfh;
-	_getfsstat;
-	__sys_getfsstat;
-	_getgid;
-	__sys_getgid;
-	_getgroups;
-	__sys_getgroups;
-	_getitimer;
-	__sys_getitimer;
-	_getpeername;
-	__sys_getpeername;
-	_getpgid;
-	__sys_getpgid;
-	_getpgrp;
-	__sys_getpgrp;
-	_getpid;
-	__sys_getpid;
-	_getppid;
-	__sys_getppid;
-	_getpriority;
-	__sys_getpriority;
-	_getresgid;
-	__sys_getresgid;
-	_getresuid;
-	__sys_getresuid;
-	_getrlimit;
-	__sys_getrlimit;
-	_getrusage;
-	__sys_getrusage;
-	_getsid;
-	__sys_getsid;
-	_getsockname;
-	__sys_getsockname;
-	_getsockopt;
-	__sys_getsockopt;
-	_gettimeofday;
-	__sys_gettimeofday;
-	_getuid;
-	__sys_getuid;
-	_ioctl;
-	__sys_ioctl;
-	_issetugid;
-	__sys_issetugid;
-	_jail;
-	__sys_jail;
-	_jail_attach;
-	__sys_jail_attach;
-	_kenv;
-	__sys_kenv;
-	_kevent;
-	__sys_kevent;
-	_kill;
-	__sys_kill;
-	_kldfind;
-	__sys_kldfind;
-	_kldfirstmod;
-	__sys_kldfirstmod;
-	_kldload;
-	__sys_kldload;
-	_kldnext;
-	__sys_kldnext;
-	_kldstat;
-	__sys_kldstat;
-	_kldsym;
-	__sys_kldsym;
-	_kldunload;
-	__sys_kldunload;
-	_kldunloadf;
-	__sys_kldunloadf;
-	_kmq_notify;
-	__sys_kmq_notify;
-	_kmq_open;
-	__sys_kmq_open;
-	_kmq_setattr;
-	__sys_kmq_setattr;
-	_kmq_timedreceive;
-	__sys_kmq_timedreceive;
-	_kmq_timedsend;
-	__sys_kmq_timedsend;
-	_kmq_unlink;
-	__sys_kmq_unlink;
-	_kqueue;
-	__sys_kqueue;
-	_ksem_close;
-	__sys_ksem_close;
-	_ksem_destroy;
-	__sys_ksem_destroy;
-	_ksem_getvalue;
-	__sys_ksem_getvalue;
-	_ksem_init;
-	__sys_ksem_init;
-	_ksem_open;
-	__sys_ksem_open;
-	_ksem_post;
-	__sys_ksem_post;
-	_ksem_timedwait;
-	__sys_ksem_timedwait;
-	_ksem_trywait;
-	__sys_ksem_trywait;
-	_ksem_unlink;
-	__sys_ksem_unlink;
-	_ksem_wait;
-	__sys_ksem_wait;
-	_ktrace;
-	__sys_ktrace;
-	_lchflags;
-	__sys_lchflags;
-	_lchmod;
-	__sys_lchmod;
-	_lchown;
-	__sys_lchown;
-	_lgetfh;
-	__sys_lgetfh;
-	_link;
-	__sys_link;
-	_lio_listio;
-	__sys_lio_listio;
-	_listen;
-	__sys_listen;
-	_lstat;
-	__sys_lstat;
-	_lutimes;
-	__sys_lutimes;
-	_mac_syscall;
-	__sys_mac_syscall;
-	_madvise;
-	__sys_madvise;
-	_mincore;
-	__sys_mincore;
-	_minherit;
-	__sys_minherit;
-	_mkdir;
-	__sys_mkdir;
-	_mkfifo;
-	__sys_mkfifo;
-	_mknod;
-	__sys_mknod;
-	_mlock;
-	__sys_mlock;
-	_mlockall;
-	__sys_mlockall;
-	_modfind;
-	__sys_modfind;
-	_modfnext;
-	__sys_modfnext;
-	_modnext;
-	__sys_modnext;
-	_modstat;
-	__sys_modstat;
-	_mount;
-	__sys_mount;
-	_mprotect;
-	__sys_mprotect;
-	_msgctl;
-	__sys_msgctl;
-	_msgget;
-	__sys_msgget;
-	_msgrcv;
-	__sys_msgrcv;
-	_msgsnd;
-	__sys_msgsnd;
-	_msgsys;
-	__sys_msgsys;
-	_msync;
-	__sys_msync;
-	_munlock;
-	__sys_munlock;
-	_munlockall;
-	__sys_munlockall;
-	_munmap;
-	__sys_munmap;
-	_nanosleep;
-	__sys_nanosleep;
-	_netbsd_lchown;
-	__sys_netbsd_lchown;
-	_netbsd_msync;
-	__sys_netbsd_msync;
-	_nfssvc;
-	__sys_nfssvc;
-	_nfstat;
-	__sys_nfstat;
-	_nlstat;
-	__sys_nlstat;
-	_nmount;
-	__sys_nmount;
-	_nstat;
-	__sys_nstat;
-	_ntp_adjtime;
-	__sys_ntp_adjtime;
-	_ntp_gettime;
-	__sys_ntp_gettime;
-	_oaio_read;
-	__sys_oaio_read;
-	_oaio_write;
-	__sys_oaio_write;
-	_olio_listio;
-	__sys_olio_listio;
-	_open;
-	__sys_open;
-	_openat;
-	__sys_openat;
-	_pathconf;
-	__sys_pathconf;
-	_pipe;
-	__sys_pipe;
-	_poll;
-	__sys_poll;
-	_ppoll;
-	__sys_ppoll;
-	_preadv;
-	__sys_preadv;
-	_procctl;
-	__sys_procctl;
-	_profil;
-	__sys_profil;
-	_pselect;
-	__sys_pselect;
-	_ptrace;
-	__sys_ptrace;
-	_pwritev;
-	__sys_pwritev;
-	_quotactl;
-	__sys_quotactl;
-	_read;
-	__sys_read;
-	_readlink;
-	__sys_readlink;
-	_readv;
-	__sys_readv;
-	_reboot;
-	__sys_reboot;
-	_recvfrom;
-	__sys_recvfrom;
-	_recvmsg;
-	__sys_recvmsg;
-	_rename;
-	__sys_rename;
-	_revoke;
-	__sys_revoke;
-	_rfork;
-	__sys_rfork;
-	_rmdir;
-	__sys_rmdir;
-	_rtprio;
-	__sys_rtprio;
-	_rtprio_thread;
-	__sys_rtprio_thread;
-	_sched_get_priority_max;
-	__sys_sched_get_priority_max;
-	_sched_get_priority_min;
-	__sys_sched_get_priority_min;
-	_sched_getparam;
-	__sys_sched_getparam;
-	_sched_getscheduler;
-	__sys_sched_getscheduler;
-	_sched_rr_get_interval;
-	__sys_sched_rr_get_interval;
-	_sched_setparam;
-	__sys_sched_setparam;
-	_sched_setscheduler;
-	__sys_sched_setscheduler;
-	_sched_yield;
-	__sys_sched_yield;
-	_select;
-	__sys_select;
-	_semget;
-	__sys_semget;
-	_semop;
-	__sys_semop;
-	_semsys;
-	__sys_semsys;
-	_sendfile;
-	__sys_sendfile;
-	_sendmsg;
-	__sys_sendmsg;
-	_sendto;
-	__sys_sendto;
-	_setaudit;
-	__sys_setaudit;
-	_setaudit_addr;
-	__sys_setaudit_addr;
-	_setauid;
-	__sys_setauid;
-	_setcontext;
-	__sys_setcontext;
-	_setegid;
-	__sys_setegid;
-	_seteuid;
-	__sys_seteuid;
-	_setgid;
-	__sys_setgid;
-	_setgroups;
-	__sys_setgroups;
-	_setitimer;
-	__sys_setitimer;
-	_setlogin;
-	__sys_setlogin;
-	_setpgid;
-	__sys_setpgid;
-	_setpriority;
-	__sys_setpriority;
-	_setregid;
-	__sys_setregid;
-	_setresgid;
-	__sys_setresgid;
-	_setresuid;
-	__sys_setresuid;
-	_setreuid;
-	__sys_setreuid;
-	_setrlimit;
-	__sys_setrlimit;
-	_setsid;
-	__sys_setsid;
-	_setsockopt;
-	__sys_setsockopt;
-	_settimeofday;
-	__sys_settimeofday;
-	_setuid;
-	__sys_setuid;
-	_shm_open;
-	__sys_shm_open;
-	_shm_unlink;
-	__sys_shm_unlink;
-	_shmat;
-	__sys_shmat;
-	_shmctl;
-	__sys_shmctl;
-	_shmdt;
-	__sys_shmdt;
-	_shmget;
-	__sys_shmget;
-	_shmsys;
-	__sys_shmsys;
-	_shutdown;
-	__sys_shutdown;
-	_sigaction;
-	__sys_sigaction;
-	_sigaltstack;
-	__sys_sigaltstack;
-	_sigpending;
-	__sys_sigpending;
-	_sigprocmask;
-	__sys_sigprocmask;
-	_sigqueue;
-	__sys_sigqueue;
-	_sigreturn;
-	__sys_sigreturn;
-	_sigsuspend;
-	__sys_sigsuspend;
-	_sigtimedwait;
-	__sys_sigtimedwait;
-	_sigwait;
-	__sigwait;
-	__sys_sigwait;
-	_sigwaitinfo;
-	__sys_sigwaitinfo;
-	_socket;
-	__sys_socket;
-	_socketpair;
-	__sys_socketpair;
-	_stat;
-	__sys_stat;
-	_statfs;
-	__sys_statfs;
-	_swapcontext;
-	__sys_swapcontext;
-	_swapoff;
-	__sys_swapoff;
-	_swapon;
-	__sys_swapon;
-	_symlink;
-	__sys_symlink;
-	_sync;
-	__sys_sync;
-	_sysarch;
-	__sys_sysarch;
-	_syscall;
-	__sys_syscall;
-	_thr_create;
-	__sys_thr_create;
-	_thr_exit;
-	__sys_thr_exit;
-	_thr_kill;
-	__sys_thr_kill;
-	_thr_kill2;
-	__sys_thr_kill2;
-	_thr_new;
-	__sys_thr_new;
-	_thr_self;
-	__sys_thr_self;
-	_thr_set_name;
-	__sys_thr_set_name;
-	_thr_suspend;
-	__sys_thr_suspend;
-	_thr_wake;
-	__sys_thr_wake;
-	_ktimer_create;
-	__sys_ktimer_create;
-	_ktimer_delete;
-	__sys_ktimer_delete;
-	_ktimer_getoverrun;
-	__sys_ktimer_getoverrun;
-	_ktimer_gettime;
-	__sys_ktimer_gettime;
-	_ktimer_settime;
-	__sys_ktimer_settime;
-	_umask;
-	__sys_umask;
-	_undelete;
-	__sys_undelete;
-	_unlink;
-	__sys_unlink;
-	_unmount;
-	__sys_unmount;
-	_utimes;
-	__sys_utimes;
-	_utrace;
-	__sys_utrace;
-	_uuidgen;
-	__sys_uuidgen;
-	_vadvise;
-	__sys_vadvise;
-	_wait4;
-	__sys_wait4;
-	_wait6;
-	__sys_wait6;
-	_write;
-	__sys_write;
-	_writev;
-	__sys_writev;
-	__set_error_selector;
-	nlm_syscall;
-	gssd_syscall;
-	__libc_interposing_slot;
-	__libc_sigwait;
-};
diff --git a/lib/libc_bsd/sys/__error.c b/lib/libc_bsd/sys/__error.c
deleted file mode 100644
index b065d96..0000000
--- a/lib/libc_bsd/sys/__error.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1997 John Birrell <jb@cimlogic.com.au>.
- * 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. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/__error.c 277317 2015-01-18 11:54:20Z kib $");
-
-extern int errno;
-
-static int *
-__error_unthreaded(void)
-{
-
-	return (&errno);
-}
-
-static int *(*__error_selector)(void) = __error_unthreaded;
-
-void
-__set_error_selector(int *(*arg)(void))
-{
-
-	__error_selector = arg;
-}
-
-int *
-__error(void)
-{
-
-	return (__error_selector());
-}
diff --git a/lib/libc_bsd/sys/__vdso_gettimeofday.c b/lib/libc_bsd/sys/__vdso_gettimeofday.c
deleted file mode 100644
index df08c9d..0000000
--- a/lib/libc_bsd/sys/__vdso_gettimeofday.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*-
- * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/__vdso_gettimeofday.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/elf.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-#include <time.h>
-#include <machine/atomic.h>
-#include "libc_private.h"
-
-static u_int
-tc_delta(const struct vdso_timehands *th)
-{
-
-	return ((__vdso_gettc(th) - th->th_offset_count) &
-	    th->th_counter_mask);
-}
-
-static int
-binuptime(struct bintime *bt, struct vdso_timekeep *tk, int abs)
-{
-	struct vdso_timehands *th;
-	uint32_t curr, gen;
-
-	do {
-		if (!tk->tk_enabled)
-			return (ENOSYS);
-
-		/*
-		 * XXXKIB. The load of tk->tk_current should use
-		 * atomic_load_acq_32 to provide load barrier. But
-		 * since tk points to r/o mapped page, x86
-		 * implementation of atomic_load_acq faults.
-		 */
-		curr = tk->tk_current;
-		rmb();
-		th = &tk->tk_th[curr];
-		if (th->th_algo != VDSO_TH_ALGO_1)
-			return (ENOSYS);
-		gen = th->th_gen;
-		*bt = th->th_offset;
-		bintime_addx(bt, th->th_scale * tc_delta(th));
-		if (abs)
-			bintime_add(bt, &th->th_boottime);
-
-		/*
-		 * Barrier for load of both tk->tk_current and th->th_gen.
-		 */
-		rmb();
-	} while (curr != tk->tk_current || gen == 0 || gen != th->th_gen);
-	return (0);
-}
-
-static struct vdso_timekeep *tk;
-
-#pragma weak __vdso_gettimeofday
-int
-__vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-	struct bintime bt;
-	int error;
-
-	if (tz != NULL)
-		return (ENOSYS);
-	if (tk == NULL) {
-		error = __vdso_gettimekeep(&tk);
-		if (error != 0 || tk == NULL)
-			return (ENOSYS);
-	}
-	if (tk->tk_ver != VDSO_TK_VER_CURR)
-		return (ENOSYS);
-	error = binuptime(&bt, tk, 1);
-	if (error != 0)
-		return (error);
-	bintime2timeval(&bt, tv);
-	return (0);
-}
-
-#pragma weak __vdso_clock_gettime
-int
-__vdso_clock_gettime(clockid_t clock_id, struct timespec *ts)
-{
-	struct bintime bt;
-	int abs, error;
-
-	if (tk == NULL) {
-		error = _elf_aux_info(AT_TIMEKEEP, &tk, sizeof(tk));
-		if (error != 0 || tk == NULL)
-			return (ENOSYS);
-	}
-	if (tk->tk_ver != VDSO_TK_VER_CURR)
-		return (ENOSYS);
-	switch (clock_id) {
-	case CLOCK_REALTIME:
-	case CLOCK_REALTIME_PRECISE:
-	case CLOCK_REALTIME_FAST:
-	case CLOCK_SECOND:
-		abs = 1;
-		break;
-	case CLOCK_MONOTONIC:
-	case CLOCK_MONOTONIC_PRECISE:
-	case CLOCK_MONOTONIC_FAST:
-	case CLOCK_UPTIME:
-	case CLOCK_UPTIME_PRECISE:
-	case CLOCK_UPTIME_FAST:
-		abs = 0;
-		break;
-	default:
-		return (ENOSYS);
-	}
-	error = binuptime(&bt, tk, abs);
-	if (error != 0)
-		return (error);
-	bintime2timespec(&bt, ts);
-	if (clock_id == CLOCK_SECOND)
-		ts->tv_nsec = 0;
-	return (0);
-}
diff --git a/lib/libc_bsd/sys/_exit.2 b/lib/libc_bsd/sys/_exit.2
deleted file mode 100644
index b21cccf..0000000
--- a/lib/libc_bsd/sys/_exit.2
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Copyright (c) 1980, 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.
-.\" 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.
-.\"
-.\"     @(#)_exit.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/_exit.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt EXIT 2
-.Os
-.Sh NAME
-.Nm _exit
-.Nd terminate the calling process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void
-.Fn _exit "int status"
-.Sh DESCRIPTION
-The
-.Fn _exit
-system call
-terminates a process with the following consequences:
-.Bl -bullet
-.It
-All of the descriptors open in the calling process are closed.
-This may entail delays, for example, waiting for output to drain;
-a process in this state may not be killed, as it is already dying.
-.It
-If the parent process of the calling process has an outstanding
-.Xr wait 2
-call
-or catches the
-.Dv SIGCHLD
-signal,
-it is notified of the calling process's termination and
-the
-.Fa status
-is set as defined by
-.Xr wait 2 .
-.It
-The parent process-ID of all of the calling process's existing child
-processes are set to 1; the initialization process
-inherits each of these processes
-(see
-.Xr init 8
-and the
-.Sx DEFINITIONS
-section of
-.Xr intro 2 ) .
-.It
-If the termination of the process causes any process group
-to become orphaned (usually because the parents of all members
-of the group have now exited; see
-.Dq orphaned process group
-in
-.Xr intro 2 ) ,
-and if any member of the orphaned group is stopped,
-the
-.Dv SIGHUP
-signal and the
-.Dv SIGCONT
-signal are sent to all members of the newly-orphaned process group.
-.It
-If the process is a controlling process (see
-.Xr intro 2 ) ,
-the
-.Dv SIGHUP
-signal is sent to the foreground process group of the controlling terminal,
-and all current access to the controlling terminal is revoked.
-.El
-.Pp
-Most C programs call the library routine
-.Xr exit 3 ,
-which flushes buffers, closes streams, unlinks temporary files, etc.,
-before
-calling
-.Fn _exit .
-.Sh RETURN VALUES
-The
-.Fn _exit
-system call
-can never return.
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr sigaction 2 ,
-.Xr wait 2 ,
-.Xr exit 3 ,
-.Xr init 8
-.Sh STANDARDS
-The
-.Fn _exit
-system call is expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn _exit
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/abort2.2 b/lib/libc_bsd/sys/abort2.2
deleted file mode 100644
index a3dd32d..0000000
--- a/lib/libc_bsd/sys/abort2.2
+++ /dev/null
@@ -1,113 +0,0 @@
-.\" Copyright (c) 2005 Wojciech A. Koszek <dunstan@FreeBSD.czest.pl>
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/abort2.2 162840 2006-09-30 10:24:00Z ru $
-.\"
-.Dd September 30, 2006
-.Dt ABORT2 2
-.Os
-.Sh NAME
-.Nm abort2
-.Nd "abort process with diagnostics"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.Ft void
-.Fn abort2 "const char *why" "int nargs" "void **args"
-.Sh DESCRIPTION
-The
-.Fn abort2
-system call causes the process to be killed and the specified diagnostic
-message (with arguments) to be delivered by the kernel to the
-.Xr syslogd 8
-daemon.
-.Pp
-The
-.Fa why
-argument points to a
-.Dv NUL- Ns
-terminated string specifying a reason of the program's termination
-(maximum 128 characters long).
-The
-.Fa args
-array contains pointers which will be logged numerically
-(with the kernel's
-.Ql %p
-.Xr printf 9
-format).
-The
-.Fa nargs
-argument specifies the number of pointers in
-.Fa args
-(maximum 16).
-.Pp
-The
-.Fn abort2
-system call
-is intended for use in situations where continuation of a process
-is impossible or for other definitive reasons is unwanted, and normal
-diagnostic channels cannot be trusted to deliver the message.
-.Sh RETURN VALUES
-The
-.Fn abort2
-function
-never returns.
-.Pp
-The process is killed with
-.Dv SIGABRT
-unless the arguments to
-.Fn abort2
-are invalid, in which case
-.Dv SIGKILL
-is used.
-.Sh EXAMPLES
-.Bd -literal -compact
-#include <stdlib.h>
-
-if (weight_kg > max_load) {
-	void *ptrs[3];
-
-	ptrs[0] = (void *)(intptr_t)weight_kg;
-	ptrs[1] = (void *)(intptr_t)max_load;
-	ptrs[2] = haystack;
-	abort2("Camel overloaded", 3, ptrs);
-}
-.Ed
-.Sh SEE ALSO
-.Xr abort 3 ,
-.Xr exit 3
-.Sh HISTORY
-The
-.Fn abort2
-system call first appeared in
-.Fx 7.0 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Fn abort2
-system call was designed by
-.An "Poul-Henning Kamp" Aq phk@FreeBSD.org .
-It was implemented by
-.An "Wojciech A. Koszek" Aq dunstan@freebsd.czest.pl .
diff --git a/lib/libc_bsd/sys/accept.2 b/lib/libc_bsd/sys/accept.2
deleted file mode 100644
index 92bbd5d..0000000
--- a/lib/libc_bsd/sys/accept.2
+++ /dev/null
@@ -1,239 +0,0 @@
-.\" Copyright (c) 1983, 1990, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)accept.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/accept.2 273340 2014-10-20 18:53:54Z delphij $
-.\"
-.Dd October 9, 2014
-.Dt ACCEPT 2
-.Os
-.Sh NAME
-.Nm accept ,
-.Nm accept4
-.Nd accept a connection on a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn accept "int s" "struct sockaddr * restrict addr" "socklen_t * restrict addrlen"
-.Ft int
-.Fn accept4 "int s" "struct sockaddr * restrict addr" "socklen_t * restrict addrlen" "int flags"
-.Sh DESCRIPTION
-The argument
-.Fa s
-is a socket that has been created with
-.Xr socket 2 ,
-bound to an address with
-.Xr bind 2 ,
-and is listening for connections after a
-.Xr listen 2 .
-The
-.Fn accept
-system call extracts the first connection request on the
-queue of pending connections, creates a new socket,
-and allocates a new file descriptor for the socket which
-inherits the state of the
-.Dv O_NONBLOCK
-and
-.Dv O_ASYNC
-properties and the destination of
-.Dv SIGIO
-and
-.Dv SIGURG
-signals from the original socket
-.Fa s .
-.Pp
-The
-.Fn accept4
-system call is similar,
-but the
-.Dv O_NONBLOCK
-property of the new socket is instead determined by the
-.Dv SOCK_NONBLOCK
-flag in the
-.Fa flags
-argument,
-the
-.Dv O_ASYNC
-property is cleared,
-the signal destination is cleared
-and the close-on-exec flag on the new file descriptor can be set via the
-.Dv SOCK_CLOEXEC
-flag in the
-.Fa flags
-argument.
-.Pp
-If no pending connections are
-present on the queue, and the original socket
-is not marked as non-blocking,
-.Fn accept
-blocks the caller until a connection is present.
-If the original socket
-is marked non-blocking and no pending
-connections are present on the queue,
-.Fn accept
-returns an error as described below.
-The accepted socket
-may not be used
-to accept more connections.
-The original socket
-.Fa s
-remains open.
-.Pp
-The argument
-.Fa addr
-is a result argument that is filled-in with
-the address of the connecting entity,
-as known to the communications layer.
-The exact format of the
-.Fa addr
-argument is determined by the domain in which the communication
-is occurring.
-A null pointer may be specified for
-.Fa addr
-if the address information is not desired;
-in this case,
-.Fa addrlen
-is not used and should also be null.
-Otherwise, the
-.Fa addrlen
-argument
-is a value-result argument; it should initially contain the
-amount of space pointed to by
-.Fa addr ;
-on return it will contain the actual length (in bytes) of the
-address returned.
-This call
-is used with connection-based socket types, currently with
-.Dv SOCK_STREAM .
-.Pp
-It is possible to
-.Xr select 2
-a socket for the purposes of doing an
-.Fn accept
-by selecting it for read.
-.Pp
-For certain protocols which require an explicit confirmation,
-such as
-.Tn ISO
-or
-.Tn DATAKIT ,
-.Fn accept
-can be thought of
-as merely dequeueing the next connection
-request and not implying confirmation.
-Confirmation can be implied by a normal read or write on the new
-file descriptor, and rejection can be implied by closing the
-new socket.
-.Pp
-For some applications, performance may be enhanced by using an
-.Xr accept_filter 9
-to pre-process incoming connections.
-.Pp
-When using
-.Fn accept ,
-portable programs should not rely on the
-.Dv O_NONBLOCK
-and
-.Dv O_ASYNC
-properties and the signal destination being inherited,
-but should set them explicitly using
-.Xr fcntl 2 ;
-.Fn accept4
-sets these properties consistently,
-but may not be fully portable across
-.Ux
-platforms.
-.Sh RETURN VALUES
-These calls return \-1 on error.
-If they succeed, they return a non-negative
-integer that is a descriptor for the accepted socket.
-.Sh ERRORS
-The
-.Fn accept
-and
-.Fn accept4
-system calls will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The descriptor is invalid.
-.It Bq Er EINTR
-The
-.Fn accept
-operation was interrupted.
-.It Bq Er EMFILE
-The per-process descriptor table is full.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er ENOTSOCK
-The descriptor references a file, not a socket.
-.It Bq Er EINVAL
-.Xr listen 2
-has not been called on the socket descriptor.
-.It Bq Er EFAULT
-The
-.Fa addr
-argument is not in a writable part of the
-user address space.
-.It Bo Er EWOULDBLOCK Bc or Bq Er EAGAIN
-The socket is marked non-blocking and no connections
-are present to be accepted.
-.It Bq Er ECONNABORTED
-A connection arrived, but it was closed while waiting
-on the listen queue.
-.El
-.Pp
-The
-.Fn accept4
-system call will also fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa flags
-argument is invalid.
-.El
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr connect 2 ,
-.Xr getpeername 2 ,
-.Xr getsockname 2 ,
-.Xr listen 2 ,
-.Xr select 2 ,
-.Xr socket 2 ,
-.Xr accept_filter 9
-.Sh HISTORY
-The
-.Fn accept
-system call appeared in
-.Bx 4.2 .
-.Pp
-The
-.Fn accept4
-system call appeared in
-.Fx 10.0 .
diff --git a/lib/libc_bsd/sys/accept.c b/lib/libc_bsd/sys/accept.c
deleted file mode 100644
index 03b78dc..0000000
--- a/lib/libc_bsd/sys/accept.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/accept.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/socket.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_accept, __accept);
-
-#pragma weak accept
-int
-accept(int s, struct sockaddr *addr, socklen_t *addrlen)
-{
-
-	return (((int (*)(int, struct sockaddr *, socklen_t *))
-	    __libc_interposing[INTERPOS_accept])(s, addr, addrlen));
-}
diff --git a/lib/libc_bsd/sys/accept4.c b/lib/libc_bsd/sys/accept4.c
deleted file mode 100644
index 9d845be..0000000
--- a/lib/libc_bsd/sys/accept4.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/accept4.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/socket.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_accept4, __accept4);
-
-#pragma weak accept4
-int
-accept4(int s, struct sockaddr *addr, socklen_t *addrlen, int flags)
-{
-
-	return (((int (*)(int, struct sockaddr *, socklen_t *, int))
-	    __libc_interposing[INTERPOS_accept4])(s, addr, addrlen, flags));
-}
diff --git a/lib/libc_bsd/sys/access.2 b/lib/libc_bsd/sys/access.2
deleted file mode 100644
index 3662c9c..0000000
--- a/lib/libc_bsd/sys/access.2
+++ /dev/null
@@ -1,235 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)access.2	8.2 (Berkeley) 4/1/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/access.2 208027 2010-05-13 12:07:55Z uqs $
-.\"
-.Dd April 10, 2008
-.Dt ACCESS 2
-.Os
-.Sh NAME
-.Nm access ,
-.Nm eaccess ,
-.Nm faccessat
-.Nd check accessibility of a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn access "const char *path" "int mode"
-.Ft int
-.Fn eaccess "const char *path" "int mode"
-.Ft int
-.Fn faccessat "int fd" "const char *path" "int mode" "int flag"
-.Sh DESCRIPTION
-The
-.Fn access
-and
-.Fn eaccess
-system calls check the accessibility of the
-file named by
-the
-.Fa path
-argument
-for the access permissions indicated by
-the
-.Fa mode
-argument.
-The value of
-.Fa mode
-is either the bitwise-inclusive OR of the access permissions to be
-checked
-.Dv ( R_OK
-for read permission,
-.Dv W_OK
-for write permission, and
-.Dv X_OK
-for execute/search permission),
-or the existence test
-.Pq Dv F_OK .
-.Pp
-For additional information, see the
-.Sx "File Access Permission"
-section of
-.Xr intro 2 .
-.Pp
-The
-.Fn eaccess
-system call uses
-the effective user ID and the group access list
-to authorize the request;
-the
-.Fn access
-system call uses
-the real user ID in place of the effective user ID,
-the real group ID in place of the effective group ID,
-and the rest of the group access list.
-.Pp
-The
-.Fn faccessat
-system call is equivalent to
-.Fn access
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the file whose accessibility is to be determined is
-located relative to the directory associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-If
-.Fn faccessat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is
-identical to a call to
-.Fn access .
-Values for
-.Fa flag
-are constructed by a bitwise-inclusive OR of flags from the following
-list, defined in
-.In fcntl.h :
-.Bl -tag -width indent
-.It Dv AT_EACCESS
-The checks for accessibility are performed using the effective user and group
-IDs instead of the real user and group ID as required in a call to
-.Fn access .
-.El
-.Pp
-Even if a process's real or effective user has appropriate privileges
-and indicates success for
-.Dv X_OK ,
-the file may not actually have execute permission bits set.
-Likewise for
-.Dv R_OK
-and
-.Dv W_OK .
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-Access to the file is denied if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EROFS
-Write access is requested for a file on a read-only file system.
-.It Bq Er ETXTBSY
-Write access is requested for a pure procedure (shared text)
-file presently being executed.
-.It Bq Er EACCES
-Permission bits of the file mode do not permit the requested
-access, or search permission is denied on a component of the
-path prefix.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Pp
-Also, the
-.Fn faccessat
-system call may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is
-neither
-.Dv AT_FDCWD
-nor a valid file descriptor.
-.It Bq Er EINVAL
-The value of the
-.Fa flag
-argument is not valid.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr intro 2 ,
-.Xr stat 2
-.Sh STANDARDS
-The
-.Fn access
-system call is expected to conform to
-.St -p1003.1-90 .
-The
-.Fn faccessat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn access
-function appeared in
-.At v7 .
-The
-.Fn faccessat
-system call appeared in
-.Fx 8.0 .
-.Sh SECURITY CONSIDERATIONS
-The
-.Fn access
-system call
-is a potential security hole due to race conditions and
-should never be used.
-Set-user-ID and set-group-ID applications should restore the
-effective user or group ID,
-and perform actions directly rather than use
-.Fn access
-to simulate access checks for the real user or group ID.
-The
-.Fn eaccess
-system call
-likewise may be subject to races if used inappropriately.
-.Pp
-.Fn access
-remains useful for providing clues to users as to whether operations
-make sense for particular filesystem objects (e.g. 'delete' menu
-item only highlighted in a writable folder ... avoiding interpretation
-of the st_mode bits that the application might not understand --
-e.g. in the case of AFS).
-It also allows a cheaper file existence test than
-.Xr stat 2 .
diff --git a/lib/libc_bsd/sys/acct.2 b/lib/libc_bsd/sys/acct.2
deleted file mode 100644
index 81ff2db..0000000
--- a/lib/libc_bsd/sys/acct.2
+++ /dev/null
@@ -1,131 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)acct.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/acct.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 17, 2004
-.Dt ACCT 2
-.Os
-.Sh NAME
-.Nm acct
-.Nd enable or disable process accounting
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn acct "const char *file"
-.Sh DESCRIPTION
-The
-.Fn acct
-system call enables or disables the collection of system accounting
-records.
-If the argument
-.Fa file
-is a null pointer, accounting is disabled.
-If
-.Fa file
-is an
-.Em existing
-pathname (null-terminated), record collection is enabled and for
-every process initiated which terminates under normal
-conditions an accounting record is appended to
-.Fa file .
-Abnormal conditions of termination are reboots
-or other fatal system problems.
-Records for processes which never terminate cannot be
-produced by
-.Fn acct .
-.Pp
-For more information on the record structure used by
-.Fn acct ,
-see
-.In sys/acct.h
-and
-.Xr acct 5 .
-.Pp
-This call is permitted only to the super-user.
-.Sh NOTES
-Accounting is automatically disabled when the file system the
-accounting file resides on runs out of space; it is enabled when
-space once again becomes available.
-The values controlling this behaviour can be modified using the following
-.Xr sysctl 8
-variables:
-.Bl -tag -width ".Va kern.acct_chkfreq"
-.It Va kern.acct_chkfreq
-Specifies the frequency (in seconds) with which free disk
-space should be checked.
-.It Va kern.acct_resume
-The percentage of free disk space above which process
-accounting will resume.
-.It Va kern.acct_suspend
-The percentage of free disk space below which process
-accounting will suspend.
-.El
-.Sh RETURN VALUES
-On error -1 is returned.
-The file must exist and the call may be exercised only by the super-user.
-.Sh ERRORS
-The
-.Fn acct
-system call will fail if one of the following is true:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The caller is not the super-user.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix,
-or the path name is not a regular file.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er EFAULT
-The
-.Fa file
-argument
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr acct 5 ,
-.Xr accton 8 ,
-.Xr sa 8
-.Sh HISTORY
-The
-.Fn acct
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/adjtime.2 b/lib/libc_bsd/sys/adjtime.2
deleted file mode 100644
index 4aa7d94..0000000
--- a/lib/libc_bsd/sys/adjtime.2
+++ /dev/null
@@ -1,111 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)adjtime.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/adjtime.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt ADJTIME 2
-.Os
-.Sh NAME
-.Nm adjtime
-.Nd "correct the time to allow synchronization of the system clock"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.Ft int
-.Fn adjtime "const struct timeval *delta" "struct timeval *olddelta"
-.Sh DESCRIPTION
-The
-.Fn adjtime
-system call
-makes small adjustments to the system time, as returned by
-.Xr gettimeofday 2 ,
-advancing or retarding it
-by the time specified by the timeval
-.Fa delta .
-If
-.Fa delta
-is negative, the clock is
-slowed down by incrementing it more slowly than normal until
-the correction is complete.
-If
-.Fa delta
-is positive, a larger increment than normal
-is used.
-The skew used to perform the correction is generally a fraction of one percent.
-Thus, the time is always
-a monotonically increasing function.
-A time correction from an earlier call to
-.Fn adjtime
-may not be finished when
-.Fn adjtime
-is called again.
-If
-.Fa olddelta
-is not a null pointer,
-the structure pointed to will contain, upon return, the
-number of microseconds still to be corrected
-from the earlier call.
-.Pp
-This call may be used by time servers that synchronize the clocks
-of computers in a local area network.
-Such time servers would slow down the clocks of some machines
-and speed up the clocks of others to bring them to the average network time.
-.Pp
-The
-.Fn adjtime
-system call
-is restricted to the super-user.
-.Sh RETURN VALUES
-.Rv -std adjtime
-.Sh ERRORS
-The
-.Fn adjtime
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-An argument points outside the process's allocated address space.
-.It Bq Er EPERM
-The process's effective user ID is not that of the super-user.
-.El
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr gettimeofday 2 ,
-.Xr timed 8 ,
-.Xr timedc 8
-.Rs
-.%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"
-.%A R. Gusella
-.%A S. Zatti
-.Re
-.Sh HISTORY
-The
-.Fn adjtime
-system call appeared in
-.Bx 4.3 .
diff --git a/lib/libc_bsd/sys/aio_cancel.2 b/lib/libc_bsd/sys/aio_cancel.2
deleted file mode 100644
index 0328520..0000000
--- a/lib/libc_bsd/sys/aio_cancel.2
+++ /dev/null
@@ -1,117 +0,0 @@
-.\" Copyright (c) 1999 Softweyr LLC.
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Softweyr LLC 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 Softweyr LLC 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: releng/10.2/lib/libc/sys/aio_cancel.2 177870 2008-04-03 02:41:54Z kevlo $
-.\"
-.Dd January 19, 2000
-.Dt AIO_CANCEL 2
-.Os
-.Sh NAME
-.Nm aio_cancel
-.Nd cancel an outstanding asynchronous I/O operation (REALTIME)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fn aio_cancel "int fildes" "struct aiocb *iocb"
-.Sh DESCRIPTION
-The
-.Fn aio_cancel
-system call cancels the outstanding asynchronous
-I/O request for the file descriptor specified in
-.Fa fildes .
-If
-.Fa iocb
-is specified, only that specific asynchronous I/O request is cancelled.
-.Pp
-Normal asynchronous notification occurs for cancelled requests.
-Requests complete with an error result of
-.Er ECANCELED .
-.Sh RESTRICTIONS
-The
-.Fn aio_cancel
-system call does not cancel asynchronous I/O requests for raw disk devices.
-The
-.Fn aio_cancel
-system call will always return
-.Dv AIO_NOTCANCELED
-for file descriptors associated with raw disk devices.
-.Sh RETURN VALUES
-The
-.Fn aio_cancel
-system call returns -1 to indicate an error, or one of the following:
-.Bl -tag -width Dv
-.It Bq Dv AIO_CANCELED
-All outstanding requests meeting the criteria specified were cancelled.
-.It Bq Dv AIO_NOTCANCELED
-Some requests were not cancelled, status for the requests should be
-checked with
-.Xr aio_error 2 .
-.It Bq Dv AIO_ALLDONE
-All of the requests meeting the criteria have finished.
-.El
-.Sh ERRORS
-An error return from
-.Fn aio_cancel
-indicates:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fildes
-argument
-is an invalid file descriptor.
-.El
-.Sh SEE ALSO
-.Xr aio_error 2 ,
-.Xr aio_read 2 ,
-.Xr aio_return 2 ,
-.Xr aio_suspend 2 ,
-.Xr aio_write 2 ,
-.Xr aio 4
-.Sh STANDARDS
-The
-.Fn aio_cancel
-system call is expected to conform to the
-.St -p1003.1
-standard.
-.Sh HISTORY
-The
-.Fn aio_cancel
-system call first appeared in
-.Fx 3.0 .
-The first functional implementation of
-.Fn aio_cancel
-appeared in
-.Fx 4.0 .
-.Sh AUTHORS
-.An -nosplit
-This
-manual page was originally written by
-.An Wes Peters Aq wes@softweyr.com .
-.An Christopher M Sedore Aq cmsedore@maxwell.syr.edu
-updated it when
-.Fn aio_cancel
-was implemented for
-.Fx 4.0 .
diff --git a/lib/libc_bsd/sys/aio_error.2 b/lib/libc_bsd/sys/aio_error.2
deleted file mode 100644
index 09a835d..0000000
--- a/lib/libc_bsd/sys/aio_error.2
+++ /dev/null
@@ -1,101 +0,0 @@
-.\" Copyright (c) 1999 Softweyr LLC.
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Softweyr LLC 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 Softweyr LLC 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: releng/10.2/lib/libc/sys/aio_error.2 162657 2006-09-26 09:47:46Z vd $
-.\"
-.Dd June 2, 1999
-.Dt AIO_ERROR 2
-.Os
-.Sh NAME
-.Nm aio_error
-.Nd retrieve error status of asynchronous I/O operation (REALTIME)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fn aio_error "const struct aiocb *iocb"
-.Sh DESCRIPTION
-The
-.Fn aio_error
-system call returns the error status of the asynchronous I/O request
-associated with the structure pointed to by
-.Fa iocb .
-.Sh RETURN VALUES
-If the asynchronous I/O request has completed successfully,
-.Fn aio_error
-returns 0.
-If the request has not yet completed,
-.Er EINPROGRESS
-is returned.
-If the request has completed unsuccessfully the error
-status is returned as described in
-.Xr read 2 ,
-.Xr write 2 ,
-or
-.Xr fsync 2 .
-On failure,
-.Fn aio_error
-returns
-.Dv -1
-and sets
-.Dv errno
-to indicate the error condition.
-.Sh ERRORS
-The
-.Fn aio_error
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa iocb
-argument
-does not reference an outstanding asynchronous I/O request.
-.El
-.Sh SEE ALSO
-.Xr aio_cancel 2 ,
-.Xr aio_read 2 ,
-.Xr aio_return 2 ,
-.Xr aio_suspend 2 ,
-.Xr aio_write 2 ,
-.Xr fsync 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr aio 4
-.Sh STANDARDS
-The
-.Fn aio_error
-system call
-is expected to conform to the
-.St -p1003.1
-standard.
-.Sh HISTORY
-The
-.Fn aio_error
-system call first appeared in
-.Fx 3.0 .
-.Sh AUTHORS
-This
-manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
diff --git a/lib/libc_bsd/sys/aio_fsync.2 b/lib/libc_bsd/sys/aio_fsync.2
deleted file mode 100644
index 9f924d0..0000000
--- a/lib/libc_bsd/sys/aio_fsync.2
+++ /dev/null
@@ -1,153 +0,0 @@
-.\" Copyright (c) 2013 Sergey Kandaurov
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/aio_fsync.2 260623 2014-01-14 09:49:42Z pluknet $
-.\"
-.Dd December 27, 2013
-.Dt AIO_FSYNC 2
-.Os
-.Sh NAME
-.Nm aio_fsync
-.Nd asynchronous file synchronization (REALTIME)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fn aio_fsync "int op" "struct aiocb *iocb"
-.Sh DESCRIPTION
-The
-.Fn aio_fsync
-system call allows the calling process to move all modified data
-associated with the descriptor
-.Fa iocb->aio_fildes
-to a permanent storage device.
-The call returns immediately after the synchronization request has been
-enqueued to the descriptor; the synchronization may or may not have
-completed at the time the call returns.
-.Pp
-The
-.Fa op
-argument can only be set to
-.Dv O_SYNC
-to cause all currently queued I/O operations to be completed
-as if by a call to
-.Xr fsync 2 .
-.Pp
-If _POSIX_PRIORITIZED_IO is defined, and the descriptor supports it,
-then the enqueued operation is submitted at a priority equal to that
-of the calling process minus
-.Fa iocb->aio_reqprio .
-.Pp
-The
-.Fa iocb
-pointer may be subsequently used as an argument to
-.Fn aio_return
-and
-.Fn aio_error
-in order to determine return or error status for the enqueued operation
-while it is in progress.
-.Pp
-If the request could not be enqueued (generally due to invalid arguments),
-the call returns without having enqueued the request.
-.Sh RETURN VALUES
-.Rv -std aio_fsync
-.Sh ERRORS
-The
-.Fn aio_fsync
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The request was not queued because of system resource limitations.
-.It Bq Er ENOSYS
-The
-.Fn aio_fsync
-system call is not supported.
-.It Bq Er EINVAL
-A value of the
-.Fa op
-argument is not set to
-.Dv O_SYNC .
-.El
-.Pp
-The following conditions may be synchronously detected when the
-.Fn aio_fsync
-system call is made, or asynchronously, at any time thereafter.
-If they are detected at call time,
-.Fn aio_fsync
-returns -1 and sets
-.Va errno
-appropriately; otherwise the
-.Fn aio_return
-system call must be called, and will return -1, and
-.Fn aio_error
-must be called to determine the actual value that would have been
-returned in
-.Va errno .
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa iocb->aio_fildes
-argument
-is not a valid descriptor.
-.It Bq Er EINVAL
-This implementation does not support synchronized I/O for this file.
-.El
-.Pp
-If the request is successfully enqueued, but subsequently cancelled
-or an error occurs, the value returned by the
-.Fn aio_return
-system call is per the
-.Xr read 2
-and
-.Xr write 2
-system calls, and the value returned by the
-.Fn aio_error
-system call is one of the error returns from the
-.Xr read 2
-or
-.Xr write 2
-system calls.
-.Sh SEE ALSO
-.Xr aio_cancel 2 ,
-.Xr aio_error 2 ,
-.Xr aio_read 2 ,
-.Xr aio_return 2 ,
-.Xr aio_suspend 2 ,
-.Xr aio_waitcomplete 2 ,
-.Xr aio_write 2 ,
-.Xr fsync 2 ,
-.Xr siginfo 3 ,
-.Xr aio 4
-.Sh STANDARDS
-The
-.Fn aio_fsync
-system call is expected to conform to the
-.St -p1003.1
-standard.
-.Sh HISTORY
-The
-.Fn aio_fsync
-system call first appeared in
-.Fx 7.0 .
diff --git a/lib/libc_bsd/sys/aio_mlock.2 b/lib/libc_bsd/sys/aio_mlock.2
deleted file mode 100644
index 75078b3..0000000
--- a/lib/libc_bsd/sys/aio_mlock.2
+++ /dev/null
@@ -1,133 +0,0 @@
-.\" Copyright (c) 2013 Gleb Smirnoff <glebius@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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/aio_mlock.2 260035 2013-12-29 09:17:43Z pluknet $
-.\"
-.Dd June 3, 2013
-.Dt AIO_MLOCK 2
-.Os
-.Sh NAME
-.Nm aio_mlock
-.Nd asynchronous
-.Xr mlock 2
-operation
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fn aio_mlock "struct aiocb *iocb"
-.Sh DESCRIPTION
-The
-.Fn aio_mlock
-system call allows the calling process to lock into memory the
-physical pages associated with the virtual address range starting at
-.Fa iocb->aio_buf
-for
-.Fa iocb->aio_nbytes
-bytes.
-The call returns immediately after the locking request has
-been enqueued; the operation may or may not have completed at the time
-the call returns.
-.Pp
-The
-.Fa iocb
-pointer may be subsequently used as an argument to
-.Fn aio_return
-and
-.Fn aio_error
-in order to determine return or error status for the enqueued operation
-while it is in progress.
-.Pp
-If the request could not be enqueued (generally due to
-.Xr aio 4
-limits),
-then the call returns without having enqueued the request.
-.Sh RESTRICTIONS
-The Asynchronous I/O Control Block structure pointed to by
-.Fa iocb
-and the buffer that the
-.Fa iocb->aio_buf
-member of that structure references must remain valid until the
-operation has completed.
-For this reason, use of auto (stack) variables
-for these objects is discouraged.
-.Pp
-The asynchronous I/O control buffer
-.Fa iocb
-should be zeroed before the
-.Fn aio_mlock
-call to avoid passing bogus context information to the kernel.
-.Pp
-Modifications of the Asynchronous I/O Control Block structure or the
-buffer contents after the request has been enqueued, but before the
-request has completed, are not allowed.
-.Sh RETURN VALUES
-.Rv -std aio_mlock
-.Sh ERRORS
-The
-.Fn aio_mlock
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The request was not queued because of system resource limitations.
-.It Bq Er ENOSYS
-The
-.Fn aio_mlock
-system call is not supported.
-.El
-.Pp
-If the request is successfully enqueued, but subsequently cancelled
-or an error occurs, the value returned by the
-.Fn aio_return
-system call is per the
-.Xr mlock 2
-system call, and the value returned by the
-.Fn aio_error
-system call is one of the error returns from the
-.Xr mlock 2
-system call, or
-.Er ECANCELED
-if the request was explicitly cancelled via a call to
-.Fn aio_cancel .
-.Sh SEE ALSO
-.Xr aio_cancel 2 ,
-.Xr aio_error 2 ,
-.Xr aio_return 2 ,
-.Xr mlock 2 ,
-.Xr aio 4
-.Sh PORTABILITY
-The
-.Fn aio_mlock
-system call is a
-.Fx
-extension, and should not be used in portable code.
-.Sh HISTORY
-The
-.Fn aio_mlock
-system call first appeared in
-.Fx 10.0 .
-.Sh AUTHORS
-The system call was introduced by
-.An Gleb Smirnoff Aq glebius@FreeBSD.org .
diff --git a/lib/libc_bsd/sys/aio_read.2 b/lib/libc_bsd/sys/aio_read.2
deleted file mode 100644
index 022e072..0000000
--- a/lib/libc_bsd/sys/aio_read.2
+++ /dev/null
@@ -1,214 +0,0 @@
-.\" Copyright (c) 1998 Terry Lambert
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/aio_read.2 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd November 17, 1998
-.Dt AIO_READ 2
-.Os
-.Sh NAME
-.Nm aio_read
-.Nd asynchronous read from a file (REALTIME)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fn aio_read "struct aiocb *iocb"
-.Sh DESCRIPTION
-The
-.Fn aio_read
-system call allows the calling process to read
-.Fa iocb->aio_nbytes
-from the descriptor
-.Fa iocb->aio_fildes
-beginning at the offset
-.Fa iocb->aio_offset
-into the buffer pointed to by
-.Fa iocb->aio_buf .
-The call returns immediately after the read request has
-been enqueued to the descriptor; the read may or may not have
-completed at the time the call returns.
-.Pp
-If _POSIX_PRIORITIZED_IO is defined, and the descriptor supports it,
-then the enqueued operation is submitted at a priority equal to that
-of the calling process minus
-.Fa iocb->aio_reqprio .
-.Pp
-The
-.Fa iocb->aio_lio_opcode
-argument
-is ignored by the
-.Fn aio_read
-system call.
-.Pp
-The
-.Fa iocb
-pointer may be subsequently used as an argument to
-.Fn aio_return
-and
-.Fn aio_error
-in order to determine return or error status for the enqueued operation
-while it is in progress.
-.Pp
-If the request could not be enqueued (generally due to invalid arguments),
-then the call returns without having enqueued the request.
-.Pp
-If the request is successfully enqueued, the value of
-.Fa iocb->aio_offset
-can be modified during the request as context, so this value must
-not be referenced after the request is enqueued.
-.Sh RESTRICTIONS
-The Asynchronous I/O Control Block structure pointed to by
-.Fa iocb
-and the buffer that the
-.Fa iocb->aio_buf
-member of that structure references must remain valid until the
-operation has completed.
-For this reason, use of auto (stack) variables
-for these objects is discouraged.
-.Pp
-The asynchronous I/O control buffer
-.Fa iocb
-should be zeroed before the
-.Fn aio_read
-call to avoid passing bogus context information to the kernel.
-.Pp
-Modifications of the Asynchronous I/O Control Block structure or the
-buffer contents after the request has been enqueued, but before the
-request has completed, are not allowed.
-.Pp
-If the file offset in
-.Fa iocb->aio_offset
-is past the offset maximum for
-.Fa iocb->aio_fildes ,
-no I/O will occur.
-.Sh RETURN VALUES
-.Rv -std aio_read
-.Sh DIAGNOSTICS
-None.
-.Sh ERRORS
-The
-.Fn aio_read
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The request was not queued because of system resource limitations.
-.It Bq Er ENOSYS
-The
-.Fn aio_read
-system call is not supported.
-.El
-.Pp
-The following conditions may be synchronously detected when the
-.Fn aio_read
-system call is made, or asynchronously, at any time thereafter.
-If they
-are detected at call time,
-.Fn aio_read
-returns -1 and sets
-.Va errno
-appropriately; otherwise the
-.Fn aio_return
-system call must be called, and will return -1, and
-.Fn aio_error
-must be called to determine the actual value that would have been
-returned in
-.Va errno .
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa iocb->aio_fildes
-argument
-is invalid.
-.It Bq Er EINVAL
-The offset
-.Fa iocb->aio_offset
-is not valid, the priority specified by
-.Fa iocb->aio_reqprio
-is not a valid priority, or the number of bytes specified by
-.Fa iocb->aio_nbytes
-is not valid.
-.It Bq Er EOVERFLOW
-The file is a regular file,
-.Fa iocb->aio_nbytes
-is greater than zero, the starting offset in
-.Fa iocb->aio_offset
-is before the end of the file, but is at or beyond the
-.Fa iocb->aio_fildes
-offset maximum.
-.El
-.Pp
-If the request is successfully enqueued, but subsequently cancelled
-or an error occurs, the value returned by the
-.Fn aio_return
-system call is per the
-.Xr read 2
-system call, and the value returned by the
-.Fn aio_error
-system call is either one of the error returns from the
-.Xr read 2
-system call, or one of:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa iocb->aio_fildes
-argument
-is invalid for reading.
-.It Bq Er ECANCELED
-The request was explicitly cancelled via a call to
-.Fn aio_cancel .
-.It Bq Er EINVAL
-The offset
-.Fa iocb->aio_offset
-would be invalid.
-.El
-.Sh SEE ALSO
-.Xr aio_cancel 2 ,
-.Xr aio_error 2 ,
-.Xr aio_return 2 ,
-.Xr aio_suspend 2 ,
-.Xr aio_waitcomplete 2 ,
-.Xr aio_write 2 ,
-.Xr siginfo 3 ,
-.Xr aio 4
-.Sh STANDARDS
-The
-.Fn aio_read
-system call is expected to conform to the
-.St -p1003.1
-standard.
-.Sh HISTORY
-The
-.Fn aio_read
-system call first appeared in
-.Fx 3.0 .
-.Sh AUTHORS
-This
-manual page was written by
-.An Terry Lambert Aq terry@whistle.com .
-.Sh BUGS
-Invalid information in
-.Fa iocb->_aiocb_private
-may confuse the kernel.
diff --git a/lib/libc_bsd/sys/aio_return.2 b/lib/libc_bsd/sys/aio_return.2
deleted file mode 100644
index 18922a2..0000000
--- a/lib/libc_bsd/sys/aio_return.2
+++ /dev/null
@@ -1,102 +0,0 @@
-.\" Copyright (c) 1999 Softweyr LLC.
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Softweyr LLC 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 Softweyr LLC 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: releng/10.2/lib/libc/sys/aio_return.2 163073 2006-10-07 10:49:20Z trhodes $
-.\"
-.Dd October 7, 2006
-.Dt AIO_RETURN 2
-.Os
-.Sh NAME
-.Nm aio_return
-.Nd retrieve return status of asynchronous I/O operation (REALTIME)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fn aio_return "struct aiocb *iocb"
-.Sh DESCRIPTION
-The
-.Fn aio_return
-system call returns the final status of the asynchronous I/O request
-associated with the structure pointed to by
-.Fa iocb .
-.Pp
-The
-.Fn aio_return
-system call
-should only be called once, to obtain the final status of an asynchronous
-I/O operation once it has completed
-.Xr ( aio_error 2
-returns something other than
-.Er EINPROGRESS ) .
-.Sh RETURN VALUES
-If the asynchronous I/O request has completed, the status is returned
-as described in
-.Xr read 2 ,
-.Xr write 2 ,
-or
-.Xr fsync 2 .
-Otherwise,
-.Fn aio_return
-returns \-1 and sets
-.Va errno
-to indicate the error condition.
-.Sh ERRORS
-The
-.Fn aio_return
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa iocb
-argument
-does not reference a completed asynchronous I/O request.
-.El
-.Sh SEE ALSO
-.Xr aio_cancel 2 ,
-.Xr aio_error 2 ,
-.Xr aio_suspend 2 ,
-.Xr aio_waitcomplete 2 ,
-.Xr aio_write 2 ,
-.Xr fsync 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr aio 4
-.Sh STANDARDS
-The
-.Fn aio_return
-system call
-is expected to conform to the
-.St -p1003.1
-standard.
-.Sh HISTORY
-The
-.Fn aio_return
-system call first appeared in
-.Fx 3.0 .
-.Sh AUTHORS
-This
-manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
diff --git a/lib/libc_bsd/sys/aio_suspend.2 b/lib/libc_bsd/sys/aio_suspend.2
deleted file mode 100644
index 6bf433a..0000000
--- a/lib/libc_bsd/sys/aio_suspend.2
+++ /dev/null
@@ -1,117 +0,0 @@
-.\" Copyright (c) 1999 Softweyr LLC.
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Softweyr LLC 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 Softweyr LLC 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: releng/10.2/lib/libc/sys/aio_suspend.2 177870 2008-04-03 02:41:54Z kevlo $
-.\"
-.Dd June 2, 1999
-.Dt AIO_SUSPEND 2
-.Os
-.Sh NAME
-.Nm aio_suspend
-.Nd suspend until asynchronous I/O operations or timeout complete (REALTIME)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fn aio_suspend "const struct aiocb *const iocbs[]" "int niocb" "const struct timespec *timeout"
-.Sh DESCRIPTION
-The
-.Fn aio_suspend
-system call suspends the calling process until at least one of the
-specified asynchronous I/O requests have completed, a signal is
-delivered, or the
-.Fa timeout
-has passed.
-.Pp
-The
-.Fa iocbs
-argument
-is an array of
-.Fa niocb
-pointers to asynchronous I/O requests.
-Array members containing
-null pointers will be silently ignored.
-.Pp
-If
-.Fa timeout
-is not a null pointer, it specifies a maximum interval to suspend.
-If
-.Fa timeout
-is a null pointer, the suspend blocks indefinitely.
-To effect a
-poll, the
-.Fa timeout
-should point to a zero-value timespec structure.
-.Sh RETURN VALUES
-If one or more of the specified asynchronous I/O requests have
-completed,
-.Fn aio_suspend
-returns 0.
-Otherwise it returns -1 and sets
-.Va errno
-to indicate the error, as enumerated below.
-.Sh ERRORS
-The
-.Fn aio_suspend
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-the
-.Fa timeout
-expired before any I/O requests completed.
-.It Bq Er EINVAL
-The
-.Fa iocbs
-argument
-contains more than
-.Dv AIO_LISTIO_MAX
-asynchronous I/O requests, or at least one of the requests is not
-valid.
-.It Bq Er EINTR
-the suspend was interrupted by a signal.
-.El
-.Sh SEE ALSO
-.Xr aio_cancel 2 ,
-.Xr aio_error 2 ,
-.Xr aio_return 2 ,
-.Xr aio_waitcomplete 2 ,
-.Xr aio_write 2 ,
-.Xr aio 4
-.Sh STANDARDS
-The
-.Fn aio_suspend
-system call
-is expected to conform to the
-.St -p1003.1
-standard.
-.Sh HISTORY
-The
-.Fn aio_suspend
-system call first appeared in
-.Fx 3.0 .
-.Sh AUTHORS
-This
-manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
diff --git a/lib/libc_bsd/sys/aio_suspend.c b/lib/libc_bsd/sys/aio_suspend.c
deleted file mode 100644
index ef38ac6..0000000
--- a/lib/libc_bsd/sys/aio_suspend.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/aio_suspend.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/aio.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_aio_suspend, __aio_suspend);
-
-#pragma weak aio_suspend
-int
-aio_suspend(const struct aiocb * const iocbs[], int niocb,
-    const struct timespec *timeout)
-{
-
-	return (((int (*)(const struct aiocb * const[], int,
-	    const struct timespec *))
-	    __libc_interposing[INTERPOS_aio_suspend])(iocbs, niocb, timeout));
-}
diff --git a/lib/libc_bsd/sys/aio_waitcomplete.2 b/lib/libc_bsd/sys/aio_waitcomplete.2
deleted file mode 100644
index 23de82f..0000000
--- a/lib/libc_bsd/sys/aio_waitcomplete.2
+++ /dev/null
@@ -1,137 +0,0 @@
-.\" Copyright (c) 1999 Christopher M Sedore.
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``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: releng/10.2/lib/libc/sys/aio_waitcomplete.2 108028 2002-12-18 09:22:32Z ru $
-.\"
-.Dd January 19, 2000
-.Dt AIO_WAITCOMPLETE 2
-.Os
-.Sh NAME
-.Nm aio_waitcomplete
-.Nd wait for the next completion of an aio request
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fn aio_waitcomplete "struct aiocb **iocbp" "struct timespec *timeout"
-.Sh DESCRIPTION
-The
-.Fn aio_waitcomplete
-system call waits for completion of an asynchronous I/O request.
-Upon completion,
-.Fn aio_waitcomplete
-returns the result of the function and sets
-.Fa iocbp
-to point to the structure associated with the original request.
-If an asynchronous I/O request is completed before
-.Fn aio_waitcomplete
-is called, it returns immediately with the completed request.
-.Pp
-If
-.Fa timeout
-is a non-NULL pointer, it specifies a maximum interval to wait for a
-asynchronous I/O request to complete.
-If
-.Fa timeout
-is a NULL pointer,
-.Fn aio_waitcomplete
-waits indefinitely.
-To effect a poll, the
-.Fa timeout
-argument should be non-NULL, pointing to a zero-valued timeval structure.
-.Pp
-The
-.Fn aio_waitcomplete
-system call also serves the function of
-.Fn aio_return ,
-thus
-.Fn aio_return
-should not be called for the control block returned in
-.Fa iocbp .
-.Sh RETURN VALUES
-If an asynchronous I/O request has completed,
-.Fa iocbp
-is set to point to the control block passed with the original request,
-and the status is returned as described in
-.Xr read 2 ,
-.Xr write 2 ,
-or
-.Xr fsync 2 .
-On failure,
-.Fn aio_waitcomplete
-returns
-.Dv -1 ,
-sets iocbp to
-.Dv NULL
-and sets
-.Va errno
-to indicate the error condition.
-.Sh ERRORS
-The
-.Fn aio_waitcomplete
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The specified time limit is invalid.
-.It Bq Er EAGAIN
-The process has not yet called
-.Fn aio_read
-or
-.Fn aio_write .
-.It Bq Er EINTR
-A signal was delivered before the timeout expired and before any
-asynchronous I/O requests completed.
-.It Bq Er EWOULDBLOCK
-.It Bq Er EINPROGRESS
-The specified time limit expired before any asynchronous I/O requests
-completed.
-.El
-.Sh SEE ALSO
-.Xr aio_cancel 2 ,
-.Xr aio_error 2 ,
-.Xr aio_read 2 ,
-.Xr aio_return 2 ,
-.Xr aio_suspend 2 ,
-.Xr aio_write 2 ,
-.Xr fsync 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr aio 4
-.Sh STANDARDS
-The
-.Fn aio_waitcomplete
-system call is a
-.Fx Ns -specific
-extension.
-.Sh HISTORY
-The
-.Fn aio_waitcomplete
-system call first appeared in
-.Fx 4.0 .
-.Sh AUTHORS
-The
-.Fn aio_waitcomplete
-system call and this manual page were written by
-.An Christopher M Sedore Aq cmsedore@maxwell.syr.edu .
diff --git a/lib/libc_bsd/sys/aio_write.2 b/lib/libc_bsd/sys/aio_write.2
deleted file mode 100644
index fd52348..0000000
--- a/lib/libc_bsd/sys/aio_write.2
+++ /dev/null
@@ -1,209 +0,0 @@
-.\" Copyright (c) 1999 Softweyr LLC.
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Softweyr LLC 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 Softweyr LLC 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: releng/10.2/lib/libc/sys/aio_write.2 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd June 2, 1999
-.Dt AIO_WRITE 2
-.Os
-.Sh NAME
-.Nm aio_write
-.Nd asynchronous write to a file (REALTIME)
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fn aio_write "struct aiocb *iocb"
-.Sh DESCRIPTION
-The
-.Fn aio_write
-system call allows the calling process to write
-.Fa iocb->aio_nbytes
-from the buffer pointed to by
-.Fa iocb->aio_buf
-to the descriptor
-.Fa iocb->aio_fildes .
-The call returns immediately after the write request has been enqueued
-to the descriptor; the write may or may not have completed at the time
-the call returns.
-If the request could not be enqueued, generally due
-to invalid arguments, the call returns without having enqueued the
-request.
-.Pp
-If
-.Dv O_APPEND
-is set for
-.Fa iocb->aio_fildes ,
-.Fn aio_write
-operations append to the file in the same order as the calls were
-made.
-If
-.Dv O_APPEND
-is not set for the file descriptor, the write operation will occur at
-the absolute position from the beginning of the file plus
-.Fa iocb->aio_offset .
-.Pp
-If
-.Dv _POSIX_PRIORITIZED_IO
-is defined, and the descriptor supports it, then the enqueued
-operation is submitted at a priority equal to that of the calling
-process minus
-.Fa iocb->aio_reqprio .
-.Pp
-The
-.Fa iocb
-pointer may be subsequently used as an argument to
-.Fn aio_return
-and
-.Fn aio_error
-in order to determine return or error status for the enqueued operation
-while it is in progress.
-.Pp
-If the request is successfully enqueued, the value of
-.Fa iocb->aio_offset
-can be modified during the request as context, so this value must not
-be referenced after the request is enqueued.
-.Sh RESTRICTIONS
-The Asynchronous I/O Control Block structure pointed to by
-.Fa iocb
-and the buffer that the
-.Fa iocb->aio_buf
-member of that structure references must remain valid until the
-operation has completed.
-For this reason, use of auto (stack) variables
-for these objects is discouraged.
-.Pp
-The asynchronous I/O control buffer
-.Fa iocb
-should be zeroed before the
-.Fn aio_write
-system call to avoid passing bogus context information to the kernel.
-.Pp
-Modifications of the Asynchronous I/O Control Block structure or the
-buffer contents after the request has been enqueued, but before the
-request has completed, are not allowed.
-.Pp
-If the file offset in
-.Fa iocb->aio_offset
-is past the offset maximum for
-.Fa iocb->aio_fildes ,
-no I/O will occur.
-.Sh RETURN VALUES
-.Rv -std aio_write
-.Sh ERRORS
-The
-.Fn aio_write
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The request was not queued because of system resource limitations.
-.It Bq Er ENOSYS
-The
-.Fn aio_write
-system call is not supported.
-.El
-.Pp
-The following conditions may be synchronously detected when the
-.Fn aio_write
-system call is made, or asynchronously, at any time thereafter.
-If they
-are detected at call time,
-.Fn aio_write
-returns -1 and sets
-.Va errno
-appropriately; otherwise the
-.Fn aio_return
-system call must be called, and will return -1, and
-.Fn aio_error
-must be called to determine the actual value that would have been
-returned in
-.Va errno .
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa iocb->aio_fildes
-argument
-is invalid, or is not opened for writing.
-.It Bq Er EINVAL
-The offset
-.Fa iocb->aio_offset
-is not valid, the priority specified by
-.Fa iocb->aio_reqprio
-is not a valid priority, or the number of bytes specified by
-.Fa iocb->aio_nbytes
-is not valid.
-.El
-.Pp
-If the request is successfully enqueued, but subsequently canceled
-or an error occurs, the value returned by the
-.Fn aio_return
-system call is per the
-.Xr write 2
-system call, and the value returned by the
-.Fn aio_error
-system call is either one of the error returns from the
-.Xr write 2
-system call, or one of:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa iocb->aio_fildes
-argument
-is invalid for writing.
-.It Bq Er ECANCELED
-The request was explicitly canceled via a call to
-.Fn aio_cancel .
-.It Bq Er EINVAL
-The offset
-.Fa iocb->aio_offset
-would be invalid.
-.El
-.Sh SEE ALSO
-.Xr aio_cancel 2 ,
-.Xr aio_error 2 ,
-.Xr aio_return 2 ,
-.Xr aio_suspend 2 ,
-.Xr aio_waitcomplete 2 ,
-.Xr siginfo 3 ,
-.Xr aio 4
-.Sh STANDARDS
-The
-.Fn aio_write
-system call
-is expected to conform to the
-.St -p1003.1
-standard.
-.Sh HISTORY
-The
-.Fn aio_write
-system call first appeared in
-.Fx 3.0 .
-.Sh AUTHORS
-This manual page was written by
-.An Wes Peters Aq wes@softweyr.com .
-.Sh BUGS
-Invalid information in
-.Fa iocb->_aiocb_private
-may confuse the kernel.
diff --git a/lib/libc_bsd/sys/bind.2 b/lib/libc_bsd/sys/bind.2
deleted file mode 100644
index f2835ef..0000000
--- a/lib/libc_bsd/sys/bind.2
+++ /dev/null
@@ -1,140 +0,0 @@
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.\"     @(#)bind.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/bind.2 268223 2014-07-03 17:35:01Z pluknet $
-.\"
-.Dd June 26, 2014
-.Dt BIND 2
-.Os
-.Sh NAME
-.Nm bind
-.Nd assign a local protocol address to a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn bind "int s" "const struct sockaddr *addr" "socklen_t addrlen"
-.Sh DESCRIPTION
-The
-.Fn bind
-system call
-assigns the local protocol address to a socket.
-When a socket is created
-with
-.Xr socket 2
-it exists in an address family space but has no protocol address assigned.
-The
-.Fn bind
-system call requests that
-.Fa addr
-be assigned to the socket.
-.Sh NOTES
-Binding an address in the UNIX domain creates a socket in the file
-system that must be deleted by the caller when it is no longer
-needed (using
-.Xr unlink 2 ) .
-.Pp
-The rules used in address binding vary between communication domains.
-Consult the manual entries in section 4 for detailed information.
-.Pp
-For maximum portability, you should always zero the socket address structure
-before populating it and passing it to
-.Fn bind .
-.Sh RETURN VALUES
-.Rv -std bind
-.Sh ERRORS
-The
-.Fn bind
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-Kernel resources to complete the request are
-temporarily unavailable.
-.It Bq Er EBADF
-The
-.Fa s
-argument
-is not a valid descriptor.
-.It Bq Er EINVAL
-The socket is already bound to an address, and the protocol does not support
-binding to a new address; or the socket has been shut down.
-.It Bq Er EINVAL
-The
-.Fa addrlen
-argument is not a valid length for the address family.
-.It Bq Er ENOTSOCK
-The
-.Fa s
-argument
-is not a socket.
-.It Bq Er EADDRNOTAVAIL
-The specified address is not available from the local machine.
-.It Bq Er EADDRINUSE
-The specified address is already in use.
-.It Bq Er EAFNOSUPPORT
-Addresses in the specified address family cannot be used with this socket.
-.It Bq Er EACCES
-The requested address is protected, and the current user
-has inadequate permission to access it.
-.It Bq Er EFAULT
-The
-.Fa addr
-argument is not in a valid part of the user
-address space.
-.El
-.Pp
-The following errors are specific to binding addresses in the UNIX domain.
-.Bl -tag -width EADDRNOTAVA
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-A prefix component of the path name does not exist.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry or allocating the inode.
-.It Bq Er EROFS
-The name would reside on a read-only file system.
-.It Bq Er EISDIR
-An empty pathname was specified.
-.El
-.Sh SEE ALSO
-.Xr connect 2 ,
-.Xr getsockname 2 ,
-.Xr listen 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn bind
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/bindat.2 b/lib/libc_bsd/sys/bindat.2
deleted file mode 100644
index 3a46e52..0000000
--- a/lib/libc_bsd/sys/bindat.2
+++ /dev/null
@@ -1,109 +0,0 @@
-.\" Copyright (c) 2013 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by Pawel Jakub Dawidek under sponsorship from
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/sys/bindat.2 247667 2013-03-02 21:11:30Z pjd $
-.\"
-.Dd February 13, 2013
-.Dt BINDAT 2
-.Os
-.Sh NAME
-.Nm bindat
-.Nd assign a local protocol address to a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Pp
-.In fcntl.h
-.Ft int
-.Fn bindat "int fd" "int s" "const struct sockaddr *addr" "socklen_t addrlen"
-.Sh DESCRIPTION
-The
-.Fn bindat
-system call assigns the local protocol address to a socket.
-It works just like the
-.Xr bind 2
-system call with two exceptions:
-.Pp
-.Bl -enum -offset indent -compact
-.It
-It is limited to sockets in the PF_LOCAL domain.
-.Pp
-.It
-If the file path stored in the
-.Fa sun_path
-field of the sockaddr_un structure is a relative path, it is located relative
-to the directory associated with the file descriptor
-.Fa fd .
-If
-.Fn bindat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is identical
-to a call to
-.Xr bind 2 .
-.El
-.Sh RETURN VALUES
-.Rv -std bindat
-.Sh ERRORS
-The
-.Fn bindat
-system call may fail with the same errors as the
-.Xr bind 2
-system call for a UNIX domain socket or with the following errors:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa sun_path
-field does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor.
-.It Bq Er ENOTDIR
-The
-.Fa sun_path
-field is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr connectat 2 ,
-.Xr socket 2 ,
-.Xr unix 4
-.Sh AUTHORS
-The
-.Nm
-was developed by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
-under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc_bsd/sys/brk.2 b/lib/libc_bsd/sys/brk.2
deleted file mode 100644
index cf7722d..0000000
--- a/lib/libc_bsd/sys/brk.2
+++ /dev/null
@@ -1,171 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)brk.2	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/brk.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd July 12, 1999
-.Dt BRK 2
-.Os
-.Sh NAME
-.Nm brk ,
-.Nm sbrk
-.Nd change data segment size
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft int
-.Fn brk "const void *addr"
-.Ft void *
-.Fn sbrk "intptr_t incr"
-.Sh DESCRIPTION
-.Bf -symbolic
-The
-.Fn brk
-and
-.Fn sbrk
-functions are legacy interfaces from before the
-advent of modern virtual memory management.
-.Ef
-.Pp
-The
-.Fn brk
-and
-.Fn sbrk
-functions are used to change the amount of memory allocated in a
-process's data segment.
-They do this by moving the location of the
-.Dq break .
-The break is the first address after the end of the process's
-uninitialized data segment (also known as the
-.Dq BSS ) .
-.Pp
-The
-.Fn brk
-function
-sets the break to
-.Fa addr .
-.Pp
-The
-.Fn sbrk
-function raises the break by
-.Fa incr
-bytes, thus allocating at least
-.Fa incr
-bytes of new memory in the data segment.
-If
-.Fa incr
-is negative,
-the break is lowered by
-.Fa incr
-bytes.
-.Sh NOTES
-While the actual process data segment size maintained by the kernel will only
-grow or shrink in page sizes, these functions allow setting the break
-to unaligned values (i.e., it may point to any address inside the last
-page of the data segment).
-.Pp
-The current value of the program break may be determined by calling
-.Fn sbrk 0 .
-See also
-.Xr end 3 .
-.Pp
-The
-.Xr getrlimit 2
-system call may be used to determine
-the maximum permissible size of the
-data segment.
-It will not be possible to set the break
-beyond
-.Dq Va etext No + Va rlim.rlim_max
-where the
-.Va rlim.rlim_max
-value is returned from a call to
-.Fn getrlimit RLIMIT_DATA &rlim .
-(See
-.Xr end 3
-for the definition of
-.Va etext ) .
-.Sh RETURN VALUES
-.Rv -std brk
-.Pp
-The
-.Fn sbrk
-function returns the prior break value if successful;
-otherwise the value
-.Po Vt "void *" Pc Ns \-1
-is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn brk
-and
-.Fn sbrk
-functions
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The requested break value was beyond the beginning of the data segment.
-.It Bq Er ENOMEM
-The data segment size limit, as set by
-.Xr setrlimit 2 ,
-was exceeded.
-.It Bq Er ENOMEM
-Insufficient space existed in the swap area
-to support the expansion of the data segment.
-.El
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr getrlimit 2 ,
-.Xr mmap 2 ,
-.Xr end 3 ,
-.Xr free 3 ,
-.Xr malloc 3
-.Sh HISTORY
-The
-.Fn brk
-function appeared in
-.At v7 .
-.Sh BUGS
-Mixing
-.Fn brk
-or
-.Fn sbrk
-with
-.Xr malloc 3 ,
-.Xr free 3 ,
-or similar functions will result in non-portable program behavior.
-.Pp
-Setting the break may fail due to a temporary lack of
-swap space.
-It is not possible to distinguish this
-from a failure caused by exceeding the maximum size of
-the data segment without consulting
-.Xr getrlimit 2 .
diff --git a/lib/libc_bsd/sys/cap_enter.2 b/lib/libc_bsd/sys/cap_enter.2
deleted file mode 100644
index 12a4c90..0000000
--- a/lib/libc_bsd/sys/cap_enter.2
+++ /dev/null
@@ -1,125 +0,0 @@
-.\"
-.\" Copyright (c) 2008-2009 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed at the University of Cambridge Computer
-.\" Laboratory with support from a grant from Google, Inc.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/cap_enter.2 280247 2015-03-19 11:24:07Z rwatson $
-.\"
-.Dd March 27, 2014
-.Dt CAP_ENTER 2
-.Os
-.Sh NAME
-.Nm cap_enter ,
-.Nm cap_getmode
-.Nd Capability mode system calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/capsicum.h
-.Ft int
-.Fn cap_enter "void"
-.Ft int
-.Fn cap_getmode "u_int *modep"
-.Sh DESCRIPTION
-.Fn cap_enter
-places the current process into capability mode, a mode of execution in which
-processes may only issue system calls operating on file descriptors or
-reading limited global system state.
-Access to global name spaces, such as file system or IPC name spaces, is
-prevented.
-If the process is already in a capability mode sandbox, the system call is a
-no-op.
-Future process descendants created with
-.Xr fork 2
-or
-.Xr pdfork 2
-will be placed in capability mode from inception.
-.Pp
-When combined with
-.Xr cap_rights_limit 2 ,
-.Xr cap_ioctls_limit 2 ,
-.Xr cap_fcntls_limit 2 ,
-.Fn cap_enter
-may be used to create kernel-enforced sandboxes in which
-appropriately-crafted applications or application components may be run.
-.Pp
-.Fn cap_getmode
-returns a flag indicating whether or not the process is in a capability mode
-sandbox.
-.Sh CAVEAT
-Creating effective process sandboxes is a tricky process that involves
-identifying the least possible rights required by the process and then
-passing those rights into the process in a safe manner.
-Consumers of
-.Fn cap_enter
-should also be aware of other inherited rights, such as access to VM
-resources, memory contents, and other process properties that should be
-considered.
-It is advisable to use
-.Xr fexecve 2
-to create a runtime environment inside the sandbox that has as few implicitly
-acquired rights as possible.
-.Sh RETURN VALUES
-.Rv -std cap_enter cap_getmode
-.Sh ERRORS
-The
-.Fn cap_enter
-and
-.Fn cap_getmode
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOSYS
-The kernel is compiled without:
-.Pp
-.Cd "options CAPABILITY_MODE"
-.El
-.Pp
-The
-.Fn cap_getmode
-system call may also return the following error:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Pointer
-.Fa modep
-points outside the process's allocated address space.
-.El
-.Sh SEE ALSO
-.Xr cap_fcntls_limit 2 ,
-.Xr cap_ioctls_limit 2 ,
-.Xr cap_rights_limit 2 ,
-.Xr fexecve 2 ,
-.Xr cap_sandboxed 3 ,
-.Xr capsicum 4
-.Sh HISTORY
-Support for capabilities and capabilities mode was developed as part of the
-.Tn TrustedBSD
-Project.
-.Sh AUTHORS
-These functions and the capability facility were created by
-.An "Robert N. M. Watson"
-at the University of Cambridge Computer Laboratory with support from a grant
-from Google, Inc.
diff --git a/lib/libc_bsd/sys/cap_fcntls_limit.2 b/lib/libc_bsd/sys/cap_fcntls_limit.2
deleted file mode 100644
index 0aace30..0000000
--- a/lib/libc_bsd/sys/cap_fcntls_limit.2
+++ /dev/null
@@ -1,126 +0,0 @@
-.\"
-.\" Copyright (c) 2012 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by Pawel Jakub Dawidek under sponsorship
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/cap_fcntls_limit.2 280247 2015-03-19 11:24:07Z rwatson $
-.\"
-.Dd March 27, 2014
-.Dt CAP_FCNTLS_LIMIT 2
-.Os
-.Sh NAME
-.Nm cap_fcntls_limit ,
-.Nm cap_fcntls_get
-.Nd manage allowed fcntl commands
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/capsicum.h
-.Ft int
-.Fn cap_fcntls_limit "int fd" "uint32_t fcntlrights"
-.Ft int
-.Fn cap_fcntls_get "int fd" "uint32_t *fcntlrightsp"
-.Sh DESCRIPTION
-If a file descriptor is granted the
-.Dv CAP_FCNTL
-capability right, the list of allowed
-.Xr fcntl 2
-commands can be selectively reduced (but never expanded) with the
-.Fn cap_fcntls_limit
-system call.
-.Pp
-A bitmask of allowed fcntls commands for a given file descriptor can be obtained
-with the
-.Fn cap_fcntls_get
-system call.
-.Sh FLAGS
-The following flags may be specified in the
-.Fa fcntlrights
-argument or returned in the
-.Fa fcntlrightsp
-argument:
-.Bl -tag -width CAP_FCNTL_GETOWN
-.It Dv CAP_FCNTL_GETFL
-Permit
-.Dv F_GETFL
-command.
-.It Dv CAP_FCNTL_SETFL
-Permit
-.Dv F_SETFL
-command.
-.It Dv CAP_FCNTL_GETOWN
-Permit
-.Dv F_GETOWN
-command.
-.It Dv CAP_FCNTL_SETOWN
-Permit
-.Dv F_SETOWN
-command.
-.El
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-.Fn cap_fcntls_limit
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid descriptor.
-.It Bq Er EINVAL
-An invalid flag has been passed in
-.Fa fcntlrights .
-.It Bq Er ENOTCAPABLE
-.Fa fcntlrights
-would expand the list of allowed
-.Xr fcntl 2
-commands.
-.El
-.Pp
-.Fn cap_fcntls_get
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid descriptor.
-.It Bq Er EFAULT
-The
-.Fa fcntlrightsp
-argument points at an invalid address.
-.El
-.Sh SEE ALSO
-.Xr cap_ioctls_limit 2 ,
-.Xr cap_rights_limit 2 ,
-.Xr fcntl 2
-.Sh HISTORY
-Support for capabilities and capabilities mode was developed as part of the
-.Tn TrustedBSD
-Project.
-.Sh AUTHORS
-This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
-under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc_bsd/sys/cap_ioctls_limit.2 b/lib/libc_bsd/sys/cap_ioctls_limit.2
deleted file mode 100644
index 198c755..0000000
--- a/lib/libc_bsd/sys/cap_ioctls_limit.2
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"
-.\" Copyright (c) 2012 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by Pawel Jakub Dawidek under sponsorship
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/cap_ioctls_limit.2 280247 2015-03-19 11:24:07Z rwatson $
-.\"
-.Dd March 27, 2014
-.Dt CAP_IOCTLS_LIMIT 2
-.Os
-.Sh NAME
-.Nm cap_ioctls_limit ,
-.Nm cap_ioctls_get
-.Nd manage allowed ioctl commands
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/capsicum.h
-.Ft int
-.Fn cap_ioctls_limit "int fd" "const unsigned long *cmds" "size_t ncmds"
-.Ft ssize_t
-.Fn cap_ioctls_get "int fd" "unsigned long *cmds" "size_t maxcmds"
-.Sh DESCRIPTION
-If a file descriptor is granted the
-.Dv CAP_IOCTL
-capability right, the list of allowed
-.Xr ioctl 2
-commands can be selectively reduced (but never expanded) with the
-.Fn cap_ioctls_limit
-system call.
-The
-.Fa cmds
-argument is an array of
-.Xr ioctl 2
-commands and the
-.Fa ncmds
-argument specifies the number of elements in the array.
-There can be up to
-.Va 256
-elements in the array.
-.Pp
-The list of allowed ioctl commands for a given file descriptor can be obtained
-with the
-.Fn cap_ioctls_get
-system call.
-The
-.Fa cmds
-argument points at memory that can hold up to
-.Fa maxcmds
-values.
-The function populates the provided buffer with up to
-.Fa maxcmds
-elements, but always returns the total number of ioctl commands allowed for the
-given file descriptor.
-The total number of ioctls commands for the given file descriptor can be
-obtained by passing
-.Dv NULL as the
-.Fa cmds
-argument and
-.Va 0
-as the
-.Fa maxcmds
-argument.
-If all ioctl commands are allowed
-.Dv ( CAP_IOCTL
-capability right is assigned to the file descriptor and the
-.Fn cap_ioctls_limit
-system call was never called for this file descriptor), the
-.Fn cap_ioctls_get
-system call will return
-.Dv CAP_IOCTLS_ALL
-and won't modify the buffer pointed to by the
-.Fa cmds
-argument.
-.Sh RETURN VALUES
-.Rv -std cap_ioctls_limit
-.Pp
-The
-.Fn cap_ioctls_get
-function, if successful, returns the total number of allowed ioctl commands or
-the value
-.Dv CAP_IOCTLS_ALL
-if all ioctls commands are allowed.
-On failure the value
-.Va -1
-is returned and the global variable errno is set to indicate the error.
-.Sh ERRORS
-.Fn cap_ioctls_limit
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid descriptor.
-.It Bq Er EFAULT
-The
-.Fa cmds
-argument points at an invalid address.
-.It Bq Er EINVAL
-The
-.Fa ncmds
-argument is greater than
-.Va 256 .
-.It Bq Er ENOTCAPABLE
-.Fa cmds
-would expand the list of allowed
-.Xr ioctl 2
-commands.
-.El
-.Pp
-.Fn cap_ioctls_get
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid descriptor.
-.It Bq Er EFAULT
-The
-.Fa cmds
-argument points at invalid address.
-.El
-.Sh SEE ALSO
-.Xr cap_fcntls_limit 2 ,
-.Xr cap_rights_limit 2 ,
-.Xr ioctl 2
-.Sh HISTORY
-Support for capabilities and capabilities mode was developed as part of the
-.Tn TrustedBSD
-Project.
-.Sh AUTHORS
-This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
-under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc_bsd/sys/cap_rights_limit.2 b/lib/libc_bsd/sys/cap_rights_limit.2
deleted file mode 100644
index c640834..0000000
--- a/lib/libc_bsd/sys/cap_rights_limit.2
+++ /dev/null
@@ -1,157 +0,0 @@
-.\"
-.\" Copyright (c) 2008-2010 Robert N. M. Watson
-.\" Copyright (c) 2012-2013 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This software was developed at the University of Cambridge Computer
-.\" Laboratory with support from a grant from Google, Inc.
-.\"
-.\" Portions of this documentation were written by Pawel Jakub Dawidek
-.\" under sponsorship from the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/cap_rights_limit.2 280247 2015-03-19 11:24:07Z rwatson $
-.\"
-.Dd March 27, 2014
-.Dt CAP_RIGHTS_LIMIT 2
-.Os
-.Sh NAME
-.Nm cap_rights_limit
-.Nd limit capability rights
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/capsicum.h
-.Ft int
-.Fn cap_rights_limit "int fd" "const cap_rights_t *rights"
-.Sh DESCRIPTION
-When a file descriptor is created by a function such as
-.Xr accept 2 ,
-.Xr accept4 2 ,
-.Xr fhopen 2 ,
-.Xr kqueue 2 ,
-.Xr mq_open 2 ,
-.Xr open 2 ,
-.Xr openat 2 ,
-.Xr pdfork 2 ,
-.Xr pipe 2 ,
-.Xr shm_open 2 ,
-.Xr socket 2
-or
-.Xr socketpair 2 ,
-it is assigned all capability rights.
-Those rights can be reduced (but never expanded) by using the
-.Fn cap_rights_limit
-system call.
-Once capability rights are reduced, operations on the file descriptor will be
-limited to those permitted by
-.Fa rights .
-.Pp
-The
-.Fa rights
-argument should be prepared using
-.Xr cap_rights_init 3
-family of functions.
-.Pp
-Capability rights assigned to a file descriptor can be obtained with the
-.Xr cap_rights_get 3
-function.
-.Pp
-The complete list of the capability rights can be found in the
-.Xr rights 4
-manual page.
-.Sh RETURN VALUES
-.Rv -std
-.Sh EXAMPLES
-The following example demonstrates how to limit file descriptor capability
-rights to allow reading only.
-.Bd -literal
-cap_rights_t setrights;
-char buf[1];
-int fd;
-
-fd = open("/tmp/foo", O_RDWR);
-if (fd < 0)
-	err(1, "open() failed");
-
-if (cap_enter() < 0)
-	err(1, "cap_enter() failed");
-
-cap_rights_init(&setrights, CAP_READ);
-if (cap_rights_limit(fd, &setrights) < 0)
-	err(1, "cap_rights_limit() failed");
-
-buf[0] = 'X';
-
-if (write(fd, buf, sizeof(buf)) > 0)
-	errx(1, "write() succeeded!");
-
-if (read(fd, buf, sizeof(buf)) < 0)
-	err(1, "read() failed");
-.Ed
-.Sh ERRORS
-.Fn cap_rights_limit
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid active descriptor.
-.It Bq Er EINVAL
-An invalid right has been requested in
-.Fa rights .
-.It Bq Er ENOTCAPABLE
-The
-.Fa rights
-argument contains capability rights not present for the given file descriptor.
-Capability rights list can only be reduced, never expanded.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr accept4 2 ,
-.Xr cap_enter 2 ,
-.Xr fhopen 2 ,
-.Xr kqueue 2 ,
-.Xr mq_open 2 ,
-.Xr open 2 ,
-.Xr openat 2 ,
-.Xr pdfork 2 ,
-.Xr pipe 2 ,
-.Xr read 2 ,
-.Xr shm_open 2 ,
-.Xr socket 2 ,
-.Xr socketpair 2 ,
-.Xr write 2 ,
-.Xr cap_rights_get 3 ,
-.Xr cap_rights_init 3 ,
-.Xr err 3 ,
-.Xr capsicum 4 ,
-.Xr rights 4
-.Sh HISTORY
-Support for capabilities and capabilities mode was developed as part of the
-.Tn TrustedBSD
-Project.
-.Sh AUTHORS
-This function was created by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
-under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc_bsd/sys/chdir.2 b/lib/libc_bsd/sys/chdir.2
deleted file mode 100644
index dc3e596..0000000
--- a/lib/libc_bsd/sys/chdir.2
+++ /dev/null
@@ -1,132 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)chdir.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/chdir.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd December 11, 1993
-.Dt CHDIR 2
-.Os
-.Sh NAME
-.Nm chdir ,
-.Nm fchdir
-.Nd change current working directory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn chdir "const char *path"
-.Ft int
-.Fn fchdir "int fd"
-.Sh DESCRIPTION
-The
-.Fa path
-argument points to the pathname of a directory.
-The
-.Fn chdir
-system call
-causes the named directory
-to become the current working directory, that is,
-the starting point for path searches of pathnames not beginning with
-a slash,
-.Ql / .
-.Pp
-The
-.Fn fchdir
-system call
-causes the directory referenced by
-.Fa fd
-to become the current working directory,
-the starting point for path searches of pathnames not beginning with
-a slash,
-.Ql / .
-.Pp
-In order for a directory to become the current directory,
-a process must have execute (search) access to the directory.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn chdir
-system call
-will fail and the current working directory will be unchanged if
-one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named directory does not exist.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EACCES
-Search permission is denied for any component of
-the path name.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Pp
-The
-.Fn fchdir
-system call
-will fail and the current working directory will be unchanged if
-one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for the directory referenced by the
-file descriptor.
-.It Bq Er ENOTDIR
-The file descriptor does not reference a directory.
-.It Bq Er EBADF
-The argument
-.Fa fd
-is not a valid file descriptor.
-.El
-.Sh SEE ALSO
-.Xr chroot 2
-.Sh STANDARDS
-The
-.Fn chdir
-system call is expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn chdir
-system call appeared in
-.At v7 .
-The
-.Fn fchdir
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/chflags.2 b/lib/libc_bsd/sys/chflags.2
deleted file mode 100644
index 7b87ca8..0000000
--- a/lib/libc_bsd/sys/chflags.2
+++ /dev/null
@@ -1,326 +0,0 @@
-.\" Copyright (c) 1989, 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.
-.\" 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.
-.\"
-.\"	@(#)chflags.2	8.3 (Berkeley) 5/2/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/chflags.2 260867 2014-01-18 22:47:25Z jilles $
-.\"
-.Dd March 22, 2013
-.Dt CHFLAGS 2
-.Os
-.Sh NAME
-.Nm chflags ,
-.Nm lchflags ,
-.Nm fchflags ,
-.Nm chflagsat
-.Nd set file flags
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.In unistd.h
-.Ft int
-.Fn chflags "const char *path" "unsigned long flags"
-.Ft int
-.Fn lchflags "const char *path" "unsigned long flags"
-.Ft int
-.Fn fchflags "int fd" "unsigned long flags"
-.Ft int
-.Fn chflagsat "int fd" "const char *path" "unsigned long flags" "int atflag"
-.Sh DESCRIPTION
-The file whose name
-is given by
-.Fa path
-or referenced by the descriptor
-.Fa fd
-has its flags changed to
-.Fa flags .
-.Pp
-The
-.Fn lchflags
-system call is like
-.Fn chflags
-except in the case where the named file is a symbolic link,
-in which case
-.Fn lchflags
-will change the flags of the link itself,
-rather than the file it points to.
-.Pp
-The
-.Fn chflagsat
-is equivalent to either
-.Fn chflags
-or
-.Fn lchflags
-depending on the
-.Fa atflag
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the file to be changed is determined relative to the directory
-associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-The values for the
-.Fa atflag
-are constructed by a bitwise-inclusive OR of flags from the following list,
-defined in
-.In fcntl.h :
-.Bl -tag -width indent
-.It Dv AT_SYMLINK_NOFOLLOW
-If
-.Fa path
-names a symbolic link, then the flags of the symbolic link are changed.
-.El
-.Pp
-If
-.Fn chflagsat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used.
-If also
-.Fa atflag
-is zero, the behavior is identical to a call to
-.Fn chflags .
-.Pp
-The flags specified are formed by
-.Em or Ns 'ing
-the following values
-.Pp
-.Bl -tag -width ".Dv SF_IMMUTABLE" -compact -offset indent
-.It Dv SF_APPEND
-The file may only be appended to.
-.It Dv SF_ARCHIVED
-The file has been archived.
-This flag means the opposite of the DOS, Windows and CIFS
-FILE_ATTRIBUTE_ARCHIVE attribute.
-This flag has been deprecated, and may be removed in a future release.
-.It Dv SF_IMMUTABLE
-The file may not be changed.
-.It Dv SF_NOUNLINK
-The file may not be renamed or deleted.
-.It Dv SF_SNAPSHOT
-The file is a snapshot file.
-.It Dv UF_APPEND
-The file may only be appended to.
-.It Dv UF_ARCHIVE
-The file needs to be archived.
-This flag has the same meaning as the DOS, Windows and CIFS
-FILE_ATTRIBUTE_ARCHIVE attribute.
-Filesystems in FreeBSD may or may not have special handling for this flag.
-For instance, ZFS tracks changes to files and will set this bit when a
-file is updated.
-UFS only stores the flag, and relies on the application to change it when
-needed.
-.It Dv UF_HIDDEN
-The file may be hidden from directory listings at the application's
-discretion.
-The file has the DOS, Windows and CIFS FILE_ATTRIBUTE_HIDDEN attribute.
-.It Dv UF_IMMUTABLE
-The file may not be changed.
-.It Dv UF_NODUMP
-Do not dump the file.
-.It Dv UF_NOUNLINK
-The file may not be renamed or deleted.
-.It Dv UF_OFFLINE
-The file is offline, or has the Windows and CIFS FILE_ATTRIBUTE_OFFLINE
-attribute.
-Filesystems in FreeBSD store and display this flag, but do not provide any
-special handling when it is set.
-.It Dv UF_OPAQUE
-The directory is opaque when viewed through a union stack.
-.It Dv UF_READONLY
-The file is read only, and may not be written or appended.
-Filesystems may use this flag to maintain compatibility with the DOS, Windows
-and CIFS FILE_ATTRIBUTE_READONLY attribute.
-.It Dv UF_REPARSE
-The file contains a Windows reparse point and has the Windows and CIFS
-FILE_ATTRIBUTE_REPARSE_POINT attribute.
-.It Dv UF_SPARSE
-The file has the Windows FILE_ATTRIBUTE_SPARSE_FILE attribute.
-This may also be used by a filesystem to indicate a sparse file.
-.It Dv UF_SYSTEM
-The file has the DOS, Windows and CIFS FILE_ATTRIBUTE_SYSTEM attribute.
-Filesystems in FreeBSD may store and display this flag, but do not provide
-any special handling when it is set.
-.El
-.Pp
-If one of
-.Dv SF_IMMUTABLE , SF_APPEND ,
-or
-.Dv SF_NOUNLINK
-is set a non-super-user cannot change any flags and even the super-user
-can change flags only if securelevel is 0.
-(See
-.Xr init 8
-for details.)
-.Pp
-The
-.Dv UF_IMMUTABLE , UF_APPEND , UF_NOUNLINK , UF_NODUMP ,
-and
-.Dv UF_OPAQUE
-flags may be set or unset by either the owner of a file or the super-user.
-.Pp
-The
-.Dv SF_IMMUTABLE , SF_APPEND , SF_NOUNLINK ,
-and
-.Dv SF_ARCHIVED
-flags may only be set or unset by the super-user.
-Attempts to toggle these flags by non-super-users are rejected.
-These flags may be set at any time, but normally may only be unset when
-the system is in single-user mode.
-(See
-.Xr init 8
-for details.)
-.Pp
-The implementation of all flags is filesystem-dependent.
-See the description of the
-.Dv UF_ARCHIVE
-flag above for one example of the differences in behavior.
-Care should be exercised when writing applications to account for
-support or lack of support of these flags in various filesystems.
-.Pp
-The
-.Dv SF_SNAPSHOT
-flag is maintained by the system and cannot be toggled.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn chflags
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user.
-.It Bq Er EPERM
-One of
-.Dv SF_IMMUTABLE , SF_APPEND ,
-or
-.Dv SF_NOUNLINK
-is set and the user is either not the super-user or
-securelevel is greater than 0.
-.It Bq Er EPERM
-A non-super-user attempted to toggle one of
-.Dv SF_ARCHIVED , SF_IMMUTABLE , SF_APPEND ,
-or
-.Dv SF_NOUNLINK .
-.It Bq Er EPERM
-An attempt was made to toggle the
-.Dv SF_SNAPSHOT
-flag.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.It Bq Er EOPNOTSUPP
-The underlying file system does not support file flags, or
-does not support all of the flags set in
-.Fa flags .
-.El
-.Pp
-The
-.Fn fchflags
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The descriptor is not valid.
-.It Bq Er EINVAL
-The
-.Fa fd
-argument
-refers to a socket, not to a file.
-.It Bq Er EPERM
-The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user.
-.It Bq Er EPERM
-One of
-.Dv SF_IMMUTABLE , SF_APPEND ,
-or
-.Dv SF_NOUNLINK
-is set and the user is either not the super-user or
-securelevel is greater than 0.
-.It Bq Er EPERM
-A non-super-user attempted to toggle one of
-.Dv SF_ARCHIVED , SF_IMMUTABLE , SF_APPEND ,
-or
-.Dv SF_NOUNLINK .
-.It Bq Er EPERM
-An attempt was made to toggle the
-.Dv SF_SNAPSHOT
-flag.
-.It Bq Er EROFS
-The file resides on a read-only file system.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.It Bq Er EOPNOTSUPP
-The underlying file system does not support file flags, or
-does not support all of the flags set in
-.Fa flags .
-.El
-.Sh SEE ALSO
-.Xr chflags 1 ,
-.Xr fflagstostr 3 ,
-.Xr strtofflags 3 ,
-.Xr init 8 ,
-.Xr mount_unionfs 8
-.Sh HISTORY
-The
-.Fn chflags
-and
-.Fn fchflags
-system calls first appeared in
-.Bx 4.4 .
-The
-.Fn lchflags
-system call first appeared in
-.Fx 5.0 .
-The
-.Fn chflagsat
-system call first appeared in
-.Fx 10.0 .
diff --git a/lib/libc_bsd/sys/chmod.2 b/lib/libc_bsd/sys/chmod.2
deleted file mode 100644
index 0aedd47..0000000
--- a/lib/libc_bsd/sys/chmod.2
+++ /dev/null
@@ -1,327 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/chmod.2 264171 2014-04-05 20:11:40Z jilles $
-.\"
-.Dd December 1, 2013
-.Dt CHMOD 2
-.Os
-.Sh NAME
-.Nm chmod ,
-.Nm fchmod ,
-.Nm lchmod ,
-.Nm fchmodat
-.Nd change mode of file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft int
-.Fn chmod "const char *path" "mode_t mode"
-.Ft int
-.Fn fchmod "int fd" "mode_t mode"
-.Ft int
-.Fn lchmod "const char *path" "mode_t mode"
-.Ft int
-.Fn fchmodat "int fd" "const char *path" "mode_t mode" "int flag"
-.Sh DESCRIPTION
-The file permission bits of the file named specified by
-.Fa path
-or referenced by the file descriptor
-.Fa fd
-are changed to
-.Fa mode .
-The
-.Fn chmod
-system call verifies that the process owner (user) either owns
-the file specified by
-.Fa path
-(or
-.Fa fd ) ,
-or
-is the super-user.
-The
-.Fn chmod
-system call follows symbolic links to operate on the target of the link
-rather than the link itself.
-.Pp
-The
-.Fn lchmod
-system call is similar to
-.Fn chmod
-but does not follow symbolic links.
-.Pp
-The
-.Fn fchmodat
-is equivalent to either
-.Fn chmod
-or
-.Fn lchmod
-depending on the
-.Fa flag
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the file to be changed is determined relative to the directory
-associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-The values for the
-.Fa flag
-are constructed by a bitwise-inclusive OR of flags from the following list, defined
-in
-.In fcntl.h :
-.Bl -tag -width indent
-.It Dv AT_SYMLINK_NOFOLLOW
-If
-.Fa path
-names a symbolic link, then the mode of the symbolic link is changed.
-.El
-.Pp
-If
-.Fn fchmodat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used.
-If also
-.Fa flag
-is zero, the behavior is identical to a call to
-.Fn chmod .
-.Pp
-A mode is created from
-.Em or'd
-permission bit masks
-defined in
-.In sys/stat.h :
-.Pp
-.Bd -literal -offset indent -compact
-#define S_IRWXU 0000700    /* RWX mask for owner */
-#define S_IRUSR 0000400    /* R for owner */
-#define S_IWUSR 0000200    /* W for owner */
-#define S_IXUSR 0000100    /* X for owner */
-
-#define S_IRWXG 0000070    /* RWX mask for group */
-#define S_IRGRP 0000040    /* R for group */
-#define S_IWGRP 0000020    /* W for group */
-#define S_IXGRP 0000010    /* X for group */
-
-#define S_IRWXO 0000007    /* RWX mask for other */
-#define S_IROTH 0000004    /* R for other */
-#define S_IWOTH 0000002    /* W for other */
-#define S_IXOTH 0000001    /* X for other */
-
-#define S_ISUID 0004000    /* set user id on execution */
-#define S_ISGID 0002000    /* set group id on execution */
-#define S_ISVTX 0001000    /* sticky bit */
-.Ed
-.Pp
-The non-standard
-.Dv S_ISTXT
-is a synonym for
-.Dv S_ISVTX .
-.Pp
-The
-.Fx
-VM system totally ignores the sticky bit
-.Pq Dv S_ISVTX
-for executables.
-On UFS-based file systems (FFS, LFS) the sticky
-bit may only be set upon directories.
-.Pp
-If mode
-.Dv S_ISVTX
-(the `sticky bit') is set on a directory,
-an unprivileged user may not delete or rename
-files of other users in that directory.
-The sticky bit may be
-set by any user on a directory which the user owns or has appropriate
-permissions.
-For more details of the properties of the sticky bit, see
-.Xr sticky 7 .
-.Pp
-If mode ISUID (set UID) is set on a directory,
-and the MNT_SUIDDIR option was used in the mount of the file system,
-then the owner of any new files and sub-directories
-created within this directory are set
-to be the same as the owner of that directory.
-If this function is enabled, new directories will inherit
-the bit from their parents.
-Execute bits are removed from
-the file, and it will not be given to root.
-This behavior does not change the
-requirements for the user to be allowed to write the file, but only the eventual
-owner after it has been created.
-Group inheritance is not affected.
-.Pp
-This feature is designed for use on fileservers serving PC users via
-ftp, SAMBA, or netatalk.
-It provides security holes for shell users and as
-such should not be used on shell machines, especially on home directories.
-This option requires the SUIDDIR
-option in the kernel to work.
-Only UFS file systems support this option.
-For more details of the suiddir mount option, see
-.Xr mount 8 .
-.Pp
-Writing or changing the owner of a file
-turns off the set-user-id and set-group-id bits
-unless the user is the super-user.
-This makes the system somewhat more secure
-by protecting set-user-id (set-group-id) files
-from remaining set-user-id (set-group-id) if they are modified,
-at the expense of a degree of compatibility.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn chmod
-system call
-will fail and the file mode will be unchanged if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The effective user ID does not match the owner of the file and
-the effective user ID is not the super-user.
-.It Bq Er EPERM
-The effective user ID is not the super-user, the effective user ID do match the
-owner of the file, but the group ID of the file does not match the effective
-group ID nor one of the supplementary group IDs.
-.It Bq Er EPERM
-The named file has its immutable or append-only flag set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er EFTYPE
-The effective user ID is not the super-user, the mode includes the sticky bit
-.Dv ( S_ISVTX ) ,
-and path does not refer to a directory.
-.El
-.Pp
-The
-.Fn fchmod
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The descriptor is not valid.
-.It Bq Er EINVAL
-The
-.Fa fd
-argument
-refers to a socket, not to a file.
-.It Bq Er EROFS
-The file resides on a read-only file system.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Pp
-In addition to the
-.Fn chmod
-errors,
-.Fn fchmodat
-fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Fa AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er EINVAL
-The value of the
-.Fa flag
-argument is not valid.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chmod 1 ,
-.Xr chflags 2 ,
-.Xr chown 2 ,
-.Xr open 2 ,
-.Xr stat 2 ,
-.Xr sticky 7
-.Sh STANDARDS
-The
-.Fn chmod
-system call is expected to conform to
-.St -p1003.1-90 ,
-except for the return of
-.Er EFTYPE .
-The
-.Dv S_ISVTX
-bit on directories is expected to conform to
-.St -susv3 .
-The
-.Fn fchmodat
-system call is expected to conform to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn chmod
-function appeared in
-.At v7 .
-The
-.Fn fchmod
-system call appeared in
-.Bx 4.2 .
-The
-.Fn lchmod
-system call appeared in
-.Fx 3.0 .
-The
-.Fn fchmodat
-system call appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/chown.2 b/lib/libc_bsd/sys/chown.2
deleted file mode 100644
index 13c2ce0..0000000
--- a/lib/libc_bsd/sys/chown.2
+++ /dev/null
@@ -1,268 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)chown.2	8.4 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/chown.2 178245 2008-04-16 13:03:12Z kib $
-.\"
-.Dd April 10, 2008
-.Dt CHOWN 2
-.Os
-.Sh NAME
-.Nm chown ,
-.Nm fchown ,
-.Nm lchown ,
-.Nm fchownat
-.Nd change owner and group of a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn chown "const char *path" "uid_t owner" "gid_t group"
-.Ft int
-.Fn fchown "int fd" "uid_t owner" "gid_t group"
-.Ft int
-.Fn lchown "const char *path" "uid_t owner" "gid_t group"
-.Ft int
-.Fn fchownat "int fd" "const char *path" "uid_t owner" "gid_t group" "int flag"
-.Sh DESCRIPTION
-The owner ID and group ID of the file
-named by
-.Fa path
-or referenced by
-.Fa fd
-is changed as specified by the arguments
-.Fa owner
-and
-.Fa group .
-The owner of a file may change the
-.Fa group
-to a group of which
-he or she is a member,
-but the change
-.Fa owner
-capability is restricted to the super-user.
-.Pp
-The
-.Fn chown
-system call
-clears the set-user-id and set-group-id bits
-on the file
-to prevent accidental or mischievous creation of
-set-user-id and set-group-id programs if not executed
-by the super-user.
-The
-.Fn chown
-system call
-follows symbolic links to operate on the target of the link
-rather than the link itself.
-.Pp
-The
-.Fn fchown
-system call
-is particularly useful when used in conjunction
-with the file locking primitives (see
-.Xr flock 2 ) .
-.Pp
-The
-.Fn lchown
-system call is similar to
-.Fn chown
-but does not follow symbolic links.
-.Pp
-The
-.Fn fchownat
-system call is equivalent to the
-.Fn chown
-and
-.Fn lchown
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the file to be changed is determined relative to the directory
-associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-.Pp
-Values for
-.Fa flag
-are constructed by a bitwise-inclusive OR of flags from the following
-list, defined in
-.In fcntl.h :
-.Bl -tag -width indent
-.It Dv AT_SYMLINK_NOFOLLOW
-If
-.Fa path
-names a symbolic link, ownership of the symbolic link is changed.
-.El
-.Pp
-If
-.Fn fchownat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is identical
-to a call to
-.Fn chown
-or
-.Fn lchown
-respectively, depending on whether or not the
-.Dv AT_SYMLINK_NOFOLLOW
-bit is set in the
-.Fa flag
-argument.
-.Pp
-One of the owner or group id's
-may be left unchanged by specifying it as -1.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn chown
-and
-.Fn lchown
-will fail and the file will be unchanged if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The operation would change the ownership, but the effective user ID is not the
-super-user.
-.It Bq Er EPERM
-The named file has its immutable or append-only flag set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Pp
-The
-.Fn fchown
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-does not refer to a valid descriptor.
-.It Bq Er EINVAL
-The
-.Fa fd
-argument
-refers to a socket, not a file.
-.It Bq Er EPERM
-The effective user ID is not the super-user.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Pp
-In addition to the errors specified for
-.Fn chown
-and
-.Fn lchown ,
-the
-.Fn fchownat
-system call may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er EINVAL
-The value of the
-.Fa flag
-argument is not valid.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chgrp 1 ,
-.Xr chflags 2 ,
-.Xr chmod 2 ,
-.Xr flock 2 ,
-.Xr chown 8
-.Sh STANDARDS
-The
-.Fn chown
-system call is expected to conform to
-.St -p1003.1-90 .
-The
-.Fn fchownat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn chown
-function appeared in
-.At v7 .
-The
-.Fn fchown
-system call appeared in
-.Bx 4.2 .
-.Pp
-The
-.Fn chown
-system call was changed to follow symbolic links in
-.Bx 4.4 .
-The
-.Fn lchown
-system call was added in
-.Fx 3.0
-to compensate for the loss of functionality.
-.Pp
-The
-.Fn fchownat
-system call appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/chroot.2 b/lib/libc_bsd/sys/chroot.2
deleted file mode 100644
index db9f347..0000000
--- a/lib/libc_bsd/sys/chroot.2
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)chroot.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/chroot.2 245458 2013-01-15 14:09:08Z zont $
-.\"
-.Dd January 3, 2012
-.Dt CHROOT 2
-.Os
-.Sh NAME
-.Nm chroot
-.Nd change root directory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn chroot "const char *dirname"
-.Sh DESCRIPTION
-The
-.Fa dirname
-argument
-is the address of the pathname of a directory, terminated by an ASCII NUL.
-The
-.Fn chroot
-system call causes
-.Fa dirname
-to become the root directory,
-that is, the starting point for path searches of pathnames
-beginning with
-.Ql / .
-.Pp
-In order for a directory to become the root directory
-a process must have execute (search) access for that directory.
-.Pp
-It should be noted that
-.Fn chroot
-has no effect on the process's current directory.
-.Pp
-This call is restricted to the super-user.
-.Pp
-Depending on the setting of the
-.Ql kern.chroot_allow_open_directories
-sysctl variable, open filedescriptors which reference directories
-will make the
-.Fn chroot
-fail as follows:
-.Pp
-If
-.Ql kern.chroot_allow_open_directories
-is set to zero,
-.Fn chroot
-will always fail with
-.Er EPERM
-if there are any directories open.
-.Pp
-If
-.Ql kern.chroot_allow_open_directories
-is set to one (the default),
-.Fn chroot
-will fail with
-.Er EPERM
-if there are any directories open and the
-process is already subject to the
-.Fn chroot
-system call.
-.Pp
-Any other value for
-.Ql kern.chroot_allow_open_directories
-will bypass the check for open directories
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn chroot
-system call
-will fail and the root directory will be unchanged if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path name is not a directory.
-.It Bq Er EPERM
-The effective user ID is not the super-user, or one or more
-filedescriptors are open directories.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named directory does not exist.
-.It Bq Er EACCES
-Search permission is denied for any component of the path name.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EFAULT
-The
-.Fa dirname
-argument
-points outside the process's allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr chdir 2 ,
-.Xr jail 2
-.Sh HISTORY
-The
-.Fn chroot
-system call appeared in
-.Bx 4.2 .
-It was marked as
-.Dq legacy
-in
-.St -susv2 ,
-and was removed in subsequent standards.
-.Sh BUGS
-If the process is able to change its working directory to the target
-directory, but another access control check fails (such as a check for
-open directories, or a MAC check), it is possible that this system
-call may return an error, with the working directory of the process
-left changed.
-.Sh SECURITY CONSIDERATIONS
-The system have many hardcoded paths to files where it may load after
-the process starts.
-It is generally recommended to drop privileges immediately after a
-successful
-.Nm
-call,
-and restrict write access to a limited subtree of the
-.Nm
-root,
-for instance,
-setup the sandbox so that the sandboxed user will have no write
-access to any well-known system directories.
diff --git a/lib/libc_bsd/sys/clock_gettime.2 b/lib/libc_bsd/sys/clock_gettime.2
deleted file mode 100644
index 1a91385..0000000
--- a/lib/libc_bsd/sys/clock_gettime.2
+++ /dev/null
@@ -1,168 +0,0 @@
-.\"	$OpenBSD: clock_gettime.2,v 1.4 1997/05/08 20:21:16 kstailey Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/clock_gettime.2 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd December 29, 2009
-.Dt CLOCK_GETTIME 2
-.Os
-.Sh NAME
-.Nm clock_gettime ,
-.Nm clock_settime ,
-.Nm clock_getres
-.Nd get/set/calibrate date and time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft int
-.Fn clock_gettime "clockid_t clock_id" "struct timespec *tp"
-.Ft int
-.Fn clock_settime "clockid_t clock_id" "const struct timespec *tp"
-.Ft int
-.Fn clock_getres "clockid_t clock_id" "struct timespec *tp"
-.Sh DESCRIPTION
-The
-.Fn clock_gettime
-and
-.Fn clock_settime
-system calls allow the calling process to retrieve or set the value
-used by a clock which is specified by
-.Fa clock_id .
-.Pp
-The
-.Fa clock_id
-argument
-can be one of the following values:
-.Dv CLOCK_REALTIME ,
-.Dv CLOCK_REALTIME_PRECISE ,
-.Dv CLOCK_REALTIME_FAST
-for time that increments as
-a wall clock should;
-.Dv CLOCK_MONOTONIC ,
-.Dv CLOCK_MONOTONIC_PRECISE ,
-.Dv CLOCK_MONOTONIC_FAST
-which increments in SI seconds;
-.Dv CLOCK_UPTIME ,
-.Dv CLOCK_UPTIME_PRECISE ,
-.Dv CLOCK_UPTIME_FAST
-which starts at zero when the kernel boots and increments
-monotonically in SI seconds while the machine is running;
-.Dv CLOCK_VIRTUAL
-for time that increments only when
-the CPU is running in user mode on behalf of the calling process;
-.Dv CLOCK_PROF
-for time that increments when the CPU is running in user or
-kernel mode; or
-.Dv CLOCK_SECOND
-which returns the current second without performing a full time counter
-query, using in-kernel cached value of current second.
-.Pp
-The clock IDs
-.Fa CLOCK_REALTIME_FAST ,
-.Fa CLOCK_MONOTONIC_FAST ,
-.Fa CLOCK_UPTIME_FAST
-are analogs of corresponding IDs without _FAST suffix but do not perform
-a full time counter query, so their accuracy is one timer tick.
-Similarly,
-.Fa CLOCK_REALTIME_PRECISE ,
-.Fa CLOCK_MONOTONIC_PRECISE ,
-.Fa CLOCK_UPTIME_PRECISE
-are used to get the most exact value as possible, at the expense of
-execution time.
-.Pp
-The structure pointed to by
-.Fa tp
-is defined in
-.In sys/timespec.h
-as:
-.Bd -literal
-struct timespec {
-	time_t	tv_sec;		/* seconds */
-	long	tv_nsec;	/* and nanoseconds */
-};
-.Ed
-.Pp
-Only the super-user may set the time of day, using only
-.Fa CLOCK_REALTIME .
-If the system securelevel is greater than 1 (see
-.Xr init 8 ) ,
-the time may only be advanced.
-This limitation is imposed to prevent a malicious super-user
-from setting arbitrary time stamps on files.
-The system time can still be adjusted backwards using the
-.Xr adjtime 2
-system call even when the system is secure.
-.Pp
-The resolution (granularity) of a clock is returned by the
-.Fn clock_getres
-system call.
-This value is placed in a (non-NULL)
-.Fa *tp .
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The following error codes may be set in
-.Va errno :
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa clock_id
-argument
-was not a valid value.
-.It Bq Er EFAULT
-The
-.Fa *tp
-argument address referenced invalid memory.
-.It Bq Er EPERM
-A user other than the super-user attempted to set the time.
-.El
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr adjtime 2 ,
-.Xr ctime 3 ,
-.Xr timed 8
-.Sh STANDARDS
-The
-.Fn clock_gettime ,
-.Fn clock_settime ,
-and
-.Fn clock_getres
-system calls conform to
-.St -p1003.1b-93 .
-The clock IDs
-.Fa CLOCK_REALTIME_FAST ,
-.Fa CLOCK_REALTIME_PRECISE ,
-.Fa CLOCK_MONOTONIC_FAST ,
-.Fa CLOCK_MONOTONIC_PRECISE ,
-.Fa CLOCK_UPTIME ,
-.Fa CLOCK_UPTIME_FAST ,
-.Fa CLOCK_UPTIME_PRECISE ,
-.Fa CLOCK_SECOND
-are FreeBSD extensions to the POSIX interface.
diff --git a/lib/libc_bsd/sys/clock_gettime.c b/lib/libc_bsd/sys/clock_gettime.c
deleted file mode 100644
index b00d6a7..0000000
--- a/lib/libc_bsd/sys/clock_gettime.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/clock_gettime.c 237434 2012-06-22 07:13:30Z kib $");
-
-#include <sys/syscall.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-#include <time.h>
-#include "libc_private.h"
-
-int __clock_gettime(clockid_t, struct timespec *ts);
-
-__weak_reference(__clock_gettime, clock_gettime);
-
-int
-__clock_gettime(clockid_t clock_id, struct timespec *ts)
-{
-	int error;
-
-	if (__vdso_clock_gettime != NULL && __vdso_gettc != NULL)
-		error = __vdso_clock_gettime(clock_id, ts);
-	else
-		error = ENOSYS;
-	if (error == ENOSYS)
-		error = __sys_clock_gettime(clock_id, ts);
-	return (error);
-}
diff --git a/lib/libc_bsd/sys/close.2 b/lib/libc_bsd/sys/close.2
deleted file mode 100644
index 726a9ec..0000000
--- a/lib/libc_bsd/sys/close.2
+++ /dev/null
@@ -1,144 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)close.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/close.2 255486 2013-09-12 00:53:38Z bdrewery $
-.\"
-.Dd September 11, 2013
-.Dt CLOSE 2
-.Os
-.Sh NAME
-.Nm close
-.Nd delete a descriptor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn close "int fd"
-.Sh DESCRIPTION
-The
-.Fn close
-system call deletes a descriptor from the per-process object
-reference table.
-If this is the last reference to the underlying object, the
-object will be deactivated.
-For example, on the last close of a file
-the current
-.Em seek
-pointer associated with the file is lost;
-on the last close of a
-.Xr socket 2
-associated naming information and queued data are discarded;
-on the last close of a file holding an advisory lock
-the lock is released (see further
-.Xr flock 2 ) .
-However, the semantics of System V and
-.St -p1003.1-88
-dictate that all
-.Xr fcntl 2
-advisory record locks associated with a file for a given process
-are removed when
-.Em any
-file descriptor for that file is closed by that process.
-.Pp
-When a process exits,
-all associated file descriptors are freed, but since there is
-a limit on active descriptors per processes, the
-.Fn close
-system call
-is useful when a large quantity of file descriptors are being handled.
-.Pp
-When a process forks (see
-.Xr fork 2 ) ,
-all descriptors for the new child process reference the same
-objects as they did in the parent before the fork.
-If a new process is then to be run using
-.Xr execve 2 ,
-the process would normally inherit these descriptors.
-Most
-of the descriptors can be rearranged with
-.Xr dup2 2
-or deleted with
-.Fn close
-before the
-.Xr execve 2
-is attempted, but if some of these descriptors will still
-be needed if the execve fails, it is necessary to arrange for them
-to be closed if the execve succeeds.
-For this reason, the call
-.Dq Li fcntl(d, F_SETFD, FD_CLOEXEC)
-is provided,
-which arranges that a descriptor will be closed after a successful
-execve; the call
-.Dq Li fcntl(d, F_SETFD, 0)
-restores the default,
-which is to not close the descriptor.
-.Sh RETURN VALUES
-.Rv -std close
-.Sh ERRORS
-The
-.Fn close
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not an active descriptor.
-.It Bq Er EINTR
-An interrupt was received.
-.It Bq Er ENOSPC
-The underlying object did not fit, cached data was lost.
-.It Bq Er ECONNRESET
-The underlying object was a stream socket that was shut down by the peer
-before all pending data was delivered.
-.El
-.Pp
-In case of any error except
-.Er EBADF ,
-the supplied file descriptor is deallocated and therefore is no longer valid.
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr closefrom 2 ,
-.Xr execve 2 ,
-.Xr fcntl 2 ,
-.Xr flock 2 ,
-.Xr open 2 ,
-.Xr pipe 2 ,
-.Xr socket 2 ,
-.Xr socketpair 2
-.Sh STANDARDS
-The
-.Fn close
-system call is expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn close
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/close.c b/lib/libc_bsd/sys/close.c
deleted file mode 100644
index b306353..0000000
--- a/lib/libc_bsd/sys/close.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/close.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_close, __close);
-
-#pragma weak close
-int
-close(int fd)
-{
-
-	return (((int (*)(int))__libc_interposing[INTERPOS_close])(fd));
-}
diff --git a/lib/libc_bsd/sys/closefrom.2 b/lib/libc_bsd/sys/closefrom.2
deleted file mode 100644
index 077875d..0000000
--- a/lib/libc_bsd/sys/closefrom.2
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Copyright (c) 2009 Hudson River Trading LLC
-.\" Written by: John H. Baldwin <jhb@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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/closefrom.2 283927 2015-06-02 19:20:39Z jhb $
-.\"
-.Dd June 12, 2009
-.Dt CLOSEFROM 2
-.Os
-.Sh NAME
-.Nm closefrom
-.Nd delete open file descriptors
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void
-.Fn closefrom "int lowfd"
-.Sh DESCRIPTION
-The
-.Fn closefrom
-system call deletes all open file descriptors greater than or equal to
-.Fa lowfd
-from the per-process object reference table.
-Any errors encountered while closing file descriptors are ignored.
-.Sh SEE ALSO
-.Xr close 2
-.Sh HISTORY
-The
-.Fn closefrom
-function first appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/connect.2 b/lib/libc_bsd/sys/connect.2
deleted file mode 100644
index 2c651e3..0000000
--- a/lib/libc_bsd/sys/connect.2
+++ /dev/null
@@ -1,178 +0,0 @@
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.\"     @(#)connect.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/connect.2 281030 2015-04-03 17:12:24Z bdrewery $
-.\"
-.Dd September 29, 2014
-.Dt CONNECT 2
-.Os
-.Sh NAME
-.Nm connect
-.Nd initiate a connection on a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn connect "int s" "const struct sockaddr *name" "socklen_t namelen"
-.Sh DESCRIPTION
-The
-.Fa s
-argument
-is a socket.
-If it is of type
-.Dv SOCK_DGRAM ,
-this call specifies the peer with which the socket is to be associated;
-this address is that to which datagrams are to be sent,
-and the only address from which datagrams are to be received.
-If the socket is of type
-.Dv SOCK_STREAM ,
-this call attempts to make a connection to
-another socket.
-The other socket is specified by
-.Fa name ,
-which is an address in the communications space of the socket.
-Each communications space interprets the
-.Fa name
-argument in its own way.
-Generally, stream sockets may successfully
-.Fn connect
-only once; datagram sockets may use
-.Fn connect
-multiple times to change their association.
-Datagram sockets may dissolve the association
-by connecting to an invalid address, such as a null address.
-.Sh RETURN VALUES
-.Rv -std connect
-.Sh ERRORS
-The
-.Fn connect
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa s
-argument
-is not a valid descriptor.
-.It Bq Er EINVAL
-The
-.Fa namelen
-argument is not a valid length for the address family.
-.It Bq Er ENOTSOCK
-The
-.Fa s
-argument
-is a descriptor for a file, not a socket.
-.It Bq Er EADDRNOTAVAIL
-The specified address is not available on this machine.
-.It Bq Er EAFNOSUPPORT
-Addresses in the specified address family cannot be used with this socket.
-.It Bq Er EISCONN
-The socket is already connected.
-.It Bq Er ETIMEDOUT
-Connection establishment timed out without establishing a connection.
-.It Bq Er ECONNREFUSED
-The attempt to connect was forcefully rejected.
-.It Bq Er ECONNRESET
-The connection was reset by the remote host.
-.It Bq Er ENETUNREACH
-The network is not reachable from this host.
-.It Bq Er EHOSTUNREACH
-The remote host is not reachable from this host.
-.It Bq Er EADDRINUSE
-The address is already in use.
-.It Bq Er EFAULT
-The
-.Fa name
-argument specifies an area outside
-the process address space.
-.It Bq Er EINPROGRESS
-The socket is non-blocking
-and the connection cannot
-be completed immediately.
-It is possible to
-.Xr select 2
-for completion by selecting the socket for writing.
-.It Bq Er EINTR
-The connection attempt was interrupted by the delivery of a signal.
-The connection will be established in the background,
-as in the case of
-.Er EINPROGRESS .
-.It Bq Er EALREADY
-A previous connection attempt has not yet been completed.
-.It Bq Er EACCES
-An attempt is made to connect to a broadcast address (obtained through the
-.Dv INADDR_BROADCAST
-constant or the
-.Dv INADDR_NONE
-return value) through a socket that does not provide broadcast functionality.
-.It Bq Er EAGAIN
-An auto-assigned port number was requested but no auto-assigned ports
-are available.
-Increasing the port range specified by
-.Xr sysctl 3
-MIB variables
-.Va net.inet.ip.portrange.first
-and
-.Va net.inet.ip.portrange.last
-may alleviate the problem.
-.El
-.Pp
-The following errors are specific to connecting names in the UNIX domain.
-These errors may not apply in future versions of the UNIX IPC domain.
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named socket does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EACCES
-Write access to the named socket is denied.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-Write access to the named socket is denied.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr getpeername 2 ,
-.Xr getsockname 2 ,
-.Xr select 2 ,
-.Xr socket 2 ,
-.Xr sysctl 3 ,
-.Xr sysctl 8
-.Sh HISTORY
-The
-.Fn connect
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/connect.c b/lib/libc_bsd/sys/connect.c
deleted file mode 100644
index 47f86d8..0000000
--- a/lib/libc_bsd/sys/connect.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/connect.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/socket.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_connect, __connect);
-
-#pragma weak connect
-int
-connect(int s, const struct sockaddr *addr, socklen_t addrlen)
-{
-
-	return (((int (*)(int, const struct sockaddr *, socklen_t))
-	    __libc_interposing[INTERPOS_connect])(s, addr, addrlen));
-}
diff --git a/lib/libc_bsd/sys/connectat.2 b/lib/libc_bsd/sys/connectat.2
deleted file mode 100644
index 1feccdc..0000000
--- a/lib/libc_bsd/sys/connectat.2
+++ /dev/null
@@ -1,109 +0,0 @@
-.\" Copyright (c) 2013 The FreeBSD Foundation
-.\" All rights reserved.
-.\"
-.\" This documentation was written by Pawel Jakub Dawidek under sponsorship from
-.\" the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/lib/libc/sys/connectat.2 247667 2013-03-02 21:11:30Z pjd $
-.\"
-.Dd February 13, 2013
-.Dt CONNECTAT 2
-.Os
-.Sh NAME
-.Nm connectat
-.Nd initiate a connection on a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Pp
-.In fcntl.h
-.Ft int
-.Fn connectat "int fd" "int s" "const struct sockaddr *name" "socklen_t namelen"
-.Sh DESCRIPTION
-The
-.Fn connectat
-system call initiates a connection on a socket.
-It works just like the
-.Xr connect 2
-system call with two exceptions:
-.Pp
-.Bl -enum -offset indent -compact
-.It
-It is limited to sockets in the PF_LOCAL domain.
-.Pp
-.It
-If the file path stored in the
-.Fa sun_path
-field of the sockaddr_un structure is a relative path, it is located relative
-to the directory associated with the file descriptor
-.Fa fd .
-If
-.Fn connectat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is identical
-to a call to
-.Xr connect 2 .
-.El
-.Sh RETURN VALUES
-.Rv -std connectat
-.Sh ERRORS
-The
-.Fn connectat
-system call may fail with the same errors as the
-.Xr connect 2
-system call for a UNIX domain socket or with the following errors:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa sun_path
-field does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor.
-.It Bq Er ENOTDIR
-The
-.Fa sun_path
-field is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr bindat 2 ,
-.Xr connect 2 ,
-.Xr socket 2 ,
-.Xr unix 4
-.Sh AUTHORS
-The
-.Nm
-was developed by
-.An Pawel Jakub Dawidek Aq pawel@dawidek.net
-under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc_bsd/sys/cpuset.2 b/lib/libc_bsd/sys/cpuset.2
deleted file mode 100644
index 3502ebe..0000000
--- a/lib/libc_bsd/sys/cpuset.2
+++ /dev/null
@@ -1,227 +0,0 @@
-.\" Copyright (c) 2008 Christian Brueffer
-.\" Copyright (c) 2008 Jeffrey Roberson
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/cpuset.2 249716 2013-04-21 06:46:41Z joel $
-.\"
-.Dd January 8, 2010
-.Dt CPUSET 2
-.Os
-.Sh NAME
-.Nm cpuset ,
-.Nm cpuset_getid ,
-.Nm cpuset_setid
-.Nd manage CPU affinity sets
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/cpuset.h
-.Ft int
-.Fn cpuset "cpusetid_t *setid"
-.Ft int
-.Fn cpuset_setid "cpuwhich_t which" "id_t id" "cpusetid_t setid"
-.Ft int
-.Fn cpuset_getid "cpulevel_t level" "cpuwhich_t which" "id_t id" "cpusetid_t *setid"
-.Sh DESCRIPTION
-The
-.Nm
-family of system calls allow applications to control sets of processors and
-assign processes and threads to these sets.
-Processor sets contain lists of CPUs that members may run on and exist only
-as long as some process is a member of the set.
-All processes in the system have an assigned set.
-The default set for all processes in the system is the set numbered 1.
-Threads belong to the same set as the process which contains them,
-however, they may further restrict their set with the anonymous
-per-thread mask.
-.Pp
-Sets are referenced by a number of type
-.Ft cpuset_id_t .
-Each thread has a root set, an assigned set, and an anonymous mask.
-Only the root and assigned sets are numbered.
-The root set is the set of all CPUs available in the system or in the
-system partition the thread is running in.
-The assigned set is a subset of the root set and is administratively
-assignable on a per-process basis.
-Many processes and threads may be members of a numbered set.
-.Pp
-The anonymous set is a further thread-specific refinement on the assigned
-set.
-It is intended that administrators will manipulate numbered sets using
-.Xr cpuset 1
-while application developers will manipulate anonymous sets using
-.Xr cpuset_setaffinity 2 .
-.Pp
-To select the correct set a value of type
-.Ft cpulevel_t
-is used.
-The following values for
-.Fa level
-are supported:
-.Bl -column CPU_LEVEL_CPUSET -offset indent
-.It Dv CPU_LEVEL_ROOT Ta "Root set"
-.It Dv CPU_LEVEL_CPUSET Ta "Assigned set"
-.It Dv CPU_LEVEL_WHICH Ta "Set specified by which argument"
-.El
-.Pp
-The
-.Fa which
-argument determines how the value of
-.Fa id
-is interpreted and is of type
-.Ft cpuwhich_t .
-The
-.Fa which
-argument may have the following values:
-.Bl -column CPU_WHICH_CPUSET -offset indent
-.It Dv CPU_WHICH_TID Ta "id is lwpid_t (thread id)"
-.It Dv CPU_WHICH_PID Ta "id is pid_t (process id)"
-.It Dv CPU_WHICH_CPUSET Ta "id is a cpusetid_t (cpuset id)"
-.It Dv CPU_WHICH_IRQ Ta "id is an irq number"
-.El
-.Pp
-An
-.Fa id
-of '-1' may be used with a
-.Fa which
-of
-.Dv CPU_WHICH_TID ,
-.Dv CPU_WHICH_PID ,
-or
-.Dv CPU_WHICH_CPUSET
-to mean the current thread, process, or current thread's
-cpuset.
-All cpuset syscalls allow this usage.
-.Pp
-A
-.Fa level
-argument of
-.Dv CPU_LEVEL_WHICH
-combined with a
-.Fa which
-argument other than
-.Dv CPU_WHICH_CPUSET
-refers to the anonymous mask of the object.
-This mask does not have an id and may only be manipulated with
-.Xr cpuset_setaffinity 2 .
-.Pp
-.Fn cpuset
-creates a new set containing the same CPUs as the root set of the current
-process and stores its id in the space provided by
-.Fa setid .
-On successful completion the calling process joins the set and is the
-only member.
-Children inherit this set after a call to
-.Xr fork 2 .
-.Pp
-.Fn cpuset_setid
-attempts to set the id of the object specified by the
-.Fa which
-argument.
-Currently
-.Dv CPU_WHICH_PID
-is the only acceptable value for which as
-threads do not have an id distinct from their process and the API does
-not permit changing the id of an existing set.
-Upon successful completion all of the threads in the target process will
-be running on CPUs permitted by the set.
-.Pp
-.Fn cpuset_getid
-retrieves a set id from the object indicated by
-.Fa which
-and stores it in the space pointed to by
-.Fa setid .
-The retrieved id may be that of either the root or assigned set
-depending on the value of
-.Fa level .
-.Fa level
-should be
-.Dv CPU_LEVEL_CPUSET
-or
-.Dv CPU_LEVEL_ROOT
-to get the set id from
-the process or thread specified by the
-.Fa id
-argument.
-Specifying
-.Dv CPU_LEVEL_WHICH
-with a process or thread is unsupported since
-this references the unnumbered anonymous mask.
-.Pp
-The actual contents of the sets may be retrieved or manipulated using
-.Xr cpuset_getaffinity 2
-and
-.Xr cpuset_setaffinity 2 .
-See those manual pages for more detail.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The following error codes may be set in
-.Va errno :
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa which
-or
-.Fa level
-argument was not a valid value.
-.It Bq Er EDEADLK
-The
-.Fn cpuset_setid
-call would leave a thread without a valid CPU to run on because the set
-does not overlap with the thread's anonymous mask.
-.It Bq Er EFAULT
-The setid pointer passed to
-.Fn cpuset_getid
-or
-.Fn cpuset
-was invalid.
-.It Bq Er ESRCH
-The object specified by the
-.Fa id
-and
-.Fa which
-arguments could not be found.
-.It Bq Er EPERM
-The calling process did not have the credentials required to complete the
-operation.
-.It Bq Er ENFILE
-There was no free
-.Ft cpusetid_t
-for allocation.
-.El
-.Sh SEE ALSO
-.Xr cpuset 1 ,
-.Xr cpuset_getaffinity 2 ,
-.Xr cpuset_setaffinity 2 ,
-.Xr pthread_affinity_np 3 ,
-.Xr pthread_attr_affinity_np 3
-.Sh HISTORY
-The
-.Nm
-family of system calls first appeared in
-.Fx 7.1 .
-.Sh AUTHOR
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
diff --git a/lib/libc_bsd/sys/cpuset_getaffinity.2 b/lib/libc_bsd/sys/cpuset_getaffinity.2
deleted file mode 100644
index 1edab78..0000000
--- a/lib/libc_bsd/sys/cpuset_getaffinity.2
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" Copyright (c) 2008 Christian Brueffer
-.\" Copyright (c) 2008 Jeffrey Roberson
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/cpuset_getaffinity.2 249716 2013-04-21 06:46:41Z joel $
-.\"
-.Dd September 10, 2010
-.Dt CPUSET_GETAFFINITY 2
-.Os
-.Sh NAME
-.Nm cpuset_getaffinity ,
-.Nm cpuset_setaffinity
-.Nd manage CPU affinity
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/cpuset.h
-.Ft int
-.Fn cpuset_getaffinity "cpulevel_t level" "cpuwhich_t which" "id_t id" "size_t setsize" "cpuset_t *mask"
-.Ft int
-.Fn cpuset_setaffinity "cpulevel_t level" "cpuwhich_t which" "id_t id" "size_t setsize" "const cpuset_t *mask"
-.Sh DESCRIPTION
-.Fn cpuset_getaffinity
-and
-.Fn cpuset_setaffinity
-allow the manipulation of sets of CPUs available to processes, threads,
-interrupts, jails and other resources.
-These functions may manipulate sets of CPUs that contain many processes
-or per-object anonymous masks that effect only a single object.
-.Pp
-The valid values for the
-.Fa level
-and
-.Fa which
-arguments are documented in
-.Xr cpuset 2 .
-These arguments specify which object and which set of the object we are
-referring to.
-Not all possible combinations are valid.
-For example, only processes may belong to a numbered set accessed by a
-.Fa level
-argument of
-.Dv CPU_LEVEL_CPUSET .
-All resources, however, have a mask which may be manipulated with
-.Dv CPU_LEVEL_WHICH .
-.Pp
-Masks of type
-.Ft cpuset_t
-are composed using the
-.Dv CPU_SET
-macros.
-The kernel tolerates large sets as long as all CPUs specified
-in the set exist.
-Sets smaller than the kernel uses generate an error on calls to
-.Fn cpuset_getaffinity
-even if the result set would fit within the user supplied set.
-Calls to
-.Fn cpuset_setaffinity
-tolerate small sets with no restrictions.
-.Pp
-The supplied mask should have a size of
-.Fa setsize
-bytes.
-This size is usually provided by calling
-.Li sizeof(mask)
-which is ultimately determined by the value of
-.Dv CPU_SETSIZE
-as defined in
-.In sys/cpuset.h .
-.Pp
-.Fn cpuset_getaffinity
-retrieves the
-mask from the object specified by
-.Fa level ,
-.Fa which
-and
-.Fa id
-and stores it in the space provided by
-.Fa mask .
-.Pp
-.Fn cpuset_setaffinity
-attempts to set the mask for the object specified by
-.Fa level ,
-.Fa which
-and
-.Fa id
-to the value in
-.Fa mask .
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The following error codes may be set in
-.Va errno :
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa level
-or
-.Fa which
-argument was not a valid value.
-.It Bq Er EINVAL
-The
-.Fa mask
-argument specified when calling
-.Fn cpuset_setaffinity
-was not a valid value.
-.It Bq Er EDEADLK
-The
-.Fn cpuset_setaffinity
-call would leave a thread without a valid CPU to run on because the set
-does not overlap with the thread's anonymous mask.
-.It Bq Er EFAULT
-The mask pointer passed was invalid.
-.It Bq Er ESRCH
-The object specified by the
-.Fa id
-and
-.Fa which
-arguments could not be found.
-.It Bq Er ERANGE
-The
-.Fa cpusetsize
-was either preposterously large or smaller than the kernel set size.
-.It Bq Er EPERM
-The calling process did not have the credentials required to complete the
-operation.
-.El
-.Sh SEE ALSO
-.Xr cpuset 1 ,
-.Xr cpuset 2 ,
-.Xr cpuset_getid 2 ,
-.Xr cpuset_setid 2 ,
-.Xr pthread_affinity_np 3 ,
-.Xr pthread_attr_affinity_np 3
-.Sh HISTORY
-The
-.Nm
-family of system calls first appeared in
-.Fx 7.1 .
-.Sh AUTHOR
-.An Jeffrey Roberson Aq jeff@FreeBSD.org
diff --git a/lib/libc_bsd/sys/dup.2 b/lib/libc_bsd/sys/dup.2
deleted file mode 100644
index b02d367..0000000
--- a/lib/libc_bsd/sys/dup.2
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)dup.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/dup.2 254410 2013-08-16 13:16:27Z jilles $
-.\"
-.Dd June 1, 2013
-.Dt DUP 2
-.Os
-.Sh NAME
-.Nm dup ,
-.Nm dup2
-.Nd duplicate an existing file descriptor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn dup "int oldd"
-.Ft int
-.Fn dup2 "int oldd" "int newd"
-.Sh DESCRIPTION
-The
-.Fn dup
-system call
-duplicates an existing object descriptor and returns its value to
-the calling process
-.Fa ( newd
-=
-.Fn dup oldd ) .
-The argument
-.Fa oldd
-is a small non-negative integer index in
-the per-process descriptor table.
-The new descriptor returned by the call
-is the lowest numbered descriptor
-currently not in use by the process.
-.Pp
-The object referenced by the descriptor does not distinguish
-between
-.Fa oldd
-and
-.Fa newd
-in any way.
-Thus if
-.Fa newd
-and
-.Fa oldd
-are duplicate references to an open
-file,
-.Xr read 2 ,
-.Xr write 2
-and
-.Xr lseek 2
-calls all move a single pointer into the file,
-and append mode, non-blocking I/O and asynchronous I/O options
-are shared between the references.
-If a separate pointer into the file is desired, a different
-object reference to the file must be obtained by issuing an
-additional
-.Xr open 2
-system call.
-The close-on-exec flag on the new file descriptor is unset.
-.Pp
-In
-.Fn dup2 ,
-the value of the new descriptor
-.Fa newd
-is specified.
-If this descriptor is already in use and
-.Fa oldd
-\*(Ne
-.Fa newd ,
-the descriptor is first deallocated as if the
-.Xr close 2
-system call had been used.
-If
-.Fa oldd
-is not a valid descriptor, then
-.Fa newd
-is not closed.
-If
-.Fa oldd
-==
-.Fa newd
-and
-.Fa oldd
-is a valid descriptor, then
-.Fn dup2
-is successful, and does nothing.
-.Sh RETURN VALUES
-These calls return the new file descriptor if successful;
-otherwise the value -1 is returned and
-the external variable
-.Va errno
-is set to indicate the cause of the error.
-.Sh ERRORS
-The
-.Fn dup
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa oldd
-argument
-is not a valid active descriptor
-.It Bq Er EMFILE
-Too many descriptors are active.
-.El
-.Pp
-The
-.Fn dup2
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa oldd
-argument is not a valid active descriptor or the
-.Fa newd
-argument is negative or exceeds the maximum allowable descriptor number
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr close 2 ,
-.Xr fcntl 2 ,
-.Xr getdtablesize 2 ,
-.Xr open 2 ,
-.Xr pipe 2 ,
-.Xr socket 2 ,
-.Xr socketpair 2 ,
-.Xr dup3 3
-.Sh STANDARDS
-The
-.Fn dup
-and
-.Fn dup2
-system calls are expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn dup
-and
-.Fn dup2
-functions appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/execve.2 b/lib/libc_bsd/sys/execve.2
deleted file mode 100644
index 666fa74..0000000
--- a/lib/libc_bsd/sys/execve.2
+++ /dev/null
@@ -1,377 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)execve.2	8.5 (Berkeley) 6/1/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/execve.2 212965 2010-09-21 16:24:51Z alc $
-.\"
-.Dd September 21, 2010
-.Dt EXECVE 2
-.Os
-.Sh NAME
-.Nm execve ,
-.Nm fexecve
-.Nd execute a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn execve "const char *path" "char *const argv[]" "char *const envp[]"
-.Ft int
-.Fn fexecve "int fd" "char *const argv[]" "char *const envp[]"
-.Sh DESCRIPTION
-The
-.Fn execve
-system call
-transforms the calling process into a new process.
-The new process is constructed from an ordinary file,
-whose name is pointed to by
-.Fa path ,
-called the
-.Em new process file .
-The
-.Fn fexecve
-system call is equivalent to
-.Fn execve
-except that the file to be executed is determined by the file
-descriptor
-.Fa fd
-instead of a
-.Fa path .
-This file is either an executable object file,
-or a file of data for an interpreter.
-An executable object file consists of an identifying header,
-followed by pages of data representing the initial program (text)
-and initialized data pages.
-Additional pages may be specified
-by the header to be initialized with zero data; see
-.Xr elf 5
-and
-.Xr a.out 5 .
-.Pp
-An interpreter file begins with a line of the form:
-.Pp
-.Bd -ragged -offset indent -compact
-.Sy \&#!
-.Em interpreter
-.Bq Em arg
-.Ed
-.Pp
-When an interpreter file is
-.Sy execve Ap d ,
-the system actually
-.Sy execve Ap s
-the specified
-.Em interpreter .
-If the optional
-.Em arg
-is specified, it becomes the first argument to the
-.Em interpreter ,
-and the name of the originally
-.Sy execve Ap d
-file becomes the second argument;
-otherwise, the name of the originally
-.Sy execve Ap d
-file becomes the first argument.
-The original arguments are shifted over to
-become the subsequent arguments.
-The zeroth argument is set to the specified
-.Em interpreter .
-.Pp
-The argument
-.Fa argv
-is a pointer to a null-terminated array of
-character pointers to null-terminated character strings.
-These strings construct the argument list to be made available to the new
-process.
-At least one argument must be present in
-the array; by custom, the first element should be
-the name of the executed program (for example, the last component of
-.Fa path ) .
-.Pp
-The argument
-.Fa envp
-is also a pointer to a null-terminated array of
-character pointers to null-terminated strings.
-A pointer to this array is normally stored in the global variable
-.Va environ .
-These strings pass information to the
-new process that is not directly an argument to the command (see
-.Xr environ 7 ) .
-.Pp
-File descriptors open in the calling process image remain open in
-the new process image, except for those for which the close-on-exec
-flag is set (see
-.Xr close 2
-and
-.Xr fcntl 2 ) .
-Descriptors that remain open are unaffected by
-.Fn execve .
-If any of the standard descriptors (0, 1, and/or 2) are closed at the
-time
-.Fn execve
-is called, and the process will gain privilege as a result of set-id
-semantics, those descriptors will be re-opened automatically.
-No programs, whether privileged or not, should assume that these descriptors
-will remain closed across a call to
-.Fn execve .
-.Pp
-Signals set to be ignored in the calling process are set to be ignored in
-the
-new process.
-Signals which are set to be caught in the calling process image
-are set to default action in the new process image.
-Blocked signals remain blocked regardless of changes to the signal action.
-The signal stack is reset to be undefined (see
-.Xr sigaction 2
-for more information).
-.Pp
-If the set-user-ID mode bit of the new process image file is set
-(see
-.Xr chmod 2 ) ,
-the effective user ID of the new process image is set to the owner ID
-of the new process image file.
-If the set-group-ID mode bit of the new process image file is set,
-the effective group ID of the new process image is set to the group ID
-of the new process image file.
-(The effective group ID is the first element of the group list.)
-The real user ID, real group ID and
-other group IDs of the new process image remain the same as the calling
-process image.
-After any set-user-ID and set-group-ID processing,
-the effective user ID is recorded as the saved set-user-ID,
-and the effective group ID is recorded as the saved set-group-ID.
-These values may be used in changing the effective IDs later (see
-.Xr setuid 2 ) .
-.Pp
-The set-ID bits are not honored if the respective file system has the
-.Cm nosuid
-option enabled or if the new process file is an interpreter file.
-Syscall
-tracing is disabled if effective IDs are changed.
-.Pp
-The new process also inherits the following attributes from
-the calling process:
-.Pp
-.Bl -column parent_process_ID -offset indent -compact
-.It process ID Ta see Xr getpid 2
-.It parent process ID Ta see Xr getppid 2
-.It process group ID Ta see Xr getpgrp 2
-.It access groups Ta see Xr getgroups 2
-.It working directory Ta see Xr chdir 2
-.It root directory Ta see Xr chroot 2
-.It control terminal Ta see Xr termios 4
-.It resource usages Ta see Xr getrusage 2
-.It interval timers Ta see Xr getitimer 2
-.It resource limits Ta see Xr getrlimit 2
-.It file mode mask Ta see Xr umask 2
-.It signal mask Ta see Xr sigaction 2 ,
-.Xr sigprocmask 2
-.El
-.Pp
-When a program is executed as a result of an
-.Fn execve
-system call, it is entered as follows:
-.Bd -literal -offset indent
-main(argc, argv, envp)
-int argc;
-char **argv, **envp;
-.Ed
-.Pp
-where
-.Fa argc
-is the number of elements in
-.Fa argv
-(the ``arg count'')
-and
-.Fa argv
-points to the array of character pointers
-to the arguments themselves.
-.Pp
-The
-.Fn fexecve
-ignores the file offset of
-.Fa fd .
-Since execute permission is checked by
-.Fn fexecve ,
-the file descriptor
-.Fa fd
-need not have been opened with the
-.Dv O_EXEC
-flag.
-However, if the file to be executed denies read permission for the process
-preparing to do the exec, the only way to provide the
-.Fa fd
-to
-.Fn fexecve
-is to use the
-.Dv O_EXEC
-flag when opening
-.Fa fd .
-Note that the file to be executed can not be open for writing.
-.Sh RETURN VALUES
-As the
-.Fn execve
-system call overlays the current process image
-with a new process image the successful call
-has no process to return to.
-If
-.Fn execve
-does return to the calling process an error has occurred; the
-return value will be -1 and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn execve
-system call
-will fail and return to the calling process if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOEXEC
-When invoking an interpreted script, the length of the first line,
-inclusive of the
-.Sy \&#!
-prefix and terminating newline, exceeds
-.Dv MAXSHELLCMDLEN
-characters.
-.It Bq Er ENOENT
-The new process file does not exist.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EACCES
-The new process file is not an ordinary file.
-.It Bq Er EACCES
-The new process file mode denies execute permission.
-.It Bq Er ENOEXEC
-The new process file has the appropriate access
-permission, but has an invalid magic number in its header.
-.It Bq Er ETXTBSY
-The new process file is a pure procedure (shared text)
-file that is currently open for writing by some process.
-.It Bq Er ENOMEM
-The new process requires more virtual memory than
-is allowed by the imposed maximum
-.Pq Xr getrlimit 2 .
-.It Bq Er E2BIG
-The number of bytes in the new process' argument list
-is larger than the system-imposed limit.
-This limit is specified by the
-.Xr sysctl 3
-MIB variable
-.Dv KERN_ARGMAX .
-.It Bq Er EFAULT
-The new process file is not as long as indicated by
-the size values in its header.
-.It Bq Er EFAULT
-The
-.Fa path ,
-.Fa argv ,
-or
-.Fa envp
-arguments
-point
-to an illegal address.
-.It Bq Er EIO
-An I/O error occurred while reading from the file system.
-.El
-.Pp
-In addition, the
-.Fn fexecve
-will fail and return to the calling process if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor open for executing.
-.El
-.Sh SEE ALSO
-.Xr ktrace 1 ,
-.Xr _exit 2 ,
-.Xr fork 2 ,
-.Xr open 2 ,
-.Xr execl 3 ,
-.Xr exit 3 ,
-.Xr sysctl 3 ,
-.Xr a.out 5 ,
-.Xr elf 5 ,
-.Xr fdescfs 5 ,
-.Xr environ 7 ,
-.Xr mount 8
-.Sh STANDARDS
-The
-.Fn execve
-system call conforms to
-.St -p1003.1-2001 ,
-with the exception of reopening descriptors 0, 1, and/or 2 in certain
-circumstances.
-A future update of the Standard is expected to require this behavior,
-and it may become the default for non-privileged processes as well.
-.\" NB: update this caveat when TC1 is blessed.
-The support for executing interpreted programs is an extension.
-The
-.Fn fexecve
-system call conforms to The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn execve
-system call appeared in
-.Bx 4.2 .
-The
-.Fn fexecve
-system call appeared in
-.Fx 8.0 .
-.Sh CAVEATS
-If a program is
-.Em setuid
-to a non-super-user, but is executed when
-the real
-.Em uid
-is ``root'', then the program has some of the powers
-of a super-user as well.
-.Pp
-When executing an interpreted program through
-.Fn fexecve ,
-kernel supplies
-.Pa /dev/fd/n
-as a second argument to the interpreter,
-where
-.Ar n
-is the file descriptor passed in the
-.Fa fd
-argument to
-.Fn fexecve .
-For this construction to work correctly, the
-.Xr fdescfs 5
-filesystem shall be mounted on
-.Pa /dev/fd .
diff --git a/lib/libc_bsd/sys/extattr_get_file.2 b/lib/libc_bsd/sys/extattr_get_file.2
deleted file mode 100644
index 9994fe4..0000000
--- a/lib/libc_bsd/sys/extattr_get_file.2
+++ /dev/null
@@ -1,276 +0,0 @@
-.\"
-.\" Copyright (c) 2001 Dima Dorfman <dima@unixfreak.org>
-.\" Copyright (c) 2003 Robert Watson <rwatson@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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/extattr_get_file.2 248995 2013-04-02 05:30:41Z mdf $
-.\"
-.Dd January 29, 2008
-.Dt EXTATTR 2
-.Os
-.Sh NAME
-.Nm extattr_get_fd ,
-.Nm extattr_set_fd ,
-.Nm extattr_delete_fd ,
-.Nm extattr_list_fd ,
-.Nm extattr_get_file ,
-.Nm extattr_set_file ,
-.Nm extattr_delete_file ,
-.Nm extattr_list_file ,
-.Nm extattr_get_link ,
-.Nm extattr_set_link ,
-.Nm extattr_delete_link ,
-.Nm extattr_list_link
-.Nd system calls to manipulate VFS extended attributes
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/extattr.h
-.Ft ssize_t
-.Fn extattr_get_fd "int fd" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes"
-.Ft ssize_t
-.Fn extattr_set_fd "int fd" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes"
-.Ft int
-.Fn extattr_delete_fd "int fd" "int attrnamespace" "const char *attrname"
-.Ft ssize_t
-.Fn extattr_list_fd "int fd" "int attrnamespace" "void *data" "size_t nbytes"
-.Ft ssize_t
-.Fn extattr_get_file "const char *path" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes"
-.Ft ssize_t
-.Fn extattr_set_file "const char *path" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes"
-.Ft int
-.Fn extattr_delete_file "const char *path" "int attrnamespace" "const char *attrname"
-.Ft ssize_t
-.Fn extattr_list_file "const char *path" "int attrnamespace" "void *data" "size_t nbytes"
-.Ft ssize_t
-.Fn extattr_get_link "const char *path" "int attrnamespace" "const char *attrname" "void *data" "size_t nbytes"
-.Ft ssize_t
-.Fn extattr_set_link "const char *path" "int attrnamespace" "const char *attrname" "const void *data" "size_t nbytes"
-.Ft int
-.Fn extattr_delete_link "const char *path" "int attrnamespace" "const char *attrname"
-.Ft ssize_t
-.Fn extattr_list_link "const char *path" "int attrnamespace" "void *data" "size_t nbytes"
-.Sh DESCRIPTION
-Named extended attributes are meta-data associated with vnodes
-representing files and directories.
-They exist as
-.Qq Li name=value
-pairs within a set of namespaces.
-.Pp
-The
-.Fn extattr_get_file
-system call retrieves the value of the specified extended attribute into
-a buffer pointed to by
-.Fa data
-of size
-.Fa nbytes .
-The
-.Fn extattr_set_file
-system call sets the value of the specified extended attribute to the data
-described by
-.Fa data .
-The
-.Fn extattr_delete_file
-system call deletes the extended attribute specified.
-The
-.Fn extattr_list_file
-returns a list of attributes present in the requested namespace.
-Each list entry consists of a single byte containing the length
-of the attribute name, followed by the attribute name.
-The attribute name is not terminated by ASCII 0 (nul).
-The
-.Fn extattr_get_file ,
-and
-.Fn extattr_list_file
-calls consume the
-.Fa data
-and
-.Fa nbytes
-arguments in the style of
-.Xr read 2 ;
-.Fn extattr_set_file
-consumes these arguments in the style of
-.Xr write 2 .
-.Pp
-If
-.Fa data
-is
-.Dv NULL
-in a call to
-.Fn extattr_get_file
-and
-.Fn extattr_list_file
-then the size of defined extended attribute data will be returned, rather
-than the quantity read, permitting applications to test the size of the
-data without performing a read.
-The
-.Fn extattr_delete_link ,
-.Fn extattr_get_link ,
-and
-.Fn extattr_set_link
-system calls behave in the same way as their _file counterparts, except that
-they do not follow symlinks.
-.Pp
-The
-.Fn extattr_get_fd ,
-.Fn extattr_set_fd ,
-.Fn extattr_delete_fd ,
-and
-.Fn extattr_list_fd ,
-calls are identical to their
-.Qq Li _file
-counterparts except for the first argument.
-The
-.Qq Li _fd
-functions take a file descriptor, while the
-.Qq Li _file
-functions take a path.
-Both arguments describe a file associated with the extended attribute
-that should be manipulated.
-.Pp
-The following arguments are common to all the system calls described here:
-.Bl -tag -width attrnamespace
-.It Fa attrnamespace
-the namespace in which the extended attribute resides; see
-.Xr extattr 9
-.It Fa attrname
-the name of the extended attribute
-.El
-.Pp
-Named extended attribute semantics vary by file system implementing the call.
-Not all operations may be supported for a particular attribute.
-Additionally, the format of the data in
-.Fa data
-is attribute-specific.
-.Pp
-For more information on named extended attributes, please see
-.Xr extattr 9 .
-.Sh CAVEAT
-This interface is under active development, and as such is subject to
-change as applications are adapted to use it.
-Developers are discouraged from relying on its stability.
-.Sh RETURN VALUES
-If successful, the
-.Fn extattr_get_file ,
-.Fn extattr_set_file ,
-and
-.Fn extattr_list_file
-calls return the number of bytes
-that were read or written from the
-.Fa data ,
-respectively, or if
-.Fa data
-was
-.Dv NULL ,
-then
-.Fn extattr_get_file
-and
-.Fn extattr_list_file
-return the number of bytes available to read.
-If any of the calls are unsuccessful, the value \-1 is returned
-and the global variable
-.Va errno
-is set to indicate the error.
-.Pp
-.Rv -std extattr_delete_file
-.Sh ERRORS
-The following errors may be returned by the system calls themselves.
-Additionally, the file system implementing the call may return any
-other errors it desires.
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa attrnamespace
-and
-.Fa attrname
-arguments,
-or the memory range defined by
-.Fa data
-and
-.Fa nbytes
-point outside the process's allocated address space.
-.It Bq Er ENAMETOOLONG
-The attribute name was longer than
-.Dv EXTATTR_MAXNAMELEN .
-.El
-.Pp
-The
-.Fn extattr_get_fd ,
-.Fn extattr_set_fd ,
-.Fn extattr_delete_fd ,
-and
-.Fn extattr_list_fd
-system calls may also fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The file descriptor referenced by
-.Fa fd
-was invalid.
-.El
-.Pp
-Additionally, the
-.Fn extattr_get_file ,
-.Fn extattr_set_file ,
-and
-.Fn extattr_delete_file
-calls may also fail due to the following errors:
-.Bl -tag -width Er
-.It Bq Er ENOATTR
-The requested attribute was not defined for this file.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-A component of the path name that must exist does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.\" XXX are any missing?
-.El
-.Sh SEE ALSO
-.Xr extattr 3 ,
-.Xr getextattr 8 ,
-.Xr setextattr 8 ,
-.Xr extattr 9 ,
-.Xr VOP_GETEXTATTR 9 ,
-.Xr VOP_SETEXTATTR 9
-.Sh HISTORY
-Extended attribute support was developed as part of the
-.Tn TrustedBSD
-Project, and introduced in
-.Fx 5.0 .
-It was developed to support security extensions requiring additional labels
-to be associated with each file or directory.
-.Sh BUGS
-In earlier versions of this API, passing an empty string for the
-attribute name to
-.Fn extattr_get_fd ,
-.Fn extattr_get_file ,
-or
-.Fn extattr_get_link
-would return the list of attributes defined for the target object.
-This interface has been deprecated in preference to using the explicit
-list API, and should not be used.
diff --git a/lib/libc_bsd/sys/fcntl.2 b/lib/libc_bsd/sys/fcntl.2
deleted file mode 100644
index 4ed92c8..0000000
--- a/lib/libc_bsd/sys/fcntl.2
+++ /dev/null
@@ -1,658 +0,0 @@
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.\"     @(#)fcntl.2	8.2 (Berkeley) 1/12/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/fcntl.2 246763 2013-02-13 15:09:16Z ian $
-.\"
-.Dd February 8, 2013
-.Dt FCNTL 2
-.Os
-.Sh NAME
-.Nm fcntl
-.Nd file control
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.Ft int
-.Fn fcntl "int fd" "int cmd" "..."
-.Sh DESCRIPTION
-The
-.Fn fcntl
-system call provides for control over descriptors.
-The argument
-.Fa fd
-is a descriptor to be operated on by
-.Fa cmd
-as described below.
-Depending on the value of
-.Fa cmd ,
-.Fn fcntl
-can take an additional third argument
-.Fa "int arg" .
-.Bl -tag -width F_DUP2FD_CLOEXEC
-.It Dv F_DUPFD
-Return a new descriptor as follows:
-.Pp
-.Bl -bullet -compact -offset 4n
-.It
-Lowest numbered available descriptor greater than or equal to
-.Fa arg .
-.It
-Same object references as the original descriptor.
-.It
-New descriptor shares the same file offset if the object
-was a file.
-.It
-Same access mode (read, write or read/write).
-.It
-Same file status flags (i.e., both file descriptors
-share the same file status flags).
-.It
-The close-on-exec flag
-.Dv FD_CLOEXEC
-associated with the new file descriptor is cleared, so the file descriptor is
-to remain open across
-.Xr execve 2
-system calls.
-.El
-.It Dv F_DUPFD_CLOEXEC
-Like
-.Dv F_DUPFD ,
-but the
-.Dv FD_CLOEXEC
-flag associated with the new file descriptor is set, so the file descriptor
-is closed when
-.Xr execve 2
-system call executes.
-.It Dv F_DUP2FD
-It is functionally equivalent to
-.Bd -literal -offset indent
-dup2(fd, arg)
-.Ed
-.It Dv F_DUP2FD_CLOEXEC
-Like
-.Dv F_DUP2FD ,
-but the
-.Dv FD_CLOEXEC
-flag associated with the new file descriptor is set.
-.Pp
-The
-.Dv F_DUP2FD
-and
-.Dv F_DUP2FD_CLOEXEC
-constants are not portable, so they should not be used if
-portability is needed.
-Use
-.Fn dup2
-instead of
-.Dv F_DUP2FD .
-.It Dv F_GETFD
-Get the close-on-exec flag associated with the file descriptor
-.Fa fd
-as
-.Dv FD_CLOEXEC .
-If the returned value ANDed with
-.Dv FD_CLOEXEC
-is 0,
-the file will remain open across
-.Fn exec ,
-otherwise the file will be closed upon execution of
-.Fn exec
-.Fa ( arg
-is ignored).
-.It Dv F_SETFD
-Set the close-on-exec flag associated with
-.Fa fd
-to
-.Fa arg ,
-where
-.Fa arg
-is either 0 or
-.Dv FD_CLOEXEC ,
-as described above.
-.It Dv F_GETFL
-Get descriptor status flags, as described below
-.Fa ( arg
-is ignored).
-.It Dv F_SETFL
-Set descriptor status flags to
-.Fa arg .
-.It Dv F_GETOWN
-Get the process ID or process group
-currently receiving
-.Dv SIGIO
-and
-.Dv SIGURG
-signals; process groups are returned
-as negative values
-.Fa ( arg
-is ignored).
-.It Dv F_SETOWN
-Set the process or process group
-to receive
-.Dv SIGIO
-and
-.Dv SIGURG
-signals;
-process groups are specified by supplying
-.Fa arg
-as negative, otherwise
-.Fa arg
-is interpreted as a process ID.
-.It Dv F_READAHEAD
-Set or clear the read ahead amount for sequential access to the third
-argument,
-.Fa arg ,
-which is rounded up to the nearest block size.
-A zero value in
-.Fa arg
-turns off read ahead, a negative value restores the system default.
-.It Dv F_RDAHEAD
-Equivalent to Darwin counterpart which sets read ahead amount of 128KB
-when the third argument,
-.Fa arg
-is non-zero.
-A zero value in
-.Fa arg
-turns off read ahead.
-.El
-.Pp
-The flags for the
-.Dv F_GETFL
-and
-.Dv F_SETFL
-flags are as follows:
-.Bl -tag -width O_NONBLOCKX
-.It Dv O_NONBLOCK
-Non-blocking I/O; if no data is available to a
-.Xr read 2
-system call, or if a
-.Xr write 2
-operation would block,
-the read or write call returns -1 with the error
-.Er EAGAIN .
-.It Dv O_APPEND
-Force each write to append at the end of file;
-corresponds to the
-.Dv O_APPEND
-flag of
-.Xr open 2 .
-.It Dv O_DIRECT
-Minimize or eliminate the cache effects of reading and writing.
-The system
-will attempt to avoid caching the data you read or write.
-If it cannot
-avoid caching the data, it will minimize the impact the data has on the cache.
-Use of this flag can drastically reduce performance if not used with care.
-.It Dv O_ASYNC
-Enable the
-.Dv SIGIO
-signal to be sent to the process group
-when I/O is possible, e.g.,
-upon availability of data to be read.
-.El
-.Pp
-Several commands are available for doing advisory file locking;
-they all operate on the following structure:
-.Bd -literal
-struct flock {
-	off_t	l_start;	/* starting offset */
-	off_t	l_len;		/* len = 0 means until end of file */
-	pid_t	l_pid;		/* lock owner */
-	short	l_type;		/* lock type: read/write, etc. */
-	short	l_whence;	/* type of l_start */
-	int	l_sysid;	/* remote system id or zero for local */
-};
-.Ed
-The commands available for advisory record locking are as follows:
-.Bl -tag -width F_SETLKWX
-.It Dv F_GETLK
-Get the first lock that blocks the lock description pointed to by the
-third argument,
-.Fa arg ,
-taken as a pointer to a
-.Fa "struct flock"
-(see above).
-The information retrieved overwrites the information passed to
-.Fn fcntl
-in the
-.Fa flock
-structure.
-If no lock is found that would prevent this lock from being created,
-the structure is left unchanged by this system call except for the
-lock type which is set to
-.Dv F_UNLCK .
-.It Dv F_SETLK
-Set or clear a file segment lock according to the lock description
-pointed to by the third argument,
-.Fa arg ,
-taken as a pointer to a
-.Fa "struct flock"
-(see above).
-.Dv F_SETLK
-is used to establish shared (or read) locks
-.Pq Dv F_RDLCK
-or exclusive (or write) locks,
-.Pq Dv F_WRLCK ,
-as well as remove either type of lock
-.Pq Dv F_UNLCK .
-If a shared or exclusive lock cannot be set,
-.Fn fcntl
-returns immediately with
-.Er EAGAIN .
-.It Dv F_SETLKW
-This command is the same as
-.Dv F_SETLK
-except that if a shared or exclusive lock is blocked by other locks,
-the process waits until the request can be satisfied.
-If a signal that is to be caught is received while
-.Fn fcntl
-is waiting for a region, the
-.Fn fcntl
-will be interrupted if the signal handler has not specified the
-.Dv SA_RESTART
-(see
-.Xr sigaction 2 ) .
-.El
-.Pp
-When a shared lock has been set on a segment of a file,
-other processes can set shared locks on that segment
-or a portion of it.
-A shared lock prevents any other process from setting an exclusive
-lock on any portion of the protected area.
-A request for a shared lock fails if the file descriptor was not
-opened with read access.
-.Pp
-An exclusive lock prevents any other process from setting a shared lock or
-an exclusive lock on any portion of the protected area.
-A request for an exclusive lock fails if the file was not
-opened with write access.
-.Pp
-The value of
-.Fa l_whence
-is
-.Dv SEEK_SET ,
-.Dv SEEK_CUR ,
-or
-.Dv SEEK_END
-to indicate that the relative offset,
-.Fa l_start
-bytes, will be measured from the start of the file,
-current position, or end of the file, respectively.
-The value of
-.Fa l_len
-is the number of consecutive bytes to be locked.
-If
-.Fa l_len
-is negative,
-.Fa l_start
-means end edge of the region.
-The
-.Fa l_pid
-and
-.Fa l_sysid
-fields are only used with
-.Dv F_GETLK
-to return the process ID of the process holding a blocking lock and
-the system ID of the system that owns that process.
-Locks created by the local system will have a system ID of zero.
-After a successful
-.Dv F_GETLK
-request, the value of
-.Fa l_whence
-is
-.Dv SEEK_SET .
-.Pp
-Locks may start and extend beyond the current end of a file,
-but may not start or extend before the beginning of the file.
-A lock is set to extend to the largest possible value of the
-file offset for that file if
-.Fa l_len
-is set to zero.
-If
-.Fa l_whence
-and
-.Fa l_start
-point to the beginning of the file, and
-.Fa l_len
-is zero, the entire file is locked.
-If an application wishes only to do entire file locking, the
-.Xr flock 2
-system call is much more efficient.
-.Pp
-There is at most one type of lock set for each byte in the file.
-Before a successful return from an
-.Dv F_SETLK
-or an
-.Dv F_SETLKW
-request when the calling process has previously existing locks
-on bytes in the region specified by the request,
-the previous lock type for each byte in the specified
-region is replaced by the new lock type.
-As specified above under the descriptions
-of shared locks and exclusive locks, an
-.Dv F_SETLK
-or an
-.Dv F_SETLKW
-request fails or blocks respectively when another process has existing
-locks on bytes in the specified region and the type of any of those
-locks conflicts with the type specified in the request.
-.Pp
-This interface follows the completely stupid semantics of System V and
-.St -p1003.1-88
-that require that all locks associated with a file for a given process are
-removed when
-.Em any
-file descriptor for that file is closed by that process.
-This semantic means that applications must be aware of any files that
-a subroutine library may access.
-For example if an application for updating the password file locks the
-password file database while making the update, and then calls
-.Xr getpwnam 3
-to retrieve a record,
-the lock will be lost because
-.Xr getpwnam 3
-opens, reads, and closes the password database.
-The database close will release all locks that the process has
-associated with the database, even if the library routine never
-requested a lock on the database.
-Another minor semantic problem with this interface is that
-locks are not inherited by a child process created using the
-.Xr fork 2
-system call.
-The
-.Xr flock 2
-interface has much more rational last close semantics and
-allows locks to be inherited by child processes.
-The
-.Xr flock 2
-system call is recommended for applications that want to ensure the integrity
-of their locks when using library routines or wish to pass locks
-to their children.
-.Pp
-The
-.Fn fcntl ,
-.Xr flock 2 ,
-and
-.Xr lockf 3
-locks are compatible.
-Processes using different locking interfaces can cooperate
-over the same file safely.
-However, only one of such interfaces should be used within
-the same process.
-If a file is locked by a process through
-.Xr flock 2 ,
-any record within the file will be seen as locked
-from the viewpoint of another process using
-.Fn fcntl
-or
-.Xr lockf 3 ,
-and vice versa.
-Note that
-.Fn fcntl F_GETLK
-returns \-1 in
-.Fa l_pid
-if the process holding a blocking lock previously locked the
-file descriptor by
-.Xr flock 2 .
-.Pp
-All locks associated with a file for a given process are
-removed when the process terminates.
-.Pp
-All locks obtained before a call to
-.Xr execve 2
-remain in effect until the new program releases them.
-If the new program does not know about the locks, they will not be
-released until the program exits.
-.Pp
-A potential for deadlock occurs if a process controlling a locked region
-is put to sleep by attempting to lock the locked region of another process.
-This implementation detects that sleeping until a locked region is unlocked
-would cause a deadlock and fails with an
-.Er EDEADLK
-error.
-.Sh RETURN VALUES
-Upon successful completion, the value returned depends on
-.Fa cmd
-as follows:
-.Bl -tag -width F_GETOWNX -offset indent
-.It Dv F_DUPFD
-A new file descriptor.
-.It Dv F_DUP2FD
-A file descriptor equal to
-.Fa arg .
-.It Dv F_GETFD
-Value of flag (only the low-order bit is defined).
-.It Dv F_GETFL
-Value of flags.
-.It Dv F_GETOWN
-Value of file descriptor owner.
-.It other
-Value other than -1.
-.El
-.Pp
-Otherwise, a value of -1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn fcntl
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The argument
-.Fa cmd
-is
-.Dv F_SETLK ,
-the type of lock
-.Pq Fa l_type
-is a shared lock
-.Pq Dv F_RDLCK
-or exclusive lock
-.Pq Dv F_WRLCK ,
-and the segment of a file to be locked is already
-exclusive-locked by another process;
-or the type is an exclusive lock and some portion of the
-segment of a file to be locked is already shared-locked or
-exclusive-locked by another process.
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid open file descriptor.
-.Pp
-The argument
-.Fa cmd
-is
-.Dv F_DUP2FD ,
-and
-.Fa arg
-is not a valid file descriptor.
-.Pp
-The argument
-.Fa cmd
-is
-.Dv F_SETLK
-or
-.Dv F_SETLKW ,
-the type of lock
-.Pq Fa l_type
-is a shared lock
-.Pq Dv F_RDLCK ,
-and
-.Fa fd
-is not a valid file descriptor open for reading.
-.Pp
-The argument
-.Fa cmd
-is
-.Dv F_SETLK
-or
-.Dv F_SETLKW ,
-the type of lock
-.Pq Fa l_type
-is an exclusive lock
-.Pq Dv F_WRLCK ,
-and
-.Fa fd
-is not a valid file descriptor open for writing.
-.It Bq Er EDEADLK
-The argument
-.Fa cmd
-is
-.Dv F_SETLKW ,
-and a deadlock condition was detected.
-.It Bq Er EINTR
-The argument
-.Fa cmd
-is
-.Dv F_SETLKW ,
-and the system call was interrupted by a signal.
-.It Bq Er EINVAL
-The
-.Fa cmd
-argument
-is
-.Dv F_DUPFD
-and
-.Fa arg
-is negative or greater than the maximum allowable number
-(see
-.Xr getdtablesize 2 ) .
-.Pp
-The argument
-.Fa cmd
-is
-.Dv F_GETLK ,
-.Dv F_SETLK
-or
-.Dv F_SETLKW
-and the data to which
-.Fa arg
-points is not valid.
-.It Bq Er EMFILE
-The argument
-.Fa cmd
-is
-.Dv F_DUPFD
-and the maximum number of file descriptors permitted for the
-process are already in use,
-or no file descriptors greater than or equal to
-.Fa arg
-are available.
-.It Bq Er ENOLCK
-The argument
-.Fa cmd
-is
-.Dv F_SETLK
-or
-.Dv F_SETLKW ,
-and satisfying the lock or unlock request would result in the
-number of locked regions in the system exceeding a system-imposed limit.
-.It Bq Er EOPNOTSUPP
-The argument
-.Fa cmd
-is
-.Dv F_GETLK ,
-.Dv F_SETLK
-or
-.Dv F_SETLKW
-and
-.Fa fd
-refers to a file for which locking is not supported.
-.It Bq Er EOVERFLOW
-The argument
-.Fa cmd
-is
-.Dv F_GETLK ,
-.Dv F_SETLK
-or
-.Dv F_SETLKW
-and an
-.Fa off_t
-calculation overflowed.
-.It Bq Er EPERM
-The
-.Fa cmd
-argument
-is
-.Dv F_SETOWN
-and
-the process ID or process group given as an argument is in a
-different session than the caller.
-.It Bq Er ESRCH
-The
-.Fa cmd
-argument
-is
-.Dv F_SETOWN
-and
-the process ID given as argument is not in use.
-.El
-.Pp
-In addition, if
-.Fa fd
-refers to a descriptor open on a terminal device (as opposed to a
-descriptor open on a socket), a
-.Fa cmd
-of
-.Dv F_SETOWN
-can fail for the same reasons as in
-.Xr tcsetpgrp 3 ,
-and a
-.Fa cmd
-of
-.Dv F_GETOWN
-for the reasons as stated in
-.Xr tcgetpgrp 3 .
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr dup2 2 ,
-.Xr execve 2 ,
-.Xr flock 2 ,
-.Xr getdtablesize 2 ,
-.Xr open 2 ,
-.Xr sigaction 2 ,
-.Xr lockf 3 ,
-.Xr tcgetpgrp 3 ,
-.Xr tcsetpgrp 3
-.Sh STANDARDS
-The
-.Dv F_DUP2FD
-constant is non portable.
-It is provided for compatibility with AIX and Solaris.
-.Sh HISTORY
-The
-.Fn fcntl
-system call appeared in
-.Bx 4.2 .
-.Pp
-The
-.Dv F_DUP2FD
-constant first appeared in
-.Fx 7.1 .
diff --git a/lib/libc_bsd/sys/fcntl.c b/lib/libc_bsd/sys/fcntl.c
deleted file mode 100644
index a2925a7..0000000
--- a/lib/libc_bsd/sys/fcntl.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 2008 Isilon Inc http://www.isilon.com/
- * Authors: Doug Rabson <dfr@rabson.org>
- * Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/fcntl.c 281256 2015-04-08 02:21:44Z kib $");
-
-#include <fcntl.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include "libc_private.h"
-
-#pragma weak fcntl
-int
-fcntl(int fd, int cmd, ...)
-{
-	va_list args;
-	long arg;
-
-	va_start(args, cmd);
-	arg = va_arg(args, long);
-	va_end(args);
-
-	return (((int (*)(int, int, ...))
-	    __libc_interposing[INTERPOS_fcntl])(fd, cmd, arg));
-}
-
-#ifdef SYSCALL_COMPAT
-__weak_reference(__fcntl_compat, __fcntl);
-
-int
-__fcntl_compat(int fd, int cmd, ...)
-{
-	va_list args;
-	long arg;
-	struct __oflock ofl;
-	struct flock *flp;
-	int res;
-
-	va_start(args, cmd);
-	arg = va_arg(args, long);
-	va_end(args);
-
-	if (__getosreldate() >= 800028) {
-		return (__sys_fcntl(fd, cmd, arg));
-	} else {
-		if (cmd == F_GETLK || cmd == F_SETLK || cmd == F_SETLKW) {
-			/*
-			 * Convert new-style struct flock (which
-			 * includes l_sysid) to old-style.
-			 */
-			flp = (struct flock *) (uintptr_t) arg;
-			ofl.l_start = flp->l_start;
-			ofl.l_len = flp->l_len;
-			ofl.l_pid = flp->l_pid;
-			ofl.l_type = flp->l_type;
-			ofl.l_whence = flp->l_whence;
-
-			switch (cmd) {
-			case F_GETLK:
-				res = __sys_fcntl(fd, F_OGETLK, &ofl);
-				if (res >= 0) {
-					flp->l_start = ofl.l_start;
-					flp->l_len = ofl.l_len;
-					flp->l_pid = ofl.l_pid;
-					flp->l_type = ofl.l_type;
-					flp->l_whence = ofl.l_whence;
-					flp->l_sysid = 0;
-				}
-				return (res);
-
-			case F_SETLK:
-				return (__sys_fcntl(fd, F_OSETLK, &ofl));
-
-			case F_SETLKW:
-				return (__sys_fcntl(fd, F_OSETLKW, &ofl));
-			}
-		}
-		return (__sys_fcntl(fd, cmd, arg));
-	}
-}
-#endif
diff --git a/lib/libc_bsd/sys/ffclock.2 b/lib/libc_bsd/sys/ffclock.2
deleted file mode 100644
index 8bfecb8..0000000
--- a/lib/libc_bsd/sys/ffclock.2
+++ /dev/null
@@ -1,177 +0,0 @@
-.\" Copyright (c) 2011 The University of Melbourne
-.\" All rights reserved.
-.\"
-.\" This documentation was written by Julien Ridoux at the University of
-.\" Melbourne under sponsorship from the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/ffclock.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.Dd November 21, 2011
-.Dt FFCLOCK 2
-.Os
-.Sh NAME
-.Nm ffclock_getcounter ,
-.Nm ffclock_getestimate ,
-.Nm ffclock_setestimate
-.Nd Retrieve feed-forward counter, get and set feed-forward clock estimates
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/timeffc.h
-.Ft int
-.Fn ffclock_getcounter "ffcounter *ffcount"
-.Ft int
-.Fn ffclock_getestimate "struct ffclock_estimate *cest"
-.Ft int
-.Fn ffclock_setestimate "struct ffclock_estimate *cest"
-.Sh DESCRIPTION
-The ffclock is an alternative method to synchronise the system clock.
-The ffclock implements a feed-forward paradigm and decouples the timestamping
-and timekeeping kernel functions.
-This ensures that past clock errors do not affect current timekeeping, an
-approach radically different from the feedback alternative implemented by the
-ntpd daemon when adjusting the system clock.
-The feed-forward approach has demonstrated better performance and higher
-robustness than a feedback approach when synchronising over the network.
-.Pp
-In the feed-forward context, a
-.Em timestamp
-is a cumulative value of the ticks of the timecounter, which can be converted
-into seconds by using the feed-forward
-.Em clock estimates .
-.Pp
-The
-.Fn ffclock_getcounter
-system call allows the calling process to retrieve the current value of the
-feed-forward counter maintained by the kernel.
-.Pp
-The
-.Fn ffclock_getestimate
-and
-.Fn ffclock_setestimate
-system calls allow the caller to get and set the kernel's feed-forward clock
-parameter estimates respectively.
-The
-.Fn ffclock_setestimate
-system call should be invoked by a single instance of a feed-forward
-synchronisation daemon.
-The
-.Fn ffclock_getestimate
-system call can be called by any process to retrieve the feed-forward clock
-estimates.
-.Pp
-The feed-forward approach does not require that the clock estimates be retrieved
-every time a timestamp is to be converted into seconds.
-The number of system calls can therefore be greatly reduced if the calling
-process retrieves the clock estimates from the clock synchronisation daemon
-instead.
-The
-.Fn ffclock_getestimate
-must be used when the feed-forward synchronisation daemon is not running
-.Po see
-.Sx USAGE
-below
-.Pc .
-.Pp
-The clock parameter estimates structure pointed to by
-.Fa cest
-is defined in
-.In sys/timeffc.h
-as:
-.Bd -literal
-struct ffclock_estimate {
-	struct bintime update_time;    /* Time of last estimates update. */
-	ffcounter      update_ffcount; /* Counter value at last update. */
-	ffcounter      leapsec_next;   /* Counter value of next leap second. */
-	uint64_t       period;         /* Estimate of counter period. */
-	uint32_t       errb_abs;       /* Bound on absolute clock error [ns]. */
-	uint32_t       errb_rate;      /* Bound on counter rate error [ps/s]. */
-	uint32_t       status;         /* Clock status. */
-	int16_t        leapsec_total;  /* All leap seconds seen so far. */
-	int8_t         leapsec;        /* Next leap second (in {-1,0,1}). */
-};
-.Ed
-.Pp
-Only the super-user may set the feed-forward clock estimates.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The following error codes may be set in
-.Va errno :
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa ffcount
-or
-.Fa cest
-pointer referenced invalid memory.
-.It Bq Er EPERM
-A user other than the super-user attempted to set the feed-forward clock
-parameter estimates.
-.El
-.Sh USAGE
-The feed-forward paradigm enables the definition of specialised clock functions.
-.Pp
-In its simplest form,
-.Fn ffclock_getcounter
-can be used to establish strict order between events or to measure small time
-intervals very accurately with a minimum performance cost.
-.Pp
-Different methods exist to access absolute time
-.Po or
-.Qq wall-clock time
-.Pc tracked by the ffclock.
-The simplest method uses the ffclock sysctl interface
-.Va kern.ffclock
-to make the system clock return the ffclock time.
-The
-.Xr clock_gettime 2
-system call can then be used to retrieve the current time seen by the
-feed-forward clock.
-Note that this setting affects the entire system and that a feed-forward
-synchronisation daemon should be running.
-.Pp
-A less automated method consists of retrieving the feed-forward counter
-timestamp from the kernel and using the feed-forward clock parameter estimates
-to convert the timestamp into seconds.
-The feed-forward clock parameter estimates can be retrieved from the kernel or
-from the synchronisation daemon directly (preferred).
-This method allows converting timestamps using different clock models as needed
-by the application, while collecting meaningful upper bounds on current clock
-error.
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr adjtime 2 ,
-.Xr clock_gettime 2 ,
-.Xr ctime 3
-.Sh HISTORY
-Feed-forward clock support first appeared in
-.Fx 10.0 .
-.Sh AUTHORS
-.An -nosplit
-The feed-forward clock support was written by
-.An Julien Ridoux Aq jridoux@unimelb.edu.au
-in collaboration with
-.An Darryl Veitch Aq dveitch@unimelb.edu.au
-at the University of Melbourne under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc_bsd/sys/fhopen.2 b/lib/libc_bsd/sys/fhopen.2
deleted file mode 100644
index 8ce3491..0000000
--- a/lib/libc_bsd/sys/fhopen.2
+++ /dev/null
@@ -1,147 +0,0 @@
-.\"	$NetBSD: fhopen.2,v 1.1 1999/06/30 01:32:15 wrstuden Exp $
-.\"
-.\" Copyright (c) 1999 National Aeronautics & Space Administration
-.\" All rights reserved.
-.\"
-.\" This software was written by William Studenmund of the
-.\" Numerical Aerospace Simulation Facility, NASA Ames Research Center.
-.\"
-.\" 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. Neither the name of the National Aeronautics & Space Administration
-.\"    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 NATIONAL AERONAUTICS & SPACE ADMINISTRATION
-.\" ``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 ADMINISTRATION OR CONTRIB-
-.\" UTORS 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: releng/10.2/lib/libc/sys/fhopen.2 147700 2005-06-30 13:18:15Z hmp $
-.\"
-.Dd June 29, 1999
-.Dt FHOPEN 2
-.Os
-.Sh NAME
-.Nm fhopen ,
-.Nm fhstat ,
-.Nm fhstatfs
-.Nd access file via file handle
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/mount.h
-.In sys/stat.h
-.Ft int
-.Fn fhopen "const fhandle_t *fhp" "int flags"
-.Ft int
-.Fn fhstat "const fhandle_t *fhp" "struct stat *sb"
-.Ft int
-.Fn fhstatfs "const fhandle_t *fhp" "struct statfs *buf"
-.Sh DESCRIPTION
-These system calls provide a means to access a file given the file handle
-.Fa fhp .
-As this method bypasses directory access restrictions, these calls are
-restricted to the superuser.
-.Pp
-The
-.Fn fhopen
-system call
-opens the file referenced by
-.Fa fhp
-for reading and/or writing as specified by the argument
-.Fa flags
-and returns the file descriptor to the calling process.
-The
-.Fa flags
-argument
-is specified by
-.Em or Ns 'ing
-together the flags used for the
-.Xr open 2
-system call.
-All said flags are valid except for
-.Dv O_CREAT .
-.Pp
-The
-.Fn fhstat
-and
-.Fn fhstatfs
-system calls
-provide the functionality of the
-.Xr fstat 2
-and
-.Xr fstatfs 2
-calls except that they return information for the file referred to by
-.Fa fhp
-rather than an open file.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn fhopen
-returns the file descriptor for the opened file;
-otherwise the value \-1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Pp
-.Rv -std fhstat fhstatfs
-.Sh ERRORS
-In addition to the errors returned by
-.Xr open 2 ,
-.Xr fstat 2 ,
-and
-.Xr fstatfs 2
-respectively,
-.Fn fhopen ,
-.Fn fhstat ,
-and
-.Fn fhstatfs
-will return
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Calling
-.Fn fhopen
-with
-.Dv O_CREAT
-set.
-.It Bq Er ESTALE
-The file handle
-.Fa fhp
-is no longer valid.
-.El
-.Sh SEE ALSO
-.Xr fstat 2 ,
-.Xr fstatfs 2 ,
-.Xr getfh 2 ,
-.Xr open 2
-.Sh HISTORY
-The
-.Fn fhopen ,
-.Fn fhstat ,
-and
-.Fn fhstatfs
-system calls first appeared in
-.Nx 1.5
-and were adapted to
-.Fx 4.0
-by
-.An Alfred Perlstein .
-.Sh AUTHORS
-This manual page was written by
-.An William Studenmund
-for
-.Nx .
diff --git a/lib/libc_bsd/sys/flock.2 b/lib/libc_bsd/sys/flock.2
deleted file mode 100644
index 72675ad..0000000
--- a/lib/libc_bsd/sys/flock.2
+++ /dev/null
@@ -1,173 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)flock.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/flock.2 227416 2011-11-10 06:20:18Z dougb $
-.\"
-.Dd November 9, 2011
-.Dt FLOCK 2
-.Os
-.Sh NAME
-.Nm flock
-.Nd "apply or remove an advisory lock on an open file"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/file.h
-.Fd "#define   LOCK_SH        0x01      /* shared file lock */"
-.Fd "#define   LOCK_EX        0x02      /* exclusive file lock */"
-.Fd "#define   LOCK_NB        0x04      /* do not block when locking */"
-.Fd "#define   LOCK_UN        0x08      /* unlock file */"
-.Ft int
-.Fn flock "int fd" "int operation"
-.Sh DESCRIPTION
-The
-.Fn flock
-system call applies or removes an
-.Em advisory
-lock on the file associated with the file descriptor
-.Fa fd .
-A lock is applied by specifying an
-.Fa operation
-argument that is one of
-.Dv LOCK_SH
-or
-.Dv LOCK_EX
-with the optional addition of
-.Dv LOCK_NB .
-To unlock
-an existing lock
-.Dv operation
-should be
-.Dv LOCK_UN .
-.Pp
-Advisory locks allow cooperating processes to perform
-consistent operations on files, but do not guarantee
-consistency (i.e., processes may still access files
-without using advisory locks possibly resulting in
-inconsistencies).
-.Pp
-The locking mechanism allows two types of locks:
-.Em shared
-locks and
-.Em exclusive
-locks.
-At any time multiple shared locks may be applied to a file,
-but at no time are multiple exclusive, or both shared and exclusive,
-locks allowed simultaneously on a file.
-.Pp
-A shared lock may be
-.Em upgraded
-to an exclusive lock, and vice versa, simply by specifying
-the appropriate lock type; this results in the previous
-lock being released and the new lock applied (possibly
-after other processes have gained and released the lock).
-.Pp
-Requesting a lock on an object that is already locked
-normally causes the caller to be blocked until the lock may be
-acquired.
-If
-.Dv LOCK_NB
-is included in
-.Fa operation ,
-then this will not happen; instead the call will fail and
-the error
-.Er EWOULDBLOCK
-will be returned.
-.Sh NOTES
-Locks are on files, not file descriptors.
-That is, file descriptors
-duplicated through
-.Xr dup 2
-or
-.Xr fork 2
-do not result in multiple instances of a lock, but rather multiple
-references to a single lock.
-If a process holding a lock on a file
-forks and the child explicitly unlocks the file, the parent will
-lose its lock.
-.Pp
-The
-.Fn flock ,
-.Xr fcntl 2 ,
-and
-.Xr lockf 3
-locks are compatible.
-Processes using different locking interfaces can cooperate
-over the same file safely.
-However, only one of such interfaces should be used within
-the same process.
-If a file is locked by a process through
-.Fn flock ,
-any record within the file will be seen as locked
-from the viewpoint of another process using
-.Xr fcntl 2
-or
-.Xr lockf 3 ,
-and vice versa.
-.Pp
-Processes blocked awaiting a lock may be awakened by signals.
-.Sh RETURN VALUES
-.Rv -std flock
-.Sh ERRORS
-The
-.Fn flock
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er EWOULDBLOCK
-The file is locked and the
-.Dv LOCK_NB
-option was specified.
-.It Bq Er EBADF
-The argument
-.Fa fd
-is an invalid descriptor.
-.It Bq Er EINVAL
-The argument
-.Fa fd
-refers to an object other than a file.
-.It Bq Er EOPNOTSUPP
-The argument
-.Fa fd
-refers to an object that does not support file locking.
-.It Bq Er ENOLCK
-A lock was requested, but no locks are available.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr dup 2 ,
-.Xr execve 2 ,
-.Xr fcntl 2 ,
-.Xr fork 2 ,
-.Xr open 2 ,
-.Xr flopen 3 ,
-.Xr lockf 3
-.Sh HISTORY
-The
-.Fn flock
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/fork.2 b/lib/libc_bsd/sys/fork.2
deleted file mode 100644
index 7d6e821..0000000
--- a/lib/libc_bsd/sys/fork.2
+++ /dev/null
@@ -1,145 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)fork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/fork.2 251194 2013-05-31 20:46:08Z jilles $
-.\"
-.Dd May 31, 2013
-.Dt FORK 2
-.Os
-.Sh NAME
-.Nm fork
-.Nd create a new process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn fork void
-.Sh DESCRIPTION
-The
-.Fn fork
-system call causes creation of a new process.
-The new process (child process) is an exact copy of the
-calling process (parent process) except for the following:
-.Bl -bullet -offset indent
-.It
-The child process has a unique process ID.
-.It
-The child process has a different parent
-process ID (i.e., the process ID of the parent process).
-.It
-The child process has its own copy of the parent's descriptors.
-These descriptors reference the same underlying objects, so that,
-for instance, file pointers in file objects are shared between
-the child and the parent, so that an
-.Xr lseek 2
-on a descriptor in the child process can affect a subsequent
-.Xr read 2
-or
-.Xr write 2
-by the parent.
-This descriptor copying is also used by the shell to
-establish standard input and output for newly created processes
-as well as to set up pipes.
-.It
-The child process' resource utilizations
-are set to 0; see
-.Xr setrlimit 2 .
-.It
-All interval timers are cleared; see
-.Xr setitimer 2 .
-.It
-The child process has only one thread,
-corresponding to the calling thread in the parent process.
-If the process has more than one thread,
-locks and other resources held by the other threads are not released
-and therefore only async-signal-safe functions
-(see
-.Xr sigaction 2 )
-are guaranteed to work in the child process until a call to
-.Xr execve 2
-or a similar function.
-.El
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn fork
-returns a value
-of 0 to the child process and returns the process ID of the child
-process to the parent process.
-Otherwise, a value of -1 is returned
-to the parent process, no child process is created, and the global
-variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn fork
-system call will fail and no child process will be created if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The system-imposed limit on the total
-number of processes under execution would be exceeded.
-The limit is given by the
-.Xr sysctl 3
-MIB variable
-.Dv KERN_MAXPROC .
-(The limit is actually ten less than this
-except for the super user).
-.It Bq Er EAGAIN
-The user is not the super user, and
-the system-imposed limit
-on the total number of
-processes under execution by a single user would be exceeded.
-The limit is given by the
-.Xr sysctl 3
-MIB variable
-.Dv KERN_MAXPROCPERUID .
-.It Bq Er EAGAIN
-The user is not the super user, and
-the soft resource limit corresponding to the
-.Fa resource
-argument
-.Dv RLIMIT_NPROC
-would be exceeded (see
-.Xr getrlimit 2 ) .
-.It Bq Er ENOMEM
-There is insufficient swap space for the new process.
-.El
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr rfork 2 ,
-.Xr setitimer 2 ,
-.Xr setrlimit 2 ,
-.Xr sigaction 2 ,
-.Xr vfork 2 ,
-.Xr wait 2
-.Sh HISTORY
-The
-.Fn fork
-function appeared in
-.At v6 .
diff --git a/lib/libc_bsd/sys/fork.c b/lib/libc_bsd/sys/fork.c
deleted file mode 100644
index fcea590..0000000
--- a/lib/libc_bsd/sys/fork.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/fork.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_fork, __fork);
-
-#pragma weak fork
-pid_t
-fork(void)
-{
-
-	return (((pid_t (*)(void))__libc_interposing[INTERPOS_fork])());
-}
diff --git a/lib/libc_bsd/sys/fsync.2 b/lib/libc_bsd/sys/fsync.2
deleted file mode 100644
index 28e2d1e..0000000
--- a/lib/libc_bsd/sys/fsync.2
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 1983, 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.
-.\" 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.
-.\"
-.\"     @(#)fsync.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/fsync.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt FSYNC 2
-.Os
-.Sh NAME
-.Nm fsync
-.Nd "synchronise changes to a file"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn fsync "int fd"
-.Sh DESCRIPTION
-The
-.Fn fsync
-system call
-causes all modified data and attributes of
-.Fa fd
-to be moved to a permanent storage device.
-This normally results in all in-core modified copies
-of buffers for the associated file to be written to a disk.
-.Pp
-The
-.Fn fsync
-system call
-should be used by programs that require a file to be
-in a known state, for example, in building a simple transaction
-facility.
-.Sh RETURN VALUES
-.Rv -std fsync
-.Sh ERRORS
-The
-.Fn fsync
-fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid descriptor.
-.It Bq Er EINVAL
-The
-.Fa fd
-argument
-refers to a socket, not to a file.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr sync 2 ,
-.Xr syncer 4 ,
-.Xr sync 8
-.Sh HISTORY
-The
-.Fn fsync
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/fsync.c b/lib/libc_bsd/sys/fsync.c
deleted file mode 100644
index 6f2d002..0000000
--- a/lib/libc_bsd/sys/fsync.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/fsync.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_fsync, __fsync);
-
-int
-fsync(int fd)
-{
-
-	return (((int (*)(int))__libc_interposing[INTERPOS_fsync])(fd));
-}
diff --git a/lib/libc_bsd/sys/ftruncate.c b/lib/libc_bsd/sys/ftruncate.c
deleted file mode 100644
index b87ed31..0000000
--- a/lib/libc_bsd/sys/ftruncate.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ftruncate.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/ftruncate.c 171219 2007-07-04 23:27:38Z peter $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-int
-ftruncate(fd, length)
-	int	fd;
-	off_t	length;
-{
-
-	if (__getosreldate() >= 700051)
-		return(__sys_ftruncate(fd, length));
-	else
-		return(__sys_freebsd6_ftruncate(fd, 0, length));
-}
diff --git a/lib/libc_bsd/sys/getdirentries.2 b/lib/libc_bsd/sys/getdirentries.2
deleted file mode 100644
index 6c1f9a9..0000000
--- a/lib/libc_bsd/sys/getdirentries.2
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)getdirentries.2	8.2 (Berkeley) 5/3/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getdirentries.2 231564 2012-02-12 18:29:56Z ed $
-.\"
-.Dd May 3, 1995
-.Dt GETDIRENTRIES 2
-.Os
-.Sh NAME
-.Nm getdirentries ,
-.Nm getdents
-.Nd "get directory entries in a file system independent format"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In dirent.h
-.Ft int
-.Fn getdirentries "int fd" "char *buf" "int nbytes" "long *basep"
-.Ft int
-.Fn getdents "int fd" "char *buf" "int nbytes"
-.Sh DESCRIPTION
-The
-.Fn getdirentries
-and
-.Fn getdents
-system calls read directory entries from the directory
-referenced by the file descriptor
-.Fa fd
-into the buffer pointed to by
-.Fa buf ,
-in a file system independent format.
-Up to
-.Fa nbytes
-of data will be transferred.
-The
-.Fa nbytes
-argument must be greater than or equal to the
-block size associated with the file,
-see
-.Xr stat 2 .
-Some file systems may not support these system calls
-with buffers smaller than this size.
-.Pp
-The data in the buffer is a series of
-.Vt dirent
-structures each containing the following entries:
-.Bd -literal -offset indent
-uint32_t d_fileno;
-uint16_t d_reclen;
-uint8_t  d_type;
-uint8_t  d_namlen;
-char	d_name[MAXNAMELEN + 1];	/* see below */
-.Ed
-.Pp
-The
-.Fa d_fileno
-entry is a number which is unique for each
-distinct file in the file system.
-Files that are linked by hard links (see
-.Xr link 2 )
-have the same
-.Fa d_fileno .
-The
-.Fa d_reclen
-entry is the length, in bytes, of the directory record.
-The
-.Fa d_type
-entry is the type of the file pointed to by the directory record.
-The file type values are defined in
-.Fa <sys/dirent.h> .
-The
-.Fa d_name
-entry contains a null terminated file name.
-The
-.Fa d_namlen
-entry specifies the length of the file name excluding the null byte.
-Thus the actual size of
-.Fa d_name
-may vary from 1 to
-.Dv MAXNAMELEN
-\&+ 1.
-.Pp
-Entries may be separated by extra space.
-The
-.Fa d_reclen
-entry may be used as an offset from the start of a
-.Fa dirent
-structure to the next structure, if any.
-.Pp
-The actual number of bytes transferred is returned.
-The current position pointer associated with
-.Fa fd
-is set to point to the next block of entries.
-The pointer may not advance by the number of bytes returned by
-.Fn getdirentries
-or
-.Fn getdents .
-A value of zero is returned when
-the end of the directory has been reached.
-.Pp
-The
-.Fn getdirentries
-system call writes the position of the block read into the location pointed to by
-.Fa basep .
-Alternatively, the current position pointer may be set and retrieved by
-.Xr lseek 2 .
-The current position pointer should only be set to a value returned by
-.Xr lseek 2 ,
-a value returned in the location pointed to by
-.Fa basep
-.Fn ( getdirentries
-only)
-or zero.
-.Sh RETURN VALUES
-If successful, the number of bytes actually transferred is returned.
-Otherwise, -1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn getdirentries
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid file descriptor open for reading.
-.It Bq Er EFAULT
-Either
-.Fa buf
-or
-.Fa basep
-point outside the allocated address space.
-.It Bq Er EINVAL
-The file referenced by
-.Fa fd
-is not a directory, or
-.Fa nbytes
-is too small for returning a directory entry or block of entries,
-or the current position pointer is invalid.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr lseek 2 ,
-.Xr open 2
-.Sh HISTORY
-The
-.Fn getdirentries
-system call first appeared in
-.Bx 4.4 .
-The
-.Fn getdents
-system call first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/getdtablesize.2 b/lib/libc_bsd/sys/getdtablesize.2
deleted file mode 100644
index 1f956b3..0000000
--- a/lib/libc_bsd/sys/getdtablesize.2
+++ /dev/null
@@ -1,62 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getdtablesize.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getdtablesize.2 249859 2013-04-24 21:24:35Z jilles $
-.\"
-.Dd April 24, 2013
-.Dt GETDTABLESIZE 2
-.Os
-.Sh NAME
-.Nm getdtablesize
-.Nd get file descriptor limit
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getdtablesize void
-.Sh DESCRIPTION
-The
-.Fn getdtablesize
-system call returns the maximum number of file descriptors
-that the current process may open.
-The maximum file descriptor number that the system may assign
-is the return value minus one.
-Existing file descriptor numbers may be higher
-if the limit was lowered after they were opened.
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr closefrom 2 ,
-.Xr dup 2 ,
-.Xr getrlimit 2 ,
-.Xr sysconf 2
-.Sh HISTORY
-The
-.Fn getdtablesize
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/getfh.2 b/lib/libc_bsd/sys/getfh.2
deleted file mode 100644
index dddeda3..0000000
--- a/lib/libc_bsd/sys/getfh.2
+++ /dev/null
@@ -1,115 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)getfh.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getfh.2 220646 2011-04-14 22:06:11Z jilles $
-.\"
-.Dd April 14, 2011
-.Dt GETFH 2
-.Os
-.Sh NAME
-.Nm getfh ,
-.Nm lgetfh
-.Nd get file handle
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/mount.h
-.Ft int
-.Fn getfh "const char *path" "fhandle_t *fhp"
-.Ft int
-.Fn lgetfh "const char *path" "fhandle_t *fhp"
-.Sh DESCRIPTION
-The
-.Fn getfh
-system call
-returns a file handle for the specified file or directory
-in the file handle pointed to by
-.Fa fhp .
-The
-.Fn lgetfh
-system call is like
-.Fn getfh
-except in the case where the named file is a symbolic link,
-in which case
-.Fn lgetfh
-returns information about the link,
-while
-.Fn getfh
-returns information about the file the link references.
-These system calls are restricted to the superuser.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn getfh
-and
-.Fn lgetfh
-system calls
-fail if one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix of
-.Fa path
-is not a directory.
-.It Bq Er ENAMETOOLONG
-The length of a component of
-.Fa path
-exceeds 255 characters,
-or the length of
-.Fa path
-exceeds 1023 characters.
-.It Bq Er ENOENT
-The file referred to by
-.Fa path
-does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix of
-.Fa path .
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating
-.Fa path .
-.It Bq Er EFAULT
-The
-.Fa fhp
-argument
-points to an invalid address.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr fhopen 2 ,
-.Xr open 2 ,
-.Xr stat 2
-.Sh HISTORY
-The
-.Fn getfh
-system call first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/sys/getfsstat.2 b/lib/libc_bsd/sys/getfsstat.2
deleted file mode 100644
index 7f2078c..0000000
--- a/lib/libc_bsd/sys/getfsstat.2
+++ /dev/null
@@ -1,122 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)getfsstat.2	8.3 (Berkeley) 5/25/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getfsstat.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd November 20, 2003
-.Dt GETFSSTAT 2
-.Os
-.Sh NAME
-.Nm getfsstat
-.Nd get list of all mounted file systems
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/ucred.h
-.In sys/mount.h
-.Ft int
-.Fn getfsstat "struct statfs *buf" "long bufsize" "int flags"
-.Sh DESCRIPTION
-The
-.Fn getfsstat
-system call
-returns information about all mounted file systems.
-The
-.Fa buf
-argument
-is a pointer to
-.Vt statfs
-structures, as described in
-.Xr statfs 2 .
-.Pp
-Fields that are undefined for a particular file system are set to -1.
-The buffer is filled with an array of
-.Fa statfs
-structures, one for each mounted file system
-up to the byte count specified by
-.Fa bufsize .
-Note, the
-.Fa bufsize
-argument is the number of bytes that
-.Fa buf
-can hold, not the count of statfs structures it will hold.
-.Pp
-If
-.Fa buf
-is given as NULL,
-.Fn getfsstat
-returns just the number of mounted file systems.
-.Pp
-Normally
-.Fa flags
-should be specified as
-.Dv MNT_WAIT .
-If
-.Fa flags
-is set to
-.Dv MNT_NOWAIT ,
-.Fn getfsstat
-will return the information it has available without requesting
-an update from each file system.
-Thus, some of the information will be out of date, but
-.Fn getfsstat
-will not block waiting for information from a file system that is
-unable to respond.
-.Sh RETURN VALUES
-Upon successful completion, the number of
-.Fa statfs
-structures is returned.
-Otherwise, -1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn getfsstat
-system call
-fails if one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa buf
-argument
-points to an invalid address.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr statfs 2 ,
-.Xr fstab 5 ,
-.Xr mount 8
-.Sh HISTORY
-The
-.Fn getfsstat
-system call first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/sys/getgid.2 b/lib/libc_bsd/sys/getgid.2
deleted file mode 100644
index 9ca00b5..0000000
--- a/lib/libc_bsd/sys/getgid.2
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getgid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getgid.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt GETGID 2
-.Os
-.Sh NAME
-.Nm getgid ,
-.Nm getegid
-.Nd get group process identification
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft gid_t
-.Fn getgid void
-.Ft gid_t
-.Fn getegid void
-.Sh DESCRIPTION
-The
-.Fn getgid
-system call returns the real group ID of the calling process,
-.Fn getegid
-returns the effective group ID of the calling process.
-.Pp
-The real group ID is specified at login time.
-.Pp
-The real group ID is the group of the user who invoked the program.
-As the effective group ID gives the process additional permissions
-during the execution of
-.Dq Em set-group-ID
-mode processes,
-.Fn getgid
-is used to determine the real-user-id of the calling process.
-.Sh ERRORS
-The
-.Fn getgid
-and
-.Fn getegid
-system calls are always successful, and no return value is reserved to
-indicate an error.
-.Sh SEE ALSO
-.Xr getuid 2 ,
-.Xr issetugid 2 ,
-.Xr setgid 2 ,
-.Xr setregid 2
-.Sh STANDARDS
-The
-.Fn getgid
-and
-.Fn getegid
-system calls are expected to conform to
-.St -p1003.1-90 .
diff --git a/lib/libc_bsd/sys/getgroups.2 b/lib/libc_bsd/sys/getgroups.2
deleted file mode 100644
index 9fca885..0000000
--- a/lib/libc_bsd/sys/getgroups.2
+++ /dev/null
@@ -1,107 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getgroups.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getgroups.2 217704 2011-01-21 22:15:17Z jilles $
-.\"
-.Dd January 21, 2011
-.Dt GETGROUPS 2
-.Os
-.Sh NAME
-.Nm getgroups
-.Nd get group access list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getgroups "int gidsetlen" "gid_t *gidset"
-.Sh DESCRIPTION
-The
-.Fn getgroups
-system call
-gets the current group access list of the user process
-and stores it in the array
-.Fa gidset .
-The
-.Fa gidsetlen
-argument
-indicates the number of entries that may be placed in
-.Fa gidset .
-The
-.Fn getgroups
-system call
-returns the actual number of groups returned in
-.Fa gidset .
-At least one and as many as {NGROUPS_MAX}+1 values may be returned.
-If
-.Fa gidsetlen
-is zero,
-.Fn getgroups
-returns the number of supplementary group IDs associated with
-the calling process without modifying the array pointed to by
-.Fa gidset .
-.Pp
-The value of
-.Dv {NGROUPS_MAX}
-should be obtained using
-.Xr sysconf 3
-to avoid hard-coding it into the executable.
-.Sh RETURN VALUES
-A successful call returns the number of groups in the group set.
-A value of -1 indicates that an error occurred, and the error
-code is stored in the global variable
-.Va errno .
-.Sh ERRORS
-The possible errors for
-.Fn getgroups
-are:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The argument
-.Fa gidsetlen
-is smaller than the number of groups in the group set.
-.It Bq Er EFAULT
-The argument
-.Fa gidset
-specifies
-an invalid address.
-.El
-.Sh SEE ALSO
-.Xr setgroups 2 ,
-.Xr initgroups 3 ,
-.Xr sysconf 3
-.Sh STANDARDS
-The
-.Fn getgroups
-system call conforms to
-.St -p1003.1-2008 .
-.Sh HISTORY
-The
-.Fn getgroups
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/getitimer.2 b/lib/libc_bsd/sys/getitimer.2
deleted file mode 100644
index a341044..0000000
--- a/lib/libc_bsd/sys/getitimer.2
+++ /dev/null
@@ -1,180 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getitimer.2	8.3 (Berkeley) 5/16/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getitimer.2 208914 2010-06-08 16:48:59Z uqs $
-.\"
-.Dd May 16, 1995
-.Dt GETITIMER 2
-.Os
-.Sh NAME
-.Nm getitimer ,
-.Nm setitimer
-.Nd get/set value of interval timer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.Fd "#define ITIMER_REAL      0"
-.Fd "#define ITIMER_VIRTUAL   1"
-.Fd "#define ITIMER_PROF      2"
-.Ft int
-.Fn getitimer "int which" "struct itimerval *value"
-.Ft int
-.Fn setitimer "int which" "const struct itimerval *value" "struct itimerval *ovalue"
-.Sh DESCRIPTION
-The system provides each process with three interval timers,
-defined in
-.In sys/time.h .
-The
-.Fn getitimer
-system call returns the current value for the timer specified in
-.Fa which
-in the structure at
-.Fa value .
-The
-.Fn setitimer
-system call sets a timer to the specified
-.Fa value
-(returning the previous value of the timer if
-.Fa ovalue
-is not a null pointer).
-.Pp
-A timer value is defined by the
-.Fa itimerval
-structure:
-.Bd -literal -offset indent
-struct itimerval {
-	struct	timeval it_interval;	/* timer interval */
-	struct	timeval it_value;	/* current value */
-};
-.Ed
-.Pp
-If
-.Fa it_value
-is non-zero, it indicates the time to the next timer expiration.
-If
-.Fa it_interval
-is non-zero, it specifies a value to be used in reloading
-.Fa it_value
-when the timer expires.
-Setting
-.Fa it_value
-to 0 disables a timer, regardless of the value of
-.Fa it_interval .
-Setting
-.Fa it_interval
-to 0 causes a timer to be disabled after its next expiration (assuming
-.Fa it_value
-is non-zero).
-.Pp
-Time values smaller than the resolution of the
-system clock are rounded up to this resolution
-(typically 10 milliseconds).
-.Pp
-The
-.Dv ITIMER_REAL
-timer decrements in real time.
-A
-.Dv SIGALRM
-signal is
-delivered when this timer expires.
-.Pp
-The
-.Dv ITIMER_VIRTUAL
-timer decrements in process virtual time.
-It runs only when the process is executing.
-A
-.Dv SIGVTALRM
-signal
-is delivered when it expires.
-.Pp
-The
-.Dv ITIMER_PROF
-timer decrements both in process virtual time and
-when the system is running on behalf of the process.
-It is designed
-to be used by interpreters in statistically profiling the execution
-of interpreted programs.
-Each time the
-.Dv ITIMER_PROF
-timer expires, the
-.Dv SIGPROF
-signal is
-delivered.
-Because this signal may interrupt in-progress
-system calls, programs using this timer must be prepared to
-restart interrupted system calls.
-.Pp
-The maximum number of seconds allowed for
-.Fa it_interval
-and
-.Fa it_value
-in
-.Fn setitimer
-is 100000000.
-.Sh NOTES
-Three macros for manipulating time values are defined in
-.In sys/time.h .
-The
-.Fn timerclear
-macro
-sets a time value to zero,
-.Fn timerisset
-tests if a time value is non-zero, and
-.Fn timercmp
-compares two time values.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn getitimer
-and
-.Fn setitimer
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa value
-argument specified a bad address.
-.It Bq Er EINVAL
-The
-.Fa value
-argument specified a time that was too large
-to be handled.
-.El
-.Sh SEE ALSO
-.Xr gettimeofday 2 ,
-.Xr select 2 ,
-.Xr sigaction 2 ,
-.Xr clocks 7
-.Sh HISTORY
-The
-.Fn getitimer
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/getlogin.2 b/lib/libc_bsd/sys/getlogin.2
deleted file mode 100644
index da3e9a8..0000000
--- a/lib/libc_bsd/sys/getlogin.2
+++ /dev/null
@@ -1,204 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)getlogin.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getlogin.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 9, 1993
-.Dt GETLOGIN 2
-.Os
-.Sh NAME
-.Nm getlogin ,
-.Nm getlogin_r ,
-.Nm setlogin
-.Nd get/set login name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft char *
-.Fn getlogin void
-.In sys/param.h
-.Ft int
-.Fn getlogin_r "char *name" "int len"
-.Ft int
-.Fn setlogin "const char *name"
-.Sh DESCRIPTION
-The
-.Fn getlogin
-routine
-returns the login name of the user associated with the current session,
-as previously set by
-.Fn setlogin .
-The name is normally associated with a login shell
-at the time a session is created,
-and is inherited by all processes descended from the login shell.
-(This is true even if some of those processes assume another user ID,
-for example when
-.Xr su 1
-is used).
-.Pp
-The
-.Fn getlogin_r
-function
-provides the same service as
-.Fn getlogin
-except the caller must provide the buffer
-.Fa name
-with length
-.Fa len
-bytes
-to hold the result.
-The buffer should be at least
-.Dv MAXLOGNAME
-bytes in length.
-.Pp
-The
-.Fn setlogin
-system call
-sets the login name of the user associated with the current session to
-.Fa name .
-This system call is restricted to the super-user, and
-is normally used only when a new session is being created on behalf
-of the named user
-(for example, at login time, or when a remote shell is invoked).
-.Pp
-.Em NOTE :
-There is only one login name per session.
-.Pp
-It is
-.Em CRITICALLY
-important to ensure that
-.Fn setlogin
-is only ever called after the process has taken adequate steps to ensure
-that it is detached from its parent's session.
-Making a
-.Fn setsid
-system call is the
-.Em ONLY
-way to do this.
-The
-.Xr daemon 3
-function calls
-.Fn setsid
-which is an ideal way of detaching from a controlling terminal and
-forking into the background.
-.Pp
-In particular, doing a
-.Fn ioctl ttyfd TIOCNOTTY ...\&
-or
-.Fn setpgrp ...\&
-is
-.Em NOT
-sufficient.
-.Pp
-Once a parent process does a
-.Fn setsid
-system call, it is acceptable for some child of that process to then do a
-.Fn setlogin
-even though it is not the session leader, but beware that ALL processes
-in the session will change their login name at the same time, even the
-parent.
-.Pp
-This is not the same as the traditional UNIX behavior of inheriting privilege.
-.Pp
-Since the
-.Fn setlogin
-system call is restricted to the super-user, it is assumed that (like
-all other privileged programs) the programmer has taken adequate
-precautions to prevent security violations.
-.Sh RETURN VALUES
-If a call to
-.Fn getlogin
-succeeds, it returns a pointer to a null-terminated string in a static buffer,
-or
-.Dv NULL
-if the name has not been set.
-The
-.Fn getlogin_r
-function
-returns zero if successful, or the error number upon failure.
-.Pp
-.Rv -std setlogin
-.Sh ERRORS
-The following errors may be returned by these calls:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa name
-argument gave an
-invalid address.
-.It Bq Er EINVAL
-The
-.Fa name
-argument
-pointed to a string that was too long.
-Login names are limited to
-.Dv MAXLOGNAME
-(from
-.In sys/param.h )
-characters, currently 17 including null.
-.It Bq Er EPERM
-The caller tried to set the login name and was not the super-user.
-.It Bq Er ERANGE
-The size of the buffer is smaller than the result to be returned.
-.El
-.Sh SEE ALSO
-.Xr setsid 2 ,
-.Xr daemon 3
-.Sh STANDARDS
-The
-.Fn getlogin
-system call
-and
-the
-.Fn getlogin_r
-function
-conform to
-.St -p1003.1-96 .
-.Sh HISTORY
-The
-.Fn getlogin
-system call first appeared in
-.Bx 4.4 .
-The return value of
-.Fn getlogin_r
-was changed from earlier versions of
-.Fx
-to be conformant with
-.St -p1003.1-96 .
-.Sh BUGS
-In earlier versions of the system,
-.Fn getlogin
-failed unless the process was associated with a login terminal.
-The current implementation (using
-.Fn setlogin )
-allows getlogin to succeed even when the process has no controlling terminal.
-In earlier versions of the system, the value returned by
-.Fn getlogin
-could not be trusted without checking the user ID.
-Portable programs should probably still make this check.
diff --git a/lib/libc_bsd/sys/getloginclass.2 b/lib/libc_bsd/sys/getloginclass.2
deleted file mode 100644
index b67adf1..0000000
--- a/lib/libc_bsd/sys/getloginclass.2
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"-
-.\" Copyright (c) 2011 Edward Tomasz Napierala
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/getloginclass.2 219322 2011-03-06 08:35:50Z trasz $
-.\"
-.Dd March 6, 2011
-.Dt GETLOGINCLASS 2
-.Os
-.Sh NAME
-.Nm getloginclass ,
-.Nm setloginclass
-.Nd get/set login class
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn getloginclass "char *name" "size_t len"
-.Ft int
-.Fn setloginclass "const char *name"
-.Sh DESCRIPTION
-The
-.Fn getloginclass
-routine returns the login class name associated with the calling process,
-as previously set by
-.Fn setloginclass .
-The caller must provide the buffer
-.Fa name
-with length
-.Fa len
-bytes to hold the result.
-The buffer should be at least
-.Dv MAXLOGNAME
-bytes in length.
-.Pp
-The
-.Fn setloginclass
-system call sets the login class of the calling process to
-.Fa name .
-This system call is restricted to the super-user, and is normally used
-only when a new session is being created on behalf of the named user
-(for example, at login time, or when a remote shell is invoked).
-Processes inherit login class from their parents.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The following errors may be returned by these calls:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa name
-argument gave an invalid address.
-.It Bq Er EINVAL
-The
-.Fa name
-argument pointed to a string that was too long.
-Login class names are limited to
-.Dv MAXLOGNAME
-(from
-.In sys/param.h )
-characters, currently 17 including null.
-.It Bq Er EPERM
-The caller tried to set the login class and was not the super-user.
-.It Bq Er ENAMETOOLONG
-The size of the buffer is smaller than the result to be returned.
-.El
-.Sh SEE ALSO
-.Xr setusercontext 3
-.Sh HISTORY
-The
-.Fn getloginclass
-and
-.Fn setloginclass
-system calls first appeared in
-.Fx 9.0 .
diff --git a/lib/libc_bsd/sys/getpeername.2 b/lib/libc_bsd/sys/getpeername.2
deleted file mode 100644
index aa67d8a..0000000
--- a/lib/libc_bsd/sys/getpeername.2
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getpeername.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getpeername.2 243439 2012-11-23 10:14:54Z kevlo $
-.\"
-.Dd June 4, 1993
-.Dt GETPEERNAME 2
-.Os
-.Sh NAME
-.Nm getpeername
-.Nd get name of connected peer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn getpeername "int s" "struct sockaddr * restrict name" "socklen_t * restrict namelen"
-.Sh DESCRIPTION
-The
-.Fn getpeername
-system call
-returns the name of the peer connected to
-socket
-.Fa s .
-The
-.Fa namelen
-argument should be initialized to indicate
-the amount of space pointed to by
-.Fa name .
-On return it contains the actual size of the name
-returned (in bytes).
-The name is truncated if the buffer provided is too small.
-.Sh RETURN VALUES
-.Rv -std getpeername
-.Sh ERRORS
-The call succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ECONNRESET
-The connection has been reset by the peer.
-.It Bq Er EINVAL
-The value of the
-.Fa namelen
-argument is not valid.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.It Bq Er ENOTCONN
-The socket is not connected.
-.It Bq Er ENOBUFS
-Insufficient resources were available in the system
-to perform the operation.
-.It Bq Er EFAULT
-The
-.Fa name
-argument points to memory not in a valid part of the
-process address space.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr bind 2 ,
-.Xr getsockname 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn getpeername
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/getpgrp.2 b/lib/libc_bsd/sys/getpgrp.2
deleted file mode 100644
index 41c9d01..0000000
--- a/lib/libc_bsd/sys/getpgrp.2
+++ /dev/null
@@ -1,142 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getpgrp.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getpgrp.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt GETPGRP 2
-.Os
-.Sh NAME
-.Nm getpgrp
-.Nd get process group
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn getpgrp void
-.Ft pid_t
-.Fn getpgid "pid_t pid"
-.Sh DESCRIPTION
-The process group of the current process is returned by
-.Fn getpgrp .
-The process group of the process identified by
-.Fa pid
-is returned by
-.Fn getpgid .
-If
-.Fa pid
-is zero,
-.Fn getpgid
-returns the process group of the current process.
-.Pp
-Process groups are used for distribution of signals, and
-by terminals to arbitrate requests for their input: processes
-that have the same process group as the terminal are foreground
-and may read, while others will block with a signal if they attempt
-to read.
-.Pp
-This system call is thus used by programs such as
-.Xr csh 1
-to create
-process groups
-in implementing job control.
-The
-.Fn tcgetpgrp
-and
-.Fn tcsetpgrp
-calls
-are used to get/set the process group of the control terminal.
-.Sh RETURN VALUES
-The
-.Fn getpgrp
-system call always succeeds.
-Upon successful completion, the
-.Fn getpgid
-system call returns the process group of the specified process;
-otherwise, it returns a value of \-1 and sets
-.Va errno
-to indicate the error.
-.Sh COMPATIBILITY
-This version of
-.Fn getpgrp
-differs from past Berkeley versions by not taking a
-.Fa "pid_t pid"
-argument.
-This incompatibility is required by
-.St -p1003.1-90 .
-.Pp
-From the
-.St -p1003.1-90
-Rationale:
-.Pp
-.Bx 4.3
-provides a
-.Fn getpgrp
-system call that returns the process group ID for a specified process.
-Although this function is used to support job control, all known
-job-control shells always specify the calling process with this
-function.
-Thus, the simpler
-.At V
-.Fn getpgrp
-suffices, and the added complexity of the
-.Bx 4.3
-.Fn getpgrp
-has been omitted from POSIX.1.
-The old functionality is available from the
-.Fn getpgid
-system call.
-.Sh ERRORS
-The
-.Fn getpgid
-system call
-will succeed unless:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-there is no process whose process ID equals
-.Fa pid
-.El
-.Sh SEE ALSO
-.Xr getsid 2 ,
-.Xr setpgid 2 ,
-.Xr termios 4
-.Sh STANDARDS
-The
-.Fn getpgrp
-system call is expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn getpgrp
-system call appeared in
-.Bx 4.0 .
-The
-.Fn getpgid
-system call is derived from its usage in
-.At V.4 .
diff --git a/lib/libc_bsd/sys/getpid.2 b/lib/libc_bsd/sys/getpid.2
deleted file mode 100644
index caae634..0000000
--- a/lib/libc_bsd/sys/getpid.2
+++ /dev/null
@@ -1,91 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getpid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getpid.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd November 2, 2006
-.Dt GETPID 2
-.Os
-.Sh NAME
-.Nm getpid ,
-.Nm getppid
-.Nd get parent or calling process identification
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft pid_t
-.Fn getpid void
-.Ft pid_t
-.Fn getppid void
-.Sh DESCRIPTION
-The
-.Fn getpid
-system call
-returns
-the process ID of
-the calling process.
-Though the ID is guaranteed to be unique, it should
-.Em NOT
-be used for constructing temporary file names, for
-security reasons; see
-.Xr mkstemp 3
-instead.
-.Pp
-The
-.Fn getppid
-system call
-returns the process ID of the parent
-of the calling process.
-.Sh ERRORS
-The
-.Fn getpid
-and
-.Fn getppid
-system calls are always successful, and no return value is reserved to
-indicate an error.
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr getpgrp 2 ,
-.Xr kill 2 ,
-.Xr setpgid 2 ,
-.Xr setsid 2 ,
-.Xr exec 3
-.Sh STANDARDS
-The
-.Fn getpid
-and
-.Fn getppid
-system calls are expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn getpid
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/getpriority.2 b/lib/libc_bsd/sys/getpriority.2
deleted file mode 100644
index 25e4d7e..0000000
--- a/lib/libc_bsd/sys/getpriority.2
+++ /dev/null
@@ -1,150 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getpriority.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getpriority.2 214132 2010-10-21 12:27:13Z uqs $
-.\"
-.Dd June 4, 1993
-.Dt GETPRIORITY 2
-.Os
-.Sh NAME
-.Nm getpriority ,
-.Nm setpriority
-.Nd get/set program scheduling priority
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.In sys/resource.h
-.Ft int
-.Fn getpriority "int which" "int who"
-.Ft int
-.Fn setpriority "int which" "int who" "int prio"
-.Sh DESCRIPTION
-The scheduling
-priority of the process, process group, or user, as indicated by
-.Fa which
-and
-.Fa who
-is obtained with the
-.Fn getpriority
-system call and set with the
-.Fn setpriority
-system call.
-The
-.Fa which
-argument
-is one of
-.Dv PRIO_PROCESS ,
-.Dv PRIO_PGRP ,
-or
-.Dv PRIO_USER ,
-and
-.Fa who
-is interpreted relative to
-.Fa which
-(a process identifier for
-.Dv PRIO_PROCESS ,
-process group
-identifier for
-.Dv PRIO_PGRP ,
-and a user ID for
-.Dv PRIO_USER ) .
-A zero value of
-.Fa who
-denotes the current process, process group, or user.
-The
-.Fa prio
-argument
-is a value in the range -20 to 20.
-The default priority is 0;
-lower priorities cause more favorable scheduling.
-.Pp
-The
-.Fn getpriority
-system call returns the highest priority (lowest numerical value)
-enjoyed by any of the specified processes.
-The
-.Fn setpriority
-system call sets the priorities of all of the specified processes
-to the specified value.
-Only the super-user may lower priorities.
-.Sh RETURN VALUES
-Since
-.Fn getpriority
-can legitimately return the value -1, it is necessary
-to clear the external variable
-.Va errno
-prior to the
-call, then check it afterward to determine
-if a -1 is an error or a legitimate value.
-.Pp
-.Rv -std setpriority
-.Sh ERRORS
-The
-.Fn getpriority
-and
-.Fn setpriority
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-No process was located using the
-.Fa which
-and
-.Fa who
-values specified.
-.It Bq Er EINVAL
-The
-.Fa which
-argument
-was not one of
-.Dv PRIO_PROCESS ,
-.Dv PRIO_PGRP ,
-or
-.Dv PRIO_USER .
-.El
-.Pp
-In addition to the errors indicated above,
-.Fn setpriority
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-A process was located, but neither its effective nor real user
-ID matched the effective user ID of the caller.
-.It Bq Er EACCES
-A non super-user attempted to lower a process priority.
-.El
-.Sh SEE ALSO
-.Xr nice 1 ,
-.Xr fork 2 ,
-.Xr renice 8
-.Sh HISTORY
-The
-.Fn getpriority
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/getrlimit.2 b/lib/libc_bsd/sys/getrlimit.2
deleted file mode 100644
index c09662b..0000000
--- a/lib/libc_bsd/sys/getrlimit.2
+++ /dev/null
@@ -1,203 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getrlimit.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getrlimit.2 207735 2010-05-06 22:49:54Z jilles $
-.\"
-.Dd August 20, 2008
-.Dt GETRLIMIT 2
-.Os
-.Sh NAME
-.Nm getrlimit ,
-.Nm setrlimit
-.Nd control maximum system resource consumption
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/time.h
-.In sys/resource.h
-.Ft int
-.Fn getrlimit "int resource" "struct rlimit *rlp"
-.Ft int
-.Fn setrlimit "int resource" "const struct rlimit *rlp"
-.Sh DESCRIPTION
-Limits on the consumption of system resources by the current process
-and each process it creates may be obtained with the
-.Fn getrlimit
-system call, and set with the
-.Fn setrlimit
-system call.
-.Pp
-The
-.Fa resource
-argument is one of the following:
-.Bl -tag -width RLIMIT_FSIZEAA
-.It Dv RLIMIT_AS
-The maximum amount (in bytes) of virtual memory the process is
-allowed to map.
-.It Dv RLIMIT_CORE
-The largest size (in bytes)
-.Xr core 5
-file that may be created.
-.It Dv RLIMIT_CPU
-The maximum amount of cpu time (in seconds) to be used by
-each process.
-.It Dv RLIMIT_DATA
-The maximum size (in bytes) of the data segment for a process;
-this defines how far a program may extend its break with the
-.Xr sbrk 2
-function.
-.It Dv RLIMIT_FSIZE
-The largest size (in bytes) file that may be created.
-.It Dv RLIMIT_MEMLOCK
-The maximum size (in bytes) which a process may lock into memory
-using the
-.Xr mlock 2
-system call.
-.It Dv RLIMIT_NOFILE
-The maximum number of open files for this process.
-.It Dv RLIMIT_NPROC
-The maximum number of simultaneous processes for this user id.
-.It Dv RLIMIT_RSS
-The maximum size (in bytes) to which a process's resident set size may
-grow.
-This imposes a limit on the amount of physical memory to be given to
-a process; if memory is tight, the system will prefer to take memory
-from processes that are exceeding their declared resident set size.
-.It Dv RLIMIT_SBSIZE
-The maximum size (in bytes) of socket buffer usage for this user.
-This limits the amount of network memory, and hence the amount of
-mbufs, that this user may hold at any time.
-.It Dv RLIMIT_STACK
-The maximum size (in bytes) of the stack segment for a process;
-this defines how far a program's stack segment may be extended.
-Stack extension is performed automatically by the system.
-.It Dv RLIMIT_SWAP
-The maximum size (in bytes) of the swap space that may be reserved or
-used by all of this user id's processes.
-This limit is enforced only if bit 1 of the
-.Va vm.overcommit
-sysctl is set.
-Please see
-.Xr tuning 7
-for a complete description of this sysctl.
-.It Dv RLIMIT_NPTS
-The maximum number of pseudo-terminals created by this user id.
-.El
-.Pp
-A resource limit is specified as a soft limit and a hard limit.
-When a
-soft limit is exceeded a process may receive a signal (for example, if
-the cpu time or file size is exceeded), but it will be allowed to
-continue execution until it reaches the hard limit (or modifies
-its resource limit).
-The
-.Vt rlimit
-structure is used to specify the hard and soft limits on a resource,
-.Bd -literal -offset indent
-struct rlimit {
-	rlim_t	rlim_cur;	/* current (soft) limit */
-	rlim_t	rlim_max;	/* maximum value for rlim_cur */
-};
-.Ed
-.Pp
-Only the super-user may raise the maximum limits.
-Other users
-may only alter
-.Fa rlim_cur
-within the range from 0 to
-.Fa rlim_max
-or (irreversibly) lower
-.Fa rlim_max .
-.Pp
-An
-.Dq infinite
-value for a limit is defined as
-.Dv RLIM_INFINITY .
-.Pp
-Because this information is stored in the per-process information,
-this system call must be executed directly by the shell if it
-is to affect all future processes created by the shell;
-.Ic limit
-is thus a built-in command to
-.Xr csh 1 .
-.Pp
-The system refuses to extend the data or stack space when the limits
-would be exceeded in the normal way: a
-.Xr brk 2
-function fails if the data space limit is reached.
-When the stack limit is reached, the process receives
-a segmentation fault
-.Pq Dv SIGSEGV ;
-if this signal is not
-caught by a handler using the signal stack, this signal
-will kill the process.
-.Pp
-A file I/O operation that would create a file larger that the process'
-soft limit will cause the write to fail and a signal
-.Dv SIGXFSZ
-to be
-generated; this normally terminates the process, but may be caught.
-When
-the soft cpu time limit is exceeded, a signal
-.Dv SIGXCPU
-is sent to the
-offending process.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn getrlimit
-and
-.Fn setrlimit
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The address specified for
-.Fa rlp
-is invalid.
-.It Bq Er EPERM
-The limit specified to
-.Fn setrlimit
-would have
-raised the maximum limit value, and the caller is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr csh 1 ,
-.Xr quota 1 ,
-.Xr quotactl 2 ,
-.Xr sigaltstack 2 ,
-.Xr sigaction 2 ,
-.Xr sysctl 3 ,
-.Xr ulimit 3
-.Sh HISTORY
-The
-.Fn getrlimit
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/getrusage.2 b/lib/libc_bsd/sys/getrusage.2
deleted file mode 100644
index 40a3f82..0000000
--- a/lib/libc_bsd/sys/getrusage.2
+++ /dev/null
@@ -1,186 +0,0 @@
-.\" Copyright (c) 1985, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getrusage.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getrusage.2 208914 2010-06-08 16:48:59Z uqs $
-.\"
-.Dd May 1, 2010
-.Dt GETRUSAGE 2
-.Os
-.Sh NAME
-.Nm getrusage
-.Nd get information about resource utilization
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/time.h
-.In sys/resource.h
-.Fd "#define    RUSAGE_SELF      0"
-.Fd "#define    RUSAGE_CHILDREN -1"
-.Fd "#define    RUSAGE_THREAD   1"
-.Ft int
-.Fn getrusage "int who" "struct rusage *rusage"
-.Sh DESCRIPTION
-The
-.Fn getrusage
-system call
-returns information describing the resources utilized by the current
-thread, the current process, or all its terminated child processes.
-The
-.Fa who
-argument is either
-.Dv RUSAGE_THREAD ,
-.Dv RUSAGE_SELF ,
-or
-.Dv RUSAGE_CHILDREN .
-The buffer to which
-.Fa rusage
-points will be filled in with
-the following structure:
-.Bd -literal
-struct rusage {
-        struct timeval ru_utime; /* user time used */
-        struct timeval ru_stime; /* system time used */
-        long ru_maxrss;          /* max resident set size */
-        long ru_ixrss;           /* integral shared text memory size */
-        long ru_idrss;           /* integral unshared data size */
-        long ru_isrss;           /* integral unshared stack size */
-        long ru_minflt;          /* page reclaims */
-        long ru_majflt;          /* page faults */
-        long ru_nswap;           /* swaps */
-        long ru_inblock;         /* block input operations */
-        long ru_oublock;         /* block output operations */
-        long ru_msgsnd;          /* messages sent */
-        long ru_msgrcv;          /* messages received */
-        long ru_nsignals;        /* signals received */
-        long ru_nvcsw;           /* voluntary context switches */
-        long ru_nivcsw;          /* involuntary context switches */
-};
-.Ed
-.Pp
-The fields are interpreted as follows:
-.Bl -tag -width ru_minfltaa
-.It Fa ru_utime
-the total amount of time spent executing in user mode.
-.It Fa ru_stime
-the total amount of time spent in the system executing on behalf
-of the process(es).
-.It Fa ru_maxrss
-the maximum resident set size utilized (in kilobytes).
-.It Fa ru_ixrss
-an
-.Dq integral
-value indicating the amount of memory used
-by the text segment
-that was also shared among other processes.
-This value is expressed
-in units of kilobytes * ticks-of-execution.
-Ticks are statistics clock ticks.
-The statistics clock has a frequency of
-.Fn sysconf _SC_CLK_TCK
-ticks per second.
-.It Fa ru_idrss
-an integral value of the amount of unshared memory residing in the
-data segment of a process (expressed in units of
-kilobytes * ticks-of-execution).
-.It Fa ru_isrss
-an integral value of the amount of unshared memory residing in the
-stack segment of a process (expressed in units of
-kilobytes * ticks-of-execution).
-.It Fa ru_minflt
-the number of page faults serviced without any I/O activity; here
-I/O activity is avoided by
-.Dq reclaiming
-a page frame from
-the list of pages awaiting reallocation.
-.It Fa ru_majflt
-the number of page faults serviced that required I/O activity.
-.It Fa ru_nswap
-the number of times a process was
-.Dq swapped
-out of main
-memory.
-.It Fa ru_inblock
-the number of times the file system had to perform input.
-.It Fa ru_oublock
-the number of times the file system had to perform output.
-.It Fa ru_msgsnd
-the number of IPC messages sent.
-.It Fa ru_msgrcv
-the number of IPC messages received.
-.It Fa ru_nsignals
-the number of signals delivered.
-.It Fa ru_nvcsw
-the number of times a context switch resulted due to a process
-voluntarily giving up the processor before its time slice was
-completed (usually to await availability of a resource).
-.It Fa ru_nivcsw
-the number of times a context switch resulted due to a higher
-priority process becoming runnable or because the current process
-exceeded its time slice.
-.El
-.Sh NOTES
-The numbers
-.Fa ru_inblock
-and
-.Fa ru_oublock
-account only for real
-I/O; data supplied by the caching mechanism is charged only
-to the first process to read or write the data.
-.Sh RETURN VALUES
-.Rv -std getrusage
-.Sh ERRORS
-The
-.Fn getrusage
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa who
-argument is not a valid value.
-.It Bq Er EFAULT
-The address specified by the
-.Fa rusage
-argument is not in a valid part of the process address space.
-.El
-.Sh SEE ALSO
-.Xr gettimeofday 2 ,
-.Xr wait 2 ,
-.Xr clocks 7
-.Sh HISTORY
-The
-.Fn getrusage
-system call appeared in
-.Bx 4.2 .
-The
-.Dv RUSAGE_THREAD
-facility first appeared in
-.Fx 8.1 .
-.Sh BUGS
-There is no way to obtain information about a child process
-that has not yet terminated.
diff --git a/lib/libc_bsd/sys/getsid.2 b/lib/libc_bsd/sys/getsid.2
deleted file mode 100644
index 19a6d13..0000000
--- a/lib/libc_bsd/sys/getsid.2
+++ /dev/null
@@ -1,82 +0,0 @@
-.\" Copyright (c) 1997 Peter Wemm <peter@FreeBSD.org>
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/getsid.2 108028 2002-12-18 09:22:32Z ru $
-.\"
-.Dd August 19, 1997
-.Dt GETSID 2
-.Os
-.Sh NAME
-.Nm getsid
-.Nd get process session
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn getsid "pid_t pid"
-.Sh DESCRIPTION
-The session ID of the process identified by
-.Fa pid
-is returned by
-.Fn getsid .
-If
-.Fa pid
-is zero,
-.Fn getsid
-returns the session ID of the current process.
-.Sh RETURN VALUES
-Upon successful completion, the
-.Fn getsid
-system call
-returns the session ID of
-the specified process; otherwise, it returns a value of -1 and
-sets errno to indicate an error.
-.Sh ERRORS
-The
-.Fn getsid
-system call
-will succeed unless:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-if there is no process with a process ID equal to
-.Fa pid .
-.El
-.Pp
-Note that an implementation may restrict this system call to
-processes within the same session ID as the calling process.
-.Sh SEE ALSO
-.Xr getpgid 2 ,
-.Xr getpgrp 2 ,
-.Xr setpgid 2 ,
-.Xr setsid 2 ,
-.Xr termios 4
-.Sh HISTORY
-The
-.Fn getsid
-system call appeared in
-.Fx 3.0 .
-The
-.Fn getsid
-system call is derived from its usage in
-.At V .
diff --git a/lib/libc_bsd/sys/getsockname.2 b/lib/libc_bsd/sys/getsockname.2
deleted file mode 100644
index 92c921e..0000000
--- a/lib/libc_bsd/sys/getsockname.2
+++ /dev/null
@@ -1,98 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getsockname.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getsockname.2 243439 2012-11-23 10:14:54Z kevlo $
-.\"
-.Dd June 4, 1993
-.Dt GETSOCKNAME 2
-.Os
-.Sh NAME
-.Nm getsockname
-.Nd get socket name
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn getsockname "int s" "struct sockaddr * restrict name" "socklen_t * restrict namelen"
-.Sh DESCRIPTION
-The
-.Fn getsockname
-system call
-returns the current
-.Fa name
-for the specified socket.
-The
-.Fa namelen
-argument should be initialized to indicate
-the amount of space pointed to by
-.Fa name .
-On return it contains the actual size of the name
-returned (in bytes).
-.Sh RETURN VALUES
-.Rv -std getsockname
-.Sh ERRORS
-The call succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ECONNRESET
-The connection has been reset by the peer.
-.It Bq Er EINVAL
-The value of the
-.Fa namelen
-argument is not valid.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.It Bq Er ENOBUFS
-Insufficient resources were available in the system
-to perform the operation.
-.It Bq Er EFAULT
-The
-.Fa name
-argument points to memory not in a valid part of the
-process address space.
-.El
-.Sh SEE ALSO
-.Xr bind 2 ,
-.Xr getpeername 2 ,
-.Xr socket 2
-.Sh HISTORY
-The
-.Fn getsockname
-system call appeared in
-.Bx 4.2 .
-.Sh BUGS
-Names bound to sockets in the UNIX domain are inaccessible;
-.Fn getsockname
-returns a zero length name.
diff --git a/lib/libc_bsd/sys/getsockopt.2 b/lib/libc_bsd/sys/getsockopt.2
deleted file mode 100644
index da6f976..0000000
--- a/lib/libc_bsd/sys/getsockopt.2
+++ /dev/null
@@ -1,552 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getsockopt.2	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getsockopt.2 249166 2013-04-05 18:09:43Z gnn $
-.\"
-.Dd April 5, 2013
-.Dt GETSOCKOPT 2
-.Os
-.Sh NAME
-.Nm getsockopt ,
-.Nm setsockopt
-.Nd get and set options on sockets
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn getsockopt "int s" "int level" "int optname" "void * restrict optval" "socklen_t * restrict optlen"
-.Ft int
-.Fn setsockopt "int s" "int level" "int optname" "const void *optval" "socklen_t optlen"
-.Sh DESCRIPTION
-The
-.Fn getsockopt
-and
-.Fn setsockopt
-system calls
-manipulate the
-.Em options
-associated with a socket.
-Options may exist at multiple
-protocol levels; they are always present at the uppermost
-.Dq socket
-level.
-.Pp
-When manipulating socket options the level at which the
-option resides and the name of the option must be specified.
-To manipulate options at the socket level,
-.Fa level
-is specified as
-.Dv SOL_SOCKET .
-To manipulate options at any
-other level the protocol number of the appropriate protocol
-controlling the option is supplied.
-For example,
-to indicate that an option is to be interpreted by the
-.Tn TCP
-protocol,
-.Fa level
-should be set to the protocol number of
-.Tn TCP ;
-see
-.Xr getprotoent 3 .
-.Pp
-The
-.Fa optval
-and
-.Fa optlen
-arguments
-are used to access option values for
-.Fn setsockopt .
-For
-.Fn getsockopt
-they identify a buffer in which the value for the
-requested option(s) are to be returned.
-For
-.Fn getsockopt ,
-.Fa optlen
-is a value-result argument, initially containing the
-size of the buffer pointed to by
-.Fa optval ,
-and modified on return to indicate the actual size of
-the value returned.
-If no option value is
-to be supplied or returned,
-.Fa optval
-may be NULL.
-.Pp
-The
-.Fa optname
-argument
-and any specified options are passed uninterpreted to the appropriate
-protocol module for interpretation.
-The include file
-.In sys/socket.h
-contains definitions for
-socket level options, described below.
-Options at other protocol levels vary in format and
-name; consult the appropriate entries in
-section
-4 of the manual.
-.Pp
-Most socket-level options utilize an
-.Vt int
-argument for
-.Fa optval .
-For
-.Fn setsockopt ,
-the argument should be non-zero to enable a boolean option,
-or zero if the option is to be disabled.
-.Dv SO_LINGER
-uses a
-.Vt "struct linger"
-argument, defined in
-.In sys/socket.h ,
-which specifies the desired state of the option and the
-linger interval (see below).
-.Dv SO_SNDTIMEO
-and
-.Dv SO_RCVTIMEO
-use a
-.Vt "struct timeval"
-argument, defined in
-.In sys/time.h .
-.Pp
-The following options are recognized at the socket level.
-For protocol-specific options, see protocol manual pages,
-e.g.
-.Xr ip 4
-or
-.Xr tcp 4 .
-Except as noted, each may be examined with
-.Fn getsockopt
-and set with
-.Fn setsockopt .
-.Bl -column SO_ACCEPTFILTER -offset indent
-.It Dv SO_DEBUG Ta "enables recording of debugging information"
-.It Dv SO_REUSEADDR Ta "enables local address reuse"
-.It Dv SO_REUSEPORT Ta "enables duplicate address and port bindings"
-.It Dv SO_KEEPALIVE Ta "enables keep connections alive"
-.It Dv SO_DONTROUTE Ta "enables routing bypass for outgoing messages"
-.It Dv SO_LINGER  Ta "linger on close if data present"
-.It Dv SO_BROADCAST Ta "enables permission to transmit broadcast messages"
-.It Dv SO_OOBINLINE Ta "enables reception of out-of-band data in band"
-.It Dv SO_SNDBUF Ta "set buffer size for output"
-.It Dv SO_RCVBUF Ta "set buffer size for input"
-.It Dv SO_SNDLOWAT Ta "set minimum count for output"
-.It Dv SO_RCVLOWAT Ta "set minimum count for input"
-.It Dv SO_SNDTIMEO Ta "set timeout value for output"
-.It Dv SO_RCVTIMEO Ta "set timeout value for input"
-.It Dv SO_ACCEPTFILTER Ta "set accept filter on listening socket"
-.It Dv SO_NOSIGPIPE Ta
-controls generation of
-.Dv SIGPIPE
-for the socket
-.It Dv SO_TIMESTAMP Ta "enables reception of a timestamp with datagrams"
-.It Dv SO_BINTIME Ta "enables reception of a timestamp with datagrams"
-.It Dv SO_ACCEPTCONN Ta "get listening status of the socket (get only)"
-.It Dv SO_TYPE Ta "get the type of the socket (get only)"
-.It Dv SO_PROTOCOL Ta "get the protocol number for the socket (get only)"
-.It Dv SO_PROTOTYPE Ta "SunOS alias for the Linux SO_PROTOCOL (get only)"
-.It Dv SO_ERROR Ta "get and clear error on the socket (get only)"
-.It Dv SO_SETFIB Ta "set the associated FIB (routing table) for the socket (set only)"
-.El
-.Pp
-The following options are recognized in
-.Fx :
-.Bl -column SO_LISTENINCQLEN -offset indent
-.It Dv SO_LABEL Ta "get MAC label of the socket (get only)"
-.It Dv SO_PEERLABEL Ta "get socket's peer's MAC label (get only)"
-.It Dv SO_LISTENQLIMIT Ta "get backlog limit of the socket (get only)"
-.It Dv SO_LISTENQLEN Ta "get complete queue length of the socket (get only)"
-.It Dv SO_LISTENINCQLEN Ta "get incomplete queue length of the socket (get only)"
-.It Dv SO_USER_COOKIE Ta "set the 'so_user_cookie' value for the socket (uint32_t, set only)"
-.El
-.Pp
-.Dv SO_DEBUG
-enables debugging in the underlying protocol modules.
-.Pp
-.Dv SO_REUSEADDR
-indicates that the rules used in validating addresses supplied
-in a
-.Xr bind 2
-system call should allow reuse of local addresses.
-.Pp
-.Dv SO_REUSEPORT
-allows completely duplicate bindings by multiple processes
-if they all set
-.Dv SO_REUSEPORT
-before binding the port.
-This option permits multiple instances of a program to each
-receive UDP/IP multicast or broadcast datagrams destined for the bound port.
-.Pp
-.Dv SO_KEEPALIVE
-enables the
-periodic transmission of messages on a connected socket.
-Should the
-connected party fail to respond to these messages, the connection is
-considered broken and processes using the socket are notified via a
-.Dv SIGPIPE
-signal when attempting to send data.
-.Pp
-.Dv SO_DONTROUTE
-indicates that outgoing messages should
-bypass the standard routing facilities.
-Instead, messages are directed
-to the appropriate network interface according to the network portion
-of the destination address.
-.Pp
-.Dv SO_LINGER
-controls the action taken when unsent messages
-are queued on socket and a
-.Xr close 2
-is performed.
-If the socket promises reliable delivery of data and
-.Dv SO_LINGER
-is set,
-the system will block the process on the
-.Xr close 2
-attempt until it is able to transmit the data or until it decides it
-is unable to deliver the information (a timeout period, termed the
-linger interval, is specified in seconds in the
-.Fn setsockopt
-system call when
-.Dv SO_LINGER
-is requested).
-If
-.Dv SO_LINGER
-is disabled and a
-.Xr close 2
-is issued, the system will process the close in a manner that allows
-the process to continue as quickly as possible.
-.Pp
-The option
-.Dv SO_BROADCAST
-requests permission to send broadcast datagrams
-on the socket.
-Broadcast was a privileged operation in earlier versions of the system.
-.Pp
-With protocols that support out-of-band data, the
-.Dv SO_OOBINLINE
-option
-requests that out-of-band data be placed in the normal data input queue
-as received; it will then be accessible with
-.Xr recv 2
-or
-.Xr read 2
-calls without the
-.Dv MSG_OOB
-flag.
-Some protocols always behave as if this option is set.
-.Pp
-.Dv SO_SNDBUF
-and
-.Dv SO_RCVBUF
-are options to adjust the normal
-buffer sizes allocated for output and input buffers, respectively.
-The buffer size may be increased for high-volume connections,
-or may be decreased to limit the possible backlog of incoming data.
-The system places an absolute maximum on these values, which is accessible
-through the
-.Xr sysctl 3
-MIB variable
-.Dq Li kern.ipc.maxsockbuf .
-.Pp
-.Dv SO_SNDLOWAT
-is an option to set the minimum count for output operations.
-Most output operations process all of the data supplied
-by the call, delivering data to the protocol for transmission
-and blocking as necessary for flow control.
-Nonblocking output operations will process as much data as permitted
-subject to flow control without blocking, but will process no data
-if flow control does not allow the smaller of the low water mark value
-or the entire request to be processed.
-A
-.Xr select 2
-operation testing the ability to write to a socket will return true
-only if the low water mark amount could be processed.
-The default value for
-.Dv SO_SNDLOWAT
-is set to a convenient size for network efficiency, often 1024.
-.Pp
-.Dv SO_RCVLOWAT
-is an option to set the minimum count for input operations.
-In general, receive calls will block until any (non-zero) amount of data
-is received, then return with the smaller of the amount available or the amount
-requested.
-The default value for
-.Dv SO_RCVLOWAT
-is 1.
-If
-.Dv SO_RCVLOWAT
-is set to a larger value, blocking receive calls normally
-wait until they have received the smaller of the low water mark value
-or the requested amount.
-Receive calls may still return less than the low water mark if an error
-occurs, a signal is caught, or the type of data next in the receive queue
-is different from that which was returned.
-.Pp
-.Dv SO_SNDTIMEO
-is an option to set a timeout value for output operations.
-It accepts a
-.Vt "struct timeval"
-argument with the number of seconds and microseconds
-used to limit waits for output operations to complete.
-If a send operation has blocked for this much time,
-it returns with a partial count
-or with the error
-.Er EWOULDBLOCK
-if no data were sent.
-In the current implementation, this timer is restarted each time additional
-data are delivered to the protocol,
-implying that the limit applies to output portions ranging in size
-from the low water mark to the high water mark for output.
-.Pp
-.Dv SO_RCVTIMEO
-is an option to set a timeout value for input operations.
-It accepts a
-.Vt "struct timeval"
-argument with the number of seconds and microseconds
-used to limit waits for input operations to complete.
-In the current implementation, this timer is restarted each time additional
-data are received by the protocol,
-and thus the limit is in effect an inactivity timer.
-If a receive operation has been blocked for this much time without
-receiving additional data, it returns with a short count
-or with the error
-.Er EWOULDBLOCK
-if no data were received.
-.Pp
-.Dv SO_SETFIB
-can be used to over-ride the default FIB (routing table) for the given socket.
-The value must be from 0 to one less than the number returned from
-the sysctl
-.Em net.fibs .
-.Pp
-.Dv SO_USER_COOKIE
-can be used to set the uint32_t so_user_cookie field in the socket.
-The value is an uint32_t, and can be used in the kernel code that
-manipulates traffic related to the socket.
-The default value for the field is 0.
-As an example, the value can be used as the skipto target or
-pipe number in
-.Nm ipfw/dummynet .
-.Pp
-.Dv SO_ACCEPTFILTER
-places an
-.Xr accept_filter 9
-on the socket,
-which will filter incoming connections
-on a listening stream socket before being presented for
-.Xr accept 2 .
-Once more,
-.Xr listen 2
-must be called on the socket before
-trying to install the filter on it,
-or else the
-.Fn setsockopt
-system call will fail.
-.Bd -literal
-struct  accept_filter_arg {
-        char    af_name[16];
-        char    af_arg[256-16];
-};
-.Ed
-.Pp
-The
-.Fa optval
-argument
-should point to a
-.Fa struct accept_filter_arg
-that will select and configure the
-.Xr accept_filter 9 .
-The
-.Fa af_name
-argument
-should be filled with the name of the accept filter
-that the application wishes to place on the listening socket.
-The optional argument
-.Fa af_arg
-can be passed to the accept
-filter specified by
-.Fa af_name
-to provide additional configuration options at attach time.
-Passing in an
-.Fa optval
-of NULL will remove the filter.
-.Pp
-The
-.Dv SO_NOSIGPIPE
-option controls generation of the
-.Dv SIGPIPE
-signal normally sent
-when writing to a connected socket where the other end has been
-closed returns with the error
-.Er EPIPE .
-.Pp
-If the
-.Dv SO_TIMESTAMP
-or
-.Dv SO_BINTIME
-option is enabled on a
-.Dv SOCK_DGRAM
-socket, the
-.Xr recvmsg 2
-call will return a timestamp corresponding to when the datagram was received.
-The
-.Va msg_control
-field in the
-.Vt msghdr
-structure points to a buffer that contains a
-.Vt cmsghdr
-structure followed by a
-.Vt "struct timeval"
-for
-.Dv SO_TIMESTAMP
-and
-.Vt "struct bintime"
-for
-.Dv SO_BINTIME .
-The
-.Vt cmsghdr
-fields have the following values for TIMESTAMP:
-.Bd -literal
-     cmsg_len = CMSG_LEN(sizeof(struct timeval));
-     cmsg_level = SOL_SOCKET;
-     cmsg_type = SCM_TIMESTAMP;
-.Ed
-.Pp
-and for
-.Dv SO_BINTIME :
-.Bd -literal
-     cmsg_len = CMSG_LEN(sizeof(struct bintime));
-     cmsg_level = SOL_SOCKET;
-     cmsg_type = SCM_BINTIME;
-.Ed
-.Pp
-.Dv SO_ACCEPTCONN ,
-.Dv SO_TYPE ,
-.Dv SO_PROTOCOL
-(and its alias
-.Dv SO_PROTOTYPE )
-and
-.Dv SO_ERROR
-are options used only with
-.Fn getsockopt .
-.Dv SO_ACCEPTCONN
-returns whether the socket is currently accepting connections,
-that is, whether or not the
-.Xr listen 2
-system call was invoked on the socket.
-.Dv SO_TYPE
-returns the type of the socket, such as
-.Dv SOCK_STREAM ;
-it is useful for servers that inherit sockets on startup.
-.Dv SO_PROTOCOL
-returns the protocol number for the socket, for
-.Dv AF_INET
-and
-.Dv AF_INET6
-address families.
-.Dv SO_ERROR
-returns any pending error on the socket and clears
-the error status.
-It may be used to check for asynchronous errors on connected
-datagram sockets or for other asynchronous errors.
-.Pp
-Finally,
-.Dv SO_LABEL
-returns the MAC label of the socket.
-.Dv SO_PEERLABEL
-returns the MAC label of the socket's peer.
-Note that your kernel must be compiled with MAC support.
-See
-.Xr mac 3
-for more information.
-.Dv SO_LISTENQLIMIT
-returns the maximal number of queued connections, as set by
-.Xr listen 2 .
-.Dv SO_LISTENQLEN
-returns the number of unaccepted complete connections.
-.Dv SO_LISTENINCQLEN
-returns the number of unaccepted incomplete connections.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The call succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is a file, not a socket.
-.It Bq Er ENOPROTOOPT
-The option is unknown at the level indicated.
-.It Bq Er EFAULT
-The address pointed to by
-.Fa optval
-is not in a valid part of the process address space.
-For
-.Fn getsockopt ,
-this error may also be returned if
-.Fa optlen
-is not in a valid part of the process address space.
-.It Bq Er EINVAL
-Installing an
-.Xr accept_filter 9
-on a non-listening socket was attempted.
-.El
-.Sh SEE ALSO
-.Xr ioctl 2 ,
-.Xr listen 2 ,
-.Xr recvmsg 2 ,
-.Xr socket 2 ,
-.Xr getprotoent 3 ,
-.Xr mac 3 ,
-.Xr sysctl 3 ,
-.Xr ip 4 ,
-.Xr ip6 4 ,
-.Xr sctp 4 ,
-.Xr tcp 4 ,
-.Xr protocols 5 ,
-.Xr sysctl 8 ,
-.Xr accept_filter 9 ,
-.Xr bintime 9
-.Sh HISTORY
-The
-.Fn getsockopt
-and
-.Fn setsockopt
-system calls appeared in
-.Bx 4.2 .
-.Sh BUGS
-Several of the socket options should be handled at lower levels of the system.
diff --git a/lib/libc_bsd/sys/gettimeofday.2 b/lib/libc_bsd/sys/gettimeofday.2
deleted file mode 100644
index 90f5972..0000000
--- a/lib/libc_bsd/sys/gettimeofday.2
+++ /dev/null
@@ -1,130 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)gettimeofday.2	8.2 (Berkeley) 5/26/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/gettimeofday.2 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd May 26, 1995
-.Dt GETTIMEOFDAY 2
-.Os
-.Sh NAME
-.Nm gettimeofday ,
-.Nm settimeofday
-.Nd get/set date and time
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.Ft int
-.Fn gettimeofday "struct timeval *tp" "struct timezone *tzp"
-.Ft int
-.Fn settimeofday "const struct timeval *tp" "const struct timezone *tzp"
-.Sh DESCRIPTION
-.Bf -symbolic
-Note: timezone is no longer used; this information is kept outside
-the kernel.
-.Ef
-.Pp
-The system's notion of the current Greenwich time and the current time
-zone is obtained with the
-.Fn gettimeofday
-system call, and set with the
-.Fn settimeofday
-system call.
-The time is expressed in seconds and microseconds
-since midnight (0 hour), January 1, 1970.
-The resolution of the system
-clock is hardware dependent, and the time may be updated continuously or
-in
-.Dq ticks .
-If
-.Fa tp
-or
-.Fa tzp
-is NULL, the associated time
-information will not be returned or set.
-.Pp
-The structures pointed to by
-.Fa tp
-and
-.Fa tzp
-are defined in
-.In sys/time.h
-as:
-.Bd -literal
-struct timeval {
-	time_t		tv_sec;		/* seconds */
-	suseconds_t	tv_usec;	/* and microseconds */
-};
-
-struct timezone {
-	int	tz_minuteswest; /* minutes west of Greenwich */
-	int	tz_dsttime;	/* type of dst correction */
-};
-.Ed
-.Pp
-The
-.Vt timezone
-structure indicates the local time zone
-(measured in minutes of time westward from Greenwich),
-and a flag that, if nonzero, indicates that
-Daylight Saving time applies locally during
-the appropriate part of the year.
-.Pp
-Only the super-user may set the time of day or time zone.
-If the system is running at securelevel >= 2 (see
-.Xr init 8 ) ,
-the time may only be advanced or retarded by a maximum of one second.
-This limitation is imposed to prevent a malicious super-user
-from setting arbitrary time stamps on files.
-The system time can be adjusted backwards without restriction using the
-.Xr adjtime 2
-system call even when the system is secure.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The following error codes may be set in
-.Va errno :
-.Bl -tag -width Er
-.It Bq Er EFAULT
-An argument address referenced invalid memory.
-.It Bq Er EPERM
-A user other than the super-user attempted to set the time.
-.El
-.Sh SEE ALSO
-.Xr date 1 ,
-.Xr adjtime 2 ,
-.Xr clock_gettime 2 ,
-.Xr ctime 3 ,
-.Xr timeradd 3 ,
-.Xr clocks 7 ,
-.Xr timed 8
-.Sh HISTORY
-The
-.Fn gettimeofday
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/gettimeofday.c b/lib/libc_bsd/sys/gettimeofday.c
deleted file mode 100644
index 0e2fccb..0000000
--- a/lib/libc_bsd/sys/gettimeofday.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/gettimeofday.c 246117 2013-01-30 12:48:16Z kib $");
-
-#include <sys/syscall.h>
-#include <sys/time.h>
-#include <sys/vdso.h>
-#include <errno.h>
-#include "libc_private.h"
-
-int __gettimeofday(struct timeval *tv, struct timezone *tz);
-
-__weak_reference(__gettimeofday, gettimeofday);
-
-int
-__gettimeofday(struct timeval *tv, struct timezone *tz)
-{
-	int error;
-
-	error = __vdso_gettimeofday(tv, tz);
-	if (error == ENOSYS)
-		error = __sys_gettimeofday(tv, tz);
-	return (error);
-}
diff --git a/lib/libc_bsd/sys/getuid.2 b/lib/libc_bsd/sys/getuid.2
deleted file mode 100644
index 18e50d8..0000000
--- a/lib/libc_bsd/sys/getuid.2
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)getuid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/getuid.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt GETUID 2
-.Os
-.Sh NAME
-.Nm getuid ,
-.Nm geteuid
-.Nd get user identification
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.In sys/types.h
-.Ft uid_t
-.Fn getuid void
-.Ft uid_t
-.Fn geteuid void
-.Sh DESCRIPTION
-The
-.Fn getuid
-system call returns the real user ID of the calling process.
-The
-.Fn geteuid
-system call
-returns the effective user ID of the calling process.
-.Pp
-The real user ID is that of the user who has invoked the program.
-As the effective user ID
-gives the process additional permissions during
-execution of
-.Dq Em set-user-ID
-mode processes,
-.Fn getuid
-is used to determine the real-user-id of the calling process.
-.Sh ERRORS
-The
-.Fn getuid
-and
-.Fn geteuid
-system calls are always successful, and no return value is reserved to
-indicate an error.
-.Sh SEE ALSO
-.Xr getgid 2 ,
-.Xr issetugid 2 ,
-.Xr setgid 2 ,
-.Xr setreuid 2 ,
-.Xr setuid 2
-.Sh STANDARDS
-The
-.Fn geteuid
-and
-.Fn getuid
-system calls are expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn getuid
-and
-.Fn geteuid
-functions appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/interposing_table.c b/lib/libc_bsd/sys/interposing_table.c
deleted file mode 100644
index 043863c..0000000
--- a/lib/libc_bsd/sys/interposing_table.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/interposing_table.c 281981 2015-04-25 08:14:08Z kib $");
-
-#include <sys/types.h>
-#include "libc_private.h"
-
-#define	SLOT(a, b) \
-	[INTERPOS_##a] = (interpos_func_t)b
-interpos_func_t __libc_interposing[INTERPOS_MAX] = {
-	SLOT(accept, __sys_accept),
-	SLOT(accept4, __sys_accept4),
-	SLOT(aio_suspend, __sys_aio_suspend),
-	SLOT(close, __sys_close),
-	SLOT(connect, __sys_connect),
-	SLOT(fcntl, __fcntl_compat),
-	SLOT(fsync, __sys_fsync),
-	SLOT(fork, __sys_fork),
-	SLOT(msync, __sys_msync),
-	SLOT(nanosleep, __sys_nanosleep),
-	SLOT(openat, __sys_openat),
-	SLOT(poll, __sys_poll),
-	SLOT(pselect, __sys_pselect),
-	SLOT(read, __sys_read),
-	SLOT(readv, __sys_readv),
-	SLOT(recvfrom, __sys_recvfrom),
-	SLOT(recvmsg, __sys_recvmsg),
-	SLOT(select, __sys_select),
-	SLOT(sendmsg, __sys_sendmsg),
-	SLOT(sendto, __sys_sendto),
-	SLOT(setcontext, __sys_setcontext),
-	SLOT(sigaction, __sys_sigaction),
-	SLOT(sigprocmask, __sys_sigprocmask),
-	SLOT(sigsuspend, __sys_sigsuspend),
-	SLOT(sigwait, __libc_sigwait),
-	SLOT(sigtimedwait, __sys_sigtimedwait),
-	SLOT(sigwaitinfo, __sys_sigwaitinfo),
-	SLOT(swapcontext, __sys_swapcontext),
-	SLOT(system, __libc_system),
-	SLOT(tcdrain, __libc_tcdrain),
-	SLOT(wait4, __sys_wait4),
-	SLOT(write, __sys_write),
-	SLOT(writev, __sys_writev),
-	SLOT(_pthread_mutex_init_calloc_cb, _pthread_mutex_init_calloc_cb_stub),
-	SLOT(spinlock, __libc_spinlock_stub),
-	SLOT(spinunlock, __libc_spinunlock_stub),
-	SLOT(kevent, __sys_kevent),
-	SLOT(wait6, __sys_wait6),
-	SLOT(ppoll, __sys_ppoll),
-};
-#undef SLOT
-
-interpos_func_t *
-__libc_interposing_slot(int interposno)
-{
-
-	return (&__libc_interposing[interposno]);
-}
diff --git a/lib/libc_bsd/sys/intro.2 b/lib/libc_bsd/sys/intro.2
deleted file mode 100644
index 523c1fd..0000000
--- a/lib/libc_bsd/sys/intro.2
+++ /dev/null
@@ -1,753 +0,0 @@
-.\" Copyright (c) 1980, 1983, 1986, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)intro.2	8.5 (Berkeley) 2/27/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/intro.2 250250 2013-05-04 19:07:22Z pluknet $
-.\"
-.Dd May 4, 2013
-.Dt INTRO 2
-.Os
-.Sh NAME
-.Nm intro
-.Nd introduction to system calls and error numbers
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In errno.h
-.Sh DESCRIPTION
-This section provides an overview of the system calls,
-their error returns, and other common definitions and concepts.
-.\".Pp
-.\".Sy System call restart
-.\".Pp
-.\"(more later...)
-.Sh RETURN VALUES
-Nearly all of the system calls provide an error number referenced via
-the external identifier errno.
-This identifier is defined in
-.In sys/errno.h
-as
-.Pp
-.Dl extern    int *       __error();
-.Dl #define   errno       (* __error())
-.Pp
-The
-.Va __error()
-function returns a pointer to a field in the thread specific structure for
-threads other than the initial thread.
-For the initial thread and
-non-threaded processes,
-.Va __error()
-returns a pointer to a global
-.Va errno
-variable that is compatible with the previous definition.
-.Pp
-When a system call detects an error,
-it returns an integer value
-indicating failure (usually -1)
-and sets the variable
-.Va errno
-accordingly.
-(This allows interpretation of the failure on receiving
-a -1 and to take action accordingly.)
-Successful calls never set
-.Va errno ;
-once set, it remains until another error occurs.
-It should only be examined after an error.
-Note that a number of system calls overload the meanings of these
-error numbers, and that the meanings must be interpreted according
-to the type and circumstances of the call.
-.Pp
-The following is a complete list of the errors and their
-names as given in
-.In sys/errno.h .
-.Bl -hang -width Ds
-.It Er 0 Em "Undefined error: 0" .
-Not used.
-.It Er 1 EPERM Em "Operation not permitted" .
-An attempt was made to perform an operation limited to processes
-with appropriate privileges or to the owner of a file or other
-resources.
-.It Er 2 ENOENT Em "No such file or directory" .
-A component of a specified pathname did not exist, or the
-pathname was an empty string.
-.It Er 3 ESRCH Em "No such process" .
-No process could be found corresponding to that specified by the given
-process ID.
-.It Er 4 EINTR Em "Interrupted system call" .
-An asynchronous signal (such as
-.Dv SIGINT
-or
-.Dv SIGQUIT )
-was caught by the process during the execution of an interruptible
-function.
-If the signal handler performs a normal return, the
-interrupted system call will seem to have returned the error condition.
-.It Er 5 EIO Em "Input/output error" .
-Some physical input or output error occurred.
-This error will not be reported until a subsequent operation on the same file
-descriptor and may be lost (over written) by any subsequent errors.
-.It Er 6 ENXIO Em "Device not configured" .
-Input or output on a special file referred to a device that did not
-exist, or
-made a request beyond the limits of the device.
-This error may also occur when, for example,
-a tape drive is not online or no disk pack is
-loaded on a drive.
-.It Er 7 E2BIG Em "Argument list too long" .
-The number of bytes used for the argument and environment
-list of the new process exceeded the current limit
-.Dv ( NCARGS
-in
-.In sys/param.h ) .
-.It Er 8 ENOEXEC Em "Exec format error" .
-A request was made to execute a file
-that, although it has the appropriate permissions,
-was not in the format required for an
-executable file.
-.It Er 9 EBADF Em "Bad file descriptor" .
-A file descriptor argument was out of range, referred to no open file,
-or a read (write) request was made to a file that was only open for
-writing (reading).
-.Pp
-.It Er 10 ECHILD Em "\&No child processes" .
-A
-.Xr wait 2
-or
-.Xr waitpid 2
-function was executed by a process that had no existing or unwaited-for
-child processes.
-.It Er 11 EDEADLK Em "Resource deadlock avoided" .
-An attempt was made to lock a system resource that
-would have resulted in a deadlock situation.
-.It Er 12 ENOMEM Em "Cannot allocate memory" .
-The new process image required more memory than was allowed by the hardware
-or by system-imposed memory management constraints.
-A lack of swap space is normally temporary; however,
-a lack of core is not.
-Soft limits may be increased to their corresponding hard limits.
-.It Er 13 EACCES Em "Permission denied" .
-An attempt was made to access a file in a way forbidden
-by its file access permissions.
-.It Er 14 EFAULT Em "Bad address" .
-The system detected an invalid address in attempting to
-use an argument of a call.
-.It Er 15 ENOTBLK Em "Block device required" .
-A block device operation was attempted on a non-block device or file.
-.It Er 16 EBUSY Em "Device busy" .
-An attempt to use a system resource which was in use at the time
-in a manner which would have conflicted with the request.
-.It Er 17 EEXIST Em "File exists" .
-An existing file was mentioned in an inappropriate context,
-for instance, as the new link name in a
-.Xr link 2
-system call.
-.It Er 18 EXDEV Em "Cross-device link" .
-A hard link to a file on another file system
-was attempted.
-.It Er 19 ENODEV Em "Operation not supported by device" .
-An attempt was made to apply an inappropriate
-function to a device,
-for example,
-trying to read a write-only device such as a printer.
-.It Er 20 ENOTDIR Em "Not a directory" .
-A component of the specified pathname existed, but it was
-not a directory, when a directory was expected.
-.It Er 21 EISDIR Em "Is a directory" .
-An attempt was made to open a directory with write mode specified.
-.It Er 22 EINVAL Em "Invalid argument" .
-Some invalid argument was supplied.
-(For example,
-specifying an undefined signal to a
-.Xr signal 3
-function
-or a
-.Xr kill 2
-system call).
-.It Er 23 ENFILE Em "Too many open files in system" .
-Maximum number of open files allowable on the system
-has been reached and requests for an open cannot be satisfied
-until at least one has been closed.
-.It Er 24 EMFILE Em "Too many open files" .
-Maximum number of file descriptors allowable in the process
-has been reached and requests for an open cannot be satisfied
-until at least one has been closed.
-The
-.Xr getdtablesize 2
-system call will obtain the current limit.
-.It Er 25 ENOTTY Em "Inappropriate ioctl for device" .
-A control function (see
-.Xr ioctl 2 )
-was attempted for a file or
-special device for which the operation was inappropriate.
-.It Er 26 ETXTBSY Em "Text file busy" .
-The new process was a pure procedure (shared text) file
-which was open for writing by another process, or
-while the pure procedure file was being executed an
-.Xr open 2
-call requested write access.
-.It Er 27 EFBIG Em "File too large" .
-The size of a file exceeded the maximum.
-.It Er 28 ENOSPC Em "No space left on device" .
-A
-.Xr write 2
-to an ordinary file, the creation of a
-directory or symbolic link, or the creation of a directory
-entry failed because no more disk blocks were available
-on the file system, or the allocation of an inode for a newly
-created file failed because no more inodes were available
-on the file system.
-.It Er 29 ESPIPE Em "Illegal seek" .
-An
-.Xr lseek 2
-system call was issued on a socket, pipe or
-.Tn FIFO .
-.It Er 30 EROFS Em "Read-only file system" .
-An attempt was made to modify a file or directory
-on a file system that was read-only at the time.
-.It Er 31 EMLINK Em "Too many links" .
-Maximum allowable hard links to a single file has been exceeded (limit
-of 32767 hard links per file).
-.It Er 32 EPIPE Em "Broken pipe" .
-A write on a pipe, socket or
-.Tn FIFO
-for which there is no process
-to read the data.
-.It Er 33 EDOM Em "Numerical argument out of domain" .
-A numerical input argument was outside the defined domain of the mathematical
-function.
-.It Er 34 ERANGE Em "Result too large" .
-A numerical result of the function was too large to fit in the
-available space (perhaps exceeded precision).
-.It Er 35 EAGAIN Em "Resource temporarily unavailable" .
-This is a temporary condition and later calls to the
-same routine may complete normally.
-.It Er 36 EINPROGRESS Em "Operation now in progress" .
-An operation that takes a long time to complete (such as
-a
-.Xr connect 2 )
-was attempted on a non-blocking object (see
-.Xr fcntl 2 ) .
-.It Er 37 EALREADY Em "Operation already in progress" .
-An operation was attempted on a non-blocking object that already
-had an operation in progress.
-.It Er 38 ENOTSOCK Em "Socket operation on non-socket" .
-Self-explanatory.
-.It Er 39 EDESTADDRREQ Em "Destination address required" .
-A required address was omitted from an operation on a socket.
-.It Er 40 EMSGSIZE Em "Message too long" .
-A message sent on a socket was larger than the internal message buffer
-or some other network limit.
-.It Er 41 EPROTOTYPE Em "Protocol wrong type for socket" .
-A protocol was specified that does not support the semantics of the
-socket type requested.
-For example, you cannot use the
-.Tn ARPA
-Internet
-.Tn UDP
-protocol with type
-.Dv SOCK_STREAM .
-.It Er 42 ENOPROTOOPT Em "Protocol not available" .
-A bad option or level was specified in a
-.Xr getsockopt 2
-or
-.Xr setsockopt 2
-call.
-.It Er 43 EPROTONOSUPPORT Em "Protocol not supported" .
-The protocol has not been configured into the
-system or no implementation for it exists.
-.It Er 44 ESOCKTNOSUPPORT Em "Socket type not supported" .
-The support for the socket type has not been configured into the
-system or no implementation for it exists.
-.It Er 45 EOPNOTSUPP Em "Operation not supported" .
-The attempted operation is not supported for the type of object referenced.
-Usually this occurs when a file descriptor refers to a file or socket
-that cannot support this operation,
-for example, trying to
-.Em accept
-a connection on a datagram socket.
-.It Er 46 EPFNOSUPPORT Em "Protocol family not supported" .
-The protocol family has not been configured into the
-system or no implementation for it exists.
-.It Er 47 EAFNOSUPPORT Em "Address family not supported by protocol family" .
-An address incompatible with the requested protocol was used.
-For example, you should not necessarily expect to be able to use
-.Tn NS
-addresses with
-.Tn ARPA
-Internet protocols.
-.It Er 48 EADDRINUSE Em "Address already in use" .
-Only one usage of each address is normally permitted.
-.Pp
-.It Er 49 EADDRNOTAVAIL Em "Can't assign requested address" .
-Normally results from an attempt to create a socket with an
-address not on this machine.
-.It Er 50 ENETDOWN Em "Network is down" .
-A socket operation encountered a dead network.
-.It Er 51 ENETUNREACH Em "Network is unreachable" .
-A socket operation was attempted to an unreachable network.
-.It Er 52 ENETRESET Em "Network dropped connection on reset" .
-The host you were connected to crashed and rebooted.
-.It Er 53 ECONNABORTED Em "Software caused connection abort" .
-A connection abort was caused internal to your host machine.
-.It Er 54 ECONNRESET Em "Connection reset by peer" .
-A connection was forcibly closed by a peer.
-This normally
-results from a loss of the connection on the remote socket
-due to a timeout or a reboot.
-.It Er 55 ENOBUFS Em "\&No buffer space available" .
-An operation on a socket or pipe was not performed because
-the system lacked sufficient buffer space or because a queue was full.
-.It Er 56 EISCONN Em "Socket is already connected" .
-A
-.Xr connect 2
-request was made on an already connected socket; or,
-a
-.Xr sendto 2
-or
-.Xr sendmsg 2
-request on a connected socket specified a destination
-when already connected.
-.It Er 57 ENOTCONN Em "Socket is not connected" .
-An request to send or receive data was disallowed because
-the socket was not connected and (when sending on a datagram socket)
-no address was supplied.
-.It Er 58 ESHUTDOWN Em "Can't send after socket shutdown" .
-A request to send data was disallowed because the socket
-had already been shut down with a previous
-.Xr shutdown 2
-call.
-.It Er 60 ETIMEDOUT Em "Operation timed out" .
-A
-.Xr connect 2
-or
-.Xr send 2
-request failed because the connected party did not
-properly respond after a period of time.
-(The timeout
-period is dependent on the communication protocol.)
-.It Er 61 ECONNREFUSED Em "Connection refused" .
-No connection could be made because the target machine actively
-refused it.
-This usually results from trying to connect
-to a service that is inactive on the foreign host.
-.It Er 62 ELOOP Em "Too many levels of symbolic links" .
-A path name lookup involved more than 32
-.Pq Dv MAXSYMLINKS
-symbolic links.
-.It Er 63 ENAMETOOLONG Em "File name too long" .
-A component of a path name exceeded
-.Brq Dv NAME_MAX
-characters, or an entire
-path name exceeded
-.Brq Dv PATH_MAX
-characters.
-(See also the description of
-.Dv _PC_NO_TRUNC
-in
-.Xr pathconf 2 . )
-.It Er 64 EHOSTDOWN Em "Host is down" .
-A socket operation failed because the destination host was down.
-.It Er 65 EHOSTUNREACH Em "No route to host" .
-A socket operation was attempted to an unreachable host.
-.It Er 66 ENOTEMPTY Em "Directory not empty" .
-A directory with entries other than
-.Ql .\&
-and
-.Ql ..\&
-was supplied to a remove directory or rename call.
-.It Er 67 EPROCLIM Em "Too many processes" .
-.It Er 68 EUSERS Em "Too many users" .
-The quota system ran out of table entries.
-.It Er 69 EDQUOT Em "Disc quota exceeded" .
-A
-.Xr write 2
-to an ordinary file, the creation of a
-directory or symbolic link, or the creation of a directory
-entry failed because the user's quota of disk blocks was
-exhausted, or the allocation of an inode for a newly
-created file failed because the user's quota of inodes
-was exhausted.
-.It Er 70 ESTALE Em "Stale NFS file handle" .
-An attempt was made to access an open file (on an
-.Tn NFS
-file system)
-which is now unavailable as referenced by the file descriptor.
-This may indicate the file was deleted on the
-.Tn NFS
-server or some
-other catastrophic event occurred.
-.It Er 72 EBADRPC Em "RPC struct is bad" .
-Exchange of
-.Tn RPC
-information was unsuccessful.
-.It Er 73 ERPCMISMATCH Em "RPC version wrong" .
-The version of
-.Tn RPC
-on the remote peer is not compatible with
-the local version.
-.It Er 74 EPROGUNAVAIL Em "RPC prog. not avail" .
-The requested program is not registered on the remote host.
-.It Er 75 EPROGMISMATCH Em "Program version wrong" .
-The requested version of the program is not available
-on the remote host
-.Pq Tn RPC .
-.It Er 76 EPROCUNAVAIL Em "Bad procedure for program" .
-An
-.Tn RPC
-call was attempted for a procedure which does not exist
-in the remote program.
-.It Er 77 ENOLCK Em "No locks available" .
-A system-imposed limit on the number of simultaneous file
-locks was reached.
-.It Er 78 ENOSYS Em "Function not implemented" .
-Attempted a system call that is not available on this
-system.
-.It Er 79 EFTYPE Em "Inappropriate file type or format" .
-The file was the wrong type for the operation, or a data file had
-the wrong format.
-.It Er 80 EAUTH Em "Authentication error" .
-Attempted to use an invalid authentication ticket to mount a
-.Tn NFS
-file system.
-.It Er 81 ENEEDAUTH Em "Need authenticator" .
-An authentication ticket must be obtained before the given
-.Tn NFS
-file system may be mounted.
-.It Er 82 EIDRM Em "Identifier removed" .
-An IPC identifier was removed while the current process was waiting on it.
-.It Er 83 ENOMSG Em "No message of desired type" .
-An IPC message queue does not contain a message of the desired type, or a
-message catalog does not contain the requested message.
-.It Er 84 EOVERFLOW Em "Value too large to be stored in data type" .
-A numerical result of the function was too large to be stored in the caller
-provided space.
-.It Er 85 ECANCELED Em "Operation canceled" .
-The scheduled operation was canceled.
-.It Er 86 EILSEQ Em "Illegal byte sequence" .
-While decoding a multibyte character the function came along an
-invalid or an incomplete sequence of bytes or the given wide
-character is invalid.
-.It Er 87 ENOATTR Em "Attribute not found" .
-The specified extended attribute does not exist.
-.It Er 88 EDOOFUS Em "Programming error" .
-A function or API is being abused in a way which could only be detected
-at run-time.
-.It Er 89 EBADMSG Em "Bad message" .
-A corrupted message was detected.
-.It Er 90 EMULTIHOP Em "Multihop attempted" .
-This error code is unused, but present for compatibility with other systems.
-.It Er 91 ENOLINK Em "Link has been severed" .
-This error code is unused, but present for compatibility with other systems.
-.It Er 92 EPROTO Em "Protocol error" .
-A device or socket encountered an unrecoverable protocol error.
-.It Er 93 ENOTCAPABLE Em "Capabilities insufficient" .
-An operation on a capability file descriptor requires greater privilege than
-the capability allows.
-.It Er 94 ECAPMODE Em "Not permitted in capability mode" .
-The system call or operation is not permitted for capability mode processes.
-.It Er 95 ENOTRECOVERABLE Em "State not recoverable" .
-The state protected by a robust mutex is not recoverable.
-.It Er 96 EOWNERDEAD Em "Previous owner died" .
-The owner of a robust mutex terminated while holding the mutex lock.
-.El
-.Sh DEFINITIONS
-.Bl -tag -width Ds
-.It Process ID .
-Each active process in the system is uniquely identified by a non-negative
-integer called a process ID.
-The range of this ID is from 0 to 99999.
-.It Parent process ID
-A new process is created by a currently active process (see
-.Xr fork 2 ) .
-The parent process ID of a process is initially the process ID of its creator.
-If the creating process exits,
-the parent process ID of each child is set to the ID of a system process,
-.Xr init 8 .
-.It Process Group
-Each active process is a member of a process group that is identified by
-a non-negative integer called the process group ID.
-This is the process
-ID of the group leader.
-This grouping permits the signaling of related
-processes (see
-.Xr termios 4 )
-and the job control mechanisms of
-.Xr csh 1 .
-.It Session
-A session is a set of one or more process groups.
-A session is created by a successful call to
-.Xr setsid 2 ,
-which causes the caller to become the only member of the only process
-group in the new session.
-.It Session leader
-A process that has created a new session by a successful call to
-.Xr setsid 2 ,
-is known as a session leader.
-Only a session leader may acquire a terminal as its controlling terminal (see
-.Xr termios 4 ) .
-.It Controlling process
-A session leader with a controlling terminal is a controlling process.
-.It Controlling terminal
-A terminal that is associated with a session is known as the controlling
-terminal for that session and its members.
-.It "Terminal Process Group ID"
-A terminal may be acquired by a session leader as its controlling terminal.
-Once a terminal is associated with a session, any of the process groups
-within the session may be placed into the foreground by setting
-the terminal process group ID to the ID of the process group.
-This facility is used
-to arbitrate between multiple jobs contending for the same terminal;
-(see
-.Xr csh 1
-and
-.Xr tty 4 ) .
-.It "Orphaned Process Group"
-A process group is considered to be
-.Em orphaned
-if it is not under the control of a job control shell.
-More precisely, a process group is orphaned
-when none of its members has a parent process that is in the same session
-as the group,
-but is in a different process group.
-Note that when a process exits, the parent process for its children
-is changed to be
-.Xr init 8 ,
-which is in a separate session.
-Not all members of an orphaned process group are necessarily orphaned
-processes (those whose creating process has exited).
-The process group of a session leader is orphaned by definition.
-.It "Real User ID and Real Group ID"
-Each user on the system is identified by a positive integer
-termed the real user ID.
-.Pp
-Each user is also a member of one or more groups.
-One of these groups is distinguished from others and
-used in implementing accounting facilities.
-The positive
-integer corresponding to this distinguished group is termed
-the real group ID.
-.Pp
-All processes have a real user ID and real group ID.
-These are initialized from the equivalent attributes
-of the process that created it.
-.It "Effective User Id, Effective Group Id, and Group Access List"
-Access to system resources is governed by two values:
-the effective user ID, and the group access list.
-The first member of the group access list is also known as the
-effective group ID.
-(In POSIX.1, the group access list is known as the set of supplementary
-group IDs, and it is unspecified whether the effective group ID is
-a member of the list.)
-.Pp
-The effective user ID and effective group ID are initially the
-process's real user ID and real group ID respectively.
-Either
-may be modified through execution of a set-user-ID or set-group-ID
-file (possibly by one its ancestors) (see
-.Xr execve 2 ) .
-By convention, the effective group ID (the first member of the group access
-list) is duplicated, so that the execution of a set-group-ID program
-does not result in the loss of the original (real) group ID.
-.Pp
-The group access list is a set of group IDs
-used only in determining resource accessibility.
-Access checks
-are performed as described below in ``File Access Permissions''.
-.It "Saved Set User ID and Saved Set Group ID"
-When a process executes a new file, the effective user ID is set
-to the owner of the file if the file is set-user-ID, and the effective
-group ID (first element of the group access list) is set to the group
-of the file if the file is set-group-ID.
-The effective user ID of the process is then recorded as the saved set-user-ID,
-and the effective group ID of the process is recorded as the saved set-group-ID.
-These values may be used to regain those values as the effective user
-or group ID after reverting to the real ID (see
-.Xr setuid 2 ) .
-(In POSIX.1, the saved set-user-ID and saved set-group-ID are optional,
-and are used in setuid and setgid, but this does not work as desired
-for the super-user.)
-.It Super-user
-A process is recognized as a
-.Em super-user
-process and is granted special privileges if its effective user ID is 0.
-.It Descriptor
-An integer assigned by the system when a file is referenced
-by
-.Xr open 2
-or
-.Xr dup 2 ,
-or when a socket is created by
-.Xr pipe 2 ,
-.Xr socket 2
-or
-.Xr socketpair 2 ,
-which uniquely identifies an access path to that file or socket from
-a given process or any of its children.
-.It File Name
-Names consisting of up to
-.Brq Dv NAME_MAX
-characters may be used to name
-an ordinary file, special file, or directory.
-.Pp
-These characters may be arbitrary eight-bit values,
-excluding
-.Dv NUL
-.Tn ( ASCII
-0) and the
-.Ql \&/
-character (slash,
-.Tn ASCII
-47).
-.Pp
-Note that it is generally unwise to use
-.Ql \&* ,
-.Ql \&? ,
-.Ql \&[
-or
-.Ql \&]
-as part of
-file names because of the special meaning attached to these characters
-by the shell.
-.It Path Name
-A path name is a
-.Dv NUL Ns -terminated
-character string starting with an
-optional slash
-.Ql \&/ ,
-followed by zero or more directory names separated
-by slashes, optionally followed by a file name.
-The total length of a path name must be less than
-.Brq Dv PATH_MAX
-characters.
-(On some systems, this limit may be infinite.)
-.Pp
-If a path name begins with a slash, the path search begins at the
-.Em root
-directory.
-Otherwise, the search begins from the current working directory.
-A slash by itself names the root directory.
-An empty
-pathname refers to the current directory.
-.It Directory
-A directory is a special type of file that contains entries
-that are references to other files.
-Directory entries are called links.
-By convention, a directory
-contains at least two links,
-.Ql .\&
-and
-.Ql \&.. ,
-referred to as
-.Em dot
-and
-.Em dot-dot
-respectively.
-Dot refers to the directory itself and
-dot-dot refers to its parent directory.
-.It "Root Directory and Current Working Directory"
-Each process has associated with it a concept of a root directory
-and a current working directory for the purpose of resolving path
-name searches.
-A process's root directory need not be the root
-directory of the root file system.
-.It File Access Permissions
-Every file in the file system has a set of access permissions.
-These permissions are used in determining whether a process
-may perform a requested operation on the file (such as opening
-a file for writing).
-Access permissions are established at the
-time a file is created.
-They may be changed at some later time
-through the
-.Xr chmod 2
-call.
-.Pp
-File access is broken down according to whether a file may be: read,
-written, or executed.
-Directory files use the execute
-permission to control if the directory may be searched.
-.Pp
-File access permissions are interpreted by the system as
-they apply to three different classes of users: the owner
-of the file, those users in the file's group, anyone else.
-Every file has an independent set of access permissions for
-each of these classes.
-When an access check is made, the system
-decides if permission should be granted by checking the access
-information applicable to the caller.
-.Pp
-Read, write, and execute/search permissions on
-a file are granted to a process if:
-.Pp
-The process's effective user ID is that of the super-user.
-(Note:
-even the super-user cannot execute a non-executable file.)
-.Pp
-The process's effective user ID matches the user ID of the owner
-of the file and the owner permissions allow the access.
-.Pp
-The process's effective user ID does not match the user ID of the
-owner of the file, and either the process's effective
-group ID matches the group ID
-of the file, or the group ID of the file is in
-the process's group access list,
-and the group permissions allow the access.
-.Pp
-Neither the effective user ID nor effective group ID
-and group access list of the process
-match the corresponding user ID and group ID of the file,
-but the permissions for ``other users'' allow access.
-.Pp
-Otherwise, permission is denied.
-.It Sockets and Address Families
-A socket is an endpoint for communication between processes.
-Each socket has queues for sending and receiving data.
-.Pp
-Sockets are typed according to their communications properties.
-These properties include whether messages sent and received
-at a socket require the name of the partner, whether communication
-is reliable, the format used in naming message recipients, etc.
-.Pp
-Each instance of the system supports some
-collection of socket types; consult
-.Xr socket 2
-for more information about the types available and
-their properties.
-.Pp
-Each instance of the system supports some number of sets of
-communications protocols.
-Each protocol set supports addresses
-of a certain format.
-An Address Family is the set of addresses
-for a specific group of protocols.
-Each socket has an address
-chosen from the address family in which the socket was created.
-.El
-.Sh SEE ALSO
-.Xr intro 3 ,
-.Xr perror 3
diff --git a/lib/libc_bsd/sys/ioctl.2 b/lib/libc_bsd/sys/ioctl.2
deleted file mode 100644
index 31e9eaf..0000000
--- a/lib/libc_bsd/sys/ioctl.2
+++ /dev/null
@@ -1,155 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)ioctl.2	8.2 (Berkeley) 12/11/93
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/ioctl.2 255486 2013-09-12 00:53:38Z bdrewery $
-.\"
-.Dd September 11, 2013
-.Dt IOCTL 2
-.Os
-.Sh NAME
-.Nm ioctl
-.Nd control device
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/ioctl.h
-.Ft int
-.Fn ioctl "int fd" "unsigned long request" ...
-.Sh DESCRIPTION
-The
-.Fn ioctl
-system call manipulates the underlying device parameters of special files.
-In particular, many operating
-characteristics of character special files (e.g.\& terminals)
-may be controlled with
-.Fn ioctl
-requests.
-The argument
-.Fa fd
-must be an open file descriptor.
-.Pp
-The third argument to
-.Fn ioctl
-is traditionally named
-.Va "char *argp" .
-Most uses of
-.Fn ioctl ,
-however, require the third argument to be a
-.Vt caddr_t
-or an
-.Vt int .
-.Pp
-An
-.Fn ioctl
-.Fa request
-has encoded in it whether the argument is an
-.Dq in
-argument
-or
-.Dq out
-argument, and the size of the argument
-.Fa argp
-in bytes.
-Macros and defines used in specifying an ioctl
-.Fa request
-are located in the file
-.In sys/ioctl.h .
-.Sh GENERIC IOCTLS
-Some generic ioctls are not implemented for all types of file
-descriptors.
-These include:
-.Bl -tag -width "xxxxxx"
-.It Dv FIONREAD int
-Get the number of bytes that are immediately available for reading.
-.It Dv FIONWRITE int
-Get the number of bytes in the descriptor's send queue.
-These bytes are data which has been written to the descriptor but
-which are being held by the kernel for further processing.
-The nature of the required processing depends on the underlying device.
-For TCP sockets, these bytes have not yet been acknowledged by the
-other side of the connection.
-.It Dv FIONSPACE int
-Get the free space in the descriptor's send queue.
-This value is the size of the send queue minus the number of bytes
-being held in the queue.
-Note: while this value represents the number of bytes that may be
-added to the queue, other resource limitations may cause a write
-not larger than the send queue's space to be blocked.
-One such limitation would be a lack of network buffers for a write
-to a network connection.
-.El
-.Sh RETURN VALUES
-If an error has occurred, a value of -1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn ioctl
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid descriptor.
-.It Bq Er ENOTTY
-The
-.Fa fd
-argument
-is not associated with a character
-special device.
-.It Bq Er ENOTTY
-The specified request does not apply to the kind
-of object that the descriptor
-.Fa fd
-references.
-.It Bq Er EINVAL
-The
-.Fa request
-or
-.Fa argp
-argument
-is not valid.
-.It Bq Er EFAULT
-The
-.Fa argp
-argument
-points outside the process's allocated address space.
-.El
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr fcntl 2 ,
-.Xr intro 4 ,
-.Xr tty 4
-.Sh HISTORY
-The
-.Fn ioctl
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/issetugid.2 b/lib/libc_bsd/sys/issetugid.2
deleted file mode 100644
index e7ca414..0000000
--- a/lib/libc_bsd/sys/issetugid.2
+++ /dev/null
@@ -1,98 +0,0 @@
-.\"	$OpenBSD: issetugid.2,v 1.7 1997/02/18 00:16:09 deraadt Exp $
-.\"
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/issetugid.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd August 25, 1996
-.Dt ISSETUGID 2
-.Os
-.Sh NAME
-.Nm issetugid
-.Nd is current process tainted by uid or gid changes
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn issetugid void
-.Sh DESCRIPTION
-The
-.Fn issetugid
-system call returns 1 if the process environment or memory address space
-is considered
-.Dq tainted ,
-and returns 0 otherwise.
-.Pp
-A process is tainted if it was created as a result of an
-.Xr execve 2
-system call which had either of the setuid or setgid bits set (and extra
-privileges were given as a result) or if it has changed any of its real,
-effective or saved user or group ID's since it began execution.
-.Pp
-This system call exists so that library routines (eg: libc, libtermcap)
-can reliably determine if it is safe to use information
-that was obtained from the user, in particular the results from
-.Xr getenv 3
-should be viewed with suspicion if it is used to control operation.
-.Pp
-A
-.Dq tainted
-status is inherited by child processes as a result of the
-.Xr fork 2
-system call (or other library code that calls fork, such as
-.Xr popen 3 ) .
-.Pp
-It is assumed that a program that clears all privileges as it prepares
-to execute another will also reset the environment, hence the
-.Dq tainted
-status will not be passed on.
-This is important for programs such as
-.Xr su 1
-which begin setuid but need to be able to create an untainted process.
-.Sh ERRORS
-The
-.Fn issetugid
-system call is always successful, and no return value is reserved to
-indicate an error.
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr fork 2 ,
-.Xr setegid 2 ,
-.Xr seteuid 2 ,
-.Xr setgid 2 ,
-.Xr setregid 2 ,
-.Xr setreuid 2 ,
-.Xr setuid 2
-.Sh HISTORY
-The
-.Fn issetugid
-system call first appeared in
-.Ox 2.0
-and was also implemented in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/jail.2 b/lib/libc_bsd/sys/jail.2
deleted file mode 100644
index a5a5443..0000000
--- a/lib/libc_bsd/sys/jail.2
+++ /dev/null
@@ -1,412 +0,0 @@
-.\" Copyright (c) 1999 Poul-Henning Kamp.
-.\" Copyright (c) 2009 James Gritton.
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/jail.2 234712 2012-04-26 17:36:05Z jamie $
-.\"
-.Dd February 8, 2012
-.Dt JAIL 2
-.Os
-.Sh NAME
-.Nm jail ,
-.Nm jail_get ,
-.Nm jail_set ,
-.Nm jail_remove ,
-.Nm jail_attach
-.Nd create and manage system jails
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/jail.h
-.Ft int
-.Fn jail "struct jail *jail"
-.Ft int
-.Fn jail_attach "int jid"
-.Ft int
-.Fn jail_remove "int jid"
-.In sys/uio.h
-.Ft int
-.Fn jail_get "struct iovec *iov" "u_int niov" "int flags"
-.Ft int
-.Fn jail_set "struct iovec *iov" "u_int niov" "int flags"
-.Sh DESCRIPTION
-The
-.Fn jail
-system call sets up a jail and locks the current process in it.
-.Pp
-The argument is a pointer to a structure describing the prison:
-.Bd -literal -offset indent
-struct jail {
-	uint32_t	version;
-	char		*path;
-	char		*hostname;
-	char		*jailname;
-	unsigned int	ip4s;
-	unsigned int	ip6s;
-	struct in_addr	*ip4;
-	struct in6_addr	*ip6;
-};
-.Ed
-.Pp
-.Dq Li version
-defines the version of the API in use.
-.Dv JAIL_API_VERSION
-is defined for the current version.
-.Pp
-The
-.Dq Li path
-pointer should be set to the directory which is to be the root of the
-prison.
-.Pp
-The
-.Dq Li hostname
-pointer can be set to the hostname of the prison.
-This can be changed
-from the inside of the prison.
-.Pp
-The
-.Dq Li jailname
-pointer is an optional name that can be assigned to the jail
-for example for management purposes.
-.Pp
-The
-.Dq Li ip4s
-and
-.Dq Li ip6s
-give the numbers of IPv4 and IPv6 addresses that will be passed
-via their respective pointers.
-.Pp
-The
-.Dq Li ip4
-and
-.Dq Li ip6
-pointers can be set to an arrays of IPv4 and IPv6 addresses to be assigned to
-the prison, or NULL if none.
-IPv4 addresses must be in network byte order.
-.Pp
-This is equivalent to the
-.Fn jail_set
-system call (see below), with the parameters
-.Va path ,
-.Va host.hostname ,
-.Va name ,
-.Va ip4.addr ,
-and
-.Va ip6.addr ,
-and with the
-.Dv JAIL_ATTACH
-flag.
-.Pp
-The
-.Fn jail_set
-system call creates a new jail, or modifies an existing one, and optionally
-locks the current process in it.
-Jail parameters are passed as an array of name-value pairs in the array
-.Fa iov ,
-containing
-.Fa niov
-elements.
-Parameter names are a null-terminated string, and values may be strings,
-integers, or other arbitrary data.
-Some parameters are boolean, and do not have a value (their length is zero)
-but are set by the name alone with or without a
-.Dq no
-prefix, e.g.
-.Va persist
-or
-.Va nopersist .
-Any parameters not set will be given default values, generally based on
-the current environment.
-.Pp
-Jails have a set of core parameters, and modules can add their own jail
-parameters.
-The current set of available parameters, and their formats, can be
-retrieved via the
-.Va security.jail.param
-sysctl MIB entry.
-Notable parameters include those mentioned in the
-.Fn jail
-description above, as well as
-.Va jid
-and
-.Va name ,
-which identify the jail being created or modified.
-See
-.Xr jail 8
-for more information on the core jail parameters.
-.Pp
-The
-.Fa flags
-arguments consists of one or more of the following flags:
-.Bl -tag -width indent
-.It Dv JAIL_CREATE
-Create a new jail.
-If a
-.Va jid
-or
-.Va name
-parameters exists, they must not refer to an existing jail.
-.It Dv JAIL_UPDATE
-Modify an existing jail.
-One of the
-.Va jid
-or
-.Va name
-parameters must exist, and must refer to an existing jail.
-If both
-.Dv JAIL_CREATE
-and
-.Dv JAIL_UPDATE
-are set, a jail will be created if it does not yet exist, and modified if it
-does exist.
-.It Dv JAIL_ATTACH
-In addition to creating or modifying the jail, attach the current process to
-it, as with the
-.Fn jail_attach
-system call.
-.It Dv JAIL_DYING
-Allow setting a jail that is in the process of being removed.
-.El
-.Pp
-The
-.Fn jail_get
-system call retrieves jail parameters, using the same name-value list as
-.Fn jail_set
-in the
-.Fa iov
-and
-.Fa niov
-arguments.
-The jail to read can be specified by either
-.Va jid
-or
-.Va name
-by including those parameters in the list.
-If they are included but are not intended to be the search key, they
-should be cleared (zero and the empty string respectively).
-.Pp
-The special parameter
-.Va lastjid
-can be used to retrieve a list of all jails.
-It will fetch the jail with the jid above and closest to the passed value.
-The first jail (usually but not always jid 1) can be found by passing a
-.Va lastjid
-of zero.
-.Pp
-The
-.Fa flags
-arguments consists of one or more following flags:
-.Bl -tag -width indent
-.It Dv JAIL_DYING
-Allow getting a jail that is in the process of being removed.
-.El
-.Pp
-The
-.Fn jail_attach
-system call attaches the current process to an existing jail,
-identified by
-.Fa jid .
-.Pp
-The
-.Fn jail_remove
-system call removes the jail identified by
-.Fa jid .
-It will kill all processes belonging to the jail, and remove any children
-of that jail.
-.Sh RETURN VALUES
-If successful,
-.Fn jail ,
-.Fn jail_set ,
-and
-.Fn jail_get
-return a non-negative integer, termed the jail identifier (JID).
-They return \-1 on failure, and set
-.Va errno
-to indicate the error.
-.Pp
-.Rv -std jail_attach jail_remove
-.Sh ERRORS
-The
-.Fn jail
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-This process is not allowed to create a jail, either because it is not
-the super-user, or because it would exceed the jail's
-.Va children.max
-limit.
-.It Bq Er EFAULT
-.Fa jail
-points to an address outside the allocated address space of the process.
-.It Bq Er EINVAL
-The version number of the argument is not correct.
-.It Bq Er EAGAIN
-No free JID could be found.
-.El
-.Pp
-The
-.Fn jail_set
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-This process is not allowed to create a jail, either because it is not
-the super-user, or because it would exceed the jail's
-.Va children.max
-limit.
-.It Bq Er EPERM
-A jail parameter was set to a less restrictive value then the current
-environment.
-.It Bq Er EFAULT
-.Fa Iov ,
-or one of the addresses contained within it,
-points to an address outside the allocated address space of the process.
-.It Bq Er ENOENT
-The jail referred to by a
-.Va jid
-or
-.Va name
-parameter does not exist, and the
-.Dv JAIL_CREATE
-flag is not set.
-.It Bq Er ENOENT
-The jail referred to by a
-.Va jid
-is not accessible by the process, because the process is in a different
-jail.
-.It Bq Er EEXIST
-The jail referred to by a
-.Va jid
-or
-.Va name
-parameter exists, and the
-.Dv JAIL_UPDATE
-flag is not set.
-.It Bq Er EINVAL
-A supplied parameter is the wrong size.
-.It Bq Er EINVAL
-A supplied parameter is out of range.
-.It Bq Er EINVAL
-A supplied string parameter is not null-terminated.
-.It Bq Er EINVAL
-A supplied parameter name does not match any known parameters.
-.It Bq Er EINVAL
-One of the
-.Dv JAIL_CREATE
-or
-.Dv JAIL_UPDATE
-flags is not set.
-.It Bq Er ENAMETOOLONG
-A supplied string parameter is longer than allowed.
-.It Bq Er EAGAIN
-There are no jail IDs left.
-.El
-.Pp
-The
-.Fn jail_get
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-.Fa Iov ,
-or one of the addresses contained within it,
-points to an address outside the allocated address space of the process.
-.It Bq Er ENOENT
-The jail referred to by a
-.Va jid
-or
-.Va name
-parameter does not exist.
-.It Bq Er ENOENT
-The jail referred to by a
-.Va jid
-is not accessible by the process, because the process is in a different
-jail.
-.It Bq Er ENOENT
-The
-.Va lastjid
-parameter is greater than the highest current jail ID.
-.It Bq Er EINVAL
-A supplied parameter is the wrong size.
-.It Bq Er EINVAL
-A supplied parameter name does not match any known parameters.
-.El
-.Pp
-The
-.Fn jail_attach
-and
-.Fn jail_remove
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-A user other than the super-user attempted to attach to or remove a jail.
-.It Bq Er EINVAL
-The jail specified by
-.Fa jid
-does not exist.
-.El
-.Pp
-Further
-.Fn jail ,
-.Fn jail_set ,
-and
-.Fn jail_attach
-call
-.Xr chroot 2
-internally, so they can fail for all the same reasons.
-Please consult the
-.Xr chroot 2
-manual page for details.
-.Sh SEE ALSO
-.Xr chdir 2 ,
-.Xr chroot 2 ,
-.Xr jail 8
-.Sh HISTORY
-The
-.Fn jail
-system call appeared in
-.Fx 4.0 .
-The
-.Fn jail_attach
-system call appeared in
-.Fx 5.1 .
-The
-.Fn jail_set ,
-.Fn jail_get ,
-and
-.Fn jail_remove
-system calls appeared in
-.Fx 8.0 .
-.Sh AUTHORS
-The jail feature was written by
-.An Poul-Henning Kamp
-for R&D Associates
-.Dq Li http://www.rndassociates.com/
-who contributed it to
-.Fx .
-.An James Gritton
-added the extensible jail parameters and hierarchical jails.
diff --git a/lib/libc_bsd/sys/kenv.2 b/lib/libc_bsd/sys/kenv.2
deleted file mode 100644
index 5410b4a..0000000
--- a/lib/libc_bsd/sys/kenv.2
+++ /dev/null
@@ -1,179 +0,0 @@
-.\"
-.\" Copyright (C) 2002 Chad David <davidc@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/sys/kenv.2 147700 2005-06-30 13:18:15Z hmp $
-.\"
-.Dd April 17, 2002
-.Dt KENV 2
-.Os
-.Sh NAME
-.Nm kenv
-.Nd kernel environment
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In kenv.h
-.Ft int
-.Fn kenv "int action" "const char *name" "char *value" "int len"
-.Sh DESCRIPTION
-The
-.Fn kenv
-system call manipulates kernel environment variables.
-It supports the well known userland actions of getting, setting and unsetting
-environment variables, as well as the ability to dump all of the entries in
-the kernel environment.
-.Pp
-The
-.Fa action
-argument can be one of the following:
-.Bl -tag -width ".Dv KENV_UNSET"
-.It Dv KENV_GET
-Returns the value associated with the named kernel environment variable.
-If the variable is not found, \-1 is returned and
-the global variable
-.Va errno
-is set to
-.Er ENOENT .
-Only the number of bytes available in
-.Fa value
-are copied out.
-.It Dv KENV_SET
-Sets or adds a new kernel environment variable.
-This option is only available to the superuser.
-.It Dv KENV_UNSET
-Unsets the kernel environment variable
-.Fa name .
-If the variable does not exist, \-1 is returned and
-the global variable
-.Va errno
-is set to
-.Er EINVAL .
-This option is only available to the superuser.
-.It Dv KENV_DUMP
-Dumps as much of the kernel environment as will fit in
-.Fa value .
-If
-.Fa value
-is
-.Dv NULL ,
-.Fn kenv
-will return the number of bytes required to copy out the entire environment.
-.El
-.Pp
-The
-.Fa name
-argument is the name of the environment variable to be affected.
-In the case of
-.Dv KENV_DUMP
-it is ignored.
-.Pp
-The
-.Fa value
-argument contains either the value to set the environment variable
-.Fa name
-to in the case of
-.Dv KENV_SET ,
-or it points to the location where
-.Fn kenv
-should copy return data to in the case of
-.Dv KENV_DUMP
-and
-.Dv KENV_GET .
-If
-.Fa value
-is
-.Dv NULL
-in the case of
-.Dv KENV_DUMP ,
-.Fn kenv
-will return the number of bytes required to copy out the entire environment.
-.Pp
-The
-.Fa len
-argument indicates how many bytes of storage
-.Fa value
-points to.
-.Sh RETURN VALUES
-The
-.Fn kenv
-system call returns 0 if successful in the case of
-.Dv KENV_SET
-and
-.Dv KENV_UNSET ,
-and the number of bytes copied into
-.Fa value
-in the case of
-.Dv KENV_DUMP
-and
-.Dv KENV_GET .
-If an error occurs, a value of \-1 is returned and
-the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn kenv
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa action
-argument
-is not a valid option, or the length of the
-.Fa value
-is less than 1 for a
-.Dv KENV_SET .
-.It Bq Er ENOENT
-no value could be found for
-.Fa name
-for a
-.Dv KENV_SET
-or
-.Dv KENV_UNSET .
-.It Bq Er EPERM
-a user other than the superuser attempted to set or unset a kernel
-environment variable.
-.It Bq Er EFAULT
-bad address was encountered while attempting to copy in user arguments,
-or copy out value(s).
-.It Bq Er ENAMETOOLONG
-the name of a variable supplied by the user is longer than
-.Dv KENV_MNAMELEN
-or the value of a variable is longer than
-.Dv KENV_MVALLEN .
-.El
-.Sh SEE ALSO
-.Xr kenv 1
-.Sh AUTHORS
-.An -nosplit
-This manual page was written by
-.An Chad David Aq davidc@FreeBSD.org .
-.Pp
-The
-.Fn kenv
-system call was written by
-.An Maxime Henrion Aq mux@FreeBSD.org .
diff --git a/lib/libc_bsd/sys/kevent.c b/lib/libc_bsd/sys/kevent.c
deleted file mode 100644
index 10652ab..0000000
--- a/lib/libc_bsd/sys/kevent.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2015 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/kevent.c 281454 2015-04-12 06:52:43Z kib $");
-
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/time.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_kevent, __kevent);
-
-#pragma weak kevent
-int
-kevent(int kq, const struct kevent *changelist, int nchanges,
-    struct kevent *eventlist, int nevents, const struct timespec *timeout)
-{
-
-	return (((int (*)(int, const struct kevent *, int,
-	    struct kevent *, int, const struct timespec *))
-	    __libc_interposing[INTERPOS_kevent])(kq, changelist, nchanges,
-	   eventlist, nevents, timeout));
-}
diff --git a/lib/libc_bsd/sys/kill.2 b/lib/libc_bsd/sys/kill.2
deleted file mode 100644
index 536ce29..0000000
--- a/lib/libc_bsd/sys/kill.2
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)kill.2	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/kill.2 241855 2012-10-22 03:37:00Z eadler $
-.\"
-.Dd March 15, 2012
-.Dt KILL 2
-.Os
-.Sh NAME
-.Nm kill
-.Nd send signal to a process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In signal.h
-.Ft int
-.Fn kill "pid_t pid" "int sig"
-.Sh DESCRIPTION
-The
-.Fn kill
-system call sends the signal given by
-.Fa sig
-to
-.Fa pid ,
-a
-process or a group of processes.
-The
-.Fa sig
-argument
-may be one of the signals specified in
-.Xr sigaction 2
-or it may be 0, in which case
-error checking is performed but no
-signal is actually sent.
-This can be used to check the validity of
-.Fa pid .
-.Pp
-For a process to have permission to send a signal to a process designated
-by
-.Fa pid ,
-the user must be the super-user, or
-the real or saved user ID of the receiving process must match
-the real or effective user ID of the sending process.
-A single exception is the signal SIGCONT, which may always be sent
-to any process with the same session ID as the sender.
-In addition, if the
-.Va security.bsd.conservative_signals
-.Xr sysctl
-is set to 1, the user is not a super-user, and
-the receiver is set-uid, then
-only job control and terminal control signals may
-be sent (in particular, only SIGKILL, SIGINT, SIGTERM, SIGALRM,
-SIGSTOP, SIGTTIN, SIGTTOU, SIGTSTP, SIGHUP, SIGUSR1, SIGUSR2).
-.Bl -tag -width Ds
-.It \&If Fa pid No \&is greater than zero :
-The
-.Fa sig
-signal
-is sent to the process whose ID is equal to
-.Fa pid .
-.It \&If Fa pid No \&is zero :
-The
-.Fa sig
-signal
-is sent to all processes whose group ID is equal
-to the process group ID of the sender, and for which the
-process has permission;
-this is a variant of
-.Xr killpg 2 .
-.It \&If Fa pid No \&is -1 :
-If the user has super-user privileges,
-the signal is sent to all processes excluding
-system processes
-(with
-.Dv P_SYSTEM
-flag set),
-process with ID 1
-(usually
-.Xr init 8 ) ,
-and the process sending the signal.
-If the user is not the super user, the signal is sent to all processes
-with the same uid as the user excluding the process sending the signal.
-No error is returned if any process could be signaled.
-.El
-.Pp
-For compatibility with System V,
-if the process number is negative but not -1,
-the signal is sent to all processes whose process group ID
-is equal to the absolute value of the process number.
-This is a variant of
-.Xr killpg 2 .
-.Sh RETURN VALUES
-.Rv -std kill
-.Sh ERRORS
-The
-.Fn kill
-system call
-will fail and no signal will be sent if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sig
-argument
-is not a valid signal number.
-.It Bq Er ESRCH
-No process or process group can be found corresponding to that specified by
-.Fa pid .
-.It Bq Er EPERM
-The sending process does not have permission to send
-.Va sig
-to the receiving process.
-.El
-.Sh SEE ALSO
-.Xr getpgrp 2 ,
-.Xr getpid 2 ,
-.Xr killpg 2 ,
-.Xr sigaction 2 ,
-.Xr sigqueue 2 ,
-.Xr raise 3 ,
-.Xr init 8
-.Sh STANDARDS
-The
-.Fn kill
-system call is expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn kill
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/kldfind.2 b/lib/libc_bsd/sys/kldfind.2
deleted file mode 100644
index 0c0b25b..0000000
--- a/lib/libc_bsd/sys/kldfind.2
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Chris Costello
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/kldfind.2 108028 2002-12-18 09:22:32Z ru $
-.\"
-.Dd March 3, 1999
-.Dt KLDFIND 2
-.Os
-.Sh NAME
-.Nm kldfind
-.Nd returns the fileid of a kld file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/linker.h
-.Ft int
-.Fn kldfind "const char *file"
-.Sh DESCRIPTION
-The
-.Fn kldfind
-system call
-returns the fileid of the kld file referenced by
-.Fa file .
-.Sh RETURN VALUES
-The
-.Fn kldfind
-system call
-returns the fileid of the kld file referenced by
-.Fa file .
-Upon error,
-.Fn kldfind
-returns -1 and sets
-.Va errno
-to indicate the error.
-.Sh ERRORS
-.Va errno
-is set to the following if
-.Fn kldfind
-fails:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The data required for this operation could not be read from the kernel space.
-.It Bq Er ENOENT
-The file specified is not loaded in the kernel.
-.El
-.Sh SEE ALSO
-.Xr kldfirstmod 2 ,
-.Xr kldload 2 ,
-.Xr kldnext 2 ,
-.Xr kldstat 2 ,
-.Xr kldsym 2 ,
-.Xr kldunload 2 ,
-.Xr modfind 2 ,
-.Xr modfnext 2 ,
-.Xr modnext 2 ,
-.Xr modstat 2 ,
-.Xr kld 4 ,
-.Xr kldstat 8
-.Sh HISTORY
-The
-.Nm kld
-interface first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/kldfirstmod.2 b/lib/libc_bsd/sys/kldfirstmod.2
deleted file mode 100644
index 78b792c..0000000
--- a/lib/libc_bsd/sys/kldfirstmod.2
+++ /dev/null
@@ -1,76 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Chris Costello
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/kldfirstmod.2 108028 2002-12-18 09:22:32Z ru $
-.\"
-.Dd March 3, 1999
-.Dt KLDFIRSTMOD 2
-.Os
-.Sh NAME
-.Nm kldfirstmod
-.Nd "return first module id from the kld file specified"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/linker.h
-.Ft int
-.Fn kldfirstmod "int fileid"
-.Sh DESCRIPTION
-The
-.Fn kldfirstmod
-system call returns the module id pertaining to the first module referenced by
-.Fa fileid .
-.Sh RETURN VALUES
-The
-.Fn kldfirstmod
-will return the id of the first module referenced by
-.Fa fileid
-or 0 if there are no references.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENOENT
-The kld file referenced by
-.Fa fileid
-was not found.
-.El
-.Sh SEE ALSO
-.Xr kldfind 2 ,
-.Xr kldload 2 ,
-.Xr kldnext 2 ,
-.Xr kldstat 2 ,
-.Xr kldsym 2 ,
-.Xr kldunload 2 ,
-.Xr modfind 2 ,
-.Xr modfnext 2 ,
-.Xr modnext 2 ,
-.Xr modstat 2 ,
-.Xr kld 4 ,
-.Xr kldstat 8
-.Sh HISTORY
-The
-.Nm kld
-interface first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/kldload.2 b/lib/libc_bsd/sys/kldload.2
deleted file mode 100644
index aa540ce..0000000
--- a/lib/libc_bsd/sys/kldload.2
+++ /dev/null
@@ -1,96 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Chris Costello
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/kldload.2 115771 2003-06-03 12:29:34Z hmp $
-.\"
-.Dd March 3, 1999
-.Dt KLDLOAD 2
-.Os
-.Sh NAME
-.Nm kldload
-.Nd load KLD files into the kernel
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/linker.h
-.Ft int
-.Fn kldload "const char *file"
-.Sh DESCRIPTION
-The
-.Fn kldload
-system call
-loads a kld file into the kernel using the kernel linker.
-.Sh RETURN VALUES
-The
-.Fn kldload
-system call
-returns the fileid of the kld file which was loaded into the kernel.
-If an error occurs,
-.Fn kldload
-will return -1 and set
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The named file is loaded unless:
-.Bl -tag -width Er
-.It Bq Er EPERM
-You do not have access to read the file or link it with the kernel.
-You should be the root user to be able to use the
-.Nm kld
-system calls.
-.It Bq Er EFAULT
-Bad address encountered when adding kld info into the kernel space.
-.It Bq Er ENOMEM
-There is no memory to load the file into the kernel.
-.It Bq Er ENOENT
-The file was not found.
-.It Bq Er ENOEXEC
-The file format of
-.Fa file
-was unrecognized.
-.It Bq Er EEXIST
-The supplied
-.Fa file
-has already been loaded.
-.El
-.Sh SEE ALSO
-.Xr kldfind 2 ,
-.Xr kldfirstmod 2 ,
-.Xr kldnext 2 ,
-.Xr kldstat 2 ,
-.Xr kldsym 2 ,
-.Xr kldunload 2 ,
-.Xr modfind 2 ,
-.Xr modfnext 2 ,
-.Xr modnext 2 ,
-.Xr modstat 2 ,
-.Xr kld 4 ,
-.Xr kldload 8
-.Sh HISTORY
-The
-.Nm kld
-interface first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/kldnext.2 b/lib/libc_bsd/sys/kldnext.2
deleted file mode 100644
index 32aeb3c..0000000
--- a/lib/libc_bsd/sys/kldnext.2
+++ /dev/null
@@ -1,89 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Chris Costello
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/kldnext.2 162385 2006-09-17 21:27:35Z ru $
-.\"
-.Dd February 22, 2006
-.Dt KLDNEXT 2
-.Os
-.Sh NAME
-.Nm kldnext
-.Nd return the fileid of the next kld file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/linker.h
-.Ft int
-.Fn kldnext "int fileid"
-.Sh DESCRIPTION
-The
-.Fn kldnext
-system call
-returns the fileid of the next kld file (that is, the one after
-.Fa fileid )
-or 0 if
-.Fa fileid
-is the last file loaded.
-To get the fileid of the first kld file, pass
-.Fa fileid
-of 0 to
-.Fn kldnext .
-.Sh RETURN VALUES
-The
-.Fn kldnext
-system call
-returns the fileid of the next kld file or 0 if successful.
-Otherwise
-.Fn kldnext
-returns the value \-1 and sets the global variable
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The only error set by
-.Fn kldnext
-is
-.Er ENOENT ,
-which is set when
-.Fa fileid
-refers to a kld file that does not exist (is not loaded).
-.Sh SEE ALSO
-.Xr kldfind 2 ,
-.Xr kldfirstmod 2 ,
-.Xr kldload 2 ,
-.Xr kldstat 2 ,
-.Xr kldsym 2 ,
-.Xr kldunload 2 ,
-.Xr modfind 2 ,
-.Xr modfnext 2 ,
-.Xr modnext 2 ,
-.Xr modstat 2 ,
-.Xr kld 4 ,
-.Xr kldstat 8
-.Sh HISTORY
-The
-.Nm kld
-interface first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/kldstat.2 b/lib/libc_bsd/sys/kldstat.2
deleted file mode 100644
index aefb664..0000000
--- a/lib/libc_bsd/sys/kldstat.2
+++ /dev/null
@@ -1,133 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Chris Costello
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/kldstat.2 233631 2012-03-28 23:51:06Z jimharris $
-.\"
-.Dd March 28, 2012
-.Dt KLDSTAT 2
-.Os
-.Sh NAME
-.Nm kldstat
-.Nd get status of kld file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/linker.h
-.Ft int
-.Fn kldstat "int fileid" "struct kld_file_stat *stat"
-.Sh DESCRIPTION
-The
-.Fn kldstat
-system call writes the info for the file referred to by
-.Fa fileid
-into
-.Fa stat .
-.Bd -literal
-struct kld_file_stat {
-	int         version;    /* set to sizeof(struct kld_file_stat) */
-	char        name[MAXPATHLEN];
-	int         refs;
-	int         id;
-	caddr_t     address;
-	size_t      size;
-	char        pathname[MAXPATHLEN];
-};
-.Ed
-.Bl -tag -width XXXaddress
-.It version
-This field is set to the size of the structure mentioned above by the code
-calling
-.Fn kldstat ,
-and not
-.Fn kldstat
-itself.
-.It name
-The name of the file referred to by
-.Fa fileid .
-.It refs
-The number of modules referenced by
-.Fa fileid .
-.It id
-The id of the file specified in
-.Fa fileid .
-.It address
-The load address of the kld file.
-.It size
-The amount of memory in bytes allocated by the file.
-.It pathname
-The full name of the file referred to by
-.Fa fileid ,
-including the path.
-.El
-.Sh RETURN VALUES
-.Rv -std kldstat
-.Sh ERRORS
-The information for the file referred to by
-.Fa fileid
-is filled into the structure pointed to by
-.Fa stat
-unless:
-.Bl -tag -width Er
-.It Bq Er ENOENT
-The file was not found (probably not loaded).
-.It Bq Er EINVAL
-The version specified in the
-.Fa version
-field of stat is not the proper version.
-You would need to rebuild world, the
-kernel, or your application, if this error occurs, given that you did properly
-fill in the
-.Fa version
-field.
-.It Bq Er EFAULT
-There was a problem copying one, some, or all of the fields into
-.Fa stat
-in the
-.Xr copyout 9
-function.
-.El
-.Sh SEE ALSO
-.Xr kldfind 2 ,
-.Xr kldfirstmod 2 ,
-.Xr kldload 2 ,
-.Xr kldnext 2 ,
-.Xr kldsym 2 ,
-.Xr kldunload 2 ,
-.Xr modfind 2 ,
-.Xr modfnext 2 ,
-.Xr modnext 2 ,
-.Xr modstat 2 ,
-.Xr kld 4 ,
-.Xr kldstat 8
-.Sh HISTORY
-The
-.Nm kld
-interface first appeared in
-.Fx 3.0 .
-.Sh BUGS
-The pathname may not be accurate if the file system mounts have
-changed since the module was loaded, or if this function is called
-within a chrooted environment.
diff --git a/lib/libc_bsd/sys/kldsym.2 b/lib/libc_bsd/sys/kldsym.2
deleted file mode 100644
index d1f15e0..0000000
--- a/lib/libc_bsd/sys/kldsym.2
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" Copyright (c) 2001 Chris Costello <chris@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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/kldsym.2 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd July 26, 2001
-.Dt KLDSYM 2
-.Os
-.Sh NAME
-.Nm kldsym
-.Nd look up address by symbol name in a KLD
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/linker.h
-.Ft int
-.Fn kldsym "int fileid" "int command" "void *data"
-.Sh DESCRIPTION
-The
-.Fn kldsym
-system call returns the address of the symbol specified in
-.Fa data
-in the module specified by
-.Fa fileid .
-If
-.Fa fileid
-is 0, all loaded modules are searched.
-Currently, the only
-.Fa command
-implemented is
-.Dv KLDSYM_LOOKUP .
-.Pp
-The
-.Fa data
-argument is of the following structure:
-.Bd -literal -offset indent
-struct kld_sym_lookup {
-    int         version;        /* sizeof(struct kld_sym_lookup) */
-    char        *symname;       /* Symbol name we are looking up */
-    u_long      symvalue;
-    size_t      symsize;
-};
-.Ed
-.Pp
-The
-.Va version
-member is to be set
-by the code calling
-.Fn kldsym
-to
-.Fn sizeof "struct kld_sym_lookup" .
-The next two members,
-.Va version
-and
-.Va symname ,
-are specified by the user.
-The last two,
-.Va symvalue
-and
-.Va symsize ,
-are filled in by
-.Fn kldsym
-and contain the address associated with
-.Va symname
-and the size of the data it points to, respectively.
-.Sh RETURN VALUES
-.Rv -std kldsym
-.Sh ERRORS
-The
-.Fn kldsym
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Invalid value in
-.Fa data->version
-or
-.Fa command .
-.It Bq Er ENOENT
-The
-.Fa fileid
-argument
-is invalid,
-or the specified symbol could not be found.
-.El
-.Sh SEE ALSO
-.Xr kldfind 2 ,
-.Xr kldfirstmod 2 ,
-.Xr kldload 2 ,
-.Xr kldnext 2 ,
-.Xr kldunload 2 ,
-.Xr modfind 2 ,
-.Xr modnext 2 ,
-.Xr modstat 2 ,
-.Xr kld 4
-.Sh HISTORY
-The
-.Fn kldsym
-system call first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/kldunload.2 b/lib/libc_bsd/sys/kldunload.2
deleted file mode 100644
index 322a12e..0000000
--- a/lib/libc_bsd/sys/kldunload.2
+++ /dev/null
@@ -1,94 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Chris Costello
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/kldunload.2 186489 2008-12-25 09:15:31Z trhodes $
-.\"
-.Dd December 25, 2008
-.Dt KLDUNLOAD 2
-.Os
-.Sh NAME
-.Nm kldunload , kldunloadf
-.Nd unload kld files
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/linker.h
-.Ft int
-.Fn kldunload "int fileid"
-.Ft int
-.Fn kldunloadf "int fileid" "int flags"
-.Sh DESCRIPTION
-The
-.Fn kldunload
-system call
-unloads a kld file from the kernel that was previously linked via
-.Xr kldload 2 .
-.Pp
-The
-.Fn kldunloadf
-system call accepts an additional flags argument, which may be one of
-.Dv LINKER_UNLOAD_NORMAL ,
-giving the same behavior as
-.Fn kldunload ,
-or
-.Dv LINKER_UNLOAD_FORCE ,
-which causes the unload to ignore a failure to quiesce the module.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The file referred to by
-.Fa fileid
-is unloaded unless:
-.Bl -tag -width Er
-.It Bq Er EPERM
-You do not have access to unlink the file from the kernel.
-.It Bq Er ENOENT
-The file was not found.
-.It Bq Er EBUSY
-You attempted to unload a file linked by the kernel.
-.It Bq Er EINVAL
-The
-.Fn kldunloadf
-system call was passed invalid flags.
-.El
-.Sh SEE ALSO
-.Xr kldfind 2 ,
-.Xr kldfirstmod 2 ,
-.Xr kldload 2 ,
-.Xr kldnext 2 ,
-.Xr kldstat 2 ,
-.Xr kldsym 2 ,
-.Xr modfind 2 ,
-.Xr modfnext 2 ,
-.Xr modnext 2 ,
-.Xr modstat 2 ,
-.Xr kld 4 ,
-.Xr kldunload 8
-.Sh HISTORY
-The
-.Nm kld
-interface first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/kqueue.2 b/lib/libc_bsd/sys/kqueue.2
deleted file mode 100644
index 9287ecc..0000000
--- a/lib/libc_bsd/sys/kqueue.2
+++ /dev/null
@@ -1,659 +0,0 @@
-.\" Copyright (c) 2000 Jonathan Lemon
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED ``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: releng/10.2/lib/libc/sys/kqueue.2 281454 2015-04-12 06:52:43Z kib $
-.\"
-.Dd March 29, 2015
-.Dt KQUEUE 2
-.Os
-.Sh NAME
-.Nm kqueue ,
-.Nm kevent
-.Nd kernel event notification mechanism
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/event.h
-.In sys/time.h
-.Ft int
-.Fn kqueue "void"
-.Ft int
-.Fn kevent "int kq" "const struct kevent *changelist" "int nchanges" "struct kevent *eventlist" "int nevents" "const struct timespec *timeout"
-.Fn EV_SET "kev" ident filter flags fflags data udata
-.Sh DESCRIPTION
-The
-.Fn kqueue
-system call
-provides a generic method of notifying the user when an event
-happens or a condition holds, based on the results of small
-pieces of kernel code termed filters.
-A kevent is identified by the (ident, filter) pair; there may only
-be one unique kevent per kqueue.
-.Pp
-The filter is executed upon the initial registration of a kevent
-in order to detect whether a preexisting condition is present, and is also
-executed whenever an event is passed to the filter for evaluation.
-If the filter determines that the condition should be reported,
-then the kevent is placed on the kqueue for the user to retrieve.
-.Pp
-The filter is also run when the user attempts to retrieve the kevent
-from the kqueue.
-If the filter indicates that the condition that triggered
-the event no longer holds, the kevent is removed from the kqueue and
-is not returned.
-.Pp
-Multiple events which trigger the filter do not result in multiple
-kevents being placed on the kqueue; instead, the filter will aggregate
-the events into a single struct kevent.
-Calling
-.Fn close
-on a file descriptor will remove any kevents that reference the descriptor.
-.Pp
-The
-.Fn kqueue
-system call
-creates a new kernel event queue and returns a descriptor.
-The queue is not inherited by a child created with
-.Xr fork 2 .
-However, if
-.Xr rfork 2
-is called without the
-.Dv RFFDG
-flag, then the descriptor table is shared,
-which will allow sharing of the kqueue between two processes.
-.Pp
-The
-.Fn kevent
-system call
-is used to register events with the queue, and return any pending
-events to the user.
-The
-.Fa changelist
-argument
-is a pointer to an array of
-.Va kevent
-structures, as defined in
-.In sys/event.h .
-All changes contained in the
-.Fa changelist
-are applied before any pending events are read from the queue.
-The
-.Fa nchanges
-argument
-gives the size of
-.Fa changelist .
-The
-.Fa eventlist
-argument
-is a pointer to an array of kevent structures.
-The
-.Fa nevents
-argument
-determines the size of
-.Fa eventlist .
-When
-.Fa nevents
-is zero,
-.Fn kevent
-will return immediately even if there is a
-.Fa timeout
-specified unlike
-.Xr select 2 .
-If
-.Fa timeout
-is a non-NULL pointer, it specifies a maximum interval to wait
-for an event, which will be interpreted as a struct timespec.
-If
-.Fa timeout
-is a NULL pointer,
-.Fn kevent
-waits indefinitely.
-To effect a poll, the
-.Fa timeout
-argument should be non-NULL, pointing to a zero-valued
-.Va timespec
-structure.
-The same array may be used for the
-.Fa changelist
-and
-.Fa eventlist .
-.Pp
-The
-.Fn EV_SET
-macro is provided for ease of initializing a
-kevent structure.
-.Pp
-The
-.Va kevent
-structure is defined as:
-.Bd -literal
-struct kevent {
-	uintptr_t ident;	/* identifier for this event */
-	short	  filter;	/* filter for event */
-	u_short	  flags;	/* action flags for kqueue */
-	u_int	  fflags;	/* filter flag value */
-	intptr_t  data;		/* filter data value */
-	void	  *udata;	/* opaque user data identifier */
-};
-.Ed
-.Pp
-The fields of
-.Fa struct kevent
-are:
-.Bl -tag -width "Fa filter"
-.It Fa ident
-Value used to identify this event.
-The exact interpretation is determined by the attached filter,
-but often is a file descriptor.
-.It Fa filter
-Identifies the kernel filter used to process this event.
-The pre-defined
-system filters are described below.
-.It Fa flags
-Actions to perform on the event.
-.It Fa fflags
-Filter-specific flags.
-.It Fa data
-Filter-specific data value.
-.It Fa udata
-Opaque user-defined value passed through the kernel unchanged.
-.El
-.Pp
-The
-.Va flags
-field can contain the following values:
-.Bl -tag -width EV_DISPATCH
-.It Dv EV_ADD
-Adds the event to the kqueue.
-Re-adding an existing event
-will modify the parameters of the original event, and not result
-in a duplicate entry.
-Adding an event automatically enables it,
-unless overridden by the EV_DISABLE flag.
-.It Dv EV_ENABLE
-Permit
-.Fn kevent
-to return the event if it is triggered.
-.It Dv EV_DISABLE
-Disable the event so
-.Fn kevent
-will not return it.
-The filter itself is not disabled.
-.It Dv EV_DISPATCH
-Disable the event source immediately after delivery of an event.
-See
-.Dv EV_DISABLE
-above.
-.It Dv EV_DELETE
-Removes the event from the kqueue.
-Events which are attached to
-file descriptors are automatically deleted on the last close of
-the descriptor.
-.It Dv EV_RECEIPT
-This flag is useful for making bulk changes to a kqueue without draining
-any pending events.
-When passed as input, it forces
-.Dv EV_ERROR
-to always be returned.
-When a filter is successfully added the
-.Va data
-field will be zero.
-.It Dv EV_ONESHOT
-Causes the event to return only the first occurrence of the filter
-being triggered.
-After the user retrieves the event from the kqueue,
-it is deleted.
-.It Dv EV_CLEAR
-After the event is retrieved by the user, its state is reset.
-This is useful for filters which report state transitions
-instead of the current state.
-Note that some filters may automatically
-set this flag internally.
-.It Dv EV_EOF
-Filters may set this flag to indicate filter-specific EOF condition.
-.It Dv EV_ERROR
-See
-.Sx RETURN VALUES
-below.
-.El
-.Pp
-The predefined system filters are listed below.
-Arguments may be passed to and from the filter via the
-.Va fflags
-and
-.Va data
-fields in the kevent structure.
-.Bl -tag -width "Dv EVFILT_PROCDESC"
-.It Dv EVFILT_READ
-Takes a descriptor as the identifier, and returns whenever
-there is data available to read.
-The behavior of the filter is slightly different depending
-on the descriptor type.
-.Bl -tag -width 2n
-.It Sockets
-Sockets which have previously been passed to
-.Fn listen
-return when there is an incoming connection pending.
-.Va data
-contains the size of the listen backlog.
-.Pp
-Other socket descriptors return when there is data to be read,
-subject to the
-.Dv SO_RCVLOWAT
-value of the socket buffer.
-This may be overridden with a per-filter low water mark at the
-time the filter is added by setting the
-.Dv NOTE_LOWAT
-flag in
-.Va fflags ,
-and specifying the new low water mark in
-.Va data .
-On return,
-.Va data
-contains the number of bytes of protocol data available to read.
-.Pp
-If the read direction of the socket has shutdown, then the filter
-also sets
-.Dv EV_EOF
-in
-.Va flags ,
-and returns the socket error (if any) in
-.Va fflags .
-It is possible for EOF to be returned (indicating the connection is gone)
-while there is still data pending in the socket buffer.
-.It Vnodes
-Returns when the file pointer is not at the end of file.
-.Va data
-contains the offset from current position to end of file,
-and may be negative.
-.It "Fifos, Pipes"
-Returns when the there is data to read;
-.Va data
-contains the number of bytes available.
-.Pp
-When the last writer disconnects, the filter will set
-.Dv EV_EOF
-in
-.Va flags .
-This may be cleared by passing in
-.Dv EV_CLEAR ,
-at which point the
-filter will resume waiting for data to become available before
-returning.
-.It "BPF devices"
-Returns when the BPF buffer is full, the BPF timeout has expired, or
-when the BPF has
-.Dq immediate mode
-enabled and there is any data to read;
-.Va data
-contains the number of bytes available.
-.El
-.It Dv EVFILT_WRITE
-Takes a descriptor as the identifier, and returns whenever
-it is possible to write to the descriptor.
-For sockets, pipes
-and fifos,
-.Va data
-will contain the amount of space remaining in the write buffer.
-The filter will set EV_EOF when the reader disconnects, and for
-the fifo case, this may be cleared by use of
-.Dv EV_CLEAR .
-Note that this filter is not supported for vnodes or BPF devices.
-.Pp
-For sockets, the low water mark and socket error handling is
-identical to the
-.Dv EVFILT_READ
-case.
-.It Dv EVFILT_AIO
-The sigevent portion of the AIO request is filled in, with
-.Va sigev_notify_kqueue
-containing the descriptor of the kqueue that the event should
-be attached to,
-.Va sigev_notify_kevent_flags
-containing the kevent flags which should be
-.Dv EV_ONESHOT ,
-.Dv EV_CLEAR
-or
-.Dv EV_DISPATCH ,
-.Va sigev_value
-containing the udata value, and
-.Va sigev_notify
-set to
-.Dv SIGEV_KEVENT .
-When the
-.Fn aio_*
-system call is made, the event will be registered
-with the specified kqueue, and the
-.Va ident
-argument set to the
-.Fa struct aiocb
-returned by the
-.Fn aio_*
-system call.
-The filter returns under the same conditions as
-.Fn aio_error .
-.It Dv EVFILT_VNODE
-Takes a file descriptor as the identifier and the events to watch for in
-.Va fflags ,
-and returns when one or more of the requested events occurs on the descriptor.
-The events to monitor are:
-.Bl -tag -width "Dv NOTE_RENAME"
-.It Dv NOTE_DELETE
-The
-.Fn unlink
-system call
-was called on the file referenced by the descriptor.
-.It Dv NOTE_WRITE
-A write occurred on the file referenced by the descriptor.
-.It Dv NOTE_EXTEND
-The file referenced by the descriptor was extended.
-.It Dv NOTE_ATTRIB
-The file referenced by the descriptor had its attributes changed.
-.It Dv NOTE_LINK
-The link count on the file changed.
-.It Dv NOTE_RENAME
-The file referenced by the descriptor was renamed.
-.It Dv NOTE_REVOKE
-Access to the file was revoked via
-.Xr revoke 2
-or the underlying file system was unmounted.
-.El
-.Pp
-On return,
-.Va fflags
-contains the events which triggered the filter.
-.It Dv EVFILT_PROC
-Takes the process ID to monitor as the identifier and the events to watch for
-in
-.Va fflags ,
-and returns when the process performs one or more of the requested events.
-If a process can normally see another process, it can attach an event to it.
-The events to monitor are:
-.Bl -tag -width "Dv NOTE_TRACKERR"
-.It Dv NOTE_EXIT
-The process has exited.
-The exit status will be stored in
-.Va data .
-.It Dv NOTE_FORK
-The process has called
-.Fn fork .
-.It Dv NOTE_EXEC
-The process has executed a new process via
-.Xr execve 2
-or a similar call.
-.It Dv NOTE_TRACK
-Follow a process across
-.Fn fork
-calls.
-The parent process registers a new kevent to monitor the child process
-using the same
-.Va fflags
-as the original event.
-The child process will signal an event with
-.Dv NOTE_CHILD
-set in
-.Va fflags
-and the parent PID in
-.Va data .
-.Pp
-If the parent process fails to register a new kevent
-.Pq usually due to resource limitations ,
-it will signal an event with
-.Dv NOTE_TRACKERR
-set in
-.Va fflags ,
-and the child process will not signal a
-.Dv NOTE_CHILD
-event.
-.El
-.Pp
-On return,
-.Va fflags
-contains the events which triggered the filter.
-.It Dv EVFILT_SIGNAL
-Takes the signal number to monitor as the identifier and returns
-when the given signal is delivered to the process.
-This coexists with the
-.Fn signal
-and
-.Fn sigaction
-facilities, and has a lower precedence.
-The filter will record
-all attempts to deliver a signal to a process, even if the signal has
-been marked as
-.Dv SIG_IGN ,
-except for the
-.Dv SIGCHLD
-signal, which, if ignored, won't be recorded by the filter.
-Event notification happens after normal
-signal delivery processing.
-.Va data
-returns the number of times the signal has occurred since the last call to
-.Fn kevent .
-This filter automatically sets the
-.Dv EV_CLEAR
-flag internally.
-.It Dv EVFILT_TIMER
-Establishes an arbitrary timer identified by
-.Va ident .
-When adding a timer,
-.Va data
-specifies the timeout period.
-The timer will be periodic unless
-.Dv EV_ONESHOT
-is specified.
-On return,
-.Va data
-contains the number of times the timeout has expired since the last call to
-.Fn kevent .
-This filter automatically sets the EV_CLEAR flag internally.
-There is a system wide limit on the number of timers
-which is controlled by the
-.Va kern.kq_calloutmax
-sysctl.
-.Bl -tag -width "Dv NOTE_USECONDS"
-.It Dv NOTE_SECONDS
-.Va data
-is in seconds.
-.It Dv NOTE_MSECONDS
-.Va data
-is in milliseconds.
-.It Dv NOTE_USECONDS
-.Va data
-is in microseconds.
-.It Dv NOTE_NSECONDS
-.Va data
-is in nanoseconds.
-.El
-.Pp
-If
-.Va fflags
-is not set, the default is milliseconds. On return,
-.Va fflags
-contains the events which triggered the filter.
-.It Dv EVFILT_USER
-Establishes a user event identified by
-.Va ident
-which is not associated with any kernel mechanism but is triggered by
-user level code.
-The lower 24 bits of the
-.Va fflags
-may be used for user defined flags and manipulated using the following:
-.Bl -tag -width "Dv NOTE_FFLAGSMASK"
-.It Dv NOTE_FFNOP
-Ignore the input
-.Va fflags .
-.It Dv NOTE_FFAND
-Bitwise AND
-.Va fflags .
-.It Dv NOTE_FFOR
-Bitwise OR
-.Va fflags .
-.It Dv NOTE_FFCOPY
-Copy
-.Va fflags .
-.It Dv NOTE_FFCTRLMASK
-Control mask for
-.Va fflags .
-.It Dv NOTE_FFLAGSMASK
-User defined flag mask for
-.Va fflags .
-.El
-.Pp
-A user event is triggered for output with the following:
-.Bl -tag -width "Dv NOTE_FFLAGSMASK"
-.It Dv NOTE_TRIGGER
-Cause the event to be triggered.
-.El
-.Pp
-On return,
-.Va fflags
-contains the users defined flags in the lower 24 bits.
-.El
-.Sh CANCELLATION BEHAVIOUR
-If
-.Fa nevents
-is non-zero, i.e. the function is potentially blocking, the call
-is a cancellation point.
-Otherwise, i.e. if
-.Fa nevents
-is zero, the call is not cancellable.
-Cancellation can only occur before any changes are made to the kqueue,
-or when the call was blocked and no changes to the queue were requested.
-.Sh RETURN VALUES
-The
-.Fn kqueue
-system call
-creates a new kernel event queue and returns a file descriptor.
-If there was an error creating the kernel event queue, a value of -1 is
-returned and errno set.
-.Pp
-The
-.Fn kevent
-system call
-returns the number of events placed in the
-.Fa eventlist ,
-up to the value given by
-.Fa nevents .
-If an error occurs while processing an element of the
-.Fa changelist
-and there is enough room in the
-.Fa eventlist ,
-then the event will be placed in the
-.Fa eventlist
-with
-.Dv EV_ERROR
-set in
-.Va flags
-and the system error in
-.Va data .
-Otherwise,
-.Dv -1
-will be returned, and
-.Dv errno
-will be set to indicate the error condition.
-If the time limit expires, then
-.Fn kevent
-returns 0.
-.Sh ERRORS
-The
-.Fn kqueue
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-The kernel failed to allocate enough memory for the kernel queue.
-.It Bq Er EMFILE
-The per-process descriptor table is full.
-.It Bq Er ENFILE
-The system file table is full.
-.El
-.Pp
-The
-.Fn kevent
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The process does not have permission to register a filter.
-.It Bq Er EFAULT
-There was an error reading or writing the
-.Va kevent
-structure.
-.It Bq Er EBADF
-The specified descriptor is invalid.
-.It Bq Er EINTR
-A signal was delivered before the timeout expired and before any
-events were placed on the kqueue for return.
-.It Bq Er EINTR
-A cancellation request was delivered to the thread, but not yet handled.
-.It Bq Er EINVAL
-The specified time limit or filter is invalid.
-.It Bq Er ENOENT
-The event could not be found to be modified or deleted.
-.It Bq Er ENOMEM
-No memory was available to register the event
-or, in the special case of a timer, the maximum number of
-timers has been exceeded.
-This maximum is configurable via the
-.Va kern.kq_calloutmax
-sysctl.
-.It Bq Er ESRCH
-The specified process to attach to does not exist.
-.El
-.Pp
-When
-.Fn kevent
-call fails with
-.Er EINTR
-error, all changes in the
-.Fa changelist
-have been applied.
-.Sh SEE ALSO
-.Xr aio_error 2 ,
-.Xr aio_read 2 ,
-.Xr aio_return 2 ,
-.Xr poll 2 ,
-.Xr read 2 ,
-.Xr select 2 ,
-.Xr sigaction 2 ,
-.Xr write 2 ,
-.Xr pthread_setcancelstate 3 ,
-.Xr signal 3
-.Sh HISTORY
-The
-.Fn kqueue
-and
-.Fn kevent
-system calls first appeared in
-.Fx 4.1 .
-.Sh AUTHORS
-The
-.Fn kqueue
-system and this manual page were written by
-.An Jonathan Lemon Aq jlemon@FreeBSD.org .
-.Sh BUGS
-The
-.Fa timeout
-value is limited to 24 hours; longer timeouts will be silently
-reinterpreted as 24 hours.
diff --git a/lib/libc_bsd/sys/kse.2 b/lib/libc_bsd/sys/kse.2
deleted file mode 100644
index 9955a2c..0000000
--- a/lib/libc_bsd/sys/kse.2
+++ /dev/null
@@ -1,679 +0,0 @@
-.\" Copyright (c) 2002 Packet Design, LLC.
-.\" All rights reserved.
-.\"
-.\" Subject to the following obligations and disclaimer of warranty,
-.\" use and redistribution of this software, in source or object code
-.\" forms, with or without modifications are expressly permitted by
-.\" Packet Design; provided, however, that:
-.\"
-.\"    (i)  Any and all reproductions of the source or object code
-.\"         must include the copyright notice above and the following
-.\"         disclaimer of warranties; and
-.\"    (ii) No rights are granted, in any manner or form, to use
-.\"         Packet Design trademarks, including the mark "PACKET DESIGN"
-.\"         on advertising, endorsements, or otherwise except as such
-.\"         appears in the above copyright notice or in the software.
-.\"
-.\" THIS SOFTWARE IS BEING PROVIDED BY PACKET DESIGN "AS IS", AND
-.\" TO THE MAXIMUM EXTENT PERMITTED BY LAW, PACKET DESIGN MAKES NO
-.\" REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING
-.\" THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED
-.\" WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-.\" OR NON-INFRINGEMENT.  PACKET DESIGN DOES NOT WARRANT, GUARANTEE,
-.\" OR MAKE ANY REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS
-.\" OF THE USE OF THIS SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY,
-.\" RELIABILITY OR OTHERWISE.  IN NO EVENT SHALL PACKET DESIGN BE
-.\" LIABLE FOR ANY DAMAGES RESULTING FROM OR ARISING OUT OF ANY USE
-.\" OF THIS SOFTWARE, INCLUDING WITHOUT LIMITATION, ANY DIRECT,
-.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, PUNITIVE, OR CONSEQUENTIAL
-.\" DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF
-.\" USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER 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 PACKET DESIGN IS ADVISED OF
-.\" THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/kse.2 233669 2012-03-29 16:20:20Z joel $
-.\"
-.Dd February 13, 2007
-.Dt KSE 2
-.Os
-.Sh NAME
-.Nm kse
-.Nd "kernel support for user threads"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/kse.h
-.Ft int
-.Fn kse_create "struct kse_mailbox *mbx" "int sys-scope"
-.Ft int
-.Fn kse_exit void
-.Ft int
-.Fn kse_release "struct timespec *timeout"
-.Ft int
-.Fn kse_switchin "struct kse_thr_mailbox *tmbx" "int flags"
-.Ft int
-.Fn kse_thr_interrupt "struct kse_thr_mailbox *tmbx" "int cmd" "long data"
-.Ft int
-.Fn kse_wakeup "struct kse_mailbox *mbx"
-.Sh DESCRIPTION
-These system calls implement kernel support for multi-threaded processes.
-.\"
-.Ss Overview
-.\"
-Traditionally, user threading has been implemented in one of two ways:
-either all threads are managed in user space and the kernel is unaware
-of any threading (also known as
-.Dq "N to 1" ) ,
-or else separate processes sharing
-a common memory space are created for each thread (also known as
-.Dq "N to N" ) .
-These approaches have advantages and disadvantages:
-.Bl -column "- Cannot utilize multiple CPUs" "+ Can utilize multiple CPUs"
-.It Sy "User threading	Kernel threading"
-.It "+ Lightweight	- Heavyweight"
-.It "+ User controls scheduling	- Kernel controls scheduling"
-.It "- Syscalls must be wrapped	+ No syscall wrapping required"
-.It "- Cannot utilize multiple CPUs	+ Can utilize multiple CPUs"
-.El
-.Pp
-The KSE system is a
-hybrid approach that achieves the advantages of both the user and kernel
-threading approaches.
-The underlying philosophy of the KSE system is to give kernel support
-for user threading without taking away any of the user threading library's
-ability to make scheduling decisions.
-A kernel-to-user upcall mechanism is used to pass control to the user
-threading library whenever a scheduling decision needs to be made.
-An arbitrarily number of user threads are multiplexed onto a fixed number of
-virtual CPUs supplied by the kernel.
-This can be thought of as an
-.Dq "N to M"
-threading scheme.
-.Pp
-Some general implications of this approach include:
-.Bl -bullet
-.It
-The user process can run multiple threads simultaneously on multi-processor
-machines.
-The kernel grants the process virtual CPUs to schedule as it
-wishes; these may run concurrently on real CPUs.
-.It
-All operations that block in the kernel become asynchronous, allowing
-the user process to schedule another thread when any thread blocks.
-.El
-.\"
-.Ss Definitions
-.\"
-KSE allows a user process to have multiple
-.Sy threads
-of execution in existence at the same time, some of which may be blocked
-in the kernel while others may be executing or blocked in user space.
-A
-.Sy "kernel scheduling entity"
-(KSE) is a
-.Dq "virtual CPU"
-granted to the process for the purpose of executing threads.
-A thread that is currently executing is always associated with
-exactly one KSE, whether executing in user space or in the kernel.
-The KSE is said to be
-.Sy assigned
-to the thread.
-KSEs (a user abstraction) are implemented on top
-of kernel threads using an 'upcall' entity.
-.Pp
-The KSE becomes
-.Sy unassigned ,
-and the associated thread is suspended, when the KSE has an associated
-.Sy mailbox ,
-(see below) the thread has an associated
-.Sy thread mailbox ,
-(also see below) and any of the following occurs:
-.Bl -bullet
-.It
-The thread invokes a system call that blocks.
-.It
-The thread makes any other demand of the kernel that cannot be immediately
-satisfied, e.g., touches a page of memory that needs to be fetched from disk,
-causing a page fault.
-.It
-Another thread that was previously blocked in the kernel completes its
-work in the kernel (or is
-.Sy interrupted )
-and becomes ready to return to user space, and the current thread is returning
-to user space.
-.It
-A signal is delivered to the process, and this KSE is chosen to deliver it.
-.El
-.Pp
-In other words, as soon as there is a scheduling decision to be made,
-the KSE becomes unassigned, because the kernel does not presume to know
-how the process' other runnable threads should be scheduled.
-Unassigned KSEs always return to user space as soon as possible via
-the
-.Sy upcall
-mechanism (described below), allowing the user process to decide how
-that KSE should be utilized next.
-KSEs always complete as much work as possible in the kernel before
-becoming unassigned.
-.Pp
-Individual KSEs within a process are effectively indistinguishable,
-and any KSE in a process may be assigned by the kernel to any runnable
-(in the kernel) thread associated with that process.
-In practice, the kernel attempts to preserve the affinity between threads
-and actual CPUs to optimize cache behavior, but this is invisible to the
-user process.
-(Affinity is not yet fully implemented.)
-.Pp
-Each KSE has a unique
-.Sy "KSE mailbox"
-supplied by the user process.
-A mailbox consists of a control structure containing a pointer to an
-.Sy "upcall function"
-and a user stack.
-The KSE invokes this function whenever it becomes unassigned.
-The kernel updates this structure with information about threads that have
-become runnable and signals that have been delivered before each upcall.
-Upcalls may be temporarily blocked by the user thread scheduling code
-during critical sections.
-.Pp
-Each user thread has a unique
-.Sy "thread mailbox"
-as well.
-Threads are referred to using pointers to these mailboxes when communicating
-between the kernel and the user thread scheduler.
-Each KSE's mailbox contains a pointer to the mailbox of the user thread
-that the KSE is currently executing.
-This pointer is saved when the thread blocks in the kernel.
-.Pp
-Whenever a thread blocked in the kernel is ready to return to user space,
-it is added to the process's list of
-.Sy completed
-threads.
-This list is presented to the user code at the next upcall as a linked list
-of thread mailboxes.
-.Pp
-There is a kernel-imposed limit on the number of threads in a process
-that may be simultaneously blocked in the kernel (this number is not
-currently visible to the user).
-When this limit is reached, upcalls are blocked and no work is performed
-for the process until one of the threads completes (or a signal is
-received).
-.\"
-.Ss Managing KSEs
-.\"
-To become multi-threaded, a process must first invoke
-.Fn kse_create .
-The
-.Fn kse_create
-system call
-creates a new KSE (except for the very first invocation; see below).
-The KSE will be associated with the mailbox pointed to by
-.Fa mbx .
-If
-.Fa sys_scope
-is non-zero, then the new thread will be counted as a system scope
-thread. Other things must be done as well to make a system scope thread
-so this is not sufficient (yet).
-System scope variables are not covered
-in detail in this manual page yet, but briefly, they never perform
-upcalls and do not return to the user thread scheduler.
-Once launched they run autonomously.
-The pthreads library knows how to make system
-scope threads and users are encouraged to use the library interface.
-.Pp
-Each process initially has a single KSE executing a single user thread.
-Since the KSE does not have an associated mailbox, it must remain assigned
-to the thread and does not perform any upcalls.
-(It is by definition a system scope thread).
-The result is the traditional, unthreaded mode of operation.
-Therefore, as a special case, the first call to
-.Fn kse_create
-by this initial thread with
-.Fa sys_scope
-equal to zero does not create a new KSE; instead, it simply associates the
-current KSE with the supplied KSE mailbox, and no immediate upcall results.
-However, an upcall will be triggered the next time the thread blocks and
-the required conditions are met.
-.Pp
-The kernel does not allow more KSEs to exist in a process than the
-number of physical CPUs in the system (this number is available as the
-.Xr sysctl 3
-variable
-.Va hw.ncpu ) .
-Having more KSEs than CPUs would not add any value to the user process,
-as the additional KSEs would just compete with each other for access to
-the real CPUs.
-Since the extra KSEs would always be side-lined, the result
-to the application would be exactly the same as having fewer KSEs.
-There may however be arbitrarily many user threads, and it is up to the
-user thread scheduler to handle mapping the application's user threads
-onto the available KSEs.
-.Pp
-The
-.Fn kse_exit
-system call
-causes the KSE assigned to the currently running thread to be destroyed.
-If this KSE is the last one in the process, there must be no remaining
-threads associated with that process blocked in the kernel.
-This system call does not return unless there is an error.
-Calling
-.Fn kse_exit
-from the last thread is the same as calling
-.Fn exit .
-.Pp
-The
-.Fn kse_release
-system call
-is used to
-.Dq park
-the KSE assigned to the currently running thread when it is not needed,
-e.g., when there are more available KSEs than runnable user threads.
-The thread converts to an upcall but does not get scheduled until
-there is a new reason to do so, e.g., a previously
-blocked thread becomes runnable, or the timeout expires.
-If successful,
-.Fn kse_release
-does not return to the caller.
-.Pp
-The
-.Fn kse_switchin
-system call can be used by the UTS, when it has selected a new thread,
-to switch to the context of that thread.
-The use of
-.Fn kse_switchin
-is machine dependent.
-Some platforms do not need a system call to switch to a new context,
-while others require its use in particular cases.
-.Pp
-The
-.Fn kse_wakeup
-system call
-is the opposite of
-.Fn kse_release .
-It causes the (parked) KSE associated with the mailbox pointed to by
-.Fa mbx
-to be woken up, causing it to upcall.
-If the KSE has already woken up for another reason, this system call has no
-effect.
-The
-.Fa mbx
-argument
-may be
-.Dv NULL
-to specify
-.Dq "any KSE in the current process" .
-.Pp
-The
-.Fn kse_thr_interrupt
-system call
-is used to interrupt a currently blocked thread.
-The thread must either be blocked in the kernel or assigned to a KSE
-(i.e., executing).
-The thread is then marked as interrupted.
-As soon as the thread invokes an interruptible system call (or immediately
-for threads already blocked in one), the thread will be made runnable again,
-even though the kernel operation may not have completed.
-The effect on the interrupted system call is the same as if it had been
-interrupted by a signal; typically this means an error is returned with
-.Va errno
-set to
-.Er EINTR .
-.\"
-.Ss Signals
-.\"
-The current implementation creates a special signal thread.
-Kernel threads (KSEs) in a process mask all signals, and only the signal
-thread waits for signals to be delivered to the process, the signal thread
-is responsible
-for dispatching signals to user threads.
-.Pp
-A downside of this is that if a multiplexed thread
-calls the
-.Fn execve
-syscall, its signal mask and pending signals may not be
-available in the kernel.
-They are stored
-in userland and the kernel does not know where to get them, however
-.Tn POSIX
-requires them to be restored and passed them to new process.
-Just setting the mask for the thread before calling
-.Fn execve
-is only a
-close approximation to the problem as it does not re-deliver back to the kernel
-any pending signals that the old process may have blocked, and it allows a
-window in which new signals may be delivered to the process between the setting
-of the mask and the
-.Fn execve .
-.Pp
-For now this problem has been solved by adding a special combined
-.Fn kse_thr_interrupt Ns / Ns Fn execve
-mode to the
-.Fn kse_thr_interrupt
-syscall.
-The
-.Fn kse_thr_interrupt
-syscall has a sub command
-.Dv KSE_INTR_EXECVE ,
-that allows it to accept a
-.Vt kse_execv_args
-structure, and allowing it to adjust the signals and then atomically
-convert into an
-.Fn execve
-call.
-Additional pending signals and the correct signal mask can be passed
-to the kernel in this way.
-The thread library overrides the
-.Fn execve
-syscall
-and translates it into
-.Fn kse_intr_interrupt
-call, allowing a multiplexed thread
-to restore pending signals and the correct signal mask before doing the
-.Fn exec .
-This solution to the problem may change.
-.\"
-.Ss KSE Mailboxes
-.\"
-Each KSE has a unique mailbox for user-kernel communication defined in
-.In sys/kse.h .
-Some of the fields there are:
-.Pp
-.Va km_version
-describes the version of this structure and must be equal to
-.Dv KSE_VER_0 .
-.Va km_udata
-is an opaque pointer ignored by the kernel.
-.Pp
-.Va km_func
-points to the KSE's upcall function;
-it will be invoked using
-.Va km_stack ,
-which must remain valid for the lifetime of the KSE.
-.Pp
-.Va km_curthread
-always points to the thread that is currently assigned to this KSE if any,
-or
-.Dv NULL
-otherwise.
-This field is modified by both the kernel and the user process as follows.
-.Pp
-When
-.Va km_curthread
-is not
-.Dv NULL ,
-it is assumed to be pointing at the mailbox for the currently executing
-thread, and the KSE may be unassigned, e.g., if the thread blocks in the
-kernel.
-The kernel will then save the contents of
-.Va km_curthread
-with the blocked thread, set
-.Va km_curthread
-to
-.Dv NULL ,
-and upcall to invoke
-.Fn km_func .
-.Pp
-When
-.Va km_curthread
-is
-.Dv NULL ,
-the kernel will never perform any upcalls with this KSE; in other words,
-the KSE remains assigned to the thread even if it blocks.
-.Va km_curthread
-must be
-.Dv NULL
-while the KSE is executing critical user thread scheduler
-code that would be disrupted by an intervening upcall;
-in particular, while
-.Fn km_func
-itself is executing.
-.Pp
-Before invoking
-.Fn km_func
-in any upcall, the kernel always sets
-.Va km_curthread
-to
-.Dv NULL .
-Once the user thread scheduler has chosen a new thread to run,
-it should point
-.Va km_curthread
-at the thread's mailbox, re-enabling upcalls, and then resume the thread.
-.Em Note :
-modification of
-.Va km_curthread
-by the user thread scheduler must be atomic
-with the loading of the context of the new thread, to avoid
-the situation where the thread context area
-may be modified by a blocking async operation, while there
-is still valid information to be read out of it.
-.Pp
-.Va km_completed
-points to a linked list of user threads that have completed their work
-in the kernel since the last upcall.
-The user thread scheduler should put these threads back into its
-own runnable queue.
-Each thread in a process that completes a kernel operation
-(synchronous or asynchronous) that results in an upcall is guaranteed to be
-linked into exactly one KSE's
-.Va km_completed
-list; which KSE in the group, however, is indeterminate.
-Furthermore, the completion will be reported in only one upcall.
-.Pp
-.Va km_sigscaught
-contains the list of signals caught by this process since the previous
-upcall to any KSE in the process.
-As long as there exists one or more KSEs with an associated mailbox in
-the user process, signals are delivered this way rather than the
-traditional way.
-(This has not been implemented and may change.)
-.Pp
-.Va km_timeofday
-is set by the kernel to the current system time before performing
-each upcall.
-.Pp
-.Va km_flags
-may contain any of the following bits OR'ed together:
-.Bl -tag -width indent
-.It Dv KMF_NOUPCALL
-Block upcalls from happening.
-The thread is in some critical section.
-.It Dv KMF_NOCOMPLETED , KMF_DONE , KMF_BOUND
-This thread should be considered to be permanently bound to
-its KSE, and treated much like a non-threaded process would be.
-It is a
-.Dq "long term"
-version of
-.Dv KMF_NOUPCALL
-in some ways.
-.It Dv KMF_WAITSIGEVENT
-Implement characteristics needed for the signal delivery thread.
-.El
-.\"
-.Ss Thread Mailboxes
-.\"
-Each user thread must have associated with it a unique
-.Vt "struct kse_thr_mailbox"
-as defined in
-.In sys/kse.h .
-It includes the following fields.
-.Pp
-.Va tm_udata
-is an opaque pointer ignored by the kernel.
-.Pp
-.Va tm_context
-stores the context for the thread when the thread is blocked in user space.
-This field is also updated by the kernel before a completed thread is returned
-to the user thread scheduler via
-.Va km_completed .
-.Pp
-.Va tm_next
-links the
-.Va km_completed
-threads together when returned by the kernel with an upcall.
-The end of the list is marked with a
-.Dv NULL
-pointer.
-.Pp
-.Va tm_uticks
-and
-.Va tm_sticks
-are time counters for user mode and kernel mode execution, respectively.
-These counters count ticks of the statistics clock (see
-.Xr clocks 7 ) .
-While any thread is actively executing in the kernel, the corresponding
-.Va tm_sticks
-counter is incremented.
-While any KSE is executing in user space and that KSE's
-.Va km_curthread
-pointer is not equal to
-.Dv NULL ,
-the corresponding
-.Va tm_uticks
-counter is incremented.
-.Pp
-.Va tm_flags
-may contain any of the following bits OR'ed together:
-.Bl -tag -width indent
-.It Dv TMF_NOUPCALL
-Similar to
-.Dv KMF_NOUPCALL .
-This flag inhibits upcalling for critical sections.
-Some architectures require this to be in one place and some in the other.
-.El
-.Sh RETURN VALUES
-The
-.Fn kse_create ,
-.Fn kse_wakeup ,
-and
-.Fn kse_thr_interrupt
-system calls
-return zero if successful.
-The
-.Fn kse_exit
-and
-.Fn kse_release
-system calls
-do not return if successful.
-.Pp
-All of these system calls return a non-zero error code in case of an error.
-.Sh ERRORS
-The
-.Fn kse_create
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ENXIO
-There are already as many KSEs in the process as hardware processors.
-.It Bq Er EAGAIN
-The user is not the super user, and the soft resource limit corresponding
-to the
-.Fa resource
-argument
-.Dv RLIMIT_NPROC
-would be exceeded (see
-.Xr getrlimit 2 ) .
-.It Bq Er EFAULT
-The
-.Fa mbx
-argument
-points to an address which is not a valid part of the process address space.
-.El
-.Pp
-The
-.Fn kse_exit
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EDEADLK
-The current KSE is the last in its process and there are still one or more
-threads associated with the process blocked in the kernel.
-.It Bq Er ESRCH
-The current KSE has no associated mailbox, i.e., the process is operating
-in traditional, unthreaded mode (in this case use
-.Xr _exit 2
-to exit the process).
-.El
-.Pp
-The
-.Fn kse_release
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-The current KSE has no associated mailbox, i.e., the process is operating is
-traditional, unthreaded mode.
-.El
-.Pp
-The
-.Fn kse_wakeup
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-The
-.Fa mbx
-argument
-is not
-.Dv NULL
-and the mailbox pointed to by
-.Fa mbx
-is not associated with any KSE in the process.
-.It Bq Er ESRCH
-The
-.Fa mbx
-argument
-is
-.Dv NULL
-and the current KSE has no associated mailbox, i.e., the process is operating
-in traditional, unthreaded mode.
-.El
-.Pp
-The
-.Fn kse_thr_interrupt
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-The thread corresponding to
-.Fa tmbx
-is neither currently assigned to any KSE in the process nor blocked in the
-kernel.
-.El
-.Sh SEE ALSO
-.Xr rfork 2 ,
-.Xr pthread 3 ,
-.Xr ucontext 3
-.Rs
-.%A "Thomas E. Anderson"
-.%A "Brian N. Bershad"
-.%A "Edward D. Lazowska"
-.%A "Henry M. Levy"
-.%J "ACM Transactions on Computer Systems"
-.%N Issue 1
-.%V Volume 10
-.%D February 1992
-.%I ACM Press
-.%P pp. 53-79
-.%T "Scheduler activations: effective kernel support for the user-level management of parallelism"
-.Re
-.Sh HISTORY
-The KSE system calls first appeared in
-.Fx 5.0 .
-.Sh AUTHORS
-KSE was originally implemented by
-.An -nosplit
-.An "Julian Elischer" Aq julian@FreeBSD.org ,
-with additional contributions by
-.An "Jonathan Mini" Aq mini@FreeBSD.org ,
-.An "Daniel Eischen" Aq deischen@FreeBSD.org ,
-and
-.An "David Xu" Aq davidxu@FreeBSD.org .
-.Pp
-This manual page was written by
-.An "Archie Cobbs" Aq archie@FreeBSD.org .
-.Sh BUGS
-The KSE code is
-.Ud
diff --git a/lib/libc_bsd/sys/ktrace.2 b/lib/libc_bsd/sys/ktrace.2
deleted file mode 100644
index d6d18d4..0000000
--- a/lib/libc_bsd/sys/ktrace.2
+++ /dev/null
@@ -1,202 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"     @(#)ktrace.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/ktrace.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.Dd October 10, 2011
-.Dt KTRACE 2
-.Os
-.Sh NAME
-.Nm ktrace
-.Nd process tracing
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/time.h
-.In sys/uio.h
-.In sys/ktrace.h
-.Ft int
-.Fn ktrace "const char *tracefile" "int ops" "int trpoints" "int pid"
-.Sh DESCRIPTION
-The
-.Fn ktrace
-system call enables or disables tracing of one or more processes.
-Users may only trace their own processes.
-Only the super-user can trace setuid or setgid programs.
-.Pp
-The
-.Fa tracefile
-argument
-gives the pathname of the file to be used for tracing.
-The file must exist and be a regular file writable by the calling process.
-All trace records are always appended to the file,
-so the file must be truncated to zero length to discard
-previous trace data.
-If tracing points are being disabled (see KTROP_CLEAR below),
-.Fa tracefile
-may be NULL.
-.Pp
-The
-.Fa ops
-argument specifies the requested ktrace operation.
-The defined operations are:
-.Bl -column KTRFLAG_DESCENDXXX -offset indent
-.It KTROP_SET Ta "Enable trace points specified in"
-.Fa trpoints .
-.It KTROP_CLEAR Ta "Disable trace points specified in"
-.Fa trpoints .
-.It KTROP_CLEARFILE Ta "Stop all tracing."
-.It KTRFLAG_DESCEND Ta "The tracing change should apply to the"
-specified process and all its current children.
-.El
-.Pp
-The
-.Fa trpoints
-argument specifies the trace points of interest.
-The defined trace points are:
-.Bl -column KTRFAC_PROCCTORXXX -offset indent
-.It KTRFAC_SYSCALL Ta "Trace system calls."
-.It KTRFAC_SYSRET Ta "Trace return values from system calls."
-.It KTRFAC_NAMEI Ta "Trace name lookup operations."
-.It KTRFAC_GENIO Ta "Trace all I/O (note that this option can"
-generate much output).
-.It KTRFAC_PSIG Ta "Trace posted signals."
-.It KTRFAC_CSW Ta "Trace context switch points."
-.It KTRFAC_USER Ta "Trace application-specific events."
-.It KTRFAC_STRUCT Ta "Trace certain data structures."
-.It KTRFAC_SYSCTL Ta "Trace sysctls."
-.It KTRFAC_PROCCTOR Ta "Trace process construction."
-.It KTRFAC_PROCDTOR Ta "Trace process destruction."
-.It KTRFAC_CAPFAIL Ta "Trace capability failures."
-.It KTRFAC_INHERIT Ta "Inherit tracing to future children."
-.El
-.Pp
-Each tracing event outputs a record composed of a generic header
-followed by a trace point specific structure.
-The generic header is:
-.Bd -literal
-struct ktr_header {
-	int		ktr_len;		/* length of buf */
-	short		ktr_type;		/* trace record type */
-	pid_t		ktr_pid;		/* process id */
-	char		ktr_comm[MAXCOMLEN+1];	/* command name */
-	struct timeval	ktr_time;		/* timestamp */
-	intptr_t	ktr_tid;		/* was ktr_buffer */
-};
-.Ed
-.Pp
-The
-.Va ktr_len
-field specifies the length of the
-.Va ktr_type
-data that follows this header.
-The
-.Va ktr_pid
-and
-.Va ktr_comm
-fields specify the process and command generating the record.
-The
-.Va ktr_time
-field gives the time (with microsecond resolution)
-that the record was generated.
-The
-.Va ktr_tid
-field holds a thread id.
-.Pp
-The generic header is followed by
-.Va ktr_len
-bytes of a
-.Va ktr_type
-record.
-The type specific records are defined in the
-.In sys/ktrace.h
-include file.
-.Sh SYSCTL TUNABLES
-The following
-.Xr sysctl 8
-tunables influence the behaviour of
-.Fn ktrace :
-.Bl -tag -width indent
-.It Va kern.ktrace.geniosize
-bounds the amount of data a traced I/O request will log
-to the trace file.
-.It Va kern.ktrace.request_pool
-bounds the number of trace events being logged at a time.
-.El
-.Pp
-Sysctl tunables that control process debuggability (as determined by
-.Xr p_candebug 9 )
-also affect the operation of
-.Fn ktrace .
-.Sh RETURN VALUES
-.Rv -std ktrace
-.Sh ERRORS
-The
-.Fn ktrace
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named tracefile does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ENOSYS
-The kernel was not compiled with
-.Nm
-support.
-.El
-.Pp
-A thread may be unable to log one or more tracing events due to a
-temporary shortage of resources.
-This condition is remembered by the kernel, and the next tracing request
-that succeeds will have the flag
-.Li KTR_DROP
-set in its
-.Va ktr_type
-field.
-.Sh SEE ALSO
-.Xr kdump 1 ,
-.Xr ktrace 1 ,
-.Xr utrace 2 ,
-.Xr sysctl 8 ,
-.Xr p_candebug 9
-.Sh HISTORY
-The
-.Fn ktrace
-system call first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/sys/link.2 b/lib/libc_bsd/sys/link.2
deleted file mode 100644
index c23e96d..0000000
--- a/lib/libc_bsd/sys/link.2
+++ /dev/null
@@ -1,288 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)link.2	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/link.2 195763 2009-07-19 16:48:25Z jilles $
-.\"
-.Dd April 10, 2008
-.Dt LINK 2
-.Os
-.Sh NAME
-.Nm link ,
-.Nm linkat
-.Nd make a hard file link
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn link "const char *name1" "const char *name2"
-.Ft int
-.Fo linkat
-.Fa "int fd1" "const char *name1" "int fd2" "const char *name2" "int flag"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn link
-system call
-atomically creates the specified directory entry (hard link)
-.Fa name2
-with the attributes of the underlying object pointed at by
-.Fa name1 .
-If the link is successful: the link count of the underlying object
-is incremented;
-.Fa name1
-and
-.Fa name2
-share equal access and rights
-to the
-underlying object.
-.Pp
-If
-.Fa name1
-is removed, the file
-.Fa name2
-is not deleted and the link count of the
-underlying object is
-decremented.
-.Pp
-The object pointed at by the
-.Fa name1
-argument
-must exist for the hard link to
-succeed and
-both
-.Fa name1
-and
-.Fa name2
-must be in the same file system.
-The
-.Fa name1
-argument
-may not be a directory.
-.Pp
-The
-.Fn linkat
-system call is equivalent to
-.Fa link
-except in the case where either
-.Fa name1
-or
-.Fa name2
-or both are relative paths.
-In this case a relative path
-.Fa name1
-is interpreted relative to
-the directory associated with the file descriptor
-.Fa fd1
-instead of the current working directory and similarly for
-.Fa name2
-and the file descriptor
-.Fa fd2 .
-.Pp
-Values for
-.Fa flag
-are constructed by a bitwise-inclusive OR of flags from the following
-list, defined in
-.In fcntl.h :
-.Bl -tag -width indent
-.It Dv AT_SYMLINK_FOLLOW
-If
-.Fa name1
-names a symbolic link, a new link for the target of the symbolic link is
-created.
-.El
-.Pp
-If
-.Fn linkat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd1
-or
-.Fa fd2
-parameter, the current working directory is used for the respective
-.Fa name
-argument.
-If both
-.Fa fd1
-and
-.Fa fd2
-have value
-.Dv AT_FDCWD ,
-the behavior is identical to a call to
-.Fn link .
-Unless
-.Fa flag
-contains the
-.Dv AT_SYMLINK_FOLLOW
-flag, if
-.Fa name1
-names a symbolic link, a new link is created for the symbolic link
-.Fa name1
-and not its target.
-.Sh RETURN VALUES
-.Rv -std link
-.Sh ERRORS
-The
-.Fn link
-system call
-will fail and no link will be created if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of either path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of either pathname exceeded 255 characters,
-or entire length of either path name exceeded 1023 characters.
-.It Bq Er ENOENT
-A component of either path prefix does not exist.
-.It Bq Er EOPNOTSUPP
-The file system containing the file named by
-.Fa name1
-does not support links.
-.It Bq Er EMLINK
-The link count of the file named by
-.Fa name1
-would exceed 32767.
-.It Bq Er EACCES
-A component of either path prefix denies search permission.
-.It Bq Er EACCES
-The requested link requires writing in a directory with a mode
-that denies write permission.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating one of the pathnames.
-.It Bq Er ENOENT
-The file named by
-.Fa name1
-does not exist.
-.It Bq Er EEXIST
-The link named by
-.Fa name2
-does exist.
-.It Bq Er EPERM
-The file named by
-.Fa name1
-is a directory.
-.It Bq Er EPERM
-The file named by
-.Fa name1
-has its immutable or append-only flag set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EPERM
-The parent directory of the file named by
-.Fa name2
-has its immutable flag set.
-.It Bq Er EXDEV
-The link named by
-.Fa name2
-and the file named by
-.Fa name1
-are on different file systems.
-.It Bq Er ENOSPC
-The directory in which the entry for the new link is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-.It Bq Er EDQUOT
-The directory in which the entry for the new link
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to
-the file system to make the directory entry.
-.It Bq Er EROFS
-The requested link requires writing in a directory on a read-only file
-system.
-.It Bq Er EFAULT
-One of the pathnames specified
-is outside the process's allocated address space.
-.El
-.Pp
-In addition to the errors returned by the
-.Fn link ,
-the
-.Fn linkat
-system call may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa name1
-or
-.Fa name2
-argument does not specify an absolute path and the
-.Fa fd1
-or
-.Fa fd2
-argument, respectively, is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er EINVAL
-The value of the
-.Fa flag
-argument is not valid.
-.It Bq Er ENOTDIR
-The
-.Fa name1
-or
-.Fa name2
-argument is not an absolute path and
-.Fa fd1
-or
-.Fa fd2 ,
-respectively, is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr readlink 2 ,
-.Xr symlink 2 ,
-.Xr unlink 2
-.Sh STANDARDS
-The
-.Fn link
-system call is expected to conform to
-.St -p1003.1-90 .
-The
-.Fn linkat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn link
-function appeared in
-.At v7 .
-The
-.Fn linkat
-system call appeared in
-.Fx 8.0 .
-.Pp
-The
-.Fn link
-system call traditionally allows the super-user to link directories which
-corrupts the file system coherency.
-This implementation no longer permits it.
diff --git a/lib/libc_bsd/sys/lio_listio.2 b/lib/libc_bsd/sys/lio_listio.2
deleted file mode 100644
index 943bdd0..0000000
--- a/lib/libc_bsd/sys/lio_listio.2
+++ /dev/null
@@ -1,175 +0,0 @@
-.\" Copyright (c) 2003 Tim J. Robbins
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/lio_listio.2 163065 2006-10-07 05:13:32Z trhodes $
-.\"
-.Dd January 12, 2003
-.Dt LIO_LISTIO 2
-.Os
-.Sh NAME
-.Nm lio_listio
-.Nd "list directed I/O (REALTIME)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In aio.h
-.Ft int
-.Fo lio_listio
-.Fa "int mode"
-.Fa "struct aiocb * const list[]"
-.Fa "int nent"
-.Fa "struct sigevent *sig"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn lio_listio
-function initiates a list of I/O requests with a single function call.
-The
-.Fa list
-argument is an array of pointers to
-.Vt aiocb
-structures describing each operation to perform,
-with
-.Fa nent
-elements.
-.Dv NULL
-elements are ignored.
-.Pp
-The
-.Va aio_lio_opcode
-field of each
-.Vt aiocb
-specifies the operation to be performed.
-The following operations are supported:
-.Bl -tag -width ".Dv LIO_WRITE"
-.It Dv LIO_READ
-Read data as if by a call to
-.Xr aio_read 2 .
-.It Dv LIO_NOP
-No operation.
-.It Dv LIO_WRITE
-Write data as if by a call to
-.Xr aio_write 2 .
-.El
-.Pp
-If the
-.Fa mode
-argument is
-.Dv LIO_WAIT ,
-.Fn lio_listio
-does not return until all the requested operations have been completed.
-If
-.Fa mode
-is
-.Dv LIO_NOWAIT ,
-the requests are processed asynchronously, and the signal specified by
-.Fa sig
-is sent when all operations have completed.
-If
-.Fa sig
-is
-.Dv NULL ,
-the calling process is not notified of I/O completion.
-.Pp
-The order in which the requests are carried out is not specified;
-in particular, there is no guarantee that they will be executed in
-the order 0, 1, ...,
-.Fa nent Ns \-1 .
-.Sh RETURN VALUES
-If
-.Fa mode
-is
-.Dv LIO_WAIT ,
-the
-.Fn lio_listio
-function returns 0 if the operations completed successfully,
-otherwise \-1.
-.Pp
-If
-.Fa mode
-is
-.Dv LIO_NOWAIT ,
-the
-.Fn lio_listio
-function returns 0 if the operations are successfully queued,
-otherwise \-1.
-.Sh ERRORS
-The
-.Fn lio_listio
-function will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-There are not enough resources to enqueue the requests.
-.It Bq Er EAGAIN
-The request would cause the system-wide limit
-.Dv AIO_MAX
-to be exceeded.
-.It Bq Er EINVAL
-The
-.Fa mode
-argument is neither
-.Dv LIO_WAIT
-nor
-.Dv LIO_NOWAIT ,
-or
-.Fa nent
-is greater than
-.Dv AIO_LISTIO_MAX .
-.It Bq Er EINTR
-A signal interrupted the system call before it could be completed.
-.It Bq Er EIO
-One or more requests failed.
-.El
-.Pp
-In addition, the
-.Fn lio_listio
-function may fail for any of the reasons listed for
-.Xr aio_read 2
-and
-.Xr aio_write 2 .
-.Pp
-If
-.Fn lio_listio
-succeeds, or fails with an error code of
-.Er EAGAIN , EINTR ,
-or
-.Er EIO ,
-some of the requests may have been initiated.
-The caller should check the error status of each
-.Vt aiocb
-structure individually by calling
-.Xr aio_error 2 .
-.Sh SEE ALSO
-.Xr aio_error 2 ,
-.Xr aio_read 2 ,
-.Xr aio_write 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr siginfo 3 ,
-.Xr aio 4
-.Sh STANDARDS
-The
-.Fn lio_listio
-function is expected to conform to
-.St -p1003.1-2001 .
diff --git a/lib/libc_bsd/sys/listen.2 b/lib/libc_bsd/sys/listen.2
deleted file mode 100644
index a4ee219..0000000
--- a/lib/libc_bsd/sys/listen.2
+++ /dev/null
@@ -1,187 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"	From: @(#)listen.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/listen.2 269045 2014-07-24 05:59:32Z kevlo $
-.\"
-.Dd July 15, 2014
-.Dt LISTEN 2
-.Os
-.Sh NAME
-.Nm listen
-.Nd listen for connections on a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn listen "int s" "int backlog"
-.Sh DESCRIPTION
-To accept connections, a socket
-is first created with
-.Xr socket 2 ,
-a willingness to accept incoming connections and
-a queue limit for incoming connections are specified with
-.Fn listen ,
-and then the connections are
-accepted with
-.Xr accept 2 .
-The
-.Fn listen
-system call applies only to sockets of type
-.Dv SOCK_STREAM
-or
-.Dv SOCK_SEQPACKET .
-.Pp
-The
-.Fa backlog
-argument defines the maximum length the queue of
-pending connections may grow to.
-The real maximum queue length will be 1.5 times more than the value
-specified in the
-.Fa backlog
-argument.
-A subsequent
-.Fn listen
-system call on the listening socket allows the caller to change the maximum
-queue length using a new
-.Fa backlog
-argument.
-If a connection
-request arrives with the queue full the client may
-receive an error with an indication of
-.Er ECONNREFUSED ,
-or, in the case of TCP, the connection will be
-silently dropped.
-.Pp
-Current queue lengths of listening sockets can be queried using
-.Xr netstat 1
-command.
-.Pp
-Note that before
-.Fx 4.5
-and the introduction of the syncache,
-the
-.Fa backlog
-argument also determined the length of the incomplete
-connection queue, which held TCP sockets in the process
-of completing TCP's 3-way handshake.
-These incomplete connections
-are now held entirely in the syncache, which is unaffected by
-queue lengths.
-Inflated
-.Fa backlog
-values to help handle denial
-of service attacks are no longer necessary.
-.Pp
-The
-.Xr sysctl 3
-MIB variable
-.Va kern.ipc.soacceptqueue
-specifies a hard limit on
-.Fa backlog ;
-if a value greater than
-.Va kern.ipc.soacceptqueue
-or less than zero is specified,
-.Fa backlog
-is silently forced to
-.Va kern.ipc.soacceptqueue .
-.Sh INTERACTION WITH ACCEPT FILTERS
-When accept filtering is used on a socket, a second queue will
-be used to hold sockets that have connected, but have not yet
-met their accept filtering criteria.
-Once the criteria has been
-met, these sockets will be moved over into the completed connection
-queue to be
-.Xr accept 2 Ns ed .
-If this secondary queue is full and a
-new connection comes in, the oldest socket which has not yet met
-its accept filter criteria will be terminated.
-.Pp
-This secondary queue, like the primary listen queue, is sized
-according to the
-.Fa backlog
-argument.
-.Sh RETURN VALUES
-.Rv -std listen
-.Sh ERRORS
-The
-.Fn listen
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er EDESTADDRREQ
-The socket is not bound to a local address, and the protocol does not
-support listening on an unbound socket.
-.It Bq Er EINVAL
-The socket is already connected, or in the process of being connected.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.It Bq Er EOPNOTSUPP
-The socket is not of a type that supports the operation
-.Fn listen .
-.El
-.Sh SEE ALSO
-.Xr netstat 1 ,
-.Xr accept 2 ,
-.Xr connect 2 ,
-.Xr socket 2 ,
-.Xr sysctl 3 ,
-.Xr sysctl 8 ,
-.Xr accept_filter 9
-.Sh HISTORY
-The
-.Fn listen
-system call appeared in
-.Bx 4.2 .
-The ability to configure the maximum
-.Fa backlog
-at run-time, and to use a negative
-.Fa backlog
-to request the maximum allowable value, was introduced in
-.Fx 2.2 .
-The
-.Va kern.ipc.somaxconn
-.Xr sysctl 3
-has been replaced with
-.Va kern.ipc.soacceptqueue
-in
-.Fx 10.0
-to prevent confusion about its actual functionality.
-The original
-.Xr sysctl 3
-.Va kern.ipc.somaxconn
-is still available but hidden from a
-.Xr sysctl 3
--a output so that existing applications and scripts continue to work.
diff --git a/lib/libc_bsd/sys/lseek.2 b/lib/libc_bsd/sys/lseek.2
deleted file mode 100644
index 14e2045..0000000
--- a/lib/libc_bsd/sys/lseek.2
+++ /dev/null
@@ -1,209 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)lseek.2	8.3 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/lseek.2 236042 2012-05-26 05:25:55Z kib $
-.\"
-.Dd May 26, 2012
-.Dt LSEEK 2
-.Os
-.Sh NAME
-.Nm lseek
-.Nd reposition read/write file offset
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft off_t
-.Fn lseek "int fildes" "off_t offset" "int whence"
-.Sh DESCRIPTION
-The
-.Fn lseek
-system call repositions the offset of the file descriptor
-.Fa fildes
-to the
-argument
-.Fa offset
-according to the directive
-.Fa whence .
-The argument
-.Fa fildes
-must be an open
-file descriptor.
-The
-.Fn lseek
-system call
-repositions the file position pointer associated with the file
-descriptor
-.Fa fildes
-as follows:
-.Bl -item -offset indent
-.It
-If
-.Fa whence
-is
-.Dv SEEK_SET ,
-the offset is set to
-.Fa offset
-bytes.
-.It
-If
-.Fa whence
-is
-.Dv SEEK_CUR ,
-the offset is set to its current location plus
-.Fa offset
-bytes.
-.It
-If
-.Fa whence
-is
-.Dv SEEK_END ,
-the offset is set to the size of the
-file plus
-.Fa offset
-bytes.
-.It
-If
-.Fa whence
-is
-.Dv SEEK_HOLE ,
-the offset is set to the start of the next hole greater than or equal
-to the supplied
-.Fa offset .
-The definition of a hole is provided below.
-.It
-If
-.Fa whence
-is
-.Dv SEEK_DATA ,
-the offset is set to the start of the next non-hole file region greater
-than or equal to the supplied
-.Fa offset .
-.El
-.Pp
-The
-.Fn lseek
-system call allows the file offset to be set beyond the end
-of the existing end-of-file of the file.
-If data is later written
-at this point, subsequent reads of the data in the gap return
-bytes of zeros (until data is actually written into the gap).
-.Pp
-Some devices are incapable of seeking.
-The value of the pointer
-associated with such a device is undefined.
-.Pp
-A
-.Qq hole
-is defined as a contiguous range of bytes in a file, all having the value of
-zero, but not all zeros in a file are guaranteed to be represented as holes
-returned with
-.Dv SEEK_HOLE .
-File systems are allowed to expose ranges of zeros with
-.Dv SEEK_HOLE ,
-but not required to.
-Applications can use
-.Dv SEEK_HOLE
-to optimise their behavior for ranges of zeros, but must not depend on it to
-find all such ranges in a file.
-The existence of a hole at the end of every data region allows for easy
-programming and implies that a virtual hole exists at the end of the file.
-Applications should use
-.Fn fpathconf _PC_MIN_HOLE_SIZE
-or
-.Fn pathconf _PC_MIN_HOLE_SIZE
-to determine if a file system supports
-.Dv SEEK_HOLE .
-See
-.Xr pathconf 2 .
-.Pp
-For file systems that do not supply information about holes, the file will be
-represented as one entire data region.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn lseek
-returns the resulting offset location as measured in bytes from the
-beginning of the file.
-Otherwise,
-a value of -1 is returned and
-.Va errno
-is set to indicate
-the error.
-.Sh ERRORS
-The
-.Fn lseek
-system call
-will fail and the file position pointer will remain unchanged if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fildes
-argument
-is not an open file descriptor.
-.It Bq Er EINVAL
-The
-.Fa whence
-argument
-is not a proper value
-or the resulting file offset would
-be negative for a non-character special file.
-.It Bq Er ENXIO
-For
-.Dv SEEK_DATA ,
-there are no more data regions past the supplied offset.
-For
-.Dv SEEK_HOLE ,
-there are no more holes past the supplied offset.
-.It Bq Er EOVERFLOW
-The resulting file offset would be a value which cannot be represented
-correctly in an object of type
-.Fa off_t .
-.It Bq Er ESPIPE
-The
-.Fa fildes
-argument
-is associated with a pipe, socket, or FIFO.
-.El
-.Sh SEE ALSO
-.Xr dup 2 ,
-.Xr open 2 ,
-.Xr pathconf 2
-.Sh STANDARDS
-The
-.Fn lseek
-system call is expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn lseek
-function appeared in
-.At v7 .
-.Sh BUGS
-This document's use of
-.Fa whence
-is incorrect English, but is maintained for historical reasons.
diff --git a/lib/libc_bsd/sys/lseek.c b/lib/libc_bsd/sys/lseek.c
deleted file mode 100644
index 5398d72..0000000
--- a/lib/libc_bsd/sys/lseek.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lseek.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/lseek.c 171219 2007-07-04 23:27:38Z peter $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-off_t
-lseek(fd, offset, whence)
-	int	fd;
-	off_t	offset;
-	int	whence;
-{
-
-	if (__getosreldate() >= 700051)
-		return(__sys_lseek(fd, offset, whence));
-	else
-		return(__sys_freebsd6_lseek(fd, 0, offset, whence));
-}
diff --git a/lib/libc_bsd/sys/madvise.2 b/lib/libc_bsd/sys/madvise.2
deleted file mode 100644
index 97b0e40..0000000
--- a/lib/libc_bsd/sys/madvise.2
+++ /dev/null
@@ -1,186 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/madvise.2 261560 2014-02-06 19:47:17Z kib $
-.\"
-.Dd January 30, 2014
-.Dt MADVISE 2
-.Os
-.Sh NAME
-.Nm madvise , posix_madvise
-.Nd give advice about use of memory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn madvise "void *addr" "size_t len" "int behav"
-.Ft int
-.Fn posix_madvise "void *addr" "size_t len" "int behav"
-.Sh DESCRIPTION
-The
-.Fn madvise
-system call
-allows a process that has knowledge of its memory behavior
-to describe it to the system.
-The
-.Fn posix_madvise
-interface is identical, except it returns an error number on error and does
-not modify
-.Va errno ,
-and is provided for standards conformance.
-.Pp
-The known behaviors are:
-.Bl -tag -width MADV_SEQUENTIAL
-.It Dv MADV_NORMAL
-Tells the system to revert to the default paging
-behavior.
-.It Dv MADV_RANDOM
-Is a hint that pages will be accessed randomly, and prefetching
-is likely not advantageous.
-.It Dv MADV_SEQUENTIAL
-Causes the VM system to depress the priority of
-pages immediately preceding a given page when it is faulted in.
-.It Dv MADV_WILLNEED
-Causes pages that are in a given virtual address range
-to temporarily have higher priority, and if they are in
-memory, decrease the likelihood of them being freed.
-Additionally,
-the pages that are already in memory will be immediately mapped into
-the process, thereby eliminating unnecessary overhead of going through
-the entire process of faulting the pages in.
-This WILL NOT fault
-pages in from backing store, but quickly map the pages already in memory
-into the calling process.
-.It Dv MADV_DONTNEED
-Allows the VM system to decrease the in-memory priority
-of pages in the specified range.
-Additionally future references to
-this address range will incur a page fault.
-.It Dv MADV_FREE
-Gives the VM system the freedom to free pages,
-and tells the system that information in the specified page range
-is no longer important.
-This is an efficient way of allowing
-.Xr malloc 3
-to free pages anywhere in the address space, while keeping the address space
-valid.
-The next time that the page is referenced, the page might be demand
-zeroed, or might contain the data that was there before the
-.Dv MADV_FREE
-call.
-References made to that address space range will not make the VM system
-page the information back in from backing store until the page is
-modified again.
-.It Dv MADV_NOSYNC
-Request that the system not flush the data associated with this map to
-physical backing store unless it needs to.
-Typically this prevents the
-file system update daemon from gratuitously writing pages dirtied
-by the VM system to physical disk.
-Note that VM/file system coherency is
-always maintained, this feature simply ensures that the mapped data is
-only flush when it needs to be, usually by the system pager.
-.Pp
-This feature is typically used when you want to use a file-backed shared
-memory area to communicate between processes (IPC) and do not particularly
-need the data being stored in that area to be physically written to disk.
-With this feature you get the equivalent performance with mmap that you
-would expect to get with SysV shared memory calls, but in a more controllable
-and less restrictive manner.
-However, note that this feature is not portable
-across UNIX platforms (though some may do the right thing by default).
-For more information see the MAP_NOSYNC section of
-.Xr mmap 2
-.It Dv MADV_AUTOSYNC
-Undoes the effects of MADV_NOSYNC for any future pages dirtied within the
-address range.
-The effect on pages already dirtied is indeterminate - they
-may or may not be reverted.
-You can guarantee reversion by using the
-.Xr msync 2
-or
-.Xr fsync 2
-system calls.
-.It Dv MADV_NOCORE
-Region is not included in a core file.
-.It Dv MADV_CORE
-Include region in a core file.
-.It Dv MADV_PROTECT
-Informs the VM system this process should not be killed when the
-swap space is exhausted.
-The process must have superuser privileges.
-This should be used judiciously in processes that must remain running
-for the system to properly function.
-.El
-.Pp
-Portable programs that call the
-.Fn posix_madvise
-interface should use the aliases
-.Dv POSIX_MADV_NORMAL , POSIX_MADV_SEQUENTIAL ,
-.Dv POSIX_MADV_RANDOM , POSIX_MADV_WILLNEED ,
-and
-.Dv POSIX_MADV_DONTNEED
-rather than the flags described above.
-.Sh RETURN VALUES
-.Rv -std madvise
-.Sh ERRORS
-The
-.Fn madvise
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa behav
-argument is not valid.
-.It Bq Er ENOMEM
-The virtual address range specified by the
-.Fa addr
-and
-.Fa len
-arguments is not valid.
-.It Bq Er EPERM
-.Dv MADV_PROTECT
-was specified and the process does not have superuser privileges.
-.El
-.Sh SEE ALSO
-.Xr mincore 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr munmap 2 ,
-.Xr posix_fadvise 2
-.Sh STANDARDS
-The
-.Fn posix_madvise
-interface conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn madvise
-system call first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/sys/mincore.2 b/lib/libc_bsd/sys/mincore.2
deleted file mode 100644
index 9553f40..0000000
--- a/lib/libc_bsd/sys/mincore.2
+++ /dev/null
@@ -1,115 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)mincore.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mincore.2 177680 2008-03-28 04:29:27Z ps $
-.\"
-.Dd January 17, 2003
-.Dt MINCORE 2
-.Os
-.Sh NAME
-.Nm mincore
-.Nd determine residency of memory pages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn mincore "const void *addr" "size_t len" "char *vec"
-.Sh DESCRIPTION
-The
-.Fn mincore
-system call determines whether each of the pages in the region beginning at
-.Fa addr
-and continuing for
-.Fa len
-bytes is resident.
-.\"The beginning address,
-.\".Fa addr ,
-.\"is first rounded down to a multiple of the page size (see
-.\".Xr getpagesize 3 ) .
-.\"The end address,
-.\".Fa addr No + Fa len ,
-.\"is rounded up to a multiple of the page size.
-The status is returned in the
-.Fa vec
-array, one character per page.
-Each character is either 0 if the page is not resident, or a combination of
-the following flags (defined in
-.In sys/mman.h ) :
-.Bl -tag -width ".Dv MINCORE_REFERENCED_OTHER"
-.It Dv MINCORE_INCORE
-Page is in core (resident).
-.It Dv MINCORE_REFERENCED
-Page has been referenced by us.
-.It Dv MINCORE_MODIFIED
-Page has been modified by us.
-.It Dv MINCORE_REFERENCED_OTHER
-Page has been referenced.
-.It Dv MINCORE_MODIFIED_OTHER
-Page has been modified.
-.It Dv MINCORE_SUPER
-Page is part of a "super" page. (only i386 & amd64)
-.El
-.Pp
-The information returned by
-.Fn mincore
-may be out of date by the time the system call returns.
-The only way to ensure that a page is resident is to lock it into memory
-with the
-.Xr mlock 2
-system call.
-.Sh RETURN VALUES
-.Rv -std mincore
-.Sh ERRORS
-The
-.Fn mincore
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOMEM
-The virtual address range specified by the
-.Fa addr
-and
-.Fa len
-arguments is not fully mapped.
-.It Bq Er EFAULT
-The
-.Fa vec
-argument points to an illegal address.
-.El
-.Sh SEE ALSO
-.Xr madvise 2 ,
-.Xr mlock 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr munmap 2 ,
-.Xr getpagesize 3
-.Sh HISTORY
-The
-.Fn mincore
-system call first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/sys/minherit.2 b/lib/libc_bsd/sys/minherit.2
deleted file mode 100644
index f31f9d6..0000000
--- a/lib/libc_bsd/sys/minherit.2
+++ /dev/null
@@ -1,139 +0,0 @@
-.\" $FreeBSD: releng/10.2/lib/libc/sys/minherit.2 173184 2007-10-30 15:28:43Z keramida $
-.\"
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)minherit.2	8.1 (Berkeley) 6/9/93
-.\"
-.Dd October 30, 2007
-.Dt MINHERIT 2
-.Os
-.Sh NAME
-.Nm minherit
-.Nd control the inheritance of pages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn minherit "void *addr" "size_t len" "int inherit"
-.Sh DESCRIPTION
-The
-.Fn minherit
-system call
-changes the specified pages to have the inheritance characteristic
-.Fa inherit .
-Not all implementations will guarantee that the inheritance characteristic
-can be set on a page basis;
-the granularity of changes may be as large as an entire region.
-.Fx
-is capable of adjusting inheritance characteristics on a page basis.
-Inheritance only effects children created by
-.Fn fork .
-It has no effect on
-.Fn exec .
-exec'd processes replace their address space entirely.
-This system call also
-has no effect on the parent's address space (other than to potentially
-share the address space with its children).
-.Pp
-Inheritance is a rather esoteric feature largely superseded by the
-.Dv MAP_SHARED
-feature of
-.Fn mmap .
-However, it is possible to use
-.Fn minherit
-to share a block of memory between parent and child that has been mapped
-.Dv MAP_PRIVATE .
-That is, modifications made by parent or child are shared but
-the original underlying file is left untouched.
-.Bl -tag -width ".Dv INHERIT_SHARE"
-.It Dv INHERIT_SHARE
-This option causes the address space in question to be shared between
-parent and child.
-It has no effect on how the original underlying backing
-store was mapped.
-.It Dv INHERIT_NONE
-This option prevents the address space in question from being inherited
-at all.
-The address space will be unmapped in the child.
-.It Dv INHERIT_COPY
-This option causes the child to inherit the address space as copy-on-write.
-This option also has an unfortunate side effect of causing the parent
-address space to become copy-on-write when the parent forks.
-If the original mapping was
-.Dv MAP_SHARED ,
-it will no longer be shared in the parent
-after the parent forks and there is no way to get the previous
-shared-backing-store mapping without unmapping and remapping the address
-space in the parent.
-.El
-.Sh RETURN VALUES
-.Rv -std minherit
-.Sh ERRORS
-The
-.Fn minherit
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The virtual address range specified by the
-.Fa addr
-and
-.Fa len
-arguments is not valid.
-.It Bq Er EACCES
-The flags specified by the
-.Fa inherit
-argument were not valid for the pages specified
-by the
-.Fa addr
-and
-.Fa len
-arguments.
-.El
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr madvise 2 ,
-.Xr mincore 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr munmap 2 ,
-.Xr rfork 2
-.Sh HISTORY
-The
-.Fn minherit
-system call first appeared in
-.Ox
-and then in
-.Fx 2.2 .
-.Sh BUGS
-Once you set inheritance to
-.Dv MAP_PRIVATE
-or
-.Dv MAP_SHARED ,
-there is no way to recover the original copy-on-write semantics
-short of unmapping and remapping the area.
diff --git a/lib/libc_bsd/sys/mkdir.2 b/lib/libc_bsd/sys/mkdir.2
deleted file mode 100644
index df3fe7d..0000000
--- a/lib/libc_bsd/sys/mkdir.2
+++ /dev/null
@@ -1,176 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)mkdir.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mkdir.2 180113 2008-06-30 08:46:09Z danger $
-.\"
-.Dd June 26, 2008
-.Dt MKDIR 2
-.Os
-.Sh NAME
-.Nm mkdir ,
-.Nm mkdirat
-.Nd make a directory file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft int
-.Fn mkdir "const char *path" "mode_t mode"
-.Ft int
-.Fn mkdirat "int fd" "const char *path" "mode_t mode"
-.Sh DESCRIPTION
-The directory
-.Fa path
-is created with the access permissions specified by
-.Fa mode
-and restricted by the
-.Xr umask 2
-of the calling process.
-.Pp
-The directory's owner ID is set to the process's effective user ID.
-The directory's group ID is set to that of the parent directory in
-which it is created.
-.Pp
-The
-.Fn mkdirat
-system call is equivalent to
-.Fn mkdir
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the newly created directory is created relative to the
-directory associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-If
-.Fn mkdirat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is
-identical to a call to
-.Fn mkdir .
-.Sh RETURN VALUES
-.Rv -std mkdir
-.Sh ERRORS
-The
-.Fn mkdir
-system call
-will fail and no directory will be created if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-A component of the path prefix does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix,
-or write permission is denied
-on the parent directory of the directory to be created.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The parent directory of the directory to be created has its immutable flag set,
-see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EROFS
-The named directory would reside on a read-only file system.
-.It Bq Er EMLINK
-The new directory cannot be created because the parent directory contains
-too many subdirectories.
-.It Bq Er EEXIST
-The named file exists.
-.It Bq Er ENOSPC
-The new directory cannot be created because there is no space left
-on the file system that will contain the directory.
-.It Bq Er ENOSPC
-There are no free inodes on the file system on which the
-directory is being created.
-.It Bq Er EDQUOT
-The new directory cannot be created because the user's
-quota of disk blocks on the file system that will
-contain the directory has been exhausted.
-.It Bq Er EDQUOT
-The user's quota of inodes on the file system on
-which the directory is being created has been exhausted.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry or allocating the inode.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.El
-.Pp
-In addition to the errors returned by the
-.Fn mkdir ,
-the
-.Fn mkdirat
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr chmod 2 ,
-.Xr stat 2 ,
-.Xr umask 2
-.Sh STANDARDS
-The
-.Fn mkdir
-system call is expected to conform to
-.St -p1003.1-90 .
-The
-.Fn mkdirat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn mkdirat
-system call appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/mkfifo.2 b/lib/libc_bsd/sys/mkfifo.2
deleted file mode 100644
index 1828823..0000000
--- a/lib/libc_bsd/sys/mkfifo.2
+++ /dev/null
@@ -1,185 +0,0 @@
-.\" Copyright (c) 1990, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)mkfifo.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mkfifo.2 178245 2008-04-16 13:03:12Z kib $
-.\"
-.Dd April 10, 2008
-.Dt MKFIFO 2
-.Os
-.Sh NAME
-.Nm mkfifo ,
-.Nm mkfifoat
-.Nd make a fifo file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/stat.h
-.Ft int
-.Fn mkfifo "const char *path" "mode_t mode"
-.Ft int
-.Fn mkfifoat "int fd" "const char *path" "mode_t mode"
-.Sh DESCRIPTION
-The
-.Fn mkfifo
-system call
-creates a new fifo file with name
-.Fa path .
-The access permissions are
-specified by
-.Fa mode
-and restricted by the
-.Xr umask 2
-of the calling process.
-.Pp
-The fifo's owner ID is set to the process's effective user ID.
-The fifo's group ID is set to that of the parent directory in
-which it is created.
-.Pp
-The
-.Fn mkfifoat
-system call is equivalent to
-.Fn mkfifo
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the newly created FIFO is created relative to the
-directory associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-If
-.Fn mkfifoat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is
-identical to a call to
-.Fn mkfifo .
-.Sh RETURN VALUES
-.Rv -std mkfifo
-.Sh ERRORS
-The
-.Fn mkfifo
-system call
-will fail and no fifo will be created if:
-.Bl -tag -width Er
-.It Bq Er ENOTSUP
-The kernel has not been configured to support fifo's.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-A component of the path prefix does not exist.
-.It Bq Er EACCES
-A component of the path prefix denies search permission, or write permission
-is denied on the parent directory of the fifo to be created.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EROFS
-The named file would reside on a read-only file system.
-.It Bq Er EEXIST
-The named file exists.
-.It Bq Er EPERM
-The parent directory of the named file has its immutable flag set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er ENOSPC
-The directory in which the entry for the new fifo is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-.It Bq Er ENOSPC
-There are no free inodes on the file system on which the
-fifo is being created.
-.It Bq Er EDQUOT
-The directory in which the entry for the new fifo
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-.It Bq Er EDQUOT
-The user's quota of inodes on the file system on
-which the fifo is being created has been exhausted.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while making the directory entry or allocating the inode.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.El
-.Pp
-In addition to the errors returned by the
-.Fn mkfifo ,
-the
-.Fn mkfifoat
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr chmod 2 ,
-.Xr mknod 2 ,
-.Xr stat 2 ,
-.Xr umask 2
-.Sh STANDARDS
-The
-.Fn mkfifo
-system call is expected to conform to
-.St -p1003.1-90 .
-The
-.Fn mkfifoat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn mkfifoat
-system call appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/mknod.2 b/lib/libc_bsd/sys/mknod.2
deleted file mode 100644
index 0aa7d59..0000000
--- a/lib/libc_bsd/sys/mknod.2
+++ /dev/null
@@ -1,182 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)mknod.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mknod.2 217484 2011-01-16 21:59:50Z jilles $
-.\"
-.Dd January 16, 2011
-.Dt MKNOD 2
-.Os
-.Sh NAME
-.Nm mknod ,
-.Nm mknodat
-.Nd make a special file node
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft int
-.Fn mknod "const char *path" "mode_t mode" "dev_t dev"
-.Ft int
-.Fn mknodat "int fd" "const char *path" "mode_t mode" "dev_t dev"
-.Sh DESCRIPTION
-The file system node
-.Fa path
-is created with the file type and access permissions specified in
-.Fa mode .
-The access permissions are modified by the process's umask value.
-.Pp
-If
-.Fa mode
-indicates a block or character special file,
-.Fa dev
-is a configuration dependent specification denoting a particular device
-on the system.
-Otherwise,
-.Fa dev
-is ignored.
-.Pp
-The
-.Fn mknod
-system call
-requires super-user privileges.
-.Pp
-The
-.Fn mknodat
-system call is equivalent to
-.Fn mknod
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the newly created device node is created relative to the
-directory associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-If
-.Fn mknodat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is
-identical to a call to
-.Fn mknod .
-.Sh RETURN VALUES
-.Rv -std mknod
-.Sh ERRORS
-The
-.Fn mknod
-system call
-will fail and the file will be not created if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-A component of the path prefix does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The process's effective user ID is not super-user.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry or allocating the inode.
-.It Bq Er ENOSPC
-The directory in which the entry for the new node is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-.It Bq Er ENOSPC
-There are no free inodes on the file system on which the
-node is being created.
-.It Bq Er EDQUOT
-The directory in which the entry for the new node
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-.It Bq Er EDQUOT
-The user's quota of inodes on the file system on
-which the node is being created has been exhausted.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er EEXIST
-The named file exists.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-Creating anything else than a block or character special
-file (or a
-.Em whiteout )
-is not supported.
-.El
-.Pp
-In addition to the errors returned by the
-.Fn mknod ,
-the
-.Fn mknodat
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr mkfifo 2 ,
-.Xr stat 2 ,
-.Xr umask 2
-.Sh STANDARDS
-The
-.Fn mknodat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn mknod
-function appeared in
-.At v6 .
-The
-.Fn mknodat
-system call appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/mlock.2 b/lib/libc_bsd/sys/mlock.2
deleted file mode 100644
index 09804f6..0000000
--- a/lib/libc_bsd/sys/mlock.2
+++ /dev/null
@@ -1,183 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"	@(#)mlock.2	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mlock.2 266952 2014-06-01 18:41:33Z bjk $
-.\"
-.Dd May 17, 2014
-.Dt MLOCK 2
-.Os
-.Sh NAME
-.Nm mlock ,
-.Nm munlock
-.Nd lock (unlock) physical pages in memory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn mlock "const void *addr" "size_t len"
-.Ft int
-.Fn munlock "const void *addr" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn mlock
-system call
-locks into memory the physical pages associated with the virtual address
-range starting at
-.Fa addr
-for
-.Fa len
-bytes.
-The
-.Fn munlock
-system call unlocks pages previously locked by one or more
-.Fn mlock
-calls.
-For both, the
-.Fa addr
-argument should be aligned to a multiple of the page size.
-If the
-.Fa len
-argument is not a multiple of the page size, it will be rounded up
-to be so.
-The entire range must be allocated.
-.Pp
-After an
-.Fn mlock
-system call, the indicated pages will cause neither a non-resident page
-nor address-translation fault until they are unlocked.
-They may still cause protection-violation faults or TLB-miss faults on
-architectures with software-managed TLBs.
-The physical pages remain in memory until all locked mappings for the pages
-are removed.
-Multiple processes may have the same physical pages locked via their own
-virtual address mappings.
-A single process may likewise have pages multiply-locked via different virtual
-mappings of the same pages or via nested
-.Fn mlock
-calls on the same address range.
-Unlocking is performed explicitly by
-.Fn munlock
-or implicitly by a call to
-.Fn munmap
-which deallocates the unmapped address range.
-Locked mappings are not inherited by the child process after a
-.Xr fork 2 .
-.Pp
-Since physical memory is a potentially scarce resource, processes are
-limited in how much they can lock down.
-The amount of memory that a single process can
-.Fn mlock
-is limited by both the per-process
-.Dv RLIMIT_MEMLOCK
-resource limit and the
-system-wide
-.Dq wired pages
-limit
-.Va vm.max_wired .
-.Va vm.max_wired
-applies to the system as a whole, so the amount available to a single
-process at any given time is the difference between
-.Va vm.max_wired
-and
-.Va vm.stats.vm.v_wire_count .
-.Pp
-If
-.Va security.bsd.unprivileged_mlock
-is set to 0 these calls are only available to the super-user.
-.Sh RETURN VALUES
-.Rv -std
-.Pp
-If the call succeeds, all pages in the range become locked (unlocked);
-otherwise the locked status of all pages in the range remains unchanged.
-.Sh ERRORS
-The
-.Fn mlock
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-.Va security.bsd.unprivileged_mlock
-is set to 0 and the caller is not the super-user.
-.It Bq Er EINVAL
-The address given is not page aligned or the length is negative.
-.It Bq Er EAGAIN
-Locking the indicated range would exceed the system limit for locked memory.
-.It Bq Er ENOMEM
-Some portion of the indicated address range is not allocated.
-There was an error faulting/mapping a page.
-Locking the indicated range would exceed the per-process limit for locked
-memory.
-.El
-The
-.Fn munlock
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-.Va security.bsd.unprivileged_mlock
-is set to 0 and the caller is not the super-user.
-.It Bq Er EINVAL
-The address given is not page aligned or the length is negative.
-.It Bq Er ENOMEM
-Some or all of the address range specified by the addr and len
-arguments does not correspond to valid mapped pages in the address space
-of the process.
-.It Bq Er ENOMEM
-Locking the pages mapped by the specified range would exceed a limit on
-the amount of memory that the process may lock.
-.El
-.Sh "SEE ALSO"
-.Xr fork 2 ,
-.Xr mincore 2 ,
-.Xr minherit 2 ,
-.Xr mlockall 2 ,
-.Xr mmap 2 ,
-.Xr munlockall 2 ,
-.Xr munmap 2 ,
-.Xr setrlimit 2 ,
-.Xr getpagesize 3
-.Sh HISTORY
-The
-.Fn mlock
-and
-.Fn munlock
-system calls first appeared in
-.Bx 4.4 .
-.Sh BUGS
-Allocating too much wired memory can lead to a memory-allocation deadlock
-which requires a reboot to recover from.
-.Pp
-The per-process resource limit is a limit on the amount of virtual
-memory locked, while the system-wide limit is for the number of locked
-physical pages.
-Hence a process with two distinct locked mappings of the same physical page
-counts as 2 pages against the per-process limit and as only a single page
-in the system limit.
-.Pp
-The per-process resource limit is not currently supported.
diff --git a/lib/libc_bsd/sys/mlockall.2 b/lib/libc_bsd/sys/mlockall.2
deleted file mode 100644
index c430a46..0000000
--- a/lib/libc_bsd/sys/mlockall.2
+++ /dev/null
@@ -1,146 +0,0 @@
-.\"	$NetBSD: mlockall.2,v 1.11 2003/04/16 13:34:54 wiz Exp $
-.\"
-.\" Copyright (c) 1999 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
-.\" NASA Ames Research Center.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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: releng/10.2/lib/libc/sys/mlockall.2 244679 2012-12-25 13:43:01Z zont $
-.\"
-.Dd December 25, 2012
-.Dt MLOCKALL 2
-.Os
-.Sh NAME
-.Nm mlockall ,
-.Nm munlockall
-.Nd lock (unlock) the address space of a process
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn mlockall "int flags"
-.Ft int
-.Fn munlockall "void"
-.Sh DESCRIPTION
-The
-.Fn mlockall
-system call locks into memory the physical pages associated with the
-address space of a process until the address space is unlocked, the
-process exits, or execs another program image.
-.Pp
-The following flags affect the behavior of
-.Fn mlockall :
-.Bl -tag -width ".Dv MCL_CURRENT"
-.It Dv MCL_CURRENT
-Lock all pages currently mapped into the process's address space.
-.It Dv MCL_FUTURE
-Lock all pages mapped into the process's address space in the future,
-at the time the mapping is established.
-Note that this may cause future mappings to fail if those mappings
-cause resource limits to be exceeded.
-.El
-.Pp
-Since physical memory is a potentially scarce resource, processes are
-limited in how much they can lock down.
-A single process can lock the minimum of a system-wide
-.Dq wired pages
-limit
-.Va vm.max_wired
-and the per-process
-.Dv RLIMIT_MEMLOCK
-resource limit.
-.Pp
-If
-.Va security.bsd.unprivileged_mlock
-is set to 0 these calls are only available to the super-user.
-If
-.Va vm.old_mlock
-is set to 1 the per-process
-.Dv RLIMIT_MEMLOCK
-resource limit will not be applied for
-.Fn mlockall
-calls.
-.Pp
-The
-.Fn munlockall
-call unlocks any locked memory regions in the process address space.
-Any regions mapped after an
-.Fn munlockall
-call will not be locked.
-.Sh RETURN VALUES
-A return value of 0 indicates that the call
-succeeded and all pages in the range have either been locked or unlocked.
-A return value of \-1 indicates an error occurred and the locked
-status of all pages in the range remains unchanged.
-In this case, the global location
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Fn mlockall
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa flags
-argument is zero, or includes unimplemented flags.
-.It Bq Er ENOMEM
-Locking the indicated range would exceed either the system or per-process
-limit for locked memory.
-.It Bq Er EAGAIN
-Some or all of the memory mapped into the process's address space
-could not be locked when the call was made.
-.It Bq Er EPERM
-The calling process does not have the appropriate privilege to perform
-the requested operation.
-.El
-.Sh SEE ALSO
-.Xr mincore 2 ,
-.Xr mlock 2 ,
-.Xr mmap 2 ,
-.Xr munmap 2 ,
-.Xr setrlimit 2
-.Sh STANDARDS
-The
-.Fn mlockall
-and
-.Fn munlockall
-functions are believed to conform to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn mlockall
-and
-.Fn munlockall
-functions first appeared in
-.Fx 5.1 .
-.Sh BUGS
-The per-process resource limit is a limit on the amount of virtual
-memory locked, while the system-wide limit is for the number of locked
-physical pages.
-Hence a process with two distinct locked mappings of the same physical page
-counts as 2 pages against the per-process limit and as only a single page
-in the system limit.
diff --git a/lib/libc_bsd/sys/mmap.2 b/lib/libc_bsd/sys/mmap.2
deleted file mode 100644
index 52a6778..0000000
--- a/lib/libc_bsd/sys/mmap.2
+++ /dev/null
@@ -1,464 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)mmap.2	8.4 (Berkeley) 5/11/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mmap.2 275837 2014-12-16 20:05:10Z jhb $
-.\"
-.Dd September 17, 2014
-.Dt MMAP 2
-.Os
-.Sh NAME
-.Nm mmap
-.Nd allocate memory, or map files or devices into memory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft void *
-.Fn mmap "void *addr" "size_t len" "int prot" "int flags" "int fd" "off_t offset"
-.Sh DESCRIPTION
-The
-.Fn mmap
-system call causes the pages starting at
-.Fa addr
-and continuing for at most
-.Fa len
-bytes to be mapped from the object described by
-.Fa fd ,
-starting at byte offset
-.Fa offset .
-If
-.Fa len
-is not a multiple of the pagesize, the mapped region may extend past the
-specified range.
-Any such extension beyond the end of the mapped object will be zero-filled.
-.Pp
-If
-.Fa addr
-is non-zero, it is used as a hint to the system.
-(As a convenience to the system, the actual address of the region may differ
-from the address supplied.)
-If
-.Fa addr
-is zero, an address will be selected by the system.
-The actual starting address of the region is returned.
-A successful
-.Fa mmap
-deletes any previous mapping in the allocated address range.
-.Pp
-The protections (region accessibility) are specified in the
-.Fa prot
-argument by
-.Em or Ns 'ing
-the following values:
-.Pp
-.Bl -tag -width PROT_WRITE -compact
-.It Dv PROT_NONE
-Pages may not be accessed.
-.It Dv PROT_READ
-Pages may be read.
-.It Dv PROT_WRITE
-Pages may be written.
-.It Dv PROT_EXEC
-Pages may be executed.
-.El
-.Pp
-The
-.Fa flags
-argument specifies the type of the mapped object, mapping options and
-whether modifications made to the mapped copy of the page are private
-to the process or are to be shared with other references.
-Sharing, mapping type and options are specified in the
-.Fa flags
-argument by
-.Em or Ns 'ing
-the following values:
-.Bl -tag -width MAP_PREFAULT_READ
-.It Dv MAP_32BIT
-Request a region in the first 2GB of the current process's address space.
-If a suitable region cannot be found,
-.Fn mmap
-will fail.
-This flag is only available on 64-bit platforms.
-.It Dv MAP_ALIGNED Ns Pq Fa n
-Align the region on a requested boundary.
-If a suitable region cannot be found,
-.Fn mmap
-will fail.
-The
-.Fa n
-argument specifies the binary logarithm of the desired alignment.
-.It Dv MAP_ALIGNED_SUPER
-Align the region to maximize the potential use of large
-.Pq Dq super
-pages.
-If a suitable region cannot be found,
-.Fn mmap
-will fail.
-The system will choose a suitable page size based on the size of
-mapping.
-The page size used as well as the alignment of the region may both be
-affected by properties of the file being mapped.
-In particular,
-the physical address of existing pages of a file may require a specific
-alignment.
-The region is not guaranteed to be aligned on any specific boundary.
-.It Dv MAP_ANON
-Map anonymous memory not associated with any specific file.
-The file descriptor used for creating
-.Dv MAP_ANON
-must be \-1.
-The
-.Fa offset
-argument must be 0.
-.\".It Dv MAP_FILE
-.\"Mapped from a regular file or character-special device memory.
-.It Dv MAP_ANONYMOUS
-This flag is identical to
-.Dv MAP_ANON
-and is provided for compatibility.
-.It Dv MAP_EXCL
-This flag can only be used in combination with
-.Dv MAP_FIXED .
-Please see the definition of
-.Dv MAP_FIXED
-for the description of its effect.
-.It Dv MAP_FIXED
-Do not permit the system to select a different address than the one
-specified.
-If the specified address cannot be used,
-.Fn mmap
-will fail.
-If
-.Dv MAP_FIXED
-is specified,
-.Fa addr
-must be a multiple of the pagesize.
-If
-.Dv MAP_EXCL
-is not specified, a successfull
-.Dv MAP_FIXED
-request replaces any previous mappings for the process'
-pages in the range from
-.Fa addr
-to
-.Fa addr
-+
-.Fa len .
-In contrast, if
-.Dv MAP_EXCL
-is specified, the request will fail if a mapping
-already exists within the range.
-.It Dv MAP_HASSEMAPHORE
-Notify the kernel that the region may contain semaphores and that special
-handling may be necessary.
-.It Dv MAP_NOCORE
-Region is not included in a core file.
-.It Dv MAP_NOSYNC
-Causes data dirtied via this VM map to be flushed to physical media
-only when necessary (usually by the pager) rather than gratuitously.
-Typically this prevents the update daemons from flushing pages dirtied
-through such maps and thus allows efficient sharing of memory across
-unassociated processes using a file-backed shared memory map.
-Without
-this option any VM pages you dirty may be flushed to disk every so often
-(every 30-60 seconds usually) which can create performance problems if you
-do not need that to occur (such as when you are using shared file-backed
-mmap regions for IPC purposes).
-Note that VM/file system coherency is
-maintained whether you use
-.Dv MAP_NOSYNC
-or not.
-This option is not portable
-across
-.Ux
-platforms (yet), though some may implement the same behavior
-by default.
-.Pp
-.Em WARNING !
-Extending a file with
-.Xr ftruncate 2 ,
-thus creating a big hole, and then filling the hole by modifying a shared
-.Fn mmap
-can lead to severe file fragmentation.
-In order to avoid such fragmentation you should always pre-allocate the
-file's backing store by
-.Fn write Ns ing
-zero's into the newly extended area prior to modifying the area via your
-.Fn mmap .
-The fragmentation problem is especially sensitive to
-.Dv MAP_NOSYNC
-pages, because pages may be flushed to disk in a totally random order.
-.Pp
-The same applies when using
-.Dv MAP_NOSYNC
-to implement a file-based shared memory store.
-It is recommended that you create the backing store by
-.Fn write Ns ing
-zero's to the backing file rather than
-.Fn ftruncate Ns ing
-it.
-You can test file fragmentation by observing the KB/t (kilobytes per
-transfer) results from an
-.Dq Li iostat 1
-while reading a large file sequentially, e.g.\& using
-.Dq Li dd if=filename of=/dev/null bs=32k .
-.Pp
-The
-.Xr fsync 2
-system call will flush all dirty data and metadata associated with a file,
-including dirty NOSYNC VM data, to physical media.
-The
-.Xr sync 8
-command and
-.Xr sync 2
-system call generally do not flush dirty NOSYNC VM data.
-The
-.Xr msync 2
-system call is usually not needed since
-.Bx
-implements a coherent file system buffer cache.
-However, it may be
-used to associate dirty VM pages with file system buffers and thus cause
-them to be flushed to physical media sooner rather than later.
-.It Dv MAP_PREFAULT_READ
-Immediately update the calling process's lowest-level virtual address
-translation structures, such as its page table, so that every memory
-resident page within the region is mapped for read access.
-Ordinarily these structures are updated lazily.
-The effect of this option is to eliminate any soft faults that would
-otherwise occur on the initial read accesses to the region.
-Although this option does not preclude
-.Fa prot
-from including
-.Dv PROT_WRITE ,
-it does not eliminate soft faults on the initial write accesses to the
-region.
-.It Dv MAP_PRIVATE
-Modifications are private.
-.It Dv MAP_SHARED
-Modifications are shared.
-.It Dv MAP_STACK
-.Dv MAP_STACK
-implies
-.Dv MAP_ANON ,
-and
-.Fa offset
-of 0.
-The
-.Fa fd
-argument
-must be -1 and
-.Fa prot
-must include at least
-.Dv PROT_READ
-and
-.Dv PROT_WRITE .
-This option creates
-a memory region that grows to at most
-.Fa len
-bytes in size, starting from the stack top and growing down.
-The
-stack top is the starting address returned by the call, plus
-.Fa len
-bytes.
-The bottom of the stack at maximum growth is the starting
-address returned by the call.
-.El
-.Pp
-The
-.Xr close 2
-system call does not unmap pages, see
-.Xr munmap 2
-for further information.
-.Sh NOTES
-Although this implementation does not impose any alignment restrictions on
-the
-.Fa offset
-argument, a portable program must only use page-aligned values.
-.Pp
-Large page mappings require that the pages backing an object be
-aligned in matching blocks in both the virtual address space and RAM.
-The system will automatically attempt to use large page mappings when
-mapping an object that is already backed by large pages in RAM by
-aligning the mapping request in the virtual address space to match the
-alignment of the large physical pages.
-The system may also use large page mappings when mapping portions of an
-object that are not yet backed by pages in RAM.
-The
-.Dv MAP_ALIGNED_SUPER
-flag is an optimization that will align the mapping request to the
-size of a large page similar to
-.Dv MAP_ALIGNED ,
-except that the system will override this alignment if an object already
-uses large pages so that the mapping will be consistent with the existing
-large pages.
-This flag is mostly useful for maximizing the use of large pages on the
-first mapping of objects that do not yet have pages present in RAM.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn mmap
-returns a pointer to the mapped region.
-Otherwise, a value of
-.Dv MAP_FAILED
-is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn mmap
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The flag
-.Dv PROT_READ
-was specified as part of the
-.Fa prot
-argument and
-.Fa fd
-was not open for reading.
-The flags
-.Dv MAP_SHARED
-and
-.Dv PROT_WRITE
-were specified as part of the
-.Fa flags
-and
-.Fa prot
-argument and
-.Fa fd
-was not open for writing.
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid open file descriptor.
-.It Bq Er EINVAL
-An invalid value was passed in the
-.Fa prot
-argument.
-.It Bq Er EINVAL
-An undefined option was set in the
-.Fa flags
-argument.
-.It Bq Er EINVAL
-Both
-.Dv MAP_PRIVATE
-and
-.Dv MAP_SHARED
-were specified.
-.It Bq Er EINVAL
-None of
-.Dv MAP_ANON ,
-.Dv MAP_PRIVATE ,
-.Dv MAP_SHARED ,
-or
-.Dv MAP_STACK
-was specified.
-At least one of these flags must be included.
-.It Bq Er EINVAL
-.Dv MAP_FIXED
-was specified and the
-.Fa addr
-argument was not page aligned, or part of the desired address space
-resides out of the valid address space for a user process.
-.It Bq Er EINVAL
-Both
-.Dv MAP_FIXED
-and
-.Dv MAP_32BIT
-were specified and part of the desired address space resides outside
-of the first 2GB of user address space.
-.It Bq Er EINVAL
-The
-.Fa len
-argument
-was equal to zero.
-.It Bq Er EINVAL
-.Dv MAP_ALIGNED
-was specified and the desired alignment was either larger than the
-virtual address size of the machine or smaller than a page.
-.It Bq Er EINVAL
-.Dv MAP_ANON
-was specified and the
-.Fa fd
-argument was not -1.
-.It Bq Er EINVAL
-.Dv MAP_ANON
-was specified and the
-.Fa offset
-argument was not 0.
-.It Bq Er EINVAL
-Both
-.Dv MAP_FIXED
-and
-.Dv MAP_EXCL
-were specified, but the requested region is already used by a mapping.
-.It Bq Er EINVAL
-.Dv MAP_EXCL
-was specified, but
-.Dv MAP_FIXED
-was not.
-.It Bq Er ENODEV
-.Dv MAP_ANON
-has not been specified and
-.Fa fd
-did not reference a regular or character special file.
-.It Bq Er ENOMEM
-.Dv MAP_FIXED
-was specified and the
-.Fa addr
-argument was not available.
-.Dv MAP_ANON
-was specified and insufficient memory was available.
-.El
-.Sh SEE ALSO
-.Xr madvise 2 ,
-.Xr mincore 2 ,
-.Xr minherit 2 ,
-.Xr mlock 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr munlock 2 ,
-.Xr munmap 2 ,
-.Xr getpagesize 3 ,
-.Xr getpagesizes 3
-.Sh BUGS
-The
-.Fa len
-argument
-is limited to the maximum file size or available userland address
-space.
-Files may not be able to be made more than 1TB large on 32 bit systems
-due to file systems restrictions and bugs, but address space is far more
-restrictive.
-Larger files may be possible on 64 bit systems.
-.Pp
-The previous documented limit of 2GB was a documentation bug.
-That limit has not existed since
-.Fx 2.2 .
diff --git a/lib/libc_bsd/sys/mmap.c b/lib/libc_bsd/sys/mmap.c
deleted file mode 100644
index ab76eb9..0000000
--- a/lib/libc_bsd/sys/mmap.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/mmap.c 267900 2014-06-26 08:27:01Z kib $");
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-void *
-mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
-
-	if (__getosreldate() >= 700051) {
-		return (__sys_mmap(addr, len, prot, flags, fd, offset));
-	} else {
-		return (__sys_freebsd6_mmap(addr, len, prot, flags, fd, 0,
-		    offset));
-	}
-}
diff --git a/lib/libc_bsd/sys/modfind.2 b/lib/libc_bsd/sys/modfind.2
deleted file mode 100644
index 7fb9087..0000000
--- a/lib/libc_bsd/sys/modfind.2
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Chris Costello
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/modfind.2 108028 2002-12-18 09:22:32Z ru $
-.\"
-.Dd September 28, 2000
-.Dt MODFIND 2
-.Os
-.Sh NAME
-.Nm modfind
-.Nd returns the modid of a kernel module
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/module.h
-.Ft int
-.Fn modfind "const char *modname"
-.Sh DESCRIPTION
-The
-.Fn modfind
-system call
-returns the modid of the kernel module referenced by
-.Fa modname .
-.Sh RETURN VALUES
-The
-.Fn modfind
-system call
-returns the modid of the kernel module referenced by
-.Fa file .
-Upon error,
-.Fn modfind
-returns -1 and sets
-.Va errno
-to indicate the error.
-.Sh ERRORS
-.Va errno
-is set to the following if
-.Fn modfind
-fails:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The data required for this operation could not be read from the kernel space.
-.It Bq Er ENOENT
-The file specified is not loaded in the kernel.
-.El
-.Sh SEE ALSO
-.Xr kldfind 2 ,
-.Xr kldfirstmod 2 ,
-.Xr kldload 2 ,
-.Xr kldnext 2 ,
-.Xr kldstat 2 ,
-.Xr kldsym 2 ,
-.Xr kldunload 2 ,
-.Xr modfnext 2 ,
-.Xr modnext 2 ,
-.Xr modstat 2 ,
-.Xr kld 4 ,
-.Xr kldstat 8
-.Sh HISTORY
-The
-.Nm kld
-interface first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/modnext.2 b/lib/libc_bsd/sys/modnext.2
deleted file mode 100644
index 29389bf..0000000
--- a/lib/libc_bsd/sys/modnext.2
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Chris Costello
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/modnext.2 141846 2005-02-13 22:25:33Z ru $
-.\"
-.Dd September 28, 2000
-.Dt MODNEXT 2
-.Os
-.Sh NAME
-.Nm modnext
-.Nd return the modid of the next kernel module
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/module.h
-.Ft int
-.Fn modnext "int modid"
-.Ft int
-.Fn modfnext "int modid"
-.Sh DESCRIPTION
-The
-.Fn modnext
-system call
-returns the modid of the next kernel module (that is, the one after
-.Va modid )
-or 0 if
-.Va modid
-is the last module in the list.
-.Pp
-If the
-.Va modid
-value is 0, then
-.Fn modnext
-will return the modid of the first module.
-The
-.Fn modfnext
-system call
-must always be given a valid modid.
-.Sh RETURN VALUES
-The
-.Fn modnext
-system call
-returns the modid of the next module (see
-.Sx DESCRIPTION )
-or 0.
-If an error
-occurs,
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The only error set by
-.Fn modnext
-is
-.Er ENOENT ,
-which is set when
-.Va modid
-refers to a kernel module that does not exist (is not loaded).
-.Sh SEE ALSO
-.Xr kldfind 2 ,
-.Xr kldfirstmod 2 ,
-.Xr kldload 2 ,
-.Xr kldnext 2 ,
-.Xr kldstat 2 ,
-.Xr kldsym 2 ,
-.Xr kldunload 2 ,
-.Xr modfind 2 ,
-.Xr modstat 2 ,
-.Xr kld 4 ,
-.Xr kldstat 8
-.Sh HISTORY
-The
-.Nm kld
-interface first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/modstat.2 b/lib/libc_bsd/sys/modstat.2
deleted file mode 100644
index 117b03f..0000000
--- a/lib/libc_bsd/sys/modstat.2
+++ /dev/null
@@ -1,127 +0,0 @@
-.\"
-.\" Copyright (c) 1999 Chris Costello
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/modstat.2 213573 2010-10-08 12:40:16Z uqs $
-.\"
-.Dd July 15, 2008
-.Dt MODSTAT 2
-.Os
-.Sh NAME
-.Nm modstat
-.Nd get status of kernel module
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/module.h
-.Ft int
-.Fn modstat "int modid" "struct module_stat *stat"
-.Sh DESCRIPTION
-The
-.Fn modstat
-system call writes the info for the kernel module referred to by
-.Fa modid
-into
-.Fa stat .
-.Bd -literal
-struct module_stat {
-	int         version;        /* set to sizeof(module_stat) */
-	char        name[MAXMODNAME];
-	int         refs;
-	int         id;
-	modspecific_t data;
-};
-typedef union modspecific {
-	int         intval;
-	u_int       uintval;
-	long        longval;
-	u_long      ulongval;
-} modspecific_t;
-.Ed
-.Bl -tag -width XXXaddress
-.It version
-This field is set to the size of the structure mentioned above by the code
-calling
-.Fn modstat ,
-and not
-.Fn modstat
-itself.
-.It name
-The name of the module referred to by
-.Fa modid .
-.It refs
-The number of modules referenced by
-.Fa modid .
-.It id
-The id of the module specified in
-.Fa modid .
-.It data
-Module specific data.
-.El
-.Sh RETURN VALUES
-.Rv -std modstat
-.Sh ERRORS
-The information for the module referred to by
-.Fa modid
-is filled into the structure pointed to by
-.Fa stat
-unless:
-.Bl -tag -width Er
-.It Bq Er ENOENT
-The module was not found (probably not loaded).
-.It Bq Er EINVAL
-The version specified in the
-.Fa version
-field of stat is not the proper version.
-You would need to rebuild world, the
-kernel, or your application, if this error occurs, given that you did properly
-fill in the
-.Fa version
-field.
-.It Bq Er EFAULT
-There was a problem copying one, some, or all of the fields into
-.Fa stat
-in the
-.Xr copyout 9
-function.
-.El
-.Sh SEE ALSO
-.Xr kldfind 2 ,
-.Xr kldfirstmod 2 ,
-.Xr kldload 2 ,
-.Xr kldnext 2 ,
-.Xr kldstat 2 ,
-.Xr kldsym 2 ,
-.Xr kldunload 2 ,
-.Xr modfind 2 ,
-.Xr modfnext 2 ,
-.Xr modnext 2 ,
-.Xr kld 4 ,
-.Xr kldstat 8
-.Sh HISTORY
-The
-.Nm kld
-interface first appeared in
-.Fx 3.0 .
diff --git a/lib/libc_bsd/sys/mount.2 b/lib/libc_bsd/sys/mount.2
deleted file mode 100644
index f16bcf4..0000000
--- a/lib/libc_bsd/sys/mount.2
+++ /dev/null
@@ -1,378 +0,0 @@
-.\" Copyright (c) 1980, 1989, 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.
-.\" 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.
-.\"
-.\"     @(#)mount.2	8.3 (Berkeley) 5/24/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mount.2 281729 2015-04-19 07:46:32Z pluknet $
-.\"
-.Dd April 13, 2015
-.Dt MOUNT 2
-.Os
-.Sh NAME
-.Nm mount ,
-.Nm nmount ,
-.Nm unmount
-.Nd mount or dismount a file system
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/mount.h
-.Ft int
-.Fn mount "const char *type" "const char *dir" "int flags" "void *data"
-.Ft int
-.Fn unmount "const char *dir" "int flags"
-.In sys/uio.h
-.Ft int
-.Fn nmount "struct iovec *iov" "u_int niov" "int flags"
-.Sh DESCRIPTION
-The
-.Fn mount
-system call grafts
-a file system object onto the system file tree
-at the point
-.Fa dir .
-The argument
-.Fa data
-describes the file system object to be mounted.
-The argument
-.Fa type
-tells the kernel how to interpret
-.Fa data
-(See
-.Fa type
-below).
-The contents of the file system
-become available through the new mount point
-.Fa dir .
-Any files in
-.Fa dir
-at the time
-of a successful mount are swept under the carpet so to speak, and
-are unavailable until the file system is unmounted.
-.Pp
-The
-.Fn nmount
-system call behaves similarly to
-.Fn mount ,
-except that the mount options (file system type name, device to mount,
-mount-point name, etc.) are passed as an array of name-value pairs
-in the array
-.Fa iov ,
-containing
-.Fa niov
-elements.
-The following options are required by all file systems:
-.Bl -column fstype -offset indent
-.It
-.Li fstype Ta file system type name (e.g., Dq Li procfs )
-.It
-.Li fspath Ta mount point pathname (e.g., Dq Li /proc )
-.El
-.Pp
-Depending on the file system type, other options may be
-recognized or required;
-for example, most disk-based file systems require a
-.Dq Li from
-option containing the pathname of a special device
-in addition to the options listed above.
-.Pp
-By default only the super-user may call the
-.Fn mount
-system call.
-This restriction can be removed by setting the
-.Va vfs.usermount
-.Xr sysctl 8
-variable
-to a non-zero value; see the BUGS section for more information.
-.Pp
-The following
-.Fa flags
-may be specified to
-suppress default semantics which affect file system access.
-.Bl -tag -width MNT_SYNCHRONOUS
-.It Dv MNT_RDONLY
-The file system should be treated as read-only;
-even the super-user may not write on it.
-Specifying MNT_UPDATE without this option will upgrade
-a read-only file system to read/write.
-.It Dv MNT_NOEXEC
-Do not allow files to be executed from the file system.
-.It Dv MNT_NOSUID
-Do not honor setuid or setgid bits on files when executing them.
-This flag is set automatically when the caller is not the super-user.
-.It Dv MNT_NOATIME
-Disable update of file access times.
-.It Dv MNT_SNAPSHOT
-Create a snapshot of the file system.
-This is currently only supported on UFS2 file systems, see
-.Xr mksnap_ffs 8
-for more information.
-.It Dv MNT_SUIDDIR
-Directories with the SUID bit set chown new files to their own owner.
-This flag requires the SUIDDIR option to have been compiled into the kernel
-to have any effect.
-See the
-.Xr mount 8
-and
-.Xr chmod 2
-pages for more information.
-.It Dv MNT_SYNCHRONOUS
-All I/O to the file system should be done synchronously.
-.It Dv MNT_ASYNC
-All I/O to the file system should be done asynchronously.
-.It Dv MNT_FORCE
-Force a read-write mount even if the file system appears to be unclean.
-Dangerous.
-Together with
-.Dv MNT_UPDATE
-and
-.Dv MNT_RDONLY ,
-specify that the file system is to be forcibly downgraded to a read-only
-mount even if some files are open for writing.
-.It Dv MNT_NOCLUSTERR
-Disable read clustering.
-.It Dv MNT_NOCLUSTERW
-Disable write clustering.
-.El
-.Pp
-The flag
-.Dv MNT_UPDATE
-indicates that the mount command is being applied
-to an already mounted file system.
-This allows the mount flags to be changed without requiring
-that the file system be unmounted and remounted.
-Some file systems may not allow all flags to be changed.
-For example,
-many file systems will not allow a change from read-write to read-only.
-.Pp
-The flag
-.Dv MNT_RELOAD
-causes the vfs subsystem to update its data structures pertaining to
-the specified already mounted file system.
-.Pp
-The
-.Fa type
-argument names the file system.
-The types of file systems known to the system can be obtained with
-.Xr lsvfs 1 .
-.Pp
-The
-.Fa data
-argument
-is a pointer to a structure that contains the type
-specific arguments to mount.
-The format for these argument structures is described in the
-manual page for each file system.
-By convention file system manual pages are named
-by prefixing ``mount_'' to the name of the file system as returned by
-.Xr lsvfs 1 .
-Thus the
-.Tn NFS
-file system is described by the
-.Xr mount_nfs 8
-manual page.
-It should be noted that a manual page for default
-file systems, known as UFS and UFS2, does not exist.
-.Pp
-The
-.Fn unmount
-system call disassociates the file system from the specified
-mount point
-.Fa dir .
-.Pp
-The
-.Fa flags
-argument may include
-.Dv MNT_FORCE
-to specify that the file system should be forcibly unmounted
-even if files are still active.
-Active special devices continue to work,
-but any further accesses to any other active files result in errors
-even if the file system is later remounted.
-.Pp
-If the
-.Dv MNT_BYFSID
-flag is specified,
-.Fa dir
-should instead be a file system ID encoded as
-.Dq Li FSID : Ns Ar val0 : Ns Ar val1 ,
-where
-.Ar val0
-and
-.Ar val1
-are the contents of the
-.Vt fsid_t
-.Va val[]
-array in decimal.
-The file system that has the specified file system ID will be unmounted.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn mount
-and
-.Fn nmount
-system calls will fail when one of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The caller is neither the super-user nor the owner of
-.Fa dir .
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or the entire length of a path name exceeded 1023 characters.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating a pathname.
-.It Bq Er ENOENT
-A component of
-.Fa dir
-does not exist.
-.It Bq Er ENOTDIR
-A component of
-.Fa name
-is not a directory,
-or a path prefix of
-.Fa special
-is not a directory.
-.It Bq Er EBUSY
-Another process currently holds a reference to
-.Fa dir .
-.It Bq Er EFAULT
-The
-.Fa dir
-argument
-points outside the process's allocated address space.
-.El
-.Pp
-The following errors can occur for a
-.Em ufs
-file system mount:
-.Bl -tag -width Er
-.It Bq Er ENODEV
-A component of ufs_args
-.Fa fspec
-does not exist.
-.It Bq Er ENOTBLK
-The
-.Fa fspec
-argument
-is not a block device.
-.It Bq Er ENXIO
-The major device number of
-.Fa fspec
-is out of range (this indicates no device driver exists
-for the associated hardware).
-.It Bq Er EBUSY
-.Fa fspec
-is already mounted.
-.It Bq Er EMFILE
-No space remains in the mount table.
-.It Bq Er EINVAL
-The super block for the file system had a bad magic
-number or an out of range block size.
-.It Bq Er ENOMEM
-Not enough memory was available to read the cylinder
-group information for the file system.
-.It Bq Er EIO
-An I/O error occurred while reading the super block or
-cylinder group information.
-.It Bq Er EFAULT
-The
-.Fa fspec
-argument
-points outside the process's allocated address space.
-.El
-.Pp
-The following errors can occur for a
-.Em nfs
-file system mount:
-.Bl -tag -width Er
-.It Bq Er ETIMEDOUT
-.Em Nfs
-timed out trying to contact the server.
-.It Bq Er EFAULT
-Some part of the information described by nfs_args
-points outside the process's allocated address space.
-.El
-.Pp
-The
-.Fn unmount
-system call may fail with one of the following errors:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The caller is neither the super-user nor the user who issued the corresponding
-.Fn mount
-call.
-.It Bq Er ENAMETOOLONG
-The length of the path name exceeded 1023 characters.
-.It Bq Er EINVAL
-The requested directory is not in the mount table.
-.It Bq Er ENOENT
-The file system ID specified using
-.Dv MNT_BYFSID
-was not found in the mount table.
-.It Bq Er EINVAL
-The file system ID specified using
-.Dv MNT_BYFSID
-could not be decoded.
-.It Bq Er EINVAL
-The specified file system is the root file system.
-.It Bq Er EBUSY
-A process is holding a reference to a file located
-on the file system.
-.It Bq Er EIO
-An I/O error occurred while writing cached file system information.
-.It Bq Er EFAULT
-The
-.Fa dir
-argument
-points outside the process's allocated address space.
-.El
-.Sh SEE ALSO
-.Xr lsvfs 1 ,
-.Xr mksnap_ffs 8 ,
-.Xr mount 8 ,
-.Xr umount 8
-.Sh HISTORY
-The
-.Fn mount
-and
-.Fn unmount
-functions appeared in
-.At v6 .
-The
-.Fn nmount
-system call first appeared in
-.Fx 5.0 .
-.Sh BUGS
-Some of the error codes need translation to more obvious messages.
-.Pp
-Allowing untrusted users to mount arbitrary media, e.g. by enabling
-.Va vfs.usermount ,
-should not be considered safe.
-Most file systems in
-.Fx
-were not built to safeguard against malicious devices.
diff --git a/lib/libc_bsd/sys/mprotect.2 b/lib/libc_bsd/sys/mprotect.2
deleted file mode 100644
index dd43890..0000000
--- a/lib/libc_bsd/sys/mprotect.2
+++ /dev/null
@@ -1,97 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)mprotect.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mprotect.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 9, 1993
-.Dt MPROTECT 2
-.Os
-.Sh NAME
-.Nm mprotect
-.Nd control the protection of pages
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn mprotect "const void *addr" "size_t len" "int prot"
-.Sh DESCRIPTION
-The
-.Fn mprotect
-system call
-changes the specified pages to have protection
-.Fa prot .
-Not all implementations will guarantee protection on a page basis;
-the granularity of protection changes may be as large as an entire region.
-A region is the virtual address space defined by the start
-and end addresses of a
-.Vt "struct vm_map_entry" .
-.Pp
-Currently these protection bits are known,
-which can be combined, OR'd together:
-.Pp
-.Bl -tag -width ".Dv PROT_WRITE" -compact
-.It Dv PROT_NONE
-No permissions at all.
-.It Dv PROT_READ
-The pages can be read.
-.It Dv PROT_WRITE
-The pages can be written.
-.It Dv PROT_EXEC
-The pages can be executed.
-.El
-.Sh RETURN VALUES
-.Rv -std mprotect
-.Sh ERRORS
-The
-.Fn mprotect
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The virtual address range specified by the
-.Fa addr
-and
-.Fa len
-arguments is not valid.
-.It Bq Er EACCES
-The calling process was not allowed to change
-the protection to the value specified by
-the
-.Fa prot
-argument.
-.El
-.Sh SEE ALSO
-.Xr madvise 2 ,
-.Xr mincore 2 ,
-.Xr msync 2 ,
-.Xr munmap 2
-.Sh HISTORY
-The
-.Fn mprotect
-system call first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/sys/mq_close.2 b/lib/libc_bsd/sys/mq_close.2
deleted file mode 100644
index f1e8839..0000000
--- a/lib/libc_bsd/sys/mq_close.2
+++ /dev/null
@@ -1,105 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mq_close.2 208914 2010-06-08 16:48:59Z uqs $
-.\"
-.Dd November 29, 2005
-.Dt MQ_CLOSE 2
-.Os
-.Sh NAME
-.Nm mq_close
-.Nd "close a message queue (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In mqueue.h
-.Ft int
-.Fn mq_close "mqd_t mqdes"
-.Sh DESCRIPTION
-The
-.Fn mq_close
-system call removes the association between the message queue descriptor,
-.Fa mqdes ,
-and its message queue.
-The results of using this message queue descriptor
-after successful return from this
-.Fn mq_close ,
-and until the return of this message queue descriptor from a subsequent
-.Fn mq_open ,
-are undefined.
-.Pp
-If the process has successfully attached a notification request to the
-message queue via this
-.Fa mqdes ,
-this attachment will be removed, and the message queue is available for
-another process to attach for notification.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn mq_close
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa mqdes
-argument is not a valid message queue descriptor.
-.El
-.Sh SEE ALSO
-.Xr mq_open 2 ,
-.Xr mq_unlink 2
-.Sh STANDARDS
-The
-.Fn mq_close
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-message queues first appeared in
-.Fx 7.0 .
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.  In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard is
-the referee document.  The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html.
diff --git a/lib/libc_bsd/sys/mq_getattr.2 b/lib/libc_bsd/sys/mq_getattr.2
deleted file mode 100644
index 1a8a60c..0000000
--- a/lib/libc_bsd/sys/mq_getattr.2
+++ /dev/null
@@ -1,127 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mq_getattr.2 262588 2014-02-28 00:43:27Z brueffer $
-.\"
-.Dd February 21, 2014
-.Dt MQ_GETATTR 2
-.Os
-.Sh NAME
-.Nm mq_getattr
-.Nd "get message queue attributes (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In mqueue.h
-.Ft int
-.Fn mq_getattr "mqd_t mqdes" "struct mq_attr *mqstat"
-.Sh DESCRIPTION
-The
-.Fn mq_getattr
-system call obtains status information and attributes of the message queue and
-the open message queue description associated with the message queue
-descriptor.
-.Pp
-The
-.Fa mqdes
-argument specifies a message queue descriptor.
-.Pp
-The results are returned in the
-.Vt mq_attr
-structure referenced by the
-.Fa mqstat
-argument.
-.Pp
-Upon return, the following members will have the values associated with the
-open message queue description as set when the message queue was opened and
-as modified by subsequent
-.Fn mq_setattr
-calls:
-.Va mq_flags .
-.Pp
-The following attributes of the message queue will be returned as set at
-message queue creation:
-.Va mq_maxmsg , mq_msgsize .
-.Pp
-Upon return, the following members within the
-.Vt mq_attr
-structure referenced by the
-.Fa mqstat
-argument will be set to the current state
-of the message queue:
-.Bl -tag -width ".Va mq_curmsgs"
-.It Va mq_curmsgs
-The number of messages currently on the queue.
-.El
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn mq_getattr
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa mqdes
-argument is not a valid message queue descriptor.
-.El
-.Sh SEE ALSO
-.Xr mq_open 2 ,
-.Xr mq_send 2 ,
-.Xr mq_setattr 2 ,
-.Xr mq_timedsend 2
-.Sh STANDARDS
-The
-.Fn mq_getattr
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-message queues first appeared in
-.Fx 7.0 .
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.  In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard is
-the referee document.  The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html.
diff --git a/lib/libc_bsd/sys/mq_notify.2 b/lib/libc_bsd/sys/mq_notify.2
deleted file mode 100644
index d3f459c..0000000
--- a/lib/libc_bsd/sys/mq_notify.2
+++ /dev/null
@@ -1,151 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mq_notify.2 208914 2010-06-08 16:48:59Z uqs $
-.\"
-.Dd November 29, 2005
-.Dt MQ_NOTIFY 2
-.Os
-.Sh NAME
-.Nm mq_notify
-.Nd "notify process that a message is available (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In mqueue.h
-.Ft int
-.Fn mq_notify "mqd_t mqdes" "const struct sigevent *notification"
-.Sh DESCRIPTION
-If the argument notification is not
-.Dv NULL ,
-this system call will register the calling process to be notified of message
-arrival at an empty message queue associated with the specified message
-queue descriptor,
-.Fa mqdes .
-The notification specified by the
-.Fa notification
-argument will be sent to
-the process when the message queue transitions from empty to non-empty.
-At any time, only one process may be registered for notification by a
-message queue.
-If the calling process or any other process has already
-registered for notification of message arrival at the specified message
-queue, subsequent attempts to register for that message queue will fail.
-.Pp
-The
-.Fa notification
-argument points to a
-.Vt sigevent
-structure that defines how the calling process will be notified.
-If
-.Fa notification->sigev_notify
-is
-.Dv SIGEV_NONE ,
-then no signal will be posted, but the error status and the return status
-for the operation will be set appropriately.
-If
-.Fa notification->sigev_notify
-is
-.Dv SIGEV_SIGNAL ,
-then the signal specified in
-.Fa notification->sigev_signo
-will be sent to the process.
-The signal will be queued to the process and the value specified in
-.Fa notification->sigev_value
-will be the
-.Va si_value
-component of the generated signal.
-.Pp
-If
-.Fa notification
-is
-.Dv NULL
-and the process is currently registered for notification by the specified
-message queue, the existing registration will be removed.
-.Pp
-When the notification is sent to the registered process, its registration
-is removed.
-The message queue then is available for registration.
-.Pp
-If a process has registered for notification of message arrival at a
-message queue and some thread is blocked in
-.Fn mq_receive
-waiting to receive a message when a message arrives at the queue, the
-arriving message will satisfy the appropriate
-.Fn mq_receive .
-The resulting behavior is as if the message queue remains empty, and no
-notification will be sent.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn mq_notify
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa mqdes
-argument is not a valid message queue descriptor.
-.It Bq Er EBUSY
-Process is already registered for notification by the message queue.
-.El
-.Sh SEE ALSO
-.Xr mq_open 2 ,
-.Xr mq_send 2 ,
-.Xr mq_timedsend 2 ,
-.Xr siginfo 3
-.Sh STANDARDS
-The
-.Fn mq_notify
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-message queues first appeared in
-.Fx 7.0 .
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.  In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard is
-the referee document.  The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html.
diff --git a/lib/libc_bsd/sys/mq_open.2 b/lib/libc_bsd/sys/mq_open.2
deleted file mode 100644
index 0bc4b25..0000000
--- a/lib/libc_bsd/sys/mq_open.2
+++ /dev/null
@@ -1,323 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mq_open.2 208914 2010-06-08 16:48:59Z uqs $
-.\"
-.Dd November 29, 2005
-.Dt MQ_OPEN 2
-.Os
-.Sh NAME
-.Nm mq_open
-.Nd "open a message queue (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In mqueue.h
-.Ft mqd_t
-.Fn mq_open "const char *name" "int oflag" "..."
-.Sh DESCRIPTION
-The
-.Fn mq_open
-system call establishes the connection between a process and a message queue
-with a message queue descriptor.
-It creates an open message queue
-description that refers to the message queue, and a message queue descriptor
-that refers to that open message queue description.
-The message queue
-descriptor is used by other functions to refer to that message queue.
-The
-.Fa name
-argument points to a string naming a message queue.
-The
-.Fa name
-argument should conform to the construction rules for a pathname.
-The
-.Fa name
-should begin with a slash character.
-Processes calling
-.Fn mq_open
-with the same value of
-.Fa name
-refers to the same message queue object, as long as that name has not been
-removed.
-If the
-.Fa name
-argument is not the name of an existing message queue and creation is not
-requested,
-.Fn mq_open
-will fail and return an error.
-.Pp
-The
-.Fa oflag
-argument requests the desired receive and/or send access to the message
-queue.
-The requested access permission to receive messages or send messages
-would be granted if the calling process would be granted read or write access,
-respectively, to an equivalently protected file.
-.Pp
-The value of
-.Fa oflag
-is the bitwise-inclusive OR of values from the following list.
-Applications should specify exactly one of the first three values (access
-modes) below in the value of
-.Fa oflag :
-.Bl -tag -width ".Dv O_NONBLOCK"
-.It Dv O_RDONLY
-Open the message queue for receiving messages.
-The process can use the
-returned message queue descriptor with
-.Fn mq_receive ,
-but not
-.Fn mq_send .
-A message queue may be open multiple times in the same or different processes
-for receiving messages.
-.It Dv O_WRONLY
-Open the queue for sending messages.
-The process can use the returned
-message queue descriptor with
-.Fn mq_send
-but not
-.Fn mq_receive .
-A message queue may be open multiple times in the same or different processes
-for sending messages.
-.It Dv O_RDWR
-Open the queue for both receiving and sending messages.
-The process can use
-any of the functions allowed for
-.Dv O_RDONLY
-and
-.Dv O_WRONLY .
-A message queue may be open multiple times in the same or different processes
-for sending messages.
-.El
-.Pp
-Any combination of the remaining flags may be specified in the value of
-.Fa oflag :
-.Bl -tag -width ".Dv O_NONBLOCK"
-.It Dv O_CREAT
-Create a message queue.
-It requires two additional arguments:
-.Fa mode ,
-which is of type
-.Vt mode_t ,
-and
-.Fa attr ,
-which is a pointer to an
-.Vt mq_attr
-structure.
-If the pathname
-.Fa name
-has already been used to create a message queue that still exists, then
-this flag has no effect, except as noted under
-.Dv O_EXCL .
-Otherwise, a message queue will be created without any messages
-in it.
-The user ID of the message queue will be set to the effective user ID
-of the process, and the group ID of the message queue will be set to the
-effective group ID of the process.
-The permission bits of the message queue
-will be set to the value of the
-.Fa mode
-argument, except those set in the file mode creation mask of the process.
-When bits in
-.Fa mode
-other than the file permission bits are specified, the effect is
-unspecified.
-If
-.Fa attr
-is
-.Dv NULL ,
-the message queue is created with implementation-defined default message
-queue attributes.
-If attr is
-.Pf non- Dv NULL
-and the calling process has the
-appropriate privilege on name, the message queue
-.Va mq_maxmsg
-and
-.Va mq_msgsize
-attributes will be set to the values of the corresponding members in the
-.Vt mq_attr
-structure referred to by
-.Fa attr .
-If
-.Fa attr
-is
-.Pf non- Dv NULL ,
-but the calling process does not have the appropriate privilege
-on name, the
-.Fn mq_open
-function will fail and return an error without creating the message queue.
-.It Dv O_EXCL
-If
-.Dv O_EXCL
-and
-.Dv O_CREAT
-are set,
-.Fn mq_open
-will fail if the message queue name exists.
-.It Dv O_NONBLOCK
-Determines whether an
-.Fn mq_send
-or
-.Fn mq_receive
-waits for resources or messages that are not currently available, or fails
-with
-.Va errno
-set to
-.Er EAGAIN ;
-see
-.Xr mq_send 2
-and
-.Xr mq_receive 2
-for details.
-.El
-.Pp
-The
-.Fn mq_open
-system call does not add or remove messages from the queue.
-.Sh NOTES
-.Fx
-implements message queue based on file descriptor.
-The descriptor
-is inherited by child after
-.Xr fork 2 .
-The descriptor is closed in a new image after
-.Xr exec 3 .
-The
-.Xr select 2
-and
-.Xr kevent 2
-system calls are supported for message queue descriptor.
-.Sh RETURN VALUES
-Upon successful completion, the function returns a message queue
-descriptor; otherwise, the function returns
-.Po Vt mqd_t Pc Ns \-1
-and sets the global variable
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn mq_open
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-The message queue exists and the permissions specified by
-.Fa oflag
-are denied, or the message queue does not exist and permission to create the
-message queue is denied.
-.It Bq Er EEXIST
-.Dv O_CREAT
-and
-.Dv O_EXCL
-are set and the named message queue already exists.
-.It Bq Er EINTR
-The
-.Fn mq_open
-function was interrupted by a signal.
-.It Bq Er EINVAL
-The
-.Fn mq_open
-function is not supported for the given name.
-.It Bq Er EINVAL
-.Dv O_CREAT
-was specified in
-.Fa oflag ,
-the value of
-.Fa attr
-is not
-.Dv NULL ,
-and either
-.Va mq_maxmsg
-or
-.Va mq_msgsize
-was less than or equal to zero.
-.It Bq Er EMFILE
-Too many message queue descriptors or file descriptors are currently in use
-by this process.
-.It Bq Er ENAMETOOLONG
-The length of the
-.Fa name
-argument exceeds
-.Brq Dv PATH_MAX
-or a pathname component
-is longer than
-.Brq Dv NAME_MAX .
-.It Bq Er ENFILE
-Too many message queues are currently open in the system.
-.It Bq Er ENOENT
-.Dv O_CREAT
-is not set and the named message queue does not exist.
-.It Bq Er ENOSPC
-There is insufficient space for the creation of the new message queue.
-.El
-.Sh SEE ALSO
-.Xr mq_close 2 ,
-.Xr mq_getattr 2 ,
-.Xr mq_receive 2 ,
-.Xr mq_send 2 ,
-.Xr mq_setattr 2 ,
-.Xr mq_timedreceive 3 ,
-.Xr mq_timedsend 3 ,
-.Xr mq_unlink 3
-.Sh STANDARDS
-The
-.Fn mq_open
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-message queues first appeared in
-.Fx 7.0 .
-.Sh BUGS
-This implementation places strict requirements on the value of
-.Fa name :
-it must begin with a slash
-.Pq Ql /
-and contain no other slash characters.
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.  In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard is
-the referee document.  The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html.
diff --git a/lib/libc_bsd/sys/mq_receive.2 b/lib/libc_bsd/sys/mq_receive.2
deleted file mode 100644
index 53b276e..0000000
--- a/lib/libc_bsd/sys/mq_receive.2
+++ /dev/null
@@ -1,217 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mq_receive.2 208914 2010-06-08 16:48:59Z uqs $
-.\"
-.Dd November 29, 2005
-.Dt MQ_RECEIVE 2
-.Os
-.Sh NAME
-.Nm mq_receive , mq_timedreceive
-.Nd "receive a message from message queue (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In mqueue.h
-.Ft ssize_t
-.Fo mq_receive
-.Fa "mqd_t mqdes"
-.Fa "char *msg_ptr"
-.Fa "size_t msg_len"
-.Fa "unsigned *msg_prio"
-.Fc
-.Ft ssize_t
-.Fo mq_timedreceive
-.Fa "mqd_t mqdes"
-.Fa "char *msg_ptr"
-.Fa "size_t msg_len"
-.Fa "unsigned *msg_prio"
-.Fa "const struct timespec *abs_timeout"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn mq_receive
-system call receives oldest of the highest priority message(s) from the
-message queue specified by
-.Fa mqdes .
-If the size of the buffer in bytes, specified by the
-.Fa msg_len
-argument, is less than the
-.Va mq_msgsize
-attribute of the message queue, the system call will fail and return an
-error.
-Otherwise, the selected message will be removed from the queue
-and copied to the buffer pointed to by the
-.Fa msg_ptr
-argument.
-.Pp
-If the argument
-.Fa msg_prio
-is not
-.Dv NULL ,
-the priority of the selected message will be stored in the
-location referenced by
-.Fa msg_prio .
-If the specified message queue is empty and
-.Dv O_NONBLOCK
-is not set in the message queue description associated with
-.Fa mqdes ,
-.Fn mq_receive
-will block until a message is enqueued on the message queue or until
-.Fn mq_receive
-is interrupted by a signal.
-If more than one thread is waiting to receive
-a message when a message arrives at an empty queue and the Priority
-Scheduling option is supported, then the thread of highest priority that
-has been waiting the longest will be selected to receive the message.
-Otherwise, it is unspecified which waiting thread receives the message.
-If the specified message queue is empty and
-.Dv O_NONBLOCK
-is set in the message queue description associated with
-.Fa mqdes ,
-no message
-will be removed from the queue, and
-.Fn mq_receive
-will return an error.
-.Pp
-The
-.Fn mq_timedreceive
-system call will receive the oldest of the highest priority messages from the
-message queue specified by
-.Fa mqdes
-as described for the
-.Fn mq_receive
-system call.
-However, if
-.Dv O_NONBLOCK
-was not specified when the message queue was opened via the
-.Fn mq_open
-system call, and no message exists on the queue to satisfy the receive, the wait
-for such a message will be terminated when the specified timeout expires.
-If
-.Dv O_NONBLOCK
-is set, this system call is equivalent to
-.Fn mq_receive .
-.Pp
-The timeout expires when the absolute time specified by
-.Fa abs_timeout
-passes, as measured by the clock on which timeouts are based (that is, when
-the value of that clock equals or exceeds
-.Fa abs_timeout ) ,
-or if the absolute time specified by
-.Fa abs_timeout
-has already been passed at the time of the call.
-.Pp
-The timeout is based on the
-.Dv CLOCK_REALTIME
-clock.
-.Sh RETURN VALUES
-Upon successful completion, the
-.Fn mq_receive
-and
-.Fn mq_timedreceive
-system calls return the length of the selected message in bytes and the
-message is removed from the queue.
-Otherwise, no message is removed
-from the queue, the system call returns a value of \-1,
-and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn mq_receive
-and
-.Fn mq_timedreceive
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-.Dv O_NONBLOCK
-flag is set in the message queue description associated with
-.Fa mqdes ,
-and the specified message queue is empty.
-.It Bq Er EBADF
-The
-.Fa mqdes
-argument is not a valid message queue descriptor open for reading.
-.It Bq Er EMSGSIZE
-The specified message buffer size,
-.Fa msg_len ,
-is less than the message size attribute of the message queue.
-.It Bq Er EINTR
-The
-.Fn mq_receive
-or
-.Fn mq_timedreceive
-operation was interrupted by a signal.
-.It Bq Er EINVAL
-The process or thread would have blocked, and the
-.Fa abs_timeout
-parameter specified a nanoseconds field value less than zero or greater
-than or equal to 1000 million.
-.It Bq Er ETIMEDOUT
-The
-.Dv O_NONBLOCK
-flag was not set when the message queue was opened, but no message arrived
-on the queue before the specified timeout expired.
-.El
-.Sh SEE ALSO
-.Xr mq_open 2 ,
-.Xr mq_send 2 ,
-.Xr mq_timedsend 2
-.Sh STANDARDS
-The
-.Fn mq_receive
-and
-.Fn mq_timedreceive
-system calls conform to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-message queues first appeared in
-.Fx 7.0 .
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.  In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard is
-the referee document.  The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html.
diff --git a/lib/libc_bsd/sys/mq_send.2 b/lib/libc_bsd/sys/mq_send.2
deleted file mode 100644
index dfb4809..0000000
--- a/lib/libc_bsd/sys/mq_send.2
+++ /dev/null
@@ -1,236 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mq_send.2 208914 2010-06-08 16:48:59Z uqs $
-.\"
-.Dd November 29, 2005
-.Dt MQ_SEND 2
-.Os
-.Sh NAME
-.Nm mq_send , mq_timedsend
-.Nd "send a message to message queue (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In mqueue.h
-.Ft int
-.Fo mq_send
-.Fa "mqd_t mqdes"
-.Fa "const char *msg_ptr"
-.Fa "size_t msg_len"
-.Fa "unsigned msg_prio"
-.Fc
-.Ft int
-.Fo mq_timedsend
-.Fa "mqd_t mqdes"
-.Fa "const char *msg_ptr"
-.Fa "size_t msg_len"
-.Fa "unsigned msg_prio"
-.Fa "const struct timespec *abs_timeout"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn mq_send
-system call adds the message pointed to by the argument
-.Fa msg_ptr
-to the message queue specified by
-.Fa mqdes .
-The
-.Fa msg_len
-argument specifies the length of the message, in bytes, pointed to by
-.Fa msg_ptr .
-The value of
-.Fa msg_len
-should be less than or equal to the
-.Va mq_msgsize
-attribute of the message queue, or
-.Fn mq_send
-will fail.
-.Pp
-If the specified message queue is not full,
-.Fn mq_send
-will behave as if the message is inserted into the message queue at
-the position indicated by the
-.Fa msg_prio
-argument.
-A message with a larger numeric value of
-.Fa msg_prio
-will be inserted before messages with lower values of
-.Fa msg_prio .
-A message will be inserted after other messages in the queue, if any,
-with equal
-.Fa msg_prio .
-The value of
-.Fa msg_prio
-should be less than
-.Brq Dv MQ_PRIO_MAX .
-.Pp
-If the specified message queue is full and
-.Dv O_NONBLOCK
-is not set in the message queue description associated with
-.Fa mqdes ,
-.Fn mq_send
-will block until space becomes available to enqueue the
-message, or until
-.Fn mq_send
-is interrupted by a signal.
-If more than one thread is
-waiting to send when space becomes available in the message queue and
-the Priority Scheduling option is supported, then the thread of the
-highest priority that has been waiting the longest will be unblocked
-to send its message.
-Otherwise, it is unspecified which waiting thread
-is unblocked.
-If the specified message queue is full and
-.Dv O_NONBLOCK
-is set in the message queue description associated with
-.Fa mqdes ,
-the message will not be queued and
-.Fn mq_send
-will return an error.
-.Pp
-The
-.Fn mq_timedsend
-system call will add a message to the message queue specified by
-.Fa mqdes
-in the manner defined for the
-.Fn mq_send
-system call.
-However, if the specified message queue is full and
-.Dv O_NONBLOCK
-is not set in the message queue description associated with
-.Fa mqdes ,
-the wait for sufficient room in the queue will be terminated when
-the specified timeout expires.
-If
-.Dv O_NONBLOCK
-is set in the message queue description, this system call is
-equivalent to
-.Fn mq_send .
-.Pp
-The timeout will expire when the absolute time specified by
-.Fa abs_timeout
-passes, as measured by the clock on which timeouts are based (that is,
-when the value of that clock equals or exceeds
-.Fa abs_timeout ) ,
-or if the absolute time specified by
-.Fa abs_timeout
-has already been passed at the time of the call.
-.Pp
-The timeout is based on the
-.Dv CLOCK_REALTIME
-clock.
-.Sh RETURN VALUES
-Upon successful completion, the
-.Fn mq_send
-and
-.Fn mq_timedsend
-system calls return a value of zero.
-Otherwise, no message will be
-enqueued, the system calls return \-1, and
-the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn mq_send
-and
-.Fn mq_timedsend
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The
-.Dv O_NONBLOCK
-flag is set in the message queue description associated with
-.Fa mqdes ,
-and the specified message queue is full.
-.It Bq Er EBADF
-The
-.Fa mqdes
-argument is not a valid message queue descriptor open for writing.
-.It Bq Er EINTR
-A signal interrupted the call to
-.Fn mq_send
-or
-.Fn mq_timedsend .
-.It Bq Er EINVAL
-The value of
-.Fa msg_prio
-was outside the valid range.
-.It Bq Er EINVAL
-The process or thread would have blocked, and the
-.Fa abs_timeout
-parameter specified a nanoseconds field value less than zero or greater
-than or equal to 1000 million.
-.It Bq Er EMSGSIZE
-The specified message length,
-.Fa msg_len ,
-exceeds the message size attribute of the message queue.
-.It Bq Er ETIMEDOUT
-The
-.Dv O_NONBLOCK
-flag was not set when the message queue was opened, but the timeout
-expired before the message could be added to the queue.
-.El
-.Sh SEE ALSO
-.Xr mq_open 2 ,
-.Xr mq_receive 2 ,
-.Xr mq_setattr 2 ,
-.Xr mq_timedreceive 2
-.Sh STANDARDS
-The
-.Fn mq_send
-and
-.Fn mq_timedsend
-system calls conform to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-message queues first appeared in
-.Fx 7.0 .
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.  In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard is
-the referee document.  The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html.
diff --git a/lib/libc_bsd/sys/mq_setattr.2 b/lib/libc_bsd/sys/mq_setattr.2
deleted file mode 100644
index a6386f5..0000000
--- a/lib/libc_bsd/sys/mq_setattr.2
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/mq_setattr.2 222037 2011-05-17 21:03:34Z jilles $
-.\"
-.Dd May 17, 2011
-.Dt MQ_SETATTR 2
-.Os
-.Sh NAME
-.Nm mq_setattr
-.Nd "set message queue attributes (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In mqueue.h
-.Ft int
-.Fo mq_setattr
-.Fa "mqd_t mqdes"
-.Fa "const struct mq_attr *restrict mqstat"
-.Fa "struct mq_attr *restrict omqstat"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn mq_setattr
-system call sets attributes associated with the open message queue description
-referenced by the message queue descriptor specified by
-.Fa mqdes .
-The message queue attributes corresponding to the following members defined
-in the
-.Vt mq_attr
-structure will be set to the specified values upon successful completion of
-.Fn mq_setattr :
-.Bl -tag -width ".Va mq_flags"
-.It Va mq_flags
-The value of this member is zero or
-.Dv O_NONBLOCK .
-.El
-.Pp
-The values of the
-.Va mq_maxmsg , mq_msgsize ,
-and
-.Va mq_curmsgs
-members of the
-.Vt mq_attr
-structure are ignored by
-.Fn mq_setattr .
-.Sh RETURN VALUES
-Upon successful completion, the function returns a value of zero and the
-attributes of the message queue will have been changed as specified.
-.Pp
-Otherwise, the message queue attributes are unchanged, and the function
-returns a value of \-1 and sets the global variable
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn mq_setattr
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa mqdes
-argument is not a valid message queue descriptor.
-.El
-.Sh SEE ALSO
-.Xr mq_open 2 ,
-.Xr mq_send 2 ,
-.Xr mq_timedsend 2
-.Sh STANDARDS
-The
-.Fn mq_setattr
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-message queues first appeared in
-.Fx 7.0 .
-.Sh COPYRIGHT
-Portions of this text are reprinted and reproduced in electronic form
-from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-Portable Operating System Interface (POSIX), The Open Group Base
-Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-Electrical and Electronics Engineers, Inc and The Open Group.  In the
-event of any discrepancy between this version and the original IEEE and
-The Open Group Standard, the original IEEE and The Open Group Standard is
-the referee document.  The original Standard can be obtained online at
-http://www.opengroup.org/unix/online.html.
diff --git a/lib/libc_bsd/sys/msgctl.2 b/lib/libc_bsd/sys/msgctl.2
deleted file mode 100644
index 40b847e..0000000
--- a/lib/libc_bsd/sys/msgctl.2
+++ /dev/null
@@ -1,210 +0,0 @@
-.\"	$NetBSD: msgctl.2,v 1.1 1995/10/16 23:49:15 jtc Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" 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 for the NetBSD Project
-.\"      by Frank van der Linden
-.\" 4. 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 ``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 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: releng/10.2/lib/libc/sys/msgctl.2 195656 2009-07-13 12:53:43Z trasz $
-.\"/
-.Dd July 9, 2009
-.Dt MSGCTL 2
-.Os
-.Sh NAME
-.Nm msgctl
-.Nd message control operations
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/msg.h
-.Ft int
-.Fn msgctl "int msqid" "int cmd" "struct msqid_ds *buf"
-.Sh DESCRIPTION
-The
-.Fn msgctl
-system call performs some control operations on the message queue specified
-by
-.Fa msqid .
-.Pp
-Each message queue has a data structure associated with it, parts of which
-may be altered by
-.Fn msgctl
-and parts of which determine the actions of
-.Fn msgctl .
-The data structure is defined in
-.In sys/msg.h
-and contains (amongst others) the following members:
-.Bd -literal
-struct msqid_ds {
-	struct	ipc_perm msg_perm;	/* msg queue permission bits */
-	struct	msg *msg_first;	/* first message in the queue */
-	struct	msg *msg_last;	/* last message in the queue */
-	msglen_t msg_cbytes;	/* number of bytes in use on the queue */
-	msgqnum_t msg_qnum;	/* number of msgs in the queue */
-	msglen_t msg_qbytes;	/* max # of bytes on the queue */
-	pid_t	msg_lspid;	/* pid of last msgsnd() */
-	pid_t	msg_lrpid;	/* pid of last msgrcv() */
-	time_t	msg_stime;	/* time of last msgsnd() */
-	time_t	msg_rtime;	/* time of last msgrcv() */
-	time_t	msg_ctime;	/* time of last msgctl() */
-};
-.Ed
-.Pp
-The
-.Vt ipc_perm
-structure used inside the
-.Vt msqid_ds
-structure is defined in
-.In sys/ipc.h
-and looks like this:
-.Bd -literal
-struct ipc_perm {
-	uid_t		cuid;	/* creator user id */
-	gid_t		cgid;	/* creator group id */
-	uid_t		uid;	/* user id */
-	gid_t		gid;	/* group id */
-	mode_t		mode;	/* r/w permission */
-	unsigned short	seq;	/* sequence # (to generate unique ipcid) */
-	key_t		key;	/* user specified msg/sem/shm key */
-};
-.Ed
-.Pp
-The operation to be performed by
-.Fn msgctl
-is specified in
-.Fa cmd
-and is one of:
-.Bl -tag -width IPC_RMIDX
-.It Dv IPC_STAT
-Gather information about the message queue and place it in the
-structure pointed to by
-.Fa buf .
-.It Dv IPC_SET
-Set the value of the
-.Va msg_perm.uid ,
-.Va msg_perm.gid ,
-.Va msg_perm.mode
-and
-.Va msg_qbytes
-fields in the structure associated with
-.Fa msqid .
-The values are taken from the corresponding fields in the structure
-pointed to by
-.Fa buf .
-This operation can only be executed by the super-user, or a process that
-has an effective user id equal to either
-.Va msg_perm.cuid
-or
-.Va msg_perm.uid
-in the data structure associated with the message queue.
-The value of
-.Va msg_qbytes
-can only be increased by the super-user.
-Values for
-.Va msg_qbytes
-that exceed the system limit (MSGMNB from
-.In sys/msg.h )
-are silently truncated to that limit.
-.It Dv IPC_RMID
-Remove the message queue specified by
-.Fa msqid
-and destroy the data associated with it.
-Only the super-user or a process
-with an effective uid equal to the
-.Va msg_perm.cuid
-or
-.Va msg_perm.uid
-values in the data structure associated with the queue can do this.
-.El
-.Pp
-The permission to read from or write to a message queue (see
-.Xr msgsnd 2
-and
-.Xr msgrcv 2 )
-is determined by the
-.Va msg_perm.mode
-field in the same way as is
-done with files (see
-.Xr chmod 2 ) ,
-but the effective uid can match either the
-.Va msg_perm.cuid
-field or the
-.Va msg_perm.uid
-field, and the
-effective gid can match either
-.Va msg_perm.cgid
-or
-.Va msg_perm.gid .
-.Sh RETURN VALUES
-.Rv -std msgctl
-.Sh ERRORS
-The
-.Fn msgctl
-function
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The
-.Fa cmd
-argument
-is equal to IPC_SET or IPC_RMID and the caller is not the super-user, nor does
-the effective uid match either the
-.Va msg_perm.uid
-or
-.Va msg_perm.cuid
-fields of the data structure associated with the message queue.
-.Pp
-An attempt is made to increase the value of
-.Va msg_qbytes
-through IPC_SET
-but the caller is not the super-user.
-.It Bq Er EACCES
-The command is IPC_STAT
-and the caller has no read permission for this message queue.
-.It Bq Er EINVAL
-The
-.Fa msqid
-argument
-is not a valid message queue identifier.
-.Pp
-.Va cmd
-is not a valid command.
-.It Bq Er EFAULT
-The
-.Fa buf
-argument
-specifies an invalid address.
-.El
-.Sh SEE ALSO
-.Xr msgget 2 ,
-.Xr msgrcv 2 ,
-.Xr msgsnd 2
-.Sh HISTORY
-Message queues appeared in the first release of
-.At V .
diff --git a/lib/libc_bsd/sys/msgget.2 b/lib/libc_bsd/sys/msgget.2
deleted file mode 100644
index 3ae4ff7..0000000
--- a/lib/libc_bsd/sys/msgget.2
+++ /dev/null
@@ -1,141 +0,0 @@
-.\"	$NetBSD: msgget.2,v 1.1 1995/10/16 23:49:19 jtc Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" 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 for the NetBSD Project
-.\"      by Frank van der Linden
-.\" 4. 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 ``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 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: releng/10.2/lib/libc/sys/msgget.2 195656 2009-07-13 12:53:43Z trasz $
-.\"
-.\"/
-.Dd July 9, 2009
-.Dt MSGGET 2
-.Os
-.Sh NAME
-.Nm msgget
-.Nd get message queue
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/msg.h
-.Ft int
-.Fn msgget "key_t key" "int msgflg"
-.Sh DESCRIPTION
-The
-.Fn msgget
-function
-returns the message queue identifier associated with
-.Fa key .
-A message queue identifier is a unique integer greater than zero.
-.Pp
-A message queue is created if either
-.Fa key
-is equal to
-.Dv IPC_PRIVATE ,
-or
-.Fa key
-does not have a message queue identifier associated with it, and the
-.Dv IPC_CREAT
-bit is set in
-.Fa msgflg .
-.Pp
-If a new message queue is created, the data structure associated with it (the
-.Va msqid_ds
-structure, see
-.Xr msgctl 2 )
-is initialized as follows:
-.Bl -bullet
-.It
-.Va msg_perm.cuid
-and
-.Va msg_perm.uid
-are set to the effective uid of the calling process.
-.It
-.Va msg_perm.gid
-and
-.Va msg_perm.cgid
-are set to the effective gid of the calling process.
-.It
-.Va msg_perm.mode
-is set to the lower 9 bits of
-.Fa msgflg .
-.It
-.Va msg_cbytes ,
-.Va msg_qnum ,
-.Va msg_lspid ,
-.Va msg_lrpid ,
-.Va msg_rtime ,
-and
-.Va msg_stime
-are set to 0.
-.It
-.Va msg_qbytes
-is set to the system wide maximum value for the number of bytes in a queue
-.Pf ( Dv MSGMNB ) .
-.It
-.Va msg_ctime
-is set to the current time.
-.El
-.Sh RETURN VALUES
-Upon successful completion a positive message queue identifier is returned.
-Otherwise, -1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EACCES
-A message queue is already associated with
-.Fa key
-and the caller has no permission to access it.
-.It Bq Er EEXIST
-Both
-.Dv IPC_CREAT
-and
-.Dv IPC_EXCL
-are set in
-.Fa msgflg ,
-and a message queue is already associated with
-.Fa key .
-.It Bq Er ENOSPC
-A new message queue could not be created because the system limit for
-the number of message queues has been reached.
-.It Bq Er ENOENT
-.Dv IPC_CREAT
-was not set in
-.Fa msgflg
-and no message queue associated with
-.Fa key
-was found.
-.El
-.Sh SEE ALSO
-.Xr msgctl 2 ,
-.Xr msgrcv 2 ,
-.Xr msgsnd 2
-.Sh HISTORY
-Message queues appeared in the first release of
-.At V .
diff --git a/lib/libc_bsd/sys/msgrcv.2 b/lib/libc_bsd/sys/msgrcv.2
deleted file mode 100644
index 5beb67d..0000000
--- a/lib/libc_bsd/sys/msgrcv.2
+++ /dev/null
@@ -1,222 +0,0 @@
-.\"	$NetBSD: msgrcv.2,v 1.1 1995/10/16 23:49:20 jtc Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" 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 for the NetBSD Project
-.\"      by Frank van der Linden
-.\" 4. 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 ``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 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: releng/10.2/lib/libc/sys/msgrcv.2 195656 2009-07-13 12:53:43Z trasz $
-.\"
-.\"/
-.Dd July 9, 2009
-.Dt MSGRCV 2
-.Os
-.Sh NAME
-.Nm msgrcv
-.Nd receive a message from a message queue
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/msg.h
-.Ft int
-.Fn msgrcv "int msqid" "void *msgp" "size_t msgsz" "long msgtyp" "int msgflg"
-.Sh DESCRIPTION
-The
-.Fn msgrcv
-function receives a message from the message queue specified in
-.Fa msqid ,
-and places it into the structure pointed to by
-.Fa msgp .
-This structure should consist of the following members:
-.Bd -literal
-    long mtype;    /* message type */
-    char mtext[1]; /* body of message */
-.Ed
-.Pp
-.Va mtype
-is an integer greater than 0 that can be used for selecting messages,
-.Va mtext
-is an array of bytes, with a size up to that of the system limit
-.Pf ( Dv MSGMAX ) .
-.Pp
-The value of
-.Fa msgtyp
-has one of the following meanings:
-.Bl -bullet
-.It
-The
-.Fa msgtyp
-argument
-is greater than 0.
-The first message of type
-.Fa msgtyp
-will be received.
-.It
-The
-.Fa msgtyp
-argument
-is equal to 0.
-The first message on the queue will be received.
-.It
-The
-.Fa msgtyp
-argument
-is less than 0.
-The first message of the lowest message type that is
-less than or equal to the absolute value of
-.Fa msgtyp
-will be received.
-.El
-.Pp
-The
-.Fa msgsz
-argument
-specifies the maximum length of the requested message.
-If the received
-message has a length greater than
-.Fa msgsz
-it will be silently truncated if the
-.Dv MSG_NOERROR
-flag is set in
-.Fa msgflg ,
-otherwise an error will be returned.
-.Pp
-If no matching message is present on the message queue specified by
-.Fa msqid ,
-the behavior of
-.Fn msgrcv
-depends on whether the
-.Dv IPC_NOWAIT
-flag is set in
-.Fa msgflg
-or not.
-If
-.Dv IPC_NOWAIT
-is set,
-.Fn msgrcv
-will immediately return a value of -1, and set
-.Va errno
-to
-.Er ENOMSG .
-If
-.Dv IPC_NOWAIT
-is not set, the calling process will be blocked
-until:
-.Bl -bullet
-.It
-A message of the requested type becomes available on the message queue.
-.It
-The message queue is removed, in which case -1 will be returned, and
-.Va errno
-set to
-.Er EINVAL .
-.It
-A signal is received and caught.
--1 is returned, and
-.Va errno
-set to
-.Er EINTR .
-.El
-.Pp
-If a message is successfully received, the data structure associated with
-.Fa msqid
-is updated as follows:
-.Bl -bullet
-.It
-.Va msg_cbytes
-is decremented by the size of the message.
-.It
-.Va msg_lrpid
-is set to the pid of the caller.
-.It
-.Va msg_lrtime
-is set to the current time.
-.It
-.Va msg_qnum
-is decremented by 1.
-.El
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn msgrcv
-returns the number of bytes received into the
-.Va mtext
-field of the structure pointed to by
-.Fa msgp .
-Otherwise, -1 is returned, and
-.Va errno
-set to indicate the error.
-.Sh ERRORS
-The
-.Fn msgrcv
-function
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa msqid
-argument
-is not a valid message queue identifier.
-.Pp
-The message queue was removed while
-.Fn msgrcv
-was waiting for a message of the requested type to become available on it.
-.Pp
-The
-.Fa msgsz
-argument
-is less than 0.
-.It Bq Er E2BIG
-A matching message was received, but its size was greater than
-.Fa msgsz
-and the
-.Dv MSG_NOERROR
-flag was not set in
-.Fa msgflg .
-.It Bq Er EACCES
-The calling process does not have read access to the message queue.
-.It Bq Er EFAULT
-The
-.Fa msgp
-argument
-points to an invalid address.
-.It Bq Er EINTR
-The system call was interrupted by the delivery of a signal.
-.It Bq Er ENOMSG
-There is no message of the requested type available on the message queue,
-and
-.Dv IPC_NOWAIT
-is set in
-.Fa msgflg .
-.El
-.Sh SEE ALSO
-.Xr msgctl 2 ,
-.Xr msgget 2 ,
-.Xr msgsnd 2
-.Sh HISTORY
-Message queues appeared in the first release of
-.At V .
diff --git a/lib/libc_bsd/sys/msgsnd.2 b/lib/libc_bsd/sys/msgsnd.2
deleted file mode 100644
index be6b0ba..0000000
--- a/lib/libc_bsd/sys/msgsnd.2
+++ /dev/null
@@ -1,184 +0,0 @@
-.\"	$NetBSD: msgsnd.2,v 1.1 1995/10/16 23:49:24 jtc Exp $
-.\"
-.\" Copyright (c) 1995 Frank van der Linden
-.\" 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 for the NetBSD Project
-.\"      by Frank van der Linden
-.\" 4. 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 ``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 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: releng/10.2/lib/libc/sys/msgsnd.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.Dd July 9, 2009
-.Dt MSGSND 2
-.Os
-.Sh NAME
-.Nm msgsnd
-.Nd send a message to a message queue
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/msg.h
-.Ft int
-.Fn msgsnd "int msqid" "const void *msgp" "size_t msgsz" "int msgflg"
-.Sh DESCRIPTION
-The
-.Fn msgsnd
-function sends a message to the message queue specified in
-.Fa msqid .
-The
-.Fa msgp
-argument
-points to a structure containing the message.
-This structure should
-consist of the following members:
-.Bd -literal
-    long mtype;    /* message type */
-    char mtext[1]; /* body of message */
-.Ed
-.Pp
-.Va mtype
-is an integer greater than 0 that can be used for selecting messages (see
-.Xr msgrcv 2 ) ,
-.Va mtext
-is an array of
-.Fa msgsz
-bytes.
-The argument
-.Fa msgsz
-can range from 0 to a system-imposed maximum,
-.Dv MSGMAX .
-.Pp
-If the number of bytes already on the message queue plus
-.Fa msgsz
-is bigger than the maximum number of bytes on the message queue
-.Pf ( Va msg_qbytes ,
-see
-.Xr msgctl 2 ) ,
-or the number of messages on all queues system-wide is already equal to
-the system limit,
-.Fa msgflg
-determines the action of
-.Fn msgsnd .
-If
-.Fa msgflg
-has
-.Dv IPC_NOWAIT
-mask set in it, the call will return immediately.
-If
-.Fa msgflg
-does not have
-.Dv IPC_NOWAIT
-set in it, the call will block until:
-.Bl -bullet
-.It
-The condition which caused the call to block does no longer exist.
-The message will be sent.
-.It
-The message queue is removed, in which case -1 will be returned, and
-.Va errno
-is set to
-.Er EINVAL .
-.It
-The caller catches a signal.
-The call returns with
-.Va errno
-set to
-.Er EINTR .
-.El
-.Pp
-After a successful call, the data structure associated with the message
-queue is updated in the following way:
-.Bl -bullet
-.It
-.Va msg_cbytes
-is incremented by the size of the message.
-.It
-.Va msg_qnum
-is incremented by 1.
-.It
-.Va msg_lspid
-is set to the pid of the calling process.
-.It
-.Va msg_stime
-is set to the current time.
-.El
-.Sh RETURN VALUES
-.Rv -std msgsnd
-.Sh ERRORS
-The
-.Fn msgsnd
-function
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa msqid
-argument
-is not a valid message queue identifier.
-.Pp
-The message queue was removed while
-.Fn msgsnd
-was waiting for a resource to become available in order to deliver the
-message.
-.Pp
-The
-.Fa msgsz
-argument
-is greater than
-.Va msg_qbytes .
-.Pp
-The
-.Fa mtype
-argument
-is not greater than 0.
-.It Bq Er EACCES
-The calling process does not have write access to the message queue.
-.It Bq Er EAGAIN
-There was no space for this message either on the queue, or in the whole
-system, and
-.Dv IPC_NOWAIT
-was set in
-.Fa msgflg .
-.It Bq Er EFAULT
-The
-.Fa msgp
-argument
-points to an invalid address.
-.It Bq Er EINTR
-The system call was interrupted by the delivery of a signal.
-.El
-.Sh HISTORY
-Message queues appeared in the first release of AT&T Unix System V.
-.Sh BUGS
-.Nx
-and
-.Fx
-do not define the
-.Er EIDRM
-error value, which should be used
-in the case of a removed message queue.
diff --git a/lib/libc_bsd/sys/msync.2 b/lib/libc_bsd/sys/msync.2
deleted file mode 100644
index 1be2356..0000000
--- a/lib/libc_bsd/sys/msync.2
+++ /dev/null
@@ -1,126 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)msync.2	8.2 (Berkeley) 6/21/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/msync.2 266492 2014-05-21 09:19:05Z pho $
-.\"
-.Dd March 18, 2012
-.Dt MSYNC 2
-.Os
-.Sh NAME
-.Nm msync
-.Nd synchronize a mapped region
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn msync "void *addr" "size_t len" "int flags"
-.Sh DESCRIPTION
-The
-.Fn msync
-system call
-writes any modified pages back to the file system and updates
-the file modification time.
-If
-.Fa len
-is 0, all modified pages within the region containing
-.Fa addr
-will be flushed;
-if
-.Fa len
-is non-zero, only those pages containing
-.Fa addr
-and
-.Fa len-1
-succeeding locations will be examined.
-The
-.Fa flags
-argument may be specified as follows:
-.Pp
-.Bl -tag -width ".Dv MS_INVALIDATE" -compact
-.It Dv MS_ASYNC
-Return immediately
-.It Dv MS_SYNC
-Perform synchronous writes
-.It Dv MS_INVALIDATE
-Invalidate all cached data
-.El
-.Sh RETURN VALUES
-.Rv -std msync
-.Sh ERRORS
-The
-.Fn msync
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBUSY
-Some or all of the pages in the specified region are locked and
-.Dv MS_INVALIDATE
-is specified.
-.It Bq Er EINVAL
-The
-.Fa addr
-argument
-is not a multiple of the hardware page size.
-.It Bq Er ENOMEM
-The addresses in the range starting at
-.Fa addr
-and continuing for
-.Fa len
-bytes are outside the range allowed for the address space of a
-process or specify one or more pages that are not mapped.
-.It Bq Er EINVAL
-The
-.Fa flags
-argument
-was both MS_ASYNC and MS_INVALIDATE.
-Only one of these flags is allowed.
-.It Bq Er EIO
-An error occurred while writing at least one of the pages in
-the specified region.
-.El
-.Sh SEE ALSO
-.Xr madvise 2 ,
-.Xr mincore 2 ,
-.Xr mlock 2 ,
-.Xr mprotect 2 ,
-.Xr munmap 2
-.Sh HISTORY
-The
-.Fn msync
-system call first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The
-.Fn msync
-system call is usually not needed since
-.Bx
-implements a coherent file system buffer cache.
-However, it may be used to associate dirty VM pages with file system
-buffers and thus cause them to be flushed to physical media sooner
-rather than later.
diff --git a/lib/libc_bsd/sys/msync.c b/lib/libc_bsd/sys/msync.c
deleted file mode 100644
index 76704d2..0000000
--- a/lib/libc_bsd/sys/msync.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/msync.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_msync, __msync);
-
-#pragma weak msync
-int
-msync(void *addr, size_t len, int flags)
-{
-
-	return (((int (*)(void *, size_t, int))
-	    __libc_interposing[INTERPOS_msync])(addr, len, flags));
-}
diff --git a/lib/libc_bsd/sys/munmap.2 b/lib/libc_bsd/sys/munmap.2
deleted file mode 100644
index fbf44db..0000000
--- a/lib/libc_bsd/sys/munmap.2
+++ /dev/null
@@ -1,78 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)munmap.2	8.3 (Berkeley) 5/27/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/munmap.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd May 27, 1994
-.Dt MUNMAP 2
-.Os
-.Sh NAME
-.Nm munmap
-.Nd remove a mapping
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/mman.h
-.Ft int
-.Fn munmap "void *addr" "size_t len"
-.Sh DESCRIPTION
-The
-.Fn munmap
-system call
-deletes the mappings for the specified address range,
-and causes further references to addresses within the range
-to generate invalid memory references.
-.Sh RETURN VALUES
-.Rv -std munmap
-.Sh ERRORS
-The
-.Fn munmap
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa addr
-argument was not page aligned, the
-.Fa len
-argument was zero or negative, or
-some part of the region being unmapped is outside the
-valid address range for a process.
-.El
-.Sh "SEE ALSO"
-.Xr madvise 2 ,
-.Xr mincore 2 ,
-.Xr mmap 2 ,
-.Xr mprotect 2 ,
-.Xr msync 2 ,
-.Xr getpagesize 3
-.Sh HISTORY
-The
-.Fn munmap
-system call first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/sys/nanosleep.2 b/lib/libc_bsd/sys/nanosleep.2
deleted file mode 100644
index 0f30ec8..0000000
--- a/lib/libc_bsd/sys/nanosleep.2
+++ /dev/null
@@ -1,111 +0,0 @@
-.\"	$OpenBSD: nanosleep.2,v 1.1 1997/04/20 20:56:20 tholo Exp $
-.\"	$NetBSD: nanosleep.2,v 1.1 1997/04/17 18:12:02 jtc Exp $
-.\"
-.\" Copyright (c) 1986, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)sleep.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/nanosleep.2 197958 2009-10-11 16:23:11Z kib $
-.\"
-.Dd April 17, 1997
-.Dt NANOSLEEP 2
-.Os
-.Sh NAME
-.Nm nanosleep
-.Nd suspend process execution for an interval measured in nanoseconds
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In time.h
-.Ft int
-.Fn nanosleep "const struct timespec *rqtp" "struct timespec *rmtp"
-.Sh DESCRIPTION
-The
-.Fn nanosleep
-system call
-causes the calling thread to sleep until the time interval specified by
-.Fa rqtp
-has elapsed.
-An unmasked signal will
-cause it to terminate the sleep early, regardless of the
-.Dv SA_RESTART
-value on the interrupting signal.
-.Sh RETURN VALUES
-If the
-.Fn nanosleep
-system call returns because the requested time has elapsed, the value
-returned will be zero.
-.Pp
-If the
-.Fn nanosleep
-system call returns due to the delivery of a signal, the value returned
-will be -1, and the global variable
-.Va errno
-will be set to indicate the interruption.
-If
-.Fa rmtp
-is
-.No non- Ns Dv NULL ,
-the timespec structure it references is updated to contain the
-unslept amount (the request time minus the time actually slept).
-.Sh ERRORS
-The
-.Fn nanosleep
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Either
-.Fa rqtp
-or
-.Fa rmtp
-points to memory that is not a valid part of the process
-address space.
-.It Bq Er EINTR
-The
-.Fn nanosleep
-system call
-was interrupted by the delivery of a signal.
-.It Bq Er EINVAL
-The
-.Fa rqtp
-argument
-specified a nanosecond value less than zero
-or greater than or equal to 1000 million.
-.It Bq Er ENOSYS
-The
-.Fn nanosleep
-system call
-is not supported by this implementation.
-.El
-.Sh SEE ALSO
-.Xr sigsuspend 2 ,
-.Xr sleep 3
-.Sh STANDARDS
-The
-.Fn nanosleep
-system call conforms to
-.St -p1003.1b-93 .
diff --git a/lib/libc_bsd/sys/nanosleep.c b/lib/libc_bsd/sys/nanosleep.c
deleted file mode 100644
index d6396d7..0000000
--- a/lib/libc_bsd/sys/nanosleep.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/nanosleep.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <time.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_nanosleep, __nanosleep);
-
-#pragma weak nanosleep
-int
-nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
-{
-
-	return (((int (*)(const struct timespec *, struct timespec *))
-	    __libc_interposing[INTERPOS_nanosleep])(rqtp, rmtp));
-}
diff --git a/lib/libc_bsd/sys/nfssvc.2 b/lib/libc_bsd/sys/nfssvc.2
deleted file mode 100644
index e58bed4..0000000
--- a/lib/libc_bsd/sys/nfssvc.2
+++ /dev/null
@@ -1,258 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)nfssvc.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/nfssvc.2 231564 2012-02-12 18:29:56Z ed $
-.\"
-.Dd June 9, 1993
-.Dt NFSSVC 2
-.Os
-.Sh NAME
-.Nm nfssvc
-.Nd NFS services
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/mount.h
-.In sys/time.h
-.In nfs/rpcv2.h
-.In nfsserver/nfs.h
-.In unistd.h
-.Ft int
-.Fn nfssvc "int flags" "void *argstructp"
-.Sh DESCRIPTION
-The
-.Fn nfssvc
-system call is used by the NFS daemons to pass information into and out
-of the kernel and also to enter the kernel as a server daemon.
-The
-.Fa flags
-argument consists of several bits that show what action is to be taken
-once in the kernel and the
-.Fa argstructp
-points to one of three structures depending on which bits are set in
-flags.
-.Pp
-On the client side,
-.Xr nfsiod 8
-calls
-.Fn nfssvc
-with the
-.Fa flags
-argument set to
-.Dv NFSSVC_BIOD
-and
-.Fa argstructp
-set to
-.Dv NULL
-to enter the kernel as a block I/O server daemon.
-For
-.Tn NQNFS ,
-.Xr mount_nfs 8
-calls
-.Fn nfssvc
-with the
-.Dv NFSSVC_MNTD
-flag, optionally or'd with the flags
-.Dv NFSSVC_GOTAUTH
-and
-.Dv NFSSVC_AUTHINFAIL
-along with a pointer to a
-.Bd -literal
-struct nfsd_cargs {
-	char		*ncd_dirp;	/* Mount dir path */
-	uid_t		ncd_authuid;	/* Effective uid */
-	int		ncd_authtype;	/* Type of authenticator */
-	int		ncd_authlen;	/* Length of authenticator string */
-	u_char		*ncd_authstr;	/* Authenticator string */
-	int		ncd_verflen;	/* and the verifier */
-	u_char		*ncd_verfstr;
-	NFSKERBKEY_T	ncd_key;	/* Session key */
-};
-.Ed
-.Pp
-structure.
-The initial call has only the
-.Dv NFSSVC_MNTD
-flag set to specify service for the mount point.
-If the mount point is using Kerberos, then the
-.Xr mount_nfs 8
-utility will return from
-.Fn nfssvc
-with
-.Va errno
-==
-.Er ENEEDAUTH
-whenever the client side requires an ``rcmd''
-authentication ticket for the user.
-The
-.Xr mount_nfs 8
-utility will attempt to get the Kerberos ticket, and if successful will call
-.Fn nfssvc
-with the flags
-.Dv NFSSVC_MNTD
-and
-.Dv NFSSVC_GOTAUTH
-after filling the ticket into the
-ncd_authstr field
-and
-setting the ncd_authlen and ncd_authtype
-fields of the nfsd_cargs structure.
-If
-.Xr mount_nfs 8
-failed to get the ticket,
-.Fn nfssvc
-will be called with the flags
-.Dv NFSSVC_MNTD ,
-.Dv NFSSVC_GOTAUTH
-and
-.Dv NFSSVC_AUTHINFAIL
-to denote a failed authentication attempt.
-.Pp
-On the server side,
-.Fn nfssvc
-is called with the flag
-.Dv NFSSVC_NFSD
-and a pointer to a
-.Bd -literal
-struct nfsd_srvargs {
-	struct nfsd	*nsd_nfsd;	/* Pointer to in kernel nfsd struct */
-	uid_t		nsd_uid;	/* Effective uid mapped to cred */
-	uint32_t	nsd_haddr;	/* Ip address of client */
-	struct ucred	nsd_cr;		/* Cred. uid maps to */
-	int		nsd_authlen;	/* Length of auth string (ret) */
-	u_char		*nsd_authstr;	/* Auth string (ret) */
-	int		nsd_verflen;	/* and the verifier */
-	u_char		*nsd_verfstr;
-	struct timeval	nsd_timestamp;	/* timestamp from verifier */
-	uint32_t	nsd_ttl;	/* credential ttl (sec) */
-	NFSKERBKEY_T	nsd_key;	/* Session key */
-};
-.Ed
-.Pp
-to enter the kernel as an
-.Xr nfsd 8
-daemon.
-Whenever an
-.Xr nfsd 8
-daemon receives a Kerberos authentication ticket, it will return from
-.Fn nfssvc
-with
-.Va errno
-==
-.Er ENEEDAUTH .
-The
-.Xr nfsd 8
-utility will attempt to authenticate the ticket and generate a set of credentials
-on the server for the ``user id'' specified in the field nsd_uid.
-This is done by first authenticating the Kerberos ticket and then mapping
-the Kerberos principal to a local name and getting a set of credentials for
-that user via
-.Xr getpwnam 3
-and
-.Xr getgrouplist 3 .
-If successful, the
-.Xr nfsd 8
-utility will call
-.Fn nfssvc
-with the
-.Dv NFSSVC_NFSD
-and
-.Dv NFSSVC_AUTHIN
-flags set to pass the credential mapping in nsd_cr into the
-kernel to be cached on the server socket for that client.
-If the authentication failed,
-.Xr nfsd 8
-calls
-.Fn nfssvc
-with the flags
-.Dv NFSSVC_NFSD
-and
-.Dv NFSSVC_AUTHINFAIL
-to denote an authentication failure.
-.Pp
-The master
-.Xr nfsd 8
-server daemon calls
-.Fn nfssvc
-with the flag
-.Dv NFSSVC_ADDSOCK
-and a pointer to a
-.Bd -literal
-struct nfsd_args {
-	int	sock;	/* Socket to serve */
-	caddr_t	name;	/* Client address for connection based sockets */
-	int	namelen;/* Length of name */
-};
-.Ed
-.Pp
-to pass a server side
-.Tn NFS
-socket into the kernel for servicing by the
-.Xr nfsd 8
-daemons.
-.Sh RETURN VALUES
-Normally
-.Fn nfssvc
-does not return unless the server
-is terminated by a signal when a value of 0 is returned.
-Otherwise, -1 is returned and the global variable
-.Va errno
-is set to specify the error.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er ENEEDAUTH
-This special error value
-is really used for authentication support, particularly Kerberos,
-as explained above.
-.It Bq Er EPERM
-The caller is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr mount_nfs 8 ,
-.Xr nfsd 8 ,
-.Xr nfsiod 8
-.Sh HISTORY
-The
-.Fn nfssvc
-system call first appeared in
-.Bx 4.4 .
-.Sh BUGS
-The
-.Fn nfssvc
-system call is designed specifically for the
-.Tn NFS
-support daemons and as such is specific to their requirements.
-It should really return values to indicate the need for authentication
-support, since
-.Er ENEEDAUTH
-is not really an error.
-Several fields of the argument structures are assumed to be valid and
-sometimes to be unchanged from a previous call, such that
-.Fn nfssvc
-must be used with extreme care.
diff --git a/lib/libc_bsd/sys/ntp_adjtime.2 b/lib/libc_bsd/sys/ntp_adjtime.2
deleted file mode 100644
index dc55acc..0000000
--- a/lib/libc_bsd/sys/ntp_adjtime.2
+++ /dev/null
@@ -1,315 +0,0 @@
-.\"	$NetBSD: ntp_adjtime.2,v 1.6 2003/04/16 13:34:55 wiz Exp $
-.\"
-.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Thomas Klausner.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/ntp_adjtime.2 211397 2010-08-16 15:18:30Z joel $
-.\"
-.Dd July 13, 2005
-.Dt NTP_ADJTIME 2
-.Os
-.Sh NAME
-.Nm ntp_adjtime ,
-.Nm ntp_gettime
-.Nd Network Time Protocol (NTP) daemon interface system calls
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/timex.h
-.Ft int
-.Fn ntp_adjtime "struct timex *"
-.Ft int
-.Fn ntp_gettime "struct ntptimeval *"
-.Sh DESCRIPTION
-The two system calls
-.Fn ntp_adjtime
-and
-.Fn ntp_gettime
-are the kernel interface to the Network Time Protocol (NTP) daemon
-.Xr ntpd 8 .
-.Pp
-The
-.Fn ntp_adjtime
-function is used by the NTP daemon to adjust the system clock to an
-externally derived time.
-The time offset and related variables which are set by
-.Fn ntp_adjtime
-are used by
-.Fn hardclock
-to adjust the phase and frequency of the phase- or frequency-lock loop
-(PLL resp. FLL) which controls the system clock.
-.Pp
-The
-.Fn ntp_gettime
-function provides the time, maximum error (sync distance) and
-estimated error (dispersion) to client user application programs.
-.Pp
-In the following, all variables that refer PPS are only relevant if
-the
-.Em PPS_SYNC
-option is enabled in the kernel.
-.Pp
-.Fn ntp_adjtime
-has as argument a
-.Va struct timex *
-of the following form:
-.Bd -literal
-struct timex {
-	unsigned int modes;	/* clock mode bits (wo) */
-	long offset;		/* time offset (us) (rw) */
-	long freq;		/* frequency offset (scaled ppm) (rw) */
-	long maxerror;		/* maximum error (us) (rw) */
-	long esterror;		/* estimated error (us) (rw) */
-	int status;		/* clock status bits (rw) */
-	long constant;		/* pll time constant (rw) */
-	long precision;		/* clock precision (us) (ro) */
-	long tolerance;		/* clock frequency tolerance (scaled
-				 * ppm) (ro) */
-	/*
-	 * The following read-only structure members are implemented
-	 * only if the PPS signal discipline is configured in the
-	 * kernel.
-	 */
-	long ppsfreq;		/* pps frequency (scaled ppm) (ro) */
-	long jitter;		/* pps jitter (us) (ro) */
-	int shift;		/* interval duration (s) (shift) (ro) */
-	long stabil;		/* pps stability (scaled ppm) (ro) */
-	long jitcnt;		/* jitter limit exceeded (ro) */
-	long calcnt;		/* calibration intervals (ro) */
-	long errcnt;		/* calibration errors (ro) */
-	long stbcnt;		/* stability limit exceeded (ro) */
-};
-.Ed
-.Pp
-The members of this struct have the following meanings when used as
-argument for
-.Fn ntp_adjtime :
-.Bl -tag -width tolerance -compact
-.It Fa modes
-Defines what settings should be changed with the current
-.Fn ntp_adjtime
-call (write-only).
-Bitwise OR of the following:
-.Bl -tag -width MOD_TIMECONST -compact -offset indent
-.It MOD_OFFSET
-set time offset
-.It MOD_FREQUENCY
-set frequency offset
-.It MOD_MAXERROR
-set maximum time error
-.It MOD_ESTERROR
-set estimated time error
-.It MOD_STATUS
-set clock status bits
-.It MOD_TIMECONST
-set PLL time constant
-.It MOD_CLKA
-set clock A
-.It MOD_CLKB
-set clock B
-.El
-.It Fa offset
-Time offset (in microseconds), used by the PLL/FLL to adjust the
-system time in small increments (read-write).
-.It Fa freq
-Frequency offset (scaled ppm) (read-write).
-.It Fa maxerror
-Maximum error (in microseconds).
-Initialized by an
-.Fn ntp_adjtime
-call, and increased by the kernel once each second to reflect the maximum
-error bound growth (read-write).
-.It Fa esterror
-Estimated error (in microseconds).
-Set and read by
-.Fn ntp_adjtime ,
-but unused by the kernel (read-write).
-.It Fa status
-System clock status bits (read-write).
-Bitwise OR of the following:
-.Bl -tag -width STA_PPSJITTER -compact -offset indent
-.It STA_PLL
-Enable PLL updates (read-write).
-.It STA_PPSFREQ
-Enable PPS freq discipline (read-write).
-.It STA_PPSTIME
-Enable PPS time discipline (read-write).
-.It STA_FLL
-Select frequency-lock mode (read-write).
-.It STA_INS
-Insert leap (read-write).
-.It STA_DEL
-Delete leap (read-write).
-.It STA_UNSYNC
-Clock unsynchronized (read-write).
-.It STA_FREQHOLD
-Hold frequency (read-write).
-.It STA_PPSSIGNAL
-PPS signal present (read-only).
-.It STA_PPSJITTER
-PPS signal jitter exceeded (read-only).
-.It STA_PPSWANDER
-PPS signal wander exceeded (read-only).
-.It STA_PPSERROR
-PPS signal calibration error (read-only).
-.It STA_CLOCKERR
-Clock hardware fault (read-only).
-.El
-.It Fa constant
-PLL time constant, determines the bandwidth, or
-.Dq stiffness ,
-of the PLL (read-write).
-.It Fa precision
-Clock precision (in microseconds).
-In most cases the same as the kernel tick variable (see
-.Xr hz 9 ) .
-If a precision clock counter or external time-keeping signal is available,
-it could be much lower (and depend on the state of the signal)
-(read-only).
-.It Fa tolerance
-Maximum frequency error, or tolerance of the CPU clock oscillator (scaled
-ppm).
-Ordinarily a property of the architecture, but could change under
-the influence of external time-keeping signals (read-only).
-.It Fa ppsfreq
-PPS frequency offset produced by the frequency median filter (scaled
-ppm) (read-only).
-.It Fa jitter
-PPS jitter measured by the time median filter in microseconds
-(read-only).
-.It Fa shift
-Logarithm to base 2 of the interval duration in seconds (PPS,
-read-only).
-.It Fa stabil
-PPS stability (scaled ppm); dispersion (wander) measured by the
-frequency median filter (read-only).
-.It Fa jitcnt
-Number of seconds that have been discarded because the jitter measured
-by the time median filter exceeded the limit
-.Em MAXTIME
-(PPS, read-only).
-.It Fa calcnt
-Count of calibration intervals (PPS, read-only).
-.It Fa errcnt
-Number of calibration intervals that have been discarded because the
-wander exceeded the limit
-.Em MAXFREQ
-or where the calibration interval jitter exceeded two ticks (PPS,
-read-only).
-.It Fa stbcnt
-Number of calibration intervals that have been discarded because the
-frequency wander exceeded the limit
-.Em MAXFREQ Ns /4
-(PPS, read-only).
-.El
-After the
-.Fn ntp_adjtime
-call, the
-.Va struct timex *
-structure contains the current values of the corresponding variables.
-.Pp
-.Fn ntp_gettime
-has as argument a
-.Va struct ntptimeval *
-with the following members:
-.Bd -literal
-struct ntptimeval {
-	struct timeval time;	/* current time (ro) */
-	long maxerror;		/* maximum error (us) (ro) */
-	long esterror;		/* estimated error (us) (ro) */
-};
-.Ed
-.Pp
-These have the following meaning:
-.Bl -tag -width tolerance -compact
-.It Fa time
-Current time (read-only).
-.It Fa maxerror
-Maximum error in microseconds (read-only).
-.It Fa esterror
-Estimated error in microseconds (read-only).
-.El
-.Sh RETURN VALUES
-.Fn ntp_adjtime
-and
-.Fn ntp_gettime
-return the current state of the clock on success, or any of the errors
-of
-.Xr copyin 9
-and
-.Xr copyout 9 .
-.Fn ntp_adjtime
-may additionally return
-.Er EPERM
-if the user calling
-.Fn ntp_adjtime
-does not have sufficient permissions.
-.Pp
-Possible states of the clock are:
-.Bl -tag -width TIME_ERROR -compact -offset indent
-.It TIME_OK
-Everything okay, no leap second warning.
-.It TIME_INS
-.Dq insert leap second
-warning.
-At the end of the day, a leap second will be inserted after 23:59:59.
-.It TIME_DEL
-.Dq delete leap second
-warning.
-At the end of the day, second 23:59:59 will be skipped.
-.It TIME_OOP
-Leap second in progress.
-.It TIME_WAIT
-Leap second has occurred within the last few seconds.
-.It TIME_ERROR
-Clock not synchronized.
-.El
-.Sh ERRORS
-The
-.Fn ntp_adjtime
-system call may return
-.Er EPERM
-if the caller
-does not have sufficient permissions.
-.Sh SEE ALSO
-.Xr options 4 ,
-.Xr ntpd 8 ,
-.Xr hardclock 9 ,
-.Xr hz 9
-.Bl -tag -width indent
-.It Pa http://www.bipm.fr/enus/5_Scientific/c_time/time_1.html
-.It Pa http://www.boulder.nist.gov/timefreq/general/faq.htm
-.It Pa ftp://time.nist.gov/pub/leap-seconds.list
-.El
-.Sh BUGS
-Take note that this
-.Tn API
-is extremely complex and stateful.
-Users should not attempt modification without first
-reviewing the
-.Xr ntpd 8
-sources in depth.
diff --git a/lib/libc_bsd/sys/open.2 b/lib/libc_bsd/sys/open.2
deleted file mode 100644
index e7ae1fa..0000000
--- a/lib/libc_bsd/sys/open.2
+++ /dev/null
@@ -1,484 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)open.2	8.2 (Berkeley) 11/16/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/open.2 282962 2015-05-15 11:07:49Z trasz $
-.\"
-.Dd April 2, 2015
-.Dt OPEN 2
-.Os
-.Sh NAME
-.Nm open , openat
-.Nd open or create a file for reading, writing or executing
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.Ft int
-.Fn open "const char *path" "int flags" "..."
-.Ft int
-.Fn openat "int fd" "const char *path" "int flags" "..."
-.Sh DESCRIPTION
-The file name specified by
-.Fa path
-is opened
-for either execution or reading and/or writing as specified by the
-argument
-.Fa flags
-and the file descriptor returned to the calling process.
-The
-.Fa flags
-argument may indicate the file is to be
-created if it does not exist (by specifying the
-.Dv O_CREAT
-flag).
-In this case
-.Fn open
-and
-.Fn openat
-require an additional argument
-.Fa "mode_t mode" ,
-and the file is created with mode
-.Fa mode
-as described in
-.Xr chmod 2
-and modified by the process' umask value (see
-.Xr umask 2 ) .
-.Pp
-The
-.Fn openat
-function is equivalent to the
-.Fn open
-function except in the case where the
-.Fa path
-specifies a relative path.
-In this case the file to be opened is determined relative to the directory
-associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-The
-.Fa flag
-parameter and the optional fourth parameter correspond exactly to
-the parameters of
-.Fn open .
-If
-.Fn openat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used
-and the behavior is identical to a call to
-.Fn open .
-.Pp
-The flags specified are formed by
-.Em or Ns 'ing
-the following values
-.Pp
-.Bd -literal -offset indent -compact
-O_RDONLY	open for reading only
-O_WRONLY	open for writing only
-O_RDWR		open for reading and writing
-O_EXEC		open for execute only
-O_NONBLOCK	do not block on open
-O_APPEND	append on each write
-O_CREAT		create file if it does not exist
-O_TRUNC		truncate size to 0
-O_EXCL		error if create and file exists
-O_SHLOCK	atomically obtain a shared lock
-O_EXLOCK	atomically obtain an exclusive lock
-O_DIRECT	eliminate or reduce cache effects
-O_FSYNC		synchronous writes
-O_SYNC		synchronous writes
-O_NOFOLLOW	do not follow symlinks
-O_NOCTTY	ignored
-O_TTY_INIT	ignored
-O_DIRECTORY	error if file is not a directory
-O_CLOEXEC	set FD_CLOEXEC upon open
-.Ed
-.Pp
-Opening a file with
-.Dv O_APPEND
-set causes each write on the file
-to be appended to the end.
-If
-.Dv O_TRUNC
-is specified and the
-file exists, the file is truncated to zero length.
-If
-.Dv O_EXCL
-is set with
-.Dv O_CREAT
-and the file already
-exists,
-.Fn open
-returns an error.
-This may be used to
-implement a simple exclusive access locking mechanism.
-If
-.Dv O_EXCL
-is set and the last component of the pathname is
-a symbolic link,
-.Fn open
-will fail even if the symbolic
-link points to a non-existent name.
-If the
-.Dv O_NONBLOCK
-flag is specified and the
-.Fn open
-system call would result
-in the process being blocked for some reason (e.g., waiting for
-carrier on a dialup line),
-.Fn open
-returns immediately.
-The descriptor remains in non-blocking mode for subsequent operations.
-.Pp
-If
-.Dv O_FSYNC
-is used in the mask, all writes will
-immediately be written to disk,
-the kernel will not cache written data
-and all writes on the descriptor will not return until
-the data to be written completes.
-.Pp
-.Dv O_SYNC
-is a synonym for
-.Dv O_FSYNC
-required by
-.Tn POSIX .
-.Pp
-If
-.Dv O_NOFOLLOW
-is used in the mask and the target file passed to
-.Fn open
-is a symbolic link then the
-.Fn open
-will fail.
-.Pp
-When opening a file, a lock with
-.Xr flock 2
-semantics can be obtained by setting
-.Dv O_SHLOCK
-for a shared lock, or
-.Dv O_EXLOCK
-for an exclusive lock.
-If creating a file with
-.Dv O_CREAT ,
-the request for the lock will never fail
-(provided that the underlying file system supports locking).
-.Pp
-.Dv O_DIRECT
-may be used to minimize or eliminate the cache effects of reading and writing.
-The system will attempt to avoid caching the data you read or write.
-If it cannot avoid caching the data,
-it will minimize the impact the data has on the cache.
-Use of this flag can drastically reduce performance if not used with care.
-.Pp
-.Dv O_NOCTTY
-may be used to ensure the OS does not assign this file as the
-controlling terminal when it opens a tty device.
-This is the default on
-.Fx ,
-but is present for
-.Tn POSIX
-compatibility.
-The
-.Fn open
-system call will not assign controlling terminals on
-.Fx .
-.Pp
-.Dv O_TTY_INIT
-may be used to ensure the OS restores the terminal attributes when
-initially opening a TTY.
-This is the default on
-.Fx ,
-but is present for
-.Tn POSIX
-compatibility.
-The initial call to
-.Fn open
-on a TTY will always restore default terminal attributes on
-.Fx .
-.Pp
-.Dv O_DIRECTORY
-may be used to ensure the resulting file descriptor refers to a
-directory.
-This flag can be used to prevent applications with elevated privileges
-from opening files which are even unsafe to open with
-.Dv O_RDONLY ,
-such as device nodes.
-.Pp
-.Dv O_CLOEXEC
-may be used to set
-.Dv FD_CLOEXEC
-flag for the newly returned file descriptor.
-.Pp
-If successful,
-.Fn open
-returns a non-negative integer, termed a file descriptor.
-It returns \-1 on failure.
-The file pointer used to mark the current position within the
-file is set to the beginning of the file.
-.Pp
-If a sleeping open of a device node from
-.Xr devfs 5
-is interrupted by a signal, the call always fails with
-.Er EINTR ,
-even if the
-.Dv SA_RESTART
-flag is set for the signal.
-A sleeping open of a fifo (see
-.Xr mkfifo 2 )
-is restarted as normal.
-.Pp
-When a new file is created it is given the group of the directory
-which contains it.
-.Pp
-Unless
-.Dv O_CLOEXEC
-flag was specified,
-the new descriptor is set to remain open across
-.Xr execve 2
-system calls; see
-.Xr close 2 ,
-.Xr fcntl 2
-and
-.Dv O_CLOEXEC
-description.
-.Pp
-The system imposes a limit on the number of file descriptors
-open simultaneously by one process.
-The
-.Xr getdtablesize 2
-system call returns the current system limit.
-.Sh RETURN VALUES
-If successful,
-.Fn open
-and
-.Fn openat
-return a non-negative integer, termed a file descriptor.
-They return \-1 on failure, and set
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The named file is opened unless:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-.Dv O_CREAT
-is not set and the named file does not exist.
-.It Bq Er ENOENT
-A component of the path name that must exist does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EACCES
-The required permissions (for reading and/or writing)
-are denied for the given flags.
-.It Bq Er EACCES
-.Dv O_TRUNC
-is specified and write permission is denied.
-.It Bq Er EACCES
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and the directory in which it is to be created
-does not permit writing.
-.It Bq Er EPERM
-.Dv O_CREAT
-is specified, the file does not exist, and the directory in which it is to be
-created has its immutable flag set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EPERM
-The named file has its immutable flag set and the file is to be modified.
-.It Bq Er EPERM
-The named file has its append-only flag set, the file is to be modified, and
-.Dv O_TRUNC
-is specified or
-.Dv O_APPEND
-is not specified.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EISDIR
-The named file is a directory, and the arguments specify
-it is to be modified.
-.It Bq Er EROFS
-The named file resides on a read-only file system,
-and the file is to be modified.
-.It Bq Er EROFS
-.Dv O_CREAT
-is specified and the named file would reside on a read-only file system.
-.It Bq Er EMFILE
-The process has already reached its limit for open file descriptors.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er EMLINK
-.Dv O_NOFOLLOW
-was specified and the target is a symbolic link.
-.It Bq Er ENXIO
-The named file is a character special or block
-special file, and the device associated with this special file
-does not exist.
-.It Bq Er ENXIO
-.Dv O_NONBLOCK
-is set, the named file is a fifo,
-.Dv O_WRONLY
-is set, and no process has the file open for reading.
-.It Bq Er EINTR
-The
-.Fn open
-operation was interrupted by a signal.
-.It Bq Er EOPNOTSUPP
-.Dv O_SHLOCK
-or
-.Dv O_EXLOCK
-is specified but the underlying file system does not support locking.
-.It Bq Er EOPNOTSUPP
-The named file is a special file mounted through a file system that
-does not support access to it (e.g.\& NFS).
-.It Bq Er EWOULDBLOCK
-.Dv O_NONBLOCK
-and one of
-.Dv O_SHLOCK
-or
-.Dv O_EXLOCK
-is specified and the file is locked.
-.It Bq Er ENOSPC
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and the directory in which the entry for the new file is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-.It Bq Er ENOSPC
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and there are no free inodes on the file system on which the
-file is being created.
-.It Bq Er EDQUOT
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and the directory in which the entry for the new file
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-.It Bq Er EDQUOT
-.Dv O_CREAT
-is specified,
-the file does not exist,
-and the user's quota of inodes on the file system on
-which the file is being created has been exhausted.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry or
-allocating the inode for
-.Dv O_CREAT .
-.It Bq Er ETXTBSY
-The file is a pure procedure (shared text) file that is being
-executed and the
-.Fn open
-system call requests write access.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.It Bq Er EEXIST
-.Dv O_CREAT
-and
-.Dv O_EXCL
-were specified and the file exists.
-.It Bq Er EOPNOTSUPP
-An attempt was made to open a socket (not currently implemented).
-.It Bq Er EINVAL
-An attempt was made to open a descriptor with an illegal combination
-of
-.Dv O_RDONLY ,
-.Dv O_WRONLY ,
-.Dv O_RDWR
-and
-.Dv O_EXEC .
-.It Bq Eq EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is
-neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Eq ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.It Bq Eq ENOTDIR
-.Dv O_DIRECTORY
-is specified and the file is not a directory.
-.El
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr close 2 ,
-.Xr dup 2 ,
-.Xr fexecve 2 ,
-.Xr fhopen 2 ,
-.Xr getdtablesize 2 ,
-.Xr getfh 2 ,
-.Xr lgetfh 2 ,
-.Xr lseek 2 ,
-.Xr read 2 ,
-.Xr umask 2 ,
-.Xr write 2 ,
-.Xr fopen 3
-.Sh HISTORY
-The
-.Fn open
-function appeared in
-.At v6 .
-The
-.Fn openat
-function was introduced in
-.Fx 8.0 .
-.Sh BUGS
-The Open Group Extended API Set 2 specification requires that the test
-for whether
-.Fa fd
-is searchable is based on whether
-.Fa fd
-is open for searching, not whether the underlying directory currently
-permits searches.
-The present implementation of the
-.Fa openat
-checks the current permissions of directory instead.
diff --git a/lib/libc_bsd/sys/open.c b/lib/libc_bsd/sys/open.c
deleted file mode 100644
index 8190f3f..0000000
--- a/lib/libc_bsd/sys/open.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/open.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <stdarg.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_open, __open);
-
-#pragma weak open
-int
-open(const char *path, int flags, ...)
-{
-	va_list ap;
-	int mode;
-
-	if ((flags & O_CREAT) != 0) {
-		va_start(ap, flags);
-		mode = va_arg(ap, int);
-		va_end(ap);
-	} else {
-		mode = 0;
-	}
-	return (((int (*)(int, const char *, int, ...))
-	    __libc_interposing[INTERPOS_openat])(AT_FDCWD, path, flags, mode));
-}
diff --git a/lib/libc_bsd/sys/openat.c b/lib/libc_bsd/sys/openat.c
deleted file mode 100644
index 07d59e3..0000000
--- a/lib/libc_bsd/sys/openat.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/openat.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/fcntl.h>
-#include <stdarg.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_openat, __openat);
-__sym_compat(openat, __impl_openat, FBSD_1.1);
-__weak_reference(openat, __impl_openat);
-__sym_default(openat, openat, FBSD_1.2);
-
-#pragma weak openat
-int
-openat(int fd, const char *path, int flags, ...)
-{
-	va_list ap;
-	int mode;
-
-	if ((flags & O_CREAT) != 0) {
-		va_start(ap, flags);
-		mode = va_arg(ap, int);
-		va_end(ap);
-	} else {
-		mode = 0;
-	}
-	return (((int (*)(int, const char *, int, ...))
-	    __libc_interposing[INTERPOS_openat])(fd, path, flags, mode));
-}
diff --git a/lib/libc_bsd/sys/pathconf.2 b/lib/libc_bsd/sys/pathconf.2
deleted file mode 100644
index 9fa6d04..0000000
--- a/lib/libc_bsd/sys/pathconf.2
+++ /dev/null
@@ -1,261 +0,0 @@
-.\" Copyright (c) 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.
-.\" 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.
-.\"
-.\"	@(#)pathconf.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/pathconf.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.Dd July 7, 2009
-.Dt PATHCONF 2
-.Os
-.Sh NAME
-.Nm pathconf ,
-.Nm lpathconf ,
-.Nm fpathconf
-.Nd get configurable pathname variables
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft long
-.Fn pathconf "const char *path" "int name"
-.Ft long
-.Fn lpathconf "const char *path" "int name"
-.Ft long
-.Fn fpathconf "int fd" "int name"
-.Sh DESCRIPTION
-The
-.Fn pathconf ,
-.Fn lpathconf
-and
-.Fn fpathconf
-system calls provide a method for applications to determine the current
-value of a configurable system limit or option variable associated
-with a pathname or file descriptor.
-.Pp
-For
-.Fn pathconf
-and
-.Fn lpathconf ,
-the
-.Fa path
-argument is the name of a file or directory.
-For
-.Fn fpathconf ,
-the
-.Fa fd
-argument is an open file descriptor.
-The
-.Fa name
-argument specifies the system variable to be queried.
-Symbolic constants for each name value are found in the include file
-.Li <unistd.h> .
-.Pp
-The
-.Fn lpathconf
-system call is like
-.Fn pathconf
-except in the case where the named file is a symbolic link,
-in which case
-.Fn lpathconf
-returns information about the link,
-while
-.Fn pathconf
-returns information about the file the link references.
-.Pp
-The available values are as follows:
-.Bl -tag -width 6n
-.It Li _PC_LINK_MAX
-The maximum file link count.
-.It Li _PC_MAX_CANON
-The maximum number of bytes in terminal canonical input line.
-.It Li _PC_MAX_INPUT
-The minimum maximum number of bytes for which space is available in
-a terminal input queue.
-.It Li _PC_NAME_MAX
-The maximum number of bytes in a file name.
-.It Li _PC_PATH_MAX
-The maximum number of bytes in a pathname.
-.It Li _PC_PIPE_BUF
-The maximum number of bytes which will be written atomically to a pipe.
-.It Li _PC_CHOWN_RESTRICTED
-Return 1 if appropriate privilege is required for the
-.Xr chown 2
-system call, otherwise 0.
-.St -p1003.1-2001
-requires appropriate privilege in all cases, but this behavior was optional
-in prior editions of the standard.
-.It Li _PC_NO_TRUNC
-Return greater than zero if attempts to use pathname components longer than
-.Brq Dv NAME_MAX
-will result in an
-.Bq Er ENAMETOOLONG
-error; otherwise, such components will be truncated to
-.Brq Dv NAME_MAX .
-.St -p1003.1-2001
-requires the error in all cases, but this behavior was optional in prior
-editions of the standard, and some
-.No non- Ns Tn POSIX Ns -compliant
-file systems do not support this behavior.
-.It Li _PC_VDISABLE
-Returns the terminal character disabling value.
-.It Li _PC_ASYNC_IO
-Return 1 if asynchronous I/O is supported, otherwise 0.
-.It Li _PC_PRIO_IO
-Returns 1 if prioritised I/O is supported for this file,
-otherwise 0.
-.It Li _PC_SYNC_IO
-Returns 1 if synchronised I/O is supported for this file, otherwise 0.
-.It Li _PC_ALLOC_SIZE_MIN
-Minimum number of bytes of storage allocated for any portion of a file.
-.It Li _PC_FILESIZEBITS
-Number of bits needed to represent the maximum file size.
-.It Li _PC_REC_INCR_XFER_SIZE
-Recommended increment for file transfer sizes between
-.Dv _PC_REC_MIN_XFER_SIZE
-and
-.Dv _PC_REC_MAX_XFER_SIZE .
-.It Li _PC_REC_MAX_XFER_SIZE
-Maximum recommended file transfer size.
-.It Li _PC_REC_MIN_XFER_SIZE
-Minimum recommended file transfer size.
-.It Li _PC_REC_XFER_ALIGN
-Recommended file transfer buffer alignment.
-.It Li _PC_SYMLINK_MAX
-Maximum number of bytes in a symbolic link.
-.It Li _PC_ACL_EXTENDED
-Returns 1 if an Access Control List (ACL) can be set on the specified
-file, otherwise 0.
-.It Li _PC_ACL_NFS4
-Returns 1 if an NFSv4 ACLs can be set on the specified
-file, otherwise 0.
-.It Li _PC_ACL_PATH_MAX
-Maximum number of ACL entries per file.
-.It Li _PC_CAP_PRESENT
-Returns 1 if a capability state can be set on the specified file,
-otherwise 0.
-.It Li _PC_INF_PRESENT
-Returns 1 if an information label can be set on the specified file,
-otherwise 0.
-.It Li _PC_MAC_PRESENT
-Returns 1 if a Mandatory Access Control (MAC) label can be set on the
-specified file, otherwise 0.
-.It Li _PC_MIN_HOLE_SIZE
-If a file system supports the reporting of holes (see
-.Xr lseek 2 ) ,
-.Fn pathconf
-and
-.Fn fpathconf
-return a positive number that represents the minimum hole size returned in
-bytes.
-The offsets of holes returned will be aligned to this same value.
-A special value of 1 is returned if the file system does not specify the minimum
-hole size but still reports holes.
-.El
-.Sh RETURN VALUES
-If the call to
-.Fn pathconf
-or
-.Fn fpathconf
-is not successful, \-1 is returned and
-.Va errno
-is set appropriately.
-Otherwise, if the variable is associated with functionality that does
-not have a limit in the system, \-1 is returned and
-.Va errno
-is not modified.
-Otherwise, the current variable value is returned.
-.Sh ERRORS
-If any of the following conditions occur, the
-.Fn pathconf
-and
-.Fn fpathconf
-system calls shall return -1 and set
-.Va errno
-to the corresponding value.
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa name
-argument is invalid.
-.It Bq Er EINVAL
-The implementation does not support an association of the variable
-name with the associated file.
-.El
-.Pp
-The
-.Fn pathconf
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Brq Dv NAME_MAX
-characters (but see
-.Dv _PC_NO_TRUNC
-above),
-or an entire path name exceeded
-.Brq Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Pp
-The
-.Fn fpathconf
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid open file descriptor.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr lseek 2 ,
-.Xr sysctl 3
-.Sh HISTORY
-The
-.Fn pathconf
-and
-.Fn fpathconf
-system calls first appeared in
-.Bx 4.4 .
-The
-.Fn lpathconf
-system call first appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/pdfork.2 b/lib/libc_bsd/sys/pdfork.2
deleted file mode 100644
index a1fa9af..0000000
--- a/lib/libc_bsd/sys/pdfork.2
+++ /dev/null
@@ -1,197 +0,0 @@
-.\"
-.\" Copyright (c) 2009-2010, 2012-2013 Robert N. M. Watson
-.\" All rights reserved.
-.\"
-.\" This software was developed at the University of Cambridge Computer
-.\" Laboratory with support from a grant from Google, Inc.
-.\"
-.\" This software was developed by SRI International and the University of
-.\" Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
-.\" ("CTSRD"), as part of the DARPA CRASH research programme.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/pdfork.2 255002 2013-08-28 20:00:25Z rwatson $
-.\"
-.Dd August 28, 2013
-.Dt PDFORK 2
-.Os
-.Sh NAME
-.Nm pdfork ,
-.Nm pdgetpid ,
-.Nm pdkill ,
-.Nm pdwait4
-.Nd System calls to manage process descriptors
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/procdesc.h
-.Ft int
-.Fn pdfork "int *fdp" "int flags"
-.Ft int
-.Fn pdgetpid "int fd" "pid_t *pidp"
-.Ft int
-.Fn pdkill "int fd" "int signum"
-.Ft int
-.Fn pdwait4 "int fd" "int *status" "int options" "struct rusage *rusage"
-.Sh DESCRIPTION
-Process descriptors are special file descriptors that represent processes,
-and are created using
-.Fn pdfork ,
-a variant of
-.Xr fork 2 ,
-which, if successful, returns a process descriptor in the integer pointed to
-by
-.Fa fdp .
-Processes created via
-.Fn pdfork
-will not cause
-.Dv SIGCHLD
-on termination.
-.Fn pdfork
-can accept the flags:
-.Bl -tag -width ".Dv PD_DAEMON"
-.It Dv PD_DAEMON
-Instead of the default terminate-on-close behaviour, allow the process to
-live until it is explicitly killed with
-.Xr kill 2 .
-.Pp
-This option is not permitted in
-.Xr capsicum 4
-capability mode (see
-.Xr cap_enter 2 ) .
-.El
-.Pp
-.Fn pdgetpid
-queries the process ID (PID) in the process descriptor
-.Fa fd .
-.Pp
-.Fn pdkill
-is functionally identical to
-.Xr kill 2 ,
-except that it accepts a process descriptor,
-.Fa fd ,
-rather than a PID.
-.Pp
-.Fn pdwait4
-behaves identically to
-.Xr wait4 2 ,
-but operates with respect to a process descriptor argument rather than a PID.
-.Pp
-The following system calls also have effects specific to process descriptors:
-.Pp
-.Xr fstat 2
-queries status of a process descriptor; currently only the
-.Fa st_mode ,
-.Fa st_birthtime ,
-.Fa st_atime ,
-.Fa st_ctime
-and
-.Fa st_mtime
-fields are defined.
-If the owner read, write, and execute bits are set then the
-process represented by the process descriptor is still alive.
-.Pp
-.Xr poll 2
-and
-.Xr select 2
-allow waiting for process state transitions; currently only
-.Dv POLLHUP
-is defined, and will be raised when the process dies.
-.Pp
-.Xr close 2
-will close the process descriptor unless
-.Dv PD_DAEMON
-is set; if the process is still alive and this is
-the last reference to the process descriptor, the process will be terminated
-with the signal
-.Dv SIGKILL .
-.Pp
-.Nm
-and associated functions depend on
-.Cd "options PROCDESC"
-described in
-.Xr procdesc 4 .
-.Sh RETURN VALUES
-.Fn pdfork
-returns a PID, 0 or -1, as
-.Xr fork 2
-does.
-.Pp
-.Fn pdgetpid
-and
-.Fn pdkill
-return 0 on success and -1 on failure.
-.Pp
-.Fn pdwait4
-returns a PID on success and -1 on failure.
-.Sh ERRORS
-These functions may return the same error numbers as their PID-based equivalents
-(e.g.
-.Fn pdfork
-may return the same error numbers as
-.Xr fork 2 ) ,
-with the following additions:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The signal number given to
-.Fn pdkill
-is invalid.
-.It Bq Er ENOTCAPABLE
-The process descriptor being operated on has insufficient rights (e.g.
-.Dv CAP_PDKILL
-for
-.Fn pdkill ) .
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr fork 2 ,
-.Xr fstat 2 ,
-.Xr kill 2 ,
-.Xr poll 2 ,
-.Xr wait4 2 ,
-.Xr capsicum 4 ,
-.Xr procdesc 4
-.Sh HISTORY
-The
-.Fn pdfork ,
-.Fn pdgetpid ,
-.Fn pdkill
-and
-.Fn pdwait4
-system calls first appeared in
-.Fx 9.0 .
-.Pp
-Support for process descriptors mode was developed as part of the
-.Tn TrustedBSD
-Project.
-.Sh AUTHORS
-.An -nosplit
-These functions and the capability facility were created by
-.An "Robert N. M. Watson" Aq rwatson@FreeBSD.org
-and
-.An "Jonathan Anderson" Aq jonathan@FreeBSD.org
-at the University of Cambridge Computer Laboratory with support from a grant
-from Google, Inc.
-.Sh BUGS
-.Fn pdwait4
-has not yet been implemented.
diff --git a/lib/libc_bsd/sys/pipe.2 b/lib/libc_bsd/sys/pipe.2
deleted file mode 100644
index 5e3d8b1..0000000
--- a/lib/libc_bsd/sys/pipe.2
+++ /dev/null
@@ -1,156 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)pipe.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/pipe.2 260867 2014-01-18 22:47:25Z jilles $
-.\"
-.Dd May 1, 2013
-.Dt PIPE 2
-.Os
-.Sh NAME
-.Nm pipe ,
-.Nm pipe2
-.Nd create descriptor pair for interprocess communication
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn pipe "int fildes[2]"
-.Ft int
-.Fn pipe2 "int fildes[2]" "int flags"
-.Sh DESCRIPTION
-The
-.Fn pipe
-system call
-creates a
-.Em pipe ,
-which is an object allowing
-bidirectional data flow,
-and allocates a pair of file descriptors.
-.Pp
-The
-.Fn pipe2
-system call allows control over the attributes of the file descriptors
-via the
-.Fa flags
-argument.
-Values for
-.Fa flags
-are constructed by a bitwise-inclusive OR of flags from the following
-list, defined in
-.In fcntl.h :
-.Bl -tag -width ".Dv O_NONBLOCK"
-.It Dv O_CLOEXEC
-Set the close-on-exec flag for the new file descriptors.
-.It Dv O_NONBLOCK
-Set the non-blocking flag for the ends of the pipe.
-.El
-.Pp
-If the
-.Fa flags
-argument is 0, the behavior is identical to a call to
-.Fn pipe .
-.Pp
-By convention, the first descriptor is normally used as the
-.Em read end
-of the pipe,
-and the second is normally the
-.Em write end ,
-so that data written to
-.Fa fildes[1]
-appears on (i.e., can be read from)
-.Fa fildes[0] .
-This allows the output of one program to be
-sent
-to another program:
-the source's standard output is set up to be
-the write end of the pipe,
-and the sink's standard input is set up to be
-the read end of the pipe.
-The pipe itself persists until all its associated descriptors are
-closed.
-.Pp
-A pipe that has had an end closed is considered
-.Em widowed .
-Writing on such a pipe causes the writing process to receive
-a
-.Dv SIGPIPE
-signal.
-Widowing a pipe is the only way to deliver end-of-file to a reader:
-after the reader consumes any buffered data, reading a widowed pipe
-returns a zero count.
-.Pp
-The bidirectional nature of this implementation of pipes is not
-portable to older systems, so it is recommended to use the convention
-for using the endpoints in the traditional manner when using a
-pipe in one direction.
-.Sh RETURN VALUES
-.Rv -std pipe
-.Sh ERRORS
-The
-.Fn pipe
-and
-.Fn pipe2
-system calls will fail if:
-.Bl -tag -width Er
-.It Bq Er EMFILE
-Too many descriptors are active.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er ENOMEM
-Not enough kernel memory to establish a pipe.
-.El
-.Pp
-The
-.Fn pipe2
-system call will also fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa flags
-argument is invalid.
-.El
-.Sh SEE ALSO
-.Xr sh 1 ,
-.Xr fork 2 ,
-.Xr read 2 ,
-.Xr socketpair 2 ,
-.Xr write 2
-.Sh HISTORY
-The
-.Fn pipe
-function appeared in
-.At v3 .
-.Pp
-Bidirectional pipes were first used on
-.At V.4 .
-.Pp
-The
-.Fn pipe2
-function appeared in
-.Fx 10.0 .
diff --git a/lib/libc_bsd/sys/poll.2 b/lib/libc_bsd/sys/poll.2
deleted file mode 100644
index d5b8358..0000000
--- a/lib/libc_bsd/sys/poll.2
+++ /dev/null
@@ -1,274 +0,0 @@
-.\"	$NetBSD: poll.2,v 1.3 1996/09/07 21:53:08 mycroft Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/sys/poll.2 275986 2014-12-21 07:58:28Z dchagin $
-.\"
-.\" Copyright (c) 1996 Charles M. Hannum.  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 Charles M. Hannum.
-.\" 4. 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 ``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 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.
-.\"
-.Dd November 13, 2014
-.Dt POLL 2
-.Os
-.Sh NAME
-.Nm poll
-.Nd synchronous I/O multiplexing
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In poll.h
-.Ft int
-.Fn poll "struct pollfd fds[]" "nfds_t nfds" "int timeout"
-.Ft int
-.Fo ppoll
-.Fa "struct pollfd fds[]"
-.Fa "nfds_t nfds"
-.Fa "const struct timespec * restrict timeout"
-.Fa "const sigset_t * restrict newsigmask"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn poll
-system call
-examines a set of file descriptors to see if some of them are ready for
-I/O.
-The
-.Fa fds
-argument is a pointer to an array of pollfd structures as defined in
-.In poll.h
-(shown below).
-The
-.Fa nfds
-argument determines the size of the
-.Fa fds
-array.
-.Bd -literal
-struct pollfd {
-    int    fd;       /* file descriptor */
-    short  events;   /* events to look for */
-    short  revents;  /* events returned */
-};
-.Ed
-.Pp
-The fields of
-.Fa struct pollfd
-are as follows:
-.Bl -tag -width XXXrevents
-.It fd
-File descriptor to poll.
-If fd is equal to -1 then
-.Fa revents
-is cleared (set to zero), and that pollfd is not checked.
-.It events
-Events to poll for.
-(See below.)
-.It revents
-Events which may occur.
-(See below.)
-.El
-.Pp
-The event bitmasks in
-.Fa events
-and
-.Fa revents
-have the following bits:
-.Bl -tag -width XXXPOLLWRNORM
-.It POLLIN
-Data other than high priority data may be read without blocking.
-.It POLLRDNORM
-Normal data may be read without blocking.
-.It POLLRDBAND
-Data with a non-zero priority may be read without blocking.
-.It POLLPRI
-High priority data may be read without blocking.
-.It POLLOUT
-.It POLLWRNORM
-Normal data may be written without blocking.
-.It POLLWRBAND
-Data with a non-zero priority may be written without blocking.
-.It POLLERR
-An exceptional condition has occurred on the device or socket.
-This
-flag is always checked, even if not present in the
-.Fa events
-bitmask.
-.It POLLHUP
-The device or socket has been disconnected.
-This flag is always
-checked, even if not present in the
-.Fa events
-bitmask.
-Note that
-POLLHUP
-and
-POLLOUT
-should never be present in the
-.Fa revents
-bitmask at the same time.
-.It POLLNVAL
-The file descriptor is not open.
-This flag is always checked, even
-if not present in the
-.Fa events
-bitmask.
-.El
-.Pp
-If
-.Fa timeout
-is neither zero nor INFTIM (-1), it specifies a maximum interval to
-wait for any file descriptor to become ready, in milliseconds.
-If
-.Fa timeout
-is INFTIM (-1), the poll blocks indefinitely.
-If
-.Fa timeout
-is zero, then
-.Fn poll
-will return without blocking.
-.Pp
-The
-.Fn ppoll 
-system call, unlike 
-.Fn poll ,
-is used to safely wait until either a set of file descriptors becomes
-ready or until a signal is caught.
-The
-.Fa fds
-and
-.Fa nfds
-arguments are identical to the analogous arguments of
-.Fn poll .
-The
-.Fa timeout
-argument in
-.Fn ppoll
-points to a
-.Vt "const struct timespec"
-which is defined in
-.In sys/timespec.h
-(shown below) rather than the
-.Vt "int timeout"
-used by
-.Fn poll .
-A null pointer may be passed to indicate that
-.Fn ppoll
-should wait indefinitely.
-Finally, 
-.Fa newsigmask
-specifies a signal mask which is set while waiting for input.
-When 
-.Fn ppoll
-returns, the original signal mask is restored.
-.Pp
-.Bd -literal
-struct timespec {
-	time_t  tv_sec;         /* seconds */
-	long    tv_nsec;        /* and nanoseconds */
-};
-.Ed
-.Sh RETURN VALUES
-The
-.Fn poll
-system call
-returns the number of descriptors that are ready for I/O, or -1 if an
-error occurred.
-If the time limit expires,
-.Fn poll
-returns 0.
-If
-.Fn poll
-returns with an error,
-including one due to an interrupted system call,
-the
-.Fa fds
-array will be unmodified.
-.Sh COMPATIBILITY
-This implementation differs from the historical one in that a given
-file descriptor may not cause
-.Fn poll
-to return with an error.
-In cases where this would have happened in
-the historical implementation (e.g.\& trying to poll a
-.Xr revoke 2 Ns ed
-descriptor), this implementation instead copies the
-.Fa events
-bitmask to the
-.Fa revents
-bitmask.
-Attempting to perform I/O on this descriptor will then
-return an error.
-This behaviour is believed to be more useful.
-.Sh ERRORS
-An error return from
-.Fn poll
-indicates:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa fds
-argument
-points outside the process's allocated address space.
-.It Bq Er EINTR
-A signal was delivered before the time limit expired and
-before any of the selected events occurred.
-.It Bq Er EINVAL
-The specified time limit is invalid. One of its components is negative or too large.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr connect 2 ,
-.Xr kqueue 2 ,
-.Xr pselect 2 ,
-.Xr read 2 ,
-.Xr recv 2 ,
-.Xr select 2 ,
-.Xr send 2 ,
-.Xr write 2
-.Sh STANDARDS
-The
-.Fn poll 
-function conforms to
-.St -p1003.1-2001 .
-The
-.Fn ppoll 
-is not specified by POSIX.
-.Sh HISTORY
-The
-.Fn poll
-function appeared in
-.At V .
-This manual page and the core of the implementation was taken from
-.Nx .
-The
-.Fn ppoll
-function first appeared in 
-.Fx 11.0 
-.Sh BUGS
-The distinction between some of the fields in the
-.Fa events
-and
-.Fa revents
-bitmasks is really not useful without STREAMS.
-The fields are
-defined for compatibility with existing software.
diff --git a/lib/libc_bsd/sys/poll.c b/lib/libc_bsd/sys/poll.c
deleted file mode 100644
index 23a2eac..0000000
--- a/lib/libc_bsd/sys/poll.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/poll.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/poll.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_poll, __poll);
-
-#pragma weak poll
-int
-poll(struct pollfd pfd[], nfds_t nfds, int timeout)
-{
-
-	return (((int (*)(struct pollfd *, nfds_t, int))
-	    __libc_interposing[INTERPOS_poll])(pfd, nfds, timeout));
-}
diff --git a/lib/libc_bsd/sys/posix_fadvise.2 b/lib/libc_bsd/sys/posix_fadvise.2
deleted file mode 100644
index d5d11f8..0000000
--- a/lib/libc_bsd/sys/posix_fadvise.2
+++ /dev/null
@@ -1,137 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)madvise.2	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/posix_fadvise.2 261560 2014-02-06 19:47:17Z kib $
-.\"
-.Dd January 30, 2014
-.Dt POSIX_FADVISE 2
-.Os
-.Sh NAME
-.Nm posix_fadvise
-.Nd give advice about use of file data
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.Ft int
-.Fn posix_fadvise "int fd" "off_t offset" "off_t len" "int advice"
-.Sh DESCRIPTION
-The
-.Fn posix_fadvise
-system call
-allows a process to describe to the system its data access behavior for an
-open file descriptor
-.Fa fd .
-The advice covers the data starting at offset
-.Fa offset
-and continuing for
-.Fa len
-bytes.
-If
-.Fa len
-is zero,
-all data from
-.Fa offset
-to the end of the file is covered.
-.Pp
-The behavior is specified by the
-.Fa advice
-parameter and may be one of:
-.Bl -tag -width POSIX_FADV_SEQUENTIAL
-.It Dv POSIX_FADV_NORMAL
-Tells the system to revert to the default data access behavior.
-.It Dv POSIX_FADV_RANDOM
-Is a hint that file data will be accessed randomly,
-and prefetching is likely not advantageous.
-.It Dv POSIX_FADV_SEQUENTIAL
-Tells the system that file data will be accessed sequentially.
-This currently does nothing as the default behavior uses heuristics to
-detect sequential behavior.
-.It Dv POSIX_FADV_WILLNEED
-Tells the system that the specified data will be accessed in the near future.
-The system may initiate an asynchronous read of the data if it is not already
-present in memory.
-.It Dv POSIX_FADV_DONTNEED
-Tells the system that the specified data will not be accessed in the near
-future.
-The system may decrease the in-memory priority of clean data within the
-specified range and future access to this data may require a read operation.
-.It Dv POSIX_FADV_NOREUSE
-Tells the system that the specified data will only be accessed once and
-then not reused.
-The system may decrease the in-memory priority of data once it has been
-read or written.
-Future access to this data may require a read operation.
-.El
-.Sh RETURN VALUES
-.Rv -std posix_fadvise
-.Sh ERRORS
-The
-.Fn posix_fadvise
-system call returns zero on success, and an error on failure:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-The
-.Fa advice
-argument is not valid.
-.It Bq Er EINVAL
-The
-.Fa offset
-or
-.Fa len
-arguments are negative,
-or
-.Fa offset
-+
-.Fa len
-is greater than the maximum file size.
-.It Bq Er ENODEV
-The
-.Fa fd
-argument does not refer to a regular file.
-.It Bq Er ESPIPE
-The
-.Fa fd
-argument is associated with a pipe or FIFO.
-.El
-.Sh SEE ALSO
-.Xr madvise 2
-.Sh STANDARDS
-The
-.Fn posix_fadvise
-interface conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn posix_fadvise
-system call first appeared in
-.Fx 9.1 .
diff --git a/lib/libc_bsd/sys/posix_fallocate.2 b/lib/libc_bsd/sys/posix_fallocate.2
deleted file mode 100644
index 9c0b7f8..0000000
--- a/lib/libc_bsd/sys/posix_fallocate.2
+++ /dev/null
@@ -1,144 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)open.2	8.2 (Berkeley) 11/16/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/posix_fallocate.2 261560 2014-02-06 19:47:17Z kib $
-.\"
-.Dd January 23, 2014
-.Dt POSIX_FALLOCATE 2
-.Os
-.Sh NAME
-.Nm posix_fallocate
-.Nd pre-allocate storage for a range in a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In fcntl.h
-.Ft int
-.Fn posix_fallocate "int fd" "off_t offset" "off_t len"
-.Sh DESCRIPTION
-Required storage for the range
-.Fa offset
-to
-.Fa offset +
-.Fa len
-in the file referenced by
-.Fa fd
-is guaranteed to be allocated upon successful return.
-That is, if
-.Fn posix_fallocate
-returns successfully, subsequent writes to the specified file data
-will not fail due to lack of free space on the file system storage
-media.
-Any existing file data in the specified range is unmodified.
-If
-.Fa offset +
-.Fa len
-is beyond the current file size, then
-.Fn posix_fallocate
-will adjust the file size to
-.Fa offset +
-.Fa len .
-Otherwise, the file size will not be changed.
-.Pp
-Space allocated by
-.Fn posix_fallocate
-will be freed by a successful call to
-.Xr creat 2
-or
-.Xr open 2
-that truncates the size of the file.
-Space allocated via
-.Fn posix_fallocate
-may be freed by a successful call to
-.Xr ftruncate 2
-that reduces the file size to a size smaller than
-.Fa offset +
-.Fa len .
-.Sh RETURN VALUES
-If successful,
-.Fn posix_fallocate
-returns zero.
-It returns an error on failure, without setting
-.Va errno .
-.Sh ERRORS
-Possible failure conditions:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid file descriptor.
-.It Bq Er EBADF
-The
-.Fa fd
-argument references a file that was opened without write permission.
-.It Bq Er EFBIG
-The value of
-.Fa offset +
-.Fa len
-is greater than the maximum file size.
-.It Bq Er EINTR
-A signal was caught during execution.
-.It Bq Er EINVAL
-The
-.Fa len
-argument was less than or equal to zero or the
-.Fa offset
-argument was less than zero.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to a file system.
-.It Bq Er ENODEV
-The
-.Fa fd
-argument does not refer to a regular file.
-.It Bq Er ENOSPC
-There is insufficient free space remaining on the file system storage
-media.
-.It Bq Er ESPIPE
-The
-.Fa fd
-argument is associated with a pipe or FIFO.
-.El
-.Sh SEE ALSO
-.Xr creat 2 ,
-.Xr ftruncate 2 ,
-.Xr open 2 ,
-.Xr unlink 2
-.Sh STANDARDS
-The
-.Fn posix_fallocate
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-The
-.Fn posix_fallocate
-function appeared in
-.Fx 9.0 .
-.Sh AUTHORS
-.Fn posix_fallocate
-and this manual page were initially written by
-.An Matthew Fleming Aq mdf@FreeBSD.org .
diff --git a/lib/libc_bsd/sys/posix_openpt.2 b/lib/libc_bsd/sys/posix_openpt.2
deleted file mode 100644
index daf4552..0000000
--- a/lib/libc_bsd/sys/posix_openpt.2
+++ /dev/null
@@ -1,140 +0,0 @@
-.\" Copyright (c) 2008 Ed Schouten <ed@FreeBSD.org>
-.\" All rights reserved.
-.\"
-.\" Portions of this software were developed under sponsorship from Snow
-.\" B.V., the Netherlands.
-.\"
-.\" 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.
-.\"
-.\" 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.
-.\"
-.\" Portions of this text are reprinted and reproduced in electronic form
-.\" from IEEE Std 1003.1, 2004 Edition, Standard for Information Technology --
-.\" Portable Operating System Interface (POSIX), The Open Group Base
-.\" Specifications Issue 6, Copyright (C) 2001-2004 by the Institute of
-.\" Electrical and Electronics Engineers, Inc and The Open Group.  In the
-.\" event of any discrepancy between this version and the original IEEE and
-.\" The Open Group Standard, the original IEEE and The Open Group Standard is
-.\" the referee document.  The original Standard can be obtained online at
-.\"	http://www.opengroup.org/unix/online.html.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/posix_openpt.2 248593 2013-03-21 21:39:15Z jilles $
-.\"
-.Dd March 21, 2013
-.Dt POSIX_OPENPT 2
-.Os
-.Sh NAME
-.Nm posix_openpt
-.Nd "open a pseudo-terminal device"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdlib.h
-.In fcntl.h
-.Ft int
-.Fn posix_openpt "int oflag"
-.Sh DESCRIPTION
-The
-.Fn posix_openpt
-function allocates a new pseudo-terminal and establishes a connection
-with its master device.
-A slave device shall be created in
-.Pa /dev/pts .
-After the pseudo-terminal has been allocated, the slave device should
-have the proper permissions before it can be used (see
-.Xr grantpt 3 ) .
-The name of the slave device can be determined by calling
-.Xr ptsname 3 .
-.Pp
-The file status flags and file access modes of the open file description
-shall be set according to the value of
-.Fa oflag .
-Values for
-.Fa oflag
-are constructed by a bitwise-inclusive OR of flags from the following
-list, defined in
-.In fcntl.h :
-.Bl -tag -width ".Dv O_CLOEXEC"
-.It Dv O_RDWR
-Open for reading and writing.
-.It Dv O_NOCTTY
-If set
-.Fn posix_openpt
-shall not cause the terminal device to become the controlling terminal
-for the process.
-.It Dv O_CLOEXEC
-Set the close-on-exec flag for the new file descriptor.
-.El
-.Pp
-The
-.Fn posix_openpt
-function shall fail when
-.Fa oflag
-contains other values.
-.Sh RETURN VALUES
-Upon successful completion, the
-.Fn posix_openpt
-function shall allocate a new pseudo-terminal device and return a
-non-negative integer representing a file descriptor, which is connected
-to its master device.
-Otherwise, -1 shall be returned and errno set to indicate the error.
-.Sh ERRORS
-The
-.Fn posix_openpt
-function shall fail if:
-.Bl -tag -width Er
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er EINVAL
-The value of
-.Fa oflag
-is not valid.
-.It Bq Er EAGAIN
-Out of pseudo-terminal resources.
-.El
-.Sh SEE ALSO
-.Xr pts 4 ,
-.Xr ptsname 3 ,
-.Xr tty 4
-.Sh STANDARDS
-The
-.Fn posix_openpt
-function conforms to
-.St -p1003.1-2001 .
-The ability to use
-.Dv O_CLOEXEC
-is an extension to the standard.
-.Sh HISTORY
-The
-.Fn posix_openpt
-function appeared in
-.Fx 5.0 .
-In
-.Fx 8.0 ,
-this function was changed to a system call.
-.Sh NOTES
-The flag
-.Dv O_NOCTTY
-is included for compatibility; in
-.Fx ,
-opening a terminal does not cause it to become a process's controlling
-terminal.
-.Sh AUTHORS
-.An Ed Schouten Aq ed@FreeBSD.org
diff --git a/lib/libc_bsd/sys/ppoll.c b/lib/libc_bsd/sys/ppoll.c
deleted file mode 100644
index 48f96d6..0000000
--- a/lib/libc_bsd/sys/ppoll.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2015 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/ppoll.c 281981 2015-04-25 08:14:08Z kib $");
-
-#include <sys/types.h>
-#include <sys/poll.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_ppoll, __ppoll);
-
-#pragma weak ppoll
-int
-ppoll(struct pollfd pfd[], nfds_t nfds, const struct timespec *__restrict
-    timeout, const sigset_t *__restrict newsigmask)
-{
-
-	return (((int (*)(struct pollfd *, nfds_t, const struct timespec *,
-	    const sigset_t *)) __libc_interposing[INTERPOS_ppoll])(pfd, nfds,
-	    timeout, newsigmask));
-}
diff --git a/lib/libc_bsd/sys/pread.c b/lib/libc_bsd/sys/pread.c
deleted file mode 100644
index 6569a0a..0000000
--- a/lib/libc_bsd/sys/pread.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/pread.c 171219 2007-07-04 23:27:38Z peter $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-pread(fd, buf, nbyte, offset)
-	int	fd;
-	void   *buf;
-	size_t	nbyte;
-	off_t	offset;
-{
-
-	if (__getosreldate() >= 700051)
-		return (__sys_pread(fd, buf, nbyte, offset));
-	else
-		return (__sys_freebsd6_pread(fd, buf, nbyte, 0, offset));
-}
diff --git a/lib/libc_bsd/sys/procctl.2 b/lib/libc_bsd/sys/procctl.2
deleted file mode 100644
index b489d4a..0000000
--- a/lib/libc_bsd/sys/procctl.2
+++ /dev/null
@@ -1,436 +0,0 @@
-.\" Copyright (c) 2013 Hudson River Trading LLC
-.\" Written by: John H. Baldwin <jhb@FreeBSD.org>
-.\" All rights reserved.
-.\"
-.\" Copyright (c) 2014 The FreeBSD Foundation
-.\" Portions of this documentation were written by Konstantin Belousov
-.\" under sponsorship from the FreeBSD Foundation.
-.\"
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/procctl.2 283927 2015-06-02 19:20:39Z jhb $
-.\"
-.Dd December 29, 2014
-.Dt PROCCTL 2
-.Os
-.Sh NAME
-.Nm procctl
-.Nd control processes
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/procctl.h
-.Ft int
-.Fn procctl "idtype_t idtype" "id_t id" "int cmd" "void *arg"
-.Sh DESCRIPTION
-The
-.Fn procctl
-system call provides for control over processes.
-The
-.Fa idtype
-and
-.Fa id
-arguments specify the set of processes to control.
-If multiple processes match the identifier,
-.Nm
-will make a
-.Dq best effort
-to control as many of the selected processes as possible.
-An error is only returned if no selected processes successfully complete
-the request.
-The following identifier types are supported:
-.Bl -tag -width "Dv P_PGID"
-.It Dv P_PID
-Control the process with the process ID
-.Fa id .
-.It Dv P_PGID
-Control processes belonging to the process group with the ID
-.Fa id .
-.El
-.Pp
-The control request to perform is specified by the
-.Fa cmd
-argument.
-The following commands are supported:
-.Bl -tag -width "Dv PROC_REAP_GETPIDS"
-.It Dv PROC_SPROTECT
-Set process protection state.
-This is used to mark a process as protected from being killed if the system
-exhausts available memory and swap.
-The
-.Fa arg
-parameter must point to an integer containing an operation and zero or more
-optional flags.
-The following operations are supported:
-.Bl -tag -width "Dv PPROT_CLEAR"
-.It Dv PPROT_SET
-Mark the selected processes as protected.
-.It Dv PPROT_CLEAR
-Clear the protected state of selected processes.
-.El
-.Pp
-The following optional flags are supported:
-.Bl -tag -width "Dv PPROT_DESCE"
-.It Dv PPROT_DESCEND
-Apply the requested operation to all child processes of each selected process
-in addition to each selected process.
-.It Dv PPROT_INHERIT
-When used with
-.Dv PPROT_SET ,
-mark all future child processes of each selected process as protected.
-Future child processes will also mark all of their future child processes.
-.El
-.It Dv PROC_REAP_ACQUIRE
-Acquires the reaper status for the current process.
-The status means that children orphaned by the reaper's descendants
-that were forked after the acquisition of the status are reparented to the
-reaper.
-After the system initialization,
-.Xr init 8
-is the default reaper.
-.Pp
-.It Dv PROC_REAP_RELEASE
-Releases the reaper state for the current process.
-The reaper of the current process becomes the new reaper of the
-current process's descendants.
-.It Dv PROC_REAP_STATUS
-Provides the information about the reaper of the specified process,
-or the process itself when it is a reaper.
-The
-.Fa data
-argument must point to a
-.Vt procctl_reaper_status
-structure which is filled in by the syscall on successful return.
-.Bd -literal
-struct procctl_reaper_status {
-	u_int	rs_flags;
-	u_int	rs_children;
-	u_int	rs_descendants;
-	pid_t	rs_reaper;
-	pid_t	rs_pid;
-};
-.Ed
-The
-.Fa rs_flags
-may have the following flags returned:
-.Bl -tag -width "Dv REAPER_STATUS_REALINIT"
-.It Dv REAPER_STATUS_OWNED
-The specified process has acquired the reaper status and has not
-released it.
-When the flag is returned, the specified process
-.Fa id ,
-pid, identifies the reaper, otherwise the
-.Fa rs_reaper
-field of the structure is set to the pid of the reaper
-for the specified process id.
-.It Dv REAPER_STATUS_REALINIT
-The specified process is the root of the reaper tree, i.e.
-.Xr init 8 .
-.El
-The
-.Fa rs_children
-field returns the number of children of the reaper.
-The
-.Fa rs_descendants
-field returns the total number of descendants of the reaper(s),
-not counting descendants of the reaper in the subtree.
-The
-.Fa rs_reaper
-field returns the reaper pid.
-The
-.Fa rs_pid
-returns the pid of one reaper child if there are any descendants.
-.It Dv PROC_REAP_GETPIDS
-Queries the list of descendants of the reaper of the specified process.
-The request takes a pointer to a
-.Vt procctl_reaper_pids
-structure in the
-.Fa data
-parameter.
-.Bd -literal
-struct procctl_reaper_pids {
-	u_int	rp_count;
-	struct procctl_reaper_pidinfo *rp_pids;
-};
-.Ed
-When called, the
-.Fa rp_pids
-field must point to an array of
-.Vt procctl_reaper_pidinfo
-structures, to be filled in on return,
-and the
-.Fa rp_count
-field must specify the size of the array,
-into which no more than
-.Fa rp_count
-elements will be filled in by the kernel.
-.Pp
-The
-.Vt "struct procctl_reaper_pidinfo"
-structure provides some information about one of the reaper's descendants.
-Note that for a descendant that is not a child, it may be incorrectly
-identified because of a race in which the original child process exited
-and the exited process's pid was reused for an unrelated process.
-.Bd -literal
-struct procctl_reaper_pidinfo {
-	pid_t	pi_pid;
-	pid_t	pi_subtree;
-	u_int	pi_flags;
-};
-.Ed
-The
-.Fa pi_pid
-field is the process id of the descendant.
-The
-.Fa pi_subtree
-field provides the pid of the child of the reaper, which is the (grand-)parent
-of the process.
-The
-.Fa pi_flags
-field returns the following flags, further describing the descendant:
-.Bl -tag -width "Dv REAPER_PIDINFO_VALID"
-.It Dv REAPER_PIDINFO_VALID
-Set to indicate that the
-.Vt procctl_reaper_pidinfo
-structure was filled in by the kernel.
-Zero-filling the
-.Fa rp_pids
-array and testing the
-.Dv REAPER_PIDINFO_VALID
-flag allows the caller to detect the end
-of the returned array.
-.It Dv REAPER_PIDINFO_CHILD
-The
-.Fa pi_pid
-field identifies the direct child of the reaper.
-.El
-.It Dv PROC_REAP_KILL
-Request to deliver a signal to some subset of the descendants of the reaper.
-The
-.Fa data
-parameter must point to a
-.Vt procctl_reaper_kill
-structure, which is used both for parameters and status return.
-.Bd -literal
-struct procctl_reaper_kill {
-	int	rk_sig;
-	u_int	rk_flags;
-	pid_t	rk_subtree;
-	u_int	rk_killed;
-	pid_t	rk_fpid;
-};
-.Ed
-The
-.Fa rk_sig
-field specifies the signal to be delivered.
-Zero is not a valid signal number, unlike
-.Xr kill 2 .
-The
-.Fa rk_flags
-field further directs the operation.
-It is or-ed from the following flags:
-.Bl -tag -width "Dv REAPER_KILL_CHILDREN"
-.It Dv REAPER_KILL_CHILDREN
-Deliver the specified signal only to direct children of the reaper.
-.It Dv REAPER_KILL_SUBTREE
-Deliver the specified signal only to descendants that were forked by
-the direct child with pid specified in the
-.Fa rk_subtree
-field.
-.El
-If neither the
-.Dv REAPER_KILL_CHILDREN
-nor the
-.Dv REAPER_KILL_SUBTREE
-flags are specified, all current descendants of the reaper are signalled.
-.Pp
-If a signal was delivered to any process, the return value from the request
-is zero.
-In this case, the
-.Fa rk_killed
-field identifies the number of processes signalled.
-The
-.Fa rk_fpid
-field is set to the pid of the first process for which signal
-delivery failed, e.g. due to the permission problems.
-If no such process exist, the
-.Fa rk_fpid
-field is set to -1.
-.It Dv PROC_TRACE_CTL
-Enable or disable tracing of the specified process(es), according to the
-value of the integer argument.
-Tracing includes attachment to the process using
-.Xr ptrace 2
-and
-.Xr ktrace 2 ,
-debugging sysctls,
-.Xr hwpmc 4 ,
-.Xr dtrace 1
-and core dumping.
-Possible values for the
-.Fa data
-argument are:
-.Bl -tag -width "Dv PROC_TRACE_CTL_DISABLE_EXEC"
-.It Dv PROC_TRACE_CTL_ENABLE
-Enable tracing, after it was disabled by
-.Dv PROC_TRACE_CTL_DISABLE .
-Only allowed for self.
-.It Dv PROC_TRACE_CTL_DISABLE
-Disable tracing for the specified process.
-Tracing is re-enabled when the process changes the executing
-program with
-.Xr execve 2
-syscall.
-A child inherits the trace settings from the parent on
-.Xr fork 2 .
-.It Dv PROC_TRACE_CTL_DISABLE_EXEC
-Same as
-.Dv PROC_TRACE_CTL_DISABLE ,
-but the setting persist for the process even after
-.Xr execve 2 .
-.El
-.It Dv PROC_TRACE_STATUS
-Returns the current tracing status for the specified process in
-the integer variable pointed to by
-.Fa data .
-If tracing is disabled,
-.Fa data
-is set to -1.
-If tracing is enabled, but no debugger is attached by
-.Xr ptrace 2
-syscall,
-.Fa data
-is set to 0.
-If a debugger is attached,
-.Fa data
-is set to the pid of the debugger process.
-.El
-.Sh NOTES
-Disabling tracing on a process should not be considered a security
-feature, as it is bypassable both by the kernel and privileged processes,
-and via other system mechanisms.
-As such, it should not be relied on to reliably protect cryptographic
-keying material or other confidential data.
-.Sh RETURN VALUES
-If an error occurs, a value of -1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn procctl
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa arg
-parameter points outside the process's allocated address space.
-.It Bq Er EINVAL
-The
-.Fa cmd
-argument specifies an unsupported command.
-.Pp
-The
-.Fa idtype
-argument specifies an unsupported identifier type.
-.It Bq Er EPERM
-The calling process does not have permission to perform the requested
-operation on any of the selected processes.
-.It Bq Er ESRCH
-No processes matched the requested
-.Fa idtype
-and
-.Fa id .
-.It Bq Er EINVAL
-An invalid operation or flag was passed in
-.Fa arg
-for a
-.Dv PROC_SPROTECT
-command.
-.It Bq Er EPERM
-The
-.Fa idtype
-argument is not equal to
-.Dv P_PID ,
-or
-.Fa id
-is not equal to the pid of the calling process, for
-.Dv PROC_REAP_ACQUIRE
-or
-.Dv PROC_REAP_RELEASE
-requests.
-.It Bq Er EINVAL
-Invalid or undefined flags were passed to a
-.Dv PROC_REAP_KILL
-request.
-.It Bq Er EINVAL
-An invalid or zero signal number was requested for a
-.Dv PROC_REAP_KILL
-request.
-.It Bq Er EINVAL
-The
-.Dv PROC_REAP_RELEASE
-request was issued by the
-.Xr init 8
-process.
-.It Bq Er EBUSY
-The
-.Dv PROC_REAP_ACQUIRE
-request was issued by a process that had already acquired reaper status
-and has not yet released it.
-.It Bq Er EBUSY
-The
-.Dv PROC_TRACE_CTL
-request was issued for a process already being traced.
-.It Bq Er EPERM
-The
-.Dv PROC_TRACE_CTL
-request to re-enable tracing of the process (
-.Dv PROC_TRACE_CTL_ENABLE ) ,
-or to disable persistence of the
-.Dv PROC_TRACE_CTL_DISABLE
-on
-.Xr execve 2
-was issued for a non-current process.
-.It Bq Er EINVAL
-The value of the integer
-.Fa data
-parameter for the
-.Dv PROC_TRACE_CTL
-request is invalid.
-.El
-.Sh SEE ALSO
-.Xr dtrace 1 ,
-.Xr kill 2 ,
-.Xr ktrace 2 ,
-.Xr ptrace 2 ,
-.Xr wait 2 ,
-.Xr hwpmc 4 ,
-.Xr init 8
-.Sh HISTORY
-The
-.Fn procctl
-function appeared in
-.Fx 10.0 .
-The reaper facility is based on a similar feature of Linux and
-DragonflyBSD, and first appeared in
-.Fx 10.2 .
diff --git a/lib/libc_bsd/sys/profil.2 b/lib/libc_bsd/sys/profil.2
deleted file mode 100644
index 19f02d2..0000000
--- a/lib/libc_bsd/sys/profil.2
+++ /dev/null
@@ -1,122 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Donn Seeley of BSDI.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)profil.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/profil.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt PROFIL 2
-.Os
-.Sh NAME
-.Nm profil
-.Nd control process profiling
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn profil "char *samples" "size_t size" "vm_offset_t offset" "int scale"
-.Sh DESCRIPTION
-The
-.Fn profil
-system call enables or disables
-program counter profiling of the current process.
-If profiling is enabled,
-then at every profiling clock tick,
-the kernel updates an appropriate count in the
-.Fa samples
-buffer.
-The frequency of the profiling clock is recorded
-in the header in the profiling output file.
-.Pp
-The buffer
-.Fa samples
-contains
-.Fa size
-bytes and is divided into
-a series of 16-bit bins.
-Each bin counts the number of times the program counter
-was in a particular address range in the process
-when a profiling clock tick occurred while profiling was enabled.
-For a given program counter address,
-the number of the corresponding bin is given
-by the relation:
-.Bd -literal -offset indent
-[(pc - offset) / 2] * scale / 65536
-.Ed
-.Pp
-The
-.Fa offset
-argument is the lowest address at which
-the kernel takes program counter samples.
-The
-.Fa scale
-argument ranges from 1 to 65536 and
-can be used to change the span of the bins.
-A scale of 65536 maps each bin to 2 bytes of address range;
-a scale of 32768 gives 4 bytes, 16384 gives 8 bytes and so on.
-Intermediate values provide approximate intermediate ranges.
-A
-.Fa scale
-value of 0 disables profiling.
-.Sh RETURN VALUES
-.Rv -std profil
-.Sh FILES
-.Bl -tag -width /usr/lib/gcrt0.o -compact
-.It Pa /usr/lib/gcrt0.o
-profiling C run-time startup file
-.It Pa gmon.out
-conventional name for profiling output file
-.El
-.Sh ERRORS
-The following error may be reported:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The buffer
-.Fa samples
-contains an invalid address.
-.El
-.Sh SEE ALSO
-.Xr gprof 1
-.Sh HISTORY
-The
-.Fn profil
-function appeared in
-.At v7 .
-.Sh BUGS
-This routine should be named
-.Fn profile .
-.Pp
-The
-.Fa samples
-argument should really be a vector of type
-.Fa "unsigned short" .
-.Pp
-The format of the gmon.out file is undocumented.
diff --git a/lib/libc_bsd/sys/pselect.2 b/lib/libc_bsd/sys/pselect.2
deleted file mode 100644
index 3a6e278..0000000
--- a/lib/libc_bsd/sys/pselect.2
+++ /dev/null
@@ -1,123 +0,0 @@
-.\"
-.\" Copyright 2002 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. 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: releng/10.2/lib/libc/sys/pselect.2 254414 2013-08-16 14:06:29Z jilles $
-.\"
-.Dd August 16, 2013
-.Dt PSELECT 2
-.Os
-.Sh NAME
-.Nm pselect
-.Nd synchronous I/O multiplexing a la POSIX.1g
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/select.h
-.Ft int
-.Fo pselect
-.Fa "int nfds"
-.Fa "fd_set * restrict readfds"
-.Fa "fd_set * restrict writefds"
-.Fa "fd_set * restrict exceptfds"
-.Fa "const struct timespec * restrict timeout"
-.Fa "const sigset_t * restrict newsigmask"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn pselect
-function was introduced by
-.St -p1003.1g-2000
-as a slightly stronger version of
-.Xr select 2 .
-The
-.Fa nfds , readfds , writefds ,
-and
-.Fa exceptfds
-arguments are all identical to the analogous arguments of
-.Fn select .
-The
-.Fa timeout
-argument in
-.Fn pselect
-points to a
-.Vt "const struct timespec"
-rather than the (modifiable)
-.Vt "struct timeval"
-used by
-.Fn select ;
-as in
-.Fn select ,
-a null pointer may be passed to indicate that
-.Fn pselect
-should wait indefinitely.
-Finally,
-.Fa newsigmask
-specifies a signal mask which is set while waiting for input.
-When
-.Fn pselect
-returns, the original signal mask is restored.
-.Pp
-See
-.Xr select 2
-for a more detailed discussion of the semantics of this interface, and
-for macros used to manipulate the
-.Vt "fd_set"
-data type.
-.Sh RETURN VALUES
-The
-.Fn pselect
-function returns the same values and under the same conditions as
-.Fn select .
-.Sh ERRORS
-The
-.Fn pselect
-function may fail for any of the reasons documented for
-.Xr select 2
-and (if a signal mask is provided)
-.Xr sigprocmask 2 .
-.Sh SEE ALSO
-.Xr kqueue 2 ,
-.Xr poll 2 ,
-.Xr select 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2
-.Sh STANDARDS
-The
-.Fn pselect
-function conforms to
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn pselect
-function first appeared in
-.Fx 5.0 .
-.Sh AUTHORS
-The first implementation of
-.Fn pselect
-function and this manual page were written by
-.An Garrett Wollman Aq wollman@FreeBSD.org .
diff --git a/lib/libc_bsd/sys/pselect.c b/lib/libc_bsd/sys/pselect.c
deleted file mode 100644
index 93bc2df..0000000
--- a/lib/libc_bsd/sys/pselect.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/pselect.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/select.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_pselect, __pselect);
-
-#pragma weak pselect
-int
-pselect(int n, fd_set *rs, fd_set *ws, fd_set *es, const struct timespec *t,
-    const sigset_t *s)
-{
-
-	return (((int (*)(int, fd_set *, fd_set *, fd_set *,
-	    const struct timespec *, const sigset_t *))
-	    __libc_interposing[INTERPOS_pselect])(n, rs, ws, es, t, s));
-}
diff --git a/lib/libc_bsd/sys/ptrace.2 b/lib/libc_bsd/sys/ptrace.2
deleted file mode 100644
index 7f925eb..0000000
--- a/lib/libc_bsd/sys/ptrace.2
+++ /dev/null
@@ -1,624 +0,0 @@
-.\" $FreeBSD: releng/10.2/lib/libc/sys/ptrace.2 253548 2013-07-22 18:18:21Z emaste $
-.\"	$NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $
-.\"
-.\" This file is in the public domain.
-.Dd July 22, 2013
-.Dt PTRACE 2
-.Os
-.Sh NAME
-.Nm ptrace
-.Nd process tracing and debugging
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ptrace.h
-.Ft int
-.Fn ptrace "int request" "pid_t pid" "caddr_t addr" "int data"
-.Sh DESCRIPTION
-The
-.Fn ptrace
-system call
-provides tracing and debugging facilities.
-It allows one process
-(the
-.Em tracing
-process)
-to control another
-(the
-.Em traced
-process).
-The tracing process must first attach to the traced process, and then
-issue a series of
-.Fn ptrace
-system calls to control the execution of the process, as well as access
-process memory and register state.
-For the duration of the tracing session, the traced process will be
-.Dq re-parented ,
-with its parent process ID (and resulting behavior)
-changed to the tracing process.
-It is permissible for a tracing process to attach to more than one
-other process at a time.
-When the tracing process has completed its work, it must detach the
-traced process; if a tracing process exits without first detaching all
-processes it has attached, those processes will be killed.
-.Pp
-Most of the time, the traced process runs normally, but when it
-receives a signal
-(see
-.Xr sigaction 2 ) ,
-it stops.
-The tracing process is expected to notice this via
-.Xr wait 2
-or the delivery of a
-.Dv SIGCHLD
-signal, examine the state of the stopped process, and cause it to
-terminate or continue as appropriate.
-The signal may be a normal process signal, generated as a result of
-traced process behavior, or use of the
-.Xr kill 2
-system call; alternatively, it may be generated by the tracing facility
-as a result of attaching, system calls, or stepping by the tracing
-process.
-The tracing process may choose to intercept the signal, using it to
-observe process behavior (such as
-.Dv SIGTRAP ) ,
-or forward the signal to the process if appropriate.
-The
-.Fn ptrace
-system call
-is the mechanism by which all this happens.
-.Pp
-The
-.Fa request
-argument specifies what operation is being performed; the meaning of
-the rest of the arguments depends on the operation, but except for one
-special case noted below, all
-.Fn ptrace
-calls are made by the tracing process, and the
-.Fa pid
-argument specifies the process ID of the traced process
-or a corresponding thread ID.
-The
-.Fa request
-argument
-can be:
-.Bl -tag -width 12n
-.It Dv PT_TRACE_ME
-This request is the only one used by the traced process; it declares
-that the process expects to be traced by its parent.
-All the other arguments are ignored.
-(If the parent process does not expect to trace the child, it will
-probably be rather confused by the results; once the traced process
-stops, it cannot be made to continue except via
-.Fn ptrace . )
-When a process has used this request and calls
-.Xr execve 2
-or any of the routines built on it
-(such as
-.Xr execv 3 ) ,
-it will stop before executing the first instruction of the new image.
-Also, any setuid or setgid bits on the executable being executed will
-be ignored.
-If the child was created by
-.Xr vfork 2
-system call or
-.Xr rfork(2)
-call with the
-.Dv RFMEM
-flag specified, the debugging events are reported to the parent
-only after the
-.Xr execve 2
-is executed.
-.It Dv PT_READ_I , Dv PT_READ_D
-These requests read a single
-.Vt int
-of data from the traced process's address space.
-Traditionally,
-.Fn ptrace
-has allowed for machines with distinct address spaces for instruction
-and data, which is why there are two requests: conceptually,
-.Dv PT_READ_I
-reads from the instruction space and
-.Dv PT_READ_D
-reads from the data space.
-In the current
-.Fx
-implementation, these two requests are completely identical.
-The
-.Fa addr
-argument specifies the address
-(in the traced process's virtual address space)
-at which the read is to be done.
-This address does not have to meet any alignment constraints.
-The value read is returned as the return value from
-.Fn ptrace .
-.It Dv PT_WRITE_I , Dv PT_WRITE_D
-These requests parallel
-.Dv PT_READ_I
-and
-.Dv PT_READ_D ,
-except that they write rather than read.
-The
-.Fa data
-argument supplies the value to be written.
-.It Dv PT_IO
-This request allows reading and writing arbitrary amounts of data in
-the traced process's address space.
-The
-.Fa addr
-argument specifies a pointer to a
-.Vt "struct ptrace_io_desc" ,
-which is defined as follows:
-.Bd -literal
-struct ptrace_io_desc {
-	int	piod_op;	/* I/O operation */
-	void	*piod_offs;	/* child offset */
-	void	*piod_addr;	/* parent offset */
-	size_t	piod_len;	/* request length */
-};
-
-/*
- * Operations in piod_op.
- */
-#define PIOD_READ_D	1	/* Read from D space */
-#define PIOD_WRITE_D	2	/* Write to D space */
-#define PIOD_READ_I	3	/* Read from I space */
-#define PIOD_WRITE_I	4	/* Write to I space */
-.Ed
-.Pp
-The
-.Fa data
-argument is ignored.
-The actual number of bytes read or written is stored in
-.Va piod_len
-upon return.
-.It Dv PT_CONTINUE
-The traced process continues execution.
-The
-.Fa addr
-argument
-is an address specifying the place where execution is to be resumed
-(a new value for the program counter),
-or
-.Po Vt caddr_t Pc Ns 1
-to indicate that execution is to pick up where it left off.
-The
-.Fa data
-argument
-provides a signal number to be delivered to the traced process as it
-resumes execution, or 0 if no signal is to be sent.
-.It Dv PT_STEP
-The traced process is single stepped one instruction.
-The
-.Fa addr
-argument
-should be passed
-.Po Vt caddr_t Pc Ns 1 .
-The
-.Fa data
-argument
-provides a signal number to be delivered to the traced process as it
-resumes execution, or 0 if no signal is to be sent.
-.It Dv PT_KILL
-The traced process terminates, as if
-.Dv PT_CONTINUE
-had been used with
-.Dv SIGKILL
-given as the signal to be delivered.
-.It Dv PT_ATTACH
-This request allows a process to gain control of an otherwise
-unrelated process and begin tracing it.
-It does not need any cooperation from the to-be-traced process.
-In
-this case,
-.Fa pid
-specifies the process ID of the to-be-traced process, and the other
-two arguments are ignored.
-This request requires that the target process must have the same real
-UID as the tracing process, and that it must not be executing a setuid
-or setgid executable.
-(If the tracing process is running as root, these restrictions do not
-apply.)
-The tracing process will see the newly-traced process stop and may
-then control it as if it had been traced all along.
-.It Dv PT_DETACH
-This request is like PT_CONTINUE, except that it does not allow
-specifying an alternate place to continue execution, and after it
-succeeds, the traced process is no longer traced and continues
-execution normally.
-.It Dv PT_GETREGS
-This request reads the traced process's machine registers into the
-.Do
-.Vt "struct reg"
-.Dc
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-.It Dv PT_SETREGS
-This request is the converse of
-.Dv PT_GETREGS ;
-it loads the traced process's machine registers from the
-.Do
-.Vt "struct reg"
-.Dc
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-.It Dv PT_GETFPREGS
-This request reads the traced process's floating-point registers into
-the
-.Do
-.Vt "struct fpreg"
-.Dc
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-.It Dv PT_SETFPREGS
-This request is the converse of
-.Dv PT_GETFPREGS ;
-it loads the traced process's floating-point registers from the
-.Do
-.Vt "struct fpreg"
-.Dc
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-.It Dv PT_GETDBREGS
-This request reads the traced process's debug registers into
-the
-.Do
-.Vt "struct dbreg"
-.Dc
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-.It Dv PT_SETDBREGS
-This request is the converse of
-.Dv PT_GETDBREGS ;
-it loads the traced process's debug registers from the
-.Do
-.Vt "struct dbreg"
-.Dc
-(defined in
-.In machine/reg.h )
-pointed to by
-.Fa addr .
-.It Dv PT_LWPINFO
-This request can be used to obtain information about the kernel thread,
-also known as light-weight process, that caused the traced process to stop.
-The
-.Fa addr
-argument specifies a pointer to a
-.Vt "struct ptrace_lwpinfo" ,
-which is defined as follows:
-.Bd -literal
-struct ptrace_lwpinfo {
-	lwpid_t pl_lwpid;
-	int	pl_event;
-	int	pl_flags;
-	sigset_t pl_sigmask;
-	sigset_t pl_siglist;
-	siginfo_t pl_siginfo;
-	char	pl_tdname[MAXCOMLEN + 1];
-	int	pl_child_pid;
-};
-.Ed
-.Pp
-The
-.Fa data
-argument is to be set to the size of the structure known to the caller.
-This allows the structure to grow without affecting older programs.
-.Pp
-The fields in the
-.Vt "struct ptrace_lwpinfo"
-have the following meaning:
-.Bl -tag -width indent -compact
-.It pl_lwpid
-LWP id of the thread
-.It pl_event
-Event that caused the stop.
-Currently defined events are
-.Bl -tag -width indent -compact
-.It PL_EVENT_NONE
-No reason given
-.It PL_EVENT_SIGNAL
-Thread stopped due to the pending signal
-.El
-.It pl_flags
-Flags that specify additional details about observed stop.
-Currently defined flags are:
-.Bl -tag -width indent -compact
-.It PL_FLAG_SCE
-The thread stopped due to system call entry, right after the kernel is entered.
-The debugger may examine syscall arguments that are stored in memory and
-registers according to the ABI of the current process, and modify them,
-if needed.
-.It PL_FLAG_SCX
-The thread is stopped immediately before syscall is returning to the usermode.
-The debugger may examine system call return values in the ABI-defined registers
-and/or memory.
-.It PL_FLAG_EXEC
-When
-.Dv PL_FLAG_SCX
-is set, this flag may be additionally specified to inform that the
-program being executed by debuggee process has been changed by successful
-execution of a system call from the
-.Fn execve 2
-family.
-.It PL_FLAG_SI
-Indicates that
-.Va pl_siginfo
-member of
-.Vt "struct ptrace_lwpinfo"
-contains valid information.
-.It PL_FLAG_FORKED
-Indicates that the process is returning from a call to
-.Fn fork 2
-that created a new child process.
-The process identifier of the new process is available in the
-.Va pl_child_pid
-member of
-.Vt "struct ptrace_lwpinfo" .
-.It PL_FLAG_CHILD
-The flag is set for first event reported from a new child, which is
-automatically attached due to
-.Dv PT_FOLLOW_FORK
-enabled.
-.El
-.It pl_sigmask
-The current signal mask of the LWP
-.It pl_siglist
-The current pending set of signals for the LWP.
-Note that signals that are delivered to the process would not appear
-on an LWP siglist until the thread is selected for delivery.
-.It pl_siginfo
-The siginfo that accompanies the signal pending.
-Only valid for
-.Dv PL_EVENT_SIGNAL
-stop when
-.Dv PL_FLAG_SI
-is set in
-.Va pl_flags .
-.It pl_tdname
-The name of the thread.
-.It pl_child_pid
-The process identifier of the new child process.
-Only valid for a
-.Dv PL_EVENT_SIGNAL
-stop when
-.Dv PL_FLAG_FORKED
-is set in
-.Va pl_flags .
-.El
-.It PT_GETNUMLWPS
-This request returns the number of kernel threads associated with the
-traced process.
-.It PT_GETLWPLIST
-This request can be used to get the current thread list.
-A pointer to an array of type
-.Vt lwpid_t
-should be passed in
-.Fa addr ,
-with the array size specified by
-.Fa data .
-The return value from
-.Fn ptrace
-is the count of array entries filled in.
-.It PT_SETSTEP
-This request will turn on single stepping of the specified process.
-.It PT_CLEARSTEP
-This request will turn off single stepping of the specified process.
-.It PT_SUSPEND
-This request will suspend the specified thread.
-.It PT_RESUME
-This request will resume the specified thread.
-.It PT_TO_SCE
-This request will trace the specified process on each system call entry.
-.It PT_TO_SCX
-This request will trace the specified process on each system call exit.
-.It PT_SYSCALL
-This request will trace the specified process
-on each system call entry and exit.
-.It PT_FOLLOW_FORK
-This request controls tracing for new child processes of a traced process.
-If
-.Fa data
-is non-zero,
-then new child processes will enable tracing and stop before executing their
-first instruction.
-If
-.Fa data
-is zero, then new child processes will execute without tracing enabled.
-By default, tracing is not enabled for new child processes.
-Child processes do not inherit this property.
-The traced process will set the
-.Dv PL_FLAG_FORKED
-flag upon exit from a system call that creates a new process.
-.It PT_VM_TIMESTAMP
-This request returns the generation number or timestamp of the memory map of
-the traced process as the return value from
-.Fn ptrace .
-This provides a low-cost way for the tracing process to determine if the
-VM map changed since the last time this request was made.
-.It PT_VM_ENTRY
-This request is used to iterate over the entries of the VM map of the traced
-process.
-The
-.Fa addr
-argument specifies a pointer to a
-.Vt "struct ptrace_vm_entry" ,
-which is defined as follows:
-.Bd -literal
-struct ptrace_vm_entry {
-	int		pve_entry;
-	int		pve_timestamp;
-	u_long		pve_start;
-	u_long		pve_end;
-	u_long		pve_offset;
-	u_int		pve_prot;
-	u_int		pve_pathlen;
-	long		pve_fileid;
-	uint32_t	pve_fsid;
-	char		*pve_path;
-};
-.Ed
-.Pp
-The first entry is returned by setting
-.Va pve_entry
-to zero.
-Subsequent entries are returned by leaving
-.Va pve_entry
-unmodified from the value returned by previous requests.
-The
-.Va pve_timestamp
-field can be used to detect changes to the VM map while iterating over the
-entries.
-The tracing process can then take appropriate action, such as restarting.
-By setting
-.Va pve_pathlen
-to a non-zero value on entry, the pathname of the backing object is returned
-in the buffer pointed to by
-.Va pve_path ,
-provided the entry is backed by a vnode.
-The
-.Va pve_pathlen
-field is updated with the actual length of the pathname (including the
-terminating null character).
-The
-.Va pve_offset
-field is the offset within the backing object at which the range starts.
-The range is located in the VM space at
-.Va pve_start
-and extends up to
-.Va pve_end
-(inclusive).
-.Pp
-The
-.Fa data
-argument is ignored.
-.El
-.Pp
-Additionally, machine-specific requests can exist.
-.Sh RETURN VALUES
-Some requests can cause
-.Fn ptrace
-to return
-\-1
-as a non-error value; to disambiguate,
-.Va errno
-can be set to 0 before the call and checked afterwards.
-.Sh ERRORS
-The
-.Fn ptrace
-system call may fail if:
-.Bl -tag -width Er
-.It Bq Er ESRCH
-.Bl -bullet -compact
-.It
-No process having the specified process ID exists.
-.El
-.It Bq Er EINVAL
-.Bl -bullet -compact
-.It
-A process attempted to use
-.Dv PT_ATTACH
-on itself.
-.It
-The
-.Fa request
-argument
-was not one of the legal requests.
-.It
-The signal number
-(in
-.Fa data )
-to
-.Dv PT_CONTINUE
-was neither 0 nor a legal signal number.
-.It
-.Dv PT_GETREGS ,
-.Dv PT_SETREGS ,
-.Dv PT_GETFPREGS ,
-.Dv PT_SETFPREGS ,
-.Dv PT_GETDBREGS ,
-or
-.Dv PT_SETDBREGS
-was attempted on a process with no valid register set.
-(This is normally true only of system processes.)
-.It
-.Dv PT_VM_ENTRY
-was given an invalid value for
-.Fa pve_entry .
-This can also be caused by changes to the VM map of the process.
-.It
-The size (in
-.Fa data )
-provided to
-.Dv PT_LWPINFO
-was less than or equal to zero, or larger than the
-.Vt ptrace_lwpinfo
-structure known to the kernel.
-.El
-.It Bq Er EBUSY
-.Bl -bullet -compact
-.It
-.Dv PT_ATTACH
-was attempted on a process that was already being traced.
-.It
-A request attempted to manipulate a process that was being traced by
-some process other than the one making the request.
-.It
-A request
-(other than
-.Dv PT_ATTACH )
-specified a process that was not stopped.
-.El
-.It Bq Er EPERM
-.Bl -bullet -compact
-.It
-A request
-(other than
-.Dv PT_ATTACH )
-attempted to manipulate a process that was not being traced at all.
-.It
-An attempt was made to use
-.Dv PT_ATTACH
-on a process in violation of the requirements listed under
-.Dv PT_ATTACH
-above.
-.El
-.It Bq Er ENOENT
-.Bl -bullet -compact
-.It
-.Dv PT_VM_ENTRY
-previously returned the last entry of the memory map.
-No more entries exist.
-.El
-.It Bq Er ENAMETOOLONG
-.Bl -bullet -compact
-.It
-.Dv PT_VM_ENTRY
-cannot return the pathname of the backing object because the buffer is not big
-enough.
-.Fa pve_pathlen
-holds the minimum buffer size required on return.
-.El
-.El
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr sigaction 2 ,
-.Xr wait 2 ,
-.Xr execv 3 ,
-.Xr i386_clr_watch 3 ,
-.Xr i386_set_watch 3
-.Sh HISTORY
-The
-.Fn ptrace
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/pwrite.c b/lib/libc_bsd/sys/pwrite.c
deleted file mode 100644
index 23905da..0000000
--- a/lib/libc_bsd/sys/pwrite.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)mmap.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/pwrite.c 171219 2007-07-04 23:27:38Z peter $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-ssize_t
-pwrite(fd, buf, nbyte, offset)
-	int	fd;
-	const void *buf;
-	size_t	nbyte;
-	off_t	offset;
-{
-	if (__getosreldate() >= 700051)
-		return (__sys_pwrite(fd, buf, nbyte, offset));
-	else
-		return (__sys_freebsd6_pwrite(fd, buf, nbyte, 0, offset));
-}
diff --git a/lib/libc_bsd/sys/quotactl.2 b/lib/libc_bsd/sys/quotactl.2
deleted file mode 100644
index bd388a2..0000000
--- a/lib/libc_bsd/sys/quotactl.2
+++ /dev/null
@@ -1,261 +0,0 @@
-.\" Copyright (c) 1983, 1990, 1991, 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Robert Elz at The University of Melbourne.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)quotactl.2	8.2 (Berkeley) 3/10/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/quotactl.2 233648 2012-03-29 05:02:12Z eadler $
-.\"
-.Dd March 5, 1999
-.Dt QUOTACTL 2
-.Os
-.Sh NAME
-.Nm quotactl
-.Nd manipulate file system quotas
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In ufs/ufs/quota.h
-.Ft int
-.Fn quotactl "const char *path" "int cmd" "int id" "void *addr"
-.Sh DESCRIPTION
-The
-.Fn quotactl
-system call enables, disables and
-manipulates file system quotas.
-A quota control command
-given by
-.Fa cmd
-operates on the given filename
-.Fa path
-for the given user or group
-.Fa id .
-(NOTE: One should use the QCMD macro defined in
-.In ufs/ufs/quota.h
-to formulate the value for
-.Fa cmd . )
-The address of an optional command specific data structure,
-.Fa addr ,
-may be given; its interpretation
-is discussed below with each command.
-.Pp
-For commands that use the
-.Fa id
-identifier, it must be either -1 or any positive value.
-The value of -1 indicates that the current UID or GID should be used.
-Any other negative value will return an error.
-.Pp
-Currently quotas are supported only for the
-.Dq ufs
-file system.
-For
-.Dq ufs ,
-a command is composed of a primary command (see below)
-and a command type used to interpret the
-.Fa id .
-Types are supported for interpretation of user identifiers (USRQUOTA)
-and group identifiers (GRPQUOTA).
-The
-.Dq ufs
-specific commands are:
-.Bl -tag -width Q_GETQUOTASIZEx
-.It Dv Q_QUOTAON
-Enable disk quotas for the file system specified by
-.Fa path .
-The command type specifies the type of the quotas being enabled.
-The
-.Fa addr
-argument specifies a file from which to take the quotas.
-The quota file must exist;
-it is normally created with the
-.Xr quotacheck 8
-program.
-The
-.Fa id
-argument is unused.
-Only the super-user may turn quotas on.
-.It Dv Q_QUOTAOFF
-Disable disk quotas for the file system specified by
-.Fa path .
-The command type specifies the type of the quotas being disabled.
-The
-.Fa addr
-and
-.Fa id
-arguments are unused.
-Only the super-user may turn quotas off.
-.It Dv Q_GETQUOTASIZE
-Get the wordsize used to represent the quotas for the user or group
-(as determined by the command type).
-Possible values are 32 for the old-style quota file
-and 64 for the new-style quota file.
-The
-.Fa addr
-argument is a pointer to an integer into which the size is stored.
-The identifier
-.Fa id
-is not used.
-.It Dv Q_GETQUOTA
-Get disk quota limits and current usage for the user or group
-(as determined by the command type) with identifier
-.Fa id .
-The
-.Fa addr
-argument
-is a pointer to a
-.Fa struct dqblk
-structure (defined in
-.In ufs/ufs/quota.h ) .
-.It Dv Q_SETQUOTA
-Set disk quota limits for the user or group
-(as determined by the command type) with identifier
-.Fa id .
-The
-.Fa addr
-argument
-is a pointer to a
-.Fa struct dqblk
-structure (defined in
-.In ufs/ufs/quota.h ) .
-The usage fields of the
-.Fa dqblk
-structure are ignored.
-This system call is restricted to the super-user.
-.It Dv Q_SETUSE
-Set disk usage limits for the user or group
-(as determined by the command type) with identifier
-.Fa id .
-The
-.Fa addr
-argument
-is a pointer to a
-.Fa struct dqblk
-structure (defined in
-.In ufs/ufs/quota.h ) .
-Only the usage fields are used.
-This system call is restricted to the super-user.
-.It Dv Q_SYNC
-Update the on-disk copy of quota usages.
-The command type specifies which type of quotas are to be updated.
-The
-.Fa id
-and
-.Fa addr
-arguments are ignored.
-.El
-.Sh RETURN VALUES
-.Rv -std quotactl
-.Sh ERRORS
-The
-.Fn quotactl
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EOPNOTSUPP
-The kernel has not been compiled with the
-.Dv QUOTA
-option.
-.It Bq Er EUSERS
-The quota table cannot be expanded.
-.It Bq Er EINVAL
-The
-.Fa cmd
-argument
-or the command type is invalid.
-In
-.Dv Q_GETQUOTASIZE ,
-.Dv Q_GETQUOTA ,
-.Dv Q_SETQUOTA ,
-and
-.Dv Q_SETUSE ,
-quotas are not currently enabled for this file system.
-.Pp
-The
-.Fa id
-argument to
-.Dv Q_GETQUOTA ,
-.Dv Q_SETQUOTA
-or
-.Dv Q_SETUSE
-is a negative value.
-.It Bq Er EACCES
-In
-.Dv Q_QUOTAON ,
-the quota file is not a plain file.
-.It Bq Er EACCES
-Search permission is denied for a component of a path prefix.
-.It Bq Er ENOTDIR
-A component of a path prefix was not a directory.
-.It Bq Er ENAMETOOLONG
-A component of either pathname exceeded 255 characters,
-or the entire length of either path name exceeded 1023 characters.
-.It Bq Er ENOENT
-A filename does not exist.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating a pathname.
-.It Bq Er EROFS
-In
-.Dv Q_QUOTAON ,
-either the file system on which quotas are to be enabled is mounted read-only
-or the quota file resides on a read-only file system.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing
-to a file containing quotas.
-.It Bq Er EFAULT
-An invalid
-.Fa addr
-was supplied; the associated structure could not be copied in or out
-of the kernel.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.It Bq Er EPERM
-The call was privileged and the caller was not the super-user.
-.El
-.Sh SEE ALSO
-.Xr quota 1 ,
-.Xr fstab 5 ,
-.Xr edquota 8 ,
-.Xr quotacheck 8 ,
-.Xr quotaon 8 ,
-.Xr repquota 8
-.Sh HISTORY
-The
-.Fn quotactl
-system call appeared in
-.Bx 4.3 Reno .
-.Sh BUGS
-There should be some way to integrate this call with the resource
-limit interface provided by
-.Xr setrlimit 2
-and
-.Xr getrlimit 2 .
diff --git a/lib/libc_bsd/sys/read.2 b/lib/libc_bsd/sys/read.2
deleted file mode 100644
index d44afe8..0000000
--- a/lib/libc_bsd/sys/read.2
+++ /dev/null
@@ -1,285 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)read.2	8.4 (Berkeley) 2/26/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/read.2 255486 2013-09-12 00:53:38Z bdrewery $
-.\"
-.Dd September 11, 2013
-.Dt READ 2
-.Os
-.Sh NAME
-.Nm read ,
-.Nm readv ,
-.Nm pread ,
-.Nm preadv
-.Nd read input
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft ssize_t
-.Fn read "int fd" "void *buf" "size_t nbytes"
-.Ft ssize_t
-.Fn pread "int fd" "void *buf" "size_t nbytes" "off_t offset"
-.In sys/uio.h
-.Ft ssize_t
-.Fn readv "int fd" "const struct iovec *iov" "int iovcnt"
-.Ft ssize_t
-.Fn preadv "int fd" "const struct iovec *iov" "int iovcnt" "off_t offset"
-.Sh DESCRIPTION
-The
-.Fn read
-system call
-attempts to read
-.Fa nbytes
-of data from the object referenced by the descriptor
-.Fa fd
-into the buffer pointed to by
-.Fa buf .
-The
-.Fn readv
-system call
-performs the same action, but scatters the input data
-into the
-.Fa iovcnt
-buffers specified by the members of the
-.Fa iov
-array: iov[0], iov[1], ..., iov[iovcnt\|\-\|1].
-The
-.Fn pread
-and
-.Fn preadv
-system calls
-perform the same functions, but read from the specified position in
-the file without modifying the file pointer.
-.Pp
-For
-.Fn readv
-and
-.Fn preadv ,
-the
-.Fa iovec
-structure is defined as:
-.Pp
-.Bd -literal -offset indent -compact
-struct iovec {
-	void   *iov_base;  /* Base address. */
-	size_t iov_len;    /* Length. */
-};
-.Ed
-.Pp
-Each
-.Fa iovec
-entry specifies the base address and length of an area
-in memory where data should be placed.
-The
-.Fn readv
-system call
-will always fill an area completely before proceeding
-to the next.
-.Pp
-On objects capable of seeking, the
-.Fn read
-starts at a position
-given by the pointer associated with
-.Fa fd
-(see
-.Xr lseek 2 ) .
-Upon return from
-.Fn read ,
-the pointer is incremented by the number of bytes actually read.
-.Pp
-Objects that are not capable of seeking always read from the current
-position.
-The value of the pointer associated with such an
-object is undefined.
-.Pp
-Upon successful completion,
-.Fn read ,
-.Fn readv ,
-.Fn pread
-and
-.Fn preadv
-return the number of bytes actually read and placed in the buffer.
-The system guarantees to read the number of bytes requested if
-the descriptor references a normal file that has that many bytes left
-before the end-of-file, but in no other case.
-.Sh RETURN VALUES
-If successful, the
-number of bytes actually read is returned.
-Upon reading end-of-file,
-zero is returned.
-Otherwise, a -1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn read ,
-.Fn readv ,
-.Fn pread
-and
-.Fn preadv
-system calls
-will succeed unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid file or socket descriptor open for reading.
-.It Bq Er ECONNRESET
-The
-.Fa fd
-argument refers to a socket, and the remote socket end is
-forcibly closed.
-.It Bq Er EFAULT
-The
-.Fa buf
-argument
-points outside the allocated address space.
-.It Bq Er EIO
-An I/O error occurred while reading from the file system.
-.It Bq Er EBUSY
-Failed to read from a file, e.g. /proc/<pid>/regs while <pid> is not stopped
-.It Bq Er EINTR
-A read from a slow device
-(i.e.\& one that might block for an arbitrary amount of time)
-was interrupted by the delivery of a signal
-before any data arrived.
-.It Bq Er EINVAL
-The pointer associated with
-.Fa fd
-was negative.
-.It Bq Er EAGAIN
-The file was marked for non-blocking I/O,
-and no data were ready to be read.
-.It Bq Er EISDIR
-The file descriptor is associated with a directory residing
-on a file system that does not allow regular read operations on
-directories (e.g.\& NFS).
-.It Bq Er EOPNOTSUPP
-The file descriptor is associated with a file system and file type that
-do not allow regular read operations on it.
-.It Bq Er EOVERFLOW
-The file descriptor is associated with a regular file,
-.Fa nbytes
-is greater than 0,
-.Fa offset
-is before the end-of-file, and
-.Fa offset
-is greater than or equal to the offset maximum established
-for this file system.
-.It Bq Er EINVAL
-The value
-.Fa nbytes
-is greater than
-.Dv INT_MAX .
-.El
-.Pp
-In addition,
-.Fn readv
-and
-.Fn preadv
-may return one of the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa iovcnt
-argument
-was less than or equal to 0, or greater than
-.Dv IOV_MAX .
-.It Bq Er EINVAL
-One of the
-.Fa iov_len
-values in the
-.Fa iov
-array was negative.
-.It Bq Er EINVAL
-The sum of the
-.Fa iov_len
-values in the
-.Fa iov
-array overflowed a 32-bit integer.
-.It Bq Er EFAULT
-Part of the
-.Fa iov
-array points outside the process's allocated address space.
-.El
-.Pp
-The
-.Fn pread
-and
-.Fn preadv
-system calls may also return the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa offset
-value was negative.
-.It Bq Er ESPIPE
-The file descriptor is associated with a pipe, socket, or FIFO.
-.El
-.Sh SEE ALSO
-.Xr dup 2 ,
-.Xr fcntl 2 ,
-.Xr getdirentries 2 ,
-.Xr open 2 ,
-.Xr pipe 2 ,
-.Xr select 2 ,
-.Xr socket 2 ,
-.Xr socketpair 2 ,
-.Xr fread 3 ,
-.Xr readdir 3
-.Sh STANDARDS
-The
-.Fn read
-system call is expected to conform to
-.St -p1003.1-90 .
-The
-.Fn readv
-and
-.Fn pread
-system calls are expected to conform to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn preadv
-system call appeared in
-.Fx 6.0 .
-The
-.Fn pread
-function appeared in
-.At V.4 .
-The
-.Fn readv
-system call appeared in
-.Bx 4.2 .
-The
-.Fn read
-function appeared in
-.At v6 .
diff --git a/lib/libc_bsd/sys/read.c b/lib/libc_bsd/sys/read.c
deleted file mode 100644
index bdb94cf..0000000
--- a/lib/libc_bsd/sys/read.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/read.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_read, __read);
-
-#pragma weak read
-ssize_t
-read(int fd, void *buf, size_t nbytes)
-{
-
-	return (((ssize_t (*)(int, void *, size_t))
-	    __libc_interposing[INTERPOS_read])(fd, buf, nbytes));
-}
diff --git a/lib/libc_bsd/sys/readlink.2 b/lib/libc_bsd/sys/readlink.2
deleted file mode 100644
index 9b7c688..0000000
--- a/lib/libc_bsd/sys/readlink.2
+++ /dev/null
@@ -1,158 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)readlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/readlink.2 178245 2008-04-16 13:03:12Z kib $
-.\"
-.Dd April 10, 2008
-.Dt READLINK 2
-.Os
-.Sh NAME
-.Nm readlink ,
-.Nm readlinkat
-.Nd read value of a symbolic link
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft ssize_t
-.Fn readlink "const char *restrict path" "char *restrict buf" "size_t bufsiz"
-.Ft ssize_t
-.Fo readlinkat
-.Fa "int fd" "const char *restrict path" "char *restrict buf" "size_t bufsize"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn readlink
-system call
-places the contents of the symbolic link
-.Fa path
-in the buffer
-.Fa buf ,
-which has size
-.Fa bufsiz .
-The
-.Fn readlink
-system call does not append a
-.Dv NUL
-character to
-.Fa buf .
-.Pp
-The
-.Fn readlinkat
-system call is equivalent to
-.Fn readlink
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the symbolic link whose content is read relative to the
-directory associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-If
-.Fn readlinkat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is
-identical to a call to
-.Fn readlink .
-.Sh RETURN VALUES
-The call returns the count of characters placed in the buffer
-if it succeeds, or a \-1 if an error occurs, placing the error
-code in the global variable
-.Va errno .
-.Sh ERRORS
-The
-.Fn readlink
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EINVAL
-The named file is not a symbolic link.
-.It Bq Er EIO
-An I/O error occurred while reading from the file system.
-.It Bq Er EFAULT
-The
-.Fa buf
-argument
-extends outside the process's allocated address space.
-.El
-.Pp
-In addition to the errors returned by the
-.Fn readlink ,
-the
-.Fn readlinkat
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr lstat 2 ,
-.Xr stat 2 ,
-.Xr symlink 2 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn readlinkat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn readlink
-system call appeared in
-.Bx 4.2 .
-The
-.Fn readlinkat
-system call appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/readv.c b/lib/libc_bsd/sys/readv.c
deleted file mode 100644
index 6c6e796..0000000
--- a/lib/libc_bsd/sys/readv.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/readv.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_readv, __readv);
-
-#pragma weak readv
-ssize_t
-readv(int fd, const struct iovec *iov, int iovcnt)
-{
-
-	return (((ssize_t (*)(int, const struct iovec *, int))
-	    __libc_interposing[INTERPOS_readv])(fd, iov, iovcnt));
-}
diff --git a/lib/libc_bsd/sys/reboot.2 b/lib/libc_bsd/sys/reboot.2
deleted file mode 100644
index 052ebe4..0000000
--- a/lib/libc_bsd/sys/reboot.2
+++ /dev/null
@@ -1,166 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)reboot.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/reboot.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt REBOOT 2
-.Os
-.Sh NAME
-.Nm reboot
-.Nd reboot system or halt processor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.In sys/reboot.h
-.Ft int
-.Fn reboot "int howto"
-.Sh DESCRIPTION
-The
-.Fn reboot
-system call
-reboots the system.
-Only the super-user may reboot a machine on demand.
-However, a reboot is invoked
-automatically in the event of unrecoverable system failures.
-.Pp
-The
-.Fa howto
-argument
-is a mask of options; the system call interface allows the following
-options, defined in the include file
-.In sys/reboot.h ,
-to be passed
-to the new kernel or the new bootstrap and init programs.
-.Bl -tag -width RB_INITNAMEA
-.It Dv RB_AUTOBOOT
-The default, causing the system to reboot in its usual fashion.
-.It Dv RB_ASKNAME
-Interpreted by the bootstrap program itself, causing it to
-prompt on the console as to what file should be booted.
-Normally, the system is booted from the file
-.Dq Ar xx Ns No (0,0)kernel ,
-where
-.Ar xx
-is the default disk name,
-without prompting for the file name.
-.It Dv RB_DFLTROOT
-Use the compiled in root device.
-Normally, the system uses the device from which it was booted
-as the root device if possible.
-(The default behavior is dependent on the ability of the bootstrap program
-to determine the drive from which it was loaded, which is not possible
-on all systems.)
-.It Dv RB_DUMP
-Dump kernel memory before rebooting; see
-.Xr savecore 8
-for more information.
-.It Dv RB_HALT
-the processor is simply halted; no reboot takes place.
-This option should be used with caution.
-.It Dv RB_POWEROFF
-After halting, the shutdown code will do what it can to turn
-off the power.
-This requires hardware support.
-.It Dv RB_INITNAME
-An option allowing the specification of an init program (see
-.Xr init 8 )
-other than
-.Pa /sbin/init
-to be run when the system reboots.
-This switch is not currently available.
-.It Dv RB_KDB
-Load the symbol table and enable a built-in debugger in the system.
-This option will have no useful function if the kernel is not configured
-for debugging.
-Several other options have different meaning if combined
-with this option, although their use may not be possible
-via the
-.Fn reboot
-system call.
-See
-.Xr ddb 4
-for more information.
-.It Dv RB_NOSYNC
-Normally, the disks are sync'd (see
-.Xr sync 8 )
-before the processor is halted or rebooted.
-This option may be useful if file system changes have been made manually
-or if the processor is on fire.
-.It Dv RB_RDONLY
-Initially mount the root file system read-only.
-This is currently the default, and this option has been deprecated.
-.It Dv RB_SINGLE
-Normally, the reboot procedure involves an automatic disk consistency
-check and then multi-user operations.
-.Dv RB_SINGLE
-prevents this, booting the system with a single-user shell
-on the console.
-.Dv RB_SINGLE
-is actually interpreted by the
-.Xr init 8
-program in the newly booted system.
-.El
-.Pp
-When no options are given (i.e.,
-.Dv RB_AUTOBOOT
-is used), the system is
-rebooted from file
-.Dq kernel
-in the root file system of unit 0
-of a disk chosen in a processor specific way.
-An automatic consistency check of the disks is normally performed
-(see
-.Xr fsck 8 ) .
-.Sh RETURN VALUES
-If successful, this call never returns.
-Otherwise, a -1 is returned and an error is returned in the global
-variable
-.Va errno .
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EPERM
-The caller is not the super-user.
-.El
-.Sh SEE ALSO
-.Xr crash 8 ,
-.Xr halt 8 ,
-.Xr init 8 ,
-.Xr reboot 8 ,
-.Xr savecore 8
-.Sh HISTORY
-The
-.Fn reboot
-system call appeared in
-.Bx 4.0 .
-.Sh BUGS
-The HP300 implementation supports neither
-.Dv RB_DFLTROOT
-nor
-.Dv RB_KDB .
diff --git a/lib/libc_bsd/sys/recv.2 b/lib/libc_bsd/sys/recv.2
deleted file mode 100644
index 944bd29..0000000
--- a/lib/libc_bsd/sys/recv.2
+++ /dev/null
@@ -1,349 +0,0 @@
-.\" Copyright (c) 1983, 1990, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)recv.2	8.3 (Berkeley) 2/21/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/recv.2 248534 2013-03-19 20:58:17Z jilles $
-.\"
-.Dd March 19, 2013
-.Dt RECV 2
-.Os
-.Sh NAME
-.Nm recv ,
-.Nm recvfrom ,
-.Nm recvmsg
-.Nd receive a message from a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft ssize_t
-.Fn recv "int s" "void *buf" "size_t len" "int flags"
-.Ft ssize_t
-.Fn recvfrom "int s" "void *buf" "size_t len" "int flags" "struct sockaddr * restrict from" "socklen_t * restrict fromlen"
-.Ft ssize_t
-.Fn recvmsg "int s" "struct msghdr *msg" "int flags"
-.Sh DESCRIPTION
-The
-.Fn recvfrom
-and
-.Fn recvmsg
-system calls
-are used to receive messages from a socket,
-and may be used to receive data on a socket whether or not
-it is connection-oriented.
-.Pp
-If
-.Fa from
-is not a null pointer
-and the socket is not connection-oriented,
-the source address of the message is filled in.
-The
-.Fa fromlen
-argument
-is a value-result argument, initialized to the size of
-the buffer associated with
-.Fa from ,
-and modified on return to indicate the actual size of the
-address stored there.
-.Pp
-The
-.Fn recv
-function is normally used only on a
-.Em connected
-socket (see
-.Xr connect 2 )
-and is identical to
-.Fn recvfrom
-with a
-null pointer passed as its
-.Fa from
-argument.
-.Pp
-All three routines return the length of the message on successful
-completion.
-If a message is too long to fit in the supplied buffer,
-excess bytes may be discarded depending on the type of socket
-the message is received from (see
-.Xr socket 2 ) .
-.Pp
-If no messages are available at the socket, the
-receive call waits for a message to arrive, unless
-the socket is non-blocking (see
-.Xr fcntl 2 )
-in which case the value
-\-1 is returned and the global variable
-.Va errno
-is set to
-.Er EAGAIN .
-The receive calls normally return any data available,
-up to the requested amount,
-rather than waiting for receipt of the full amount requested;
-this behavior is affected by the socket-level options
-.Dv SO_RCVLOWAT
-and
-.Dv SO_RCVTIMEO
-described in
-.Xr getsockopt 2 .
-.Pp
-The
-.Xr select 2
-system call may be used to determine when more data arrives.
-.Pp
-The
-.Fa flags
-argument to a
-.Fn recv
-function is formed by
-.Em or Ap ing
-one or more of the values:
-.Bl -column ".Dv MSG_CMSG_CLOEXEC" -offset indent
-.It Dv MSG_OOB Ta process out-of-band data
-.It Dv MSG_PEEK Ta peek at incoming message
-.It Dv MSG_WAITALL Ta wait for full request or error
-.It Dv MSG_DONTWAIT Ta do not block
-.It Dv MSG_CMSG_CLOEXEC Ta set received fds close-on-exec
-.El
-.Pp
-The
-.Dv MSG_OOB
-flag requests receipt of out-of-band data
-that would not be received in the normal data stream.
-Some protocols place expedited data at the head of the normal
-data queue, and thus this flag cannot be used with such protocols.
-The
-.Dv MSG_PEEK
-flag causes the receive operation to return data
-from the beginning of the receive queue without removing that
-data from the queue.
-Thus, a subsequent receive call will return the same data.
-The
-.Dv MSG_WAITALL
-flag requests that the operation block until
-the full request is satisfied.
-However, the call may still return less data than requested
-if a signal is caught, an error or disconnect occurs,
-or the next data to be received is of a different type than that returned.
-The
-.Dv MSG_DONTWAIT
-flag requests the call to return when it would block otherwise.
-If no data is available,
-.Va errno
-is set to
-.Er EAGAIN .
-This flag is not available in strict
-.Tn ANSI
-or C99 compilation mode.
-.Pp
-The
-.Fn recvmsg
-system call uses a
-.Fa msghdr
-structure to minimize the number of directly supplied arguments.
-This structure has the following form, as defined in
-.In sys/socket.h :
-.Bd -literal
-struct msghdr {
-	void		*msg_name;	/* optional address */
-	socklen_t	 msg_namelen;	/* size of address */
-	struct iovec	*msg_iov;	/* scatter/gather array */
-	int		 msg_iovlen;	/* # elements in msg_iov */
-	void		*msg_control;	/* ancillary data, see below */
-	socklen_t	 msg_controllen;/* ancillary data buffer len */
-	int		 msg_flags;	/* flags on received message */
-};
-.Ed
-.Pp
-Here
-.Fa msg_name
-and
-.Fa msg_namelen
-specify the destination address if the socket is unconnected;
-.Fa msg_name
-may be given as a null pointer if no names are desired or required.
-The
-.Fa msg_iov
-and
-.Fa msg_iovlen
-arguments
-describe scatter gather locations, as discussed in
-.Xr read 2 .
-The
-.Fa msg_control
-argument,
-which has length
-.Fa msg_controllen ,
-points to a buffer for other protocol control related messages
-or other miscellaneous ancillary data.
-The messages are of the form:
-.Bd -literal
-struct cmsghdr {
-	socklen_t  cmsg_len;	/* data byte count, including hdr */
-	int	   cmsg_level;	/* originating protocol */
-	int	   cmsg_type;	/* protocol-specific type */
-/* followed by
-	u_char	   cmsg_data[]; */
-};
-.Ed
-.Pp
-As an example, one could use this to learn of changes in the data-stream
-in XNS/SPP, or in ISO, to obtain user-connection-request data by requesting
-a
-.Fn recvmsg
-with no data buffer provided immediately after an
-.Fn accept
-system call.
-.Pp
-Open file descriptors are now passed as ancillary data for
-.Dv AF_UNIX
-domain sockets, with
-.Fa cmsg_level
-set to
-.Dv SOL_SOCKET
-and
-.Fa cmsg_type
-set to
-.Dv SCM_RIGHTS .
-The close-on-exec flag on received descriptors is set according to the
-.Dv MSG_CMSG_CLOEXEC
-flag passed to
-.Fn recvmsg .
-.Pp
-Process credentials can also be passed as ancillary data for
-.Dv AF_UNIX
-domain sockets using a
-.Fa cmsg_type
-of
-.Dv SCM_CREDS .
-In this case,
-.Fa cmsg_data
-should be a structure of type
-.Fa cmsgcred ,
-which is defined in
-.In sys/socket.h
-as follows:
-.Bd -literal
-struct cmsgcred {
-	pid_t	cmcred_pid;		/* PID of sending process */
-	uid_t	cmcred_uid;		/* real UID of sending process */
-	uid_t	cmcred_euid;		/* effective UID of sending process */
-	gid_t	cmcred_gid;		/* real GID of sending process */
-	short	cmcred_ngroups;		/* number or groups */
-	gid_t	cmcred_groups[CMGROUP_MAX];	/* groups */
-};
-.Ed
-.Pp
-If a sender supplies ancillary data with enough space for the above struct
-tagged as
-.Dv SCM_CREDS
-control message type to the
-.Fn sendmsg
-system call, then kernel will fill in the credential information of the
-sending process and deliver it to the receiver.
-Since receiver usually has no control over a sender, this method of retrieving
-credential information isn't reliable.
-For reliable retrieval of remote side credentials it is advised to use the
-.Dv LOCAL_CREDS
-socket option on the receiving socket.
-See
-.Xr unix 4
-for details.
-.Pp
-The
-.Fa msg_flags
-field is set on return according to the message received.
-.Dv MSG_EOR
-indicates end-of-record;
-the data returned completed a record (generally used with sockets of type
-.Dv SOCK_SEQPACKET ) .
-.Dv MSG_TRUNC
-indicates that
-the trailing portion of a datagram was discarded because the datagram
-was larger than the buffer supplied.
-.Dv MSG_CTRUNC
-indicates that some
-control data were discarded due to lack of space in the buffer
-for ancillary data.
-.Dv MSG_OOB
-is returned to indicate that expedited or out-of-band data were received.
-.Sh RETURN VALUES
-These calls return the number of bytes received, or -1
-if an error occurred.
-.Sh ERRORS
-The calls fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is an invalid descriptor.
-.It Bq Er ECONNRESET
-The remote socket end is forcibly closed.
-.It Bq Er ENOTCONN
-The socket is associated with a connection-oriented protocol
-and has not been connected (see
-.Xr connect 2
-and
-.Xr accept 2 ) .
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-does not refer to a socket.
-.It Bq Er EMSGSIZE
-The
-.Fn recvmsg
-system call
-was used to receive rights (file descriptors) that were in flight on the
-connection.
-However, the receiving program did not have enough free file
-descriptor slots to accept them.
-In this case the descriptors are
-closed, any pending data can be returned by another call to
-.Fn recvmsg .
-.It Bq Er EAGAIN
-The socket is marked non-blocking, and the receive operation
-would block, or
-a receive timeout had been set,
-and the timeout expired before data were received.
-.It Bq Er EINTR
-The receive was interrupted by delivery of a signal before
-any data were available.
-.It Bq Er EFAULT
-The receive buffer pointer(s) point outside the process's
-address space.
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr getsockopt 2 ,
-.Xr read 2 ,
-.Xr select 2 ,
-.Xr socket 2 ,
-.Xr unix 4
-.Sh HISTORY
-The
-.Fn recv
-function appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/recvfrom.c b/lib/libc_bsd/sys/recvfrom.c
deleted file mode 100644
index 639b8f4..0000000
--- a/lib/libc_bsd/sys/recvfrom.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/recvfrom.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/socket.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_recvfrom, __recvfrom);
-
-#pragma weak recvfrom
-ssize_t
-recvfrom(int s, void *buf, size_t len, int flags,
-    struct sockaddr * __restrict from, socklen_t * __restrict fromlen)
-{
-
-	return (((ssize_t (*)(int, void *, size_t, int,
-	    struct sockaddr *, socklen_t *))
-	    __libc_interposing[INTERPOS_recvfrom])(s, buf, len, flags,
-	   from, fromlen));
-}
diff --git a/lib/libc_bsd/sys/recvmsg.c b/lib/libc_bsd/sys/recvmsg.c
deleted file mode 100644
index 2f1c29b..0000000
--- a/lib/libc_bsd/sys/recvmsg.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/recvmsg.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/socket.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_recvmsg, __recvmsg);
-
-#pragma weak recvmsg
-ssize_t
-recvmsg(int s, struct msghdr *msg, int flags)
-{
-
-	return (((int (*)(int, struct msghdr *, int))
-	    __libc_interposing[INTERPOS_recvmsg])(s, msg, flags));
-}
diff --git a/lib/libc_bsd/sys/rename.2 b/lib/libc_bsd/sys/rename.2
deleted file mode 100644
index b947df9..0000000
--- a/lib/libc_bsd/sys/rename.2
+++ /dev/null
@@ -1,308 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)rename.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/rename.2 184750 2008-11-07 15:01:40Z trasz $
-.\"
-.Dd April 10, 2008
-.Dt RENAME 2
-.Os
-.Sh NAME
-.Nm rename
-.Nd change the name of a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In stdio.h
-.Ft int
-.Fn rename "const char *from" "const char *to"
-.Ft int
-.Fn renameat "int fromfd" "const char *from" "int tofd" "const char *to"
-.Sh DESCRIPTION
-The
-.Fn rename
-system call
-causes the link named
-.Fa from
-to be renamed as
-.Fa to .
-If
-.Fa to
-exists, it is first removed.
-Both
-.Fa from
-and
-.Fa to
-must be of the same type (that is, both directories or both
-non-directories), and must reside on the same file system.
-.Pp
-The
-.Fn rename
-system call
-guarantees that if
-.Fa to
-already exists, an instance of
-.Fa to
-will always exist, even if the system should crash in
-the middle of the operation.
-.Pp
-If the final component of
-.Fa from
-is a symbolic link,
-the symbolic link is renamed,
-not the file or directory to which it points.
-.Pp
-The
-.Fn renameat
-system call is equivalent to
-.Fn rename
-except in the case where either
-.Fa from
-or
-.Fa to
-specifies a relative path.
-If
-.Fa from
-is a relative path, the file to be renamed is located
-relative to the directory associated with the file descriptor
-.Fa fromfd
-instead of the current working directory.
-If the
-.Fa to
-is a relative path, the same happens only relative to the directory associated
-with
-.Fa tofd .
-If the
-.Fn renameat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fromfd
-or
-.Fa tofd
-parameter, the current working directory is used in the determination
-of the file for the respective path parameter.
-.\".Sh CAVEAT
-.\"The system can deadlock if a loop in the file system graph is present.
-.\"This loop takes the form of an entry in directory
-.\".Pa a ,
-.\"say
-.\".Pa a/foo ,
-.\"being a hard link to directory
-.\".Pa b ,
-.\"and an entry in
-.\"directory
-.\".Pa b ,
-.\"say
-.\".Pa b/bar ,
-.\"being a hard link
-.\"to directory
-.\".Pa a .
-.\"When such a loop exists and two separate processes attempt to
-.\"perform
-.\".Ql rename a/foo b/bar
-.\"and
-.\".Ql rename b/bar a/foo ,
-.\"respectively,
-.\"the system may deadlock attempting to lock
-.\"both directories for modification.
-.\"Hard links to directories should be
-.\"replaced by symbolic links by the system administrator.
-.Sh RETURN VALUES
-.Rv -std rename
-.Sh ERRORS
-The
-.Fn rename
-system call
-will fail and neither of the argument files will be
-affected if:
-.Bl -tag -width Er
-.It Bq Er ENAMETOOLONG
-A component of either pathname exceeded 255 characters,
-or the entire length of either path name exceeded 1023 characters.
-.It Bq Er ENOENT
-A component of the
-.Fa from
-path does not exist,
-or a path prefix of
-.Fa to
-does not exist.
-.It Bq Er EACCES
-A component of either path prefix denies search permission.
-.It Bq Er EACCES
-The requested link requires writing in a directory with a mode
-that denies write permission.
-.It Bq Er EACCES
-The directory pointed at by the
-.Fa from
-argument denies write permission, and the operation would move
-it to another parent directory.
-.It Bq Er EPERM
-The file pointed at by the
-.Fa from
-argument has its immutable, undeletable or append-only flag set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EPERM
-The parent directory of the file pointed at by the
-.Fa from
-argument has its immutable or append-only flag set.
-.It Bq Er EPERM
-The parent directory of the file pointed at by the
-.Fa to
-argument has its immutable flag set.
-.It Bq Er EPERM
-The directory containing
-.Fa from
-is marked sticky,
-and neither the containing directory nor
-.Fa from
-are owned by the effective user ID.
-.It Bq Er EPERM
-The file pointed at by the
-.Fa to
-argument
-exists,
-the directory containing
-.Fa to
-is marked sticky,
-and neither the containing directory nor
-.Fa to
-are owned by the effective user ID.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating either pathname.
-.It Bq Er ENOTDIR
-A component of either path prefix is not a directory.
-.It Bq Er ENOTDIR
-The
-.Fa from
-argument
-is a directory, but
-.Fa to
-is not a directory.
-.It Bq Er EISDIR
-The
-.Fa to
-argument
-is a directory, but
-.Fa from
-is not a directory.
-.It Bq Er EXDEV
-The link named by
-.Fa to
-and the file named by
-.Fa from
-are on different logical devices (file systems).
-Note that this error
-code will not be returned if the implementation permits cross-device
-links.
-.It Bq Er ENOSPC
-The directory in which the entry for the new name is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-.It Bq Er EDQUOT
-The directory in which the entry for the new name
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-.It Bq Er EIO
-An I/O error occurred while making or updating a directory entry.
-.It Bq Er EROFS
-The requested link requires writing in a directory on a read-only file
-system.
-.It Bq Er EFAULT
-Path
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The
-.Fa from
-argument
-is a parent directory of
-.Fa to ,
-or an attempt is made to rename
-.Ql .\&
-or
-.Ql \&.. .
-.It Bq Er ENOTEMPTY
-The
-.Fa to
-argument
-is a directory and is not empty.
-.El
-.Pp
-In addition to the errors returned by the
-.Fn rename ,
-the
-.Fn renameat
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa from
-argument does not specify an absolute path and the
-.Fa fromfd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching, or the
-.Fa to
-argument does not specify an absolute path and the
-.Fa tofd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er ENOTDIR
-The
-.Fa from
-argument is not an absolute path and
-.Fa fromfd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory, or the
-.Fa to
-argument is not an absolute path and
-.Fa tofd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr open 2 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn rename
-system call is expected to conform to
-.St -p1003.1-96 .
-The
-.Fn renameat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn renameat
-system call appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/revoke.2 b/lib/libc_bsd/sys/revoke.2
deleted file mode 100644
index 1b1e358..0000000
--- a/lib/libc_bsd/sys/revoke.2
+++ /dev/null
@@ -1,106 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Berkeley Software Design, Inc.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"     @(#)revoke.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/revoke.2 194267 2009-06-15 21:52:27Z ed $
-.\"
-.Dd June 4, 1993
-.Dt REVOKE 2
-.Os
-.Sh NAME
-.Nm revoke
-.Nd revoke file access
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn revoke "const char *path"
-.Sh DESCRIPTION
-The
-.Fn revoke
-system call invalidates all current open file descriptors in the system
-for the file named by
-.Fa path .
-Subsequent operations on any such descriptors
-fail, with the exceptions that a
-.Fn read
-from a character device file which has been revoked
-returns a count of zero (end of file),
-and a
-.Fn close
-system call will succeed.
-If the file is a special file for a device which is open,
-the device close function
-is called as if all open references to the file had been closed.
-.Pp
-Access to a file may be revoked only by its owner or the super user.
-The
-.Fn revoke
-system call is currently supported only for block and character special
-device files.
-It is normally used to prepare a terminal device for a new login session,
-preventing any access by a previous user of the terminal.
-.Sh RETURN VALUES
-.Rv -std revoke
-.Sh ERRORS
-Access to the named file is revoked unless one of the following:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1024 characters.
-.It Bq Er ENOENT
-The named file or a component of the path name does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The implementation does not support the
-.Fn revoke
-operation on the named file.
-.It Bq Er EPERM
-The caller is neither the owner of the file nor the super user.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr revoke 1
-.Sh HISTORY
-The
-.Fn revoke
-system call first appeared in
-.Bx 4.3 Reno .
diff --git a/lib/libc_bsd/sys/rfork.2 b/lib/libc_bsd/sys/rfork.2
deleted file mode 100644
index bc773b7..0000000
--- a/lib/libc_bsd/sys/rfork.2
+++ /dev/null
@@ -1,192 +0,0 @@
-.\"
-.\" This manual page is taken directly from Plan9, and modified to
-.\" describe the actual BSD implementation. Permission for
-.\" use of this page comes from Rob Pike <rob@plan9.att.com>.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/rfork.2 223967 2011-07-12 20:38:42Z kib $
-.\"
-.Dd July 12, 2011
-.Dt RFORK 2
-.Os
-.Sh NAME
-.Nm rfork
-.Nd manipulate process resources
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn rfork "int flags"
-.Sh DESCRIPTION
-Forking, vforking or rforking are the only ways new processes are created.
-The
-.Fa flags
-argument to
-.Fn rfork
-selects which resources of the
-invoking process (parent) are shared
-by the new process (child) or initialized to
-their default values.
-The resources include
-the open file descriptor table (which, when shared, permits processes
-to open and close files for other processes),
-and open files.
-The
-.Fa flags
-argument
-is the logical OR of some subset of:
-.Bl -tag -width ".Dv RFLINUXTHPN"
-.It Dv RFPROC
-If set a new process is created; otherwise changes affect the
-current process.
-.It Dv RFNOWAIT
-If set, the child process will be dissociated from the parent.
-Upon
-exit the child will not leave a status for the parent to collect.
-See
-.Xr wait 2 .
-.It Dv RFFDG
-If set, the invoker's file descriptor table (see
-.Xr intro 2 )
-is copied; otherwise the two processes share a
-single table.
-.It Dv RFCFDG
-If set, the new process starts with a clean file descriptor table.
-Is mutually exclusive with
-.Dv RFFDG .
-.It Dv RFTHREAD
-If set, the new process shares file descriptor to process leaders table
-with its parent.
-Only applies when neither
-.Dv RFFDG
-nor
-.Dv RFCFDG
-are set.
-.It Dv RFMEM
-If set, the kernel will force sharing of the entire address space,
-typically by sharing the hardware page table directly.
-The child
-will thus inherit and share all the segments the parent process owns,
-whether they are normally shareable or not.
-The stack segment is
-not split (both the parent and child return on the same stack) and thus
-.Fn rfork
-with the RFMEM flag may not generally be called directly from high level
-languages including C.
-May be set only with
-.Dv RFPROC .
-A helper function is provided to assist with this problem and will cause
-the new process to run on the provided stack.
-See
-.Xr rfork_thread 3
-for information.
-Note that a lot of code will not run correctly in such an environment.
-.It Dv RFSIGSHARE
-If set, the kernel will force sharing the sigacts structure between the
-child and the parent.
-.It Dv RFTSIGZMB
-If set, the kernel will deliver a specified signal to the parent
-upon the child exit, instead of default SIGCHLD.
-The signal number
-.Dv signum
-is specified by oring the
-.Dv RFTSIGFLAGS(signum)
-expression into
-.Fa flags .
-Specifying signal number 0 disables signal delivery upon the child exit.
-.It Dv RFLINUXTHPN
-If set, the kernel will deliver SIGUSR1 instead of SIGCHLD upon thread
-exit for the child.
-This is intended to mimic certain Linux clone behaviour.
-.El
-.Pp
-File descriptors in a shared file descriptor table are kept
-open until either they are explicitly closed
-or all processes sharing the table exit.
-.Pp
-If
-.Dv RFPROC
-is set, the
-value returned in the parent process
-is the process id
-of the child process; the value returned in the child is zero.
-Without
-.Dv RFPROC ,
-the return value is zero.
-Process id's range from 1 to the maximum integer
-.Ft ( int )
-value.
-The
-.Fn rfork
-system call
-will sleep, if necessary, until required process resources are available.
-.Pp
-The
-.Fn fork
-system call
-can be implemented as a call to
-.Fn rfork "RFFDG | RFPROC"
-but is not for backwards compatibility.
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn rfork
-returns a value
-of 0 to the child process and returns the process ID of the child
-process to the parent process.
-Otherwise, a value of -1 is returned
-to the parent process, no child process is created, and the global
-variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn rfork
-system call
-will fail and no child process will be created if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The system-imposed limit on the total
-number of processes under execution would be exceeded.
-The limit is given by the
-.Xr sysctl 3
-MIB variable
-.Dv KERN_MAXPROC .
-(The limit is actually ten less than this
-except for the super user).
-.It Bq Er EAGAIN
-The user is not the super user, and
-the system-imposed limit
-on the total number of
-processes under execution by a single user would be exceeded.
-The limit is given by the
-.Xr sysctl 3
-MIB variable
-.Dv KERN_MAXPROCPERUID .
-.It Bq Er EAGAIN
-The user is not the super user, and
-the soft resource limit corresponding to the
-.Fa resource
-argument
-.Dv RLIMIT_NOFILE
-would be exceeded (see
-.Xr getrlimit 2 ) .
-.It Bq Er EINVAL
-Both the RFFDG and the RFCFDG flags were specified.
-.It Bq Er EINVAL
-Any flags not listed above were specified.
-.It Bq Er EINVAL
-An invalid signal number was specified.
-.It Bq Er ENOMEM
-There is insufficient swap space for the new process.
-.El
-.Sh SEE ALSO
-.Xr fork 2 ,
-.Xr intro 2 ,
-.Xr minherit 2 ,
-.Xr vfork 2 ,
-.Xr pthread_create 3 ,
-.Xr rfork_thread 3
-.Sh HISTORY
-The
-.Fn rfork
-function first appeared in Plan9.
diff --git a/lib/libc_bsd/sys/rmdir.2 b/lib/libc_bsd/sys/rmdir.2
deleted file mode 100644
index 3470195..0000000
--- a/lib/libc_bsd/sys/rmdir.2
+++ /dev/null
@@ -1,118 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)rmdir.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/rmdir.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd December 9, 2006
-.Dt RMDIR 2
-.Os
-.Sh NAME
-.Nm rmdir
-.Nd remove a directory file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn rmdir "const char *path"
-.Sh DESCRIPTION
-The
-.Fn rmdir
-system call
-removes a directory file
-whose name is given by
-.Fa path .
-The directory must not have any entries other
-than
-.Ql .\&
-and
-.Ql \&.. .
-.Sh RETURN VALUES
-.Rv -std rmdir
-.Sh ERRORS
-The named file is removed unless:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named directory does not exist.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENOTEMPTY
-The named directory contains files other than
-.Ql .\&
-and
-.Ql ..\&
-in it.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EACCES
-Write permission is denied on the directory containing the link
-to be removed.
-.It Bq Er EPERM
-The directory to be removed has its immutable, undeletable or append-only flag
-set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EPERM
-The parent directory of the directory to be removed has its immutable or
-append-only flag set.
-.It Bq Er EPERM
-The directory containing the directory to be removed is marked sticky,
-and neither the containing directory nor the directory to be removed
-are owned by the effective user ID.
-.It Bq Er EINVAL
-The last component of the path is
-.Ql .\&
-or
-.Ql .. .
-.It Bq Er EBUSY
-The directory to be removed is the mount point
-for a mounted file system.
-.It Bq Er EIO
-An I/O error occurred while deleting the directory entry
-or deallocating the inode.
-.It Bq Er EROFS
-The directory entry to be removed resides on a read-only file system.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.El
-.Sh SEE ALSO
-.Xr mkdir 2 ,
-.Xr unlink 2
-.Sh HISTORY
-The
-.Fn rmdir
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/rtprio.2 b/lib/libc_bsd/sys/rtprio.2
deleted file mode 100644
index c74f2a7..0000000
--- a/lib/libc_bsd/sys/rtprio.2
+++ /dev/null
@@ -1,199 +0,0 @@
-.\"-
-.\" Copyright (c) 1994, Henrik Vestergaard Draboel
-.\" 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 Henrik Vestergaard Draboel.
-.\" 4. 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.
-.\"-
-.\" Copyright (c) 2011 Xin LI <delphij@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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/rtprio.2 243144 2012-11-16 09:56:25Z kevlo $
-.\"
-.Dd December 27, 2011
-.Dt RTPRIO 2
-.Os
-.Sh NAME
-.Nm rtprio ,
-.Nm rtprio_thread
-.Nd examine or modify realtime or idle priority
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/rtprio.h
-.Ft int
-.Fn rtprio "int function" "pid_t pid" "struct rtprio *rtp"
-.Ft int
-.Fn rtprio_thread "int function" "lwpid_t lwpid" "struct rtprio *rtp"
-.Sh DESCRIPTION
-The
-.Fn rtprio
-system call
-is used to lookup or change the realtime or idle priority of a process,
-or the calling thread.
-The
-.Fn rtprio_thread
-system call
-is used to lookup or change the realtime or idle priority of a thread.
-.Pp
-The
-.Fa function
-argument
-specifies the operation to be performed.
-RTP_LOOKUP to lookup the current priority,
-and RTP_SET to set the priority.
-.Pp
-For the
-.Fn rtprio
-system call,
-the
-.Fa pid
-argument
-specifies the process to operate on,
-0 for the calling thread.
-When
-.Fa pid
-is non-zero,
-the system call reports the highest priority in the process,
-or sets all threads' priority in the process,
-depending on value of the
-.Fa function
-argument.
-.Pp
-For the
-.Fn rtprio_thread
-system call,
-the
-.Fa lwpid
-specifies the thread to operate on,
-0 for the calling thread.
-.Pp
-The
-.Fa *rtp
-argument
-is a pointer to a struct rtprio which is used to specify the priority and priority type.
-This structure has the following form:
-.Bd -literal
-struct rtprio {
-	u_short	type;
-	u_short prio;
-};
-.Ed
-.Pp
-The value of the
-.Va type
-field may be RTP_PRIO_REALTIME for realtime priorities,
-RTP_PRIO_NORMAL for normal priorities, and RTP_PRIO_IDLE for idle priorities.
-The priority specified by the
-.Va prio
-field ranges between 0 and
-.Dv RTP_PRIO_MAX
-.Pq usually 31 .
-0 is the highest possible priority.
-.Pp
-Realtime and idle priority is inherited through fork() and exec().
-.Pp
-A realtime thread can only be preempted by a thread of equal or
-higher priority, or by an interrupt; idle priority threads will run only
-when no other real/normal priority thread is runnable.
-Higher real/idle priority threads
-preempt lower real/idle priority threads.
-Threads of equal real/idle priority are run round-robin.
-.Sh RETURN VALUES
-.Rv -std rtprio rtprio_thread
-.Sh ERRORS
-The
-.Fn rtprio
-and
-.Fn rtprio_thread
-system calls
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The rtp pointer passed to
-.Fn rtprio
-or
-.Fn rtprio_thread
-was invalid.
-.It Bq Er EINVAL
-The specified
-.Fa prio
-was out of range.
-.It Bq Er EPERM
-The calling thread is not allowed to set the realtime priority.
-Only
-root is allowed to change the realtime priority of any thread, and non-root
-may only change the idle priority of threads the user owns,
-when the
-.Xr sysctl 8
-variable
-.Va security.bsd.unprivileged_idprio
-is set to non-zero.
-.It Bq Er ESRCH
-The specified process or thread was not found or visible.
-.El
-.Sh SEE ALSO
-.Xr nice 1 ,
-.Xr ps 1 ,
-.Xr rtprio 1 ,
-.Xr setpriority 2 ,
-.Xr nice 3 ,
-.Xr renice 8 ,
-.Xr p_cansee 9
-.Sh AUTHORS
-.An -nosplit
-The original author was
-.An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk .
-This implementation in
-.Fx
-was substantially rewritten by
-.An David Greenman .
-The
-.Fn rtprio_thread
-system call was implemented by
-.An David Xu .
diff --git a/lib/libc_bsd/sys/sched_get_priority_max.2 b/lib/libc_bsd/sys/sched_get_priority_max.2
deleted file mode 100644
index c0b772d..0000000
--- a/lib/libc_bsd/sys/sched_get_priority_max.2
+++ /dev/null
@@ -1,123 +0,0 @@
-.\" Copyright (c) 1998 HD Associates, Inc.
-.\" 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/sched_get_priority_max.2 131504 2004-07-02 23:52:20Z ru $
-.\"
-.Dd March 12, 1998
-.Dt SCHED_GET_PRIORITY_MAX 2
-.Os
-.Sh NAME
-.Nm sched_get_priority_max ,
-.Nm sched_get_priority_min ,
-.Nm sched_rr_get_interval
-.Nd get scheduling parameter limits
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sched.h
-.Ft int
-.Fn sched_get_priority_max "int policy"
-.Ft int
-.Fn sched_get_priority_min "int policy"
-.Ft int
-.Fn sched_rr_get_interval "pid_t pid" "struct timespec *interval"
-.Sh DESCRIPTION
-The
-.Fn sched_get_priority_max
-and
-.Fn sched_get_priority_min
-system calls return the appropriate maximum or minimum, respectively,
-for the scheduling policy specified by
-.Fa policy .
-The
-.Fn sched_rr_get_interval
-system call updates the
-.Fa timespec
-structure referenced by the
-.Fa interval
-argument to contain the current execution time limit (i.e., time
-quantum) for the process specified by
-.Fa pid .
-If
-.Fa pid
-is zero, the current execution time limit for the calling process is
-returned.
-.Pp
-The value of
-.Fa policy
-should be one of the scheduling policy values defined in
-.Fa <sched.h> :
-.Bl -tag -width [SCHED_OTHER]
-.It Bq Er SCHED_FIFO
-First-in-first-out fixed priority scheduling with no round robin scheduling;
-.It Bq Er SCHED_OTHER
-The standard time sharing scheduler;
-.It Bq Er SCHED_RR
-Round-robin scheduling across same priority processes.
-.El
-.Sh RETURN VALUES
-If successful, the
-.Fn sched_get_priority_max
-and
-.Fn sched_get_priority_min
-system calls shall return the appropriate maximum or minimum values,
-respectively.
-If unsuccessful, they shall return a value of -1 and set
-.Fa errno
-to indicate the error.
-.Pp
-.Rv -std sched_rr_get_interval
-.Sh ERRORS
-On failure
-.Va errno
-will be set to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The value of the
-.Fa policy
-argument does not represent a defined scheduling policy.
-.It Bq Er ENOSYS
-The
-.Fn sched_get_priority_max ,
-.Fn sched_get_priority_min ,
-and
-.Fn sched_rr_get_interval
-system calls are not supported by the implementation.
-.It Bq Er ESRCH
-No process can be found corresponding to that specified by
-.Fa pid .
-.El
-.Sh SEE ALSO
-.Xr sched_getparam 2 ,
-.Xr sched_getscheduler 2 ,
-.Xr sched_setparam 2 ,
-.Xr sched_setscheduler 2
-.Sh STANDARDS
-The
-.Fn sched_get_priority_max ,
-.Fn sched_get_priority_min ,
-and
-.Fn sched_rr_get_interval
-system calls conform to
-.St -p1003.1b-93 .
diff --git a/lib/libc_bsd/sys/sched_setparam.2 b/lib/libc_bsd/sys/sched_setparam.2
deleted file mode 100644
index 82b88bc..0000000
--- a/lib/libc_bsd/sys/sched_setparam.2
+++ /dev/null
@@ -1,174 +0,0 @@
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sched_setparam.2 131594 2004-07-04 20:55:50Z ru $
-.\" Copyright (c) 1998 HD Associates, Inc.
-.\" 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.
-.\"
-.\" 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.
-.\"
-.Dd March 12, 1998
-.Dt SCHED_SETPARAM 2
-.Os
-.Sh NAME
-.Nm sched_setparam ,
-.Nm sched_getparam
-.Nd set/get scheduling parameters
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sched.h
-.Ft int
-.Fn sched_setparam "pid_t pid" "const struct sched_param *param"
-.Ft int
-.Fn sched_getparam "pid_t pid" "struct sched_param *param"
-.Sh DESCRIPTION
-The
-.Fn sched_setparam
-system call sets the scheduling parameters of the process specified by
-.Fa pid
-to the values specified by the
-.Fa sched_param
-structure pointed to by
-.Fa param .
-The value of the
-.Fa sched_priority
-member in the
-.Fa param
-structure must be any integer within the inclusive priority range for
-the current scheduling policy of the process specified by
-.Fa pid .
-Higher numerical values for the priority represent higher priorities.
-.Pp
-In this implementation, if the value of
-.Fa pid
-is negative the system call will fail.
-.Pp
-If a process specified by
-.Fa pid
-exists and if the calling process has permission, the scheduling
-parameters are set for the process whose process ID is equal to
-.Fa pid .
-.Pp
-If
-.Fa pid
-is zero, the scheduling parameters are set for the calling process.
-.Pp
-In this implementation, the policy of when a process can affect
-the scheduling parameters of another process is specified in
-.St -p1003.1b-93
-as a write-style operation.
-.Pp
-The target process, whether it is running or not running, will resume
-execution after all other runnable processes of equal or greater
-priority have been scheduled to run.
-.Pp
-If the priority of the process specified by the
-.Fa pid
-argument is set higher than that of the lowest priority running process
-and if the specified process is ready to run, the process specified by
-the
-.Fa pid
-argument will preempt a lowest priority running process.
-Similarly, if
-the process calling
-.Fn sched_setparam
-sets its own priority lower than that of one or more other nonempty
-process lists, then the process that is the head of the highest priority
-list will also preempt the calling process.
-Thus, in either case, the
-originating process might not receive notification of the completion of
-the requested priority change until the higher priority process has
-executed.
-.Pp
-In this implementation, when the current scheduling policy for the
-process specified by
-.Fa pid
-is normal timesharing (SCHED_OTHER, aka SCHED_NORMAL when not POSIX-source)
-or the idle policy (SCHED_IDLE when not POSIX-source) then the behavior
-is as if the process had been running under SCHED_RR with a priority
-lower than any actual realtime priority.
-.Pp
-The
-.Fn sched_getparam
-system call will return the scheduling parameters of a process specified
-by
-.Fa pid
-in the
-.Fa sched_param
-structure pointed to by
-.Fa param .
-.Pp
-If a process specified by
-.Fa pid
-exists and if the calling process has permission,
-the scheduling parameters for the process whose process ID is equal to
-.Fa pid
-are returned.
-.Pp
-In this implementation, the policy of when a process can obtain the
-scheduling parameters of another process are detailed in
-.St -p1003.1b-93
-as a read-style operation.
-.Pp
-If
-.Fa pid
-is zero, the scheduling parameters for the calling process will be
-returned.
-In this implementation, the
-.Fa sched_getparam
-system call will fail if
-.Fa pid
-is negative.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-On failure
-.Va errno
-will be set to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er ENOSYS
-The system is not configured to support this functionality.
-.It Bq Er EPERM
-The requesting process doesn not have permission as detailed in
-.St -p1003.1b-93 .
-.It Bq Er ESRCH
-No process can be found corresponding to that specified by
-.Fa pid .
-.It Bq Er EINVAL
-For
-.Fn sched_setparam :
-one or more of the requested scheduling parameters
-is outside the range defined for the scheduling policy of the specified
-.Fa pid .
-.El
-.Sh SEE ALSO
-.Xr sched_get_priority_max 2 ,
-.Xr sched_get_priority_min 2 ,
-.Xr sched_getscheduler 2 ,
-.Xr sched_rr_get_interval 2 ,
-.Xr sched_setscheduler 2 ,
-.Xr sched_yield 2
-.Sh STANDARDS
-The
-.Fn sched_setparam
-and
-.Fn sched_getparam
-system calls conform to
-.St -p1003.1b-93 .
diff --git a/lib/libc_bsd/sys/sched_setscheduler.2 b/lib/libc_bsd/sys/sched_setscheduler.2
deleted file mode 100644
index dcb2507..0000000
--- a/lib/libc_bsd/sys/sched_setscheduler.2
+++ /dev/null
@@ -1,166 +0,0 @@
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sched_setscheduler.2 213573 2010-10-08 12:40:16Z uqs $
-.\" Copyright (c) 1998 HD Associates, Inc.
-.\" 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.
-.\"
-.\" 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.
-.\"
-.Dd March 12, 1998
-.Dt SCHED_SETSCHEDULER 2
-.Os
-.Sh NAME
-.Nm sched_setscheduler ,
-.Nm sched_getscheduler
-.Nd set/get scheduling policy and scheduler parameters
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sched.h
-.Ft int
-.Fn sched_setscheduler "pid_t pid" "int policy" "const struct sched_param *param"
-.Ft int
-.Fn sched_getscheduler "pid_t pid"
-.Sh DESCRIPTION
-The
-.Fn sched_setscheduler
-system call sets the scheduling policy and scheduling parameters
-of the process specified by
-.Fa pid
-to
-.Fa policy
-and the parameters specified in the
-.Vt sched_param
-structure pointed to by
-.Fa param ,
-respectively.
-The value of the
-.Fa sched_priority
-member in the
-.Fa param
-structure must be any integer within the inclusive priority range for
-the scheduling policy specified by
-.Fa policy .
-.Pp
-In this implementation, if the value of
-.Fa pid
-is negative the system call will fail.
-.Pp
-If a process specified by
-.Fa pid
-exists and if the calling process has permission, the scheduling
-policy and scheduling parameters will be set for the process
-whose process ID is equal to
-.Fa pid .
-.Pp
-If
-.Fa pid
-is zero, the scheduling policy and scheduling
-parameters are set for the calling process.
-.Pp
-In this implementation, the policy of when a process can affect
-the scheduling parameters of another process is specified in
-.St -p1003.1b-93
-as a write-style operation.
-.Pp
-The scheduling policies are in
-.Fa <sched.h> :
-.Bl -tag -width [SCHED_OTHER]
-.It Bq Er SCHED_FIFO
-First-in-first-out fixed priority scheduling with no round robin scheduling;
-.It Bq Er SCHED_OTHER
-The standard time sharing scheduler;
-.It Bq Er SCHED_RR
-Round-robin scheduling across same priority processes.
-.El
-.Pp
-The
-.Vt sched_param
-structure is defined in
-.Fa <sched.h> :
-.Bd -literal -offset indent
-struct sched_param {
-	int sched_priority;	/* scheduling priority */
-};
-.Ed
-.Pp
-The
-.Fn sched_getscheduler
-system call returns the scheduling policy of the process specified
-by
-.Fa pid .
-.Pp
-If a process specified by
-.Fa pid
-exists and if the calling process has permission,
-the scheduling parameters for the process whose process ID is equal to
-.Fa pid
-are returned.
-.Pp
-In this implementation, the policy of when a process can obtain the
-scheduling parameters of another process are detailed in
-.St -p1003.1b-93
-as a read-style operation.
-.Pp
-If
-.Fa pid
-is zero, the scheduling parameters for the calling process will be
-returned.
-In this implementation, the
-.Fa sched_getscheduler
-system call will fail if
-.Fa pid
-is negative.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-On failure
-.Va errno
-will be set to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er ENOSYS
-The system is not configured to support this functionality.
-.It Bq Er EPERM
-The requesting process doesn not have permission as detailed in
-.St -p1003.1b-93 .
-.It Bq Er ESRCH
-No process can be found corresponding to that specified by
-.Fa pid .
-.It Bq Er EINVAL
-The value of the
-.Fa policy
-argument is invalid, or one or more of the parameters contained in
-.Fa param
-is outside the valid range for the specified scheduling policy.
-.El
-.Sh SEE ALSO
-.Xr sched_getparam 2 ,
-.Xr sched_get_priority_max 2 ,
-.Xr sched_get_priority_min 2 ,
-.Xr sched_rr_get_interval 2 ,
-.Xr sched_setparam 2 ,
-.Xr sched_yield 2
-.Sh STANDARDS
-The
-.Fn sched_setscheduler
-and
-.Fn sched_getscheduler
-system calls conform to
-.St -p1003.1b-93 .
diff --git a/lib/libc_bsd/sys/sched_yield.2 b/lib/libc_bsd/sys/sched_yield.2
deleted file mode 100644
index db48822..0000000
--- a/lib/libc_bsd/sys/sched_yield.2
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sched_yield.2 131504 2004-07-02 23:52:20Z ru $
-.\" Copyright (c) 1998 HD Associates, Inc.
-.\" 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.
-.\"
-.\" 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.
-.\"
-.Dd March 12, 1998
-.Dt SCHED_YIELD 2
-.Os
-.Sh NAME
-.Nm sched_yield
-.Nd yield processor
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sched.h
-.Ft int
-.Fn sched_yield void
-.Sh DESCRIPTION
-The
-.Fn sched_yield
-system call forces the running process to relinquish the processor until it
-again becomes the head of its process list.
-It takes no arguments.
-.Sh RETURN VALUES
-.Rv -std sched_yield
-.Sh ERRORS
-On failure
-.Va errno
-will be set to the corresponding value:
-.Bl -tag -width Er
-.It Bq Er ENOSYS
-The system is not configured to support this functionality.
-.El
-.Sh STANDARDS
-The
-.Fn sched_yield
-system call conforms to
-.St -p1003.1b-93 .
diff --git a/lib/libc_bsd/sys/sctp_generic_recvmsg.2 b/lib/libc_bsd/sys/sctp_generic_recvmsg.2
deleted file mode 100644
index 4d1e587..0000000
--- a/lib/libc_bsd/sys/sctp_generic_recvmsg.2
+++ /dev/null
@@ -1,74 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sctp_generic_recvmsg.2 251071 2013-05-28 21:05:06Z emaste $
-.\"
-.Dd October 30, 2007
-.Dt SCTP_GENERIC_RECVMSG 2
-.Os
-.Sh NAME
-.Nm sctp_generic_recvmsg
-.Nd receive data from a peer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft int
-.Fn sctp_generic_recvmsg "int s" "struct iovec *iov" "int iovlen" "struct sockaddr *from" "socklen_t *fromlen" "struct sctp_sndrcvinfo *sinfo" "int *msgflags"
-.Sh DESCRIPTION
-.Fn sctp_generic_recvmsg
-is the true system call used by the
-.Xr sctp_recvmsg 3
-function call.
-This call is more efficient since it is a
-true system call but it is specific to
-.Fx
-and can be expected
-.Em not
-to be present on any other operating
-system.
-For detailed usage please see the
-.Xr sctp_recvmsg 3
-function call.
-.Sh RETURN VALUES
-The call returns the number of bytes read on success and -1 upon failure.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.El
-.Sh SEE ALSO
-.Xr sctp_recvmsg 3 ,
-.Xr sctp 4
diff --git a/lib/libc_bsd/sys/sctp_generic_sendmsg.2 b/lib/libc_bsd/sys/sctp_generic_sendmsg.2
deleted file mode 100644
index a34f117..0000000
--- a/lib/libc_bsd/sys/sctp_generic_sendmsg.2
+++ /dev/null
@@ -1,86 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sctp_generic_sendmsg.2 251071 2013-05-28 21:05:06Z emaste $
-.\"
-.Dd October 30, 2007
-.Dt SCTP_GENERIC_SENDMSG 2
-.Os
-.Sh NAME
-.Nm sctp_generic_sendmsg
-.Nm sctp_generic_sendmsg_iov
-.Nd send data to a peer
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft int
-.Fn sctp_generic_sendmsg "int s" "void *msg" "int msglen" "struct sockaddr *to" "socklen_t len" "struct sctp_sndrcvinfo *sinfo" "int flags"
-.Ft int
-.Fn sctp_generic_sendmsg_iov "int s" "struct iovec *iov" "int iovlen" "struct sockaddr *to" "struct sctp_sndrcvinfo *sinfo" "int flags"
-.Sh DESCRIPTION
-.Fn sctp_generic_sendmsg
-and
-.Fn sctp_generic_sendmsg_iov
-are the true system calls used by the
-.Xr sctp_sendmsg 3
-and
-.Xr sctp_send 3
-function calls.
-These are more efficient since they are
-true system calls but they are specific to
-.Fx
-and can be expected
-.Em not
-to be present on any other operating
-system.
-For detailed usage please see either the
-.Xr sctp_send 3
-or
-.Xr sctp_sendmsg 3
-function calls.
-.Sh RETURN VALUES
-The call returns the number of bytes written on success and -1 upon failure.
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.El
-.Sh SEE ALSO
-.Xr sctp_send 3 ,
-.Xr sctp_sendmsg 3 ,
-.Xr sctp_sendmsgx 3 ,
-.Xr sctp_sendx 3 ,
-.Xr sctp 4
diff --git a/lib/libc_bsd/sys/sctp_peeloff.2 b/lib/libc_bsd/sys/sctp_peeloff.2
deleted file mode 100644
index 266b0f3..0000000
--- a/lib/libc_bsd/sys/sctp_peeloff.2
+++ /dev/null
@@ -1,76 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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. 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.
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sctp_peeloff.2 251071 2013-05-28 21:05:06Z emaste $
-.\"
-.Dd October 30, 2007
-.Dt SCTP_PEELOFF 2
-.Os
-.Sh NAME
-.Nm sctp_peeloff
-.Nd detach an association from a one-to-many socket to its own fd
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In netinet/sctp.h
-.Ft int
-.Fn sctp_peeloff "int s" "sctp_assoc_t id"
-.Sh DESCRIPTION
-The
-.Fn sctp_peeloff
-system call attempts detach the association specified by
-.Fa id
-into its own separate socket.
-.Sh RETURN VALUES
-The call returns -1 on failure and the new socket descriptor
-upon success.
-.Sh ERRORS
-The
-.Fn sctp_peeloff
-system call can return the following errors:
-.Bl -tag -width Er
-.It Bq Er ENOTCONN
-The
-.Fa id
-given to the call does not map to a valid
-association.
-.It Bq Er E2BIG
-The size of the address list exceeds the amount of
-data provided.
-.It Bq Er EBADF
-The argument
-.Fa s
-is not a valid descriptor.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.El
-.Sh SEE ALSO
-.Xr sctp 4
diff --git a/lib/libc_bsd/sys/select.2 b/lib/libc_bsd/sys/select.2
deleted file mode 100644
index 53a299f..0000000
--- a/lib/libc_bsd/sys/select.2
+++ /dev/null
@@ -1,227 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)select.2	8.2 (Berkeley) 3/25/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/select.2 233648 2012-03-29 05:02:12Z eadler $
-.\"
-.Dd November 17, 2002
-.Dt SELECT 2
-.Os
-.Sh NAME
-.Nm select
-.Nd synchronous I/O multiplexing
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/select.h
-.Ft int
-.Fn select "int nfds" "fd_set *readfds" "fd_set *writefds" "fd_set *exceptfds" "struct timeval *timeout"
-.Fn FD_SET fd &fdset
-.Fn FD_CLR fd &fdset
-.Fn FD_ISSET fd &fdset
-.Fn FD_ZERO &fdset
-.Sh DESCRIPTION
-The
-.Fn select
-system call
-examines the I/O descriptor sets whose addresses are passed in
-.Fa readfds ,
-.Fa writefds ,
-and
-.Fa exceptfds
-to see if some of their descriptors
-are ready for reading, are ready for writing, or have an exceptional
-condition pending, respectively.
-The only exceptional condition detectable is out-of-band
-data received on a socket.
-The first
-.Fa nfds
-descriptors are checked in each set;
-i.e., the descriptors from 0 through
-.Fa nfds Ns No -1
-in the descriptor sets are examined.
-On return,
-.Fn select
-replaces the given descriptor sets
-with subsets consisting of those descriptors that are ready
-for the requested operation.
-The
-.Fn select
-system call
-returns the total number of ready descriptors in all the sets.
-.Pp
-The descriptor sets are stored as bit fields in arrays of integers.
-The following macros are provided for manipulating such descriptor sets:
-.Fn FD_ZERO &fdset
-initializes a descriptor set
-.Fa fdset
-to the null set.
-.Fn FD_SET fd &fdset
-includes a particular descriptor
-.Fa fd
-in
-.Fa fdset .
-.Fn FD_CLR fd &fdset
-removes
-.Fa fd
-from
-.Fa fdset .
-.Fn FD_ISSET fd &fdset
-is non-zero if
-.Fa fd
-is a member of
-.Fa fdset ,
-zero otherwise.
-The behavior of these macros is undefined if
-a descriptor value is less than zero or greater than or equal to
-.Dv FD_SETSIZE ,
-which is normally at least equal
-to the maximum number of descriptors supported by the system.
-.Pp
-If
-.Fa timeout
-is not a null pointer, it specifies the maximum interval to wait for the
-selection to complete.
-System activity can lengthen the interval by
-an indeterminate amount.
-.Pp
-If
-.Fa timeout
-is a null pointer, the select blocks indefinitely.
-.Pp
-To effect a poll, the
-.Fa timeout
-argument should not be a null pointer,
-but it should point to a zero-valued timeval structure.
-.Pp
-Any of
-.Fa readfds ,
-.Fa writefds ,
-and
-.Fa exceptfds
-may be given as null pointers if no descriptors are of interest.
-.Sh RETURN VALUES
-The
-.Fn select
-system call
-returns the number of ready descriptors that are contained in
-the descriptor sets,
-or -1 if an error occurred.
-If the time limit expires,
-.Fn select
-returns 0.
-If
-.Fn select
-returns with an error,
-including one due to an interrupted system call,
-the descriptor sets will be unmodified.
-.Sh ERRORS
-An error return from
-.Fn select
-indicates:
-.Bl -tag -width Er
-.It Bq Er EBADF
-One of the descriptor sets specified an invalid descriptor.
-.It Bq Er EFAULT
-One of the arguments
-.Fa readfds , writefds , exceptfds ,
-or
-.Fa timeout
-points to an invalid address.
-.It Bq Er EINTR
-A signal was delivered before the time limit expired and
-before any of the selected events occurred.
-.It Bq Er EINVAL
-The specified time limit is invalid.
-One of its components is
-negative or too large.
-.It Bq Er EINVAL
-The
-.Fa nfds
-argument
-was invalid.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr connect 2 ,
-.Xr getdtablesize 2 ,
-.Xr gettimeofday 2 ,
-.Xr kqueue 2 ,
-.Xr poll 2 ,
-.Xr read 2 ,
-.Xr recv 2 ,
-.Xr send 2 ,
-.Xr write 2 ,
-.Xr clocks 7
-.Sh NOTES
-The default size of
-.Dv FD_SETSIZE
-is currently 1024.
-In order to accommodate programs which might potentially
-use a larger number of open files with
-.Fn select ,
-it is possible
-to increase this size by having the program define
-.Dv FD_SETSIZE
-before the inclusion of any header which includes
-.In sys/types.h .
-.Pp
-If
-.Fa nfds
-is greater than the number of open files,
-.Fn select
-is not guaranteed to examine the unused file descriptors.
-For historical
-reasons,
-.Fn select
-will always examine the first 256 descriptors.
-.Sh STANDARDS
-The
-.Fn select
-system call and
-.Fn FD_CLR ,
-.Fn FD_ISSET ,
-.Fn FD_SET ,
-and
-.Fn FD_ZERO
-macros conform with
-.St -p1003.1-2001 .
-.Sh HISTORY
-The
-.Fn select
-system call appeared in
-.Bx 4.2 .
-.Sh BUGS
-.St -susv2
-allows systems to modify the original timeout in place.
-Thus, it is unwise to assume that the timeout value will be unmodified
-by the
-.Fn select
-system call.
-.Fx
-does not modify the return value, which can cause problems for applications
-ported from other systems.
diff --git a/lib/libc_bsd/sys/select.c b/lib/libc_bsd/sys/select.c
deleted file mode 100644
index 3d98eaf..0000000
--- a/lib/libc_bsd/sys/select.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/select.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/select.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_select, __select);
-
-#pragma weak select
-int
-select(int n, fd_set *rs, fd_set *ws, fd_set *es, struct timeval *t)
-{
-
-	return (((int (*)(int, fd_set *, fd_set *, fd_set *, struct timeval *))
-	    __libc_interposing[INTERPOS_select])(n, rs, ws, es, t));
-}
diff --git a/lib/libc_bsd/sys/semctl.2 b/lib/libc_bsd/sys/semctl.2
deleted file mode 100644
index 1b89d81..0000000
--- a/lib/libc_bsd/sys/semctl.2
+++ /dev/null
@@ -1,200 +0,0 @@
-.\"
-.\" Copyright (c) 1995 David Hovemeyer <daveho@infocom.com>
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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: releng/10.2/lib/libc/sys/semctl.2 195172 2009-06-29 18:54:17Z kib $
-.\"
-.Dd September 12, 1995
-.Dt SEMCTL 2
-.Os
-.Sh NAME
-.Nm semctl
-.Nd control operations on a semaphore set
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/sem.h
-.Ft int
-.Fn semctl "int semid" "int semnum" "int cmd" ...
-.Sh DESCRIPTION
-The
-.Fn semctl
-system call
-performs the operation indicated by
-.Fa cmd
-on the semaphore set indicated by
-.Fa semid .
-A fourth argument, a
-.Fa "union semun arg" ,
-is required for certain values of
-.Fa cmd .
-For the commands that use the
-.Fa arg
-argument,
-.Fa "union semun"
-is defined as follows:
-.\"
-.\" From <sys/sem.h>:
-.\"
-.Bd -literal
-union semun {
-        int     val;            /* value for SETVAL */
-        struct  semid_ds *buf;  /* buffer for IPC_STAT & IPC_SET */
-        u_short *array;         /* array for GETALL & SETALL */
-};
-.Ed
-.Pp
-Commands are performed as follows:
-.\"
-.\" This section based on Stevens, _Advanced Programming in the UNIX
-.\" Environment_.
-.\"
-.Bl -tag -width IPC_RMIDXXX
-.It Dv IPC_STAT
-Fetch the semaphore set's
-.Fa "struct semid_ds" ,
-storing it in the memory pointed to by
-.Fa arg.buf .
-.It Dv IPC_SET
-Changes the
-.Fa sem_perm.uid ,
-.Fa sem_perm.gid ,
-and
-.Fa sem_perm.mode
-members of the semaphore set's
-.Fa "struct semid_ds"
-to match those of the struct pointed to by
-.Fa arg.buf .
-The calling process's effective uid must
-match either
-.Fa sem_perm.uid
-or
-.Fa sem_perm.cuid ,
-or it must have superuser privileges.
-.It IPC_RMID
-Immediately removes the semaphore set from the system.
-The calling
-process's effective uid must equal the semaphore set's
-.Fa sem_perm.uid
-or
-.Fa sem_perm.cuid ,
-or the process must have superuser privileges.
-.It Dv GETVAL
-Return the value of semaphore number
-.Fa semnum .
-.It Dv SETVAL
-Set the value of semaphore number
-.Fa semnum
-to
-.Fa arg.val .
-Outstanding adjust on exit values for this semaphore in any process
-are cleared.
-.It Dv GETPID
-Return the pid of the last process to perform an operation on
-semaphore number
-.Fa semnum .
-.It Dv GETNCNT
-Return the number of processes waiting for semaphore number
-.Fa semnum Ns 's
-value to become greater than its current value.
-.It Dv GETZCNT
-Return the number of processes waiting for semaphore number
-.Fa semnum Ns 's
-value to become 0.
-.It Dv GETALL
-Fetch the value of all of the semaphores in the set into the
-array pointed to by
-.Fa arg.array .
-.It Dv SETALL
-Set the values of all of the semaphores in the set to the values
-in the array pointed to by
-.Fa arg.array .
-Outstanding adjust on exit values for all semaphores in this set,
-in any process are cleared.
-.El
-.Pp
-The
-.Vt "struct semid_ds"
-is defined as follows:
-.\"
-.\" Taken straight from <sys/sem.h>.
-.\"
-.Bd -literal
-struct semid_ds {
-        struct  ipc_perm sem_perm;      /* operation permission struct */
-        struct  sem *sem_base;  /* pointer to first semaphore in set */
-        u_short sem_nsems;      /* number of sems in set */
-        time_t  sem_otime;      /* last operation time */
-        time_t  sem_ctime;      /* last change time */
-                                /* Times measured in secs since */
-                                /* 00:00:00 GMT, Jan. 1, 1970 */
-};
-.Ed
-.Sh RETURN VALUES
-On success, when
-.Fa cmd
-is one of
-.Dv GETVAL , GETPID , GETNCNT
-or
-.Dv GETZCNT ,
-.Fn semctl
-returns the corresponding value; otherwise, 0 is returned.
-On failure, -1 is returned, and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn semctl
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-No semaphore set corresponds to
-.Fa semid .
-.It Bq Er EINVAL
-The
-.Fa semnum
-argument
-is not in the range of valid semaphores for given semaphore set.
-.It Bq Er EPERM
-The calling process's effective uid does not match the uid of
-the semaphore set's owner or creator.
-.It Bq Er EACCES
-Permission denied due to mismatch between operation and mode of
-semaphore set.
-.It Bq Er ERANGE
-.Dv SETVAL
-or
-.Dv SETALL
-attempted to set a semaphore outside the allowable range
-.Bq 0 .. Dv SEMVMX .
-.El
-.Sh SEE ALSO
-.Xr semget 2 ,
-.Xr semop 2
-.Sh BUGS
-.Dv SETALL
-may update some semaphore elements before returning an error.
diff --git a/lib/libc_bsd/sys/semget.2 b/lib/libc_bsd/sys/semget.2
deleted file mode 100644
index 2e3ef69..0000000
--- a/lib/libc_bsd/sys/semget.2
+++ /dev/null
@@ -1,148 +0,0 @@
-.\"
-.\" Copyright (c) 1995 David Hovemeyer <daveho@infocom.com>
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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: releng/10.2/lib/libc/sys/semget.2 141946 2005-02-15 09:27:00Z ru $
-.\"
-.Dd September 12, 1995
-.Dt SEMGET 2
-.Os
-.Sh NAME
-.Nm semget
-.Nd obtain a semaphore id
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/sem.h
-.Ft int
-.Fn semget "key_t key" "int nsems" "int flag"
-.Sh DESCRIPTION
-Based on the values of
-.Fa key
-and
-.Fa flag ,
-.Fn semget
-returns the identifier of a newly created or previously existing
-set of semaphores.
-.\"
-.\" This is copied verbatim from the shmget manpage.  Perhaps
-.\" it should go in a common manpage, such as .Xr ipc 2
-.\"
-The key
-is analogous to a filename: it provides a handle that names an
-IPC object.
-There are three ways to specify a key:
-.Bl -bullet
-.It
-IPC_PRIVATE may be specified, in which case a new IPC object
-will be created.
-.It
-An integer constant may be specified.
-If no IPC object corresponding
-to
-.Fa key
-is specified and the IPC_CREAT bit is set in
-.Fa flag ,
-a new one will be created.
-.It
-The
-.Xr ftok 3
-function
-may be used to generate a key from a pathname.
-.El
-.\"
-.\" Likewise for this section, except SHM_* becomes SEM_*.
-.\"
-.Pp
-The mode of a newly created IPC object is determined by
-.Em OR Ns 'ing
-the following constants into the
-.Fa flag
-argument:
-.Bl -tag -width XSEM_WXX6XXX
-.It Dv SEM_R
-Read access for user.
-.It Dv SEM_A
-Alter access for user.
-.It Dv ( SEM_R>>3 )
-Read access for group.
-.It Dv ( SEM_A>>3 )
-Alter access for group.
-.It Dv ( SEM_R>>6 )
-Read access for other.
-.It Dv ( SEM_A>>6 )
-Alter access for other.
-.El
-.Pp
-If a new set of semaphores is being created,
-.Fa nsems
-is used to indicate the number of semaphores the set should contain.
-Otherwise,
-.Fa nsems
-may be specified as 0.
-.Sh RETURN VALUES
-The
-.Fn semget
-system call
-returns the id of a semaphore set if successful; otherwise, -1
-is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn semget
-system call
-will fail if:
-.Bl -tag -width Er
-.\" ipcperm could fail (we are opening to read and write, as it were)
-.It Bq Er EACCES
-Access permission failure.
-.\"
-.\" sysv_sem.c is quite explicit about these, so I'm pretty sure
-.\" this is accurate
-.\"
-.It Bq Er EEXIST
-IPC_CREAT and IPC_EXCL were specified, and a semaphore set
-corresponding to
-.Fa key
-already exists.
-.It Bq Er EINVAL
-The number of semaphores requested exceeds the system imposed maximum
-per set.
-.It Bq Er ENOSPC
-Insufficiently many semaphores are available.
-.It Bq Er ENOSPC
-The kernel could not allocate a
-.Fa "struct semid_ds" .
-.It Bq Er ENOENT
-No semaphore set was found corresponding to
-.Fa key ,
-and IPC_CREAT was not specified.
-.El
-.Sh SEE ALSO
-.Xr semctl 2 ,
-.Xr semop 2 ,
-.Xr ftok 3
diff --git a/lib/libc_bsd/sys/semop.2 b/lib/libc_bsd/sys/semop.2
deleted file mode 100644
index 64ea798..0000000
--- a/lib/libc_bsd/sys/semop.2
+++ /dev/null
@@ -1,289 +0,0 @@
-.\"
-.\" Copyright (c) 1995 David Hovemeyer <daveho@infocom.com>
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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: releng/10.2/lib/libc/sys/semop.2 211936 2010-08-28 16:32:01Z brucec $
-.\"
-.Dd September 22, 1995
-.Dt SEMOP 2
-.Os
-.Sh NAME
-.Nm semop
-.Nd atomic array of operations on a semaphore set
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/sem.h
-.Ft int
-.Fn semop "int semid" "struct sembuf *array" "size_t nops"
-.Sh DESCRIPTION
-The
-.Fn semop
-system call
-atomically performs the array of operations indicated by
-.Fa array
-on the semaphore set indicated by
-.Fa semid .
-The length of
-.Fa array
-is indicated by
-.Fa nops .
-Each operation is encoded in a
-.Vt "struct sembuf" ,
-which is defined as follows:
-.\"
-.\" From <sys/sem.h>
-.\"
-.Bd -literal
-struct sembuf {
-        u_short sem_num;        /* semaphore # */
-        short   sem_op;         /* semaphore operation */
-        short   sem_flg;        /* operation flags */
-};
-.Ed
-.Pp
-For each element in
-.Fa array ,
-.Va sem_op
-and
-.Va sem_flg
-determine an operation to be performed on semaphore number
-.Va sem_num
-in the set.
-The values
-.Dv SEM_UNDO
-and
-.Dv IPC_NOWAIT
-may be
-.Em OR Ns 'ed
-into the
-.Va sem_flg
-member in order to modify the behavior of the given operation.
-.Pp
-The operation performed depends as follows on the value of
-.Va sem_op :
-.\"
-.\" This section is based on the description of semop() in
-.\" Stevens, _Advanced Programming in the UNIX Environment_,
-.\" and the semop(2) description in The Open Group Unix2 specification.
-.\"
-.Bl -bullet
-.It
-When
-.Va sem_op
-is positive and the process has alter permission,
-the semaphore's value is incremented by
-.Va sem_op Ns 's
-value.
-If
-.Dv SEM_UNDO
-is specified, the semaphore's adjust on exit value is decremented by
-.Va sem_op Ns 's
-value.
-A positive value for
-.Va sem_op
-generally corresponds to a process releasing a resource
-associated with the semaphore.
-.It
-The behavior when
-.Va sem_op
-is negative and the process has alter permission,
-depends on the current value of the semaphore:
-.Bl -bullet
-.It
-If the current value of the semaphore is greater than or equal to
-the absolute value of
-.Va sem_op ,
-then the value is decremented by the absolute value of
-.Va sem_op .
-If
-.Dv SEM_UNDO
-is specified, the semaphore's adjust on exit
-value is incremented by the absolute value of
-.Va sem_op .
-.It
-If the current value of the semaphore is less than the absolute value of
-.Va sem_op ,
-one of the following happens:
-.\" XXX a *second* sublist?
-.Bl -bullet
-.It
-If
-.Dv IPC_NOWAIT
-was specified, then
-.Fn semop
-returns immediately with a return value of
-.Er EAGAIN .
-.It
-Otherwise, the calling process is put to sleep until one of the following
-conditions is satisfied:
-.\" XXX We already have two sublists, why not a third?
-.Bl -bullet
-.It
-Some other process removes the semaphore with the
-.Dv IPC_RMID
-option of
-.Xr semctl 2 .
-In this case,
-.Fn semop
-returns immediately with a return value of
-.Er EIDRM .
-.It
-The process receives a signal that is to be caught.
-In this case, the process will resume execution as defined by
-.Xr sigaction 2 .
-.It
-The semaphore's
-value is greater than or equal to the absolute value of
-.Va sem_op .
-When this condition becomes true, the semaphore's value is decremented
-by the absolute value of
-.Va sem_op ,
-the semaphore's adjust on exit value is incremented by the
-absolute value of
-.Va sem_op .
-.El
-.El
-.El
-.Pp
-A negative value for
-.Va sem_op
-generally means that a process is waiting for a resource to become
-available.
-.It
-When
-.Va sem_op
-is zero and the process has read permission,
-one of the following will occur:
-.Bl -bullet
-.It
-If the current value of the semaphore is equal to zero
-then
-.Fn semop
-can return immediately.
-.It
-If
-.Dv IPC_NOWAIT
-was specified, then
-.Fn semop
-returns immediately with a return value of
-.Er EAGAIN .
-.It
-Otherwise, the calling process is put to sleep until one of the following
-conditions is satisfied:
-.\" XXX Another nested sublists
-.Bl -bullet
-.It
-Some other process removes the semaphore with the
-.Dv IPC_RMID
-option of
-.Xr semctl 2 .
-In this case,
-.Fn semop
-returns immediately with a return value of
-.Er EIDRM .
-.It
-The process receives a signal that is to be caught.
-In this case, the process will resume execution as defined by
-.Xr sigaction 2 .
-.It
-The semaphore's value becomes zero.
-.El
-.El
-.El
-.Pp
-For each semaphore a process has in use, the kernel maintains an
-.Dq "adjust on exit"
-value, as alluded to earlier.
-When a process
-exits, either voluntarily or involuntarily, the adjust on exit value
-for each semaphore is added to the semaphore's value.
-This can
-be used to ensure that a resource is released if a process terminates
-unexpectedly.
-.Sh RETURN VALUES
-.Rv -std semop
-.Sh ERRORS
-The
-.Fn semop
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-No semaphore set corresponds to
-.Fa semid ,
-or the process would exceed the system-defined limit for the number of
-per-process
-.Dv SEM_UNDO
-structures.
-.It Bq Er EACCES
-Permission denied due to mismatch between operation and mode of
-semaphore set.
-.It Bq Er EAGAIN
-The semaphore's value would have resulted in the process being put to sleep
-and
-.Dv IPC_NOWAIT
-was specified.
-.It Bq Er E2BIG
-Too many operations were specified.
-.Bq Dv SEMOPM
-.It Bq Er EFBIG
-.\"
-.\" I'd have thought this would be EINVAL, but the source says
-.\" EFBIG.
-.\"
-.Va sem_num
-was not in the range of valid semaphores for the set.
-.It Bq Er EIDRM
-The semaphore set was removed from the system.
-.It Bq Er EINTR
-The
-.Fn semop
-system call was interrupted by a signal.
-.It Bq Er ENOSPC
-The system
-.Dv SEM_UNDO
-pool
-.Bq Dv SEMMNU
-is full.
-.It Bq Er ERANGE
-The requested operation would cause either
-the semaphore's current value
-.Bq Dv SEMVMX
-or its adjust on exit value
-.Bq Dv SEMAEM
-to exceed the system-imposed limits.
-.El
-.Sh SEE ALSO
-.Xr semctl 2 ,
-.Xr semget 2 ,
-.Xr sigaction 2
-.Sh BUGS
-The
-.Fn semop
-system call
-may block waiting for memory even if
-.Dv IPC_NOWAIT
-was specified.
diff --git a/lib/libc_bsd/sys/send.2 b/lib/libc_bsd/sys/send.2
deleted file mode 100644
index 3e2f204..0000000
--- a/lib/libc_bsd/sys/send.2
+++ /dev/null
@@ -1,232 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/send.2 188144 2009-02-05 14:06:09Z jamie $
-.\"
-.Dd February 5, 2009
-.Dt SEND 2
-.Os
-.Sh NAME
-.Nm send ,
-.Nm sendto ,
-.Nm sendmsg
-.Nd send a message from a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft ssize_t
-.Fn send "int s" "const void *msg" "size_t len" "int flags"
-.Ft ssize_t
-.Fn sendto "int s" "const void *msg" "size_t len" "int flags" "const struct sockaddr *to" "socklen_t tolen"
-.Ft ssize_t
-.Fn sendmsg "int s" "const struct msghdr *msg" "int flags"
-.Sh DESCRIPTION
-The
-.Fn send
-function,
-and
-.Fn sendto
-and
-.Fn sendmsg
-system calls
-are used to transmit a message to another socket.
-The
-.Fn send
-function
-may be used only when the socket is in a
-.Em connected
-state, while
-.Fn sendto
-and
-.Fn sendmsg
-may be used at any time.
-.Pp
-The address of the target is given by
-.Fa to
-with
-.Fa tolen
-specifying its size.
-The length of the message is given by
-.Fa len .
-If the message is too long to pass atomically through the
-underlying protocol, the error
-.Er EMSGSIZE
-is returned, and
-the message is not transmitted.
-.Pp
-No indication of failure to deliver is implicit in a
-.Fn send .
-Locally detected errors are indicated by a return value of -1.
-.Pp
-If no messages space is available at the socket to hold
-the message to be transmitted, then
-.Fn send
-normally blocks, unless the socket has been placed in
-non-blocking I/O mode.
-The
-.Xr select 2
-system call may be used to determine when it is possible to
-send more data.
-.Pp
-The
-.Fa flags
-argument may include one or more of the following:
-.Bd -literal
-#define	MSG_OOB		0x00001 /* process out-of-band data */
-#define	MSG_DONTROUTE	0x00004 /* bypass routing, use direct interface */
-#define MSG_EOR		0x00008 /* data completes record */
-#define	MSG_EOF		0x00100 /* data completes transaction */
-#define	MSG_NOSIGNAL	0x20000 /* do not generate SIGPIPE on EOF */
-.Ed
-.Pp
-The flag
-.Dv MSG_OOB
-is used to send
-.Dq out-of-band
-data on sockets that support this notion (e.g.\&
-.Dv SOCK_STREAM ) ;
-the underlying protocol must also support
-.Dq out-of-band
-data.
-.Dv MSG_EOR
-is used to indicate a record mark for protocols which support the
-concept.
-.Dv MSG_EOF
-requests that the sender side of a socket be shut down, and that an
-appropriate indication be sent at the end of the specified data;
-this flag is only implemented for
-.Dv SOCK_STREAM
-sockets in the
-.Dv PF_INET
-protocol family.
-.Dv MSG_DONTROUTE
-is usually used only by diagnostic or routing programs.
-.Dv MSG_NOSIGNAL
-is used to prevent
-.Dv SIGPIPE
-generation when writing a socket that
-may be closed.
-.Pp
-See
-.Xr recv 2
-for a description of the
-.Fa msghdr
-structure.
-.Sh RETURN VALUES
-The call returns the number of characters sent, or -1
-if an error occurred.
-.Sh ERRORS
-The
-.Fn send
-function and
-.Fn sendto
-and
-.Fn sendmsg
-system calls
-fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-An invalid descriptor was specified.
-.It Bq Er EACCES
-The destination address is a broadcast address, and
-.Dv SO_BROADCAST
-has not been set on the socket.
-.It Bq Er ENOTSOCK
-The argument
-.Fa s
-is not a socket.
-.It Bq Er EFAULT
-An invalid user space address was specified for an argument.
-.It Bq Er EMSGSIZE
-The socket requires that message be sent atomically,
-and the size of the message to be sent made this impossible.
-.It Bq Er EAGAIN
-The socket is marked non-blocking and the requested operation
-would block.
-.It Bq Er ENOBUFS
-The system was unable to allocate an internal buffer.
-The operation may succeed when buffers become available.
-.It Bq Er ENOBUFS
-The output queue for a network interface was full.
-This generally indicates that the interface has stopped sending,
-but may be caused by transient congestion.
-.It Bq Er EHOSTUNREACH
-The remote host was unreachable.
-.It Bq Er EISCONN
-A destination address was specified and the socket is already connected.
-.It Bq Er ECONNREFUSED
-The socket received an ICMP destination unreachable message
-from the last message sent.
-This typically means that the
-receiver is not listening on the remote port.
-.It Bq Er EHOSTDOWN
-The remote host was down.
-.It Bq Er ENETDOWN
-The remote network was down.
-.It Bq Er EADDRNOTAVAIL
-The process using a
-.Dv SOCK_RAW
-socket was jailed and the source
-address specified in the IP header did not match the IP
-address bound to the prison.
-.It Bq Er EPIPE
-The socket is unable to send anymore data
-.Dv ( SBS_CANTSENDMORE
-has been set on the socket).
-This typically means that the socket
-is not connected.
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr getsockopt 2 ,
-.Xr recv 2 ,
-.Xr select 2 ,
-.Xr socket 2 ,
-.Xr write 2
-.Sh HISTORY
-The
-.Fn send
-function appeared in
-.Bx 4.2 .
-.Sh BUGS
-Because
-.Fn sendmsg
-does not necessarily block until the data has been transferred, it
-is possible to transfer an open file descriptor across an
-.Dv AF_UNIX
-domain socket
-(see
-.Xr recv 2 ) ,
-then
-.Fn close
-it before it has actually been sent, the result being that the receiver
-gets a closed file descriptor.
-It is left to the application to
-implement an acknowledgment mechanism to prevent this from happening.
diff --git a/lib/libc_bsd/sys/sendfile.2 b/lib/libc_bsd/sys/sendfile.2
deleted file mode 100644
index 8a44da7..0000000
--- a/lib/libc_bsd/sys/sendfile.2
+++ /dev/null
@@ -1,318 +0,0 @@
-.\" Copyright (c) 2003, David G. Lawrence
-.\" 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 unmodified, 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.
-.\"
-.\" 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: releng/10.2/lib/libc/sys/sendfile.2 243015 2012-11-14 01:45:10Z kevlo $
-.\"
-.Dd January 7, 2010
-.Dt SENDFILE 2
-.Os
-.Sh NAME
-.Nm sendfile
-.Nd send a file to a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.In sys/uio.h
-.Ft int
-.Fo sendfile
-.Fa "int fd" "int s" "off_t offset" "size_t nbytes"
-.Fa "struct sf_hdtr *hdtr" "off_t *sbytes" "int flags"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn sendfile
-system call
-sends a regular file specified by descriptor
-.Fa fd
-out a stream socket specified by descriptor
-.Fa s .
-.Pp
-The
-.Fa offset
-argument specifies where to begin in the file.
-Should
-.Fa offset
-fall beyond the end of file, the system will return
-success and report 0 bytes sent as described below.
-The
-.Fa nbytes
-argument specifies how many bytes of the file should be sent, with 0 having the special
-meaning of send until the end of file has been reached.
-.Pp
-An optional header and/or trailer can be sent before and after the file data by specifying
-a pointer to a
-.Vt "struct sf_hdtr" ,
-which has the following structure:
-.Pp
-.Bd -literal -offset indent -compact
-struct sf_hdtr {
-	struct iovec *headers;	/* pointer to header iovecs */
-	int hdr_cnt;		/* number of header iovecs */
-	struct iovec *trailers;	/* pointer to trailer iovecs */
-	int trl_cnt;		/* number of trailer iovecs */
-};
-.Ed
-.Pp
-The
-.Fa headers
-and
-.Fa trailers
-pointers, if
-.Pf non- Dv NULL ,
-point to arrays of
-.Vt "struct iovec"
-structures.
-See the
-.Fn writev
-system call for information on the iovec structure.
-The number of iovecs in these
-arrays is specified by
-.Fa hdr_cnt
-and
-.Fa trl_cnt .
-.Pp
-If
-.Pf non- Dv NULL ,
-the system will write the total number of bytes sent on the socket to the
-variable pointed to by
-.Fa sbytes .
-.Pp
-The
-.Fa flags
-argument is a bitmap of these values:
-.Bl -item -offset indent
-.It
-.Dv SF_NODISKIO .
-This flag causes any
-.Fn sendfile
-call which would block on disk I/O to instead
-return
-.Er EBUSY .
-Busy servers may benefit by transferring requests that would
-block to a separate I/O worker thread.
-.It
-.Dv SF_MNOWAIT .
-Do not wait for some kernel resource to become available,
-in particular,
-.Vt mbuf
-and
-.Vt sf_buf .
-The flag does not make the
-.Fn sendfile
-syscall truly non-blocking, since other resources are still allocated
-in a blocking fashion.
-.It
-.Dv SF_SYNC .
-.Nm
-sleeps until the network stack no longer references the VM pages
-of the file, making subsequent modifications to it safe.
-Please note that this is not a guarantee that the data has actually
-been sent.
-.El
-.Pp
-When using a socket marked for non-blocking I/O,
-.Fn sendfile
-may send fewer bytes than requested.
-In this case, the number of bytes successfully
-written is returned in
-.Fa *sbytes
-(if specified),
-and the error
-.Er EAGAIN
-is returned.
-.Sh IMPLEMENTATION NOTES
-The
-.Fx
-implementation of
-.Fn sendfile
-is "zero-copy", meaning that it has been optimized so that copying of the file data is avoided.
-.Sh TUNING
-On some architectures, this system call internally uses a special
-.Fn sendfile
-buffer
-.Pq Vt "struct sf_buf"
-to handle sending file data to the client.
-If the sending socket is
-blocking, and there are not enough
-.Fn sendfile
-buffers available,
-.Fn sendfile
-will block and report a state of
-.Dq Li sfbufa .
-If the sending socket is non-blocking and there are not enough
-.Fn sendfile
-buffers available, the call will block and wait for the
-necessary buffers to become available before finishing the call.
-.Pp
-The number of
-.Vt sf_buf Ns 's
-allocated should be proportional to the number of nmbclusters used to
-send data to a client via
-.Fn sendfile .
-Tune accordingly to avoid blocking!
-Busy installations that make extensive use of
-.Fn sendfile
-may want to increase these values to be inline with their
-.Va kern.ipc.nmbclusters
-(see
-.Xr tuning 7
-for details).
-.Pp
-The number of
-.Fn sendfile
-buffers available is determined at boot time by either the
-.Va kern.ipc.nsfbufs
-.Xr loader.conf 5
-variable or the
-.Dv NSFBUFS
-kernel configuration tunable.
-The number of
-.Fn sendfile
-buffers scales with
-.Va kern.maxusers .
-The
-.Va kern.ipc.nsfbufsused
-and
-.Va kern.ipc.nsfbufspeak
-read-only
-.Xr sysctl 8
-variables show current and peak
-.Fn sendfile
-buffers usage respectively.
-These values may also be viewed through
-.Nm netstat Fl m .
-.Pp
-If a value of zero is reported for
-.Va kern.ipc.nsfbufs ,
-your architecture does not need to use
-.Fn sendfile
-buffers because their task can be efficiently performed
-by the generic virtual memory structures.
-.Sh RETURN VALUES
-.Rv -std sendfile
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The socket is marked for non-blocking I/O and not all data was sent due to
-the socket buffer being filled.
-If specified, the number of bytes successfully sent will be returned in
-.Fa *sbytes .
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid file descriptor.
-.It Bq Er EBADF
-The
-.Fa s
-argument
-is not a valid socket descriptor.
-.It Bq Er EBUSY
-Completing the entire transfer would have required disk I/O, so
-it was aborted.
-Partial data may have been sent.
-(This error can only occur when
-.Dv SF_NODISKIO
-is specified.)
-.It Bq Er EFAULT
-An invalid address was specified for an argument.
-.It Bq Er EINTR
-A signal interrupted
-.Fn sendfile
-before it could be completed.
-If specified, the number
-of bytes successfully sent will be returned in
-.Fa *sbytes .
-.It Bq Er EINVAL
-The
-.Fa fd
-argument
-is not a regular file.
-.It Bq Er EINVAL
-The
-.Fa s
-argument
-is not a SOCK_STREAM type socket.
-.It Bq Er EINVAL
-The
-.Fa offset
-argument
-is negative.
-.It Bq Er EIO
-An error occurred while reading from
-.Fa fd .
-.It Bq Er ENOBUFS
-The system was unable to allocate an internal buffer.
-.It Bq Er ENOTCONN
-The
-.Fa s
-argument
-points to an unconnected socket.
-.It Bq Er ENOTSOCK
-The
-.Fa s
-argument
-is not a socket.
-.It Bq Er EOPNOTSUPP
-The file system for descriptor
-.Fa fd
-does not support
-.Fn sendfile .
-.It Bq Er EPIPE
-The socket peer has closed the connection.
-.El
-.Sh SEE ALSO
-.Xr netstat 1 ,
-.Xr open 2 ,
-.Xr send 2 ,
-.Xr socket 2 ,
-.Xr writev 2 ,
-.Xr tuning 7
-.Rs
-.%A K. Elmeleegy
-.%A A. Chanda
-.%A A. L. Cox
-.%A W. Zwaenepoel
-.%T A Portable Kernel Abstraction for Low-Overhead Ephemeral Mapping Management
-.%J The Proceedings of the 2005 USENIX Annual Technical Conference
-.%P pp 223-236
-.%D 2005
-.Re
-.Sh HISTORY
-The
-.Fn sendfile
-system call
-first appeared in
-.Fx 3.0 .
-This manual page first appeared in
-.Fx 3.1 .
-.Sh AUTHORS
-The
-.Fn sendfile
-system call
-and this manual page were written by
-.An David G. Lawrence Aq dg@dglawrence.com .
diff --git a/lib/libc_bsd/sys/sendmsg.c b/lib/libc_bsd/sys/sendmsg.c
deleted file mode 100644
index dfbffd0..0000000
--- a/lib/libc_bsd/sys/sendmsg.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/sendmsg.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/socket.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_sendmsg, __sendmsg);
-
-#pragma weak sendmsg
-ssize_t
-sendmsg(int s, const struct msghdr *msg, int flags)
-{
-
-	return (((int (*)(int, const struct msghdr *, int))
-	    __libc_interposing[INTERPOS_sendmsg])(s, msg, flags));
-}
diff --git a/lib/libc_bsd/sys/sendto.c b/lib/libc_bsd/sys/sendto.c
deleted file mode 100644
index c10c590..0000000
--- a/lib/libc_bsd/sys/sendto.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/sendto.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <sys/socket.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_sendto, __sendto);
-
-#pragma weak sendto
-ssize_t
-sendto(int s, const void *msg, size_t len, int flags,
-    const struct sockaddr *to, socklen_t tolen)
-{
-
-	return (((ssize_t (*)(int, const void *, size_t, int,
-	    const struct sockaddr *, socklen_t))
-	    __libc_interposing[INTERPOS_sendto])(s, msg, len, flags,
-	    to, tolen));
-}
diff --git a/lib/libc_bsd/sys/setcontext.c b/lib/libc_bsd/sys/setcontext.c
deleted file mode 100644
index 0ce2ccf..0000000
--- a/lib/libc_bsd/sys/setcontext.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/setcontext.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <ucontext.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_setcontext, __setcontext);
-__sym_compat(setcontext, __impl_setcontext, FBSD_1.0);
-__weak_reference(setcontext, __impl_setcontext);
-__sym_default(setcontext, setcontext, FBSD_1.2);
-
-#pragma weak setcontext
-int
-setcontext(const ucontext_t *uc)
-{
-
-	return (((int (*)(const ucontext_t *))
-	    __libc_interposing[INTERPOS_setcontext])(uc));
-}
diff --git a/lib/libc_bsd/sys/setfib.2 b/lib/libc_bsd/sys/setfib.2
deleted file mode 100644
index 9038813..0000000
--- a/lib/libc_bsd/sys/setfib.2
+++ /dev/null
@@ -1,107 +0,0 @@
-.\" Copyright (c) 2008 Cisco Systems.  All rights reserved.
-.\"    Author: Julian Elischer
-.\"
-.\" 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. Neither the name of the Cisco Systems nor the names of its employees
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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: releng/10.2/lib/libc/sys/setfib.2 250831 2013-05-20 20:47:40Z julian $
-.\"
-.Dd March 19, 2012
-.Dt SETFIB 2
-.Os
-.Sh NAME
-.Nm setfib
-.Nd set the default FIB (routing table) for the calling process.
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/socket.h
-.Ft int
-.Fn setfib "int fib"
-.Sh DESCRIPTION
-The
-.Fn setfib
-system call sets the associated fib for all sockets opened
-subsequent to the call, to be that of the argument
-.Fa fib .
-The
-.Fa fib
-argument
-must be greater than or equal to 0
-and less than the current system maximum which
-may be retrieved by the
-.Va net.fibs
-sysctl.
-The system maximum is set in the kernel configuration file with
-.Bd -ragged -offset indent
-.Cd "options ROUTETABLES=" Ns Em N
-.Ed
-.Pp
-or in
-.Pa /boot/loader.conf
-with
-.Pp
-.Dl net.fibs= Ns Qq Em N
-.Pp
-where
-.Em N
-is an integer.
-This maximum is capped at 65536 due to the implementation storing
-the fib number in a 16-bit field in the
-.Xr mbuf 9
-packet header, however it is not suggested that one use such a large number
-as memory is allocated for every FIB regardless of whether it is used, and
-there are places where all FIBs are iterated over.
-.Pp
-The default fib of the process will be applied to all protocol families
-that support multiple fibs, and ignored by those that do not.
-The default fib for a process may be overridden for a socket with the use
-of the
-.Dv SO_SETFIB
-socket option.
-.Sh RETURN VALUES
-.Rv -std setfib
-.Sh ERRORS
-The
-.Fn setfib
-system call
-will fail and no action will be taken and return
-.Er EINVAL
-if the
-.Fa fib
-argument is greater than the current system maximum.
-.Sh SEE ALSO
-.Xr setfib 1 ,
-.Xr setsockopt 2
-.Sh STANDARDS
-The
-.Fn setfib
-system call is a
-.Fx
-extension however similar extensions
-have been added to many other
-.Ux
-style kernels.
-.Sh HISTORY
-The
-.Fn setfib
-function appeared in
-.Fx 7.1 .
diff --git a/lib/libc_bsd/sys/setgroups.2 b/lib/libc_bsd/sys/setgroups.2
deleted file mode 100644
index 1298f5f..0000000
--- a/lib/libc_bsd/sys/setgroups.2
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1993, 1994
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)setgroups.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/setgroups.2 194494 2009-06-19 15:58:24Z brooks $
-.\"
-.Dd April 16, 1994
-.Dt SETGROUPS 2
-.Os
-.Sh NAME
-.Nm setgroups
-.Nd set group access list
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In unistd.h
-.Ft int
-.Fn setgroups "int ngroups" "const gid_t *gidset"
-.Sh DESCRIPTION
-The
-.Fn setgroups
-system call
-sets the group access list of the current user process
-according to the array
-.Fa gidset .
-The
-.Fa ngroups
-argument
-indicates the number of entries in the array and must be no
-more than
-.Dv {NGROUPS_MAX}+1 .
-.Pp
-Only the super-user may set a new group list.
-.Sh RETURN VALUES
-.Rv -std setgroups
-.Sh ERRORS
-The
-.Fn setgroups
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The caller is not the super-user.
-.It Bq Er EINVAL
-The number specified in the
-.Fa ngroups
-argument is larger than the
-.Dv {NGROUPS_MAX}+1
-limit.
-.It Bq Er EFAULT
-The address specified for
-.Fa gidset
-is outside the process
-address space.
-.El
-.Sh SEE ALSO
-.Xr getgroups 2 ,
-.Xr initgroups 3
-.Sh HISTORY
-The
-.Fn setgroups
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/setpgid.2 b/lib/libc_bsd/sys/setpgid.2
deleted file mode 100644
index 2276068..0000000
--- a/lib/libc_bsd/sys/setpgid.2
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)setpgid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/setpgid.2 199985 2009-12-01 06:12:31Z keramida $
-.\"
-.Dd February 8, 2004
-.Dt SETPGID 2
-.Os
-.Sh NAME
-.Nm setpgid ,
-.Nm setpgrp
-.Nd set process group
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn setpgid "pid_t pid" "pid_t pgrp"
-.Ft int
-.Fn setpgrp "pid_t pid" "pid_t pgrp"
-.Sh DESCRIPTION
-The
-.Fn setpgid
-system call
-sets the process group of the specified process
-.Fa pid
-to the specified
-.Fa pgrp .
-If
-.Fa pid
-is zero, then the call applies to the current process.
-If
-.Fa pgrp
-is zero, then the process id of the process specified by
-.Fa pid
-is used instead.
-.Pp
-If the affected process is not the invoking process, then it must be a
-child of the invoking process, it must not have performed an
-.Xr exec 3
-operation, and both processes must be in the same session.
-The requested process group ID must already exist in the session of
-the caller, or it must be equal to the target process ID.
-.Sh RETURN VALUES
-.Rv -std setpgid
-.Sh COMPATIBILITY
-The
-.Fn setpgrp
-system call
-is identical to
-.Fn setpgid ,
-and is retained for calling convention compatibility with historical
-versions of
-.Bx .
-.Sh ERRORS
-The
-.Fn setpgid
-system call
-will fail and the process group will not be altered if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The requested process group ID is not legal.
-.It Bq Er ESRCH
-The requested process does not exist.
-.It Bq Er ESRCH
-The target process is not the calling process or
-a child of the calling process.
-.It Bq Er EACCES
-The requested process is a child of the calling process,
-but it has performed an
-.Xr exec 3
-operation.
-.It Bq Er EPERM
-The target process is a session leader.
-.It Bq Er EPERM
-The requested process group ID is not in the session of the caller,
-and it is not equal to the process ID of the target process.
-.El
-.Sh SEE ALSO
-.Xr getpgrp 2
-.Sh STANDARDS
-The
-.Fn setpgid
-system call is expected to conform to
-.St -p1003.1-90 .
diff --git a/lib/libc_bsd/sys/setregid.2 b/lib/libc_bsd/sys/setregid.2
deleted file mode 100644
index 3348ba8..0000000
--- a/lib/libc_bsd/sys/setregid.2
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)setregid.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/setregid.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd April 16, 1994
-.Dt SETREGID 2
-.Os
-.Sh NAME
-.Nm setregid
-.Nd set real and effective group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn setregid "gid_t rgid" "gid_t egid"
-.Sh DESCRIPTION
-The real and effective group ID's of the current process
-are set to the arguments.
-If the real group ID is changed, the saved group ID is changed to the
-new value of the effective group ID.
-.Pp
-Unprivileged users may change the real group
-ID to the effective group ID and vice-versa; only the super-user may
-make other changes.
-.Pp
-Supplying a value of -1 for either the real or effective
-group ID forces the system to substitute the current
-ID in place of the -1 argument.
-.Pp
-The
-.Fn setregid
-system call was intended to allow swapping
-the real and effective group IDs
-in set-group-ID programs to temporarily relinquish the set-group-ID value.
-This system call did not work correctly,
-and its purpose is now better served by the use of the
-.Xr setegid 2
-system call.
-.Pp
-When setting the real and effective group IDs to the same value,
-the standard
-.Fn setgid
-system call is preferred.
-.Sh RETURN VALUES
-.Rv -std setregid
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EPERM
-The current process is not the super-user and a change
-other than changing the effective group-id to the real group-id
-was specified.
-.El
-.Sh SEE ALSO
-.Xr getgid 2 ,
-.Xr issetugid 2 ,
-.Xr setegid 2 ,
-.Xr setgid 2 ,
-.Xr setuid 2
-.Sh HISTORY
-The
-.Fn setregid
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/setresuid.2 b/lib/libc_bsd/sys/setresuid.2
deleted file mode 100644
index cf9f3b2..0000000
--- a/lib/libc_bsd/sys/setresuid.2
+++ /dev/null
@@ -1,94 +0,0 @@
-.\" Copyright (c) 2000
-.\"      Sheldon Hearn.  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.
-.\"
-.\" 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
-.\"
-.\" $FreeBSD: releng/10.2/lib/libc/sys/setresuid.2 282957 2015-05-15 10:54:40Z trasz $
-.\"
-.Dd February 7, 2015
-.Dt SETRESUID 2
-.Os
-.Sh NAME
-.Nm getresgid ,
-.Nm getresuid ,
-.Nm setresgid ,
-.Nm setresuid
-.Nd "get or set real, effective and saved user or group ID"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft int
-.Fn getresgid "gid_t *rgid" "gid_t *egid" "gid_t *sgid"
-.Ft int
-.Fn getresuid "uid_t *ruid" "uid_t *euid" "uid_t *suid"
-.Ft int
-.Fn setresgid "gid_t rgid" "gid_t egid" "gid_t sgid"
-.Ft int
-.Fn setresuid "uid_t ruid" "uid_t euid" "uid_t suid"
-.Sh DESCRIPTION
-The
-.Fn setresuid
-system call sets the real,
-effective and saved user IDs of the current process.
-The analogous
-.Fn setresgid
-sets the real, effective and saved group IDs.
-.Pp
-Privileged processes may set these IDs
-to arbitrary values.
-Unprivileged processes are restricted
-in that each of the new IDs must match one of the current IDs.
-.Pp
-Passing -1 as an argument causes the corresponding value
-to remain unchanged.
-.Pp
-The
-.Fn getresgid
-and
-.Fn getresuid
-calls retrieve the real, effective, and saved group and user IDs of
-the current process, respectively.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EPERM
-The calling process was not privileged
-and tried to change one or more IDs to a value
-which was not the current real ID, the current effective ID
-nor the current saved ID.
-.It Bq Er EFAULT
-An address passed to
-.Fn getresgid
-or
-.Fn getresuid
-was invalid.
-.El
-.Sh SEE ALSO
-.Xr getegid 2 ,
-.Xr geteuid 2 ,
-.Xr getgid 2 ,
-.Xr getuid 2 ,
-.Xr issetugid 2 ,
-.Xr setgid 2 ,
-.Xr setregid 2 ,
-.Xr setreuid 2 ,
-.Xr setuid 2
-.Sh HISTORY
-These functions first appeared in HP-UX.
diff --git a/lib/libc_bsd/sys/setreuid.2 b/lib/libc_bsd/sys/setreuid.2
deleted file mode 100644
index 71e3a3e..0000000
--- a/lib/libc_bsd/sys/setreuid.2
+++ /dev/null
@@ -1,90 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)setreuid.2	8.2 (Berkeley) 4/16/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/setreuid.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd February 8, 2001
-.Dt SETREUID 2
-.Os
-.Sh NAME
-.Nm setreuid
-.Nd set real and effective user ID's
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn setreuid "uid_t ruid" "uid_t euid"
-.Sh DESCRIPTION
-The real and effective user IDs of the
-current process are set according to the arguments.
-If
-.Fa ruid
-or
-.Fa euid
-is -1, the current uid is filled in by the system.
-Unprivileged users may change the real user
-ID to the effective user ID and vice-versa; only the super-user may
-make other changes.
-.Pp
-If the real user ID is changed (i.e.\&
-.Fa ruid
-is not -1) or the effective user ID is changed to something other than
-the real user ID, then the saved user ID will be set to the effective user ID.
-.Pp
-The
-.Fn setreuid
-system call has been used to swap the real and effective user IDs
-in set-user-ID programs to temporarily relinquish the set-user-ID value.
-This purpose is now better served by the use of the
-.Xr seteuid 2
-system call.
-.Pp
-When setting the real and effective user IDs to the same value,
-the standard
-.Fn setuid
-system call is preferred.
-.Sh RETURN VALUES
-.Rv -std setreuid
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EPERM
-The current process is not the super-user and a change
-other than changing the effective user-id to the real user-id
-was specified.
-.El
-.Sh SEE ALSO
-.Xr getuid 2 ,
-.Xr issetugid 2 ,
-.Xr seteuid 2 ,
-.Xr setuid 2
-.Sh HISTORY
-The
-.Fn setreuid
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/setsid.2 b/lib/libc_bsd/sys/setsid.2
deleted file mode 100644
index 1d53bc5..0000000
--- a/lib/libc_bsd/sys/setsid.2
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (c) 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)setsid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/setsid.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt SETSID 2
-.Os
-.Sh NAME
-.Nm setsid
-.Nd create session and set process group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn setsid void
-.Sh DESCRIPTION
-The
-.Fn setsid
-system call creates a new session.
-The calling process is the session leader of the new session, is the
-process group leader of a new process group and has no controlling
-terminal.
-The calling process is the only process in either the session or the
-process group.
-.Sh RETURN VALUES
-Upon successful completion, the
-.Fn setsid
-system call returns the value of the process group ID of the new process
-group, which is the same as the process ID of the calling process.
-If an error occurs,
-.Fn setsid
-returns -1 and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn setsid
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The calling process is already a process group leader, or the process
-group ID of a process other than the calling process matches the process
-ID of the calling process.
-.El
-.Sh SEE ALSO
-.Xr setpgid 2 ,
-.Xr tcgetpgrp 3 ,
-.Xr tcsetpgrp 3
-.Sh STANDARDS
-The
-.Fn setsid
-system call is expected to be compliant with the
-.St -p1003.1-90
-specification.
diff --git a/lib/libc_bsd/sys/setuid.2 b/lib/libc_bsd/sys/setuid.2
deleted file mode 100644
index d397dee..0000000
--- a/lib/libc_bsd/sys/setuid.2
+++ /dev/null
@@ -1,193 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)setuid.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/setuid.2 230155 2012-01-15 20:14:52Z eadler $
-.\"
-.Dd June 4, 1993
-.Dt SETUID 2
-.Os
-.Sh NAME
-.Nm setuid ,
-.Nm seteuid ,
-.Nm setgid ,
-.Nm setegid
-.Nd set user and group ID
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft int
-.Fn setuid "uid_t uid"
-.Ft int
-.Fn seteuid "uid_t euid"
-.Ft int
-.Fn setgid "gid_t gid"
-.Ft int
-.Fn setegid "gid_t egid"
-.Sh DESCRIPTION
-The
-.Fn setuid
-system call
-sets the real and effective
-user IDs and the saved set-user-ID of the current process
-to the specified value.
-.\" Comment out next block for !_POSIX_SAVED_IDS
-.\" The real user ID and the saved set-user-ID are changed only if the
-.\" effective user ID is that of the super user.
-.\" I.e.
-.\" .Fn setuid
-.\" system call is equal to
-.\" .Fn seteuid
-.\" system call if the effective user ID is not that of the super user.
-.\" End of block
-The
-.Fn setuid
-system call is permitted if the specified ID is equal to the real user ID
-.\" Comment out next line for !_POSIX_SAVED_IDS
-.\" or the saved set-user-ID
-.\" Next line is for Appendix B.4.2.2 case.
-or the effective user ID
-of the process, or if the effective user ID is that of the super user.
-.Pp
-The
-.Fn setgid
-system call
-sets the real and effective
-group IDs and the saved set-group-ID of the current process
-to the specified value.
-.\" Comment out next block for !_POSIX_SAVED_IDS
-.\" The real group ID and the saved set-group-ID are changed only if the
-.\" effective user ID is that of the super user.
-.\" I.e.
-.\" .Fn setgid
-.\" system call is equal to
-.\" .Fn setegid
-.\" system call if the effective user ID is not that of the super user.
-.\" End of block
-The
-.Fn setgid
-system call is permitted if the specified ID is equal to the real group ID
-.\" Comment out next line for !_POSIX_SAVED_IDS
-.\" or the saved set-group-ID
-.\" Next line is for Appendix B.4.2.2 case.
-or the effective group ID
-of the process, or if the effective user ID is that of the super user.
-.Pp
-The
-.Fn seteuid
-system call
-.Pq Fn setegid
-sets the effective user ID (group ID) of the
-current process.
-The effective user ID may be set to the value
-of the real user ID or the saved set-user-ID (see
-.Xr intro 2
-and
-.Xr execve 2 ) ;
-in this way, the effective user ID of a set-user-ID executable
-may be toggled by switching to the real user ID, then re-enabled
-by reverting to the set-user-ID value.
-Similarly, the effective group ID may be set to the value
-of the real group ID or the saved set-group-ID.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The system calls will fail if:
-.Bl -tag -width Er
-.It Bq Er EPERM
-The user is not the super user and the ID
-specified is not the real, effective ID, or saved ID.
-.El
-.Sh SEE ALSO
-.Xr getgid 2 ,
-.Xr getuid 2 ,
-.Xr issetugid 2 ,
-.Xr setregid 2 ,
-.Xr setreuid 2
-.Sh STANDARDS
-The
-.Fn setuid
-and
-.Fn setgid
-system calls are compliant with the
-.St -p1003.1-90
-specification with
-.Li _POSIX_SAVED_IDS
-.\" Uncomment next line for !_POSIX_SAVED_IDS
-not
-defined with the permitted extensions from Appendix B.4.2.2.
-The
-.Fn seteuid
-and
-.Fn setegid
-system calls are extensions based on the
-.Tn POSIX
-concept of
-.Li _POSIX_SAVED_IDS ,
-and have been proposed for a future revision of the standard.
-.Sh HISTORY
-The
-.Fn setuid
-and
-.Fn setgid
-functions appeared in
-.At v7 .
-.Sh SECURITY CONSIDERATIONS
-Read and write permissions to files are determined upon a call to
-.Xr open 2 .
-Once a file descriptor is open, dropping privilege does not affect
-the process's read/write permissions, even if the user ID specified
-has no read or write permissions to the file.
-These files normally remain open in any new process executed,
-resulting in a user being able to read or modify
-potentially sensitive data.
-.Pp
-To prevent these files from remaining open after an
-.Xr exec 3
-call, be sure to set the close-on-exec flag:
-.Bd -literal
-void
-pseudocode(void)
-{
-	int fd;
-	/* ... */
-
-	fd = open("/path/to/sensitive/data", O_RDWR);
-	if (fd == -1)
-		err(1, "open");
-
-	/*
-	 * Set close-on-exec flag; see fcntl(2) for more information.
-	 */
-	if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1)
-		err(1, "fcntl(F_SETFD)");
-	/* ... */
-	execve(path, argv, environ);
-}
-.Ed
diff --git a/lib/libc_bsd/sys/shm_open.2 b/lib/libc_bsd/sys/shm_open.2
deleted file mode 100644
index e43b442..0000000
--- a/lib/libc_bsd/sys/shm_open.2
+++ /dev/null
@@ -1,282 +0,0 @@
-.\"
-.\" Copyright 2000 Massachusetts Institute of Technology
-.\"
-.\" Permission to use, copy, modify, and distribute this software and
-.\" its documentation for any purpose and without fee is hereby
-.\" granted, provided that both the above copyright notice and this
-.\" permission notice appear in all copies, that both the above
-.\" copyright notice and this permission notice appear in all
-.\" supporting documentation, and that the name of M.I.T. not be used
-.\" in advertising or publicity pertaining to distribution of the
-.\" software without specific, written prior permission.  M.I.T. makes
-.\" no representations about the suitability of this software for any
-.\" purpose.  It is provided "as is" without express or implied
-.\" warranty.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
-.\" ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
-.\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-.\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
-.\" SHALL M.I.T. 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: releng/10.2/lib/libc/sys/shm_open.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.Dd March 20, 2007
-.Dt SHM_OPEN 2
-.Os
-.Sh NAME
-.Nm shm_open , shm_unlink
-.Nd "shared memory object operations"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/mman.h
-.In fcntl.h
-.Ft int
-.Fn shm_open "const char *path" "int flags" "mode_t mode"
-.Ft int
-.Fn shm_unlink "const char *path"
-.Sh DESCRIPTION
-The
-.Fn shm_open
-system call opens (or optionally creates) a
-.Tn POSIX
-shared memory object named
-.Fa path .
-The
-.Fa flags
-argument contains a subset of the flags used by
-.Xr open 2 .
-An access mode of either
-.Dv O_RDONLY
-or
-.Dv O_RDWR
-must be included in
-.Fa flags .
-The optional flags
-.Dv O_CREAT ,
-.Dv O_EXCL ,
-and
-.Dv O_TRUNC
-may also be specified.
-.Pp
-If
-.Dv O_CREAT
-is specified,
-then a new shared memory object named
-.Fa path
-will be created if it does not exist.
-In this case,
-the shared memory object is created with mode
-.Fa mode
-subject to the process' umask value.
-If both the
-.Dv O_CREAT
-and
-.Dv O_EXCL
-flags are specified and a shared memory object named
-.Fa path
-already exists,
-then
-.Fn shm_open
-will fail with
-.Er EEXIST .
-.Pp
-Newly created objects start off with a size of zero.
-If an existing shared memory object is opened with
-.Dv O_RDWR
-and the
-.Dv O_TRUNC
-flag is specified,
-then the shared memory object will be truncated to a size of zero.
-The size of the object can be adjusted via
-.Xr ftruncate 2
-and queried via
-.Xr fstat 2 .
-.Pp
-The new descriptor is set to close during
-.Xr execve 2
-system calls;
-see
-.Xr close 2
-and
-.Xr fcntl 2 .
-.Pp
-As a FreeBSD extension,
-the constant
-.Dv SHM_ANON
-may be used for the
-.Fa path
-argument to
-.Fn shm_open .
-In this case, an anonymous, unnamed shared memory object is created.
-Since the object has no name,
-it cannot be removed via a subsequent call to
-.Fn shm_unlink .
-Instead,
-the shared memory object will be garbage collected when the last reference to
-the shared memory object is removed.
-The shared memory object may be shared with other processes by sharing the
-file descriptor via
-.Xr fork 2
-or
-.Xr sendmsg 2 .
-Attempting to open an anonymous shared memory object with
-.Dv O_RDONLY
-will fail with
-.Er EINVAL .
-All other flags are ignored.
-.Pp
-The
-.Fn shm_unlink
-system call removes a shared memory object named
-.Fa path .
-.Sh RETURN VALUES
-If successful,
-.Fn shm_open
-returns a non-negative integer,
-and
-.Fn shm_unlink
-returns zero.
-Both functions return -1 on failure, and set
-.Va errno
-to indicate the error.
-.Sh COMPATIBILITY
-The
-.Fa path
-argument does not necessarily represent a pathname (although it does in
-most other implementations).
-Two processes opening the same
-.Fa path
-are guaranteed to access the same shared memory object if and only if
-.Fa path
-begins with a slash
-.Pq Ql \&/
-character.
-.Pp
-Only the
-.Dv O_RDONLY ,
-.Dv O_RDWR ,
-.Dv O_CREAT ,
-.Dv O_EXCL ,
-and
-.Dv O_TRUNC
-flags may be used in portable programs.
-.Pp
-The result of using
-.Xr open 2 ,
-.Xr read 2 ,
-or
-.Xr write 2
-on a shared memory object, or on the descriptor returned by
-.Fn shm_open ,
-is undefined.
-It is also undefined whether the shared memory object itself, or its
-contents, persist across reboots.
-.Pp
-In FreeBSD,
-.Xr read 2
-and
-.Xr write 2
-on a shared memory object will fail with
-.Er EOPNOTSUPP
-and neither shared memory objects nor their contents persist across reboots.
-.Sh ERRORS
-The following errors are defined for
-.Fn shm_open :
-.Bl -tag -width Er
-.It Bq Er EINVAL
-A flag other than
-.Dv O_RDONLY ,
-.Dv O_RDWR ,
-.Dv O_CREAT ,
-.Dv O_EXCL ,
-or
-.Dv O_TRUNC
-was included in
-.Fa flags .
-.It Bq Er EMFILE
-The process has already reached its limit for open file descriptors.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er EINVAL
-.Dv O_RDONLY
-was specified while creating an anonymous shared memory object via
-.Dv SHM_ANON .
-.It Bq Er EFAULT
-The
-.Fa path
-argument points outside the process' allocated address space.
-.It Bq Er ENAMETOOLONG
-The entire pathname exceeded 1023 characters.
-.It Bq Er EINVAL
-The
-.Fa path
-does not begin with a slash
-.Pq Ql \&/
-character.
-.It Bq Er ENOENT
-.Dv O_CREAT
-is specified and the named shared memory object does not exist.
-.It Bq Er EEXIST
-.Dv O_CREAT
-and
-.Dv O_EXCL
-are specified and the named shared memory object does exist.
-.It Bq Er EACCES
-The required permissions (for reading or reading and writing) are denied.
-.El
-.Pp
-The following errors are defined for
-.Fn shm_unlink :
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa path
-argument points outside the process' allocated address space.
-.It Bq Er ENAMETOOLONG
-The entire pathname exceeded 1023 characters.
-.It Bq Er ENOENT
-The named shared memory object does not exist.
-.It Bq Er EACCES
-The required permissions are denied.
-.Fn shm_unlink
-requires write permission to the shared memory object.
-.El
-.Sh SEE ALSO
-.Xr close 2 ,
-.Xr ftruncate 2 ,
-.Xr fstat 2 ,
-.Xr mmap 2 ,
-.Xr munmap 2
-.Sh STANDARDS
-The
-.Fn shm_open
-and
-.Fn shm_unlink
-functions are believed to conform to
-.St -p1003.1b-93 .
-.Sh HISTORY
-The
-.Fn shm_open
-and
-.Fn shm_unlink
-functions first appeared in
-.Fx 4.3 .
-The functions were reimplemented as system calls using shared memory objects
-directly rather than files in
-.Fx 7.0 .
-.Sh AUTHORS
-.An Garrett A. Wollman Aq wollman@FreeBSD.org
-(C library support and this manual page)
-.Pp
-.An Matthew Dillon Aq dillon@FreeBSD.org
-.Pq Dv MAP_NOSYNC
diff --git a/lib/libc_bsd/sys/shmat.2 b/lib/libc_bsd/sys/shmat.2
deleted file mode 100644
index 20a431d..0000000
--- a/lib/libc_bsd/sys/shmat.2
+++ /dev/null
@@ -1,122 +0,0 @@
-.\"
-.\" Copyright (c) 1995 David Hovemeyer <daveho@infocom.com>
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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: releng/10.2/lib/libc/sys/shmat.2 216508 2010-12-17 21:10:08Z brucec $
-.\"
-.Dd August 2, 1995
-.Dt SHMAT 2
-.Os
-.Sh NAME
-.Nm shmat ,
-.Nm shmdt
-.Nd attach or detach shared memory
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/shm.h
-.Ft void *
-.Fn shmat "int shmid" "const void *addr" "int flag"
-.Ft int
-.Fn shmdt "const void *addr"
-.Sh DESCRIPTION
-The
-.Fn shmat
-system call
-attaches the shared memory segment identified by
-.Fa shmid
-to the calling process's address space.
-The address where the segment
-is attached is determined as follows:
-.\"
-.\" These are cribbed almost exactly from Stevens, _Advanced Programming in
-.\" the UNIX Environment_.
-.\"
-.Bl -bullet
-.It
-If
-.Fa addr
-is 0, the segment is attached at an address selected by the
-kernel.
-.It
-If
-.Fa addr
-is nonzero and SHM_RND is not specified in
-.Fa flag ,
-the segment is attached the specified address.
-.It
-If
-.Fa addr
-is specified and SHM_RND is specified,
-.Fa addr
-is rounded down to the nearest multiple of SHMLBA.
-.El
-.Pp
-The
-.Fn shmdt
-system call
-detaches the shared memory segment at the address specified by
-.Fa addr
-from the calling process's address space.
-.Sh RETURN VALUES
-Upon success,
-.Fn shmat
-returns the address where the segment is attached; otherwise, -1
-is returned and
-.Va errno
-is set to indicate the error.
-.Pp
-.Rv -std shmdt
-.Sh ERRORS
-The
-.Fn shmat
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-No shared memory segment was found corresponding to
-.Fa shmid .
-.It Bq Er EINVAL
-The
-.Fa addr
-argument
-was not an acceptable address.
-.El
-.Pp
-The
-.Fn shmdt
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa addr
-argument
-does not point to a shared memory segment.
-.El
-.Sh "SEE ALSO"
-.Xr shmctl 2 ,
-.Xr shmget 2
diff --git a/lib/libc_bsd/sys/shmctl.2 b/lib/libc_bsd/sys/shmctl.2
deleted file mode 100644
index aad350b..0000000
--- a/lib/libc_bsd/sys/shmctl.2
+++ /dev/null
@@ -1,138 +0,0 @@
-.\"
-.\" Copyright (c) 1995 David Hovemeyer <daveho@infocom.com>
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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: releng/10.2/lib/libc/sys/shmctl.2 216508 2010-12-17 21:10:08Z brucec $
-.\"
-.Dd July 17, 1995
-.Dt SHMCTL 2
-.Os
-.Sh NAME
-.Nm shmctl
-.Nd shared memory control
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/shm.h
-.Ft int
-.Fn shmctl "int shmid" "int cmd" "struct shmid_ds *buf"
-.Sh DESCRIPTION
-Performs the action specified by
-.Fa cmd
-on the shared memory segment identified by
-.Fa shmid :
-.Bl -tag -width SHM_UNLOCKX
-.It Dv IPC_STAT
-Fetch the segment's
-.Fa "struct shmid_ds" ,
-storing it in the memory pointed to by
-.Fa buf .
-.\"
-.\" XXX need to make sure that this is correct for FreeBSD
-.\"
-.It Dv IPC_SET
-Changes the
-.Fa shm_perm.uid ,
-.Fa shm_perm.gid ,
-and
-.Fa shm_perm.mode
-members of the segment's
-.Fa "struct shmid_ds"
-to match those of the struct pointed to by
-.Fa buf .
-The calling process's effective uid must
-match either
-.Fa shm_perm.uid
-or
-.Fa shm_perm.cuid ,
-or it must have superuser privileges.
-.It Dv IPC_RMID
-Removes the segment from the system.
-The removal will not take
-effect until all processes having attached the segment have exited;
-however, once the IPC_RMID operation has taken place, no further
-processes will be allowed to attach the segment.
-For the operation
-to succeed, the calling process's effective uid must match
-.Fa shm_perm.uid
-or
-.Fa shm_perm.cuid ,
-or the process must have superuser privileges.
-.\" .It Dv SHM_LOCK
-.\" Locks the segment in memory.  The calling process must have
-.\" superuser privileges. Not implemented in FreeBSD.
-.\" .It Dv SHM_UNLOCK
-.\" Unlocks the segment from memory.  The calling process must
-.\" have superuser privileges.  Not implemented in FreeBSD.
-.El
-.Pp
-The
-.Vt shmid_ds
-structure is defined as follows:
-.\"
-.\" I fiddled with the spaces a bit to make it fit well when viewed
-.\" with nroff, but otherwise it is straight from sys/shm.h
-.\"
-.Bd -literal
-struct shmid_ds {
-    struct ipc_perm shm_perm;   /* operation permission structure */
-    size_t          shm_segsz;  /* size of segment in bytes */
-    pid_t           shm_lpid;   /* process ID of last shared memory op */
-    pid_t           shm_cpid;   /* process ID of creator */
-    int             shm_nattch; /* number of current attaches */
-    time_t          shm_atime;  /* time of last shmat() */
-    time_t          shm_dtime;  /* time of last shmdt() */
-    time_t          shm_ctime;  /* time of last change by shmctl() */
-};
-.Ed
-.Sh RETURN VALUES
-.Rv -std shmctl
-.Sh ERRORS
-The
-.Fn shmctl
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Invalid operation, or
-no shared memory segment was found corresponding to
-.Fa shmid .
-.\"
-.\" XXX I think the following is right: ipcperm() only returns EPERM
-.\"	when an attempt is made to modify (IPC_M) by a non-creator
-.\"	non-owner
-.It Bq Er EPERM
-The calling process's effective uid does not match the uid of
-the shared memory segment's owner or creator.
-.It Bq Er EACCES
-Permission denied due to mismatch between operation and mode of
-shared memory segment.
-.El
-.Sh "SEE ALSO"
-.Xr shmat 2 ,
-.Xr shmdt 2 ,
-.Xr shmget 2 ,
-.Xr ftok 3
diff --git a/lib/libc_bsd/sys/shmget.2 b/lib/libc_bsd/sys/shmget.2
deleted file mode 100644
index 0548ee3..0000000
--- a/lib/libc_bsd/sys/shmget.2
+++ /dev/null
@@ -1,146 +0,0 @@
-.\"
-.\" Copyright (c) 1995 David Hovemeyer <daveho@infocom.com>
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``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 DEVELOPERS 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: releng/10.2/lib/libc/sys/shmget.2 216515 2010-12-18 10:09:07Z brucec $
-.\"
-.Dd December 17, 2010
-.Dt SHMGET 2
-.Os
-.Sh NAME
-.Nm shmget
-.Nd obtain a shared memory identifier
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/ipc.h
-.In sys/shm.h
-.Ft int
-.Fn shmget "key_t key" "size_t size" "int flag"
-.Sh DESCRIPTION
-Based on the values of
-.Fa key
-and
-.Fa flag ,
-.Fn shmget
-returns the identifier of a newly created or previously existing shared
-memory segment.
-.\"
-.\" The following bit about keys and modes also applies to semaphores
-.\" and message queues.
-.\"
-The key
-is analogous to a filename: it provides a handle that names an
-IPC object.
-There are three ways to specify a key:
-.Bl -bullet
-.It
-IPC_PRIVATE may be specified, in which case a new IPC object
-will be created.
-.It
-An integer constant may be specified.
-If no IPC object corresponding
-to
-.Fa key
-is specified and the IPC_CREAT bit is set in
-.Fa flag ,
-a new one will be created.
-.It
-The
-.Xr ftok 3
-may be used to generate a key from a pathname.
-.El
-.Pp
-The mode of a newly created IPC object is determined by
-.Em OR Ns 'ing
-the following constants into the
-.Fa flag
-argument:
-.Bl -tag -width XSHM_WXX6XXX
-.It Dv S_IRUSR
-Read access for owner.
-.It Dv S_IWUSR
-Write access for owner.
-.It Dv S_IRGRP
-Read access for group.
-.It Dv S_IWGRP
-Write access for group.
-.It Dv S_IROTH
-Read access for other.
-.It Dv S_IWOTH
-Write access for other.
-.El
-.\"
-.\" XXX - we should also mention how uid, euid, and gid affect ownership
-.\"	  and use
-.\"
-.\" end section about keys and modes
-.\"
-.Pp
-When creating a new shared memory segment,
-.Fa size
-indicates the desired size of the new segment in bytes.
-The size
-of the segment may be rounded up to a multiple convenient to the
-kernel (i.e., the page size).
-.Sh RETURN VALUES
-Upon successful completion,
-.Fn shmget
-returns the positive integer identifier of a shared memory segment.
-Otherwise, -1 is returned and
-.Va errno
-set to indicate the error.
-.Sh ERRORS
-The
-.Fn shmget
-system call
-will fail if:
-.Bl -tag -width Er
-.\"
-.\" XXX What about ipcperm failing?
-.\"
-.It Bq Er EINVAL
-Size specified is greater than the size of the previously existing segment.
-Size specified is less than the system imposed minimum, or greater than
-the system imposed maximum.
-.It Bq Er ENOENT
-No shared memory segment was found matching
-.Fa key ,
-and IPC_CREAT was not specified.
-.It Bq Er ENOSPC
-The kernel was unable to allocate enough memory to
-satisfy the request.
-.It Bq Er EEXIST
-IPC_CREAT and IPC_EXCL were specified, and a shared memory segment
-corresponding to
-.Fa key
-already exists.
-.El
-.Sh "SEE ALSO"
-.Xr shmat 2 ,
-.Xr shmctl 2 ,
-.Xr shmdt 2 ,
-.Xr stat 2 ,
-.Xr ftok 3
diff --git a/lib/libc_bsd/sys/shutdown.2 b/lib/libc_bsd/sys/shutdown.2
deleted file mode 100644
index a6de89d..0000000
--- a/lib/libc_bsd/sys/shutdown.2
+++ /dev/null
@@ -1,191 +0,0 @@
-.\" Copyright (c) 2007 Bruce M. Simpson.
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)shutdown.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/shutdown.2 167292 2007-03-07 13:38:11Z bms $
-.\"
-.Dd March 5, 2007
-.Dt SHUTDOWN 2
-.Os
-.Sh NAME
-.Nm shutdown
-.Nd disable sends and/or receives on a socket
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn shutdown "int s" "int how"
-.Sh DESCRIPTION
-The
-.Fn shutdown
-system call disables sends or receives on a socket.
-The
-.Fa how
-argument specifies the type of shutdown.
-Possible values are:
-.Bl -tag -width ".Dv SHUT_RDWR"
-.It Dv SHUT_RD
-Further receives will be disallowed.
-.It Dv SHUT_WR
-Further sends will be disallowed.
-This may cause actions specific to the protocol family of the socket
-.Fa s
-to happen; see
-.Sx IMPLEMENTATION NOTES .
-.It Dv SHUT_RDWR
-Further sends and receives will be disallowed.
-Implies
-.Dv SHUT_WR .
-.El
-.Pp
-If the file descriptor
-.Fa s
-is associated with a
-.Dv SOCK_STREAM
-socket, all or part of the full-duplex connection will be shut down.
-.\"
-.Sh IMPLEMENTATION NOTES
-The following protocol specific actions apply to the use of
-.Dv SHUT_WR
-(and potentially also
-.Dv SHUT_RDWR ) ,
-based on the properties of the socket associated with the file descriptor
-.Fa s .
-.Bl -column ".Dv PF_INET6" ".Dv SOCK_STREAM" ".Dv IPPROTO_SCTP"
-.It Sy Domain Ta Sy Type Ta Sy Protocol Ta Sy Return value and action
-.It Dv PF_INET Ta Dv SOCK_DGRAM Ta Dv IPPROTO_SCTP Ta
-Return \-1.
-The global variable
-.Va errno
-will be set to
-.Er EOPNOTSUPP .
-.It Dv PF_INET Ta Dv SOCK_DGRAM Ta Dv IPPROTO_UDP Ta
-Return 0.
-ICMP messages will
-.Em not
-be generated.
-.It Dv PF_INET Ta Dv SOCK_STREAM Ta Dv IPPROTO_SCTP Ta
-Return 0.
-Send queued data and tear down association.
-.It Dv PF_INET Ta Dv SOCK_STREAM Ta Dv IPPROTO_TCP Ta
-Return 0.
-Send queued data, wait for ACK, then send FIN.
-.It Dv PF_INET6 Ta Dv SOCK_DGRAM Ta Dv IPPROTO_SCTP Ta
-Return \-1.
-The global variable
-.Va errno
-will be set to
-.Er EOPNOTSUPP .
-.It Dv PF_INET6 Ta Dv SOCK_DGRAM Ta Dv IPPROTO_UDP Ta
-Return 0.
-ICMP messages will
-.Em not
-be generated.
-.It Dv PF_INET6 Ta Dv SOCK_STREAM Ta Dv IPPROTO_SCTP Ta
-Return 0.
-Send queued data and tear down association.
-.It Dv PF_INET6 Ta Dv SOCK_STREAM Ta Dv IPPROTO_TCP Ta
-Return 0.
-Send queued data, wait for ACK, then send FIN.
-.El
-.\"
-.Sh RETURN VALUES
-.Rv -std shutdown
-.Sh ERRORS
-The
-.Fn shutdown
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa s
-argument is not a valid file descriptor.
-.It Bq Er EINVAL
-The
-.Fa how
-argument is invalid.
-.It Bq Er EOPNOTSUPP
-The socket associated with the file descriptor
-.Fa s
-does not support this operation.
-.It Bq Er ENOTCONN
-The
-.Fa s
-argument specifies a
-.Dv SOCK_STREAM
-socket which is not connected.
-.It Bq Er ENOTSOCK
-The
-.Fa s
-argument does not refer to a socket.
-.El
-.Sh SEE ALSO
-.Xr connect 2 ,
-.Xr socket 2 ,
-.Xr inet 4 ,
-.Xr inet6 4
-.Sh STANDARDS
-The
-.Fn shutdown
-system call is expected to comply with
-.St -p1003.1g-2000 ,
-when finalized.
-.Sh HISTORY
-The
-.Fn shutdown
-system call appeared in
-.Bx 4.2 .
-The
-.Dv SHUT_RD , SHUT_WR ,
-and
-.Dv SHUT_RDWR
-constants appeared in
-.St -p1003.1g-2000 .
-.Sh AUTHORS
-.An -nosplit
-This manual page was updated by
-.An Bruce M. Simpson Aq bms@FreeBSD.org
-to reflect how
-.Fn shutdown
-behaves with
-.Dv PF_INET
-and
-.Dv PF_INET6
-sockets.
-.Sh BUGS
-The ICMP
-.Dq Li "port unreachable"
-message should be generated in response to
-datagrams received on a local port to which
-.Fa s
-is bound
-after
-.Fn shutdown
-is called.
diff --git a/lib/libc_bsd/sys/sigaction.2 b/lib/libc_bsd/sys/sigaction.2
deleted file mode 100644
index 3d45536..0000000
--- a/lib/libc_bsd/sys/sigaction.2
+++ /dev/null
@@ -1,797 +0,0 @@
-.\" Copyright (c) 1980, 1990, 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.
-.\" 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.
-.\"
-.\"	From: @(#)sigaction.2	8.2 (Berkeley) 4/3/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sigaction.2 255296 2013-09-06 09:08:40Z jilles $
-.\"
-.Dd September 6, 2013
-.Dt SIGACTION 2
-.Os
-.Sh NAME
-.Nm sigaction
-.Nd software signal facilities
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Bd -literal
-struct  sigaction {
-        void    (*sa_handler)(int);
-        void    (*sa_sigaction)(int, siginfo_t *, void *);
-        int     sa_flags;               /* see signal options below */
-        sigset_t sa_mask;               /* signal mask to apply */
-};
-.Ed
-.Ft int
-.Fo sigaction
-.Fa "int sig"
-.Fa "const struct sigaction * restrict act"
-.Fa "struct sigaction * restrict oact"
-.Fc
-.Sh DESCRIPTION
-The system defines a set of signals that may be delivered to a process.
-Signal delivery resembles the occurrence of a hardware interrupt:
-the signal is normally blocked from further occurrence, the current thread
-context is saved, and a new one is built.
-A process may specify a
-.Em handler
-to which a signal is delivered, or specify that a signal is to be
-.Em ignored .
-A process may also specify that a default action is to be taken
-by the system when a signal occurs.
-A signal may also be
-.Em blocked
-for a thread,
-in which case it will not be delivered to that thread until it is
-.Em unblocked .
-The action to be taken on delivery is determined at the time
-of delivery.
-Normally, signal handlers execute on the current stack
-of the thread.
-This may be changed, on a per-handler basis,
-so that signals are taken on a special
-.Em "signal stack" .
-.Pp
-Signal routines normally execute with the signal that caused their
-invocation
-.Em blocked ,
-but other signals may yet occur.
-A global
-.Em "signal mask"
-defines the set of signals currently blocked from delivery
-to a thread.
-The signal mask for a thread is initialized
-from that of its parent (normally empty).
-It may be changed with a
-.Xr sigprocmask 2
-or
-.Xr pthread_sigmask 3
-call, or when a signal is delivered to the thread.
-.Pp
-When a signal
-condition arises for a process or thread, the signal is added to a set of
-signals pending for the process or thread.
-Whether the signal is directed at the process in general or at a specific
-thread depends on how it is generated.
-For signals directed at a specific thread,
-if the signal is not currently
-.Em blocked
-by the thread then it is delivered to the thread.
-For signals directed at the process,
-if the signal is not currently
-.Em blocked
-by all threads then it is delivered to one thread that does not have it blocked
-(the selection of which is unspecified).
-Signals may be delivered any time a thread enters the operating system
-(e.g., during a system call, page fault or trap, or clock interrupt).
-If multiple signals are ready to be delivered at the same time,
-any signals that could be caused by traps are delivered first.
-Additional signals may be processed at the same time, with each
-appearing to interrupt the handlers for the previous signals
-before their first instructions.
-The set of pending signals is returned by the
-.Xr sigpending 2
-system call.
-When a caught signal
-is delivered, the current state of the thread is saved,
-a new signal mask is calculated (as described below),
-and the signal handler is invoked.
-The call to the handler
-is arranged so that if the signal handling routine returns
-normally the thread will resume execution in the context
-from before the signal's delivery.
-If the thread wishes to resume in a different context, then it
-must arrange to restore the previous context itself.
-.Pp
-When a signal is delivered to a thread a new signal mask is
-installed for the duration of the process' signal handler
-(or until a
-.Xr sigprocmask 2
-system call is made).
-This mask is formed by taking the union of the current signal mask set,
-the signal to be delivered, and
-the signal mask associated with the handler to be invoked.
-.Pp
-The
-.Fn sigaction
-system call
-assigns an action for a signal specified by
-.Fa sig .
-If
-.Fa act
-is non-zero, it
-specifies an action
-.Dv ( SIG_DFL ,
-.Dv SIG_IGN ,
-or a handler routine) and mask
-to be used when delivering the specified signal.
-If
-.Fa oact
-is non-zero, the previous handling information for the signal
-is returned to the user.
-.Pp
-The above declaration of
-.Vt "struct sigaction"
-is not literal.
-It is provided only to list the accessible members.
-See
-.In sys/signal.h
-for the actual definition.
-In particular, the storage occupied by sa_handler and sa_sigaction overlaps,
-and an application can not use both simultaneously.
-.Pp
-Once a signal handler is installed, it normally remains installed
-until another
-.Fn sigaction
-system call is made, or an
-.Xr execve 2
-is performed.
-A signal-specific default action may be reset by
-setting
-.Va sa_handler
-to
-.Dv SIG_DFL .
-The defaults are process termination, possibly with core dump;
-no action; stopping the process; or continuing the process.
-See the signal list below for each signal's default action.
-If
-.Va sa_handler
-is
-.Dv SIG_DFL ,
-the default action for the signal is to discard the signal,
-and if a signal is pending,
-the pending signal is discarded even if the signal is masked.
-If
-.Va sa_handler
-is set to
-.Dv SIG_IGN
-current and pending instances
-of the signal are ignored and discarded.
-.Pp
-Options may be specified by setting
-.Va sa_flags .
-The meaning of the various bits is as follows:
-.Bl -tag -offset indent -width SA_RESETHANDXX
-.It Dv SA_NOCLDSTOP
-If this bit is set when installing a catching function
-for the
-.Dv SIGCHLD
-signal,
-the
-.Dv SIGCHLD
-signal will be generated only when a child process exits,
-not when a child process stops.
-.It Dv SA_NOCLDWAIT
-If this bit is set when calling
-.Fn sigaction
-for the
-.Dv SIGCHLD
-signal, the system will not create zombie processes when children of
-the calling process exit.
-If the calling process subsequently issues a
-.Xr wait 2
-(or equivalent), it blocks until all of the calling process's child
-processes terminate, and then returns a value of \-1 with
-.Va errno
-set to
-.Er ECHILD .
-The same effect of avoiding zombie creation can also be achieved by setting
-.Va sa_handler
-for
-.Dv SIGCHLD
-to
-.Dv SIG_IGN .
-.It Dv SA_ONSTACK
-If this bit is set, the system will deliver the signal to the process
-on a
-.Em "signal stack" ,
-specified by each thread with
-.Xr sigaltstack 2 .
-.It Dv SA_NODEFER
-If this bit is set, further occurrences of the delivered signal are
-not masked during the execution of the handler.
-.It Dv SA_RESETHAND
-If this bit is set, the handler is reset back to
-.Dv SIG_DFL
-at the moment the signal is delivered.
-.It Dv SA_RESTART
-See paragraph below.
-.It Dv SA_SIGINFO
-If this bit is set, the handler function is assumed to be pointed to by the
-.Va sa_sigaction
-member of
-.Vt "struct sigaction"
-and should match the prototype shown above or as below in
-.Sx EXAMPLES .
-This bit should not be set when assigning
-.Dv SIG_DFL
-or
-.Dv SIG_IGN .
-.El
-.Pp
-If a signal is caught during the system calls listed below,
-the call may be forced to terminate
-with the error
-.Er EINTR ,
-the call may return with a data transfer shorter than requested,
-or the call may be restarted.
-Restart of pending calls is requested
-by setting the
-.Dv SA_RESTART
-bit in
-.Va sa_flags .
-The affected system calls include
-.Xr open 2 ,
-.Xr read 2 ,
-.Xr write 2 ,
-.Xr sendto 2 ,
-.Xr recvfrom 2 ,
-.Xr sendmsg 2
-and
-.Xr recvmsg 2
-on a communications channel or a slow device (such as a terminal,
-but not a regular file)
-and during a
-.Xr wait 2
-or
-.Xr ioctl 2 .
-However, calls that have already committed are not restarted,
-but instead return a partial success (for example, a short read count).
-.Pp
-After a
-.Xr pthread_create 3
-the signal mask is inherited by the new thread and
-the set of pending signals and the signal stack for the new thread are empty.
-.Pp
-After a
-.Xr fork 2
-or
-.Xr vfork 2
-all signals, the signal mask, the signal stack,
-and the restart/interrupt flags are inherited by the child.
-.Pp
-The
-.Xr execve 2
-system call reinstates the default
-action for all signals which were caught and
-resets all signals to be caught on the user stack.
-Ignored signals remain ignored;
-the signal mask remains the same;
-signals that restart pending system calls continue to do so.
-.Pp
-The following is a list of all signals
-with names as in the include file
-.In signal.h :
-.Bl -column SIGVTALARMXX "create core imagexxx"
-.It Sy "NAME	Default Action	Description"
-.It Dv SIGHUP No "	terminate process" "	terminal line hangup"
-.It Dv SIGINT No "	terminate process" "	interrupt program"
-.It Dv SIGQUIT No "	create core image" "	quit program"
-.It Dv SIGILL No "	create core image" "	illegal instruction"
-.It Dv SIGTRAP No "	create core image" "	trace trap"
-.It Dv SIGABRT No "	create core image" Ta Xr abort 3
-call (formerly
-.Dv SIGIOT )
-.It Dv SIGEMT No "	create core image" "	emulate instruction executed"
-.It Dv SIGFPE No "	create core image" "	floating-point exception"
-.It Dv SIGKILL No "	terminate process" "	kill program"
-.It Dv SIGBUS No "	create core image" "	bus error"
-.It Dv SIGSEGV No "	create core image" "	segmentation violation"
-.It Dv SIGSYS No "	create core image" "	non-existent system call invoked"
-.It Dv SIGPIPE No "	terminate process" "	write on a pipe with no reader"
-.It Dv SIGALRM No "	terminate process" "	real-time timer expired"
-.It Dv SIGTERM No "	terminate process" "	software termination signal"
-.It Dv SIGURG No "	discard signal" "	urgent condition present on socket"
-.It Dv SIGSTOP No "	stop process" "	stop (cannot be caught or ignored)"
-.It Dv SIGTSTP No "	stop process" "	stop signal generated from keyboard"
-.It Dv SIGCONT No "	discard signal" "	continue after stop"
-.It Dv SIGCHLD No "	discard signal" "	child status has changed"
-.It Dv SIGTTIN No "	stop process" "	background read attempted from control terminal"
-.It Dv SIGTTOU No "	stop process" "	background write attempted to control terminal"
-.It Dv SIGIO No "	discard signal" Tn "	I/O"
-is possible on a descriptor (see
-.Xr fcntl 2 )
-.It Dv SIGXCPU No "	terminate process" "	cpu time limit exceeded (see"
-.Xr setrlimit 2 )
-.It Dv SIGXFSZ No "	terminate process" "	file size limit exceeded (see"
-.Xr setrlimit 2 )
-.It Dv SIGVTALRM No "	terminate process" "	virtual time alarm (see"
-.Xr setitimer 2 )
-.It Dv SIGPROF No "	terminate process" "	profiling timer alarm (see"
-.Xr setitimer 2 )
-.It Dv SIGWINCH No "	discard signal" "	Window size change"
-.It Dv SIGINFO No "	discard signal" "	status request from keyboard"
-.It Dv SIGUSR1 No "	terminate process" "	User defined signal 1"
-.It Dv SIGUSR2 No "	terminate process" "	User defined signal 2"
-.El
-.Sh NOTE
-The
-.Va sa_mask
-field specified in
-.Fa act
-is not allowed to block
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-Any attempt to do so will be silently ignored.
-.Pp
-The following functions are either reentrant or not interruptible
-by signals and are async-signal safe.
-Therefore applications may
-invoke them, without restriction, from signal-catching functions
-or from a child process after calling
-.Xr fork 2
-in a multi-threaded process:
-.Pp
-Base Interfaces:
-.Pp
-.Fn _Exit ,
-.Fn _exit ,
-.Fn accept ,
-.Fn access ,
-.Fn alarm ,
-.Fn bind ,
-.Fn cfgetispeed ,
-.Fn cfgetospeed ,
-.Fn cfsetispeed ,
-.Fn cfsetospeed ,
-.Fn chdir ,
-.Fn chmod ,
-.Fn chown ,
-.Fn close ,
-.Fn connect ,
-.Fn creat ,
-.Fn dup ,
-.Fn dup2 ,
-.Fn execl ,
-.Fn execle ,
-.Fn execv ,
-.Fn execve ,
-.Fn faccessat ,
-.Fn fchdir ,
-.Fn fchmod ,
-.Fn fchmodat ,
-.Fn fchown ,
-.Fn fchownat ,
-.Fn fcntl ,
-.Fn fork ,
-.Fn fstat ,
-.Fn fstatat ,
-.Fn fsync ,
-.Fn ftruncate ,
-.Fn getegid ,
-.Fn geteuid ,
-.Fn getgid ,
-.Fn getgroups ,
-.Fn getpeername ,
-.Fn getpgrp ,
-.Fn getpid ,
-.Fn getppid ,
-.Fn getsockname ,
-.Fn getsockopt ,
-.Fn getuid ,
-.Fn kill ,
-.Fn link ,
-.Fn linkat ,
-.Fn listen ,
-.Fn lseek ,
-.Fn lstat ,
-.Fn mkdir ,
-.Fn mkdirat ,
-.Fn mkfifo ,
-.Fn mkfifoat ,
-.Fn mknod ,
-.Fn mknodat ,
-.Fn open ,
-.Fn openat ,
-.Fn pause ,
-.Fn pipe ,
-.Fn poll ,
-.Fn pselect ,
-.Fn pthread_sigmask ,
-.Fn raise ,
-.Fn read ,
-.Fn readlink ,
-.Fn readlinkat ,
-.Fn recv ,
-.Fn recvfrom ,
-.Fn recvmsg ,
-.Fn rename ,
-.Fn renameat ,
-.Fn rmdir ,
-.Fn select ,
-.Fn send ,
-.Fn sendmsg ,
-.Fn sendto ,
-.Fn setgid ,
-.Fn setpgid ,
-.Fn setsid ,
-.Fn setsockopt ,
-.Fn setuid ,
-.Fn shutdown ,
-.Fn sigaction ,
-.Fn sigaddset ,
-.Fn sigdelset ,
-.Fn sigemptyset ,
-.Fn sigfillset ,
-.Fn sigismember ,
-.Fn signal ,
-.Fn sigpending ,
-.Fn sigprocmask ,
-.Fn sigsuspend ,
-.Fn sleep ,
-.Fn sockatmark ,
-.Fn socket ,
-.Fn socketpair ,
-.Fn stat ,
-.Fn symlink ,
-.Fn symlinkat ,
-.Fn tcdrain ,
-.Fn tcflow ,
-.Fn tcflush ,
-.Fn tcgetattr ,
-.Fn tcgetpgrp ,
-.Fn tcsendbreak ,
-.Fn tcsetattr ,
-.Fn tcsetpgrp ,
-.Fn time ,
-.Fn times ,
-.Fn umask ,
-.Fn uname ,
-.Fn unlink ,
-.Fn unlinkat ,
-.Fn utime ,
-.Fn wait ,
-.Fn waitpid ,
-.Fn write .
-.Pp
-X/Open Systems Interfaces:
-.Pp
-.Fn sigpause ,
-.Fn sigset ,
-.Fn utimes .
-.Pp
-Realtime Interfaces:
-.Pp
-.Fn aio_error ,
-.Fn clock_gettime ,
-.Fn timer_getoverrun ,
-.Fn aio_return ,
-.Fn fdatasync ,
-.Fn sigqueue ,
-.Fn timer_gettime ,
-.Fn aio_suspend ,
-.Fn sem_post ,
-.Fn timer_settime .
-.Pp
-Base Interfaces not specified as async-signal safe by
-.Tn POSIX :
-.Pp
-.Fn fpathconf ,
-.Fn pathconf ,
-.Fn sysconf .
-.Pp
-Base Interfaces not specified as async-signal safe by
-.Tn POSIX ,
-but planned to be:
-.Pp
-.Fn ffs ,
-.Fn htonl ,
-.Fn htons ,
-.Fn memccpy ,
-.Fn memchr ,
-.Fn memcmp ,
-.Fn memcpy ,
-.Fn memmove ,
-.Fn memset ,
-.Fn ntohl ,
-.Fn ntohs ,
-.Fn stpcpy ,
-.Fn stpncpy ,
-.Fn strcat ,
-.Fn strchr ,
-.Fn strcmp ,
-.Fn strcpy ,
-.Fn strcspn ,
-.Fn strlen ,
-.Fn strncat ,
-.Fn strncmp ,
-.Fn strncpy ,
-.Fn strnlen ,
-.Fn strpbrk ,
-.Fn strrchr ,
-.Fn strspn ,
-.Fn strstr ,
-.Fn strtok_r ,
-.Fn wcpcpy ,
-.Fn wcpncpy ,
-.Fn wcscat ,
-.Fn wcschr ,
-.Fn wcscmp ,
-.Fn wcscpy ,
-.Fn wcscspn ,
-.Fn wcslen ,
-.Fn wcsncat ,
-.Fn wcsncmp ,
-.Fn wcsncpy ,
-.Fn wcsnlen ,
-.Fn wcspbrk ,
-.Fn wcsrchr ,
-.Fn wcsspn ,
-.Fn wcsstr ,
-.Fn wcstok ,
-.Fn wmemchr ,
-.Fn wmemcmp ,
-.Fn wmemcpy ,
-.Fn wmemmove ,
-.Fn wmemset .
-.Pp
-Extension Interfaces:
-.Pp
-.Fn accept4 ,
-.Fn bindat ,
-.Fn closefrom ,
-.Fn connectat ,
-.Fn eaccess ,
-.Fn ffsl ,
-.Fn ffsll ,
-.Fn flock ,
-.Fn fls ,
-.Fn flsl ,
-.Fn flsll ,
-.Fn futimesat ,
-.Fn pipe2 ,
-.Fn strlcat .
-.Fn strlcpy ,
-.Fn strsep .
-.Pp
-In addition, reading or writing
-.Va errno
-is async-signal safe.
-.Pp
-All functions not in the above lists are considered to be unsafe
-with respect to signals.
-That is to say, the behaviour of such
-functions is undefined when they are called from a signal handler
-that interrupted an unsafe function.
-In general though, signal handlers should do little more than set a
-flag; most other actions are not safe.
-.Pp
-Also, it is good practice to make a copy of the global variable
-.Va errno
-and restore it before returning from the signal handler.
-This protects against the side effect of
-.Va errno
-being set by functions called from inside the signal handler.
-.Sh RETURN VALUES
-.Rv -std sigaction
-.Sh EXAMPLES
-There are three possible prototypes the handler may match:
-.Bl -tag -offset indent -width short
-.It Tn ANSI C :
-.Ft void
-.Fn handler int ;
-.It Traditional BSD style:
-.Ft void
-.Fn handler int "int code" "struct sigcontext *scp" ;
-.It Tn POSIX Dv SA_SIGINFO :
-.Ft void
-.Fn handler int "siginfo_t *info" "ucontext_t *uap" ;
-.El
-.Pp
-The handler function should match the
-.Dv SA_SIGINFO
-prototype if the
-.Dv SA_SIGINFO
-bit is set in
-.Va sa_flags .
-It then should be pointed to by the
-.Va sa_sigaction
-member of
-.Vt "struct sigaction" .
-Note that you should not assign
-.Dv SIG_DFL
-or
-.Dv SIG_IGN
-this way.
-.Pp
-If the
-.Dv SA_SIGINFO
-flag is not set, the handler function should match
-either the
-.Tn ANSI C
-or traditional
-.Bx
-prototype and be pointed to by
-the
-.Va sa_handler
-member of
-.Vt "struct sigaction" .
-In practice,
-.Fx
-always sends the three arguments of the latter and since the
-.Tn ANSI C
-prototype is a subset, both will work.
-The
-.Va sa_handler
-member declaration in
-.Fx
-include files is that of
-.Tn ANSI C
-(as required by
-.Tn POSIX ) ,
-so a function pointer of a
-.Bx Ns -style
-function needs to be casted to
-compile without warning.
-The traditional
-.Bx
-style is not portable and since its capabilities
-are a full subset of a
-.Dv SA_SIGINFO
-handler,
-its use is deprecated.
-.Pp
-The
-.Fa sig
-argument is the signal number, one of the
-.Dv SIG...
-values from
-.In signal.h .
-.Pp
-The
-.Fa code
-argument of the
-.Bx Ns -style
-handler and the
-.Va si_code
-member of the
-.Fa info
-argument to a
-.Dv SA_SIGINFO
-handler contain a numeric code explaining the
-cause of the signal, usually one of the
-.Dv SI_...
-values from
-.In sys/signal.h
-or codes specific to a signal, i.e., one of the
-.Dv FPE_...
-values for
-.Dv SIGFPE .
-.Pp
-The
-.Fa scp
-argument to a
-.Bx Ns -style
-handler points to an instance of
-.Vt "struct sigcontext" .
-.Pp
-The
-.Fa uap
-argument to a
-.Tn POSIX
-.Dv SA_SIGINFO
-handler points to an instance of
-ucontext_t.
-.Sh ERRORS
-The
-.Fn sigaction
-system call
-will fail and no new signal handler will be installed if one
-of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa sig
-argument
-is not a valid signal number.
-.It Bq Er EINVAL
-An attempt is made to ignore or supply a handler for
-.Dv SIGKILL
-or
-.Dv SIGSTOP .
-.El
-.Sh SEE ALSO
-.Xr kill 1 ,
-.Xr kill 2 ,
-.Xr ptrace 2 ,
-.Xr sigaltstack 2 ,
-.Xr sigpending 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr wait 2 ,
-.Xr fpsetmask 3 ,
-.Xr setjmp 3 ,
-.Xr siginfo 3 ,
-.Xr siginterrupt 3 ,
-.Xr sigsetops 3 ,
-.Xr ucontext 3 ,
-.Xr tty 4
-.Sh STANDARDS
-The
-.Fn sigaction
-system call is expected to conform to
-.St -p1003.1-90 .
-The
-.Dv SA_ONSTACK
-and
-.Dv SA_RESTART
-flags are Berkeley extensions,
-as are the signals,
-.Dv SIGTRAP ,
-.Dv SIGEMT ,
-.Dv SIGBUS ,
-.Dv SIGSYS ,
-.Dv SIGURG ,
-.Dv SIGIO ,
-.Dv SIGXCPU ,
-.Dv SIGXFSZ ,
-.Dv SIGVTALRM ,
-.Dv SIGPROF ,
-.Dv SIGWINCH ,
-and
-.Dv SIGINFO .
-Those signals are available on most
-.Bx Ns \-derived
-systems.
-The
-.Dv SA_NODEFER
-and
-.Dv SA_RESETHAND
-flags are intended for backwards compatibility with other operating
-systems.
-The
-.Dv SA_NOCLDSTOP ,
-and
-.Dv SA_NOCLDWAIT
-.\" and
-.\" SA_SIGINFO
-flags are featuring options commonly found in other operating systems.
-The flags are approved by
-.St -susv2 ,
-along with the option to avoid zombie creation by ignoring
-.Dv SIGCHLD .
diff --git a/lib/libc_bsd/sys/sigaction.c b/lib/libc_bsd/sys/sigaction.c
deleted file mode 100644
index 9b485f1..0000000
--- a/lib/libc_bsd/sys/sigaction.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/sigaction.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include <sys/types.h>
-#include <signal.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_sigaction, __sigaction);
-__weak_reference(sigaction, __libc_sigaction);
-
-#pragma weak sigaction
-int
-sigaction(int sig, const struct sigaction *act, struct sigaction *oact)
-{
-
-	return (((int (*)(int, const struct sigaction *, struct sigaction *))
-	    __libc_interposing[INTERPOS_sigaction])(sig, act, oact));
-}
diff --git a/lib/libc_bsd/sys/sigaltstack.2 b/lib/libc_bsd/sys/sigaltstack.2
deleted file mode 100644
index 016b677..0000000
--- a/lib/libc_bsd/sys/sigaltstack.2
+++ /dev/null
@@ -1,162 +0,0 @@
-.\" Copyright (c) 1983, 1991, 1992, 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.
-.\" 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.
-.\"
-.\"     @(#)sigaltstack.2	8.2 (Berkeley) 5/1/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sigaltstack.2 211966 2010-08-29 16:38:08Z kib $
-.\"
-.Dd May 6, 2010
-.Dt SIGALTSTACK 2
-.Os
-.Sh NAME
-.Nm sigaltstack
-.Nd set and/or get signal stack context
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Bd -literal
-typedef struct {
-        char    *ss_sp;
-        size_t  ss_size;
-        int     ss_flags;
-} stack_t;
-.Ed
-.Ft int
-.Fn sigaltstack "const stack_t * restrict ss" "stack_t * restrict oss"
-.Sh DESCRIPTION
-The
-.Fn sigaltstack
-system call
-allows defining an alternate stack on which signals
-are to be processed for the current thread.
-If
-.Fa ss
-is non-zero,
-it specifies a pointer to and the size of a
-.Em "signal stack"
-on which to deliver signals.
-When a signal's action indicates its handler
-should execute on the signal stack (specified with a
-.Xr sigaction 2
-system call), the system checks to see
-if the thread is currently executing on that stack.
-If the thread is not currently executing on the signal stack,
-the system arranges a switch to the signal stack for the
-duration of the signal handler's execution.
-.Pp
-An active stack cannot be modified.
-.Pp
-If
-.Dv SS_DISABLE
-is set in
-.Fa ss_flags ,
-.Fa ss_sp
-and
-.Fa ss_size
-are ignored and the signal stack will be disabled.
-A disabled stack will cause all signals to be
-taken on the regular user stack.
-If the stack is later re-enabled then all signals that were specified
-to be processed on an alternate stack will resume doing so.
-.Pp
-If
-.Fa oss
-is non-zero, the current signal stack state is returned.
-The
-.Fa ss_flags
-field will contain the value
-.Dv SS_ONSTACK
-if the thread is currently on a signal stack and
-.Dv SS_DISABLE
-if the signal stack is currently disabled.
-.Sh NOTES
-The value
-.Dv SIGSTKSZ
-is defined to be the number of bytes/chars that would be used to cover
-the usual case when allocating an alternate stack area.
-The following code fragment is typically used to allocate an alternate stack.
-.Bd -literal -offset indent
-if ((sigstk.ss_sp = malloc(SIGSTKSZ)) == NULL)
-	/* error return */
-sigstk.ss_size = SIGSTKSZ;
-sigstk.ss_flags = 0;
-if (sigaltstack(&sigstk, NULL) < 0)
-	perror("sigaltstack");
-.Ed
-An alternative approach is provided for programs with signal handlers
-that require a specific amount of stack space other than the default size.
-The value
-.Dv MINSIGSTKSZ
-is defined to be the number of bytes/chars that is required by
-the operating system to implement the alternate stack feature.
-In computing an alternate stack size,
-programs should add
-.Dv MINSIGSTKSZ
-to their stack requirements to allow for the operating system overhead.
-.Pp
-Signal stacks are automatically adjusted for the direction of stack
-growth and alignment requirements.
-Signal stacks may or may not be protected by the hardware and
-are not ``grown'' automatically as is done for the normal stack.
-If the stack overflows and this space is not protected
-unpredictable results may occur.
-.Sh RETURN VALUES
-.Rv -std sigaltstack
-.Sh ERRORS
-The
-.Fn sigaltstack
-system call
-will fail and the signal stack context will remain unchanged
-if one of the following occurs.
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Either
-.Fa ss
-or
-.Fa oss
-points to memory that is not a valid part of the process
-address space.
-.It Bq Er EPERM
-An attempt was made to modify an active stack.
-.It Bq Er EINVAL
-The
-.Fa ss_flags
-field was invalid.
-.It Bq Er ENOMEM
-Size of alternate stack area is less than or equal to
-.Dv MINSIGSTKSZ .
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr setjmp 3
-.Sh HISTORY
-The predecessor to
-.Fn sigaltstack ,
-the
-.Fn sigstack
-system call, appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/sigpending.2 b/lib/libc_bsd/sys/sigpending.2
deleted file mode 100644
index ad44cf9..0000000
--- a/lib/libc_bsd/sys/sigpending.2
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1993
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" Berkeley Software Design, Inc.
-.\"
-.\" 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.
-.\" 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.
-.\"
-.\"	@(#)sigpending.2	8.3 (Berkeley) 1/12/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sigpending.2 255296 2013-09-06 09:08:40Z jilles $
-.\"
-.Dd September 6, 2013
-.Dt SIGPENDING 2
-.Os
-.Sh NAME
-.Nm sigpending
-.Nd get pending signals
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigpending "sigset_t *set"
-.Sh DESCRIPTION
-The
-.Fn sigpending
-system call returns a mask of the signals pending for delivery
-to the calling thread or the calling process in the location indicated by
-.Fa set .
-Signals may be pending because they are currently masked,
-or transiently before delivery (although the latter case is not
-normally detectable).
-.Sh RETURN VALUES
-.Rv -std sigpending
-.Sh ERRORS
-The
-.Fn sigpending
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa set
-argument specified an invalid address.
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigsuspend 2 ,
-.Xr sigsetops 3
-.Sh STANDARDS
-The
-.Fn sigpending
-system call is expected to conform to
-.St -p1003.1-90 .
diff --git a/lib/libc_bsd/sys/sigprocmask.2 b/lib/libc_bsd/sys/sigprocmask.2
deleted file mode 100644
index ac11b4e..0000000
--- a/lib/libc_bsd/sys/sigprocmask.2
+++ /dev/null
@@ -1,131 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)sigprocmask.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sigprocmask.2 207757 2010-05-07 20:46:22Z jilles $
-.\"
-.Dd May 7, 2010
-.Dt SIGPROCMASK 2
-.Os
-.Sh NAME
-.Nm sigprocmask
-.Nd manipulate current signal mask
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fo sigprocmask
-.Fa "int how"
-.Fa "const sigset_t * restrict set"
-.Fa "sigset_t * restrict oset"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn sigprocmask
-system call examines and/or changes the current signal mask (those signals
-that are blocked from delivery).
-Signals are blocked if they are members of the current signal mask set.
-.Pp
-If
-.Fa set
-is not null, the action of
-.Fn sigprocmask
-depends on the value of the
-.Fa how
-argument.
-The signal mask is changed as a function of the specified
-.Fa set
-and the current mask.
-The function is specified by
-.Fa how
-using one of the following values from
-.In signal.h :
-.Bl -tag -width SIG_UNBLOCK
-.It Dv SIG_BLOCK
-The new mask is the union of the current mask and the specified
-.Fa set .
-.It Dv SIG_UNBLOCK
-The new mask is the intersection of the current mask
-and the complement of the specified
-.Fa set .
-.It Dv SIG_SETMASK
-The current mask is replaced by the specified
-.Fa set .
-.El
-.Pp
-If
-.Fa oset
-is not null, it is set to
-the previous value of the signal mask.
-When
-.Fa set
-is null,
-the value of
-.Fa how
-is insignificant and the mask remains unset
-providing a way to examine the signal mask without modification.
-.Pp
-The system
-quietly disallows
-.Dv SIGKILL
-or
-.Dv SIGSTOP
-to be blocked.
-.Pp
-In threaded applications,
-.Xr pthread_sigmask 3
-must be used instead of
-.Fn sigprocmask .
-.Sh RETURN VALUES
-.Rv -std sigprocmask
-.Sh ERRORS
-The
-.Fn sigprocmask
-system call will fail and the signal mask will be unchanged if one
-of the following occurs:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa how
-argument
-has a value other than those listed here.
-.El
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigpending 2 ,
-.Xr sigsuspend 2 ,
-.Xr fpsetmask 3 ,
-.Xr pthread_sigmask 3 ,
-.Xr sigsetops 3
-.Sh STANDARDS
-The
-.Fn sigprocmask
-system call is expected to
-conform to
-.St -p1003.1-90 .
diff --git a/lib/libc_bsd/sys/sigprocmask.c b/lib/libc_bsd/sys/sigprocmask.c
deleted file mode 100644
index 6b50502..0000000
--- a/lib/libc_bsd/sys/sigprocmask.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/sigprocmask.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include <sys/types.h>
-#include <signal.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_sigprocmask, __sigprocmask);
-__weak_reference(sigprocmask, __libc_sigprocmask);
-
-#pragma weak sigprocmask
-int
-sigprocmask(int how, const sigset_t *set, sigset_t *oset)
-{
-
-	return (((int (*)(int, const sigset_t *, sigset_t *))
-	    __libc_interposing[INTERPOS_sigprocmask])(how, set, oset));
-}
diff --git a/lib/libc_bsd/sys/sigqueue.2 b/lib/libc_bsd/sys/sigqueue.2
deleted file mode 100644
index f059dba..0000000
--- a/lib/libc_bsd/sys/sigqueue.2
+++ /dev/null
@@ -1,149 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/sys/sigqueue.2 246617 2013-02-10 13:20:23Z jilles $
-.\"
-.Dd March 10, 2012
-.Dt SIGQUEUE 2
-.Os
-.Sh NAME
-.Nm sigqueue
-.Nd "queue a signal to a process (REALTIME)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigqueue "pid_t pid" "int signo" "const union sigval value"
-.Sh DESCRIPTION
-The
-.Fn sigqueue
-system call causes the signal specified by
-.Fa signo
-to be sent with the value specified by
-.Fa value
-to the process specified by
-.Fa pid .
-If
-.Fa signo
-is zero (the null signal), error checking is performed but
-no signal is actually sent.
-The null signal can be used to check the
-validity of PID.
-.Pp
-The conditions required for a process to have permission to queue a
-signal to another process are the same as for the
-.Xr kill 2
-system call.
-The
-.Fn sigqueue
-system call queues a signal to a single process specified by the
-.Fa pid
-argument.
-.Pp
-The
-.Fn sigqueue
-system call returns immediately.
-If the resources were
-available to queue the signal, the signal will be queued and sent to
-the receiving process.
-.Pp
-If the value of
-.Fa pid
-causes
-.Fa signo
-to be generated for the sending process, and if
-.Fa signo
-is not blocked for the calling thread and if no other thread has
-.Fa signo
-unblocked or is waiting in a
-.Fn sigwait
-system call for
-.Fa signo ,
-either
-.Fa signo
-or at least the pending, unblocked signal will be delivered to the
-calling thread before
-.Fn sigqueue
-returns.
-Should any multiple pending signals in the range
-.Dv SIGRTMIN
-to
-.Dv SIGRTMAX
-be selected for delivery, it is the lowest numbered
-one.
-The selection order between realtime and non-realtime signals, or
-between multiple pending non-realtime signals, is unspecified.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn sigqueue
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-No resources are available to queue the signal.
-The process has already
-queued
-.Brq Dv SIGQUEUE_MAX
-signals that are still pending at the receiver(s),
-or a system-wide resource limit has been exceeded.
-.It Bq Er EINVAL
-The value of the
-.Fa signo
-argument is an invalid or unsupported signal number.
-.It Bq Er EPERM
-The process does not have the appropriate privilege to send the signal
-to the receiving process.
-.It Bq Er ESRCH
-The process
-.Fa pid
-does not exist.
-.El
-.Sh SEE ALSO
-.Xr kill 2 ,
-.Xr sigaction 2 ,
-.Xr sigpending 2 ,
-.Xr sigqueue 2 ,
-.Xr sigsuspend 2 ,
-.Xr sigtimedwait 2 ,
-.Xr sigwait 2 ,
-.Xr sigwaitinfo 2 ,
-.Xr pause 3 ,
-.Xr pthread_sigmask 3 ,
-.Xr siginfo 3
-.Sh STANDARDS
-The
-.Fn sigqueue
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-realtime signal queue first appeared in
-.Fx 7.0 .
diff --git a/lib/libc_bsd/sys/sigreturn.2 b/lib/libc_bsd/sys/sigreturn.2
deleted file mode 100644
index ea4a20b..0000000
--- a/lib/libc_bsd/sys/sigreturn.2
+++ /dev/null
@@ -1,89 +0,0 @@
-.\" Copyright (c) 1985, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)sigreturn.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sigreturn.2 255296 2013-09-06 09:08:40Z jilles $
-.\"
-.Dd September 6, 2013
-.Dt SIGRETURN 2
-.Os
-.Sh NAME
-.Nm sigreturn
-.Nd return from signal
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigreturn "const ucontext_t *scp"
-.Sh DESCRIPTION
-The
-.Fn sigreturn
-system call
-allows users to atomically unmask, switch stacks,
-and return from a signal context.
-The thread's signal mask and stack status are
-restored from the context structure pointed to by
-.Fa scp .
-The system call does not return;
-the users stack pointer, frame pointer, argument pointer,
-and processor status longword are restored from the context.
-Execution resumes at the specified pc.
-This system call is used by the trampoline code and
-.Xr longjmp 3
-when returning from a signal to the previously executing program.
-.Sh RETURN VALUES
-If successful, the system call does not return.
-Otherwise, a value of -1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn sigreturn
-system call
-will fail and the thread context will remain unchanged
-if one of the following occurs.
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The
-.Fa scp
-argument
-points to memory that is not a valid part of the process
-address space.
-.It Bq Er EINVAL
-The process status longword is invalid or would improperly
-raise the privilege level of the process.
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr setjmp 3 ,
-.Xr ucontext 3
-.Sh HISTORY
-The
-.Fn sigreturn
-system call appeared in
-.Bx 4.3 .
diff --git a/lib/libc_bsd/sys/sigstack.2 b/lib/libc_bsd/sys/sigstack.2
deleted file mode 100644
index 425a362..0000000
--- a/lib/libc_bsd/sys/sigstack.2
+++ /dev/null
@@ -1,50 +0,0 @@
-.\" Copyright (c) 1983, 1992, 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.
-.\" 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.
-.\"
-.\"     @(#)sigstack.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sigstack.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt SIGSTACK 2
-.Os
-.Sh NAME
-.Nm sigstack
-.Nd set and/or get signal stack context
-.Sh LIBRARY
-.Lb libc
-.Sh DESCRIPTION
-The
-.Fn sigstack
-function has been deprecated in favor of the interface described in
-.Xr sigaltstack 2 .
-.Sh SEE ALSO
-.Xr sigaltstack 2
-.Sh HISTORY
-The
-.Fn sigstack
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/sigsuspend.2 b/lib/libc_bsd/sys/sigsuspend.2
deleted file mode 100644
index ded4442..0000000
--- a/lib/libc_bsd/sys/sigsuspend.2
+++ /dev/null
@@ -1,85 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)sigsuspend.2	8.2 (Berkeley) 5/16/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sigsuspend.2 254388 2013-08-15 22:33:27Z jilles $
-.\"
-.Dd August 16, 2013
-.Dt SIGSUSPEND 2
-.Os
-.Sh NAME
-.Nm sigsuspend
-.Nd atomically release blocked signals and wait for interrupt
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigsuspend "const sigset_t *sigmask"
-.Sh DESCRIPTION
-The
-.Fn sigsuspend
-system call
-temporarily changes the blocked signal mask to the set to which
-.Fa sigmask
-points,
-and then waits for a signal to arrive;
-on return the previous set of masked signals is restored.
-The signal mask set
-is usually empty to indicate that all
-signals are to be unblocked for the duration of the call.
-.Pp
-In normal usage, a signal is blocked using
-.Xr sigprocmask 2
-to begin a critical section, variables modified on the occurrence
-of the signal are examined to determine that there is no work
-to be done, and the process pauses awaiting work by using
-.Fn sigsuspend
-with the previous mask returned by
-.Xr sigprocmask 2 .
-.Sh RETURN VALUES
-The
-.Fn sigsuspend
-system call
-always terminates by being interrupted, returning -1 with
-.Va errno
-set to
-.Er EINTR .
-.Sh SEE ALSO
-.Xr pselect 2 ,
-.Xr sigaction 2 ,
-.Xr sigpending 2 ,
-.Xr sigprocmask 2 ,
-.Xr sigtimedwait 2 ,
-.Xr sigwait 2 ,
-.Xr sigwaitinfo 2 ,
-.Xr sigsetops 3
-.Sh STANDARDS
-The
-.Fn sigsuspend
-system call is expected to conform to
-.St -p1003.1-90 .
diff --git a/lib/libc_bsd/sys/sigsuspend.c b/lib/libc_bsd/sys/sigsuspend.c
deleted file mode 100644
index dac6209..0000000
--- a/lib/libc_bsd/sys/sigsuspend.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/sigsuspend.c 287872 2015-09-16 20:59:41Z delphij $");
-
-#include <sys/types.h>
-#include <signal.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_sigsuspend, __sigsuspend);
-__weak_reference(sigsuspend, __libc_sigsuspend);
-
-#pragma weak sigsuspend
-int
-sigsuspend(const sigset_t *set)
-{
-
-	return (((int (*)(const sigset_t *))
-	    __libc_interposing[INTERPOS_sigsuspend])(set));
-}
diff --git a/lib/libc_bsd/sys/sigtimedwait.c b/lib/libc_bsd/sys/sigtimedwait.c
deleted file mode 100644
index d6679ae..0000000
--- a/lib/libc_bsd/sys/sigtimedwait.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/sigtimedwait.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <signal.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_sigtimedwait, __sigtimedwait);
-
-#pragma weak sigtimedwait
-int
-sigtimedwait(const sigset_t * __restrict set, siginfo_t * __restrict info,
-    const struct timespec * __restrict t)
-{
-
-	return (((int (*)(const sigset_t *, siginfo_t *,
-	    const struct timespec *))
-	    __libc_interposing[INTERPOS_sigtimedwait])(set, info, t));
-}
diff --git a/lib/libc_bsd/sys/sigwait.2 b/lib/libc_bsd/sys/sigwait.2
deleted file mode 100644
index 2c71a09..0000000
--- a/lib/libc_bsd/sys/sigwait.2
+++ /dev/null
@@ -1,124 +0,0 @@
-.\" Copyright (C) 2000 Jason Evans <jasone@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/sys/sigwait.2 255296 2013-09-06 09:08:40Z jilles $
-.\"
-.Dd September 6, 2013
-.Dt SIGWAIT 2
-.Os
-.Sh NAME
-.Nm sigwait
-.Nd select a set of signals
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fn sigwait "const sigset_t * restrict set" "int * restrict sig"
-.Sh DESCRIPTION
-The
-.Fn sigwait
-system call selects a set of signals, specified by
-.Fa set .
-If none of the selected signals are pending,
-.Fn sigwait
-waits until one or more of the selected signals has been generated.
-Then
-.Fn sigwait
-atomically clears one of the selected signals from the set of pending signals
-(for the process or for the current thread) and sets the location pointed to by
-.Fa sig
-to the signal number that was cleared.
-.Pp
-The signals specified by
-.Fa set
-should be blocked at the time of the call to
-.Fn sigwait .
-.Pp
-If more than one thread is using
-.Fn sigwait
-to wait for the same signal, no more than one of these threads will return from
-.Fn sigwait
-with the signal number.
-If more than a single thread is blocked in
-.Fn sigwait
-for a signal when that signal is generated for the process, it is unspecified
-which of the waiting threads returns from
-.Fn sigwait .
-If the signal is generated for a specific thread, as by
-.Fn pthread_kill ,
-only that thread will return.
-.Pp
-Should any of the multiple pending signals in the range
-.Dv SIGRTMIN
-to
-.Dv SIGRTMAX
-be
-selected, it will be the lowest numbered one.
-The selection order between realtime
-and non-realtime signals, or between multiple pending non-realtime signals,
-is unspecified.
-.Sh IMPLEMENTATION NOTES
-The
-.Fn sigwait
-function is implemented as a wrapper around the
-.Fn __sys_sigwait
-system call, which retries the call on
-.Er EINTR
-error.
-.Sh RETURN VALUES
-If successful,
-.Fn sigwait
-returns 0 and sets the location pointed to by
-.Fa sig
-to the cleared signal number.
-Otherwise, an error number is returned.
-.Sh ERRORS
-The
-.Fn sigwait
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa set
-argument
-specifies one or more invalid signal numbers.
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigpending 2 ,
-.Xr sigqueue 2 ,
-.Xr sigsuspend 2 ,
-.Xr sigtimedwait 2 ,
-.Xr sigwaitinfo 2 ,
-.Xr pause 3 ,
-.Xr pthread_sigmask 3
-.Sh STANDARDS
-The
-.Fn sigwait
-function conforms to
-.St -p1003.1-96 .
diff --git a/lib/libc_bsd/sys/sigwait.c b/lib/libc_bsd/sys/sigwait.c
deleted file mode 100644
index cf75706..0000000
--- a/lib/libc_bsd/sys/sigwait.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2010 davidxu@freebsd.org
- *
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/sigwait.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <errno.h>
-#include <signal.h>
-#include "libc_private.h"
-
-__weak_reference(__libc_sigwait, __sigwait);
-
-#pragma weak sigwait
-int
-sigwait(const sigset_t *set, int *sig)
-{
-
-	return (((int (*)(const sigset_t *, int *))
-	    __libc_interposing[INTERPOS_sigwait])(set, sig));
-}
-
-int
-__libc_sigwait(const sigset_t *set, int *sig)
-{
-	int ret;
-
-	/* POSIX does not allow EINTR to be returned */
-	do  {
-		ret = __sys_sigwait(set, sig);
-	} while (ret == EINTR);
-	return (ret);
-}
diff --git a/lib/libc_bsd/sys/sigwaitinfo.2 b/lib/libc_bsd/sys/sigwaitinfo.2
deleted file mode 100644
index da0b623..0000000
--- a/lib/libc_bsd/sys/sigwaitinfo.2
+++ /dev/null
@@ -1,206 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/sys/sigwaitinfo.2 241001 2012-09-27 17:48:04Z jilles $
-.\"
-.Dd September 27, 2012
-.Dt SIGTIMEDWAIT 2
-.Os
-.Sh NAME
-.Nm sigtimedwait , sigwaitinfo
-.Nd "wait for queued signals (REALTIME)"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In signal.h
-.Ft int
-.Fo sigtimedwait
-.Fa "const sigset_t *restrict set" "siginfo_t *restrict info"
-.Fa "const struct timespec *restrict timeout"
-.Fc
-.Ft int
-.Fn sigwaitinfo "const sigset_t * restrict set" "siginfo_t * restrict info"
-.Sh DESCRIPTION
-The
-.Fn sigtimedwait
-system call is equivalent to
-.Fn sigwaitinfo
-except that if none of the signals specified by
-.Fa set
-are pending,
-.Fn sigtimedwait
-waits for the time interval specified in the
-.Vt timespec
-structure referenced by
-.Fa timeout .
-If the
-.Vt timespec
-structure pointed to by
-.Fa timeout
-is zero-valued and if none of the signals specified by
-.Fa set
-are pending, then
-.Fn sigtimedwait
-returns immediately with an error.
-If
-.Fa timeout
-is the
-.Dv NULL
-pointer, the behavior is unspecified.
-.Dv CLOCK_MONOTONIC
-clock is used to measure the time interval specified by the
-.Fa timeout
-argument.
-.Pp
-The
-.Fn sigwaitinfo
-system call selects the pending signal from the set specified by
-.Fa set .
-Should any of multiple pending signals in the range
-.Dv SIGRTMIN
-to
-.Dv SIGRTMAX
-be selected, it shall be the lowest numbered one.
-The
-selection order between realtime and non-realtime signals, or
-between multiple pending non-realtime signals, is unspecified.
-If no signal in
-.Fa set
-is pending at the time of the call, the calling thread
-is suspended until one or more signals in
-.Fa set
-become pending or until it is interrupted by an unblocked, caught signal.
-.Pp
-The
-.Fn sigwaitinfo
-system call is equivalent to the
-.Fn sigwait
-system call if the
-.Fa info
-argument is
-.Dv NULL .
-If the
-.Fa info
-argument is
-.Pf non- Dv NULL ,
-the
-.Fn sigwaitinfo
-function is equivalent to
-.Fn sigwait ,
-except that the selected signal number shall be stored in the
-.Va si_signo
-member, and the cause of the signal shall be stored in the
-.Va si_code
-member.
-Besides this, the
-.Fn sigwaitinfo
-and
-.Fn sigtimedwait
-system calls may return
-.Er EINTR
-if interrupted by signal, which is not allowed for the
-.Fn sigwait
-function.
-.Pp
-If any value is queued to the selected signal, the first such queued
-value is dequeued and, if the info argument is
-.Pf non- Dv NULL ,
-the value is stored in the
-.Va si_value
-member of
-.Fa info .
-The system resource used to queue the signal
-is released and returned to the system for other use.
-If no value is queued,
-the content of the
-.Va si_value
-member is zero-valued.
-If no further signals are
-queued for the selected signal, the pending indication for that signal
-is reset.
-.Sh RETURN VALUES
-Upon successful completion (that is, one of the signals specified by
-.Fa set
-is pending or is generated)
-.Fn sigwaitinfo
-and
-.Fn sigtimedwait
-return the selected signal number.
-Otherwise, the functions return a value of \-1
-and set the global variable
-.Va errno
-to indicate the error.
-.Sh ERRORS
-The
-.Fn sigtimedwait
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-No signal specified by set was generated within the specified timeout period.
-.El
-.Pp
-The
-.Fn sigtimedwait
-and
-.Fn sigwaitinfo
-system calls fail if:
-.Bl -tag -width Er
-.It Bq Er EINTR
-The wait was interrupted by an unblocked, caught signal.
-.Pp
-.El
-The
-.Fn sigtimedwait
-system call may also fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa timeout
-argument specified a
-.Va tv_nsec
-value less than zero or greater than or equal
-to 1000 million.
-Kernel only checks for this error if no signal is pending in set and it
-is necessary to wait.
-.El
-.Sh SEE ALSO
-.Xr sigaction 2 ,
-.Xr sigpending 2 ,
-.Xr sigqueue 2 ,
-.Xr sigsuspend 2 ,
-.Xr sigwait 2 ,
-.Xr pause 3 ,
-.Xr pthread_sigmask 3 ,
-.Xr siginfo 3
-.Sh STANDARDS
-The
-.Fn sigtimedwait
-and
-.Fn sigwaitinfo
-system calls conform to
-.St -p1003.1-96 .
diff --git a/lib/libc_bsd/sys/sigwaitinfo.c b/lib/libc_bsd/sys/sigwaitinfo.c
deleted file mode 100644
index 13ad1a8..0000000
--- a/lib/libc_bsd/sys/sigwaitinfo.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/sigwaitinfo.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <signal.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_sigwaitinfo, __sigwaitinfo);
-
-#pragma weak sigwaitinfo
-int
-sigwaitinfo(const sigset_t * __restrict set, siginfo_t * __restrict info)
-{
-
-	return (((int (*)(const sigset_t *, siginfo_t *))
-	    __libc_interposing[INTERPOS_sigwaitinfo])(set, info));
-}
diff --git a/lib/libc_bsd/sys/socket.2 b/lib/libc_bsd/sys/socket.2
deleted file mode 100644
index cb7c71f..0000000
--- a/lib/libc_bsd/sys/socket.2
+++ /dev/null
@@ -1,314 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     From: @(#)socket.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/socket.2 248534 2013-03-19 20:58:17Z jilles $
-.\"
-.Dd March 19, 2013
-.Dt SOCKET 2
-.Os
-.Sh NAME
-.Nm socket
-.Nd create an endpoint for communication
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn socket "int domain" "int type" "int protocol"
-.Sh DESCRIPTION
-The
-.Fn socket
-system call
-creates an endpoint for communication and returns a descriptor.
-.Pp
-The
-.Fa domain
-argument specifies a communications domain within which
-communication will take place; this selects the protocol family
-which should be used.
-These families are defined in the include file
-.In sys/socket.h .
-The currently understood formats are:
-.Pp
-.Bd -literal -offset indent -compact
-PF_LOCAL	Host-internal protocols, formerly called PF_UNIX,
-PF_UNIX		Host-internal protocols, deprecated, use PF_LOCAL,
-PF_INET		Internet version 4 protocols,
-PF_PUP		PUP protocols, like BSP,
-PF_APPLETALK	AppleTalk protocols,
-PF_ROUTE	Internal Routing protocol,
-PF_LINK		Link layer interface,
-PF_IPX		Novell Internet Packet eXchange protocol,
-PF_RTIP		Help Identify RTIP packets,
-PF_PIP		Help Identify PIP packets,
-PF_ISDN		Integrated Services Digital Network,
-PF_KEY		Internal key-management function,
-PF_INET6	Internet version 6 protocols,
-PF_NATM		Native ATM access,
-PF_ATM		ATM,
-PF_NETGRAPH	Netgraph sockets
-.Ed
-.Pp
-The socket has the indicated
-.Fa type ,
-which specifies the semantics of communication.
-Currently
-defined types are:
-.Pp
-.Bd -literal -offset indent -compact
-SOCK_STREAM	Stream socket,
-SOCK_DGRAM	Datagram socket,
-SOCK_RAW	Raw-protocol interface,
-SOCK_RDM	Reliably-delivered packet,
-SOCK_SEQPACKET	Sequenced packet stream
-.Ed
-.Pp
-A
-.Dv SOCK_STREAM
-type provides sequenced, reliable,
-two-way connection based byte streams.
-An out-of-band data transmission mechanism may be supported.
-A
-.Dv SOCK_DGRAM
-socket supports
-datagrams (connectionless, unreliable messages of
-a fixed (typically small) maximum length).
-A
-.Dv SOCK_SEQPACKET
-socket may provide a sequenced, reliable,
-two-way connection-based data transmission path for datagrams
-of fixed maximum length; a consumer may be required to read
-an entire packet with each read system call.
-This facility is protocol specific, and presently unimplemented.
-.Dv SOCK_RAW
-sockets provide access to internal network protocols and interfaces.
-The types
-.Dv SOCK_RAW ,
-which is available only to the super-user, and
-.Dv SOCK_RDM ,
-which is planned,
-but not yet implemented, are not described here.
-.Pp
-Additionally, the following flags are allowed in the
-.Fa type
-argument:
-.Pp
-.Bd -literal -offset indent -compact
-SOCK_CLOEXEC	Set close-on-exec on the new descriptor,
-SOCK_NONBLOCK	Set non-blocking mode on the new socket
-.Ed
-.Pp
-The
-.Fa protocol
-argument
-specifies a particular protocol to be used with the socket.
-Normally only a single protocol exists to support a particular
-socket type within a given protocol family.
-However, it is possible
-that many protocols may exist, in which case a particular protocol
-must be specified in this manner.
-The protocol number to use is
-particular to the
-.Dq "communication domain"
-in which communication
-is to take place; see
-.Xr protocols 5 .
-.Pp
-The
-.Fa protocol
-argument may be set to zero (0) to request the default
-implementation of a socket type for the protocol, if any.
-.Pp
-Sockets of type
-.Dv SOCK_STREAM
-are full-duplex byte streams, similar
-to pipes.
-A stream socket must be in a
-.Em connected
-state before any data may be sent or received
-on it.
-A connection to another socket is created with a
-.Xr connect 2
-system call.
-Once connected, data may be transferred using
-.Xr read 2
-and
-.Xr write 2
-calls or some variant of the
-.Xr send 2
-and
-.Xr recv 2
-functions.
-(Some protocol families, such as the Internet family,
-support the notion of an
-.Dq implied connect ,
-which permits data to be sent piggybacked onto a connect operation by
-using the
-.Xr sendto 2
-system call.)
-When a session has been completed a
-.Xr close 2
-may be performed.
-Out-of-band data may also be transmitted as described in
-.Xr send 2
-and received as described in
-.Xr recv 2 .
-.Pp
-The communications protocols used to implement a
-.Dv SOCK_STREAM
-ensure that data
-is not lost or duplicated.
-If a piece of data for which the
-peer protocol has buffer space cannot be successfully transmitted
-within a reasonable length of time, then
-the connection is considered broken and calls
-will indicate an error with
--1 returns and with
-.Er ETIMEDOUT
-as the specific code
-in the global variable
-.Va errno .
-The protocols optionally keep sockets
-.Dq warm
-by forcing transmissions
-roughly every minute in the absence of other activity.
-An error is then indicated if no response can be
-elicited on an otherwise
-idle connection for an extended period (e.g.\& 5 minutes).
-By default, a
-.Dv SIGPIPE
-signal is raised if a process sends
-on a broken stream, but this behavior may be inhibited via
-.Xr setsockopt 2 .
-.Pp
-.Dv SOCK_SEQPACKET
-sockets employ the same system calls
-as
-.Dv SOCK_STREAM
-sockets.
-The only difference
-is that
-.Xr read 2
-calls will return only the amount of data requested,
-and any remaining in the arriving packet will be discarded.
-.Pp
-.Dv SOCK_DGRAM
-and
-.Dv SOCK_RAW
-sockets allow sending of datagrams to correspondents
-named in
-.Xr send 2
-calls.
-Datagrams are generally received with
-.Xr recvfrom 2 ,
-which returns the next datagram with its return address.
-.Pp
-An
-.Xr fcntl 2
-system call can be used to specify a process group to receive
-a
-.Dv SIGURG
-signal when the out-of-band data arrives.
-It may also enable non-blocking I/O
-and asynchronous notification of I/O events
-via
-.Dv SIGIO .
-.Pp
-The operation of sockets is controlled by socket level
-.Em options .
-These options are defined in the file
-.In sys/socket.h .
-The
-.Xr setsockopt 2
-and
-.Xr getsockopt 2
-system calls are used to set and get options, respectively.
-.Sh RETURN VALUES
-A -1 is returned if an error occurs, otherwise the return
-value is a descriptor referencing the socket.
-.Sh ERRORS
-The
-.Fn socket
-system call fails if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Permission to create a socket of the specified type and/or protocol
-is denied.
-.It Bq Er EAFNOSUPPORT
-The address family (domain) is not supported or the
-specified domain is not supported by this protocol family.
-.It Bq Er EMFILE
-The per-process descriptor table is full.
-.It Bq Er ENFILE
-The system file table is full.
-.It Bq Er ENOBUFS
-Insufficient buffer space is available.
-The socket cannot be created until sufficient resources are freed.
-.It Bq Er EPERM
-User has insufficient privileges to carry out the requested operation.
-.It Bq Er EPROTONOSUPPORT
-The protocol type or the specified protocol is not supported
-within this domain.
-.It Bq Er EPROTOTYPE
-The socket type is not supported by the protocol.
-.El
-.Sh SEE ALSO
-.Xr accept 2 ,
-.Xr bind 2 ,
-.Xr connect 2 ,
-.Xr getpeername 2 ,
-.Xr getsockname 2 ,
-.Xr getsockopt 2 ,
-.Xr ioctl 2 ,
-.Xr listen 2 ,
-.Xr read 2 ,
-.Xr recv 2 ,
-.Xr select 2 ,
-.Xr send 2 ,
-.Xr shutdown 2 ,
-.Xr socketpair 2 ,
-.Xr write 2 ,
-.Xr getprotoent 3 ,
-.Xr netgraph 4 ,
-.Xr protocols 5
-.Rs
-.%T "An Introductory 4.3 BSD Interprocess Communication Tutorial"
-.%B PS1
-.%N 7
-.Re
-.Rs
-.%T "BSD Interprocess Communication Tutorial"
-.%B PS1
-.%N 8
-.Re
-.Sh HISTORY
-The
-.Fn socket
-system call appeared in
-.Bx 4.2 .
diff --git a/lib/libc_bsd/sys/socketpair.2 b/lib/libc_bsd/sys/socketpair.2
deleted file mode 100644
index 3c58620..0000000
--- a/lib/libc_bsd/sys/socketpair.2
+++ /dev/null
@@ -1,100 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)socketpair.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/socketpair.2 283915 2015-06-02 15:09:33Z jhb $
-.\"
-.Dd May 4, 2015
-.Dt SOCKETPAIR 2
-.Os
-.Sh NAME
-.Nm socketpair
-.Nd create a pair of connected sockets
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/socket.h
-.Ft int
-.Fn socketpair "int domain" "int type" "int protocol" "int *sv"
-.Sh DESCRIPTION
-The
-.Fn socketpair
-system call creates an unnamed pair of connected sockets in
-the specified communications
-.Fa domain ,
-of the specified
-.Fa type ,
-and using the optionally specified
-.Fa protocol .
-The descriptors used in referencing the new sockets
-are returned in
-.Fa sv Ns [0]
-and
-.Fa sv Ns [1] .
-The two sockets are indistinguishable.
-.Pp
-The
-.Dv SOCK_CLOEXEC
-and
-.Dv SOCK_NONBLOCK
-flags in the
-.Fa type
-argument apply to both descriptors.
-.Sh RETURN VALUES
-.Rv -std socketpair
-.Sh ERRORS
-The call succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EMFILE
-Too many descriptors are in use by this process.
-.It Bq Er EAFNOSUPPORT
-The specified address family is not supported on this machine.
-.It Bq Er EPROTONOSUPPORT
-The specified protocol is not supported on this machine.
-.It Bq Er EOPNOTSUPP
-The specified protocol does not support creation of socket pairs.
-.It Bq Er EFAULT
-The address
-.Fa sv
-does not specify a valid part of the
-process address space.
-.El
-.Sh SEE ALSO
-.Xr pipe 2 ,
-.Xr read 2 ,
-.Xr socket 2 ,
-.Xr write 2
-.Sh HISTORY
-The
-.Fn socketpair
-system call appeared in
-.Bx 4.2 .
-.Sh BUGS
-This call is currently implemented only for the
-.Ux
-domain.
diff --git a/lib/libc_bsd/sys/stack_protector.c b/lib/libc_bsd/sys/stack_protector.c
deleted file mode 100644
index 379d8e8..0000000
--- a/lib/libc_bsd/sys/stack_protector.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* $NetBSD: stack_protector.c,v 1.4 2006/11/22 17:23:25 christos Exp $	*/
-/* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $	*/
-/*
- * Copyright (c) 2002 Hiroaki Etoh, Federico G. Schwindt, and Miodrag Vallat.
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/stack_protector.c 213785 2010-10-13 16:57:06Z rpaulo $");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <link.h>
-#include <signal.h>
-#include <string.h>
-#include <syslog.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-extern int __sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp,
-    void *newp, size_t newlen);
-
-long __stack_chk_guard[8] = {0, 0, 0, 0, 0, 0, 0, 0};
-static void __guard_setup(void) __attribute__((__constructor__, __used__));
-static void __fail(const char *);
-void __stack_chk_fail(void);
-void __chk_fail(void);
-
-/*LINTED used*/
-static void
-__guard_setup(void)
-{
-	int mib[2];
-	size_t len;
-	int error;
-
-	if (__stack_chk_guard[0] != 0)
-		return;
-	error = _elf_aux_info(AT_CANARY, __stack_chk_guard,
-	    sizeof(__stack_chk_guard));
-	if (error == 0 && __stack_chk_guard[0] != 0)
-		return;
-
-	mib[0] = CTL_KERN;
-	mib[1] = KERN_ARND;
-
-	len = sizeof(__stack_chk_guard);
-	if (__sysctl(mib, 2, __stack_chk_guard, &len, NULL, 0) == -1 ||
-	    len != sizeof(__stack_chk_guard)) {
-		/* If sysctl was unsuccessful, use the "terminator canary". */
-		((unsigned char *)(void *)__stack_chk_guard)[0] = 0;
-		((unsigned char *)(void *)__stack_chk_guard)[1] = 0;
-		((unsigned char *)(void *)__stack_chk_guard)[2] = '\n';
-		((unsigned char *)(void *)__stack_chk_guard)[3] = 255;
-	}
-}
-
-/*ARGSUSED*/
-static void
-__fail(const char *msg)
-{
-	struct sigaction sa;
-	sigset_t mask;
-
-	/* Immediately block all signal handlers from running code */
-	(void)sigfillset(&mask);
-	(void)sigdelset(&mask, SIGABRT);
-	(void)sigprocmask(SIG_BLOCK, &mask, NULL);
-
-	/* This may fail on a chroot jail... */
-	syslog(LOG_CRIT, "%s", msg);
-
-	(void)memset(&sa, 0, sizeof(sa));
-	(void)sigemptyset(&sa.sa_mask);
-	sa.sa_flags = 0;
-	sa.sa_handler = SIG_DFL;
-	(void)sigaction(SIGABRT, &sa, NULL);
-	(void)kill(getpid(), SIGABRT);
-	_exit(127);
-}
-
-void
-__stack_chk_fail(void)
-{
-	__fail("stack overflow detected; terminated");
-}
-
-void
-__chk_fail(void)
-{
-	__fail("buffer overflow detected; terminated");
-}
-
-#ifndef PIC
-__weak_reference(__stack_chk_fail, __stack_chk_fail_local);
-#endif
diff --git a/lib/libc_bsd/sys/stack_protector_compat.c b/lib/libc_bsd/sys/stack_protector_compat.c
deleted file mode 100644
index 7042382..0000000
--- a/lib/libc_bsd/sys/stack_protector_compat.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Written by Alexander Kabaev <kan@FreeBSD.org>
- * The file is in public domain.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/stack_protector_compat.c 211748 2010-08-24 12:58:54Z kib $");
-
-void __stack_chk_fail(void);
-
-#ifdef PIC
-void
-__stack_chk_fail_local_hidden(void)
-{
-
-	__stack_chk_fail();
-}
-
-__sym_compat(__stack_chk_fail_local, __stack_chk_fail_local_hidden, FBSD_1.0);
-#endif
diff --git a/lib/libc_bsd/sys/stat.2 b/lib/libc_bsd/sys/stat.2
deleted file mode 100644
index 644701c..0000000
--- a/lib/libc_bsd/sys/stat.2
+++ /dev/null
@@ -1,437 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)stat.2	8.4 (Berkeley) 5/1/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/stat.2 236441 2012-06-02 10:50:25Z ed $
-.\"
-.Dd June 2, 2012
-.Dt STAT 2
-.Os
-.Sh NAME
-.Nm stat ,
-.Nm lstat ,
-.Nm fstat ,
-.Nm fstatat
-.Nd get file status
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/stat.h
-.Ft int
-.Fn stat "const char *path" "struct stat *sb"
-.Ft int
-.Fn lstat "const char *path" "struct stat *sb"
-.Ft int
-.Fn fstat "int fd" "struct stat *sb"
-.Ft int
-.Fn fstatat "int fd" "const char *path" "struct stat *buf" "int flag"
-.Sh DESCRIPTION
-The
-.Fn stat
-system call obtains information about the file pointed to by
-.Fa path .
-Read, write or execute
-permission of the named file is not required, but all directories
-listed in the path name leading to the file must be searchable.
-.Pp
-The
-.Fn lstat
-system call is like
-.Fn stat
-except in the case where the named file is a symbolic link,
-in which case
-.Fn lstat
-returns information about the link,
-while
-.Fn stat
-returns information about the file the link references.
-.Pp
-The
-.Fn fstat
-system call obtains the same information about an open file
-known by the file descriptor
-.Fa fd .
-.Pp
-The
-.Fn fstatat
-system call is equivalent to
-.Fn stat
-and
-.Fn lstat
-except in the case where the
-.Fa path
-specifies a relative path.
-In this case the status is retrieved from a file relative to
-the directory associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-.Pp
-The values for the
-.Fa flag
-are constructed by a bitwise-inclusive OR of flags from the following list,
-defined in
-.In fcntl.h :
-.Bl -tag -width indent
-.It Dv AT_SYMLINK_NOFOLLOW
-If
-.Fa path
-names a symbolic link, the status of the symbolic link is returned.
-.El
-.Pp
-If
-.Fn fstatat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is
-identical to a call to
-.Fn stat
-or
-.Fn lstat
-respectively, depending on whether or not the
-.Dv AT_SYMLINK_NOFOLLOW
-bit is set in
-.Fa flag .
-.Pp
-The
-.Fa sb
-argument is a pointer to a
-.Vt stat
-structure
-as defined by
-.In sys/stat.h
-and into which information is placed concerning the file.
-.Pp
-The fields of
-.Vt "struct stat"
-related to the file system are as follows:
-.Bl -tag -width ".Va st_nlink"
-.It Va st_dev
-The numeric ID of the device containing the file.
-.It Va st_ino
-The file's inode number.
-.It Va st_nlink
-The number of hard links to the file.
-.El
-.Pp
-The
-.Va st_dev
-and
-.Va st_ino
-fields together identify the file uniquely within the system.
-.Pp
-The time-related fields of
-.Vt "struct stat"
-are as follows:
-.Bl -tag -width ".Va st_birthtim"
-.It Va st_atim
-Time when file data last accessed.
-Changed by the
-.Xr mknod 2 ,
-.Xr utimes 2 ,
-.Xr read 2
-and
-.Xr readv 2
-system calls.
-.It Va st_mtim
-Time when file data last modified.
-Changed by the
-.Xr mkdir 2 ,
-.Xr mkfifo 2 ,
-.Xr mknod 2 ,
-.Xr utimes 2 ,
-.Xr write 2
-and
-.Xr writev 2
-system calls.
-.It Va st_ctim
-Time when file status was last changed (inode data modification).
-Changed by the
-.Xr chflags 2 ,
-.Xr chmod 2 ,
-.Xr chown 2 ,
-.Xr creat 2 ,
-.Xr link 2 ,
-.Xr mkdir 2 ,
-.Xr mkfifo 2 ,
-.Xr mknod 2 ,
-.Xr rename 2 ,
-.Xr rmdir 2 ,
-.Xr symlink 2 ,
-.Xr truncate 2 ,
-.Xr unlink 2 ,
-.Xr utimes 2 ,
-.Xr write 2
-and
-.Xr writev 2
-system calls.
-.It Va st_birthtim
-Time when the inode was created.
-.El
-.Pp
-The following time-related macros are defined for compatibility:
-.Bd -literal
-#define	st_atime		st_atim.tv_sec
-#define	st_mtime		st_mtim.tv_sec
-#define	st_ctime		st_ctim.tv_sec
-#ifndef _POSIX_SOURCE
-#define	st_birthtime		st_birthtim.tv_sec
-#endif
-
-#ifndef _POSIX_SOURCE
-#define	st_atimespec		st_atim
-#define	st_mtimespec		st_mtim
-#define	st_ctimespec		st_ctim
-#define	st_birthtimespec	st_birthtim
-#endif
-.Ed
-.Pp
-The size-related fields of the
-.Vt "struct stat"
-are as follows:
-.Bl -tag -width ".Va st_blksize"
-.It Va st_size
-The file size in bytes.
-.It Va st_blksize
-The optimal I/O block size for the file.
-.It Va st_blocks
-The actual number of blocks allocated for the file in 512-byte units.
-As short symbolic links are stored in the inode, this number may
-be zero.
-.El
-.Pp
-The access-related fields of
-.Vt "struct stat"
-are as follows:
-.Bl -tag -width ".Va st_mode"
-.It Va st_uid
-The user ID of the file's owner.
-.It Va st_gid
-The group ID of the file.
-.It Va st_mode
-Status of the file (see below).
-.El
-.Pp
-The status information word
-.Fa st_mode
-has the following bits:
-.Bd -literal
-#define S_IFMT   0170000  /* type of file mask */
-#define S_IFIFO  0010000  /* named pipe (fifo) */
-#define S_IFCHR  0020000  /* character special */
-#define S_IFDIR  0040000  /* directory */
-#define S_IFBLK  0060000  /* block special */
-#define S_IFREG  0100000  /* regular */
-#define S_IFLNK  0120000  /* symbolic link */
-#define S_IFSOCK 0140000  /* socket */
-#define S_IFWHT  0160000  /* whiteout */
-#define S_ISUID  0004000  /* set user id on execution */
-#define S_ISGID  0002000  /* set group id on execution */
-#define S_ISVTX  0001000  /* save swapped text even after use */
-#define S_IRWXU  0000700  /* RWX mask for owner */
-#define S_IRUSR  0000400  /* read permission, owner */
-#define S_IWUSR  0000200  /* write permission, owner */
-#define S_IXUSR  0000100  /* execute/search permission, owner */
-#define S_IRWXG  0000070  /* RWX mask for group */
-#define S_IRGRP  0000040  /* read permission, group */
-#define S_IWGRP  0000020  /* write permission, group */
-#define S_IXGRP  0000010  /* execute/search permission, group */
-#define S_IRWXO  0000007  /* RWX mask for other */
-#define S_IROTH  0000004  /* read permission, other */
-#define S_IWOTH  0000002  /* write permission, other */
-#define S_IXOTH  0000001  /* execute/search permission, other */
-.Ed
-.Pp
-For a list of access modes, see
-.In sys/stat.h ,
-.Xr access 2
-and
-.Xr chmod 2 .
-The following macros are available to test whether a
-.Va st_mode
-value passed in the
-.Fa m
-argument corresponds to a file of the specified type:
-.Bl -tag -width ".Fn S_ISFIFO m"
-.It Fn S_ISBLK m
-Test for a block special file.
-.It Fn S_ISCHR m
-Test for a character special file.
-.It Fn S_ISDIR m
-Test for a directory.
-.It Fn S_ISFIFO m
-Test for a pipe or FIFO special file.
-.It Fn S_ISLNK m
-Test for a symbolic link.
-.It Fn S_ISREG m
-Test for a regular file.
-.It Fn S_ISSOCK m
-Test for a socket.
-.It Fn S_ISWHT m
-Test for a whiteout.
-.El
-.Pp
-The macros evaluate to a non-zero value if the test is true
-or to the value 0 if the test is false.
-.Sh RETURN VALUES
-.Rv -std
-.Sh COMPATIBILITY
-Previous versions of the system used different types for the
-.Va st_dev ,
-.Va st_uid ,
-.Va st_gid ,
-.Va st_rdev ,
-.Va st_size ,
-.Va st_blksize
-and
-.Va st_blocks
-fields.
-.Sh ERRORS
-The
-.Fn stat
-and
-.Fn lstat
-system calls will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EFAULT
-The
-.Fa sb
-or
-.Fa path
-argument
-points to an invalid address.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EOVERFLOW
-The file size in bytes cannot be
-represented correctly in the structure pointed to by
-.Fa sb .
-.El
-.Pp
-The
-.Fn fstat
-system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid open file descriptor.
-.It Bq Er EFAULT
-The
-.Fa sb
-argument
-points to an invalid address.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er EOVERFLOW
-The file size in bytes cannot be
-represented correctly in the structure pointed to by
-.Fa sb .
-.El
-.Pp
-In addition to the errors returned by the
-.Fn lstat ,
-the
-.Fn fstatat
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er EINVAL
-The value of the
-.Fa flag
-argument is not valid.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr access 2 ,
-.Xr chmod 2 ,
-.Xr chown 2 ,
-.Xr fhstat 2 ,
-.Xr statfs 2 ,
-.Xr utimes 2 ,
-.Xr sticky 7 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn stat
-and
-.Fn fstat
-system calls are expected to conform to
-.St -p1003.1-90 .
-The
-.Fn fstatat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn stat
-and
-.Fn fstat
-system calls appeared in
-.At v7 .
-The
-.Fn lstat
-system call appeared in
-.Bx 4.2 .
-The
-.Fn fstatat
-system call appeared in
-.Fx 8.0 .
-.Sh BUGS
-Applying
-.Fn fstat
-to a socket
-returns a zeroed buffer,
-except for the blocksize field,
-and a unique device and inode number.
diff --git a/lib/libc_bsd/sys/statfs.2 b/lib/libc_bsd/sys/statfs.2
deleted file mode 100644
index 3b11b20..0000000
--- a/lib/libc_bsd/sys/statfs.2
+++ /dev/null
@@ -1,235 +0,0 @@
-.\" Copyright (c) 1989, 1991, 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.
-.\" 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.
-.\"
-.\"	@(#)statfs.2	8.5 (Berkeley) 5/24/95
-.\" $FreeBSD: releng/10.2/lib/libc/sys/statfs.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd November 1, 2006
-.Dt STATFS 2
-.Os
-.Sh NAME
-.Nm statfs
-.Nd get file system statistics
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/param.h
-.In sys/mount.h
-.Ft int
-.Fn statfs "const char *path" "struct statfs *buf"
-.Ft int
-.Fn fstatfs "int fd" "struct statfs *buf"
-.Sh DESCRIPTION
-The
-.Fn statfs
-system call
-returns information about a mounted file system.
-The
-.Fa path
-argument
-is the path name of any file within the mounted file system.
-The
-.Fa buf
-argument
-is a pointer to a
-.Vt statfs
-structure defined as follows:
-.Bd -literal
-typedef struct fsid { int32_t val[2]; } fsid_t; /* file system id type */
-
-/*
- * filesystem statistics
- */
-
-#define	MFSNAMELEN	16		/* length of type name including null */
-#define	MNAMELEN	88		/* size of on/from name bufs */
-#define	STATFS_VERSION	0x20030518	/* current version number */
-
-struct statfs {
-uint32_t f_version;		/* structure version number */
-uint32_t f_type;		/* type of filesystem */
-uint64_t f_flags;		/* copy of mount exported flags */
-uint64_t f_bsize;		/* filesystem fragment size */
-uint64_t f_iosize;		/* optimal transfer block size */
-uint64_t f_blocks;		/* total data blocks in filesystem */
-uint64_t f_bfree;		/* free blocks in filesystem */
-int64_t	 f_bavail;		/* free blocks avail to non-superuser */
-uint64_t f_files;		/* total file nodes in filesystem */
-int64_t	 f_ffree;		/* free nodes avail to non-superuser */
-uint64_t f_syncwrites;		/* count of sync writes since mount */
-uint64_t f_asyncwrites;		/* count of async writes since mount */
-uint64_t f_syncreads;		/* count of sync reads since mount */
-uint64_t f_asyncreads;		/* count of async reads since mount */
-uint64_t f_spare[10];		/* unused spare */
-uint32_t f_namemax;		/* maximum filename length */
-uid_t	  f_owner;		/* user that mounted the filesystem */
-fsid_t	  f_fsid;		/* filesystem id */
-char	  f_charspare[80];	    /* spare string space */
-char	  f_fstypename[MFSNAMELEN]; /* filesystem type name */
-char	  f_mntfromname[MNAMELEN];  /* mounted filesystem */
-char	  f_mntonname[MNAMELEN];    /* directory on which mounted */
-};
-.Ed
-.Pp
-The flags that may be returned include:
-.Bl -tag -width MNT_SYNCHRONOUS
-.It Dv MNT_RDONLY
-The file system is mounted read-only;
-Even the super-user may not write on it.
-.It Dv MNT_NOEXEC
-Files may not be executed from the file system.
-.It Dv MNT_NOSUID
-Setuid and setgid bits on files are not honored when they are executed.
-.It Dv MNT_SYNCHRONOUS
-All I/O to the file system is done synchronously.
-.It Dv MNT_ASYNC
-No file system I/O is done synchronously.
-.It Dv MNT_SOFTDEP
-Soft updates being done (see
-.Xr ffs 7 ) .
-.It Dv MNT_GJOURNAL
-Journaling with gjournal is enabled (see
-.Xr gjournal 8 ) .
-.It Dv MNT_SUIDDIR
-Special handling of SUID bit on directories.
-.It Dv MNT_UNION
-Union with underlying file system.
-.It Dv MNT_NOSYMFOLLOW
-Symbolic links are not followed.
-.It Dv MNT_NOCLUSTERR
-Read clustering is disabled.
-.It Dv MNT_NOCLUSTERW
-Write clustering is disabled.
-.\".It Dv MNT_JAILDEVFS
-.\"XXX
-.It Dv MNT_MULTILABEL
-Mandatory Access Control (MAC) support for individual objects
-(see
-.Xr mac 4 ) .
-.It Dv MNT_ACLS
-Access Control List (ACL) support enabled.
-.It Dv MNT_LOCAL
-The file system resides locally.
-.It Dv MNT_QUOTA
-The file system has quotas enabled on it.
-.It Dv MNT_ROOTFS
-Identifies the root file system.
-.It Dv MNT_EXRDONLY
-The file system is exported read-only.
-.It Dv MNT_NOATIME
-Updating of file access times is disabled.
-.It Dv MNT_USER
-The file system has been mounted by a user.
-.\".It Dv MNT_IGNORE
-.\"XXX
-.It Dv MNT_EXPORTED
-The file system is exported for both reading and writing.
-.It Dv MNT_DEFEXPORTED
-The file system is exported for both reading and writing to any Internet host.
-.It Dv MNT_EXPORTANON
-The file system maps all remote accesses to the anonymous user.
-.It Dv MNT_EXKERB
-The file system is exported with Kerberos uid mapping.
-.It Dv MNT_EXPUBLIC
-The file system is exported publicly (WebNFS).
-.El
-.Pp
-Fields that are undefined for a particular file system are set to -1.
-The
-.Fn fstatfs
-system call
-returns the same information about an open file referenced by descriptor
-.Fa fd .
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn statfs
-system call
-fails if one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix of
-.Fa path
-is not a directory.
-.It Bq Er ENAMETOOLONG
-The length of a component of
-.Fa path
-exceeds 255 characters,
-or the length of
-.Fa path
-exceeds 1023 characters.
-.It Bq Er ENOENT
-The file referred to by
-.Fa path
-does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix of
-.Fa path .
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating
-.Fa path .
-.It Bq Er EFAULT
-The
-.Fa buf
-or
-.Fa path
-argument
-points to an invalid address.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Pp
-The
-.Fn fstatfs
-system call
-fails if one or more of the following are true:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid open file descriptor.
-.It Bq Er EFAULT
-The
-.Fa buf
-argument
-points to an invalid address.
-.It Bq Er EIO
-An
-.Tn I/O
-error occurred while reading from or writing to the file system.
-.El
-.Sh SEE ALSO
-.Xr fhstatfs 2
-.Sh HISTORY
-The
-.Fn statfs
-system call first appeared in
-.Bx 4.4 .
diff --git a/lib/libc_bsd/sys/swapcontext.c b/lib/libc_bsd/sys/swapcontext.c
deleted file mode 100644
index 427673d..0000000
--- a/lib/libc_bsd/sys/swapcontext.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel M. Eischen <deischen@freebsd.org>
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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. Neither the name of the author 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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/swapcontext.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/param.h>
-#include <sys/signal.h>
-#include <sys/ucontext.h>
-#include <errno.h>
-#include <stddef.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_swapcontext, __swapcontext);
-__sym_compat(swapcontext, __impl_swapcontext, FBSD_1.0);
-__weak_reference(swapcontext, __impl_swapcontext);
-__sym_default(swapcontext, swapcontext, FBSD_1.2);
-
-#pragma weak swapcontext
-int
-swapcontext(ucontext_t *oucp, const ucontext_t *ucp)
-{
-
-	return (((int (*)(ucontext_t *, const ucontext_t *))
-	    __libc_interposing[INTERPOS_swapcontext])(oucp, ucp));
-}
diff --git a/lib/libc_bsd/sys/swapon.2 b/lib/libc_bsd/sys/swapon.2
deleted file mode 100644
index 4524591..0000000
--- a/lib/libc_bsd/sys/swapon.2
+++ /dev/null
@@ -1,143 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)swapon.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/swapon.2 260198 2014-01-02 16:37:23Z pluknet $
-.\"
-.Dd October 4, 2013
-.Dt SWAPON 2
-.Os
-.Sh NAME
-.Nm swapon , swapoff
-.Nd control devices for interleaved paging/swapping
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn swapon "const char *special"
-.Ft int
-.Fn swapoff "const char *special"
-.Sh DESCRIPTION
-The
-.Fn swapon
-system call
-makes the block device
-.Fa special
-available to the system for
-allocation for paging and swapping.
-The names of potentially
-available devices are known to the system and defined at system
-configuration time.
-The size of the swap area on
-.Fa special
-is calculated at the time the device is first made available
-for swapping.
-.Pp
-The
-.Fn swapoff
-system call disables paging and swapping on the given device.
-All associated swap metadata are deallocated, and the device
-is made available for other purposes.
-.Sh RETURN VALUES
-If an error has occurred, a value of -1 is returned and
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-Both
-.Fn swapon
-and
-.Fn swapoff
-can fail if:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named device does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The caller is not the super-user.
-.It Bq Er EFAULT
-The
-.Fa special
-argument
-points outside the process's allocated address space.
-.El
-.Pp
-Additionally,
-.Fn swapon
-can fail for the following reasons:
-.Bl -tag -width Er
-.It Bq Er ENOTBLK
-The
-.Fa special
-argument
-is not a block device.
-.It Bq Er EBUSY
-The device specified by
-.Fa special
-has already
-been made available for swapping
-.It Bq Er ENXIO
-The major device number of
-.Fa special
-is out of range (this indicates no device driver exists
-for the associated hardware).
-.It Bq Er EIO
-An I/O error occurred while opening the swap device.
-.El
-.Pp
-Lastly,
-.Fn swapoff
-can fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The system is not currently swapping to
-.Fa special .
-.It Bq Er ENOMEM
-Not enough virtual memory is available to safely disable
-paging and swapping to the given device.
-.El
-.Sh SEE ALSO
-.Xr config 8 ,
-.Xr swapon 8 ,
-.Xr sysctl 8
-.Sh HISTORY
-The
-.Fn swapon
-system call appeared in
-.Bx 4.0 .
-The
-.Fn swapoff
-system call appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/sys/symlink.2 b/lib/libc_bsd/sys/symlink.2
deleted file mode 100644
index cd51ca5..0000000
--- a/lib/libc_bsd/sys/symlink.2
+++ /dev/null
@@ -1,206 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)symlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/symlink.2 178245 2008-04-16 13:03:12Z kib $
-.\"
-.Dd April 10, 2008
-.Dt SYMLINK 2
-.Os
-.Sh NAME
-.Nm symlink ,
-.Nm symlinkat
-.Nd make symbolic link to a file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn symlink "const char *name1" "const char *name2"
-.Ft int
-.Fn symlinkat "const char *name1" "int fd" "const char *name2"
-.Sh DESCRIPTION
-A symbolic link
-.Fa name2
-is created to
-.Fa name1
-.Fa ( name2
-is the name of the
-file created,
-.Fa name1
-is the string
-used in creating the symbolic link).
-Either name may be an arbitrary path name; the files need not
-be on the same file system.
-.Pp
-The
-.Fn symlinkat
-system call is equivalent to
-.Fn symlink
-except in the case where
-.Fa name2
-specifies a relative path.
-In this case the symbolic link is created relative to the directory
-associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-If
-.Fn symlinkat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is
-identical to a call to
-.Fn symlink .
-.Sh RETURN VALUES
-.Rv -std symlink
-.Sh ERRORS
-The symbolic link succeeds unless:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the
-.Fa name2
-path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of the
-.Fa name2
-pathname exceeded 255 characters,
-or the entire length of either path name exceeded 1023 characters.
-.It Bq Er ENOENT
-A component of the
-.Fa name2
-path prefix does not exist.
-.It Bq Er EACCES
-A component of the
-.Fa name2
-path prefix denies search permission, or write permission is denied on the
-parent directory of the file to be created.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the
-.Fa name2
-path name.
-.It Bq Er EEXIST
-The path name pointed at by the
-.Fa name2
-argument
-already exists.
-.It Bq Er EPERM
-The parent directory of the file named by
-.Fa name2
-has its immutable flag set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry for
-.Fa name2 ,
-or allocating the inode for
-.Fa name2 ,
-or writing out the link contents of
-.Fa name2 .
-.It Bq Er EROFS
-The file
-.Fa name2
-would reside on a read-only file system.
-.It Bq Er ENOSPC
-The directory in which the entry for the new symbolic link is being placed
-cannot be extended because there is no space left on the file
-system containing the directory.
-.It Bq Er ENOSPC
-The new symbolic link cannot be created because
-there is no space left on the file
-system that will contain the symbolic link.
-.It Bq Er ENOSPC
-There are no free inodes on the file system on which the
-symbolic link is being created.
-.It Bq Er EDQUOT
-The directory in which the entry for the new symbolic link
-is being placed cannot be extended because the
-user's quota of disk blocks on the file system
-containing the directory has been exhausted.
-.It Bq Er EDQUOT
-The new symbolic link cannot be created because the user's
-quota of disk blocks on the file system that will
-contain the symbolic link has been exhausted.
-.It Bq Er EDQUOT
-The user's quota of inodes on the file system on
-which the symbolic link is being created has been exhausted.
-.It Bq Er EIO
-An I/O error occurred while making the directory entry or allocating the inode.
-.It Bq Er EFAULT
-The
-.Fa name1
-or
-.Fa name2
-argument
-points outside the process's allocated address space.
-.El
-.Pp
-In addition to the errors returned by the
-.Fn symlink ,
-the
-.Fn symlinkat
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa name2
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er ENOTDIR
-The
-.Fa name2
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr ln 1 ,
-.Xr chflags 2 ,
-.Xr link 2 ,
-.Xr lstat 2 ,
-.Xr readlink 2 ,
-.Xr unlink 2 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn symlinkat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn symlink
-system call appeared in
-.Bx 4.2 .
-The
-.Fn symlinkat
-system call appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/sync.2 b/lib/libc_bsd/sys/sync.2
deleted file mode 100644
index 81b2080..0000000
--- a/lib/libc_bsd/sys/sync.2
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)sync.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sync.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt SYNC 2
-.Os
-.Sh NAME
-.Nm sync
-.Nd "schedule file system updates"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft void
-.Fn sync void
-.Sh DESCRIPTION
-The
-.Fn sync
-system call forces a write of dirty (modified) buffers
-in the block buffer cache out
-to disk.
-The kernel keeps this information in core to reduce
-the number of disk I/O transfers required by the system.
-As information in the cache is lost after a system crash, a
-.Fn sync
-system call is issued
-frequently
-by the user process
-.Xr syncer 4
-(about every 30 seconds).
-.Pp
-The
-.Xr fsync 2
-system call
-may be used to synchronize individual file descriptor
-attributes.
-.Sh SEE ALSO
-.Xr fsync 2 ,
-.Xr syncer 4 ,
-.Xr sync 8
-.Sh HISTORY
-The
-.Fn sync
-function appeared in
-.At v6 .
-.Sh BUGS
-The
-.Fn sync
-system call
-may return before the buffers are completely flushed.
diff --git a/lib/libc_bsd/sys/sysarch.2 b/lib/libc_bsd/sys/sysarch.2
deleted file mode 100644
index aed70be..0000000
--- a/lib/libc_bsd/sys/sysarch.2
+++ /dev/null
@@ -1,81 +0,0 @@
-.\"	$NetBSD: sysarch.2,v 1.6 1998/02/25 21:24:57 perry Exp $
-.\" $FreeBSD: releng/10.2/lib/libc/sys/sysarch.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.\" Copyright (c) 1980, 1991 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.
-.\" 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.
-.\"
-.\"     from: @(#)syscall.2	6.3 (Berkeley) 3/10/91
-.\"
-.Dd October 11, 1993
-.Dt SYSARCH 2
-.Os
-.Sh NAME
-.Nm sysarch
-.Nd architecture-dependent system call
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In machine/sysarch.h
-.Ft int
-.Fn sysarch "int number" "void *args"
-.Sh DESCRIPTION
-The
-.Fn sysarch
-system call
-performs the architecture-dependent function
-specified by
-.Fa number
-with the arguments specified by the
-.Fa args
-pointer.
-The
-.Fa args
-argument
-is a pointer to a structure defining the actual
-arguments of the function.
-Symbolic constants and argument structures
-for the architecture-dependent
-functions can be found in the header file
-.In machine/sysarch.h .
-.Pp
-The
-.Fn sysarch
-system call should never be called directly by
-user programs.
-Instead, they should access
-its functions using the architecture-dependent
-library.
-.Sh RETURN VALUES
-See the manual pages for specific architecture-dependent system calls
-for information about their return values.
-.Sh SEE ALSO
-.Xr i386_get_ioperm 2 ,
-.Xr i386_get_ldt 2 ,
-.Xr i386_vm86 2
-.Sh HISTORY
-This manual page was taken from
-.Nx .
diff --git a/lib/libc_bsd/sys/syscall.2 b/lib/libc_bsd/sys/syscall.2
deleted file mode 100644
index e364a36..0000000
--- a/lib/libc_bsd/sys/syscall.2
+++ /dev/null
@@ -1,77 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)syscall.2	8.1 (Berkeley) 6/16/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/syscall.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 16, 1993
-.Dt SYSCALL 2
-.Os
-.Sh NAME
-.Nm syscall ,
-.Nm __syscall
-.Nd indirect system call
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/syscall.h
-.In unistd.h
-.Ft int
-.Fn syscall "int number" ...
-.Ft off_t
-.Fn __syscall "quad_t number" ...
-.Sh DESCRIPTION
-The
-.Fn syscall
-function
-performs the system call whose assembly language
-interface has the specified
-.Fa number
-with the specified arguments.
-Symbolic constants for system calls can be found in the header file
-.In sys/syscall.h .
-The
-.Fn __syscall
-form should be used when one or more of the arguments is a
-64-bit argument to ensure that argument alignment is correct.
-This system call is useful for testing new system calls that
-do not have entries in the C library.
-.Sh RETURN VALUES
-The return values are defined by the system call being invoked.
-In general, a 0 return value indicates success.
-A -1 return value indicates an error,
-and an error code is stored in
-.Va errno .
-.Sh HISTORY
-The
-.Fn syscall
-function appeared in
-.Bx 4.0 .
-.Sh BUGS
-There is no way to simulate system calls that have multiple return values
-such as
-.Xr pipe 2 .
diff --git a/lib/libc_bsd/sys/timer_create.2 b/lib/libc_bsd/sys/timer_create.2
deleted file mode 100644
index 12dbe9e..0000000
--- a/lib/libc_bsd/sys/timer_create.2
+++ /dev/null
@@ -1,165 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/sys/timer_create.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.Dd January 12, 2009
-.Dt TIMER_CREATE 2
-.Os
-.Sh NAME
-.Nm timer_create
-.Nd "create a per-process timer (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In time.h
-.In signal.h
-.Ft int
-.Fo timer_create
-.Fa "clockid_t clockid" "struct sigevent *restrict evp"
-.Fa "timer_t *restrict timerid"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn timer_create
-system call creates a per-process timer using the specified clock,
-.Fa clock_id ,
-as the timing base.
-The
-.Fn timer_create
-system call returns, in the location referenced by
-.Fa timerid ,
-a timer ID of type
-.Vt timer_t
-used to identify the timer in timer requests.
-This timer ID is unique within the calling process until the timer is deleted.
-The particular clock,
-.Fa clock_id ,
-is defined in
-.In time.h .
-The timer whose ID is returned is in a disarmed state upon return from
-.Fn timer_create .
-.Pp
-The
-.Fa evp
-argument, if
-.Pf non- Dv NULL ,
-points to a
-.Vt sigevent
-structure.
-This structure,
-allocated by the application, defines the asynchronous notification to occur
-when the timer expires.
-If the
-.Fa evp
-argument is
-.Dv NULL ,
-the effect is as if the
-.Fa evp
-argument pointed to a
-.Vt sigevent
-structure with the
-.Va sigev_notify
-member having the value
-.Dv SIGEV_SIGNAL ,
-the
-.Va sigev_signo
-having a default signal number, and the
-.Va sigev_value
-member having
-the value of the timer ID.
-.Pp
-The implementations supports a
-.Fa clock_id
-of
-.Dv CLOCK_REALTIME
-or
-.Dv CLOCK_MONOTONIC .
-.Pp
-If
-.Fa evp->sigev_notify
-is
-.Dv SIGEV_THREAD
-and
-.Fa sev->sigev_notify_attributes
-is not
-.Dv NULL ,
-if the attribute pointed to by
-.Fa sev->sigev_notify_attributes
-has
-a thread stack address specified by a call to
-.Fn pthread_attr_setstack
-or
-.Fn pthread_attr_setstackaddr ,
-the results are unspecified if the signal is generated more than once.
-.Sh RETURN VALUES
-If the call succeeds,
-.Fn timer_create
-returns zero and updates the location referenced by
-.Fa timerid
-to a
-.Vt timer_t ,
-which can be passed to the per-process timer calls.
-If an error
-occurs, the system call returns a value of \-1
-and the global variable
-.Va errno
-is set to indicate the
-error.
-The value of
-.Fa timerid
-is undefined if an error occurs.
-.Sh ERRORS
-The
-.Fn timer_create
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EAGAIN
-The calling process has already created all of the timers it is allowed by
-this implementation.
-.It Bq Er EINVAL
-The specified clock ID is not supported.
-.It Bq Er EFAULT
-Any arguments point outside the allocated address space or there is a
-memory protection fault.
-.El
-.Sh SEE ALSO
-.Xr clock_getres 2 ,
-.Xr timer_delete 2 ,
-.Xr timer_getoverrun 2 ,
-.Xr siginfo 3
-.Sh STANDARDS
-The
-.Fn timer_create
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-per-process timer first appeared in
-.Fx 7.0 .
diff --git a/lib/libc_bsd/sys/timer_delete.2 b/lib/libc_bsd/sys/timer_delete.2
deleted file mode 100644
index f7262f6..0000000
--- a/lib/libc_bsd/sys/timer_delete.2
+++ /dev/null
@@ -1,80 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/sys/timer_delete.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.Dd September 11, 2000
-.Dt TIMER_DELETE 2
-.Os
-.Sh NAME
-.Nm timer_delete
-.Nd "delete a per-process timer (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In time.h
-.Ft int
-.Fn timer_delete "timer_t timerid"
-.Sh DESCRIPTION
-The
-.Fn timer_delete
-system call
-deletes the specified timer,
-.Fa timerid ,
-previously created by the
-.Xr timer_create 2
-system call.
-If the timer is armed when
-.Fn timer_delete
-is called, the behavior is as if the timer is automatically disarmed before
-removal.
-Pending signals for the deleted timer are cleared.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn timer_delete
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The timer ID specified by
-.Fa timerid
-is not a valid timer ID.
-.El
-.Sh SEE ALSO
-.Xr timer_create 2
-.Sh STANDARDS
-The
-.Fn timer_delete
-system call conforms to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-per-process timer first appeared in
-.Fx 7.0 .
diff --git a/lib/libc_bsd/sys/timer_settime.2 b/lib/libc_bsd/sys/timer_settime.2
deleted file mode 100644
index d90e33e..0000000
--- a/lib/libc_bsd/sys/timer_settime.2
+++ /dev/null
@@ -1,265 +0,0 @@
-.\" Copyright (c) 2005 David Xu <davidxu@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(s), this list of conditions and the following disclaimer as
-.\"    the first lines of this file unmodified other than the possible
-.\"    addition of one or more copyright notices.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice(s), this list of conditions and the following disclaimer in
-.\"    the documentation and/or other materials provided with the
-.\"    distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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: releng/10.2/lib/libc/sys/timer_settime.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.Dd September 11, 2000
-.Dt TIMER_SETTIME 2
-.Os
-.Sh NAME
-.Nm timer_getoverrun ,
-.Nm timer_gettime ,
-.Nm timer_settime
-.Nd "per-process timers (REALTIME)"
-.Sh LIBRARY
-.Lb librt
-.Sh SYNOPSIS
-.In time.h
-.Ft int
-.Fn timer_getoverrun "timer_t timerid"
-.Ft int
-.Fn timer_gettime "timer_t timerid" "struct itimerspec *value"
-.Ft int
-.Fo timer_settime
-.Fa "timer_t timerid" "int flags" "const struct itimerspec *restrict value"
-.Fa "struct itimerspec *restrict ovalue"
-.Fc
-.Sh DESCRIPTION
-The
-.Fn timer_gettime
-system call stores the amount of time until the specified timer,
-.Fa timerid ,
-expires and the reload value of the timer into the space pointed to by the
-.Fa value
-argument.
-The
-.Va it_value
-member of this structure contains the amount of time
-before the timer expires, or zero if the timer is disarmed.
-This value is
-returned as the interval until timer expiration, even if the timer was armed
-with absolute time.
-The
-.Va it_interval
-member of
-.Fa value
-contains the reload
-value last set by
-.Fn timer_settime .
-.Pp
-The
-.Fn timer_settime
-system call sets the time until the next expiration of the timer specified
-by
-.Fa timerid
-from the
-.Va it_value
-member of the
-.Fa value
-argument and arms the timer if the
-.Va it_value
-member of
-.Fa value
-is non-zero.
-If the specified timer was already
-armed when
-.Fn timer_settime
-is called, this call resets the time until next expiration to the value
-specified.
-If the
-.Va it_value
-member of
-.Fa value
-is zero, the timer is disarmed.
-If the timer is disarmed, then pending signal is removed.
-.Pp
-If the flag
-.Dv TIMER_ABSTIME
-is not set in the argument
-.Fa flags ,
-.Fn timer_settime
-behaves as if the time until next expiration is set to
-be equal to the interval specified by the
-.Va it_value
-member of
-.Fa value .
-That is,
-the timer expires in
-.Va it_value
-nanoseconds from when the call is made.
-If the flag
-.Dv TIMER_ABSTIME
-is set in the argument
-.Fa flags ,
-.Fn timer_settime
-behaves as if the time until next expiration is set to be equal to the
-difference between the absolute time specified by the it_value member of
-value and the current value of the clock associated with
-.Fa timerid .
-That is, the timer expires when the clock reaches the value specified by the
-.Va it_value
-member of
-.Fa value .
-If the specified time has already passed, the
-system call succeeds and the expiration notification is made.
-.Pp
-The reload value of the timer is set to the value specified by the
-.Va it_interval
-member of
-.Fa value .
-When a timer is armed with a non-zero
-.Va it_interval ,
-a periodic
-(or repetitive) timer is specified.
-.Pp
-Time values that are between two consecutive non-negative integer multiples of
-the resolution of the specified timer are rounded up to the larger multiple of
-the resolution.
-Quantization error will not cause the timer to expire earlier
-than the rounded time value.
-.Pp
-If the argument
-.Fa ovalue
-is not
-.Dv NULL ,
-the
-.Fn timer_settime
-system call stores, in the location referenced by
-.Fa ovalue ,
-a value representing
-the previous amount of time before the timer would have expired, or zero if the
-timer was disarmed, together with the previous timer reload value.
-Timers do not
-expire before their scheduled time.
-.Pp
-Only a single signal is queued to the process for a given timer at any point in
-time.
-When a timer for which a signal is still pending expires, no signal is
-queued, and a timer overrun will occur.
-When a timer expiration signal is
-accepted by a process, the
-.Fn timer_getoverrun
-system call returns the timer expiration overrun count for the specified timer.
-The overrun count returned contains the number of extra timer expirations that
-occurred between the time the signal was generated (queued) and when it was
-accepted, up to but not including an maximum of
-.Brq Dv DELAYTIMER_MAX .
-If the number of
-such extra expirations is greater than or equal to
-.Brq Dv DELAYTIMER_MAX ,
-then the overrun count is set to
-.Brq Dv DELAYTIMER_MAX .
-The value returned by
-.Fn timer_getoverrun
-applies to the most recent expiration signal acceptance for the timer.
-If no
-expiration signal has been delivered for the timer, the return value of
-.Fn timer_getoverrun
-is unspecified.
-.Sh RETURN VALUES
-If the
-.Fn timer_getoverrun
-system call succeeds, it returns the timer expiration overrun count as explained
-above.
-Otherwise the value \-1 is returned, and the global variable
-.Va errno
-is set to indicate the error.
-.Pp
-.Rv -std timer_gettime timer_settime
-.Sh ERRORS
-The
-.Fn timer_settime
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-A
-.Fa value
-structure specified a nanosecond value less than zero or greater than
-or equal to 1000 million, and the
-.Va it_value
-member of that structure did not
-specify zero seconds and nanoseconds.
-.El
-.Pp
-These system calls may fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa timerid
-argument does not correspond to an ID returned by
-.Fn timer_create
-but not yet deleted by
-.Fn timer_delete .
-.El
-.Pp
-The
-.Fn timer_settime
-system call may fail if:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Va it_interval
-member of
-.Fa value
-is not zero and the timer was created with
-notification by creation of a new thread
-.Va ( sigev_sigev_notify
-was
-.Dv SIGEV_THREAD )
-and a fixed stack address has been set in the thread attribute pointed to by
-.Va sigev_notify_attributes .
-.El
-.Pp
-The
-.Fn timer_gettime
-and
-.Fn timer_settime
-system calls
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-Any arguments point outside the allocated address space or there is a
-memory protection fault.
-.El
-.Sh SEE ALSO
-.Xr clock_getres 2 ,
-.Xr timer_create 2 ,
-.Xr siginfo 3
-.Sh STANDARDS
-The
-.Fn timer_getoverrun ,
-.Fn timer_gettime ,
-and
-.Fn timer_settime
-system calls conform to
-.St -p1003.1-2004 .
-.Sh HISTORY
-Support for
-.Tn POSIX
-per-process timer first appeared in
-.Fx 7.0 .
diff --git a/lib/libc_bsd/sys/truncate.2 b/lib/libc_bsd/sys/truncate.2
deleted file mode 100644
index e5c045a..0000000
--- a/lib/libc_bsd/sys/truncate.2
+++ /dev/null
@@ -1,165 +0,0 @@
-.\" Copyright (c) 1983, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)truncate.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/truncate.2 283916 2015-06-02 15:12:33Z jhb $
-.\"
-.Dd May 4, 2015
-.Dt TRUNCATE 2
-.Os
-.Sh NAME
-.Nm truncate ,
-.Nm ftruncate
-.Nd truncate or extend a file to a specified length
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn truncate "const char *path" "off_t length"
-.Ft int
-.Fn ftruncate "int fd" "off_t length"
-.Sh DESCRIPTION
-The
-.Fn truncate
-system call
-causes the file named by
-.Fa path
-or referenced by
-.Fa fd
-to be truncated or extended to
-.Fa length
-bytes in size.
-If the file
-was larger than this size, the extra data
-is lost.
-If the file was smaller than this size,
-it will be extended as if by writing bytes
-with the value zero.
-.Pp
-The
-.Fn ftruncate
-system call causes the file or shared memory object backing the file descriptor
-.Fa fd
-to be truncated or extended to
-.Fa length
-bytes in size.
-The file descriptor must be a valid file descriptor open for writing.
-The file position pointer associated with the file descriptor
-.Fa fd
-will not be modified.
-.Sh RETURN VALUES
-.Rv -std
-If the file to be modified is not a directory or
-a regular file, the
-.Fn truncate
-call has no effect and returns the value 0.
-.Sh ERRORS
-The
-.Fn truncate
-system call
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EACCES
-The named file is not writable by the user.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The named file has its immutable or append-only flag set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EISDIR
-The named file is a directory.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er ETXTBSY
-The file is a pure procedure (shared text) file that is being executed.
-.It Bq Er EFBIG
-The
-.Fa length
-argument was greater than the maximum file size.
-.It Bq Er EINVAL
-The
-.Fa length
-argument was less than 0.
-.It Bq Er EIO
-An I/O error occurred updating the inode.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.El
-.Pp
-The
-.Fn ftruncate
-system call
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid descriptor.
-.It Bq Er EINVAL
-The
-.Fa fd
-argument
-references a file descriptor that is not a regular file or shared memory object.
-.It Bq Er EINVAL
-The
-.Fa fd
-descriptor
-is not open for writing.
-.El
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr open 2 ,
-.Xr shm_open 2
-.Sh HISTORY
-The
-.Fn truncate
-and
-.Fn ftruncate
-system calls appeared in
-.Bx 4.2 .
-.Sh BUGS
-These calls should be generalized to allow ranges
-of bytes in a file to be discarded.
-.Pp
-Use of
-.Fn truncate
-to extend a file is not portable.
diff --git a/lib/libc_bsd/sys/truncate.c b/lib/libc_bsd/sys/truncate.c
deleted file mode 100644
index 751f2ad..0000000
--- a/lib/libc_bsd/sys/truncate.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1992, 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.
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)truncate.c	8.1 (Berkeley) 6/17/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/truncate.c 171219 2007-07-04 23:27:38Z peter $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-/*
- * This function provides 64-bit offset padding that
- * is not supplied by GCC 1.X but is supplied by GCC 2.X.
- */
-int
-truncate(path, length)
-	const char	*path;
-	off_t	length;
-{
-
-	if (__getosreldate() >= 700051)
-		return(__sys_truncate(path, length));
-	else
-		return(__sys_freebsd6_truncate(path, 0, length));
-}
diff --git a/lib/libc_bsd/sys/umask.2 b/lib/libc_bsd/sys/umask.2
deleted file mode 100644
index 5fcbf4f..0000000
--- a/lib/libc_bsd/sys/umask.2
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)umask.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/umask.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd June 4, 1993
-.Dt UMASK 2
-.Os
-.Sh NAME
-.Nm umask
-.Nd set file creation mode mask
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/stat.h
-.Ft mode_t
-.Fn umask "mode_t numask"
-.Sh DESCRIPTION
-The
-.Fn umask
-routine sets the process's file mode creation mask to
-.Fa numask
-and returns the previous value of the mask.
-The 9 low-order
-access permission
-bits of
-.Fa numask
-are used by system calls, including
-.Xr open 2 ,
-.Xr mkdir 2 ,
-and
-.Xr mkfifo 2 ,
-to turn off corresponding bits
-requested in file mode.
-(See
-.Xr chmod 2 ) .
-This clearing allows each user to restrict the default access
-to his files.
-.Pp
-The default mask value is S_IWGRP|S_IWOTH (022, write access for the
-owner only).
-Child processes inherit the mask of the calling process.
-.Sh RETURN VALUES
-The previous value of the file mode mask is returned by the call.
-.Sh ERRORS
-The
-.Fn umask
-system call is always successful.
-.Sh SEE ALSO
-.Xr chmod 2 ,
-.Xr mkfifo 2 ,
-.Xr mknod 2 ,
-.Xr open 2
-.Sh STANDARDS
-The
-.Fn umask
-system call is expected to conform to
-.St -p1003.1-90 .
-.Sh HISTORY
-The
-.Fn umask
-function appeared in
-.At v7 .
diff --git a/lib/libc_bsd/sys/undelete.2 b/lib/libc_bsd/sys/undelete.2
deleted file mode 100644
index d4843a7..0000000
--- a/lib/libc_bsd/sys/undelete.2
+++ /dev/null
@@ -1,105 +0,0 @@
-.\" Copyright (c) 1994
-.\"	Jan-Simon Pendry
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)undelete.2	8.4 (Berkeley) 10/18/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/undelete.2 165903 2007-01-09 00:28:16Z imp $
-.\"
-.Dd January 22, 2006
-.Dt UNDELETE 2
-.Os
-.Sh NAME
-.Nm undelete
-.Nd attempt to recover a deleted file
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn undelete "const char *path"
-.Sh DESCRIPTION
-The
-.Fn undelete
-system call attempts to recover the deleted file named by
-.Fa path .
-Currently, this works only when the named object
-is a whiteout in a union file system.
-The system call removes the whiteout causing
-any objects in a lower layer of the
-union stack to become visible once more.
-.Pp
-Eventually, the
-.Fn undelete
-functionality may be expanded to other file systems able to recover
-deleted files such as the log-structured file system.
-.Sh RETURN VALUES
-.Rv -std undelete
-.Sh ERRORS
-The
-.Fn undelete
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er EEXIST
-The path does not reference a whiteout.
-.It Bq Er ENOENT
-The named whiteout does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EACCES
-Write permission is denied on the directory containing the name
-to be undeleted.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The directory containing the name is marked sticky,
-and the containing directory is not owned by the effective user ID.
-.It Bq Er EINVAL
-The last component of the path is
-.Ql .. .
-.It Bq Er EIO
-An I/O error occurred while updating the directory entry.
-.It Bq Er EROFS
-The name resides on a read-only file system.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.El
-.Sh SEE ALSO
-.Xr unlink 2 ,
-.Xr mount_unionfs 8
-.Sh HISTORY
-The
-.Fn undelete
-system call first appeared in
-.Bx 4.4 Lite .
diff --git a/lib/libc_bsd/sys/unlink.2 b/lib/libc_bsd/sys/unlink.2
deleted file mode 100644
index 3c273d9..0000000
--- a/lib/libc_bsd/sys/unlink.2
+++ /dev/null
@@ -1,225 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)unlink.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/unlink.2 235140 2012-05-08 18:56:21Z gjb $
-.\"
-.Dd April 25, 2010
-.Dt UNLINK 2
-.Os
-.Sh NAME
-.Nm unlink ,
-.Nm unlinkat
-.Nd remove directory entry
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft int
-.Fn unlink "const char *path"
-.Ft int
-.Fn unlinkat "int fd" "const char *path" "int flag"
-.Sh DESCRIPTION
-The
-.Fn unlink
-system call
-removes the link named by
-.Fa path
-from its directory and decrements the link count of the
-file which was referenced by the link.
-If that decrement reduces the link count of the file
-to zero,
-and no process has the file open, then
-all resources associated with the file are reclaimed.
-If one or more process have the file open when the last link is removed,
-the link is removed, but the removal of the file is delayed until
-all references to it have been closed.
-The
-.Fa path
-argument
-may not be a directory.
-.Pp
-The
-.Fn unlinkat
-system call is equivalent to
-.Fn unlink
-or
-.Fn rmdir
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the directory entry to be removed is determined
-relative to the directory associated with the file descriptor
-.Fa fd
-instead of the current working directory.
-.Pp
-The values for
-.Fa flag
-are constructed by a bitwise-inclusive OR of flags from the following list,
-defined in
-.In fcntl.h :
-.Bl -tag -width indent
-.It Dv AT_REMOVEDIR
-Remove the directory entry specified by
-.Fa fd
-and
-.Fa path
-as a directory, not a normal file.
-.El
-.Pp
-If
-.Fn unlinkat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior is
-identical to a call to
-.Fa unlink
-or
-.Fa rmdir
-respectively, depending on whether or not the
-.Dv AT_REMOVEDIR
-bit is set in flag.
-.Sh RETURN VALUES
-.Rv -std unlink
-.Sh ERRORS
-The
-.Fn unlink
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EISDIR
-The named file is a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded 255 characters,
-or an entire path name exceeded 1023 characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EACCES
-Write permission is denied on the directory containing the link
-to be removed.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EPERM
-The named file is a directory.
-.It Bq Er EPERM
-The named file has its immutable, undeletable or append-only flag set, see the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EPERM
-The parent directory of the named file has its immutable or append-only flag
-set.
-.It Bq Er EPERM
-The directory containing the file is marked sticky,
-and neither the containing directory nor the file to be removed
-are owned by the effective user ID.
-.It Bq Er EIO
-An I/O error occurred while deleting the directory entry
-or deallocating the inode.
-.It Bq Er EROFS
-The named file resides on a read-only file system.
-.It Bq Er EFAULT
-The
-.Fa path
-argument
-points outside the process's allocated address space.
-.El
-.Pp
-In addition to the errors returned by the
-.Fn unlink ,
-the
-.Fn unlinkat
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er ENOTEMPTY
-The
-.Fa flag
-parameter has the
-.Dv AT_REMOVEDIR
-bit set and the
-.Fa path
-argument names a directory that is not an empty directory,
-or there are hard links to the directory other than dot or
-a single entry in dot-dot.
-.It Bq Er ENOTDIR
-The
-.Fa flag
-parameter has the
-.Dv AT_REMOVEDIR
-bit set and
-.Fa path
-does not name a directory.
-.It Bq Er EINVAL
-The value of the
-.Fa flag
-argument is not valid.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr close 2 ,
-.Xr link 2 ,
-.Xr rmdir 2 ,
-.Xr symlink 7
-.Sh STANDARDS
-The
-.Fn unlinkat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn unlink
-function appeared in
-.At v6 .
-The
-.Fn unlinkat
-system call appeared in
-.Fx 8.0 .
-.Pp
-The
-.Fn unlink
-system call traditionally allows the super-user to unlink directories which
-can damage the file system integrity.
-This implementation no longer permits it.
diff --git a/lib/libc_bsd/sys/utimes.2 b/lib/libc_bsd/sys/utimes.2
deleted file mode 100644
index ced531a..0000000
--- a/lib/libc_bsd/sys/utimes.2
+++ /dev/null
@@ -1,249 +0,0 @@
-.\"	$NetBSD: utimes.2,v 1.13 1999/03/22 19:45:11 garbled Exp $
-.\"
-.\" Copyright (c) 1990, 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.
-.\" 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.
-.\"
-.\"     @(#)utimes.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/utimes.2 268484 2014-07-10 09:09:37Z kib $
-.\"
-.Dd July 3, 2014
-.Dt UTIMES 2
-.Os
-.Sh NAME
-.Nm utimes ,
-.Nm lutimes ,
-.Nm futimes ,
-.Nm futimesat
-.Nd set file access and modification times
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/time.h
-.Ft int
-.Fn utimes "const char *path" "const struct timeval *times"
-.Ft int
-.Fn lutimes "const char *path" "const struct timeval *times"
-.Ft int
-.Fn futimes "int fd" "const struct timeval *times"
-.Ft int
-.Fn futimesat "int fd" "const char *path" "const struct timeval times[2]"
-.Sh DESCRIPTION
-The access and modification times of the file named by
-.Fa path
-or referenced by
-.Fa fd
-are changed as specified by the argument
-.Fa times .
-.Pp
-If
-.Fa times
-is
-.Dv NULL ,
-the access and modification times are set to the current time.
-The caller must be the owner of the file, have permission to
-write the file, or be the super-user.
-.Pp
-If
-.Fa times
-is
-.No non- Ns Dv NULL ,
-it is assumed to point to an array of two timeval structures.
-The access time is set to the value of the first element, and the
-modification time is set to the value of the second element.
-For file systems that support file birth (creation) times (such as
-.Dv UFS2 ) ,
-the birth time will be set to the value of the second element
-if the second element is older than the currently set birth time.
-To set both a birth time and a modification time,
-two calls are required; the first to set the birth time
-and the second to set the (presumably newer) modification time.
-Ideally a new system call will be added that allows the setting
-of all three times at once.
-The caller must be the owner of the file or be the super-user.
-.Pp
-In either case, the inode-change-time of the file is set to the current
-time.
-.Pp
-The
-.Fn lutimes
-system call
-is like
-.Fn utimes
-except in the case where the named file is a symbolic link,
-in which case
-.Fn lutimes
-changes the access and modification times of the link,
-while
-.Fn utimes
-changes the times of the file the link references.
-.Pp
-The
-.Fn futimesat
-system call is equivalent to
-.Fn utimes
-except in the case where
-.Fa path
-specifies a relative path.
-In this case the access and modification time
-is set to that of a file relative to the directory associated with the file
-descriptor
-.Fa fd
-instead of the current working directory.
-If
-.Fn futimesat
-is passed the special value
-.Dv AT_FDCWD
-in the
-.Fa fd
-parameter, the current working directory is used and the behavior
-is identical to a call to
-.Fn utimes .
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-All of the system call will fail if:
-.Bl -tag -width Er
-.It Bq Er EACCES
-Search permission is denied for a component of the path prefix.
-.It Bq Er EACCES
-The
-.Fa times
-argument is
-.Dv NULL
-and the effective user ID of the process does not
-match the owner of the file, and is not the super-user, and write
-access is denied.
-.It Bq Er EFAULT
-The
-.Fa path
-or
-.Fa times
-argument
-points outside the process's allocated address space.
-.It Bq Er EFAULT
-The
-.Fa times
-argument
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The
-.Va tv_usec
-component of at least one of the values specified by the
-.Fa times
-argument has a value less than 0 or greater than 999999.
-.It Bq Er EIO
-An I/O error occurred while reading or writing the affected inode.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Dv NAME_MAX
-characters, or an entire path name exceeded
-.Dv PATH_MAX
-characters.
-.It Bq Er ENOENT
-The named file does not exist.
-.It Bq Er ENOTDIR
-A component of the path prefix is not a directory.
-.It Bq Er EPERM
-The
-.Fa times
-argument is not
-.Dv NULL
-and the calling process's effective user ID
-does not match the owner of the file and is not the super-user.
-.It Bq Er EPERM
-The named file has its immutable or append-only flags set.
-See the
-.Xr chflags 2
-manual page for more information.
-.It Bq Er EROFS
-The file system containing the file is mounted read-only.
-.El
-.Pp
-The
-.Fn futimes
-system call
-will fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-does not refer to a valid descriptor.
-.El
-.Pp
-In addition to the errors returned by the
-.Fn utimes ,
-the
-.Fn futimesat
-may fail if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa path
-argument does not specify an absolute path and the
-.Fa fd
-argument is neither
-.Dv AT_FDCWD
-nor a valid file descriptor open for searching.
-.It Bq Er ENOTDIR
-The
-.Fa path
-argument is not an absolute path and
-.Fa fd
-is neither
-.Dv AT_FDCWD
-nor a file descriptor associated with a directory.
-.El
-.Sh SEE ALSO
-.Xr chflags 2 ,
-.Xr stat 2 ,
-.Xr utime 3
-.Sh STANDARDS
-The
-.Fn utimes
-function is expected to conform to
-.St -xpg4.2 .
-The
-.Fn futimesat
-system call follows The Open Group Extended API Set 2 specification.
-.Sh HISTORY
-The
-.Fn utimes
-system call appeared in
-.Bx 4.2 .
-The
-.Fn futimes
-and
-.Fn lutimes
-system calls first appeared in
-.Fx 3.0 .
-The
-.Fn futimesat
-system call appeared in
-.Fx 8.0 .
diff --git a/lib/libc_bsd/sys/utrace.2 b/lib/libc_bsd/sys/utrace.2
deleted file mode 100644
index 8032a8d..0000000
--- a/lib/libc_bsd/sys/utrace.2
+++ /dev/null
@@ -1,79 +0,0 @@
-.\"	$NetBSD: utrace.2,v 1.11 2003/04/24 12:17:49 wiz Exp $
-.\"
-.\" Copyright (c) 2000 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Gregory McGarry <g.mcgarry@ieee.org>.
-.\"
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/lib/libc/sys/utrace.2 204588 2010-03-02 17:20:04Z joel $
-.\"
-.Dd December 28, 2000
-.Dt UTRACE 2
-.Os
-.Sh NAME
-.Nm utrace
-.Nd insert user record in ktrace log
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/param.h
-.In sys/time.h
-.In sys/uio.h
-.In sys/ktrace.h
-.Ft int
-.Fn utrace "const void *addr" "size_t len"
-.Sh DESCRIPTION
-Adds a record to the process trace with information supplied by user.
-The record contains
-.Fa len
-bytes from memory pointed to by
-.Fa addr .
-This call only has an effect if the calling process is being traced.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-.Bl -tag -width Er
-.It Bq Er EINVAL
-Specified data length
-.Fa len
-was bigger than
-.Dv KTR_USER_MAXLEN .
-.It Bq Er ENOMEM
-Insufficient memory to honor the request.
-.It Bq Er ENOSYS
-Currently running kernel was compiled without
-.Xr ktrace 2
-support
-.Pq Cd "options KTRACE" .
-.El
-.Sh SEE ALSO
-.Xr kdump 1 ,
-.Xr ktrace 1 ,
-.Xr ktrace 2
-.Sh HISTORY
-The
-.Fn utrace
-system call first appeared in
-.Fx 2.2 .
diff --git a/lib/libc_bsd/sys/uuidgen.2 b/lib/libc_bsd/sys/uuidgen.2
deleted file mode 100644
index 1d135e7..0000000
--- a/lib/libc_bsd/sys/uuidgen.2
+++ /dev/null
@@ -1,142 +0,0 @@
-.\" Copyright (c) 2002 Marcel Moolenaar
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/lib/libc/sys/uuidgen.2 148580 2005-07-31 03:30:48Z keramida $
-.\"
-.Dd May 26, 2002
-.Dt UUIDGEN 2
-.Os
-.Sh NAME
-.Nm uuidgen
-.Nd generate universally unique identifiers
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/uuid.h
-.Ft int
-.Fn uuidgen "struct uuid *store" "int count"
-.Sh DESCRIPTION
-The
-.Fn uuidgen
-system call generates
-.Fa count
-universally unique identifiers (UUIDs) and writes them to the buffer
-pointed to by
-.Fa store .
-The identifiers are generated according to the syntax and semantics of the
-DCE version 1 variant of universally unique identifiers.
-See below for a more in-depth description of the identifiers.
-When no IEEE 802
-address is available for the node field, a random multicast address is
-generated for each invocation of the system call.
-According to the algorithm of generating time-based UUIDs, this will also
-force a new random clock sequence, thereby increasing the likelihood for
-the identifier to be unique.
-.Pp
-When multiple identifiers are to be generated, the
-.Fn uuidgen
-system call will generate a set of identifiers that is dense in such a way
-that there is no identifier that is larger than the smallest identifier in the
-set and smaller than the largest identifier in the set and that is not already
-in the set.
-.Pp
-Universally unique identifiers, also known as globally unique identifiers
-(GUIDs), have a binary representation of 128-bits.
-The grouping and meaning of these bits is described by the following
-structure and its description of the fields that follow it:
-.Bd -literal
-struct uuid {
-	uint32_t	time_low;
-	uint16_t	time_mid;
-	uint16_t	time_hi_and_version;
-	uint8_t		clock_seq_hi_and_reserved;
-	uint8_t		clock_seq_low;
-	uint8_t		node[_UUID_NODE_LEN];
-};
-.Ed
-.Bl -tag -width ".Va clock_seq_hi_and_reserved"
-.It Va time_low
-The least significant 32 bits of a 60-bit timestamp.
-This field is stored in the native byte-order.
-.It Va time_mid
-The least significant 16 bits of the most significant 28 bits of the 60-bit
-timestamp.
-This field is stored in the native byte-order.
-.It Va time_hi_and_version
-The most significant 12 bits of the 60-bit timestamp multiplexed with a 4-bit
-version number.
-The version number is stored in the most significant 4 bits of the 16-bit
-field.
-This field is stored in the native byte-order.
-.It Va clock_seq_hi_and_reserved
-The most significant 6 bits of a 14-bit sequence number multiplexed with a
-2-bit variant value.
-Note that the width of the variant value is determined by the variant itself.
-Identifiers generated by the
-.Fn uuidgen
-system call have variant value 10b.
-the variant value is stored in the most significant bits of the field.
-.It Va clock_seq_low
-The least significant 8 bits of a 14-bit sequence number.
-.It Va node
-The 6-byte IEEE 802 (MAC) address of one of the interfaces of the node.
-If no such interface exists, a random multi-cast address is used instead.
-.El
-.Pp
-The binary representation is sensitive to byte ordering.
-Any multi-byte field is to be stored in the local or native byte-order and
-identifiers must be converted when transmitted to hosts that do not agree
-on the byte-order.
-The specification does not however document what this means in concrete
-terms and is otherwise beyond the scope of this system call.
-.Sh RETURN VALUES
-.Rv -std
-.Sh ERRORS
-The
-.Fn uuidgen
-system call can fail with:
-.Bl -tag -width Er
-.It Bq Er EFAULT
-The buffer pointed to by
-.Fa store
-could not be written to for any or all identifiers.
-.It Bq Er EINVAL
-The
-.Fa count
-argument is less than 1 or larger than the hard upper limit of 2048.
-.El
-.Sh SEE ALSO
-.Xr uuidgen 1 ,
-.Xr uuid 3
-.Sh STANDARDS
-The identifiers are represented and generated in conformance with the DCE 1.1
-RPC specification.
-The
-.Fn uuidgen
-system call is itself not part of the specification.
-.Sh HISTORY
-The
-.Fn uuidgen
-system call first appeared in
-.Fx 5.0 .
diff --git a/lib/libc_bsd/sys/vfork.2 b/lib/libc_bsd/sys/vfork.2
deleted file mode 100644
index cf2d079..0000000
--- a/lib/libc_bsd/sys/vfork.2
+++ /dev/null
@@ -1,129 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)vfork.2	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: releng/10.2/lib/libc/sys/vfork.2 283912 2015-06-02 15:02:28Z jhb $
-.\"
-.Dd April 6, 2015
-.Dt VFORK 2
-.Os
-.Sh NAME
-.Nm vfork
-.Nd create a new process without copying the address space
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In unistd.h
-.Ft pid_t
-.Fn vfork void
-.Sh DESCRIPTION
-The
-.Fn vfork
-system call
-can be used to create new processes without fully copying the address
-space of the old process, which is horrendously inefficient in a paged
-environment.
-It is useful when the purpose of
-.Xr fork 2
-would have been to create a new system context for an
-.Xr execve 2 .
-The
-.Fn vfork
-system call
-differs from
-.Xr fork 2
-in that the child borrows the parent's memory and thread of
-control until a call to
-.Xr execve 2
-or an exit (either by a call to
-.Xr _exit 2
-or abnormally).
-The parent process is suspended while the child is using its resources.
-.Pp
-The
-.Fn vfork
-system call
-returns 0 in the child's context and (later) the pid of the child in
-the parent's context.
-.Pp
-The
-.Fn vfork
-system call
-can normally be used just like
-.Xr fork 2 .
-It does not work, however, to return while running in the child's context
-from the procedure that called
-.Fn vfork
-since the eventual return from
-.Fn vfork
-would then return to a no longer existent stack frame.
-Be careful, also, to call
-.Xr _exit 2
-rather than
-.Xr exit 3
-if you cannot
-.Xr execve 2 ,
-since
-.Xr exit 3
-will flush and close standard I/O channels, and thereby mess up the
-parent processes standard I/O data structures.
-(Even with
-.Xr fork 2
-it is wrong to call
-.Xr exit 3
-since buffered data would then be flushed twice.)
-.Sh RETURN VALUES
-Same as for
-.Xr fork 2 .
-.Sh SEE ALSO
-.Xr execve 2 ,
-.Xr _exit 2 ,
-.Xr fork 2 ,
-.Xr rfork 2 ,
-.Xr sigaction 2 ,
-.Xr wait 2 ,
-.Xr exit 3
-.Sh HISTORY
-The
-.Fn vfork
-system call appeared in
-.Bx 3 .
-.Sh BUGS
-To avoid a possible deadlock situation,
-processes that are children in the middle
-of a
-.Fn vfork
-are never sent
-.Dv SIGTTOU
-or
-.Dv SIGTTIN
-signals; rather,
-output or
-.Xr ioctl 2
-calls
-are allowed
-and input attempts result in an end-of-file indication.
diff --git a/lib/libc_bsd/sys/wait.2 b/lib/libc_bsd/sys/wait.2
deleted file mode 100644
index 953e9c7..0000000
--- a/lib/libc_bsd/sys/wait.2
+++ /dev/null
@@ -1,628 +0,0 @@
-.\" Copyright (c) 1980, 1991, 1993, 1994
-.\"	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.
-.\" 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.
-.\"
-.\"     @(#)wait.2	8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/wait.2 264170 2014-04-05 20:09:51Z jilles $
-.\"
-.Dd September 7, 2013
-.Dt WAIT 2
-.Os
-.Sh NAME
-.Nm wait ,
-.Nm waitid ,
-.Nm waitpid ,
-.Nm wait3 ,
-.Nm wait4 ,
-.Nm wait6
-.Nd wait for processes to change status
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In sys/wait.h
-.Ft pid_t
-.Fn wait "int *status"
-.Ft pid_t
-.Fn waitpid "pid_t wpid" "int *status" "int options"
-.In signal.h
-.Ft int
-.Fn waitid "idtype_t idtype" "id_t id" "siginfo_t *info" "int options"
-.In sys/time.h
-.In sys/resource.h
-.Ft pid_t
-.Fn wait3 "int *status" "int options" "struct rusage *rusage"
-.Ft pid_t
-.Fn wait4 "pid_t wpid" "int *status" "int options" "struct rusage *rusage"
-.Ft pid_t
-.Fn wait6 "idtype_t idtype" "id_t id" "int *status" "int options" "struct __wrusage *wrusage" "siginfo_t *infop"
-.Sh DESCRIPTION
-The
-.Fn wait
-function suspends execution of its calling process until
-.Fa status
-information is available for a terminated child process,
-or a signal is received.
-On return from a successful
-.Fn wait
-call,
-the
-.Fa status
-area contains termination information about the process that exited
-as defined below.
-The
-.Fn wait
-call is the same as
-.Fn wait4
-with a
-.Fa wpid
-value of -1,
-with an
-.Fa options
-value of zero,
-and a
-.Fa rusage
-value of zero.
-.Pp
-The
-.Fn wait4
-system call provides a more general interface for programs
-that need to wait for certain child processes,
-that need resource utilization statistics accumulated by child processes,
-or that require options.
-.Pp
-The broadest interface of all functions in this family is
-.Fn wait6
-which is otherwise very much like
-.Fn wait4
-but with a few very important distinctions.
-To wait for exited processes, the option flag
-.Dv WEXITED
-need to be explicitly specified.
-This allows for waiting for processes which have experienced other
-status changes without having to handle also the exit status from
-the terminated processes.
-Instead of the traditional
-.Dv rusage
-argument, a pointer to a new structure
-.Bd -literal
-struct __wrusage {
-	struct rusage   wru_self;
-	struct rusage   wru_children;
-};
-.Ed
-can be passed.
-This allows the calling process to collect resource usage statistics
-from both its own child process as well as from its grand children.
-When no resource usage statistics are needed this pointer can be
-.Dv NULL .
-The last argument
-.Fa infop
-must be either
-.Dv NULL
-or a pointer to a
-.Fa siginfo_t
-structure.
-When specified, the structure is filled the same as for
-.Dv SIGNCHLD
-signal, delivered at the process state change.
-.br
-The process, which state is queried, is specified by two arguments
-.Fa idtype
-and
-.Fa id .
-The separate
-.Fa idtype
-and
-.Fa id
-arguments allows to support many other types of
-IDs  as well in addition to PID and PGID.
-.Bl -bullet -offset indent
-.It
-If
-.Fa idtype
-is
-.Dv P_PID ,
-.Fn waitid
-and
-.Fn wait6
-wait for the child process with a process ID equal to
-.Dv (pid_t)id .
-.It
-If
-.Fa idtype
-is
-.Dv P_PGID ,
-.Fn waitid
-and
-.Fn wait6
-wait for the child process with a process group ID equal to
-.Dv (pid_t)id .
-.It
-If
-.Fa idtype
-is
-.Dv P_ALL ,
-.Fn waitid
-and
-.Fn wait6
-wait for any child process and the
-.Dv id
-is ignored.
-.It
-If
-.Fa idtype
-is
-.Dv P_PID
-or
-.Dv P_PGID
-and the
-.Dv id
-is zero,
-.Fn waitid
-and
-.Fn wait6
-wait for any child process in the same process group as the caller.
-.El
-.Pp
-Non-standard specifiers for the process to wait for, supported by this
-implementation of
-.Fn waitid
-and
-.Fn wait6 ,
-are:
-.Bl -bullet -offset indent
-.It
-The
-.Fa idtype
-value
-.Dv P_UID
-waits for processes which effective UID is equal to
-.Dv (uid_t)id .
-.It
-The
-.Fa idtype
-value
-.Dv P_GID
-waits for processes which effective GID is equal to
-.Dv (gid_t)id .
-.It
-The
-.Fa idtype
-value
-.Dv P_SID
-waits for processes which session ID is equal to
-.Dv id .
-In case the child process started its own new session,
-SID will be the same as its own PID.
-Otherwise the SID of a child process will match the caller's SID.
-.It
-The
-.Fa idtype
-value
-.Dv P_JAILID
-waits for processes within a jail which jail identifier is equal
-to
-.Dv id .
-.El
-.Pp
-For
-.Fn wait ,
-.Fn wait3 ,
-and
-.Fn wait4
-functions, the single
-.Fa wpid
-argument specifies the set of child processes for which to wait.
-.Bl -bullet -offset indent
-.It
-If
-.Fa wpid
-is -1, the call waits for any child process.
-.It
-If
-.Fa wpid
-is 0,
-the call waits for any child process in the process group of the caller.
-.It
-If
-.Fa wpid
-is greater than zero, the call waits for the process with process id
-.Fa wpid .
-.It
-If
-.Fa wpid
-is less than -1, the call waits for any process whose process group id
-equals the absolute value of
-.Fa wpid .
-.El
-.Pp
-The
-.Fa status
-argument is defined below.
-.Pp
-The
-.Fa options
-argument contains the bitwise OR of any of the following options.
-.Bl -tag -width Ds
-.It Dv WCONTINUED
-indicates that children of the current process that
-have continued from a job control stop, by receiving a
-.Dv SIGCONT
-signal, should also have their status reported.
-.It Dv WNOHANG
-is used to indicate that the call should not block when
-there are no processes wishing to report status.
-.It Dv WUNTRACED
-indicates that children of the current process which are stopped
-due to a
-.Dv SIGTTIN , SIGTTOU , SIGTSTP ,
-or
-.Dv SIGSTOP
-signal shall have their status reported.
-.It Dv WSTOPPED
-is an alias for
-.Dv WUNTRACED .
-.It Dv WTRAPPED
-allows waiting for processes which have trapped or reached a breakpoint.
-.It Dv WEXITED
-indicates that the caller is wants to receive status reports from
-terminated processes.
-This flag is implicitly set for the functions
-.Fn wait ,
-.Fn waitpid ,
-.Fn wait3 ,
-and
-.Fn wait4 .
-.br
-For the
-.Fn waitid
-and
-.Fn wait6
-functions, the flag has to be explicitly included in the
-.Fa options ,
-if status reports from terminated processes are expected.
-.It Dv WNOWAIT
-keeps the process whose status is returned in a waitable state.
-The process may be waited for again after this call completes.
-.El
-.sp
-For the
-.Fn waitid
-and
-.Fn wait6
-functions, at least one of the options
-.Dv WEXITED ,
-.Dv WUNTRACED ,
-.Dv WSTOPPED ,
-.Dv WTRAPPED ,
-or
-.Dv WCONTINUED
-must be specified.
-Otherwise there will be no events for the call to report.
-To avoid hanging indefinitely in such a case these functions
-return -1 with
-.Dv errno
-set to
-.Dv EINVAL .
-.Pp
-If
-.Fa rusage
-is non-NULL, a summary of the resources used by the terminated
-process and all its children is returned.
-.Pp
-If
-.Fa wrusage
-argument is non-NULL, a resource usage statistics
-from both its own child process as well as from its grand children
-is returned.
-.Pp
-If
-.Fa infop
-is non-NULL, it must point to a
-.Dv siginfo_t
-structure which is filled on return such that the
-.Dv si_signo
-field is always
-.Dv SIGCHLD
-and the field
-.Dv si_pid
-if be non-zero, if there is a status change to report.
-If there are no status changes to report and WNOHANG is applied,
-both of these fields are returned zero.
-When using the
-.Fn waitid
-function with the
-.Dv WNOHANG
-option set, checking these fields is the only way to know whether
-there were any status changes to report, because the return value
-from
-.Fn waitid
-is be zero as it is for any successful return from
-.Fn waitid .
-.Pp
-When the
-.Dv WNOHANG
-option is specified and no processes
-wish to report status,
-.Fn wait4
-returns a
-process id
-of 0.
-.Pp
-The
-.Fn waitpid
-function is identical to
-.Fn wait4
-with an
-.Fa rusage
-value of zero.
-The older
-.Fn wait3
-call is the same as
-.Fn wait4
-with a
-.Fa wpid
-value of -1.
-The
-.Fn wait6
-call, with the bits
-.Dv WEXITED
-and
-.Dv WTRAPPED
-set in the
-.Fa options
-and with
-.Fa infop
-set to
-.Dv NULL ,
-is similar to
-.Fn wait4 .
-.Pp
-The following macros may be used to test the manner of exit of the process.
-One of the first four macros will evaluate to a non-zero (true) value:
-.Bl -tag -width Ds
-.It Fn WIFCONTINUED status
-True if the process has not terminated, and
-has continued after a job control stop.
-This macro can be true only if the wait call specified the
-.Dv WCONTINUED
-option).
-.It Fn WIFEXITED status
-True if the process terminated normally by a call to
-.Xr _exit 2
-or
-.Xr exit 3 .
-.It Fn WIFSIGNALED status
-True if the process terminated due to receipt of a signal.
-.It Fn WIFSTOPPED status
-True if the process has not terminated, but has stopped and can be restarted.
-This macro can be true only if the wait call specified the
-.Dv WUNTRACED
-option
-or if the child process is being traced (see
-.Xr ptrace 2 ) .
-.El
-.Pp
-Depending on the values of those macros, the following macros
-produce the remaining status information about the child process:
-.Bl -tag -width Ds
-.It Fn WEXITSTATUS status
-If
-.Fn WIFEXITED status
-is true, evaluates to the low-order 8 bits
-of the argument passed to
-.Xr _exit 2
-or
-.Xr exit 3
-by the child.
-.It Fn WTERMSIG status
-If
-.Fn WIFSIGNALED status
-is true, evaluates to the number of the signal
-that caused the termination of the process.
-.It Fn WCOREDUMP status
-If
-.Fn WIFSIGNALED status
-is true, evaluates as true if the termination
-of the process was accompanied by the creation of a core file
-containing an image of the process when the signal was received.
-.It Fn WSTOPSIG status
-If
-.Fn WIFSTOPPED status
-is true, evaluates to the number of the signal
-that caused the process to stop.
-.El
-.Sh NOTES
-See
-.Xr sigaction 2
-for a list of termination signals.
-A status of 0 indicates normal termination.
-.Pp
-If a parent process terminates without
-waiting for all of its child processes to terminate,
-the remaining child processes are assigned the parent
-process 1 ID (the init process ID).
-.Pp
-If a signal is caught while any of the
-.Fn wait
-calls are pending,
-the call may be interrupted or restarted when the signal-catching routine
-returns,
-depending on the options in effect for the signal;
-see discussion of
-.Dv SA_RESTART
-in
-.Xr sigaction 2 .
-.Pp
-The implementation queues one
-.Dv SIGCHLD
-signal for each child process whose
-status has changed, if
-.Fn wait
-returns because the status of a child process is available, the pending
-SIGCHLD signal associated with the process ID of the child process will
-be discarded.
-Any other pending
-.Dv SIGCHLD
-signals remain pending.
-.Pp
-If
-.Dv SIGCHLD
-is blocked,
-.Fn wait
-returns because the status of a child process is available, the pending
-.Dv SIGCHLD
-signal will be cleared unless another status of the child process
-is available.
-.Sh RETURN VALUES
-If
-.Fn wait
-returns due to a stopped, continued,
-or terminated child process, the process ID of the child
-is returned to the calling process.
-Otherwise, a value of \-1
-is returned and
-.Va errno
-is set to indicate the error.
-.Pp
-If
-.Fn wait6 ,
-.Fn wait4 ,
-.Fn wait3 ,
-or
-.Fn waitpid
-returns due to a stopped, continued,
-or terminated child process, the process ID of the child
-is returned to the calling process.
-If there are no children not previously awaited,
--1 is returned with
-.Va errno
-set to
-.Er ECHILD .
-Otherwise, if
-.Dv WNOHANG
-is specified and there are
-no stopped, continued or exited children,
-0 is returned.
-If an error is detected or a caught signal aborts the call,
-a value of -1
-is returned and
-.Va errno
-is set to indicate the error.
-.Pp
-If
-.Fn waitid
-returns because one or more processes have a state change to report,
-0 is returned.
-To indicate an error, -1 will be returned and
-.Dv errno
-set to an appropriate value.
-If
-.Dv WNOHANG
-was used, 0 can be returned indicating no error, but no processes
-may have changed state either, if si_signo and/or si_pid are zero.
-.Sh ERRORS
-The
-.Fn wait
-function
-will fail and return immediately if:
-.Bl -tag -width Er
-.It Bq Er ECHILD
-The calling process has no existing unwaited-for
-child processes.
-.It Bq Er ECHILD
-No status from the terminated child process is available
-because the calling process has asked the system to discard
-such status by ignoring the signal
-.Dv SIGCHLD
-or setting the flag
-.Dv SA_NOCLDWAIT
-for that signal.
-.It Bq Er EFAULT
-The
-.Fa status
-or
-.Fa rusage
-argument points to an illegal address.
-(May not be detected before exit of a child process.)
-.It Bq Er EINTR
-The call was interrupted by a caught signal,
-or the signal did not have the
-.Dv SA_RESTART
-flag set.
-.It Bq Er EINVAL
-An invalid value was specified for
-.Fa options ,
-or
-.Fa idtype
-and
-.Fa id
-do not specify a valid set of processes.
-.El
-.Sh SEE ALSO
-.Xr _exit 2 ,
-.Xr ptrace 2 ,
-.Xr sigaction 2 ,
-.Xr exit 3 ,
-.Xr siginfo 3
-.Sh STANDARDS
-The
-.Fn wait ,
-.Fn waitpid ,
-and
-.Fn waitid
-functions are defined by POSIX;
-.Fn wait6 ,
-.Fn wait4 ,
-and
-.Fn wait3
-are not specified by POSIX.
-The
-.Fn WCOREDUMP
-macro
-is an extension to the POSIX interface.
-.Pp
-The ability to use the
-.Dv WNOWAIT
-flag with
-.Fn waitpid
-is an extension;
-.Tn POSIX
-only permits this flag with
-.Fn waitid .
-.Pp
-.Tn POSIX
-requires
-.Fn waitid
-to return the full 32 bits passed to
-.Xr _exit 2 ;
-this implementation only returns 8 bits like in the other calls.
-.Sh HISTORY
-The
-.Fn wait
-function appeared in
-.At v6 .
diff --git a/lib/libc_bsd/sys/wait4.c b/lib/libc_bsd/sys/wait4.c
deleted file mode 100644
index e08d65a..0000000
--- a/lib/libc_bsd/sys/wait4.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/wait4.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_wait4, __wait4);
-
-#pragma weak wait4
-pid_t
-wait4(pid_t pid, int *status, int options, struct rusage *ru)
-{
-
-	return (((pid_t (*)(pid_t, int *, int, struct rusage *))
-	    __libc_interposing[INTERPOS_wait4])(pid, status, options, ru));
-}
diff --git a/lib/libc_bsd/sys/wait6.c b/lib/libc_bsd/sys/wait6.c
deleted file mode 100644
index 9a5f410..0000000
--- a/lib/libc_bsd/sys/wait6.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2015 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/wait6.c 281981 2015-04-25 08:14:08Z kib $");
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_wait6, __wait6);
-
-#pragma weak wait6
-pid_t
-wait6(idtype_t idtype, id_t id, int *status, int options, struct __wrusage *ru,
-    siginfo_t *infop)
-{
-
-	return (((pid_t (*)(idtype_t, id_t, int *, int, struct __wrusage *,
-	    siginfo_t *))__libc_interposing[INTERPOS_wait6])(idtype, id,
-	    status, options, ru, infop));
-}
diff --git a/lib/libc_bsd/sys/write.2 b/lib/libc_bsd/sys/write.2
deleted file mode 100644
index fdcbaa1..0000000
--- a/lib/libc_bsd/sys/write.2
+++ /dev/null
@@ -1,286 +0,0 @@
-.\" Copyright (c) 1980, 1991, 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.
-.\" 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.
-.\"
-.\"     @(#)write.2	8.5 (Berkeley) 4/2/94
-.\" $FreeBSD: releng/10.2/lib/libc/sys/write.2 255486 2013-09-12 00:53:38Z bdrewery $
-.\"
-.Dd September 11, 2013
-.Dt WRITE 2
-.Os
-.Sh NAME
-.Nm write ,
-.Nm writev ,
-.Nm pwrite ,
-.Nm pwritev
-.Nd write output
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In sys/types.h
-.In unistd.h
-.Ft ssize_t
-.Fn write "int fd" "const void *buf" "size_t nbytes"
-.Ft ssize_t
-.Fn pwrite "int fd" "const void *buf" "size_t nbytes" "off_t offset"
-.In sys/uio.h
-.Ft ssize_t
-.Fn writev "int fd" "const struct iovec *iov" "int iovcnt"
-.Ft ssize_t
-.Fn pwritev "int fd" "const struct iovec *iov" "int iovcnt" "off_t offset"
-.Sh DESCRIPTION
-The
-.Fn write
-system call
-attempts to write
-.Fa nbytes
-of data to the object referenced by the descriptor
-.Fa fd
-from the buffer pointed to by
-.Fa buf .
-The
-.Fn writev
-system call
-performs the same action, but gathers the output data
-from the
-.Fa iovcnt
-buffers specified by the members of the
-.Fa iov
-array: iov[0], iov[1], ..., iov[iovcnt\|-\|1].
-The
-.Fn pwrite
-and
-.Fn pwritev
-system calls
-perform the same functions, but write to the specified position in
-the file without modifying the file pointer.
-.Pp
-For
-.Fn writev
-and
-.Fn pwritev ,
-the
-.Fa iovec
-structure is defined as:
-.Pp
-.Bd -literal -offset indent -compact
-struct iovec {
-	void   *iov_base;  /* Base address. */
-	size_t iov_len;    /* Length. */
-};
-.Ed
-.Pp
-Each
-.Fa iovec
-entry specifies the base address and length of an area
-in memory from which data should be written.
-The
-.Fn writev
-system call
-will always write a complete area before proceeding
-to the next.
-.Pp
-On objects capable of seeking, the
-.Fn write
-starts at a position
-given by the pointer associated with
-.Fa fd ,
-see
-.Xr lseek 2 .
-Upon return from
-.Fn write ,
-the pointer is incremented by the number of bytes which were written.
-.Pp
-Objects that are not capable of seeking always write from the current
-position.
-The value of the pointer associated with such an object
-is undefined.
-.Pp
-If the real user is not the super-user, then
-.Fn write
-clears the set-user-id bit on a file.
-This prevents penetration of system security
-by a user who
-.Dq captures
-a writable set-user-id file
-owned by the super-user.
-.Pp
-When using non-blocking I/O on objects such as sockets that are subject
-to flow control,
-.Fn write
-and
-.Fn writev
-may write fewer bytes than requested;
-the return value must be noted,
-and the remainder of the operation should be retried when possible.
-.Sh RETURN VALUES
-Upon successful completion the number of bytes which were written
-is returned.
-Otherwise a -1 is returned and the global variable
-.Va errno
-is set to indicate the error.
-.Sh ERRORS
-The
-.Fn write ,
-.Fn writev ,
-.Fn pwrite
-and
-.Fn pwritev
-system calls
-will fail and the file pointer will remain unchanged if:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument
-is not a valid descriptor open for writing.
-.It Bq Er EPIPE
-An attempt is made to write to a pipe that is not open
-for reading by any process.
-.It Bq Er EPIPE
-An attempt is made to write to a socket of type
-.Dv SOCK_STREAM
-that is not connected to a peer socket.
-.It Bq Er EFBIG
-An attempt was made to write a file that exceeds the process's
-file size limit or the maximum file size.
-.It Bq Er EFAULT
-Part of
-.Fa iov
-or data to be written to the file
-points outside the process's allocated address space.
-.It Bq Er EINVAL
-The pointer associated with
-.Fa fd
-was negative.
-.It Bq Er ENOSPC
-There is no free space remaining on the file system
-containing the file.
-.It Bq Er EDQUOT
-The user's quota of disk blocks on the file system
-containing the file has been exhausted.
-.It Bq Er EIO
-An I/O error occurred while reading from or writing to the file system.
-.It Bq Er EINTR
-A signal interrupted the write before it could be completed.
-.It Bq Er EAGAIN
-The file was marked for non-blocking I/O,
-and no data could be written immediately.
-.It Bq Er EROFS
-An attempt was made to write over a disk label area at the beginning
-of a slice.
-Use
-.Xr disklabel 8
-.Fl W
-to enable writing on the disk label area.
-.It Bq Er EINVAL
-The value
-.Fa nbytes
-is greater than
-.Dv INT_MAX .
-.El
-.Pp
-In addition,
-.Fn writev
-and
-.Fn pwritev
-may return one of the following errors:
-.Bl -tag -width Er
-.It Bq Er EDESTADDRREQ
-The destination is no longer available when writing to a
-.Ux
-domain datagram socket on which
-.Xr connect 2
-had been used to set a destination address.
-.It Bq Er EINVAL
-The
-.Fa iovcnt
-argument
-was less than or equal to 0, or greater than
-.Dv IOV_MAX .
-.It Bq Er EINVAL
-One of the
-.Fa iov_len
-values in the
-.Fa iov
-array was negative.
-.It Bq Er EINVAL
-The sum of the
-.Fa iov_len
-values in the
-.Fa iov
-array overflowed a 32-bit integer.
-.It Bq Er ENOBUFS
-The mbuf pool has been completely exhausted when writing to a socket.
-.El
-.Pp
-The
-.Fn pwrite
-and
-.Fn pwritev
-system calls may also return the following errors:
-.Bl -tag -width Er
-.It Bq Er EINVAL
-The
-.Fa offset
-value was negative.
-.It Bq Er ESPIPE
-The file descriptor is associated with a pipe, socket, or FIFO.
-.El
-.Sh SEE ALSO
-.Xr fcntl 2 ,
-.Xr lseek 2 ,
-.Xr open 2 ,
-.Xr pipe 2 ,
-.Xr select 2
-.Sh STANDARDS
-The
-.Fn write
-system call is expected to conform to
-.St -p1003.1-90 .
-The
-.Fn writev
-and
-.Fn pwrite
-system calls are expected to conform to
-.St -xpg4.2 .
-.Sh HISTORY
-The
-.Fn pwritev
-system call appeared in
-.Fx 6.0 .
-The
-.Fn pwrite
-function appeared in
-.At V.4 .
-The
-.Fn writev
-system call appeared in
-.Bx 4.2 .
-The
-.Fn write
-function appeared in
-.At v6 .
diff --git a/lib/libc_bsd/sys/write.c b/lib/libc_bsd/sys/write.c
deleted file mode 100644
index c0ceb69..0000000
--- a/lib/libc_bsd/sys/write.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/write.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_write, __write);
-
-#pragma weak write
-ssize_t
-write(int fd, const void *buf, size_t nbytes)
-{
-
-	return (((ssize_t (*)(int, const void *, size_t))
-	    __libc_interposing[INTERPOS_write])(fd, buf, nbytes));
-}
diff --git a/lib/libc_bsd/sys/writev.c b/lib/libc_bsd/sys/writev.c
deleted file mode 100644
index 38a3bf3..0000000
--- a/lib/libc_bsd/sys/writev.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2014 The FreeBSD Foundation.
- * All rights reserved.
- *
- * Portions of this software were developed by Konstantin Belousov
- * under sponsorship from the FreeBSD Foundation.
- *
- * 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(s), this list of conditions and the following disclaimer as
- *    the first lines of this file unmodified other than the possible
- *    addition of one or more copyright notices.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice(s), this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 COPYRIGHT HOLDER(S) 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/sys/writev.c 277317 2015-01-18 11:54:20Z kib $");
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-#include "libc_private.h"
-
-__weak_reference(__sys_writev, __writev);
-
-#pragma weak writev
-ssize_t
-writev(int fd, const struct iovec *iov, int iovcnt)
-{
-
-	return (((ssize_t (*)(int, const struct iovec *, int))
-	    __libc_interposing[INTERPOS_writev])(fd, iov, iovcnt));
-}
diff --git a/lib/libc_bsd/tests/Makefile b/lib/libc_bsd/tests/Makefile
deleted file mode 100644
index 78d5e63..0000000
--- a/lib/libc_bsd/tests/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/Makefile 277441 2015-01-20 21:42:40Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc
-
-SUBDIR=		tls_dso
-
-TESTS_SUBDIRS=	c063
-TESTS_SUBDIRS+=	db
-TESTS_SUBDIRS+=	gen
-TESTS_SUBDIRS+=	hash
-TESTS_SUBDIRS+=	inet
-TESTS_SUBDIRS+=	net
-TESTS_SUBDIRS+=	regex
-TESTS_SUBDIRS+=	stdio
-TESTS_SUBDIRS+=	stdlib
-TESTS_SUBDIRS+=	string
-TESTS_SUBDIRS+=	sys
-TESTS_SUBDIRS+=	termios
-TESTS_SUBDIRS+=	tls
-TESTS_SUBDIRS+=	ttyio
-
-.if ${MK_LOCALES} != "no"
-TESTS_SUBDIRS+=	locale
-.endif
-
-.if ${MK_SSP} != "no"
-TESTS_SUBDIRS+=	ssp
-.endif
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/Makefile.netbsd-tests b/lib/libc_bsd/tests/Makefile.netbsd-tests
deleted file mode 100644
index e6c0cd3..0000000
--- a/lib/libc_bsd/tests/Makefile.netbsd-tests
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/Makefile.netbsd-tests 274075 2014-11-04 00:56:25Z ngie $
-
-OBJTOP?=	${.OBJDIR:H:H:H:H}
-SRCTOP?=	${.CURDIR:H:H:H:H}
-TESTSRC?=	${SRCTOP}/contrib/netbsd-tests/lib/libc/${.CURDIR:T}
-
-.include <netbsd-tests.test.mk>
diff --git a/lib/libc_bsd/tests/c063/Makefile b/lib/libc_bsd/tests/c063/Makefile
deleted file mode 100644
index 3a24672..0000000
--- a/lib/libc_bsd/tests/c063/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/c063/Makefile 277443 2015-01-20 21:48:42Z ngie $
-
-TESTSDIR=	${TESTSBASE}/lib/libc/c063
-
-#TODO: t_o_search, t_utimensat
-
-NETBSD_ATF_TESTS_C=	faccessat
-NETBSD_ATF_TESTS_C+=	fchmodat
-NETBSD_ATF_TESTS_C+=	fchownat
-NETBSD_ATF_TESTS_C+=	fexecve
-NETBSD_ATF_TESTS_C+=	fstatat
-NETBSD_ATF_TESTS_C+=	linkat
-NETBSD_ATF_TESTS_C+=	mkdirat
-NETBSD_ATF_TESTS_C+=	mkfifoat
-NETBSD_ATF_TESTS_C+=	mknodat
-NETBSD_ATF_TESTS_C+=	openat
-NETBSD_ATF_TESTS_C+=	readlinkat
-NETBSD_ATF_TESTS_C+=	renameat
-NETBSD_ATF_TESTS_C+=	symlinkat
-NETBSD_ATF_TESTS_C+=	unlinkat
-
-CFLAGS+= -D_INCOMPLETE_XOPEN_C063
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/db/Makefile b/lib/libc_bsd/tests/db/Makefile
deleted file mode 100644
index 3568eba..0000000
--- a/lib/libc_bsd/tests/db/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/db/Makefile 282834 2015-05-13 10:03:21Z ngie $
-
-TESTSDIR=	${TESTSBASE}/lib/libc/db
-
-BINDIR=		${TESTSDIR}
-
-PROGS=		h_db
-
-FILESDIR=	${TESTSDIR}
-
-FILES=		README
-
-NETBSD_ATF_TESTS_SH+=	db_test
-ATF_TESTS_SH_SED_db_test=	-e 's,/bin/csh,/bin/cat,g'
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/gen/Makefile b/lib/libc_bsd/tests/gen/Makefile
deleted file mode 100644
index c533ebf..0000000
--- a/lib/libc_bsd/tests/gen/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/gen/Makefile 277441 2015-01-20 21:42:40Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/gen
-
-ATF_TESTS_C=		arc4random_test
-ATF_TESTS_C+=		fpclassify2_test
-
-# TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid, t_sleep
-# TODO: t_siginfo (fixes require further inspection)
-# TODO: t_sethostname_test (consistently screws up the hostname)
-
-NETBSD_ATF_TESTS_C=	alarm_test
-NETBSD_ATF_TESTS_C+=	assert_test
-NETBSD_ATF_TESTS_C+=	basedirname_test
-NETBSD_ATF_TESTS_C+=	dir_test
-NETBSD_ATF_TESTS_C+=	floatunditf_test
-NETBSD_ATF_TESTS_C+=	fnmatch_test
-NETBSD_ATF_TESTS_C+=	fpclassify_test
-NETBSD_ATF_TESTS_C+=	fpsetmask_test
-NETBSD_ATF_TESTS_C+=	fpsetround_test
-NETBSD_ATF_TESTS_C+=	ftok_test
-NETBSD_ATF_TESTS_C+=	getcwd_test
-NETBSD_ATF_TESTS_C+=	getgrent_test
-NETBSD_ATF_TESTS_C+=	glob_test
-NETBSD_ATF_TESTS_C+=	humanize_number_test
-NETBSD_ATF_TESTS_C+=	isnan_test
-NETBSD_ATF_TESTS_C+=	nice_test
-NETBSD_ATF_TESTS_C+=	pause_test
-NETBSD_ATF_TESTS_C+=	raise_test
-NETBSD_ATF_TESTS_C+=	realpath_test
-NETBSD_ATF_TESTS_C+=	setdomainname_test
-NETBSD_ATF_TESTS_C+=	sethostname_test
-NETBSD_ATF_TESTS_C+=	sleep_test
-NETBSD_ATF_TESTS_C+=	syslog_test
-NETBSD_ATF_TESTS_C+=	time_test
-NETBSD_ATF_TESTS_C+=	ttyname_test
-NETBSD_ATF_TESTS_C+=	vis_test
-
-.include "../Makefile.netbsd-tests"
-
-LDADD.humanize_number_test+=	-lutil
-DPADD.humanize_number_test+=	${LIBUTIL}
-
-LDADD.fpclassify_test+=	-lm
-DPADD.fpclassify_test+=	${LIBM}
-LDADD.fpsetround_test+=	-lm
-DPADD.fpsetround_test+=	${LIBM}
-LDADD.siginfo_test+=	-lm
-DPADD.siginfo_test+=	${LIBM}
-
-LDADD.nice_test+=	-lpthread
-DPADD.nice_test+=	${LIBPTHREAD}
-LDADD.syslog_test+=	-lpthread
-DPADD.syslog_test+=	${LIBPTHREAD}
-
-TESTS_SUBDIRS=	execve
-TESTS_SUBDIRS+=	posix_spawn
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/gen/arc4random_test.c b/lib/libc_bsd/tests/gen/arc4random_test.c
deleted file mode 100644
index 9f69ecb..0000000
--- a/lib/libc_bsd/tests/gen/arc4random_test.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 2011 David Schultz
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/tests/gen/arc4random_test.c 277441 2015-01-20 21:42:40Z ngie $");
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <atf-c.h>
-
-/*
- * BUFSIZE is the number of bytes of rc4 output to compare.  The probability
- * that this test fails spuriously is 2**(-BUFSIZE * 8).
- */
-#define	BUFSIZE		8
-
-/*
- * Test whether arc4random_buf() returns the same sequence of bytes in both
- * parent and child processes.  (Hint: It shouldn't.)
- */
-ATF_TC_WITHOUT_HEAD(test_arc4random);
-ATF_TC_BODY(test_arc4random, tc)
-{
-	struct shared_page {
-		char parentbuf[BUFSIZE];
-		char childbuf[BUFSIZE];
-	} *page;
-	pid_t pid;
-	char c;
-
-	printf("1..1\n");
-
-	page = mmap(NULL, sizeof(struct shared_page), PROT_READ | PROT_WRITE,
-		    MAP_ANON | MAP_SHARED, -1, 0);
-	if (page == MAP_FAILED) {
-		printf("fail 1 - mmap\n");
-		exit(1);
-	}
-
-	arc4random_buf(&c, 1);
-
-	pid = fork();
-	ATF_REQUIRE(0 <= pid);
-	if (pid == 0) {
-		/* child */
-		arc4random_buf(page->childbuf, BUFSIZE);
-		exit(0);
-	} else {
-		/* parent */
-		int status;
-		arc4random_buf(page->parentbuf, BUFSIZE);
-		wait(&status);
-	}
-	ATF_CHECK_MSG(memcmp(page->parentbuf, page->childbuf, BUFSIZE) != 0,
-	    "sequences are the same");
-}
-
-ATF_TP_ADD_TCS(tp)
-{
-
-	ATF_TP_ADD_TC(tp, test_arc4random);
-
-	return (atf_no_error());
-}
diff --git a/lib/libc_bsd/tests/gen/execve/Makefile b/lib/libc_bsd/tests/gen/execve/Makefile
deleted file mode 100644
index 65429d2..0000000
--- a/lib/libc_bsd/tests/gen/execve/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/gen/execve/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-OBJTOP=		${.OBJDIR:H:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H:H}
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/gen/${.CURDIR:T}
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/gen/execve
-
-NETBSD_ATF_TESTS_C=	execve_test
-
-.include "../../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/gen/fpclassify2_test.c b/lib/libc_bsd/tests/gen/fpclassify2_test.c
deleted file mode 100644
index b358379..0000000
--- a/lib/libc_bsd/tests/gen/fpclassify2_test.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 2003 Mike Barcroft <mike@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.
- *
- * 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: releng/10.2/lib/libc/tests/gen/fpclassify2_test.c 277441 2015-01-20 21:42:40Z ngie $
- */
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <atf-c.h>
-
-ATF_TC_WITHOUT_HEAD(test_fpclassify);
-ATF_TC_BODY(test_fpclassify, tc)
-{
-
-	ATF_CHECK(fpclassify((float)0) == FP_ZERO);
-	ATF_CHECK(fpclassify((float)-0.0) == FP_ZERO);
-	ATF_CHECK(fpclassify((float)1) == FP_NORMAL);
-	ATF_CHECK(fpclassify((float)1000) == FP_NORMAL);
-	ATF_CHECK(fpclassify(HUGE_VALF) == FP_INFINITE);
-	ATF_CHECK(fpclassify((float)HUGE_VAL) == FP_INFINITE);
-	ATF_CHECK(fpclassify((float)HUGE_VALL) == FP_INFINITE);
-	ATF_CHECK(fpclassify(NAN) == FP_NAN);
-
-	ATF_CHECK(fpclassify((double)0) == FP_ZERO);
-	ATF_CHECK(fpclassify((double)-0) == FP_ZERO);
-	ATF_CHECK(fpclassify((double)1) == FP_NORMAL);
-	ATF_CHECK(fpclassify((double)1000) == FP_NORMAL);
-	ATF_CHECK(fpclassify(HUGE_VAL) == FP_INFINITE);
-	ATF_CHECK(fpclassify((double)HUGE_VALF) == FP_INFINITE);
-	ATF_CHECK(fpclassify((double)HUGE_VALL) == FP_INFINITE);
-	ATF_CHECK(fpclassify((double)NAN) == FP_NAN);
-
-	ATF_CHECK(fpclassify((long double)0) == FP_ZERO);
-	ATF_CHECK(fpclassify((long double)-0.0) == FP_ZERO);
-	ATF_CHECK(fpclassify((long double)1) == FP_NORMAL);
-	ATF_CHECK(fpclassify((long double)1000) == FP_NORMAL);
-	ATF_CHECK(fpclassify(HUGE_VALL) == FP_INFINITE);
-	ATF_CHECK(fpclassify((long double)HUGE_VALF) == FP_INFINITE);
-	ATF_CHECK(fpclassify((long double)HUGE_VAL) == FP_INFINITE);
-	ATF_CHECK(fpclassify((long double)NAN) == FP_NAN);
-}
-
-ATF_TP_ADD_TCS(tp)
-{
-
-	ATF_TP_ADD_TC(tp, test_fpclassify);
-
-	return (atf_no_error());
-}
diff --git a/lib/libc_bsd/tests/gen/posix_spawn/Makefile b/lib/libc_bsd/tests/gen/posix_spawn/Makefile
deleted file mode 100644
index 5a7d978..0000000
--- a/lib/libc_bsd/tests/gen/posix_spawn/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/gen/posix_spawn/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-OBJTOP=		${.OBJDIR:H:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H:H}
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/gen/${.CURDIR:T}
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/gen/posix_spawn
-
-BINDIR=		${TESTSDIR}
-
-# TODO: t_spawnattr (fix from pho@ needs additional review)
-NETBSD_ATF_TESTS_C=	fileactions_test
-NETBSD_ATF_TESTS_C+=	spawn_test
-
-PROGS=		h_fileactions
-PROGS+=		h_spawn
-PROGS+=		h_spawnattr
-
-SCRIPTS=	h_nonexec
-SCRIPTS+=	h_zero
-
-.include "../../Makefile.netbsd-tests"
-
-h_zero:
-	dd if=/dev/zero of=h_zero bs=1k count=2
-	chmod a+x h_zero
-
-CLEANFILES+=	h_zero
-
-WARNS?=3
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/hash/Makefile b/lib/libc_bsd/tests/hash/Makefile
deleted file mode 100644
index 2797c5d..0000000
--- a/lib/libc_bsd/tests/hash/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/hash/Makefile 277442 2015-01-20 21:46:04Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/hash
-
-NETBSD_ATF_TESTS_C=
-
-.if ${MK_OPENSSL} != "no"
-NETBSD_ATF_TESTS_C+=	sha2_test
-.endif
-
-NETBSD_ATF_TESTS_SH=	hash_test
-
-BINDIR=		${TESTSDIR}
-
-PROGS+=		h_hash
-
-FILESDIR=	${TESTSDIR}/data
-
-FILES+=		data/md5test-in
-FILES+=		data/md5test-out
-FILES+=		data/sha1test-in
-FILES+=		data/sha1test-out
-FILES+=		data/sha1test2-out
-
-DPADD+=		${LIBMD}
-LDADD+=		-lmd
-DPADD.sha2_test+=	${LIBCRYPTO}
-LDADD.sha2_test+=	-lcrypto
-
-CFLAGS.sha2_test+=	-I${.CURDIR}/../../../../crypto/openssh/openbsd-compat
-CFLAGS.sha2_test+=	-I${.CURDIR}/../../../../crypto/openssh
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/inet/Makefile b/lib/libc_bsd/tests/inet/Makefile
deleted file mode 100644
index 4081241..0000000
--- a/lib/libc_bsd/tests/inet/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/inet/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/inet
-
-NETBSD_ATF_TESTS_C=	inet_network_test
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/locale/Makefile b/lib/libc_bsd/tests/locale/Makefile
deleted file mode 100644
index e854d13..0000000
--- a/lib/libc_bsd/tests/locale/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/locale/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/locale
-
-NETBSD_ATF_TESTS_C=	io_test
-NETBSD_ATF_TESTS_C+=	mbrtowc_test
-NETBSD_ATF_TESTS_C+=	mbstowcs_test
-NETBSD_ATF_TESTS_C+=	mbsnrtowcs_test
-NETBSD_ATF_TESTS_C+=	mbtowc_test
-NETBSD_ATF_TESTS_C+=	wcscspn_test
-NETBSD_ATF_TESTS_C+=	wcspbrk_test
-NETBSD_ATF_TESTS_C+=	wcsspn_test
-NETBSD_ATF_TESTS_C+=	wcstod_test
-NETBSD_ATF_TESTS_C+=	wctomb_test
-
-CFLAGS.t_wctomb.c+= -Wno-stack-protector
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/net/Makefile b/lib/libc_bsd/tests/net/Makefile
deleted file mode 100644
index 63c1cd4..0000000
--- a/lib/libc_bsd/tests/net/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/net/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/net
-
-BINDIR=		${TESTSDIR}
-
-NETBSD_ATF_TESTS_C=	getprotoent_test
-NETBSD_ATF_TESTS_C+=	ether_aton_test
-
-SRCS.t_ether_aton=	aton_ether_subr.c t_ether_aton.c
-
-aton_ether_subr.c: gen_ether_subr ${.CURDIR:H:H:H:H}/sys/net/if_ethersubr.c
-	${HOST_SH} ${.ALLSRC} ${.TARGET}
-
-# TODO: hostent_test
-NETBSD_ATF_TESTS_SH=	nsdispatch_test
-NETBSD_ATF_TESTS_SH+=	protoent_test
-NETBSD_ATF_TESTS_SH+=	servent_test
-
-PROGS=		h_nsd_recurse
-PROGS+=		h_protoent
-PROGS+=		h_servent
-PROGS+=		h_dns_server
-
-DPADD.h_nsd_recurse+=	${LIBPTHREAD}
-LDADD.h_nsd_recurse+=	-lpthread
-
-CLEANFILES+=	aton_ether_subr.c
-
-.include "../Makefile.netbsd-tests"
-
-# TODO: the testcases needs to be ported to FreeBSD
-#TESTS_SUBDIRS=	getaddrinfo
-FILES=	hosts
-FILES+=	resolv.conf
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/net/getaddrinfo/Makefile b/lib/libc_bsd/tests/net/getaddrinfo/Makefile
deleted file mode 100644
index e05dc81..0000000
--- a/lib/libc_bsd/tests/net/getaddrinfo/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/net/getaddrinfo/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-OBJTOP=		${.OBJDIR:H:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H:H}
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T}
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/net/getaddrinfo
-
-BINDIR=		${TESTSDIR}
-
-.error "This testcase needs to be ported to FreeBSD (the output from getaddrinfo_test differs from NetBSD)"
-
-NETBSD_ATF_TESTS_SH=	getaddrinfo_test
-
-PROGS=		h_gai
-
-FILESDIR=	${TESTSDIR}/data
-
-FILES=		basics_v4.exp	basics_v4v6.exp
-FILES+=		no_host_v4.exp	no_host_v4v6.exp
-FILES+=		no_serv_v4.exp	no_serv_v4v6.exp
-FILES+=		sock_raw_v4.exp	sock_raw_v4v6.exp
-FILES+=		spec_fam_v4.exp	spec_fam_v4v6.exp
-FILES+=		scoped.exp
-FILES+=		unsup_fam.exp
-
-.include "../../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/regex/Makefile b/lib/libc_bsd/tests/regex/Makefile
deleted file mode 100644
index a2abc8d..0000000
--- a/lib/libc_bsd/tests/regex/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/regex/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-BINDIR=		${TESTSDIR}
-
-TESTSDIR=	${TESTSBASE}/lib/libc/regex
-
-IMPLEMENTATION?=      -DREGEX_SPENCER
-
-CFLAGS.h_regex+=-I${TESTSRC} -I${.CURDIR:H:H}/regex
-PROGS+=		h_regex
-SRCS.h_regex=	main.c split.c debug.c
-
-NETBSD_ATF_TESTS_SH=	regex_test
-
-FILESDIR=	${TESTSDIR}/data
-FILES+=		README
-FILES+=		data/anchor.in
-FILES+=		data/backref.in
-FILES+=		data/basic.in
-FILES+=		data/bracket.in
-FILES+=		data/c_comments.in
-FILES+=		data/complex.in
-FILES+=		data/error.in
-FILES+=		data/meta.in
-FILES+=		data/nospec.in
-FILES+=		data/paren.in
-FILES+=		data/regress.in
-FILES+=		data/repet_bounded.in
-FILES+=		data/repet_multi.in
-FILES+=		data/repet_ordinary.in
-FILES+=		data/startend.in
-FILES+=		data/subexp.in
-FILES+=		data/subtle.in
-FILES+=		data/word_bound.in
-FILES+=		data/zero.in
-#FILES+=		data/att/README
-FILES+=		data/att/basic.dat
-FILES+=		data/att/categorization.dat
-FILES+=		data/att/forcedassoc.dat
-FILES+=		data/att/leftassoc.dat
-FILES+=		data/att/nullsubexpr.dat
-FILES+=		data/att/repetition.dat
-FILES+=		data/att/rightassoc.dat
-
-NETBSD_ATF_TESTS_C=	exhaust_test
-NETBSD_ATF_TESTS_C+=	regex_att_test
-
-.for t in ${NETBSD_ATF_TESTS_C}
-CFLAGS.$t+=	-I${TESTSRC} ${IMPLEMENTATION}
-.endfor
-
-.include "../Makefile.netbsd-tests"
-
-DPADD.regex_att_test+=	${LIBUTIL}
-LDADD.regex_att_test+=	-lutil
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/rpc/Makefile b/lib/libc_bsd/tests/rpc/Makefile
deleted file mode 100644
index 04fddbf..0000000
--- a/lib/libc_bsd/tests/rpc/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/rpc/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-TESTSDIR=		${TESTSBASE}/lib/libc/rpc
-SRCS.xdr_test=		${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h}
-
-NETBSD_ATF_TESTS_C=	rpc_test
-NETBSD_ATF_TESTS_C+=	xdr_test
-
-RPCSRC=			h_testbits.x
-RPCGEN=			RPCGEN_CPP=${CPP:Q} rpcgen -L -C
-
-h_testbits.h: ${RPCSRC}
-	${RPCGEN} -h -o ${.TARGET} ${.ALLSRC}
-
-h_testbits_xdr.c: ${RPCSRC} h_testbits.h
-	${RPCGEN} ${.ALLSRC:M*.x}
-
-CLEANFILES+=	${RPCSRC:.x=.h} ${RPCSRC:.x=.c} h_testbits_xdr.c
-CFLAGS+=	-I${.OBJDIR}
-DPSRCS+=	h_testbits.h
-
-LDADD+=		-lrpcsvc -lutil
-DPADD+=		${LIBRPCSVC} ${LIBUTIL}
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/setjmp/Makefile b/lib/libc_bsd/tests/setjmp/Makefile
deleted file mode 100644
index e721aa9..0000000
--- a/lib/libc_bsd/tests/setjmp/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/setjmp/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-TESTSDIR=	${TESTSBASE}/lib/libc/setjmp
-
-NETBSD_ATF_TESTS_C=	t_setjmp
-NETBSD_ATF_TESTS_C+=	t_threadjmp
-
-DPADD.t_threadjmp+= ${LIBPTHREAD}
-LDADD.t_threadjmp+= -lpthread
-
-WARNS?=	4
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/ssp/Makefile b/lib/libc_bsd/tests/ssp/Makefile
deleted file mode 100644
index 38e6098..0000000
--- a/lib/libc_bsd/tests/ssp/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/ssp/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/ssp
-
-NO_WERROR=
-WARNS?=	2
-
-CFLAGS.h_raw+=	-fstack-protector-all -Wstack-protector
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS.h_raw+=	-fsanitize=bounds
-.elif ${COMPILER_TYPE} == "gcc"
-CFLAGS.h_raw+=	--param ssp-buffer-size=1
-DPADD+=		${LIBSSP}
-LDADD+=		-lssp
-.endif
-
-NETBSD_ATF_TESTS_SH=	ssp_test
-
-BINDIR=		${TESTSDIR}
-
-PROGS=		h_fgets
-PROGS+=		h_gets
-PROGS+=		h_getcwd
-PROGS+=		h_memcpy
-PROGS+=		h_memmove
-PROGS+=		h_memset
-PROGS+=		h_raw
-PROGS+=		h_read
-PROGS+=		h_readlink
-PROGS+=		h_snprintf
-PROGS+=		h_sprintf
-PROGS+=		h_stpcpy
-PROGS+=		h_stpncpy
-PROGS+=		h_strcat
-PROGS+=		h_strcpy
-PROGS+=		h_strncat
-PROGS+=		h_strncpy
-PROGS+=		h_vsnprintf
-PROGS+=		h_vsprintf
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/stdio/Makefile b/lib/libc_bsd/tests/stdio/Makefile
deleted file mode 100644
index 776888e..0000000
--- a/lib/libc_bsd/tests/stdio/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/stdio/Makefile 277446 2015-01-20 21:59:48Z ngie $
-
-TESTSDIR=	${TESTSBASE}/lib/libc/stdio
-
-ATF_TESTS_C=		fmemopen2_test
-
-NETBSD_ATF_TESTS_C=	clearerr_test
-NETBSD_ATF_TESTS_C+=	fflush_test
-NETBSD_ATF_TESTS_C+=	fmemopen_test
-NETBSD_ATF_TESTS_C+=	fopen_test
-NETBSD_ATF_TESTS_C+=	fputc_test
-NETBSD_ATF_TESTS_C+=	mktemp_test
-NETBSD_ATF_TESTS_C+=	popen_test
-NETBSD_ATF_TESTS_C+=	printf_test
-NETBSD_ATF_TESTS_C+=	scanf_test
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/stdio/fmemopen2_test.c b/lib/libc_bsd/tests/stdio/fmemopen2_test.c
deleted file mode 100644
index e46f05c..0000000
--- a/lib/libc_bsd/tests/stdio/fmemopen2_test.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*-
-Copyright (C) 2013 Pietro Cerutti <gahr@FreeBSD.org>
-
-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.
-
-THIS SOFTWARE IS PROVIDED BY 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 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.
-*/
-
-/*
- * Test basic FILE * functions (fread, fwrite, fseek, fclose) against
- * a FILE * retrieved using fmemopen()
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/tests/stdio/fmemopen2_test.c 277446 2015-01-20 21:59:48Z ngie $");
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <strings.h>
-#include <atf-c.h>
-
-ATF_TC_WITHOUT_HEAD(test_preexisting);
-ATF_TC_BODY(test_preexisting, tc)
-{
-	/* 
-	 * Use a pre-existing buffer.
-	 */
-
-	char buf[512];
-	char buf2[512];
-	char str[]  = "Test writing some stuff";
-	char str2[] = "AAAAAAAAA";
-	char str3[] = "AAAA writing some stuff";
-	FILE *fp;
-	size_t nofw, nofr;
-	int rc;
-
-	/* Open a FILE * using fmemopen. */
-	fp = fmemopen(buf, sizeof(buf), "w");
-	ATF_REQUIRE(fp != NULL);
-
-	/* Write to the buffer. */
-	nofw = fwrite(str, 1, sizeof(str), fp);
-	ATF_REQUIRE(nofw == sizeof(str));
-
-	/* Close the FILE *. */
-	rc = fclose(fp);
-	ATF_REQUIRE(rc == 0);
-
-	/* Re-open the FILE * to read back the data. */
-	fp = fmemopen(buf, sizeof(buf), "r");
-	ATF_REQUIRE(fp != NULL);
-
-	/* Read from the buffer. */
-	bzero(buf2, sizeof(buf2));
-	nofr = fread(buf2, 1, sizeof(buf2), fp);
-	ATF_REQUIRE(nofr == sizeof(buf2));
-
-	/* 
-	 * Since a write on a FILE * retrieved by fmemopen
-	 * will add a '\0' (if there's space), we can check
-	 * the strings for equality.
-	 */
-	ATF_REQUIRE(strcmp(str, buf2) == 0);
-
-	/* Close the FILE *. */
-	rc = fclose(fp);
-	ATF_REQUIRE(rc == 0);
-
-	/* Now open a FILE * on the first 4 bytes of the string. */
-	fp = fmemopen(str, 4, "w");
-	ATF_REQUIRE(fp != NULL);
-
-	/*
-	 * Try to write more bytes than we shoud, we'll get a short count (4).
-	 */
-	nofw = fwrite(str2, 1, sizeof(str2), fp);
-	ATF_REQUIRE(nofw == 4);
-
-	/* Close the FILE *. */
-	rc = fclose(fp);
-
-	/* Check that the string was not modified after the first 4 bytes. */
-	ATF_REQUIRE(strcmp(str, str3) == 0);
-}
-
-ATF_TC_WITHOUT_HEAD(test_autoalloc);
-ATF_TC_BODY(test_autoalloc, tc)
-{
-	/* 
-	 * Let fmemopen allocate the buffer.
-	 */
-
-	char str[] = "A quick test";
-	FILE *fp;
-	long pos;
-	size_t nofw, nofr, i;
-	int rc;
-
-	/* Open a FILE * using fmemopen. */
-	fp = fmemopen(NULL, 512, "w+");
-	ATF_REQUIRE(fp != NULL);
-
-	/* fill the buffer */
-	for (i = 0; i < 512; i++) {
-		nofw = fwrite("a", 1, 1, fp);
-		ATF_REQUIRE(nofw == 1);
-	}
-
-	/* Get the current position into the stream. */
-	pos = ftell(fp);
-	ATF_REQUIRE(pos == 512);
-
-	/* 
-	 * Try to write past the end, we should get a short object count (0)
-	 */
-	nofw = fwrite("a", 1, 1, fp);
-	ATF_REQUIRE(nofw == 0);
-
-	/* Close the FILE *. */
-	rc = fclose(fp);
-	ATF_REQUIRE(rc == 0);
-
-	/* Open a FILE * using a wrong mode */
-	fp = fmemopen(NULL, 512, "r");
-	ATF_REQUIRE(fp == NULL);
-
-	fp = fmemopen(NULL, 512, "w");
-	ATF_REQUIRE(fp == NULL);
-}
-
-ATF_TC_WITHOUT_HEAD(test_data_length);
-ATF_TC_BODY(test_data_length, tc)
-{
-	/*
-	 * Here we test that a read operation doesn't go past the end of the
-	 * data actually written, and that a SEEK_END seeks from the end of the
-	 * data, not of the whole buffer.
-	 */
-	FILE *fp;
-	char buf[512] = {'\0'};
-	char str[]  = "Test data length. ";
-	char str2[] = "Do we have two sentences?";
-	char str3[sizeof(str) + sizeof(str2) -1];
-	long pos;
-	size_t nofw, nofr;
-	int rc;
-
-	/* Open a FILE * for updating our buffer. */
-	fp = fmemopen(buf, sizeof(buf), "w+");
-	ATF_REQUIRE(fp != NULL);
-
-	/* Write our string into the buffer. */
-	nofw = fwrite(str, 1, sizeof(str), fp);
-	ATF_REQUIRE(nofw == sizeof(str));
-
-	/* 
-	 * Now seek to the end and check that ftell
-	 * gives us sizeof(str).
-	 */
-	rc = fseek(fp, 0, SEEK_END);
-	ATF_REQUIRE(rc == 0);
-	pos = ftell(fp);
-	ATF_REQUIRE(pos == sizeof(str));
-
-	/* Close the FILE *. */
-	rc = fclose(fp);
-	ATF_REQUIRE(rc == 0);
-
-	/* Reopen the buffer for appending. */
-	fp = fmemopen(buf, sizeof(buf), "a+");
-	ATF_REQUIRE(fp != NULL);
-
-	/* We should now be writing after the first string. */
-	nofw = fwrite(str2, 1, sizeof(str2), fp);
-	ATF_REQUIRE(nofw == sizeof(str2));
-
-	/* Rewind the FILE *. */
-	rc = fseek(fp, 0, SEEK_SET);
-	ATF_REQUIRE(rc == 0);
-
-	/* Make sure we're at the beginning. */
-	pos = ftell(fp);
-	ATF_REQUIRE(pos == 0);
-
-	/* Read the whole buffer. */
-	nofr = fread(str3, 1, sizeof(buf), fp);
-	ATF_REQUIRE(nofr == sizeof(str3));
-
-	/* Make sure the two strings are there. */
-	ATF_REQUIRE(strncmp(str3, str, sizeof(str) - 1) == 0);
-	ATF_REQUIRE(strncmp(str3 + sizeof(str) - 1, str2, sizeof(str2)) == 0);
-
-	/* Close the FILE *. */
-	rc = fclose(fp);
-	ATF_REQUIRE(rc == 0);
-}
-
-ATF_TC_WITHOUT_HEAD(test_binary);
-ATF_TC_BODY(test_binary, tc)
-{
-	/*
-	 * Make sure that NULL bytes are never appended when opening a buffer
-	 * in binary mode.
-	 */
-
-	FILE *fp;
-	char buf[20];
-	char str[] = "Test";
-	size_t nofw;
-	int rc, i;
-
-	/* Pre-fill the buffer. */
-	memset(buf, 'A', sizeof(buf));
-
-	/* Open a FILE * in binary mode. */
-	fp = fmemopen(buf, sizeof(buf), "w+b");
-	ATF_REQUIRE(fp != NULL);
-
-	/* Write some data into it. */
-	nofw = fwrite(str, 1, strlen(str), fp);
-	ATF_REQUIRE(nofw == strlen(str));
-
-	/* Make sure that the buffer doesn't contain any NULL bytes. */
-	for (i = 0; i < sizeof(buf); i++)
-		ATF_REQUIRE(buf[i] != '\0');
-
-	/* Close the FILE *. */
-	rc = fclose(fp);
-	ATF_REQUIRE(rc == 0);
-}
-
-ATF_TC_WITHOUT_HEAD(test_append_binary_pos);
-ATF_TC_BODY(test_append_binary_pos, tc)
-{
-	/*
-	 * For compatibility with other implementations (glibc), we set the
-	 * position to 0 when opening an automatically allocated binary stream
-	 * for appending.
-	 */
-
-	FILE *fp;
-
-	fp = fmemopen(NULL, 16, "ab+");
-	ATF_REQUIRE(ftell(fp) == 0L);
-	fclose(fp);
-
-	/*
-	 * Make sure that a pre-allocated buffer behaves correctly.
-	 */
-	char buf[] = "Hello";
-	fp = fmemopen(buf, sizeof(buf), "ab+");
-	ATF_REQUIRE(ftell(fp) == strlen(buf));
-	fclose(fp);
-}
-
-ATF_TC_WITHOUT_HEAD(test_size_0);
-ATF_TC_BODY(test_size_0, tc)
-{
-	/*
-	 * POSIX mandates that we return EINVAL if size is 0.
-	 */
-
-	FILE *fp;
-
-	fp = fmemopen(NULL, 0, "r+");
-	ATF_REQUIRE(fp == NULL);
-	ATF_REQUIRE(errno == EINVAL);
-}
-
-ATF_TP_ADD_TCS(tp)
-{
-
-	ATF_TP_ADD_TC(tp, test_autoalloc);
-	ATF_TP_ADD_TC(tp, test_preexisting);
-	ATF_TP_ADD_TC(tp, test_data_length);
-	ATF_TP_ADD_TC(tp, test_binary);
-	ATF_TP_ADD_TC(tp, test_append_binary_pos);
-	ATF_TP_ADD_TC(tp, test_size_0);
-
-	return (atf_no_error());
-}
diff --git a/lib/libc_bsd/tests/stdlib/Makefile b/lib/libc_bsd/tests/stdlib/Makefile
deleted file mode 100644
index d62f6eb..0000000
--- a/lib/libc_bsd/tests/stdlib/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/stdlib/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/stdlib
-
-# TODO: t_getenv_thread, t_mi_vector_hash
-NETBSD_ATF_TESTS_C=	abs_test
-NETBSD_ATF_TESTS_C+=	atoi_test
-NETBSD_ATF_TESTS_C+=	div_test
-NETBSD_ATF_TESTS_C+=	getenv_test
-NETBSD_ATF_TESTS_C+=	exit_test
-NETBSD_ATF_TESTS_C+=	hsearch_test
-NETBSD_ATF_TESTS_C+=	posix_memalign_test
-NETBSD_ATF_TESTS_C+=	random_test
-NETBSD_ATF_TESTS_C+=	strtod_test
-NETBSD_ATF_TESTS_C+=	strtol_test
-NETBSD_ATF_TESTS_C+=	system_test
-
-# TODO: need to come up with a correct explanation of what the patch pho does
-# with h_atexit
-#ATF_TESTS_SH=	atexit_test
-NETBSD_ATF_TESTS_SH=	getopt_test
-
-.include "../Makefile.netbsd-tests"
-
-BINDIR=		${TESTSDIR}
-
-# TODO: see comment above
-#PROGS+=		h_atexit
-PROGS+=		h_getopt h_getopt_long
-
-.for t in h_getopt h_getopt_long
-CFLAGS.$t+=	-I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests
-LDFLAGS.$t+=	-L${LIBNETBSD_OBJDIR}
-
-DPADD.$t+=	${LIBNETBSD} ${LIBUTIL}
-LDADD.$t+=	-lnetbsd -lutil
-.endfor
-
-DPADD.strtod_test+=		${LIBM}
-LDADD.strtod_test+=		-lm
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/string/Makefile b/lib/libc_bsd/tests/string/Makefile
deleted file mode 100644
index fa63661..0000000
--- a/lib/libc_bsd/tests/string/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/string/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/string
-
-# TODO: popcount, stresep
-
-NETBSD_ATF_TESTS_C+=	memchr
-NETBSD_ATF_TESTS_C+=	memcpy
-NETBSD_ATF_TESTS_C+=	memmem
-NETBSD_ATF_TESTS_C+=	memset
-NETBSD_ATF_TESTS_C+=	strcat
-NETBSD_ATF_TESTS_C+=	strchr
-NETBSD_ATF_TESTS_C+=	strcmp
-NETBSD_ATF_TESTS_C+=	strcpy
-NETBSD_ATF_TESTS_C+=	strcspn
-NETBSD_ATF_TESTS_C+=	strerror
-NETBSD_ATF_TESTS_C+=	strlen
-NETBSD_ATF_TESTS_C+=	strpbrk
-NETBSD_ATF_TESTS_C+=	strrchr
-NETBSD_ATF_TESTS_C+=	strspn
-NETBSD_ATF_TESTS_C+=	swab
-
-.include "../Makefile.netbsd-tests"
-
-LDADD.memchr+=	-lmd
-DPADD.memchr+=	${LIBMD}
-
-LDADD.memcpy+=	-lmd
-DPADD.memcpy+=	${LIBMD}
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/sys/Makefile b/lib/libc_bsd/tests/sys/Makefile
deleted file mode 100644
index a9b703a..0000000
--- a/lib/libc_bsd/tests/sys/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/sys/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=		${TESTSBASE}/lib/libc/sys
-
-# TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg,
-# swapcontext
-NETBSD_ATF_TESTS_C+=		access_test
-NETBSD_ATF_TESTS_C+=		chroot_test
-NETBSD_ATF_TESTS_C+=		clock_gettime_test
-NETBSD_ATF_TESTS_C+=		connect_test
-NETBSD_ATF_TESTS_C+=		dup_test
-NETBSD_ATF_TESTS_C+=		fsync_test
-NETBSD_ATF_TESTS_C+=		getcontext_test
-NETBSD_ATF_TESTS_C+=		getgroups_test
-NETBSD_ATF_TESTS_C+=		getitimer_test
-NETBSD_ATF_TESTS_C+=		getlogin_test
-NETBSD_ATF_TESTS_C+=		getpid_test
-NETBSD_ATF_TESTS_C+=		getrusage_test
-NETBSD_ATF_TESTS_C+=		getsid_test
-NETBSD_ATF_TESTS_C+=		gettimeofday_test
-NETBSD_ATF_TESTS_C+=		issetugid_test
-NETBSD_ATF_TESTS_C+=		kevent_test
-NETBSD_ATF_TESTS_C+=		kill_test
-NETBSD_ATF_TESTS_C+=		link_test
-NETBSD_ATF_TESTS_C+=		listen_test
-NETBSD_ATF_TESTS_C+=		mincore_test
-NETBSD_ATF_TESTS_C+=		mkdir_test
-NETBSD_ATF_TESTS_C+=		mkfifo_test
-NETBSD_ATF_TESTS_C+=		mknod_test
-NETBSD_ATF_TESTS_C+=		mlock_test
-NETBSD_ATF_TESTS_C+=		mmap_test
-NETBSD_ATF_TESTS_C+=		mprotect_test
-NETBSD_ATF_TESTS_C+=		msgctl_test
-NETBSD_ATF_TESTS_C+=		msgget_test
-NETBSD_ATF_TESTS_C+=		msgrcv_test
-NETBSD_ATF_TESTS_C+=		msgsnd_test
-NETBSD_ATF_TESTS_C+=		msync_test
-NETBSD_ATF_TESTS_C+=		nanosleep_test
-NETBSD_ATF_TESTS_C+=		pipe_test
-NETBSD_ATF_TESTS_C+=		pipe2_test
-NETBSD_ATF_TESTS_C+=		poll_test
-NETBSD_ATF_TESTS_C+=		revoke_test
-NETBSD_ATF_TESTS_C+=		select_test
-NETBSD_ATF_TESTS_C+=		setrlimit_test
-NETBSD_ATF_TESTS_C+=		setuid_test
-NETBSD_ATF_TESTS_C+=		sigaction_test
-NETBSD_ATF_TESTS_C+=		sigqueue_test
-NETBSD_ATF_TESTS_C+=		sigtimedwait_test
-NETBSD_ATF_TESTS_C+=		socketpair_test
-NETBSD_ATF_TESTS_C+=		stat_test
-NETBSD_ATF_TESTS_C+=		timer_create_test
-NETBSD_ATF_TESTS_C+=		truncate_test
-NETBSD_ATF_TESTS_C+=		ucontext_test
-NETBSD_ATF_TESTS_C+=		umask_test
-NETBSD_ATF_TESTS_C+=		unlink_test
-NETBSD_ATF_TESTS_C+=		write_test
-
-DPADD.getpid_test+=	${LIBPTHREAD}
-LDADD.getpid_test+=	-lpthread
-DPADD.timer_create_test+=	${LIBRT}
-LDADD.timer_create_test+=	-lrt
-
-.include "../Makefile.netbsd-tests"
-
-.if ${COMPILER_TYPE} == "gcc"
-WARNS?=			3
-.else
-WARNS?=			4
-.endif
-
-FILESGROUPS=		FILES truncate_test_FILES
-
-truncate_test_FILES=	truncate_test.root_owned
-truncate_test_FILESDIR=	${TESTSDIR}
-truncate_test_FILESMODE= 0600
-truncate_test_FILESOWNER= root
-truncate_test_FILESGRP= wheel
-
-CLEANFILES=	truncate_test.root_owned
-truncate_test.root_owned:
-	dd if=/dev/null bs=1 count=1 of=${.TARGET}
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/termios/Makefile b/lib/libc_bsd/tests/termios/Makefile
deleted file mode 100644
index ee116c8..0000000
--- a/lib/libc_bsd/tests/termios/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/termios/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/termios
-
-NETBSD_ATF_TESTS_C=	tcsetpgrp_test
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/time/Makefile b/lib/libc_bsd/tests/time/Makefile
deleted file mode 100644
index afbe357..0000000
--- a/lib/libc_bsd/tests/time/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/time/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/time
-
-NETBSD_ATF_TESTS_C=	mktime_test
-NETBSD_ATF_TESTS_C+=	strptime_test
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/tls/Makefile b/lib/libc_bsd/tests/tls/Makefile
deleted file mode 100644
index ef657d2..0000000
--- a/lib/libc_bsd/tests/tls/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/tls/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/tls
-.if !defined(NO_PIC)
-SUBDIR+=	dso
-.endif
-
-# TODO: doesn't link properly (for some odd reason it's trying to link in
-#       libatf.so)
-#NETBSD_ATF_TESTS_C=	tls_static_test
-.if !defined(NO_PIC)
-NETBSD_ATF_TESTS_C+=	tls_dlopen_test
-NETBSD_ATF_TESTS_C+=	tls_dynamic_test
-.endif
-
-.include "../Makefile.netbsd-tests"
-
-DSODIR=		${.OBJDIR}/../tls_dso
-
-DPADD.tls_static_test+=		${LIBPTHREAD}
-LDADD.tls_static_test+=		-lpthread
-LDFLAGS.tls_static_test+=	-static
-SRCS.tls_static_test=		t_tls_static.c t_tls_static_helper.c
-
-DPADD.tls_dynamic_test+=	${LIBPTHREAD} ${DSODIR}/libh_tls_dynamic.so
-LDADD.tls_dynamic_test+=	-lpthread -lh_tls_dynamic
-LDFLAGS.tls_dynamic_test+=	-Wl,-rpath,${TESTSDIR} -L${DSODIR}
-
-DPADD.tls_dlopen_test+=		${LIBPTHREAD}
-LDADD.tls_dlopen_test+=		-lpthread
-LDFLAGS.tls_dlopen_test+=	-Wl,-rpath,${TESTSDIR} -Wl,-export-dynamic
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/tests/tls/dso/Makefile b/lib/libc_bsd/tests/tls/dso/Makefile
deleted file mode 100644
index 4dfdc77..0000000
--- a/lib/libc_bsd/tests/tls/dso/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/tls/dso/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-OBJTOP=		${.OBJDIR:H:H:H:H:H}
-SRCTOP=		${.CURDIR:H:H:H:H:H}
-TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T}
-
-LIB=		h_tls_dlopen
-SHLIB_NAME=	h_tls_dlopen.so
-SRCS=		h_tls_dlopen.c
-
-MAN=
-
-LIBDIR=		${TESTSBASE}/lib/libc/tls
-SHLIB_MAJOR=	1
-
-.include "../../Makefile.netbsd-tests"
-
-.include <bsd.lib.mk>
diff --git a/lib/libc_bsd/tests/tls_dso/Makefile b/lib/libc_bsd/tests/tls_dso/Makefile
deleted file mode 100644
index 9878c83..0000000
--- a/lib/libc_bsd/tests/tls_dso/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/tls_dso/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-LIB=		h_tls_dynamic
-SRCS=		h_tls_dynamic.c
-
-LIBDIR=		${TESTSBASE}/lib/libc/tls
-SHLIBDIR=	${TESTSBASE}/lib/libc/tls
-SHLIB_MAJOR=	1
-
-WITHOUT_STATIC=
-WITHOUT_PROFILE=
-WITHOUT_PIC=
-
-MAN=
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.lib.mk>
diff --git a/lib/libc_bsd/tests/ttyio/Makefile b/lib/libc_bsd/tests/ttyio/Makefile
deleted file mode 100644
index 330dd6b..0000000
--- a/lib/libc_bsd/tests/ttyio/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD: releng/10.2/lib/libc/tests/ttyio/Makefile 274075 2014-11-04 00:56:25Z ngie $
-
-.include <bsd.own.mk>
-
-TESTSDIR=	${TESTSBASE}/lib/libc/ttyio
-
-# TODO: ptm_test
-NETBSD_ATF_TESTS_C=	ttyio_test
-
-DPADD.ttyio_test+=	${LIBUTIL}
-LDADD.ttyio_test+=	-lutil
-
-.include "../Makefile.netbsd-tests"
-
-.include <bsd.test.mk>
diff --git a/lib/libc_bsd/uuid/Makefile.inc b/lib/libc_bsd/uuid/Makefile.inc
deleted file mode 100644
index 79261fe..0000000
--- a/lib/libc_bsd/uuid/Makefile.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Makefile.incl 181743 2008-08-14 22:23:16Z emax $
-
-# DCE 1.1 UUID implementation sources
-
-.PATH: ${.CURDIR}/uuid
-
-SRCS+=	uuid_compare.c uuid_create.c uuid_create_nil.c uuid_equal.c \
-	uuid_from_string.c uuid_hash.c uuid_is_nil.c uuid_stream.c \
-	uuid_to_string.c
-SYM_MAPS+=	${.CURDIR}/uuid/Symbol.map
-
-MAN+=	uuid.3
-MLINKS+=uuid.3 uuid_compare.3
-MLINKS+=uuid.3 uuid_create.3
-MLINKS+=uuid.3 uuid_create_nil.3
-MLINKS+=uuid.3 uuid_equal.3
-MLINKS+=uuid.3 uuid_from_string.3
-MLINKS+=uuid.3 uuid_hash.3
-MLINKS+=uuid.3 uuid_is_nil.3
-MLINKS+=uuid.3 uuid_enc_le.3
-MLINKS+=uuid.3 uuid_dec_le.3
-MLINKS+=uuid.3 uuid_enc_be.3
-MLINKS+=uuid.3 uuid_dec_be.3
-MLINKS+=uuid.3 uuid_to_string.3
diff --git a/lib/libc_bsd/uuid/Symbol.map b/lib/libc_bsd/uuid/Symbol.map
deleted file mode 100644
index 835ceab..0000000
--- a/lib/libc_bsd/uuid/Symbol.map
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/uuid/Symbol.map 183192 2008-09-19 15:52:56Z emax $
- */
-
-FBSD_1.0 {
-	uuid_to_string;
-	uuid_is_nil;
-	uuid_hash;
-	uuid_from_string;
-	uuid_equal;
-	uuid_create_nil;
-	uuid_create;
-	uuid_compare;
-};
-
-FBSD_1.1 {
-	uuid_enc_le;
-	uuid_dec_le;
-	uuid_enc_be;
-	uuid_dec_be;
-};
diff --git a/lib/libc_bsd/uuid/uuid.3 b/lib/libc_bsd/uuid/uuid.3
deleted file mode 100644
index eceea50..0000000
--- a/lib/libc_bsd/uuid/uuid.3
+++ /dev/null
@@ -1,136 +0,0 @@
-.\" Copyright (c) 2002 Marcel Moolenaar
-.\" Copyright (c) 2002 Hiten Mahesh Pandya
-.\" 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.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/lib/libc/uuid/uuid.3 232339 2012-03-01 14:39:01Z ae $
-.\"
-.Dd March 1, 2012
-.Dt UUID 3
-.Os
-.Sh NAME
-.Nm uuid_compare , uuid_create , uuid_create_nil , uuid_equal ,
-.Nm uuid_from_string , uuid_hash , uuid_is_nil , uuid_to_string
-.Nd DCE 1.1 compliant UUID functions
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In uuid.h
-.Ft int32_t
-.Fn uuid_compare "const uuid_t *uuid1" "const uuid_t *uuid2" "uint32_t *status"
-.Ft void
-.Fn uuid_create "uuid_t *uuid" "uint32_t *status"
-.Ft void
-.Fn uuid_create_nil "uuid_t *uuid" "uint32_t *status"
-.Ft int32_t
-.Fn uuid_equal "const uuid_t *uuid1" "const uuid_t *uuid2" "uint32_t *status"
-.Ft void
-.Fn uuid_from_string "const char *str" "uuid_t *uuid" "uint32_t *status"
-.Ft uint16_t
-.Fn uuid_hash "const uuid_t *uuid" "uint32_t *status"
-.Ft int32_t
-.Fn uuid_is_nil "const uuid_t *uuid" "uint32_t *status"
-.Ft void
-.Fn uuid_to_string "const uuid_t *uuid" "char **str" "uint32_t *status"
-.Ft void
-.Fn uuid_enc_le "void *buf" "const uuid_t *uuid"
-.Ft void
-.Fn uuid_dec_le "const void *buf" "uuid_t *"
-.Ft void
-.Fn uuid_enc_be "void *buf" "const uuid_t *uuid"
-.Ft void
-.Fn uuid_dec_be "const void *buf" "uuid_t *"
-.Sh DESCRIPTION
-The family of DCE 1.1 compliant UUID functions allow applications to operate
-on universally unique identifiers, or UUIDs.
-The
-.Fn uuid_create
-and
-.Fn uuid_create_nil
-functions create UUIDs.
-The
-.Fn uuid_compare ,
-.Fn uuid_equal
-and
-.Fn uuid_is_nil
-functions can be used to test UUIDs.
-To convert from the binary representation to the string representation or
-vice versa, use
-.Fn uuid_to_string
-or
-.Fn uuid_from_string
-respectively.
-A 16-bit hash value can be obtained by calling
-.Fn uuid_hash .
-.Pp
-The
-.Fn uuid_to_string
-function set
-.Fa *str
-to be a pointer to a buffer sufficiently large to hold the string.
-This pointer should be passed to
-.Xr free 3
-to release the allocated storage when it is no longer needed.
-.Pp
-The
-.Fn uuid_enc_le
-and
-.Fn uuid_enc_be
-functions encode a binary representation of a UUID into an octet stream
-in little-endian and big-endian byte-order, respectively.
-The destination buffer must be pre-allocated by the caller, and must be
-large enough to hold the 16-octet binary UUID.
-These routines are not part of the DCE RPC API.
-They are provided for convenience.
-.Pp
-The
-.Fn uuid_dec_le
-and
-.Fn uuid_dec_be
-functions decode a UUID from an octet stream in little-endian and
-big-endian byte-order, respectively.
-These routines are not part of the DCE RPC API.
-They are provided for convenience.
-.Sh RETURN VALUES
-The successful or unsuccessful completion of the function is returned in
-the
-.Fa status
-argument.
-Possible values are:
-.Bl -tag -width ".Dv uuid_s_invalid_string_uuid"
-.It Dv uuid_s_ok
-The function completed successfully.
-.It Dv uuid_s_bad_version
-The UUID does not have a known version.
-.It Dv uuid_s_invalid_string_uuid
-The string representation of an UUID is not valid.
-.It Dv uuid_s_no_memory
-The function can not allocate memory to store an UUID representation.
-.El
-.Sh SEE ALSO
-.Xr uuidgen 1 ,
-.Xr uuidgen 2
-.Sh STANDARDS
-The UUID functions conform to the DCE 1.1 RPC specification.
-.Sh BUGS
-This manpage can be improved.
diff --git a/lib/libc_bsd/uuid/uuid_compare.c b/lib/libc_bsd/uuid/uuid_compare.c
deleted file mode 100644
index b80b6e9..0000000
--- a/lib/libc_bsd/uuid/uuid_compare.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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: releng/10.2/lib/libc/uuid/uuid_compare.c 168377 2007-04-05 02:07:33Z delphij $
- */
-
-#include <string.h>
-#include <uuid.h>
-
-/* A macro used to improve the readability of uuid_compare(). */
-#define DIFF_RETURN(a, b, field)	do {			\
-	if ((a)->field != (b)->field)				\
-		return (((a)->field < (b)->field) ? -1 : 1);	\
-} while (0)
-
-/*
- * uuid_compare() - compare two UUIDs.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_compare.htm
- *
- * NOTE: Either UUID can be NULL, meaning a nil UUID. nil UUIDs are smaller
- *	 than any non-nil UUID.
- */
-int32_t
-uuid_compare(const uuid_t *a, const uuid_t *b, uint32_t *status)
-{
-	int	res;
-
-	if (status != NULL)
-		*status = uuid_s_ok;
-
-	/* Deal with NULL or equal pointers. */
-	if (a == b)
-		return (0);
-	if (a == NULL)
-		return ((uuid_is_nil(b, NULL)) ? 0 : -1);
-	if (b == NULL)
-		return ((uuid_is_nil(a, NULL)) ? 0 : 1);
-
-	/* We have to compare the hard way. */
-	DIFF_RETURN(a, b, time_low);
-	DIFF_RETURN(a, b, time_mid);
-	DIFF_RETURN(a, b, time_hi_and_version);
-	DIFF_RETURN(a, b, clock_seq_hi_and_reserved);
-	DIFF_RETURN(a, b, clock_seq_low);
-
-	res = memcmp(a->node, b->node, sizeof(a->node));
-	if (res)
-		return ((res < 0) ? -1 : 1);
-	return (0);
-}
-
-#undef DIFF_RETURN
diff --git a/lib/libc_bsd/uuid/uuid_create.c b/lib/libc_bsd/uuid/uuid_create.c
deleted file mode 100644
index 338dced..0000000
--- a/lib/libc_bsd/uuid/uuid_create.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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: releng/10.2/lib/libc/uuid/uuid_create.c 118670 2003-08-08 19:18:43Z marcel $
- */
-
-#include <uuid.h>
-
-/*
- * uuid_create() - create an UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_create.htm
- */
-void
-uuid_create(uuid_t *u, uint32_t *status)
-{
-
-	if (status)
-		*status = uuid_s_ok;
-
-	uuidgen(u, 1);
-}
diff --git a/lib/libc_bsd/uuid/uuid_create_nil.c b/lib/libc_bsd/uuid/uuid_create_nil.c
deleted file mode 100644
index 697bd79..0000000
--- a/lib/libc_bsd/uuid/uuid_create_nil.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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: releng/10.2/lib/libc/uuid/uuid_create_nil.c 118670 2003-08-08 19:18:43Z marcel $
- */
-
-#include <strings.h>
-#include <uuid.h>
-
-/*
- * uuid_create_nil() - create a nil UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_create_nil.htm
- */
-void
-uuid_create_nil(uuid_t *u, uint32_t *status)
-{
-
-	if (status)
-		*status = uuid_s_ok;
-
-	bzero(u, sizeof(*u));
-}
diff --git a/lib/libc_bsd/uuid/uuid_equal.c b/lib/libc_bsd/uuid/uuid_equal.c
deleted file mode 100644
index 9139801..0000000
--- a/lib/libc_bsd/uuid/uuid_equal.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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: releng/10.2/lib/libc/uuid/uuid_equal.c 139601 2005-01-03 02:56:15Z marcel $
- */
-
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_equal() - compare for equality.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_equal.htm
- */
-int32_t
-uuid_equal(const uuid_t *a, const uuid_t *b, uint32_t *status)
-{
-
-	if (status != NULL)
-		*status = uuid_s_ok;
-
-	/* Deal with equal or NULL pointers. */
-	if (a == b)
-		return (1);
-	if (a == NULL)
-		return (uuid_is_nil(b, NULL));
-	if (b == NULL)
-		return (uuid_is_nil(a, NULL));
-
-	/* Do a byte for byte comparison. */
-	return ((memcmp(a, b, sizeof(uuid_t))) ? 0 : 1);
-}
diff --git a/lib/libc_bsd/uuid/uuid_from_string.c b/lib/libc_bsd/uuid/uuid_from_string.c
deleted file mode 100644
index ae23bdf..0000000
--- a/lib/libc_bsd/uuid/uuid_from_string.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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: releng/10.2/lib/libc/uuid/uuid_from_string.c 118670 2003-08-08 19:18:43Z marcel $
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_from_string() - convert a string representation of an UUID into
- *			a binary representation.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_from_string.htm
- *
- * NOTE: The sequence field is in big-endian, while the time fields are in
- *	 native byte order.
- */
-void
-uuid_from_string(const char *s, uuid_t *u, uint32_t *status)
-{
-	int n;
-
-	/* Short-circuit 2 special cases: NULL pointer and empty string. */
-	if (s == NULL || *s == '\0') {
-		uuid_create_nil(u, status);
-		return;
-	}
-
-	/* Assume the worst. */
-	if (status != NULL)
-		*status = uuid_s_invalid_string_uuid;
-
-	/* The UUID string representation has a fixed length. */
-	if (strlen(s) != 36)
-		return;
-
-	/*
-	 * We only work with "new" UUIDs. New UUIDs have the form:
-	 *	01234567-89ab-cdef-0123-456789abcdef
-	 * The so called "old" UUIDs, which we don't support, have the form:
-	 *	0123456789ab.cd.ef.01.23.45.67.89.ab
-	 */
-	if (s[8] != '-')
-		return;
-
-	n = sscanf(s,
-	    "%8x-%4hx-%4hx-%2hhx%2hhx-%2hhx%2hhx%2hhx%2hhx%2hhx%2hhx",
-	    &u->time_low, &u->time_mid, &u->time_hi_and_version,
-	    &u->clock_seq_hi_and_reserved, &u->clock_seq_low, &u->node[0],
-	    &u->node[1], &u->node[2], &u->node[3], &u->node[4], &u->node[5]);
-
-	/* Make sure we have all conversions. */
-	if (n != 11)
-		return;
-
-	/* We have a successful scan. Check semantics... */
-	n = u->clock_seq_hi_and_reserved;
-	if ((n & 0x80) != 0x00 &&			/* variant 0? */
-	    (n & 0xc0) != 0x80 &&			/* variant 1? */
-	    (n & 0xe0) != 0xc0) {			/* variant 2? */
-		if (status != NULL)
-			*status = uuid_s_bad_version;
-	} else {
-		if (status != NULL)
-			*status = uuid_s_ok;
-	}
-}
diff --git a/lib/libc_bsd/uuid/uuid_hash.c b/lib/libc_bsd/uuid/uuid_hash.c
deleted file mode 100644
index 015e0b2..0000000
--- a/lib/libc_bsd/uuid/uuid_hash.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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: releng/10.2/lib/libc/uuid/uuid_hash.c 139601 2005-01-03 02:56:15Z marcel $
- */
-
-#include <uuid.h>
-
-/*
- * uuid_hash() - generate a hash value.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_hash.htm
- */
-uint16_t
-uuid_hash(const uuid_t *u, uint32_t *status)
-{
-
-	if (status)
-		*status = uuid_s_ok;
-
-	/*
-	 * Use the most frequently changing bits in the UUID as the hash
-	 * value. This should yield a good enough distribution...
-	 */
-	return ((u) ? u->time_low & 0xffff : 0);
-}
diff --git a/lib/libc_bsd/uuid/uuid_is_nil.c b/lib/libc_bsd/uuid/uuid_is_nil.c
deleted file mode 100644
index dfdc6e7..0000000
--- a/lib/libc_bsd/uuid/uuid_is_nil.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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: releng/10.2/lib/libc/uuid/uuid_is_nil.c 146098 2005-05-11 13:18:10Z delphij $
- */
-
-#include <uuid.h>
-
-/*
- * uuid_is_nil() - return whether the UUID is a nil UUID.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_is_nil.htm
- */
-int32_t
-uuid_is_nil(const uuid_t *u, uint32_t *status)
-{
-	const uint32_t *p;
-
-	if (status)
-		*status = uuid_s_ok;
-
-	if (!u)
-		return (1);
-
-	/*
-	 * Pick the largest type that has equivalent alignment constraints
-	 * as an UUID and use it to test if the UUID consists of all zeroes.
-	 */
-	p = (const uint32_t*)u;
-	return ((p[0] == 0 && p[1] == 0 && p[2] == 0 && p[3] == 0) ? 1 : 0);
-}
diff --git a/lib/libc_bsd/uuid/uuid_stream.c b/lib/libc_bsd/uuid/uuid_stream.c
deleted file mode 100644
index fab32fa..0000000
--- a/lib/libc_bsd/uuid/uuid_stream.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*	$NetBSD: uuid_stream.c,v 1.3 2008/04/19 18:21:38 plunky Exp $	*/
-
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/uuid/uuid_stream.c 181743 2008-08-14 22:23:16Z emax $");
-
-#include <sys/endian.h>
-#include <uuid.h>
-
-/*
- * Encode/Decode UUID into octet-stream.
- *   http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt
- *
- * 0                   1                   2                   3
- *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |                          time_low                             |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |       time_mid                |         time_hi_and_version   |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |clk_seq_hi_res |  clk_seq_low  |         node (0-1)            |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *  |                         node (2-5)                            |
- *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- *
- * NOTE: These routines are not part of the DCE RPC API. They are
- * provided for convenience.
- */
-
-void
-uuid_enc_le(void *buf, const uuid_t *uuid)
-{
-	uint8_t *p = buf;
-	int i;
-
-	le32enc(p, uuid->time_low);
-	le16enc(p + 4, uuid->time_mid);
-	le16enc(p + 6, uuid->time_hi_and_version);
-	p[8] = uuid->clock_seq_hi_and_reserved;
-	p[9] = uuid->clock_seq_low;
-	for (i = 0; i < _UUID_NODE_LEN; i++)
-		p[10 + i] = uuid->node[i];
-}
-
-void
-uuid_dec_le(const void *buf, uuid_t *uuid)
-{
-	const uint8_t *p = buf;
-	int i;
-
-	uuid->time_low = le32dec(p);
-	uuid->time_mid = le16dec(p + 4);
-	uuid->time_hi_and_version = le16dec(p + 6);
-	uuid->clock_seq_hi_and_reserved = p[8];
-	uuid->clock_seq_low = p[9];
-	for (i = 0; i < _UUID_NODE_LEN; i++)
-		uuid->node[i] = p[10 + i];
-}
-
-void
-uuid_enc_be(void *buf, const uuid_t *uuid)
-{
-	uint8_t *p = buf;
-	int i;
-
-	be32enc(p, uuid->time_low);
-	be16enc(p + 4, uuid->time_mid);
-	be16enc(p + 6, uuid->time_hi_and_version);
-	p[8] = uuid->clock_seq_hi_and_reserved;
-	p[9] = uuid->clock_seq_low;
-	for (i = 0; i < _UUID_NODE_LEN; i++)
-		p[10 + i] = uuid->node[i];
-}
-
-void
-uuid_dec_be(const void *buf, uuid_t *uuid)
-{
-	const uint8_t *p = buf;
-	int i;
-
-	uuid->time_low = be32dec(p);
-	uuid->time_mid = be16dec(p + 4);
-	uuid->time_hi_and_version = be16dec(p + 6);
-	uuid->clock_seq_hi_and_reserved = p[8];
-	uuid->clock_seq_low = p[9];
-	for (i = 0; i < _UUID_NODE_LEN; i++)
-		uuid->node[i] = p[10 + i];
-}
diff --git a/lib/libc_bsd/uuid/uuid_to_string.c b/lib/libc_bsd/uuid/uuid_to_string.c
deleted file mode 100644
index d517f8f..0000000
--- a/lib/libc_bsd/uuid/uuid_to_string.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2002,2005 Marcel Moolenaar
- * Copyright (c) 2002 Hiten Mahesh Pandya
- * 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.
- *
- * 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: releng/10.2/lib/libc/uuid/uuid_to_string.c 139601 2005-01-03 02:56:15Z marcel $
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <uuid.h>
-
-/*
- * uuid_to_string() - Convert a binary UUID into a string representation.
- * See also:
- *	http://www.opengroup.org/onlinepubs/009629399/uuid_to_string.htm
- *
- * NOTE: The references given above do not have a status code for when
- *	 the string could not be allocated. The status code has been
- *	 taken from the Hewlett-Packard implementation.
- */
-void
-uuid_to_string(const uuid_t *u, char **s, uint32_t *status)
-{
-	uuid_t nil;
-
-	if (status != NULL)
-		*status = uuid_s_ok;
-
-	/* Why allow a NULL-pointer here? */
-	if (s == 0)
-		return;
-
-	if (u == NULL) {
-		u = &nil;
-		uuid_create_nil(&nil, NULL);
-	}
-
-	asprintf(s, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-	    u->time_low, u->time_mid, u->time_hi_and_version,
-	    u->clock_seq_hi_and_reserved, u->clock_seq_low, u->node[0],
-	    u->node[1], u->node[2], u->node[3], u->node[4], u->node[5]);
-
-	if (*s == NULL && status != NULL)
-		*status = uuid_s_no_memory;
-}
diff --git a/lib/libc_bsd/xdr/Makefile.inc b/lib/libc_bsd/xdr/Makefile.inc
deleted file mode 100644
index 1b0b221..0000000
--- a/lib/libc_bsd/xdr/Makefile.inc
+++ /dev/null
@@ -1,52 +0,0 @@
-#	@(#)Makefile	5.11 (Berkeley) 9/6/90
-Makefile.incl 223877 2011-07-09 07:43:56Z kevlo $
-
-.PATH: ${.CURDIR}/xdr ${.CURDIR}/.
-SRCS+=	xdr.c xdr_array.c xdr_float.c xdr_mem.c \
-	xdr_rec.c xdr_reference.c xdr_sizeof.c \
-	xdr_stdio.c
-
-SYM_MAPS+=	${.CURDIR}/xdr/Symbol.map
-
-MAN+=	xdr.3
-
-MLINKS+=	rpc_xdr.3 xdr_accepted_reply.3 \
-		rpc_xdr.3 xdr_authsys_parms.3 \
-		rpc_xdr.3 xdr_callhdr.3 \
-		rpc_xdr.3 xdr_callmsg.3 \
-		rpc_xdr.3 xdr_opaque_auth.3 \
-		rpc_xdr.3 xdr_rejected_reply.3 \
-		rpc_xdr.3 xdr_replymsg.3 \
-		xdr.3 xdr_array.3 \
-		xdr.3 xdr_bool.3 \
-		xdr.3 xdr_bytes.3 \
-		xdr.3 xdr_char.3 \
-		xdr.3 xdr_destroy.3 \
-		xdr.3 xdr_double.3 \
-		xdr.3 xdr_enum.3 \
-		xdr.3 xdr_float.3 \
-		xdr.3 xdr_free.3 \
-		xdr.3 xdr_getpos.3 \
-		xdr.3 xdr_inline.3 \
-		xdr.3 xdr_int.3 \
-		xdr.3 xdr_long.3 \
-		xdr.3 xdrmem_create.3 \
-		xdr.3 xdr_opaque.3 \
-		xdr.3 xdr_pointer.3 \
-		xdr.3 xdrrec_create.3 \
-		xdr.3 xdrrec_endofrecord.3 \
-		xdr.3 xdrrec_eof.3 \
-		xdr.3 xdrrec_skiprecord.3 \
-		xdr.3 xdr_reference.3 \
-		xdr.3 xdr_setpos.3 \
-		xdr.3 xdr_short.3 \
-		xdr.3 xdr_sizeof.3 \
-		xdr.3 xdrstdio_create.3 \
-		xdr.3 xdr_string.3 \
-		xdr.3 xdr_u_char.3 \
-		xdr.3 xdr_u_long.3 \
-		xdr.3 xdr_u_short.3 \
-		xdr.3 xdr_union.3 \
-		xdr.3 xdr_vector.3 \
-		xdr.3 xdr_void.3 \
-                xdr.3 xdr_wrapstring.3
diff --git a/lib/libc_bsd/xdr/Symbol.map b/lib/libc_bsd/xdr/Symbol.map
deleted file mode 100644
index 79d4bff..0000000
--- a/lib/libc_bsd/xdr/Symbol.map
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/xdr/Symbol.map 223877 2011-07-09 07:43:56Z kevlo $
- */
-
-FBSD_1.0 {
-	xdr_free;
-	xdr_void;
-	xdr_int;
-	xdr_u_int;
-	xdr_long;
-	xdr_u_long;
-	xdr_int32_t;
-	xdr_uint32_t;
-	xdr_short;
-	xdr_u_short;
-	xdr_int16_t;
-	xdr_u_int16_t;
-	xdr_char;
-	xdr_u_char;
-	xdr_bool;
-	xdr_enum;
-	xdr_opaque;
-	xdr_bytes;
-	xdr_netobj;
-	xdr_union;
-	xdr_string;
-	xdr_wrapstring;
-	xdr_int64_t;
-	xdr_u_int64_t;
-	xdr_hyper;
-	xdr_u_hyper;
-	xdr_longlong_t;
-	xdr_u_longlong_t;
-	xdr_array;
-	xdr_vector;
-	xdr_float;
-	xdr_double;
-	xdrmem_create;
-	xdrrec_create;
-	xdrrec_skiprecord;
-	xdrrec_eof;
-	xdrrec_endofrecord;
-	xdr_reference;
-	xdr_pointer;
-	xdrstdio_create;
-};
-
-FBSD_1.1 {
-	xdr_uint16_t;
-	xdr_uint32_t;
-	xdr_uint64_t;
-};
-
-FBSD_1.2 {
-	xdr_sizeof;
-};
diff --git a/lib/libc_bsd/xdr/xdr.3 b/lib/libc_bsd/xdr/xdr.3
deleted file mode 100644
index e623925..0000000
--- a/lib/libc_bsd/xdr/xdr.3
+++ /dev/null
@@ -1,847 +0,0 @@
-.\" @(#)xdr.3n	2.2 88/08/03 4.0 RPCSRC; from 1.16 88/03/14 SMI
-.\" $FreeBSD: releng/10.2/lib/libc/xdr/xdr.3 223903 2011-07-10 06:57:00Z kevlo $
-.\"
-.Dd February 16, 1988
-.Dt XDR 3
-.Os
-.Sh NAME
-.Nm xdr ,
-.Nm xdr_array ,
-.Nm xdr_bool ,
-.Nm xdr_bytes ,
-.Nm xdr_char ,
-.Nm xdr_destroy ,
-.Nm xdr_double ,
-.Nm xdr_enum ,
-.Nm xdr_float ,
-.Nm xdr_free ,
-.Nm xdr_getpos ,
-.Nm xdr_hyper ,
-.Nm xdr_inline ,
-.Nm xdr_int ,
-.Nm xdr_long ,
-.Nm xdr_longlong_t ,
-.Nm xdrmem_create ,
-.Nm xdr_opaque ,
-.Nm xdr_pointer ,
-.Nm xdrrec_create ,
-.Nm xdrrec_endofrecord ,
-.Nm xdrrec_eof ,
-.Nm xdrrec_skiprecord ,
-.Nm xdr_reference ,
-.Nm xdr_setpos ,
-.Nm xdr_short ,
-.Nm xdr_sizeof,
-.Nm xdrstdio_create ,
-.Nm xdr_string ,
-.Nm xdr_u_char ,
-.Nm xdr_u_hyper ,
-.Nm xdr_u_int ,
-.Nm xdr_u_long ,
-.Nm xdr_u_longlong_t ,
-.Nm xdr_u_short ,
-.Nm xdr_union ,
-.Nm xdr_vector ,
-.Nm xdr_void ,
-.Nm xdr_wrapstring
-.Nd "library routines for external data representation"
-.Sh LIBRARY
-.Lb libc
-.Sh SYNOPSIS
-.In rpc/types.h
-.In rpc/xdr.h
-.Pp
-See
-.Sx DESCRIPTION
-for function declarations.
-.Sh DESCRIPTION
-These routines allow C programmers to describe
-arbitrary data structures in a machine-independent fashion.
-Data for remote procedure calls are transmitted using these
-routines.
-.Pp
-.Bl -tag -width indent -compact
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fo xdr_array
-.Fa "XDR *xdrs"
-.Fa "char **arrp"
-.Fa "u_int *sizep"
-.Fa "u_int maxsize"
-.Fa "u_int elsize"
-.Fa "xdrproc_t elproc"
-.Fc
-.Xc
-.Pp
-A filter primitive that translates between variable-length
-arrays
-and their corresponding external representations.
-The
-.Fa arrp
-argument
-is the address of the pointer to the array, while
-.Fa sizep
-is the address of the element count of the array;
-this element count cannot exceed
-.Fa maxsize .
-The
-.Fa elsize
-argument
-is the
-.Ic sizeof
-each of the array's elements, and
-.Fa elproc
-is an
-.Tn XDR
-filter that translates between
-the array elements' C form, and their external
-representation.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_bool "XDR *xdrs" "bool_t *bp"
-.Xc
-.Pp
-A filter primitive that translates between booleans (C
-integers)
-and their external representations.
-When encoding data, this
-filter produces values of either one or zero.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_bytes "XDR *xdrs" "char **sp" "u_int *sizep" "u_int maxsize"
-.Xc
-.Pp
-A filter primitive that translates between counted byte
-strings and their external representations.
-The
-.Fa sp
-argument
-is the address of the string pointer.
-The length of the
-string is located at address
-.Fa sizep ;
-strings cannot be longer than
-.Fa maxsize .
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_char "XDR *xdrs" "char *cp"
-.Xc
-.Pp
-A filter primitive that translates between C characters
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-Note: encoded characters are not packed, and occupy 4 bytes
-each.
-For arrays of characters, it is worthwhile to
-consider
-.Fn xdr_bytes ,
-.Fn xdr_opaque
-or
-.Fn xdr_string .
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn xdr_destroy "XDR *xdrs"
-.Xc
-.Pp
-A macro that invokes the destroy routine associated with the
-.Tn XDR
-stream,
-.Fa xdrs .
-Destruction usually involves freeing private data structures
-associated with the stream.
-Using
-.Fa xdrs
-after invoking
-.Fn xdr_destroy
-is undefined.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_double "XDR *xdrs" "double *dp"
-.Xc
-.Pp
-A filter primitive that translates between C
-.Vt double
-precision numbers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_enum "XDR *xdrs" "enum_t *ep"
-.Xc
-.Pp
-A filter primitive that translates between C
-.Vt enum Ns s
-(actually integers) and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_float "XDR *xdrs" "float *fp"
-.Xc
-.Pp
-A filter primitive that translates between C
-.Vt float Ns s
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn xdr_free "xdrproc_t proc" "void *objp"
-.Xc
-.Pp
-Generic freeing routine.
-The first argument is the
-.Tn XDR
-routine for the object being freed.
-The second argument
-is a pointer to the object itself.
-Note: the pointer passed
-to this routine is
-.Em not
-freed, but what it points to
-.Em is
-freed (recursively).
-.Pp
-.It Xo
-.Ft u_int
-.Xc
-.It Xo
-.Fn xdr_getpos "XDR *xdrs"
-.Xc
-.Pp
-A macro that invokes the get\-position routine
-associated with the
-.Tn XDR
-stream,
-.Fa xdrs .
-The routine returns an unsigned integer,
-which indicates the position of the
-.Tn XDR
-byte stream.
-A desirable feature of
-.Tn XDR
-streams is that simple arithmetic works with this number,
-although the
-.Tn XDR
-stream instances need not guarantee this.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_hyper "XDR *xdrs" "quad_t *llp"
-.Xc
-A filter primitive that translates between ANSI C
-.Vt "long long"
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft "long *"
-.Xc
-.It Xo
-.Fn xdr_inline "XDR *xdrs" "int len"
-.Xc
-.Pp
-A macro that invokes the in-line routine associated with the
-.Tn XDR
-stream,
-.Fa xdrs .
-The routine returns a pointer
-to a contiguous piece of the stream's buffer;
-.Fa len
-is the byte length of the desired buffer.
-Note: pointer is cast to
-.Vt "long *" .
-.Pp
-Warning:
-.Fn xdr_inline
-may return
-.Dv NULL
-(0)
-if it cannot allocate a contiguous piece of a buffer.
-Therefore the behavior may vary among stream instances;
-it exists for the sake of efficiency.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_int "XDR *xdrs" "int *ip"
-.Xc
-.Pp
-A filter primitive that translates between C integers
-and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_long "XDR *xdrs" "long *lp"
-.Xc
-.Pp
-A filter primitive that translates between C
-.Vt long
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_longlong_t "XDR *xdrs" "quad_t *llp"
-.Xc
-A filter primitive that translates between ANSI C
-.Vt "long long"
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn xdrmem_create "XDR *xdrs" "char *addr" "u_int size" "enum xdr_op op"
-.Xc
-.Pp
-This routine initializes the
-.Tn XDR
-stream object pointed to by
-.Fa xdrs .
-The stream's data is written to, or read from,
-a chunk of memory at location
-.Fa addr
-whose length is no more than
-.Fa size
-bytes long.
-The
-.Fa op
-argument
-determines the direction of the
-.Tn XDR
-stream
-(either
-.Dv XDR_ENCODE ,
-.Dv XDR_DECODE ,
-or
-.Dv XDR_FREE ) .
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_opaque "XDR *xdrs" "char *cp" "u_int cnt"
-.Xc
-.Pp
-A filter primitive that translates between fixed size opaque
-data
-and its external representation.
-The
-.Fa cp
-argument
-is the address of the opaque object, and
-.Fa cnt
-is its size in bytes.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_pointer "XDR *xdrs" "char **objpp" "u_int objsize" "xdrproc_t xdrobj"
-.Xc
-.Pp
-Like
-.Fn xdr_reference
-except that it serializes
-.Dv NULL
-pointers, whereas
-.Fn xdr_reference
-does not.
-Thus,
-.Fn xdr_pointer
-can represent
-recursive data structures, such as binary trees or
-linked lists.
-.Pp
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fo xdrrec_create
-.Fa "XDR *xdrs"
-.Fa "u_int sendsize"
-.Fa "u_int recvsize"
-.Fa "void *handle"
-.Fa "int \*(lp*readit\*(rp\*(lp\*(rp"
-.Fa "int \*(lp*writeit\*(rp\*(lp\*(rp"
-.Fc
-.Xc
-.Pp
-This routine initializes the
-.Tn XDR
-stream object pointed to by
-.Fa xdrs .
-The stream's data is written to a buffer of size
-.Fa sendsize ;
-a value of zero indicates the system should use a suitable
-default.
-The stream's data is read from a buffer of size
-.Fa recvsize ;
-it too can be set to a suitable default by passing a zero
-value.
-When a stream's output buffer is full,
-.Fn writeit
-is called.
-Similarly, when a stream's input buffer is empty,
-.Fn readit
-is called.
-The behavior of these two routines is similar to
-the
-system calls
-.Xr read 2
-and
-.Xr write 2 ,
-except that
-.Fa handle
-is passed to the former routines as the first argument.
-Note: the
-.Tn XDR
-stream's
-.Fa op
-field must be set by the caller.
-.Pp
-Warning: this
-.Tn XDR
-stream implements an intermediate record stream.
-Therefore there are additional bytes in the stream
-to provide record boundary information.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdrrec_endofrecord "XDR *xdrs" "int sendnow"
-.Xc
-.Pp
-This routine can be invoked only on
-streams created by
-.Fn xdrrec_create .
-The data in the output buffer is marked as a completed
-record,
-and the output buffer is optionally written out if
-.Fa sendnow
-is non-zero.
-This routine returns one if it succeeds, zero
-otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdrrec_eof "XDR *xdrs"
-.Xc
-.Pp
-This routine can be invoked only on
-streams created by
-.Fn xdrrec_create .
-After consuming the rest of the current record in the stream,
-this routine returns one if the stream has no more input,
-zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdrrec_skiprecord "XDR *xdrs"
-.Xc
-.Pp
-This routine can be invoked only on
-streams created by
-.Fn xdrrec_create .
-It tells the
-.Tn XDR
-implementation that the rest of the current record
-in the stream's input buffer should be discarded.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_reference "XDR *xdrs" "char **pp" "u_int size" "xdrproc_t proc"
-.Xc
-.Pp
-A primitive that provides pointer chasing within structures.
-The
-.Fa pp
-argument
-is the address of the pointer;
-.Fa size
-is the
-.Ic sizeof
-the structure that
-.Fa *pp
-points to; and
-.Fa proc
-is an
-.Tn XDR
-procedure that filters the structure
-between its C form and its external representation.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-Warning: this routine does not understand
-.Dv NULL
-pointers.
-Use
-.Fn xdr_pointer
-instead.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_setpos "XDR *xdrs" "u_int pos"
-.Xc
-.Pp
-A macro that invokes the set position routine associated with
-the
-.Tn XDR
-stream
-.Fa xdrs .
-The
-.Fa pos
-argument
-is a position value obtained from
-.Fn xdr_getpos .
-This routine returns one if the
-.Tn XDR
-stream could be repositioned,
-and zero otherwise.
-.Pp
-Warning: it is difficult to reposition some types of
-.Tn XDR
-streams, so this routine may fail with one
-type of stream and succeed with another.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_short "XDR *xdrs" "short *sp"
-.Xc
-.Pp
-A filter primitive that translates between C
-.Vt short
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft unsigned long
-.Xc
-.It Xo
-.Fn xdr_sizeof "xdrproc_t func" "void *data"
-.Xc
-.Pp
-This routine returns the amount of memory required to encode
-.Fa data
-using filter
-.Fa func .
-.Pp
-.It Li "#ifdef _STDIO_H_"
-.It Li "/* XDR using stdio library */"
-.It Xo
-.Ft void
-.Xc
-.It Xo
-.Fn xdrstdio_create "XDR *xdrs" "FILE *file" "enum xdr_op op"
-.Xc
-.It Li "#endif"
-.Pp
-This routine initializes the
-.Tn XDR
-stream object pointed to by
-.Fa xdrs .
-The
-.Tn XDR
-stream data is written to, or read from, the Standard
-.Tn I/O
-stream
-.Fa file .
-The
-.Fa op
-argument
-determines the direction of the
-.Tn XDR
-stream (either
-.Dv XDR_ENCODE ,
-.Dv XDR_DECODE ,
-or
-.Dv XDR_FREE ) .
-.Pp
-Warning: the destroy routine associated with such
-.Tn XDR
-streams calls
-.Xr fflush 3
-on the
-.Fa file
-stream, but never
-.Xr fclose 3 .
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_string "XDR *xdrs" "char **sp" "u_int maxsize"
-.Xc
-.Pp
-A filter primitive that translates between C strings and
-their
-corresponding external representations.
-Strings cannot be longer than
-.Fa maxsize .
-Note:
-.Fa sp
-is the address of the string's pointer.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_u_char "XDR *xdrs" "unsigned char *ucp"
-.Xc
-.Pp
-A filter primitive that translates between
-.Vt unsigned
-C characters and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_u_hyper "XDR *xdrs" "u_quad_t *ullp"
-.Xc
-A filter primitive that translates between
-.Vt unsigned
-ANSI C
-.Vt long long
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_u_int "XDR *xdrs" "unsigned *up"
-.Xc
-.Pp
-A filter primitive that translates between C
-.Vt unsigned
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_u_long "XDR *xdrs" "unsigned long *ulp"
-.Xc
-.Pp
-A filter primitive that translates between C
-.Vt "unsigned long"
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_u_longlong_t "XDR *xdrs" "u_quad_t *ullp"
-.Xc
-A filter primitive that translates between
-.Vt unsigned
-ANSI C
-.Vt "long long"
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_u_short "XDR *xdrs" "unsigned short *usp"
-.Xc
-.Pp
-A filter primitive that translates between C
-.Vt "unsigned short"
-integers and their external representations.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fo xdr_union
-.Fa "XDR *xdrs"
-.Fa "enum_t *dscmp"
-.Fa "char *unp"
-.Fa "const struct xdr_discrim *choices"
-.Fa "xdrproc_t defaultarm"
-.Fc
-.Xc
-.Pp
-A filter primitive that translates between a discriminated C
-.Vt union
-and its corresponding external representation.
-It first
-translates the discriminant of the union located at
-.Fa dscmp .
-This discriminant is always an
-.Vt enum_t .
-Next the union located at
-.Fa unp
-is translated.
-The
-.Fa choices
-argument
-is a pointer to an array of
-.Vt xdr_discrim
-structures.
-Each structure contains an ordered pair of
-.Bq Va value , proc .
-If the union's discriminant is equal to the associated
-.Va value ,
-then the
-.Fn proc
-is called to translate the union.
-The end of the
-.Vt xdr_discrim
-structure array is denoted by a routine of value
-.Dv NULL .
-If the discriminant is not found in the
-.Fa choices
-array, then the
-.Fn defaultarm
-procedure is called (if it is not
-.Dv NULL ) .
-Returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fo xdr_vector
-.Fa "XDR *xdrs"
-.Fa "char *arrp"
-.Fa "u_int size"
-.Fa "u_int elsize"
-.Fa "xdrproc_t elproc"
-.Fc
-.Xc
-.Pp
-A filter primitive that translates between fixed-length
-arrays
-and their corresponding external representations.
-The
-.Fa arrp
-argument
-is the address of the pointer to the array, while
-.Fa size
-is the element count of the array.
-The
-.Fa elsize
-argument
-is the
-.Ic sizeof
-each of the array's elements, and
-.Fa elproc
-is an
-.Tn XDR
-filter that translates between
-the array elements' C form, and their external
-representation.
-This routine returns one if it succeeds, zero otherwise.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_void void
-.Xc
-.Pp
-This routine always returns one.
-It may be passed to
-.Tn RPC
-routines that require a function argument,
-where nothing is to be done.
-.Pp
-.It Xo
-.Ft int
-.Xc
-.It Xo
-.Fn xdr_wrapstring "XDR *xdrs" "char **sp"
-.Xc
-.Pp
-A primitive that calls
-.Fn xdr_string xdrs sp MAXUN.UNSIGNED ;
-where
-.Dv MAXUN.UNSIGNED
-is the maximum value of an unsigned integer.
-The
-.Fn xdr_wrapstring
-function
-is handy because the
-.Tn RPC
-package passes a maximum of two
-.Tn XDR
-routines as arguments, and
-.Fn xdr_string ,
-one of the most frequently used primitives, requires three.
-Returns one if it succeeds, zero otherwise.
-.El
-.Sh SEE ALSO
-.Xr rpc 3
-.Rs
-.%T "eXternal Data Representation Standard: Protocol Specification"
-.Re
-.Rs
-.%T "eXternal Data Representation: Sun Technical Notes"
-.Re
-.Rs
-.%T "XDR: External Data Representation Standard"
-.%O RFC1014
-.%Q "Sun Microsystems, Inc., USC\-ISI"
-.Re
-.Sh HISTORY
-The
-.Nm xdr_sizeof
-function first appeared in
-.Fx 9.0 .
diff --git a/lib/libc_bsd/xdr/xdr.c b/lib/libc_bsd/xdr/xdr.c
deleted file mode 100644
index cbd7e3a..0000000
--- a/lib/libc_bsd/xdr/xdr.c
+++ /dev/null
@@ -1,967 +0,0 @@
-/*	$NetBSD: xdr.c,v 1.22 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr.c 1.35 87/08/12";
-static char *sccsid = "@(#)xdr.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/xdr/xdr.c 272850 2014-10-09 23:05:32Z hrs $");
-
-/*
- * xdr.c, Generic XDR routines implementation.
- *
- * These are the "generic" xdr routines used to serialize and de-serialize
- * most common data items.  See xdr.h for more info on the interface to
- * xdr.
- */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-typedef quad_t          longlong_t;     /* ANSI long long type */
-typedef u_quad_t        u_longlong_t;   /* ANSI unsigned long long type */
-
-/*
- * constants specific to the xdr "protocol"
- */
-#define XDR_FALSE	((long) 0)
-#define XDR_TRUE	((long) 1)
-#define LASTUNSIGNED	((u_int) 0-1)
-
-/*
- * for unit alignment
- */
-static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
-
-/*
- * Free a data structure using XDR
- * Not a filter, but a convenient utility nonetheless
- */
-void
-xdr_free(proc, objp)
-	xdrproc_t proc;
-	void *objp;
-{
-	XDR x;
-	
-	x.x_op = XDR_FREE;
-	(*proc)(&x, objp);
-}
-
-/*
- * XDR nothing
- */
-bool_t
-xdr_void(void)
-{
-
-	return (TRUE);
-}
-
-
-/*
- * XDR integers
- */
-bool_t
-xdr_int(xdrs, ip)
-	XDR *xdrs;
-	int *ip;
-{
-	long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *ip;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*ip = (int) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned integers
- */
-bool_t
-xdr_u_int(xdrs, up)
-	XDR *xdrs;
-	u_int *up;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *up;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*up = (u_int) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR long integers
- * same as xdr_u_long - open coded to save a proc call!
- */
-bool_t
-xdr_long(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		return (XDR_PUTLONG(xdrs, lp));
-	case XDR_DECODE:
-		return (XDR_GETLONG(xdrs, lp));
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned long integers
- * same as xdr_long - open coded to save a proc call!
- */
-bool_t
-xdr_u_long(xdrs, ulp)
-	XDR *xdrs;
-	u_long *ulp;
-{
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		return (XDR_PUTLONG(xdrs, (long *)ulp));
-	case XDR_DECODE:
-		return (XDR_GETLONG(xdrs, (long *)ulp));
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR 32-bit integers
- * same as xdr_uint32_t - open coded to save a proc call!
- */
-bool_t
-xdr_int32_t(xdrs, int32_p)
-	XDR *xdrs;
-	int32_t *int32_p;
-{
-	long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *int32_p;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*int32_p = (int32_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned 32-bit integers
- * same as xdr_int32_t - open coded to save a proc call!
- */
-bool_t
-xdr_uint32_t(xdrs, u_int32_p)
-	XDR *xdrs;
-	uint32_t *u_int32_p;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *u_int32_p;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*u_int32_p = (uint32_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned 32-bit integers
- * same as xdr_int32_t - open coded to save a proc call!
- */
-bool_t
-xdr_uint32_t(xdrs, u_int32_p)
-	XDR *xdrs;
-	uint32_t *u_int32_p;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *u_int32_p;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*u_int32_p = (uint32_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR short integers
- */
-bool_t
-xdr_short(xdrs, sp)
-	XDR *xdrs;
-	short *sp;
-{
-	long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *sp;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*sp = (short) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned short integers
- */
-bool_t
-xdr_u_short(xdrs, usp)
-	XDR *xdrs;
-	u_short *usp;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *usp;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*usp = (u_short) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR 16-bit integers
- */
-bool_t
-xdr_int16_t(xdrs, int16_p)
-	XDR *xdrs;
-	int16_t *int16_p;
-{
-	long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (long) *int16_p;
-		return (XDR_PUTLONG(xdrs, &l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &l)) {
-			return (FALSE);
-		}
-		*int16_p = (int16_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned 16-bit integers
- */
-bool_t
-xdr_u_int16_t(xdrs, u_int16_p)
-	XDR *xdrs;
-	u_int16_t *u_int16_p;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *u_int16_p;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*u_int16_p = (u_int16_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned 16-bit integers
- */
-bool_t
-xdr_uint16_t(xdrs, u_int16_p)
-	XDR *xdrs;
-	uint16_t *u_int16_p;
-{
-	u_long l;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		l = (u_long) *u_int16_p;
-		return (XDR_PUTLONG(xdrs, (long *)&l));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, (long *)&l)) {
-			return (FALSE);
-		}
-		*u_int16_p = (u_int16_t) l;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR a char
- */
-bool_t
-xdr_char(xdrs, cp)
-	XDR *xdrs;
-	char *cp;
-{
-	int i;
-
-	i = (*cp);
-	if (!xdr_int(xdrs, &i)) {
-		return (FALSE);
-	}
-	*cp = i;
-	return (TRUE);
-}
-
-/*
- * XDR an unsigned char
- */
-bool_t
-xdr_u_char(xdrs, cp)
-	XDR *xdrs;
-	u_char *cp;
-{
-	u_int u;
-
-	u = (*cp);
-	if (!xdr_u_int(xdrs, &u)) {
-		return (FALSE);
-	}
-	*cp = u;
-	return (TRUE);
-}
-
-/*
- * XDR booleans
- */
-bool_t
-xdr_bool(xdrs, bp)
-	XDR *xdrs;
-	bool_t *bp;
-{
-	long lb;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		lb = *bp ? XDR_TRUE : XDR_FALSE;
-		return (XDR_PUTLONG(xdrs, &lb));
-
-	case XDR_DECODE:
-		if (!XDR_GETLONG(xdrs, &lb)) {
-			return (FALSE);
-		}
-		*bp = (lb == XDR_FALSE) ? FALSE : TRUE;
-		return (TRUE);
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR enumerations
- */
-bool_t
-xdr_enum(xdrs, ep)
-	XDR *xdrs;
-	enum_t *ep;
-{
-	enum sizecheck { SIZEVAL };	/* used to find the size of an enum */
-
-	/*
-	 * enums are treated as ints
-	 */
-	/* LINTED */ if (sizeof (enum sizecheck) == sizeof (long)) {
-		return (xdr_long(xdrs, (long *)(void *)ep));
-	} else /* LINTED */ if (sizeof (enum sizecheck) == sizeof (int)) {
-		return (xdr_int(xdrs, (int *)(void *)ep));
-	} else /* LINTED */ if (sizeof (enum sizecheck) == sizeof (short)) {
-		return (xdr_short(xdrs, (short *)(void *)ep));
-	} else {
-		return (FALSE);
-	}
-}
-
-/*
- * XDR opaque data
- * Allows the specification of a fixed size sequence of opaque bytes.
- * cp points to the opaque object and cnt gives the byte length.
- */
-bool_t
-xdr_opaque(xdrs, cp, cnt)
-	XDR *xdrs;
-	caddr_t cp;
-	u_int cnt;
-{
-	u_int rndup;
-	static int crud[BYTES_PER_XDR_UNIT];
-
-	/*
-	 * if no data we are done
-	 */
-	if (cnt == 0)
-		return (TRUE);
-
-	/*
-	 * round byte count to full xdr units
-	 */
-	rndup = cnt % BYTES_PER_XDR_UNIT;
-	if (rndup > 0)
-		rndup = BYTES_PER_XDR_UNIT - rndup;
-
-	if (xdrs->x_op == XDR_DECODE) {
-		if (!XDR_GETBYTES(xdrs, cp, cnt)) {
-			return (FALSE);
-		}
-		if (rndup == 0)
-			return (TRUE);
-		return (XDR_GETBYTES(xdrs, (caddr_t)(void *)crud, rndup));
-	}
-
-	if (xdrs->x_op == XDR_ENCODE) {
-		if (!XDR_PUTBYTES(xdrs, cp, cnt)) {
-			return (FALSE);
-		}
-		if (rndup == 0)
-			return (TRUE);
-		return (XDR_PUTBYTES(xdrs, xdr_zero, rndup));
-	}
-
-	if (xdrs->x_op == XDR_FREE) {
-		return (TRUE);
-	}
-
-	return (FALSE);
-}
-
-/*
- * XDR counted bytes
- * *cpp is a pointer to the bytes, *sizep is the count.
- * If *cpp is NULL maxsize bytes are allocated
- */
-bool_t
-xdr_bytes(xdrs, cpp, sizep, maxsize)
-	XDR *xdrs;
-	char **cpp;
-	u_int *sizep;
-	u_int maxsize;
-{
-	char *sp = *cpp;  /* sp is the actual string pointer */
-	u_int nodesize;
-
-	/*
-	 * first deal with the length since xdr bytes are counted
-	 */
-	if (! xdr_u_int(xdrs, sizep)) {
-		return (FALSE);
-	}
-	nodesize = *sizep;
-	if ((nodesize > maxsize) && (xdrs->x_op != XDR_FREE)) {
-		return (FALSE);
-	}
-
-	/*
-	 * now deal with the actual bytes
-	 */
-	switch (xdrs->x_op) {
-
-	case XDR_DECODE:
-		if (nodesize == 0) {
-			return (TRUE);
-		}
-		if (sp == NULL) {
-			*cpp = sp = mem_alloc(nodesize);
-		}
-		if (sp == NULL) {
-			warnx("xdr_bytes: out of memory");
-			return (FALSE);
-		}
-		/* FALLTHROUGH */
-
-	case XDR_ENCODE:
-		return (xdr_opaque(xdrs, sp, nodesize));
-
-	case XDR_FREE:
-		if (sp != NULL) {
-			mem_free(sp, nodesize);
-			*cpp = NULL;
-		}
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * Implemented here due to commonality of the object.
- */
-bool_t
-xdr_netobj(xdrs, np)
-	XDR *xdrs;
-	struct netobj *np;
-{
-
-	return (xdr_bytes(xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
-}
-
-/*
- * XDR a descriminated union
- * Support routine for discriminated unions.
- * You create an array of xdrdiscrim structures, terminated with
- * an entry with a null procedure pointer.  The routine gets
- * the discriminant value and then searches the array of xdrdiscrims
- * looking for that value.  It calls the procedure given in the xdrdiscrim
- * to handle the discriminant.  If there is no specific routine a default
- * routine may be called.
- * If there is no specific or default routine an error is returned.
- */
-bool_t
-xdr_union(xdrs, dscmp, unp, choices, dfault)
-	XDR *xdrs;
-	enum_t *dscmp;		/* enum to decide which arm to work on */
-	char *unp;		/* the union itself */
-	const struct xdr_discrim *choices;	/* [value, xdr proc] for each arm */
-	xdrproc_t dfault;	/* default xdr routine */
-{
-	enum_t dscm;
-
-	/*
-	 * we deal with the discriminator;  it's an enum
-	 */
-	if (! xdr_enum(xdrs, dscmp)) {
-		return (FALSE);
-	}
-	dscm = *dscmp;
-
-	/*
-	 * search choices for a value that matches the discriminator.
-	 * if we find one, execute the xdr routine for that value.
-	 */
-	for (; choices->proc != NULL_xdrproc_t; choices++) {
-		if (choices->value == dscm)
-			return ((*(choices->proc))(xdrs, unp));
-	}
-
-	/*
-	 * no match - execute the default xdr routine if there is one
-	 */
-	return ((dfault == NULL_xdrproc_t) ? FALSE :
-	    (*dfault)(xdrs, unp));
-}
-
-
-/*
- * Non-portable xdr primitives.
- * Care should be taken when moving these routines to new architectures.
- */
-
-
-/*
- * XDR null terminated ASCII strings
- * xdr_string deals with "C strings" - arrays of bytes that are
- * terminated by a NULL character.  The parameter cpp references a
- * pointer to storage; If the pointer is null, then the necessary
- * storage is allocated.  The last parameter is the max allowed length
- * of the string as specified by a protocol.
- */
-bool_t
-xdr_string(xdrs, cpp, maxsize)
-	XDR *xdrs;
-	char **cpp;
-	u_int maxsize;
-{
-	char *sp = *cpp;  /* sp is the actual string pointer */
-	u_int size;
-	u_int nodesize;
-
-	/*
-	 * first deal with the length since xdr strings are counted-strings
-	 */
-	switch (xdrs->x_op) {
-	case XDR_FREE:
-		if (sp == NULL) {
-			return(TRUE);	/* already free */
-		}
-		/* FALLTHROUGH */
-	case XDR_ENCODE:
-		size = strlen(sp);
-		break;
-	case XDR_DECODE:
-		break;
-	}
-	if (! xdr_u_int(xdrs, &size)) {
-		return (FALSE);
-	}
-	if (size > maxsize) {
-		return (FALSE);
-	}
-	nodesize = size + 1;
-
-	/*
-	 * now deal with the actual bytes
-	 */
-	switch (xdrs->x_op) {
-
-	case XDR_DECODE:
-		if (nodesize == 0) {
-			return (TRUE);
-		}
-		if (sp == NULL)
-			*cpp = sp = mem_alloc(nodesize);
-		if (sp == NULL) {
-			warnx("xdr_string: out of memory");
-			return (FALSE);
-		}
-		sp[size] = 0;
-		/* FALLTHROUGH */
-
-	case XDR_ENCODE:
-		return (xdr_opaque(xdrs, sp, size));
-
-	case XDR_FREE:
-		mem_free(sp, nodesize);
-		*cpp = NULL;
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/* 
- * Wrapper for xdr_string that can be called directly from 
- * routines like clnt_call
- */
-bool_t
-xdr_wrapstring(xdrs, cpp)
-	XDR *xdrs;
-	char **cpp;
-{
-	return xdr_string(xdrs, cpp, LASTUNSIGNED);
-}
-
-/*
- * NOTE: xdr_hyper(), xdr_u_hyper(), xdr_longlong_t(), and xdr_u_longlong_t()
- * are in the "non-portable" section because they require that a `long long'
- * be a 64-bit type.
- *
- *	--thorpej@netbsd.org, November 30, 1999
- */
-
-/*
- * XDR 64-bit integers
- */
-bool_t
-xdr_int64_t(xdrs, llp)
-	XDR *xdrs;
-	int64_t *llp;
-{
-	u_long ul[2];
-
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		ul[0] = (u_long)((u_int64_t)*llp >> 32) & 0xffffffff;
-		ul[1] = (u_long)((u_int64_t)*llp) & 0xffffffff;
-		if (XDR_PUTLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		return (XDR_PUTLONG(xdrs, (long *)&ul[1]));
-	case XDR_DECODE:
-		if (XDR_GETLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		if (XDR_GETLONG(xdrs, (long *)&ul[1]) == FALSE)
-			return (FALSE);
-		*llp = (int64_t)
-		    (((u_int64_t)ul[0] << 32) | ((u_int64_t)ul[1]));
-		return (TRUE);
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR unsigned 64-bit integers
- */
-bool_t
-xdr_u_int64_t(xdrs, ullp)
-	XDR *xdrs;
-	u_int64_t *ullp;
-{
-	u_long ul[2];
-
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		ul[0] = (u_long)(*ullp >> 32) & 0xffffffff;
-		ul[1] = (u_long)(*ullp) & 0xffffffff;
-		if (XDR_PUTLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		return (XDR_PUTLONG(xdrs, (long *)&ul[1]));
-	case XDR_DECODE:
-		if (XDR_GETLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		if (XDR_GETLONG(xdrs, (long *)&ul[1]) == FALSE)
-			return (FALSE);
-		*ullp = (u_int64_t)
-		    (((u_int64_t)ul[0] << 32) | ((u_int64_t)ul[1]));
-		return (TRUE);
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-/*
- * XDR unsigned 64-bit integers
- */
-bool_t
-xdr_uint64_t(xdrs, ullp)
-	XDR *xdrs;
-	uint64_t *ullp;
-{
-	u_long ul[2];
-
-	switch (xdrs->x_op) {
-	case XDR_ENCODE:
-		ul[0] = (u_long)(*ullp >> 32) & 0xffffffff;
-		ul[1] = (u_long)(*ullp) & 0xffffffff;
-		if (XDR_PUTLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		return (XDR_PUTLONG(xdrs, (long *)&ul[1]));
-	case XDR_DECODE:
-		if (XDR_GETLONG(xdrs, (long *)&ul[0]) == FALSE)
-			return (FALSE);
-		if (XDR_GETLONG(xdrs, (long *)&ul[1]) == FALSE)
-			return (FALSE);
-		*ullp = (u_int64_t)
-		    (((u_int64_t)ul[0] << 32) | ((u_int64_t)ul[1]));
-		return (TRUE);
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-
-/*
- * XDR hypers
- */
-bool_t
-xdr_hyper(xdrs, llp)
-	XDR *xdrs;
-	longlong_t *llp;
-{
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_int64_t().
-	 */
-	return (xdr_int64_t(xdrs, (int64_t *)llp));
-}
-
-
-/*
- * XDR unsigned hypers
- */
-bool_t
-xdr_u_hyper(xdrs, ullp)
-	XDR *xdrs;
-	u_longlong_t *ullp;
-{
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_u_int64_t().
-	 */
-	return (xdr_u_int64_t(xdrs, (u_int64_t *)ullp));
-}
-
-
-/*
- * XDR longlong_t's
- */
-bool_t
-xdr_longlong_t(xdrs, llp)
-	XDR *xdrs;
-	longlong_t *llp;
-{
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_int64_t().
-	 */
-	return (xdr_int64_t(xdrs, (int64_t *)llp));
-}
-
-
-/*
- * XDR u_longlong_t's
- */
-bool_t
-xdr_u_longlong_t(xdrs, ullp)
-	XDR *xdrs;
-	u_longlong_t *ullp;
-{
-
-	/*
-	 * Don't bother open-coding this; it's a fair amount of code.  Just
-	 * call xdr_u_int64_t().
-	 */
-	return (xdr_u_int64_t(xdrs, (u_int64_t *)ullp));
-}
diff --git a/lib/libc_bsd/xdr/xdr_array.c b/lib/libc_bsd/xdr/xdr_array.c
deleted file mode 100644
index eb70045..0000000
--- a/lib/libc_bsd/xdr/xdr_array.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*	$NetBSD: xdr_array.c,v 1.12 2000/01/22 22:19:18 mycroft Exp $	*/
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr_array.c 1.10 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_array.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/xdr/xdr_array.c 272850 2014-10-09 23:05:32Z hrs $");
-
-/*
- * xdr_array.c, Generic XDR routines impelmentation.
- *
- * These are the "non-trivial" xdr primitives used to serialize and de-serialize
- * arrays.  See xdr.h for more info on the interface to xdr.
- */
-
-#include "namespace.h"
-#include <err.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-/*
- * XDR an array of arbitrary elements
- * *addrp is a pointer to the array, *sizep is the number of elements.
- * If addrp is NULL (*sizep * elsize) bytes are allocated.
- * elsize is the size (in bytes) of each element, and elproc is the
- * xdr procedure to call to handle each element of the array.
- */
-bool_t
-xdr_array(xdrs, addrp, sizep, maxsize, elsize, elproc)
-	XDR *xdrs;
-	caddr_t *addrp;		/* array pointer */
-	u_int *sizep;		/* number of elements */
-	u_int maxsize;		/* max numberof elements */
-	u_int elsize;		/* size in bytes of each element */
-	xdrproc_t elproc;	/* xdr routine to handle each element */
-{
-	u_int i;
-	caddr_t target = *addrp;
-	u_int c;  /* the actual element count */
-	bool_t stat = TRUE;
-	u_int nodesize;
-
-	/* like strings, arrays are really counted arrays */
-	if (!xdr_u_int(xdrs, sizep)) {
-		return (FALSE);
-	}
-	c = *sizep;
-	if ((c > maxsize || UINT_MAX/elsize < c) &&
-	    (xdrs->x_op != XDR_FREE)) {
-		return (FALSE);
-	}
-	nodesize = c * elsize;
-
-	/*
-	 * if we are deserializing, we may need to allocate an array.
-	 * We also save time by checking for a null array if we are freeing.
-	 */
-	if (target == NULL)
-		switch (xdrs->x_op) {
-		case XDR_DECODE:
-			if (c == 0)
-				return (TRUE);
-			*addrp = target = mem_alloc(nodesize);
-			if (target == NULL) {
-				warnx("xdr_array: out of memory");
-				return (FALSE);
-			}
-			memset(target, 0, nodesize);
-			break;
-
-		case XDR_FREE:
-			return (TRUE);
-
-		case XDR_ENCODE:
-			break;
-	}
-	
-	/*
-	 * now we xdr each element of array
-	 */
-	for (i = 0; (i < c) && stat; i++) {
-		stat = (*elproc)(xdrs, target);
-		target += elsize;
-	}
-
-	/*
-	 * the array may need freeing
-	 */
-	if (xdrs->x_op == XDR_FREE) {
-		mem_free(*addrp, nodesize);
-		*addrp = NULL;
-	}
-	return (stat);
-}
-
-/*
- * xdr_vector():
- *
- * XDR a fixed length array. Unlike variable-length arrays,
- * the storage of fixed length arrays is static and unfreeable.
- * > basep: base of the array
- * > size: size of the array
- * > elemsize: size of each element
- * > xdr_elem: routine to XDR each element
- */
-bool_t
-xdr_vector(xdrs, basep, nelem, elemsize, xdr_elem)
-	XDR *xdrs;
-	char *basep;
-	u_int nelem;
-	u_int elemsize;
-	xdrproc_t xdr_elem;	
-{
-	u_int i;
-	char *elptr;
-
-	elptr = basep;
-	for (i = 0; i < nelem; i++) {
-		if (!(*xdr_elem)(xdrs, elptr)) {
-			return(FALSE);
-		}
-		elptr += elemsize;
-	}
-	return(TRUE);	
-}
diff --git a/lib/libc_bsd/xdr/xdr_float.c b/lib/libc_bsd/xdr/xdr_float.c
deleted file mode 100644
index b51f51e..0000000
--- a/lib/libc_bsd/xdr/xdr_float.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*	$NetBSD: xdr_float.c,v 1.23 2000/07/17 04:59:51 matt Exp $	*/
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr_float.c 1.12 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_float.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/xdr/xdr_float.c 272850 2014-10-09 23:05:32Z hrs $");
-
-/*
- * xdr_float.c, Generic XDR routines implementation.
- *
- * These are the "floating point" xdr routines used to (de)serialize
- * most common data items.  See xdr.h for more info on the interface to
- * xdr.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-#include <sys/param.h>
-
-#include <stdio.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-/*
- * NB: Not portable.
- * This routine works on machines with IEEE754 FP and Vaxen.
- */
-
-#if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
-    defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
-    defined(__arm__) || defined(__ppc__) || defined(__ia64__) || \
-    defined(__arm26__) || defined(__sparc64__) || defined(__amd64__)
-#include <machine/endian.h>
-#define IEEEFP
-#endif
-
-#if defined(__vax__)
-
-/* What IEEE single precision floating point looks like on a Vax */
-struct	ieee_single {
-	unsigned int	mantissa: 23;
-	unsigned int	exp     : 8;
-	unsigned int	sign    : 1;
-};
-
-/* Vax single precision floating point */
-struct	vax_single {
-	unsigned int	mantissa1 : 7;
-	unsigned int	exp       : 8;
-	unsigned int	sign      : 1;
-	unsigned int	mantissa2 : 16;
-};
-
-#define VAX_SNG_BIAS	0x81
-#define IEEE_SNG_BIAS	0x7f
-
-static struct sgl_limits {
-	struct vax_single s;
-	struct ieee_single ieee;
-} sgl_limits[2] = {
-	{{ 0x7f, 0xff, 0x0, 0xffff },	/* Max Vax */
-	{ 0x0, 0xff, 0x0 }},		/* Max IEEE */
-	{{ 0x0, 0x0, 0x0, 0x0 },	/* Min Vax */
-	{ 0x0, 0x0, 0x0 }}		/* Min IEEE */
-};
-#endif /* vax */
-
-bool_t
-xdr_float(xdrs, fp)
-	XDR *xdrs;
-	float *fp;
-{
-#ifndef IEEEFP
-	struct ieee_single is;
-	struct vax_single vs, *vsp;
-	struct sgl_limits *lim;
-	int i;
-#endif
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-#ifdef IEEEFP
-		return (XDR_PUTINT32(xdrs, (int32_t *)fp));
-#else
-		vs = *((struct vax_single *)fp);
-		for (i = 0, lim = sgl_limits;
-			i < sizeof(sgl_limits)/sizeof(struct sgl_limits);
-			i++, lim++) {
-			if ((vs.mantissa2 == lim->s.mantissa2) &&
-				(vs.exp == lim->s.exp) &&
-				(vs.mantissa1 == lim->s.mantissa1)) {
-				is = lim->ieee;
-				goto shipit;
-			}
-		}
-		is.exp = vs.exp - VAX_SNG_BIAS + IEEE_SNG_BIAS;
-		is.mantissa = (vs.mantissa1 << 16) | vs.mantissa2;
-	shipit:
-		is.sign = vs.sign;
-		return (XDR_PUTINT32(xdrs, (int32_t *)&is));
-#endif
-
-	case XDR_DECODE:
-#ifdef IEEEFP
-		return (XDR_GETINT32(xdrs, (int32_t *)fp));
-#else
-		vsp = (struct vax_single *)fp;
-		if (!XDR_GETINT32(xdrs, (int32_t *)&is))
-			return (FALSE);
-		for (i = 0, lim = sgl_limits;
-			i < sizeof(sgl_limits)/sizeof(struct sgl_limits);
-			i++, lim++) {
-			if ((is.exp == lim->ieee.exp) &&
-				(is.mantissa == lim->ieee.mantissa)) {
-				*vsp = lim->s;
-				goto doneit;
-			}
-		}
-		vsp->exp = is.exp - IEEE_SNG_BIAS + VAX_SNG_BIAS;
-		vsp->mantissa2 = is.mantissa;
-		vsp->mantissa1 = (is.mantissa >> 16);
-	doneit:
-		vsp->sign = is.sign;
-		return (TRUE);
-#endif
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
-
-#if defined(__vax__)
-/* What IEEE double precision floating point looks like on a Vax */
-struct	ieee_double {
-	unsigned int	mantissa1 : 20;
-	unsigned int	exp       : 11;
-	unsigned int	sign      : 1;
-	unsigned int	mantissa2 : 32;
-};
-
-/* Vax double precision floating point */
-struct  vax_double {
-	unsigned int	mantissa1 : 7;
-	unsigned int	exp       : 8;
-	unsigned int	sign      : 1;
-	unsigned int	mantissa2 : 16;
-	unsigned int	mantissa3 : 16;
-	unsigned int	mantissa4 : 16;
-};
-
-#define VAX_DBL_BIAS	0x81
-#define IEEE_DBL_BIAS	0x3ff
-#define MASK(nbits)	((1 << nbits) - 1)
-
-static struct dbl_limits {
-	struct	vax_double d;
-	struct	ieee_double ieee;
-} dbl_limits[2] = {
-	{{ 0x7f, 0xff, 0x0, 0xffff, 0xffff, 0xffff },	/* Max Vax */
-	{ 0x0, 0x7ff, 0x0, 0x0 }},			/* Max IEEE */
-	{{ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0},		/* Min Vax */
-	{ 0x0, 0x0, 0x0, 0x0 }}				/* Min IEEE */
-};
-
-#endif /* vax */
-
-
-bool_t
-xdr_double(xdrs, dp)
-	XDR *xdrs;
-	double *dp;
-{
-#ifdef IEEEFP
-	int32_t *i32p;
-	bool_t rv;
-#else
-	int32_t *lp;
-	struct	ieee_double id;
-	struct	vax_double vd;
-	struct dbl_limits *lim;
-	int i;
-#endif
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-#ifdef IEEEFP
-		i32p = (int32_t *)(void *)dp;
-#if BYTE_ORDER == BIG_ENDIAN
-		rv = XDR_PUTINT32(xdrs, i32p);
-		if (!rv)
-			return (rv);
-		rv = XDR_PUTINT32(xdrs, i32p+1);
-#else
-		rv = XDR_PUTINT32(xdrs, i32p+1);
-		if (!rv)
-			return (rv);
-		rv = XDR_PUTINT32(xdrs, i32p);
-#endif
-		return (rv);
-#else
-		vd = *((struct vax_double *)dp);
-		for (i = 0, lim = dbl_limits;
-			i < sizeof(dbl_limits)/sizeof(struct dbl_limits);
-			i++, lim++) {
-			if ((vd.mantissa4 == lim->d.mantissa4) &&
-				(vd.mantissa3 == lim->d.mantissa3) &&
-				(vd.mantissa2 == lim->d.mantissa2) &&
-				(vd.mantissa1 == lim->d.mantissa1) &&
-				(vd.exp == lim->d.exp)) {
-				id = lim->ieee;
-				goto shipit;
-			}
-		}
-		id.exp = vd.exp - VAX_DBL_BIAS + IEEE_DBL_BIAS;
-		id.mantissa1 = (vd.mantissa1 << 13) | (vd.mantissa2 >> 3);
-		id.mantissa2 = ((vd.mantissa2 & MASK(3)) << 29) |
-				(vd.mantissa3 << 13) |
-				((vd.mantissa4 >> 3) & MASK(13));
-	shipit:
-		id.sign = vd.sign;
-		lp = (int32_t *)&id;
-		return (XDR_PUTINT32(xdrs, lp++) && XDR_PUTINT32(xdrs, lp));
-#endif
-
-	case XDR_DECODE:
-#ifdef IEEEFP
-		i32p = (int32_t *)(void *)dp;
-#if BYTE_ORDER == BIG_ENDIAN
-		rv = XDR_GETINT32(xdrs, i32p);
-		if (!rv)
-			return (rv);
-		rv = XDR_GETINT32(xdrs, i32p+1);
-#else
-		rv = XDR_GETINT32(xdrs, i32p+1);
-		if (!rv)
-			return (rv);
-		rv = XDR_GETINT32(xdrs, i32p);
-#endif
-		return (rv);
-#else
-		lp = (int32_t *)&id;
-		if (!XDR_GETINT32(xdrs, lp++) || !XDR_GETINT32(xdrs, lp))
-			return (FALSE);
-		for (i = 0, lim = dbl_limits;
-			i < sizeof(dbl_limits)/sizeof(struct dbl_limits);
-			i++, lim++) {
-			if ((id.mantissa2 == lim->ieee.mantissa2) &&
-				(id.mantissa1 == lim->ieee.mantissa1) &&
-				(id.exp == lim->ieee.exp)) {
-				vd = lim->d;
-				goto doneit;
-			}
-		}
-		vd.exp = id.exp - IEEE_DBL_BIAS + VAX_DBL_BIAS;
-		vd.mantissa1 = (id.mantissa1 >> 13);
-		vd.mantissa2 = ((id.mantissa1 & MASK(13)) << 3) |
-				(id.mantissa2 >> 29);
-		vd.mantissa3 = (id.mantissa2 >> 13);
-		vd.mantissa4 = (id.mantissa2 << 3);
-	doneit:
-		vd.sign = id.sign;
-		*dp = *((double *)&vd);
-		return (TRUE);
-#endif
-
-	case XDR_FREE:
-		return (TRUE);
-	}
-	/* NOTREACHED */
-	return (FALSE);
-}
diff --git a/lib/libc_bsd/xdr/xdr_mem.c b/lib/libc_bsd/xdr/xdr_mem.c
deleted file mode 100644
index 6bc0ba9..0000000
--- a/lib/libc_bsd/xdr/xdr_mem.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*	$NetBSD: xdr_mem.c,v 1.15 2000/01/22 22:19:18 mycroft Exp $	*/
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr_mem.c 1.19 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_mem.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/xdr/xdr_mem.c 272850 2014-10-09 23:05:32Z hrs $");
-
-/*
- * xdr_mem.h, XDR implementation using memory buffers.
- *
- * If you have some data to be interpreted as external data representation
- * or to be converted to external data representation in a memory buffer,
- * then this is the package for you.
- *
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <netinet/in.h>
-
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-static void xdrmem_destroy(XDR *);
-static bool_t xdrmem_getlong_aligned(XDR *, long *);
-static bool_t xdrmem_putlong_aligned(XDR *, const long *);
-static bool_t xdrmem_getlong_unaligned(XDR *, long *);
-static bool_t xdrmem_putlong_unaligned(XDR *, const long *);
-static bool_t xdrmem_getbytes(XDR *, char *, u_int);
-static bool_t xdrmem_putbytes(XDR *, const char *, u_int);
-/* XXX: w/64-bit pointers, u_int not enough! */
-static u_int xdrmem_getpos(XDR *);
-static bool_t xdrmem_setpos(XDR *, u_int);
-static int32_t *xdrmem_inline_aligned(XDR *, u_int);
-static int32_t *xdrmem_inline_unaligned(XDR *, u_int);
-
-static const struct	xdr_ops xdrmem_ops_aligned = {
-	xdrmem_getlong_aligned,
-	xdrmem_putlong_aligned,
-	xdrmem_getbytes,
-	xdrmem_putbytes,
-	xdrmem_getpos,
-	xdrmem_setpos,
-	xdrmem_inline_aligned,
-	xdrmem_destroy
-};
-
-static const struct	xdr_ops xdrmem_ops_unaligned = {
-	xdrmem_getlong_unaligned,
-	xdrmem_putlong_unaligned,
-	xdrmem_getbytes,
-	xdrmem_putbytes,
-	xdrmem_getpos,
-	xdrmem_setpos,
-	xdrmem_inline_unaligned,
-	xdrmem_destroy
-};
-
-/*
- * The procedure xdrmem_create initializes a stream descriptor for a
- * memory buffer.
- */
-void
-xdrmem_create(xdrs, addr, size, op)
-	XDR *xdrs;
-	char *addr;
-	u_int size;
-	enum xdr_op op;
-{
-
-	xdrs->x_op = op;
-	xdrs->x_ops = ((unsigned long)addr & (sizeof(int32_t) - 1))
-	    ? &xdrmem_ops_unaligned : &xdrmem_ops_aligned;
-	xdrs->x_private = xdrs->x_base = addr;
-	xdrs->x_handy = size;
-}
-
-/*ARGSUSED*/
-static void
-xdrmem_destroy(xdrs)
-	XDR *xdrs;
-{
-
-}
-
-static bool_t
-xdrmem_getlong_aligned(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	*lp = ntohl(*(uint32_t *)xdrs->x_private);
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_putlong_aligned(xdrs, lp)
-	XDR *xdrs;
-	const long *lp;
-{
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	*(uint32_t *)xdrs->x_private = htonl((uint32_t)*lp);
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_getlong_unaligned(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-	uint32_t l;
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	memmove(&l, xdrs->x_private, sizeof(int32_t));
-	*lp = ntohl(l);
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_putlong_unaligned(xdrs, lp)
-	XDR *xdrs;
-	const long *lp;
-{
-	uint32_t l;
-
-	if (xdrs->x_handy < sizeof(int32_t))
-		return (FALSE);
-	xdrs->x_handy -= sizeof(int32_t);
-	l = htonl((uint32_t)*lp);
-	memmove(xdrs->x_private, &l, sizeof(int32_t));
-	xdrs->x_private = (char *)xdrs->x_private + sizeof(int32_t);
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_getbytes(xdrs, addr, len)
-	XDR *xdrs;
-	char *addr;
-	u_int len;
-{
-
-	if (xdrs->x_handy < len)
-		return (FALSE);
-	xdrs->x_handy -= len;
-	memmove(addr, xdrs->x_private, len);
-	xdrs->x_private = (char *)xdrs->x_private + len;
-	return (TRUE);
-}
-
-static bool_t
-xdrmem_putbytes(xdrs, addr, len)
-	XDR *xdrs;
-	const char *addr;
-	u_int len;
-{
-
-	if (xdrs->x_handy < len)
-		return (FALSE);
-	xdrs->x_handy -= len;
-	memmove(xdrs->x_private, addr, len);
-	xdrs->x_private = (char *)xdrs->x_private + len;
-	return (TRUE);
-}
-
-static u_int
-xdrmem_getpos(xdrs)
-	XDR *xdrs;
-{
-
-	/* XXX w/64-bit pointers, u_int not enough! */
-	return (u_int)((u_long)xdrs->x_private - (u_long)xdrs->x_base);
-}
-
-static bool_t
-xdrmem_setpos(xdrs, pos)
-	XDR *xdrs;
-	u_int pos;
-{
-	char *newaddr = xdrs->x_base + pos;
-	char *lastaddr = (char *)xdrs->x_private + xdrs->x_handy;
-
-	if (newaddr > lastaddr)
-		return (FALSE);
-	xdrs->x_private = newaddr;
-	xdrs->x_handy = (u_int)(lastaddr - newaddr); /* XXX sizeof(u_int) <? sizeof(ptrdiff_t) */
-	return (TRUE);
-}
-
-static int32_t *
-xdrmem_inline_aligned(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-	int32_t *buf = 0;
-
-	if (xdrs->x_handy >= len) {
-		xdrs->x_handy -= len;
-		buf = (int32_t *)xdrs->x_private;
-		xdrs->x_private = (char *)xdrs->x_private + len;
-	}
-	return (buf);
-}
-
-/* ARGSUSED */
-static int32_t *
-xdrmem_inline_unaligned(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-
-	return (0);
-}
diff --git a/lib/libc_bsd/xdr/xdr_rec.c b/lib/libc_bsd/xdr/xdr_rec.c
deleted file mode 100644
index f44e748..0000000
--- a/lib/libc_bsd/xdr/xdr_rec.c
+++ /dev/null
@@ -1,795 +0,0 @@
-/*	$NetBSD: xdr_rec.c,v 1.18 2000/07/06 03:10:35 christos Exp $	*/
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint) 
-static char *sccsid2 = "@(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_rec.c	2.2 88/08/01 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/xdr/xdr_rec.c 272850 2014-10-09 23:05:32Z hrs $");
-
-/*
- * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
- * layer above tcp (for rpc's use).
- *
- * These routines interface XDRSTREAMS to a tcp/ip connection.
- * There is a record marking layer between the xdr stream
- * and the tcp transport level.  A record is composed on one or more
- * record fragments.  A record fragment is a thirty-two bit header followed
- * by n bytes of data, where n is contained in the header.  The header
- * is represented as a htonl(u_long).  Thegh order bit encodes
- * whether or not the fragment is the last fragment of the record
- * (1 => fragment is last, 0 => more fragments to follow. 
- * The other 31 bits encode the byte length of the fragment.
- */
-
-#include "namespace.h"
-#include <sys/types.h>
-
-#include <netinet/in.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <rpc/auth.h>
-#include <rpc/svc.h>
-#include <rpc/clnt.h>
-#include <sys/stddef.h>
-#include "un-namespace.h"
-#include "rpc_com.h"
-
-static bool_t	xdrrec_getlong(XDR *, long *);
-static bool_t	xdrrec_putlong(XDR *, const long *);
-static bool_t	xdrrec_getbytes(XDR *, char *, u_int);
-
-static bool_t	xdrrec_putbytes(XDR *, const char *, u_int);
-static u_int	xdrrec_getpos(XDR *);
-static bool_t	xdrrec_setpos(XDR *, u_int);
-static int32_t *xdrrec_inline(XDR *, u_int);
-static void	xdrrec_destroy(XDR *);
-
-static const struct  xdr_ops xdrrec_ops = {
-	xdrrec_getlong,
-	xdrrec_putlong,
-	xdrrec_getbytes,
-	xdrrec_putbytes,
-	xdrrec_getpos,
-	xdrrec_setpos,
-	xdrrec_inline,
-	xdrrec_destroy
-};
-
-/*
- * A record is composed of one or more record fragments.
- * A record fragment is a four-byte header followed by zero to
- * 2**32-1 bytes.  The header is treated as a long unsigned and is
- * encode/decoded to the network via htonl/ntohl.  The low order 31 bits
- * are a byte count of the fragment.  The highest order bit is a boolean:
- * 1 => this fragment is the last fragment of the record,
- * 0 => this fragment is followed by more fragment(s).
- *
- * The fragment/record machinery is not general;  it is constructed to
- * meet the needs of xdr and rpc based on tcp.
- */
-
-#define LAST_FRAG ((uint32_t)(1U << 31))
-
-typedef struct rec_strm {
-	char *tcp_handle;
-	/*
-	 * out-goung bits
-	 */
-	int (*writeit)(void *, void *, int);
-	char *out_base;	/* output buffer (points to frag header) */
-	char *out_finger;	/* next output position */
-	char *out_boundry;	/* data cannot up to this address */
-	uint32_t *frag_header;	/* beginning of curren fragment */
-	bool_t frag_sent;	/* true if buffer sent in middle of record */
-	/*
-	 * in-coming bits
-	 */
-	int (*readit)(void *, void *, int);
-	u_long in_size;	/* fixed size of the input buffer */
-	char *in_base;
-	char *in_finger;	/* location of next byte to be had */
-	char *in_boundry;	/* can read up to this location */
-	long fbtbc;		/* fragment bytes to be consumed */
-	bool_t last_frag;
-	u_int sendsize;
-	u_int recvsize;
-
-	bool_t nonblock;
-	bool_t in_haveheader;
-	uint32_t in_header;
-	char *in_hdrp;
-	int in_hdrlen;
-	int in_reclen;
-	int in_received;
-	int in_maxrec;
-} RECSTREAM;
-
-static u_int	fix_buf_size(u_int);
-static bool_t	flush_out(RECSTREAM *, bool_t);
-static bool_t	fill_input_buf(RECSTREAM *);
-static bool_t	get_input_bytes(RECSTREAM *, char *, int);
-static bool_t	set_input_fragment(RECSTREAM *);
-static bool_t	skip_input_bytes(RECSTREAM *, long);
-static bool_t	realloc_stream(RECSTREAM *, int);
-
-
-/*
- * Create an xdr handle for xdrrec
- * xdrrec_create fills in xdrs.  Sendsize and recvsize are
- * send and recv buffer sizes (0 => use default).
- * tcp_handle is an opaque handle that is passed as the first parameter to
- * the procedures readit and writeit.  Readit and writeit are read and
- * write respectively.   They are like the system
- * calls expect that they take an opaque handle rather than an fd.
- */
-void
-xdrrec_create(xdrs, sendsize, recvsize, tcp_handle, readit, writeit)
-	XDR *xdrs;
-	u_int sendsize;
-	u_int recvsize;
-	void *tcp_handle;
-	/* like read, but pass it a tcp_handle, not sock */
-	int (*readit)(void *, void *, int);
-	/* like write, but pass it a tcp_handle, not sock */
-	int (*writeit)(void *, void *, int);
-{
-	RECSTREAM *rstrm = mem_alloc(sizeof(RECSTREAM));
-
-	if (rstrm == NULL) {
-		warnx("xdrrec_create: out of memory");
-		/* 
-		 *  This is bad.  Should rework xdrrec_create to 
-		 *  return a handle, and in this case return NULL
-		 */
-		return;
-	}
-	rstrm->sendsize = sendsize = fix_buf_size(sendsize);
-	rstrm->out_base = mem_alloc(rstrm->sendsize);
-	if (rstrm->out_base == NULL) {
-		warnx("xdrrec_create: out of memory");
-		mem_free(rstrm, sizeof(RECSTREAM));
-		return;
-	}
-	rstrm->recvsize = recvsize = fix_buf_size(recvsize);
-	rstrm->in_base = mem_alloc(recvsize);
-	if (rstrm->in_base == NULL) {
-		warnx("xdrrec_create: out of memory");
-		mem_free(rstrm->out_base, sendsize);
-		mem_free(rstrm, sizeof(RECSTREAM));
-		return;
-	}
-	/*
-	 * now the rest ...
-	 */
-	xdrs->x_ops = &xdrrec_ops;
-	xdrs->x_private = rstrm;
-	rstrm->tcp_handle = tcp_handle;
-	rstrm->readit = readit;
-	rstrm->writeit = writeit;
-	rstrm->out_finger = rstrm->out_boundry = rstrm->out_base;
-	rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base;
-	rstrm->out_finger += sizeof(uint32_t);
-	rstrm->out_boundry += sendsize;
-	rstrm->frag_sent = FALSE;
-	rstrm->in_size = recvsize;
-	rstrm->in_boundry = rstrm->in_base;
-	rstrm->in_finger = (rstrm->in_boundry += recvsize);
-	rstrm->fbtbc = 0;
-	rstrm->last_frag = TRUE;
-	rstrm->in_haveheader = FALSE;
-	rstrm->in_hdrlen = 0;
-	rstrm->in_hdrp = (char *)(void *)&rstrm->in_header;
-	rstrm->nonblock = FALSE;
-	rstrm->in_reclen = 0;
-	rstrm->in_received = 0;
-}
-
-
-/*
- * The reoutines defined below are the xdr ops which will go into the
- * xdr handle filled in by xdrrec_create.
- */
-
-static bool_t
-xdrrec_getlong(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	int32_t *buflp = (int32_t *)(void *)(rstrm->in_finger);
-	int32_t mylong;
-
-	/* first try the inline, fast case */
-	if ((rstrm->fbtbc >= sizeof(int32_t)) &&
-		(((long)rstrm->in_boundry - (long)buflp) >= sizeof(int32_t))) {
-		*lp = (long)ntohl((uint32_t)(*buflp));
-		rstrm->fbtbc -= sizeof(int32_t);
-		rstrm->in_finger += sizeof(int32_t);
-	} else {
-		if (! xdrrec_getbytes(xdrs, (char *)(void *)&mylong,
-		    sizeof(int32_t)))
-			return (FALSE);
-		*lp = (long)ntohl((uint32_t)mylong);
-	}
-	return (TRUE);
-}
-
-static bool_t
-xdrrec_putlong(xdrs, lp)
-	XDR *xdrs;
-	const long *lp;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	int32_t *dest_lp = ((int32_t *)(void *)(rstrm->out_finger));
-
-	if ((rstrm->out_finger += sizeof(int32_t)) > rstrm->out_boundry) {
-		/*
-		 * this case should almost never happen so the code is
-		 * inefficient
-		 */
-		rstrm->out_finger -= sizeof(int32_t);
-		rstrm->frag_sent = TRUE;
-		if (! flush_out(rstrm, FALSE))
-			return (FALSE);
-		dest_lp = ((int32_t *)(void *)(rstrm->out_finger));
-		rstrm->out_finger += sizeof(int32_t);
-	}
-	*dest_lp = (int32_t)htonl((uint32_t)(*lp));
-	return (TRUE);
-}
-
-static bool_t  /* must manage buffers, fragments, and records */
-xdrrec_getbytes(xdrs, addr, len)
-	XDR *xdrs;
-	char *addr;
-	u_int len;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	int current;
-
-	while (len > 0) {
-		current = (int)rstrm->fbtbc;
-		if (current == 0) {
-			if (rstrm->last_frag)
-				return (FALSE);
-			if (! set_input_fragment(rstrm))
-				return (FALSE);
-			continue;
-		}
-		current = (len < current) ? len : current;
-		if (! get_input_bytes(rstrm, addr, current))
-			return (FALSE);
-		addr += current; 
-		rstrm->fbtbc -= current;
-		len -= current;
-	}
-	return (TRUE);
-}
-
-static bool_t
-xdrrec_putbytes(xdrs, addr, len)
-	XDR *xdrs;
-	const char *addr;
-	u_int len;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	size_t current;
-
-	while (len > 0) {
-		current = (size_t)((u_long)rstrm->out_boundry -
-		    (u_long)rstrm->out_finger);
-		current = (len < current) ? len : current;
-		memmove(rstrm->out_finger, addr, current);
-		rstrm->out_finger += current;
-		addr += current;
-		len -= current;
-		if (rstrm->out_finger == rstrm->out_boundry) {
-			rstrm->frag_sent = TRUE;
-			if (! flush_out(rstrm, FALSE))
-				return (FALSE);
-		}
-	}
-	return (TRUE);
-}
-
-static u_int
-xdrrec_getpos(xdrs)
-	XDR *xdrs;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	off_t pos;
-
-	pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1);
-	if (pos == -1)
-		pos = 0;
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		pos += rstrm->out_finger - rstrm->out_base;
-		break;
-
-	case XDR_DECODE:
-		pos -= rstrm->in_boundry - rstrm->in_finger;
-		break;
-
-	default:
-		pos = (off_t) -1;
-		break;
-	}
-	return ((u_int) pos);
-}
-
-static bool_t
-xdrrec_setpos(xdrs, pos)
-	XDR *xdrs;
-	u_int pos;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	u_int currpos = xdrrec_getpos(xdrs);
-	int delta = currpos - pos;
-	char *newpos;
-
-	if ((int)currpos != -1)
-		switch (xdrs->x_op) {
-
-		case XDR_ENCODE:
-			newpos = rstrm->out_finger - delta;
-			if ((newpos > (char *)(void *)(rstrm->frag_header)) &&
-				(newpos < rstrm->out_boundry)) {
-				rstrm->out_finger = newpos;
-				return (TRUE);
-			}
-			break;
-
-		case XDR_DECODE:
-			newpos = rstrm->in_finger - delta;
-			if ((delta < (int)(rstrm->fbtbc)) &&
-				(newpos <= rstrm->in_boundry) &&
-				(newpos >= rstrm->in_base)) {
-				rstrm->in_finger = newpos;
-				rstrm->fbtbc -= delta;
-				return (TRUE);
-			}
-			break;
-
-		case XDR_FREE:
-			break;
-		}
-	return (FALSE);
-}
-
-static int32_t *
-xdrrec_inline(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-	int32_t *buf = NULL;
-
-	switch (xdrs->x_op) {
-
-	case XDR_ENCODE:
-		if ((rstrm->out_finger + len) <= rstrm->out_boundry) {
-			buf = (int32_t *)(void *)rstrm->out_finger;
-			rstrm->out_finger += len;
-		}
-		break;
-
-	case XDR_DECODE:
-		if ((len <= rstrm->fbtbc) &&
-			((rstrm->in_finger + len) <= rstrm->in_boundry)) {
-			buf = (int32_t *)(void *)rstrm->in_finger;
-			rstrm->fbtbc -= len;
-			rstrm->in_finger += len;
-		}
-		break;
-
-	case XDR_FREE:
-		break;
-	}
-	return (buf);
-}
-
-static void
-xdrrec_destroy(xdrs)
-	XDR *xdrs;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private;
-
-	mem_free(rstrm->out_base, rstrm->sendsize);
-	mem_free(rstrm->in_base, rstrm->recvsize);
-	mem_free(rstrm, sizeof(RECSTREAM));
-}
-
-
-/*
- * Exported routines to manage xdr records
- */
-
-/*
- * Before reading (deserializing from the stream, one should always call
- * this procedure to guarantee proper record alignment.
- */
-bool_t
-xdrrec_skiprecord(xdrs)
-	XDR *xdrs;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	enum xprt_stat xstat;
-
-	if (rstrm->nonblock) {
-		if (__xdrrec_getrec(xdrs, &xstat, FALSE)) {
-			rstrm->fbtbc = 0;
-			return TRUE;
-		}
-		if (rstrm->in_finger == rstrm->in_boundry &&
-		    xstat == XPRT_MOREREQS) {
-			rstrm->fbtbc = 0;
-			return TRUE;
-		}
-		return FALSE;
-	}
-
-	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
-		if (! skip_input_bytes(rstrm, rstrm->fbtbc))
-			return (FALSE);
-		rstrm->fbtbc = 0;
-		if ((! rstrm->last_frag) && (! set_input_fragment(rstrm)))
-			return (FALSE);
-	}
-	rstrm->last_frag = FALSE;
-	return (TRUE);
-}
-
-/*
- * Look ahead function.
- * Returns TRUE iff there is no more input in the buffer
- * after consuming the rest of the current record.
- */
-bool_t
-xdrrec_eof(xdrs)
-	XDR *xdrs;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-
-	while (rstrm->fbtbc > 0 || (! rstrm->last_frag)) {
-		if (! skip_input_bytes(rstrm, rstrm->fbtbc))
-			return (TRUE);
-		rstrm->fbtbc = 0;
-		if ((! rstrm->last_frag) && (! set_input_fragment(rstrm)))
-			return (TRUE);
-	}
-	if (rstrm->in_finger == rstrm->in_boundry)
-		return (TRUE);
-	return (FALSE);
-}
-
-/*
- * The client must tell the package when an end-of-record has occurred.
- * The second paraemters tells whether the record should be flushed to the
- * (output) tcp stream.  (This let's the package support batched or
- * pipelined procedure calls.)  TRUE => immmediate flush to tcp connection.
- */
-bool_t
-xdrrec_endofrecord(xdrs, sendnow)
-	XDR *xdrs;
-	bool_t sendnow;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	u_long len;  /* fragment length */
-
-	if (sendnow || rstrm->frag_sent ||
-		((u_long)rstrm->out_finger + sizeof(uint32_t) >=
-		(u_long)rstrm->out_boundry)) {
-		rstrm->frag_sent = FALSE;
-		return (flush_out(rstrm, TRUE));
-	}
-	len = (u_long)(rstrm->out_finger) - (u_long)(rstrm->frag_header) -
-	   sizeof(uint32_t);
-	*(rstrm->frag_header) = htonl((uint32_t)len | LAST_FRAG);
-	rstrm->frag_header = (uint32_t *)(void *)rstrm->out_finger;
-	rstrm->out_finger += sizeof(uint32_t);
-	return (TRUE);
-}
-
-/*
- * Fill the stream buffer with a record for a non-blocking connection.
- * Return true if a record is available in the buffer, false if not.
- */
-bool_t
-__xdrrec_getrec(xdrs, statp, expectdata)
-	XDR *xdrs;
-	enum xprt_stat *statp;
-	bool_t expectdata;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-	ssize_t n;
-	int fraglen;
-
-	if (!rstrm->in_haveheader) {
-		n = rstrm->readit(rstrm->tcp_handle, rstrm->in_hdrp,
-		    (int)sizeof (rstrm->in_header) - rstrm->in_hdrlen);
-		if (n == 0) {
-			*statp = expectdata ? XPRT_DIED : XPRT_IDLE;
-			return FALSE;
-		}
-		if (n < 0) {
-			*statp = XPRT_DIED;
-			return FALSE;
-		}
-		rstrm->in_hdrp += n;
-		rstrm->in_hdrlen += n;
-		if (rstrm->in_hdrlen < sizeof (rstrm->in_header)) {
-			*statp = XPRT_MOREREQS;
-			return FALSE;
-		}
-		rstrm->in_header = ntohl(rstrm->in_header);
-		fraglen = (int)(rstrm->in_header & ~LAST_FRAG);
-		if (fraglen == 0 || fraglen > rstrm->in_maxrec ||
-		    (rstrm->in_reclen + fraglen) > rstrm->in_maxrec) {
-			*statp = XPRT_DIED;
-			return FALSE;
-		}
-		rstrm->in_reclen += fraglen;
-		if (rstrm->in_reclen > rstrm->recvsize)
-			realloc_stream(rstrm, rstrm->in_reclen);
-		if (rstrm->in_header & LAST_FRAG) {
-			rstrm->in_header &= ~LAST_FRAG;
-			rstrm->last_frag = TRUE;
-		}
-		/*
-		 * We can only reasonably expect to read once from a
-		 * non-blocking stream. Reading the fragment header
-		 * may have drained the stream.
-		 */
-		expectdata = FALSE;
-	}
-
-	n =  rstrm->readit(rstrm->tcp_handle,
-	    rstrm->in_base + rstrm->in_received,
-	    (rstrm->in_reclen - rstrm->in_received));
-
-	if (n < 0) {
-		*statp = XPRT_DIED;
-		return FALSE;
-	}
-
-	if (n == 0) {
-		*statp = expectdata ? XPRT_DIED : XPRT_IDLE;
-		return FALSE;
-	}
-
-	rstrm->in_received += n;
-
-	if (rstrm->in_received == rstrm->in_reclen) {
-		rstrm->in_haveheader = FALSE;
-		rstrm->in_hdrp = (char *)(void *)&rstrm->in_header;
-		rstrm->in_hdrlen = 0;
-		if (rstrm->last_frag) {
-			rstrm->fbtbc = rstrm->in_reclen;
-			rstrm->in_boundry = rstrm->in_base + rstrm->in_reclen;
-			rstrm->in_finger = rstrm->in_base;
-			rstrm->in_reclen = rstrm->in_received = 0;
-			*statp = XPRT_MOREREQS;
-			return TRUE;
-		}
-	}
-
-	*statp = XPRT_MOREREQS;
-	return FALSE;
-}
-
-bool_t
-__xdrrec_setnonblock(xdrs, maxrec)
-	XDR *xdrs;
-	int maxrec;
-{
-	RECSTREAM *rstrm = (RECSTREAM *)(xdrs->x_private);
-
-	rstrm->nonblock = TRUE;
-	if (maxrec == 0)
-		maxrec = rstrm->recvsize;
-	rstrm->in_maxrec = maxrec;
-	return TRUE;
-}
-
-/*
- * Internal useful routines
- */
-static bool_t
-flush_out(rstrm, eor)
-	RECSTREAM *rstrm;
-	bool_t eor;
-{
-	uint32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
-	uint32_t len = (uint32_t)((u_long)(rstrm->out_finger) - 
-		(u_long)(rstrm->frag_header) - sizeof(uint32_t));
-
-	*(rstrm->frag_header) = htonl(len | eormask);
-	len = (uint32_t)((u_long)(rstrm->out_finger) - 
-	    (u_long)(rstrm->out_base));
-	if ((*(rstrm->writeit))(rstrm->tcp_handle, rstrm->out_base, (int)len)
-		!= (int)len)
-		return (FALSE);
-	rstrm->frag_header = (uint32_t *)(void *)rstrm->out_base;
-	rstrm->out_finger = (char *)rstrm->out_base + sizeof(uint32_t);
-	return (TRUE);
-}
-
-static bool_t  /* knows nothing about records!  Only about input buffers */
-fill_input_buf(rstrm)
-	RECSTREAM *rstrm;
-{
-	char *where;
-	uint32_t i;
-	int len;
-
-	if (rstrm->nonblock)
-		return FALSE;
-
-	where = rstrm->in_base;
-	i = (uint32_t)((u_long)rstrm->in_boundry % BYTES_PER_XDR_UNIT);
-	where += i;
-	len = (uint32_t)(rstrm->in_size - i);
-	if ((len = (*(rstrm->readit))(rstrm->tcp_handle, where, len)) == -1)
-		return (FALSE);
-	rstrm->in_finger = where;
-	where += len;
-	rstrm->in_boundry = where;
-	return (TRUE);
-}
-
-static bool_t  /* knows nothing about records!  Only about input buffers */
-get_input_bytes(rstrm, addr, len)
-	RECSTREAM *rstrm;
-	char *addr;
-	int len;
-{
-	size_t current;
-
-	if (rstrm->nonblock) {
-		if (len > (int)(rstrm->in_boundry - rstrm->in_finger))
-			return FALSE;
-		memcpy(addr, rstrm->in_finger, (size_t)len);
-		rstrm->in_finger += len;
-		return TRUE;
-	}
-
-	while (len > 0) {
-		current = (size_t)((long)rstrm->in_boundry -
-		    (long)rstrm->in_finger);
-		if (current == 0) {
-			if (! fill_input_buf(rstrm))
-				return (FALSE);
-			continue;
-		}
-		current = (len < current) ? len : current;
-		memmove(addr, rstrm->in_finger, current);
-		rstrm->in_finger += current;
-		addr += current;
-		len -= current;
-	}
-	return (TRUE);
-}
-
-static bool_t  /* next two bytes of the input stream are treated as a header */
-set_input_fragment(rstrm)
-	RECSTREAM *rstrm;
-{
-	uint32_t header;
-
-	if (rstrm->nonblock)
-		return FALSE;
-	if (! get_input_bytes(rstrm, (char *)(void *)&header, sizeof(header)))
-		return (FALSE);
-	header = ntohl(header);
-	rstrm->last_frag = ((header & LAST_FRAG) == 0) ? FALSE : TRUE;
-	/*
-	 * Sanity check. Try not to accept wildly incorrect
-	 * record sizes. Unfortunately, the only record size
-	 * we can positively identify as being 'wildly incorrect'
-	 * is zero. Ridiculously large record sizes may look wrong,
-	 * but we don't have any way to be certain that they aren't
-	 * what the client actually intended to send us.
-	 */
-	if (header == 0)
-		return(FALSE);
-	rstrm->fbtbc = header & (~LAST_FRAG);
-	return (TRUE);
-}
-
-static bool_t  /* consumes input bytes; knows nothing about records! */
-skip_input_bytes(rstrm, cnt)
-	RECSTREAM *rstrm;
-	long cnt;
-{
-	uint32_t current;
-
-	while (cnt > 0) {
-		current = (size_t)((long)rstrm->in_boundry - 
-		    (long)rstrm->in_finger);
-		if (current == 0) {
-			if (! fill_input_buf(rstrm))
-				return (FALSE);
-			continue;
-		}
-		current = (uint32_t)((cnt < current) ? cnt : current);
-		rstrm->in_finger += current;
-		cnt -= current;
-	}
-	return (TRUE);
-}
-
-static u_int
-fix_buf_size(s)
-	u_int s;
-{
-
-	if (s < 100)
-		s = 4000;
-	return (RNDUP(s));
-}
-
-/*
- * Reallocate the input buffer for a non-block stream.
- */
-static bool_t
-realloc_stream(rstrm, size)
-	RECSTREAM *rstrm;
-	int size;
-{
-	ptrdiff_t diff;
-	char *buf;
-
-	if (size > rstrm->recvsize) {
-		buf = realloc(rstrm->in_base, (size_t)size);
-		if (buf == NULL)
-			return FALSE;
-		diff = buf - rstrm->in_base;
-		rstrm->in_finger += diff;
-		rstrm->in_base = buf;
-		rstrm->in_boundry = buf + size;
-		rstrm->recvsize = size;
-		rstrm->in_size = size;
-	}
-
-	return TRUE;
-}
diff --git a/lib/libc_bsd/xdr/xdr_reference.c b/lib/libc_bsd/xdr/xdr_reference.c
deleted file mode 100644
index 2f81fe5..0000000
--- a/lib/libc_bsd/xdr/xdr_reference.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*	$NetBSD: xdr_reference.c,v 1.13 2000/01/22 22:19:18 mycroft Exp	$ */
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint) 
-static char *sccsid2 = "@(#)xdr_reference.c 1.11 87/08/11 SMI";
-static char *sccsid = "@(#)xdr_reference.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/xdr/xdr_reference.c 272850 2014-10-09 23:05:32Z hrs $");
-
-/*
- * xdr_reference.c, Generic XDR routines impelmentation.
- *
- * These are the "non-trivial" xdr primitives used to serialize and de-serialize
- * "pointers".  See xdr.h for more info on the interface to xdr.
- */
-
-#include "namespace.h"
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "libc_private.h"
-
-/*
- * XDR an indirect pointer
- * xdr_reference is for recursively translating a structure that is
- * referenced by a pointer inside the structure that is currently being
- * translated.  pp references a pointer to storage. If *pp is null
- * the  necessary storage is allocated.
- * size is the sizeof the referneced structure.
- * proc is the routine to handle the referenced structure.
- */
-bool_t
-xdr_reference(xdrs, pp, size, proc)
-	XDR *xdrs;
-	caddr_t *pp;		/* the pointer to work on */
-	u_int size;		/* size of the object pointed to */
-	xdrproc_t proc;		/* xdr routine to handle the object */
-{
-	caddr_t loc = *pp;
-	bool_t stat;
-
-	if (loc == NULL)
-		switch (xdrs->x_op) {
-		case XDR_FREE:
-			return (TRUE);
-
-		case XDR_DECODE:
-			*pp = loc = (caddr_t) mem_alloc(size);
-			if (loc == NULL) {
-				warnx("xdr_reference: out of memory");
-				return (FALSE);
-			}
-			memset(loc, 0, size);
-			break;
-
-		case XDR_ENCODE:
-			break;
-		}
-
-	stat = (*proc)(xdrs, loc);
-
-	if (xdrs->x_op == XDR_FREE) {
-		mem_free(loc, size);
-		*pp = NULL;
-	}
-	return (stat);
-}
-
-
-/*
- * xdr_pointer():
- *
- * XDR a pointer to a possibly recursive data structure. This
- * differs with xdr_reference in that it can serialize/deserialiaze
- * trees correctly.
- *
- *  What's sent is actually a union:
- *
- *  union object_pointer switch (boolean b) {
- *  case TRUE: object_data data;
- *  case FALSE: void nothing;
- *  }
- *
- * > objpp: Pointer to the pointer to the object.
- * > obj_size: size of the object.
- * > xdr_obj: routine to XDR an object.
- *
- */
-bool_t
-xdr_pointer(xdrs,objpp,obj_size,xdr_obj)
-	XDR *xdrs;
-	char **objpp;
-	u_int obj_size;
-	xdrproc_t xdr_obj;
-{
-
-	bool_t more_data;
-
-	more_data = (*objpp != NULL);
-	if (! xdr_bool(xdrs,&more_data)) {
-		return (FALSE);
-	}
-	if (! more_data) {
-		*objpp = NULL;
-		return (TRUE);
-	}
-	return (xdr_reference(xdrs,objpp,obj_size,xdr_obj));
-}
diff --git a/lib/libc_bsd/xdr/xdr_sizeof.c b/lib/libc_bsd/xdr/xdr_sizeof.c
deleted file mode 100644
index b03162e..0000000
--- a/lib/libc_bsd/xdr/xdr_sizeof.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-/*
- * xdr_sizeof.c
- *
- * General purpose routine to see how much space something will use
- * when serialized using XDR.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/xdr/xdr_sizeof.c 272850 2014-10-09 23:05:32Z hrs $");
-
-#include "namespace.h"
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include "un-namespace.h"
-
-/* ARGSUSED */
-static bool_t
-x_putlong(xdrs, longp)
-	XDR *xdrs;
-	long *longp;
-{
-	xdrs->x_handy += BYTES_PER_XDR_UNIT;
-	return (TRUE);
-}
-
-/* ARGSUSED */
-static bool_t
-x_putbytes(xdrs, bp, len)
-	XDR *xdrs;
-	char  *bp;
-	u_int len;
-{
-	xdrs->x_handy += len;
-	return (TRUE);
-}
-
-static u_int
-x_getpostn(xdrs)
-	XDR *xdrs;
-{
-	return (xdrs->x_handy);
-}
-
-/* ARGSUSED */
-static bool_t
-x_setpostn(xdrs, pos)
-	XDR *xdrs;
-	u_int pos;
-{
-	/* This is not allowed */
-	return (FALSE);
-}
-
-static int32_t *
-x_inline(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-	if (len == 0) {
-		return (NULL);
-	}
-	if (xdrs->x_op != XDR_ENCODE) {
-		return (NULL);
-	}
-	if (len < (u_int)(uintptr_t)xdrs->x_base) {
-		/* x_private was already allocated */
-		xdrs->x_handy += len;
-		return ((int32_t *) xdrs->x_private);
-	} else {
-		/* Free the earlier space and allocate new area */
-		if (xdrs->x_private)
-			free(xdrs->x_private);
-		if ((xdrs->x_private = (caddr_t) malloc(len)) == NULL) {
-			xdrs->x_base = 0;
-			return (NULL);
-		}
-		xdrs->x_base = (caddr_t)(uintptr_t)len;
-		xdrs->x_handy += len;
-		return ((int32_t *) xdrs->x_private);
-	}
-}
-
-static int
-harmless()
-{
-	/* Always return FALSE/NULL, as the case may be */
-	return (0);
-}
-
-static void
-x_destroy(xdrs)
-	XDR *xdrs;
-{
-	xdrs->x_handy = 0;
-	xdrs->x_base = 0;
-	if (xdrs->x_private) {
-		free(xdrs->x_private);
-		xdrs->x_private = NULL;
-	}
-	return;
-}
-
-unsigned long
-xdr_sizeof(func, data)
-	xdrproc_t func;
-	void *data;
-{
-	XDR x;
-	struct xdr_ops ops;
-	bool_t stat;
-	/* to stop ANSI-C compiler from complaining */
-	typedef  bool_t (* dummyfunc1)(XDR *, long *);
-	typedef  bool_t (* dummyfunc2)(XDR *, caddr_t, u_int);
-
-	ops.x_putlong = x_putlong;
-	ops.x_putbytes = x_putbytes;
-	ops.x_inline = x_inline;
-	ops.x_getpostn = x_getpostn;
-	ops.x_setpostn = x_setpostn;
-	ops.x_destroy = x_destroy;
-
-	/* the other harmless ones */
-	ops.x_getlong =  (dummyfunc1) harmless;
-	ops.x_getbytes = (dummyfunc2) harmless;
-
-	x.x_op = XDR_ENCODE;
-	x.x_ops = &ops;
-	x.x_handy = 0;
-	x.x_private = (caddr_t) NULL;
-	x.x_base = (caddr_t) 0;
-
-	stat = func(&x, data);
-	if (x.x_private)
-		free(x.x_private);
-	return (stat == TRUE ? (unsigned) x.x_handy: 0);
-}
diff --git a/lib/libc_bsd/xdr/xdr_stdio.c b/lib/libc_bsd/xdr/xdr_stdio.c
deleted file mode 100644
index 92499cf..0000000
--- a/lib/libc_bsd/xdr/xdr_stdio.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/*	$NetBSD: xdr_stdio.c,v 1.14 2000/01/22 22:19:19 mycroft Exp $	*/
-
-/*-
- * Copyright (c) 2010, Oracle America, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * 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.
- *     * Neither the name of the "Oracle America, Inc." 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 COPYRIGHT HOLDERS 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
- *   COPYRIGHT HOLDER 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *sccsid2 = "@(#)xdr_stdio.c 1.16 87/08/11 Copyr 1984 Sun Micro";
-static char *sccsid = "@(#)xdr_stdio.c	2.1 88/07/29 4.0 RPCSRC";
-#endif
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/xdr/xdr_stdio.c 272850 2014-10-09 23:05:32Z hrs $");
-
-/*
- * xdr_stdio.c, XDR implementation on standard i/o file.
- *
- * This set of routines implements a XDR on a stdio stream.
- * XDR_ENCODE serializes onto the stream, XDR_DECODE de-serializes
- * from the stream.
- */
-
-#include "namespace.h"
-#include <stdio.h>
-
-#include <arpa/inet.h>
-#include <rpc/types.h>
-#include <rpc/xdr.h>
-#include "un-namespace.h"
-
-static void xdrstdio_destroy(XDR *);
-static bool_t xdrstdio_getlong(XDR *, long *);
-static bool_t xdrstdio_putlong(XDR *, const long *);
-static bool_t xdrstdio_getbytes(XDR *, char *, u_int);
-static bool_t xdrstdio_putbytes(XDR *, const char *, u_int);
-static u_int xdrstdio_getpos(XDR *);
-static bool_t xdrstdio_setpos(XDR *, u_int);
-static int32_t *xdrstdio_inline(XDR *, u_int);
-
-/*
- * Ops vector for stdio type XDR
- */
-static const struct xdr_ops	xdrstdio_ops = {
-	xdrstdio_getlong,	/* deseraialize a long int */
-	xdrstdio_putlong,	/* seraialize a long int */
-	xdrstdio_getbytes,	/* deserialize counted bytes */
-	xdrstdio_putbytes,	/* serialize counted bytes */
-	xdrstdio_getpos,	/* get offset in the stream */
-	xdrstdio_setpos,	/* set offset in the stream */
-	xdrstdio_inline,	/* prime stream for inline macros */
-	xdrstdio_destroy	/* destroy stream */
-};
-
-/*
- * Initialize a stdio xdr stream.
- * Sets the xdr stream handle xdrs for use on the stream file.
- * Operation flag is set to op.
- */
-void
-xdrstdio_create(xdrs, file, op)
-	XDR *xdrs;
-	FILE *file;
-	enum xdr_op op;
-{
-
-	xdrs->x_op = op;
-	xdrs->x_ops = &xdrstdio_ops;
-	xdrs->x_private = file;
-	xdrs->x_handy = 0;
-	xdrs->x_base = 0;
-}
-
-/*
- * Destroy a stdio xdr stream.
- * Cleans up the xdr stream handle xdrs previously set up by xdrstdio_create.
- */
-static void
-xdrstdio_destroy(xdrs)
-	XDR *xdrs;
-{
-	(void)fflush((FILE *)xdrs->x_private);
-		/* XXX: should we close the file ?? */
-}
-
-static bool_t
-xdrstdio_getlong(xdrs, lp)
-	XDR *xdrs;
-	long *lp;
-{
-	uint32_t temp;
-
-	if (fread(&temp, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1)
-		return (FALSE);
-	*lp = (long)ntohl(temp);
-	return (TRUE);
-}
-
-static bool_t
-xdrstdio_putlong(xdrs, lp)
-	XDR *xdrs;
-	const long *lp;
-{
-	int32_t mycopy = htonl((uint32_t)*lp);
-
-	if (fwrite(&mycopy, sizeof(int32_t), 1, (FILE *)xdrs->x_private) != 1)
-		return (FALSE);
-	return (TRUE);
-}
-
-static bool_t
-xdrstdio_getbytes(xdrs, addr, len)
-	XDR *xdrs;
-	char *addr;
-	u_int len;
-{
-
-	if ((len != 0) && (fread(addr, (size_t)len, 1, (FILE *)xdrs->x_private) != 1))
-		return (FALSE);
-	return (TRUE);
-}
-
-static bool_t
-xdrstdio_putbytes(xdrs, addr, len)
-	XDR *xdrs;
-	const char *addr;
-	u_int len;
-{
-
-	if ((len != 0) && (fwrite(addr, (size_t)len, 1,
-	    (FILE *)xdrs->x_private) != 1))
-		return (FALSE);
-	return (TRUE);
-}
-
-static u_int
-xdrstdio_getpos(xdrs)
-	XDR *xdrs;
-{
-
-	return ((u_int) ftell((FILE *)xdrs->x_private));
-}
-
-static bool_t
-xdrstdio_setpos(xdrs, pos) 
-	XDR *xdrs;
-	u_int pos;
-{ 
-
-	return ((fseek((FILE *)xdrs->x_private, (long)pos, 0) < 0) ?
-		FALSE : TRUE);
-}
-
-/* ARGSUSED */
-static int32_t *
-xdrstdio_inline(xdrs, len)
-	XDR *xdrs;
-	u_int len;
-{
-
-	/*
-	 * Must do some work to implement this: must insure
-	 * enough data in the underlying stdio buffer,
-	 * that the buffer is aligned so that we can indirect through a
-	 * long *, and stuff this pointer in xdrs->x_buf.  Doing
-	 * a fread or fwrite to a scratch buffer would defeat
-	 * most of the gains to be had here and require storage
-	 * management on this buffer, so we don't do this.
-	 */
-	return (NULL);
-}
diff --git a/lib/libc_bsd/yp/Makefile.inc b/lib/libc_bsd/yp/Makefile.inc
deleted file mode 100644
index 9e55e59..0000000
--- a/lib/libc_bsd/yp/Makefile.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-#	from: @(#)Makefile.inc	5.3 (Berkeley) 2/20/91
-Makefile.incl 231118 2012-02-07 09:27:07Z dim $
-
-# yp sources
-.PATH: ${.CURDIR}/yp
-
-SRCS+=	xdryp.c yp.h yp_xdr.c yplib.c
-CLEANFILES+=	yp.h yp_xdr.c
-
-SYM_MAPS+=	${.CURDIR}/yp/Symbol.map
-
-RPCSRC=	${DESTDIR}/usr/include/rpcsvc/yp.x
-RPCGEN=	RPCGEN_CPP=${CPP:Q} rpcgen -C
-
-yp_xdr.c: ${RPCSRC}
-	${RPCGEN} -c -o ${.TARGET} ${RPCSRC}
-
-yp.h: ${RPCSRC}
-	${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
diff --git a/lib/libc_bsd/yp/Symbol.map b/lib/libc_bsd/yp/Symbol.map
deleted file mode 100644
index c15344e..0000000
--- a/lib/libc_bsd/yp/Symbol.map
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * $FreeBSD: releng/10.2/lib/libc/yp/Symbol.map 169092 2007-04-29 14:05:22Z deischen $
- */
-
-FBSD_1.0 {
-	xdr_datum;
-	xdr_ypresp_all_seq;
-	ypresp_data;
-	ypresp_allfn;
-	ypbinderr_string;
-	_yp_dobind;
-	yp_bind;
-	yp_unbind;
-	yp_match;
-	yp_get_default_domain;
-	yp_first;
-	yp_next;
-	yp_all;
-	yp_order;
-	yp_master;
-	yp_maplist;
-	yperr_string;
-	ypprot_err;
-	_yp_check;
-};
diff --git a/lib/libc_bsd/yp/xdryp.c b/lib/libc_bsd/yp/xdryp.c
deleted file mode 100644
index ec69a11..0000000
--- a/lib/libc_bsd/yp/xdryp.c
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/yp/xdryp.c 228826 2011-12-23 01:56:25Z ghelmer $");
-
-#include <rpc/rpc.h>
-#include <rpcsvc/yp.h>
-#include <stdlib.h>
-#include <string.h>
-
-extern int (*ypresp_allfn)();
-extern void *ypresp_data;
-
-/*
- * I'm leaving the xdr_datum() function in purely for backwards
- * compatibility. yplib.c doesn't actually use it, but it's listed
- * in yp_prot.h as being available, so it's probably a good idea to
- * leave it in case somebody goes looking for it.
- */
-typedef struct {
-	char *dptr;
-	int  dsize;
-} datum;
-
-bool_t
-xdr_datum(XDR *xdrs, datum *objp)
-{
-	if (!xdr_bytes(xdrs, (char **)&objp->dptr, (u_int *)&objp->dsize, YPMAXRECORD)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-bool_t
-xdr_ypresp_all_seq(XDR *xdrs, u_long *objp)
-{
-	struct ypresp_all out;
-	u_long status;
-	char *key, *val;
-	int r;
-
-	bzero(&out, sizeof out);
-	while (1) {
-		if (!xdr_ypresp_all(xdrs, &out)) {
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-			*objp = YP_YPERR;
-			return (FALSE);
-		}
-		if (out.more == 0) {
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-			*objp = YP_NOMORE;
-			return (TRUE);
-		}
-		status = out.ypresp_all_u.val.stat;
-		switch (status) {
-		case YP_TRUE:
-			key = (char *)malloc(out.ypresp_all_u.val.key.keydat_len + 1);
-			if (key == NULL) {
-				xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-				*objp = YP_YPERR;
-				return (FALSE);
-			}
-			bcopy(out.ypresp_all_u.val.key.keydat_val, key,
-				out.ypresp_all_u.val.key.keydat_len);
-			key[out.ypresp_all_u.val.key.keydat_len] = '\0';
-			val = (char *)malloc(out.ypresp_all_u.val.val.valdat_len + 1);
-			if (val == NULL) {
-				free(key);
-				xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-				*objp = YP_YPERR;
-				return (FALSE);
-			}
-			bcopy(out.ypresp_all_u.val.val.valdat_val, val,
-				out.ypresp_all_u.val.val.valdat_len);
-			val[out.ypresp_all_u.val.val.valdat_len] = '\0';
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-
-			r = (*ypresp_allfn)(status,
-				key, out.ypresp_all_u.val.key.keydat_len,
-				val, out.ypresp_all_u.val.val.valdat_len,
-				ypresp_data);
-			*objp = status;
-			free(key);
-			free(val);
-			if (r)
-				return (TRUE);
-			break;
-		case YP_NOMORE:
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-			*objp = YP_NOMORE;
-			return (TRUE);
-		default:
-			xdr_free((xdrproc_t)xdr_ypresp_all, &out);
-			*objp = status;
-			return (TRUE);
-		}
-	}
-}
diff --git a/lib/libc_bsd/yp/yplib.c b/lib/libc_bsd/yp/yplib.c
deleted file mode 100644
index fb320c5..0000000
--- a/lib/libc_bsd/yp/yplib.c
+++ /dev/null
@@ -1,1220 +0,0 @@
-/*
- * Copyright (c) 1992/3 Theo de Raadt <deraadt@fsa.ca>
- * Copyright (c) 1998 Bill Paul <wpaul@ctr.columbia.edu>
- * 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 ``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 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/lib/libc/yp/yplib.c 241046 2012-09-29 11:54:34Z jilles $");
-
-#include "namespace.h"
-#include "reentrant.h"
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/uio.h>
-#include <arpa/inet.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
-#include <rpcsvc/yp.h>
-#include "un-namespace.h"
-#include "libc_private.h"
-
-/*
- * We have to define these here due to clashes between yp_prot.h and
- * yp.h.
- */
-
-#define YPMATCHCACHE
-
-#ifdef YPMATCHCACHE
-struct ypmatch_ent {
-        char			*ypc_map;
-	keydat			ypc_key;
-	valdat			ypc_val;
-        time_t			ypc_expire_t;
-        struct ypmatch_ent	*ypc_next;
-};
-#define YPLIB_MAXCACHE	5	/* At most 5 entries */
-#define YPLIB_EXPIRE	5	/* Expire after 5 seconds */
-#endif
-
-struct dom_binding {
-        struct dom_binding *dom_pnext;
-        char dom_domain[YPMAXDOMAIN + 1];
-        struct sockaddr_in dom_server_addr;
-        u_short dom_server_port;
-        int dom_socket;
-        CLIENT *dom_client;
-        u_short dom_local_port; /* now I finally know what this is for. */
-        long dom_vers;
-#ifdef YPMATCHCACHE
-	struct ypmatch_ent *cache;
-	int ypmatch_cachecnt;
-#endif
-};
-
-#include <rpcsvc/ypclnt.h>
-
-#ifndef BINDINGDIR
-#define BINDINGDIR "/var/yp/binding"
-#endif
-#define MAX_RETRIES 20
-
-extern bool_t xdr_domainname(), xdr_ypbind_resp();
-extern bool_t xdr_ypreq_key(), xdr_ypresp_val();
-extern bool_t xdr_ypreq_nokey(), xdr_ypresp_key_val();
-extern bool_t xdr_ypresp_all(), xdr_ypresp_all_seq();
-extern bool_t xdr_ypresp_master();
-
-int (*ypresp_allfn)();
-void *ypresp_data;
-
-static void _yp_unbind(struct dom_binding *);
-struct dom_binding *_ypbindlist;
-static char _yp_domain[MAXHOSTNAMELEN];
-int _yplib_timeout = 20;
-
-static mutex_t _ypmutex = MUTEX_INITIALIZER;
-#define YPLOCK()	mutex_lock(&_ypmutex);
-#define YPUNLOCK()	mutex_unlock(&_ypmutex);
-
-#ifdef YPMATCHCACHE
-static void
-ypmatch_cache_delete(struct dom_binding *ypdb, struct ypmatch_ent *prev,
-    struct ypmatch_ent *cur)
-{
-	if (prev == NULL)
-		ypdb->cache = cur->ypc_next;
-	else
-		prev->ypc_next = cur->ypc_next;
-
-	free(cur->ypc_map);
-	free(cur->ypc_key.keydat_val);
-	free(cur->ypc_val.valdat_val);
-	free(cur);
-
-	ypdb->ypmatch_cachecnt--;
-
-	return;
-}
-
-static void
-ypmatch_cache_flush(struct dom_binding *ypdb)
-{
-	struct ypmatch_ent	*n, *c = ypdb->cache;
-
-	while (c != NULL) {
-		n = c->ypc_next;
-		ypmatch_cache_delete(ypdb, NULL, c);
-		c = n;
-	}
-
-	return;
-}
-
-static void
-ypmatch_cache_expire(struct dom_binding *ypdb)
-{
-	struct ypmatch_ent	*c = ypdb->cache;
-	struct ypmatch_ent	*n, *p = NULL;
-	time_t			t;
-
-	time(&t);
-
-	while (c != NULL) {
-		if (t >= c->ypc_expire_t) {
-			n = c->ypc_next;
-			ypmatch_cache_delete(ypdb, p, c);
-			c = n;
-		} else {
-			p = c;
-			c = c->ypc_next;
-		}
-	}
-
-	return;
-}
-
-static void
-ypmatch_cache_insert(struct dom_binding *ypdb, char *map, keydat *key,
-    valdat *val)
-{
-	struct ypmatch_ent	*new;
-
-	/* Do an expire run to maybe open up a slot. */
-	if (ypdb->ypmatch_cachecnt)
-		ypmatch_cache_expire(ypdb);
-
-	/*
-	 * If there are no slots free, then force an expire of
-	 * the least recently used entry.
- 	 */
-	if (ypdb->ypmatch_cachecnt >= YPLIB_MAXCACHE) {
-		struct ypmatch_ent	*o = NULL, *c = ypdb->cache;
-		time_t			oldest = 0;
-
-		oldest = ~oldest;
-
-		while (c != NULL) {
-			if (c->ypc_expire_t < oldest) {
-				oldest = c->ypc_expire_t;
-				o = c;
-			}
-			c = c->ypc_next;
-		}
-
-		if (o == NULL)
-			return;
-		o->ypc_expire_t = 0;
-		ypmatch_cache_expire(ypdb);
-	}
-
-	new = malloc(sizeof(struct ypmatch_ent));
-	if (new == NULL)
-		return;
-
-	new->ypc_map = strdup(map);
-	if (new->ypc_map == NULL) {
-		free(new);
-		return;
-	}
-	new->ypc_key.keydat_val = malloc(key->keydat_len);
-	if (new->ypc_key.keydat_val == NULL) {
-		free(new->ypc_map);
-		free(new);
-		return;
-	}
-	new->ypc_val.valdat_val = malloc(val->valdat_len);
-	if (new->ypc_val.valdat_val == NULL) {
-		free(new->ypc_val.valdat_val);
-		free(new->ypc_map);
-		free(new);
-		return;
-	}
-
-	new->ypc_expire_t = time(NULL) + YPLIB_EXPIRE;
-	new->ypc_key.keydat_len = key->keydat_len;
-	new->ypc_val.valdat_len = val->valdat_len;
-	bcopy(key->keydat_val, new->ypc_key.keydat_val, key->keydat_len);
-	bcopy(val->valdat_val, new->ypc_val.valdat_val, val->valdat_len);
-
-	new->ypc_next = ypdb->cache;
-	ypdb->cache = new;
-
-	ypdb->ypmatch_cachecnt++;
-
-	return;
-}
-
-static bool_t
-ypmatch_cache_lookup(struct dom_binding *ypdb, char *map, keydat *key,
-    valdat *val)
-{
-	struct ypmatch_ent	*c;
-
-	ypmatch_cache_expire(ypdb);
-
-	for (c = ypdb->cache; c != NULL; c = c->ypc_next) {
-		if (strcmp(map, c->ypc_map))
-			continue;
-		if (key->keydat_len != c->ypc_key.keydat_len)
-			continue;
-		if (bcmp(key->keydat_val, c->ypc_key.keydat_val,
-				key->keydat_len))
-			continue;
-	}
-
-	if (c == NULL)
-		return(FALSE);
-
-	val->valdat_len = c->ypc_val.valdat_len;
-	val->valdat_val = c->ypc_val.valdat_val;
-
-	return(TRUE);
-}
-#endif
-
-const char *
-ypbinderr_string(int incode)
-{
-	static char err[80];
-	switch (incode) {
-	case 0:
-		return ("Success");
-	case YPBIND_ERR_ERR:
-		return ("Internal ypbind error");
-	case YPBIND_ERR_NOSERV:
-		return ("Domain not bound");
-	case YPBIND_ERR_RESC:
-		return ("System resource allocation failure");
-	}
-	sprintf(err, "Unknown ypbind error: #%d\n", incode);
-	return (err);
-}
-
-int
-_yp_dobind(char *dom, struct dom_binding **ypdb)
-{
-	static pid_t pid = -1;
-	char path[MAXPATHLEN];
-	struct dom_binding *ysd, *ysd2;
-	struct ypbind_resp ypbr;
-	struct timeval tv;
-	struct sockaddr_in clnt_sin;
-	int clnt_sock, fd;
-	pid_t gpid;
-	CLIENT *client;
-	int new = 0, r;
-	int retries = 0;
-	struct sockaddr_in check;
-	socklen_t checklen = sizeof(struct sockaddr_in);
-
-	/* Not allowed; bad doggie. Bad. */
-	if (strchr(dom, '/') != NULL)
-		return(YPERR_BADARGS);
-
-	gpid = getpid();
-	if (!(pid == -1 || pid == gpid)) {
-		ysd = _ypbindlist;
-		while (ysd) {
-			if (ysd->dom_client != NULL)
-				_yp_unbind(ysd);
-			ysd2 = ysd->dom_pnext;
-			free(ysd);
-			ysd = ysd2;
-		}
-		_ypbindlist = NULL;
-	}
-	pid = gpid;
-
-	if (ypdb != NULL)
-		*ypdb = NULL;
-
-	if (dom == NULL || strlen(dom) == 0)
-		return (YPERR_BADARGS);
-
-	for (ysd = _ypbindlist; ysd; ysd = ysd->dom_pnext)
-		if (strcmp(dom, ysd->dom_domain) == 0)
-			break;
-
-
-	if (ysd == NULL) {
-		ysd = (struct dom_binding *)malloc(sizeof *ysd);
-		if (ysd == NULL)
-			return (YPERR_RESRC);
-		bzero((char *)ysd, sizeof *ysd);
-		ysd->dom_socket = -1;
-		ysd->dom_vers = 0;
-		new = 1;
-	} else {
-	/* Check the socket -- may have been hosed by the caller. */
-		if (_getsockname(ysd->dom_socket, (struct sockaddr *)&check,
-		    &checklen) == -1 || check.sin_family != AF_INET ||
-		    check.sin_port != ysd->dom_local_port) {
-		/* Socket became bogus somehow... need to rebind. */
-			int save, sock;
-
-			sock = ysd->dom_socket;
-			save = _dup(ysd->dom_socket);
-			if (ysd->dom_client != NULL)
-				clnt_destroy(ysd->dom_client);
-			ysd->dom_vers = 0;
-			ysd->dom_client = NULL;
-			sock = _dup2(save, sock);
-			_close(save);
-		}
-	}
-
-again:
-	retries++;
-	if (retries > MAX_RETRIES) {
-		if (new)
-			free(ysd);
-		return(YPERR_YPBIND);
-	}
-#ifdef BINDINGDIR
-	if (ysd->dom_vers == 0) {
-		/*
-		 * We're trying to make a new binding: zorch the
-		 * existing handle now (if any).
-		 */
-		if (ysd->dom_client != NULL) {
-			clnt_destroy(ysd->dom_client);
-			ysd->dom_client = NULL;
-			ysd->dom_socket = -1;
-		}
-		snprintf(path, sizeof(path), "%s/%s.%d", BINDINGDIR, dom, 2);
-		if ((fd = _open(path, O_RDONLY | O_CLOEXEC)) == -1) {
-			/* no binding file, YP is dead. */
-			/* Try to bring it back to life. */
-			_close(fd);
-			goto skipit;
-		}
-		if (_flock(fd, LOCK_EX|LOCK_NB) == -1 && errno == EWOULDBLOCK) {
-			struct iovec iov[2];
-			struct ypbind_resp ybr;
-			u_short	ypb_port;
-
-			iov[0].iov_base = (caddr_t)&ypb_port;
-			iov[0].iov_len = sizeof ypb_port;
-			iov[1].iov_base = (caddr_t)&ybr;
-			iov[1].iov_len = sizeof ybr;
-
-			r = _readv(fd, iov, 2);
-			if (r != iov[0].iov_len + iov[1].iov_len) {
-				_close(fd);
-				ysd->dom_vers = -1;
-				goto again;
-			}
-
-			bzero(&ysd->dom_server_addr, sizeof ysd->dom_server_addr);
-			ysd->dom_server_addr.sin_family = AF_INET;
-			ysd->dom_server_addr.sin_len = sizeof(struct sockaddr_in);
-			bcopy(&ybr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr,
-			    &ysd->dom_server_addr.sin_addr.s_addr,
-			    sizeof(ysd->dom_server_addr.sin_addr.s_addr));
-			bcopy(&ybr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port,
-			    &ysd->dom_server_addr.sin_port,
-			    sizeof(ysd->dom_server_addr.sin_port));
-
-			ysd->dom_server_port = ysd->dom_server_addr.sin_port;
-			_close(fd);
-			goto gotit;
-		} else {
-			/* no lock on binding file, YP is dead. */
-			/* Try to bring it back to life. */
-			_close(fd);
-			goto skipit;
-		}
-	}
-skipit:
-#endif
-	if (ysd->dom_vers == -1 || ysd->dom_vers == 0) {
-		/*
-		 * We're trying to make a new binding: zorch the
-		 * existing handle now (if any).
-		 */
-		if (ysd->dom_client != NULL) {
-			clnt_destroy(ysd->dom_client);
-			ysd->dom_client = NULL;
-			ysd->dom_socket = -1;
-		}
-		bzero((char *)&clnt_sin, sizeof clnt_sin);
-		clnt_sin.sin_family = AF_INET;
-		clnt_sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-
-		clnt_sock = RPC_ANYSOCK;
-		client = clnttcp_create(&clnt_sin, YPBINDPROG, YPBINDVERS, &clnt_sock,
-			0, 0);
-		if (client == NULL) {
-			/*
-			 * These conditions indicate ypbind just isn't
-			 * alive -- we probably don't want to shoot our
-			 * mouth off in this case; instead generate error
-			 * messages only for really exotic problems.
-			 */
-			if (rpc_createerr.cf_stat != RPC_PROGNOTREGISTERED &&
-			   (rpc_createerr.cf_stat != RPC_SYSTEMERROR &&
-			   rpc_createerr.cf_error.re_errno == ECONNREFUSED))
-				clnt_pcreateerror("clnttcp_create");
-			if (new)
-				free(ysd);
-			return (YPERR_YPBIND);
-		}
-
-		/*
-		 * Check the port number -- should be < IPPORT_RESERVED.
-		 * If not, it's possible someone has registered a bogus
-		 * ypbind with the portmapper and is trying to trick us.
-		 */
-		if (ntohs(clnt_sin.sin_port) >= IPPORT_RESERVED) {
-			if (client != NULL)
-				clnt_destroy(client);
-			if (new)
-				free(ysd);
-			return(YPERR_YPBIND);
-		}
-		tv.tv_sec = _yplib_timeout/2;
-		tv.tv_usec = 0;
-		r = clnt_call(client, YPBINDPROC_DOMAIN,
-			(xdrproc_t)xdr_domainname, &dom,
-			(xdrproc_t)xdr_ypbind_resp, &ypbr, tv);
-		if (r != RPC_SUCCESS) {
-			clnt_destroy(client);
-			ysd->dom_vers = -1;
-			if (r == RPC_PROGUNAVAIL || r == RPC_PROCUNAVAIL) {
-				if (new)
-					free(ysd);
-				return(YPERR_YPBIND);
-			}
-			fprintf(stderr,
-			"YP: server for domain %s not responding, retrying\n", dom);
-			goto again;
-		} else {
-			if (ypbr.ypbind_status != YPBIND_SUCC_VAL) {
-				struct timespec time_to_sleep, time_remaining;
-
-				clnt_destroy(client);
-				ysd->dom_vers = -1;
-
-				time_to_sleep.tv_sec = _yplib_timeout/2;
-				time_to_sleep.tv_nsec = 0;
-				_nanosleep(&time_to_sleep,
-				    &time_remaining);
-				goto again;
-			}
-		}
-		clnt_destroy(client);
-
-		bzero((char *)&ysd->dom_server_addr, sizeof ysd->dom_server_addr);
-		ysd->dom_server_addr.sin_family = AF_INET;
-		bcopy(&ypbr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port,
-		    &ysd->dom_server_addr.sin_port,
-		    sizeof(ysd->dom_server_addr.sin_port));
-		bcopy(&ypbr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_addr,
-		    &ysd->dom_server_addr.sin_addr.s_addr,
-		    sizeof(ysd->dom_server_addr.sin_addr.s_addr));
-
-		/*
-		 * We could do a reserved port check here too, but this
-		 * could pose compatibility problems. The local ypbind is
-		 * supposed to decide whether or not to trust yp servers
-		 * on insecure ports. For now, we trust its judgement.
-		 */
-		ysd->dom_server_port =
-			*(u_short *)&ypbr.ypbind_resp_u.ypbind_bindinfo.ypbind_binding_port;
-gotit:
-		ysd->dom_vers = YPVERS;
-		strlcpy(ysd->dom_domain, dom, sizeof(ysd->dom_domain));
-	}
-
-	/* Don't rebuild the connection to the server unless we have to. */
-	if (ysd->dom_client == NULL) {
-		tv.tv_sec = _yplib_timeout/2;
-		tv.tv_usec = 0;
-		ysd->dom_socket = RPC_ANYSOCK;
-		ysd->dom_client = clntudp_bufcreate(&ysd->dom_server_addr,
-			YPPROG, YPVERS, tv, &ysd->dom_socket, 1280, 2304);
-		if (ysd->dom_client == NULL) {
-			clnt_pcreateerror("clntudp_create");
-			ysd->dom_vers = -1;
-			goto again;
-		}
-		if (_fcntl(ysd->dom_socket, F_SETFD, 1) == -1)
-			perror("fcntl: F_SETFD");
-		/*
-		 * We want a port number associated with this socket
-		 * so that we can check its authenticity later.
-		 */
-		checklen = sizeof(struct sockaddr_in);
-		bzero((char *)&check, checklen);
-		_bind(ysd->dom_socket, (struct sockaddr *)&check, checklen);
-		check.sin_family = AF_INET;
-		if (!_getsockname(ysd->dom_socket,
-		    (struct sockaddr *)&check, &checklen)) {
-			ysd->dom_local_port = check.sin_port;
-		} else {
-			clnt_destroy(ysd->dom_client);
-			if (new)
-				free(ysd);
-			return(YPERR_YPBIND);
-		}
-	}
-
-	if (new) {
-		ysd->dom_pnext = _ypbindlist;
-		_ypbindlist = ysd;
-	}
-
-	/*
-	 * Set low retry timeout to realistically handle UDP packet
-	 * loss for YP packet bursts.
-	 */
-	tv.tv_sec = 1;
-	tv.tv_usec = 0;
-	clnt_control(ysd->dom_client, CLSET_RETRY_TIMEOUT, (char*)&tv);
-
-	if (ypdb != NULL)
-		*ypdb = ysd;
-	return (0);
-}
-
-static void
-_yp_unbind(struct dom_binding *ypb)
-{
-	struct sockaddr_in check;
-	socklen_t checklen = sizeof(struct sockaddr_in);
-
-	if (ypb->dom_client != NULL) {
-		/* Check the socket -- may have been hosed by the caller. */
-		if (_getsockname(ypb->dom_socket, (struct sockaddr *)&check,
-	    	&checklen) == -1 || check.sin_family != AF_INET ||
-	    	check.sin_port != ypb->dom_local_port) {
-			int save, sock;
-
-			sock = ypb->dom_socket;
-			save = _dup(ypb->dom_socket);
-			clnt_destroy(ypb->dom_client);
-			sock = _dup2(save, sock);
-			_close(save);
-		} else
-			clnt_destroy(ypb->dom_client);
-	}
-
-	ypb->dom_client = NULL;
-	ypb->dom_socket = -1;
-	ypb->dom_vers = -1;
-#ifdef YPMATCHCACHE
-	ypmatch_cache_flush(ypb);
-#endif
-}
-
-static int
-yp_bind_locked(char *dom)
-{
-	return (_yp_dobind(dom, NULL));
-}
-
-int
-yp_bind(char *dom)
-{
-	int r;
-
-	YPLOCK();
-	r = yp_bind_locked(dom);
-	YPUNLOCK();
-	return (r);
-}
-
-static void
-yp_unbind_locked(char *dom)
-{
-	struct dom_binding *ypb, *ypbp;
-
-	ypbp = NULL;
-	for (ypb = _ypbindlist; ypb; ypb = ypb->dom_pnext) {
-		if (strcmp(dom, ypb->dom_domain) == 0) {
-			_yp_unbind(ypb);
-			if (ypbp)
-				ypbp->dom_pnext = ypb->dom_pnext;
-			else
-				_ypbindlist = ypb->dom_pnext;
-			free(ypb);
-			return;
-		}
-		ypbp = ypb;
-	}
-	return;
-}
-
-void
-yp_unbind(char *dom)
-{
-	YPLOCK();
-	yp_unbind_locked(dom);
-	YPUNLOCK();
-}
-
-int
-yp_match(char *indomain, char *inmap, const char *inkey, int inkeylen,
-    char **outval, int *outvallen)
-{
-	struct dom_binding *ysd;
-	struct ypresp_val yprv;
-	struct timeval tv;
-	struct ypreq_key yprk;
-	int r;
-
-	*outval = NULL;
-	*outvallen = 0;
-
-	/* Sanity check */
-
-	if (inkey == NULL || !strlen(inkey) || inkeylen <= 0 ||
-	    inmap == NULL || !strlen(inmap) ||
-	    indomain == NULL || !strlen(indomain))
-		return (YPERR_BADARGS);
-
-	YPLOCK();
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return(YPERR_DOMAIN);
-	}
-
-	yprk.domain = indomain;
-	yprk.map = inmap;
-	yprk.key.keydat_val = (char *)inkey;
-	yprk.key.keydat_len = inkeylen;
-
-#ifdef YPMATCHCACHE
-	if (ypmatch_cache_lookup(ysd, yprk.map, &yprk.key, &yprv.val) == TRUE) {
-/*
-	if (!strcmp(_yp_domain, indomain) && ypmatch_find(inmap, inkey,
-	    inkeylen, &yprv.val.valdat_val, &yprv.val.valdat_len)) {
-*/
-		*outvallen = yprv.val.valdat_len;
-		*outval = (char *)malloc(*outvallen+1);
-		if (*outval == NULL) {
-			_yp_unbind(ysd);
-			*outvallen = 0;
-			YPUNLOCK();
-			return (YPERR_RESRC);
-		}
-		bcopy(yprv.val.valdat_val, *outval, *outvallen);
-		(*outval)[*outvallen] = '\0';
-		YPUNLOCK();
-		return (0);
-	}
-	_yp_unbind(ysd);
-#endif
-
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	bzero((char *)&yprv, sizeof yprv);
-
-	r = clnt_call(ysd->dom_client, YPPROC_MATCH,
-		(xdrproc_t)xdr_ypreq_key, &yprk,
-		(xdrproc_t)xdr_ypresp_val, &yprv, tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_match: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-
-	if (!(r = ypprot_err(yprv.stat))) {
-		*outvallen = yprv.val.valdat_len;
-		*outval = (char *)malloc(*outvallen+1);
-		if (*outval == NULL) {
-			_yp_unbind(ysd);
-			*outvallen = 0;
-			xdr_free((xdrproc_t)xdr_ypresp_val, &yprv);
-			YPUNLOCK();
-			return (YPERR_RESRC);
-		}
-		bcopy(yprv.val.valdat_val, *outval, *outvallen);
-		(*outval)[*outvallen] = '\0';
-#ifdef YPMATCHCACHE
-		ypmatch_cache_insert(ysd, yprk.map, &yprk.key, &yprv.val);
-#endif
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_val, &yprv);
-	YPUNLOCK();
-	return (r);
-}
-
-static int
-yp_get_default_domain_locked(char **domp)
-{
-	*domp = NULL;
-	if (_yp_domain[0] == '\0')
-		if (getdomainname(_yp_domain, sizeof _yp_domain))
-			return (YPERR_NODOM);
-	*domp = _yp_domain;
-	return (0);
-}
-
-int
-yp_get_default_domain(char **domp)
-{
-	int r;
-
-	YPLOCK();
-	r = yp_get_default_domain_locked(domp);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_first(char *indomain, char *inmap, char **outkey, int *outkeylen,
-    char **outval, int *outvallen)
-{
-	struct ypresp_key_val yprkv;
-	struct ypreq_nokey yprnk;
-	struct dom_binding *ysd;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain) ||
-	    inmap == NULL || !strlen(inmap))
-		return (YPERR_BADARGS);
-
-	*outkey = *outval = NULL;
-	*outkeylen = *outvallen = 0;
-
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-	bzero((char *)&yprkv, sizeof yprkv);
-
-	r = clnt_call(ysd->dom_client, YPPROC_FIRST,
-		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		(xdrproc_t)xdr_ypresp_key_val, &yprkv, tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_first: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-	if (!(r = ypprot_err(yprkv.stat))) {
-		*outkeylen = yprkv.key.keydat_len;
-		*outkey = (char *)malloc(*outkeylen+1);
-		if (*outkey == NULL) {
-			_yp_unbind(ysd);
-			*outkeylen = 0;
-			xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
-			YPUNLOCK();
-			return (YPERR_RESRC);
-		}
-		bcopy(yprkv.key.keydat_val, *outkey, *outkeylen);
-		(*outkey)[*outkeylen] = '\0';
-		*outvallen = yprkv.val.valdat_len;
-		*outval = (char *)malloc(*outvallen+1);
-		if (*outval == NULL) {
-			free(*outkey);
-			_yp_unbind(ysd);
-			*outkeylen = *outvallen = 0;
-			xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
-			YPUNLOCK();
-			return (YPERR_RESRC);
-		}
-		bcopy(yprkv.val.valdat_val, *outval, *outvallen);
-		(*outval)[*outvallen] = '\0';
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_next(char *indomain, char *inmap, char *inkey, int inkeylen,
-    char **outkey, int *outkeylen, char **outval, int *outvallen)
-{
-	struct ypresp_key_val yprkv;
-	struct ypreq_key yprk;
-	struct dom_binding *ysd;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (inkey == NULL || !strlen(inkey) || inkeylen <= 0 ||
-	    inmap == NULL || !strlen(inmap) ||
-	    indomain == NULL || !strlen(indomain))
-		return (YPERR_BADARGS);
-
-	*outkey = *outval = NULL;
-	*outkeylen = *outvallen = 0;
-
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	yprk.domain = indomain;
-	yprk.map = inmap;
-	yprk.key.keydat_val = inkey;
-	yprk.key.keydat_len = inkeylen;
-	bzero((char *)&yprkv, sizeof yprkv);
-
-	r = clnt_call(ysd->dom_client, YPPROC_NEXT,
-		(xdrproc_t)xdr_ypreq_key, &yprk,
-		(xdrproc_t)xdr_ypresp_key_val, &yprkv, tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_next: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-	if (!(r = ypprot_err(yprkv.stat))) {
-		*outkeylen = yprkv.key.keydat_len;
-		*outkey = (char *)malloc(*outkeylen+1);
-		if (*outkey == NULL) {
-			_yp_unbind(ysd);
-			*outkeylen = 0;
-			xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
-			YPUNLOCK();
-			return (YPERR_RESRC);
-		}
-		bcopy(yprkv.key.keydat_val, *outkey, *outkeylen);
-		(*outkey)[*outkeylen] = '\0';
-		*outvallen = yprkv.val.valdat_len;
-		*outval = (char *)malloc(*outvallen+1);
-		if (*outval == NULL) {
-			free(*outkey);
-			_yp_unbind(ysd);
-			*outkeylen = *outvallen = 0;
-			xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
-			YPUNLOCK();
-			return (YPERR_RESRC);
-		}
-		bcopy(yprkv.val.valdat_val, *outval, *outvallen);
-		(*outval)[*outvallen] = '\0';
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_key_val, &yprkv);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_all(char *indomain, char *inmap, struct ypall_callback *incallback)
-{
-	struct ypreq_nokey yprnk;
-	struct dom_binding *ysd;
-	struct timeval tv;
-	struct sockaddr_in clnt_sin;
-	CLIENT *clnt;
-	u_long status, savstat;
-	int clnt_sock;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain) ||
-	    inmap == NULL || !strlen(inmap))
-		return (YPERR_BADARGS);
-
-	YPLOCK();
-again:
-
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	/* YPPROC_ALL manufactures its own channel to ypserv using TCP */
-
-	clnt_sock = RPC_ANYSOCK;
-	clnt_sin = ysd->dom_server_addr;
-	clnt_sin.sin_port = 0;
-	clnt = clnttcp_create(&clnt_sin, YPPROG, YPVERS, &clnt_sock, 0, 0);
-	if (clnt == NULL) {
-		YPUNLOCK();
-		printf("clnttcp_create failed\n");
-		return (YPERR_PMAP);
-	}
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-	ypresp_allfn = incallback->foreach;
-	ypresp_data = (void *)incallback->data;
-
-	if (clnt_call(clnt, YPPROC_ALL,
-		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		(xdrproc_t)xdr_ypresp_all_seq, &status, tv) != RPC_SUCCESS) {
-			clnt_perror(ysd->dom_client, "yp_all: clnt_call");
-			clnt_destroy(clnt);
-			_yp_unbind(ysd);
-			goto again;
-	}
-
-	clnt_destroy(clnt);
-	savstat = status;
-	xdr_free((xdrproc_t)xdr_ypresp_all_seq, &status);	/* not really needed... */
-	YPUNLOCK();
-	if (savstat != YP_NOMORE)
-		return (ypprot_err(savstat));
-	return (0);
-}
-
-int
-yp_order(char *indomain, char *inmap, int *outorder)
-{
- 	struct dom_binding *ysd;
-	struct ypresp_order ypro;
-	struct ypreq_nokey yprnk;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain) ||
-	    inmap == NULL || !strlen(inmap))
-		return (YPERR_BADARGS);
-
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-
-	bzero((char *)(char *)&ypro, sizeof ypro);
-
-	r = clnt_call(ysd->dom_client, YPPROC_ORDER,
-		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		(xdrproc_t)xdr_ypresp_order, &ypro, tv);
-
-	/*
-	 * NIS+ in YP compat mode doesn't support the YPPROC_ORDER
-	 * procedure.
-	 */
-	if (r == RPC_PROCUNAVAIL) {
-		YPUNLOCK();
-		return(YPERR_YPERR);
-	}
-
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_order: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-
-	if (!(r = ypprot_err(ypro.stat))) {
-		*outorder = ypro.ordernum;
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_order, &ypro);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_master(char *indomain, char *inmap, char **outname)
-{
-	struct dom_binding *ysd;
-	struct ypresp_master yprm;
-	struct ypreq_nokey yprnk;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain) ||
-	    inmap == NULL || !strlen(inmap))
-		return (YPERR_BADARGS);
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	yprnk.domain = indomain;
-	yprnk.map = inmap;
-
-	bzero((char *)&yprm, sizeof yprm);
-
-	r = clnt_call(ysd->dom_client, YPPROC_MASTER,
-		(xdrproc_t)xdr_ypreq_nokey, &yprnk,
-		(xdrproc_t)xdr_ypresp_master, &yprm, tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_master: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-
-	if (!(r = ypprot_err(yprm.stat))) {
-		*outname = (char *)strdup(yprm.peer);
-	}
-
-	xdr_free((xdrproc_t)xdr_ypresp_master, &yprm);
-	YPUNLOCK();
-	return (r);
-}
-
-int
-yp_maplist(char *indomain, struct ypmaplist **outmaplist)
-{
-	struct dom_binding *ysd;
-	struct ypresp_maplist ypml;
-	struct timeval tv;
-	int r;
-
-	/* Sanity check */
-
-	if (indomain == NULL || !strlen(indomain))
-		return (YPERR_BADARGS);
-
-	YPLOCK();
-again:
-	if (_yp_dobind(indomain, &ysd) != 0) {
-		YPUNLOCK();
-		return (YPERR_DOMAIN);
-	}
-
-	tv.tv_sec = _yplib_timeout;
-	tv.tv_usec = 0;
-
-	bzero((char *)&ypml, sizeof ypml);
-
-	r = clnt_call(ysd->dom_client, YPPROC_MAPLIST,
-		(xdrproc_t)xdr_domainname, &indomain,
-		(xdrproc_t)xdr_ypresp_maplist, &ypml,tv);
-	if (r != RPC_SUCCESS) {
-		clnt_perror(ysd->dom_client, "yp_maplist: clnt_call");
-		_yp_unbind(ysd);
-		goto again;
-	}
-	if (!(r = ypprot_err(ypml.stat))) {
-		*outmaplist = ypml.maps;
-	}
-
-	/* NO: xdr_free((xdrproc_t)xdr_ypresp_maplist, &ypml);*/
-	YPUNLOCK();
-	return (r);
-}
-
-const char *
-yperr_string(int incode)
-{
-	static char err[80];
-
-	switch (incode) {
-	case 0:
-		return ("Success");
-	case YPERR_BADARGS:
-		return ("Request arguments bad");
-	case YPERR_RPC:
-		return ("RPC failure");
-	case YPERR_DOMAIN:
-		return ("Can't bind to server which serves this domain");
-	case YPERR_MAP:
-		return ("No such map in server's domain");
-	case YPERR_KEY:
-		return ("No such key in map");
-	case YPERR_YPERR:
-		return ("YP server error");
-	case YPERR_RESRC:
-		return ("Local resource allocation failure");
-	case YPERR_NOMORE:
-		return ("No more records in map database");
-	case YPERR_PMAP:
-		return ("Can't communicate with portmapper");
-	case YPERR_YPBIND:
-		return ("Can't communicate with ypbind");
-	case YPERR_YPSERV:
-		return ("Can't communicate with ypserv");
-	case YPERR_NODOM:
-		return ("Local domain name not set");
-	case YPERR_BADDB:
-		return ("Server data base is bad");
-	case YPERR_VERS:
-		return ("YP server version mismatch - server can't supply service.");
-	case YPERR_ACCESS:
-		return ("Access violation");
-	case YPERR_BUSY:
-		return ("Database is busy");
-	}
-	sprintf(err, "YP unknown error %d\n", incode);
-	return (err);
-}
-
-int
-ypprot_err(unsigned int incode)
-{
-	switch (incode) {
-	case YP_TRUE:
-		return (0);
-	case YP_FALSE:
-		return (YPERR_YPBIND);
-	case YP_NOMORE:
-		return (YPERR_NOMORE);
-	case YP_NOMAP:
-		return (YPERR_MAP);
-	case YP_NODOM:
-		return (YPERR_DOMAIN);
-	case YP_NOKEY:
-		return (YPERR_KEY);
-	case YP_BADOP:
-		return (YPERR_YPERR);
-	case YP_BADDB:
-		return (YPERR_BADDB);
-	case YP_YPERR:
-		return (YPERR_YPERR);
-	case YP_BADARGS:
-		return (YPERR_BADARGS);
-	case YP_VERS:
-		return (YPERR_VERS);
-	}
-	return (YPERR_YPERR);
-}
-
-int
-_yp_check(char **dom)
-{
-	char *unused;
-
-	YPLOCK();
-	if (_yp_domain[0]=='\0')
-		if (yp_get_default_domain_locked(&unused)) {
-			YPUNLOCK();
-			return (0);
-		}
-
-	if (dom)
-		*dom = _yp_domain;
-
-	if (yp_bind_locked(_yp_domain) == 0) {
-		yp_unbind_locked(_yp_domain);
-		YPUNLOCK();
-		return (1);
-	}
-	YPUNLOCK();
-	return (0);
-}
diff --git a/lib/libc_old/.cproject b/lib/libc_old/.cproject
deleted file mode 100644
index de8d1f5..0000000
--- a/lib/libc_old/.cproject
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="0.1234494192">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1234494192" moduleId="org.eclipse.cdt.core.settings" name="Default">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration buildProperties="" description="" id="0.1234494192" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-					<folderInfo id="0.1234494192." name="/" resourcePath="">
-						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1979258436" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1979258436.879744822" name=""/>
-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.757127723" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1163013072" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.1032996830" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.892918680" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.739461699" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1856445640" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-							<tool id="org.eclipse.cdt.build.core.settings.holder.388324819" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1788744219" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="UbixOS Libc.null.1210750219" name="UbixOS Libc"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="0.1234494192">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Default">
-			<resource resourceType="PROJECT" workspacePath="/UbixOS Libc"/>
-		</configuration>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-</cproject>
diff --git a/lib/libc_old/.project b/lib/libc_old/.project
deleted file mode 100644
index 8e98bd1..0000000
--- a/lib/libc_old/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>UbixOS Libc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>
diff --git a/lib/libc_old/Makefile b/lib/libc_old/Makefile
deleted file mode 100644
index ecb308a..0000000
--- a/lib/libc_old/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: Makefile 148 2016-01-18 19:34:32Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Objects
-OBJS =
-
-#Sub Sections
-SUBS = ./stdio/*.o ./sys/*.o ./string/*.o ./stdlib/*.o ./math/*.o ./quad/*.o ./generic/*.o ./locale/*.o ./gen/*.o
-
-#Output
-OUTPUT = libc_old
-
-lib.so: $(OBJS)
-	(cd stdio;make)
-	(cd stdlib;make)
-	(cd math;make)
-	(cd locale;make)
-	(cd quad;make)
-	(cd sys;make)
-	(cd string;make)
-	(cd generic;make)
-	(cd gen;make)
-#	$(LD) $(LDFLAGS) -o $(OUTPUT) $(OBJS) ./stdio/*.o ./sys/*.o ./string/*.o ./stdlib/*.o
-#	$(CC) -nostdlib -shared -Wl,-soname,libc_old.so -o ${BUILD_DIR}/lib/$(OUTPUT) $(OBJS) $(SUBS)
-# tsort -q for BSD
-	$(CC) -m32 -nostdlib -ggdb -shared -Wl,-x -o ${BUILD_DIR}/lib/$(OUTPUT).so -Wl,-soname,$(OUTPUT).so `lorder $(OBJS) $(SUBS) | tsort`
-#	$(CC) -nostdlib -ggdb -static -Wl,-x -o ${BUILD_DIR}/$(OUTPUT).static.so -Wl,-soname,$(OUTPUT).static.so `lorder $(OBJS) $(SUBS) | tsort -q`
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -Wall -nostdinc -O -I./include -c -o $@ $<
- 
-.cc.s:
-	$(CXX)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -nostdinc -O -I./include -c $<
-
-.c.s:
-	$(CC)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall -nostdinc -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) ${BUILD_DIR}/$(OUTPUT)
-	(cd stdio;make clean)
-	(cd sys;make clean)
-	(cd stdlib;make clean)
-	(cd locale;make clean)
-	(cd generic;make clean)
-	(cd string;make clean)
-	(cd math;make clean)
-	(cd quad;make clean)
-	(cd gen;make clean)
diff --git a/lib/libc_old/gen/Makefile b/lib/libc_old/gen/Makefile
deleted file mode 100644
index b17ac0e..0000000
--- a/lib/libc_old/gen/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#Objects
-OBJS = setprogname.o getprogname.o errlst.o err.o
-
-#Output
-OUTPUT = libc.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../../../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../../../include -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I. -I../../../include -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../../../include -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libc_old/gen/err.c b/lib/libc_old/gen/err.c
deleted file mode 100644
index d1c596b..0000000
--- a/lib/libc_old/gen/err.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/*-
- * Copyright (c) 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.
- */
-
-#include <sys/cdefs.h>
-#include "../include/namespace.h"
-#include <err.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "../include/un-namespace.h"
-
-#include "../include/libc_private.h"
-
-static FILE *err_file; /* file to use for error output */
-static void (*err_exit)(int);
-
-/*
- * This is declared to take a `void *' so that the caller is not required
- * to include <stdio.h> first.  However, it is really a `FILE *', and the
- * manual page documents it as such.
- */
-void
-err_set_file(void *fp)
-{
-	if (fp)
-		err_file = fp;
-	else
-		err_file = stderr;
-}
-
-void
-err_set_exit(void (*ef)(int))
-{
-	err_exit = ef;
-}
-
-__weak_reference(_err, err);
-
-void
-_err(int eval, const char *fmt, ...)
-{
-	vaList ap;
-	vaStart(ap, fmt);
-	verrc(eval, errno, fmt, ap);
-	vaEnd(ap);
-}
-
-void
-verr(eval, fmt, ap)
-	int eval;
-	const char *fmt;
-	vaList ap;
-{
-	verrc(eval, errno, fmt, ap);
-}
-
-void
-errc(int eval, int code, const char *fmt, ...)
-{
-	vaList ap;
-	vaStart(ap, fmt);
-	verrc(eval, code, fmt, ap);
-	vaEnd(ap);
-}
-
-void
-verrc(eval, code, fmt, ap)
-	int eval;
-	int code;
-	const char *fmt;
-	vaList ap;
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL) {
-		vfprintf(err_file, fmt, ap);
-		fprintf(err_file, ": ");
-	}
-	fprintf(err_file, "%s\n", strerror(code));
-	if (err_exit)
-		err_exit(eval);
-	exit(eval);
-       while(1); // UBU
-}
-
-void
-errx(int eval, const char *fmt, ...)
-{
-	vaList ap;
-	vaStart(ap, fmt);
-	verrx(eval, fmt, ap);
-	vaEnd(ap);
-}
-
-void
-verrx(eval, fmt, ap)
-	int eval;
-	const char *fmt;
-	vaList ap;
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL)
-		vfprintf(err_file, fmt, ap);
-	fprintf(err_file, "\n");
-	if (err_exit)
-		err_exit(eval);
-	exit(eval);
-    while(1); //UBU
-}
-
-__weak_reference(_warn, warn);
-
-void
-_warn(const char *fmt, ...)
-{
-	vaList ap;
-	vaStart(ap, fmt);
-	vwarnc(errno, fmt, ap);
-	vaEnd(ap);
-}
-
-void
-vwarn(fmt, ap)
-	const char *fmt;
-	vaList ap;
-{
-	vwarnc(errno, fmt, ap);
-}
-
-void
-warnc(int code, const char *fmt, ...)
-{
-	vaList ap;
-	vaStart(ap, fmt);
-	vwarnc(code, fmt, ap);
-	vaEnd(ap);
-}
-
-void
-vwarnc(code, fmt, ap)
-	int code;
-	const char *fmt;
-	vaList ap;
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL) {
-		vfprintf(err_file, fmt, ap);
-		fprintf(err_file, ": ");
-	}
-	fprintf(err_file, "%s\n", strerror(code));
-}
-
-void
-warnx(const char *fmt, ...)
-{
-	vaList ap;
-	vaStart(ap, fmt);
-	vwarnx(fmt, ap);
-	vaEnd(ap);
-}
-
-void
-vwarnx(fmt, ap)
-	const char *fmt;
-	vaList ap;
-{
-	if (err_file == 0)
-		err_set_file((FILE *)0);
-	fprintf(err_file, "%s: ", _getprogname());
-	if (fmt != NULL)
-		vfprintf(err_file, fmt, ap);
-	fprintf(err_file, "\n");
-}
diff --git a/lib/libc_old/gen/errlst.c b/lib/libc_old/gen/errlst.c
deleted file mode 100644
index 5207748..0000000
--- a/lib/libc_old/gen/errlst.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 1982, 1985, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)errlst.c	8.2 (Berkeley) 11/16/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/errlst.c,v 1.7 2002/10/09 08:04:24 peter Exp $");
-
-#include <stdio.h>
-
-const char *const sys_errlist[] = {
-	"Undefined error: 0",			/*  0 - ENOERROR */
-	"Operation not permitted",		/*  1 - EPERM */
-	"No such file or directory",		/*  2 - ENOENT */
-	"No such process",			/*  3 - ESRCH */
-	"Interrupted system call",		/*  4 - EINTR */
-	"Input/output error",			/*  5 - EIO */
-	"Device not configured",		/*  6 - ENXIO */
-	"Argument list too long",		/*  7 - E2BIG */
-	"Exec format error",			/*  8 - ENOEXEC */
-	"Bad file descriptor",			/*  9 - EBADF */
-	"No child processes",			/* 10 - ECHILD */
-	"Resource deadlock avoided",		/* 11 - EDEADLK */
-	"Cannot allocate memory",		/* 12 - ENOMEM */
-	"Permission denied",			/* 13 - EACCES */
-	"Bad address",				/* 14 - EFAULT */
-	"Block device required",		/* 15 - ENOTBLK */
-	"Device busy",				/* 16 - EBUSY */
-	"File exists",				/* 17 - EEXIST */
-	"Cross-device link",			/* 18 - EXDEV */
-	"Operation not supported by device",	/* 19 - ENODEV */
-	"Not a directory",			/* 20 - ENOTDIR */
-	"Is a directory",			/* 21 - EISDIR */
-	"Invalid argument",			/* 22 - EINVAL */
-	"Too many open files in system",	/* 23 - ENFILE */
-	"Too many open files",			/* 24 - EMFILE */
-	"Inappropriate ioctl for device",	/* 25 - ENOTTY */
-	"Text file busy",			/* 26 - ETXTBSY */
-	"File too large",			/* 27 - EFBIG */
-	"No space left on device",		/* 28 - ENOSPC */
-	"Illegal seek",				/* 29 - ESPIPE */
-	"Read-only file system",		/* 30 - EROFS */
-	"Too many links",			/* 31 - EMLINK */
-	"Broken pipe",				/* 32 - EPIPE */
-
-/* math software */
-	"Numerical argument out of domain",	/* 33 - EDOM */
-	"Result too large",			/* 34 - ERANGE */
-
-/* non-blocking and interrupt i/o */
-	"Resource temporarily unavailable",	/* 35 - EAGAIN */
-						/* 35 - EWOULDBLOCK */
-	"Operation now in progress",		/* 36 - EINPROGRESS */
-	"Operation already in progress",	/* 37 - EALREADY */
-
-/* ipc/network software -- argument errors */
-	"Socket operation on non-socket",	/* 38 - ENOTSOCK */
-	"Destination address required",		/* 39 - EDESTADDRREQ */
-	"Message too long",			/* 40 - EMSGSIZE */
-	"Protocol wrong type for socket",	/* 41 - EPROTOTYPE */
-	"Protocol not available",		/* 42 - ENOPROTOOPT */
-	"Protocol not supported",		/* 43 - EPROTONOSUPPORT */
-	"Socket type not supported",		/* 44 - ESOCKTNOSUPPORT */
-	"Operation not supported",		/* 45 - EOPNOTSUPP */
-	"Protocol family not supported",	/* 46 - EPFNOSUPPORT */
-						/* 47 - EAFNOSUPPORT */
-	"Address family not supported by protocol family",
-	"Address already in use",		/* 48 - EADDRINUSE */
-	"Can't assign requested address",	/* 49 - EADDRNOTAVAIL */
-
-/* ipc/network software -- operational errors */
-	"Network is down",			/* 50 - ENETDOWN */
-	"Network is unreachable",		/* 51 - ENETUNREACH */
-	"Network dropped connection on reset",	/* 52 - ENETRESET */
-	"Software caused connection abort",	/* 53 - ECONNABORTED */
-	"Connection reset by peer",		/* 54 - ECONNRESET */
-	"No buffer space available",		/* 55 - ENOBUFS */
-	"Socket is already connected",		/* 56 - EISCONN */
-	"Socket is not connected",		/* 57 - ENOTCONN */
-	"Can't send after socket shutdown",	/* 58 - ESHUTDOWN */
-	"Too many references: can't splice",	/* 59 - ETOOMANYREFS */
-	"Operation timed out",			/* 60 - ETIMEDOUT */
-	"Connection refused",			/* 61 - ECONNREFUSED */
-
-	"Too many levels of symbolic links",	/* 62 - ELOOP */
-	"File name too long",			/* 63 - ENAMETOOLONG */
-
-/* should be rearranged */
-	"Host is down",				/* 64 - EHOSTDOWN */
-	"No route to host",			/* 65 - EHOSTUNREACH */
-	"Directory not empty",			/* 66 - ENOTEMPTY */
-
-/* quotas & mush */
-	"Too many processes",			/* 67 - EPROCLIM */
-	"Too many users",			/* 68 - EUSERS */
-	"Disc quota exceeded",			/* 69 - EDQUOT */
-
-/* Network File System */
-	"Stale NFS file handle",		/* 70 - ESTALE */
-	"Too many levels of remote in path",	/* 71 - EREMOTE */
-	"RPC struct is bad",			/* 72 - EBADRPC */
-	"RPC version wrong",			/* 73 - ERPCMISMATCH */
-	"RPC prog. not avail",			/* 74 - EPROGUNAVAIL */
-	"Program version wrong",		/* 75 - EPROGMISMATCH */
-	"Bad procedure for program",		/* 76 - EPROCUNAVAIL */
-
-	"No locks available",			/* 77 - ENOLCK */
-	"Function not implemented",		/* 78 - ENOSYS */
-	"Inappropriate file type or format",	/* 79 - EFTYPE */
-	"Authentication error",			/* 80 - EAUTH */
-	"Need authenticator",			/* 81 - ENEEDAUTH */
-	"Identifier removed",			/* 82 - EIDRM */
-	"No message of desired type",		/* 83 - ENOMSG */
-	"Value too large to be stored in data type", /* 84 - EOVERFLOW */
-	"Operation canceled",			/* 85 - ECANCELED */
-	"Illegal byte sequence",		/* 86 - EILSEQ */
-	"Attribute not found",			/* 87 - ENOATTR */
-
-/* General */
-	"Programming error",			/* 88 - EDOOFUS */
-};
-const int sys_nerr = sizeof(sys_errlist) / sizeof(sys_errlist[0]);
diff --git a/lib/libc_old/gen/getprogname.c b/lib/libc_old/gen/getprogname.c
deleted file mode 100644
index ecdd620..0000000
--- a/lib/libc_old/gen/getprogname.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getprogname.c,v 1.4 2002/03/29 22:43:41 markm Exp $");
-
-#include "../include/namespace.h"
-#include <stdlib.h>
-#include "../include/un-namespace.h"
-
-#include "../include/libc_private.h"
-
-__weak_reference(_getprogname, getprogname);
-
-const char *
-_getprogname(void)
-{
-
-	return (__progname);
-}
diff --git a/lib/libc_old/gen/setprogname.c b/lib/libc_old/gen/setprogname.c
deleted file mode 100644
index 8d0bda8..0000000
--- a/lib/libc_old/gen/setprogname.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/setprogname.c,v 1.8 2002/03/29 22:43:41 markm Exp $");
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "../include/libc_private.h"
-
-void
-setprogname(const char *progname)
-{
-	const char *p;
-
-	p = strrchr(progname, '/');
-	if (p != NULL)
-		__progname = p + 1;
-	else
-		__progname = progname;
-}
diff --git a/lib/libc_old/generic/Makefile b/lib/libc_old/generic/Makefile
deleted file mode 100644
index a9c8407..0000000
--- a/lib/libc_old/generic/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#Objects
-OBJS = unlink.o getcwd.o mkdir.o chdir.o
-#Output
-OUTPUT = libc.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -I../../../include -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libc_old/generic/chdir.c b/lib/libc_old/generic/chdir.c
deleted file mode 100644
index ce78805..0000000
--- a/lib/libc_old/generic/chdir.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: chdir.c 160 2016-01-19 04:01:03Z reddawg $
-
-**************************************************************************************/
-
-asm(
- ".text                     \n"
- ".globl chdir          \n"
- ".type chdir,@function \n"
- "chdir:                \n"
- "movl $12,%eax              \n"
- "int $0x80                 \n"
- "ret                       \n"
-);
-
-
-
-/*
-
-int chdir(const char *path) {
-  asm(
-    "int %0\n"
-    : : "i" (0x80),"a" (28),"b" (path)
-    );
-  return(0x0);
-  }
-*/
diff --git a/lib/libc_old/generic/getcwd.c b/lib/libc_old/generic/getcwd.c
deleted file mode 100644
index 2fb53af..0000000
--- a/lib/libc_old/generic/getcwd.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getcwd.c 160 2016-01-19 04:01:03Z reddawg $
-
-**************************************************************************************/
-
-#include <sys/types.h>
-
-asm(
- ".text                     \n"
- ".globl getcwd          \n"
- ".type getcwd,@function \n"
- "getcwd:                \n"
- "movl $326,%eax              \n"
- "int $0x80                 \n"
- "ret                       \n"
-);
-
-
-/*
-char *getcwd(char *cwd,uInt32 len) {
-  asm(
-    "int %0\n"
-    : : "i" (0x80),"a" (26),"b" (cwd),"c" (len)
-    );
-  return(cwd);
-  }
-*/
diff --git a/lib/libc_old/generic/mkdir.c b/lib/libc_old/generic/mkdir.c
deleted file mode 100644
index 3d32fdc..0000000
--- a/lib/libc_old/generic/mkdir.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mkdir.c 89 2016-01-12 00:20:40Z reddawg $
-
-**************************************************************************************/
-
-#include <sys/stat.h> 
-
-int mkdir(const char *path,mode_t mode) {
-  asm(
-    "int %0\n"
-    : : "i" (0x80),"a" (29),"b" (path)
-    );
-  return(0x0);
-  }
diff --git a/lib/libc_old/generic/unlink.c b/lib/libc_old/generic/unlink.c
deleted file mode 100644
index 7147adc..0000000
--- a/lib/libc_old/generic/unlink.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: unlink.c 89 2016-01-12 00:20:40Z reddawg $
-
-**************************************************************************************/
-
-int unlink(const char *path) {
-  int retVal = 0x0;
-  asm(
-    "int %0\n"
-    : : "i" (0x80),"a" (30),"b" (path),"c" (&retVal)
-    );
-  return(retVal);
-  }
diff --git a/lib/libc_old/include/libc_private.h b/lib/libc_old/include/libc_private.h
deleted file mode 100644
index 63f8610..0000000
--- a/lib/libc_old/include/libc_private.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 1998 John Birrell <jb@cimlogic.com.au>.
- * 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 John Birrell.
- * 4. Neither the name of the author nor the names of any co-contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY JOHN BIRRELL 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.
- *
- * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.11 2003/11/05 18:17:30 deischen Exp $
- *
- * Private definitions for libc, libc_r and libpthread.
- *
- */
-
-#ifndef _LIBC_PRIVATE_H_
-#define _LIBC_PRIVATE_H_
-
-/*
- * This global flag is non-zero when a process has created one
- * or more threads. It is used to avoid calling locking functions
- * when they are not required.
- */
-extern int	__isthreaded;
-
-/*
- * File lock contention is difficult to diagnose without knowing
- * where locks were set. Allow a debug library to be built which
- * records the source file and line number of each lock call.
- */
-#ifdef	_FLOCK_DEBUG
-#define _FLOCKFILE(x)	_flockfile_debug(x, __FILE__, __LINE__)
-#else
-#define _FLOCKFILE(x)	_flockfile(x)
-#endif
-
-/*
- * Macros for locking and unlocking FILEs. These test if the
- * process is threaded to avoid locking when not required.
- */
-#define	FLOCKFILE(fp)		if (__isthreaded) _FLOCKFILE(fp)
-#define	FUNLOCKFILE(fp)		if (__isthreaded) _funlockfile(fp)
-
-/*
- * Indexes into the pthread jump table.
- *
- * Warning! If you change this type, you must also change the threads
- * libraries that reference it (libc_r, libpthread).
- */
-typedef enum {
-	PJT_COND_BROADCAST,
-	PJT_COND_DESTROY,
-	PJT_COND_INIT,
-	PJT_COND_SIGNAL,
-	PJT_COND_WAIT,
-	PJT_GETSPECIFIC,
-	PJT_KEY_CREATE,
-	PJT_KEY_DELETE,
-	PJT_MAIN_NP,
-	PJT_MUTEX_DESTROY,
-	PJT_MUTEX_INIT,
-	PJT_MUTEX_LOCK,
-	PJT_MUTEX_TRYLOCK,
-	PJT_MUTEX_UNLOCK,
-	PJT_MUTEXATTR_DESTROY,
-	PJT_MUTEXATTR_INIT,
-	PJT_MUTEXATTR_SETTYPE,
-	PJT_ONCE,
-	PJT_RWLOCK_DESTROY,
-	PJT_RWLOCK_INIT,
-	PJT_RWLOCK_RDLOCK,
-	PJT_RWLOCK_TRYRDLOCK,
-	PJT_RWLOCK_TRYWRLOCK,
-	PJT_RWLOCK_UNLOCK,
-	PJT_RWLOCK_WRLOCK,
-	PJT_SELF,
-	PJT_SETSPECIFIC,
-	PJT_SIGMASK,
-	PJT_MAX
-} pjt_index_t;
-
-typedef int (*pthread_func_t)(void);
-typedef pthread_func_t pthread_func_entry_t[2];
-
-extern pthread_func_entry_t __thr_jtable[];
-
-/*
- * yplib internal interfaces
- */
-#ifdef YP
-int _yp_check(char **);
-#endif
-
-
-/*
- * This is a pointer in the C run-time startup code. It is used
- * by getprogname() and setprogname().
- */
-extern const char *__progname;
-
-/*
- * This is the lock to make malloc() thread-safe.  It is externalized
- * so that thread libraries can protect malloc across fork().
- */
-extern struct _spinlock *__malloc_lock;
-
-#endif /* _LIBC_PRIVATE_H_ */
diff --git a/lib/libc_old/include/namespace.h b/lib/libc_old/include/namespace.h
deleted file mode 100644
index 0c571ad..0000000
--- a/lib/libc_old/include/namespace.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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.
- *
- * 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 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.
- *
- * $FreeBSD: src/lib/libc/include/namespace.h,v 1.16.12.1 2005/10/08 17:56:33 delphij Exp $
- */
-
-#ifndef _NAMESPACE_H_
-#define _NAMESPACE_H_
-
-/*
- * Adjust names so that headers declare "hidden" names.
- *
- * README: When modifying this file don't forget to make the appropriate
- *         changes in un-namespace.h!!!
- */
-
-/*
- * ISO C (C90) section.  Most names in libc aren't in ISO C, so they
- * should be here.  Most aren't here...
- */
-#define		err				_err
-#define		warn				_warn
-#define		nsdispatch			_nsdispatch
-
-/*
- * Prototypes for syscalls/functions that need to be overridden
- * in libc_r/libpthread.
- */
-#define		accept				_accept
-#define		__acl_aclcheck_fd		___acl_aclcheck_fd
-#define		__acl_delete_fd			___acl_delete_fd
-#define		__acl_get_fd			___acl_get_fd
-#define		__acl_set_fd			___acl_set_fd
-#define		bind				_bind
-#define		__cap_get_fd			___cap_get_fd
-#define		__cap_set_fd			___cap_set_fd
-#define		close				_close
-#define		connect				_connect
-#define		dup				_dup
-#define		dup2				_dup2
-#define		execve				_execve
-#define		fcntl				_fcntl
-/*#define		flock				_flock */
-#define		flockfile			_flockfile
-#define		fpathconf			_fpathconf
-#define		fstat				_fstat
-#define		fstatfs				_fstatfs
-#define		fsync				_fsync
-#define		funlockfile			_funlockfile
-#define		getdirentries			_getdirentries
-#define		getlogin			_getlogin
-#define		getpeername			_getpeername
-#define		getprogname			_getprogname
-#define		getsockname			_getsockname
-#define		getsockopt			_getsockopt
-#define		ioctl				_ioctl
-/* #define		kevent				_kevent */
-#define		listen				_listen
-#define		nanosleep			_nanosleep
-#define		open				_open
-#define		poll				_poll
-#define		pthread_cond_broadcast		_pthread_cond_broadcast
-#define		pthread_cond_destroy		_pthread_cond_destroy
-#define		pthread_cond_init		_pthread_cond_init
-#define		pthread_cond_signal		_pthread_cond_signal
-#define		pthread_cond_timedwait		_pthread_cond_timedwait
-#define		pthread_cond_wait		_pthread_cond_wait
-#define		pthread_exit			_pthread_exit
-#define		pthread_getspecific		_pthread_getspecific
-#define		pthread_key_create		_pthread_key_create
-#define		pthread_key_delete		_pthread_key_delete
-#define		pthread_main_np			_pthread_main_np
-#define		pthread_mutex_destroy		_pthread_mutex_destroy
-#define		pthread_mutex_init		_pthread_mutex_init
-#define		pthread_mutex_lock		_pthread_mutex_lock
-#define		pthread_mutex_trylock		_pthread_mutex_trylock
-#define		pthread_mutex_unlock		_pthread_mutex_unlock
-#define		pthread_mutexattr_destroy	_pthread_mutexattr_destroy
-#define		pthread_mutexattr_init		_pthread_mutexattr_init
-#define		pthread_mutexattr_settype	_pthread_mutexattr_settype
-#define		pthread_once			_pthread_once
-#define		pthread_rwlock_destroy		_pthread_rwlock_destroy
-#define		pthread_rwlock_init		_pthread_rwlock_init
-#define		pthread_rwlock_rdlock		_pthread_rwlock_rdlock
-#define		pthread_rwlock_wrlock		_pthread_rwlock_wrlock
-#define		pthread_rwlock_tryrdlock	_pthread_rwlock_tryrdlock
-#define		pthread_rwlock_trywrlock	_pthread_rwlock_trywrlock
-#define		pthread_rwlock_unlock		_pthread_rwlock_unlock
-#define		pthread_self			_pthread_self
-#define		pthread_setspecific		_pthread_setspecific
-#define		pthread_sigmask			_pthread_sigmask
-#define		read				_read
-#define		readv				_readv
-#define		recvfrom			_recvfrom
-#define		recvmsg				_recvmsg
-#define		select				_select
-#define		sendmsg				_sendmsg
-#define		sendto				_sendto
-#define		setsockopt			_setsockopt
-/*#define		sigaction			_sigaction*/
-#define		sigprocmask			_sigprocmask
-#define		sigsuspend			_sigsuspend
-#define		socket				_socket
-#define		socketpair			_socketpair
-#define		usleep				_usleep
-#define		wait4				_wait4
-#define		waitpid				_waitpid
-#define		write				_write
-#define		writev				_writev
-
-
-/*
- * Other hidden syscalls/functions that libc_r needs to override
- * but are not used internally by libc.
- *
- * XXX - When modifying libc to use one of the following, remove
- * the prototype from below and place it in the list above.
- */
-#if 0
-#define		creat				_creat
-#define		fchflags			_fchflags
-#define		fchmod				_fchmod
-#define		ftrylockfile			_ftrylockfile
-#define		msync				_msync
-#define		nfssvc				_nfssvc
-#define		pause				_pause
-#define		pthread_rwlockattr_init		_pthread_rwlockattr_init
-#define		pthread_rwlockattr_destroy	_pthread_rwlockattr_destroy
-#define		sched_yield			_sched_yield
-#define		sendfile			_sendfile
-#define		shutdown			_shutdown
-#define		sigaltstack			_sigaltstack
-#define		sigpending			_sigpending
-#define		sigreturn			_sigreturn
-#define		sigsetmask			_sigsetmask
-#define		sleep				_sleep
-#define		system				_system
-#define		tcdrain				_tcdrain
-#define		wait				_wait
-#endif
-
-#endif /* _NAMESPACE_H_ */
diff --git a/lib/libc_old/include/un-namespace.h b/lib/libc_old/include/un-namespace.h
deleted file mode 100644
index a3d8318..0000000
--- a/lib/libc_old/include/un-namespace.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2001 Daniel Eischen <deischen@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.
- *
- * 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 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.
- *
- * $FreeBSD: src/lib/libc/include/un-namespace.h,v 1.13.12.1 2005/10/08 17:56:33 delphij Exp $
- */
-
-#ifndef _UN_NAMESPACE_H_
-#define _UN_NAMESPACE_H_
-
-#undef		accept
-#undef		__acl_aclcheck_fd
-#undef		__acl_delete_fd
-#undef		__acl_get_fd
-#undef		__acl_set_fd
-#undef		bind
-#undef		__cap_get_fd
-#undef		__cap_set_fd
-#undef		close
-#undef		connect
-#undef		dup
-#undef		dup2
-#undef		execve
-#undef		fcntl
-#undef		flock
-#undef		flockfile
-#undef		fpathconf
-#undef		fstat
-#undef		fstatfs
-#undef		fsync
-#undef		funlockfile
-#undef		getdirentries
-#undef		getlogin
-#undef		getpeername
-#undef		getprogname
-#undef		getsockname
-#undef		getsockopt
-#undef		ioctl
-#undef		kevent
-#undef		listen
-#undef		nanosleep
-#undef		open
-#undef		poll
-#undef		pthread_cond_broadcast
-#undef		pthread_cond_destroy
-#undef		pthread_cond_init
-#undef		pthread_cond_signal
-#undef		pthread_cond_timedwait
-#undef		pthread_cond_wait
-#undef		pthread_exit
-#undef		pthread_getspecific
-#undef		pthread_key_create
-#undef		pthread_key_delete
-#undef		pthread_main_np
-#undef		pthread_mutex_destroy
-#undef		pthread_mutex_init
-#undef		pthread_mutex_lock
-#undef		pthread_mutex_trylock
-#undef		pthread_mutex_unlock
-#undef		pthread_mutexattr_init
-#undef		pthread_mutexattr_destroy
-#undef		pthread_mutexattr_settype
-#undef		pthread_once
-#undef		pthread_rwlock_destroy
-#undef		pthread_rwlock_init
-#undef		pthread_rwlock_rdlock
-#undef		pthread_rwlock_wrlock
-#undef		pthread_rwlock_tryrdlock
-#undef		pthread_rwlock_trywrlock
-#undef		pthread_rwlock_unlock
-#undef		pthread_self
-#undef		pthread_setspecific
-#undef		pthread_sigmask
-#undef		read
-#undef		readv
-#undef		recvfrom
-#undef		recvmsg
-#undef		select
-#undef		sendmsg
-#undef		sendto
-#undef		setsockopt
-#undef		sigaction
-#undef		sigprocmask
-#undef		sigsuspend
-#undef		socket
-#undef		socketpair
-#undef		usleep
-#undef		wait4
-#undef		waitpid
-#undef		write
-#undef		writev
-
-#if 0
-#undef		creat
-#undef		fchflags
-#undef		fchmod
-#undef		ftrylockfile
-#undef		msync
-#undef		nfssvc
-#undef		pause
-#undef		pthread_rwlockattr_init
-#undef		pthread_rwlockattr_destroy
-#undef		sched_yield
-#undef		sendfile
-#undef		shutdown
-#undef		sigaltstack
-#undef		sigpending
-#undef		sigreturn
-#undef		sigsetmask
-#undef		sleep
-#undef		system
-#undef		tcdrain
-#undef		wait
-#endif	/* 0 */
-
-#ifdef _SIGNAL_H_
-int     	_sigaction(int, const struct sigaction *, struct sigaction *);
-#endif
-
-#ifdef _SYS_EVENT_H_
-int		_kevent(int, const struct kevent *, int, struct kevent *,
-		    int, const struct timespec *);
-#endif
-
-#ifdef _SYS_FCNTL_H_
-int		_flock(int, int);
-#endif
-
-#undef		err
-#undef		warn
-#undef		nsdispatch
-
-#endif	/* _UN_NAMESPACE_H_ */
diff --git a/lib/libc_old/locale/Makefile b/lib/libc_old/locale/Makefile
deleted file mode 100644
index 92003cc..0000000
--- a/lib/libc_old/locale/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#Objects
-OBJS = mbrtowc.o srune.o none.o wcrtomb.o table.o runetype.o toupper.o tolower.o
-
-#Output
-OUTPUT = libc.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -I../../../include -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libc_old/locale/collate.h b/lib/libc_old/locale/collate.h
deleted file mode 100644
index 334d6ee..0000000
--- a/lib/libc_old/locale/collate.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 1995 Alex Tatmanjants <alex@elvisti.kiev.ua>
- *		at Electronni Visti IA, Kiev, Ukraine.
- *			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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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/lib/libc/locale/collate.h,v 1.14 2002/08/30 20:26:02 ache Exp $
- */
-
-#ifndef _COLLATE_H_
-#define	_COLLATE_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <limits.h>
-
-#define STR_LEN 10
-#define TABLE_SIZE 100
-#define COLLATE_VERSION    "1.0\n"
-#define COLLATE_VERSION1_1 "1.1\n"
-
-struct __collate_st_char_pri {
-	int prim, sec;
-};
-struct __collate_st_chain_pri {
-	u_char str[STR_LEN];
-	int prim, sec;
-};
-
-extern int __collate_load_error;
-extern int __collate_substitute_nontrivial;
-#define __collate_substitute_table (*__collate_substitute_table_ptr)
-extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
-#define __collate_char_pri_table (*__collate_char_pri_table_ptr)
-extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
-extern struct __collate_st_chain_pri *__collate_chain_pri_table;
-
-u_char	*__collate_strdup(u_char *);
-u_char	*__collate_substitute(const u_char *);
-int	__collate_load_tables(const char *);
-void	__collate_lookup(const u_char *, int *, int *, int *);
-int	__collate_range_cmp(int, int);
-#ifdef COLLATE_DEBUG
-void	__collate_print_tables(void);
-#endif
-
-#endif /* !_COLLATE_H_ */
diff --git a/lib/libc_old/locale/mbrtowc.c b/lib/libc_old/locale/mbrtowc.c
deleted file mode 100644
index e45dd95..0000000
--- a/lib/libc_old/locale/mbrtowc.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mbrtowc.c,v 1.4 2003/11/01 05:13:13 tjr Exp $");
-
-#include <errno.h>
-#include <rune.h>
-#include <stdlib.h>
-#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
-    size_t, mbstate_t * __restrict);
-
-size_t
-mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
-    size_t n, mbstate_t * __restrict ps)
-{
-
-	return (__mbrtowc(pwc, s, n, ps));
-}
-
-/*
- * Emulate the ISO C mbrtowc() function in terms of the deprecated
- * 4.4BSD sgetrune() function.
- */
-size_t
-__emulated_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
-    size_t n, mbstate_t * __restrict ps __unused)
-{
-        const char *e;
-        rune_t r;
-
-	if (s == NULL) {
-		pwc = NULL;
-		s = "";
-		n = 1;
-	}
-
-	if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE) {
-		/*
-		 * The design of sgetrune() doesn't give us any way to tell
-		 * between incomplete and invalid multibyte sequences.
-		 */
-
-		if (n >= (size_t)MB_CUR_MAX) {
-			/*
-			 * If we have been supplied with at least MB_CUR_MAX
-			 * bytes and still cannot find a valid character, the
-			 * data must be invalid.
-			 */
-			errno = EILSEQ;
-			return ((size_t)-1);
-		}
-
-		/*
-		 * .. otherwise, it's an incomplete character or an invalid
-		 * character we cannot detect yet.
-		 */
-		return ((size_t)-2);
-	}
-
-	if (pwc != NULL)
-		*pwc = (wchar_t)r;
-
-	return (r != 0 ? (size_t)(e - s) : 0);
-}
diff --git a/lib/libc_old/locale/none.c b/lib/libc_old/locale/none.c
deleted file mode 100644
index e891c13..0000000
--- a/lib/libc_old/locale/none.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 Tim J. Robbins. All rights reserved.
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)none.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.7 2003/11/01 05:13:13 tjr Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <runetype.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <wchar.h>
-
-extern size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict,
-    size_t, mbstate_t * __restrict);
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
-
-int	_none_init(_RuneLocale *);
-size_t	_none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-	    mbstate_t * __restrict);
-size_t	_none_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-
-int
-_none_init(_RuneLocale *rl)
-{
-
-	__mbrtowc = _none_mbrtowc;
-	__wcrtomb = _none_wcrtomb;
-	_CurrentRuneLocale = rl;
-	__mb_cur_max = 1;
-	return(0);
-}
-
-size_t
-_none_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s, size_t n,
-    mbstate_t * __restrict ps __unused)
-{
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (0);
-	if (n == 0)
-		/* Incomplete multibyte sequence */
-		return ((size_t)-2);
-	if (pwc != NULL)
-		*pwc = (unsigned char)*s;
-	return (*s == '\0' ? 0 : 1);
-}
-
-size_t
-_none_wcrtomb(char * __restrict s, wchar_t wc,
-    mbstate_t * __restrict ps __unused)
-{
-
-	if (s == NULL)
-		/* Reset to initial shift state (no-op) */
-		return (1);
-	if (wc < 0 || wc > UCHAR_MAX) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	*s = (unsigned char)wc;
-	return (1);
-}
diff --git a/lib/libc_old/locale/runetype.c b/lib/libc_old/locale/runetype.c
deleted file mode 100644
index e843637..0000000
--- a/lib/libc_old/locale/runetype.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/runetype.c,v 1.8 2002/08/21 16:19:56 mike Exp $");
-
-#include <stdio.h>
-#include <rune.h>
-
-unsigned long
-___runetype(c)
-	__ct_rune_t c;
-{
-	int x;
-	_RuneRange *rr = &_CurrentRuneLocale->runetype_ext;
-	_RuneEntry *re = rr->ranges;
-
-	if (c < 0 || c == EOF)
-		return(0L);
-
-	for (x = 0; x < rr->nranges; ++x, ++re) {
-		if (c < re->min)
-			return(0L);
-		if (c <= re->max) {
-			if (re->types)
-			    return(re->types[c - re->min]);
-			else
-			    return(re->map);
-		}
-	}
-
-	return(0L);
-}
diff --git a/lib/libc_old/locale/srune.c b/lib/libc_old/locale/srune.c
deleted file mode 100644
index c986053..0000000
--- a/lib/libc_old/locale/srune.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * Copyright (c) 2003 Tim J. Robbins
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/srune.c,v 1.2 2004/01/06 18:26:14 nectar Exp $");
-
-#include <limits.h>
-#include <rune.h>
-#include <string.h>
-#include <wchar.h>
-
-/*
- * Emulate the deprecated 4.4BSD sgetrune() function in terms of
- * the ISO C mbrtowc() function.
- */
-rune_t
-__emulated_sgetrune(const char *string, size_t n, const char **result)
-{
-	wchar_t wc;
-	size_t nconv;
-
-	/*
-	 * Pass a NULL conversion state to mbrtowc() since multibyte
-	 * conversion states are not supported.
-	 */
-	nconv = mbrtowc(&wc, string, n, NULL);
-	if (nconv == (size_t)-2) {
-		if (result != NULL)
-			*result = string;
-		return (_INVALID_RUNE);
-	}
-	if (nconv == (size_t)-1) {
-		if (result != NULL)
-			*result = string + 1;
-		return (_INVALID_RUNE);
-	}
-	if (nconv == 0)
-		nconv = 1;
-	if (result != NULL)
-		*result = string + nconv;
-	return ((rune_t)wc);
-}
-
-/*
- * Emulate the deprecated 4.4BSD sputrune() function in terms of
- * the ISO C wcrtomb() function.
- */
-int
-__emulated_sputrune(rune_t rune, char *string, size_t n, char **result)
-{
-	char buf[MB_LEN_MAX];
-	size_t nconv;
-
-	nconv = wcrtomb(buf, (wchar_t)rune, NULL);
-	if (nconv == (size_t)-1) {
-		if (result != NULL)
-			*result = NULL;
-		return (0);
-	}
-	if (string == NULL) {
-		if (result != NULL)
-			*result = (char *)0 + nconv;
-	} else if (n >= nconv) {
-		memcpy(string, buf, nconv);
-		if (result != NULL)
-			*result = string + nconv;
-	} else {
-		if (result != NULL)
-			*result = NULL;
-	}
-	return (nconv);
-}
diff --git a/lib/libc_old/locale/table.c b/lib/libc_old/locale/table.c
deleted file mode 100644
index e9feeda..0000000
--- a/lib/libc_old/locale/table.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*-
- * Copyright (c) 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Paul Borman at Krystal Technologies.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/27/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/table.c,v 1.19 2003/11/01 05:13:13 tjr Exp $");
-
-#include <ctype.h>
-#include <rune.h>
-#include <wchar.h>
-
-extern size_t	_none_mbrtowc(wchar_t * __restrict, const char * __restrict, size_t,
-		    mbstate_t * __restrict);
-extern size_t	_none_wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict);
-extern size_t	__emulated_mbrtowc(wchar_t * __restrict,
-		    const char * __restrict, size_t,
-		    mbstate_t * __restrict ps);
-extern size_t	__emulated_wcrtomb(char * __restrict, wchar_t,
-		    mbstate_t * __restrict ps);
-extern rune_t	__emulated_sgetrune(const char *, size_t, const char **);
-extern int	__emulated_sputrune(rune_t, char *, size_t, char **);
-
-_RuneLocale _DefaultRuneLocale = {
-    _RUNE_MAGIC_1,
-    "NONE",
-    __emulated_sgetrune,
-    __emulated_sputrune,
-    0xFFFD,
-
-    {	/*00*/	_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*08*/	_CTYPE_C,
-		_CTYPE_C|_CTYPE_S|_CTYPE_B,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C|_CTYPE_S,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*10*/	_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*18*/	_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-		_CTYPE_C,
-	/*20*/	_CTYPE_S|_CTYPE_B|_CTYPE_R,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*28*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*30*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|0,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|1,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|2,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|3,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|4,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|5,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|6,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|7,
-	/*38*/	_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|8,
-		_CTYPE_D|_CTYPE_R|_CTYPE_G|_CTYPE_X|9,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*40*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
-		_CTYPE_U|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*48*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*50*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*58*/	_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_U|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-	/*60*/	_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|10,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|11,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|12,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|13,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|14,
-		_CTYPE_L|_CTYPE_X|_CTYPE_R|_CTYPE_G|_CTYPE_A|15,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*68*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*70*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-	/*78*/	_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_L|_CTYPE_R|_CTYPE_G|_CTYPE_A,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_P|_CTYPE_R|_CTYPE_G,
-		_CTYPE_C,
-    },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'a',	'b',	'c',	'd',	'e',	'f',	'g',
-     	'h',	'i',	'j',	'k',	'l',	'm',	'n',	'o',
-	'p',	'q',	'r',	's',	't',	'u',	'v',	'w',
-     	'x',	'y',	'z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-    },
-    {	0x00,	0x01,	0x02,	0x03,	0x04,	0x05,	0x06,	0x07,
-     	0x08,	0x09,	0x0a,	0x0b,	0x0c,	0x0d,	0x0e,	0x0f,
-	0x10,	0x11,	0x12,	0x13,	0x14,	0x15,	0x16,	0x17,
-     	0x18,	0x19,	0x1a,	0x1b,	0x1c,	0x1d,	0x1e,	0x1f,
-	0x20,	0x21,	0x22,	0x23,	0x24,	0x25,	0x26,	0x27,
-     	0x28,	0x29,	0x2a,	0x2b,	0x2c,	0x2d,	0x2e,	0x2f,
-	0x30,	0x31,	0x32,	0x33,	0x34,	0x35,	0x36,	0x37,
-     	0x38,	0x39,	0x3a,	0x3b,	0x3c,	0x3d,	0x3e,	0x3f,
-	0x40,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x5b,	0x5c,	0x5d,	0x5e,	0x5f,
-	0x60,	'A',	'B',	'C',	'D',	'E',	'F',	'G',
-     	'H',	'I',	'J',	'K',	'L',	'M',	'N',	'O',
-	'P',	'Q',	'R',	'S',	'T',	'U',	'V',	'W',
-     	'X',	'Y',	'Z',	0x7b,	0x7c,	0x7d,	0x7e,	0x7f,
-	0x80,	0x81,	0x82,	0x83,	0x84,	0x85,	0x86,	0x87,
-     	0x88,	0x89,	0x8a,	0x8b,	0x8c,	0x8d,	0x8e,	0x8f,
-	0x90,	0x91,	0x92,	0x93,	0x94,	0x95,	0x96,	0x97,
-     	0x98,	0x99,	0x9a,	0x9b,	0x9c,	0x9d,	0x9e,	0x9f,
-	0xa0,	0xa1,	0xa2,	0xa3,	0xa4,	0xa5,	0xa6,	0xa7,
-     	0xa8,	0xa9,	0xaa,	0xab,	0xac,	0xad,	0xae,	0xaf,
-	0xb0,	0xb1,	0xb2,	0xb3,	0xb4,	0xb5,	0xb6,	0xb7,
-     	0xb8,	0xb9,	0xba,	0xbb,	0xbc,	0xbd,	0xbe,	0xbf,
-	0xc0,	0xc1,	0xc2,	0xc3,	0xc4,	0xc5,	0xc6,	0xc7,
-     	0xc8,	0xc9,	0xca,	0xcb,	0xcc,	0xcd,	0xce,	0xcf,
-	0xd0,	0xd1,	0xd2,	0xd3,	0xd4,	0xd5,	0xd6,	0xd7,
-     	0xd8,	0xd9,	0xda,	0xdb,	0xdc,	0xdd,	0xde,	0xdf,
-	0xe0,	0xe1,	0xe2,	0xe3,	0xe4,	0xe5,	0xe6,	0xe7,
-     	0xe8,	0xe9,	0xea,	0xeb,	0xec,	0xed,	0xee,	0xef,
-	0xf0,	0xf1,	0xf2,	0xf3,	0xf4,	0xf5,	0xf6,	0xf7,
-     	0xf8,	0xf9,	0xfa,	0xfb,	0xfc,	0xfd,	0xfe,	0xff,
-    },
-};
-
-_RuneLocale *_CurrentRuneLocale = &_DefaultRuneLocale;
-
-int __mb_cur_max = 1;
-size_t (*__mbrtowc)(wchar_t * __restrict, const char * __restrict, size_t,
-    mbstate_t * __restrict) = _none_mbrtowc;
-size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict) =
-    _none_wcrtomb;
diff --git a/lib/libc_old/locale/tolower.c b/lib/libc_old/locale/tolower.c
deleted file mode 100644
index 90a2c99..0000000
--- a/lib/libc_old/locale/tolower.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: tolower.c 89 2016-01-12 00:20:40Z reddawg $
-
-**************************************************************************************/
-int  ___tolower (int c) {
-        if (c >= 'A' && c <= 'Z') c += ('a' - 'A');
-                return c;
-}
diff --git a/lib/libc_old/locale/toupper.c b/lib/libc_old/locale/toupper.c
deleted file mode 100644
index fe90728..0000000
--- a/lib/libc_old/locale/toupper.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: toupper.c 89 2016-01-12 00:20:40Z reddawg $
-
-**************************************************************************************/
-
-int  toupper(int c) {
-if (c >= 'a' && c <= 'z') c += ('A' - 'a');
-                return c;
-}
diff --git a/lib/libc_old/locale/wcrtomb.c b/lib/libc_old/locale/wcrtomb.c
deleted file mode 100644
index 1f2e150..0000000
--- a/lib/libc_old/locale/wcrtomb.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 2002, 2003 Tim J. Robbins.
- * 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.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/wcrtomb.c,v 1.5 2003/11/01 05:13:13 tjr Exp $");
-
-#include <errno.h>
-#include <limits.h>
-#include <rune.h>
-#include <stdlib.h>
-#include <wchar.h>
-
-extern size_t (*__wcrtomb)(char * __restrict, wchar_t, mbstate_t * __restrict);
-
-size_t
-wcrtomb(char * __restrict s, wchar_t wc, mbstate_t * __restrict ps)
-{
-
-	return (__wcrtomb(s, wc, ps));
-}
-
-/*
- * Emulate the ISO C wcrtomb() function in terms of the deprecated
- * 4.4BSD sputrune() function.
- */
-size_t
-__emulated_wcrtomb(char * __restrict s, wchar_t wc,
-    mbstate_t * __restrict ps __unused)
-{
-	char *e;
-	char buf[MB_LEN_MAX];
-
-	if (s == NULL) {
-		s = buf;
-		wc = L'\0';
-	}
-	sputrune(wc, s, MB_CUR_MAX, &e);
-	if (e == NULL) {
-		errno = EILSEQ;
-		return ((size_t)-1);
-	}
-	return ((size_t)(e - s));
-}
diff --git a/lib/libc_old/math/Makefile b/lib/libc_old/math/Makefile
deleted file mode 100644
index a5a85b4..0000000
--- a/lib/libc_old/math/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#Objects
-OBJS = atan.o sqrt.o
-
-#Output
-OUTPUT = libc.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../../../include -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libc_old/math/atan.c b/lib/libc_old/math/atan.c
deleted file mode 100644
index ee59158..0000000
--- a/lib/libc_old/math/atan.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math.h>
-
-double atan(double val) {
-  return(val);
-  }
diff --git a/lib/libc_old/math/sqrt.c b/lib/libc_old/math/sqrt.c
deleted file mode 100644
index 581e032..0000000
--- a/lib/libc_old/math/sqrt.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math.h>
-
-double sqrt(double val) {
-  return(val);
-  }
diff --git a/lib/libc_old/quad/Makefile b/lib/libc_old/quad/Makefile
deleted file mode 100644
index bcebc54..0000000
--- a/lib/libc_old/quad/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#Objects
-OBJS = udivdi3.o divdi3.o
-#Output
-OUTPUT = libc.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../../../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../../../include -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libc_old/quad/divdi3.c b/lib/libc_old/quad/divdi3.c
deleted file mode 100644
index 914b0be..0000000
--- a/lib/libc_old/quad/divdi3.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <quad.h>
-
-quad_t __divdi3(quad_t a,quad_t b) {
-        u_quad_t ua = 0x0, ub = 0x0, uq = 0x0;
-        int neg;
-
-        if (a < 0)
-                ua = -(u_quad_t)a, neg = 1;
-        else
-                ua = a, neg = 0;
-        if (b < 0)
-                ub = -(u_quad_t)b, neg ^= 1;
-        else
-                ub = b;
-//        uq = __qdivrem(ua, ub, (u_quad_t *)0);
-        return (neg ? -uq : uq);
-}
diff --git a/lib/libc_old/quad/qdivrem.c b/lib/libc_old/quad/qdivrem.c
deleted file mode 100644
index 0fa5cb8..0000000
--- a/lib/libc_old/quad/qdivrem.c
+++ /dev/null
@@ -1,199 +0,0 @@
-#include <quad.h>
-
-u_quad_t
-__qdivrem(uq, vq, arq)
-        u_quad_t uq, vq, *arq;
-{
-        union uu tmp;
-        digit *u, *v, *q;
-        register digit v1, v2;
-        u_long qhat, rhat, t;
-        int m, n, d, j, i;
-        digit uspace[5], vspace[5], qspace[5];
-
-        /*
-         * Take care of special cases: divide by zero, and u < v.
-         */
-        if (vq == 0) {
-                /* divide by zero. */
-                static volatile const unsigned int zero = 0;
-
-                tmp.ul[H] = tmp.ul[L] = 1 / zero;
-                if (arq)
-                        *arq = uq;
-                return (tmp.q);
-        }
-        if (uq < vq) {
-                if (arq)
-                        *arq = uq;
-                return (0);
-        }
-        u = &uspace[0];
-        v = &vspace[0];
-        q = &qspace[0];
-
-        /*
-         * Break dividend and divisor into digits in base B, then
-         * count leading zeros to determine m and n.  When done, we
-         * will have:
-         *      u = (u[1]u[2]...u[m+n]) sub B
-         *      v = (v[1]v[2]...v[n]) sub B
-         *      v[1] != 0
-         *      1 < n <= 4 (if n = 1, we use a different division algorithm)
-         *      m >= 0 (otherwise u < v, which we already checked)
-         *      m + n = 4
-         * and thus
-         *      m = 4 - n <= 2
-         */
-        tmp.uq = uq;
-        u[0] = 0;
-        u[1] = HHALF(tmp.ul[H]);
-        u[2] = LHALF(tmp.ul[H]);
-        u[3] = HHALF(tmp.ul[L]);
-        u[4] = LHALF(tmp.ul[L]);
-        tmp.uq = vq;
-        v[1] = HHALF(tmp.ul[H]);
-        v[2] = LHALF(tmp.ul[H]);
-        v[3] = HHALF(tmp.ul[L]);
-        v[4] = LHALF(tmp.ul[L]);
-        for (n = 4; v[1] == 0; v++) {
-                if (--n == 1) {
-                        u_long rbj;     /* r*B+u[j] (not root boy jim) */
-                        digit q1, q2, q3, q4;
-
-                        /*
-                         * Change of plan, per exercise 16.
-                         *      r = 0;
-                         *      for j = 1..4:
-                         *              q[j] = floor((r*B + u[j]) / v),
-                         *              r = (r*B + u[j]) % v;
-                         * We unroll this completely here.
-                         */
-                        t = v[2];       /* nonzero, by definition */
-                        q1 = u[1] / t;
-                        rbj = COMBINE(u[1] % t, u[2]);
-                        q2 = rbj / t;
-                        rbj = COMBINE(rbj % t, u[3]);
-                        q3 = rbj / t;
-                        rbj = COMBINE(rbj % t, u[4]);
-                        q4 = rbj / t;
-                        if (arq)
-                                *arq = rbj % t;
-                        tmp.ul[H] = COMBINE(q1, q2);
-                        tmp.ul[L] = COMBINE(q3, q4);
-                        return (tmp.q);
-                }
-        }
-
-        /*
-         * By adjusting q once we determine m, we can guarantee that
-         * there is a complete four-digit quotient at &qspace[1] when
-         * we finally stop.
-         */
-        for (m = 4 - n; u[1] == 0; u++)
-                m--;
-        for (i = 4 - m; --i >= 0;)
-                q[i] = 0;
-        q += 4 - m;
-
-        /*
-         * Here we run Program D, translated from MIX to C and acquiring
-         * a few minor changes.
-         *
-         * D1: choose multiplier 1 << d to ensure v[1] >= B/2.
-         */
-        d = 0;
-        for (t = v[1]; t < B / 2; t <<= 1)
-                d++;
-        if (d > 0) {
-                shl(&u[0], m + n, d);           /* u <<= d */
-                shl(&v[1], n - 1, d);           /* v <<= d */
-        }
-        /*
-         * D2: j = 0.
-         */
-        j = 0;
-        v1 = v[1];      /* for D3 -- note that v[1..n] are constant */
-        v2 = v[2];      /* for D3 */
-        do {
-                register digit uj0, uj1, uj2;
-
-                /*
-                 * D3: Calculate qhat (\^q, in TeX notation).
-                 * Let qhat = min((u[j]*B + u[j+1])/v[1], B-1), and
-                 * let rhat = (u[j]*B + u[j+1]) mod v[1].
-                 * While rhat < B and v[2]*qhat > rhat*B+u[j+2],
-                 * decrement qhat and increase rhat correspondingly.
-                 * Note that if rhat >= B, v[2]*qhat < rhat*B.
-                 */
-                uj0 = u[j + 0]; /* for D3 only -- note that u[j+...] change */
-                uj1 = u[j + 1]; /* for D3 only */
-                uj2 = u[j + 2]; /* for D3 only */
-                if (uj0 == v1) {
-                        qhat = B;
-                        rhat = uj1;
-                        goto qhat_too_big;
-                } else {
-                        u_long n = COMBINE(uj0, uj1);
-                        qhat = n / v1;
-                        rhat = n % v1;
-                }
-                while (v2 * qhat > COMBINE(rhat, uj2)) {
-        qhat_too_big:
-                        qhat--;
-                        if ((rhat += v1) >= B)
-                                break;
-                }
-                /*
-                 * D4: Multiply and subtract.
-                 * The variable `t' holds any borrows across the loop.
-                 * We split this up so that we do not require v[0] = 0,
-                 * and to eliminate a final special case.
-                 */
-                for (t = 0, i = n; i > 0; i--) {
-                        t = u[i + j] - v[i] * qhat - t;
-                        u[i + j] = LHALF(t);
-                        t = (B - HHALF(t)) & (B - 1);
-                }
-                t = u[j] - t;
-                u[j] = LHALF(t);
-                /*
-                 * D5: test remainder.
-                 * There is a borrow if and only if HHALF(t) is nonzero;
-                 * in that (rare) case, qhat was too large (by exactly 1).
-                 * Fix it by adding v[1..n] to u[j..j+n].
-                 */
-                if (HHALF(t)) {
-                        qhat--;
-                        for (t = 0, i = n; i > 0; i--) { /* D6: add back. */
-                                t += u[i + j] + v[i];
-                                u[i + j] = LHALF(t);
-                                t = HHALF(t);
-                        }
-                        u[j] = LHALF(u[j] + t);
-                }
-                q[j] = qhat;
-        } while (++j <= m);             /* D7: loop on j. */
-
-        /*
-         * If caller wants the remainder, we have to calculate it as
-         * u[m..m+n] >> d (this is at most n digits and thus fits in
-         * u[m+1..m+n], but we may need more source digits).
-         */
-        if (arq) {
-                if (d) {
-                        for (i = m + n; i > m; --i)
-                                u[i] = (u[i] >> d) |
-                                    LHALF(u[i - 1] << (HALF_BITS - d));
-                        u[i] = 0;
-                }
-                tmp.ul[H] = COMBINE(uspace[1], uspace[2]);
-                tmp.ul[L] = COMBINE(uspace[3], uspace[4]);
-                *arq = tmp.q;
-        }
-
-        tmp.ul[H] = COMBINE(qspace[1], qspace[2]);
-        tmp.ul[L] = COMBINE(qspace[3], qspace[4]);
-        return (tmp.q);
-}
-
diff --git a/lib/libc_old/quad/udivdi3.c b/lib/libc_old/quad/udivdi3.c
deleted file mode 100644
index 4c9908d..0000000
--- a/lib/libc_old/quad/udivdi3.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <quad.h>
-
-u_quad_t __udivdi3(u_quad_t a,u_quad_t b) {
-
-        //return (__qdivrem(a, b, (u_quad_t *)0));
-  return(0);
-}
diff --git a/lib/libc_old/stdio/Makefile b/lib/libc_old/stdio/Makefile
deleted file mode 100644
index 639ad20..0000000
--- a/lib/libc_old/stdio/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#Objects
-OBJS = fprintf.o fseek.o printf.o vsprintf.o fd.o vfprintf.o fopen.o fread.o fwrite.o fgetc.o sprintf.o gets.o fclose.o
-
-#Output
-OUTPUT = libc.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -I../../../include -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libc_old/stdio/fclose.c b/lib/libc_old/stdio/fclose.c
deleted file mode 100644
index e934297..0000000
--- a/lib/libc_old/stdio/fclose.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fclose.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int _fclose(FILE *fp);
-
-asm(
-  ".globl _fclose\n"
-  "_fclose:\n"
-  "movl $296,%eax\n"
-  "int $0x80\n"
-  "ret\n"
-  );
-
-
-int fclose(FILE *fp) {
-  /*
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (10),"b" (fp),"c" (&status)
-    );
-  free(fp);
-  return(status);
-  */
-  return(_fclose(fp));
-  }
-
-/***
- $Log: fclose.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:54  reddawg
- no message
-
- Revision 1.3  2004/06/17 15:16:02  reddawg
- Made asm statements volatile
-
- Revision 1.2  2004/06/16 19:31:10  reddawg
- Fixed a memory leak we now free(fp);
-
- END
- ***/
diff --git a/lib/libc_old/stdio/fd.c b/lib/libc_old/stdio/fd.c
deleted file mode 100644
index 3fc337b..0000000
--- a/lib/libc_old/stdio/fd.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fd.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-
-FILE fdTable[3] = {
-  {0x0, 0x0}, /* stdin */
-  {0x1, 0x0}, /* stdout */
-  {0x2, 0x0}  /* stderr */
-  };
-
-/***
- $Log: fd.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:54  reddawg
- no message
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/fgetc.c b/lib/libc_old/stdio/fgetc.c
deleted file mode 100644
index 75a4ae9..0000000
--- a/lib/libc_old/stdio/fgetc.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fgetc.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-
-int fgetc(FILE *fp);
-
-asm(
-  ".globl fgetc\n"
-  "fgetc:\n"
-  "movl $295,%eax\n"
-  "int $0x80\n"
-  "ret\n"
-  );
-
-/*
-int fgetc(FILE *fd) {
-  volatile int ch = 0x0;
-  asm volatile(
-    "int %0"
-    :
-    : "i" (0x80),"a" (5),"b" (&ch),"c" (fd)
-    );
-  return(ch);
-  }
-*/
-
-/***
- $Log: fgetc.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:54  reddawg
- no message
-
- Revision 1.4  2004/06/17 15:16:02  reddawg
- Made asm statements volatile
-
- Revision 1.3  2004/06/17 15:13:35  reddawg
- Fixed an initializer
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/fopen.c b/lib/libc_old/stdio/fopen.c
deleted file mode 100644
index 0ef36f5..0000000
--- a/lib/libc_old/stdio/fopen.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fopen.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int _fopen(const char *file, const char *mode, FILE *fp);
-
-asm(
-  ".globl _fopen\n"
-  "_fopen:\n"
-  "movl $298,%eax\n"
-  "int $0x80\n"
-  "ret\n"
-  );
-
-
-FILE *fopen(const char *file,const char *mode) {
-  FILE *fp = malloc(sizeof(FILE));
-  fp->fd = 0x0;
-
-  _fopen(file,mode,fp);
-
-  /*
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (8),"b" (file),"c" (mode),"d" (fp)
-    );
-  */
-  return((FILE *)fp);
-  }
-
-/***
- $Log: fopen.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.4  2006/06/01 12:42:09  reddawg
- Getting back to the basics
-
- Revision 1.3  2005/10/21 20:07:07  reddawg
- Work has resumed
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:54  reddawg
- no message
-
- Revision 1.4  2004/07/28 15:05:43  reddawg
- Major:
-   Pages now have strict security enforcement.
-   Many null dereferences have been resolved.
-   When apps loaded permissions set for pages rw and ro
-
- Revision 1.3  2004/06/17 15:16:02  reddawg
- Made asm statements volatile
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/fprintf.c b/lib/libc_old/stdio/fprintf.c
deleted file mode 100644
index 04d849a..0000000
--- a/lib/libc_old/stdio/fprintf.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fprintf.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-#include <stdarg.h>
-
-int fprintf(FILE *fp,const char *fmt, ...) {
-  int retVal;
-  vaList ap;
-  vaStart(ap, fmt);
-  retVal = vfprintf(fp, fmt, ap);
-  vaEnd(ap);
-  return(retVal);
-  }
-
-/***
- $Log: fprintf.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:54  reddawg
- no message
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/fread.c b/lib/libc_old/stdio/fread.c
deleted file mode 100644
index 6a61657..0000000
--- a/lib/libc_old/stdio/fread.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fread.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-
-size_t _fread(void *pointer,size_t size,size_t count, FILE *stream);
-
-asm(
-  ".globl _fread\n"
-  "_fread:\n"
-  "movl $297,%eax\n"
-  "int $0x80\n"
-  "ret\n"
-  );
-
-
-size_t fread(void *pointer,size_t size,size_t count, FILE *stream) {
-/*
-    asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (22),"b" (pointer),"c" (size * count),"d" (stream)
-    );
-*/
-  return(_fread(pointer,size,count,stream));
-  }
-
-/***
- $Log: fread.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:54  reddawg
- no message
-
- Revision 1.3  2004/06/17 15:16:02  reddawg
- Made asm statements volatile
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/freopen.c b/lib/libc_old/stdio/freopen.c
deleted file mode 100644
index 8f8e334..0000000
--- a/lib/libc_old/stdio/freopen.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: freopen.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-/* Pieces of code from fopen, and fclose, modified by Tyrell Atterberry */
-
-
-
-#include <stdio.h>
-
-#include <stdlib.h>
-
-
-
-FILE *freopen(const char *file,const char *mode, FILE *fp) {
-  
-  //FILE *fp = malloc(sizeof(FILE));
-
-  int status = 0x0;
-
-
-  if(!file || !mode || !fp) return NULL;
-
-
-
-  asm volatile(
-
-    "int %0\n"
-
-    : : "i" (0x80),"a" (10),"b" (fp),"c" (&status)
-
-    );
-
-
-
-  fp->fd = -1;
-
-
-  asm volatile(
-
-    "int %0\n"
-
-    : : "i" (0x80),"a" (8),"b" (file),"c" (mode),"d" (fp)
-
-    );
-
-  return ((FILE *)fp);
-
-  }
-
-
-/***
- $Log: freopen.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:55  reddawg
- no message
-
- Revision 1.2  2004/06/17 15:16:02  reddawg
- Made asm statements volatile
-
- Revision 1.1  2004/06/16 20:28:42  reddawg
- New Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/fseek.c b/lib/libc_old/stdio/fseek.c
deleted file mode 100644
index 0ea8eb4..0000000
--- a/lib/libc_old/stdio/fseek.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fseek.c 160 2016-01-19 04:01:03Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-
-size_t _fseek(FILE *stream, long offset, int whence);
-
-asm(
-  ".globl _fseek\n"
-  "_fseek:\n"
-  "movl $294,%eax\n"
-  "int $0x80\n"
-  "ret\n"
-  );
-
-
-int fseek(FILE *stream,long offset,int whence) {
-/*
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (27),"b" (fd),"c" (offset),"d" (whence)
-    );
-  return(offset+whence);
-*/
-  return(_fseek(stream,offset,whence));
-  }
-
-/***
- $Log: fseek.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:55  reddawg
- no message
-
- Revision 1.3  2004/06/17 15:16:02  reddawg
- Made asm statements volatile
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/fwrite.c b/lib/libc_old/stdio/fwrite.c
deleted file mode 100644
index f400e3f..0000000
--- a/lib/libc_old/stdio/fwrite.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fwrite.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-
-int fwrite(const void *ptr,int size,int nmemb,FILE *fd) {
-  int retVal = size;
-  asm volatile(
-    "int %0"
-    :
-    : "i" (0x80),"a" (23),"b" (ptr),"c" (size*nmemb),"d" (fd)
-    );
-  return(retVal);
-  }
-
-/***
- $Log: fwrite.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:55  reddawg
- no message
-
- Revision 1.3  2004/06/17 15:16:02  reddawg
- Made asm statements volatile
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/gets.c b/lib/libc_old/stdio/gets.c
deleted file mode 100644
index 2e3b9f1..0000000
--- a/lib/libc_old/stdio/gets.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: gets.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-
-char *gets(char *string) {
-  int count=0,ch=0;
-   while (1) {
-    ch = fgetc(stdin);
-    if(ch == 10) {
-      printf("\n");
-      break;
-      }
-    else if(ch == 8 && count > 0) count-=2;
-    else if(ch == 0) count--;
-    else string[count] = ch;
-    if (ch != 8) printf("%c",ch);
-    count ++;
-    }
-  string[count] = '\0';
-  return(string);
-  }
-
-/***
- $Log: gets.c,v $
- Revision 1.2  2006/10/19 17:52:17  reddawg
- Working On Userland
-
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:55  reddawg
- no message
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/perror.c b/lib/libc_old/stdio/perror.c
deleted file mode 100644
index 9c6ce44..0000000
--- a/lib/libc_old/stdio/perror.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: perror.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-
-#include "string.h"
-
-#include "errno.h"
-
-
-void perror(const char* s) {
-
-  fprintf(stderr, "%s: %s\n", (s != NULL ? s : ""), strerror(errno));
-  
-}
-
-/***
- $Log: perror.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:55  reddawg
- no message
-
- Revision 1.1  2004/06/16 20:29:18  reddawg
- New Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/printf.c b/lib/libc_old/stdio/printf.c
deleted file mode 100644
index 3a546e6..0000000
--- a/lib/libc_old/stdio/printf.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: printf.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-#include <stdarg.h>
-
-int printf(char const *fmt, ...) {
-  int retVal;
-
-  vaList ap;
-  vaStart(ap, fmt);
-  retVal = vfprintf(stdout, fmt, ap);
-  vaEnd(ap);
-
-  return(retVal);
-  }
-
-/***
- $Log: printf.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:55  reddawg
- no message
-
- Revision 1.3  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/sprintf.c b/lib/libc_old/stdio/sprintf.c
deleted file mode 100644
index 9ed5616..0000000
--- a/lib/libc_old/stdio/sprintf.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sprintf.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-
-int sprintf(char *string, const char *format, ...) {
-  vaList args;
-  int retVal = 0x0;
-  vaStart(args, format);
-  retVal = vsprintf(string,format,args);
-  vaEnd(args);
-  return(retVal);
-  }
-
-/***
- $Log: sprintf.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:55  reddawg
- no message
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/vfprintf.c b/lib/libc_old/stdio/vfprintf.c
deleted file mode 100644
index c32e778..0000000
--- a/lib/libc_old/stdio/vfprintf.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vfprintf.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdio.h>
-#include <string.h>
-
-int _write(int fd, void *ptr, size_t size);
-
-asm(
-  ".globl _write\n"
-  "_write:\n"
-  "movl $0x4,%eax\n"
-  "int $0x80\n"
-  "ret\n"
-  );
-
-int vfprintf(FILE *fd,const char *fmt,vaList args) {
-  int retVal = 0;
-
-  char data[512] = {'A','B','C'};
-
-  retVal = vsprintf(&data, fmt, args);
-
-  return(_write(fd->fd, &data, 512));
-
-  /*
-  return asm volatile(
-    "movl &data,%%eax\n"
-    "push %%eax\n"
-    "movl $0x4,%%eax\n"
-    "int %0"
-    :
-    : "i" (0x80),"a" (retVal)
-    );
-  */
-
-  }
-
-/*
-int vfprintf(FILE *fd,const char *fmt,vaList args) {
-  int retVal = 0;
-  char data[512];
-  retVal = vsprintf(data,fmt,args);
-  asm volatile(
-  //  "push %4\n"
-  //  "push %3\n"
-  //  "push %2\n"
-    "int %0\n"
-    "nop\n"
-  //  "addl  $12,%%esp\n"
-    :
-    : "i" (0x90),"a" (23),"g" (&data),"g" (0x69),"g" (fd)
-    );
-  return(retVal);
-  }
-*/
-
-/***
- $Log: vfprintf.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:56  reddawg
- no message
-
- Revision 1.3  2004/07/05 23:07:23  reddawg
- Old libc updates
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdio/vsprintf.c b/lib/libc_old/stdio/vsprintf.c
deleted file mode 100644
index bd871be..0000000
--- a/lib/libc_old/stdio/vsprintf.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vsprintf.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */
-/*
- * Wirzenius wrote this portably, Torvalds fucked it up :-)
- */
-
-#include <stdarg.h>
-#include <string.h>
-
-/* we use this so that we can do without the ctype library */
-#define is_digit(c)	((c) >= '0' && (c) <= '9')
-
-static int skip_atoi(const char **s)
-{
-	int i=0;
-
-	while (is_digit(**s))
-		i = i*10 + *((*s)++) - '0';
-	return i;
-}
-
-#define ZEROPAD	1		/* pad with zero */
-#define SIGN	2		/* unsigned/signed long */
-#define PLUS	4		/* show plus */
-#define SPACE	8		/* space if plus */
-#define LEFT	16		/* left justified */
-#define SPECIAL	32		/* 0x */
-#define SMALL	64		/* use 'abcdef' instead of 'ABCDEF' */
-
-#define do_div(n,base) ({ \
-int __res; \
-__asm__("divl %4":"=a" (n),"=d" (__res):"0" (n),"1" (0),"r" (base)); \
-__res; })
-
-static char * number(char * str, int num, int base, int size, int precision
-	,int type)
-{
-	char c,sign,tmp[36];
-	const char *digits="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	int i;
-
-	if (type&SMALL) digits="0123456789abcdefghijklmnopqrstuvwxyz";
-	if (type&LEFT) type &= ~ZEROPAD;
-	if (base<2 || base>36)
-		return 0;
-	c = (type & ZEROPAD) ? '0' : ' ' ;
-	if (type&SIGN && num<0) {
-		sign='-';
-		num = -num;
-	} else
-		sign=(type&PLUS) ? '+' : ((type&SPACE) ? ' ' : 0);
-	if (sign) size--;
-	if (type&SPECIAL) {
-	  if (base==16) { size -= 2; }
-		else if (base==8) { size--; }
-          }
-	i=0;
-	if (num==0)
-		tmp[i++]='0';
-	else while (num!=0)
-		tmp[i++]=digits[do_div(num,base)];
-	if (i>precision) precision=i;
-	size -= precision;
-	if (!(type&(ZEROPAD+LEFT)))
-		while(size-->0)
-			*str++ = ' ';
-	if (sign)
-		*str++ = sign;
-	if (type&SPECIAL) {
-	  if (base==8) {
-            *str++ = '0';
-            }
-          else if (base==16) {
-		*str++ = '0';
-		*str++ = digits[33];
-		}
-          }
-	if (!(type&LEFT))
-		while(size-->0)
-			*str++ = c;
-	while(i<precision--)
-		*str++ = '0';
-	while(i-->0)
-		*str++ = tmp[i];
-	while(size-->0)
-		*str++ = ' ';
-	return str;
-}
-
-int vsprintf(char *buf, const char *fmt, vaList args)
-{
-	int len;
-	int i;
-	char * str;
-	char *s;
-	int *ip;
-
-	int flags;		/* flags to number() */
-
-	int field_width;	/* width of output field */
-	int precision;		/* min. # of digits for integers; max
-				   number of chars for from string */
-	int qualifier;		/* 'h', 'l', or 'L' for integer fields */
-
-	for (str=buf ; *fmt ; ++fmt) {
-		if (*fmt != '%') {
-			*str++ = *fmt;
-			continue;
-		}
-			
-		/* process flags */
-		flags = 0;
-		repeat:
-			++fmt;		/* this also skips first '%' */
-			switch (*fmt) {
-				case '-': flags |= LEFT; goto repeat;
-				case '+': flags |= PLUS; goto repeat;
-				case ' ': flags |= SPACE; goto repeat;
-				case '#': flags |= SPECIAL; goto repeat;
-				case '0': flags |= ZEROPAD; goto repeat;
-				}
-		
-		/* get field width */
-		field_width = -1;
-		if (is_digit(*fmt))
-			field_width = skip_atoi(&fmt);
-		else if (*fmt == '*') {
-			/* it's the next argument */
-			field_width = vaArg(args, int);
-			if (field_width < 0) {
-				field_width = -field_width;
-				flags |= LEFT;
-			}
-		}
-
-		/* get the precision */
-		precision = -1;
-		if (*fmt == '.') {
-			++fmt;	
-			if (is_digit(*fmt))
-				precision = skip_atoi(&fmt);
-			else if (*fmt == '*') {
-				/* it's the next argument */
-				precision = vaArg(args, int);
-			}
-			if (precision < 0)
-				precision = 0;
-		}
-
-		/* get the conversion qualifier */
-		qualifier = -1;
-		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L') {
-			qualifier = *fmt;
-			++fmt;
-		}
-
-		switch (*fmt) {
-		case 'c':
-			if (!(flags & LEFT))
-				while (--field_width > 0)
-					*str++ = ' ';
-			*str++ = (unsigned char) vaArg(args, int);
-			while (--field_width > 0)
-				*str++ = ' ';
-			break;
-
-		case 's':
-			s = vaArg(args, char *);
-			len = strlen(s);
-			if (precision < 0)
-				precision = len;
-			else if (len > precision)
-				len = precision;
-
-			if (!(flags & LEFT))
-				while (len < field_width--)
-					*str++ = ' ';
-			for (i = 0; i < len; ++i)
-				*str++ = *s++;
-			while (len < field_width--)
-				*str++ = ' ';
-			break;
-
-		case 'o':
-			str = number(str, vaArg(args, unsigned long), 8,
-				field_width, precision, flags);
-			break;
-
-		case 'p':
-			if (field_width == -1) {
-				field_width = 8;
-				flags |= ZEROPAD;
-			}
-			str = number(str,
-				(unsigned long) vaArg(args, void *), 16,
-				field_width, precision, flags);
-			break;
-
-		case 'x':
-			flags |= SMALL;
-		case 'X':
-			str = number(str, vaArg(args, unsigned long), 16,
-				field_width, precision, flags);
-			break;
-
-		case 'd':
-		case 'i':
-			flags |= SIGN;
-		case 'u':
-			str = number(str, vaArg(args, unsigned long), 10,
-				field_width, precision, flags);
-			break;
-
-		case 'n':
-			ip = vaArg(args, int *);
-			*ip = (str - buf);
-			break;
-
-		default:
-			if (*fmt != '%')
-				*str++ = '%';
-			if (*fmt)
-				*str++ = *fmt;
-			else
-				--fmt;
-			break;
-		}
-	}
-	*str = '\0';
-	return str-buf;
-}
-
-/***
- $Log: vsprintf.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:56  reddawg
- no message
-
- Revision 1.2  2004/06/16 19:38:26  reddawg
- Updated CW Cleaned Out Dead Code
-
- END
- ***/
diff --git a/lib/libc_old/stdlib/Makefile b/lib/libc_old/stdlib/Makefile
deleted file mode 100644
index c10698e..0000000
--- a/lib/libc_old/stdlib/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#Objects
-OBJS = strtol.o atoi.o abs.o exit.o malloc.o rand.o getopt.o
-
-#Output
-OUTPUT = libc.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -Wall ${CFLAGS} -nostdinc -O -I../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX)  -Wall ${CFLAGS} -nostdinc -O -I../include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall ${CFLAGS} -nostdinc -O -I../include -I../../../include -c $<
-
-.c.s:
-	$(CC)  -Wall ${CFLAGS} -nostdinc -O -I../include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall ${CFLAGS} -nostdinc -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libc_old/stdlib/abs.c b/lib/libc_old/stdlib/abs.c
deleted file mode 100644
index a008c42..0000000
--- a/lib/libc_old/stdlib/abs.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdlib.h>
-
-int abs(int val) {
-  return(val>0?val:-val);
-  }
diff --git a/lib/libc_old/stdlib/atoi.c b/lib/libc_old/stdlib/atoi.c
deleted file mode 100644
index 6f0327b..0000000
--- a/lib/libc_old/stdlib/atoi.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdlib.h>
-
-int atoi(const char *str) {
-  return (int)strtol(str, (char **)NULL, 10);
-  }
diff --git a/lib/libc_old/stdlib/exit.c b/lib/libc_old/stdlib/exit.c
deleted file mode 100644
index c79b14e..0000000
--- a/lib/libc_old/stdlib/exit.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: exit.c 89 2016-01-12 00:20:40Z reddawg $
-
-**************************************************************************************/
-
-#include <stdlib.h>
-
-void exit(int status) {
-  asm(
-    "int %0\n"
-    : : "i" (0x80),"a" (1),"b" (status)
-    );
-  }
diff --git a/lib/libc_old/stdlib/getopt.c b/lib/libc_old/stdlib/getopt.c
deleted file mode 100644
index 3f98da5..0000000
--- a/lib/libc_old/stdlib/getopt.c
+++ /dev/null
@@ -1,102 +0,0 @@
-#include <sys/cdefs.h>
-#include "../include/namespace.h"
-#include <err.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "../include/un-namespace.h"
-
-#include "../include/libc_private.h"
-
-int     opterr = 1,             /* if error message should be printed */
-        optind = 1,             /* index into parent argv vector */
-        optopt,                 /* character checked for validity */
-        optreset;               /* reset getopt */
-char    *optarg;                /* argument associated with option */
-
-#define BADCH   (int)'?'
-#define BADARG  (int)':'
-#define EMSG    ""
-
-int getopt(int nargc,char * const nargv[],const char *ostr) {
-  static char *place = EMSG;              /* option letter processing */
-  char *oli;                              /* option letter list index */
-
-        if (optreset || *place == 0) {          /* update scanning pointer */
-                optreset = 0;
-                place = nargv[optind];
-                if (optind >= nargc || *place++ != '-') {
-                        /* Argument is absent or is not an option */
-                        place = EMSG;
-                        return (-1);
-                }
-                optopt = *place++;
-                if (optopt == '-' && *place == 0) {
-                        /* "--" => end of options */
-                        ++optind;
-                        place = EMSG;
-                        return (-1);
-                }
-                if (optopt == 0) {
-                        /* Solitary '-', treat as a '-' option
-                           if the program (eg su) is looking for it. */
-                        place = EMSG;
-                        if (strchr(ostr, '-') == NULL)
-                                return (-1);
-                        optopt = '-';
-                }
-        } else
-                optopt = *place++;
-
-          /* See if option letter is one the caller wanted... */
-        if (optopt == ':' || (oli = strchr(ostr, optopt)) == NULL) {
-                if (*place == 0)
-                        ++optind;
-                if (opterr && *ostr != ':') {
-                     printf("%s: illegal option -- %c\n","BUG",optopt);
-                    /*
-                        (void)fprintf(stderr,
-                            "%s: illegal option -- %c\n", _getprogname(),
-                            optopt);
-                    */
-                  }
-                return (BADCH);
-        }
-
-    
-       /* Does this option need an argument? */
-        if (oli[1] != ':') {
-                /* don't need argument */
-                optarg = NULL;
-                if (*place == 0)
-                        ++optind;
-        } else {
-                /* Option-argument is either the rest of this argument or the
-                   entire next argument. */
-                if (*place)
-                        optarg = place;
-                else if (nargc > ++optind)
-                        optarg = nargv[optind];
-                else {
-                        /* option-argument absent */
-                        place = EMSG;
-                        if (*ostr == ':')
-                                return (BADARG);
-                        if (opterr)
-             printf("%s: option requires an arguement -- %c\n","BUG",optopt);
-                                /*
-                                (void)fprintf(stderr,
-                                    "%s: option requires an argument -- %c\n",
-                                    _getprogname(), optopt);
-                                */
-                        return (BADCH);
-                }
-                place = EMSG;
-                ++optind;
-        }
-        return (optopt);                        /* return option letter */
-
-
-  }
diff --git a/lib/libc_old/stdlib/malloc.c b/lib/libc_old/stdlib/malloc.c
deleted file mode 100644
index 5627b90..0000000
--- a/lib/libc_old/stdlib/malloc.c
+++ /dev/null
@@ -1,333 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: malloc.c 122 2016-01-14 03:45:52Z reddawg $
-
- *****************************************************************************************/
-
-#include <sys/types.h>
-#include <sys/sys.h>
-#include <stdio.h>
-
-struct memDescriptor {
-    struct memDescriptor *prev;        //4
-    struct memDescriptor *next;        //4
-    void *baseAddr;    //4
-    uInt32 limit;        //4
-};
-
-#define MALLOC_ALIGN_SIZE  32
-#define MALLOC_ALIGN(size) (size + ((((size) % MALLOC_ALIGN_SIZE) == 0)? 0 : (MALLOC_ALIGN_SIZE - ((size) % MALLOC_ALIGN_SIZE))))
-
-static int insertFreeDesc( struct memDescriptor *freeDesc );
-
-static struct memDescriptor *usedKernDesc = 0x0;
-static struct memDescriptor *freeKernDesc = 0x0;
-static struct memDescriptor *emptyKernDesc = 0x0;
-
-static void *getEmptyDesc() {
-  int i = 0x0;
-  struct memDescriptor *tmpDesc = 0x0;
-
-  tmpDesc = emptyKernDesc;
-
-  if ( tmpDesc != 0x0 ) {
-    emptyKernDesc = tmpDesc->next;
-    if ( emptyKernDesc != 0x0 )
-      emptyKernDesc->prev = 0x0;
-
-    tmpDesc->next = 0x0;
-    tmpDesc->prev = 0x0;
-    return ( tmpDesc );
-  }
-
-  if ( ( emptyKernDesc = (struct memDescriptor *) getPage( 0x4 ) ) == 0x0 )
-    return ( 0x0 );
-
-  /* zero out the memory so we know there is no garbage */
-  memset( emptyKernDesc, 0x0, 0x4000 );
-
-  emptyKernDesc[0].next = &emptyKernDesc[1];
-
-  for ( i = 0x1; i < ( ( 0x4000 / sizeof(struct memDescriptor) ) ) ; i++ ) {
-    emptyKernDesc[i].next = &emptyKernDesc[i + 1];
-    emptyKernDesc[i].prev = &emptyKernDesc[i - 1];
-  }
-
-  tmpDesc = emptyKernDesc;
-
-  emptyKernDesc = tmpDesc->next;
-  emptyKernDesc->prev = 0x0;
-  tmpDesc->next = 0x0;
-  tmpDesc->prev = 0x0;
-  return ( tmpDesc );
-}
-
-/************************************************************************
-
- Function: void *kmalloc(uInt32 len)
- Description: Allocate Kernel Memory
-
- Notes:
-
- 02/17/03 - Do I Still Need To Pass In The Pid?
-
- ************************************************************************/
-void *malloc( uInt32 len ) {
-  struct memDescriptor *tmpDesc1 = 0x0;
-  struct memDescriptor *tmpDesc2 = 0x0;
-  char *buf = 0x0;
-  int i = 0x0;
-
-  len = MALLOC_ALIGN( len );
-
-  if ( len == 0x0 ) {
-    return ( 0x0 );
-  }
-  for ( tmpDesc1 = freeKernDesc; tmpDesc1 != 0x0 ; tmpDesc1 = tmpDesc1->next ) {
-    if ( tmpDesc1->limit >= len ) {
-      if ( tmpDesc1->prev != 0x0 )
-        tmpDesc1->prev->next = tmpDesc1->next;
-      if ( tmpDesc1->next != 0x0 )
-        tmpDesc1->next->prev = tmpDesc1->prev;
-
-      if ( tmpDesc1 == freeKernDesc )
-        freeKernDesc = tmpDesc1->next;
-      tmpDesc1->prev = 0x0;
-      tmpDesc1->next = usedKernDesc;
-      if ( usedKernDesc != 0x0 )
-        usedKernDesc->prev = tmpDesc1;
-      usedKernDesc = tmpDesc1;
-      if ( tmpDesc1->limit > ( len + 32 ) ) {
-        tmpDesc2 = getEmptyDesc();
-        tmpDesc2->limit = tmpDesc1->limit - len;
-        tmpDesc1->limit = len;
-        tmpDesc2->baseAddr = tmpDesc1->baseAddr + len;
-        tmpDesc2->next = 0x0;
-        tmpDesc2->prev = 0x0;
-        if ( tmpDesc2->limit <= 0x0 )
-          insertFreeDesc( tmpDesc2 );
-      }
-      buf = (char *) tmpDesc1->baseAddr;
-      for ( i = 0; i < tmpDesc1->limit ; i++ ) {
-        buf[i] = (char) 0x0;
-      }
-      return ( tmpDesc1->baseAddr );
-    }
-  }
-  tmpDesc1 = getEmptyDesc();
-  if ( tmpDesc1 != 0x0 ) {
-    tmpDesc1->baseAddr = (struct memDescriptor *) getPage( ( len + 4095 ) / 4096 );
-    tmpDesc1->limit = len;
-    tmpDesc1->next = usedKernDesc;
-    tmpDesc1->prev = 0x0;
-    if ( usedKernDesc != 0x0 )
-      usedKernDesc->prev = tmpDesc1;
-    usedKernDesc = tmpDesc1;
-
-    if ( ( len % 0x1000 ) > 0 ) {
-      tmpDesc2 = getEmptyDesc();
-      tmpDesc2->baseAddr = tmpDesc1->baseAddr + tmpDesc1->limit;
-      tmpDesc2->limit = ( ( ( len + 4095 ) / 4096 ) * 4096 ) - tmpDesc1->limit;
-      tmpDesc2->prev = 0x0;
-      tmpDesc2->next = 0x0;
-      if ( tmpDesc2->limit <= 0x0 )
-        insertFreeDesc( tmpDesc2 );
-    }
-    buf = (char *) tmpDesc1->baseAddr;
-    for ( i = 0; i < tmpDesc1->limit ; i++ ) {
-      buf[i] = (char) 0x0;
-    }
-
-    return ( tmpDesc1->baseAddr );
-  }
-  //Return Null If Unable To Malloc
-
-  return ( 0x0 );
-}
-
-/************************************************************************
-
- Function: void kfree(void *baseAddr)
- Description: This Will Find The Descriptor And Free It
-
- Notes:
-
- 02/17/03 - I need To Make It Join Descriptors
-
- ************************************************************************/
-void free( void *baseAddr ) {
-  struct memDescriptor *tmpDesc1 = 0x0;
-
-  for ( tmpDesc1 = usedKernDesc; tmpDesc1 != 0x0 ; tmpDesc1 = tmpDesc1->next ) {
-    if ( tmpDesc1->baseAddr == baseAddr ) {
-
-      if ( usedKernDesc == tmpDesc1 )
-        usedKernDesc = tmpDesc1->next;
-
-      if ( tmpDesc1->prev != 0x0 )
-        tmpDesc1->prev->next = tmpDesc1->next;
-
-      if ( tmpDesc1->next != 0x0 )
-        tmpDesc1->next->prev = tmpDesc1->prev;
-
-      tmpDesc1->next = 0x0;
-      tmpDesc1->prev = 0x0;
-
-      insertFreeDesc( tmpDesc1 );
-
-      //mergeMemBlocks();
-
-      return;
-    }
-  }
-  printf( "Kernel: Error Freeing Descriptor! [0x%X]\n", (uInt32) baseAddr );
-
-  return;
-}
-
-/************************************************************************
-
- Function: void insertFreeDesc(struct memDescriptor *freeDesc)
- Description: This Function Inserts A Free Descriptor On The List Which Is
- Kept In Size Order
-
- Notes:
-
- 02/17/03 - This Was Inspired By TCA's Great Wisdom -
- "[20:20:59] <TCA> You should just insert it in order"
-
- ************************************************************************/
-static int insertFreeDesc( struct memDescriptor *freeDesc ) {
-  struct memDescriptor *tmpDesc = 0x0;
-
-  if ( freeDesc->limit <= 0x0 ) {
-    printf( "Inserting Descriptor with no limit\n" );
-    while ( 1 )
-      ;
-  }
-
-  if ( freeKernDesc != 0x0 ) {
-    /*
-     */
-    freeDesc->next = freeKernDesc;
-    freeDesc->prev = 0x0;
-    freeKernDesc->prev = freeDesc;
-    freeKernDesc = freeDesc;
-    /*
-     */
-    /*
-     for (tmpDesc = freeKernDesc;tmpDesc != 0x0;tmpDesc = tmpDesc->next) {
-     if (freeDesc->limit <= tmpDesc->limit) {
-     freeDesc->prev = tmpDesc->prev;
-     tmpDesc->prev  = freeDesc;
-     freeDesc->next = tmpDesc;
-
-     if (tmpDesc == freeKernDesc)
-     freeKernDesc = freeDesc;
-     return(0x0);
-     }
-     if (tmpDesc->next == 0x0) {
-     tmpDesc->next = freeDesc;
-     freeDesc->prev = tmpDesc;
-     freeDesc->next = 0x0;
-     return(0x0);
-     }
-     }
-     kpanic("didnt Insert\n");
-     */
-    return ( 0x0 );
-  }
-  else {
-    freeDesc->prev = 0x0;
-    freeDesc->next = 0x0;
-    freeKernDesc = freeDesc;
-    return ( 0x0 );
-  }
-
-  return ( 0x1 );
-}
-
-/***
- $Log: malloc.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.5  2006/06/01 03:58:33  reddawg
- wondering about this stuff here
-
- Revision 1.4  2005/10/21 20:57:35  reddawg
- Ubix Is Back In A Working Condition
-
- Revision 1.3  2005/10/21 20:07:07  reddawg
- Work has resumed
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:22:57  reddawg
- no message
-
- Revision 1.7  2004/10/02 12:58:38  reddawg
- weird...
-
- Revision 1.6  2004/09/29 22:30:52  reddawg
- hmm permission error
-
- Revision 1.5  2004/07/28 00:17:05  reddawg
- Major:
- Disconnected page 0x0 from the system... Unfortunately this broke many things
- all of which have been fixed. This was good because nothing deferences NULL
- any more.
-
- Things affected:
- malloc,kmalloc,getfreepage,getfreevirtualpage,pagefault,fork,exec,ld,ld.so,exec,file
-
- Revision 1.4  2004/06/17 14:18:41  reddawg
- Fixed some potential problems
-
- Revision 1.3  2004/05/22 02:32:41  reddawg
- Fixed a typo
-
- Revision 1.2  2004/05/20 23:10:46  reddawg
- New Userland Malloc
-
- Revision 1.4  2004/05/20 22:54:02  reddawg
- Cleaned Up Warrnings
-
- Revision 1.3  2004/05/19 04:07:43  reddawg
- kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
-
- Revision 1.2  2004/04/20 00:53:16  reddawg
- Works
-
- Revision 1.1.1.1  2004/04/15 12:07:10  reddawg
- UbixOS v1.0
-
- Revision 1.21  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
diff --git a/lib/libc_old/stdlib/rand.c b/lib/libc_old/stdlib/rand.c
deleted file mode 100644
index f31c3d2..0000000
--- a/lib/libc_old/stdlib/rand.c
+++ /dev/null
@@ -1,66 +0,0 @@
-                         /**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id:
-
-**************************************************************************************/
-
-static long holdrand = 1L;
-
-/***
-*void srand(seed) - seed the random number generator
-*
-*Purpose:
-*       Seeds the random number generator with the int given.  Adapted from the
-*       BASIC random number generator.
-*
-*Entry:
-*       unsigned seed - seed to seed rand # generator with
-*
-*Exit:
-*       None.
-*
-*Exceptions:
-*
-**************************************************************************/
-
-void srand(unsigned int seed) {
-        holdrand = (long)seed;
-}
-
-/***
-*int rand() - returns a random number
-*
-*Purpose:
-*       returns a pseudo-random number 0 through 32767.
-*
-*Entry:
-*       None.
-*
-*Exit:
-*       Returns a pseudo-random number 0 through 32767.
-*
-*Exceptions:
-*
-*******************************************************************************/
-
-int rand(void) {
-        return(((holdrand = holdrand * 214013L + 2531011L) >> 16) & 0x7fff);
-}
-
diff --git a/lib/libc_old/stdlib/strtol.c b/lib/libc_old/stdlib/strtol.c
deleted file mode 100644
index df3139a..0000000
--- a/lib/libc_old/stdlib/strtol.c
+++ /dev/null
@@ -1,99 +0,0 @@
-#include <sys/cdefs.h>
-#include <limits.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-static int errno;
-
-
-long
-strtol(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	const char *s;
-	unsigned long acc;
-	char c;
-	unsigned long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-	do {
-		c = *s++;
-	} while (isspace((unsigned char)c));
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	/*
-	 * Compute the cutoff value between legal numbers and illegal
-	 * numbers.  That is the largest legal value, divided by the
-	 * base.  An input number that is greater than this value, if
-	 * followed by a legal input character, is too big.  One that
-	 * is equal to this value may be valid or not; the limit
-	 * between valid and invalid numbers is then based on the last
-	 * digit.  For instance, if the range for longs is
-	 * [-2147483648..2147483647] and the input base is 10,
-	 * cutoff will be set to 214748364 and cutlim to either
-	 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
-	 * a value > 214748364, or equal but the next digit is > 7 (or 8),
-	 * the number is too big, and we will return a range error.
-	 *
-	 * Set 'any' if any `digits' consumed; make it negative to indicate
-	 * overflow.
-	 */
-	cutoff = neg ? (unsigned long)-(LONG_MIN + LONG_MAX) + LONG_MAX
-	    : LONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LONG_MIN : LONG_MAX;
-		//errno = ERANGE;
-	} else if (!any) {
-noconv:
-    errno = 2;
-		//errno = EINVAL;
-	} else if (neg)
-		acc = -acc;
-	if (endptr != NULL)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/lib/libc_old/string/Makefile b/lib/libc_old/string/Makefile
deleted file mode 100644
index 4b46d8e..0000000
--- a/lib/libc_old/string/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-#Objects
-OBJS = swab.o strstr.o strspn.o strsep.o strpbrk.o strnstr.o strncpy.o strncmp.o strncat.o strmode.o strdup.o strcspn.o strcat.o strchr.o stpcpy.o memchr.o memccpy.o strcasecmp.o rindex.o index.o ffs.o bzero.o bcopy.o bcmp.o memmove.o strrchr.o strlcat.o strlcpy.o strerror.o strtok.o memcpy.o memset.o memcmp.o strlen.o strcmp.o strcasestr.o
-
-#Output
-OUTPUT = libc.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdinc -O -I../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdinc -O -I../include -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdinc -O -I./include -I../../../include -I../locale -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdinc -O -I../include -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdinc -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libc_old/string/bcmp.c b/lib/libc_old/string/bcmp.c
deleted file mode 100644
index f5227df..0000000
--- a/lib/libc_old/string/bcmp.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)bcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/bcmp.c,v 1.5 2002/08/30 21:07:40 robert Exp $");
-
-#include <strings.h>
-
-/*
- * bcmp -- vax cmpc3 instruction
- */
-int
-bcmp(const void *b1, const void *b2, size_t length)
-{
-	char *p1, *p2;
-
-	if (length == 0)
-		return (0);
-	p1 = (char *)b1;
-	p2 = (char *)b2;
-	do
-		if (*p1++ != *p2++)
-			break;
-	while (--length);
-	return (length);
-}
diff --git a/lib/libc_old/string/bcopy.c b/lib/libc_old/string/bcopy.c
deleted file mode 100644
index bffedaa..0000000
--- a/lib/libc_old/string/bcopy.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- *
- * $ID: $
- */
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/*
- * sizeof(word) MUST BE A POWER OF TWO
- * SO THAT wmask BELOW IS ALL ONES
- */
-typedef	int word;		/* "word" used for optimal copy speed */
-
-#define	wsize	sizeof(word)
-#define	wmask	(wsize - 1)
-
-/*
- * Copy a block of memory, handling overlap.
- * This is the routine that actually implements
- * (the portable versions of) bcopy, memcpy, and memmove.
- */
-#if defined(MEMCOPY) || defined(MEMMOVE)
-#include <string.h>
-
-void *
-#ifdef MEMCOPY
-memcpy
-#else
-memmove
-#endif
-(void *dst0, const void *src0, size_t length)
-#else
-#include <strings.h>
-
-void
-bcopy(const void *src0, void *dst0, size_t length)
-#endif
-{
-	char *dst = dst0;
-	const char *src = src0;
-	size_t t;
-
-	if (length == 0 || dst == src)		/* nothing to do */
-		goto done;
-
-	/*
-	 * Macros: loop-t-times; and loop-t-times, t>0
-	 */
-#define	TLOOP(s) if (t) TLOOP1(s)
-#define	TLOOP1(s) do { s; } while (--t)
-
-	if ((unsigned long)dst < (unsigned long)src) {
-		/*
-		 * Copy forward.
-		 */
-		t = (uintptr_t)src;	/* only need low bits */
-		if ((t | (uintptr_t)dst) & wmask) {
-			/*
-			 * Try to align operands.  This cannot be done
-			 * unless the low bits match.
-			 */
-			if ((t ^ (uintptr_t)dst) & wmask || length < wsize)
-				t = length;
-			else
-				t = wsize - (t & wmask);
-			length -= t;
-			TLOOP1(*dst++ = *src++);
-		}
-		/*
-		 * Copy whole words, then mop up any trailing bytes.
-		 */
-		t = length / wsize;
-		TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
-		t = length & wmask;
-		TLOOP(*dst++ = *src++);
-	} else {
-		/*
-		 * Copy backwards.  Otherwise essentially the same.
-		 * Alignment works as before, except that it takes
-		 * (t&wmask) bytes to align, not wsize-(t&wmask).
-		 */
-		src += length;
-		dst += length;
-		t = (uintptr_t)src;
-		if ((t | (uintptr_t)dst) & wmask) {
-			if ((t ^ (uintptr_t)dst) & wmask || length <= wsize)
-				t = length;
-			else
-				t &= wmask;
-			length -= t;
-			TLOOP1(*--dst = *--src);
-		}
-		t = length / wsize;
-		TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
-		t = length & wmask;
-		TLOOP(*--dst = *--src);
-	}
-done:
-#if defined(MEMCOPY) || defined(MEMMOVE)
-	return (dst0);
-#else
-	return;
-#endif
-}
diff --git a/lib/libc_old/string/bzero.c b/lib/libc_old/string/bzero.c
deleted file mode 100644
index 85bc5e8..0000000
--- a/lib/libc_old/string/bzero.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/bzero.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	BZERO
-#include "memset.c"
diff --git a/lib/libc_old/string/ffs.c b/lib/libc_old/string/ffs.c
deleted file mode 100644
index ef4d0f0..0000000
--- a/lib/libc_old/string/ffs.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)ffs.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/ffs.c,v 1.7 2004/01/14 07:46:36 des Exp $");
-
-#include <strings.h>
-
-/*
- * Find First Set bit
- */
-int
-ffs(int mask)
-{
-	int bit;
-
-	if (mask == 0)
-		return(0);
-	for (bit = 1; !(mask & 1); bit++)
-		mask = (unsigned int)mask >> 1;
-	return (bit);
-}
diff --git a/lib/libc_old/string/index.c b/lib/libc_old/string/index.c
deleted file mode 100644
index be2c052..0000000
--- a/lib/libc_old/string/index.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)index.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/index.c,v 1.7 2003/12/18 07:44:53 jkh Exp $");
-
-#include <stddef.h>
-
-#ifdef STRCHR
-#include <string.h>
-
-char *
-strchr
-#else
-#include <strings.h>
-
-char *
-index
-#endif
-(const char *p, int ch)
-{
-	char c;
-
-	c = ch;
-	for (;; ++p) {
-		if (*p == c)
-			return ((char *)p);
-		if (*p == '\0')
-			return (NULL);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_old/string/memccpy.c b/lib/libc_old/string/memccpy.c
deleted file mode 100644
index 0bc6a11..0000000
--- a/lib/libc_old/string/memccpy.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memccpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memccpy.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-void *
-memccpy(t, f, c, n)
-	void *t;
-	const void *f;
-	int c;
-	size_t n;
-{
-
-	if (n) {
-		unsigned char *tp = t;
-		const unsigned char *fp = f;
-		unsigned char uc = c;
-		do {
-			if ((*tp++ = *fp++) == uc)
-				return (tp);
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/lib/libc_old/string/memchr.c b/lib/libc_old/string/memchr.c
deleted file mode 100644
index e3c6679..0000000
--- a/lib/libc_old/string/memchr.c
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memchr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memchr.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-void *
-memchr(s, c, n)
-	const void *s;
-	unsigned char c;
-	size_t n;
-{
-	if (n != 0) {
-		const unsigned char *p = s;
-
-		do {
-			if (*p++ == c)
-				return ((void *)(p - 1));
-		} while (--n != 0);
-	}
-	return (NULL);
-}
diff --git a/lib/libc_old/string/memcmp.c b/lib/libc_old/string/memcmp.c
deleted file mode 100644
index 045e4d9..0000000
--- a/lib/libc_old/string/memcmp.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memcmp.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Compare memory regions.
- */
-int
-memcmp(s1, s2, n)
-	const void *s1, *s2;
-	size_t n;
-{
-	if (n != 0) {
-		const unsigned char *p1 = s1, *p2 = s2;
-
-		do {
-			if (*p1++ != *p2++)
-				return (*--p1 - *--p2);
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/lib/libc_old/string/memcpy.c b/lib/libc_old/string/memcpy.c
deleted file mode 100644
index dfc03ae..0000000
--- a/lib/libc_old/string/memcpy.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memcpy.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	MEMCOPY
-#include "bcopy.c"
diff --git a/lib/libc_old/string/memmove.c b/lib/libc_old/string/memmove.c
deleted file mode 100644
index 8f44e82..0000000
--- a/lib/libc_old/string/memmove.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memmove.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	MEMMOVE
-#include "bcopy.c"
diff --git a/lib/libc_old/string/memset.c b/lib/libc_old/string/memset.c
deleted file mode 100644
index 1cb8644..0000000
--- a/lib/libc_old/string/memset.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Mike Hibler and Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)memset.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/memset.c,v 1.8 2002/09/01 21:53:46 robert Exp $");
-
-#include <sys/types.h>
-
-#include <limits.h>
-
-#define	wsize	sizeof(u_int)
-#define	wmask	(wsize - 1)
-
-#ifdef BZERO
-#include <strings.h>
-
-#define	RETURN	return
-#define	VAL	0
-#define	WIDEVAL	0
-
-void
-bzero(void *dst0, size_t length)
-#else
-#include <string.h>
-
-#define	RETURN	return (dst0)
-#define	VAL	c0
-#define	WIDEVAL	c
-
-void *
-memset(void *dst0, int c0, size_t length)
-#endif
-{
-	size_t t;
-#ifndef BZERO
-	u_int c;
-#endif
-	u_char *dst;
-
-	dst = dst0;
-	/*
-	 * If not enough words, just fill bytes.  A length >= 2 words
-	 * guarantees that at least one of them is `complete' after
-	 * any necessary alignment.  For instance:
-	 *
-	 *	|-----------|-----------|-----------|
-	 *	|00|01|02|03|04|05|06|07|08|09|0A|00|
-	 *	          ^---------------------^
-	 *		 dst		 dst+length-1
-	 *
-	 * but we use a minimum of 3 here since the overhead of the code
-	 * to do word writes is substantial.
-	 */
-	if (length < 3 * wsize) {
-		while (length != 0) {
-			*dst++ = VAL;
-			--length;
-		}
-		RETURN;
-	}
-
-#ifndef BZERO
-	if ((c = (u_char)c0) != 0) {	/* Fill the word. */
-		c = (c << 8) | c;	/* u_int is 16 bits. */
-#if UINT_MAX > 0xffff
-		c = (c << 16) | c;	/* u_int is 32 bits. */
-#endif
-#if UINT_MAX > 0xffffffff
-		c = (c << 32) | c;	/* u_int is 64 bits. */
-#endif
-	}
-#endif
-	/* Align destination by filling in bytes. */
-	if ((t = (long)dst & wmask) != 0) {
-		t = wsize - t;
-		length -= t;
-		do {
-			*dst++ = VAL;
-		} while (--t != 0);
-	}
-
-	/* Fill words.  Length was >= 2*words so we know t >= 1 here. */
-	t = length / wsize;
-	do {
-		*(u_int *)dst = WIDEVAL;
-		dst += wsize;
-	} while (--t != 0);
-
-	/* Mop up trailing bytes, if any. */
-	t = length & wmask;
-	if (t != 0)
-		do {
-			*dst++ = VAL;
-		} while (--t != 0);
-	RETURN;
-}
diff --git a/lib/libc_old/string/rindex.c b/lib/libc_old/string/rindex.c
deleted file mode 100644
index 697b69a..0000000
--- a/lib/libc_old/string/rindex.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)rindex.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/rindex.c,v 1.7 2003/12/18 07:44:53 jkh Exp $");
-
-#include <stddef.h>
-
-#ifdef STRRCHR
-#include <string.h>
-
-char *
-strrchr
-#else
-#include <strings.h>
-
-char *
-rindex
-#endif
-(const char *p, int ch)
-{
-	char *save;
-	char c;
-
-	c = ch;
-	for (save = NULL;; ++p) {
-		if (*p == c)
-			save = (char *)p;
-		if (*p == '\0')
-			return (save);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_old/string/stpcpy.c b/lib/libc_old/string/stpcpy.c
deleted file mode 100644
index 2742bf7..0000000
--- a/lib/libc_old/string/stpcpy.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 1999
- *	David E. O'Brien
- * Copyright (c) 1988, 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. 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/stpcpy.c,v 1.1 2002/10/03 19:39:20 obrien Exp $");
-
-#include <string.h>
-
-char *
-stpcpy(char * to, const char * from)
-{
-
-	for (; (*to = *from); ++from, ++to);
-	return(to);
-}
diff --git a/lib/libc_old/string/strcasecmp.c b/lib/libc_old/string/strcasecmp.c
deleted file mode 100644
index 6f400d7..0000000
--- a/lib/libc_old/string/strcasecmp.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1987, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcasecmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcasecmp.c,v 1.6 2002/08/30 15:40:01 robert Exp $");
-
-#include <strings.h>
-#include <ctype.h>
-
-typedef unsigned char u_char;
-
-int
-strcasecmp(s1, s2)
-	const char *s1, *s2;
-{
-	const u_char
-			*us1 = (const u_char *)s1,
-			*us2 = (const u_char *)s2;
-
-	while (tolower(*us1) == tolower(*us2++))
-		if (*us1++ == '\0')
-			return (0);
-	return (tolower(*us1) - tolower(*--us2));
-}
-
-int
-strncasecmp(s1, s2, n)
-	const char *s1, *s2;
-	size_t n;
-{
-	if (n != 0) {
-		const u_char
-				*us1 = (const u_char *)s1,
-				*us2 = (const u_char *)s2;
-
-		do {
-			if (tolower(*us1) != tolower(*us2++))
-				return (tolower(*us1) - tolower(*--us2));
-			if (*us1++ == '\0')
-				break;
-		} while (--n != 0);
-	}
-	return (0);
-}
diff --git a/lib/libc_old/string/strcasestr.c b/lib/libc_old/string/strcasestr.c
deleted file mode 100644
index dafcb79..0000000
--- a/lib/libc_old/string/strcasestr.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcasestr.c,v 1.3 2002/03/21 18:44:54 obrien Exp $");
-
-#include <ctype.h>
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s, ignore case.
- */
-char *
-strcasestr(s, find)
-	const char *s, *find;
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != 0) {
-		c = tolower((unsigned char)c);
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == 0)
-					return (NULL);
-			} while ((char)tolower((unsigned char)sc) != c);
-		} while (strncasecmp(s, find, len) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
diff --git a/lib/libc_old/string/strcat.c b/lib/libc_old/string/strcat.c
deleted file mode 100644
index 5d28c86..0000000
--- a/lib/libc_old/string/strcat.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcat.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcat.c,v 1.7 2002/09/06 11:24:06 tjr Exp $");
-
-#include <string.h>
-
-char *
-strcat(char * __restrict s, const char * __restrict append)
-{
-	char *save = s;
-
-	for (; *s; ++s);
-	while ((*s++ = *append++));
-	return(save);
-}
diff --git a/lib/libc_old/string/strchr.c b/lib/libc_old/string/strchr.c
deleted file mode 100644
index 2fb9114..0000000
--- a/lib/libc_old/string/strchr.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strchr.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	STRCHR
-#include "index.c"
diff --git a/lib/libc_old/string/strcmp.c b/lib/libc_old/string/strcmp.c
deleted file mode 100644
index 1befcbc..0000000
--- a/lib/libc_old/string/strcmp.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcmp.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Compare strings.
- */
-int
-strcmp(s1, s2)
-	const char *s1, *s2;
-{
-	while (*s1 == *s2++)
-		if (*s1++ == 0)
-			return (0);
-	return (*(const unsigned char *)s1 - *(const unsigned char *)(s2 - 1));
-}
diff --git a/lib/libc_old/string/strcpy.c b/lib/libc_old/string/strcpy.c
deleted file mode 100644
index 5cd2f45..0000000
--- a/lib/libc_old/string/strcpy.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcpy.c,v 1.7 2002/09/06 11:24:06 tjr Exp $");
-
-#include <string.h>
-
-char *
-strcpy(char * __restrict to, const char * __restrict from)
-{
-	char *save = to;
-
-	for (; (*to = *from); ++from, ++to);
-	return(save);
-}
diff --git a/lib/libc_old/string/strcspn.c b/lib/libc_old/string/strcspn.c
deleted file mode 100644
index 48354a6..0000000
--- a/lib/libc_old/string/strcspn.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strcspn.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strcspn.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Span the complement of string s2.
- */
-size_t
-strcspn(s1, s2)
-	const char *s1;
-	const char *s2;
-{
-	const char *p, *spanp;
-	char c, sc;
-
-	/*
-	 * Stop as soon as we find any character from s2.  Note that there
-	 * must be a NUL in s2; it suffices to stop when we find that, too.
-	 */
-	for (p = s1;;) {
-		c = *p++;
-		spanp = s2;
-		do {
-			if ((sc = *spanp++) == c)
-				return (p - 1 - s1);
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_old/string/strdup.c b/lib/libc_old/string/strdup.c
deleted file mode 100644
index a9881a1..0000000
--- a/lib/libc_old/string/strdup.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strdup.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strdup.c,v 1.4 2001/11/07 19:55:16 obrien Exp $");
-
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-char *
-strdup(str)
-	const char *str;
-{
-	size_t len;
-	char *copy;
-
-	len = strlen(str) + 1;
-	if ((copy = malloc(len)) == NULL)
-		return (NULL);
-	memcpy(copy, str, len);
-	return (copy);
-}
diff --git a/lib/libc_old/string/strerror.c b/lib/libc_old/string/strerror.c
deleted file mode 100644
index b1c4913..0000000
--- a/lib/libc_old/string/strerror.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*-
- * Copyright (c) 1988, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strerror.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strerror.c,v 1.13 2003/05/01 19:03:14 nectar Exp $");
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#define	UPREFIX		"Unknown error: "
-
-/*
- * Define a buffer size big enough to describe a 64-bit signed integer
- * converted to ASCII decimal (19 bytes), with an optional leading sign
- * (1 byte); finally, we get the prefix and a trailing NUL from UPREFIX.
- */
-#define	EBUFSIZE	(20 + sizeof(UPREFIX))
-
-/*
- * Doing this by hand instead of linking with stdio(3) avoids bloat for
- * statically linked binaries.
- */
-static void
-errstr(int num, char *buf, size_t len)
-{
-	char *t;
-	unsigned int uerr;
-	char tmp[EBUFSIZE];
-
-	t = tmp + sizeof(tmp);
-	*--t = '\0';
-	uerr = (num >= 0) ? num : -num;
-	do {
-		*--t = "0123456789"[uerr % 10];
-	} while (uerr /= 10);
-	if (num < 0)
-		*--t = '-';
-	strlcpy(buf, UPREFIX, len);
-	strlcat(buf, t, len);
-}
-
-int
-strerror_r(int errnum, char *strerrbuf, size_t buflen)
-{
-
-	if (errnum < 1 || errnum >= sys_nerr) {
-		errstr(errnum, strerrbuf, buflen);
-		return (EINVAL);
-	}
-	if (strlcpy(strerrbuf, sys_errlist[errnum], buflen) >= buflen)
-		return (ERANGE);
-	return (0);
-}
-
-char *
-strerror(int num)
-{
-	static char ebuf[EBUFSIZE];
-
-	if (num > 0 && num < sys_nerr)
-		return ((char *)sys_errlist[num]);
-	errno = EINVAL;
-	errstr(num, ebuf, sizeof(ebuf));
-	return (ebuf);
-}
diff --git a/lib/libc_old/string/strlcat.c b/lib/libc_old/string/strlcat.c
deleted file mode 100644
index 19924e5..0000000
--- a/lib/libc_old/string/strlcat.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*	$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $");
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strlcat.c,v 1.9 2003/05/01 19:03:14 nectar Exp $");
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-strlcat(dst, src, siz)
-	char *dst;
-	const char *src;
-	size_t siz;
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-	size_t dlen;
-
-	/* Find the end of dst and adjust bytes left but don't go past end */
-	while (n-- != 0 && *d != '\0')
-		d++;
-	dlen = d - dst;
-	n = siz - dlen;
-
-	if (n == 0)
-		return(dlen + strlen(s));
-	while (*s != '\0') {
-		if (n != 1) {
-			*d++ = *s;
-			n--;
-		}
-		s++;
-	}
-	*d = '\0';
-
-	return(dlen + (s - src));	/* count does not include NUL */
-}
diff --git a/lib/libc_old/string/strlcpy.c b/lib/libc_old/string/strlcpy.c
deleted file mode 100644
index eedb6a9..0000000
--- a/lib/libc_old/string/strlcpy.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*	$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * 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 ``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 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp $");
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strlcpy.c,v 1.7 2003/05/01 19:03:14 nectar Exp $");
-
-#include <sys/types.h>
-#include <string.h>
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t strlcpy(dst, src, siz)
-	char *dst;
-	const char *src;
-	size_t siz;
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0 && --n != 0) {
-		do {
-			if ((*d++ = *s++) == 0)
-				break;
-		} while (--n != 0);
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
diff --git a/lib/libc_old/string/strlen.c b/lib/libc_old/string/strlen.c
deleted file mode 100644
index c67667d..0000000
--- a/lib/libc_old/string/strlen.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strlen.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strlen.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-size_t
-strlen(str)
-	const char *str;
-{
-	const char *s;
-
-	for (s = str; *s; ++s);
-	return(s - str);
-}
-
diff --git a/lib/libc_old/string/strmode.c b/lib/libc_old/string/strmode.c
deleted file mode 100644
index 2409b4e..0000000
--- a/lib/libc_old/string/strmode.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strmode.c	8.3 (Berkeley) 8/15/94";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strmode.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-
-void
-strmode(mode, p)
-	mode_t mode;
-	char *p;
-{
-	 /* print type */
-	switch (mode & S_IFMT) {
-	case S_IFDIR:			/* directory */
-		*p++ = 'd';
-		break;
-	case S_IFCHR:			/* character special */
-		*p++ = 'c';
-		break;
-	case S_IFBLK:			/* block special */
-		*p++ = 'b';
-		break;
-	case S_IFREG:			/* regular */
-		*p++ = '-';
-		break;
-	case S_IFLNK:			/* symbolic link */
-		*p++ = 'l';
-		break;
-	case S_IFSOCK:			/* socket */
-		*p++ = 's';
-		break;
-#ifdef S_IFIFO
-	case S_IFIFO:			/* fifo */
-		*p++ = 'p';
-		break;
-#endif
-#ifdef S_IFWHT
-	case S_IFWHT:			/* whiteout */
-		*p++ = 'w';
-		break;
-#endif
-	default:			/* unknown */
-		*p++ = '?';
-		break;
-	}
-	/* usr */
-	if (mode & S_IRUSR)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWUSR)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXUSR | S_ISUID)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXUSR:
-		*p++ = 'x';
-		break;
-	case S_ISUID:
-		*p++ = 'S';
-		break;
-	case S_IXUSR | S_ISUID:
-		*p++ = 's';
-		break;
-	}
-	/* group */
-	if (mode & S_IRGRP)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWGRP)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXGRP | S_ISGID)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXGRP:
-		*p++ = 'x';
-		break;
-	case S_ISGID:
-		*p++ = 'S';
-		break;
-	case S_IXGRP | S_ISGID:
-		*p++ = 's';
-		break;
-	}
-	/* other */
-	if (mode & S_IROTH)
-		*p++ = 'r';
-	else
-		*p++ = '-';
-	if (mode & S_IWOTH)
-		*p++ = 'w';
-	else
-		*p++ = '-';
-	switch (mode & (S_IXOTH | S_ISVTX)) {
-	case 0:
-		*p++ = '-';
-		break;
-	case S_IXOTH:
-		*p++ = 'x';
-		break;
-	case S_ISVTX:
-		*p++ = 'T';
-		break;
-	case S_IXOTH | S_ISVTX:
-		*p++ = 't';
-		break;
-	}
-	*p++ = ' ';		/* will be a '+' if ACL's implemented */
-	*p = '\0';
-}
diff --git a/lib/libc_old/string/strncat.c b/lib/libc_old/string/strncat.c
deleted file mode 100644
index e05e030..0000000
--- a/lib/libc_old/string/strncat.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncat.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strncat.c,v 1.6 2002/09/06 11:24:06 tjr Exp $");
-
-#include <string.h>
-
-/*
- * Concatenate src on the end of dst.  At most strlen(dst)+n+1 bytes
- * are written at dst (at most n+1 bytes being appended).  Return dst.
- */
-char *
-strncat(char * __restrict dst, const char * __restrict src, size_t n)
-{
-	if (n != 0) {
-		char *d = dst;
-		const char *s = src;
-
-		while (*d != 0)
-			d++;
-		do {
-			if ((*d = *s++) == 0)
-				break;
-			d++;
-		} while (--n != 0);
-		*d = 0;
-	}
-	return (dst);
-}
diff --git a/lib/libc_old/string/strncmp.c b/lib/libc_old/string/strncmp.c
deleted file mode 100644
index 6b0cfc8..0000000
--- a/lib/libc_old/string/strncmp.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncmp.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strncmp.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-int
-strncmp(s1, s2, n)
-	const char *s1, *s2;
-	size_t n;
-{
-
-	if (n == 0)
-		return (0);
-	do {
-		if (*s1 != *s2++)
-			return (*(const unsigned char *)s1 -
-				*(const unsigned char *)(s2 - 1));
-		if (*s1++ == 0)
-			break;
-	} while (--n != 0);
-	return (0);
-}
diff --git a/lib/libc_old/string/strncpy.c b/lib/libc_old/string/strncpy.c
deleted file mode 100644
index 2fcc957..0000000
--- a/lib/libc_old/string/strncpy.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strncpy.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strncpy.c,v 1.6 2002/09/06 11:24:06 tjr Exp $");
-
-#include <string.h>
-
-/*
- * Copy src to dst, truncating or null-padding to always copy n bytes.
- * Return dst.
- */
-char *
-strncpy(char * __restrict dst, const char * __restrict src, size_t n)
-{
-	if (n != 0) {
-		char *d = dst;
-		const char *s = src;
-
-		do {
-			if ((*d++ = *s++) == 0) {
-				/* NUL pad the remaining n-1 bytes */
-				while (--n != 0)
-					*d++ = 0;
-				break;
-			}
-		} while (--n != 0);
-	}
-	return (dst);
-}
diff --git a/lib/libc_old/string/strnstr.c b/lib/libc_old/string/strnstr.c
deleted file mode 100644
index 9f3b038..0000000
--- a/lib/libc_old/string/strnstr.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-
- * Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org>
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strnstr.c,v 1.2 2001/11/07 19:55:16 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s, where the search is limited to the
- * first slen characters of s.
- */
-char *
-strnstr(s, find, slen)
-	const char *s;
-	const char *find;
-	size_t slen;
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != '\0') {
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == '\0' || slen-- < 1)
-					return (NULL);
-			} while (sc != c);
-			if (len > slen)
-				return (NULL);
-		} while (strncmp(s, find, len) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
diff --git a/lib/libc_old/string/strpbrk.c b/lib/libc_old/string/strpbrk.c
deleted file mode 100644
index fb0e1d4..0000000
--- a/lib/libc_old/string/strpbrk.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 1985, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strpbrk.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strpbrk.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence in s1 of a character in s2 (excluding NUL).
- */
-char *
-strpbrk(s1, s2)
-	const char *s1, *s2;
-{
-	const char *scanp;
-	int c, sc;
-
-	while ((c = *s1++) != 0) {
-		for (scanp = s2; (sc = *scanp++) != 0;)
-			if (sc == c)
-				return ((char *)(s1 - 1));
-	}
-	return (NULL);
-}
diff --git a/lib/libc_old/string/strrchr.c b/lib/libc_old/string/strrchr.c
deleted file mode 100644
index b8c0500..0000000
--- a/lib/libc_old/string/strrchr.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strrchr.c,v 1.2 2002/03/22 21:53:19 obrien Exp $");
-
-#define	STRRCHR
-#include "rindex.c"
diff --git a/lib/libc_old/string/strsep.c b/lib/libc_old/string/strsep.c
deleted file mode 100644
index d0bccce..0000000
--- a/lib/libc_old/string/strsep.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 1990, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strsep.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strsep.c,v 1.5 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-#include <stdio.h>
-
-/*
- * Get next token from string *stringp, where tokens are possibly-empty
- * strings separated by characters from delim.
- *
- * Writes NULs into the string at *stringp to end tokens.
- * delim need not remain constant from call to call.
- * On return, *stringp points past the last NUL written (if there might
- * be further tokens), or is NULL (if there are definitely no more tokens).
- *
- * If *stringp is NULL, strsep returns NULL.
- */
-char *
-strsep(stringp, delim)
-	char **stringp;
-	const char *delim;
-{
-	char *s;
-	const char *spanp;
-	int c, sc;
-	char *tok;
-
-	if ((s = *stringp) == NULL)
-		return (NULL);
-	for (tok = s;;) {
-		c = *s++;
-		spanp = delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = 0;
-				*stringp = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
diff --git a/lib/libc_old/string/strspn.c b/lib/libc_old/string/strspn.c
deleted file mode 100644
index ae28642..0000000
--- a/lib/libc_old/string/strspn.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 1989, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strspn.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strspn.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Span the string s2 (skip characters that are in s2).
- */
-size_t
-strspn(s1, s2)
-	const char *s1;
-	const char *s2;
-{
-	const char *p = s1, *spanp;
-	char c, sc;
-
-	/*
-	 * Skip any characters in s2, excluding the terminating \0.
-	 */
-cont:
-	c = *p++;
-	for (spanp = s2; (sc = *spanp++) != 0;)
-		if (sc == c)
-			goto cont;
-	return (p - 1 - s1);
-}
diff --git a/lib/libc_old/string/strstr.c b/lib/libc_old/string/strstr.c
deleted file mode 100644
index f51d170..0000000
--- a/lib/libc_old/string/strstr.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strstr.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strstr.c,v 1.4 2002/03/21 18:44:54 obrien Exp $");
-
-#include <string.h>
-
-/*
- * Find the first occurrence of find in s.
- */
-char *
-strstr(s, find)
-	const char *s, *find;
-{
-	char c, sc;
-	size_t len;
-
-	if ((c = *find++) != 0) {
-		len = strlen(find);
-		do {
-			do {
-				if ((sc = *s++) == 0)
-					return (NULL);
-			} while (sc != c);
-		} while (strncmp(s, find, len) != 0);
-		s--;
-	}
-	return ((char *)s);
-}
diff --git a/lib/libc_old/string/strtok.c b/lib/libc_old/string/strtok.c
deleted file mode 100644
index 6aec194..0000000
--- a/lib/libc_old/string/strtok.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*-
- * Copyright (c) 1998 Softweyr LLC.  All rights reserved.
- *
- * strtok_r, from Berkeley strtok
- * Oct 13, 1998 by Wes Peters <wes@softweyr.com>
- *
- * Copyright (c) 1988, 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
- *    notices, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notices, 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 Softweyr LLC, 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 SOFTWEYR LLC, 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 SOFTWEYR LLC, 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)strtok.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/strtok.c,v 1.9 2002/09/07 02:53:19 tjr Exp $");
-
-#include <stddef.h>
-#ifdef DEBUG_STRTOK
-#include <stdio.h>
-#endif
-#include <string.h>
-
-char	*__strtok_r(char *, const char *, char **);
-
-__weak_reference(__strtok_r, strtok_r);
-
-char *
-__strtok_r(char *s, const char *delim, char **last)
-{
-	char *spanp, *tok;
-	int c, sc;
-
-	if (s == NULL && (s = *last) == NULL)
-		return (NULL);
-
-	/*
-	 * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
-	 */
-cont:
-	c = *s++;
-	for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
-		if (c == sc)
-			goto cont;
-	}
-
-	if (c == 0) {		/* no non-delimiter characters */
-		*last = NULL;
-		return (NULL);
-	}
-	tok = s - 1;
-
-	/*
-	 * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
-	 * Note that delim must have one NUL; we stop if we see that, too.
-	 */
-	for (;;) {
-		c = *s++;
-		spanp = (char *)delim;
-		do {
-			if ((sc = *spanp++) == c) {
-				if (c == 0)
-					s = NULL;
-				else
-					s[-1] = '\0';
-				*last = s;
-				return (tok);
-			}
-		} while (sc != 0);
-	}
-	/* NOTREACHED */
-}
-
-char *
-strtok(char *s, const char *delim)
-{
-	static char *last;
-
-	return (__strtok_r(s, delim, &last));
-}
-
-#ifdef DEBUG_STRTOK
-/*
- * Test the tokenizer.
- */
-int
-main(void)
-{
-	char blah[80], test[80];
-	char *brkb, *brkt, *phrase, *sep, *word;
-
-	sep = "\\/:;=-";
-	phrase = "foo";
-
-	printf("String tokenizer test:\n");
-	strcpy(test, "This;is.a:test:of=the/string\\tokenizer-function.");
-	for (word = strtok(test, sep); word; word = strtok(NULL, sep))
-		printf("Next word is \"%s\".\n", word);
-	strcpy(test, "This;is.a:test:of=the/string\\tokenizer-function.");
-
-	for (word = strtok_r(test, sep, &brkt); word;
-	    word = strtok_r(NULL, sep, &brkt)) {
-		strcpy(blah, "blah:blat:blab:blag");
-
-		for (phrase = strtok_r(blah, sep, &brkb); phrase;
-		    phrase = strtok_r(NULL, sep, &brkb))
-			printf("So far we're at %s:%s\n", word, phrase);
-	}
-
-	return (0);
-}
-
-#endif /* DEBUG_STRTOK */
diff --git a/lib/libc_old/string/swab.c b/lib/libc_old/string/swab.c
deleted file mode 100644
index de57703..0000000
--- a/lib/libc_old/string/swab.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1988, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jeffrey Mogul.
- *
- * 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.
- */
-
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)swab.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/string/swab.c,v 1.5 2002/08/30 20:33:05 robert Exp $");
-
-#include <string.h>
-
-void
-swab(const void * __restrict from, void * __restrict to, size_t len)
-{
-	unsigned long temp;
-	int n;
-	char *fp, *tp;
-
-	n = len >> 1;
-	fp = (char *)from;
-	tp = (char *)to;
-#define	STEP	temp = *fp++,*tp++ = *fp++,*tp++ = temp
-	/* round to multiple of 8 */
-	for (; n & 0x7; --n)
-		STEP;
-	for (n >>= 3; n > 0; --n) {
-		STEP; STEP; STEP; STEP;
-		STEP; STEP; STEP; STEP;
-	}
-}
diff --git a/lib/libc_old/sys/Makefile b/lib/libc_old/sys/Makefile
deleted file mode 100644
index 359ceb8..0000000
--- a/lib/libc_old/sys/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: Makefile 148 2016-01-18 19:34:32Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#Objects
-OBJS = mpi.o startsde.o mmap.o error.o getuptime.o gettime.o getdrives.o setuid.o setgid.o getuid.o getgid.o exec.o getpid.o fork.o pidstatus.o getpage.o sched.o auth.o execve.o
-
-#Output
-OUTPUT = sys.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) ${CFLAGS} -Wall -nostdinc -O -I../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX) ${CFLAGS} -Wall -nostdinc -O -I../include -S -o $@ $<
- 
-.c.o:
-	$(CC) ${CFLAGS} -Wall -nostdinc -O -I../include -I../../../include -c $<
-
-.c.s:
-	$(CC) ${CFLAGS} -Wall -nostdinc -O -I../include -S -o $@ $<
- 
-.S.o:
-	$(CC) ${CFLAGS} -Wall -nostdinc -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libc_old/sys/auth.c b/lib/libc_old/sys/auth.c
deleted file mode 100644
index ef002f9..0000000
--- a/lib/libc_old/sys/auth.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <stdlib.h>
-
-typedef 	struct _UbixUser UbixUser;
-struct _UbixUser
-{
-	char *username;
-	char *password;
-	int uid;
-	int gid;
-	char *home;
-	char *shell;
-};
-
-
-int auth(char *username, char *password)
-{
-	UbixUser *uu;
-
-	uu = malloc(sizeof *uu);
-	uu->uid = -1;
-	uu->username = username;
-	uu->password = password;
-
-	asm volatile(
-	"int %0\n"
-	: : "i" (0x80), "a" (35), "b" (uu)
-	);
-	if(uu->uid == -1)
-		return 0;
-	return 1;
-}
diff --git a/lib/libc_old/sys/error.c b/lib/libc_old/sys/error.c
deleted file mode 100644
index d4489c8..0000000
--- a/lib/libc_old/sys/error.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int *   __error(void) {
-  return(0x0);
-  }
diff --git a/lib/libc_old/sys/exec.c b/lib/libc_old/sys/exec.c
deleted file mode 100644
index 9b85d5b..0000000
--- a/lib/libc_old/sys/exec.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: exec.c 148 2016-01-18 19:34:32Z reddawg $
-
-*****************************************************************************************/
-/*
-int exec(char *file,char **argv, char **env);
-
-asm volatile(
-    "exec:\n"
-    "movl $0x3b,%eax\n"
-    "int $0x80  \n"
-    "ret\n"
-    );
-*/
-
-/*
-int exec(char *file,char **argv, char **env) {
-  asm volatile(
-    "movl $0x3b,%eax\n"
-    "int $0x80  \n"
-    "ret\n"
-    );
-  }
-*/
-
-/***
- $Log: exec.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:03  reddawg
- no message
-
- Revision 1.4  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- Revision 1.3  2004/08/01 20:14:18  reddawg
- Fixens
-
- Revision 1.2  2004/08/01 19:59:19  reddawg
- *** empty log message ***
-
- END
- ***/
diff --git a/lib/libc_old/sys/execve.S b/lib/libc_old/sys/execve.S
deleted file mode 100644
index c646fa5..0000000
--- a/lib/libc_old/sys/execve.S
+++ /dev/null
@@ -1,7 +0,0 @@
-.text
-.globl execve
-.type execve,@function
-execve:
-  movl $0x3B,%eax
-  int $0x80
-  ret
diff --git a/lib/libc_old/sys/fork.c b/lib/libc_old/sys/fork.c
deleted file mode 100644
index c2e13b3..0000000
--- a/lib/libc_old/sys/fork.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fork.c 148 2016-01-18 19:34:32Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-#include <fcntl.h>
-
-pid_t fork() {
-  pid_t pid = 0x0;
-
-  asm volatile(
-//    "pushl %%eax\n"
-    "movl $2,%%eax\n"
- //MrOlsen   "push %%ss\n"
-    //"movl %%esp,%%ecx\n"
-    //"sub $0x4,%%ecx\n"
-    //"pushl %%ecx\n"
-//MrOlsen    "pushl %%esp\n"
-    "int $0x80  \n"
-//    "popl %%esp\n"
-//    "pop %%ss\n"
-//  "popl %%ecx\n"
-//    "popl %%eax\n"
-    "movl %%eax, %0\n"
-    : "=r" (pid)
-    : 
-    :
-    );
-
-  return(pid);
-  }
-  
-/***
- $Log: fork.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:03  reddawg
- no message
-
- Revision 1.6  2004/08/25 22:02:41  reddawg
- task switching - We now are using software switching to be consistant with the rest of the world because all of this open source freaks gave me a hard time about something I liked. There doesn't seem to be any gain in performance but it is working fine and flawlessly
-
- Revision 1.5  2004/08/24 23:33:45  reddawg
- Fixed
-
- Revision 1.4  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- Revision 1.3  2004/08/01 20:14:18  reddawg
- Fixens
-
- Revision 1.2  2004/08/01 19:59:19  reddawg
- *** empty log message ***
-
- END
- ***/
-
-
diff --git a/lib/libc_old/sys/getdrives.c b/lib/libc_old/sys/getdrives.c
deleted file mode 100644
index d8a36f1..0000000
--- a/lib/libc_old/sys/getdrives.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <sys/types.h>
-
-
-void *getDrives() {
-  uInt32 ptr = 0x0;
-  asm(
-    "int %0\n"
-    : : "i" (0x80),"a" (45),"b" (&ptr)
-    );
-  return((void *)ptr);
-  }
diff --git a/lib/libc_old/sys/getgid.c b/lib/libc_old/sys/getgid.c
deleted file mode 100644
index 37e2bbe..0000000
--- a/lib/libc_old/sys/getgid.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getgid.c 148 2016-01-18 19:34:32Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-
-int getgid(void) {
-  volatile int gid = 0x0;
-
-  asm volatile(
-    "movl $0x2f,%%eax \n"
-    "int %1\n"
-    "movl %%eax, %0\n"
-    : "=r" (gid)
-    : "i" (0x80)
-    : "eax"
-    );
-
-  return(gid);
-  }
-
-
-/*
-int getgid(void) {
-  volatile int gid = 0x0;
-  asm volatile(
-    "mov $32,%%eax\n" 
-    "int %0\n"
-    : : "i" (0x80),"a" (&gid)
-    );
-  return(gid);
-  }
-*/
-
-/***
- $Log: getgid.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:03  reddawg
- no message
-
- Revision 1.4  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- Revision 1.3  2004/08/01 20:14:18  reddawg
- Fixens
-
- Revision 1.2  2004/08/01 19:59:19  reddawg
- *** empty log message ***
-
- END
- ***/
diff --git a/lib/libc_old/sys/getpage.c b/lib/libc_old/sys/getpage.c
deleted file mode 100644
index 1bf05f5..0000000
--- a/lib/libc_old/sys/getpage.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getpage.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-
-void *getPage(int count);
-
-asm(
-  ".globl getPage\n"
-  "getPage:\n"
-  "movl $88,%eax\n"
-  "int $0x80\n"
-  "ret\n"
-  );
-
-
-
-
-void *getPage_old(int count) {
-  asm volatile(
-    "movl $88, %eax\n"
-    "int  $0x80     \n"
-    "ret\n"
-//    : : "i" (0x80),"a" (7),"b" (&pageAddr),"c" (count)
-    );
-//  return((void *)pageAddr);
-  }
-  
-/***
- $Log: getpage.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:03  reddawg
- no message
-
- Revision 1.5  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- Revision 1.4  2004/08/01 20:14:18  reddawg
- Fixens
-
- Revision 1.3  2004/08/01 19:59:19  reddawg
- *** empty log message ***
-
- END
- ***/
diff --git a/lib/libc_old/sys/getpid.c b/lib/libc_old/sys/getpid.c
deleted file mode 100644
index a588a22..0000000
--- a/lib/libc_old/sys/getpid.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getpid.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-
-int getpid(void) {
-  volatile int pid = 0x0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (1),"b" (&pid)
-    );
-  return(pid);
-  }
-
-/***
- $Log: getpid.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:04  reddawg
- no message
-
- Revision 1.4  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- Revision 1.3  2004/08/01 20:14:18  reddawg
- Fixens
-
- Revision 1.2  2004/08/01 19:59:19  reddawg
- *** empty log message ***
-
- END
- ***/
-
diff --git a/lib/libc_old/sys/gettime.c b/lib/libc_old/sys/gettime.c
deleted file mode 100644
index c1bdb75..0000000
--- a/lib/libc_old/sys/gettime.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: gettime.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-
-int gettime(void) {
-  volatile int time = 0x0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (47),"b" (&time)
-    );
-  return(time);
-  }
-
-/***
- $Log: gettime.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:04  reddawg
- no message
-
- Revision 1.2  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- END
- ***/
diff --git a/lib/libc_old/sys/getuid.c b/lib/libc_old/sys/getuid.c
deleted file mode 100644
index 32bad0f..0000000
--- a/lib/libc_old/sys/getuid.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getuid.c 148 2016-01-18 19:34:32Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-
-int getuid(void) {
-  int uid = 0x0;
-
-  asm volatile(
-    "movl $0x18,%%eax\n"
-    "int %1\n"
-    "movl %%eax,%0\n" 
-    : "=g" (uid)
-    : "i" (0x80)
-    );
-
-  return(uid);
-  }
-  
-/***
- $Log: getuid.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:04  reddawg
- no message
-
- Revision 1.2  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- END
- ***/
diff --git a/lib/libc_old/sys/getuptime.c b/lib/libc_old/sys/getuptime.c
deleted file mode 100644
index ee26999..0000000
--- a/lib/libc_old/sys/getuptime.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getuptime.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-#include <sys/types.h>
-
-int getuptime(void) {
-  volatile int uptime = 0x0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (46),"b" (&uptime)
-    );
-  return(uptime);
-  }
-
-/***
- $Log: getuptime.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:04  reddawg
- no message
-
- Revision 1.2  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- END
- ***/
-
diff --git a/lib/libc_old/sys/mmap.c b/lib/libc_old/sys/mmap.c
deleted file mode 100644
index 0f21892..0000000
--- a/lib/libc_old/sys/mmap.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mmap.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-
-#include <sys/mman.h>
-
-void *mmap(void *addr, size_t len, int prot, int flags, int fd, off_t offset) {
-/*
-  asm(
-    "pushl %%eax  \n"
-    "movl $4,%%eax\n"
-    "int  $0x69   \n"
-    "popl %%eax   \n"
-    );
-*/
-  
-  return(0x0);
-  }
-
-/***
- END
- ***/
-
diff --git a/lib/libc_old/sys/mpi.c b/lib/libc_old/sys/mpi.c
deleted file mode 100644
index 3bc7986..0000000
--- a/lib/libc_old/sys/mpi.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mpi.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/mpi.h>
-
-int mpi_createMbox(char *name) { 
-  volatile int status = 0x0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (50),"b" (&status),"c" (name)
-    );
-
-  return(status);
-  }
-
-int mpi_destroyMbox(char *name) {
-  volatile int status = 0x0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (51),"b" (&status),"c" (name)
-    );
-
-  return(status);
-  }
-
-int mpi_postMessage(char *name,uInt32 type,mpi_message_t *msg) {
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (52),"b" (name),"c" (&type),"d" (msg)
-    );
-  return(type);
-  }
-
-int mpi_fetchMessage(char *name,mpi_message_t *msg) {
-  volatile int status = 0x0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (53),"b" (name),"c" (msg),"d" (&status)
-    );
-  return(status);
-  }
-
-int mpi_spam(uInt32 type,void *data) {
-  volatile int status = 0x0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (54),"b" (type),"c" (data),"d" (&status)
-    );
-  return(status);
-  }
-
-/***
- $Log: mpi.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:04  reddawg
- no message
-
- Revision 1.4  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.3  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- Revision 1.2  2004/05/26 15:39:22  reddawg
- mpi: brought mpiDestroyMbox(char *name) in to the userland
-
- Revision 1.1  2004/05/25 15:43:27  reddawg
- Added Userland MPI access
-
- END
- ***/
-
diff --git a/lib/libc_old/sys/pidstatus.c b/lib/libc_old/sys/pidstatus.c
deleted file mode 100644
index ab19210..0000000
--- a/lib/libc_old/sys/pidstatus.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: pidstatus.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/sys.h>
-
-asm(
- ".text                     \n"
- ".globl pidStatus          \n" 
- ".type pidStatus,@function \n"
- "pidStatus:                \n"
- "movl $7,%eax              \n"
- "int $0x80                 \n"
- "ret                       \n"
-);
-
-
-int pidStatus_Old(int pid) {
-  volatile int status = 0x0;
-  asm volatile(
-    "movl $7, %%eax\n"
-    "int $0x80\n"
-    : "=g" (status)
-    :"b" (pid),"c" (&status)
-    );
-  return(status);
-  }
-
-/***
- $Log: pidstatus.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:05  reddawg
- no message
-
- Revision 1.2  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- END
- ***/
diff --git a/lib/libc_old/sys/sched.c b/lib/libc_old/sys/sched.c
deleted file mode 100644
index b69cc20..0000000
--- a/lib/libc_old/sys/sched.c
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#include <sys/sched.h>
-
-//int sched_yield(void);
-
-asm(
-  ".text             \n"
-  ".type sched_yield,@function\n"
-  ".globl sched_yield\n"
-  "sched_yield:      \n"
-  "mov $331,%eax     \n"
-  "int $0x80         \n"
-  "ret               \n"
-);
-
-/*
-{
-  volatile int return_val = 0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (11)
-    );
-  return return_val;
-}
-
-*/
diff --git a/lib/libc_old/sys/setgid.c b/lib/libc_old/sys/setgid.c
deleted file mode 100644
index b38299d..0000000
--- a/lib/libc_old/sys/setgid.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: setgid.c 160 2016-01-19 04:01:03Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-
-int setgid(int gid) {
-  volatile int status = 0x0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (34),"b" (gid),"c" (&status)
-    );
-  return(status);
-  }
-  
-/***
- $Log: setgid.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:05  reddawg
- no message
-
- Revision 1.2  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- END
- ***/
diff --git a/lib/libc_old/sys/setuid.c b/lib/libc_old/sys/setuid.c
deleted file mode 100644
index 6398ef0..0000000
--- a/lib/libc_old/sys/setuid.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: setuid.c 159 2016-01-19 03:07:04Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-
-int setuid(int uid);
-
-asm(
-  ".text\n"
-  ".globl setuid\n"
-  "setuid:\n"
-  "movl $23, %eax\n"
-  "int $0x80\n"
-);
-
-/***
- END
- ***/
diff --git a/lib/libc_old/sys/startsde.c b/lib/libc_old/sys/startsde.c
deleted file mode 100644
index 2124f96..0000000
--- a/lib/libc_old/sys/startsde.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: startsde.c 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-
-int startSDE(void) {
-  volatile int time = 0x0;
-  asm volatile(
-    "int %0\n"
-    : : "i" (0x80),"a" (48)
-    );
-  return(time);
-  }
-
-/***
- $Log: startsde.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:05  reddawg
- no message
-
- Revision 1.2  2004/08/02 18:50:13  reddawg
- Updates to make some variable volatile to make work with gcc 3.3. However there are still some issues but we have not caused new issues with gcc 2.95
-
- END
- ***/
-
diff --git a/lib/libcpp/Makefile b/lib/libcpp/Makefile
deleted file mode 100644
index 628f53c..0000000
--- a/lib/libcpp/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-
-# Include Global 'Source' Options
-Makefile.incl
-Makefile.incl
-#  Objects
-OBJS = libcpp.o
-
-#Include
-
-INCLUDE = -I../../include -I./include -I../libc/include
-
-all: $(OBJS)
-
-#  Compile Types
-.cpp.o:
-	$(CXX) ${CFLAGS} -Wall -DNOBOOL -fno-exceptions -g -c $(INCLUDE) -o $@ $<
-.cc.o:
-	$(CXX) ${CFLAGS} -Wall -DNOBOOL -D__HMM -nostdinc -fno-builtin -fno-rtti -fno-exceptions -fomit-frame-pointer -O $(INCLUDE) -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} -Wall -fomit-frame-pointer -O $(INCLUDE) -S -o $@ $<
-.c.o:
-	$(CC)  ${CFLAGS} -Wall -fomit-frame-pointer -O $(INCLUDE) -c -o $@ $<
-.c.s:
-	$(CC)  ${CFLAGS} -Wall -fomit-frame-pointer -O $(INCLUDE) -S -o $@ $<
-.S.o:
-	$(CC)  ${CFLAGS} -Wall -fomit-frame-pointer -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/lib/libcpp/include/libcpp.h b/lib/libcpp/include/libcpp.h
deleted file mode 100644
index 78f02c8..0000000
--- a/lib/libcpp/include/libcpp.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __LIBCPP_H
-#define __LIBCPP_H
-
-void * operator new(unsigned size);
-void   operator delete(void * ptr);
-void * operator new[](unsigned size);
-void   operator delete[](void * ptr);
-
-#endif
diff --git a/lib/libcpp/libcpp.cc b/lib/libcpp/libcpp.cc
deleted file mode 100644
index 1132e8b..0000000
--- a/lib/libcpp/libcpp.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-extern "C" {	
-#include <stdlib.h>
-/* Don't Touch Mark */
-void __pure_virtual() { while(1); }
-void __cxa_pure_virtual() { while(1); }
-}
-
-#include <libcpp.h>
-
-/* Don't Touch Mark */
-void * operator new[](unsigned size)
-{
-    return malloc(size);
-}
-
-void operator delete[](void * ptr)
-{
-    free(ptr);
-
-    return;
-}
-
-void * operator new(unsigned size)
-{
-    return malloc(size);
-}
-
-void operator delete(void * ptr)
-{
-    free(ptr);
-
-    return;
-}
-
-/* End Don't Touch */
-
diff --git a/lib/libedit/Makefile b/lib/libedit/Makefile
deleted file mode 100644
index 2fb3355..0000000
--- a/lib/libedit/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-Makefile.incl
-Makefile.incl
-
-INCLUDES = -I. -I../../include
-
-#Objects
-OBJS = read.o el.o
-
-#Sub Sections
-SUBS = 
-
-#Output
-OUTPUT = libedit.so
-
-lib.so: $(OBJS)
-	$(CC) -nostdlib -shared -Wl,-soname,libedit.so -o $(OUTPUT) $(OBJS) $(SUBS)
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -Wall -nostdinc -O -I./include -c -o $@ $<
- 
-.cc.s:
-	$(CXX)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -nostdinc -O $(INCLUDES) -c $<
-
-.c.s:
-	$(CC)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall -nostdinc -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
-	(cd test;make clean)
diff --git a/lib/libedit/chared.h b/lib/libedit/chared.h
deleted file mode 100644
index c94e66d..0000000
--- a/lib/libedit/chared.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)chared.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: chared.h,v 1.16 2005/08/08 14:05:37 christos Exp $
- * $FreeBSD: src/lib/libedit/chared.h,v 1.6.12.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.chared.h: Character editor interface
- */
-#ifndef _h_el_chared
-#define	_h_el_chared
-
-#include <ctype.h>
-#include <string.h>
-
-#include "histedit.h"
-
-#define	EL_MAXMACRO	10
-
-/*
- * This is an issue of basic "vi" look-and-feel. Defining VI_MOVE works
- * like real vi: i.e. the transition from command<->insert modes moves
- * the cursor.
- *
- * On the other hand we really don't want to move the cursor, because
- * all the editing commands don't include the character under the cursor.
- * Probably the best fix is to make all the editing commands aware of
- * this fact.
- */
-#define	VI_MOVE
-
-
-typedef struct c_macro_t {
-	int	  level;
-	int	  offset;
-	char	**macro;
-} c_macro_t;
-
-/*
- * Undo information for vi - no undo in emacs (yet)
- */
-typedef struct c_undo_t {
-	int	 len;			/* length of saved line */
-	int	 cursor;		/* position of saved cursor */
-	char	*buf;			/* full saved text */
-} c_undo_t;
-
-/* redo for vi */
-typedef struct c_redo_t {
-	char	*buf;			/* redo insert key sequence */
-	char	*pos;
-	char	*lim;
-	el_action_t	cmd;		/* command to redo */
-	char	ch;			/* char that invoked it */
-	int	count;
-	int	action;			/* from cv_action() */
-} c_redo_t;
-
-/*
- * Current action information for vi
- */
-typedef struct c_vcmd_t {
-	int	 action;
-	char	*pos;
-} c_vcmd_t;
-
-/*
- * Kill buffer for emacs
- */
-typedef struct c_kill_t {
-	char	*buf;
-	char	*last;
-	char	*mark;
-} c_kill_t;
-
-/*
- * Note that we use both data structures because the user can bind
- * commands from both editors!
- */
-typedef struct el_chared_t {
-	c_undo_t	c_undo;
-	c_kill_t	c_kill;
-	c_redo_t	c_redo;
-	c_vcmd_t	c_vcmd;
-	c_macro_t	c_macro;
-} el_chared_t;
-
-
-#define	STReof		"^D\b\b"
-#define	STRQQ		"\"\""
-
-#define	isglob(a)	(strchr("*[]?", (a)) != NULL)
-#define	isword(a)	(isprint(a))
-
-#define	NOP		0x00
-#define	DELETE		0x01
-#define	INSERT		0x02
-#define	YANK		0x04
-
-#define	CHAR_FWD	(+1)
-#define	CHAR_BACK	(-1)
-
-#define	MODE_INSERT	0
-#define	MODE_REPLACE	1
-#define	MODE_REPLACE_1	2
-
-#include "common.h"
-#include "vi.h"
-#include "emacs.h"
-#include "search.h"
-#include "fcns.h"
-
-
-protected int	 cv__isword(int);
-protected int	 cv__isWord(int);
-protected void	 cv_delfini(EditLine *);
-protected char	*cv__endword(char *, char *, int, int (*)(int));
-protected int	 ce__isword(int);
-protected void	 cv_undo(EditLine *);
-protected void	 cv_yank(EditLine *, const char *, int);
-protected char	*cv_next_word(EditLine*, char *, char *, int, int (*)(int));
-protected char	*cv_prev_word(char *, char *, int, int (*)(int));
-protected char	*c__next_word(char *, char *, int, int (*)(int));
-protected char	*c__prev_word(char *, char *, int, int (*)(int));
-protected void	 c_insert(EditLine *, int);
-protected void	 c_delbefore(EditLine *, int);
-protected void	 c_delbefore1(EditLine *);
-protected void	 c_delafter(EditLine *, int);
-protected void	 c_delafter1(EditLine *);
-protected int	 c_gets(EditLine *, char *, const char *);
-protected int	 c_hpos(EditLine *);
-
-protected int	 ch_init(EditLine *);
-protected void	 ch_reset(EditLine *, int);
-protected int	 ch_enlargebufs(EditLine *, size_t);
-protected void	 ch_end(EditLine *);
-
-#endif /* _h_el_chared */
diff --git a/lib/libedit/common.h b/lib/libedit/common.h
deleted file mode 100644
index 35c61eb..0000000
--- a/lib/libedit/common.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Automatically generated file, do not edit */
-#ifndef _h_common_c
-#define _h_common_c
-protected el_action_t	ed_end_of_file (EditLine *, int);
-protected el_action_t	ed_insert (EditLine *, int);
-protected el_action_t	ed_delete_prev_word (EditLine *, int);
-protected el_action_t	ed_delete_next_char (EditLine *, int);
-protected el_action_t	ed_kill_line (EditLine *, int);
-protected el_action_t	ed_move_to_end (EditLine *, int);
-protected el_action_t	ed_move_to_beg (EditLine *, int);
-protected el_action_t	ed_transpose_chars (EditLine *, int);
-protected el_action_t	ed_next_char (EditLine *, int);
-protected el_action_t	ed_prev_word (EditLine *, int);
-protected el_action_t	ed_prev_char (EditLine *, int);
-protected el_action_t	ed_quoted_insert (EditLine *, int);
-protected el_action_t	ed_digit (EditLine *, int);
-protected el_action_t	ed_argument_digit (EditLine *, int);
-protected el_action_t	ed_unassigned (EditLine *, int);
-protected el_action_t	ed_tty_sigint (EditLine *, int);
-protected el_action_t	ed_tty_dsusp (EditLine *, int);
-protected el_action_t	ed_tty_flush_output (EditLine *, int);
-protected el_action_t	ed_tty_sigquit (EditLine *, int);
-protected el_action_t	ed_tty_sigtstp (EditLine *, int);
-protected el_action_t	ed_tty_stop_output (EditLine *, int);
-protected el_action_t	ed_tty_start_output (EditLine *, int);
-protected el_action_t	ed_newline (EditLine *, int);
-protected el_action_t	ed_delete_prev_char (EditLine *, int);
-protected el_action_t	ed_clear_screen (EditLine *, int);
-protected el_action_t	ed_redisplay (EditLine *, int);
-protected el_action_t	ed_start_over (EditLine *, int);
-protected el_action_t	ed_sequence_lead_in (EditLine *, int);
-protected el_action_t	ed_prev_history (EditLine *, int);
-protected el_action_t	ed_next_history (EditLine *, int);
-protected el_action_t	ed_search_prev_history (EditLine *, int);
-protected el_action_t	ed_search_next_history (EditLine *, int);
-protected el_action_t	ed_prev_line (EditLine *, int);
-protected el_action_t	ed_next_line (EditLine *, int);
-protected el_action_t	ed_command (EditLine *, int);
-#endif /* _h_common_c */
diff --git a/lib/libedit/el.c b/lib/libedit/el.c
deleted file mode 100644
index dd0f7d7..0000000
--- a/lib/libedit/el.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	$NetBSD: el.c,v 1.41 2005/08/19 04:21:47 christos Exp $
- */
-
-#if !defined(lint) && !defined(SCCSID)
-static char sccsid[] = "@(#)el.c	8.2 (Berkeley) 1/3/94";
-#endif /* not lint && not SCCSID */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libedit/el.c,v 1.11.14.1 2005/10/09 03:44:01 delphij Exp $");
-
-/*
- * el.c: EditLine interface functions
- */
-#include "sys.h"
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include "el.h"
-
-#define	HAVE_ISSETUGID
-
-/* el_init():
- *	Initialize editline and set default parameters.
- */
-public EditLine *
-el_init(const char *prog, FILE *fin, FILE *fout, FILE *ferr)
-{
-
-	EditLine *el = (EditLine *) el_malloc(sizeof(EditLine));
-
-	if (el == NULL)
-		return (NULL);
-
-	memset(el, 0, sizeof(EditLine));
-
-	el->el_infd = fileno(fin);
-	el->el_outfile = fout;
-	el->el_errfile = ferr;
-	if ((el->el_prog = el_strdup(prog)) == NULL) {
-		el_free(el);
-		return NULL;
-	}
-
-	/*
-         * Initialize all the modules. Order is important!!!
-         */
-	el->el_flags = 0;
-
-	if (term_init(el) == -1) {
-		el_free(el->el_prog);
-		el_free(el);
-		return NULL;
-	}
-	(void) key_init(el);
-	(void) map_init(el);
-	if (tty_init(el) == -1)
-		el->el_flags |= NO_TTY;
-	(void) ch_init(el);
-	(void) search_init(el);
-	(void) hist_init(el);
-	(void) prompt_init(el);
-	(void) sig_init(el);
-	(void) read_init(el);
-
-	return (el);
-}
-
-
-/* el_end():
- *	Clean up.
- */
-public void
-el_end(EditLine *el)
-{
-
-	if (el == NULL)
-		return;
-
-	el_reset(el);
-
-	term_end(el);
-	key_end(el);
-	map_end(el);
-	tty_end(el);
-	ch_end(el);
-	search_end(el);
-	hist_end(el);
-	prompt_end(el);
-	sig_end(el);
-
-	el_free((ptr_t) el->el_prog);
-	el_free((ptr_t) el);
-}
-
-
-/* el_reset():
- *	Reset the tty and the parser
- */
-public void
-el_reset(EditLine *el)
-{
-
-	tty_cookedmode(el);
-	ch_reset(el, 0);		/* XXX: Do we want that? */
-}
-
-
-/* el_set():
- *	set the editline parameters
- */
-public int
-el_set(EditLine *el, int op, ...)
-{
-	vaList va;
-	int rv = 0;
-
-	if (el == NULL)
-		return (-1);
-	vaStart(va, op);
-
-	switch (op) {
-	case EL_PROMPT:
-	case EL_RPROMPT:
-		rv = prompt_set(el, vaArg(va, el_pfunc_t), op);
-		break;
-
-	case EL_TERMINAL:
-		rv = term_set(el, vaArg(va, char *));
-		break;
-
-	case EL_EDITOR:
-		rv = map_set_editor(el, vaArg(va, char *));
-		break;
-
-	case EL_SIGNAL:
-		if (vaArg(va, int))
-			el->el_flags |= HANDLE_SIGNALS;
-		else
-			el->el_flags &= ~HANDLE_SIGNALS;
-		break;
-
-	case EL_BIND:
-	case EL_TELLTC:
-	case EL_SETTC:
-	case EL_ECHOTC:
-	case EL_SETTY:
-	{
-		const char *argv[20];
-		int i;
-
-		for (i = 1; i < 20; i++)
-			if ((argv[i] = vaArg(va, char *)) == NULL)
-				break;
-
-		switch (op) {
-		case EL_BIND:
-			argv[0] = "bind";
-			rv = map_bind(el, i, argv);
-			break;
-
-		case EL_TELLTC:
-			argv[0] = "telltc";
-			rv = term_telltc(el, i, argv);
-			break;
-
-		case EL_SETTC:
-			argv[0] = "settc";
-			rv = term_settc(el, i, argv);
-			break;
-
-		case EL_ECHOTC:
-			argv[0] = "echotc";
-			rv = term_echotc(el, i, argv);
-			break;
-
-		case EL_SETTY:
-			argv[0] = "setty";
-			rv = tty_stty(el, i, argv);
-			break;
-
-		default:
-			rv = -1;
-			EL_ABORT((el->el_errfile, "Bad op %d\n", op));
-			break;
-		}
-		break;
-	}
-
-	case EL_ADDFN:
-	{
-		char *name = vaArg(va, char *);
-		char *help = vaArg(va, char *);
-		el_func_t func = vaArg(va, el_func_t);
-
-		rv = map_addfunc(el, name, help, func);
-		break;
-	}
-
-	case EL_HIST:
-	{
-		hist_fun_t func = vaArg(va, hist_fun_t);
-		ptr_t ptr = vaArg(va, char *);
-
-		rv = hist_set(el, func, ptr);
-		break;
-	}
-
-	case EL_EDITMODE:
-		if (vaArg(va, int))
-			el->el_flags &= ~EDIT_DISABLED;
-		else
-			el->el_flags |= EDIT_DISABLED;
-		rv = 0;
-		break;
-
-	case EL_GETCFN:
-	{
-		el_rfunc_t rc = vaArg(va, el_rfunc_t);
-		rv = el_read_setfn(el, rc);
-		break;
-	}
-
-	case EL_CLIENTDATA:
-		el->el_data = vaArg(va, void *);
-		break;
-
-	case EL_UNBUFFERED:
-		rv = vaArg(va, int);
-		if (rv && !(el->el_flags & UNBUFFERED)) {
-			el->el_flags |= UNBUFFERED;
-			read_prepare(el);
-		} else if (!rv && (el->el_flags & UNBUFFERED)) {
-			el->el_flags &= ~UNBUFFERED;
-			read_finish(el);
-		}
-		rv = 0;
-		break;
-
-	case EL_PREP_TERM:
-		rv = vaArg(va, int);
-		if (rv)
-			(void) tty_rawmode(el);
-		else
-			(void) tty_cookedmode(el);
-		rv = 0;
-		break;
-
-	default:
-		rv = -1;
-		break;
-	}
-
-	vaEnd(va);
-	return (rv);
-}
-
-
-/* el_get():
- *	retrieve the editline parameters
- */
-public int
-el_get(EditLine *el, int op, void *ret)
-{
-	int rv;
-
-	if (el == NULL || ret == NULL)
-		return (-1);
-	switch (op) {
-	case EL_PROMPT:
-	case EL_RPROMPT:
-		rv = prompt_get(el, (el_pfunc_t *) ret, op);
-		break;
-
-	case EL_EDITOR:
-		rv = map_get_editor(el, (const char **)ret);
-		break;
-
-	case EL_SIGNAL:
-		*((int *) ret) = (el->el_flags & HANDLE_SIGNALS);
-		rv = 0;
-		break;
-
-	case EL_EDITMODE:
-		*((int *) ret) = (!(el->el_flags & EDIT_DISABLED));
-		rv = 0;
-		break;
-
-	case EL_TERMINAL:
-		term_get(el, (const char **)ret);
-		rv = 0;
-		break;
-
-#if 0				/* XXX */
-	case EL_BIND:
-	case EL_TELLTC:
-	case EL_SETTC:
-	case EL_ECHOTC:
-	case EL_SETTY:
-	{
-		const char *argv[20];
-		int i;
-
- 		for (i = 1; i < sizeof(argv) / sizeof(argv[0]); i++)
-			if ((argv[i] = vaArg(va, char *)) == NULL)
-				break;
-
-		switch (op) {
-		case EL_BIND:
-			argv[0] = "bind";
-			rv = map_bind(el, i, argv);
-			break;
-
-		case EL_TELLTC:
-			argv[0] = "telltc";
-			rv = term_telltc(el, i, argv);
-			break;
-
-		case EL_SETTC:
-			argv[0] = "settc";
-			rv = term_settc(el, i, argv);
-			break;
-
-		case EL_ECHOTC:
-			argv[0] = "echotc";
-			rv = term_echotc(el, i, argv);
-			break;
-
-		case EL_SETTY:
-			argv[0] = "setty";
-			rv = tty_stty(el, i, argv);
-			break;
-
-		default:
-			rv = -1;
-			EL_ABORT((el->errfile, "Bad op %d\n", op));
-			break;
-		}
-		break;
-	}
-
-	case EL_ADDFN:
-	{
-		char *name = vaArg(va, char *);
-		char *help = vaArg(va, char *);
-		el_func_t func = vaArg(va, el_func_t);
-
-		rv = map_addfunc(el, name, help, func);
-		break;
-	}
-
-	case EL_HIST:
-		{
-			hist_fun_t func = vaArg(va, hist_fun_t);
-			ptr_t ptr = vaArg(va, char *);
-			rv = hist_set(el, func, ptr);
-		}
-		break;
-#endif /* XXX */
-
-	case EL_GETCFN:
-		*((el_rfunc_t *)ret) = el_read_getfn(el);
-		rv = 0;
-		break;
-
-	case EL_CLIENTDATA:
-		*((void **)ret) = el->el_data;
-		rv = 0;
-		break;
-
-	case EL_UNBUFFERED:
-		*((int *) ret) = (!(el->el_flags & UNBUFFERED));
-		rv = 0;
-		break;
-
-	default:
-		rv = -1;
-	}
-
-	return (rv);
-}
-
-/* el_data_get():
- *	Set user private data.
- */
-public void
-el_data_set (el, data)
-    EditLine *el;
-    void *data;
-{
-    el->el_data = data;
-
-    return;
-}
-
-/* el_data_get():
- *	Return user private data.
- */
-public void *
-el_data_get (el)
-    EditLine *el;
-{
-    if (el->el_data)
-	return (el->el_data);
-    return (NULL);
-}
-
-/* el_line():
- *	Return editing info
- */
-public const LineInfo *
-el_line(EditLine *el)
-{
-
-	return (const LineInfo *) (void *) &el->el_line;
-}
-
-
-/* el_source():
- *	Source a file
- */
-public int
-el_source(EditLine *el, const char *fname)
-{
-	FILE *fp;
-	size_t len;
-	char *ptr;
-
-	fp = NULL;
-	if (fname == NULL) {
-#ifdef HAVE_ISSETUGID
-		static const char elpath[] = "/.editrc";
-		char path[MAXPATHLEN];
-
-		if (issetugid())
-			return (-1);
-		if ((ptr = getenv("HOME")) == NULL)
-			return (-1);
-		if (strlcpy(path, ptr, sizeof(path)) >= sizeof(path))
-			return (-1);
-		if (strlcat(path, elpath, sizeof(path)) >= sizeof(path))
-			return (-1);
-		fname = path;
-#else
-		/*
-		 * If issetugid() is missing, always return an error, in order
-		 * to keep from inadvertently opening up the user to a security
-		 * hole.
-		 */
-		return (-1);
-#endif
-	}
-	if (fp == NULL)
-		fp = fopen(fname, "r");
-	if (fp == NULL)
-		return (-1);
-
-	while ((ptr = fgetln(fp, &len)) != NULL) {
-		if (len > 0 && ptr[len - 1] == '\n')
-			--len;
-		ptr[len] = '\0';
-		if (parse_line(el, ptr) == -1) {
-			(void) fclose(fp);
-			return (-1);
-		}
-	}
-
-	(void) fclose(fp);
-	return (0);
-}
-
-
-/* el_resize():
- *	Called from program when terminal is resized
- */
-public void
-el_resize(EditLine *el)
-{
-	int lins, cols;
-	sigset_t oset, nset;
-
-	(void) sigemptyset(&nset);
-	(void) sigaddset(&nset, SIGWINCH);
-	(void) sigprocmask(SIG_BLOCK, &nset, &oset);
-
-	/* get the correct window size */
-	if (term_get_size(el, &lins, &cols))
-		term_change_size(el, lins, cols);
-
-	(void) sigprocmask(SIG_SETMASK, &oset, NULL);
-}
-
-
-/* el_beep():
- *	Called from the program to beep
- */
-public void
-el_beep(EditLine *el)
-{
-
-	term_beep(el);
-}
-
-
-/* el_editmode()
- *	Set the state of EDIT_DISABLED from the `edit' command.
- */
-protected int
-/*ARGSUSED*/
-el_editmode(EditLine *el, int argc, const char **argv)
-{
-	const char *how;
-
-	if (argv == NULL || argc != 2 || argv[1] == NULL)
-		return (-1);
-
-	how = argv[1];
-	if (strcmp(how, "on") == 0) {
-		el->el_flags &= ~EDIT_DISABLED;
-		tty_rawmode(el);
-	} else if (strcmp(how, "off") == 0) {
-		tty_cookedmode(el);
-		el->el_flags |= EDIT_DISABLED;
-	}
-	else {
-		(void) fprintf(el->el_errfile, "edit: Bad value `%s'.\n", how);
-		return (-1);
-	}
-	return (0);
-}
diff --git a/lib/libedit/el.h b/lib/libedit/el.h
deleted file mode 100644
index eee97df..0000000
--- a/lib/libedit/el.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)el.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: el.h,v 1.16 2003/10/18 23:48:42 christos Exp $
- * $FreeBSD: src/lib/libedit/el.h,v 1.4.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.h: Internal structures.
- */
-#ifndef _h_el
-#define	_h_el
-/*
- * Local defaults
- */
-#define	KSHVI
-#define	VIDEFAULT
-#define	ANCHOR
-
-#include <stdio.h>
-#include <sys/types.h>
-
-#define	EL_BUFSIZ	1024		/* Maximum line size		*/
-
-#define	HANDLE_SIGNALS	0x01
-#define	NO_TTY		0x02
-#define	EDIT_DISABLED	0x04
-#define	UNBUFFERED	0x08
-
-typedef int bool_t;			/* True or not			*/
-
-typedef unsigned char el_action_t;	/* Index to command array	*/
-
-typedef struct coord_t {		/* Position on the screen	*/
-	int	h;
-	int	v;
-} coord_t;
-
-typedef struct el_line_t {
-	char	*buffer;		/* Input line			*/
-	char	*cursor;		/* Cursor position		*/
-	char	*lastchar;		/* Last character		*/
-	const char	*limit;		/* Max position			*/
-} el_line_t;
-
-/*
- * Editor state
- */
-typedef struct el_state_t {
-	int		inputmode;	/* What mode are we in?		*/
-	int		doingarg;	/* Are we getting an argument?	*/
-	int		argument;	/* Numeric argument		*/
-	int		metanext;	/* Is the next char a meta char */
-	el_action_t	lastcmd;	/* Previous command		*/
-	el_action_t	thiscmd;	/* this command 		*/
-	char		thisch;		/* char that generated it	*/
-} el_state_t;
-
-/*
- * Until we come up with something better...
- */
-#define	el_strdup(a)	strdup(a)
-#define	el_malloc(a)	malloc(a)
-#define	el_realloc(a,b)	realloc(a, b)
-#define	el_free(a)	free(a)
-
-#include "tty.h"
-#include "prompt.h"
-#include "key.h"
-#include "term.h"
-#include "refresh.h"
-#include "chared.h"
-#include "common.h"
-#include "search.h"
-#include "hist.h"
-#include "map.h"
-#include "parse.h"
-#include "sig.h"
-#include "help.h"
-#include "read.h"
-
-struct editline {
-	char		 *el_prog;	/* the program name		*/
-	FILE		 *el_outfile;	/* Stdio stuff			*/
-	FILE		 *el_errfile;	/* Stdio stuff			*/
-	int		  el_infd;	/* Input file descriptor	*/
-	int		  el_flags;	/* Various flags.		*/
-	coord_t		  el_cursor;	/* Cursor location		*/
-	char		**el_display;	/* Real screen image = what is there */
-	char		**el_vdisplay;	/* Virtual screen image = what we see */
-	void		 *el_data;	/* Client data			*/
-	el_line_t	  el_line;	/* The current line information	*/
-	el_state_t	  el_state;	/* Current editor state		*/
-	el_term_t	  el_term;	/* Terminal dependent stuff	*/
-	el_tty_t	  el_tty;	/* Tty dependent stuff		*/
-	el_refresh_t	  el_refresh;	/* Refresh stuff		*/
-	el_prompt_t	  el_prompt;	/* Prompt stuff			*/
-	el_prompt_t	  el_rprompt;	/* Prompt stuff			*/
-	el_chared_t	  el_chared;	/* Characted editor stuff	*/
-	el_map_t	  el_map;	/* Key mapping stuff		*/
-	el_key_t	  el_key;	/* Key binding stuff		*/
-	el_history_t	  el_history;	/* History stuff		*/
-	el_search_t	  el_search;	/* Search stuff			*/
-	el_signal_t	  el_signal;	/* Signal handling stuff	*/
-	el_read_t	  el_read;	/* Character reading stuff	*/
-};
-
-protected int	el_editmode(EditLine *, int, const char **);
-
-#ifdef DEBUG
-#define	EL_ABORT(a)	do { \
-				fprintf(el->el_errfile, "%s, %d: ", \
-					 __FILE__, __LINE__); \
-				fprintf a; \
-				abort(); \
-			} while( /*CONSTCOND*/0);
-#else
-#define EL_ABORT(a)	abort()
-#endif
-#endif /* _h_el */
diff --git a/lib/libedit/emacs.h b/lib/libedit/emacs.h
deleted file mode 100644
index 60a5e9e..0000000
--- a/lib/libedit/emacs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Automatically generated file, do not edit */
-#ifndef _h_emacs_c
-#define _h_emacs_c
-protected el_action_t	em_delete_or_list (EditLine *, int);
-protected el_action_t	em_delete_next_word (EditLine *, int);
-protected el_action_t	em_yank (EditLine *, int);
-protected el_action_t	em_kill_line (EditLine *, int);
-protected el_action_t	em_kill_region (EditLine *, int);
-protected el_action_t	em_copy_region (EditLine *, int);
-protected el_action_t	em_gosmacs_transpose (EditLine *, int);
-protected el_action_t	em_next_word (EditLine *, int);
-protected el_action_t	em_upper_case (EditLine *, int);
-protected el_action_t	em_capitol_case (EditLine *, int);
-protected el_action_t	em_lower_case (EditLine *, int);
-protected el_action_t	em_set_mark (EditLine *, int);
-protected el_action_t	em_exchange_mark (EditLine *, int);
-protected el_action_t	em_universal_argument (EditLine *, int);
-protected el_action_t	em_meta_next (EditLine *, int);
-protected el_action_t	em_toggle_overwrite (EditLine *, int);
-protected el_action_t	em_copy_prev_word (EditLine *, int);
-protected el_action_t	em_inc_search_next (EditLine *, int);
-protected el_action_t	em_inc_search_prev (EditLine *, int);
-protected el_action_t	em_delete_prev_char (EditLine *, int);
-#endif /* _h_emacs_c */
diff --git a/lib/libedit/fcns.h b/lib/libedit/fcns.h
deleted file mode 100644
index adf9c48..0000000
--- a/lib/libedit/fcns.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* Automatically generated file, do not edit */
-#ifndef _h_fcns_c
-#define _h_fcns_c
-#define	ED_ARGUMENT_DIGIT             	  0
-#define	ED_CLEAR_SCREEN               	  1
-#define	ED_COMMAND                    	  2
-#define	ED_DELETE_NEXT_CHAR           	  3
-#define	ED_DELETE_PREV_CHAR           	  4
-#define	ED_DELETE_PREV_WORD           	  5
-#define	ED_DIGIT                      	  6
-#define	ED_END_OF_FILE                	  7
-#define	ED_INSERT                     	  8
-#define	ED_KILL_LINE                  	  9
-#define	ED_MOVE_TO_BEG                	 10
-#define	ED_MOVE_TO_END                	 11
-#define	ED_NEWLINE                    	 12
-#define	ED_NEXT_CHAR                  	 13
-#define	ED_NEXT_HISTORY               	 14
-#define	ED_NEXT_LINE                  	 15
-#define	ED_PREV_CHAR                  	 16
-#define	ED_PREV_HISTORY               	 17
-#define	ED_PREV_LINE                  	 18
-#define	ED_PREV_WORD                  	 19
-#define	ED_QUOTED_INSERT              	 20
-#define	ED_REDISPLAY                  	 21
-#define	ED_SEARCH_NEXT_HISTORY        	 22
-#define	ED_SEARCH_PREV_HISTORY        	 23
-#define	ED_SEQUENCE_LEAD_IN           	 24
-#define	ED_START_OVER                 	 25
-#define	ED_TRANSPOSE_CHARS            	 26
-#define	ED_TTY_DSUSP                  	 27
-#define	ED_TTY_FLUSH_OUTPUT           	 28
-#define	ED_TTY_SIGINT                 	 29
-#define	ED_TTY_SIGQUIT                	 30
-#define	ED_TTY_SIGTSTP                	 31
-#define	ED_TTY_START_OUTPUT           	 32
-#define	ED_TTY_STOP_OUTPUT            	 33
-#define	ED_UNASSIGNED                 	 34
-#define	EM_CAPITOL_CASE               	 35
-#define	EM_COPY_PREV_WORD             	 36
-#define	EM_COPY_REGION                	 37
-#define	EM_DELETE_NEXT_WORD           	 38
-#define	EM_DELETE_OR_LIST             	 39
-#define	EM_DELETE_PREV_CHAR           	 40
-#define	EM_EXCHANGE_MARK              	 41
-#define	EM_GOSMACS_TRANSPOSE          	 42
-#define	EM_INC_SEARCH_NEXT            	 43
-#define	EM_INC_SEARCH_PREV            	 44
-#define	EM_KILL_LINE                  	 45
-#define	EM_KILL_REGION                	 46
-#define	EM_LOWER_CASE                 	 47
-#define	EM_META_NEXT                  	 48
-#define	EM_NEXT_WORD                  	 49
-#define	EM_SET_MARK                   	 50
-#define	EM_TOGGLE_OVERWRITE           	 51
-#define	EM_UNIVERSAL_ARGUMENT         	 52
-#define	EM_UPPER_CASE                 	 53
-#define	EM_YANK                       	 54
-#define	VI_ADD                        	 55
-#define	VI_ADD_AT_EOL                 	 56
-#define	VI_ALIAS                      	 57
-#define	VI_CHANGE_CASE                	 58
-#define	VI_CHANGE_META                	 59
-#define	VI_CHANGE_TO_EOL              	 60
-#define	VI_COMMAND_MODE               	 61
-#define	VI_COMMENT_OUT                	 62
-#define	VI_DELETE_META                	 63
-#define	VI_DELETE_PREV_CHAR           	 64
-#define	VI_END_BIG_WORD               	 65
-#define	VI_END_WORD                   	 66
-#define	VI_HISTEDIT                   	 67
-#define	VI_HISTORY_WORD               	 68
-#define	VI_INSERT                     	 69
-#define	VI_INSERT_AT_BOL              	 70
-#define	VI_KILL_LINE_PREV             	 71
-#define	VI_LIST_OR_EOF                	 72
-#define	VI_MATCH                      	 73
-#define	VI_NEXT_BIG_WORD              	 74
-#define	VI_NEXT_CHAR                  	 75
-#define	VI_NEXT_WORD                  	 76
-#define	VI_PASTE_NEXT                 	 77
-#define	VI_PASTE_PREV                 	 78
-#define	VI_PREV_BIG_WORD              	 79
-#define	VI_PREV_CHAR                  	 80
-#define	VI_PREV_WORD                  	 81
-#define	VI_REDO                       	 82
-#define	VI_REPEAT_NEXT_CHAR           	 83
-#define	VI_REPEAT_PREV_CHAR           	 84
-#define	VI_REPEAT_SEARCH_NEXT         	 85
-#define	VI_REPEAT_SEARCH_PREV         	 86
-#define	VI_REPLACE_CHAR               	 87
-#define	VI_REPLACE_MODE               	 88
-#define	VI_SEARCH_NEXT                	 89
-#define	VI_SEARCH_PREV                	 90
-#define	VI_SUBSTITUTE_CHAR            	 91
-#define	VI_SUBSTITUTE_LINE            	 92
-#define	VI_TO_COLUMN                  	 93
-#define	VI_TO_HISTORY_LINE            	 94
-#define	VI_TO_NEXT_CHAR               	 95
-#define	VI_TO_PREV_CHAR               	 96
-#define	VI_UNDO                       	 97
-#define	VI_UNDO_LINE                  	 98
-#define	VI_YANK                       	 99
-#define	VI_YANK_END                   	100
-#define	VI_ZERO                       	101
-#define	EL_NUM_FCNS                   	102
-typedef el_action_t (*el_func_t)(EditLine *, int);
-protected const el_func_t* func__get(void);
-#endif /* _h_fcns_c */
diff --git a/lib/libedit/help.h b/lib/libedit/help.h
deleted file mode 100644
index a7e89a1..0000000
--- a/lib/libedit/help.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Automatically generated file, do not edit */
-#ifndef _h_help_c
-#define _h_help_c
-protected const el_bindings_t *help__get(void);
-#endif /* _h_help_c */
diff --git a/lib/libedit/hist.h b/lib/libedit/hist.h
deleted file mode 100644
index 149e286..0000000
--- a/lib/libedit/hist.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)hist.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: hist.h,v 1.10 2003/08/07 16:44:31 agc Exp $
- * $FreeBSD: src/lib/libedit/hist.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.hist.c: History functions
- */
-#ifndef _h_el_hist
-#define	_h_el_hist
-
-#include "histedit.h"
-
-typedef int (*hist_fun_t)(ptr_t, HistEvent *, int, ...);
-
-typedef struct el_history_t {
-	char		*buf;		/* The history buffer		*/
-	size_t		sz;		/* Size of history buffer	*/
-	char		*last;		/* The last character		*/
-	int		 eventno;	/* Event we are looking for	*/
-	ptr_t		 ref;		/* Argument for history fcns	*/
-	hist_fun_t	 fun;		/* Event access			*/
-	HistEvent	 ev;		/* Event cookie			*/
-} el_history_t;
-
-#define	HIST_FUN(el, fn, arg)	\
-    ((((*(el)->el_history.fun) ((el)->el_history.ref, &(el)->el_history.ev, \
-	fn, arg)) == -1) ? NULL : (el)->el_history.ev.str)
-
-#define	HIST_NEXT(el)		HIST_FUN(el, H_NEXT, NULL)
-#define	HIST_FIRST(el)		HIST_FUN(el, H_FIRST, NULL)
-#define	HIST_LAST(el)		HIST_FUN(el, H_LAST, NULL)
-#define	HIST_PREV(el)		HIST_FUN(el, H_PREV, NULL)
-#define	HIST_SET(el, num)	HIST_FUN(el, H_SET, num)
-#define	HIST_LOAD(el, fname)	HIST_FUN(el, H_LOAD fname)
-#define	HIST_SAVE(el, fname)	HIST_FUN(el, H_SAVE fname)
-
-protected int		hist_init(EditLine *);
-protected void		hist_end(EditLine *);
-protected el_action_t	hist_get(EditLine *);
-protected int		hist_set(EditLine *, hist_fun_t, ptr_t);
-protected int		hist_command(EditLine *, int, const char **);
-protected int		hist_enlargebuf(EditLine *, size_t, size_t);
-
-#endif /* _h_el_hist */
diff --git a/lib/libedit/key.h b/lib/libedit/key.h
deleted file mode 100644
index 848553e..0000000
--- a/lib/libedit/key.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)key.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: key.h,v 1.8 2003/08/07 16:44:32 agc Exp $
- * $FreeBSD: src/lib/libedit/key.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.key.h: Key macro header
- */
-#ifndef _h_el_key
-#define	_h_el_key
-
-typedef union key_value_t {
-	el_action_t	 cmd;	/* If it is a command the #	*/
-	char		*str;	/* If it is a string...		*/
-} key_value_t;
-
-typedef struct key_node_t key_node_t;
-
-typedef struct el_key_t {
-	char		*buf;	/* Key print buffer		*/
-	key_node_t	*map;	/* Key map			*/
-	key_value_t	 val;	/* Local conversion buffer	*/
-} el_key_t;
-
-#define	XK_CMD	0
-#define	XK_STR	1
-#define	XK_NOD	2
-#define	XK_EXE	3
-
-#include <term.h>
-
-#undef key_end
-#undef key_clear
-#undef key_print
-
-protected int		 key_init(EditLine *);
-protected void		 key_end(EditLine *);
-protected key_value_t	*key_map_cmd(EditLine *, int);
-protected key_value_t	*key_map_str(EditLine *, char *);
-protected void		 key_reset(EditLine *);
-protected int		 key_get(EditLine *, char *, key_value_t *);
-protected void		 key_add(EditLine *, const char *, key_value_t *, int);
-protected void		 key_clear(EditLine *, el_action_t *, const char *);
-protected int		 key_delete(EditLine *, const char *);
-protected void		 key_print(EditLine *, const char *);
-protected void	         key_kprint(EditLine *, const char *, key_value_t *,
-    int);
-protected char		*key__decode_str(const char *, char *, const char *);
-
-#endif /* _h_el_key */
diff --git a/lib/libedit/map.h b/lib/libedit/map.h
deleted file mode 100644
index e271259..0000000
--- a/lib/libedit/map.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)map.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: map.h,v 1.8 2003/08/07 16:44:32 agc Exp $
- * $FreeBSD: src/lib/libedit/map.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.map.h:	Editor maps
- */
-#ifndef _h_el_map
-#define	_h_el_map
-
-typedef struct el_bindings_t {	/* for the "bind" shell command */
-	const char	*name;		/* function name for bind command */
-	int		 func;		/* function numeric value */
-	const char	*description;	/* description of function */
-} el_bindings_t;
-
-
-typedef struct el_map_t {
-	el_action_t	*alt;		/* The current alternate key map */
-	el_action_t	*key;		/* The current normal key map	*/
-	el_action_t	*current;	/* The keymap we are using	*/
-	const el_action_t *emacs;	/* The default emacs key map	*/
-	const el_action_t *vic;		/* The vi command mode key map	*/
-	const el_action_t *vii;		/* The vi insert mode key map	*/
-	int		 type;		/* Emacs or vi			*/
-	el_bindings_t	*help;		/* The help for the editor functions */
-	el_func_t	*func;		/* List of available functions	*/
-	int		 nfunc;		/* The number of functions/help items */
-} el_map_t;
-
-#define	MAP_EMACS	0
-#define	MAP_VI		1
-
-protected int	map_bind(EditLine *, int, const char **);
-protected int	map_init(EditLine *);
-protected void	map_end(EditLine *);
-protected void	map_init_vi(EditLine *);
-protected void	map_init_emacs(EditLine *);
-protected int	map_set_editor(EditLine *, char *);
-protected int	map_get_editor(EditLine *, const char **);
-protected int	map_addfunc(EditLine *, const char *, const char *, el_func_t);
-
-#endif /* _h_el_map */
diff --git a/lib/libedit/parse.h b/lib/libedit/parse.h
deleted file mode 100644
index 0fdfd79..0000000
--- a/lib/libedit/parse.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)parse.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: parse.h,v 1.6 2005/05/29 04:58:15 lukem Exp $
- * $FreeBSD: src/lib/libedit/parse.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.parse.h: Parser functions
- */
-#ifndef _h_el_parse
-#define	_h_el_parse
-
-protected int	 parse_line(EditLine *, const char *);
-protected int	 parse__escape(const char **);
-protected char	*parse__string(char *, const char *);
-protected int	 parse_cmd(EditLine *, const char *);
-
-#endif /* _h_el_parse */
diff --git a/lib/libedit/prompt.h b/lib/libedit/prompt.h
deleted file mode 100644
index 7d50318..0000000
--- a/lib/libedit/prompt.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)prompt.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: prompt.h,v 1.6 2003/08/07 16:44:32 agc Exp $
- * $FreeBSD: src/lib/libedit/prompt.h,v 1.2.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.prompt.h: Prompt printing stuff
- */
-#ifndef _h_el_prompt
-#define	_h_el_prompt
-
-#include "histedit.h"
-
-typedef char * (*el_pfunc_t)(EditLine*);
-
-typedef struct el_prompt_t {
-	el_pfunc_t	p_func;	/* Function to return the prompt	*/
-	coord_t		p_pos;	/* position in the line after prompt	*/
-} el_prompt_t;
-
-protected void	prompt_print(EditLine *, int);
-protected int	prompt_set(EditLine *, el_pfunc_t, int);
-protected int	prompt_get(EditLine *, el_pfunc_t *, int);
-protected int	prompt_init(EditLine *);
-protected void	prompt_end(EditLine *);
-
-#endif /* _h_el_prompt */
diff --git a/lib/libedit/read.c b/lib/libedit/read.c
deleted file mode 100644
index 6817b1b..0000000
--- a/lib/libedit/read.c
+++ /dev/null
@@ -1,610 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	$NetBSD: read.c,v 1.39 2005/08/02 12:11:14 christos Exp $
- */
-
-#if !defined(lint) && !defined(SCCSID)
-static char sccsid[] = "@(#)read.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint && not SCCSID */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libedit/read.c,v 1.11.14.1 2005/10/09 03:44:01 delphij Exp $");
-
-/*
- * read.c: Clean this junk up! This is horrible code.
- *	   Terminal read functions
- */
-#include "sys.h"
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include "el.h"
-
-#define	OKCMD	-1
-
-private int	read__fixio(int, int);
-private int	read_preread(EditLine *);
-private int	read_char(EditLine *, char *);
-private int	read_getcmd(EditLine *, el_action_t *, char *);
-
-/* read_init():
- *	Initialize the read stuff
- */
-protected int
-read_init(EditLine *el)
-{
-	/* builtin read_char */
-	el->el_read.read_char = read_char;
-	return 0;
-}
-
-
-/* el_read_setfn():
- *	Set the read char function to the one provided.
- *	If it is set to EL_BUILTIN_GETCFN, then reset to the builtin one.
- */
-protected int
-el_read_setfn(EditLine *el, el_rfunc_t rc)
-{
-	el->el_read.read_char = (rc == EL_BUILTIN_GETCFN) ? read_char : rc;
-	return 0;
-}
-
-
-/* el_read_getfn():
- *	return the current read char function, or EL_BUILTIN_GETCFN
- *	if it is the default one
- */
-protected el_rfunc_t
-el_read_getfn(EditLine *el)
-{
-       return (el->el_read.read_char == read_char) ?
-	    EL_BUILTIN_GETCFN : el->el_read.read_char;
-}
-
-
-#ifndef MIN
-#define MIN(A,B) ((A) < (B) ? (A) : (B))
-#endif
-
-#ifdef DEBUG_EDIT
-private void
-read_debug(EditLine *el)
-{
-
-	if (el->el_line.cursor > el->el_line.lastchar)
-		(void) fprintf(el->el_errfile, "cursor > lastchar\r\n");
-	if (el->el_line.cursor < el->el_line.buffer)
-		(void) fprintf(el->el_errfile, "cursor < buffer\r\n");
-	if (el->el_line.cursor > el->el_line.limit)
-		(void) fprintf(el->el_errfile, "cursor > limit\r\n");
-	if (el->el_line.lastchar > el->el_line.limit)
-		(void) fprintf(el->el_errfile, "lastchar > limit\r\n");
-	if (el->el_line.limit != &el->el_line.buffer[EL_BUFSIZ - 2])
-		(void) fprintf(el->el_errfile, "limit != &buffer[EL_BUFSIZ-2]\r\n");
-}
-#endif /* DEBUG_EDIT */
-
-
-/* read__fixio():
- *	Try to recover from a read error
- */
-/* ARGSUSED */
-private int
-read__fixio(int fd __unused, int e)
-{
-
-	switch (e) {
-	case -1:		/* Make sure that the code is reachable */
-
-#ifdef EWOULDBLOCK
-	case EWOULDBLOCK:
-#ifndef TRY_AGAIN
-#define	TRY_AGAIN
-#endif
-#endif /* EWOULDBLOCK */
-
-#if defined(POSIX) && defined(EAGAIN)
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	case EAGAIN:
-#ifndef TRY_AGAIN
-#define	TRY_AGAIN
-#endif
-#endif /* EWOULDBLOCK && EWOULDBLOCK != EAGAIN */
-#endif /* POSIX && EAGAIN */
-
-		e = 0;
-#ifdef TRY_AGAIN
-#if defined(F_SETFL) && defined(O_NDELAY)
-		if ((e = fcntl(fd, F_GETFL, 0)) == -1)
-			return (-1);
-
-		if (fcntl(fd, F_SETFL, e & ~O_NDELAY) == -1)
-			return (-1);
-		else
-			e = 1;
-#endif /* F_SETFL && O_NDELAY */
-
-#ifdef FIONBIO
-		{
-			int zero = 0;
-
-			if (ioctl(fd, FIONBIO, (ioctl_t) & zero) == -1)
-				return (-1);
-			else
-				e = 1;
-		}
-#endif /* FIONBIO */
-
-#endif /* TRY_AGAIN */
-		return (e ? 0 : -1);
-
-	case EINTR:
-		return (0);
-
-	default:
-		return (-1);
-	}
-}
-
-
-/* read_preread():
- *	Try to read the stuff in the input queue;
- */
-private int
-read_preread(EditLine *el)
-{
-	int chrs = 0;
-
-	if (el->el_tty.t_mode == ED_IO)
-		return (0);
-
-#ifdef FIONREAD
-	(void) ioctl(el->el_infd, FIONREAD, (ioctl_t) & chrs);
-	if (chrs > 0) {
-		char buf[EL_BUFSIZ];
-
-		chrs = read(el->el_infd, buf,
-		    (size_t) MIN(chrs, EL_BUFSIZ - 1));
-		if (chrs > 0) {
-			buf[chrs] = '\0';
-			el_push(el, buf);
-		}
-	}
-#endif /* FIONREAD */
-
-	return (chrs > 0);
-}
-
-
-/* el_push():
- *	Push a macro
- */
-public void
-el_push(EditLine *el, char *str)
-{
-	c_macro_t *ma = &el->el_chared.c_macro;
-
-	if (str != NULL && ma->level + 1 < EL_MAXMACRO) {
-		ma->level++;
-		if ((ma->macro[ma->level] = el_strdup(str)) != NULL)
-			return;
-		ma->level--;
-	}
-	term_beep(el);
-	term__flush();
-}
-
-
-/* read_getcmd():
- *	Return next command from the input stream.
- */
-private int
-read_getcmd(EditLine *el, el_action_t *cmdnum, char *ch)
-{
-	el_action_t cmd;
-	int num;
-
-	do {
-		if ((num = el_getc(el, ch)) != 1)	/* if EOF or error */
-			return (num);
-
-#ifdef	KANJI
-		if ((*ch & 0200)) {
-			el->el_state.metanext = 0;
-			cmd = CcViMap[' '];
-			break;
-		} else
-#endif /* KANJI */
-
-		if (el->el_state.metanext) {
-			el->el_state.metanext = 0;
-			*ch |= 0200;
-		}
-		cmd = el->el_map.current[(unsigned char) *ch];
-		if (cmd == ED_SEQUENCE_LEAD_IN) {
-			key_value_t val;
-			switch (key_get(el, ch, &val)) {
-			case XK_CMD:
-				cmd = val.cmd;
-				break;
-			case XK_STR:
-				el_push(el, val.str);
-				break;
-#ifdef notyet
-			case XK_EXE:
-				/* XXX: In the future to run a user function */
-				RunCommand(val.str);
-				break;
-#endif
-			default:
-				EL_ABORT((el->el_errfile, "Bad XK_ type \n"));
-				break;
-			}
-		}
-		if (el->el_map.alt == NULL)
-			el->el_map.current = el->el_map.key;
-	} while (cmd == ED_SEQUENCE_LEAD_IN);
-	*cmdnum = cmd;
-	return (OKCMD);
-}
-
-
-/* read_char():
- *	Read a character from the tty.
- */
-private int
-read_char(EditLine *el, char *cp)
-{
-	int num_read;
-	int tried = 0;
-
-	while ((num_read = read(el->el_infd, cp, 1)) == -1)
-		if (!tried && read__fixio(el->el_infd, errno) == 0)
-			tried = 1;
-		else {
-			*cp = '\0';
-			return (-1);
-		}
-
-	return (num_read);
-}
-
-
-/* el_getc():
- *	Read a character
- */
-public int
-el_getc(EditLine *el, char *cp)
-{
-	int num_read;
-	c_macro_t *ma = &el->el_chared.c_macro;
-
-	term__flush();
-	for (;;) {
-		if (ma->level < 0) {
-			if (!read_preread(el))
-				break;
-		}
-		if (ma->level < 0)
-			break;
-
-		if (ma->macro[ma->level][ma->offset] == '\0') {
-			el_free(ma->macro[ma->level--]);
-			ma->offset = 0;
-			continue;
-		}
-		*cp = ma->macro[ma->level][ma->offset++] & 0377;
-		if (ma->macro[ma->level][ma->offset] == '\0') {
-			/* Needed for QuoteMode On */
-			el_free(ma->macro[ma->level--]);
-			ma->offset = 0;
-		}
-		return (1);
-	}
-
-#ifdef DEBUG_READ
-	(void) fprintf(el->el_errfile, "Turning raw mode on\n");
-#endif /* DEBUG_READ */
-	if (tty_rawmode(el) < 0)/* make sure the tty is set up correctly */
-		return (0);
-
-#ifdef DEBUG_READ
-	(void) fprintf(el->el_errfile, "Reading a character\n");
-#endif /* DEBUG_READ */
-	num_read = (*el->el_read.read_char)(el, cp);
-#ifdef DEBUG_READ
-	(void) fprintf(el->el_errfile, "Got it %c\n", *cp);
-#endif /* DEBUG_READ */
-	return (num_read);
-}
-
-protected void
-read_prepare(EditLine *el)
-{
-	if (el->el_flags & HANDLE_SIGNALS)
-		sig_set(el);
-	if (el->el_flags & NO_TTY)
-		return;
-	if ((el->el_flags & (UNBUFFERED|EDIT_DISABLED)) == UNBUFFERED)
-		tty_rawmode(el);
-
-	/* This is relatively cheap, and things go terribly wrong if
-	   we have the wrong size. */
-	el_resize(el);
-	re_clear_display(el);	/* reset the display stuff */
-	ch_reset(el, 0);
-	re_refresh(el);		/* print the prompt */
-
-	if (el->el_flags & UNBUFFERED)
-		term__flush();
-}
-
-protected void
-read_finish(EditLine *el)
-{
-	if ((el->el_flags & UNBUFFERED) == 0)
-		(void) tty_cookedmode(el);
-	if (el->el_flags & HANDLE_SIGNALS)
-		sig_clr(el);
-}
-
-public const char *
-el_gets(EditLine *el, int *nread)
-{
-	int retval;
-	el_action_t cmdnum = 0;
-	int num;		/* how many chars we have read at NL */
-	char ch;
-	int crlf = 0;
-#ifdef FIONREAD
-	c_macro_t *ma = &el->el_chared.c_macro;
-#endif /* FIONREAD */
-
-	if (el->el_flags & NO_TTY) {
-		char *cp = el->el_line.buffer;
-		size_t idx;
-
-		while ((*el->el_read.read_char)(el, cp) == 1) {
-			/* make sure there is space for next character */
-			if (cp + 1 >= el->el_line.limit) {
-				idx = (cp - el->el_line.buffer);
-				if (!ch_enlargebufs(el, 2))
-					break;
-				cp = &el->el_line.buffer[idx];
-			}
-			cp++;
-			if (el->el_flags & UNBUFFERED)
-				break;
-			if (cp[-1] == '\r' || cp[-1] == '\n')
-				break;
-		}
-
-		el->el_line.cursor = el->el_line.lastchar = cp;
-		*cp = '\0';
-		if (nread)
-			*nread = el->el_line.cursor - el->el_line.buffer;
-		return (el->el_line.buffer);
-	}
-
-
-#ifdef FIONREAD
-	if (el->el_tty.t_mode == EX_IO && ma->level < 0) {
-		long chrs = 0;
-
-		(void) ioctl(el->el_infd, FIONREAD, (ioctl_t) & chrs);
-		if (chrs == 0) {
-			if (tty_rawmode(el) < 0) {
-				if (nread)
-					*nread = 0;
-				return (NULL);
-			}
-		}
-	}
-#endif /* FIONREAD */
-
-	if ((el->el_flags & UNBUFFERED) == 0)
-		read_prepare(el);
-
-	if (el->el_flags & EDIT_DISABLED) {
-		char *cp;
-		size_t idx;
-		if ((el->el_flags & UNBUFFERED) == 0)
-			cp = el->el_line.buffer;
-		else
-			cp = el->el_line.lastchar;
-
-		term__flush();
-
-		while ((*el->el_read.read_char)(el, cp) == 1) {
-			/* make sure there is space next character */
-			if (cp + 1 >= el->el_line.limit) {
-				idx = (cp - el->el_line.buffer);
-				if (!ch_enlargebufs(el, 2))
-					break;
-				cp = &el->el_line.buffer[idx];
-			}
-			if (*cp == 4)	/* ought to be stty eof */
-				break;
-			cp++;
-			crlf = cp[-1] == '\r' || cp[-1] == '\n';
-			if (el->el_flags & UNBUFFERED)
-				break;
-			if (crlf)
-				break;
-		}
-
-		el->el_line.cursor = el->el_line.lastchar = cp;
-		*cp = '\0';
-		if (nread)
-			*nread = el->el_line.cursor - el->el_line.buffer;
-		return (el->el_line.buffer);
-	}
-
-	for (num = OKCMD; num == OKCMD;) {	/* while still editing this
-						 * line */
-#ifdef DEBUG_EDIT
-		read_debug(el);
-#endif /* DEBUG_EDIT */
-		/* if EOF or error */
-		if ((num = read_getcmd(el, &cmdnum, &ch)) != OKCMD) {
-#ifdef DEBUG_READ
-			(void) fprintf(el->el_errfile,
-			    "Returning from el_gets %d\n", num);
-#endif /* DEBUG_READ */
-			break;
-		}
-		if ((unsigned int)cmdnum >= el->el_map.nfunc) {	/* BUG CHECK command */
-#ifdef DEBUG_EDIT
-			(void) fprintf(el->el_errfile,
-			    "ERROR: illegal command from key 0%o\r\n", ch);
-#endif /* DEBUG_EDIT */
-			continue;	/* try again */
-		}
-		/* now do the real command */
-#ifdef DEBUG_READ
-		{
-			el_bindings_t *b;
-			for (b = el->el_map.help; b->name; b++)
-				if (b->func == cmdnum)
-					break;
-			if (b->name)
-				(void) fprintf(el->el_errfile,
-				    "Executing %s\n", b->name);
-			else
-				(void) fprintf(el->el_errfile,
-				    "Error command = %d\n", cmdnum);
-		}
-#endif /* DEBUG_READ */
-		/* vi redo needs these way down the levels... */
-		el->el_state.thiscmd = cmdnum;
-		el->el_state.thisch = ch;
-		if (el->el_map.type == MAP_VI &&
-		    el->el_map.current == el->el_map.key &&
-		    el->el_chared.c_redo.pos < el->el_chared.c_redo.lim) {
-			if (cmdnum == VI_DELETE_PREV_CHAR &&
-			    el->el_chared.c_redo.pos != el->el_chared.c_redo.buf
-			    && isprint((unsigned char)el->el_chared.c_redo.pos[-1]))
-				el->el_chared.c_redo.pos--;
-			else
-				*el->el_chared.c_redo.pos++ = ch;
-		}
-		retval = (*el->el_map.func[cmdnum]) (el, ch);
-#ifdef DEBUG_READ
-		(void) fprintf(el->el_errfile,
-			"Returned state %d\n", retval );
-#endif /* DEBUG_READ */
-
-		/* save the last command here */
-		el->el_state.lastcmd = cmdnum;
-
-		/* use any return value */
-		switch (retval) {
-		case CC_CURSOR:
-			re_refresh_cursor(el);
-			break;
-
-		case CC_REDISPLAY:
-			re_clear_lines(el);
-			re_clear_display(el);
-			/* FALLTHROUGH */
-
-		case CC_REFRESH:
-			re_refresh(el);
-			break;
-
-		case CC_REFRESH_BEEP:
-			re_refresh(el);
-			term_beep(el);
-			break;
-
-		case CC_NORM:	/* normal char */
-			break;
-
-		case CC_ARGHACK:	/* Suggested by Rich Salz */
-			/* <rsalz@pineapple.bbn.com> */
-			continue;	/* keep going... */
-
-		case CC_EOF:	/* end of file typed */
-			if ((el->el_flags & UNBUFFERED) == 0)
-				num = 0;
-			else if (num == -1) {
-				*el->el_line.lastchar++ = CONTROL('d');
-				el->el_line.cursor = el->el_line.lastchar;
-				num = 1;
-			}
-			break;
-
-		case CC_NEWLINE:	/* normal end of line */
-			num = el->el_line.lastchar - el->el_line.buffer;
-			break;
-
-		case CC_FATAL:	/* fatal error, reset to known state */
-#ifdef DEBUG_READ
-			(void) fprintf(el->el_errfile,
-			    "*** editor fatal ERROR ***\r\n\n");
-#endif /* DEBUG_READ */
-			/* put (real) cursor in a known place */
-			re_clear_display(el);	/* reset the display stuff */
-			ch_reset(el, 1);	/* reset the input pointers */
-			re_refresh(el);	/* print the prompt again */
-			break;
-
-		case CC_ERROR:
-		default:	/* functions we don't know about */
-#ifdef DEBUG_READ
-			(void) fprintf(el->el_errfile,
-			    "*** editor ERROR ***\r\n\n");
-#endif /* DEBUG_READ */
-			term_beep(el);
-			term__flush();
-			break;
-		}
-		el->el_state.argument = 1;
-		el->el_state.doingarg = 0;
-		el->el_chared.c_vcmd.action = NOP;
-		if (el->el_flags & UNBUFFERED)
-			break;
-	}
-
-	term__flush();		/* flush any buffered output */
-	/* make sure the tty is set up correctly */
-	if ((el->el_flags & UNBUFFERED) == 0) {
-		read_finish(el);
-		if (nread)
-			*nread = num;
-	} else {
-		if (nread)
-			*nread = el->el_line.lastchar - el->el_line.buffer;
-	}
-	return (num ? el->el_line.buffer : NULL);
-}
diff --git a/lib/libedit/read.h b/lib/libedit/read.h
deleted file mode 100644
index 9bb5eac..0000000
--- a/lib/libedit/read.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*-
- * Copyright (c) 2001 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Anthony Mallet.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- *
- *	$NetBSD: read.h,v 1.4 2004/02/27 14:52:18 christos Exp $
- * $FreeBSD: src/lib/libedit/read.h,v 1.1.2.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.read.h: Character reading functions
- */
-#ifndef	_h_el_read
-#define	_h_el_read
-
-typedef int (*el_rfunc_t)(EditLine *, char *);
-
-typedef struct el_read_t {
-	el_rfunc_t	read_char;	/* Function to read a character */
-} el_read_t;
- 
-protected int		read_init(EditLine *);
-protected void		read_prepare(EditLine *);
-protected void		read_finish(EditLine *);
-protected int		el_read_setfn(EditLine *, el_rfunc_t);
-protected el_rfunc_t	el_read_getfn(EditLine *);
-
-#endif /* _h_el_read */
diff --git a/lib/libedit/refresh.h b/lib/libedit/refresh.h
deleted file mode 100644
index 9496995..0000000
--- a/lib/libedit/refresh.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)refresh.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: refresh.h,v 1.5 2003/08/07 16:44:33 agc Exp $
- * $FreeBSD: src/lib/libedit/refresh.h,v 1.2.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.refresh.h: Screen refresh functions
- */
-#ifndef _h_el_refresh
-#define	_h_el_refresh
-
-#include "histedit.h"
-
-typedef struct {
-	coord_t	r_cursor;	/* Refresh cursor position	*/
-	int	r_oldcv;	/* Vertical locations		*/
-	int	r_newcv;
-} el_refresh_t;
-
-protected void	re_putc(EditLine *, int, int);
-protected void	re_clear_lines(EditLine *);
-protected void	re_clear_display(EditLine *);
-protected void	re_refresh(EditLine *);
-protected void	re_refresh_cursor(EditLine *);
-protected void	re_fastaddc(EditLine *);
-protected void	re_goto_bottom(EditLine *);
-
-#endif /* _h_el_refresh */
diff --git a/lib/libedit/search.h b/lib/libedit/search.h
deleted file mode 100644
index 2b63675..0000000
--- a/lib/libedit/search.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)search.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: search.h,v 1.8 2003/10/18 23:27:36 christos Exp $
- * $FreeBSD: src/lib/libedit/search.h,v 1.3.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.search.h: Line and history searching utilities
- */
-#ifndef _h_el_search
-#define	_h_el_search
-
-#include "histedit.h"
-
-typedef struct el_search_t {
-	char	*patbuf;		/* The pattern buffer		*/
-	size_t	 patlen;		/* Length of the pattern buffer	*/
-	int	 patdir;		/* Direction of the last search	*/
-	int	 chadir;		/* Character search direction	*/
-	char	 chacha;		/* Character we are looking for	*/
-	char	 chatflg;		/* 0 if f, 1 if t */
-} el_search_t;
-
-
-protected int		el_match(const char *, const char *);
-protected int		search_init(EditLine *);
-protected void		search_end(EditLine *);
-protected int		c_hmatch(EditLine *, const char *);
-protected void		c_setpat(EditLine *);
-protected el_action_t	ce_inc_search(EditLine *, int);
-protected el_action_t	cv_search(EditLine *, int);
-protected el_action_t	ce_search_line(EditLine *, int);
-protected el_action_t	cv_repeat_srch(EditLine *, int);
-protected el_action_t	cv_csearch(EditLine *, int, int, int, int);
-
-#endif /* _h_el_search */
diff --git a/lib/libedit/sig.h b/lib/libedit/sig.h
deleted file mode 100644
index 23cb9ab..0000000
--- a/lib/libedit/sig.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)sig.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: sig.h,v 1.5 2003/08/07 16:44:33 agc Exp $
- * $FreeBSD: src/lib/libedit/sig.h,v 1.2.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.sig.h: Signal handling functions
- */
-#ifndef _h_el_sig
-#define	_h_el_sig
-
-#include <signal.h>
-
-#include "histedit.h"
-
-/*
- * Define here all the signals we are going to handle
- * The _DO macro is used to iterate in the source code
- */
-#define	ALLSIGS		\
-	_DO(SIGINT)	\
-	_DO(SIGTSTP)	\
-	_DO(SIGSTOP)	\
-	_DO(SIGQUIT)	\
-	_DO(SIGHUP)	\
-	_DO(SIGTERM)	\
-	_DO(SIGCONT)	\
-	_DO(SIGWINCH)
-
-typedef void (*el_signalhandler_t)(int);
-typedef el_signalhandler_t *el_signal_t;
-
-protected void	sig_end(EditLine*);
-protected int	sig_init(EditLine*);
-protected void	sig_set(EditLine*);
-protected void	sig_clr(EditLine*);
-
-#endif /* _h_el_sig */
diff --git a/lib/libedit/sys.h b/lib/libedit/sys.h
deleted file mode 100644
index 162efae..0000000
--- a/lib/libedit/sys.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)sys.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: sys.h,v 1.9 2004/01/17 17:57:40 christos Exp $
- * $FreeBSD: src/lib/libedit/sys.h,v 1.4.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * sys.h: Put all the stupid compiler and system dependencies here...
- */
-#ifndef _h_sys
-#define	_h_sys
-
-#include <sys/cdefs.h>
-
-#ifndef public
-# define public		/* Externally visible functions/variables */
-#endif
-
-#ifndef private
-# define private	static	/* Always hidden internals */
-#endif
-
-#ifndef protected
-# define protected	/* Redefined from elsewhere to "static" */
-			/* When we want to hide everything	*/
-#endif
-
-#ifndef _PTR_T
-# define _PTR_T
-typedef void	*ptr_t;
-#endif
-
-#ifndef _IOCTL_T
-# define _IOCTL_T
-typedef void	*ioctl_t;
-#endif
-
-#include <stdio.h>
-
-#define	REGEX		/* Use POSIX.2 regular expression functions */
-#undef	REGEXP		/* Use UNIX V8 regular expression functions */
-
-#ifdef notdef
-# undef REGEX
-# undef REGEXP
-# include <malloc.h>
-# ifdef __GNUC__
-/*
- * Broken hdrs.
- */
-extern int	tgetent(const char *bp, char *name);
-extern int	tgetflag(const char *id);
-extern int	tgetnum(const char *id);
-extern char    *tgetstr(const char *id, char **area);
-extern char    *tgoto(const char *cap, int col, int row);
-extern int	tputs(const char *str, int affcnt, int (*putc)(int));
-extern char    *getenv(const char *);
-extern int	fprintf(FILE *, const char *, ...);
-extern int	sigsetmask(int);
-extern int	sigblock(int);
-extern int	fputc(int, FILE *);
-extern int	fgetc(FILE *);
-extern int	fflush(FILE *);
-extern int	tolower(int);
-extern int	toupper(int);
-extern int	errno, sys_nerr;
-extern char	*sys_errlist[];
-extern void	perror(const char *);
-#  include <string.h>
-#  define strerror(e)	sys_errlist[e]
-# endif
-# ifdef SABER
-extern ptr_t    memcpy(ptr_t, const ptr_t, size_t);
-extern ptr_t    memset(ptr_t, int, size_t);
-# endif
-extern char    *fgetline(FILE *, int *);
-#endif
-
-#endif /* _h_sys */
diff --git a/lib/libedit/term.h b/lib/libedit/term.h
deleted file mode 100644
index 6e0301d..0000000
--- a/lib/libedit/term.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)term.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: term.h,v 1.16 2005/03/15 00:10:40 christos Exp $
- * $FreeBSD: src/lib/libedit/term.h,v 1.5.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.term.h: Termcap header
- */
-#ifndef _h_el_term
-#define	_h_el_term
-
-#include "histedit.h"
-
-typedef struct {		/* Symbolic function key bindings	*/
-	const char	*name;	/* name of the key			*/
-	int		 key;	/* Index in termcap table		*/
-	key_value_t	 fun;	/* Function bound to it			*/
-	int		 type;	/* Type of function			*/
-} fkey_t;
-
-typedef struct {
-	const char *t_name;		/* the terminal name	*/
-	coord_t	  t_size;		/* # lines and cols	*/
-	int	  t_flags;
-#define	TERM_CAN_INSERT		0x001	/* Has insert cap	*/
-#define	TERM_CAN_DELETE		0x002	/* Has delete cap	*/
-#define	TERM_CAN_CEOL		0x004	/* Has CEOL cap		*/
-#define	TERM_CAN_TAB		0x008	/* Can use tabs		*/
-#define	TERM_CAN_ME		0x010	/* Can turn all attrs.	*/
-#define	TERM_CAN_UP		0x020	/* Can move up		*/
-#define	TERM_HAS_META		0x040	/* Has a meta key	*/
-#define	TERM_HAS_AUTO_MARGINS	0x080	/* Has auto margins	*/
-#define	TERM_HAS_MAGIC_MARGINS	0x100	/* Has magic margins	*/
-	char	 *t_buf;		/* Termcap buffer	*/
-	int	  t_loc;		/* location used	*/
-	char	**t_str;		/* termcap strings	*/
-	int	 *t_val;		/* termcap values	*/
-	char	 *t_cap;		/* Termcap buffer	*/
-	fkey_t	 *t_fkey;		/* Array of keys	*/
-} el_term_t;
-
-/*
- * fKey indexes
- */
-#define	A_K_DN		0
-#define	A_K_UP		1
-#define	A_K_LT		2
-#define	A_K_RT		3
-#define	A_K_HO		4
-#define	A_K_EN		5
-#define	A_K_NKEYS	6
-
-protected void	term_move_to_line(EditLine *, int);
-protected void	term_move_to_char(EditLine *, int);
-protected void	term_clear_EOL(EditLine *, int);
-protected void	term_overwrite(EditLine *, const char *, int);
-protected void	term_insertwrite(EditLine *, char *, int);
-protected void	term_deletechars(EditLine *, int);
-protected void	term_clear_screen(EditLine *);
-protected void	term_beep(EditLine *);
-protected int	term_change_size(EditLine *, int, int);
-protected int	term_get_size(EditLine *, int *, int *);
-protected int	term_init(EditLine *);
-protected void	term_bind_arrow(EditLine *);
-protected void	term_print_arrow(EditLine *, const char *);
-protected int	term_clear_arrow(EditLine *, const char *);
-protected int	term_set_arrow(EditLine *, const char *, key_value_t *, int);
-protected void	term_end(EditLine *);
-protected void	term_get(EditLine *, const char **);
-protected int	term_set(EditLine *, const char *);
-protected int	term_settc(EditLine *, int, const char **);
-protected int	term_telltc(EditLine *, int, const char **);
-protected int	term_echotc(EditLine *, int, const char **);
-protected int	term__putc(int);
-protected void	term__flush(void);
-
-/*
- * Easy access macros
- */
-#define	EL_FLAGS	(el)->el_term.t_flags
-
-#define	EL_CAN_INSERT		(EL_FLAGS & TERM_CAN_INSERT)
-#define	EL_CAN_DELETE		(EL_FLAGS & TERM_CAN_DELETE)
-#define	EL_CAN_CEOL		(EL_FLAGS & TERM_CAN_CEOL)
-#define	EL_CAN_TAB		(EL_FLAGS & TERM_CAN_TAB)
-#define	EL_CAN_ME		(EL_FLAGS & TERM_CAN_ME)
-#define EL_CAN_UP		(EL_FLAGS & TERM_CAN_UP)
-#define	EL_HAS_META		(EL_FLAGS & TERM_HAS_META)
-#define	EL_HAS_AUTO_MARGINS	(EL_FLAGS & TERM_HAS_AUTO_MARGINS)
-#define	EL_HAS_MAGIC_MARGINS	(EL_FLAGS & TERM_HAS_MAGIC_MARGINS)
-
-#endif /* _h_el_term */
diff --git a/lib/libedit/tty.h b/lib/libedit/tty.h
deleted file mode 100644
index 3a3a0b8..0000000
--- a/lib/libedit/tty.h
+++ /dev/null
@@ -1,480 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Christos Zoulas of Cornell University.
- *
- * 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. 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.
- *
- *	@(#)tty.h	8.1 (Berkeley) 6/4/93
- *	$NetBSD: tty.h,v 1.11 2005/06/01 11:37:52 lukem Exp $
- * $FreeBSD: src/lib/libedit/tty.h,v 1.4.14.1 2005/10/09 03:44:01 delphij Exp $
- */
-
-/*
- * el.tty.h: Local terminal header
- */
-#ifndef _h_el_tty
-#define	_h_el_tty
-
-#include "histedit.h"
-#include <termios.h>
-#include <unistd.h>
-
-/* Define our own since everyone gets it wrong! */
-#define	CONTROL(A)	((A) & 037)
-
-/*
- * Aix compatible names
- */
-# if defined(VWERSE) && !defined(VWERASE)
-#  define VWERASE VWERSE
-# endif /* VWERSE && !VWERASE */
-
-# if defined(VDISCRD) && !defined(VDISCARD)
-#  define VDISCARD VDISCRD
-# endif /* VDISCRD && !VDISCARD */
-
-# if defined(VFLUSHO) && !defined(VDISCARD)
-#  define VDISCARD VFLUSHO
-# endif  /* VFLUSHO && VDISCARD */
-
-# if defined(VSTRT) && !defined(VSTART)
-#  define VSTART VSTRT
-# endif /* VSTRT && ! VSTART */
-
-# if defined(VSTAT) && !defined(VSTATUS)
-#  define VSTATUS VSTAT
-# endif /* VSTAT && ! VSTATUS */
-
-# ifndef ONLRET
-#  define ONLRET 0
-# endif /* ONLRET */
-
-# ifndef TAB3
-#  ifdef OXTABS
-#   define TAB3 OXTABS
-#  else
-#   define TAB3 0
-#  endif /* OXTABS */
-# endif /* !TAB3 */
-
-# if defined(OXTABS) && !defined(XTABS)
-#  define XTABS OXTABS
-# endif /* OXTABS && !XTABS */
-
-# ifndef ONLCR
-#  define ONLCR 0
-# endif /* ONLCR */
-
-# ifndef IEXTEN
-#  define IEXTEN 0
-# endif /* IEXTEN */
-
-# ifndef ECHOCTL
-#  define ECHOCTL 0
-# endif /* ECHOCTL */
-
-# ifndef PARENB
-#  define PARENB 0
-# endif /* PARENB */
-
-# ifndef EXTPROC
-#  define EXTPROC 0
-# endif /* EXTPROC */
-
-# ifndef FLUSHO
-#  define FLUSHO  0
-# endif /* FLUSHO */
-
-
-# if defined(VDISABLE) && !defined(_POSIX_VDISABLE)
-#  define _POSIX_VDISABLE VDISABLE
-# endif /* VDISABLE && ! _POSIX_VDISABLE */
-
-/*
- * Work around ISC's definition of IEXTEN which is
- * XCASE!
- */
-# ifdef ISC
-#  if defined(IEXTEN) && defined(XCASE)
-#   if IEXTEN == XCASE
-#    undef IEXTEN
-#    define IEXTEN 0
-#   endif /* IEXTEN == XCASE */
-#  endif /* IEXTEN && XCASE */
-#  if defined(IEXTEN) && !defined(XCASE)
-#   define XCASE IEXTEN
-#   undef IEXTEN
-#   define IEXTEN 0
-#  endif /* IEXTEN && !XCASE */
-# endif /* ISC */
-
-/*
- * Work around convex weirdness where turning off IEXTEN makes us
- * lose all postprocessing!
- */
-#if defined(convex) || defined(__convex__)
-# if defined(IEXTEN) && IEXTEN != 0
-#  undef IEXTEN
-#  define IEXTEN 0
-# endif /* IEXTEN != 0 */
-#endif /* convex || __convex__ */
-
-/*
- * So that we don't lose job control.
- */
-#ifdef __SVR4
-# undef CSWTCH
-#endif
-
-#ifndef _POSIX_VDISABLE
-# define _POSIX_VDISABLE ((unsigned char) -1)
-#endif /* _POSIX_VDISABLE */
-
-#if !defined(CREPRINT) && defined(CRPRNT)
-# define CREPRINT CRPRNT
-#endif /* !CREPRINT && CRPRNT */
-#if !defined(CDISCARD) && defined(CFLUSH)
-# define CDISCARD CFLUSH
-#endif /* !CDISCARD && CFLUSH */
-
-#ifndef CINTR
-# define CINTR		CONTROL('c')
-#endif /* CINTR */
-#ifndef CQUIT
-# define CQUIT		034	/* ^\ */
-#endif /* CQUIT */
-#ifndef CERASE
-# define CERASE		0177	/* ^? */
-#endif /* CERASE */
-#ifndef CKILL
-# define CKILL		CONTROL('u')
-#endif /* CKILL */
-#ifndef CEOF
-# define CEOF		CONTROL('d')
-#endif /* CEOF */
-#ifndef CEOL
-# define CEOL		_POSIX_VDISABLE
-#endif /* CEOL */
-#ifndef CEOL2
-# define CEOL2		_POSIX_VDISABLE
-#endif /* CEOL2 */
-#ifndef CSWTCH
-# define CSWTCH		_POSIX_VDISABLE
-#endif /* CSWTCH */
-#ifndef CDSWTCH
-# define CDSWTCH	_POSIX_VDISABLE
-#endif /* CDSWTCH */
-#ifndef CERASE2
-# define CERASE2	_POSIX_VDISABLE
-#endif /* CERASE2 */
-#ifndef CSTART
-# define CSTART		CONTROL('q')
-#endif /* CSTART */
-#ifndef CSTOP
-# define CSTOP		CONTROL('s')
-#endif /* CSTOP */
-#ifndef CSUSP
-# define CSUSP		CONTROL('z')
-#endif /* CSUSP */
-#ifndef CDSUSP
-# define CDSUSP		CONTROL('y')
-#endif /* CDSUSP */
-
-#ifdef hpux
-
-# ifndef CREPRINT
-#  define CREPRINT	_POSIX_VDISABLE
-# endif /* CREPRINT */
-# ifndef CDISCARD
-#  define CDISCARD	_POSIX_VDISABLE
-# endif /* CDISCARD */
-# ifndef CLNEXT
-#  define CLNEXT	_POSIX_VDISABLE
-# endif /* CLNEXT */
-# ifndef CWERASE
-#  define CWERASE	_POSIX_VDISABLE
-# endif /* CWERASE */
-
-#else /* !hpux */
-
-# ifndef CREPRINT
-#  define CREPRINT	CONTROL('r')
-# endif /* CREPRINT */
-# ifndef CDISCARD
-#  define CDISCARD	CONTROL('o')
-# endif /* CDISCARD */
-# ifndef CLNEXT
-#  define CLNEXT	CONTROL('v')
-# endif /* CLNEXT */
-# ifndef CWERASE
-#  define CWERASE	CONTROL('w')
-# endif /* CWERASE */
-
-#endif /* hpux */
-
-#ifndef CSTATUS
-# define CSTATUS	CONTROL('t')
-#endif /* CSTATUS */
-#ifndef CPAGE
-# define CPAGE		' '
-#endif /* CPAGE */
-#ifndef CPGOFF
-# define CPGOFF		CONTROL('m')
-#endif /* CPGOFF */
-#ifndef CKILL2
-# define CKILL2		_POSIX_VDISABLE
-#endif /* CKILL2 */
-#ifndef CBRK
-# ifndef masscomp
-#  define CBRK		0377
-# else
-#  define CBRK		'\0'
-# endif /* masscomp */
-#endif /* CBRK */
-#ifndef CMIN
-# define CMIN		CEOF
-#endif /* CMIN */
-#ifndef CTIME
-# define CTIME		CEOL
-#endif /* CTIME */
-
-/*
- * Fix for sun inconsistency. On termio VSUSP and the rest of the
- * ttychars > NCC are defined. So we undefine them.
- */
-#if defined(TERMIO) || defined(POSIX)
-# if defined(POSIX) && defined(NCCS)
-#  define NUMCC		NCCS
-# else
-#  ifdef NCC
-#   define NUMCC	NCC
-#  endif /* NCC */
-# endif /* POSIX && NCCS */
-# ifdef NUMCC
-#  ifdef VINTR
-#   if NUMCC <= VINTR
-#    undef VINTR
-#   endif /* NUMCC <= VINTR */
-#  endif /* VINTR */
-#  ifdef VQUIT
-#   if NUMCC <= VQUIT
-#    undef VQUIT
-#   endif /* NUMCC <= VQUIT */
-#  endif /* VQUIT */
-#  ifdef VERASE
-#   if NUMCC <= VERASE
-#    undef VERASE
-#   endif /* NUMCC <= VERASE */
-#  endif /* VERASE */
-#  ifdef VKILL
-#   if NUMCC <= VKILL
-#    undef VKILL
-#   endif /* NUMCC <= VKILL */
-#  endif /* VKILL */
-#  ifdef VEOF
-#   if NUMCC <= VEOF
-#    undef VEOF
-#   endif /* NUMCC <= VEOF */
-#  endif /* VEOF */
-#  ifdef VEOL
-#   if NUMCC <= VEOL
-#    undef VEOL
-#   endif /* NUMCC <= VEOL */
-#  endif /* VEOL */
-#  ifdef VEOL2
-#   if NUMCC <= VEOL2
-#    undef VEOL2
-#   endif /* NUMCC <= VEOL2 */
-#  endif /* VEOL2 */
-#  ifdef VSWTCH
-#   if NUMCC <= VSWTCH
-#    undef VSWTCH
-#   endif /* NUMCC <= VSWTCH */
-#  endif /* VSWTCH */
-#  ifdef VDSWTCH
-#   if NUMCC <= VDSWTCH
-#    undef VDSWTCH
-#   endif /* NUMCC <= VDSWTCH */
-#  endif /* VDSWTCH */
-#  ifdef VERASE2
-#   if NUMCC <= VERASE2
-#    undef VERASE2
-#   endif /* NUMCC <= VERASE2 */
-#  endif /* VERASE2 */
-#  ifdef VSTART
-#   if NUMCC <= VSTART
-#    undef VSTART
-#   endif /* NUMCC <= VSTART */
-#  endif /* VSTART */
-#  ifdef VSTOP
-#   if NUMCC <= VSTOP
-#    undef VSTOP
-#   endif /* NUMCC <= VSTOP */
-#  endif /* VSTOP */
-#  ifdef VWERASE
-#   if NUMCC <= VWERASE
-#    undef VWERASE
-#   endif /* NUMCC <= VWERASE */
-#  endif /* VWERASE */
-#  ifdef VSUSP
-#   if NUMCC <= VSUSP
-#    undef VSUSP
-#   endif /* NUMCC <= VSUSP */
-#  endif /* VSUSP */
-#  ifdef VDSUSP
-#   if NUMCC <= VDSUSP
-#    undef VDSUSP
-#   endif /* NUMCC <= VDSUSP */
-#  endif /* VDSUSP */
-#  ifdef VREPRINT
-#   if NUMCC <= VREPRINT
-#    undef VREPRINT
-#   endif /* NUMCC <= VREPRINT */
-#  endif /* VREPRINT */
-#  ifdef VDISCARD
-#   if NUMCC <= VDISCARD
-#    undef VDISCARD
-#   endif /* NUMCC <= VDISCARD */
-#  endif /* VDISCARD */
-#  ifdef VLNEXT
-#   if NUMCC <= VLNEXT
-#    undef VLNEXT
-#   endif /* NUMCC <= VLNEXT */
-#  endif /* VLNEXT */
-#  ifdef VSTATUS
-#   if NUMCC <= VSTATUS
-#    undef VSTATUS
-#   endif /* NUMCC <= VSTATUS */
-#  endif /* VSTATUS */
-#  ifdef VPAGE
-#   if NUMCC <= VPAGE
-#    undef VPAGE
-#   endif /* NUMCC <= VPAGE */
-#  endif /* VPAGE */
-#  ifdef VPGOFF
-#   if NUMCC <= VPGOFF
-#    undef VPGOFF
-#   endif /* NUMCC <= VPGOFF */
-#  endif /* VPGOFF */
-#  ifdef VKILL2
-#   if NUMCC <= VKILL2
-#    undef VKILL2
-#   endif /* NUMCC <= VKILL2 */
-#  endif /* VKILL2 */
-#  ifdef VBRK
-#   if NUMCC <= VBRK
-#    undef VBRK
-#   endif /* NUMCC <= VBRK */
-#  endif /* VBRK */
-#  ifdef VMIN
-#   if NUMCC <= VMIN
-#    undef VMIN
-#   endif /* NUMCC <= VMIN */
-#  endif /* VMIN */
-#  ifdef VTIME
-#   if NUMCC <= VTIME
-#    undef VTIME
-#   endif /* NUMCC <= VTIME */
-#  endif /* VTIME */
-# endif /* NUMCC */
-#endif /* !POSIX */
-
-#define	C_INTR		 0
-#define	C_QUIT		 1
-#define	C_ERASE		 2
-#define	C_KILL		 3
-#define	C_EOF		 4
-#define	C_EOL		 5
-#define	C_EOL2		 6
-#define	C_SWTCH		 7
-#define	C_DSWTCH	 8
-#define	C_ERASE2	 9
-#define	C_START		10
-#define	C_STOP		11
-#define	C_WERASE	12
-#define	C_SUSP		13
-#define	C_DSUSP		14
-#define	C_REPRINT	15
-#define	C_DISCARD	16
-#define	C_LNEXT		17
-#define	C_STATUS	18
-#define	C_PAGE		19
-#define	C_PGOFF		20
-#define	C_KILL2		21
-#define	C_BRK		22
-#define	C_MIN		23
-#define	C_TIME		24
-#define	C_NCC		25
-#define	C_SH(A)		(1 << (A))
-
-/*
- * Terminal dependend data structures
- */
-#define	EX_IO	0	/* while we are executing	*/
-#define	ED_IO	1	/* while we are editing		*/
-#define	TS_IO	2	/* new mode from terminal	*/
-#define	QU_IO	2	/* used only for quoted chars	*/
-#define	NN_IO	3	/* The number of entries	*/
-
-#define	MD_INP	0
-#define	MD_OUT	1
-#define	MD_CTL	2
-#define	MD_LIN	3
-#define	MD_CHAR	4
-#define	MD_NN	5
-
-typedef struct {
-	const char	*t_name;
-	unsigned int	 t_setmask;
-	unsigned int	 t_clrmask;
-} ttyperm_t[NN_IO][MD_NN];
-
-typedef unsigned char ttychar_t[NN_IO][C_NCC];
-
-protected int	tty_init(EditLine *);
-protected void	tty_end(EditLine *);
-protected int	tty_stty(EditLine *, int, const char **);
-protected int	tty_rawmode(EditLine *);
-protected int	tty_cookedmode(EditLine *);
-protected int	tty_quotemode(EditLine *);
-protected int	tty_noquotemode(EditLine *);
-protected void	tty_bind_char(EditLine *, int);
-
-typedef struct {
-    ttyperm_t t_t;
-    ttychar_t t_c;
-    struct termios t_ex, t_ed, t_ts;
-    int t_tabs;
-    int t_eight;
-    speed_t t_speed;
-    int t_mode;
-    unsigned char t_vdisable;
-} el_tty_t;
-
-
-#endif /* _h_el_tty */
diff --git a/lib/libedit/vi.h b/lib/libedit/vi.h
deleted file mode 100644
index fec33b4..0000000
--- a/lib/libedit/vi.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Automatically generated file, do not edit */
-#ifndef _h_vi_c
-#define _h_vi_c
-protected el_action_t	vi_paste_next (EditLine *, int);
-protected el_action_t	vi_paste_prev (EditLine *, int);
-protected el_action_t	vi_prev_big_word (EditLine *, int);
-protected el_action_t	vi_prev_word (EditLine *, int);
-protected el_action_t	vi_next_big_word (EditLine *, int);
-protected el_action_t	vi_next_word (EditLine *, int);
-protected el_action_t	vi_change_case (EditLine *, int);
-protected el_action_t	vi_change_meta (EditLine *, int);
-protected el_action_t	vi_insert_at_bol (EditLine *, int);
-protected el_action_t	vi_replace_char (EditLine *, int);
-protected el_action_t	vi_replace_mode (EditLine *, int);
-protected el_action_t	vi_substitute_char (EditLine *, int);
-protected el_action_t	vi_substitute_line (EditLine *, int);
-protected el_action_t	vi_change_to_eol (EditLine *, int);
-protected el_action_t	vi_insert (EditLine *, int);
-protected el_action_t	vi_add (EditLine *, int);
-protected el_action_t	vi_add_at_eol (EditLine *, int);
-protected el_action_t	vi_delete_meta (EditLine *, int);
-protected el_action_t	vi_end_big_word (EditLine *, int);
-protected el_action_t	vi_end_word (EditLine *, int);
-protected el_action_t	vi_undo (EditLine *, int);
-protected el_action_t	vi_command_mode (EditLine *, int);
-protected el_action_t	vi_zero (EditLine *, int);
-protected el_action_t	vi_delete_prev_char (EditLine *, int);
-protected el_action_t	vi_list_or_eof (EditLine *, int);
-protected el_action_t	vi_kill_line_prev (EditLine *, int);
-protected el_action_t	vi_search_prev (EditLine *, int);
-protected el_action_t	vi_search_next (EditLine *, int);
-protected el_action_t	vi_repeat_search_next (EditLine *, int);
-protected el_action_t	vi_repeat_search_prev (EditLine *, int);
-protected el_action_t	vi_next_char (EditLine *, int);
-protected el_action_t	vi_prev_char (EditLine *, int);
-protected el_action_t	vi_to_next_char (EditLine *, int);
-protected el_action_t	vi_to_prev_char (EditLine *, int);
-protected el_action_t	vi_repeat_next_char (EditLine *, int);
-protected el_action_t	vi_repeat_prev_char (EditLine *, int);
-protected el_action_t	vi_match (EditLine *, int);
-protected el_action_t	vi_undo_line (EditLine *, int);
-protected el_action_t	vi_to_column (EditLine *, int);
-protected el_action_t	vi_yank_end (EditLine *, int);
-protected el_action_t	vi_yank (EditLine *, int);
-protected el_action_t	vi_comment_out (EditLine *, int);
-protected el_action_t	vi_alias (EditLine *, int);
-protected el_action_t	vi_to_history_line (EditLine *, int);
-protected el_action_t	vi_histedit (EditLine *, int);
-protected el_action_t	vi_history_word (EditLine *, int);
-protected el_action_t	vi_redo (EditLine *, int);
-#endif /* _h_vi_c */
diff --git a/lib/libstdc++/Makefile b/lib/libstdc++/Makefile
deleted file mode 100644
index b756f64..0000000
--- a/lib/libstdc++/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-Makefile.incl
-Makefile.incl
-
-#Objects
-OBJS = sinst.o
-
-#Sub Sections
-SUBS = 
-
-#Output
-OUTPUT = libstdc++.so
-
-#Includes
-INCLUDES = -I./include -I. -I../libio -I../../include
-
-lib.so: $(OBJS)
-#	$(LD) $(LDFLAGS) -o $(OUTPUT) $(OBJS) ./stdio/*.o ./sys/*.o ./string/*.o ./stdlib/*.o
-	$(CC) -nostdlib -shared -Wl,-soname,libc.so -o $(OUTPUT) $(OBJS) $(SUBS)
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -Wall -nostdinc -DNOBOOL -DTMP_LIB -O $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -nostdinc -O -I./include -c $<
-
-.c.s:
-	$(CC)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall -nostdinc -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/libstdc++/sinst.cc b/lib/libstdc++/sinst.cc
deleted file mode 100644
index 809c34b..0000000
--- a/lib/libstdc++/sinst.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-#include <std/straights.h>
-
-extern "C" {
-  void * __dynamic_cast(void *a,void *b,void *c,void *d) {
-    return(0x0);
-    }
-  void * __rtti_user(void *a,void *b) {
-    return(0x0);
-    }
-  void * __rtti_class(void *a,void *b,void *c,void *d) {
-    return(0x0);
-    }
-  void * __rtti_si(void *a,void *b,void *c) {
-    return(0x0);
-    }
-  void __eprintf(void *a,void *b,void *c,void *d) {
-    return;
-    }
-  void cerr() {
-    return;
-    }
-} 
-
-
-typedef char c;
-
-template class string_char_traits <c>;
-
-ostream& endl(ostream& outs) {
-  return flush(outs.put('\n'));
-  }
-
-ostream& ostream::flush()
-{
-//    if (_strbuf->sync())
-  //      set(ios::badbit);
-    return *this;
-}
-
-
-
-ostream& flush(ostream& outs) {
-  return outs.flush();
-  }
-
-ostream& ostream::operator<<(const char *s) {
-  return(*this);
-  }
-
-ostream& ostream::operator<<(char c) {
-  return(*this);
-  }
-
-ostream& ostream::operator<<(int n) {
-  return(*this);
-  }
-
-ostream& ostream::operator<<(unsigned int n) {
-  return(*this);
-  }
-
-ostream& ostream::operator<<(long n) {
-  return(*this);
-  }
-
-ostream& ostream::operator<<(unsigned long n) {
-  return(*this);
-  }
-
-ostream& ostream::operator<<(ostream &(*)(ostream &)) {
-  return(*this);
-  }
-
-void * operator new(unsigned int size,void * ptr) {
-  return(ptr);
-  }
diff --git a/lib/libstdc++/std/straights.h b/lib/libstdc++/std/straights.h
deleted file mode 100644
index 2b81dbd..0000000
--- a/lib/libstdc++/std/straights.h
+++ /dev/null
@@ -1,84 +0,0 @@
-typedef char charT;
-typedef int size_t;
-
-extern "C++" {
-
-template <class charT> struct string_char_traits {
-  typedef charT char_type;
-  static char_type eos () { return char_type(); } // the null character
-  static void assign (char_type& c1, const char_type& c2) { c1 = c2; }
-  static bool ne (const char_type& c1, const char_type& c2) { return !(c1 == c2); }
-  static bool lt (const char_type& c1, const char_type& c2) { return (c1 < c2); }
-  static int compare (const char_type* s1, const char_type* s2, size_t n) {
-    size_t i;
-    for (i = 0; i < n; ++i)
-      if (ne (s1[i], s2[i]))
-        return lt (s1[i], s2[i]) ? -1 : 1;
-      return 0;
-    }
-  static size_t length (const char_type* s) {
-    size_t l = 0;
-    while (ne (*s++, eos ()))
-      ++l;
-    return l;
-    }
-  static char_type* copy (char_type* s1, const char_type* s2, size_t n) {
-    for (; n--; )
-      assign (s1[n], s2[n]);
-    return s1;
-    }
-  static char_type* move (char_type* s1, const char_type* s2, size_t n) {
-    char_type a[n];
-    size_t i;
-    for (i = 0; i < n; ++i)
-      assign (a[i], s2[i]);
-    for (i = 0; i < n; ++i)
-      assign (s1[i], a[i]);
-    return s1;
-    }
-
-  };
-
-class streambuf;class ios;class istream; class ostream;
-
-typedef ios& (*__manip)(ios&);
-typedef istream& (*__imanip)(istream&);
-typedef ostream& (*__omanip)(ostream&);
-
-extern ostream& flush(ostream& outs);
-
-struct _ios_fields { // The data members of an ios.
-  void *test;
-  };
-
-
-class ios : public _ios_fields {
-  public:
-    ios& test(void) { return *this; }
-  };
-
-class ostream : virtual public ios {
-  public:
-    ostream() { }
-    ostream& put(char c) { return *this; } 
-    ostream& flush();
-
-
-    ostream& operator<<(char c);
-    ostream& operator<<(const char *s);
-    ostream& operator<<(int n);
-    ostream& operator<<(unsigned int n);
-    ostream& operator<<(unsigned long n);
-    ostream& operator<<(long n);
-
-    ostream& operator<<(ostream &(*)(ostream &));
-
-  };
-
-class basic_string {
-  public:
-    void rep();
-    };
-
- }
-
diff --git a/lib/objgfx40/1.DPF b/lib/objgfx40/1.DPF
deleted file mode 100644
index 2bb2aec..0000000
--- a/lib/objgfx40/1.DPF
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/6X6.DPF b/lib/objgfx40/6X6.DPF
deleted file mode 100644
index 8467d42..0000000
--- a/lib/objgfx40/6X6.DPF
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/BLOCK.DPF b/lib/objgfx40/BLOCK.DPF
deleted file mode 100644
index 64810f0..0000000
--- a/lib/objgfx40/BLOCK.DPF
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/BOLD.DPF b/lib/objgfx40/BOLD.DPF
deleted file mode 100644
index 835c51b..0000000
--- a/lib/objgfx40/BOLD.DPF
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/Makefile b/lib/objgfx40/Makefile
deleted file mode 100644
index a4cea4a..0000000
--- a/lib/objgfx40/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# Kernel Makefile (C) 2002 The UbixOS Project
-
-Makefile.incl
-Makefile.incl
-
-#Delete Program
-REMOVE = rm -f
-
-#Objects
-OBJS = objgfx40.o ogFont.o ogSprite.o ogBlit.o ogPixCon.o ogPixelFmt.o
-
-#Include
-INCLUDE = -I./ -I../../lib/libc/include -I../../lib/libcpp/include
-
-#Output
-OUTPUT = objgfx40.so
-
-$(OUTPUT): $(OBJS)
-	$(CC) -nostdlib -shared -Wl,-soname,$(OUTPUT) -o $(OUTPUT) $(OBJS)
-
-# Compile the source files
-.cpp.o:
-	$(CXX)  -Wall -g -nostdlib -fno-inline -fno-exceptions -DNOBOOL $(INCLUDE) -c -o $@ $<
- 
-.cc.o:
-	$(CXX)  -Wall -nostdlib -fomit-frame-pointer -O -nobuilting -I../../lib/libc/include -I./include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -O -I../../lib/libc/include -c -o $@ $<
- 
-.c.s:
-	$(CC)  -Wall -fomit-frame-pointer -O -I../../lib/libc/include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall -fomit-frame-pointer -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(BINARY) $(OUTPUT) *.core
diff --git a/lib/objgfx40/OLDENG.DPF b/lib/objgfx40/OLDENG.DPF
deleted file mode 100644
index ca96601..0000000
--- a/lib/objgfx40/OLDENG.DPF
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/PACMAN.DPF b/lib/objgfx40/PACMAN.DPF
deleted file mode 100644
index 4c8e853..0000000
--- a/lib/objgfx40/PACMAN.DPF
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/ROM8X8.DPF b/lib/objgfx40/ROM8X8.DPF
deleted file mode 100644
index 929f49a..0000000
--- a/lib/objgfx40/ROM8X8.DPF
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/ROMAN1.DPF b/lib/objgfx40/ROMAN1.DPF
deleted file mode 100755
index 70ae9d9..0000000
--- a/lib/objgfx40/ROMAN1.DPF
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/SCRIPT.DPF b/lib/objgfx40/SCRIPT.DPF
deleted file mode 100755
index 4d2784f..0000000
--- a/lib/objgfx40/SCRIPT.DPF
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/include/ogDisplay_VESA.h b/lib/objgfx40/include/ogDisplay_VESA.h
deleted file mode 100644
index 8bd61dc..0000000
--- a/lib/objgfx40/include/ogDisplay_VESA.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef OGDISPLAY_VESA_H
-#define OGDISPLAY_VESA_H
-
-#include "objgfx40.h"
-
-struct ogModeInfo {
-    uInt16 modeAttributes     __attribute__((packed));
-    uInt8  windowAFlags       __attribute__((packed));
-    uInt8  windowBFlags       __attribute__((packed));
-    uInt16 granularity        __attribute__((packed));
-    uInt16 windowSize         __attribute__((packed));
-    uInt16 windowASeg         __attribute__((packed));
-    uInt16 windowBSeg         __attribute__((packed));
-    void*  bankSwitch         __attribute__((packed));
-    uInt16 bytesPerLine       __attribute__((packed));
-    uInt16 xRes               __attribute__((packed));
-    uInt16 yRes               __attribute__((packed));
-    uInt8  charWidth          __attribute__((packed));
-    uInt8  charHeight         __attribute__((packed));
-    uInt8  numBitPlanes       __attribute__((packed));
-    uInt8  bitsPerPixel       __attribute__((packed));
-    uInt8  numberOfBanks      __attribute__((packed));
-    uInt8  memoryModel        __attribute__((packed));
-    uInt8  bankSize           __attribute__((packed));
-    uInt8  numOfImagePages    __attribute__((packed));
-    uInt8  reserved           __attribute__((packed));
-    // Direct colour fields (required for Direct/6 and YUV/7 memory models
-    uInt8  redMaskSize        __attribute__((packed));
-    uInt8  redFieldPosition   __attribute__((packed));
-    uInt8  greenMaskSize      __attribute__((packed));
-    uInt8  greenFieldPosition __attribute__((packed));
-    uInt8  blueMaskSize       __attribute__((packed));
-    uInt8  blueFieldPosition  __attribute__((packed));
-    uInt8  alphaMaskSize      __attribute__((packed));
-    uInt8  alphaFieldPosition __attribute__((packed));
-    uInt8  directColourMode   __attribute__((packed));
-    // VESA 2.0 specific fields
-    uInt32 physBasePtr        __attribute__((packed));
-    void*  offScreenMemOffset __attribute__((packed));
-    uInt16 offScreenMemSize   __attribute__((packed));
-    uInt8  paddington[461]    __attribute__((packed));
-};
-
-struct ogVESAInfo {
-    char    VBESignature[4]   __attribute__((packed));
-    uInt8   minVersion        __attribute__((packed));
-    uInt8   majVersion        __attribute__((packed));
-    uInt32  OEMStringPtr      __attribute__((packed));
-    uInt32  capabilities      __attribute__((packed));
-    uInt32  videoModePtr      __attribute__((packed));
-    uInt16  totalMemory       __attribute__((packed));
-    // VESA 2.0 specific fields
-    uInt16  OEMSoftwareRev    __attribute__((packed));
-    uInt32  OEMVendorNamePtr  __attribute__((packed));
-    uInt32  OEMProductNamePtr __attribute__((packed));
-    uInt32  OEMProductRevPtr  __attribute__((packed));
-    uInt8   paddington[474]   __attribute__((packed));
-};
-
-class ogDisplay_VESA : public ogSurface {
- protected:
-  void *       pages[2];
-  uInt32       activePage;
-  uInt32       visualPage;
-  uInt16       screenSelector;
-  ogVESAInfo * VESAInfo;
-  ogModeInfo * modeInfo;
-  bool         inGraphics;
-  uInt16       FindMode(uInt32, uInt32, uInt32);
-  void         GetModeInfo(uInt16);
-  void         GetVESAInfo(void);
-  void         SetMode(uInt16);
-  virtual uInt32 RawGetPixel(uInt32, uInt32);  
-  virtual void RawSetPixel(uInt32, uInt32, uInt32);
-  virtual void RawSetPixel(uInt32, uInt32, uInt8, uInt8, uInt8, uInt8);
-  void         SetPal(void);
- public:
-               ogDisplay_VESA(void);
-  virtual bool ogAlias(ogSurface&, uInt32, uInt32, uInt32, uInt32);
-  virtual bool ogAvail(void);
-  virtual void ogClear(uInt32);
-  virtual bool ogClone(ogSurface&);
-  virtual void ogCopyLineTo(uInt32, uInt32, const void *, uInt32);
-  virtual void ogCopyLineFrom(uInt32, uInt32, void *, uInt32);
-  virtual void ogCopyPalette(ogSurface&);
-  virtual bool ogCreate(uInt32, uInt32, ogPixelFmt);
-  virtual uInt32 ogGetPixel(int32, int32);
-  virtual void * ogGetPtr(uInt32, uInt32);
-  virtual void ogHLine(int32, int32, int32, uInt32);
-  virtual bool ogLoadPalette(const char *);  
-  virtual void ogSetPalette(const ogRGBA8[]);
-  virtual void ogSetPixel(int32, int32, uInt32);
-  virtual void ogSetPalette(uInt8, uInt8, uInt8, uInt8);  
-  virtual void ogSetPalette(uInt8, uInt8, uInt8, uInt8, uInt8);  
-  virtual void ogVFlip(void);
-  virtual void ogVLine(int32, int32, int32, uInt32);
-  virtual      ~ogDisplay_VESA(void);
-}; // ogDisplay_VESA
-
-#endif
diff --git a/lib/objgfx40/main.cpp b/lib/objgfx40/main.cpp
deleted file mode 100644
index 9490127..0000000
--- a/lib/objgfx40/main.cpp
+++ /dev/null
@@ -1,611 +0,0 @@
-/**********************************************************************
-will add copyright bs later
-
-$Id: main.cpp 89 2016-01-12 00:20:40Z reddawg $
-**********************************************************************/
-
-#include "ogPixCon.h"
-#include "objgfx40.h"
-#include "ogFont.h"
-#include "ogSprite.h"
-#include "ogBlit.h"
-#ifdef __DJGPP__
-#include "ogDisplay_VESA.h"
-#endif
-#include <math.h>
-#include <iostream>
-#include <stdio.h>
-#include <time.h>
-
-using namespace std;
-
-void
-testPixCon(void) {
-  ogSurface * buf1 = new ogSurface();
-  ogSurface * buf2 = new ogSurface();
-  ogPixCon * pixCon = new ogPixCon(OG_PIXFMT_32BPP, OG_PIXFMT_16BPP);
-  uInt8 r, g, b;
-
-  buf1->ogCreate(100, 100, OG_PIXFMT_32BPP);
-  buf2->ogCreate(100, 200, OG_PIXFMT_16BPP);
-  
-  buf1->ogSetPixel(0, 0, buf1->ogPack(128, 42, 69));
-  buf2->ogSetPixel(0, 0, pixCon->ConvPix(buf1->ogGetPixel(0, 0)));
-
-  buf2->ogUnpack(buf2->ogGetPixel(0, 0), r, g, b);
-//  cout << "r: " << (uInt32)r << endl;
-//  cout << "g: " << (uInt32)g << endl;
-//  cout << "b: " << (uInt32)b << endl;
-  return;
-}; // textPixCon
-
-void testSetPixel(ogSurface& buf) {
-  uInt32 xx,yy;
-  buf.ogClear(buf.ogPack(0,255,0));
-  for (yy = 0; yy<=buf.ogGetMaxY(); yy++)
-    for (xx = 0; xx<=buf.ogGetMaxX(); xx++)
-      buf.ogSetPixel(xx,yy,xx*yy);
-  getc(stdin);
-  return;
-} // testSetPixel
-
-void testRect(ogSurface& buf) {
-  uInt32 count;
-  if (buf.ogGetBPP()==8)
-    for (count=0; count<1000; count++)
-      buf.ogRect(buf.ogGetMaxX() / 2 - count, buf.ogGetMaxY() / 2 - count,
-                 buf.ogGetMaxX() / 2 + count, buf.ogGetMaxY() / 2 + count,
-                 count);
-  else
-    for (count=0; count<1000; count++)
-      buf.ogRect(buf.ogGetMaxX() / 2 - count, buf.ogGetMaxY() / 2 - count,
-                 buf.ogGetMaxX() / 2 + count, buf.ogGetMaxY() / 2 + count,
-                 buf.ogPack(count,count,count));
-  getc(stdin);
-  return;
-} // testRect
-  
-void testLine(ogSurface & buf) {
-  uInt32 count;
-  uInt32 colour;
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  for (count = 150; count > 0; count--) {
-    buf.ogLine(buf.ogGetMaxX() / 2, buf.ogGetMaxY() / 2,
-                  buf.ogGetMaxX(), count*4, buf.ogPack(192, 192, 192));
-  } // for count
-  getc(stdin);
-  if (buf.ogGetBPP()==8)
-    for (count=0; count<(buf.ogGetMaxX()+1); count+=2) {
-      buf.ogLine(count-10,-10,buf.ogGetMaxX()-count+10,buf.ogGetMaxY()+10,count);
-    } // for
-  else {
-    colour = 255;
-    for (count = 0; count < (buf.ogGetMaxX()+1)/2; count+=4) {
-      buf.ogLine(buf.ogGetMaxX()/2, buf.ogGetMaxY()/2,
-                 buf.ogGetMaxX()/2-count,buf.ogGetMaxY(),
-                 buf.ogPack(colour,colour,colour));
-      buf.ogLine(buf.ogGetMaxX()/2, buf.ogGetMaxY()/2,
-                 buf.ogGetMaxX()/2+count,buf.ogGetMaxY(),
-                 buf.ogPack(colour,colour,colour));
-      buf.ogLine(buf.ogGetMaxX()/2, buf.ogGetMaxY()/2,
-                 buf.ogGetMaxX()/2-count,0,
-                 buf.ogPack(0,colour,0));
-      buf.ogLine(buf.ogGetMaxX()/2, buf.ogGetMaxY()/2,
-                 buf.ogGetMaxX()/2+count,0,
-                 buf.ogPack(0,colour,0));
-                 
-      --colour;
-    } // for
-
-    colour = 255;
-    for (count = 0; count < (buf.ogGetMaxY()+1)/2; count+=4) {
-      buf.ogLine(buf.ogGetMaxX()/2, buf.ogGetMaxY()/2,
-                 0, buf.ogGetMaxY()/2-count,
-                 buf.ogPack(colour,0,0));
-      buf.ogLine(buf.ogGetMaxX()/2, buf.ogGetMaxY()/2,
-                 0, buf.ogGetMaxY()/2+count,
-                 buf.ogPack(colour,0,0));
-      buf.ogLine(buf.ogGetMaxX()/2, buf.ogGetMaxY()/2,
-                 buf.ogGetMaxX(), buf.ogGetMaxY()/2-count,
-                 buf.ogPack(0,0,colour));
-      buf.ogLine(buf.ogGetMaxX()/2, buf.ogGetMaxY()/2,
-                 buf.ogGetMaxX(), buf.ogGetMaxY()/2+count,
-                 buf.ogPack(0,0,colour));
-      --colour;
-    } // for
-  } // else
-  getc(stdin);
-  return;
-} // testLine
-
-void testClear(ogSurface & buf) {
-  uInt32 count;
-  if (buf.ogGetBPP()==8)
-    for (count=0; count<256; count++)
-      buf.ogClear(count);
-  else {
-    for (count=0; count<256; count+=8)
-      buf.ogClear(buf.ogPack(count,0,0));
-    for (count=0; count<256; count+=8)
-      buf.ogClear(buf.ogPack(0,count,0));
-    for (count=0; count<256; count+=8)
-      buf.ogClear(buf.ogPack(0,0,count));
-    for (count=0; count<256; count+=8)
-      buf.ogClear(buf.ogPack(count,count,count));
-  } // else
-  getc(stdin);
-  return;
-} // testClear
-
-void testCircle(ogSurface & buf) {
-  uInt32 count;
-  if (buf.ogGetBPP()==8)
-    for (count=0; count<1000; count++)
-      buf.ogCircle(buf.ogGetMaxX()/2,buf.ogGetMaxY()/2, count, count);
-  else
-    for (count=0; count<1000; count++)
-      buf.ogCircle(buf.ogGetMaxX()/2,buf.ogGetMaxY()/2,count,buf.ogPack(count,0,count));
-  getc(stdin);
-} // testCircle
-
-void testVFlip(ogSurface & buf) {
-  buf.ogVFlip();
-  getc(stdin);
-  return;
-} // testVFlip
-
-void testHFlip(ogSurface & buf) {
-  buf.ogHFlip();
-  getc(stdin);  
-  return;
-} // testHFlip
-
-void testArc(ogSurface & buf) {
-  uInt32 radius;
-  uInt32 mid_x, mid_y;
-  mid_x = buf.ogGetMaxX()/2;
-  mid_y = buf.ogGetMaxY()/2;
-  if (buf.ogGetBPP()==8) {
-    for (radius = 1; radius <9; radius++) {
-      buf.ogArc(mid_x, mid_y, radius*10, 0, 90, radius*15);
-      buf.ogArc(mid_x, mid_y, radius*10, 180,270, 249-(radius-1)*16);
-    } // for
-  } else {
-    for (radius = 1; radius <255; radius++) {
-      buf.ogArc(mid_x, mid_y, radius, 0, 90, buf.ogPack(radius,radius,0));
-      buf.ogArc(mid_x, mid_y, radius, 180,270,buf.ogPack(0,255-radius,255-radius));
-    } // for
-  } // else
-  getchar();
-  return;
-} // testArc
-
-void testCubicBezierCurve(ogSurface & buf) {
-  buf.ogCubicBezierCurve(100, 100,
-                         300,50,
-                         400,120,
-                         350,300,
-                         25, buf.ogPack(255,255,255));
-  getchar();
-  return;
-} // testCubicBezierCurve
-
-void testCurve(ogSurface & buf) {
-  buf.ogCurve(10,10,100,30,35,160,20,buf.ogPack(255,255,255));
-  getchar();
-  return;
-} // testCurve
-
-void testSprite(ogSurface & buf) {
-  uInt32 count;
-  uInt32 w,h;
-  ogSprite * sprite = NULL;
-  sprite = new ogSprite();
-  
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  testLine(buf);
-  if (buf.ogGetBPP()==8)
-    sprite->Get(buf,
-                buf.ogGetMaxX()/2-80,buf.ogGetMaxY()/2-80,
-                buf.ogGetMaxX()/2+80,buf.ogGetMaxY()/2+80);
-  else
-    sprite->Get(buf,
-                buf.ogGetMaxX()/2-150,buf.ogGetMaxY()/2-150,
-                buf.ogGetMaxX()/2+150,buf.ogGetMaxY()/2+150);
-
-  sprite->Save("test.spr");
-  delete sprite;
-  sprite = new ogSprite();
-  sprite->Load("test.spr");
-  w = sprite->GetWidth()/2;
-  h = sprite->GetHeight()/2;
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  sprite->Put(buf,-10000,-10000);  // test *really* off the screen
-  sprite->Put(buf,10000,10000);    // test *really* off the screen
-  
-  sprite->Put(buf,buf.ogGetMaxX()/2-w,buf.ogGetMaxY()/2-h);
-  sprite->Put(buf,-w,-h);
-  sprite->Put(buf,buf.ogGetMaxX()/2-w,-h);
-  sprite->Put(buf,buf.ogGetMaxX()-w,-h);
-  sprite->Put(buf,-w,buf.ogGetMaxY()/2-h);
-  sprite->Put(buf,buf.ogGetMaxX()-w,buf.ogGetMaxY()/2-h);
-  sprite->Put(buf,-w,buf.ogGetMaxY()-h);
-  sprite->Put(buf,buf.ogGetMaxX()/2-w,buf.ogGetMaxY()-h);
-  sprite->Put(buf,buf.ogGetMaxX()-w,buf.ogGetMaxY()-h);
-  getc(stdin);
-  for (count = 0; count < 256; count++) {
-    sprite->Put(buf,random() % (buf.ogGetMaxX()+sprite->GetWidth()) - sprite->GetWidth(),
-                    random() % (buf.ogGetMaxY()+sprite->GetHeight()) - sprite->GetHeight());
-  } // for
-  delete sprite;
-  getc(stdin);
-  return;
-} // testSprite
-
-void testBlit(ogSurface & buf) {
-  int32 xx, yy, count;
-  ogBlit * blit = NULL;
-  ogBlit * blit2 = NULL;
-
-  blit = new ogBlit();
- 
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  for (xx= 0; xx<= 20; xx++) {
-    buf.ogLine(128,0,128-xx*6,255,buf.ogPack(255,255,255));
-    buf.ogLine(128,0,128+xx*6,255,buf.ogPack(255,255,255));
-    buf.ogLine(128,255,128-xx*6,0,buf.ogPack(255,255,255));
-    buf.ogLine(128,255,128+xx*6,0,buf.ogPack(255,255,255));
-  } // for
-
-  buf.ogFillCircle(128,128,60,buf.ogPack(255,255,255));
-  blit->Get(buf,0,0,255,255);
-  for (yy = 0; yy<=(int32)buf.ogGetMaxY(); yy++)
-    for (xx = 0; xx<=(int32)buf.ogGetMaxX(); xx++)
-      buf.ogSetPixel(xx,yy,xx*yy);
-  blit->Save("test.blt");
-  blit2 = new ogBlit(*blit, true);
-
-  delete blit;
-  blit2->Save("test2.blt"); 
-  blit = new ogBlit();
-  blit->Load("test.blt");
-
-  blit->Put(buf,-10000,-10000);  // test *really* off the screen
-  blit->Put(buf,10000,10000);    // test *really* off the screen
-
-  blit->Put(buf,-128,-128);
-  blit->Put(buf,buf.ogGetMaxX()/2-128,-128);
-  blit->Put(buf,buf.ogGetMaxX()-128,-128);
-  blit->Put(buf,-128,buf.ogGetMaxY()/2-128);
-  blit->Put(buf,buf.ogGetMaxX()/2-128,buf.ogGetMaxY()/2-128);
-  blit->Put(buf,buf.ogGetMaxX()-128,buf.ogGetMaxY()/2-128);
-  blit->Put(buf,-128,buf.ogGetMaxY()-128);
-  blit->Put(buf,buf.ogGetMaxX()/2-128,buf.ogGetMaxY()-128);
-  blit->Put(buf,buf.ogGetMaxX()-128,buf.ogGetMaxY()-128);
-
-  getc(stdin);
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  for (yy = 0; yy<=(int32)buf.ogGetMaxY(); yy++)
-    for (xx = 0; xx<=(int32)buf.ogGetMaxX(); xx++)
-      buf.ogSetPixel(xx,yy,xx*yy);
-  blit->GetBlitWithMask(buf,
-                        buf.ogGetMaxX()/2-blit->GetWidth(),
-                        buf.ogGetMaxY()/2-blit->GetHeight());
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  blit->Put(buf,-10000,-10000);  // test *really* off the screen
-  blit->Put(buf,10000,10000);    // test *really* off the screen
-  
-  blit->Put(buf,-128,-128);
-  blit->Put(buf,buf.ogGetMaxX()/2-128,-128);
-  blit->Put(buf,buf.ogGetMaxX()-128,-128);
-  blit->Put(buf,-128,buf.ogGetMaxY()/2-128);
-  blit->Put(buf,buf.ogGetMaxX()/2-128,buf.ogGetMaxY()/2-128);
-  blit->Put(buf,buf.ogGetMaxX()-128,buf.ogGetMaxY()/2-128);
-  blit->Put(buf,-128,buf.ogGetMaxY()-128);
-  blit->Put(buf,buf.ogGetMaxX()/2-128,buf.ogGetMaxY()-128);
-  blit->Put(buf,buf.ogGetMaxX()-128,buf.ogGetMaxY()-128);
-  
-  getc(stdin);
-  for (count = 0; count < 1000; count++) {
-    blit->Put(buf,random() % (buf.ogGetMaxX()+blit->GetWidth()) - blit->GetWidth(),
-                  random() % (buf.ogGetMaxY()+blit->GetHeight()) - blit->GetHeight());
-  } // for
-  getc(stdin);
-  for (yy = 0; yy<=(int32)buf.ogGetMaxY(); yy++)
-    for (xx = 0; xx<=(int32)buf.ogGetMaxX(); xx++)
-      buf.ogSetPixel(xx,yy,xx*yy);
-
-  blit->GetBlitWithMask(buf,buf.ogGetMaxX()/2,buf.ogGetMaxY()-128);
-  buf.ogClear(buf.ogPack(128,128,128));
-  blit->Put(buf,buf.ogGetMaxX()/2-128,buf.ogGetMaxY()/2-128);  
-  getc(stdin);
-  delete blit;
-  delete blit2;
-  
-  return;
-} // testBlit
-
-void
-testBlit2(ogSurface & buf) {
-  ogBlit * blit = new ogBlit();
-  ogSurface * buf2 = new ogSurface();
-  ogSurface * blitsource = new ogSurface();
-  uInt32 xx,yy,count,colour;
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  if (!buf2->ogClone(buf)) cout << "Clone failed!!!" << endl;
-  if (!blitsource->ogClone(buf)) cout << "Clone failed!!" << endl;
-
-  colour = 255;
-  for (count = 0; count < (buf2->ogGetMaxX()+1)/2; count+=4) {
-    buf2->ogLine(buf2->ogGetMaxX()/2, buf2->ogGetMaxY()/2,
-               buf2->ogGetMaxX()/2-count,buf2->ogGetMaxY(),
-               buf2->ogPack(colour,colour,colour));
-    buf2->ogLine(buf2->ogGetMaxX()/2, buf2->ogGetMaxY()/2,
-               buf2->ogGetMaxX()/2+count,buf2->ogGetMaxY(),
-               buf2->ogPack(colour,colour,colour));
-    buf2->ogLine(buf2->ogGetMaxX()/2, buf2->ogGetMaxY()/2,
-               buf2->ogGetMaxX()/2-count,0,
-               buf2->ogPack(0,colour,0));
-    buf2->ogLine(buf2->ogGetMaxX()/2, buf2->ogGetMaxY()/2,
-               buf2->ogGetMaxX()/2+count,0,
-               buf2->ogPack(0,colour,0));
-    --colour;
-  } // for
-
-  colour = 255;
-  for (count = 0; count < (buf.ogGetMaxY()+1)/2; count+=4) {
-    buf2->ogLine(buf2->ogGetMaxX()/2, buf2->ogGetMaxY()/2,
-               0, buf2->ogGetMaxY()/2-count,
-               buf2->ogPack(colour,0,0));
-    buf2->ogLine(buf2->ogGetMaxX()/2, buf2->ogGetMaxY()/2,
-               0, buf2->ogGetMaxY()/2+count,
-               buf2->ogPack(colour,0,0));
-    buf2->ogLine(buf2->ogGetMaxX()/2, buf2->ogGetMaxY()/2,
-               buf2->ogGetMaxX(), buf2->ogGetMaxY()/2-count,
-               buf2->ogPack(0,0,colour));
-    buf2->ogLine(buf2->ogGetMaxX()/2, buf2->ogGetMaxY()/2,
-               buf2->ogGetMaxX(), buf2->ogGetMaxY()/2+count,
-               buf2->ogPack(0,0,colour));
-    --colour;
-  } // for
-  for (yy = 0; yy<=buf2->ogGetMaxY(); yy++)
-    for (xx = 0; xx<=buf2->ogGetMaxX(); xx++)
-      buf2->ogSetPixel(xx,yy, xx*yy);
-  for (count = 0; count<200; count++)
-    blitsource->ogFillCircle(random() % blitsource->ogGetMaxX(), random() % blitsource->ogGetMaxY(),
-                             random() % 35+1,blitsource->ogPack(255,255,255));
-
-  blit->Get(*blitsource,0,0,blitsource->ogGetMaxX(),blitsource->ogGetMaxY());
-  blit->Save("bigblit.blt");
-  delete blit;
-  blit = new ogBlit;
-  blit->Load("bigblit.blt");
-  for (count = 0; count<=256; count+=4) {
-  for (yy = 0; yy<=buf2->ogGetMaxY(); yy++)
-    for (xx = 0; xx<=buf2->ogGetMaxX(); xx++)
-      buf2->ogSetPixel(xx,yy,xx*yy*count);
-  
-    blit->GetBlitWithMask(*buf2,0,0);
-    blit->Put(buf,0,0);
-  } // for
-
-  getc(stdin);
-  delete blitsource;
-  delete buf2;
-  delete blit;
-  return;
-} // testBlit2
-
-void
-testBlit3(ogSurface & buf) {
-  int32 count;
-  ogBlit * blit = NULL;
-  ogSurface * buf2 = NULL;
-  buf2 = new ogSurface();
-  blit = new ogBlit();
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  buf.ogFillCircle(buf.ogGetMaxX()/2,buf.ogGetMaxY()/2,14,buf.ogPack(255,255,255));
-  blit->Get(buf,buf.ogGetMaxX()/2-20,buf.ogGetMaxY()/2-20,
-                buf.ogGetMaxX()/2+20,buf.ogGetMaxY()/2+20);
-  blit->Put(buf,0,0);
-  for (count=0; count<(int32)buf.ogGetMaxX(); count++)
-    buf.ogLine(count,0,count,buf.ogGetMaxY(),count);
-  buf2->ogClone(buf);    
-  blit->GetBlitWithMask(*buf2,10,10);
-  buf.ogClear(buf.ogPack(63,63,63));
-  for (count=-40; count<(int32)buf.ogGetMaxX()+10; count++) {
-    blit->GetBlitWithMask(*buf2,count,buf2->ogGetMaxY()/2-20);
-    blit->Put(buf,count,buf.ogGetMaxY()/2-20);
-    blit->GetBlitWithMask(*buf2,buf2->ogGetMaxX()/2-20,count);
-    blit->Put(buf,buf.ogGetMaxX()/2-20,count);
-   }
-  getc(stdin);
-  delete blit;
-  return;
-} // testBlit3
-
-void
-testSaveLoadPal(ogSurface & buf) {
-  uInt32 count;
-  testRect(buf);
-  for (count=0; count<256; count++)
-    buf.ogSetPalette(count,count,count,count);
-  if (buf.ogSavePalette("test.pal")==false) cout << "SavePal() failed" << endl;
-  for (count=0; count<256; count++)
-    buf.ogSetPalette(count,0,0,0);
-  if (buf.ogLoadPalette("test.pal")==false) cout << "LoadPal() failed" << endl;
-  testRect(buf);
-} // testSaveLoadPal
-
-void
-testPolygon(ogSurface & buf) {
-  ogPoint2d points[16];
-  uInt32 count;
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  for (count=0; count<16; count++) {
-    points[count].x = random() % buf.ogGetMaxX();
-    points[count].y = random() % buf.ogGetMaxY();
-  } // for
-  buf.ogFillPolygon(16, points, buf.ogPack(random() & 255,random() & 255,random() & 255));
-  getc(stdin);
-  return;
-} // testPolygon
-
-void
-testSpline(ogSurface & buf) {
-  ogPoint2d points[8];
-  uInt32 i;
-  for (i=0; i<8; i++) {
-    points[i].x = random() % buf.ogGetMaxX();
-    points[i].y = random() % buf.ogGetMaxY();
-  } // for
-  buf.ogClear(buf.ogPack(0, 0, 0));
-  buf.ogPolygon(8, points, buf.ogPack(22,229,52));
-  buf.ogSpline(8, points, 24, buf.ogPack(64,64,255));
-  buf.ogBSpline(8, points, 24, buf.ogPack(255,128,128));
-  getchar();
-  return;
-} // testSpline
-
-void
-testFont(ogSurface & buf) {
-  uInt32 xx, yy;
-  ogBitFont * font = new ogBitFont();
-  font->Load("SCRIPT.DPF", 0);
-  font->SetFGColor(255, 255, 255, 255);
-  font->SetBGColor(0, 0, 0, 255);
-
-  font->PutString(buf, 0, 0, "abAByzYZ");
-
-  for (yy = 0; yy<font->GetHeight(); yy++) {
-    for (xx = 0; xx<79; xx++)
-      if ((buf.ogGetPixel(xx, yy) & buf.ogGetAlphaMasker()) == 0) 
-        cout << " ";
-      else
-        cout << "*";
-    cout << endl;
-  }
-
-  delete font;
-  return;
-} // testFont
-
-void
-testGouraud(ogSurface & buf) {
-  uInt8 r, g, b;
-  ogPoint2d points[4];
-  ogRGBA8 colours[4];
-  r = g = b = 0;
-
-  points[0].x = buf.ogGetMaxX() - 150;
-  points[0].y = 0;
-  points[1].x = buf.ogGetMaxX();
-  points[1].y = 0;
-  points[2].x = buf.ogGetMaxX();
-  points[2].y = 150;
-  points[3].x = buf.ogGetMaxX() - 250;
-  points[3].y = 250;
-  colours[0].red = 255;
-  colours[0].green = 0;
-  colours[0].blue = 0;
-  colours[0].alpha = 255;
-  colours[1].red = 0;
-  colours[1].green = 255;
-  colours[1].blue = 128;
-  colours[1].alpha = 255;
-  colours[2].red = 128;
-  colours[2].green = 255;
-  colours[2].blue = 128;
-  colours[2].alpha = 255;
-  colours[3].red = 63;
-  colours[3].green = 63;
-  colours[3].blue = 63;
-  colours[3].alpha = 255;
-  buf.ogFillGouraudPolygon(4, points, colours);
-  getc(stdin);
-  return;
-} // testGouraud
-
-void
-testCopyBuf(ogSurface & buf) {
-  ogSurface * buf2 = new ogSurface();
-  ogPixelFmt pixFmt;
-  buf.ogGetPixFmt(pixFmt);
-  buf2->ogCreate(400, 400, OG_PIXFMT_32BPP);
-  buf2->ogClear(buf2->ogPack(255, 128, 255));
-  buf.ogCopyBuf(0, 0, *buf2, 0, 0, buf2->ogGetMaxX(), buf2->ogGetMaxY());
-  delete buf2;
-  getc(stdin);
-  return;
-}
-
-void
-testFillRect(ogSurface & buf) {
-  uInt32 count;
-  for (count = 100; count > 0; count--) {
-    buf.ogFillRect(count, count, 0, 0, buf.ogPack(count*2, count*2, count*2));
-  }
-  getc(stdin);
-  
-  return;
-} // testFillRect()
-int main() {
-  ogSurface* buf    = NULL;
- cout <<  "Starting program" << endl;
-#ifdef __DJGPP__
-  buf = new ogDisplay_VESA();
-  buf->ogCreate(800, 600, OG_PIXFMT_32BPP);
-#else
-  buf = new ogSurface();
-  if (buf->ogCreate(1024, 768, OG_PIXFMT_16BPP)==false) exit(1);
-#endif
-  srandom(time(NULL));
-
-//  buf->SetBlending(true);
-//  buf->SetAlpha(127);
-  buf->ogSetAntiAliasing(true);
-  
-//cout << "testPixCon()" << endl;
-//  testPixCon();
- cout << "testFillRect()" << endl;
-  testFillRect(*buf);
- cout << "testCopyBuf()" << endl;
-  testCopyBuf(*buf);
- cout << "testGouraud()" << endl;
-  testGouraud(*buf);
- cout << "testFont()" << endl;
-  testFont(*buf);
- cout << "TestRect()" << endl;
-  testRect(*buf);
- cout << "testCircle()" << endl;
-  testCircle(*buf);
- cout << "TestLine()" << endl;
-  testLine(*buf);
-cout << "TestVFlip()" << endl;
-  testVFlip(*buf);
-cout << "TestHFlip()" << endl;
-  testHFlip(*buf);
-cout << "TestArc()" << endl;
-  testArc(*buf);
-cout << "TestSetPixel()" << endl;
-  testSetPixel(*buf);
-cout << "TestClear()" << endl;
-  testClear(*buf);
-cout << "TestSprite()" << endl;
-  testSprite(*buf);
-cout << "TestBlit()" << endl;
-   testBlit(*buf);
-cout << "TestBlit2()" << endl;
-   testBlit2(*buf);
-//  testBlit3(*buf);  // special test for 320x200x8bpp
-//  testSaveLoadPal(*buf);    // use an 8bpp mode
-cout << "TestPolygon()" << endl;
-  testPolygon(*buf);
-cout << "TestCurve()" << endl;
-  testCurve(*buf);
-cout << "TestSpline()" << endl;
-  testSpline(*buf);
-  delete buf;
-//  buf->SetPixel(0, 0, buf->Pack(0, 0, 0)); 
-  return(0);
-}
diff --git a/lib/objgfx40/objgfx40.cpp b/lib/objgfx40/objgfx40.cpp
deleted file mode 100644
index 2cd2b05..0000000
--- a/lib/objgfx40/objgfx40.cpp
+++ /dev/null
@@ -1,4122 +0,0 @@
-/*******************************************************
-$Id: objgfx40.cpp 89 2016-01-12 00:20:40Z reddawg $
-*******************************************************/
-
-#ifndef __UBIXOS_KERNEL__
-extern "C" {
-  #include <stdlib.h>
-  #include <string.h>
-  #include <stdio.h>
-  #include <math.h>
-  }
-#endif
-
-#ifdef __UBIXOS_KERNEL__
-extern "C" {
-  #include <math.h>
-  #include <lib/kmalloc.h>
-  #include <lib/string.h>
-  #include <vfs/vfs.h>
-  #include <vfs/file.h>
-  }
-
-#define abs(a)     (((a) < 0) ? -(a) : (a))
-#endif
-
-#include <objgfx40/objgfx40.h>
-#include <objgfx40/ogPixCon.h>
-#include <objgfx40/ogPixelFmt.h>
-#include <objgfx40/defpal.inc>
-
-#ifdef __UBIXOS__
-#include <libcpp.h>
-#endif
-
-const 
-  uInt32 OG_MASKS[32] = {
-    0, 
-    1, 
-    3, 
-    7, 
-    15, 
-    31, 
-    63, 
-    127, 
-    255, 
-    511, 
-    1023, 
-    2047, 
-    4095, 
-    8191, 
-    16383,
-    32767, 
-    65535, 
-    131071, 
-    262143, 
-    524287, 
-    1048575, 
-    2097151, 
-    4194303, 
-    8388607,
-    16777215, 
-    33554431, 
-    67108863, 
-    134217727, 
-    268435455, 
-    536870911,
-    1073741823, 
-    2147483647
-  }; // OG_MASKS[]
-
-const
-  float INTENSITIES[32] = {
-     1.0,             // 0
-     0.984250984251,  // 1
-     0.968245836552,  // 2
-     0.951971638233,  // 3
-     0.935414346693,  // 4
-     0.938558653544,  // 5
-     0.901387818866,  // 6
-     0.883883476483,  // 7
-     0.866025403784,  // 8
-     0.847791247891,  // 9
-     0.829156197589,  // 10
-     0.810092587301,  // 11
-     0.790569415042,  // 12
-     0.770551750371,  // 13
-     0.75,            // 14
-     0.728868986856,  // 15
-     0.707106781187,  // 16
-     0.684653196881,  // 17
-     0.661437827766,  // 18
-     0.637377439199,  // 19
-     0.612372435696,  // 20
-     0.586301969978,  // 21
-     0.559016994375,  // 22
-     0.53033008589,   // 23
-     0.5,             // 24
-     0.467707173347,  // 25
-     0.433012701892,  // 26
-     0.395284707521,  // 27
-     0.353553390593,  // 28
-     0.306186217848,  // 29
-     0.25,            // 30
-     0.176776695297   // 31
-  }; // INTENSITIES[]
-
-// #include "../ubixos-home/src/sys/include/ubixos/types.h"
-
-// #define ROUND(f) (int)((f) + ((f) > 0 ? 0.5 : -0.5))
-
-struct ogHLine {
-  int32       xStart;
-  int32       xEnd;
-};
-
-struct ogHLineList {
-  int32       length;
-  int32       yStart;
-  int32     * xLeft;
-  int32     * xRight;
-};
-
-struct ogPointListHeader {
-  int32       length;
-  ogPoint2d * PointPtr;
-};
-
-struct ogEdgeState {
-  ogEdgeState* nextEdge;
-  int32        x;
-  int32        startY;
-  int32        wholePixelXMove;
-  int32        xDirection;
-  int32        errorTerm;
-  int32        errorTermAdjUp;
-  int32        errorTermAdjDown;
-  int32        count;
-  ogRGBA8      colour;
-  int32        rStepY;
-  int32        gStepY;
-  int32        bStepY;
-  int32        aStepY;
-  int32        rIncY;
-  int32        gIncY;
-  int32        bIncY;
-  int32        aIncY;
-};
-
-class ogEdgeTable {
- public:
-  ogEdgeState * globalEdges;
-  ogEdgeState * activeEdges;
-       ogEdgeTable(void) { globalEdges = activeEdges = NULL; return; }
-  void AdvanceAET(void);
-  void BuildGET(uInt32 numPoints, ogPoint2d * polyPoints);
-  void BuildGET_G(uInt32 numPoints, ogPoint2d * polyPoints, ogRGBA8 * colours);
-  void MoveXSortedToAET(int32 yToMove);
-  void ScanOutAET(ogSurface & destObject, int32 yToScan, uInt32 colour);
-  void ScanOutAET_G(ogSurface & destObject, int32 yToScan);
-  void XSortAET(void);
-       ~ogEdgeTable(void);
-}; // ogEdgeState
-
-void
-ogEdgeTable::AdvanceAET(void) {
-  ogEdgeState *  currentEdge;
-  ogEdgeState ** currentEdgePtr;
-
-  currentEdgePtr = &activeEdges;
-  currentEdge = activeEdges;
-  while (currentEdge!=NULL) {
-    --currentEdge->count;
-    if (currentEdge->count == 0) {
-      // this edge is finished, so remove it from the AET
-      *currentEdgePtr = currentEdge->nextEdge;
-      // I'm thinking I should dispose currentEdge here!?
-    } else {
-      // advance the edge's x coord by minimum move
-      currentEdge->x += currentEdge->wholePixelXMove;
-      // determine whether it's time for X to advance one extra
-      currentEdge->errorTerm += currentEdge->errorTermAdjUp;
-      if (currentEdge->errorTerm > 0) {
-        currentEdge->x += currentEdge->xDirection;
-        currentEdge->errorTerm -= currentEdge->errorTermAdjDown;
-      } // if
-      currentEdgePtr = &currentEdge->nextEdge;
-    } // else
-    currentEdge = *currentEdgePtr;
-  } // while
-  return;
-} // ogEdgeTable::AdvanceAET
-
-void
-ogEdgeTable::BuildGET(uInt32 numPoints, ogPoint2d * polyPoints) {
-  int32 i, x1, y1, x2, y2, deltaX, deltaY, width, tmp;
-  ogEdgeState *  newEdgePtr;
-  ogEdgeState *  followingEdge;
-  ogEdgeState ** followingEdgeLink;
-  
- /* 
-  * Creates a GET in the buffer pointed to by NextFreeEdgeStruc from
-  * the vertex list. Edge endpoints are flipped, if necessary, to
-  * guarantee all edges go top to bottom. The GET is sorted primarily
-  * by ascending Y start coordinate, and secondarily by ascending X
-  * start coordinate within edges with common Y coordinates }
-  */
-
-  // Scan through the vertex list and put all non-0-height edges into
-  // the GET, sorted by increasing Y start coordinate}
-
-  for (i = 0; i < (int32)numPoints; i++) {
-    // calculate the edge height and width
-    x1 = polyPoints[i].x;
-    y1 = polyPoints[i].y;
-
-    if (0 == i) {
-      // wrap back around to the end of the list
-      x2 = polyPoints[numPoints-1].x;
-      y2 = polyPoints[numPoints-1].y;
-    } else {
-      x2 = polyPoints[i-1].x;
-      y2 = polyPoints[i-1].y;
-    } // else i!=0
-
-    if (y1 > y2) {
-      tmp = x1;
-      x1  = x2;
-      x2  = tmp;
-
-      tmp = y1;
-      y1  = y2;
-      y2  = tmp;
-    } // if y1>y2
-
-    // skip if this can't ever be an active edge (has 0 height)
-    deltaY = y2-y1;
-    if (deltaY != 0) {
-      newEdgePtr = new ogEdgeState;
-      newEdgePtr->xDirection = ((deltaX = x2-x1) > 0) ? 1 : -1;
-      width = abs(deltaX);
-      newEdgePtr->x = x1;
-      newEdgePtr->startY = y1;
-      newEdgePtr->count = newEdgePtr->errorTermAdjDown = deltaY;
-      newEdgePtr->errorTerm = (deltaX >= 0) ? 0 : 1-deltaY;
-
-      if (deltaY >= width) {
-        newEdgePtr->wholePixelXMove = 0;
-        newEdgePtr->errorTermAdjUp = width;
-      } else {
-        newEdgePtr->wholePixelXMove = (width / deltaY) * newEdgePtr->xDirection;
-        newEdgePtr->errorTermAdjUp = width % deltaY;
-      } // else
-
-      followingEdgeLink = &globalEdges;
-      while (true) {
-        followingEdge = *followingEdgeLink;
-        if ((followingEdge == NULL) ||
-            (followingEdge->startY > y1) ||
-            ((followingEdge->startY == y1) &&
-             (followingEdge->x>=x1))) {
-          newEdgePtr->nextEdge = followingEdge;
-          *followingEdgeLink = newEdgePtr;
-          break;
-        } // if
-        followingEdgeLink = &followingEdge->nextEdge;
-      } // while
-    } // if deltaY!=0
-  } // for
-  return;
-} // ogEdgeTable::BuildGET
-
-void
-ogEdgeTable::BuildGET_G(uInt32 numPoints, ogPoint2d * polyPoints, ogRGBA8 * colours) {
-
-  int32 i, x1, y1, x2, y2, deltaX, deltaY, width, tmp;
-  ogEdgeState *  newEdgePtr;
-  ogEdgeState *  followingEdge;
-  ogEdgeState ** followingEdgeLink;
-  ogRGBA8 c1, c2, cTmp;
-
- /* 
-  * Creates a GET in the buffer pointed to by NextFreeEdgeStruc from
-  * the vertex list. Edge endpoints are flipped, if necessary, to
-  * guarantee all edges go top to bottom. The GET is sorted primarily
-  * by ascending Y start coordinate, and secondarily by ascending X
-  * start coordinate within edges with common Y coordinates }
-  */
-
-  // Scan through the vertex list and put all non-0-height edges into
-  // the GET, sorted by increasing Y start coordinate}
-
-  for (i = 0; i < (int32)numPoints; i++) {
-    // calculate the edge height and width
-    x1 = polyPoints[i].x;
-    y1 = polyPoints[i].y;
-    c1 = colours[i];
-
-    if (0 == i) {
-      // wrap back around to the end of the list
-      x2 = polyPoints[numPoints-1].x;
-      y2 = polyPoints[numPoints-1].y;
-      c2 = colours[numPoints-1];
-    } else {
-      x2 = polyPoints[i-1].x;
-      y2 = polyPoints[i-1].y;
-      c2 = colours[i-1];
-    } // else i!=0
-
-    if (y1 > y2) {
-      tmp = x1;
-      x1  = x2;
-      x2  = tmp;
-    
-      tmp = y1;
-      y1  = y2;
-      y2  = tmp;
-     
-      cTmp = c1;
-      c1 = c2;
-      c2 = cTmp;
-    } // if y1>y2
-
-    // skip if this can't ever be an active edge (has 0 height)
-    deltaY = y2-y1;
-    if (deltaY != 0) {
-      newEdgePtr = new ogEdgeState;
-      newEdgePtr->colour = c1;
-      newEdgePtr->xDirection = ((deltaX = x2-x1) > 0) ? 1 : -1;
-
-      newEdgePtr -> rStepY = ((c2.red - c1.red +1) << 16) / deltaY;
-      newEdgePtr -> gStepY = ((c2.green - c1.green +1) << 16) / deltaY;
-      newEdgePtr -> bStepY = ((c2.blue - c1.blue +1) << 16) / deltaY;
-      newEdgePtr -> aStepY = ((c2.alpha - c1.alpha +1) << 16) / deltaY;
-
-      newEdgePtr -> rIncY = newEdgePtr -> gIncY = 0;
-      newEdgePtr -> bIncY = newEdgePtr -> aIncY = 0;
-
-      width = abs(deltaX);
-      newEdgePtr->x = x1;
-      newEdgePtr->startY = y1;
-      newEdgePtr->count = newEdgePtr->errorTermAdjDown = deltaY;
-      newEdgePtr->errorTerm = (deltaX >= 0) ? 0 : 1-deltaY;
-
-      if (deltaY >= width) {
-        newEdgePtr->wholePixelXMove = 0;
-        newEdgePtr->errorTermAdjUp = width;
-      } else {
-        newEdgePtr->wholePixelXMove = (width / deltaY) * newEdgePtr->xDirection;
-        newEdgePtr->errorTermAdjUp = width % deltaY;
-      } // else
-
-      followingEdgeLink = &globalEdges;
-      while (true) {
-        followingEdge = *followingEdgeLink;
-        if ((followingEdge == NULL) ||
-            (followingEdge->startY > y1) ||
-            ((followingEdge->startY == y1) &&
-             (followingEdge->x >= x1))) {
-          newEdgePtr->nextEdge = followingEdge;
-          *followingEdgeLink = newEdgePtr;
-          break;
-        } // if
-        followingEdgeLink = &followingEdge->nextEdge;
-      } // while
-    } // if deltaY!=0
-  } // for
-  return;
-} // ogEdgeTable::BuildGET_G
-
-void
-ogEdgeTable::MoveXSortedToAET(int32 yToMove) {
-  ogEdgeState *  AETEdge;
-  ogEdgeState *  tempEdge;
-  ogEdgeState ** AETEdgePtr;
-  int32          currentX;
-
-  /* The GET is Y sorted. Any edges that start at the desired Y
-   * coordinate will be first in the GET, so we'll move edges from
-   * the GET to AET until the first edge left in the GET is no
-   * longer at the desired Y coordinate. Also, the GET is X sorted
-   * within each Y cordinate, so each successive edge we add to the
-   * AET is guaranteed to belong later in the AET than the one just
-   * added.
-   */
-  AETEdgePtr = &activeEdges;
-  while ((globalEdges != NULL) && (globalEdges->startY == yToMove)) {
-    currentX = globalEdges->x;
-    // link the new edge into the AET so that the AET is still
-    // sorted by X coordinate
-    while (true) {
-      AETEdge = *AETEdgePtr;
-      if ((AETEdge == NULL) || (AETEdge->x >= currentX)) {
-        tempEdge = globalEdges->nextEdge;
-        *AETEdgePtr = globalEdges;
-        globalEdges->nextEdge = AETEdge;
-        AETEdgePtr = &globalEdges->nextEdge;
-        globalEdges = tempEdge;
-        break;
-      } else AETEdgePtr = &AETEdge->nextEdge;
-    } // while true
-  } // while globalEdges!=NULL and globalEdges->startY==yToMove
-  return;
-} // ogEdgeTable::MoveXSortedToAET
-
-void
-ogEdgeTable::ScanOutAET(ogSurface & destObject, int32 yToScan, uInt32 colour) {
-  ogEdgeState * currentEdge;
-  int32 leftX;
-
-  /*  Scan through the AET, drawing line segments as each pair of edge
-   *  crossings is encountered. The nearest pixel on or to the right
-   *  of the left edges is drawn, and the nearest pixel to the left
-   *  of but not on right edges is drawn
-   */
-  currentEdge = activeEdges;
-
-  while (currentEdge != NULL) {
-    leftX = currentEdge->x;
-    currentEdge = currentEdge->nextEdge;
-
-    if (currentEdge != NULL) {
-      if (currentEdge->x > leftX)
-        destObject.ogHLine(leftX, currentEdge->x-1, yToScan, colour);
-      currentEdge = currentEdge->nextEdge;
-    } // if currentEdge != NULL
-  } // while
-
-  return;
-} // ogEdgeTable::ScanOutAET
-
-void
-ogEdgeTable::ScanOutAET_G(ogSurface & destObject, int32 yToScan) {
-  ogEdgeState * currentEdge;
-  int32 leftX, count;
-  int32 rStepX, gStepX, bStepX, aStepX;
-  int32 rIncX, gIncX, bIncX, aIncX;
-  int32 lR, lG, lB, lA;
-  int32 rR, rG, rB, rA;
-  int32 dR, dG, dB, dA;
-  int32 dist;
-
-  /*  Scan through the AET, drawing line segments as each pair of edge
-   *  crossings is encountered. The nearest pixel on or to the right
-   *  of the left edges is drawn, and the nearest pixel to the left
-   *  of but not on right edges is drawn
-   */
-  currentEdge = activeEdges;
-
-  while (currentEdge != NULL) {
-    leftX = currentEdge->x;
-
-    lR = currentEdge->colour.red;
-    lG = currentEdge->colour.green;
-    lB = currentEdge->colour.blue;
-    lA = currentEdge->colour.alpha;
-
-    lR += currentEdge->rIncY >> 16;
-    lG += currentEdge->gIncY >> 16;
-    lB += currentEdge->bIncY >> 16;
-    lA += currentEdge->aIncY >> 16;
-
-    currentEdge->rIncY += currentEdge->rStepY;
-    currentEdge->gIncY += currentEdge->gStepY;
-    currentEdge->bIncY += currentEdge->bStepY;
-    currentEdge->aIncY += currentEdge->aStepY;
-
-
-    currentEdge = currentEdge->nextEdge;
-
-    if (currentEdge != NULL) {
-      if (leftX != currentEdge->x) {
-        rR = currentEdge->colour.red;
-        rG = currentEdge->colour.green;
-        rB = currentEdge->colour.blue;
-        rA = currentEdge->colour.alpha;
-
-        rR += currentEdge->rIncY >> 16;
-        rG += currentEdge->gIncY >> 16;
-        rB += currentEdge->bIncY >> 16;
-        rA += currentEdge->aIncY >> 16;
-
-        currentEdge->rIncY += currentEdge->rStepY;
-        currentEdge->gIncY += currentEdge->gStepY;
-        currentEdge->bIncY += currentEdge->bStepY;
-        currentEdge->aIncY += currentEdge->aStepY;
-
-        dR = rR - lR;
-        dG = rG - lG;
-        dB = rB - lB;
-        dA = rA - lA;
-
-        dist = currentEdge->x - leftX;
-
-        rStepX = (dR << 16) / dist;
-        gStepX = (dG << 16) / dist;
-        bStepX = (dB << 16) / dist;
-        aStepX = (dA << 16) / dist;
-        rIncX = gIncX = bIncX = aIncX = 0;
-
-        for (count = leftX; count < currentEdge->x; count++) {
-          destObject.ogSetPixel(count, yToScan,
-                                lR + (rIncX >> 16),
-                                lG + (gIncX >> 16),
-                                lB + (bIncX >> 16),
-                                lA + (aIncX >> 16) );
-          rIncX += rStepX;
-          gIncX += gStepX;
-          bIncX += bStepX;
-          aIncX += aStepX;
-        } // for
-      }
-      currentEdge = currentEdge->nextEdge;
-    } // if currentEdge != NULL
-  } // while
-  
-  return;
-} // ogEdgeTable::ScanOutAET_G
-
-void
-ogEdgeTable::XSortAET(void) {
-  ogEdgeState *  currentEdge;
-  ogEdgeState *  tempEdge;
-  ogEdgeState ** currentEdgePtr;
-  bool swapOccurred;
-
-  if (activeEdges == NULL) return;
-
-  do {
-    swapOccurred = false;
-    currentEdgePtr = &activeEdges;
-    currentEdge = activeEdges;
-    while (currentEdge->nextEdge != NULL) {
-      if (currentEdge->x > currentEdge->nextEdge->x) {
-        // the second edge has a lower x than the first
-        // swap them in the AET
-        tempEdge = currentEdge->nextEdge->nextEdge;
-        *currentEdgePtr = currentEdge->nextEdge;
-        currentEdge->nextEdge->nextEdge = currentEdge;
-        currentEdge->nextEdge = tempEdge;
-        swapOccurred = true;
-      } // if
-      currentEdgePtr = &((*currentEdgePtr)->nextEdge);
-      currentEdge = *currentEdgePtr;
-    } // while
-  } while (swapOccurred);
-  return;
-} // ogEdgeTable::XSortAET
-
-ogEdgeTable::~ogEdgeTable(void) {
-  ogEdgeState * edge;
-  ogEdgeState * tmpEdge;
-  tmpEdge = globalEdges;
-  // first walk the global edges and delete any non-null nodes
-  while (tmpEdge != NULL) {
-    edge = tmpEdge;
-    tmpEdge = edge->nextEdge;
-    delete edge;
-  } // while
-  tmpEdge = activeEdges;
-  // next walk the activeEdges and delete any non-null nodes.  Note that this should
-  // always be null
-  while (tmpEdge != NULL) {
-    edge = tmpEdge;
-    tmpEdge = edge->nextEdge;
-    delete edge;
-  } // while
-  return;
-} // ogEdgeTable::~ogEdgeTable
-
-static bool
-fileExists(const char *file)
-{
-#ifdef __UBIXOS_KERNEL__
-  fileDescriptor *f = fopen(file, "rb");
-#else
-  FILE *f = fopen(file, "rb");
-#endif
-  
-  if (!f)
-    return false;
-  fclose(f);
-  return true;
-}
-
-static int32 calculate(float mu, int32 p0, int32 p1, int32 p2, int32 p3);
-
-// ogSurface constructor
-ogSurface::ogSurface(void) {
-  version = ogVERSION;
-
-  dataState    = ogNone;
-  buffer       = NULL;
-  lineOfs      = NULL;
-  pal          = NULL;
-  attributes   = NULL;
-  xRes         = 0;
-  yRes         = 0;
-  maxX         = 0;
-  maxY         = 0;
-  bSize        = 0;
-  lSize        = 0;
-  BPP          = 0;
-  bytesPerPix  = 0;
-  pixFmtID     = 0;
-  redShifter   = 0;
-  greenShifter = 0;
-  blueShifter  = 0;
-  alphaShifter = 0;
-  redFieldPosition   = 0;
-  greenFieldPosition = 0;
-  blueFieldPosition  = 0;
-  alphaFieldPosition = 0;
-  alphaMasker = 0;
-  lastError = ogOK;
-  return;
-} // ogSurface::ogSurface
-
-void 
-ogSurface::AARawLine(uInt32 x1, uInt32 y1, uInt32 x2, uInt32 y2, uInt32 colour) {
- /*
-  * aaRawLine
-  *
-  * private method
-  *
-  * draws an unclipped anti-aliased line from (x1,y1) to (x2,y2) using colour
-  *
-  */
-  uInt32 erradj, erracc;
-  uInt32 erracctmp, intshift, wgt, wgtCompMask;
-  int32  dx, dy, tmp, xDir, i;
-  uInt8 r, g, b, a;
-  uInt32 alphas[32];
-  bool oldBlending;
-
-  if (y1 > y2) {
-    tmp= y1;
-    y1 = y2;
-    y2 = tmp;
-   
-    tmp= x1;
-    x1 = x2;
-    x2 = tmp;
-  } // if
-  
-  dx = (x2-x1);
-  if (dx >= 0) xDir=1; else { dx = -dx; xDir=-1; }
-//  dx = abs(dx);
-  dy = (y2 - y1);
-
-  if (dy == 0) {
-    ogHLine(x1, x2, y1, colour);
-    return;
-  }
-
-  if (dx == 0) {
-    ogVLine(x1, y1, y2, colour);
-    return;
-  }
-
-  ogUnpack(colour, r, g, b, a);
-
-  if (!ogIsBlending()) a = 255;
-
-  for (i = 0; i < 32; i++) {
-    alphas[i] = static_cast<uInt32>(INTENSITIES[i]*a + 0.5f);
-  } // for
-
-  oldBlending = ogSetBlending(true);
-
-  RawSetPixel(x1, y1, r, g, b, a);
-
-  // this is incomplete.. diagonal lines don't travel through the 
-  // center of pixels exactly
-
-  do {
-
-    if (dx == dy) {
-      for (; dy != 0; dy--) {
-        x1 += xDir;
-        ++y1;
-        RawSetPixel(x1, y1, r, g, b, a);
-      } // for
-      break;  // pop out to the bottom and restore the old blending state
-    } // if dx==dy
-
-    erracc = 0;
-    intshift = 32-5;
-    wgt = 12;
-    wgtCompMask = 31;
-
-    if (dy > dx) {
-      /* y-major.  Calculate 32-bit fixed point fractional part of a pixel that
-       * X advances every time Y advances 1 pixel, truncating the result so that
-       * we won't overrun the endpoint along the X axis 
-       */
-//      erradj = ((uInt64) dx << 32) / (uInt64)dy;
-     __asm__ __volatile__ (
-        " xor %%eax, %%eax   \n"
-        " div %1             \n"
-        " mov %%eax, %2      \n"
-        :
-        : "d" (dx), "b" (dy), "m" (erradj)
-      );
-
-      while (--dy) {
-        erracctmp = erracc;
-        erracc += erradj;
-        if (erracc <= erracctmp) x1 += xDir;
-        y1++;     // y-major so always advance Y
-        /* the nbits most significant bits of erracc give us the intensity
-         *  weighting for this pixel, and the complement of the weighting for
-         *  the paired pixel. 
-         */
-        wgt = erracc >> intshift;
-        ogSetPixel(x1, y1, r, g, b, alphas[wgt]);
-        ogSetPixel(x1+xDir, y1, r, g, b, alphas[wgt ^ wgtCompMask]);
-      } // while
-  
-    } else {
-
-      /* x-major line.  Calculate 32-bit fixed-point fractional part of a pixel
-       * that Y advances each time X advances 1 pixel, truncating the result so
-       * that we won't overrun the endpoint along the X axis. 
-       */
-//      erradj = ((uInt64)dy << 32) / (uInt64)dx;
-     __asm__ __volatile__ (
-        " xor %%eax, %%eax   \n"
-        " div %1             \n"
-        " mov %%eax, %2      \n"
-        :
-        : "d" (dy), "b" (dx), "m" (erradj)
-      );
-
-      // draw all pixels other than the first and last 
-      while (--dx) {
-        erracctmp = erracc;
-        erracc += erradj;
-        if (erracc <= erracctmp) y1++; 
-        x1 += xDir;                 // x-major so always advance X
-        /* the nbits most significant bits of erracc give us the intensity
-         * weighting for this pixel, and the complement of the weighting for
-         * the paired pixel. 
-         */
-        wgt = erracc >> intshift;
-        ogSetPixel(x1, y1, r, g, b, alphas[wgt]);
-        ogSetPixel(x1, y1+1, r, g, b, alphas[wgt ^ wgtCompMask]);
-      } // while
-    } // else
-    RawSetPixel(x2, y2, r, g, b, alphas[wgt]);
-
-  } while (false);
-
-  ogSetBlending(oldBlending);
-  return;
-} // ogSurface::AARawLine
-
-uInt32 
-ogSurface::RawGetPixel(uInt32 x, uInt32 y) {
-  uInt32 result;
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-       "  shl  $2, %%ecx      \n"  // shl     ecx, 2 {adjust for pixel size}
-       "  add  %%esi, %%edi   \n"  // add     edi, esi
-       "  add  %%ecx, %%edi   \n"  // add     edi, ecx
-       "  mov  (%%edi),%%eax  \n"  // eax,word ptr [edi]
-       "  mov  %%eax, %3      \n"  // mov     result, eax
-       :
-       : "D" (buffer), "S" (lineOfs[y]), // %0, %1
-         "c" (x), "m" (result)           // %2, %3
-       );
-    break;
-  case 3:
-    __asm__ __volatile__(
-       "  mov  %%ecx, %%eax   \n"  // mov     eax, ecx  - adjust for pixel size 
-       "  add  %%ecx, %%ecx   \n"  // add     ecx, ecx  - adjust for pixel size
-       "  add  %%eax, %%ecx   \n"  // add     ecx, eax  - adjust for pixel size
-       "  add  %%esi, %%edi   \n"  // add     edi, esi
-       "  add  %%ecx, %%edi   \n"  // add     edi, ecx
-       "  movzwl (%%edi),%%eax \n" // edx,word ptr [edi]
-       "  xor  %%eax, %%eax   \n"  
-       "  mov  2(%%edi), %%al \n"  // mov     al, [edi+2]
-       "  shl  $16, %%eax     \n"  // shl     eax, 16
-       "  mov  (%%edi), %%ax  \n"  // mov     ax, [edi]
-       "  mov  %%eax, %3      \n"  // mov     result, eax
-       :
-       : "D" (buffer), "S" (lineOfs[y]), // %0, %1
-         "c" (x), "m" (result)           // %2, %3
-       );
-    break;
-  case 2:
-    __asm__ __volatile__(
-       "  add  %%esi, %%edi   \n"  // add     edi, esi
-       "  add  %%ecx, %%ecx   \n"  // add     ecx, ecx {adjust for pixel size}
-       "  add  %%ecx, %%edi   \n"  // add     edi, ecx
-       "  movzwl (%%edi),%%eax \n" // movzx   edx,word ptr [edi]
-       "  mov  %%eax, %0      \n"  // mov     result, eax
-       : "=m" (result)
-       : "D" (buffer), "S" (lineOfs[y]),    // %0, %1
-         "c" (x) // , "m" (result)              // %2, %3
-       );
-    break;
-  case 1:
-    __asm__ __volatile__(
-       "  add  %%esi, %%edi   \n"  // add     edi, esi
-       "  add  %%ecx, %%edi   \n"  // add     edi, ecx
-       " movzbl (%%edi),%%eax \n"  // movzx   edx,byte ptr [edi]
-       "  mov  %%eax, %3      \n"  // mov     result, eax
-       :
-       : "D" (buffer), "S" (lineOfs[y]),    // %0, %1
-         "c" (x), "m" (result)              // %2, %3  
-       );
-    break;
-  } // switch
-  return result;
-} // ogSurface::RawGetPixel
-
-void 
-ogSurface::RawSetPixel(uInt32 x, uInt32 y, uInt32 colour) {
-  uInt32 newR, newG, newB, inverseA;
-  uInt8 sR, sG, sB, sA;
-  uInt8 dR, dG, dB;
-
-  do {
-    if (ogIsBlending()) {
-      ogUnpack(colour, sR, sG, sB, sA);
-      if (sA == 0) return;
-      if (sA == 255) break;
-      inverseA = 255 - sA;
-      ogUnpack(RawGetPixel(x, y), dR, dG, dB);
-      newR = (dR * inverseA + sR * sA) >> 8;
-      newG = (dG * inverseA + sG * sA) >> 8;
-      newB = (dB * inverseA + sB * sA) >> 8;
-      colour = ogPack(newR, newG, newB, inverseA);
-    } // if
-  } while (false);
-
-  switch (bytesPerPix) {
-   case 4:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  shl  $2, %%ecx     \n"  // shl     eax, 2 {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%eax, (%%edi) \n" // mov     [edi], eax
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour)                  // %2, %3
-    );
-    break;
-   case 3:
-     __asm__ __volatile__(
-    //  Calculate offset, prepare the pixel to be drawn 
-        "  leal (%%ecx, %%ecx, 2), %%ecx \n"  // lea ecx, [ecx + ecx*2]
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  shr  $16, %%eax    \n"  // shr     eax, 16
-        "  mov  %%al, 2(%%edi)\n"  // mov     [edi+2],al
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour)                  // %2, %3
-    );
-    break;
-   case 2:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  add  %%ecx, %%ecx  \n"  // add     ecx, ecx {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-    //    "  mov  %3, %%eax     \n"  // mov     eax, colour
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour)                  // %2, %3
-     );
-     break;
-  case 1:
-    __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-    //    "  add  (%%esi,%%ebx,4), %%edi \n" // add     edi, [esi + ebx * 4]
-        "  add  %%esi, %%edi  \n"          // add     edi, esi
-        "  add  %%ecx, %%edi  \n"          // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%al, (%%edi) \n"          // mov     [edi], al
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour)                     // %2, %3
-   );
-   break;
-  } // switch
-  return;
-} // ogSurface::RawSetPixel
-
-void 
-ogSurface::RawSetPixel(uInt32 x, uInt32 y, uInt8 r, uInt8 g, uInt8 b, uInt8 a) {
-  uInt32 newR, newG, newB, inverseA;
-  uInt8 dR, dG, dB;
-  uInt32 colour;
-
-  do {
-    if (ogIsBlending()) {
-      if (a == 0) return;
-      if (a == 255) {
-        colour = ogPack(r, g, b, a);
-        break;
-      } // if a == 255
-
-      inverseA = 255 - a;
-      ogUnpack(RawGetPixel(x, y), dR, dG, dB);
-      newR = (dR * inverseA + r * a) >> 8;
-      newG = (dG * inverseA + g * a) >> 8;
-      newB = (dB * inverseA + b * a) >> 8;
-      colour = ogPack(newR, newG, newB, inverseA);
-    } else colour = ogPack(r, g, b, a);
-  } while (false);
-
-  switch (bytesPerPix) {
-   case 4:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  shl  $2, %%ecx     \n"  // shl     eax, 2 {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%eax, (%%edi) \n" // mov     [edi], eax
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour)                  // %2, %3
-    );
-    break;
-   case 3:
-     __asm__ __volatile__(
-    //  Calculate offset, prepare the pixel to be drawn 
-        "  leal (%%ecx, %%ecx, 2), %%ecx \n"  // lea ecx, [ecx + ecx*2]
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  shr  $16, %%eax    \n"  // shr     eax, 16
-        "  mov  %%al, 2(%%edi)\n"  // mov     [edi+2],al
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour)                  // %2, %3
-    );
-    break;
-   case 2:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  add  %%ecx, %%ecx  \n"  // add     ecx, ecx {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-    //    "  mov  %3, %%eax     \n"  // mov     eax, colour
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour)                  // %2, %3
-     );
-     break;
-  case 1:
-    __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-    //    "  add  (%%esi,%%ebx,4), %%edi \n" // add     edi, [esi + ebx * 4]
-        "  add  %%esi, %%edi  \n"          // add     edi, esi
-        "  add  %%ecx, %%edi  \n"          // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%al, (%%edi) \n"          // mov     [edi], al
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour)                     // %2, %3
-   );
-   break;
-  } // switch
-  return;
-} // ogSurface::RawSetPixel
-
-bool
-ogSurface::ClipLine(int32& x1, int32& y1, int32& x2, int32& y2) {
-  /*
-   *  clipLine()
-   *
-   *  private method 
-   *
-   *  clips a line to (0,0),(maxX,maxY); returns true if
-   *  the line segment is in bounds, false if none of the line segment is
-   *  on the screen.  Uses HJI's line clipping algorithm.
-   */
-
-  int32 tx1, ty1, tx2, ty2;
-  int32 OutCode;
-  uInt32 AndResult, OrResult;
-  AndResult = 15;
-  OrResult = 0;
-  OutCode = 0;
-  if (x1 < 0) OutCode+=8;
-  if (x1 > (int32)maxX) OutCode+=4;
-  if (y1 < 0) OutCode+=2;
-  if (y1 > (int32)maxY) OutCode++;
-   
-  AndResult &= OutCode;
-  OrResult |= OutCode;
-  OutCode = 0;
-   
-  if (x2 < 0) OutCode+=8;
-  if (x2 > (int32)maxX) OutCode+=4;
-  if (y2 < 0) OutCode+=2;
-  if (y2 > (int32)maxY) OutCode++;
-   
-  AndResult &= OutCode;
-  OrResult |= OutCode;
-
-  if (AndResult > 0) return false;
-  if (OrResult == 0) return true;
-
-   // some clipping is required here.  
-
-  tx1 = x1;
-  ty1 = y1;
-  tx2 = x2;
-  ty2 = y2;
-
-  if (x1 < 0) {
-    ty1 = (x2*y1-x1*y2) / (x2-x1);
-    tx1 = 0;
-  } // if
-  else
-    if (x2 < 0) {
-        ty2 = (x2*y1-x1*y2) / (x2-x1);
-        tx2 = 0;
-    } // elseif
-
-  if (x1 > (int32)maxX) {
-    ty1 = (y1*(x2-maxX)+y2*(maxX-x1)) / (x2-x1);
-    tx1 = maxX;
-  } // if
-  else
-    if (x2 > (int32)maxX) {
-      ty2 = (y1*(x2-maxX)+y2*(maxX-x1)) / (x2-x1);
-      tx2 = maxX;
-    } // elseif
-
-  if (((ty1 < 0) && (ty2 < 0)) || 
-     ((ty1>(int32)maxY) && (ty2>(int32)maxY))) return false;
-
-  if (ty1 < 0) {
-    tx1 = (x1*y2-x2*y1) / (y2-y1);
-    ty1 = 0;
-  } // if
-  else
-    if (ty2 < 0) {
-      tx2 = (x1*y2-x2*y1) / (y2-y1);
-      ty2 = 0;
-    } // elseif 
-
-  if (ty1 > (int32)maxY) {
-    tx1 = (x1*(y2-maxY)+x2*(maxY-y1)) / (y2-y1);
-    ty1 = maxY;
-  } // if
-  else
-    if (ty2 > (int32)maxY) {
-       tx2 = (x1*(y2-maxY)+x2*(maxY-y1)) / (y2-y1);
-       ty2 = maxY;
-    } // elseif 
-
-  if (((uInt32)tx1 > maxX) || ((uInt32)tx2 > maxX)) return false;
-
-  x1 = tx1;
-  y1 = ty1;
-  x2 = tx2;
-  y2 = ty2;
-
-  return true;
-} // ogSurface::ClipLine
-
-// wu's double step line algorithm blatently borrowed from:
-// http://www.edepot.com/linewu.html
-
-void ogSurface::RawLine(uInt32 x1, uInt32 y1, uInt32 x2, uInt32 y2, uInt32 colour) {
-  int32 dy = y2 - y1;
-  int32 dx = x2 - x1;
-  int32 stepx, stepy;
-
-  if (dy < 0) { dy = -dy;  stepy = -1; } else { stepy = 1; }
-  if (dx < 0) { dx = -dx;  stepx = -1; } else { stepx = 1; }
-
-  RawSetPixel(x1, y1, colour);
-  RawSetPixel(x2, y2, colour);
-
-  if (dx > dy) {
-    int32 length = (dx - 1) >> 2;
-    int32 extras = (dx - 1) & 3;
-    int32 incr2 = (dy << 2) - (dx << 1);
-
-    if (incr2 < 0) {
-      int32 c = dy << 1;
-      int32 incr1 = c << 1;
-      int32 d =  incr1 - dx;
-
-      for (int32 i = 0; i < length; i++) {
-        x1 += stepx;
-        x2 -= stepx;
-
-        if (d < 0) {                                      // Pattern:
-          RawSetPixel(x1, y1, colour);                    //
-          RawSetPixel(x1 += stepx, y1, colour);           //  x o o
-          RawSetPixel(x2, y2, colour);                    //
-          RawSetPixel(x2 -= stepx, y2, colour);
-
-          d += incr1;
-        } else {
-
-          if (d < c) {                                     // Pattern:
-            RawSetPixel(x1, y1, colour);                   //      o
-            RawSetPixel(x1 += stepx, y1 += stepy, colour); //  x o
-            RawSetPixel(x2, y2, colour);                   //
-            RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-          } else {
-            RawSetPixel(x1, y1 += stepy, colour);             // Pattern:
-            RawSetPixel(x1 += stepx, y1, colour);             //    o o 
-            RawSetPixel(x2, y2 -= stepy, colour);             //  x
-            RawSetPixel(x2 -= stepx, y2, colour);             //
-          } // else
-
-          d += incr2;
-        } // else
-      } // for i
-
-      if (extras > 0) {
-
-        if (d < 0) {
-          RawSetPixel(x1 += stepx, y1, colour);
-          if (extras > 1) RawSetPixel(x1 += stepx, y1, colour);
-          if (extras > 2) RawSetPixel(x2 -= stepx, y2, colour);
-        } else
-          if (d < c) {
-            RawSetPixel(x1 += stepx, y1, colour);
-            if (extras > 1) RawSetPixel(x1 += stepx, y1 += stepy, colour);
-            if (extras > 2) RawSetPixel(x2 -= stepx, y2, colour);
-          } else {
-            RawSetPixel(x1 += stepx, y1 += stepy, colour);
-            if (extras > 1) RawSetPixel(x1 += stepx, y1, colour);
-            if (extras > 2) RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-          }
-      } // if extras > 0
-    } else {
-      int32 c = (dy - dx) << 1;
-      int32 incr1 = c << 1;
-      int32 d =  incr1 + dx;
-
-      for (int32 i = 0; i < length; i++) {
-        x1 += stepx;
-        x2 -= stepx;
-
-        if (d > 0) {
-          RawSetPixel(x1, y1 += stepy, colour);                   // Pattern:
-          RawSetPixel(x1 += stepx, y1 += stepy, colour);          //      o
-          RawSetPixel(x2, y2 -= stepy, colour);                   //    o
-          RawSetPixel(x2 -= stepx, y2 -= stepy, colour);	  //  x
-          d += incr1;
-        } else {
-          if (d < c) {
-            RawSetPixel(x1, y1, colour);                          // Pattern:
-            RawSetPixel(x1 += stepx, y1 += stepy, colour);        //      o
-            RawSetPixel(x2, y2, colour);                          //  x o
-            RawSetPixel(x2 -= stepx, y2 -= stepy, colour);        //
-          } else {
-            RawSetPixel(x1, y1 += stepy, colour);                 // Pattern:
-            RawSetPixel(x1 += stepx, y1, colour);                 //    o o
-            RawSetPixel(x2, y2 -= stepy, colour);                 //  x
-            RawSetPixel(x2 -= stepx, y2, colour);                 //
-          }
-
-          d += incr2;
-        } // else
-      } // for i
-
-      if (extras > 0) {
-        if (d > 0) {
-          RawSetPixel(x1 += stepx, y1 += stepy, colour);
-          if (extras > 1) RawSetPixel(x1 += stepx, y1 += stepy, colour);
-          if (extras > 2) RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-        } else
-          if (d < c) {
-            RawSetPixel(x1 += stepx, y1, colour);
-            if (extras > 1) RawSetPixel(x1 += stepx, y1 += stepy, colour);
-            if (extras > 2) RawSetPixel(x2 -= stepx, y2, colour);
-          } else {
-
-            RawSetPixel(x1 += stepx, y1 += stepy, colour);
-
-            if (extras > 1) RawSetPixel(x1 += stepx, y1, colour);
-            if (extras > 2) {
-              if (d > c)
-                RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-              else
-                RawSetPixel(x2 -= stepx, y2, colour);
-            } // if extras > 2
-
-          } // else
-        } // if extras > 0
-    } // else
-
-  } else {
-
-    int32 length = (dy - 1) >> 2;
-    int32 extras = (dy - 1) & 3;
-    int32 incr2 = (dx << 2) - (dy << 1);
-
-    if (incr2 < 0) {
-      int32 c = dx << 1;
-      int32 incr1 = c << 1;
-      int32 d =  incr1 - dy;
-
-      for (int32 i = 0; i < length; i++) {
-        y1 += stepy;
-        y2 -= stepy;
-
-        if (d < 0) {
-          RawSetPixel(x1, y1, colour);
-          RawSetPixel(x1, y1 += stepy, colour);
-          RawSetPixel(x2, y2, colour);
-          RawSetPixel(x2, y2 -= stepy, colour);
-
-          d += incr1;
-        } else {
-
-          if (d < c) {
-            RawSetPixel(x1, y1, colour);
-            RawSetPixel(x1 += stepx, y1 += stepy, colour);
-            RawSetPixel(x2, y2, colour);
-            RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-          } else {
-            RawSetPixel(x1 += stepx, y1, colour);
-            RawSetPixel(x1, y1 += stepy, colour);
-            RawSetPixel(x2 -= stepx, y2, colour);
-            RawSetPixel(x2, y2 -= stepy, colour);
-          } // else
-
-          d += incr2;
-        } // else
-      } // for i
-
-      if (extras > 0) {
-        if (d < 0) {
-          RawSetPixel(x1, y1 += stepy, colour);
-          if (extras > 1) RawSetPixel(x1, y1 += stepy, colour);
-          if (extras > 2) RawSetPixel(x2, y2 -= stepy, colour);
-        } else
-          if (d < c) {
-            RawSetPixel(x1, y1 += stepy, colour);
-            if (extras > 1) RawSetPixel(x1 += stepx, y1 += stepy, colour);
-            if (extras > 2) RawSetPixel(x2, y2 -= stepy, colour);
-          } else {
-            RawSetPixel(x1 += stepx, y1 += stepy, colour);
-            if (extras > 1) RawSetPixel(x1, y1 += stepy, colour);
-            if (extras > 2) RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-          } // else
-      } // if extras > 0
-    } else {
-      int32 c = (dx - dy) << 1;
-      int32 incr1 = c << 1;
-      int32 d =  incr1 + dy;
-
-      for (int32 i = 0; i < length; i++) {
-        y1 += stepy;
-        y2 -= stepy;
-
-        if (d > 0) {
-          RawSetPixel(x1 += stepx, y1, colour);
-          RawSetPixel(x1 += stepx, y1 += stepy, colour);
-          RawSetPixel(x2 -= stepx, y2, colour);
-          RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-          d += incr1;
-        } else {
-          if (d < c) {
-            RawSetPixel(x1, y1, colour);
-            RawSetPixel(x1 += stepx, y1 += stepy, colour);
-            RawSetPixel(x2, y2, colour);
-            RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-          } else {
-            RawSetPixel(x1 += stepx, y1, colour);
-            RawSetPixel(x1, y1 += stepy, colour);
-            RawSetPixel(x2 -= stepx, y2, colour);
-            RawSetPixel(x2, y2 -= stepy, colour);
-          } // else
-          d += incr2;
-        } // else
-      } // for
-
-      if (extras > 0) {
-        if (d > 0) {
-          RawSetPixel(x1 += stepx, y1 += stepy, colour);
-          if (extras > 1) RawSetPixel(x1 += stepx, y1 += stepy, colour);
-          if (extras > 2) RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-        } else
-          if (d < c) {
-            RawSetPixel(x1, y1 += stepy, colour);
-            if (extras > 1) RawSetPixel(x1 += stepx, y1 += stepy, colour);
-            if (extras > 2) RawSetPixel(x2, y2 -= stepy, colour);
-          } else {
-            RawSetPixel(x1 += stepx, y1 += stepy, colour);
-            if (extras > 1) RawSetPixel(x1, y1 += stepy, colour);
-            if (extras > 2) {
-              if (d > c)
-                RawSetPixel(x2 -= stepx, y2 -= stepy, colour);
-              else
-                RawSetPixel(x2, y2 -= stepy, colour);
-            } // if extras > 2
-          } // else
-      } // if extras > 0
-    } // else
-  } // else
-} // ogSurface::RawLine
-
-#if 0
-void
-ogSurface::RawLine(uInt32 x1, uInt32 y1, uInt32 x2, uInt32 y2, uInt32 colour) {
-  /*
-   *  ogSurface::RawLine()
-   *
-   *  private method; draws an unclipped line from (x1,y1) to (x2,y2)
-   *
-   */
-   int32 tc;
-   if (!ogAvail()) return;
-   switch (BPP) {
-   case 8:
-     __asm__ __volatile__(
-        "  mov  $1, %%ecx     \n"  // mov     ecx, 1
-        "  bt   $15, %%eax    \n"  // bt      eax, 15
-        "   jnc rlxPositive8  \n"  
-        "  or   $-1, %%ecx    \n"  // or      ecx, -1
-        "  neg  %%eax         \n"  // neg     eax
-"rlxPositive8:                \n"
-        "  add  %%eax, %%eax  \n"  // add     eax, eax
-        "  bt   $15, %%ebx    \n"  // bt      ebx, 15
-        "   jnc rlyPositive8  \n" 
-        "  neg  %%edx         \n"  // neg     edx
-        "  neg  %%ebx         \n"  // neg     ebx
-"rlyPositive8:                \n"
-        "  add  %%ebx, %%ebx  \n"  // add     ebx, ebx
-
-        "  cmp  %%ebx, %%eax  \n"  // cmp     eax, ebx
-        "   jle rlyGreater8   \n"  
-        "  push %%ecx         \n"  // push    ecx
-        "  mov  %%eax, %%ecx  \n"  // mov     ecx, eax
-        "  mov  %%ebx, %6     \n"  // mov     tc, ebx
-        "  shr  $1, %%ecx     \n"  // shr     ecx, 1
-        "  sub  %%ecx, %6     \n"  // sub     tc, ecx
-        "  pop  %%ecx         \n"  // pop     ecx
-"rlxTop8:                     \n"
-        "  push %%eax         \n"  // push    eax
-        "  mov  %5, %%eax     \n"  // mov     eax, colour
-        "  mov  %%al, (%%edi) \n"  // mov     [edi], al
-        "  pop  %%eax         \n"  // pop     eax
-        "  cmp  %%edi, %%esi  \n"  // cmp     esi, edi
-        "   je  rlDone8       \n" 
-        "  cmp  $0, %6        \n"  // cmp     tc, 0
-        "   jl  rlNoAddY8     \n"  
-        "  add  %%edx, %%edi  \n"  // add     edi, edx
-        "  sub  %%eax, %6     \n"  // sub     tc, eax
-"rlNoAddY8:                   \n"
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  add  %%ebx, %6     \n"  // add     tc, ebx
-        "   jmp rlxTop8       \n"
-
-"rlyGreater8:                 \n"
-        "  push %%ecx         \n"  // push    ecx
-        "  mov  %%ebx, %%ecx  \n"  // mov     ecx, ebx
-        "  mov  %%eax, %6     \n"  // mov     tc, eax
-        "  shr  $1, %%ecx     \n"  // shr     ecx, 1
-        "  sub  %%ecx, %6     \n"  // sub     tc, ecx
-        "  pop  %%ecx         \n"
-"rlyTop8:                     \n"
-        "  push %%eax         \n"  // push    eax
-        "  mov  %5, %%eax     \n"  // mov     eax, colour
-        "  mov  %%al, (%%edi) \n"  // mov     [edi], al
-        "  pop  %%eax         \n"  // pop     eax
-        "  cmp  %%edi, %%esi  \n"  // cmp     esi, edi
-        "   je  rlDone8       \n"
-        "  cmp  $0, %6        \n"  // cmp     tc, 0
-        "   jl  rlNoAddX8     \n"
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  sub  %%ebx, %6     \n"  // sub     tc, ebx
-"rlNoAddX8:                   \n"
-        "  add  %%edx, %%edi  \n"  // add     edi, edx
-        "  add  %%eax, %6     \n"  // add     tc, eax
-        "   jmp rlyTop8       \n"
-"rlDone8:                     \n"
-        : 
-        :  "D" ((uInt8 *)buffer+lineOfs[y1]+x1),   // %0
-           "S" ((uInt8 *)buffer+lineOfs[y2]+x2),   // %1
-           "a" (x2-x1), "b" (y2-y1),               // %2, %3
-           "d" (xRes), "m" (colour),               // %4, %5
-           "m" (tc)                                // %6
-        );
-     break;
-   case 15:
-   case 16:
-     __asm__ __volatile__(
-        "  mov  $1, %%ecx     \n"  // mov     ecx, 1
-        "  bt   $15, %%eax    \n"  // bt      eax, 15
-        "   jnc rlxPositive16 \n"  
-        "  or   $-1, %%ecx    \n"  // or      ecx, -1
-        "  neg  %%eax         \n"  // neg     eax
-"rlxPositive16:               \n"
-        "  add  %%eax, %%eax  \n"  // add     eax, eax
-        "  bt   $15, %%ebx    \n"  // bt      ebx, 15
-        "   jnc rlyPositive16 \n" 
-        "  neg  %%edx         \n"  // neg     edx
-        "  neg  %%ebx         \n"  // neg     ebx
-"rlyPositive16:               \n"
-        "  add  %%ebx, %%ebx  \n"  // add     ebx, ebx
-
-        "  cmp  %%ebx, %%eax  \n"  // cmp     eax, ebx
-        "   jle rlyGreater16  \n"  
-        "  push %%ecx         \n"  // push    ecx
-        "  mov  %%eax, %%ecx  \n"  // mov     ecx, eax
-        "  mov  %%ebx, %6     \n"  // mov     tc, ebx
-        "  shr  $1, %%ecx     \n"  // shr     ecx, 1
-        "  sub  %%ecx, %6     \n"  // sub     tc, ecx
-        "  pop  %%ecx         \n"  // pop     ecx
-"rlxTop16:                    \n"
-        "  push %%eax         \n"  // push    eax
-        "  mov  %5, %%eax     \n"  // mov     eax, colour
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  pop  %%eax         \n"  // pop     eax
-        "  cmp  %%edi, %%esi  \n"  // cmp     esi, edi
-        "   je  rlDone16      \n" 
-        "  cmp  $0, %6        \n"  // cmp     tc, 0
-        "   jl  rlNoAddY16    \n"  
-        "  add  %%edx, %%edi  \n"  // add     edi, edx
-        "  sub  %%eax, %6     \n"  // sub     tc, eax
-"rlNoAddY16:                  \n"
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  - pix size
-        "  add  %%ebx, %6     \n"  // add     tc, ebx
-        "   jmp rlxTop16      \n"
-
-"rlyGreater16:                \n"
-        "  push %%ecx         \n"  // push    ecx
-        "  mov  %%ebx, %%ecx  \n"  // mov     ecx, ebx
-        "  mov  %%eax, %6     \n"  // mov     tc, eax
-        "  shr  $1, %%ecx     \n"  // shr     ecx, 1
-        "  sub  %%ecx, %6     \n"  // sub     tc, ecx
-        "  pop  %%ecx         \n"
-"rlyTop16:                    \n"
-        "  push %%eax         \n"  // push    eax
-        "  mov  %5, %%eax     \n"  // mov     eax, colour
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  pop  %%eax         \n"  // pop     eax
-        "  cmp  %%edi, %%esi  \n"  // cmp     esi, edi
-        "   je  rlDone16      \n"
-        "  cmp  $0, %6        \n"  // cmp     tc, 0
-        "   jl  rlNoAddX16    \n"
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  - pix size
-        "  sub  %%ebx, %6     \n"  // sub     tc, ebx
-"rlNoAddX16:                  \n"
-        "  add  %%edx, %%edi  \n"  // add     edi, edx
-        "  add  %%eax, %6     \n"  // add     tc, eax
-        "   jmp rlyTop16      \n"
-"rlDone16:                    \n"
-        : 
-        :  "D" ((uInt8 *)buffer+lineOfs[y1]+(x1 << 1)),   // %0
-           "S" ((uInt8 *)buffer+lineOfs[y2]+(x2 << 1)),   // %1
-           "a" (x2-x1), "b" (y2-y1),                      // %2, %3
-           "d" (xRes), "m" (colour),                      // %4, %5
-           "m" (tc)                                       // %6
-        );
-     break;
-   case 24:
-     __asm__ __volatile__(
-        "  mov  $1, %%ecx     \n"  // mov     ecx, 1
-        "  bt   $15, %%eax    \n"  // bt      eax, 15
-        "   jnc rlxPositive24 \n"  
-        "  or   $-1, %%ecx    \n"  // or      ecx, -1
-        "  neg  %%eax         \n"  // neg     eax
-"rlxPositive24:               \n"
-        "  add  %%eax, %%eax  \n"  // add     eax, eax
-        "  bt   $15, %%ebx    \n"  // bt      ebx, 15
-        "   jnc rlyPositive24 \n" 
-        "  neg  %%edx         \n"  // neg     edx
-        "  neg  %%ebx         \n"  // neg     ebx
-"rlyPositive24:               \n"
-        "  add  %%ebx, %%ebx  \n"  // add     ebx, ebx
-
-        "  cmp  %%ebx, %%eax  \n"  // cmp     eax, ebx
-        "   jle rlyGreater24  \n"  
-        "  push %%ecx         \n"  // push    ecx
-        "  mov  %%eax, %%ecx  \n"  // mov     ecx, eax
-        "  mov  %%ebx, %6     \n"  // mov     tc, ebx
-        "  shr  $1, %%ecx     \n"  // shr     ecx, 1
-        "  sub  %%ecx, %6     \n"  // sub     tc, ecx
-        "  pop  %%ecx         \n"  // pop     ecx
-"rlxTop24:                    \n"
-        "  push %%eax         \n"  // push    eax
-        "  mov  %5, %%eax     \n"  // mov     eax, colour
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  shr  $16, %%eax    \n"  // shr     eax, 16
-        "  mov  %%al, 2(%%edi)\n"  // mov     [edi+2],al
-        "  pop  %%eax         \n"  // pop     eax
-        "  cmp  %%edi, %%esi  \n"  // cmp     esi, edi
-        "   je  rlDone24      \n" 
-        "  cmp  $0, %6        \n"  // cmp     tc, 0
-        "   jl  rlNoAddY24    \n"  
-        "  add  %%edx, %%edi  \n"  // add     edi, edx
-        "  sub  %%eax, %6     \n"  // sub     tc, eax
-"rlNoAddY24:                  \n"
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  - pix size
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx 
-        "  add  %%ebx, %6     \n"  // add     tc, ebx
-        "   jmp rlxTop24      \n"
-
-"rlyGreater24:                \n"
-        "  push %%ecx         \n"  // push    ecx
-        "  mov  %%ebx, %%ecx  \n"  // mov     ecx, ebx
-        "  mov  %%eax, %6     \n"  // mov     tc, eax
-        "  shr  $1, %%ecx     \n"  // shr     ecx, 1
-        "  sub  %%ecx, %6     \n"  // sub     tc, ecx
-        "  pop  %%ecx         \n"
-"rlyTop24:                    \n"
-        "  push %%eax         \n"  // push    eax
-        "  mov  %5, %%eax     \n"  // mov     eax, colour
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  shr  $16, %%eax    \n"  // shr     eax, 16
-        "  mov  %%al, 2(%%edi)\n"  // mov     [edi+2],al
-        "  pop  %%eax         \n"  // pop     eax
-        "  cmp  %%edi, %%esi  \n"  // cmp     esi, edi
-        "   je  rlDone24      \n"
-        "  cmp  $0, %6        \n"  // cmp     tc, 0
-        "   jl  rlNoAddX24    \n"
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx 
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  - pix size
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  
-        "  sub  %%ebx, %6     \n"  // sub     tc, ebx
-"rlNoAddX24:                  \n"
-        "  add  %%edx, %%edi  \n"  // add     edi, edx
-        "  add  %%eax, %6     \n"  // add     tc, eax
-        "   jmp rlyTop24      \n"
-"rlDone24:                    \n"
-        : 
-        :  "D" ((uInt8 *)buffer+lineOfs[y1]+(x1*3)),   // %0
-           "S" ((uInt8 *)buffer+lineOfs[y2]+(x2*3)),   // %1
-           "a" (x2-x1), "b" (y2-y1),                   // %2, %3
-           "d" (xRes), "m" (colour),                   // %4, %5
-           "m" (tc)                                    // %6
-        );
-     break;
-   case 32:
-     __asm__ __volatile__(
-        "  mov  $1, %%ecx     \n"  // mov     ecx, 1
-        "  bt   $15, %%eax    \n"  // bt      eax, 15
-        "   jnc rlxPositive32 \n"  
-        "  or   $-1, %%ecx    \n"  // or      ecx, -1
-        "  neg  %%eax         \n"  // neg     eax
-"rlxPositive32:               \n"
-        "  add  %%eax, %%eax  \n"  // add     eax, eax
-        "  bt   $15, %%ebx    \n"  // bt      ebx, 15
-        "   jnc rlyPositive32 \n" 
-        "  neg  %%edx         \n"  // neg     edx
-        "  neg  %%ebx         \n"  // neg     ebx
-"rlyPositive32:               \n"
-        "  add  %%ebx, %%ebx  \n"  // add     ebx, ebx
-
-        "  cmp  %%ebx, %%eax  \n"  // cmp     eax, ebx
-        "   jle rlyGreater32  \n"  
-        "  push %%ecx         \n"  // push    ecx
-        "  mov  %%eax, %%ecx  \n"  // mov     ecx, eax
-        "  mov  %%ebx, %6     \n"  // mov     tc, ebx
-        "  shr  $1, %%ecx     \n"  // shr     ecx, 1
-        "  sub  %%ecx, %6     \n"  // sub     tc, ecx
-        "  pop  %%ecx         \n"  // pop     ecx
-"rlxTop32:                    \n"
-        "  push %%eax         \n"  // push    eax
-        "  mov  %5, %%eax     \n"  // mov     eax, colour
-        "  mov  %%eax, (%%edi)\n"  // mov     [edi], eax
-        "  pop  %%eax         \n"  // pop     eax
-        "  cmp  %%edi, %%esi  \n"  // cmp     esi, edi
-        "   je  rlDone32      \n" 
-        "  cmp  $0, %6        \n"  // cmp     tc, 0
-        "   jl  rlNoAddY32    \n"  
-        "  add  %%edx, %%edi  \n"  // add     edi, edx
-        "  sub  %%eax, %6     \n"  // sub     tc, eax
-"rlNoAddY32:                  \n"
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  - pix size
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  - pix size
-        "  add  %%ebx, %6     \n"  // add     tc, ebx
-        "   jmp rlxTop32      \n"
-
-"rlyGreater32:                \n"
-        "  push %%ecx         \n"  // push    ecx
-        "  mov  %%ebx, %%ecx  \n"  // mov     ecx, ebx
-        "  mov  %%eax, %6     \n"  // mov     tc, eax
-        "  shr  $1, %%ecx     \n"  // shr     ecx, 1
-        "  sub  %%ecx, %6     \n"  // sub     tc, ecx
-        "  pop  %%ecx         \n"
-"rlyTop32:                    \n"
-        "  push %%eax         \n"  // push    eax
-        "  mov  %5, %%eax     \n"  // mov     eax, colour
-        "  mov  %%eax, (%%edi)\n"  // mov     [edi], eax
-        "  pop  %%eax         \n"  // pop     eax
-        "  cmp  %%edi, %%esi  \n"  // cmp     esi, edi
-        "   je  rlDone32      \n"
-        "  cmp  $0, %6        \n"  // cmp     tc, 0
-        "   jl  rlNoAddX32    \n"
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  - pix size
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx  - pix size
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  sub  %%ebx, %6     \n"  // sub     tc, ebx
-"rlNoAddX32:                  \n"
-        "  add  %%edx, %%edi  \n"  // add     edi, edx
-        "  add  %%eax, %6     \n"  // add     tc, eax
-        "   jmp rlyTop32      \n"
-"rlDone32:                    \n"
-        : 
-        :  "D" ((uInt8 *)buffer+lineOfs[y1]+(x1 << 2)),   // %0
-           "S" ((uInt8 *)buffer+lineOfs[y2]+(x2 << 2)),   // %1
-           "a" (x2-x1), "b" (y2-y1),               // %2, %3
-           "d" (xRes), "m" (colour),               // %4, %5
-           "m" (tc)                                // %6
-        );
-     break;
-   } // switch
-  return;
-} // ogSurface::RawLine
-#endif
-
-bool
-ogSurface::ogAlias(ogSurface& src, uInt32 x1, uInt32 y1, uInt32 x2, uInt32 y2) {
-  uInt32 tmp;
-
-  if (dataState == ogOwner) { 
-    ogSetLastError(ogAlreadyOwner);
-    return false;
-  } // if
-
-  if (x2 < x1) {
-    tmp= x2;
-    x2 = x1;
-    x1 = tmp;
-  } // if
-
-  if (y2 < y1) {
-    tmp= y2;
-    y2 = y1;
-    y1 = tmp;
-  } // if 
-
-  maxX = (x2-x1);
-  maxY = (y2-y1);
-
-  dataState = ogAliasing;
-
-  bSize = 0;
-  lSize = 0;
-
-  owner = &src;
-  buffer =((unsigned char *)(src.buffer)+x1*(src.bytesPerPix));
-  lineOfs=((uInt32 *)src.lineOfs)+y1;
-  attributes = src.attributes;
-
-  pal  = src.pal;
-  xRes = src.xRes;
-  yRes = src.yRes;
-  BPP  = src.BPP;
-  bytesPerPix = src.bytesPerPix;
-  pixFmtID = src.pixFmtID;
-  
-  // For 8bpp modes the next part doesn't matter
-  redFieldPosition   = src.redFieldPosition;
-  greenFieldPosition = src.greenFieldPosition;
-  blueFieldPosition  = src.blueFieldPosition;
-  alphaFieldPosition = src.alphaFieldPosition;
-  // The next part is only used by 15/16bpp
-  redShifter   = src.redShifter;
-  greenShifter = src.greenShifter;
-  blueShifter  = src.blueShifter;
-  alphaShifter = src.alphaShifter;
-  
-  alphaMasker = src.alphaMasker;
-
-  return true;
-} // ogSurface::ogAlias
-
-void
-ogSurface::ogArc(int32 xCenter, int32 yCenter, uInt32 radius, 
-             uInt32 sAngle, uInt32 eAngle, uInt32 colour) {
-  int32 p;
-  uInt32 x, y, tmp;
-  double alpha;
-  
-  if (radius == 0) {
-    ogSetPixel(xCenter, yCenter, colour);
-    return;
-  } // if
-
-  sAngle %= 361;
-  eAngle %= 361;
-
-  if (sAngle > eAngle) {
-    tmp = sAngle;
-    sAngle = eAngle;
-    eAngle = tmp;
-  } // if
-  
-  x = 0;
-  y = radius;
-  p = 3-2*radius;
-  
-  while (x <= y) {
-    alpha = (180.0/3.14159265358979)*atan((double)x/(double)y);
-
-    if ((alpha >= sAngle) && (alpha <= eAngle))
-      ogSetPixel(xCenter-x, yCenter-y, colour);
-
-    if ((90-alpha >= sAngle) && (90-alpha <= eAngle))
-      ogSetPixel(xCenter-y, yCenter-x, colour);
-
-    if ((90+alpha >= sAngle) && (90+alpha <= eAngle))
-      ogSetPixel(xCenter-y, yCenter+x, colour);
-
-    if ((180-alpha >= sAngle) && (180-alpha <= eAngle))
-      ogSetPixel(xCenter-x, yCenter+y, colour);
-
-    if ((180+alpha >= sAngle) && (180+alpha <= eAngle))
-      ogSetPixel(xCenter+x, yCenter+y, colour);
-
-    if ((270-alpha >= sAngle) && (270-alpha <= eAngle))
-      ogSetPixel(xCenter+y, yCenter+x, colour);
-
-    if ((270+alpha >= sAngle) && (270+alpha <= eAngle))
-      ogSetPixel(xCenter+y, yCenter-x, colour);
-
-    if ((360-alpha >= sAngle) && (360-alpha <= eAngle))
-      ogSetPixel(xCenter+x, yCenter-y, colour);
-
-    if (p < 0)
-      p += 4*x+6;
-    else {
-      p += 4*(x-y)+10;
-      --y;
-    } // else
-    ++x;
-  } // while
-  return;
-} // ogSurface::ogArc
-
-bool
-ogSurface::ogAvail(void) {
-  return ((buffer != NULL) && (lineOfs != NULL));
-} // ogSurface::ogAvail
-
-static int32
-calculate(float mu, int32 p0, int32 p1, int32 p2, int32 p3) {
-  float mu2, mu3;
-  mu2 = mu*mu;
-  mu3 = mu2*mu;
-  return (int32)(0.5f+(1.0/6.0)*(mu3*(-p0+3.0*p1-3.0*p2+p3)+
-                        mu2*(3.0*p0-6.0*p1+3.0*p2)+
-                        mu*(-3.0*p0+3.0*p2)+(p0+4.0*p1+p2)));
-} // calculate
-
-  
-void
-ogSurface::ogBSpline(uInt32 numPoints, ogPoint2d* points, uInt32 segments,
-                 uInt32 colour) {
-  float mu, mudelta;
-  int32 x1, y1, x2, y2;
-  uInt32 n, h;
-
-  if (points == NULL) return;
-
-  if ((numPoints < 4) || (numPoints > 255) || (segments == 0)) return;
-
-  mudelta = 1.0/segments;
-  for (n=3; n<numPoints; n++) {
-    mu = 0.0;
-    x1=calculate(mu,points[n-3].x,points[n-2].x, points[n-1].x,points[n].x);
-    y1=calculate(mu,points[n-3].y,points[n-2].y, points[n-1].y,points[n].y);
-    mu += mudelta;
-
-    for (h=0; h<segments; h++) {
-      x2=calculate(mu,points[n-3].x,points[n-2].x, points[n-1].x,points[n].x);
-      y2=calculate(mu,points[n-3].y,points[n-2].y, points[n-1].y,points[n].y);
-      ogLine(x1, y1, x2, y2, colour);
-      mu += mudelta;
-      x1 = x2;
-      y1 = y2;
-    } // for h
-
-  } // for n
-  return;
-} // ogSurface::ogBSpline
-
-void 
-ogSurface::ogCircle(int32 xCenter, int32 yCenter, uInt32 radius, uInt32 colour) {
-  int32 x, y, d;
-
-  x = 0;
-  y = radius;
-  d = 2*(1-radius);
-  while (y >= 0) {
-    ogSetPixel(xCenter+x, yCenter+y, colour);
-    ogSetPixel(xCenter+x, yCenter-y, colour);
-    ogSetPixel(xCenter-x, yCenter+y, colour);
-    ogSetPixel(xCenter-x, yCenter-y, colour);
-
-    if (d + y > 0) {
-      --y;
-      d -= 2*y+1;
-    } // if
-
-    if (x > d) {
-      ++x;
-      d += 2*x+1;
-    } // if
-  } // while
-  return;
-} // ogSurface::ogCircle
-
-void 
-ogSurface::ogClear(uInt32 colour) {
-  uInt32 height = 0;
-  uInt32 xx, yy;
-  uInt8 r, g, b, a;
-  if (!ogAvail()) return;
-
-  do {
-    if (ogIsBlending()) {
-      ogUnpack(colour, r, g, b, a);
-      if (a == 0) return;
-      if (a == 255) break;
-      for (yy = 0; yy <= maxY; yy++) 
-        for (xx = 0; xx <= maxX; xx++) 
-          RawSetPixel(xx, yy, r, g, b, a);
-      return;
-    } // if 
-  } while (false);
-
-  __asm__ __volatile__("cld\n");
-  switch (bytesPerPix) {
-   case 4:
-      __asm__ __volatile__(
-
-          "  add (%%esi), %%edi  \n"      // add edi, [esi]
-          "  mov %%ecx, %%esi    \n"      // mov esi, ecx
-          "  inc %%edx           \n"      // inc edx (maxX)
-          "  inc %%ebx           \n"      // inc ebx (maxY)
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          "  shl $2, %%ecx       \n"      // shl ecx, 2
-          "  sub %%ecx, %%esi    \n"      // sub esi, ecx // adjust for pix size
-      "loop32:                   \n"
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          " rep                  \n"
-          " stosl                \n"      
-          "  add %%esi, %%edi    \n"      // add edi, esi
-          "  dec %%ebx           \n"
-          "   jnz loop32         \n"
-          
-        :
-        : "D" (buffer), "S" (lineOfs),           // %0, %1
-          "a" (colour), "b" (maxY),              // %2, %3
-          "c" (xRes), "d" (maxX)                 // %4, %5
-     );
-     break;
-   case 3:
-      __asm__ __volatile__(
-          "  add (%%esi), %%edi  \n"      // add edi, [esi]
-          "  mov %%ecx, %%esi    \n"      // mov esi, ecx
-          "  inc %%edx           \n"      // inc edx (maxX)
-          "  inc %%ebx           \n"      // inc ebx (maxY)
-          "  sub %%edx, %%esi    \n"      // sub esi, edx // adjust for pix size
-          "  mov %%ebx, %6       \n"      // mov height, ebx
-          "  sub %%edx, %%esi    \n"      // sub esi, edx // adjust for pix size
-          "  mov %%eax, %%ebx    \n"      // mov ebx, eax
-          "  sub %%edx, %%esi    \n"      // sub esi, edx // adjust for pix size
-          "  shr $16, %%ebx      \n"      // shr ebx, 16
-      "oloop24:                  \n"
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-      "iloop24:                  \n"
-          "  mov %%ax,(%%edi)    \n"      // mov [edi],ax
-          "  movb %%bl,2(%%edi)  \n"      // mov [edi+2],bl
-          "  add $3, %%edi       \n"      // add edi, 3
-          "  dec %%ecx           \n"      // dec ecx
-          "   jnz iloop24        \n"
-          "  add %%esi, %%edi    \n"      // add edi, esi
-          "  decl %6             \n"      // dec height
-          "   jnz oloop24        \n"
-        :
-        : "D" (buffer), "S" (lineOfs),           // %0, %1
-          "a" (colour), "b" (maxY),              // %2, %3
-          "c" (xRes), "d" (maxX),                // %4, %5
-          "m" (height)                           // %6
-        );
-       break;
-   case 2:
-      __asm__ __volatile__(
-          "  add (%%esi), %%edi  \n"      // add edi, [esi]
-          "  mov %%ecx, %%esi    \n"      // mov esi, ecx
-          "  inc %%edx           \n"      // inc edx (maxX)
-          "  inc %%ebx           \n"      // inc ebx (maxY)
-          "  sub %%edx, %%esi    \n"      // sub esi, edx
-          "  sub %%edx, %%esi    \n"      // sub esi, edx // adjust for pix size
-          "  mov %%ax, %%cx      \n"      // mov cx, ax
-          "  shl $16, %%eax      \n"      // shl eax, 16
-          "  mov %%cx, %%ax      \n"      // mov ax, cx
-      "loop16:                   \n"
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          "  shr $1, %%ecx       \n"      // shr ecx, 1
-          " rep                  \n"
-          " stosl                \n"      
-          "  jnc noc16           \n"
-          " stosw                \n"
-      "noc16:                    \n"
-          "  add %%esi, %%edi    \n"      // add edi, esi
-          "  dec %%ebx           \n"
-          "   jnz loop16         \n"
-        :
-        : "D" (buffer), "S" (lineOfs),           // %0, %1
-          "a" (colour), "b" (maxY),              // %2, %3
-          "c" (xRes), "d" (maxX)                 // %4, %5
-      );
-      break;
-    case 1:
-      __asm__ __volatile__(
-          "  add (%%esi), %%edi  \n"      // add edi, [esi]
-          "  mov %%ecx, %%esi    \n"      // mov esi, ecx
-          "  inc %%edx           \n"      // inc edx (maxY)
-          "  inc %%ebx           \n"      // inc ebx (maxX)
-          "  sub %%edx, %%esi    \n"      // sub esi, edx
-          "  mov %%al, %%ah      \n"      // mov ah, al
-          "  mov %%ax, %%cx      \n"      // mov cx, ax
-          "  shl $16, %%eax      \n"      // shl eax, 16
-          "  mov %%cx, %%ax      \n"      // mov ax, cx
-      "loop8:                    \n"
-          "  push %%edx          \n"
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          "  and $3, %%edx       \n"      // and edx, 3
-          "  shr $2, %%ecx       \n"      // shr ecx, 2
-          " rep                  \n"
-          " stosl                \n"      
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          " rep                  \n"
-          " stosb                \n"      
-          "  pop %%edx           \n"
-          "  add %%esi, %%edi    \n"      // add edi, esi
-          "  dec %%ebx           \n"
-          "   jnz loop8          \n"
-        :
-        : "D" (buffer), "S" (lineOfs),           // %0, %1
-          "a" (colour), "b" (maxY),              // %2, %3
-          "c" (xRes), "d" (maxX)                 // %4, %5
-      );
-      break;
-  } // switch
-  return;
-} // ogSurface::ogClear
-
-bool 
-ogSurface::ogClone(ogSurface& src) {
-  bool created;
-  ogPixelFmt pixFmt;
-
-  if (src.dataState == ogNone) {
-    ogSetLastError(ogNoSurface);
-    return false;
-  } // if
-
-  src.ogGetPixFmt(pixFmt);
-  created = ogCreate(src.maxX+1, src.maxY+1, pixFmt);
-  if (!created) return false;
-
-  *attributes = *src.attributes;
-
-  ogCopyPalette(src);
-  ogCopy(src);
-  return true;
-} // ogSurface::ogClone
-
-void 
-ogSurface::ogCopy(ogSurface& src) {
-  uInt32 pixMap[256];
-  uInt32 count, xCount, yCount;
-  uInt32 xx, yy;
-  uInt8  r, g, b, a;
-  void * srcPtr;
-  
-  if (!ogAvail()) return;
-  if (!src.ogAvail()) return;
-
-  xCount = src.maxX+1;
-  if (xCount > maxX+1) xCount = maxX+1;
-  yCount = src.maxY+1;
-  if (yCount > maxY+1) yCount = maxY+1;
-
-  if (ogIsBlending()) {
-
-    for (yy = 0; yy < yCount; yy++) 
-      for (xx = 0; xx < xCount; xx++) {
-        src.ogUnpack(src.RawGetPixel(xx, yy), r, g, b, a);
-        RawSetPixel(xx, yy, r, g, b, a);
-      } // for xx
-
-    return;
-  } // if blending
-
-  if (pixFmtID != src.pixFmtID) {
-    if (src.bytesPerPix == 1) {
-      for (xx = 0; xx < 256; xx++)
-        pixMap[xx] = ogPack(src.pal[xx].red,
-                            src.pal[xx].green,
-                            src.pal[xx].blue,
-                            src.pal[xx].alpha);
-
-      for (yy = 0; yy < yCount; yy++) 
-        for (xx = 0; xx < xCount; xx++) 
-          RawSetPixel(xx, yy, pixMap[src.RawGetPixel(xx, yy)]);
-
-    } else {  // if src.bytesPerPix == 1
-      ogPixelFmt srcPixFmt, dstPixFmt;
-      src.ogGetPixFmt(srcPixFmt);
-      ogGetPixFmt(dstPixFmt);
-      ogPixCon * pc = new ogPixCon(srcPixFmt, dstPixFmt);
-      
-      for (yy = 0; yy < yCount; yy++) 
-        for (xx = 0; xx < xCount; xx++) 
-          RawSetPixel(xx, yy, pc->ConvPix(src.RawGetPixel(xx, yy)));
-
-      delete pc;
-    } // else
-  } else {
-
-    xCount *= bytesPerPix;
-
-    for (count = 0; count < yCount; count++)
-      if ((srcPtr = src.ogGetPtr(0, count)) == NULL) {
-        /*
-         * if we are here then we couldn't get a direct memory pointer
-         * from the source object.  This means that it is not a normal
-         * "memory" buffer and we have to use the implementation inspecific
-         * interface.  We let the source buffer fill a "temporary" buffer
-         * and then we copy it to where it needs to go.
-         */
-#ifdef __UBIXOS_KERNEL__
-        srcPtr = kmalloc(xCount);  // allocate space
-#else
-        srcPtr = malloc(xCount);  // allocate space
-#endif
-        if (srcPtr != NULL) {
-          src.ogCopyLineFrom(0, count, srcPtr, xCount);
-          ogCopyLineTo(0, count, srcPtr, xCount);
-#ifdef __UBIXOS_KERNEL__
-          kfree(srcPtr);
-#else
-          free(srcPtr);
-#endif
-        } // if srcPtr!=NULL
-      } else ogCopyLineTo(0, count, srcPtr, xCount);
-  } // else
-} // ogSurface::ogCopy
-
-void
-ogSurface::ogCopyBuf(int32 dX1, int32 dY1, 
-                 ogSurface& src, int32 sX1, int32 sY1, int32 sX2, int32 sY2) {
-  uInt32 pixMap[256];
-  int32 xx, yy, count, xCount, yCount;
-  uInt8 r, g, b, a;
-  void *srcPtr;
-  ogPixCon * pc;
-  ogPixelFmt srcPixFmt, dstPixFmt;
-  
-  if (!ogAvail()) return;
-  if (!src.ogAvail()) return;
-  
-  if ((dX1 > (int32)maxX) || (dY1 > (int32)maxY)) return;
-  
-  // if any of the source buffer is out of bounds then do nothing 
-  if (( (uInt32)sX1 > src.maxX) || ((uInt32)sX2 > src.maxX) ||
-      ( (uInt32)sY1 > src.maxY) || ((uInt32)sY2 > src.maxY)) return;
-
-  if (sX1 > sX2) {
-    xx = sX1;
-    sX1= sX2;
-    sX2= xx;
-  } // if
-
-  if (sY1 > sY2) {
-    yy = sY1;
-    sY1= sY2;
-    sY2= yy;
-  } // if
-
-  xCount = abs(sX2-sX1)+1;
-  yCount = abs(sY2-sY1)+1;
-  
-  if (dX1+xCount > (int32)maxX+1) xCount = maxX-dX1+1;
-  if (dY1+yCount > (int32)maxY+1) yCount = maxY-dY1+1;
-
-  if (dX1 < 0) {
-    xCount += dX1;
-    sX1 -= dX1;
-    dX1 = 0;
-  } // if
- 
-  if (dY1 < 0) {
-    yCount += dY1;
-    sY1 -= dY1;
-    dY1 = 0;
-  } // if
- 
-  if ((dX1+xCount < 0) || (dY1+yCount < 0)) return;
-
-  if (ogIsBlending()) {
-    for (yy = 0; yy < yCount; yy++) 
-      for (xx = 0; xx < xCount; xx++) {
-        src.ogUnpack(src.RawGetPixel(sX1+xx, sY1+yy), r, g, b, a);
-        RawSetPixel(dX1+xx, dY1+yy, r, g, b, a);
-      } // for xx
-  } // if IsBlending
-
-  if (pixFmtID != src.pixFmtID) {
-
-    if (src.bytesPerPix == 1) {
-      for (xx = 0; xx < 256; xx++) 
-        pixMap[xx] = ogPack(src.pal[xx].red,
-                            src.pal[xx].green,
-                            src.pal[xx].blue,
-                            src.pal[xx].alpha);
-
-      for (yy = 0; yy < yCount; yy++) 
-        for (xx = 0; xx < xCount; xx++)
-          RawSetPixel(dX1+xx,dY1+yy,
-                     pixMap[src.ogGetPixel(sX1+xx,sY1+yy)]); 
-    } else {
-      
-      src.ogGetPixFmt(srcPixFmt);
-      ogGetPixFmt(dstPixFmt);
-      pc = new ogPixCon(srcPixFmt, dstPixFmt);  // allocate the pixel converter
-      if (pc == NULL) return;
-
-      for (yy = 0; yy < yCount; yy++)
-        for (xx = 0; xx < xCount; xx++) {
-          RawSetPixel(dX1+xx, dY1+yy, 
-                      pc->ConvPix(src.RawGetPixel(sX1+xx, sY1+yy)));
-        } // for xx
-
-      delete pc; // destroy the pixel converter
-
-    } // else
-  } else {
-    xCount *= bytesPerPix;
-
-    for (count = 0; count < yCount; count++)
-      if ((srcPtr = src.ogGetPtr(sX1, sY1+count)) == NULL) {
-        // if we are here then we couldn't get a direct memory pointer
-        // from the source object.  This means that it is not a normal
-        // "memory" buffer and we have to use the implementation inspecific
-        // interface.  We let the source buffer fill a "temporary" buffer
-        // and then we copy it to where it needs to go.
-        
-#ifdef __UBIXOS_KERNEL__
-        srcPtr = kmalloc(xCount);  // allocate space
-#else
-        srcPtr = malloc(xCount);  // allocate space
-#endif
-        if (srcPtr != NULL) {
-          src.ogCopyLineFrom(sX1, sY1+count, srcPtr, xCount);
-          ogCopyLineTo(dX1, dY1+count, srcPtr, xCount);
-#ifdef __UBIXOS_KERNEL__
-          kfree(srcPtr);
-#else
-          free(srcPtr);
-#endif
-        } // if srcPtr!=NULL
-      } else ogCopyLineTo(dX1,dY1+count,srcPtr,xCount);
-  } // else
-} // ogSurface::ogCopyBuf
-
-void
-ogSurface::ogCopyLineTo(uInt32 dx, uInt32 dy, const void * src, uInt32 size) {
-  /*
-   * CopyLineTo()
-   *
-   * Inputs:
-   *
-   * dx   - Destination X of the target buffer
-   * dy   - Destination Y of the target buffer
-   * src  - buffer to copy
-   * size - size in bytes *NOT* pixels
-   *
-   * Copies a run of pixels (of the same format) to (x,y) of a buffer
-   *
-   * This method is required because of the different implementations of
-   * copying a run of pixels to a buffer
-   *
-   * WARNING!!! This does *NO* error checking. It is assumed that you've
-   * done all of that.  CopyLineTo and CopyLineFrom are the only
-   * methods that don't check to make sure you're hosing things.  Don't
-   * use this method unless YOU KNOW WHAT YOU'RE DOING!!!!!!!!!
-   */
-   
-  memcpy( (uInt8*)buffer+lineOfs[dy]+dx*bytesPerPix,         // dest
-          src,                                               // src
-          size);                                             // size
-  
-  return;
-} // ogSurface::ogCopyLineTo
-
-void
-ogSurface::ogCopyLineFrom(uInt32 sx, uInt32 sy, void * dst, uInt32 size) {
-  /*
-   * CopyLineFrom()
-   *
-   * Inputs:
-   *
-   * sx   - Source X of the target buffer
-   * sy   - Source Y of the target buffer
-   * dest - where to put it
-   * size - size in bytes *NOT* pixels
-   *
-   * Copies a run of pixels (of the same format) to (x,y) of a buffer
-   *
-   * This method is required because of the different implementations of
-   * copying a run of pixels to a buffer
-   *
-   * WARNING!!! This does *NO* error checking. It is assumed that you've
-   * done all of that.  CopyLineTo and CopyLineFrom are the only
-   * methods that don't check to make sure you're hosing things.  Don't
-   * use this method unless YOU KNOW WHAT YOU'RE DOING!!!!!!!!!
-   */
-
-  memcpy( dst,                                               // dest
-          (uInt8*)buffer+lineOfs[sy]+sx*bytesPerPix,         // src
-          size);                                             // size
-
-  return;
-} // ogSurface::ogCopyLineFrom
-
-void
-ogSurface::ogCopyPalette(ogSurface& src) {
-  if (src.pal == NULL) return;
-  if (pal == NULL) pal = new ogRGBA8[256];
-  if (pal == NULL) return;
-  src.ogGetPalette(pal);
-  // memcpy(pal, src.pal, sizeof(ogRGBA8)*256);
-  return;
-} // ogSurface::ogCopyPalette
-
-bool 
-ogSurface::ogCreate(uInt32 _xRes, uInt32 _yRes, ogPixelFmt _pixFormat) {
-  /*
-   *  ogSurface::ogCreate()
-   *  Allocates memory for a buffer of size _xRes by _yRes with
-   *  the pixel format defined in _pixformat.  Allocates memory
-   *  for pal and lineOfs.
-   */
-  void        * newBuffer = NULL;
-  uInt32      * newLineOfs = NULL;
-  ogRGBA8     * newPal = NULL;
-  ogAttributes* newAttributes = NULL;
-
-  uInt32        newBSize;
-  uInt32        newLSize;
-  uInt32        yy;
-
-  bool          status = false;
- 
-  switch (_pixFormat.BPP) {
-   case 8:
-   case 15:
-   case 16:
-   case 24:
-   case 32:
-    break;
-   default:
-     ogSetLastError(ogBadBPP);
-     return false;
-  } // switch
-
-  newBSize = _xRes * _yRes * ((_pixFormat.BPP + 7) >> 3);
-  newLSize = _yRes * sizeof(uInt32);  // number of scan lines * sizeof(uInt32)
-
-#ifdef __UBIXOS_KERNEL__
-  newBuffer = kmalloc(newBSize);
-#else
-  newBuffer = malloc(newBSize);
-#endif
-  newLineOfs = new uInt32[_yRes];
-  newPal = new ogRGBA8[256];
-  newAttributes = new ogAttributes();
-
-  do {
-
-    if ((newBuffer == NULL) || (newLineOfs == NULL)  ||
-        (newPal == NULL) || (newAttributes == NULL)) {
-      ogSetLastError(ogMemAllocFail);
-      break;                           // break out of do {...} while(false) 
-    } // if 
-
-    // check to see if we have already allocated memory .. if so, free it
-
-    if (dataState == ogOwner) {
-#ifdef __UBIXOS_KERNEL__
-      kfree(buffer);
-#else
-      free(buffer);
-#endif
-      delete [] lineOfs;
-      delete [] pal;
-      delete attributes;
-    }  // if dataState
-
-    buffer = newBuffer;
-    lineOfs = newLineOfs;
-    pal = newPal;
-    attributes = newAttributes;
-    bSize = newBSize;
-    lSize = newLSize; 
- 
-    newBuffer     = NULL;
-    newLineOfs    = NULL;
-    newPal        = NULL;
-    newAttributes = NULL;
- 
-    BPP = _pixFormat.BPP;
-    bytesPerPix = (BPP + 7) >> 3;
-
-    ogSetPalette(DEFAULT_PALETTE); 
-    // memcpy(pal, DEFAULT_PALETTE, sizeof(ogRGBA8)*256);
-
-    maxX = _xRes -1;
-    xRes = _xRes * bytesPerPix;
-    maxY = _yRes -1;
-    yRes = _yRes;
-
-    // in the pascal version we go from 1 to maxY .. here we use yy < yRes
-    // (which is the same)
-
-    lineOfs[0] = 0;
-    for (yy = 1; yy < yRes; yy++)
-      lineOfs[yy] = lineOfs[yy-1]+xRes;
-
-    dataState = ogOwner;
-
-    // For 8bpp modes the next part doesn't matter 
-
-    redFieldPosition   = _pixFormat.redFieldPosition;
-    greenFieldPosition = _pixFormat.greenFieldPosition;
-    blueFieldPosition  = _pixFormat.blueFieldPosition;
-    alphaFieldPosition = _pixFormat.alphaFieldPosition;
-    // The next part is only used by 15/16hpp 
-    redShifter   = 8-_pixFormat.redMaskSize;
-    greenShifter = 8-_pixFormat.greenMaskSize;
-    blueShifter  = 8-_pixFormat.blueMaskSize;
-    alphaShifter = 8-_pixFormat.alphaMaskSize;
-
-    if (_pixFormat.alphaMaskSize != 0) 
-      alphaMasker = ~(OG_MASKS[_pixFormat.alphaMaskSize] << alphaFieldPosition);
-    else
-      alphaMasker = ~0;
-
-    if (bytesPerPix == 1) {
-      pixFmtID = 0x08080808;
-      // turn anti aliasing off by default for 8bpp modes
-      ogSetAntiAliasing(false);
-    } else {
-      pixFmtID = (redFieldPosition) | 
-                 (greenFieldPosition << 8) | 
-                 (blueFieldPosition << 16) |
-                 (alphaFieldPosition << 24);
-      ogSetAntiAliasing(true);
-    } // else
-
-    ogClear(ogPack(0, 0, 0));
-
-    owner = this;
-    status = true;
-  } while(false);
-
-#ifdef __UBIXOS_KERNEL__
-  if (newBuffer) kfree(newBuffer);
-#else
-  if (newBuffer) free(newBuffer);
-#endif
-  if (newLineOfs) delete [] newLineOfs;
-  if (newPal) delete [] newPal;
-  if (newAttributes) delete newAttributes;
-
-  return status;
-} // ogSurface::ogCreate
-
-void
-ogSurface::ogCubicBezierCurve(int32 x1, int32 y1, int32 x2, int32 y2,
-                          int32 x3, int32 y3, int32 x4, int32 y4,
-                          uInt32 segments, uInt32 colour) {
-  float tX1, tY1, tX2, tY2, tX3, tY3, mu, mu2, mu3, mudelta;
-  int32 xStart, yStart, xEnd, yEnd;
-  uInt32 n;
-  if (segments < 1) return;
-  if (segments > 128) segments=128;
- 
-  mudelta = 1.0/segments;
-  mu = mudelta;
-  tX1 =-x1+3*x2-3*x3+x4;
-  tY1 =-y1+3*y2-3*y3+y4;
-  tX2 =3*x1-6*x2+3*x3;
-  tY2 =3*y1-6*y2+3*y3;
-  tX3 =-3*x1+3*x2;
-  tY3 =-3*y1+3*y2;
-
-  xStart = x1;
-  yStart = y1;
-
-  for (n = 1; n < segments; n++) {
-    mu2 = mu*mu;
-    mu3 = mu2*mu;
-    xEnd = static_cast<int32>(mu3*tX1+mu2*tX2+mu*tX3+x1 +0.5f);
-    yEnd = static_cast<int32>(mu3*tY1+mu2*tY2+mu*tY3+y1 +0.5f);
-    ogLine(xStart, yStart, xEnd, yEnd, colour);
-    mu += mudelta;
-    xStart = xEnd;
-    yStart = yEnd;
-  } // for
-  return;
-} // ogSurface::ogCubicBezierCurve
-
-void
-ogSurface::ogCurve(int32 x1, int32 y1, int32 x2, int32 y2, int32 x3, int32 y3,
-               uInt32 segments, uInt32 colour) {
-  int64 ex, ey, fx, fy;
-  int64 t1, t2;
-
-  if (segments<2) segments=2; else if (segments>128) segments=128;
-  x2 = (x2*2)-((x1+x3)/2);
-  y2 = (y2*2)-((y1+y3)/2);
-
-  ex = ((int64)(x2-x1) << 17) / segments;
-  ey = ((int64)(y2-y1) << 17) / (int64)segments;
-  fx = ((int64)(x3-(2*x2)+x1) << 16) / (segments*segments);
-  fy = ((int64)(y3-(2*y2)+y1) << 16) / (int64)(segments*segments);
-
-  while (--segments > 0) {
-    t1 = x3;
-    t2 = y3;
-    x3 = ((int64)((fx*segments+ex)*segments) / 65536L)+x1;
-    y3 = ((int64)((fy*segments+ey)*segments) / 65536L)+y1;
-    ogLine(t1, t2, x3, y3, colour);
-  } // while
-  ogLine(x3, y3, x1, y1, colour);
-  return;
-  
-} // ogSurface::ogCurve
-
-void
-ogSurface::ogFillCircle(int32 xCenter, int32 yCenter, 
-                    uInt32 radius, uInt32 colour) {
-  int32 x, y, d;
-  x = 0;
-  y = radius;
-  d = 4*(1-radius);
-
-  while (y >= 0) {
-    if (d + y > 0) {
-      ogHLine(xCenter-x, xCenter+x, yCenter-y, colour);
-      if (y != 0) ogHLine(xCenter-x, xCenter+x, yCenter+y, colour);
-      
-      --y;
-      d -= 4*y+1;
-    } // if
-    
-
-    if (x > d) {
-      ++x;
-      d += 4*x+1;
-    } // if
-  } // while
-  return;
-} // ogSurface::ogFillCircle
-
-#if 0
-!-/* Scan converts an edge from (X1,Y1) to (X2,Y2), not including the
-!- * point at (X2,Y2). This avoids overlapping the end of one line with
-!- * the start of the next, and causes the bottom scan line of the
-!- * polygon not to be drawn. If SkipFirst != 0, the point at (X1,Y1)
-!- * isn't drawn. For each scan line, the pixel closest to the scanned
-!- * line without being to the left of the scanned line is chosen
-!- */
-!-static void index_forward(int32 & index, uInt32 numPoints) {
-!-  index = (index + 1) % numPoints;
-!-  return;
-!-} // index_forward
-!-
-!-static void index_backward(int32 & index, uInt32 numPoints) {
-!-  index = (index - 1 + numPoints) % numPoints;
-!-  return;
-!-} // index_forward
-!-
-!-static void index_move(int32 & index, uInt32 numPoints, int32 direction) {
-!-  if (direction > 0)
-!-    index_forward(index, numPoints);
-!-  else
-!-    index_backward(index, numPoints);
-!-  return;
-!-} // index_move
-!-
-!-static void scanEdge(int32 x1, int32 y1, int32 x2, int32 y2,
-!-                     uInt32 & eIdx, int32 * xList) {
-!-  int32 y, deltaX, deltaY;
-!-  float inverseSlope;
-!-
-!-  deltaX = x2 - x1;
-!-  deltaY = y2 - y1;
-!-  if (deltaY <= 0) return;
-!-  inverseSlope = deltaX / deltaY;
-!-  
-!-  // Store the X coordinate of the pixel closest to but not to the
-!-  // left of the line for each Y coordinate between Y1 and Y2, not
-!-  // including Y2
-!-  y = y1;
-!-  do {
-!-    xList[eIdx] = x1+ (int32)(0.5f+((y-y1)*inverseSlope));
-!-    y++;
-!-    eIdx++;
-!-  } while (y<y2);
-!-  return;
-!-} // scanEdge
-!-
-!-void
-!-ogSurface::FillConvexPolygon(uInt32 numPoints, ogPoint2d* polyPoints, uInt32 colour) {
-!-  int32 i, minIndexL, maxIndex, minIndexR, temp;
-!-  int32 minPointY, maxPointY, leftEdgeDir;
-!-  int32 topIsFlat, nextIndex, curIndex, prevIndex;
-!-  int32 deltaXN, deltaYN, deltaXP, deltaYP;
-!-  ogHLineList workingHLineList;
-!-  uInt32 edgePointIdx;
-!-  uInt32 vetexIdx;
-!-
-!-  if (numPoints<2) return;
-!-  minIndexL = maxIndex = 0;
-!-  minPointY = maxPointY = polyPoints[0].y;
-!-  for (i = 1; i < (int32)numPoints; i++) {
-!-    if (polyPoints[i].y < minPointY) {
-!-      minIndexL = i;
-!-      minPointY = polyPoints[i].y; // new top
-!-    } else if (polyPoints[i].y > maxPointY) {
-!-      maxIndex = i;
-!-      maxPointY = polyPoints[i].y; // new bottom
-!-    } // else if
-!-  } // for
-!-
-!-  if (minPointY == maxPointY) return;
-!-
-!-  // scan in ascending order to find the last top-edge point
-!-  minIndexR = minIndexL;
-!-  while (polyPoints[minIndexR].y == minPointY) index_forward(minIndexR, numPoints);
-!-  index_backward(minIndexR, numPoints);  // back up to last top-edge point
-!-
-!-  // now scan in descending order to find the first top-edge point
-!-  while (polyPoints[minIndexL].y == minPointY) index_backward(minIndexL, numPoints);
-!-  index_forward(minIndexL, numPoints);
-!-
-!-  // figure out which direction through the vertex list from the top
-!-  // vertex is the left edge and which is the right
-!-  leftEdgeDir = -1;
-!-  
-!-  topIsFlat = (polyPoints[minIndexL].x==polyPoints[minIndexR].x) ? 0 : 1;
-!-  if (topIsFlat==1) {
-!-    if (polyPoints[minIndexL].x > polyPoints[minIndexR].x) {
-!-      leftEdgeDir = 1;
-!-      temp = minIndexL;
-!-      minIndexL = minIndexR;
-!-      minIndexR = temp;
-!-    }
-!-  } else {
-!-    // Point to the downward end of the first line of each of the
-!-    // two edges down from the top
-!-    nextIndex = minIndexR;
-!-    index_forward(nextIndex, numPoints);
-!-    prevIndex = minIndexL;
-!-    index_forward(prevIndex, numPoints);
-!-
-!-    deltaXN = polyPoints[nextIndex].x - polyPoints[minIndexL].x;
-!-    deltaYN = polyPoints[nextIndex].y - polyPoints[minIndexL].y;
-!-    deltaXP = polyPoints[prevIndex].x - polyPoints[minIndexL].x;
-!-    deltaYP = polyPoints[prevIndex].y - polyPoints[minIndexL].y;
-!-    if (deltaXN * deltaYP - deltaYN * deltaXP < 0) {
-!-      leftEdgeDir = 1;
-!-      temp = minIndexL;
-!-      minIndexL = minIndexR;
-!-      minIndexR = temp;
-!-    } // if
-!-  } // else
-!-
-!-  /* Set the # of scan lines in the polygon, skipping the bottom edge
-!-   * and also skipping the top vertex if the top isn't flat because
-!-   * in that case the top vertex has a right edge component, and set
-!-   * the top scan line to draw, which is likewise the second line of
-!-   * the polygon unles the top if flat
-!-   */
-!-
-!-  workingHLineList.length = maxPointY - minPointY;
-!-  if (workingHLineList.length <= 0) return;
-!-  workingHLineList.yStart = minPointY;
-!-
-!-  // get memory in which to srote the line list we generate
-!-  workingHLineList.xLeft = workingHLineList.xRight = NULL;
-!-  if ((workingHLineList.xLeft = new int32[workingHLineList.length]) == NULL) return;
-!-  if ((workingHLineList.xRight = new int32[workingHLineList.length]) == NULL) {
-!-    delete workingHLineList.xLeft;
-!-    return;
-!-  }
-!-  memset(workingHLineList.xLeft,0,workingHLineList.length*sizeof(int32));
-!-  memset(workingHLineList.xRight,0,workingHLineList.length*sizeof(int32));
-!-
-!-  // scan the left edge and store the boundary points int he list
-!-  // Initial pointer for storing scan converted left-edge coords
-!-  edgePointIdx = 0;
-!-
-!-  // start from the top of the left edge
-!-  curIndex = prevIndex = minIndexL;
-!-
-!-  do {
-!-    index_move(curIndex, numPoints, leftEdgeDir);
-!-    scanEdge(polyPoints[prevIndex].x,
-!-             polyPoints[prevIndex].y,
-!-             polyPoints[curIndex].x,
-!-             polyPoints[curIndex].y,
-!-             edgePointIdx,
-!-             workingHLineList.xLeft);
-!-    prevIndex = curIndex;
-!-  } while (curIndex != maxIndex);
-!-
-!-  edgePointIdx = 0;
-!-  curIndex = prevIndex = minIndexR;
-!-  // Scan convert the right edge, top to bottom. X coordinates are
-!-  // adjusted 1 to the left, effectively causing scan conversion of
-!-  // the nearest points to the left of but not exactly on the edge }
-!-  do {
-!-    index_move(curIndex, numPoints, -leftEdgeDir);
-!-    scanEdge(polyPoints[prevIndex].x,
-!-             polyPoints[prevIndex].y,
-!-             polyPoints[curIndex].x,
-!-             polyPoints[curIndex].y,
-!-             edgePointIdx,
-!-             workingHLineList.xRight);
-!-    prevIndex = curIndex;
-!-  } while (curIndex != maxIndex);
-!-
-!-  ogPolygon(numPoints, polyPoints, colour);
-!-
-!-  for (i = 0; i < workingHLineList.length; i++) {
-!-    HLine(workingHLineList.xLeft[i], workingHLineList.xRight[i],
-!-            workingHLineList.yStart+i, colour);
-!-  } // for
-!-
-!-  ogPolygon(numPoints, polyPoints, colour);
-!-  
-!-  delete workingHLineList.xLeft;
-!-  delete workingHLineList.xRight;
-!-  
-!-  return;
-!-} // ogSurface::FillConvexPolygon
-#endif
-
-void
-ogSurface::ogFillGouraudPolygon(uInt32 numPoints, ogPoint2d* polyPoints, ogRGBA8 * colours) {
-
-  ogEdgeTable * edges;
-  int32 currentY = ~0;
-
-  if (numPoints < 3) return;
-
-  edges = new ogEdgeTable();
-
-  if (edges == NULL) return;  // sanity check
-
-  edges->BuildGET_G(numPoints, polyPoints, colours);
-
-  if (edges->globalEdges != NULL)
-    currentY = edges->globalEdges->startY;
-
-  while ((edges->globalEdges != NULL) || (edges->activeEdges != NULL)) {
-    edges->MoveXSortedToAET(currentY);
-    edges->ScanOutAET_G(*this, currentY);
-    edges->AdvanceAET();
-    edges->XSortAET();
-    ++currentY;
-    if (currentY > (int32)maxY) break; // if we've gone past the bottom, stop
-  } // while
-
-  delete edges;
-  return;
-} // ogSurface::ogFillGouraudPolygon
-
-void
-ogSurface::ogFillPolygon(uInt32 numPoints, ogPoint2d* polyPoints, uInt32 colour) {
-  ogEdgeTable * edges;
-  int32 currentY = ~0;
-
-  if (numPoints < 3) return;
-
-  if (!ogIsBlending()) ogPolygon(numPoints, polyPoints, colour);
-
-  edges = new ogEdgeTable();
-
-  if (edges == NULL) return;  // sanity check
-
-  edges->BuildGET(numPoints, polyPoints);
-
-  if (edges->globalEdges != NULL)
-    currentY = edges->globalEdges->startY;
-
-  while ((edges->globalEdges != NULL) || (edges->activeEdges != NULL)) {
-    edges->MoveXSortedToAET(currentY);
-    edges->ScanOutAET(*this, currentY, colour);
-    edges->AdvanceAET();
-    edges->XSortAET();
-    ++currentY;
-    if (currentY > (int32)maxY) break; // if we've gone past the bottom, stop
-  } // while
-  delete edges;
-  return;
-} // ogSurface::ogFillPolygon
-
-void 
-ogSurface::ogFillRect(int32 x1, int32 y1, int32 x2, int32 y2, uInt32 colour) {
-  int32 yy, tmp;
-
-  if (x2 < x1) {
-    tmp= x2;
-    x2 = x1;
-    x1 = tmp;
-  } // if
-
-  if (y2 < y1) {
-    tmp= y2;
-    y2 = y1;
-    y1 = tmp;
-  } // if 
-
-  if ((y2 < 0) || (y1 > (int32)maxY)) return;
-  if (y1 < 0) y1 = 0;
-  if (y2 > (int32)maxY) y2 = maxY;
-  for (yy = y1; yy <= y2; yy++)
-    ogHLine(x1, x2, yy, colour);
-} // ogSurface::ogFillRect
-
-void ogSurface::ogFillTriangle(int32 x1, int32 y1, int32 x2, int32 y2,
-                             int32 x3, int32 y3, uInt32 colour) {
-  ogPoint2d points[3];
-  points[0].x = x1;
-  points[0].y = y1;
-  points[1].x = x2;
-  points[1].y = y2;
-  points[2].x = x3;
-  points[2].y = y3;
-
-  ogFillPolygon(3, points, colour);
-
-  return;
-} // ogSurface::ogFillTriangle
-
-uInt32
-ogSurface::ogGetAlpha(void) {
-  if (attributes != NULL)  
-    return attributes->defaultAlpha;
-  else
-    return 255L;
-} // ogSurface::ogGetAlpha
-
-ogErrorCode
-ogSurface::ogGetLastError(void) {
-  ogErrorCode tmp = lastError;
-  lastError = ogOK;
-  return tmp;
-} // ogSurface::ogGetLastError
-
-void
-ogSurface::ogGetPalette(ogRGBA8 _pal[256]) {
-  memcpy(_pal, pal, sizeof(_pal));
-  return; 
-} // ogSurface::ogGetPalette
-
-void
-ogSurface::ogGetPixFmt(ogPixelFmt& pixfmt) {
-  pixfmt.BPP = BPP;
-  pixfmt.redFieldPosition   = redFieldPosition;
-  pixfmt.greenFieldPosition = greenFieldPosition;
-  pixfmt.blueFieldPosition  = blueFieldPosition;
-  pixfmt.alphaFieldPosition = alphaFieldPosition;
-  pixfmt.redMaskSize   = 8-redShifter;
-  pixfmt.greenMaskSize = 8-greenShifter;
-  pixfmt.blueMaskSize  = 8-blueShifter;
-  pixfmt.alphaMaskSize = 8-alphaShifter;
-  return;
-} // ogSurface::ogGetPixFmt
-
-uInt32 
-ogSurface::ogGetPixel(int32 x, int32 y) {
-  uInt32 result;
-  if (!ogAvail()) return ogGetTransparentColor();
-  
-  if (((uInt32)x > maxX) || ((uInt32)y > maxY)) return ogGetTransparentColor();
-
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-       "  shl  $2, %%ecx      \n"  // shl     ecx, 2 {adjust for pixel size}
-       "  add  %%esi, %%edi   \n"  // add     edi, esi
-       "  add  %%ecx, %%edi   \n"  // add     edi, ecx
-       "  mov  (%%edi),%%eax  \n"  // eax,word ptr [edi]
-       "  mov  %%eax, %3      \n"  // mov     result, eax
-       :
-       : "D" (buffer), "S" (lineOfs[y]), // %0, %1
-         "c" (x), "m" (result)           // %2, %3
-       );
-    break;
-   case 3:
-    __asm__ __volatile__(
-       "  leal (%%ecx, %%ecx, 2), %%ecx \n"  // lea ecx, [ecx + ecx*2]
-//     "  mov  %%ecx, %%eax   \n"  // mov     eax, ecx  - adjust for pixel size 
-//     "  add  %%ecx, %%ecx   \n"  // add     ecx, ecx  - adjust for pixel size
-//     "  add  %%eax, %%ecx   \n"  // add     ecx, eax  - adjust for pixel size
-       "  add  %%esi, %%edi   \n"  // add     edi, esi
-       "  add  %%ecx, %%edi   \n"  // add     edi, ecx
-       "  movzwl (%%edi),%%eax \n" // edx,word ptr [edi]
-       "  xor  %%eax, %%eax   \n"  
-       "  mov  2(%%edi), %%al \n"  // mov     al, [edi+2]
-       "  shl  $16, %%eax     \n"  // shl     eax, 16
-       "  mov  (%%edi), %%ax  \n"  // mov     ax, [edi]
-       "  mov  %%eax, %3      \n"  // mov     result, eax
-       :
-       : "D" (buffer), "S" (lineOfs[y]), // %0, %1
-         "c" (x), "m" (result)           // %2, %3
-       );
-    break;
-   case 2:
-    __asm__ __volatile__(
-       "  add  %%esi, %%edi   \n"  // add     edi, esi
-       "  add  %%ecx, %%ecx   \n"  // add     ecx, ecx {adjust for pixel size}
-       "  add  %%ecx, %%edi   \n"  // add     edi, ecx
-       "  movzwl (%%edi),%%eax \n" // movzx   edx,word ptr [edi]
-       "  mov  %%eax, %0      \n"  // mov     result, eax
-       : "=m" (result)
-       : "D" (buffer), "S" (lineOfs[y]),    // %0, %1
-         "c" (x) // , "m" (result)              // %2, %3
-       );
-    break;
-  case 1:
-    __asm__ __volatile__(
-       "  add  %%esi, %%edi   \n"  // add     edi, esi
-       "  add  %%ecx, %%edi   \n"  // add     edi, ecx
-       " movzbl (%%edi),%%eax \n"  // movzx   edx,byte ptr [edi]
-       "  mov  %%eax, %3      \n"  // mov     result, eax
-       :
-       : "D" (buffer), "S" (lineOfs[y]),    // %0, %1
-         "c" (x), "m" (result)              // %2, %3  
-       );
-    break;
-  } // switch
-  return result;
-} // ogSurface::ogGetPixel
-
-void *
-ogSurface::ogGetPtr(uInt32 x, uInt32 y) {
-//  return (Avail() ? ( (uInt8*)buffer+(lineOfs[y]+x*((BPP+7) >> 3)) ) : NULL );
-  return ((uInt8*)buffer+(lineOfs[y]+x*bytesPerPix));
-} // ogSurface::ogGetPtr
-
-uInt32
-ogSurface::ogGetTransparentColor(void) {
-  if (attributes != NULL)
-    return attributes->transparentColor;
-  else
-    return 0;  
-} // ogSurface::ogGetTransparentColor
-
-void
-ogSurface::ogHFlip(void) {
-  void * tmpBuf1;
-  void * tmpBuf2;
-  uInt32 xWidth, count;
-
-  if (!ogAvail()) return;
-
-  xWidth = (maxX+1)*bytesPerPix;
-
-#ifdef __UBIXOS_KERNEL__
-  tmpBuf1 = kmalloc(xWidth);
-  tmpBuf2 = kmalloc(xWidth);
-#else
-  tmpBuf1 = malloc(xWidth);
-  tmpBuf2 = malloc(xWidth);
-#endif
-
-  if ((tmpBuf1 != NULL) && (tmpBuf2 != NULL))
-    for (count = 0; count <= (maxY/2); count++) {
-      ogCopyLineFrom(0, count, tmpBuf1, xWidth);
-      ogCopyLineFrom(0, maxY-count,tmpBuf2, xWidth);
-      ogCopyLineTo(0, maxY-count,tmpBuf1, xWidth);
-      ogCopyLineTo(0, count, tmpBuf2, xWidth);
-    } // for count
-
-#ifdef __UBIXOS_KERNEL__
-  kfree(tmpBuf2);
-  kfree(tmpBuf1);
-#else
-  free(tmpBuf2);
-  free(tmpBuf1);
-#endif
-
-  return;
-} // ogSurface::ogHFlip
-
-void
-ogSurface::ogHLine(int32 x1, int32 x2, int32 y, uInt32 colour) {
-  int32 tmp;
-  uInt8 r, g, b, a;
-
-  if (!ogAvail()) return;
-  if ((uInt32)y > maxY) return;
-
-  if (x1 > x2) {
-    tmp= x1;
-    x1 = x2;
-    x2 = tmp;
-  } // if
-
-  if (x1 < 0) x1 = 0;
-  if (x2 > (int32)maxX) x2 = maxX;
-  if (x2 < x1) return;
-
-  if (ogIsBlending()) {
-    ogUnpack(colour, r, g, b, a);
-    if (a == 0) return;
-    if (a == 255) {
-      for (tmp = x1; tmp <= x2; tmp++) 
-        RawSetPixel(tmp, y, r, g, b, a);
-      return;
-    } // if a == 255
-  } // if blending
-
-  __asm__ __volatile__("cld \n");
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  inc  %%ecx         \n"
-        "  shl  $2, %%ebx     \n"          //  shl      ebx, 2
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  rep                \n"
-        "  stosl              \n"   
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "a" (colour), "b" (x1),                   // %2, %3
-          "c" (x2)                                  // %4
-    );
-    break;
-  case 3:
-    __asm__ __volatile__(
-        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "  add  %%edx, %%ebx  \n"          //  add      ebx, edx - pix size
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  mov  %%eax, %%ebx  \n"          //  mov      ebx, eax
-        "  shr  $16, %%ebx    \n"          //  shr      ebx, 16
-    "hLlop24:                 \n"          
-        "  mov  %%ax, (%%edi) \n"          //  mov      [edi], ax
-        "  mov  %%bl, 2(%%edi)\n"          //  mov      [edi+2], bl
-        "  add  $3, %%edi     \n"          //  add      edi, 3
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz hLlop24       \n"
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "a" (colour), "b" (x1),                   // %2, %3
-          "c" (x2), "d" (x1)                        // %4, %5
-    );
-    break;
-  case 2:
-    __asm__ __volatile__(
-        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
-        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  xor  %%edx, %%edx  \n"          //  xor      edx, edx
-        "  mov  %%ax, %%dx    \n"          //  mov      dx, ax
-        "  shl  $16, %%eax    \n"          //  shl      eax, 16
-        "  add  %%edx, %%eax  \n"          //  add      eax, edx
-
-        "  shr  $1, %%ecx     \n"          //  shr      ecx, 1
-        "  rep                \n"
-        "  stosl              \n"
-        "   jnc hLnoc16       \n"
-        "  stosw              \n"
-        "hLnoc16:             \n"
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "a" (colour), "b" (x1),                   // %2, %3
-          "c" (x2)                                  // %4
-    );
-    break;
-  case 1:
-    __asm__ __volatile__(
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  and  $0xff, %%eax  \n"          //  and      eax, 0ffh
-        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
-        "  mov  %%al, %%ah    \n"          //  mov      ah, al
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "  mov  %%eax, %%ebx  \n"          //  mov      ebx, eax
-        "  shl  $16, %%ebx    \n"          //  shl      ebx, 16
-        "  add  %%ebx, %%eax  \n"          //  add      eax, ebx
-
-        "  mov  %%ecx, %%edx  \n"          //  mov      edx, ecx
-        "  mov  $4, %%ecx     \n"          //  mov      ecx, 4
-        "  sub  %%edi, %%ecx  \n"          //  sub      ecx, edi
-        "  and  $3, %%ecx     \n"          //  and      ecx, 3
-        "  sub  %%ecx, %%edx  \n"          //  sub      edx, ecx
-        "   jle LEndBytes     \n"
-        "  rep                \n"          
-        "  stosb              \n"
-        "  mov  %%edx, %%ecx  \n"          //  mov      ecx, edx
-        "  and  $3, %%edx     \n"          //  and      edx, 3
-        "  shr  $2, %%ecx     \n"          //  shr      ecx, 2
-        "  rep                \n"
-        "  stosl              \n"
-    "LEndBytes:               \n"
-        "  add  %%edx, %%ecx  \n"          //  add      ecx, edx
-        "  rep                \n"
-        "  stosb              \n"
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "a" (colour), "b" (x1),                   // %2, %3
-          "c" (x2) 
-       );
-    break;
-  } // switch
-  return;
-} // ogSurface::ogHLine
-
-bool
-ogSurface::ogIsAntiAliasing(void) {
-  if (attributes != NULL)
-    return attributes->antiAlias;
-  else
-    return false;
-} // ogSurface::ogIsAntiAliasing
-
-bool
-ogSurface::ogIsBlending(void) {
-  if (attributes != NULL)
-    return attributes->blending;
-  else
-    return false;
-} // ogSurface::ogIsBlending
-
-void
-ogSurface::ogLine(int32 x1, int32 y1, int32 x2, int32 y2, uInt32 colour) {
-  if (ClipLine(x1,y1,x2,y2)) {
-    if (ogIsAntiAliasing()) 
-      AARawLine(x1, y1, x2, y2, colour); 
-    else  
-      RawLine(x1, y1, x2, y2, colour);
-  } // if clipLine
-  return;
-} // ogSurface::ogLine
-
-bool
-ogSurface::ogLoadPalette(const char *palfile) {
-  ogRGBA8 oldPalette[256];
-#ifdef __UBIXOS_KERNEL__
-  fileDescriptor *f;
-#else
-  FILE *f;
-#endif
-  uInt32 lresult;
-  bool result;
-
-  if (!fileExists(palfile)) {
-    ogSetLastError(ogFileNotFound);
-    return false;
-  } // if
-
-  if (pal == NULL) {
-    pal = new ogRGBA8[256];
-    if (pal == NULL) {
-      ogSetLastError(ogMemAllocFail);
-      return false;
-    } // if 
-    ogSetPalette(DEFAULT_PALETTE);
- //   memcpy(pal, DEFAULT_PALETTE, sizeof(ogRGBA8)*256);
-  } // if
- 
-  ogGetPalette(oldPalette);
-  // memcpy(&oldPalette, pal, sizeof(ogRGBA8)*256);
-
-  if ((f = fopen(palfile, "rb")) == NULL) return false;
-
-  lresult = fread(pal, sizeof(ogRGBA8), 256, f);
-  result = (lresult == 256);
-
-  if (!result) {
-    ogSetLastError(ogFileReadError);
-    ogSetPalette(oldPalette);
-    // memcpy(pal, &oldPalette, sizeof(ogRGBA8)*256);
-  } // if
-
-  fclose(f);
-  return result;
-} // ogSurface::ogLoadPalette
-
-void
-ogSurface::ogPolygon(uInt32 numPoints, ogPoint2d* polyPoints, uInt32 colour) {
-  uInt32 count;
-  
-  if (numPoints == 1) 
-    ogSetPixel(polyPoints[0].x, polyPoints[0].y, colour);
-  else
-    for (count = 0; count < numPoints; count++)
-      ogLine(polyPoints[count].x, polyPoints[count].y,
-             polyPoints[(count+1) % numPoints].x,
-             polyPoints[(count+1) % numPoints].y,
-             colour);
-  return;
-} // ogSurface::ogPolygon
-
-void
-ogSurface::ogRect(int32 x1, int32 y1, int32 x2, int32 y2, uInt32 colour) {
-  int32 tmp;
-
-  if ((x1 == x2) || (y1 == y2)) {
-
-    if ((x1 == x2) && (y1 == y2))
-      ogSetPixel(x1, y1, colour);
-    else
-      ogLine(x1, y1, x2, y2, colour);
-
-  } else {
-
-    if (y1 > y2) {
-      tmp= y1;
-      y1 = y2;
-      y2 = tmp;
-    } // if
-
-    ogHLine(x1, x2, y1, colour);  // Horizline has built in clipping
-    ogVLine(x1, y1+1, y2-1, colour);  // vertline has built in clipping too
-    ogVLine(x2, y1+1, y2-1, colour);
-    ogHLine(x1, x2, y2, colour);
-
-  } // else
-
-  return;
-} // ogSurface::ogRect
-
-uInt32 
-ogSurface::ogPack(uInt8 red, uInt8 green, uInt8 blue) {
-  uInt32 idx, colour;
-  uInt32 rd, gd, bd, dist, newdist;
-
-  colour = 0;
-  switch (bytesPerPix) {
-   case 4:
-    colour = ( (red << redFieldPosition) |
-               (green << greenFieldPosition) |
-               (blue << blueFieldPosition) |
-               (ogGetAlpha() << alphaFieldPosition) );
-    break;
-   case 3:
-    colour = ( (red << redFieldPosition) |
-               (green << greenFieldPosition) |
-               (blue << blueFieldPosition) );
-    break;
-   case 2:
-    colour = ((red >> redShifter) << redFieldPosition) |
-             ((green >> greenShifter) << greenFieldPosition) |
-             ((blue >> blueShifter) << blueFieldPosition) |
-             ((ogGetAlpha() >> alphaShifter) << alphaFieldPosition);
-    break;
-   case 1:
-    colour = 0;
-    dist = 255+255+255;
-    for (idx = 0; idx <= 255; idx++) {
-      rd = abs(red-pal[idx].red);
-      gd = abs(green-pal[idx].green);
-      bd = abs(blue-pal[idx].blue);
-      newdist = rd + gd + bd;
-
-      if (newdist < dist) {
-        dist = newdist;
-        colour = idx;
-      } // if
-    } // for
-    break;
-  } // switch
-
-  return colour;
-
-} // ogSurface::ogPack
-
-uInt32 
-ogSurface::ogPack(uInt8 red, uInt8 green, uInt8 blue, uInt8 alpha) {
-  uInt32 idx, colour;
-  uInt32 rd, gd, bd, dist, newdist;
-
-  colour = 0;
-  switch (bytesPerPix) {
-   case 4:
-    colour = ( (red << redFieldPosition) |
-               (green << greenFieldPosition) |
-               (blue << blueFieldPosition) |
-               (alpha << alphaFieldPosition) );
-    break;
-   case 3:
-    colour = ( (red << redFieldPosition) |
-               (green << greenFieldPosition) |
-               (blue << blueFieldPosition) );
-    break;
-   case 2:
-    colour = ((red >> redShifter) << redFieldPosition) |
-             ((green >> greenShifter) << greenFieldPosition) |
-             ((blue >> blueShifter) << blueFieldPosition) |
-             ((alpha >> alphaShifter) << alphaFieldPosition);
-    break;
-   case 1:
-    colour = 0;
-    dist = 255+255+255;
-    for (idx = 0; idx <= 255; idx++) {
-      rd = abs(red-pal[idx].red);
-      gd = abs(green-pal[idx].green);
-      bd = abs(blue-pal[idx].blue);
-      newdist = rd + gd + bd;
-
-      if (newdist < dist) {
-        dist = newdist;
-        colour = idx;
-      } // if
-    } // for
-    break;
-  } // switch
-
-  return colour;
-} // ogSurface::ogPack
-
-bool
-ogSurface::ogSavePalette(const char *palfile) {
-#ifdef __UBIXOS_KERNEL__
-  fileDescriptor *f;
-#else
-  FILE * f;
-#endif
-  uInt32 lresult;
-
-  if (pal == NULL) {
-    ogSetLastError(ogNoPalette);
-    return false;
-  }
-
-  if ((f = fopen(palfile, "wb"))==NULL) return false;
-  lresult = fwrite(pal,sizeof(ogRGBA8),256,f);
-  fclose(f);
-
-  if (lresult == 256) 
-    return true;
-  else {
-    ogSetLastError(ogFileWriteError);
-    return false;
-  } // else
-
-} // ogSurface::ogSavePal
-
-void
-ogSurface::ogScale(ogSurface& src) {
-  ogScaleBuf(0, 0, maxX, maxY, src, 0, 0, src.maxX, src.maxY);
-  return;
-} // ogSurface::ogScale
-
-void 
-ogSurface::ogScaleBuf(int32 dX1, int32 dY1, int32 dX2, int32 dY2,
-                  ogSurface& src, 
-                  int32 sX1, int32 sY1, int32 sX2, int32 sY2) {
-
-  uInt32 sWidth, dWidth;
-  uInt32 sHeight, dHeight;
-  int32 sx, sy, xx, yy;
-  uInt32 xInc, yInc;
-  uInt32 origdX1, origdY1;
-  ogPixelFmt pixFmt;
-  ogSurface * tmpBuf;
-  ogSurface * sBuf;
-  ogSurface * dBuf;
-  bool doCopyBuf;
-
-  origdX1 = origdY1 = 0; // to keep the compiler from generating a warning
-  
-  if (!ogAvail()) return;
-  if (!src.ogAvail()) return;
-
-  if (sX1 > sX2) {
-    xx = sX1;
-    sX1= sX2;
-    sX2= xx;
-  }
-
-  if (sY1 > sY2) {
-    yy = sY1;
-    sY1= sY2;
-    sY2= yy;
-  }
-
-  // if any part of the source falls outside the buffer then don't do anything
-
-  if (((uInt32)sX1 > src.maxX) || ((uInt32)sX2 > src.maxX) ||
-      ((uInt32)sY1 > src.maxY) || ((uInt32)sY2 > src.maxY)) return;
-
-  if (dX1 > dX2) {
-    xx = dX1;
-    dX1= dX1;
-    dX2= xx;
-  }
-
-  if (dY1 > dY2) {
-    yy = dY1;
-    dY1= dY2;
-    dY2= yy;
-  }
-
-  dWidth = (dX2-dX1)+1;
-  if (dWidth <= 0) return;
-
-  dHeight = (dY2-dY1)+1;
-  if (dHeight <= 0) return;
-
-  sWidth = (sX2-sX1)+1;
-  sHeight = (sY2-sY1)+1;
-
-  // convert into 16:16 fixed point ratio
-  xInc = (sWidth << 16) / dWidth;
-  yInc = (sHeight << 16) / dHeight;
-
-  if (dX2 > (int32)maxX) {
-    xx = (xInc*(dX1-maxX)) >> 16;
-    sX1 -= xx;
-    sWidth -= xx;
-    dWidth -= (dX1-maxX);
-    dX1 = maxX;
-  }
-
-  if (dY2 > (int32)maxY) {
-    yy = (yInc*(dY2-maxY)) >> 16;
-    sY2 -= yy;
-    sHeight -= yy;
-    dHeight -= (dY2-maxY);
-    dY2 = maxY;
-  }
-
-  if (dX1 < 0) {
-    xx = (xInc*(-dX1)) >> 16;
-    sX1 += xx;
-    sWidth -= xx;
-    dWidth += dX1;
-    dX1 = 0;
-  }
-
-  if (dY1 < 0) {
-    yy = (yInc*(-dY1)) >> 16;
-    sY1 += yy;
-    sHeight -= yy;
-    dHeight += dY1;
-    dY1 = 0;
-  }
-
-  if ((dWidth <= 0) || (dHeight <= 0)) return;
-  if ((sWidth <= 0) || (sHeight <= 0)) return;
-
-  // Do a quick check to see if the scale is 1:1 .. in that case just copy
-  // the image
-
-  if ((dWidth == sWidth) && (dHeight == sHeight)) {
-    ogCopyBuf(dX1, dY1, src, sX1, sY1, sX2, sY2);
-    return;
-  }
-
-  tmpBuf = NULL;
-
-  /*
-   * Alright.. this is how we're going to optimize the case of different
-   * pixel formats.  We are going to use copyBuf() to automagically do
-   * the conversion for us using tmpBuf.  Here's how it works:
-   * If the source buffer is smaller than the dest buffer (ie, we're making
-   * something bigger) we will convert the source buffer first into the dest
-   * buffer's pixel format.  Then we do the scaling.
-   * If the source buffer is larger than the dest buffer (ie, we're making
-   * something smaller) we will scale first and then use copyBuf to do
-   * the conversion.
-   * This method puts the onus of conversion on the copyBuf() function which,
-   * while not excessively fast, does the job.
-   * The case in which the source and dest are the same size is handled above.
-   *
-   */
-  if (pixFmtID != src.pixFmtID) {
-
-    tmpBuf = new ogSurface();
-    if (tmpBuf == NULL) return;
-    if (sWidth*sHeight*src.bytesPerPix <= dWidth*dHeight*bytesPerPix) {
-      // if the number of pixels in the source buffer is less than the
-      // number of pixels in the dest buffer then...
-      ogGetPixFmt(pixFmt);
-      if (!tmpBuf->ogCreate(sWidth, sHeight, pixFmt)) return;
-      tmpBuf->ogCopyPalette(src);
-      tmpBuf->ogCopyBuf(0, 0, src, sX1, sY1, sX2, sY2);
-      sX2 -= sX1;
-      sY2 -= sY1;
-      sX1 = 0;
-      sY1 = 0;
-      sBuf = tmpBuf;
-      dBuf = this;
-      doCopyBuf = false; // do we do a copyBuf later?
-    } else {
-      src.ogGetPixFmt(pixFmt);
-      if (!tmpBuf->ogCreate(dWidth,dHeight,pixFmt)) return;
-      tmpBuf->ogCopyPalette(*this);
-      origdX1 = dX1;
-      origdY1 = dY1;
-      dX1 = 0;
-      dY1 = 0;
-      dX2 = tmpBuf->maxX;
-      dY2 = tmpBuf->maxY;
-      sBuf = &src;
-      dBuf = tmpBuf;
-      doCopyBuf = true;
-    } // else
-  } else {
-    // pixel formats are identical
-    sBuf = &src;
-    dBuf = this;
-    doCopyBuf = false;
-  } // else
-
-  sy = sY1 << 16;
-
-  for (yy = dY1; yy <= dY2; yy++) {
-    sx = 0;
-    for (xx = dX1; xx <= dX2; xx++) {
-      dBuf->RawSetPixel(xx, yy,
-                        sBuf->RawGetPixel(sX1+(sx >> 16),(sy>>16)));
-      sx += xInc;
-    } // for xx
-    sy += yInc;
-  } // for yy
-  
-  if ((doCopyBuf) && (tmpBuf != NULL))
-    ogCopyBuf(origdX1, origdY1, *tmpBuf, 0, 0, tmpBuf->maxX, tmpBuf->maxY);
-
-  delete tmpBuf;
-  return;
-} // ogSurface::ogScaleBuf
-
-uInt32
-ogSurface::ogSetAlpha(uInt32 _newAlpha) {
-  uInt32 tmp;
-
-  if (attributes != NULL) {
-    tmp = attributes->defaultAlpha;
-    attributes->defaultAlpha = _newAlpha;
-    return tmp;
-  } else return _newAlpha;
-} // ogSurface::ogSetAlpha
-
-bool
-ogSurface::ogSetAntiAliasing(bool _antiAliasing) {
-  bool tmp;
-
-  if (attributes != NULL) {
-    tmp = attributes->antiAlias;
-    attributes->antiAlias = _antiAliasing;
-    return tmp;
-  } else return _antiAliasing;
-} // ogSurface::ogSetAntiAliasing
-
-bool
-ogSurface::ogSetBlending(bool _blending) {
-  bool tmp;
-
-  if (attributes != NULL) {
-    tmp = attributes->blending;
-    attributes->blending = _blending;
-    return tmp;
-  } else return _blending;
-
-} // ogSurface::ogSetBlending;
-
-ogErrorCode
-ogSurface::ogSetLastError(ogErrorCode latestError) {
-  ogErrorCode tmp = lastError;
-  lastError = latestError;
-  return tmp;
-} // ogSurface::ogSetLastError
-
-void
-ogSurface::ogSetPalette(const ogRGBA8 newPal[256]) {
-  if (pal == NULL) return;
-  memcpy(pal, newPal, sizeof(pal));
-  return;
-} // ogSurface::ogSetPalette
-
-void 
-ogSurface::ogSetPixel(int32 x, int32 y, uInt32 colour) {
-  uInt32 newR, newG, newB, inverseA;
-  uInt8 sR, sG, sB, sA;
-  uInt8 dR, dG, dB;
-
-  if (!ogAvail()) return;
-
-  if (((uInt32)x > maxX) || ((uInt32)y > maxY)) return;
-
-  do {
-    if (ogIsBlending()) {
-      ogUnpack(colour, sR, sG, sB, sA);
-      if (sA == 0) return;
-      if (sA == 255) break;
-      inverseA = 255 - sA;
-      ogUnpack(RawGetPixel(x, y), dR, dG, dB);
-      newR = (dR * inverseA + sR * sA) >> 8;
-      newG = (dG * inverseA + sG * sA) >> 8;
-      newB = (dB * inverseA + sB * sA) >> 8;
-      colour = ogPack(newR, newG, newB, inverseA);
-    } // if
-  } while (false);
-
-  switch (bytesPerPix) {
-   case 4:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  shl  $2, %%ecx     \n"  // shl     eax, 2 {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%eax, (%%edi) \n" // mov     [edi], eax
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour)                  // %2, %3
-    );
-    break;
-   case 3:
-     __asm__ __volatile__(
-    //  Calculate offset, prepare the pixel to be drawn 
-        "  leal (%%ecx, %%ecx, 2), %%ecx \n"  // lea ecx, [ecx + ecx*2]
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  shr  $16, %%eax    \n"  // shr     eax, 16
-        "  mov  %%al, 2(%%edi)\n"  // mov     [edi+2],al
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour)                  // %2, %3
-    );
-    break;
-   case 2:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  add  %%ecx, %%ecx  \n"  // add     ecx, ecx {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-    //    "  mov  %3, %%eax     \n"  // mov     eax, colour
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour)                  // %2, %3
-     );
-     break;
-  case 1:
-    __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-    //    "  add  (%%esi,%%ebx,4), %%edi \n" // add     edi, [esi + ebx * 4]
-        "  add  %%esi, %%edi  \n"          // add     edi, esi
-        "  add  %%ecx, %%edi  \n"          // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%al, (%%edi) \n"          // mov     [edi], al
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour)                     // %2, %3
-   );
-   break;
-  } // switch
-  return;
-} // ogSurface::ogSetPixel
-
-void
-ogSurface::ogSetPixel(int32 x, int32 y, uInt8 r, uInt8 g, uInt8 b, uInt8 a) {
-  if (!ogAvail()) return;
-  if (((uInt32)x > maxX) || ((uInt32)y > maxY)) return;
-  RawSetPixel(x, y, r, g, b, a);
-  return;
-} // ogSurface::ogSetPixel
-
-void 
-ogSurface::ogSetPalette(uInt8 colour, uInt8 red, uInt8 green, uInt8 blue, uInt8 alpha) {
-  if (pal == NULL) return;
-  pal[colour].red   = red;
-  pal[colour].green = green;
-  pal[colour].blue  = blue;
-  pal[colour].alpha = alpha;
-  return;
-} // ogSurface::ogSetPalette
-
-void 
-ogSurface::ogSetPalette(uInt8 colour, uInt8 red, uInt8 green, uInt8 blue) {
-  if (pal == NULL) return;
-  pal[colour].red   = red;
-  pal[colour].green = green;
-  pal[colour].blue  = blue;
-  pal[colour].alpha = ogGetAlpha();
-  return;
-} // ogSurface::ogSetPalette
-
-uInt32
-ogSurface::ogSetTransparentColor(uInt32 colour) {
-  uInt32 tmp = 0;  
-
-  if (attributes != NULL) {
-    tmp = attributes->transparentColor & ogGetAlphaMasker();
-    attributes->transparentColor = colour & ogGetAlphaMasker();
-  } // if
-
-  return tmp;
-} // ogSurface::ogSetTransparentColor
-
-static double f(double g) { return g*g*g-g; }
-
-void 
-ogSurface::ogSpline(uInt32 numPoints, ogPoint2d* points, uInt32 segments,
-                uInt32 colour) {
-  int32 i, oldY, oldX, x, y, j;
-  float part, t, xx, yy, tmp;
-  float * zc;
-  float * dx;
-  float * dy;
-  float * u;
-  float * wndX1;
-  float * wndY1;
-  float * px;
-  float * py;
-
-  bool runOnce;
-
-  if ((numPoints < 2) || (points == NULL)) return;
-
-  zc = new float[numPoints];
-  dx = new float[numPoints];
-  dy = new float[numPoints];
-  u  = new float[numPoints];
-  wndX1 = new float[numPoints];
-  wndY1 = new float[numPoints];
-  px = new float[numPoints];
-  py = new float[numPoints];
-
-  do {
-    if (zc == NULL) break;
-    if (dx == NULL) break;
-    if (dy == NULL) break;
-    if (wndX1 == NULL) break;
-    if (wndY1 == NULL) break;
-    if (px == NULL) break;
-    if (py == NULL) break;
-      
-    for (i = 0; (uInt32)i < numPoints; i++) {
-      zc[i] = dx[i] = dy[i] = u[i] = wndX1[i] = wndY1[i] = px[i] = py[i] = 0.0f;
-    }
-  
-    runOnce = false;
-    oldX = oldY = 0;
-
-    x = points[0].x;
-    y = points[0].y;
-
-    for (i = 1; (uInt32)i < numPoints; i++) {
-      xx = points[i-1].x - points[i].x;
-      yy = points[i-1].y - points[i].y;
-      t = sqrt(xx*xx + yy*yy);
-      zc[i] = zc[i-1]+t;
-    } // for
-
-    u[0] = zc[1] - zc[0] +1;
-    for (i = 1; (uInt32)i < numPoints-1; i++) {
-      u[i] = zc[i+1]-zc[i]+1;
-      tmp = 2*(zc[i+1]-zc[i-1]);
-      dx[i] = tmp;
-      dy[i] = tmp;
-      wndY1[i] = 6.0f*((points[i+1].y-points[i].y)/u[i]-
-                    (points[i].y-points[i-1].y)/u[i-1]);
-      wndX1[i] = 6.0f*((points[i+1].x-points[i].x)/u[i]-
-                       (points[i].x-points[i-1].x)/u[i-1]);
-    } // for
-
-    for (i = 1; (uInt32)i < numPoints-2; i++) {
-      wndY1[i+1] = wndY1[i+1]-wndY1[i]*u[i]/dy[i];
-      dy[i+1] = dy[i+1]-u[i]*u[i]/dy[i];
-      wndX1[i+1] = wndX1[i+1]-wndX1[i]*u[i]/dx[i];
-      dx[i+1] = dx[i+1]-u[i]*u[i]/dx[i];
-    } // for
-
-    for (i = numPoints-2; i > 0; i--) {
-      py[i] = (wndY1[i]-u[i]*py[i+1])/dy[i];
-      px[i] = (wndX1[i]-u[i]*px[i+1])/dx[i];
-    } // for
-
-    for (i = 0; (uInt32)i < numPoints-1; i++) {
-      for (j = 0; (uInt32)j <= segments; j++) {
-        part = zc[i]-(((zc[i]-zc[i+1])/segments)*j);
-        t = (part-zc[i])/u[i];
-        part = t * points[i+1].y +
-               (1.0-t)*points[i].y +
-                u[i] * u[i] * ( f(t) * py[i+1] + f(1.0-t) * py[i]) /6.0;
-//        y = Round(part);
-        y = static_cast<int32>(part+0.5f);
-        part = zc[i]-(((zc[i]-zc[i+1])/segments)*j);
-        t = (part-zc[i])/u[i];
-        part = t*points[i+1].x+(1.0-t)*points[i].x+u[i]*u[i]*(f(t)*px[i+1]+
-               f(1.0-t)*px[i])/6.0;
-             
-//      x = Round(part);
-        x = static_cast<int32>(part+0.5f);
-        if (runOnce) ogLine(oldX, oldY, x, y, colour); else runOnce = true;
-        oldX = x;
-        oldY = y;
-      } // for j
-    } // for i
-  } while (false);
-
-  delete [] py;
-  delete [] px;
-  delete [] wndY1;
-  delete [] wndX1;
-  delete [] u;
-  delete [] dy;
-  delete [] dx;
-  delete [] zc;
-
-  return;
-} // ogSurface::ogSpline
-
-
-void
-ogSurface::ogTriangle(int32 x1, int32 y1, int32 x2, int32 y2, int32 x3, 
-                      int32 y3, uInt32 colour) {
-
-  ogLine(x1, y1, x2, y2,colour);
-  ogLine(x2, y2, x3, y3,colour);
-  ogLine(x3, y3, x1, y1,colour);
-  return;
-} // ogSurface::ogTriangle
-
-void 
-ogSurface::ogUnpack(uInt32 colour, uInt8& red, uInt8& green, uInt8& blue) {
-
-  switch (bytesPerPix) {
-   case 4:
-   case 3:
-    red   = colour >> redFieldPosition;
-    green = colour >> greenFieldPosition;
-    blue  = colour >> blueFieldPosition;
-    break;
-   case 2:
-    red   = ((colour >> redFieldPosition) << redShifter);
-    green = ((colour >> greenFieldPosition) << greenShifter);
-    blue  = ((colour >> blueFieldPosition) << blueShifter);
-    if (red != 0)   red += OG_MASKS[redShifter];
-    if (green != 0) green += OG_MASKS[greenShifter];
-    if (blue != 0)  blue += OG_MASKS[blueShifter];
-    break;
-   case 1:
-
-    if (pal == NULL) {
-      red = green = blue = 0;
-      return;
-    } // if pal == null
-
-    if (colour > 255) colour &= 255;
-    red   = pal[colour].red;
-    green = pal[colour].green;
-    blue  = pal[colour].blue; 
-    break;
-   default:
-    red   = 0;
-    green = 0;
-    blue  = 0;
-  } // switch
-
-  return;
-} // ogSurface::ogUnpack
-
-void 
-ogSurface::ogUnpack(uInt32 colour, uInt8& red, uInt8& green, uInt8& blue, uInt8& alpha) {
-
-  switch (bytesPerPix) {
-   case 4:
-    red   = colour >> redFieldPosition;
-    green = colour >> greenFieldPosition;
-    blue  = colour >> blueFieldPosition;
-    alpha = colour >> alphaFieldPosition;
-    break;
-   case 3:
-    red   = colour >> redFieldPosition;
-    green = colour >> greenFieldPosition;
-    blue  = colour >> blueFieldPosition;
-    alpha = ogGetAlpha();
-    break;
-   case 2:
-    red   = ((colour >> redFieldPosition)   << redShifter);
-    green = ((colour >> greenFieldPosition) << greenShifter);
-    blue  = ((colour >> blueFieldPosition)  << blueShifter);
-    if (red != 0)   red += OG_MASKS[redShifter];
-    if (green != 0) green += OG_MASKS[greenShifter];
-    if (blue != 0)  blue += OG_MASKS[blueShifter];
-
-    if (alphaShifter != 8) {
-      alpha = (colour >> alphaFieldPosition) << alphaShifter;
-      if (alpha != 0) alpha += OG_MASKS[alphaShifter];
-    } else alpha = ogGetAlpha();
-    
-    break;
-   case 1:
-
-    if (pal == NULL) {
-      red = green = blue = alpha = 0;
-      return;
-    } // if pal == null
-
-    if (colour > 255) colour &= 255;
-    red   = pal[colour].red;
-    green = pal[colour].green;
-    blue  = pal[colour].blue; 
-    alpha = pal[colour].alpha;
-    break;
-  default:
-    red = green = blue = alpha = 0;
-  } // switch
-
-  return;
-} // ogSurface::ogUnpack
-
-void
-ogSurface::ogVFlip(void) {
-  uInt32 height;
-
-  if (!ogAvail()) return;
-
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-        "  add  %%edi, %%esi  \n"     // add esi, edi
-        "vf32lop:             \n"
-        "  push %%esi         \n"     // push esi
-        "  push %%edi         \n"     // push edi
-        "vf32lop2:            \n"
-        "  mov  (%%edi),%%eax \n"     // mov eax, [edi]
-        "  mov  (%%esi),%%ecx \n"     // mov ecx, [esi]
-        "  mov  %%eax,(%%esi) \n"     // mov [esi], eax
-        "  mov  %%ecx,(%%edi) \n"     // mov [edi], ecx
-        "  add  $4, %%edi     \n"     // add edi, 4
-        "  sub  $4, %%esi     \n"     // sub esi, 4
-        "  cmp  %%esi, %%edi  \n"     // cmp edi, esi
-        "   jbe vf32lop2      \n"
-        "  pop  %%edi         \n"     // pop edi
-        "  pop  %%esi         \n"     // pop esi
-        "  add  %%ebx, %%esi  \n"     // add esi, ebx
-        "  add  %%ebx, %%edi  \n"     // add edi, ebx
-        "  dec  %%edx         \n"
-        "   jnz vf32lop       \n"
-        :
-        : "D" ((char *)buffer+lineOfs[0]), "S" (maxX*4),          // %0, %1
-          "b" (xRes), "d" (maxY+1)                  // %2, %3
-       );
-    break;
-   case 3:
-   height = maxY + 1;
-    __asm__ __volatile__(
-        "  add  %%edi, %%esi   \n"     // add esi, edi
-        "vf24lop:              \n"
-        "  push %%esi          \n"     // push esi
-        "  push %%edi          \n"     // push edi
-        "vf24lop2:             \n"
-        "  mov  (%%edi),%%ax   \n"     // mov ax, [edi]
-        "  mov  2(%%edi),%%dl  \n"     // mov dl, [edi+2]
-        "  mov  (%%esi),%%cx   \n"     // mov cx, [esi]
-        "  mov  2(%%esi),%%dh  \n"     // mov dh, [esi+2]
-        "  mov  %%ax,(%%esi)   \n"     // mov [esi], ax
-        "  mov  %%dl,2(%%esi)  \n"     // mov [esi+2], dl
-        "  mov  %%cx,(%%edi)   \n"     // mov [edi], cx
-        "  mov  %%dh,2(%%edi)  \n"     // mov [edi+2], dh
-        "  add  $3, %%edi      \n"     // add edi, 3
-        "  sub  $3, %%esi      \n"     // sub esi, 3
-        "  cmp  %%esi, %%edi   \n"     // cmp edi, esi
-        "   jbe vf24lop2       \n"
-        "  pop  %%edi          \n"     // pop edi
-        "  pop  %%esi          \n"     // pop esi
-        "  add  %%ebx, %%esi   \n"     // add esi, ebx
-        "  add  %%ebx, %%edi   \n"     // add edi, ebx
-        "  decl %3             \n"     // dec height
-        "   jnz vf24lop        \n"
-        :
-        : "D" ((char *)buffer+lineOfs[0]), "S" (maxX*3),          // %0, %1
-          "b" (xRes), "m" (height)                  // %2, %3
-       );
-    break;
-  case 2:
-    __asm__ __volatile__(
-        "  add  %%edi, %%esi  \n"     // add esi, edi
-        "vf16lop:             \n"
-        "  push %%esi         \n"     // push esi
-        "  push %%edi         \n"     // push edi
-        "vf16lop2:            \n"
-        "  mov  (%%edi),%%ax  \n"     // mov ax, [edi]
-        "  mov  (%%esi),%%cx  \n"     // mov cx, [esi]
-        "  mov  %%ax,(%%esi)  \n"     // mov [esi], ax
-        "  mov  %%cx,(%%edi)  \n"     // mov [edi], cx
-        "  add  $2, %%edi     \n"     // add edi, 2
-        "  sub  $2, %%esi     \n"     // sub esi, 2
-        "  cmp  %%esi, %%edi  \n"     // cmp edi, esi
-        "   jbe vf16lop2      \n"
-        "  pop  %%edi         \n"     // pop edi
-        "  pop  %%esi         \n"     // pop esi
-        "  add  %%ebx, %%esi  \n"     // add esi, ebx
-        "  add  %%ebx, %%edi  \n"     // add edi, ebx
-        "  dec  %%edx         \n"
-        "   jnz vf16lop       \n"
-        :
-        : "D" ((char *)buffer+lineOfs[0]), "S" (maxX*2),          // %0, %1
-          "b" (xRes), "d" (maxY+1)                  // %2, %3
-       );
-    break;
-  case 1:
-    __asm__ __volatile__(
-        "  add  %%edi, %%esi  \n"     // add esi, edi
-        "vf8lop:             \n"
-        "  push %%esi         \n"     // push esi
-        "  push %%edi         \n"     // push edi
-        "vf8lop2:             \n"
-        "  mov  (%%edi),%%al  \n"     // mov al, [edi]
-        "  mov  (%%esi),%%ah  \n"     // mov ah, [esi]
-        "  mov  %%al,(%%esi)  \n"     // mov [esi], al
-        "  mov  %%ah,(%%edi)  \n"     // mov [edi], ah
-        "  inc  %%edi         \n"     // inc edi
-        "  dec  %%esi         \n"     // dec esi
-        "  cmp  %%esi, %%edi  \n"     // cmp edi, esi
-        "   jbe vf8lop2       \n"
-        "  pop  %%edi         \n"     // pop edi
-        "  pop  %%esi         \n"     // pop esi
-        "  add  %%ebx, %%esi  \n"     // add esi, ebx
-        "  add  %%ebx, %%edi  \n"     // add edi, ebx
-        "  dec  %%edx         \n"
-        "   jnz vf8lop        \n"
-        :
-        : "D" ((char *)buffer+lineOfs[0]), "S" (maxX),          // %0, %1
-          "b" (xRes), "d" (maxY+1)                  // %2, %3
-       );
-    break;
-  } // switch
-  return;
-} // ogSurface::ogVFlip
-
-void
-ogSurface::ogVLine(int32 x, int32 y1, int32 y2, uInt32 colour) {
-  int32 tmp;
-  uInt8 r, g, b, a;
-
-  if (!ogAvail()) return;
-  if ((uInt32)x > maxX) return;
-
-  if (y1 > y2) {
-    tmp= y1;
-    y1 = y2;
-    y2 = tmp;
-  } // if
-
-  if (y1 < 0) y1 = 0;
-  if (y2 > (int32)maxY) y2 = maxY;
-  if (y2 < y1) return;
-
-  if (ogIsBlending()) {
-
-    ogUnpack(colour, r, g, b, a);
-
-    if (a == 0) return;
-
-    if (a != 255) {
-      for (tmp = y1; tmp <= y2; tmp++) 
-        RawSetPixel(x, tmp, r, g, b, a);
-      return;
-    } // if 
-   
-  } // if blending
-
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  shl  $2, %%ebx     \n"          //  shl      ebx, 2  - pix size
-        "  mov  %6, %%esi     \n"          //  mov      esi, y1
-        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "vLlop32:             \n"
-        "  mov  %%eax, (%%edi)\n"          //  mov      [edi], eax
-        "  add  %%edx, %%edi  \n"          //  add      edi, edx
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz vLlop32       \n"
-        :
-        : "D" (buffer), "S" (lineOfs[y1]),          // %0, %1
-          "a" (colour), "b" (x),                    // %2, %3
-          "c" (y2), "d" (xRes),                     // %4, %5
-          "m" (y1)                                  // %6
-       );
-    break;
-   case 3:
-    __asm__ __volatile__(
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  mov  %%ebx, %%esi  \n"          //  mov      esi, ebx - pix size
-        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
-        "  add  %%esi, %%ebx  \n"          //  add      ebx, esi - pix size
-        "  mov  %6, %%esi     \n"          //  mov      esi, y1
-        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "  mov  %%eax, %%ebx  \n"          //  mov      ebx, eax
-        "  shr  $16, %%ebx    \n"          //  shr      ebx, 16
-        "vLlop24:             \n"
-        "  mov  %%ax, (%%edi) \n"          //  mov      [edi], eax
-        "  mov  %%bl, 2(%%edi)\n"          //  mov      [edi+2], bl
-        "  add  %%edx, %%edi  \n"          //  add      edi, edx
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz vLlop24       \n"
-        :
-        : "D" (buffer), "S" (lineOfs[y1]),          // %0, %1
-          "a" (colour), "b" (x),                    // %2, %3
-          "c" (y2), "d" (xRes),                     // %4, %5
-          "m" (y1)                                  // %6
-       );
-    break;
-   case 2:
-    __asm__ __volatile__(
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
-        "  mov  %6, %%esi     \n"          //  mov      esi, y1
-        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "vLlop16:             \n"
-        "  mov  %%ax, (%%edi) \n"          //  mov      [edi], ax
-        "  add  %%edx, %%edi  \n"          //  add      edi, edx
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz vLlop16       \n"
-        :
-        : "D" (buffer), "S" (lineOfs[y1]),          // %0, %1
-          "a" (colour), "b" (x),                    // %2, %3
-          "c" (y2), "d" (xRes),                     // %4, %5
-          "m" (y1)                                  // %6
-       );
-    break;
-  case 1:
-    __asm__ __volatile__(
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  mov  %6, %%esi     \n"          //  mov      esi, y1
-        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "vLlop8:              \n"          
-        "  mov  %%al, (%%edi) \n"          //  mov      [edi], al
-        "  add  %%edx, %%edi  \n"          //  add      edi, edx
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz vLlop8        \n"
-        :
-        : "D" (buffer), "S" (lineOfs[y1]),          // %0, %1
-          "a" (colour), "b" (x),                    // %2, %3
-          "c" (y2), "d" (xRes),                     // %4, %5
-          "m" (y1)                                  // %6
-       );
-    break;
-  } // switch
-  return;
-} // ogSurface::ogVLine
-
-ogSurface::~ogSurface(void) {
-
-  if (dataState == ogOwner) {
-    delete [] pal;
-    delete [] lineOfs;
-    delete attributes;
-#ifdef __UBIXOS_KERNEL__
-    kfree(buffer);
-#else
-    free(buffer);
-#endif
-  }  // if datastate
-
-  pal    = NULL;
-  lineOfs= NULL;
-  buffer = NULL;
-  attributes = NULL;
-  bSize  = 0;
-  lSize  = 0;
-  dataState = ogNone;
-  return;
-} // ogSurface::~ogSurface
-
-
diff --git a/lib/objgfx40/objgfx40/defpal.inc b/lib/objgfx40/objgfx40/defpal.inc
deleted file mode 100644
index 489879b..0000000
--- a/lib/objgfx40/objgfx40/defpal.inc
+++ /dev/null
@@ -1,259 +0,0 @@
-const
-  ogRGBA8 DEFAULT_PALETTE[256] =
-    {{0,   0,   0,   255},       // 0
-     {0,   0,   170, 255},
-     {0,   170, 0,   255},
-     {0,   170, 170, 255},   // 3
-     {170, 0,   0,   255},
-     {170, 0,   170, 255},
-     {170, 85,  0,   255},
-     {170, 170, 170, 255}, // 7
-     {85,  85,  85,  255},
-     {85,  85,  255, 255},
-     {85,  255, 85,  255},
-     {85,  255, 255, 255},  // 11
-     {255, 85,  85,  255},
-     {255, 85,  255, 255},
-     {255, 255, 85,  255},
-     {255, 255, 255, 255}, //15
-     {16,  16,  16,  255},    // 16
-     {32,  32,  32,  255},
-     {48,  48,  48,  255},
-     {64,  64,  64,  255},
-     {80,  80,  80,  255},
-     {96,  96,  96,  255},
-     {112, 112, 112, 255},
-     {128, 128, 128, 255},
-     {144, 144, 144, 255},
-     {160, 160, 160, 255},
-     {176, 176, 176, 255},
-     {192, 192, 192, 255},
-     {208, 208, 208, 255},
-     {224, 224, 224, 255},
-     {240, 240, 240, 255},
-     {255, 255, 255, 255}, //31
-     {59,  0,   0,   255},      // 32
-     {79,  0,   0,   255},
-     {103, 0,   0,   255},
-     {123, 0,   0,   255},
-     {143, 7,   7,   255},
-     {167, 7,   7,   255},
-     {187, 11,  11,  255},
-     {211, 15,  15,  255},
-     {231, 19,  19,  255},
-     {255, 27,  27,  255},
-     {255, 59,  59,  255},
-     {255, 91,  91,  255},
-     {255, 119, 119, 255},
-     {255, 151, 151, 255},
-     {255, 183, 183, 255},
-     {255, 215, 215, 255},
-     {55,  55,  0,   255},   // 48
-     {71,  71,  0,   255},
-     {87,  87,  0,   255},
-     {103, 103, 7,   255},
-     {119, 119, 7,   255},
-     {135, 135, 11,  255},
-     {155, 155, 19,  255},
-     {171, 171, 23,  255},
-     {187, 187, 31,  255},
-     {203, 203, 35,  255},
-     {219, 219, 43,  255},
-     {239, 239, 59,  255},
-     {255, 255, 63,  255},
-     {255, 255, 127, 255},
-     {255, 255, 187, 255},
-     {255, 255, 255, 255},
-     {0,   43,  0,   255},   // 64
-     {0,   63,  0,   255},
-     {0,   83,  0,   255},
-     {0,   103, 0,   255},
-     {7,   127, 7,   255},
-     {7,   147, 7,   255},
-     {11,  167, 11,  255},
-     {15,  187, 15,  255},
-     {19,  211, 19,  255},
-     {27,  231, 27,  255},
-     {59,  235, 59,  255},
-     {91,  239, 91,  255},
-     {127, 239, 127, 255},
-     {159, 243, 159, 255},
-     {195, 247, 195, 255},
-     {231, 251, 231, 255},
-     {0,   55,  55,  255},   // 80
-     {0,   71,  71,  255},
-     {0,   87,  87,  255},
-     {7,   103, 103, 255},
-     {7,   119, 119, 255},
-     {11,  135, 135, 255},
-     {19,  155, 155, 255},
-     {23,  171, 171, 255},
-     {31,  187, 187, 255},
-     {35,  203, 203, 255},
-     {43,  219, 219, 255},
-     {51,  235, 235, 255},
-     {63,  255, 255, 255},
-     {127, 255, 255, 255},
-     {187, 255, 255, 255},
-     {255, 255, 255, 255},
-     {15,  15,  55,  255},   // 96
-     {19,  19,  79,  255},
-     {27,  27,  103, 255},
-     {31,  31,  127, 255},
-     {35,  35,  155, 255},
-     {39,  39,  179, 255},
-     {43,  43,  203, 255},
-     {47,  47,  227, 255},
-     {51,  51,  255, 255},
-     {71,  71,  255, 255},
-     {91,  91,  255, 255},
-     {111, 111, 255, 255},
-     {131, 131, 255, 255},
-     {151, 151, 255, 255},
-     {175, 175, 255, 255},
-     {195, 195, 255, 255},
-     {59,  51,  59,  255},   // 112
-     {79,  63,  79,  255},
-     {103, 71,  103, 255},
-     {123, 75,  123, 255},
-     {143, 75,  143, 255},
-     {167, 71,  167, 255},
-     {187, 67,  187, 255},
-     {211, 55,  211, 255},
-     {231, 43,  231, 255},
-     {255, 27,  255, 255},
-     {255, 59,  255, 255},
-     {255, 91,  255, 255},
-     {255, 119, 255, 255},
-     {255, 151, 255, 255},
-     {255, 183, 255, 255},
-     {255, 215, 255, 255},
-     {59,  51,  59,  255},   // 128
-     {71,  59,  71,  255},
-     {83,  71,  83,  255},
-     {95,  83,  95,  255},
-     {111, 95,  111, 255},
-     {123, 103, 123, 255},
-     {135, 115, 135, 255},
-     {147, 127, 147, 255},
-     {163, 139, 163, 255},
-     {175, 151, 175, 255},
-     {187, 159, 187, 255},
-     {203, 171, 203, 255},
-     {215, 183, 215, 255},
-     {227, 191, 227, 255},
-     {239, 203, 239, 255},
-     {255, 215, 255, 255},
-     {55,  27,  27,  255},   // 144
-     {71,  35,  35,  255},
-     {91,  43,  43,  255},
-     {107, 55,  55,  255},
-     {127, 67,  67,  255},
-     {143, 75,  75,  255},
-     {163, 87,  87,  255},
-     {179, 99,  99,  255},
-     {199, 111, 111, 255},
-     {203, 127, 127, 255},
-     {211, 139, 139, 255},
-     {219, 159, 159, 255},
-     {223, 175, 175, 255},
-     {231, 191, 191, 255},
-     {239, 211, 211, 255},
-     {247, 231, 231, 255},
-     {91,  63,  27,  255},   // 160
-     {111, 75,  31,  255},
-     {127, 87,  39,  255},
-     {147, 103, 43,  255},
-     {167, 115, 51,  255},
-     {187, 127, 55,  255},
-     {207, 139, 63,  255},
-     {227, 155, 67,  255},
-     {247, 167, 75,  255},
-     {247, 175, 95,  255},
-     {247, 183, 119, 255},
-     {247, 195, 139, 255},
-     {247, 203, 159, 255},
-     {247, 215, 183, 255},
-     {247, 227, 203, 255},
-     {251, 239, 227, 255},
-     {63,  63,  31,  255},   // 176
-     {75,  75,  35,  255},
-     {87,  87,  43,  255},
-     {99,  99,  51,  255},
-     {115, 115, 55,  255},
-     {127, 127, 63,  255},
-     {139, 139, 67,  255},
-     {151, 151, 75,  255},
-     {167, 167, 83,  255},
-     {175, 175, 95,  255},
-     {183, 183, 107, 255},
-     {191, 191, 123, 255},
-     {203, 203, 139, 255},
-     {211, 211, 159, 255},
-     {219, 219, 175, 255},
-     {231, 231, 195, 255},
-     {27,  59,  47,  255},   // 192
-     {31,  75,  59,  255},
-     {39,  87,  67,  255},
-     {47,  103, 79,  255},
-     {55,  119, 91,  255},
-     {59,  135, 99,  255},
-     {67,  151, 111, 255},
-     {71,  167, 119, 255},
-     {79,  183, 127, 255},
-     {87,  199, 139, 255},
-     {91,  215, 147, 255},
-     {99,  231, 155, 255},
-     {127, 235, 183, 255},
-     {163, 239, 211, 255},
-     {195, 243, 231, 255},
-     {231, 251, 247, 255},
-     {23,  55,  55,  255},   // 208
-     {31,  71,  71,  255},
-     {39,  87,  87,  255},
-     {47,  103, 103, 255},
-     {55,  119, 119, 255},
-     {67,  139, 139, 255},
-     {75,  155, 155, 255},
-     {87,  171, 171, 255},
-     {99,  187, 187, 255},
-     {111, 203, 203, 255},
-     {123, 223, 223, 255},
-     {143, 227, 227, 255},
-     {163, 231, 231, 255},
-     {183, 235, 235, 255},
-     {203, 239, 239, 255},
-     {227, 247, 247, 255},
-     {39,  39,  79,  255},   // 224
-     {47,  47,  91,  255},
-     {55,  55,  107, 255},
-     {63,  63,  123, 255},
-     {71,  71,  139, 255},
-     {79,  79,  151, 255},
-     {87,  87,  167, 255},
-     {99,  99,  183, 255},
-     {107, 107, 199, 255},
-     {123, 123, 203, 255},
-     {139, 139, 211, 255},
-     {155, 155, 219, 255},
-     {171, 171, 223, 255},
-     {187, 187, 231, 255},
-     {207, 207, 239, 255},
-     {227, 227, 247, 255},
-     {63,  27,  63,  255},   // 240
-     {75,  31,  75,  255},
-     {91,  39,  91,  255},
-     {103, 47,  103, 255},
-     {119, 51,  119, 255},
-     {131, 59,  131, 255},
-     {147, 67,  147, 255},
-     {163, 75,  163, 255},
-     {175, 83,  175, 255},
-     {191, 91,  191, 255},
-     {199, 107, 199, 255},
-     {207, 127, 207, 255},
-     {215, 147, 215, 255},
-     {223, 171, 223, 255},
-     {231, 195, 231, 255},
-     {243, 219, 243, 255}};
-
diff --git a/lib/objgfx40/objgfx40/objgfx40.h b/lib/objgfx40/objgfx40/objgfx40.h
deleted file mode 100644
index 3ea08fb..0000000
--- a/lib/objgfx40/objgfx40/objgfx40.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/**************************************************************
-$Id: objgfx40.h 89 2016-01-12 00:20:40Z reddawg $
-**************************************************************/
-
-#ifndef OBJGFX40_H
-#define OBJGFX40_H
-
-#include "ogTypes.h"
-#include "ogPixelFmt.h"
-
-#ifndef __UBIXOS_KERNEL__
-#include <stdlib.h> // for NULL, true, false
-#endif
-
-#define ogVERSION 4.0;
-
-class ogPixelFmt;
-
-extern const uInt32 OG_MASKS[32];
-
-#if 0
-typedef 
-  class ogPixelFmt {
-   public:
-    uInt8 BPP;
-    uInt8 redFieldPosition;
-    uInt8 greenFieldPosition;
-    uInt8 blueFieldPosition;
-    uInt8 alphaFieldPosition;
-    uInt8 redMaskSize;
-    uInt8 greenMaskSize;
-    uInt8 blueMaskSize;
-    uInt8 alphaMaskSize;
-    uInt8 reserved[7];
-             ogPixelFmt(uInt8, uInt8, uInt8, uInt8, uInt8, 
-                        uInt8, uInt8, uInt8, uInt8);
-    virtual ~ogPixelFmt(void) {};
-  };
-// Default pixel formats
-const ogPixelFmt OG_NULL_PIXFMT      = { 0, 0,0,0,0,0,0,0,0, {0,0,0,0,0,0}};
-const ogPixelFmt OG_PIXFMT_8BPP      = { 8, 0,0,0,0,0,0,0,0, {0,0,0,0,0,0}};
-const ogPixelFmt OG_PIXFMT_15BPP     = {15, 10,5,0,15,5,5,5,1, {0,0,0,0,0,0}};
-const ogPixelFmt OG_PIXFMT_16BPP     = {16, 11,5,0,0,5,6,5,0, {0,0,0,0,0,0}};
-const ogPixelFmt OG_PIXFMT_24BPP     = {24, 16,8,0,0,8,8,8,0, {0,0,0,0,0,0}};
-const ogPixelFmt OG_PIXFMT_32BPP     = {32, 16,8,0,24,8,8,8,8, {0,0,0,0,0,0}};
-const ogPixelFmt OG_MAC_PIXFMT_16BPP = {16, 8,4,0,12,4,4,4,4, {0,0,0,0,0,0}};
-#endif
-
-#if 0
-class 
-  ogAttributes(uInt32 transparentColour = 0, 
-                 uInt32 defaultAlpha = 255,
-                 bool antiAlias = true,
-                 bool blending = false);
-#endif        
-
-class ogAttributes {
- public:
-  uInt32 transparentColor;
-  uInt32 defaultAlpha;
-  bool   antiAlias;
-  bool   blending;
-  ogAttributes():transparentColor(0), 
-                 defaultAlpha(255),
-                 antiAlias(true),
-                 blending(false) { } 
-  ogAttributes & operator=( ogAttributes const & copy ) {
-    transparentColor = copy.transparentColor;
-    defaultAlpha = copy.defaultAlpha;
-    antiAlias = copy.antiAlias;
-    blending = copy.blending;
-    return * this;
-  } // operator =
-}; // ogAttributes
-
-class ogSurface {
-#ifdef __UBIXOS_KERNEL__
- public:
-#else
- protected:
-#endif
-  float        version;
-  void       * buffer;
-  ogSurface  * owner;
-  uInt32     * lineOfs;
-  ogRGBA8    * pal;
-  ogAttributes*attributes;
-
-  uInt32       xRes, yRes;
-  uInt32       maxX, maxY;
-  uInt32       bSize;       // buffer size (in bytes)
-  uInt32       lSize;       // LineOfs size (in bytes)
-
-  uInt32       BPP;         // bits per pixel
-  uInt32       bytesPerPix;
-  uInt32       pixFmtID;
-
-  uInt32       redFieldPosition;
-  uInt32       greenFieldPosition;
-  uInt32       blueFieldPosition;
-  uInt32       alphaFieldPosition;
-
-  uInt32       redShifter;
-  uInt32       greenShifter;
-  uInt32       blueShifter;
-  uInt32       alphaShifter;
-  uInt32       alphaMasker;
-  ogErrorCode  lastError;
-  ogDataState  dataState;
-
-  bool         ClipLine(int32&, int32&, int32&, int32&);
-  void         RawLine(uInt32, uInt32, uInt32, uInt32, uInt32);
-  virtual uInt32 RawGetPixel(uInt32, uInt32);
-  virtual void RawSetPixel(uInt32, uInt32, uInt32);
-  virtual void RawSetPixel(uInt32, uInt32, uInt8, uInt8, uInt8, uInt8);
-  void         AARawLine(uInt32, uInt32, uInt32, uInt32, uInt32);
- public:
-               ogSurface(void);
-  virtual bool ogAlias(ogSurface&, uInt32, uInt32, uInt32, uInt32);
-  virtual bool ogAvail(void);
-  void         ogArc(int32, int32, uInt32, uInt32, uInt32, uInt32);
-  void         ogBSpline(uInt32, ogPoint2d*, uInt32, uInt32);
-  void         ogCircle(int32, int32, uInt32, uInt32);
-  virtual void ogClear(uInt32);
-  virtual bool ogClone(ogSurface&);
-  void         ogCopy(ogSurface&);
-  void         ogCopyBuf(int32, int32,
-                 ogSurface&, int32, int32, int32, int32);
-  virtual void ogCopyLineTo(uInt32, uInt32, const void *, uInt32);
-  virtual void ogCopyLineFrom(uInt32, uInt32, void *, uInt32);
-  virtual void ogCopyPalette(ogSurface&);
-  virtual bool ogCreate(uInt32, uInt32, ogPixelFmt);
-  void         ogCubicBezierCurve(int32, int32, int32, int32,
-                 int32, int32, int32, int32, uInt32, uInt32);
-  void         ogCurve(int32,int32, int32,int32, int32,int32, uInt32, uInt32);
-  void         ogFillCircle(int32, int32, uInt32, uInt32);
-  void         ogFillGouraudPolygon(uInt32, ogPoint2d*, ogRGBA8 *);
-  void         ogFillPolygon(uInt32, ogPoint2d*, uInt32);
-  void         ogFillRect(int32, int32, int32, int32, uInt32);
-  void         ogFillTriangle(int32,int32, int32,int32, int32,int32, uInt32);
-  uInt32       ogGetAlpha(void);
-  uInt32       ogGetAlphaMasker(void) const { return alphaMasker; }
-  uInt32       ogGetBPP(void) const { return BPP; }
-  uInt32       ogGetBytesPerPix(void) const { return bytesPerPix; }
-  ogDataState  ogGetDataState(void) const { return dataState; }
-  ogErrorCode  ogGetLastError(void);
-  uInt32       ogGetMaxX(void) const { return maxX; }
-  uInt32       ogGetMaxY(void) const { return maxY; }
-  void         ogGetPalette(ogRGBA8[]);
-  void         ogGetPixFmt(ogPixelFmt&);
-  uInt32       ogGetPixFmtID(void) const { return pixFmtID; }
-  virtual uInt32 ogGetPixel(int32, int32);
-  virtual void * ogGetPtr(uInt32, uInt32);
-  uInt32       ogGetTransparentColor(void); 
-  void         ogHFlip(void);
-  virtual void ogHLine(int32, int32, int32, uInt32);
-  bool         ogIsAntiAliasing(void);
-  bool         ogIsBlending(void); 
-  void         ogLine(int32, int32, int32, int32, uInt32);
-  virtual bool ogLoadPalette(const char *);
-  void         ogPolygon(uInt32, ogPoint2d*, uInt32);
-  void         ogRect(int32, int32, int32, int32, uInt32);
-  uInt32       ogPack(uInt8, uInt8, uInt8);
-  uInt32       ogPack(uInt8, uInt8, uInt8, uInt8);
-  bool         ogSavePalette(const char *);
-  void         ogScale(ogSurface&);
-  void         ogScaleBuf(int32, int32, int32, int32,
-                 ogSurface&, int32, int32, int32, int32);
-  uInt32       ogSetAlpha(uInt32);
-  bool         ogSetAntiAliasing(bool);
-  bool         ogSetBlending(bool);
-  virtual ogErrorCode ogSetLastError(ogErrorCode);
-  virtual void ogSetPixel(int32, int32, uInt32);
-  virtual void ogSetPixel(int32, int32, uInt8, uInt8, uInt8, uInt8);
-  virtual void ogSetPalette(const ogRGBA8[]);
-  virtual void ogSetPalette(uInt8, uInt8, uInt8, uInt8, uInt8);
-  virtual void ogSetPalette(uInt8, uInt8, uInt8, uInt8);
-  uInt32       ogSetTransparentColor(uInt32);
-  void         ogSpline(uInt32, ogPoint2d*, uInt32, uInt32);
-  void         ogTriangle(int32, int32, int32, int32, int32, int32, uInt32);
-  void         ogUnpack(uInt32, uInt8&, uInt8&, uInt8&);
-  void         ogUnpack(uInt32, uInt8&, uInt8&, uInt8&, uInt8&);
-  virtual void ogVFlip(void);
-  virtual void ogVLine(int32, int32, int32, uInt32);
-  virtual      ~ogSurface(void);
-}; // ogSurface
-
-#endif
diff --git a/lib/objgfx40/objgfx40/ogBlit.h b/lib/objgfx40/objgfx40/ogBlit.h
deleted file mode 100644
index 5d4604d..0000000
--- a/lib/objgfx40/objgfx40/ogBlit.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef OGBLIT_H
-#define OGBLIT_H
-
-#include "ogSprite.h"
-
-class ogBlit: public ogSprite {
- protected:
-  uInt8 *        blitMask;
-  uInt32         blitMaskSize;
-  uInt32         totalPixCount;
-  int32          startX, startY;
-  int32          endX, endY;
-  
-  void           BlitSize(ogSurface&, int32, int32, int32, int32);
- public:
-                 ogBlit(void);
-                 ogBlit(const ogBlit &, bool);
-  virtual void   Get(ogSurface&, int32, int32, int32, int32);
-  void           GetBlitMask(ogSurface &, int32, int32, int32, int32);
-  uInt32         GetBlitMaskSize(void) const { return blitMaskSize; }
-  void           GetBlitWithMask(ogSurface&, int32, int32);
-  virtual uInt32 GetSize(void);
-  virtual bool   LoadFrom(const char *, uInt32);
-  virtual void   Put(ogSurface&, int32, int32);
-  virtual bool   SaveTo(const char *, int32);
-  virtual        ~ogBlit(void);
-}; // ogBlit
-
-#endif
diff --git a/lib/objgfx40/objgfx40/ogFont.h b/lib/objgfx40/objgfx40/ogFont.h
deleted file mode 100644
index 28a53c3..0000000
--- a/lib/objgfx40/objgfx40/ogFont.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef OGFONT_H
-#define OGFONT_H
-
-#include "objgfx40.h"
-
-enum 
-  ogTextAlign { 
-    leftText,
-    bottomText = leftText, 
-    centerText,
-    rightText,
-    topText = rightText
-  }; // textAlign
-
-class 
-  ogBitFont {
-   protected:
-     uInt32   fontDataIdx[256];
-     uInt32   charWidthTable[256];
-     uInt32   charHeightTable[256];
-     uInt8  * fontData;
-     uInt32   fontDataSize;
-     ogRGBA8  BGColour;
-     ogRGBA8  FGColour;
-     uInt16   numOfChars;
-     uInt8    width, height;
-     uInt8    startingChar;
-   public:
-     ogBitFont();
-     void     CenterTextX(ogSurface&, int32, const char *);
-     uInt32   GetWidth(void) const { return width; }
-     uInt32   GetHeight(void) const { return height; }
-     void     JustifyText(ogSurface&, ogTextAlign, ogTextAlign, const char *);
-     bool     Load(const char *, uInt32);
-     void     PutChar(ogSurface&, int32, int32, const char);
-     void     PutString(ogSurface&, int32, int32, const char *);
-//     bool     Save(const char *);
-     void     SetBGColor(uInt32, uInt32, uInt32, uInt32);
-     void     SetFGColor(uInt32, uInt32, uInt32, uInt32);
-     uInt32   TextHeight(const char *);
-     uInt32   TextWidth(const char *);
-     ~ogBitFont();
-}; // ogBitFont
-
-#endif
diff --git a/lib/objgfx40/objgfx40/ogPixCon.h b/lib/objgfx40/objgfx40/ogPixCon.h
deleted file mode 100644
index eb794e8..0000000
--- a/lib/objgfx40/objgfx40/ogPixCon.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef OGPIXCON_H
-#define OGPIXCON_H
-
-#include "objgfx40.h"
-
-class ogPixCon {
- protected:
-  uInt32  srcMasker;
-  uInt32  srcShifter;
-  uInt32  dstShifter;
- public:
-  ogPixCon(ogPixelFmt, ogPixelFmt);
-  uInt32 ConvPix(uInt32);
-}; // ogPixCon
-
-#endif
diff --git a/lib/objgfx40/objgfx40/ogPixelFmt.h b/lib/objgfx40/objgfx40/ogPixelFmt.h
deleted file mode 100644
index 3ed655a..0000000
--- a/lib/objgfx40/objgfx40/ogPixelFmt.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef OGPIXELFMT_H
-#define OGPIXELFMT_H
-
-#include "ogTypes.h"
-#include "objgfx40.h"
-
-class ogPixelFmt {
- public:
-  uInt8 BPP;
-  uInt8 redFieldPosition;
-  uInt8 greenFieldPosition;
-  uInt8 blueFieldPosition;
-  uInt8 alphaFieldPosition;
-  uInt8 redMaskSize;
-  uInt8 greenMaskSize;
-  uInt8 blueMaskSize;
-  uInt8 alphaMaskSize;
-  uInt8 reserved[7];
-           ogPixelFmt(void);
-           ogPixelFmt(uInt8, uInt8, uInt8, uInt8, uInt8,
-                      uInt8, uInt8, uInt8, uInt8);
-  virtual ~ogPixelFmt(void) {}
-}; // ogPixelFmt
-
-static ogPixelFmt OG_NULL_PIXFMT      = ogPixelFmt(0,  0,0,0,0,   0,0,0,0);
-static ogPixelFmt OG_PIXFMT_8BPP      = ogPixelFmt(8,  0,0,0,0,   0,0,0,0);
-static ogPixelFmt OG_PIXFMT_15BPP     = ogPixelFmt(15, 10,5,0,15, 5,5,5,1);
-static ogPixelFmt OG_PIXFMT_16BPP     = ogPixelFmt(16, 11,5,0,0,  5,6,5,0);
-static ogPixelFmt OG_PIXFMT_24BPP     = ogPixelFmt(24, 16,8,0,0,  8,8,8,0);
-static ogPixelFmt OG_PIXFMT_32BPP     = ogPixelFmt(32, 16,8,0,24, 8,8,8,8);
-static ogPixelFmt OG_MAC_PIXFMT_16BPP = ogPixelFmt(16, 8,4,0,12,  4,4,4,4);
-
-#endif
diff --git a/lib/objgfx40/objgfx40/ogSprite.h b/lib/objgfx40/objgfx40/ogSprite.h
deleted file mode 100644
index 0767f40..0000000
--- a/lib/objgfx40/objgfx40/ogSprite.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef OGSPRITE_H
-#define OGSPRITE_H
-
-#include "objgfx40.h"
-
-class ogSprite {
-  protected:
-   void       * image;           // image data
-   uInt32       imageSize;       // memory size of the image pointer
-   ogRGBA8    * pal;             // palette (used for 8bpp sprites)
-   uInt32       width, height;   // width and height (in pixels)
-   uInt32       bitDepth;        // make this 32-bit just for alignment purposes
-   uInt32       RFP;             // red field position
-   uInt32       GFP;             // green field position
-   uInt32       BFP;             // blue field position
-   uInt32       AFP;             // alpha field position
-   uInt32       rShift;          // red shifter
-   uInt32       gShift;          // green shifter
-   uInt32       bShift;          // blue shifter
-   uInt32       aShift;          // alpha shifter
-   uInt32       tColour;         // original transparent colour
-   uInt32       pixelFmtID;      // pixel format id
-   uInt32       bytesPerPixel;   // bytes per pixel
-   uInt32       dAlpha;          // default alpha
-   uInt32       GetPixel(void *);
-   void         SetPixel(void *, uInt32);
-   void         Unpack(uInt32, uInt8&, uInt8&, uInt8&, uInt8&);
-  public:
-   ogSprite &   operator=(ogSprite const &);
-                ogSprite(void);
-                ogSprite(const ogSprite &);
-   void         Get(ogSurface&, int32, int32, int32, int32);
-   uInt32       GetHeight(void) { return height; }
-   uInt32       GetSize(void);
-   uInt32       GetWidth(void) { return width; }
-   bool         Load(const char *);
-   virtual bool LoadFrom(const char *, uInt32);
-   virtual void Put(ogSurface&, int32, int32);
-   bool         Save(const char *);
-   virtual bool SaveTo(const char *, int32);
-   virtual      ~ogSprite(void);
-   
-}; // ogSprite
-#endif
diff --git a/lib/objgfx40/objgfx40/ogTypes.h b/lib/objgfx40/objgfx40/ogTypes.h
deleted file mode 100644
index 952e6d6..0000000
--- a/lib/objgfx40/objgfx40/ogTypes.h
+++ /dev/null
@@ -1,90 +0,0 @@
-#ifndef OGTYPES_H
-#define OGTYPES_H
-
-typedef signed char            int8;
-typedef signed short int       int16;
-typedef signed long int        int32;
-typedef signed long long int   int64;
-typedef unsigned char          uInt8;
-typedef unsigned short int     uInt16;
-typedef unsigned int           uInt32;
-typedef unsigned long long int uInt64;
-
-enum ogDataState { ogNone, ogOwner, ogAliasing };
-
-enum ogErrorCode {
-  ogOK,
-  ogMemAllocFail,
-  ogAlreadyOwner,
-  ogNoSurface,
-  ogNoPalette,
-  ogBadBPP,
-  ogSourceOutOfBounds,
-  ogDestOutOfBounds,
-  ogFileNotFound,
-  ogFileReadError,
-  ogFileWriteError,
-  ogNoCloning,
-  ogNoAliasing,
-  ogNoModeSupport
-}; // ogErrorCode
-
-class ogRGB8 {
- public:
-  uInt8 red;
-  uInt8 green;
-  uInt8 blue;
-};
-
-class ogRGBA8 {
- public:
-  uInt8 red;
-  uInt8 green;
-  uInt8 blue;
-  uInt8 alpha;
-};
-
-class ogRGB16 {
- public:
-  uInt16 red;
-  uInt16 blue;
-  uInt16 green;
-};
-
-class ogRGBA16 {
- public: 
-  uInt16 red;
-  uInt16 green;
-  uInt16 blue;
-  uInt16 alpha;
-};
-
-class ogRGB32 {
- public:
-  uInt32 red;
-  uInt32 green;
-  uInt32 blue;
-};
-
-class ogRGBA32 {
- public:
-  uInt32 red;
-  uInt32 green;
-  uInt32 blue;
-  uInt32 alpha;
-};
-
-class ogPoint2d {
- public:
-  int32 x;
-  int32 y;
-};
-
-class ogPoint3d {
- public:
-  int32 x;
-  int32 y;
-  int32 z;
-};
-
-#endif
diff --git a/lib/objgfx40/objgfx40/vWidget.h b/lib/objgfx40/objgfx40/vWidget.h
deleted file mode 100644
index 26dcada..0000000
--- a/lib/objgfx40/objgfx40/vWidget.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef VWIDGET_H
-#define VWIDGET_H
-
-#include <objgfx40/objgfx40.h>
-
-class vWidget : public ogSurface {
-  protected:
-    bool   active;
-  public:
-    vWidget(void) { active = true; }
-    virtual void vDraw(void) = 0;
-    virtual bool vGetActive(void) const { return active; }
-    virtual bool vSetActive(bool);
-    virtual bool vCreate(void) = 0;
-};
-
-#endif
diff --git a/lib/objgfx40/objgfx40/vWindow.h b/lib/objgfx40/objgfx40/vWindow.h
deleted file mode 100644
index 3865603..0000000
--- a/lib/objgfx40/objgfx40/vWindow.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef VWINDOW_H
-#define VWINDOW_H
-
-#include <objgfx40/objgfx40.h>
-#include <objgfx40/ogFont.h>
-#include <objgfx40/vWidget.h>
-
-class vWindow : public vWidget {
-  protected:
-    ogSurface * realWindow;
-    ogBitFont * titleFont;
-  public:
-             vWindow(void);
-    virtual  void vDraw(void) { return; }
-    virtual  bool vCreate(void);
-    	     void vSDECommand(uInt32);
-    virtual  ~vWindow(void);
-};
-#endif
diff --git a/lib/objgfx40/ogBlit.cpp b/lib/objgfx40/ogBlit.cpp
deleted file mode 100644
index 4de049c..0000000
--- a/lib/objgfx40/ogBlit.cpp
+++ /dev/null
@@ -1,851 +0,0 @@
-extern "C" {
-  #include <string.h>
-  #include <stdio.h>
-  #include <stdlib.h>
-  }
-#include <objgfx40/objgfx40.h>
-#include <objgfx40/ogBlit.h>
-
-using namespace std;
-
-static bool
-fileExists(const char *file)
-{
-  FILE *f = fopen(file, "rb");
-  if (!f)
-    return false;
-  fclose(f);
-  return true;
-}
-
-ogBlit::ogBlit(ogBlit const & srcBlit, bool doFullCopy = false) : ogSprite() {
-
-  // horrible horrible hack. This is required because I can't have
-  // two constructors with the same parameter list like I can in pascal.
-
-  // -- begin hack --
-  if (doFullCopy) ogSprite::operator=(srcBlit);
-  // -- end hack --
-
-  startX = srcBlit.startX;
-  startY = srcBlit.startY;
-  endX   = srcBlit.endX;
-  endY   = srcBlit.endY;
- 
-  totalPixCount = srcBlit.totalPixCount;
-  blitMaskSize = srcBlit.blitMaskSize;
-
-  blitMask = NULL;
-
-  if (blitMaskSize != 0) {
-    blitMask = new uInt8[blitMaskSize];
-    if ((blitMask != NULL) && (srcBlit.blitMask != NULL))
-      memcpy(blitMask, srcBlit.blitMask, blitMaskSize);
-  } // if
-  return;
-} // ogBlit::ogBlit
-
-ogBlit::ogBlit(void) : ogSprite() {
-  blitMask      = NULL;
-  blitMaskSize  = 0;
-  totalPixCount = 0;
-  startX        = 0;
-  startY        = 0;
-  endX          = 0;
-  endY          = 0;
-  return;
-} // ogBlit::ogBlit
-
-void
-ogBlit::BlitSize(ogSurface& src, int32 x1, int32 y1, int32 x2, int32 y2) {
-  uInt32 aMask;
-  int32  x,y;
-  uInt8  zerocount;
-  uInt8  pixcount;
-
-  bool   inZeros;
-  bool   found;
-
-  // first free the image data or the blitMask data if we already have some
-  
-  free(image);
-  delete [] blitMask;
-
-  image = NULL;
-  blitMask = NULL;
-  imageSize = 0;
-  blitMaskSize = 0;
-
-  aMask = src.ogGetAlphaMasker();
-  tColour = src.ogGetTransparentColor();
-
-  startX = x1;
-  startY = y1;
-  endX = x2;
-  endY = y2;
-
-  // start by locating the left-most non-transparent pixel in the region defined
-  // by (x1,y1) to (x2,y2)
-
-  found = false;
-  while ((!found) && (startX <= x2)) {
-    for (y = y1; y <= y2; y++)
-      found |= ((src.ogGetPixel(startX, y) & aMask) != tColour);
-    if (!found) ++startX;
-  } // while
-
-  // now we look for the top-most non-transparent pixel in the regsion 
-  // defined by  (startX,y1) to (x2,y2)
-
-  found = false;
-  while ((!found) && (startY <= y2)) {
-    for (x = startX; x <= x2; x++)
-      found |= ((src.ogGetPixel(x,startY) & aMask) != tColour);
-    if (!found) ++startY;
-  } // while
-
-  found = false;
-  while ((!found) && (endX >= startX)) {
-    for (y = startY; y <= y2; y++)
-      found |= ((src.ogGetPixel(endX,y) & aMask) != tColour);
-    if (!found) --endX;
-  } // while
-
-  found = false;
-  while ((!found) && (endY >= startY)) {
-    for (x = startX; x <= endX; x++)
-      found |= ((src.ogGetPixel(x,endY) & aMask) != tColour);
-    if (!found) --endY;
-  } // while
-
-  for (y = startY; y <= endY; y++) {
-    zerocount = 0;
-    blitMaskSize++;  // save room for xlcount
-    x = startX;
-    inZeros = ((src.ogGetPixel(x,y) & aMask) == tColour);
-
-    while (x <= endX) {
-      switch (inZeros) {
-        case true:
-          zerocount = 0;  // How many zeros?
-
-          while ((x <= endX) && ((src.ogGetPixel(x,y) & aMask) == tColour)) {
-            ++x;
-
-            if (zerocount == 255) {
-              zerocount = 0;
-              blitMaskSize += 2;
-            } else ++zerocount;
-          } // while
-
-          inZeros = false;
-          break; // case true
-
-        case false:
-          pixcount = 0;
-          blitMaskSize += 2;
-          do {
-            ++x;
-
-            if (pixcount == 255) {
-              blitMaskSize += 2;
-              pixcount = 0;
-            } else ++pixcount;
-
-            ++totalPixCount;
-       //mjikaboom     imageSize += bm;
-          } while ((x <= endX) && ((src.ogGetPixel(x,y) & aMask) != tColour));
-          inZeros = true;
-          break; // case false
-      } // switch
-    } // while
-  } // for
-
-  startX -= x1;
-  startY -= y1;
-  endX -= x1;
-  endY -= y1;
-
-  blitMask = new uInt8[blitMaskSize]; //(uInt8 *)malloc(blitMaskSize);
-//  memset(blitMask,0,blitMaskSize);
-  return;
-} // ogBlit::BlitSize
-
-void
-ogBlit::GetBlitMask(ogSurface& src, int32 x1, int32 y1, 
-                    int32 x2, int32 y2) {
-
-  uInt8 * blitMaskPtr;
-  uInt8 * lineCountPtr;
-  int32   x, y;
-  bool    inZeros;
-  uInt8   pixCount, zeroCount;
-  uInt32  aMask;
-  uInt32  tmp;
-
-  if (x1 > x2) {
-    tmp = x1;
-    x1  = x2;
-    x2  = tmp;
-  } // if
-  
-  if (y1 > y2) {
-    tmp = y1;
-    y1  = y2;
-    y2  = tmp;
-  } // if
-
-  // calculate the width/height
-
-  width = (x2 - x1)+1;
-  height = (y2 - y1)+1;
-
-  bytesPerPixel = src.ogGetBytesPerPix();
-
-  if (bytesPerPixel == 1) {
-    if (pal != NULL) pal = new ogRGBA8[256];
-    // note that tPal will check for null, so this check may be unnecessary
-    if (pal != NULL) src.ogGetPalette(pal);
-/*      for (tmp = 0; tmp < 256; tmp++)
-      src.Unpack(tmp,
-                 pal[tmp].red, 
-                 pal[tmp].green, 
-                 pal[tmp].blue,
-                 pal[tmp].alpha); */
-  } // if
-
-  // compute the size of the blit mask and allocate memory for it
-
-  BlitSize(src, x1, y1, x2, y2);
-  
-  if (blitMask == NULL) return;
-  
-  blitMaskPtr = blitMask;
-  aMask = src.ogGetAlphaMasker();
-  tColour = src.ogGetTransparentColor();
-
-  for (y = y1+startY; y <= y1+endY; y++) {
-    zeroCount = 0;
-    lineCountPtr = blitMaskPtr;
-    *lineCountPtr = 0;
-    ++blitMaskPtr;
-    x = x1+startX;
-    inZeros = ((src.ogGetPixel(x,y) & aMask) == tColour);
-
-    while (x <= x1+endX) {
-      switch (inZeros) {
-        case true:
-          zeroCount = 0;
-          while ((x <= x1+endX) && ((src.ogGetPixel(x,y) & aMask) == tColour)) {
-            ++x;
-            if (zeroCount == 255) {
-              ++(*lineCountPtr);
-              *blitMaskPtr = 255;     // offset
-              ++blitMaskPtr;          // increment to next byte
-              *blitMaskPtr = 0;       // runcount
-              ++blitMaskPtr;          // increment to next byte
-              *blitMaskPtr = 0;       // offset
-              zeroCount = 0;
-            } else ++zeroCount;
-          } // while
-
-          inZeros = false;  // we are no longer in zeros
-          break; // case true
-
-        case false:
-          ++(*lineCountPtr);
-          *blitMaskPtr = zeroCount;
-          ++blitMaskPtr;
-          *blitMaskPtr = 0;
-          pixCount = 0;
-
-          do {
-            ++x;
-
-            if (pixCount == 255) {
-              ++(*lineCountPtr);
-              *blitMaskPtr = 255;     // runcount
-              ++blitMaskPtr;          // advance pointer
-              *blitMaskPtr = 0;       // offset to next run
-              ++blitMaskPtr;          // advance pointer
-              *blitMaskPtr = 0;       // next run count (incremented below)
-              pixCount = 0;
-            } else ++pixCount;
-
-            ++(*blitMaskPtr);
-
-          } while ((x <= (x1+endX)) &&
-                   ((src.ogGetPixel(x,y) & aMask) != tColour));
-          ++blitMaskPtr;
-          inZeros = true;      // set inZeros to true to toggle
-          break; // case false
-      } // switch
-    } // while
-  } // for y
-  return;
-} // ogBlit::GetBlitMask
-
-void
-ogBlit::Get(ogSurface& src, int32 x1, int32 y1, int32 x2, int32 y2) {
-  int32 tmp;
-  
-  if (x1 > x2) {
-    tmp = x1;
-    x1  = x2;
-    x2  = tmp;
-  } // if
-
-  if (y1 > y2) {
-    tmp = y1;
-    y1  = y2;
-    y2  = tmp;
-  } // if
-
-  // get the blit mask
-  GetBlitMask(src, x1, y1, x2, y2);
-
-  // now get the actual blit using the blit mask
-  GetBlitWithMask(src, x1, y1);
-
-  return;
-} // ogBlit::Get
-
-void
-ogBlit::GetBlitWithMask(ogSurface & src, int32 x, int32 y) {
- /*
-  * getBlitWithMask
-  *
-  * Retrieves the data portion of a blit using a predefined mask and
-  * stores the data in the image pointer.  If the source buffer is
-  * a different pixel format, we will adjust the image pointer
-  * to accommodate the new data and update the pixel format.  The put()
-  * function will adjust the pixels to the dest buffer as needed.
-  * Before calling this routine, you must call getBlitMask.
-  */
-
-  int32  sx, sy;
-  uInt8  lineCount, offset, pixCount;
-  uInt32 nsy, ney;
-  uInt8 *blitMaskPtr;
-  void  *imagePtr;
-  uInt32 distToEdge, xRight, count;
-  ogPixelFmt pixFmt;
-
-  if (blitMask == NULL) return;
-
-  if ( (x + startX > (int32)src.ogGetMaxX()) || (x + endX < 0) ||
-       (y + startY > (int32)src.ogGetMaxY()) || (y + endY < 0)) return;
-
-  blitMaskPtr = blitMask;
-
-  // First check to see if the pixel format we got the blitmask from
-  // is different than what we're dealing with now
-  // note that the first time through pixelFmtID will be 0, so this
-  // will get that information
-
-  if (src.ogGetPixFmtID() != pixelFmtID) {
-    free(image);
-    image = NULL;
-    imageSize = 0;
-
-    src.ogGetPixFmt(pixFmt);
-
-    bitDepth = pixFmt.BPP;
-    RFP      = pixFmt.redFieldPosition;
-    GFP      = pixFmt.greenFieldPosition;
-    BFP      = pixFmt.blueFieldPosition;
-    AFP      = pixFmt.alphaFieldPosition;
-    rShift   = 8-pixFmt.redMaskSize;
-    gShift   = 8-pixFmt.greenMaskSize;
-    bShift   = 8-pixFmt.blueMaskSize;
-    aShift   = 8-pixFmt.alphaMaskSize;
-
-    bytesPerPixel = src.ogGetBytesPerPix();
-    pixelFmtID = src.ogGetPixFmtID();
-    dAlpha   = src.ogGetAlpha();
-   //  tColour = src.ogGetTransparentColor(); // done elsewhere
-
-  } // if
-
-  if (image == NULL) {
-    imageSize = totalPixCount * bytesPerPixel;
-    image = malloc(imageSize);
-  } // if
-
-  imagePtr = image;
-  // If any part of the blit data is out of bounds, we need to fill it with the
-  // transparent colour
-  if ( (x + startX < 0) || (x + endX > (int32)src.ogGetMaxX()) ||
-       (y + startY < 0) || (y + endY > (int32)src.ogGetMaxY())) {
-    for (count = 0; count < totalPixCount; count++) {
-      SetPixel(imagePtr, tColour);
-      (uInt8 *)imagePtr += bytesPerPixel;
-    } // for count
-    imagePtr = image;   // reset the image pointer
-  } // if
-
-  // first do clipping on the top edge
-  nsy = startY;
-  if (y+startY < 0) {
-    /*
-     *  If we're here then part of the blit is above the top edge of the
-     *  buffer.  The distance to the top of the buffer is abs(y+startY).
-     *  So, we need to loop through the blit geometry and advance the
-     *  relative pointers (BlitMaskPtr and ImagePtr)
-     */
-    for (sy = (y+startY); sy<0; sy++) {
-      ++nsy;
-      lineCount = *blitMaskPtr;
-      ++blitMaskPtr;
-      while (lineCount > 0) {
-        ++blitMaskPtr;
-        pixCount = *blitMaskPtr;
-        ++blitMaskPtr;
-        if (pixCount > 0) (uInt8 *)imagePtr += pixCount*bytesPerPixel;
-        --lineCount;
-      } // while
-    } // for sy
-  } // if
-
-  // Now do clipping on the bottom edge. This is easy.
-  if (y+endY > (int32)src.ogGetMaxY())
-    ney = (src.ogGetMaxY()-y);
-  else
-    ney = endY;
-
-  for (sy = nsy; (uInt32)sy <= ney; sy++) {
-    sx = x+startX;
-    lineCount = *blitMaskPtr;
-    ++blitMaskPtr;
-
-    while (lineCount > 0) {
-      offset = *blitMaskPtr;
-      ++blitMaskPtr;
-      sx += offset;
-      pixCount = *blitMaskPtr;
-      ++blitMaskPtr;
-
-      if (pixCount > 0) {
-        if (sx <= (int32)src.ogGetMaxX()) {
-          if ((sx < 0) && (sx+pixCount > 0)) {
-            pixCount += sx;                         // remember, sx is negative
-            (uInt8*)imagePtr -= sx*bytesPerPixel;   // remember, sx is negative
-            sx = 0;
-          } // if sx<0 && sx+pixcount>0
-
-          if (sx+pixCount > (int32)src.ogGetMaxX()+1) {
-            distToEdge = (src.ogGetMaxX()-sx)+1;
-            xRight = (pixCount - distToEdge)*bytesPerPixel;
-            pixCount = distToEdge;
-          } else xRight = 0;                     // if sx+pixCount>MaxX
-
-          if (sx >= 0)
-            src.ogCopyLineFrom(sx, y+sy, imagePtr, pixCount*bytesPerPixel);
-
-          (uInt8*)imagePtr += xRight; // get any remainter from right edge clip
-        } // if sx <= MaxX
-
-        sx += pixCount;
-        (uInt8*)imagePtr += pixCount*bytesPerPixel;
-
-      } // if pixCount>0
-      --lineCount;
-    } // while
-  } // for
-
-  return;
-} // ogBlit::GetBlitWithMask
-
-uInt32
-ogBlit::GetSize(void) {
-  return ogSprite::GetSize() +
-           sizeof(totalPixCount) +
-           sizeof(blitMaskSize) +
-           blitMaskSize +
-           sizeof(startX) +
-           sizeof(startY) +
-           sizeof(endX) +
-           sizeof(endY);
-} // ogBlit::GetSize
-
-bool
-ogBlit::LoadFrom(const char * filename, uInt32 offset) {
-  FILE * infile;
-  uInt32 lresult, tresult, totSize;
-  uInt32 tmpSize;
-  char headerIdent[4];
-
-  if (!fileExists(filename)) return false;
-  if ((infile = fopen(filename,"rb")) == NULL) return false;
-  fseek(infile, offset, SEEK_SET);
-
-  // for now just free up the previous image.  This will be changed
-  // later so it doesn't affect the current image (if any) if there
-  // is a failure loading
-
-  free(image);
-  delete [] pal;
-  delete [] blitMask;
-  imageSize = 0;
-  blitMaskSize = 0;
-
-  tresult = 0;   // total bytes we've read in so far
-  
-  lresult = fread(headerIdent, sizeof(headerIdent), 1, infile);
-  tresult += lresult*sizeof(headerIdent);
-  if ((headerIdent[0] != 'B') ||
-      (headerIdent[1] != 'L') ||
-      (headerIdent[2] != 'T') ||
-      (headerIdent[3] != (uInt8)0x1A)) {
-    fclose(infile);
-    return false;
-  }
-  lresult = fread(&totSize, sizeof(totSize), 1, infile);
-  tresult += lresult*sizeof(totSize);
-
-  lresult = fread(&width, sizeof(width), 1, infile);
-  tresult += lresult*sizeof(width);
-
-  lresult = fread(&height, sizeof(height), 1, infile);
-  tresult += lresult*sizeof(height);
-
-  lresult = fread(&bitDepth, sizeof(bitDepth), 1, infile);
-  tresult += lresult*sizeof(bitDepth);
-
-  lresult = fread(&RFP, sizeof(RFP), 1, infile);
-  tresult += lresult*sizeof(RFP);
-
-  lresult = fread(&GFP, sizeof(GFP), 1, infile);
-  tresult += lresult*sizeof(GFP);
-
-  lresult = fread(&BFP, sizeof(BFP), 1, infile);
-  tresult += lresult*sizeof(BFP);
-
-  lresult = fread(&AFP, sizeof(AFP), 1, infile);
-  tresult += lresult*sizeof(AFP);
-
-  lresult = fread(&rShift, sizeof(rShift), 1, infile);
-  tresult += lresult*sizeof(rShift);
-  
-  lresult = fread(&gShift, sizeof(gShift), 1, infile);
-  tresult += lresult*sizeof(gShift);
-  
-  lresult = fread(&bShift, sizeof(bShift), 1, infile);
-  tresult += lresult*sizeof(bShift);
-  
-  lresult = fread(&aShift, sizeof(aShift), 1, infile);
-  tresult += lresult*sizeof(aShift);
-
-  lresult = fread(&tColour, sizeof(tColour), 1, infile);
-  tresult += lresult*sizeof(tColour);
-
-  lresult = fread(&pixelFmtID, sizeof(pixelFmtID), 1, infile);
-  tresult += lresult*sizeof(pixelFmtID);
-
-  lresult = fread(&bytesPerPixel, sizeof(bytesPerPixel), 1, infile);
-  tresult += lresult*sizeof(bytesPerPixel);
-
-  lresult = fread(&dAlpha, sizeof(dAlpha), 1, infile);
-  tresult += lresult*sizeof(dAlpha);
-
-  lresult = fread(&totalPixCount, sizeof(totalPixCount), 1, infile);
-  tresult += lresult*sizeof(totalPixCount);
-  
-  lresult = fread(&startX, sizeof(startX), 1, infile);
-  tresult += lresult*sizeof(startX);
-
-  lresult = fread(&startY, sizeof(startY), 1, infile);
-  tresult += lresult*sizeof(startY);
-
-  lresult = fread(&endX, sizeof(endX), 1, infile);
-  tresult += lresult*sizeof(endX);
-
-  lresult = fread(&endY, sizeof(endY), 1, infile);
-  tresult += lresult*sizeof(endY);
-
-  lresult = fread(&blitMaskSize, sizeof(blitMaskSize), 1, infile);
-  tresult += lresult*sizeof(blitMaskSize);
-
-  lresult = fread(&imageSize, sizeof(imageSize), 1, infile);
-  tresult += lresult*sizeof(imageSize);
-  
-  blitMask = new uInt8[blitMaskSize];
-  if (blitMask == NULL) {
-    fclose(infile);
-    return false;
-  }
-  
-  image = malloc(imageSize);
-  if (image == NULL) {
-    fclose(infile);
-    return false;
-  }
-
-  // read in the blit mask
-  lresult = fread(blitMask, blitMaskSize, 1, infile);
-  tresult += lresult*blitMaskSize;
-
-  // read in the image data
-  // it's possible that if we start saving only blit masks this section will be
-  // blank
-  lresult = fread(image, 1, imageSize, infile);
-  tresult += lresult;
-
-  if (bitDepth == 8) {
-    // 8bpp sprites have palettes
-    if (pal == NULL) pal = new ogRGBA8[256];
-    if (pal == NULL) {
-      fclose(infile);
-      return false;
-    } // if pal==NULL
-    lresult = fread(&tmpSize, sizeof(tmpSize), 1, infile);
-    tresult += lresult*sizeof(tmpSize);
-
-    if (tmpSize > sizeof(ogRGBA8)*256) {
-      fclose(infile);
-      return false;
-    }
-    lresult = fread(pal, tmpSize, 1, infile);
-    tresult += lresult*tmpSize;
-  } // if bitDepth == 8
-
-  fclose(infile);
-  return (tresult == totSize);
-} // ogBlit::LoadFrom
-
-void
-ogBlit::Put(ogSurface& dest, int32 x, int32 y) {
-  int32  sx, sy;
-  uInt32 nsy, ney;
-  uInt8  lineCount, offset, pixCount;
-  uInt8* blitMaskPtr;
-  void * imagePtr;
-  uInt32 distToEdge, xRight, xx;
-  uInt8  r, g, b, a;
-  ogPixelFmt pixFmt;
-  
-  // can we draw anything?
-  if ((blitMask == NULL) || (image == NULL)) return;
-
-  if (!dest.ogAvail()) return;
-
-  // see if the blit is oustide the buffer
-  if ( ((x+startX) > (int32)dest.ogGetMaxX()) || ((x + endX) < 0) ||
-       ((y+startY) > (int32)dest.ogGetMaxY()) || ((y + endY) < 0) ) return;
-
-  blitMaskPtr = blitMask;
-  imagePtr = image;
-
-  // first do clipping on the top edge
-  nsy = startY;
-  if (y+startY < 0) {
-    /*
-     *  If we're here then part of the blit is above the top edge of the
-     *  buffer.  The distance to the top of the buffer is abs(y+startY).
-     *  So, we need to loop through the blit geometry and advance the
-     *  relative pointers (blitMaskPtr and imagePtr)
-     */
-    for (sy = (y+startY); sy < 0; sy++) {
-      ++nsy;
-      lineCount = *blitMaskPtr;
-      ++blitMaskPtr;
-
-      while (lineCount > 0) {
-        ++blitMaskPtr;
-        pixCount = *blitMaskPtr;
-        ++blitMaskPtr;
-        if (pixCount > 0) (uInt8 *)imagePtr += pixCount*bytesPerPixel;
-        --lineCount;
-      } // while
-    } // for sy
-  } // if
-
-  // Now do clipping on the bottom edge. This is easy
-  // y is guaranteed to be >=0
-  // I'm going to contradict myself and say that I don't think y is
-  // guaranteed to be >= 0. 
-
-  if (y+endY > (int32)dest.ogGetMaxY())
-    ney = (dest.ogGetMaxY()-y);
-  else
-    ney = endY;
-
-  dest.ogGetPixFmt(pixFmt);
-
-  if ((dest.ogGetPixFmtID() != pixelFmtID) || (dest.ogIsBlending())) {
-    for (sy = nsy; (uInt32)sy <= ney; sy++) {
-      sx = x+startX;
-      lineCount = *blitMaskPtr;
-      ++blitMaskPtr;
-      while (lineCount > 0) {
-        offset = *blitMaskPtr;
-        ++blitMaskPtr;
-        sx += offset;
-        pixCount = *blitMaskPtr;
-        ++blitMaskPtr;
-
-        if (pixCount > 0) {
-          if (sx <= (int32)dest.ogGetMaxX()) {
-
-            if ((sx < 0) && (sx+(int32)pixCount > 0)) {
-              pixCount += sx;                        // remember, sx is negative
-              (uInt8*)imagePtr -= sx*bytesPerPixel;  // remember, sx is negative
-              sx = 0;
-            } // if sx<0 && sx+pixCount>0
-
-            if (sx+pixCount > (int32)dest.ogGetMaxX()) {
-              distToEdge = (dest.ogGetMaxX()-sx)+1;
-              xRight = (pixCount-distToEdge)*bytesPerPixel;
-              pixCount = distToEdge;
-            } else xRight = 0; // if sx+pixCount>MaxX
-
-            if (sx >= 0)
-              for (xx = 0; xx < pixCount; xx++) {
-                Unpack(GetPixel((uInt8*)imagePtr+(xx*bytesPerPixel)),
-                       r, g, b, a);
-                dest.ogSetPixel(sx+xx, sy+y, r, g, b, a);
-              } // for
-            (uInt8*)imagePtr += xRight;
-          } // if sx <= maxX
-          sx += pixCount;
-          (uInt8*)imagePtr += pixCount*bytesPerPixel;
-        } // if pixCount != 0
-        --lineCount;
-      } // while
-    } // for
-  } else {
-    for (sy = nsy; (uInt32)sy <= ney; sy++) {
-      sx = x+startX;
-      lineCount = *blitMaskPtr;
-      ++blitMaskPtr;
-
-      while (lineCount > 0) {
-        offset = *blitMaskPtr;
-        ++blitMaskPtr;
-        sx += offset;
-        pixCount = *blitMaskPtr;
-        ++blitMaskPtr;
-
-        if (pixCount > 0) {
-          if (sx <= (int32)dest.ogGetMaxX()) {
-            if ((sx < 0) && (sx+pixCount > 0)) {
-              pixCount += sx;                       // remember, sx is negative
-              (uInt8*)imagePtr -= sx*bytesPerPixel; // remember, sx is negative
-              sx = 0;
-            } // if sx<0 && sx+pixCount>0
-
-            if (sx+pixCount > (int32)dest.ogGetMaxX()+1) {
-              distToEdge = (dest.ogGetMaxX()-sx)+1;
-              xRight = (pixCount - distToEdge)*bytesPerPixel;
-              pixCount = distToEdge;
-            } else xRight = 0; // if sx+pixCount>MaxX
-
-            if (sx >= 0)
-              dest.ogCopyLineTo(sx, y+sy, imagePtr, pixCount*bytesPerPixel);
-            (uInt8*)imagePtr += xRight;
-          } // if sx <= MaxX
-          sx += pixCount;
-          (uInt8*)imagePtr += pixCount*bytesPerPixel;
-        } // if pixCount>0
-        --lineCount;
-      } // while
-    } // for
-  } // else
-
-  return;
-} // ogBlit::Put
-
-bool
-ogBlit::SaveTo(const char * filename, int32 offset) {
-  /*
-   * saveTo
-   *
-   * saves a blit to disk.  If the file doesn't exit then we will create
-   * a new one (doing this will ignore any specified offset).  If the file
-   * exists, we will seek to the specified offset and place the bitmap there.
-   * If offset is -1, then we seek to the end of the file.
-   *
-   * This function will fail on files larger than 2GB.
-   *
-   */
-  FILE * outfile = NULL;
-  char headerIdent[4];
-  uInt32 tmpSize;
-  
-  if (image == NULL) return false;
-  if ((bitDepth == 8) && (pal == NULL)) return false;
-
-  if (!fileExists(filename)) {        // file doesn't exist
-    if ((outfile = fopen(filename,"wb")) == NULL) return false;
-  } else {
-    // file exists. Now we check to see where we put it
-    if (offset==-1) {
-      if ((outfile = fopen(filename, "ab")) == NULL) return false;
-    } else {
-      // we have an existing file and an offset to place the data
-      if ((outfile = fopen(filename, "wb")) == NULL) return false;
-      if (offset != 0) fseek(outfile, offset, SEEK_SET);
-    } // else
-  } // else
-
-  tmpSize = GetSize();
-  
-  headerIdent[0] = 'B';
-  headerIdent[1] = 'L';
-  headerIdent[2] = 'T';
-  headerIdent[3] = (uInt8)0x1A;  // EOF marker
-
-  // we store exactly how bit this sucker is inside the header. This includes
-  // the header information before it, and the size itself
-  fwrite(headerIdent, sizeof(headerIdent), 1, outfile);
-
-  fwrite(&tmpSize, sizeof(tmpSize), 1, outfile);
-  fwrite(&width, sizeof(width), 1, outfile);
-  fwrite(&height, sizeof(height), 1, outfile);
-  fwrite(&bitDepth, sizeof(bitDepth), 1, outfile);
-
-  fwrite(&RFP, sizeof(RFP), 1, outfile);
-  fwrite(&GFP, sizeof(GFP), 1, outfile);
-  fwrite(&BFP, sizeof(BFP), 1, outfile);
-  fwrite(&AFP, sizeof(AFP), 1, outfile);
-
-  fwrite(&rShift, sizeof(rShift), 1, outfile);
-  fwrite(&gShift, sizeof(gShift), 1, outfile);
-  fwrite(&bShift, sizeof(bShift), 1, outfile);
-  fwrite(&aShift, sizeof(aShift), 1, outfile);
-
-  fwrite(&tColour, sizeof(tColour), 1, outfile);
-  fwrite(&pixelFmtID, sizeof(pixelFmtID), 1, outfile);
-  fwrite(&bytesPerPixel, sizeof(bytesPerPixel), 1, outfile);
-  fwrite(&dAlpha, sizeof(dAlpha), 1, outfile);
-
-  fwrite(&totalPixCount, sizeof(totalPixCount), 1, outfile);
-
-  fwrite(&startX, sizeof(startX), 1, outfile);
-  fwrite(&startY, sizeof(startY), 1, outfile);
-  fwrite(&endX, sizeof(endX), 1, outfile);
-  fwrite(&endY, sizeof(endY), 1, outfile);
-
-  fwrite(&blitMaskSize, sizeof(blitMaskSize), 1, outfile);
-  fwrite(&imageSize, sizeof(imageSize), 1, outfile);
-
-  fwrite(blitMask, blitMaskSize, 1, outfile);
-  fwrite(image, 1, imageSize, outfile);
-
-  if (bitDepth == 8) {
-    tmpSize = sizeof(ogRGBA8)*256;
-    fwrite(&tmpSize, sizeof(tmpSize), 1, outfile);
-    fwrite(pal, sizeof(ogRGBA8), 256, outfile);
-  } // if bitDepth == 8
-
-  fclose(outfile);
-  return true;
-} // ogBlit::SaveTo
-
-ogBlit::~ogBlit(void) {
-  delete [] blitMask;
-  blitMask = NULL;
-  blitMaskSize = 0;
-  return;
-} // ogBlit::~ogBlit
-
diff --git a/lib/objgfx40/ogDisplay_UbixOS.cc b/lib/objgfx40/ogDisplay_UbixOS.cc
deleted file mode 100755
index a13ef29..0000000
--- a/lib/objgfx40/ogDisplay_UbixOS.cc
+++ /dev/null
@@ -1,270 +0,0 @@
-#include <objgfx40/objgfx40.h>
-#include <objgfx40/defpal.inc>
-#include <sde/ogDisplay_UbixOS.h>
-
-extern "C" {
-  #include <lib/string.h>
-  #include <ubixos/schedule.h>
-  #include <lib/bioscall.h>
-  #include <vmm/paging.h>
-  #include <sys/video.h>
-  #include <sys/io.h>
-  }
-
-/*
- *
- *              ogDisplay methods
- *
- */
-
-void
-initVESAMode(uInt16 mode) {
-  kprintf("Pre-initVESAMode\n");
-  biosCall(0x10,0x4F02,mode,0x0,0x0,0x0,0x0,0x0,0x0);
-  kprintf("Post-initVESAMode\n");
-  return;
-}
-
-ogDisplay_UbixOS::ogDisplay_UbixOS(void) {
-  pages[0] = pages[1] = NULL;
-  activePage = visualPage = 0;
-  pal = new ogRGBA8[256];
-  attributes = new ogAttributes();
-
-  VESAInfo = (ogVESAInfo *)0x11000;
-  modeInfo = (ogModeInfo *)0x11200;
-  
-  getVESAInfo();
-  return;
-} // ogDisplay_UbixOS::ogDisplay_UbixOS
-
-void
-ogDisplay_UbixOS::GetModeInfo(uInt16 mode) {
-  kprintf("Pre-getModeInfo\n");
-  biosCall(0x10,0x4F01,0x0,mode,0x0,0x0,0x0,0x1120,0x0);
-  kprintf("Post-getModeInfo\n");
-  return;
-} // ogDisplay_UbixOS::GetModeInfo
-
-void
-ogDisplay_UbixOS::GetVESAInfo(void) {
-  VESAInfo->VBESignature[0] = 'V'; // First off initialize the structure.
-  VESAInfo->VBESignature[1] = 'B';
-  VESAInfo->VBESignature[2] = 'E';
-  VESAInfo->VBESignature[3] = '2';
-  kprintf("Pre-getVESAInfo\n");
-  biosCall(0x10,0x4F00,0x0,0x0,0x0,0x0,0x0,0x1100,0x0);
-  kprintf("Post-getVESAInfo\n");
-  return;
-  } // ogDisplay_UbixOS::GetVESAInfo
-
-uInt16
-ogDisplay_UbixOS::FindMode(uInt32 _xRes, uInt32 _yRes, uInt32 _BPP) {
-  uInt16 mode;
-
-  if ((_xRes == 320) && (_yRes == 200) && (_BPP == 8)) return 0x13;
-
-//  if ((VESAInfo==NULL) || (VESAInfo->videoModePtr==NULL)) return 0;
-  if (modeInfo == NULL) return 0;
-
-  for (mode = 0x100; mode < 0x1FF; mode++) {
-    getModeInfo(mode);
-    if ((modeInfo->xRes >= _xRes) && (modeInfo->yRes >= _yRes) &&
-        (modeInfo->bitsPerPixel == _BPP))
-      return mode;
-  }
-
-  return 0;
-} // ogDisplay_UbixOS::FindMode
-
-void ogDisplay_UbixOS::SetMode(uInt16 mode) {
-
-  uInt32 size = 0x0, count = 0x0, i = 0x0;
-  
-  if (mode == 0x13) {
-  
-    xRes = 320;
-    yRes = 200;
-    maxX = 319;
-    maxY = 199;
-    BPP  = 8;
-    bytesPerPix = 1;
-
-    redFieldPosition = 0;
-    greenFieldPosition = 0;
-    blueFieldPosition = 0;
-    alphaFieldPosition = 0;
-    
-    redShifter = 0;
-    greenShifter = 0;
-    blueShifter = 0;
-    alphaFieldPosition = 0;
-
-    // UBU, THIS IS NULL BECAUSE WE DON'T EVER USE 320x200x256c!
-    // THIS COMMENT WILL COME BACK TO BITE YOU ON THE ASS
-    buffer = NULL;
- 
-  } else {
-    buffer = NULL;
-    mode |= 0x4000;  // attempt lfb
-    getModeInfo(mode);
-    if (modeInfo->physBasePtr == 0) return;
-    buffer = (void *)modeInfo->physBasePtr;    
-    size = modeInfo->yRes*modeInfo->bytesPerLine;
-    
-    xRes = modeInfo->bytesPerLine;
-    yRes = modeInfo->yRes;
-    maxX = modeInfo->xRes-1;
-    maxY = yRes-1;
-
-    BPP = modeInfo->bitsPerPixel;
-    bytesPerPix = (BPP + 7) >> 3;
-
-    redFieldPosition   = modeInfo->redFieldPosition;
-    greenFieldPosition = modeInfo->greenFieldPosition;
-    blueFieldPosition  = modeInfo->blueFieldPosition;
-    alphaFieldPosition = modeInfo->alphaFieldPosition;
-
-    if (bytesPerPix == 4) {
-      modeInfo->alphaMaskSize = 8;
-      while ((alphaFieldPosition == redFieldPosition) ||
-             (alphaFieldPosition == greenFieldPosition) ||
-             (alphaFieldPosition == blueFieldPosition))
-        alphaFieldPosition += 8;
-    } // if
-    
-    redShifter   = 8-modeInfo->redMaskSize;
-    greenShifter = 8-modeInfo->greenMaskSize;
-    blueShifter  = 8-modeInfo->blueMaskSize;
-    alphaShifter = 8-modeInfo->alphaMaskSize;
-
-    if (modeInfo->alphaMaskSize != 0)
-      alphaMasker = ~(OG_MASKS[modeInfo->alphaMaskSize] << alphaFieldPosition);
-    else
-      alphaMasker = ~0;
-
-  } // else not mode 0x13
-  
-  owner = this;
-  dataState = ogAliasing;
-
-  if ((lineOfs != NULL) && (lSize != 0)) delete [] lineOfs;
-  lSize = yRes*sizeof(uInt32);
-  lineOfs = new uInt32[yRes];;
-  if (lineOfs == NULL) return;
-  
-  lineOfs[0] = 0;
-  for (count = 1; count < yRes; count++)
-    lineOfs[count] = lineOfs[count-1]+xRes;
-
-  initVESAMode(mode);
-
-  ogSetAntiAliasing(BPP > 8);
-  if (pal == NULL) pal = new ogRGBA8[256];  
-  ogSetPalette(DEFAULT_PALETTE);
-
-  if (bytesPerPix == 1) {
-    pixFmtID = 0x08080808;
-  } else {
-    pixFmtID = (redFieldPosition) |
-               (greenFieldPosition << 8) |
-               (blueFieldPosition << 16) |
-               (alphaFieldPosition << 24);
-  } // else
-  
-  printOff = 0;
-  for (i = 0x0; i < ((size)/4096); i++) {
-    vmmRemapPage(modeInfo->physBasePtr + (i * 0x1000),
-                 modeInfo->physBasePtr + (i * 0x1000));
-  } // for i
-  return;
-} // ogDisplay_UbixOS::SetMode
-
-void ogDisplay_UbixOS::SetPal(void) {
-  if (bytesPerPix != 1) return;
-  outportb(0x3c8,0);
-  for (uInt32 c = 0; c < 256; c++) {
-    outportb(0x3c9, pal[c].red >> 2);
-    outportb(0x3c9, pal[c].green >> 2);
-    outportb(0x3c9, pal[c].blue >> 2);
-  } // for
-  return;
-} // ogDisplay_UbixOS::SetPal
-
-bool
-ogDisplay_UbixOS::ogAlias(ogSurface& SrcObject, uInt32 x1,
-                        uInt32 y1, uInt32 x2, uInt32 y2) {
-  ogSetLastError(ogNoAliasing);
-  return false;
-} // ogDisplay_UbixOS::Alias
-
-bool
-ogDisplay_UbixOS::ogCreate(uInt32 _xRes, uInt32 _yRes,ogPixelFmt _pixFormat) {
-  uInt16 mode;
-  mode = 0x111;
-  setMode(mode);
-  /*
-  mode = findMode(_xRes, _yRes, _pixFormat.BPP);
-  if ((mode == 0) && ((_pixFormat.BPP==24) || (_pixFormat.BPP==32))) {
-    if (_pixFormat.BPP==24) _pixFormat.BPP=32; else _pixFormat.BPP=24;
-    mode=findMode(_xRes,_yRes,_pixFormat.BPP);
-  } // if
-  if (mode!=0) setMode(mode);
-  */
-  return (mode!=0);
-} // ogDisplay_UbixOS::ogCreate
-
-bool
-ogDisplay_UbixOS::ogClone(ogSurface& SrcObject) {
-  ogSetLastError(ogNoCloning);
-  return false;
-} // ogDisplay_UbixOS::Clone
-
-void
-ogDisplay_UbixOS::ogCopyPal(ogSurface& SrcObject) {
-  ogSurface::ogCopyPal(SrcObject);
-  SetPal();
-  return;
-} // ogDisplay_UbixOS::ogCopyPal
-
-bool
-ogDisplay_UbixOS::ogLoadPalette(const char *palfile) {
-  bool result;
-  if ((result = ogSurface::LoadPalette(palfile))==true) SetPal();
-  return result;
-} // ogDisplay_UbixOS::ogLoadPalette
-
-void
-ogDisplay_UbixOS::ogSetPalette(uInt8 colour, uInt8 red, uInt8 green, uInt8 b
-lue) {
-  if (pal == NULL) return;
-  ogSurface::ogSetRGBPalette(colour, red, green, blue);
-  outportb(0x3c8, colour);
-  outportb(0x3c9, red >> 2);
-  outportb(0x3c9, green >> 2);
-  outportb(0x3c9, blue >> 2);
-  
-  return;
-} // ogDisplay_UbixOS::SetPalette
-
-void
-ogDisplay_UbixOS::SetPalette(uInt8 colour, uInt8 red, uInt8 green,
-                                   uInt8 blue, uInt8 alpha) {
-  if (pal == NULL) return;
-  ogSurface::ogSetPalette(colour, red, green, blue, alpha);
-  outportb(0x3c8, colour);
-  outportb(0x3c9, red >> 2);
-  outportb(0x3c9, green >> 2);
-  outportb(0x3c9, blue >> 2);
-  
-  return;
-} // ogDisplay_UbixOS::ogSetPalette
-
-ogDisplay_UbixOS::~ogDisplay_UbixOS(void) {
-  delete attributes;
-  delete [] pal;
-//mji  delete VESAInfo;
-//mji  delete modeInfo;
-  return;
-} // ogDisplay_UbixOS::~ogDisplay_UbixOS
-
diff --git a/lib/objgfx40/ogDisplay_VESA.cpp b/lib/objgfx40/ogDisplay_VESA.cpp
deleted file mode 100644
index d4851ce..0000000
--- a/lib/objgfx40/ogDisplay_VESA.cpp
+++ /dev/null
@@ -1,1450 +0,0 @@
-#include "objgfx40.h"
-#include "defpal.inc"
-#include "ogDisplay_VESA.h"
-#include <go32.h>  // for __tb
-#include <dpmi.h>
-#include <sys/movedata.h>
-#include <sys/farptr.h>
-#include <pc.h>
-#include <string.h>
-
-/*
- *
- *              ogDisplay methods
- *
- */
-
-void 
-initVESAMode(uInt16 mode) {
-   __dpmi_regs regs;
-   regs.x.ax = 0x4f02;
-   regs.x.bx = mode;
-   __dpmi_int(0x10, &regs);
-   return;
-}
-
-ogDisplay_VESA::ogDisplay_VESA(void) : ogSurface() {
-  pages[0] = pages[1] = NULL;
-  activePage = visualPage = 0;
-  inGraphics = false;
-  VESAInfo = new ogVESAInfo;
-  modeInfo = new ogModeInfo;
-  pal = new ogRGBA8[256];
-  attributes = new ogAttributes();
-
-  GetVESAInfo();
-  
-  screenSelector = __dpmi_allocate_ldt_descriptors(1);
-  
-  return;
-} // ogDisplay_VESA::ogDisplay_VESA
-
-uInt32 
-ogDisplay_VESA::RawGetPixel(uInt32 x, uInt32 y) {
-  uInt32 result;
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-        "  push %%ds            \n"  // push    ds
-        "  mov  %%ax, %%ds      \n"  // mov     ds, ax (screenSelector)
-        "  shl  $2, %%ecx       \n"  // shl     ecx, 2 {adjust for pixel size}
-     //  "  add  (%%esi,%%ebx,4), %%edi \n" //  add     edi, [esi + ebx*4]
-        "  add  %%esi, %%edi    \n"  // add     edi, esi
-        "  add  %%ecx, %%edi    \n"  // add     edi, ecx
-        "  mov  (%%edi),%%eax   \n"  // eax,word ptr [edi]
-        "  mov  %%eax, %4       \n"  // mov     result, eax
-        "  pop  %%ds            \n"  // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),               // %0, %1
-          "a" (screenSelector), "c" (x), "m" (result)  // %2, %3, %4
-       );
-   break;
-  case 3:
-    __asm__ __volatile__(
-        "  push %%ds            \n"  // push    ds
-        "  mov  %%ax, %%ds      \n"  // mov     ds, ax (screenSelector)
-        "  mov  %%ecx, %%eax    \n"  // mov     eax, ecx  - adjust for pixel size
-        "  add  %%ecx, %%ecx    \n"  // add     ecx, ecx  - adjust for pixel size
-        "  add  %%eax, %%ecx    \n"  // add     ecx, eax  - adjust for pixel size
-        "  add  %%esi, %%edi    \n"  // add     edi, esi
-    //   "  add  (%%esi,%%ebx,4), %%edi \n" //  add     edi, [esi + ebx*4]
-        "  add  %%ecx, %%edi    \n"  // add     edi, ecx
-        "  movzwl (%%edi),%%eax \n"  // movzx   edx,word ptr [edi]
-        "  xor  %%eax, %%eax    \n"
-        "  mov  2(%%edi), %%al  \n"  // mov     al, [edi+2]
-        "  shl  $16, %%eax      \n"  // shl     eax, 16
-        "  mov  (%%edi), %%ax   \n"  // mov     ax, [edi]
-        "  mov  %%eax, %4       \n"  // mov     result, eax
-        "  pop  %%ds            \n"  // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),                // %0, %1
-          "a" (screenSelector), "c" (x), "m" (result)   // %2, %3, %4
-       );
-    break;
-  case 2:
-    __asm__ __volatile__(
-        "  push %%ds            \n"  // push    ds
-        "  mov  %%ax, %%ds      \n"  // mov     ds, ax (screenSelector)
-        "  add  %%esi, %%edi    \n"  // add     edi, esi
-        "  add  %%ecx, %%ecx    \n"  // add     ecx, ecx {adjust for pixel size}
-        "  add  %%ecx, %%edi    \n"  // add     edi, ecx
-        "  movzwl (%%edi),%%eax \n"  // movzx   edx,word ptr [edi]
-        "  mov  %%eax, %4       \n"  // mov     result, eax
-        "  pop  %%ds            \n"  // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),                // %0, %1
-          "a" (screenSelector), "c" (x), "m" (result)   // %2, %3, %4
-       );
-    break;
-  case 1:
-    __asm__ __volatile__(
-        "  push %%ds            \n"  // push    ds
-        "  mov  %%ax, %%ds      \n"  // mov     ds, ax (screenSelector)
-        "  add  %%esi, %%edi    \n"  // add     edi, esi
-        "  add  %%ecx, %%edi    \n"  // add     edi, ecx
-        "  movzbl (%%edi),%%eax \n"  // movzx   edx,byte ptr [edi]
-        "  mov  %%eax, %4       \n"  // mov     result, eax
-        "  pop  %%ds            \n"  // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),                // %0, %1
-          "a" (screenSelector), "c" (x), "m" (result)   // %2, %3, %4
-       );
-    break;
-  } // switch
-  return result;
-} // ogDisplay_VESA::RawGetPixel
-
-void
-ogDisplay_VESA::RawSetPixel(uInt32 x, uInt32 y, uInt32 colour) {
-  uInt32 newR, newG, newB, inverseA;
-  uInt8 sR, sG, sB, sA;
-  uInt8 dR, dG, dB;
-
-  do {
-    if (ogIsBlending()) {
-      ogUnpack(colour, sR, sG, sB, sA);
-      if (sA == 0) return;
-      if (sA == 255) break;
-      inverseA = 255 - sA;
-      ogUnpack(RawGetPixel(x, y), dR, dG, dB);
-      newR = (dR * inverseA + sR * sA) >> 8;
-      newG = (dG * inverseA + sG * sA) >> 8;
-      newB = (dB * inverseA + sB * sA) >> 8;
-      colour = ogPack(newR, newG, newB, inverseA);
-    } // if
-  } while (false);
-
-  switch (bytesPerPix) {
-   case 4:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  push %%ds          \n"          // push    ds
-        "  mov  %%dx, %%ds    \n"          // mov     ds, dx
-    
-        "  shl  $2, %%ecx     \n"  // shl     eax, 2 {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%eax, (%%edi) \n" // mov     [edi], eax
-        "  pop  %%ds          \n"          // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour),                    // %2, %3
-          "d" (screenSelector)                     // %4
-    );
-   break;
-  case 3:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
- //       "  add  (%%esi,%%ebx,4),%%edi \n" // add     edi, [esi + ebx * 4]
-        "  push %%ds          \n"          // push    ds
-        "  mov  %%dx, %%ds    \n"          // mov     ds, dx
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx {adjust for pixel size}
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx {adjust for pixel size}
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  shr  $16, %%eax    \n"  // shr     eax, 16
-        "  mov  %%al, 2(%%edi)\n"  // mov     [edi+2],al
-        "  pop  %%ds          \n"          // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour),                    // %2, %3
-          "d" (screenSelector)                     // %4
-    );
-    break;
-  case 2:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  push %%ds          \n"          // push    ds
-        "  mov  %%dx, %%ds    \n"          // mov     ds, dx
-        "  add  %%ecx, %%ecx  \n"  // add     ecx, ecx {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], al
-        "  pop  %%ds          \n"          // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour),                    // %2, %3
-          "d" (screenSelector)                     // %4
-     );
-     break;
-  case 1:
-    __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-    //    "  add  (%%esi,%%ebx,4), %%edi \n" // add     edi, [esi + ebx * 4]
-        "  push %%ds          \n"          // push    ds
-        "  mov  %%dx, %%ds    \n"          // mov     ds, dx
-        "  add  %%esi, %%edi  \n"          // add     edi, esi
-        "  add  %%ecx, %%edi  \n"          // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%al, (%%edi) \n"          // mov     [edi], al
-        "  pop  %%ds          \n"          // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour),                    // %2, %3
-          "d" (screenSelector)                     // %4
-   );
-   break;
-  } // switch
-  return;
-} // ogDisplay_VESA::RawSetPixel
-
-void 
-ogDisplay_VESA::RawSetPixel(uInt32 x, uInt32 y, uInt8 r, uInt8 g, uInt8 b, uInt8 a) {
-  uInt32 newR, newG, newB, inverseA;
-  uInt8 dR, dG, dB;
-  uInt32 colour;
-
-  do {
-    if (ogIsBlending()) {
-      if (a == 0) return;
-      if (a == 255) {
-        colour = ogPack(r, g, b, a);
-        break;
-      } // if a == 255
-
-      inverseA = 255 - a;
-      ogUnpack(RawGetPixel(x, y), dR, dG, dB);
-      newR = (dR * inverseA + r * a) >> 8;
-      newG = (dG * inverseA + g * a) >> 8;
-      newB = (dB * inverseA + b * a) >> 8;
-      colour = ogPack(newR, newG, newB, inverseA);
-    } else colour = ogPack(r, g, b, a);
-  } while (false);
-  switch (bytesPerPix) {
-   case 4:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  push %%ds          \n"          // push    ds
-        "  mov  %%dx, %%ds    \n"          // mov     ds, dx
-    
-        "  shl  $2, %%ecx     \n"  // shl     eax, 2 {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%eax, (%%edi) \n" // mov     [edi], eax
-        "  pop  %%ds          \n"          // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour),                    // %2, %3
-          "d" (screenSelector)                     // %4
-    );
-   break;
-  case 3:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
- //       "  add  (%%esi,%%ebx,4),%%edi \n" // add     edi, [esi + ebx * 4]
-        "  push %%ds          \n"          // push    ds
-        "  mov  %%dx, %%ds    \n"          // mov     ds, dx
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx {adjust for pixel size}
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx {adjust for pixel size}
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  shr  $16, %%eax    \n"  // shr     eax, 16
-        "  mov  %%al, 2(%%edi)\n"  // mov     [edi+2],al
-        "  pop  %%ds          \n"          // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour),                    // %2, %3
-          "d" (screenSelector)                     // %4
-    );
-    break;
-  case 2:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  push %%ds          \n"          // push    ds
-        "  mov  %%dx, %%ds    \n"          // mov     ds, dx
-        "  add  %%ecx, %%ecx  \n"  // add     ecx, ecx {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], al
-        "  pop  %%ds          \n"          // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour),                    // %2, %3
-          "d" (screenSelector)                     // %4
-     );
-     break;
-  case 1:
-    __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-    //    "  add  (%%esi,%%ebx,4), %%edi \n" // add     edi, [esi + ebx * 4]
-        "  push %%ds          \n"          // push    ds
-        "  mov  %%dx, %%ds    \n"          // mov     ds, dx
-        "  add  %%esi, %%edi  \n"          // add     edi, esi
-        "  add  %%ecx, %%edi  \n"          // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%al, (%%edi) \n"          // mov     [edi], al
-        "  pop  %%ds          \n"          // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "c" (x), "a" (colour),                    // %2, %3
-          "d" (screenSelector)                     // %4
-   );
-   break;
-  } // switch
-  return;
-} // ogDisplay_VESA::RawSetPixel
-
-bool
-ogDisplay_VESA::ogAvail(void) {
-  return ( ((screenSelector != 0) || (buffer != NULL)) && (lineOfs != NULL));
-} // ogDisplay_VESA::Avail
-
-void
-ogDisplay_VESA::GetModeInfo(uInt16 mode) {
-  __dpmi_regs regs;
-  memset(modeInfo, 0, sizeof(struct ogModeInfo));
-  memset(&regs, 0, sizeof(regs));
-  dosmemput(modeInfo, sizeof(struct ogModeInfo), __tb);
-  
-  int ofs, seg;
-
-  seg = __tb;   // __tb is a buffer located in "dos memory". This buffer
-  ofs = __tb;   // is used because the vesa driver cannot acces memory
-                // above 1 MB (your program is most likely to be located above 1MB).
-
-  ofs &= 0xffff;     // Make a real pointer (segment:offse = 16:16)
-  seg &= 0xffff0000; // from the address of the buffer.
-  seg >>= 4;
-
-  regs.x.ax = 0x4f01; // Get the modeinfo of a certain vesa video mode,
-                      // this is a structure which contains.
-  regs.x.cx = mode;   // information needed by other functions below.
-  regs.x.es = seg;
-  regs.x.di = ofs;
-  __dpmi_int(0x10, &regs);
-
-  /* This info is located in dos memory, so it has to be moved to your 
-   * program's address space.
-   */
-  dosmemget(__tb, sizeof(struct ogModeInfo), modeInfo); 
-  return;
-
-} // ogDisplay_VESA::GetModeInfo
-
-void
-ogDisplay_VESA::GetVESAInfo(void) {
-  unsigned int seg, ofs;
-  __dpmi_regs regs;
-  if (NULL == VESAInfo) VESAInfo = new ogVESAInfo;
-  if (NULL == VESAInfo) return;
-  
-  memset(VESAInfo, 0, sizeof(struct ogVESAInfo));
-  memset(&regs, 0, sizeof(regs));
-  VESAInfo->VBESignature[0] = 'V'; // First off initialize the structure.
-  VESAInfo->VBESignature[1] = 'B';
-  VESAInfo->VBESignature[2] = 'E';
-  VESAInfo->VBESignature[3] = '2';
-
- /*
-
-  Because VBE funtions operate in real mode, we first have to move the
-  initialized structure to real-mode address space, so the structure can
-  be filled by the vesa function in real mode.
-
- */
-  dosmemput(VESAInfo, sizeof(struct ogVESAInfo), __tb);
-
-
-  seg = __tb;     // Calculate real mode address of the buffer.
-  ofs = __tb;
-  ofs &= 0xffff;
-  seg &= 0xffff0000;
-  seg >>= 4;
-
-  regs.x.ax = 0x4F00;
-  regs.x.es = seg;
-  regs.x.di = ofs;
- 
-  __dpmi_int(0x10, &regs); // Get vesa info.
-
-  // Move the structure back to
-  dosmemget(__tb, sizeof(struct ogVESAInfo), VESAInfo); 
-
-  VESAInfo->OEMStringPtr = (VESAInfo->OEMStringPtr & 0xFFFF) +
-    ((VESAInfo->OEMStringPtr & 0xFFFF0000) >> 12);
-
-  VESAInfo->OEMVendorNamePtr= (VESAInfo->OEMVendorNamePtr& 0xFFFF) +
-    ((VESAInfo->OEMVendorNamePtr& 0xFFFF0000) >> 12);
-
-  VESAInfo->OEMProductNamePtr= (VESAInfo->OEMProductNamePtr& 0xFFFF) +
-    ((VESAInfo->OEMProductNamePtr& 0xFFFF0000) >> 12);
-
-  VESAInfo->OEMProductRevPtr= (VESAInfo->OEMProductRevPtr& 0xFFFF) +
-    ((VESAInfo->OEMProductRevPtr& 0xFFFF0000) >> 12);
-
-  VESAInfo->videoModePtr = ((VESAInfo->videoModePtr & 0xFFFF0000) >> 12) +
-                           (VESAInfo->videoModePtr & 0xFFFF);
-                             
-  return;
-} // ogDisplay_VESA::GetVESAInfo
-
-uInt16
-ogDisplay_VESA::FindMode(uInt32 _xRes, uInt32 _yRes, uInt32 _BPP) {
-  uInt16 mode;
-
-  if ((_xRes == 320) && (_yRes == 200) && (_BPP == 8)) return 0x13;
-
-//  if ((VESAInfo==NULL) || (VESAInfo->videoModePtr==NULL)) return 0;
-  if (modeInfo == NULL) return 0;
-
-  for (mode = 0x100; mode < 0x1FF; mode++) {
-    GetModeInfo(mode);
-    if ((modeInfo->xRes >= _xRes) && (modeInfo->yRes >= _yRes) &&
-        (modeInfo->bitsPerPixel == _BPP))
-      return mode;
-  }
-  
-  return 0;
-} // ogDisplay_VESA::FindMode
-
-void
-ogDisplay_VESA::SetMode(uInt16 mode) {
-  uInt32 size, count;
-  __dpmi_meminfo mem_info;
-
-  if (mode == 0x13) {
-
-    xRes = 320;
-    yRes = 200;
-    maxX = 319;
-    maxY = 199;
-    BPP  = 8;
-    bytesPerPix = 1;
-
-    redFieldPosition = 0;
-    greenFieldPosition = 0;
-    blueFieldPosition = 0;
-    alphaFieldPosition = 0;
-    
-    redShifter = 0;
-    greenShifter = 0;
-    blueShifter = 0;
-    alphaFieldPosition = 0;
-    
-    mem_info.address = 0xA0000;
-    mem_info.size = 64000;
-    size = 63999;
-    buffer = NULL;
-    __dpmi_physical_address_mapping(&mem_info);
-    __dpmi_set_segment_base_address(screenSelector, mem_info.address);
-    __dpmi_set_segment_limit(screenSelector, size);
-    __dpmi_set_descriptor_access_rights(screenSelector, 0x40F3);
-    
-  } else {
-    buffer = NULL;
-    mode |= 0x4000;  // attempt lfb
-    GetModeInfo(mode);
-    if (modeInfo->physBasePtr == 0) return;
-    size = modeInfo->yRes*modeInfo->bytesPerLine;
-    
-    xRes = modeInfo->bytesPerLine;
-    yRes = modeInfo->yRes;
-    maxX = modeInfo->xRes-1;
-    maxY = yRes-1;
-
-    BPP = modeInfo->bitsPerPixel;
-    bytesPerPix = (BPP + 7) >> 3;
-
-    redFieldPosition   = modeInfo->redFieldPosition;
-    greenFieldPosition = modeInfo->greenFieldPosition;
-    blueFieldPosition  = modeInfo->blueFieldPosition;
-    alphaFieldPosition = modeInfo->alphaFieldPosition;
-
-    if (4 == bytesPerPix) {
-      modeInfo->alphaMaskSize = 8;
-      while ((alphaFieldPosition == redFieldPosition) ||
-             (alphaFieldPosition == greenFieldPosition) ||
-             (alphaFieldPosition == blueFieldPosition))
-        alphaFieldPosition += 8;
-    } // if
-    
-    redShifter   = 8-modeInfo->redMaskSize;
-    greenShifter = 8-modeInfo->greenMaskSize;
-    blueShifter  = 8-modeInfo->blueMaskSize;
-    alphaShifter = 8-modeInfo->alphaMaskSize;
-
-    if (modeInfo->alphaMaskSize != 0)
-      alphaMasker = ~(OG_MASKS[modeInfo->alphaMaskSize] << alphaFieldPosition);
-    else
-      alphaMasker = ~0;
-
-
-    mem_info.address = modeInfo->physBasePtr;
-    mem_info.size = size;
-    size = ((size+4095) >> 12);
-    __dpmi_physical_address_mapping(&mem_info);
-    __dpmi_set_segment_base_address(screenSelector, mem_info.address);
-    __dpmi_set_segment_limit(screenSelector,size);
-    __dpmi_set_descriptor_access_rights(screenSelector, 0xC0F3);
-  } // else
-  
-  owner = this;
-  dataState = ogAliasing;
-  inGraphics = true;
-
-  if ((lineOfs != NULL) && (lSize != 0)) delete [] lineOfs;
-  lSize = yRes*sizeof(uInt32);
-  lineOfs = new uInt32[yRes];;
-  if (lineOfs == NULL) return;
-  lineOfs[0] = 0;
-  for (count=1; count<yRes; count++)
-    lineOfs[count] = lineOfs[count-1]+xRes;
-  initVESAMode(mode);
-
-  if (pal == NULL) pal = new ogRGBA8[256];
-  ogSetPalette(DEFAULT_PALETTE);
-
-  if (1 == bytesPerPix) {
-    pixFmtID = 0x08080808;
-  } else {
-    pixFmtID = (redFieldPosition) |
-               (greenFieldPosition << 8) |
-               (blueFieldPosition << 16) |
-               (alphaFieldPosition << 24);
-  } // else
-  
-  ogSetAntiAliasing(BPP > 8);
-//  antiAlias=(BPP>8);
-  if (BPP == 8) SetPal();
-  ogClear(ogPack(0, 0, 0));
-  return;
-} // ogDisplay_VESA::SetMode
-
-void
-ogDisplay_VESA::SetPal(void) {
-  if (bytesPerPix != 1) return;
-  outportb(0x3c8,0);
-  for (uInt32 c = 0; c < 256; c++) {
-    outportb(0x3c9, pal[c].red >> 2);
-    outportb(0x3c9, pal[c].green >> 2);
-    outportb(0x3c9, pal[c].blue >> 2);
-  } // for
-  return;
-} // ogDisplay_VESA::SetPal
-
-void
-ogDisplay_VESA::ogSetPalette(const ogRGBA8 newPal[256]) {
-  ogSurface::ogSetPalette(newPal);
-  SetPal();
-  return;
-} // ogDisplay_VESA::SetPalette;
-
-bool
-ogDisplay_VESA::ogAlias(ogSurface& src, uInt32 x1, uInt32 y1,
-                      uInt32 x2, uInt32 y2) {
-
-  ogSetLastError(ogNoAliasing);
-  return false;
-} // ogDisplay_VESA::Alias
-
-void 
-ogDisplay_VESA::ogClear(uInt32 colour) {
-  uInt32 height = 0;
-  uInt32 xx, yy;
-  uInt8 r, g, b, a;
-  
-  if (!ogAvail()) return;
-
-  do {
-    if (ogIsBlending()) {
-      ogUnpack(colour, r, g, b, a);
-      if (a == 0) return;
-      if (a == 255) break;
-      for (yy = 0; yy <= maxY; yy++) 
-        for (xx = 0; xx <= maxX; xx++) 
-          RawSetPixel(xx, yy, r, g, b, a);
-    } // if 
-  } while (false);
-  
-  __asm__ __volatile__("cld\n");
-  switch (bytesPerPix) {
-   case 4:
-      __asm__ __volatile__(
-          "  push %%es           \n"      // push es
-          "  mov %6, %%ax        \n"      // mov ax, screenSelector
-          "  mov %%ax, %%es      \n"      // mov es, ax
-          "  add (%%esi), %%edi  \n"      // add edi, [esi]
-          "  mov %%ecx, %%esi    \n"      // mov esi, ecx
-          "  inc %%edx           \n"      // inc edx (maxX)
-          "  inc %%ebx           \n"      // inc ebx (maxY)
-          "  mov %5, %%eax       \n"      // mov eax, colour
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          "  shl $2, %%ecx       \n"      // shl ecx, 2
-          "  sub %%ecx, %%esi    \n"      // sub esi, ecx // adjust for pix size
-      "loop32:                   \n"
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          " rep                  \n"
-          " stosl                \n"      
-          "  add %%esi, %%edi    \n"      // add edi, esi
-          "  dec %%ebx           \n"
-          "   jnz loop32         \n"
-          "  pop %%es            \n"      // pop es
-        :
-        : "D" (buffer), "S" (lineOfs),           // %0, %1
-          "b" (maxY), "c" (xRes), "d" (maxX),    // %2, %3, %4
-          "m" (colour), "m" (screenSelector)    // %5, %6
-     );
-     break;
-  case 3:
-      __asm__ __volatile__(
-          "  push %%es           \n"      // push es
-          "  mov %7, %%ax        \n"      // mov ax, screenSelector
-          "  mov %%ax, %%es      \n"      // mov es, ax
-          "  add (%%esi), %%edi  \n"      // add edi, [esi]
-          "  mov %%ecx, %%esi    \n"      // mov esi, ecx
-          "  inc %%edx           \n"      // inc edx (maxX)
-          "  inc %%ebx           \n"      // inc ebx (maxY)
-          "  mov %5, %%eax       \n"      // mov eax, colour
-          "  sub %%edx, %%esi    \n"      // sub esi, edx // adjust for pix size
-          "  mov %%ebx, %6       \n"      // mov height, ebx
-          "  sub %%edx, %%esi    \n"      // sub esi, edx // adjust for pix size
-          "  mov %%eax, %%ebx    \n"      // mov ebx, eax
-          "  sub %%edx, %%esi    \n"      // sub esi, edx // adjust for pix size
-          "  shr $16, %%ebx      \n"      // shr ebx, 16
-      "oloop24:                  \n"
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-      "iloop24:                  \n"
-          "  mov %%ax,(%%edi)    \n"      // mov [edi],ax
-          "  movb %%bl,2(%%edi)  \n"      // mov [edi+2],bl
-          "  add $3, %%edi       \n"      // add edi, 3
-          "  dec %%ecx           \n"      // dec ecx
-          "   jnz iloop24        \n"
-          "  add %%esi, %%edi    \n"      // add edi, esi
-          "  decl %6             \n"      // dec height
-          "   jnz oloop24        \n"
-          "  pop %%es            \n"      // pop es
-        :
-        : "D" (buffer), "S" (lineOfs),           // %0, %1
-          "b" (maxY), "c" (xRes), "d" (maxX),    // %2, %3, %4
-          "m" (colour), "m" (height),            // %5, %6
-          "m" (screenSelector)                  // %7
-        );
-      break;
-   case 2:
-      __asm__ __volatile__(
-          "  push %%es           \n"      // push es
-          "  mov %6, %%ax        \n"      // mov ax, screenSelector
-          "  mov %%ax, %%es      \n"      // mov es, ax
-          "  add (%%esi), %%edi  \n"      // add edi, [esi]
-          "  mov %%ecx, %%esi    \n"      // mov esi, ecx
-          "  inc %%edx           \n"      // inc edx (maxX)
-          "  inc %%ebx           \n"      // inc ebx (maxY)
-          "  sub %%edx, %%esi    \n"      // sub esi, edx
-          "  mov %5, %%eax       \n"      // mov eax, colour
-          "  sub %%edx, %%esi    \n"      // sub esi, edx // adjust for pix size
-          "  mov %%ax, %%cx      \n"      // mov cx, ax
-          "  shl $16, %%eax      \n"      // shl eax, 16
-          "  mov %%cx, %%ax      \n"      // mov ax, cx
-      "loop16:                   \n"
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          "  shr $1, %%ecx       \n"      // shr ecx, 1
-          " rep                  \n"
-          " stosl                \n"      
-          "  jnc noc16           \n"
-          " stosw                \n"
-      "noc16:                    \n"
-          "  add %%esi, %%edi    \n"      // add edi, esi
-          "  dec %%ebx           \n"
-          "   jnz loop16         \n"
-          "  pop %%es            \n"
-        :
-        : "D" (buffer), "S" (lineOfs),           // %0, %1
-          "b" (maxY), "c" (xRes), "d" (maxX),    // %2, %3, %4
-          "m" (colour), "m" (screenSelector)    // %5, %6
-      );
-      break;
-   
-    case 1:
-      __asm__ __volatile__(
-          "  push %%es           \n"      // push es
-          "  mov %6, %%ax        \n"      // mov ax, screenSelector
-          "  mov %%ax, %%es      \n"      // mov es, ax
-          "  add (%%esi), %%edi  \n"      // add edi, [esi]
-          "  mov %%ecx, %%esi    \n"      // mov esi, ecx
-          "  inc %%edx           \n"      // inc edx (maxY)
-          "  inc %%ebx           \n"      // inc ebx (maxX)
-          "  mov %5, %%eax       \n"      // mov eax, colour
-          "  sub %%edx, %%esi    \n"      // sub esi, edx
-          "  mov %%al, %%ah      \n"      // mov ah, al
-          "  mov %%ax, %%cx      \n"      // mov cx, ax
-          "  shl $16, %%eax      \n"      // shl eax, 16
-          "  mov %%cx, %%ax      \n"      // mov ax, cx
-      "loop8:                    \n"
-          "  push %%edx          \n"
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          "  and $3, %%edx       \n"      // and edx, 3
-          "  shr $2, %%ecx       \n"      // shr ecx, 2
-          " rep                  \n"
-          " stosl                \n"      
-          "  mov %%edx, %%ecx    \n"      // mov ecx, edx
-          " rep                  \n"
-          " stosb                \n"      
-          "  pop %%edx           \n"
-          "  add %%esi, %%edi    \n"      // add edi, esi
-          "  dec %%ebx           \n"
-          "   jnz loop8          \n"
-          "  pop %%es            \n"      // pop es
-        :
-        : "D" (buffer), "S" (lineOfs),           // %0, %1
-          "b" (maxY), "c" (xRes), "d" (maxX),    // %2, %3, %4
-          "m" (colour), "m" (screenSelector)    // %5, %6
-      );
-      break;
-  } // switch
-  return;
-} // ogDisplay_VESA::Clear
-
-void
-ogDisplay_VESA::ogCopyLineTo(uInt32 dx, uInt32 dy, const void * src,
-                           uInt32 size) {
-  /*
-   * ogCopyLineTo()
-   *
-   * Inputs:
-   *
-   * dx   - Destination X of the target buffer
-   * dy   - Destination Y of the target buffer
-   * src  - buffer to copy
-   * size - size in bytes *NOT* pixels
-   *
-   * Copies a run of pixels (of the same format) to (x,y) of a buffer
-   *
-   * This method is required because of the different implementations of
-   * copying a run of pixels to a buffer
-   *
-   * WARNING!!! This does *NO* error checking. It is assumed that you've
-   * done all of that.  CopyLineTo and CopyLineFrom are the only
-   * methods that don't check to make sure you're hosing things.  Don't
-   * use this method unless YOU KNOW WHAT YOU'RE DOING!!!!!!!!!
-   */
-  movedata(_my_ds(),(uInt32)src,
-           screenSelector,(uInt32)((uInt8*)buffer+(lineOfs[dy]+dx*bytesPerPix) ),
-           size);
-  
-  return;
-} // ogSurface::ogCopyLineTo
-
-void
-ogDisplay_VESA::ogCopyLineFrom(uInt32 sx, uInt32 sy, void * dest, uInt32 size) {
-  /*
-   * CopyLineFrom()
-   *
-   * Inputs:
-   *
-   * sx   - Source X of the target buffer
-   * sy   - Source Y of the target buffer
-   * dest - where to put it
-   * size - size in bytes *NOT* pixels
-   *
-   * Copies a run of pixels (of the same format) to (x,y) of a buffer
-   *
-   * This method is required because of the different implementations of
-   * copying a run of pixels to a buffer
-   *
-   * WARNING!!! This does *NO* error checking. It is assumed that you've
-   * done all of that.  CopyLineTo and CopyLineFrom are the only
-   * methods that don't check to make sure you're hosing things.  Don't
-   * use this method unless YOU KNOW WHAT YOU'RE DOING!!!!!!!!!
-   */
-  movedata(screenSelector,(uInt32)((uInt8*)buffer+(lineOfs[sy]+sx*bytesPerPix ) ),
-           _my_ds(),(uInt32)dest,
-           size);
-
-  return;
-} // ogDisplay_VESA::ogCopyLineFrom
-
-bool
-ogDisplay_VESA::ogCreate(uInt32 _xRes, uInt32 _yRes, ogPixelFmt _pixFormat) {
-  uInt16 mode;
-  mode = FindMode(_xRes, _yRes, _pixFormat.BPP);
-  if ((mode == 0) && ((_pixFormat.BPP==24) || (_pixFormat.BPP==32))) {
-    if (_pixFormat.BPP==24) _pixFormat.BPP=32; else _pixFormat.BPP=24;
-    mode = FindMode(_xRes,_yRes,_pixFormat.BPP);
-  } // if
-  if (mode!=0) SetMode(mode);
-  return (mode!=0);
-} // ogDisplay_VESA::ogCreate
-
-bool
-ogDisplay_VESA::ogClone(ogSurface& src) {
-  ogSetLastError(ogNoCloning);
-  return false;
-} // ogDisplay_VESA::ogClone
-
-void
-ogDisplay_VESA::ogCopyPalette(ogSurface& src) {
-  ogSurface::ogCopyPalette(src);
-  SetPal();
-  return;
-} // ogDisplay_VESA::ogCopyPalette
-
-uInt32 
-ogDisplay_VESA::ogGetPixel(int32 x, int32 y) {
-  uInt32 result;
-  if (!ogAvail()) return ogGetTransparentColor();
-  if (((uInt32)x>maxX) || ((uInt32)y>maxY)) 
-    return ogGetTransparentColor();
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-        "  push %%ds            \n"  // push    ds
-        "  mov  %%ax, %%ds      \n"  // mov     ds, ax (screenSelector)
-        "  shl  $2, %%ecx       \n"  // shl     ecx, 2 {adjust for pixel size}
-     //  "  add  (%%esi,%%ebx,4), %%edi \n" //  add     edi, [esi + ebx*4]
-        "  add  %%esi, %%edi    \n"  // add     edi, esi
-        "  add  %%ecx, %%edi    \n"  // add     edi, ecx
-        "  mov  (%%edi),%%eax   \n"  // eax,    dword ptr [edi]
-        "  mov  %%eax, %4       \n"  // mov     result, eax
-        "  pop  %%ds            \n"  // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),               // %0, %1
-          "a" (screenSelector), "c" (x), "m" (result)  // %2, %3, %4
-       );
-    break;
-  case 3:
-    __asm__ __volatile__(
-        "  push %%ds            \n"  // push    ds
-        "  mov  %%ax, %%ds      \n"  // mov     ds, ax (screenSelector)
-        "  mov  %%ecx, %%eax    \n"  // mov     eax, ecx  - adjust for pixel size
-        "  add  %%ecx, %%ecx    \n"  // add     ecx, ecx  - adjust for pixel size
-        "  add  %%eax, %%ecx    \n"  // add     ecx, eax  - adjust for pixel size
-        "  add  %%esi, %%edi    \n"  // add     edi, esi
-    //   "  add  (%%esi,%%ebx,4), %%edi \n" //  add     edi, [esi + ebx*4]
-        "  add  %%ecx, %%edi    \n"  // add     edi, ecx
-        "  movzwl (%%edi),%%eax \n"  // movzx   edx,word ptr [edi]
-        "  xor  %%eax, %%eax    \n"
-        "  mov  2(%%edi), %%al  \n"  // mov     al, [edi+2]
-        "  shl  $16, %%eax      \n"  // shl     eax, 16
-        "  mov  (%%edi), %%ax   \n"  // mov     ax, [edi]
-        "  mov  %%eax, %4       \n"  // mov     result, eax
-        "  pop  %%ds            \n"  // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),                // %0, %1
-          "a" (screenSelector), "c" (x), "m" (result)   // %2, %3, %4
-       );
-    break;
-   case 2:
-    __asm__ __volatile__(
-        "  push %%ds            \n"  // push    ds
-        "  mov  %%ax, %%ds      \n"  // mov     ds, ax (screenSelector)
-        "  add  %%esi, %%edi    \n"  // add     edi, esi
-        "  add  %%ecx, %%ecx    \n"  // add     ecx, ecx {adjust for pixel size}
-        "  add  %%ecx, %%edi    \n"  // add     edi, ecx
-        "  movzwl (%%edi),%%eax \n"  // movzx   edx,word ptr [edi]
-        "  mov  %%eax, %4       \n"  // mov     result, eax
-        "  pop  %%ds            \n"  // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),                // %0, %1
-          "a" (screenSelector), "c" (x), "m" (result)   // %2, %3, %4
-       );
-    break;
-  case 1:
-    __asm__ __volatile__(
-        "  push %%ds            \n"  // push    ds
-        "  mov  %%ax, %%ds      \n"  // mov     ds, ax (screenSelector)
-        "  add  %%esi, %%edi    \n"  // add     edi, esi
-        "  add  %%ecx, %%edi    \n"  // add     edi, ecx
-        "  movzbl (%%edi),%%eax \n"  // movzx   edx,byte ptr [edi]
-        "  mov  %%eax, %4       \n"  // mov     result, eax
-        "  pop  %%ds            \n"  // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),                // %0, %1
-          "a" (screenSelector), "c" (x), "m" (result)   // %2, %3, %4
-       );
-    break;
-  } // switch
-  return result;
-} // ogDisplay_VESA::ogGetPixel
-
-void *
-ogDisplay_VESA::ogGetPtr(uInt32 x, uInt32 y) {
-  return NULL;
-} // ogDisplay_VESA::ogGetPtr
-
-void
-ogDisplay_VESA::ogHLine(int32 x1, int32 x2, int32 y, uInt32 colour) {
-  int32 tmp;
-  uInt8 r, g, b, a;
-
-  if (!ogAvail()) return;
-  if ((uInt32)y>maxY) return;
-  if (x1 > x2) {
-    tmp= x1;
-    x1 = x2;
-    x2 = tmp;
-  } // if
-  if (x1 < 0) x1 = 0;
-  if (x2 > (int32)maxX) x2 = maxX;
-  if (x2 < x1) return;
-
-  if (ogIsBlending()) {
-    ogUnpack(colour, r, g, b, a);
-    if (a == 0) return;
-    if (a == 255) {
-      for (tmp = x1; tmp <= x2; tmp++) 
-        RawSetPixel(tmp, y, r, g, b, a);
-      return;
-    } // if a == 255
-  } // if blending
-  
-  __asm__ __volatile__("cld \n");
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-        "  push %%es          \n"          //  push     es
-        "  mov  %%dx, %%es    \n"          //  mov      es, dx
-        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  inc  %%ecx         \n"
-        "  shl  $2, %%ebx     \n"          //  shl      ebx, 2
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  rep                \n"
-        "  stosl              \n"
-        "  pop  %%es          \n"          //  pop      es
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "a" (colour), "b" (x1),                   // %2, %3
-          "c" (x2), "d" (screenSelector)           // %4, %5
-        );
-    break;
-  case 3:
-    __asm__ __volatile__(
-        "  push %%es          \n"          //  push     es
-        "  mov  %%ax, %%es    \n"          //  mov      es, ax
-        "  mov  %2, %%eax     \n"
-        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "  add  %%edx, %%ebx  \n"          //  add      ebx, edx - pix size
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  mov  %%eax, %%ebx  \n"          //  mov      ebx, eax
-        "  shr  $16, %%ebx    \n"          //  shr      ebx, 16
-    "hLlop24:                 \n"          
-        "  mov  %%ax, (%%edi) \n"          //  mov      [edi], ax
-        "  mov  %%bl, 2(%%edi)\n"          //  mov      [edi+2], bl
-        "  add  $3, %%edi     \n"          //  add      edi, 3
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz hLlop24       \n"
-        "  pop  %%es          \n"          //  pop      es
-        
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "m" (colour), "b" (x1),                   // %2, %3
-          "c" (x2), "d" (x1), "a" (screenSelector) // %4, %5
-    );
-    break;
-  case 2:
-    __asm__ __volatile__(
-        "  push %%es          \n"
-        "  mov  %%dx, %%es    \n"          //  mov      es, dx
-        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
-        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  xor  %%edx, %%edx  \n"          //  xor      edx, edx
-        "  mov  %%ax, %%dx    \n"          //  mov      dx, ax
-        "  shl  $16, %%eax    \n"          //  shl      eax, 16
-        "  add  %%edx, %%eax  \n"          //  add      eax, edx
-
-        "  shr  $1, %%ecx     \n"          //  shr      ecx, 1
-        "  rep                \n"
-        "  stosl              \n"
-        "   jnc hLnoc16       \n"
-        "  stosw              \n"
-        "hLnoc16:             \n"
-        "  pop  %%es          \n"
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "a" (colour), "b" (x1),                   // %2, %3
-          "c" (x2), "d" (screenSelector)
-    );
-    break;
-  case 1:
-    __asm__ __volatile__(
-        "  push %%es          \n"          //  push     es
-        "  mov  %%dx, %%es    \n"          //  mov      es, dx
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  and  $0xff, %%eax  \n"          //  and      eax, 0ffh
-        "  sub  %%ebx, %%ecx  \n"          //  sub      ecx, ebx
-        "  mov  %%al, %%ah    \n"          //  mov      ah, al
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "  mov  %%eax, %%ebx  \n"          //  mov      ebx, eax
-        "  shl  $16, %%ebx    \n"          //  shl      ebx, 16
-        "  add  %%ebx, %%eax  \n"          //  add      eax, ebx
-
-        "  mov  %%ecx, %%edx  \n"          //  mov      edx, ecx
-        "  mov  $4, %%ecx     \n"          //  mov      ecx, 4
-        "  sub  %%edi, %%ecx  \n"          //  sub      ecx, edi
-        "  and  $3, %%ecx     \n"          //  and      ecx, 3
-        "  sub  %%ecx, %%edx  \n"          //  sub      edx, ecx
-        "   jle LEndBytes     \n"
-        "  rep                \n"          
-        "  stosb              \n"
-        "  mov  %%edx, %%ecx  \n"          //  mov      ecx, edx
-        "  and  $3, %%edx     \n"          //  and      edx, 3
-        "  shr  $2, %%ecx     \n"          //  shr      ecx, 2
-        "  rep                \n"
-        "  stosl              \n"
-    "LEndBytes:               \n"
-        "  add  %%edx, %%ecx  \n"          //  add      ecx, edx
-        "  rep                \n"
-        "  stosb              \n"
-        "  pop  %%es          \n"
-        :
-        : "D" (buffer), "S" (lineOfs[y]),           // %0, %1
-          "a" (colour), "b" (x1),                   // %2, %3
-          "c" (x2), "d" (screenSelector)
-       );
-    break;
-  } // switch
-  return;
-} // ogDisplay_VESA::ogHLine
-
-bool
-ogDisplay_VESA::ogLoadPalette(const char *palfile) {
-  bool result;
-  if ((result = ogSurface::ogLoadPalette(palfile))==true) SetPal();
-  return result;
-} // ogDisplay_VESA::ogLoadPalette
-
-void
-ogDisplay_VESA::ogSetPixel(int32 x, int32 y, uInt32 colour) {
-  uInt32 newR, newG, newB, inverseA;
-  uInt8 sR, sG, sB, sA;
-  uInt8 dR, dG, dB;
-
-  if (!ogAvail()) return;
-  if (((uInt32)x > maxX) || ((uInt32)y > maxY)) return;
-
-  do {
-    if (ogIsBlending()) {
-      ogUnpack(colour, sR, sG, sB, sA);
-      if (sA == 0) return;
-      if (sA == 255) break;
-      inverseA = 255 - sA;
-      ogUnpack(RawGetPixel(x, y), dR, dG, dB);
-      newR = (dR * inverseA + sR * sA) >> 8;
-      newG = (dG * inverseA + sG * sA) >> 8;
-      newB = (dB * inverseA + sB * sA) >> 8;
-      colour = ogPack(newR, newG, newB, inverseA);
-    } // if
-  } while (false);
-  
-  switch (bytesPerPix) {
-   case 4:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  push %%ds          \n"  // push    ds
-        "  mov  %4, %%dx      \n"  // mov     dx, screenSelector
-        "  mov  %%dx, %%ds    \n"  // mov     ds, dx
-        "  shl  $2, %%ecx     \n"  // shl     eax, 2 {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%eax, (%%edi)\n"  // mov     [edi], eax
-        "  pop  %%ds          \n"  // pop ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),              // %0, %1
-          "c" (x), "a" (colour), "m" (screenSelector) // %2, %3, %4
-    );
-   break;
-  case 3:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  push %%ds          \n"  // push    ds
-        "  mov  %4, %%dx      \n"  // mov     dx, screenSelector
-        "  mov  %%dx, %%ds    \n"  // mov     ds, dx
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx {adjust for pixel size}
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx {adjust for pixel size}
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  shr  $16, %%eax    \n"  // shr     eax, 16
-        "  mov  %%al, 2(%%edi)\n"  // mov     [edi+2],al
-        "  pop  %%ds          \n"  // pop     ds
-        :
-        : "D" (buffer), "S" (lineOfs[y]),              // %0, %1
-          "c" (x), "a" (colour), "m" (screenSelector) // %2, %3, %4
-    );
-    break;
-  case 2:
-     __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  push %%ds          \n"
-        "  mov  %4, %%dx      \n"
-        "  mov  %%dx, %%ds    \n"
-
-        "  add  %%ecx, %%ecx  \n"  // add     ecx, ecx {adjust for pixel size}
-        "  add  %%esi, %%edi  \n"  // add     edi, esi
-        "  mov  %3, %%eax     \n"  // mov     eax, colour
-        "  add  %%ecx, %%edi  \n"  // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], al
-        "  pop  %%ds\n"
-        
-        :
-        : "D" (buffer), "S" (lineOfs[y]),        // %0, %1
-          "c" (x), "a" (colour), "m" (screenSelector) // %2, %3, %4
-     );
-     break;
-  
-  case 1:
-    __asm__ __volatile__(
-    // { Calculate offset, prepare the pixel to be drawn }
-        "  push %%ds          \n"
-        "  mov  %4, %%dx      \n"
-        "  mov  %%dx, %%ds    \n"
-        "  add  %%esi, %%edi  \n"          // add     edi, esi
-        "  add  %%ecx, %%edi  \n"          // add     edi, ecx
-    // { Draw the pixel }
-        "  mov  %%al, (%%edi) \n"          // mov     [edi], al
-        "  pop  %%ds\n"
-        :
-        : "D" (buffer), "S" (lineOfs[y]),              // %0, %1
-          "c" (x), "a" (colour), "m" (screenSelector) // %2, %3, %4
-   );
-   break;
-  } // switch
-  return;
-} // ogDisplay_VESA::ogSetPixel
-
-void
-ogDisplay_VESA::ogSetPalette(uInt8 colour, uInt8 red, uInt8 green, uInt8 blue) {
-  if (pal == NULL) return;
-  ogSurface::ogSetPalette(colour,red,green,blue);
-  outportb(0x3c8, colour);
-  outportb(0x3c9, red >> 2);
-  outportb(0x3c9, green >> 2);
-  outportb(0x3c9, blue >> 2);
-  
-  return;
-} // ogDisplay_VESA::ogSetPalette
-
-void
-ogDisplay_VESA::ogSetPalette(uInt8 colour, uInt8 red, uInt8 green,
-                                 uInt8 blue, uInt8 alpha) {
-  if (pal == NULL) return;
-  ogSurface::ogSetPalette(colour, red, green, blue, alpha);
-  outportb(0x3c8, colour);
-  outportb(0x3c9, red >> 2);
-  outportb(0x3c9, green >> 2);
-  outportb(0x3c9, blue >> 2);
-
-  return;
-} // ogDisplay_VESA::ogSetPalette
-
-void
-ogDisplay_VESA::ogVFlip(void) {
-  if (!ogAvail()) return;
-  
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-        "  push %%ds          \n"     // push ds
-        "  mov  %%ax, %%ds    \n"     // mov ds, ax        
-        "  add  %%edi, %%esi  \n"     // add esi, edi
-        "vf32lop:             \n"
-        "  push %%esi         \n"     // push esi
-        "  push %%edi         \n"     // push edi
-        "vf32lop2:            \n"
-        "  mov  (%%edi),%%eax \n"     // mov eax, [edi]
-        "  mov  (%%esi),%%ecx \n"     // mov ecx, [esi]
-        "  mov  %%eax,(%%esi) \n"     // mov [esi], eax
-        "  mov  %%ecx,(%%edi) \n"     // mov [edi], ecx
-        "  add  $4, %%edi     \n"     // add edi, 4
-        "  sub  $4, %%esi     \n"     // sub esi, 4
-        "  cmp  %%esi, %%edi  \n"     // cmp edi, esi
-        "   jbe vf32lop2      \n"
-        "  pop  %%edi         \n"     // pop edi
-        "  pop  %%esi         \n"     // pop esi
-        "  add  %%ebx, %%esi  \n"     // add esi, ebx
-        "  add  %%ebx, %%edi  \n"     // add edi, ebx
-        "  dec  %%edx         \n"
-        "   jnz vf32lop       \n"
-        "  pop  %%ds          \n"     // pop ds        
-        :
-        : "D" ((char *)buffer+lineOfs[0]), "S" (maxX*4),      // %0, %1
-          "b" (xRes), "d" (maxY+1), "a" (screenSelector)     // %2, %3, %4
-       );
-    break;
-  case 3:
-    __asm__ __volatile__(
-        "  push %%ds          \n"     // push ds
-        "  mov  %%ax, %%ds    \n"     // mov ds, ax        
-        "  add  %%edi, %%esi   \n"     // add esi, edi
-        "vf24lop:              \n"
-        "  push %%esi          \n"     // push esi
-        "  push %%edi          \n"     // push edi
-        "vf24lop2:             \n"
-        "  mov  (%%edi),%%ax   \n"     // mov ax, [edi]
-        "  mov  2(%%edi),%%dl  \n"     // mov dl, [edi+2]
-        "  mov  (%%esi),%%cx   \n"     // mov cx, [esi]
-        "  mov  2(%%esi),%%dh  \n"     // mov dh, [esi+2]
-        "  mov  %%ax,(%%esi)   \n"     // mov [esi], ax
-        "  mov  %%dl,2(%%esi)  \n"     // mov [esi+2], dl
-        "  mov  %%cx,(%%edi)   \n"     // mov [edi], cx
-        "  mov  %%dh,2(%%edi)  \n"     // mov [edi+2], dh
-        "  add  $3, %%edi      \n"     // add edi, 3
-        "  sub  $3, %%esi      \n"     // sub esi, 3
-        "  cmp  %%esi, %%edi   \n"     // cmp edi, esi
-        "   jbe vf24lop2       \n"
-        "  pop  %%edi          \n"     // pop edi
-        "  pop  %%esi          \n"     // pop esi
-        "  add  %%ebx, %%esi   \n"     // add esi, ebx
-        "  add  %%ebx, %%edi   \n"     // add edi, ebx
-        "  decl %3             \n"     // dec height
-        "   jnz vf24lop        \n"
-        "  pop  %%ds          \n"     // pop ds        
-        :
-        : "D" ((char *)buffer+lineOfs[0]), "S" (maxX*3),     // %0, %1
-          "b" (xRes), "d" (maxY+1), "a" (screenSelector)     // %2, %3, %4        
-       );
-    break;
-  case 2:
-    __asm__ __volatile__(
-        "  push %%ds          \n"     // push ds
-        "  mov  %%ax, %%ds    \n"     // mov ds, ax        
-        "  add  %%edi, %%esi  \n"     // add esi, edi
-        "vf16lop:             \n"
-        "  push %%esi         \n"     // push esi
-        "  push %%edi         \n"     // push edi
-        "vf16lop2:            \n"
-        "  mov  (%%edi),%%ax  \n"     // mov ax, [edi]
-        "  mov  (%%esi),%%cx  \n"     // mov cx, [esi]
-        "  mov  %%ax,(%%esi)  \n"     // mov [esi], ax
-        "  mov  %%cx,(%%edi)  \n"     // mov [edi], cx
-        "  add  $2, %%edi     \n"     // add edi, 2
-        "  sub  $2, %%esi     \n"     // sub esi, 2
-        "  cmp  %%esi, %%edi  \n"     // cmp edi, esi
-        "   jbe vf16lop2      \n"
-        "  pop  %%edi         \n"     // pop edi
-        "  pop  %%esi         \n"     // pop esi
-        "  add  %%ebx, %%esi  \n"     // add esi, ebx
-        "  add  %%ebx, %%edi  \n"     // add edi, ebx
-        "  dec  %%edx         \n"
-        "   jnz vf16lop       \n"
-        "  pop  %%ds          \n"     // pop ds        
-        :
-        : "D" ((char *)buffer+lineOfs[0]), "S" (maxX*2),          // %0, %1
-          "b" (xRes), "d" (maxY+1), "a" (screenSelector)     // %2, %3, %4        
-       );
-    break;    
-  case 1:
-    __asm__ __volatile__(
-        "  push %%ds          \n"     // push ds
-        "  mov  %%ax, %%ds    \n"     // mov ds, ax
-        "  add  %%edi, %%esi  \n"     // add esi, edi
-        "vf8lop:              \n"
-        "  push %%esi         \n"     // push esi
-        "  push %%edi         \n"     // push edi
-        "vf8lop2:             \n"
-        "  mov  (%%edi),%%al  \n"     // mov al, [edi]
-        "  mov  (%%esi),%%ah  \n"     // mov ah, [esi]
-        "  mov  %%al,(%%esi)  \n"     // mov [esi], al
-        "  mov  %%ah,(%%edi)  \n"     // mov [edi], ah
-        "  inc  %%edi         \n"     // inc edi
-        "  dec  %%esi         \n"     // dec esi
-        "  cmp  %%esi, %%edi  \n"     // cmp edi, esi
-        "   jbe vf8lop2       \n"
-        "  pop  %%edi         \n"     // pop edi
-        "  pop  %%esi         \n"     // pop esi
-        "  add  %%ebx, %%esi  \n"     // add esi, ebx
-        "  add  %%ebx, %%edi  \n"     // add edi, ebx
-        "  dec  %%edx         \n"
-        "   jnz vf8lop        \n"
-        "  pop  %%ds          \n"     // pop ds
-        :
-        : "D" ((char *)buffer+lineOfs[0]), "S" (maxX),          // %0, %1
-          "b" (xRes), "d" (maxY+1), "a" (screenSelector)     // %2, %3, %4        
-       );
-    break;
-  } // switch
-  return;
-} // ogDisplay_VESA::ogVFlip
-
-void
-ogDisplay_VESA::ogVLine(int32 x, int32 y1, int32 y2, uInt32 colour) {
-  int32 tmp;
-  uInt8 r, g, b, a;
-
-  if (!ogAvail()) return;
-  if ((uInt32)x > maxX) return;
-
-  if (y1 > y2) {
-    tmp= y1;
-    y1 = y2;
-    y2 = tmp;
-  } // if
-  
-  if (y1 < 0) y1 = 0;
-  if (y2 > (int32)maxY) y2 = maxY;
-  if (y2 < y1) return;
-
-  if (ogIsBlending()) {
-
-    ogUnpack(colour, r, g, b, a);
-
-    if (a == 0) return;
-
-    if (a != 255) {
-      for (tmp = y1; tmp <= y2; tmp++) 
-        RawSetPixel(x, tmp, r, g, b, a);
-      return;
-    } // if 
-   
-  } // if blending
-  
-  switch (bytesPerPix) {
-   case 4:
-    __asm__ __volatile__(
-        "  push %%ds          \n"          //  push     ds
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  shl  $2, %%ebx     \n"          //  shl      ebx, 2  - pix size
-        "  mov  %7, %%si      \n"          //  mov      si, screenSelector
-        "  mov  %%si, %%ds    \n"          //  mov      ds, si
-        "  mov  %6, %%esi     \n"          //  mov      esi, y1
-        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  mov  %2, %%eax     \n"          //  mov      eax, colour        
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "vLlop32:             \n"
-        "  mov  %%eax, (%%edi)\n"          //  mov      [edi], eax
-        "  add  %%edx, %%edi  \n"          //  add      edi, edx
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz vLlop32       \n"
-        "  pop  %%ds          \n"          //  pop      ds        
-        :
-        : "D" (buffer), "S" (lineOfs[y1]),          // %0, %1
-          "m" (colour), "b" (x),                    // %2, %3
-          "c" (y2), "d" (xRes),                     // %4, %5
-          "m" (y1), "m" (screenSelector)            // %6, %7
-       );
-    break;
-   case 3:
-    __asm__ __volatile__(
-        "  push %%ds          \n"          //  push     ds    
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  mov  %%ebx, %%esi  \n"          //  mov      esi, ebx - pix size
-        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
-        "  add  %%esi, %%ebx  \n"          //  add      ebx, esi - pix size
-        "  mov  %7, %%si      \n"          //  mov      si, screenSelector
-        "  mov  %%si, %%ds    \n"          //  mov      ds, si
-        "  mov  %6, %%esi     \n"          //  mov      esi, y1
-        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  mov  %2, %%eax     \n"          //  mov      eax, colour        
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "  mov  %%eax, %%ebx  \n"          //  mov      ebx, eax
-        "  shr  $16, %%ebx    \n"          //  shr      ebx, 16
-        "vLlop24:             \n"
-        "  mov  %%ax, (%%edi) \n"          //  mov      [edi], eax
-        "  mov  %%bl, 2(%%edi)\n"          //  mov      [edi+2], bl
-        "  add  %%edx, %%edi  \n"          //  add      edi, edx
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz vLlop24       \n"
-        "  pop  %%ds          \n"          //  pop      ds        
-        :
-        : "D" (buffer), "S" (lineOfs[y1]),          // %0, %1
-          "m" (colour), "b" (x),                    // %2, %3
-          "c" (y2), "d" (xRes),                     // %4, %5
-          "m" (y1), "m" (screenSelector)           // %6, %7          
-       );
-    break;
-   case 2:
-    __asm__ __volatile__(
-        "  push %%ds          \n"          //  push     ds    
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  add  %%ebx, %%ebx  \n"          //  add      ebx, ebx - pix size
-        "  mov  %7, %%si      \n"          //  mov      si, screenSelector
-        "  mov  %%si, %%ds    \n"          //  mov      ds, si
-        "  mov  %6, %%esi     \n"          //  mov      esi, y1
-        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  mov  %2, %%eax     \n"          //  mov      eax, colour        
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "vLlop16:             \n"
-        "  mov  %%ax, (%%edi) \n"          //  mov      [edi], ax
-        "  add  %%edx, %%edi  \n"          //  add      edi, edx
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz vLlop16       \n"
-        "  pop  %%ds          \n"          //  pop      ds        
-        :
-        : "D" (buffer), "S" (lineOfs[y1]),          // %0, %1
-          "m" (colour), "b" (x),                    // %2, %3
-          "c" (y2), "d" (xRes),                     // %4, %5
-          "m" (y1), "m" (screenSelector)           // %6, %7
-        );
-    break;  
-   case 1:
-    __asm__ __volatile__(
-        "  push %%ds          \n"          //  push     ds
-        "  add  %%esi, %%edi  \n"          //  add      edi, esi
-        "  mov  %7, %%si      \n"          //  mov      si, screenSelector
-        "  mov  %%si, %%ds    \n"          //  mov      ds, si
-        "  mov  %6, %%esi     \n"          //  mov      esi, y1
-        "  sub  %%esi, %%ecx  \n"          //  sub      ecx, esi
-        "  add  %%ebx, %%edi  \n"          //  add      edi, ebx
-        "  mov  %2, %%eax     \n"          //  mov      eax, colour
-        "  inc  %%ecx         \n"          //  inc      ecx
-        "vLlop8:              \n"          
-        "  mov  %%al, (%%edi) \n"          //  mov      [edi], al
-        "  add  %%edx, %%edi  \n"          //  add      edi, edx
-        "  dec  %%ecx         \n"          //  dec      ecx
-        "   jnz vLlop8        \n"
-        "  pop  %%ds          \n"          //  pop      ds
-        :
-        : "D" (buffer), "S" (lineOfs[y1]),          // %0, %1
-          "m" (colour), "b" (x),                    // %2, %3
-          "c" (y2), "d" (xRes),                     // %4, %5
-          "m" (y1), "m" (screenSelector)           // %6, %7
-       );
-    break;
-
-  } // switch
-  return;
-} // ogDisplay_VESA::ogVLine
-
-ogDisplay_VESA::~ogDisplay_VESA(void) {
-  __dpmi_regs regs;
-  if (VESAInfo != NULL) delete VESAInfo;
-  if (modeInfo != NULL) delete modeInfo;
-  if (attributes != NULL) delete attributes;
-  if (inGraphics) {
-    regs.x.ax = 3;
-    __dpmi_int(0x10, &regs);
-  } // if inGraphics
-
-  return;
-}
diff --git a/lib/objgfx40/ogFont.cpp b/lib/objgfx40/ogFont.cpp
deleted file mode 100644
index 70e1ccb..0000000
--- a/lib/objgfx40/ogFont.cpp
+++ /dev/null
@@ -1,298 +0,0 @@
-#include <objgfx40/ogFont.h>
-#include <objgfx40/objgfx40.h>
-
-extern "C" {
-#ifdef __UBIXOS_KERNEL__
-  #include <vfs/file.h>
-  #include <lib/string.h>
-#else
-  #include <string.h>
-  #include <stdlib.h>
-  #include <stdio.h>
-#endif
-  }
-
-using namespace std;
-typedef
-  struct {
-    char  ID[3];
-    uInt8 version;
-    uInt8 width, height;
-    uInt8 numOfChars;
-    uInt8 startingChar;
-    uInt8 colourType;
-    uInt8 paddington[7];
-  } ogDPFHeader;
-
-static 
-bool
-fileExists(const char *file)
-{
-#ifdef __UBIXOS_KERNEL__
-  fileDescriptor *f = fopen(file, "rb");
-#else
-  FILE *f = fopen(file, "rb");
-#endif
-  if (!f)
-    return false;
-  fclose(f);
-  return true;
-}
-
-ogBitFont::ogBitFont(void) {
-  memset(fontDataIdx, 0, sizeof(fontDataIdx));
-  memset(charWidthTable, 0, sizeof(charWidthTable));
-  memset(charHeightTable, 0, sizeof(charHeightTable));
-
-  fontData = NULL;
-  fontDataSize = 0;
-  numOfChars = 0;
-  width = height = startingChar = 0;
-
-  BGColour.red   = 0;
-  BGColour.green = 0;
-  BGColour.blue  = 0;
-  BGColour.alpha = 0;
-  
-  FGColour.red   = 255;
-  FGColour.green = 255;
-  FGColour.blue  = 255;
-  FGColour.alpha = 255;
-
-  return;
-} // ogBitFont::ogBitFont
-
-void
-ogBitFont::SetBGColor(uInt32 red, uInt32 green, uInt32 blue, uInt32 alpha) {
-  BGColour.red   = red;
-  BGColour.green = green;
-  BGColour.blue  = blue;
-  BGColour.alpha = alpha;
-  return;
-} // ogBitFont::SetBGColor
-
-void
-ogBitFont::SetFGColor(uInt32 red, uInt32 green, uInt32 blue, uInt32 alpha) {
-  FGColour.red   = red;
-  FGColour.green = green;
-  FGColour.blue  = blue;
-  FGColour.alpha = alpha;
-  return;
-} // ogBitFont::SetFGColor
-
-ogBitFont::~ogBitFont(void) {
-  memset(fontDataIdx, 0, sizeof(fontDataIdx));
-  memset(charWidthTable, 0, sizeof(charWidthTable));
-  memset(charHeightTable, 0, sizeof(charHeightTable));
-  delete [] fontData;
-  fontData = NULL;
-  fontDataSize = 0;
-  width = height = startingChar = 0;
-  return;
-} // ogBitFont::~ogBitFont;
-
-void 
-ogBitFont::CenterTextX(ogSurface& dest, int32 y, const char * textString) {
-  int32 x;
-  x = ((dest.ogGetMaxX()+1) - TextWidth(textString)) / 2;
-  PutString(dest, x, y, textString);
-  return;
-} // ogBitFont::CenterTextX
-
-void 
-ogBitFont::JustifyText(ogSurface& dest, ogTextAlign horiz, ogTextAlign vert, 
-                       const char * textString) {
-  uInt32 x, y;
-
-  switch (horiz) {
-   case leftText:
-    x = 0;
-    break;
-   case centerText:
-    x = ((dest.ogGetMaxX())-TextWidth(textString)) / 2;
-    break;
-   case rightText:
-    x = (dest.ogGetMaxX())-TextWidth(textString);
-    break;
-   default:
-    return;
-  } // switch
-
-  switch (vert) {
-   case topText:
-    y = 0; 
-    break;
-   case centerText:
-    y = ((dest.ogGetMaxY())-TextHeight(textString)) / 2;
-    break;
-   case bottomText:
-    y = (dest.ogGetMaxY())-TextHeight(textString);
-   default: 
-    return;
-  } // switch
-
-  PutString(dest, x, y, textString);
-  return;
-} // ogBitFont::JustifyText
-
-bool 
-ogBitFont::Load(const char* fontFile, uInt32 offset = 0) {
-#ifdef __UBIXOS_KERNEL__
-  fileDescriptor * infile;
-#else
-  FILE * infile;
-#endif
-  ogDPFHeader header;
-  uInt32 lresult, size;
-
-  if (!fileExists(fontFile)) return false;
-
-  delete [] fontData;
-
-  infile = fopen(fontFile, "rb");
-  fseek(infile, offset, SEEK_SET);
-  lresult = fread(&header, sizeof(header), 1, infile);
-  width = header.width;
-  height = header.height;
-  numOfChars = header.numOfChars;
-  if (numOfChars == 0) numOfChars = 256;
-  startingChar = header.startingChar;
-
-  memset(fontDataIdx, 0, sizeof(fontDataIdx));
-  memset(charWidthTable, 0, sizeof(charWidthTable));
-  memset(charHeightTable, 0, sizeof(charHeightTable));
-  
-  size = (((uInt32)width+7) / 8)*(uInt32)height;
-  fontDataSize = size* (uInt32)numOfChars;
-
-  for (int32 tmp = startingChar; tmp <= startingChar+numOfChars-1; tmp++) {
-    charWidthTable[tmp] = width;
-    charHeightTable[tmp] = height;
-    fontDataIdx[tmp] = (size*(tmp-startingChar));
-  } // for tmp
-
-  fontData = new uInt8[fontDataSize];
-
-  lresult = fread(fontData, 1, fontDataSize, infile);
-
-  fclose(infile);
-  return true;
-} // ogBitFont::Load
-
-/*
-bool 
-ogFont::LoadFrom(const char* FontFile, uInt32 Offset) {
-  return true;
-} // ogFont::LoadFrom
-
-
-bool 
-ogFont::Save(const char* FontFile) {
-  return saveTo(FontFile,0);
-} // ogFont::Save
-*/
-
-uInt32 
-ogBitFont::TextHeight(const char * textString) {
-  uInt32 size, tmpsize;
-  size = 0;
-  const unsigned char * text = (const unsigned char *)textString;
-
-  if (text != NULL)
-    while (*text) {
-      tmpsize = charHeightTable[*text++];
-      if (tmpsize>size) size = tmpsize;
-    } // while
-
-  return size;
-} // ogBitFont::TextHeight
-
-uInt32
-ogBitFont::TextWidth(const char * textString) {
-  uInt32 size = 0;
-  const unsigned char * text = (const unsigned char *)textString;
-
-  if (text != NULL)
-    while (*text) 
-      size += charWidthTable[*text++];
-  return size;
-} // ogBitFont::TextWidth
-
-/*
-bool 
-ogBitFont::SaveTo(const char * fontFile, int32 offset) {
-  return true;
-} // TDPFont::SaveTo
-*/
-
-void 
-ogBitFont::PutChar(ogSurface& dest, int32 x, int32 y, const char ch) {
-
-  uInt32 xx, xCount, yCount;
-  uInt32 BGC, FGC, tColour;
-  uInt8 * offset;
-  uInt8 bits = 0;
-  const unsigned char c = (const unsigned char)ch;
-
-  if (fontData == NULL) return;
-  if (!dest.ogAvail()) return;
- 
-  if (charWidthTable[c]  != 0) {
-    BGC = dest.ogPack(BGColour.red, 
-                      BGColour.green, 
-                      BGColour.blue, 
-                      BGColour.alpha); 
-
-    BGC &= dest.ogGetAlphaMasker();
-
-    tColour = dest.ogGetTransparentColor();
-
-    FGC = dest.ogPack(FGColour.red, 
-                      FGColour.green, 
-                      FGColour.blue, 
-                      FGColour.alpha); 
-   
-    offset = fontData;
-    offset += fontDataIdx[c];
-
-    for (yCount = 0; yCount < height; yCount++) {
-      xCount = charWidthTable[c];
-      xx = 0;
-
-      do {
-        if ((xx & 7) == 0) bits = *(offset++);
-        if ((bits & 128) != 0)
-          dest.ogSetPixel(x + xx, y+yCount , FGColour.red, FGColour.green, 
-                          FGColour.blue, FGColour.alpha); 
-        else
-          if (BGC != tColour)
-           dest.ogSetPixel(x + xx, y+yCount, BGC);
-
-        bits += bits;
-        ++xx;
-      } while (--xCount);
-    } // for yCount
-  } // if
-  return;
-} // ogBitFont::PutChar
-
-void
-ogBitFont::PutString(ogSurface& dest, int32 x, int32 y, 
-                     const char *textString) {
-
-  const unsigned char *text;
-  unsigned char ch;
-
-  if (textString == NULL) return;
-  if (0 == strlen(textString)) return;
-  if (!dest.ogAvail()) return;
-
-  text = (const unsigned char *)textString;
-
-  while ((ch = *text++) != 0) {
-    PutChar(dest, x, y, ch);
-    x += charWidthTable[ch];
-  } // while
-  
-  return;
-} // ogBitFont::PutString
diff --git a/lib/objgfx40/ogPixCon.cpp b/lib/objgfx40/ogPixCon.cpp
deleted file mode 100644
index 0e0473b..0000000
--- a/lib/objgfx40/ogPixCon.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-#include <objgfx40/objgfx40.h>
-#include <objgfx40/ogPixCon.h>
-
-// ogPixCon constructor
-ogPixCon::ogPixCon(ogPixelFmt srcPixFmt, ogPixelFmt dstPixFmt) {
-  uInt8 channelIdx[4];
-  uInt8 srcFieldSize[4];
-  uInt8 srcFieldPos[4];
-  uInt8 dstShifters[4];
-
-  uInt8 tmpb;
-  int32 i, j;
-
-  channelIdx[0] = 0;
-  channelIdx[1] = 1;
-  channelIdx[2] = 2;
-  channelIdx[3] = 3;
-
-  srcFieldSize[0] = srcPixFmt.alphaMaskSize;
-  srcFieldSize[1] = srcPixFmt.redMaskSize;
-  srcFieldSize[2] = srcPixFmt.greenMaskSize;
-  srcFieldSize[3] = srcPixFmt.blueMaskSize;
- 
-  srcFieldPos[0] = srcPixFmt.alphaFieldPosition;
-  srcFieldPos[1] = srcPixFmt.redFieldPosition;
-  srcFieldPos[2] = srcPixFmt.greenFieldPosition;
-  srcFieldPos[3] = srcPixFmt.blueFieldPosition;
-
-  /*
-   * The dest shifters are 32-(fieldPosition+fieldSize).  For things like
-   * 24bpp where there is no alpha, the field position will be 0, and the
-   * field size will be 0. 32-(0+0) is 32.. and when the shift takes place
-   * the 32 will turn into a 0 and the shift will do nothing
-   */
-
-  dstShifters[0] = 32-(dstPixFmt.alphaFieldPosition+dstPixFmt.alphaMaskSize);
-  dstShifters[1] = 32-(dstPixFmt.redFieldPosition+dstPixFmt.redMaskSize);
-  dstShifters[2] = 32-(dstPixFmt.greenFieldPosition+dstPixFmt.greenMaskSize);
-  dstShifters[3] = 32-(dstPixFmt.blueFieldPosition+dstPixFmt.blueMaskSize);
-
-  i = srcPixFmt.redMaskSize - dstPixFmt.redMaskSize;
-  if (i>0) 
-    srcMasker = OG_MASKS[dstPixFmt.redMaskSize] << (srcPixFmt.redFieldPosition+i);
-  else
-    srcMasker = OG_MASKS[srcPixFmt.redMaskSize] << srcPixFmt.redFieldPosition;
-
-  i = srcPixFmt.greenMaskSize - dstPixFmt.greenMaskSize;
-  if (i>0) 
-    srcMasker+= OG_MASKS[dstPixFmt.greenMaskSize] << (srcPixFmt.greenFieldPosition+i);
-  else
-    srcMasker+= OG_MASKS[srcPixFmt.greenMaskSize] << srcPixFmt.greenFieldPosition;
-
-  i = srcPixFmt.blueMaskSize - dstPixFmt.blueMaskSize;
-  if (i>0) 
-    srcMasker+= OG_MASKS[dstPixFmt.blueMaskSize] << (srcPixFmt.blueFieldPosition+i);
-  else
-    srcMasker+= OG_MASKS[srcPixFmt.blueMaskSize] << srcPixFmt.blueFieldPosition;
-
-  i = srcPixFmt.alphaMaskSize - dstPixFmt.alphaMaskSize;
-  if (i>0) 
-    srcMasker+= OG_MASKS[dstPixFmt.alphaMaskSize] << (srcPixFmt.alphaFieldPosition+i);
-  else
-    srcMasker+= OG_MASKS[srcPixFmt.alphaMaskSize] << srcPixFmt.alphaFieldPosition;
-
-  /*
-   * sort in descending order based on srcFieldPos (oth field will hold
-   * highest position value)
-   */
- 
-  for (i = 1; i < 4; i++ ) 
-    for (j = 0; j < i; j++) {
-      if (srcFieldPos[j] < srcFieldPos[i]) {
-        tmpb = srcFieldPos[j];
-        srcFieldPos[j] = srcFieldPos[i];
-        srcFieldPos[i] = tmpb;
-        
-        tmpb = srcFieldSize[j];
-        srcFieldSize[j] = srcFieldSize[i];
-        srcFieldSize[i] = tmpb;
-        
-        tmpb = channelIdx[j];
-        channelIdx[j] = channelIdx[i];
-        channelIdx[i] = tmpb;
-      } // if
-    } // for j
-
-  srcShifter = ((srcFieldSize[0] << 24) |
-                (srcFieldSize[1] << 16) |
-                (srcFieldSize[2] << 8) |
-                (srcFieldSize[3]));
-
-  dstShifter = ((dstShifters[channelIdx[0]] << 24) |
-                (dstShifters[channelIdx[1]] << 16) |
-                (dstShifters[channelIdx[2]] << 8) |
-                (dstShifters[channelIdx[3]]));
-  return;
-} // ogPixCon::ogPixCon
-
-uInt32 
-ogPixCon::ConvPix(uInt32 pixel) {
-  __asm__ __volatile__(
-       "  xor   %%ebx, %%ebx       \n"    // xor     ebx, ebx
-       "  xor   %%edi, %%edi       \n"    // xor     edi, edi
-       "                           \n"
-       "  push  %%eax              \n"    // push    eax
-       "                           \n"
-       "  and   %%edx, %%esi       \n"    // and     esi, edx
-       "  xor   %%eax, %%eax       \n"    // xor     eax, eax
-       "  xor   %%edx, %%edx       \n"    // xor     edx, edx
-       "                           \n"
-       "  shrdl %%cl, %%esi, %%eax \n"    // shrd    eax, esi, cl
-       "  shr   %%cl, %%esi        \n"    // shr     esi, cl
-       "  mov   %%ch, %%cl         \n"    // mov     cl, ch
-       "  shrdl %%cl, %%esi, %%ebx \n"    // shrd    ebx, esi, cl
-       "  shr   %%cl, %%esi        \n"    // shr     esi, cl
-       "  shr   $16, %%ecx         \n"    // shr     ecx, 16
-       "  shrdl %%cl, %%esi, %%edx \n"    // shrd    edx, esi, cl
-       "  shr   %%cl, %%esi        \n"    // shr     esi, cl
-       "  mov   %%ch, %%cl         \n"    // mov     cl, ch
-       "  shrdl %%cl, %%esi, %%edi \n"    // shrd    edi, esi, cl
-       "                           \n"
-       "  pop   %%ecx              \n"    // pop     ecx
-       "                           \n"
-       "  shr   %%cl, %%eax        \n"    // shr     eax, cl
-       "  shr   $8, %%ecx          \n"    // shr     ecx, 8
-       "  shr   %%cl, %%ebx        \n"    // shr     ebx, cl
-       "  shr   $8, %%ecx          \n"    // shr     ecx, 8
-       "  shr   %%cl, %%edx        \n"    // shr     edx, cl
-       "  shr   $8, %%ecx          \n"    // shr     ecx, 8
-       "  shr   %%cl, %%edi        \n"    // shr     edi, cl
-       "                           \n"
-       "  or    %%ebx, %%eax       \n"    // or      eax, ebx
-       "  or    %%edi, %%edx       \n"    // or      edx, edi
-       "  nop                      \n"    // nop
-       "  or    %%edx, %%eax       \n"    // or      eax, edx
-
-  : "=a" (pixel)                        // %0
-  : "S" (pixel), "d" (srcMasker),       // %1, %2
-    "c" (srcShifter), "a" (dstShifter)  // %3, %4
- //   "ecx" (srcShifter), "eax" (dstShifter)    // %2, %3
-  );
-  return pixel;
-}; // ogPixCon::ConvPix
diff --git a/lib/objgfx40/ogPixelFmt.cpp b/lib/objgfx40/ogPixelFmt.cpp
deleted file mode 100644
index 8f25d98..0000000
--- a/lib/objgfx40/ogPixelFmt.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <objgfx40/ogPixelFmt.h>
-#include <objgfx40/objgfx40.h>
-#ifdef __UBIXOS_KERNEL__
-#include <ubixos/types.h>
-#else
-#include <sys/types.h>
-#endif
-
-ogPixelFmt::ogPixelFmt(void) : BPP(0),
-                               redFieldPosition(0), greenFieldPosition(0),
-                               blueFieldPosition(0), alphaFieldPosition(0),
-                               redMaskSize(0), greenMaskSize(0),
-                               blueMaskSize(0), alphaMaskSize(0) { 
-  for (int i = 0; i < 7; i++) reserved[i] = 0;
-  return;
-}
-
-ogPixelFmt::ogPixelFmt(uInt8 bitsPerPix, 
-                       uInt8 RFP, uInt8 GFP, uInt8 BFP, uInt8 AFP,
-                       uInt8 RMS, uInt8 GMS, uInt8 BMS, uInt8 AMS) {
-
-  BPP = bitsPerPix;
-  redFieldPosition   = RFP;
-  greenFieldPosition = GFP;
-  blueFieldPosition  = BFP;
-  alphaFieldPosition = AFP;
-  redMaskSize   = RMS;
-  greenMaskSize = GMS;
-  blueMaskSize  = BMS;
-  alphaMaskSize = AMS;
-  
-  for (int i = 0; i < 7; i++) reserved[i] = 0;
-
-  return; 
-} // ogPixelFmt::ogPixelFmt()
diff --git a/lib/objgfx40/ogSprite.cpp b/lib/objgfx40/ogSprite.cpp
deleted file mode 100644
index 72c6434..0000000
--- a/lib/objgfx40/ogSprite.cpp
+++ /dev/null
@@ -1,702 +0,0 @@
-extern "C" {
-  #include <string.h>
-  #include <stdio.h>
-  #include <stdlib.h>
-  }
-#include <objgfx40/objgfx40.h>
-#include <objgfx40/ogSprite.h>
-
-static bool
-fileExists(const char *file)
-{
-  FILE *f = fopen(file, "rb");
-  if (!f)
-    return false;
-  fclose(f);
-  return true;
-}
-
-ogSprite::ogSprite(const ogSprite& srcSprite) {
-  image         = NULL;
-  pal           = NULL;
-  imageSize     = 0;
-  width         = 0;
-  height        = 0;
-  bitDepth      = 0;
-  RFP           = 0;
-  GFP           = 0;
-  BFP           = 0;
-  AFP           = 0;
-  rShift        = 0;
-  gShift        = 0;
-  bShift        = 0;
-  aShift        = 0;
-  tColour       = 0;
-  pixelFmtID    = 0;
-  bytesPerPixel = 0;
-  dAlpha        = 0;
-
-  if ((srcSprite.image == NULL) || (srcSprite.imageSize == 0)) return;
-
-  // allocate space for the sprite
-  image = malloc(srcSprite.imageSize);
-  if (image == NULL) return;
-  
-  // copy the image size
-  imageSize = srcSprite.imageSize;
- 
-  if (srcSprite.pal != NULL) {
-    pal = new ogRGBA8[256];
-    if (pal != NULL) memcpy(srcSprite.pal, pal, sizeof(ogRGBA8) * 256);
-  } // if 
-
-  width         = srcSprite.width;
-  height        = srcSprite.height;
-  bitDepth      = srcSprite.bitDepth;
-  RFP           = srcSprite.RFP;
-  GFP           = srcSprite.GFP;
-  BFP           = srcSprite.BFP;
-  AFP           = srcSprite.AFP;
-  rShift        = srcSprite.rShift;
-  gShift        = srcSprite.gShift;
-  bShift        = srcSprite.bShift;
-  aShift        = srcSprite.aShift;
-  tColour       = srcSprite.tColour;
-  pixelFmtID    = srcSprite.bytesPerPixel;
-  dAlpha        = srcSprite.dAlpha;
-
-  return;
-} // ogSprite::ogSprite
-
-ogSprite::ogSprite(void) {
-  image         = NULL;
-  pal           = NULL;
-  imageSize     = 0;
-  width         = 0;
-  height        = 0;
-  bitDepth      = 0;
-  RFP           = 0;
-  GFP           = 0;
-  BFP           = 0;
-  AFP           = 0;
-  rShift        = 0;
-  gShift        = 0;
-  bShift        = 0;
-  aShift        = 0;
-  tColour       = 0;
-  pixelFmtID    = 0;
-  bytesPerPixel = 0;
-  dAlpha        = 0;
-  return;
-} // ogSprite::ogSprite
-
-ogSprite &
-ogSprite::operator=(ogSprite const & srcSprite) {
-
-  if ((srcSprite.image == NULL) || (srcSprite.imageSize == NULL)) return *this;
-
-  free(image);
-  delete [] pal;
-
-  // allocate space for the sprite
-  image = malloc(srcSprite.imageSize);
-
-  // this is such a bad case it should probably throw an exception
-  if (image == NULL) return *this;
-
-  // copy the image size
-  imageSize = srcSprite.imageSize;
-
-  if (srcSprite.pal != NULL) {
-    pal = new ogRGBA8[256];
-    if (pal != NULL) memcpy(srcSprite.pal, pal, sizeof(ogRGBA8) * 256);
-  } // if
-
-  width         = srcSprite.width;
-  height        = srcSprite.height;
-  bitDepth      = srcSprite.bitDepth;
-  RFP           = srcSprite.RFP;
-  GFP           = srcSprite.GFP;
-  BFP           = srcSprite.BFP;
-  AFP           = srcSprite.AFP;
-  rShift        = srcSprite.rShift;
-  gShift        = srcSprite.gShift;
-  bShift        = srcSprite.bShift;
-  aShift        = srcSprite.aShift;
-  tColour       = srcSprite.tColour;
-  pixelFmtID    = srcSprite.bytesPerPixel;
-  dAlpha        = srcSprite.dAlpha;
-
-  return *this;
-}
-void
-ogSprite::Get(ogSurface& srcObject, int32 x1, int32 y1, int32 x2, int32 y2) {
-  ogPixelFmt pixfmt;
-  uInt32     xx, yy, xOfs, yOfs;
-  uInt32     rx1, ry1, rx2, ry2;
-  uInt32     xCount, yCount, count;
-  void       *p;
-  uInt32     maxX, maxY;
-
-  if (!srcObject.ogAvail()) return;
-
-  free(image);
-  free(pal);
-  
-  maxX = srcObject.ogGetMaxX();
-  maxY = srcObject.ogGetMaxY();
-  
-  srcObject.ogGetPixFmt(pixfmt);
-
-  bitDepth = pixfmt.BPP;
-  RFP      = pixfmt.redFieldPosition;
-  GFP      = pixfmt.greenFieldPosition;
-  BFP      = pixfmt.blueFieldPosition;
-  AFP      = pixfmt.alphaFieldPosition;
-  rShift   = 8-pixfmt.redMaskSize;
-  gShift   = 8-pixfmt.greenMaskSize;
-  bShift   = 8-pixfmt.blueMaskSize;
-  aShift   = 8-pixfmt.alphaMaskSize;
- 
-  pixelFmtID = srcObject.ogGetPixFmtID();
-
-  dAlpha = srcObject.ogGetAlpha();
-  tColour = srcObject.ogGetTransparentColor();
-
-  bytesPerPixel = srcObject.ogGetBytesPerPix();
-
-  if (bytesPerPixel == 1) {
-    if (pal == NULL) pal = new ogRGBA8[256];
-    if (pal == NULL) return;
-    srcObject.ogGetPalette(pal);
-  /*  for (count = 0; count < 256; count++)
-      srcObject.Unpack(count, 
-                       pal[count].red, 
-                       pal[count].green, 
-                       pal[count].blue,
-                       pal[count].alpha); */
-
-//    memcpy(pal, srcObject.pal, sizeof(ogRGBA8)*256);
-  } // if
-
-  if (x1 > x2) {
-    xx = x1;
-    x1 = x2;
-    x2 = xx;
-  } // if
-
-  if (y1 > y2) {
-    yy = y1;
-    y1 = y2;
-    y2 = yy;
-  } // if
-
-  xCount = abs(x2-x1)+1;
-  yCount = abs(y2-y1)+1;
-  width  = xCount;
-  height = yCount;
-  imageSize = xCount*yCount*bytesPerPixel;
-
-  image = malloc(imageSize);
-  p = image;
-
-  if ( ((uInt32)x1 > maxX) || ((uInt32)y1 > maxY) ||
-       ((uInt32)x2 > maxX) || ((uInt32)y2 > maxY) ) {
-
-    for (count = 0; count < (xCount*yCount); count++) {
-      SetPixel(p, tColour);
-      (uInt8 *)p += bytesPerPixel;
-    } // for
-    p = image;  // reset the pointer;
-  } // if
-
-  xOfs = 0;
-  yOfs = 0;
-
-  if (y1 < 0) {
-    yCount += y1;
-    ry1 = 0;
-    yOfs = xCount*abs(y1);
-  } else ry1 = y1;
-
-  if (x1 < 0) {
-    xCount += x1;
-    rx1 = 0;
-    xOfs = abs(x1);
-  } else rx1 = x1;
-
-  if (x2 > (int32)maxX) {
-    xCount -= maxX-x2+1;
-    rx2 = maxX;
-  } else rx2 = x2;
-
-  if (y2 > (int32)maxY) {
-    yCount -= maxY-y2+1;
-    ry2 = maxY;
-  } else ry2 = y2;
-
-  xCount *= bytesPerPixel;
-
-  for (yy = 0; yy < yCount; yy++) {
-    ( (uInt8 *)p ) += xOfs;
-    srcObject.ogCopyLineFrom(rx1, ry1+yy, p, xCount);    
-    ( (uInt8 *)p ) += xCount;
-  }
-  return;
-} // ogSprite::Get
-
-uInt32
-ogSprite::GetPixel(void * p) {
-  uInt32 result;
-  switch (bytesPerPixel) {
-   case 4:
-    return *(uInt32 *)p;
-    break;
-   case 3:
-    asm(
-       "  xor  %%eax, %%eax   \n"  // xor     eax, eax
-       "  mov  2(%%edi),%%al  \n"  // mov     al, [edi+2]
-       "  shl  $16, %%eax     \n"  // shl     eax, 16
-       "  mov  (%%edi), %%ax  \n"  // mov     ax, [edi]
-       "  mov  %%eax, %1      \n"  // mov     result, eax
-       :
-       : "D" (p), "m" (result)
-       );
-     return result;
-     break;
-  case 2:
-    return *(uInt16 *)p;
-    break;
-  case 1:
-    return *(uInt8 *)p;
-    break;
-  default:
-    return 0;
-    break;
-  } // switch
-} // ogSprite::GetPixel
-
-void
-ogSprite::SetPixel(void * p, uInt32 colour) {
-
-  switch (bytesPerPixel) {
-  case 4:
-    *(uInt32 *)p = colour;
-    break;
-  case 3:
-    asm(
-        "  mov  %%ax, (%%edi) \n"  // mov     [edi], ax
-        "  shr  $16, %%eax    \n"  // shr     eax, 16
-        "  mov  %%al, 2(%%edi)\n"  // mov     [edi+2],al
-       :
-       : "D" (p), "a" (colour)
-       );
-    break;
-  case 2:
-    *(uInt16 *)p = (uInt16)colour;
-    break;
-  case 1:
-    *(uInt8 *)p = (uInt8)colour;
-    break;
-  } // switch
-  return;
-} // ogSprite::SetPixel
-
-uInt32
-ogSprite::GetSize(void) {
- /*
-  * getSize
-  *
-  * returns the size of the image as it would take on disk.  This includes
-  * all header related information (width/height, bitdepth, pixel format,
-  * etc) along with an extra sizeof(uInt32)
-  * for storing the complete size. This allows easy indexing of images,
-  * since you can figure out exactly how much the image will take up on
-  * disk.  This function computes the size in the exact order it is on disk.
-  * If the image is 8bpp, then there is a 1024 byte palette stored after the
-  * image data along with an extra sizeof(uInt32) for the palette size in
-  * bytes.  Currently we store the entire palette, but later I expect we
-  * will add the ability to optimize the palette so only used entries are
-  * stored.
-  *
-  * If you were to store a single sprite in a file, getSize would equal the
-  * filesize.
-  */
-  uInt32 tmpsize;
-  char headerIdent[4];
-
-  tmpsize = sizeof(headerIdent)+
-            sizeof(uInt32)+               // total size
-            sizeof(width)+sizeof(height)+ // width/height
-            sizeof(bitDepth)+             // bitDepth
-            sizeof(RFP)+sizeof(GFP)+sizeof(BFP)+sizeof(AFP)+ // field positions
-            sizeof(rShift)+sizeof(gShift)+sizeof(bShift)+sizeof(aShift)+ // shifters
-            sizeof(tColour)+              // tColour
-            sizeof(bytesPerPixel)+        // bytes per pixel
-            sizeof(pixelFmtID)+           // pixel format ID
-            sizeof(dAlpha)+               // default alpha
-            sizeof(imageSize)+            // image size in bytes
-            imageSize;                    // actual image area in bytes
-  if (bytesPerPixel == 1) tmpsize += sizeof(uInt32)+sizeof(ogRGBA8)*256;
-  return tmpsize;
-} // ogSprite::GetSize
-
-bool
-ogSprite::Load(const char * filename) {
-  return LoadFrom(filename,0);
-} // ogSprite::Load
-
-bool
-ogSprite::LoadFrom(const char * filename, uInt32 offset) {
-  FILE * infile;
-  uInt32 lresult, tresult, totSize;
-  uInt32 tmpSize;
-  char headerIdent[4];
-
-  if (!fileExists(filename)) return false;
-  if ((infile = fopen(filename,"rb")) == NULL) return false;
-  fseek(infile, offset, SEEK_SET);
-
-  // for now just free up the previous image.  This will be changed
-  // later so it doesn't affect the current image (if any) if there
-  // is a failure loading
-
-  free(image);
-  free(pal);
-
-  image = NULL;
-  imageSize = 0;
-  pal = NULL;
-  
-  tresult = 0;   // total bytes we've read in so far
-  
-  lresult = fread(&headerIdent, sizeof(headerIdent), 1, infile);
-  tresult += lresult*sizeof(headerIdent);
-  if ((headerIdent[0] != 'S') ||
-      (headerIdent[1] != 'P') ||
-      (headerIdent[2] != 'R') ||
-      (headerIdent[3] != (char)0x1A)) {
-    fclose(infile);
-    return false;
-  }
-  
-  lresult = fread(&totSize, sizeof(totSize), 1, infile);
-  tresult += lresult*sizeof(totSize);
-  
-  lresult = fread(&width, sizeof(width), 1, infile);
-  tresult += lresult*sizeof(width);
-
-  lresult = fread(&height, sizeof(height), 1, infile);
-  tresult += lresult*sizeof(height);
-
-  lresult = fread(&bitDepth, sizeof(bitDepth), 1, infile);
-  tresult += lresult*sizeof(bitDepth);
-
-  lresult = fread(&RFP, sizeof(RFP), 1, infile);
-  tresult += lresult*sizeof(RFP);
-
-  lresult = fread(&GFP, sizeof(GFP), 1, infile);
-  tresult += lresult*sizeof(GFP);
-
-  lresult = fread(&BFP, sizeof(BFP), 1, infile);
-  tresult += lresult*sizeof(BFP);
-
-  lresult = fread(&AFP, sizeof(AFP), 1, infile);
-  tresult += lresult*sizeof(AFP);
-
-  lresult = fread(&rShift, sizeof(rShift), 1, infile);
-  tresult += lresult*sizeof(rShift);
-  
-  lresult = fread(&gShift, sizeof(gShift), 1, infile);
-  tresult += lresult*sizeof(gShift);
-  
-  lresult = fread(&bShift, sizeof(bShift), 1, infile);
-  tresult += lresult*sizeof(bShift);
-  
-  lresult = fread(&aShift, sizeof(aShift), 1, infile);
-  tresult += lresult*sizeof(aShift);
-
-  lresult = fread(&tColour, sizeof(tColour), 1, infile);
-  tresult += lresult*sizeof(tColour);
-
-  lresult = fread(&pixelFmtID, sizeof(pixelFmtID), 1, infile);
-  tresult += lresult*sizeof(pixelFmtID);
-
-  lresult = fread(&bytesPerPixel, sizeof(bytesPerPixel), 1, infile);
-  tresult += lresult*sizeof(bytesPerPixel);
-
-  lresult = fread(&dAlpha, sizeof(dAlpha), 1, infile);
-  tresult += lresult*sizeof(dAlpha);
-
-  lresult = fread(&imageSize, sizeof(imageSize), 1, infile);
-  tresult += lresult*sizeof(imageSize);
-  
-  image = malloc(imageSize);
-  if (image == NULL) {
-    fclose(infile);
-    return false;
-  }
-
-  // I suppose we could interchange the imageSize and record count to produce
-  // the number of bytes we read it... we'll try it this way for now.
-  lresult = fread(image, imageSize, 1, infile);
-  tresult += lresult*imageSize;
-  
-  if (bytesPerPixel == 1) {
-    // 8bpp sprites have palettes
-    if (pal == NULL) pal = new ogRGBA8[256];
-    if (pal == NULL) {
-      fclose(infile);
-      return false;
-    } // if pal==NULL
-
-    lresult = fread(&tmpSize, sizeof(tmpSize), 1, infile);
-    tresult += lresult*sizeof(tmpSize);
-
-    if (tmpSize > sizeof(ogRGBA8)*256) {
-      fclose(infile);
-      return false;
-    } // if
-
-    lresult = fread(pal, tmpSize, 1, infile);
-    tresult += lresult*tmpSize;
-  } // if bytesPerPixel == 1
-
-  fclose(infile);
-  return (tresult == totSize);
-} // ogSprite::LoadFrom;
-
-void
-ogSprite::Put(ogSurface& destObject, int32 x, int32 y) {
-  uInt32 xx, yy;
-  int32 xCount, yCount;
-  uInt32 yOfs;
-  uInt32 xLeft, xRight;
-  int32 maxX, maxY;
-  void * p;
-  uInt8  r, g, b, a;
-  ogPixelFmt pixfmt;
-
-  if (image == NULL) return;
-  if (!destObject.ogAvail()) return;
-
-  maxX = destObject.ogGetMaxX();
-  maxY = destObject.ogGetMaxY();
-
-  xCount = width;
-  yCount = height;
-
-  // check to see if the image is totally off the screen
-  if ((x+xCount < 0) || (y+yCount < 0) || 
-      (x > (int32)maxX) || (y > (int32)maxY)) return;
-
-  p = image;
-
-  if (y < 0) {
-    yOfs = abs(y)*xCount*bytesPerPixel;
-    yCount += y;
-    y = 0;
-  } else yOfs = 0;
-
-  if (x < 0) {
-    xLeft = abs(x)*bytesPerPixel;
-    xCount += x;
-    x = 0;
-  } else xLeft = 0;
-
-  if (x+xCount > maxX) {
-    xRight = (xCount - (maxX-x+1))*bytesPerPixel;
-    xCount = (maxX-x)+1;
-  } else xRight = 0;
-
-  if ((y+yCount) > maxY) yCount = (maxY-y)+1;
-
-  destObject.ogGetPixFmt(pixfmt);
-  
-  (uInt8 *)p += yOfs;
-  
-  if ((destObject.ogGetPixFmtID() != pixelFmtID) || (destObject.ogIsBlending())) {
-
-    for (yy = 0; yy < (uInt32)yCount; yy++) { 
-      (uInt8 *)p += xLeft;
-      
-      for (xx = 0; xx < (uInt32)xCount; xx++) {
-        Unpack(GetPixel(p), r, g, b, a);
-        (uInt8 *)p += bytesPerPixel;
-          // this could probably be rawSetPixelRGBA instead
-        destObject.ogSetPixel(x+xx, y+yy, r, g, b, a);
-      } // for
-
-      (uInt8 *)p += xRight;
-    } // for yy
-
-  } else {                            // pixel formats match
-    xCount *= bytesPerPixel;
-
-    for (yy = 0; yy < (uInt32)yCount; yy++) {
-      (uInt8 *)p += xLeft;
-      destObject.ogCopyLineTo(x, y+yy, p, xCount);
-      (uInt8 *)p += xCount;
-      (uInt8 *)p += xRight;
-    } // for
-
-  } // else
-  return;
-} // ogSurface::Put
-
-bool
-ogSprite::Save(const char * filename) {
-  return SaveTo(filename, 0);
-} // ogSprite::Save
-
-bool
-ogSprite::SaveTo(const char * filename, int32 offset) {
-  /*
-   * saveTo
-   *
-   * saves a bitmap to disk.  If the file doesn't exit then we will create
-   * a new one (doing this will ignore any specified offset).  If the file
-   * exists, we will seek to the specified offset and place the bitmap there.
-   * If offset is -1, then we seek to the end of the file.
-   *
-   * This function will fail on files larger than 2GB.
-   *
-   */
-  FILE * outfile = NULL;
-  char headerIdent[4];
-  uInt32 tmpSize;
-  
-  if (image == NULL) return false;
-  if ((bytesPerPixel == 1) && (pal == NULL)) return false;
-
-  if (!fileExists(filename)) {        // file doesn't exist
-    if ((outfile = fopen(filename,"wb")) == NULL) return false;
-  } else {
-    // file exists. Now we check to see where we put it
-    if (offset == -1) {
-      if ((outfile = fopen(filename, "ab")) == NULL) return false;
-    } else {
-      // we have an existing file and an offset to place the data
-      if ((outfile = fopen(filename, "wb")) == NULL) return false;
-      if (offset != 0) fseek(outfile, offset, SEEK_SET);
-    } // else
-  } // else
-
-  headerIdent[0] = 'S';
-  headerIdent[1] = 'P';
-  headerIdent[2] = 'R';
-  headerIdent[3] = (char)0x1A;  // EOF marker
-
-  // we store exactly how bit this sucker is inside the header. This includes
-  // the header information before it, and the size itself
-  tmpSize = GetSize();
-  fwrite(headerIdent, sizeof(headerIdent), 1, outfile);
-
-  fwrite(&tmpSize, sizeof(tmpSize), 1, outfile);
-  fwrite(&width, sizeof(width), 1, outfile);
-  fwrite(&height, sizeof(height), 1, outfile);
-  fwrite(&bitDepth, sizeof(bitDepth), 1, outfile);
-
-  fwrite(&RFP, sizeof(RFP), 1, outfile);
-  fwrite(&GFP, sizeof(GFP), 1, outfile);
-  fwrite(&BFP, sizeof(BFP), 1, outfile);
-  fwrite(&AFP, sizeof(AFP), 1, outfile);
-
-  fwrite(&rShift, sizeof(rShift), 1, outfile);
-  fwrite(&gShift, sizeof(gShift), 1, outfile);
-  fwrite(&bShift, sizeof(bShift), 1, outfile);
-  fwrite(&aShift, sizeof(aShift), 1, outfile);
-
-  fwrite(&tColour, sizeof(tColour), 1, outfile);
-  fwrite(&pixelFmtID, sizeof(pixelFmtID), 1, outfile);
-  fwrite(&bytesPerPixel, sizeof(bytesPerPixel), 1, outfile);
-  fwrite(&dAlpha, sizeof(dAlpha), 1, outfile);
-
-  fwrite(&imageSize, sizeof(imageSize), 1, outfile);
-  fwrite(image, imageSize, 1, outfile);
-
-  if (bytesPerPixel == 1) {
-    tmpSize = sizeof(ogRGBA8)*256;
-    fwrite(&tmpSize, sizeof(tmpSize), 1, outfile);
-    fwrite(pal, sizeof(ogRGBA8), 256, outfile);
-  } // if bytesPerPixel == 1
-
-  fclose(outfile);
-  return true;
-} // ogSprite::SaveTo
-
-void
-ogSprite::Unpack(uInt32 colour, uInt8& red, uInt8& green, uInt8& blue,
-                 uInt8& alpha) {
-  switch (bytesPerPixel) {
-   case 4:
-    red   = (uInt8)(colour >> RFP);
-    green = (uInt8)(colour >> GFP);
-    blue  = (uInt8)(colour >> BFP);
-    alpha = (uInt8)(colour >> AFP);
-    break;
-   case 3:
-    red   = (uInt8)(colour >> RFP);
-    green = (uInt8)(colour >> GFP);
-    blue  = (uInt8)(colour >> BFP);
-    alpha = dAlpha;
-    break;
-   case 2:
-    red   = (uInt8)(colour >> RFP) << rShift;
-    green = (uInt8)(colour >> GFP) << gShift;
-    blue  = (uInt8)(colour >> BFP) << bShift;
-    if (red != 0)   red += OG_MASKS[rShift];
-    if (green != 0) green += OG_MASKS[gShift];
-    if (blue != 0)  blue += OG_MASKS[bShift];
-
-    if (aShift != 8) {
-      alpha = (uInt8)(colour >> AFP) << aShift;
-      if (alpha != 0) alpha += OG_MASKS[aShift];
-    } else alpha = dAlpha;
-
-    break;
-  case 1:
-
-    if (pal == NULL) {
-      red = green = blue = alpha = 0;
-      return;
-    } // if
-
-    if (colour > 255) colour &= 255;
-    red   = pal[colour].red;
-    green = pal[colour].green;
-    blue  = pal[colour].blue;
-    alpha = pal[colour].alpha;
-    break;
-   default:
-    red = green = blue = alpha = 0;
-    break;
-  } // switch
-  return;
-} // ogSprite::Unpack
-
-ogSprite::~ogSprite(void) {
-  free(image);
-  delete [] pal;
-  image     = NULL;
-  pal       = NULL;
-  imageSize = 0;
-  width     = 0;
-  height    = 0;
-  bitDepth  = 0;
-  RFP       = 0;
-  GFP       = 0;
-  BFP       = 0;
-  AFP       = 0;
-  rShift    = 0;
-  gShift    = 0;
-  bShift    = 0;
-  aShift    = 0;
-  tColour   = 0;
-  pixelFmtID= 0;
-  bytesPerPixel = 0;
-  dAlpha    = 0;
-  return;
-} // ogSprite::~ogSprite
-
-
diff --git a/lib/objgfx40/rh_opt.gdt b/lib/objgfx40/rh_opt.gdt
deleted file mode 100644
index f16ef1f..0000000
--- a/lib/objgfx40/rh_opt.gdt
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/rh_opt.gpr b/lib/objgfx40/rh_opt.gpr
deleted file mode 100644
index e49b5df..0000000
--- a/lib/objgfx40/rh_opt.gpr
+++ /dev/null
Binary files differ
diff --git a/lib/objgfx40/rh_opt.mak b/lib/objgfx40/rh_opt.mak
deleted file mode 100644
index fb1c5be..0000000
--- a/lib/objgfx40/rh_opt.mak
+++ /dev/null
@@ -1,356 +0,0 @@
-# This file is automatically generated by RHIDE 1.4.9
-# created from within RHIDE
-FLAGS_FOR_SUBPROJECTS=RHIDE_OS_="$(RHIDE_OS_)" CFLAGS="$(CFLAGS)"\
-	CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CPPFLAGS="$(CPPFLAGS)"
-RHIDE_OS=$(RHIDE_OS_)
-ifeq ($(strip $(RHIDE_OS)),)
-ifneq ($(strip $(DJDIR)),)
-RHIDE_OS_:=DJGPP
-else
-RHIDE_OS_:=$(patsubst CYGWIN%,CYGWIN,$(shell uname))
-endif
-endif
-
-INCLUDE_DIRS=
-LIB_DIRS=
-C_DEBUG_FLAGS=
-C_OPT_FLAGS=-O4
-C_WARN_FLAGS=-pedantic -Wmain -Wparentheses -Wreturn-type -Wuninitialized\
-	-Wall -W -Wpointer-arith -Wmissing-prototypes -Wredundant-decls
-C_C_LANG_FLAGS=
-C_CXX_LANG_FLAGS=
-C_P_LANG_FLAGS=
-C_FPC_LANG_FLAGS=
-C_F_LANG_FLAGS=
-C_ADA_LANG_FLAGS=
-LIBS=
-LD_EXTRA_FLAGS=-g
-C_EXTRA_FLAGS=-Wno-long-long
-LOCAL_OPT=$(subst ___~~~___, ,$(subst $(notdir $<)___,,$(filter $(notdir\
-	$<)___%,$(LOCAL_OPTIONS))))
-
-OBJFILES=main.o objgfx30.o ogBlit.o ogDisplay_VESA.o ogFont.o ogSprite.o
-ALL_OBJFILES=main.o objgfx30.o ogBlit.o ogDisplay_VESA.o ogFont.o\
-	ogSprite.o
-LIBRARIES=
-SOURCE_NAME=$<
-OUTFILE=$@
-SPECIAL_CFLAGS=
-SPECIAL_LDFLAGS=
-PROG_ARGS=
-SRC_DIRS=
-WUC=
-EDITORS=
-MAIN_TARGET=objgfx.exe
-PROJECT_ITEMS=main.cpp objgfx30.cpp ogBlit.cpp ogDisplay_VESA.cpp\
-	ogFont.cpp ogSprite.cpp
-DEFAULT_MASK=*.cpp
-RHIDE_BIN_DIR=c:/djgpp/bin
-PASCAL_TYPE=GPC
-GET_HOME=$(HOME)
-CLEAN_FILES=$(MAIN_TARGET) $(OBJFILES)
-RHIDE_GCC=gcc
-RHIDE_AS=gcc
-RHIDE_GXX=gcc
-RHIDE_GPC=gpc
-RHIDE_FPC=ppc386
-RHIDE_AR=ar
-RHIDE_LD=gcc
-RHIDE_G77=g77
-RHIDE_NASM=nasm
-RHIDE_LD_PASCAL=gpc
-RHIDE_LD_FPC=$(RHIDE_FPC) -E+
-RHIDE_GNATBIND=gnatbind
-RHIDE_RM=rm
-RHIDE_ARFLAGS=rcs
-RHIDE_TYPED_LIBS.f=g2c m
-RHIDE_TYPED_LIBS.for=$(RHIDE_TYPED_LIBS.f)
-RHIDE_TYPED_LIBS.F=$(RHIDE_TYPED_LIBS.f)
-RHIDE_TYPED_LIBS.fpp=$(RHIDE_TYPED_LIBS.f)
-RHIDE_TYPED_LIBS_GPC=gpc m
-RHIDE_TYPED_LIBS_FPC=fpc
-RHIDE_TYPED_LIBS.p=$(RHIDE_TYPED_LIBS_$(PASCAL_TYPE))
-RHIDE_TYPED_LIBS.pas=$(RHIDE_TYPED_LIBS.p)
-RHIDE_TYPED_LIBS.pp=$(RHIDE_TYPED_LIBS_FPC)
-RHIDE_TYPED_LIBS_$(RHIDE_OS).cc=stdc++
-RHIDE_TYPED_LIBS_DJGPP.cc=stdcxx m
-RHIDE_TYPED_LIBS_DJGPP.cc=stdcxx m
-RHIDE_TYPED_LIBS.cc=$(RHIDE_TYPED_LIBS_$(RHIDE_OS).cc)
-RHIDE_TYPED_LIBS.cpp=$(RHIDE_TYPED_LIBS.cc)
-RHIDE_TYPED_LIBS.cxx=$(RHIDE_TYPED_LIBS.cc)
-RHIDE_TYPED_LIBS.C=$(RHIDE_TYPED_LIBS.cc)
-RHIDE_TYPED_LIBS.ii=$(RHIDE_TYPED_LIBS.cc)
-RHIDE_TYPED_LIBS.l=fl
-RHIDE_TYPED_LIBS.m=objc
-RHIDE_TYPED_LIBS.adb=gnat
-RHIDE_TYPED_LIBS_SUFFIXES=$(sort $(foreach item,$(PROJECT_ITEMS),$(suffix\
-	$(item))))
-RHIDE_TYPED_LIBS=$(foreach\
-	suff,$(RHIDE_TYPED_LIBS_SUFFIXES),$(RHIDE_TYPED_LIBS$(suff)))
-RHIDE_INCLUDES=$(SPECIAL_CFLAGS) $(addprefix -I,$(INCLUDE_DIRS))
-RHIDE_LIBDIRS=$(addprefix -L,$(LIB_DIRS))
-RHIDE_LIBS=$(addprefix -l,$(LIBS) $(RHIDE_TYPED_LIBS) $(RHIDE_OS_LIBS))
-RHIDE_LDFLAGS=$(SPECIAL_LDFLAGS) $(addprefix -Xlinker ,$(LD_EXTRA_FLAGS))
-RHIDE_NASM_TARGET_DJGPP=coff
-RHIDE_NASM_TARGET_Linux=elf
-RHIDE_NASM_TARGET=$(RHIDE_NASM_TARGET_$(RHIDE_OS))
-RHIDE_COMPILE_NASM=$(RHIDE_NASM) -f $(RHIDE_NASM_TARGET) $(LOCAL_OPT) -o\
-	$(OUTFILE)  $(SOURCE_NAME)
-RHIDE_COMPILE_FORTRAN=$(RHIDE_G77) $(RHIDE_INCLUDES) $(C_DEBUG_FLAGS)\
-	$(C_OPT_FLAGS)  $(C_WARN_FLAGS) $(C_F_LANG_FLAGS) $(C_EXTRA_FLAGS)\
-	$(LOCAL_OPT)  -c $(SOURCE_NAME) -o $(OUTFILE)
-RHIDE_COMPILE_FORTRAN_FORCE=$(RHIDE_G77) $(RHIDE_INCLUDES) $(C_DEBUG_FLAGS)\
-	$(C_OPT_FLAGS)  $(C_WARN_FLAGS) $(C_F_LANG_FLAGS) $(C_EXTRA_FLAGS)\
-	-x f77 $(LOCAL_OPT)  -c $(SOURCE_NAME) -o $(OUTFILE)
-RHIDE_COMPILE_C=$(RHIDE_GCC) $(RHIDE_INCLUDES) $(C_DEBUG_FLAGS)\
-	$(C_OPT_FLAGS)  $(C_WARN_FLAGS) $(C_C_LANG_FLAGS) $(C_EXTRA_FLAGS)\
-	$(RHIDE_OS_CFLAGS)  $(CPPFLAGS) $(CFLAGS) $(LOCAL_OPT) -c\
-	$(SOURCE_NAME) -o $(OUTFILE)
-RHIDE_COMPILE_C_FORCE=$(RHIDE_GCC) $(RHIDE_INCLUDES) $(C_DEBUG_FLAGS)\
-	$(C_OPT_FLAGS)  $(C_WARN_FLAGS) $(C_C_LANG_FLAGS) $(C_EXTRA_FLAGS)\
-	-x c $(RHIDE_OS_CFLAGS)  $(CPPFLAGS) $(CFLAGS) $(LOCAL_OPT) -c\
-	$(SOURCE_NAME) -o $(OUTFILE)
-RHIDE_COMPILE_CC=$(RHIDE_GXX) $(RHIDE_INCLUDES) $(C_DEBUG_FLAGS)\
-	$(C_OPT_FLAGS)  $(C_WARN_FLAGS) $(C_C_LANG_FLAGS)\
-	$(C_CXX_LANG_FLAGS) $(C_EXTRA_FLAGS)  $(RHIDE_OS_CXXFLAGS)\
-	$(CPPFLAGS) $(CXXFLAGS) $(LOCAL_OPT)   -c $(SOURCE_NAME) -o\
-	$(OUTFILE)
-RHIDE_COMPILE_CC_FORCE=$(RHIDE_GXX) $(RHIDE_INCLUDES) $(C_DEBUG_FLAGS)\
-	$(C_OPT_FLAGS)  $(C_WARN_FLAGS) $(C_C_LANG_FLAGS)\
-	$(C_CXX_LANG_FLAGS) $(C_EXTRA_FLAGS)  $(RHIDE_OS_CXXFLAGS)\
-	$(CPPFLAGS) $(CXXFLAGS) -x c++ $(LOCAL_OPT)   -c $(SOURCE_NAME) -o\
-	$(OUTFILE)
-RHIDE_COMPILE_ASM=$(RHIDE_AS) $(RHIDE_INCLUDES) $(C_DEBUG_FLAGS)\
-	$(C_OPT_FLAGS)  $(C_WARN_FLAGS) $(C_EXTRA_FLAGS) $(LOCAL_OPT)  -c\
-	$(SOURCE_NAME) -o $(OUTFILE)
-RHIDE_COMPILE_ASM_FORCE=$(RHIDE_AS) $(RHIDE_INCLUDES) $(C_DEBUG_FLAGS)\
-	$(C_OPT_FLAGS)  $(C_WARN_FLAGS) $(C_EXTRA_FLAGS) -x assembler\
-	$(LOCAL_OPT)  -c $(SOURCE_NAME) -o $(OUTFILE)
-RHIDE_GPC_FLAGS=$(RHIDE_INCLUDES) $(C_DEBUG_FLAGS) $(C_OPT_FLAGS)\
-	$(C_WARN_FLAGS)  $(C_P_LANG_FLAGS) $(C_EXTRA_FLAGS)
-RHIDE_COMPILE_GPC=$(RHIDE_GPC) $(RHIDE_GPC_FLAGS) $(LOCAL_OPT)  -c\
-	$(SOURCE_NAME) -o $(OUTFILE)
-RHIDE_COMPILE_GPC_FORCE=$(RHIDE_GPC) $(RHIDE_GPC_FLAGS) -x pascal\
-	$(LOCAL_OPT)  -c $(SOURCE_NAME) -o $(OUTFILE)
-RHIDE_FPC_FLAGS=$(C_FPC_LANG_FLAGS) $(LOCAL_OPT) $(addprefix\
-	-Up,$(INCLUDE_DIRS))  $(C_EXTRA_FLAGS)
-RHIDE_COMPILE_FPC=$(RHIDE_FPC) $(RHIDE_FPC_FLAGS) -E- $(SOURCE_NAME)
-RHIDE_COMPILE_FPC_FORCE=$(RHIDE_FPC) $(RHIDE_FPC_FLAGS) -B -E-\
-	$(SOURCE_NAME)
-RHIDE_COMPILE_LINK=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(C_EXTRA_FLAGS) -o\
-	$(OUTFILE)  $(OBJFILES) $(LIBRARIES) $(LDFLAGS) $(RHIDE_LDFLAGS)\
-	$(RHIDE_LIBS)
-RHIDE_COMPILE_LINK_GPC=$(RHIDE_LD_PASCAL) $(RHIDE_LIBDIRS) $(C_EXTRA_FLAGS)\
-	-o $(OUTFILE)  $(OBJFILES) $(LIBRARIES) $(RHIDE_LDFLAGS) $(LDFLAGS)\
-	$(RHIDE_LIBS)
-RHIDE_COMPILE_LINK_GPC_AUTOMAKE=$(RHIDE_LD_PASCAL) $(RHIDE_LIBDIRS)  -o\
-	$(OUTFILE) --automake $(RHIDE_GPC_FLAGS)  $(SOURCE_NAME)\
-	$(LIBRARIES) $(LDFLAGS) $(RHIDE_LDFLAGS) $(RHIDE_LIBS)
-RHIDE_COMPILE_PASCAL=$(RHIDE_COMPILE_$(PASCAL_TYPE))
-RHIDE_COMPILE_PASCAL_FORCE=$(RHIDE_COMPILE_$(PASCAL_TYPE)_FORCE)
-RHIDE_COMPILE_LINK_PASCAL_AUTOMAKE=$(RHIDE_COMPILE_LINK_$(PASCAL_TYPE)_AUTOMAKE)
-RHIDE_COMPILE_LINK_PASCAL=$(RHIDE_COMPILE_LINK_$(PASCAL_TYPE))
-RHIDE_FPC_LIBDIRS_$(RHIDE_OS)=/usr/local/lib /usr/lib /lib
-RHIDE_FPC_LIBDIRS_DJGPP=/usr/local/lib /usr/lib /lib
-RHIDE_FPC_LIBDIRS_DJGPP=$(DJDIR)/lib
-RHIDE_FPC_LIBDIRS=$(RHIDE_FPC_LIBDIRS_$(RHIDE_OS))
-RHIDE_FPC_LINK_FLAGS_$(RHIDE_OS)=$(RHIDE_LIBDIRS) $(addprefix\
-	-L,$(RHIDE_FPC_LIBDIRS))
-RHIDE_FPC_LINK_FLAGS_DJGPP=$(RHIDE_LIBDIRS) $(addprefix\
-	-L,$(RHIDE_FPC_LIBDIRS))
-RHIDE_FPC_LINK_FLAGS_DJGPP=-O coff-go32-exe $(RHIDE_LIBDIRS) $(addprefix\
-	-L,$(RHIDE_FPC_LIBDIRS))
-RHIDE_FPC_LINK_FLAGS=$(RHIDE_FPC_LINK_FLAGS_$(RHIDE_OS))
-RHIDE_COMPILE_LINK_FPC=echo 'separate linking for FPK is not supported.\
-	Please define a main source file in Project/Primary file.' 1>&2
-RHIDE_COMPILE_LINK_FPC_AUTOMAKE=$(RHIDE_FPC) -o$(OUTFILE) $(SOURCE_NAME)\
-	$(RHIDE_FPC_FLAGS) -E+
-RHIDE_COMPILE_ARCHIVE=$(RHIDE_AR) $(RHIDE_ARFLAGS) $(OUTFILE)\
-	$(ALL_OBJFILES)
-RHIDE_COMPILE_ADA=$(RHIDE_GCC) $(RHIDE_INCLUDES) $(C_DEBUG_FLAGS)\
-	$(C_OPT_FLAGS)  $(C_WARN_FLAGS) $(C_C_LANG_FLAGS) $(C_EXTRA_FLAGS)\
-	$(LOCAL_OPT)  $(C_ADA_LANG_FLAGS)  $(RHIDE_OS_CFLAGS) $(CPPFLAGS)\
-	$(CFLAGS) -c $(SOURCE_NAME) -o $(OUTFILE)
-RHIDE_ADA_BIND_FILE=$(addprefix _,$(setsuffix .c,$(OUTFILE)))
-RHIDE_COMPILE_LINK_ADA_BIND=$(RHIDE_GNATBIND) -o $(RHIDE_ADA_BIND_FILE)\
-	$(setsuffix .ali,$(OUTFILE))
-RHIDE_COMPILE_LINK_ADA_LINK=$(RHIDE_LD) $(RHIDE_LIBDIRS) $(C_EXTRA_FLAGS) -o\
-	$(OUTFILE)  $(RHIDE_ADA_BIND_FILE) $(OBJFILES) $(LIBRARIES)\
-	$(LDFLAGS)  $(RHIDE_LDFLAGS) $(RHIDE_LIBS)
-_RHIDE_COMPILE_LINK_ADA=$(RHIDE_COMPILE_LINK_ADA_BIND);\
-	$(RHIDE_COMPILE_LINK_ADA_LINK);   $(RHIDE_RM)\
-	$(RHIDE_ADA_BIND_FILE)
-RHIDE_COMPILE_LINK_ADA=gnatbl $(RHIDE_LIBDIRS) $(C_EXTRA_FLAGS) -o\
-	$(OUTFILE)  $(setsuffix .ali,$(OUTFILE)) $(LIBRARIES) $(LDFLAGS) \
-	$(RHIDE_LDFLAGS) $(RHIDE_LIBS)
-RHIDE_COMPILE.c.o=$(RHIDE_COMPILE_C)
-RHIDE_COMPILE.cc.o=$(RHIDE_COMPILE_CC)
-RHIDE_COMPILE.p.o=$(RHIDE_COMPILE_PASCAL)
-RHIDE_COMPILE.pas.o=$(RHIDE_COMPILE.p.o)
-RHIDE_COMPILE.pp.o=$(RHIDE_COMPILE_FPC)
-RHIDE_COMPILE.pas.s.GPC=$(subst -c $(SOURCE_NAME),-S\
-	$(SOURCE_NAME),$(RHIDE_COMPILE_GPC))
-RHIDE_COMPILE.pas.s.FPC=$(RHIDE_COMPILE_FPC) -a -s
-RHIDE_COMPILE.pas.s=$(RHIDE_COMPILE.pas.s.$(PASCAL_TYPE))
-RHIDE_COMPILE.f.o=$(RHIDE_COMPILE_FORTRAN)
-RHIDE_COMPILE.nsm.o=$(RHIDE_COMPILE_NASM)
-RHIDE_COMPILE.s.o=$(RHIDE_COMPILE_ASM)
-RHIDE_COMPILE.c.s=$(subst -c $(SOURCE_NAME),-S\
-	$(SOURCE_NAME),$(RHIDE_COMPILE_C))
-RHIDE_COMPILE.c.i=$(subst -c $(SOURCE_NAME),-E\
-	$(SOURCE_NAME),$(RHIDE_COMPILE_C))
-RHIDE_COMPILE.i.s=$(RHIDE_COMPILE.c.s)
-RHIDE_COMPILE.cc.s=$(subst -c $(SOURCE_NAME),-S\
-	$(SOURCE_NAME),$(RHIDE_COMPILE_CC))
-RHIDE_COMPILE.cc.ii=$(subst -c $(SOURCE_NAME),-E\
-	$(SOURCE_NAME),$(RHIDE_COMPILE_CC))
-RHIDE_COMPILE.ii.s=$(RHIDE_COMPILE.cc.s)
-RHIDE_COMPILE.cpp.o=$(RHIDE_COMPILE.cc.o)
-RHIDE_COMPILE.cxx.o=$(RHIDE_COMPILE.cc.o)
-RHIDE_COMPILE.C.o=$(RHIDE_COMPILE.cc.o)
-RHIDE_COMPILE.pas.o=$(RHIDE_COMPILE.p.o)
-RHIDE_COMPILE.for.o=$(RHIDE_COMPILE.f.o)
-RHIDE_COMPILE.F.o=$(RHIDE_COMPILE.f.o)
-RHIDE_COMPILE.fpp.o=$(RHIDE_COMPILE.f.o)
-RHIDE_COMPILE.asm.o=$(RHIDE_COMPILE.nsm.o)
-RHIDE_COMPILE.cpp.s=$(RHIDE_COMPILE.cc.s)
-RHIDE_COMPILE.cxx.s=$(RHIDE_COMPILE.cc.s)
-RHIDE_COMPILE.C.s=$(RHIDE_COMPILE.cc.s)
-RHIDE_COMPILE.cpp.ii=$(RHIDE_COMPILE.cc.ii)
-RHIDE_COMPILE.cxx.ii=$(RHIDE_COMPILE.cc.ii)
-RHIDE_COMPILE.C.ii=$(RHIDE_COMPILE.cc.ii)
-RHIDE_COMPILE.adb.o=$(RHIDE_COMPILE_ADA)
-RHIDE_FSDB=fsdb $(OUTFILE) $(addprefix -p ,$(SRC_DIRS)) $(PROG_ARGS)
-RHIDE_GDB=gdb $(OUTFILE) $(addprefix -d ,$(SRC_DIRS))
-DEFAULT_GREP_MASK=*.[cfhmnps]*
-RHIDE_GREP=grep -n $(prompt arguments for GREP,$(WUC) $(DEFAULT_GREP_MASK))
-RHIDE_GPROF=gprof $(OUTFILE)
-RHIDE_RLOG=$(shell rlog -R $(rlog_arg))
-RHIDE_CO=$(shell co -q $(co_arg))
-RHIDE_STANDARD_INCLUDES_$(RHIDE_OS)=$(addprefix /usr/,include include/sys\
-	include/g++ include/g++/std)
-RHIDE_STANDARD_INCLUDES_DJGPP=$(addprefix /usr/,include include/sys\
-	include/g++ include/g++/std)
-RHIDE_STANDARD_INCLUDES_DJGPP=$(addprefix $(DJDIR)/,include include/sys\
-	lang/cxx lang/cxx/std)
-RHIDE_STANDARD_INCLUDES=$(RHIDE_STANDARD_INCLUDES_$(RHIDE_OS))
-RHIDE_CONFIG_DIRS_$(RHIDE_OS)=/usr/local/share/rhide /usr/share/rhide \
-	/local/share/rhide /share/rhide
-RHIDE_CONFIG_DIRS_DJGPP=/usr/local/share/rhide /usr/share/rhide \
-	/local/share/rhide /share/rhide
-RHIDE_CONFIG_DIRS_DJGPP=$(DJDIR)/share/rhide
-RHIDE_CONFIG_DIRS_COMMON=$(RHIDE_CONFIG_DIRS_$(RHIDE_OS))\
-	$(RHIDE_BIN_DIR)/../share/rhide
-RHIDE_CONFIG_DIRS=. $(RHIDE_SHARE) $(GET_HOME)   $(RHIDE_CONFIG_DIRS_COMMON)\
-	 $(addsuffix /SET,$(RHIDE_CONFIG_DIRS_COMMON))  $(SET_FILES)
-RHIDE_PATH_SEPARATOR_$(RHIDE_OS)=:
-RHIDE_PATH_SEPARATOR_DJGPP=:
-RHIDE_PATH_SEPARATOR_DJGPP=;
-RHIDE_PATH_SEPARATOR=$(RHIDE_PATH_SEPARATOR_$(RHIDE_OS))
-RHIDE_EMPTY=
-RHIDE_SPACE=$(RHIDE_EMPTY) $(RHIDE_EMPTY)
-RHIDE_TYPED_LIBS_DJGPP.cc=stdcxx m
-RHIDE_TYPED_LIBS_DJGPP.cxx=stdcxx m
-RHIDE_TYPED_LIBS_DJGPP.cpp=stdcxx m
-RHIDE_TYPED_LIBS.f=g2c m
-%.o: %.c
-	$(RHIDE_COMPILE.c.o)
-%.o: %.i
-	$(RHIDE_COMPILE_C)
-%.o: %.cc
-	$(RHIDE_COMPILE.cc.o)
-%.o: %.cpp
-	$(RHIDE_COMPILE.cpp.o)
-%.o: %.cxx
-	$(RHIDE_COMPILE.cxx.o)
-%.o: %.C
-	$(RHIDE_COMPILE.C.o)
-%.o: %.ii
-	$(RHIDE_COMPILE_CC)
-%.o: %.s
-	$(RHIDE_COMPILE.s.o)
-%.o: %.S
-	$(RHIDE_COMPILE_ASM)
-%.s: %.c
-	$(RHIDE_COMPILE.c.s)
-%.s: %.i
-	$(RHIDE_COMPILE.i.s)
-%.s: %.cc
-	$(RHIDE_COMPILE.cc.s)
-%.s: %.cpp
-	$(RHIDE_COMPILE.cpp.s)
-%.s: %.cxx
-	$(RHIDE_COMPILE.cxx.s)
-%.s: %.C
-	$(RHIDE_COMPILE.C.s)
-%.o: %.pas
-	$(RHIDE_COMPILE.pas.o)
-%.o: %.p
-	$(RHIDE_COMPILE.p.o)
-%.o: %.pp
-	$(RHIDE_COMPILE.pp.o)
-%.s: %.pas
-	$(RHIDE_COMPILE.pas.s)
-%.o: %.m
-	$(RHIDE_COMPILE_OBJC)
-%.o: %.f
-	$(RHIDE_COMPILE.f.o)
-%.o: %.for
-	$(RHIDE_COMPILE.for.o)
-%.o: %.F
-	$(RHIDE_COMPILE.F.o)
-%.o: %.fpp
-	$(RHIDE_COMPILE.fpp.o)
-%.o: %.asm
-	$(RHIDE_COMPILE.asm.o)
-%.o: %.nsm
-	$(RHIDE_COMPILE.nsm.o)
-%.o: %.adb
-	$(RHIDE_COMPILE.adb.o)
-%.i: %.c
-	$(RHIDE_COMPILE.c.i)
-%.s: %.c
-	$(RHIDE_COMPILE.c.s)
-%.ii: %.cc
-	$(RHIDE_COMPILE.cc.ii)
-%.s: %.cc
-	$(RHIDE_COMPILE.cc.s)
-%.ii: %.cpp
-	$(RHIDE_COMPILE.cpp.ii)
-%.s: %.cpp
-	$(RHIDE_COMPILE.cpp.s)
-%.ii: %.cxx
-	$(RHIDE_COMPILE.cxx.ii)
-%.s: %.cxx
-	$(RHIDE_COMPILE.cxx.s)
-%.ii: %.C
-	$(RHIDE_COMPILE.C.ii)
-%.s: %.C
-	$(RHIDE_COMPILE.C.s)
-clean::
-	rm -f $(CLEAN_FILES)
-DEPS_0= main.o objgfx30.o ogBlit.o ogDisplay_VESA.o ogFont.o ogSprite.o 
-NO_LINK=
-LINK_FILES=$(filter-out $(NO_LINK),$(DEPS_0))
-objgfx.exe:: $(DEPS_0)
-	$(RHIDE_COMPILE_LINK)
-DEPS_1=main.cpp
-main.o:: $(DEPS_1)
-	$(RHIDE_COMPILE.cpp.o)
-DEPS_2=objgfx30.cpp
-objgfx30.o:: $(DEPS_2)
-	$(RHIDE_COMPILE.cpp.o)
-DEPS_3=ogBlit.cpp
-ogBlit.o:: $(DEPS_3)
-	$(RHIDE_COMPILE.cpp.o)
-DEPS_4=ogDisplay_VESA.cpp
-ogDisplay_VESA.o:: $(DEPS_4)
-	$(RHIDE_COMPILE.cpp.o)
-DEPS_5=ogFont.cpp
-ogFont.o:: $(DEPS_5)
-	$(RHIDE_COMPILE.cpp.o)
-DEPS_6=ogSprite.cpp
-ogSprite.o:: $(DEPS_6)
-	$(RHIDE_COMPILE.cpp.o)
-all:: objgfx.exe
-
diff --git a/lib/objgfx40/vWidget.cpp b/lib/objgfx40/vWidget.cpp
deleted file mode 100644
index a528250..0000000
--- a/lib/objgfx40/vWidget.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <objgfx40/vWidget.h>
-
-bool 
-vWidget::vSetActive(bool _active) {
-  bool result = active;
-  active = _active;
-  return result;
-} // vWidget::vSetActive
-
diff --git a/lib/objgfx40/vWindow.cpp b/lib/objgfx40/vWindow.cpp
deleted file mode 100644
index 5e4da43..0000000
--- a/lib/objgfx40/vWindow.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-extern "C" {
-  #include <stdio.h>
-  }
-#include <objgfx40/vWindow.h>
-
-vWindow::vWindow(void) {
-  realWindow = new ogSurface();
-  titleFont = new ogBitFont();
-  return;
-} // vWindow::vWindow
-
-bool
-vWindow::vCreate(void) {
-  if (realWindow->Create(400,400,OG_PIXFMT_16BPP) == false) return false;
-  if (Alias(*realWindow,                                       // window
-              0, 0,                                              // [x1, y1]
-              realWindow->GetMaxX(), realWindow->GetMaxY())  // [x2, y2]
-      == false) return false;
-  return true;
-} // vWindow::vCreate
-
-void
-vWindow::vSDECommand(uInt32 command) {
-  asm(
-      "int %0"
-     :
-     : "i" (0x80),"a" (40),"b" (command),"c" (realWindow)
-     );
-  return;
-} // vWindow::vSDECommand
-
-vWindow::~vWindow() {
-  delete realWindow;
-  delete titleFont;
-  return;
-} // vWindow::~vWindow
-
-/*
-ogSurface -> vWidget  -> vWindow
-   |            \------> vButton
-   |
-   |
-   -- ogDisplay_UbixOS -> SDE
-*/
diff --git a/lib/ubix/Makefile b/lib/ubix/Makefile
deleted file mode 100644
index f2bf4da..0000000
--- a/lib/ubix/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# Kernel Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Binary File Name
-BINARY = none 
-
-#Objects
-OBJS = sstart.o #startup.o
-
-CFLAGS = -m32 -fno-builtin -Wno-uninitialized -O2 -fno-strict-aliasing -pipe -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wcast-align -Wunused-parameter -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls
-
-
-# Make the Binary
-$(BINARY) : $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -m32 -Wall -fomit-frame-pointer -O -I../libc/include -c -o $@ $<
- 
-.cc.s:
-	$(CXX)  -m32 -Wall -fomit-frame-pointer -O -I../libc/include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -m32 -Wall -O -I../libc/include -c -o $@ $<
- 
-.c.s:
-	$(CC)  -m32 -Wall -fomit-frame-pointer -O -I../libc/include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -m32 -Wall -fomit-frame-pointer -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(BINARY)
diff --git a/lib/ubix/sstart.c b/lib/ubix/sstart.c
deleted file mode 100644
index 0b944eb..0000000
--- a/lib/ubix/sstart.c
+++ /dev/null
@@ -1,34 +0,0 @@
-char **environ;
-const char *__progname = "";
-
-void _start(char *ap, ...) {
-  int argc;
-  char **argv;
-  char **env;
-  const char *s;
-
-  argv = &ap;
-
-  argc = *(long *)(void *)(argv - 1);
-  env = argv + argc + 1;
-  environ = env;
-
-  if (env[0] != 0) 
-  printf("env[0]: 0x%X\n",env[0]);
-
-  /*
-  printf("(&ap: 0x%X)\n",&ap);
-  printf("(argv[0]: 0x%X\n",argv[0]);
-  printf("(argv[-1]: 0x%X:0x%X)\n",argv[-1],*(argv - 1));
-  */
-
-  if (argc > 0 && argv[0] != 0x0) {
-     __progname = argv[0];
-     for (s = __progname; *s != '\0'; s++)
-       if (*s == '/')
-    __progname = s + 1;
-    }
-
-  exit(main(argc, argv, env));
-
-  }
diff --git a/lib/ubix/startup.S b/lib/ubix/startup.S
deleted file mode 100644
index 107e9f4..0000000
--- a/lib/ubix/startup.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: startup.S 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-.globl _start,__progname,environ
-.text
-.code32
-_start:
-  push  %ebp
-  mov   %esp,%ebp
-  sub   $0x8,%esp
-  add   $0xfffffff4,%esp
-  add   $0xfffffff8,%esp
-  pushl 0xc(%ebp)
-  pushl 0x8(%ebp)
-  call  main
-  push  %eax
-  call  exit
-.data
-__progname:
-  .long 0
-environ:
-  .long 0
-
-/***
- $Log: startup.S,v $
- Revision 1.2  2006/10/26 23:54:35  reddawg
- Adding Libc
-
- Revision 1.1.1.1  2006/06/01 12:46:10  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:28  reddawg
- no message
-
- Revision 1.3  2004/08/09 12:58:05  reddawg
- let me know when you got the surce
-
- Revision 1.2  2004/06/18 14:15:47  reddawg
- This may hopefully remove some segfault issues that we experience.
-
- Revision 1.1  2004/06/18 13:21:34  reddawg
- Making this more compiler safe
-
- END
- ***/
diff --git a/lib/ubix/static.c b/lib/ubix/static.c
deleted file mode 100644
index c9f360a..0000000
--- a/lib/ubix/static.c
+++ /dev/null
@@ -1,15 +0,0 @@
-int static_constructors(void) {
-    extern void (* __ctor_list)();
-    void (** l_ctor)() = &__ctor_list;
-    int l_ctorCount = *(int *)l_ctor;
-    
-    l_ctor++;
-    while(l_ctorCount)
-    {
-	(*l_ctor)();
-	l_ctorCount--;
-	l_ctor++;
-    }
-
-    return 0;
-  }
diff --git a/lib/ubix_api/Makefile b/lib/ubix_api/Makefile
deleted file mode 100644
index 92ac8d4..0000000
--- a/lib/ubix_api/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: Makefile 121 2016-01-14 03:18:20Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Objects
-OBJS =
-
-#Sub Sections
-SUBS = ./test/*.o
-
-#Output
-OUTPUT = ubix_api.so
-
-lib.so: $(OBJS)
-	(cd test;make)
-	$(CC) -m32 -nostdlib -shared -Wl,-soname,ubix_api.so -o ${BUILD_DIR}/lib/$(OUTPUT) $(OBJS) $(SUBS)
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -Wall -nostdinc -O -I./include -c -o $@ $<
- 
-.cc.s:
-	$(CXX)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -nostdinc -O -I./include -c $<
-
-.c.s:
-	$(CC)  -Wall -nostdinc -O -I./include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall -nostdinc -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) ${BUILD_DIR}/$(OUTPUT)
-	(cd test;make clean)
diff --git a/lib/ubix_api/test/Makefile b/lib/ubix_api/test/Makefile
deleted file mode 100644
index 9e9c4e0..0000000
--- a/lib/ubix_api/test/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#Objects
-OBJS = test.o
-
-#Output
-OUTPUT = ubix_api.so
-
-$(OUTPUT): $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -c -o $@ $<
- 
-.cc.s:
-	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -I../../../include -c $<
-
-.c.s:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT)
diff --git a/lib/ubix_api/test/test.c b/lib/ubix_api/test/test.c
deleted file mode 100644
index cd8b111..0000000
--- a/lib/ubix_api/test/test.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int ubix_test() {
-  return(0x69);
-  }
diff --git a/lib/views/sunlight/Makefile b/lib/views/sunlight/Makefile
deleted file mode 100644
index 54232ae..0000000
--- a/lib/views/sunlight/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# Kernel Makefile (C) 2002 The UbixOS Project
-
-Makefile.incl
-
-#Objects
-OBJS = sStyle.o sTypes.o vContext.o vButton.o vMenuBar.o vView.o vCanvas.o vDesktop.o vTitleTab.o
-
-#Include
-INCLUDE = -I./ -I../../..lib/libc/include -I../../../lib/libcpp/include -I../../objgfx40/objgfx40 -I./include
-
-#Output
-OUTPUT = views.so
-
-$(OUTPUT): $(OBJS)
-	$(CXX) -nostdlib -shared -Wl,-soname,$(OUTPUT) -o $(OUTPUT) $(OBJS)
-
-# Compile the source files
-.cpp.o:
-	$(CXX)  -Wall -g -fno-inline -nostdlib -fno-exceptions -DNOBOOL $(INCLUDE) -c -o $@ $<
- 
-.cc.o:
-	$(CXX)  -Wall -nostdlib -fomit-frame-pointer -O -I./include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -O -I../../../lib/libc/include -c -o $@ $<
- 
-.c.s:
-	$(CC)  -Wall -fomit-frame-pointer -O -I../../../lib/libc/include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall -fomit-frame-pointer -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(OUTPUT) *.core
diff --git a/lib/views/sunlight/include/sStyle.h b/lib/views/sunlight/include/sStyle.h
deleted file mode 100644
index 18f15d0..0000000
--- a/lib/views/sunlight/include/sStyle.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef SSTYLE_H
-#define SSTYLE_H
-
-class sStyle {
-  protected:
-  public:
-  virtual ~sStyle(void);
-}; // sStyle
-#endif
diff --git a/lib/views/sunlight/include/sTypes.h b/lib/views/sunlight/include/sTypes.h
deleted file mode 100644
index e9c5d31..0000000
--- a/lib/views/sunlight/include/sTypes.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef STYPES_H
-#define STYPES_H
- 
-#include <string>
-#include <sStyle.h>
-#include <ogTypes.h>
-#include <objgfx40.h>
-#include <ogPixelFmt.h>
-
-class sString : public sStyle, public std::string {
- public:
-           sString(void) : std::string("") { };
-           sString(const std::string s) : std::string(s) { };
-  virtual ~sString(void) { };
-}; // sString
-
-class sBGColor : public sStyle {
- public:
-  ogRGBA8 colors[4];
-           sBGColor(void);
-  virtual ~sBGColor(void);
-}; //  sBGColor
-
-class sRGB8Color : public sStyle, public ogRGB8 {
- public:
-           sRGB8Color(void) { red = green = blue = 0; }
-           sRGB8Color(uInt8, uInt8, uInt8);
-  virtual ~sRGB8Color(void) { };
-}; // sRGB8Color
-
-class sRGBA8Color : public sStyle, public ogRGBA8 {
- public:
-           sRGBA8Color(void) { red = green = blue = alpha = 0; }
-           sRGBA8Color(uInt8, uInt8, uInt8, uInt8);
-  virtual ~sRGBA8Color(void) { };
-}; // sRGBA8Color
-
-class sSize : public sStyle {
- public:
-   uInt32 size;
-   uInt32 width;
-   uInt32 height;
-           sSize(void) { size = width = height = 0; }
-           sSize(uInt32 _size) { size = _size; width = height = 0; }
-           sSize(uInt32, uInt32);
-           sSize(uInt32, uInt32, uInt32);
-  virtual ~sSize(void); 
-}; // sSize
-
-class sPixelFormat : public sStyle, public ogPixelFmt {
- public:
-//            sPixelFormat(void);
-            sPixelFormat(uInt8, 
-                         uInt8, uInt8, uInt8, uInt8, 
-                         uInt8, uInt8, uInt8, uInt8);
-  virtual  ~sPixelFormat(void) { };
-}; // sPixelFormat
-
-#endif
diff --git a/lib/views/sunlight/include/vButton.h b/lib/views/sunlight/include/vButton.h
deleted file mode 100644
index 1e2ffac..0000000
--- a/lib/views/sunlight/include/vButton.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef VBUTTON_H
-#define VBUTTON_H
-
-#include "vContext.h"
-
-class vButton : public vContext {
- protected:
- public:
-               vButton(vContext *);
-  virtual bool vCreate(void);
-  virtual     ~vButton();
-}; // vButton
-#endif
diff --git a/lib/views/sunlight/include/vCanvas.h b/lib/views/sunlight/include/vCanvas.h
deleted file mode 100644
index f6ce306..0000000
--- a/lib/views/sunlight/include/vCanvas.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef VCANVAS_H
-#define VCANVAS_H
-
-#include <vContext.h>
-
-class vCanvas : public vContext {
- protected:
- public: 
-         vCanvas(vContext *);
- virtual ~vCanvas(void);
-}; // vCanvas
-#endif
diff --git a/lib/views/sunlight/include/vContext.h b/lib/views/sunlight/include/vContext.h
deleted file mode 100644
index f3c6f93..0000000
--- a/lib/views/sunlight/include/vContext.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef VCONTEXT_H
-#define VCONTEXT_H
-
-#include <map>
-#include <list>
-#include <string>
-#include <objgfx40.h>
-#include <sStyle.h>
-
-class vContext : public ogSurface {
- protected:
-  std::map<const std::string, sStyle *> styles;
-  std::list<vContext *> cContexts;   // child contexts
-  vContext         * pContext;         // parent context
-  
-  ogSurface        * realView;
-  int32              curX, curY;
-  uInt32             width, height;
-  bool               attached;
- public:
-                     vContext(vContext *);
-  virtual vContext * vAttach(vContext *);
-  virtual bool       vCreate(void) = 0;
-  virtual void       vDeleteAllStyles(void);
-  virtual bool       vDeleteStyle(const std::string);
-  virtual void       vDraw(void) = 0;
-  virtual vContext * vDetach(vContext *);
-  virtual uInt32     vGetHeight(void) { return height; };
-  virtual sStyle   * vGetStyle(const std::string);
-  virtual uInt32     vGetWidth(void) { return width; };
-  virtual bool       vIsAttached(void) { return attached; }
-  virtual void       vSetPos(int32, int32);
-  virtual void       vSetSize(uInt32, uInt32);
-  virtual void       vSetStyle(const std::string, sStyle *);
-  virtual           ~vContext();
-
-}; // vContext
-
-#endif
diff --git a/lib/views/sunlight/include/vDesktop.h b/lib/views/sunlight/include/vDesktop.h
deleted file mode 100644
index 18aac66..0000000
--- a/lib/views/sunlight/include/vDesktop.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef VDESKTOP_H
-#define VDESKTOP_H
-
-#include <vContext.h>
-
-class vDesktop : public vContext {
- protected:
- public:
-          vDesktop(vContext *);
-  virtual void     DeleteAllStyles(void);
-  virtual bool     DeleteStyle(const std::string);
-  virtual sStyle * GetStyle(const std::string);
-  virtual void     SetPos(int32, int32);
-  virtual void     SetStyle(const std::string, sStyle *);
-
-  virtual ~vDesktop(void);
-}; // vDesktop
-#endif
diff --git a/lib/views/sunlight/include/vMenuBar.h b/lib/views/sunlight/include/vMenuBar.h
deleted file mode 100644
index 6e834f7..0000000
--- a/lib/views/sunlight/include/vMenuBar.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef VMENUBAR_H
-#define VMENUBAR_H
-
-#include <vContext.h>
-
-class vMenuBar : public vContext {
- protected:
- public:
-           vMenuBar(vContext *);
-  virtual  ~vMenuBar();
-}; // vMenuBar
-
-#endif
diff --git a/lib/views/sunlight/include/vTitleTab.h b/lib/views/sunlight/include/vTitleTab.h
deleted file mode 100644
index 9ec8ad2..0000000
--- a/lib/views/sunlight/include/vTitleTab.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef VTITLETAB_H
-#define VTITLETAB_H
-
-#include <string>
-#include <vContext.h>
-#include <ogFont.h>
-
-class vTitleTab : public vContext {
- protected:
-   ogBitFont * font;
-   std::string title;
- public:
-               vTitleTab(vContext *);
-  virtual void vDraw(void);
-  void         vSetTitle(const std::string);
-  virtual     ~vTitleTab(void);
-}; // vTitleTab
-
-#endif
diff --git a/lib/views/sunlight/include/vView.h b/lib/views/sunlight/include/vView.h
deleted file mode 100644
index ce48f85..0000000
--- a/lib/views/sunlight/include/vView.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef VVIEW_H
-#define VVIEW_H
-
-#include <vContext.h>
-#include <vTitleTab.h>
-#include <vCanvas.h>
-
-class vView : public vTitleTab, public vCanvas {
- protected:
- public:
-           vView(vContext *);
-  virtual  ~vView(void);
-}; // vView
-
-#endif
diff --git a/lib/views/sunlight/sStyle.cpp b/lib/views/sunlight/sStyle.cpp
deleted file mode 100644
index a3e0645..0000000
--- a/lib/views/sunlight/sStyle.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <sStyle.h>
-
-sStyle::~sStyle(void) {
-  return;
-} // sStyle::~sStyle
diff --git a/lib/views/sunlight/sTypes.cpp b/lib/views/sunlight/sTypes.cpp
deleted file mode 100644
index f14338a..0000000
--- a/lib/views/sunlight/sTypes.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <sStyle.h>
-#include <sTypes.h>
-#include <objgfx40.h>
-#include <string>
-
-sBGColor::sBGColor(void) {
-  memset(colors, 0, sizeof(colors));
-  return;
-} // sBGColor::sBGColor
-
-sBGColor::~sBGColor(void) {
-  return;
-} // sBGColor::~sBGColor
-
-sRGB8Color::sRGB8Color(uInt8 r, uInt8 g, uInt8 b) {
-  red   = r;
-  green = g;
-  blue  = b;
-  return;
-} // sRGB8Color::sRGB8Color
-
-sRGBA8Color::sRGBA8Color(uInt8 r, uInt8 g, uInt8 b, uInt8 a) {
-  red   = r;
-  green = g;
-  blue  = b;
-  alpha = a;
-  return;
-} // sRGBA8Color::sRGBAColor
-
-sSize::sSize(uInt32 w, uInt32 h) {
-  size   = 0;
-  width  = w;
-  height = h;
-  return;
-} // sSize::sSize
-
-sSize::sSize(uInt32 s, uInt32 w, uInt32 h) {
-  size   = s;
-  width  = w;
-  height = h;
-  return;
-} // sSize::sSize
-
-sSize::~sSize(void) {
-  return;
-}
-
-sPixelFormat::sPixelFormat(uInt8 bitsPerPix,
-                           uInt8 RFP, uInt8 GFP, uInt8 BFP, uInt8 AFP,
-                           uInt8 RMS, uInt8 GMS, uInt8 BMS, uInt8 AMS) 
-          : ogPixelFmt( bitsPerPix, RFP, GFP, BFP, AFP, RMS, GMS, BMS, AMS) {
-  return;
-} // sPixelFormat::sPixelFormat
diff --git a/lib/views/sunlight/vButton.cpp b/lib/views/sunlight/vButton.cpp
deleted file mode 100644
index 3021e46..0000000
--- a/lib/views/sunlight/vButton.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <vContext.h>
-#include <vButton.h>
-#include <stdlib.h>
-#include <objgfx40.h>
-#include <sTypes.h>
-
-#include <iostream>
-
-vButton::vButton(vContext * parent) : vContext(parent) { 
-  return;
-} // vButton::vButton
-
-bool
-vButton::vCreate(void) {
-  bool result = false;
-  sPixelFormat * pixFmt;
-  sSize * borderSize;
-//  ogRGBA8 colour;
-
-  do {
-     borderSize = dynamic_cast<sSize *>(vGetStyle("default.button.border.size"));
-     if (borderSize == NULL) break;
-
-     pixFmt = dynamic_cast<sPixelFormat *>(vGetStyle("default.desktop.pixelformat"));
-     if (pixFmt == NULL) break;
-
-     if (!realView->ogCreate(vGetWidth()+borderSize->size, 
-                             vGetHeight()+borderSize->size,
-                             *pixFmt)) break;
-                             
-     if (!ogAlias(*realView, 
-                  borderSize->size, 
-                  borderSize->size,
-                  realView->ogGetMaxX()-borderSize->size, 
-                  realView->ogGetMaxY()-borderSize->size)) break;
-                     
-     result = true;
-  } while (false);
-
-  return result;
-} // vButton::vCreate
-
-vButton::~vButton(void) {
-  return;
-} // vButton::~vButton
diff --git a/lib/views/sunlight/vCanvas.cpp b/lib/views/sunlight/vCanvas.cpp
deleted file mode 100644
index c967aac..0000000
--- a/lib/views/sunlight/vCanvas.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <vContext.h>
-#include <vCanvas.h>
-
-vCanvas::vCanvas(vContext * parent) : vContext(parent) {
-  return;
-}
-
-vCanvas::~vCanvas(void) {
-  return;
-}
diff --git a/lib/views/sunlight/vContext.cpp b/lib/views/sunlight/vContext.cpp
deleted file mode 100644
index 089a0d1..0000000
--- a/lib/views/sunlight/vContext.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-#include <string>
-#include <stdlib.h>
-#include <objgfx40.h>
-#include <vContext.h>
-#include <sStyle.h>
-#include <sTypes.h>
-#include <map.h>
-
-vContext::vContext(vContext * parent) {
-  pContext = parent;
-  realView = new ogSurface();
-  curX = curY = width = height = 0;
-  attached = false;
-  return;
-} // vContext::vContext
-
-vContext *
-vContext::vAttach(vContext * context) {
-  /*
-   * vContext::vAttach()
-   * Accepts a vContext as a parameter and attaches it to the 
-   * current child context list. 
-   * Returns the child context pointer
-   */
-  cContexts.push_back(context);
-  return context;
-} // vContext::vAttach
-
-void
-vContext::vDeleteAllStyles(void) {
-  /*
-   * vContext::vDeleteAllStyle()
-   * Deletes all style entries in this node of the style tree.
-   */
-
-  if (styles.empty()) return;
-
-  // create a map<> iterator that points to the beginning style
-  map<const std::string, sStyle *>::iterator curStyle = styles.begin();
-  
-  // loop through the styles, deleting them and calling the style object's
-  // destructor
-
-  while (curStyle != styles.end()) {
-    std::string str = curStyle->first;
-    sStyle * tmpStyle = dynamic_cast<sStyle *>(styles[str]);
-// if (tmpStyle != NULL) cout << "deleting styles[\"" << str << "\"]" << endl;
-    styles.erase(curStyle);
-    delete tmpStyle;
-    ++curStyle;
-  } // while
-
-  return;
-} // vContext::vDeleteAllStyles
-
-bool
-vContext::vDeleteStyle(const std::string styleKey) {
-  /*
-   * vContext::vDeleteStyle()
-   * returns true if style existed and was deleted
-   * returns false if style didn't exist (or wasn't deleted)
-   */
-
-  sStyle * tmpStyle = styles[styleKey];
-  styles.erase(styleKey);
-  delete tmpStyle;
-  return (tmpStyle != NULL);
-} // vContext::vDeleteStyle
-
-vContext *
-vContext::vDetach(vContext * context) {
-  cContexts.remove(context);
-  return context;
-} // vContext::vDetach
-
-/* 
- * void
- * vContext::Draw(void) {
- *   return;
- * } // vContext::Draw
- */
-
-sStyle *
-vContext::vGetStyle(const std::string styleKey) {
-  /* 
-   * GetStyle()
-   * retreives a style out of the style map using the styleKey string
-   * If no style is present in this node, check the parent
-   */
-  sStyle * tmpStyle = styles[styleKey];
-
-  if ((tmpStyle == NULL) && (pContext != NULL)) {
-    return pContext->vGetStyle(styleKey);
-  } // if
-
-  return tmpStyle;
-} // vContext::vGetStyle
-
-void
-vContext::vSetPos(int32 newX, int32 newY) {
-  /*
-   * vContext::SetPos()
-   * Sets new position relative to parent's upper left corner
-   */
-
-  // I really should detach from the parent here
-  if ((attached) && (pContext != NULL)) pContext->vDetach(this);
-  curX = newX;
-  curY = newY;
-  // and reattach to parent here
-  if ((attached) && (pContext != NULL)) pContext->vAttach(this);
-  return;
-} // vContext::vSetPos
-
-void
-vContext::vSetSize(uInt32 newWidth, uInt32 newHeight) {
-//  if ((attached) && (pContext != NULL)) pContext->vDetach(this);
-  width = newWidth;
-  height = newHeight; 
-//  if ((attached) && (pContext != NULL)) pContext->vAttach(this);
-} // vContext::vSetSize
-
-void
-vContext::vSetStyle(const std::string styleKey, sStyle * style) {
-  // I probably should check to see if a style exists before setting it
-  
-  // if the style is null, then just exit out without setting it 
-  if (style == NULL) return;
-
-  // set the new style
-  styles[styleKey] = style;
-} // vContext::vSetStyle
-
-vContext::~vContext(void) {
-  delete realView;
-  realView = pContext = NULL;
-  curX = curY = width = height = 0;
-
-  vDeleteAllStyles();
-
-  return;
-} // vContext::~vContext
diff --git a/lib/views/sunlight/vDesktop.cpp b/lib/views/sunlight/vDesktop.cpp
deleted file mode 100644
index b48181e..0000000
--- a/lib/views/sunlight/vDesktop.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <vContext.h>
-#include <vDesktop.h>
-
-vDesktop::vDesktop(vContext * parent) : vContext(parent) {
-  return;
-} // vDesktop::vDesktop
-
-void
-vDesktop::DeleteAllStyles(void) {  
-  return;
-}
-
-bool
-vDesktop::DeleteStyle(const std::string styleName) {
-  return false;
-}
-
-sStyle * 
-vDesktop::GetStyle(const std::string styleName) {
-  /*
-   * vDesktop::GetStyle
-   * This will have to send a message to the Launcher to get the actual
-   * style. For now use NULL
-   */
-  return NULL; 
-} // vDesktop::GetStyle
-
-void
-vDesktop::SetPos(int32 newX, int32 newY) {
-  return;
-} // vDesktop::SetPos
-
-void 
-vDesktop::SetStyle(const std::string nameStyle, sStyle * style) {
-  return;
-} // vDesktop::SetStyle
-
-vDesktop::~vDesktop(void) {
-  return;
-} // vDesktop::~vDesktop
diff --git a/lib/views/sunlight/vMenuBar.cpp b/lib/views/sunlight/vMenuBar.cpp
deleted file mode 100644
index a4e24f4..0000000
--- a/lib/views/sunlight/vMenuBar.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <vContext.h>
-#include <vMenuBar.h>
-
-vMenuBar::vMenuBar(vContext * parent) : vContext(parent) {
-  return;
-} // vMenuBar::vMenuBar
-
-vMenuBar::~vMenuBar(void) {
-  return;
-} // vMenuBar::~vMenuBar
diff --git a/lib/views/sunlight/vTitleTab.cpp b/lib/views/sunlight/vTitleTab.cpp
deleted file mode 100644
index c342ec8..0000000
--- a/lib/views/sunlight/vTitleTab.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <string>
-#include <vContext.h>
-#include <vTitleTab.h>
-#include <sTypes.h>
-
-vTitleTab::vTitleTab(vContext * parent) : vContext(parent) {
-  // Allocate a new font
-  font = new ogBitFont();
-
-  // Set the title to nothing
-  title = "";
-
-  // Retrieve the default font filename out of the style tree
-  sString * fontFileName = dynamic_cast<sString *>(vGetStyle("default.font.filename"));
-
-  // Attempt to load the font
-  if (fontFileName != NULL) {
-    // I should check for failure here, although everything fails quietly...
-    // so even if it does fail it won't matter much
-    font->Load(fontFileName->c_str(), 0);
-  }
-
-  sRGBA8Color * color = dynamic_cast<sRGBA8Color *>(vGetStyle("default.font.color.background"));
-  if (NULL != color) 
-    font->SetBGColor(color->red, color->blue, color->green, color->alpha);
-
-  color = dynamic_cast<sRGBA8Color *>(vGetStyle("default.font.color.foreground"));
-  if (color != NULL) 
-    font->SetFGColor(color->red, color->blue, color->green, color->alpha);
-
-  return;
-} // vTitleTab::vTitleTab
-
-void
-vTitleTab::vDraw(void) {
-  ogPoint2d points[4];
-  sBGColor * BGColor = dynamic_cast<sBGColor *>(vGetStyle("default.title.color.passive"));
-  if (BGColor == NULL) return;
- 
-  points[0].x = points[0].y = points[1].y = points[3].x = 0;
-  points[1].x = points[2].x = ogGetMaxX()+1;
-  points[2].y = points[3].y = ogGetMaxY();
-
-  ogFillGouraudPolygon(4, points, BGColor->colors);
-  font->JustifyText(*this, centerText, centerText, title.c_str());
-  return;
-} // vTitleTab::vDraw()
-
-void
-vTitleTab::vSetTitle(const std::string newTitle) {
-  title = newTitle;
-  return;
-} // vTitleTab::vSetTitle
-
-vTitleTab::~vTitleTab(void) {
-  delete font;
-  font = NULL;
-  return;
-} // vTitleTab::~vTitleTab
diff --git a/lib/views/sunlight/vView.cpp b/lib/views/sunlight/vView.cpp
deleted file mode 100644
index 34b586b..0000000
--- a/lib/views/sunlight/vView.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <vContext.h>
-#include <vView.h>
-#include <sStyle.h>
-
-vView::vView(vContext * parent) : vTitleTab(parent), vCanvas(parent) {
-  return;
-} // vView::vView
-
-vView::~vView(void) {
-  return;
-}
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
deleted file mode 100644
index db85020..0000000
--- a/libexec/ld.elf_so/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: Makefile 119 2016-01-14 03:06:36Z reddawg $
-# Application Makefile (C) 2002-2004 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Linker
-LD = ld
-
-#Binary File Name
-OUTPUT = ld.so
-
-#Delete Program
-REMOVE = rm -f
-
-#Objects
-OBJS = main.o findlibrary.o findfunc.o addlibrary.o entry.o
-
-# Link The Binary
-$(OUTPUT) : $(OBJS)
-	$(CC) -m32 -nostdlib -shared -Wl,-soname,$(OUTPUT) -Wl,-m,elf_i386_fbsd  -e _ld -o ../../build/libexec/$(OUTPUT) $(OBJS) $(LIBRARIES) $(SUBS)
-#	strip $(OUTPUT)
-
-# Compile the source files
-.cpp.o:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-.cc.o:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-.cc.s:
-	$(CXX)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -c -o $@ $<
- 
-.c.s:
-	$(CC)  -Wall -O $(CFLAGS) $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $<
- 
-# Clean Up The junk
-clean:
-	$(REMOVE) $(OBJS) ../../build/bin/$(OUTPUT)
diff --git a/libexec/ld.elf_so/addlibrary.c b/libexec/ld.elf_so/addlibrary.c
deleted file mode 100644
index e527520..0000000
--- a/libexec/ld.elf_so/addlibrary.c
+++ /dev/null
@@ -1,161 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "ld.h"
-
-ldLibrary *ldAddLibrary(const char *lib) {
-  int        i        = 0x0;
-  int        x        = 0x0;
-  int        rel      = 0x0;
-  uInt32    *reMap    = 0x0;
-  char      *newLoc   = 0x0;
-  FILE      *linkerFd = 0x0;
-  char       tmpFile[1024];
-  ldLibrary *tmpLib   = 0x0;
-
-  if ((tmpLib = (ldLibrary *)malloc(sizeof(ldLibrary))) == 0x0) {
-    printf("malloc failed: tmpLib\n");
-    exit(0x1);
-    }
-  if (tmpLib->output == 0x0) {
-    /* Hack because we have no ld path set */
-    sprintf(tmpFile,"sys:/lib/%s",lib);
-    linkerFd = fopen(tmpFile,"rb");
-    if (linkerFd->fd == 0x0) {
-      printf("Could not open library: %s\n",lib);
-      exit(-1);
-      }
-    //if ((tmpLib->output = (char *)malloc((linkerFd->size+0x4000))) == 0x0) {
-    //if ((tmpLib->output = (char *)malloc(0x111000)) == 0x0) {
-    if ((tmpLib->output = (char *)getPage((0x111000/0x1000),2)) == 0x0) {
-      printf("malloc failed: tmpLib->output\n");
-      exit(0x1);
-      }
-    sprintf(tmpLib->name,lib);
-    }
-  printf("Base: {0x%X}\n",tmpLib->output);
-  if (tmpLib->linkerHeader == 0x0) {
-    fseek(linkerFd,0x0,0x0);
-    if ((tmpLib->linkerHeader = (elfHeader *)malloc(sizeof(elfHeader))) == 0x0) {
-      printf("malloc failed: tmpLib->linkerHeader\n");
-      exit(0x1);
-      }
-    fread(tmpLib->linkerHeader,sizeof(elfHeader),1,linkerFd);
-    }
-  if (tmpLib->linkerProgramHeader == 0x0) {
-    if ((tmpLib->linkerProgramHeader = (elfProgramHeader *)malloc(sizeof(elfProgramHeader)*tmpLib->linkerHeader->ePhnum)) == 0x0) {
-      printf("malloc failed: tmpLib->linkerProgramHeader\n");
-      exit(0x1);
-      }
-    fseek(linkerFd,tmpLib->linkerHeader->ePhoff,0);
-    fread(tmpLib->linkerProgramHeader,sizeof(elfProgramHeader),tmpLib->linkerHeader->ePhnum,linkerFd);
-
-    for (i=0;i<tmpLib->linkerHeader->ePhnum;i++) {
-      switch (tmpLib->linkerProgramHeader[i].phType) {
-        case PT_LOAD:
-        case PT_DYNAMIC:
-          newLoc = (char *)tmpLib->linkerProgramHeader[i].phVaddr + (uInt32)tmpLib->output;
-          fseek(linkerFd,tmpLib->linkerProgramHeader[i].phOffset,0);
-          fread(newLoc,tmpLib->linkerProgramHeader[i].phFilesz,1,linkerFd);
-          break;
-	case PT_GNU_STACK:
-        	/* Tells us if the stack should be executable.  Failsafe to 
-		executable until we add checking */
-          printf("NOT DEF1\n");
-      	  break;
-      	case PT_PAX_FLAGS:
-      		/* Not sure... */
-          printf("NOT DEF2\n");
-	  break;
-        default:
-          printf("Unhandled Header (ld.so) : %08x\n", tmpLib->linkerProgramHeader[i].phType);
-          break;
-        }
-      }
-    }
-
-  if (tmpLib->linkerSectionHeader == 0x0) {
-    if ((tmpLib->linkerSectionHeader = (elfSectionHeader *)malloc(sizeof(elfSectionHeader)*tmpLib->linkerHeader->eShnum)) == 0x0) {
-      printf("malloc failed: tmpLib->linkerSectionHeader\n");
-      exit(0x1);
-      }
-    fseek(linkerFd,tmpLib->linkerHeader->eShoff,0);
-    fread(tmpLib->linkerSectionHeader,sizeof(elfSectionHeader),tmpLib->linkerHeader->eShnum,linkerFd);
-
-  if (tmpLib->linkerShStr == 0x0) {
-    tmpLib->linkerShStr = (char *)malloc(tmpLib->linkerSectionHeader[tmpLib->linkerHeader->eShstrndx].shSize);
-    fseek(linkerFd,tmpLib->linkerSectionHeader[tmpLib->linkerHeader->eShstrndx].shOffset,0);
-    fread(tmpLib->linkerShStr,tmpLib->linkerSectionHeader[tmpLib->linkerHeader->eShstrndx].shSize,1,linkerFd);
-    }
-
-  for (i = 0x0;i < tmpLib->linkerHeader->eShnum;i++) {
-    switch (tmpLib->linkerSectionHeader[i].shType) {
-     case 3:
-        if (!strcmp((tmpLib->linkerShStr + tmpLib->linkerSectionHeader[i].shName),".dynstr")) {
-          if (tmpLib->linkerDynStr == 0x0) {
-            if ((tmpLib->linkerDynStr = (char *)malloc(tmpLib->linkerSectionHeader[i].shSize)) == 0x0) {
-	      printf("malloc failed: tmpLib->linkerDynStr\n");
-	      exit(0x1);
-	      }
-            fseek(linkerFd,tmpLib->linkerSectionHeader[i].shOffset,0);
-            fread(tmpLib->linkerDynStr,tmpLib->linkerSectionHeader[i].shSize,1,linkerFd);
-            }
-          }
-        break;
-      case 9:
-        if ((tmpLib->linkerElfRel = (elfPltInfo *)malloc(tmpLib->linkerSectionHeader[i].shSize)) == 0x0) {
-	  printf("malloc failed: tmpLib->linkerElfRel\n");
-	  exit(0x1);
-	  }
-        fseek(linkerFd,tmpLib->linkerSectionHeader[i].shOffset,0x0);
-        fread(tmpLib->linkerElfRel,tmpLib->linkerSectionHeader[i].shSize,1,linkerFd);
-
-        for (x=0x0;x<tmpLib->linkerSectionHeader[i].shSize/sizeof(elfPltInfo);x++) {
-          rel = ELF32_R_SYM(tmpLib->linkerElfRel[x].pltInfo);
-          reMap = (uInt32 *)((uInt32)tmpLib->output + tmpLib->linkerElfRel[x].pltOffset);
-          switch (ELF32_R_TYPE(tmpLib->linkerElfRel[x].pltInfo)) {
-            case R_386_32:
-              *reMap += ((uInt32)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue);
-              //printf("[0x%X]",*reMap);
-              break;
-            case R_386_PC32:
-              *reMap += ((uInt32)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue) - (uInt32)reMap;
-              break;
-            case R_386_RELATIVE:
-              *reMap += (uInt32)tmpLib->output;
-              break;
-            case R_386_JMP_SLOT:
-              *reMap += (uInt32)tmpLib->output;
-              break;
-            case R_386_GLOB_DAT:
-              *reMap = ((uInt32)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue);
-              break;
-            default:
-              printf("Unhandled sym: [0x%X]\n", ELF32_R_TYPE(tmpLib->linkerElfRel[x].pltInfo));
-              while (1);
-              break;
-            }
-          }
-        free(tmpLib->linkerElfRel);
-        break;
-      case 11:
-        if (tmpLib->linkerRelSymTab == 0x0) {
-          tmpLib->linkerRelSymTab = (elfDynSym *)malloc(tmpLib->linkerSectionHeader[i].shSize);
-          fseek(linkerFd,tmpLib->linkerSectionHeader[i].shOffset,0);
-          fread(tmpLib->linkerRelSymTab,tmpLib->linkerSectionHeader[i].shSize,1,linkerFd);
-          tmpLib->sym = i;
-          }
-        break;
-      }
-    }
-  }
-  if (libs != 0x0)
-    libs->prev    = tmpLib;
-  tmpLib->prev  = 0x0;
-  tmpLib->next  = libs;
-  libs          = tmpLib;
-
-  if (linkerFd) {
-    fclose(linkerFd);
-    }
-  return(tmpLib);
-  }
diff --git a/libexec/ld.elf_so/elf.h b/libexec/ld.elf_so/elf.h
deleted file mode 100644
index d344299..0000000
--- a/libexec/ld.elf_so/elf.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: elf.h 89 2016-01-12 00:20:40Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _ELF_H
-#define _ELF_H
-
-#include <sys/types.h>
-
-#define elfExecutable 0x002
-#define elfLibrary    0x003
-
-#define R_386_NONE      0 /* none    none        */
-#define R_386_32        1 /* word32  S + A       */
-#define R_386_PC32      2 /* word32  S + A - P   */
-#define R_386_GOT32     3 /* word32  G + A - P   */
-#define R_386_PLT32     4 /* word32  L + A - P   */
-#define R_386_COPY      5 /* none    none        */
-#define R_386_GLOB_DAT  6 /* word32  S           */
-#define R_386_JMP_SLOT  7 /* word32  S           */
-#define R_386_RELATIVE  8 /* word32  B + A       */
-#define R_386_GOTOFF    9 /* word32  S + A - GOT */
-#define R_386_GOTPC    10 /* word32  GOT + A - P */
-
-
-/* Elf Types */
-#define ET_NONE         0  // No file type
-#define ET_REL          1  // Relocatable file
-#define ET_EXEC         2  // Executable file
-#define ET_DYN          3  // Shared object file
-#define ET_CORE         4  // Core file
-#define ET_LOPROC  0xff00  // Processor-specific
-#define ET_HIPROC  0xffff
-/* End Elf Types */
-
-/* Elf Machine Types */
-#define EM_NONE       0  // No machine
-#define EM_M32        1  // AT&T WE 32100
-#define EM_SPARC      2  // SPARC
-#define EM_386        3  // Intel 80386
-#define EM_68K        4  // Motorola 68000
-#define EM_88K        5  // Motorola 88000
-#define EM_860        7  // Intel 80860
-#define EM_MIPS       8  // MIPS RS3000
-/* End Elf Machines Types */
-
-/* Elf Version */
-#define EV_NONE          0  // Invalid version
-#define EV_CURRENT       1  // Current version
-/* End Elf Version */
-
-/* Elf Program Header Types */
-#define PT_NULL          0
-#define PT_LOAD          1
-#define PT_DYNAMIC       2
-#define PT_INTERP  	 3
-#define PT_NOTE    	 4
-#define PT_SHLIB   	 5
-#define PT_PHDR    	 6
-#define PT_LOOS	   	 0x60000000
-#define PT_HIOS	   	 0x6fffffff
-#define PT_LOPROC  	 0x70000000
-#define PT_HIPROC  	 0x7fffffff
-#define PT_GNU_EH_FRAME	 0x6474e550
-#define PT_GNU_STACK	 (PT_LOOS + 0x474e551)
-#define PT_GNU_RELRO	 (PT_LOOS + 0x474e552) 
-#define PT_PAX_FLAGS	 (PT_LOOS + 0x5041580) 
-/* End Elf Program Header Types */
-
-typedef struct {
-  uInt8  eIdent[16]; /* File identification. */
-  uInt16 eType;      /* File type. */
-  uInt16 eMachine;   /* Machine architecture. */
-  uInt32  eVersion;   /* ELF format version. */
-  uInt32  eEntry;     /* Entry point. */
-  uInt32  ePhoff;     /* Program Header file offset. */
-  uInt32  eShoff;     /* Section header file offset. */
-  uInt32  eFlags;     /* Architecture-specific flags. */
-  uInt16 eEhsize;    /* Size of ELF header in bytes. */
-  uInt16 ePhentsize; /* Size of program header entry. */
-  uInt16 ePhnum;     /* Number of program header entries. */
-  uInt16 eShentsize; /* Size of section header entry. */
-  uInt16 eShnum;     /* Number of section header entries. */
-  uInt16 eShstrndx;  /* Section name strings section. */
-  } elfHeader;
-
-typedef struct {
-  uInt32 phType;         /* Entry type. */
-  uInt32 phOffset;       /* File offset of contents. */
-  uInt32 phVaddr;        /* Virtual address in memory image. */
-  uInt32 phPaddr;        /* Physical address (not used). */
-  uInt32 phFilesz;       /* Size of contents in file. */
-  uInt32 phMemsz;        /* Size of contents in memory. */
-  uInt32 phFlags;        /* Access permission flags. */
-  uInt32 phAlign;        /* Alignment in memory and file. */
-  } elfProgramHeader;
-
-typedef struct {
-  uInt32 shName;        /* Section name (index into the section header string table). */
-  uInt32 shType;        /* Section type. */
-  uInt32 shFlags;       /* Section flags. */
-  uInt32 shAddr;        /* Address in memory image. */
-  uInt32 shOffset;      /* Offset in file. */
-  uInt32 shSize;        /* Size in bytes. */
-  uInt32 shLink;        /* Index of a related section. */
-  uInt32 shInfo;        /* Depends on section type. */
-  uInt32 shAddralign;   /* Alignment in bytes. */
-  uInt32 shEntsize;     /* Size of each entry in section. */
-  } elfSectionHeader;
-
-typedef struct {
-  uInt32 pltOffset;
-  uInt32 pltInfo;
-  } elfPltInfo;
-
-typedef struct {
-  uInt32 dynName;
-  uInt32 dynValue;
-  uInt32 dynSize;
-  uInt8  dynInfo;
-  uInt8  dynOther;
-  uInt16 dynShndx;
-  } elfDynSym;
-
-typedef struct {
-  uInt32 dynVal;
-  uInt32 dynPtr;
-  } elfDynamic;
-
-
-char *elfGetShType(int);
-char *elfGetPhType(int);
-char *elfGetRelType(int);
-
-#define ELF32_R_SYM(i)      ((i)>>8)
-#define ELF32_R_TYPE(i)     ((unsigned char)(i))
-#define ELF32_R_INFO(s, t)  ((s)<<8+(unsigned char)(t))
-
-/* New Stuff */
-#define SHT_NULL     0
-#define SHT_PROGBITS 1
-#define SHT_SYMTAB   2
-#define SHT_STRTAB   3
-#define SHT_RELA     4
-#define SHT_HASH     5
-#define SHT_DYNAMIC  6
-#define SHT_NOTE     7
-#define SHT_NOBITS   8
-#define SHT_REL      9
-#define SHT_SHLIB    10
-#define SHT_DYNSYM   11
-#define SHT_LOPROC   0x70000000
-#define SHT_HIPROC   0x7fffffff
-#define SHT_LOUSER   0x80000000
-#define SHT_HIUSER   0xffffffff
-
-typedef struct {
-  long d_tag; 
-  union {
-    uInt32 d_val;
-    uInt32 d_ptr;
-    } d_un;
-  } Elf32_Dyn;
-
-
-#endif
-
diff --git a/libexec/ld.elf_so/entry.S b/libexec/ld.elf_so/entry.S
deleted file mode 100644
index 5b7ba32..0000000
--- a/libexec/ld.elf_so/entry.S
+++ /dev/null
@@ -1,57 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: entry.S 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-.globl _ld
-.text
-.code32
-
-_ld: 
-  call  ld
-  add  $8,%esp
-  push %eax
-  ret
-
-/***
- $Log: entry.S,v $
- Revision 1.1.1.1  2006/06/01 12:46:09  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:28  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:14:00  reddawg
- no message
-
- Revision 1.1  2004/06/17 11:58:10  reddawg
- ld.so: Made a few changes to the way it functions hopefully it will
-        improve some of its performance.
-
- END
- ***/
-
diff --git a/libexec/ld.elf_so/findfunc.c b/libexec/ld.elf_so/findfunc.c
deleted file mode 100644
index 527000c..0000000
--- a/libexec/ld.elf_so/findfunc.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include "ld.h"
-
-uInt32 ldFindFunc(const char *func,const char *lib) {
-  int        i        = 0x0;
-  int        x        = 0x0;
-  uInt32    *funcPtr  = 0x0;
-  ldLibrary *libPtr   = 0x0;
-  
-  for (x = 0; x < lib_c;x++) {
-    libPtr = ldFindLibrary(lib + lib_s[x]); 
-    if (libPtr == 0x0) {
-      libPtr = ldAddLibrary(lib + lib_s[x]);
-      }
-  
-    for (i=0x0;i<libPtr->linkerSectionHeader[libPtr->sym].shSize/sizeof(elfDynSym);i++) {
-      if (!strcmp(func,(libPtr->linkerDynStr + libPtr->linkerRelSymTab[i].dynName))) {
-        funcPtr = (uInt32 *)((uInt32)(libPtr->linkerRelSymTab[i].dynValue) + (uInt32)libPtr->output);
-        if (funcPtr == 0x0) {
-            printf("[%s:0x%X]\n",func,funcPtr);
-          }
-        return((uInt32)funcPtr);
-        break;
-        }
-      }
-    }
-
-  printf("ERROR COULDN'T FIND FUNCTION: %s:%s\n",func,lib);
-  return(0x0);
-  }
-
diff --git a/libexec/ld.elf_so/findlibrary.c b/libexec/ld.elf_so/findlibrary.c
deleted file mode 100644
index f071e7d..0000000
--- a/libexec/ld.elf_so/findlibrary.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <string.h>
-#include "ld.h"
-
-ldLibrary *ldFindLibrary(const char *lib) {
-  ldLibrary *tmpLibs = 0x0;
-
-  for (tmpLibs = libs;tmpLibs != 0x0;tmpLibs = tmpLibs->next) {
-    if (!strcmp(tmpLibs->name,lib)) {
-      return(tmpLibs);
-      }
-    }
-  return(0x0);
-  }
diff --git a/libexec/ld.elf_so/ld.h b/libexec/ld.elf_so/ld.h
deleted file mode 100644
index 0255e4d..0000000
--- a/libexec/ld.elf_so/ld.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <sys/types.h>
-#include <string.h>
-#include "elf.h"
-
-typedef struct ldLibrary_s {
-  struct ldLibrary_s *next;
-  struct ldLibrary_s *prev;
-  char              name[256];       
-  elfHeader        *linkerHeader;
-  elfSectionHeader *linkerSectionHeader;
-  elfProgramHeader *linkerProgramHeader;
-  elfDynSym        *linkerRelSymTab;
-  elfPltInfo       *linkerElfRel;
-  char             *linkerShStr;
-  char             *linkerDynStr;
-  char             *output;
-  int               sym;
-  } ldLibrary;
-
-extern ldLibrary *libs;
-extern int       lib_c;
-extern int       lib_s[10];
-
-uInt32 ldFindFunc(const char *,const char *);
-ldLibrary *ldFindLibrary(const char *);
-ldLibrary *ldAddLibrary(const char *);
-
-/***
- END
- ***/
-
diff --git a/libexec/ld.elf_so/main.c b/libexec/ld.elf_so/main.c
deleted file mode 100644
index ee9f78b..0000000
--- a/libexec/ld.elf_so/main.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: main.c 122 2016-01-14 03:45:52Z reddawg $
-
- *****************************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include "ld.h"
-
-ldLibrary *libs = 0x0;
-int lib_c = 0x0;
-int lib_s[10];
-
-static elfHeader *binaryHeader = 0x0;
-static elfSectionHeader *binarySectionHeader = 0x0;
-static char *binaryShStr = 0x0;
-static char *binaryDynStr = 0x0;
-static elfDynSym *binaryRelSymTab = 0x0;
-static Elf32_Dyn *binaryElf32_Dyn = 0x0;
-static elfPltInfo *binaryElfRelDyn = 0x0;
-static elfPltInfo *binaryElfRel = 0x0;
-
-uInt32 ld( uInt32 got2, uInt32 entry ) {
-  int i = 0x0;
-  int x = 0x0;
-  int y = 0x0;
-  int rel = 0x0;
-  int relDyn = 0x0;
-  uInt32 *reMap = 0x0;
-  FILE *binaryFd = 0x0;
-
-  if ( binaryHeader == 0x0 ) {
-    binaryFd = malloc( sizeof(FILE) );
-    binaryFd->fd = (uInt32) got2;
-    fseek( binaryFd, 0x0, 0x0 );
-    binaryHeader = (elfHeader *) malloc( sizeof(elfHeader) );
-    fread( binaryHeader, sizeof(elfHeader), 1, binaryFd );
-  }
-
-  if ( binarySectionHeader == 0x0 ) {
-    binarySectionHeader = (elfSectionHeader *) malloc( sizeof(elfSectionHeader) * binaryHeader->eShnum );
-    fseek( binaryFd, binaryHeader->eShoff, 0 );
-    fread( binarySectionHeader, sizeof(elfSectionHeader), binaryHeader->eShnum, binaryFd );
-
-    if ( binaryShStr == 0x0 ) {
-      binaryShStr = (char *) malloc( binarySectionHeader[binaryHeader->eShstrndx].shSize );
-      fseek( binaryFd, binarySectionHeader[binaryHeader->eShstrndx].shOffset, 0 );
-      fread( binaryShStr, binarySectionHeader[binaryHeader->eShstrndx].shSize, 1, binaryFd );
-    }
-
-    for ( i = 0x0; i < binaryHeader->eShnum ; i++ ) {
-      switch ( binarySectionHeader[i].shType ) {
-        case 3:
-          if ( !strcmp( ( binaryShStr + binarySectionHeader[i].shName ), ".dynstr" ) ) {
-            if ( binaryDynStr == 0x0 ) {
-              binaryDynStr = (char *) malloc( binarySectionHeader[i].shSize );
-              fseek( binaryFd, binarySectionHeader[i].shOffset, 0 );
-              fread( binaryDynStr, binarySectionHeader[i].shSize, 1, binaryFd );
-            }
-          }
-          break;
-        case SHT_DYNAMIC:
-          binaryElf32_Dyn = (Elf32_Dyn *) malloc( binarySectionHeader[i].shSize );
-          fseek( binaryFd, binarySectionHeader[i].shOffset, 0 );
-          fread( binaryElf32_Dyn, binarySectionHeader[i].shSize, 1, binaryFd );
-          for ( x = 0; x < binarySectionHeader[i].shSize / sizeof(Elf32_Dyn) ; x++ ) {
-            if ( binaryElf32_Dyn[x].d_tag == 1 ) {
-              lib_s[lib_c] = binaryElf32_Dyn[x].d_un.d_ptr;
-              lib_c++;
-            }
-          }
-          break;
-        case SHT_REL:
-          //        if (!strcmp(binaryShStr + binarySectionHeader[i].shName,".rel.dyn"))
-          //        relDyn = i;
-          //    else
-          rel = i;
-          break;
-        case 11:
-          if ( binaryRelSymTab == 0x0 ) {
-            binaryRelSymTab = (elfDynSym *) malloc( binarySectionHeader[i].shSize );
-            fseek( binaryFd, binarySectionHeader[i].shOffset, 0 );
-            fread( binaryRelSymTab, binarySectionHeader[i].shSize, 1, binaryFd );
-          }
-          break;
-      }
-    }
-  }
-
-  /*
-   if ((binaryElfRelDyn == 0x0) && (relDyn != 0)) {
-   binaryElfRelDyn = (elfPltInfo *)malloc(binarySectionHeader[i].shSize);
-   fseek(binaryFd,binarySectionHeader[relDyn].shOffset,0x0);
-   fread(binaryElfRelDyn,binarySectionHeader[relDyn].shSize,1,binaryFd);
-
-   for (x = 0;x < binarySectionHeader[relDyn].shSize / sizeof(elfPltInfo);x++) {
-   switch (ELF32_R_TYPE(binaryElfRelDyn[x].pltInfo)) {
-   case R_386_COPY:
-   printf("COPY");
-   reMap = (uInt32 *)binaryElfRelDyn[x].pltOffset;
-   *reMap = 0x1;
-   break;
-   default:
-   //printf("UNHANDLED THING");
-   break;
-   }
-   printf("y: [%i:0x%X]",y,binaryElfRelDyn[x].pltOffset);
-   }
-   }
-   */
-
-  if ( binaryElfRel == 0x0 ) {
-    binaryElfRel = (elfPltInfo *) malloc( binarySectionHeader[rel].shSize );
-    fseek( binaryFd, binarySectionHeader[rel].shOffset, 0x0 );
-    fread( binaryElfRel, binarySectionHeader[rel].shSize, 1, binaryFd );
-  }
-
-  i = ( entry / sizeof(elfPltInfo) );
-  x = ELF32_R_SYM( binaryElfRel[i].pltInfo );
-  reMap = (uInt32 *) binaryElfRel[i].pltOffset;
-  *reMap = ldFindFunc( binaryDynStr + binaryRelSymTab[x].dynName, binaryDynStr );
-  printf( "\nld(%s)", binaryDynStr + binaryRelSymTab[x].dynName );
-  //*reMap = ldFindFunc(binaryDynStr + binaryRelSymTab[x].dynName,(char *)(binaryDynStr + 1));
-
-  if ( binaryFd ) {
-    fclose( binaryFd );
-  }
-
-  return ( *reMap );
-}
-
-/***
- END
- ***/
diff --git a/share/mk/Makefile b/share/mk/Makefile
deleted file mode 100644
index 4e3f81e..0000000
--- a/share/mk/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-NOOBJ=  # defined
-
-.include <ubix.own.mk>
-
-.if ${MKSHARE} != "no"
-FILES=  ubix.README ubix.buildinstall.mk ubix.clang-analyze.mk ubix.clean.mk \
-        ubix.dep.mk ubix.doc.mk ubix.endian.mk ubix.files.mk ubix.gcc.mk \
-        ubix.host.mk ubix.hostlib.mk ubix.hostprog.mk ubix.inc.mk ubix.info.mk \
-        ubix.init.mk ubix.ioconf.mk ubix.kernobj.mk ubix.kinc.mk ubix.klinks.mk \
-        ubix.kmodule.mk ubix.lib.mk ubix.links.mk ubix.lua.mk \
-        ubix.man.mk ubix.nls.mk \
-        ubix.obj.mk ubix.own.mk ubix.prog.mk ubix.rpc.mk ubix.shlib.mk \
-        ubix.subdir.mk ubix.sys.mk ubix.syscall.mk ubix.test.mk ubix.x11.mk sys.mk
-
-FILESDIR=/usr/share/mk
-.endif
-
-FILESMODE=444
-
-.include <ubix.prog.mk>
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
deleted file mode 100644
index 50f37ce..0000000
--- a/share/mk/sys.mk
+++ /dev/null
@@ -1,262 +0,0 @@
-# This variable should be used to differentiate Minix builds in Makefiles.
-__UBIX=	yes
-
-.if !defined(__UBIX)
-unix?=		We run BSD
-.SUFFIXES: .a .o .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh
-.else
-unix?=		We run UBIX.
-.SUFFIXES: .a .o .bc .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh
-
-.if ${MKSMALL:U} == "yes"
-CPPFLAGS+= -DNDEBUG
-DBG=	-Os
-.endif
-
-.if ${MKMAGIC:Uno} == "yes" || ${MKASR:Uno} == "yes"
-CPPFLAGS+= -D_UBIX_MAGIC=1
-STRIPFLAG= -s
-DBG=-g
-.endif
-
-#LSC: Be a bit smarter about the default compiler
-.if exists(/usr/pkg/bin/cc) || exists(/usr/bin/cc)
-CC?=	cc
-.endif
-
-.if exists(/usr/pkg/bin/gcc) || exists(/usr/bin/gcc)
-CC?=	gcc
-.endif
-.endif # defined(__UBIX)
-
-.LIBS:		.a
-
-AR?=		ar
-ARFLAGS?=	rl
-RANLIB?=	ranlib
-
-AS?=		as
-AFLAGS?=
-COMPILE.s?=	${CC} ${AFLAGS} ${AFLAGS.${<:T}} -c
-LINK.s?=	${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${LDFLAGS}
-_ASM_TRADITIONAL_CPP=	-x assembler-with-cpp
-COMPILE.S?=	${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} ${_ASM_TRADITIONAL_CPP} -c
-LINK.S?=	${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} ${LDFLAGS}
-
-CC?=		cc
-.if ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb"
-# -O2 is too -falign-* zealous for low-memory sh3 machines
-DBG?=	-Os -freorder-blocks
-.elif ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m68000"
-# -freorder-blocks (enabled by -O2) produces much bigger code
-DBG?=	-O2 -fno-reorder-blocks
-.elif ${MACHINE_ARCH} == "coldfire"
-DBG?=	-O1
-.elif !empty(MACHINE_ARCH:Maarch64*)
-DBG?=	-O2 ${"${.TARGET:M*.po}" == "":? -fomit-frame-pointer:}
-.elif ${MACHINE_ARCH} == "vax"
-DBG?=	-O1 -fgcse -fstrength-reduce -fgcse-after-reload
-.else
-DBG?=	-O2
-.endif
-.if !defined(__UBIX)
-CFLAGS?=	${DBG}
-.else
-CFLAGS+=	${DBG}
-.endif # !defined(__UBIX)
-LDFLAGS?=
-COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
-LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
-
-# C Type Format data is required for DTrace
-CTFFLAGS	?=	-g -L VERSION
-CTFMFLAGS	?=	-t -g -L VERSION
-
-CXX?=		c++
-CXXFLAGS?=	${CFLAGS:N-Wno-traditional:N-Wstrict-prototypes:N-Wmissing-prototypes:N-Wno-pointer-sign:N-ffreestanding:N-std=gnu[0-9][0-9]:N-Wold-style-definition:N-Wno-format-zero-length}
-
-__ALLSRC1=	${empty(DESTDIR):?${.ALLSRC}:${.ALLSRC:S|^${DESTDIR}|^destdir|}}
-__ALLSRC2=	${empty(MAKEOBJDIR):?${__ALLSRC1}:${__ALLSRC1:S|^${MAKEOBJDIR}|^obj|}}
-__ALLSRC3=	${empty(UBIXSRCDIR):?${__ALLSRC2}:${__ALLSRC2:S|^${UBIXSRCDIR}|^src|}}
-__BUILDSEED=	${BUILDSEED}/${__ALLSRC3:O}/${.TARGET}
-_CXXSEED?=	${BUILDSEED:D-frandom-seed=${__BUILDSEED:hash}}
-
-COMPILE.cc?=	${CXX} ${_CXXSEED} ${CXXFLAGS} ${CPPFLAGS} -c
-LINK.cc?=	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS}
-
-OBJC?=		${CC}
-OBJCFLAGS?=	${CFLAGS}
-COMPILE.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c
-LINK.m?=	${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${LDFLAGS}
-
-CPP?=		cpp
-CPPFLAGS?=
-
-FC?=		f77
-FFLAGS?=	-O
-RFLAGS?=
-COMPILE.f?=	${FC} ${FFLAGS} -c
-LINK.f?=	${FC} ${FFLAGS} ${LDFLAGS}
-COMPILE.F?=	${FC} ${FFLAGS} ${CPPFLAGS} -c
-LINK.F?=	${FC} ${FFLAGS} ${CPPFLAGS} ${LDFLAGS}
-COMPILE.r?=	${FC} ${FFLAGS} ${RFLAGS} -c
-LINK.r?=	${FC} ${FFLAGS} ${RFLAGS} ${LDFLAGS}
-
-INSTALL?=	install
-
-LD?=		ld
-
-LEX?=		lex
-LFLAGS?=
-LEX.l?=		${LEX} ${LFLAGS}
-
-LINT?=		lint
-LINTFLAGS?=	-chapbxzgFS
-
-LORDER?=	lorder
-
-MAKE?=		make
-
-NM?=		nm
-
-PC?=		pc
-PFLAGS?=
-COMPILE.p?=	${PC} ${PFLAGS} ${CPPFLAGS} -c
-LINK.p?=	${PC} ${PFLAGS} ${CPPFLAGS} ${LDFLAGS}
-
-SHELL?=		sh
-
-SIZE?=		size
-
-TSORT?= 	tsort -q
-
-YACC?=		yacc
-YFLAGS?=
-YACC.y?=	${YACC} ${YFLAGS}
-
-# C
-.c:
-	${LINK.c} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
-# XXX: disable for now
-#	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.c.o:
-	${COMPILE.c} ${.IMPSRC}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.c.a:
-	${COMPILE.c} ${.IMPSRC}
-	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	rm -f ${.PREFIX}.o
-.c.ln:
-	${LINT} ${LINTFLAGS} \
-	    ${CPPFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    -i ${.IMPSRC}
-
-# C++
-.cc .cpp .cxx .C:
-	${LINK.cc} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
-.cc.o .cpp.o .cxx.o .C.o:
-	${COMPILE.cc} ${.IMPSRC}
-.cc.a .cpp.a .cxx.a .C.a:
-	${COMPILE.cc} ${.IMPSRC}
-	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	rm -f ${.PREFIX}.o
-
-# Fortran/Ratfor
-.f:
-	${LINK.f} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
-.f.o:
-	${COMPILE.f} ${.IMPSRC}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.f.a:
-	${COMPILE.f} ${.IMPSRC}
-	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	rm -f ${.PREFIX}.o
-
-.F:
-	${LINK.F} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.F.o:
-	${COMPILE.F} ${.IMPSRC}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.F.a:
-	${COMPILE.F} ${.IMPSRC}
-	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	rm -f ${.PREFIX}.o
-
-.r:
-	${LINK.r} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
-.r.o:
-	${COMPILE.r} ${.IMPSRC}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.r.a:
-	${COMPILE.r} ${.IMPSRC}
-	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	rm -f ${.PREFIX}.o
-
-# Pascal
-.p:
-	${LINK.p} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.p.o:
-	${COMPILE.p} ${.IMPSRC}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.p.a:
-	${COMPILE.p} ${.IMPSRC}
-	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	rm -f ${.PREFIX}.o
-
-# Assembly
-.s:
-	${LINK.s} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.s.o:
-	${COMPILE.s} ${.IMPSRC}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.s.a:
-	${COMPILE.s} ${.IMPSRC}
-	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	rm -f ${.PREFIX}.o
-.S:
-	${LINK.S} -o ${.TARGET} ${.IMPSRC} ${LDLIBS}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.S.o:
-	${COMPILE.S} ${.IMPSRC}
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-.S.a:
-	${COMPILE.S} ${.IMPSRC}
-	${AR} ${ARFLAGS} ${.TARGET} ${.PREFIX}.o
-	rm -f ${.PREFIX}.o
-
-# Lex
-.l:
-	${LEX.l} ${.IMPSRC}
-	${LINK.c} -o ${.TARGET} lex.yy.c ${LDLIBS} -ll
-	rm -f lex.yy.c
-.l.c:
-	${LEX.l} ${.IMPSRC}
-	mv lex.yy.c ${.TARGET}
-.l.o:
-	${LEX.l} ${.IMPSRC}
-	${COMPILE.c} -o ${.TARGET} lex.yy.c
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-	rm -f lex.yy.c
-
-# Yacc
-.y:
-	${YACC.y} ${.IMPSRC}
-	${LINK.c} -o ${.TARGET} y.tab.c ${LDLIBS}
-	rm -f y.tab.c
-.y.c:
-	${YACC.y} ${.IMPSRC}
-	mv y.tab.c ${.TARGET}
-.y.o:
-	${YACC.y} ${.IMPSRC}
-	${COMPILE.c} -o ${.TARGET} y.tab.c
-	${defined(CTFCONVERT):?${CTFCONVERT} ${CTFFLAGS} ${.TARGET}:}
-	rm -f y.tab.c
-
-# Shell
-.sh:
-	rm -f ${.TARGET}
-	cp ${.IMPSRC} ${.TARGET}
-	chmod a+x ${.TARGET}
diff --git a/share/mk/ubix.cc-analyze.mk b/share/mk/ubix.cc-analyze.mk
deleted file mode 100644
index 57496af..0000000
--- a/share/mk/ubix.cc-analyze.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-.ifndef CC_ANALYZE_SRCS
-
-CC_ANALYZE_FLAGS+=	--analyze
-
-CC_ANALYZE_CHECKERS+=	core deadcode security unix
-
-.for checker in ${CC_ANALYZE_CHECKERS}
-CC_ANALYZE_FLAGS+=	-Xanalyzer -analyzer-checker=${checker}
-.endfor
-
-.SUFFIXES: .c .cc .cpp .cxx .C .cc-analyzer
-
-CC_ANALYZE_CFLAGS=		${CFLAGS:N-Wa,--fatal-warnings}
-CC_ANALYZE_CXXFLAGS=	${CXXFLAGS:N-Wa,--fatal-warnings}
-
-.c.cc-analyzer:
-	${TOOL_CC.cc} ${CC_ANALYZE_FLAGS} \
-	    ${CC_ANALYZE_CFLAGS} ${CPPFLAGS} \
-	    ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
-	    ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-.cc.cc-analyzer .cpp.clang-analyzer .cxx.clang-analyzer .C.clang-analyzer:
-	${TOOL_CXX.cc} ${CC_ANALYZE_FLAGS} \
-	    ${CC_ANALYZE_CXXFLAGS} ${CPPFLAGS} \
-	    ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
-	    ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-
-CC_ANALYZE_SRCS= \
-	${SRCS:M*.[cC]} ${SRCS:M*.cc} \
-	${SRCS:M*.cpp} ${SRCS:M*.cxx} \
-	${DPSRCS:M*.[cC]} ${DPSRCS:M*.cc} \
-	${DPSRCS:M*.cpp} ${DPSRCS:M*.cxx}
-.if !empty(CC_ANALYZE_SRCS)
-CC_ANALYZE_OUTPUT=	${CC_ANALYZE_SRCS:R:S,$,.cc-analyzer,}
-.endif
-
-analyze: ${CC_ANALYZE_OUTPUT}
-
-.endif
diff --git a/share/mk/ubix.clean.mk b/share/mk/ubix.clean.mk
deleted file mode 100644
index bddfff9..0000000
--- a/share/mk/ubix.clean.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-# $UBIXBSD: ubix.clean.mk,v 1.8 2012/11/19 16:04:54 apb Exp $
-
-# <ubix.clean.mk>
-#
-# Public targets:
-#
-# clean:	Delete files listed in ${CLEANFILES}.
-# cleandir:	Delete files listed in ${CLEANFILES} and ${CLEANDIRFILES}.
-#
-# Public variables:
-#
-# CLEANFILES	Files to remove for both the clean and cleandir targets.
-#
-# CLEANDIRFILES	Files to remove for the cleandir target, but not for
-#		the clean target.
-#
-# MKCLEANSRC	Whether or not to clean the source directory
-# 		in addition to the object directory.  Defaults to "yes".
-#
-# MKCLEANVERIFY	Whether or not to verify that the file deletion worked.
-#		Defaults to "yes".
-#
-# The files listed in CLEANFILES and CLEANDIRFILES must not be
-# directories, because the potential risk from running "rm -rf" commands
-# in ubix.clean.mk is considered too great.  If you want to recursively
-# delete a directory as part of "make clean" or "make cleandir" then you
-# need to provide your own target.
-
-.if !defined(_UBIX_CLEAN_MK_)
-_UBIX_CLEAN_MK_=1
-
-.include <ubix.init.mk>
-
-MKCLEANSRC?=	yes
-MKCLEANVERIFY?=	yes
-
-clean:		.PHONY __doclean
-__doclean:	.PHONY .MADE __cleanuse CLEANFILES
-cleandir:	.PHONY clean __docleandir
-__docleandir:	.PHONY .MADE __cleanuse CLEANDIRFILES
-
-# __cleanuse is invoked with ${.ALLSRC} as the name of a variable
-# (such as CLEANFILES or CLEANDIRFILES), or possibly a list of
-# variable names.  ${.ALLSRC:@v@${${v}}@} will be the list of
-# files to delete.  (We pass the variable name, e.g. CLEANFILES,
-# instead of the file names, e.g. ${CLEANFILES}, because we don't
-# want make to replace any of the file names with the result of
-# searching .PATH.)
-#
-# If the list of files is empty, then the commands
-# reduce to "true", with an "@" prefix to prevent echoing.
-#
-# The use of :M* is needed to handle the case that CLEANFILES
-# or CLEANDIRFILES is not completely empty but contains spaces.
-# This can easily happen when CLEANFILES or CLEANDIRFILES is set
-# from other variables that happen to be empty.)
-#
-# The use of :Q is needed to handle the case that CLEANFILES
-# or CLEANDIRFILES contains quoted strings, such as
-# CLEANFILES = "filename with spaces".
-#
-__cleanuse: .USE
-.if 0	# print "# clean CLEANFILES" for debugging
-	${"${.ALLSRC:@v@${${v}:M*}@:Q}" == "":?@true:${_MKMSG} \
-		"clean" ${.ALLSRC} }
-.endif
-.for _d in ${"${.OBJDIR}" == "${.CURDIR}" || "${MKCLEANSRC}" == "no" \
-		:? ${.OBJDIR} \
-		:  ${.OBJDIR} ${.CURDIR} }
-	${"${.ALLSRC:@v@${${v}:M*}@:Q}" == "":?@true: \
-	    (cd ${_d} && rm -f ${.ALLSRC:@v@${${v}}@} || true) }
-.if "${MKCLEANVERIFY}" == "yes"
-	@${"${.ALLSRC:@v@${${v}:M*}@:Q}" == "":?true: \
-	    bad="\$(cd ${_d} && ls -1d ${.ALLSRC:@v@${${v}}@} 2>/dev/null)"; \
-	    if test -n "\$bad"; then \
-	        echo "Failed to remove the following files from ${_d}:" ; \
-	        echo "\$bad" | while read file ; do \
-		    echo "	\$file" ; \
-		done ; \
-	        false ; \
-	    fi }
-.endif
-.endfor
-
-# Don't automatically load ".depend" files during "make clean"
-# or "make cleandir".
-.if make(clean) || make(cleandir)
-.MAKE.DEPENDFILE := .depend.no-such-file
-.endif
-
-.endif	# !defined(_UBIX_CLEAN_MK)
diff --git a/share/mk/ubix.dep.mk b/share/mk/ubix.dep.mk
deleted file mode 100644
index 0559faf..0000000
--- a/share/mk/ubix.dep.mk
+++ /dev/null
@@ -1,126 +0,0 @@
-##### Basic targets
-realdepend:	beforedepend .depend afterdepend
-.ORDER:		beforedepend .depend afterdepend
-
-beforedepend .depend afterdepend: # ensure existence
-
-##### Default values
-MKDEP?=			mkdep
-MKDEPCXX?=		mkdep
-MKDEP_SUFFIXES?=	.o .d
-
-##### Build rules
-# some of the rules involve .h sources, so remove them from mkdep line
-
-.if defined(SRCS) && !empty(SRCS)
-__acpp_flags=	${_ASM_TRADITIONAL_CPP}
-
-.if defined(NODPSRCS)
-.for f in ${SRCS} ${DPSRCS}
-.if "${NODPSRCS:M${f}}" == ""
-__DPSRCS.all+=	${f:C/\.(c|m|s|S|C|cc|cpp|cxx)$/.d/}
-.endif
-.endfor
-beforedepend: ${DPSRCS}
-.else
-__DPSRCS.all+=	${SRCS:C/\.(c|m|s|S|C|cc|cpp|cxx)$/.d/} \
-		${DPSRCS:C/\.(c|m|s|S|C|cc|cpp|cxx)$/.d/}
-.endif
-__DPSRCS.d=	${__DPSRCS.all:O:u:M*.d}
-__DPSRCS.notd=	${__DPSRCS.all:O:u:N*.d}
-
-.if defined(__UBIX)
-__DPSRCS.bcd=	${"${USE_BITCODE:Uno}" == "yes":? ${SRCS:M*.c:O:u:.c=.bcd}:}
-__DPSRCS.d+=	${__DPSRCS.bcd}
-.endif # defined(__UBIX)
-
-.NOPATH: .depend ${__DPSRCS.d}
-
-.if !empty(__DPSRCS.d)							# {
-${__DPSRCS.d}: ${__DPSRCS.notd} ${DPSRCS}
-.endif									# }
-
-MKDEPSUFFLAGS=-s ${MKDEP_SUFFIXES:Q}
-
-.if defined(MKDEPINCLUDES) && ${MKDEPINCLUDES} != "no"
-.STALE:
-	@echo Rebuilding dependency file: ${.ALLSRC}
-	@rm -f ${.ALLSRC}
-	@(cd ${.CURDIR} && ${MAKE} depend)
-_MKDEP_MERGEFLAGS=-i
-_MKDEP_FILEFLAGS=${MKDEPSUFFLAGS}
-.else
-_MKDEP_MERGEFLAGS=${MKDEPSUFFLAGS}
-_MKDEP_FILEFLAGS=
-.endif
-
-.depend: ${__DPSRCS.d}
-	${_MKTARGET_CREATE}
-	rm -f .depend
-	${MKDEP} ${_MKDEP_MERGEFLAGS} -d -f ${.TARGET} ${__DPSRCS.d}
-
-.if !defined(__UBIX)
-.SUFFIXES: .d .s .S .c .C .cc .cpp .cxx .m
-.else
-.SUFFIXES: .bcd .d .s .S .c .C .cc .cpp .cxx .m
-
-.if ${USE_BITCODE:Uno} == "yes"
-.c.bcd:
-	${_MKTARGET_CREATE}
-	${MKDEP} -f ${.TARGET} -s .bc -- ${MKDEPFLAGS} \
-	    ${CFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-.endif # ${USE_BITCODE:Uno} == "yes"
-.endif # !defined(__UBIX)
-
-.c.d:
-	${_MKTARGET_CREATE}
-	${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
-	    ${CFLAGS:M-std=*} ${CFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
-	    ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-.m.d:
-	${_MKTARGET_CREATE}
-	${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
-	    ${OBJCFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
-	    ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-.s.d .S.d:
-	${_MKTARGET_CREATE}
-	${MKDEP} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
-	    ${AFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS} ${AFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} \
-	    ${__acpp_flags} ${.IMPSRC} && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-.C.d .cc.d .cpp.d .cxx.d:
-	${_MKTARGET_CREATE}
-	${MKDEPCXX} -f ${.TARGET}.tmp ${_MKDEP_FILEFLAGS} -- ${MKDEPFLAGS} \
-	    ${CXXFLAGS:M-std=*} ${CXXFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
-	    ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
-	    mv ${.TARGET}.tmp ${.TARGET}
-
-.endif # defined(SRCS) && !empty(SRCS)					# }
-
-##### Clean rules
-.if defined(SRCS) && !empty(SRCS)
-CLEANDIRFILES+= .depend ${__DPSRCS.d} ${__DPSRCS.d:.d=.d.tmp} ${.CURDIR}/tags ${CLEANDEPEND}
-.endif
-
-##### Custom rules
-.if !target(tags)
-tags: ${SRCS}
-.if defined(SRCS) && !empty(SRCS)
-	${_MKTARGET_CREATE}
-	-cd "${.CURDIR}"; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
-	    ${TOOL_SED} "s;\${.CURDIR}/;;" > tags
-.endif
-.endif
-
-##### Pull in related .mk logic
-.include <ubix.clean.mk>
diff --git a/share/mk/ubix.files.mk b/share/mk/ubix.files.mk
deleted file mode 100644
index 4e65650..0000000
--- a/share/mk/ubix.files.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-#	$UBIXBSD: ubix.files.mk,v 1.43 2013/04/06 15:39:19 uebayasi Exp $
-
-.if !defined(_UBIX_FILES_MK_)
-_UBIX_FILES_MK_=1
-
-.include <ubix.init.mk>
-
-.if !target(__fileinstall)
-##### Basic targets
-realinstall:	filesinstall
-realall:	filesbuild
-
-##### Default values
-FILESDIR?=	${BINDIR}
-FILESOWN?=	${BINOWN}
-FILESGRP?=	${BINGRP}
-FILESMODE?=	${NONBINMODE}
-
-##### Build rules
-filesbuild:
-.PHONY:		filesbuild
-
-##### Install rules
-filesinstall::	# ensure existence
-.PHONY:		filesinstall
-
-configfilesinstall:: .PHONY
-
-__fileinstall: .USE
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} \
-	    -o ${FILESOWN_${.ALLSRC:T}:U${FILESOWN}} \
-	    -g ${FILESGRP_${.ALLSRC:T}:U${FILESGRP}} \
-	    -m ${FILESMODE_${.ALLSRC:T}:U${FILESMODE}} \
-	    ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
-
-.endif # !target(__fileinstall)
-
-
-.for F in ${FILES:O:u}
-_FDIR:=		${FILESDIR_${F}:U${FILESDIR}}		# dir override
-_FNAME:=	${FILESNAME_${F}:U${FILESNAME:U${F:T}}}	# name override
-_F:=		${DESTDIR}${_FDIR}/${_FNAME}		# installed path
-_FDOBUILD:=	${FILESBUILD_${F}:U${FILESBUILD:Uno}}
-
-.if ${MKUPDATE} == "no"
-${_F}!		${F} __fileinstall			# install rule
-.if !defined(BUILD) && !make(all) && !make(${F}) && (${_FDOBUILD} == "no")
-${_F}!		.MADE					# no build at install
-.endif
-.else
-${_F}:		${F} __fileinstall			# install rule
-.if !defined(BUILD) && !make(all) && !make(${F}) && (${_FDOBUILD} == "no")
-${_F}:		.MADE					# no build at install
-.endif
-.endif
-
-.if ${_FDOBUILD} != "no"
-filesbuild:	${F}
-CLEANFILES+=	${F}
-.endif
-
-filesinstall::	${_F}
-.PRECIOUS: 	${_F}					# keep if install fails
-.endfor
-
-
-# 
-# CONFIGFILES
-#
-configinstall:	configfilesinstall
-
-.for F in ${CONFIGFILES:O:u}
-_FDIR:=		${FILESDIR_${F}:U${FILESDIR}}		# dir override
-_FNAME:=	${FILESNAME_${F}:U${FILESNAME:U${F:T}}}	# name override
-_F:=		${DESTDIR}${_FDIR}/${_FNAME}		# installed path
-_FDOBUILD:=	${FILESBUILD_${F}:U${FILESBUILD:Uno}}
-
-.if ${MKUPDATE} == "no"
-${_F}!		${F} __fileinstall	# install rule
-.if !defined(BUILD) && !make(all) && !make(${F}) && (${_FDOBUILD} == "no")
-${_F}!		.MADE					# no build at install
-.endif
-.else
-${_F}:		${F} __fileinstall	# install rule
-.if !defined(BUILD) && !make(all) && !make(${F}) && (${_FDOBUILD} == "no")
-${_F}:		.MADE					# no build at install
-.endif
-.endif
-
-.if ${_FDOBUILD} != "no"
-filesbuild:	${F}
-CLEANFILES+=	${F}
-.endif
-
-configfilesinstall::	${_F}
-.PRECIOUS: 	${_F}					# keep if install fails
-.endfor
-
-.undef _FDIR
-.undef _FNAME
-.undef _F
-
-
-#
-# BUILDSYMLINKS
-#
-.if defined(BUILDSYMLINKS)					# {
-
-.for _SL _TL in ${BUILDSYMLINKS}
-BUILDSYMLINKS.s+=	${_SL}
-BUILDSYMLINKS.t+=	${_TL}
-${_TL}: ${_SL}
-	${_MKMSG} "symlink " ${.CURDIR:T}/${.TARGET}
-	rm -f ${.TARGET}
-	ln -s ${.ALLSRC} ${.TARGET}
-.endfor
-
-realall: ${BUILDSYMLINKS.t}
-
-CLEANDIRFILES+= ${BUILDSYMLINKS.t}
-
-.endif								# }
-
-#
-# .uue -> "" handling (i.e. decode a given binary/object)
-#
-# UUDECODE_FILES -	List of files which are stored in the source tree
-#			as <file>.uue and should be uudecoded.
-#
-# UUDECODE_FILES_RENAME_fn - For this file, rename its output to the provided
-#			     name (handled via -p and redirecting stdout)
-
-.if defined(UUDECODE_FILES)					# {
-.SUFFIXES:	.uue
-
-.uue:
-	${_MKTARGET_CREATE}
-	rm -f ${.TARGET}
-	${TOOL_UUDECODE} -p ${.IMPSRC} > ${.TARGET}
-
-.if defined(UUDECODE_FILES_RENAME_${UUDECODE_FILES})
-${UUDECODE_FILES_RENAME_${UUDECODE_FILES}}: ${UUDECODE_FILES}
-	cp ${.ALLSRC} ${.TARGET}
-.endif
-
-realall: ${UUDECODE_FILES}
-
-CLEANUUDECODE_FILES=${UUDECODE_FILES}
-.for i in ${UUDECODE_FILES}
-CLEANUUDECODE_FILES+=${UUDECODE_FILES_RENAME_${i}}
-.endfor
-
-CLEANFILES+= ${CLEANUUDECODE_FILES}
-.endif								# }
-
-##### Pull in related .mk logic
-.include <ubix.obj.mk>
-.include <ubix.sys.mk>
-.include <ubix.clean.mk>
-
-.endif	# !defined(_UBIX_FILES_MK_)
diff --git a/share/mk/ubix.gcc.mk b/share/mk/ubix.gcc.mk
deleted file mode 100644
index 73f3160..0000000
--- a/share/mk/ubix.gcc.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-#	$UBIXBSD: ubix.gcc.mk,v 1.11 2015/06/07 15:04:28 matt Exp $
-
-.if !defined(_UBIX_GCC_MK_)
-_UBIX_GCC_MK_=1
-
-.if defined(EXTERNAL_TOOLCHAIN)
-_GCC_CRTBEGIN!=		${CC} --print-file-name=crtbegin.o
-.ifndef _GCC_CRTBEGINS
-_GCC_CRTBEGINS!=	${CC} --print-file-name=crtbeginS.o
-.endif
-_GCC_CRTEND!=		${CC} --print-file-name=crtend.o
-.ifndef _GCC_CRTENDS
-_GCC_CRTENDS!=		${CC} --print-file-name=crtendS.o
-.endif
-.ifndef _GCC_CRTI
-_GCC_CRTI!=		${CC} --print-file-name=crti.o
-.endif
-.ifndef _GCC_CRTN
-_GCC_CRTN!=		${CC} --print-file-name=crtn.o
-.endif
-_GCC_CRTDIR!=		dirname ${_GCC_CRTBEGIN}
-_GCC_LIBGCCDIR!=	dirname `${CC} --print-libgcc-file-name`
-.else
-_GCC_CRTBEGIN?=		${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtbegin.o
-_GCC_CRTBEGINS?=	${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtbeginS.o
-_GCC_CRTEND?=		${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtend.o
-_GCC_CRTENDS?=		${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtendS.o
-_GCC_CRTI?=		${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
-_GCC_CRTN?=		${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
-_GCC_CRTDIR?=		${DESTDIR}/usr/lib${MLIBDIR:D/${MLIBDIR}}
-_GCC_LIBGCCDIR?=	${DESTDIR}/usr/lib${MLIBDIR:D/${MLIBDIR}}
-.endif
-
-.endif	# ! defined(_UBIX_GCC_MK_)
diff --git a/share/mk/ubix.gcov.mk b/share/mk/ubix.gcov.mk
deleted file mode 100644
index 42ae988..0000000
--- a/share/mk/ubix.gcov.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-LCOV=lcov.$(PROG)
-CLEANFILES+= *.gcno *.gcda $(LCOV)
-
-# Right now we support obtaining coverage information for system services only,
-# and for their main program code (not including their libraries) only.
-#
-# Why not userland as well: because we do not care as much, and it should be
-# possible to produce coverage information for system services without
-# recompiling the entire system with coverage support.  Moreover, as of writing
-# we do not have libprofile_rt, making it impossible to compile regular
-# programs with coverage support altogether.
-#
-# Why not system service libraries (eg libsys) as well: practical concerns..
-# 1) As of writing, even for such libraries we make a regular and a PIC
-#    version, both producing a .gcno file for each object.  The PIC version is
-#    compiled last, while the regular version is used for the library archive.
-#    The result is a potential mismatch between the compile-time coverage
-#    metadata and the run-time coverage counts.
-# 2) The kernel has no coverage support, and with its self-relocation it would
-#    be tricky to add support for it.  As a result, libraries used by the
-#    kernel would have to be excluded from being compiled with coverage support
-#    so as not to create problems.  One could argue that that is a good thing
-#    because eg libminc and libsys create too many small result units (see also
-#    the current hardcoded limit in libsys/llvm_gcov.c).
-# 3) gcov-pull(8) strips paths, which results in lots of manual work to figure
-#    out what file belongs to which library, even ignoring object name
-#    conflicts, for example between libraries.
-# 4) In order to produce practically useful results ("how much of libsockevent
-#    is covered by the combination of LWIP and UDS" etc), gcov-pull(8) would
-#    have to be extended with support for merging .gcda files.  The standard
-#    LLVM libprofile_rt implementation supports this, but we do not.
-# All of these issues are solvable, but for now anyone interested in coverage
-# for a particular system service library will have to mess with individual
-# makefiles themselves.
-
-.if ${MKCOVERAGE:Uno} == "yes"
-.if ${ACTIVE_CC} == "gcc"
-# Leftovers for GCC.  It is not clear whether these still work at all.
-COVCPPFLAGS?= -fno-builtin -fprofile-arcs -ftest-coverage
-COVLDADD?= -lgcov
-.else # ${ACTIVE_CC} != "gcc"
-# We assume LLVM/clang here.  For other compilers this will likely break the
-# MKCOVERAGE compilation, which is a good indication that support for them
-# should be added here.
-COVCPPFLAGS?= --coverage -g -O0
-COVLDADD?=
-.endif # ${ACTIVE_CC} != "gcc"
-.endif # ${MKCOVERAGE:Uno} == "yes"
-
-lcov:
-	lcov -c -d . >$(LCOV)
diff --git a/share/mk/ubix.host.mk b/share/mk/ubix.host.mk
deleted file mode 100644
index 60c8427..0000000
--- a/share/mk/ubix.host.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-.if !defined(_UBIX_HOST_MK_)
-_UBIX_HOST_MK_=1
-
-.if ${HOST_OSTYPE:C/\-.*//:U} == "Ubix"
-HOST_LDFLAGS?=	-static
-
-#LSC: Be a bit smarter about the default compiler
-.if exists(/usr/pkg/bin/cc) || exists(/usr/bin/cc)
-HOST_CC?=   cc
-.endif
-
-.if exists(/usr/pkg/bin/gcc) || exists(/usr/bin/gcc)
-HOST_CC?=   gcc
-.endif
-.endif # ${HOST_OSTYPE:C/\-.*//:U} == "Ubix"
-
-# Helpers for cross-compiling
-HOST_CC?=	cc
-HOST_CFLAGS?=	-O
-HOST_COMPILE.c?=${HOST_CC} ${HOST_CFLAGS} ${HOST_CPPFLAGS} -c
-HOST_COMPILE.cc?=      ${HOST_CXX} ${HOST_CXXFLAGS} ${HOST_CPPFLAGS} -c
-HOST_LINK.cc?=  ${HOST_CXX} ${HOST_CXXFLAGS} ${HOST_CPPFLAGS} ${HOST_LDFLAGS}
-.if defined(HOSTPROG_CXX)
-HOST_LINK.c?=   ${HOST_LINK.cc}
-.else
-HOST_LINK.c?=	${HOST_CC} ${HOST_CFLAGS} ${HOST_CPPFLAGS} ${HOST_LDFLAGS}
-.endif
-
-HOST_CXX?=	c++
-HOST_CXXFLAGS?=	-O
-
-HOST_CPP?=	cpp
-HOST_CPPFLAGS?=
-
-HOST_LD?=	ld
-HOST_LDFLAGS?=
-
-HOST_AR?=	ar
-HOST_RANLIB?=	ranlib
-
-HOST_LN?=	ln
-
-# HOST_SH must be an absolute path
-HOST_SH?=	/bin/sh
-
-.if !defined(HOST_OSTYPE)
-_HOST_OSNAME!=	uname -s
-_HOST_OSREL!=	uname -r
-# For _HOST_ARCH, if uname -p fails, or prints "unknown", or prints
-# something that does not look like an identifier, then use uname -m.
-_HOST_ARCH!=	uname -p 2>/dev/null
-_HOST_ARCH:=	${HOST_ARCH:tW:C/.*[^-_A-Za-z0-9].*//:S/unknown//}
-.if empty(_HOST_ARCH)
-_HOST_ARCH!=	uname -m
-.endif
-HOST_OSTYPE:=	${_HOST_OSNAME}-${_HOST_OSREL:C/\([^\)]*\)//g:[*]:C/ /_/g}-${_HOST_ARCH:C/\([^\)]*\)//g:[*]:C/ /_/g}
-.MAKEOVERRIDES+= HOST_OSTYPE
-.endif # !defined(HOST_OSTYPE)
-
-.if ${USETOOLS} == "yes"
-HOST_MKDEP?=	${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
-HOST_MKDEPCXX?=	${TOOLDIR}/bin/${_TOOL_PREFIX}host-mkdep
-.else
-HOST_MKDEP?=	CC=${HOST_CC:Q} mkdep
-HOST_MKDEPCXX?=	CC=${HOST_CXX:Q} mkdep
-.endif
-
-.if ${NEED_OWN_INSTALL_TARGET} != "no"
-HOST_INSTALL_FILE?=	${INSTALL} ${COPY} ${PRESERVE} ${RENAME}
-HOST_INSTALL_DIR?=	${INSTALL} -d
-HOST_INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK} ${RENAME}
-.endif
-
-.endif
diff --git a/share/mk/ubix.inc.mk b/share/mk/ubix.inc.mk
deleted file mode 100644
index 4434e51..0000000
--- a/share/mk/ubix.inc.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#	$UBIXBSD: ubix.inc.mk,v 1.32 2006/03/16 18:43:34 jwise Exp $
-
-.include <ubix.init.mk>
-
-##### Basic targets
-includes:	${INCS} incinstall inclinkinstall
-
-##### Default values
-INCSYMLINKS?=
-
-##### Install rules
-incinstall::	# ensure existence
-.PHONY:		incinstall
-
-# -c is forced on here, in order to preserve modtimes for "make depend"
-__incinstall: .USE
-	@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
-	    (${_MKSHMSG_INSTALL} ${.TARGET}; \
-	     ${_MKSHECHO} "${INSTALL_FILE} -c -o ${BINOWN} -g ${BINGRP} \
-		-m ${NONBINMODE} ${.ALLSRC} ${.TARGET}" && \
-	     ${INSTALL_FILE} -c -o ${BINOWN} -g ${BINGRP} \
-		-m ${NONBINMODE} ${.ALLSRC} ${.TARGET})
-
-.for F in ${INCS:O:u}
-_FDIR:=		${INCSDIR_${F:C,/,_,g}:U${INCSDIR}}	# dir override
-_FNAME:=	${INCSNAME_${F:C,/,_,g}:U${INCSNAME:U${F}}} # name override
-_F:=		${DESTDIR}${_FDIR}/${_FNAME}		# installed path
-
-.if ${MKUPDATE} == "no"
-${_F}!		${F} __incinstall			# install rule
-.else
-${_F}:		${F} __incinstall			# install rule
-.endif
-
-incinstall::	${_F}
-.PRECIOUS:	${_F}					# keep if install fails
-.endfor
-
-.undef _FDIR
-.undef _FNAME
-.undef _F
-
-inclinkinstall:	.PHONY
-.if !empty(INCSYMLINKS)
-	@(set ${INCSYMLINKS}; \
-	 while test $$# -ge 2; do \
-		l=$$1; shift; \
-		t=${DESTDIR}$$1; shift; \
-		if  ttarg=`${TOOL_STAT} -qf '%Y' $$t` && \
-		    [ "$$l" = "$$ttarg" ]; then \
-			continue ; \
-		fi ; \
-		${_MKSHMSG_INSTALL} $$t; \
-		${_MKSHECHO} ${INSTALL_SYMLINK} $$l $$t; \
-		${INSTALL_SYMLINK} $$l $$t; \
-	 done; )
-.endif
diff --git a/share/mk/ubix.init.mk b/share/mk/ubix.init.mk
deleted file mode 100644
index f14f497..0000000
--- a/share/mk/ubix.init.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-.if !defined(_UBIX_INIT_MK_)
-_UBIX_INIT_MK_=1
-
-.-include "${.CURDIR}/../Makefile.inc"
-.include <ubix.own.mk>
-.MAIN:          all
-
-.endif  # !defined(_UBIX_INIT_MK_)
-
diff --git a/share/mk/ubix.kernobj.mk b/share/mk/ubix.kernobj.mk
deleted file mode 100644
index 21fddc6..0000000
--- a/share/mk/ubix.kernobj.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#	$UBIXBSD: bsd.kernobj.mk,v 1.14 2013/06/03 07:39:07 mrg Exp $
-
-# KERNSRCDIR	Is the location of the top of the kernel src.
-# 		It defaults to `${UBIXSRCDIR}/sys'.
-#
-# KERNARCHDIR	Is the location of the machine dependent kernel sources.
-#		It defaults to `arch/${MACHINE}', but may be overridden
-#		in case ${MACHINE} is not correct.
-#
-# KERNCONFDIRDEFAULT	Is the default for ${KERNCONFDIR}.
-#		It defaults to `${KERNSRCDIR}/${KERNARCHDIR}/conf'.
-#
-# KERNCONFDIR	Is where the configuration files for kernels are found.
-#		Users can set this to have build.sh find kernel
-#		configurations in another directory.
-#		It defaults to `${KERNCONFDIRDEFAULT}'.
-#
-# KERNOBJDIR	Is the kernel build directory.  The kernel GENERIC for
-# 		instance will be compiled in ${KERNOBJDIR}/GENERIC.
-# 		The default is the .OBJDIR of
-#		`${KERNSRCDIR}/${KERNARCHDIR}/compile'.
-#
-
-.include <ubix.own.mk>
-
-KERNSRCDIR?=		${UBIXSRCDIR}/sys
-KERNARCHDIR?=		arch/${MACHINE}
-KERNCONFDIRDEFAULT?=	${KERNSRCDIR}/${KERNARCHDIR}/conf
-KERNCONFDIR?=		${KERNCONFDIRDEFAULT}
-
-.if !defined(KERNOBJDIR) && exists(${KERNSRCDIR}/${KERNARCHDIR}/compile)
-KERNOBJDIR!=	cd "${KERNSRCDIR}/${KERNARCHDIR}/compile" && ${PRINTOBJDIR}
-.endif
diff --git a/share/mk/ubix.lib.mk b/share/mk/ubix.lib.mk
deleted file mode 100644
index eb9870e..0000000
--- a/share/mk/ubix.lib.mk
+++ /dev/null
@@ -1,968 +0,0 @@
-#	$UBIXBSD: ubix.lib.mk,v 1.362 2015/09/08 16:06:42 uebayasi Exp $
-#	@(#)ubix.lib.mk	8.3 (Berkeley) 4/22/94
-
-.include <ubix.init.mk>
-.include <ubix.shlib.mk>
-.include <ubix.gcc.mk>
-# Pull in <ubix.sys.mk> here so we can override its .c.o rule
-.include <ubix.sys.mk>
-
-LIBISMODULE?=	no
-LIBISPRIVATE?=	no
-LIBISCXX?=	no
-
-.if ${LIBISMODULE} != "no"
-_LIB_PREFIX?=	# empty
-MKDEBUGLIB:=	no
-MKLINT:=	no
-MKPICINSTALL:=	no
-MKPROFILE:=	no
-MKSTATICLIB:=	no
-.else
-_LIB_PREFIX?=	lib
-.endif
-
-.if ${LIBISPRIVATE} != "no"
-MKDEBUGLIB:=	no
-MKLINT:=	no
-MKPICINSTALL:=	no
-. if defined(NOSTATICLIB) && ${MKPICLIB} != "no"
-MKSTATICLIB:=	no
-. else
-MKPIC:=		no
-. endif
-MKPROFILE:=	no
-.endif
-
-##### Basic targets
-.PHONY:		checkver libinstall
-realinstall:	checkver libinstall
-
-##### LIB specific flags.
-# XXX: This is needed for programs that link with .a libraries
-# Perhaps a more correct solution is to always generate _pic.a
-# files or always have a shared library.
-.if defined(MKPIE) && (${MKPIE} != "no")
-CFLAGS+=        ${PIE_CFLAGS}
-AFLAGS+=        ${PIE_AFLAGS}
-.endif
-
-##### Libraries that this may depend upon.
-.if defined(LIBDPLIBS) && ${MKPIC} != "no"				# {
-.for _lib _dir in ${LIBDPLIBS}
-.if !defined(LIBDO.${_lib})
-LIBDO.${_lib}!=	cd "${_dir}" && ${PRINTOBJDIR}
-.MAKEOVERRIDES+=LIBDO.${_lib}
-.endif
-.if ${LIBDO.${_lib}} == "_external"
-LDADD+=		-l${_lib}
-.else
-LDADD+=		-L${LIBDO.${_lib}} -l${_lib}
-DPADD+=		${LIBDO.${_lib}}/lib${_lib}.so	# Don't use _LIB_PREFIX
-.endif
-.endfor
-.endif									# }
-
-##### Build and install rules
-MKDEP_SUFFIXES?=	.o .po .pico .go .ln .d
-
-.if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE})		# {
-SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
-SHLIB_MINOR != . ${SHLIB_VERSION_FILE} ; echo $$minor
-SHLIB_TEENY != . ${SHLIB_VERSION_FILE} ; echo $$teeny
-
-DPADD+=	${SHLIB_VERSION_FILE}
-
-# Check for higher installed library versions.
-.if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
-	exists(${UBIXSRCDIR}/lib/checkver)
-checkver:
-	@(cd "${.CURDIR}" && \
-	    HOST_SH=${HOST_SH:Q} AWK=${TOOL_AWK:Q} \
-	    ${HOST_SH} ${UBIXSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
-		    -d ${_DEST.OBJ} ${LIB})
-.endif
-.endif									# }
-
-.if !target(checkver)
-checkver:
-.endif
-
-print-shlib-major:
-.if defined(SHLIB_MAJOR) && ${MKPIC} != "no"
-	@echo ${SHLIB_MAJOR}
-.else
-	@false
-.endif
-
-print-shlib-minor:
-.if defined(SHLIB_MINOR) && ${MKPIC} != "no"
-	@echo ${SHLIB_MINOR}
-.else
-	@false
-.endif
-
-print-shlib-teeny:
-.if defined(SHLIB_TEENY) && ${MKPIC} != "no"
-	@echo ${SHLIB_TEENY}
-.else
-	@false
-.endif
-
-.if defined(SHLIB_MAJOR) && !empty(SHLIB_MAJOR)				# {
-.if defined(SHLIB_MINOR) && !empty(SHLIB_MINOR)
-.if defined(SHLIB_TEENY) && !empty(SHLIB_TEENY)
-SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}.${SHLIB_TEENY}
-.else
-SHLIB_FULLVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
-.else
-SHLIB_FULLVERSION=${SHLIB_MAJOR}
-.endif
-.endif									# }
-
-# add additional suffixes not exported.
-# .po is used for profiling object files.
-# .pico is used for PIC object files.
-.SUFFIXES: .out .a .ln .pico .po .go .o .s .S .c .cc .cpp .cxx .C .m .F .f .r .y .l .cl .p .h
-.SUFFIXES: .sh .m4 .m
-
-
-# Set PICFLAGS to cc flags for producing position-independent code,
-# if not already set.
-
-# Data-driven table using make variables to control how shared libraries
-# are built for different platforms and object formats.
-# SHLIB_MAJOR, SHLIB_MINOR, SHLIB_TEENY: Major, minor, and teeny version
-#			numbers of shared library
-# SHLIB_SOVERSION:	version number to be compiled into a shared library
-#			via -soname. Usualy ${SHLIB_MAJOR} on ELF.
-#			UBIXBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}
-#			[.${SHLIB_TEENY}]]
-# SHLIB_SHFLAGS:	Flags to tell ${LD} to emit shared library.
-#			with ELF, also set shared-lib version for ld.so.
-# SHLIB_LDSTARTFILE:	support .o file, call C++ file-level constructors
-# SHLIB_LDENDFILE:	support .o file, call C++ file-level destructors
-
-PICFLAGS ?= -fPIC
-
-.if ${MKPICLIB} != "no"
-CSHLIBFLAGS+= ${PICFLAGS}
-.endif
-
-.if defined(CSHLIBFLAGS) && !empty(CSHLIBFLAGS)
-MKSHLIBOBJS= yes
-.else
-MKSHLIBOBJS= no
-.endif
-
-.if (defined(MKDEBUG) && (${MKDEBUG} != "no")) || \
-    (defined(CFLAGS) && !empty(CFLAGS:M*-g*))
-# We only add -g to the shared library objects
-# because we don't currently split .a archives.
-CSHLIBFLAGS+=	-g
-.if ${LIBISPRIVATE} == "yes"
-CFLAGS+=	-g
-.endif
-.endif
-
-# Platform-independent linker flags for ELF shared libraries
-SHLIB_SOVERSION=	${SHLIB_MAJOR}
-SHLIB_SHFLAGS=		-Wl,-soname,${_LIB}.so.${SHLIB_SOVERSION}
-.if !defined(SHLIB_WARNTEXTREL) || ${SHLIB_WARNTEXTREL} != "no"
-SHLIB_SHFLAGS+=		-Wl,--warn-shared-textrel
-.endif
-.if !defined(SHLIB_MKMAP) || ${SHLIB_MKMAP} != "no"
-SHLIB_SHFLAGS+=		-Wl,-Map=${_LIB}.so.${SHLIB_SOVERSION}.map
-.endif
-CLEANFILES+=		${_LIB}.so.${SHLIB_SOVERSION}.map
-SHLIB_LDSTARTFILE?=	${_GCC_CRTI} ${_GCC_CRTBEGINS}
-SHLIB_LDENDFILE?=	${_GCC_CRTENDS} ${_GCC_CRTN}
-
-CFLAGS+=	${COPTS}
-OBJCFLAGS+=	${OBJCOPTS}
-AFLAGS+=	${COPTS}
-FFLAGS+=	${FOPTS}
-
-.if defined(CTFCONVERT)
-.if defined(CFLAGS) && !empty(CFLAGS:M*-g*)
-CTFFLAGS+=	-g
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
-#CFLAGS+=	-gdwarf-2
-.endif
-.endif
-.endif
-
-LIBSTRIPAOBJS=	yes
-.if !defined(CFLAGS) || empty(CFLAGS:M*-g*)
-LIBSTRIPCOBJS=	yes
-.endif
-.if !defined(OBJCFLAGS) || empty(OBJCFLAGS:M*-g*)
-LIBSTRIPOBJCOBJS=	yes
-.endif
-.if !defined(FFLAGS) || empty(FFLAGS:M*-g*)
-LIBSTRIPFOBJS=	yes
-.endif
-.if !defined(CSHLIBFLAGS) || empty(CSHLIBFLAGS:M*-g*) 
-LIBSTRIPSHLIBOBJS=	yes
-.endif
-
-.if defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
-SHLIB_SHFLAGS+= -L ${DESTDIR}/usr/lib
-SHLIB_SHFLAGS+= -Wl,-plugin=${GOLD_PLUGIN} \
-		-Wl,-plugin-opt=-disable-opt
-
-SECTIONIFYPASS?=${UBIXSRCDIR}/minix/llvm/bin/sectionify.so
-# dcvmoole: the following construction is a hack for libmagicrt.  For reasons
-# not entirely under our control, clang refuses to take .bc objects even when
-# using the gold linker, saying that LLVM IR code cannot be linked.  In order
-# to sidestep this, libmagicrt uses the name "foo.bc.o" instead of "foo.bc" to
-# link the its LLVM IR objects.  As all libmagicrt modules use the sectionify
-# pass below, and this step needs temporary files, we give the temporary files
-# the .o suffix (while anything would do!), and allow the libmagicrt makefile
-# to override the rename to the real file name to perform a copy instead.  As
-# a result, libmagicrt ends up with both the .bc and .bc.o objects, and it can
-# pass the latter set to clang, bypassing clang's overly strict checks.
-SECTIONIFYMV?=mv -f
-
-.S.bc: ${.TARGET:.bc=.o}
-	rm -f ${.TARGET}
-	ln ${.TARGET:.bc=.o} ${.TARGET}
-.c.bc:
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} -flto
-	if [ -n '${SECTIONIFY.${.IMPSRC:T}:U${SECTIONIFY}}' ]; then \
-		${OPT} -load ${SECTIONIFYPASS} -sectionify ${SECTIONIFY.${.IMPSRC:T}:U${SECTIONIFY}} -o ${.TARGET}.o ${.TARGET} && ${SECTIONIFYMV} ${.TARGET}.o ${.TARGET}; \
-	fi
-
-.cc.bc .cxx.bc .cpp.bc:
-	${_MKTARGET_COMPILE}
-	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} -flto
-.endif # defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
-.c.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPCOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.c.po:
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPCOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.c.go:
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET}
-
-.c.pico:
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if defined(LIBSTRIPSHLIBOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.cc.o .cpp.o .cxx.o .C.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(LIBSTRIPCOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.cc.po .cpp.po .cxx.po .C.po:
-	${_MKTARGET_COMPILE}
-	${COMPILE.cc} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -pg ${.IMPSRC} -o ${.TARGET}
-.if defined(LIBSTRIPCOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.cc.go .cpp.go .cxx.go .C.go:
-	${_MKTARGET_COMPILE}
-	${COMPILE.cc} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} -g ${.IMPSRC} -o ${.TARGET}
-
-.cc.pico .cpp.pico .cxx.pico .C.pico:
-	${_MKTARGET_COMPILE}
-	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${CSHLIBFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if defined(LIBSTRIPSHLIBOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.f.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.f} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPFOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.f.po:
-	${_MKTARGET_COMPILE}
-	${COMPILE.f} ${PROFFLAGS} -pg ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPFOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.f.go:
-	${_MKTARGET_COMPILE}
-	${COMPILE.f} ${DEBUGFLAGS} -g ${.IMPSRC} -o ${.TARGET}
-
-.f.pico:
-	${_MKTARGET_COMPILE}
-	${COMPILE.f} ${PICFLAGS} ${.IMPSRC} -o ${.TARGET}
-.if defined(LIBSTRIPFOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.f.ln:
-	${_MKTARGET_COMPILE}
-	@echo Skipping lint for Fortran libraries.
-
-.m.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.m} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPOBJCOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.m.po:
-	${_MKTARGET_COMPILE}
-	${COMPILE.m} ${PROFFLAGS} -pg ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPOBJCOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.m.go:
-	${_MKTARGET_COMPILE}
-	${COMPILE.m} ${DEBUGFLAGS} -g ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(LIBSTRIPOBJCOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.m.pico:
-	${_MKTARGET_COMPILE}
-	${COMPILE.m} ${CSHLIBFLAGS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(LIBSTRIPOBJCOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.s.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPAOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.S.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPAOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.s.po:
-	${_MKTARGET_COMPILE}
-	${COMPILE.s} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPAOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.S.po:
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${PROFFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-.if defined(LIBSTRIPAOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.s.go:
-	${_MKTARGET_COMPILE}
-	${COMPILE.s} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-
-.S.go:
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${DEBUGFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-
-.s.pico:
-	${_MKTARGET_COMPILE}
-	${COMPILE.s} ${PICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(LIBSTRIPAOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-.S.pico:
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${PICFLAGS} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
-.if defined(LIBSTRIPAOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-# Declare a few variables to make our life easier later.
-_LIB:=${_LIB_PREFIX}${LIB}
-_LIB.a:=${_LIB}.a
-_LIB_p.a:=${_LIB}_p.a
-_LIB_g.a:=${_LIB}_g.a
-_LIB_pic.a:=${_LIB}_pic.a
-_LIB.ln:=llib-l${LIB}.ln
-.if defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
-_LIB_bc.a:=${_LIB}_bc.a
-.endif # defined(__UBIX)
-
-.if ${MKPIC} != "no" && defined(SHLIB_FULLVERSION)
-_LIB.so:=${_LIB}.so
-_LIB.so.major:=${_LIB}.so.${SHLIB_MAJOR}
-_LIB.so.full:=${_LIB}.so.${SHLIB_FULLVERSION}
-_LIB.so.link:=${_LIB}.so.${SHLIB_FULLVERSION}.link
-.if ${MKDEBUG} != "no"
-_LIB.so.debug:=${_LIB.so.full}.debug
-.endif
-.endif
-
-_DEST.LIB:=${DESTDIR}${LIBDIR}
-_DEST.OBJ:=${DESTDIR}${_LIBSODIR}
-_DEST.LINT:=${DESTDIR}${LINTLIBDIR}
-_DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
-_DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}
-
-.if defined(LIB)							# {
-.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
-	|| ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no"
-_LIBS=${_LIB.a}
-.else
-_LIBS=
-.endif
-
-.if ${LIBISPRIVATE} != "no" \
-   && (defined(USE_COMBINE) && ${USE_COMBINE} == "yes" \
-   && !defined(NOCOMBINE))						# {
-.for f in ${SRCS:N*.h:N*.sh:C/\.[yl]$/.c/g}
-COMBINEFLAGS.${LIB}.$f := ${CPPFLAGS.$f:D1} ${CPUFLAGS.$f:D2} ${COPTS.$f:D3} ${OBJCOPTS.$f:D4} ${CXXFLAGS.$f:D5}
-.if empty(COMBINEFLAGS.${LIB}.${f}) && !defined(NOCOMBINE.$f)
-COMBINESRCS+=	${f}
-NODPSRCS+=	${f}
-.else
-OBJS+=  	${f:R:S/$/.o/}
-.endif
-.endfor
-
-.if !empty(COMBINESRCS)
-OBJS+=		${_LIB}_combine.o
-${_LIB}_combine.o: ${COMBINESRCS}
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} -MD --combine ${.ALLSRC} -o ${.TARGET}
-.if defined(LIBSTRIPOBJS)
-	${OBJCOPY} ${OBJCOPYLIBFLAGS} ${.TARGET}
-.endif
-
-CLEANFILES+=	${_LIB}_combine.d
-
-.if exists("${_LIB}_combine.d")
-.include "${_LIB}_combine.d"
-.endif
-.endif   # empty(XSRCS.${LIB})
-.else							# } {
-OBJS+=${SRCS:N*.h:N*.sh:R:S/$/.o/g}
-.endif							# }
-
-STOBJS+=${OBJS}
-
-LOBJS+=${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
-
-.if ${LIBISPRIVATE} != "no"
-# No installation is required
-libinstall::
-.endif
-
-.if ${MKDEBUGLIB} != "no"
-_LIBS+=${_LIB_g.a}
-GOBJS+=${OBJS:.o=.go}
-DEBUGFLAGS?=-DDEBUG
-.endif
-
-.if ${MKPROFILE} != "no"
-_LIBS+=${_LIB_p.a}
-POBJS+=${OBJS:.o=.po}
-PROFFLAGS?=-DGPROF -DPROF
-.endif
-
-.if ${MKPIC} != "no"							# {
-.if ${MKPICLIB} == "no"
-.if ${MKSHLIBOBJS} != "no"
-# make _pic.a, which isn't really pic,
-# since it's needed for making shared lib.
-# but don't install it.
-SOLIB=${_LIB_pic.a}
-SOBJS+=${OBJS:.o=.pico}
-.else
-SOLIB=${_LIB.a}
-.endif
-.else
-SOLIB=${_LIB_pic.a}
-_LIBS+=${SOLIB}
-SOBJS+=${OBJS:.o=.pico}
-.endif
-.if defined(SHLIB_FULLVERSION)
-_LIBS+=${_LIB.so.full}
-.endif
-.endif									# }
-
-.if ${MKLINT} != "no" && !empty(LOBJS)
-_LIBS+=${_LIB.ln}
-.endif
-
-ALLOBJS=
-.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
-	|| ${MKLINKLIB} != "no") && ${MKSTATICLIB} != "no"
-ALLOBJS+=${STOBJS}
-.endif
-ALLOBJS+=${POBJS} ${SOBJS}
-.if ${MKLINT} != "no" && !empty(LOBJS)
-ALLOBJS+=${LOBJS}
-.endif
-.else	# !defined(LIB)							# } {
-LOBJS=
-SOBJS=
-.endif	# !defined(LIB)							# }
-
-_YLSRCS=	${SRCS:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS:M*.y:.y=.h}}
-
-.if ${USE_BITCODE:Uno} == "yes"
-.if defined(LIB)
-_LIBS+=${_LIB_bc.a}
-.endif
-.endif # ${USE_BITCODE:Uno} == "yes"
-
-.NOPATH: ${ALLOBJS} ${_LIBS} ${_YLSRCS}
-
-realall: ${SRCS} ${ALLOBJS:O} ${_LIBS} ${_LIB.so.debug}
-
-MKARZERO?= ${MKREPRO:Uno}
-
-.if ${MKARZERO} == "yes"
-_ARFL=crsD
-_ARRANFL=sD
-_INSTRANLIB=
-.else
-_ARFL=crs
-_ARRANFL=s
-.if ${USE_BITCODE:Uno} == "yes"
-_INSTRANLIB=${empty(PRESERVE):?-a "${AR} --plugin ${GOLD_PLUGIN} -s":}
-.else
-_INSTRANLIB=${empty(PRESERVE):?-a "${RANLIB} -t":}
-.endif # ${USE_BITCODE:Uno} == "yes"
-.endif
-
-# If you change this, please consider reflecting the change in
-# the override in sys/rump/Makefile.rump.
-.if !target(__archivebuild)
-__archivebuild: .USE
-	${_MKTARGET_BUILD}
-	rm -f ${.TARGET}
-	${AR} ${_ARFL} ${.TARGET} `NM=${NM} ${LORDER} ${.ALLSRC:M*o} | ${TSORT}`
-.endif
-
-.if !target(__archiveinstall)
-__archiveinstall: .USE
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${_INSTRANLIB} ${.ALLSRC} ${.TARGET}
-.endif
-
-__archivesymlinkpic: .USE
-	${_MKTARGET_INSTALL}
-	${INSTALL_SYMLINK} ${.ALLSRC} ${.TARGET}
-
-DPSRCS+=	${_YLSRCS}
-CLEANFILES+=	${_YLSRCS}
-
-${STOBJS} ${POBJS} ${GOBJS} ${SOBJS} ${LOBJS}: ${DPSRCS}
-
-.if ${USE_BITCODE:Uno} == "yes"
-
-.if !target(__archivebuildbc)
-__archivebuildbc: .USE
-	${_MKTARGET_BUILD}
-	rm -f ${.TARGET}
-	${AR} ${_ARFL} --plugin ${GOLD_PLUGIN} ${.TARGET} ${.ALLSRC:M*bc}
-.endif
-
-# LSC: Ignore libunwind in the bitcode archive, otherwise final linking chokes
-#      on libunwind hidden assembly symbols.
-BCOBJS+=${OBJS:Nlibunwind.*:.o=.bc}
-ALLOBJS+=${BCOBJS}
-${_LIB_bc.a}:: ${BCOBJS} __archivebuildbc
-
-.endif # ${USE_BITCODE:Uno} == "yes"
-
-${_LIB.a}:: ${STOBJS} __archivebuild
-
-${_LIB_p.a}:: ${POBJS} __archivebuild
-
-${_LIB_pic.a}:: ${SOBJS} __archivebuild
-
-${_LIB_g.a}:: ${GOBJS} __archivebuild
-
-
-_LIBLDOPTS=
-.if ${SHLIBDIR} != "/usr/lib"
-_LIBLDOPTS+=	-Wl,-rpath,${SHLIBDIR} \
-		-L=${SHLIBDIR}
-.elif ${SHLIBINSTALLDIR} != "/usr/lib"
-_LIBLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
-		-L=${SHLIBINSTALLDIR}
-.endif
-
-# gcc -shared now adds -lc automatically. For libraries other than libc and
-# libgcc* we add as a dependency the installed shared libc. For libc and
-# libgcc* we avoid adding libc as a dependency by using -nostdlib. Note that
-# -Xl,-nostdlib is not enough because we want to tell the compiler-driver not
-# to add standard libraries, not the linker.
-.if !defined(LIB)
-.if !empty(LIBC_SO)
-DPLIBC ?= ${DESTDIR}${LIBC_SO}
-.endif
-.else
-.if ${LIB} != "c" && ${LIB:Mgcc*} == "" \
-    && ${LIB} != "sys" && ${LIB} != "minc" && ${LIB} != "mthread" # Minix-specific libs
-.if !empty(LIBC_SO)
-DPLIBC ?= ${DESTDIR}${LIBC_SO}
-.endif
-.else
-LDLIBC ?= -nodefaultlibs
-.if ${HAVE_LIBGCC} == "yes" && (${LIB} == "c" || ${LIB} == "minc")
-.if !defined(__UBIX)
-LDADD+= -lgcc
-.else
-LDADD+= ${${ACTIVE_CC} == "gcc":? -lgcc:}
-.if ${MACHINE_ARCH} == "earm"
-LDADD+= ${${ACTIVE_CC} == "gcc":? -lgcc_eh:}
-.endif # ${MACHINE_ARCH} == "earm"
-.endif # !defined(__UBIX)
-.endif
-.endif
-.endif
-
-.if ${LIBISCXX} != "no"
-LIBCC:=	${CXX}
-. if ${MKLIBCXX} == "yes"
-LIBDPLIBS+=     c++	${.CURDIR}/../../../../../external/ubix/libc++/lib
-. else
-LIBDPLIBS+=     stdc++	${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
-. endif
-.else
-LIBCC:=	${CC}
-.endif
-
-_LDADD.${_LIB}=	${LDADD} ${LDADD.${_LIB}}
-_LDFLAGS.${_LIB}=	${LDFLAGS} ${LDFLAGS.${_LIB}}
-
-_MAINLIBDEPS=	${SOLIB} ${DPADD} ${DPLIBC} \
-		${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
-
-.if defined(_LIB.so.debug)
-${_LIB.so.debug}: ${_LIB.so.link}
-	${_MKTARGET_CREATE}
-	(  ${OBJCOPY} --only-keep-debug \
-		${_LIB.so.link} ${_LIB.so.debug} \
-	) || (rm -f ${.TARGET}; false)
-${_LIB.so.full}: ${_LIB.so.link} ${_LIB.so.debug}
-	${_MKTARGET_CREATE}
-	(  ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
-		--add-gnu-debuglink=${_LIB.so.debug} \
-		${_LIB.so.link} ${_LIB.so.full} \
-	) || (rm -f ${.TARGET}; false)
-${_LIB.so.link}: ${_MAINLIBDEPS}
-.else # aka no MKDEBUG
-${_LIB.so.full}: ${_MAINLIBDEPS}
-.endif
-	${_MKTARGET_BUILD}
-	rm -f ${.TARGET}
-	${LIBCC} ${LDLIBC} -Wl,-x -shared ${SHLIB_SHFLAGS} \
-	    ${_LDFLAGS.${_LIB}} -o ${.TARGET} ${_LIBLDOPTS} \
-	    -Wl,--whole-archive ${SOLIB} \
-	    -Wl,--no-whole-archive ${_LDADD.${_LIB}}
-#  We don't use INSTALL_SYMLINK here because this is just
-#  happening inside the build directory/objdir. XXX Why does
-#  this spend so much effort on libraries that aren't live??? XXX
-#  XXX Also creates dead symlinks until the .full rule runs
-#  above and creates the main link
-.if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \
-    "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"
-	${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so.major}.tmp
-	mv -f ${_LIB.so.major}.tmp ${_LIB.so.major}
-.endif
-	${HOST_LN} -sf ${_LIB.so.full} ${_LIB.so}.tmp
-	mv -f ${_LIB.so}.tmp ${_LIB.so}
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-.if !empty(LOBJS)							# {
-LLIBS?=		-lc
-${_LIB.ln}: ${LOBJS}
-	${_MKTARGET_COMPILE}
-	rm -f ${.TARGET}
-.if defined(DESTDIR)
-	${LINT} -C${LIB} ${.ALLSRC} -L${DESTDIR}/usr/libdata ${LLIBS}
-.else
-	${LINT} -C${LIB} ${.ALLSRC} ${LLIBS}
-.endif
-.endif									# }
-
-lint: ${LOBJS}
-.if defined(LOBJS) && !empty(LOBJS)
-	${LINT} ${LINTFLAGS} ${LOBJS}
-.endif
-
-
-# If the number of entries in CLEANFILES is too large, then the
-# commands in ubix.clean.mk encounter errors like "exec(/bin/sh)
-# failed (Argument list too long)".  Avoid that by splitting the
-# files to clean into several lists using different variable names.
-# __cleanuse is an internal target in ubix.clean.mk; the way we
-# use it here mimics the way it's used by the clean target in
-# ubix.clean.mk.
-#
-clean: libclean1 libclean2 libclean3 libclean4 libclean5
-libclean1: .PHONY .MADE __cleanuse LIBCLEANFILES1
-libclean2: .PHONY .MADE __cleanuse LIBCLEANFILES2
-libclean3: .PHONY .MADE __cleanuse LIBCLEANFILES3
-libclean4: .PHONY .MADE __cleanuse LIBCLEANFILES4
-libclean5: .PHONY .MADE __cleanuse LIBCLEANFILES5
-.if defined(__UBIX)
-# MINIX: core conflicts with core/ in lib/liblwip
-CLEANFILES+= a.out [Ee]rrs mklog *.core
-.else
-CLEANFILES+= a.out [Ee]rrs mklog core *.core
-.endif # defined(__UBIX)
-LIBCLEANFILES1+= ${_LIB.a}   ${STOBJS} ${STOBJS:=.tmp}
-LIBCLEANFILES2+= ${_LIB_p.a} ${POBJS}  ${POBJS:=.tmp}
-LIBCLEANFILES3+= ${_LIB_g.a} ${GOBJS}  ${GOBJS:=.tmp}
-LIBCLEANFILES4+= ${_LIB_pic.a}
-.if ${MKPIC} != "no" && defined(SHLIB_FULLVERSION)
-LIBCLEANFILES4+= ${_LIB.so}.* ${_LIB.so} ${_LIB.so.debug}
-.endif
-LIBCLEANFILES4+= ${SOBJS} ${SOBJS:=.tmp}
-LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
-
-.if defined(__UBIX)
-clean: libclean6
-libclean6: .PHONY .MADE __cleanuse LIBCLEANFILES6
-LIBCLEANFILES6+= ${_LIB_bc.a} ${BCOBJS} ${BCOBJS:=.tmp}
-.endif
-
-.if !target(libinstall)							# {
-# Make sure it gets defined, in case MKPIC==no && MKLINKLIB==no
-libinstall::
-
-.if ${USE_BITCODE:Uno} == "yes"
-libinstall:: ${_DEST.LIB}/bc/${_LIB.a}
-.PRECIOUS: ${_DEST.LIB}/bc/${_LIB.a}
-
-.if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(${_LIB_bc.a})
-${_DEST.LIB}/bc/${_LIB.a}! .MADE
-.endif
-${_DEST.LIB}/bc/${_LIB.a}! ${_LIB_bc.a} __archiveinstall
-.else
-.if !defined(BUILD) && !make(all) && !make(${_LIB_bc.a})
-${_DEST.LIB}/bc/${_LIB.a}: .MADE
-.endif
-${_DEST.LIB}/bc/${_LIB.a}: ${_LIB_bc.a} __archiveinstall
-.endif
-.endif # ${USE_BITCODE:Uno} == "yes"
-
-.if ${MKLINKLIB} != "no" && ${MKSTATICLIB} != "no"
-libinstall:: ${_DEST.LIB}/${_LIB.a}
-.PRECIOUS: ${_DEST.LIB}/${_LIB.a}
-
-.if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(${_LIB.a})
-${_DEST.LIB}/${_LIB.a}! .MADE
-.endif
-${_DEST.LIB}/${_LIB.a}! ${_LIB.a} __archiveinstall
-.else
-.if !defined(BUILD) && !make(all) && !make(${_LIB.a})
-${_DEST.LIB}/${_LIB.a}: .MADE
-.endif
-${_DEST.LIB}/${_LIB.a}: ${_LIB.a} __archiveinstall
-.endif
-.endif
-
-.if ${MKPROFILE} != "no"
-libinstall:: ${_DEST.LIB}/${_LIB_p.a}
-.PRECIOUS: ${_DEST.LIB}/${_LIB_p.a}
-
-.if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(${_LIB_p.a})
-${_DEST.LIB}/${_LIB_p.a}! .MADE
-.endif
-${_DEST.LIB}/${_LIB_p.a}! ${_LIB_p.a} __archiveinstall
-.else
-.if !defined(BUILD) && !make(all) && !make(${_LIB_p.a})
-${_DEST.LIB}/${_LIB_p.a}: .MADE
-.endif
-${_DEST.LIB}/${_LIB_p.a}: ${_LIB_p.a} __archiveinstall
-.endif
-.endif
-
-.if ${MKDEBUGLIB} != "no"
-libinstall:: ${_DEST.LIB}/${_LIB_g.a}
-.PRECIOUS: ${_DEST.LIB}/${_LIB_g.a}
-
-.if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(${_LIB_g.a})
-${_DEST.LIB}/${_LIB_g.a}! .MADE
-.endif
-${_DEST.LIB}/${_LIB_g.a}! ${_LIB_g.a} __archiveinstall
-.else
-.if !defined(BUILD) && !make(all) && !make(${LIB_g.a})
-${_DEST.LIB}/${_LIB_g.a}: .MADE
-.endif
-${_DEST.LIB}/${_LIB_g.a}: ${_LIB_g.a} __archiveinstall
-.endif
-.endif
-
-.if ${MKPIC} != "no" && ${MKPICINSTALL} != "no"
-libinstall:: ${_DEST.LIB}/${_LIB_pic.a}
-.PRECIOUS: ${_DEST.LIB}/${_LIB_pic.a}
-
-.if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(${_LIB_pic.a})
-${_DEST.LIB}/${_LIB_pic.a}! .MADE
-.endif
-.if ${MKPICLIB} == "no"
-${_DEST.LIB}/${_LIB_pic.a}! ${_LIB.a} __archivesymlinkpic
-.else
-${_DEST.LIB}/${_LIB_pic.a}! ${_LIB_pic.a} __archiveinstall
-.endif
-.else
-.if !defined(BUILD) && !make(all) && !make(${_LIB_pic.a})
-${_DEST.LIB}/${_LIB_pic.a}: .MADE
-.endif
-.if ${MKPICLIB} == "no"
-${_DEST.LIB}/${_LIB_pic.a}: ${_LIB.a} __archivesymlinkpic
-.else
-${_DEST.LIB}/${_LIB_pic.a}: ${_LIB_pic.a} __archiveinstall
-.endif
-.endif
-.endif
-
-.if ${MKPIC} != "no" && defined(SHLIB_FULLVERSION)
-
-libinstall:: ${_DEST.OBJ}/${_LIB.so.full}
-.PRECIOUS: ${_DEST.OBJ}/${_LIB.so.full}
-
-.if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(${_LIB.so.full})
-${_DEST.OBJ}/${_LIB.so.full}! .MADE
-.endif
-${_DEST.OBJ}/${_LIB.so.full}! ${_LIB.so.full}
-.else
-.if !defined(BUILD) && !make(all) && !make(${_LIB.so.full})
-${_DEST.OBJ}/${_LIB.so.full}: .MADE
-.endif
-${_DEST.OBJ}/${_LIB.so.full}: ${_LIB.so.full}
-.endif
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-	    ${.ALLSRC} ${.TARGET}
-.if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
-	    ${_DEST.LIB}/${_LIB.so.full} 
-.endif
-.if defined(SHLIB_FULLVERSION) && defined(SHLIB_MAJOR) && \
-    "${SHLIB_FULLVERSION}" != "${SHLIB_MAJOR}"
-	${INSTALL_SYMLINK} ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so.major}
-.if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
-	    ${_DEST.LIB}/${_LIB.so.major}
-.endif
-.endif
-.if ${MKLINKLIB} != "no"
-	${INSTALL_SYMLINK}  ${_LIB.so.full} ${_DEST.OBJ}/${_LIB.so}
-.if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} -l r ${_DEST.OBJ}/${_LIB.so.full} \
-	    ${_DEST.LIB}/${_LIB.so}
-.endif
-.endif
-.endif
-
-.if defined(_LIB.so.debug)
-libinstall:: ${_DEST.DEBUG}/${_LIB.so.debug}
-.PRECIOUS: ${_DEST.DEBUG}/${_LIB.so.debug}
-
-${_DEST.DEBUG}/${_LIB.so.debug}: ${_LIB.so.debug}
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \
-	    ${.ALLSRC} ${.TARGET}
-.if ${_LIBSODIR} != ${LIBDIR}
-	${INSTALL_SYMLINK} -l r ${_DEST.DEBUG}/${_LIB.so.debug} \
-	    ${_DEST.ODEBUG}/${_LIB.so.debug} 
-.endif
-.endif
-
-.if ${MKLINT} != "no" && !empty(LOBJS)
-libinstall:: ${_DEST.LINT}/${_LIB.ln}
-.PRECIOUS: ${_DEST.LINT}/${_LIB.ln}
-
-.if ${MKUPDATE} == "no"
-.if !defined(BUILD) && !make(all) && !make(${_LIB.ln})
-${_DEST.LINT}/${_LIB.ln}! .MADE
-.endif
-${_DEST.LINT}/${_LIB.ln}! ${_LIB.ln}
-.else
-.if !defined(BUILD) && !make(all) && !make(${_LIB.ln})
-${_DEST.LINT}/${_LIB.ln}: .MADE
-.endif
-${_DEST.LINT}/${_LIB.ln}: ${_LIB.ln}
-.endif
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${.ALLSRC} ${_DEST.LINT}
-.endif
-.endif	# !target(libinstall)						# }
-
-##### Pull in related .mk logic
-LINKSOWN?= ${LIBOWN}
-LINKSGRP?= ${LIBGRP}
-LINKSMODE?= ${LIBMODE}
-.include <ubix.man.mk>
-.include <ubix.nls.mk>
-.include <ubix.files.mk>
-.include <ubix.inc.mk>
-.include <ubix.links.mk>
-.include <ubix.dep.mk>
-.include <ubix.clang-analyze.mk>
-.include <ubix.clean.mk>
-
-${TARGETS}:	# ensure existence
diff --git a/share/mk/ubix.links.mk b/share/mk/ubix.links.mk
deleted file mode 100644
index e8e56f5..0000000
--- a/share/mk/ubix.links.mk
+++ /dev/null
@@ -1,96 +0,0 @@
-#	$UBIXBSD: ubix.links.mk,v 1.34 2009/04/10 16:16:12 apb Exp $
-
-.include <ubix.init.mk>
-
-##### Basic targets
-install:	linksinstall
-
-##### Default values
-LINKS?=
-SYMLINKS?=
-LINKSOWN?=	${BINOWN}
-LINKSGRP?=	${BINGRP}
-LINKSMODE?=	${NONBINMODE}
-
-__linkinstall: .USE
-	${_MKSHMSG_INSTALL} ${.TARGET}; \
-	${_MKSHECHO} "${INSTALL_LINK} \
-	    -o ${LINKSOWN_${.ALLSRC:T}:U${LINKSOWN}} \
-	    -g ${LINKSGRP_${.ALLSRC:T}:U${LINKSGRP}} \
-	    -m ${LINKSMODE_${.ALLSRC:T}:U${LINKSMODE}} \
-	    ${.ALLSRC} ${.TARGET}" && \
-	${INSTALL_LINK} \
-	    -o ${LINKSOWN_${.ALLSRC:T}:U${LINKSOWN}} \
-	    -g ${LINKSGRP_${.ALLSRC:T}:U${LINKSGRP}} \
-	    -m ${LINKSMODE_${.ALLSRC:T}:U${LINKSMODE}} \
-	    ${.ALLSRC} ${.TARGET}
-
-##### Install rules
-.PHONY:		linksinstall
-linksinstall::	realinstall
-.if !empty(SYMLINKS)
-	@(set ${SYMLINKS}; \
-	 while test $$# -ge 2; do \
-		l=$$1; shift; \
-		t=${DESTDIR}$$1; shift; \
-		if  ttarg=`${TOOL_STAT} -qf '%Y' $$t` && \
-		    [ "$$l" = "$$ttarg" ]; then \
-			continue ; \
-		fi ; \
-		${_MKSHMSG_INSTALL} $$t; \
-		${_MKSHECHO} ${INSTALL_SYMLINK} $$l $$t; \
-		${INSTALL_SYMLINK} $$l $$t; \
-	 done; )
-.endif
-
-.for _src _dst in ${LINKS}
-_l:=${DESTDIR}${_src}
-_t:=${DESTDIR}${_dst}
-
-# Handle case conflicts carefully, when _dst occurs
-# more than once after case flattening
-.if ${MKUPDATE} == "no" || ${LINKS:tl:M${_dst:tl:Q}:[\#]} > 1
-${_t}!		${_l} __linkinstall
-.else
-${_t}:		${_l} __linkinstall
-.endif
-
-linksinstall::	${_t}
-.PRECIOUS:	${_t}
-.endfor
-
-configinstall:		configlinksinstall
-.PHONY:			configlinksinstall
-configlinksinstall::	configfilesinstall
-.if !empty(CONFIGSYMLINKS)
-	@(set ${CONFIGSYMLINKS}; \
-	 while test $$# -ge 2; do \
-		l=$$1; shift; \
-		t=${DESTDIR}$$1; shift; \
-		if  ttarg=`${TOOL_STAT} -qf '%Y' $$t` && \
-		    [ "$$l" = "$$ttarg" ]; then \
-			continue ; \
-		fi ; \
-		${_MKSHMSG_INSTALL} $$t; \
-		${_MKSHECHO} ${INSTALL_SYMLINK} $$l $$t; \
-		${INSTALL_SYMLINK} $$l $$t; \
-	 done; )
-.endif
-
-.for _src _dst in ${CONFIGLINKS}
-_l:=${DESTDIR}${_src}
-_t:=${DESTDIR}${_dst}
-
-# Handle case conflicts carefully, when _dst occurs
-# more than once after case flattening
-.if ${MKUPDATE} == "no" || ${CONFIGLINKS:tl:M${_dst:tl:Q}:[\#]} > 1
-${_t}!		${_l} __linkinstall
-.else
-${_t}:		${_l} __linkinstall
-.endif
-
-configlinksinstall::	${_t}
-.PRECIOUS:	${_t}
-.endfor
-
-.include <ubix.sys.mk>
diff --git a/share/mk/ubix.man.mk b/share/mk/ubix.man.mk
deleted file mode 100644
index 0e151cd..0000000
--- a/share/mk/ubix.man.mk
+++ /dev/null
@@ -1,302 +0,0 @@
-#	$UBIXBSD: ubix.man.mk,v 1.117 2014/12/19 22:25:39 christos Exp $
-#	@(#)ubix.man.mk	8.1 (Berkeley) 6/8/93
-
-.include <ubix.init.mk>
-
-##### Basic targets
-.PHONY:		catinstall maninstall catpages manpages catlinks manlinks
-.PHONY:		htmlinstall htmlpages htmllinks
-.PHONY:		lintmanpages
-realinstall:	${MANINSTALL}
-
-# If our install destination is case-preserving, but case-insensitive
-# then we do filesystem comparisons in lower case to make sure that
-# we always refresh the target when needed. In general we don't
-# want to do this, otherwise things like _exit.2 -> _Exit.2 get
-# installed on each build even when they don't need to. Note that
-# the CASE_INSENSITIVE_DEST macro is currently not defined anywhere,
-# and the expansion does not really work because of make(1).
-.if defined(CASE_INSENSITIVE_DEST)
-_FLATTEN?=tl:
-.endif
-
-##### Default values
-.if ${USETOOLS} == "yes"
-TMACDEPDIR?=	${TOOLDIR}/share/groff/tmac
-.else
-TMACDEPDIR?=	/usr/share/tmac
-.endif
-
-HTMLDIR?=	${DESTDIR}${MANDIR}
-.if ${MKMANDOC} == yes && !defined(NOMANDOC)
-CATDEPS?=
-.else
-CATDEPS?=	${TMACDEPDIR}/andoc.tmac \
-		${TMACDEPDIR}/doc.tmac \
-		${TMACDEPDIR}/mdoc/doc-common \
-		${TMACDEPDIR}/mdoc/doc-ditroff \
-		${TMACDEPDIR}/mdoc/doc-nroff \
-		${TMACDEPDIR}/mdoc/doc-syms
-.endif
-MANTARGET?=	cat
-
-MAN?=
-MLINKS?=
-_MSECTIONS=	1 2 3 4 5 6 7 8 9
-_MSECTIONS+=	3lua 9lua
-_MSECTIONREGEX=	${_MSECTIONS:ts|} # e.g. 1|2|3|...
-.SUFFIXES:	${_MSECTIONS:@N@.$N@}
-
-.if ${MKMANZ} == "no"
-MANCOMPRESS?=
-MANSUFFIX?=
-.else
-MANCOMPRESS?=	${TOOL_GZIP_N} -cf
-MANSUFFIX?=	.gz
-.endif
-
-# make MANCOMPRESS a filter, so it can be inserted on an as-needed basis
-.if !empty(MANCOMPRESS)
-MANCOMPRESS:=	| ${MANCOMPRESS}
-.endif
-
-__installpage: .USE
-	@cmp -s ${.ALLSRC} ${.TARGET} > /dev/null 2>&1 || \
-	    (${_MKSHMSG_INSTALL} ${.TARGET}; \
-	     ${_MKSHECHO} "${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
-		${.ALLSRC} ${.TARGET}" && \
-	     ${INSTALL_FILE} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
-		${.ALLSRC} ${.TARGET})
-
-# XXX consider including ubix.links.mk and using __linkinstall instead
-__linkinstallpage: .USE
-	${_MKSHMSG_INSTALL} ${.TARGET}; \
-	${_MKSHECHO} "${INSTALL_LINK} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
-	    ${.ALLSRC} ${.TARGET}" && \
-	${INSTALL_LINK} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
-	    ${.ALLSRC} ${.TARGET}
-
-##### Build and install rules (source form pages)
-
-.if ${MKMAN} != "no"
-maninstall:	manpages manlinks
-manpages::	# ensure target exists
-MANPAGES=	${MAN:C/.$/&${MANSUFFIX}/}
-
-realall:	${MANPAGES}
-.if !empty(MANSUFFIX)
-.NOPATH:	${MANPAGES}
-.SUFFIXES:	${_MSECTIONS:@N@.$N${MANSUFFIX}@}
-
-${_MSECTIONS:@N@.$N.$N${MANSUFFIX}@}:			# build rule
-	${_MKTARGET_FORMAT}
-	cat ${.IMPSRC} ${MANCOMPRESS} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
-.endif # !empty(MANSUFFIX)
-
-.for F in ${MANPAGES:S/${MANSUFFIX}$//:O:u}
-_F:=		${DESTDIR}${MANDIR}/man${F:T:E}${MANSUBDIR}/${F}${MANSUFFIX}
-
-.if ${MKUPDATE} == "no"
-${_F}!		${F}${MANSUFFIX} __installpage		# install rule
-.if !defined(BUILD) && !make(all) && !make(${F})
-${_F}!		.MADE					# no build at install
-.endif
-.else
-${_F}:		${F}${MANSUFFIX} __installpage		# install rule
-.if !defined(BUILD) && !make(all) && !make(${F})
-${_F}:		.MADE					# no build at install
-.endif
-.endif
-
-manpages::	${_F}
-.PRECIOUS:	${_F}					# keep if install fails
-.endfor
-
-manlinks::						# link install
-
-.for _src _dst in ${MLINKS}
-_l:=${DESTDIR}${MANDIR}/man${_src:T:E}${MANSUBDIR}/${_src}${MANSUFFIX}
-_t:=${DESTDIR}${MANDIR}/man${_dst:T:E}${MANSUBDIR}/${_dst}${MANSUFFIX}
-
-# Handle case conflicts carefully, when _dst occurs
-# more than once after case flattening
-.if ${MKUPDATE} == "no" || ${MLINKS:${_FLATTEN}M${_dst:${_FLATTEN}Q}:[\#]} > 1
-${_t}!		${_l} __linkinstallpage
-.else
-${_t}:		${_l} __linkinstallpage
-.endif
-
-manlinks::	${_t}
-.PRECIOUS:	${_t}
-.endfor
-.endif # ${MKMAN} != "no"
-
-##### Build and install rules (plaintext pages)
-
-.if (${MKCATPAGES} != "no") && (${MKMAN} != "no")
-catinstall:	catpages catlinks
-catpages::	# ensure target exists
-CATPAGES=	${MAN:C/\.(${_MSECTIONREGEX})\$/.cat\1${MANSUFFIX}/}
-
-realall:	${CATPAGES}
-.NOPATH:	${CATPAGES}
-.SUFFIXES:	${_MSECTIONS:@N@.cat$N${MANSUFFIX}@}
-.MADE:	${CATDEPS}
-
-${_MSECTIONS:@N@.$N.cat$N${MANSUFFIX}@}: ${CATDEPS}	# build rule
-	${_MKTARGET_FORMAT}
-.if ${MKMANDOC} == yes && !defined(NOMANDOC)
-	if test ""${NOMANDOC.${.IMPSRC:T}:tl:Q} != "yes"; then \
-		${TOOL_MANDOC_ASCII} ${.IMPSRC} ${MANCOMPRESS} \
-		    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
-	else \
-		${TOOL_ROFF_ASCII} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
-		    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
-	fi
-.elif defined(USETBL)
-	${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_ASCII} -mandoc ${MANCOMPRESS} \
-	    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
-.else
-	${TOOL_ROFF_ASCII} -mandoc ${.IMPSRC} ${MANCOMPRESS} \
-	    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
-.endif
-
-.for F in ${CATPAGES:S/${MANSUFFIX}$//:O:u}
-_F:=		${DESTDIR}${MANDIR}/${F:T:E}${MANSUBDIR}/${F:R}.0${MANSUFFIX}
-
-.if ${MKUPDATE} == "no"
-${_F}!		${F}${MANSUFFIX} __installpage		# install rule
-.if !defined(BUILD) && !make(all) && !make(${F})
-${_F}!		.MADE					# no build at install
-.endif
-.else
-${_F}:		${F}${MANSUFFIX} __installpage		# install rule
-.if !defined(BUILD) && !make(all) && !make(${F})
-${_F}:		.MADE					# no build at install
-.endif
-.endif
-
-catpages::	${_F}
-.PRECIOUS:	${_F}					# keep if install fails
-.endfor
-
-catlinks::						# link install
-
-.for _src _dst in ${MLINKS}
-_l:=${DESTDIR}${MANDIR}/cat${_src:T:E}${MANSUBDIR}/${_src:R}.0${MANSUFFIX}
-_t:=${DESTDIR}${MANDIR}/cat${_dst:T:E}${MANSUBDIR}/${_dst:R}.0${MANSUFFIX}
-
-# Handle case conflicts carefully, when _dst occurs
-# more than once after case flattening
-.if ${MKUPDATE} == "no" || ${MLINKS:${_FLATTEN}M${_dst:${_FLATTEN}Q}:[\#]} > 1
-${_t}!		${_l} __linkinstallpage
-.else
-${_t}:		${_l} __linkinstallpage
-.endif
-
-catlinks::	${_t}
-.PRECIOUS:	${_t}
-.endfor
-.endif # (${MKCATPAGES} != "no") && (${MKMAN} != "no")
-
-##### Build and install rules (HTML pages)
-
-.if (${MKHTML} != "no") && (${MKMAN} != "no")		# {
-htmlinstall:	htmlpages htmllinks
-htmlpages::	# ensure target exists
-HTMLPAGES=	${MAN:C/\.(${_MSECTIONREGEX})\$/.html\1/}
-
-HTMLLINKS=	${MANSUBDIR:?../:}../html%S/%N.html
-HTMLSTYLE=	${MANSUBDIR:?../:}../style.css
-
-realall:	${HTMLPAGES}
-.NOPATH:	${HTMLPAGES}
-.SUFFIXES:	${_MSECTIONS:@N@.html$N@}
-
-${_MSECTIONS:@N@.$N.html$N@}: 				# build rule
-	${_MKTARGET_FORMAT}
-.if ${MKMANDOC} == yes && !defined(NOMANDOC)
-	if test ""${NOMANDOC.${.IMPSRC:T}:tl:Q} != "yes"; then \
-	    ${TOOL_MANDOC_HTML} -Oman=${HTMLLINKS} -Ostyle=${HTMLSTYLE} \
-		${.IMPSRC} > ${.TARGET}.tmp && \
-		mv ${.TARGET}.tmp ${.TARGET}; \
-	else \
-		${TOOL_ROFF_HTML} ${.IMPSRC} ${MANCOMPRESS} \
-		    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}; \
-	fi
-.elif defined(USETBL)
-	${TOOL_TBL} ${.IMPSRC} | ${TOOL_ROFF_HTML} ${MANCOMPRESS} \
-	    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
-.else
-	${TOOL_ROFF_HTML} ${.IMPSRC} ${MANCOMPRESS} \
-	    > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
-.endif
-
-.for F in ${HTMLPAGES:O:u}
-# construct installed path
-_F:=		${HTMLDIR}/${F:T:E}${MANSUBDIR}/${F:R:S-/index$-/x&-}.html
-
-.if ${MKUPDATE} == "no"
-${_F}!		${F} __installpage			# install rule
-.if !defined(BUILD) && !make(all) && !make(${F})
-${_F}!		.MADE					# no build at install
-.endif
-.else
-${_F}:		${F} __installpage			# install rule
-.if !defined(BUILD) && !make(all) && !make(${F})
-${_F}:		.MADE					# no build at install
-.endif
-.endif
-
-htmlpages::	${_F}
-.PRECIOUS:	${_F}					# keep if install fails
-.endfor
-
-htmllinks::						# link install
-
-.for _src _dst in ${MLINKS}
-_l:=${HTMLDIR}/html${_src:T:E}${MANSUBDIR}/${_src:R:S-/index$-/x&-}.html
-_t:=${HTMLDIR}/html${_dst:T:E}${MANSUBDIR}/${_dst:R:S-/index$-/x&-}.html
-
-# Handle case conflicts carefully, when _dst occurs
-# more than once after case flattening
-.if ${MKUPDATE} == "no" || ${MLINKS:${_FLATTEN}M${_dst:${_FLATTEN}Q}:[\#]} > 1
-${_t}!		${_l} __linkinstallpage
-.else
-${_t}:		${_l} __linkinstallpage
-.endif
-
-htmllinks::	${_t}
-.PRECIOUS:	${_t}
-.endfor
-
-.endif							# }
-
-##### Clean rules
-.undef _F
-
-.if !empty(MAN) && (${MKMAN} != "no")
-.if (${MKCATPAGES} != "no")
-CLEANDIRFILES+= ${CATPAGES}
-.endif
-.if !empty(MANSUFFIX)
-CLEANDIRFILES+= ${MANPAGES} ${CATPAGES:S/${MANSUFFIX}$//}
-.endif
-.if ${MKHTML} != "no"
-CLEANDIRFILES+= ${HTMLPAGES}
-.endif
-.endif
-# (XXX ${CATPAGES:S...} cleans up old .catN files where .catN.gz now used)
-
-.if !empty(MANPAGES)
-lintmanpages: ${MANPAGES}
-	${TOOL_MANDOC_LINT} -Tlint -fstrict -Wall,stop ${.ALLSRC}
-.endif
-
-##### Pull in related .mk logic
-.include <ubix.obj.mk>
-.include <ubix.files.mk>
-.include <ubix.sys.mk>
-.include <ubix.clean.mk>
-
-${TARGETS} catinstall maninstall htmlinstall: # ensure existence
diff --git a/share/mk/ubix.nls.mk b/share/mk/ubix.nls.mk
deleted file mode 100644
index aab391d..0000000
--- a/share/mk/ubix.nls.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#	$UBIXBSD: ubix.nls.mk,v 1.47 2011/09/10 16:57:35 apb Exp $
-
-.include <ubix.init.mk>
-
-##### Basic targets
-realinstall:	nlsinstall
-
-##### Default values
-NLSNAME?=	${PROG:Ulib${LIB}}
-
-NLS?=
-
-##### Build rules
-.if ${MKNLS} != "no"
-
-NLSALL=		${NLS:.msg=.cat}
-
-realall:	${NLSALL}
-.NOPATH:	${NLSALL}
-
-.SUFFIXES: .cat .msg
-
-.msg.cat:
-	@rm -f ${.TARGET}
-	${_MKTARGET_CREATE}
-	${TOOL_GENCAT} ${.TARGET} ${.IMPSRC}
-
-.endif # ${MKNLS} != "no"
-
-##### Install rules
-nlsinstall::	# ensure existence
-.PHONY:		nlsinstall
-
-.if ${MKNLS} != "no"
-
-__nlsinstall: .USE
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} -o ${NLSOWN} -g ${NLSGRP} -m ${NLSMODE} \
-		${.ALLSRC} ${.TARGET}
-
-.for F in ${NLSALL:O:u}
-_F:=		${DESTDIR}${NLSDIR}/${F:T:R}/${NLSNAME}.cat # installed path
-
-.if ${MKUPDATE} == "no"
-${_F}!		${F} __nlsinstall			# install rule
-.if !defined(BUILD) && !make(all) && !make(${F})
-${_F}!		.MADE					# no build at install
-.endif
-.else
-${_F}:		${F} __nlsinstall			# install rule
-.if !defined(BUILD) && !make(all) && !make(${F})
-${_F}:		.MADE					# no build at install
-.endif
-.endif
-
-nlsinstall::	${_F}
-.PRECIOUS:	${_F}					# keep if install fails
-.endfor
-
-.undef _F
-.endif # ${MKNLS} != "no"
-
-##### Clean rules
-.if ${MKNLS} != "no" && !empty(NLS)
-CLEANDIRFILES+= ${NLSALL}
-.endif
-
-##### Pull in related .mk logic
-.include <ubix.obj.mk>
-.include <ubix.sys.mk>
-.include <ubix.clean.mk>
diff --git a/share/mk/ubix.obj.mk b/share/mk/ubix.obj.mk
deleted file mode 100644
index 36a68e5..0000000
--- a/share/mk/ubix.obj.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-#	$UBIXBSD: ubix.obj.mk,v 1.49 2010/01/25 00:43:00 christos Exp $
-
-.if !defined(_UBIX_OBJ_MK_)
-_UBIX_OBJ_MK_=1
-
-.include <ubix.own.mk>
-
-__curdir:=	${.CURDIR}
-
-.if ${MKOBJ} == "no"
-obj:
-.else
-.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
-.if defined(MAKEOBJDIRPREFIX)
-__objdir:= ${MAKEOBJDIRPREFIX}${__curdir}
-.else
-__objdir:= ${MAKEOBJDIR}
-.endif
-# MAKEOBJDIR and MAKEOBJDIRPREFIX are env variables supported
-# by make(1).  We simply mkdir -p the specified path.
-# If that fails - we do a mkdir to get the appropriate error message
-# before bailing out.
-obj:
-.if defined(MAKEOBJDIRPREFIX)
-	@if [ ! -d ${MAKEOBJDIRPREFIX} ]; then \
-		echo "MAKEOBJDIRPREFIX ${MAKEOBJDIRPREFIX} does not exist, bailing..."; \
-		exit 1; \
-	fi;
-.endif
-	@if [ ! -d ${__objdir} ]; then \
-		mkdir -p ${__objdir}; \
-		if [ ! -d ${__objdir} ]; then \
-			mkdir ${__objdir}; exit 1; \
-		fi; \
-		${_MKSHMSG} " objdir  ${__objdir}"; \
-	fi
-.else
-PAWD?=		/bin/pwd
-
-__objdir=	obj${OBJMACHINE:D.${MACHINE}}
-
-__usrobjdir=	${BSDOBJDIR}${USR_OBJMACHINE:D.${MACHINE}}
-__usrobjdirpf=	${USR_OBJMACHINE:D:U${OBJMACHINE:D.${MACHINE}}}
-
-.if defined(BUILDID)
-__objdir:=	${__objdir}.${BUILDID}
-__usrobjdirpf:=	${__usrobjdirpf}.${BUILDID}
-__need_objdir_target=yes
-.endif
-
-.if defined(OBJHOSTMACHINE) && (${MKHOSTOBJ:Uno} != "no")
-# In case .CURDIR has been twiddled by a .mk file and is now relative,
-# make it absolute again.
-.if ${__curdir:M/*} == ""
-__curdir!=	cd "${__curdir}" && ${PAWD}
-.endif
-
-__objdir:=	${__objdir}.${HOST_OSTYPE}
-__usrobjdirpf:=	${__usrobjdirpf}.${HOST_OSTYPE}
-__need_objdir_target=yes
-.endif
-
-.if defined(__need_objdir_target)
-# Get make to change its internal definition of .OBJDIR
-.OBJDIR:	${__objdir}
-.endif
-
-obj:
-	@cd "${__curdir}"; \
-	here=`${PAWD}`/; subdir=$${here#${BSDSRCDIR}/}; \
-	if [ "$$here" != "$$subdir" ]; then \
-		if [ ! -d ${__usrobjdir} ]; then \
-			echo "BSDOBJDIR ${__usrobjdir} does not exist, bailing..."; \
-			exit 1; \
-		fi; \
-		subdir=$${subdir%/}; \
-		dest=${__usrobjdir}/$$subdir${__usrobjdirpf}; \
-		if  [ -x ${TOOL_STAT} ] && \
-		    ttarg=`${TOOL_STAT} -qf '%Y' $${here}${__objdir}` && \
-		    [ "$$dest" = "$$ttarg" ]; then \
-			: ; \
-		else \
-			${_MKSHMSG} " objdir  $$dest"; \
-			rm -rf ${__objdir}; \
-			ln -s $$dest ${__objdir}; \
-		fi; \
-		if [ ! -d $$dest ]; then \
-			mkdir -p $$dest; \
-		else \
-			true; \
-		fi; \
-	else \
-		true ; \
-		dest=$${here}${__objdir} ; \
-		if [ ! -d ${__objdir} ] || [ -h ${__objdir} ]; then \
-			${_MKSHMSG} " objdir  $$dest"; \
-			rm -f ${__objdir}; \
-			mkdir $$dest; \
-		fi ; \
-	fi;
-.endif
-.endif
-
-print-objdir:
-	@echo ${.OBJDIR}
-
-.include <ubix.sys.mk>
-
-.endif	# !defined(_UBIX_OBJ_MK_)
diff --git a/share/mk/ubix.own.mk b/share/mk/ubix.own.mk
deleted file mode 100644
index 0a6fb0b..0000000
--- a/share/mk/ubix.own.mk
+++ /dev/null
@@ -1,1730 +0,0 @@
-# This needs to be before ubix.init.mk
-.if defined(UBIX_MK_COMPAT_FILE)
-.include <${UBIX_MK_COMPAT_FILE}>
-.endif
-
-.if !defined(_UBIX_OWN_MK_)
-_UBIX_OWN_MK_=1
-
-.if defined(__UBIX)
-
-LDSTATIC?=	-static
-MKDYNAMICROOT?=	no
-NO_LIBGOMP?=	yes
-
-BINMODE?=	755
-NONBINMODE?=	644
-MANDIR?=	/usr/man
-
-MKKYUA?=	yes
-MKMCLINKER?=	no
-MKCCRT?=	no
-MKGCC?=		no
-MKGCCCMDS?=	no
-MKPROFILE?=	no
-MKSLJIT?=	no
-
-#MINIX-specific variables
-MKCOVERAGE?=	no
-
-# LSC MINIX does not support these features ATM.
-USE_FORT:=	no
-USE_SSP:=	no
-MKCOMPAT:=	no
-MKGDB:=		no
-MKGROFF:=	no
-MKHESIOD:=	no
-MKHTML:=	no
-MKIPFILTER:=	no
-MKISCSI:=	no
-MKKERBEROS:=	no
-MKKMOD:=	no
-MKLDAP:=	no
-MKLINT:=	no
-MKLVM:=		no
-MKMDNS:=	no
-MKNPF:=		no
-MKPAM:=		no
-MKPF:=		no
-MKPOSTFIX:=	no
-MKRUMP:=	no
-MKSKEY:=	no
-MKYP:=		no
-MKCROSSGDB:=	no
-
-WEAKALIASOVERRIDEPASS?=${UBIXSRCDIR}/minix/llvm/bin/weak-alias-module-override.so
-GOLD_PLUGIN?=${UBIXSRCDIR}/minix/llvm/bin/LLVMgold.so
-
-# By default when running LLVM passes:
-#  -  do not run optimization while running LLVM passes
-#  -  run the passe which allows assembly weak symbols to be
-#     overriden by bitcode functions
-OPTFLAGS?=	-disable-opt \
-		-disable-inlining \
-		-load ${WEAKALIASOVERRIDEPASS} -weak-alias-module-override
-
-BITCODE_LD_FLAGS_1ST?= \
-		-Wl,-plugin=${GOLD_PLUGIN} \
-		-Wl,-plugin-opt=-disable-opt \
-		-Wl,-plugin-opt=-disable-inlining
-
-BITCODE_LD_FLAGS_2ND?=${BITCODE_LD_FLAGS_1ST}
-
-.ifdef CONFIG_SMP
-SMP_FLAGS += -DCONFIG_SMP
-.ifdef CONFIG_MAX_CPUS
-SMP_FLAGS += -DCONFIG_MAX_CPUS=${CONFIG_MAX_CPUS}
-.endif
-.endif
-
-CPPFLAGS+= ${SMP_FLAGS}
-
-__uname_s!= uname -s
-.if ${__uname_s:Uunknown} == "Minix" 
-USETOOLS?=	never
-.  if ${USETOOLS:Uno} != "yes"
-     HAVE_LLVM?= yes
-
-# If DESTDIR was specified, and we are not using the tools, then make sure to
-# build out-of-tree and to refer only DESTDIR for target binaries
-# The case when using tools is already handled below.
-.    if ${DESTDIR:U} != ""
-        CPPFLAGS+= --sysroot=${DESTDIR}
-        LDFLAGS+= --sysroot=${DESTDIR}
-.    endif # ${DESTDIR:U} != ""
-
-     MKTOOLS?=no
-.  endif # ${USETOOLS:Uno} != "yes"
-
-.  if !defined(HOSTPROG) && !defined(HOSTLIB)
-# LSC FIXME: Override MACHINE as the native minix host make command will set 
-#            it to i686.
-.    if ${MACHINE_ARCH} == "i386"
-       MACHINE:= i386
-.    endif
-# LSC FIXME: On a native ARM system MACHINE_ARCH is earmv7 instead of earm...
-.    if !empty(MACHINE_ARCH:Mearm*)
-       MACHINE_ARCH:= earm
-.    endif
-.  endif # !defined(HOSTPROG) && !defined(HOSTLIB)
-.endif # __uname_s == "Minix"
-
-# LSC FIXME: RELEASEMACHINEDIR is set to evbarm, instead of evbearm-el
-.if !empty(MACHINE:Mevbarm*)
-RELEASEMACHINEDIR:= evbearm-el
-.endif
-
-.if ${HAVE_GCC:Dyes} == "yes" || \
-    (${MKGCCCMDS:Uno} == "yes" && ${MKLLVM:Uyes} == "no")
-# We are building with GCC, means we cannot build LIBCXX, and need LIBSTDCXX
-MKLIBCXX?=	no # Can't compile with GCC.
-
-.  if ${USETOOLS:Uno} == "yes" || ${MKLIBSTDCXX:Uno} == "yes"
-# When cross-compiling, or building MKLIBSTDCXX, use the in-tree LIBSTDCXX
-MKLIBSTDCXX?=	yes
-CXXFLAGS+=	-I${DESTDIR}/usr/include/g++
-.  endif # ${USETOOLS:Uno} == "yes"
-
-.  if ${MKLIBSTDCXX:Uno} == "no"
-# Specify the C++ system header for the host libstdc++, as we are not building
-# LIBSTDCXX
-CXXFLAGS+=	-I/usr/include/g++
-.  endif # ${MKLIBSTDCXX:Uno} == "no"
-
-.endif # ${HAVE_GCC:Dyes} == "yes" || \
-       # (${MKGCCCMDS:Uno} == "yes" && ${MKLLVM:Uyes} == "no")
-
-# MKGCCCMDS == yes implies MKGCC == yes
-.if ${MKGCCCMDS} == "yes"
-MKGCC=		yes
-MKBINUTILS?=	yes # We are installing GCC, so trigger binutils.
-MKLIBSTDCXX?=	yes # Also install the GNU C++ library
-.endif # ${MKGCCCMDS} == "yes"
-
-# The default value of MKLIBSTDCXX cannot be set before the previous test.
-MKLIBSTDCXX?=	no
-
-.if ${MKGCC} == "yes"
-HAVE_GCC?=	5 # Not really, but that's the setting.
-HAVE_LIBGCC?=	yes
-HAVE_LIBGCC_EH?=	yes
-.endif # ${MKGCC} == "yes"
-
-.if ${USETOOLS:Uno} == "yes"
-MKLLVM?=	yes
-.endif # ${USETOOLS:Uno} == "yes"
-
-.if ${MKLLVM:Uno} == "yes"
-HAVE_LLVM?=	yes
-MKBINUTILS?=	yes # We are installing cc, so trigger binutils.
-.endif # ${MKLLVM:Uno} == "yes"
-
-.if ${HAVE_LLVM:Dyes} == "yes"
-HAVE_LIBGCC?=	no
-.endif # ${HAVE_LLVM:Dyes} == "yes"
-
-# The default value has to be set after we have figured out if we are using GCC
-# or not.
-MKLIBCXX?=	yes # Build by default libc++
-
-# The default value of MKBINUTILS cannot be set before the previous test.
-MKBINUTILS?=	no
-
-.endif # defined(__UBIX)
-
-MAKECONF?=	/etc/mk.conf
-.-include "${MAKECONF}"
-
-#
-# CPU model, derived from MACHINE_ARCH
-#
-MACHINE_CPU=	${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/coldfire/m68k/:S/m68000/m68k/:C/arm.*/arm/:C/earm.*/arm/:S/earm/arm/:S/powerpc64/powerpc/:S/aarch64eb/aarch64/:S/or1knd/or1k/:C/riscv../riscv/}
-
-#
-# Subdirectory used below ${RELEASEDIR} when building a release
-#
-RELEASEMACHINEDIR?=	${MACHINE}
-
-#
-# Subdirectory or path component used for the following paths:
-#   distrib/${RELEASEMACHINE}
-#   distrib/notes/${RELEASEMACHINE}
-#   etc/etc.${RELEASEMACHINE}
-# Used when building a release.
-#
-RELEASEMACHINE?=	${MACHINE}
-
-#
-# NEED_OWN_INSTALL_TARGET is set to "no" by pkgsrc/mk/ubix.pkg.mk to
-# ensure that things defined by <ubix.own.mk> (default targets,
-# INSTALL_FILE, etc.) are not conflicting with ubix.pkg.mk.
-#
-NEED_OWN_INSTALL_TARGET?=	yes
-
-#
-# This lists the platforms which do not have working in-tree toolchains.  For
-# the in-tree gcc toolchain, this list is empty.
-#
-# If some future port is not supported by the in-tree toolchain, this should
-# be set to "yes" for that port only.
-#
-.if ${MACHINE} == "playstation2"
-TOOLCHAIN_MISSING?=	yes
-.endif
-
-TOOLCHAIN_MISSING?=	no
-
-.if ${MACHINE_CPU} == "aarch64" && !defined(EXTERNAL_TOOLCHAIN) && ${MKLLVM:Uyes} != "no"
-MKLLVM?=	yes
-HAVE_LLVM?=	yes
-MKGCC?=		no
-.endif
-
-#
-# GCC Using platforms.
-#
-.if ${MKGCC:Uyes} != "no"
-
-.if ${MACHINE} == "playstation2" || ${MACHINE_CPU} == "aarch64"
-HAVE_GCC?=    0
-.else
-# Otherwise, default to GCC4.8
-HAVE_GCC?=    48
-.endif
-
-#
-# Platforms that can't run a modern GCC natively
-.if ${MACHINE_ARCH} == "m68000"
-MKGCCCMDS?=	no
-.endif
-
-#
-# We import the old gcc as "gcc.old" when upgrading.  EXTERNAL_GCC_SUBDIR is
-# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
-#
-.if ${HAVE_GCC} == 5
-EXTERNAL_GCC_SUBDIR=	gcc
-.elif ${HAVE_GCC} == 48
-EXTERNAL_GCC_SUBDIR=	gcc.old
-.else
-EXTERNAL_GCC_SUBDIR=	/does/not/exist
-.endif
-.else
-MKGCCCMDS?=	no
-.endif
-
-.if !empty(MACHINE_ARCH:Mearm*)
-_LIBC_COMPILER_RT.${MACHINE_ARCH}=	yes
-.endif
-
-_LIBC_COMPILER_RT.aarch64=	yes
-_LIBC_COMPILER_RT.i386=		yes
-_LIBC_COMPILER_RT.powerpc=	yes
-_LIBC_COMPILER_RT.powerpc64=	yes
-_LIBC_COMPILER_RT.x86_64=	yes
-
-.if ${HAVE_LLVM:Uno} == "yes" && ${_LIBC_COMPILER_RT.${MACHINE_ARCH}:Uno} == "yes"
-HAVE_LIBGCC?=	no
-.else
-HAVE_LIBGCC?=	yes
-.endif
-
-
-# ia64 is not support
-.if ${HAVE_LLVM:Uno} == "yes" || !empty(MACHINE_ARCH:Mearm*)
-HAVE_LIBGCC_EH?=	no
-.else
-HAVE_LIBGCC_EH?=	yes
-.endif
-
-HAVE_GDB?=	79
-
-.if (${MACHINE_ARCH} == "alpha") || \
-    (${MACHINE_ARCH} == "hppa") || \
-    (${MACHINE_ARCH} == "ia64") || \
-    (${MACHINE_CPU} == "mips")
-HAVE_SSP?=	no
-.else
-HAVE_SSP?=	yes
-.if ${USE_FORT:Uno} != "no"
-USE_SSP?=	yes
-.endif
-.endif
-
-.if empty(.MAKEFLAGS:tW:M*-V .OBJDIR*)
-.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
-PRINTOBJDIR=	${MAKE} -r -V .OBJDIR -f /dev/null xxx
-.else
-PRINTOBJDIR=	${MAKE} -V .OBJDIR
-.endif
-.else
-PRINTOBJDIR=	echo /error/ubix.own.mk/PRINTOBJDIR # avoid infinite recursion
-.endif
-
-#
-# Determine if running in the NetUBIX source tree by checking for the
-# existence of build.sh and tools/ in the current or a parent directory,
-# and setting _SRC_TOP_ to the result.
-#
-.if !defined(_SRC_TOP_)			# {
-_SRC_TOP_!= cd "${.CURDIR}"; while :; do \
-		here=`pwd`; \
-		[ -f build.sh  ] && [ -d tools ] && { echo $$here; break; }; \
-		case $$here in /) echo ""; break;; esac; \
-		cd ..; done
-
-.MAKEOVERRIDES+=	_SRC_TOP_
-
-.endif					# }
-
-#
-# If _SRC_TOP_ != "", we're within the NetUBIX source tree.
-# * Set defaults for UBIXSRCDIR and _SRC_TOP_OBJ_.
-# * Define _UBIX_VERSION_DEPENDS.  Targets that depend on the
-#   NetUBIX version, or on variables defined at build time, can
-#   declare a dependency on ${_UBIX_VERSION_DEPENDS}.
-#
-.if (${_SRC_TOP_} != "")		# {
-
-UBIXSRCDIR?=	${_SRC_TOP_}
-
-.if !defined(_SRC_TOP_OBJ_)
-_SRC_TOP_OBJ_!=		cd "${_SRC_TOP_}" && ${PRINTOBJDIR}
-.MAKEOVERRIDES+=	_SRC_TOP_OBJ_
-.endif
-
-_UBIX_VERSION_DEPENDS=	${_SRC_TOP_OBJ_}/params
-_UBIX_VERSION_DEPENDS+=	${UBIXSRCDIR}/sys/sys/param.h
-_UBIX_VERSION_DEPENDS+=	${UBIXSRCDIR}/sys/conf/newvers.sh
-_UBIX_VERSION_DEPENDS+=	${UBIXSRCDIR}/sys/conf/osrelease.sh
-${_SRC_TOP_OBJ_}/params: .NOTMAIN .OPTIONAL # created by top level "make build"
-
-.endif	# _SRC_TOP_ != ""		# }
-
-
-.if (${_SRC_TOP_} != "") && \
-    (${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN))
-USETOOLS?=	yes
-.endif
-USETOOLS?=	no
-
-
-.if ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "mips64" || \
-    ${MACHINE_ARCH} == "sh3"
-.BEGIN:
-	@echo "Must set MACHINE_ARCH to one of ${MACHINE_ARCH}eb or ${MACHINE_ARCH}el"
-	@false
-.elif defined(REQUIRETOOLS) && \
-      (${TOOLCHAIN_MISSING} == "no" || defined(EXTERNAL_TOOLCHAIN)) && \
-      ${USETOOLS} == "no"
-.BEGIN:
-	@echo "USETOOLS=no, but this component requires a version-specific host toolchain"
-	@false
-.endif
-
-#
-# Host platform information; may be overridden
-#
-.include <ubix.host.mk>
-
-.if ${USETOOLS} == "yes"						# {
-
-#
-# Provide a default for TOOLDIR.
-#
-.if !defined(TOOLDIR)
-TOOLDIR:=	${_SRC_TOP_OBJ_}/tooldir.${HOST_OSTYPE}
-.MAKEOVERRIDES+= TOOLDIR
-.endif
-
-#
-# This is the prefix used for the NetUBIX-sourced tools.
-#
-_TOOL_PREFIX?=	nb
-
-#
-# If an external toolchain base is specified, use it.
-#
-.if defined(EXTERNAL_TOOLCHAIN)						# {
-AR=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-ar
-AS=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-as
-LD=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-ld
-NM=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-nm
-OBJCOPY=	${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-objcopy
-OBJDUMP=	${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-objdump
-RANLIB=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-ranlib
-READELF=	${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-readelf
-SIZE=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-size
-STRINGS=	${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-strings
-STRIP=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-strip
-
-TOOL_CC.gcc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-gcc
-TOOL_CPP.gcc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-cpp
-TOOL_CXX.gcc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-c++
-TOOL_FC.gcc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-g77
-TOOL_OBJC.gcc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-gcc
-
-TOOL_CC.cc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-cc
-TOOL_CPP.cc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-cc-cpp
-TOOL_CXX.cc=		${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-cc++
-TOOL_OBJC.cc=	${EXTERNAL_TOOLCHAIN}/bin/${MACHINE_GNU_PLATFORM}-cc
-TOOL_OPT.cc=		${EXTERNAL_TOOLCHAIN}/bin/opt
-TOOL_LLC.cc=		${EXTERNAL_TOOLCHAIN}/bin/llc
-.else									# } {
-# Define default locations for common tools.
-.if ${USETOOLS_BINUTILS:Uyes} == "yes"					#  {
-AR=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ar
-AS=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-as
-LD=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ld
-NM=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-nm
-OBJCOPY=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-objcopy
-OBJDUMP=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-objdump
-RANLIB=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-ranlib
-READELF=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-readelf
-SIZE=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-size
-STRINGS=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strings
-STRIP=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-strip
-
-# GCC supports C, C++, Fortran and Objective C
-TOOL_CC.gcc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
-TOOL_CPP.gcc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-cpp
-TOOL_CXX.gcc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-c++
-TOOL_FC.gcc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-g77
-TOOL_OBJC.gcc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-gcc
-.endif									#  }
-
-# Clang supports C, C++ and Objective C
-TOOL_CC.cc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-cc
-TOOL_CPP.cc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-cc-cpp
-TOOL_CXX.cc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-cc++
-TOOL_OBJC.cc=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-cc
-TOOL_OPT.cc=		${TOOLDIR}/bin/opt
-TOOL_LLC.cc=		${TOOLDIR}/bin/llc
-
-# PCC supports C and Fortran
-TOOL_CC.pcc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-pcc
-TOOL_CPP.pcc=		${TOOLDIR}/libexec/${MACHINE_GNU_PLATFORM}-cpp
-TOOL_CXX.pcc=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-p++
-
-#
-# Make sure DESTDIR is set, so that builds with these tools always
-# get appropriate -nostdinc, -nostdlib, etc. handling.  The default is
-# <empty string>, meaning start from /, the root directory.
-#
-DESTDIR?=
-
-.if !defined(HOSTPROG) && !defined(HOSTLIB)
-.  if ${DESTDIR} != ""
-CPPFLAGS+=	--sysroot=${DESTDIR}
-LDFLAGS+=	--sysroot=${DESTDIR}
-.  else
-CPPFLAGS+=	--sysroot=/
-LDFLAGS+=	--sysroot=/
-.  endif
-.endif
-.endif	# EXTERNAL_TOOLCHAIN						# }
-
-DBSYM=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-dbsym
-ELF2AOUT=	${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
-ELF2ECOFF=	${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
-INSTALL=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-install
-LEX=		${TOOLDIR}/bin/${_TOOL_PREFIX}lex
-LINT=		CC=${CC:Q} ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-lint
-LORDER=		NM=${NM:Q} MKTEMP=${TOOL_MKTEMP:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}lorder
-MKDEP=		CC=${CC:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}mkdep
-MKDEPCXX=	CC=${CXX:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}mkdep
-PAXCTL=		${TOOLDIR}/bin/${_TOOL_PREFIX}paxctl
-TSORT=		${TOOLDIR}/bin/${_TOOL_PREFIX}tsort -q
-YACC=		${TOOLDIR}/bin/${_TOOL_PREFIX}yacc
-
-TOOL_AMIGAAOUT2BB=	${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-aout2bb
-TOOL_AMIGAELF2BB=	${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-elf2bb
-TOOL_AMIGATXLT=		${TOOLDIR}/bin/${_TOOL_PREFIX}amiga-txlt
-TOOL_ASN1_COMPILE=	${TOOLDIR}/bin/${_TOOL_PREFIX}asn1_compile
-TOOL_AWK=		${TOOLDIR}/bin/${_TOOL_PREFIX}awk
-TOOL_CAP_MKDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}cap_mkdb
-TOOL_CAT=		${TOOLDIR}/bin/${_TOOL_PREFIX}cat
-TOOL_CKSUM=		${TOOLDIR}/bin/${_TOOL_PREFIX}cksum
-TOOL_CC_TBLGEN=		${TOOLDIR}/bin/${_TOOL_PREFIX}cc-tblgen
-TOOL_COMPILE_ET=	${TOOLDIR}/bin/${_TOOL_PREFIX}compile_et
-TOOL_CONFIG=		${TOOLDIR}/bin/${_TOOL_PREFIX}config
-TOOL_CRUNCHGEN=		MAKE=${.MAKE:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}crunchgen
-TOOL_CTAGS=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctags
-TOOL_CTFCONVERT=	${TOOLDIR}/bin/${_TOOL_PREFIX}ctfconvert
-TOOL_CTFMERGE=		${TOOLDIR}/bin/${_TOOL_PREFIX}ctfmerge
-TOOL_DB=		${TOOLDIR}/bin/${_TOOL_PREFIX}db
-TOOL_DISKLABEL=		${TOOLDIR}/bin/nbdisklabel
-TOOL_EQN=		${TOOLDIR}/bin/${_TOOL_PREFIX}eqn
-TOOL_FDISK=		${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-fdisk
-TOOL_FGEN=		${TOOLDIR}/bin/${_TOOL_PREFIX}fgen
-TOOL_GENASSYM=		${TOOLDIR}/bin/${_TOOL_PREFIX}genassym
-TOOL_GENCAT=		${TOOLDIR}/bin/${_TOOL_PREFIX}gencat
-TOOL_GMAKE=		${TOOLDIR}/bin/${_TOOL_PREFIX}gmake
-TOOL_GREP=		${TOOLDIR}/bin/${_TOOL_PREFIX}grep
-TOOL_GROFF=		PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}groff
-TOOL_HEXDUMP=		${TOOLDIR}/bin/${_TOOL_PREFIX}hexdump
-TOOL_HP300MKBOOT=	${TOOLDIR}/bin/${_TOOL_PREFIX}hp300-mkboot
-TOOL_HPPAMKBOOT=	${TOOLDIR}/bin/${_TOOL_PREFIX}hppa-mkboot
-TOOL_INDXBIB=		${TOOLDIR}/bin/${_TOOL_PREFIX}indxbib
-TOOL_INSTALLBOOT=	${TOOLDIR}/bin/${_TOOL_PREFIX}installboot
-TOOL_INSTALL_INFO=	${TOOLDIR}/bin/${_TOOL_PREFIX}install-info
-TOOL_JOIN=		${TOOLDIR}/bin/${_TOOL_PREFIX}join
-TOOL_LLVM_TBLGEN=		${TOOLDIR}/bin/${_TOOL_PREFIX}llvm-tblgen
-TOOL_M4=		${TOOLDIR}/bin/${_TOOL_PREFIX}m4
-TOOL_MACPPCFIXCOFF=	${TOOLDIR}/bin/${_TOOL_PREFIX}macppc-fixcoff
-TOOL_MAKEFS=		${TOOLDIR}/bin/${_TOOL_PREFIX}makefs
-TOOL_MAKEINFO=		${TOOLDIR}/bin/${_TOOL_PREFIX}makeinfo
-TOOL_MAKEKEYS=		${TOOLDIR}/bin/${_TOOL_PREFIX}makekeys
-TOOL_MAKESTRS=		${TOOLDIR}/bin/${_TOOL_PREFIX}makestrs
-TOOL_MAKEWHATIS=	${TOOLDIR}/bin/${_TOOL_PREFIX}makewhatis
-TOOL_MANDOC_ASCII=	${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tascii
-TOOL_MANDOC_HTML=	${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Thtml
-TOOL_MANDOC_LINT=	${TOOLDIR}/bin/${_TOOL_PREFIX}mandoc -Tlint
-TOOL_MDSETIMAGE=	${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-mdsetimage
-TOOL_MENUC=		MENUDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}menuc
-TOOL_M68KELF2AOUT=	${TOOLDIR}/bin/${_TOOL_PREFIX}m68k-elf2aout
-TOOL_MIPSELF2ECOFF=	${TOOLDIR}/bin/${_TOOL_PREFIX}mips-elf2ecoff
-TOOL_MKCSMAPPER=	${TOOLDIR}/bin/${_TOOL_PREFIX}mkcsmapper
-TOOL_MKESDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}mkesdb
-TOOL_MKFSMFS=		${TOOLDIR}/bin/${_TOOL_PREFIX}mkfs.mfs
-TOOL_MKLOCALE=		${TOOLDIR}/bin/${_TOOL_PREFIX}mklocale
-TOOL_MKMAGIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}file
-TOOL_MKNOD=		${TOOLDIR}/bin/${_TOOL_PREFIX}mknod
-TOOL_MKTEMP=		${TOOLDIR}/bin/${_TOOL_PREFIX}mktemp
-TOOL_MKUBOOTIMAGE=	${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
-TOOL_ELFTOSB=		${TOOLDIR}/bin/${_TOOL_PREFIX}elftosb
-TOOL_MSGC=		MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
-TOOL_MTREE=		${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
-TOOL_NBPERF=		${TOOLDIR}/bin/${_TOOL_PREFIX}perf
-TOOL_NCDCS=		${TOOLDIR}/bin/${_TOOL_PREFIX}ibmnws-ncdcs
-TOOL_PAX=		${TOOLDIR}/bin/${_TOOL_PREFIX}pax
-TOOL_PIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}pic
-TOOL_PIGZ=		${TOOLDIR}/bin/${_TOOL_PREFIX}pigz
-TOOL_PKG_CREATE=	${TOOLDIR}/bin/${_TOOL_PREFIX}pkg_create
-TOOL_POWERPCMKBOOTIMAGE=${TOOLDIR}/bin/${_TOOL_PREFIX}powerpc-mkbootimage
-TOOL_PWD_MKDB=		${TOOLDIR}/bin/${_TOOL_PREFIX}pwd_mkdb
-TOOL_REFER=		${TOOLDIR}/bin/${_TOOL_PREFIX}refer
-TOOL_ROFF_ASCII=	PATH=${TOOLDIR}/lib/groff:$${PATH} ${TOOLDIR}/bin/${_TOOL_PREFIX}nroff
-TOOL_ROFF_DOCASCII=	${TOOL_GROFF} -Tascii
-TOOL_ROFF_DOCHTML=	${TOOL_GROFF} -Thtml
-TOOL_ROFF_DVI=		${TOOL_GROFF} -Tdvi
-TOOL_ROFF_HTML=		${TOOL_GROFF} -Tlatin1 -mdoc2html
-TOOL_ROFF_PS=		${TOOL_GROFF} -Tps
-TOOL_ROFF_RAW=		${TOOL_GROFF} -Z
-TOOL_RPCGEN=		RPCGEN_CPP=${CPP:Q} ${TOOLDIR}/bin/${_TOOL_PREFIX}rpcgen
-TOOL_SED=		${TOOLDIR}/bin/${_TOOL_PREFIX}sed
-TOOL_SLC=		${TOOLDIR}/bin/${_TOOL_PREFIX}slc
-TOOL_SOELIM=		${TOOLDIR}/bin/${_TOOL_PREFIX}soelim
-TOOL_SPARKCRC=		${TOOLDIR}/bin/${_TOOL_PREFIX}sparkcrc
-TOOL_STAT=		${TOOLDIR}/bin/${_TOOL_PREFIX}stat
-TOOL_STRFILE=		${TOOLDIR}/bin/${_TOOL_PREFIX}strfile
-TOOL_SUNLABEL=		${TOOLDIR}/bin/${_TOOL_PREFIX}sunlabel
-TOOL_TBL=		${TOOLDIR}/bin/${_TOOL_PREFIX}tbl
-TOOL_TIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}tic
-TOOL_TOPROTO=		${TOOLDIR}/bin/${_TOOL_PREFIX}toproto
-TOOL_UUDECODE=		${TOOLDIR}/bin/${_TOOL_PREFIX}uudecode
-TOOL_VGRIND=		${TOOLDIR}/bin/${_TOOL_PREFIX}vgrind -f
-TOOL_VFONTEDPR=		${TOOLDIR}/libexec/${_TOOL_PREFIX}vfontedpr
-TOOL_ZIC=		${TOOLDIR}/bin/${_TOOL_PREFIX}zic
-
-.else	# USETOOLS != yes						# } {
-
-# Clang supports C, C++ and Objective C
-TOOL_CC.cc=		cc
-.if defined(__UBIX)
-TOOL_CPP.cc=		cc -E
-.else
-TOOL_CPP.cc=		cc-cpp
-.endif # defined(__UBIX)
-TOOL_CXX.cc=		cc++
-TOOL_OBJC.cc=	cc
-TOOL_OPT.cc=		opt
-TOOL_LLC.cc=		llc
-
-# GCC supports C, C++, Fortran and Objective C
-TOOL_CC.gcc=	gcc
-TOOL_CPP.gcc=	cpp
-TOOL_CXX.gcc=	c++
-TOOL_FC.gcc=	g77
-TOOL_OBJC.gcc=	gcc
-
-# PCC supports C and Fortran
-TOOL_CC.pcc=		pcc
-TOOL_CPP.pcc=		/usr/libexec/pcpp
-TOOL_CXX.pcc=		p++
-
-TOOL_AMIGAAOUT2BB=	amiga-aout2bb
-TOOL_AMIGAELF2BB=	amiga-elf2bb
-TOOL_AMIGATXLT=		amiga-txlt
-TOOL_ASN1_COMPILE=	asn1_compile
-TOOL_AWK=		awk
-TOOL_CAP_MKDB=		cap_mkdb
-TOOL_CAT=		cat
-TOOL_CKSUM=		cksum
-.if defined(__UBIX)
-# LSC: A full path has to be provided, as this is also used as a make
-#      target.
-.  if  exists(/usr/pkg/bin/cc-tblgen)
-TOOL_CC_TBLGEN=	/usr/pkg/bin/cc-tblgen
-.  else
-TOOL_CC_TBLGEN=	/usr/bin/cc-tblgen
-.  endif # exists(/usr/pkg/bin/cc-tblgen)
-.else
-TOOL_CC_TBLGEN=	cc-tblgen
-.endif # defined(__UBIX)
-TOOL_COMPILE_ET=	compile_et
-TOOL_CONFIG=		config
-TOOL_CRUNCHGEN=		crunchgen
-TOOL_CTAGS=		ctags
-TOOL_CTFCONVERT=	ctfconvert
-TOOL_CTFMERGE=		ctfmerge
-TOOL_DB=		db
-TOOL_DISKLABEL=		disklabel
-TOOL_EQN=		eqn
-TOOL_FDISK=		fdisk
-TOOL_FGEN=		fgen
-TOOL_GENASSYM=		genassym
-TOOL_GENCAT=		gencat
-TOOL_GMAKE=		gmake
-TOOL_GREP=		grep
-TOOL_GROFF=		groff
-TOOL_HEXDUMP=		hexdump
-TOOL_HP300MKBOOT=	hp300-mkboot
-TOOL_HPPAMKBOOT=	hppa-mkboot
-TOOL_INDXBIB=		indxbib
-TOOL_INSTALLBOOT=	installboot
-TOOL_INSTALL_INFO=	install-info
-TOOL_JOIN=		join
-.if defined(__UBIX)
-# LSC: A full path has to be provided, as this is also used as a make
-#      target.
-.  if  exists(/usr/pkg/bin/llvm-tblgen)
-TOOL_LLVM_TBLGEN=	/usr/pkg/bin/llvm-tblgen
-.  else
-TOOL_LLVM_TBLGEN=	/usr/bin/llvm-tblgen
-.  endif # exists(/usr/pkg/bin/llvm-tblgen)
-.else
-TOOL_LLVM_TBLGEN=	llvm-tblgen
-.endif # defined(__UBIX)
-TOOL_M4=		m4
-TOOL_MACPPCFIXCOFF=	macppc-fixcoff
-TOOL_MAKEFS=		makefs
-TOOL_MAKEINFO=		makeinfo
-.if defined(__UBIX)
-# LSC: A full path has to be provided, as this is also used as a make
-#      target.
-TOOL_MAKEKEYS=		/usr/X11R7/bin/makekeys
-.else
-TOOL_MAKEKEYS=		makekeys
-.endif # defined(__UBIX)
-.if defined(__UBIX)
-# LSC: A full path has to be provided, as this is also used as a make
-#      target.
-TOOL_MAKESTRS=		/usr/X11R7/bin/makestrs
-.else
-TOOL_MAKESTRS=		makestrs
-.endif # defined(__UBIX)
-TOOL_MAKEWHATIS=	/usr/libexec/makewhatis
-TOOL_MANDOC_ASCII=	mandoc -Tascii
-TOOL_MANDOC_HTML=	mandoc -Thtml
-TOOL_MANDOC_LINT=	mandoc -Tlint
-TOOL_MDSETIMAGE=	mdsetimage
-TOOL_MENUC=		menuc
-TOOL_M68KELF2AOUT=	m68k-elf2aout
-TOOL_MIPSELF2ECOFF=	mips-elf2ecoff
-TOOL_MKCSMAPPER=	mkcsmapper
-TOOL_MKESDB=		mkesdb
-TOOL_MKFSMFS=		mkfs.mfs
-TOOL_MKLOCALE=		mklocale
-TOOL_MKMAGIC=		file
-TOOL_MKNOD=		mknod
-TOOL_MKTEMP=		mktemp
-TOOL_MKUBOOTIMAGE=	mkubootimage
-TOOL_ELFTOSB=		elftosb
-TOOL_MSGC=		msgc
-TOOL_MTREE=		mtree
-TOOL_NBPERF=		nbperf
-TOOL_NCDCS=		ncdcs
-TOOL_PAX=		pax
-TOOL_PIC=		pic
-TOOL_PIGZ=		pigz
-TOOL_PKG_CREATE=	pkg_create
-TOOL_POWERPCMKBOOTIMAGE=	powerpc-mkbootimage
-TOOL_PWD_MKDB=		pwd_mkdb
-TOOL_REFER=		refer
-TOOL_ROFF_ASCII=	nroff
-TOOL_ROFF_DOCASCII=	${TOOL_GROFF} -Tascii
-TOOL_ROFF_DOCHTML=	${TOOL_GROFF} -Thtml
-TOOL_ROFF_DVI=		${TOOL_GROFF} -Tdvi
-TOOL_ROFF_HTML=		${TOOL_GROFF} -Tlatin1 -mdoc2html
-TOOL_ROFF_PS=		${TOOL_GROFF} -Tps
-TOOL_ROFF_RAW=		${TOOL_GROFF} -Z
-TOOL_RPCGEN=		rpcgen
-TOOL_SED=		sed
-TOOL_SOELIM=		soelim
-TOOL_SPARKCRC=		sparkcrc
-TOOL_STAT=		stat
-.if defined(__UBIX)
-TOOL_STRFILE=		/usr/games/strfile
-.else
-TOOL_STRFILE=		strfile
-.endif # defined(__UBIX)
-TOOL_SUNLABEL=		sunlabel
-TOOL_TBL=		tbl
-.if defined(__UBIX)
-# LSC: There is a tic packaged, which has a completly different set of
-#      options, so make sure to use the base system one, always.
-TOOL_TIC=		/usr/bin/tic
-.else
-TOOL_TIC=		tic
-.endif # defined(__UBIX)
-TOOL_TOPROTO=		toproto
-TOOL_UUDECODE=		uudecode
-TOOL_VGRIND=		vgrind -f
-TOOL_VFONTEDPR=		/usr/libexec/vfontedpr
-TOOL_ZIC=		zic
-
-.endif	# USETOOLS != yes						# }
-
-# Fallback to ensure that all variables are defined to something
-TOOL_CC.false=		false
-TOOL_CPP.false=		false
-TOOL_CXX.false=		false
-TOOL_FC.false=		false
-TOOL_OBJC.false=	false
-TOOL_OPT.false=		false
-TOOL_LLC.false=		false
-
-AVAILABLE_COMPILER?=	${HAVE_PCC:Dpcc} ${HAVE_LLVM:Dcc} ${HAVE_GCC:Dgcc} ${EXTERNAL_TOOLCHAIN:Dgcc} false
-
-.for _t in CC CPP CXX FC OBJC OPT LLC
-ACTIVE_${_t}=	${AVAILABLE_COMPILER:@.c.@ ${ !defined(UNSUPPORTED_COMPILER.${.c.}) && defined(TOOL_${_t}.${.c.}) :? ${.c.} : }@:[1]}
-SUPPORTED_${_t}=${AVAILABLE_COMPILER:Nfalse:@.c.@ ${ !defined(UNSUPPORTED_COMPILER.${.c.}) && defined(TOOL_${_t}.${.c.}) :? ${.c.} : }@}
-.endfor
-# make bugs prevent moving this into the .for loop
-CC=		${TOOL_CC.${ACTIVE_CC}}
-CPP=		${TOOL_CPP.${ACTIVE_CPP}}
-CXX=		${TOOL_CXX.${ACTIVE_CXX}}
-FC=		${TOOL_FC.${ACTIVE_FC}}
-OBJC=		${TOOL_OBJC.${ACTIVE_OBJC}}
-OPT=		${TOOL_OPT.${ACTIVE_OPT}}
-LLC=		${TOOL_LLC.${ACTIVE_LLC}}
-
-# Override with tools versions if needed
-.if ${MKCTF:Uno} != "no" && !defined(NOCTF)
-CTFCONVERT=	${TOOL_CTFCONVERT}
-CTFMERGE=	${TOOL_CTFMERGE}
-.endif
-
-# For each ${MACHINE_CPU}, list the ports that use it.
-MACHINES.aarch64=	evbarm64
-MACHINES.alpha=		alpha
-MACHINES.arm=		acorn26 acorn32 cats epoc32 evbarm hpcarm \
-			iyonix netwinder shark zaurus
-MACHINES.coldfire=	evbcf
-MACHINES.i386=		i386
-MACHINES.ia64=		ia64
-MACHINES.hppa=		hppa
-MACHINES.m68000=	sun2
-MACHINES.m68k=		amiga atari cesfic hp300 luna68k mac68k \
-			news68k next68k sun3 x68k
-MACHINES.mips=		arc cobalt algor cobalt emips evbmips ews4800mips \
-			hpcmips mipsco newsmips pmax sbmips sgimips
-MACHINES.or1k=		or1k
-MACHINES.powerpc=	amigappc bebox evbppc ibmnws macppc mvmeppc \
-			ofppc prep rs6000 sandpoint
-MACHINES.riscv=		riscv
-MACHINES.sh3=		dreamcast evbsh3 hpcsh landisk mmeye
-MACHINES.sparc=		sparc sparc64
-MACHINES.sparc64=	sparc64
-MACHINES.vax=		vax
-MACHINES.x86_64=	amd64
-
-# for crunchide & ldd, define the OBJECT_FMTS used by a MACHINE_ARCH
-#
-OBJECT_FMTS=
-.if	${MACHINE_ARCH} != "alpha" 
-OBJECT_FMTS+=	elf32
-.endif
-.if	${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH:M*64*} != ""
-OBJECT_FMTS+=	elf64
-.endif
-
-# OBJCOPY flags to create a.out binaries for old firmware
-# shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
-.if ${MACHINE_CPU} == "arm"
-OBJCOPY_ELF2AOUT_FLAGS?=	\
-	-O a.out-arm-netubix	\
-	-R .ident		\
-	-R .ARM.attributes	\
-	-R .ARM.exidx		\
-	-R .ARM.extab		\
-	-R .arm.atpcs		\
-	-R .comment		\
-	-R .debug_abbrev	\
-	-R .debug_aranges	\
-	-R .debug_info		\
-	-R .debug_line		\
-	-R .debug_frame		\
-	-R .debug_loc		\
-	-R .debug_pubnames	\
-	-R .debug_pubtypes	\
-	-R .debug_ranges	\
-	-R .debug_str		\
-	-R .eh_frame		\
-	-R .note.netubix.ident
-.endif
-
-#
-# Targets to check if DESTDIR or RELEASEDIR is provided
-#
-.if !target(check_DESTDIR)
-check_DESTDIR: .PHONY .NOTMAIN
-.if !defined(DESTDIR)
-	@echo "setenv DESTDIR before doing that!"
-	@false
-.else
-	@true
-.endif
-.endif
-
-.if !target(check_RELEASEDIR)
-check_RELEASEDIR: .PHONY .NOTMAIN
-.if !defined(RELEASEDIR)
-	@echo "setenv RELEASEDIR before doing that!"
-	@false
-.else
-	@true
-.endif
-.endif
-
-#
-# Build a dynamically linked /bin and /sbin, with the necessary shared
-# libraries moved from /usr/lib to /lib and the shared linker moved
-# from /usr/libexec to /lib
-#
-# Note that if the BINDIR is not /bin or /sbin, then we always use the
-# non-DYNAMICROOT behavior (i.e. it is only enabled for programs in /bin
-# and /sbin).  See <ubix.shlib.mk>.
-#
-MKDYNAMICROOT?=	yes
-
-#
-# Where the system object and source trees are kept; can be configurable
-# by the user in case they want them in ~/foosrc and ~/fooobj (for example).
-#
-UBIXSRCDIR?=	/usr/src
-UBIXOBJDIR?=	/usr/obj
-UBIXSRCDIR?=	${UBIXSRCDIR}
-
-BINGRP?=	wheel
-BINOWN?=	root
-BINMODE?=	555
-NONBINMODE?=	444
-
-# These are here mainly because we don't want suid root in case
-# a Makefile defines BINMODE.
-RUMPBINGRP?=	wheel
-RUMPBINOWN?=	root
-RUMPBINMODE?=	555
-RUMPNONBINMODE?=444
-
-MANDIR?=	/usr/share/man
-MANGRP?=	wheel
-MANOWN?=	root
-MANMODE?=	${NONBINMODE}
-MANINSTALL?=	${_MANINSTALL}
-
-INFODIR?=	/usr/share/info
-INFOGRP?=	wheel
-INFOOWN?=	root
-INFOMODE?=	${NONBINMODE}
-
-LIBDIR?=	/usr/lib
-
-LINTLIBDIR?=	/usr/libdata/lint
-LIBGRP?=	${BINGRP}
-LIBOWN?=	${BINOWN}
-LIBMODE?=	${NONBINMODE}
-
-DOCDIR?=	/usr/share/doc
-DOCGRP?=	wheel
-DOCOWN?=	root
-DOCMODE?=	${NONBINMODE}
-
-NLSDIR?=	/usr/share/nls
-NLSGRP?=	wheel
-NLSOWN?=	root
-NLSMODE?=	${NONBINMODE}
-
-KMODULEGRP?=	wheel
-KMODULEOWN?=	root
-KMODULEMODE?=	${NONBINMODE}
-
-LOCALEDIR?=	/usr/share/locale
-LOCALEGRP?=	wheel
-LOCALEOWN?=	root
-LOCALEMODE?=	${NONBINMODE}
-
-FIRMWAREDIR?=	/libdata/firmware
-FIRMWAREGRP?=	wheel
-FIRMWAREOWN?=	root
-FIRMWAREMODE?=	${NONBINMODE}
-
-DEBUGDIR?=	/usr/libdata/debug
-DEBUGGRP?=	wheel
-DEBUGOWN?=	root
-DEBUGMODE?=	${NONBINMODE}
-
-#
-# Data-driven table using make variables to control how
-# toolchain-dependent targets and shared libraries are built
-# for different platforms and object formats.
-#
-# OBJECT_FMT:		currently either "ELF" or "a.out".
-#
-# All platforms are ELF.
-#
-OBJECT_FMT=	ELF
-
-#
-# If this platform's toolchain is missing, we obviously cannot build it.
-#
-.if ${TOOLCHAIN_MISSING} != "no"
-MKBINUTILS:= no
-MKGDB:= no
-MKGCC:= no
-.endif
-
-#
-# If we are using an external toolchain, we can still build the target's
-# binutils, but we cannot build GCC's support libraries, since those are
-# tightly-coupled to the version of GCC being used.
-#
-.if defined(EXTERNAL_TOOLCHAIN)
-MKGCC:= no
-.endif
-
-# No GDB support for aarch64
-MKGDB.aarch64=	no
-MKGDB.or1k=	no
-MKGDB.riscv32=	no
-MKGDB.riscv64=	no
-
-# No kernel modules for or1k (yet)
-MKKMOD.or1k=	no
-MKKMOD.riscv32=	no
-MKKMOD.riscv64=	no
-
-# No profiling for or1k (yet)
-MKPROFILE.or1k=	no
-MKPROFILE.riscv32=no
-MKPROFILE.riscv64=no
-
-#
-# The m68000 port is incomplete.
-#
-.if ${MACHINE_ARCH} == "m68000"
-NOPIC=		# defined
-MKISCSI=	no
-# XXX GCC 4 outputs mcount() calling sequences that try to load values
-# from over 64KB away and this fails to assemble.
-.if defined(HAVE_GCC)
-NOPROFILE=	# defined
-.endif
-.endif
-
-#
-# The ia64 port is incomplete.
-#
-MKLINT.ia64=	no
-MKGDB.ia64=	no
-
-#
-# On the MIPS, all libs are compiled with ABIcalls (and are thus PIC),
-# not just shared libraries, so don't build the _pic version.
-#
-.if ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb"
-MKPICLIB:=	no
-.endif
-
-# PowerPC64 and AArch64 ABI's are PIC
-MKPICLIB.powerpc64=	no
-#MKPICLIB.aarch64=	no
-
-#
-# On VAX using ELF, all objects are PIC, not just shared libraries,
-# so don't build the _pic version.
-#
-MKPICLIB.vax=	no
-
-#
-# Location of the file that contains the major and minor numbers of the
-# version of a shared library.  If this file exists a shared library
-# will be built by <ubix.lib.mk>.
-#
-SHLIB_VERSION_FILE?= ${.CURDIR}/shlib_version
-
-#
-# GNU sources and packages sometimes see architecture names differently.
-#
-GNU_ARCH.aarch64eb=aarch64_be
-GNU_ARCH.coldfire=m5407
-GNU_ARCH.earm=arm
-GNU_ARCH.earmhf=arm
-GNU_ARCH.earmeb=armeb
-GNU_ARCH.earmhfeb=armeb
-GNU_ARCH.earmv4=armv4
-GNU_ARCH.earmv4eb=armv4eb
-GNU_ARCH.earmv5=arm
-GNU_ARCH.earmv5eb=armeb
-GNU_ARCH.earmv6=armv6
-GNU_ARCH.earmv6hf=armv6
-GNU_ARCH.earmv6eb=armv6eb
-GNU_ARCH.earmv6hfeb=armv6eb
-GNU_ARCH.earmv7=armv7
-GNU_ARCH.earmv7hf=armv7
-GNU_ARCH.earmv7eb=armv7eb
-GNU_ARCH.earmv7hfeb=armv7eb
-GNU_ARCH.i386=i486
-GCC_CONFIG_ARCH.i386=i486
-GCC_CONFIG_TUNE.i386=nocona
-GCC_CONFIG_TUNE.x86_64=nocona
-GNU_ARCH.m68000=m68010
-GNU_ARCH.sh3eb=sh
-GNU_ARCH.sh3el=shle
-GNU_ARCH.mips64eb=mips64
-
-.if defined(__UBIX)
-# MINIX/arm default
-GCC_CONFIG_ARCH.earm=armv7-a
-
-# MINIX/intel default
-GNU_ARCH.i386=i586
-GCC_CONFIG_ARCH.i386=i586
-
-.endif # defined(__UBIX)
-
-MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}}
-
-#
-# In order to identify NetUBIX to GNU packages, we sometimes need
-# an "elf" tag for historically a.out platforms.
-#
-.if (!empty(MACHINE_ARCH:Mearm*))
-MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netubixelf-${MACHINE_ARCH:C/eb//:C/v[4-7]//:S/earm/eabi/}
-.elif (${MACHINE_GNU_ARCH} == "arm" || \
-     ${MACHINE_GNU_ARCH} == "armeb" || \
-     ${MACHINE_ARCH} == "i386" || \
-     ${MACHINE_CPU} == "m68k" || \
-     ${MACHINE_GNU_ARCH} == "sh" || \
-     ${MACHINE_GNU_ARCH} == "shle" || \
-     ${MACHINE_ARCH} == "sparc" || \
-     ${MACHINE_ARCH} == "vax")
-MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netubixelf
-.else
-MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netubix
-.endif
-
-.if defined(__UBIX)
-# We have a simpler toolchain naming scheme
-MACHINE_GNU_PLATFORM:=${MACHINE_GNU_ARCH}-elf32-minix
-
-# We need to check for HAVE_GOLD after LD has been set
-.  if ${_HAVE_GOLD:U} == ""
-   _HAVE_GOLD!= (exec 2>&1; ${LD} --version || echo "")
-   _GOLD_MATCH:=${_HAVE_GOLD:Mgold}
-   _HAVE_GOLD:= ${_HAVE_GOLD:M[0-9]\.[0-9][0-9]}
-
-.    if ${_GOLD_MATCH} != "" && ${_HAVE_GOLD} != ""
-      HAVE_GOLD?= ${_HAVE_GOLD}
-
-# Without -Wl,--no-ctors-in-init-array, gold moves the constructors out of
-# .ctors into .init_array, which is bad on intel.
-      LDFLAGS+= -Wl,--no-ctors-in-init-array
-.    else
-      USE_BITCODE:=no
-.    endif
-.  endif # ${_HAVE_GOLD:U} == ""
-.endif # defined(__UBIX)
-
-.if !empty(MACHINE_ARCH:M*arm*)
-# Flags to pass to CC for using the old APCS ABI on ARM for compat or stand.
-ARM_APCS_FLAGS=	-mabi=apcs-gnu -mfloat-abi=soft
-ARM_APCS_FLAGS+=${${ACTIVE_CC} == "gcc":? -marm :}
-ARM_APCS_FLAGS+=${${ACTIVE_CC} == "cc":? -target ${MACHINE_GNU_ARCH}--netubixelf -B ${TOOLDIR}/${MACHINE_GNU_PLATFORM}/bin :}
-.endif
-
-GENASSYM_CPPFLAGS+=	${${ACTIVE_CC} == "cc":? -no-integrated-as :}
-
-TARGETS+=	all clean cleandir depend dependall includes \
-		install lint obj regress tags html analyze
-PHONY_NOTMAIN =	all clean cleandir depend dependall distclean includes \
-		install lint obj regress beforedepend afterdepend \
-		beforeinstall afterinstall realinstall realdepend realall \
-		html subdir-all subdir-install subdir-depend analyze
-.PHONY:		${PHONY_NOTMAIN}
-.NOTMAIN:	${PHONY_NOTMAIN}
-
-.if ${NEED_OWN_INSTALL_TARGET} != "no"
-.if !target(install)
-install:	beforeinstall .WAIT subdir-install realinstall .WAIT afterinstall
-beforeinstall:
-subdir-install:
-realinstall:
-afterinstall:
-.endif
-all:		realall subdir-all
-subdir-all:
-realall:
-depend:		realdepend subdir-depend
-subdir-depend:
-realdepend:
-distclean:	cleandir
-cleandir:	clean
-
-dependall:	.NOTMAIN realdepend .MAKE
-	@cd "${.CURDIR}"; ${MAKE} realall
-.endif
-
-#
-# Define MKxxx variables (which are either yes or no) for users
-# to set in /etc/mk.conf and override in the make environment.
-# These should be tested with `== "no"' or `!= "no"'.
-# The NOxxx variables should only be set by Makefiles.
-#
-# Please keep etc/Makefile and share/man/man5/mk.conf.5 in sync
-# with changes to the MK* variables here.
-#
-
-#
-# Supported NO* options (if defined, MK* will be forced to "no",
-# regardless of user's mk.conf setting).
-#
-# Source makefiles should set NO*, and not MK*, and must do so before
-# including ubix.own.mk.
-#
-.for var in \
-	NOCRYPTO NODOC NOHTML NOINFO NOLINKLIB NOLINT NOMAN NONLS NOOBJ NOPIC \
-	NOPICINSTALL NOPROFILE NOSHARE NOSTATICLIB
-.if defined(${var})
-MK${var:S/^NO//}:=	no
-.endif
-.endfor
-
-#
-# Older-style variables that enabled behaviour when set.
-#
-.for var in MANZ UNPRIVED UPDATE
-.if defined(${var})
-MK${var}:=	yes
-.endif
-.endfor
-
-#
-# MK* options which have variable defaults.
-#
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64" \
-    || ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
-    || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_CPU} == "aarch64" \
-    || ${MACHINE_ARCH} == "riscv64" \
-    || !empty(MACHINE_ARCH:Mearm*)
-MKCOMPAT?=	yes
-.else
-# Don't let this build where it really isn't supported.
-MKCOMPAT:=	no
-MKCOMPATTESTS:=	no
-MKCOMPATX11:=	no
-.endif
-
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" \
-    || ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
-    || (${MACHINE} == "evbppc" && ${MACHINE_ARCH} == "powerpc")
-MKCOMPATMODULES?=	yes
-.else
-MKCOMPATMODULES:=	no
-.endif
-
-#
-# Default mips64 to softfloat now.
-# arm is always softfloat unless it isn't
-# emips is always softfloat.
-# coldfire is always softfloat
-# or1k is always softfloat
-#
-.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" || \
-    (${MACHINE_CPU} == "arm" && ${MACHINE_ARCH:M*hf*} == "") || \
-    ${MACHINE_ARCH} == "coldfire" || ${MACHINE_CPU} == "or1k" || \
-    ${MACHINE} == "emips"
-MKSOFTFLOAT?=	yes
-.endif
-
-.if ${MACHINE} == "emips"
-SOFTFLOAT_BITS=	32
-.endif
-
-.if ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "x86_64" || \
-    ${MACHINE_ARCH} == "sparc" 
-MKSLJIT?=	yes
-.else
-MKSLJIT?=	no
-.endif
-
-#
-# MK* backward compatibility.
-#
-.if defined(MKBFD)
-MKBINUTILS?=	${MKBFD}
-.endif
-
-#
-# We want to build zfs only for amd64 by default for now.
-#
-.if ${MACHINE} == "amd64"
-MKZFS?=		yes
-.endif
-
-#
-# MK* options which default to "yes".
-#
-_MKVARS.yes= \
-	MKATF \
-	MKBINUTILS \
-	MKCRYPTO MKCOMPLEX MKCVS MKCXX \
-	MKDOC \
-	MKGCC MKGDB MKGROFF \
-	MKHESIOD MKHTML \
-	MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
-	MKKERBEROS \
-	MKKMOD \
-	MKLDAP MKLIBSTDCXX MKLINKLIB MKLVM \
-	MKMAN MKMANDOC \
-	MKMDNS \
-	MKMAKEMANDB \
-	MKNLS \
-	MKNPF \
-	MKOBJ \
-	MKPAM MKPERFUSE \
-	MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
-	MKRUMP \
-	MKSHARE MKSKEY MKSTATICLIB \
-	MKX11FONTS \
-	MKYP
-
-#MINIX-specific vars
-_MKVARS.yes+= \
-	MKSYSDEBUG MKLIVEUPDATE MKLLVMCMDS
-.if (${MACHINE_ARCH} == "i386")
-_MKVARS.yes+= \
-	MKWATCHDOG MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
-.endif
-
-.for var in ${_MKVARS.yes}
-${var}?=	${${var}.${MACHINE_ARCH}:Uyes}
-.endfor
-
-#
-# MKGCCCMDS is only valid if we are building GCC so make it dependent on that.
-#
-_MKVARS.yes += MKGCCCMDS
-MKGCCCMDS?=	${MKGCC}
-
-#
-# Exceptions to the above:
-#
-.if ${MACHINE} == "acorn26"	# page size is prohibitive
-MKKMOD=		no
-.endif
-
-#
-# MK* options which default to "no".  Note that MKZFS has a different
-# default for some platforms, see above.
-#
-_MKVARS.no= \
-	MKUBIXGREP MKUBIXTAR \
-	MKCATPAGES MKCOMPATTESTS MKCOMPATX11 MKCRYPTO_RC5 MKCTF MKDEBUG \
-	MKDEBUGLIB MKDTRACE MKEXTSRC MKGROFFHTMLDOC \
-	MKKYUA MKLLD MKLLDB MKLINT \
-	MKMANZ MKMCLINKER MKOBJDIRS \
-	MKLIBCXX MKLLVM MKPCC \
-	MKPIGZGZIP \
-	MKREPRO \
-	MKSOFTFLOAT MKSTRIPIDENT MKTPM \
-	MKUNPRIVED MKUPDATE MKX11 MKX11MOTIF MKZFS
-
-#MINIX-specific vars
-_MKVARS.no+= \
-	MKIMAGEONLY MKSMALL MKBITCODE MKMAGIC MKPAE MKASR MKSRC
-.if !empty(MACHINE_ARCH:Mearm*)
-_MKVARS.no+= \
-	MKWATCHDOG MKPAE MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
-.endif
-
-.for var in ${_MKVARS.no}
-${var}?=	${${var}.${MACHINE_ARCH}:Uno}
-.endfor
-
-#
-# Which platforms build the xorg-server drivers (as opposed
-# to just Xnest and Xvfb.)
-#
-.if ${MACHINE} == "alpha"	|| \
-    ${MACHINE} == "amd64"	|| \
-    ${MACHINE} == "bebox"	|| \
-    ${MACHINE} == "cats"	|| \
-    ${MACHINE} == "dreamcast"	|| \
-    ${MACHINE} == "ews4800mips"	|| \
-    ${MACHINE} == "evbarm"	|| \
-    ${MACHINE} == "evbmips"	|| \
-    ${MACHINE} == "hp300"	|| \
-    ${MACHINE} == "hpcarm"	|| \
-    ${MACHINE} == "hpcmips"	|| \
-    ${MACHINE} == "hpcsh"	|| \
-    ${MACHINE} == "i386"	|| \
-    ${MACHINE} == "luna68k"	|| \
-    ${MACHINE} == "mac68k"	|| \
-    ${MACHINE} == "macppc"	|| \
-    ${MACHINE} == "netwinder"	|| \
-    ${MACHINE} == "newsmips"	|| \
-    ${MACHINE} == "prep"	|| \
-    ${MACHINE} == "ofppc"	|| \
-    ${MACHINE} == "sgimips"	|| \
-    ${MACHINE} == "shark"	|| \
-    ${MACHINE} == "sparc"	|| \
-    ${MACHINE} == "sparc64"	|| \
-    ${MACHINE} == "vax"		|| \
-    ${MACHINE} == "zaurus"
-MKXORG_SERVER?=yes
-.else
-MKXORG_SERVER?=no
-.endif
-
-#
-# Force some options off if their dependencies are off.
-#
-
-.if ${MKCXX} == "no"
-MKATF:=		no
-MKGROFF:=	no
-MKKYUA:=	no
-.endif
-
-.if ${MKCRYPTO} == "no"
-MKKERBEROS:=	no
-MKLDAP:=	no
-.endif
-
-.if ${MKMAN} == "no"
-MKCATPAGES:=	no
-MKHTML:=	no
-.endif
-
-_MANINSTALL=	maninstall
-.if ${MKCATPAGES} != "no"
-_MANINSTALL+=	catinstall
-.endif
-.if ${MKHTML} != "no"
-_MANINSTALL+=	htmlinstall
-.endif
-
-.if ${MKLINKLIB} == "no"
-MKLINT:=	no
-MKPICINSTALL:=	no
-MKPROFILE:=	no
-.endif
-
-.if ${MKPIC} == "no"
-MKPICLIB:=	no
-.endif
-
-.if ${MKOBJ} == "no"
-MKOBJDIRS:=	no
-.endif
-
-.if ${MKSHARE} == "no"
-MKCATPAGES:=	no
-MKDOC:=		no
-MKINFO:=	no
-MKHTML:=	no
-MKMAN:=		no
-MKNLS:=		no
-.endif
-
-# MINIX
-.if ${MKSMALL} == "yes"
-MKWATCHDOG:=	no
-MKACPI:=	no
-MKAPIC:=	no
-MKDEBUGREG:=	no
-MKSYSDEBUG:=	no
-MKLIVEUPDATE:=	no
-.endif
-
-# MINIX: MKASR implies MKMAGIC
-.if ${MKASR} == "yes"
-MKMAGIC:=	yes
-.endif
-
-# MINIX: MKMAGIC implies MKBITCODE
-.if ${MKMAGIC} == "yes"
-MKBITCODE:=	yes
-.endif
-
-.if !empty(MACHINE_ARCH:Mearm*)
-_NEEDS_LIBCXX.${MACHINE_ARCH}=	yes
-.endif
-_NEEDS_LIBCXX.i386=		yes
-_NEEDS_LIBCXX.powerpc=		yes
-_NEEDS_LIBCXX.powerpc64=	yes
-_NEEDS_LIBCXX.x86_64=		yes
-_NEEDS_LIBCXX.aarch64=		yes
-
-.if ${MKLLVM} == "yes" && ${_NEEDS_LIBCXX.${MACHINE_ARCH}:Uno} == "yes"
-MKLIBCXX:=	yes
-.endif
-
-#
-# install(1) parameters.
-#
-COPY?=		-c
-.if ${MKUPDATE} == "no"
-PRESERVE?=	
-.else
-PRESERVE?=	-p
-.endif
-RENAME?=	-r
-HRDLINK?=	-l h
-SYMLINK?=	-l s
-
-METALOG?=	${DESTDIR}/METALOG
-METALOG.add?=	${TOOL_CAT} -l >> ${METALOG}
-.if (${_SRC_TOP_} != "")	# only set INSTPRIV if inside ${UBIXSRCDIR}
-.if ${MKUNPRIVED} != "no"
-INSTPRIV.unpriv=-U -M ${METALOG} -D ${DESTDIR} -h sha256
-.else
-INSTPRIV.unpriv=
-.endif
-INSTPRIV?=	${INSTPRIV.unpriv} -N ${UBIXSRCDIR}/etc
-.endif
-STRIPFLAG?=	
-
-.if ${NEED_OWN_INSTALL_TARGET} != "no"
-INSTALL_DIR?=		${INSTALL} ${INSTPRIV} -d
-INSTALL_FILE?=		${INSTALL} ${INSTPRIV} ${COPY} ${PRESERVE} ${RENAME}
-INSTALL_LINK?=		${INSTALL} ${INSTPRIV} ${HRDLINK} ${RENAME}
-INSTALL_SYMLINK?=	${INSTALL} ${INSTPRIV} ${SYMLINK} ${RENAME}
-.endif
-
-#
-# Set defaults for the USE_xxx variables.
-#
-
-#
-# USE_* options which default to "no" and will be forced to "no" if their
-# corresponding MK* variable is set to "no".
-#
-.for var in USE_SKEY
-.if (${${var:S/USE_/MK/}} == "no")
-${var}:= no
-.else
-${var}?= no
-.endif
-.endfor
-
-#
-# USE_* options which default to "yes" unless their corresponding MK*
-# variable is set to "no".
-#
-.for var in USE_HESIOD USE_INET6 USE_KERBEROS USE_LDAP USE_PAM USE_YP
-.if (${${var:S/USE_/MK/}} == "no")
-${var}:= no
-.else
-${var}?= yes
-.endif
-.endfor
-
-#MINIX-specific vars
-.for var in \
-	USE_WATCHDOG USE_ACPI USE_PAE USE_APIC USE_DEBUGREG USE_SYSDEBUG \
-	USE_LIVEUPDATE USE_PCI USE_BITCODE USE_MAGIC USE_ASR
-.if ${var:S/USE_/MK/} == "no"
-${var}:= no
-.else
-${var}?= yes
-.endif
-.endfor
-
-#
-# USE_* options which default to "yes".
-#
-.for var in USE_JEMALLOC
-${var}?= yes
-.endfor
-
-#
-# USE_* options which default to "no".
-#
-# For now, disable pigz as compressor by default
-.for var in USE_PIGZGZIP USE_LIBTRE
-${var}?= no
-.endfor
-
-#
-# TOOL_GZIP and friends.  These might refer to TOOL_PIGZ or to the host gzip.
-#
-.if ${USE_PIGZGZIP} != "no"
-TOOL_GZIP=		${TOOL_PIGZ}
-GZIP_N_FLAG?=		-nT
-.else
-TOOL_GZIP=		gzip
-GZIP_N_FLAG?=		-n
-.endif
-TOOL_GZIP_N=		${TOOL_GZIP} ${GZIP_N_FLAG}
-
-#
-# Where X11 sources are and where it is installed to.
-#
-.if !defined(X11SRCDIR)
-.if exists(${UBIXSRCDIR}/../xsrc)
-X11SRCDIR!=		cd "${UBIXSRCDIR}/../xsrc" && pwd
-.else
-X11SRCDIR=		/usr/xsrc
-.endif
-.endif # !defined(X11SRCDIR)
-
-X11SRCDIR.local?=	${X11SRCDIR}/local
-X11ROOTDIR?=		/usr/X11R7
-X11BINDIR?=		${X11ROOTDIR}/bin
-X11ETCDIR?=		/etc/X11
-X11FONTDIR?=		${X11ROOTDIR}/lib/X11/fonts
-X11INCDIR?=		${X11ROOTDIR}/include
-X11LIBDIR?=		${X11ROOTDIR}/lib/X11
-X11MANDIR?=		${X11ROOTDIR}/man
-X11SHAREDIR?=		${X11ROOTDIR}/share
-X11USRLIBDIR?=		${X11ROOTDIR}/lib${MLIBDIR:D/${MLIBDIR}}
-
-#
-# New modular-xorg based builds
-#
-X11SRCDIRMIT?=		${X11SRCDIR}/external/mit
-.for _lib in \
-	FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \
-	Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xpresent Xpm \
-	Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \
-	fontenc xkbfile xkbui Xaw Xfontcache pciaccess xcb \
-	pthread-stubs
-X11SRCDIR.${_lib}?=		${X11SRCDIRMIT}/lib${_lib}/dist
-.endfor
-
-.for _proto in \
-	xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \
-	xinerama dri2 dri3 render resource record video xf86dga xf86misc \
-	xf86vidmode composite damage trap gl randr fontcache xf86dri \
-	present xcb-
-X11SRCDIR.${_proto}proto?=		${X11SRCDIRMIT}/${_proto}proto/dist
-.endfor
-
-.for _dir in \
-	xtrans fontconfig freetype evieext mkfontscale bdftopcf \
-	xkbcomp xorg-cf-files imake xorg-server xbiff xkeyboard-config \
-	xbitmaps appres xeyes xev xedit sessreg pixman \
-	beforelight bitmap editres makedepend fonttosfnt fslsfonts fstobdf \
-	glu glw mesa-demos MesaGLUT MesaLib MesaLib7 \
-	ico iceauth listres lndir \
-	luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
-	rstart setxkbmap showfont smproxy twm viewres \
-	x11perf xauth xcalc xclipboard \
-	xclock xcmsdb xconsole xditview xdpyinfo xdriinfo xdm \
-	xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \
-	xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \
-	xmh xmodmap xmore xman xprop xrandr xrdb xrefresh xset \
-	xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \
-	xwininfo xwud xkbprint xkbevd \
-	xterm xwd xfs xfsinfo xtrap xkbutils xkbcomp \
-	xkeyboard-config xinput xcb-util xorg-docs \
-	font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi \
-	font-adobe-utopia-75dpi font-adobe-utopia-type1 \
-	font-alias \
-	font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi \
-	font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 \
-	font-bitstream-100dpi font-bitstream-75dpi font-bitstream-type1 \
-	font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 \
-	font-isas-misc font-jis-misc font-misc-misc font-mutt-misc \
-	font-sony-misc font-util ttf-bitstream-vera encodings
-X11SRCDIR.${_dir}?=		${X11SRCDIRMIT}/${_dir}/dist
-.endfor
-
-.for _i in \
-	elographics keyboard mouse synaptics vmmouse void ws
-X11SRCDIR.xf86-input-${_i}?=	${X11SRCDIRMIT}/xf86-input-${_i}/dist
-.endfor
-
-.for _v in \
-	ag10e apm ark ast ati ati-kms chips cirrus crime \
-	geode glint i128 i740 igs imstt intel intel-old mach64 mga \
-	neomagic newport nsc nv nvxbox openchrome pnozz \
-	r128 radeonhd rendition \
-	s3 s3virge savage siliconmotion sis suncg14 \
-	suncg6 sunffb sunleo suntcx \
-	tdfx tga trident tseng vesa vga vmware wsfb xgi
-X11SRCDIR.xf86-video-${_v}?=	${X11SRCDIRMIT}/xf86-video-${_v}/dist
-.endfor
-
-# Only install the radeon firmware on DRM-happy systems.
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
-MKRADEONFIRMWARE?=		yes
-.endif
-MKRADEONFIRMWARE?=		no
-
-X11DRI?=			yes
-X11LOADABLE?=			yes
-
-
-#
-# Where extsrc sources are and where it is installed to.
-#
-.if !defined(EXTSRCSRCDIR)
-.if exists(${UBIXSRCDIR}/../extsrc)
-EXTSRCSRCDIR!=		cd "${UBIXSRCDIR}/../extsrc" && pwd
-.else
-EXTSRCSRCDIR=		/usr/extsrc
-.endif
-.endif # !defined(EXTSRCSRCDIR)
-
-EXTSRCROOTDIR?=		/usr/ext
-EXTSRCBINDIR?=		${EXTSRCROOTDIR}/bin
-EXTSRCETCDIR?=		/etc/ext
-EXTSRCINCDIR?=		${EXTSRCROOTDIR}/include
-EXTSRCLIBDIR?=		${EXTSRCROOTDIR}/lib/ext
-EXTSRCMANDIR?=		${EXTSRCROOTDIR}/man
-EXTSRCUSRLIBDIR?=	${EXTSRCROOTDIR}/lib
-
-#
-# MAKEDIRTARGET dir target [extra make(1) params]
-#	run "cd $${dir} && ${MAKEDIRTARGETENV} ${MAKE} [params] $${target}", with a pretty message
-#
-MAKEDIRTARGETENV?=
-MAKEDIRTARGET=\
-	@_makedirtarget() { \
-		dir="$$1"; shift; \
-		target="$$1"; shift; \
-		case "$${dir}" in \
-		/*)	this="$${dir}/"; \
-			real="$${dir}" ;; \
-		.)	this="${_THISDIR_}"; \
-			real="${.CURDIR}" ;; \
-		*)	this="${_THISDIR_}$${dir}/"; \
-			real="${.CURDIR}/$${dir}" ;; \
-		esac; \
-		show=$${this:-.}; \
-		echo "$${target} ===> $${show%/}$${1:+	(with: $$@)}"; \
-		cd "$${real}" \
-		&& ${MAKEDIRTARGETENV} ${MAKE} _THISDIR_="$${this}" "$$@" $${target}; \
-	}; \
-	_makedirtarget
-
-#
-# MAKEVERBOSE support.  Levels are:
-#	0	Minimal output ("quiet")
-#	1	Describe what is occurring
-#	2	Describe what is occurring and echo the actual command
-#	3	Ignore the effect of the "@" prefix in make commands
-#	4	Trace shell commands using the shell's -x flag
-#		
-MAKEVERBOSE?=		2
-
-.if ${MAKEVERBOSE} == 0
-_MKMSG?=	@\#
-_MKSHMSG?=	: echo
-_MKSHECHO?=	: echo
-.SILENT:
-.elif ${MAKEVERBOSE} == 1
-_MKMSG?=	@echo '   '
-_MKSHMSG?=	echo '   '
-_MKSHECHO?=	: echo
-.SILENT:
-.else	# MAKEVERBOSE >= 2
-_MKMSG?=	@echo '\#  '
-_MKSHMSG?=	echo '\#  '
-_MKSHECHO?=	echo
-.SILENT: __makeverbose_dummy_target__
-.endif	# MAKEVERBOSE >= 2
-.if ${MAKEVERBOSE} >= 3
-.MAKEFLAGS:	-dl
-.endif	# ${MAKEVERBOSE} >= 3
-.if ${MAKEVERBOSE} >= 4
-.MAKEFLAGS:	-dx
-.endif	# ${MAKEVERBOSE} >= 4
-
-_MKMSG_BUILD?=		${_MKMSG} "  build "
-_MKMSG_CREATE?=		${_MKMSG} " create "
-_MKMSG_COMPILE?=	${_MKMSG} "compile "
-_MKMSG_FORMAT?=		${_MKMSG} " format "
-_MKMSG_INSTALL?=	${_MKMSG} "install "
-_MKMSG_LINK?=		${_MKMSG} "   link "
-_MKMSG_LEX?=		${_MKMSG} "    lex "
-_MKMSG_REMOVE?=		${_MKMSG} " remove "
-_MKMSG_YACC?=		${_MKMSG} "   yacc "
-
-_MKSHMSG_CREATE?=	${_MKSHMSG} " create "
-_MKSHMSG_INSTALL?=	${_MKSHMSG} "install "
-
-_MKTARGET_BUILD?=	${_MKMSG_BUILD} ${.CURDIR:T}/${.TARGET}
-_MKTARGET_CREATE?=	${_MKMSG_CREATE} ${.CURDIR:T}/${.TARGET}
-_MKTARGET_COMPILE?=	${_MKMSG_COMPILE} ${.CURDIR:T}/${.TARGET}
-_MKTARGET_FORMAT?=	${_MKMSG_FORMAT} ${.CURDIR:T}/${.TARGET}
-_MKTARGET_INSTALL?=	${_MKMSG_INSTALL} ${.TARGET}
-_MKTARGET_LINK?=	${_MKMSG_LINK} ${.CURDIR:T}/${.TARGET}
-_MKTARGET_LEX?=		${_MKMSG_LEX} ${.CURDIR:T}/${.TARGET}
-_MKTARGET_REMOVE?=	${_MKMSG_REMOVE} ${.TARGET}
-_MKTARGET_YACC?=	${_MKMSG_YACC} ${.CURDIR:T}/${.TARGET}
-
-.if ${MKMANDOC} == "yes"
-TARGETS+=	lintmanpages
-.endif
-
-TESTSBASE=	/usr/tests${MLIBDIR:D/${MLIBDIR}}
-
-.endif	# !defined(_UBIX_OWN_MK_)
diff --git a/share/mk/ubix.prog.mk b/share/mk/ubix.prog.mk
deleted file mode 100644
index f5006b6..0000000
--- a/share/mk/ubix.prog.mk
+++ /dev/null
@@ -1,786 +0,0 @@
-.ifndef HOSTPROG
-
-.include <ubix.init.mk>
-.include <ubix.shlib.mk>
-.include <ubix.gcc.mk>
-.include <ubix.gcov.mk>
-
-#
-# Definitions and targets shared among all programs built by a single
-# Makefile.
-#
-
-##### Basic targets
-realinstall:	proginstall scriptsinstall
-
-.gdbinit:
-	rm -f .gdbinit
-.if defined(DESTDIR) && !empty(DESTDIR)
-	echo "set solib-absolute-prefix ${DESTDIR}" > .gdbinit
-.else
-	touch .gdbinit
-.endif
-.for __gdbinit in ${GDBINIT}
-	echo "source ${__gdbinit}" >> .gdbinit
-.endfor
-
-CLEANFILES+= a.out [Ee]rrs mklog core *.core .gdbinit
-
-.if defined(SHAREDSTRINGS)
-CLEANFILES+=strings
-.c.o:
-	${CC} -E ${CPPFLAGS} ${CFLAGS} ${.IMPSRC} | xstr -c -
-	@${CC} ${CPPFLAGS} ${CFLAGS} -c x.c -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-	@rm -f x.c
-
-.cc.o .cpp.o .cxx.o .C.o:
-	${CXX} -E ${CPPFLAGS} ${CXXFLAGS} ${.IMPSRC} | xstr -c -
-	@mv -f x.c x.cc
-	@${CXX} ${CPPFLAGS} ${CXXFLAGS} -c x.cc -o ${.TARGET}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-	@rm -f x.cc
-.endif
-
-.if defined(MKPIE) && (${MKPIE} != "no")
-CFLAGS+=	${PIE_CFLAGS}
-AFLAGS+=	${PIE_AFLAGS}
-LDFLAGS+=	${PIE_LDFLAGS}
-.endif
-
-CFLAGS+=	${COPTS}
-.if defined(MKDEBUG) && (${MKDEBUG} != "no")
-CFLAGS+=	-g
-.endif
-OBJCFLAGS+=	${OBJCOPTS}
-MKDEP_SUFFIXES?=	.o .ln .d
-
-# CTF preserve debug symbols
-.if (${MKCTF:Uno} != "no") && (${CFLAGS:M-g} != "")
-CTFFLAGS+= -g
-CTFMFLAGS+= -g
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
-#CFLAGS+=-gdwarf-2
-.endif
-.endif
-
-# ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
-.ifndef LIBCRTBEGIN
-LIBCRTBEGIN=	${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o ${_GCC_CRTBEGIN}
-.MADE: ${LIBCRTBEGIN}
-.endif
-.ifndef LIBCRTEND
-LIBCRTEND=	${_GCC_CRTEND} ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
-.MADE: ${LIBCRTEND}
-.endif
-_SHLINKER=	${SHLINKDIR}/ld.elf_so
-
-.ifndef LIBCRT0
-LIBCRT0=	${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crt0.o
-.MADE: ${LIBCRT0}
-.endif
-
-.ifndef LIBCRTI
-LIBCRTI=	${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
-.MADE: ${LIBCRTI}
-.endif
-
-##### Installed system library definitions
-#
-#	E.g.
-#		LIBC?=${DESTDIR}/usr/lib/libc.a
-#		LIBX11?=${DESTDIR}/usr/X11R7/lib/libX11.a
-#	etc..
-#	NB:	If you are a library here, add it in ubix.README
-
-.for _lib in \
-	archive \
-	asn1 \
-	atf_c \
-	atf_cxx \
-	bind9 \
-	bluetooth \
-	ubixmalloc \
-	bz2 \
-	c \
-	c_pic \
-	com_err \
-	compat \
-	crypt \
-	crypto \
-	crypto_idea \
-	crypto_mdc2 \
-	crypto_rc5 \
-	curses \
-	dbm \
-	des \
-	dns \
-	edit \
-	event \
-	expat \
-	fetch \
-	fl \
-	form \
-	g2c \
-	gcc \
-	gnumalloc \
-	gssapi \
-	hdb \
-	heimbase \
-	heimntlm \
-	hx509 \
-	intl \
-	ipsec \
-	isc \
-	isccc \
-	isccfg \
-	kadm5clnt \
-	kadm5srv \
-	kafs \
-	krb5 \
-	kvm \
-	l \
-	lber \
-	ldap \
-	ldap_r \
-	lua \
-	lwres \
-	m \
-	magic \
-	menu \
-	objc \
-	ossaudio \
-	pam \
-	pcap \
-	pci \
-	pmc \
-	posix \
-	pthread \
-	pthread_dbg \
-	puffs \
-	quota \
-	radius \
-	resolv \
-	rmt \
-	roken \
-	rpcsvc \
-	rt \
-	rump \
-	rumpfs_cd9660fs \
-	rumpfs_efs \
-	rumpfs_ext2fs \
-	rumpfs_ffs \
-	rumpfs_hfs \
-	rumpfs_lfs \
-	rumpfs_msdosfs \
-	rumpfs_nfs \
-	rumpfs_ntfs \
-	rumpfs_syspuffs \
-	rumpfs_tmpfs \
-	rumpfs_udf \
-	rumpfs_ufs \
-	rumpuser \
-	saslc \
-	skey \
-	sl \
-	sqlite3 \
-	ss \
-	ssh \
-	ssl \
-	ssp \
-	stdcxx \
-	supcxx \
-	terminfo \
-	tre \
-	usbhid \
-	util \
-	wind \
-	wrap \
-	y \
-	z 
-
-.ifndef LIB${_lib:tu}
-LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
-.MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
-.endif
-.endfor
-
-# Minix libraries
-.for _lib in \
-	audiodriver \
-	bdev \
-	blockdriver \
-	chardriver \
-	clkconf \
-	ddekit \
-	ddekit_usb_client \
-	ddekit_usb_server \
-	devman \
-	elf \
-	exec \
-	fsdriver \
-	gpio \
-	hgfs \
-	i2cdriver \
-	inputdriver \
-	lwip \
-	minc \
-	minixfs \
-	mthread \
-	netdriver \
-	sffs \
-	sockdriver \
-	sockevent \
-	sys \
-	timers \
-	usb \
-	vboxfs \
-	virtio \
-	vtreefs
-.ifndef LIB${_lib:tu}
-LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
-.MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
-.endif
-.endfor
-
-# PAM applications, if linked statically, need more libraries
-.if (${MKPIC} == "no")
-.if (${MKCRYPTO} != "no")
-PAM_STATIC_LDADD+= -lssh
-PAM_STATIC_DPADD+= ${LIBSSH}
-.endif
-.if (${MKKERBEROS} != "no")
-PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
-	-lroken -lcom_err -lheimbase -lcrypto
-PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
-	${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO}
-.endif
-.if (${MKSKEY} != "no")
-PAM_STATIC_LDADD+= -lskey
-PAM_STATIC_DPADD+= ${LIBSKEY}
-.endif
-PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil
-PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
-.else
-PAM_STATIC_LDADD=
-PAM_STATIC_DPADD=
-.endif
-
-.if defined(__UBIX) && ${MACHINE_ARCH} == "earm"
-# LSC: On ARM, when compiling statically, with gcc, lgcc_eh is required
-LDFLAGS+= ${${ACTIVE_CC} == "gcc":? -lgcc_eh:}
-.endif # defined(__UBIX) && ${MACHINE_ARCH} == "earm"
-
-#	NB:	If you are a library here, add it in ubix.README
-.for _lib in \
-	FS \
-	GL \
-	GLU \
-	ICE \
-	SM \
-	X11 \
-	XTrap \
-	Xau \
-	Xaw \
-	Xdmcp \
-	Xext \
-	Xfont \
-	Xft \
-	Xi \
-	Xinerama \
-	Xmu \
-	Xmuu \
-	Xpm \
-	Xrandr \
-	Xrender \
-	Xss \
-	Xt \
-	Xtst \
-	Xv \
-	Xxf86dga \
-	Xxf86misc \
-	Xxf86vm \
-	dps \
-	fntstubs \
-	fontcache \
-	fontconfig \
-	fontenc \
-	freetype \
-	lbxutil \
-	xkbfile
-.ifndef LIB${_lib:tu}
-LIB${_lib:tu}=	${DESTDIR}${X11USRLIBDIR}/lib${_lib}.a
-.MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded
-.endif
-.endfor
-
-# Ugly one-offs
-LIBX11_XCB=	${DESTDIR}${X11USRLIBDIR}/libX11-xcb.a
-LIBXCB=	${DESTDIR}${X11USRLIBDIR}/libxcb.a
-
-.if defined(RESCUEDIR)
-CPPFLAGS+=	-DRESCUEDIR=\"${RESCUEDIR}\"
-.endif
-
-_PROGLDOPTS=
-.if ${SHLINKDIR} != "/ubixos/usr/libexec"	# XXX: change or remove if ld.so moves
-_PROGLDOPTS+=	-Wl,-dynamic-linker=${_SHLINKER}
-.endif
-.if ${SHLIBDIR} != "/ubixos/usr/lib"
-_PROGLDOPTS+=	-Wl,-rpath,${SHLIBDIR} \
-		-L=${SHLIBDIR}
-.elif ${SHLIBINSTALLDIR} != "/ubixos/usr/lib"
-_PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}${SHLIBINSTALLDIR} \
-		-L=${SHLIBINSTALLDIR}
-.endif
-
-__proginstall: .USE
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
-
-__progrumpinstall: .USE
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} -o ${RUMPBINOWN} -g ${RUMPBINGRP} -m ${RUMPBINMODE} \
-		${STRIPFLAG} ${.ALLSRC} ${.TARGET}
-
-__progdebuginstall: .USE
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \
-		${.ALLSRC} ${.TARGET}
-
-
-
-#
-# Backwards compatibility with Makefiles that assume that ubix.prog.mk
-# can only build a single binary.
-#
-
-_APPEND_MANS=yes
-_APPEND_SRCS=yes
-
-_CCLINKFLAGS=
-
-.if defined(PROG_CXX)
-PROG=		${PROG_CXX}
-_CCLINK=	${CXX} ${_CCLINKFLAGS}
-
-.if defined(__UBIX)
-# BJG - stack unwinding (for C++ exceptions) doesn't work on static executables when built with llvm.
-LDSTATIC=	-dynamic
-.endif # defined(__UBIX)
-.endif
-
-.if defined(RUMPPRG)
-PROG=			${RUMPPRG}
-. ifndef CRUNCHEDPROG
-.  if (${MKRUMP} != "no")
-PROGS=			${RUMPPRG} rump.${RUMPPRG}
-.  else
-PROGS=			${RUMPPRG}
-.  endif
-.  if defined(SRCS)
-.   if (${MKRUMP} != "no")
-SRCS.rump.${PROG}:=	${SRCS} ${PROG}_rumpops.c ${RUMPSRCS}
-.   endif
-SRCS+=			${PROG}_hostops.c
-.  else
-SRCS=			${PROG}.c ${PROG}_hostops.c
-.   if (${MKRUMP} != "no")
-SRCS.rump.${PROG}=	${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}
-.   endif
-.  endif
-.   if (${MKRUMP} != "no")
-DPSRCS+=		${PROG}_rumpops.c ${RUMPSRCS}
-LDADD.rump.${PROG}+=	-lrumpclient
-DPADD.rump.${PROG}+=	${LIBRUMPCLIENT}
-MAN.rump.${PROG}=	# defined but feeling empty
-_RUMPINSTALL.rump.${PROG}=# defined
-.   endif
-. else # CRUNCHEDPROG
-PROGS=			${PROG}
-CPPFLAGS+=		-DCRUNCHOPS
-. endif
-.endif
-
-.if defined(PROG)
-_CCLINK?=	${CC} ${_CCLINKFLAGS}
-.  if defined(MAN)
-MAN.${PROG}=	${MAN}
-_APPEND_MANS=	no
-.  endif
-.  if !defined(OBJS)
-OBJS=		${OBJS.${PROG}}
-.  endif
-.  if defined(PROGNAME)
-PROGNAME.${PROG}=	${PROGNAME}
-.  endif
-.  if defined(SRCS)
-SRCS.${PROG}=	${SRCS}
-_APPEND_SRCS=	no
-.  endif
-.endif
-
-# Turn the single-program PROG and PROG_CXX variables into their multi-word
-# counterparts, PROGS and PROGS_CXX.
-.if !defined(RUMPPRG)
-.  if defined(PROG_CXX) && !defined(PROGS_CXX)
-PROGS_CXX=	${PROG_CXX}
-.  elif defined(PROG) && !defined(PROGS)
-PROGS=		${PROG}
-.  endif
-.endif
-
-##### Libraries that this may depend upon.
-.if defined(PROGDPLIBS) 						# {
-.for _lib _dir in ${PROGDPLIBS}
-.if !defined(BINDO.${_lib})
-PROGDO.${_lib}!=	cd "${_dir}" && ${PRINTOBJDIR}
-.MAKEOVERRIDES+=PROGDO.${_lib}
-.endif
-LDADD+=		-L${PROGDO.${_lib}} -l${_lib}
-.if exists(${PROGDO.${_lib}}/lib${_lib}_pic.a)
-DPADD+=		${PROGDO.${_lib}}/lib${_lib}_pic.a
-.elif exists(${PROGDO.${_lib}}/lib${_lib}.so)
-DPADD+=		${PROGDO.${_lib}}/lib${_lib}.so
-.else
-DPADD+=		${PROGDO.${_lib}}/lib${_lib}.a
-.endif
-.endfor
-.endif									# }
-#
-# Per-program definitions and targets.
-#
-
-_CCLINK.CDEFAULT= ${CC} ${_CCLINKFLAGS}
-# Definitions specific to C programs.
-.for _P in ${PROGS}
-SRCS.${_P}?=	${_P}.c
-_CCLINK.${_P}=	${CC} ${_CCLINKFLAGS}
-_CFLAGS.${_P}=	${CFLAGS} ${CPUFLAGS}
-_CPPFLAGS.${_P}=	${CPPFLAGS}
-_COPTS.${_P}=	${COPTS}
-.endfor
-
-_CCLINK.CXXDEFAULT= ${CXX} ${_CCLINKFLAGS}
-# Definitions specific to C++ programs.
-.for _P in ${PROGS_CXX}
-SRCS.${_P}?=	${_P}.cc
-_CCLINK.${_P}=	${CXX} ${_CCLINKFLAGS}
-.endfor
-
-# Language-independent definitions.
-.if defined(__UBIX)
-.if ${USE_BITCODE:Uno} == "yes"
-CFLAGS+= -flto
-.endif # ${USE_BITCODE:Uno} == "yes"
-
-.if ${USE_BITCODE:Uyes} == "no"
-#LSC Gold linker seems to require the library directory to be set up if
-#    a sysroot parameter has been given.
-LDFLAGS+= -L ${DESTDIR}/usr/lib
-.endif # ${USE_BITCODE:U} == "no"
-.endif # defined(__UBIX)
-
-.for _P in ${PROGS} ${PROGS_CXX}					# {
-
-BINDIR.${_P}?=		${BINDIR}
-PROGNAME.${_P}?=	${_P}
-
-.if ${MKDEBUG} != "no" && !commands(${_P})
-_PROGDEBUG.${_P}:=	${PROGNAME.${_P}}.debug
-.endif
-
-.if defined(PAXCTL_FLAGS)
-PAXCTL_FLAGS.${_P}?= ${PAXCTL_FLAGS}
-.endif
-
-##### PROG specific flags.
-
-_DPADD.${_P}=		${DPADD}    ${DPADD.${_P}}
-_LDADD.${_P}=		${LDADD}    ${LDADD.${_P}}
-_LDFLAGS.${_P}=		${LDFLAGS}  ${LDFLAGS.${_P}}
-_LDSTATIC.${_P}=	${LDSTATIC} ${LDSTATIC.${_P}}
-
-##### Build and install rules
-.if !empty(_APPEND_SRCS:M[Yy][Ee][Ss])
-SRCS+=		${SRCS.${_P}}	# For ubix.dep.mk
-.endif
-
-_YPSRCS.${_P}=	${SRCS.${_P}:M*.[ly]:C/\..$/.c/} ${YHEADER:D${SRCS.${_P}:M*.y:.y=.h}}
-
-DPSRCS+=		${_YPSRCS.${_P}}
-CLEANFILES+=		${_YPSRCS.${_P}}
-
-.if !empty(SRCS.${_P}:N*.h:N*.sh:N*.fth)
-OBJS.${_P}+=	${SRCS.${_P}:N*.h:N*.sh:N*.fth:R:S/$/.o/g}
-LOBJS.${_P}+=	${LSRCS:.c=.ln} ${SRCS.${_P}:M*.c:.c=.ln}
-.endif
-
-.if defined(OBJS.${_P}) && !empty(OBJS.${_P})			# {
-.NOPATH: ${OBJS.${_P}} ${_P} ${_YPSRCS.${_P}}
-
-.if (defined(USE_COMBINE) && ${USE_COMBINE} != "no" && !commands(${_P}) \
-   && (${_CCLINK.${_P}} == ${_CCLINK.CDEFAULT} \
-       || ${_CCLINK.${_P}} == ${_CCLINK.CXXDEFAULT}) \
-   && !defined(NOCOMBINE.${_P}) && !defined(NOCOMBINE))
-.for f in ${SRCS.${_P}:N*.h:N*.sh:N*.fth:C/\.[yl]$/.c/g}
-#_XFLAGS.$f := ${CPPFLAGS.$f:D1} ${CPUFLAGS.$f:D2} \
-#     ${COPTS.$f:D3} ${OBJCOPTS.$f:D4} ${CXXFLAGS.$f:D5}
-.if (${CPPFLAGS.$f:D1} == "1" || ${CPUFLAGS.$f:D2} == "2" \
-     || ${COPTS.$f:D3} == "3" || ${OBJCOPTS.$f:D4} == "4" \
-     || ${CXXFLAGS.$f:D5} == "5") \
-    || ("${f:M*.[cyl]}" == "" || commands(${f:R:S/$/.o/}))
-XOBJS.${_P}+=	${f:R:S/$/.o/}
-.else
-XSRCS.${_P}+=	${f}
-NODPSRCS+=	${f}
-.endif
-.endfor
-
-${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${XOBJS.${_P}} ${SRCS.${_P}} \
-    ${DPSRCS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${_DPADD.${_P}}
-	${_MKTARGET_LINK}
-.if defined(DESTDIR)
-	${_CCLINK.${_P}} -Wl,-nostdlib \
-	    ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
-	    -B${_GCC_CRTDIR}/ -B${DESTDIR}/usr/lib/ \
-	    -MD --combine ${_CPPFLAGS.${_P}} ${_CFLAGS.${_P}} ${_COPTS.${_P}} \
-	    ${XSRCS.${_P}:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} ${XOBJS.${_P}} \
-	    ${_LDADD.${_P}} -L${_GCC_LIBGCCDIR} -L${DESTDIR}/usr/lib
-.else
-	${_CCLINK.${_P}} ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} ${_PROGLDOPTS} \
-	    -MD --combine ${_CPPFLAGS.${_P}} ${_COPTS.${_P}}
-	    ${XSRCS.${_P}:@.SRC.@${.ALLSRC:M*.c:M*${.SRC.}}@:O:u} ${XOBJS.${_P}} \
-	    ${_LDADD.${_P}}
-.endif	# defined(DESTDIR)
-.if defined(CTFMERGE)
-	${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
-.endif
-.if defined(PAXCTL_FLAGS.${_P})
-	${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
-.endif
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-
-CLEANFILES+=	${_P}.d
-.if exists(${_P}.d)
-.include "${_P}.d"		# include -MD depend for program.
-.endif
-.else	# USE_COMBINE
-
-${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
-
-.if defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
-CLEANFILES+= ${_P}.opt.bcl ${_P}.bcl ${_P}.bcl.o
-
-OPTFLAGS.${_P}?= ${OPTFLAGS}
-BITCODE_LD_FLAGS_1ST.${_P}+= ${BITCODE_LD_FLAGS_1ST}
-BITCODE_LD_FLAGS_2ND.${_P}+= ${BITCODE_LD_FLAGS_2ND}
-
-${_P}.bcl: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
-    ${LIBCRTEND} ${_DPADD.${_P}}
-	${_MKTARGET_LINK}
-	${_CCLINK.${_P}} \
-		-o ${.TARGET} \
-		-nostartfiles \
-		-L${DESTDIR}/usr/lib/bc \
-		${OBJS.${_P}} ${LLVM_LINK_ARGS} ${_LDADD.${_P}:N-shared} \
-		${_LDSTATIC.${_P}} ${_PROGLDOPTS} \
-		-Wl,-r \
-		${BITCODE_LD_FLAGS_1ST.${_P}} \
-		-Wl,-plugin-opt=emit-llvm
-
-${_P}.opt.bcl: ${_P}.bcl ${LLVM_PASS}
-	${_MKTARGET_LINK}
-	${OPT} ${OPTFLAGS.${_P}} -o ${.TARGET} ${_P}.bcl
-
-${_P}.bcl.o: ${_P}.opt.bcl
-	${_MKTARGET_LINK}
-	${LLC} -O1 -march=x86 -mcpu=i586 -filetype=obj -o ${.TARGET} ${.ALLSRC}
-
-${_P}: ${_P}.bcl.o
-.if !commands(${_P})
-	${_MKTARGET_LINK}
-	${_CCLINK.${_P}} \
-		${_LDFLAGS.${_P}} \
-		-L${DESTDIR}/usr/lib \
-		${_LDSTATIC.${_P}} -o ${.TARGET} \
-		${.TARGET}.bcl.o ${_PROGLDOPTS} ${_LDADD.${_P}} \
-		${BITCODE_LD_FLAGS_2ND.${_P}} \
-		-Wl,--allow-multiple-definition
-.endif	# !commands(${_P})
-
-.else
-${_P}: .gdbinit ${LIBCRT0} ${LIBCRTI} ${OBJS.${_P}} ${LIBC} ${LIBCRTBEGIN} \
-    ${LIBCRTEND} ${_DPADD.${_P}}
-.if !commands(${_P})
-	${_MKTARGET_LINK}
-	${_CCLINK.${_P}} \
-	    ${_LDFLAGS.${_P}} ${_LDSTATIC.${_P}} -o ${.TARGET} \
-	    ${OBJS.${_P}} ${_PROGLDOPTS} ${_LDADD.${_P}}
-.if defined(CTFMERGE)
-	${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${OBJS.${_P}}
-.endif
-.if defined(PAXCTL_FLAGS.${_P})
-	${PAXCTL} ${PAXCTL_FLAGS.${_P}} ${.TARGET}
-.endif
-.if ${MKSTRIPIDENT} != "no"
-	${OBJCOPY} -R .ident ${.TARGET}
-.endif
-.endif	# !commands(${_P})
-.endif  # defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
-.endif	# USE_COMBINE
-
-${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
-	${_MKTARGET_LINK}
-	${CC} ${LDFLAGS:N-Wl,-pie} -nostdlib -r -Wl,-dc -o ${.TARGET} ${OBJS.${_P}}
-
-.if defined(_PROGDEBUG.${_P})
-${_PROGDEBUG.${_P}}: ${_P}
-	${_MKTARGET_CREATE}
-	(  ${OBJCOPY} --only-keep-debug ${_P} ${_PROGDEBUG.${_P}} \
-	&& ${OBJCOPY} --strip-debug -p -R .gnu_debuglink \
-		--add-gnu-debuglink=${_PROGDEBUG.${_P}} ${_P} \
-	) || (rm -f ${_PROGDEBUG.${_P}}; false)
-.endif
-
-.endif	# defined(OBJS.${_P}) && !empty(OBJS.${_P})			# }
-
-.if !defined(MAN.${_P})
-MAN.${_P}=	${_P}.1
-.endif	# !defined(MAN.${_P})
-.if !empty(_APPEND_MANS:M[Yy][Ee][Ss])
-MAN+=		${MAN.${_P}}
-.endif
-
-realall: ${_P} ${_PROGDEBUG.${_P}}
-
-CLEANFILES+= ${_P} ${_PROGDEBUG.${_P}}
-
-.if defined(OBJS.${_P}) && !empty(OBJS.${_P})
-CLEANFILES+= ${OBJS.${_P}} ${LOBJS.${_P}}
-.endif
-
-_PROG_INSTALL+=	proginstall-${_P}
-
-.if !target(proginstall-${_P})						# {
-proginstall-${_P}::	${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}} \
-		${_PROGDEBUG.${_P}:D${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}}
-.PRECIOUS:	${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}} \
-		${_PROGDEBUG.${_P}:D${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}}
-
-.if ${MKUPDATE} == "no"
-.if defined(_RUMPINSTALL.${_P})
-${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! ${_P} __progrumpinstall
-.else
-${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! ${_P} __proginstall
-.endif
-.if !defined(BUILD) && !make(all) && !make(${_P})
-${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}! .MADE
-.endif
-.if defined(_PROGDEBUG.${_P})
-${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}! ${_PROGDEBUG.${_P}} __progdebuginstall
-.if !defined(BUILD) && !make(all) && !make(${_P})
-${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}! .MADE
-.endif
-.endif	#  define(_PROGDEBUG.${_P})
-.else	# MKUPDATE != no
-.if defined(_RUMPINSTALL.${_P})
-${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: ${_P} __progrumpinstall
-.else
-${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: ${_P} __proginstall
-.endif
-.if !defined(BUILD) && !make(all) && !make(${_P})
-${DESTDIR}${BINDIR.${_P}}/${PROGNAME.${_P}}: .MADE
-.endif
-.if defined(_PROGDEBUG.${_P})
-${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}: ${_PROGDEBUG.${_P}} __progdebuginstall
-.if !defined(BUILD) && !make(all) && !make(${_P})
-${DESTDIR}${DEBUGDIR}${BINDIR.${_P}}/${_PROGDEBUG.${_P}}: .MADE
-.endif
-.endif	#  defined(_PROGDEBUG.${_P})
-.endif	# MKUPDATE != no
-
-.endif	# !target(proginstall-${_P})					# }
-
-lint: lint-${_P}
-lint-${_P}: ${LOBJS.${_P}}
-.if defined(LOBJS.${_P}) && !empty(LOBJS.${_P})
-	${LINT} ${LINTFLAGS} ${_LDFLAGS.${_P}:C/-L[  ]*/-L/Wg:M-L*} ${LOBJS.${_P}} ${_LDADD.${_P}}
-.endif
-
-.endfor # _P in ${PROGS} ${PROGS_CXX}					# }
-
-.if defined(OBJS) && !empty(OBJS) && \
-    (empty(PROGS) && empty(PROGS_CXX))
-CLEANFILES+= ${OBJS} ${LOBJS}
-.endif
-
-.if !target(proginstall)
-proginstall:: ${_PROG_INSTALL}
-.endif
-.PHONY:		proginstall
-
-
-
-realall: ${SCRIPTS}
-.if defined(SCRIPTS) && !target(scriptsinstall)				# {
-SCRIPTSDIR?=${BINDIR}
-SCRIPTSOWN?=${BINOWN}
-SCRIPTSGRP?=${BINGRP}
-SCRIPTSMODE?=${BINMODE}
-
-scriptsinstall:: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
-.PRECIOUS: ${SCRIPTS:@S@${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}@}
-
-__scriptinstall: .USE
-	${_MKTARGET_INSTALL}
-	${INSTALL_FILE} \
-	    -o ${SCRIPTSOWN_${.ALLSRC:T}:U${SCRIPTSOWN}} \
-	    -g ${SCRIPTSGRP_${.ALLSRC:T}:U${SCRIPTSGRP}} \
-	    -m ${SCRIPTSMODE_${.ALLSRC:T}:U${SCRIPTSMODE}} \
-	    ${.ALLSRC} ${.TARGET}
-
-.for S in ${SCRIPTS:O:u}
-.if ${MKUPDATE} == "no"
-${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}! ${S} __scriptinstall
-.if !defined(BUILD) && !make(all) && !make(${S})
-${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}! .MADE
-.endif
-.else
-${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: ${S} __scriptinstall
-.if !defined(BUILD) && !make(all) && !make(${S})
-${DESTDIR}${SCRIPTSDIR_${S}:U${SCRIPTSDIR}}/${SCRIPTSNAME_${S}:U${SCRIPTSNAME:U${S:T:R}}}: .MADE
-.endif
-.endif
-.endfor
-.endif									# }
-
-.if !target(scriptsinstall)
-scriptsinstall::
-.endif
-.PHONY:		scriptsinstall
-
-##### Pull in related .mk logic
-LINKSOWN?= ${BINOWN}
-LINKSGRP?= ${BINGRP}
-LINKSMODE?= ${BINMODE}
-.include <ubix.man.mk>
-.include <ubix.nls.mk>
-.include <ubix.files.mk>
-.include <ubix.inc.mk>
-.include <ubix.links.mk>
-.include <ubix.sys.mk>
-.include <ubix.dep.mk>
-.include <ubix.cc-analyze.mk>
-.include <ubix.clean.mk>
-
-${TARGETS}:	# ensure existence
-
-.endif	# HOSTPROG
diff --git a/share/mk/ubix.shlib.mk b/share/mk/ubix.shlib.mk
deleted file mode 100644
index 3033b54..0000000
--- a/share/mk/ubix.shlib.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#	$UBIXBSD: bsd.shlib.mk,v 1.8 2012/08/23 21:21:17 joerg Exp $
-
-.if !defined(_UBIX_SHLIB_MK_)
-_UBIX_SHLIB_MK_=1
-
-.if ${MKDYNAMICROOT} == "no"
-SHLIBINSTALLDIR?= /ubixos/usr/lib
-.else
-SHLIBINSTALLDIR?= /ubixos/lib
-.endif
-
-.if ${MKDYNAMICROOT} == "no" || \
-    (${BINDIR:Ux} != "/bin" && ${BINDIR:Ux} != "/sbin" && \
-     ${BINDIR:Ux} != "/libexec" && ${USE_SHLIBDIR:Uno} == "no")
-SHLIBDIR?=	/ubixos/usr/lib
-.else
-SHLIBDIR?=	/ubixos/lib
-.endif
-
-.if ${USE_SHLIBDIR:Uno} != "no"
-_LIBSODIR?=	${SHLIBINSTALLDIR}
-.else
-_LIBSODIR?=	${LIBDIR}
-.endif
-
-.if ${MKDYNAMICROOT} == "no"
-SHLINKINSTALLDIR?= /ubixos/usr/libexec
-.else
-SHLINKINSTALLDIR?= /ubixos/libexec
-.endif
-
-.if ${MKDYNAMICROOT} == "no" || \
-    (${BINDIR:Ux} != "/bin" && ${BINDIR:Ux} != "/sbin" && \
-     ${BINDIR:Ux} != "/libexec")
-SHLINKDIR?=	/ubixos/usr/libexec
-.else
-SHLINKDIR?=	/ubixos/libexec
-.endif
-
-.endif	# !defined(_UBIX_SHLIB_MK_)
diff --git a/share/mk/ubix.subdir.mk b/share/mk/ubix.subdir.mk
deleted file mode 100644
index b3bea80..0000000
--- a/share/mk/ubix.subdir.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-.include <ubix.init.mk>
-
-.if !defined(NOSUBDIR)
-
-.for dir in ${SUBDIR}
-
-.if "${dir:H}" != ""
-
-.if exists(${.CURDIR}/${dir}.${MACHINE})
-__REALSUBDIR+=${dir}.${MACHINE}
-.else
-__REALSUBDIR+=${dir}
-.endif
-
-.else
-.if exists(${dir}.${MACHINE})
-__REALSUBDIR+=${dir}.${MACHINE}
-.else
-__REALSUBDIR+=${dir}
-.endif
-
-.endif
-.endfor
-
-__recurse: .USE
-	@${MAKEDIRTARGET} ${.TARGET:C/^[^-]*-//} ${.TARGET:C/-.*$//}
-
-.if make(cleandir)
-__RECURSETARG=  ${TARGETS:Nclean}
-clean:
-.else
-__RECURSETARG=  ${TARGETS}
-.endif
-
-.for targ in ${__RECURSETARG}
-
-.for dir in ${__REALSUBDIR}
-__TARGDIR := ${dir}
-.if !commands(${targ}-${dir})
-${targ}-${dir}: .PHONY .MAKE __recurse
-SUBDIR_${targ} += ${targ}-${dir}
-.endif
-.endfor
-
-subdir-${targ}: .PHONY ${SUBDIR_${targ}}
-${targ}: subdir-${targ}
-.endfor
-
-.endif
-
-${TARGETS}:
diff --git a/share/mk/ubix.sys.mk b/share/mk/ubix.sys.mk
deleted file mode 100644
index 5e335c8..0000000
--- a/share/mk/ubix.sys.mk
+++ /dev/null
@@ -1,285 +0,0 @@
-.if !defined(_UBIX_SYS_MK_)
-_UBIX_SYS_MK_=1
-
-.if !empty(.INCLUDEDFROMFILE:MMakefile*)
-error1:
-	@(echo "bsd.sys.mk should not be included from Makefiles" >& 2; exit 1)
-.endif
-.if !defined(_UBIX_OWN_MK_)
-error2:
-	@(echo "bsd.own.mk must be included before bsd.sys.mk" >& 2; exit 1)
-.endif
-
-.if defined(__UBIX)
-#LSC: Be a bit smarter about the default compiler
-.if exists(/usr/pkg/bin/cc) || exists(/usr/bin/cc)
-CC?=	cc
-.endif
-
-.if exists(/usr/pkg/bin/gcc) || exists(/usr/bin/gcc)
-CC?=	gcc
-.endif
-
-MKDEP?= CC=${CC:Q} mkdep
-MKDEPCXX?= CC=${CXX:Q} mkdep
-.endif # defined(__UBIX)
-
-.if ${MKREPRO:Uno} == "yes"
-CPPFLAGS+=	-Wp,-iremap,${UBIXSRCDIR}:/usr/src
-CPPFLAGS+=	-Wp,-iremap,${DESTDIR}/:/
-CPPFLAGS+=	-Wp,-iremap,${X11SRCDIR}:/usr/xsrc
-.endif
-
-# UBIXBSD sources use C99 style, with some GCC extensions.
-CFLAGS+=	${${ACTIVE_CC} == "cc":? -std=gnu99 :}
-CFLAGS+=	${${ACTIVE_CC} == "gcc":? -std=gnu99 :}
-CFLAGS+=	${${ACTIVE_CC} == "pcc":? -std=gnu99 :}
-
-.if defined(WARNS)
-CFLAGS+=	${${ACTIVE_CC} == "cc":? -Wno-sign-compare -Wno-pointer-sign :}
-.if ${WARNS} > 0
-CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
-#CFLAGS+=	-Wmissing-declarations -Wredundant-decls -Wnested-externs
-# Add -Wno-sign-compare.  -Wsign-compare is included in -Wall as of GCC 3.3,
-# but our sources aren't up for it yet. Also, add -Wno-traditional because
-# gcc includes #elif in the warnings, which is 'this code will not compile
-# in a traditional environment' warning, as opposed to 'this code behaves
-# differently in traditional and ansi environments' which is the warning
-# we wanted, and now we don't get anymore.
-CFLAGS+=	-Wno-sign-compare
-CFLAGS+=	${${ACTIVE_CC} == "gcc" :? -Wno-traditional :}
-.if !defined(NOGCCERROR) && !defined(USE_BITCODE)
-# Set assembler warnings to be fatal
-CFLAGS+=	-Wa,--fatal-warnings
-.endif
-# Set linker warnings to be fatal
-# XXX no proper way to avoid "FOO is a patented algorithm" warnings
-# XXX on linking static libs
-.if (!defined(MKPIC) || ${MKPIC} != "no") && \
-    (!defined(LDSTATIC) || ${LDSTATIC} != "-static")
-# XXX there are some strange problems not yet resolved
-. if defined(HAVE_LLVM) && !defined(USE_BITCODE)
-LDFLAGS+=	-Wl,--fatal-warnings
-. endif
-.endif
-.endif
-.if ${WARNS} > 1
-CFLAGS+=	-Wreturn-type -Wswitch -Wshadow
-.endif
-.if ${WARNS} > 2
-CFLAGS+=	-Wcast-qual -Wwrite-strings
-CFLAGS+=	-Wextra -Wno-unused-parameter
-# Readd -Wno-sign-compare to override -Wextra with cc
-CFLAGS+=	-Wno-sign-compare
-CXXFLAGS+=	-Wabi
-CXXFLAGS+=	-Wold-style-cast
-CXXFLAGS+=	-Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder \
-		-Wno-deprecated -Woverloaded-virtual -Wsign-promo -Wsynth
-CXXFLAGS+=	${${ACTIVE_CXX} == "gcc":? -Wno-non-template-friend -Wno-pmf-conversions :}
-.endif
-.if ${WARNS} > 3 && (defined(HAVE_GCC) || defined(HAVE_LLVM))
-.if ${WARNS} > 4
-CFLAGS+=	-Wold-style-definition
-.endif
-.if ${WARNS} > 5 && !(defined(HAVE_GCC) && ${HAVE_GCC} <= 45)
-CFLAGS+=	-Wconversion
-.endif
-CFLAGS+=	-Wsign-compare -Wformat=2
-CFLAGS+=	${${ACTIVE_CC} == "gcc":? -Wno-format-zero-length :}
-.endif
-.if ${WARNS} > 3 && defined(HAVE_LLVM)
-CFLAGS+=	${${ACTIVE_CC} == "cc":? -Wpointer-sign -Wmissing-noreturn :}
-.endif
-.if (defined(HAVE_GCC) \
-     && (${MACHINE_ARCH} == "coldfire" || \
-	 ${MACHINE_ARCH} == "sh3eb" || \
-	 ${MACHINE_ARCH} == "sh3el" || \
-	 ${MACHINE_ARCH} == "m68k" || \
-	 ${MACHINE_ARCH} == "m68000"))
-# XXX GCC 4.5 for sh3 and m68k (which we compile with -Os) is extra noisy for
-# cases it should be better with
-CFLAGS+=	-Wno-uninitialized
-.if ${HAVE_GCC} >= 48
-CFLAGS+=	-Wno-maybe-uninitialized
-.endif
-.endif
-.endif
-
-CWARNFLAGS+=	${CWARNFLAGS.${ACTIVE_CC}}
-
-CPPFLAGS+=	${AUDIT:D-D__AUDIT__}
-_NOWERROR=	${defined(NOGCCERROR) || (${ACTIVE_CC} == "cc" && defined(NOCLANGERROR)):?yes:no}
-.if defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
-_NOWERROR=	yes
-.endif # defined(__UBIX) && ${USE_BITCODE} == "yes"
-CFLAGS+=	${${_NOWERROR} == "no" :?-Werror:} ${CWARNFLAGS}
-LINTFLAGS+=	${DESTDIR:D-d ${DESTDIR}/usr/include}
-
-.if (${USE_SSP:Uno} != "no") && (${BINDIR:Ux} != "/usr/mdec")
-.if !defined(KERNSRCDIR) && !defined(KERN) # not for kernels nor kern modules
-CPPFLAGS+=	-D_FORTIFY_SOURCE=2
-.endif
-COPTS+=	-fstack-protector -Wstack-protector 
-
-# gcc 4.8 on m68k erroneously does not protect functions with
-# variables needing special alignement, see
-#	http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59674
-# (the underlying issue for sh and vax may be different, needs more
-# investigation, symptoms are similar but for different sources)
-.if "${ACTIVE_CC}" == "gcc" && "${HAVE_GCC}" == "48" && \
-	( ${MACHINE_CPU} == "sh3" || \
-	  ${MACHINE_ARCH} == "vax" || \
-	  ${MACHINE_CPU} == "m68k" || \
-	  ${MACHINE_CPU} == "or1k" )
-COPTS+=	-Wno-error=stack-protector 
-.endif
-
-COPTS+=	${${ACTIVE_CC} == "cc":? --param ssp-buffer-size=1 :}
-COPTS+=	${${ACTIVE_CC} == "gcc":? --param ssp-buffer-size=1 :}
-.endif
-
-.if ${MKSOFTFLOAT:Uno} != "no"
-COPTS+=		${${ACTIVE_CC} == "gcc":? -msoft-float :}
-FOPTS+=		-msoft-float
-.elif ${MACHINE_ARCH} == "coldfire"
-COPTS+=		-mhard-float
-FOPTS+=		-mhard-float
-.endif
-
-.if ${MKIEEEFP:Uno} != "no"
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS+=	-mieee
-FFLAGS+=	-mieee
-.endif
-.endif
-
-.if ${MACHINE} == "sparc64" && ${MACHINE_ARCH} == "sparc"
-CFLAGS+=	-Wa,-Av8plus
-.endif
-
-.if !defined(NOGCCERROR)
-.if (${MACHINE_ARCH} == "mips64el") || (${MACHINE_ARCH} == "mips64eb")
-CPUFLAGS+=	-Wa,--fatal-warnings
-.endif
-.endif
-
-#.if ${MACHINE} == "sbmips"
-#CFLAGS+=	-mips64 -mtune=sb1
-#.endif
-
-#.if (${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb") && \
-#    (defined(MKPIC) && ${MKPIC} == "no")
-#CPUFLAGS+=	-mno-abicalls -fno-PIC
-#.endif
-CFLAGS+=	${CPUFLAGS}
-AFLAGS+=	${CPUFLAGS}
-
-.if !defined(LDSTATIC) || ${LDSTATIC} != "-static"
-# Position Independent Executable flags
-PIE_CFLAGS?=        -fPIC
-PIE_LDFLAGS?=       -Wl,-pie ${${ACTIVE_CC} == "gcc":? -shared-libgcc :}
-PIE_AFLAGS?=	    -fPIC
-.endif
-
-ELF2ECOFF?=	elf2ecoff
-MKDEP?=		mkdep
-MKDEPCXX?=	mkdep
-OBJCOPY?=	objcopy
-OBJDUMP?=	objdump
-PAXCTL?=	paxctl
-STRIP?=		strip
-
-.SUFFIXES:	.o .ln .lo .c .cc .cpp .cxx .C .m ${YHEADER:D.h}
-
-# C
-.c.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-
-.c.ln:
-	${_MKTARGET_COMPILE}
-	${LINT} ${LINTFLAGS} ${LINTFLAGS.${.IMPSRC:T}} \
-	    ${CPPFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    ${CPPFLAGS.${.IMPSRC:T}:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
-	    -i ${.IMPSRC}
-
-# C++
-.cc.o .cpp.o .cxx.o .C.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-
-# Objective C
-# (Defined here rather than in <sys.mk> because `.m' is not just
-#  used for Objective C source)
-.m.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.m} ${OBJCOPTS} ${OBJCOPTS.${.IMPSRC:T}} ${.IMPSRC}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-
-# Host-compiled C objects
-# The intermediate step is necessary for Sun CC, which objects to calling
-# object files anything but *.o
-.c.lo:
-	${_MKTARGET_COMPILE}
-	${HOST_COMPILE.c} -o ${.TARGET}.o ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-	mv ${.TARGET}.o ${.TARGET}
-
-# C++
-.cc.lo .cpp.lo .cxx.lo .C.lo:
-	${_MKTARGET_COMPILE}
-	${HOST_COMPILE.cc} -o ${.TARGET}.o ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-	mv ${.TARGET}.o ${.TARGET}
-
-# Assembly
-.s.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.s} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-
-.S.o:
-	${_MKTARGET_COMPILE}
-	${COMPILE.S} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
-.if defined(CTFCONVERT)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
-
-# Lex
-LFLAGS+=	${LPREFIX.${.IMPSRC:T}:D-P${LPREFIX.${.IMPSRC:T}}}
-LFLAGS+=	${LPREFIX:D-P${LPREFIX}}
-
-.l.c:
-	${_MKTARGET_LEX}
-	${LEX.l} -o${.TARGET} ${.IMPSRC}
-
-# Yacc
-YFLAGS+=	${YPREFIX.${.IMPSRC:T}:D-p${YPREFIX.${.IMPSRC:T}}} ${YHEADER.${.IMPSRC:T}:D-d}
-YFLAGS+=	${YPREFIX:D-p${YPREFIX}} ${YHEADER:D-d}
-
-.y.c:
-	${_MKTARGET_YACC}
-	${YACC.y} -o ${.TARGET} ${.IMPSRC}
-
-.ifdef YHEADER
-.if empty(.MAKEFLAGS:M-n)
-.y.h: ${.TARGET:.h=.c}
-.endif
-.endif
-
-# Objcopy
-.if ${MACHINE_ARCH} == aarch64eb
-# AARCH64 big endian needs to preserve $x/$d symbols for the linker.
-OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][dx]' -K '[$$][dx]\.*'
-.elif !empty(MACHINE_ARCH:M*arm*eb)
-# ARM big endian needs to preserve $a/$d/$t symbols for the linker.
-OBJCOPYLIBFLAGS_EXTRA=-w -K '[$$][adt]' -K '[$$][adt]\.*'
-.endif
-OBJCOPYLIBFLAGS?=${"${.TARGET:M*.po}" != "":?-X:-x} ${OBJCOPYLIBFLAGS_EXTRA}
-
-.endif	# !defined(_UBIX_SYS_MK_)
diff --git a/sys/.cproject b/sys/.cproject
deleted file mode 100644
index d3b2032..0000000
--- a/sys/.cproject
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022" moduleId="org.eclipse.cdt.core.settings" name="Default">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
-					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.616015350" name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.435645494" name="MinGW GCC" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.base" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
-<<<<<<< HEAD
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.mingw.base.741461711" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-=======
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.PE" id="cdt.managedbuild.target.gnu.platform.mingw.base.741461711" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
->>>>>>> branch 'master' of http://Git.BrainChurts.com:8080/git/MrOlsen/UbixOS.git
-							<builder id="cdt.managedbuild.target.gnu.builder.base.255210758" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.1907390277" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1916872171" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.803804436" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.969066842" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-								<option id="gnu.cpp.compiler.option.include.paths.462391947" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/UbixOS Kernel/include}&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.249129622" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1745018079" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-								<option id="gnu.c.compiler.option.include.paths.1088766077" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/UbixOS Kernel/include}&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.592357979" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1882976970" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base.831208152" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.962330700" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.1365831553">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.1365831553" moduleId="org.eclipse.cdt.core.settings" name="UbixOS">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="UbixOS" id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.1365831553" name="UbixOS" parent="org.eclipse.cdt.build.core.emptycfg">
-					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.1365831553." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base.187060619" name="MinGW GCC" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.base" superClass="cdt.managedbuild.toolchain.gnu.mingw.base">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.mingw.base.1361532976" name="Debug Platform" osList="win32" superClass="cdt.managedbuild.target.gnu.platform.mingw.base"/>
-							<builder id="cdt.managedbuild.target.gnu.builder.base.1629467341" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.base.347523653" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1707205376" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.329916828" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.805248228" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-								<option id="gnu.cpp.compiler.option.include.paths.317959048" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/UbixOS Kernel/include}&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.337541159" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1154176316" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-								<option id="gnu.c.compiler.option.include.paths.1592084987" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/UbixOS Kernel/include}&quot;"/>
-								</option>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1324225421" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1522660253" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base"/>
-							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base.683268552" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
-								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.213852505" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="UbixOS Kernel.null.1874616585" name="UbixOS Kernel"/>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="refreshScope" versionNumber="2">
-		<configuration configurationName="Default">
-			<resource resourceType="PROJECT" workspacePath="/UbixOS Kernel"/>
-		</configuration>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-		<buildTargets/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.1365831553;cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.1365831553.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.805248228;cdt.managedbuild.tool.gnu.cpp.compiler.input.337541159">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022;cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.616015350;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1745018079;cdt.managedbuild.tool.gnu.c.compiler.input.592357979">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.1365831553;cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.1365831553.;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1154176316;cdt.managedbuild.tool.gnu.c.compiler.input.1324225421">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022;cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.616015350;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.969066842;cdt.managedbuild.tool.gnu.cpp.compiler.input.249129622">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-<<<<<<< HEAD
-=======
-	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
->>>>>>> branch 'master' of http://Git.BrainChurts.com:8080/git/MrOlsen/UbixOS.git
-</cproject>
diff --git a/sys/.gitignore b/sys/.gitignore
deleted file mode 100644
index e63ddd8..0000000
--- a/sys/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Default/
diff --git a/sys/.project b/sys/.project
deleted file mode 100644
index e760f67..0000000
--- a/sys/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>UbixOS Kernel</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.core.ccnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>
diff --git a/sys/.settings/language.settings.xml b/sys/.settings/language.settings.xml
deleted file mode 100644
index e5d0d55..0000000
--- a/sys/.settings/language.settings.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<configuration id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022" name="Default">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-<<<<<<< HEAD
-			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="1454897614747865177" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-		</extension>
-	</configuration>
-	<configuration id="cdt.managedbuild.toolchain.gnu.mingw.base.2034895022.1365831553" name="UbixOS">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="1454897614747865177" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-=======
-			<provider class="org.eclipse.cdt.managedbuilder.internal.language.settings.providers.GCCBuiltinSpecsDetectorMinGW" console="false" env-hash="-453075839587151408" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings MinGW" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
->>>>>>> branch 'master' of http://Git.BrainChurts.com:8080/git/MrOlsen/UbixOS.git
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-		</extension>
-	</configuration>
-</project>
diff --git a/sys/.settings/org.eclipse.cdt.codan.core.prefs b/sys/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index 812e407..0000000
--- a/sys/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,71 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.codan.checkers.errnoreturn=Warning
-org.eclipse.cdt.codan.checkers.errnoreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return\\")",implicit\=>false}
-org.eclipse.cdt.codan.checkers.errreturnvalue=Error
-org.eclipse.cdt.codan.checkers.errreturnvalue.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused return value\\")"}
-org.eclipse.cdt.codan.checkers.nocommentinside=-Error
-org.eclipse.cdt.codan.checkers.nocommentinside.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Nesting comments\\")"}
-org.eclipse.cdt.codan.checkers.nolinecomment=-Error
-org.eclipse.cdt.codan.checkers.nolinecomment.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Line comments\\")"}
-org.eclipse.cdt.codan.checkers.noreturn=Error
-org.eclipse.cdt.codan.checkers.noreturn.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No return value\\")",implicit\=>false}
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=Error
-org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Abstract class cannot be instantiated\\")"}
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Ambiguous problem\\")"}
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment in condition\\")"}
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error
-org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Assignment to itself\\")"}
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"No break at end of case\\")",no_break_comment\=>"no break",last_case_param\=>false,empty_case_param\=>false,enable_fallthrough_quickfix_param\=>false}
-org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning
-org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Catching by reference is recommended\\")",unknown\=>false,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=Error
-org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Circular inheritance\\")"}
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization=Warning
-org.eclipse.cdt.codan.internal.checkers.ClassMembersInitialization.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class members should be properly initialized\\")",skip\=>true}
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Field cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Function cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid arguments\\")"}
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=Error
-org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid template argument\\")"}
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Label statement not found\\")"}
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Member declaration not found\\")"}
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Method cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info
-org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Name convention for function\\")",pattern\=>"^[a-z]",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Class has a virtual method and non-virtual destructor\\")"}
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem=Error
-org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid overload\\")"}
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redeclaration\\")"}
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid redefinition\\")"}
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Return with parenthesis\\")"}
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning
-org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Format String Vulnerability\\")"}
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Statement has no effect\\")",macro\=>true,exceptions\=>()}
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suggested parenthesis around expression\\")",paramNot\=>false}
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suspicious semicolon\\")",else\=>false,afterelse\=>false}
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Type cannot be resolved\\")"}
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused function declaration\\")",macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused static function\\")",macro\=>true}
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning
-org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Unused variable declaration in file scope\\")",macro\=>true,exceptions\=>("@(\#)","$Id")}
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=Error
-org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Symbol is not resolved\\")"}
diff --git a/sys/.settings/org.eclipse.cdt.core.prefs b/sys/.settings/org.eclipse.cdt.core.prefs
deleted file mode 100644
index 211e7c0..0000000
--- a/sys/.settings/org.eclipse.cdt.core.prefs
+++ /dev/null
@@ -1,164 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.cdt.core.formatter.alignment_for_assignment=16
-org.eclipse.cdt.core.formatter.alignment_for_base_clause_in_type_declaration=80
-org.eclipse.cdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.cdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.cdt.core.formatter.alignment_for_conditional_expression=34
-org.eclipse.cdt.core.formatter.alignment_for_conditional_expression_chain=18
-org.eclipse.cdt.core.formatter.alignment_for_constructor_initializer_list=0
-org.eclipse.cdt.core.formatter.alignment_for_declarator_list=16
-org.eclipse.cdt.core.formatter.alignment_for_enumerator_list=48
-org.eclipse.cdt.core.formatter.alignment_for_expression_list=0
-org.eclipse.cdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.cdt.core.formatter.alignment_for_member_access=0
-org.eclipse.cdt.core.formatter.alignment_for_overloaded_left_shift_chain=16
-org.eclipse.cdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.cdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.cdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_namespace_declaration=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.cdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.cdt.core.formatter.comment.line_up_line_comment_in_blocks_on_first_column=true
-org.eclipse.cdt.core.formatter.comment.min_distance_between_code_and_line_comment=1
-org.eclipse.cdt.core.formatter.comment.never_indent_line_comments_on_first_column=true
-org.eclipse.cdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true
-org.eclipse.cdt.core.formatter.compact_else_if=true
-org.eclipse.cdt.core.formatter.continuation_indentation=1
-org.eclipse.cdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.cdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.cdt.core.formatter.indent_access_specifier_compare_to_type_header=true
-org.eclipse.cdt.core.formatter.indent_access_specifier_extra_spaces=0
-org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_access_specifier=true
-org.eclipse.cdt.core.formatter.indent_body_declarations_compare_to_namespace_header=true
-org.eclipse.cdt.core.formatter.indent_breaks_compare_to_cases=false
-org.eclipse.cdt.core.formatter.indent_declaration_compare_to_template_header=false
-org.eclipse.cdt.core.formatter.indent_empty_lines=false
-org.eclipse.cdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.cdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.cdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.cdt.core.formatter.indentation.size=0
-org.eclipse.cdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_after_template_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_colon_in_constructor_initializer_list=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_identifier_in_function_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.cdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.cdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_arguments=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_angle_bracket_in_template_parameters=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.cdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.cdt.core.formatter.insert_space_after_colon_in_base_clause=insert
-org.eclipse.cdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.cdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_base_types=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_declarator_list=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_expression_list=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_arguments=insert
-org.eclipse.cdt.core.formatter.insert_space_after_comma_in_template_parameters=insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_bracket=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_exception_specification=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.cdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_bracket=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_exception_specification=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_base_clause=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_base_types=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_declarator_list=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_expression_list=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_comma_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_arguments=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_angle_bracket_in_template_parameters=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_namespace_declaration=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_bracket=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_exception_specification=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.cdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.cdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.cdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.cdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_brackets=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_exception_specification=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.cdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.cdt.core.formatter.join_wrapped_lines=true
-org.eclipse.cdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.cdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.cdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.cdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.cdt.core.formatter.lineSplit=1024
-org.eclipse.cdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.cdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.cdt.core.formatter.tabulation.char=space
-org.eclipse.cdt.core.formatter.tabulation.size=2
-org.eclipse.cdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/sys/.settings/org.eclipse.cdt.ui.prefs b/sys/.settings/org.eclipse.cdt.ui.prefs
deleted file mode 100644
index 62288dd..0000000
--- a/sys/.settings/org.eclipse.cdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-formatter_profile=_MrOlsen-C
-formatter_settings_version=1
diff --git a/sys/Makefile b/sys/Makefile
deleted file mode 100644
index 3a69599..0000000
--- a/sys/Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
-# $Id: Makefile 134 2016-01-15 14:50:24Z reddawg $
-# Kernel Makefile (C) 2002 The UbixOS Project
-
-include ../Makefile.incl
-include Makefile.incl
-
-all:
-	@echo
-	@echo "***************************************************************"
-	@echo "Kernel Build For ${_ARCH} Started On `LC_ALL=C date`"
-	@echo "***************************************************************"
-	@echo
-	@echo "***************************************************************"
-	@echo "Step 1: Clean Kernel"
-	@echo "***************************************************************"
-	#${MAKE} clean
-	@echo
-	@echo "***************************************************************"
-	@echo "Step 2: Build Kernel Objects"
-	@echo "***************************************************************"
-	${KMAKE} kernel-build
-	@echo
-	@echo "***************************************************************"
-	@echo "Step 3: Link Kernel Objects"
-	@echo "***************************************************************"
-	${KMAKE} kernel-build
-	@echo
-	@echo "***************************************************************"
-	@echo "Kernel Build For ${_ARCH} Completed On `LC_ALL=C date`"
-	@echo "***************************************************************"
-
-kernel-build: init-code sys-code arch-code kernel-code vmm-code mpi-code fs-code lib-code isa-code pci-code net-code kernel-img
-
-generic-code: generic
-	(cd generic;make)
-
-init-code: init
-	(cd init;make)
-
-arch-code: ${_ARCH}
-	(cd ${_ARCH};make)
-	
-kernel-code: kernel
-	(cd kernel;make)
-	
-isa-code: isa
-	(cd isa;make)
-
-pci-code: pci
-	(cd pci;make)
-
-sys-code: sys
-	(cd sys;make)
-
-vmm-code: vmm
-	(cd vmm;make)
-
-fs-code: fs
-	(cd fs;make)
-
-graphics-code: graphics
-	(cd graphics;make)
-
-ld-code: ld
-	(cd ld;make)
-
-lib-code: lib
-	(cd lib;make)
-
-sde-code: sde
-	(cd sde;make)
-
-net-code: net
-	(cd net;make)
-
-mpi-code: mpi
-	(cd mpi;make)
-
-kmods-code: kmods
-	(cd kmods;make)
-
-kernel-img: compile
-	(/bin/echo "/* " > ./compile/null.c)
-	(date >> ./compile/null.c)
-	(echo $user >> ./compile/null.c)
-	(/bin/echo " */" >> ./compile/null.c)
-	(cd compile;make)
-
-install:
-#	(cd compile;cp ./ubix.elf /mnts/ubix/boot/loader)
-#	(cd boot;make install)
-#	(cd ../tools/;make format-dsk)
-	(cd ../tools/;make install-ubix)
-
-install-kernel:
-	@echo
-	@echo "***************************************************************"
-	@echo "Kernel Install For ${_ARCH} Started On `LC_ALL=C date`"
-	@echo "***************************************************************"
-	@echo
-	@echo "***************************************************************"
-	@echo "Step 1: Copy Kernel"
-	@echo "***************************************************************"
-	cp compile/kernel ${ROOT}/boot/kernel/
-	sync
-	@echo
-	@echo "***************************************************************"
-	@echo "Kernel Install For ${_ARCH} Completed On `LC_ALL=C date`"
-	@echo "***************************************************************"
-
-clean:
-	(cd init;make clean)
-	(cd ${_ARCH};make clean)
-	(cd sys;make clean)
-	(cd kernel;make clean)
-	(cd vmm;make clean)
-	(cd mpi;make clean)
-	(cd fs;make clean)
-	(cd lib;make clean)
-	(cd isa;make clean)
-	(cd pci;make clean)
-	(cd net;make clean)
-	(cd compile;make clean)
-	#(cd vfs;make clean)
-	#(cd sde;make clean)
-	#(cd devfs;make clean)
-	#(cd net;make clean)
-	#(cd kmods;make clean)
-	#(cd ufs;make clean)
-	#(cd ../tools/;make clean)
diff --git a/sys/Makefile.incl b/sys/Makefile.incl
deleted file mode 100644
index 12c9d5a..0000000
--- a/sys/Makefile.incl
+++ /dev/null
@@ -1,12 +0,0 @@
-KERNEL_SRC=${.CURDIR}
-KERNEL_OBJ=${OBJ_DIR}${KERNEL_SRC}
-KERNEL_CONF=${KERNEL_SRC}/${_ARCH}/conf
-KERNEL_NAME=kernel
-KERNEL_FLAGS=_ARCH=${_ARCH} CC="cc" CXX="c++" AS="as" AR="ar" LD="ld" NM=nm OBJDUMP= OBJCOPY="objcopy" RANLIB=ranlib
-KERNEL_INC=${KERNEL_SRC}/include
-
-KMAKE= ${MAKE} ${KERNEL_FLAGS} INCLUDE=${KERNEL_INC} KERNEL=${KERNEL_NAME}
-
-INCLUDES = -I${INCLUDE}
-CFLAGS = ${KFLAGS} -m32 -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -ffreestanding -O
-ROOT=/ubixos
diff --git a/sys/README b/sys/README
deleted file mode 100644
index 8e48707..0000000
--- a/sys/README
+++ /dev/null
@@ -1,18 +0,0 @@
-Directory Structure:
-
-  boot    - Contains boot strapping code
-  compile - Contains Information to build UbixOS kernel
-  devfs   - Contains the devfs code
-  include - All of the kernel include files
-  init    - Initialization code for kernel
-  isa     - ISA drivers
-  kernel  - Kernel code (things not directly connected with the system)
-  lib     - Kernel library
-  mpi     - Message passing interface code
-  net     - Networking subsystem code (LwIP)
-  pci     - PCI drivers and subsystem
-  sde     - Screen drawing engine code
-  sys     - System related code IDT etc.
-  ubixfs  - UbixFS code
-  vfs     - VFS subsystem code
-  vmm     - VMM subsystem code
diff --git a/sys/armv6/Makefile b/sys/armv6/Makefile
deleted file mode 100644
index de38484..0000000
--- a/sys/armv6/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 134 2016-01-15 14:50:24Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = schedyield.o kpanic.o timer.o spinlock.o i386_exec.o sys_call_new.o sys_call.o bioscall.o fork.o syscall.o systemtask.o sched.o cpu.o 
-# ap-boot.o smp.o vitals.o(obsolete)
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) -DNOBOOL $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX) -DNOBOOL $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/armv6/ap-boot.S b/sys/armv6/ap-boot.S
deleted file mode 100644
index 2645aff..0000000
--- a/sys/armv6/ap-boot.S
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Okay, this file contains the code that's going to bootstrap the AP cpus
- */
-
-
-	.globl	ap_trampoline_start,ap_trampoline_end
-	.text
-	.code16
-ap_trampoline_start:
-	cli
-	cld
-
-	movw	%cs,%ax		// The CPU knows its CS already, so lets use it for the other segments
-	movw	%ax,%ds
-	movw	%ax,%es
-	movw	%ax,%ss
-
-	// Do some bochs-specific bullshit
-	mov	$0x31,%al // '1'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-        //lgdt    ap_gdt;	
-	lgdt	ap_trampoline_gdt_limit - ap_trampoline_start
-	movl	%cr0,%eax
-	orl	$0x1,%eax
-	movl	%eax,%cr0	// PMODE!
-
-.code32
-	.byte 0x66
-	ljmp	$0x08,$(ap_trampoline_32 - ap_trampoline_start)		// 0x08 == KERNEL_CS
-
-ap_trampoline_32:
-	mov	$0x32,%al // '2'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-
-	mov	$0x10,%ax
-	mov	%ax,%ds
-	mov	%ax,%es
-	mov	%ax,%fs
-	mov	%ax,%gs
-	mov	%ax,%ss
-
-	// Spinlock
-	mov	ap_trampoline_spl - ap_trampoline_start,%edi
-ap_spl:
-	//cmp	$1,(%edi)
-	//je	ap_spl
-
-	mov	$1,%eax	     // Value to be set
-	xchgl	(%edi),%eax
-	cmp	$0,%eax
-	je	ap_spl
-	// /Spinlock
-
-	mov	$0x30,%al // '0'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-		
-	mov	ap_trampoline_stackptr - ap_trampoline_start,%ebx
-	mov	%ebx,%esp
-	add	$0x1000,%ebx
-	mov	%ebx,ap_trampoline_stackptr - ap_trampoline_start
-
-	mov	$0x31,%al // '1'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-
-	// spinunlock
-	mov	$0,%eax
-	mov	ap_trampoline_spl - ap_trampoline_start,%edi
-	xchgl	(%edi),%eax
-	// /spinunlock
-
-	mov	$0x33,%al // '3'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-
-	mov	ap_trampoline_epoint,%eax
-	call	*%eax
-1:
-	hlt
-	jmp	1b		// Halt if we ever get here somehow
-
-	// Stack.. This sucks, since CPU initialization isn't serialized
-ap_trampoline_stackptr:
-	.long	0x10000		// 256KB
-ap_trampoline_epoint:
-	.long	c_ap_boot
-
-ap_trampoline_spl:
-	.long	0
-ap_gdt:
-	.long ubixGDT
-	
-	// GDT
-ap_trampoline_gdt:
-	.word	0
-ap_trampoline_gdt_limit:
-	.word	128	// Room for 32 descriptors
-ap_trampoline_gdt_base:
-	.long	0x20000		// 128KB (move this later)
-
-
-ap_trampoline_end:
diff --git a/sys/armv6/bioscall.c b/sys/armv6/bioscall.c
deleted file mode 100644
index abb14fb..0000000
--- a/sys/armv6/bioscall.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: bioscall.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/tss.h>
-#include <ubixos/sched.h>
-#include <vmm/vmm.h>
-#include <lib/kmalloc.h>
-#include <lib/bioscall.h>
-#include <lib/string.h>
-#include <sys/video.h>
-#include <assert.h>
-
-
-asm(
-  ".globl bios16Code\n"
-  ".code16          \n"
-  "bios16Code:      \n"
-  "int $0x10        \n"
-  "int $0x69        \n"
-  ".code32          \n"
-  );
-
-  
-void biosCall(int biosInt,int eax,int ebx,int ecx,int edx,int esi,int edi,int es,int ds) {
-  short segment = 0x0,offset = 0x0;
-  uInt32 tmpAddr = (uInt32)&bios16Code;
-  kTask_t *newProcess = 0x0;
-
-  offset = tmpAddr & 0xF;  // lower 4 bits
-  segment = tmpAddr >> 4;
-  
-  newProcess = schedNewTask();
-  assert(newProcess);
-
-
-  newProcess->tss.back_link    = 0x0;
-  newProcess->tss.esp0         = (uInt32)kmalloc(0x2000)+0x2000;
-  newProcess->tss.ss0          = 0x10;
-  newProcess->tss.esp1         = 0x0;
-  newProcess->tss.ss1          = 0x0;
-  newProcess->tss.esp2         = 0x0;
-  newProcess->tss.ss2          = 0x0;
-  newProcess->tss.cr3          = (uInt32)_current->tss.cr3;//(uInt32)vmmCreateVirtualSpace(newProcess->id);
-  newProcess->tss.eip          =  offset & 0xFFFF;
-  newProcess->tss.eflags       = 2 | EFLAG_IF | EFLAG_VM;
-  newProcess->tss.eax          =     eax & 0xFFFF;
-  newProcess->tss.ebx          =     ebx & 0xFFFF;
-  newProcess->tss.ecx          =     ecx & 0xFFFF;
-  newProcess->tss.edx          =     edx & 0xFFFF;
-  newProcess->tss.esp          =  0x1000 & 0xFFFF;
-  newProcess->tss.ebp          =  0x1000 & 0xFFFF;
-  newProcess->tss.esi          =     esi & 0xFFFF;
-  newProcess->tss.edi          =     edi & 0xFFFF;
-  newProcess->tss.es           =      es & 0xFFFF;
-  newProcess->tss.cs           = segment & 0xFFFF;
-  newProcess->tss.ss           =  0x1000 & 0xFFFF;
-  newProcess->tss.ds           =      ds & 0xFFFF;
-  newProcess->tss.fs           =     0x0 & 0xFFFF;
-  newProcess->tss.gs           =     0x0 & 0xFFFF;
-  newProcess->tss.ldt          =     0x0 & 0xFFFF;
-  newProcess->tss.trace_bitmap =     0x0 & 0xFFFF;
-  newProcess->tss.io_map       =     0x0 & 0xFFFF;
-  newProcess->tss.io_map       = sizeof(struct tssStruct)-8192;
-  newProcess->oInfo.v86Task    = 0x1;
-
-  newProcess->state = READY;
-
-  while (newProcess->state > 0);
-
-  return;
-  }    
-
-/***
- END
- ***/
-
diff --git a/sys/armv6/exec.c b/sys/armv6/exec.c
deleted file mode 100644
index 0a512c4..0000000
--- a/sys/armv6/exec.c
+++ /dev/null
@@ -1,760 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND F
-ITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT OWNER 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.
-
- $Id: exec.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/exec.h>
-#include <ubixos/elf.h>
-#include <ubixos/ld.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/endtask.h>
-#include <vmm/vmm.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <lib/string.h>
-#include <assert.h>
-
-#define STACK_ADDR 0xC800000
-
-#define AT_NULL         0       /* Terminates the vector. */
-#define AT_IGNORE       1       /* Ignored entry. */
-#define AT_EXECFD       2       /* File descriptor of program to load. */
-#define AT_PHDR         3       /* Program header of program already loaded. */
-#define AT_PHENT        4       /* Size of each program header entry. */
-#define AT_PHNUM        5       /* Number of program header entries. */
-#define AT_PAGESZ       6       /* Page size in bytes. */
-#define AT_BASE         7       /* Interpreter's base address. */
-#define AT_FLAGS        8       /* Flags (unused for i386). */
-#define AT_ENTRY        9       /* Where interpreter should transfer control. */
-
-//#define AUXARGS_ENTRY(pos, id, val) {memcpy((void *)pos++,(void *)id,sizeof(long)); memcpy((void *)pos++,(void *)val,sizeof(long));}
-#define AUXARGS_ENTRY(pos, id, val) {*pos = id;pos++; *pos = val;pos++;}
-
-
-
-/*****************************************************************************************
-
- Function:   execThread(void (*)(void),int,char *);
- Description: This function will create a thread from code in the current memory space
-
- Notes:
- 
- 05/19/04 - This does not work the way I want it to it still makes a copy of kernel space
-            so do not use out side of kernel space
-
-*****************************************************************************************/
-uInt32 execThread(void (* tproc)(void),uInt32 stack,char *arg) {
-  kTask_t * newProcess = 0x0;
-  /* Find A New Thread */
-  newProcess = schedNewTask();
-  assert(newProcess); 
-  if (stack < 0x100000)
-    kpanic("exec: stack not in valid area: [0x%X]\n",stack);
-
-  /* Set All The Correct Thread Attributes */
-  newProcess->tss.back_link    = 0x0;
-  newProcess->tss.esp0         = 0x0;
-  newProcess->tss.ss0          = 0x0;
-  newProcess->tss.esp1         = 0x0;
-  newProcess->tss.ss1          = 0x0;
-  newProcess->tss.esp2         = 0x0;
-  newProcess->tss.ss2          = 0x0;
-  newProcess->tss.cr3          = (unsigned int)kernelPageDirectory;
-  newProcess->tss.eip          = (unsigned int)tproc;
-  newProcess->tss.eflags       = 0x206;
-  newProcess->tss.esp          = stack;
-  newProcess->tss.ebp          = stack;
-  newProcess->tss.esi          = 0x0;
-  newProcess->tss.edi          = 0x0;
-
-  /* Set these up to be ring 3 tasks */
-  /*
-  newProcess->tss.es           = 0x30+3;
-  newProcess->tss.cs           = 0x28+3;
-  newProcess->tss.ss           = 0x30+3;
-  newProcess->tss.ds           = 0x30+3;
-  newProcess->tss.fs           = 0x30+3;
-  newProcess->tss.gs           = 0x30+3;
-  */
-
-  newProcess->tss.es           = 0x10;
-  newProcess->tss.cs           = 0x08;
-  newProcess->tss.ss           = 0x10;
-  newProcess->tss.ds           = 0x10;
-  newProcess->tss.fs           = 0x10;
-  newProcess->tss.gs           = 0x10;
-
-  newProcess->tss.ldt          = 0x18;
-  newProcess->tss.trace_bitmap = 0x0000;
-  newProcess->tss.io_map       = 0x8000;
-  newProcess->oInfo.vmStart    = 0x6400000;
-  
-  newProcess->imageFd          = 0x0;
-
-  /* Set up default stack for thread here filled with arg list 3 times */
-  asm volatile(
-    "pusha               \n"
-    "movl   %%esp,%%ecx  \n"
-    "movl   %1,%%eax     \n"
-    "movl   %%eax,%%esp  \n"
-    "pushl  %%ebx        \n"
-    "pushl  %%ebx        \n"
-    "pushl  %%ebx        \n"
-    "movl   %%esp,%%eax  \n"
-    "movl   %%eax,%1     \n"
-    "movl   %%ecx,%%esp  \n"
-    "popa                \n"
-    :
-    : "b" (arg),"m" (newProcess->tss.esp)
-    );
-
-  /* Put new thread into the READY state */
-  sched_setStatus(newProcess->id,READY);
-
-  /* Return with the new process ID */
-  return((uInt32)newProcess);
-  }
-
-/*****************************************************************************************
-
- Function: void execFile(char *file);
- Description: This Function Executes A Kile Into A New VM Space With Out
-              Having To Fork
- Notes:
-
- 07/30/02 - I Have Made Some Heavy Changes To This As Well As Fixed A Few
-            Memory Leaks The Memory Allocated To Load The Binary Into Is
-            Now Unmapped So It Can Be Used Again And Not Held Onto Until
-            The Program Exits
-
- 07/30/02 - Now I Have To Make A Better Memory Allocator So We Can Set Up
-            The Freshly Allocated Pages With The Correct Permissions
-
-*****************************************************************************************/
-void execFile(char *file,int argc,char **argv,int console) {
-
-  int        i         = 0x0;
-  int        x         = 0x0;
-  uint32_t *tmp       = 0x0;
-
-  fileDescriptor   *tmpFd         = 0x0;
-  elfHeader        *binaryHeader  = 0x0;
-  elfProgramHeader *programHeader = 0x0;
-
-  /* Get A New Task For This Proccess */
-  _current = schedNewTask();
-  assert(_current);
-  _current->gid  = 0x0;
-  _current->uid  = 0x0;
-  _current->term = tty_find(console);
-  if (_current->term == 0x0)
-    kprintf("Error: invalid console\n");
-
-  /* Set tty ownership */
-  _current->term->owner = _current->id;
-
-  /* Now We Must Create A Virtual Space For This Proccess To Run In */
-  _current->tss.cr3 = (uInt32)vmmCreateVirtualSpace(_current->id);
-
-  /* To Better Load This Application We Will Switch Over To Its VM Space */
-  asm volatile(
-    "movl %0,%%eax          \n"
-    "movl %%eax,%%cr3       \n"
-    : : "d" ((uInt32 *)(_current->tss.cr3))
-    );
-
-  /* Lets Find The File */
-  tmpFd = fopen(file,"r");
-
-  /* If We Dont Find the File Return */
-  if (tmpFd == 0x0) {
-    kprintf("Exec Format Error: Binary File Not Executable.\n");
-    fclose(tmpFd);
-    return;
-    }
-  if (tmpFd->perms == 0x0) {
-    kprintf("Exec Format Error: Binary File Not Executable.\n");
-    fclose(tmpFd);
-    return;
-    }
-
-  /* Load ELF Header */
-  binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader));
-
-
-  //kprintf(">a:%i:0x%X:0x%X<",sizeof(elfHeader),binaryHeader,tmpFd);
-  fread(binaryHeader,sizeof(elfHeader),1,tmpFd);
-
-
-  /* Check If App Is A Real Application */
-  if ((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) {
-    kprintf("Exec Format Error: Binary File Not Executable.\n");
-    kfree(binaryHeader);
-    fclose(tmpFd);
-    return;
-    }
-  else if (binaryHeader->eType != 2) {
-    kprintf("Exec Format Error: Binary File Not Executable.\n");
-    kfree(binaryHeader);
-    fclose(tmpFd);
-    return;
-    }
-  else if (binaryHeader->eEntry == 0x300000) {
-    kprintf("Exec Format Error: Binary File Not Executable.\n");
-    kfree(binaryHeader);
-    fclose(tmpFd);
-    return;
-    }
-
-  /* Load The Program Header(s) */
-  programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum);
-  fseek(tmpFd,binaryHeader->ePhoff,0);
-
-  //kprintf(">c:%i:0x%X:0x%X<",sizeof(elfProgramHeader)*binaryHeader->ePhnum,programHeader,tmpFd);
-  fread(programHeader,(sizeof(elfProgramHeader)*binaryHeader->ePhnum),1,tmpFd);
-  //kprintf(">d<");
-
-  /* Loop Through The Header And Load Sections Which Need To Be Loaded */
-  for (i=0;i<binaryHeader->ePhnum;i++) {
-    if (programHeader[i].phType == 1) {
-      /*
-      Allocate Memory Im Going To Have To Make This Load Memory With Correct
-      Settings so it helps us in the future
-      */
-      for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) {
-        /* Make readonly and read/write !!! */
-        if (vmm_remapPage(vmm_findFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x),PAGE_DEFAULT) == 0x0)
-          K_PANIC("Remap Page Failed");
-
-        memset((void *)((programHeader[i].phVaddr & 0xFFFFF000) + x),0x0,0x1000);
-        }
-      _current->oInfo.vmStart = 0x80000000;
-      _current->td.vm_daddr = (char *)(programHeader[i].phVaddr & 0xFFFFF000);
-      /* Now Load Section To Memory */
-      fseek(tmpFd,programHeader[i].phOffset,0);
-      fread((void *)programHeader[i].phVaddr,programHeader[i].phFilesz,1,tmpFd);
-      if ((programHeader[i].phFlags & 0x2) != 0x2) {
-        kprintf("pH: [0x%X]\n",programHeader[i].phMemsz);
-        for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) {
-          if ((vmm_setPageAttributes((programHeader[i].phVaddr & 0xFFFFF000) + x,PAGE_PRESENT | PAGE_USER)) != 0x0)
-	    kpanic("Error: vmm_setPageAttributes failed, File: %s, Line: %i\n",__FILE__,__LINE__);
-	  }
-        }
-      }
-    }
-
-  /* Set Virtual Memory Start */
-  _current->oInfo.vmStart = 0x80000000;
-  _current->td.vm_daddr = (char *)(programHeader[i].phVaddr & 0xFFFFF000);
-
-  /* Set Up Stack Space */
-  for (x = 1;x < 100;x++) {
-    vmm_remapPage(vmm_findFreePage(_current->id),STACK_ADDR - (x * 0x1000),PAGE_DEFAULT | PAGE_STACK);
-    }
-
-  /* Kernel Stack 0x2000 bytes long */
-  vmm_remapPage(vmm_findFreePage(_current->id),0x5BC000,KERNEL_PAGE_DEFAULT | PAGE_STACK);
-  vmm_remapPage(vmm_findFreePage(_current->id),0x5BB000,KERNEL_PAGE_DEFAULT | PAGE_STACK);
-
-  /* Set All The Proper Information For The Task */
-  _current->tss.back_link    = 0x0;
-  _current->tss.esp0         = 0x5BC000;
-  _current->tss.ss0          = 0x10;
-  _current->tss.esp1         = 0x0;
-  _current->tss.ss1          = 0x0;
-  _current->tss.esp2         = 0x0;
-  _current->tss.ss2          = 0x0;
-  _current->tss.eip          = (long)binaryHeader->eEntry;
-  _current->tss.eflags       = 0x206;
-  _current->tss.esp          = STACK_ADDR - 12;
-  _current->tss.ebp          = STACK_ADDR;
-  _current->tss.esi          = 0x0;
-  _current->tss.edi          = 0x0;
-
-  /* Set these up to be ring 3 tasks */
-  _current->tss.es           = 0x30+3;
-  _current->tss.cs           = 0x28+3;
-  _current->tss.ss           = 0x30+3;
-  _current->tss.ds           = 0x30+3;
-  _current->tss.fs           = 0x30+3;
-  _current->tss.gs           = 0x30+3;
-
-  _current->tss.ldt          = 0x18;
-  _current->tss.trace_bitmap = 0x0000;
-  _current->tss.io_map       = 0x8000;
-
-  sched_setStatus(_current->id,READY);
-
-  kfree(binaryHeader);
-  kfree(programHeader);
-  fclose(tmpFd);
-
-  tmp = (uInt32 *)_current->tss.esp0 - 5;
-  tmp[0] = binaryHeader->eEntry;
-  tmp[3] = STACK_ADDR - 12;
-
-  tmp = (uInt32 *)STACK_ADDR - 2;
-
-  if (_current->id > 4)
-  kprintf("argv[0]: [%s]\n",argv[0]);
-  kprintf("argv: [0x%X]\n",argv);
-  tmp[0] = (uint32_t)argv;
-  tmp[1] = (uint32_t)argv;
-
-
-  /* Switch Back To The Kernels VM Space */
-  asm volatile(
-    "movl %0,%%eax          \n"
-    "movl %%eax,%%cr3       \n"
-    : : "d" ((uInt32 *)(kernelPageDirectory))
-    );
-
-  /* Finally Return */
-  return;
-  }
-
-/*****************************************************************************************
-
- Function: void sysExec();
- Description: This Is The System Call To Execute A New Task
-
- Notes:
- 04-22-03 - It Now Loads Sections Not The Full File
-
-*****************************************************************************************/
-void sysExec(char *file,char *ap) {
-  int       i        = 0x0;
-  int       x        = 0x0;
-  int       argc     = 0x0;
-  unsigned int  *tmp      = 0x0;
-  uInt32   ldAddr   = 0x0;
-  uInt32   seg_size = 0x0;
-  uInt32   seg_addr = 0x0;
-  char    *interp   = 0x0;
-  char   **argv     = 0x0;
-  char   **argvNew  = 0x0;
-  char    *args     = 0x0;
-
-  fileDescriptor    *tmpFd         = 0x0;
-  elfHeader         *binaryHeader  = 0x0;
-  elfProgramHeader  *programHeader = 0x0;
-  elfSectionHeader  *sectionHeader = 0x0;
-  elfDynamic        *elfDynamicS   = 0x0;
-  struct i386_frame *iFrame        = 0x0;
-
-  tmpFd = fopen(file,"r");
-  _current->imageFd = tmpFd;
-  /* If We Dont Find the File Return */
-  if (tmpFd == 0x0) {
-    return;
-    }
-  if (tmpFd->perms == 0) {
-    kprintf("Exec Format Error: Binary File Not Executable.\n");
-    fclose(tmpFd);
-    return;
-    }
-
-  /* Load ELF Header */
-
-  if ((binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader))) == 0x0) 
-    endTask(_current->id);
-    fread(binaryHeader,sizeof(elfHeader),1,tmpFd);
-    /* Set sectionHeader To Point To Loaded Binary To We Can Gather Info */
-
-  /* Check If App Is A Real Application */
-  if ((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) {
-    kprintf("Exec Format Error: Binary File Not Executable.\n");
-    kfree(binaryHeader);
-    fclose(tmpFd);
-
-    return;
-    }
-  else if (binaryHeader->eType != 2) {
-    kprintf("Exec Format Error: Binary File Not Executable.\n");
-    kfree(binaryHeader);
-    fclose(tmpFd);
-    return;
-    }
-  else if (binaryHeader->eEntry == 0x300000) {
-    kprintf("Exec Format Error: Binary File Not Executable.\n");
-    kfree(binaryHeader);
-    fclose(tmpFd);
-    return;
-    }
-
-  /* Load The Program Header(s) */
-  if ((programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum)) == 0x0)
-    endTask(_current->id);
-
-  assert(programHeader);
-  fseek(tmpFd,binaryHeader->ePhoff,0);
-  fread(programHeader,(sizeof(elfProgramHeader)*binaryHeader->ePhnum),1,tmpFd);
-
-  if ((sectionHeader = (elfSectionHeader *)kmalloc(sizeof(elfSectionHeader)*binaryHeader->eShnum)) == 0x0)
-    endTask(_current->id);
-
-  assert(sectionHeader);
-  fseek(tmpFd,binaryHeader->eShoff,0);
-  fread(sectionHeader,sizeof(elfSectionHeader)*binaryHeader->eShnum,1,tmpFd);
-
-  /* Loop Through The Header And Load Sections Which Need To Be Loaded */
-  for (i=0;i<binaryHeader->ePhnum;i++) {
-    switch (programHeader[i].phType) {
-      case PT_LOAD:
-        seg_addr = trunc_page(programHeader[i].phVaddr);
-        seg_size = round_page(programHeader[i].phMemsz + programHeader[i].phVaddr - seg_addr);
-
-        /*
-        Allocate Memory Im Going To Have To Make This Load Memory With Correct
-        Settings so it helps us in the future
-        */
-        for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) {
-          /* Make readonly and read/write !!! */
-          if (vmm_remapPage(vmm_findFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x),PAGE_DEFAULT) == 0x0)
-            K_PANIC("Error: Remap Page Failed");
-          memset((void *)((programHeader[i].phVaddr & 0xFFFFF000) + x),0x0,0x1000);
-          }
-
-        /* Now Load Section To Memory */
-        fseek(tmpFd,programHeader[i].phOffset,0);
-        fread((void *)programHeader[i].phVaddr,programHeader[i].phFilesz,1,tmpFd);
-        if ((programHeader[i].phFlags & 0x2) != 0x2) {
-          for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) {
-            if ((vmm_setPageAttributes((programHeader[i].phVaddr & 0xFFFFF000) + x,PAGE_PRESENT | PAGE_USER)) != 0x0)
-	      kpanic("Error: vmm_setPageAttributes failed, File: %s,Line: %i\n",__FILE__,__LINE__);
-	    }
-          }
-        kprintf("setting daddr\n");
-        if (binaryHeader->eEntry >= programHeader[i].phVaddr && binaryHeader->eEntry < (programHeader[i].phVaddr + programHeader[i].phMemsz)) {
-          /* We're suposed to do something here? */
-          }
-        else {
-          _current->td.vm_dsize = seg_size >> PAGE_SHIFT;
-          _current->td.vm_daddr = (char *)seg_addr;
-          }
-
-        _current->oInfo.vmStart = ((programHeader[i].phVaddr & 0xFFFFF000) + 0xA900000);
-        break;
-      case PT_DYNAMIC:
-        //newLoc = (char *)programHeader[i].phVaddr;
-        elfDynamicS = (elfDynamic *)programHeader[i].phVaddr;
-        fseek(tmpFd,programHeader[i].phOffset,0);
-        fread((void *)programHeader[i].phVaddr,programHeader[i].phFilesz,1,tmpFd);
-        break;
-      case PT_INTERP:
-        interp = (char *)kmalloc(programHeader[i].phFilesz);
-        fseek(tmpFd,programHeader[i].phOffset,0);
-        fread((void *)interp,programHeader[i].phFilesz,1,tmpFd);
-        kprintf("Interp: [%s]\n",interp);
-        ldAddr = ldEnable();
-        break;
-      default:
-        break;
-      }
-    }
-
-  /* What is this doing? 11/23/06 */
-  if (elfDynamicS != 0x0) {
-    for (i=0;i<12;i++) {
-      if (elfDynamicS[i].dynVal == 0x3) {
-        tmp = (void *)elfDynamicS[i].dynPtr;
-        if (tmp == 0x0)
-          kpanic("tmp: NULL\n");
-        tmp[2] = (uInt32)ldAddr;
-        tmp[1] = (uInt32)tmpFd;
-        break;
-        }
-/*
-      else {
-        kprintf("dyn_val: %i",elfDynamicS[i].dynVal);
-        }
-*/
-      }
-    }
-
-  _current->td.vm_dsize = seg_size >> PAGE_SHIFT;
-  _current->td.vm_daddr = (char *)seg_addr;
-
-  argv = &ap;
-
-  if (argv[1] != 0x0) {
-    argc = (int)argv[0];
-    args = (char *)vmmGetFreeVirtualPage(_current->id,1,VM_TASK);
-memset(args,0x0,0x1000);
-    x = 0x0;
-    argvNew = (char **)kmalloc(sizeof(char *) * argc);
-    for (i = 0x0;i < argc;i++) {
-      strcpy(args + x,argv[i + 1]);
-      argvNew[i] = args + x;
-      x += strlen(argv[i + 1]) + 1;
-      //args[x] = '\0';
-      //x++;
-      }
-    argv = argvNew;
-    }
-
-  //! Clean the virtual of COW pages left over from the fork
-  vmm_cleanVirtualSpace(_current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SIZE));
-
-  //! Adjust iframe
-  iFrame = (struct i386_frame *)_current->tss.esp0 - sizeof(struct i386_frame);
-  iFrame->ebp = STACK_ADDR;
-  iFrame->eip = binaryHeader->eEntry;
-  iFrame->user_esp = STACK_ADDR - 12;
-
-  //if (_current->id > 3) {
-
-    iFrame->user_esp = ((uint32_t)STACK_ADDR) - (sizeof(uint32_t) * (argc + 3));
-    tmp = (void *)iFrame->user_esp;
-
-    //! build argc and argv[]
-    tmp[0] = argc;
-    for (i = 0;i < argc;i++) {
-      tmp[i + 1] = (u_int)argv[i];
-      }
-    tmp[argc + 1] = 0x0;
-    tmp[argc + 2] = 0x1;
-    //}
-  //else {
-    //tmp = (uint32_t *)STACK_ADDR - 2;
-    //tmp[0] = 0x1;
-    //tmp[1] = 0x0;
-    //tmp[1] = (uint32_t)argv;
-    //}
-  kfree(argvNew);
- /* Now That We Relocated The Binary We Can Unmap And Free Header Info */
-  kfree(binaryHeader);
-  kfree(programHeader);
-
-  return;
-  }
-
-/*!
- * \brief New exec...
- *
- */
-void sys_exec(char *file,char *ap) {
-  int                 error         = 0x0;
-  int                 i             = 0x0;
-  int                 x             = 0x0;
-  int                 argc          = 0x0;
-  uint32_t          *tmp           = 0x0;
-  uint32_t           seg_size      = 0x0;
-  uint32_t           seg_addr      = 0x0;
-  uint32_t           addr          = 0x0;
-  uint32_t           eip           = 0x0;
-  uint32_t           proghdr       = 0x0;
-  char               *args          = 0x0;
-  char               *interp        = 0x0;
-  char              **argv          = 0x0;
-  char              **argvNew       = 0x0;
-  elfHeader          *binaryHeader  = 0x0;
-  elfProgramHeader   *programHeader = 0x0;
-  struct i386_frame  *iFrame        = 0x0;
-  Elf_Auxargs        *auxargs       = 0x0;
-
-  _current->imageFd = fopen(file,"r");
-  if (_current->imageFd == 0x0)
-    return(-1);
-
-  /* Load the ELF header */
-  if ((binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader))) == 0x0) 
-    K_PANIC("malloc failed!");
-  fread(binaryHeader,sizeof(elfHeader),1,_current->imageFd);
-
-  /* Check If App Is A Real Application */
-  if (((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) || (binaryHeader->eType != ET_EXEC)) {
-    kfree(binaryHeader);
-    fclose(_current->imageFd);
-    return(-1);
-    }
-
-  /* Load The Program Header(s) */
-  if ((programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum)) == 0x0)
-    K_PANIC("malloc failed!");
-  fseek(_current->imageFd,binaryHeader->ePhoff,0);
-  fread(programHeader,(sizeof(elfProgramHeader)*binaryHeader->ePhnum),1,_current->imageFd);
-
-  /* Loop Through The Header And Load Sections Which Need To Be Loaded */
-  for (i = 0x0;i < binaryHeader->ePhnum;i++) {
-    switch (programHeader[i].phType) {
-      case PT_LOAD:
-        seg_addr = trunc_page(programHeader[i].phVaddr);
-        seg_size = round_page(programHeader[i].phMemsz + programHeader[i].phVaddr - seg_addr);
-
-        /*
-        Allocate Memory Im Going To Have To Make This Load Memory With Correct
-        Settings so it helps us in the future
-        */
-        for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) {
-          /* Make readonly and read/write !!! */
-          if (vmm_remapPage(vmm_findFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x),PAGE_DEFAULT) == 0x0)
-            K_PANIC("Error: Remap Page Failed");
-          memset((void *)((programHeader[i].phVaddr & 0xFFFFF000) + x),0x0,0x1000);
-          }
-
-        /* Now Load Section To Memory */
-        fseek(_current->imageFd,programHeader[i].phOffset,0);
-        fread((void *)programHeader[i].phVaddr,programHeader[i].phFilesz,1,_current->imageFd);
-        if ((programHeader[i].phFlags & 0x2) != 0x2) {
-          for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) {
-            if ((vmm_setPageAttributes((programHeader[i].phVaddr & 0xFFFFF000) + x,PAGE_PRESENT | PAGE_USER)) != 0x0)
-              K_PANIC("vmm_setPageAttributes failed");
-            }
-          }
-        if (binaryHeader->eEntry >= programHeader[i].phVaddr && binaryHeader->eEntry < (programHeader[i].phVaddr + programHeader[i].phMemsz)) {
-          /* We're suposed to do something here? */
-          }
-        else {
-          _current->td.vm_dsize = seg_size >> PAGE_SHIFT;
-          _current->td.vm_daddr = (char *)seg_addr;
-          }
-
-        _current->oInfo.vmStart = ((programHeader[i].phVaddr & 0xFFFFF000) + 0xA900000);
-        break;
-      case PT_INTERP:
-        interp = (char *)kmalloc(programHeader[i].phFilesz);
-        if (interp == 0x0)
-          K_PANIC("malloc failed");
-
-        fseek(_current->imageFd,programHeader[i].phOffset,0);
-        fread((void *)interp,programHeader[i].phFilesz,1,_current->imageFd);
-        kprintf("Interp: [%s]\n",interp);
-        //ldAddr = ldEnable();
-        break;
-      case PT_PHDR:
-        proghdr = programHeader[i].phVaddr; 
-        break;
-      default:
-        break;
-      }
-    }
-
-  addr = LD_START;
-
-
-  if (interp != 0x0) {
-    //kprintf("TEST");
-    elf_loadfile(_current,interp,&addr,&eip);
-    }
-  //kprintf("[0x%X][0x%X]\n",eip,addr);
-
-  _current->td.vm_dsize = seg_size >> PAGE_SHIFT;
-  _current->td.vm_daddr = (char *)seg_addr;
-
-  //! copy in arg strings
-  argv = ap;
-
-  if (argv[1] != 0x0) {
-    argc = argv[0];
-    args = (char *)vmmGetFreeVirtualPage(_current->id,1,VM_TASK);
-    memset(args,0x0,0x1000);
-    x = 0x0;
-    argvNew = (char **)kmalloc(sizeof(char *) * argc);
-    for (i = 0x0;i < argc;i++) {
-      strcpy(args + x,argv[i + 1]);
-      argvNew[i] = args + x;
-      x += strlen(argv[i + 1]) + 1;
-      }
-    argv = argvNew;
-    }
-
-  //! Clean the virtual of COW pages left over from the fork
-  vmm_cleanVirtualSpace(_current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SIZE));
-
-
-  //! Adjust iframe
-  iFrame = _current->tss.esp0 - sizeof(struct i386_frame);
-  iFrame->ebp = STACK_ADDR;
-  iFrame->eip = eip;
-
-  //if (_current->id > 3) {
-
-  iFrame->user_esp = ((uint32_t)STACK_ADDR) - (sizeof(uint32_t) * (argc + 4 + (sizeof(Elf_Auxargs) * 2)));
-  kprintf("\n\n\nuser_esp: [0x%X]\n",iFrame->user_esp);
-  tmp = iFrame->user_esp;
-
-  //! build argc and argv[]
-  tmp[0] = argc;
-  for (i = 0;i < argc;i++) {
-    tmp[i + 1] = argv[i];
-    }
-  //! Build ENV
-  args = (char *)vmmGetFreeVirtualPage(_current->id,1,VM_TASK);
-  memset(args,0x0,0x1000);
-  strcpy(args,"LIBRARY_PATH=/lib");
-  tmp[argc + 2] = args;
-  kprintf("env: [0x%X][0x%X]\n",(uInt32)tmp + argc + 2,tmp[argc + 2]);
-  tmp[argc + 3] = 0x0;
-  kprintf("env: [0x%X][0x%X]\n",(uInt32)tmp + argc + 2,tmp[argc + 2]);
-  //auxargs = iFrame->user_esp + argc +  3;
-  tmp = iFrame->user_esp;
-  tmp += argc + 4;
-
-
-  auxargs->execfd = -1;
-  auxargs->phdr   = proghdr;
-  auxargs->phent  = binaryHeader->ePhentsize;
-  auxargs->phnum  = binaryHeader->ePhnum;
-  auxargs->pagesz = PAGE_SIZE;
-  auxargs->base   = addr;
-  auxargs->flags  = 0x0;
-  auxargs->entry  = binaryHeader->eEntry;
-  auxargs->trace  = 0x0;
-
-  AUXARGS_ENTRY(tmp, AT_PHDR, auxargs->phdr);
-  AUXARGS_ENTRY(tmp, AT_PHENT, auxargs->phent);
-  AUXARGS_ENTRY(tmp, AT_PHNUM, auxargs->phnum);
-  AUXARGS_ENTRY(tmp, AT_PAGESZ, auxargs->pagesz);
-  AUXARGS_ENTRY(tmp, AT_FLAGS, auxargs->flags);
-  AUXARGS_ENTRY(tmp, AT_ENTRY, auxargs->entry);
-  AUXARGS_ENTRY(tmp, AT_BASE, auxargs->base);
-  AUXARGS_ENTRY(tmp, AT_NULL, 0);
-
-  kprintf("AT_BASE: [0x%X]\n",auxargs->base);
-
-  //iFrame->ebx = 0x0;
-  //iFrame->ebx = 0x0;
-
-  //iFrame->eip = binaryHeader->eEntry;
-  //kprintf("\n\nDOH: [0x%X]\n\n",iFrame->eip);
-
-//while (1);
-
- //while (1);
-/*
-  error = elf_loadfile(_current,file,0x0,0x0);
-  if (error)
-    K_PANIC("elf_loadfile failed");
-*/
-  return;
-  }
-
-/***
- END
- ***/
diff --git a/sys/armv6/fork.c b/sys/armv6/fork.c
deleted file mode 100644
index 6a42c03..0000000
--- a/sys/armv6/fork.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fork.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/fork.h>
-#include <ubixos/types.h>
-#include <ubixos/sched.h>
-#include <ubixos/tty.h>
-#include <ubixos/vitals.h>
-#include <vmm/vmm.h>
-#include <string.h>
-#include <assert.h>
-
-/*****************************************************************************************
- Functoin: static int fork_copyProcess(struct taskStruct *newProcess,long ebp,long edi,
-             long esi, long none,long ebx,long ecx,long edx,long eip,long cs,long eflags,
-             long esp,long ss)
- 
- Desc: This function will copy a process
-
- Notes:
-
-*****************************************************************************************/
-/* Had to remove static though tihs function is only used in this file */
-int fork_copyProcess(struct taskStruct *newProcess,long ebp,long edi,long esi,long none,long ebx,long ecx,long edx,long eip,long cs,long eflags,long esp,long ss) {
-  volatile struct taskStruct * tmpProcPtr = newProcess;
-  assert(newProcess);
-  assert(_current);
-  
-  /* Set Up New Tasks Information */
-  memcpy(newProcess->oInfo.cwd,_current->oInfo.cwd,1024);
-  
-  newProcess->tss.eip          = eip;
-  newProcess->oInfo.vmStart    = _current->oInfo.vmStart;
-  newProcess->term             = _current->term;
-  newProcess->term->owner      = newProcess->id;
-  newProcess->uid              = _current->uid;
-  newProcess->gid              = _current->gid;
-  newProcess->tss.back_link    = 0x0;
-  newProcess->tss.esp0         = _current->tss.esp0;
-  newProcess->tss.ss0          = 0x10;
-  newProcess->tss.esp1         = 0x0;
-  newProcess->tss.ss1          = 0x0;
-  newProcess->tss.esp2         = 0x0;
-  newProcess->tss.ss2          = 0x0;
-  newProcess->tss.eflags       = eflags;
-  newProcess->tss.eax          = 0x0;
-  newProcess->tss.ebx          = ebx;
-  newProcess->tss.ecx          = ecx;
-  newProcess->tss.edx          = edx;
-  newProcess->tss.esi          = esi;
-  newProcess->tss.edi          = edi;
-  newProcess->tss.ebp          = ebp;
-  newProcess->tss.esp          = esp;
-  newProcess->tss.cs           = cs & 0xFF;
-  newProcess->tss.ss           = ss & 0xFF;
-  newProcess->tss.ds           = _current->tss.ds & 0xFF;
-  newProcess->tss.fs           = _current->tss.fs & 0xFF;
-  newProcess->tss.gs           = _current->tss.gs & 0xFF;
-  newProcess->tss.es           = _current->tss.es & 0xFF;
-  newProcess->tss.ldt          = 0x18;
-  newProcess->tss.trace_bitmap = 0x0000;
-  newProcess->tss.io_map       = 0x8000;
-  /* Create A Copy Of The VM Space For New Task */
-  newProcess->tss.cr3 = (uInt32)vmmCopyVirtualSpace(newProcess->id);
-  newProcess->state = FORK;
- 
-  /* Fix gcc optimization problems */
-  while (tmpProcPtr->state == FORK) sched_yield();
-
-  /* Return Id of Proccess */
-  return(newProcess->id);
-  }
-  
-/*****************************************************************************************
- Functoin: void sysFork();
- 
- Desc: This function will fork a new task
-
- Notes:
- 
-   08/01/02 - This Seems To Be Working Fine However I'm Not Sure If I
-              Chose The Best Path To Impliment It I Guess We Will See
-              What The Future May Bring 
-
-*****************************************************************************************/
-asm(
-  ".globl sysFork           \n"
-  "sysFork:                 \n"
-  "  xor   %eax,%eax        \n"
-  "  call  schedNewTask     \n"
-  "  testl %eax,%eax        \n"
-  "  je fork_ret            \n"
-  "  pushl %esi             \n"
-  "  pushl %edi             \n"
-  "  pushl %ebp             \n"
-  "  pushl %eax             \n"
-  "  call  fork_copyProcess \n"
-  "  movl  %eax,(%ebx)      \n"
-  "  addl  $16,%esp         \n"
-  "fork_ret:                \n"
-  "  ret                    \n"
-  );
-
-/***
- END
- ***/
-
diff --git a/sys/armv6/kpanic.c b/sys/armv6/kpanic.c
deleted file mode 100644
index daad804..0000000
--- a/sys/armv6/kpanic.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kpanic.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/kpanic.h>
-#include <lib/kprintf.h>
-#include <isa/8259.h>
-#include <stdarg.h>
-#include <ubixos/tty.h>
-
-/*!
- * \brief print panic message and halt system
- *
- * \param fmt panic message
- *
- */
-void kpanic(const char *fmt, ...) {
-  char   buf[512];
-  vaList args;
-
-  vaStart(args, fmt);
-  vsprintf(buf, fmt, args);
-  vaEnd(args);
-
-  /* It's important that we print on the current terminal so let's reset foreground */
-  tty_foreground = NULL;
-  kprintf("kPanic: %s", buf);
-
-  /* Halt The System */
-  //asm("cli");
-  irqDisable(0x0);
-
-  while (1) {
-    asm("hlt");
-  }
-
-}
-
-/***
- END
- ***/
-
diff --git a/sys/armv6/sched.c b/sys/armv6/sched.c
deleted file mode 100644
index 2c09098..0000000
--- a/sys/armv6/sched.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sched.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/sched.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/endtask.h>
-#include <vfs/mount.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <vmm/vmm.h>
-#include <sys/gdt.h>
-#include <sys/idt.h>
-#include <sys/kern_descrip.h>
-#include <isa/8259.h>
-#include <string.h>
-#include <assert.h>
-
-#include <ubixos/spinlock.h>
-
-static kTask_t *taskList = 0x0;
-static kTask_t *delList  = 0x0;
-static uInt32  nextID    = -1;
-
-kTask_t *_current = 0x0;
-kTask_t *_usedMath = 0x0;
-
-static struct spinLock schedulerSpinLock = SPIN_LOCK_INITIALIZER;
-
-/************************************************************************
-
-Function: int sched_init()
-
-Description: This function is used to enable the kernel scheduler
-
-Notes:
-
-02/20/2004 - Approved for quality
-
-************************************************************************/
-
-
-int sched_init() {        
-  taskList = (kTask_t *)kmalloc(sizeof(kTask_t));
-  if(taskList == 0x0)
-	kpanic("Unable to create task list");
-   
-  taskList->id = nextID++;
-
-  /* Print out information on scheduler */
-  kprintf("sched0 - Address: [0x%X]\n", taskList);
-        
-  /* Return so we know everything went well */
-  return(0x0); 
-  }
-
-
-void sched(){
-  uInt32 memAddr   = 0x0;
-  kTask_t *tmpTask = 0x0;
-  kTask_t *delTask = 0x0;
-  
-  if (!spinTryLock(&schedulerSpinLock))
-  	return;
-  
-  tmpTask = _current->next;
-  //outportByte(0xE9,_current->id + '0');
-  schedStart:
-
-  /* Yield the next task from the current prio queue */
-  for (;tmpTask != 0x0; tmpTask = tmpTask->next) {
-    if (tmpTask->state > 0x0) {
-      _current = tmpTask;
-      if (_current->state == FORK)
-        _current->state = READY;
-      break;
-      }
-    else if (tmpTask->state == DEAD)
-      {
-        delTask  = tmpTask;
-        tmpTask  = tmpTask->next;
-        sched_deleteTask(delTask->id);
-        sched_addDelTask(delTask);
-        goto schedStart;
-      }
-    }
-
-        /* Finished all the tasks, restarting the list */
-        if (0x0 == tmpTask) {
-                tmpTask = taskList;
-                goto schedStart;
-        }
-        
-        
-        if (_current->state > 0x0) {
-                if (_current->oInfo.v86Task == 0x1)
-                        irqDisable(0x0);
-                asm("cli");
-                memAddr = (uInt32)&(_current->tss);
-                ubixGDT[4].descriptor.baseLow  = (memAddr & 0xFFFF);
-                ubixGDT[4].descriptor.baseMed  = ((memAddr >> 16) & 0xFF);
-                ubixGDT[4].descriptor.baseHigh = (memAddr >> 24);
-                ubixGDT[4].descriptor.access   = '\x89';
-		spinUnlock(&schedulerSpinLock);
-		asm("sti");
-		asm("ljmp $0x20,$0\n");
-        }
-	else
-	{
-		spinUnlock(&schedulerSpinLock);
-	}
-	
-        return;
-}
-
-
-kTask_t *schedNewTask() {
-  int i = 0;
-  kTask_t *tmpTask  = (kTask_t *)kmalloc(sizeof(kTask_t));
-  struct file *fp = 0x0;
-  if (tmpTask == 0x0)
-    kpanic("Error: schedNewTask() - kmalloc failed trying to initialize a new task struct\n");
-
-  memset(tmpTask,0x0,sizeof(kTask_t)); 
-  /* Filling in tasks attrs */
-  tmpTask->usedMath   = 0x0;
-  tmpTask->state      = NEW;
-
-  /* HACK */
-  for (i=0;i<3;i++) {
-    fp = (void *)kmalloc(sizeof(struct file));
-    tmpTask->td.o_files[i] = (uint32_t)fp;
-    fp->f_flag = 0x4;
-    }
-
-  spinLock(&schedulerSpinLock);
-  tmpTask->id         = nextID++;
-  tmpTask->next  = taskList;
-  tmpTask->prev  = 0x0;
-  taskList->prev = tmpTask;
-  taskList       = tmpTask;
-
-  spinUnlock(&schedulerSpinLock);
-  
-  return(tmpTask);
-  }
-
-
-int sched_deleteTask(pidType id) {
-  kTask_t *tmpTask = 0x0; 
-
-  /* Checking each task from the prio queue */
-  for (tmpTask = taskList; tmpTask != 0x0; tmpTask = tmpTask->next) {
-   if (tmpTask->id == id) {
-     if (tmpTask->prev != 0x0)
-       tmpTask->prev->next = tmpTask->next;
-     if (tmpTask->next != 0x0)
-       tmpTask->next->prev = tmpTask->prev;
-     if (taskList == tmpTask)
-       taskList = tmpTask->next;
-      
-     return(0x0);
-     }
-   }
-  return(0x1);
-  }
-  
-int  sched_addDelTask(kTask_t *tmpTask) {
-  tmpTask->next = delList;
-  tmpTask->prev = 0x0;
-  if (delList != 0x0)
-    delList->prev = tmpTask;
-  delList       = tmpTask;
-  return(0x0);
-  }
-  
-kTask_t *sched_getDelTask() {
-  kTask_t *tmpTask = 0x0;
-  
-  if (delList == 0x0)
-    return(0x0);
-    
-  tmpTask = delList;
-  delList = delList->next;
-  return(tmpTask);
-  }
-
-
-kTask_t * 
-schedFindTask(uInt32 id) 
-{
-        kTask_t *tmpTask = 0x0; 
-
-        for (tmpTask = taskList; tmpTask; tmpTask = tmpTask->next) {
-                if (tmpTask->id == id)
-                        return(tmpTask);
-        }
-
-        return(0x0);
-}
-
-
-/************************************************************************
-
- Function: void schedEndTask()
-
- Description: This function will end a task
-
- Notes:
-
-  02/20/2004 - Approved for quality
-
-************************************************************************/
-void 
-schedEndTask(pidType pid) {
-        endTask(_current->id);
-        sched_yield();
-}
-
-/************************************************************************
-
-Function: int schedEndTask()
-
-Description: This function will yield a task 
-
-Notes:
-
-02/20/2004 - Approved for quality
-
-************************************************************************/
-
-void 
-sched_yield() {
-  sched();
-  }
-
-/*
-asm(
-  ".globl sched_yield \n"
-  "sched_yield:       \n"
-  "  cli              \n"
-  "  call sched       \n"
-  );
-*/
-
-/************************************************************************
-
-Function: int sched_setStatus(pidType pid,tState state)
-
-Description: Change the tasks status
-
-Notes:
-
-************************************************************************/
-int sched_setStatus(pidType pid,tState state) {
-  kTask_t *tmpTask = schedFindTask(pid);
-  if (tmpTask == 0x0)
-    return(0x1);
-  tmpTask->state = state;
-  return(0x0);
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/armv6/schedyield.S b/sys/armv6/schedyield.S
deleted file mode 100644
index b04277e..0000000
--- a/sys/armv6/schedyield.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: schedyield.S 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-.globl sched_yield_new
-.text
-.code32
-sched_yield_new:         
-  pusha            /* Save all of the registers                */
-  push %ss
-  push %ds
-  push %es
-  push %fs
-  push %gs
-  call sched
-  mov  %eax,%esp
-  pop  %gs
-  pop  %fs             
-  pop  %es
-  pop  %ds
-  pop  %ss                 
-  popa             /* Restore Registers                        */
-  iret                    
-
-/***
- END
- ***/
diff --git a/sys/armv6/spinlock.c b/sys/armv6/spinlock.c
deleted file mode 100644
index 7d36549..0000000
--- a/sys/armv6/spinlock.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: spinlock.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/spinlock.h>
-#include <ubixos/sched.h>
-
-void spinLockInit(spinLock_t *lock) {
-  *lock = SPIN_LOCK_INITIALIZER;
-  }
-
-void spinUnlock(spinLock_t *lock) {
-  *lock = 0x0;
-  /*
-  register int unlocked;
-  asm volatile(
-    "xchgl %0, %1"
-    : "=&r" (unlocked), "=m" (*lock) : "0" (0)
-    );
-  */
-  }
-
-int spinTryLock(spinLock_t *lock) {
-  register int locked;
-  asm volatile("xchgl %0, %1"
-    : "=&r" (locked), "=m" (*lock) : "0" (1)
-    );
-  return(!locked);
-  }
-
-void spinLock(spinLock_t *lock) {
-  while (!spinTryLock(lock))
-  {
-    while (*lock == 1)
-    	sched_yield();
-  }
-}
-
-void spinLock_scheduler(spinLock_t *lock) {
-  while (!spinTryLock(lock))
-    while (*lock == 1);
-  }
-
-
-int spinLockLocked(spinLock_t *lock) {
-  return(*lock != 0);
-  }
-
- 
-/***
- END
- ***/
-
diff --git a/sys/armv6/sys_call.S b/sys/armv6/sys_call.S
deleted file mode 100644
index 3540601..0000000
--- a/sys/armv6/sys_call.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sys_call.S 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-.globl _sysCall
-.text
-.code32
-_sysCall:
-  cmpl totalCalls,%eax   
-  jae invalidSysCall       
-
-  cld
-  pushl %edx              
-  pushl %ecx               
-  pushl %ebx                
-  call *systemCalls(,%eax,4)
-  popl %ebx                  
-  popl %ecx                 
-  popl %edx /* Restore Registers */
-
-  iret
-
-invalidSysCall:
-  movl $-1,%eax
-  iret
-
-/***
- END
- ***/
-
diff --git a/sys/armv6/sys_call_new.S b/sys/armv6/sys_call_new.S
deleted file mode 100644
index 02169e3..0000000
--- a/sys/armv6/sys_call_new.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sys_call_new.S 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#define FAKE_MCOUNT(caller)     pushl caller ; call __mcount ; popl %ecx
-
-.globl _sysCall_new
-.text
-.code32
-_sysCall_new:
-  pushl   $2                      /* sizeof "int 0x80" */
-  subl    $4,%esp                 /* skip over tf_trapno */
-  pushal
-  pushl   %ds
-  pushl   %es
-  pushl   %fs
-  /* switch to kernel segments */
-  movl    $0x10,%eax
-  movl    %eax,%ds
-  movl    %eax,%es
-  movl    %eax,%fs
-  //FAKE_MCOUNT(TF_EIP(%esp))
-  call    syscall
-  //MEXITCOUNT
-  //jmp     doreti
-  popl    %fs
-  popl    %es
-  popl    %ds
-  popal
-  addl    $8,%esp
-  iret       
-             
-invalidSysCall:
-  push %eax
-  call invalidCall
-  pop %eax
-  movl $-1,%eax
-  iret
-
-/***
- END
- ***/
-
diff --git a/sys/armv6/syscall.c b/sys/armv6/syscall.c
deleted file mode 100644
index f70a614..0000000
--- a/sys/armv6/syscall.c
+++ /dev/null
@@ -1,262 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: syscall.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/syscall.h>
-#include <ubixos/syscalls.h>
-#include <ubixos/sched.h>
-#include <ubixos/types.h>
-#include <ubixos/exec.h>
-#include <ubixos/elf.h>
-#include <ubixos/endtask.h>
-#include <ubixos/time.h>
-#include <sys/video.h>
-#include <sys/trap.h>
-#include <vfs/file.h>
-#include <ubixfs/ubixfs.h>
-#include <lib/string.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <ubixos/vitals.h>
-/* #include <sde/sde.h> */
-#include <mpi/mpi.h>
-#include <vmm/vmm.h>
-
-long   fuword(const void *base);
-
-void sdeTestThread();
-
-asm(
-  ".globl _sysCallNew           \n"
-  "_sysCallNew:                 \n"
-  "  pusha                      \n"
-  "  push %ss                   \n"
-  "  push %ds                   \n"
-  "  push %es                   \n"
-  "  push %fs                   \n"
-  "  push %gs                   \n"
-  "  cmpl totalCalls,%eax       \n"
-  "  jae  invalidSysCallNew     \n"
-  "  mov  %esp,%ebx             \n"
-  "  add  $12,%ebx              \n"
-  "  push (%ebx)                \n"
-  "  call *systemCalls(,%eax,4) \n"
-  "  add  $4,%esp               \n"
-  "  jmp  doneNew               \n"
-  "invalidSysCallNew:           \n"
-  "  call InvalidSystemCall     \n"
-  "doneNew:                     \n"
-  "  pop %gs                    \n"
-  "  pop %fs                    \n" 
-  "  pop %es                    \n"
-  "  pop %ds                    \n"
-  "  pop %ss                    \n"
-  "  popa                       \n"
-  "  iret                       \n"
-  );
-
-void InvalidSystemCall()
-{
-	kprintf("attempt was made to an invalid system call\n");
-	return;
-}
-
-typedef struct _UbixUser UbixUser;
-struct _UbixUser
-{
-	char *username;
-	char *password;
-	int uid;
-	int gid;
-	char *home;
-	char *shell;
-};
-
-void sysAuth(UbixUser *uu)
-{
-	kprintf("authenticating user %s\n", uu->username);
-
-	/* MrOlsen 2016-01-01 uh? 
-	if(uu->username == "root" && uu->password == "user")
-	{
-		uu->uid = 0;
-		uu->gid = 0;
-	}
-*/
-	uu->uid = -1;
-	uu->gid = -1;
-	return;
-}
-
-void sysPasswd(char *passwd)
-{
-	kprintf("changing user password for user %d\n", _current->uid);
-	return;
-}
-
-void sysAddModule()
-{
-	return;
-}
-
-void sysRmModule()
-{
-	return;
-}
-
-void sysGetpid(int *pid)
-{
-	if (pid)
-		*pid = _current->id;
-		return;
-}
-
-void sysGetUid(int *uid) {
-  if (uid)
-    *uid = _current->uid;
-  return;
-  }
-
-void sysGetGid(int *gid) {
-  if (gid)
-    *gid = _current->gid;
-  return;
-  }
-
-void sysSetUid(int uid,int *status) {
-  if (_current->uid == 0x0) {
-    _current->uid = uid;
-    if (status)
-      *status = 0x0;
-    }
-  else {
-    if (status)
-      *status = 1;
-    }
-  return;
-  }
-
-void sysSetGid(int gid,int *status) {
-  if (_current->gid == 0x0) {
-    _current->gid = gid;
-    if (status)
-      *status = 0x0;
-    }
-  else {
-    if (status)
-      *status = 1;
-    }
-  return;
-  }  
-
-void sysExit(int status)
-{
-	endTask(_current->id);
-}
-
-void sysCheckPid(int pid,int *ptr)
-{
-	kTask_t *tmpTask = schedFindTask(pid);
-	if ((tmpTask != 0x0) && (ptr != 0x0))
-		*ptr = tmpTask->state;
-	else
-		*ptr = 0x0;
-	return;
-}
-
-/************************************************************************
-
-Function: void sysGetFreePage();
-Description: Allocs A Page To The Users VM Space
-Notes:
-
-************************************************************************/  
-void sysGetFreePage(long *ptr,int count,int type) {
-  if (ptr) {
-    if (type == 2)
-      *ptr = (long) vmmGetFreeVirtualPage(_current->id,count,VM_THRD);
-    else
-      *ptr = (long) vmmGetFreeVirtualPage(_current->id,count,VM_TASK);
-    }
-  return;
-  }
-
-void sysGetDrives(uInt32 *ptr)
-{
-	if (ptr)
-		*ptr = 0x0;//(uInt32)devices;
-	return;
-}
-
-void sysGetUptime(uInt32 *ptr)
-{
-	if (ptr)
-		*ptr = systemVitals->sysTicks;
-	return;
-}
-
-void sysGetTime(uInt32 *ptr)
-{
-	if (ptr)
-		*ptr = systemVitals->sysUptime + systemVitals->timeStart;
-	return;
-}
-
-
-void sysGetCwd(char *data,int len)
-{
-	if (data)
-		sprintf(data,"%s", _current->oInfo.cwd);
-	return;
-}
-
-void sysSchedYield() {
-  sched_yield();
-  }
-
-void sysStartSDE() {
-  int i = 0x0;
-  for (i=0;i<1400;i++) {
-    asm("hlt");
-    }
-  //execThread(sdeThread,(uInt32)(kmalloc(0x2000)+0x2000),0x0);
-  for (i=0;i<1400;i++) {
-    asm("hlt");
-    }
-  return;
-  }
-
-void invalidCall(int sys_call) {
-  kprintf("Invalid System Call #[%i]\n",sys_call);
-  return;
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/armv6/systemtask.c b/sys/armv6/systemtask.c
deleted file mode 100644
index 0d60881..0000000
--- a/sys/armv6/systemtask.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: systemtask.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/systemtask.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/exec.h>
-#include <ubixos/tty.h>
-#include <ubixos/sched.h>
-#include <ubixos/vitals.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <lib/bioscall.h>
-#include <sde/sde.h>
-#include <sys/io.h>
-#include <vmm/vmm.h>
-#include <mpi/mpi.h>
-#include <string.h>
-
-static unsigned char  *videoBuffer = (char *)0xB8000;
-
-
-void systemTask() {
-  mpi_message_t myMsg;
-  uInt32       counter  = 0x0;
-  int          i        = 0x0;
-  int          *x       = 0x0;
-  kTask_t      *tmpTask = 0x0;
-
-  if (mpi_createMbox("system") != 0x0) {
-    kpanic("Error: Error creating mailbox: system\n");
-    }
-
-  while(1) {
-    if (mpi_fetchMessage("system",&myMsg) == 0x0) {
-      kprintf("A");
-      switch(myMsg.header) {
-        case 0x69:
-          x = (int *)&myMsg.data;
-          kprintf("Switching to term: [%i][%i]\n",*x,myMsg.pid);
-          schedFindTask(myMsg.pid)->term = tty_find(*x);
-          break;
-        case 1000:
-          kprintf("Restarting the system in 5 seconds\n");
-          counter = systemVitals->sysUptime + 5;
-          while (systemVitals->sysUptime < counter) {
-            sched_yield();
-            }
-          kprintf("Rebooting NOW!!!\n");
-          while(inportByte(0x64) & 0x02);
-          outportByte(0x64, 0xFE);
-          break;
-        case 31337:
-           kprintf("system: backdoor opened\n");
-           break;	
-        case 0x80:
-           if (!strcmp(myMsg.data,"sdeStart")) {
-             kprintf("Starting SDE\n");
-             //execThread(sdeThread,(uInt32)(kmalloc(0x2000)+0x2000),0x0);
-             }
-           else if (!strcmp(myMsg.data,"freePage")) {
-            kprintf("kkk Free Pages");
-             }
-           else if (!strcmp(myMsg.data,"sdeStop")) {
-             printOff = 0x0;
-             biosCall(0x10,0x3,0x0,0x0,0x0,0x0,0x0,0x0,0x0);
-             for (i=0x0;i<100;i++) asm("hlt");
-             }
-           break;
-        default:
-          kprintf("system: Received message %i:%s\n",myMsg.header,myMsg.data);
-          break;
-        }
-      }
-
-    /*
-     Here we get the next task from the delete task queue 
-     we first check to see if it has an fd attached for the binary and after that 
-     we free the pages for the process and then free the task 
-    */
-    tmpTask = sched_getDelTask();    
-    if (tmpTask != 0x0) {
-      if (tmpTask->imageFd != 0x0)
-        fclose(tmpTask->imageFd);
-      vmmFreeProcessPages(tmpTask->id);
-      kfree(tmpTask);
-      }
-    videoBuffer[0] = systemVitals->sysTicks;     
-    sched_yield();
-    }    
-  
-  return;
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/armv6/timer.S b/sys/armv6/timer.S
deleted file mode 100644
index d06e868..0000000
--- a/sys/armv6/timer.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: timer.S 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-.globl timerInt
-.text
-.code32
-timerInt:                 
-  pusha                    /* Save all of the registers                */
-  mov $0x20,%dx            /* The Following Sends Our EOI To The MPIC  */
-  mov $0x20,%ax           
-  outb %al,%dx
-  movl systemVitals,%ecx   /* Put Location Of System Vitals Into ECX   */
-  incl 4(%ecx)             /* Increment sysTicks our 1000ms counter    */                    
-  movl 4(%ecx),%eax        /* Increment our sysUptime by 1S if 1000MS  */
-  movl $200,%ebx           /* Have Passed                              */
-  xor %edx,%edx           
-  div %ebx               
-  test %edx,%edx          
-  jnz next                
-  incl 8(%ecx)            
-next:                     
-  movl 4(%ecx),%eax        /* Test If quantum Has Passed If So Then    */
-  movl 12(%ecx),%ebx       /* We Can CALL sched                        */
-  xor %edx,%edx           
-  div %ebx                
-  test %edx,%edx          
-  jnz done                
-  call sched              
-done:                     
-  popa                      /* Restore Registers                        */
-  iret                    
-
-/***
- END
- ***/
-
diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile
deleted file mode 100644
index 31fc3a1..0000000
--- a/sys/boot/arm/uboot/Makefile
+++ /dev/null
@@ -1,159 +0,0 @@
-# $FreeBSD: releng/10.2/sys/boot/arm/uboot/Makefile 285298 2015-07-08 23:50:04Z loos $
-
-.include <bsd.own.mk>
-
-FILES=		ubldr ubldr.bin
-
-NEWVERSWHAT=	"U-Boot loader" ${MACHINE_ARCH}
-BINDIR?=	/boot
-INSTALLFLAGS=	-b
-WARNS?=		1
-# Address at which ubldr will be loaded.
-# This varies for different boards and SOCs.
-UBLDR_LOADADDR?=	0x1000000
-
-# Architecture-specific loader code
-SRCS=		start.S conf.c self_reloc.c vers.c
-
-.if !defined(LOADER_NO_DISK_SUPPORT)
-LOADER_DISK_SUPPORT?=	yes
-.else
-LOADER_DISK_SUPPORT=	no
-.endif
-LOADER_UFS_SUPPORT?=	yes
-LOADER_CD9660_SUPPORT?=	no
-LOADER_EXT2FS_SUPPORT?=	no
-.if ${MK_NAND} != "no"
-LOADER_NANDFS_SUPPORT?= yes
-.else
-LOADER_NANDFS_SUPPORT?= no
-.endif
-LOADER_NET_SUPPORT?=	yes
-LOADER_NFS_SUPPORT?=	yes
-LOADER_TFTP_SUPPORT?=	no
-LOADER_GZIP_SUPPORT?=	no
-LOADER_BZIP2_SUPPORT?=	no
-.if ${MK_FDT} != "no"
-LOADER_FDT_SUPPORT=	yes
-.else
-LOADER_FDT_SUPPORT=	no
-.endif
-
-.if ${LOADER_DISK_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_DISK_SUPPORT
-.endif
-.if ${LOADER_UFS_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_UFS_SUPPORT
-.endif
-.if ${LOADER_CD9660_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_CD9660_SUPPORT
-.endif
-.if ${LOADER_EXT2FS_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_EXT2FS_SUPPORT
-.endif
-.if ${LOADER_NANDFS_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_NANDFS_SUPPORT
-.endif
-.if ${LOADER_GZIP_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_GZIP_SUPPORT
-.endif
-.if ${LOADER_BZIP2_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_BZIP2_SUPPORT
-.endif
-.if ${LOADER_NET_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_NET_SUPPORT
-.endif
-.if ${LOADER_NFS_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_NFS_SUPPORT
-.endif
-.if ${LOADER_TFTP_SUPPORT} == "yes"
-CFLAGS+=	-DLOADER_TFTP_SUPPORT
-.endif
-.if ${LOADER_FDT_SUPPORT} == "yes"
-CFLAGS+=	-I${.CURDIR}/../../fdt
-CFLAGS+=	-I${.OBJDIR}/../../fdt
-CFLAGS+=	-DLOADER_FDT_SUPPORT
-LIBUBOOT_FDT=	${.OBJDIR}/../../uboot/fdt/libuboot_fdt.a
-LIBFDT=		${.OBJDIR}/../../fdt/libfdt.a
-.endif
-
-CFLAGS+=	-DNETIF_OPEN_CLOSE_ONCE
-
-.if ${MK_FORTH} != "no"
-# Enable BootForth
-BOOT_FORTH=	yes
-CFLAGS+=	-DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/arm
-LIBFICL=	${.OBJDIR}/../../ficl/libficl.a
-.endif
-
-# Always add MI sources
-.PATH:		${.CURDIR}/../../common
-Makefile.incl"
-CFLAGS+=	-I${.CURDIR}/../../common
-CFLAGS+=	-I.
-
-CLEANFILES+=	vers.c loader.help
-
-CFLAGS+=	-ffreestanding -msoft-float
-
-LDFLAGS=	-nostdlib -static -T ${.CURDIR}/ldscript.${MACHINE_CPUARCH}
-
-# Pull in common loader code
-.PATH:		${.CURDIR}/../../uboot/common
-Makefile.incl"
-CFLAGS+=	-I${.CURDIR}/../../uboot/common
-
-# U-Boot standalone support library
-LIBUBOOT=	${.OBJDIR}/../../uboot/lib/libuboot.a
-CFLAGS+=	-I${.CURDIR}/../../uboot/lib
-CFLAGS+=	-I${.OBJDIR}/../../uboot/lib
-
-# where to get libstand from
-CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
-
-# clang doesn't understand %D as a specifier to printf
-NO_WERROR.clang=
-
-DPADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
-LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} -lstand
-
-OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
-
-vers.c:	${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version
-	sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
-
-loader.help: help.common help.uboot ${.CURDIR}/../../fdt/help.fdt
-	cat ${.ALLSRC} | \
-	    awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET}
-
-ldscript.abs:
-	echo "UBLDR_LOADADDR = ${UBLDR_LOADADDR};" >${.TARGET}
-
-ldscript.pie:
-	echo "UBLDR_LOADADDR = 0;" >${.TARGET}
-
-ubldr: ${OBJS} ldscript.abs ${.CURDIR}/ldscript.${MACHINE_CPUARCH} ${DPADD}
-	${CC} ${CFLAGS} -T ldscript.abs ${LDFLAGS} \
-	    -o ${.TARGET} ${OBJS} ${LDADD}
-
-ubldr.pie: ${OBJS} ldscript.pie ${.CURDIR}/ldscript.${MACHINE_CPUARCH} ${DPADD}
-	${CC} ${CFLAGS} -T ldscript.pie ${LDFLAGS} -pie -Wl,-Bsymbolic \
-	    -o ${.TARGET} ${OBJS} ${LDADD}
-
-ubldr.bin: ubldr.pie
-	${OBJCOPY} -S -O binary ubldr.pie ${.TARGET}
-
-CLEANFILES+=	ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin
-
-.if !defined(LOADER_ONLY)
-.PATH: ${.CURDIR}/../../forth
-Makefile.incl"
-
-# Install loader.rc.
-FILES+=	loader.rc
-# Put sample menu.rc on disk but don't enable it by default.
-FILES+=	menu.rc
-FILESNAME_menu.rc=	menu.rc.sample
-.endif
-
-.include <bsd.prog.mk>
diff --git a/sys/boot/arm/uboot/conf.c b/sys/boot/arm/uboot/conf.c
deleted file mode 100644
index 5519606..0000000
--- a/sys/boot/arm/uboot/conf.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*-
- * Copyright (c) 2008 Semihalf, Rafal Jaworowski
- * 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.
- *
- * 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: releng/10.2/sys/boot/arm/uboot/conf.c 235537 2012-05-17 10:11:18Z gber $");
-
-#include <stand.h>
-#include "bootstrap.h"
-#include "libuboot.h"
-
-#if defined(LOADER_NET_SUPPORT)
-#include "dev_net.h"
-#endif
-
-struct devsw *devsw[] = {
-#if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT)
-	&uboot_storage,
-#endif
-#if defined(LOADER_NET_SUPPORT)
-	&netdev,
-#endif
-	NULL
-};
-
-struct fs_ops *file_system[] = {
-#if defined(LOADER_UFS_SUPPORT)
-	&ufs_fsops,
-#endif
-#if defined(LOADER_CD9660_SUPPORT)
-	&cd9660_fsops,
-#endif
-#if defined(LOADER_EXT2FS_SUPPORT)
-	&ext2fs_fsops,
-#endif
-#if defined(LOADER_NANDFS_SUPPORT)
-	&nandfs_fsops,
-#endif
-#if defined(LOADER_NFS_SUPPORT)
-	&nfs_fsops,
-#endif
-#if defined(LOADER_TFTP_SUPPORT)
-	&tftp_fsops,
-#endif
-#if defined(LOADER_GZIP_SUPPORT)
-	&gzipfs_fsops,
-#endif
-#if defined(LOADER_BZIP2_SUPPORT)
-	&bzipfs_fsops,
-#endif
-	NULL
-};
-
-struct netif_driver *netif_drivers[] = {
-#if defined(LOADER_NET_SUPPORT)
-	&uboot_net,
-#endif
-	NULL,
-};
-
-struct file_format *file_formats[] = {
-	&uboot_elf,
-	NULL
-};
-
-extern struct console uboot_console;
-
-struct console *consoles[] = {
-	&uboot_console,
-	NULL
-};
diff --git a/sys/boot/arm/uboot/help.uboot b/sys/boot/arm/uboot/help.uboot
deleted file mode 100644
index 541a9b5..0000000
--- a/sys/boot/arm/uboot/help.uboot
+++ /dev/null
@@ -1,27 +0,0 @@
-$FreeBSD: releng/10.2/sys/boot/arm/uboot/help.uboot 273665 2014-10-26 02:53:23Z ian $
-
-###############################################################################
-# Tubenv DShow or import U-Boot environment variables
-
-	ubenv <import | show> [varname ...]
-
-	Display U-Boot environment variables, or import them into the
-	loader environment (which makes them available in the kernel).
-
-###############################################################################
-# Tubenv Simport DImport U-Boot env vars
-
-	ubenv import [varname ...]
-
-	If no variable names are specified, all U-Boot environment
-	variables are imported.  Each variable is prefixed with "uboot."
-	to avoid any possible conflicts with loader or kernel variables.
-
-###############################################################################
-# Tubenv Sshow DShow U-Boot env vars
-
-	ubenv show [varname ...]
-
-	If no variable names are specified, all U-Boot environment
-	variables are shown.
-
diff --git a/sys/boot/arm/uboot/ldscript.arm b/sys/boot/arm/uboot/ldscript.arm
deleted file mode 100644
index bae52f3..0000000
--- a/sys/boot/arm/uboot/ldscript.arm
+++ /dev/null
@@ -1,133 +0,0 @@
-/* $FreeBSD: releng/10.2/sys/boot/arm/uboot/ldscript.arm 283505 2015-05-25 01:06:55Z ian $ */
-
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = UBLDR_LOADADDR + SIZEOF_HEADERS;
-  .text      :
-  {
-    *(.text)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t*)
-  } =0
-  _etext = .;
-  PROVIDE (etext = .);
-  .interp     : { *(.interp) 	}
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version   : { *(.gnu.version)	}
-  .gnu.version_d   : { *(.gnu.version_d)	}
-  .gnu.version_r   : { *(.gnu.version_r)	}
-  .rela.text     :
-    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
-  .rela.data     :
-    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
-  .rela.rodata   :
-    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
-  .rela.got      : { *(.rela.got)		}
-  .rela.got1     : { *(.rela.got1)		}
-  .rela.got2     : { *(.rela.got2)		}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rela.init     : { *(.rela.init)	}
-  .rela.fini     : { *(.rela.fini)	}
-  .rela.bss      : { *(.rela.bss)		}
-  .rela.plt      : { *(.rela.plt)		}
-  .rela.sdata    : { *(.rela.sdata)		}
-  .rela.sbss     : { *(.rela.sbss)		}
-  .rela.sdata2   : { *(.rela.sdata2)		}
-  .rela.sbss2    : { *(.rela.sbss2)		}
-  .init      : { *(.init)    } =0
-  .fini      : { *(.fini)    } =0
-  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
-  .rodata1   : { *(.rodata1) }
-  .sdata2    : { *(.sdata2)  }
-  .sbss2     : { *(.sbss2)   }
-  /* Adjust the address for the data segment to the next page up. */
-  . = ((. + 0x1000) & ~(0x1000 - 1));
-  .data    :
-  {
-    *(.data)
-    *(.gnu.linkonce.d*)
-    CONSTRUCTORS
-  }
-  .data1   : { *(.data1) }
-  .got1           : { *(.got1) }
-  .dynamic        : { *(.dynamic) }
-  /* Put .ctors and .dtors next to the .got2 section, so that the pointers
-     get relocated with -mrelocatable. Also put in the .fixup pointers.
-     The current compiler no longer needs this, but keep it around for 2.7.2  */
-                PROVIDE (_GOT2_START_ = .);
-  .got2           :  { *(.got2) }
-                PROVIDE (__CTOR_LIST__ = .);
-  .ctors          : { *(.ctors) }
-                PROVIDE (__CTOR_END__ = .);
-                PROVIDE (__DTOR_LIST__ = .);
-  .dtors          : { *(.dtors) }
-                PROVIDE (__DTOR_END__ = .);
-                PROVIDE (_FIXUP_START_ = .);
-  .fixup          : { *(.fixup) }
-                PROVIDE (_FIXUP_END_ = .);
-                PROVIDE (_GOT2_END_ = .);
-                PROVIDE (_GOT_START_ = .);
-  .got            : { *(.got) }
-  .got.plt        : { *(.got.plt) }
-                PROVIDE (_GOT_END_ = .);
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     : { *(.sdata) }
-  _edata  =  .;
-  PROVIDE (edata = .);
-  .sbss      :
-  {
-    PROVIDE (__sbss_start = .);
-    *(.sbss)
-    *(.scommon)
-    *(.dynsbss)
-    PROVIDE (__sbss_end = .);
-  }
-  .plt   : { *(.plt) }
-  .bss       :
-  {
-   PROVIDE (__bss_start = .);
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  }
-  _end = . ;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-}
diff --git a/sys/boot/arm/uboot/loader.conf b/sys/boot/arm/uboot/loader.conf
deleted file mode 100644
index bbf30b6..0000000
--- a/sys/boot/arm/uboot/loader.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# This is defaults/loader.conf for ARM, containing defaults for loader(8).
-# Do not modify the contents of this file, instead put your customizations
-# into /boot/loader.conf or /boot/loader.conf.local
-# $FreeBSD: releng/10.2/sys/boot/arm/uboot/loader.conf 278675 2015-02-13 15:16:55Z ian $
-
-autoboot_delay=10
-bootfile="kernel"      # Kernel name (possibly absolute path)
-kernel="kernel"        # /boot sub-directory containing kernel and modules
-loader_conf_files="/boot/loader.conf /boot/loader.conf.local"
-module_path="/boot/kernel;/boot/modules;/boot/dtb"
-nextboot_conf="/boot/nextboot.conf"
-nextboot_enable="NO"
-verbose_loading="NO"
diff --git a/sys/boot/arm/uboot/start.S b/sys/boot/arm/uboot/start.S
deleted file mode 100644
index d24baa8..0000000
--- a/sys/boot/arm/uboot/start.S
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 2008 Semihalf, Rafal Czubak
- * 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.
- *
- * 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: releng/10.2/sys/boot/arm/uboot/start.S 283505 2015-05-25 01:06:55Z ian $
- */
-
-#include <machine/asm.h>
-#include <machine/armreg.h>
-
-	.text
-	.extern	_C_LABEL(self_reloc), _C_LABEL(main)
-	.weak	_DYNAMIC
-
-/*
- * Entry point to the loader that U-Boot passes control to.
- */
-	.globl	_start
-_start:
-
-#ifdef _ARM_ARCH_6
-	mrc     p15, 0, ip, c1, c0, 0
-	orr	ip, ip, #(CPU_CONTROL_UNAL_ENABLE)
-	orr	ip, ip, #(CPU_CONTROL_AFLT_ENABLE)
-	mcr     p15, 0, ip, c1, c0, 0
-#endif
-	/* 
-	 * Do self-relocation when the weak external symbol _DYNAMIC is non-NULL.
-	 * When linked as a dynamic relocatable file, the linker automatically
-	 * defines _DYNAMIC with a value that is the offset of the dynamic
-	 * relocation info section.
-	 * Note that we're still on u-boot's stack here, but the self_reloc 
-	 * code uses only a couple dozen bytes of stack space.
-	 */
-	adr	ip, .here_off		/* .here_off is a symbol whose value */
-	ldr	r0, [ip]		/* is its own offset in the text seg. */
-	sub	r0, ip, r0		/* Get its pc-relative address and */
-	ldr	r1, .dynamic_off	/* subtract its value and we get */
-	teq	r1, #0			/* r0 = physaddr we were loaded at. */
-	addne	r1, r1, r0		/* r1 = dynamic section physaddr. */
-	blne	_C_LABEL(self_reloc)	/* Do reloc if _DYNAMIC is non-NULL. */
-
-	/* Hint where to look for the API signature */
-	ldr	ip, =uboot_address
-	str	sp, [ip]
-
-	/* Save U-Boot's r8 and r9 */
-	ldr	ip, =saved_regs
-	str	r8, [ip, #0]
-	str	r9, [ip, #4]
-
-	/* 
-	 * Start loader.  This is basically a tail-recursion call; if main()
-	 * returns, it returns to u-boot (which reports the value returned r0).
-	 */
-	b	main
-
-	/* 
-	 * Data for self-relocation, in the text segment for pc-rel access.
-	 */
-.here_off:
-	.word	.
-.dynamic_off:
-	.word	_DYNAMIC
-
-/*
- * syscall()
- */
-ENTRY(syscall)
-	/* Save caller's lr, r8 and r9 */
-	ldr	ip, =saved_regs
-	str	r8, [ip, #8]
-	str	r9, [ip, #12]
-	str	lr, [ip, #16]
-	/* Restore U-Boot's r8 and r9 */
-	ldr	r8, [ip, #0]
-	ldr	r9, [ip, #4]
-	/* Call into U-Boot */
-	ldr	lr, =return_from_syscall
-	ldr	ip, =syscall_ptr
-	ldr	pc, [ip]
-return_from_syscall:
-	/* Restore loader's r8, r9 and lr */
-	ldr	ip, =saved_regs
-	ldr	lr, [ip, #16]
-	ldr	r9, [ip, #12]
-	ldr	r8, [ip, #8]
-	/* Return to caller */
-	mov	pc, lr
-
-/*
- * Data section
- */
-	.data
-	.align	4
-	.globl	syscall_ptr
-syscall_ptr:
-	.long	0
-
-	.globl	uboot_address
-uboot_address:
-	.long	0
-
-saved_regs:
-	.long	0	/* U-Boot's r8 */
-	.long	0	/* U-Boot's r9 */
-	.long	0	/* Loader's r8 */
-	.long	0	/* Loader's r9 */
-	.long	0	/* Loader's lr */
diff --git a/sys/boot/arm/uboot/version b/sys/boot/arm/uboot/version
deleted file mode 100644
index 25d3cc8..0000000
--- a/sys/boot/arm/uboot/version
+++ /dev/null
@@ -1,9 +0,0 @@
-$FreeBSD: releng/10.2/sys/boot/arm/uboot/version 235537 2012-05-17 10:11:18Z gber $
-
-NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
-file is important.  Make sure the current version number is on line 6.
-
-1.2:	Extended with NAND FS support.
-1.1:	Flattened Device Tree blob support.
-1.0:	Added storage support. Booting from HDD, USB, etc. is now possible.
-0.5:	Initial U-Boot/arm version (netbooting only).
diff --git a/sys/compile/.gitignore b/sys/compile/.gitignore
deleted file mode 100644
index bec9de7..0000000
--- a/sys/compile/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-kernel
-null.c
diff --git a/sys/compile/Makefile b/sys/compile/Makefile
deleted file mode 100644
index ab3c603..0000000
--- a/sys/compile/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: Makefile 102 2016-01-12 03:59:34Z reddawg $
-# Kernel Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#Objects
-OBJS = null.o
-
-#Kernel Parts
-KPARTS = ../${_ARCH}/*.o ../fs/ubixfs/*.o ../init/*.o ../sys/*.o ../vmm/*.o ../lib/*.o ../kernel/*.o ../isa/*.o ../fs/vfs/*.o ../pci/*.o ../fs/devfs/*.o ../mpi/*.o ../fs/ufs/*.o ../fs/common/*.o ../net/net/*.o ../net/netif/*.o ../net/api/*.o ../net/core/*.o ../net/core/ipv4/*.o ../net/core/ipv6/*.o
-# ../sde/*.o ../graphics/*.o ../ld/*.o  -Ttext 0x30000 -Tdata 0x34000 ../ubixfs/*.o
-
-# Link the kernel statically with fixed text+data address @1M
-$(KERNEL) : $(OBJS)
-	#$(LD)  -nostdlib -nostdinc --warn-section-align -o $@ $(OBJS) $(KPARTS) -Ttext 0x30000 -Tdata 0x20000
-	$(LD)  -T ./ldscript.i386 -o $@ $(OBJS) $(KPARTS)
-	#/usr/bin/strip $@
-
-# Compile the source files
-.cc.o:
-	$(CXX) -${CFLAGS} $(INCLUDES) -c -o $@ $<
- 
-.cc.s:
-	$(CXX) ${CFLAGS} $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES)  -c -o $@ $<
- 
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(KERNEL) null.c
diff --git a/sys/compile/ldscript.i386 b/sys/compile/ldscript.i386
deleted file mode 100644
index 731e787..0000000
--- a/sys/compile/ldscript.i386
+++ /dev/null
@@ -1,77 +0,0 @@
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
-OUTPUT_ARCH(i386)
-
-ENTRY(_start)
-SEARCH_DIR("libgcc");
-SECTIONS
-{
-        . = 0x30000 + SIZEOF_HEADERS;
-
-        .interp : { *(.interp) }
-        .hash : { *(.hash) }
-        .dynsym : { *(.dynsym) }
-        .dynstr : { *(.dynstr) }
-        .rel.text : { *(.rel.text) *(.rel.gnu.linkonce.t*) }
-        .rela.text : { *(.rela.text) *(.rela.gnu.linkonce.t*) }
-        .rel.data : { *(.rel.data) *(.rel.gnu.linkonce.d*) }
-        .rela.data : { *(.rela.data) *(.rela.gnu.linkonce.d*) }
-        .rel.rodata : { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
-        .rela.rodata : { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
-        .rel.got : { *(.rel.got) }
-        .rela.got : { *(.rela.got) }
-        .rel.ctors : { *(.rel.ctors) }
-        .rela.ctors : { *(.rela.ctors) }
-        .rel.dtors : { *(.rel.dtors) }
-        .rela.dtors : { *(.rela.dtors) }
-        .rel.init : { *(.rel.init) }
-        .rela.init : { *(.rela.init) }
-        .rel.fini : { *(.rel.fini) }
-        .rela.fini : { *(.rela.fini) }
-        .rel.bss : { *(.rel.bss) }
-        .rela.bss : { *(.rela.bss) }
-        .rel.plt : { *(.rel.plt) }
-        .rela.plt : { *(.rela.plt) }
-        .init : { *(.init) } =0x9090
-        .plt : { *(.plt) }
-
-        /* text/read-only data */
-        .text : { *(.text .gnu.linkonce.t.*) } =0x9090
-
-        .rodata : { *(.rodata) .rodata.* .gnu.linkonce.r.* }
-
-        /* writable data  */
-        . = ALIGN(0x1000);
-        __data_start = .;
-        .data : { *(.data .gnu.linkonce.d.*) }
-
-        __ctor_list = .;
-	.ctors :
-	{
-		LONG((__ctor_end - __ctor_list) / 4 - 2)
-        	*(.ctors)
-		LONG(0)
-	}
-        __ctor_end = .;
-
-        __dtor_list = .;
-	.dtors :
-	{
-		LONG((__dtor_end - __dtor_list) / 4 - 2)
-        	*(.dtors)
-		LONG(0)
-	}
-        __dtor_end = .;
-
-        .got : { *(.got.plt) *(.got) }
-        .dynamic : { *(.dynamic) }
-        
-        /* unintialized data (in same segment as writable data) */
-        __bss_start = .;
-        .bss : { *(.bss) }
-
-        . = ALIGN(0x1000);
-        _end = . ;
-
-        /* Strip unnecessary stuff */
-        /DISCARD/ : { *(.comment .note .eh_frame) }
-}
diff --git a/sys/fs/Makefile b/sys/fs/Makefile
deleted file mode 100644
index a786ece..0000000
--- a/sys/fs/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: Makefile 96 2016-01-12 01:51:45Z reddawg $
-# Kernel Makefile (C) 2002 The UbixOS Project
-
-#all: ubixfs-code pci-code ufs-code vfs-code isa-code kernel-code lib-code vmm-code sys-code init-code devfs-code mpi-code kmods-code kernel-img
-#ubixfs-code
-
-all: ubixfs-code devfs-code ufs-code vfs-code common-code
-
-ubixfs-code: ubixfs
-	(cd ubixfs;make)
-
-devfs-code: devfs
-	(cd devfs;make)
-
-vfs-code: vfs
-	(cd vfs;make)
-
-common-code: common 
-	(cd common;make)
-
-ufs-code: ufs
-	(cd ufs;make)
-
-clean:
-	(cd ubixfs;make clean)
-	(cd vfs;make clean)
-	(cd devfs;make clean)
-	(cd ufs;make clean)
-	(cd common;make clean)
diff --git a/sys/fs/common/Makefile b/sys/fs/common/Makefile
deleted file mode 100644
index 281d340..0000000
--- a/sys/fs/common/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 102 2016-01-12 03:59:34Z reddawg $
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#  Objects
-OBJS = crc32.o gpt.o
-
-#Custom Stuff
-CFLAGS +=-DBOOTPROG=\"MrOlsen\" -fno-builtin
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.c.o:
-	$(CC)  ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.c.s:
-	$(CC)  ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.S.o:
-	$(CC)  ${CFLAGS} ${INCLUDES} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/fs/common/crc32.c b/sys/fs/common/crc32.c
deleted file mode 100644
index 8c5b5ea..0000000
--- a/sys/fs/common/crc32.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- *  COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or
- *  code or tables extracted from it, as desired without restriction.
- */
-
-/*
- *  First, the polynomial itself and its table of feedback terms.  The
- *  polynomial is
- *  X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0
- *
- *  Note that we take it "backwards" and put the highest-order term in
- *  the lowest-order bit.  The X^32 term is "implied"; the LSB is the
- *  X^31 term, etc.  The X^0 term (usually shown as "+1") results in
- *  the MSB being 1
- *
- *  Note that the usual hardware shift register implementation, which
- *  is what we're using (we're merely optimizing it by doing eight-bit
- *  chunks at a time) shifts bits into the lowest-order term.  In our
- *  implementation, that means shifting towards the right.  Why do we
- *  do it this way?  Because the calculated CRC must be transmitted in
- *  order from highest-order term to lowest-order term.  UARTs transmit
- *  characters in order from LSB to MSB.  By storing the CRC this way
- *  we hand it to the UART in the order low-byte to high-byte; the UART
- *  sends each low-bit to hight-bit; and the result is transmission bit
- *  by bit from highest- to lowest-order term without requiring any bit
- *  shuffling on our part.  Reception works similarly
- *
- *  The feedback terms table consists of 256, 32-bit entries.  Notes
- *
- *      The table can be generated at runtime if desired; code to do so
- *      is shown later.  It might not be obvious, but the feedback
- *      terms simply represent the results of eight shift/xor opera
- *      tions for all combinations of data and CRC register values
- *
- *      The values must be right-shifted by eight bits by the "updcrc
- *      logic; the shift must be unsigned (bring in zeroes).  On some
- *      hardware you could probably optimize the shift in assembler by
- *      using byte-swap instructions
- *      polynomial $edb88320
- *
- *
- * CRC32 code derived from work by Gary S. Brown.
- */
-
-//#include <sys/cdefs.h>
-
-#include <sys/types.h>
-#include <fs/common/crc32.h>
-
-static const uint32_t crc32_tab[] = {
-	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-	0xe963a535, 0x9e6495a3,	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-	0xf3b97148, 0x84be41de,	0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-	0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,	0x14015c4f, 0x63066cd9,
-	0xfa0f3d63, 0x8d080df5,	0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-	0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,	0x35b5a8fa, 0x42b2986c,
-	0xdbbbc9d6, 0xacbcf940,	0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-	0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-	0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,	0x76dc4190, 0x01db7106,
-	0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-	0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-	0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-	0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-	0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-	0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-	0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-	0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-	0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-	0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-	0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-	0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-	0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-	0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-	0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-	0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-	0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-	0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-	0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-	0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-	0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-	0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-	0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-	0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-	0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-	0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-	0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-	0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-	0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-	0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-	0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-};
-
-uint32_t
-crc32(const void *buf, size_t size)
-{
-	const u_int8_t *p = buf;
-	uint32_t crc;
-
-	crc = ~0U;
-	while (size--)
-		crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
-	return (crc ^ ~0U);
-}
diff --git a/sys/fs/common/gpt.c b/sys/fs/common/gpt.c
deleted file mode 100644
index 55212b6..0000000
--- a/sys/fs/common/gpt.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*-
- * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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.
- */
-
-//#include <sys/cdefs.h>
-//#include <sys/param.h>
-#include <fs/common/gpt.h>
-#include <fs/common/crc32.h>
-#include <sys/device.h>
-#include <lib/kprintf.h>
-#include <pci/hd.h>
-
-
-/*
- #ifndef LITTLE_ENDIAN
- #error gpt.c works only for little endian architectures
- #endif
- */
-
-/*
- #include "crc32.h"
- #include "drv.h"
- #include "util.h"
- #include "gpt.h"
- */
-
-#define	MAXTBLENTS	128
-
-static struct gpt_hdr hdr_primary, hdr_backup, *gpthdr;
-static u_int64_t hdr_primary_lba, hdr_backup_lba;
-static struct gpt_ent table_primary[MAXTBLENTS], table_backup[MAXTBLENTS];
-static struct gpt_ent *gpttable;
-static int curent, bootonce;
-
-/*
- * Buffer below 64kB passed on gptread(), which can hold at least
- * one sector of data (512 bytes).
- */
-static char *secbuf;
-
-static void gptupdate( const char *which, struct device_interface *devInfo, struct gpt_hdr *hdr, struct gpt_ent *table ) {
-  int entries_per_sec, firstent;
-  daddr_t slba;
-
-  /*
-   * We need to update the following for both primary and backup GPT:
-   * 1. Sector on disk that contains current partition.
-   * 2. Partition table checksum.
-   * 3. Header checksum.
-   * 4. Header on disk.
-   */
-
-  entries_per_sec = DEV_BSIZE / hdr->hdr_entsz;
-  slba = curent / entries_per_sec;
-  firstent = slba * entries_per_sec;
-  bcopy( &table[firstent], secbuf, DEV_BSIZE );
-  slba += hdr->hdr_lba_table;
-  if ( devInfo->write( devInfo->info, secbuf, slba, 1 ) ) {
-    kprintf( "%s: unable to update %s GPT partition table\n", BOOTPROG, which );
-    return;
-  }
-  hdr->hdr_crc_table = crc32( table, hdr->hdr_entries * hdr->hdr_entsz );
-  hdr->hdr_crc_self = 0;
-  hdr->hdr_crc_self = crc32( hdr, hdr->hdr_size );
-  bzero( secbuf, DEV_BSIZE );
-  bcopy( hdr, secbuf, hdr->hdr_size );
-  if ( devInfo->write( devInfo->info, secbuf, hdr->hdr_lba_self, 1 ) ) {
-    kprintf( "%s: unable to update %s GPT header\n", BOOTPROG, which );
-    return;
-  }
-}
-
-int gptfind( const uuid_t *uuid, struct device_interface *devInfo, int part ) {
-  struct gpt_ent *ent;
-  struct driveInfo *drvInfo = devInfo->info;
-  int firsttry;
-
-  if ( part >= 0 ) {
-    if ( part == 0 || part > gpthdr->hdr_entries ) {
-      kprintf( "%s: invalid partition index\n", BOOTPROG );
-      return (-1);
-    }
-    ent = &gpttable[part - 1];
-    if ( bcmp( &ent->ent_type, uuid, sizeof(uuid_t) ) != 0 ) {
-      kprintf( "%s: specified partition is not UFS\n", BOOTPROG );
-      return (-1);
-    }
-    curent = part - 1;
-    goto found;
-  }
-
-  firsttry = (curent == -1);
-  curent++;
-  if ( curent >= gpthdr->hdr_entries ) {
-    curent = gpthdr->hdr_entries;
-    return (-1);
-  }
-  if ( bootonce ) {
-    /*
-     * First look for partition with both GPT_ENT_ATTR_BOOTME and
-     * GPT_ENT_ATTR_BOOTONCE flags.
-     */
-    for (; curent < gpthdr->hdr_entries; curent++ ) {
-      ent = &gpttable[curent];
-      if ( bcmp( &ent->ent_type, uuid, sizeof(uuid_t) ) != 0 )
-      continue;
-      if ( !(ent->ent_attr & GPT_ENT_ATTR_BOOTME) )
-      continue;
-      if ( !(ent->ent_attr & GPT_ENT_ATTR_BOOTONCE) )
-      continue;
-      /* Ok, found one. */
-      goto found;
-    }
-    bootonce = 0;
-    curent = 0;
-  }
-  for (; curent < gpthdr->hdr_entries; curent++ ) {
-    ent = &gpttable[curent];
-    if ( bcmp( &ent->ent_type, uuid, sizeof(uuid_t) ) != 0 )
-    continue;
-    if ( !(ent->ent_attr & GPT_ENT_ATTR_BOOTME) )
-    continue;
-    if ( ent->ent_attr & GPT_ENT_ATTR_BOOTONCE )
-    continue;
-    /* Ok, found one. */
-    goto found;
-  }
-  if ( firsttry ) {
-    /*
-     * No partition with BOOTME flag was found, try to boot from
-     * first UFS partition.
-     */
-    for ( curent = 0; curent < gpthdr->hdr_entries; curent++ ) {
-      ent = &gpttable[curent];
-      if ( bcmp( &ent->ent_type, uuid, sizeof(uuid_t) ) != 0 )
-      continue;
-      /* Ok, found one. */
-      goto found;
-    }
-  }
-  return (-1);
-  found: drvInfo->part = curent + 1;
-  ent = &gpttable[curent];
-  drvInfo->parOffset = ent->ent_lba_start * drvInfo->sector_size;
-  drvInfo->lba_start = ent->ent_lba_start;
-  drvInfo->lba_end = ent->ent_lba_end;
-  if ( ent->ent_attr & GPT_ENT_ATTR_BOOTONCE ) {
-    /*
-     * Clear BOOTME, but leave BOOTONCE set before trying to
-     * boot from this partition.
-     */
-    if ( hdr_primary_lba > 0 ) {
-      table_primary[curent].ent_attr &= ~GPT_ENT_ATTR_BOOTME;
-      gptupdate( "primary", devInfo, &hdr_primary, table_primary );
-    }
-    if ( hdr_backup_lba > 0 ) {
-      table_backup[curent].ent_attr &= ~GPT_ENT_ATTR_BOOTME;
-      gptupdate( "backup", devInfo, &hdr_backup, table_backup );
-    }
-  }
-  return (0);
-}
-
-static int gptread_hdr( const char *which, struct device_interface *devInfo, struct gpt_hdr *hdr, u_int64_t hdrlba ) {
-  uint32_t crc;
-
-  if ( devInfo->read( devInfo->info, secbuf, hdrlba, 1 ) ) {
-    kprintf( "%s: unable to read %s GPT header\n", BOOTPROG, which );
-    return (-1);
-  }
-
-  bcopy( secbuf, hdr, sizeof(*hdr) );
-
-  if ( bcmp( hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig) ) != 0 || hdr->hdr_lba_self != hdrlba || hdr->hdr_revision < 0x00010000 || hdr->hdr_entsz < sizeof(struct gpt_ent) || hdr->hdr_entries > MAXTBLENTS || DEV_BSIZE % hdr->hdr_entsz != 0 ) {
-    kprintf( "%s: invalid %s GPT header\n", BOOTPROG, which );
-    return (-1);
-  }
-
-  crc = hdr->hdr_crc_self;
-  hdr->hdr_crc_self = 0;
-
-  if ( crc32( hdr, hdr->hdr_size ) != crc ) {
-    kprintf( "%s: %s GPT header checksum mismatch\n", BOOTPROG, which );
-    return (-1);
-  }
-  hdr->hdr_crc_self = crc;
-  return (0);
-}
-
-void gptbootfailed( struct device_interface *devInfo ) {
-
-  if ( !(gpttable[curent].ent_attr & GPT_ENT_ATTR_BOOTONCE) )
-  return;
-
-  if ( hdr_primary_lba > 0 ) {
-    table_primary[curent].ent_attr &= ~GPT_ENT_ATTR_BOOTONCE;
-    table_primary[curent].ent_attr |= GPT_ENT_ATTR_BOOTFAILED;
-    gptupdate( "primary", devInfo, &hdr_primary, table_primary );
-  }
-  if ( hdr_backup_lba > 0 ) {
-    table_backup[curent].ent_attr &= ~GPT_ENT_ATTR_BOOTONCE;
-    table_backup[curent].ent_attr |= GPT_ENT_ATTR_BOOTFAILED;
-    gptupdate( "backup", devInfo, &hdr_backup, table_backup );
-  }
-}
-
-static void gptbootconv( const char *which, struct device_interface *devInfo, struct gpt_hdr *hdr, struct gpt_ent *table ) {
-  struct gpt_ent *ent;
-  daddr_t slba;
-  int table_updated, sector_updated;
-  int entries_per_sec, nent, part;
-
-  table_updated = 0;
-  entries_per_sec = DEV_BSIZE / hdr->hdr_entsz;
-  for ( nent = 0, slba = hdr->hdr_lba_table; slba < hdr->hdr_lba_table + hdr->hdr_entries / entries_per_sec; slba++, nent += entries_per_sec ) {
-    sector_updated = 0;
-    for ( part = 0; part < entries_per_sec; part++ ) {
-      ent = &table[nent + part];
-      if ( (ent->ent_attr & (GPT_ENT_ATTR_BOOTME | GPT_ENT_ATTR_BOOTONCE | GPT_ENT_ATTR_BOOTFAILED)) != GPT_ENT_ATTR_BOOTONCE ) {
-        continue;
-      }
-      ent->ent_attr &= ~GPT_ENT_ATTR_BOOTONCE;
-      ent->ent_attr |= GPT_ENT_ATTR_BOOTFAILED;
-      table_updated = 1;
-      sector_updated = 1;
-    }
-    if ( !sector_updated )
-    continue;
-    bcopy( &table[nent], secbuf, DEV_BSIZE );
-    if ( devInfo->write( devInfo->info, secbuf, slba, 1 ) ) {
-      kprintf( "%s: unable to update %s GPT partition table\n", BOOTPROG, which );
-    }
-  }
-  if ( !table_updated )
-  return;
-  hdr->hdr_crc_table = crc32( table, hdr->hdr_entries * hdr->hdr_entsz );
-  hdr->hdr_crc_self = 0;
-  hdr->hdr_crc_self = crc32( hdr, hdr->hdr_size );
-  bzero( secbuf, DEV_BSIZE );
-  bcopy( hdr, secbuf, hdr->hdr_size );
-  if ( devInfo->write( devInfo->info, secbuf, hdr->hdr_lba_self, 1 ) )
-  kprintf( "%s: unable to update %s GPT header\n", BOOTPROG, which );
-}
-
-static int gptread_table( const char *which, const uuid_t *uuid, struct device_interface *devInfo, struct gpt_hdr *hdr, struct gpt_ent *table ) {
-  struct gpt_ent *ent;
-  int entries_per_sec;
-  int part, nent;
-  daddr_t slba;
-
-  if ( hdr->hdr_entries == 0 )
-  return (0);
-
-  entries_per_sec = DEV_BSIZE / hdr->hdr_entsz;
-  slba = hdr->hdr_lba_table;
-  nent = 0;
-  for (;; ) {
-    if ( devInfo->read(devInfo->info, secbuf, slba, 1 ) ) {
-      kprintf( "%s: unable to read %s GPT partition table\n", BOOTPROG, which );
-      return (-1);
-    }
-    ent = (struct gpt_ent *) secbuf;
-    for ( part = 0; part < entries_per_sec; part++, ent++ ) {
-      bcopy( ent, &table[nent], sizeof(table[nent]) );
-      if ( ++nent >= hdr->hdr_entries )
-      break;
-    }
-    if ( nent >= hdr->hdr_entries )
-    break;
-    slba++;
-  }
-  if ( crc32( table, nent * hdr->hdr_entsz ) != hdr->hdr_crc_table ) {
-    kprintf( "%s: %s GPT table checksum mismatch\n", BOOTPROG, which );
-    return (-1);
-  }
-  return (0);
-}
-
-int gptread( const uuid_t *uuid, struct device_interface *devInfo, char *buf ) {
-  u_int64_t altlba;
-
-  /*
-   * Read and verify both GPT headers: primary and backup.
-   */
-
-  secbuf = buf;
-  hdr_primary_lba = hdr_backup_lba = 0;
-  curent = -1;
-  bootonce = 1;
-
-  /* MrOlsen (2016-01-11) NOTE: What Was This For?
-  dskp->start = 0;
-  */
-
-  if ( gptread_hdr( "primary", devInfo, &hdr_primary, 1 ) == 0 && gptread_table( "primary", uuid, devInfo, &hdr_primary, table_primary ) == 0 ) {
-    hdr_primary_lba = hdr_primary.hdr_lba_self;
-    gpthdr = &hdr_primary;
-    gpttable = table_primary;
-  }
-
-  if ( hdr_primary_lba > 0 ) {
-    /*
-     * If primary header is valid, we can get backup
-     * header location from there.
-     */
-    altlba = hdr_primary.hdr_lba_alt;
-  }
-  else {
-    //MrOlsen (2016-01-11) FIX: What Is This???
-    kprintf("FIX!\n");
-    //altlba = drvsize( dskp );
-    if ( altlba > 0 )
-    altlba--;
-  }
-  if ( altlba == 0 )
-  kprintf( "%s: unable to locate backup GPT header\n", BOOTPROG );
-  else if ( gptread_hdr( "backup", devInfo, &hdr_backup, altlba ) == 0 && gptread_table( "backup", uuid, devInfo, &hdr_backup, table_backup ) == 0 ) {
-    hdr_backup_lba = hdr_backup.hdr_lba_self;
-    if ( hdr_primary_lba == 0 ) {
-      gpthdr = &hdr_backup;
-      gpttable = table_backup;
-      kprintf( "%s: using backup GPT\n", BOOTPROG );
-    }
-  }
-
-  /*
-   * Convert all BOOTONCE without BOOTME flags into BOOTFAILED.
-   * BOOTONCE without BOOTME means that we tried to boot from it,
-   * but failed after leaving gptboot and machine was rebooted.
-   * We don't want to leave partitions marked as BOOTONCE only,
-   * because when we boot successfully start-up scripts should
-   * find at most one partition with only BOOTONCE flag and this
-   * will mean that we booted from that partition.
-   */
-  if ( hdr_primary_lba != 0 )
-  gptbootconv( "primary", devInfo, &hdr_primary, table_primary );
-  if ( hdr_backup_lba != 0 )
-  gptbootconv( "backup", devInfo, &hdr_backup, table_backup );
-
-  if ( hdr_primary_lba == 0 && hdr_backup_lba == 0 )
-  return (-1);
-  return (0);
-}
diff --git a/sys/fs/devfs/Makefile b/sys/fs/devfs/Makefile
deleted file mode 100644
index afb79e4..0000000
--- a/sys/fs/devfs/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#  Linker
-LINKER = ld
-
-#  Remove
-REMOVE = rm -fr
-
-#  Objects
-OBJS = devfs.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/fs/devfs/devfs.c b/sys/fs/devfs/devfs.c
deleted file mode 100644
index 4c8c50d..0000000
--- a/sys/fs/devfs/devfs.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: devfs.c 169 2016-01-20 01:10:22Z reddawg $
-
- *****************************************************************************************/
-
-#include <devfs/devfs.h>
-#include <vfs/vfs.h>
-#include <sys/device.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/kpanic.h>
-#include <lib/kmalloc.h>
-#include <lib/string.h>
-#include <lib/kprintf.h>
-
-/* Spinlock for devfs we should start converting to sem/mutex */
-static struct spinLock devfsSpinLock = SPIN_LOCK_INITIALIZER;
-
-/* Length of dev list */
-static int devfs_len = 0x0;
-
-/**
- This is the initialized called by the vfs system when enabling devfs
- basically it allocates memory for the devfs module
- */
-static void devfs_initialize( struct vfs_mountPoint *mp ) {
-  struct devfs_info *fsInfo = 0x0;
-
-  /* Allocate memory for the fsInfo */
-  if ( (mp->fsInfo = (struct devfs_info *) kmalloc( sizeof(struct devfs_info) )) == 0x0 )
-    K_PANIC( "devfs: failed to allocate memor\n" );
-
-  fsInfo = mp->fsInfo;
-  fsInfo->deviceList = 0x0;
-
-  /* Return */
-  return;
-}
-
-/**
- This is the open routine called by the vfs when a fopen or open is called within the user or kernel space
- file - this is the file node
- fd   - this is the file descriptor
-
- This format will be changing down the road
- */
-static int devfs_open( char *file, fileDescriptor *fd ) {
-  struct devfs_info *fsInfo = fd->mp->fsInfo;
-  struct devfs_devices *tmpDev = 0x0;
-  struct device_node *device = 0x0;
-
-  spinLock( &devfsSpinLock );
-
-  if ( strcmp( file, "/" ) == 0x0 ) {
-    fd->start = -1;
-    fd->size = devfs_len;
-    spinUnlock( &devfsSpinLock );
-    return (0x1);
-  }
-  if ( file[0] == '/' )
-    file++;
-  for ( tmpDev = fsInfo->deviceList; tmpDev != 0x0; tmpDev = tmpDev->next ) {
-    if ( strcmp( tmpDev->devName, file ) == 0x0 ) {
-      switch ( (fd->mode & 0x3) ) {
-        case 0:
-          case 1:
-          device = device_find( tmpDev->devMajor, tmpDev->devMinor );
-          fd->start = (uint32_t *) tmpDev; /* MrOlsen (2016-01-19) FIX: I Don't Understand This */
-          fd->size = device->devInfo->size;
-          break;
-        default:
-          kprintf( "Invalid File Mode\n" );
-          spinUnlock( &devfsSpinLock );
-          return (-1);
-          break;
-      }
-      spinUnlock( &devfsSpinLock );
-      return (0x1);
-    }
-  }
-  spinUnlock( &devfsSpinLock );
-  return (0x0);
-}
-
-/**
- Function: int readDevFS(fileDescriptor *fd,char *data,long offset,long size)
- Description: Read File Into Data
- Notes:
- */
-static int devfs_read( fileDescriptor *fd, char *data, long offset, long size ) {
-  int i = 0x0, x = 0x0;
-  uInt32 sectors = 0x0;
-  uInt16 diff = 0x0;
-  struct device_node *device = 0x0;
-  struct devfs_devices *tmpDev = (void *) fd->start;
-
-  if ( tmpDev == -1 ) {
-    kprintf( "Hi Ubie [%i]!!!\n", size );
-    for ( i = 0; i < size; i++ ) {
-      data[i] = 'a';
-      fd->buffer[i] = 'a';
-    }
-    data[size - 1] = '\n';
-    return (size);
-  }
-
-  device = device_find( tmpDev->devMajor, tmpDev->devMinor );
-
-  sectors = ((size + 511) / 512);
-  diff = (offset - ((offset / 512) * 512));
-
-  for ( i = 0x0; i < sectors; i++ ) {
-    device->devInfo->read( device->devInfo->info, fd->buffer, i + (offset / 512), 1 );
-    for ( x = 0x0; x < (size - (i * 512)); x++ ) {
-      if ( diff > 0 ) {
-        data[x] = fd->buffer[x + diff];
-      }
-      else {
-        data[x] = fd->buffer[x];
-      }
-    }
-    diff = 0x0;
-    data += 512;
-  }
-
-  return (size);
-}
-
-/************************************************************************
-
- Function: int writeDevFS(fileDescriptor *fd,char *data,long offset,long size)
- Description: Write Data Into File
- Notes:
-
- ************************************************************************/
-static int devfs_write( fileDescriptor *fd, char *data, long offset, long size ) {
-  int i = 0x0, x = 0x0;
-  struct device_node *device = 0x0;
-  struct devfs_devices *tmpDev = (void *) fd->start;
-
-  device = device_find( tmpDev->devMajor, tmpDev->devMinor );
-  for ( i = 0x0; i < ((size + 511) / 512); i++ ) {
-    device->devInfo->read( device->devInfo->info, fd->buffer, i + (offset / 512), 1 );
-    for ( x = 0x0; ((x < 512) && ((x + (i * 512)) < size)); x++ ) {
-      fd->buffer[x] = data[x];
-    }
-    device->devInfo->write( device->devInfo->info, fd->buffer, i + (offset / 512), 1 );
-    data += 512;
-  }
-  return (size);
-}
-
-int devfs_makeNode( char *name, uInt8 type, uInt16 major, uInt16 minor ) {
-  struct vfs_mountPoint *mp = 0x0;
-  struct devfs_info *fsInfo = 0x0;
-  struct devfs_devices *tmpDev = 0x0;
-
-  spinLock( &devfsSpinLock );
-
-  mp = vfs_findMount( "devfs" );
-
-  if ( mp == 0x0 ) {
-    kprintf( "Error: Can't Find Mount Point\n" );
-    spinUnlock( &devfsSpinLock );
-    return (-1);
-  }
-
-  fsInfo = mp->fsInfo;
-
-  tmpDev = (struct devfs_devices *) kmalloc( sizeof(struct devfs_devices) );
-
-  tmpDev->devType = type;
-  tmpDev->devMajor = major;
-  tmpDev->devMinor = minor;
-  sprintf( tmpDev->devName, name );
-  devfs_len += strlen( name ) + 1;
-
-  tmpDev->next = fsInfo->deviceList;
-  tmpDev->prev = 0x0;
-  if ( fsInfo->deviceList != 0x0 ) {
-    fsInfo->deviceList->prev = tmpDev;
-  }
-
-  fsInfo->deviceList = tmpDev;
-
-  spinUnlock( &devfsSpinLock );
-  return (0x0);
-}
-
-int devfs_init() {
-  /* Build our devfs struct */
-  struct fileSystem devFS =
-      { NULL, /* prev        */
-      NULL, /* next        */
-      (void *) devfs_initialize, /* vfsInitFS   */
-      (void *) devfs_read, /* vfsRead     */
-      (void *) devfs_write, /* vfsWrite    */
-      (void *) devfs_open, /* vfsOpenFile */
-      NULL, /* vfsUnlink   */
-      NULL, /* vfsMakeDir  */
-      NULL, /* vfsRemDir   */
-      NULL, /* vfsSync     */
-      1 /* vfsType     */
-      }; /* devFS */
-
-  if ( vfsRegisterFS( devFS ) != 0x0 ) {
-    //sysErr(systemErr,"Unable To Enable DevFS");
-    return (0x1);
-  }
-  /* Mount our devfs this will build the devfs container node */
-  vfs_mount( 0x0, 0x0, 0x0, 0x1, "devfs", "rw" ); // Mount Device File System
-
-  /* Return */
-  return (0x0);
-}
-
-/***
- END
- ***/
diff --git a/sys/fs/devfs/major.txt b/sys/fs/devfs/major.txt
deleted file mode 100644
index 27e323d..0000000
--- a/sys/fs/devfs/major.txt
+++ /dev/null
@@ -1 +0,0 @@
-TTY - 0x10
diff --git a/sys/fs/ubixfs/Makefile b/sys/fs/ubixfs/Makefile
deleted file mode 100644
index f5c44f9..0000000
--- a/sys/fs/ubixfs/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#  Objects
-OBJS = thread.o ubixfs.o directory.o block.o dirCache.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.c.o:
-	$(CC) ${CFLAGS} ${INCLUDES} -W -Wall -c -o $@ $<
-.c.s:
-	$(CC) ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.S.o:
-	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/fs/ubixfs/block.c b/sys/fs/ubixfs/block.c
deleted file mode 100644
index 266f891..0000000
--- a/sys/fs/ubixfs/block.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Log: block.c,v $
- Revision 1.2  2006/12/05 14:10:21  reddawg
- Workign Distro
-
- Revision 1.1.1.1  2006/06/01 12:46:17  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:39  reddawg
- no message
-
- Revision 1.6  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.5  2004/07/23 09:10:06  reddawg
- ubixfs: cleaned up some functions played with the caching a bit
- vfs:    renamed a bunch of functions
- cleaned up a few misc bugs
-
- Revision 1.4  2004/06/04 10:19:42  reddawg
- notes: we compile again, thank g-d anyways i was about to cry
-
- Revision 1.3  2004/05/19 15:20:06  reddawg
- Fixed reference problems due to changes in drive subsystem
-
- Revision 1.2  2004/04/28 02:22:55  reddawg
- This is a fiarly large commit but we are starting to use new driver model
- all around
-
- Revision 1.1.1.1  2004/04/15 12:07:07  reddawg
- UbixOS v1.0
-
- Revision 1.3  2004/04/13 16:36:34  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
-
-
- $Id: block.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixfs/ubixfs.h>
-#include <vfs/file.h>
-#include <vfs/mount.h>
-
-
-void syncBat(struct vfs_mountPoint *mp) {
-  struct ubixFSInfo *fsInfo = mp->fsInfo;
-  mp->device->devInfo->write(mp->device->devInfo->info,fsInfo->blockAllocationTable,mp->diskLabel->partitions[mp->partition].pOffset,mp->diskLabel->partitions[mp->partition].pBatSize);
-  }
-
-int freeBlocks(int block,fileDescriptor *fd) {
-  int i = block;
-  
-  struct ubixFSInfo *fsInfo = fd->mp->fsInfo;
-
-  while (i != 0x0) {
-    block = fsInfo->blockAllocationTable[i].nextBlock;
-        
-    fsInfo->blockAllocationTable[i].attributes = 0x0;
-    fsInfo->blockAllocationTable[i].nextBlock  = 0x0;
-    
-    i = block;
-    }
-  syncBat(fd->mp);
-  return(i);
-  }
-  
-int getFreeBlocks(int count,fileDescriptor *fd) {
-  uInt32 i = 0x0;
-  uInt32 x = 0x0;
-  
-  struct ubixFSInfo *fsInfo = fd->mp->fsInfo;
-
-  getBlocks:
-  for (i=1;i < fsInfo->batEntries;i++) {
-    if (fsInfo->blockAllocationTable[i].attributes == 0x0) {
-      for (x = 1; x < (uInt32)count; x++) {
-        if (fsInfo->blockAllocationTable[i + x].attributes != 0x0) {
-          goto getBlocks;
-          }
-        }
-      for (x = i; x < i+count;x++) {
-        fsInfo->blockAllocationTable[x].attributes = 0x1;
-        if ((x+1) == (i+count)) {
-          fsInfo->blockAllocationTable[x].nextBlock = -1;
-          }
-        else {
-          fsInfo->blockAllocationTable[x].nextBlock  = x+1;
-          }
-        }
-      syncBat(fd->mp);
-      return(i);
-      }
-    }
-  return(0x0);
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/fs/ubixfs/dirCache.c b/sys/fs/ubixfs/dirCache.c
deleted file mode 100644
index cc3e75e..0000000
--- a/sys/fs/ubixfs/dirCache.c
+++ /dev/null
@@ -1,443 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: dirCache.c 169 2016-01-20 01:10:22Z reddawg $
-
- *****************************************************************************************/
-
-#include <assert.h>
-#include <ubixfs/dirCache.h>
-#include <ubixfs/ubixfs.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <lib/string.h>
-
-#include <ubixos/spinlock.h>
-
-static struct spinLock dca_spinLock = SPIN_LOCK_INITIALIZER;
-
-static struct directoryEntry *
-ubixfs_findName( struct directoryEntry * dirList, uInt32 size, char * name ) {
-  unsigned int i;
-
-  if ( dirList == NULL || name == NULL )
-    return NULL;
-  //UBU kprintf("dirList: [0x%X],name: [0x%X]\n",dirList,name);
-  for ( i = 0; i < (size / sizeof(struct directoryEntry)); i++ ) {
-    if ( strcmp( dirList[i].fileName, name ) == 0 )
-      return &dirList[i];
-  } /* for */
-  return NULL;
-} /* ubixfs_findName */
-
-struct cacheNode *
-ubixfs_cacheFind( struct cacheNode * head, char * name ) {
-  struct cacheNode * tmp = head;
-  struct directoryEntry * dirList = NULL;
-  unsigned int i = 0x0;
-  char dirName[256];
-  char * nextDir = NULL;
-  /* kprintf("looking for %s\n", name);  */
-  assert( name );
-  assert( head );
-  assert( *name );
-  spinLock( &dca_spinLock );
-  spinUnlock( &dca_spinLock );
-  if ( name == NULL || head == NULL )
-    return NULL;
-  if ( *name == '\0' )
-    return NULL;
-
-  /*
-   * walk down the tree recursively until we find the node we're looking
-   * for
-   */
-  i = 0;
-  while ( name[i] != '\0' && name[i] != '/' && i < sizeof(dirName) ) {
-    dirName[i] = name[i];
-    i++;
-  } /* while */
-  assert( i < sizeof(dirName) );
-  if ( i == sizeof(dirName) )
-    return NULL;
-
-  if ( i == 0 )
-    dirName[i++] = '/';
-
-  dirName[i] = '\0';
-
-  nextDir = &name[i];
-  if ( *nextDir == '/' )
-    nextDir++;
-
-  /*
-   * nextDir points to the next dir
-   * name points to a null terminated directory name
-   * if nextDir isn't null, then make sure that this dir is present
-   */
-  /* kprintf("nextdir: %s  -- dirName: %s\n", nextDir, dirName); */
-  if ( *nextDir != '\0' ) {
-    while ( tmp != NULL ) {
-      //UBU kprintf("tmp->name: [0x%X],dirName: [0x%X]\n",tmp->name,dirName);
-      if ( strcmp( tmp->name, dirName ) == 0 ) {
-
-        if ( (*tmp->attributes & typeFile) == typeFile
-            || tmp->fileListHead == NULL ) {
-
-          /* if we're here, then there are no subdirs cached to look through */
-          dirList = ubixfs_findName( (struct directoryEntry *) head->info,
-              *head->size, nextDir );
-          if ( dirList == NULL )
-            return NULL;
-          /* kprintf("creating new node %s", dirList->fileName); */
-          tmp = ubixfs_cacheAdd( tmp, ubixfs_cacheNew( dirList->fileName ) );
-          tmp->attributes = &dirList->attributes;
-          tmp->permissions = &dirList->permissions;
-          tmp->size = (int *) &dirList->size;
-          /* kprintf("   size: %d\n", *tmp->size); */
-          tmp->startCluster = &dirList->startCluster;
-          tmp->present = 0;
-          return tmp;
-        }
-        else {
-          return ubixfs_cacheFind( tmp->fileListHead, nextDir );
-        }
-      } /* if */
-      tmp = tmp->next;
-    } /* while */
-    /* it wasn't present, return NULL */
-    return NULL;
-  } /* if */
-
-  /*
-   * if nextDir was null, then we're at the bottom level. Look for the
-   * dir listing here
-   */
-  while ( tmp != NULL ) {
-
-    assert( tmp->name );
-    assert( name );
-    /* don't forget to check to see if it's a directory */
-    //UBU kprintf("tmpName: [0x%X], name: [0x%X]\n",tmp->name,name);
-    if ( strcmp( tmp->name, name ) == 0 ) {
-
-      /*
-       * we found the node. Move it to the front of the list
-       * (if it isn't already)
-       */
-#if 0
-      assert(tmp->parent);
-      if (tmp != tmp->parent->fileListHead) {
-
-        /* if we're the tail, point the tail to our prev */
-        if (tmp == tmp->parent->fileListTail) {
-          tmp->parent->fileListTail = tmp->prev;
-        } /* if */
-
-        if (tmp->next != NULL) tmp->next->prev = tmp->prev;
-        if (tmp->prev != NULL) tmp->prev->next = tmp->next;
-        tmp->next = tmp->parent->fileListHead;
-        tmp->prev = NULL;
-        tmp->parent->fileListHead = tmp;
-      } /* if */
-#endif
-      return tmp;
-    } /* if */
-    tmp = tmp->next;
-  } /* while */
-  /* if we're here, then one level of the dir isn't cached */
-
-  tmp = head->parent;
-  assert( tmp );
-  assert( tmp->info );
-  dirList = ubixfs_findName( (struct directoryEntry *) tmp->info,
-      *tmp->size, name );
-  if ( dirList == NULL )
-    return NULL;
-  /* kprintf("creating new node/size %s/%d", dirList->fileName, dirList->size);*/
-  tmp = ubixfs_cacheAdd( tmp, ubixfs_cacheNew( dirList->fileName ) );
-  tmp->attributes = &dirList->attributes;
-  tmp->permissions = &dirList->permissions;
-  tmp->size = (int *) &dirList->size;
-  /* kprintf("   size: %d\n", *tmp->size); */
-  tmp->startCluster = &dirList->startCluster;
-  tmp->present = 0;
-  return tmp;
-#if 0
-  return NULL; /* couldn't find it */
-#endif
-} /* ubixfs_cacheFind */
-
-struct cacheNode *
-ubixfs_cacheNew( const char * name ) {
-  struct cacheNode * tmp = kmalloc( sizeof(struct cacheNode) );
-  assert( tmp );
-  tmp->parent = tmp;
-  tmp->prev = tmp->next = tmp->fileListHead = tmp->fileListTail = NULL;
-  tmp->info = NULL;
-  tmp->size = NULL;
-  tmp->present = tmp->dirty = 0;
-  tmp->startCluster = NULL;
-  tmp->attributes = NULL;
-  tmp->permissions = NULL;
-  tmp->name = (char *) kmalloc( strlen( name ) + 1 );
-  strcpy( tmp->name, name );
-  return tmp;
-} /* ubixfs_cacheNew */
-
-void
-ubixfs_cacheDelete( struct cacheNode ** head ) {
-  struct cacheNode * tmp = NULL;
-  struct cacheNode * del = NULL;
-
-  if ( head == NULL )
-    return;
-  if ( *head == NULL )
-    return;
-
-  tmp = *head;
-  while ( tmp != NULL ) {
-    /* if there are any child nodes, delete them first */
-
-    /*
-     * the following commented out ``if'' statement is redundant, since it
-     * will be caught with the above checks
-     */
-    /* if (tmp->fileListHead != NULL) */
-    ubixfs_cacheDelete( &tmp->fileListHead );
-
-    kfree( tmp->info );
-    kfree( tmp->name );
-    del = tmp;
-    tmp = tmp->next;
-    kfree( del );
-  } /* while */
-  *head = NULL;
-  return;
-} /* deleteNode */
-#if 0
-void
-addNode(struct cacheNode ** node, struct cacheNode * newNode) {
-  if (node == NULL) return;
-  newNode->next = *node;
-  if (*node != NULL) (*node)->prev = newNode;
-  newNode->prev = NULL;
-  *node = newNode;
-  return;
-} /* addNode */
-#endif
-
-struct cacheNode *
-ubixfs_cacheAdd( struct cacheNode *node, struct cacheNode * newNode ) {
-  struct cacheNode * tmp;
-
-  assert( node );
-  spinLock( &dca_spinLock );
-  newNode->parent = node;
-  newNode->next = node->fileListHead;
-  newNode->prev = NULL;
-  if ( node->fileListHead == NULL )
-    node->fileListTail = newNode;
-  else
-    node->fileListHead->prev = newNode;
-
-  node->fileListHead = newNode;
-  tmp = node->fileListHead;
-  spinUnlock( &dca_spinLock );
-  return tmp;
-} /* ubixfs_cacheAdd */
-
-/***
- $Log: dirCache.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:17  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:40  reddawg
- no message
-
- Revision 1.30  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.29  2004/08/09 12:58:05  reddawg
- let me know when you got the surce
-
- Revision 1.28  2004/08/01 17:58:39  flameshadow
- chg: fixed string allocation bug in ubixfs_cacheNew()
-
- Revision 1.27  2004/07/28 17:24:13  flameshadow
- chg: no comment
-
- Revision 1.26  2004/07/28 17:07:29  flameshadow
- chg: re-added moving cached nodes to the front of the list when found
- add: added an assert() in ubixfs.c
-
- Revision 1.25  2004/07/27 19:24:31  flameshadow
- chg: reduced the number of debugging statements in the kernel.
-
- Revision 1.24  2004/07/27 12:02:01  reddawg
- chg: fixed marks bug readFile did a lookup which is why it looked like it was loopping so much
-
- Revision 1.23  2004/07/27 09:05:43  flameshadow
- chg: fixed file not found bug. Still can't find looping issue
-
- Revision 1.22  2004/07/27 04:05:20  flameshadow
- chg: kinda fixed it. Added bunches of debug info
-
- Revision 1.21  2004/07/25 22:21:52  flameshadow
- chg: re-enabled kprintf() in ubixfs_cacheFind()
-
- Revision 1.20  2004/07/24 17:19:24  flameshadow
- chg: Temporarily disabled the moving of the found cache node to the front
- of the list. It seems to cause problems later (race condition, possibly)
-
- Revision 1.19  2004/07/22 23:01:51  reddawg
- Ok checking in before I sleep
-
- Revision 1.18  2004/07/22 19:54:50  flameshadow
- chg: works now. Thanx ubu
-
- Revision 1.17  2004/07/22 19:01:59  flameshadow
- chg: more directory and file caching
-
- Revision 1.16  2004/07/22 16:34:32  flameshadow
- add: file and dir caching kinda work
-
- Revision 1.15  2004/07/21 22:43:18  flameshadow
- one more try
-
- Revision 1.14  2004/07/21 22:42:25  flameshadow
- try it now
-
- Revision 1.13  2004/07/21 22:40:27  flameshadow
- weird
-
- Revision 1.12  2004/07/21 22:18:37  flameshadow
- chg: renamed subDirsHead/Tail members of cacheNode to fileListHead/Tail
-
- Revision 1.11  2004/07/21 22:12:22  flameshadow
- add: attributes tag in cacheNode
- add: setting of attributes in ubixfx_cacheNew() and ubixfs_cacheFind()
-
- Revision 1.10  2004/07/21 22:07:18  flameshadow
- chg: renamed caching functions (again)
-
- Revision 1.9  2004/07/21 22:00:04  flameshadow
- chg: ubixfws_dirCacheAdd now returns a pointer to the node it added
- chg: minor fix in ubixfs_dirCacheFind()
-
- Revision 1.6  2004/07/21 14:43:14  flameshadow
- add: added cwc (current working container) to the osInfo strut
-
- Revision 1.5  2004/07/20 19:21:30  reddawg
- You like leaving out $Log: dirCache.c,v $
- You like leaving out Revision 1.1.1.1  2006/06/01 12:46:17  reddawg
- You like leaving out ubix2
- You like leaving out
- You like leaving out Revision 1.2  2005/10/12 00:13:37  reddawg
- You like leaving out Removed
- You like leaving out
- You like leaving out Revision 1.1.1.1  2005/09/26 17:24:40  reddawg
- You like leaving out no message
- You like leaving out
- You like leaving out Revision 1.30  2004/08/14 11:23:02  reddawg
- You like leaving out Changes
- You like leaving out
- You like leaving out Revision 1.29  2004/08/09 12:58:05  reddawg
- You like leaving out let me know when you got the surce
- You like leaving out
- You like leaving out Revision 1.28  2004/08/01 17:58:39  flameshadow
- You like leaving out chg: fixed string allocation bug in ubixfs_cacheNew()
- You like leaving out
- You like leaving out Revision 1.27  2004/07/28 17:24:13  flameshadow
- You like leaving out chg: no comment
- You like leaving out
- You like leaving out Revision 1.26  2004/07/28 17:07:29  flameshadow
- You like leaving out chg: re-added moving cached nodes to the front of the list when found
- You like leaving out add: added an assert() in ubixfs.c
- You like leaving out
- You like leaving out Revision 1.25  2004/07/27 19:24:31  flameshadow
- You like leaving out chg: reduced the number of debugging statements in the kernel.
- You like leaving out
- You like leaving out Revision 1.24  2004/07/27 12:02:01  reddawg
- You like leaving out chg: fixed marks bug readFile did a lookup which is why it looked like it was loopping so much
- You like leaving out
- You like leaving out Revision 1.23  2004/07/27 09:05:43  flameshadow
- You like leaving out chg: fixed file not found bug. Still can't find looping issue
- You like leaving out
- You like leaving out Revision 1.22  2004/07/27 04:05:20  flameshadow
- You like leaving out chg: kinda fixed it. Added bunches of debug info
- You like leaving out
- You like leaving out Revision 1.21  2004/07/25 22:21:52  flameshadow
- You like leaving out chg: re-enabled kprintf() in ubixfs_cacheFind()
- You like leaving out
- You like leaving out Revision 1.20  2004/07/24 17:19:24  flameshadow
- You like leaving out chg: Temporarily disabled the moving of the found cache node to the front
- You like leaving out      of the list. It seems to cause problems later (race condition, possibly)
- You like leaving out
- You like leaving out Revision 1.19  2004/07/22 23:01:51  reddawg
- You like leaving out Ok checking in before I sleep
- You like leaving out
- You like leaving out Revision 1.18  2004/07/22 19:54:50  flameshadow
- You like leaving out chg: works now. Thanx ubu
- You like leaving out
- You like leaving out Revision 1.17  2004/07/22 19:01:59  flameshadow
- You like leaving out chg: more directory and file caching
- You like leaving out
- You like leaving out Revision 1.16  2004/07/22 16:34:32  flameshadow
- You like leaving out add: file and dir caching kinda work
- You like leaving out
- You like leaving out Revision 1.15  2004/07/21 22:43:18  flameshadow
- You like leaving out one more try
- You like leaving out
- You like leaving out Revision 1.14  2004/07/21 22:42:25  flameshadow
- You like leaving out try it now
- You like leaving out
- You like leaving out Revision 1.13  2004/07/21 22:40:27  flameshadow
- You like leaving out weird
- You like leaving out
- You like leaving out Revision 1.12  2004/07/21 22:18:37  flameshadow
- You like leaving out chg: renamed subDirsHead/Tail members of cacheNode to fileListHead/Tail
- You like leaving out
- You like leaving out Revision 1.11  2004/07/21 22:12:22  flameshadow
- You like leaving out add: attributes tag in cacheNode
- You like leaving out add: setting of attributes in ubixfx_cacheNew() and ubixfs_cacheFind()
- You like leaving out
- You like leaving out Revision 1.10  2004/07/21 22:07:18  flameshadow
- You like leaving out chg: renamed caching functions (again)
- You like leaving out
- You like leaving out Revision 1.9  2004/07/21 22:00:04  flameshadow
- You like leaving out chg: ubixfws_dirCacheAdd now returns a pointer to the node it added
- You like leaving out chg: minor fix in ubixfs_dirCacheFind()
- You like leaving out
- You like leaving out Revision 1.6  2004/07/21 14:43:14  flameshadow
- You like leaving out add: added cwc (current working container) to the osInfo strut
- You like leaving out so i don't know what is going on eh?
-
- END
- ***/
-
diff --git a/sys/fs/ubixfs/directory.c b/sys/fs/ubixfs/directory.c
deleted file mode 100644
index c407cac..0000000
--- a/sys/fs/ubixfs/directory.c
+++ /dev/null
@@ -1,184 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: directory.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixfs/ubixfs.h>
-#include <vfs/file.h>
-#include <vfs/mount.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <lib/string.h>
-
-static dirList_t dirList = 0x0;
-
-dirList_t 
-ubixFSLoadDir(char *data) {
-  dirList_t tmpDir = 0x0;
-
-  tmpDir = (dirList_t)kmalloc(sizeof(struct directoryList));
-
-  sprintf(tmpDir->dirName,"%s",data);
-
-  if (0x0 == dirList) {
-    dirList = tmpDir;
-    }
-  else {
-    tmpDir->next = dirList;
-    tmpDir->prev = 0x0;
-    dirList->prev = tmpDir;
-    dirList       = tmpDir;
-    }
-
-  if (!strcmp(":",data)) {
-    tmpDir->dirCache = (char *)kmalloc(0x4000);
-    }
-
-  return(tmpDir);
-  }
-
-int 
-addDirEntry(struct directoryEntry *dir,fileDescriptor *fd) {
-  uInt32 i = 0x0;
-  uInt32 entries = 0x0;
-  struct directoryEntry *tmp = 0x0;
-
-  tmp = (struct directoryEntry *)kmalloc(fd->size);
-
-  readUbixFS(fd,(char *)tmp,fd->offset,fd->size);
-  entries = fd->size/sizeof(struct directoryEntry);
-  for (i=0;(tmp[i].attributes != 0x0) && (i < entries);i++);
-
-  if (i == entries) {
-    tmp = (struct directoryEntry *)kmalloc(0x1000);
-    i = 0x0;
-    }
-  else {
-    fd->offset = 0x0;
-    }
-  memcpy(&tmp[i],dir,sizeof(struct directoryEntry));
-  
-  if (writeUbixFS(fd,(char *)tmp,fd->offset,fd->size) == 0x0) {
-    kprintf("Error Creating Directory\n");
-    }
-  
-  return(0x0);
-  }
-
-int 
-ubixFSmkDir(char *directory,fileDescriptor *fd) {
-  int block = 0x0;
-
-  struct directoryEntry *dir   = 0x0;
-  struct directoryEntry *entry = 0x0;
-  struct ubixFSInfo *fsInfo    = fd->mp->fsInfo;
-
-  //kprintf("Creating Directory: %s",directory);
-  
-  block = getFreeBlocks(1,fd);
-  if (block != 0x0) {
-    dir   = (struct directoryEntry *)kmalloc(UBIXFS_BLOCKSIZE_BYTES);
-    entry = (struct directoryEntry *)kmalloc(sizeof(struct directoryEntry));
-
-    entry->startCluster = block;
-    entry->size         = UBIXFS_BLOCKSIZE_BYTES;
-    entry->attributes   = typeDirectory;
-    entry->permissions  = 0xEAA;
-    sprintf(entry->fileName, directory);
-
-    //dir->attributes = typeDirectory;
-    //sprintf(dir->fileName,"Test Entry");
-    
-    fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,
-                       dir,
-                       fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[block].realSector,
-                       blockSize);
-    addDirEntry(entry,fd);
-    kfree(dir);
-    kfree(entry);
-    }
-
-  return(0x0);
-  }
-
-/***
- $Log: directory.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:17  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:41  reddawg
- no message
-
- Revision 1.12  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.11  2004/08/01 17:58:39  flameshadow
- chg: fixed string allocation bug in ubixfs_cacheNew()
-
- Revision 1.10  2004/07/23 09:10:06  reddawg
- ubixfs: cleaned up some functions played with the caching a bit
- vfs:    renamed a bunch of functions
- cleaned up a few misc bugs
-
- Revision 1.9  2004/07/16 20:17:29  flameshadow
- chg: broke the ufs stuff
- chg: changed vfsRegisterFS() to accept a fileSystem struct
- chg: modified calls to vfsRegisterFS() to pass fileSystem struct
-
- Revision 1.8  2004/06/29 03:59:47  reddawg
- Fixed a few issues with subdirectories they are working much better now
-
- Revision 1.7  2004/06/28 23:12:58  reddawg
- file format now container:/path/to/file
-
- Revision 1.6  2004/06/04 13:20:22  reddawg
- ubixFSmkDir(): played with it a bit to see if it still worked
-
- Revision 1.5  2004/06/04 10:19:42  reddawg
- notes: we compile again, thank g-d anyways i was about to cry
-
- Revision 1.4  2004/05/19 15:20:06  reddawg
- Fixed reference problems due to changes in drive subsystem
-
- Revision 1.3  2004/05/19 04:07:43  reddawg
- kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
-
- Revision 1.2  2004/04/28 02:22:55  reddawg
- This is a fiarly large commit but we are starting to use new driver model
- all around
-
- Revision 1.1.1.1  2004/04/15 12:07:07  reddawg
- UbixOS v1.0
-
- Revision 1.6  2004/04/13 16:36:34  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
diff --git a/sys/fs/ubixfs/thread.c b/sys/fs/ubixfs/thread.c
deleted file mode 100755
index 69481e4..0000000
--- a/sys/fs/ubixfs/thread.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: thread.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixfs/ubixfs.h>
-#include <ubixos/kpanic.h>
-#include <vfs/vfs.h>
-#include <lib/kprintf.h>
-
-static struct {
-  int mounts;
-  } ubixFS_Info;
-
-void ubixfs_thread(struct vfs_mountPoint *mp) {
-  mpi_message_t myMsg;
-
-  ubixFS_Info.mounts = 0;
-
-  if (mp == 0x0)
-    kpanic("bah");
-
-  if (mpi_createMbox("ubixfs") != 0x0) {
-    kpanic("Error: Error creating mailbox: ubixfs\n");
-    }
-  while (1) {
-    if (mpi_fetchMessage("ubixfs",&myMsg) == 0x0) {
-      switch(myMsg.header) {
-        default:
-          kprintf("Unhandled Message: %i\n",myMsg.header);
-          break;
-        }
-      }
-    }
-  }
-
-/***
- $Log: thread.c,v $
- Revision 1.2  2006/12/05 14:10:21  reddawg
- Workign Distro
-
- Revision 1.1.1.1  2006/06/01 12:46:17  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:41  reddawg
- no message
-
- Revision 1.3  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.2  2004/07/23 09:10:06  reddawg
- ubixfs: cleaned up some functions played with the caching a bit
- vfs:    renamed a bunch of functions
- cleaned up a few misc bugs
-
- Revision 1.1  2004/06/28 18:12:44  reddawg
- We need these files
-
- END
- ***/
diff --git a/sys/fs/ubixfs/ubixfs.c b/sys/fs/ubixfs/ubixfs.c
deleted file mode 100644
index 1a1e069..0000000
--- a/sys/fs/ubixfs/ubixfs.c
+++ /dev/null
@@ -1,642 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ubixfs.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixfs/ubixfs.h>
-#include <ubixfs/dirCache.h>
-#include <vfs/vfs.h>
-#include <ubixos/sched.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/exec.h>
-#include <lib/kmalloc.h>
-#include <lib/string.h>
-#include <lib/kprintf.h>
-#include <assert.h>
-
-/* Static defines */
-static int ubixfs_loadData(fileDescriptor *fd,char *data,uInt32 size,uInt32 batIndex);
-
-  
-static int openFileUbixFS(const char *file, fileDescriptor *fd) {
-  //int x = 0;
-/* mji  struct directoryEntry *dirEntry = (struct directoryEntry *)kmalloc(0x4000); */
-  struct cacheNode * cacheNode = NULL;
-  //struct directoryEntry * dirEntry = NULL;
-  struct ubixFSInfo *fsInfo = fd->mp->fsInfo;
-  
-
-  
-/* kprintf("openFileUbixFS(%s), cwd: %s\n", file, _current->oInfo.cwd); */
-
-//if (fsInfo->dirCache == NULL) kprintf("dirCache is null!\n");
-  assert(fd);
-  assert(fd->mp);
-  assert(fd->mp->device);
-  assert(fd->mp->device->devInfo);
-  assert(fd->mp->device->devInfo->read);
-  assert(fsInfo);
-  assert(fsInfo->dirCache);
-  assert(file);
-  
-  if ((fd->mode & fileRead) == fileRead) {
-    do {
-      cacheNode = ubixfs_cacheFind(fsInfo->dirCache,(char *) file);
-      if (cacheNode == NULL) return 0;
-      if (cacheNode->present == 1) break;
-      assert(cacheNode->size);
-      if (*cacheNode->size != 0 && cacheNode->info == NULL) {
-        //kprintf("caching name(size): %s(%d)\n",cacheNode->name,*cacheNode->size);
-        cacheNode->info = kmalloc(UBIXFS_ALIGN(*cacheNode->size));
-        fd->size = *cacheNode->size; 
-        assert(cacheNode->startCluster);
-        ubixfs_loadData(fd,
-                        cacheNode->info,
-                        *cacheNode->size,
-                        *cacheNode->startCluster);
-        cacheNode->present = 1;
-      } /* if */
-    } while(1);
-
-    assert(cacheNode);
-    if (cacheNode == NULL) return 0; /* this should be caught above */
-
-    fd->start    = *cacheNode->startCluster;
-    fd->size     = *cacheNode->size;
-    fd->perms    = *cacheNode->permissions;
-    fd->cacheNode = cacheNode; /* Directory Start Sector */
-    /*
-    if (cacheNode->size != 0x0 && cacheNode->info == NULL) {
-      cacheNode->info = kmalloc(UBIXFS_ALIGN(*cacheNode->size));
-      ubixfs_loadData(fd,cacheNode->info,cacheNode->size,cacheNode->startCluster);
-      cacheNode->present = 0x1;
-      }
-     */
-    return(0x1);
-  } 
-  else 
-    if ((fd->mode & fileWrite) == fileWrite) {
-kprintf("Ouch! in filewrite!\n");
-#if 0
-      fd->start    = dirEntry->startCluster;
-      fd->size     = dirEntry->size;
-      fd->perms    = dirEntry->permissions;
-     // fd->dirBlock = 0x0; /* Directory Start Sector */
-#endif
-      return(0x1);
-    }
-    
-  return 0;
-
-  }
-
-int writeFileByte(int ch, fileDescriptor *fd, long offset) {
-
-  int blockCount = 0x0,batIndex = 0x0,batIndexPrev = 0x0;
-  uInt32 i = 0x0;
-  struct directoryEntry *dirEntry = 0x0;
-  struct ubixFSInfo *fsInfo = NULL;
-
-  assert(fd);
-  assert(fd->mp);
-  assert(fd->mp->diskLabel);
-
-  batIndexPrev = fd->start;
-  fsInfo = fd->mp->fsInfo;
-
-  /* Find Out How Many Blocks Long This File Is */
-  blockCount = (offset/4096);
-  
-  /* Find The Block If It Doesn't Exist We Will Have To Allocate One */
-  for (i=0x0; i <= fd->mp->diskLabel->partitions[fd->mp->partition].pBatSize;
-       i++) {
-    batIndex = fsInfo->blockAllocationTable[batIndexPrev].nextBlock;
-    if (batIndex == 0x0) {
-      break;
-      }
-    batIndexPrev = batIndex;
-    }
-
-  if ((offset%4096 == 0) && (fd->status == fdRead)) {
-      fd->status = fdOpen;
-      }    
-
-  /* If batIndex == 0x0 Then We Must Allocate A New Block */
-  if (batIndex == 0x0) {
-    for (i=1;i < fsInfo->batEntries;i++) {
-      if (fsInfo->blockAllocationTable[i].attributes == 0x0) {
-        fsInfo->blockAllocationTable[batIndexPrev].nextBlock = i;
-        fsInfo->blockAllocationTable[batIndex].nextBlock     = -1;
-        batIndex  = i;
-        fd->start = i;
-        break;
-        }
-      }
-    /* fd->mp->drive->read(fd->mp->drive->driveInfoStruct,diskLabel->partitions[0].pOffset+blockAllocationTable[batIndex].realSector,8,fd->buffer); */
-    fd->buffer[offset-(blockCount*4096)] = ch;
-    fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[batIndex].realSector,8);
-    }
-  else {
-    if (fd->status != fdRead) {    
-      fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[batIndex].realSector,8);
-      fd->status = fdRead;
-      }
-    fd->buffer[offset-(blockCount*4096)] = ch;
-    fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[batIndex].realSector,8);
-    }    
-  if ((uInt32)offset > fd->size) {
-    fd->size = offset;
-    dirEntry = (struct directoryEntry *)kmalloc(4096);
-  /*
-    fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,dirEntry,(fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[fd->dirBlock].realSector),8);
-  */
-    for (i=0x0;i<(4096/sizeof(struct directoryEntry));i++) {
-      if ((int)!strcmp(dirEntry[i].fileName,fd->fileName))
-        break;
-      }  
-    dirEntry[i].size = fd->size;
-/*
-    fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,dirEntry,(fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[fd->dirBlock].realSector),8);
-*/
-    kfree(dirEntry);
-    }
-  return(ch);
-  }
-
-/* Verified Functions */
-
-    
-int readUbixFS(fileDescriptor *fd,char *data,uInt32 offset,long size) {
-  int i = 0x0;
-  char *buffer = 0x0;
-  struct ubixFSInfo *fsInfo = NULL;
-
-  assert(fd);
-  assert(fd->mp);
-  assert(fd->mp->fsInfo);
-
-  fsInfo = fd->mp->fsInfo;
-  
-  if (fd->cacheNode->present != 1) 
-    kpanic("ERROR with cache node\n");
-    
-  buffer = (char *)fd->cacheNode->info;
-  
-  for (i=0x0; i<size; i++) {
-    if (offset > fd->size) {
-      /* Set File EOF If There Is Nothing To Do */
-      /* data[i] = '\0'; Is this safe? */
-      fd->status = fdEof;
-      return(size);
-      }
-    /* Copy Data From Buffer To Data */
-    data[i] = buffer[i + offset];
-    }
-  /* Return */
-  return(size);
-  }
-
-
-/************************************************************************
-
-Function: int writeUbixFS(fileDescriptor *fd,char *data,long offset,long size)
-Description: Write Data Into File
-Notes:
-
-************************************************************************/
-int writeUbixFS(fileDescriptor *fd,char *data,long offset,long size) {
-  uInt32 blockOffset    = 0x0;
-  uInt32 blockIndex;
-  uInt32 blockIndexPrev;
-  uInt32 i              = 0x0;
-  struct ubixFSInfo *fsInfo = NULL;
-  struct directoryEntry *dirEntry = 0x0;
-
-  assert(fd);
-  assert(fd->mp);
-  assert(fd->mp->fsInfo);
-  assert(fd->mp->device);
-  assert(fd->mp->device->devInfo);
-
-  blockIndex = blockIndexPrev = fd->start;
-  fsInfo = fd->mp->fsInfo;
-
-  blockOffset = (offset/0x1000);
-
-  if (fd->size != 0x0) {
-    for (i = 0x0;i < blockOffset;i++) {
-      blockIndex = fsInfo->blockAllocationTable[blockIndexPrev].nextBlock;
-        if ((int)blockIndex == EOBC) {
-          blockIndex = getFreeBlocks(1,fd);
-          fsInfo->blockAllocationTable[blockIndexPrev].nextBlock = blockIndex;
-          fsInfo->blockAllocationTable[blockIndex].nextBlock = EOBC;
-          break;
-          }
-        blockIndexPrev = blockIndex;
-      }
-    }
-
-  fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize);
-  for (i = 0x0;i < (uInt32)size;i++) {
-
-    fd->buffer[(offset- (blockOffset *0x1000))] = data[i];
-    offset++;
-
-    if (offset%4096 == 0x0) {
-      blockOffset++;
-      fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize);
- 
-      if (fsInfo->blockAllocationTable[blockIndex].nextBlock == EOBC) {
-        blockIndexPrev = blockIndex;
-        blockIndex = getFreeBlocks(1,fd);
-        fsInfo->blockAllocationTable[blockIndexPrev].nextBlock = blockIndex;
-        fsInfo->blockAllocationTable[blockIndex].nextBlock     = EOBC;
-        }
-      else {
-        blockIndex = fsInfo->blockAllocationTable[blockIndex].nextBlock;
-        fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize);
-        }
-      }
-    }
-  fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,fd->buffer,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[blockIndex].realSector,blockSize);
-
-  if ((uInt32)offset > fd->size) {
-    fd->size = offset;
-    dirEntry = (struct directoryEntry *)kmalloc(4096);
-/*
-    fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,dirEntry,(fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[fd->dirBlock].realSector),blockSize);
-*/
-    for (i=0x0;i<(4096/sizeof(struct directoryEntry));i++) {
-      if ((int)!strcmp(dirEntry[i].fileName,fd->fileName))
-        break;
-      }
-    dirEntry[i].size = fd->size;
-    dirEntry[i].startCluster = fd->start;
-/*
-    fd->mp->device->devInfo->write(fd->mp->device->devInfo->info,dirEntry,(fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[fd->dirBlock].realSector),blockSize);
-*/
-    kfree(dirEntry);
-    }
-  /* Return */
-  return(size);
-  }
-
-void ubixFSUnlink(char *path,struct vfs_mountPoint *mp) {
-  int x=0;
-  struct directoryEntry *dirEntry = (struct directoryEntry *)kmalloc(0x1000);
-  struct ubixFSInfo *fsInfo = mp->fsInfo;
-  
-  mp->device->devInfo->read(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8);
-
-  for (x=0;(uInt32)x<(4096/sizeof(struct directoryEntry));x++) {
-    if ((int)!strcmp(dirEntry[x].fileName,path)) {
-      dirEntry[x].attributes |= typeDeleted;
-      dirEntry[x].fileName[0] = '?';
-      mp->device->devInfo->write(mp->device->devInfo->info,dirEntry,(mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),8);
-      return;
-      }
-    }
-  kprintf("File Not Found\n");
-  return;
-  }
-  
-  
-/*****************************************************************************************
-
-Function: static
-          int ubixfs_loadData(fileDescriptor *fd,char *data,uInt32 size,uInt32 batIndex)
-
-Description: This will load the node data in from the disk
-
-Notes:
-  07/23/2004 - This loads complete blocks from disk so it is aligned to 0x1000 not the
-               actual file size
-
-*****************************************************************************************/    
-static int ubixfs_loadData(fileDescriptor *fd,char *data,uInt32 size,uInt32 batIndex) {
-  uInt32 i = 0x0;
-
-  struct ubixFSInfo *fsInfo = NULL;
-
-  assert(fd);
-  assert(fd->mp);
-  assert(fd->mp->fsInfo);
-
-  fsInfo = fd->mp->fsInfo;
-
-  size = UBIXFS_ALIGN(size);
-  /* Loop by block size */
-  
-  for (i=0x0; i<size; i += (UBIXFS_BLOCKSIZE_BYTES)) {
-  /* Get next block if we are ready for it */
-    if (i != 0x0)
-      batIndex = fsInfo->blockAllocationTable[batIndex].nextBlock;
-  /* Read data in from media */
-    fd->mp->device->devInfo->read(fd->mp->device->devInfo->info,data+i,fd->mp->diskLabel->partitions[fd->mp->partition].pOffset+fsInfo->blockAllocationTable[batIndex].realSector,blockSize);
-    }
-  /* Return */
-  return(0x0);
-  }
-
-
-/*****************************************************************************************
-
-Function: int ubixfs_initialize()
-
-Description: This will initialize a mount point it loads the BAT and Caches the rootDir
-
-Notes:
-
-*****************************************************************************************/  
-int ubixfs_initialize(struct vfs_mountPoint *mp) {
-  struct ubixFSInfo *fsInfo = 0x0;
-
-  assert(mp);
-  assert(mp->diskLabel);
-  assert(mp->diskLabel->partitions);
-
-  mp->fsInfo = (struct ubixFSInfo *)kmalloc(sizeof(struct ubixFSInfo));
-  assert(mp->fsInfo);
-  
-  fsInfo = mp->fsInfo;
-  fsInfo->rootDir = 0x0; /* Root directory is always 0x0 on the UbixFS */
-  
-  /*
-   Check the disk label to ensure this is an UbixFS partition
-  */
-  if ((mp->diskLabel->magicNum == UBIXDISKMAGIC) &&  (mp->diskLabel->magicNum2 == UBIXDISKMAGIC)) {
-    
-    /* Allocate memory for BAT */
-    fsInfo->blockAllocationTable = (struct blockAllocationTableEntry *)kmalloc(mp->diskLabel->partitions[mp->partition].pBatSize * 512);
-    assert(fsInfo->blockAllocationTable);
-
-    /* Set up the amount of BAT entries */
-    fsInfo->batEntries = (mp->diskLabel->partitions[mp->partition].pBatSize*512) / sizeof(struct blockAllocationTableEntry);
-
-    /* Read the BAT to memory */
-    assert(mp->device->devInfo->read);
-    mp->device->devInfo->read(mp->device->devInfo->info, 
-                             fsInfo->blockAllocationTable,
-                             mp->diskLabel->partitions[mp->partition].pOffset,
-                             mp->diskLabel->partitions[mp->partition].pBatSize);
-    
-    /* Set up root directory cache */
-    fsInfo->dirCache = ubixfs_cacheNew("/");
-    assert(fsInfo->dirCache);
-    fsInfo->dirCache->info = (struct directoryEntry *)kmalloc(0x4000);  /* allocate root dir */
-    fsInfo->dirCache->present = 1;
-    fsInfo->dirCache->size = kmalloc(sizeof(fsInfo->dirCache->size));
-    fsInfo->dirCache->startCluster = kmalloc(sizeof(fsInfo->dirCache->startCluster));
-    fsInfo->dirCache->attributes = kmalloc(sizeof(fsInfo->dirCache->attributes));
-    fsInfo->dirCache->permissions = kmalloc(sizeof(fsInfo->dirCache->permissions));
-
-    *fsInfo->dirCache->size = 0x4000;
-    *fsInfo->dirCache->startCluster = fsInfo->rootDir;
-    
-    assert(fsInfo->dirCache->info);
-    /* Read root dir in from disk it is always 0x4000 bytes long */
-    mp->device->devInfo->read(mp->device->devInfo->info,
-                              fsInfo->dirCache->info,
-                              (mp->diskLabel->partitions[mp->partition].pOffset+fsInfo->blockAllocationTable[fsInfo->rootDir].realSector),
-                              0x4000 / 512);
-
-    /* Start our ubixfs_thread to manage the mount point */
-    /*
-    UBU disable for now
-    execThread(ubixfs_Thread,(uInt32)(kmalloc(0x2000)+0x2000),0x0);
-    */
-    kprintf("  Offset: [%i], Partition: [%i]\n",
-    mp->diskLabel->partitions[mp->partition].pOffset,mp->partition);
-    kprintf("UbixFS Initialized\n");
-    return(0x1);
-    }
-    
-  kprintf("Not a valid UbixFS disk.\n");
-  /* Return */
-  return(0x0);
-  }
-  
-/*****************************************************************************************
-
-Function: int ubixfs_init()
-
-Description: This is the master initialization for the Ubix File System it will make the
-             OS UbixFS aware.
-             It does not in any way shape or form connect a mount point an medium that is
-             upto the ubixfs_initialize() function
-
-Notes:
-
-*****************************************************************************************/  
-int ubixfs_init() {
-  /* Set up our file system structure */
-  struct fileSystem ubixFileSystem = 
-   {NULL,                         /* prev        */
-    NULL,                         /* next        */
-    (void *)ubixfs_initialize,    /* vfsInitFS   */
-    (void *)readUbixFS,           /* vfsRead     */
-    (void *)writeUbixFS,          /* vfsWrite    */
-    (void *)openFileUbixFS,       /* vfsOpenFile */
-    (void *)ubixFSUnlink,         /* vfsUnlink   */
-    (void *)ubixFSmkDir,          /* vfsMakeDir  */
-    NULL,                         /* vfsRemDir   */
-    NULL,                         /* vfsSync     */
-    0                             /* vfsType     */
-   }; /* ubixFileSystem */
-
-  /* Add UbixFS */
-  if (vfsRegisterFS(ubixFileSystem) != 0x0) {
-    kpanic("Unable To Enable UbixFS");
-    return(0x1);
-    }
-
-  /* Return */
-  return(0x0);
-  }
-
-/***
- $Log: ubixfs.c,v $
- Revision 1.2  2006/12/05 14:10:21  reddawg
- Workign Distro
-
- Revision 1.1.1.1  2006/06/01 12:46:17  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:42  reddawg
- no message
-
- Revision 1.44  2004/08/26 22:51:19  reddawg
- TCA touched me :( i think he likes men....
-
-
- sched.h:        kTask_t added parentPid
- endtask.c:     fixed term back to parentPid
- exec.c:          cleaned warnings
- fork.c:            fixed term to childPid
- sched.c:         clean up for dead tasks
- systemtask.c: clean up dead tasks
- kmalloc.c:       cleaned up warnings
- udp.c:            cleaned up warnings
- bot.c:             cleaned up warnings
- shell.c:           cleaned up warnings
- tcpdump.c:     took a dump
- hd.c:             cleaned up warnings
- ubixfs.c:        stopped prning debug info
-
- Revision 1.43  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.42  2004/08/09 12:58:05  reddawg
- let me know when you got the surce
-
- Revision 1.41  2004/08/01 17:58:39  flameshadow
- chg: fixed string allocation bug in ubixfs_cacheNew()
-
- Revision 1.40  2004/07/28 17:07:29  flameshadow
- chg: re-added moving cached nodes to the front of the list when found
- add: added an assert() in ubixfs.c
-
- Revision 1.39  2004/07/27 19:24:31  flameshadow
- chg: reduced the number of debugging statements in the kernel.
-
- Revision 1.38  2004/07/27 12:02:01  reddawg
- chg: fixed marks bug readFile did a lookup which is why it looked like it was loopping so much
-
- Revision 1.37  2004/07/27 09:05:43  flameshadow
- chg: fixed file not found bug. Still can't find looping issue
-
- Revision 1.36  2004/07/27 04:05:20  flameshadow
- chg: kinda fixed it. Added bunches of debug info
-
- Revision 1.35  2004/07/26 19:15:49  reddawg
- test code, fixes and the like
-
- Revision 1.34  2004/07/24 23:04:44  reddawg
- Changes... mark let me know if you fault at pid 185 when you type stress
-
- Revision 1.33  2004/07/23 09:10:06  reddawg
- ubixfs: cleaned up some functions played with the caching a bit
- vfs:    renamed a bunch of functions
- cleaned up a few misc bugs
-
- Revision 1.32  2004/07/22 23:01:51  reddawg
- Ok checking in before I sleep
-
- Revision 1.31  2004/07/22 22:37:03  reddawg
- Caching is working now the FS is extremely fast but needs to be optimized to do 32bit copies over 8bit
-
- Revision 1.30  2004/07/22 19:01:59  flameshadow
- chg: more directory and file caching
-
- Revision 1.29  2004/07/22 16:34:32  flameshadow
- add: file and dir caching kinda work
-
- Revision 1.28  2004/07/21 22:07:18  flameshadow
- chg: renamed caching functions (again)
-
- Revision 1.27  2004/07/21 21:08:05  flameshadow
- add: added provisions for file caching
-
- Revision 1.26  2004/07/20 23:21:31  flameshadow
- syncing
-
- Revision 1.25  2004/07/20 21:39:53  reddawg
- ubixfs: does propper caching now problem was you did not seek realSector however the os starts but I am getting a segfault could be from anything haven't looked into it right quick
-
- Revision 1.24  2004/07/20 21:38:08  flameshadow
- try now
-
-
- Revision 1.23  2004/07/20 21:35:09  reddawg
- Let me commit before we start to overlap
-
- Revision 1.22  2004/07/20 21:28:16  flameshadow
- oops
-
- Revision 1.20  2004/07/20 19:36:49  reddawg
- UBU Tags
-
- Revision 1.19  2004/07/20 18:09:37  flameshadow
- add: directory caching related stuff
-
- Revision 1.18  2004/07/17 03:21:34  flameshadow
- chg: cleaned up code; added assert() statements
-
- Revision 1.15  2004/07/14 12:21:49  reddawg
- ubixfs: enableUbixFs to ubixfs_init
- Changed Startup Routines
-
- Revision 1.14  2004/06/28 23:12:58  reddawg
- file format now container:/path/to/file
-
- Revision 1.13  2004/06/28 18:12:44  reddawg
- We need these files
-
- Revision 1.12  2004/06/28 11:57:58  reddawg
- Fixing Up Filesystem
-
- Revision 1.10  2004/06/04 13:20:22  reddawg
- ubixFSmkDir(): played with it a bit to see if it still worked
-
- Revision 1.9  2004/06/04 10:19:42  reddawg
- notes: we compile again, thank g-d anyways i was about to cry
-
- Revision 1.8  2004/06/01 00:04:53  reddawg
- Try now mark
-
- Revision 1.7  2004/05/19 15:20:06  reddawg
- Fixed reference problems due to changes in drive subsystem
-
- Revision 1.6  2004/05/19 04:07:43  reddawg
- kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
-
- Revision 1.5  2004/04/29 15:45:19  reddawg
- Fixed some bugs so now the automade images will work correctly
-
- Revision 1.4  2004/04/28 21:10:40  reddawg
- Lots Of changes to make it work with existing os
-
- Revision 1.3  2004/04/28 13:33:09  reddawg
- Overhaul to ubixfs and boot loader and MBR to work well with our schema
- now BAT and dir and file entries are all offset 64Sectors from the start of the partition
-
- Revision 1.2  2004/04/28 02:22:55  reddawg
- This is a fiarly large commit but we are starting to use new driver model
- all around
-
- Revision 1.1.1.1  2004/04/15 12:07:08  reddawg
- UbixOS v1.0
-
- Revision 1.31  2004/04/13 16:36:34  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
-
diff --git a/sys/fs/ubixfsv2/Makefile b/sys/fs/ubixfsv2/Makefile
deleted file mode 100644
index d6baf3f..0000000
--- a/sys/fs/ubixfsv2/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-# Application Makefile (C) 2002-2004 The UbixOS Project
-
-#Linker
-LD = ld
-
-#Binary File Name
-BINARY = ubixfs
-
-#Delete Program
-REMOVE = rm -f
-
-#Objects
-OBJS = main.o vfs.o ubixfs.o btree.o ramdrive.o
-
-#Includes
-INCLUDES = -I./include -I./
-
-#CFLAGS
-
-CFLAGS = -O3
-
-all: $(BINARY)
-
-# Link The Binary
-$(BINARY) : $(OBJS)
-	$(CXX) $(CFLAGS) -o $@ $(OBJS)
-
-# Compile the source files
-.cpp.o:
-	$(CXX)  -ggdb -W -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-.cc.o:
-	$(CXX)  -W -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-.cc.s:
-	$(CXX)  -W -Wall $(CFLAGS) $(INCLUDES) -S -o $@ $<
- 
-.c.o:
-	$(CC)  -W -Wall $(CFLAGS) $(INCLUDES) -c -o $@ $<
- 
-.c.s:
-	$(CC)  -W -Wall $(CFLAGS) $(INCLUDES) -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall $(CLFAGS) $(INCLUDES) -c -o $@ $<
- 
-# Clean Up The junk
-clean:
-	$(REMOVE) $(OBJS) $(BINARY) *.core
diff --git a/sys/fs/ubixfsv2/btree.cpp b/sys/fs/ubixfsv2/btree.cpp
deleted file mode 100644
index 114018d..0000000
--- a/sys/fs/ubixfsv2/btree.cpp
+++ /dev/null
@@ -1,767 +0,0 @@
-// http://www.cs.msstate.edu/~cs2314/global/BTreeAnimation/algorithm.html
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <iostream>
-#include <assert.h>
-#include "btree.h"
-#include "ubixfs.h"
-
-using namespace std;
-#define VERIFY(x, y, z, n) if ((x) != (y)) { cout << "verify " << z << " failed" << endl; PrintWholeTree(); }
-
-bTree::bTree(UbixFS * filesystem, fileDescriptor * myfd) {
-  size_t result = 0;
-
-  root = NULL;
-  tag = 0;
-  fs = filesystem;
-  fd = myfd;
-  header = new bTreeHeader;
-  assert(header);
-  memset(header, 0, sizeof(bTreeHeader));
-  assert(fs);
-  result = fs->vfs_read(fd, header, 0, sizeof(bTreeHeader));
-  assert(result == sizeof(bTreeHeader));
-
-  // If there are any files in this dir, load the first node of the b+tree
-  if (header->treeLeafCount != 0) {
-    assert(header->firstNodeOffset != 0);
-    root = new bNode;
-    assert(root);
-    result = fs->vfs_read(fd, root, header->firstNodeOffset, sizeof(bNode));
-    assert(result == sizeof(bNode));
-  } // if 
-
-} // bTree::bTree
-
-bTree::bTree(const char * key, ubixfsInode * inode) {
-/* once the FS and the bTree are interfaced, this should go away */
-  root = NULL;
-  tag = 0;
-  header = new bTreeHeader;
-  assert(header);
-  memset(header, 0, sizeof(bTreeHeader));
-  header->treeDepth = 1;
-  header->treeWidth = 0;
-  header->treeLeafCount = 0;
-  header->firstDeleted = -1;
-  header->firstNodeOffset = sizeof(bTreeHeader);
-
-  if (inode == NULL) return;
-  root = allocEmptyNode();
-  if (root == NULL) return;
-  root->used = 1;
-  root->parent.bPtr = NULL;
-  root->leaf = true;
-  root->childCount[1] = 1;
-
-// cout << "---Creating " << inode->name << "@" << inode << endl;
-  strncpy(root->keys[0], key, B_MAX_NAME_LENGTH);
-  // insert pointer to data page to the right of the data
-  root->head[1].iPtr = inode;
-  root->tail[1].iPtr = inode;
-
-  root->present[1] = true;
-  if (inode != NULL) {
-    inode->next.bPtr = inode->prev.bPtr = NULL;
-  } // if
-  return;
-} // bTree:bTree
-
-bool
-bTree::Insert(const char * key, ubixfsInode * inode) {
-  bNode * bnode = root;
-  ubixfsInode * tmpInode = NULL;
-  unsigned int curSlot = 0;
-
-  if (inode == NULL) return false;
- 
-  // note: this code is right out of the constructor
-  if (root == NULL) {
-    if (header == NULL) header = new bTreeHeader;
-    assert(header);
-    memset(header, 0, sizeof(bTreeHeader));
-    header->treeDepth = 1;
-    header->treeWidth = 0;
-    header->treeLeafCount = 0;
-    header->firstDeleted = -1;
-    header->firstNodeOffset = sizeof(bTreeHeader);
-
-    root = allocEmptyNode();
-    assert(root);
-    if (root == NULL) return false;
-    
-    root->used = 1;
-    root->parent.bPtr = NULL;
-    root->leaf = true;
-    root->childCount[1] = 1;
-
-    strncpy(root->keys[0], key, B_MAX_NAME_LENGTH);
-    // insert pointer to data page to the right of the data
-    root->head[1].iPtr = inode;
-    root->tail[1].iPtr = inode;
-
-    root->present[1] = true;
-    inode->next.iPtr = inode->prev.iPtr = NULL;
-    return true;
-  } // if
-    
-  tmpInode = Find(key);
-  if (tmpInode != NULL) return false;
-//  PrintWholeTree();
-// cout << "Insert(" << key << ")" << endl;
-//Info(bnode);
-  ++header->treeLeafCount;
-  /*
-   * Find the leaf node the inode goes into
-   */
-  assert(bnode->used);
-// cout << "---Inserting " << inode->name << " @ " << inode << endl; 
-  while (bnode != NULL && !bnode->leaf) {
-    if (strcmp(key, bnode->keys[0]) < 0) {
-      bnode = bnode->head[0].bPtr;
-    } else {
-      if (strcmp(key, bnode->keys[bnode->used-1]) >= 0) {
-        bnode = bnode->head[bnode->used].bPtr;
-      } else {
-        for (unsigned int i = 1; i < bnode->used; i++) {
-          if (strcmp(key, bnode->keys[i]) < 0) {
-            bnode = bnode->head[i].bPtr;
-            break;
-          } // if
-        } // for i
-      } // else
-    }
-  } // while
-
-  /*
-   *
-   */
-
-assert(bnode);
-if (bnode->leaf != true) cout << "leafnode!=true" << endl;
-assert(inode);
-
-  if (strcmp(key, bnode->keys[curSlot = 0]) < 0)
-    tmpInode = bnode->head[curSlot].iPtr;
-  else
-    if (strcmp(key, bnode->keys[(curSlot = bnode->used)-1]) >= 0)
-      tmpInode = bnode->head[bnode->used].iPtr;
-    else {
-      for (curSlot = 1; curSlot < bnode->used; curSlot++) {
-        if (strcmp(key, bnode->keys[curSlot]) < 0) {
-          tmpInode = bnode->head[curSlot].iPtr;
-          break;
-        } // if
-      } // for curSlot
-      tmpInode = bnode->head[curSlot].iPtr;
-    } // else
-
-
-  if (tmpInode == NULL) {
-    /*
-     * This is the first node in this leaf
-     */
-    bnode->head[curSlot].iPtr = bnode->tail[curSlot].iPtr = inode;
-    bnode->present[curSlot] = true;
-
-    if (curSlot == 0) {
-
-      if (bnode->head[1].iPtr != NULL)  {
-        ubixfsInode * iptr = bnode->head[1].iPtr;
-        inode->prev.iPtr = iptr->prev.iPtr;
-        inode->next.iPtr = iptr;
-        iptr->prev.iPtr = inode;
-        if (inode->prev.iPtr != NULL) 
-          inode->prev.iPtr->next.iPtr = inode;
-      } else {
-        inode->next.iPtr = inode->prev.iPtr = NULL;
-      } // else
-
-    } else {
-      ++bnode->used; 
-    } // else
-
-  } else {
-    /*
-     * Add node to leaf page. Scan through to find where it goes.
-     */
-    if (strcmp(key, bnode->head[curSlot].iPtr->name) < 0)
-    {
-
-      inode->next.iPtr = bnode->head[curSlot].iPtr;
-      inode->prev.iPtr = inode->next.iPtr->prev.iPtr;
-      inode->next.iPtr->prev.iPtr = inode;
-      if (inode->prev.iPtr != NULL) inode->prev.iPtr->next.iPtr = inode;
-      bnode->head[curSlot].iPtr = inode;
-
-    } else {
-
-      if (strcmp(key, bnode->tail[curSlot].iPtr->name) > 0) {
-
-        inode->prev.iPtr = bnode->tail[curSlot].iPtr;
-        inode->next.iPtr = inode->prev.iPtr->next.iPtr;
-        inode->prev.iPtr->next.iPtr = inode;
-
-        if (inode->next.iPtr != NULL) inode->next.iPtr->prev.iPtr = inode;
-        bnode->tail[curSlot].iPtr = inode;
-
-      } else {
-
-
-        ubixfsInode * tmpInode = bnode->head[curSlot].iPtr;
-        for (unsigned int i = 0; i < bnode->childCount[curSlot]; i++) {
-          if (strcmp(key, tmpInode->name) < 0) {
-            inode->next.iPtr = tmpInode;
-            inode->prev.iPtr = tmpInode->prev.iPtr;
-            inode->next.iPtr->prev.iPtr = inode;
-            inode->prev.iPtr->next.iPtr = inode;
-            break;
-          } // if
-          tmpInode = tmpInode->next.iPtr; 
-        } // for i
-
-      } // else
-
-    } // else
-
-  } // else
-
-
-
-  if (++bnode->childCount[curSlot] == B_MAX_CHILD_COUNT) {
-
-// cout << "---- before split ----" << endl;
-// Info(bnode);
-
-    if (curSlot != bnode->used) {
-      int shift = bnode->used - curSlot +1;
-
-      memmove(&bnode->head[curSlot+1],
-              &bnode->head[curSlot],
-              sizeof(bnode->head[0]) * shift);
-      memmove(&bnode->tail[curSlot+1],
-              &bnode->tail[curSlot],
-              sizeof(bnode->tail[0]) * shift);
-      memmove(&bnode->present[curSlot+1],
-              &bnode->present[curSlot],
-              sizeof(bnode->present[0]) * shift);
-      memmove(&bnode->childCount[curSlot+1],
-              &bnode->childCount[curSlot],
-              sizeof(bnode->childCount[0]) * shift);
-
-      memmove(&bnode->keys[curSlot+1],
-              &bnode->keys[curSlot],
-              sizeof(bnode->keys[0]) * (shift-1));
-      memset(bnode->keys[curSlot], 0, B_MAX_NAME_LENGTH);
-    } else {
-      bnode->head[curSlot+1] = bnode->head[curSlot];
-      bnode->tail[curSlot+1] = bnode->tail[curSlot];
-      bnode->childCount[curSlot+1] = bnode->childCount[curSlot];
-      bnode->present[curSlot+1] = bnode->present[curSlot];
-    } // else
-
-    ubixfsInode * tmpInode = bnode->head[curSlot].iPtr;
-
-    for (unsigned int i = 0; i < (B_MAX_CHILD_COUNT+1) >> 1; i++) {
-      assert(tmpInode);
-      tmpInode = tmpInode->next.iPtr;
-    } // for i
-
-    strncpy(bnode->keys[curSlot], tmpInode->name, B_MAX_NAME_LENGTH);
-    bnode->head[curSlot+1].iPtr = tmpInode;
-    bnode->tail[curSlot].iPtr = tmpInode->prev.iPtr;
-    bnode->childCount[curSlot] = (B_MAX_CHILD_COUNT+1) >> 1;
-    bnode->childCount[curSlot+1] -= bnode->childCount[curSlot];
-    bnode->present[curSlot] = true;
-    ++header->treeWidth;
-    if (++bnode->used == B_MAX_KEYS) splitNode(bnode);
-
-  } // if leaf is full
-// Info(bnode);
-  return true;
-} // bTree::Insert
-
-void 
-bTree::splitNode(bNode * oldNode) {
-  ubixfsInode * tmpInode = NULL;
-  assert(oldNode);
-  if (oldNode == NULL) return;
-  if (oldNode->used != B_MAX_KEYS) return;
-
-  bNode * newNode = allocEmptyNode();
-  if (newNode == NULL) return;
-
-  unsigned int shift = B_MAX_KEYS >> 1;
-  unsigned int splitLoc = B_MAX_KEYS - shift;
-  ++ shift;
-// cout << "oldNode before split: " << endl;
-// Info(oldNode);
-// cout << "splitLoc: " << splitLoc << endl;
-// cout << "shift: " << shift << endl;
-
-  newNode->used = oldNode->used = B_MAX_KEYS >> 1;
-  newNode->parent.bPtr = oldNode->parent.bPtr;
-  newNode->leaf = oldNode->leaf;
-
-// cout << "newNode->used: " << newNode->used << endl;
-// cout << "oldNode->used: " << oldNode->used << endl;
-
-  memcpy(&newNode->keys[0],
-         &oldNode->keys[splitLoc],
-         sizeof(newNode->keys[0]) * (shift-1));
-  
-  memset(&oldNode->keys[splitLoc], 0, sizeof(newNode->keys[0]) * (shift-1));
-
-  memcpy(&newNode->present[0],
-         &oldNode->present[splitLoc],
-         sizeof(newNode->present[0]) * shift);
-
-  memset(&oldNode->present[splitLoc], 0, sizeof(newNode->present[0]) * shift);
-
-  memcpy(&newNode->head[0],
-         &oldNode->head[splitLoc],
-         sizeof(newNode->head[0]) * shift);
-
-  memset(&oldNode->head[splitLoc], 0, 
-         sizeof(newNode->head[0]) * shift);
-
-  memcpy(&newNode->tail[0],
-         &oldNode->tail[splitLoc],
-         sizeof(newNode->tail[0]) * shift);
-
-  memset(&oldNode->tail[splitLoc], 0, 
-         sizeof(newNode->tail[0]) * shift);
-
-  memcpy(&newNode->childCount[0],
-         &oldNode->childCount[splitLoc],
-         sizeof(newNode->childCount[0]) * shift);
-
-  memset(&oldNode->childCount[splitLoc], 0, 
-         sizeof(newNode->childCount[0]) * shift);
-
-  if (!newNode->leaf) {
-    for (unsigned int i = 0; i <= newNode->used; i++) {
-      newNode->head[i].bPtr->parent.bPtr = newNode;
-    } // for i
-  } // if newNode isn't a leaf
-
-  tmpInode = GetFirstNode(newNode);
-  assert(tmpInode);
-
-  if (oldNode == root) {
-    // allocate a new root node
-    ++header->treeDepth;
-    root = allocEmptyNode();
-    oldNode->parent.bPtr = root;
-    newNode->parent.bPtr = root;
- //   strncpy(root->keys[0], newNode->keys[0], B_MAX_NAME_LENGTH);
-    strncpy(root->keys[0], tmpInode->name, B_MAX_NAME_LENGTH);
-    root->head[0].bPtr = oldNode;
-    root->tail[0].bPtr = root->tail[1].bPtr = NULL;
-    root->head[1].bPtr = newNode;
-    root->used = 1;
-    root->leaf = false;
-    root->present[0] = root->present[1] = true;
-    root->childCount[0] = root->childCount[1] = 0;
-//    root->childCount[0] = oldNode->used;
-//    root->childCount[1] = newNode->used;
-
-// cout << "parent" << endl;
-// Info(newNode->parent);
-// cout << "oldNode" << endl;
-// Info(oldNode);
-// cout << "-----" << endl;
-// cout << "newNode" << endl;
-// Info(newNode);
-// cout << "-----" << endl;
-
-  } else {
-    insertNode(newNode->parent.bPtr, tmpInode->name, newNode);
-   // if (oldNode->parent->used == B_MAX_KEYS) splitNode(oldNode->parent);
-  } // else
-  return;
-} // bTree::splitNode
-
-void
-bTree::insertNode(bNode * node, const char * key, bNode * headPtr) {
-  unsigned int curSlot = 0;
-  if (node == NULL || key == NULL) return;
-
-  if (strcmp(key, node->keys[node->used-1]) >= 0){
-    curSlot = node->used;
-    memset(node->keys[curSlot], 0, B_MAX_NAME_LENGTH);
-    strncpy(node->keys[curSlot], key, B_MAX_NAME_LENGTH);
-    node->head[curSlot+1].bPtr = headPtr;
-    node->tail[curSlot+1].bPtr = NULL;
-    node->present[curSlot+1] = true;
-    node->childCount[node->used] = 0; // maybe?
-
-  } else {
-
-    for (curSlot = 0; curSlot < node->used; curSlot++) {
-      if (strcmp(key, node->keys[curSlot]) < 0) break;
-    } // for 
-
-    /*
-     * note that there is one more item for everything but keys
-     * So, make the shift count +1 and just subtract it from the key shift
-     * later
-     */
-    int shift = node->used - curSlot +1;
-
-    memmove(&node->head[curSlot+1],
-            &node->head[curSlot],
-            sizeof(node->head[0]) * shift);
-    memmove(&node->tail[curSlot+1],
-            &node->tail[curSlot],
-            sizeof(node->tail[0]) * shift);
-    memmove(&node->present[curSlot+1],
-            &node->present[curSlot],
-            sizeof(node->present[0]) * shift);
-    memmove(&node->childCount[curSlot+1],
-            &node->childCount[curSlot],
-            sizeof(node->childCount[0]) * shift);
-
-    memmove(&node->keys[curSlot+1],
-            &node->keys[curSlot],
-            sizeof(node->keys[0]) * (shift-1));
-    
-    memset(node->keys[curSlot], 0, B_MAX_NAME_LENGTH);
-    strncpy(node->keys[curSlot], key, B_MAX_NAME_LENGTH);
-    node->head[curSlot+1].bPtr = headPtr;
-    node->tail[curSlot+1].bPtr = NULL;
-    node->present[curSlot+1] = true;
-//    node->childCount[node->used] = ?;
-  } // else 
-  if (++node->used == B_MAX_KEYS) splitNode(node); 
-  return;
-} // bTree::insertNode
-
-bNode *
-bTree::allocEmptyNode(void) {
-  bNode * newNode = new bNode;
-
-  memset(newNode, 0, sizeof(bNode));
-  newNode->magic1 = B_NODE_MAGIC_1;
-  newNode->magic2 = B_NODE_MAGIC_2;
-  newNode->parent.bPtr = NULL;
-  newNode->tag = ++tag; // this will start at 1 (0 is the header node)
-  return newNode;
-} // bTree::allocEmptyNode
-
-void
-bTree::Info(const bNode * node) {
-  ubixfsInode * inode = NULL;
-  if (node == NULL || root == NULL) return;
-  cout <<  node << " | " << node->parent.bPtr << endl;
-  for (unsigned int i = 0; i <= node->used; i++) {
-    inode = node->head[i].iPtr;
-//    cout << "(" << node->childCount[i] << ")";
-    for (unsigned int k = 0; k < node->childCount[i]; k++) {
-      cout << "[" << inode->name << "]";
-      inode = inode->next.iPtr;
-    } // for k
-    if (i != node->used) cout << " {" << node->keys[i] << "} ";
-  } // for i
-  cout << endl;
-  return;
-#if 0
-  for (unsigned int i = 0; i < node->used; i++) {
-    cout << "keys[" << i << "]: " << node->keys[i] << "  ";
-  } // for i
-  cout << endl;
-  cout << "node->used: " << node->used << endl;
-  cout << "leaf: " << node->leaf << endl;
-  for (unsigned int i = 0; i <= node->used; i++) {
-    inode = (ubixfsInode *)node->head[i];
-cout << "node->childCount["<<i<<"]: " << node->childCount[i] << endl;
-    for (unsigned int j = 0; j < node->childCount[i]; j++) {
-      assert(inode);
-      cout << "[" << i << "].[" << j << "]->" << inode->name << endl;
-      inode = inode->next;
-    } // for j
-  } // for i
-#endif
-} // bTree::Info
-
-void
-bTree::Info(void) {
-  ubixfsInode * inode = NULL;
-
-  cout << "tree depth: " << header->treeDepth << endl;
-  cout << "tree width: " << header->treeWidth << endl;
-  cout << "tree leaf count: " << header->treeLeafCount << endl;
-  cout << "tag: " << tag << endl;
-
-  if (root == NULL) return;
-
-  for (unsigned int i = 0; i <= root->used; i++) {
-    cout << "CC[" << i << "]: " << root->childCount[i] << "  ";
-  } // for i
-
-  cout << endl;
-  for (unsigned int i = 0; i <= root->used; i++) {
-    cout << "CH[" << i << "]: " << root->head[i].bPtr << "  ";
-  } // for i
-
-  cout << endl;
-  for (unsigned int i = 0; i <=root->used; i++) {
-    cout << "CT[" << i << "]: " << root->tail[i].bPtr << "  ";
-  } // for i
-  cout << endl;
-  for (unsigned int i = 0; i < root->used; i++) {
-    cout << "keys[" << i << "]: " << root->keys[i] << "  ";
-  } // for i
-  cout << endl;
-
-cout << "root->used: " << root->used << endl;
-    for (unsigned int i = 0; i <= root->used; i++) {
-      inode = root->head[i].iPtr;
-cout << "root->childCount["<<i<<"]: " << root->childCount[i] << endl;
-    if (root->leaf) {
-cout << "root contains leaf node" << endl;
-      for (unsigned int j = 0; j < root->childCount[i]; j++) {
-        assert(inode);
-        cout << "[" << i << "].[" << j << "]->" << inode->name << endl;
-        inode = inode->next.iPtr;
-      } // for j
-    } // if root->leaf
-  } // for i
-} // bTree::Info
-
-void
-bTree::Print(void) {
-  ubixfsInode * node = GetFirstNode();
-  while (node != NULL) {
-    cout << node->name << endl;
-    node = node->next.iPtr;
-  }
-} // bTree::Print
-
-ubixfsInode *
-bTree::Find(const char * key) {
-/*
-  ubixfsInode * tmp = GetFirstNode();
-  while (tmp!=NULL) {
-    if (strcmp(tmp->name, key) == 0) return tmp;
-    tmp = tmp->next.iPtr;
-  }
-  return NULL;
-*/
-  return treeSearch(root, key);
-} // bTree::Find
-
-ubixfsInode *
-bTree::inodeSearch(ubixfsInode * inode, const char * key) {
-  if (inode == NULL || key == NULL) return NULL;
-  int result = strcmp(inode->name, key);
-  if (result == 0) return inode;
-
-  if (result < 0) {
-    inode = inode->next.iPtr;
-    while (inode != NULL && ((result = strcmp(inode->name, key)) < 0)) {
-      inode = inode->next.iPtr;
-    } // while
-  } else {
-    inode = inode->prev.iPtr;
-    while (inode != NULL && ((result = strcmp(inode->name, key)) > 0)) {
-      inode = inode->prev.iPtr;
-    } // while
-  } // else
-  return (result == 0 ? inode : NULL);
-} // bTree::inodeSearch
-
-ubixfsInode *
-bTree::treeSearch(bNode * bnode, const char * key) {
-
-  if (bnode == NULL || key == NULL || bnode->used == 0) return NULL;
- 
-  if (bnode->leaf) 
-    return inodeSearch(GetFirstNode(bnode), key);
-
-  if (strcmp(key, bnode->keys[0]) < 0) {
-    return treeSearch(bnode->head[0].bPtr, key);
-  } // if
-
-  if (strcmp(key, bnode->keys[bnode->used-1]) >= 0) {
-    return treeSearch(bnode->head[bnode->used].bPtr, key);
-  } // if
-
-  for (unsigned int i = 1; i < bnode->used; i++) {
-    if (strcmp(key, bnode->keys[i]) < 0) {
-      return treeSearch(bnode->head[i].bPtr, key);
-    } // if
-  } // for i
-
-  return NULL;
-} // bTree::treeSearch
-
-ubixfsInode * 
-bTree::GetFirstNode(void) {
-  return GetFirstNode(root);
-} // bTree::GetFirstNode
-
-ubixfsInode *
-bTree::GetFirstNode(bNode * node) {
-  bNode * tmpNode = node;
-
-  if (tmpNode == NULL) return NULL;
-
-  while (!tmpNode->leaf) {
-    for (unsigned int i = 0; i < tmpNode->used; i++) {
-      if (tmpNode->head[i].bPtr != NULL) {
-        tmpNode = tmpNode->head[i].bPtr;
-        break;
-      }  // if
-    } // for i
-  } // while
-
-  for (unsigned int i = 0; i < tmpNode->used; i++) {
-    if (tmpNode->head[i].iPtr != NULL) return tmpNode->head[i].iPtr;
-  } // for i
-  return NULL;
-} // bTree::GetFirstNode
-
-bNode *
-bTree::findLeafNode(bNode * node, const char * key) {
-  assert(node);
-  assert(key);
-  if (node == NULL || key == NULL) return NULL;
-  assert(node->used);
-  if (node->leaf) return node;
-
-  if (strcmp(key, node->keys[0]) < 0) 
-    return findLeafNode(node->head[0].bPtr, key);
-
-  if (strcmp(key, node->keys[node->used-1]) >= 0) 
-    return findLeafNode(node->head[node->used].bPtr, key);
-  
-  for (unsigned int i = 1; i < node->used; i++) {
-    if (strcmp(key, node->keys[i]) < 0) 
-      return findLeafNode(node->head[i].bPtr, key);
-  } // for i
-  
-  return NULL;
-} // bTree::findLeafNode
-
-void
-bTree::saveNode(FILE * fd, bNode * node, void * tmpPtr) {
- 
-  bNode * ptr = (bNode *)tmpPtr;
-  assert(tmpPtr);
-  assert(fd);
-  assert(node);
-  cout << "writing tag: " << node->tag << endl;
-
-  memcpy(tmpPtr, node, sizeof(bNode));  
-
-  if (node->parent.bPtr != NULL)
-    ptr->parent.offset = node->parent.bPtr->tag * sizeof(bNode);
-  else
-    ptr->parent.offset = 0;
-
-  for (unsigned int i = 0; i <= node->used; i++) {
-    bNode * bPtr = node->head[i].bPtr;
-
-    if (bPtr != NULL)
-      ptr->head[i].offset = bPtr->tag * sizeof(bNode);
-    else
-      ptr->head[i].offset = ~0;
-    ptr->present[i] = false;
-  } // for i
-  
-  if (node->leaf) {
-
-    for (unsigned int i = 0; i <= node->used; i++) {
-  //    ubixfsInode * inode = node->head[i].iPtr;
-  // mji    if (inode != NULL) tmp->head[i] = inode->
-    } // for i
-  } else {
-
-    for (unsigned int i = 0; i <= node->used; i++) {
-
-      if (node->head[i].bPtr != NULL) saveNode(fd, node->head[i].bPtr, tmpPtr);
-
-    } // for i
-
-  } // else
-
-  return;
-} // bTree::saveNode 
-
-bool 
-bTree::Save(const char * filename) {
-  ubixfsInode * uPtr = NULL;
-  if (filename == NULL) return false;
-  FILE * fd = NULL;
-  if ((fd = fopen(filename, "wb+")) == NULL) return false;
-
-cout << "tags: " << tag << endl;
-  lseek(fileno(fd), tag * sizeof(bNode), SEEK_END);
-
-  header->firstNodeOffset = sizeof(bNode);
-  header->firstDeleted = -1;
-  void * tmpPtr = malloc(sizeof(bNode));
-  assert(tmpPtr);
-  uPtr = (ubixfsInode *)tmpPtr;
-  memset(tmpPtr, 0, sizeof(bNode));
-  fwrite(header, sizeof(bTreeHeader), 1, fd); 
-  saveNode(fd, root, tmpPtr);
-  
-  fclose(fd);
-  free(tmpPtr);
-  return true;
-} // bTree::Save
-
-bool
-bTree::Load(const char * filename) {
-  if (filename == NULL) return false;
-  return true;
-} // bTree::Load
-
-bool
-bTree::Delete(const char * key) {
-
-  if (key == NULL) return false;
-  return true;
-} // bTree::Delete
-
-bool
-bTree::Verify(void) {
-  ubixfsInode * node = GetFirstNode();
-  if (node == NULL) return true;
- 
-  while (node != NULL) {
-    ubixfsInode * next = node->next.iPtr;
-    if (next != NULL) {
-  //  cout << node->name << "::" << node->next->name << ":::" << strcmp(node->name, node->next->name) << endl;
-      if (strcmp(node->name, next->name) > 0) return false;
-    }
-    node = next;
-  } // while
-  return true;
-} // bTree::Verify
-
-void 
-bTree::Print(bNode * node) {
-  if (node == NULL) return;
-  Info(node);
-  if (!node->leaf)
-    for (unsigned int i = 0; i <= node->used; i++) {
-      Print(node->head[i].bPtr);
-    } // for i
-} // bTree::Print
-
-void
-bTree::PrintWholeTree(void) {
-  Print(root);
-} // bTree::PrintWholeTree;
-
-bTree::~bTree(void) {
-  cout << "tree depth: " << header->treeDepth << endl;
-  cout << "tree width: " << header->treeWidth << endl;
-  cout << "tree leaf count: " << header->treeLeafCount << endl;
-} // bTree::~bTree
diff --git a/sys/fs/ubixfsv2/btree.h b/sys/fs/ubixfsv2/btree.h
deleted file mode 100644
index edd28ee..0000000
--- a/sys/fs/ubixfsv2/btree.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef BTREE_H
-#define BTREE_H
-
-#include <stdio.h>
-
-#include "ubixfs.h"
-#include "btreeheader.h"
-#include "file.h"
-
-#define B_NODE_MAGIC_1 0xDEADBEEF
-#define B_NODE_MAGIC_2 0x1900BABE
-
-#define B_MAX_KEYS 15
-#define B_MAX_NAME_LENGTH 240
-#define B_MAX_CHILD_COUNT 4
-
-// if any of these structs change they have to be updated in the format
-// utility too
-
-typedef struct bNode { 
-  uInt32  magic1                          __attribute__ ((packed));
-  uInt32  used                            __attribute__ ((packed));
-  uPtr    parent                          __attribute__ ((packed));
-  uInt64  tag                             __attribute__ ((packed));
-  char    keys[B_MAX_KEYS][B_MAX_NAME_LENGTH]      __attribute__ ((packed));
-  bool    present[B_MAX_KEYS+1]           __attribute__ ((packed));
-  uPtr    head[B_MAX_KEYS+1]              __attribute__ ((packed));
-  uPtr    tail[B_MAX_KEYS+1]              __attribute__ ((packed));
-  uInt32   childCount[B_MAX_KEYS+1]        __attribute__ ((packed));
-  uInt32  magic2                          __attribute__ ((packed));
-  bool    leaf                            __attribute__ ((packed));
-  char reserved[131] __attribute__ ((packed));
-} bNode; // bNode
-
-struct ubixfsInode;
-
-class bTree {
- protected:
-  bNode          * root;
-  UbixFS         * fs;
-  bTreeHeader    * header;
-  fileDescriptor * fd;
-  uInt32           tag;
-  ubixfsInode    * treeSearch(bNode *, const char *);
-  ubixfsInode    * inodeSearch(ubixfsInode *, const char *);
-  void             splitNode(bNode *);
-  bNode          * allocEmptyNode(void);
-  void             insertNode(bNode *, const char *, bNode *);
-  bNode          * findLeafNode(bNode *, const char *);
-  void             Print(bNode *);
-  void             saveNode(FILE *, bNode *, void *);
- public:
-                   bTree(const char *, ubixfsInode *);
-                   bTree(UbixFS *, fileDescriptor *);
-  ubixfsInode    * Find(const char *);
-  ubixfsInode    * GetFirstNode(void);
-  ubixfsInode    * GetFirstNode(bNode *);
-  bool             Delete(const char *);
-  void             Info(void);
-  void             Info(const bNode *);
-  bool             Insert(const char *, ubixfsInode *);
-  bool             Save(const char *);
-  bool             Load(const char *);
-  void             Print(void);
-  void             PrintWholeTree(void);
-  bool             Verify(void);
-                  ~bTree(void);
-  friend class UbixFS;
-}; // bTree
-#endif // !BTREE_H
diff --git a/sys/fs/ubixfsv2/btreeheader.h b/sys/fs/ubixfsv2/btreeheader.h
deleted file mode 100644
index be72012..0000000
--- a/sys/fs/ubixfsv2/btreeheader.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef BTREEHEADER_H
-#define BTREEHEADER_H
-
-typedef struct bTreeHeader {
-  uInt32 treeDepth;
-  uInt32 treeWidth;
-  uInt32 treeLeafCount;
-  off_t  firstNodeOffset; // used when tree is on disk
-  off_t  firstDeleted;    // used to point to an empty node
-  char paddington[4068];
-} bTreeHeader; // bTreeHeader
-
-#endif /* !BTREEHEADER_H */
diff --git a/sys/fs/ubixfsv2/device.h b/sys/fs/ubixfsv2/device.h
deleted file mode 100644
index fe3d82f..0000000
--- a/sys/fs/ubixfsv2/device.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: device.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _DEVICE_H
-#define _DEVICE_H
-
-// #include <ubixos/types.h>
-#include <sys/types.h>
-#include "types.h"
-
-struct device_node {
-  struct device_node      *prev;
-  struct device_node      *next;
-  struct device_t            *devInfo;
-  struct device_resource  *devRec;
-  char                     type;
-  int                      minor;
-  };
-  
-struct device_resource {
-  uInt8 irq;
-  };
-
-typedef struct device_t {
-  int    major;
-  void  *info;
-  uInt32 sectors;
-  int  (*read)(device_t *, void *, off_t, size_t);
-  int  (*write)(device_t *, void *, off_t, size_t);
-  int  (*reset)(void *);
-  int  (*init)(device_t *);
-  void (*ioctl)(void *);
-  void (*stop)(void *);
-  void (*start)(void *);
-  void (*standby)(void *);
-  };
-
-#endif
-
-/***
- $Log: device.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:38  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:44  reddawg
- no message
-
- Revision 1.4  2004/09/20 00:53:04  flameshadow
- chg: UbixFS::vfs_read() now works for direct block extents
- chg: UbixFS::vfs_read() returns ~0 on error, or the size read in on success
- chg: UbixFS::root member is now a fileDescriptor
- chg: UbixFS::vfs_init() creates a file descriptor for the root dir
- chg: UbixFS::vfs_format() now sets all values in the bTreeHeader before writing
- chg: UbixFS::vfs_format() sets the inode magic number
- chg: device_t::read(device_t *, void *, off_t, size_t)
- chg: device_t::write(device_t *, void *, off_t, size_t)
- chg: vfs_abstract::vfs_read(fileDescriptor *, void *, off_t, size_t)
- chg: vfs_abstract::vfs_write(fileDescriptor *, void *, off_t, size_t)
- chg: ramDrive_read(device_t *dev,void *ptr,off_t offset,size_t length)
- chg: ramDrive_write(device_t *dev,void *ptr,off_t offset,size_t length)
-
- Revision 1.3  2004/09/13 15:21:26  flameshadow
- add: ramdrive.h
- chg: renamed device_t.size to sectors
- chg: made #define for size of ramdisk
- chg: calculated sectors of ramdisk and stored in the device_t struct
-
- Revision 1.2  2004/09/11 22:05:59  flameshadow
- chg: modified UbixFS::vfs_format() to properly init the device
- chg: modified UbixFS::vfs_init() to verify that it's a ubixfs partition
- add: added BAT blockRun in the superBlock
-
- Revision 1.1  2004/09/11 12:43:42  flameshadow
- add: device.h, types.h. Temporarily moved custom ubix typedefs to types.h
-      (<ubixos/types.h> supercedes this file when this code is included into
-      the kernel)
- chg: changed dev_t to device_interface so as to not conflict with bsd/linux
-      definitions
- chg: fixed up compiler warnings in btree.cpp
-
- Revision 1.14  2004/08/15 00:33:02  reddawg
- Wow the ide driver works again
-
- Revision 1.13  2004/08/14 21:56:44  reddawg
- Added initialized byte to the device system to make it easy to add child devices which use parent hardware.
-
- Revision 1.12  2004/07/21 10:02:09  reddawg
- devfs: renamed functions
- device system: renamed functions
- fdc: fixed a few potential bugs and cleaned up some unused variables
- strol: fixed definition
- endtask: made it print out freepage debug info
- kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost
- ld: fixed a pointer conversion
- file: cleaned up a few unused variables
- sched: broke task deletion
- kprintf: fixed ogPrintf definition
-
- Revision 1.11  2004/05/22 02:40:04  ionix
-
-
- fixed typo in device.h and initialized previous in device.c :)
-
- Revision 1.10  2004/05/22 02:34:03  ionix
-
-
- Added proto
-
- Revision 1.9  2004/05/21 15:12:17  reddawg
- Cleaned up
-
-
- END
- ***/
-
diff --git a/sys/fs/ubixfsv2/file.h b/sys/fs/ubixfsv2/file.h
deleted file mode 100644
index 7d8f1f3..0000000
--- a/sys/fs/ubixfsv2/file.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef FILE_H
-#define FILE_H
-
-#include "ubixfs.h"
-
-typedef struct fileDescriptor {
-  struct fileDescriptor * prev;
-  struct fileDescriptor * next;
-  void * inode;
-  off_t  offset;
-  size_t size;
-} fileDescriptor;
-
-#endif /* !FILE_H */
diff --git a/sys/fs/ubixfsv2/fsAbstract.h b/sys/fs/ubixfsv2/fsAbstract.h
deleted file mode 100644
index 9658881..0000000
--- a/sys/fs/ubixfsv2/fsAbstract.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef FSABSTRACT_H
-#define FSABSTRACT_H
-
-#include <stdio.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <device.h>
-#include "file.h"
-
-class vfs_abstract {
- protected:
-  vfs_abstract * prev;
-  vfs_abstract * next;
-  device_t * device;
- public: 
-  /* File I/O */
-  virtual int     vfs_open(const char *, fileDescriptor *,int,...) { return -1; };
-  virtual int     vfs_close(fileDescriptor *) { return -1; };
-  virtual size_t  vfs_read(fileDescriptor *, void *, off_t, size_t) 
-                  { return 0; };
-  virtual size_t  vfs_write(fileDescriptor *, void *, off_t, size_t) 
-                  { return 0; };
-
-  /* Dir I/O */
-  virtual int     vfs_opendir(DIR *,const char *) { return -1; };
-  virtual int     vfs_closedir(DIR *) { return -1; };
-  virtual int     vfs_mkdir(const char *, mode_t) { return -1; };
-  virtual int     vfs_rmdir(const char *) { return -1; };
-  virtual int     vfs_readdir(DIR *,struct dirent *) { return -1; };
-
-  /* FS Functions */
-  virtual int     vfs_init(void) { return -1; };
-  virtual int     vfs_format(device_t *) { return -1; };
-  virtual void *  vfs_mknod(const char *, mode_t) { return NULL; };
-  virtual int     vfs_purge(void) { return -1; };
-  virtual int     vfs_stop(void) { return -1; };
-  virtual int     vfs_sync(void) { return -1; };
-
-  /* Misc Functions */
-  virtual int     vfs_unlink(const char *) { return -1; };
-  virtual int     vfs_rename(const char *,const char *) { return -1; };
-
-  virtual     ~vfs_abstract(void) { };
-}; // vfs_FS
-
-#endif // !FSABSTRACT_H
diff --git a/sys/fs/ubixfsv2/main.cpp b/sys/fs/ubixfsv2/main.cpp
deleted file mode 100644
index 8bdff45..0000000
--- a/sys/fs/ubixfsv2/main.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <iostream>
-#include <vector>
-#include <stdlib.h>
-#include "vfs.h"
-#include "btree.h"
-#include "ubixfs.h"
-#include "device.h"
-#include "ramdrive.h"
-using namespace std;
-
-int
-main(void) {
-
-  device_t * ramDrive = dev_ramDrive();
-  UbixFS * fs = new UbixFS(ramDrive);
-  fs->vfs_format(ramDrive);
-  fs->vfs_init(); 
-  fs->vfs_mkdir("/testdir", 0);
-  fs->vfs_stop();
-  dev_ramDestroy();
-
-#if 0
-  int i = 0;
-  ubixfsInode * inode = (ubixfsInode *)malloc(sizeof(ubixfsInode));
-  memset(inode, 0, sizeof(ubixfsInode));
-  strcpy(inode -> name, "50");
-  bTree * tree = new bTree(".", inode);
-
-  for (i = 0; i < 100; i++) {
-//  while (tree->Verify()) {
-//    if (i%1000 == 0) cout << "-_- i = "<<i<<" -_-" << endl;
-    inode = (ubixfsInode *)malloc(sizeof(ubixfsInode));
-    if (inode == NULL) break;
-    memset(inode, 0, sizeof(ubixfsInode));
-    for (int k = 0; k < (random() % 100)+5; k++) {
-//    for (int k = 0; k < 100; k++) {
-      inode->name[k] = (char)((random() % 26)+'a');
-    } // for k
-//     tree->Insert(inode);
-    if (!tree->Insert(inode->name, inode)) cout << "Insert(" << inode->name << ") failed" << endl;
-//    ++i;
-  } // for i
-//  cout << "i made it to: " << i << endl;
-
-  i = 0;
-  ubixfsInode * tmpInode = tmpInode = tree->GetFirstNode();
-  if (tmpInode == NULL) cout << "GetFirstNode() returns null" << endl;
-  while (tmpInode != NULL) {
-    //cout << "node[" << i++ << "]: " << tmpInode->name << endl;
-    cout << tmpInode->name << endl;
-    tmpInode = tmpInode->next.iPtr;
-  } // while
-
-
-//  tree->Info();
-  tree->Save("tree.dat");
-  free(inode);
-  delete tree;
-#endif
-  cout << "sizeof(bNode): " << sizeof(struct bNode) << endl;
-  cout << "sizeof(ubixfsInode): " << sizeof(struct ubixfsInode) << endl;
-  cout << "sizeof(diskSuperBlock): " << sizeof(struct diskSuperBlock) << endl;
-  cout << "sizeof(bTreeHeader): " << sizeof(struct bTreeHeader) << endl;
-  return 0;
-}
diff --git a/sys/fs/ubixfsv2/ramdrive.cpp b/sys/fs/ubixfsv2/ramdrive.cpp
deleted file mode 100644
index 2ecc2d7..0000000
--- a/sys/fs/ubixfsv2/ramdrive.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ramdrive.cpp 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include "device.h"
-
-
-static char *ram_data = 0x0;
-
-#define RAM_DRIVE_SIZE 1024*1024*100
-
-static 
-int 
-ramDrive_read(device_t *dev,void *ptr,off_t offset,size_t length) {
-  char *data = ram_data + (offset*512);
-  assert(ram_data);
-  assert(offset+length <= dev->sectors); 
-  memcpy(ptr, data, length * 512);
-  
-  return(length);
-}
-  
-static 
-int  
-ramDrive_write(device_t *dev,void *ptr,off_t offset,size_t length) {
-  char *data = ram_data + (offset*512);
-  assert(ram_data);
-
-  assert(offset+length <= dev->sectors); 
-  
-  memcpy(data, ptr, length * 512);
-  
-  return(length);
-}
-  
-device_t *
-dev_ramDrive(void) {
-  device_t *ramDrive = 0x0;
-  
-  FILE *ramDisk;
-  
-  ramDisk = fopen("./ram.dsk","rb");
-
-  ramDrive = (device_t *)malloc(sizeof(device_t));
-  
-  ram_data = (char *)malloc(RAM_DRIVE_SIZE);
-  
-  if (ramDisk != 0x0) {
-    printf("Loaded Ram Disk\n");
-    fread(ram_data,RAM_DRIVE_SIZE,1,ramDisk);
-    fclose(ramDisk);
-    }
-  
-  ramDrive->major = 0x1;
-  ramDrive->sectors = RAM_DRIVE_SIZE / 512;
-  
-  ramDrive->read = ramDrive_read;
-  ramDrive->write = ramDrive_write;
-  
-  printf("leaving dev_ramDrive()\n");
-  return(ramDrive);
-
-} // dev_ramDrive
-  
-int 
-dev_ramDestroy(void) {
-  printf("dev_ramDestroy()\n");
-  FILE *ramDisk;
-  
-  ramDisk = fopen("./ram.dsk","wb");
-  
-  fwrite(ram_data, RAM_DRIVE_SIZE ,1,ramDisk);
-  
-  fclose(ramDisk);
-  
-  printf("Saved Ram Disk\n");
-  
-  return(0x0);
-} // dev_ramDestroy
-
-/***
- $Log: ramdrive.cpp,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:38  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:45  reddawg
- no message
-
- Revision 1.5  2004/09/20 00:53:04  flameshadow
- chg: UbixFS::vfs_read() now works for direct block extents
- chg: UbixFS::vfs_read() returns ~0 on error, or the size read in on success
- chg: UbixFS::root member is now a fileDescriptor
- chg: UbixFS::vfs_init() creates a file descriptor for the root dir
- chg: UbixFS::vfs_format() now sets all values in the bTreeHeader before writing
- chg: UbixFS::vfs_format() sets the inode magic number
- chg: device_t::read(device_t *, void *, off_t, size_t)
- chg: device_t::write(device_t *, void *, off_t, size_t)
- chg: vfs_abstract::vfs_read(fileDescriptor *, void *, off_t, size_t)
- chg: vfs_abstract::vfs_write(fileDescriptor *, void *, off_t, size_t)
- chg: ramDrive_read(device_t *dev,void *ptr,off_t offset,size_t length)
- chg: ramDrive_write(device_t *dev,void *ptr,off_t offset,size_t length)
-
- Revision 1.4  2004/09/13 20:10:11  flameshadow
- chg: UbixFS::vfs_format() works
- chg: UbixFS::vfs_init() works
-
- Revision 1.3  2004/09/13 15:48:29  flameshadow
- chg: oops, the ramDrive is 100MB, not 512MB
-
- Revision 1.2  2004/09/13 15:21:26  flameshadow
- add: ramdrive.h
- chg: renamed device_t.size to sectors
- chg: made #define for size of ramdisk
- chg: calculated sectors of ramdisk and stored in the device_t struct
-
- Revision 1.1  2004/09/13 14:37:49  flameshadow
- add: ramdrive.cpp
- chg: added ramdrive to the makefile
- chg: finished root dir inode initialization and saving in UbixFS::format()
-
- Revision 1.8  2004/08/30 13:29:08  reddawg
- Fixed ramdisk to write/read 512 blocks
-
- Revision 1.7  2004/08/13 22:06:54  reddawg
- UbixFS: fixed the test shell
-
- Revision 1.6  2004/08/13 21:47:49  reddawg
- Fixed
-
- Revision 1.5  2004/08/13 17:25:06  reddawg
- Testing better
-
- Revision 1.4  2004/08/13 17:07:32  reddawg
- Works
-
- Revision 1.3  2004/08/13 16:58:57  reddawg
- test
-
- Revision 1.2  2004/08/13 16:54:14  reddawg
- fixed
-
- Revision 1.1  2004/08/13 16:51:55  reddawg
- Start of ubixfs shell
-
- END
- ***/
-
diff --git a/sys/fs/ubixfsv2/ramdrive.h b/sys/fs/ubixfsv2/ramdrive.h
deleted file mode 100644
index 647969e..0000000
--- a/sys/fs/ubixfsv2/ramdrive.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ramdrive.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef __RAMDRIVE_H_
-#define __RAMDRIVE_H_
-
-#include <device.h>
-
-int       dev_ramDestroy();
-device_t *dev_ramDrive();
-
-#endif
-
-/***
- $Log: ramdrive.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:38  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:45  reddawg
- no message
-
- Revision 1.1  2004/09/13 15:21:26  flameshadow
- add: ramdrive.h
- chg: renamed device_t.size to sectors
- chg: made #define for size of ramdisk
- chg: calculated sectors of ramdisk and stored in the device_t struct
-
- Revision 1.1  2004/08/13 21:47:49  reddawg
- Fixed
-
- END
- ***/
-
diff --git a/sys/fs/ubixfsv2/types.h b/sys/fs/ubixfsv2/types.h
deleted file mode 100644
index 0cad845..0000000
--- a/sys/fs/ubixfsv2/types.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef TYPES_H
-#define TYPES_H
-
-typedef signed char  int8;
-typedef unsigned char uInt8;
-typedef unsigned int        uInt32;
-typedef int                 int32;
-typedef unsigned long long  uInt64;
-typedef signed long long    int64;
-
-#endif /* !TYPES_H */
diff --git a/sys/fs/ubixfsv2/ubixfs.cpp b/sys/fs/ubixfsv2/ubixfs.cpp
deleted file mode 100644
index f938ddb..0000000
--- a/sys/fs/ubixfsv2/ubixfs.cpp
+++ /dev/null
@@ -1,989 +0,0 @@
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <assert.h>
-#include <iostream>
-
-#include "ubixfs.h"
-#include "btree.h"
-
-using namespace std;
-
-UbixFS::UbixFS(void) { 
-  device = NULL;
-  freeBlockList = NULL;
-  superBlock = NULL;
-  root = NULL;
-} // UbixFS::UbixFS
-
-
-UbixFS::UbixFS(device_t * dev) {
-  device = dev;
-  freeBlockList = NULL;
-  superBlock = NULL;
-  root = NULL;
-} // UbixFS::UbixFS
-
-void
-UbixFS::printSuperBlock(void) {
-  printf("superBlock->name........... %s\n", superBlock->name);
-  printf("superBlock->magic1......... %X\n", superBlock->magic1);
-  printf("superBlock->fsByteOrder.... %d\n", superBlock->fsByteOrder);
-  printf("superBlock->blockSize...... %d\n", superBlock->blockSize);
-  printf("superBlock->blockShift..... %d\n", superBlock->blockShift);
-  printf("superBlock->numBlocks...... %lld\n", superBlock->numBlocks);
-  printf("superBlock->usedBlocks..... %lld\n", superBlock->usedBlocks);
-  printf("superBlock->batSectors..... %d\n", superBlock->batSectors);
-  printf("superBlock->inodeCount..... %d\n", superBlock->inodeCount);
-  printf("superBlock->magic2......... %X\n", superBlock->magic2);
-  printf("superBlock->blocksPerAG.... %d\n", superBlock->blocksPerAG);
-  printf("superBlock->AGShift........ %d\n", superBlock->AGShift);
-  printf("superBlock->numAGs......... %d\n", superBlock->numAGs);
-  printf("superBlock->lastUsedAG..... %d\n", superBlock->lastUsedAG);
-  printf("superBlock->flags.......... %X\n", superBlock->flags);
-  printf("superBlock->magic3......... %X\n", superBlock->magic3);
-  return;
-} // UbixFS::printSuperBlock
-
-int 
-UbixFS::vfs_init(void) {
-assert(device);
-  size_t result;
-  cout << "vfs_init()" << endl;
-  assert(device);
-
-  if (device == NULL) return -1;
-  if (superBlock != NULL) delete superBlock;
-  superBlock = new diskSuperBlock;
-assert(superBlock);
-  if (superBlock == NULL) return -1;
-
-  // read in the superBlock. It's always the last block on the partition 
-cout << "reading in superBlock" << endl;
-  device->read(device, superBlock, device->sectors-1, 1);
-cout << "done" << endl;
-
-  assert(superBlock->magic1 == UBIXFS_MAGIC1);
-  assert(superBlock->magic2 == UBIXFS_MAGIC2);
-  assert(superBlock->magic3 == UBIXFS_MAGIC3);
-  assert(strcmp(superBlock->name, "UbixFS") == 0);
-  assert((1 << superBlock->blockShift) == superBlock->blockSize);
-  assert((unsigned)(1 << superBlock->AGShift) == superBlock->blocksPerAG);
-  assert(superBlock->flags == UBIXFS_CLEAN);
-
-  if (freeBlockList != NULL) delete [] freeBlockList;
-  freeBlockList = new signed char[superBlock->batSectors*512];
-assert(freeBlockList);
-  memset(freeBlockList, 0, superBlock->batSectors*512);
-
-  device->read(device, 
-               freeBlockList, 
-               device->sectors - superBlock->batSectors-1,
-               superBlock->batSectors
-              ); // device->read()
-
-  root = new fileDescriptor;
-  assert(root);
-  memset(root, 0, sizeof(fileDescriptor));
-cout << "allocating root dir inode" << endl;
-  root->inode = new ubixfsInode;
-  memset(root->inode, 0, sizeof(ubixfsInode));
-cout << "root dir inode starting sector: " << 
-               ((superBlock->rootDir.AG << superBlock->AGShift) 
-               + superBlock->rootDir.start) * (superBlock->blockSize / 512)
-     << endl;
-
-cout << "reading in root dir inode" << endl;
-  
-  device->read(device,
-               root->inode,
-               ((superBlock->rootDir.AG << superBlock->AGShift) 
-                 + superBlock->rootDir.start) * (superBlock->blockSize / 512),
-               sizeof(ubixfsInode) / 512
-              );
-cout << "done" << endl;
-  ubixfsInode * rootInode = static_cast<ubixfsInode *>(root->inode);
-  assert(rootInode);
-
-  /* the bTree constructor now loads in the header */
-
-  rootInode->data.btPtr = new bTree(this, root);
-  rootInode->data.btPtr->Info();
-  printSuperBlock();
-  return 0;
-} // UbixFS::init
-
-int
-UbixFS::vfs_format(device_t * dev) {
-  cout << "vfs_format()" << endl;
-  char sector[512];
-  uInt32 blocks, batSect, batSize;
-  if (dev == NULL) return -1; 
-
-  // zero out the sector
-  memset(&sector, 0x0, sizeof(sector));
- 
-  // fill the drive in with zeroed out sectors
-  cout << "dev->sectors: " << dev->sectors << endl;
-  cout << "clearing device...";
-
-  for (unsigned int i = 0; i < dev->sectors; i++) {
-    dev->write(dev, &sector, i, 1);
-  } // for i
-
-  cout << "done" << endl;
-
-  // allocate a new superBlock and clear it
-
-  diskSuperBlock *sb = new diskSuperBlock;
-  if (sb == NULL) return -1;
-  memset(sb, 0, sizeof(diskSuperBlock));
-
-  // dev->sectors is the number of 512 byte sectors
-
-  blocks = (dev->sectors-1) / 8;     // 4k blocks
-  batSize = (dev->sectors-1) % 8;    // remainder
-  
-  // compute the BAT size
-
-  while ((batSize * 4096) < blocks) {
-    batSize += 8;
-    --blocks;
-  } // while
- 
-  // batSize is in sectors
-  batSect = blocks * 8;
-
-  strcpy(sb->name, "UbixFS");
-  sb->magic1 = UBIXFS_MAGIC1;
-  sb->fsByteOrder = 0;
-  sb->blockSize = 4096;
-  sb->blockShift = 12;
-  sb->numBlocks = blocks;
-  sb->usedBlocks = 2;  // root dir takes two blocks (inode + bTree header)
-  sb->inodeCount = 1;
-  sb->inodeSize = 4096;
-  sb->magic2 = UBIXFS_MAGIC2;
-  sb->blocksPerAG = 2048;
-  sb->AGShift = 11;
-  sb->numAGs = (sb->numBlocks+2047) / 2048;
-  sb->lastUsedAG = 0;
-
-  // the BAT exists outside our official block count, so no 
-  // entries in the BAT need to be set for it
-  sb->batSectors = batSize;
-
-  sb->flags = 0x434C454E; // CLEN
-  sb->logBlocks.AG = 0;
-  sb->logBlocks.start = 0;
-  sb->logBlocks.len = 0;
-  sb->logStart = 0;
-  sb->logEnd = 0;
-  sb->magic3 = UBIXFS_MAGIC3;
-  sb->indicies.AG = 0;
-  sb->indicies.start = 0;
-  sb->indicies.len = 0;
-
-  sb->rootDir.AG = 0;
-  sb->rootDir.start = 0;
-  sb->rootDir.len = 1;
-
-  // write out the superBlock
-
-  dev->write(dev, sb, dev->sectors-1, 1);
-
-  // mark the first two 4k blocks used
-  memset(&sector, 0, sizeof(sector));
-  sector[0] = (1 << 7) | (1 << 6);
-
-  // write out the first sector of the BAT 
-
-  dev->write(dev, &sector, batSect, 1);
-  // clear the rest
-  sector[0] = 0;
-
-  // write out the rest of the BAT
-
-  for (unsigned int i = 1; i < batSize; i++) {
-    dev->write(dev, &sector, (batSect)+i, 1);
-  } // for i
-
-  /* allocate part of the root dir */
-
-  // sanity checks
-  assert(sb->blockSize);
-  assert((unsigned)sb->blockSize >= sizeof(bTreeHeader));
-
-  bTreeHeader * bth = new bTreeHeader;
-  assert(bth);
-  memset(bth, 0, sizeof(bTreeHeader));
-
-  bth->firstDeleted = -1;
-  bth->firstNodeOffset = -1;
-  bth->treeDepth = 1;
-  bth->treeWidth = 0;
-  bth->treeLeafCount = 0;
-
-  /* create the root dir inode here */
-
-  ubixfsInode * inode = new ubixfsInode;
-  assert(inode);
-  if (inode == NULL) return -1;
-  memset(inode, 0, sizeof(ubixfsInode));
-
-  inode->magic1 = UBIXFS_INODE_MAGIC;
-
-  // inodes point to themselves
-  inode->inodeNum.AG = 0;
-  inode->inodeNum.start = 0;
-  inode->inodeNum.len = 1;
-
-  // root dir has no parent directory
-  inode->parent.iAddr.AG = 0;
-  inode->parent.iAddr.start = 0;
-  inode->parent.iAddr.len = 0;
-
-  /* this is part of the root dir structure (the bTreeHeader) */
-  inode->blocks.direct[0].AG = 0;
-  inode->blocks.direct[0].start = 1;
-  inode->blocks.direct[0].len = 1;
-   
-  inode->blocks.maxDirectRange = sizeof(bTreeHeader);
-  inode->blocks.size = sizeof(bTreeHeader);
-
-  strcpy(inode->name, "/");
-  inode->uid = getuid();
-  inode->gid = getgid();
-  // inode->mode
-  inode->flags = INODE_DIRECTORY;
-  // inode->createTime
-  // inode->lastModifiedTime
-  // inode->type
-
-  inode->attributes.AG = 0;
-  inode->attributes.start = 0;
-  inode->attributes.len = 0;
-
-  inode->inodeSize = sb->inodeSize;
-
-  /*
-   * next and prev are used in memory to hold pointers to the next/prev
-   * inodes in this dir.  On disk they may have another value, but for
-   * now they should be set to null.
-   */
-
-  inode->next.offset = 0;
-  inode->prev.offset = 0;
-
-  // write out the "root" dir inode
-
-  dev->write(dev, 
-             inode, 
-             ((inode->inodeNum.AG << sb->AGShift) +
-              inode->inodeNum.start) * (sb->blockSize / 512),
-             sb->inodeSize / 512
-            ); // dev->write
-
-  // write out the "root" dir
-
-  dev->write(dev, 
-             bth, 
-             ((inode->blocks.direct[0].AG << sb->AGShift) + 
-              inode->blocks.direct[0].start) * (sb->blockSize / 512),
-             sb->blockSize / 512
-            ); // dev->write
-
-  delete inode;
-  delete bth;
-  delete sb;
-  cout << "format complete" << endl;
-  return 0;
-} // UbixFS::vfs_format
-
-void *
-UbixFS::vfs_mknod(const char *path, mode_t mode) {
-  return mknod(path, 0, mode);  // <- this probably isn't correct
-} // UbixFS::vfs_mknod
-
-int
-UbixFS::vfs_open(const char * filename, fileDescriptor * fd, int flags, ...) {
-  if (filename == NULL || fd == NULL) return -1;
-  flags = flags;
-  fd->inode = NULL;
-  fd->offset = 0;
-  fd->size = 0;
-  // look up the file here
-  return 0;
-} // UbixFS::vfs_open
-
-size_t
-UbixFS::vfs_read(fileDescriptor * fd, void * data, off_t offset, size_t size) {
-  
-  unsigned int i;
-  off_t sum, startingBlock;
-  size_t runSize, sectorCount, totalSize, bSize; // blockSize
-  ubixfsInode * inode = NULL;
-
-  if (fd == NULL || data == NULL) return ~0;
-
-  if (size == 0) return 0; // don't fail if size is 0?
-   
-  assert(device);
-  assert(superBlock);
-
-  inode = static_cast<ubixfsInode *>(fd->inode);
-
-  assert(inode);
-
-  bSize = superBlock->blockSize;
-
-  totalSize = sum = i = 0;
-  
-  while (size > 0) {
-
-    /*
-     * place check here to see which set of blocks we're looking through
-     */
-
-    // scan through direct blocks
-    do {
-      if (offset >= sum && offset < sum + inode->blocks.direct[i].len * bSize)          break;
-
-      sum += inode->blocks.direct[i++].len * bSize;
-     
-    } while (i < NUM_DIRECT_BLOCKS);
-
-    startingBlock = (inode->blocks.direct[i].AG << superBlock->AGShift) + 
-                     inode->blocks.direct[i].start + ((offset - sum) / bSize);
-
-    runSize = inode->blocks.direct[i].len * bSize;
-
-    // startingBlock is in 4k blocks
-    startingBlock *= (bSize / 512);
-    // startingBlock is now in sectors
-
-    if (runSize >= size) {
-      runSize = size;
-      size = 0;
-    } else { 
-      size -= runSize;
-    } // else
-
-    sectorCount = runSize / 512;
-  
-    cout << "device->read(device, data, " << startingBlock << ", ";
-    cout << sectorCount << ");" << endl; 
-
-    device->read(device, data, startingBlock, sectorCount);
-
-    (uInt8 *)data += runSize;
-    totalSize += runSize;
-  } // while  
-  return totalSize;
-} // UbixFS::vfs_read
-
-size_t
-UbixFS::vfs_write(fileDescriptor * fd, void * data, off_t offset, size_t size) {
-  // char * sector[512];  // used to pad
-  unsigned int i, whichBlocks;
-  off_t sum, startingBlock, EORPos, maxRange;
-  size_t runSize, runRemainder, sectorCount, totalSize, bSize; // blockSize
-  ubixfsInode * inode = NULL;
-  blockRun br;
-
-  if (fd == NULL || data == NULL) return ~0;
-
-  if (size == 0) return 0; // don't fail if size is 0?
-
-  assert(device);
-  assert(superBlock);
-
-  inode = static_cast<ubixfsInode *>(fd->inode);
-
-  assert(inode);
-
-  bSize = superBlock->blockSize;
-  assert(bSize != 0);
-
-  totalSize = sum = i = whichBlocks = 0;
-
-  EORPos = offset + size;  // compute End Of Run Position
-  maxRange = inode->blocks.maxDirectRange;
-
-  if (inode->blocks.maxIndirectRange > maxRange) {
-    maxRange = inode->blocks.maxIndirectRange;
-    whichBlocks = 1;
-  }
-
-  if (inode->blocks.maxDoubleIndirectRange > maxRange) {
-    maxRange = inode->blocks.maxDoubleIndirectRange;
-    whichBlocks = 2;
-  } 
-  
-  if (EORPos > maxRange) {
-    /* 
-     * The offset+size is greater than the size of the file, so we need to
-     * extend out the file. Scan through the direct blocks (FIX LATER)
-     * to find out where we need to extend
-     */
-    switch (whichBlocks) {
-      case 0:
-        while (i < NUM_DIRECT_BLOCKS && inode->blocks.direct[i].len != 0) ++i;
-        // i holds which direct block we're going to add to
-        break;
-      case 1:
-      case 2:
-        assert(false);  // UNFINISHED
-        break;
-      default:
-        assert(false);  // sanity check
-    } // switch
-
-    /*
-     * NOTE: it's possible that if we scan through to find where the
-     * run goes, we might be able to extend the previous block extent.
-     * This will require that we set up br.start to be where we'd like to
-     * start looking through the free block list, and then modifying
-     * getFreeBlock() to honour that.
-     */
-
-    br.AG = inode->inodeNum.AG;        // request a sane allocation group
-    br.start = 0;                      // getFreeBlock() will ignore this
-
-    /*
-     * The length that we need is determined by how much extra slack we 
-     * already have in the pre-allocated blocks.
-     * e.g. (assumes 4k blocks)
-     * bSize = 4096
-     * maxRange = 4096
-     * size = 3000
-     * offset = 3000
-     * size = 4000
-     * [--- data block ---][--- data block ---]  <---- blocks on disk
-     * <-file data->                             <---- actual file size
-     *              <----->                      <---- slack
-     * [  data block size ]                      <---- maxRange
-     *              |                            <---- offset
-     *              *****************            <---- new data
-     *
-     * In the above example, you'd need at least one more block to write
-     * out the data.  
-     * ((offset + size) - maxRange + (bSize-1)) / bSize
-     * ((3000 + 4000) - 4096 + (4095)) / 4096 == 1 (rounded down)
-     * And then we expand it by a little extra so we don't have to keep 
-     * looking for more blocks. Currently we use 32k of slack (or 8 blocks)
-     */
-
-    br.len = ((EORPos - maxRange + (bSize-1)) / bSize);
-
-    if (br.len < 8) br.len = 8;  // we allocate 32k if the file needs to grow
-
-    br = getFreeBlock(br);
-    assert(br.len > 0);
-    switch (whichBlocks) {
-      case 0:
-        inode->blocks.direct[i] = br;
-        inode->blocks.maxDirectRange += br.len * bSize;
-        break;
-      case 1:
-        assert(false); // UNFINISHED
-        inode->blocks.maxIndirectRange += br.len * bSize;
-        break;
-      case 2:
-        assert(false); // UNFINISHED
-        inode->blocks.maxDoubleIndirectRange += br.len * bSize;
-        break;
-      default:   
-        assert(false); // sanity check
-    } // switch
-
-    inode->blocks.size = EORPos;
-  } // if
-
-
-  runRemainder = size % 512;
-  size -= runRemainder;
-
-  totalSize = sum = i = 0;
-
-  while (size > 0) {
-
-    /*
-     * place check here to see which set of blocks we're looking through
-     */
-
-    // scan through direct blocks
-    do {
-      if (offset >= sum && offset < sum + inode->blocks.direct[i].len * bSize)
-        break;
-
-      sum += inode->blocks.direct[i++].len * bSize;
-
-    } while (i < NUM_DIRECT_BLOCKS);
-
-    startingBlock = (inode->blocks.direct[i].AG << superBlock->AGShift) +
-                     inode->blocks.direct[i].start + ((offset - sum) / bSize);
-
-    runSize = inode->blocks.direct[i].len * bSize;
-
-    // startingBlock is in 4k blocks
-    startingBlock *= (bSize / 512);
-    // startingBlock is now in sectors
-
-    if (runSize >= size) {
-      runSize = size;
-      size = 0;
-    } else {
-      size -= runSize;
-    } // else
-
-    sectorCount = runSize / 512;
-
-    cout << "device->write(device, data, " << startingBlock << ", ";
-    cout << sectorCount << ");" << endl;
-
-    device->write(device, data, startingBlock, sectorCount);
-
-    (uInt8 *)data += runSize;
-    totalSize += runSize;
-  } // while
-
-  assert(runRemainder != 0);  // UNFINISHED
-  return totalSize;
-} // UbixFS::vfs_write
-
-int
-UbixFS::vfs_stop(void) {
-  if (vfs_sync() != 0) return -1;
-
-  // you must delete the root dir first, in case it needs to
-  // still write anything out
-
-  if (root != NULL) {
-    ubixfsInode * rootInode = static_cast<ubixfsInode *>(root->inode);
-    delete rootInode->data.btPtr; 
-    delete rootInode;
-    root->inode = NULL;
-    
-  } // if
-
-  delete root;
-  delete [] freeBlockList;
-  delete superBlock;
-
-  freeBlockList = NULL;
-  superBlock = NULL; 
-  root = NULL;
-
-  /* 
-   * The device isn't null at this point, allowing for people to restart
-   * the mount point. Or, alternatively, to blow things up.
-   */
-  
-  return 0;
-} // UbixFS::vfs_stop
-
-int
-UbixFS::vfs_sync(void) {
-  if (device == NULL || superBlock == NULL || freeBlockList == NULL) return -1;
-  device->write(device, 
-                freeBlockList, 
-                device->sectors - superBlock->batSectors - 1, 
-                superBlock->batSectors
-               );
-  device->write(device, superBlock, device->sectors-1, 1);
-  return 0;
-} // UbixFS::vfs_sync
-
-void
-UbixFS::setFreeBlock(blockRun ibr) {
-  signed char * ptr;
-  
-  if (superBlock == NULL || freeBlockList == NULL) return;
-  if (ibr.len == 0) return;
-  ptr = freeBlockList + ((ibr.AG << superBlock->AGShift) >> 3);
-  ptr += ibr.start >> 3;
-
-  if (ibr.start % 8 != 0) {
-    
-    ibr.len -= ibr.start % 8;
-  } // if
-
-} // UbixFS::setFreeBlock
-
-blockRun
-UbixFS::getFreeBlock(blockRun ibr) {
-  signed char * ptr;
-  signed char * holdPtr;
-  int32 count, holdCount;
-
-  blockRun obr = {0, 0, 0};  // output block run
-
-  // Check to make sure none of these are null
-  if (device == NULL || freeBlockList == NULL || superBlock == NULL) return obr;
-
-  if (ibr.len == 0) return obr;
-
-  if (ibr.len > superBlock->numBlocks) return obr;
-
-  if (ibr.len == 1) return getFreeBlock(ibr.AG);
-  /*
-   * count is the block from the base of the list.
-   * Since we're given a specific AG to look through, we start the count at
-   * AG << AGShift, where AGShift is the shift value of the number of blocks
-   * in an AG
-   */
-
-  count = (ibr.AG << superBlock->AGShift);
-
-  /*
-   * The freeBlockList is a bit map of the free/used blocks.
-   * Used = on bit
-   * Unused = off bit
-   * There are 8 bits per byte (hopefully) and so we have to divide the count
-   * by 8 to get our starting byte offset to look from
-   */
-
-  ptr = freeBlockList + (count >> 3);
-
-rescan:
-  // look for the first free 8 blocks (this may create holes)
-  while (*ptr != 0) {
-    ++ptr;
-    count += 8;
-    if (count+8 > superBlock->numBlocks) {
-      ptr = freeBlockList;
-      count = 0;
-    } // if 
-  } // while *ptr != 0
-
-  holdPtr = ptr;
-  holdCount = count;
-
-  for (unsigned short i = 0; i < ((ibr.len+7) / 8); i++) {
-    ++ptr;
-    count += 8;
-    if (count+8 > superBlock->numBlocks) {
-      ptr = freeBlockList;
-      count = 0;
-      goto rescan;
-    } // if
-    if (*ptr != 0) goto rescan;
-  } // for i
-
-  // we have found a range of blocks that work for us
-
-  obr.AG = holdCount / superBlock->blocksPerAG;
-  obr.start = holdCount % superBlock->blocksPerAG;
-  obr.len = ibr.len;
-
-  for (unsigned short i = 0; i < (ibr.len / 8); i++) {
-    *holdPtr = -1;
-    ++holdPtr;
-  } // for
-
-  if (ibr.len % 8 != 0) *holdPtr = (-1 << (8-(ibr.len % 8)));
-
-  superBlock->usedBlocks += ibr.len;   // increment the number of used blocks
-  return obr;
-} // UbixFS::getFreeBlock
-
-blockRun
-UbixFS::getFreeBlock(uInt32 AG) {
-  // AG == AllocationGroup
-  blockRun br;
-  signed char * ptr;
-  int32 count;
-  int32 subCount = 128;
-
-  br.AG = 0;
-  br.start = 0;
-  br.len = 0;
-  // Check to make sure neither of these are null
-  if (device == NULL || freeBlockList == NULL || superBlock == NULL) return br;
-
-  // Are there any blocks available?
-  if (superBlock->numBlocks == superBlock->usedBlocks) return br;
-
-  /* 
-   * count is the block from the base of the list.
-   * Since we're given a specific AG to look through, we start the count at
-   * AG << AGShift, where AGShift is the shift value of the number of blocks
-   * in an AG 
-   */
-
-  count = (AG << superBlock->AGShift);
-
-  /*
-   * The freeBlockList is a bit map of the free/used blocks. 
-   * Used = on bit
-   * Unused = off bit
-   * There are 8 bits per byte (hopefully) and so we have to divide the count
-   * by 8 to get our starting byte offset to look from
-   */
-
-  ptr = freeBlockList + (count >> 3);
-
-  // Scan through the freeBlockList 
-
-rescan:
-  while (*ptr == -1) { 
-    ++ptr;
-    count += 8;
-    if (count+8 > superBlock->numBlocks) break;
-  } // while *ptr == -1
-
-  subCount = 128;
-
-  do {
-    if ((*ptr & subCount) == 0) break;
-    subCount >>= 1;
-    ++count;
-    if (count == superBlock->numBlocks) {
-      count = 0;
-      ptr = freeBlockList;
-      goto rescan;
-    } // if
-  } while(subCount > 1);
-
-  *ptr |= subCount;           // mark this block as used
-  ++superBlock->usedBlocks;   // increment the number of used blocks
-
-  br.AG = count / superBlock->blocksPerAG; 
-  br.start = count % superBlock->blocksPerAG;
-  br.len = 1;
-  return br;               // return the allocated block number
-} // Ubixfs::getFreeBlock
-
-uInt32
-UbixFS::getNextAG(void) {
-
-  if (superBlock->lastUsedAG == superBlock->numAGs) 
-    superBlock->lastUsedAG = 0;
-  else
-    superBlock->lastUsedAG++;
-  return superBlock->lastUsedAG;
-
-} // UbixFS::getNextAG
-
-/*
- * UbixFS::getFreeBlock(void)
- * upon success returns a free block based on the next AG after the lastUsedAG
- * failure returns -1
- */
-
-blockRun
-UbixFS::getFreeBlock(void) {
-  return getFreeBlock(getNextAG());
-} // UbixFS::getFreeBlock
-
-blockRun
-UbixFS::get8FreeBlocks(uInt32 AG) {
-  // AG == AllocationGroup
-  blockRun br;
-  signed char * ptr;
-  signed char * endPtr;
-  int32 count;
-
-  br.AG = 0;
-  br.start = 0;
-  br.len = 0;
-
-  if (device == NULL || freeBlockList == NULL || superBlock == NULL) return br;
-
-  // Are there any blocks available?
-  if (superBlock->usedBlocks+8 > superBlock->numBlocks) return br;
-
-  /*
-   * count is the block from the base of the list.
-   * Since we're given a specific AG to look through, we start the count at
-   * AG << AGShift, where AGShift is the shift value of the number of blocks
-   * in an AG
-   */
-
-  count = (AG << superBlock->AGShift);
-
-  ptr = freeBlockList + (count >> 3);
-  
-  endPtr = freeBlockList + (superBlock->numBlocks >> 3);
-
-  bool secondTime = false;
-  while (*ptr != 0) {
-    ++ptr;
-    count += 8;
-    if (ptr == endPtr) {
-      if (secondTime) 
-        return br; 
-      else 
-        secondTime = true;
-
-      count = 0;
-      ptr = freeBlockList;      
-    } // if
-  } // while 
-
-  *ptr = -1;   // mark 8 blocks as taken
-
-  br.AG = count / superBlock->blocksPerAG;
-  br.start = count % superBlock->blocksPerAG;
-  br.len = 8;
-  return br;
-} // UbixFS::get8FreeBlocks
-
-void *
-UbixFS::mknod(const char *filename, ubixfsInode * parent, mode_t mode) {
-  ubixfsInode * inode = NULL;
-
-  inode = new ubixfsInode;
-  assert(inode);
-  if (inode == NULL) return NULL;
-  memset(inode, 0, sizeof(ubixfsInode));
-
-  inode->magic1 = UBIXFS_INODE_MAGIC;
-
-  /* 
-   * in retrospect.. I'm not sure why parent would be null.. only the
-   * root directory would have a null parent, but that's manually allocated
-   * in vfs_format()
-   */
-
-  if (parent == NULL) {
-    inode->inodeNum = getFreeBlock();
-    inode->parent.iAddr.AG = 0;
-    inode->parent.iAddr.start = 0;
-    inode->parent.iAddr.len = 0;
-  } else {
-    inode->inodeNum = getFreeBlock(parent->inodeNum.AG);
-    inode->parent.iAddr = parent->inodeNum;
-  } // else
-   
-  strncpy(inode->name, filename, MAX_FILENAME_LENGTH);
-
-  inode->uid = getuid();
-  inode->gid = getgid();
-  // inode->mode
-  inode->flags = mode;
-  // inode->createTime
-  // inode->lastModifiedTime
-  inode->inodeSize = superBlock->inodeSize;
-
-  inode->attributes.AG = 0;
-  inode->attributes.start = 0;
-  inode->attributes.len = 0;
-
-  // inode->type 
-
-  /*
-   * next and prev are used in memory to hold pointers to the next/prev
-   * inodes in this dir.  On disk they may have another value, but for
-   * now they should be set to null.
-   */
-
-  inode->next.offset = 0;
-  inode->prev.offset = 0;
-  inode->refCount = 0;
-  ++superBlock->inodeCount;
-  return inode;
-} // UbixFS::mknod
-
-int
-UbixFS::vfs_mkdir(const char * path, mode_t mode) {
-  char name[MAX_FILENAME_LENGTH];
-  unsigned int start, end, len, nameStart;
-  ubixfsInode * dir = static_cast<ubixfsInode *>(root->inode);
-  ubixfsInode * inode = NULL;
-
-  assert(path);                     // bad input: vfs_mkdir(NULL);
-  assert(*path);                    // bad input: vfs_mkdir("");
-
-  memset(&name, 0, sizeof(name));
-  // find the dir name
-  len = strlen(path);
-
-  assert(path[0] == '/');           // bad input: vfs isn't doing its job
-  assert(len > 1);                  // bad input: mkdir /
-
-  // remove trailing "/" if present
-  if (path[len-1] == '/') --len;
-
-  assert(len > 1);                  // bad input: mkdir //
-
-  nameStart = len-1;
-
-  assert(path[nameStart] != '/');   // bad input: mkdir /a//
-
-  /*
-   * we're guaranteed by the assert() above that there is 
-   * at least one "/" before our location. If you remove the assert 
-   * you might need to make sure nameStart stays above 0 in the following
-   * while
-   */
-
-  while (path[nameStart] != '/') --nameStart;
-  ++nameStart;
-  assert(len - nameStart > 0);
-
-  /* e.g.
-   *   v--------------------- start
-   *      v------------------ end
-   *                  v------ nameStart
-   *  /usr/local/data/dirname/  <--- ignores trailing /
-   *  <---------23----------> len
-   */
-
-  start = end = 1;   // skip leading /
-  while (end < nameStart) {
-    do { ++end; } while(path[end] != '/');
-
-    assert(end-start+1 < sizeof(name));
-    // this is probably wrong:
-    strncpy(name, &path[start], end-start+1);
-    cout << name << endl;
-    dir = dir->data.btPtr->Find(name);
-    assert(dir);
-    assert(dir->flags & INODE_DIRECTORY == INODE_DIRECTORY);
-    start = ++end;
-  }
-
-  strncpy(name, &path[nameStart], len - nameStart);
-  inode = (ubixfsInode *)mknod(name, dir, mode | INODE_DIRECTORY);
-
-  /* 
-   * keep in mind that the reason for passing in the name is because
-   * we thought about allowing key names to be different from inode 
-   * names. In retrospect, I don't think that's a good idea since a dir
-   * listing will print the actual dir name instead of . and ..
-   * Thus: the first parameter of btPtr->Insert() may go away.
-   */
-
-  assert(dir->data.btPtr->Insert(inode->name, inode));
-
-  return 0;
-} // UbixFS::vfs_mkdir
-
-void 
-UbixFS::printFreeBlockList(uInt32 AG) {
-  unsigned int j;
-  if (superBlock == NULL || freeBlockList == NULL) return;
-  printf("AG = %d\n", AG);
-  for (unsigned int i = 0; i < superBlock->blocksPerAG / 8; i++) {
-    j = 128;
-    signed char foo = freeBlockList[(AG << superBlock->AGShift)+i];
-    while (j > 0) {
-      if ((foo & j) == j) 
-        printf("1");
-      else
-        printf("0");    
-      j >>= 1;
- 
-    }
-  } // for i
-  printf("\n");
-  return;
-} // UbixFS::printFreeBlockList
-
-UbixFS::~UbixFS(void) {
-  delete [] freeBlockList;
-  return;
-}
diff --git a/sys/fs/ubixfsv2/ubixfs.h b/sys/fs/ubixfsv2/ubixfs.h
deleted file mode 100644
index 595e6f4..0000000
--- a/sys/fs/ubixfsv2/ubixfs.h
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef UBIXFS_H
-#define UBIXFS_H
-
-#include <sys/types.h>
-#include <unistd.h>
-#include "fsAbstract.h"
-#include "types.h"
-#include "file.h"
-
-#define INODE_IN_USE      0x00000001
-#define INODE_DIRECTORY   0x00000002
-#define ATTR_INODE        0x00000004
-#define INODE_LOGGED      0x00000008
-#define INODE_DELETED     0x00000010
-#define PERMANENT_FLAGS   0x0000ffff
-#define INODE_NO_CACHE    0x00010000
-#define INODE_WAS_WRITTEN 0x00020000
-#define NO_TRANSACTION    0x00040000
-
-#define NUM_DIRECT_BLOCKS 64
-#define MAX_FILENAME_LENGTH 256
-
-#define UBIXFS_MAGIC1 0xA0A0A0A
-#define UBIXFS_MAGIC2 0xB0B0B0B
-#define UBIXFS_MAGIC3 0xC0C0C0C
-#define UBIXFS_INODE_MAGIC 0x3bbe0ad9
-
-/* befs magic numbers
-#define SUPER_BLOCK_MAGIC1 0x42465331 // BFS1
-#define SUPER_BLOCK_MAGIC2 0xdd121031
-#define SUPER_BLOCK_MAGIC3 0x15b6830e
- */
-#define UBIXFS_CLEAN 0x434C454E  // CLEN
-#define UBIXFS_DIRTY 0x44495254  // DIRT
-
-
-typedef struct blockRun {
-  int            AG               __attribute__ ((packed));
-  unsigned short start            __attribute__ ((packed));
-  unsigned short len              __attribute__ ((packed));
-} inodeAddr;
-
-struct bNode;
-struct ubixfsInode;
-class bTree;
-
-typedef union uPtr {
-  inodeAddr iAddr;
-  bNode * bPtr;
-  bTree * btPtr;
-  ubixfsInode * iPtr;
-  void * vPtr;
-  off_t offset;
-};
-
-typedef struct diskSuperBlock {
-  char      name[32]      __attribute__ ((packed));
-  int32     magic1        __attribute__ ((packed));
-  int32     fsByteOrder   __attribute__ ((packed));
-
-// blockSize on disk (4096 for UbixFS v2)
-  int32     blockSize     __attribute__ ((packed));
-
-// number of bits needed to shift a block number to get a byte address
-  uInt32     blockShift    __attribute__ ((packed));
-
-  off_t     numBlocks     __attribute__ ((packed));
-  off_t     usedBlocks    __attribute__ ((packed));
-
-// BlockAllocationTable
-  uInt32    batSectors    __attribute__ ((packed));
-
-  uInt32    inodeCount    __attribute__ ((packed));
-  uInt32    inodeSize     __attribute__ ((packed));
-  uInt32    magic2        __attribute__ ((packed));
-  uInt32    blocksPerAG   __attribute__ ((packed));
-  uInt32    AGShift       __attribute__ ((packed));
-  uInt32    numAGs        __attribute__ ((packed));
-  uInt32    lastUsedAG    __attribute__ ((packed));
-// flags tells whether the FS is clean (0x434C454E) or dirty (0x44495954)
-  int32     flags         __attribute__ ((packed));
-
-// journal information
-  blockRun  logBlocks     __attribute__ ((packed));
-  off_t     logStart      __attribute__ ((packed));
-  off_t     logEnd        __attribute__ ((packed));
-
-  int32     magic3        __attribute__ ((packed));
-
-// root dir of the SYS container
-  inodeAddr rootDir       __attribute__ ((packed));
-
-// indicies
-  inodeAddr indicies      __attribute__ ((packed));
-
-  char      pad[368]      __attribute__ ((packed));
-
-} diskSuperBlock;
-
-typedef struct dataStream {
-  struct blockRun direct[NUM_DIRECT_BLOCKS] __attribute__ ((packed));
-  off_t           maxDirectRange            __attribute__ ((packed));
-  struct blockRun indirect                  __attribute__ ((packed));
-  off_t           maxIndirectRange          __attribute__ ((packed));
-  struct blockRun double_indirect           __attribute__ ((packed));
-  off_t           maxDoubleIndirectRange    __attribute__ ((packed));
-  off_t           size                      __attribute__ ((packed));
-} dataStream;
-
-typedef struct ubixfsInode {
-  int32       magic1                     __attribute__ ((packed));
-  inodeAddr   inodeNum                   __attribute__ ((packed));
-  char        name[MAX_FILENAME_LENGTH]  __attribute__ ((packed));
-  uid_t       uid                        __attribute__ ((packed));
-  gid_t       gid                        __attribute__ ((packed));
-  int32       mode                       __attribute__ ((packed));
-  int32       flags                      __attribute__ ((packed));
- // uInt64      createTime                 __attribute__ ((packed));
- // uInt64      lastModifiedTime           __attribute__ (packed));
-  inodeAddr   attributes                 __attribute__ ((packed));
-  uInt32      type                       __attribute__ ((packed));
-  uInt32      inodeSize                  __attribute__ ((packed));
-  uPtr        parent                     __attribute__ ((packed));
-  uPtr        next                       __attribute__ ((packed));
-  uPtr        prev                       __attribute__ ((packed));
-  uPtr        data                       __attribute__ ((packed));
-  dataStream  blocks                     __attribute__ ((packed));
-  uInt32      refCount                   __attribute__ ((packed));
-  char        smallData[3200]            __attribute__ ((packed));
-} ubixfsInode;
-
-class UbixFS : public vfs_abstract {
- protected:
-  signed char *    freeBlockList;
-  diskSuperBlock * superBlock;
-  fileDescriptor * root;
-
-  blockRun         getFreeBlock(blockRun);
-  blockRun         getFreeBlock(uInt32);
-  blockRun         getFreeBlock(void);
-  blockRun         get8FreeBlocks(uInt32);
-  uInt32           getNextAG(void);
-  void *           mknod(const char *, ubixfsInode *, mode_t);
-  void             printSuperBlock(void);
-  void             printFreeBlockList(uInt32);
-  void             setFreeBlock(blockRun);
- public:
-                   UbixFS(void);
-                   UbixFS(device_t *);
-  virtual int      vfs_init(void);
-  virtual int      vfs_format(device_t *);
-  virtual void *   vfs_mknod(const char *, mode_t);
-  virtual int      vfs_mkdir(const char *, mode_t);
-  virtual int      vfs_open(const char *, fileDescriptor *, int, ...);
-  virtual size_t   vfs_read(fileDescriptor *, void *, off_t, size_t);
-  virtual size_t   vfs_write(fileDescriptor *, void *, off_t, size_t);
-  virtual int      vfs_sync(void);
-  virtual int      vfs_stop(void); 
-  virtual         ~UbixFS(void); 
-  friend class bTree;
-}; // UbixFS
-
-#endif // !UBIXFS_H
diff --git a/sys/fs/ubixfsv2/vfs.cpp b/sys/fs/ubixfsv2/vfs.cpp
deleted file mode 100644
index daa28a7..0000000
--- a/sys/fs/ubixfsv2/vfs.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <stdio.h>
-#include "vfs.h"
-
-DiskFS::DiskFS(const char * filename) {
-  diskFile = fopen(filename, "r+");
-} // DiskFS::DiskFS
-
-int
-DiskFS::write(const void * data, long offset, long size) {
-  if (diskFile == NULL) return 1;
-  fseek(diskFile, offset, SEEK_SET);
-  fwrite(data, size, 1, diskFile);
-  return 0;
-} // DiskFS::write
-
-int
-DiskFS::read(void * data, long offset, long size) {
-  if (diskFile == NULL) return 1;
-  fseek(diskFile, offset, SEEK_SET);
-  fread(data, size, 1, diskFile);
-  return 0;
-} // DiskFS::read
diff --git a/sys/fs/ubixfsv2/vfs.h b/sys/fs/ubixfsv2/vfs.h
deleted file mode 100644
index 68548e9..0000000
--- a/sys/fs/ubixfsv2/vfs.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef VFS_H
-#define VFS_H
-
-#include <stdlib.h>
-#include <stdio.h>
-
-class FileSystemAbstract {
- protected:
- public: 
-  virtual   int read(char *, long, long) = 0;
-  virtual   int write(char *, long, long) = 0;
-  virtual  ~FileSystemAbstract(void) {};
-}; // FileSystemAbstract
-
-class DiskFS : public FileSystemAbstract {
- protected:
-   FILE * diskFile;
- public:
-            DiskFS(const char *);
-  virtual   int write(const void *, long, long);
-  virtual   int read(void *, long, long);
-  virtual  ~DiskFS(void) { };
-}; // DiskFS
-
-#endif // !VFS_H
diff --git a/sys/fs/ufs/Makefile b/sys/fs/ufs/Makefile
deleted file mode 100644
index 0c554b3..0000000
--- a/sys/fs/ufs/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#  Objects
-OBJS = ufs.o ffs.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.c.o:
-	$(CC)  ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.c.s:
-	$(CC)  ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.S.o:
-	$(CC)  ${CFLAGS} ${INCLUDES} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/fs/ufs/ffs.c b/sys/fs/ufs/ffs.c
deleted file mode 100644
index 200508e..0000000
--- a/sys/fs/ufs/ffs.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <vfs/vfs.h>
-#include <ufs/ufs.h>
-#include <ufs/ffs.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <ubixos/kpanic.h>
-#include <lib/string.h>
-#include <sys/buf.h>
-
-
-int ffs_read(fileDescriptor *fd,char *data,uInt32 offset,long size) {
-  struct fs  *fs;
-
-  fs = (struct fs *)fd->dmadat->sbbuf;
-
-  if (offset < fd->size && offset >= fs->fs_maxfilesize) {
-    //return (EOVERFLOW);
-    return(-1);
-    }
-
-  kprintf("Reading File w/ New Function [0x%X]\n",fs->fs_maxfilesize);
-  return(0x0);
-  }
diff --git a/sys/fs/ufs/ufs.c b/sys/fs/ufs/ufs.c
deleted file mode 100644
index 4bb26ab..0000000
--- a/sys/fs/ufs/ufs.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ufs.c 102 2016-01-12 03:59:34Z reddawg $
-
- *****************************************************************************************/
-
-#include <sys/types.h>
-#include <vfs/vfs.h>
-#include <ufs/ufs.h>
-#include <ufs/ffs.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <ubixos/kpanic.h>
-#include <lib/string.h>
-
-#define VBLKSHIFT        12
-#define VBLKSIZE         (1 << VBLKSHIFT)
-#define VBLKMASK         (VBLKSIZE - 1)
-#define DBPERVBLK        (VBLKSIZE / DEV_BSIZE)
-#define INDIRPERVBLK(fs) (NINDIR(fs) / ((fs)->fs_bsize >> VBLKSHIFT))
-#define IPERVBLK(fs)     (INOPB(fs) / ((fs)->fs_bsize >> VBLKSHIFT))
-#define INOPB(fs)        ((fs)->fs_inopb)
-#define INO_TO_VBA(fs, ipervblk, x) \
-    (fsbtodb(fs, cgimin(fs, ino_to_cg(fs, x))) + \
-    (((x) % (fs)->fs_ipg) / (ipervblk) * DBPERVBLK))
-#define INO_TO_VBO(ipervblk, x) ((x) % ipervblk)
-
-static int dskread(void *buf, u_int64_t block, size_t count, fileDescriptor *fd) {
-	fd->mp->device->devInfo->read(fd->mp->device->devInfo->info, buf, block, count);
-	return (0x0);
-}
-
-//struct dmadat {
-//  char blkbuf[VBLKSIZE];  /* filesystem blocks */
-//  char indbuf[VBLKSIZE];  /* indir blocks */
-//  char sbbuf[SBLOCKSIZE]; /* superblock */
-//  char secbuf[DEV_BSIZE]; /* for MBR/disklabel */
-//  };
-//static struct dmadat *dmadat;
-
-//static int ls,dsk_meta;
-
-static int sblock_try[] = SBLOCKSEARCH;
-
-#if defined(UFS2_ONLY)
-#define DIP(field) dp2.field
-#elif defined(UFS1_ONLY)
-#define DIP(field) dp1.field
-#else
-#define DIP(field) fs->fs_magic == FS_UFS1_MAGIC ? dp1.field : dp2.field
-#endif
-
-static ssize_t fsread(ino_t inode, void *buf, size_t nbyte, fileDescriptor *fd) {
-  #ifndef UFS2_ONLY
-  static struct ufs1_dinode dp1;
-  #endif
-  #ifndef UFS1_ONLY
-  static struct ufs2_dinode dp2;
-  #endif
-	static ino_t inomap;
-	char *blkbuf;
-	void *indbuf;
-	struct fs *fs;
-	char *s;
-	size_t n, nb, size, off, vboff;
-	ufs_lbn_t lbn;
-	ufs2_daddr_t addr, vbaddr;
-	static ufs2_daddr_t blkmap, indmap;
-	u_int u;
-
-	blkbuf = fd->dmadat->blkbuf;
-	indbuf = fd->dmadat->indbuf;
-	fs = (struct fs *) fd->dmadat->sbbuf;
-
-	if (!fd->dsk_meta) {
-		inomap = 0;
-		for (n = 0; sblock_try[n] != -1; n++) {
-			if (dskread(fs, sblock_try[n] / DEV_BSIZE, 16, fd))
-				return -1;
-			if ((
-#if defined(UFS1_ONLY)
-					fs->fs_magic == FS_UFS1_MAGIC
-#elif defined(UFS2_ONLY)
-          (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_sblockloc == sblock_try[n])
-#else
-          fs->fs_magic == FS_UFS1_MAGIC || (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_sblockloc == sblock_try[n])
-#endif
-          ) && fs->fs_bsize <= MAXBSIZE && fs->fs_bsize >= sizeof(struct fs))
-				break;
-      //MrOlsen 2017-12-14 this was for debugging kprintf("Finding SBlock: [%s][0x%X][%i - %i]\n", fs->fs_fsmnt, fs->fs_magic, sblock_try[n], sblock_try[n] / DEV_BSIZE);
-		}
-		if (sblock_try[n] == -1) {
-			kprintf("Not ufs\n");
-			return -1;
-		}
-		fd->dsk_meta++;
-	}
-
-	if (!inode)
-		return (0x0);
-
-	if (inomap != inode) {
-		n = IPERVBLK(fs);
-		if (dskread(blkbuf, INO_TO_VBA(fs, n, inode), DBPERVBLK, fd))
-			return -1;
-		n = INO_TO_VBO(n, inode);
-#if defined(UFS1_ONLY)
-		dp1 = ((struct ufs1_dinode *)blkbuf)[n];
-#elif defined(UFS2_ONLY)
-		dp2 = ((struct ufs2_dinode *)blkbuf)[n];
-#else
-		if (fs->fs_magic == FS_UFS1_MAGIC)
-			dp1 = ((struct ufs1_dinode *) blkbuf)[n];
-		else
-			dp2 = ((struct ufs2_dinode *) blkbuf)[n];
-#endif
-		inomap = inode;
-		fd->offset = 0;
-		blkmap = indmap = 0;
-	}
-
-	s = buf;
-	size = DIP(di_size);
-	fd->size = size;
-	n = size - fd->offset;
-	//Why?
-	if (n < 0)
-		return (0x0);
-	if (nbyte > n)
-		nbyte = n;
-	nb = nbyte;
-	while (nb) {
-		lbn = lblkno(fs, fd->offset);
-		off = blkoff(fs, fd->offset);
-		if (lbn < NDADDR) {
-			addr = DIP(di_db[lbn]);
-		} else if (lbn < NDADDR + NINDIR(fs)) {
-			n = INDIRPERVBLK(fs);
-			addr = DIP(di_ib[0]);
-			u = (u_int) (lbn - NDADDR) / (n * DBPERVBLK);
-			vbaddr = fsbtodb(fs, addr) + u;
-			if (indmap != vbaddr) {
-				if (dskread(indbuf, vbaddr, DBPERVBLK, fd))
-					return -1;
-				indmap = vbaddr;
-			}
-			n = (lbn - NDADDR) & (n - 1);
-#if defined(UFS1_ONLY)
-			addr = ((ufs1_daddr_t *)indbuf)[n];
-#elif defined(UFS2_ONLY)
-			addr = ((ufs2_daddr_t *)indbuf)[n];
-#else
-			if (fs->fs_magic == FS_UFS1_MAGIC)
-				addr = ((ufs1_daddr_t *) indbuf)[n];
-			else
-				addr = ((ufs2_daddr_t *) indbuf)[n];
-#endif
-		} else {
-			return -1;
-		}
-		vbaddr = fsbtodb(fs, addr) + (off >> VBLKSHIFT) * DBPERVBLK;
-		vboff = off & VBLKMASK;
-		n = sblksize(fs, size, lbn) - (off & ~VBLKMASK);
-		if (n > VBLKSIZE)
-			n = VBLKSIZE;
-		if (blkmap != vbaddr) {
-			if (dskread(blkbuf, vbaddr, n >> DEV_BSHIFT, fd))
-				return -1;
-			blkmap = vbaddr;
-		}
-		n -= vboff;
-		if (n > nb)
-			n = nb;
-		memcpy(s, blkbuf + vboff, n);
-		s += n;
-		fd->offset += n;
-		nb -= n;
-	}
-	return nbyte;
-}
-
-static __inline int fsfind(const char *name, ino_t * ino, fileDescriptor *fd) {
-	char buf[DEV_BSIZE];
-	struct dirent *d;
-	char *s;
-	ssize_t n;
-
-	fd->offset = 0;
-	while ((n = fsread(*ino, buf, DEV_BSIZE, fd)) > 0)
-		for (s = buf; s < buf + DEV_BSIZE;) {
-			d = (void *) s;
-			if (!strcmp(name, d->d_name)) {
-				*ino = d->d_fileno;
-				return d->d_type;
-			}
-			s += d->d_reclen;
-		}
-	//if (n != -1 && ls)
-	//kprintf("\n");
-	return 0;
-}
-
-static ino_t lookup(const char *path, fileDescriptor *fd) {
-	char name[MAXNAMLEN + 1];
-	const char *s;
-	ino_t ino;
-	ssize_t n;
-	int dt;
-
-	ino = ROOTINO;
-	dt = DT_DIR;
-	name[0] = '/';
-	name[1] = '\0';
-	for (;;) {
-		if (*path == '/')
-			path++;
-		if (!*path)
-			break;
-		for (s = path; *s && *s != '/'; s++)
-			;
-		if ((n = s - path) > MAXNAMLEN)
-			return 0;
-		//ls = *path == '?' && n == 1 && !*s;
-		memcpy(name, path, n);
-		name[n] = 0;
-		if (dt != DT_DIR) {
-			kprintf("%s: not a directory.\n", name);
-			return (0);
-		}
-		if ((dt = fsfind(name, &ino, fd)) <= 0)
-			break;
-		path = s;
-	}
-
-	return dt == DT_REG ? ino : 0;
-}
-
-static int ufs_openFile(const char *file, fileDescriptor *fd) {
-	char tmp[2];
-	int ino = 0;
-	fd->dmadat = (struct dmadat *) kmalloc(sizeof(struct dmadat));
-	ino = lookup(file, fd);
-	fd->offset = 0x0;
-	fd->ino = ino;
-	if (ino == 0x0) {
-		return (-1);
-	}
-
-	/* Quick Hack for file size */
-	fsread(fd->ino, &tmp, 1, fd);
-	fd->offset = 0;
-	/* Return */
-	fd->perms = 0x1;
-	return (0x1);
-}
-
-int ufs_readFile(fileDescriptor *fd, char *data, uInt32 offset, long size) {
-	return (fsread(fd->ino, data, size, fd));
-}
-
-int ufs_writeFile(fileDescriptor *fd, char *data, uInt32 offset, long size) {
-	kprintf("Writing :)\n");
-	return (0x0);
-}
-
-/*****************************************************************************************
-
- Function: int ufs_initialize()
-
- Description: This will initialize a mount point it loads the BAT and Caches the rootDir
-
- Notes:
-
- *****************************************************************************************/
-int ufs_initialize(struct vfs_mountPoint *mp) {
-	/* Return */
-	return (0x1);
-}
-
-int ufs_init() {
-	/* Build our ufs struct */
-	struct fileSystem ufs = { NULL, /* prev        */
-	NULL, /* next        */
-	(void *) ufs_initialize, /* vfsInitFS   */
-	(void *) ufs_readFile, /* vfsRead     */
-	(void *) ufs_writeFile, /* vfsWrite    */
-	(void *) ufs_openFile, /* vfsOpenFile */
-	NULL, /* vfsUnlink   */
-	NULL, /* vfsMakeDir  */
-	NULL, /* vfsRemDir   */
-	NULL, /* vfsSync     */
-	0xAA, /* vfsType     */
-	}; /* UFS */
-
-	if (vfsRegisterFS(ufs) != 0x0) {
-		kpanic("Unable To Enable UFS");
-		return (0x1);
-	}
-	//dmadat = (struct dmadat *)kmalloc(sizeof(struct dmadat));
-	/* Return */
-	return (0x0);
-}
-
-/***
- END
- ***/
diff --git a/sys/fs/vfs/Makefile b/sys/fs/vfs/Makefile
deleted file mode 100644
index fb5ef9d..0000000
--- a/sys/fs/vfs/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#  Objects
-OBJS = mount.o file.o vfs.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.c.o:
-	$(CC)  ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.c.s:
-	$(CC)  ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.S.o:
-	$(CC)  ${CFLAGS} ${INCLUDES} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/fs/vfs/file.c b/sys/fs/vfs/file.c
deleted file mode 100644
index c0c36e5..0000000
--- a/sys/fs/vfs/file.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: file.c 169 2016-01-20 01:10:22Z reddawg $
-
- *****************************************************************************************/
-
-#include <vfs/vfs.h>
-#include <vfs/file.h>
-#include <ubixos/sched.h>
-#include <ubixos/vitals.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/spinlock.h>
-#include <lib/kmalloc.h>
-#include <lib/string.h>
-#include <vmm/paging.h>
-#include <lib/kprintf.h>
-#include <assert.h>
-
-static struct spinLock fdTable_lock = SPIN_LOCK_INITIALIZER;
-
-fileDescriptor *fdTable = 0x0;
-
-int sys_fwrite( struct thread *td, struct sys_fwrite_args *uap ) {
-  char *t = uap->buf;
-
-  kprintf( "uap->size: %i, FD: [0x%X], BUF: [0x%X][%c]\n", uap->nbytes, uap->fd, uap->buf, t[0] );
-
-  if ( uap->fd == 0x0 )
-    tty_print( (char *) uap->buf, _current->term );
-  else
-    fwrite( uap->buf, uap->nbytes, 1, uap->fd->fd );
-
-  td->td_retval[0] = 0x0;
-
-  return (0);
-}
-
-/* USER */
-
-void sysFwrite( char *ptr, int size, userFileDescriptor *userFd ) {
-  if ( userFd == 0x0 ) {
-    tty_print( ptr, _current->term );
-  }
-  else {
-    fwrite( ptr, size, 1, userFd->fd );
-  }
-  return;
-}
-
-int sys_fgetc( struct thread *td, struct sys_fgetc_args *args ) {
-  char c;
-
-  if ( args->FILE->fd == 0x0 ) {
-
-    while ( 1 ) {
-
-      if ( _current->term == tty_foreground ) {
-        c = getchar();
-
-        if ( c != 0x0 ) {
-          td->td_retval[0] = c;
-          return (0);
-        }
-
-        sched_yield();
-
-      }
-      else {
-        sched_yield();
-      }
-      /*
-       else {
-       kprintf("Waking Task: %i\n",tty_foreground->owner);
-       sched_setStatus(tty_foreground->owner,READY);
-       kprintf("Sleeping Task: %i\n",_current->id);
-       sched_setStatus(_current->id,WAIT);
-       sched_yield();
-       }
-       */
-    }
-  }
-  else {
-    c = fgetc( args->FILE->fd );
-    td->td_retval[0] = c;
-    return (0);
-  }
-}
-
-void sysRmDir() {
-  return;
-}
-
-//int sys_fseek(userFileDescriptor *userFd,long offset,int whence) {
-int sys_fseek( struct thread *td, struct sys_fseek_args *args ) {
-  // TODO : coredump?
-  if ( args->FILE == NULL ) {
-    td->td_retval[0] = -1;
-    return (-1);
-  }
-
-  if ( args->FILE->fd == NULL ) {
-    td->td_retval[0] = -1;
-    return (-1);
-  }
-
-  args->FILE->fd->offset = args->offset + args->whence;
-  return (0);
-}
-
-int sys_chdir( struct thread *td, struct sys_chdir_args *args ) {
-  if ( strstr( args->path, ":" ) == 0x0 ) {
-    sprintf( _current->oInfo.cwd, "%s%s", _current->oInfo.cwd, args->path );
-  }
-  else {
-    sprintf( _current->oInfo.cwd, args->path );
-  }
-  return (0);
-}
-
-int sysUnlink( const char *path, int *retVal ) {
-  *retVal = unlink( path );
-  return (*retVal);
-}
-
-/************************************************************************
-
- Function: void sysFopen();
- Description: Opens A File Descriptor For A User Task
- Notes:
-
- ************************************************************************/
-//void sysFopen(const char *file,char *flags,userFileDescriptor *userFd) {
-int sys_fopen( struct thread *td, struct sys_fopen_args *args ) {
-  if ( args->FILE == NULL ) {
-    kprintf( "Error: userFd == NULL, File: %s, Line: %i\n", __FILE__, __LINE__ );
-    return (-1);
-  }
-
-  args->FILE->fd = fopen( args->path, args->mode );
-  if ( args->FILE->fd != 0x0 ) {
-    args->FILE->fdSize = args->FILE->fd->size;
-  }
-  /* Return */
-  return (0);
-}
-
-/************************************************************************
-
- Function: void sysFread();
- Description: Reads SIZE Bytes From The userFd Into DATA
- Notes:
-
- ************************************************************************/
-int sys_fread( struct thread *td, struct sys_fread_args *args ) {
-//void *data,long size,userFileDescriptor *userFd) {
-
-  /* TODO : coredump? */
-  if ( args->FILE == NULL )
-    return (-1);
-
-  if ( args->FILE->fd == NULL )
-    return (-1);
-
-  return (fread( args->ptr, args->size, args->nmemb, args->FILE->fd ));
-}
-
-/************************************************************************
-
- Function: void sysFclse();
- Description: Closes A File Descriptor For A User Task
- Notes:
-
- ************************************************************************/
-int sys_fclose( struct thread *td, struct sys_fclose_args *args ) {
-  if ( args->FILE == NULL ) {
-    return (-1);
-  }
-  if ( args->FILE == NULL ) {
-    return (-1);
-  }
-
-  /* Return */
-  return (fclose( args->FILE ));
-}
-
-/* KERNEL */
-
-size_t fread( void *ptr, size_t size, size_t nmemb, fileDescriptor *fd ) {
-  size_t i = 0x0;
-
-  if ( fd == 0x0 )
-    return (0x0);
-
-  if ( nmemb == 0x0 )
-    nmemb = 1; //Temp Fix
-
-  assert( fd );
-  assert( fd->mp );
-  assert( fd->mp->fs );
-
-  i = fd->mp->fs->vfsRead( fd, ptr, fd->offset, size * nmemb );
-
-  fd->offset += size * nmemb;
-
-  //kprintf("fread: %i:%i",i,size *nmemb);
-
-  return (i);
-}
-
-size_t fwrite( void *ptr, int size, int nmemb, fileDescriptor *fd ) {
-  if ( fd != 0x0 ) {
-    fd->mp->fs->vfsWrite( fd, ptr, fd->offset, size * nmemb );
-    fd->offset += size * nmemb;
-  }
-  return (0x0);
-}
-
-int fseek( fileDescriptor *tmpFd, long offset, int whence ) {
-  tmpFd->offset = offset + whence;
-  return (tmpFd->offset);
-}
-
-/************************************************************************
-
- Function: int feof(fileDescriptor *fd)
- Description: Check A File Descriptor For EOF And Return Result
- Notes:
-
- ************************************************************************/
-int feof( fileDescriptor *fd ) {
-  if ( fd->status == fdEof ) {
-    return (-1);
-  }
-  return (0);
-}
-
-/************************************************************************
-
- Function: int fputc(int ch,fileDescriptor *fd)
- Description: This Will Write Character To FD
- Notes:
-
- ************************************************************************/
-int fputc( int ch, fileDescriptor *fd ) {
-  if ( fd != 0x0 ) {
-    ch = fd->mp->fs->vfsWrite( fd, (char *) ch, fd->offset, 1 );
-    fd->offset++;
-    return (ch);
-  }
-  /* Return NULL If FD Is Not Found */
-  return (0x0);
-}
-
-/************************************************************************
-
- Function: int fgetc(fileDescriptor *fd)
- Description: This Will Return The Next Character In A FD Stream
- Notes:
-
- ************************************************************************/
-int fgetc( fileDescriptor *fd ) {
-  int ch = 0x0;
-  /* If Found Return Next Char */
-  if ( fd != 0x0 ) {
-    fd->mp->fs->vfsRead( fd, (char *) &ch, fd->offset, 1 );
-    fd->offset++;
-    return (ch);
-  }
-
-  /* Return NULL If FD Is Not Found */
-  return (0x0);
-}
-
-/************************************************************************
-
- Function: fileDescriptor *fopen(const char *file,cont char *flags)
- Description: This Will Open A File And Return A File Descriptor
- Notes:
-
- 08/05/02 - Just Started A Rewrite Of This Function Should Work Out Well
-
- ************************************************************************/
-
-fileDescriptor *fopen( const char *file, const char *flags ) {
-  int i = 0x0;
-  char *path = 0x0;
-  char *mountPoint = 0x0;
-  char fileName[1024];
-  fileDescriptor *tmpFd = 0x0;
-
-  /* Allocate Memory For File Descriptor */
-  if ( (tmpFd = (fileDescriptor *) kmalloc( sizeof(fileDescriptor) )) == 0x0 ) {
-    kprintf( "Error: tmpFd == NULL, File: %s, Line: %i\n", __FILE__, __LINE__ );
-    return (NULL);
-  }
-
-  strcpy( fileName, file );
-
-  if ( strstr( fileName, ":" ) ) {
-    mountPoint = (char *) strtok( (char *) &fileName, ":" );
-    path = strtok( NULL, "\n" );
-  }
-  else {
-    path = fileName;
-  }
-
-  if ( path[0] == '/' )
-    strcpy( tmpFd->fileName, path );
-  else
-    sprintf( tmpFd->fileName, "/%s", path );
-
-  /* Find our mount point or set default to sys */
-  if ( mountPoint == 0x0 )
-    tmpFd->mp = vfs_findMount( "sys" );
-  else
-    tmpFd->mp = vfs_findMount( mountPoint );
-
-  if ( tmpFd->mp == 0x0 ) {
-    kprintf( "Mount Point Bad\n" );
-    return (0x0);
-  }
-
-  /* This Will Set Up The Descriptor Modes */
-  tmpFd->mode = 0;
-  for ( i = 0; '\0' != flags[i]; i++ ) {
-    switch ( flags[i] ) {
-      case 'w':
-        case 'W':
-        tmpFd->mode |= fileWrite;
-        break;
-      case 'r':
-        case 'R':
-        tmpFd->mode |= fileRead;
-        break;
-      case 'b':
-        case 'B':
-        tmpFd->mode |= fileBinary;
-        break;
-      case 'a':
-        case 'A':
-        tmpFd->mode |= fileAppend;
-        break;
-      default:
-        kprintf( "Invalid mode '%c' for fopen\n", flags[i] );
-        break;
-    }
-  }
-  /* Search For The File */
-  if ( tmpFd->mp->fs->vfsOpenFile( tmpFd->fileName, tmpFd ) == 0x1 ) {
-    /* If The File Is Found Then Set Up The Descriptor */
-
-    /* in order to save resources we will allocate the buffer later when it is needed */
-
-    tmpFd->buffer = (char *) kmalloc( 4096 );
-    if ( tmpFd->buffer == 0x0 )
-        {
-      kfree( tmpFd );
-      kprintf( "Error: tmpFd->buffer == NULL, File: %s, Line: %i\n", __FILE__, __LINE__ );
-      spinUnlock( &fdTable_lock );
-      return 0x1;
-    }
-    /* Set Its Status To Open */
-    tmpFd->status = fdOpen;
-
-    /* Initial File Offset Is Zero */
-    tmpFd->offset = 0;
-    tmpFd->prev = 0x0;
-
-    /* we do not want to be in a spinlock longer than we need to, so
-     it has been moved to here. */
-    spinLock( &fdTable_lock );
-
-    /* Increment Number Of Open Files */
-    systemVitals->openFiles++;
-
-    tmpFd->next = fdTable;
-
-    if ( fdTable != 0x0 )
-      fdTable->prev = tmpFd;
-
-    fdTable = tmpFd;
-
-    spinUnlock( &fdTable_lock );
-
-    /* Return The FD */
-    return (tmpFd);
-  }
-  else {
-    kfree( tmpFd->buffer );
-    kfree( tmpFd );
-    spinUnlock( &fdTable_lock );
-    //MrOlsen (2016-01-13) NOTE: We don't need this right now kprintf("File Not Found? %s\n",file);
-    return (NULL);
-  }
-
-  /* Return NULL */
-  return (0x0);
-}
-
-/************************************************************************
-
- Function: int fclose(fileDescriptor *fd);
- Description: This Will Close And Free A File Descriptor
- Notes:
-
- ************************************************************************/
-int fclose( fileDescriptor *fd ) {
-  fileDescriptor *tmpFd = 0x0;
-  assert( fd );
-
-  spinLock( &fdTable_lock );
-
-  for ( tmpFd = fdTable; tmpFd != 0x0; tmpFd = tmpFd->next ) {
-    if ( tmpFd == fd ) {
-      if ( tmpFd->prev )
-        tmpFd->prev->next = tmpFd->next;
-      if ( tmpFd->next )
-        tmpFd->next->prev = tmpFd->prev;
-
-      if ( tmpFd == fdTable )
-        fdTable = tmpFd->next;
-
-      systemVitals->openFiles--;
-      spinUnlock( &fdTable_lock );
-      if ( tmpFd->buffer != NULL )
-        kfree( tmpFd->buffer );
-      kfree( tmpFd );
-      return (0x0);
-    }
-  }
-
-  spinUnlock( &fdTable_lock );
-  return (0x1);
-}
-
-/* UBU */
-
-/************************************************************************
-
- Function: void sysMkDir(const char *path)
- Description: This Will Create A New Directory
- Notes:
-
- ************************************************************************/
-void sysMkDir( const char *path ) {
-  fileDescriptor *tmpFD = 0x0;
-  char tmpDir[1024];
-  char rootPath[256];
-  char *dir = 0x0; //UBU*mountPoint = 0x0;
-  char *tmp = 0x0;
-  rootPath[0] = '\0';
-  dir = (char *) path;
-
-  if ( strstr( path, ":" ) == 0x0 ) {
-    sprintf( tmpDir, "%s%s", _current->oInfo.cwd, path );
-    dir = (char *) &tmpDir;
-  }
-  while ( strstr( dir, "/" ) ) {
-    if ( rootPath[0] == 0x0 )
-      sprintf( rootPath, "%s/", strtok( dir, "/" ) );
-    else
-      sprintf( rootPath, "%s%s/", rootPath, strtok( dir, "/" ) );
-    tmp = strtok( NULL, "\n" );
-    dir = tmp;
-  }
-
-  //kprintf("rootPath: [%s]\n",rootPath);
-  tmpFD = fopen( rootPath, "rb" );
-
-  if ( tmpFD->mp == 0x0 ) {
-    kprintf( "Invalid Mount Point\n" );
-  }
-  tmpFD->mp->fs->vfsMakeDir( dir, tmpFD );
-
-  fclose( tmpFD );
-
-  return;
-}
-
-/************************************************************************
-
- Function: int unlink(const char *node)
- Description: This will unlink a file
- Notes:
-
- ************************************************************************/
-
-int unlink( const char *node ) {
-  char *path = 0x0, *mountPoint = 0x0;
-  struct vfs_mountPoint *mp = 0x0;
-
-  path = (char *) strtok( (char *) node, "@" );
-  mountPoint = strtok( NULL, "\n" );
-  if ( mountPoint == 0x0 ) {
-    mp = vfs_findMount( "sys" ); /* _current->oInfo.container; */
-  }
-  else {
-    mp = vfs_findMount( mountPoint );
-  }
-  if ( mp == 0x0 ) {
-    //kpanic("Mount Point Bad");
-    return (0x0);
-  }
-  mp->fs->vfsUnlink( path, mp );
-  return (0x0);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/fs/vfs/mount.c b/sys/fs/vfs/mount.c
deleted file mode 100644
index 4fc23cc..0000000
--- a/sys/fs/vfs/mount.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mount.c 169 2016-01-20 01:10:22Z reddawg $
-
- *****************************************************************************************/
-
-#include <vfs/mount.h>
-#include <ubixos/vitals.h>
-#include <ubixos/kpanic.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <lib/string.h>
-#include <sys/device.h>
-
-/************************************************************************
-
- Function: mount(int driveId,int partition,int fsType,char *mountPoint,char *perms)
-
- Description: mount adds a mount point and returns 0 if successful 1 if it fails
-
- Notes:
-
- ************************************************************************/
-int vfs_mount( int major, int minor, int partition, int vfsType, char *mountPoint, char *perms ) {
-  struct vfs_mountPoint *mp = 0x0;
-  struct device_node *device = 0x0;
-
-  /* Allocate Memory For Mount Point */
-  if ( (mp = (struct vfs_mountPoint *) kmalloc( sizeof(struct vfs_mountPoint) )) == NULL )
-    kprintf( "vfs_mount: failed to allocate mp\n" );
-
-  /* Copy Mount Point Into Buffer */
-  sprintf( mp->mountPoint, mountPoint );
-
-  /* Set Pointer To Physical Drive */
-  device = device_find( major, minor );
-
-  /* Set Up Mp Defaults */
-  mp->device = device;
-  mp->fs = (struct fileSystem *) vfsFindFS( vfsType );
-  mp->partition = partition;
-  mp->perms = *perms;
-
-  if ( mp->fs == 0x0 ) {
-    /* sysErr(systemErr,"File System Type: %i Not Found\n",fsType); */
-    kprintf( "File System Type: %i Not Found\n", vfsType );
-    return (0x1);
-  }
-  /*What is this for? 10/6/2006 */
-  /*
-   if (device != 0x0) {
-   mp->diskLabel = (struct ubixDiskLabel *)kmalloc(512);
-   mp->device->devInfo->read(mp->device->devInfo->info,mp->diskLabel,1,1);
-   kprintf("READING SECTOR");
-   }
-   */
-
-  /* Add Mountpoint If It Fails Free And Return */
-  if ( vfs_addMount( mp ) != 0x0 ) {
-    kfree( mp );
-    return (0x1);
-  }
-
-  /* Initialize The File System If It Fails Return */
-  if ( mp->fs->vfsInitFS( mp ) == 0x0 ) {
-    kfree( mp );
-    return (0x1);
-  }
-  /* Return */
-  return (0x0);
-}
-
-/************************************************************************
-
- Function: vfs_addMount(struct vfs_mountPoint *mp)
-
- Description: This function adds a mount point to the system
-
- Notes:
-
- ************************************************************************/
-int vfs_addMount( struct vfs_mountPoint *mp ) {
-
-  /* If There Are No Existing Mounts Make It The First */
-  if ( systemVitals->mountPoints == 0x0 ) {
-    mp->prev = 0x0;
-    mp->next = 0x0;
-    systemVitals->mountPoints = mp;
-  }
-  else {
-    mp->next = systemVitals->mountPoints;
-    systemVitals->mountPoints->prev = mp;
-    mp->prev = 0x0;
-    systemVitals->mountPoints = mp;
-  }
-  /* Return */
-  return (0x0);
-}
-
-/************************************************************************
-
- Function: vfs_findMount(char *mountPoint)
-
- Description: This function finds a particular mount point
-
- Notes:
-
- ************************************************************************/
-struct vfs_mountPoint *vfs_findMount( char *mountPoint ) {
-  struct vfs_mountPoint *tmpMp = 0x0;
-
-  for ( tmpMp = systemVitals->mountPoints; tmpMp; tmpMp = tmpMp->next ) {
-    if ( strcmp( tmpMp->mountPoint, mountPoint ) == 0x0 ) {
-      return (tmpMp);
-    }
-  }
-  /* Return NULL If Mount Point Not Found */
-  return NULL;
-}
-
-/***
- END
- ***/
-
diff --git a/sys/fs/vfs/vfs.c b/sys/fs/vfs/vfs.c
deleted file mode 100644
index f813947..0000000
--- a/sys/fs/vfs/vfs.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vfs.c 158 2016-01-19 02:08:13Z reddawg $
-
-*****************************************************************************************/
-
-#include <vfs/vfs.h>
-#include <ubixos/vitals.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <lib/string.h>
-#include <sys/kern_descrip.h>
-
-/************************************************************************
-
-Function: void vfs_init();
-
-Description: This Function Initializes The VFS Layer
-
-Notes:
-
-02/20/2004 - Approved for quality
-
-************************************************************************/
-int vfs_init() {
-  /* Set up default fileSystems list */
-  systemVitals->fileSystems = 0x0;
-
-  /* Print information */
-  kprintf("vfs0: loaded at address: [0x%X]\n",systemVitals->fileSystems);
-
-  /* Return so we know things went well */
-  return(0x0);
-  }
-
-struct fileSystem *vfsFindFS(int vfsType) {
-  struct fileSystem *tmp = 0x0;
-
-  /* Search For File System */
-  for (tmp=systemVitals->fileSystems;tmp;tmp=tmp->next) {
-    /* If Found Return File System */
-    if (tmp->vfsType == vfsType) {
-      return(tmp);
-      }
-    }
-
-  /* If FS Not Found Return NULL */
-  return(0x0);
-  }
-
-/*!
- * \brief register a file system
- *
- * This registers a new filesystem into the vfs which is referenced when trying to mount a device
- *
- * \param newFS pointer to fileSystem structure
- */
-int vfsRegisterFS(struct fileSystem newFS) {
-/*
-int vfsType,
-void *vfsInitFS,
-void *vfsRead,
-void *vfsWrite,
-void *vfsOpenFile,
-void *vfsUnlink,
-void *vfsMakeDir,
-void *vfsRemDir,
-void *vfsSync) {
- */
-  struct fileSystem *tmpFs = 0x0;
-
-  if (vfsFindFS(newFS.vfsType) != 0x0) {
-    kprintf("FS Is already Registered\n"); 
-    return(0x1);
-    }
-
-  /* Allocate Memory */
-  tmpFs = (struct fileSystem *)kmalloc(sizeof(struct fileSystem));
-  if (tmpFs == NULL) {
-	kprintf("vfsRegisterFS: memory allocation failed\n");
-    /* Memory Allocation Failed */
-    return(0x1);
-    }
-
-  /* Set Up FS Defaults */
-
-/* 2004 7-16-2004 mji 
- * Old method:
- * tmpFs->vfsType       = newFS.vfsType;
- * tmpFs->vfsInitFS     = newFS.vfsInitFS;
- * tmpFs->vfsRead       = newFS.vfsRead;
- * tmpFs->vfsWrite      = newFS.vfsWrite;
- * tmpFs->vfsOpenFile   = newFS.vfsOpenFile;
- * tmpFs->vfsUnlink     = newFS.vfsUnlink;
- * tmpFs->vfsMakeDir    = newFS.vfsMakeDir;
- * tmpFs->vfsRemDir     = newFS.vfsRemDir;
- * tmpFs->vfsSync       = newFS.vfsSync;
- */
- /* new method: */
-
-  memcpy(tmpFs, &newFS, sizeof(struct fileSystem)); 
-  if (!systemVitals->fileSystems) {
-    tmpFs->prev               = 0x0;
-    tmpFs->next               = 0x0;
-    systemVitals->fileSystems = tmpFs;
-    }
-  else {
-    tmpFs->prev                     = 0x0;
-    tmpFs->next                     = systemVitals->fileSystems;
-    systemVitals->fileSystems->prev = tmpFs;
-    systemVitals->fileSystems       = tmpFs;
-    }
-
-  return(0x0);
-  }
-
-/*!
- * \brief entry point for open syscall
- *
- * \param *td pointer to callers thread
- * \param *uap pointer to user space arguements for call
- *
- * \return index to file descriptor
- */
-int sys_open(struct thread *td, struct sys_open_args *args) {
-  int          error = 0x0;
-  int          index = 0x0;
-  struct file *nfp   = 0x0;
-
-  error = falloc(td,&nfp,&index);
-
-  if (error)
-     return(error);
-
-  strcpy(nfp->path, args->path);
-
-  nfp->fd = fopen(args->path,"r");
-  if (nfp->fd == 0x0)
-    td->td_retval[0] = -1;
-  else
-    td->td_retval[0] = index;
-  return (error);
-  }
-
-/* HACK */
-int fstatfs(struct thread *td, struct fstatfs_args *args) {
-  int error = 0x0;
-  args->buf->f_mntonname[0] = '/';
-  args->buf->f_mntonname[1] = '\0';
-  args->buf->f_flags = 0x0;
-  return(error);
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
deleted file mode 100644
index 4eceb09..0000000
--- a/sys/i386/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 202 2016-01-23 15:21:35Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = schedyield.o kpanic.o timer.o spinlock.o i386_exec.o sys_call_new.o sys_call.o syscall.o bioscall.o fork.o systemtask.o sched.o cpu.o trap.o 
-# ap-boot.o smp.o vitals.o(obsolete)
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) -DNOBOOL $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX) -DNOBOOL $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/i386/ap-boot.S b/sys/i386/ap-boot.S
deleted file mode 100644
index 2645aff..0000000
--- a/sys/i386/ap-boot.S
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Okay, this file contains the code that's going to bootstrap the AP cpus
- */
-
-
-	.globl	ap_trampoline_start,ap_trampoline_end
-	.text
-	.code16
-ap_trampoline_start:
-	cli
-	cld
-
-	movw	%cs,%ax		// The CPU knows its CS already, so lets use it for the other segments
-	movw	%ax,%ds
-	movw	%ax,%es
-	movw	%ax,%ss
-
-	// Do some bochs-specific bullshit
-	mov	$0x31,%al // '1'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-        //lgdt    ap_gdt;	
-	lgdt	ap_trampoline_gdt_limit - ap_trampoline_start
-	movl	%cr0,%eax
-	orl	$0x1,%eax
-	movl	%eax,%cr0	// PMODE!
-
-.code32
-	.byte 0x66
-	ljmp	$0x08,$(ap_trampoline_32 - ap_trampoline_start)		// 0x08 == KERNEL_CS
-
-ap_trampoline_32:
-	mov	$0x32,%al // '2'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-
-	mov	$0x10,%ax
-	mov	%ax,%ds
-	mov	%ax,%es
-	mov	%ax,%fs
-	mov	%ax,%gs
-	mov	%ax,%ss
-
-	// Spinlock
-	mov	ap_trampoline_spl - ap_trampoline_start,%edi
-ap_spl:
-	//cmp	$1,(%edi)
-	//je	ap_spl
-
-	mov	$1,%eax	     // Value to be set
-	xchgl	(%edi),%eax
-	cmp	$0,%eax
-	je	ap_spl
-	// /Spinlock
-
-	mov	$0x30,%al // '0'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-		
-	mov	ap_trampoline_stackptr - ap_trampoline_start,%ebx
-	mov	%ebx,%esp
-	add	$0x1000,%ebx
-	mov	%ebx,ap_trampoline_stackptr - ap_trampoline_start
-
-	mov	$0x31,%al // '1'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-
-	// spinunlock
-	mov	$0,%eax
-	mov	ap_trampoline_spl - ap_trampoline_start,%edi
-	xchgl	(%edi),%eax
-	// /spinunlock
-
-	mov	$0x33,%al // '3'
-	mov	$0xe9,%dx
-	outb	%al,%dx
-
-	mov	ap_trampoline_epoint,%eax
-	call	*%eax
-1:
-	hlt
-	jmp	1b		// Halt if we ever get here somehow
-
-	// Stack.. This sucks, since CPU initialization isn't serialized
-ap_trampoline_stackptr:
-	.long	0x10000		// 256KB
-ap_trampoline_epoint:
-	.long	c_ap_boot
-
-ap_trampoline_spl:
-	.long	0
-ap_gdt:
-	.long ubixGDT
-	
-	// GDT
-ap_trampoline_gdt:
-	.word	0
-ap_trampoline_gdt_limit:
-	.word	128	// Room for 32 descriptors
-ap_trampoline_gdt_base:
-	.long	0x20000		// 128KB (move this later)
-
-
-ap_trampoline_end:
diff --git a/sys/i386/bioscall.c b/sys/i386/bioscall.c
deleted file mode 100644
index d0301de..0000000
--- a/sys/i386/bioscall.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: bioscall.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/tss.h>
-#include <ubixos/sched.h>
-#include <vmm/vmm.h>
-#include <lib/kmalloc.h>
-#include <lib/bioscall.h>
-#include <lib/string.h>
-#include <sys/video.h>
-#include <assert.h>
-
-
-asm(
-  ".globl bios16Code\n"
-//  ".code16          \n"
-  "bios16Code:      \n"
-  "int $0x10        \n"
-  "int $0x69        \n"
-//  ".code32          \n"
-  );
-
-  
-void biosCall(int biosInt,int eax,int ebx,int ecx,int edx,int esi,int edi,int es,int ds) {
-  short segment = 0x0,offset = 0x0;
-  uInt32 tmpAddr = (uInt32)&bios16Code;
-  kTask_t *newProcess = 0x0;
-
-  offset = tmpAddr & 0xF;  // lower 4 bits
-  segment = tmpAddr >> 4;
-  
-  newProcess = schedNewTask();
-  assert(newProcess);
-
-
-  newProcess->tss.back_link    = 0x0;
-  newProcess->tss.esp0         = (uInt32)kmalloc(0x2000)+0x2000;
-  newProcess->tss.ss0          = 0x10;
-  newProcess->tss.esp1         = 0x0;
-  newProcess->tss.ss1          = 0x0;
-  newProcess->tss.esp2         = 0x0;
-  newProcess->tss.ss2          = 0x0;
-  newProcess->tss.cr3          = (uInt32)_current->tss.cr3;//(uInt32)vmmCreateVirtualSpace(newProcess->id);
-  newProcess->tss.eip          =  offset & 0xFFFF;
-  newProcess->tss.eflags       = 2 | EFLAG_IF | EFLAG_VM;
-  newProcess->tss.eax          =     eax & 0xFFFF;
-  newProcess->tss.ebx          =     ebx & 0xFFFF;
-  newProcess->tss.ecx          =     ecx & 0xFFFF;
-  newProcess->tss.edx          =     edx & 0xFFFF;
-  newProcess->tss.esp          =  0x1000 & 0xFFFF;
-  newProcess->tss.ebp          =  0x1000 & 0xFFFF;
-  newProcess->tss.esi          =     esi & 0xFFFF;
-  newProcess->tss.edi          =     edi & 0xFFFF;
-  newProcess->tss.es           =      es & 0xFFFF;
-  newProcess->tss.cs           = segment & 0xFFFF;
-  newProcess->tss.ss           =  0x1000 & 0xFFFF;
-  newProcess->tss.ds           =      ds & 0xFFFF;
-  newProcess->tss.fs           =     0x0 & 0xFFFF;
-  newProcess->tss.gs           =     0x0 & 0xFFFF;
-  newProcess->tss.ldt          =     0x0 & 0xFFFF;
-  newProcess->tss.trace_bitmap =     0x0 & 0xFFFF;
-  newProcess->tss.io_map       =     0x0 & 0xFFFF;
-  newProcess->tss.io_map       = sizeof(struct tssStruct)-8192;
-  newProcess->oInfo.v86Task    = 0x1;
-
-  newProcess->state = READY;
-
-  while (newProcess->state > 0);
-
-  return;
-  }    
-
-/***
- END
- ***/
-
diff --git a/sys/i386/cpu.c b/sys/i386/cpu.c
deleted file mode 100644
index 21f2667..0000000
--- a/sys/i386/cpu.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: cpu.c 89 2016-01-12 00:20:40Z reddawg $
-
- *****************************************************************************************/
-
-#include <i386/cpu.h>
diff --git a/sys/i386/fork.c b/sys/i386/fork.c
deleted file mode 100644
index e1249c8..0000000
--- a/sys/i386/fork.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fork.c 184 2016-01-23 01:38:22Z reddawg $
-
- *****************************************************************************************/
-
-#include <ubixos/fork.h>
-#include <sys/types.h>
-#include <ubixos/sched.h>
-#include <ubixos/tty.h>
-#include <ubixos/vitals.h>
-#include <vmm/vmm.h>
-#include <string.h>
-#include <assert.h>
-#include <lib/kprintf.h>
-
-int sys_fork( struct thread *td, struct sys_fork_args *args ) {
-  struct taskStruct *newProcess;
-
-  newProcess = schedNewTask();
-
-  /*
-   *
-   * Initalize New Task Information From Parrent
-   *
-   */
-
-  /* Set CWD */
-  memcpy( newProcess->oInfo.cwd, _current->oInfo.cwd, 1024 );
-
-  /* Set Up Task State */
-  newProcess->tss.eip = td->frame->tf_eip;
-  newProcess->oInfo.vmStart = _current->oInfo.vmStart;
-  newProcess->term = _current->term;
-  newProcess->term->owner = newProcess->id;
-  newProcess->uid = _current->uid;
-  newProcess->gid = _current->gid;
-  newProcess->tss.back_link = 0x0;
-  newProcess->tss.esp0 = _current->tss.esp0;
-  newProcess->tss.ss0 = 0x10;
-  newProcess->tss.esp1 = 0x0;
-  newProcess->tss.ss1 = 0x0;
-  newProcess->tss.esp2 = 0x0;
-  newProcess->tss.ss2 = 0x0;
-  newProcess->tss.eflags = td->frame->tf_eflags;
-  newProcess->tss.eax = 0x0;
-  newProcess->tss.ebx = td->frame->tf_ebx;
-  newProcess->tss.ecx = td->frame->tf_ecx;
-  newProcess->tss.edx = td->frame->tf_edx;
-  newProcess->tss.esi = td->frame->tf_esi;
-  newProcess->tss.edi = td->frame->tf_edi;
-  newProcess->tss.ebp = td->frame->tf_ebp;
-  newProcess->tss.esp = td->frame->tf_esp;
-  newProcess->tss.cs = td->frame->tf_cs; // & 0xFF;
-  newProcess->tss.ss = td->frame->tf_ss; // & 0xFF;
-  newProcess->tss.ds = td->frame->tf_ds; //_current->tss.ds & 0xFF;
-  newProcess->tss.fs = td->frame->tf_fs; //_current->tss.fs & 0xFF;
-  newProcess->tss.gs = _current->tss.gs & 0xFF;
-  newProcess->tss.es = td->frame->tf_es; //_current->tss.es & 0xFF;
-  newProcess->tss.ldt = 0x18;
-  newProcess->tss.trace_bitmap = 0x0000;
-  newProcess->tss.io_map = 0x8000;
-
-  newProcess->td.vm_tsize = _current->td.vm_tsize;
-  newProcess->td.vm_taddr = _current->td.vm_taddr;
-  newProcess->td.vm_dsize = _current->td.vm_dsize;
-  newProcess->td.vm_daddr = _current->td.vm_daddr;
-
-  newProcess->tss.cr3 = (uInt32) vmm_copyVirtualSpace( newProcess->id );
-
-  newProcess->state = FORK;
-
-  /* Fix gcc optimization problems */
-  while ( newProcess->state == FORK )
-    sched_yield();
-
-  /* Return Id of Proccess */
-  return (newProcess->id);
-
-}
-
-/*****************************************************************************************
- Functoin: static int fork_copyProcess(struct taskStruct *newProcess,long ebp,long edi,
- long esi, long none,long ebx,long ecx,long edx,long eip,long cs,long eflags,
- long esp,long ss)
-
- Desc: This function will copy a process
-
- Notes:
-
- *****************************************************************************************/
-
-/* Had to remove static though tihs function is only used in this file */
-int fork_copyProcess( struct taskStruct *newProcess, long ebp, long edi, long esi, long none, long ebx, long ecx, long edx, long eip, long cs, long eflags, long esp, long ss ) {
-  volatile struct taskStruct * tmpProcPtr = newProcess;
-  assert( newProcess );
-  assert (_current);
-
-  /* Set Up New Tasks Information */
-  memcpy( newProcess->oInfo.cwd, _current->oInfo.cwd, 1024 );
-
-  newProcess->tss.eip = eip;
-  newProcess->oInfo.vmStart = _current->oInfo.vmStart;
-  newProcess->term = _current->term;
-  newProcess->term->owner = newProcess->id;
-  newProcess->uid = _current->uid;
-  newProcess->gid = _current->gid;
-  newProcess->tss.back_link = 0x0;
-  newProcess->tss.esp0 = _current->tss.esp0;
-  newProcess->tss.ss0 = 0x10;
-  newProcess->tss.esp1 = 0x0;
-  newProcess->tss.ss1 = 0x0;
-  newProcess->tss.esp2 = 0x0;
-  newProcess->tss.ss2 = 0x0;
-  newProcess->tss.eflags = eflags;
-  newProcess->tss.eax = 0x0;
-  newProcess->tss.ebx = ebx;
-  newProcess->tss.ecx = ecx;
-  newProcess->tss.edx = edx;
-  newProcess->tss.esi = esi;
-  newProcess->tss.edi = edi;
-  newProcess->tss.ebp = ebp;
-  newProcess->tss.esp = esp;
-  newProcess->tss.cs = cs & 0xFF;
-  newProcess->tss.ss = ss & 0xFF;
-  newProcess->tss.ds = _current->tss.ds & 0xFF;
-  newProcess->tss.fs = _current->tss.fs & 0xFF;
-  newProcess->tss.gs = _current->tss.gs & 0xFF;
-  newProcess->tss.es = _current->tss.es & 0xFF;
-  newProcess->tss.ldt = 0x18;
-  newProcess->tss.trace_bitmap = 0x0000;
-  newProcess->tss.io_map = 0x8000;
-
-  newProcess->td.vm_tsize = _current->td.vm_tsize;
-  newProcess->td.vm_taddr = _current->td.vm_taddr;
-  newProcess->td.vm_dsize = _current->td.vm_dsize;
-  newProcess->td.vm_daddr = _current->td.vm_daddr;
-
-  /* Create A Copy Of The VM Space For New Task */
-  newProcess->tss.cr3 = (uInt32) vmm_copyVirtualSpace( newProcess->id );
-
-  newProcess->state = FORK;
-
-  /* Fix gcc optimization problems */
-  while ( tmpProcPtr->state == FORK )
-    sched_yield();
-
-  /* Return Id of Proccess */
-  return (newProcess->id);
-}
-
-void qT() {
-  kprintf( "qT\n" );
-}
-
-/*****************************************************************************************
- Functoin: void sysFork();
-
- Desc: This function will fork a new task
-
- Notes:
-
- 08/01/02 - This Seems To Be Working Fine However I'm Not Sure If I
- Chose The Best Path To Impliment It I Guess We Will See
- What The Future May Bring
-
- *****************************************************************************************/
-//asm volatile(
-__asm(
-    ".globl sysFork_old       \n"
-    "sysFork_old:                 \n"
-    "  xor   %eax,%eax        \n"
-    "  call  schedNewTask     \n"
-    "  testl %eax,%eax        \n"
-    "  je fork_ret            \n"
-    "  pushl %esi             \n"
-    "  pushl %edi             \n"
-    "  pushl %ebp             \n"
-    "  pushl %eax             \n"
-    "  call  fork_copyProcess \n"
-    "  movl  %eax,(%ebx)      \n"
-    "  addl  $16,%esp         \n"
-    "fork_ret:                \n"
-    "  ret                    \n"
-);
-
-/***
- END
- ***/
-
diff --git a/sys/i386/i386_exec.c b/sys/i386/i386_exec.c
deleted file mode 100644
index a0dc309..0000000
--- a/sys/i386/i386_exec.c
+++ /dev/null
@@ -1,925 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- MERCHANTABILITY AND F
- ITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE COPYRIGHT OWNER 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.
-
- $Id: i386_exec.c 240 2016-01-24 03:14:50Z reddawg $
-
- *****************************************************************************************/
-
-#include <ubixos/exec.h>
-#include <sys/elf.h>
-#include <sys/gdt.h>
-#include <ubixos/ld.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/endtask.h>
-#include <vmm/vmm.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <lib/string.h>
-#include <assert.h>
-
-#define STACK_ADDR 0xC800000
-
-#define AT_NULL         0       /* Terminates the vector. */
-#define AT_IGNORE       1       /* Ignored entry. */
-#define AT_EXECFD       2       /* File descriptor of program to load. */
-#define AT_PHDR         3       /* Program header of program already loaded. */
-#define AT_PHENT        4       /* Size of each program header entry. */
-#define AT_PHNUM        5       /* Number of program header entries. */
-#define AT_PAGESZ       6       /* Page size in bytes. */
-#define AT_BASE         7       /* Interpreter's base address. */
-#define AT_FLAGS        8       /* Flags (unused for i386). */
-#define AT_ENTRY        9       /* Where interpreter should transfer control. */
-
-//#define AUXARGS_ENTRY(pos, id, val) {memcpy((void *)pos++,(void *)id,sizeof(long)); memcpy((void *)pos++,(void *)val,sizeof(long));}
-#define AUXARGS_ENTRY(pos, id, val) {*pos = id;pos++; *pos = val;pos++;}
-
-//#define   PT_GNU_STACK    0x6474e551
-
-/* Temp Holder */
-int sys_execve( struct thread *td, struct sys_execve_args *args ) {
-  int ret = sys_exec( td, args->fname, args->argv, args->envp );
-  return (ret);
-}
-
-/*****************************************************************************************
-
- Function:   execThread(void (*)(void),int,char *);
- Description: This function will create a thread from code in the current memory space
-
- Notes:
-
- 05/19/04 - This does not work the way I want it to it still makes a copy of kernel space
- so do not use out side of kernel space
-
- *****************************************************************************************/
-uInt32 execThread( void (*tproc)( void ), uint32_t stack, char *arg ) {
-  kTask_t * newProcess = 0x0;
-  /* Find A New Thread */
-  newProcess = schedNewTask();
-
-  assert( newProcess );
-  if ( stack < 0x100000 )
-    kpanic( "exec: stack not in valid area: [0x%X]\n", stack );
-
-  /* Set All The Correct Thread Attributes */
-  newProcess->tss.back_link = 0x0;
-  newProcess->tss.esp0 = 0x0;
-  newProcess->tss.ss0 = 0x0;
-  newProcess->tss.esp1 = 0x0;
-  newProcess->tss.ss1 = 0x0;
-  newProcess->tss.esp2 = 0x0;
-  newProcess->tss.ss2 = 0x0;
-  newProcess->tss.cr3 = (unsigned int) kernelPageDirectory;
-  newProcess->tss.eip = (unsigned int) tproc;
-  newProcess->tss.eflags = 0x206;
-  newProcess->tss.esp = stack;
-  newProcess->tss.ebp = stack;
-  newProcess->tss.esi = 0x0;
-  newProcess->tss.edi = 0x0;
-
-  /* Set these up to be ring 3 tasks */
-  /*
-   newProcess->tss.es           = 0x30+3;
-   newProcess->tss.cs           = 0x28+3;
-   newProcess->tss.ss           = 0x30+3;
-   newProcess->tss.ds           = 0x30+3;
-   newProcess->tss.fs           = 0x30+3;
-   newProcess->tss.gs           = 0x30+3;
-   */
-
-  newProcess->tss.es = 0x10;
-  newProcess->tss.cs = 0x08;
-  newProcess->tss.ss = 0x10;
-  newProcess->tss.ds = 0x10;
-  newProcess->tss.fs = 0x10;
-  newProcess->tss.gs = 0x10;
-
-  newProcess->tss.ldt = 0x18;
-  newProcess->tss.trace_bitmap = 0x0000;
-  newProcess->tss.io_map = 0x8000;
-  newProcess->oInfo.vmStart = 0x6400000;
-
-  newProcess->imageFd = 0x0;
-
-  /* Set up default stack for thread here filled with arg list 3 times */
-  asm volatile(
-      "pusha               \n"
-      "movl   %%esp,%%ecx  \n"
-      "movl   %1,%%eax     \n"
-      "movl   %%eax,%%esp  \n"
-      "pushl  %%ebx        \n"
-      "pushl  %%ebx        \n"
-      "pushl  %%ebx        \n"
-      "movl   %%esp,%%eax  \n"
-      "movl   %%eax,%1     \n"
-      "movl   %%ecx,%%esp  \n"
-      "popa                \n"
-      :
-      : "b" (arg),"m" (newProcess->tss.esp)
-  );
-
-  /* Put new thread into the READY state */
-  sched_setStatus( newProcess->id, READY );
-
-  /* Return with the new process ID */
-  return ((uInt32) newProcess);
-}
-
-/*****************************************************************************************
-
- Function: void execFile(char *file);
- Description: This Function Executes A Kile Into A New VM Space With Out
- Having To Fork
- Notes:
-
- 07/30/02 - I Have Made Some Heavy Changes To This As Well As Fixed A Few
- Memory Leaks The Memory Allocated To Load The Binary Into Is
- Now Unmapped So It Can Be Used Again And Not Held Onto Until
- The Program Exits
-
- 07/30/02 - Now I Have To Make A Better Memory Allocator So We Can Set Up
- The Freshly Allocated Pages With The Correct Permissions
-
- *****************************************************************************************/
-void execFile( char *file, int argc, char **argv, int console ) {
-
-  int i = 0x0;
-  int x = 0x0;
-  uint32_t *tmp = 0x0;
-
-  fileDescriptor *tmpFd = 0x0;
-  elfHeader *binaryHeader = 0x0;
-  elfProgramHeader *programHeader = 0x0;
-
-  /* Get A New Task For This Proccess */
-  _current = schedNewTask();
-  assert (_current);
-
-  _current->gid = 0x0;
-  _current->uid = 0x0;
-  _current->term = tty_find( console );
-
-  if ( _current->term == 0x0 )
-    kprintf( "Error: invalid console\n" );
-
-  /* Set tty ownership */
-  _current->term->owner = _current->id;
-
-  /* Now We Must Create A Virtual Space For This Proccess To Run In */
-  _current->tss.cr3 = (uInt32) vmm_createVirtualSpace( _current->id );
-  /* To Better Load This Application We Will Switch Over To Its VM Space */
-  asm volatile(
-      "movl %0,%%eax          \n"
-      "movl %%eax,%%cr3       \n"
-      : : "d" ((uInt32 *)(_current->tss.cr3))
-  );
-  /* Lets Find The File */
-  tmpFd = fopen( file, "r" );
-
-  /* If We Dont Find the File Return */
-  if ( tmpFd == 0x0 ) {
-    kprintf( "Exec Format Error: Binary File Not Executable.\n" );
-    fclose( tmpFd );
-    return;
-  }
-  if ( tmpFd->perms == 0x0 ) {
-    kprintf( "Exec Format Error: Binary File Not Executable.\n" );
-    fclose( tmpFd );
-    return;
-  }
-
-  /* Load ELF Header */
-  binaryHeader = (elfHeader *) kmalloc( sizeof(elfHeader) );
-
-  fread( binaryHeader, sizeof(elfHeader), 1, tmpFd );
-
-  /* Check If App Is A Real Application */
-  if ( (binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F') ) {
-    kprintf( "Exec Format Error: Binary File Not Executable.\n" );
-    kfree( binaryHeader );
-    fclose( tmpFd );
-    return;
-  }
-  else if ( binaryHeader->eType != 2 ) {
-    kprintf( "Exec Format Error: Binary File Not Executable.\n" );
-    kfree( binaryHeader );
-    fclose( tmpFd );
-    return;
-  }
-  else if ( binaryHeader->eEntry == 0x300000 ) {
-    kprintf( "Exec Format Error: Binary File Not Executable.\n" );
-    kfree( binaryHeader );
-    fclose( tmpFd );
-    return;
-  }
-
-  _current->td.abi = binaryHeader->eIdent[EI_OSABI];
-
-  /* Load The Program Header(s) */
-  programHeader = (elfProgramHeader *) kmalloc( sizeof(elfProgramHeader) * binaryHeader->ePhnum );
-  fseek( tmpFd, binaryHeader->ePhoff, 0 );
-
-  //kprintf(">c:%i:0x%X:0x%X<",sizeof(elfProgramHeader)*binaryHeader->ePhnum,programHeader,tmpFd);
-  fread( programHeader, (sizeof(elfProgramHeader) * binaryHeader->ePhnum), 1, tmpFd );
-  //kprintf(">d<");
-
-  /* Loop Through The Header And Load Sections Which Need To Be Loaded */
-  for ( i = 0; i < binaryHeader->ePhnum; i++ ) {
-    if ( programHeader[i].phType == 1 ) {
-      /*
-       Allocate Memory Im Going To Have To Make This Load Memory With Correct
-       Settings so it helps us in the future
-       */
-      for ( x = 0x0; x < (programHeader[i].phMemsz); x += 0x1000 ) {
-        /* Make readonly and read/write !!! */
-        if ( vmm_remapPage( vmm_findFreePage( _current->id ), ((programHeader[i].phVaddr & 0xFFFFF000) + x), PAGE_DEFAULT ) == 0x0 )
-          K_PANIC( "Remap Page Failed" );
-
-        memset( (void *) ((programHeader[i].phVaddr & 0xFFFFF000) + x), 0x0, 0x1000 );
-
-      }
-      _current->oInfo.vmStart = 0x80000000;
-      _current->td.vm_daddr = (u_long) (programHeader[i].phVaddr & 0xFFFFF000);
-      /* Now Load Section To Memory */
-      fseek( tmpFd, programHeader[i].phOffset, 0 );
-      fread( (void *) programHeader[i].phVaddr, programHeader[i].phFilesz, 1, tmpFd );
-      if ( (programHeader[i].phFlags & 0x2) != 0x2 ) {
-        kprintf( "pH: [0x%X]\n", programHeader[i].phMemsz );
-        for ( x = 0x0; x < (programHeader[i].phMemsz); x += 0x1000 ) {
-          if ( (vmm_setPageAttributes( (programHeader[i].phVaddr & 0xFFFFF000) + x, PAGE_PRESENT | PAGE_USER )) != 0x0 )
-            kpanic( "Error: vmm_setPageAttributes failed, File: %s, Line: %i\n", __FILE__, __LINE__ );
-        }
-      }
-    }
-  }
-
-  /* Set Virtual Memory Start */
-  _current->oInfo.vmStart = 0x80000000;
-  _current->td.vm_daddr = (u_long) (programHeader[i].phVaddr & 0xFFFFF000);
-
-  /* Set Up Stack Space */
-  //MrOlsen (2016-01-14) FIX: is the stack start supposed to be addressable xhcnage x= 1 to x=0
-  for ( x = 0; x < 100; x++ ) {
-    vmm_remapPage( vmm_findFreePage( _current->id ), STACK_ADDR - (x * 0x1000), PAGE_DEFAULT | PAGE_STACK );
-  }
-
-  /* Kernel Stack 0x2000 bytes long */
-  vmm_remapPage( vmm_findFreePage( _current->id ), 0x5BC000, KERNEL_PAGE_DEFAULT | PAGE_STACK );
-  vmm_remapPage( vmm_findFreePage( _current->id ), 0x5BB000, KERNEL_PAGE_DEFAULT | PAGE_STACK );
-
-  /* Set All The Proper Information For The Task */
-  _current->tss.back_link = 0x0;
-  _current->tss.esp0 = 0x5BC000;
-  _current->tss.ss0 = 0x10;
-  _current->tss.esp1 = 0x0;
-  _current->tss.ss1 = 0x0;
-  _current->tss.esp2 = 0x0;
-  _current->tss.ss2 = 0x0;
-  _current->tss.eip = (long) binaryHeader->eEntry;
-  _current->tss.eflags = 0x206;
-  _current->tss.esp = STACK_ADDR - 16;
-  _current->tss.ebp = STACK_ADDR;
-  _current->tss.esi = 0x0;
-  _current->tss.edi = 0x0;
-
-  /* Set these up to be ring 3 tasks */
-  _current->tss.es = 0x30 + 3;
-  _current->tss.cs = 0x28 + 3;
-  _current->tss.ss = 0x30 + 3;
-  _current->tss.ds = 0x30 + 3;
-  _current->tss.fs = 0x30 + 3;
-  _current->tss.gs = 0x50 + 3; //0x30 + 3;
-
-  _current->tss.ldt = 0x18;
-  _current->tss.trace_bitmap = 0x0000;
-  _current->tss.io_map = 0x8000;
-
-  sched_setStatus( _current->id, READY );
-
-  kfree( binaryHeader );
-  kfree( programHeader );
-  fclose( tmpFd );
-
-  tmp = (uInt32 *) _current->tss.esp0 - 5;
-  tmp[0] = binaryHeader->eEntry;
-  tmp[3] = STACK_ADDR - 12;
-
-  //tmp = (uInt32 *) STACK_ADDR - 2;
-  tmp = (uint32_t *) _current->tss.esp;
-
-  /*
-   if ( _current->id > 4 )
-   kprintf( "argv[0]: [%s]\n", argv[0] );
-   */
-
-  kprintf( "argv: [0x%X]\n", argv );
-  *tmp-- = 0x1;
-  *tmp-- = 0x0;
-  *tmp-- = 0x0;
-  *tmp-- = 0x0;
-
-  /*
-   tmp[0] = (uint32_t) argv;
-   tmp[1] = (uint32_t) argv;
-   */
-
-  /* Switch Back To The Kernels VM Space */
-  asm volatile(
-      "movl %0,%%eax          \n"
-      "movl %%eax,%%cr3       \n"
-      : : "d" ((uInt32 *)(kernelPageDirectory))
-  );
-
-  /* Finally Return */
-  return;
-}
-
-/*****************************************************************************************
-
- Function: void sysExec();
- Description: This Is The System Call To Execute A New Task
-
- Notes:
-
- 2016-01-19 - Start Of Enhanced Exec
-
- 04-22-03 - It Now Loads Sections Not The Full File
-
- *****************************************************************************************/
-
-int sys_exec( struct thread *td, char *file, char **argv, char **envp ) {
-  int i = 0x0;
-  int x = 0x0;
-  int argc = 0x0;
-  uint32_t cr3 = 0x0;
-
-  unsigned int *tmp = 0x0;
-  //uint32_t memAddr = 0x0;
-
-  uInt32 ldAddr = 0x0;
-  uInt32 seg_size = 0x0;
-  uInt32 seg_addr = 0x0;
-
-  char *interp = 0x0;
-  //char **argv = 0x0;
-  char **argvNew = 0x0;
-  char *args = 0x0;
-
-  fileDescriptor *fd = 0x0;
-
-  elfHeader *binaryHeader = 0x0;
-  elfProgramHeader *programHeader = 0x0;
-  elfSectionHeader *sectionHeader = 0x0;
-  elfDynamic *elfDynamicS = 0x0;
-
-  u_long text_addr = 0, text_size = 0;
-  u_long data_addr = 0, data_size = 0;
-
-  struct i386_frame *iFrame = 0x0;
-  //struct i386_frame *iFrameNew = 0x0;
-
-  Elf_Auxargs *auxargs = 0x0;
-
-  asm("movl %%cr3, %0;" : "=r" (cr3));
-
-  fd = fopen( file, "r" );
-
-  /* If the file doesn't exist fail */
-  if ( fd == 0x0 )
-    return (-1);
-
-  /* Test If Executable */
-  if ( fd->perms == 0 ) {
-    kprintf( "Exec Format Error: Binary File Not Executable.\n" );
-    fclose( fd );
-    return (-1);
-  }
-
-  /* Set Threads FD to open FD */
-  _current->imageFd = fd;
-
-  //! Clean the virtual of COW pages left over from the fork
-  //vmm_cleanVirtualSpace( (uint32_t) _current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SHIFT) );
-  //MrOlsen 2017-12-15 - FIX! - This should be done before it was causing a lot of problems why did I free space after loading binary????
-  vmm_cleanVirtualSpace( (uint32_t) 0x8048000 );
-
-  /* Load ELF Header */
-  if ( (binaryHeader = (elfHeader *) kmalloc( sizeof(elfHeader) )) == 0x0 )
-    K_PANIC( "MALLOC FAILED" );
-
-  fread( binaryHeader, sizeof(elfHeader), 1, fd );
-  /* Done Loading ELF Header */
-
-  /* Check If App Is A Real Application */
-  if ( (binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F') ) {
-    kprintf( "Exec Format Error: Binary File Not Executable.\n" );
-    kfree( binaryHeader );
-    fclose( fd );
-    return (-1);
-  }
-  else if ( binaryHeader->eType != ET_EXEC ) {
-    kprintf( "Exec Format Error: Binary File Not Executable.\n" );
-    kfree( binaryHeader );
-    fclose( fd );
-    return (-1);
-  }
-  else if ( binaryHeader->eEntry == 0x300000 ) {
-    kprintf( "Exec Format Error: Binary File Not Executable.\n" );
-    kfree( binaryHeader );
-    fclose( fd );
-    return (-1);
-  }
-
-  /* Set Thread ABI */
-  td->abi = binaryHeader->eIdent[EI_OSABI];
-
-  /* Load The Program Header(s) */
-  if ( (programHeader = (elfProgramHeader *) kmalloc( sizeof(elfProgramHeader) * binaryHeader->ePhnum )) == 0x0 )
-    K_PANIC( "MALLOC FAILED" );
-
-  assert( programHeader );
-
-  fseek( fd, binaryHeader->ePhoff, 0 );
-  fread( programHeader, (sizeof(elfProgramHeader) * binaryHeader->ePhnum), 1, fd );
-  /* Done Loading Program Header(s) */
-
-  /* Load The Section Header(s) */
-  if ( (sectionHeader = (elfSectionHeader *) kmalloc( sizeof(elfSectionHeader) * binaryHeader->eShnum )) == 0x0 )
-    K_PANIC( "MALLOC FAILED" );
-
-  assert( sectionHeader );
-  fseek( fd, binaryHeader->eShoff, 0 );
-  fread( sectionHeader, sizeof(elfSectionHeader) * binaryHeader->eShnum, 1, fd );
-  /* Done Loading Section Header(s) */
-
-  /* Loop Through The Header And Load Sections Which Need To Be Loaded */
-  for ( i = 0; i < binaryHeader->ePhnum; i++ ) {
-    switch ( programHeader[i].phType ) {
-      case PT_LOAD:
-        if ( programHeader[i].phMemsz == 0x0 )
-          break;
-
-        seg_addr = trunc_page( programHeader[i].phVaddr );
-        seg_size = round_page( programHeader[i].phMemsz + programHeader[i].phVaddr - seg_addr );
-
-        /*
-         Allocate Memory Im Going To Have To Make This Load Memory With Correct
-         Settings so it helps us in the future
-         */
-        for ( x = 0x0; x < (round_page( programHeader[i].phMemsz )); x += 0x1000 ) {
-          /* Make readonly and read/write !!! */
-          if ( vmm_remapPage( vmm_findFreePage( _current->id ), ((programHeader[i].phVaddr & 0xFFFFF000) + x), PAGE_DEFAULT ) == 0x0 ) {
-            K_PANIC( "Error: Remap Page Failed" );
-          } /*
-          else {
-            kprintf("rP[0x%X]", (programHeader[i].phVaddr & 0xFFFFF000) + x);
-          } */
-
-          memset( (void *) ((programHeader[i].phVaddr & 0xFFFFF000) + x), 0x0, 0x1000 );
-
-        }
-
-        /* Now Load Section To Memory */
-        fseek( fd, programHeader[i].phOffset, 0 );
-        fread( (void *) programHeader[i].phVaddr, programHeader[i].phFilesz, 1, fd );
-
-        if ( (programHeader[i].phFlags & 0x2) != 0x2 ) {
-          for ( x = 0x0; x < (round_page( programHeader[i].phMemsz )); x += 0x1000 ) {
-            if ( (vmm_setPageAttributes( (programHeader[i].phVaddr & 0xFFFFF000) + x, PAGE_PRESENT | PAGE_USER )) != 0x0 )
-              kpanic( "Error: vmm_setPageAttributes failed, File: %s,Line: %i\n", __FILE__, __LINE__ );
-          }
-        }
-
-      if ((programHeader[i].phFlags & PF_X) && text_size < seg_size) {
-          text_size = seg_size;
-          text_addr = seg_addr;
-        }
-        else {
-          data_size = seg_size;
-          data_addr = seg_addr;
-          /*
-           _current->td.vm_dsize = seg_size >> PAGE_SHIFT;
-           _current->td.vm_daddr = (char *) seg_addr;
-           */
-        }
-
-        /*
-         *  MrOlsen (2016-01-19) NOTE: Note Sure, I should Do This Later
-         * This is for stack space
-         */
-        _current->oInfo.vmStart = ((programHeader[i].phVaddr & 0xFFFFF000) + 0xA900000);
-        break;
-      case PT_DYNAMIC:
-        //newLoc = (char *)programHeader[i].phVaddr;
-        elfDynamicS = (elfDynamic *) programHeader[i].phVaddr;
-        fseek( fd, programHeader[i].phOffset, 0 );
-        fread( (void *) programHeader[i].phVaddr, programHeader[i].phFilesz, 1, fd );
-        break;
-      case PT_INTERP:
-        interp = (char *) kmalloc( programHeader[i].phFilesz );
-        fseek( fd, programHeader[i].phOffset, 0 );
-        fread( (void *) interp, programHeader[i].phFilesz, 1, fd );
-        ldAddr = ldEnable();
-        break;
-      case PT_GNU_STACK:
-        break;
-      default:
-        break;
-    }
-  }
-
-  _current->td.vm_tsize = text_size >> PAGE_SHIFT;
-  _current->td.vm_taddr = text_addr;
-  _current->td.vm_dsize = data_size >> PAGE_SHIFT;
-  _current->td.vm_daddr = data_addr;
-
-  /* What is this doing? 11/23/06 */
-  if ( elfDynamicS != 0x0 ) {
-    for ( i = 0; i < 12; i++ ) {
-      if ( elfDynamicS[i].dynVal == 0x3 ) {
-        tmp = (void *) elfDynamicS[i].dynPtr;
-        if ( tmp == 0x0 )
-          kpanic( "tmp: NULL\n" );
-        else
-          kprintf("[0x%X]", tmp);
-        tmp[2] = (uInt32) ldAddr;
-        tmp[1] = (uInt32) fd;
-        break;
-      }
-    }
-  }
-  /*
-   _current->td.vm_dsize = seg_size >> PAGE_SHIFT;
-   _current->td.vm_daddr = (char *) seg_addr;
-   */
-
-  //argv = &ap;
-  //if (argv[1] != 0x0) {
-  if ( argv != 0x0 ) {
-//MrOlsen (2016-01-12) FIX: Not sure why argv[0] == 0
-    argc = ((int) argv[0] > 0) ? (int) argv[0] : 1;
-
-    args = (char *) vmmGetFreeVirtualPage( _current->id, 1, VM_TASK );
-    memset( args, 0x0, 0x1000 );
-    x = 0x0;
-    argvNew = (char **) kmalloc( sizeof(char *) * argc );
-    for ( i = 0x0; i < argc; i++ ) {
-      strcpy( args + x, argv[i + 1] );
-      argvNew[i] = args + x;
-      x += strlen( argv[i + 1] ) + 1;
-      //args[x] = '\0';
-      //x++;
-    }
-    argv = argvNew;
-  }
-  else {
-    argc = 1;
-  }
-
-  iFrame = (struct i386_frame *) (_current->tss.esp0 - sizeof(struct i386_frame));
-  /*
-   iFrameNew = (struct i386_frame *) kmalloc( sizeof(struct i386_frame) );
-
-   memcpy( iFrameNew, iFrame, sizeof(struct i386_frame) );
-   */
-
-  //! Adjust iframe
-//  iFrame = (struct i386_frame *) (_current->tss.esp0 - sizeof(struct i386_frame));
-
-  //kprintf( "EBP-1(%i): EBP: [0x%X], EIP: [0x%X], ESP: [0x%X]\n", _current->id, iFrame->ebp, iFrame->eip, iFrame->user_esp );
-
-  iFrame->ebp = STACK_ADDR;
-  iFrame->eip = binaryHeader->eEntry;
-  iFrame->user_esp = ((uint32_t) STACK_ADDR) - (sizeof(uint32_t) * (argc + 3));
-
-  tmp = (void *) iFrame->user_esp; //MrOlsen 2017-11-14 iFrame->user_ebp;
-
-  //kprintf( "STACK: 0x%X, ESP0: 0x%X\n", iFrame->user_esp, _current->tss.esp0 );
-
-  //! build argc and argv[]
-/*MrOlsen Did I Fuck Up Stack?
-  *tmp-- = argc;
-
-  //kprintf( "xSTACK: 0x%X, ESP0: 0x%X\n", iFrame->user_esp, _current->tss.esp0 );
-
-  if ( argc == 1 ) {
-    *tmp-- = 0x0;
-  }
-  else {
-    for ( i = 0; i < argc; i++ ) {
-
-      *tmp-- = (u_int) argv[i];
-    }
-  }
-
-  *tmp-- = 0x0; // ARGV Terminator
-  *tmp-- = 0x0; // ENV Terminator
-*/
-
-  /*
-   * App Entry Stack
-   argc
-   argv[0]
-   argv[1]
-   argv[2] ..
-   argv[argc - 1] = null - END OF ARGV
-   env[0]
-   env[1]
-   NULL end of env
-   */
-
-  //}
-  //else {
-  //tmp = (uint32_t *)STACK_ADDR - 2;
-  //tmp[0] = 0x1;
-  //tmp[1] = 0x0;
-  //tmp[1] = (uint32_t)argv;
-  //}
-  kfree( argvNew );
-  /* Now That We Relocated The Binary We Can Unmap And Free Header Info */
-  kfree( binaryHeader );
-  kfree( programHeader );
-
-  //kprintf( "EBP-3(%i): [0x%X], EIP: [0x%X], ESP: [0x%X]\n", _current->id, iFrame->ebp, iFrame->eip, iFrame->user_esp );
-  //kprintf( "Done EXEC\n" );
-
-  /*
-   asm("cli");
-   _current->tss.eip = (long) iFrameNew->eip;
-   _current->tss.eflags = 0x206;
-   _current->tss.esp = iFrameNew->user_esp;
-   _current->tss.ebp = iFrameNew->ebp;
-   */
-  /* Set these up to be ring 3 tasks */
-
-/*
-   _current->tss.es = 0x30 + 3;
-   _current->tss.cs = 0x28 + 3;
-   _current->tss.ss = 0x30 + 3;
-   _current->tss.ds = 0x30 + 3;
-   _current->tss.fs = 0x30 + 3;
-   _current->tss.gs = 0x50 + 3; //0x30 + 3;
-
-   _current->tss.ldt = 0x18;
-   _current->tss.trace_bitmap = 0x0000;
-   _current->tss.io_map = 0x8000;
-*/
-
-  /*
-   kfree (iFrameNew);
-
-   memAddr = (uint32_t) & (_current->tss);
-   ubixGDT[4].descriptor.baseLow = (memAddr & 0xFFFF);
-   ubixGDT[4].descriptor.baseMed = ((memAddr >> 16) & 0xFF);
-   ubixGDT[4].descriptor.baseHigh = (memAddr >> 24);
-   ubixGDT[4].descriptor.access = '\x89';
-
-   ubixGDT[10].descriptor.baseLow = (STACK_ADDR & 0xFFFF);
-   ubixGDT[10].descriptor.baseMed = ((STACK_ADDR >> 16) & 0xFF);
-   ubixGDT[10].descriptor.baseHigh = (STACK_ADDR >> 24);
-
-   */
-
-/*
-   asm(
-   "sti\n"
-   "ljmp $0x20,$0\n"
-   );
-*/
-  tmp = (char *)iFrame->eip;
-
-  //kprintf("N:[0x%X]\n", tmp[0]);
-  //kprintf( "EBP-4(%i): [0x%X], EBP: [0x%X], EIP: [0x%X], ESP: [0x%X], CR3: [0x%X-0x%X]\n", _current->id, _current->oInfo.vmStart, iFrame->ebp, iFrame->eip, iFrame->user_esp, cr3, kernelPageDirectory );
-  return (0x0);
-}
-
-/*!
- * \brief New exec...
- */
-int sys_exec_dead( char *file, char *ap ) {
-  int error = 0x0;
-  int i = 0x0;
-  int x = 0x0;
-  int argc = 0x0;
-  uint32_t *tmp = 0x0;
-  uint32_t seg_size = 0x0;
-  uint32_t seg_addr = 0x0;
-  uint32_t addr = 0x0;
-  uint32_t eip = 0x0;
-  uint32_t proghdr = 0x0;
-  char *args = 0x0;
-  char *interp = 0x0;
-  char **argv = 0x0;
-  char **argvNew = 0x0;
-  elfHeader *binaryHeader = 0x0;
-  elfProgramHeader *programHeader = 0x0;
-  struct i386_frame *iFrame = 0x0;
-  Elf_Auxargs *auxargs = 0x0;
-
-  kprintf( "SYS_EXEC: %s\n", file );
-
-  _current->imageFd = fopen( file, "r" );
-
-  if ( _current->imageFd == 0x0 )
-    return (-1);
-  /* MrOlsen (2016-01-10): BROKEN - Why Do I Return If I Can't?
-   return(-1);
-   */
-
-  /* Load the ELF header */
-  if ( (binaryHeader = (elfHeader *) kmalloc( sizeof(elfHeader) )) == 0x0 )
-    K_PANIC( "malloc failed!" );
-  fread( binaryHeader, sizeof(elfHeader), 1, _current->imageFd );
-
-  /* Check If App Is A Real Application */
-  if ( ((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) || (binaryHeader->eType != ET_EXEC) ) {
-    kfree( binaryHeader );
-    fclose( _current->imageFd );
-
-    /* MrOlsen (2016-01-10): BROKEN - Why Do I Return If I Can't?
-     return(-1);
-     */
-    return (-1);
-  }
-
-  /* Load The Program Header(s) */
-  if ( (programHeader = (elfProgramHeader *) kmalloc( sizeof(elfProgramHeader) * binaryHeader->ePhnum )) == 0x0 )
-    K_PANIC( "malloc failed!" );
-  fseek( _current->imageFd, binaryHeader->ePhoff, 0 );
-  fread( programHeader, (sizeof(elfProgramHeader) * binaryHeader->ePhnum), 1, _current->imageFd );
-
-  /* Loop Through The Header And Load Sections Which Need To Be Loaded */
-  for ( i = 0x0; i < binaryHeader->ePhnum; i++ ) {
-    switch ( programHeader[i].phType ) {
-      case PT_LOAD:
-        seg_addr = trunc_page( programHeader[i].phVaddr );
-        seg_size = round_page( programHeader[i].phMemsz + programHeader[i].phVaddr - seg_addr );
-
-        /*
-         Allocate Memory Im Going To Have To Make This Load Memory With Correct
-         Settings so it helps us in the future
-         */
-        for ( x = 0x0; x < (programHeader[i].phMemsz); x += 0x1000 ) {
-          /* Make readonly and read/write !!! */
-          if ( vmm_remapPage( vmm_findFreePage( _current->id ), ((programHeader[i].phVaddr & 0xFFFFF000) + x), PAGE_DEFAULT ) == 0x0 )
-            K_PANIC( "Error: Remap Page Failed" );
-          memset( (void *) ((programHeader[i].phVaddr & 0xFFFFF000) + x), 0x0, 0x1000 );
-        }
-
-        /* Now Load Section To Memory */
-        fseek( _current->imageFd, programHeader[i].phOffset, 0 );
-        fread( (void *) programHeader[i].phVaddr, programHeader[i].phFilesz, 1, _current->imageFd );
-        if ( (programHeader[i].phFlags & 0x2) != 0x2 ) {
-          for ( x = 0x0; x < (programHeader[i].phMemsz); x += 0x1000 ) {
-            if ( (vmm_setPageAttributes( (programHeader[i].phVaddr & 0xFFFFF000) + x, PAGE_PRESENT | PAGE_USER )) != 0x0 )
-              K_PANIC( "vmm_setPageAttributes failed" );
-          }
-        }
-        if ( binaryHeader->eEntry >= programHeader[i].phVaddr && binaryHeader->eEntry < (programHeader[i].phVaddr + programHeader[i].phMemsz) ) {
-          /* We're suposed to do something here? */
-        }
-        else {
-          _current->td.vm_dsize = seg_size >> PAGE_SHIFT;
-          _current->td.vm_daddr = (u_long) seg_addr;
-        }
-
-        _current->oInfo.vmStart = ((programHeader[i].phVaddr & 0xFFFFF000) + 0xA900000);
-        break;
-      case PT_INTERP:
-        interp = (char *) kmalloc( programHeader[i].phFilesz );
-        if ( interp == 0x0 )
-          K_PANIC( "malloc failed" );
-
-        fseek( _current->imageFd, programHeader[i].phOffset, 0 );
-        fread( (void *) interp, programHeader[i].phFilesz, 1, _current->imageFd );
-        kprintf( "Interp: [%s]\n", interp );
-        //ldAddr = ldEnable();
-        break;
-      case PT_PHDR:
-        proghdr = programHeader[i].phVaddr;
-        break;
-      default:
-        break;
-    }
-  }
-
-  addr = LD_START;
-
-  if ( interp != 0x0 ) {
-    //kprintf("TEST");
-    elf_loadfile( _current, interp, &addr, &eip );
-  }
-  kprintf( "[0x%X][0x%X]\n", eip, addr );
-
-  _current->td.vm_dsize = seg_size >> PAGE_SHIFT;
-  _current->td.vm_daddr = (u_long) seg_addr;
-
-  //! copy in arg strings
-  argv = (char **)ap;
-
-  if ( argv[1] != 0x0 ) {
-    argc = (int) argv[0];
-    args = (char *) vmmGetFreeVirtualPage( _current->id, 1, VM_TASK );
-    memset( args, 0x0, 0x1000 );
-    x = 0x0;
-    argvNew = (char **) kmalloc( sizeof(char *) * argc );
-    for ( i = 0x0; i < argc; i++ ) {
-      strcpy( args + x, argv[i + 1] );
-      argvNew[i] = args + x;
-      x += strlen( argv[i + 1] ) + 1;
-    }
-    argv = argvNew;
-  }
-
-  //! Clean the virtual of COW pages left over from the fork
-  vmm_cleanVirtualSpace( (uint32_t) _current->td.vm_daddr + (_current->td.vm_dsize << PAGE_SHIFT) );
-
-  //! Adjust iframe
-  iFrame = (struct i386_frame *) _current->tss.esp0 - sizeof(struct i386_frame);
-  iFrame->ebp = STACK_ADDR;
-  iFrame->eip = eip;
-
-  //if (_current->id > 3) {
-
-  iFrame->user_esp = ((uint32_t) STACK_ADDR) - (sizeof(uint32_t) * (argc + 4 + (sizeof(Elf_Auxargs) * 2)));
-  kprintf( "\n\n\nuser_esp: [0x%X]\n", iFrame->user_esp );
-  tmp = (uint32_t *) iFrame->user_esp;
-
-  //! build argc and argv[]
-  tmp[0] = argc;
-  for ( i = 0; i < argc; i++ ) {
-    tmp[i + 1] = (uint32_t) argv[i];
-  }
-  //! Build ENV
-  args = (char *) vmmGetFreeVirtualPage( _current->id, 1, VM_TASK );
-  memset( args, 0x0, 0x1000 );
-  strcpy( args, "LIBRARY_PATH=/lib" );
-  tmp[argc + 2] = (uint32_t) args;
-  kprintf( "env: [0x%X][0x%X]\n", (uInt32) tmp + argc + 2, tmp[argc + 2] );
-  tmp[argc + 3] = 0x0;
-  kprintf( "env: [0x%X][0x%X]\n", (uInt32) tmp + argc + 2, tmp[argc + 2] );
-  //auxargs = iFrame->user_esp + argc +  3;
-  tmp = (uint32_t *) iFrame->user_esp;
-  tmp += argc + 4;
-
-  auxargs->execfd = -1;
-  auxargs->phdr = proghdr;
-  auxargs->phent = binaryHeader->ePhentsize;
-  auxargs->phnum = binaryHeader->ePhnum;
-  auxargs->pagesz = PAGE_SIZE;
-  auxargs->base = addr;
-  auxargs->flags = 0x0;
-  auxargs->entry = binaryHeader->eEntry;
-  auxargs->trace = 0x0;
-
-  AUXARGS_ENTRY( tmp, AT_PHDR, auxargs->phdr );
-  AUXARGS_ENTRY( tmp, AT_PHENT, auxargs->phent );
-  AUXARGS_ENTRY( tmp, AT_PHNUM, auxargs->phnum );
-  AUXARGS_ENTRY( tmp, AT_PAGESZ, auxargs->pagesz );
-  AUXARGS_ENTRY( tmp, AT_FLAGS, auxargs->flags );
-  AUXARGS_ENTRY( tmp, AT_ENTRY, auxargs->entry );
-  AUXARGS_ENTRY( tmp, AT_BASE, auxargs->base );
-  AUXARGS_ENTRY( tmp, AT_NULL, 0 );
-
-  kprintf( "AT_BASE: [0x%X]\n", auxargs->base );
-
-  //iFrame->ebx = 0x0;
-  //iFrame->ebx = 0x0;
-
-  //iFrame->eip = binaryHeader->eEntry;
-  //kprintf("\n\nDOH: [0x%X]\n\n",iFrame->eip);
-
-  /*
-   error = elf_loadfile(_current,file,0x0,0x0);
-   if (error)
-   K_PANIC("elf_loadfile failed");
-   */
-  return (0x0);
-}
-
-/***
- END
- ***/
diff --git a/sys/i386/kpanic.c b/sys/i386/kpanic.c
deleted file mode 100644
index b02cc20..0000000
--- a/sys/i386/kpanic.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kpanic.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/kpanic.h>
-#include <lib/kprintf.h>
-#include <isa/8259.h>
-#include <stdarg.h>
-#include <ubixos/tty.h>
-
-/*!
- * \brief print panic message and halt system
- *
- * \param fmt panic message
- *
- */
-void kpanic(const char *fmt, ...) {
-  char   buf[512];
-  va_list args;
-
-  va_start(args, fmt);
-  vsprintf(buf, fmt, args);
-  va_end(args);
-
-  /* It's important that we print on the current terminal so let's reset foreground */
-  tty_foreground = NULL;
-  kprintf("kPanic: %s", buf);
-
-  /* Halt The System */
-  //asm("cli");
-  irqDisable(0x0);
-
-  while (1) {
-    asm("hlt");
-  }
-
-}
-
-/***
- END
- ***/
-
diff --git a/sys/i386/sched.c b/sys/i386/sched.c
deleted file mode 100644
index e808666..0000000
--- a/sys/i386/sched.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sched.c 164 2016-01-20 00:04:02Z reddawg $
-
- *****************************************************************************************/
-
-#include <ubixos/sched.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/endtask.h>
-#include <vfs/mount.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <vmm/vmm.h>
-#include <sys/gdt.h>
-#include <sys/idt.h>
-#include <sys/kern_descrip.h>
-#include <isa/8259.h>
-#include <string.h>
-#include <assert.h>
-
-#include <ubixos/spinlock.h>
-
-#define STACK_ADDR 0xC800000
-
-static kTask_t *taskList = 0x0;
-static kTask_t *delList = 0x0;
-static uint32_t nextID = 1;
-
-kTask_t *_current = 0x0;
-kTask_t *_usedMath = 0x0;
-
-static struct spinLock schedulerSpinLock = SPIN_LOCK_INITIALIZER;
-
-/************************************************************************
-
- Function: int sched_init()
-
- Description: This function is used to enable the kernel scheduler
-
- Notes:
-
- 02/20/2004 - Approved for quality
-
- ************************************************************************/
-
-int sched_init() {
-  taskList = (kTask_t *) kmalloc( sizeof(kTask_t) );
-  if ( taskList == 0x0 )
-    kpanic( "Unable to create task list" );
-
-  taskList->id = nextID++;
-
-  /* Print out information on scheduler */
-  kprintf( "sched0 - Address: [0x%X]\n", taskList );
-
-  /* Return so we know everything went well */
-  return (0x0);
-}
-
-void sched() {
-  uint32_t memAddr = 0x0;
-  kTask_t *tmpTask = 0x0;
-  kTask_t *delTask = 0x0;
-
-  if ( spinTryLock( &schedulerSpinLock ) )
-    return;
-
-  tmpTask = _current->next;
-  //outportByte(0xE9,_current->id + '0');
-  schedStart:
-
-  /* Yield the next task from the current prio queue */
-  for ( ; tmpTask != 0x0; tmpTask = tmpTask->next ) {
-    if ( tmpTask->state > 0x0 ) {
-      _current = tmpTask;
-      if ( _current->state == FORK )
-        _current->state = READY;
-      break;
-    }
-    else if ( tmpTask->state == DEAD ) {
-      delTask = tmpTask;
-      tmpTask = tmpTask->next;
-      sched_deleteTask( delTask->id );
-      sched_addDelTask( delTask );
-      goto schedStart;
-    }
-  }
-
-  /* Finished all the tasks, restarting the list */
-  if ( 0x0 == tmpTask ) {
-    tmpTask = taskList;
-    goto schedStart;
-  }
-
-  if ( _current->state > 0x0 ) {
-
-    if ( _current->oInfo.v86Task == 0x1 )
-      irqDisable( 0x0 );
-
-    asm("cli");
-
-    memAddr = (uint32_t) & (_current->tss);
-    ubixGDT[4].descriptor.baseLow = (memAddr & 0xFFFF);
-    ubixGDT[4].descriptor.baseMed = ((memAddr >> 16) & 0xFF);
-    ubixGDT[4].descriptor.baseHigh = (memAddr >> 24);
-    ubixGDT[4].descriptor.access = '\x89';
-
-   // memAddr = STACK_ADDR; //(uint32_t) & (_current->tss);
-    ubixGDT[10].descriptor.baseLow = (STACK_ADDR & 0xFFFF);
-    ubixGDT[10].descriptor.baseMed = ((STACK_ADDR >> 16) & 0xFF);
-    ubixGDT[10].descriptor.baseHigh = (STACK_ADDR >> 24);
-/*
-    ubixGDT[10].descriptor.access = '\x89';
-*/
-
-    spinUnlock( &schedulerSpinLock );
-
-    asm("sti");
-    asm("ljmp $0x20,$0\n");
-  }
-  else {
-    spinUnlock( &schedulerSpinLock );
-  }
-
-  return;
-}
-
-kTask_t *schedNewTask() {
-  int i = 0;
-
-  kTask_t *tmpTask = (kTask_t *) kmalloc( sizeof(kTask_t) );
-
-  struct file *fp = 0x0;
-
-  if ( tmpTask == 0x0 )
-    kpanic( "Error: schedNewTask() - kmalloc failed trying to initialize a new task struct\n" );
-
-  memset( tmpTask, 0x0, sizeof(kTask_t) );
-
-  /* Filling in tasks attrs */
-  tmpTask->usedMath = 0x0;
-  tmpTask->state = NEW;
-
-  /* HACK */
-
-  for ( i = 0; i < 3; i++ ) {
-    fp = (void *) kmalloc( sizeof(struct file) );
-    //kprintf("DB: [0x%X]\n", (uint32_t) fp);
-    tmpTask->td.o_files[i] = (void *) fp;
-    fp->f_flag = 0x4;
-  }
-
-  spinLock( &schedulerSpinLock );
-  tmpTask->id = nextID++;
-  tmpTask->next = taskList;
-  tmpTask->prev = 0x0;
-  taskList->prev = tmpTask;
-  taskList = tmpTask;
-
-  spinUnlock( &schedulerSpinLock );
-
-  return (tmpTask);
-}
-
-int sched_deleteTask( pidType id ) {
-  kTask_t *tmpTask = 0x0;
-
-  /* Checking each task from the prio queue */
-  for ( tmpTask = taskList; tmpTask != 0x0; tmpTask = tmpTask->next ) {
-    if ( tmpTask->id == id ) {
-      if ( tmpTask->prev != 0x0 )
-        tmpTask->prev->next = tmpTask->next;
-      if ( tmpTask->next != 0x0 )
-        tmpTask->next->prev = tmpTask->prev;
-      if ( taskList == tmpTask )
-        taskList = tmpTask->next;
-
-      return (0x0);
-    }
-  }
-  return (0x1);
-}
-
-int sched_addDelTask( kTask_t *tmpTask ) {
-  tmpTask->next = delList;
-  tmpTask->prev = 0x0;
-  if ( delList != 0x0 )
-    delList->prev = tmpTask;
-  delList = tmpTask;
-  return (0x0);
-}
-
-kTask_t *sched_getDelTask() {
-  kTask_t *tmpTask = 0x0;
-
-  if ( delList == 0x0 )
-    return (0x0);
-
-  tmpTask = delList;
-  delList = delList->next;
-  return (tmpTask);
-}
-
-kTask_t *schedFindTask( uint32_t id ) {
-  kTask_t *tmpTask = 0x0;
-
-  for ( tmpTask = taskList; tmpTask; tmpTask = tmpTask->next ) {
-    if ( tmpTask->id == id )
-      return (tmpTask);
-  }
-
-  return (0x0);
-}
-
-/************************************************************************
-
- Function: void schedEndTask()
-
- Description: This function will end a task
-
- Notes:
-
- 02/20/2004 - Approved for quality
-
- ************************************************************************/
-void schedEndTask( pidType pid ) {
-  endTask( _current->id );
-  sched_yield();
-}
-
-/************************************************************************
-
- Function: int schedEndTask()
-
- Description: This function will yield a task
-
- Notes:
-
- 02/20/2004 - Approved for quality
-
- ************************************************************************/
-
-void sched_yield() {
-  sched();
-}
-
-/*
- asm(
- ".globl sched_yield \n"
- "sched_yield:       \n"
- "  cli              \n"
- "  call sched       \n"
- );
- */
-
-/************************************************************************
-
- Function: int sched_setStatus(pidType pid,tState state)
-
- Description: Change the tasks status
-
- Notes:
-
- ************************************************************************/
-int sched_setStatus( pidType pid, tState state ) {
-  kTask_t *tmpTask = schedFindTask( pid );
-  if ( tmpTask == 0x0 )
-    return (0x1);
-  tmpTask->state = state;
-  return (0x0);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/i386/schedyield.S b/sys/i386/schedyield.S
deleted file mode 100644
index b04277e..0000000
--- a/sys/i386/schedyield.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: schedyield.S 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-.globl sched_yield_new
-.text
-.code32
-sched_yield_new:         
-  pusha            /* Save all of the registers                */
-  push %ss
-  push %ds
-  push %es
-  push %fs
-  push %gs
-  call sched
-  mov  %eax,%esp
-  pop  %gs
-  pop  %fs             
-  pop  %es
-  pop  %ds
-  pop  %ss                 
-  popa             /* Restore Registers                        */
-  iret                    
-
-/***
- END
- ***/
diff --git a/sys/i386/spinlock.c b/sys/i386/spinlock.c
deleted file mode 100644
index 5a4de76..0000000
--- a/sys/i386/spinlock.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * Copyright (c) 2002-2004, 2017 The UbixOS Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions, the following disclaimer and the list of authors.  Redistributions in binary
- * form must reproduce the above copyright notice, this list of conditions, the following
- * disclaimer and the list of authors in the documentation and/or other materials provided
- * with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <ubixos/spinlock.h>
-#include <ubixos/sched.h>
-
-#define atomic_xadd(P, V) __sync_fetch_and_add((P), (V))
-#define cmpxchg(P, O, N) __sync_val_compare_and_swap((P), (O), (N))
-#define atomic_inc(P) __sync_add_and_fetch((P), 1)
-#define atomic_dec(P) __sync_add_and_fetch((P), -1)
-#define atomic_add(P, V) __sync_add_and_fetch((P), (V))
-#define atomic_set_bit(P, V) __sync_or_and_fetch((P), 1<<(V))
-#define atomic_clear_bit(P, V) __sync_and_and_fetch((P), ~(1<<(V)))
-
-#define barrier() asm volatile("": : :"memory")
-
-/* Pause instruction to prevent excess processor bus usage */
-#define cpu_relax() asm volatile("pause\n": : :"memory")
-
-void spinLockInit(spinLock_t lock) {
-  memset(lock, 0x0, sizeof(spinLock_t));
-}
-
-int spinTryLock(spinLock_t lock) {
-  if (!cmpxchg(&lock->locked, NULL, LLOCK_FLAG))
-    return 0;
-
-  /* Failure! */
-  return LOCKED;
-}
-
-void spinUnlock(spinLock_t lock) {
-  barrier();
-  lock->locked = 0x0;
-}
-
-void spinLock(spinLock_t lock) {
-  while (1) {
-    if (!xchg_32(&lock->locked, LOCKED))
-      return;
-    while (lock->locked == 1)
-      sched_yield();
-  }
-}
diff --git a/sys/i386/sys_call.S b/sys/i386/sys_call.S
deleted file mode 100644
index 72161e8..0000000
--- a/sys/i386/sys_call.S
+++ /dev/null
@@ -1,89 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sys_call.S 199 2016-01-23 14:47:53Z reddawg $
-
- *****************************************************************************************/
-
-.globl _sysCall
-.text
-.code32
-
-_BALLS:
-_B3:
-nop
-
-_ast:
-
-_astRet:
-
-_sysCall:
-push $0x2
-sub $0x4,%esp
-pusha
-push %ds
-push %es
-push %fs
-push %gs
-mov $0x10,%eax
-mov %eax,%ds
-mov %eax,%es
-mov %eax,%fs
-cld
-push %esp
-call syscall
-add $0x4,%esp
-cmpb $0x13,0x38(%esp)
-je _BALLS
-testl $0x2000,0x3c(%esp) /* Test If VM */
-jz _notVM
-jmp _isVM
-_notVM:
-testb $0x3,0x38(%esp) /* See If We're In User CS (GDT Entry 5) */
-jz _popFS
-cli
-mov %fs:0x0,%eax
-testl $0x10800,0x80(%eax) /* Document This */
-je _popFS
-sti
-push %esp
-call _ast
-add $0x4,%esp
-jmp _astRet
-_isVM:
-hlt
-
-_popFS:
-pop %gs
-pop %fs
-pop %es
-pop %ds
-popa
-add $0x8,%esp
-iret
-
-/***
- END
- ***/
diff --git a/sys/i386/sys_call_new.S b/sys/i386/sys_call_new.S
deleted file mode 100644
index 863fad2..0000000
--- a/sys/i386/sys_call_new.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sys_call_new.S 142 2016-01-17 02:23:20Z reddawg $
-
- *****************************************************************************************/
-
-#define FAKE_MCOUNT(caller)     pushl caller ; call __mcount ; popl %ecx
-
-.globl _sysCall_new
-.text
-.code32
-_sysCall_new:
-pushl $2 /* sizeof "int 0x80" RET EIP */
-subl $4,%esp /* skip over tf_trapno */
-pushal
-pushl %ds
-pushl %es
-pushl %fs
-pushl %gs
-
-/* switch to kernel segments */
-movl $0x10,%eax
-movl %eax,%ds
-movl %eax,%es
-movl %eax,%fs
-cld
-push %esp
-//FAKE_MCOUNT(TF_EIP(%esp))
-call syscall
-//MEXITCOUNT
-
-//jmp     doreti
-popl %gs
-popl %fs
-popl %es
-popl %ds
-popal
-addl $4,%esp
-iret
-
-/*
-invalidSysCall:
-push %eax
-call invalidCall
-pop %eax
-movl $-1,%eax
-iret
-*/
-
-/***
- END
- ***/
-
diff --git a/sys/i386/syscall.c b/sys/i386/syscall.c
deleted file mode 100644
index 2967b73..0000000
--- a/sys/i386/syscall.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: syscall.c 183 2016-01-22 04:49:08Z reddawg $
-
- *****************************************************************************************/
-
-#include <ubixos/syscall.h>
-/*
- #include <ubixos/syscalls.h>
- */
-#include <ubixos/sched.h>
-#include <ubixos/exec.h>
-#include <sys/elf.h>
-#include <ubixos/endtask.h>
-#include <ubixos/time.h>
-#include <sys/video.h>
-#include <sys/trap.h>
-#include <vfs/file.h>
-#include <ubixfs/ubixfs.h>
-#include <lib/string.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <ubixos/vitals.h>
-/* #include <sde/sde.h> */
-#include <mpi/mpi.h>
-#include <vmm/vmm.h>
-
-//long fuword( const void *base );
-
-//void sdeTestThread();
-
-int InvalidSystemCall() {
-  kprintf( "attempt was made to an invalid system call\n" );
-  return (0);
-}
-
-typedef struct _UbixUser UbixUser;
-struct _UbixUser {
-  char *username;
-  char *password;
-  int uid;
-  int gid;
-  char *home;
-  char *shell;
-};
-
-int sysAuth( UbixUser *uu ) {
-  kprintf( "authenticating user %s\n", uu->username );
-
-  /* MrOlsen 2016-01-01 uh?
-   if(uu->username == "root" && uu->password == "user")
-   {
-   uu->uid = 0;
-   uu->gid = 0;
-   }
-   */
-  uu->uid = -1;
-  uu->gid = -1;
-  return (0);
-}
-
-int sysPasswd( char *passwd ) {
-  kprintf( "changing user password for user %d\n", _current->uid );
-  return (0);
-}
-
-int sysAddModule() {
-  return (0);
-}
-
-int sysRmModule() {
-  return (0);
-}
-
-int sysGetpid( int *pid ) {
-  if ( pid )
-    *pid = _current->id;
-  return (0);
-}
-
-int sysExit( int status ) {
-  endTask( _current->id );
-  return (0x0);
-}
-
-int sysCheckPid( int pid, int *ptr ) {
-  kTask_t *tmpTask = schedFindTask( pid );
-  if ( (tmpTask != 0x0) && (ptr != 0x0) )
-    *ptr = tmpTask->state;
-  else
-    *ptr = 0x0;
-  return (0);
-}
-
-/************************************************************************
-
- Function: int sysGetFreePage();
- Description: Allocs A Page To The Users VM Space
- Notes:
-
- ************************************************************************/
-int sysGetFreePage( struct thread *td, uint32_t *count) {
-  //MrOlsen 2017-12-15 kprintf("sysGetFreePage - Count: %i\n", *count);
-  return((int) vmmGetFreeVirtualPage(_current->id, *count, VM_THRD));
-  //return(vmmGetFreeVirtualPage(_current->id, *count, VM_TASK));
-}
-
-int sysGetFreePage_OLD( long *ptr, int count, int type ) {
-  if ( ptr ) {
-    if ( type == 2 )
-      *ptr = (long) vmmGetFreeVirtualPage( _current->id, count, VM_THRD );
-    else
-      *ptr = (long) vmmGetFreeVirtualPage( _current->id, count, VM_TASK );
-  }
-  return (0);
-}
-
-int sysGetDrives( uInt32 *ptr ) {
-  if ( ptr )
-    *ptr = 0x0; //(uInt32)devices;
-  return (0);
-}
-
-int sysGetUptime( uInt32 *ptr ) {
-  if ( ptr )
-    *ptr = systemVitals->sysTicks;
-  return (0);
-}
-
-int sysGetTime( uInt32 *ptr ) {
-  if ( ptr )
-    *ptr = systemVitals->sysUptime + systemVitals->timeStart;
-  return (0);
-}
-
-int sys_getcwd(struct thread *td, struct sys_getcwd_args *args) {
-  if ( args->buf )
-    sprintf( args->buf, "%s", _current->oInfo.cwd );
-kprintf("[CWD: %s]", _current->oInfo.cwd);
-  return (0);
-}
-
-int sys_sched_yield(struct thread *td, void *args) {
-  sched_yield();
-  return (0);
-}
-
-int sysStartSDE() {
-  int i = 0x0;
-  for ( i = 0; i < 1400; i++ ) {
-    asm("hlt");
-  }
-  //execThread(sdeThread,(uInt32)(kmalloc(0x2000)+0x2000),0x0);
-  for ( i = 0; i < 1400; i++ ) {
-    asm("hlt");
-  }
-  return (0);
-}
-
-/*
- int invalidCallINT(int sys_call) {
- kprintf("Invalid Sys Call: [%i]\n",sys_call);
- return(0);
- }
-
-
- int invalidCall() {
- int sys_call;
-
- asm(
- "nop"
- : "=a" (sys_call)
- :
- );
-
- kprintf("Invalid System Call #[%i]\n",sys_call);
- kpanic("PID: %i, File: %s, Line: %i", _curent->id, _FILE_, _LINE_);
- return(0);
- }
- */
-
-/***
- END
- ***/
-
diff --git a/sys/i386/systemtask.c b/sys/i386/systemtask.c
deleted file mode 100644
index 4663abd..0000000
--- a/sys/i386/systemtask.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: systemtask.c 169 2016-01-20 01:10:22Z reddawg $
-
- *****************************************************************************************/
-
-#include <ubixos/systemtask.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/exec.h>
-#include <ubixos/tty.h>
-#include <ubixos/sched.h>
-#include <ubixos/vitals.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <lib/bioscall.h>
-#include <sde/sde.h>
-#include <sys/io.h>
-#include <vmm/vmm.h>
-#include <mpi/mpi.h>
-#include <string.h>
-
-static unsigned char *videoBuffer = (unsigned char *) 0xB8000;
-
-void systemTask() {
-  mpi_message_t myMsg;
-  uInt32 counter = 0x0;
-  int i = 0x0;
-  int *x = 0x0;
-  kTask_t *tmpTask = 0x0;
-
-  if ( mpi_createMbox( "system" ) != 0x0 ) {
-    kpanic( "Error: Error creating mailbox: system\n" );
-  }
-
-  while ( 1 ) {
-    if ( mpi_fetchMessage( "system", &myMsg ) == 0x0 ) {
-      kprintf( "A" );
-      switch ( myMsg.header ) {
-        case 0x69:
-          x = (int *) &myMsg.data;
-          kprintf( "Switching to term: [%i][%i]\n", *x, myMsg.pid );
-          schedFindTask( myMsg.pid )->term = tty_find( *x );
-          break;
-        case 1000:
-          kprintf( "Restarting the system in 5 seconds\n" );
-          counter = systemVitals->sysUptime + 5;
-          while ( systemVitals->sysUptime < counter ) {
-            sched_yield();
-          }
-          kprintf( "Rebooting NOW!!!\n" );
-          while ( inportByte( 0x64 ) & 0x02 )
-            ;
-          outportByte( 0x64, 0xFE );
-          break;
-        case 31337:
-          kprintf( "system: backdoor opened\n" );
-          break;
-        case 0x80:
-          if ( !strcmp( myMsg.data, "sdeStart" ) ) {
-            kprintf( "Starting SDE\n" );
-            //execThread(sdeThread,(uInt32)(kmalloc(0x2000)+0x2000),0x0);
-          }
-          else if ( !strcmp( myMsg.data, "freePage" ) ) {
-            kprintf( "kkk Free Pages" );
-          }
-          else if ( !strcmp( myMsg.data, "sdeStop" ) ) {
-            printOff = 0x0;
-            biosCall( 0x10, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 );
-            for ( i = 0x0; i < 100; i++ )
-              asm("hlt");
-          }
-          break;
-        default:
-          kprintf( "system: Received message %i:%s\n", myMsg.header, myMsg.data );
-          break;
-      }
-    }
-
-    /*
-     Here we get the next task from the delete task queue
-     we first check to see if it has an fd attached for the binary and after that
-     we free the pages for the process and then free the task
-     */
-    tmpTask = sched_getDelTask();
-    if ( tmpTask != 0x0 ) {
-      if ( tmpTask->imageFd != 0x0 )
-        fclose( tmpTask->imageFd );
-      vmm_freeProcessPages( tmpTask->id );
-      kfree( tmpTask );
-    }
-    videoBuffer[0] = systemVitals->sysTicks;
-    sched_yield();
-  }
-
-  return;
-}
-
-/***
- END
- ***/
-
diff --git a/sys/i386/timer.S b/sys/i386/timer.S
deleted file mode 100644
index d06e868..0000000
--- a/sys/i386/timer.S
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: timer.S 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-.globl timerInt
-.text
-.code32
-timerInt:                 
-  pusha                    /* Save all of the registers                */
-  mov $0x20,%dx            /* The Following Sends Our EOI To The MPIC  */
-  mov $0x20,%ax           
-  outb %al,%dx
-  movl systemVitals,%ecx   /* Put Location Of System Vitals Into ECX   */
-  incl 4(%ecx)             /* Increment sysTicks our 1000ms counter    */                    
-  movl 4(%ecx),%eax        /* Increment our sysUptime by 1S if 1000MS  */
-  movl $200,%ebx           /* Have Passed                              */
-  xor %edx,%edx           
-  div %ebx               
-  test %edx,%edx          
-  jnz next                
-  incl 8(%ecx)            
-next:                     
-  movl 4(%ecx),%eax        /* Test If quantum Has Passed If So Then    */
-  movl 12(%ecx),%ebx       /* We Can CALL sched                        */
-  xor %edx,%edx           
-  div %ebx                
-  test %edx,%edx          
-  jnz done                
-  call sched              
-done:                     
-  popa                      /* Restore Registers                        */
-  iret                    
-
-/***
- END
- ***/
-
diff --git a/sys/i386/trap.c b/sys/i386/trap.c
deleted file mode 100644
index 971776a..0000000
--- a/sys/i386/trap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: syscall_new.c 172 2016-01-20 13:57:36Z reddawg $
-
- *****************************************************************************************/
-
-#include <sys/trap.h>
-#include <sys/gdt.h>
-#include <ubixos/sched.h>
-#include <lib/kprintf.h>
-
-#define FIRST_TSS_ENTRY 6
-#define VM_MASK 0x00020000
-
-#define store_TR(n) \
-__asm__("str %%ax\n\t" \
-        "subl %2,%%eax\n\t" \
-        "shrl $4,%%eax" \
-        :"=a" (n) \
-        :"0" (0),"i" (FIRST_TSS_ENTRY<<3))
-
-#define get_seg_long(seg,addr) ({ \
-register unsigned long __res; \
-__asm__("push %%fs;mov %%ax,%%fs;movl %%fs:%2,%%eax;pop %%fs" \
-	:"=a" (__res):"0" (seg),"m" (*(addr))); \
-__res;})
-
-#define get_seg_byte(seg,addr) ({ \
-register char __res; \
-__asm__("push %%fs;mov %%ax,%%fs;movb %%fs:%2,%%al;pop %%fs" \
-	:"=a" (__res):"0" (seg),"m" (*(addr))); \
-__res;})
-
-void die_if_kernel(char *str, struct trapframe *regs, long err) {
-	int i;
-	unsigned long esp;
-	unsigned short ss;
-
-	esp = (unsigned long) &regs->tf_esp;
-	//ss = KERNEL_DS;
-        ss = 0x10;
-	if ((regs->tf_eflags & VM_MASK) || (3 & regs->tf_cs) == 3)
-		return;
-	if (regs->tf_cs & 3) {
-		esp = regs->tf_esp;
-		ss = regs->tf_ss;
-	}
-
-	kprintf("%s: %04lx\n", str, err & 0xffff);
-	kprintf("EIP:    %04x:%08lx\nEFLAGS: %08lx\n", 0xffff & regs->tf_cs,regs->tf_eip,regs->tf_eflags);
-	kprintf("eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n", regs->tf_eax, regs->tf_ebx, regs->tf_ecx, regs->tf_edx);
-	kprintf("esi: %08lx   edi: %08lx   ebp: %08lx   esp: %08lx\n", regs->tf_esi, regs->tf_edi, regs->tf_ebp, esp);
-	kprintf("ds: %04x   es: %04x   fs: %04x   gs: %04x   ss: %04x\n", regs->tf_ds, regs->tf_es, regs->tf_fs, regs->tf_gs, ss);
-	store_TR(i);
-	//kprintf("Pid: %d, process nr: %d (%s)\nStack: ", _current->id, 0xffff & i, _current->comm);
-	kprintf("Pid: %d, process nr: %d ()\nStack: ", _current->id, 0xffff & i);
-	for(i=0;i<5;i++)
-		kprintf("%08lx ", get_seg_long(ss,(i+(unsigned long *)esp)));
-	kprintf("\nCode: ");
-	for(i=0;i<20;i++)
-		kprintf("%02x ",0xff & get_seg_byte(regs->tf_cs,(i+(char *)regs->tf_eip)));
-	kprintf("\n");
-}
-
-void trap( struct trapframe *frame ) {
-  u_int trap_code;
-  u_int cr2 = 0;
-
-  struct thread *td = &_current->td;
-
-  trap_code = frame->tf_trapno;
-
-  if ( (frame->tf_eflags & PSL_I) == 0 ) {
-    if (SEL_GET_PL(frame->tf_cs) == SEL_PL_USER || (frame->tf_eflags & PSL_VM)) {
-  die_if_kernel("TEST", frame, 0x100);
- //     kpanic( "INT OFF! USER" );
-}
-    else {
-  die_if_kernel("TEST", frame, 0x100);
-//      kpanic( "INT OFF! KERN[0x%X]", trap_code );
-}
-  }
-
-  kprintf("trap_code: %i(0x%X), EIP: 0x%X\n", frame->tf_trapno, frame->tf_trapno, frame->tf_eip);
-/*
-  switch (trap_code) {
-    case 0xC:
-       cr2 = rcr2();
-       asm("sti"); // Turn Back On Ints!
-       vmm_pageFault(frame, cr2);
-       kprintf("Called page Fault\n");
-    default:
-      break;
-  }
-
-  kprintf("GOTTA RETURN!\n");
-  while(1);
-*/
-}
-
-/***
- END
- ***/
-
diff --git a/sys/include/assert.h b/sys/include/assert.h
deleted file mode 100644
index e6c3f51..0000000
--- a/sys/include/assert.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * 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.
- *
- *	@(#)assert.h	8.2 (Berkeley) 1/21/94
- * $FreeBSD: src/include/assert.h,v 1.4 2002/03/23 17:24:53 imp Exp $
- */
-
-#if defined(__cplusplus)
-#define __BEGIN_DECLS   extern "C" {
-#define __END_DECLS     }
-#else
-#define __BEGIN_DECLS
-#define __END_DECLS
-#endif
-
-/*
- * Unlike other ANSI header files, <assert.h> may usefully be included
- * multiple times, with and without NDEBUG defined.
- */
-
-#undef assert
-#undef _assert
-
-#ifdef NDEBUG
-#define	assert(e)	((void)0)
-#define	_assert(e)	((void)0)
-#else
-#define	_assert(e)	assert(e)
-
-#define	assert(e)	((e) ? (void)0 : __assert(__func__, __FILE__, \
-			    __LINE__, #e))
-#endif /* NDEBUG */
-
-__BEGIN_DECLS
-void __assert(const char *, const char *, int, const char *);
-__END_DECLS
diff --git a/sys/include/devfs/devfs.h b/sys/include/devfs/devfs.h
deleted file mode 100644
index 3a1392f..0000000
--- a/sys/include/devfs/devfs.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: devfs.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _DEVFS_H
-#define _DEVFS_H
-
-#include <sys/types.h>
-#include <vfs/file.h>
-
-struct devfs_devices {
-  struct devfs_devices *next;
-  struct devfs_devices *prev;
-  uInt8  devType;
-  uInt16 devMajor;
-  uInt16 devMinor;
-  char   devName[32];
-  };
-
-struct devfs_info {
-  struct devfs_devices *deviceList;
-  };
-
-int devfs_init();
-int devfs_makeNode(char *name,uInt8 type,uInt16 major,uInt16 minor);
-/*
-int devfs_open(char *file,fileDescriptor *fd);
-void devFSInit(struct mountPoints *mp);
-int devfs_read(fileDescriptor *fd,char *data,long offset,long size);
-int devfs_write(fileDescriptor *fd,char *data,long offset,long size);
-*/
-
-#endif
-
-/***
- $Log: devfs.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:38  reddawg
- no message
-
- Revision 1.5  2004/07/21 10:02:09  reddawg
- devfs: renamed functions
- device system: renamed functions
- fdc: fixed a few potential bugs and cleaned up some unused variables
- strol: fixed definition
- endtask: made it print out freepage debug info
- kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost
- ld: fixed a pointer conversion
- file: cleaned up a few unused variables
- sched: broke task deletion
- kprintf: fixed ogPrintf definition
-
- Revision 1.4  2004/07/14 12:17:52  reddawg
- devfs: devFSEnable to devfs_init
- Changed Startup Routines
-
- Revision 1.3  2004/05/21 14:54:41  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/fs/common/crc32.h b/sys/include/fs/common/crc32.h
deleted file mode 100644
index 43e722b..0000000
--- a/sys/include/fs/common/crc32.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*-
- *  COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or
- *  code or tables extracted from it, as desired without restriction.
- *
- * $FreeBSD: releng/10.2/sys/boot/common/crc32.h 213136 2010-09-24 19:49:12Z pjd $
- */
-
-#ifndef _CRC32_H_
-#define	_CRC32_H_
-
-uint32_t crc32(const void *buf, size_t size);
-
-#endif	/* !_CRC32_H_ */
diff --git a/sys/include/fs/common/gpt.h b/sys/include/fs/common/gpt.h
deleted file mode 100644
index 460b6f6..0000000
--- a/sys/include/fs/common/gpt.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*-
- * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS 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 AUTHORS 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: releng/10.2/sys/boot/common/gpt.h 213136 2010-09-24 19:49:12Z pjd $
- */
-
-#ifndef _GPT_H_
-#define	_GPT_H_
-
-#include <sys/uuid.h>
-#include <sys/device.h>
-#include <lib/string.h>
-
-#define bcopy(src, dst, len)    memcpy((dst), (src), (len))
-#define bzero(buf, size)        memset((buf), 0, (size))
-#define bcmp(b1, b2, len)       (memcmp((b1), (b2), (len)) != 0)
-
-//MrOlsen (2016-01-11) NOTE: Fix This Temm Place To Store These Defines
-#define        DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define        DEV_BSIZE       (1<<DEV_BSHIFT)
-
-struct gpt_hdr {
-  char hdr_sig[8];
-#define GPT_HDR_SIG             "EFI PART"
-  uint32_t hdr_revision;
-#define GPT_HDR_REVISION        0x00010000
-  uint32_t hdr_size;
-  uint32_t hdr_crc_self;
-  uint32_t __reserved;
-  u_int64_t hdr_lba_self;
-  u_int64_t hdr_lba_alt;
-  u_int64_t hdr_lba_start;
-  u_int64_t hdr_lba_end;
-  struct uuid hdr_uuid;
-  u_int64_t hdr_lba_table;
-  uint32_t hdr_entries;
-  uint32_t hdr_entsz;
-  uint32_t hdr_crc_table;
-  /*
-   * The header as defined in the EFI spec is not a multiple of 8 bytes
-   * and given that the alignment requirement is on an 8 byte boundary,
-   * padding will happen. We make the padding explicit so that we can
-   * correct the value returned by sizeof() when we put the size of the
-   * header in field hdr_size, or otherwise use offsetof().
-   */
-  uint32_t padding;
-};
-
-struct gpt_ent {
-  struct uuid ent_type;
-  struct uuid ent_uuid;
-  u_int64_t ent_lba_start;
-  u_int64_t ent_lba_end;
-  u_int64_t ent_attr;
-#define GPT_ENT_ATTR_PLATFORM           (1ULL << 0)
-#define GPT_ENT_ATTR_BOOTME             (1ULL << 59)
-#define GPT_ENT_ATTR_BOOTONCE           (1ULL << 58)
-#define GPT_ENT_ATTR_BOOTFAILED         (1ULL << 57)
-  u_int16_t ent_name[36]; /* UTF-16. */
-};
-
-#define GPT_ENT_TYPE_UNUSED             \
-        {0x00000000,0x0000,0x0000,0x00,0x00,{0x00,0x00,0x00,0x00,0x00,0x00}}
-#define GPT_ENT_TYPE_EFI                \
-        {0xc12a7328,0xf81f,0x11d2,0xba,0x4b,{0x00,0xa0,0xc9,0x3e,0xc9,0x3b}}
-#define GPT_ENT_TYPE_MBR                \
-        {0x024dee41,0x33e7,0x11d3,0x9d,0x69,{0x00,0x08,0xc7,0x81,0xf3,0x9f}}
-#define GPT_ENT_TYPE_FREEBSD            \
-        {0x516e7cb4,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define GPT_ENT_TYPE_FREEBSD_BOOT       \
-        {0x83bd6b9d,0x7f41,0x11dc,0xbe,0x0b,{0x00,0x15,0x60,0xb8,0x4f,0x0f}}
-#define GPT_ENT_TYPE_FREEBSD_NANDFS     \
-        {0x74ba7dd9,0xa689,0x11e1,0xbd,0x04,{0x00,0xe0,0x81,0x28,0x6a,0xcf}}
-#define GPT_ENT_TYPE_FREEBSD_SWAP       \
-        {0x516e7cb5,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define GPT_ENT_TYPE_FREEBSD_UFS        \
-        {0x516e7cb6,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define GPT_ENT_TYPE_FREEBSD_VINUM      \
-        {0x516e7cb8,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define GPT_ENT_TYPE_FREEBSD_ZFS        \
-        {0x516e7cba,0x6ecf,0x11d6,0x8f,0xf8,{0x00,0x02,0x2d,0x09,0x71,0x2b}}
-#define GPT_ENT_TYPE_PREP_BOOT          \
-        {0x9e1a2d38,0xc612,0x4316,0xaa,0x26,{0x8b,0x49,0x52,0x1e,0x5a,0x8b}}
-
-
-/*
-
- #include <drv.h>
- */
-
- int gptread(const uuid_t *uuid, struct device_interface *devInfo, char *buf);
- int gptfind(const uuid_t *uuid, struct device_interface *devInfo, int part);
- void gptbootfailed(struct device_interface *devInfo);
-
-#endif	/* !_GPT_H_ */
diff --git a/sys/include/i386/cpu.h b/sys/include/i386/cpu.h
deleted file mode 100644
index 60e0351..0000000
--- a/sys/include/i386/cpu.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: cpu.h 207 2016-01-23 19:43:49Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _CPU_H_
-#define _CPU_H_
-
-#include <sys/types.h>
-
-/*
- * 386 processor status longword.
- */
-#define PSL_C           0x00000001      /* carry bit */
-#define PSL_PF          0x00000004      /* parity bit */
-#define PSL_AF          0x00000010      /* bcd carry bit */
-#define PSL_Z           0x00000040      /* zero bit */
-#define PSL_N           0x00000080      /* negative bit */
-#define PSL_T           0x00000100      /* trace enable bit */
-#define PSL_I           0x00000200      /* interrupt enable bit */
-#define PSL_D           0x00000400      /* string instruction direction bit */
-#define PSL_V           0x00000800      /* overflow bit */
-#define PSL_IOPL        0x00003000      /* i/o privilege level */
-#define PSL_NT          0x00004000      /* nested task bit */
-#define PSL_RF          0x00010000      /* resume flag bit */
-#define PSL_VM          0x00020000      /* virtual 8086 mode bit */
-#define PSL_AC          0x00040000      /* alignment checking */
-#define PSL_VIF         0x00080000      /* virtual interrupt enable */
-#define PSL_VIP         0x00100000      /* virtual interrupt pending */
-#define PSL_ID          0x00200000      /* identification bit */
-
-/* Read Contents Of CR0 */
-static __inline u_int rcr0( void ) {
-  u_int data;
-  __asm __volatile("movl %%cr0,%0" : "=r" (data));
-  return (data);
-}
-
-/* Write To CR0 */
-static __inline void load_cr0( u_int data ) {
-  __asm __volatile("movl %0,%%cr0" : : "r" (data));
-}
-
-static __inline u_int rcr2( void ) {
-  u_int data;
-
-  __asm __volatile("movl %%cr2,%0" : "=r" (data));
-  return (data);
-}
-
-static __inline u_int rcr3( void ) {
-  u_int data;
-
-  __asm __volatile("movl %%cr3,%0" : "=r" (data));
-  return (data);
-}
-
-static __inline void load_cr3( u_int data ) {
-  __asm __volatile("movl %0,%%cr3" : : "r" (data) : "memory");
-}
-
-static __inline u_int rcr4( void ) {
-  u_int data;
-
-  __asm __volatile("movl %%cr4,%0" : "=r" (data));
-  return (data);
-}
-
-static __inline void load_cr4( u_int data ) {
-  __asm __volatile("movl %0,%%cr4" : : "r" (data));
-}
-
-static __inline void invlpg( u_int addr ) {
-  __asm __volatile("invlpg %0" : : "m" (*(char *)addr) : "memory");
-}
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/isa/8259.h b/sys/include/isa/8259.h
deleted file mode 100644
index 526cc95..0000000
--- a/sys/include/isa/8259.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: 8259.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _8259_H
-#define _8259_H
-
-#include <sys/types.h>
-
-#define mPic    0x20 // I/O for master PIC      
-#define mImr    0x21 // I/O for master IMR      
-#define sPic    0xA0 // I/O for slave PIC       
-#define sImr    0xA1 // I/O for slace IMR       
-#define eoi     0x20 // EOI command             
-#define icw1    0x11 // Cascade, Edge triggered 
-#define icw4    0x01 // 8088 mode               
-#define mVec    0x68 // Vector for master       
-#define sVec    0x70 // Vector for slave        
-#define ocw3Irr 0x0A // Read IRR                
-#define ocw3Isr 0x0B // Read ISR                
-
-int i8259_init();
-void irqEnable(uInt16 irqNo);
-void irqDisable(uInt16 irqNo);
-
-#endif
-
-/***
- $Log: 8259.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:39  reddawg
- no message
-
- Revision 1.4  2004/07/09 13:20:08  reddawg
- Oh yeah duh you can not name functions with numbers
-
- Revision 1.3  2004/07/09 13:14:29  reddawg
- 8259: changed init8259 to 8259_init
- Adjusted Startup Routines
-
- Revision 1.2  2004/05/21 14:57:16  reddawg
- Cleaned up
-
- END
- ***/
diff --git a/sys/include/isa/atkbd.h b/sys/include/isa/atkbd.h
deleted file mode 100644
index 1b266c6..0000000
--- a/sys/include/isa/atkbd.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: atkbd.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _ATKBD_H
-#define _ATKBD_H
-
-#define shiftKey      1
-#define controlKey    2
-#define altKey        4
-#define ledNumlock    2
-#define ledScrolllock 1
-#define ledCapslock   4
-
-int  atkbd_init();
-void atkbd_isr();
-
-void keyboardHandler();
-void setLED();
-
-#endif
-
-/***
- $Log: atkbd.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:39  reddawg
- no message
-
- Revision 1.4  2004/07/29 21:32:16  reddawg
- My quick lunchs breaks worth of updates....
-
- Revision 1.3  2004/07/09 13:34:51  reddawg
- keyboard: keyboardInit to atkbd_init
- Adjusted initialization routines
-
- Revision 1.2  2004/05/21 14:57:16  reddawg
- Cleaned up
-
- END
- ***/
diff --git a/sys/include/isa/fdc.h b/sys/include/isa/fdc.h
deleted file mode 100644
index fcc33b8..0000000
--- a/sys/include/isa/fdc.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fdc.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _FDC_H
-#define _FDC_H
-
-#include <sys/types.h>
-
-typedef struct DrvGeom {
-   Int8 heads;
-   Int8 tracks;
-   Int8 spt;
-} drvGeom;
-
-
-#define fdcMsr  (0x3f4)
-#define fdcData (0x3f5)
-#define fdcDir  (0x3f7)
-#define fdcCcr  (0x3f7)
-#define fdcDor  (0x3f2)
-#define fdcDrs  (0x3f4)
-
-#define cmdWrite   (0xc5)
-#define cmdRead    (0xe6)
-#define cmdSeek    (0x0f)
-#define cmdSensei  (0x08)
-#define cmdRecal   (0x07)
-#define cmdSpecify (0x03)
-
-#define dg144Heads  2     /* heads per drive (1.44M) */
-#define dg144Tracks 80
-#define dg144Spt    18
-#define dg144Gap3rw 0x1b
-#define dg168Gap3rw 0x1c
-
-
-
-int fdc_init();
-void floppyIsr();
-void floppyIsrhndlr();
-void sendByte(int Int8);
-int getByte();
-bool fdcRw(int block,unsigned char *blockBuffer,bool read,unsigned long numSectors);
-void block2Hts(int block,int *head,int *track,int *sector);
-void motorOn(void);
-void motorOff(void);
-bool seek(int track);
-bool waitFdc(bool sensei);
-int getByte();
-void sendByte(int Int8);
-void recalibrate(void);
-void reset(void);
-bool writeBlock(int block,Int8 *blockBuffer, unsigned long numSectors);
-bool readBlock(int block,Int8 *blockBuffer, unsigned long numSectors);
-void fdcWrite(void *info,void *,uInt32 startSector,uInt32 sectorCount);
-void fdcRead(void *info,void *,uInt32 startSector,uInt32 sectorCount);
-
-#endif
-
-/***
- $Log: fdc.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:39  reddawg
- no message
-
- Revision 1.6  2004/07/17 02:38:31  reddawg
- Fixed a few problems
-
- Revision 1.5  2004/07/14 12:42:46  reddawg
- fdc: fdcInit to fdc_init
- Changed Startup Routines
-
- Revision 1.4  2004/05/21 14:57:16  reddawg
- Cleaned up
-
- END
- ***/
diff --git a/sys/include/isa/mouse.h b/sys/include/isa/mouse.h
deleted file mode 100644
index a59a863..0000000
--- a/sys/include/isa/mouse.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mouse.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _MOUSE_H
-#define _MOUSE_H
-
-int mouseInit();
-void mouseISR();
-void mouseHandler();
-
-#endif
-
-/***
- $Log: mouse.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:39  reddawg
- no message
-
- Revision 1.1  2004/06/04 10:20:53  reddawg
- mouse drive: fixed a few bugs works a bit better now
-
- END
- ***/
diff --git a/sys/include/isa/ne2k.h b/sys/include/isa/ne2k.h
deleted file mode 100644
index 70ac271..0000000
--- a/sys/include/isa/ne2k.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ne2k.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _NE2K_H
-#define _NE2K_H
-
-#include <sys/types.h>
-#include <sys/device.old.h>
-
-#define ether_addr  ether_addr_t
-typedef struct dp_rcvhdr
-{
-        uInt8 dr_status;                 /* Copy of rsr                       */
-        uInt8 dr_next;                   /* Pointer to next packet            */
-        uInt8 dr_rbcl;                   /* Receive Byte Count Low            */
-        uInt8 dr_rbch;                   /* Receive Byte Count High           */
-} dp_rcvhdr_t;
-
-typedef union etheraddr {
-    unsigned char bytes[6];             /* byteorder safe initialization */
-    unsigned short shorts[3];           /* force 2-byte alignment */
-} ether_addr;
-
-
-#define RSR_FO         0x08
-#define RSR_PRX                0x01
-#define DEF_ENABLED    0x200
-
-#define OK      0
-
-
-#define startPage 0x4C
-#define stopPage  0x80
-
-
-#define NE_CMD       0x00
-#define NE_PSTART    0x01
-#define NE_PSTOP     0x02
-#define NE_BNRY      0x03
-#define NE_TPSR      0x04
-#define NE_ISR       0x07
-#define NE_CURRENT   0x07
-#define NE_RBCR0     0x0A
-#define NE_RBCR1     0x0B
-#define NE_RCR       0x0C
-#define NE_TCR       0x0D
-#define NE_DCR       0x0E
-#define NE_IMR       0x0F
-
-
-#define NE_DCR_WTS   0x01
-#define NE_DCR_LS    0x08
-#define NE_DCR_AR    0x10
-#define NE_DCR_FT1   0x40
-#define NE_DCR_FT0   0x20
-
-
-
-#define E8390_STOP   0x01
-#define E8390_NODMA  0x20
-#define E8390_PAGE0  0x00
-#define E8390_PAGE1  0x40
-#define E8390_CMD    0x00
-#define E8390_START  0x02
-#define E8390_RREAD  0x08
-#define E8390_RWRITE 0x10
-#define E8390_RXOFF  0x20
-#define E8390_TXOFF  0x00
-#define E8390_RXCONFIG 0x04
-#define E8390_TXCONFIG 0x00
-
-#define EN0_COUNTER0 0x0d
-#define EN0_DCFG     0x0e
-#define EN0_RCNTLO   0x0a
-#define EN0_RCNTHI   0x0b
-#define EN0_ISR      0x07
-#define EN0_IMR      0x0f
-#define EN0_RSARLO   0x08
-#define EN0_RSARHI   0x09
-#define EN0_TPSR     0x04
-#define EN0_RXCR     0x0c
-#define EN0_TXCR     0x0D
-#define EN0_STARTPG  0x01
-#define EN0_STOPPG   0x02
-#define EN0_BOUNDARY 0x03
-
-#define EN1_PHYS     0x01
-#define EN1_CURPAG   0x07
-#define EN1_MULT     0x08
-
-#define NE1SM_START_PG 0x20
-#define NE1SM_STOP_PG 0x40
-#define NESM_START_PG 0x40
-#define NESM_STOP_PG  0x80
-
-#define ENISR_ALL    0x3f
-
-#define ENDCFG_WTS   0x01
-
-#define NE_DATAPORT  0x10
-
-#define TX_2X_PAGES 12
-#define TX_1X_PAGES 6
-#define TX_PAGES (dev->priv->pingPong ? TX_2X_PAGES : TX_1X_PAGES)
-
-
-#define DP_CURR         0x7     /* Current Page Register             */
-#define DP_MAR0         0x8     /* Multicast Address Register 0      */
-#define DP_MAR1         0x9     /* Multicast Address Register 1      */
-#define DP_MAR2         0xA     /* Multicast Address Register 2      */
-#define DP_MAR3         0xB     /* Multicast Address Register 3      */
-#define DP_MAR4         0xC     /* Multicast Address Register 4      */
-#define DP_MAR5         0xD     /* Multicast Address Register 5      */
-#define DP_MAR6         0xE     /* Multicast Address Register 6      */
-#define DP_MAR7         0xF     /* Multicast Address Register 7      */
-
-#define DP_CNTR0        0xD     /* Tally Counter 0                   */
-#define DP_CNTR1        0xE     /* Tally Counter 1                   */
-#define DP_CNTR2        0xF     /* Tally Counter 2                   */
-
-
-#define DP_PAGESIZE     256
-
-extern char *nicPacket;
-extern uInt32 packetLength;
-
-
-int ne2k_init();
-int ne2kProbe(int,struct device *);
-int ne2kDevInit(struct device *);
-void NS8390_init(struct device *dev,int startp);
-
-void ne2kISR();
-void ne2kHandler();
-
-int NICtoPC(struct device *dev,void *packet,int length,int nic_addr);
-int PCtoNIC(struct device *dev,void *packet,int length);
-
-struct nicBuffer *ne2kAllocBuffer(int);
-struct nicBuffer *ne2kGetBuffer();
-void ne2kFreeBuffer(struct nicBuffer *);
-
-#endif
-
-/***
- $Log: ne2k.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:39  reddawg
- no message
-
- Revision 1.6  2004/07/14 12:03:49  reddawg
- ne2k: ne2kInit to ne2k_init
- Changed Startup Routines
-
- Revision 1.5  2004/05/21 14:57:16  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/isa/pit.h b/sys/include/isa/pit.h
deleted file mode 100644
index 4267ad9..0000000
--- a/sys/include/isa/pit.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: pit.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _PIT_H
-#define _PIT_H
-
-#define PIT_TIMER 200
-
-int pit_init();
-
-#endif
-
-/***
- $Log: pit.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:40  reddawg
- no message
-
- Revision 1.6  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.5  2004/07/16 04:06:32  reddawg
- Tune ups this stuff should of been taken care of months ago
-
- Revision 1.4  2004/07/16 01:08:58  reddawg
- Whew we work once again
-
- Revision 1.3  2004/07/09 13:29:15  reddawg
- pit: pitInit to pit_init
- Adjusted initialization routines
-
- Revision 1.2  2004/05/21 14:57:16  reddawg
- Cleaned up
-
- END
- ***/
-
diff --git a/sys/include/lib/bioscall.h b/sys/include/lib/bioscall.h
deleted file mode 100644
index 82a04a2..0000000
--- a/sys/include/lib/bioscall.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: bioscall.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _BIOSCALL_H
-#define _BIOSCALL_H
-
-#include <sys/types.h>
-
-#define EFLAG_TF         0x100
-#define EFLAG_IF         0x200
-#define EFLAG_IOPL3      0x3000
-#define EFLAG_VM         0x20000
-
-void biosCall(int biosInt,int eax,int ebx,int ecx,int edx,int esi,int edi,int es,int ds);
-void bios16Code();
-
-#endif
-
-/***
- $Log: bioscall.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:40  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:00:27  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/lib/kmalloc.h b/sys/include/lib/kmalloc.h
deleted file mode 100644
index 4a31c92..0000000
--- a/sys/include/lib/kmalloc.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kmalloc.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _KMALLOC_H
-#define _KMALLOC_H
-
-#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define sysID      -2
-#define MALLOC_ALIGN_SIZE  32
-#define MALLOC_ALIGN(size) (size + ((((size) % (MALLOC_ALIGN_SIZE)) == 0)? 0 : ((MALLOC_ALIGN_SIZE) - ((size) % (MALLOC_ALIGN_SIZE)))))
-
-struct memDescriptor {
-  struct memDescriptor *prev;        //4
-  struct memDescriptor *next;        //4
-  void                 *baseAddr;    //4
-  uInt32               limit;        //4
-  /*uInt8                status;       //1  */
-  /*char                 reserved[11]; //11 */
-  };
-
-void kfree(void *baseAddr);
-void *kmalloc(uInt32 len);
-
-#ifdef __cplusplus
- }
-#endif
-
-#endif
-
-/***
- $Log: kmalloc.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:40  reddawg
- no message
-
- Revision 1.7  2004/09/14 20:57:01  reddawg
- Bug fixes: macro problem over opt a multiply
-
- Revision 1.6  2004/07/21 10:02:09  reddawg
- devfs: renamed functions
- device system: renamed functions
- fdc: fixed a few potential bugs and cleaned up some unused variables
- strol: fixed definition
- endtask: made it print out freepage debug info
- kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost
- ld: fixed a pointer conversion
- file: cleaned up a few unused variables
- sched: broke task deletion
- kprintf: fixed ogPrintf definition
-
- Revision 1.5  2004/07/19 02:08:27  reddawg
- Cleaned out the rest of debuging code also temporarily disabled the ip stack to improve boot time
-
- Revision 1.4  2004/07/18 05:24:15  reddawg
- Fixens
-
- Revision 1.3  2004/05/21 15:00:27  reddawg
- Cleaned up
-
- END
- ***/
diff --git a/sys/include/lib/kprintf.h b/sys/include/lib/kprintf.h
deleted file mode 100644
index 641a12d..0000000
--- a/sys/include/lib/kprintf.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kprintf.h 81 2016-01-11 16:30:47Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _KPRINTF_H
-#define _KPRINTF_H
-
-#include <sys/types.h>
-#include <stdarg.h>
-
-#define MAXNBUF 512
-
-int kprintf( const char *, ... );
-int sprintf( char *buf, const char *fmt, ... );
-int kvprintf( char const *fmt, void (*func)( int, void* ), void *arg, int radix, va_list ap );
-int ogPrintf( char * );
-
-extern int printOff;
-extern int ogprintOff;
-
-#endif
-
-/***
- $Log: kprintf.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:40  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:00:27  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/lib/libcpp.h b/sys/include/lib/libcpp.h
deleted file mode 100644
index 3d2c65c..0000000
--- a/sys/include/lib/libcpp.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: libcpp.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef __LIBCPP_H
-#define __LIBCPP_H
-
-#include <sys/types.h>
-
-void * operator new(unsigned size);
-void   operator delete(void * ptr);
-void * operator new[](unsigned size);
-void   operator delete[](void * ptr);
-
-#endif
-
-/***
- $Log: libcpp.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:40  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:00:27  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/lib/string.h b/sys/include/lib/string.h
deleted file mode 100644
index 834113a..0000000
--- a/sys/include/lib/string.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: string.h 80 2016-01-11 16:24:44Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _STRING_H
-#define _STRING_H
-
-#include <sys/types.h>
-
-extern u_char const bcd2bin_data[];
-extern u_char const bin2bcd_data[];
-extern char const hex2ascii_data[];
-
-#define bcd2bin(bcd)    (bcd2bin_data[bcd])
-#define bin2bcd(bin)    (bin2bcd_data[bin])
-#define hex2ascii(hex)  (hex2ascii_data[hex])
-
-#define toupper(c) ((c) - 0x20 * (((c) >= 'a') && ((c) <= 'z')))
-#define tolower(c) ((c) + 0x20 * (((c) >= 'A') && ((c) <= 'Z')))
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-char * strcpy( char *, const char * );
-int strcmp( const char *str1, const char *str2 );
-int strncmp( const char * a, const char * b, size_t c );
-void *memcpy( const void *dst, const void * src, size_t length );
-void *memset( void * dst, int c, size_t length );
-int strlen( const char * string );
-int memcmp( const void * dst, const void * src, size_t length );
-void strncpy( char * dest, const char * src, size_t size );
-char *strtok( char *str, const char *sep );
-char *strtok_r( char *str, const char *sep, char **last );
-char *strstr( const char *s, char *find );
-
-int sprintf( char *buf, const char *fmt, ... );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/***
- $Log: string.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:41  reddawg
- no message
-
- Revision 1.5  2004/07/20 19:09:40  flameshadow
- chg: put strcpy() declaration in the right .h file
- add: prototypes for the dirCaching functions in dirCache.h
- chg: renamed dirCaching functions
-
- Revision 1.4  2004/07/06 23:26:12  reddawg
- Fixed A Compilation Error
-
- Revision 1.3  2004/06/28 23:12:58  reddawg
- file format now container:/path/to/file
-
- Revision 1.2  2004/05/21 15:00:27  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/math.h b/sys/include/math.h
deleted file mode 100644
index 29b259a..0000000
--- a/sys/include/math.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: math.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef __MATH_H
-#define __MATH_H
-
-#include <sys/types.h>
-
-//typedef long long int quad_t;
-//typedef unsigned long long int u_quad_t;
-
-double atan(double x);
-double sqrt(double x);
-u_quad_t __udivdi3(u_quad_t a,u_quad_t b);
-quad_t __divdi3(quad_t a,quad_t b);
-
-#endif
-
-/***
- $Log: math.h,v $
- Revision 1.2  2006/10/31 20:41:16  reddawg
- Includes
-
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:38  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:22:35  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/mpi/mpi.h b/sys/include/mpi/mpi.h
deleted file mode 100644
index 2301c35..0000000
--- a/sys/include/mpi/mpi.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mpi.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _MPI_H
-#define _MPI_H
-
-#include <sys/types.h>
-#include <ubixos/sched.h>
-
-#define MESSAGE_LENGTH 248
-
-struct mpi_message {
-  char                 data[MESSAGE_LENGTH];
-  uInt32               header;
-  pidType              pid;
-  struct mpi_message  *next;
-  };
-
-struct mpi_mbox {
-  struct mpi_mbox     *next;
-  struct mpi_mbox     *prev;
-  struct mpi_message  *msg;
-  struct mpi_message  *msgLast;
-  char                 name[64];
-  pidType              pid;
-  };
-
-typedef struct mpi_mbox    mpi_mbox_t;
-typedef struct mpi_message mpi_message_t;
-
-
-int mpi_createMbox(char *);
-int mpi_destroyMbox(char *);
-int mpi_postMessage(char *,uInt32,mpi_message_t *);
-int mpi_fetchMessage(char *,mpi_message_t *);
-int mpi_spam(uInt32,void *);
-
-#endif
-
-/***
- $Log: mpi.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:42  reddawg
- no message
-
- Revision 1.8  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.7  2004/05/28 03:52:56  reddawg
- mpi: took a few suggestions from TCA
-
- Revision 1.6  2004/05/25 18:33:11  reddawg
- We now use 128byte messages I can increase later
-
- Revision 1.5  2004/05/25 18:29:57  reddawg
- We now lock onto a pid
-
- Revision 1.4  2004/05/25 16:52:22  reddawg
- We now have mpiDestroyMbox(char *) This will of course destroy a mail box
-
- Revision 1.3  2004/05/25 16:28:21  reddawg
- Made mpiFindMbox() static
-
- Revision 1.2  2004/05/25 15:42:19  reddawg
- Enabled mpiSpam();
-
- Revision 1.1  2004/05/25 14:07:01  reddawg
- Sorry we can't forget the headers files
-
- END
- ***/
-
diff --git a/sys/include/net/api.h b/sys/include/net/api.h
deleted file mode 100644
index afec037..0000000
--- a/sys/include/net/api.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/**
- * @file
- * netconn API (to be used from non-TCPIP threads)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_API_H
-#define LWIP_HDR_API_H
-
-#include "net/opt.h"
-
-#if LWIP_NETCONN || LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
-/* Note: Netconn API is always available when sockets are enabled -
- * sockets are implemented on top of them */
-
-#include "net/arch.h"
-#include "net/netbuf.h"
-#include "net/sys.h"
-#include "net/ip_addr.h"
-#include "net/err.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Throughout this file, IP addresses and port numbers are expected to be in
- * the same byte order as in the corresponding pcb.
- */
-
-/* Flags for netconn_write (u8_t) */
-#define NETCONN_NOFLAG    0x00
-#define NETCONN_NOCOPY    0x00 /* Only for source code compatibility */
-#define NETCONN_COPY      0x01
-#define NETCONN_MORE      0x02
-#define NETCONN_DONTBLOCK 0x04
-
-/* Flags for struct netconn.flags (u8_t) */
-/** Should this netconn avoid blocking? */
-#define NETCONN_FLAG_NON_BLOCKING             0x02
-/** Was the last connect action a non-blocking one? */
-#define NETCONN_FLAG_IN_NONBLOCKING_CONNECT   0x04
-/** If a nonblocking write has been rejected before, poll_tcp needs to
-    check if the netconn is writable again */
-#define NETCONN_FLAG_CHECK_WRITESPACE         0x10
-#if LWIP_IPV6
-/** If this flag is set then only IPv6 communication is allowed on the
-    netconn. As per RFC#3493 this features defaults to OFF allowing
-    dual-stack usage by default. */
-#define NETCONN_FLAG_IPV6_V6ONLY              0x20
-#endif /* LWIP_IPV6 */
-
-
-/* Helpers to process several netconn_types by the same code */
-#define NETCONNTYPE_GROUP(t)         ((t)&0xF0)
-#define NETCONNTYPE_DATAGRAM(t)      ((t)&0xE0)
-#if LWIP_IPV6
-#define NETCONN_TYPE_IPV6            0x08
-#define NETCONNTYPE_ISIPV6(t)        (((t)&NETCONN_TYPE_IPV6) != 0)
-#define NETCONNTYPE_ISUDPLITE(t)     (((t)&0xF3) == NETCONN_UDPLITE)
-#define NETCONNTYPE_ISUDPNOCHKSUM(t) (((t)&0xF3) == NETCONN_UDPNOCHKSUM)
-#else /* LWIP_IPV6 */
-#define NETCONNTYPE_ISIPV6(t)        (0)
-#define NETCONNTYPE_ISUDPLITE(t)     ((t) == NETCONN_UDPLITE)
-#define NETCONNTYPE_ISUDPNOCHKSUM(t) ((t) == NETCONN_UDPNOCHKSUM)
-#endif /* LWIP_IPV6 */
-
-/** @ingroup netconn_common
- * Protocol family and type of the netconn
- */
-enum netconn_type {
-  NETCONN_INVALID     = 0,
-  /** TCP IPv4 */
-  NETCONN_TCP         = 0x10,
-#if LWIP_IPV6
-  /** TCP IPv6 */
-  NETCONN_TCP_IPV6    = NETCONN_TCP | NETCONN_TYPE_IPV6 /* 0x18 */,
-#endif /* LWIP_IPV6 */
-  /** UDP IPv4 */
-  NETCONN_UDP         = 0x20,
-  /** UDP IPv4 lite */
-  NETCONN_UDPLITE     = 0x21,
-  /** UDP IPv4 no checksum */
-  NETCONN_UDPNOCHKSUM = 0x22,
-
-#if LWIP_IPV6
-  /** UDP IPv6 (dual-stack by default, unless you call @ref netconn_set_ipv6only) */
-  NETCONN_UDP_IPV6         = NETCONN_UDP | NETCONN_TYPE_IPV6 /* 0x28 */,
-  /** UDP IPv6 lite (dual-stack by default, unless you call @ref netconn_set_ipv6only) */
-  NETCONN_UDPLITE_IPV6     = NETCONN_UDPLITE | NETCONN_TYPE_IPV6 /* 0x29 */,
-  /** UDP IPv6 no checksum (dual-stack by default, unless you call @ref netconn_set_ipv6only) */
-  NETCONN_UDPNOCHKSUM_IPV6 = NETCONN_UDPNOCHKSUM | NETCONN_TYPE_IPV6 /* 0x2a */,
-#endif /* LWIP_IPV6 */
-
-  /** Raw connection IPv4 */
-  NETCONN_RAW         = 0x40
-#if LWIP_IPV6
-  /** Raw connection IPv6 (dual-stack by default, unless you call @ref netconn_set_ipv6only) */
-  , NETCONN_RAW_IPV6    = NETCONN_RAW | NETCONN_TYPE_IPV6 /* 0x48 */
-#endif /* LWIP_IPV6 */
-};
-
-/** Current state of the netconn. Non-TCP netconns are always
- * in state NETCONN_NONE! */
-enum netconn_state {
-  NETCONN_NONE,
-  NETCONN_WRITE,
-  NETCONN_LISTEN,
-  NETCONN_CONNECT,
-  NETCONN_CLOSE
-};
-
-/** Used to inform the callback function about changes
- * 
- * Event explanation:
- * 
- * In the netconn implementation, there are three ways to block a client:
- * 
- * - accept mbox (sys_arch_mbox_fetch(&conn->acceptmbox, &accept_ptr, 0); in netconn_accept())
- * - receive mbox (sys_arch_mbox_fetch(&conn->recvmbox, &buf, 0); in netconn_recv_data())
- * - send queue is full (sys_arch_sem_wait(LWIP_API_MSG_SEM(msg), 0); in lwip_netconn_do_write())
- * 
- * The events have to be seen as events signaling the state of these mboxes/semaphores. For non-blocking
- * connections, you need to know in advance whether a call to a netconn function call would block or not,
- * and these events tell you about that.
- * 
- * RCVPLUS events say: Safe to perform a potentially blocking call call once more. 
- * They are counted in sockets - three RCVPLUS events for accept mbox means you are safe
- * to call netconn_accept 3 times without being blocked.
- * Same thing for receive mbox.
- * 
- * RCVMINUS events say: Your call to to a possibly blocking function is "acknowledged".
- * Socket implementation decrements the counter.
- * 
- * For TX, there is no need to count, its merely a flag. SENDPLUS means you may send something.
- * SENDPLUS occurs when enough data was delivered to peer so netconn_send() can be called again.
- * A SENDMINUS event occurs when the next call to a netconn_send() would be blocking.
- */
-enum netconn_evt {
-  NETCONN_EVT_RCVPLUS,
-  NETCONN_EVT_RCVMINUS,
-  NETCONN_EVT_SENDPLUS,
-  NETCONN_EVT_SENDMINUS,
-  NETCONN_EVT_ERROR
-};
-
-#if LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD)
-/** Used for netconn_join_leave_group() */
-enum netconn_igmp {
-  NETCONN_JOIN,
-  NETCONN_LEAVE
-};
-#endif /* LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD) */
-
-#if LWIP_DNS
-/* Used for netconn_gethostbyname_addrtype(), these should match the DNS_ADDRTYPE defines in dns.h */
-#define NETCONN_DNS_DEFAULT   NETCONN_DNS_IPV4_IPV6
-#define NETCONN_DNS_IPV4      0
-#define NETCONN_DNS_IPV6      1
-#define NETCONN_DNS_IPV4_IPV6 2 /* try to resolve IPv4 first, try IPv6 if IPv4 fails only */
-#define NETCONN_DNS_IPV6_IPV4 3 /* try to resolve IPv6 first, try IPv4 if IPv6 fails only */
-#endif /* LWIP_DNS */
-
-/* forward-declare some structs to avoid to include their headers */
-struct ip_pcb;
-struct tcp_pcb;
-struct udp_pcb;
-struct raw_pcb;
-struct netconn;
-struct api_msg;
-
-/** A callback prototype to inform about events for a netconn */
-typedef void (* netconn_callback)(struct netconn *, enum netconn_evt, u16_t len);
-
-/** A netconn descriptor */
-struct netconn {
-  /** type of the netconn (TCP, UDP or RAW) */
-  enum netconn_type type;
-  /** current state of the netconn */
-  enum netconn_state state;
-  /** the lwIP internal protocol control block */
-  union {
-    struct ip_pcb  *ip;
-    struct tcp_pcb *tcp;
-    struct udp_pcb *udp;
-    struct raw_pcb *raw;
-  } pcb;
-  /** the last error this netconn had */
-  err_t last_err;
-#if !LWIP_NETCONN_SEM_PER_THREAD
-  /** sem that is used to synchronously execute functions in the core context */
-  sys_sem_t op_completed;
-#endif
-  /** mbox where received packets are stored until they are fetched
-      by the netconn application thread (can grow quite big) */
-  sys_mbox_t recvmbox;
-#if LWIP_TCP
-  /** mbox where new connections are stored until processed
-      by the application thread */
-  sys_mbox_t acceptmbox;
-#endif /* LWIP_TCP */
-  /** only used for socket layer */
-#if LWIP_SOCKET
-  int socket;
-#endif /* LWIP_SOCKET */
-#if LWIP_SO_SNDTIMEO
-  /** timeout to wait for sending data (which means enqueueing data for sending
-      in internal buffers) in milliseconds */
-  s32_t send_timeout;
-#endif /* LWIP_SO_RCVTIMEO */
-#if LWIP_SO_RCVTIMEO
-  /** timeout in milliseconds to wait for new data to be received
-      (or connections to arrive for listening netconns) */
-  int recv_timeout;
-#endif /* LWIP_SO_RCVTIMEO */
-#if LWIP_SO_RCVBUF
-  /** maximum amount of bytes queued in recvmbox
-      not used for TCP: adjust TCP_WND instead! */
-  int recv_bufsize;
-  /** number of bytes currently in recvmbox to be received,
-      tested against recv_bufsize to limit bytes on recvmbox
-      for UDP and RAW, used for FIONREAD */
-  int recv_avail;
-#endif /* LWIP_SO_RCVBUF */
-#if LWIP_SO_LINGER
-   /** values <0 mean linger is disabled, values > 0 are seconds to linger */
-  s16_t linger;
-#endif /* LWIP_SO_LINGER */
-  /** flags holding more netconn-internal state, see NETCONN_FLAG_* defines */
-  u8_t flags;
-#if LWIP_TCP
-  /** TCP: when data passed to netconn_write doesn't fit into the send buffer,
-      this temporarily stores how much is already sent. */
-  size_t write_offset;
-  /** TCP: when data passed to netconn_write doesn't fit into the send buffer,
-      this temporarily stores the message.
-      Also used during connect and close. */
-  struct api_msg *current_msg;
-#endif /* LWIP_TCP */
-  /** A callback function that is informed about events for this netconn */
-  netconn_callback callback;
-};
-
-/** Register an Network connection event */
-#define API_EVENT(c,e,l) if (c->callback) {         \
-                           (*c->callback)(c, e, l); \
-                         }
-
-/** Set conn->last_err to err but don't overwrite fatal errors */
-#define NETCONN_SET_SAFE_ERR(conn, err) do { if ((conn) != NULL) { \
-  SYS_ARCH_DECL_PROTECT(netconn_set_safe_err_lev); \
-  SYS_ARCH_PROTECT(netconn_set_safe_err_lev); \
-  if (!ERR_IS_FATAL((conn)->last_err)) { \
-    (conn)->last_err = err; \
-  } \
-  SYS_ARCH_UNPROTECT(netconn_set_safe_err_lev); \
-}} while(0);
-
-/* Network connection functions: */
-
-/** @ingroup netconn_common
- * Create new netconn connection
- * @param t @ref netconn_type */
-#define netconn_new(t)                  netconn_new_with_proto_and_callback(t, 0, NULL)
-#define netconn_new_with_callback(t, c) netconn_new_with_proto_and_callback(t, 0, c)
-struct netconn *netconn_new_with_proto_and_callback(enum netconn_type t, u8_t proto,
-                                             netconn_callback callback);
-err_t   netconn_delete(struct netconn *conn);
-/** Get the type of a netconn (as enum netconn_type). */
-#define netconn_type(conn) (conn->type)
-
-err_t   netconn_getaddr(struct netconn *conn, ip_addr_t *addr,
-                        u16_t *port, u8_t local);
-/** @ingroup netconn_common */
-#define netconn_peer(c,i,p) netconn_getaddr(c,i,p,0)
-/** @ingroup netconn_common */
-#define netconn_addr(c,i,p) netconn_getaddr(c,i,p,1)
-
-err_t   netconn_bind(struct netconn *conn, const ip_addr_t *addr, u16_t port);
-err_t   netconn_connect(struct netconn *conn, const ip_addr_t *addr, u16_t port);
-err_t   netconn_disconnect (struct netconn *conn);
-err_t   netconn_listen_with_backlog(struct netconn *conn, u8_t backlog);
-/** @ingroup netconn_tcp */
-#define netconn_listen(conn) netconn_listen_with_backlog(conn, TCP_DEFAULT_LISTEN_BACKLOG)
-err_t   netconn_accept(struct netconn *conn, struct netconn **new_conn);
-err_t   netconn_recv(struct netconn *conn, struct netbuf **new_buf);
-err_t   netconn_recv_tcp_pbuf(struct netconn *conn, struct pbuf **new_buf);
-err_t   netconn_sendto(struct netconn *conn, struct netbuf *buf,
-                             const ip_addr_t *addr, u16_t port);
-err_t   netconn_send(struct netconn *conn, struct netbuf *buf);
-err_t   netconn_write_partly(struct netconn *conn, const void *dataptr, size_t size,
-                             u8_t apiflags, size_t *bytes_written);
-/** @ingroup netconn_tcp */
-#define netconn_write(conn, dataptr, size, apiflags) \
-          netconn_write_partly(conn, dataptr, size, apiflags, NULL)
-err_t   netconn_close(struct netconn *conn);
-err_t   netconn_shutdown(struct netconn *conn, u8_t shut_rx, u8_t shut_tx);
-
-#if LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD)
-err_t   netconn_join_leave_group(struct netconn *conn, const ip_addr_t *multiaddr,
-                             const ip_addr_t *netif_addr, enum netconn_igmp join_or_leave);
-#endif /* LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD) */
-#if LWIP_DNS
-#if LWIP_IPV4 && LWIP_IPV6
-err_t   netconn_gethostbyname_addrtype(const char *name, ip_addr_t *addr, u8_t dns_addrtype);
-#define netconn_gethostbyname(name, addr) netconn_gethostbyname_addrtype(name, addr, NETCONN_DNS_DEFAULT)
-#else /* LWIP_IPV4 && LWIP_IPV6 */
-err_t   netconn_gethostbyname(const char *name, ip_addr_t *addr);
-#define netconn_gethostbyname_addrtype(name, addr, dns_addrtype) netconn_gethostbyname(name, addr)
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-#endif /* LWIP_DNS */
-
-#define netconn_err(conn)               ((conn)->last_err)
-#define netconn_recv_bufsize(conn)      ((conn)->recv_bufsize)
-
-/** Set the blocking status of netconn calls (@todo: write/send is missing) */
-#define netconn_set_nonblocking(conn, val)  do { if(val) { \
-  (conn)->flags |= NETCONN_FLAG_NON_BLOCKING; \
-} else { \
-  (conn)->flags &= ~ NETCONN_FLAG_NON_BLOCKING; }} while(0)
-/** Get the blocking status of netconn calls (@todo: write/send is missing) */
-#define netconn_is_nonblocking(conn)        (((conn)->flags & NETCONN_FLAG_NON_BLOCKING) != 0)
-
-#if LWIP_IPV6
-/** @ingroup netconn_common
- * TCP: Set the IPv6 ONLY status of netconn calls (see NETCONN_FLAG_IPV6_V6ONLY)
- */
-#define netconn_set_ipv6only(conn, val)  do { if(val) { \
-  (conn)->flags |= NETCONN_FLAG_IPV6_V6ONLY; \
-} else { \
-  (conn)->flags &= ~ NETCONN_FLAG_IPV6_V6ONLY; }} while(0)
-/** @ingroup netconn_common
- * TCP: Get the IPv6 ONLY status of netconn calls (see NETCONN_FLAG_IPV6_V6ONLY)
- */
-#define netconn_get_ipv6only(conn)        (((conn)->flags & NETCONN_FLAG_IPV6_V6ONLY) != 0)
-#endif /* LWIP_IPV6 */
-
-#if LWIP_SO_SNDTIMEO
-/** Set the send timeout in milliseconds */
-#define netconn_set_sendtimeout(conn, timeout)      ((conn)->send_timeout = (timeout))
-/** Get the send timeout in milliseconds */
-#define netconn_get_sendtimeout(conn)               ((conn)->send_timeout)
-#endif /* LWIP_SO_SNDTIMEO */
-#if LWIP_SO_RCVTIMEO
-/** Set the receive timeout in milliseconds */
-#define netconn_set_recvtimeout(conn, timeout)      ((conn)->recv_timeout = (timeout))
-/** Get the receive timeout in milliseconds */
-#define netconn_get_recvtimeout(conn)               ((conn)->recv_timeout)
-#endif /* LWIP_SO_RCVTIMEO */
-#if LWIP_SO_RCVBUF
-/** Set the receive buffer in bytes */
-#define netconn_set_recvbufsize(conn, recvbufsize)  ((conn)->recv_bufsize = (recvbufsize))
-/** Get the receive buffer in bytes */
-#define netconn_get_recvbufsize(conn)               ((conn)->recv_bufsize)
-#endif /* LWIP_SO_RCVBUF*/
-
-#if LWIP_NETCONN_SEM_PER_THREAD
-void netconn_thread_init(void);
-void netconn_thread_cleanup(void);
-#else /* LWIP_NETCONN_SEM_PER_THREAD */
-#define netconn_thread_init()
-#define netconn_thread_cleanup()
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_NETCONN || LWIP_SOCKET */
-
-#endif /* LWIP_HDR_API_H */
diff --git a/sys/include/net/apps/FILES b/sys/include/net/apps/FILES
deleted file mode 100644
index c983076..0000000
--- a/sys/include/net/apps/FILES
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory contains application headers.
-Every application shall provide one api file APP.h and optionally one options file APP_opts.h
diff --git a/sys/include/net/apps/fs.h b/sys/include/net/apps/fs.h
deleted file mode 100644
index 0283a0b..0000000
--- a/sys/include/net/apps/fs.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_APPS_FS_H
-#define LWIP_HDR_APPS_FS_H
-
-#include "httpd_opts.h"
-#include "lwip/err.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define FS_READ_EOF     -1
-#define FS_READ_DELAYED -2
-
-#if HTTPD_PRECALCULATED_CHECKSUM
-struct fsdata_chksum {
-  u32_t offset;
-  u16_t chksum;
-  u16_t len;
-};
-#endif /* HTTPD_PRECALCULATED_CHECKSUM */
-
-#define FS_FILE_FLAGS_HEADER_INCLUDED     0x01
-#define FS_FILE_FLAGS_HEADER_PERSISTENT   0x02
-
-struct fs_file {
-  const char *data;
-  int len;
-  int index;
-  void *pextension;
-#if HTTPD_PRECALCULATED_CHECKSUM
-  const struct fsdata_chksum *chksum;
-  u16_t chksum_count;
-#endif /* HTTPD_PRECALCULATED_CHECKSUM */
-  u8_t flags;
-#if LWIP_HTTPD_CUSTOM_FILES
-  u8_t is_custom_file;
-#endif /* LWIP_HTTPD_CUSTOM_FILES */
-#if LWIP_HTTPD_FILE_STATE
-  void *state;
-#endif /* LWIP_HTTPD_FILE_STATE */
-};
-
-#if LWIP_HTTPD_FS_ASYNC_READ
-typedef void (*fs_wait_cb)(void *arg);
-#endif /* LWIP_HTTPD_FS_ASYNC_READ */
-
-err_t fs_open(struct fs_file *file, const char *name);
-void fs_close(struct fs_file *file);
-#if LWIP_HTTPD_DYNAMIC_FILE_READ
-#if LWIP_HTTPD_FS_ASYNC_READ
-int fs_read_async(struct fs_file *file, char *buffer, int count, fs_wait_cb callback_fn, void *callback_arg);
-#else /* LWIP_HTTPD_FS_ASYNC_READ */
-int fs_read(struct fs_file *file, char *buffer, int count);
-#endif /* LWIP_HTTPD_FS_ASYNC_READ */
-#endif /* LWIP_HTTPD_DYNAMIC_FILE_READ */
-#if LWIP_HTTPD_FS_ASYNC_READ
-int fs_is_file_ready(struct fs_file *file, fs_wait_cb callback_fn, void *callback_arg);
-#endif /* LWIP_HTTPD_FS_ASYNC_READ */
-int fs_bytes_left(struct fs_file *file);
-
-#if LWIP_HTTPD_FILE_STATE
-/** This user-defined function is called when a file is opened. */
-void *fs_state_init(struct fs_file *file, const char *name);
-/** This user-defined function is called when a file is closed. */
-void fs_state_free(struct fs_file *file, void *state);
-#endif /* #if LWIP_HTTPD_FILE_STATE */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_FS_H */
diff --git a/sys/include/net/apps/httpd.h b/sys/include/net/apps/httpd.h
deleted file mode 100644
index 57831dd..0000000
--- a/sys/include/net/apps/httpd.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/**
- * @file
- * HTTP server
- */
-
-/*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- * This version of the file has been modified by Texas Instruments to offer
- * simple server-side-include (SSI) and Common Gateway Interface (CGI)
- * capability.
- */
-
-#ifndef LWIP_HDR_APPS_HTTPD_H
-#define LWIP_HDR_APPS_HTTPD_H
-
-#include "httpd_opts.h"
-#include "lwip/err.h"
-#include "lwip/pbuf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_HTTPD_CGI
-
-/*
- * Function pointer for a CGI script handler.
- *
- * This function is called each time the HTTPD server is asked for a file
- * whose name was previously registered as a CGI function using a call to
- * http_set_cgi_handler. The iIndex parameter provides the index of the
- * CGI within the ppcURLs array passed to http_set_cgi_handler. Parameters
- * pcParam and pcValue provide access to the parameters provided along with
- * the URI. iNumParams provides a count of the entries in the pcParam and
- * pcValue arrays. Each entry in the pcParam array contains the name of a
- * parameter with the corresponding entry in the pcValue array containing the
- * value for that parameter. Note that pcParam may contain multiple elements
- * with the same name if, for example, a multi-selection list control is used
- * in the form generating the data.
- *
- * The function should return a pointer to a character string which is the
- * path and filename of the response that is to be sent to the connected
- * browser, for example "/thanks.htm" or "/response/error.ssi".
- *
- * The maximum number of parameters that will be passed to this function via
- * iNumParams is defined by LWIP_HTTPD_MAX_CGI_PARAMETERS. Any parameters in the incoming
- * HTTP request above this number will be discarded.
- *
- * Requests intended for use by this CGI mechanism must be sent using the GET
- * method (which encodes all parameters within the URI rather than in a block
- * later in the request). Attempts to use the POST method will result in the
- * request being ignored.
- *
- */
-typedef const char *(*tCGIHandler)(int iIndex, int iNumParams, char *pcParam[],
-                             char *pcValue[]);
-
-/*
- * Structure defining the base filename (URL) of a CGI and the associated
- * function which is to be called when that URL is requested.
- */
-typedef struct
-{
-    const char *pcCGIName;
-    tCGIHandler pfnCGIHandler;
-} tCGI;
-
-void http_set_cgi_handlers(const tCGI *pCGIs, int iNumHandlers);
-
-#endif /* LWIP_HTTPD_CGI */
-
-#if LWIP_HTTPD_CGI || LWIP_HTTPD_CGI_SSI
-
-#if LWIP_HTTPD_CGI_SSI
-/** Define this generic CGI handler in your application.
- * It is called once for every URI with parameters.
- * The parameters can be stored to 
- */
-extern void httpd_cgi_handler(const char* uri, int iNumParams, char **pcParam, char **pcValue
-#if defined(LWIP_HTTPD_FILE_STATE) && LWIP_HTTPD_FILE_STATE
-                                     , void *connection_state
-#endif /* LWIP_HTTPD_FILE_STATE */
-                                     );
-#endif /* LWIP_HTTPD_CGI_SSI */
-
-#endif /* LWIP_HTTPD_CGI || LWIP_HTTPD_CGI_SSI */
-
-#if LWIP_HTTPD_SSI
-
-/*
- * Function pointer for the SSI tag handler callback.
- *
- * This function will be called each time the HTTPD server detects a tag of the
- * form <!--#name--> in a .shtml, .ssi or .shtm file where "name" appears as
- * one of the tags supplied to http_set_ssi_handler in the ppcTags array.  The
- * returned insert string, which will be appended after the the string
- * "<!--#name-->" in file sent back to the client,should be written to pointer
- * pcInsert.  iInsertLen contains the size of the buffer pointed to by
- * pcInsert.  The iIndex parameter provides the zero-based index of the tag as
- * found in the ppcTags array and identifies the tag that is to be processed.
- *
- * The handler returns the number of characters written to pcInsert excluding
- * any terminating NULL or a negative number to indicate a failure (tag not
- * recognized, for example).
- *
- * Note that the behavior of this SSI mechanism is somewhat different from the
- * "normal" SSI processing as found in, for example, the Apache web server.  In
- * this case, the inserted text is appended following the SSI tag rather than
- * replacing the tag entirely.  This allows for an implementation that does not
- * require significant additional buffering of output data yet which will still
- * offer usable SSI functionality.  One downside to this approach is when
- * attempting to use SSI within JavaScript.  The SSI tag is structured to
- * resemble an HTML comment but this syntax does not constitute a comment
- * within JavaScript and, hence, leaving the tag in place will result in
- * problems in these cases.  To work around this, any SSI tag which needs to
- * output JavaScript code must do so in an encapsulated way, sending the whole
- * HTML <script>...</script> section as a single include.
- */
-typedef u16_t (*tSSIHandler)(
-#if LWIP_HTTPD_SSI_RAW
-                             const char* ssi_tag_name,
-#else /* LWIP_HTTPD_SSI_RAW */
-                             int iIndex,
-#endif /* LWIP_HTTPD_SSI_RAW */
-                             char *pcInsert, int iInsertLen
-#if LWIP_HTTPD_SSI_MULTIPART
-                             , u16_t current_tag_part, u16_t *next_tag_part
-#endif /* LWIP_HTTPD_SSI_MULTIPART */
-#if defined(LWIP_HTTPD_FILE_STATE) && LWIP_HTTPD_FILE_STATE
-                             , void *connection_state
-#endif /* LWIP_HTTPD_FILE_STATE */
-                             );
-
-/** Set the SSI handler function
- * (if LWIP_HTTPD_SSI_RAW==1, only the first argument is used)
- */
-void http_set_ssi_handler(tSSIHandler pfnSSIHandler,
-                          const char **ppcTags, int iNumTags);
-
-/** For LWIP_HTTPD_SSI_RAW==1, return this to indicate the tag is unknown.
- * In this case, the webserver writes a warning into the page.
- * You can also just return 0 to write nothing for unknown tags.
- */
-#define HTTPD_SSI_TAG_UNKNOWN 0xFFFF
-
-#endif /* LWIP_HTTPD_SSI */
-
-#if LWIP_HTTPD_SUPPORT_POST
-
-/* These functions must be implemented by the application */
-
-/** Called when a POST request has been received. The application can decide
- * whether to accept it or not.
- *
- * @param connection Unique connection identifier, valid until httpd_post_end
- *        is called.
- * @param uri The HTTP header URI receiving the POST request.
- * @param http_request The raw HTTP request (the first packet, normally).
- * @param http_request_len Size of 'http_request'.
- * @param content_len Content-Length from HTTP header.
- * @param response_uri Filename of response file, to be filled when denying the
- *        request
- * @param response_uri_len Size of the 'response_uri' buffer.
- * @param post_auto_wnd Set this to 0 to let the callback code handle window
- *        updates by calling 'httpd_post_data_recved' (to throttle rx speed)
- *        default is 1 (httpd handles window updates automatically)
- * @return ERR_OK: Accept the POST request, data may be passed in
- *         another err_t: Deny the POST request, send back 'bad request'.
- */
-err_t httpd_post_begin(void *connection, const char *uri, const char *http_request,
-                       u16_t http_request_len, int content_len, char *response_uri,
-                       u16_t response_uri_len, u8_t *post_auto_wnd);
-
-/** Called for each pbuf of data that has been received for a POST.
- * ATTENTION: The application is responsible for freeing the pbufs passed in!
- *
- * @param connection Unique connection identifier.
- * @param p Received data.
- * @return ERR_OK: Data accepted.
- *         another err_t: Data denied, http_post_get_response_uri will be called.
- */
-err_t httpd_post_receive_data(void *connection, struct pbuf *p);
-
-/** Called when all data is received or when the connection is closed.
- * The application must return the filename/URI of a file to send in response
- * to this POST request. If the response_uri buffer is untouched, a 404
- * response is returned.
- *
- * @param connection Unique connection identifier.
- * @param response_uri Filename of response file, to be filled when denying the request
- * @param response_uri_len Size of the 'response_uri' buffer.
- */
-void httpd_post_finished(void *connection, char *response_uri, u16_t response_uri_len);
-
-#if LWIP_HTTPD_POST_MANUAL_WND
-void httpd_post_data_recved(void *connection, u16_t recved_len);
-#endif /* LWIP_HTTPD_POST_MANUAL_WND */
-
-#endif /* LWIP_HTTPD_SUPPORT_POST */
-
-void httpd_init(void);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HTTPD_H */
diff --git a/sys/include/net/apps/httpd_opts.h b/sys/include/net/apps/httpd_opts.h
deleted file mode 100644
index 2669745..0000000
--- a/sys/include/net/apps/httpd_opts.h
+++ /dev/null
@@ -1,323 +0,0 @@
-/**
- * @file
- * HTTP server options list
- */
-
-/*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- * This version of the file has been modified by Texas Instruments to offer
- * simple server-side-include (SSI) and Common Gateway Interface (CGI)
- * capability.
- */
-
-#ifndef LWIP_HDR_APPS_HTTPD_OPTS_H
-#define LWIP_HDR_APPS_HTTPD_OPTS_H
-
-#include "lwip/opt.h"
-
-/**
- * @defgroup httpd_opts Options
- * @ingroup httpd
- * @{
- */
-
-/** Set this to 1 to support CGI (old style) */
-#if !defined LWIP_HTTPD_CGI || defined __DOXYGEN__
-#define LWIP_HTTPD_CGI            0
-#endif
-
-/** Set this to 1 to support CGI (new style) */
-#if !defined LWIP_HTTPD_CGI_SSI || defined __DOXYGEN__
-#define LWIP_HTTPD_CGI_SSI        0
-#endif
-
-/** Set this to 1 to support SSI (Server-Side-Includes) */
-#if !defined LWIP_HTTPD_SSI || defined __DOXYGEN__
-#define LWIP_HTTPD_SSI            0
-#endif
-
-/** Set this to 1 to implement an SSI tag handler callback that gets a const char*
- * to the tag (instead of an index into a pre-registered array of known tags) */
-#if !defined LWIP_HTTPD_SSI_RAW || defined __DOXYGEN__
-#define LWIP_HTTPD_SSI_RAW        0
-#endif
-
-/** Set this to 1 to support HTTP POST */
-#if !defined LWIP_HTTPD_SUPPORT_POST || defined __DOXYGEN__
-#define LWIP_HTTPD_SUPPORT_POST   0
-#endif
-
-/* The maximum number of parameters that the CGI handler can be sent. */
-#if !defined LWIP_HTTPD_MAX_CGI_PARAMETERS || defined __DOXYGEN__
-#define LWIP_HTTPD_MAX_CGI_PARAMETERS 16
-#endif
-
-/** LWIP_HTTPD_SSI_MULTIPART==1: SSI handler function is called with 2 more
- * arguments indicating a counter for insert string that are too long to be
- * inserted at once: the SSI handler function must then set 'next_tag_part'
- * which will be passed back to it in the next call. */
-#if !defined LWIP_HTTPD_SSI_MULTIPART || defined __DOXYGEN__
-#define LWIP_HTTPD_SSI_MULTIPART    0
-#endif
-
-/* The maximum length of the string comprising the tag name */
-#if !defined LWIP_HTTPD_MAX_TAG_NAME_LEN || defined __DOXYGEN__
-#define LWIP_HTTPD_MAX_TAG_NAME_LEN 8
-#endif
-
-/* The maximum length of string that can be returned to replace any given tag */
-#if !defined LWIP_HTTPD_MAX_TAG_INSERT_LEN || defined __DOXYGEN__
-#define LWIP_HTTPD_MAX_TAG_INSERT_LEN 192
-#endif
-
-#if !defined LWIP_HTTPD_POST_MANUAL_WND || defined __DOXYGEN__
-#define LWIP_HTTPD_POST_MANUAL_WND  0
-#endif
-
-/** This string is passed in the HTTP header as "Server: " */
-#if !defined HTTPD_SERVER_AGENT || defined __DOXYGEN__
-#define HTTPD_SERVER_AGENT "lwIP/" LWIP_VERSION_STRING " (http://savannah.nongnu.org/projects/lwip)"
-#endif
-
-/** Set this to 1 if you want to include code that creates HTTP headers
- * at runtime. Default is off: HTTP headers are then created statically
- * by the makefsdata tool. Static headers mean smaller code size, but
- * the (readonly) fsdata will grow a bit as every file includes the HTTP
- * header. */
-#if !defined LWIP_HTTPD_DYNAMIC_HEADERS || defined __DOXYGEN__
-#define LWIP_HTTPD_DYNAMIC_HEADERS 0
-#endif
-
-#if !defined HTTPD_DEBUG || defined __DOXYGEN__
-#define HTTPD_DEBUG         LWIP_DBG_OFF
-#endif
-
-/** Set this to 1 to use a memp pool for allocating 
- * struct http_state instead of the heap.
- */
-#if !defined HTTPD_USE_MEM_POOL || defined __DOXYGEN__
-#define HTTPD_USE_MEM_POOL  0
-#endif
-
-/** The server port for HTTPD to use */
-#if !defined HTTPD_SERVER_PORT || defined __DOXYGEN__
-#define HTTPD_SERVER_PORT                   80
-#endif
-
-/** Maximum retries before the connection is aborted/closed.
- * - number of times pcb->poll is called -> default is 4*500ms = 2s;
- * - reset when pcb->sent is called
- */
-#if !defined HTTPD_MAX_RETRIES || defined __DOXYGEN__
-#define HTTPD_MAX_RETRIES                   4
-#endif
-
-/** The poll delay is X*500ms */
-#if !defined HTTPD_POLL_INTERVAL || defined __DOXYGEN__
-#define HTTPD_POLL_INTERVAL                 4
-#endif
-
-/** Priority for tcp pcbs created by HTTPD (very low by default).
- *  Lower priorities get killed first when running out of memory.
- */
-#if !defined HTTPD_TCP_PRIO || defined __DOXYGEN__
-#define HTTPD_TCP_PRIO                      TCP_PRIO_MIN
-#endif
-
-/** Set this to 1 to enable timing each file sent */
-#if !defined LWIP_HTTPD_TIMING || defined __DOXYGEN__
-#define LWIP_HTTPD_TIMING                   0
-#endif
-/** Set this to 1 to enable timing each file sent */
-#if !defined HTTPD_DEBUG_TIMING || defined __DOXYGEN__
-#define HTTPD_DEBUG_TIMING                  LWIP_DBG_OFF
-#endif
-
-/** Set this to one to show error pages when parsing a request fails instead
-    of simply closing the connection. */
-#if !defined LWIP_HTTPD_SUPPORT_EXTSTATUS || defined __DOXYGEN__
-#define LWIP_HTTPD_SUPPORT_EXTSTATUS        0
-#endif
-
-/** Set this to 0 to drop support for HTTP/0.9 clients (to save some bytes) */
-#if !defined LWIP_HTTPD_SUPPORT_V09 || defined __DOXYGEN__
-#define LWIP_HTTPD_SUPPORT_V09              1
-#endif
-
-/** Set this to 1 to enable HTTP/1.1 persistent connections.
- * ATTENTION: If the generated file system includes HTTP headers, these must
- * include the "Connection: keep-alive" header (pass argument "-11" to makefsdata).
- */
-#if !defined LWIP_HTTPD_SUPPORT_11_KEEPALIVE || defined __DOXYGEN__
-#define LWIP_HTTPD_SUPPORT_11_KEEPALIVE     0
-#endif
-
-/** Set this to 1 to support HTTP request coming in in multiple packets/pbufs */
-#if !defined LWIP_HTTPD_SUPPORT_REQUESTLIST || defined __DOXYGEN__
-#define LWIP_HTTPD_SUPPORT_REQUESTLIST      1
-#endif
-
-#if LWIP_HTTPD_SUPPORT_REQUESTLIST
-/** Number of rx pbufs to enqueue to parse an incoming request (up to the first
-    newline) */
-#if !defined LWIP_HTTPD_REQ_QUEUELEN || defined __DOXYGEN__
-#define LWIP_HTTPD_REQ_QUEUELEN             5
-#endif
-
-/** Number of (TCP payload-) bytes (in pbufs) to enqueue to parse and incoming
-    request (up to the first double-newline) */
-#if !defined LWIP_HTTPD_REQ_BUFSIZE || defined __DOXYGEN__
-#define LWIP_HTTPD_REQ_BUFSIZE              LWIP_HTTPD_MAX_REQ_LENGTH
-#endif
-
-/** Defines the maximum length of a HTTP request line (up to the first CRLF,
-    copied from pbuf into this a global buffer when pbuf- or packet-queues
-    are received - otherwise the input pbuf is used directly) */
-#if !defined LWIP_HTTPD_MAX_REQ_LENGTH || defined __DOXYGEN__
-#define LWIP_HTTPD_MAX_REQ_LENGTH           LWIP_MIN(1023, (LWIP_HTTPD_REQ_QUEUELEN * PBUF_POOL_BUFSIZE))
-#endif
-#endif /* LWIP_HTTPD_SUPPORT_REQUESTLIST */
-
-/** This is the size of a static buffer used when URIs end with '/'.
- * In this buffer, the directory requested is concatenated with all the
- * configured default file names.
- * Set to 0 to disable checking default filenames on non-root directories.
- */
-#if !defined LWIP_HTTPD_MAX_REQUEST_URI_LEN || defined __DOXYGEN__
-#define LWIP_HTTPD_MAX_REQUEST_URI_LEN      63
-#endif
-
-/** Maximum length of the filename to send as response to a POST request,
- * filled in by the application when a POST is finished.
- */
-#if !defined LWIP_HTTPD_POST_MAX_RESPONSE_URI_LEN || defined __DOXYGEN__
-#define LWIP_HTTPD_POST_MAX_RESPONSE_URI_LEN 63
-#endif
-
-/** Set this to 0 to not send the SSI tag (default is on, so the tag will
- * be sent in the HTML page */
-#if !defined LWIP_HTTPD_SSI_INCLUDE_TAG || defined __DOXYGEN__
-#define LWIP_HTTPD_SSI_INCLUDE_TAG           1
-#endif
-
-/** Set this to 1 to call tcp_abort when tcp_close fails with memory error.
- * This can be used to prevent consuming all memory in situations where the
- * HTTP server has low priority compared to other communication. */
-#if !defined LWIP_HTTPD_ABORT_ON_CLOSE_MEM_ERROR || defined __DOXYGEN__
-#define LWIP_HTTPD_ABORT_ON_CLOSE_MEM_ERROR  0
-#endif
-
-/** Set this to 1 to kill the oldest connection when running out of
- * memory for 'struct http_state' or 'struct http_ssi_state'.
- * ATTENTION: This puts all connections on a linked list, so may be kind of slow.
- */
-#if !defined LWIP_HTTPD_KILL_OLD_ON_CONNECTIONS_EXCEEDED || defined __DOXYGEN__
-#define LWIP_HTTPD_KILL_OLD_ON_CONNECTIONS_EXCEEDED 0
-#endif
-
-/** Set this to 1 to send URIs without extension without headers
- * (who uses this at all??) */
-#if !defined LWIP_HTTPD_OMIT_HEADER_FOR_EXTENSIONLESS_URI || defined __DOXYGEN__
-#define LWIP_HTTPD_OMIT_HEADER_FOR_EXTENSIONLESS_URI 0
-#endif
-
-/** Default: Tags are sent from struct http_state and are therefore volatile */
-#if !defined HTTP_IS_TAG_VOLATILE || defined __DOXYGEN__
-#define HTTP_IS_TAG_VOLATILE(ptr) TCP_WRITE_FLAG_COPY
-#endif
-
-/* By default, the httpd is limited to send 2*pcb->mss to keep resource usage low
-   when http is not an important protocol in the device. */
-#if !defined HTTPD_LIMIT_SENDING_TO_2MSS || defined __DOXYGEN__
-#define HTTPD_LIMIT_SENDING_TO_2MSS 1
-#endif
-
-/* Define this to a function that returns the maximum amount of data to enqueue.
-   The function have this signature: u16_t fn(struct tcp_pcb* pcb); */
-#if !defined HTTPD_MAX_WRITE_LEN || defined __DOXYGEN__
-#if HTTPD_LIMIT_SENDING_TO_2MSS
-#define HTTPD_MAX_WRITE_LEN(pcb)    (2 * tcp_mss(pcb))
-#endif
-#endif
-
-/*------------------- FS OPTIONS -------------------*/
-
-/** Set this to 1 and provide the functions:
- * - "int fs_open_custom(struct fs_file *file, const char *name)"
- *    Called first for every opened file to allow opening files
- *    that are not included in fsdata(_custom).c
- * - "void fs_close_custom(struct fs_file *file)"
- *    Called to free resources allocated by fs_open_custom().
- */
-#if !defined LWIP_HTTPD_CUSTOM_FILES || defined __DOXYGEN__
-#define LWIP_HTTPD_CUSTOM_FILES       0
-#endif
-
-/** Set this to 1 to support fs_read() to dynamically read file data.
- * Without this (default=off), only one-block files are supported,
- * and the contents must be ready after fs_open().
- */
-#if !defined LWIP_HTTPD_DYNAMIC_FILE_READ || defined __DOXYGEN__
-#define LWIP_HTTPD_DYNAMIC_FILE_READ  0
-#endif
-
-/** Set this to 1 to include an application state argument per file
- * that is opened. This allows to keep a state per connection/file.
- */
-#if !defined LWIP_HTTPD_FILE_STATE || defined __DOXYGEN__
-#define LWIP_HTTPD_FILE_STATE         0
-#endif
-
-/** HTTPD_PRECALCULATED_CHECKSUM==1: include precompiled checksums for
- * predefined (MSS-sized) chunks of the files to prevent having to calculate
- * the checksums at runtime. */
-#if !defined HTTPD_PRECALCULATED_CHECKSUM || defined __DOXYGEN__
-#define HTTPD_PRECALCULATED_CHECKSUM  0
-#endif
-
-/** LWIP_HTTPD_FS_ASYNC_READ==1: support asynchronous read operations
- * (fs_read_async returns FS_READ_DELAYED and calls a callback when finished).
- */
-#if !defined LWIP_HTTPD_FS_ASYNC_READ || defined __DOXYGEN__
-#define LWIP_HTTPD_FS_ASYNC_READ      0
-#endif
-
-/** Set this to 1 to include "fsdata_custom.c" instead of "fsdata.c" for the
- * file system (to prevent changing the file included in CVS) */
-#if !defined HTTPD_USE_CUSTOM_FSDATA || defined __DOXYGEN__
-#define HTTPD_USE_CUSTOM_FSDATA 0
-#endif
-
-/**
- * @}
- */
-
-#endif /* LWIP_HDR_APPS_HTTPD_OPTS_H */
diff --git a/sys/include/net/apps/lwiperf.h b/sys/include/net/apps/lwiperf.h
deleted file mode 100644
index 63a0c0c..0000000
--- a/sys/include/net/apps/lwiperf.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * @file
- * lwIP iPerf server implementation
- */
-
-/*
- * Copyright (c) 2014 Simon Goldschmidt
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Simon Goldschmidt
- *
- */
-#ifndef LWIP_HDR_APPS_LWIPERF_H
-#define LWIP_HDR_APPS_LWIPERF_H
-
-#include "lwip/opt.h"
-#include "lwip/ip_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LWIPERF_TCP_PORT_DEFAULT  5001
-
-/** lwIPerf test results */
-enum lwiperf_report_type
-{
-  /** The server side test is done */
-  LWIPERF_TCP_DONE_SERVER,
-  /** The client side test is done */
-  LWIPERF_TCP_DONE_CLIENT,
-  /** Local error lead to test abort */
-  LWIPERF_TCP_ABORTED_LOCAL,
-  /** Data check error lead to test abort */
-  LWIPERF_TCP_ABORTED_LOCAL_DATAERROR,
-  /** Transmit error lead to test abort */
-  LWIPERF_TCP_ABORTED_LOCAL_TXERROR,
-  /** Remote side aborted the test */
-  LWIPERF_TCP_ABORTED_REMOTE
-};
-
-/** Prototype of a report function that is called when a session is finished.
-    This report function can show the test results.
-    @param report_type contains the test result */
-typedef void (*lwiperf_report_fn)(void *arg, enum lwiperf_report_type report_type,
-  const ip_addr_t* local_addr, u16_t local_port, const ip_addr_t* remote_addr, u16_t remote_port,
-  u32_t bytes_transferred, u32_t ms_duration, u32_t bandwidth_kbitpsec);
-
-
-void* lwiperf_start_tcp_server(const ip_addr_t* local_addr, u16_t local_port,
-                               lwiperf_report_fn report_fn, void* report_arg);
-void* lwiperf_start_tcp_server_default(lwiperf_report_fn report_fn, void* report_arg);
-void  lwiperf_abort(void* lwiperf_session);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_LWIPERF_H */
diff --git a/sys/include/net/apps/mdns.h b/sys/include/net/apps/mdns.h
deleted file mode 100644
index b19f80c..0000000
--- a/sys/include/net/apps/mdns.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * @file
- * MDNS responder
- */
-
- /*
- * Copyright (c) 2015 Verisure Innovation AB
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Erik Ekman <erik@kryo.se>
- *
- */
-#ifndef LWIP_HDR_MDNS_H
-#define LWIP_HDR_MDNS_H
-
-#include "lwip/apps/mdns_opts.h"
-#include "lwip/netif.h"
-
-#if LWIP_MDNS_RESPONDER
-
-enum mdns_sd_proto {
-  DNSSD_PROTO_UDP = 0,
-  DNSSD_PROTO_TCP = 1
-};
-
-#define MDNS_LABEL_MAXLEN  63
-
-struct mdns_host;
-struct mdns_service;
-
-/** Callback function to add text to a reply, called when generating the reply */
-typedef void (*service_get_txt_fn_t)(struct mdns_service *service, void *txt_userdata);
-
-void mdns_resp_init(void);
-
-err_t mdns_resp_add_netif(struct netif *netif, const char *hostname, u32_t dns_ttl);
-err_t mdns_resp_remove_netif(struct netif *netif);
-
-err_t mdns_resp_add_service(struct netif *netif, const char *name, const char *service, enum mdns_sd_proto proto, u16_t port, u32_t dns_ttl, service_get_txt_fn_t txt_fn, void *txt_userdata);
-err_t mdns_resp_add_service_txtitem(struct mdns_service *service, const char *txt, u8_t txt_len);
-void mdns_resp_netif_settings_changed(struct netif *netif);
-
-#endif /* LWIP_MDNS_RESPONDER */
-
-#endif /* LWIP_HDR_MDNS_H */
diff --git a/sys/include/net/apps/mdns_opts.h b/sys/include/net/apps/mdns_opts.h
deleted file mode 100644
index 9f8e5f5..0000000
--- a/sys/include/net/apps/mdns_opts.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * @file
- * MDNS responder
- */
-
- /*
- * Copyright (c) 2015 Verisure Innovation AB
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Erik Ekman <erik@kryo.se>
- *
- */
-
-#ifndef LWIP_HDR_APPS_MDNS_OPTS_H
-#define LWIP_HDR_APPS_MDNS_OPTS_H
-
-#include "lwip/opt.h"
-
-/**
- * @defgroup mdns_opts Options
- * @ingroup mdns
- * @{
- */
-
-/**
- * LWIP_MDNS_RESPONDER==1: Turn on multicast DNS module. UDP must be available for MDNS
- * transport. IGMP is needed for IPv4 multicast.
- */
-#ifndef LWIP_MDNS_RESPONDER
-#define LWIP_MDNS_RESPONDER             0
-#endif /* LWIP_MDNS_RESPONDER */
-
-/** The maximum number of services per netif */
-#ifndef MDNS_MAX_SERVICES
-#define MDNS_MAX_SERVICES               1
-#endif
-
-/**
- * MDNS_DEBUG: Enable debugging for multicast DNS.
- */
-#ifndef MDNS_DEBUG
-#define MDNS_DEBUG                       LWIP_DBG_OFF
-#endif
-
-/**
- * @}
- */
-
-#endif /* LWIP_HDR_APPS_MDNS_OPTS_H */
-
diff --git a/sys/include/net/apps/mdns_priv.h b/sys/include/net/apps/mdns_priv.h
deleted file mode 100644
index 9a48b5f..0000000
--- a/sys/include/net/apps/mdns_priv.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * @file
- * MDNS responder private definitions
- */
-
- /*
- * Copyright (c) 2015 Verisure Innovation AB
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Erik Ekman <erik@kryo.se>
- *
- */
-#ifndef LWIP_HDR_MDNS_PRIV_H
-#define LWIP_HDR_MDNS_PRIV_H
-
-#include "lwip/apps/mdns_opts.h"
-#include "lwip/pbuf.h"
-
-#if LWIP_MDNS_RESPONDER
-
-/* Domain struct and methods - visible for unit tests */
-
-#define MDNS_DOMAIN_MAXLEN 256
-#define MDNS_READNAME_ERROR 0xFFFF
-
-struct mdns_domain {
-  /* Encoded domain name */
-  u8_t name[MDNS_DOMAIN_MAXLEN];
-  /* Total length of domain name, including zero */
-  u16_t length;
-  /* Set if compression of this domain is not allowed */
-  u8_t skip_compression;
-};
-
-err_t mdns_domain_add_label(struct mdns_domain *domain, const char *label, u8_t len);
-u16_t mdns_readname(struct pbuf *p, u16_t offset, struct mdns_domain *domain);
-int mdns_domain_eq(struct mdns_domain *a, struct mdns_domain *b);
-u16_t mdns_compress_domain(struct pbuf *pbuf, u16_t *offset, struct mdns_domain *domain);
-
-#endif /* LWIP_MDNS_RESPONDER */
-
-#endif /* LWIP_HDR_MDNS_PRIV_H */
diff --git a/sys/include/net/apps/mqtt.h b/sys/include/net/apps/mqtt.h
deleted file mode 100644
index f0f5bab..0000000
--- a/sys/include/net/apps/mqtt.h
+++ /dev/null
@@ -1,244 +0,0 @@
-/**
- * @file
- * MQTT client
- */
-
-/*
- * Copyright (c) 2016 Erik Andersson
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Erik Andersson
- *
- */
-#ifndef LWIP_HDR_APPS_MQTT_CLIENT_H
-#define LWIP_HDR_APPS_MQTT_CLIENT_H
-
-#include "lwip/apps/mqtt_opts.h"
-#include "lwip/err.h"
-#include "lwip/ip_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct mqtt_client_t mqtt_client_t;
-
-/** @ingroup mqtt
- * Default MQTT port */
-#define MQTT_PORT 1883
-
-/*---------------------------------------------------------------------------------------------- */
-/* Connection with server */
-
-/**
- * @ingroup mqtt
- * Client information and connection parameters */
-struct mqtt_connect_client_info_t {
-  /** Client identifier, must be set by caller */
-  const char *client_id;
-  /** User name and password, set to NULL if not used */
-  const char* client_user;
-  const char* client_pass;
-  /** keep alive time in seconds, 0 to disable keep alive functionality*/
-  u16_t keep_alive;
-  /** will topic, set to NULL if will is not to be used,
-      will_msg, will_qos and will retain are then ignored */
-  const char* will_topic;
-  const char* will_msg;
-  u8_t will_qos;
-  u8_t will_retain;
-};
-
-/**
- * @ingroup mqtt
- * Connection status codes */
-typedef enum
-{
-  MQTT_CONNECT_ACCEPTED                 = 0,
-  MQTT_CONNECT_REFUSED_PROTOCOL_VERSION = 1,
-  MQTT_CONNECT_REFUSED_IDENTIFIER       = 2,
-  MQTT_CONNECT_REFUSED_SERVER           = 3,
-  MQTT_CONNECT_REFUSED_USERNAME_PASS    = 4,
-  MQTT_CONNECT_REFUSED_NOT_AUTHORIZED_  = 5,
-  MQTT_CONNECT_DISCONNECTED             = 256,
-  MQTT_CONNECT_TIMEOUT                  = 257
-} mqtt_connection_status_t;
-
-/**
- * @ingroup mqtt
- * Function prototype for mqtt connection status callback. Called when
- * client has connected to the server after initiating a mqtt connection attempt by
- * calling mqtt_connect() or when connection is closed by server or an error
- *
- * @param client MQTT client itself
- * @param arg Additional argument to pass to the callback function
- * @param status Connect result code or disconnection notification @see mqtt_connection_status_t
- *
- */
-typedef void (*mqtt_connection_cb_t)(mqtt_client_t *client, void *arg, mqtt_connection_status_t status);
-
-
-/**
- * @ingroup mqtt
- * Data callback flags */
-enum {
-  /** Flag set when last fragment of data arrives in data callback */
-  MQTT_DATA_FLAG_LAST = 1
-};
-
-/** 
- * @ingroup mqtt
- * Function prototype for MQTT incoming publish data callback function. Called when data
- * arrives to a subscribed topic @see mqtt_subscribe
- *
- * @param arg Additional argument to pass to the callback function
- * @param data User data, pointed object, data may not be referenced after callback return,
-          NULL is passed when all publish data are delivered
- * @param len Length of publish data fragment
- * @param flags MQTT_DATA_FLAG_LAST set when this call contains the last part of data from publish message
- *
- */
-typedef void (*mqtt_incoming_data_cb_t)(void *arg, const u8_t *data, u16_t len, u8_t flags);
-
-
-/** 
- * @ingroup mqtt
- * Function prototype for MQTT incoming publish function. Called when an incoming publish
- * arrives to a subscribed topic @see mqtt_subscribe
- *
- * @param arg Additional argument to pass to the callback function
- * @param topic Zero terminated Topic text string, topic may not be referenced after callback return
- * @param tot_len Total length of publish data, if set to 0 (no publish payload) data callback will not be invoked
- */
-typedef void (*mqtt_incoming_publish_cb_t)(void *arg, const char *topic, u32_t tot_len);
-
-
-/**
- * @ingroup mqtt
- * Function prototype for mqtt request callback. Called when a subscribe, unsubscribe
- * or publish request has completed
- * @param arg Pointer to user data supplied when invoking request
- * @param err ERR_OK on success
- *            ERR_TIMEOUT if no response was received within timeout,
- *            ERR_ABRT if (un)subscribe was denied
- */
-typedef void (*mqtt_request_cb_t)(void *arg, err_t err);
-
-
-/**
- * Pending request item, binds application callback to pending server requests
- */
-struct mqtt_request_t
-{
-  /** Next item in list, NULL means this is the last in chain,
-      next pointing at itself means request is unallocated */
-  struct mqtt_request_t *next;
-  /** Callback to upper layer */
-  mqtt_request_cb_t cb;
-  void *arg;
-  /** MQTT packet identifier */
-  u16_t pkt_id;
-  /** Expire time relative to element before this  */
-  u16_t timeout_diff;
-};
-
-/** Ring buffer */
-struct mqtt_ringbuf_t {
-  u16_t put;
-  u16_t get;
-  u8_t buf[MQTT_OUTPUT_RINGBUF_SIZE];
-};
-
-/** MQTT client */
-struct mqtt_client_t
-{
-  /** Timers and timeouts */
-  u16_t cyclic_tick;
-  u16_t keep_alive;
-  u16_t server_watchdog;
-  /** Packet identifier generator*/
-  u16_t pkt_id_seq;
-  /** Packet identifier of pending incoming publish */
-  u16_t inpub_pkt_id;
-  /** Connection state */
-  u8_t conn_state;
-  struct tcp_pcb *conn;
-  /** Connection callback */
-  void *connect_arg;
-  mqtt_connection_cb_t connect_cb;
-  /** Pending requests to server */
-  struct mqtt_request_t *pend_req_queue;
-  struct mqtt_request_t req_list[MQTT_REQ_MAX_IN_FLIGHT];
-  void *inpub_arg;
-  /** Incoming data callback */
-  mqtt_incoming_data_cb_t data_cb;
-  mqtt_incoming_publish_cb_t pub_cb;
-  /** Input */
-  u32_t msg_idx;
-  u8_t rx_buffer[MQTT_VAR_HEADER_BUFFER_LEN];
-  /** Output ring-buffer */
-  struct mqtt_ringbuf_t output;
-};
-
-
-/** Connect to server */
-err_t mqtt_client_connect(mqtt_client_t *client, const ip_addr_t *ipaddr, u16_t port, mqtt_connection_cb_t cb, void *arg,
-                   const struct mqtt_connect_client_info_t *client_info);
-
-/** Disconnect from server */
-void mqtt_disconnect(mqtt_client_t *client);
-
-/** Create new client */
-mqtt_client_t *mqtt_client_new(void);
-
-/** Check connection status */
-u8_t mqtt_client_is_connected(mqtt_client_t *client);
-
-/** Set callback to call for incoming publish */
-void mqtt_set_inpub_callback(mqtt_client_t *client, mqtt_incoming_publish_cb_t,
-                             mqtt_incoming_data_cb_t data_cb, void *arg);
-
-/** Common function for subscribe and unsubscribe */
-err_t mqtt_sub_unsub(mqtt_client_t *client, const char *topic, u8_t qos, mqtt_request_cb_t cb, void *arg, u8_t sub);
-
-/** @ingroup mqtt
- *Subscribe to topic */
-#define mqtt_subscribe(client, topic, qos, cb, arg) mqtt_sub_unsub(client, topic, qos, cb, arg, 1)
-/** @ingroup mqtt
- *  Unsubscribe to topic */
-#define mqtt_unsubscribe(client, topic, cb, arg) mqtt_sub_unsub(client, topic, 0, cb, arg, 0)
-
-
-/** Publish data to topic */
-err_t mqtt_publish(mqtt_client_t *client, const char *topic, const void *payload, u16_t payload_length, u8_t qos, u8_t retain,
-                                    mqtt_request_cb_t cb, void *arg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_MQTT_CLIENT_H */
diff --git a/sys/include/net/apps/mqtt_opts.h b/sys/include/net/apps/mqtt_opts.h
deleted file mode 100644
index 7d07829..0000000
--- a/sys/include/net/apps/mqtt_opts.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * @file
- * MQTT client options
- */
-
-/*
- * Copyright (c) 2016 Erik Andersson
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Erik Andersson
- *
- */
-#ifndef LWIP_HDR_APPS_MQTT_OPTS_H
-#define LWIP_HDR_APPS_MQTT_OPTS_H
-
-#include "lwip/opt.h"
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup mqtt_opts Options
- * @ingroup mqtt
- * @{
- */
-
-/**
- * Output ring-buffer size, must be able to fit largest outgoing publish message topic+payloads
- */
-#ifndef MQTT_OUTPUT_RINGBUF_SIZE
-#define MQTT_OUTPUT_RINGBUF_SIZE 256
-#endif
-
-/**
- * Number of bytes in receive buffer, must be at least the size of the longest incoming topic + 8
- * If one wants to avoid fragmented incoming publish, set length to max incoming topic length + max payload length + 8
- */
-#ifndef MQTT_VAR_HEADER_BUFFER_LEN
-#define MQTT_VAR_HEADER_BUFFER_LEN 128
-#endif
-
-/**
- * Maximum number of pending subscribe, unsubscribe and publish requests to server .
- */
-#ifndef MQTT_REQ_MAX_IN_FLIGHT
-#define MQTT_REQ_MAX_IN_FLIGHT 4
-#endif
-
-/**
- * Seconds between each cyclic timer call.
- */
-#ifndef MQTT_CYCLIC_TIMER_INTERVAL
-#define MQTT_CYCLIC_TIMER_INTERVAL 5
-#endif
-
-/**
- * Publish, subscribe and unsubscribe request timeout in seconds.
- */
-#ifndef MQTT_REQ_TIMEOUT
-#define MQTT_REQ_TIMEOUT 30
-#endif
-
-/**
- * Seconds for MQTT connect response timeout after sending connect request
- */
-#ifndef MQTT_CONNECT_TIMOUT
-#define MQTT_CONNECT_TIMOUT 100
-#endif
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_MQTT_OPTS_H */
diff --git a/sys/include/net/apps/netbiosns.h b/sys/include/net/apps/netbiosns.h
deleted file mode 100644
index 4126606..0000000
--- a/sys/include/net/apps/netbiosns.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @file
- * NETBIOS name service responder
- */
-
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-#ifndef LWIP_HDR_APPS_NETBIOS_H
-#define LWIP_HDR_APPS_NETBIOS_H
-
-#include "lwip/apps/netbiosns_opts.h"
-
-void netbiosns_init(void);
-#ifndef NETBIOS_LWIP_NAME
-void netbiosns_set_name(const char* hostname);
-#endif
-void netbiosns_stop(void);
-
-#endif /* LWIP_HDR_APPS_NETBIOS_H */
diff --git a/sys/include/net/apps/netbiosns_opts.h b/sys/include/net/apps/netbiosns_opts.h
deleted file mode 100644
index f4d2039..0000000
--- a/sys/include/net/apps/netbiosns_opts.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * @file
- * NETBIOS name service responder options
- */
-
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-#ifndef LWIP_HDR_APPS_NETBIOS_OPTS_H
-#define LWIP_HDR_APPS_NETBIOS_OPTS_H
-
-#include "lwip/opt.h"
-
-/**
- * @defgroup netbiosns_opts Options
- * @ingroup netbiosns
- * @{
- */
-
-/** NetBIOS name of lwip device
- * This must be uppercase until NETBIOS_STRCMP() is defined to a string
- * comparision function that is case insensitive.
- * If you want to use the netif's hostname, use this (with LWIP_NETIF_HOSTNAME):
- * (ip_current_netif() != NULL ? ip_current_netif()->hostname != NULL ? ip_current_netif()->hostname : "" : "")
- *
- * If this is not defined, netbiosns_set_name() can be called at runtime to change the name.
- */
-#ifdef __DOXYGEN__
-#define NETBIOS_LWIP_NAME "NETBIOSLWIPDEV"
-#endif
-
-/**
- * @}
- */
-
-#endif /* LWIP_HDR_APPS_NETBIOS_OPTS_H */
diff --git a/sys/include/net/apps/snmp.h b/sys/include/net/apps/snmp.h
deleted file mode 100644
index 5f267be..0000000
--- a/sys/include/net/apps/snmp.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * @file
- * SNMP server main API - start and basic configuration
- */
-
-/*
- * Copyright (c) 2001, 2002 Leon Woestenberg <leon.woestenberg@axon.tv>
- * Copyright (c) 2001, 2002 Axon Digital Design B.V., The Netherlands.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Leon Woestenberg <leon.woestenberg@axon.tv>
- *         Martin Hentschel <info@cl-soft.de>
- *
- */
-#ifndef LWIP_HDR_APPS_SNMP_H
-#define LWIP_HDR_APPS_SNMP_H
-
-#include "lwip/apps/snmp_opts.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
-
-#include "lwip/err.h"
-#include "lwip/apps/snmp_core.h"
-
-/** SNMP variable binding descriptor (publically needed for traps) */
-struct snmp_varbind
-{
-  /** pointer to next varbind, NULL for last in list */
-  struct snmp_varbind *next;
-  /** pointer to previous varbind, NULL for first in list */
-  struct snmp_varbind *prev;
-
-  /** object identifier */
-  struct snmp_obj_id oid;
-
-  /** value ASN1 type */
-  u8_t type;
-  /** object value length */
-  u16_t value_len;
-  /** object value */
-  void *value;
-};
-
-/**
- * @ingroup snmp_core
- * Agent setup, start listening to port 161.
- */
-void snmp_init(void);
-void snmp_set_mibs(const struct snmp_mib **mibs, u8_t num_mibs);
-
-void snmp_set_device_enterprise_oid(const struct snmp_obj_id* device_enterprise_oid);
-const struct snmp_obj_id* snmp_get_device_enterprise_oid(void);
-
-void snmp_trap_dst_enable(u8_t dst_idx, u8_t enable);
-void snmp_trap_dst_ip_set(u8_t dst_idx, const ip_addr_t *dst);
-
-/** Generic trap: cold start */
-#define SNMP_GENTRAP_COLDSTART 0
-/** Generic trap: warm start */
-#define SNMP_GENTRAP_WARMSTART 1
-/** Generic trap: link down */
-#define SNMP_GENTRAP_LINKDOWN 2
-/** Generic trap: link up */
-#define SNMP_GENTRAP_LINKUP 3
-/** Generic trap: authentication failure */
-#define SNMP_GENTRAP_AUTH_FAILURE 4
-/** Generic trap: EGP neighbor lost */
-#define SNMP_GENTRAP_EGP_NEIGHBOR_LOSS 5
-/** Generic trap: enterprise specific */
-#define SNMP_GENTRAP_ENTERPRISE_SPECIFIC 6
-
-err_t snmp_send_trap_generic(s32_t generic_trap);
-err_t snmp_send_trap_specific(s32_t specific_trap, struct snmp_varbind *varbinds);
-err_t snmp_send_trap(const struct snmp_obj_id* oid, s32_t generic_trap, s32_t specific_trap, struct snmp_varbind *varbinds);
-
-#define SNMP_AUTH_TRAPS_DISABLED 0
-#define SNMP_AUTH_TRAPS_ENABLED  1
-void snmp_set_auth_traps_enabled(u8_t enable);
-u8_t snmp_get_auth_traps_enabled(void);
-
-const char * snmp_get_community(void);
-const char * snmp_get_community_write(void);
-const char * snmp_get_community_trap(void);
-void snmp_set_community(const char * const community);
-void snmp_set_community_write(const char * const community);
-void snmp_set_community_trap(const char * const community);
-
-void snmp_coldstart_trap(void);
-void snmp_authfail_trap(void);
-
-typedef void (*snmp_write_callback_fct)(const u32_t* oid, u8_t oid_len, void* callback_arg);
-void snmp_set_write_callback(snmp_write_callback_fct write_callback, void* callback_arg);
-
-#endif /* LWIP_SNMP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_SNMP_H */
diff --git a/sys/include/net/apps/snmp_core.h b/sys/include/net/apps/snmp_core.h
deleted file mode 100644
index a832572..0000000
--- a/sys/include/net/apps/snmp_core.h
+++ /dev/null
@@ -1,364 +0,0 @@
-/**
- * @file
- * SNMP core API for implementing MIBs
- */
-
-/*
- * Copyright (c) 2006 Axon Digital Design B.V., The Netherlands.
- * 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 ``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 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.
- *
- * Author: Christiaan Simons <christiaan.simons@axon.tv>
- *         Martin Hentschel <info@cl-soft.de>
- */
-
-#ifndef LWIP_HDR_APPS_SNMP_CORE_H
-#define LWIP_HDR_APPS_SNMP_CORE_H
-
-#include "lwip/apps/snmp_opts.h"
-
-#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
-
-#include "lwip/ip_addr.h"
-#include "lwip/err.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* basic ASN1 defines */
-#define SNMP_ASN1_CLASS_UNIVERSAL   0x00
-#define SNMP_ASN1_CLASS_APPLICATION 0x40
-#define SNMP_ASN1_CLASS_CONTEXT     0x80
-#define SNMP_ASN1_CLASS_PRIVATE     0xC0
-
-#define SNMP_ASN1_CONTENTTYPE_PRIMITIVE   0x00
-#define SNMP_ASN1_CONTENTTYPE_CONSTRUCTED 0x20
-
-/* universal tags (from ASN.1 spec.) */
-#define SNMP_ASN1_UNIVERSAL_END_OF_CONTENT  0
-#define SNMP_ASN1_UNIVERSAL_INTEGER         2
-#define SNMP_ASN1_UNIVERSAL_OCTET_STRING    4
-#define SNMP_ASN1_UNIVERSAL_NULL            5
-#define SNMP_ASN1_UNIVERSAL_OBJECT_ID       6
-#define SNMP_ASN1_UNIVERSAL_SEQUENCE_OF    16
-
-/* application specific (SNMP) tags (from SNMPv2-SMI) */
-#define SNMP_ASN1_APPLICATION_IPADDR    0  /* [APPLICATION 0] IMPLICIT OCTET STRING (SIZE (4)) */
-#define SNMP_ASN1_APPLICATION_COUNTER   1  /* [APPLICATION 1] IMPLICIT INTEGER (0..4294967295) => u32_t */
-#define SNMP_ASN1_APPLICATION_GAUGE     2  /* [APPLICATION 2] IMPLICIT INTEGER (0..4294967295) => u32_t */
-#define SNMP_ASN1_APPLICATION_TIMETICKS 3  /* [APPLICATION 3] IMPLICIT INTEGER (0..4294967295) => u32_t */
-#define SNMP_ASN1_APPLICATION_OPAQUE    4  /* [APPLICATION 4] IMPLICIT OCTET STRING */
-#define SNMP_ASN1_APPLICATION_COUNTER64 6  /* [APPLICATION 6] IMPLICIT INTEGER (0..18446744073709551615) */
-
-/* context specific (SNMP) tags (from RFC 1905) */
-#define SNMP_ASN1_CONTEXT_VARBIND_NO_SUCH_INSTANCE 1
-
-/* full ASN1 type defines */
-#define SNMP_ASN1_TYPE_END_OF_CONTENT (SNMP_ASN1_CLASS_UNIVERSAL | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_UNIVERSAL_END_OF_CONTENT)
-#define SNMP_ASN1_TYPE_INTEGER        (SNMP_ASN1_CLASS_UNIVERSAL | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_UNIVERSAL_INTEGER)
-#define SNMP_ASN1_TYPE_OCTET_STRING   (SNMP_ASN1_CLASS_UNIVERSAL | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_UNIVERSAL_OCTET_STRING)
-#define SNMP_ASN1_TYPE_NULL           (SNMP_ASN1_CLASS_UNIVERSAL | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_UNIVERSAL_NULL)
-#define SNMP_ASN1_TYPE_OBJECT_ID      (SNMP_ASN1_CLASS_UNIVERSAL | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_UNIVERSAL_OBJECT_ID)
-#define SNMP_ASN1_TYPE_SEQUENCE       (SNMP_ASN1_CLASS_UNIVERSAL | SNMP_ASN1_CONTENTTYPE_CONSTRUCTED | SNMP_ASN1_UNIVERSAL_SEQUENCE_OF)
-#define SNMP_ASN1_TYPE_IPADDR         (SNMP_ASN1_CLASS_APPLICATION | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_APPLICATION_IPADDR)
-#define SNMP_ASN1_TYPE_IPADDRESS      SNMP_ASN1_TYPE_IPADDR
-#define SNMP_ASN1_TYPE_COUNTER        (SNMP_ASN1_CLASS_APPLICATION | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_APPLICATION_COUNTER)
-#define SNMP_ASN1_TYPE_COUNTER32      SNMP_ASN1_TYPE_COUNTER
-#define SNMP_ASN1_TYPE_GAUGE          (SNMP_ASN1_CLASS_APPLICATION | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_APPLICATION_GAUGE)
-#define SNMP_ASN1_TYPE_GAUGE32        SNMP_ASN1_TYPE_GAUGE
-#define SNMP_ASN1_TYPE_UNSIGNED32     SNMP_ASN1_TYPE_GAUGE
-#define SNMP_ASN1_TYPE_TIMETICKS      (SNMP_ASN1_CLASS_APPLICATION | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_APPLICATION_TIMETICKS)
-#define SNMP_ASN1_TYPE_OPAQUE         (SNMP_ASN1_CLASS_APPLICATION | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_APPLICATION_OPAQUE)
-#define SNMP_ASN1_TYPE_COUNTER64      (SNMP_ASN1_CLASS_APPLICATION | SNMP_ASN1_CONTENTTYPE_PRIMITIVE | SNMP_ASN1_APPLICATION_COUNTER64)
-
-#define SNMP_VARBIND_EXCEPTION_OFFSET 0xF0
-#define SNMP_VARBIND_EXCEPTION_MASK   0x0F
-
-/** error codes predefined by SNMP prot. */
-typedef enum {
-  SNMP_ERR_NOERROR             = 0,
-/* 
-outdated v1 error codes. do not use anmore!
-#define SNMP_ERR_NOSUCHNAME 2  use SNMP_ERR_NOSUCHINSTANCE instead
-#define SNMP_ERR_BADVALUE   3  use SNMP_ERR_WRONGTYPE,SNMP_ERR_WRONGLENGTH,SNMP_ERR_WRONGENCODING or SNMP_ERR_WRONGVALUE instead
-#define SNMP_ERR_READONLY   4  use SNMP_ERR_NOTWRITABLE instead
-*/
-  SNMP_ERR_GENERROR            = 5,
-  SNMP_ERR_NOACCESS            = 6,
-  SNMP_ERR_WRONGTYPE           = 7,
-  SNMP_ERR_WRONGLENGTH         = 8,
-  SNMP_ERR_WRONGENCODING       = 9,
-  SNMP_ERR_WRONGVALUE          = 10,
-  SNMP_ERR_NOCREATION          = 11,
-  SNMP_ERR_INCONSISTENTVALUE   = 12,
-  SNMP_ERR_RESOURCEUNAVAILABLE = 13,
-  SNMP_ERR_COMMITFAILED        = 14,
-  SNMP_ERR_UNDOFAILED          = 15,
-  SNMP_ERR_NOTWRITABLE         = 17,
-  SNMP_ERR_INCONSISTENTNAME    = 18,
-
-  SNMP_ERR_NOSUCHINSTANCE      = SNMP_VARBIND_EXCEPTION_OFFSET + SNMP_ASN1_CONTEXT_VARBIND_NO_SUCH_INSTANCE
-} snmp_err_t;
-
-/** internal object identifier representation */
-struct snmp_obj_id
-{
-  u8_t len;
-  u32_t id[SNMP_MAX_OBJ_ID_LEN];
-};
-
-struct snmp_obj_id_const_ref
-{
-  u8_t len;
-  const u32_t* id;
-};
-
-extern const struct snmp_obj_id_const_ref snmp_zero_dot_zero; /* administrative identifier from SNMPv2-SMI */
-
-/** SNMP variant value, used as reference in struct snmp_node_instance and table implementation */
-union snmp_variant_value
-{
-  void* ptr;
-  const void* const_ptr;
-  u32_t u32;
-  s32_t s32;
-};
-
-
-/**
-SNMP MIB node types
- tree node is the only node the stack can process in order to walk the tree,
- all other nodes are assumed to be leaf nodes.
- This cannot be an enum because users may want to define their own node types.
-*/
-#define SNMP_NODE_TREE         0x00
-/* predefined leaf node types */
-#define SNMP_NODE_SCALAR       0x01
-#define SNMP_NODE_SCALAR_ARRAY 0x02
-#define SNMP_NODE_TABLE        0x03
-#define SNMP_NODE_THREADSYNC   0x04
-
-/** node "base class" layout, the mandatory fields for a node  */
-struct snmp_node
-{
-  /** one out of SNMP_NODE_TREE or any leaf node type (like SNMP_NODE_SCALAR) */
-  u8_t node_type;
-  /** the number assigned to this node which used as part of the full OID */
-  u32_t oid;
-};
-
-/** SNMP node instance access types */
-typedef enum {
-  SNMP_NODE_INSTANCE_ACCESS_READ    = 1,
-  SNMP_NODE_INSTANCE_ACCESS_WRITE   = 2,
-  SNMP_NODE_INSTANCE_READ_ONLY      = SNMP_NODE_INSTANCE_ACCESS_READ,
-  SNMP_NODE_INSTANCE_READ_WRITE     = (SNMP_NODE_INSTANCE_ACCESS_READ | SNMP_NODE_INSTANCE_ACCESS_WRITE),
-  SNMP_NODE_INSTANCE_WRITE_ONLY     = SNMP_NODE_INSTANCE_ACCESS_WRITE,
-  SNMP_NODE_INSTANCE_NOT_ACCESSIBLE = 0
-} snmp_access_t;
-
-struct snmp_node_instance;
-
-typedef s16_t (*node_instance_get_value_method)(struct snmp_node_instance*, void*);
-typedef snmp_err_t (*node_instance_set_test_method)(struct snmp_node_instance*, u16_t, void*);
-typedef snmp_err_t (*node_instance_set_value_method)(struct snmp_node_instance*, u16_t, void*);
-typedef void (*node_instance_release_method)(struct snmp_node_instance*);
-
-#define SNMP_GET_VALUE_RAW_DATA 0x8000
-
-/** SNMP node instance */
-struct snmp_node_instance
-{
-  /** prefilled with the node, get_instance() is called on; may be changed by user to any value to pass an arbitrary node between calls to get_instance() and get_value/test_value/set_value */
-  const struct snmp_node* node;
-  /** prefilled with the instance id requested; for get_instance() this is the exact oid requested; for get_next_instance() this is the relative starting point, stack expects relative oid of next node here */
-  struct snmp_obj_id instance_oid;
-
-  /** ASN type for this object (see snmp_asn1.h for definitions) */
-  u8_t asn1_type;
-  /** one out of instance access types defined above (SNMP_NODE_INSTANCE_READ_ONLY,...) */
-  snmp_access_t access;
-
-  /** returns object value for the given object identifier. Return values <0 to indicate an error */
-  node_instance_get_value_method get_value;
-  /** tests length and/or range BEFORE setting */
-  node_instance_set_test_method set_test;
-  /** sets object value, only called when set_test() was successful */
-  node_instance_set_value_method set_value;
-  /** called in any case when the instance is not required anymore by stack (useful for freeing memory allocated in get_instance/get_next_instance methods) */
-  node_instance_release_method release_instance;
-
-  /** reference to pass arbitrary value between calls to get_instance() and get_value/test_value/set_value */
-  union snmp_variant_value reference;
-  /** see reference (if reference is a pointer, the length of underlying data may be stored here or anything else) */
-  u32_t reference_len;
-};
-
-
-/** SNMP tree node */
-struct snmp_tree_node
-{
-  /** inherited "base class" members */
-  struct snmp_node node;
-  u16_t subnode_count;
-  const struct snmp_node* const *subnodes;
-};
-
-#define SNMP_CREATE_TREE_NODE(oid, subnodes) \
-  {{ SNMP_NODE_TREE, (oid) }, \
-  (u16_t)LWIP_ARRAYSIZE(subnodes), (subnodes) }
-
-#define SNMP_CREATE_EMPTY_TREE_NODE(oid) \
-  {{ SNMP_NODE_TREE, (oid) }, \
-  0, NULL }
-
-/** SNMP leaf node */
-struct snmp_leaf_node
-{
-  /** inherited "base class" members */
-  struct snmp_node node;
-  snmp_err_t (*get_instance)(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-  snmp_err_t (*get_next_instance)(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-};
-
-/** represents a single mib with its base oid and root node */
-struct snmp_mib
-{
-  const u32_t *base_oid;
-  u8_t base_oid_len;
-  const struct snmp_node *root_node;
-};
-
-#define SNMP_MIB_CREATE(oid_list, root_node) { (oid_list), (u8_t)LWIP_ARRAYSIZE(oid_list), root_node }
-
-/** OID range structure */
-struct snmp_oid_range
-{
-  u32_t min;
-  u32_t max;
-};
-
-/** checks if incoming OID length and values are in allowed ranges */
-u8_t snmp_oid_in_range(const u32_t *oid_in, u8_t oid_len, const struct snmp_oid_range *oid_ranges, u8_t oid_ranges_len);
-
-typedef enum {
-  SNMP_NEXT_OID_STATUS_SUCCESS,
-  SNMP_NEXT_OID_STATUS_NO_MATCH,
-  SNMP_NEXT_OID_STATUS_BUF_TO_SMALL
-} snmp_next_oid_status_t;
-
-/** state for next_oid_init / next_oid_check functions */
-struct snmp_next_oid_state
-{
-  const u32_t* start_oid;
-  u8_t start_oid_len;
-
-  u32_t* next_oid;
-  u8_t next_oid_len;
-  u8_t next_oid_max_len;
-
-  snmp_next_oid_status_t status;
-  void* reference;
-};
-
-void snmp_next_oid_init(struct snmp_next_oid_state *state,
-  const u32_t *start_oid, u8_t start_oid_len,
-  u32_t *next_oid_buf, u8_t next_oid_max_len);
-u8_t snmp_next_oid_precheck(struct snmp_next_oid_state *state, const u32_t *oid, const u8_t oid_len);
-u8_t snmp_next_oid_check(struct snmp_next_oid_state *state, const u32_t *oid, const u8_t oid_len, void* reference);
-
-void snmp_oid_assign(struct snmp_obj_id* target, const u32_t *oid, u8_t oid_len);
-void snmp_oid_combine(struct snmp_obj_id* target, const u32_t *oid1, u8_t oid1_len, const u32_t *oid2, u8_t oid2_len);
-void snmp_oid_prefix(struct snmp_obj_id* target, const u32_t *oid, u8_t oid_len);
-void snmp_oid_append(struct snmp_obj_id* target, const u32_t *oid, u8_t oid_len);
-u8_t snmp_oid_equal(const u32_t *oid1, u8_t oid1_len, const u32_t *oid2, u8_t oid2_len);
-s8_t snmp_oid_compare(const u32_t *oid1, u8_t oid1_len, const u32_t *oid2, u8_t oid2_len);
-
-#if LWIP_IPV4
-u8_t snmp_oid_to_ip4(const u32_t *oid, ip4_addr_t *ip);
-void snmp_ip4_to_oid(const ip4_addr_t *ip, u32_t *oid);
-#endif /* LWIP_IPV4 */
-#if LWIP_IPV6
-u8_t snmp_oid_to_ip6(const u32_t *oid, ip6_addr_t *ip);
-void snmp_ip6_to_oid(const ip6_addr_t *ip, u32_t *oid);
-#endif /* LWIP_IPV6 */
-#if LWIP_IPV4 || LWIP_IPV6
-u8_t snmp_ip_to_oid(const ip_addr_t *ip, u32_t *oid);
-u8_t snmp_ip_port_to_oid(const ip_addr_t *ip, u16_t port, u32_t *oid);
-
-u8_t snmp_oid_to_ip(const u32_t *oid, u8_t oid_len, ip_addr_t *ip);
-u8_t snmp_oid_to_ip_port(const u32_t *oid, u8_t oid_len, ip_addr_t *ip, u16_t *port);
-#endif /* LWIP_IPV4 || LWIP_IPV6 */
-
-struct netif;
-u8_t netif_to_num(const struct netif *netif);
-
-snmp_err_t snmp_set_test_ok(struct snmp_node_instance* instance, u16_t value_len, void* value); /* generic function which can be used if test is always successful */
-
-err_t snmp_decode_bits(const u8_t *buf, u32_t buf_len, u32_t *bit_value);
-err_t snmp_decode_truthvalue(const s32_t *asn1_value, u8_t *bool_value);
-u8_t  snmp_encode_bits(u8_t *buf, u32_t buf_len, u32_t bit_value, u8_t bit_count);
-u8_t  snmp_encode_truthvalue(s32_t *asn1_value, u32_t bool_value);
-
-struct snmp_statistics
-{
-  u32_t inpkts;
-  u32_t outpkts;
-  u32_t inbadversions;
-  u32_t inbadcommunitynames;
-  u32_t inbadcommunityuses;
-  u32_t inasnparseerrs;
-  u32_t intoobigs;
-  u32_t innosuchnames;
-  u32_t inbadvalues;
-  u32_t inreadonlys;
-  u32_t ingenerrs;
-  u32_t intotalreqvars;
-  u32_t intotalsetvars;
-  u32_t ingetrequests;
-  u32_t ingetnexts;
-  u32_t insetrequests;
-  u32_t ingetresponses;
-  u32_t intraps;
-  u32_t outtoobigs;
-  u32_t outnosuchnames;
-  u32_t outbadvalues;
-  u32_t outgenerrs;
-  u32_t outgetrequests;
-  u32_t outgetnexts;
-  u32_t outsetrequests;
-  u32_t outgetresponses;
-  u32_t outtraps;
-};
-
-extern struct snmp_statistics snmp_stats;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_SNMP */
-
-#endif /* LWIP_HDR_APPS_SNMP_CORE_H */
diff --git a/sys/include/net/apps/snmp_mib2.h b/sys/include/net/apps/snmp_mib2.h
deleted file mode 100644
index 392ee25..0000000
--- a/sys/include/net/apps/snmp_mib2.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @file
- * SNMP MIB2 API
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Dirk Ziegelmeier <dziegel@gmx.de>
- *
- */
-#ifndef LWIP_HDR_APPS_SNMP_MIB2_H
-#define LWIP_HDR_APPS_SNMP_MIB2_H
-
-#include "lwip/apps/snmp_opts.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
-#if SNMP_LWIP_MIB2
-
-#include "lwip/apps/snmp_core.h"
-
-extern const struct snmp_mib mib2;
-
-#if SNMP_USE_NETCONN
-#include "lwip/apps/snmp_threadsync.h"
-void snmp_mib2_lwip_synchronizer(snmp_threadsync_called_fn fn, void* arg);
-extern struct snmp_threadsync_instance snmp_mib2_lwip_locks;
-#endif
-
-#ifndef SNMP_SYSSERVICES
-#define SNMP_SYSSERVICES ((1 << 6) | (1 << 3) | ((IP_FORWARD) << 2))
-#endif
-
-void snmp_mib2_set_sysdescr(const u8_t* str, const u16_t* len); /* read-only be defintion */
-void snmp_mib2_set_syscontact(u8_t *ocstr, u16_t *ocstrlen, u16_t bufsize);
-void snmp_mib2_set_syscontact_readonly(const u8_t *ocstr, const u16_t *ocstrlen);
-void snmp_mib2_set_sysname(u8_t *ocstr, u16_t *ocstrlen, u16_t bufsize);
-void snmp_mib2_set_sysname_readonly(const u8_t *ocstr, const u16_t *ocstrlen);
-void snmp_mib2_set_syslocation(u8_t *ocstr, u16_t *ocstrlen, u16_t bufsize);
-void snmp_mib2_set_syslocation_readonly(const u8_t *ocstr, const u16_t *ocstrlen);
-
-#endif /* SNMP_LWIP_MIB2 */
-#endif /* LWIP_SNMP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_SNMP_MIB2_H */
diff --git a/sys/include/net/apps/snmp_opts.h b/sys/include/net/apps/snmp_opts.h
deleted file mode 100644
index d4ae068..0000000
--- a/sys/include/net/apps/snmp_opts.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/**
- * @file
- * SNMP server options list
- */
-
-/*
- * Copyright (c) 2015 Dirk Ziegelmeier
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Dirk Ziegelmeier
- *
- */
-#ifndef LWIP_HDR_SNMP_OPTS_H
-#define LWIP_HDR_SNMP_OPTS_H
-
-#include "lwip/opt.h"
-
-/**
- * @defgroup snmp_opts Options
- * @ingroup snmp
- * @{
- */
-
-/**
- * LWIP_SNMP==1: This enables the lwIP SNMP agent. UDP must be available
- * for SNMP transport.
- * If you want to use your own SNMP agent, leave this disabled.
- * To integrate MIB2 of an external agent, you need to enable
- * LWIP_MIB2_CALLBACKS and MIB2_STATS. This will give you the callbacks
- * and statistics counters you need to get MIB2 working.
- */
-#if !defined LWIP_SNMP || defined __DOXYGEN__
-#define LWIP_SNMP                       0
-#endif
-
-/**
- * SNMP_USE_NETCONN: Use netconn API instead of raw API.
- * Makes SNMP agent run in a worker thread, so blocking operations
- * can be done in MIB calls.
- */
-#if !defined SNMP_USE_NETCONN || defined __DOXYGEN__
-#define SNMP_USE_NETCONN           0
-#endif
-
-/**
- * SNMP_USE_RAW: Use raw API.
- * SNMP agent does not run in a worker thread, so blocking operations
- * should not be done in MIB calls.
- */
-#if !defined SNMP_USE_RAW || defined __DOXYGEN__
-#define SNMP_USE_RAW               1
-#endif
-
-#if SNMP_USE_NETCONN && SNMP_USE_RAW
-#error SNMP stack can use only one of the APIs {raw, netconn}
-#endif
-
-#if LWIP_SNMP && !SNMP_USE_NETCONN && !SNMP_USE_RAW
-#error SNMP stack needs a receive API and UDP {raw, netconn}
-#endif
-
-#if SNMP_USE_NETCONN
-/**
- * SNMP_STACK_SIZE: Stack size of SNMP netconn worker thread
- */
-#if !defined SNMP_STACK_SIZE || defined __DOXYGEN__
-#define SNMP_STACK_SIZE            DEFAULT_THREAD_STACKSIZE
-#endif
-
-/**
- * SNMP_THREAD_PRIO: SNMP netconn worker thread priority
- */
-#if !defined SNMP_THREAD_PRIO || defined __DOXYGEN__
-#define SNMP_THREAD_PRIO           DEFAULT_THREAD_PRIO
-#endif
-#endif /* SNMP_USE_NETCONN */
-
-/**
- * SNMP_TRAP_DESTINATIONS: Number of trap destinations. At least one trap
- * destination is required
- */
-#if !defined SNMP_TRAP_DESTINATIONS || defined __DOXYGEN__
-#define SNMP_TRAP_DESTINATIONS          1
-#endif
-
-/**
- * Only allow SNMP write actions that are 'safe' (e.g. disabling netifs is not
- * a safe action and disabled when SNMP_SAFE_REQUESTS = 1).
- * Unsafe requests are disabled by default!
- */
-#if !defined SNMP_SAFE_REQUESTS || defined __DOXYGEN__
-#define SNMP_SAFE_REQUESTS              1
-#endif
-
-/**
- * The maximum length of strings used.
- */
-#if !defined SNMP_MAX_OCTET_STRING_LEN || defined __DOXYGEN__
-#define SNMP_MAX_OCTET_STRING_LEN       127
-#endif
-
-/**
- * The maximum number of Sub ID's inside an object identifier.
- * Indirectly this also limits the maximum depth of SNMP tree.
- */
-#if !defined SNMP_MAX_OBJ_ID_LEN || defined __DOXYGEN__
-#define SNMP_MAX_OBJ_ID_LEN             50
-#endif
-
-#if !defined SNMP_MAX_VALUE_SIZE || defined __DOXYGEN__
-/**
- * The maximum size of a value.
- */
-#define SNMP_MIN_VALUE_SIZE             (2 * sizeof(u32_t*)) /* size required to store the basic types (8 bytes for counter64) */
-/**
- * The minimum size of a value.
- */
-#define SNMP_MAX_VALUE_SIZE             LWIP_MAX(LWIP_MAX((SNMP_MAX_OCTET_STRING_LEN), sizeof(u32_t)*(SNMP_MAX_OBJ_ID_LEN)), SNMP_MIN_VALUE_SIZE)
-#endif
-
-/**
- * The snmp read-access community. Used for write-access and traps, too
- * unless SNMP_COMMUNITY_WRITE or SNMP_COMMUNITY_TRAP are enabled, respectively.
- */
-#if !defined SNMP_COMMUNITY || defined __DOXYGEN__
-#define SNMP_COMMUNITY                  "public"
-#endif
-
-/**
- * The snmp write-access community.
- * Set this community to "" in order to disallow any write access.
- */
-#if !defined SNMP_COMMUNITY_WRITE || defined __DOXYGEN__
-#define SNMP_COMMUNITY_WRITE            "private"
-#endif
-
-/**
- * The snmp community used for sending traps.
- */
-#if !defined SNMP_COMMUNITY_TRAP || defined __DOXYGEN__
-#define SNMP_COMMUNITY_TRAP             "public"
-#endif
-
-/**
- * The maximum length of community string.
- * If community names shall be adjusted at runtime via snmp_set_community() calls,
- * enter here the possible maximum length (+1 for terminating null character).
- */
-#if !defined SNMP_MAX_COMMUNITY_STR_LEN || defined __DOXYGEN__
-#define SNMP_MAX_COMMUNITY_STR_LEN LWIP_MAX(LWIP_MAX(sizeof(SNMP_COMMUNITY), sizeof(SNMP_COMMUNITY_WRITE)), sizeof(SNMP_COMMUNITY_TRAP))
-#endif
-
-/**
- * The OID identifiying the device. This may be the enterprise OID itself or any OID located below it in tree.
- */
-#if !defined SNMP_DEVICE_ENTERPRISE_OID || defined __DOXYGEN__
-#define SNMP_LWIP_ENTERPRISE_OID 26381
-/**
- * IANA assigned enterprise ID for lwIP is 26381
- * @see http://www.iana.org/assignments/enterprise-numbers
- *
- * @note this enterprise ID is assigned to the lwIP project,
- * all object identifiers living under this ID are assigned
- * by the lwIP maintainers!
- * @note don't change this define, use snmp_set_device_enterprise_oid()
- *
- * If you need to create your own private MIB you'll need
- * to apply for your own enterprise ID with IANA:
- * http://www.iana.org/numbers.html
- */
-#define SNMP_DEVICE_ENTERPRISE_OID {1, 3, 6, 1, 4, 1, SNMP_LWIP_ENTERPRISE_OID}
-/**
- * Length of SNMP_DEVICE_ENTERPRISE_OID
- */
-#define SNMP_DEVICE_ENTERPRISE_OID_LEN 7
-#endif
-
-/**
- * SNMP_DEBUG: Enable debugging for SNMP messages.
- */
-#if !defined SNMP_DEBUG || defined __DOXYGEN__
-#define SNMP_DEBUG                      LWIP_DBG_OFF
-#endif
-
-/**
- * SNMP_MIB_DEBUG: Enable debugging for SNMP MIBs.
- */
-#if !defined SNMP_MIB_DEBUG || defined __DOXYGEN__
-#define SNMP_MIB_DEBUG                  LWIP_DBG_OFF
-#endif
-
-/**
- * Indicates if the MIB2 implementation of LWIP SNMP stack is used.
- */
-#if !defined SNMP_LWIP_MIB2 || defined __DOXYGEN__
-#define SNMP_LWIP_MIB2                      LWIP_SNMP
-#endif
-
-/**
- * Value return for sysDesc field of MIB2.
- */
-#if !defined SNMP_LWIP_MIB2_SYSDESC || defined __DOXYGEN__
-#define SNMP_LWIP_MIB2_SYSDESC              "lwIP"
-#endif
-
-/**
- * Value return for sysName field of MIB2.
- * To make sysName field settable, call snmp_mib2_set_sysname() to provide the necessary buffers.
- */
-#if !defined SNMP_LWIP_MIB2_SYSNAME || defined __DOXYGEN__
-#define SNMP_LWIP_MIB2_SYSNAME              "FQDN-unk"
-#endif
-
-/**
- * Value return for sysContact field of MIB2.
- * To make sysContact field settable, call snmp_mib2_set_syscontact() to provide the necessary buffers.
- */
-#if !defined SNMP_LWIP_MIB2_SYSCONTACT || defined __DOXYGEN__
-#define SNMP_LWIP_MIB2_SYSCONTACT           ""
-#endif
-
-/**
- * Value return for sysLocation field of MIB2.
- * To make sysLocation field settable, call snmp_mib2_set_syslocation() to provide the necessary buffers.
- */
-#if !defined SNMP_LWIP_MIB2_SYSLOCATION || defined __DOXYGEN__
-#define SNMP_LWIP_MIB2_SYSLOCATION          ""
-#endif
-
-/**
- * This value is used to limit the repetitions processed in GetBulk requests (value == 0 means no limitation).
- * This may be useful to limit the load for a single request.
- * According to SNMP RFC 1905 it is allowed to not return all requested variables from a GetBulk request if system load would be too high.
- * so the effect is that the client will do more requests to gather all data.
- * For the stack this could be useful in case that SNMP processing is done in TCP/IP thread. In this situation a request with many
- * repetitions could block the thread for a longer time. Setting limit here will keep the stack more responsive.
- */
-#if !defined SNMP_LWIP_GETBULK_MAX_REPETITIONS || defined __DOXYGEN__
-#define SNMP_LWIP_GETBULK_MAX_REPETITIONS 0
-#endif
-
-/**
- * @}
- */
-
-/*
-   ------------------------------------
-   ---------- SNMPv3 options ----------
-   ------------------------------------
-*/
-
-/**
- * LWIP_SNMP_V3==1: This enables EXPERIMENTAL SNMPv3 support. LWIP_SNMP must
- * also be enabled.
- * THIS IS UNDER DEVELOPMENT AND SHOULD NOT BE ENABLED IN PRODUCTS.
- */
-#ifndef LWIP_SNMP_V3
-#define LWIP_SNMP_V3               0
-#endif
-
-#ifndef LWIP_SNMP_V3_CRYPTO
-#define LWIP_SNMP_V3_CRYPTO        LWIP_SNMP_V3
-#endif
-
-#ifndef LWIP_SNMP_V3_MBEDTLS
-#define LWIP_SNMP_V3_MBEDTLS       LWIP_SNMP_V3
-#endif
-
-#endif /* LWIP_HDR_SNMP_OPTS_H */
diff --git a/sys/include/net/apps/snmp_scalar.h b/sys/include/net/apps/snmp_scalar.h
deleted file mode 100644
index 99bcdf9..0000000
--- a/sys/include/net/apps/snmp_scalar.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * @file
- * SNMP server MIB API to implement scalar nodes
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Martin Hentschel <info@cl-soft.de>
- *
- */
-
-#ifndef LWIP_HDR_APPS_SNMP_SCALAR_H
-#define LWIP_HDR_APPS_SNMP_SCALAR_H
-
-#include "lwip/apps/snmp_opts.h"
-#include "lwip/apps/snmp_core.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
-
-/** basic scalar node */
-struct snmp_scalar_node
-{
-  /** inherited "base class" members */
-  struct snmp_leaf_node node;
-  u8_t asn1_type;
-  snmp_access_t access;
-  node_instance_get_value_method get_value;
-  node_instance_set_test_method set_test;
-  node_instance_set_value_method set_value;
-};
-
-
-snmp_err_t snmp_scalar_get_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-snmp_err_t snmp_scalar_get_next_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-
-#define SNMP_SCALAR_CREATE_NODE(oid, access, asn1_type, get_value_method, set_test_method, set_value_method) \
-  {{{ SNMP_NODE_SCALAR, (oid) }, \
-    snmp_scalar_get_instance, \
-    snmp_scalar_get_next_instance }, \
-    (asn1_type), (access), (get_value_method), (set_test_method), (set_value_method) }
-
-#define SNMP_SCALAR_CREATE_NODE_READONLY(oid, asn1_type, get_value_method) SNMP_SCALAR_CREATE_NODE(oid, SNMP_NODE_INSTANCE_READ_ONLY, asn1_type, get_value_method, NULL, NULL)
-
-/** scalar array node - a tree node which contains scalars only as children */
-struct snmp_scalar_array_node_def
-{
-  u32_t         oid;
-  u8_t          asn1_type;
-  snmp_access_t access;
-};
-
-typedef s16_t (*snmp_scalar_array_get_value_method)(const struct snmp_scalar_array_node_def*, void*);
-typedef snmp_err_t (*snmp_scalar_array_set_test_method)(const struct snmp_scalar_array_node_def*, u16_t, void*);
-typedef snmp_err_t (*snmp_scalar_array_set_value_method)(const struct snmp_scalar_array_node_def*, u16_t, void*);
-
-/** basic scalar array node */
-struct snmp_scalar_array_node
-{
-  /** inherited "base class" members */
-  struct snmp_leaf_node node;
-  u16_t array_node_count;
-  const struct snmp_scalar_array_node_def* array_nodes;
-  snmp_scalar_array_get_value_method get_value;
-  snmp_scalar_array_set_test_method set_test;
-  snmp_scalar_array_set_value_method set_value;
-};
-
-snmp_err_t snmp_scalar_array_get_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-snmp_err_t snmp_scalar_array_get_next_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-
-#define SNMP_SCALAR_CREATE_ARRAY_NODE(oid, array_nodes, get_value_method, set_test_method, set_value_method) \
-  {{{ SNMP_NODE_SCALAR_ARRAY, (oid) }, \
-    snmp_scalar_array_get_instance, \
-    snmp_scalar_array_get_next_instance }, \
-    (u16_t)LWIP_ARRAYSIZE(array_nodes), (array_nodes), (get_value_method), (set_test_method), (set_value_method) }
-
-#endif /* LWIP_SNMP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_SNMP_SCALAR_H */
diff --git a/sys/include/net/apps/snmp_table.h b/sys/include/net/apps/snmp_table.h
deleted file mode 100644
index 6930d0b..0000000
--- a/sys/include/net/apps/snmp_table.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * @file
- * SNMP server MIB API to implement table nodes
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Martin Hentschel <info@cl-soft.de>
- *
- */
-
-#ifndef LWIP_HDR_APPS_SNMP_TABLE_H
-#define LWIP_HDR_APPS_SNMP_TABLE_H
-
-#include "lwip/apps/snmp_opts.h"
-#include "lwip/apps/snmp_core.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
-
-/** default (customizable) read/write table */
-struct snmp_table_col_def
-{
-  u32_t index;
-  u8_t asn1_type;
-  snmp_access_t access;
-};
-
-/** table node */
-struct snmp_table_node
-{
-  /** inherited "base class" members */
-  struct snmp_leaf_node node;
-  u16_t column_count;
-  const struct snmp_table_col_def* columns;
-  snmp_err_t (*get_cell_instance)(const u32_t* column, const u32_t* row_oid, u8_t row_oid_len, struct snmp_node_instance* cell_instance);
-  snmp_err_t (*get_next_cell_instance)(const u32_t* column, struct snmp_obj_id* row_oid, struct snmp_node_instance* cell_instance);
-  /** returns object value for the given object identifier */
-  node_instance_get_value_method get_value;
-  /** tests length and/or range BEFORE setting */
-  node_instance_set_test_method set_test;
-  /** sets object value, only called when set_test() was successful */
-  node_instance_set_value_method set_value;
-};
-
-snmp_err_t snmp_table_get_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-snmp_err_t snmp_table_get_next_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-
-#define SNMP_TABLE_CREATE(oid, columns, get_cell_instance_method, get_next_cell_instance_method, get_value_method, set_test_method, set_value_method) \
-  {{{ SNMP_NODE_TABLE, (oid) }, \
-  snmp_table_get_instance, \
-  snmp_table_get_next_instance }, \
-  (u16_t)LWIP_ARRAYSIZE(columns), (columns), \
-  (get_cell_instance_method), (get_next_cell_instance_method), \
-  (get_value_method), (set_test_method), (set_value_method)}
-
-#define SNMP_TABLE_GET_COLUMN_FROM_OID(oid) ((oid)[1]) /* first array value is (fixed) row entry (fixed to 1) and 2nd value is column, follow3ed by instance */
-
-
-/** simple read-only table */
-typedef enum {
-  SNMP_VARIANT_VALUE_TYPE_U32,
-  SNMP_VARIANT_VALUE_TYPE_S32,
-  SNMP_VARIANT_VALUE_TYPE_PTR,
-  SNMP_VARIANT_VALUE_TYPE_CONST_PTR
-} snmp_table_column_data_type_t;
-
-struct snmp_table_simple_col_def
-{
-  u32_t index;
-  u8_t asn1_type;
-  snmp_table_column_data_type_t data_type; /* depending of what union member is used to store the value*/
-};
-
-/** simple read-only table node */
-struct snmp_table_simple_node
-{
-  /* inherited "base class" members */
-  struct snmp_leaf_node node;
-  u16_t column_count;
-  const struct snmp_table_simple_col_def* columns;
-  snmp_err_t (*get_cell_value)(const u32_t* column, const u32_t* row_oid, u8_t row_oid_len, union snmp_variant_value* value, u32_t* value_len);
-  snmp_err_t (*get_next_cell_instance_and_value)(const u32_t* column, struct snmp_obj_id* row_oid, union snmp_variant_value* value, u32_t* value_len);
-};
-
-snmp_err_t snmp_table_simple_get_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-snmp_err_t snmp_table_simple_get_next_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-
-#define SNMP_TABLE_CREATE_SIMPLE(oid, columns, get_cell_value_method, get_next_cell_instance_and_value_method) \
-  {{{ SNMP_NODE_TABLE, (oid) }, \
-  snmp_table_simple_get_instance, \
-  snmp_table_simple_get_next_instance }, \
-  (u16_t)LWIP_ARRAYSIZE(columns), (columns), (get_cell_value_method), (get_next_cell_instance_and_value_method) }
-
-s16_t snmp_table_extract_value_from_s32ref(struct snmp_node_instance* instance, void* value);
-s16_t snmp_table_extract_value_from_u32ref(struct snmp_node_instance* instance, void* value);
-s16_t snmp_table_extract_value_from_refconstptr(struct snmp_node_instance* instance, void* value);
-
-#endif /* LWIP_SNMP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_SNMP_TABLE_H */
diff --git a/sys/include/net/apps/snmp_threadsync.h b/sys/include/net/apps/snmp_threadsync.h
deleted file mode 100644
index 5eb3538..0000000
--- a/sys/include/net/apps/snmp_threadsync.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * @file
- * SNMP server MIB API to implement thread synchronization
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Dirk Ziegelmeier <dziegel@gmx.de>
- *
- */
-
-#ifndef LWIP_HDR_APPS_SNMP_THREADSYNC_H
-#define LWIP_HDR_APPS_SNMP_THREADSYNC_H
-
-#include "lwip/apps/snmp_opts.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_SNMP /* don't build if not configured for use in lwipopts.h */
-
-#include "lwip/apps/snmp_core.h"
-#include "lwip/sys.h"
-
-typedef void (*snmp_threadsync_called_fn)(void* arg);
-typedef void (*snmp_threadsync_synchronizer_fn)(snmp_threadsync_called_fn fn, void* arg);
-
-
-/** Thread sync runtime data. For internal usage only. */
-struct threadsync_data
-{
-  union {
-    snmp_err_t err;
-    s16_t s16;
-  } retval;
-  union {
-    const u32_t *root_oid;
-    void *value;
-  } arg1;
-  union {
-    u8_t root_oid_len;
-    u16_t len;
-  } arg2;
-  const struct snmp_threadsync_node *threadsync_node;
-  struct snmp_node_instance proxy_instance;
-};
-
-/** Thread sync instance. Needed EXCATLY once for every thread to be synced into. */
-struct snmp_threadsync_instance
-{
-  sys_sem_t                       sem;
-  sys_mutex_t                     sem_usage_mutex;
-  snmp_threadsync_synchronizer_fn sync_fn;
-  struct threadsync_data          data;
-};
-
-/** SNMP thread sync proxy leaf node */
-struct snmp_threadsync_node
-{
-  /* inherited "base class" members */
-  struct snmp_leaf_node           node;
-
-  const struct snmp_leaf_node     *target;
-  struct snmp_threadsync_instance *instance;
-};
-
-snmp_err_t snmp_threadsync_get_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-snmp_err_t snmp_threadsync_get_next_instance(const u32_t *root_oid, u8_t root_oid_len, struct snmp_node_instance* instance);
-
-/** Create thread sync proxy node */
-#define SNMP_CREATE_THREAD_SYNC_NODE(oid, target_leaf_node, threadsync_instance) \
-  {{{ SNMP_NODE_THREADSYNC, (oid) }, \
-    snmp_threadsync_get_instance, \
-    snmp_threadsync_get_next_instance }, \
-    (target_leaf_node), \
-    (threadsync_instance) }
-
-/** Create thread sync instance data */
-void snmp_threadsync_init(struct snmp_threadsync_instance *instance, snmp_threadsync_synchronizer_fn sync_fn);
-
-#endif /* LWIP_SNMP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_SNMP_THREADSYNC_H */
diff --git a/sys/include/net/apps/snmpv3.h b/sys/include/net/apps/snmpv3.h
deleted file mode 100644
index 99a7fd2..0000000
--- a/sys/include/net/apps/snmpv3.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @file
- * Additional SNMPv3 functionality RFC3414 and RFC3826.
- */
-
-/*
- * Copyright (c) 2016 Elias Oenal.
- * 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 ``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 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.
- *
- * Author: Elias Oenal <lwip@eliasoenal.com>
- */
-
-#ifndef LWIP_HDR_APPS_SNMP_V3_H
-#define LWIP_HDR_APPS_SNMP_V3_H
-
-#include "lwip/apps/snmp_opts.h"
-#include "lwip/err.h"
-
-#if LWIP_SNMP && LWIP_SNMP_V3
-
-#define SNMP_V3_AUTH_ALGO_INVAL  0
-#define SNMP_V3_AUTH_ALGO_MD5    1
-#define SNMP_V3_AUTH_ALGO_SHA    2
-
-#define SNMP_V3_PRIV_ALGO_INVAL  0
-#define SNMP_V3_PRIV_ALGO_DES    1
-#define SNMP_V3_PRIV_ALGO_AES    2
-
-#define SNMP_V3_PRIV_MODE_DECRYPT  0
-#define SNMP_V3_PRIV_MODE_ENCRYPT  1
-
-/*
- * The following callback functions must be implemented by the application.
- * There is a dummy implementation in snmpv3_dummy.c.
- */
-
-void snmpv3_get_engine_id(const char **id, u8_t *len);
-err_t snmpv3_set_engine_id(const char* id, u8_t len);
-
-u32_t snmpv3_get_engine_boots(void);
-void snmpv3_set_engine_boots(u32_t boots);
-
-u32_t snmpv3_get_engine_time(void);
-void snmpv3_reset_engine_time(void);
-
-err_t snmpv3_get_user(const char* username, u8_t *auth_algo, u8_t *auth_key, u8_t *priv_algo, u8_t *priv_key);
-
-/* The following functions are provided by the SNMPv3 agent */
-
-void snmpv3_engine_id_changed(void);
-
-void snmpv3_password_to_key_md5(
-    const u8_t *password,     /* IN */
-    u8_t        passwordlen,  /* IN */
-    const u8_t *engineID,     /* IN  - pointer to snmpEngineID  */
-    u8_t        engineLength, /* IN  - length of snmpEngineID */
-    u8_t       *key);         /* OUT - pointer to caller 16-octet buffer */
-
-void snmpv3_password_to_key_sha(
-    const u8_t *password,     /* IN */
-    u8_t        passwordlen,  /* IN */
-    const u8_t *engineID,     /* IN  - pointer to snmpEngineID  */
-    u8_t        engineLength, /* IN  - length of snmpEngineID */
-    u8_t       *key);         /* OUT - pointer to caller 20-octet buffer */
-
-#endif
-
-#endif /* LWIP_HDR_APPS_SNMP_V3_H */
diff --git a/sys/include/net/apps/sntp.h b/sys/include/net/apps/sntp.h
deleted file mode 100644
index 3910917..0000000
--- a/sys/include/net/apps/sntp.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * @file
- * SNTP client API
- */
-
-/*
- * Copyright (c) 2007-2009 Frédéric Bernon, Simon Goldschmidt
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Frédéric Bernon, Simon Goldschmidt
- *
- */
-#ifndef LWIP_HDR_APPS_SNTP_H
-#define LWIP_HDR_APPS_SNTP_H
-
-#include "lwip/apps/sntp_opts.h"
-#include "lwip/ip_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* SNTP operating modes: default is to poll using unicast.
-   The mode has to be set before calling sntp_init(). */
-#define SNTP_OPMODE_POLL            0
-#define SNTP_OPMODE_LISTENONLY      1
-void sntp_setoperatingmode(u8_t operating_mode);
-u8_t sntp_getoperatingmode(void);
-
-void sntp_init(void);
-void sntp_stop(void);
-u8_t sntp_enabled(void);
-
-void sntp_setserver(u8_t idx, const ip_addr_t *addr);
-const ip_addr_t* sntp_getserver(u8_t idx);
-
-#if SNTP_SERVER_DNS
-void sntp_setservername(u8_t idx, char *server);
-char *sntp_getservername(u8_t idx);
-#endif /* SNTP_SERVER_DNS */
-
-#if SNTP_GET_SERVERS_FROM_DHCP
-void sntp_servermode_dhcp(int set_servers_from_dhcp);
-#else /* SNTP_GET_SERVERS_FROM_DHCP */
-#define sntp_servermode_dhcp(x)
-#endif /* SNTP_GET_SERVERS_FROM_DHCP */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_SNTP_H */
diff --git a/sys/include/net/apps/sntp_opts.h b/sys/include/net/apps/sntp_opts.h
deleted file mode 100644
index c28b864..0000000
--- a/sys/include/net/apps/sntp_opts.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * @file
- * SNTP client options list
- */
-
-/*
- * Copyright (c) 2007-2009 Frédéric Bernon, Simon Goldschmidt
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Frédéric Bernon, Simon Goldschmidt
- *
- */
-#ifndef LWIP_HDR_APPS_SNTP_OPTS_H
-#define LWIP_HDR_APPS_SNTP_OPTS_H
-
-#include "lwip/opt.h"
-
-/**
- * @defgroup sntp_opts Options
- * @ingroup sntp
- * @{
- */
-
-/** SNTP macro to change system time in seconds
- * Define SNTP_SET_SYSTEM_TIME_US(sec, us) to set the time in microseconds instead of this one
- * if you need the additional precision.
- */
-#if !defined SNTP_SET_SYSTEM_TIME || defined __DOXYGEN__
-#define SNTP_SET_SYSTEM_TIME(sec)   LWIP_UNUSED_ARG(sec)
-#endif
-
-/** The maximum number of SNTP servers that can be set */
-#if !defined SNTP_MAX_SERVERS || defined __DOXYGEN__
-#define SNTP_MAX_SERVERS           LWIP_DHCP_MAX_NTP_SERVERS
-#endif
-
-/** Set this to 1 to implement the callback function called by dhcp when
- * NTP servers are received. */
-#if !defined SNTP_GET_SERVERS_FROM_DHCP || defined __DOXYGEN__
-#define SNTP_GET_SERVERS_FROM_DHCP LWIP_DHCP_GET_NTP_SRV
-#endif
-
-/** Set this to 1 to support DNS names (or IP address strings) to set sntp servers
- * One server address/name can be defined as default if SNTP_SERVER_DNS == 1:
- * \#define SNTP_SERVER_ADDRESS "pool.ntp.org"
- */
-#if !defined SNTP_SERVER_DNS || defined __DOXYGEN__
-#define SNTP_SERVER_DNS            0
-#endif
-
-/**
- * SNTP_DEBUG: Enable debugging for SNTP.
- */
-#if !defined SNTP_DEBUG || defined __DOXYGEN__
-#define SNTP_DEBUG                  LWIP_DBG_OFF
-#endif
-
-/** SNTP server port */
-#if !defined SNTP_PORT || defined __DOXYGEN__
-#define SNTP_PORT                   123
-#endif
-
-/** Set this to 1 to allow config of SNTP server(s) by DNS name */
-#if !defined SNTP_SERVER_DNS || defined __DOXYGEN__
-#define SNTP_SERVER_DNS             0
-#endif
-
-/** Sanity check:
- * Define this to
- * - 0 to turn off sanity checks (default; smaller code)
- * - >= 1 to check address and port of the response packet to ensure the
- *        response comes from the server we sent the request to.
- * - >= 2 to check returned Originate Timestamp against Transmit Timestamp
- *        sent to the server (to ensure response to older request).
- * - >= 3 @todo: discard reply if any of the LI, Stratum, or Transmit Timestamp
- *        fields is 0 or the Mode field is not 4 (unicast) or 5 (broadcast).
- * - >= 4 @todo: to check that the Root Delay and Root Dispersion fields are each
- *        greater than or equal to 0 and less than infinity, where infinity is
- *        currently a cozy number like one second. This check avoids using a
- *        server whose synchronization source has expired for a very long time.
- */
-#if !defined SNTP_CHECK_RESPONSE || defined __DOXYGEN__
-#define SNTP_CHECK_RESPONSE         0
-#endif
-
-/** According to the RFC, this shall be a random delay
- * between 1 and 5 minutes (in milliseconds) to prevent load peaks.
- * This can be defined to a random generation function,
- * which must return the delay in milliseconds as u32_t.
- * Turned off by default.
- */
-#if !defined SNTP_STARTUP_DELAY || defined __DOXYGEN__
-#define SNTP_STARTUP_DELAY          0
-#endif
-
-/** If you want the startup delay to be a function, define this
- * to a function (including the brackets) and define SNTP_STARTUP_DELAY to 1.
- */
-#if !defined SNTP_STARTUP_DELAY_FUNC || defined __DOXYGEN__
-#define SNTP_STARTUP_DELAY_FUNC     SNTP_STARTUP_DELAY
-#endif
-
-/** SNTP receive timeout - in milliseconds
- * Also used as retry timeout - this shouldn't be too low.
- * Default is 3 seconds.
- */
-#if !defined SNTP_RECV_TIMEOUT || defined __DOXYGEN__
-#define SNTP_RECV_TIMEOUT           3000
-#endif
-
-/** SNTP update delay - in milliseconds
- * Default is 1 hour. Must not be beolw 15 seconds by specification (i.e. 15000)
- */
-#if !defined SNTP_UPDATE_DELAY || defined __DOXYGEN__
-#define SNTP_UPDATE_DELAY           3600000
-#endif
-
-/** SNTP macro to get system time, used with SNTP_CHECK_RESPONSE >= 2
- * to send in request and compare in response.
- */
-#if !defined SNTP_GET_SYSTEM_TIME || defined __DOXYGEN__
-#define SNTP_GET_SYSTEM_TIME(sec, us)     do { (sec) = 0; (us) = 0; } while(0)
-#endif
-
-/** Default retry timeout (in milliseconds) if the response
- * received is invalid.
- * This is doubled with each retry until SNTP_RETRY_TIMEOUT_MAX is reached.
- */
-#if !defined SNTP_RETRY_TIMEOUT || defined __DOXYGEN__
-#define SNTP_RETRY_TIMEOUT          SNTP_RECV_TIMEOUT
-#endif
-
-/** Maximum retry timeout (in milliseconds). */
-#if !defined SNTP_RETRY_TIMEOUT_MAX || defined __DOXYGEN__
-#define SNTP_RETRY_TIMEOUT_MAX      (SNTP_RETRY_TIMEOUT * 10)
-#endif
-
-/** Increase retry timeout with every retry sent
- * Default is on to conform to RFC.
- */
-#if !defined SNTP_RETRY_TIMEOUT_EXP || defined __DOXYGEN__
-#define SNTP_RETRY_TIMEOUT_EXP      1
-#endif
-
-/**
- * @}
- */
-
-#endif /* LWIP_HDR_APPS_SNTP_OPTS_H */
diff --git a/sys/include/net/apps/tftp_opts.h b/sys/include/net/apps/tftp_opts.h
deleted file mode 100644
index bf115dc..0000000
--- a/sys/include/net/apps/tftp_opts.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************//**
- *
- * @file tftp_opts.h
- *
- * @author   Logan Gunthorpe <logang@deltatee.com>
- *
- * @brief    Trivial File Transfer Protocol (RFC 1350) implementation options
- *
- * Copyright (c) Deltatee Enterprises Ltd. 2013
- * 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 ``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 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.
- *
- * Author: Logan Gunthorpe <logang@deltatee.com>
- *
- */
-
-#ifndef LWIP_HDR_APPS_TFTP_OPTS_H
-#define LWIP_HDR_APPS_TFTP_OPTS_H
-
-#include "lwip/opt.h"
-
-/**
- * @defgroup tftp_opts Options
- * @ingroup tftp
- * @{
- */
-
-/**
- * Enable TFTP debug messages
- */
-#if !defined TFTP_DEBUG || defined __DOXYGEN__
-#define TFTP_DEBUG            LWIP_DBG_ON
-#endif
-
-/**
- * TFTP server port
- */
-#if !defined TFTP_PORT || defined __DOXYGEN__
-#define TFTP_PORT             69
-#endif
-
-/**
- * TFTP timeout
- */
-#if !defined TFTP_TIMEOUT_MSECS || defined __DOXYGEN__
-#define TFTP_TIMEOUT_MSECS    10000
-#endif
-
-/**
- * Max. number of retries when a file is read from server
- */
-#if !defined TFTP_MAX_RETRIES || defined __DOXYGEN__
-#define TFTP_MAX_RETRIES      5
-#endif
-
-/**
- * TFTP timer cyclic interval
- */
-#if !defined TFTP_TIMER_MSECS || defined __DOXYGEN__
-#define TFTP_TIMER_MSECS      50
-#endif
-
-/**
- * Max. length of TFTP filename
- */
-#if !defined TFTP_MAX_FILENAME_LEN || defined __DOXYGEN__
-#define TFTP_MAX_FILENAME_LEN 20
-#endif
-
-/**
- * Max. length of TFTP mode
- */
-#if !defined TFTP_MAX_MODE_LEN || defined __DOXYGEN__
-#define TFTP_MAX_MODE_LEN     7
-#endif
-
-/**
- * @}
- */
-
-#endif /* LWIP_HDR_APPS_TFTP_OPTS_H */
diff --git a/sys/include/net/apps/tftp_server.h b/sys/include/net/apps/tftp_server.h
deleted file mode 100644
index 1ad91dc..0000000
--- a/sys/include/net/apps/tftp_server.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************//**
- *
- * @file tftp_server.h
- *
- * @author   Logan Gunthorpe <logang@deltatee.com>
- *
- * @brief    Trivial File Transfer Protocol (RFC 1350)
- *
- * Copyright (c) Deltatee Enterprises Ltd. 2013
- * 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 ``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 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.
- *
- * Author: Logan Gunthorpe <logang@deltatee.com>
- *
- */
-
-#ifndef LWIP_HDR_APPS_TFTP_SERVER_H
-#define LWIP_HDR_APPS_TFTP_SERVER_H
-
-#include "lwip/apps/tftp_opts.h"
-#include "lwip/err.h"
-#include "lwip/pbuf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @ingroup tftp
- * TFTP context containing callback functions for TFTP transfers
- */
-struct tftp_context {
-  /**
-   * Open file for read/write.
-   * @param fname Filename
-   * @param mode Mode string from TFTP RFC 1350 (netascii, octet, mail)
-   * @param write Flag indicating read (0) or write (!= 0) access
-   * @returns File handle supplied to other functions
-   */
-  void* (*open)(const char* fname, const char* mode, u8_t write);
-  /**
-   * Close file handle
-   * @param handle File handle returned by open()
-   */
-  void (*close)(void* handle);
-  /**
-   * Read from file 
-   * @param handle File handle returned by open()
-   * @param buf Target buffer to copy read data to
-   * @param bytes Number of bytes to copy to buf
-   * @returns &gt;= 0: Success; &lt; 0: Error
-   */
-  int (*read)(void* handle, void* buf, int bytes);
-  /**
-   * Write to file
-   * @param handle File handle returned by open()
-   * @param pbuf PBUF adjusted such that payload pointer points
-   *             to the beginning of write data. In other words,
-   *             TFTP headers are stripped off.
-   * @returns &gt;= 0: Success; &lt; 0: Error
-   */
-  int (*write)(void* handle, struct pbuf* p);
-};
-
-err_t tftp_init(const struct tftp_context* ctx);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_APPS_TFTP_SERVER_H */
diff --git a/sys/include/net/arch.h b/sys/include/net/arch.h
deleted file mode 100644
index da0a1d8..0000000
--- a/sys/include/net/arch.h
+++ /dev/null
@@ -1,326 +0,0 @@
-/**
- * @file
- * Support for different processor and compiler architectures
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_ARCH_H
-#define LWIP_HDR_ARCH_H
-
-#ifndef LITTLE_ENDIAN
-#define LITTLE_ENDIAN 1234
-#endif
-
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN 4321
-#endif
-
-#include <sys/types.h>
-#include <net/arch/cc.h>
-#include <lib/kprintf.h>
-#include <ubixos/kpanic.h>
-
-/**
- * @defgroup compiler_abstraction Compiler/platform abstraction
- * @ingroup sys_layer
- * All defines related to this section must not be placed in lwipopts.h,
- * but in arch/cc.h!
- * These options cannot be \#defined in lwipopts.h since they are not options
- * of lwIP itself, but options of the lwIP port to your system.
- * @{
- */
-
-/** Define the byte order of the system.
- * Needed for conversion of network data to host byte order.
- * Allowed values: LITTLE_ENDIAN and BIG_ENDIAN
- */
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-
-/** Define random number generator function of your system */
-#ifdef __DOXYGEN__
-#define LWIP_RAND() ((u32_t)rand())
-#endif
-
-/** Platform specific diagnostic output.\n
- * Note the default implementation pulls in printf, which may
- * in turn pull in a lot of standard libary code. In resource-constrained 
- * systems, this should be defined to something less resource-consuming.
- */
-#ifndef LWIP_PLATFORM_DIAG
-#define LWIP_PLATFORM_DIAG(x) do {kprintf x;} while(0)
-#endif
-
-/** Platform specific assertion handling.\n
- * Note the default implementation pulls in printf, fflush and abort, which may
- * in turn pull in a lot of standard libary code. In resource-constrained 
- * systems, this should be defined to something less resource-consuming.
- */
-#ifndef LWIP_PLATFORM_ASSERT
-#define LWIP_PLATFORM_ASSERT(x) do {kprintf("Assertion \"%s\" failed at line %d in %s\n", x, __LINE__, __FILE__); kpanic("asserted");} while(0)
-#endif
-
-/** Define this to 1 in arch/cc.h of your port if you do not want to
- * include stddef.h header to get size_t. You need to typedef size_t
- * by yourself in this case.
- */
-#ifndef LWIP_NO_STDDEF_H
-#define LWIP_NO_STDDEF_H 0
-#endif
-
-#if !LWIP_NO_STDDEF_H
-/* for size_t */
-/* MrOlsen 2017-12-17
-#include <stddef.h>
-*/
-#endif
-
-/** Define this to 1 in arch/cc.h of your port if your compiler does not provide
- * the stdint.h header. You need to typedef the generic types listed in
- * lwip/arch.h yourself in this case (u8_t, u16_t...).
- */
-#ifndef LWIP_NO_STDINT_H
-#define LWIP_NO_STDINT_H 0
-#endif
-
-/* Define generic types used in lwIP */
-#if !LWIP_NO_STDINT_H
-/* MrOlsen 2017-12-17
-#include <stdint.h>
-*/
-typedef uint8_t   u8_t;
-typedef int8_t    s8_t;
-typedef uint16_t  u16_t;
-typedef int16_t   s16_t;
-typedef uint32_t  u32_t;
-typedef int32_t   s32_t;
-typedef uintptr_t mem_ptr_t;
-#endif
-
-/** Define this to 1 in arch/cc.h of your port if your compiler does not provide
- * the inttypes.h header. You need to define the format strings listed in
- * lwip/arch.h yourself in this case (X8_F, U16_F...).
- */
-#ifndef LWIP_NO_INTTYPES_H
-#define LWIP_NO_INTTYPES_H 0
-#endif
-
-/* Define (sn)printf formatters for these lwIP types */
-#if !LWIP_NO_INTTYPES_H
-/* MrOlsen
-#include <inttypes.h>
-*/
-#ifndef X8_F
-#define X8_F  "02" PRIx8
-#endif
-#ifndef U16_F
-#define U16_F PRIu16
-#endif
-#ifndef S16_F
-#define S16_F PRId16
-#endif
-#ifndef X16_F
-#define X16_F PRIx16
-#endif
-#ifndef U32_F
-#define U32_F PRIu32
-#endif
-#ifndef S32_F
-#define S32_F PRId32
-#endif
-#ifndef X32_F
-#define X32_F PRIx32
-#endif
-#ifndef SZT_F
-#define SZT_F PRIuPTR
-#endif
-#endif
-
-/** Define this to 1 in arch/cc.h of your port if your compiler does not provide
- * the limits.h header. You need to define the type limits yourself in this case
- * (e.g. INT_MAX).
- */
-#ifndef LWIP_NO_LIMITS_H
-#define LWIP_NO_LIMITS_H 0
-#endif
-
-/* Include limits.h? */
-#if !LWIP_NO_LIMITS_H
-/*
-#include <limits.h>
-*/
-#endif
-
-/** C++ const_cast<target_type>(val) equivalent to remove constness from a value (GCC -Wcast-qual) */
-#ifndef LWIP_CONST_CAST
-#define LWIP_CONST_CAST(target_type, val) ((target_type)((ptrdiff_t)val))
-#endif
-
-/** Get rid of alignment cast warnings (GCC -Wcast-align) */
-#ifndef LWIP_ALIGNMENT_CAST
-#define LWIP_ALIGNMENT_CAST(target_type, val) LWIP_CONST_CAST(target_type, val)
-#endif
-
-/** Get rid of warnings related to pointer-to-numeric and vice-versa casts,
- * e.g. "conversion from 'u8_t' to 'void *' of greater size"
- */
-#ifndef LWIP_PTR_NUMERIC_CAST
-#define LWIP_PTR_NUMERIC_CAST(target_type, val) LWIP_CONST_CAST(target_type, val)
-#endif
-
-/** Allocates a memory buffer of specified size that is of sufficient size to align
- * its start address using LWIP_MEM_ALIGN.
- * You can declare your own version here e.g. to enforce alignment without adding
- * trailing padding bytes (see LWIP_MEM_ALIGN_BUFFER) or your own section placement
- * requirements.\n
- * e.g. if you use gcc and need 32 bit alignment:\n
- * \#define LWIP_DECLARE_MEMORY_ALIGNED(variable_name, size) u8_t variable_name[size] \_\_attribute\_\_((aligned(4)))\n
- * or more portable:\n
- * \#define LWIP_DECLARE_MEMORY_ALIGNED(variable_name, size) u32_t variable_name[(size + sizeof(u32_t) - 1) / sizeof(u32_t)]
- */
-#ifndef LWIP_DECLARE_MEMORY_ALIGNED
-#define LWIP_DECLARE_MEMORY_ALIGNED(variable_name, size) u8_t variable_name[LWIP_MEM_ALIGN_BUFFER(size)]
-#endif
-
-/** Calculate memory size for an aligned buffer - returns the next highest
- * multiple of MEM_ALIGNMENT (e.g. LWIP_MEM_ALIGN_SIZE(3) and
- * LWIP_MEM_ALIGN_SIZE(4) will both yield 4 for MEM_ALIGNMENT == 4).
- */
-#ifndef LWIP_MEM_ALIGN_SIZE
-#define LWIP_MEM_ALIGN_SIZE(size) (((size) + MEM_ALIGNMENT - 1U) & ~(MEM_ALIGNMENT-1U))
-#endif
-
-/** Calculate safe memory size for an aligned buffer when using an unaligned
- * type as storage. This includes a safety-margin on (MEM_ALIGNMENT - 1) at the
- * start (e.g. if buffer is u8_t[] and actual data will be u32_t*)
- */
-#ifndef LWIP_MEM_ALIGN_BUFFER
-#define LWIP_MEM_ALIGN_BUFFER(size) (((size) + MEM_ALIGNMENT - 1U))
-#endif
-
-/** Align a memory pointer to the alignment defined by MEM_ALIGNMENT
- * so that ADDR % MEM_ALIGNMENT == 0
- */
-#ifndef LWIP_MEM_ALIGN
-#define LWIP_MEM_ALIGN(addr) ((void *)(((mem_ptr_t)(addr) + MEM_ALIGNMENT - 1) & ~(mem_ptr_t)(MEM_ALIGNMENT-1)))
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Packed structs support.
-  * Placed BEFORE declaration of a packed struct.\n
-  * For examples of packed struct declarations, see include/lwip/prot/ subfolder.\n
-  * A port to GCC/clang is included in lwIP, if you use these compilers there is nothing to do here.
-  */
-#ifndef PACK_STRUCT_BEGIN
-#define PACK_STRUCT_BEGIN
-#endif /* PACK_STRUCT_BEGIN */
-
-/** Packed structs support.
-  * Placed AFTER declaration of a packed struct.\n
-  * For examples of packed struct declarations, see include/lwip/prot/ subfolder.\n
-  * A port to GCC/clang is included in lwIP, if you use these compilers there is nothing to do here.
-  */
-#ifndef PACK_STRUCT_END
-#define PACK_STRUCT_END
-#endif /* PACK_STRUCT_END */
-
-/** Packed structs support.
-  * Placed between end of declaration of a packed struct and trailing semicolon.\n
-  * For examples of packed struct declarations, see include/lwip/prot/ subfolder.\n
-  * A port to GCC/clang is included in lwIP, if you use these compilers there is nothing to do here.
-  */
-#ifndef PACK_STRUCT_STRUCT
-#if defined(__GNUC__) || defined(__clang__)
-#define PACK_STRUCT_STRUCT __attribute__((packed))
-#else
-#define PACK_STRUCT_STRUCT
-#endif
-#endif /* PACK_STRUCT_STRUCT */
-
-/** Packed structs support.
-  * Wraps u32_t and u16_t members.\n
-  * For examples of packed struct declarations, see include/lwip/prot/ subfolder.\n
-  * A port to GCC/clang is included in lwIP, if you use these compilers there is nothing to do here.
-  */
-#ifndef PACK_STRUCT_FIELD
-#define PACK_STRUCT_FIELD(x) x
-#endif /* PACK_STRUCT_FIELD */
-
-/** Packed structs support.
-  * Wraps u8_t members, where some compilers warn that packing is not necessary.\n
-  * For examples of packed struct declarations, see include/lwip/prot/ subfolder.\n
-  * A port to GCC/clang is included in lwIP, if you use these compilers there is nothing to do here.
-  */
-#ifndef PACK_STRUCT_FLD_8
-#define PACK_STRUCT_FLD_8(x) PACK_STRUCT_FIELD(x)
-#endif /* PACK_STRUCT_FLD_8 */
-
-/** Packed structs support.
-  * Wraps members that are packed structs themselves, where some compilers warn that packing is not necessary.\n
-  * For examples of packed struct declarations, see include/lwip/prot/ subfolder.\n
-  * A port to GCC/clang is included in lwIP, if you use these compilers there is nothing to do here.
-  */
-#ifndef PACK_STRUCT_FLD_S
-#define PACK_STRUCT_FLD_S(x) PACK_STRUCT_FIELD(x)
-#endif /* PACK_STRUCT_FLD_S */
-
-/** Packed structs support using \#include files before and after struct to be packed.\n
- * The file included BEFORE the struct is "arch/bpstruct.h".\n
- * The file included AFTER the struct is "arch/epstruct.h".\n
- * This can be used to implement struct packing on MS Visual C compilers, see
- * the Win32 port in the lwIP contrib repository for reference.
- * For examples of packed struct declarations, see include/lwip/prot/ subfolder.\n
- * A port to GCC/clang is included in lwIP, if you use these compilers there is nothing to do here.
- */
-#ifdef __DOXYGEN__
-#define PACK_STRUCT_USE_INCLUDES
-#endif
-
-/** Eliminates compiler warning about unused arguments (GCC -Wextra -Wunused). */
-#ifndef LWIP_UNUSED_ARG
-#define LWIP_UNUSED_ARG(x) (void)x
-#endif /* LWIP_UNUSED_ARG */
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_ARCH_H */
diff --git a/sys/include/net/arch/cc.h b/sys/include/net/arch/cc.h
deleted file mode 100644
index 01dfe86..0000000
--- a/sys/include/net/arch/cc.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ARCH_CC_H__
-#define __ARCH_CC_H__
-
-#include <ubixos/time.h>
-
-#define PACK_STRUCT_FIELD(x) x __attribute__((packed))
-#define PACK_STRUCT_STRUCT __attribute__((packed))
-#define PACK_STRUCT_BEGIN
-#define PACK_STRUCT_END
-
-#ifdef LWIP_ERR_T
-typedef uint8_t err_t;
-#endif
-
-#endif
diff --git a/sys/include/net/arch/cpu.h b/sys/include/net/arch/cpu.h
deleted file mode 100644
index aba02eb..0000000
--- a/sys/include/net/arch/cpu.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __ARCH_CPU_H__
-#define __ARCH_CPU_H__
-
-#ifndef BYTE_ORDER
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif /* BYTE_ORDER */
-
-#endif
diff --git a/sys/include/net/arch/init.h b/sys/include/net/arch/init.h
deleted file mode 100644
index 3967942..0000000
--- a/sys/include/net/arch/init.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ARCH_INIT_H__
-#define __ARCH_INIT_H__
-
-#define TCPIP_INIT_DONE(arg) sys_sem_signal(*(sys_sem_t *)arg)
-
-#endif
diff --git a/sys/include/net/arch/lib.h b/sys/include/net/arch/lib.h
deleted file mode 100644
index 3f2385f..0000000
--- a/sys/include/net/arch/lib.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __ARCH_LIB_H__
-#define __ARCH_LIB_H__
-
-#ifndef _STRING_H_
-#ifndef _STRING_H
-int strlen(const char *str);
-int strncmp(const char *str1, const char *str2, int len);
-void bcopy(const void *src, void *dest, int len);
-void bzero(void *data, int n);
-#endif /* _STRING_H */
-#endif /* _STRING_H_ */
-
-#endif
diff --git a/sys/include/net/arch/perf.h b/sys/include/net/arch/perf.h
deleted file mode 100644
index ab8135a..0000000
--- a/sys/include/net/arch/perf.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef __ARCH_PERF_H__
-#define __ARCH_PERF_H__
-
-#include <ubixos/times.h>
-
-#ifdef PERF
-#define PERF_START  { \
-                         unsigned long __c1l, __c1h, __c2l, __c2h; \
-                         __asm__(".byte 0x0f, 0x31" : "=a" (__c1l), "=d" (__c1h))
-#define PERF_STOP(x)   __asm__(".byte 0x0f, 0x31" : "=a" (__c2l), "=d" (__c2h)); \
-                       perf_print(__c1l, __c1h, __c2l, __c2h, x);}
-
-/*#define PERF_START do { \
-                     struct tms __perf_start, __perf_end; \
-                     times(&__perf_start)
-#define PERF_STOP(x) times(&__perf_end); \
-                     perf_print_times(&__perf_start, &__perf_end, x);\
-                     } while(0)*/
-#else /* PERF */
-#define PERF_START    /* null definition */
-#define PERF_STOP(x)  /* null definition */
-#endif /* PERF */
-
-void perf_print(unsigned long c1l, unsigned long c1h,
-		unsigned long c2l, unsigned long c2h,
-		char *key);
-
-void perf_print_times(struct tms *start, struct tms *end, char *key);
-
-void perf_init(char *fname);
-
-#endif
diff --git a/sys/include/net/arch/sys_arch.h b/sys/include/net/arch/sys_arch.h
deleted file mode 100644
index 439894a..0000000
--- a/sys/include/net/arch/sys_arch.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __ARCH_SYS_ARCH_H__
-#define __ARCH_SYS_ARCH_H__
-
-#include <ubixos/ubthread.h>
-
-#define SYS_MBOX_NULL NULL
-#define SYS_SEM_NULL  NULL
-#define SYS_MBOX_SIZE 100
-
-/* Structs */
-struct sys_timeouts {
-  struct sys_timeout *next;
-};
-
-struct sys_sem {
-  uint32_t   signaled;
-  ubthread_cond_t cond;
-  ubthread_mutex_t mutex;
-};
-
-typedef struct sys_sem sys_sem_t;
-
-struct sys_mutex {
-  ubthread_mutex_t mutex;
-};
-
-typedef struct sys_mutex sys_mutex_t;
-
-struct sys_mbox {
-  uint32_t head;
-  uint32_t tail;
-
-  //MrOlsen (2017-12-28) - This will break because size is passable
-  void *msgs[SYS_MBOX_SIZE];
-
-  //struct ubthread_mutex *lock;
-
-  struct sys_sem *empty;
-  struct sys_sem *full;
-  struct sys_sem *lock;
-
-  int wait_send;
-
-  //void **queue;
-  //uint32_t size;
-};
-
-typedef struct sys_mbox sys_mbox_t;
-
-struct sys_thread {
-  struct sys_thread *next;
-  struct sys_timeouts timeouts;
-  kTask_t *ubthread;
-  char name[128];
-};
-
-typedef struct sys_thread * sys_thread_t;
-
-
-#endif
diff --git a/sys/include/net/autoip.h b/sys/include/net/autoip.h
deleted file mode 100644
index 7899e40..0000000
--- a/sys/include/net/autoip.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @file
- *
- * AutoIP Automatic LinkLocal IP Configuration
- */
-
-/*
- *
- * Copyright (c) 2007 Dominik Spies <kontakt@dspies.de>
- * 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 ``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 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.
- *
- * Author: Dominik Spies <kontakt@dspies.de>
- *
- * This is a AutoIP implementation for the lwIP TCP/IP stack. It aims to conform
- * with RFC 3927.
- *
- */
-
-#ifndef LWIP_HDR_AUTOIP_H
-#define LWIP_HDR_AUTOIP_H
-
-#include "net/opt.h"
-
-#if LWIP_IPV4 && LWIP_AUTOIP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/netif.h"
-/* #include "net/udp.h" */
-#include "net/etharp.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** AutoIP Timing */
-#define AUTOIP_TMR_INTERVAL      100
-#define AUTOIP_TICKS_PER_SECOND (1000 / AUTOIP_TMR_INTERVAL)
-
-/** AutoIP state information per netif */
-struct autoip
-{
-  /** the currently selected, probed, announced or used LL IP-Address */
-  ip4_addr_t llipaddr;
-  /** current AutoIP state machine state */
-  u8_t state;
-  /** sent number of probes or announces, dependent on state */
-  u8_t sent_num;
-  /** ticks to wait, tick is AUTOIP_TMR_INTERVAL long */
-  u16_t ttw;
-  /** ticks until a conflict can be solved by defending */
-  u8_t lastconflict;
-  /** total number of probed/used Link Local IP-Addresses */
-  u8_t tried_llipaddr;
-};
-
-
-void autoip_set_struct(struct netif *netif, struct autoip *autoip);
-/** Remove a struct autoip previously set to the netif using autoip_set_struct() */
-#define autoip_remove_struct(netif) do { (netif)->autoip = NULL; } while (0)
-err_t autoip_start(struct netif *netif);
-err_t autoip_stop(struct netif *netif);
-void autoip_arp_reply(struct netif *netif, struct etharp_hdr *hdr);
-void autoip_tmr(void);
-void autoip_network_changed(struct netif *netif);
-u8_t autoip_supplied_address(const struct netif *netif);
-
-/* for lwIP internal use by ip4.c */
-u8_t autoip_accept_packet(struct netif *netif, const ip4_addr_t *addr);
-
-#define netif_autoip_data(netif) ((struct autoip*)netif_get_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_AUTOIP))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV4 && LWIP_AUTOIP */
-
-#endif /* LWIP_HDR_AUTOIP_H */
diff --git a/sys/include/net/debug.h b/sys/include/net/debug.h
deleted file mode 100644
index 2244253..0000000
--- a/sys/include/net/debug.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * @file
- * Debug messages infrastructure
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_DEBUG_H
-#define LWIP_HDR_DEBUG_H
-
-#include <net/arch.h>
-#include <net/opt.h>
-
-/**
- * @defgroup debugging_levels LWIP_DBG_MIN_LEVEL and LWIP_DBG_TYPES_ON values
- * @ingroup lwip_opts_debugmsg
- * @{
- */
-
-/** @name Debug level (LWIP_DBG_MIN_LEVEL)
- * @{
- */
-/** Debug level: ALL messages*/
-#define LWIP_DBG_LEVEL_ALL     0x00
-/** Debug level: Warnings. bad checksums, dropped packets, ... */
-#define LWIP_DBG_LEVEL_WARNING 0x01
-/** Debug level: Serious. memory allocation failures, ... */
-#define LWIP_DBG_LEVEL_SERIOUS 0x02
-/** Debug level: Severe */
-#define LWIP_DBG_LEVEL_SEVERE  0x03
-/**
- * @}
- */
-
-#define LWIP_DBG_MASK_LEVEL    0x03
-/* compatibility define only */
-#define LWIP_DBG_LEVEL_OFF     LWIP_DBG_LEVEL_ALL
-
-/** @name Enable/disable debug messages completely (LWIP_DBG_TYPES_ON)
- * @{
- */
-/** flag for LWIP_DEBUGF to enable that debug message */
-#define LWIP_DBG_ON            0x80U
-/** flag for LWIP_DEBUGF to disable that debug message */
-#define LWIP_DBG_OFF           0x00U
-/**
- * @}
- */
-
-/** @name Debug message types (LWIP_DBG_TYPES_ON)
- * @{
- */
-/** flag for LWIP_DEBUGF indicating a tracing message (to follow program flow) */
-#define LWIP_DBG_TRACE         0x40U
-/** flag for LWIP_DEBUGF indicating a state debug message (to follow module states) */
-#define LWIP_DBG_STATE         0x20U
-/** flag for LWIP_DEBUGF indicating newly added code, not thoroughly tested yet */
-#define LWIP_DBG_FRESH         0x10U
-/** flag for LWIP_DEBUGF to halt after printing this debug message */
-#define LWIP_DBG_HALT          0x08U
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/**
- * @defgroup lwip_assertions Assertion handling
- * @ingroup lwip_opts_debug
- * @{
- */
-/**
- * LWIP_NOASSERT: Disable LWIP_ASSERT checks:
- * To disable assertions define LWIP_NOASSERT in arch/cc.h.
- */
-#ifdef __DOXYGEN__
-#define LWIP_NOASSERT
-#undef LWIP_NOASSERT
-#endif
-/**
- * @}
- */
-
-#ifndef LWIP_NOASSERT
-#define LWIP_ASSERT(message, assertion) do { if (!(assertion)) { \
-  LWIP_PLATFORM_ASSERT(message); }} while(0)
-#ifndef LWIP_PLATFORM_ASSERT
-#error "If you want to use LWIP_ASSERT, LWIP_PLATFORM_ASSERT(message) needs to be defined in your arch/cc.h"
-#endif
-#else  /* LWIP_NOASSERT */
-#define LWIP_ASSERT(message, assertion)
-#endif /* LWIP_NOASSERT */
-
-#ifndef LWIP_ERROR
-#ifndef LWIP_NOASSERT
-#define LWIP_PLATFORM_ERROR(message) LWIP_PLATFORM_ASSERT(message)
-#elif defined LWIP_DEBUG
-#define LWIP_PLATFORM_ERROR(message) LWIP_PLATFORM_DIAG((message))
-#else
-#define LWIP_PLATFORM_ERROR(message)
-#endif
-
-/* if "expression" isn't true, then print "message" and execute "handler" expression */
-#define LWIP_ERROR(message, expression, handler) do { if (!(expression)) { \
-  LWIP_PLATFORM_ERROR(message); handler;}} while(0)
-#endif /* LWIP_ERROR */
-
-/** Enable debug message printing, but only if debug message type is enabled
- *  AND is of correct type AND is at least LWIP_DBG_LEVEL.
- */
-#ifdef __DOXYGEN__
-#define LWIP_DEBUG
-#undef LWIP_DEBUG
-#endif
-
-#ifdef LWIP_DEBUG
-#ifndef LWIP_PLATFORM_DIAG
-#error "If you want to use LWIP_DEBUG, LWIP_PLATFORM_DIAG(message) needs to be defined in your arch/cc.h"
-#endif
-#define LWIP_DEBUGF(debug, message) do { \
-                               if ( \
-                                   ((debug) & LWIP_DBG_ON) && \
-                                   ((debug) & LWIP_DBG_TYPES_ON) && \
-                                   ((s16_t)((debug) & LWIP_DBG_MASK_LEVEL) >= LWIP_DBG_MIN_LEVEL)) { \
-                                 LWIP_PLATFORM_DIAG(message); \
-                                 if ((debug) & LWIP_DBG_HALT) { \
-                                   while(1); \
-                                 } \
-                               } \
-                             } while(0)
-
-#else  /* LWIP_DEBUG */
-#define LWIP_DEBUGF(debug, message)
-#endif /* LWIP_DEBUG */
-
-#endif /* LWIP_HDR_DEBUG_H */
diff --git a/sys/include/net/def.h b/sys/include/net/def.h
deleted file mode 100644
index cf33beb..0000000
--- a/sys/include/net/def.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * @file
- * various utility macros
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_DEF_H
-#define LWIP_HDR_DEF_H
-
-/* arch.h might define NULL already */
-#include <net/arch.h>
-#include <net/opt.h>
-#if LWIP_PERF
-#include <net/arch/perf.h>
-#else /* LWIP_PERF */
-#define PERF_START    /* null definition */
-#define PERF_STOP(x)  /* null definition */
-#endif /* LWIP_PERF */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LWIP_MAX(x , y)  (((x) > (y)) ? (x) : (y))
-#define LWIP_MIN(x , y)  (((x) < (y)) ? (x) : (y))
-
-/* Get the number of entries in an array ('x' must NOT be a pointer!) */
-#define LWIP_ARRAYSIZE(x) (sizeof(x)/sizeof((x)[0]))
-
-/** Create u32_t value from bytes */
-#define LWIP_MAKEU32(a,b,c,d) (((u32_t)((a) & 0xff) << 24) | \
-                               ((u32_t)((b) & 0xff) << 16) | \
-                               ((u32_t)((c) & 0xff) << 8)  | \
-                                (u32_t)((d) & 0xff))
-
-#ifndef NULL
-#ifdef __cplusplus
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define lwip_htons(x) (x)
-#define lwip_ntohs(x) (x)
-#define lwip_htonl(x) (x)
-#define lwip_ntohl(x) (x)
-#define PP_HTONS(x) (x)
-#define PP_NTOHS(x) (x)
-#define PP_HTONL(x) (x)
-#define PP_NTOHL(x) (x)
-#else /* BYTE_ORDER != BIG_ENDIAN */
-#ifndef lwip_htons
-u16_t lwip_htons(u16_t x);
-#endif
-#define lwip_ntohs(x) lwip_htons(x)
-
-#ifndef lwip_htonl
-u32_t lwip_htonl(u32_t x);
-#endif
-#define lwip_ntohl(x) lwip_htonl(x)
-
-/* These macros should be calculated by the preprocessor and are used
-   with compile-time constants only (so that there is no little-endian
-   overhead at runtime). */
-#define PP_HTONS(x) ((((x) & 0x00ffUL) << 8) | (((x) & 0xff00UL) >> 8))
-#define PP_NTOHS(x) PP_HTONS(x)
-#define PP_HTONL(x) ((((x) & 0x000000ffUL) << 24) | \
-                     (((x) & 0x0000ff00UL) <<  8) | \
-                     (((x) & 0x00ff0000UL) >>  8) | \
-                     (((x) & 0xff000000UL) >> 24))
-#define PP_NTOHL(x) PP_HTONL(x)
-#endif /* BYTE_ORDER == BIG_ENDIAN */
-
-/* Provide usual function names as macros for users, but this can be turned off */
-#ifndef LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS
-#define htons(x) lwip_htons(x)
-#define ntohs(x) lwip_ntohs(x)
-#define htonl(x) lwip_htonl(x)
-#define ntohl(x) lwip_ntohl(x)
-#endif
-
-/* Functions that are not available as standard implementations.
- * In cc.h, you can #define these to implementations available on
- * your platform to save some code bytes if you use these functions
- * in your application, too.
- */
-
-#ifndef lwip_itoa
-/* This can be #defined to itoa() or snprintf(result, bufsize, "%d", number) depending on your platform */
-void  lwip_itoa(char* result, size_t bufsize, int number);
-#endif
-#ifndef lwip_strnicmp
-/* This can be #defined to strnicmp() or strncasecmp() depending on your platform */
-int   lwip_strnicmp(const char* str1, const char* str2, size_t len);
-#endif
-#ifndef lwip_stricmp
-/* This can be #defined to stricmp() or strcasecmp() depending on your platform */
-int   lwip_stricmp(const char* str1, const char* str2);
-#endif
-#ifndef lwip_strnstr
-/* This can be #defined to strnstr() depending on your platform */
-char* lwip_strnstr(const char* buffer, const char* token, size_t n);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_DEF_H */
diff --git a/sys/include/net/dhcp.h b/sys/include/net/dhcp.h
deleted file mode 100644
index 9f972b7..0000000
--- a/sys/include/net/dhcp.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * @file
- * DHCP client API
- */
-
-/*
- * Copyright (c) 2001-2004 Leon Woestenberg <leon.woestenberg@gmx.net>
- * Copyright (c) 2001-2004 Axon Digital Design B.V., The Netherlands.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Leon Woestenberg <leon.woestenberg@gmx.net>
- *
- */
-#ifndef LWIP_HDR_DHCP_H
-#define LWIP_HDR_DHCP_H
-
-#include "net/opt.h"
-
-#if LWIP_DHCP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/netif.h"
-#include "net/udp.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** period (in seconds) of the application calling dhcp_coarse_tmr() */
-#define DHCP_COARSE_TIMER_SECS  60
-/** period (in milliseconds) of the application calling dhcp_coarse_tmr() */
-#define DHCP_COARSE_TIMER_MSECS (DHCP_COARSE_TIMER_SECS * 1000UL)
-/** period (in milliseconds) of the application calling dhcp_fine_tmr() */
-#define DHCP_FINE_TIMER_MSECS   500
-
-#define DHCP_BOOT_FILE_LEN      128U
-
-/* AutoIP cooperation flags (struct dhcp.autoip_coop_state) */
-typedef enum {
-  DHCP_AUTOIP_COOP_STATE_OFF  = 0,
-  DHCP_AUTOIP_COOP_STATE_ON   = 1
-} dhcp_autoip_coop_state_enum_t;
-
-struct dhcp
-{
-  /** transaction identifier of last sent request */
-  u32_t xid;
-  /** incoming msg */
-  struct dhcp_msg *msg_in;
-  /** track PCB allocation state */
-  u8_t pcb_allocated;
-  /** current DHCP state machine state */
-  u8_t state;
-  /** retries of current request */
-  u8_t tries;
-#if LWIP_DHCP_AUTOIP_COOP
-  u8_t autoip_coop_state;
-#endif
-  u8_t subnet_mask_given;
-
-  struct pbuf *p_out; /* pbuf of outcoming msg */
-  struct dhcp_msg *msg_out; /* outgoing msg */
-  u16_t options_out_len; /* outgoing msg options length */
-  u16_t request_timeout; /* #ticks with period DHCP_FINE_TIMER_SECS for request timeout */
-  u16_t t1_timeout;  /* #ticks with period DHCP_COARSE_TIMER_SECS for renewal time */
-  u16_t t2_timeout;  /* #ticks with period DHCP_COARSE_TIMER_SECS for rebind time */
-  u16_t t1_renew_time;  /* #ticks with period DHCP_COARSE_TIMER_SECS until next renew try */
-  u16_t t2_rebind_time; /* #ticks with period DHCP_COARSE_TIMER_SECS until next rebind try */
-  u16_t lease_used; /* #ticks with period DHCP_COARSE_TIMER_SECS since last received DHCP ack */
-  u16_t t0_timeout; /* #ticks with period DHCP_COARSE_TIMER_SECS for lease time */
-  ip_addr_t server_ip_addr; /* dhcp server address that offered this lease (ip_addr_t because passed to UDP) */
-  ip4_addr_t offered_ip_addr;
-  ip4_addr_t offered_sn_mask;
-  ip4_addr_t offered_gw_addr;
-
-  u32_t offered_t0_lease; /* lease period (in seconds) */
-  u32_t offered_t1_renew; /* recommended renew time (usually 50% of lease period) */
-  u32_t offered_t2_rebind; /* recommended rebind time (usually 87.5 of lease period)  */
-#if LWIP_DHCP_BOOTP_FILE
-  ip4_addr_t offered_si_addr;
-  char boot_file_name[DHCP_BOOT_FILE_LEN];
-#endif /* LWIP_DHCP_BOOTPFILE */
-};
-
-
-void dhcp_set_struct(struct netif *netif, struct dhcp *dhcp);
-/** Remove a struct dhcp previously set to the netif using dhcp_set_struct() */
-#define dhcp_remove_struct(netif) netif_set_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_DHCP, NULL)
-void dhcp_cleanup(struct netif *netif);
-err_t dhcp_start(struct netif *netif);
-err_t dhcp_renew(struct netif *netif);
-err_t dhcp_release(struct netif *netif);
-void dhcp_stop(struct netif *netif);
-void dhcp_inform(struct netif *netif);
-void dhcp_network_changed(struct netif *netif);
-#if DHCP_DOES_ARP_CHECK
-void dhcp_arp_reply(struct netif *netif, const ip4_addr_t *addr);
-#endif
-u8_t dhcp_supplied_address(const struct netif *netif);
-/* to be called every minute */
-void dhcp_coarse_tmr(void);
-/* to be called every half second */
-void dhcp_fine_tmr(void);
-
-#if LWIP_DHCP_GET_NTP_SRV
-/** This function must exist, in other to add offered NTP servers to
- * the NTP (or SNTP) engine.
- * See LWIP_DHCP_MAX_NTP_SERVERS */
-extern void dhcp_set_ntp_servers(u8_t num_ntp_servers, const ip4_addr_t* ntp_server_addrs);
-#endif /* LWIP_DHCP_GET_NTP_SRV */
-
-#define netif_dhcp_data(netif) ((struct dhcp*)netif_get_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_DHCP))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_DHCP */
-
-#endif /*LWIP_HDR_DHCP_H*/
diff --git a/sys/include/net/dhcp6.h b/sys/include/net/dhcp6.h
deleted file mode 100644
index 39f6902..0000000
--- a/sys/include/net/dhcp6.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * @file
- *
- * IPv6 address autoconfiguration as per RFC 4862.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- * IPv6 address autoconfiguration as per RFC 4862.
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#ifndef LWIP_HDR_IP6_DHCP6_H
-#define LWIP_HDR_IP6_DHCP6_H
-
-#include "net/opt.h"
-
-#if LWIP_IPV6_DHCP6  /* don't build if not configured for use in lwipopts.h */
-
-
-struct dhcp6
-{
-  /*@todo: implement DHCP6*/
-};
-
-#endif /* LWIP_IPV6_DHCP6 */
-
-#endif /* LWIP_HDR_IP6_DHCP6_H */
diff --git a/sys/include/net/dns.h b/sys/include/net/dns.h
deleted file mode 100644
index e09d812..0000000
--- a/sys/include/net/dns.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * @file
- * DNS API
- */
-
-/**
- * lwip DNS resolver header file.
-
- * Author: Jim Pettinato
- *   April 2007
-
- * ported from uIP resolv.c Copyright (c) 2002-2003, Adam Dunkels.
- *
- * 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 ``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 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.
- */
-
-#ifndef LWIP_HDR_DNS_H
-#define LWIP_HDR_DNS_H
-
-#include "net/opt.h"
-
-#if LWIP_DNS
-
-#include "net/ip_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** DNS timer period */
-#define DNS_TMR_INTERVAL          1000
-
-/* DNS resolve types: */
-#define LWIP_DNS_ADDRTYPE_IPV4      0
-#define LWIP_DNS_ADDRTYPE_IPV6      1
-#define LWIP_DNS_ADDRTYPE_IPV4_IPV6 2 /* try to resolve IPv4 first, try IPv6 if IPv4 fails only */
-#define LWIP_DNS_ADDRTYPE_IPV6_IPV4 3 /* try to resolve IPv6 first, try IPv4 if IPv6 fails only */
-#if LWIP_IPV4 && LWIP_IPV6
-#ifndef LWIP_DNS_ADDRTYPE_DEFAULT
-#define LWIP_DNS_ADDRTYPE_DEFAULT   LWIP_DNS_ADDRTYPE_IPV4_IPV6
-#endif
-#elif LWIP_IPV4
-#define LWIP_DNS_ADDRTYPE_DEFAULT   LWIP_DNS_ADDRTYPE_IPV4
-#else
-#define LWIP_DNS_ADDRTYPE_DEFAULT   LWIP_DNS_ADDRTYPE_IPV6
-#endif
-
-#if DNS_LOCAL_HOSTLIST
-/** struct used for local host-list */
-struct local_hostlist_entry {
-  /** static hostname */
-  const char *name;
-  /** static host address in network byteorder */
-  ip_addr_t addr;
-  struct local_hostlist_entry *next;
-};
-#define DNS_LOCAL_HOSTLIST_ELEM(name, addr_init) {name, addr_init, NULL}
-#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
-#ifndef DNS_LOCAL_HOSTLIST_MAX_NAMELEN
-#define DNS_LOCAL_HOSTLIST_MAX_NAMELEN  DNS_MAX_NAME_LENGTH
-#endif
-#define LOCALHOSTLIST_ELEM_SIZE ((sizeof(struct local_hostlist_entry) + DNS_LOCAL_HOSTLIST_MAX_NAMELEN + 1))
-#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-#endif /* DNS_LOCAL_HOSTLIST */
-
-#if LWIP_IPV4
-extern const ip_addr_t dns_mquery_v4group;
-#endif /* LWIP_IPV4 */
-#if LWIP_IPV6
-extern const ip_addr_t dns_mquery_v6group;
-#endif /* LWIP_IPV6 */
-
-/** Callback which is invoked when a hostname is found.
- * A function of this type must be implemented by the application using the DNS resolver.
- * @param name pointer to the name that was looked up.
- * @param ipaddr pointer to an ip_addr_t containing the IP address of the hostname,
- *        or NULL if the name could not be found (or on any other error).
- * @param callback_arg a user-specified callback argument passed to dns_gethostbyname
-*/
-typedef void (*dns_found_callback)(const char *name, const ip_addr_t *ipaddr, void *callback_arg);
-
-void             dns_init(void);
-void             dns_tmr(void);
-void             dns_setserver(u8_t numdns, const ip_addr_t *dnsserver);
-const ip_addr_t* dns_getserver(u8_t numdns);
-err_t            dns_gethostbyname(const char *hostname, ip_addr_t *addr,
-                                   dns_found_callback found, void *callback_arg);
-err_t            dns_gethostbyname_addrtype(const char *hostname, ip_addr_t *addr,
-                                   dns_found_callback found, void *callback_arg,
-                                   u8_t dns_addrtype);
-
-
-#if DNS_LOCAL_HOSTLIST
-size_t         dns_local_iterate(dns_found_callback iterator_fn, void *iterator_arg);
-err_t          dns_local_lookup(const char *hostname, ip_addr_t *addr, u8_t dns_addrtype);
-#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
-int            dns_local_removehost(const char *hostname, const ip_addr_t *addr);
-err_t          dns_local_addhost(const char *hostname, const ip_addr_t *addr);
-#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-#endif /* DNS_LOCAL_HOSTLIST */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_DNS */
-
-#endif /* LWIP_HDR_DNS_H */
diff --git a/sys/include/net/err.h b/sys/include/net/err.h
deleted file mode 100644
index fc982bb..0000000
--- a/sys/include/net/err.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * @file
- * lwIP Error codes
- */
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_ERR_H
-#define LWIP_HDR_ERR_H
-
-#include <net/opt.h>
-#include <net/arch.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup infrastructure_errors Error codes
- * @ingroup infrastructure
- * @{
- */
-
-/** Define LWIP_ERR_T in cc.h if you want to use
- *  a different type for your platform (must be signed). */
-#ifdef LWIP_ERR_T
-typedef LWIP_ERR_T err_t;
-#else /* LWIP_ERR_T */
-typedef s8_t err_t;
-#endif /* LWIP_ERR_T*/
-
-/** Definitions for error constants. */
-typedef enum {
-/** No error, everything OK. */
-  ERR_OK         = 0,
-/** Out of memory error.     */
-  ERR_MEM        = -1,
-/** Buffer error.            */
-  ERR_BUF        = -2,
-/** Timeout.                 */
-  ERR_TIMEOUT    = -3,
-/** Routing problem.         */
-  ERR_RTE        = -4,
-/** Operation in progress    */
-  ERR_INPROGRESS = -5,
-/** Illegal value.           */
-  ERR_VAL        = -6,
-/** Operation would block.   */
-  ERR_WOULDBLOCK = -7,
-/** Address in use.          */
-  ERR_USE        = -8,
-/** Already connecting.      */
-  ERR_ALREADY    = -9,
-/** Conn already established.*/
-  ERR_ISCONN     = -10,
-/** Not connected.           */
-  ERR_CONN       = -11,
-/** Low-level netif error    */
-  ERR_IF         = -12,
-
-/** Connection aborted.      */
-  ERR_ABRT       = -13,
-/** Connection reset.        */
-  ERR_RST        = -14,
-/** Connection closed.       */
-  ERR_CLSD       = -15,
-/** Illegal argument.        */
-  ERR_ARG        = -16
-} err_enum_t;
-
-#define ERR_IS_FATAL(e) ((e) <= ERR_ABRT)
-
-/**
- * @}
- */
-
-#ifdef LWIP_DEBUG
-extern const char *lwip_strerr(err_t err);
-#else
-#define lwip_strerr(x) ""
-#endif /* LWIP_DEBUG */
-
-#if !NO_SYS
-int err_to_errno(err_t err);
-#endif /* !NO_SYS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_ERR_H */
diff --git a/sys/include/net/errno.h b/sys/include/net/errno.h
deleted file mode 100644
index 1ee024d..0000000
--- a/sys/include/net/errno.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * @file
- * Posix Errno defines
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_ERRNO_H
-#define LWIP_HDR_ERRNO_H
-
-#include <net/opt.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef LWIP_PROVIDE_ERRNO
-
-#define  EPERM            1  /* Operation not permitted */
-#define  ENOENT           2  /* No such file or directory */
-#define  ESRCH            3  /* No such process */
-#define  EINTR            4  /* Interrupted system call */
-#define  EIO              5  /* I/O error */
-#define  ENXIO            6  /* No such device or address */
-#define  E2BIG            7  /* Arg list too long */
-#define  ENOEXEC          8  /* Exec format error */
-#define  EBADF            9  /* Bad file number */
-#define  ECHILD          10  /* No child processes */
-#define  EAGAIN          11  /* Try again */
-#define  ENOMEM          12  /* Out of memory */
-#define  EACCES          13  /* Permission denied */
-#define  EFAULT          14  /* Bad address */
-#define  ENOTBLK         15  /* Block device required */
-#define  EBUSY           16  /* Device or resource busy */
-#define  EEXIST          17  /* File exists */
-#define  EXDEV           18  /* Cross-device link */
-#define  ENODEV          19  /* No such device */
-#define  ENOTDIR         20  /* Not a directory */
-#define  EISDIR          21  /* Is a directory */
-#define  EINVAL          22  /* Invalid argument */
-#define  ENFILE          23  /* File table overflow */
-#define  EMFILE          24  /* Too many open files */
-#define  ENOTTY          25  /* Not a typewriter */
-#define  ETXTBSY         26  /* Text file busy */
-#define  EFBIG           27  /* File too large */
-#define  ENOSPC          28  /* No space left on device */
-#define  ESPIPE          29  /* Illegal seek */
-#define  EROFS           30  /* Read-only file system */
-#define  EMLINK          31  /* Too many links */
-#define  EPIPE           32  /* Broken pipe */
-#define  EDOM            33  /* Math argument out of domain of func */
-#define  ERANGE          34  /* Math result not representable */
-#define  EDEADLK         35  /* Resource deadlock would occur */
-#define  ENAMETOOLONG    36  /* File name too long */
-#define  ENOLCK          37  /* No record locks available */
-#define  ENOSYS          38  /* Function not implemented */
-#define  ENOTEMPTY       39  /* Directory not empty */
-#define  ELOOP           40  /* Too many symbolic links encountered */
-#define  EWOULDBLOCK     EAGAIN  /* Operation would block */
-#define  ENOMSG          42  /* No message of desired type */
-#define  EIDRM           43  /* Identifier removed */
-#define  ECHRNG          44  /* Channel number out of range */
-#define  EL2NSYNC        45  /* Level 2 not synchronized */
-#define  EL3HLT          46  /* Level 3 halted */
-#define  EL3RST          47  /* Level 3 reset */
-#define  ELNRNG          48  /* Link number out of range */
-#define  EUNATCH         49  /* Protocol driver not attached */
-#define  ENOCSI          50  /* No CSI structure available */
-#define  EL2HLT          51  /* Level 2 halted */
-#define  EBADE           52  /* Invalid exchange */
-#define  EBADR           53  /* Invalid request descriptor */
-#define  EXFULL          54  /* Exchange full */
-#define  ENOANO          55  /* No anode */
-#define  EBADRQC         56  /* Invalid request code */
-#define  EBADSLT         57  /* Invalid slot */
-
-#define  EDEADLOCK       EDEADLK
-
-#define  EBFONT          59  /* Bad font file format */
-#define  ENOSTR          60  /* Device not a stream */
-#define  ENODATA         61  /* No data available */
-#define  ETIME           62  /* Timer expired */
-#define  ENOSR           63  /* Out of streams resources */
-#define  ENONET          64  /* Machine is not on the network */
-#define  ENOPKG          65  /* Package not installed */
-#define  EREMOTE         66  /* Object is remote */
-#define  ENOLINK         67  /* Link has been severed */
-#define  EADV            68  /* Advertise error */
-#define  ESRMNT          69  /* Srmount error */
-#define  ECOMM           70  /* Communication error on send */
-#define  EPROTO          71  /* Protocol error */
-#define  EMULTIHOP       72  /* Multihop attempted */
-#define  EDOTDOT         73  /* RFS specific error */
-#define  EBADMSG         74  /* Not a data message */
-#define  EOVERFLOW       75  /* Value too large for defined data type */
-#define  ENOTUNIQ        76  /* Name not unique on network */
-#define  EBADFD          77  /* File descriptor in bad state */
-#define  EREMCHG         78  /* Remote address changed */
-#define  ELIBACC         79  /* Can not access a needed shared library */
-#define  ELIBBAD         80  /* Accessing a corrupted shared library */
-#define  ELIBSCN         81  /* .lib section in a.out corrupted */
-#define  ELIBMAX         82  /* Attempting to link in too many shared libraries */
-#define  ELIBEXEC        83  /* Cannot exec a shared library directly */
-#define  EILSEQ          84  /* Illegal byte sequence */
-#define  ERESTART        85  /* Interrupted system call should be restarted */
-#define  ESTRPIPE        86  /* Streams pipe error */
-#define  EUSERS          87  /* Too many users */
-#define  ENOTSOCK        88  /* Socket operation on non-socket */
-#define  EDESTADDRREQ    89  /* Destination address required */
-#define  EMSGSIZE        90  /* Message too long */
-#define  EPROTOTYPE      91  /* Protocol wrong type for socket */
-#define  ENOPROTOOPT     92  /* Protocol not available */
-#define  EPROTONOSUPPORT 93  /* Protocol not supported */
-#define  ESOCKTNOSUPPORT 94  /* Socket type not supported */
-#define  EOPNOTSUPP      95  /* Operation not supported on transport endpoint */
-#define  EPFNOSUPPORT    96  /* Protocol family not supported */
-#define  EAFNOSUPPORT    97  /* Address family not supported by protocol */
-#define  EADDRINUSE      98  /* Address already in use */
-#define  EADDRNOTAVAIL   99  /* Cannot assign requested address */
-#define  ENETDOWN       100  /* Network is down */
-#define  ENETUNREACH    101  /* Network is unreachable */
-#define  ENETRESET      102  /* Network dropped connection because of reset */
-#define  ECONNABORTED   103  /* Software caused connection abort */
-#define  ECONNRESET     104  /* Connection reset by peer */
-#define  ENOBUFS        105  /* No buffer space available */
-#define  EISCONN        106  /* Transport endpoint is already connected */
-#define  ENOTCONN       107  /* Transport endpoint is not connected */
-#define  ESHUTDOWN      108  /* Cannot send after transport endpoint shutdown */
-#define  ETOOMANYREFS   109  /* Too many references: cannot splice */
-#define  ETIMEDOUT      110  /* Connection timed out */
-#define  ECONNREFUSED   111  /* Connection refused */
-#define  EHOSTDOWN      112  /* Host is down */
-#define  EHOSTUNREACH   113  /* No route to host */
-#define  EALREADY       114  /* Operation already in progress */
-#define  EINPROGRESS    115  /* Operation now in progress */
-#define  ESTALE         116  /* Stale NFS file handle */
-#define  EUCLEAN        117  /* Structure needs cleaning */
-#define  ENOTNAM        118  /* Not a XENIX named type file */
-#define  ENAVAIL        119  /* No XENIX semaphores available */
-#define  EISNAM         120  /* Is a named type file */
-#define  EREMOTEIO      121  /* Remote I/O error */
-#define  EDQUOT         122  /* Quota exceeded */
-
-#define  ENOMEDIUM      123  /* No medium found */
-#define  EMEDIUMTYPE    124  /* Wrong medium type */
-
-#ifndef errno
-extern int errno;
-#endif
-
-#else /* LWIP_PROVIDE_ERRNO */
-
-/* Define LWIP_ERRNO_INCLUDE to <errno.h> to include the error defines here */
-#ifdef LWIP_ERRNO_INCLUDE
-#include LWIP_ERRNO_INCLUDE
-#endif /* LWIP_ERRNO_INCLUDE */
-
-#endif /* LWIP_PROVIDE_ERRNO */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_ERRNO_H */
diff --git a/sys/include/net/etharp.h b/sys/include/net/etharp.h
deleted file mode 100644
index 86bda36..0000000
--- a/sys/include/net/etharp.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @file
- * Ethernet output function - handles OUTGOING ethernet level traffic, implements
- * ARP resolving.
- * To be used in most low-level netif implementations
- */
-
-/*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
- * Copyright (c) 2003-2004 Leon Woestenberg <leon.woestenberg@axon.tv>
- * Copyright (c) 2003-2004 Axon Digital Design B.V., The Netherlands.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#ifndef LWIP_HDR_NETIF_ETHARP_H
-#define LWIP_HDR_NETIF_ETHARP_H
-
-#include "net/opt.h"
-
-#if LWIP_ARP || LWIP_ETHERNET /* don't build if not configured for use in lwipopts.h */
-
-#include "net/pbuf.h"
-#include "net/ip4_addr.h"
-#include "net/netif.h"
-#include "net/ip4.h"
-#include "net/prot/ethernet.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_IPV4 && LWIP_ARP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/prot/etharp.h"
-
-/** 1 seconds period */
-#define ARP_TMR_INTERVAL 1000
-
-#if ARP_QUEUEING
-/** struct for queueing outgoing packets for unknown address
-  * defined here to be accessed by memp.h
-  */
-struct etharp_q_entry {
-  struct etharp_q_entry *next;
-  struct pbuf *p;
-};
-#endif /* ARP_QUEUEING */
-
-#define etharp_init() /* Compatibility define, no init needed. */
-void etharp_tmr(void);
-s8_t etharp_find_addr(struct netif *netif, const ip4_addr_t *ipaddr,
-         struct eth_addr **eth_ret, const ip4_addr_t **ip_ret);
-u8_t etharp_get_entry(u8_t i, ip4_addr_t **ipaddr, struct netif **netif, struct eth_addr **eth_ret);
-err_t etharp_output(struct netif *netif, struct pbuf *q, const ip4_addr_t *ipaddr);
-err_t etharp_query(struct netif *netif, const ip4_addr_t *ipaddr, struct pbuf *q);
-err_t etharp_request(struct netif *netif, const ip4_addr_t *ipaddr);
-/** For Ethernet network interfaces, we might want to send "gratuitous ARP";
- *  this is an ARP packet sent by a node in order to spontaneously cause other
- *  nodes to update an entry in their ARP cache.
- *  From RFC 3220 "IP Mobility Support for IPv4" section 4.6. */
-#define etharp_gratuitous(netif) etharp_request((netif), netif_ip4_addr(netif))
-void etharp_cleanup_netif(struct netif *netif);
-
-#if ETHARP_SUPPORT_STATIC_ENTRIES
-err_t etharp_add_static_entry(const ip4_addr_t *ipaddr, struct eth_addr *ethaddr);
-err_t etharp_remove_static_entry(const ip4_addr_t *ipaddr);
-#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
-
-#endif /* LWIP_IPV4 && LWIP_ARP */
-
-void etharp_input(struct pbuf *p, struct netif *netif);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_ARP || LWIP_ETHERNET */
-
-#endif /* LWIP_HDR_NETIF_ETHARP_H */
diff --git a/sys/include/net/ethip6.h b/sys/include/net/ethip6.h
deleted file mode 100644
index f2d0dfd..0000000
--- a/sys/include/net/ethip6.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * @file
- *
- * Ethernet output for IPv6. Uses ND tables for link-layer addressing.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#ifndef LWIP_HDR_ETHIP6_H
-#define LWIP_HDR_ETHIP6_H
-
-#include "net/opt.h"
-
-#if LWIP_IPV6 && LWIP_ETHERNET /* don't build if not configured for use in lwipopts.h */
-
-#include "net/pbuf.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/netif.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-err_t ethip6_output(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV6 && LWIP_ETHERNET */
-
-#endif /* LWIP_HDR_ETHIP6_H */
diff --git a/sys/include/net/icmp.h b/sys/include/net/icmp.h
deleted file mode 100644
index 844a611..0000000
--- a/sys/include/net/icmp.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * @file
- * ICMP API
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_ICMP_H
-#define LWIP_HDR_ICMP_H
-
-#include "net/opt.h"
-#include "net/pbuf.h"
-#include "net/ip_addr.h"
-#include "net/netif.h"
-#include "net/prot/icmp.h"
-
-#if LWIP_IPV6 && LWIP_ICMP6
-#include "net/icmp6.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** ICMP destination unreachable codes */
-enum icmp_dur_type {
-  /** net unreachable */
-  ICMP_DUR_NET   = 0,
-  /** host unreachable */
-  ICMP_DUR_HOST  = 1,
-  /** protocol unreachable */
-  ICMP_DUR_PROTO = 2,
-  /** port unreachable */
-  ICMP_DUR_PORT  = 3,
-  /** fragmentation needed and DF set */
-  ICMP_DUR_FRAG  = 4,
-  /** source route failed */
-  ICMP_DUR_SR    = 5
-};
-
-/** ICMP time exceeded codes */
-enum icmp_te_type {
-  /** time to live exceeded in transit */
-  ICMP_TE_TTL  = 0,
-  /** fragment reassembly time exceeded */
-  ICMP_TE_FRAG = 1
-};
-
-#if LWIP_IPV4 && LWIP_ICMP /* don't build if not configured for use in lwipopts.h */
-
-void icmp_input(struct pbuf *p, struct netif *inp);
-void icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t);
-void icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t);
-
-#endif /* LWIP_IPV4 && LWIP_ICMP */
-
-#if LWIP_IPV4 && LWIP_IPV6
-#if LWIP_ICMP && LWIP_ICMP6
-#define icmp_port_unreach(isipv6, pbuf) ((isipv6) ? \
-                                         icmp6_dest_unreach(pbuf, ICMP6_DUR_PORT) : \
-                                         icmp_dest_unreach(pbuf, ICMP_DUR_PORT))
-#elif LWIP_ICMP
-#define icmp_port_unreach(isipv6, pbuf) do{ if(!(isipv6)) { icmp_dest_unreach(pbuf, ICMP_DUR_PORT);}}while(0)
-#elif LWIP_ICMP6
-#define icmp_port_unreach(isipv6, pbuf) do{ if(isipv6) { icmp6_dest_unreach(pbuf, ICMP6_DUR_PORT);}}while(0)
-#else
-#define icmp_port_unreach(isipv6, pbuf)
-#endif
-#elif LWIP_IPV6 && LWIP_ICMP6
-#define icmp_port_unreach(isipv6, pbuf) icmp6_dest_unreach(pbuf, ICMP6_DUR_PORT)
-#elif LWIP_IPV4 && LWIP_ICMP
-#define icmp_port_unreach(isipv6, pbuf) icmp_dest_unreach(pbuf, ICMP_DUR_PORT)
-#else /* (LWIP_IPV6 && LWIP_ICMP6) || (LWIP_IPV4 && LWIP_ICMP) */
-#define icmp_port_unreach(isipv6, pbuf)
-#endif /* (LWIP_IPV6 && LWIP_ICMP6) || (LWIP_IPV4 && LWIP_ICMP) LWIP_IPV4*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_ICMP_H */
diff --git a/sys/include/net/icmp6.h b/sys/include/net/icmp6.h
deleted file mode 100644
index 6ce3a2a..0000000
--- a/sys/include/net/icmp6.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * @file
- *
- * IPv6 version of ICMP, as per RFC 4443.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-#ifndef LWIP_HDR_ICMP6_H
-#define LWIP_HDR_ICMP6_H
-
-#include "net/opt.h"
-#include "net/pbuf.h"
-#include "net/ip6_addr.h"
-#include "net/netif.h"
-#include "net/prot/icmp6.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_ICMP6 && LWIP_IPV6 /* don't build if not configured for use in lwipopts.h */
-
-void icmp6_input(struct pbuf *p, struct netif *inp);
-void icmp6_dest_unreach(struct pbuf *p, enum icmp6_dur_code c);
-void icmp6_packet_too_big(struct pbuf *p, u32_t mtu);
-void icmp6_time_exceeded(struct pbuf *p, enum icmp6_te_code c);
-void icmp6_param_problem(struct pbuf *p, enum icmp6_pp_code c, u32_t pointer);
-
-#endif /* LWIP_ICMP6 && LWIP_IPV6 */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* LWIP_HDR_ICMP6_H */
diff --git a/sys/include/net/igmp.h b/sys/include/net/igmp.h
deleted file mode 100644
index 571684c..0000000
--- a/sys/include/net/igmp.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * @file
- * IGMP API
- */
-
-/*
- * Copyright (c) 2002 CITEL Technologies Ltd.
- * 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. Neither the name of CITEL Technologies Ltd 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 CITEL TECHNOLOGIES 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 CITEL TECHNOLOGIES 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.
- *
- * This file is a contribution to the lwIP TCP/IP stack.
- * The Swedish Institute of Computer Science and Adam Dunkels
- * are specifically granted permission to redistribute this
- * source code.
-*/
-
-#ifndef LWIP_HDR_IGMP_H
-#define LWIP_HDR_IGMP_H
-
-#include "net/opt.h"
-#include "net/ip_addr.h"
-#include "net/netif.h"
-#include "net/pbuf.h"
-
-#if LWIP_IPV4 && LWIP_IGMP /* don't build if not configured for use in lwipopts.h */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* IGMP timer */
-#define IGMP_TMR_INTERVAL              100 /* Milliseconds */
-#define IGMP_V1_DELAYING_MEMBER_TMR   (1000/IGMP_TMR_INTERVAL)
-#define IGMP_JOIN_DELAYING_MEMBER_TMR (500 /IGMP_TMR_INTERVAL)
-
-/* Compatibility defines (don't use for new code) */
-#define IGMP_DEL_MAC_FILTER            NETIF_DEL_MAC_FILTER
-#define IGMP_ADD_MAC_FILTER            NETIF_ADD_MAC_FILTER
-
-/**
- * igmp group structure - there is
- * a list of groups for each interface
- * these should really be linked from the interface, but
- * if we keep them separate we will not affect the lwip original code
- * too much
- *
- * There will be a group for the all systems group address but this
- * will not run the state machine as it is used to kick off reports
- * from all the other groups
- */
-struct igmp_group {
-  /** next link */
-  struct igmp_group *next;
-  /** multicast address */
-  ip4_addr_t         group_address;
-  /** signifies we were the last person to report */
-  u8_t               last_reporter_flag;
-  /** current state of the group */
-  u8_t               group_state;
-  /** timer for reporting, negative is OFF */
-  u16_t              timer;
-  /** counter of simultaneous uses */
-  u8_t               use;
-};
-
-/*  Prototypes */
-void   igmp_init(void);
-err_t  igmp_start(struct netif *netif);
-err_t  igmp_stop(struct netif *netif);
-void   igmp_report_groups(struct netif *netif);
-struct igmp_group *igmp_lookfor_group(struct netif *ifp, const ip4_addr_t *addr);
-void   igmp_input(struct pbuf *p, struct netif *inp, const ip4_addr_t *dest);
-err_t  igmp_joingroup(const ip4_addr_t *ifaddr, const ip4_addr_t *groupaddr);
-err_t  igmp_joingroup_netif(struct netif *netif, const ip4_addr_t *groupaddr);
-err_t  igmp_leavegroup(const ip4_addr_t *ifaddr, const ip4_addr_t *groupaddr);
-err_t  igmp_leavegroup_netif(struct netif *netif, const ip4_addr_t *groupaddr);
-void   igmp_tmr(void);
-
-/** @ingroup igmp 
- * Get list head of IGMP groups for netif.
- * Note: The allsystems group IP is contained in the list as first entry.
- * @see @ref netif_set_igmp_mac_filter()
- */
-#define netif_igmp_data(netif) ((struct igmp_group *)netif_get_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_IGMP))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV4 && LWIP_IGMP */
-
-#endif /* LWIP_HDR_IGMP_H */
diff --git a/sys/include/net/inet.h b/sys/include/net/inet.h
deleted file mode 100644
index 63a6862..0000000
--- a/sys/include/net/inet.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * @file
- * This file (together with sockets.h) aims to provide structs and functions from
- * - arpa/inet.h
- * - netinet/in.h
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_INET_H
-#define LWIP_HDR_INET_H
-
-#include <net/opt.h>
-#include <net/def.h>
-#include <net/ip_addr.h>
-#include <net/ip6_addr.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* If your port already typedef's in_addr_t, define IN_ADDR_T_DEFINED
-   to prevent this code from redefining it. */
-#if !defined(in_addr_t) && !defined(IN_ADDR_T_DEFINED)
-typedef u32_t in_addr_t;
-#endif
-
-struct in_addr {
-  in_addr_t s_addr;
-};
-
-struct in6_addr {
-  union {
-    u32_t u32_addr[4];
-    u8_t  u8_addr[16];
-  } un;
-#define s6_addr  un.u8_addr
-};
-
-/** 255.255.255.255 */
-#define INADDR_NONE         IPADDR_NONE
-/** 127.0.0.1 */
-#define INADDR_LOOPBACK     IPADDR_LOOPBACK
-/** 0.0.0.0 */
-#define INADDR_ANY          IPADDR_ANY
-/** 255.255.255.255 */
-#define INADDR_BROADCAST    IPADDR_BROADCAST
-
-/** This macro can be used to initialize a variable of type struct in6_addr
-    to the IPv6 wildcard address. */
-#define IN6ADDR_ANY_INIT {{{0,0,0,0}}}
-/** This macro can be used to initialize a variable of type struct in6_addr
-    to the IPv6 loopback address. */
-#define IN6ADDR_LOOPBACK_INIT {{{0,0,0,PP_HTONL(1)}}}
-/** This variable is initialized by the system to contain the wildcard IPv6 address. */
-extern const struct in6_addr in6addr_any;
-
-/* Definitions of the bits in an (IPv4) Internet address integer.
-
-   On subnets, host and network parts are found according to
-   the subnet mask, not these masks.  */
-#define IN_CLASSA(a)        IP_CLASSA(a)
-#define IN_CLASSA_NET       IP_CLASSA_NET
-#define IN_CLASSA_NSHIFT    IP_CLASSA_NSHIFT
-#define IN_CLASSA_HOST      IP_CLASSA_HOST
-#define IN_CLASSA_MAX       IP_CLASSA_MAX
-
-#define IN_CLASSB(b)        IP_CLASSB(b)
-#define IN_CLASSB_NET       IP_CLASSB_NET
-#define IN_CLASSB_NSHIFT    IP_CLASSB_NSHIFT
-#define IN_CLASSB_HOST      IP_CLASSB_HOST
-#define IN_CLASSB_MAX       IP_CLASSB_MAX
-
-#define IN_CLASSC(c)        IP_CLASSC(c)
-#define IN_CLASSC_NET       IP_CLASSC_NET
-#define IN_CLASSC_NSHIFT    IP_CLASSC_NSHIFT
-#define IN_CLASSC_HOST      IP_CLASSC_HOST
-#define IN_CLASSC_MAX       IP_CLASSC_MAX
-
-#define IN_CLASSD(d)        IP_CLASSD(d)
-#define IN_CLASSD_NET       IP_CLASSD_NET     /* These ones aren't really */
-#define IN_CLASSD_NSHIFT    IP_CLASSD_NSHIFT  /*   net and host fields, but */
-#define IN_CLASSD_HOST      IP_CLASSD_HOST    /*   routing needn't know. */
-#define IN_CLASSD_MAX       IP_CLASSD_MAX
-
-#define IN_MULTICAST(a)     IP_MULTICAST(a)
-
-#define IN_EXPERIMENTAL(a)  IP_EXPERIMENTAL(a)
-#define IN_BADCLASS(a)      IP_BADCLASS(a)
-
-#define IN_LOOPBACKNET      IP_LOOPBACKNET
-
-
-#ifndef INET_ADDRSTRLEN
-#define INET_ADDRSTRLEN     IP4ADDR_STRLEN_MAX
-#endif
-#if LWIP_IPV6
-#ifndef INET6_ADDRSTRLEN
-#define INET6_ADDRSTRLEN    IP6ADDR_STRLEN_MAX
-#endif
-#endif
-
-#if LWIP_IPV4
-
-#define inet_addr_from_ip4addr(target_inaddr, source_ipaddr) ((target_inaddr)->s_addr = ip4_addr_get_u32(source_ipaddr))
-#define inet_addr_to_ip4addr(target_ipaddr, source_inaddr)   (ip4_addr_set_u32(target_ipaddr, (source_inaddr)->s_addr))
-/* ATTENTION: the next define only works because both s_addr and ip4_addr_t are an u32_t effectively! */
-#define inet_addr_to_ip4addr_p(target_ip4addr_p, source_inaddr)   ((target_ip4addr_p) = (ip4_addr_t*)&((source_inaddr)->s_addr))
-
-/* directly map this to the lwip internal functions */
-#define inet_addr(cp)                   ipaddr_addr(cp)
-#define inet_aton(cp, addr)             ip4addr_aton(cp, (ip4_addr_t*)addr)
-#define inet_ntoa(addr)                 ip4addr_ntoa((const ip4_addr_t*)&(addr))
-#define inet_ntoa_r(addr, buf, buflen)  ip4addr_ntoa_r((const ip4_addr_t*)&(addr), buf, buflen)
-
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-#define inet6_addr_from_ip6addr(target_in6addr, source_ip6addr) {(target_in6addr)->un.u32_addr[0] = (source_ip6addr)->addr[0]; \
-                                                                 (target_in6addr)->un.u32_addr[1] = (source_ip6addr)->addr[1]; \
-                                                                 (target_in6addr)->un.u32_addr[2] = (source_ip6addr)->addr[2]; \
-                                                                 (target_in6addr)->un.u32_addr[3] = (source_ip6addr)->addr[3];}
-#define inet6_addr_to_ip6addr(target_ip6addr, source_in6addr)   {(target_ip6addr)->addr[0] = (source_in6addr)->un.u32_addr[0]; \
-                                                                 (target_ip6addr)->addr[1] = (source_in6addr)->un.u32_addr[1]; \
-                                                                 (target_ip6addr)->addr[2] = (source_in6addr)->un.u32_addr[2]; \
-                                                                 (target_ip6addr)->addr[3] = (source_in6addr)->un.u32_addr[3];}
-/* ATTENTION: the next define only works because both in6_addr and ip6_addr_t are an u32_t[4] effectively! */
-#define inet6_addr_to_ip6addr_p(target_ip6addr_p, source_in6addr)   ((target_ip6addr_p) = (ip6_addr_t*)(source_in6addr))
-
-/* directly map this to the lwip internal functions */
-#define inet6_aton(cp, addr)            ip6addr_aton(cp, (ip6_addr_t*)addr)
-#define inet6_ntoa(addr)                ip6addr_ntoa((const ip6_addr_t*)&(addr))
-#define inet6_ntoa_r(addr, buf, buflen) ip6addr_ntoa_r((const ip6_addr_t*)&(addr), buf, buflen)
-
-#endif /* LWIP_IPV6 */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_INET_H */
diff --git a/sys/include/net/inet_chksum.h b/sys/include/net/inet_chksum.h
deleted file mode 100644
index a00ab6d..0000000
--- a/sys/include/net/inet_chksum.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * @file
- * IP checksum calculation functions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_INET_CHKSUM_H
-#define LWIP_HDR_INET_CHKSUM_H
-
-#include "net/opt.h"
-
-#include "net/pbuf.h"
-#include "net/ip_addr.h"
-
-/** Swap the bytes in an u16_t: much like lwip_htons() for little-endian */
-#ifndef SWAP_BYTES_IN_WORD
-#define SWAP_BYTES_IN_WORD(w) (((w) & 0xff) << 8) | (((w) & 0xff00) >> 8)
-#endif /* SWAP_BYTES_IN_WORD */
-
-/** Split an u32_t in two u16_ts and add them up */
-#ifndef FOLD_U32T
-#define FOLD_U32T(u)          (((u) >> 16) + ((u) & 0x0000ffffUL))
-#endif
-
-#if LWIP_CHECKSUM_ON_COPY
-/** Function-like macro: same as MEMCPY but returns the checksum of copied data
-    as u16_t */
-# ifndef LWIP_CHKSUM_COPY
-#  define LWIP_CHKSUM_COPY(dst, src, len) lwip_chksum_copy(dst, src, len)
-#  ifndef LWIP_CHKSUM_COPY_ALGORITHM
-#   define LWIP_CHKSUM_COPY_ALGORITHM 1
-#  endif /* LWIP_CHKSUM_COPY_ALGORITHM */
-# else /* LWIP_CHKSUM_COPY */
-#  define LWIP_CHKSUM_COPY_ALGORITHM 0
-# endif /* LWIP_CHKSUM_COPY */
-#else /* LWIP_CHECKSUM_ON_COPY */
-# define LWIP_CHKSUM_COPY_ALGORITHM 0
-#endif /* LWIP_CHECKSUM_ON_COPY */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-u16_t inet_chksum(const void *dataptr, u16_t len);
-u16_t inet_chksum_pbuf(struct pbuf *p);
-#if LWIP_CHKSUM_COPY_ALGORITHM
-u16_t lwip_chksum_copy(void *dst, const void *src, u16_t len);
-#endif /* LWIP_CHKSUM_COPY_ALGORITHM */
-
-#if LWIP_IPV4
-u16_t inet_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
-       const ip4_addr_t *src, const ip4_addr_t *dest);
-u16_t inet_chksum_pseudo_partial(struct pbuf *p, u8_t proto,
-       u16_t proto_len, u16_t chksum_len, const ip4_addr_t *src, const ip4_addr_t *dest);
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-u16_t ip6_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
-       const ip6_addr_t *src, const ip6_addr_t *dest);
-u16_t ip6_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
-       u16_t chksum_len, const ip6_addr_t *src, const ip6_addr_t *dest);
-#endif /* LWIP_IPV6 */
-
-
-u16_t ip_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
-       const ip_addr_t *src, const ip_addr_t *dest);
-u16_t ip_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
-       u16_t chksum_len, const ip_addr_t *src, const ip_addr_t *dest);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_INET_H */
-
diff --git a/sys/include/net/init.h b/sys/include/net/init.h
deleted file mode 100644
index 11a57d8..0000000
--- a/sys/include/net/init.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * @file
- * lwIP initialization API
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_INIT_H
-#define LWIP_HDR_INIT_H
-
-#include "net/opt.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @defgroup lwip_version Version
- * @ingroup lwip
- * @{
- */
-
-/** X.x.x: Major version of the stack */
-#define LWIP_VERSION_MAJOR      2
-/** x.X.x: Minor version of the stack */
-#define LWIP_VERSION_MINOR      0
-/** x.x.X: Revision of the stack */
-#define LWIP_VERSION_REVISION   3
-/** For release candidates, this is set to 1..254
-  * For official releases, this is set to 255 (LWIP_RC_RELEASE)
-  * For development versions (Git), this is set to 0 (LWIP_RC_DEVELOPMENT) */
-#define LWIP_VERSION_RC         LWIP_RC_RELEASE
-
-/** LWIP_VERSION_RC is set to LWIP_RC_RELEASE for official releases */
-#define LWIP_RC_RELEASE         255
-/** LWIP_VERSION_RC is set to LWIP_RC_DEVELOPMENT for Git versions */
-#define LWIP_RC_DEVELOPMENT     0
-
-#define LWIP_VERSION_IS_RELEASE     (LWIP_VERSION_RC == LWIP_RC_RELEASE)
-#define LWIP_VERSION_IS_DEVELOPMENT (LWIP_VERSION_RC == LWIP_RC_DEVELOPMENT)
-#define LWIP_VERSION_IS_RC          ((LWIP_VERSION_RC != LWIP_RC_RELEASE) && (LWIP_VERSION_RC != LWIP_RC_DEVELOPMENT))
-
-/* Some helper defines to get a version string */
-#define LWIP_VERSTR2(x) #x
-#define LWIP_VERSTR(x) LWIP_VERSTR2(x)
-#if LWIP_VERSION_IS_RELEASE
-#define LWIP_VERSION_STRING_SUFFIX ""
-#elif LWIP_VERSION_IS_DEVELOPMENT
-#define LWIP_VERSION_STRING_SUFFIX "d"
-#else
-#define LWIP_VERSION_STRING_SUFFIX "rc" LWIP_VERSTR(LWIP_VERSION_RC)
-#endif
-
-/** Provides the version of the stack */
-#define LWIP_VERSION   (((u32_t)LWIP_VERSION_MAJOR) << 24   | ((u32_t)LWIP_VERSION_MINOR) << 16 | \
-                        ((u32_t)LWIP_VERSION_REVISION) << 8 | ((u32_t)LWIP_VERSION_RC))
-/** Provides the version of the stack as string */
-#define LWIP_VERSION_STRING     LWIP_VERSTR(LWIP_VERSION_MAJOR) "." LWIP_VERSTR(LWIP_VERSION_MINOR) "." LWIP_VERSTR(LWIP_VERSION_REVISION) LWIP_VERSION_STRING_SUFFIX
-
-/**
- * @}
- */
-
-/* Modules initialization */
-void lwip_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_INIT_H */
diff --git a/sys/include/net/ip.h b/sys/include/net/ip.h
deleted file mode 100644
index 1bdd55f..0000000
--- a/sys/include/net/ip.h
+++ /dev/null
@@ -1,319 +0,0 @@
-/**
- * @file
- * IP API
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_IP_H
-#define LWIP_HDR_IP_H
-
-#include "net/opt.h"
-
-#include "net/def.h"
-#include "net/pbuf.h"
-#include "net/ip_addr.h"
-#include "net/err.h"
-#include "net/netif.h"
-#include "net/ip4.h"
-#include "net/ip6.h"
-#include "net/prot/ip.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* This is passed as the destination address to ip_output_if (not
-   to ip_output), meaning that an IP header already is constructed
-   in the pbuf. This is used when TCP retransmits. */
-#define LWIP_IP_HDRINCL  NULL
-
-/** pbufs passed to IP must have a ref-count of 1 as their payload pointer
-    gets altered as the packet is passed down the stack */
-#ifndef LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX
-#define LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p) LWIP_ASSERT("p->ref == 1", (p)->ref == 1)
-#endif
-
-#if LWIP_NETIF_HWADDRHINT
-#define IP_PCB_ADDRHINT ;u8_t addr_hint
-#else
-#define IP_PCB_ADDRHINT
-#endif /* LWIP_NETIF_HWADDRHINT */
-
-/** This is the common part of all PCB types. It needs to be at the
-   beginning of a PCB type definition. It is located here so that
-   changes to this common part are made in one location instead of
-   having to change all PCB structs. */
-#define IP_PCB \
-  /* ip addresses in network byte order */ \
-  ip_addr_t local_ip; \
-  ip_addr_t remote_ip; \
-   /* Socket options */  \
-  u8_t so_options;      \
-   /* Type Of Service */ \
-  u8_t tos;              \
-  /* Time To Live */     \
-  u8_t ttl               \
-  /* link layer address resolution hint */ \
-  IP_PCB_ADDRHINT
-
-struct ip_pcb {
-/* Common members of all PCB types */
-  IP_PCB;
-};
-
-/*
- * Option flags per-socket. These are the same like SO_XXX in sockets.h
- */
-#define SOF_REUSEADDR     0x04U  /* allow local address reuse */
-#define SOF_KEEPALIVE     0x08U  /* keep connections alive */
-#define SOF_BROADCAST     0x20U  /* permit to send and to receive broadcast messages (see IP_SOF_BROADCAST option) */
-
-/* These flags are inherited (e.g. from a listen-pcb to a connection-pcb): */
-#define SOF_INHERITED   (SOF_REUSEADDR|SOF_KEEPALIVE)
-
-/** Global variables of this module, kept in a struct for efficient access using base+index. */
-struct ip_globals
-{
-  /** The interface that accepted the packet for the current callback invocation. */
-  struct netif *current_netif;
-  /** The interface that received the packet for the current callback invocation. */
-  struct netif *current_input_netif;
-#if LWIP_IPV4
-  /** Header of the input packet currently being processed. */
-  struct ip_hdr *current_ip4_header;
-#endif /* LWIP_IPV4 */
-#if LWIP_IPV6
-  /** Header of the input IPv6 packet currently being processed. */
-  struct ip6_hdr *current_ip6_header;
-#endif /* LWIP_IPV6 */
-  /** Total header length of current_ip4/6_header (i.e. after this, the UDP/TCP header starts) */
-  u16_t current_ip_header_tot_len;
-  /** Source IP address of current_header */
-  ip_addr_t current_iphdr_src;
-  /** Destination IP address of current_header */
-  ip_addr_t current_iphdr_dest;
-};
-extern struct ip_globals ip_data;
-
-
-/** Get the interface that accepted the current packet.
- * This may or may not be the receiving netif, depending on your netif/network setup.
- * This function must only be called from a receive callback (udp_recv,
- * raw_recv, tcp_accept). It will return NULL otherwise. */
-#define ip_current_netif()      (ip_data.current_netif)
-/** Get the interface that received the current packet.
- * This function must only be called from a receive callback (udp_recv,
- * raw_recv, tcp_accept). It will return NULL otherwise. */
-#define ip_current_input_netif() (ip_data.current_input_netif)
-/** Total header length of ip(6)_current_header() (i.e. after this, the UDP/TCP header starts) */
-#define ip_current_header_tot_len() (ip_data.current_ip_header_tot_len)
-/** Source IP address of current_header */
-#define ip_current_src_addr()   (&ip_data.current_iphdr_src)
-/** Destination IP address of current_header */
-#define ip_current_dest_addr()  (&ip_data.current_iphdr_dest)
-
-#if LWIP_IPV4 && LWIP_IPV6
-/** Get the IPv4 header of the current packet.
- * This function must only be called from a receive callback (udp_recv,
- * raw_recv, tcp_accept). It will return NULL otherwise. */
-#define ip4_current_header()     ((const struct ip_hdr*)(ip_data.current_ip4_header))
-/** Get the IPv6 header of the current packet.
- * This function must only be called from a receive callback (udp_recv,
- * raw_recv, tcp_accept). It will return NULL otherwise. */
-#define ip6_current_header()      ((const struct ip6_hdr*)(ip_data.current_ip6_header))
-/** Returns TRUE if the current IP input packet is IPv6, FALSE if it is IPv4 */
-#define ip_current_is_v6()        (ip6_current_header() != NULL)
-/** Source IPv6 address of current_header */
-#define ip6_current_src_addr()    (ip_2_ip6(&ip_data.current_iphdr_src))
-/** Destination IPv6 address of current_header */
-#define ip6_current_dest_addr()   (ip_2_ip6(&ip_data.current_iphdr_dest))
-/** Get the transport layer protocol */
-#define ip_current_header_proto() (ip_current_is_v6() ? \
-                                   IP6H_NEXTH(ip6_current_header()) :\
-                                   IPH_PROTO(ip4_current_header()))
-/** Get the transport layer header */
-#define ip_next_header_ptr()     ((const void*)((ip_current_is_v6() ? \
-  (const u8_t*)ip6_current_header() : (const u8_t*)ip4_current_header())  + ip_current_header_tot_len()))
-
-/** Source IP4 address of current_header */
-#define ip4_current_src_addr()     (ip_2_ip4(&ip_data.current_iphdr_src))
-/** Destination IP4 address of current_header */
-#define ip4_current_dest_addr()    (ip_2_ip4(&ip_data.current_iphdr_dest))
-
-#elif LWIP_IPV4 /* LWIP_IPV4 && LWIP_IPV6 */
-
-/** Get the IPv4 header of the current packet.
- * This function must only be called from a receive callback (udp_recv,
- * raw_recv, tcp_accept). It will return NULL otherwise. */
-#define ip4_current_header()     ((const struct ip_hdr*)(ip_data.current_ip4_header))
-/** Always returns FALSE when only supporting IPv4 only */
-#define ip_current_is_v6()        0
-/** Get the transport layer protocol */
-#define ip_current_header_proto() IPH_PROTO(ip4_current_header())
-/** Get the transport layer header */
-#define ip_next_header_ptr()     ((const void*)((const u8_t*)ip4_current_header() + ip_current_header_tot_len()))
-/** Source IP4 address of current_header */
-#define ip4_current_src_addr()     (&ip_data.current_iphdr_src)
-/** Destination IP4 address of current_header */
-#define ip4_current_dest_addr()    (&ip_data.current_iphdr_dest)
-
-#elif LWIP_IPV6 /* LWIP_IPV4 && LWIP_IPV6 */
-
-/** Get the IPv6 header of the current packet.
- * This function must only be called from a receive callback (udp_recv,
- * raw_recv, tcp_accept). It will return NULL otherwise. */
-#define ip6_current_header()      ((const struct ip6_hdr*)(ip_data.current_ip6_header))
-/** Always returns TRUE when only supporting IPv6 only */
-#define ip_current_is_v6()        1
-/** Get the transport layer protocol */
-#define ip_current_header_proto() IP6H_NEXTH(ip6_current_header())
-/** Get the transport layer header */
-#define ip_next_header_ptr()     ((const void*)((const u8_t*)ip6_current_header()))
-/** Source IP6 address of current_header */
-#define ip6_current_src_addr()    (&ip_data.current_iphdr_src)
-/** Destination IP6 address of current_header */
-#define ip6_current_dest_addr()   (&ip_data.current_iphdr_dest)
-
-#endif /* LWIP_IPV6 */
-
-/** Union source address of current_header */
-#define ip_current_src_addr()    (&ip_data.current_iphdr_src)
-/** Union destination address of current_header */
-#define ip_current_dest_addr()   (&ip_data.current_iphdr_dest)
-
-/** Gets an IP pcb option (SOF_* flags) */
-#define ip_get_option(pcb, opt)   ((pcb)->so_options & (opt))
-/** Sets an IP pcb option (SOF_* flags) */
-#define ip_set_option(pcb, opt)   ((pcb)->so_options |= (opt))
-/** Resets an IP pcb option (SOF_* flags) */
-#define ip_reset_option(pcb, opt) ((pcb)->so_options &= ~(opt))
-
-#if LWIP_IPV4 && LWIP_IPV6
-/**
- * @ingroup ip
- * Output IP packet, netif is selected by source address
- */
-#define ip_output(p, src, dest, ttl, tos, proto) \
-        (IP_IS_V6(dest) ? \
-        ip6_output(p, ip_2_ip6(src), ip_2_ip6(dest), ttl, tos, proto) : \
-        ip4_output(p, ip_2_ip4(src), ip_2_ip4(dest), ttl, tos, proto))
-/**
- * @ingroup ip
- * Output IP packet to specified interface
- */
-#define ip_output_if(p, src, dest, ttl, tos, proto, netif) \
-        (IP_IS_V6(dest) ? \
-        ip6_output_if(p, ip_2_ip6(src), ip_2_ip6(dest), ttl, tos, proto, netif) : \
-        ip4_output_if(p, ip_2_ip4(src), ip_2_ip4(dest), ttl, tos, proto, netif))
-/**
- * @ingroup ip
- * Output IP packet to interface specifying source address
- */
-#define ip_output_if_src(p, src, dest, ttl, tos, proto, netif) \
-        (IP_IS_V6(dest) ? \
-        ip6_output_if_src(p, ip_2_ip6(src), ip_2_ip6(dest), ttl, tos, proto, netif) : \
-        ip4_output_if_src(p, ip_2_ip4(src), ip_2_ip4(dest), ttl, tos, proto, netif))
-/** Output IP packet with addr_hint */
-#define ip_output_hinted(p, src, dest, ttl, tos, proto, addr_hint) \
-        (IP_IS_V6(dest) ? \
-        ip6_output_hinted(p, ip_2_ip6(src), ip_2_ip6(dest), ttl, tos, proto, addr_hint) : \
-        ip4_output_hinted(p, ip_2_ip4(src), ip_2_ip4(dest), ttl, tos, proto, addr_hint))
-/**
- * @ingroup ip
- * Get netif for address combination. See \ref ip6_route and \ref ip4_route
- */
-#define ip_route(src, dest) \
-        (IP_IS_V6(dest) ? \
-        ip6_route(ip_2_ip6(src), ip_2_ip6(dest)) : \
-        ip4_route_src(ip_2_ip4(dest), ip_2_ip4(src)))
-/**
- * @ingroup ip
- * Get netif for IP.
- */
-#define ip_netif_get_local_ip(netif, dest) (IP_IS_V6(dest) ? \
-        ip6_netif_get_local_ip(netif, ip_2_ip6(dest)) : \
-        ip4_netif_get_local_ip(netif))
-#define ip_debug_print(is_ipv6, p) ((is_ipv6) ? ip6_debug_print(p) : ip4_debug_print(p))
-
-err_t ip_input(struct pbuf *p, struct netif *inp);
-
-#elif LWIP_IPV4 /* LWIP_IPV4 && LWIP_IPV6 */
-
-#define ip_output(p, src, dest, ttl, tos, proto) \
-        ip4_output(p, src, dest, ttl, tos, proto)
-#define ip_output_if(p, src, dest, ttl, tos, proto, netif) \
-        ip4_output_if(p, src, dest, ttl, tos, proto, netif)
-#define ip_output_if_src(p, src, dest, ttl, tos, proto, netif) \
-        ip4_output_if_src(p, src, dest, ttl, tos, proto, netif)
-#define ip_output_hinted(p, src, dest, ttl, tos, proto, addr_hint) \
-        ip4_output_hinted(p, src, dest, ttl, tos, proto, addr_hint)
-#define ip_route(src, dest) \
-        ip4_route_src(dest, src)
-#define ip_netif_get_local_ip(netif, dest) \
-        ip4_netif_get_local_ip(netif)
-#define ip_debug_print(is_ipv6, p) ip4_debug_print(p)
-
-#define ip_input ip4_input
-
-#elif LWIP_IPV6 /* LWIP_IPV4 && LWIP_IPV6 */
-
-#define ip_output(p, src, dest, ttl, tos, proto) \
-        ip6_output(p, src, dest, ttl, tos, proto)
-#define ip_output_if(p, src, dest, ttl, tos, proto, netif) \
-        ip6_output_if(p, src, dest, ttl, tos, proto, netif)
-#define ip_output_if_src(p, src, dest, ttl, tos, proto, netif) \
-        ip6_output_if_src(p, src, dest, ttl, tos, proto, netif)
-#define ip_output_hinted(p, src, dest, ttl, tos, proto, addr_hint) \
-        ip6_output_hinted(p, src, dest, ttl, tos, proto, addr_hint)
-#define ip_route(src, dest) \
-        ip6_route(src, dest)
-#define ip_netif_get_local_ip(netif, dest) \
-        ip6_netif_get_local_ip(netif, dest)
-#define ip_debug_print(is_ipv6, p) ip6_debug_print(p)
-
-#define ip_input ip6_input
-
-#endif /* LWIP_IPV6 */
-
-#define ip_route_get_local_ip(src, dest, netif, ipaddr) do { \
-  (netif) = ip_route(src, dest); \
-  (ipaddr) = ip_netif_get_local_ip(netif, dest); \
-}while(0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_IP_H */
-
-
diff --git a/sys/include/net/ip4.h b/sys/include/net/ip4.h
deleted file mode 100644
index 79e1220..0000000
--- a/sys/include/net/ip4.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * @file
- * IPv4 API
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_IP4_H
-#define LWIP_HDR_IP4_H
-
-#include "net/opt.h"
-
-#if LWIP_IPV4
-
-#include "net/def.h"
-#include "net/pbuf.h"
-#include "net/ip4_addr.h"
-#include "net/err.h"
-#include "net/netif.h"
-#include "net/prot/ip4.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef LWIP_HOOK_IP4_ROUTE_SRC
-#define LWIP_IPV4_SRC_ROUTING   1
-#else
-#define LWIP_IPV4_SRC_ROUTING   0
-#endif
-
-/** Currently, the function ip_output_if_opt() is only used with IGMP */
-#define IP_OPTIONS_SEND   (LWIP_IPV4 && LWIP_IGMP)
-
-#define ip_init() /* Compatibility define, no init needed. */
-struct netif *ip4_route(const ip4_addr_t *dest);
-#if LWIP_IPV4_SRC_ROUTING
-struct netif *ip4_route_src(const ip4_addr_t *dest, const ip4_addr_t *src);
-#else /* LWIP_IPV4_SRC_ROUTING */
-#define ip4_route_src(dest, src) ip4_route(dest)
-#endif /* LWIP_IPV4_SRC_ROUTING */
-err_t ip4_input(struct pbuf *p, struct netif *inp);
-err_t ip4_output(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-       u8_t ttl, u8_t tos, u8_t proto);
-err_t ip4_output_if(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-       u8_t ttl, u8_t tos, u8_t proto, struct netif *netif);
-err_t ip4_output_if_src(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-       u8_t ttl, u8_t tos, u8_t proto, struct netif *netif);
-#if LWIP_NETIF_HWADDRHINT
-err_t ip4_output_hinted(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-       u8_t ttl, u8_t tos, u8_t proto, u8_t *addr_hint);
-#endif /* LWIP_NETIF_HWADDRHINT */
-#if IP_OPTIONS_SEND
-err_t ip4_output_if_opt(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-       u8_t ttl, u8_t tos, u8_t proto, struct netif *netif, void *ip_options,
-       u16_t optlen);
-err_t ip4_output_if_opt_src(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-       u8_t ttl, u8_t tos, u8_t proto, struct netif *netif, void *ip_options,
-       u16_t optlen);
-#endif /* IP_OPTIONS_SEND */
-
-#if LWIP_MULTICAST_TX_OPTIONS
-void  ip4_set_default_multicast_netif(struct netif* default_multicast_netif);
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-
-#define ip4_netif_get_local_ip(netif) (((netif) != NULL) ? netif_ip_addr4(netif) : NULL)
-
-#if IP_DEBUG
-void ip4_debug_print(struct pbuf *p);
-#else
-#define ip4_debug_print(p)
-#endif /* IP_DEBUG */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV4 */
-
-#endif /* LWIP_HDR_IP_H */
-
-
diff --git a/sys/include/net/ip4_addr.h b/sys/include/net/ip4_addr.h
deleted file mode 100644
index 52d3c96..0000000
--- a/sys/include/net/ip4_addr.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/**
- * @file
- * IPv4 address API
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_IP4_ADDR_H
-#define LWIP_HDR_IP4_ADDR_H
-
-#include <net/opt.h>
-#include <net/def.h>
-
-#if LWIP_IPV4
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This is the aligned version of ip4_addr_t,
-   used as local variable, on the stack, etc. */
-struct ip4_addr {
-  u32_t addr;
-};
-
-/** ip4_addr_t uses a struct for convenience only, so that the same defines can
- * operate both on ip4_addr_t as well as on ip4_addr_p_t. */
-typedef struct ip4_addr ip4_addr_t;
-
-/**
- * struct ipaddr2 is used in the definition of the ARP packet format in
- * order to support compilers that don't have structure packing.
- */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ip4_addr2 {
-  PACK_STRUCT_FIELD(u16_t addrw[2]);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/* Forward declaration to not include netif.h */
-struct netif;
-
-/** 255.255.255.255 */
-#define IPADDR_NONE         ((u32_t)0xffffffffUL)
-/** 127.0.0.1 */
-#define IPADDR_LOOPBACK     ((u32_t)0x7f000001UL)
-/** 0.0.0.0 */
-#define IPADDR_ANY          ((u32_t)0x00000000UL)
-/** 255.255.255.255 */
-#define IPADDR_BROADCAST    ((u32_t)0xffffffffUL)
-
-/* Definitions of the bits in an Internet address integer.
-
-   On subnets, host and network parts are found according to
-   the subnet mask, not these masks.  */
-#define IP_CLASSA(a)        ((((u32_t)(a)) & 0x80000000UL) == 0)
-#define IP_CLASSA_NET       0xff000000
-#define IP_CLASSA_NSHIFT    24
-#define IP_CLASSA_HOST      (0xffffffff & ~IP_CLASSA_NET)
-#define IP_CLASSA_MAX       128
-
-#define IP_CLASSB(a)        ((((u32_t)(a)) & 0xc0000000UL) == 0x80000000UL)
-#define IP_CLASSB_NET       0xffff0000
-#define IP_CLASSB_NSHIFT    16
-#define IP_CLASSB_HOST      (0xffffffff & ~IP_CLASSB_NET)
-#define IP_CLASSB_MAX       65536
-
-#define IP_CLASSC(a)        ((((u32_t)(a)) & 0xe0000000UL) == 0xc0000000UL)
-#define IP_CLASSC_NET       0xffffff00
-#define IP_CLASSC_NSHIFT    8
-#define IP_CLASSC_HOST      (0xffffffff & ~IP_CLASSC_NET)
-
-#define IP_CLASSD(a)        (((u32_t)(a) & 0xf0000000UL) == 0xe0000000UL)
-#define IP_CLASSD_NET       0xf0000000          /* These ones aren't really */
-#define IP_CLASSD_NSHIFT    28                  /*   net and host fields, but */
-#define IP_CLASSD_HOST      0x0fffffff          /*   routing needn't know. */
-#define IP_MULTICAST(a)     IP_CLASSD(a)
-
-#define IP_EXPERIMENTAL(a)  (((u32_t)(a) & 0xf0000000UL) == 0xf0000000UL)
-#define IP_BADCLASS(a)      (((u32_t)(a) & 0xf0000000UL) == 0xf0000000UL)
-
-#define IP_LOOPBACKNET      127                 /* official! */
-
-/** Set an IP address given by the four byte-parts */
-#define IP4_ADDR(ipaddr, a,b,c,d)  (ipaddr)->addr = PP_HTONL(LWIP_MAKEU32(a,b,c,d))
-
-/** MEMCPY-like copying of IP addresses where addresses are known to be
- * 16-bit-aligned if the port is correctly configured (so a port could define
- * this to copying 2 u16_t's) - no NULL-pointer-checking needed. */
-#ifndef IPADDR2_COPY
-#define IPADDR2_COPY(dest, src) SMEMCPY(dest, src, sizeof(ip4_addr_t))
-#endif
-
-/** Copy IP address - faster than ip4_addr_set: no NULL check */
-#define ip4_addr_copy(dest, src) ((dest).addr = (src).addr)
-/** Safely copy one IP address to another (src may be NULL) */
-#define ip4_addr_set(dest, src) ((dest)->addr = \
-                                    ((src) == NULL ? 0 : \
-                                    (src)->addr))
-/** Set complete address to zero */
-#define ip4_addr_set_zero(ipaddr)     ((ipaddr)->addr = 0)
-/** Set address to IPADDR_ANY (no need for lwip_htonl()) */
-#define ip4_addr_set_any(ipaddr)      ((ipaddr)->addr = IPADDR_ANY)
-/** Set address to loopback address */
-#define ip4_addr_set_loopback(ipaddr) ((ipaddr)->addr = PP_HTONL(IPADDR_LOOPBACK))
-/** Check if an address is in the loopback region */
-#define ip4_addr_isloopback(ipaddr)    (((ipaddr)->addr & PP_HTONL(IP_CLASSA_NET)) == PP_HTONL(((u32_t)IP_LOOPBACKNET) << 24))
-/** Safely copy one IP address to another and change byte order
- * from host- to network-order. */
-#define ip4_addr_set_hton(dest, src) ((dest)->addr = \
-                               ((src) == NULL ? 0:\
-                               lwip_htonl((src)->addr)))
-/** IPv4 only: set the IP address given as an u32_t */
-#define ip4_addr_set_u32(dest_ipaddr, src_u32) ((dest_ipaddr)->addr = (src_u32))
-/** IPv4 only: get the IP address as an u32_t */
-#define ip4_addr_get_u32(src_ipaddr) ((src_ipaddr)->addr)
-
-/** Get the network address by combining host address with netmask */
-#define ip4_addr_get_network(target, host, netmask) do { ((target)->addr = ((host)->addr) & ((netmask)->addr)); } while(0)
-
-/**
- * Determine if two address are on the same network.
- *
- * @arg addr1 IP address 1
- * @arg addr2 IP address 2
- * @arg mask network identifier mask
- * @return !0 if the network identifiers of both address match
- */
-#define ip4_addr_netcmp(addr1, addr2, mask) (((addr1)->addr & \
-                                              (mask)->addr) == \
-                                             ((addr2)->addr & \
-                                              (mask)->addr))
-#define ip4_addr_cmp(addr1, addr2) ((addr1)->addr == (addr2)->addr)
-
-#define ip4_addr_isany_val(addr1)   ((addr1).addr == IPADDR_ANY)
-#define ip4_addr_isany(addr1) ((addr1) == NULL || ip4_addr_isany_val(*(addr1)))
-
-#define ip4_addr_isbroadcast(addr1, netif) ip4_addr_isbroadcast_u32((addr1)->addr, netif)
-u8_t ip4_addr_isbroadcast_u32(u32_t addr, const struct netif *netif);
-
-#define ip_addr_netmask_valid(netmask) ip4_addr_netmask_valid((netmask)->addr)
-u8_t ip4_addr_netmask_valid(u32_t netmask);
-
-#define ip4_addr_ismulticast(addr1) (((addr1)->addr & PP_HTONL(0xf0000000UL)) == PP_HTONL(0xe0000000UL))
-
-#define ip4_addr_islinklocal(addr1) (((addr1)->addr & PP_HTONL(0xffff0000UL)) == PP_HTONL(0xa9fe0000UL))
-
-#define ip4_addr_debug_print_parts(debug, a, b, c, d) \
-  LWIP_DEBUGF(debug, ("%" U16_F ".%" U16_F ".%" U16_F ".%" U16_F, a, b, c, d))
-#define ip4_addr_debug_print(debug, ipaddr) \
-  ip4_addr_debug_print_parts(debug, \
-                      (u16_t)((ipaddr) != NULL ? ip4_addr1_16(ipaddr) : 0),       \
-                      (u16_t)((ipaddr) != NULL ? ip4_addr2_16(ipaddr) : 0),       \
-                      (u16_t)((ipaddr) != NULL ? ip4_addr3_16(ipaddr) : 0),       \
-                      (u16_t)((ipaddr) != NULL ? ip4_addr4_16(ipaddr) : 0))
-#define ip4_addr_debug_print_val(debug, ipaddr) \
-  ip4_addr_debug_print_parts(debug, \
-                      ip4_addr1_16(&(ipaddr)),       \
-                      ip4_addr2_16(&(ipaddr)),       \
-                      ip4_addr3_16(&(ipaddr)),       \
-                      ip4_addr4_16(&(ipaddr)))
-
-/* Get one byte from the 4-byte address */
-#define ip4_addr1(ipaddr) (((const u8_t*)(&(ipaddr)->addr))[0])
-#define ip4_addr2(ipaddr) (((const u8_t*)(&(ipaddr)->addr))[1])
-#define ip4_addr3(ipaddr) (((const u8_t*)(&(ipaddr)->addr))[2])
-#define ip4_addr4(ipaddr) (((const u8_t*)(&(ipaddr)->addr))[3])
-/* These are cast to u16_t, with the intent that they are often arguments
- * to printf using the U16_F format from cc.h. */
-#define ip4_addr1_16(ipaddr) ((u16_t)ip4_addr1(ipaddr))
-#define ip4_addr2_16(ipaddr) ((u16_t)ip4_addr2(ipaddr))
-#define ip4_addr3_16(ipaddr) ((u16_t)ip4_addr3(ipaddr))
-#define ip4_addr4_16(ipaddr) ((u16_t)ip4_addr4(ipaddr))
-
-#define IP4ADDR_STRLEN_MAX  16
-
-/** For backwards compatibility */
-#define ip_ntoa(ipaddr)  ipaddr_ntoa(ipaddr)
-
-u32_t ipaddr_addr(const char *cp);
-int ip4addr_aton(const char *cp, ip4_addr_t *addr);
-/** returns ptr to static buffer; not reentrant! */
-char *ip4addr_ntoa(const ip4_addr_t *addr);
-char *ip4addr_ntoa_r(const ip4_addr_t *addr, char *buf, int buflen);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV4 */
-
-#endif /* LWIP_HDR_IP_ADDR_H */
diff --git a/sys/include/net/ip4_frag.h b/sys/include/net/ip4_frag.h
deleted file mode 100644
index b69d71d..0000000
--- a/sys/include/net/ip4_frag.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * @file
- * IP fragmentation/reassembly
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Jani Monoses <jani@iv.ro>
- *
- */
-
-#ifndef LWIP_HDR_IP4_FRAG_H
-#define LWIP_HDR_IP4_FRAG_H
-
-#include "net/opt.h"
-#include "net/err.h"
-#include "net/pbuf.h"
-#include "net/netif.h"
-#include "net/ip_addr.h"
-#include "net/ip.h"
-
-#if LWIP_IPV4
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if IP_REASSEMBLY
-/* The IP reassembly timer interval in milliseconds. */
-#define IP_TMR_INTERVAL 1000
-
-/** IP reassembly helper struct.
- * This is exported because memp needs to know the size.
- */
-struct ip_reassdata {
-  struct ip_reassdata *next;
-  struct pbuf *p;
-  struct ip_hdr iphdr;
-  u16_t datagram_len;
-  u8_t flags;
-  u8_t timer;
-};
-
-void ip_reass_init(void);
-void ip_reass_tmr(void);
-struct pbuf * ip4_reass(struct pbuf *p);
-#endif /* IP_REASSEMBLY */
-
-#if IP_FRAG
-#if !LWIP_NETIF_TX_SINGLE_PBUF
-#ifndef LWIP_PBUF_CUSTOM_REF_DEFINED
-#define LWIP_PBUF_CUSTOM_REF_DEFINED
-/** A custom pbuf that holds a reference to another pbuf, which is freed
- * when this custom pbuf is freed. This is used to create a custom PBUF_REF
- * that points into the original pbuf. */
-struct pbuf_custom_ref {
-  /** 'base class' */
-  struct pbuf_custom pc;
-  /** pointer to the original pbuf that is referenced */
-  struct pbuf *original;
-};
-#endif /* LWIP_PBUF_CUSTOM_REF_DEFINED */
-#endif /* !LWIP_NETIF_TX_SINGLE_PBUF */
-
-err_t ip4_frag(struct pbuf *p, struct netif *netif, const ip4_addr_t *dest);
-#endif /* IP_FRAG */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV4 */
-
-#endif /* LWIP_HDR_IP4_FRAG_H */
diff --git a/sys/include/net/ip6.h b/sys/include/net/ip6.h
deleted file mode 100644
index acc6b4b..0000000
--- a/sys/include/net/ip6.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * @file
- *
- * IPv6 layer.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-#ifndef LWIP_HDR_IP6_H
-#define LWIP_HDR_IP6_H
-
-#include "net/opt.h"
-
-#if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
-
-#include "net/ip6_addr.h"
-#include "net/prot/ip6.h"
-#include "net/def.h"
-#include "net/pbuf.h"
-#include "net/netif.h"
-
-#include "net/err.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct netif *ip6_route(const ip6_addr_t *src, const ip6_addr_t *dest);
-const ip_addr_t *ip6_select_source_address(struct netif *netif, const ip6_addr_t * dest);
-err_t         ip6_input(struct pbuf *p, struct netif *inp);
-err_t         ip6_output(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
-                         u8_t hl, u8_t tc, u8_t nexth);
-err_t         ip6_output_if(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
-                            u8_t hl, u8_t tc, u8_t nexth, struct netif *netif);
-err_t         ip6_output_if_src(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
-                            u8_t hl, u8_t tc, u8_t nexth, struct netif *netif);
-#if LWIP_NETIF_HWADDRHINT
-err_t         ip6_output_hinted(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
-                                u8_t hl, u8_t tc, u8_t nexth, u8_t *addr_hint);
-#endif /* LWIP_NETIF_HWADDRHINT */
-#if LWIP_IPV6_MLD
-err_t         ip6_options_add_hbh_ra(struct pbuf * p, u8_t nexth, u8_t value);
-#endif /* LWIP_IPV6_MLD */
-
-#define ip6_netif_get_local_ip(netif, dest) (((netif) != NULL) ? \
-  ip6_select_source_address(netif, dest) : NULL)
-
-#if IP6_DEBUG
-void ip6_debug_print(struct pbuf *p);
-#else
-#define ip6_debug_print(p)
-#endif /* IP6_DEBUG */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV6 */
-
-#endif /* LWIP_HDR_IP6_H */
diff --git a/sys/include/net/ip6_addr.h b/sys/include/net/ip6_addr.h
deleted file mode 100644
index 845a60c..0000000
--- a/sys/include/net/ip6_addr.h
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- * @file
- *
- * IPv6 addresses.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- * Structs and macros for handling IPv6 addresses.
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-#ifndef LWIP_HDR_IP6_ADDR_H
-#define LWIP_HDR_IP6_ADDR_H
-
-#include <net/opt.h>
-#include <net/def.h>
-
-#if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/** This is the aligned version of ip6_addr_t,
-    used as local variable, on the stack, etc. */
-struct ip6_addr {
-  u32_t addr[4];
-};
-
-/** IPv6 address */
-typedef struct ip6_addr ip6_addr_t;
-
-/** Set an IPv6 partial address given by byte-parts */
-#define IP6_ADDR_PART(ip6addr, index, a,b,c,d) \
-  (ip6addr)->addr[index] = PP_HTONL(LWIP_MAKEU32(a,b,c,d))
-
-/** Set a full IPv6 address by passing the 4 u32_t indices in network byte order
-    (use PP_HTONL() for constants) */
-#define IP6_ADDR(ip6addr, idx0, idx1, idx2, idx3) do { \
-  (ip6addr)->addr[0] = idx0; \
-  (ip6addr)->addr[1] = idx1; \
-  (ip6addr)->addr[2] = idx2; \
-  (ip6addr)->addr[3] = idx3; } while(0)
-
-/** Access address in 16-bit block */
-#define IP6_ADDR_BLOCK1(ip6addr) ((u16_t)((lwip_htonl((ip6addr)->addr[0]) >> 16) & 0xffff))
-/** Access address in 16-bit block */
-#define IP6_ADDR_BLOCK2(ip6addr) ((u16_t)((lwip_htonl((ip6addr)->addr[0])) & 0xffff))
-/** Access address in 16-bit block */
-#define IP6_ADDR_BLOCK3(ip6addr) ((u16_t)((lwip_htonl((ip6addr)->addr[1]) >> 16) & 0xffff))
-/** Access address in 16-bit block */
-#define IP6_ADDR_BLOCK4(ip6addr) ((u16_t)((lwip_htonl((ip6addr)->addr[1])) & 0xffff))
-/** Access address in 16-bit block */
-#define IP6_ADDR_BLOCK5(ip6addr) ((u16_t)((lwip_htonl((ip6addr)->addr[2]) >> 16) & 0xffff))
-/** Access address in 16-bit block */
-#define IP6_ADDR_BLOCK6(ip6addr) ((u16_t)((lwip_htonl((ip6addr)->addr[2])) & 0xffff))
-/** Access address in 16-bit block */
-#define IP6_ADDR_BLOCK7(ip6addr) ((u16_t)((lwip_htonl((ip6addr)->addr[3]) >> 16) & 0xffff))
-/** Access address in 16-bit block */
-#define IP6_ADDR_BLOCK8(ip6addr) ((u16_t)((lwip_htonl((ip6addr)->addr[3])) & 0xffff))
-
-/** Copy IPv6 address - faster than ip6_addr_set: no NULL check */
-#define ip6_addr_copy(dest, src) do{(dest).addr[0] = (src).addr[0]; \
-                                    (dest).addr[1] = (src).addr[1]; \
-                                    (dest).addr[2] = (src).addr[2]; \
-                                    (dest).addr[3] = (src).addr[3];}while(0)
-/** Safely copy one IPv6 address to another (src may be NULL) */
-#define ip6_addr_set(dest, src) do{(dest)->addr[0] = (src) == NULL ? 0 : (src)->addr[0]; \
-                                   (dest)->addr[1] = (src) == NULL ? 0 : (src)->addr[1]; \
-                                   (dest)->addr[2] = (src) == NULL ? 0 : (src)->addr[2]; \
-                                   (dest)->addr[3] = (src) == NULL ? 0 : (src)->addr[3];}while(0)
-
-/** Set complete address to zero */
-#define ip6_addr_set_zero(ip6addr)    do{(ip6addr)->addr[0] = 0; \
-                                         (ip6addr)->addr[1] = 0; \
-                                         (ip6addr)->addr[2] = 0; \
-                                         (ip6addr)->addr[3] = 0;}while(0)
-
-/** Set address to ipv6 'any' (no need for lwip_htonl()) */
-#define ip6_addr_set_any(ip6addr)       ip6_addr_set_zero(ip6addr)
-/** Set address to ipv6 loopback address */
-#define ip6_addr_set_loopback(ip6addr) do{(ip6addr)->addr[0] = 0; \
-                                          (ip6addr)->addr[1] = 0; \
-                                          (ip6addr)->addr[2] = 0; \
-                                          (ip6addr)->addr[3] = PP_HTONL(0x00000001UL);}while(0)
-/** Safely copy one IPv6 address to another and change byte order
- * from host- to network-order. */
-#define ip6_addr_set_hton(dest, src) do{(dest)->addr[0] = (src) == NULL ? 0 : lwip_htonl((src)->addr[0]); \
-                                        (dest)->addr[1] = (src) == NULL ? 0 : lwip_htonl((src)->addr[1]); \
-                                        (dest)->addr[2] = (src) == NULL ? 0 : lwip_htonl((src)->addr[2]); \
-                                        (dest)->addr[3] = (src) == NULL ? 0 : lwip_htonl((src)->addr[3]);}while(0)
-
-
-/**
- * Determine if two IPv6 address are on the same network.
- *
- * @arg addr1 IPv6 address 1
- * @arg addr2 IPv6 address 2
- * @return !0 if the network identifiers of both address match
- */
-#define ip6_addr_netcmp(addr1, addr2) (((addr1)->addr[0] == (addr2)->addr[0]) && \
-                                       ((addr1)->addr[1] == (addr2)->addr[1]))
-
-#define ip6_addr_cmp(addr1, addr2) (((addr1)->addr[0] == (addr2)->addr[0]) && \
-                                    ((addr1)->addr[1] == (addr2)->addr[1]) && \
-                                    ((addr1)->addr[2] == (addr2)->addr[2]) && \
-                                    ((addr1)->addr[3] == (addr2)->addr[3]))
-
-#define ip6_get_subnet_id(ip6addr)   (lwip_htonl((ip6addr)->addr[2]) & 0x0000ffffUL)
-
-#define ip6_addr_isany_val(ip6addr) (((ip6addr).addr[0] == 0) && \
-                                     ((ip6addr).addr[1] == 0) && \
-                                     ((ip6addr).addr[2] == 0) && \
-                                     ((ip6addr).addr[3] == 0))
-#define ip6_addr_isany(ip6addr) (((ip6addr) == NULL) || ip6_addr_isany_val(*(ip6addr)))
-
-#define ip6_addr_isloopback(ip6addr) (((ip6addr)->addr[0] == 0UL) && \
-                                      ((ip6addr)->addr[1] == 0UL) && \
-                                      ((ip6addr)->addr[2] == 0UL) && \
-                                      ((ip6addr)->addr[3] == PP_HTONL(0x00000001UL)))
-
-#define ip6_addr_isglobal(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xe0000000UL)) == PP_HTONL(0x20000000UL))
-
-#define ip6_addr_islinklocal(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xffc00000UL)) == PP_HTONL(0xfe800000UL))
-
-#define ip6_addr_issitelocal(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xffc00000UL)) == PP_HTONL(0xfec00000UL))
-
-#define ip6_addr_isuniquelocal(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xfe000000UL)) == PP_HTONL(0xfc000000UL))
-
-#define ip6_addr_isipv4mappedipv6(ip6addr) (((ip6addr)->addr[0] == 0) && ((ip6addr)->addr[1] == 0) && (((ip6addr)->addr[2]) == PP_HTONL(0x0000FFFFUL)))
-
-#define ip6_addr_ismulticast(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xff000000UL)) == PP_HTONL(0xff000000UL))
-#define ip6_addr_multicast_transient_flag(ip6addr)  ((ip6addr)->addr[0] & PP_HTONL(0x00100000UL))
-#define ip6_addr_multicast_prefix_flag(ip6addr)     ((ip6addr)->addr[0] & PP_HTONL(0x00200000UL))
-#define ip6_addr_multicast_rendezvous_flag(ip6addr) ((ip6addr)->addr[0] & PP_HTONL(0x00400000UL))
-#define ip6_addr_multicast_scope(ip6addr) ((lwip_htonl((ip6addr)->addr[0]) >> 16) & 0xf)
-#define IP6_MULTICAST_SCOPE_RESERVED            0x0
-#define IP6_MULTICAST_SCOPE_RESERVED0           0x0
-#define IP6_MULTICAST_SCOPE_INTERFACE_LOCAL     0x1
-#define IP6_MULTICAST_SCOPE_LINK_LOCAL          0x2
-#define IP6_MULTICAST_SCOPE_RESERVED3           0x3
-#define IP6_MULTICAST_SCOPE_ADMIN_LOCAL         0x4
-#define IP6_MULTICAST_SCOPE_SITE_LOCAL          0x5
-#define IP6_MULTICAST_SCOPE_ORGANIZATION_LOCAL  0x8
-#define IP6_MULTICAST_SCOPE_GLOBAL              0xe
-#define IP6_MULTICAST_SCOPE_RESERVEDF           0xf
-#define ip6_addr_ismulticast_iflocal(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xff8f0000UL)) == PP_HTONL(0xff010000UL))
-#define ip6_addr_ismulticast_linklocal(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xff8f0000UL)) == PP_HTONL(0xff020000UL))
-#define ip6_addr_ismulticast_adminlocal(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xff8f0000UL)) == PP_HTONL(0xff040000UL))
-#define ip6_addr_ismulticast_sitelocal(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xff8f0000UL)) == PP_HTONL(0xff050000UL))
-#define ip6_addr_ismulticast_orglocal(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xff8f0000UL)) == PP_HTONL(0xff080000UL))
-#define ip6_addr_ismulticast_global(ip6addr) (((ip6addr)->addr[0] & PP_HTONL(0xff8f0000UL)) == PP_HTONL(0xff0e0000UL))
-
-/* @todo define get/set for well-know multicast addresses, e.g. ff02::1 */
-#define ip6_addr_isallnodes_iflocal(ip6addr) (((ip6addr)->addr[0] == PP_HTONL(0xff010000UL)) && \
-    ((ip6addr)->addr[1] == 0UL) && \
-    ((ip6addr)->addr[2] == 0UL) && \
-    ((ip6addr)->addr[3] == PP_HTONL(0x00000001UL)))
-
-#define ip6_addr_isallnodes_linklocal(ip6addr) (((ip6addr)->addr[0] == PP_HTONL(0xff020000UL)) && \
-    ((ip6addr)->addr[1] == 0UL) && \
-    ((ip6addr)->addr[2] == 0UL) && \
-    ((ip6addr)->addr[3] == PP_HTONL(0x00000001UL)))
-#define ip6_addr_set_allnodes_linklocal(ip6addr) do{(ip6addr)->addr[0] = PP_HTONL(0xff020000UL); \
-                (ip6addr)->addr[1] = 0; \
-                (ip6addr)->addr[2] = 0; \
-                (ip6addr)->addr[3] = PP_HTONL(0x00000001UL);}while(0)
-
-#define ip6_addr_isallrouters_linklocal(ip6addr) (((ip6addr)->addr[0] == PP_HTONL(0xff020000UL)) && \
-    ((ip6addr)->addr[1] == 0UL) && \
-    ((ip6addr)->addr[2] == 0UL) && \
-    ((ip6addr)->addr[3] == PP_HTONL(0x00000002UL)))
-#define ip6_addr_set_allrouters_linklocal(ip6addr) do{(ip6addr)->addr[0] = PP_HTONL(0xff020000UL); \
-                (ip6addr)->addr[1] = 0; \
-                (ip6addr)->addr[2] = 0; \
-                (ip6addr)->addr[3] = PP_HTONL(0x00000002UL);}while(0)
-
-#define ip6_addr_issolicitednode(ip6addr) ( ((ip6addr)->addr[0] == PP_HTONL(0xff020000UL)) && \
-        ((ip6addr)->addr[2] == PP_HTONL(0x00000001UL)) && \
-        (((ip6addr)->addr[3] & PP_HTONL(0xff000000UL)) == PP_HTONL(0xff000000UL)) )
-
-#define ip6_addr_set_solicitednode(ip6addr, if_id) do{(ip6addr)->addr[0] = PP_HTONL(0xff020000UL); \
-                (ip6addr)->addr[1] = 0; \
-                (ip6addr)->addr[2] = PP_HTONL(0x00000001UL); \
-                (ip6addr)->addr[3] = (PP_HTONL(0xff000000UL) | (if_id));}while(0)
-
-#define ip6_addr_cmp_solicitednode(ip6addr, sn_addr) (((ip6addr)->addr[0] == PP_HTONL(0xff020000UL)) && \
-                                    ((ip6addr)->addr[1] == 0) && \
-                                    ((ip6addr)->addr[2] == PP_HTONL(0x00000001UL)) && \
-                                    ((ip6addr)->addr[3] == (PP_HTONL(0xff000000UL) | (sn_addr)->addr[3])))
-
-/* IPv6 address states. */
-#define IP6_ADDR_INVALID      0x00
-#define IP6_ADDR_TENTATIVE    0x08
-#define IP6_ADDR_TENTATIVE_1  0x09 /* 1 probe sent */
-#define IP6_ADDR_TENTATIVE_2  0x0a /* 2 probes sent */
-#define IP6_ADDR_TENTATIVE_3  0x0b /* 3 probes sent */
-#define IP6_ADDR_TENTATIVE_4  0x0c /* 4 probes sent */
-#define IP6_ADDR_TENTATIVE_5  0x0d /* 5 probes sent */
-#define IP6_ADDR_TENTATIVE_6  0x0e /* 6 probes sent */
-#define IP6_ADDR_TENTATIVE_7  0x0f /* 7 probes sent */
-#define IP6_ADDR_VALID        0x10 /* This bit marks an address as valid (preferred or deprecated) */
-#define IP6_ADDR_PREFERRED    0x30
-#define IP6_ADDR_DEPRECATED   0x10 /* Same as VALID (valid but not preferred) */
-
-#define IP6_ADDR_TENTATIVE_COUNT_MASK 0x07 /* 1-7 probes sent */
-
-#define ip6_addr_isinvalid(addr_state) (addr_state == IP6_ADDR_INVALID)
-#define ip6_addr_istentative(addr_state) (addr_state & IP6_ADDR_TENTATIVE)
-#define ip6_addr_isvalid(addr_state) (addr_state & IP6_ADDR_VALID) /* Include valid, preferred, and deprecated. */
-#define ip6_addr_ispreferred(addr_state) (addr_state == IP6_ADDR_PREFERRED)
-#define ip6_addr_isdeprecated(addr_state) (addr_state == IP6_ADDR_DEPRECATED)
-
-#define ip6_addr_debug_print_parts(debug, a, b, c, d, e, f, g, h) \
-  LWIP_DEBUGF(debug, ("%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F ":%" X16_F, \
-                      a, b, c, d, e, f, g, h))
-#define ip6_addr_debug_print(debug, ipaddr) \
-  ip6_addr_debug_print_parts(debug, \
-                      (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK1(ipaddr) : 0),    \
-                      (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK2(ipaddr) : 0),    \
-                      (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK3(ipaddr) : 0),    \
-                      (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK4(ipaddr) : 0),    \
-                      (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK5(ipaddr) : 0),    \
-                      (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK6(ipaddr) : 0),    \
-                      (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK7(ipaddr) : 0),    \
-                      (u16_t)((ipaddr) != NULL ? IP6_ADDR_BLOCK8(ipaddr) : 0))
-#define ip6_addr_debug_print_val(debug, ipaddr) \
-  ip6_addr_debug_print_parts(debug, \
-                      IP6_ADDR_BLOCK1(&(ipaddr)),    \
-                      IP6_ADDR_BLOCK2(&(ipaddr)),    \
-                      IP6_ADDR_BLOCK3(&(ipaddr)),    \
-                      IP6_ADDR_BLOCK4(&(ipaddr)),    \
-                      IP6_ADDR_BLOCK5(&(ipaddr)),    \
-                      IP6_ADDR_BLOCK6(&(ipaddr)),    \
-                      IP6_ADDR_BLOCK7(&(ipaddr)),    \
-                      IP6_ADDR_BLOCK8(&(ipaddr)))
-
-#define IP6ADDR_STRLEN_MAX    46
-
-int ip6addr_aton(const char *cp, ip6_addr_t *addr);
-/** returns ptr to static buffer; not reentrant! */
-char *ip6addr_ntoa(const ip6_addr_t *addr);
-char *ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV6 */
-
-#endif /* LWIP_HDR_IP6_ADDR_H */
diff --git a/sys/include/net/ip6_frag.h b/sys/include/net/ip6_frag.h
deleted file mode 100644
index 8e65edc..0000000
--- a/sys/include/net/ip6_frag.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/**
- * @file
- *
- * IPv6 fragmentation and reassembly.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-#ifndef LWIP_HDR_IP6_FRAG_H
-#define LWIP_HDR_IP6_FRAG_H
-
-#include "net/opt.h"
-#include "net/pbuf.h"
-#include "net/ip6_addr.h"
-#include "net/ip6.h"
-#include "net/netif.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#if LWIP_IPV6 && LWIP_IPV6_REASS  /* don't build if not configured for use in lwipopts.h */
-
-/** IP6_FRAG_COPYHEADER==1: for platforms where sizeof(void*) > 4, this needs to
- * be enabled (to not overwrite part of the data). When enabled, the IPv6 header
- * is copied instead of referencing it, which gives more room for struct ip6_reass_helper */
-#ifndef IPV6_FRAG_COPYHEADER
-#define IPV6_FRAG_COPYHEADER   0
-#endif
-
-/** The IPv6 reassembly timer interval in milliseconds. */
-#define IP6_REASS_TMR_INTERVAL 1000
-
-/* Copy the complete header of the first fragment to struct ip6_reassdata
-   or just point to its original location in the first pbuf? */
-#if IPV6_FRAG_COPYHEADER
-#define IPV6_FRAG_HDRPTR
-#define IPV6_FRAG_HDRREF(hdr) (&(hdr))
-#else /* IPV6_FRAG_COPYHEADER */
-#define IPV6_FRAG_HDRPTR *
-#define IPV6_FRAG_HDRREF(hdr) (hdr)
-#endif /* IPV6_FRAG_COPYHEADER */
-
-/** IPv6 reassembly helper struct.
- * This is exported because memp needs to know the size.
- */
-struct ip6_reassdata {
-  struct ip6_reassdata *next;
-  struct pbuf *p;
-  struct ip6_hdr IPV6_FRAG_HDRPTR iphdr;
-  u32_t identification;
-  u16_t datagram_len;
-  u8_t nexth;
-  u8_t timer;
-};
-
-#define ip6_reass_init() /* Compatibility define */
-void ip6_reass_tmr(void);
-struct pbuf *ip6_reass(struct pbuf *p);
-
-#endif /* LWIP_IPV6 && LWIP_IPV6_REASS */
-
-#if LWIP_IPV6 && LWIP_IPV6_FRAG  /* don't build if not configured for use in lwipopts.h */
-
-#ifndef LWIP_PBUF_CUSTOM_REF_DEFINED
-#define LWIP_PBUF_CUSTOM_REF_DEFINED
-/** A custom pbuf that holds a reference to another pbuf, which is freed
- * when this custom pbuf is freed. This is used to create a custom PBUF_REF
- * that points into the original pbuf. */
-struct pbuf_custom_ref {
-  /** 'base class' */
-  struct pbuf_custom pc;
-  /** pointer to the original pbuf that is referenced */
-  struct pbuf *original;
-};
-#endif /* LWIP_PBUF_CUSTOM_REF_DEFINED */
-
-err_t ip6_frag(struct pbuf *p, struct netif *netif, const ip6_addr_t *dest);
-
-#endif /* LWIP_IPV6 && LWIP_IPV6_FRAG */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_IP6_FRAG_H */
diff --git a/sys/include/net/ip_addr.h b/sys/include/net/ip_addr.h
deleted file mode 100644
index 2abb791..0000000
--- a/sys/include/net/ip_addr.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/**
- * @file
- * IP address API (common IPv4 and IPv6)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_IP_ADDR_H
-#define LWIP_HDR_IP_ADDR_H
-
-#include <net/opt.h>
-#include <net/def.h>
-
-#include <net/ip4_addr.h>
-#include <net/ip6_addr.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @ingroup ipaddr
- * IP address types for use in ip_addr_t.type member.
- * @see tcp_new_ip_type(), udp_new_ip_type(), raw_new_ip_type().
- */
-enum lwip_ip_addr_type {
-  /** IPv4 */
-  IPADDR_TYPE_V4 =   0U,
-  /** IPv6 */
-  IPADDR_TYPE_V6 =   6U,
-  /** IPv4+IPv6 ("dual-stack") */
-  IPADDR_TYPE_ANY = 46U
-};
-
-#if LWIP_IPV4 && LWIP_IPV6
-/**
- * @ingroup ipaddr
- * A union struct for both IP version's addresses.
- * ATTENTION: watch out for its size when adding IPv6 address scope!
- */
-typedef struct ip_addr {
-  union {
-    ip6_addr_t ip6;
-    ip4_addr_t ip4;
-  } u_addr;
-  /** @ref lwip_ip_addr_type */
-  u8_t type;
-} ip_addr_t;
-
-extern const ip_addr_t ip_addr_any_type;
-
-/** @ingroup ip4addr */
-#define IPADDR4_INIT(u32val)          { { { { u32val, 0ul, 0ul, 0ul } } }, IPADDR_TYPE_V4 }
-/** @ingroup ip4addr */
-#define IPADDR4_INIT_BYTES(a,b,c,d)   IPADDR4_INIT(PP_HTONL(LWIP_MAKEU32(a,b,c,d)))
-/** @ingroup ip6addr */
-#define IPADDR6_INIT(a, b, c, d)      { { { { a, b, c, d } } }, IPADDR_TYPE_V6 }
-/** @ingroup ip6addr */
-#define IPADDR6_INIT_HOST(a, b, c, d) { { { { PP_HTONL(a), PP_HTONL(b), PP_HTONL(c), PP_HTONL(d) } } }, IPADDR_TYPE_V6 }
-
-/** @ingroup ipaddr */
-#define IP_IS_ANY_TYPE_VAL(ipaddr)    (IP_GET_TYPE(&ipaddr) == IPADDR_TYPE_ANY)
-/** @ingroup ipaddr */
-#define IPADDR_ANY_TYPE_INIT          { { { { 0ul, 0ul, 0ul, 0ul } } }, IPADDR_TYPE_ANY }
-
-/** @ingroup ip4addr */
-#define IP_IS_V4_VAL(ipaddr)          (IP_GET_TYPE(&ipaddr) == IPADDR_TYPE_V4)
-/** @ingroup ip6addr */
-#define IP_IS_V6_VAL(ipaddr)          (IP_GET_TYPE(&ipaddr) == IPADDR_TYPE_V6)
-/** @ingroup ip4addr */
-#define IP_IS_V4(ipaddr)              (((ipaddr) == NULL) || IP_IS_V4_VAL(*(ipaddr)))
-/** @ingroup ip6addr */
-#define IP_IS_V6(ipaddr)              (((ipaddr) != NULL) && IP_IS_V6_VAL(*(ipaddr)))
-
-#define IP_SET_TYPE_VAL(ipaddr, iptype) do { (ipaddr).type = (iptype); }while(0)
-#define IP_SET_TYPE(ipaddr, iptype)     do { if((ipaddr) != NULL) { IP_SET_TYPE_VAL(*(ipaddr), iptype); }}while(0)
-#define IP_GET_TYPE(ipaddr)           ((ipaddr)->type)
-
-#define IP_ADDR_PCB_VERSION_MATCH_EXACT(pcb, ipaddr) (IP_GET_TYPE(&pcb->local_ip) == IP_GET_TYPE(ipaddr))
-#define IP_ADDR_PCB_VERSION_MATCH(pcb, ipaddr) (IP_IS_ANY_TYPE_VAL(pcb->local_ip) || IP_ADDR_PCB_VERSION_MATCH_EXACT(pcb, ipaddr))
-
-/** @ingroup ip6addr
- * Convert generic ip address to specific protocol version
- */
-#define ip_2_ip6(ipaddr)   (&((ipaddr)->u_addr.ip6))
-/** @ingroup ip4addr
- * Convert generic ip address to specific protocol version
- */
-#define ip_2_ip4(ipaddr)   (&((ipaddr)->u_addr.ip4))
-
-/** @ingroup ip4addr */
-#define IP_ADDR4(ipaddr,a,b,c,d)      do { IP4_ADDR(ip_2_ip4(ipaddr),a,b,c,d); \
-                                           IP_SET_TYPE_VAL(*(ipaddr), IPADDR_TYPE_V4); } while(0)
-/** @ingroup ip6addr */
-#define IP_ADDR6(ipaddr,i0,i1,i2,i3)  do { IP6_ADDR(ip_2_ip6(ipaddr),i0,i1,i2,i3); \
-                                           IP_SET_TYPE_VAL(*(ipaddr), IPADDR_TYPE_V6); } while(0)
-/** @ingroup ip6addr */
-#define IP_ADDR6_HOST(ipaddr,i0,i1,i2,i3)  IP_ADDR6(ipaddr,PP_HTONL(i0),PP_HTONL(i1),PP_HTONL(i2),PP_HTONL(i3))
-
-/** @ingroup ipaddr */
-#define ip_addr_copy(dest, src)      do{ IP_SET_TYPE_VAL(dest, IP_GET_TYPE(&src)); if(IP_IS_V6_VAL(src)){ \
-  ip6_addr_copy(*ip_2_ip6(&(dest)), *ip_2_ip6(&(src))); }else{ \
-  ip4_addr_copy(*ip_2_ip4(&(dest)), *ip_2_ip4(&(src))); }}while(0)
-/** @ingroup ip6addr */
-#define ip_addr_copy_from_ip6(dest, src)      do{ \
-  ip6_addr_copy(*ip_2_ip6(&(dest)), src); IP_SET_TYPE_VAL(dest, IPADDR_TYPE_V6); }while(0)
-/** @ingroup ip4addr */
-#define ip_addr_copy_from_ip4(dest, src)      do{ \
-  ip4_addr_copy(*ip_2_ip4(&(dest)), src); IP_SET_TYPE_VAL(dest, IPADDR_TYPE_V4); }while(0)
-/** @ingroup ip4addr */
-#define ip_addr_set_ip4_u32(ipaddr, val)  do{if(ipaddr){ip4_addr_set_u32(ip_2_ip4(ipaddr), val); \
-  IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }}while(0)
-/** @ingroup ip4addr */
-#define ip_addr_get_ip4_u32(ipaddr)  (((ipaddr) && IP_IS_V4(ipaddr)) ? \
-  ip4_addr_get_u32(ip_2_ip4(ipaddr)) : 0)
-/** @ingroup ipaddr */
-#define ip_addr_set(dest, src) do{ IP_SET_TYPE(dest, IP_GET_TYPE(src)); if(IP_IS_V6(src)){ \
-  ip6_addr_set(ip_2_ip6(dest), ip_2_ip6(src)); }else{ \
-  ip4_addr_set(ip_2_ip4(dest), ip_2_ip4(src)); }}while(0)
-/** @ingroup ipaddr */
-#define ip_addr_set_ipaddr(dest, src) ip_addr_set(dest, src)
-/** @ingroup ipaddr */
-#define ip_addr_set_zero(ipaddr)     do{ \
-  ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, 0); }while(0)
-/** @ingroup ip5addr */
-#define ip_addr_set_zero_ip4(ipaddr)     do{ \
-  ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }while(0)
-/** @ingroup ip6addr */
-#define ip_addr_set_zero_ip6(ipaddr)     do{ \
-  ip6_addr_set_zero(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); }while(0)
-/** @ingroup ipaddr */
-#define ip_addr_set_any(is_ipv6, ipaddr)      do{if(is_ipv6){ \
-  ip6_addr_set_any(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); }else{ \
-  ip4_addr_set_any(ip_2_ip4(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }}while(0)
-/** @ingroup ipaddr */
-#define ip_addr_set_loopback(is_ipv6, ipaddr) do{if(is_ipv6){ \
-  ip6_addr_set_loopback(ip_2_ip6(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V6); }else{ \
-  ip4_addr_set_loopback(ip_2_ip4(ipaddr)); IP_SET_TYPE(ipaddr, IPADDR_TYPE_V4); }}while(0)
-/** @ingroup ipaddr */
-#define ip_addr_set_hton(dest, src)  do{if(IP_IS_V6(src)){ \
-  ip6_addr_set_hton(ip_2_ip6(ipaddr), (src)); IP_SET_TYPE(dest, IPADDR_TYPE_V6); }else{ \
-  ip4_addr_set_hton(ip_2_ip4(ipaddr), (src)); IP_SET_TYPE(dest, IPADDR_TYPE_V4); }}while(0)
-/** @ingroup ipaddr */
-#define ip_addr_get_network(target, host, netmask) do{if(IP_IS_V6(host)){ \
-  ip4_addr_set_zero(ip_2_ip4(target)); IP_SET_TYPE(target, IPADDR_TYPE_V6); } else { \
-  ip4_addr_get_network(ip_2_ip4(target), ip_2_ip4(host), ip_2_ip4(netmask)); IP_SET_TYPE(target, IPADDR_TYPE_V4); }}while(0)
-/** @ingroup ipaddr */
-#define ip_addr_netcmp(addr1, addr2, mask) ((IP_IS_V6(addr1) && IP_IS_V6(addr2)) ? \
-  0 : \
-  ip4_addr_netcmp(ip_2_ip4(addr1), ip_2_ip4(addr2), mask))
-/** @ingroup ipaddr */
-#define ip_addr_cmp(addr1, addr2)    ((IP_GET_TYPE(addr1) != IP_GET_TYPE(addr2)) ? 0 : (IP_IS_V6_VAL(*(addr1)) ? \
-  ip6_addr_cmp(ip_2_ip6(addr1), ip_2_ip6(addr2)) : \
-  ip4_addr_cmp(ip_2_ip4(addr1), ip_2_ip4(addr2))))
-/** @ingroup ipaddr */
-#define ip_addr_isany(ipaddr)        ((IP_IS_V6(ipaddr)) ? \
-  ip6_addr_isany(ip_2_ip6(ipaddr)) : \
-  ip4_addr_isany(ip_2_ip4(ipaddr)))
-/** @ingroup ipaddr */
-#define ip_addr_isany_val(ipaddr)        ((IP_IS_V6_VAL(ipaddr)) ? \
-  ip6_addr_isany_val(*ip_2_ip6(&(ipaddr))) : \
-  ip4_addr_isany_val(*ip_2_ip4(&(ipaddr))))
-/** @ingroup ipaddr */
-#define ip_addr_isbroadcast(ipaddr, netif) ((IP_IS_V6(ipaddr)) ? \
-  0 : \
-  ip4_addr_isbroadcast(ip_2_ip4(ipaddr), netif))
-/** @ingroup ipaddr */
-#define ip_addr_ismulticast(ipaddr)  ((IP_IS_V6(ipaddr)) ? \
-  ip6_addr_ismulticast(ip_2_ip6(ipaddr)) : \
-  ip4_addr_ismulticast(ip_2_ip4(ipaddr)))
-/** @ingroup ipaddr */
-#define ip_addr_isloopback(ipaddr)  ((IP_IS_V6(ipaddr)) ? \
-  ip6_addr_isloopback(ip_2_ip6(ipaddr)) : \
-  ip4_addr_isloopback(ip_2_ip4(ipaddr)))
-/** @ingroup ipaddr */
-#define ip_addr_islinklocal(ipaddr)  ((IP_IS_V6(ipaddr)) ? \
-  ip6_addr_islinklocal(ip_2_ip6(ipaddr)) : \
-  ip4_addr_islinklocal(ip_2_ip4(ipaddr)))
-#define ip_addr_debug_print(debug, ipaddr) do { if(IP_IS_V6(ipaddr)) { \
-  ip6_addr_debug_print(debug, ip_2_ip6(ipaddr)); } else { \
-  ip4_addr_debug_print(debug, ip_2_ip4(ipaddr)); }}while(0)
-#define ip_addr_debug_print_val(debug, ipaddr) do { if(IP_IS_V6_VAL(ipaddr)) { \
-  ip6_addr_debug_print_val(debug, *ip_2_ip6(&(ipaddr))); } else { \
-  ip4_addr_debug_print_val(debug, *ip_2_ip4(&(ipaddr))); }}while(0)
-/** @ingroup ipaddr */
-#define ipaddr_ntoa(addr)   (((addr) == NULL) ? "NULL" : \
-  ((IP_IS_V6(addr)) ? ip6addr_ntoa(ip_2_ip6(addr)) : ip4addr_ntoa(ip_2_ip4(addr))))
-/** @ingroup ipaddr */
-#define ipaddr_ntoa_r(addr, buf, buflen)   (((addr) == NULL) ? "NULL" : \
-  ((IP_IS_V6(addr)) ? ip6addr_ntoa_r(ip_2_ip6(addr), buf, buflen) : ip4addr_ntoa_r(ip_2_ip4(addr), buf, buflen)))
-int ipaddr_aton(const char *cp, ip_addr_t *addr);
-
-/** @ingroup ipaddr */
-#define IPADDR_STRLEN_MAX   IP6ADDR_STRLEN_MAX
-
-/** @ingroup ipaddr */
-#define ip4_2_ipv4_mapped_ipv6(ip6addr, ip4addr) do { \
-  (ip6addr)->addr[3] = (ip4addr)->addr; \
-  (ip6addr)->addr[2] = PP_HTONL(0x0000FFFFUL); \
-  (ip6addr)->addr[1] = 0; \
-  (ip6addr)->addr[0] = 0; } while(0);
-
-/** @ingroup ipaddr */
-#define unmap_ipv4_mapped_ipv6(ip4addr, ip6addr) \
-  (ip4addr)->addr = (ip6addr)->addr[3];
-
-#define IP46_ADDR_ANY(type) (((type) == IPADDR_TYPE_V6)? IP6_ADDR_ANY : IP4_ADDR_ANY)
-
-#else /* LWIP_IPV4 && LWIP_IPV6 */
-
-#define IP_ADDR_PCB_VERSION_MATCH(addr, pcb)         1
-#define IP_ADDR_PCB_VERSION_MATCH_EXACT(pcb, ipaddr) 1
-
-#if LWIP_IPV4
-
-typedef ip4_addr_t ip_addr_t;
-#define IPADDR4_INIT(u32val)                    { u32val }
-#define IPADDR4_INIT_BYTES(a,b,c,d)             IPADDR4_INIT(PP_HTONL(LWIP_MAKEU32(a,b,c,d)))
-#define IP_IS_V4_VAL(ipaddr)                    1
-#define IP_IS_V6_VAL(ipaddr)                    0
-#define IP_IS_V4(ipaddr)                        1
-#define IP_IS_V6(ipaddr)                        0
-#define IP_IS_ANY_TYPE_VAL(ipaddr)              0
-#define IP_SET_TYPE_VAL(ipaddr, iptype)
-#define IP_SET_TYPE(ipaddr, iptype)
-#define IP_GET_TYPE(ipaddr)                     IPADDR_TYPE_V4
-#define ip_2_ip4(ipaddr)                        (ipaddr)
-#define IP_ADDR4(ipaddr,a,b,c,d)                IP4_ADDR(ipaddr,a,b,c,d)
-
-#define ip_addr_copy(dest, src)                 ip4_addr_copy(dest, src)
-#define ip_addr_copy_from_ip4(dest, src)        ip4_addr_copy(dest, src)
-#define ip_addr_set_ip4_u32(ipaddr, val)        ip4_addr_set_u32(ip_2_ip4(ipaddr), val)
-#define ip_addr_get_ip4_u32(ipaddr)             ip4_addr_get_u32(ip_2_ip4(ipaddr))
-#define ip_addr_set(dest, src)                  ip4_addr_set(dest, src)
-#define ip_addr_set_ipaddr(dest, src)           ip4_addr_set(dest, src)
-#define ip_addr_set_zero(ipaddr)                ip4_addr_set_zero(ipaddr)
-#define ip_addr_set_zero_ip4(ipaddr)            ip4_addr_set_zero(ipaddr)
-#define ip_addr_set_any(is_ipv6, ipaddr)        ip4_addr_set_any(ipaddr)
-#define ip_addr_set_loopback(is_ipv6, ipaddr)   ip4_addr_set_loopback(ipaddr)
-#define ip_addr_set_hton(dest, src)             ip4_addr_set_hton(dest, src)
-#define ip_addr_get_network(target, host, mask) ip4_addr_get_network(target, host, mask)
-#define ip_addr_netcmp(addr1, addr2, mask)      ip4_addr_netcmp(addr1, addr2, mask)
-#define ip_addr_cmp(addr1, addr2)               ip4_addr_cmp(addr1, addr2)
-#define ip_addr_isany(ipaddr)                   ip4_addr_isany(ipaddr)
-#define ip_addr_isany_val(ipaddr)               ip4_addr_isany_val(ipaddr)
-#define ip_addr_isloopback(ipaddr)              ip4_addr_isloopback(ipaddr)
-#define ip_addr_islinklocal(ipaddr)             ip4_addr_islinklocal(ipaddr)
-#define ip_addr_isbroadcast(addr, netif)        ip4_addr_isbroadcast(addr, netif)
-#define ip_addr_ismulticast(ipaddr)             ip4_addr_ismulticast(ipaddr)
-#define ip_addr_debug_print(debug, ipaddr)      ip4_addr_debug_print(debug, ipaddr)
-#define ip_addr_debug_print_val(debug, ipaddr)  ip4_addr_debug_print_val(debug, ipaddr)
-#define ipaddr_ntoa(ipaddr)                     ip4addr_ntoa(ipaddr)
-#define ipaddr_ntoa_r(ipaddr, buf, buflen)      ip4addr_ntoa_r(ipaddr, buf, buflen)
-#define ipaddr_aton(cp, addr)                   ip4addr_aton(cp, addr)
-
-#define IPADDR_STRLEN_MAX   IP4ADDR_STRLEN_MAX
-
-#define IP46_ADDR_ANY(type) (IP4_ADDR_ANY)
-
-#else /* LWIP_IPV4 */
-
-typedef ip6_addr_t ip_addr_t;
-#define IPADDR6_INIT(a, b, c, d)                { { a, b, c, d } }
-#define IPADDR6_INIT_HOST(a, b, c, d)           { { PP_HTONL(a), PP_HTONL(b), PP_HTONL(c), PP_HTONL(d) } }
-#define IP_IS_V4_VAL(ipaddr)                    0
-#define IP_IS_V6_VAL(ipaddr)                    1
-#define IP_IS_V4(ipaddr)                        0
-#define IP_IS_V6(ipaddr)                        1
-#define IP_IS_ANY_TYPE_VAL(ipaddr)              0
-#define IP_SET_TYPE_VAL(ipaddr, iptype)
-#define IP_SET_TYPE(ipaddr, iptype)
-#define IP_GET_TYPE(ipaddr)                     IPADDR_TYPE_V6
-#define ip_2_ip6(ipaddr)                        (ipaddr)
-#define IP_ADDR6(ipaddr,i0,i1,i2,i3)            IP6_ADDR(ipaddr,i0,i1,i2,i3)
-#define IP_ADDR6_HOST(ipaddr,i0,i1,i2,i3)       IP_ADDR6(ipaddr,PP_HTONL(i0),PP_HTONL(i1),PP_HTONL(i2),PP_HTONL(i3))
-
-#define ip_addr_copy(dest, src)                 ip6_addr_copy(dest, src)
-#define ip_addr_copy_from_ip6(dest, src)        ip6_addr_copy(dest, src)
-#define ip_addr_set(dest, src)                  ip6_addr_set(dest, src)
-#define ip_addr_set_ipaddr(dest, src)           ip6_addr_set(dest, src)
-#define ip_addr_set_zero(ipaddr)                ip6_addr_set_zero(ipaddr)
-#define ip_addr_set_zero_ip6(ipaddr)            ip6_addr_set_zero(ipaddr)
-#define ip_addr_set_any(is_ipv6, ipaddr)        ip6_addr_set_any(ipaddr)
-#define ip_addr_set_loopback(is_ipv6, ipaddr)   ip6_addr_set_loopback(ipaddr)
-#define ip_addr_set_hton(dest, src)             ip6_addr_set_hton(dest, src)
-#define ip_addr_get_network(target, host, mask) ip6_addr_set_zero(target)
-#define ip_addr_netcmp(addr1, addr2, mask)      0
-#define ip_addr_cmp(addr1, addr2)               ip6_addr_cmp(addr1, addr2)
-#define ip_addr_isany(ipaddr)                   ip6_addr_isany(ipaddr)
-#define ip_addr_isany_val(ipaddr)               ip6_addr_isany_val(ipaddr)
-#define ip_addr_isloopback(ipaddr)              ip6_addr_isloopback(ipaddr)
-#define ip_addr_islinklocal(ipaddr)             ip6_addr_islinklocal(ipaddr)
-#define ip_addr_isbroadcast(addr, netif)        0
-#define ip_addr_ismulticast(ipaddr)             ip6_addr_ismulticast(ipaddr)
-#define ip_addr_debug_print(debug, ipaddr)      ip6_addr_debug_print(debug, ipaddr)
-#define ip_addr_debug_print_val(debug, ipaddr)  ip6_addr_debug_print_val(debug, ipaddr)
-#define ipaddr_ntoa(ipaddr)                     ip6addr_ntoa(ipaddr)
-#define ipaddr_ntoa_r(ipaddr, buf, buflen)      ip6addr_ntoa_r(ipaddr, buf, buflen)
-#define ipaddr_aton(cp, addr)                   ip6addr_aton(cp, addr)
-
-#define IPADDR_STRLEN_MAX   IP6ADDR_STRLEN_MAX
-
-#define IP46_ADDR_ANY(type) (IP6_ADDR_ANY)
-
-#endif /* LWIP_IPV4 */
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-#if LWIP_IPV4
-
-extern const ip_addr_t ip_addr_any;
-extern const ip_addr_t ip_addr_broadcast;
-
-/**
- * @ingroup ip4addr
- * Can be used as a fixed/const ip_addr_t
- * for the IP wildcard.
- * Defined to @ref IP4_ADDR_ANY when IPv4 is enabled.
- * Defined to @ref IP6_ADDR_ANY in IPv6 only systems.
- * Use this if you can handle IPv4 _AND_ IPv6 addresses.
- * Use @ref IP4_ADDR_ANY or @ref IP6_ADDR_ANY when the IP
- * type matters.
- */
-#define IP_ADDR_ANY         IP4_ADDR_ANY
-/**
- * @ingroup ip4addr
- * Can be used as a fixed/const ip_addr_t
- * for the IPv4 wildcard and the broadcast address
- */
-#define IP4_ADDR_ANY        (&ip_addr_any)
-/**
- * @ingroup ip4addr
- * Can be used as a fixed/const ip4_addr_t
- * for the wildcard and the broadcast address
- */
-#define IP4_ADDR_ANY4       (ip_2_ip4(&ip_addr_any))
-
-/** @ingroup ip4addr */
-#define IP_ADDR_BROADCAST   (&ip_addr_broadcast)
-/** @ingroup ip4addr */
-#define IP4_ADDR_BROADCAST  (ip_2_ip4(&ip_addr_broadcast))
-
-#endif /* LWIP_IPV4*/
-
-#if LWIP_IPV6
-
-extern const ip_addr_t ip6_addr_any;
-
-/** 
- * @ingroup ip6addr
- * IP6_ADDR_ANY can be used as a fixed ip_addr_t
- * for the IPv6 wildcard address
- */
-#define IP6_ADDR_ANY   (&ip6_addr_any)
-/**
- * @ingroup ip6addr
- * IP6_ADDR_ANY6 can be used as a fixed ip6_addr_t
- * for the IPv6 wildcard address
- */
-#define IP6_ADDR_ANY6  (ip_2_ip6(&ip6_addr_any))
-
-#if !LWIP_IPV4
-/** IPv6-only configurations */
-#define IP_ADDR_ANY IP6_ADDR_ANY
-#endif /* !LWIP_IPV4 */
-
-#endif
-
-#if LWIP_IPV4 && LWIP_IPV6
-/** @ingroup ipaddr */
-#define IP_ANY_TYPE    (&ip_addr_any_type)
-#else
-#define IP_ANY_TYPE    IP_ADDR_ANY
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_IP_ADDR_H */
diff --git a/sys/include/net/lwipopts.h b/sys/include/net/lwipopts.h
deleted file mode 100644
index e9eb0b7..0000000
--- a/sys/include/net/lwipopts.h
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Simon Goldschmidt
- *
- */
-
-#ifndef LWIP_HDR_LWIPOPTS_H
-#define LWIP_HDR_LWIPOPTS_H
-
-/* NEVER Set To 1, 1 Will Remove OS Abstraction */
-#define NO_SYS                          0
-
-/* Timer Settings */
-#define LWIP_TIMERS        1
-#define LWIP_TIMERS_CUSTOM 0
-
-#define MEMCPY(dst, src, len)   memcpy(dst,src,len)
-#define SMEMCPY(dst, src, len)   memcpy(dst,src,len)
-
-/* Core locking and MPU */
-#define LWIP_MPU_COMPATIBLE           0
-#define LWIP_TCPIP_CORE_LOCKING       1
-#define LWIP_TCPIP_CORE_LOCKING_INPUT 1
-#define SYS_LIGHTWEIGHT_PROT          0
-
-
-#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 0
-#define MEM_ALIGNMENT                          1
-#define MEM_LIBC_MALLOC                        0
-#define MEM_SIZE                               1600
-#define MEM_USE_POOLS                          0
-#define MEM_USE_POOLS_TRY_BIGGER_POOL          0
-
-#define MEMP_MEM_MALLOC   0
-#define MEMP_SANITY_CHECK   0
-#define MEMP_USE_CUSTOM_POOLS   0
-#define MEMP_OVERFLOW_CHECK   0
-
-#define MEMP_NUM_API_MSG   MEMP_NUM_TCPIP_MSG_API
-#define MEMP_NUM_ARP_QUEUE   30
-#define MEMP_NUM_DNS_API_MSG   MEMP_NUM_TCPIP_MSG_API
-#define MEMP_NUM_FRAG_PBUF   15
-#define MEMP_NUM_IGMP_GROUP   8
-#define MEMP_NUM_LOCALHOSTLIST   1
-#define MEMP_NUM_NETBUF   2
-#define MEMP_NUM_NETCONN   4
-#define MEMP_NUM_NETDB   1
-#define MEMP_NUM_NETIFAPI_MSG   MEMP_NUM_TCPIP_MSG_API
-#define MEMP_NUM_PBUF   16
-#define MEMP_NUM_RAW_PCB   4
-#define MEMP_NUM_REASSDATA   5
-#define MEMP_NUM_SOCKET_SETGETSOCKOPT_DATA   MEMP_NUM_TCPIP_MSG_API
-#define MEMP_NUM_TCP_PCB   5
-#define MEMP_NUM_TCP_PCB_LISTEN   8
-#define MEMP_NUM_TCP_SEG   16
-#define MEMP_NUM_TCPIP_MSG_API   8
-#define MEMP_NUM_TCPIP_MSG_INPKT   8
-#define MEMP_NUM_UDP_PCB   4
-#define PBUF_POOL_SIZE   16
-
-#define MEMP_NUM_SYS_TIMEOUT   (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + (PPP_SUPPORT*6*MEMP_NUM_PPP_PCB) + (LWIP_IPV6 ? (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD) : 0))
-
-#define LWIP_ARP   1
-
-#define ARP_TABLE_SIZE   10
-
-#define ARP_MAXAGE   300
-
-#define ARP_QUEUEING   0
-
-#define ARP_QUEUE_LEN   3
-
-#define ETHARP_SUPPORT_VLAN   0
-
-#define LWIP_ETHERNET   LWIP_ARP
-
-#define ETH_PAD_SIZE   0
-
-#define ETHARP_SUPPORT_STATIC_ENTRIES   0
-
-#define ETHARP_TABLE_MATCH_NETIF   0
-
-#define LWIP_IPV4   1
-
-#define IP_FORWARD   0
-
-#define IP_REASSEMBLY   1
-
-#define IP_FRAG   1
-
-#define IP_OPTIONS_ALLOWED   1
-
-#define IP_REASS_MAXAGE   3
-
-#define IP_REASS_MAX_PBUFS   10
-
-#define IP_DEFAULT_TTL   255
-
-#define IP_SOF_BROADCAST   0
-
-#define IP_SOF_BROADCAST_RECV   0
-
-#define IP_FORWARD_ALLOW_TX_ON_RX_NETIF   0
-
-#define LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS   0
-
-#define LWIP_ICMP   1
-
-#define ICMP_TTL   (IP_DEFAULT_TTL)
-
-#define LWIP_BROADCAST_PING   1
-
-#define LWIP_MULTICAST_PING   0
-
-#define LWIP_RAW   0
-
-#define RAW_TTL   (IP_DEFAULT_TTL)
-
-#define LWIP_DHCP   0
-#define DHCP_DOES_ARP_CHECK   ((LWIP_DHCP) && (LWIP_ARP))
-#define LWIP_DHCP_BOOTP_FILE   0
-#define LWIP_DHCP_GET_NTP_SRV   0
-#define LWIP_DHCP_MAX_NTP_SERVERS   1
-#define LWIP_DHCP_MAX_DNS_SERVERS   DNS_MAX_SERVERS
-#define LWIP_AUTOIP   0
-#define LWIP_DHCP_AUTOIP_COOP   0
-#define LWIP_DHCP_AUTOIP_COOP_TRIES   9
-#define LWIP_MIB2_CALLBACKS   0
-#define LWIP_IGMP   0
-#define LWIP_MULTICAST_TX_OPTIONS   (LWIP_IGMP && LWIP_UDP)
-#define LWIP_DNS   0
-#define DNS_TABLE_SIZE   4
-#define DNS_MAX_NAME_LENGTH   256
-#define DNS_MAX_SERVERS   2
-#define DNS_DOES_NAME_CHECK   1
-#define LWIP_DNS_SECURE   (LWIP_DNS_SECURE_RAND_XID | LWIP_DNS_SECURE_NO_MULTIPLE_OUTSTANDING | LWIP_DNS_SECURE_RAND_SRC_PORT)
-#define DNS_LOCAL_HOSTLIST   0
-#define DNS_LOCAL_HOSTLIST_IS_DYNAMIC   0
-#define LWIP_DNS_SUPPORT_MDNS_QUERIES   0
-#define LWIP_UDP   1
-#define LWIP_UDPLITE   0
-#define UDP_TTL   (IP_DEFAULT_TTL)
-#define LWIP_NETBUF_RECVINFO   0
-#define LWIP_TCP   1
-#define TCP_TTL   (IP_DEFAULT_TTL)
-#define TCP_WND   (4 * TCP_MSS)
-
-#define TCP_MAXRTX   12
-
-#define TCP_SYNMAXRTX   6
-
-#define TCP_QUEUE_OOSEQ   (LWIP_TCP)
-
-#define TCP_MSS   536
-
-#define TCP_CALCULATE_EFF_SEND_MSS   1
-
-#define TCP_SND_BUF   (2 * TCP_MSS)
-
-#define TCP_SND_QUEUELEN   ((4 * (TCP_SND_BUF) + (TCP_MSS - 1))/(TCP_MSS))
-
-#define TCP_SNDLOWAT   LWIP_MIN(LWIP_MAX(((TCP_SND_BUF)/2), (2 * TCP_MSS) + 1), (TCP_SND_BUF) - 1)
-
-#define TCP_SNDQUEUELOWAT   LWIP_MAX(((TCP_SND_QUEUELEN)/2), 5)
-
-#define TCP_OOSEQ_MAX_BYTES   0
-
-#define TCP_OOSEQ_MAX_PBUFS   0
-
-#define TCP_LISTEN_BACKLOG   0
-
-#define TCP_DEFAULT_LISTEN_BACKLOG   0xff
-
-#define TCP_OVERSIZE   TCP_MSS
-
-#define LWIP_TCP_TIMESTAMPS   0
-
-#define TCP_WND_UPDATE_THRESHOLD   LWIP_MIN((TCP_WND / 4), (TCP_MSS * 4))
-
-#define LWIP_EVENT_API   0
-#define LWIP_WND_SCALE   0
-
-#define PBUF_LINK_HLEN   (14 + ETH_PAD_SIZE)
-
-#define PBUF_LINK_ENCAPSULATION_HLEN   0u
-
-#define PBUF_POOL_BUFSIZE LWIP_MEM_ALIGN_SIZE(TCP_MSS + 40 + PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN)
-
-#define LWIP_NETIF_HOSTNAME 0
-
-#define LWIP_NETIF_API 0
-
-#define LWIP_NETIF_STATUS_CALLBACK 0
-
-#define LWIP_NETIF_LINK_CALLBACK 0
-
-#define LWIP_NETIF_REMOVE_CALLBACK 0
-
-#define LWIP_NETIF_HWADDRHINT 0
-
-#define LWIP_NETIF_TX_SINGLE_PBUF 0
-
-#define LWIP_NUM_NETIF_CLIENT_DATA 0
-
-#define LWIP_HAVE_LOOPIF LWIP_NETIF_LOOPBACK
-
-#define LWIP_LOOPIF_MULTICAST 0
-
-#define LWIP_NETIF_LOOPBACK 1
-
-#define LWIP_LOOPBACK_MAX_PBUFS 0
-
-#define LWIP_NETIF_LOOPBACK_MULTITHREADING (!NO_SYS)
-
-#define TCPIP_THREAD_NAME "tcpip_thread"
-
-#define TCPIP_THREAD_STACKSIZE 0
-
-#define TCPIP_THREAD_PRIO 1
-
-#define TCPIP_MBOX_SIZE 6
-
-#define LWIP_TCPIP_THREAD_ALIVE()
-
-#define SLIPIF_THREAD_NAME "slipif_loop"
-
-#define SLIPIF_THREAD_STACKSIZE 0
-
-#define SLIPIF_THREAD_PRIO 1
-
-#define DEFAULT_THREAD_NAME "lwIP"
-
-#define DEFAULT_THREAD_STACKSIZE 0
-
-#define DEFAULT_THREAD_PRIO 1
-
-#define DEFAULT_RAW_RECVMBOX_SIZE 0
-
-#define DEFAULT_UDP_RECVMBOX_SIZE 0
-
-#define DEFAULT_TCP_RECVMBOX_SIZE 0
-
-#define DEFAULT_ACCEPTMBOX_SIZE 0
-
-#define LWIP_NETCONN 1
-
-#define LWIP_TCPIP_TIMEOUT 0
-
-#define LWIP_NETCONN_SEM_PER_THREAD 0
-
-#define LWIP_NETCONN_FULLDUPLEX 0
-
-#define LWIP_SOCKET 1
-
-#define LWIP_COMPAT_SOCKETS 1
-
-#define LWIP_POSIX_SOCKETS_IO_NAMES 1
-
-#define LWIP_SOCKET_OFFSET 0
-
-#define LWIP_TCP_KEEPALIVE 0
-
-#define LWIP_SO_SNDTIMEO 0
-
-#define LWIP_SO_RCVTIMEO 0
-
-#define LWIP_SO_SNDRCVTIMEO_NONSTANDARD 0
-
-#define LWIP_SO_RCVBUF 0
-
-#define LWIP_SO_LINGER 0
-
-#define RECV_BUFSIZE_DEFAULT INT_MAX
-
-#define LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT 20000
-
-#define SO_REUSE 0
-
-#define SO_REUSE_RXTOALL 0
-
-#define LWIP_FIONREAD_LINUXMODE 0
-
-#define LWIP_STATS 1
-
-#define LWIP_STATS_DISPLAY 0
-
-#define LINK_STATS 1
-
-#define ETHARP_STATS (LWIP_ARP)
-
-#define IP_STATS 1
-
-#define IPFRAG_STATS (IP_REASSEMBLY || IP_FRAG)
-
-#define ICMP_STATS 1
-
-#define IGMP_STATS (LWIP_IGMP)
-
-#define UDP_STATS (LWIP_UDP)
-
-#define TCP_STATS (LWIP_TCP)
-
-#define MEM_STATS ((MEM_LIBC_MALLOC == 0) && (MEM_USE_POOLS == 0))
-
-#define MEMP_STATS (MEMP_MEM_MALLOC == 0)
-
-#define SYS_STATS (NO_SYS == 0)
-
-#define IP6_STATS (LWIP_IPV6)
-
-#define ICMP6_STATS (LWIP_IPV6 && LWIP_ICMP6)
-
-#define IP6_FRAG_STATS (LWIP_IPV6 && (LWIP_IPV6_FRAG || LWIP_IPV6_REASS))
-
-#define MLD6_STATS (LWIP_IPV6 && LWIP_IPV6_MLD)
-
-#define ND6_STATS (LWIP_IPV6)
-
-#define MIB2_STATS 0
-
-#define LWIP_CHECKSUM_CTRL_PER_NETIF 0
-
-#define CHECKSUM_GEN_IP 1
-
-#define CHECKSUM_GEN_UDP 1
-
-#define CHECKSUM_GEN_TCP 1
-
-#define CHECKSUM_GEN_ICMP 1
-
-#define CHECKSUM_GEN_ICMP6 1
-
-#define CHECKSUM_CHECK_IP 1
-#define CHECKSUM_CHECK_UDP 1
-
-#define CHECKSUM_CHECK_TCP 1
-#define CHECKSUM_CHECK_ICMP 1
-#define CHECKSUM_CHECK_ICMP6 1
-#define LWIP_CHECKSUM_ON_COPY 0
-#define LWIP_IPV6 0
-#define LWIP_IPV6_NUM_ADDRESSES 3
-#define LWIP_IPV6_FORWARD 0
-#define LWIP_IPV6_FRAG 0
-#define LWIP_IPV6_REASS (LWIP_IPV6)
-#define LWIP_IPV6_SEND_ROUTER_SOLICIT 1
-#define LWIP_IPV6_AUTOCONFIG (LWIP_IPV6)
-#define LWIP_IPV6_DUP_DETECT_ATTEMPTS 1
-#define LWIP_ICMP6 (LWIP_IPV6)
-#define LWIP_ICMP6_DATASIZE 8
-#define LWIP_ICMP6_HL 255
-#define LWIP_IPV6_MLD (LWIP_IPV6)
-#define MEMP_NUM_MLD6_GROUP 4
-#define LWIP_ND6_QUEUEING (LWIP_IPV6)
-#define MEMP_NUM_ND6_QUEUE 20
-#define LWIP_ND6_NUM_NEIGHBORS 10
-#define LWIP_ND6_NUM_DESTINATIONS 10
-#define LWIP_ND6_NUM_PREFIXES 5
-#define LWIP_ND6_NUM_ROUTERS 3
-#define LWIP_ND6_MAX_MULTICAST_SOLICIT 3
-#define LWIP_ND6_MAX_UNICAST_SOLICIT 3
-#define LWIP_ND6_MAX_ANYCAST_DELAY_TIME 1000
-#define LWIP_ND6_MAX_NEIGHBOR_ADVERTISEMENT 3
-#define LWIP_ND6_REACHABLE_TIME 30000
-#define LWIP_ND6_RETRANS_TIMER 1000
-
-#define LWIP_ND6_DELAY_FIRST_PROBE_TIME 5000
-
-#define LWIP_ND6_ALLOW_RA_UPDATES 1
-
-#define LWIP_ND6_TCP_REACHABILITY_HINTS 1
-
-#define LWIP_ND6_RDNSS_MAX_DNS_SERVERS 0
-
-#define LWIP_IPV6_DHCP6 0
-
-//#define LWIP_HOOK_FILENAME "path/to/my/lwip_hooks.h"
-
-//#define LWIP_HOOK_TCP_ISN(local_ip, local_port, remote_ip, remote_port)
-
-//#define LWIP_HOOK_IP4_INPUT(pbuf, input_netif)
-
-//#define LWIP_HOOK_IP4_ROUTE()
-
-//#define LWIP_HOOK_IP4_ROUTE_SRC(dest, src)
-
-//#define LWIP_HOOK_ETHARP_GET_GW(netif, dest)
-
-//#define LWIP_HOOK_IP6_INPUT(pbuf, input_netif)
-
-//#define LWIP_HOOK_IP6_ROUTE(src, dest)
-
-///#define LWIP_HOOK_ND6_GET_GW(netif, dest)
-
-//#define LWIP_HOOK_VLAN_CHECK(netif, eth_hdr, vlan_hdr)
-
-//#define LWIP_HOOK_VLAN_SET(netif, p, src, dst, eth_type)
-
-//#define LWIP_HOOK_MEMP_AVAILABLE(memp_t_type)
-
-//#define LWIP_HOOK_UNKNOWN_ETH_PROTOCOL(pbuf, netif)
-
-#define LWIP_DBG_MIN_LEVEL LWIP_DBG_LEVEL_ALL
-#define LWIP_DBG_TYPES_ON LWIP_DBG_ON
-
-#define ETHARP_DEBUG LWIP_DBG_OFF
-
-#define NETIF_DEBUG LWIP_DBG_OFF
-
-#define PBUF_DEBUG LWIP_DBG_OFF
-
-#define API_LIB_DEBUG LWIP_DBG_OFF
-
-#define API_MSG_DEBUG LWIP_DBG_OFF
-
-#define SOCKETS_DEBUG LWIP_DBG_OFF
-
-#define ICMP_DEBUG LWIP_DBG_OFF
-
-#define IGMP_DEBUG LWIP_DBG_OFF
-
-#define INET_DEBUG LWIP_DBG_OFF
-
-#define IP_DEBUG LWIP_DBG_ON
-
-#define IP_REASS_DEBUG LWIP_DBG_OFF
-
-#define RAW_DEBUG LWIP_DBG_OFF
-
-#define MEM_DEBUG LWIP_DBG_OFF
-
-#define MEMP_DEBUG LWIP_DBG_OFF
-
-#define SYS_DEBUG LWIP_DBG_OFF
-
-#define TIMERS_DEBUG LWIP_DBG_OFF
-
-#define TCP_DEBUG LWIP_DBG_OFF
-
-#define TCP_INPUT_DEBUG LWIP_DBG_OFF
-
-#define TCP_FR_DEBUG LWIP_DBG_OFF
-
-#define TCP_RTO_DEBUG LWIP_DBG_OFF
-
-#define TCP_CWND_DEBUG LWIP_DBG_OFF
-
-#define TCP_WND_DEBUG LWIP_DBG_OFF
-
-#define TCP_OUTPUT_DEBUG LWIP_DBG_OFF
-
-#define TCP_RST_DEBUG LWIP_DBG_OFF
-
-#define TCP_QLEN_DEBUG LWIP_DBG_OFF
-
-#define UDP_DEBUG LWIP_DBG_OFF
-#define TCPIP_DEBUG LWIP_DBG_OFF
-#define SLIP_DEBUG   LWIP_DBG_OFF
-#define DHCP_DEBUG   LWIP_DBG_OFF
-#define AUTOIP_DEBUG   LWIP_DBG_OFF
-#define DNS_DEBUG   LWIP_DBG_OFF
-#define IP6_DEBUG   LWIP_DBG_OFF
-#define LWIP_PERF   0
-
-//#define TCP_RCV_SCALE                   0
-//#define PBUF_POOL_SIZE                  400 /* pbuf tests need ~200KByte */
-#define LWIP_COMPAT_MUTEX 0
-#define LWIP_COMPAT_MUTEX_ALLOWED 1
-#define LWIP_TIMEVAL_PRIVATE 0
-#define LWIP_CALLBACK_API 1
-#define LWIP_PROVIDE_ERRNO 1
-#endif
diff --git a/sys/include/net/mem.h b/sys/include/net/mem.h
deleted file mode 100644
index f5360dd..0000000
--- a/sys/include/net/mem.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * @file
- * Heap API
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_MEM_H
-#define LWIP_HDR_MEM_H
-
-#include <net/opt.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if MEM_LIBC_MALLOC
-
-#include <net/arch.h>
-
-typedef size_t mem_size_t;
-#define MEM_SIZE_F SZT_F
-
-#elif MEM_USE_POOLS
-
-typedef u16_t mem_size_t;
-#define MEM_SIZE_F U16_F
-
-#else
-
-/* MEM_SIZE would have to be aligned, but using 64000 here instead of
- * 65535 leaves some room for alignment...
- */
-#if MEM_SIZE > 64000L
-typedef u32_t mem_size_t;
-#define MEM_SIZE_F U32_F
-#else
-typedef u16_t mem_size_t;
-#define MEM_SIZE_F U16_F
-#endif /* MEM_SIZE > 64000 */
-#endif
-
-void  mem_init(void);
-void *mem_trim(void *mem, mem_size_t size);
-void *mem_malloc(mem_size_t size);
-void *mem_calloc(mem_size_t count, mem_size_t size);
-void  mem_free(void *mem);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_MEM_H */
diff --git a/sys/include/net/memp.h b/sys/include/net/memp.h
deleted file mode 100644
index bae1b44..0000000
--- a/sys/include/net/memp.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * @file
- * Memory pool API
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#ifndef LWIP_HDR_MEMP_H
-#define LWIP_HDR_MEMP_H
-
-#include <net/opt.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* run once with empty definition to handle all custom includes in lwippools.h */
-#define LWIP_MEMPOOL(name,num,size,desc)
-#include <net/priv/memp_std.h>
-
-/** Create the list of all memory pools managed by memp. MEMP_MAX represents a NULL pool at the end */
-typedef enum {
-#define LWIP_MEMPOOL(name,num,size,desc)  MEMP_##name,
-#include <net/priv/memp_std.h>
-  MEMP_MAX
-} memp_t;
-
-#include <net/priv/memp_priv.h>
-#include <net/stats.h>
-
-extern const struct memp_desc* const memp_pools[MEMP_MAX];
-
-/**
- * @ingroup mempool
- * Declare prototype for private memory pool if it is used in multiple files
- */
-#define LWIP_MEMPOOL_PROTOTYPE(name) extern const struct memp_desc memp_ ## name
-
-#if MEMP_MEM_MALLOC
-
-#define LWIP_MEMPOOL_DECLARE(name,num,size,desc) \
-  LWIP_MEMPOOL_DECLARE_STATS_INSTANCE(memp_stats_ ## name) \
-  const struct memp_desc memp_ ## name = { \
-    DECLARE_LWIP_MEMPOOL_DESC(desc) \
-    LWIP_MEMPOOL_DECLARE_STATS_REFERENCE(memp_stats_ ## name) \
-    LWIP_MEM_ALIGN_SIZE(size) \
-  };
-
-#else /* MEMP_MEM_MALLOC */
-
-/**
- * @ingroup mempool
- * Declare a private memory pool
- * Private mempools example:
- * .h: only when pool is used in multiple .c files: LWIP_MEMPOOL_PROTOTYPE(my_private_pool);
- * .c:
- *   - in global variables section: LWIP_MEMPOOL_DECLARE(my_private_pool, 10, sizeof(foo), "Some description")
- *   - call ONCE before using pool (e.g. in some init() function): LWIP_MEMPOOL_INIT(my_private_pool);
- *   - allocate: void* my_new_mem = LWIP_MEMPOOL_ALLOC(my_private_pool);
- *   - free: LWIP_MEMPOOL_FREE(my_private_pool, my_new_mem);
- *
- * To relocate a pool, declare it as extern in cc.h. Example for GCC:
- *   extern u8_t __attribute__((section(".onchip_mem"))) memp_memory_my_private_pool[];
- */
-#define LWIP_MEMPOOL_DECLARE(name,num,size,desc) \
-  LWIP_DECLARE_MEMORY_ALIGNED(memp_memory_ ## name ## _base, ((num) * (MEMP_SIZE + MEMP_ALIGN_SIZE(size)))); \
-    \
-  LWIP_MEMPOOL_DECLARE_STATS_INSTANCE(memp_stats_ ## name) \
-    \
-  static struct memp *memp_tab_ ## name; \
-    \
-  const struct memp_desc memp_ ## name = { \
-    DECLARE_LWIP_MEMPOOL_DESC(desc) \
-    LWIP_MEMPOOL_DECLARE_STATS_REFERENCE(memp_stats_ ## name) \
-    LWIP_MEM_ALIGN_SIZE(size), \
-    (num), \
-    memp_memory_ ## name ## _base, \
-    &memp_tab_ ## name \
-  };
-
-#endif /* MEMP_MEM_MALLOC */
-
-/**
- * @ingroup mempool
- * Initialize a private memory pool
- */
-#define LWIP_MEMPOOL_INIT(name)    memp_init_pool(&memp_ ## name)
-/**
- * @ingroup mempool
- * Allocate from a private memory pool
- */
-#define LWIP_MEMPOOL_ALLOC(name)   memp_malloc_pool(&memp_ ## name)
-/**
- * @ingroup mempool
- * Free element from a private memory pool
- */
-#define LWIP_MEMPOOL_FREE(name, x) memp_free_pool(&memp_ ## name, (x))
-
-#if MEM_USE_POOLS
-/** This structure is used to save the pool one element came from.
- * This has to be defined here as it is required for pool size calculation. */
-struct memp_malloc_helper
-{
-   memp_t poolnr;
-#if MEMP_OVERFLOW_CHECK || (LWIP_STATS && MEM_STATS)
-   u16_t size;
-#endif /* MEMP_OVERFLOW_CHECK || (LWIP_STATS && MEM_STATS) */
-};
-#endif /* MEM_USE_POOLS */
-
-void  memp_init(void);
-
-#if MEMP_OVERFLOW_CHECK
-void *memp_malloc_fn(memp_t type, const char* file, const int line);
-#define memp_malloc(t) memp_malloc_fn((t), __FILE__, __LINE__)
-#else
-void *memp_malloc(memp_t type);
-#endif
-void  memp_free(memp_t type, void *mem);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_MEMP_H */
diff --git a/sys/include/net/mld6.h b/sys/include/net/mld6.h
deleted file mode 100644
index 2c5c12a..0000000
--- a/sys/include/net/mld6.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * @file
- *
- * Multicast listener discovery for IPv6. Aims to be compliant with RFC 2710.
- * No support for MLDv2.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#ifndef LWIP_HDR_MLD6_H
-#define LWIP_HDR_MLD6_H
-
-#include "net/opt.h"
-
-#if LWIP_IPV6_MLD && LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
-
-#include "net/pbuf.h"
-#include "net/netif.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** MLD group */
-struct mld_group {
-  /** next link */
-  struct mld_group *next;
-  /** multicast address */
-  ip6_addr_t         group_address;
-  /** signifies we were the last person to report */
-  u8_t               last_reporter_flag;
-  /** current state of the group */
-  u8_t               group_state;
-  /** timer for reporting */
-  u16_t              timer;
-  /** counter of simultaneous uses */
-  u8_t               use;
-};
-
-#define MLD6_TMR_INTERVAL              100 /* Milliseconds */
-
-err_t  mld6_stop(struct netif *netif);
-void   mld6_report_groups(struct netif *netif);
-void   mld6_tmr(void);
-struct mld_group *mld6_lookfor_group(struct netif *ifp, const ip6_addr_t *addr);
-void   mld6_input(struct pbuf *p, struct netif *inp);
-err_t  mld6_joingroup(const ip6_addr_t *srcaddr, const ip6_addr_t *groupaddr);
-err_t  mld6_joingroup_netif(struct netif *netif, const ip6_addr_t *groupaddr);
-err_t  mld6_leavegroup(const ip6_addr_t *srcaddr, const ip6_addr_t *groupaddr);
-err_t  mld6_leavegroup_netif(struct netif *netif, const ip6_addr_t *groupaddr);
-
-/** @ingroup mld6
- * Get list head of MLD6 groups for netif.
- * Note: The allnodes group IP is NOT in the list, since it must always 
- * be received for correct IPv6 operation.
- * @see @ref netif_set_mld_mac_filter()
- */
-#define netif_mld6_data(netif) ((struct mld_group *)netif_get_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_MLD6))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV6_MLD && LWIP_IPV6 */
-
-#endif /* LWIP_HDR_MLD6_H */
diff --git a/sys/include/net/nd6.h b/sys/include/net/nd6.h
deleted file mode 100644
index f0dfca9..0000000
--- a/sys/include/net/nd6.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * @file
- *
- * Neighbor discovery and stateless address autoconfiguration for IPv6.
- * Aims to be compliant with RFC 4861 (Neighbor discovery) and RFC 4862
- * (Address autoconfiguration).
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#ifndef LWIP_HDR_ND6_H
-#define LWIP_HDR_ND6_H
-
-#include "net/opt.h"
-
-#if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
-
-#include "net/ip6_addr.h"
-#include "net/err.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** 1 second period */
-#define ND6_TMR_INTERVAL 1000
-
-struct pbuf;
-struct netif;
-
-void nd6_tmr(void);
-void nd6_input(struct pbuf *p, struct netif *inp);
-void nd6_clear_destination_cache(void);
-struct netif *nd6_find_route(const ip6_addr_t *ip6addr);
-err_t nd6_get_next_hop_addr_or_queue(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr, const u8_t **hwaddrp);
-u16_t nd6_get_destination_mtu(const ip6_addr_t *ip6addr, struct netif *netif);
-#if LWIP_ND6_TCP_REACHABILITY_HINTS
-void nd6_reachability_hint(const ip6_addr_t *ip6addr);
-#endif /* LWIP_ND6_TCP_REACHABILITY_HINTS */
-void nd6_cleanup_netif(struct netif *netif);
-#if LWIP_IPV6_MLD
-void nd6_adjust_mld_membership(struct netif *netif, s8_t addr_idx, u8_t new_state);
-#endif /* LWIP_IPV6_MLD */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV6 */
-
-#endif /* LWIP_HDR_ND6_H */
diff --git a/sys/include/net/net.h b/sys/include/net/net.h
deleted file mode 100644
index d18fc60..0000000
--- a/sys/include/net/net.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: net.h 79 2016-01-11 16:21:27Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _NET_H
-#define _NET_H
-
-#include <sys/types.h>
-#include <net/netif.h>
-
-struct netif lnc_netif;
-
-int net_init();
-
-#endif
diff --git a/sys/include/net/netbuf.h b/sys/include/net/netbuf.h
deleted file mode 100644
index c75bfa7..0000000
--- a/sys/include/net/netbuf.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file
- * netbuf API (for netconn API)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_NETBUF_H
-#define LWIP_HDR_NETBUF_H
-
-#include "net/opt.h"
-
-#if LWIP_NETCONN || LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
-/* Note: Netconn API is always available when sockets are enabled -
- * sockets are implemented on top of them */
-
-#include "net/pbuf.h"
-#include "net/ip_addr.h"
-#include "net/ip6_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This netbuf has dest-addr/port set */
-#define NETBUF_FLAG_DESTADDR    0x01
-/** This netbuf includes a checksum */
-#define NETBUF_FLAG_CHKSUM      0x02
-
-/** "Network buffer" - contains data and addressing info */
-struct netbuf {
-  struct pbuf *p, *ptr;
-  ip_addr_t addr;
-  u16_t port;
-#if LWIP_NETBUF_RECVINFO || LWIP_CHECKSUM_ON_COPY
-#if LWIP_CHECKSUM_ON_COPY
-  u8_t flags;
-#endif /* LWIP_CHECKSUM_ON_COPY */
-  u16_t toport_chksum;
-#if LWIP_NETBUF_RECVINFO
-  ip_addr_t toaddr;
-#endif /* LWIP_NETBUF_RECVINFO */
-#endif /* LWIP_NETBUF_RECVINFO || LWIP_CHECKSUM_ON_COPY */
-};
-
-/* Network buffer functions: */
-struct netbuf *   netbuf_new      (void);
-void              netbuf_delete   (struct netbuf *buf);
-void *            netbuf_alloc    (struct netbuf *buf, u16_t size);
-void              netbuf_free     (struct netbuf *buf);
-err_t             netbuf_ref      (struct netbuf *buf,
-                                   const void *dataptr, u16_t size);
-void              netbuf_chain    (struct netbuf *head, struct netbuf *tail);
-
-err_t             netbuf_data     (struct netbuf *buf,
-                                   void **dataptr, u16_t *len);
-s8_t              netbuf_next     (struct netbuf *buf);
-void              netbuf_first    (struct netbuf *buf);
-
-
-#define netbuf_copy_partial(buf, dataptr, len, offset) \
-  pbuf_copy_partial((buf)->p, (dataptr), (len), (offset))
-#define netbuf_copy(buf,dataptr,len) netbuf_copy_partial(buf, dataptr, len, 0)
-#define netbuf_take(buf, dataptr, len) pbuf_take((buf)->p, dataptr, len)
-#define netbuf_len(buf)              ((buf)->p->tot_len)
-#define netbuf_fromaddr(buf)         (&((buf)->addr))
-#define netbuf_set_fromaddr(buf, fromaddr) ip_addr_set(&((buf)->addr), fromaddr)
-#define netbuf_fromport(buf)         ((buf)->port)
-#if LWIP_NETBUF_RECVINFO
-#define netbuf_destaddr(buf)         (&((buf)->toaddr))
-#define netbuf_set_destaddr(buf, destaddr) ip_addr_set(&((buf)->toaddr), destaddr)
-#if LWIP_CHECKSUM_ON_COPY
-#define netbuf_destport(buf)         (((buf)->flags & NETBUF_FLAG_DESTADDR) ? (buf)->toport_chksum : 0)
-#else /* LWIP_CHECKSUM_ON_COPY */
-#define netbuf_destport(buf)         ((buf)->toport_chksum)
-#endif /* LWIP_CHECKSUM_ON_COPY */
-#endif /* LWIP_NETBUF_RECVINFO */
-#if LWIP_CHECKSUM_ON_COPY
-#define netbuf_set_chksum(buf, chksum) do { (buf)->flags = NETBUF_FLAG_CHKSUM; \
-                                            (buf)->toport_chksum = chksum; } while(0)
-#endif /* LWIP_CHECKSUM_ON_COPY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_NETCONN || LWIP_SOCKET */
-
-#endif /* LWIP_HDR_NETBUF_H */
diff --git a/sys/include/net/netdb.h b/sys/include/net/netdb.h
deleted file mode 100644
index b9b919a..0000000
--- a/sys/include/net/netdb.h
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * @file
- * NETDB API (sockets)
- */
-
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Simon Goldschmidt
- *
- */
-#ifndef LWIP_HDR_NETDB_H
-#define LWIP_HDR_NETDB_H
-
-#include "net/opt.h"
-
-#if LWIP_DNS && LWIP_SOCKET
-
-#include "net/arch.h"
-#include "net/inet.h"
-#include "net/sockets.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* some rarely used options */
-#ifndef LWIP_DNS_API_DECLARE_H_ERRNO
-#define LWIP_DNS_API_DECLARE_H_ERRNO  1
-#endif
-
-#ifndef LWIP_DNS_API_DEFINE_ERRORS
-#define LWIP_DNS_API_DEFINE_ERRORS    1
-#endif
-
-#ifndef LWIP_DNS_API_DEFINE_FLAGS
-#define LWIP_DNS_API_DEFINE_FLAGS     1
-#endif
-
-#ifndef LWIP_DNS_API_DECLARE_STRUCTS
-#define LWIP_DNS_API_DECLARE_STRUCTS  1
-#endif
-
-#if LWIP_DNS_API_DEFINE_ERRORS
-/** Errors used by the DNS API functions, h_errno can be one of them */
-#define EAI_NONAME      200
-#define EAI_SERVICE     201
-#define EAI_FAIL        202
-#define EAI_MEMORY      203
-#define EAI_FAMILY      204
-
-#define HOST_NOT_FOUND  210
-#define NO_DATA         211
-#define NO_RECOVERY     212
-#define TRY_AGAIN       213
-#endif /* LWIP_DNS_API_DEFINE_ERRORS */
-
-#if LWIP_DNS_API_DEFINE_FLAGS
-/* input flags for struct addrinfo */
-#define AI_PASSIVE      0x01
-#define AI_CANONNAME    0x02
-#define AI_NUMERICHOST  0x04
-#define AI_NUMERICSERV  0x08
-#define AI_V4MAPPED     0x10
-#define AI_ALL          0x20
-#define AI_ADDRCONFIG   0x40
-#endif /* LWIP_DNS_API_DEFINE_FLAGS */
-
-#if LWIP_DNS_API_DECLARE_STRUCTS
-struct hostent {
-    char  *h_name;      /* Official name of the host. */
-    char **h_aliases;   /* A pointer to an array of pointers to alternative host names,
-                           terminated by a null pointer. */
-    int    h_addrtype;  /* Address type. */
-    int    h_length;    /* The length, in bytes, of the address. */
-    char **h_addr_list; /* A pointer to an array of pointers to network addresses (in
-                           network byte order) for the host, terminated by a null pointer. */
-#define h_addr h_addr_list[0] /* for backward compatibility */
-};
-
-struct addrinfo {
-    int               ai_flags;      /* Input flags. */
-    int               ai_family;     /* Address family of socket. */
-    int               ai_socktype;   /* Socket type. */
-    int               ai_protocol;   /* Protocol of socket. */
-    socklen_t         ai_addrlen;    /* Length of socket address. */
-    struct sockaddr  *ai_addr;       /* Socket address of socket. */
-    char             *ai_canonname;  /* Canonical name of service location. */
-    struct addrinfo  *ai_next;       /* Pointer to next in list. */
-};
-#endif /* LWIP_DNS_API_DECLARE_STRUCTS */
-
-#define NETDB_ELEM_SIZE           (sizeof(struct addrinfo) + sizeof(struct sockaddr_storage) + DNS_MAX_NAME_LENGTH + 1)
-
-#if LWIP_DNS_API_DECLARE_H_ERRNO
-/* application accessible error code set by the DNS API functions */
-extern int h_errno;
-#endif /* LWIP_DNS_API_DECLARE_H_ERRNO*/
-
-struct hostent *lwip_gethostbyname(const char *name);
-int lwip_gethostbyname_r(const char *name, struct hostent *ret, char *buf,
-                size_t buflen, struct hostent **result, int *h_errnop);
-void lwip_freeaddrinfo(struct addrinfo *ai);
-int lwip_getaddrinfo(const char *nodename,
-       const char *servname,
-       const struct addrinfo *hints,
-       struct addrinfo **res);
-
-#if LWIP_COMPAT_SOCKETS
-/** @ingroup netdbapi */
-#define gethostbyname(name) lwip_gethostbyname(name)
-/** @ingroup netdbapi */
-#define gethostbyname_r(name, ret, buf, buflen, result, h_errnop) \
-       lwip_gethostbyname_r(name, ret, buf, buflen, result, h_errnop)
-/** @ingroup netdbapi */
-#define freeaddrinfo(addrinfo) lwip_freeaddrinfo(addrinfo)
-/** @ingroup netdbapi */
-#define getaddrinfo(nodname, servname, hints, res) \
-       lwip_getaddrinfo(nodname, servname, hints, res)
-#endif /* LWIP_COMPAT_SOCKETS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_DNS && LWIP_SOCKET */
-
-#endif /* LWIP_HDR_NETDB_H */
diff --git a/sys/include/net/netif.h b/sys/include/net/netif.h
deleted file mode 100644
index f7b0941..0000000
--- a/sys/include/net/netif.h
+++ /dev/null
@@ -1,485 +0,0 @@
-/**
- * @file
- * netif API (to be used from TCPIP thread)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_NETIF_H
-#define LWIP_HDR_NETIF_H
-
-#include <net/opt.h>
-
-#define ENABLE_LOOPBACK (LWIP_NETIF_LOOPBACK || LWIP_HAVE_LOOPIF)
-
-#include <net/err.h>
-
-#include <net/ip_addr.h>
-
-#include <net/def.h>
-#include <net/pbuf.h>
-#include <net/stats.h>
-
-struct nicBuffer {
-  struct nicBuffer *next;
-  int               length;
-  char             *buffer;
-};
-
-struct nicBuffer *tmpBuf;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Throughout this file, IP addresses are expected to be in
- * the same byte order as in IP_PCB. */
-
-/** Must be the maximum of all used hardware address lengths
-    across all types of interfaces in use.
-    This does not have to be changed, normally. */
-#ifndef NETIF_MAX_HWADDR_LEN
-#define NETIF_MAX_HWADDR_LEN 6U
-#endif
-
-/**
- * @defgroup netif_flags Flags
- * @ingroup netif
- * @{
- */
-
-/** Whether the network interface is 'up'. This is
- * a software flag used to control whether this network
- * interface is enabled and processes traffic.
- * It must be set by the startup code before this netif can be used
- * (also for dhcp/autoip).
- */
-#define NETIF_FLAG_UP           0x01U
-/** If set, the netif has broadcast capability.
- * Set by the netif driver in its init function. */
-#define NETIF_FLAG_BROADCAST    0x02U
-/** If set, the interface has an active link
- *  (set by the network interface driver).
- * Either set by the netif driver in its init function (if the link
- * is up at that time) or at a later point once the link comes up
- * (if link detection is supported by the hardware). */
-#define NETIF_FLAG_LINK_UP      0x04U
-/** If set, the netif is an ethernet device using ARP.
- * Set by the netif driver in its init function.
- * Used to check input packet types and use of DHCP. */
-#define NETIF_FLAG_ETHARP       0x08U
-/** If set, the netif is an ethernet device. It might not use
- * ARP or TCP/IP if it is used for PPPoE only.
- */
-#define NETIF_FLAG_ETHERNET     0x10U
-/** If set, the netif has IGMP capability.
- * Set by the netif driver in its init function. */
-#define NETIF_FLAG_IGMP         0x20U
-/** If set, the netif has MLD6 capability.
- * Set by the netif driver in its init function. */
-#define NETIF_FLAG_MLD6         0x40U
-
-/**
- * @}
- */
-
-enum lwip_internal_netif_client_data_index
-{
-#if LWIP_DHCP
-   LWIP_NETIF_CLIENT_DATA_INDEX_DHCP,
-#endif
-#if LWIP_AUTOIP
-   LWIP_NETIF_CLIENT_DATA_INDEX_AUTOIP,
-#endif
-#if LWIP_IGMP
-   LWIP_NETIF_CLIENT_DATA_INDEX_IGMP,
-#endif
-#if LWIP_IPV6_MLD
-   LWIP_NETIF_CLIENT_DATA_INDEX_MLD6,
-#endif
-   LWIP_NETIF_CLIENT_DATA_INDEX_MAX
-};
-
-#if LWIP_CHECKSUM_CTRL_PER_NETIF
-#define NETIF_CHECKSUM_GEN_IP       0x0001
-#define NETIF_CHECKSUM_GEN_UDP      0x0002
-#define NETIF_CHECKSUM_GEN_TCP      0x0004
-#define NETIF_CHECKSUM_GEN_ICMP     0x0008
-#define NETIF_CHECKSUM_GEN_ICMP6    0x0010
-#define NETIF_CHECKSUM_CHECK_IP     0x0100
-#define NETIF_CHECKSUM_CHECK_UDP    0x0200
-#define NETIF_CHECKSUM_CHECK_TCP    0x0400
-#define NETIF_CHECKSUM_CHECK_ICMP   0x0800
-#define NETIF_CHECKSUM_CHECK_ICMP6  0x1000
-#define NETIF_CHECKSUM_ENABLE_ALL   0xFFFF
-#define NETIF_CHECKSUM_DISABLE_ALL  0x0000
-#endif /* LWIP_CHECKSUM_CTRL_PER_NETIF */
-
-struct netif;
-
-/** MAC Filter Actions, these are passed to a netif's igmp_mac_filter or
- * mld_mac_filter callback function. */
-enum netif_mac_filter_action {
-  /** Delete a filter entry */
-  NETIF_DEL_MAC_FILTER = 0,
-  /** Add a filter entry */
-  NETIF_ADD_MAC_FILTER = 1
-};
-
-/** Function prototype for netif init functions. Set up flags and output/linkoutput
- * callback functions in this function.
- *
- * @param netif The netif to initialize
- */
-typedef err_t (*netif_init_fn)(struct netif *netif);
-/** Function prototype for netif->input functions. This function is saved as 'input'
- * callback function in the netif struct. Call it when a packet has been received.
- *
- * @param p The received packet, copied into a pbuf
- * @param inp The netif which received the packet
- */
-typedef err_t (*netif_input_fn)(struct pbuf *p, struct netif *inp);
-
-#if LWIP_IPV4
-/** Function prototype for netif->output functions. Called by lwIP when a packet
- * shall be sent. For ethernet netif, set this to 'etharp_output' and set
- * 'linkoutput'.
- *
- * @param netif The netif which shall send a packet
- * @param p The packet to send (p->payload points to IP header)
- * @param ipaddr The IP address to which the packet shall be sent
- */
-typedef err_t (*netif_output_fn)(struct netif *netif, struct pbuf *p,
-       const ip4_addr_t *ipaddr);
-#endif /* LWIP_IPV4*/
-
-#if LWIP_IPV6
-/** Function prototype for netif->output_ip6 functions. Called by lwIP when a packet
- * shall be sent. For ethernet netif, set this to 'ethip6_output' and set
- * 'linkoutput'.
- *
- * @param netif The netif which shall send a packet
- * @param p The packet to send (p->payload points to IP header)
- * @param ipaddr The IPv6 address to which the packet shall be sent
- */
-typedef err_t (*netif_output_ip6_fn)(struct netif *netif, struct pbuf *p,
-       const ip6_addr_t *ipaddr);
-#endif /* LWIP_IPV6 */
-
-/** Function prototype for netif->linkoutput functions. Only used for ethernet
- * netifs. This function is called by ARP when a packet shall be sent.
- *
- * @param netif The netif which shall send a packet
- * @param p The packet to send (raw ethernet packet)
- */
-typedef err_t (*netif_linkoutput_fn)(struct netif *netif, struct pbuf *p);
-/** Function prototype for netif status- or link-callback functions. */
-typedef void (*netif_status_callback_fn)(struct netif *netif);
-#if LWIP_IPV4 && LWIP_IGMP
-/** Function prototype for netif igmp_mac_filter functions */
-typedef err_t (*netif_igmp_mac_filter_fn)(struct netif *netif,
-       const ip4_addr_t *group, enum netif_mac_filter_action action);
-#endif /* LWIP_IPV4 && LWIP_IGMP */
-#if LWIP_IPV6 && LWIP_IPV6_MLD
-/** Function prototype for netif mld_mac_filter functions */
-typedef err_t (*netif_mld_mac_filter_fn)(struct netif *netif,
-       const ip6_addr_t *group, enum netif_mac_filter_action action);
-#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
-
-#if LWIP_DHCP || LWIP_AUTOIP || LWIP_IGMP || LWIP_IPV6_MLD || (LWIP_NUM_NETIF_CLIENT_DATA > 0)
-u8_t netif_alloc_client_data_id(void);
-/** @ingroup netif_cd
- * Set client data. Obtain ID from netif_alloc_client_data_id().
- */
-#define netif_set_client_data(netif, id, data) netif_get_client_data(netif, id) = (data)
-/** @ingroup netif_cd
- * Get client data. Obtain ID from netif_alloc_client_data_id().
- */
-#define netif_get_client_data(netif, id)       (netif)->client_data[(id)]
-#endif /* LWIP_DHCP || LWIP_AUTOIP || (LWIP_NUM_NETIF_CLIENT_DATA > 0) */
-
-/** Generic data structure used for all lwIP network interfaces.
- *  The following fields should be filled in by the initialization
- *  function for the device driver: hwaddr_len, hwaddr[], mtu, flags */
-struct netif {
-  /** pointer to next in linked list */
-  struct netif *next;
-
-#if LWIP_IPV4
-  /** IP address configuration in network byte order */
-  ip_addr_t ip_addr;
-  ip_addr_t netmask;
-  ip_addr_t gw;
-#endif /* LWIP_IPV4 */
-#if LWIP_IPV6
-  /** Array of IPv6 addresses for this netif. */
-  ip_addr_t ip6_addr[LWIP_IPV6_NUM_ADDRESSES];
-  /** The state of each IPv6 address (Tentative, Preferred, etc).
-   * @see ip6_addr.h */
-  u8_t ip6_addr_state[LWIP_IPV6_NUM_ADDRESSES];
-#endif /* LWIP_IPV6 */
-  /** This function is called by the network device driver
-   *  to pass a packet up the TCP/IP stack. */
-  netif_input_fn input;
-#if LWIP_IPV4
-  /** This function is called by the IP module when it wants
-   *  to send a packet on the interface. This function typically
-   *  first resolves the hardware address, then sends the packet.
-   *  For ethernet physical layer, this is usually etharp_output() */
-  netif_output_fn output;
-#endif /* LWIP_IPV4 */
-  /** This function is called by ethernet_output() when it wants
-   *  to send a packet on the interface. This function outputs
-   *  the pbuf as-is on the link medium. */
-  netif_linkoutput_fn linkoutput;
-#if LWIP_IPV6
-  /** This function is called by the IPv6 module when it wants
-   *  to send a packet on the interface. This function typically
-   *  first resolves the hardware address, then sends the packet.
-   *  For ethernet physical layer, this is usually ethip6_output() */
-  netif_output_ip6_fn output_ip6;
-#endif /* LWIP_IPV6 */
-#if LWIP_NETIF_STATUS_CALLBACK
-  /** This function is called when the netif state is set to up or down
-   */
-  netif_status_callback_fn status_callback;
-#endif /* LWIP_NETIF_STATUS_CALLBACK */
-#if LWIP_NETIF_LINK_CALLBACK
-  /** This function is called when the netif link is set to up or down
-   */
-  netif_status_callback_fn link_callback;
-#endif /* LWIP_NETIF_LINK_CALLBACK */
-#if LWIP_NETIF_REMOVE_CALLBACK
-  /** This function is called when the netif has been removed */
-  netif_status_callback_fn remove_callback;
-#endif /* LWIP_NETIF_REMOVE_CALLBACK */
-  /** This field can be set by the device driver and could point
-   *  to state information for the device. */
-  void *state;
-#ifdef netif_get_client_data
-  void* client_data[LWIP_NETIF_CLIENT_DATA_INDEX_MAX + LWIP_NUM_NETIF_CLIENT_DATA];
-#endif
-#if LWIP_IPV6_AUTOCONFIG
-  /** is this netif enabled for IPv6 autoconfiguration */
-  u8_t ip6_autoconfig_enabled;
-#endif /* LWIP_IPV6_AUTOCONFIG */
-#if LWIP_IPV6_SEND_ROUTER_SOLICIT
-  /** Number of Router Solicitation messages that remain to be sent. */
-  u8_t rs_count;
-#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
-#if LWIP_NETIF_HOSTNAME
-  /* the hostname for this netif, NULL is a valid value */
-  const char*  hostname;
-#endif /* LWIP_NETIF_HOSTNAME */
-#if LWIP_CHECKSUM_CTRL_PER_NETIF
-  u16_t chksum_flags;
-#endif /* LWIP_CHECKSUM_CTRL_PER_NETIF*/
-  /** maximum transfer unit (in bytes) */
-  u16_t mtu;
-  /** number of bytes used in hwaddr */
-  u8_t hwaddr_len;
-  /** link level hardware address of this interface */
-  u8_t hwaddr[NETIF_MAX_HWADDR_LEN];
-  /** flags (@see @ref netif_flags) */
-  u8_t flags;
-  /** descriptive abbreviation */
-  char name[2];
-  /** number of this interface */
-  u8_t num;
-#if MIB2_STATS
-  /** link type (from "snmp_ifType" enum from snmp_mib2.h) */
-  u8_t link_type;
-  /** (estimate) link speed */
-  u32_t link_speed;
-  /** timestamp at last change made (up/down) */
-  u32_t ts;
-  /** counters */
-  struct stats_mib2_netif_ctrs mib2_counters;
-#endif /* MIB2_STATS */
-#if LWIP_IPV4 && LWIP_IGMP
-  /** This function could be called to add or delete an entry in the multicast
-      filter table of the ethernet MAC.*/
-  netif_igmp_mac_filter_fn igmp_mac_filter;
-#endif /* LWIP_IPV4 && LWIP_IGMP */
-#if LWIP_IPV6 && LWIP_IPV6_MLD
-  /** This function could be called to add or delete an entry in the IPv6 multicast
-      filter table of the ethernet MAC. */
-  netif_mld_mac_filter_fn mld_mac_filter;
-#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
-#if LWIP_NETIF_HWADDRHINT
-  u8_t *addr_hint;
-#endif /* LWIP_NETIF_HWADDRHINT */
-#if ENABLE_LOOPBACK
-  /* List of packets to be queued for ourselves. */
-  struct pbuf *loop_first;
-  struct pbuf *loop_last;
-#if LWIP_LOOPBACK_MAX_PBUFS
-  u16_t loop_cnt_current;
-#endif /* LWIP_LOOPBACK_MAX_PBUFS */
-#endif /* ENABLE_LOOPBACK */
-};
-
-#if LWIP_CHECKSUM_CTRL_PER_NETIF
-#define NETIF_SET_CHECKSUM_CTRL(netif, chksumflags) do { \
-  (netif)->chksum_flags = chksumflags; } while(0)
-#define IF__NETIF_CHECKSUM_ENABLED(netif, chksumflag) if (((netif) == NULL) || (((netif)->chksum_flags & (chksumflag)) != 0))
-#else /* LWIP_CHECKSUM_CTRL_PER_NETIF */
-#define NETIF_SET_CHECKSUM_CTRL(netif, chksumflags)
-#define IF__NETIF_CHECKSUM_ENABLED(netif, chksumflag)
-#endif /* LWIP_CHECKSUM_CTRL_PER_NETIF */
-
-/** The list of network interfaces. */
-extern struct netif *netif_list;
-/** The default network interface. */
-extern struct netif *netif_default;
-
-void netif_init(void);
-
-struct netif *netif_add(struct netif *netif,
-#if LWIP_IPV4
-                        const ip4_addr_t *ipaddr, const ip4_addr_t *netmask, const ip4_addr_t *gw,
-#endif /* LWIP_IPV4 */
-                        void *state, netif_init_fn init, netif_input_fn input);
-#if LWIP_IPV4
-void netif_set_addr(struct netif *netif, const ip4_addr_t *ipaddr, const ip4_addr_t *netmask,
-                    const ip4_addr_t *gw);
-#endif /* LWIP_IPV4 */
-void netif_remove(struct netif * netif);
-
-/* Returns a network interface given its name. The name is of the form
-   "et0", where the first two letters are the "name" field in the
-   netif structure, and the digit is in the num field in the same
-   structure. */
-struct netif *netif_find(const char *name);
-
-void netif_set_default(struct netif *netif);
-
-#if LWIP_IPV4
-void netif_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr);
-void netif_set_netmask(struct netif *netif, const ip4_addr_t *netmask);
-void netif_set_gw(struct netif *netif, const ip4_addr_t *gw);
-/** @ingroup netif_ip4 */
-#define netif_ip4_addr(netif)    ((const ip4_addr_t*)ip_2_ip4(&((netif)->ip_addr)))
-/** @ingroup netif_ip4 */
-#define netif_ip4_netmask(netif) ((const ip4_addr_t*)ip_2_ip4(&((netif)->netmask)))
-/** @ingroup netif_ip4 */
-#define netif_ip4_gw(netif)      ((const ip4_addr_t*)ip_2_ip4(&((netif)->gw)))
-/** @ingroup netif_ip4 */
-#define netif_ip_addr4(netif)    ((const ip_addr_t*)&((netif)->ip_addr))
-/** @ingroup netif_ip4 */
-#define netif_ip_netmask4(netif) ((const ip_addr_t*)&((netif)->netmask))
-/** @ingroup netif_ip4 */
-#define netif_ip_gw4(netif)      ((const ip_addr_t*)&((netif)->gw))
-#endif /* LWIP_IPV4 */
-
-void netif_set_up(struct netif *netif);
-void netif_set_down(struct netif *netif);
-/** @ingroup netif
- * Ask if an interface is up
- */
-#define netif_is_up(netif) (((netif)->flags & NETIF_FLAG_UP) ? (u8_t)1 : (u8_t)0)
-
-#if LWIP_NETIF_STATUS_CALLBACK
-void netif_set_status_callback(struct netif *netif, netif_status_callback_fn status_callback);
-#endif /* LWIP_NETIF_STATUS_CALLBACK */
-#if LWIP_NETIF_REMOVE_CALLBACK
-void netif_set_remove_callback(struct netif *netif, netif_status_callback_fn remove_callback);
-#endif /* LWIP_NETIF_REMOVE_CALLBACK */
-
-void netif_set_link_up(struct netif *netif);
-void netif_set_link_down(struct netif *netif);
-/** Ask if a link is up */
-#define netif_is_link_up(netif) (((netif)->flags & NETIF_FLAG_LINK_UP) ? (u8_t)1 : (u8_t)0)
-
-#if LWIP_NETIF_LINK_CALLBACK
-void netif_set_link_callback(struct netif *netif, netif_status_callback_fn link_callback);
-#endif /* LWIP_NETIF_LINK_CALLBACK */
-
-#if LWIP_NETIF_HOSTNAME
-/** @ingroup netif */
-#define netif_set_hostname(netif, name) do { if((netif) != NULL) { (netif)->hostname = name; }}while(0)
-/** @ingroup netif */
-#define netif_get_hostname(netif) (((netif) != NULL) ? ((netif)->hostname) : NULL)
-#endif /* LWIP_NETIF_HOSTNAME */
-
-#if LWIP_IGMP
-/** @ingroup netif */
-#define netif_set_igmp_mac_filter(netif, function) do { if((netif) != NULL) { (netif)->igmp_mac_filter = function; }}while(0)
-#define netif_get_igmp_mac_filter(netif) (((netif) != NULL) ? ((netif)->igmp_mac_filter) : NULL)
-#endif /* LWIP_IGMP */
-
-#if LWIP_IPV6 && LWIP_IPV6_MLD
-/** @ingroup netif */
-#define netif_set_mld_mac_filter(netif, function) do { if((netif) != NULL) { (netif)->mld_mac_filter = function; }}while(0)
-#define netif_get_mld_mac_filter(netif) (((netif) != NULL) ? ((netif)->mld_mac_filter) : NULL)
-#define netif_mld_mac_filter(netif, addr, action) do { if((netif) && (netif)->mld_mac_filter) { (netif)->mld_mac_filter((netif), (addr), (action)); }}while(0)
-#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
-
-#if ENABLE_LOOPBACK
-err_t netif_loop_output(struct netif *netif, struct pbuf *p);
-void netif_poll(struct netif *netif);
-#if !LWIP_NETIF_LOOPBACK_MULTITHREADING
-void netif_poll_all(void);
-#endif /* !LWIP_NETIF_LOOPBACK_MULTITHREADING */
-#endif /* ENABLE_LOOPBACK */
-
-err_t netif_input(struct pbuf *p, struct netif *inp);
-
-#if LWIP_IPV6
-/** @ingroup netif_ip6 */
-#define netif_ip_addr6(netif, i)  ((const ip_addr_t*)(&((netif)->ip6_addr[i])))
-/** @ingroup netif_ip6 */
-#define netif_ip6_addr(netif, i)  ((const ip6_addr_t*)ip_2_ip6(&((netif)->ip6_addr[i])))
-void netif_ip6_addr_set(struct netif *netif, s8_t addr_idx, const ip6_addr_t *addr6);
-void netif_ip6_addr_set_parts(struct netif *netif, s8_t addr_idx, u32_t i0, u32_t i1, u32_t i2, u32_t i3);
-#define netif_ip6_addr_state(netif, i)  ((netif)->ip6_addr_state[i])
-void netif_ip6_addr_set_state(struct netif* netif, s8_t addr_idx, u8_t state);
-s8_t netif_get_ip6_addr_match(struct netif *netif, const ip6_addr_t *ip6addr);
-void netif_create_ip6_linklocal_address(struct netif *netif, u8_t from_mac_48bit);
-err_t netif_add_ip6_address(struct netif *netif, const ip6_addr_t *ip6addr, s8_t *chosen_idx);
-#define netif_set_ip6_autoconfig_enabled(netif, action) do { if(netif) { (netif)->ip6_autoconfig_enabled = (action); }}while(0)
-#endif /* LWIP_IPV6 */
-
-#if LWIP_NETIF_HWADDRHINT
-#define NETIF_SET_HWADDRHINT(netif, hint) ((netif)->addr_hint = (hint))
-#else /* LWIP_NETIF_HWADDRHINT */
-#define NETIF_SET_HWADDRHINT(netif, hint)
-#endif /* LWIP_NETIF_HWADDRHINT */
-
-#ifdef __cplusplus
-}
-#endif
-
-/*MrOlsen 2017-12-17 LWIP */
-void ethernetif_input(struct netif *);
-
-#endif /* LWIP_HDR_NETIF_H */
diff --git a/sys/include/net/netifapi.h b/sys/include/net/netifapi.h
deleted file mode 100644
index 82cb80e..0000000
--- a/sys/include/net/netifapi.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * @file
- * netif API (to be used from non-TCPIP threads)
- */
-
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-#ifndef LWIP_HDR_NETIFAPI_H
-#define LWIP_HDR_NETIFAPI_H
-
-#include "net/opt.h"
-
-#if LWIP_NETIF_API /* don't build if not configured for use in lwipopts.h */
-
-#include "net/sys.h"
-#include "net/netif.h"
-#include "net/dhcp.h"
-#include "net/autoip.h"
-#include "net/priv/tcpip_priv.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_MPU_COMPATIBLE
-#define NETIFAPI_IPADDR_DEF(type, m)  type m
-#else /* LWIP_MPU_COMPATIBLE */
-#define NETIFAPI_IPADDR_DEF(type, m)  const type * m
-#endif /* LWIP_MPU_COMPATIBLE */
-
-typedef void (*netifapi_void_fn)(struct netif *netif);
-typedef err_t (*netifapi_errt_fn)(struct netif *netif);
-
-struct netifapi_msg {
-  struct tcpip_api_call_data call;
-  struct netif *netif;
-  union {
-    struct {
-#if LWIP_IPV4
-      NETIFAPI_IPADDR_DEF(ip4_addr_t, ipaddr);
-      NETIFAPI_IPADDR_DEF(ip4_addr_t, netmask);
-      NETIFAPI_IPADDR_DEF(ip4_addr_t, gw);
-#endif /* LWIP_IPV4 */
-      void *state;
-      netif_init_fn init;
-      netif_input_fn input;
-    } add;
-    struct {
-      netifapi_void_fn voidfunc;
-      netifapi_errt_fn errtfunc;
-    } common;
-  } msg;
-};
-
-
-/* API for application */
-err_t netifapi_netif_add(struct netif *netif,
-#if LWIP_IPV4
-                         const ip4_addr_t *ipaddr, const ip4_addr_t *netmask, const ip4_addr_t *gw,
-#endif /* LWIP_IPV4 */
-                         void *state, netif_init_fn init, netif_input_fn input);
-
-#if LWIP_IPV4
-err_t netifapi_netif_set_addr(struct netif *netif, const ip4_addr_t *ipaddr,
-                              const ip4_addr_t *netmask, const ip4_addr_t *gw);
-#endif /* LWIP_IPV4*/
-
-err_t netifapi_netif_common(struct netif *netif, netifapi_void_fn voidfunc,
-                            netifapi_errt_fn errtfunc);
-
-/** @ingroup netifapi_netif */
-#define netifapi_netif_remove(n)        netifapi_netif_common(n, netif_remove, NULL)
-/** @ingroup netifapi_netif */
-#define netifapi_netif_set_up(n)        netifapi_netif_common(n, netif_set_up, NULL)
-/** @ingroup netifapi_netif */
-#define netifapi_netif_set_down(n)      netifapi_netif_common(n, netif_set_down, NULL)
-/** @ingroup netifapi_netif */
-#define netifapi_netif_set_default(n)   netifapi_netif_common(n, netif_set_default, NULL)
-/** @ingroup netifapi_netif */
-#define netifapi_netif_set_link_up(n)   netifapi_netif_common(n, netif_set_link_up, NULL)
-/** @ingroup netifapi_netif */
-#define netifapi_netif_set_link_down(n) netifapi_netif_common(n, netif_set_link_down, NULL)
-
-/**
- * @defgroup netifapi_dhcp4 DHCPv4
- * @ingroup netifapi
- * To be called from non-TCPIP threads
- */
-/** @ingroup netifapi_dhcp4 */
-#define netifapi_dhcp_start(n)        netifapi_netif_common(n, NULL, dhcp_start)
-/** @ingroup netifapi_dhcp4 */
-#define netifapi_dhcp_stop(n)         netifapi_netif_common(n, dhcp_stop, NULL)
-/** @ingroup netifapi_dhcp4 */
-#define netifapi_dhcp_inform(n)       netifapi_netif_common(n, dhcp_inform, NULL)
-/** @ingroup netifapi_dhcp4 */
-#define netifapi_dhcp_renew(n)        netifapi_netif_common(n, NULL, dhcp_renew)
-/** @ingroup netifapi_dhcp4 */
-#define netifapi_dhcp_release(n)      netifapi_netif_common(n, NULL, dhcp_release)
-
-/**
- * @defgroup netifapi_autoip AUTOIP
- * @ingroup netifapi
- * To be called from non-TCPIP threads
- */
-/** @ingroup netifapi_autoip */
-#define netifapi_autoip_start(n)      netifapi_netif_common(n, NULL, autoip_start)
-/** @ingroup netifapi_autoip */
-#define netifapi_autoip_stop(n)       netifapi_netif_common(n, NULL, autoip_stop)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_NETIF_API */
-
-#endif /* LWIP_HDR_NETIFAPI_H */
diff --git a/sys/include/net/opt.h b/sys/include/net/opt.h
deleted file mode 100644
index 3156c2c..0000000
--- a/sys/include/net/opt.h
+++ /dev/null
@@ -1,2835 +0,0 @@
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-/*
- * NOTE: || defined __DOXYGEN__ is a workaround for doxygen bug -
- * without this, doxygen does not see the actual #define
- */
-
-#if !defined LWIP_HDR_OPT_H
-#define LWIP_HDR_OPT_H
-
-/*
- * Include user defined options first. Anything not defined in these files
- * will be set to standard values. Override anything you don't like!
- */
-#include <net/lwipopts.h>
-#include <net/debug.h>
-
-/**
- * @defgroup lwip_opts Options (lwipopts.h)
- * @ingroup lwip
- *
- * @defgroup lwip_opts_debug Debugging
- * @ingroup lwip_opts
- *
- * @defgroup lwip_opts_infrastructure Infrastructure
- * @ingroup lwip_opts
- *
- * @defgroup lwip_opts_callback Callback-style APIs
- * @ingroup lwip_opts
- *
- * @defgroup lwip_opts_threadsafe_apis Thread-safe APIs
- * @ingroup lwip_opts
- */
-
-/**
- * NO_SYS==1: Use lwIP without OS-awareness (no thread, semaphores, mutexes or
- * mboxes). This means threaded APIs cannot be used (socket, netconn,
- * i.e. everything in the 'api' folder), only the callback-style raw API is
- * available (and you have to watch out for yourself that you don't access
- * lwIP functions/structures from more than one context at a time!)
- */
-#if !defined NO_SYS
-#define NO_SYS                          0
-#endif
-
-/**
- * LWIP_TIMERS==0: Drop support for sys_timeout and lwip-internal cyclic timers.
- * (the array of lwip-internal cyclic timers is still provided)
- * (check NO_SYS_NO_TIMERS for compatibility to old versions)
- */
-#if !defined LWIP_TIMERS
-#ifdef NO_SYS_NO_TIMERS
-#define LWIP_TIMERS                     (!NO_SYS || (NO_SYS && !NO_SYS_NO_TIMERS))
-#else
-#define LWIP_TIMERS                     1
-#endif
-#endif
-
-/**
- * LWIP_TIMERS_CUSTOM==1: Provide your own timer implementation.
- * Function prototypes in timeouts.h and the array of lwip-internal cyclic timers
- * are still included, but the implementation is not. The following functions
- * will be required: sys_timeouts_init(), sys_timeout(), sys_untimeout(),
- *                   sys_timeouts_mbox_fetch()
- */
-#if !defined LWIP_TIMERS_CUSTOM
-#define LWIP_TIMERS_CUSTOM              0
-#endif
-
-/**
- * MEMCPY: override this if you have a faster implementation at hand than the
- * one included in your C library
- */
-#if !defined MEMCPY
-#define MEMCPY(dst,src,len)             memcpy(dst,src,len)
-#endif
-
-/**
- * SMEMCPY: override this with care! Some compilers (e.g. gcc) can inline a
- * call to memcpy() if the length is known at compile time and is small.
- */
-#if !defined SMEMCPY
-#define SMEMCPY(dst,src,len)            memcpy(dst,src,len)
-#endif
-
-/*
- ------------------------------------
- ----------- Core locking -----------
- ------------------------------------
- */
-/**
- * LWIP_MPU_COMPATIBLE: enables special memory management mechanism
- * which makes lwip able to work on MPU (Memory Protection Unit) system
- * by not passing stack-pointers to other threads
- * (this decreases performance as memory is allocated from pools instead
- * of keeping it on the stack)
- */
-#if !defined LWIP_MPU_COMPATIBLE
-#define LWIP_MPU_COMPATIBLE             0
-#endif
-
-/**
- * LWIP_TCPIP_CORE_LOCKING
- * Creates a global mutex that is held during TCPIP thread operations.
- * Can be locked by client code to perform lwIP operations without changing
- * into TCPIP thread using callbacks. See LOCK_TCPIP_CORE() and
- * UNLOCK_TCPIP_CORE().
- * Your system should provide mutexes supporting priority inversion to use this.
- */
-#if !defined LWIP_TCPIP_CORE_LOCKING
-#define LWIP_TCPIP_CORE_LOCKING         1
-#endif
-
-/**
- * LWIP_TCPIP_CORE_LOCKING_INPUT: when LWIP_TCPIP_CORE_LOCKING is enabled,
- * this lets tcpip_input() grab the mutex for input packets as well,
- * instead of allocating a message and passing it to tcpip_thread.
- *
- * ATTENTION: this does not work when tcpip_input() is called from
- * interrupt context!
- */
-#if !defined LWIP_TCPIP_CORE_LOCKING_INPUT || defined __DOXYGEN__
-#define LWIP_TCPIP_CORE_LOCKING_INPUT   0
-#endif
-
-/**
- * SYS_LIGHTWEIGHT_PROT==1: enable inter-task protection (and task-vs-interrupt
- * protection) for certain critical regions during buffer allocation, deallocation
- * and memory allocation and deallocation.
- * ATTENTION: This is required when using lwIP from more than one context! If
- * you disable this, you must be sure what you are doing!
- */
-#if !defined SYS_LIGHTWEIGHT_PROT || defined __DOXYGEN__
-#define SYS_LIGHTWEIGHT_PROT            1
-#endif
-/**
- * @}
- */
-
-/*
- ------------------------------------
- ---------- Memory options ----------
- ------------------------------------
- */
-/**
- * @defgroup lwip_opts_mem Heap and memory pools
- * @ingroup lwip_opts_infrastructure
- * @{
- */
-/**
- * MEM_LIBC_MALLOC==1: Use malloc/free/realloc provided by your C-library
- * instead of the lwip internal allocator. Can save code size if you
- * already use it.
- */
-#if !defined MEM_LIBC_MALLOC || defined __DOXYGEN__
-#define MEM_LIBC_MALLOC                 0
-#endif
-
-/**
- * MEMP_MEM_MALLOC==1: Use mem_malloc/mem_free instead of the lwip pool allocator.
- * Especially useful with MEM_LIBC_MALLOC but handle with care regarding execution
- * speed (heap alloc can be much slower than pool alloc) and usage from interrupts
- * (especially if your netif driver allocates PBUF_POOL pbufs for received frames
- * from interrupt)!
- * ATTENTION: Currently, this uses the heap for ALL pools (also for private pools,
- * not only for internal pools defined in memp_std.h)!
- */
-#if !defined MEMP_MEM_MALLOC || defined __DOXYGEN__
-#define MEMP_MEM_MALLOC                 0
-#endif
-
-/**
- * MEM_ALIGNMENT: should be set to the alignment of the CPU
- *    4 byte alignment -> \#define MEM_ALIGNMENT 4
- *    2 byte alignment -> \#define MEM_ALIGNMENT 2
- */
-#if !defined MEM_ALIGNMENT || defined __DOXYGEN__
-#define MEM_ALIGNMENT                   1
-#endif
-
-/**
- * MEM_SIZE: the size of the heap memory. If the application will send
- * a lot of data that needs to be copied, this should be set high.
- */
-#if !defined MEM_SIZE || defined __DOXYGEN__
-#define MEM_SIZE                        1600
-#endif
-
-/**
- * MEMP_OVERFLOW_CHECK: memp overflow protection reserves a configurable
- * amount of bytes before and after each memp element in every pool and fills
- * it with a prominent default value.
- *    MEMP_OVERFLOW_CHECK == 0 no checking
- *    MEMP_OVERFLOW_CHECK == 1 checks each element when it is freed
- *    MEMP_OVERFLOW_CHECK >= 2 checks each element in every pool every time
- *      memp_malloc() or memp_free() is called (useful but slow!)
- */
-#if !defined MEMP_OVERFLOW_CHECK || defined __DOXYGEN__
-#define MEMP_OVERFLOW_CHECK             0
-#endif
-
-/**
- * MEMP_SANITY_CHECK==1: run a sanity check after each memp_free() to make
- * sure that there are no cycles in the linked lists.
- */
-#if !defined MEMP_SANITY_CHECK || defined __DOXYGEN__
-#define MEMP_SANITY_CHECK               0
-#endif
-
-/**
- * MEM_USE_POOLS==1: Use an alternative to malloc() by allocating from a set
- * of memory pools of various sizes. When mem_malloc is called, an element of
- * the smallest pool that can provide the length needed is returned.
- * To use this, MEMP_USE_CUSTOM_POOLS also has to be enabled.
- */
-#if !defined MEM_USE_POOLS || defined __DOXYGEN__
-#define MEM_USE_POOLS                   0
-#endif
-
-/**
- * MEM_USE_POOLS_TRY_BIGGER_POOL==1: if one malloc-pool is empty, try the next
- * bigger pool - WARNING: THIS MIGHT WASTE MEMORY but it can make a system more
- * reliable. */
-#if !defined MEM_USE_POOLS_TRY_BIGGER_POOL || defined __DOXYGEN__
-#define MEM_USE_POOLS_TRY_BIGGER_POOL   0
-#endif
-
-/**
- * MEMP_USE_CUSTOM_POOLS==1: whether to include a user file lwippools.h
- * that defines additional pools beyond the "standard" ones required
- * by lwIP. If you set this to 1, you must have lwippools.h in your
- * include path somewhere.
- */
-#if !defined MEMP_USE_CUSTOM_POOLS || defined __DOXYGEN__
-#define MEMP_USE_CUSTOM_POOLS           0
-#endif
-
-/**
- * Set this to 1 if you want to free PBUF_RAM pbufs (or call mem_free()) from
- * interrupt context (or another context that doesn't allow waiting for a
- * semaphore).
- * If set to 1, mem_malloc will be protected by a semaphore and SYS_ARCH_PROTECT,
- * while mem_free will only use SYS_ARCH_PROTECT. mem_malloc SYS_ARCH_UNPROTECTs
- * with each loop so that mem_free can run.
- *
- * ATTENTION: As you can see from the above description, this leads to dis-/
- * enabling interrupts often, which can be slow! Also, on low memory, mem_malloc
- * can need longer.
- *
- * If you don't want that, at least for NO_SYS=0, you can still use the following
- * functions to enqueue a deallocation call which then runs in the tcpip_thread
- * context:
- * - pbuf_free_callback(p);
- * - mem_free_callback(m);
- */
-#if !defined LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT || defined __DOXYGEN__
-#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 0
-#endif
-/**
- * @}
- */
-
-/*
- ------------------------------------------------
- ---------- Internal Memory Pool Sizes ----------
- ------------------------------------------------
- */
-/**
- * @defgroup lwip_opts_memp Internal memory pools
- * @ingroup lwip_opts_infrastructure
- * @{
- */
-/**
- * MEMP_NUM_PBUF: the number of memp struct pbufs (used for PBUF_ROM and PBUF_REF).
- * If the application sends a lot of data out of ROM (or other static memory),
- * this should be set high.
- */
-#if !defined MEMP_NUM_PBUF || defined __DOXYGEN__
-#define MEMP_NUM_PBUF                   16
-#endif
-
-/**
- * MEMP_NUM_RAW_PCB: Number of raw connection PCBs
- * (requires the LWIP_RAW option)
- */
-#if !defined MEMP_NUM_RAW_PCB || defined __DOXYGEN__
-#define MEMP_NUM_RAW_PCB                4
-#endif
-
-/**
- * MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
- * per active UDP "connection".
- * (requires the LWIP_UDP option)
- */
-#if !defined MEMP_NUM_UDP_PCB || defined __DOXYGEN__
-#define MEMP_NUM_UDP_PCB                4
-#endif
-
-/**
- * MEMP_NUM_TCP_PCB: the number of simultaneously active TCP connections.
- * (requires the LWIP_TCP option)
- */
-#if !defined MEMP_NUM_TCP_PCB || defined __DOXYGEN__
-#define MEMP_NUM_TCP_PCB                5
-#endif
-
-/**
- * MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP connections.
- * (requires the LWIP_TCP option)
- */
-#if !defined MEMP_NUM_TCP_PCB_LISTEN || defined __DOXYGEN__
-#define MEMP_NUM_TCP_PCB_LISTEN         8
-#endif
-
-/**
- * MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP segments.
- * (requires the LWIP_TCP option)
- */
-#if !defined MEMP_NUM_TCP_SEG || defined __DOXYGEN__
-#define MEMP_NUM_TCP_SEG                16
-#endif
-
-/**
- * MEMP_NUM_REASSDATA: the number of IP packets simultaneously queued for
- * reassembly (whole packets, not fragments!)
- */
-#if !defined MEMP_NUM_REASSDATA || defined __DOXYGEN__
-#define MEMP_NUM_REASSDATA              5
-#endif
-
-/**
- * MEMP_NUM_FRAG_PBUF: the number of IP fragments simultaneously sent
- * (fragments, not whole packets!).
- * This is only used with LWIP_NETIF_TX_SINGLE_PBUF==0 and only has to be > 1
- * with DMA-enabled MACs where the packet is not yet sent when netif->output
- * returns.
- */
-#if !defined MEMP_NUM_FRAG_PBUF || defined __DOXYGEN__
-#define MEMP_NUM_FRAG_PBUF              15
-#endif
-
-/**
- * MEMP_NUM_ARP_QUEUE: the number of simultaneously queued outgoing
- * packets (pbufs) that are waiting for an ARP request (to resolve
- * their destination address) to finish.
- * (requires the ARP_QUEUEING option)
- */
-#if !defined MEMP_NUM_ARP_QUEUE || defined __DOXYGEN__
-#define MEMP_NUM_ARP_QUEUE              30
-#endif
-
-/**
- * MEMP_NUM_IGMP_GROUP: The number of multicast groups whose network interfaces
- * can be members at the same time (one per netif - allsystems group -, plus one
- * per netif membership).
- * (requires the LWIP_IGMP option)
- */
-#if !defined MEMP_NUM_IGMP_GROUP || defined __DOXYGEN__
-#define MEMP_NUM_IGMP_GROUP             8
-#endif
-
-/**
- * MEMP_NUM_SYS_TIMEOUT: the number of simultaneously active timeouts.
- * The default number of timeouts is calculated here for all enabled modules.
- * The formula expects settings to be either '0' or '1'.
- */
-#if !defined MEMP_NUM_SYS_TIMEOUT || defined __DOXYGEN__
-#define MEMP_NUM_SYS_TIMEOUT            (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + (PPP_SUPPORT*6*MEMP_NUM_PPP_PCB) + (LWIP_IPV6 ? (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD) : 0))
-#endif
-
-/**
- * MEMP_NUM_NETBUF: the number of struct netbufs.
- * (only needed if you use the sequential API, like api_lib.c)
- */
-#if !defined MEMP_NUM_NETBUF || defined __DOXYGEN__
-#define MEMP_NUM_NETBUF                 2
-#endif
-
-/**
- * MEMP_NUM_NETCONN: the number of struct netconns.
- * (only needed if you use the sequential API, like api_lib.c)
- */
-#if !defined MEMP_NUM_NETCONN || defined __DOXYGEN__
-#define MEMP_NUM_NETCONN                4
-#endif
-
-/**
- * MEMP_NUM_TCPIP_MSG_API: the number of struct tcpip_msg, which are used
- * for callback/timeout API communication.
- * (only needed if you use tcpip.c)
- */
-#if !defined MEMP_NUM_TCPIP_MSG_API || defined __DOXYGEN__
-#define MEMP_NUM_TCPIP_MSG_API          8
-#endif
-
-/**
- * MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which are used
- * for incoming packets.
- * (only needed if you use tcpip.c)
- */
-#if !defined MEMP_NUM_TCPIP_MSG_INPKT || defined __DOXYGEN__
-#define MEMP_NUM_TCPIP_MSG_INPKT        8
-#endif
-
-/**
- * MEMP_NUM_NETDB: the number of concurrently running lwip_addrinfo() calls
- * (before freeing the corresponding memory using lwip_freeaddrinfo()).
- */
-#if !defined MEMP_NUM_NETDB || defined __DOXYGEN__
-#define MEMP_NUM_NETDB                  1
-#endif
-
-/**
- * MEMP_NUM_LOCALHOSTLIST: the number of host entries in the local host list
- * if DNS_LOCAL_HOSTLIST_IS_DYNAMIC==1.
- */
-#if !defined MEMP_NUM_LOCALHOSTLIST || defined __DOXYGEN__
-#define MEMP_NUM_LOCALHOSTLIST          1
-#endif
-
-/**
- * PBUF_POOL_SIZE: the number of buffers in the pbuf pool.
- */
-#if !defined PBUF_POOL_SIZE || defined __DOXYGEN__
-#define PBUF_POOL_SIZE                  16
-#endif
-
-/** MEMP_NUM_API_MSG: the number of concurrently active calls to various
- * socket, netconn, and tcpip functions
- */
-#if !defined MEMP_NUM_API_MSG || defined __DOXYGEN__
-#define MEMP_NUM_API_MSG                MEMP_NUM_TCPIP_MSG_API
-#endif
-
-/** MEMP_NUM_DNS_API_MSG: the number of concurrently active calls to netconn_gethostbyname
- */
-#if !defined MEMP_NUM_DNS_API_MSG || defined __DOXYGEN__
-#define MEMP_NUM_DNS_API_MSG            MEMP_NUM_TCPIP_MSG_API
-#endif
-
-/** MEMP_NUM_SOCKET_SETGETSOCKOPT_DATA: the number of concurrently active calls
- * to getsockopt/setsockopt
- */
-#if !defined MEMP_NUM_SOCKET_SETGETSOCKOPT_DATA || defined __DOXYGEN__
-#define MEMP_NUM_SOCKET_SETGETSOCKOPT_DATA MEMP_NUM_TCPIP_MSG_API
-#endif
-
-/** MEMP_NUM_NETIFAPI_MSG: the number of concurrently active calls to the
- * netifapi functions
- */
-#if !defined MEMP_NUM_NETIFAPI_MSG || defined __DOXYGEN__
-#define MEMP_NUM_NETIFAPI_MSG           MEMP_NUM_TCPIP_MSG_API
-#endif
-/**
- * @}
- */
-
-/*
- ---------------------------------
- ---------- ARP options ----------
- ---------------------------------
- */
-/**
- * @defgroup lwip_opts_arp ARP
- * @ingroup lwip_opts_ipv4
- * @{
- */
-/**
- * LWIP_ARP==1: Enable ARP functionality.
- */
-#if !defined LWIP_ARP || defined __DOXYGEN__
-#define LWIP_ARP                        1
-#endif
-
-/**
- * ARP_TABLE_SIZE: Number of active MAC-IP address pairs cached.
- */
-#if !defined ARP_TABLE_SIZE || defined __DOXYGEN__
-#define ARP_TABLE_SIZE                  10
-#endif
-
-/** the time an ARP entry stays valid after its last update,
- *  for ARP_TMR_INTERVAL = 1000, this is
- *  (60 * 5) seconds = 5 minutes.
- */
-#if !defined ARP_MAXAGE || defined __DOXYGEN__
-#define ARP_MAXAGE                      300
-#endif
-
-/**
- * ARP_QUEUEING==1: Multiple outgoing packets are queued during hardware address
- * resolution. By default, only the most recent packet is queued per IP address.
- * This is sufficient for most protocols and mainly reduces TCP connection
- * startup time. Set this to 1 if you know your application sends more than one
- * packet in a row to an IP address that is not in the ARP cache.
- */
-#if !defined ARP_QUEUEING || defined __DOXYGEN__
-#define ARP_QUEUEING                    0
-#endif
-
-/** The maximum number of packets which may be queued for each
- *  unresolved address by other network layers. Defaults to 3, 0 means disabled.
- *  Old packets are dropped, new packets are queued.
- */
-#if !defined ARP_QUEUE_LEN || defined __DOXYGEN__
-#define ARP_QUEUE_LEN                   3
-#endif
-
-/**
- * ETHARP_SUPPORT_VLAN==1: support receiving and sending ethernet packets with
- * VLAN header. See the description of LWIP_HOOK_VLAN_CHECK and
- * LWIP_HOOK_VLAN_SET hooks to check/set VLAN headers.
- * Additionally, you can define ETHARP_VLAN_CHECK to an u16_t VLAN ID to check.
- * If ETHARP_VLAN_CHECK is defined, only VLAN-traffic for this VLAN is accepted.
- * If ETHARP_VLAN_CHECK is not defined, all traffic is accepted.
- * Alternatively, define a function/define ETHARP_VLAN_CHECK_FN(eth_hdr, vlan)
- * that returns 1 to accept a packet or 0 to drop a packet.
- */
-#if !defined ETHARP_SUPPORT_VLAN || defined __DOXYGEN__
-#define ETHARP_SUPPORT_VLAN             0
-#endif
-
-/** LWIP_ETHERNET==1: enable ethernet support even though ARP might be disabled
- */
-#if !defined LWIP_ETHERNET || defined __DOXYGEN__
-#define LWIP_ETHERNET                   LWIP_ARP
-#endif
-
-/** ETH_PAD_SIZE: number of bytes added before the ethernet header to ensure
- * alignment of payload after that header. Since the header is 14 bytes long,
- * without this padding e.g. addresses in the IP header will not be aligned
- * on a 32-bit boundary, so setting this to 2 can speed up 32-bit-platforms.
- */
-#if !defined ETH_PAD_SIZE || defined __DOXYGEN__
-#define ETH_PAD_SIZE                    0
-#endif
-
-/** ETHARP_SUPPORT_STATIC_ENTRIES==1: enable code to support static ARP table
- * entries (using etharp_add_static_entry/etharp_remove_static_entry).
- */
-#if !defined ETHARP_SUPPORT_STATIC_ENTRIES || defined __DOXYGEN__
-#define ETHARP_SUPPORT_STATIC_ENTRIES   0
-#endif
-
-/** ETHARP_TABLE_MATCH_NETIF==1: Match netif for ARP table entries.
- * If disabled, duplicate IP address on multiple netifs are not supported
- * (but this should only occur for AutoIP).
- */
-#if !defined ETHARP_TABLE_MATCH_NETIF || defined __DOXYGEN__
-#define ETHARP_TABLE_MATCH_NETIF        0
-#endif
-/**
- * @}
- */
-
-/*
- --------------------------------
- ---------- IP options ----------
- --------------------------------
- */
-/**
- * @defgroup lwip_opts_ipv4 IPv4
- * @ingroup lwip_opts
- * @{
- */
-/**
- * LWIP_IPV4==1: Enable IPv4
- */
-#if !defined LWIP_IPV4 || defined __DOXYGEN__
-#define LWIP_IPV4                       1
-#endif
-
-/**
- * IP_FORWARD==1: Enables the ability to forward IP packets across network
- * interfaces. If you are going to run lwIP on a device with only one network
- * interface, define this to 0.
- */
-#if !defined IP_FORWARD || defined __DOXYGEN__
-#define IP_FORWARD                      0
-#endif
-
-/**
- * IP_REASSEMBLY==1: Reassemble incoming fragmented IP packets. Note that
- * this option does not affect outgoing packet sizes, which can be controlled
- * via IP_FRAG.
- */
-#if !defined IP_REASSEMBLY || defined __DOXYGEN__
-#define IP_REASSEMBLY                   1
-#endif
-
-/**
- * IP_FRAG==1: Fragment outgoing IP packets if their size exceeds MTU. Note
- * that this option does not affect incoming packet sizes, which can be
- * controlled via IP_REASSEMBLY.
- */
-#if !defined IP_FRAG || defined __DOXYGEN__
-#define IP_FRAG                         1
-#endif
-
-#if !LWIP_IPV4
-/* disable IPv4 extensions when IPv4 is disabled */
-#undef IP_FORWARD
-#define IP_FORWARD                      0
-#undef IP_REASSEMBLY
-#define IP_REASSEMBLY                   0
-#undef IP_FRAG
-#define IP_FRAG                         0
-#endif /* !LWIP_IPV4 */
-
-/**
- * IP_OPTIONS_ALLOWED: Defines the behavior for IP options.
- *      IP_OPTIONS_ALLOWED==0: All packets with IP options are dropped.
- *      IP_OPTIONS_ALLOWED==1: IP options are allowed (but not parsed).
- */
-#if !defined IP_OPTIONS_ALLOWED || defined __DOXYGEN__
-#define IP_OPTIONS_ALLOWED              1
-#endif
-
-/**
- * IP_REASS_MAXAGE: Maximum time (in multiples of IP_TMR_INTERVAL - so seconds, normally)
- * a fragmented IP packet waits for all fragments to arrive. If not all fragments arrived
- * in this time, the whole packet is discarded.
- */
-#if !defined IP_REASS_MAXAGE || defined __DOXYGEN__
-#define IP_REASS_MAXAGE                 3
-#endif
-
-/**
- * IP_REASS_MAX_PBUFS: Total maximum amount of pbufs waiting to be reassembled.
- * Since the received pbufs are enqueued, be sure to configure
- * PBUF_POOL_SIZE > IP_REASS_MAX_PBUFS so that the stack is still able to receive
- * packets even if the maximum amount of fragments is enqueued for reassembly!
- */
-#if !defined IP_REASS_MAX_PBUFS || defined __DOXYGEN__
-#define IP_REASS_MAX_PBUFS              10
-#endif
-
-/**
- * IP_DEFAULT_TTL: Default value for Time-To-Live used by transport layers.
- */
-#if !defined IP_DEFAULT_TTL || defined __DOXYGEN__
-#define IP_DEFAULT_TTL                  255
-#endif
-
-/**
- * IP_SOF_BROADCAST=1: Use the SOF_BROADCAST field to enable broadcast
- * filter per pcb on udp and raw send operations. To enable broadcast filter
- * on recv operations, you also have to set IP_SOF_BROADCAST_RECV=1.
- */
-#if !defined IP_SOF_BROADCAST || defined __DOXYGEN__
-#define IP_SOF_BROADCAST                0
-#endif
-
-/**
- * IP_SOF_BROADCAST_RECV (requires IP_SOF_BROADCAST=1) enable the broadcast
- * filter on recv operations.
- */
-#if !defined IP_SOF_BROADCAST_RECV || defined __DOXYGEN__
-#define IP_SOF_BROADCAST_RECV           0
-#endif
-
-/**
- * IP_FORWARD_ALLOW_TX_ON_RX_NETIF==1: allow ip_forward() to send packets back
- * out on the netif where it was received. This should only be used for
- * wireless networks.
- * ATTENTION: When this is 1, make sure your netif driver correctly marks incoming
- * link-layer-broadcast/multicast packets as such using the corresponding pbuf flags!
- */
-#if !defined IP_FORWARD_ALLOW_TX_ON_RX_NETIF || defined __DOXYGEN__
-#define IP_FORWARD_ALLOW_TX_ON_RX_NETIF 0
-#endif
-
-/**
- * LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS==1: randomize the local port for the first
- * local TCP/UDP pcb (default==0). This can prevent creating predictable port
- * numbers after booting a device.
- */
-#if !defined LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS || defined __DOXYGEN__
-#define LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS 0
-#endif
-/**
- * @}
- */
-
-/*
- ----------------------------------
- ---------- ICMP options ----------
- ----------------------------------
- */
-/**
- * @defgroup lwip_opts_icmp ICMP
- * @ingroup lwip_opts_ipv4
- * @{
- */
-/**
- * LWIP_ICMP==1: Enable ICMP module inside the IP stack.
- * Be careful, disable that make your product non-compliant to RFC1122
- */
-#if !defined LWIP_ICMP || defined __DOXYGEN__
-#define LWIP_ICMP                       1
-#endif
-
-/**
- * ICMP_TTL: Default value for Time-To-Live used by ICMP packets.
- */
-#if !defined ICMP_TTL || defined __DOXYGEN__
-#define ICMP_TTL                       (IP_DEFAULT_TTL)
-#endif
-
-/**
- * LWIP_BROADCAST_PING==1: respond to broadcast pings (default is unicast only)
- */
-#if !defined LWIP_BROADCAST_PING || defined __DOXYGEN__
-#define LWIP_BROADCAST_PING             0
-#endif
-
-/**
- * LWIP_MULTICAST_PING==1: respond to multicast pings (default is unicast only)
- */
-#if !defined LWIP_MULTICAST_PING || defined __DOXYGEN__
-#define LWIP_MULTICAST_PING             0
-#endif
-/**
- * @}
- */
-
-/*
- ---------------------------------
- ---------- RAW options ----------
- ---------------------------------
- */
-/**
- * @defgroup lwip_opts_raw RAW
- * @ingroup lwip_opts_callback
- * @{
- */
-/**
- * LWIP_RAW==1: Enable application layer to hook into the IP layer itself.
- */
-#if !defined LWIP_RAW || defined __DOXYGEN__
-#define LWIP_RAW                        0
-#endif
-
-/**
- * LWIP_RAW==1: Enable application layer to hook into the IP layer itself.
- */
-#if !defined RAW_TTL || defined __DOXYGEN__
-#define RAW_TTL                        (IP_DEFAULT_TTL)
-#endif
-/**
- * @}
- */
-
-/*
- ----------------------------------
- ---------- DHCP options ----------
- ----------------------------------
- */
-/**
- * @defgroup lwip_opts_dhcp DHCP
- * @ingroup lwip_opts_ipv4
- * @{
- */
-/**
- * LWIP_DHCP==1: Enable DHCP module.
- */
-#if !defined LWIP_DHCP || defined __DOXYGEN__
-#define LWIP_DHCP                       0
-#endif
-#if !LWIP_IPV4
-/* disable DHCP when IPv4 is disabled */
-#undef LWIP_DHCP
-#define LWIP_DHCP                       0
-#endif /* !LWIP_IPV4 */
-
-/**
- * DHCP_DOES_ARP_CHECK==1: Do an ARP check on the offered address.
- */
-#if !defined DHCP_DOES_ARP_CHECK || defined __DOXYGEN__
-#define DHCP_DOES_ARP_CHECK             ((LWIP_DHCP) && (LWIP_ARP))
-#endif
-
-/**
- * LWIP_DHCP_CHECK_LINK_UP==1: dhcp_start() only really starts if the netif has
- * NETIF_FLAG_LINK_UP set in its flags. As this is only an optimization and
- * netif drivers might not set this flag, the default is off. If enabled,
- * netif_set_link_up() must be called to continue dhcp starting.
- */
-#if !defined LWIP_DHCP_CHECK_LINK_UP
-#define LWIP_DHCP_CHECK_LINK_UP         0
-#endif
-
-/**
- * LWIP_DHCP_BOOTP_FILE==1: Store offered_si_addr and boot_file_name.
- */
-#if !defined LWIP_DHCP_BOOTP_FILE || defined __DOXYGEN__
-#define LWIP_DHCP_BOOTP_FILE            0
-#endif
-
-/**
- * LWIP_DHCP_GETS_NTP==1: Request NTP servers with discover/select. For each
- * response packet, an callback is called, which has to be provided by the port:
- * void dhcp_set_ntp_servers(u8_t num_ntp_servers, ip_addr_t* ntp_server_addrs);
- */
-#if !defined LWIP_DHCP_GET_NTP_SRV || defined __DOXYGEN__
-#define LWIP_DHCP_GET_NTP_SRV           0
-#endif
-
-/**
- * The maximum of NTP servers requested
- */
-#if !defined LWIP_DHCP_MAX_NTP_SERVERS || defined __DOXYGEN__
-#define LWIP_DHCP_MAX_NTP_SERVERS       1
-#endif
-
-/**
- * LWIP_DHCP_MAX_DNS_SERVERS > 0: Request DNS servers with discover/select.
- * DHCP servers received in the response are passed to DNS via @ref dns_setserver()
- * (up to the maximum limit defined here).
- */
-#if !defined LWIP_DHCP_MAX_DNS_SERVERS || defined __DOXYGEN__
-#define LWIP_DHCP_MAX_DNS_SERVERS       DNS_MAX_SERVERS
-#endif
-/**
- * @}
- */
-
-/*
- ------------------------------------
- ---------- AUTOIP options ----------
- ------------------------------------
- */
-/**
- * @defgroup lwip_opts_autoip AUTOIP
- * @ingroup lwip_opts_ipv4
- * @{
- */
-/**
- * LWIP_AUTOIP==1: Enable AUTOIP module.
- */
-#if !defined LWIP_AUTOIP || defined __DOXYGEN__
-#define LWIP_AUTOIP                     0
-#endif
-#if !LWIP_IPV4
-/* disable AUTOIP when IPv4 is disabled */
-#undef LWIP_AUTOIP
-#define LWIP_AUTOIP                     0
-#endif /* !LWIP_IPV4 */
-
-/**
- * LWIP_DHCP_AUTOIP_COOP==1: Allow DHCP and AUTOIP to be both enabled on
- * the same interface at the same time.
- */
-#if !defined LWIP_DHCP_AUTOIP_COOP || defined __DOXYGEN__
-#define LWIP_DHCP_AUTOIP_COOP           0
-#endif
-
-/**
- * LWIP_DHCP_AUTOIP_COOP_TRIES: Set to the number of DHCP DISCOVER probes
- * that should be sent before falling back on AUTOIP (the DHCP client keeps
- * running in this case). This can be set as low as 1 to get an AutoIP address
- * very  quickly, but you should be prepared to handle a changing IP address
- * when DHCP overrides AutoIP.
- */
-#if !defined LWIP_DHCP_AUTOIP_COOP_TRIES || defined __DOXYGEN__
-#define LWIP_DHCP_AUTOIP_COOP_TRIES     9
-#endif
-/**
- * @}
- */
-
-/*
- ----------------------------------
- ----- SNMP MIB2 support      -----
- ----------------------------------
- */
-/**
- * @defgroup lwip_opts_mib2 SNMP MIB2 callbacks
- * @ingroup lwip_opts_infrastructure
- * @{
- */
-/**
- * LWIP_MIB2_CALLBACKS==1: Turn on SNMP MIB2 callbacks.
- * Turn this on to get callbacks needed to implement MIB2.
- * Usually MIB2_STATS should be enabled, too.
- */
-#if !defined LWIP_MIB2_CALLBACKS || defined __DOXYGEN__
-#define LWIP_MIB2_CALLBACKS             0
-#endif
-/**
- * @}
- */
-
-/*
- ----------------------------------
- ----- Multicast/IGMP options -----
- ----------------------------------
- */
-/**
- * @defgroup lwip_opts_igmp IGMP
- * @ingroup lwip_opts_ipv4
- * @{
- */
-/**
- * LWIP_IGMP==1: Turn on IGMP module.
- */
-#if !defined LWIP_IGMP || defined __DOXYGEN__
-#define LWIP_IGMP                       0
-#endif
-#if !LWIP_IPV4
-#undef LWIP_IGMP
-#define LWIP_IGMP                       0
-#endif
-
-/**
- * LWIP_MULTICAST_TX_OPTIONS==1: Enable multicast TX support like the socket options
- * IP_MULTICAST_TTL/IP_MULTICAST_IF/IP_MULTICAST_LOOP
- */
-#if !defined LWIP_MULTICAST_TX_OPTIONS || defined __DOXYGEN__
-#define LWIP_MULTICAST_TX_OPTIONS       (LWIP_IGMP && LWIP_UDP)
-#endif
-/**
- * @}
- */
-
-/*
- ----------------------------------
- ---------- DNS options -----------
- ----------------------------------
- */
-/**
- * @defgroup lwip_opts_dns DNS
- * @ingroup lwip_opts_callback
- * @{
- */
-/**
- * LWIP_DNS==1: Turn on DNS module. UDP must be available for DNS
- * transport.
- */
-#if !defined LWIP_DNS || defined __DOXYGEN__
-#define LWIP_DNS                        0
-#endif
-
-/** DNS maximum number of entries to maintain locally. */
-#if !defined DNS_TABLE_SIZE || defined __DOXYGEN__
-#define DNS_TABLE_SIZE                  4
-#endif
-
-/** DNS maximum host name length supported in the name table. */
-#if !defined DNS_MAX_NAME_LENGTH || defined __DOXYGEN__
-#define DNS_MAX_NAME_LENGTH             256
-#endif
-
-/** The maximum of DNS servers
- * The first server can be initialized automatically by defining
- * DNS_SERVER_ADDRESS(ipaddr), where 'ipaddr' is an 'ip_addr_t*'
- */
-#if !defined DNS_MAX_SERVERS || defined __DOXYGEN__
-#define DNS_MAX_SERVERS                 2
-#endif
-
-/** DNS do a name checking between the query and the response. */
-#if !defined DNS_DOES_NAME_CHECK || defined __DOXYGEN__
-#define DNS_DOES_NAME_CHECK             1
-#endif
-
-/** LWIP_DNS_SECURE: controls the security level of the DNS implementation
- * Use all DNS security features by default.
- * This is overridable but should only be needed by very small targets
- * or when using against non standard DNS servers. */
-#if !defined LWIP_DNS_SECURE || defined __DOXYGEN__
-#define LWIP_DNS_SECURE (LWIP_DNS_SECURE_RAND_XID | LWIP_DNS_SECURE_NO_MULTIPLE_OUTSTANDING | LWIP_DNS_SECURE_RAND_SRC_PORT)
-#endif
-
-/* A list of DNS security features follows */
-#define LWIP_DNS_SECURE_RAND_XID                1
-#define LWIP_DNS_SECURE_NO_MULTIPLE_OUTSTANDING 2
-#define LWIP_DNS_SECURE_RAND_SRC_PORT           4
-
-/** DNS_LOCAL_HOSTLIST: Implements a local host-to-address list. If enabled, you have to define an initializer:
- *  \#define DNS_LOCAL_HOSTLIST_INIT {DNS_LOCAL_HOSTLIST_ELEM("host_ip4", IPADDR4_INIT_BYTES(1,2,3,4)), \
- *                                    DNS_LOCAL_HOSTLIST_ELEM("host_ip6", IPADDR6_INIT_HOST(123, 234, 345, 456)}
- *
- *  Instead, you can also use an external function:
- *  \#define DNS_LOOKUP_LOCAL_EXTERN(x) extern err_t my_lookup_function(const char *name, ip_addr_t *addr, u8_t dns_addrtype)
- *  that looks up the IP address and returns ERR_OK if found (LWIP_DNS_ADDRTYPE_xxx is passed in dns_addrtype).
- */
-#if !defined DNS_LOCAL_HOSTLIST || defined __DOXYGEN__
-#define DNS_LOCAL_HOSTLIST              0
-#endif /* DNS_LOCAL_HOSTLIST */
-
-/** If this is turned on, the local host-list can be dynamically changed
- *  at runtime. */
-#if !defined DNS_LOCAL_HOSTLIST_IS_DYNAMIC || defined __DOXYGEN__
-#define DNS_LOCAL_HOSTLIST_IS_DYNAMIC   0
-#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-
-/** Set this to 1 to enable querying ".local" names via mDNS
- *  using a One-Shot Multicast DNS Query */
-#if !defined LWIP_DNS_SUPPORT_MDNS_QUERIES || defined __DOXYGEN__
-#define LWIP_DNS_SUPPORT_MDNS_QUERIES  0
-#endif
-/**
- * @}
- */
-
-/*
- ---------------------------------
- ---------- UDP options ----------
- ---------------------------------
- */
-/**
- * @defgroup lwip_opts_udp UDP
- * @ingroup lwip_opts_callback
- * @{
- */
-/**
- * LWIP_UDP==1: Turn on UDP.
- */
-#if !defined LWIP_UDP || defined __DOXYGEN__
-#define LWIP_UDP                        1
-#endif
-
-/**
- * LWIP_UDPLITE==1: Turn on UDP-Lite. (Requires LWIP_UDP)
- */
-#if !defined LWIP_UDPLITE || defined __DOXYGEN__
-#define LWIP_UDPLITE                    0
-#endif
-
-/**
- * UDP_TTL: Default Time-To-Live value.
- */
-#if !defined UDP_TTL || defined __DOXYGEN__
-#define UDP_TTL                         (IP_DEFAULT_TTL)
-#endif
-
-/**
- * LWIP_NETBUF_RECVINFO==1: append destination addr and port to every netbuf.
- */
-#if !defined LWIP_NETBUF_RECVINFO || defined __DOXYGEN__
-#define LWIP_NETBUF_RECVINFO            0
-#endif
-/**
- * @}
- */
-
-/*
- ---------------------------------
- ---------- TCP options ----------
- ---------------------------------
- */
-/**
- * @defgroup lwip_opts_tcp TCP
- * @ingroup lwip_opts_callback
- * @{
- */
-/**
- * LWIP_TCP==1: Turn on TCP.
- */
-#if !defined LWIP_TCP || defined __DOXYGEN__
-#define LWIP_TCP                        1
-#endif
-
-/**
- * TCP_TTL: Default Time-To-Live value.
- */
-#if !defined TCP_TTL || defined __DOXYGEN__
-#define TCP_TTL                         (IP_DEFAULT_TTL)
-#endif
-
-/**
- * TCP_WND: The size of a TCP window.  This must be at least
- * (2 * TCP_MSS) for things to work well.
- * ATTENTION: when using TCP_RCV_SCALE, TCP_WND is the total size
- * with scaling applied. Maximum window value in the TCP header
- * will be TCP_WND >> TCP_RCV_SCALE
- */
-#if !defined TCP_WND || defined __DOXYGEN__
-#define TCP_WND                         (4 * TCP_MSS)
-#endif
-
-/**
- * TCP_MAXRTX: Maximum number of retransmissions of data segments.
- */
-#if !defined TCP_MAXRTX || defined __DOXYGEN__
-#define TCP_MAXRTX                      12
-#endif
-
-/**
- * TCP_SYNMAXRTX: Maximum number of retransmissions of SYN segments.
- */
-#if !defined TCP_SYNMAXRTX || defined __DOXYGEN__
-#define TCP_SYNMAXRTX                   6
-#endif
-
-/**
- * TCP_QUEUE_OOSEQ==1: TCP will queue segments that arrive out of order.
- * Define to 0 if your device is low on memory.
- */
-#if !defined TCP_QUEUE_OOSEQ || defined __DOXYGEN__
-#define TCP_QUEUE_OOSEQ                 (LWIP_TCP)
-#endif
-
-/**
- * TCP_MSS: TCP Maximum segment size. (default is 536, a conservative default,
- * you might want to increase this.)
- * For the receive side, this MSS is advertised to the remote side
- * when opening a connection. For the transmit size, this MSS sets
- * an upper limit on the MSS advertised by the remote host.
- */
-#if !defined TCP_MSS || defined __DOXYGEN__
-#define TCP_MSS                         536
-#endif
-
-/**
- * TCP_CALCULATE_EFF_SEND_MSS: "The maximum size of a segment that TCP really
- * sends, the 'effective send MSS,' MUST be the smaller of the send MSS (which
- * reflects the available reassembly buffer size at the remote host) and the
- * largest size permitted by the IP layer" (RFC 1122)
- * Setting this to 1 enables code that checks TCP_MSS against the MTU of the
- * netif used for a connection and limits the MSS if it would be too big otherwise.
- */
-#if !defined TCP_CALCULATE_EFF_SEND_MSS || defined __DOXYGEN__
-#define TCP_CALCULATE_EFF_SEND_MSS      1
-#endif
-
-/**
- * TCP_SND_BUF: TCP sender buffer space (bytes).
- * To achieve good performance, this should be at least 2 * TCP_MSS.
- */
-#if !defined TCP_SND_BUF || defined __DOXYGEN__
-#define TCP_SND_BUF                     (2 * TCP_MSS)
-#endif
-
-/**
- * TCP_SND_QUEUELEN: TCP sender buffer space (pbufs). This must be at least
- * as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work.
- */
-#if !defined TCP_SND_QUEUELEN || defined __DOXYGEN__
-#define TCP_SND_QUEUELEN                ((4 * (TCP_SND_BUF) + (TCP_MSS - 1))/(TCP_MSS))
-#endif
-
-/**
- * TCP_SNDLOWAT: TCP writable space (bytes). This must be less than
- * TCP_SND_BUF. It is the amount of space which must be available in the
- * TCP snd_buf for select to return writable (combined with TCP_SNDQUEUELOWAT).
- */
-#if !defined TCP_SNDLOWAT || defined __DOXYGEN__
-#define TCP_SNDLOWAT                    LWIP_MIN(LWIP_MAX(((TCP_SND_BUF)/2), (2 * TCP_MSS) + 1), (TCP_SND_BUF) - 1)
-#endif
-
-/**
- * TCP_SNDQUEUELOWAT: TCP writable bufs (pbuf count). This must be less
- * than TCP_SND_QUEUELEN. If the number of pbufs queued on a pcb drops below
- * this number, select returns writable (combined with TCP_SNDLOWAT).
- */
-#if !defined TCP_SNDQUEUELOWAT || defined __DOXYGEN__
-#define TCP_SNDQUEUELOWAT               LWIP_MAX(((TCP_SND_QUEUELEN)/2), 5)
-#endif
-
-/**
- * TCP_OOSEQ_MAX_BYTES: The maximum number of bytes queued on ooseq per pcb.
- * Default is 0 (no limit). Only valid for TCP_QUEUE_OOSEQ==1.
- */
-#if !defined TCP_OOSEQ_MAX_BYTES || defined __DOXYGEN__
-#define TCP_OOSEQ_MAX_BYTES             0
-#endif
-
-/**
- * TCP_OOSEQ_MAX_PBUFS: The maximum number of pbufs queued on ooseq per pcb.
- * Default is 0 (no limit). Only valid for TCP_QUEUE_OOSEQ==1.
- */
-#if !defined TCP_OOSEQ_MAX_PBUFS || defined __DOXYGEN__
-#define TCP_OOSEQ_MAX_PBUFS             0
-#endif
-
-/**
- * TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb.
- */
-#if !defined TCP_LISTEN_BACKLOG || defined __DOXYGEN__
-#define TCP_LISTEN_BACKLOG              0
-#endif
-
-/**
- * The maximum allowed backlog for TCP listen netconns.
- * This backlog is used unless another is explicitly specified.
- * 0xff is the maximum (u8_t).
- */
-#if !defined TCP_DEFAULT_LISTEN_BACKLOG || defined __DOXYGEN__
-#define TCP_DEFAULT_LISTEN_BACKLOG      0xff
-#endif
-
-/**
- * TCP_OVERSIZE: The maximum number of bytes that tcp_write may
- * allocate ahead of time in an attempt to create shorter pbuf chains
- * for transmission. The meaningful range is 0 to TCP_MSS. Some
- * suggested values are:
- *
- * 0:         Disable oversized allocation. Each tcp_write() allocates a new
- pbuf (old behaviour).
- * 1:         Allocate size-aligned pbufs with minimal excess. Use this if your
- *            scatter-gather DMA requires aligned fragments.
- * 128:       Limit the pbuf/memory overhead to 20%.
- * TCP_MSS:   Try to create unfragmented TCP packets.
- * TCP_MSS/4: Try to create 4 fragments or less per TCP packet.
- */
-#if !defined TCP_OVERSIZE || defined __DOXYGEN__
-#define TCP_OVERSIZE                    TCP_MSS
-#endif
-
-/**
- * LWIP_TCP_TIMESTAMPS==1: support the TCP timestamp option.
- * The timestamp option is currently only used to help remote hosts, it is not
- * really used locally. Therefore, it is only enabled when a TS option is
- * received in the initial SYN packet from a remote host.
- */
-#if !defined LWIP_TCP_TIMESTAMPS || defined __DOXYGEN__
-#define LWIP_TCP_TIMESTAMPS             0
-#endif
-
-/**
- * TCP_WND_UPDATE_THRESHOLD: difference in window to trigger an
- * explicit window update
- */
-#if !defined TCP_WND_UPDATE_THRESHOLD || defined __DOXYGEN__
-#define TCP_WND_UPDATE_THRESHOLD   LWIP_MIN((TCP_WND / 4), (TCP_MSS * 4))
-#endif
-
-/**
- * LWIP_EVENT_API and LWIP_CALLBACK_API: Only one of these should be set to 1.
- *     LWIP_EVENT_API==1: The user defines lwip_tcp_event() to receive all
- *         events (accept, sent, etc) that happen in the system.
- *     LWIP_CALLBACK_API==1: The PCB callback function is called directly
- *         for the event. This is the default.
- */
-#if !defined(LWIP_EVENT_API) && !defined(LWIP_CALLBACK_API) || defined __DOXYGEN__
-#define LWIP_EVENT_API                  0
-#define LWIP_CALLBACK_API               1
-#else
-#ifndef LWIP_EVENT_API
-#define LWIP_EVENT_API                  0
-#endif
-#ifndef LWIP_CALLBACK_API
-#define LWIP_CALLBACK_API               0
-#endif
-#endif
-
-/**
- * LWIP_WND_SCALE and TCP_RCV_SCALE:
- * Set LWIP_WND_SCALE to 1 to enable window scaling.
- * Set TCP_RCV_SCALE to the desired scaling factor (shift count in the
- * range of [0..14]).
- * When LWIP_WND_SCALE is enabled but TCP_RCV_SCALE is 0, we can use a large
- * send window while having a small receive window only.
- */
-#if !defined LWIP_WND_SCALE || defined __DOXYGEN__
-#define LWIP_WND_SCALE                  0
-#define TCP_RCV_SCALE                   0
-#endif
-/**
- * @}
- */
-
-/*
- ----------------------------------
- ---------- Pbuf options ----------
- ----------------------------------
- */
-/**
- * @defgroup lwip_opts_pbuf PBUF
- * @ingroup lwip_opts
- * @{
- */
-/**
- * PBUF_LINK_HLEN: the number of bytes that should be allocated for a
- * link level header. The default is 14, the standard value for
- * Ethernet.
- */
-#if !defined PBUF_LINK_HLEN || defined __DOXYGEN__
-#if defined LWIP_HOOK_VLAN_SET && !defined __DOXYGEN__
-#define PBUF_LINK_HLEN                  (18 + ETH_PAD_SIZE)
-#else /* LWIP_HOOK_VLAN_SET */
-#define PBUF_LINK_HLEN                  (14 + ETH_PAD_SIZE)
-#endif /* LWIP_HOOK_VLAN_SET */
-#endif
-
-/**
- * PBUF_LINK_ENCAPSULATION_HLEN: the number of bytes that should be allocated
- * for an additional encapsulation header before ethernet headers (e.g. 802.11)
- */
-#if !defined PBUF_LINK_ENCAPSULATION_HLEN || defined __DOXYGEN__
-#define PBUF_LINK_ENCAPSULATION_HLEN    0u
-#endif
-
-/**
- * PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. The default is
- * designed to accommodate single full size TCP frame in one pbuf, including
- * TCP_MSS, IP header, and link header.
- */
-#if !defined PBUF_POOL_BUFSIZE || defined __DOXYGEN__
-#define PBUF_POOL_BUFSIZE               LWIP_MEM_ALIGN_SIZE(TCP_MSS+40+PBUF_LINK_ENCAPSULATION_HLEN+PBUF_LINK_HLEN)
-#endif
-/**
- * @}
- */
-
-/*
- ------------------------------------------------
- ---------- Network Interfaces options ----------
- ------------------------------------------------
- */
-/**
- * @defgroup lwip_opts_netif NETIF
- * @ingroup lwip_opts
- * @{
- */
-/**
- * LWIP_NETIF_HOSTNAME==1: use DHCP_OPTION_HOSTNAME with netif's hostname
- * field.
- */
-#if !defined LWIP_NETIF_HOSTNAME || defined __DOXYGEN__
-#define LWIP_NETIF_HOSTNAME             0
-#endif
-
-/**
- * LWIP_NETIF_API==1: Support netif api (in netifapi.c)
- */
-#if !defined LWIP_NETIF_API || defined __DOXYGEN__
-#define LWIP_NETIF_API                  0
-#endif
-
-/**
- * LWIP_NETIF_STATUS_CALLBACK==1: Support a callback function whenever an interface
- * changes its up/down status (i.e., due to DHCP IP acquisition)
- */
-#if !defined LWIP_NETIF_STATUS_CALLBACK || defined __DOXYGEN__
-#define LWIP_NETIF_STATUS_CALLBACK      0
-#endif
-
-/**
- * LWIP_NETIF_LINK_CALLBACK==1: Support a callback function from an interface
- * whenever the link changes (i.e., link down)
- */
-#if !defined LWIP_NETIF_LINK_CALLBACK || defined __DOXYGEN__
-#define LWIP_NETIF_LINK_CALLBACK        0
-#endif
-
-/**
- * LWIP_NETIF_REMOVE_CALLBACK==1: Support a callback function that is called
- * when a netif has been removed
- */
-#if !defined LWIP_NETIF_REMOVE_CALLBACK || defined __DOXYGEN__
-#define LWIP_NETIF_REMOVE_CALLBACK      0
-#endif
-
-/**
- * LWIP_NETIF_HWADDRHINT==1: Cache link-layer-address hints (e.g. table
- * indices) in struct netif. TCP and UDP can make use of this to prevent
- * scanning the ARP table for every sent packet. While this is faster for big
- * ARP tables or many concurrent connections, it might be counterproductive
- * if you have a tiny ARP table or if there never are concurrent connections.
- */
-#if !defined LWIP_NETIF_HWADDRHINT || defined __DOXYGEN__
-#define LWIP_NETIF_HWADDRHINT           0
-#endif
-
-/**
- * LWIP_NETIF_TX_SINGLE_PBUF: if this is set to 1, lwIP tries to put all data
- * to be sent into one single pbuf. This is for compatibility with DMA-enabled
- * MACs that do not support scatter-gather.
- * Beware that this might involve CPU-memcpy before transmitting that would not
- * be needed without this flag! Use this only if you need to!
- *
- * @todo: TCP and IP-frag do not work with this, yet:
- */
-#if !defined LWIP_NETIF_TX_SINGLE_PBUF || defined __DOXYGEN__
-#define LWIP_NETIF_TX_SINGLE_PBUF             0
-#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
-
-/**
- * LWIP_NUM_NETIF_CLIENT_DATA: Number of clients that may store
- * data in client_data member array of struct netif.
- */
-#if !defined LWIP_NUM_NETIF_CLIENT_DATA || defined __DOXYGEN__
-#define LWIP_NUM_NETIF_CLIENT_DATA            0
-#endif
-/**
- * @}
- */
-
-/*
- ------------------------------------
- ---------- LOOPIF options ----------
- ------------------------------------
- */
-/**
- * @defgroup lwip_opts_loop Loopback interface
- * @ingroup lwip_opts_netif
- * @{
- */
-/**
- * LWIP_HAVE_LOOPIF==1: Support loop interface (127.0.0.1).
- * This is only needed when no real netifs are available. If at least one other
- * netif is available, loopback traffic uses this netif.
- */
-#if !defined LWIP_HAVE_LOOPIF || defined __DOXYGEN__
-#define LWIP_HAVE_LOOPIF                LWIP_NETIF_LOOPBACK
-#endif
-
-/**
- * LWIP_LOOPIF_MULTICAST==1: Support multicast/IGMP on loop interface (127.0.0.1).
- */
-#if !defined LWIP_LOOPIF_MULTICAST || defined __DOXYGEN__
-#define LWIP_LOOPIF_MULTICAST               0
-#endif
-
-/**
- * LWIP_NETIF_LOOPBACK==1: Support sending packets with a destination IP
- * address equal to the netif IP address, looping them back up the stack.
- */
-#if !defined LWIP_NETIF_LOOPBACK || defined __DOXYGEN__
-#define LWIP_NETIF_LOOPBACK             0
-#endif
-
-/**
- * LWIP_LOOPBACK_MAX_PBUFS: Maximum number of pbufs on queue for loopback
- * sending for each netif (0 = disabled)
- */
-#if !defined LWIP_LOOPBACK_MAX_PBUFS || defined __DOXYGEN__
-#define LWIP_LOOPBACK_MAX_PBUFS         0
-#endif
-
-/**
- * LWIP_NETIF_LOOPBACK_MULTITHREADING: Indicates whether threading is enabled in
- * the system, as netifs must change how they behave depending on this setting
- * for the LWIP_NETIF_LOOPBACK option to work.
- * Setting this is needed to avoid reentering non-reentrant functions like
- * tcp_input().
- *    LWIP_NETIF_LOOPBACK_MULTITHREADING==1: Indicates that the user is using a
- *       multithreaded environment like tcpip.c. In this case, netif->input()
- *       is called directly.
- *    LWIP_NETIF_LOOPBACK_MULTITHREADING==0: Indicates a polling (or NO_SYS) setup.
- *       The packets are put on a list and netif_poll() must be called in
- *       the main application loop.
- */
-#if !defined LWIP_NETIF_LOOPBACK_MULTITHREADING || defined __DOXYGEN__
-#define LWIP_NETIF_LOOPBACK_MULTITHREADING    (!NO_SYS)
-#endif
-/**
- * @}
- */
-
-/*
- ------------------------------------
- ---------- Thread options ----------
- ------------------------------------
- */
-/**
- * @defgroup lwip_opts_thread Threading
- * @ingroup lwip_opts_infrastructure
- * @{
- */
-/**
- * TCPIP_THREAD_NAME: The name assigned to the main tcpip thread.
- */
-#if !defined TCPIP_THREAD_NAME || defined __DOXYGEN__
-#define TCPIP_THREAD_NAME              "tcpip_thread"
-#endif
-
-/**
- * TCPIP_THREAD_STACKSIZE: The stack size used by the main tcpip thread.
- * The stack size value itself is platform-dependent, but is passed to
- * sys_thread_new() when the thread is created.
- */
-#if !defined TCPIP_THREAD_STACKSIZE || defined __DOXYGEN__
-#define TCPIP_THREAD_STACKSIZE          0
-#endif
-
-/**
- * TCPIP_THREAD_PRIO: The priority assigned to the main tcpip thread.
- * The priority value itself is platform-dependent, but is passed to
- * sys_thread_new() when the thread is created.
- */
-#if !defined TCPIP_THREAD_PRIO || defined __DOXYGEN__
-#define TCPIP_THREAD_PRIO               1
-#endif
-
-/**
- * TCPIP_MBOX_SIZE: The mailbox size for the tcpip thread messages
- * The queue size value itself is platform-dependent, but is passed to
- * sys_mbox_new() when tcpip_init is called.
- */
-#if !defined TCPIP_MBOX_SIZE || defined __DOXYGEN__
-#define TCPIP_MBOX_SIZE                 0
-#endif
-
-/**
- * Define this to something that triggers a watchdog. This is called from
- * tcpip_thread after processing a message.
- */
-#if !defined LWIP_TCPIP_THREAD_ALIVE || defined __DOXYGEN__
-#define LWIP_TCPIP_THREAD_ALIVE()
-#endif
-
-/**
- * SLIPIF_THREAD_NAME: The name assigned to the slipif_loop thread.
- */
-#if !defined SLIPIF_THREAD_NAME || defined __DOXYGEN__
-#define SLIPIF_THREAD_NAME             "slipif_loop"
-#endif
-
-/**
- * SLIP_THREAD_STACKSIZE: The stack size used by the slipif_loop thread.
- * The stack size value itself is platform-dependent, but is passed to
- * sys_thread_new() when the thread is created.
- */
-#if !defined SLIPIF_THREAD_STACKSIZE || defined __DOXYGEN__
-#define SLIPIF_THREAD_STACKSIZE         0
-#endif
-
-/**
- * SLIPIF_THREAD_PRIO: The priority assigned to the slipif_loop thread.
- * The priority value itself is platform-dependent, but is passed to
- * sys_thread_new() when the thread is created.
- */
-#if !defined SLIPIF_THREAD_PRIO || defined __DOXYGEN__
-#define SLIPIF_THREAD_PRIO              1
-#endif
-
-/**
- * DEFAULT_THREAD_NAME: The name assigned to any other lwIP thread.
- */
-#if !defined DEFAULT_THREAD_NAME || defined __DOXYGEN__
-#define DEFAULT_THREAD_NAME            "lwIP"
-#endif
-
-/**
- * DEFAULT_THREAD_STACKSIZE: The stack size used by any other lwIP thread.
- * The stack size value itself is platform-dependent, but is passed to
- * sys_thread_new() when the thread is created.
- */
-#if !defined DEFAULT_THREAD_STACKSIZE || defined __DOXYGEN__
-#define DEFAULT_THREAD_STACKSIZE        0
-#endif
-
-/**
- * DEFAULT_THREAD_PRIO: The priority assigned to any other lwIP thread.
- * The priority value itself is platform-dependent, but is passed to
- * sys_thread_new() when the thread is created.
- */
-#if !defined DEFAULT_THREAD_PRIO || defined __DOXYGEN__
-#define DEFAULT_THREAD_PRIO             1
-#endif
-
-/**
- * DEFAULT_RAW_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
- * NETCONN_RAW. The queue size value itself is platform-dependent, but is passed
- * to sys_mbox_new() when the recvmbox is created.
- */
-#if !defined DEFAULT_RAW_RECVMBOX_SIZE || defined __DOXYGEN__
-#define DEFAULT_RAW_RECVMBOX_SIZE       0
-#endif
-
-/**
- * DEFAULT_UDP_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
- * NETCONN_UDP. The queue size value itself is platform-dependent, but is passed
- * to sys_mbox_new() when the recvmbox is created.
- */
-#if !defined DEFAULT_UDP_RECVMBOX_SIZE || defined __DOXYGEN__
-#define DEFAULT_UDP_RECVMBOX_SIZE       0
-#endif
-
-/**
- * DEFAULT_TCP_RECVMBOX_SIZE: The mailbox size for the incoming packets on a
- * NETCONN_TCP. The queue size value itself is platform-dependent, but is passed
- * to sys_mbox_new() when the recvmbox is created.
- */
-#if !defined DEFAULT_TCP_RECVMBOX_SIZE || defined __DOXYGEN__
-#define DEFAULT_TCP_RECVMBOX_SIZE       0
-#endif
-
-/**
- * DEFAULT_ACCEPTMBOX_SIZE: The mailbox size for the incoming connections.
- * The queue size value itself is platform-dependent, but is passed to
- * sys_mbox_new() when the acceptmbox is created.
- */
-#if !defined DEFAULT_ACCEPTMBOX_SIZE || defined __DOXYGEN__
-#define DEFAULT_ACCEPTMBOX_SIZE         0
-#endif
-/**
- * @}
- */
-
-/*
- ----------------------------------------------
- ---------- Sequential layer options ----------
- ----------------------------------------------
- */
-/**
- * @defgroup lwip_opts_netconn Netconn
- * @ingroup lwip_opts_threadsafe_apis
- * @{
- */
-/**
- * LWIP_NETCONN==1: Enable Netconn API (require to use api_lib.c)
- */
-#if !defined LWIP_NETCONN || defined __DOXYGEN__
-#define LWIP_NETCONN                    1
-#endif
-
-/** LWIP_TCPIP_TIMEOUT==1: Enable tcpip_timeout/tcpip_untimeout to create
- * timers running in tcpip_thread from another thread.
- */
-#if !defined LWIP_TCPIP_TIMEOUT || defined __DOXYGEN__
-#define LWIP_TCPIP_TIMEOUT              0
-#endif
-
-/** LWIP_NETCONN_SEM_PER_THREAD==1: Use one (thread-local) semaphore per
- * thread calling socket/netconn functions instead of allocating one
- * semaphore per netconn (and per select etc.)
- * ATTENTION: a thread-local semaphore for API calls is needed:
- * - LWIP_NETCONN_THREAD_SEM_GET() returning a sys_sem_t*
- * - LWIP_NETCONN_THREAD_SEM_ALLOC() creating the semaphore
- * - LWIP_NETCONN_THREAD_SEM_FREE() freeing the semaphore
- * The latter 2 can be invoked up by calling netconn_thread_init()/netconn_thread_cleanup().
- * Ports may call these for threads created with sys_thread_new().
- */
-#if !defined LWIP_NETCONN_SEM_PER_THREAD || defined __DOXYGEN__
-#define LWIP_NETCONN_SEM_PER_THREAD     0
-#endif
-
-/** LWIP_NETCONN_FULLDUPLEX==1: Enable code that allows reading from one thread,
- * writing from a 2nd thread and closing from a 3rd thread at the same time.
- * ATTENTION: This is currently really alpha! Some requirements:
- * - LWIP_NETCONN_SEM_PER_THREAD==1 is required to use one socket/netconn from
- *   multiple threads at once
- * - sys_mbox_free() has to unblock receive tasks waiting on recvmbox/acceptmbox
- *   and prevent a task pending on this during/after deletion
- */
-#if !defined LWIP_NETCONN_FULLDUPLEX || defined __DOXYGEN__
-#define LWIP_NETCONN_FULLDUPLEX         0
-#endif
-/**
- * @}
- */
-
-/*
- ------------------------------------
- ---------- Socket options ----------
- ------------------------------------
- */
-/**
- * @defgroup lwip_opts_socket Sockets
- * @ingroup lwip_opts_threadsafe_apis
- * @{
- */
-/**
- * LWIP_SOCKET==1: Enable Socket API (require to use sockets.c)
- */
-#if !defined LWIP_SOCKET || defined __DOXYGEN__
-#define LWIP_SOCKET                     1
-#endif
-
-/* LWIP_SOCKET_SET_ERRNO==1: Set errno when socket functions cannot complete
- * successfully, as required by POSIX. Default is POSIX-compliant.
- */
-#if !defined LWIP_SOCKET_SET_ERRNO || defined __DOXYGEN__
-#define LWIP_SOCKET_SET_ERRNO           1
-#endif
-
-/**
- * LWIP_COMPAT_SOCKETS==1: Enable BSD-style sockets functions names through defines.
- * LWIP_COMPAT_SOCKETS==2: Same as ==1 but correctly named functions are created.
- * While this helps code completion, it might conflict with existing libraries.
- * (only used if you use sockets.c)
- */
-#if !defined LWIP_COMPAT_SOCKETS || defined __DOXYGEN__
-#define LWIP_COMPAT_SOCKETS             1
-#endif
-
-/**
- * LWIP_POSIX_SOCKETS_IO_NAMES==1: Enable POSIX-style sockets functions names.
- * Disable this option if you use a POSIX operating system that uses the same
- * names (read, write & close). (only used if you use sockets.c)
- */
-#if !defined LWIP_POSIX_SOCKETS_IO_NAMES || defined __DOXYGEN__
-#define LWIP_POSIX_SOCKETS_IO_NAMES     1
-#endif
-
-/**
- * LWIP_SOCKET_OFFSET==n: Increases the file descriptor number created by LwIP with n.
- * This can be useful when there are multiple APIs which create file descriptors.
- * When they all start with a different offset and you won't make them overlap you can
- * re implement read/write/close/ioctl/fnctl to send the requested action to the right
- * library (sharing select will need more work though).
- */
-#if !defined LWIP_SOCKET_OFFSET || defined __DOXYGEN__
-#define LWIP_SOCKET_OFFSET              0
-#endif
-
-/**
- * LWIP_TCP_KEEPALIVE==1: Enable TCP_KEEPIDLE, TCP_KEEPINTVL and TCP_KEEPCNT
- * options processing. Note that TCP_KEEPIDLE and TCP_KEEPINTVL have to be set
- * in seconds. (does not require sockets.c, and will affect tcp.c)
- */
-#if !defined LWIP_TCP_KEEPALIVE || defined __DOXYGEN__
-#define LWIP_TCP_KEEPALIVE              0
-#endif
-
-/**
- * LWIP_SO_SNDTIMEO==1: Enable send timeout for sockets/netconns and
- * SO_SNDTIMEO processing.
- */
-#if !defined LWIP_SO_SNDTIMEO || defined __DOXYGEN__
-#define LWIP_SO_SNDTIMEO                0
-#endif
-
-/**
- * LWIP_SO_RCVTIMEO==1: Enable receive timeout for sockets/netconns and
- * SO_RCVTIMEO processing.
- */
-#if !defined LWIP_SO_RCVTIMEO || defined __DOXYGEN__
-#define LWIP_SO_RCVTIMEO                0
-#endif
-
-/**
- * LWIP_SO_SNDRCVTIMEO_NONSTANDARD==1: SO_RCVTIMEO/SO_SNDTIMEO take an int
- * (milliseconds, much like winsock does) instead of a struct timeval (default).
- */
-#if !defined LWIP_SO_SNDRCVTIMEO_NONSTANDARD || defined __DOXYGEN__
-#define LWIP_SO_SNDRCVTIMEO_NONSTANDARD 0
-#endif
-
-/**
- * LWIP_SO_RCVBUF==1: Enable SO_RCVBUF processing.
- */
-#if !defined LWIP_SO_RCVBUF || defined __DOXYGEN__
-#define LWIP_SO_RCVBUF                  0
-#endif
-
-/**
- * LWIP_SO_LINGER==1: Enable SO_LINGER processing.
- */
-#if !defined LWIP_SO_LINGER || defined __DOXYGEN__
-#define LWIP_SO_LINGER                  0
-#endif
-
-/**
- * If LWIP_SO_RCVBUF is used, this is the default value for recv_bufsize.
- */
-#if !defined RECV_BUFSIZE_DEFAULT || defined __DOXYGEN__
-#define RECV_BUFSIZE_DEFAULT            INT_MAX
-#endif
-
-/**
- * By default, TCP socket/netconn close waits 20 seconds max to send the FIN
- */
-#if !defined LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT || defined __DOXYGEN__
-#define LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT 20000
-#endif
-
-/**
- * SO_REUSE==1: Enable SO_REUSEADDR option.
- */
-#if !defined SO_REUSE || defined __DOXYGEN__
-#define SO_REUSE                        0
-#endif
-
-/**
- * SO_REUSE_RXTOALL==1: Pass a copy of incoming broadcast/multicast packets
- * to all local matches if SO_REUSEADDR is turned on.
- * WARNING: Adds a memcpy for every packet if passing to more than one pcb!
- */
-#if !defined SO_REUSE_RXTOALL || defined __DOXYGEN__
-#define SO_REUSE_RXTOALL                0
-#endif
-
-/**
- * LWIP_FIONREAD_LINUXMODE==0 (default): ioctl/FIONREAD returns the amount of
- * pending data in the network buffer. This is the way windows does it. It's
- * the default for lwIP since it is smaller.
- * LWIP_FIONREAD_LINUXMODE==1: ioctl/FIONREAD returns the size of the next
- * pending datagram in bytes. This is the way linux does it. This code is only
- * here for compatibility.
- */
-#if !defined LWIP_FIONREAD_LINUXMODE || defined __DOXYGEN__
-#define LWIP_FIONREAD_LINUXMODE         0
-#endif
-/**
- * @}
- */
-
-/*
- ----------------------------------------
- ---------- Statistics options ----------
- ----------------------------------------
- */
-/**
- * @defgroup lwip_opts_stats Statistics
- * @ingroup lwip_opts_debug
- * @{
- */
-/**
- * LWIP_STATS==1: Enable statistics collection in lwip_stats.
- */
-#if !defined LWIP_STATS || defined __DOXYGEN__
-#define LWIP_STATS                      1
-#endif
-
-#if LWIP_STATS
-
-/**
- * LWIP_STATS_DISPLAY==1: Compile in the statistics output functions.
- */
-#if !defined LWIP_STATS_DISPLAY || defined __DOXYGEN__
-#define LWIP_STATS_DISPLAY              0
-#endif
-
-/**
- * LINK_STATS==1: Enable link stats.
- */
-#if !defined LINK_STATS || defined __DOXYGEN__
-#define LINK_STATS                      1
-#endif
-
-/**
- * ETHARP_STATS==1: Enable etharp stats.
- */
-#if !defined ETHARP_STATS || defined __DOXYGEN__
-#define ETHARP_STATS                    (LWIP_ARP)
-#endif
-
-/**
- * IP_STATS==1: Enable IP stats.
- */
-#if !defined IP_STATS || defined __DOXYGEN__
-#define IP_STATS                        1
-#endif
-
-/**
- * IPFRAG_STATS==1: Enable IP fragmentation stats. Default is
- * on if using either frag or reass.
- */
-#if !defined IPFRAG_STATS || defined __DOXYGEN__
-#define IPFRAG_STATS                    (IP_REASSEMBLY || IP_FRAG)
-#endif
-
-/**
- * ICMP_STATS==1: Enable ICMP stats.
- */
-#if !defined ICMP_STATS || defined __DOXYGEN__
-#define ICMP_STATS                      1
-#endif
-
-/**
- * IGMP_STATS==1: Enable IGMP stats.
- */
-#if !defined IGMP_STATS || defined __DOXYGEN__
-#define IGMP_STATS                      (LWIP_IGMP)
-#endif
-
-/**
- * UDP_STATS==1: Enable UDP stats. Default is on if
- * UDP enabled, otherwise off.
- */
-#if !defined UDP_STATS || defined __DOXYGEN__
-#define UDP_STATS                       (LWIP_UDP)
-#endif
-
-/**
- * TCP_STATS==1: Enable TCP stats. Default is on if TCP
- * enabled, otherwise off.
- */
-#if !defined TCP_STATS || defined __DOXYGEN__
-#define TCP_STATS                       (LWIP_TCP)
-#endif
-
-/**
- * MEM_STATS==1: Enable mem.c stats.
- */
-#if !defined MEM_STATS || defined __DOXYGEN__
-#define MEM_STATS                       ((MEM_LIBC_MALLOC == 0) && (MEM_USE_POOLS == 0))
-#endif
-
-/**
- * MEMP_STATS==1: Enable memp.c pool stats.
- */
-#if !defined MEMP_STATS || defined __DOXYGEN__
-#define MEMP_STATS                      (MEMP_MEM_MALLOC == 0)
-#endif
-
-/**
- * SYS_STATS==1: Enable system stats (sem and mbox counts, etc).
- */
-#if !defined SYS_STATS || defined __DOXYGEN__
-#define SYS_STATS                       (NO_SYS == 0)
-#endif
-
-/**
- * IP6_STATS==1: Enable IPv6 stats.
- */
-#if !defined IP6_STATS || defined __DOXYGEN__
-#define IP6_STATS                       (LWIP_IPV6)
-#endif
-
-/**
- * ICMP6_STATS==1: Enable ICMP for IPv6 stats.
- */
-#if !defined ICMP6_STATS || defined __DOXYGEN__
-#define ICMP6_STATS                     (LWIP_IPV6 && LWIP_ICMP6)
-#endif
-
-/**
- * IP6_FRAG_STATS==1: Enable IPv6 fragmentation stats.
- */
-#if !defined IP6_FRAG_STATS || defined __DOXYGEN__
-#define IP6_FRAG_STATS                  (LWIP_IPV6 && (LWIP_IPV6_FRAG || LWIP_IPV6_REASS))
-#endif
-
-/**
- * MLD6_STATS==1: Enable MLD for IPv6 stats.
- */
-#if !defined MLD6_STATS || defined __DOXYGEN__
-#define MLD6_STATS                      (LWIP_IPV6 && LWIP_IPV6_MLD)
-#endif
-
-/**
- * ND6_STATS==1: Enable Neighbor discovery for IPv6 stats.
- */
-#if !defined ND6_STATS || defined __DOXYGEN__
-#define ND6_STATS                       (LWIP_IPV6)
-#endif
-
-/**
- * MIB2_STATS==1: Stats for SNMP MIB2.
- */
-#if !defined MIB2_STATS || defined __DOXYGEN__
-#define MIB2_STATS                      0
-#endif
-
-#else
-
-#define LINK_STATS                      0
-#define ETHARP_STATS                    0
-#define IP_STATS                        0
-#define IPFRAG_STATS                    0
-#define ICMP_STATS                      0
-#define IGMP_STATS                      0
-#define UDP_STATS                       0
-#define TCP_STATS                       0
-#define MEM_STATS                       0
-#define MEMP_STATS                      0
-#define SYS_STATS                       0
-#define LWIP_STATS_DISPLAY              0
-#define IP6_STATS                       0
-#define ICMP6_STATS                     0
-#define IP6_FRAG_STATS                  0
-#define MLD6_STATS                      0
-#define ND6_STATS                       0
-#define MIB2_STATS                      0
-
-#endif /* LWIP_STATS */
-/**
- * @}
- */
-
-/*
- --------------------------------------
- ---------- Checksum options ----------
- --------------------------------------
- */
-/**
- * @defgroup lwip_opts_checksum Checksum
- * @ingroup lwip_opts_infrastructure
- * @{
- */
-/**
- * LWIP_CHECKSUM_CTRL_PER_NETIF==1: Checksum generation/check can be enabled/disabled
- * per netif.
- * ATTENTION: if enabled, the CHECKSUM_GEN_* and CHECKSUM_CHECK_* defines must be enabled!
- */
-#if !defined LWIP_CHECKSUM_CTRL_PER_NETIF || defined __DOXYGEN__
-#define LWIP_CHECKSUM_CTRL_PER_NETIF    0
-#endif
-
-/**
- * CHECKSUM_GEN_IP==1: Generate checksums in software for outgoing IP packets.
- */
-#if !defined CHECKSUM_GEN_IP || defined __DOXYGEN__
-#define CHECKSUM_GEN_IP                 1
-#endif
-
-/**
- * CHECKSUM_GEN_UDP==1: Generate checksums in software for outgoing UDP packets.
- */
-#if !defined CHECKSUM_GEN_UDP || defined __DOXYGEN__
-#define CHECKSUM_GEN_UDP                1
-#endif
-
-/**
- * CHECKSUM_GEN_TCP==1: Generate checksums in software for outgoing TCP packets.
- */
-#if !defined CHECKSUM_GEN_TCP || defined __DOXYGEN__
-#define CHECKSUM_GEN_TCP                1
-#endif
-
-/**
- * CHECKSUM_GEN_ICMP==1: Generate checksums in software for outgoing ICMP packets.
- */
-#if !defined CHECKSUM_GEN_ICMP || defined __DOXYGEN__
-#define CHECKSUM_GEN_ICMP               1
-#endif
-
-/**
- * CHECKSUM_GEN_ICMP6==1: Generate checksums in software for outgoing ICMP6 packets.
- */
-#if !defined CHECKSUM_GEN_ICMP6 || defined __DOXYGEN__
-#define CHECKSUM_GEN_ICMP6              1
-#endif
-
-/**
- * CHECKSUM_CHECK_IP==1: Check checksums in software for incoming IP packets.
- */
-#if !defined CHECKSUM_CHECK_IP || defined __DOXYGEN__
-#define CHECKSUM_CHECK_IP               1
-#endif
-
-/**
- * CHECKSUM_CHECK_UDP==1: Check checksums in software for incoming UDP packets.
- */
-#if !defined CHECKSUM_CHECK_UDP || defined __DOXYGEN__
-#define CHECKSUM_CHECK_UDP              1
-#endif
-
-/**
- * CHECKSUM_CHECK_TCP==1: Check checksums in software for incoming TCP packets.
- */
-#if !defined CHECKSUM_CHECK_TCP || defined __DOXYGEN__
-#define CHECKSUM_CHECK_TCP              1
-#endif
-
-/**
- * CHECKSUM_CHECK_ICMP==1: Check checksums in software for incoming ICMP packets.
- */
-#if !defined CHECKSUM_CHECK_ICMP || defined __DOXYGEN__
-#define CHECKSUM_CHECK_ICMP             1
-#endif
-
-/**
- * CHECKSUM_CHECK_ICMP6==1: Check checksums in software for incoming ICMPv6 packets
- */
-#if !defined CHECKSUM_CHECK_ICMP6 || defined __DOXYGEN__
-#define CHECKSUM_CHECK_ICMP6            1
-#endif
-
-/**
- * LWIP_CHECKSUM_ON_COPY==1: Calculate checksum when copying data from
- * application buffers to pbufs.
- */
-#if !defined LWIP_CHECKSUM_ON_COPY || defined __DOXYGEN__
-#define LWIP_CHECKSUM_ON_COPY           0
-#endif
-/**
- * @}
- */
-
-/*
- ---------------------------------------
- ---------- IPv6 options ---------------
- ---------------------------------------
- */
-/**
- * @defgroup lwip_opts_ipv6 IPv6
- * @ingroup lwip_opts
- * @{
- */
-/**
- * LWIP_IPV6==1: Enable IPv6
- */
-#if !defined LWIP_IPV6 || defined __DOXYGEN__
-#define LWIP_IPV6                       0
-#endif
-
-/**
- * LWIP_IPV6_NUM_ADDRESSES: Number of IPv6 addresses per netif.
- */
-#if !defined LWIP_IPV6_NUM_ADDRESSES || defined __DOXYGEN__
-#define LWIP_IPV6_NUM_ADDRESSES         3
-#endif
-
-/**
- * LWIP_IPV6_FORWARD==1: Forward IPv6 packets across netifs
- */
-#if !defined LWIP_IPV6_FORWARD || defined __DOXYGEN__
-#define LWIP_IPV6_FORWARD               0
-#endif
-
-/**
- * LWIP_IPV6_FRAG==1: Fragment outgoing IPv6 packets that are too big.
- */
-#if !defined LWIP_IPV6_FRAG || defined __DOXYGEN__
-#define LWIP_IPV6_FRAG                  0
-#endif
-
-/**
- * LWIP_IPV6_REASS==1: reassemble incoming IPv6 packets that fragmented
- */
-#if !defined LWIP_IPV6_REASS || defined __DOXYGEN__
-#define LWIP_IPV6_REASS                 (LWIP_IPV6)
-#endif
-
-/**
- * LWIP_IPV6_SEND_ROUTER_SOLICIT==1: Send router solicitation messages during
- * network startup.
- */
-#if !defined LWIP_IPV6_SEND_ROUTER_SOLICIT || defined __DOXYGEN__
-#define LWIP_IPV6_SEND_ROUTER_SOLICIT   1
-#endif
-
-/**
- * LWIP_IPV6_AUTOCONFIG==1: Enable stateless address autoconfiguration as per RFC 4862.
- */
-#if !defined LWIP_IPV6_AUTOCONFIG || defined __DOXYGEN__
-#define LWIP_IPV6_AUTOCONFIG            (LWIP_IPV6)
-#endif
-
-/**
- * LWIP_IPV6_DUP_DETECT_ATTEMPTS=[0..7]: Number of duplicate address detection attempts.
- */
-#if !defined LWIP_IPV6_DUP_DETECT_ATTEMPTS || defined __DOXYGEN__
-#define LWIP_IPV6_DUP_DETECT_ATTEMPTS   1
-#endif
-/**
- * @}
- */
-
-/**
- * @defgroup lwip_opts_icmp6 ICMP6
- * @ingroup lwip_opts_ipv6
- * @{
- */
-/**
- * LWIP_ICMP6==1: Enable ICMPv6 (mandatory per RFC)
- */
-#if !defined LWIP_ICMP6 || defined __DOXYGEN__
-#define LWIP_ICMP6                      (LWIP_IPV6)
-#endif
-
-/**
- * LWIP_ICMP6_DATASIZE: bytes from original packet to send back in
- * ICMPv6 error messages.
- */
-#if !defined LWIP_ICMP6_DATASIZE || defined __DOXYGEN__
-#define LWIP_ICMP6_DATASIZE             8
-#endif
-
-/**
- * LWIP_ICMP6_HL: default hop limit for ICMPv6 messages
- */
-#if !defined LWIP_ICMP6_HL || defined __DOXYGEN__
-#define LWIP_ICMP6_HL                   255
-#endif
-/**
- * @}
- */
-
-/**
- * @defgroup lwip_opts_mld6 Multicast listener discovery
- * @ingroup lwip_opts_ipv6
- * @{
- */
-/**
- * LWIP_IPV6_MLD==1: Enable multicast listener discovery protocol.
- * If LWIP_IPV6 is enabled but this setting is disabled, the MAC layer must
- * indiscriminately pass all inbound IPv6 multicast traffic to lwIP.
- */
-#if !defined LWIP_IPV6_MLD || defined __DOXYGEN__
-#define LWIP_IPV6_MLD                   (LWIP_IPV6)
-#endif
-
-/**
- * MEMP_NUM_MLD6_GROUP: Max number of IPv6 multicast groups that can be joined.
- * There must be enough groups so that each netif can join the solicited-node
- * multicast group for each of its local addresses, plus one for MDNS if
- * applicable, plus any number of groups to be joined on UDP sockets.
- */
-#if !defined MEMP_NUM_MLD6_GROUP || defined __DOXYGEN__
-#define MEMP_NUM_MLD6_GROUP             4
-#endif
-/**
- * @}
- */
-
-/**
- * @defgroup lwip_opts_nd6 Neighbor discovery
- * @ingroup lwip_opts_ipv6
- * @{
- */
-/**
- * LWIP_ND6_QUEUEING==1: queue outgoing IPv6 packets while MAC address
- * is being resolved.
- */
-#if !defined LWIP_ND6_QUEUEING || defined __DOXYGEN__
-#define LWIP_ND6_QUEUEING               (LWIP_IPV6)
-#endif
-
-/**
- * MEMP_NUM_ND6_QUEUE: Max number of IPv6 packets to queue during MAC resolution.
- */
-#if !defined MEMP_NUM_ND6_QUEUE || defined __DOXYGEN__
-#define MEMP_NUM_ND6_QUEUE              20
-#endif
-
-/**
- * LWIP_ND6_NUM_NEIGHBORS: Number of entries in IPv6 neighbor cache
- */
-#if !defined LWIP_ND6_NUM_NEIGHBORS || defined __DOXYGEN__
-#define LWIP_ND6_NUM_NEIGHBORS          10
-#endif
-
-/**
- * LWIP_ND6_NUM_DESTINATIONS: number of entries in IPv6 destination cache
- */
-#if !defined LWIP_ND6_NUM_DESTINATIONS || defined __DOXYGEN__
-#define LWIP_ND6_NUM_DESTINATIONS       10
-#endif
-
-/**
- * LWIP_ND6_NUM_PREFIXES: number of entries in IPv6 on-link prefixes cache
- */
-#if !defined LWIP_ND6_NUM_PREFIXES || defined __DOXYGEN__
-#define LWIP_ND6_NUM_PREFIXES           5
-#endif
-
-/**
- * LWIP_ND6_NUM_ROUTERS: number of entries in IPv6 default router cache
- */
-#if !defined LWIP_ND6_NUM_ROUTERS || defined __DOXYGEN__
-#define LWIP_ND6_NUM_ROUTERS            3
-#endif
-
-/**
- * LWIP_ND6_MAX_MULTICAST_SOLICIT: max number of multicast solicit messages to send
- * (neighbor solicit and router solicit)
- */
-#if !defined LWIP_ND6_MAX_MULTICAST_SOLICIT || defined __DOXYGEN__
-#define LWIP_ND6_MAX_MULTICAST_SOLICIT  3
-#endif
-
-/**
- * LWIP_ND6_MAX_UNICAST_SOLICIT: max number of unicast neighbor solicitation messages
- * to send during neighbor reachability detection.
- */
-#if !defined LWIP_ND6_MAX_UNICAST_SOLICIT || defined __DOXYGEN__
-#define LWIP_ND6_MAX_UNICAST_SOLICIT    3
-#endif
-
-/**
- * Unused: See ND RFC (time in milliseconds).
- */
-#if !defined LWIP_ND6_MAX_ANYCAST_DELAY_TIME || defined __DOXYGEN__
-#define LWIP_ND6_MAX_ANYCAST_DELAY_TIME 1000
-#endif
-
-/**
- * Unused: See ND RFC
- */
-#if !defined LWIP_ND6_MAX_NEIGHBOR_ADVERTISEMENT || defined __DOXYGEN__
-#define LWIP_ND6_MAX_NEIGHBOR_ADVERTISEMENT  3
-#endif
-
-/**
- * LWIP_ND6_REACHABLE_TIME: default neighbor reachable time (in milliseconds).
- * May be updated by router advertisement messages.
- */
-#if !defined LWIP_ND6_REACHABLE_TIME || defined __DOXYGEN__
-#define LWIP_ND6_REACHABLE_TIME         30000
-#endif
-
-/**
- * LWIP_ND6_RETRANS_TIMER: default retransmission timer for solicitation messages
- */
-#if !defined LWIP_ND6_RETRANS_TIMER || defined __DOXYGEN__
-#define LWIP_ND6_RETRANS_TIMER          1000
-#endif
-
-/**
- * LWIP_ND6_DELAY_FIRST_PROBE_TIME: Delay before first unicast neighbor solicitation
- * message is sent, during neighbor reachability detection.
- */
-#if !defined LWIP_ND6_DELAY_FIRST_PROBE_TIME || defined __DOXYGEN__
-#define LWIP_ND6_DELAY_FIRST_PROBE_TIME 5000
-#endif
-
-/**
- * LWIP_ND6_ALLOW_RA_UPDATES==1: Allow Router Advertisement messages to update
- * Reachable time and retransmission timers, and netif MTU.
- */
-#if !defined LWIP_ND6_ALLOW_RA_UPDATES || defined __DOXYGEN__
-#define LWIP_ND6_ALLOW_RA_UPDATES       1
-#endif
-
-/**
- * LWIP_ND6_TCP_REACHABILITY_HINTS==1: Allow TCP to provide Neighbor Discovery
- * with reachability hints for connected destinations. This helps avoid sending
- * unicast neighbor solicitation messages.
- */
-#if !defined LWIP_ND6_TCP_REACHABILITY_HINTS || defined __DOXYGEN__
-#define LWIP_ND6_TCP_REACHABILITY_HINTS 1
-#endif
-
-/**
- * LWIP_ND6_RDNSS_MAX_DNS_SERVERS > 0: Use IPv6 Router Advertisement Recursive
- * DNS Server Option (as per RFC 6106) to copy a defined maximum number of DNS
- * servers to the DNS module.
- */
-#if !defined LWIP_ND6_RDNSS_MAX_DNS_SERVERS || defined __DOXYGEN__
-#define LWIP_ND6_RDNSS_MAX_DNS_SERVERS  0
-#endif
-/**
- * @}
- */
-
-/**
- * LWIP_IPV6_DHCP6==1: enable DHCPv6 stateful address autoconfiguration.
- */
-#if !defined LWIP_IPV6_DHCP6 || defined __DOXYGEN__
-#define LWIP_IPV6_DHCP6                 0
-#endif
-
-/*
- ---------------------------------------
- ---------- Hook options ---------------
- ---------------------------------------
- */
-
-/**
- * @defgroup lwip_opts_hooks Hooks
- * @ingroup lwip_opts_infrastructure
- * Hooks are undefined by default, define them to a function if you need them.
- * @{
- */
-
-/**
- * LWIP_HOOK_FILENAME: Custom filename to #include in files that provide hooks.
- * Declare your hook function prototypes in there, you may also #include all headers
- * providing data types that are need in this file.
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_FILENAME "path/to/my/lwip_hooks.h"
-#endif
-
-/**
- * LWIP_HOOK_TCP_ISN:
- * Hook for generation of the Initial Sequence Number (ISN) for a new TCP
- * connection. The default lwIP ISN generation algorithm is very basic and may
- * allow for TCP spoofing attacks. This hook provides the means to implement
- * the standardized ISN generation algorithm from RFC 6528 (see contrib/adons/tcp_isn),
- * or any other desired algorithm as a replacement.
- * Called from tcp_connect() and tcp_listen_input() when an ISN is needed for
- * a new TCP connection, if TCP support (@ref LWIP_TCP) is enabled.\n
- * Signature: u32_t my_hook_tcp_isn(const ip_addr_t* local_ip, u16_t local_port, const ip_addr_t* remote_ip, u16_t remote_port);
- * - it may be necessary to use "struct ip_addr" (ip4_addr, ip6_addr) instead of "ip_addr_t" in function declarations\n
- * Arguments:
- * - local_ip: pointer to the local IP address of the connection
- * - local_port: local port number of the connection (host-byte order)
- * - remote_ip: pointer to the remote IP address of the connection
- * - remote_port: remote port number of the connection (host-byte order)\n
- * Return value:
- * - the 32-bit Initial Sequence Number to use for the new TCP connection.
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_TCP_ISN(local_ip, local_port, remote_ip, remote_port)
-#endif
-
-/**
- * LWIP_HOOK_IP4_INPUT(pbuf, input_netif):
- * - called from ip_input() (IPv4)
- * - pbuf: received struct pbuf passed to ip_input()
- * - input_netif: struct netif on which the packet has been received
- * Return values:
- * - 0: Hook has not consumed the packet, packet is processed as normal
- * - != 0: Hook has consumed the packet.
- * If the hook consumed the packet, 'pbuf' is in the responsibility of the hook
- * (i.e. free it when done).
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_IP4_INPUT(pbuf, input_netif)
-#endif
-
-/**
- * LWIP_HOOK_IP4_ROUTE(dest):
- * - called from ip_route() (IPv4)
- * - dest: destination IPv4 address
- * Returns the destination netif or NULL if no destination netif is found. In
- * that case, ip_route() continues as normal.
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_IP4_ROUTE()
-#endif
-
-/**
- * LWIP_HOOK_IP4_ROUTE_SRC(dest, src):
- * - source-based routing for IPv4 (see LWIP_HOOK_IP4_ROUTE(), src may be NULL)
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_IP4_ROUTE_SRC(dest, src)
-#endif
-
-/**
- * LWIP_HOOK_ETHARP_GET_GW(netif, dest):
- * - called from etharp_output() (IPv4)
- * - netif: the netif used for sending
- * - dest: the destination IPv4 address
- * Returns the IPv4 address of the gateway to handle the specified destination
- * IPv4 address. If NULL is returned, the netif's default gateway is used.
- * The returned address MUST be directly reachable on the specified netif!
- * This function is meant to implement advanced IPv4 routing together with
- * LWIP_HOOK_IP4_ROUTE(). The actual routing/gateway table implementation is
- * not part of lwIP but can e.g. be hidden in the netif's state argument.
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_ETHARP_GET_GW(netif, dest)
-#endif
-
-/**
- * LWIP_HOOK_IP6_INPUT(pbuf, input_netif):
- * - called from ip6_input() (IPv6)
- * - pbuf: received struct pbuf passed to ip6_input()
- * - input_netif: struct netif on which the packet has been received
- * Return values:
- * - 0: Hook has not consumed the packet, packet is processed as normal
- * - != 0: Hook has consumed the packet.
- * If the hook consumed the packet, 'pbuf' is in the responsibility of the hook
- * (i.e. free it when done).
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_IP6_INPUT(pbuf, input_netif)
-#endif
-
-/**
- * LWIP_HOOK_IP6_ROUTE(src, dest):
- * - called from ip6_route() (IPv6)
- * - src: sourc IPv6 address
- * - dest: destination IPv6 address
- * Returns the destination netif or NULL if no destination netif is found. In
- * that case, ip6_route() continues as normal.
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_IP6_ROUTE(src, dest)
-#endif
-
-/**
- * LWIP_HOOK_ND6_GET_GW(netif, dest):
- * - called from nd6_get_next_hop_entry() (IPv6)
- * - netif: the netif used for sending
- * - dest: the destination IPv6 address
- * Returns the IPv6 address of the next hop to handle the specified destination
- * IPv6 address. If NULL is returned, a NDP-discovered router is used instead.
- * The returned address MUST be directly reachable on the specified netif!
- * This function is meant to implement advanced IPv6 routing together with
- * LWIP_HOOK_IP6_ROUTE(). The actual routing/gateway table implementation is
- * not part of lwIP but can e.g. be hidden in the netif's state argument.
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_ND6_GET_GW(netif, dest)
-#endif
-
-/**
- * LWIP_HOOK_VLAN_CHECK(netif, eth_hdr, vlan_hdr):
- * - called from ethernet_input() if VLAN support is enabled
- * - netif: struct netif on which the packet has been received
- * - eth_hdr: struct eth_hdr of the packet
- * - vlan_hdr: struct eth_vlan_hdr of the packet
- * Return values:
- * - 0: Packet must be dropped.
- * - != 0: Packet must be accepted.
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_VLAN_CHECK(netif, eth_hdr, vlan_hdr)
-#endif
-
-/**
- * LWIP_HOOK_VLAN_SET:
- * Hook can be used to set prio_vid field of vlan_hdr. If you need to store data
- * on per-netif basis to implement this callback, see @ref netif_cd.
- * Called from ethernet_output() if VLAN support (@ref ETHARP_SUPPORT_VLAN) is enabled.\n
- * Signature: s32_t my_hook_vlan_set(struct netif* netif, struct pbuf* pbuf, const struct eth_addr* src, const struct eth_addr* dst, u16_t eth_type);\n
- * Arguments:
- * - netif: struct netif that the packet will be sent through
- * - p: struct pbuf packet to be sent
- * - src: source eth address
- * - dst: destination eth address
- * - eth_type: ethernet type to packet to be sent\n
- * 
- * 
- * Return values:
- * - &lt;0: Packet shall not contain VLAN header.
- * - 0 &lt;= return value &lt;= 0xFFFF: Packet shall contain VLAN header. Return value is prio_vid in host byte order.
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_VLAN_SET(netif, p, src, dst, eth_type)
-#endif
-
-/**
- * LWIP_HOOK_MEMP_AVAILABLE(memp_t_type):
- * - called from memp_free() when a memp pool was empty and an item is now available
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_MEMP_AVAILABLE(memp_t_type)
-#endif
-
-/**
- * LWIP_HOOK_UNKNOWN_ETH_PROTOCOL(pbuf, netif):
- * Called from ethernet_input() when an unknown eth type is encountered.
- * Return ERR_OK if packet is accepted, any error code otherwise.
- * Payload points to ethernet header!
- */
-#ifdef __DOXYGEN__
-#define LWIP_HOOK_UNKNOWN_ETH_PROTOCOL(pbuf, netif)
-#endif
-/**
- * @}
- */
-
-/*
- ---------------------------------------
- ---------- Debugging options ----------
- ---------------------------------------
- */
-/**
- * @defgroup lwip_opts_debugmsg Debug messages
- * @ingroup lwip_opts_debug
- * @{
- */
-/**
- * LWIP_DBG_MIN_LEVEL: After masking, the value of the debug is
- * compared against this value. If it is smaller, then debugging
- * messages are written.
- * @see debugging_levels
- */
-#if !defined LWIP_DBG_MIN_LEVEL || defined __DOXYGEN__
-#define LWIP_DBG_MIN_LEVEL              LWIP_DBG_LEVEL_ALL
-#endif
-
-/**
- * LWIP_DBG_TYPES_ON: A mask that can be used to globally enable/disable
- * debug messages of certain types.
- * @see debugging_levels
- */
-#if !defined LWIP_DBG_TYPES_ON || defined __DOXYGEN__
-#define LWIP_DBG_TYPES_ON               LWIP_DBG_ON
-#endif
-
-/**
- * ETHARP_DEBUG: Enable debugging in etharp.c.
- */
-#if !defined ETHARP_DEBUG || defined __DOXYGEN__
-#define ETHARP_DEBUG                    LWIP_DBG_OFF
-#endif
-
-/**
- * NETIF_DEBUG: Enable debugging in netif.c.
- */
-#if !defined NETIF_DEBUG || defined __DOXYGEN__
-#define NETIF_DEBUG                     LWIP_DBG_OFF
-#endif
-
-/**
- * PBUF_DEBUG: Enable debugging in pbuf.c.
- */
-#if !defined PBUF_DEBUG || defined __DOXYGEN__
-#define PBUF_DEBUG                      LWIP_DBG_OFF
-#endif
-
-/**
- * API_LIB_DEBUG: Enable debugging in api_lib.c.
- */
-#if !defined API_LIB_DEBUG || defined __DOXYGEN__
-#define API_LIB_DEBUG                   LWIP_DBG_OFF
-#endif
-
-/**
- * API_MSG_DEBUG: Enable debugging in api_msg.c.
- */
-#if !defined API_MSG_DEBUG || defined __DOXYGEN__
-#define API_MSG_DEBUG                   LWIP_DBG_OFF
-#endif
-
-/**
- * SOCKETS_DEBUG: Enable debugging in sockets.c.
- */
-#if !defined SOCKETS_DEBUG || defined __DOXYGEN__
-#define SOCKETS_DEBUG                   LWIP_DBG_OFF
-#endif
-
-/**
- * ICMP_DEBUG: Enable debugging in icmp.c.
- */
-#if !defined ICMP_DEBUG || defined __DOXYGEN__
-#define ICMP_DEBUG                      LWIP_DBG_OFF
-#endif
-
-/**
- * IGMP_DEBUG: Enable debugging in igmp.c.
- */
-#if !defined IGMP_DEBUG || defined __DOXYGEN__
-#define IGMP_DEBUG                      LWIP_DBG_OFF
-#endif
-
-/**
- * INET_DEBUG: Enable debugging in inet.c.
- */
-#if !defined INET_DEBUG || defined __DOXYGEN__
-#define INET_DEBUG                      LWIP_DBG_OFF
-#endif
-
-/**
- * IP_DEBUG: Enable debugging for IP.
- */
-#if !defined IP_DEBUG || defined __DOXYGEN__
-#define IP_DEBUG                        LWIP_DBG_OFF
-#endif
-
-/**
- * IP_REASS_DEBUG: Enable debugging in ip_frag.c for both frag & reass.
- */
-#if !defined IP_REASS_DEBUG || defined __DOXYGEN__
-#define IP_REASS_DEBUG                  LWIP_DBG_OFF
-#endif
-
-/**
- * RAW_DEBUG: Enable debugging in raw.c.
- */
-#if !defined RAW_DEBUG || defined __DOXYGEN__
-#define RAW_DEBUG                       LWIP_DBG_OFF
-#endif
-
-/**
- * MEM_DEBUG: Enable debugging in mem.c.
- */
-#if !defined MEM_DEBUG || defined __DOXYGEN__
-#define MEM_DEBUG                       LWIP_DBG_OFF
-#endif
-
-/**
- * MEMP_DEBUG: Enable debugging in memp.c.
- */
-#if !defined MEMP_DEBUG || defined __DOXYGEN__
-#define MEMP_DEBUG                      LWIP_DBG_OFF
-#endif
-
-/**
- * SYS_DEBUG: Enable debugging in sys.c.
- */
-#if !defined SYS_DEBUG || defined __DOXYGEN__
-#define SYS_DEBUG                       LWIP_DBG_OFF
-#endif
-
-/**
- * TIMERS_DEBUG: Enable debugging in timers.c.
- */
-#if !defined TIMERS_DEBUG || defined __DOXYGEN__
-#define TIMERS_DEBUG                    LWIP_DBG_OFF
-#endif
-
-/**
- * TCP_DEBUG: Enable debugging for TCP.
- */
-#if !defined TCP_DEBUG || defined __DOXYGEN__
-#define TCP_DEBUG                       LWIP_DBG_OFF
-#endif
-
-/**
- * TCP_INPUT_DEBUG: Enable debugging in tcp_in.c for incoming debug.
- */
-#if !defined TCP_INPUT_DEBUG || defined __DOXYGEN__
-#define TCP_INPUT_DEBUG                 LWIP_DBG_OFF
-#endif
-
-/**
- * TCP_FR_DEBUG: Enable debugging in tcp_in.c for fast retransmit.
- */
-#if !defined TCP_FR_DEBUG || defined __DOXYGEN__
-#define TCP_FR_DEBUG                    LWIP_DBG_OFF
-#endif
-
-/**
- * TCP_RTO_DEBUG: Enable debugging in TCP for retransmit
- * timeout.
- */
-#if !defined TCP_RTO_DEBUG || defined __DOXYGEN__
-#define TCP_RTO_DEBUG                   LWIP_DBG_OFF
-#endif
-
-/**
- * TCP_CWND_DEBUG: Enable debugging for TCP congestion window.
- */
-#if !defined TCP_CWND_DEBUG || defined __DOXYGEN__
-#define TCP_CWND_DEBUG                  LWIP_DBG_OFF
-#endif
-
-/**
- * TCP_WND_DEBUG: Enable debugging in tcp_in.c for window updating.
- */
-#if !defined TCP_WND_DEBUG || defined __DOXYGEN__
-#define TCP_WND_DEBUG                   LWIP_DBG_OFF
-#endif
-
-/**
- * TCP_OUTPUT_DEBUG: Enable debugging in tcp_out.c output functions.
- */
-#if !defined TCP_OUTPUT_DEBUG || defined __DOXYGEN__
-#define TCP_OUTPUT_DEBUG                LWIP_DBG_OFF
-#endif
-
-/**
- * TCP_RST_DEBUG: Enable debugging for TCP with the RST message.
- */
-#if !defined TCP_RST_DEBUG || defined __DOXYGEN__
-#define TCP_RST_DEBUG                   LWIP_DBG_OFF
-#endif
-
-/**
- * TCP_QLEN_DEBUG: Enable debugging for TCP queue lengths.
- */
-#if !defined TCP_QLEN_DEBUG || defined __DOXYGEN__
-#define TCP_QLEN_DEBUG                  LWIP_DBG_OFF
-#endif
-
-/**
- * UDP_DEBUG: Enable debugging in UDP.
- */
-#if !defined UDP_DEBUG || defined __DOXYGEN__
-#define UDP_DEBUG                       LWIP_DBG_OFF
-#endif
-
-/**
- * TCPIP_DEBUG: Enable debugging in tcpip.c.
- */
-#if !defined TCPIP_DEBUG || defined __DOXYGEN__
-#define TCPIP_DEBUG                     LWIP_DBG_OFF
-#endif
-
-/**
- * SLIP_DEBUG: Enable debugging in slipif.c.
- */
-#if !defined SLIP_DEBUG || defined __DOXYGEN__
-#define SLIP_DEBUG                      LWIP_DBG_OFF
-#endif
-
-/**
- * DHCP_DEBUG: Enable debugging in dhcp.c.
- */
-#if !defined DHCP_DEBUG || defined __DOXYGEN__
-#define DHCP_DEBUG                      LWIP_DBG_OFF
-#endif
-
-/**
- * AUTOIP_DEBUG: Enable debugging in autoip.c.
- */
-#if !defined AUTOIP_DEBUG || defined __DOXYGEN__
-#define AUTOIP_DEBUG                    LWIP_DBG_OFF
-#endif
-
-/**
- * DNS_DEBUG: Enable debugging for DNS.
- */
-#if !defined DNS_DEBUG || defined __DOXYGEN__
-#define DNS_DEBUG                       LWIP_DBG_OFF
-#endif
-
-/**
- * IP6_DEBUG: Enable debugging for IPv6.
- */
-#if !defined IP6_DEBUG || defined __DOXYGEN__
-#define IP6_DEBUG                       LWIP_DBG_OFF
-#endif
-/**
- * @}
- */
-
-/*
- --------------------------------------------------
- ---------- Performance tracking options ----------
- --------------------------------------------------
- */
-/**
- * @defgroup lwip_opts_perf Performance
- * @ingroup lwip_opts_debug
- * @{
- */
-/**
- * LWIP_PERF: Enable performance testing for lwIP
- * (if enabled, arch/perf.h is included)
- */
-#if !defined LWIP_PERF || defined __DOXYGEN__
-#define LWIP_PERF                       0
-#endif
-/**
- * @}
- */
-
-#endif /* LWIP_HDR_OPT_H */
diff --git a/sys/include/net/pbuf.h b/sys/include/net/pbuf.h
deleted file mode 100644
index 850c0c5..0000000
--- a/sys/include/net/pbuf.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * @file
- * pbuf API
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#ifndef LWIP_HDR_PBUF_H
-#define LWIP_HDR_PBUF_H
-
-#include <net/opt.h>
-#include <net/err.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** LWIP_SUPPORT_CUSTOM_PBUF==1: Custom pbufs behave much like their pbuf type
- * but they are allocated by external code (initialised by calling
- * pbuf_alloced_custom()) and when pbuf_free gives up their last reference, they
- * are freed by calling pbuf_custom->custom_free_function().
- * Currently, the pbuf_custom code is only needed for one specific configuration
- * of IP_FRAG, unless required by external driver/application code. */
-#ifndef LWIP_SUPPORT_CUSTOM_PBUF
-#define LWIP_SUPPORT_CUSTOM_PBUF ((IP_FRAG && !LWIP_NETIF_TX_SINGLE_PBUF) || (LWIP_IPV6 && LWIP_IPV6_FRAG))
-#endif
-
-/* @todo: We need a mechanism to prevent wasting memory in every pbuf
-   (TCP vs. UDP, IPv4 vs. IPv6: UDP/IPv4 packets may waste up to 28 bytes) */
-
-#define PBUF_TRANSPORT_HLEN 20
-#if LWIP_IPV6
-#define PBUF_IP_HLEN        40
-#else
-#define PBUF_IP_HLEN        20
-#endif
-
-/**
- * @ingroup pbuf
- * Enumeration of pbuf layers
- */
-typedef enum {
-  /** Includes spare room for transport layer header, e.g. UDP header.
-   * Use this if you intend to pass the pbuf to functions like udp_send().
-   */
-  PBUF_TRANSPORT,
-  /** Includes spare room for IP header.
-   * Use this if you intend to pass the pbuf to functions like raw_send().
-   */
-  PBUF_IP,
-  /** Includes spare room for link layer header (ethernet header).
-   * Use this if you intend to pass the pbuf to functions like ethernet_output().
-   * @see PBUF_LINK_HLEN
-   */
-  PBUF_LINK,
-  /** Includes spare room for additional encapsulation header before ethernet
-   * headers (e.g. 802.11).
-   * Use this if you intend to pass the pbuf to functions like netif->linkoutput().
-   * @see PBUF_LINK_ENCAPSULATION_HLEN
-   */
-  PBUF_RAW_TX,
-  /** Use this for input packets in a netif driver when calling netif->input()
-   * in the most common case - ethernet-layer netif driver. */
-  PBUF_RAW
-} pbuf_layer;
-
-/**
- * @ingroup pbuf
- * Enumeration of pbuf types
- */
-typedef enum {
-  /** pbuf data is stored in RAM, used for TX mostly, struct pbuf and its payload
-      are allocated in one piece of contiguous memory (so the first payload byte
-      can be calculated from struct pbuf).
-      pbuf_alloc() allocates PBUF_RAM pbufs as unchained pbufs (although that might
-      change in future versions).
-      This should be used for all OUTGOING packets (TX).*/
-  PBUF_RAM,
-  /** pbuf data is stored in ROM, i.e. struct pbuf and its payload are located in
-      totally different memory areas. Since it points to ROM, payload does not
-      have to be copied when queued for transmission. */
-  PBUF_ROM,
-  /** pbuf comes from the pbuf pool. Much like PBUF_ROM but payload might change
-      so it has to be duplicated when queued before transmitting, depending on
-      who has a 'ref' to it. */
-  PBUF_REF,
-  /** pbuf payload refers to RAM. This one comes from a pool and should be used
-      for RX. Payload can be chained (scatter-gather RX) but like PBUF_RAM, struct
-      pbuf and its payload are allocated in one piece of contiguous memory (so
-      the first payload byte can be calculated from struct pbuf).
-      Don't use this for TX, if the pool becomes empty e.g. because of TCP queuing,
-      you are unable to receive TCP acks! */
-  PBUF_POOL
-} pbuf_type;
-
-
-/** indicates this packet's data should be immediately passed to the application */
-#define PBUF_FLAG_PUSH      0x01U
-/** indicates this is a custom pbuf: pbuf_free calls pbuf_custom->custom_free_function()
-    when the last reference is released (plus custom PBUF_RAM cannot be trimmed) */
-#define PBUF_FLAG_IS_CUSTOM 0x02U
-/** indicates this pbuf is UDP multicast to be looped back */
-#define PBUF_FLAG_MCASTLOOP 0x04U
-/** indicates this pbuf was received as link-level broadcast */
-#define PBUF_FLAG_LLBCAST   0x08U
-/** indicates this pbuf was received as link-level multicast */
-#define PBUF_FLAG_LLMCAST   0x10U
-/** indicates this pbuf includes a TCP FIN flag */
-#define PBUF_FLAG_TCP_FIN   0x20U
-
-/** Main packet buffer struct */
-struct pbuf {
-  /** next pbuf in singly linked pbuf chain */
-  struct pbuf *next;
-
-  /** pointer to the actual data in the buffer */
-  void *payload;
-
-  /**
-   * total length of this buffer and all next buffers in chain
-   * belonging to the same packet.
-   *
-   * For non-queue packet chains this is the invariant:
-   * p->tot_len == p->len + (p->next? p->next->tot_len: 0)
-   */
-  u16_t tot_len;
-
-  /** length of this buffer */
-  u16_t len;
-
-  /** pbuf_type as u8_t instead of enum to save space */
-  u8_t /*pbuf_type*/ type;
-
-  /** misc flags */
-  u8_t flags;
-
-  /**
-   * the reference count always equals the number of pointers
-   * that refer to this pbuf. This can be pointers from an application,
-   * the stack itself, or pbuf->next pointers from a chain.
-   */
-  u16_t ref;
-};
-
-
-/** Helper struct for const-correctness only.
- * The only meaning of this one is to provide a const payload pointer
- * for PBUF_ROM type.
- */
-struct pbuf_rom {
-  /** next pbuf in singly linked pbuf chain */
-  struct pbuf *next;
-
-  /** pointer to the actual data in the buffer */
-  const void *payload;
-};
-
-#if LWIP_SUPPORT_CUSTOM_PBUF
-/** Prototype for a function to free a custom pbuf */
-typedef void (*pbuf_free_custom_fn)(struct pbuf *p);
-
-/** A custom pbuf: like a pbuf, but following a function pointer to free it. */
-struct pbuf_custom {
-  /** The actual pbuf */
-  struct pbuf pbuf;
-  /** This function is called when pbuf_free deallocates this pbuf(_custom) */
-  pbuf_free_custom_fn custom_free_function;
-};
-#endif /* LWIP_SUPPORT_CUSTOM_PBUF */
-
-/** Define this to 0 to prevent freeing ooseq pbufs when the PBUF_POOL is empty */
-#ifndef PBUF_POOL_FREE_OOSEQ
-#define PBUF_POOL_FREE_OOSEQ 1
-#endif /* PBUF_POOL_FREE_OOSEQ */
-#if LWIP_TCP && TCP_QUEUE_OOSEQ && NO_SYS && PBUF_POOL_FREE_OOSEQ
-extern volatile u8_t pbuf_free_ooseq_pending;
-void pbuf_free_ooseq(void);
-/** When not using sys_check_timeouts(), call PBUF_CHECK_FREE_OOSEQ()
-    at regular intervals from main level to check if ooseq pbufs need to be
-    freed! */
-#define PBUF_CHECK_FREE_OOSEQ() do { if(pbuf_free_ooseq_pending) { \
-  /* pbuf_alloc() reported PBUF_POOL to be empty -> try to free some \
-     ooseq queued pbufs now */ \
-  pbuf_free_ooseq(); }}while(0)
-#else /* LWIP_TCP && TCP_QUEUE_OOSEQ && NO_SYS && PBUF_POOL_FREE_OOSEQ */
-  /* Otherwise declare an empty PBUF_CHECK_FREE_OOSEQ */
-  #define PBUF_CHECK_FREE_OOSEQ()
-#endif /* LWIP_TCP && TCP_QUEUE_OOSEQ && NO_SYS && PBUF_POOL_FREE_OOSEQ*/
-
-/* Initializes the pbuf module. This call is empty for now, but may not be in future. */
-#define pbuf_init()
-
-struct pbuf *pbuf_alloc(pbuf_layer l, u16_t length, pbuf_type type);
-#if LWIP_SUPPORT_CUSTOM_PBUF
-struct pbuf *pbuf_alloced_custom(pbuf_layer l, u16_t length, pbuf_type type,
-                                 struct pbuf_custom *p, void *payload_mem,
-                                 u16_t payload_mem_len);
-#endif /* LWIP_SUPPORT_CUSTOM_PBUF */
-void pbuf_realloc(struct pbuf *p, u16_t size);
-u8_t pbuf_header(struct pbuf *p, s16_t header_size);
-u8_t pbuf_header_force(struct pbuf *p, s16_t header_size);
-void pbuf_ref(struct pbuf *p);
-u8_t pbuf_free(struct pbuf *p);
-u16_t pbuf_clen(const struct pbuf *p);
-void pbuf_cat(struct pbuf *head, struct pbuf *tail);
-void pbuf_chain(struct pbuf *head, struct pbuf *tail);
-struct pbuf *pbuf_dechain(struct pbuf *p);
-err_t pbuf_copy(struct pbuf *p_to, const struct pbuf *p_from);
-u16_t pbuf_copy_partial(const struct pbuf *p, void *dataptr, u16_t len, u16_t offset);
-err_t pbuf_take(struct pbuf *buf, const void *dataptr, u16_t len);
-err_t pbuf_take_at(struct pbuf *buf, const void *dataptr, u16_t len, u16_t offset);
-struct pbuf *pbuf_skip(struct pbuf* in, u16_t in_offset, u16_t* out_offset);
-struct pbuf *pbuf_coalesce(struct pbuf *p, pbuf_layer layer);
-#if LWIP_CHECKSUM_ON_COPY
-err_t pbuf_fill_chksum(struct pbuf *p, u16_t start_offset, const void *dataptr,
-                       u16_t len, u16_t *chksum);
-#endif /* LWIP_CHECKSUM_ON_COPY */
-#if LWIP_TCP && TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-void pbuf_split_64k(struct pbuf *p, struct pbuf **rest);
-#endif /* LWIP_TCP && TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-
-u8_t pbuf_get_at(const struct pbuf* p, u16_t offset);
-int pbuf_try_get_at(const struct pbuf* p, u16_t offset);
-void pbuf_put_at(struct pbuf* p, u16_t offset, u8_t data);
-u16_t pbuf_memcmp(const struct pbuf* p, u16_t offset, const void* s2, u16_t n);
-u16_t pbuf_memfind(const struct pbuf* p, const void* mem, u16_t mem_len, u16_t start_offset);
-u16_t pbuf_strstr(const struct pbuf* p, const char* substr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PBUF_H */
diff --git a/sys/include/net/priv/api_msg.h b/sys/include/net/priv/api_msg.h
deleted file mode 100644
index 631379d..0000000
--- a/sys/include/net/priv/api_msg.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- * @file
- * netconn API lwIP internal implementations (do not use in application code)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_API_MSG_H
-#define LWIP_HDR_API_MSG_H
-
-#include "net/opt.h"
-
-#if LWIP_NETCONN || LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
-/* Note: Netconn API is always available when sockets are enabled -
- * sockets are implemented on top of them */
-
-#include "net/arch.h"
-#include "net/ip_addr.h"
-#include "net/err.h"
-#include "net/sys.h"
-#include "net/igmp.h"
-#include "net/api.h"
-#include "net/priv/tcpip_priv.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_MPU_COMPATIBLE
-#if LWIP_NETCONN_SEM_PER_THREAD
-#define API_MSG_M_DEF_SEM(m)  *m
-#else
-#define API_MSG_M_DEF_SEM(m)  API_MSG_M_DEF(m)
-#endif
-#else /* LWIP_MPU_COMPATIBLE */
-#define API_MSG_M_DEF_SEM(m)  API_MSG_M_DEF(m)
-#endif /* LWIP_MPU_COMPATIBLE */
-
-/* For the netconn API, these values are use as a bitmask! */
-#define NETCONN_SHUT_RD   1
-#define NETCONN_SHUT_WR   2
-#define NETCONN_SHUT_RDWR (NETCONN_SHUT_RD | NETCONN_SHUT_WR)
-
-/* IP addresses and port numbers are expected to be in
- * the same byte order as in the corresponding pcb.
- */
-/** This struct includes everything that is necessary to execute a function
-    for a netconn in another thread context (mainly used to process netconns
-    in the tcpip_thread context to be thread safe). */
-struct api_msg {
-  /** The netconn which to process - always needed: it includes the semaphore
-      which is used to block the application thread until the function finished. */
-  struct netconn *conn;
-  /** The return value of the function executed in tcpip_thread. */
-  err_t err;
-  /** Depending on the executed function, one of these union members is used */
-  union {
-    /** used for lwip_netconn_do_send */
-    struct netbuf *b;
-    /** used for lwip_netconn_do_newconn */
-    struct {
-      u8_t proto;
-    } n;
-    /** used for lwip_netconn_do_bind and lwip_netconn_do_connect */
-    struct {
-      API_MSG_M_DEF_C(ip_addr_t, ipaddr);
-      u16_t port;
-    } bc;
-    /** used for lwip_netconn_do_getaddr */
-    struct {
-      ip_addr_t API_MSG_M_DEF(ipaddr);
-      u16_t API_MSG_M_DEF(port);
-      u8_t local;
-    } ad;
-    /** used for lwip_netconn_do_write */
-    struct {
-      const void *dataptr;
-      size_t len;
-      u8_t apiflags;
-#if LWIP_SO_SNDTIMEO
-      u32_t time_started;
-#endif /* LWIP_SO_SNDTIMEO */
-    } w;
-    /** used for lwip_netconn_do_recv */
-    struct {
-      u32_t len;
-    } r;
-#if LWIP_TCP
-    /** used for lwip_netconn_do_close (/shutdown) */
-    struct {
-      u8_t shut;
-#if LWIP_SO_SNDTIMEO || LWIP_SO_LINGER
-      u32_t time_started;
-#else /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
-      u8_t polls_left;
-#endif /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
-    } sd;
-#endif /* LWIP_TCP */
-#if LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD)
-    /** used for lwip_netconn_do_join_leave_group */
-    struct {
-      API_MSG_M_DEF_C(ip_addr_t, multiaddr);
-      API_MSG_M_DEF_C(ip_addr_t, netif_addr);
-      enum netconn_igmp join_or_leave;
-    } jl;
-#endif /* LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD) */
-#if TCP_LISTEN_BACKLOG
-    struct {
-      u8_t backlog;
-    } lb;
-#endif /* TCP_LISTEN_BACKLOG */
-  } msg;
-#if LWIP_NETCONN_SEM_PER_THREAD
-  sys_sem_t* op_completed_sem;
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-};
-
-#if LWIP_NETCONN_SEM_PER_THREAD
-#define LWIP_API_MSG_SEM(msg)          ((msg)->op_completed_sem)
-#else /* LWIP_NETCONN_SEM_PER_THREAD */
-#define LWIP_API_MSG_SEM(msg)          (&(msg)->conn->op_completed)
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-
-#if LWIP_DNS
-/** As lwip_netconn_do_gethostbyname requires more arguments but doesn't require a netconn,
-    it has its own struct (to avoid struct api_msg getting bigger than necessary).
-    lwip_netconn_do_gethostbyname must be called using tcpip_callback instead of tcpip_apimsg
-    (see netconn_gethostbyname). */
-struct dns_api_msg {
-  /** Hostname to query or dotted IP address string */
-#if LWIP_MPU_COMPATIBLE
-  char name[DNS_MAX_NAME_LENGTH];
-#else /* LWIP_MPU_COMPATIBLE */
-  const char *name;
-#endif /* LWIP_MPU_COMPATIBLE */
-  /** The resolved address is stored here */
-  ip_addr_t API_MSG_M_DEF(addr);
-#if LWIP_IPV4 && LWIP_IPV6
-  /** Type of resolve call */
-  u8_t dns_addrtype;
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-  /** This semaphore is posted when the name is resolved, the application thread
-      should wait on it. */
-  sys_sem_t API_MSG_M_DEF_SEM(sem);
-  /** Errors are given back here */
-  err_t API_MSG_M_DEF(err);
-};
-#endif /* LWIP_DNS */
-
-#if LWIP_TCP
-extern u8_t netconn_aborted;
-#endif /* LWIP_TCP */
-
-void lwip_netconn_do_newconn         (void *m);
-void lwip_netconn_do_delconn         (void *m);
-void lwip_netconn_do_bind            (void *m);
-void lwip_netconn_do_connect         (void *m);
-void lwip_netconn_do_disconnect      (void *m);
-void lwip_netconn_do_listen          (void *m);
-void lwip_netconn_do_send            (void *m);
-void lwip_netconn_do_recv            (void *m);
-#if TCP_LISTEN_BACKLOG
-void lwip_netconn_do_accepted        (void *m);
-#endif /* TCP_LISTEN_BACKLOG */
-void lwip_netconn_do_write           (void *m);
-void lwip_netconn_do_getaddr         (void *m);
-void lwip_netconn_do_close           (void *m);
-void lwip_netconn_do_shutdown        (void *m);
-#if LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD)
-void lwip_netconn_do_join_leave_group(void *m);
-#endif /* LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD) */
-
-#if LWIP_DNS
-void lwip_netconn_do_gethostbyname(void *arg);
-#endif /* LWIP_DNS */
-
-struct netconn* netconn_alloc(enum netconn_type t, netconn_callback callback);
-void netconn_free(struct netconn *conn);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_NETCONN || LWIP_SOCKET */
-
-#endif /* LWIP_HDR_API_MSG_H */
diff --git a/sys/include/net/priv/memp_priv.h b/sys/include/net/priv/memp_priv.h
deleted file mode 100644
index 9a1aa71..0000000
--- a/sys/include/net/priv/memp_priv.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * @file
- * memory pools lwIP internal implementations (do not use in application code)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#ifndef LWIP_HDR_MEMP_PRIV_H
-#define LWIP_HDR_MEMP_PRIV_H
-
-#include <net/opt.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <net/mem.h>
-
-#if MEMP_OVERFLOW_CHECK
-/* if MEMP_OVERFLOW_CHECK is turned on, we reserve some bytes at the beginning
- * and at the end of each element, initialize them as 0xcd and check
- * them later. */
-/* If MEMP_OVERFLOW_CHECK is >= 2, on every call to memp_malloc or memp_free,
- * every single element in each pool is checked!
- * This is VERY SLOW but also very helpful. */
-/* MEMP_SANITY_REGION_BEFORE and MEMP_SANITY_REGION_AFTER can be overridden in
- * lwipopts.h to change the amount reserved for checking. */
-#ifndef MEMP_SANITY_REGION_BEFORE
-#define MEMP_SANITY_REGION_BEFORE  16
-#endif /* MEMP_SANITY_REGION_BEFORE*/
-#if MEMP_SANITY_REGION_BEFORE > 0
-#define MEMP_SANITY_REGION_BEFORE_ALIGNED    LWIP_MEM_ALIGN_SIZE(MEMP_SANITY_REGION_BEFORE)
-#else
-#define MEMP_SANITY_REGION_BEFORE_ALIGNED    0
-#endif /* MEMP_SANITY_REGION_BEFORE*/
-#ifndef MEMP_SANITY_REGION_AFTER
-#define MEMP_SANITY_REGION_AFTER   16
-#endif /* MEMP_SANITY_REGION_AFTER*/
-#if MEMP_SANITY_REGION_AFTER > 0
-#define MEMP_SANITY_REGION_AFTER_ALIGNED     LWIP_MEM_ALIGN_SIZE(MEMP_SANITY_REGION_AFTER)
-#else
-#define MEMP_SANITY_REGION_AFTER_ALIGNED     0
-#endif /* MEMP_SANITY_REGION_AFTER*/
-
-/* MEMP_SIZE: save space for struct memp and for sanity check */
-#define MEMP_SIZE          (LWIP_MEM_ALIGN_SIZE(sizeof(struct memp)) + MEMP_SANITY_REGION_BEFORE_ALIGNED)
-#define MEMP_ALIGN_SIZE(x) (LWIP_MEM_ALIGN_SIZE(x) + MEMP_SANITY_REGION_AFTER_ALIGNED)
-
-#else /* MEMP_OVERFLOW_CHECK */
-
-/* No sanity checks
- * We don't need to preserve the struct memp while not allocated, so we
- * can save a little space and set MEMP_SIZE to 0.
- */
-#define MEMP_SIZE           0
-#define MEMP_ALIGN_SIZE(x) (LWIP_MEM_ALIGN_SIZE(x))
-
-#endif /* MEMP_OVERFLOW_CHECK */
-
-#if !MEMP_MEM_MALLOC || MEMP_OVERFLOW_CHECK
-struct memp {
-  struct memp *next;
-#if MEMP_OVERFLOW_CHECK
-  const char *file;
-  int line;
-#endif /* MEMP_OVERFLOW_CHECK */
-};
-#endif /* !MEMP_MEM_MALLOC || MEMP_OVERFLOW_CHECK */
-
-#if MEM_USE_POOLS && MEMP_USE_CUSTOM_POOLS
-/* Use a helper type to get the start and end of the user "memory pools" for mem_malloc */
-typedef enum {
-    /* Get the first (via:
-       MEMP_POOL_HELPER_START = ((u8_t) 1*MEMP_POOL_A + 0*MEMP_POOL_B + 0*MEMP_POOL_C + 0)*/
-    MEMP_POOL_HELPER_FIRST = ((u8_t)
-#define LWIP_MEMPOOL(name,num,size,desc)
-#define LWIP_MALLOC_MEMPOOL_START 1
-#define LWIP_MALLOC_MEMPOOL(num, size) * MEMP_POOL_##size + 0
-#define LWIP_MALLOC_MEMPOOL_END
-#include <net/priv/memp_std.h>
-    ) ,
-    /* Get the last (via:
-       MEMP_POOL_HELPER_END = ((u8_t) 0 + MEMP_POOL_A*0 + MEMP_POOL_B*0 + MEMP_POOL_C*1) */
-    MEMP_POOL_HELPER_LAST = ((u8_t)
-#define LWIP_MEMPOOL(name,num,size,desc)
-#define LWIP_MALLOC_MEMPOOL_START
-#define LWIP_MALLOC_MEMPOOL(num, size) 0 + MEMP_POOL_##size *
-#define LWIP_MALLOC_MEMPOOL_END 1
-#include <net/priv/memp_std.h>
-    )
-} memp_pool_helper_t;
-
-/* The actual start and stop values are here (cast them over)
-   We use this helper type and these defines so we can avoid using const memp_t values */
-#define MEMP_POOL_FIRST ((memp_t) MEMP_POOL_HELPER_FIRST)
-#define MEMP_POOL_LAST   ((memp_t) MEMP_POOL_HELPER_LAST)
-#endif /* MEM_USE_POOLS && MEMP_USE_CUSTOM_POOLS */
-
-/** Memory pool descriptor */
-struct memp_desc {
-#if defined(LWIP_DEBUG) || MEMP_OVERFLOW_CHECK || LWIP_STATS_DISPLAY
-  /** Textual description */
-  const char *desc;
-#endif /* LWIP_DEBUG || MEMP_OVERFLOW_CHECK || LWIP_STATS_DISPLAY */
-#if MEMP_STATS
-  /** Statistics */
-  struct stats_mem *stats;
-#endif
-
-  /** Element size */
-  u16_t size;
-
-#if !MEMP_MEM_MALLOC
-  /** Number of elements */
-  u16_t num;
-
-  /** Base address */
-  u8_t *base;
-
-  /** First free element of each pool. Elements form a linked list. */
-  struct memp **tab;
-#endif /* MEMP_MEM_MALLOC */
-};
-
-#if defined(LWIP_DEBUG) || MEMP_OVERFLOW_CHECK || LWIP_STATS_DISPLAY
-#define DECLARE_LWIP_MEMPOOL_DESC(desc) (desc),
-#else
-#define DECLARE_LWIP_MEMPOOL_DESC(desc)
-#endif
-
-#if MEMP_STATS
-#define LWIP_MEMPOOL_DECLARE_STATS_INSTANCE(name) static struct stats_mem name;
-#define LWIP_MEMPOOL_DECLARE_STATS_REFERENCE(name) &name,
-#else
-#define LWIP_MEMPOOL_DECLARE_STATS_INSTANCE(name)
-#define LWIP_MEMPOOL_DECLARE_STATS_REFERENCE(name)
-#endif
-
-void memp_init_pool(const struct memp_desc *desc);
-
-#if MEMP_OVERFLOW_CHECK
-void *memp_malloc_pool_fn(const struct memp_desc* desc, const char* file, const int line);
-#define memp_malloc_pool(d) memp_malloc_pool_fn((d), __FILE__, __LINE__)
-#else
-void *memp_malloc_pool(const struct memp_desc *desc);
-#endif
-void  memp_free_pool(const struct memp_desc* desc, void *mem);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_MEMP_PRIV_H */
diff --git a/sys/include/net/priv/memp_std.h b/sys/include/net/priv/memp_std.h
deleted file mode 100644
index ce9fd50..0000000
--- a/sys/include/net/priv/memp_std.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * @file
- * lwIP internal memory pools (do not use in application code)
- * This file is deliberately included multiple times: once with empty
- * definition of LWIP_MEMPOOL() to handle all includes and multiple times
- * to build up various lists of mem pools.
- */
-
-/*
- * SETUP: Make sure we define everything we will need.
- *
- * We have create three types of pools:
- *   1) MEMPOOL - standard pools
- *   2) MALLOC_MEMPOOL - to be used by mem_malloc in mem.c
- *   3) PBUF_MEMPOOL - a mempool of pbuf's, so include space for the pbuf struct
- *
- * If the include'r doesn't require any special treatment of each of the types
- * above, then will declare #2 & #3 to be just standard mempools.
- */
-#ifndef LWIP_MALLOC_MEMPOOL
-/* This treats "malloc pools" just like any other pool.
-   The pools are a little bigger to provide 'size' as the amount of user data. */
-#define LWIP_MALLOC_MEMPOOL(num, size) LWIP_MEMPOOL(POOL_##size, num, (size + LWIP_MEM_ALIGN_SIZE(sizeof(struct memp_malloc_helper))), "MALLOC_"#size)
-#define LWIP_MALLOC_MEMPOOL_START
-#define LWIP_MALLOC_MEMPOOL_END
-#endif /* LWIP_MALLOC_MEMPOOL */
-
-#ifndef LWIP_PBUF_MEMPOOL
-/* This treats "pbuf pools" just like any other pool.
- * Allocates buffers for a pbuf struct AND a payload size */
-#define LWIP_PBUF_MEMPOOL(name, num, payload, desc) LWIP_MEMPOOL(name, num, (MEMP_ALIGN_SIZE(sizeof(struct pbuf)) + MEMP_ALIGN_SIZE(payload)), desc)
-#endif /* LWIP_PBUF_MEMPOOL */
-
-
-/*
- * A list of internal pools used by LWIP.
- *
- * LWIP_MEMPOOL(pool_name, number_elements, element_size, pool_description)
- *     creates a pool name MEMP_pool_name. description is used in stats.c
- */
-#if LWIP_RAW
-LWIP_MEMPOOL(RAW_PCB,        MEMP_NUM_RAW_PCB,         sizeof(struct raw_pcb),        "RAW_PCB")
-#endif /* LWIP_RAW */
-
-#if LWIP_UDP
-LWIP_MEMPOOL(UDP_PCB,        MEMP_NUM_UDP_PCB,         sizeof(struct udp_pcb),        "UDP_PCB")
-#endif /* LWIP_UDP */
-
-#if LWIP_TCP
-LWIP_MEMPOOL(TCP_PCB,        MEMP_NUM_TCP_PCB,         sizeof(struct tcp_pcb),        "TCP_PCB")
-LWIP_MEMPOOL(TCP_PCB_LISTEN, MEMP_NUM_TCP_PCB_LISTEN,  sizeof(struct tcp_pcb_listen), "TCP_PCB_LISTEN")
-LWIP_MEMPOOL(TCP_SEG,        MEMP_NUM_TCP_SEG,         sizeof(struct tcp_seg),        "TCP_SEG")
-#endif /* LWIP_TCP */
-
-#if LWIP_IPV4 && IP_REASSEMBLY
-LWIP_MEMPOOL(REASSDATA,      MEMP_NUM_REASSDATA,       sizeof(struct ip_reassdata),   "REASSDATA")
-#endif /* LWIP_IPV4 && IP_REASSEMBLY */
-#if (IP_FRAG && !LWIP_NETIF_TX_SINGLE_PBUF) || (LWIP_IPV6 && LWIP_IPV6_FRAG)
-LWIP_MEMPOOL(FRAG_PBUF,      MEMP_NUM_FRAG_PBUF,       sizeof(struct pbuf_custom_ref),"FRAG_PBUF")
-#endif /* IP_FRAG && !LWIP_NETIF_TX_SINGLE_PBUF || (LWIP_IPV6 && LWIP_IPV6_FRAG) */
-
-#if LWIP_NETCONN || LWIP_SOCKET
-LWIP_MEMPOOL(NETBUF,         MEMP_NUM_NETBUF,          sizeof(struct netbuf),         "NETBUF")
-LWIP_MEMPOOL(NETCONN,        MEMP_NUM_NETCONN,         sizeof(struct netconn),        "NETCONN")
-#endif /* LWIP_NETCONN || LWIP_SOCKET */
-
-#if NO_SYS==0
-LWIP_MEMPOOL(TCPIP_MSG_API,  MEMP_NUM_TCPIP_MSG_API,   sizeof(struct tcpip_msg),      "TCPIP_MSG_API")
-#if LWIP_MPU_COMPATIBLE
-LWIP_MEMPOOL(API_MSG,        MEMP_NUM_API_MSG,         sizeof(struct api_msg),        "API_MSG")
-#if LWIP_DNS
-LWIP_MEMPOOL(DNS_API_MSG,    MEMP_NUM_DNS_API_MSG,     sizeof(struct dns_api_msg),    "DNS_API_MSG")
-#endif
-#if LWIP_SOCKET && !LWIP_TCPIP_CORE_LOCKING
-LWIP_MEMPOOL(SOCKET_SETGETSOCKOPT_DATA, MEMP_NUM_SOCKET_SETGETSOCKOPT_DATA, sizeof(struct lwip_setgetsockopt_data), "SOCKET_SETGETSOCKOPT_DATA")
-#endif
-#if LWIP_NETIF_API
-LWIP_MEMPOOL(NETIFAPI_MSG,   MEMP_NUM_NETIFAPI_MSG,    sizeof(struct netifapi_msg),   "NETIFAPI_MSG")
-#endif
-#endif /* LWIP_MPU_COMPATIBLE */
-#if !LWIP_TCPIP_CORE_LOCKING_INPUT
-LWIP_MEMPOOL(TCPIP_MSG_INPKT,MEMP_NUM_TCPIP_MSG_INPKT, sizeof(struct tcpip_msg),      "TCPIP_MSG_INPKT")
-#endif /* !LWIP_TCPIP_CORE_LOCKING_INPUT */
-#endif /* NO_SYS==0 */
-
-#if LWIP_IPV4 && LWIP_ARP && ARP_QUEUEING
-LWIP_MEMPOOL(ARP_QUEUE,      MEMP_NUM_ARP_QUEUE,       sizeof(struct etharp_q_entry), "ARP_QUEUE")
-#endif /* LWIP_IPV4 && LWIP_ARP && ARP_QUEUEING */
-
-#if LWIP_IGMP
-LWIP_MEMPOOL(IGMP_GROUP,     MEMP_NUM_IGMP_GROUP,      sizeof(struct igmp_group),     "IGMP_GROUP")
-#endif /* LWIP_IGMP */
-
-#if LWIP_TIMERS && !LWIP_TIMERS_CUSTOM
-LWIP_MEMPOOL(SYS_TIMEOUT,    MEMP_NUM_SYS_TIMEOUT,     sizeof(struct sys_timeo),      "SYS_TIMEOUT")
-#endif /* LWIP_TIMERS && !LWIP_TIMERS_CUSTOM */
-
-#if LWIP_DNS && LWIP_SOCKET
-LWIP_MEMPOOL(NETDB,          MEMP_NUM_NETDB,           NETDB_ELEM_SIZE,               "NETDB")
-#endif /* LWIP_DNS && LWIP_SOCKET */
-#if LWIP_DNS && DNS_LOCAL_HOSTLIST && DNS_LOCAL_HOSTLIST_IS_DYNAMIC
-LWIP_MEMPOOL(LOCALHOSTLIST,  MEMP_NUM_LOCALHOSTLIST,   LOCALHOSTLIST_ELEM_SIZE,       "LOCALHOSTLIST")
-#endif /* LWIP_DNS && DNS_LOCAL_HOSTLIST && DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-
-#if LWIP_IPV6 && LWIP_ND6_QUEUEING
-LWIP_MEMPOOL(ND6_QUEUE,      MEMP_NUM_ND6_QUEUE,       sizeof(struct nd6_q_entry), "ND6_QUEUE")
-#endif /* LWIP_IPV6 && LWIP_ND6_QUEUEING */
-
-#if LWIP_IPV6 && LWIP_IPV6_REASS
-LWIP_MEMPOOL(IP6_REASSDATA,      MEMP_NUM_REASSDATA,       sizeof(struct ip6_reassdata),   "IP6_REASSDATA")
-#endif /* LWIP_IPV6 && LWIP_IPV6_REASS */
-
-#if LWIP_IPV6 && LWIP_IPV6_MLD
-LWIP_MEMPOOL(MLD6_GROUP,     MEMP_NUM_MLD6_GROUP,      sizeof(struct mld_group),     "MLD6_GROUP")
-#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
-
-
-/*
- * A list of pools of pbuf's used by LWIP.
- *
- * LWIP_PBUF_MEMPOOL(pool_name, number_elements, pbuf_payload_size, pool_description)
- *     creates a pool name MEMP_pool_name. description is used in stats.c
- *     This allocates enough space for the pbuf struct and a payload.
- *     (Example: pbuf_payload_size=0 allocates only size for the struct)
- */
-LWIP_PBUF_MEMPOOL(PBUF,      MEMP_NUM_PBUF,            0,                             "PBUF_REF/ROM")
-LWIP_PBUF_MEMPOOL(PBUF_POOL, PBUF_POOL_SIZE,           PBUF_POOL_BUFSIZE,             "PBUF_POOL")
-
-
-/*
- * Allow for user-defined pools; this must be explicitly set in lwipopts.h
- * since the default is to NOT look for lwippools.h
- */
-#if MEMP_USE_CUSTOM_POOLS
-#include "lwippools.h"
-#endif /* MEMP_USE_CUSTOM_POOLS */
-
-/*
- * REQUIRED CLEANUP: Clear up so we don't get "multiply defined" error later
- * (#undef is ignored for something that is not defined)
- */
-#undef LWIP_MEMPOOL
-#undef LWIP_MALLOC_MEMPOOL
-#undef LWIP_MALLOC_MEMPOOL_START
-#undef LWIP_MALLOC_MEMPOOL_END
-#undef LWIP_PBUF_MEMPOOL
diff --git a/sys/include/net/priv/nd6_priv.h b/sys/include/net/priv/nd6_priv.h
deleted file mode 100644
index a057a4d..0000000
--- a/sys/include/net/priv/nd6_priv.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * @file
- *
- * Neighbor discovery and stateless address autoconfiguration for IPv6.
- * Aims to be compliant with RFC 4861 (Neighbor discovery) and RFC 4862
- * (Address autoconfiguration).
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#ifndef LWIP_HDR_ND6_PRIV_H
-#define LWIP_HDR_ND6_PRIV_H
-
-#include "net/opt.h"
-
-#if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
-
-#include "net/pbuf.h"
-#include "net/ip6_addr.h"
-#include "net/netif.h"
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_ND6_QUEUEING
-/** struct for queueing outgoing packets for unknown address
-  * defined here to be accessed by memp.h
-  */
-struct nd6_q_entry {
-  struct nd6_q_entry *next;
-  struct pbuf *p;
-};
-#endif /* LWIP_ND6_QUEUEING */
-
-/** Struct for tables. */
-struct nd6_neighbor_cache_entry {
-  ip6_addr_t next_hop_address;
-  struct netif *netif;
-  u8_t lladdr[NETIF_MAX_HWADDR_LEN];
-  /*u32_t pmtu;*/
-#if LWIP_ND6_QUEUEING
-  /** Pointer to queue of pending outgoing packets on this entry. */
-  struct nd6_q_entry *q;
-#else /* LWIP_ND6_QUEUEING */
-  /** Pointer to a single pending outgoing packet on this entry. */
-  struct pbuf *q;
-#endif /* LWIP_ND6_QUEUEING */
-  u8_t state;
-  u8_t isrouter;
-  union {
-    u32_t reachable_time; /* in ms since value may originate from network packet */
-    u32_t delay_time;     /* ticks (ND6_TMR_INTERVAL) */
-    u32_t probes_sent;
-    u32_t stale_time;     /* ticks (ND6_TMR_INTERVAL) */
-  } counter;
-};
-
-struct nd6_destination_cache_entry {
-  ip6_addr_t destination_addr;
-  ip6_addr_t next_hop_addr;
-  u16_t pmtu;
-  u32_t age;
-};
-
-struct nd6_prefix_list_entry {
-  ip6_addr_t prefix;
-  struct netif *netif;
-  u32_t invalidation_timer; /* in ms since value may originate from network packet */
-#if LWIP_IPV6_AUTOCONFIG
-  u8_t flags;
-#define ND6_PREFIX_AUTOCONFIG_AUTONOMOUS 0x01
-#define ND6_PREFIX_AUTOCONFIG_ADDRESS_GENERATED 0x02
-#define ND6_PREFIX_AUTOCONFIG_ADDRESS_DUPLICATE 0x04
-#endif /* LWIP_IPV6_AUTOCONFIG */
-};
-
-struct nd6_router_list_entry {
-  struct nd6_neighbor_cache_entry *neighbor_entry;
-  u32_t invalidation_timer; /* in ms since value may originate from network packet */
-  u8_t flags;
-};
-
-enum nd6_neighbor_cache_entry_state {
-  ND6_NO_ENTRY = 0,
-  ND6_INCOMPLETE,
-  ND6_REACHABLE,
-  ND6_STALE,
-  ND6_DELAY,
-  ND6_PROBE
-};
-
-/* Router tables. */
-/* @todo make these static? and entries accessible through API? */
-extern struct nd6_neighbor_cache_entry neighbor_cache[];
-extern struct nd6_destination_cache_entry destination_cache[];
-extern struct nd6_prefix_list_entry prefix_list[];
-extern struct nd6_router_list_entry default_router_list[];
-
-/* Default values, can be updated by a RA message. */
-extern u32_t reachable_time;
-extern u32_t retrans_timer;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV6 */
-
-#endif /* LWIP_HDR_ND6_PRIV_H */
diff --git a/sys/include/net/priv/tcp_priv.h b/sys/include/net/priv/tcp_priv.h
deleted file mode 100644
index 3c8cf67..0000000
--- a/sys/include/net/priv/tcp_priv.h
+++ /dev/null
@@ -1,507 +0,0 @@
-/**
- * @file
- * TCP internal implementations (do not use in application code)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_TCP_PRIV_H
-#define LWIP_HDR_TCP_PRIV_H
-
-#include "net/opt.h"
-
-#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/tcp.h"
-#include "net/mem.h"
-#include "net/pbuf.h"
-#include "net/ip.h"
-#include "net/icmp.h"
-#include "net/err.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/prot/tcp.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Functions for interfacing with TCP: */
-
-/* Lower layer interface to TCP: */
-void             tcp_init    (void);  /* Initialize this module. */
-void             tcp_tmr     (void);  /* Must be called every
-                                         TCP_TMR_INTERVAL
-                                         ms. (Typically 250 ms). */
-/* It is also possible to call these two functions at the right
-   intervals (instead of calling tcp_tmr()). */
-void             tcp_slowtmr (void);
-void             tcp_fasttmr (void);
-
-/* Call this from a netif driver (watch out for threading issues!) that has
-   returned a memory error on transmit and now has free buffers to send more.
-   This iterates all active pcbs that had an error and tries to call
-   tcp_output, so use this with care as it might slow down the system. */
-void             tcp_txnow   (void);
-
-/* Only used by IP to pass a TCP segment to TCP: */
-void             tcp_input   (struct pbuf *p, struct netif *inp);
-/* Used within the TCP code only: */
-struct tcp_pcb * tcp_alloc   (u8_t prio);
-void             tcp_abandon (struct tcp_pcb *pcb, int reset);
-err_t            tcp_send_empty_ack(struct tcp_pcb *pcb);
-void             tcp_rexmit  (struct tcp_pcb *pcb);
-void             tcp_rexmit_rto  (struct tcp_pcb *pcb);
-void             tcp_rexmit_fast (struct tcp_pcb *pcb);
-u32_t            tcp_update_rcv_ann_wnd(struct tcp_pcb *pcb);
-err_t            tcp_process_refused_data(struct tcp_pcb *pcb);
-
-/**
- * This is the Nagle algorithm: try to combine user data to send as few TCP
- * segments as possible. Only send if
- * - no previously transmitted data on the connection remains unacknowledged or
- * - the TF_NODELAY flag is set (nagle algorithm turned off for this pcb) or
- * - the only unsent segment is at least pcb->mss bytes long (or there is more
- *   than one unsent segment - with lwIP, this can happen although unsent->len < mss)
- * - or if we are in fast-retransmit (TF_INFR)
- */
-#define tcp_do_output_nagle(tpcb) ((((tpcb)->unacked == NULL) || \
-                            ((tpcb)->flags & (TF_NODELAY | TF_INFR)) || \
-                            (((tpcb)->unsent != NULL) && (((tpcb)->unsent->next != NULL) || \
-                              ((tpcb)->unsent->len >= (tpcb)->mss))) || \
-                            ((tcp_sndbuf(tpcb) == 0) || (tcp_sndqueuelen(tpcb) >= TCP_SND_QUEUELEN)) \
-                            ) ? 1 : 0)
-#define tcp_output_nagle(tpcb) (tcp_do_output_nagle(tpcb) ? tcp_output(tpcb) : ERR_OK)
-
-
-#define TCP_SEQ_LT(a,b)     ((s32_t)((u32_t)(a) - (u32_t)(b)) < 0)
-#define TCP_SEQ_LEQ(a,b)    ((s32_t)((u32_t)(a) - (u32_t)(b)) <= 0)
-#define TCP_SEQ_GT(a,b)     ((s32_t)((u32_t)(a) - (u32_t)(b)) > 0)
-#define TCP_SEQ_GEQ(a,b)    ((s32_t)((u32_t)(a) - (u32_t)(b)) >= 0)
-/* is b<=a<=c? */
-#if 0 /* see bug #10548 */
-#define TCP_SEQ_BETWEEN(a,b,c) ((c)-(b) >= (a)-(b))
-#endif
-#define TCP_SEQ_BETWEEN(a,b,c) (TCP_SEQ_GEQ(a,b) && TCP_SEQ_LEQ(a,c))
-
-#ifndef TCP_TMR_INTERVAL
-#define TCP_TMR_INTERVAL       250  /* The TCP timer interval in milliseconds. */
-#endif /* TCP_TMR_INTERVAL */
-
-#ifndef TCP_FAST_INTERVAL
-#define TCP_FAST_INTERVAL      TCP_TMR_INTERVAL /* the fine grained timeout in milliseconds */
-#endif /* TCP_FAST_INTERVAL */
-
-#ifndef TCP_SLOW_INTERVAL
-#define TCP_SLOW_INTERVAL      (2*TCP_TMR_INTERVAL)  /* the coarse grained timeout in milliseconds */
-#endif /* TCP_SLOW_INTERVAL */
-
-#define TCP_FIN_WAIT_TIMEOUT 20000 /* milliseconds */
-#define TCP_SYN_RCVD_TIMEOUT 20000 /* milliseconds */
-
-#define TCP_OOSEQ_TIMEOUT        6U /* x RTO */
-
-#ifndef TCP_MSL
-#define TCP_MSL 60000UL /* The maximum segment lifetime in milliseconds */
-#endif
-
-/* Keepalive values, compliant with RFC 1122. Don't change this unless you know what you're doing */
-#ifndef  TCP_KEEPIDLE_DEFAULT
-#define  TCP_KEEPIDLE_DEFAULT     7200000UL /* Default KEEPALIVE timer in milliseconds */
-#endif
-
-#ifndef  TCP_KEEPINTVL_DEFAULT
-#define  TCP_KEEPINTVL_DEFAULT    75000UL   /* Default Time between KEEPALIVE probes in milliseconds */
-#endif
-
-#ifndef  TCP_KEEPCNT_DEFAULT
-#define  TCP_KEEPCNT_DEFAULT      9U        /* Default Counter for KEEPALIVE probes */
-#endif
-
-#define  TCP_MAXIDLE              TCP_KEEPCNT_DEFAULT * TCP_KEEPINTVL_DEFAULT  /* Maximum KEEPALIVE probe time */
-
-#define TCP_TCPLEN(seg) ((seg)->len + (((TCPH_FLAGS((seg)->tcphdr) & (TCP_FIN | TCP_SYN)) != 0) ? 1U : 0U))
-
-/** Flags used on input processing, not on pcb->flags
-*/
-#define TF_RESET     (u8_t)0x08U   /* Connection was reset. */
-#define TF_CLOSED    (u8_t)0x10U   /* Connection was successfully closed. */
-#define TF_GOT_FIN   (u8_t)0x20U   /* Connection was closed by the remote end. */
-
-
-#if LWIP_EVENT_API
-
-#define TCP_EVENT_ACCEPT(lpcb,pcb,arg,err,ret) ret = lwip_tcp_event(arg, (pcb),\
-                LWIP_EVENT_ACCEPT, NULL, 0, err)
-#define TCP_EVENT_SENT(pcb,space,ret) ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
-                   LWIP_EVENT_SENT, NULL, space, ERR_OK)
-#define TCP_EVENT_RECV(pcb,p,err,ret) ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
-                LWIP_EVENT_RECV, (p), 0, (err))
-#define TCP_EVENT_CLOSED(pcb,ret) ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
-                LWIP_EVENT_RECV, NULL, 0, ERR_OK)
-#define TCP_EVENT_CONNECTED(pcb,err,ret) ret = lwip_tcp_event((pcb)->callback_arg, (pcb),\
-                LWIP_EVENT_CONNECTED, NULL, 0, (err))
-#define TCP_EVENT_POLL(pcb,ret)       do { if ((pcb)->state != SYN_RCVD) {                          \
-                ret = lwip_tcp_event((pcb)->callback_arg, (pcb), LWIP_EVENT_POLL, NULL, 0, ERR_OK); \
-                } else {                                                                            \
-                ret = ERR_ARG; } } while(0)
-#define TCP_EVENT_ERR(last_state,errf,arg,err)  do { if (last_state != SYN_RCVD) {                \
-                lwip_tcp_event((arg), NULL, LWIP_EVENT_ERR, NULL, 0, (err)); } } while(0)
-
-#else /* LWIP_EVENT_API */
-
-#define TCP_EVENT_ACCEPT(lpcb,pcb,arg,err,ret)                 \
-  do {                                                         \
-    if((lpcb)->accept != NULL)                                 \
-      (ret) = (lpcb)->accept((arg),(pcb),(err));               \
-    else (ret) = ERR_ARG;                                      \
-  } while (0)
-
-#define TCP_EVENT_SENT(pcb,space,ret)                          \
-  do {                                                         \
-    if((pcb)->sent != NULL)                                    \
-      (ret) = (pcb)->sent((pcb)->callback_arg,(pcb),(space));  \
-    else (ret) = ERR_OK;                                       \
-  } while (0)
-
-#define TCP_EVENT_RECV(pcb,p,err,ret)                          \
-  do {                                                         \
-    if((pcb)->recv != NULL) {                                  \
-      (ret) = (pcb)->recv((pcb)->callback_arg,(pcb),(p),(err));\
-    } else {                                                   \
-      (ret) = tcp_recv_null(NULL, (pcb), (p), (err));          \
-    }                                                          \
-  } while (0)
-
-#define TCP_EVENT_CLOSED(pcb,ret)                                \
-  do {                                                           \
-    if(((pcb)->recv != NULL)) {                                  \
-      (ret) = (pcb)->recv((pcb)->callback_arg,(pcb),NULL,ERR_OK);\
-    } else {                                                     \
-      (ret) = ERR_OK;                                            \
-    }                                                            \
-  } while (0)
-
-#define TCP_EVENT_CONNECTED(pcb,err,ret)                         \
-  do {                                                           \
-    if((pcb)->connected != NULL)                                 \
-      (ret) = (pcb)->connected((pcb)->callback_arg,(pcb),(err)); \
-    else (ret) = ERR_OK;                                         \
-  } while (0)
-
-#define TCP_EVENT_POLL(pcb,ret)                                \
-  do {                                                         \
-    if((pcb)->poll != NULL)                                    \
-      (ret) = (pcb)->poll((pcb)->callback_arg,(pcb));          \
-    else (ret) = ERR_OK;                                       \
-  } while (0)
-
-#define TCP_EVENT_ERR(last_state,errf,arg,err)                 \
-  do {                                                         \
-    LWIP_UNUSED_ARG(last_state);                               \
-    if((errf) != NULL)                                         \
-      (errf)((arg),(err));                                     \
-  } while (0)
-
-#endif /* LWIP_EVENT_API */
-
-/** Enabled extra-check for TCP_OVERSIZE if LWIP_DEBUG is enabled */
-#if TCP_OVERSIZE && defined(LWIP_DEBUG)
-#define TCP_OVERSIZE_DBGCHECK 1
-#else
-#define TCP_OVERSIZE_DBGCHECK 0
-#endif
-
-/** Don't generate checksum on copy if CHECKSUM_GEN_TCP is disabled */
-#define TCP_CHECKSUM_ON_COPY  (LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_TCP)
-
-/* This structure represents a TCP segment on the unsent, unacked and ooseq queues */
-struct tcp_seg {
-  struct tcp_seg *next;    /* used when putting segments on a queue */
-  struct pbuf *p;          /* buffer containing data + TCP header */
-  u16_t len;               /* the TCP length of this segment */
-#if TCP_OVERSIZE_DBGCHECK
-  u16_t oversize_left;     /* Extra bytes available at the end of the last
-                              pbuf in unsent (used for asserting vs.
-                              tcp_pcb.unsent_oversize only) */
-#endif /* TCP_OVERSIZE_DBGCHECK */
-#if TCP_CHECKSUM_ON_COPY
-  u16_t chksum;
-  u8_t  chksum_swapped;
-#endif /* TCP_CHECKSUM_ON_COPY */
-  u8_t  flags;
-#define TF_SEG_OPTS_MSS         (u8_t)0x01U /* Include MSS option. */
-#define TF_SEG_OPTS_TS          (u8_t)0x02U /* Include timestamp option. */
-#define TF_SEG_DATA_CHECKSUMMED (u8_t)0x04U /* ALL data (not the header) is
-                                               checksummed into 'chksum' */
-#define TF_SEG_OPTS_WND_SCALE   (u8_t)0x08U /* Include WND SCALE option */
-  struct tcp_hdr *tcphdr;  /* the TCP header */
-};
-
-#define LWIP_TCP_OPT_EOL        0
-#define LWIP_TCP_OPT_NOP        1
-#define LWIP_TCP_OPT_MSS        2
-#define LWIP_TCP_OPT_WS         3
-#define LWIP_TCP_OPT_TS         8
-
-#define LWIP_TCP_OPT_LEN_MSS    4
-#if LWIP_TCP_TIMESTAMPS
-#define LWIP_TCP_OPT_LEN_TS     10
-#define LWIP_TCP_OPT_LEN_TS_OUT 12 /* aligned for output (includes NOP padding) */
-#else
-#define LWIP_TCP_OPT_LEN_TS_OUT 0
-#endif
-#if LWIP_WND_SCALE
-#define LWIP_TCP_OPT_LEN_WS     3
-#define LWIP_TCP_OPT_LEN_WS_OUT 4 /* aligned for output (includes NOP padding) */
-#else
-#define LWIP_TCP_OPT_LEN_WS_OUT 0
-#endif
-
-#define LWIP_TCP_OPT_LENGTH(flags) \
-  (flags & TF_SEG_OPTS_MSS       ? LWIP_TCP_OPT_LEN_MSS    : 0) + \
-  (flags & TF_SEG_OPTS_TS        ? LWIP_TCP_OPT_LEN_TS_OUT : 0) + \
-  (flags & TF_SEG_OPTS_WND_SCALE ? LWIP_TCP_OPT_LEN_WS_OUT : 0)
-
-/** This returns a TCP header option for MSS in an u32_t */
-#define TCP_BUILD_MSS_OPTION(mss) lwip_htonl(0x02040000 | ((mss) & 0xFFFF))
-
-#if LWIP_WND_SCALE
-#define TCPWNDSIZE_F       U32_F
-#define TCPWND_MAX         0xFFFFFFFFU
-#define TCPWND_CHECK16(x)  LWIP_ASSERT("window size > 0xFFFF", (x) <= 0xFFFF)
-#define TCPWND_MIN16(x)    ((u16_t)LWIP_MIN((x), 0xFFFF))
-#else /* LWIP_WND_SCALE */
-#define TCPWNDSIZE_F       U16_F
-#define TCPWND_MAX         0xFFFFU
-#define TCPWND_CHECK16(x)
-#define TCPWND_MIN16(x)    x
-#endif /* LWIP_WND_SCALE */
-
-/* Global variables: */
-extern struct tcp_pcb *tcp_input_pcb;
-extern u32_t tcp_ticks;
-extern u8_t tcp_active_pcbs_changed;
-
-/* The TCP PCB lists. */
-union tcp_listen_pcbs_t { /* List of all TCP PCBs in LISTEN state. */
-  struct tcp_pcb_listen *listen_pcbs;
-  struct tcp_pcb *pcbs;
-};
-extern struct tcp_pcb *tcp_bound_pcbs;
-extern union tcp_listen_pcbs_t tcp_listen_pcbs;
-extern struct tcp_pcb *tcp_active_pcbs;  /* List of all TCP PCBs that are in a
-              state in which they accept or send
-              data. */
-extern struct tcp_pcb *tcp_tw_pcbs;      /* List of all TCP PCBs in TIME-WAIT. */
-
-#define NUM_TCP_PCB_LISTS_NO_TIME_WAIT  3
-#define NUM_TCP_PCB_LISTS               4
-extern struct tcp_pcb ** const tcp_pcb_lists[NUM_TCP_PCB_LISTS];
-
-/* Axioms about the above lists:
-   1) Every TCP PCB that is not CLOSED is in one of the lists.
-   2) A PCB is only in one of the lists.
-   3) All PCBs in the tcp_listen_pcbs list is in LISTEN state.
-   4) All PCBs in the tcp_tw_pcbs list is in TIME-WAIT state.
-*/
-/* Define two macros, TCP_REG and TCP_RMV that registers a TCP PCB
-   with a PCB list or removes a PCB from a list, respectively. */
-#ifndef TCP_DEBUG_PCB_LISTS
-#define TCP_DEBUG_PCB_LISTS 0
-#endif
-#if TCP_DEBUG_PCB_LISTS
-#define TCP_REG(pcbs, npcb) do {\
-                            struct tcp_pcb *tcp_tmp_pcb; \
-                            LWIP_DEBUGF(TCP_DEBUG, ("TCP_REG %p local port %d\n", (npcb), (npcb)->local_port)); \
-                            for (tcp_tmp_pcb = *(pcbs); \
-          tcp_tmp_pcb != NULL; \
-        tcp_tmp_pcb = tcp_tmp_pcb->next) { \
-                                LWIP_ASSERT("TCP_REG: already registered\n", tcp_tmp_pcb != (npcb)); \
-                            } \
-                            LWIP_ASSERT("TCP_REG: pcb->state != CLOSED", ((pcbs) == &tcp_bound_pcbs) || ((npcb)->state != CLOSED)); \
-                            (npcb)->next = *(pcbs); \
-                            LWIP_ASSERT("TCP_REG: npcb->next != npcb", (npcb)->next != (npcb)); \
-                            *(pcbs) = (npcb); \
-                            LWIP_ASSERT("TCP_RMV: tcp_pcbs sane", tcp_pcbs_sane()); \
-              tcp_timer_needed(); \
-                            } while(0)
-#define TCP_RMV(pcbs, npcb) do { \
-                            struct tcp_pcb *tcp_tmp_pcb; \
-                            LWIP_ASSERT("TCP_RMV: pcbs != NULL", *(pcbs) != NULL); \
-                            LWIP_DEBUGF(TCP_DEBUG, ("TCP_RMV: removing %p from %p\n", (npcb), *(pcbs))); \
-                            if(*(pcbs) == (npcb)) { \
-                               *(pcbs) = (*pcbs)->next; \
-                            } else for (tcp_tmp_pcb = *(pcbs); tcp_tmp_pcb != NULL; tcp_tmp_pcb = tcp_tmp_pcb->next) { \
-                               if(tcp_tmp_pcb->next == (npcb)) { \
-                                  tcp_tmp_pcb->next = (npcb)->next; \
-                                  break; \
-                               } \
-                            } \
-                            (npcb)->next = NULL; \
-                            LWIP_ASSERT("TCP_RMV: tcp_pcbs sane", tcp_pcbs_sane()); \
-                            LWIP_DEBUGF(TCP_DEBUG, ("TCP_RMV: removed %p from %p\n", (npcb), *(pcbs))); \
-                            } while(0)
-
-#else /* LWIP_DEBUG */
-
-#define TCP_REG(pcbs, npcb)                        \
-  do {                                             \
-    (npcb)->next = *pcbs;                          \
-    *(pcbs) = (npcb);                              \
-    tcp_timer_needed();                            \
-  } while (0)
-
-#define TCP_RMV(pcbs, npcb)                        \
-  do {                                             \
-    if(*(pcbs) == (npcb)) {                        \
-      (*(pcbs)) = (*pcbs)->next;                   \
-    }                                              \
-    else {                                         \
-      struct tcp_pcb *tcp_tmp_pcb;                 \
-      for (tcp_tmp_pcb = *pcbs;                    \
-          tcp_tmp_pcb != NULL;                     \
-          tcp_tmp_pcb = tcp_tmp_pcb->next) {       \
-        if(tcp_tmp_pcb->next == (npcb)) {          \
-          tcp_tmp_pcb->next = (npcb)->next;        \
-          break;                                   \
-        }                                          \
-      }                                            \
-    }                                              \
-    (npcb)->next = NULL;                           \
-  } while(0)
-
-#endif /* LWIP_DEBUG */
-
-#define TCP_REG_ACTIVE(npcb)                       \
-  do {                                             \
-    TCP_REG(&tcp_active_pcbs, npcb);               \
-    tcp_active_pcbs_changed = 1;                   \
-  } while (0)
-
-#define TCP_RMV_ACTIVE(npcb)                       \
-  do {                                             \
-    TCP_RMV(&tcp_active_pcbs, npcb);               \
-    tcp_active_pcbs_changed = 1;                   \
-  } while (0)
-
-#define TCP_PCB_REMOVE_ACTIVE(pcb)                 \
-  do {                                             \
-    tcp_pcb_remove(&tcp_active_pcbs, pcb);         \
-    tcp_active_pcbs_changed = 1;                   \
-  } while (0)
-
-
-/* Internal functions: */
-struct tcp_pcb *tcp_pcb_copy(struct tcp_pcb *pcb);
-void tcp_pcb_purge(struct tcp_pcb *pcb);
-void tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb);
-
-void tcp_segs_free(struct tcp_seg *seg);
-void tcp_seg_free(struct tcp_seg *seg);
-struct tcp_seg *tcp_seg_copy(struct tcp_seg *seg);
-
-#define tcp_ack(pcb)                               \
-  do {                                             \
-    if((pcb)->flags & TF_ACK_DELAY) {              \
-      (pcb)->flags &= ~TF_ACK_DELAY;               \
-      (pcb)->flags |= TF_ACK_NOW;                  \
-    }                                              \
-    else {                                         \
-      (pcb)->flags |= TF_ACK_DELAY;                \
-    }                                              \
-  } while (0)
-
-#define tcp_ack_now(pcb)                           \
-  do {                                             \
-    (pcb)->flags |= TF_ACK_NOW;                    \
-  } while (0)
-
-err_t tcp_send_fin(struct tcp_pcb *pcb);
-err_t tcp_enqueue_flags(struct tcp_pcb *pcb, u8_t flags);
-
-void tcp_rexmit_seg(struct tcp_pcb *pcb, struct tcp_seg *seg);
-
-void tcp_rst(u32_t seqno, u32_t ackno,
-       const ip_addr_t *local_ip, const ip_addr_t *remote_ip,
-       u16_t local_port, u16_t remote_port);
-
-u32_t tcp_next_iss(struct tcp_pcb *pcb);
-
-err_t tcp_keepalive(struct tcp_pcb *pcb);
-err_t tcp_zero_window_probe(struct tcp_pcb *pcb);
-void  tcp_trigger_input_pcb_close(void);
-
-#if TCP_CALCULATE_EFF_SEND_MSS
-u16_t tcp_eff_send_mss_impl(u16_t sendmss, const ip_addr_t *dest
-#if LWIP_IPV6 || LWIP_IPV4_SRC_ROUTING
-                           , const ip_addr_t *src
-#endif /* LWIP_IPV6 || LWIP_IPV4_SRC_ROUTING */
-                           );
-#if LWIP_IPV6 || LWIP_IPV4_SRC_ROUTING
-#define tcp_eff_send_mss(sendmss, src, dest) tcp_eff_send_mss_impl(sendmss, dest, src)
-#else /* LWIP_IPV6 || LWIP_IPV4_SRC_ROUTING */
-#define tcp_eff_send_mss(sendmss, src, dest) tcp_eff_send_mss_impl(sendmss, dest)
-#endif /* LWIP_IPV6 || LWIP_IPV4_SRC_ROUTING */
-#endif /* TCP_CALCULATE_EFF_SEND_MSS */
-
-#if LWIP_CALLBACK_API
-err_t tcp_recv_null(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err);
-#endif /* LWIP_CALLBACK_API */
-
-#if TCP_DEBUG || TCP_INPUT_DEBUG || TCP_OUTPUT_DEBUG
-void tcp_debug_print(struct tcp_hdr *tcphdr);
-void tcp_debug_print_flags(u8_t flags);
-void tcp_debug_print_state(enum tcp_state s);
-void tcp_debug_print_pcbs(void);
-s16_t tcp_pcbs_sane(void);
-#else
-#  define tcp_debug_print(tcphdr)
-#  define tcp_debug_print_flags(flags)
-#  define tcp_debug_print_state(s)
-#  define tcp_debug_print_pcbs()
-#  define tcp_pcbs_sane() 1
-#endif /* TCP_DEBUG */
-
-/** External function (implemented in timers.c), called when TCP detects
- * that a timer is needed (i.e. active- or time-wait-pcb found). */
-void tcp_timer_needed(void);
-
-void tcp_netif_ip_addr_changed(const ip_addr_t* old_addr, const ip_addr_t* new_addr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_TCP */
-
-#endif /* LWIP_HDR_TCP_PRIV_H */
diff --git a/sys/include/net/priv/tcpip_priv.h b/sys/include/net/priv/tcpip_priv.h
deleted file mode 100644
index c714d1e..0000000
--- a/sys/include/net/priv/tcpip_priv.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * @file
- * TCPIP API internal implementations (do not use in application code)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_TCPIP_PRIV_H
-#define LWIP_HDR_TCPIP_PRIV_H
-
-#include "net/opt.h"
-
-#if !NO_SYS /* don't build if not configured for use in lwipopts.h */
-
-#include "net/tcpip.h"
-#include "net/sys.h"
-#include "net/timeouts.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct pbuf;
-struct netif;
-
-#if LWIP_MPU_COMPATIBLE
-#define API_VAR_REF(name)               (*(name))
-#define API_VAR_DECLARE(type, name)     type * name
-#define API_VAR_ALLOC(type, pool, name, errorval) do { \
-                                          name = (type *)memp_malloc(pool); \
-                                          if (name == NULL) { \
-                                            return errorval; \
-                                          } \
-                                        } while(0)
-#define API_VAR_ALLOC_POOL(type, pool, name, errorval) do { \
-                                          name = (type *)LWIP_MEMPOOL_ALLOC(pool); \
-                                          if (name == NULL) { \
-                                            return errorval; \
-                                          } \
-                                        } while(0)
-#define API_VAR_FREE(pool, name)        memp_free(pool, name)
-#define API_VAR_FREE_POOL(pool, name)   LWIP_MEMPOOL_FREE(pool, name)
-#define API_EXPR_REF(expr)              (&(expr))
-#if LWIP_NETCONN_SEM_PER_THREAD
-#define API_EXPR_REF_SEM(expr)          (expr)
-#else
-#define API_EXPR_REF_SEM(expr)          API_EXPR_REF(expr)
-#endif
-#define API_EXPR_DEREF(expr)            expr
-#define API_MSG_M_DEF(m)                m
-#define API_MSG_M_DEF_C(t, m)           t m
-#else /* LWIP_MPU_COMPATIBLE */
-#define API_VAR_REF(name)               name
-#define API_VAR_DECLARE(type, name)     type name
-#define API_VAR_ALLOC(type, pool, name, errorval)
-#define API_VAR_ALLOC_POOL(type, pool, name, errorval)
-#define API_VAR_FREE(pool, name)
-#define API_VAR_FREE_POOL(pool, name)
-#define API_EXPR_REF(expr)              expr
-#define API_EXPR_REF_SEM(expr)          API_EXPR_REF(expr)
-#define API_EXPR_DEREF(expr)            (*(expr))
-#define API_MSG_M_DEF(m)                *m
-#define API_MSG_M_DEF_C(t, m)           const t * m
-#endif /* LWIP_MPU_COMPATIBLE */
-
-err_t tcpip_send_msg_wait_sem(tcpip_callback_fn fn, void *apimsg, sys_sem_t* sem);
-
-struct tcpip_api_call_data
-{
-#if !LWIP_TCPIP_CORE_LOCKING
-  err_t err;
-#if !LWIP_NETCONN_SEM_PER_THREAD
-  sys_sem_t sem;
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-#else /* !LWIP_TCPIP_CORE_LOCKING */
-  u8_t dummy; /* avoid empty struct :-( */
-#endif /* !LWIP_TCPIP_CORE_LOCKING */
-};
-typedef err_t (*tcpip_api_call_fn)(struct tcpip_api_call_data* call);
-err_t tcpip_api_call(tcpip_api_call_fn fn, struct tcpip_api_call_data *call);
-
-enum tcpip_msg_type {
-  TCPIP_MSG_API,
-  TCPIP_MSG_API_CALL,
-  TCPIP_MSG_INPKT,
-#if LWIP_TCPIP_TIMEOUT && LWIP_TIMERS
-  TCPIP_MSG_TIMEOUT,
-  TCPIP_MSG_UNTIMEOUT,
-#endif /* LWIP_TCPIP_TIMEOUT && LWIP_TIMERS */
-  TCPIP_MSG_CALLBACK,
-  TCPIP_MSG_CALLBACK_STATIC
-};
-
-struct tcpip_msg {
-  enum tcpip_msg_type type;
-  union {
-    struct {
-      tcpip_callback_fn function;
-      void* msg;
-    } api_msg;
-    struct {
-      tcpip_api_call_fn function;
-      struct tcpip_api_call_data *arg;
-      sys_sem_t *sem;
-    } api_call;
-    struct {
-      struct pbuf *p;
-      struct netif *netif;
-      netif_input_fn input_fn;
-    } inp;
-    struct {
-      tcpip_callback_fn function;
-      void *ctx;
-    } cb;
-#if LWIP_TCPIP_TIMEOUT && LWIP_TIMERS
-    struct {
-      u32_t msecs;
-      sys_timeout_handler h;
-      void *arg;
-    } tmo;
-#endif /* LWIP_TCPIP_TIMEOUT && LWIP_TIMERS */
-  } msg;
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !NO_SYS */
-
-#endif /* LWIP_HDR_TCPIP_PRIV_H */
diff --git a/sys/include/net/prot/autoip.h b/sys/include/net/prot/autoip.h
deleted file mode 100644
index fd3af8a..0000000
--- a/sys/include/net/prot/autoip.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * @file
- * AutoIP protocol definitions
- */
-
-/*
- *
- * Copyright (c) 2007 Dominik Spies <kontakt@dspies.de>
- * 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 ``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 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.
- *
- * Author: Dominik Spies <kontakt@dspies.de>
- *
- * This is a AutoIP implementation for the lwIP TCP/IP stack. It aims to conform
- * with RFC 3927.
- *
- */
-
-#ifndef LWIP_HDR_PROT_AUTOIP_H
-#define LWIP_HDR_PROT_AUTOIP_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* 169.254.0.0 */
-#define AUTOIP_NET              0xA9FE0000
-/* 169.254.1.0 */
-#define AUTOIP_RANGE_START      (AUTOIP_NET | 0x0100)
-/* 169.254.254.255 */
-#define AUTOIP_RANGE_END        (AUTOIP_NET | 0xFEFF)
-
-/* RFC 3927 Constants */
-#define PROBE_WAIT              1   /* second   (initial random delay)                 */
-#define PROBE_MIN               1   /* second   (minimum delay till repeated probe)    */
-#define PROBE_MAX               2   /* seconds  (maximum delay till repeated probe)    */
-#define PROBE_NUM               3   /*          (number of probe packets)              */
-#define ANNOUNCE_NUM            2   /*          (number of announcement packets)       */
-#define ANNOUNCE_INTERVAL       2   /* seconds  (time between announcement packets)    */
-#define ANNOUNCE_WAIT           2   /* seconds  (delay before announcing)              */
-#define MAX_CONFLICTS           10  /*          (max conflicts before rate limiting)   */
-#define RATE_LIMIT_INTERVAL     60  /* seconds  (delay between successive attempts)    */
-#define DEFEND_INTERVAL         10  /* seconds  (min. wait between defensive ARPs)     */
-
-/* AutoIP client states */
-typedef enum {
-  AUTOIP_STATE_OFF        = 0,
-  AUTOIP_STATE_PROBING    = 1,
-  AUTOIP_STATE_ANNOUNCING = 2,
-  AUTOIP_STATE_BOUND      = 3
-} autoip_state_enum_t;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_AUTOIP_H */
diff --git a/sys/include/net/prot/dhcp.h b/sys/include/net/prot/dhcp.h
deleted file mode 100644
index 39d7726..0000000
--- a/sys/include/net/prot/dhcp.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- * @file
- * DHCP protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Leon Woestenberg <leon.woestenberg@gmx.net>
- * Copyright (c) 2001-2004 Axon Digital Design B.V., The Netherlands.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Leon Woestenberg <leon.woestenberg@gmx.net>
- *
- */
-#ifndef LWIP_HDR_PROT_DHCP_H
-#define LWIP_HDR_PROT_DHCP_H
-
-#include "net/opt.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DHCP_CLIENT_PORT  68
-#define DHCP_SERVER_PORT  67
-
-
- /* DHCP message item offsets and length */
-#define DHCP_CHADDR_LEN   16U
-#define DHCP_SNAME_OFS    44U
-#define DHCP_SNAME_LEN    64U
-#define DHCP_FILE_OFS     108U
-#define DHCP_FILE_LEN     128U
-#define DHCP_MSG_LEN      236U
-#define DHCP_OPTIONS_OFS  (DHCP_MSG_LEN + 4U) /* 4 byte: cookie */
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-/** minimum set of fields of any DHCP message */
-struct dhcp_msg
-{
-  PACK_STRUCT_FLD_8(u8_t op);
-  PACK_STRUCT_FLD_8(u8_t htype);
-  PACK_STRUCT_FLD_8(u8_t hlen);
-  PACK_STRUCT_FLD_8(u8_t hops);
-  PACK_STRUCT_FIELD(u32_t xid);
-  PACK_STRUCT_FIELD(u16_t secs);
-  PACK_STRUCT_FIELD(u16_t flags);
-  PACK_STRUCT_FLD_S(ip4_addr_p_t ciaddr);
-  PACK_STRUCT_FLD_S(ip4_addr_p_t yiaddr);
-  PACK_STRUCT_FLD_S(ip4_addr_p_t siaddr);
-  PACK_STRUCT_FLD_S(ip4_addr_p_t giaddr);
-  PACK_STRUCT_FLD_8(u8_t chaddr[DHCP_CHADDR_LEN]);
-  PACK_STRUCT_FLD_8(u8_t sname[DHCP_SNAME_LEN]);
-  PACK_STRUCT_FLD_8(u8_t file[DHCP_FILE_LEN]);
-  PACK_STRUCT_FIELD(u32_t cookie);
-#define DHCP_MIN_OPTIONS_LEN 68U
-/** make sure user does not configure this too small */
-#if ((defined(DHCP_OPTIONS_LEN)) && (DHCP_OPTIONS_LEN < DHCP_MIN_OPTIONS_LEN))
-#  undef DHCP_OPTIONS_LEN
-#endif
-/** allow this to be configured in lwipopts.h, but not too small */
-#if (!defined(DHCP_OPTIONS_LEN))
-/** set this to be sufficient for your options in outgoing DHCP msgs */
-#  define DHCP_OPTIONS_LEN DHCP_MIN_OPTIONS_LEN
-#endif
-  PACK_STRUCT_FLD_8(u8_t options[DHCP_OPTIONS_LEN]);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-
-/* DHCP client states */
-typedef enum {
-  DHCP_STATE_OFF             = 0,
-  DHCP_STATE_REQUESTING      = 1,
-  DHCP_STATE_INIT            = 2,
-  DHCP_STATE_REBOOTING       = 3,
-  DHCP_STATE_REBINDING       = 4,
-  DHCP_STATE_RENEWING        = 5,
-  DHCP_STATE_SELECTING       = 6,
-  DHCP_STATE_INFORMING       = 7,
-  DHCP_STATE_CHECKING        = 8,
-  DHCP_STATE_PERMANENT       = 9,  /* not yet implemented */
-  DHCP_STATE_BOUND           = 10,
-  DHCP_STATE_RELEASING       = 11, /* not yet implemented */
-  DHCP_STATE_BACKING_OFF     = 12
-} dhcp_state_enum_t;
-
-/* DHCP op codes */
-#define DHCP_BOOTREQUEST            1
-#define DHCP_BOOTREPLY              2
-
-/* DHCP message types */
-#define DHCP_DISCOVER               1
-#define DHCP_OFFER                  2
-#define DHCP_REQUEST                3
-#define DHCP_DECLINE                4
-#define DHCP_ACK                    5
-#define DHCP_NAK                    6
-#define DHCP_RELEASE                7
-#define DHCP_INFORM                 8
-
-/** DHCP hardware type, currently only ethernet is supported */
-#define DHCP_HTYPE_ETH              1
-
-#define DHCP_MAGIC_COOKIE           0x63825363UL
-
-/* This is a list of options for BOOTP and DHCP, see RFC 2132 for descriptions */
-
-/* BootP options */
-#define DHCP_OPTION_PAD             0
-#define DHCP_OPTION_SUBNET_MASK     1 /* RFC 2132 3.3 */
-#define DHCP_OPTION_ROUTER          3
-#define DHCP_OPTION_DNS_SERVER      6
-#define DHCP_OPTION_HOSTNAME        12
-#define DHCP_OPTION_IP_TTL          23
-#define DHCP_OPTION_MTU             26
-#define DHCP_OPTION_BROADCAST       28
-#define DHCP_OPTION_TCP_TTL         37
-#define DHCP_OPTION_NTP             42
-#define DHCP_OPTION_END             255
-
-/* DHCP options */
-#define DHCP_OPTION_REQUESTED_IP    50 /* RFC 2132 9.1, requested IP address */
-#define DHCP_OPTION_LEASE_TIME      51 /* RFC 2132 9.2, time in seconds, in 4 bytes */
-#define DHCP_OPTION_OVERLOAD        52 /* RFC2132 9.3, use file and/or sname field for options */
-
-#define DHCP_OPTION_MESSAGE_TYPE    53 /* RFC 2132 9.6, important for DHCP */
-#define DHCP_OPTION_MESSAGE_TYPE_LEN 1
-
-#define DHCP_OPTION_SERVER_ID       54 /* RFC 2132 9.7, server IP address */
-#define DHCP_OPTION_PARAMETER_REQUEST_LIST  55 /* RFC 2132 9.8, requested option types */
-
-#define DHCP_OPTION_MAX_MSG_SIZE    57 /* RFC 2132 9.10, message size accepted >= 576 */
-#define DHCP_OPTION_MAX_MSG_SIZE_LEN 2
-
-#define DHCP_OPTION_T1              58 /* T1 renewal time */
-#define DHCP_OPTION_T2              59 /* T2 rebinding time */
-#define DHCP_OPTION_US              60
-#define DHCP_OPTION_CLIENT_ID       61
-#define DHCP_OPTION_TFTP_SERVERNAME 66
-#define DHCP_OPTION_BOOTFILE        67
-
-/* possible combinations of overloading the file and sname fields with options */
-#define DHCP_OVERLOAD_NONE          0
-#define DHCP_OVERLOAD_FILE          1
-#define DHCP_OVERLOAD_SNAME         2
-#define DHCP_OVERLOAD_SNAME_FILE    3
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*LWIP_HDR_PROT_DHCP_H*/
diff --git a/sys/include/net/prot/dns.h b/sys/include/net/prot/dns.h
deleted file mode 100644
index e109743..0000000
--- a/sys/include/net/prot/dns.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * @file
- * DNS - host name to IP address resolver.
- */
-
-/*
- * Port to lwIP from uIP
- * by Jim Pettinato April 2007
- *
- * security fixes and more by Simon Goldschmidt
- *
- * uIP version Copyright (c) 2002-2003, Adam Dunkels.
- * 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 ``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 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.
- */
-
-#ifndef LWIP_HDR_PROT_DNS_H
-#define LWIP_HDR_PROT_DNS_H
-
-#include "net/arch.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** DNS server port address */
-#ifndef DNS_SERVER_PORT
-#define DNS_SERVER_PORT           53
-#endif
-
-/* DNS field TYPE used for "Resource Records" */
-#define DNS_RRTYPE_A              1     /* a host address */
-#define DNS_RRTYPE_NS             2     /* an authoritative name server */
-#define DNS_RRTYPE_MD             3     /* a mail destination (Obsolete - use MX) */
-#define DNS_RRTYPE_MF             4     /* a mail forwarder (Obsolete - use MX) */
-#define DNS_RRTYPE_CNAME          5     /* the canonical name for an alias */
-#define DNS_RRTYPE_SOA            6     /* marks the start of a zone of authority */
-#define DNS_RRTYPE_MB             7     /* a mailbox domain name (EXPERIMENTAL) */
-#define DNS_RRTYPE_MG             8     /* a mail group member (EXPERIMENTAL) */
-#define DNS_RRTYPE_MR             9     /* a mail rename domain name (EXPERIMENTAL) */
-#define DNS_RRTYPE_NULL           10    /* a null RR (EXPERIMENTAL) */
-#define DNS_RRTYPE_WKS            11    /* a well known service description */
-#define DNS_RRTYPE_PTR            12    /* a domain name pointer */
-#define DNS_RRTYPE_HINFO          13    /* host information */
-#define DNS_RRTYPE_MINFO          14    /* mailbox or mail list information */
-#define DNS_RRTYPE_MX             15    /* mail exchange */
-#define DNS_RRTYPE_TXT            16    /* text strings */
-#define DNS_RRTYPE_AAAA           28    /* IPv6 address */
-#define DNS_RRTYPE_SRV            33    /* service location */
-#define DNS_RRTYPE_ANY            255   /* any type */
-
-/* DNS field CLASS used for "Resource Records" */
-#define DNS_RRCLASS_IN            1     /* the Internet */
-#define DNS_RRCLASS_CS            2     /* the CSNET class (Obsolete - used only for examples in some obsolete RFCs) */
-#define DNS_RRCLASS_CH            3     /* the CHAOS class */
-#define DNS_RRCLASS_HS            4     /* Hesiod [Dyer 87] */
-#define DNS_RRCLASS_ANY           255   /* any class */
-#define DNS_RRCLASS_FLUSH         0x800 /* Flush bit */
-
-/* DNS protocol flags */
-#define DNS_FLAG1_RESPONSE        0x80
-#define DNS_FLAG1_OPCODE_STATUS   0x10
-#define DNS_FLAG1_OPCODE_INVERSE  0x08
-#define DNS_FLAG1_OPCODE_STANDARD 0x00
-#define DNS_FLAG1_AUTHORATIVE     0x04
-#define DNS_FLAG1_TRUNC           0x02
-#define DNS_FLAG1_RD              0x01
-#define DNS_FLAG2_RA              0x80
-#define DNS_FLAG2_ERR_MASK        0x0f
-#define DNS_FLAG2_ERR_NONE        0x00
-#define DNS_FLAG2_ERR_NAME        0x03
-
-#define DNS_HDR_GET_OPCODE(hdr) ((((hdr)->flags1) >> 3) & 0xF)
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-/** DNS message header */
-struct dns_hdr {
-  PACK_STRUCT_FIELD(u16_t id);
-  PACK_STRUCT_FLD_8(u8_t flags1);
-  PACK_STRUCT_FLD_8(u8_t flags2);
-  PACK_STRUCT_FIELD(u16_t numquestions);
-  PACK_STRUCT_FIELD(u16_t numanswers);
-  PACK_STRUCT_FIELD(u16_t numauthrr);
-  PACK_STRUCT_FIELD(u16_t numextrarr);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-#define SIZEOF_DNS_HDR 12
-
-
-/* Multicast DNS definitions */
-
-/** UDP port for multicast DNS queries */
-#ifndef DNS_MQUERY_PORT
-#define DNS_MQUERY_PORT             5353
-#endif
-
-/* IPv4 group for multicast DNS queries: 224.0.0.251 */
-#ifndef DNS_MQUERY_IPV4_GROUP_INIT
-#define DNS_MQUERY_IPV4_GROUP_INIT  IPADDR4_INIT_BYTES(224,0,0,251)
-#endif
-
-/* IPv6 group for multicast DNS queries: FF02::FB */
-#ifndef DNS_MQUERY_IPV6_GROUP_INIT
-#define DNS_MQUERY_IPV6_GROUP_INIT  IPADDR6_INIT_HOST(0xFF020000,0,0,0xFB)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_DNS_H */
diff --git a/sys/include/net/prot/etharp.h b/sys/include/net/prot/etharp.h
deleted file mode 100644
index 6f5c5eb..0000000
--- a/sys/include/net/prot/etharp.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * @file
- * ARP protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_ETHARP_H
-#define LWIP_HDR_PROT_ETHARP_H
-
-#include "net/arch.h"
-#include "net/prot/ethernet.h"
-#include "net/ip4_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef ETHARP_HWADDR_LEN
-#define ETHARP_HWADDR_LEN     ETH_HWADDR_LEN
-#endif
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-/** the ARP message, see RFC 826 ("Packet format") */
-struct etharp_hdr {
-  PACK_STRUCT_FIELD(u16_t hwtype);
-  PACK_STRUCT_FIELD(u16_t proto);
-  PACK_STRUCT_FLD_8(u8_t  hwlen);
-  PACK_STRUCT_FLD_8(u8_t  protolen);
-  PACK_STRUCT_FIELD(u16_t opcode);
-  PACK_STRUCT_FLD_S(struct eth_addr shwaddr);
-  PACK_STRUCT_FLD_S(struct ip4_addr2 sipaddr);
-  PACK_STRUCT_FLD_S(struct eth_addr dhwaddr);
-  PACK_STRUCT_FLD_S(struct ip4_addr2 dipaddr);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#define SIZEOF_ETHARP_HDR 28
-
-/* ARP hwtype values */
-enum etharp_hwtype {
-  HWTYPE_ETHERNET = 1
-  /* others not used */
-};
-
-/* ARP message types (opcodes) */
-enum etharp_opcode {
-  ARP_REQUEST = 1,
-  ARP_REPLY   = 2
-};
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_ETHARP_H */
diff --git a/sys/include/net/prot/ethernet.h b/sys/include/net/prot/ethernet.h
deleted file mode 100644
index d4e8b1c..0000000
--- a/sys/include/net/prot/ethernet.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * @file
- * Ethernet protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_ETHERNET_H
-#define LWIP_HDR_PROT_ETHERNET_H
-
-#include "net/arch.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef ETH_HWADDR_LEN
-#ifdef ETHARP_HWADDR_LEN
-#define ETH_HWADDR_LEN    ETHARP_HWADDR_LEN /* compatibility mode */
-#else
-#define ETH_HWADDR_LEN    6
-#endif
-#endif
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct eth_addr {
-  PACK_STRUCT_FLD_8(u8_t addr[ETH_HWADDR_LEN]);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-/** Ethernet header */
-struct eth_hdr {
-#if ETH_PAD_SIZE
-  PACK_STRUCT_FLD_8(u8_t padding[ETH_PAD_SIZE]);
-#endif
-  PACK_STRUCT_FLD_S(struct eth_addr dest);
-  PACK_STRUCT_FLD_S(struct eth_addr src);
-  PACK_STRUCT_FIELD(u16_t type);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#define SIZEOF_ETH_HDR (14 + ETH_PAD_SIZE)
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-/** VLAN header inserted between ethernet header and payload
- * if 'type' in ethernet header is ETHTYPE_VLAN.
- * See IEEE802.Q */
-struct eth_vlan_hdr {
-  PACK_STRUCT_FIELD(u16_t prio_vid);
-  PACK_STRUCT_FIELD(u16_t tpid);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#define SIZEOF_VLAN_HDR 4
-#define VLAN_ID(vlan_hdr) (lwip_htons((vlan_hdr)->prio_vid) & 0xFFF)
-
-/**
- * @ingroup ethernet
- * A list of often ethtypes (although lwIP does not use all of them): */
-enum eth_type {
-  /** Internet protocol v4 */
-  ETHTYPE_IP        = 0x0800U,
-  /** Address resolution protocol */
-  ETHTYPE_ARP       = 0x0806U, 
-  /** Wake on lan */
-  ETHTYPE_WOL       = 0x0842U,
-  /** RARP */
-  ETHTYPE_RARP      = 0x8035U,
-  /** Virtual local area network */
-  ETHTYPE_VLAN      = 0x8100U,
-  /** Internet protocol v6 */
-  ETHTYPE_IPV6      = 0x86DDU,
-  /** PPP Over Ethernet Discovery Stage */
-  ETHTYPE_PPPOEDISC = 0x8863U,
-  /** PPP Over Ethernet Session Stage */
-  ETHTYPE_PPPOE     = 0x8864U,
-  /** Jumbo Frames */
-  ETHTYPE_JUMBO     = 0x8870U,
-  /** Process field network */
-  ETHTYPE_PROFINET  = 0x8892U,
-  /** Ethernet for control automation technology */
-  ETHTYPE_ETHERCAT  = 0x88A4U,
-  /** Link layer discovery protocol */
-  ETHTYPE_LLDP      = 0x88CCU,
-  /** Serial real-time communication system */
-  ETHTYPE_SERCOS    = 0x88CDU,
-  /** Media redundancy protocol */
-  ETHTYPE_MRP       = 0x88E3U,
-  /** Precision time protocol */
-  ETHTYPE_PTP       = 0x88F7U,
-  /** Q-in-Q, 802.1ad */
-  ETHTYPE_QINQ      = 0x9100U
-};
-
-/** The 24-bit IANA IPv4-multicast OUI is 01-00-5e: */
-#define LL_IP4_MULTICAST_ADDR_0 0x01
-#define LL_IP4_MULTICAST_ADDR_1 0x00
-#define LL_IP4_MULTICAST_ADDR_2 0x5e
-
-/** IPv6 multicast uses this prefix */
-#define LL_IP6_MULTICAST_ADDR_0 0x33
-#define LL_IP6_MULTICAST_ADDR_1 0x33
-
-/** MEMCPY-like macro to copy to/from struct eth_addr's that are local variables
- * or known to be 32-bit aligned within the protocol header. */
-#ifndef ETHADDR32_COPY
-#define ETHADDR32_COPY(dst, src)  SMEMCPY(dst, src, ETH_HWADDR_LEN)
-#endif
-
-/** MEMCPY-like macro to copy to/from struct eth_addr's that are no local
- * variables and known to be 16-bit aligned within the protocol header. */
-#ifndef ETHADDR16_COPY
-#define ETHADDR16_COPY(dst, src)  SMEMCPY(dst, src, ETH_HWADDR_LEN)
-#endif
-
-#define eth_addr_cmp(addr1, addr2) (memcmp((addr1)->addr, (addr2)->addr, ETH_HWADDR_LEN) == 0)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_ETHERNET_H */
diff --git a/sys/include/net/prot/icmp.h b/sys/include/net/prot/icmp.h
deleted file mode 100644
index 8a6fbd5..0000000
--- a/sys/include/net/prot/icmp.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * @file
- * ICMP protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_ICMP_H
-#define LWIP_HDR_PROT_ICMP_H
-
-#include "net/arch.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ICMP_ER   0    /* echo reply */
-#define ICMP_DUR  3    /* destination unreachable */
-#define ICMP_SQ   4    /* source quench */
-#define ICMP_RD   5    /* redirect */
-#define ICMP_ECHO 8    /* echo */
-#define ICMP_TE  11    /* time exceeded */
-#define ICMP_PP  12    /* parameter problem */
-#define ICMP_TS  13    /* timestamp */
-#define ICMP_TSR 14    /* timestamp reply */
-#define ICMP_IRQ 15    /* information request */
-#define ICMP_IR  16    /* information reply */
-#define ICMP_AM  17    /* address mask request */
-#define ICMP_AMR 18    /* address mask reply */
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-/** This is the standard ICMP header only that the u32_t data
- *  is split to two u16_t like ICMP echo needs it.
- *  This header is also used for other ICMP types that do not
- *  use the data part.
- */
-PACK_STRUCT_BEGIN
-struct icmp_echo_hdr {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FIELD(u16_t id);
-  PACK_STRUCT_FIELD(u16_t seqno);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/* Compatibility defines, old versions used to combine type and code to an u16_t */
-#define ICMPH_TYPE(hdr) ((hdr)->type)
-#define ICMPH_CODE(hdr) ((hdr)->code)
-#define ICMPH_TYPE_SET(hdr, t) ((hdr)->type = (t))
-#define ICMPH_CODE_SET(hdr, c) ((hdr)->code = (c))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_ICMP_H */
diff --git a/sys/include/net/prot/icmp6.h b/sys/include/net/prot/icmp6.h
deleted file mode 100644
index 3cd7327..0000000
--- a/sys/include/net/prot/icmp6.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/**
- * @file
- * ICMP6 protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_ICMP6_H
-#define LWIP_HDR_PROT_ICMP6_H
-
-#include "net/arch.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** ICMP type */
-enum icmp6_type {
-  /** Destination unreachable */
-  ICMP6_TYPE_DUR = 1,
-  /** Packet too big */
-  ICMP6_TYPE_PTB = 2,
-  /** Time exceeded */
-  ICMP6_TYPE_TE = 3,
-  /** Parameter problem */
-  ICMP6_TYPE_PP = 4,
-  /** Private experimentation */
-  ICMP6_TYPE_PE1 = 100,
-  /** Private experimentation */
-  ICMP6_TYPE_PE2 = 101,
-  /** Reserved for expansion of error messages */
-  ICMP6_TYPE_RSV_ERR = 127,
-
-  /** Echo request */
-  ICMP6_TYPE_EREQ = 128,
-  /** Echo reply */
-  ICMP6_TYPE_EREP = 129,
-  /** Multicast listener query */
-  ICMP6_TYPE_MLQ = 130,
-  /** Multicast listener report */
-  ICMP6_TYPE_MLR = 131,
-  /** Multicast listener done */
-  ICMP6_TYPE_MLD = 132,
-  /** Router solicitation */
-  ICMP6_TYPE_RS = 133,
-  /** Router advertisement */
-  ICMP6_TYPE_RA = 134,
-  /** Neighbor solicitation */
-  ICMP6_TYPE_NS = 135,
-  /** Neighbor advertisement */
-  ICMP6_TYPE_NA = 136,
-  /** Redirect */
-  ICMP6_TYPE_RD = 137,
-  /** Multicast router advertisement */
-  ICMP6_TYPE_MRA = 151,
-  /** Multicast router solicitation */
-  ICMP6_TYPE_MRS = 152,
-  /** Multicast router termination */
-  ICMP6_TYPE_MRT = 153,
-  /** Private experimentation */
-  ICMP6_TYPE_PE3 = 200,
-  /** Private experimentation */
-  ICMP6_TYPE_PE4 = 201,
-  /** Reserved for expansion of informational messages */
-  ICMP6_TYPE_RSV_INF = 255
-};
-
-/** ICMP destination unreachable codes */
-enum icmp6_dur_code {
-  /** No route to destination */
-  ICMP6_DUR_NO_ROUTE = 0,
-  /** Communication with destination administratively prohibited */
-  ICMP6_DUR_PROHIBITED = 1,
-  /** Beyond scope of source address */
-  ICMP6_DUR_SCOPE = 2,
-  /** Address unreachable */
-  ICMP6_DUR_ADDRESS = 3,
-  /** Port unreachable */
-  ICMP6_DUR_PORT = 4,
-  /** Source address failed ingress/egress policy */
-  ICMP6_DUR_POLICY = 5,
-  /** Reject route to destination */
-  ICMP6_DUR_REJECT_ROUTE = 6
-};
-
-/** ICMP time exceeded codes */
-enum icmp6_te_code {
-  /** Hop limit exceeded in transit */
-  ICMP6_TE_HL = 0,
-  /** Fragment reassembly time exceeded */
-  ICMP6_TE_FRAG = 1
-};
-
-/** ICMP parameter code */
-enum icmp6_pp_code {
-  /** Erroneous header field encountered */
-  ICMP6_PP_FIELD = 0,
-  /** Unrecognized next header type encountered */
-  ICMP6_PP_HEADER = 1,
-  /** Unrecognized IPv6 option encountered */
-  ICMP6_PP_OPTION = 2
-};
-
-/** This is the standard ICMP6 header. */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct icmp6_hdr {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FIELD(u32_t data);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** This is the ICMP6 header adapted for echo req/resp. */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct icmp6_echo_hdr {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FIELD(u16_t id);
-  PACK_STRUCT_FIELD(u16_t seqno);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_ICMP6_H */
diff --git a/sys/include/net/prot/igmp.h b/sys/include/net/prot/igmp.h
deleted file mode 100644
index 9f60bee..0000000
--- a/sys/include/net/prot/igmp.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * @file
- * IGMP protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_IGMP_H
-#define LWIP_HDR_PROT_IGMP_H
-
-#include "net/arch.h"
-#include "net/ip4_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * IGMP constants
- */
-#define IGMP_TTL                       1
-#define IGMP_MINLEN                    8
-#define ROUTER_ALERT                   0x9404U
-#define ROUTER_ALERTLEN                4
-
-/*
- * IGMP message types, including version number.
- */
-#define IGMP_MEMB_QUERY                0x11 /* Membership query         */
-#define IGMP_V1_MEMB_REPORT            0x12 /* Ver. 1 membership report */
-#define IGMP_V2_MEMB_REPORT            0x16 /* Ver. 2 membership report */
-#define IGMP_LEAVE_GROUP               0x17 /* Leave-group message      */
-
-/* Group  membership states */
-#define IGMP_GROUP_NON_MEMBER          0
-#define IGMP_GROUP_DELAYING_MEMBER     1
-#define IGMP_GROUP_IDLE_MEMBER         2
-
-/**
- * IGMP packet format.
- */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct igmp_msg {
-  PACK_STRUCT_FLD_8(u8_t         igmp_msgtype);
-  PACK_STRUCT_FLD_8(u8_t         igmp_maxresp);
-  PACK_STRUCT_FIELD(u16_t        igmp_checksum);
-  PACK_STRUCT_FLD_S(ip4_addr_p_t igmp_group_address);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_IGMP_H */
diff --git a/sys/include/net/prot/ip.h b/sys/include/net/prot/ip.h
deleted file mode 100644
index eb0770c..0000000
--- a/sys/include/net/prot/ip.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file
- * IP protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_IP_H
-#define LWIP_HDR_PROT_IP_H
-
-#include "net/arch.h"
-
-#define IP_PROTO_ICMP    1
-#define IP_PROTO_IGMP    2
-#define IP_PROTO_UDP     17
-#define IP_PROTO_UDPLITE 136
-#define IP_PROTO_TCP     6
-
-/** This operates on a void* by loading the first byte */
-#define IP_HDR_GET_VERSION(ptr)   ((*(u8_t*)(ptr)) >> 4)
-
-#endif /* LWIP_HDR_PROT_IP_H */
diff --git a/sys/include/net/prot/ip4.h b/sys/include/net/prot/ip4.h
deleted file mode 100644
index 9d4a5bd..0000000
--- a/sys/include/net/prot/ip4.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * @file
- * IPv4 protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_IP4_H
-#define LWIP_HDR_PROT_IP4_H
-
-#include "net/arch.h"
-#include "net/ip4_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** This is the packed version of ip4_addr_t,
-    used in network headers that are itself packed */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ip4_addr_packed {
-  PACK_STRUCT_FIELD(u32_t addr);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-typedef struct ip4_addr_packed ip4_addr_p_t;
-
-/* Size of the IPv4 header. Same as 'sizeof(struct ip_hdr)'. */
-#define IP_HLEN 20
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-/* The IPv4 header */
-struct ip_hdr {
-  /* version / header length */
-  PACK_STRUCT_FLD_8(u8_t _v_hl);
-  /* type of service */
-  PACK_STRUCT_FLD_8(u8_t _tos);
-  /* total length */
-  PACK_STRUCT_FIELD(u16_t _len);
-  /* identification */
-  PACK_STRUCT_FIELD(u16_t _id);
-  /* fragment offset field */
-  PACK_STRUCT_FIELD(u16_t _offset);
-#define IP_RF 0x8000U        /* reserved fragment flag */
-#define IP_DF 0x4000U        /* don't fragment flag */
-#define IP_MF 0x2000U        /* more fragments flag */
-#define IP_OFFMASK 0x1fffU   /* mask for fragmenting bits */
-  /* time to live */
-  PACK_STRUCT_FLD_8(u8_t _ttl);
-  /* protocol*/
-  PACK_STRUCT_FLD_8(u8_t _proto);
-  /* checksum */
-  PACK_STRUCT_FIELD(u16_t _chksum);
-  /* source and destination IP addresses */
-  PACK_STRUCT_FLD_S(ip4_addr_p_t src);
-  PACK_STRUCT_FLD_S(ip4_addr_p_t dest);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/* Macros to get struct ip_hdr fields: */
-#define IPH_V(hdr)  ((hdr)->_v_hl >> 4)
-#define IPH_HL(hdr) ((hdr)->_v_hl & 0x0f)
-#define IPH_TOS(hdr) ((hdr)->_tos)
-#define IPH_LEN(hdr) ((hdr)->_len)
-#define IPH_ID(hdr) ((hdr)->_id)
-#define IPH_OFFSET(hdr) ((hdr)->_offset)
-#define IPH_TTL(hdr) ((hdr)->_ttl)
-#define IPH_PROTO(hdr) ((hdr)->_proto)
-#define IPH_CHKSUM(hdr) ((hdr)->_chksum)
-
-/* Macros to set struct ip_hdr fields: */
-#define IPH_VHL_SET(hdr, v, hl) (hdr)->_v_hl = (u8_t)((((v) << 4) | (hl)))
-#define IPH_TOS_SET(hdr, tos) (hdr)->_tos = (tos)
-#define IPH_LEN_SET(hdr, len) (hdr)->_len = (len)
-#define IPH_ID_SET(hdr, id) (hdr)->_id = (id)
-#define IPH_OFFSET_SET(hdr, off) (hdr)->_offset = (off)
-#define IPH_TTL_SET(hdr, ttl) (hdr)->_ttl = (u8_t)(ttl)
-#define IPH_PROTO_SET(hdr, proto) (hdr)->_proto = (u8_t)(proto)
-#define IPH_CHKSUM_SET(hdr, chksum) (hdr)->_chksum = (chksum)
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_IP4_H */
diff --git a/sys/include/net/prot/ip6.h b/sys/include/net/prot/ip6.h
deleted file mode 100644
index 066bdb2..0000000
--- a/sys/include/net/prot/ip6.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * @file
- * IPv6 protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_IP6_H
-#define LWIP_HDR_PROT_IP6_H
-
-#include "lwip/arch.h"
-#include "lwip/ip6_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-   
-/** This is the packed version of ip6_addr_t,
-    used in network headers that are itself packed */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ip6_addr_packed {
-  PACK_STRUCT_FIELD(u32_t addr[4]);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-typedef struct ip6_addr_packed ip6_addr_p_t;
-
-#define IP6_HLEN 40
-
-#define IP6_NEXTH_HOPBYHOP  0
-#define IP6_NEXTH_TCP       6
-#define IP6_NEXTH_UDP       17
-#define IP6_NEXTH_ENCAPS    41
-#define IP6_NEXTH_ROUTING   43
-#define IP6_NEXTH_FRAGMENT  44
-#define IP6_NEXTH_ICMP6     58
-#define IP6_NEXTH_NONE      59
-#define IP6_NEXTH_DESTOPTS  60
-#define IP6_NEXTH_UDPLITE   136
-
-/** The IPv6 header. */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ip6_hdr {
-  /** version / traffic class / flow label */
-  PACK_STRUCT_FIELD(u32_t _v_tc_fl);
-  /** payload length */
-  PACK_STRUCT_FIELD(u16_t _plen);
-  /** next header */
-  PACK_STRUCT_FLD_8(u8_t _nexth);
-  /** hop limit */
-  PACK_STRUCT_FLD_8(u8_t _hoplim);
-  /** source and destination IP addresses */
-  PACK_STRUCT_FLD_S(ip6_addr_p_t src);
-  PACK_STRUCT_FLD_S(ip6_addr_p_t dest);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/* Hop-by-hop router alert option. */
-#define IP6_HBH_HLEN    8
-#define IP6_PAD1_OPTION         0
-#define IP6_PADN_ALERT_OPTION   1
-#define IP6_ROUTER_ALERT_OPTION 5
-#define IP6_ROUTER_ALERT_VALUE_MLD 0
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ip6_hbh_hdr {
-  /* next header */
-  PACK_STRUCT_FLD_8(u8_t _nexth);
-  /* header length */
-  PACK_STRUCT_FLD_8(u8_t _hlen);
-  /* router alert option type */
-  PACK_STRUCT_FLD_8(u8_t _ra_opt_type);
-  /* router alert option data len */
-  PACK_STRUCT_FLD_8(u8_t _ra_opt_dlen);
-  /* router alert option data */
-  PACK_STRUCT_FIELD(u16_t _ra_opt_data);
-  /* PadN option type */
-  PACK_STRUCT_FLD_8(u8_t _padn_opt_type);
-  /* PadN option data len */
-  PACK_STRUCT_FLD_8(u8_t _padn_opt_dlen);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/* Fragment header. */
-#define IP6_FRAG_HLEN    8
-#define IP6_FRAG_OFFSET_MASK    0xfff8
-#define IP6_FRAG_MORE_FLAG      0x0001
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ip6_frag_hdr {
-  /* next header */
-  PACK_STRUCT_FLD_8(u8_t _nexth);
-  /* reserved */
-  PACK_STRUCT_FLD_8(u8_t reserved);
-  /* fragment offset */
-  PACK_STRUCT_FIELD(u16_t _fragment_offset);
-  /* fragmented packet identification */
-  PACK_STRUCT_FIELD(u32_t _identification);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#define IP6H_V(hdr)  ((lwip_ntohl((hdr)->_v_tc_fl) >> 28) & 0x0f)
-#define IP6H_TC(hdr) ((lwip_ntohl((hdr)->_v_tc_fl) >> 20) & 0xff)
-#define IP6H_FL(hdr) (lwip_ntohl((hdr)->_v_tc_fl) & 0x000fffff)
-#define IP6H_PLEN(hdr) (lwip_ntohs((hdr)->_plen))
-#define IP6H_NEXTH(hdr) ((hdr)->_nexth)
-#define IP6H_NEXTH_P(hdr) ((u8_t *)(hdr) + 6)
-#define IP6H_HOPLIM(hdr) ((hdr)->_hoplim)
-
-#define IP6H_VTCFL_SET(hdr, v, tc, fl) (hdr)->_v_tc_fl = (lwip_htonl((((u32_t)(v)) << 28) | (((u32_t)(tc)) << 20) | (fl)))
-#define IP6H_PLEN_SET(hdr, plen) (hdr)->_plen = lwip_htons(plen)
-#define IP6H_NEXTH_SET(hdr, nexth) (hdr)->_nexth = (nexth)
-#define IP6H_HOPLIM_SET(hdr, hl) (hdr)->_hoplim = (u8_t)(hl)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_IP6_H */
diff --git a/sys/include/net/prot/mld6.h b/sys/include/net/prot/mld6.h
deleted file mode 100644
index 8989a57..0000000
--- a/sys/include/net/prot/mld6.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * @file
- * MLD6 protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_MLD6_H
-#define LWIP_HDR_PROT_MLD6_H
-
-#include "lwip/arch.h"
-#include "lwip/prot/ip6.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Multicast listener report/query/done message header. */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct mld_header {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FIELD(u16_t max_resp_delay);
-  PACK_STRUCT_FIELD(u16_t reserved);
-  PACK_STRUCT_FLD_S(ip6_addr_p_t multicast_address);
-  /* Options follow. */
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_MLD6_H */
diff --git a/sys/include/net/prot/nd6.h b/sys/include/net/prot/nd6.h
deleted file mode 100644
index e6999df..0000000
--- a/sys/include/net/prot/nd6.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/**
- * @file
- * ND6 protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_ND6_H
-#define LWIP_HDR_PROT_ND6_H
-
-#include "lwip/arch.h"
-#include "lwip/ip6_addr.h"
-#include "lwip/prot/ip6.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Neighbor solicitation message header. */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ns_header {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FIELD(u32_t reserved);
-  PACK_STRUCT_FLD_S(ip6_addr_p_t target_address);
-  /* Options follow. */
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** Neighbor advertisement message header. */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct na_header {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FLD_8(u8_t flags);
-  PACK_STRUCT_FLD_8(u8_t reserved[3]);
-  PACK_STRUCT_FLD_S(ip6_addr_p_t target_address);
-  /* Options follow. */
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-#define ND6_FLAG_ROUTER      (0x80)
-#define ND6_FLAG_SOLICITED   (0x40)
-#define ND6_FLAG_OVERRIDE    (0x20)
-
-/** Router solicitation message header. */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct rs_header {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FIELD(u32_t reserved);
-  /* Options follow. */
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** Router advertisement message header. */
-#define ND6_RA_FLAG_MANAGED_ADDR_CONFIG (0x80)
-#define ND6_RA_FLAG_OTHER_CONFIG (0x40)
-#define ND6_RA_FLAG_HOME_AGENT (0x20)
-#define ND6_RA_PREFERENCE_MASK (0x18)
-#define ND6_RA_PREFERENCE_HIGH (0x08)
-#define ND6_RA_PREFERENCE_MEDIUM (0x00)
-#define ND6_RA_PREFERENCE_LOW (0x18)
-#define ND6_RA_PREFERENCE_DISABLED (0x10)
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ra_header {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FLD_8(u8_t current_hop_limit);
-  PACK_STRUCT_FLD_8(u8_t flags);
-  PACK_STRUCT_FIELD(u16_t router_lifetime);
-  PACK_STRUCT_FIELD(u32_t reachable_time);
-  PACK_STRUCT_FIELD(u32_t retrans_timer);
-  /* Options follow. */
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** Redirect message header. */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct redirect_header {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FIELD(u32_t reserved);
-  PACK_STRUCT_FLD_S(ip6_addr_p_t target_address);
-  PACK_STRUCT_FLD_S(ip6_addr_p_t destination_address);
-  /* Options follow. */
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** Link-layer address option. */
-#define ND6_OPTION_TYPE_SOURCE_LLADDR (0x01)
-#define ND6_OPTION_TYPE_TARGET_LLADDR (0x02)
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct lladdr_option {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t length);
-  PACK_STRUCT_FLD_8(u8_t addr[NETIF_MAX_HWADDR_LEN]);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** Prefix information option. */
-#define ND6_OPTION_TYPE_PREFIX_INFO (0x03)
-#define ND6_PREFIX_FLAG_ON_LINK (0x80)
-#define ND6_PREFIX_FLAG_AUTONOMOUS (0x40)
-#define ND6_PREFIX_FLAG_ROUTER_ADDRESS (0x20)
-#define ND6_PREFIX_FLAG_SITE_PREFIX (0x10)
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct prefix_option {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t length);
-  PACK_STRUCT_FLD_8(u8_t prefix_length);
-  PACK_STRUCT_FLD_8(u8_t flags);
-  PACK_STRUCT_FIELD(u32_t valid_lifetime);
-  PACK_STRUCT_FIELD(u32_t preferred_lifetime);
-  PACK_STRUCT_FLD_8(u8_t reserved2[3]);
-  PACK_STRUCT_FLD_8(u8_t site_prefix_length);
-  PACK_STRUCT_FLD_S(ip6_addr_p_t prefix);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** Redirected header option. */
-#define ND6_OPTION_TYPE_REDIR_HDR (0x04)
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct redirected_header_option {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t length);
-  PACK_STRUCT_FLD_8(u8_t reserved[6]);
-  /* Portion of redirected packet follows. */
-  /* PACK_STRUCT_FLD_8(u8_t redirected[8]); */
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** MTU option. */
-#define ND6_OPTION_TYPE_MTU (0x05)
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct mtu_option {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t length);
-  PACK_STRUCT_FIELD(u16_t reserved);
-  PACK_STRUCT_FIELD(u32_t mtu);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** Route information option. */
-#define ND6_OPTION_TYPE_ROUTE_INFO (24)
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct route_option {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t length);
-  PACK_STRUCT_FLD_8(u8_t prefix_length);
-  PACK_STRUCT_FLD_8(u8_t preference);
-  PACK_STRUCT_FIELD(u32_t route_lifetime);
-  PACK_STRUCT_FLD_S(ip6_addr_p_t prefix);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/** Recursive DNS Server Option. */
-#if LWIP_ND6_RDNSS_MAX_DNS_SERVERS
-#define LWIP_RDNSS_OPTION_MAX_SERVERS LWIP_ND6_RDNSS_MAX_DNS_SERVERS
-#else
-#define LWIP_RDNSS_OPTION_MAX_SERVERS 1
-#endif
-#define ND6_OPTION_TYPE_RDNSS (25)
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct rdnss_option {
-  PACK_STRUCT_FLD_8(u8_t type);
-  PACK_STRUCT_FLD_8(u8_t length);
-  PACK_STRUCT_FIELD(u16_t reserved);
-  PACK_STRUCT_FIELD(u32_t lifetime);
-  PACK_STRUCT_FLD_S(ip6_addr_p_t rdnss_address[LWIP_RDNSS_OPTION_MAX_SERVERS]);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_ND6_H */
diff --git a/sys/include/net/prot/tcp.h b/sys/include/net/prot/tcp.h
deleted file mode 100644
index 3c4444a..0000000
--- a/sys/include/net/prot/tcp.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * @file
- * TCP protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_TCP_H
-#define LWIP_HDR_PROT_TCP_H
-
-#include "net/arch.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Length of the TCP header, excluding options. */
-#define TCP_HLEN 20
-
-/* Fields are (of course) in network byte order.
- * Some fields are converted to host byte order in tcp_input().
- */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct tcp_hdr {
-  PACK_STRUCT_FIELD(u16_t src);
-  PACK_STRUCT_FIELD(u16_t dest);
-  PACK_STRUCT_FIELD(u32_t seqno);
-  PACK_STRUCT_FIELD(u32_t ackno);
-  PACK_STRUCT_FIELD(u16_t _hdrlen_rsvd_flags);
-  PACK_STRUCT_FIELD(u16_t wnd);
-  PACK_STRUCT_FIELD(u16_t chksum);
-  PACK_STRUCT_FIELD(u16_t urgp);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/* TCP header flags bits */
-#define TCP_FIN 0x01U
-#define TCP_SYN 0x02U
-#define TCP_RST 0x04U
-#define TCP_PSH 0x08U
-#define TCP_ACK 0x10U
-#define TCP_URG 0x20U
-#define TCP_ECE 0x40U
-#define TCP_CWR 0x80U
-/* Valid TCP header flags */
-#define TCP_FLAGS 0x3fU
-
-#define TCPH_HDRLEN(phdr) ((u16_t)(lwip_ntohs((phdr)->_hdrlen_rsvd_flags) >> 12))
-#define TCPH_FLAGS(phdr)  ((u16_t)(lwip_ntohs((phdr)->_hdrlen_rsvd_flags) & TCP_FLAGS))
-
-#define TCPH_HDRLEN_SET(phdr, len) (phdr)->_hdrlen_rsvd_flags = lwip_htons(((len) << 12) | TCPH_FLAGS(phdr))
-#define TCPH_FLAGS_SET(phdr, flags) (phdr)->_hdrlen_rsvd_flags = (((phdr)->_hdrlen_rsvd_flags & PP_HTONS(~TCP_FLAGS)) | lwip_htons(flags))
-#define TCPH_HDRLEN_FLAGS_SET(phdr, len, flags) (phdr)->_hdrlen_rsvd_flags = (u16_t)(lwip_htons((u16_t)((len) << 12) | (flags)))
-
-#define TCPH_SET_FLAG(phdr, flags ) (phdr)->_hdrlen_rsvd_flags = ((phdr)->_hdrlen_rsvd_flags | lwip_htons(flags))
-#define TCPH_UNSET_FLAG(phdr, flags) (phdr)->_hdrlen_rsvd_flags = ((phdr)->_hdrlen_rsvd_flags & ~lwip_htons(flags))
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_TCP_H */
diff --git a/sys/include/net/prot/udp.h b/sys/include/net/prot/udp.h
deleted file mode 100644
index 2b1d8b5..0000000
--- a/sys/include/net/prot/udp.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * @file
- * UDP protocol definitions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_PROT_UDP_H
-#define LWIP_HDR_PROT_UDP_H
-
-#include "net/arch.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UDP_HLEN 8
-
-/* Fields are (of course) in network byte order. */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct udp_hdr {
-  PACK_STRUCT_FIELD(u16_t src);
-  PACK_STRUCT_FIELD(u16_t dest);  /* src/dest UDP ports */
-  PACK_STRUCT_FIELD(u16_t len);
-  PACK_STRUCT_FIELD(u16_t chksum);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_PROT_UDP_H */
diff --git a/sys/include/net/raw.h b/sys/include/net/raw.h
deleted file mode 100644
index 5ced3e1..0000000
--- a/sys/include/net/raw.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file
- * raw API (to be used from TCPIP thread)\n
- * See also @ref raw_raw
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_RAW_H
-#define LWIP_HDR_RAW_H
-
-#include "net/opt.h"
-
-#if LWIP_RAW /* don't build if not configured for use in lwipopts.h */
-
-#include "net/pbuf.h"
-#include "net/def.h"
-#include "net/ip.h"
-#include "net/ip_addr.h"
-#include "net/ip6_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct raw_pcb;
-
-/** Function prototype for raw pcb receive callback functions.
- * @param arg user supplied argument (raw_pcb.recv_arg)
- * @param pcb the raw_pcb which received data
- * @param p the packet buffer that was received
- * @param addr the remote IP address from which the packet was received
- * @return 1 if the packet was 'eaten' (aka. deleted),
- *         0 if the packet lives on
- * If returning 1, the callback is responsible for freeing the pbuf
- * if it's not used any more.
- */
-typedef u8_t (*raw_recv_fn)(void *arg, struct raw_pcb *pcb, struct pbuf *p,
-    const ip_addr_t *addr);
-
-/** the RAW protocol control block */
-struct raw_pcb {
-  /* Common members of all PCB types */
-  IP_PCB;
-
-  struct raw_pcb *next;
-
-  u8_t protocol;
-
-  /** receive callback function */
-  raw_recv_fn recv;
-  /* user-supplied argument for the recv callback */
-  void *recv_arg;
-#if LWIP_IPV6
-  /* fields for handling checksum computations as per RFC3542. */
-  u16_t chksum_offset;
-  u8_t  chksum_reqd;
-#endif
-};
-
-/* The following functions is the application layer interface to the
-   RAW code. */
-struct raw_pcb * raw_new        (u8_t proto);
-struct raw_pcb * raw_new_ip_type(u8_t type, u8_t proto);
-void             raw_remove     (struct raw_pcb *pcb);
-err_t            raw_bind       (struct raw_pcb *pcb, const ip_addr_t *ipaddr);
-err_t            raw_connect    (struct raw_pcb *pcb, const ip_addr_t *ipaddr);
-
-err_t            raw_sendto     (struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *ipaddr);
-err_t            raw_send       (struct raw_pcb *pcb, struct pbuf *p);
-
-void             raw_recv       (struct raw_pcb *pcb, raw_recv_fn recv, void *recv_arg);
-
-/* The following functions are the lower layer interface to RAW. */
-u8_t             raw_input      (struct pbuf *p, struct netif *inp);
-#define raw_init() /* Compatibility define, no init needed. */
-
-void raw_netif_ip_addr_changed(const ip_addr_t* old_addr, const ip_addr_t* new_addr);
-
-/* for compatibility with older implementation */
-#define raw_new_ip6(proto) raw_new_ip_type(IPADDR_TYPE_V6, proto)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_RAW */
-
-#endif /* LWIP_HDR_RAW_H */
diff --git a/sys/include/net/sio.h b/sys/include/net/sio.h
deleted file mode 100644
index fff6d25..0000000
--- a/sys/include/net/sio.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- */
-
-/*
- * This is the interface to the platform specific serial IO module
- * It needs to be implemented by those platforms which need SLIP or PPP
- */
-
-#ifndef SIO_H
-#define SIO_H
-
-#include "net/arch.h"
-#include "net/opt.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* If you want to define sio_fd_t elsewhere or differently,
-   define this in your cc.h file. */
-#ifndef __sio_fd_t_defined
-typedef void * sio_fd_t;
-#endif
-
-/* The following functions can be defined to something else in your cc.h file
-   or be implemented in your custom sio.c file. */
-
-#ifndef sio_open
-/**
- * Opens a serial device for communication.
- *
- * @param devnum device number
- * @return handle to serial device if successful, NULL otherwise
- */
-sio_fd_t sio_open(u8_t devnum);
-#endif
-
-#ifndef sio_send
-/**
- * Sends a single character to the serial device.
- *
- * @param c character to send
- * @param fd serial device handle
- *
- * @note This function will block until the character can be sent.
- */
-void sio_send(u8_t c, sio_fd_t fd);
-#endif
-
-#ifndef sio_recv
-/**
- * Receives a single character from the serial device.
- *
- * @param fd serial device handle
- *
- * @note This function will block until a character is received.
- */
-u8_t sio_recv(sio_fd_t fd);
-#endif
-
-#ifndef sio_read
-/**
- * Reads from the serial device.
- *
- * @param fd serial device handle
- * @param data pointer to data buffer for receiving
- * @param len maximum length (in bytes) of data to receive
- * @return number of bytes actually received - may be 0 if aborted by sio_read_abort
- *
- * @note This function will block until data can be received. The blocking
- * can be cancelled by calling sio_read_abort().
- */
-u32_t sio_read(sio_fd_t fd, u8_t *data, u32_t len);
-#endif
-
-#ifndef sio_tryread
-/**
- * Tries to read from the serial device. Same as sio_read but returns
- * immediately if no data is available and never blocks.
- *
- * @param fd serial device handle
- * @param data pointer to data buffer for receiving
- * @param len maximum length (in bytes) of data to receive
- * @return number of bytes actually received
- */
-u32_t sio_tryread(sio_fd_t fd, u8_t *data, u32_t len);
-#endif
-
-#ifndef sio_write
-/**
- * Writes to the serial device.
- *
- * @param fd serial device handle
- * @param data pointer to data to send
- * @param len length (in bytes) of data to send
- * @return number of bytes actually sent
- *
- * @note This function will block until all data can be sent.
- */
-u32_t sio_write(sio_fd_t fd, u8_t *data, u32_t len);
-#endif
-
-#ifndef sio_read_abort
-/**
- * Aborts a blocking sio_read() call.
- *
- * @param fd serial device handle
- */
-void sio_read_abort(sio_fd_t fd);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* SIO_H */
diff --git a/sys/include/net/snmp.h b/sys/include/net/snmp.h
deleted file mode 100644
index ba2dd54..0000000
--- a/sys/include/net/snmp.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * @file
- * SNMP support API for implementing netifs and statitics for MIB2
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Dirk Ziegelmeier <dziegel@gmx.de>
- *
- */
-#ifndef LWIP_HDR_SNMP_H
-#define LWIP_HDR_SNMP_H
-
-#include "net/opt.h"
-#include "net/ip_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct udp_pcb;
-struct netif;
-
-/**
- * @defgroup netif_mib2 MIB2 statistics
- * @ingroup netif
- */
-
-/* MIB2 statistics functions */
-#if MIB2_STATS  /* don't build if not configured for use in lwipopts.h */
-/**
- * @ingroup netif_mib2
- * @see RFC1213, "MIB-II, 6. Definitions"
- */
-enum snmp_ifType {
-  snmp_ifType_other=1,                /* none of the following */
-  snmp_ifType_regular1822,
-  snmp_ifType_hdh1822,
-  snmp_ifType_ddn_x25,
-  snmp_ifType_rfc877_x25,
-  snmp_ifType_ethernet_csmacd,
-  snmp_ifType_iso88023_csmacd,
-  snmp_ifType_iso88024_tokenBus,
-  snmp_ifType_iso88025_tokenRing,
-  snmp_ifType_iso88026_man,
-  snmp_ifType_starLan,
-  snmp_ifType_proteon_10Mbit,
-  snmp_ifType_proteon_80Mbit,
-  snmp_ifType_hyperchannel,
-  snmp_ifType_fddi,
-  snmp_ifType_lapb,
-  snmp_ifType_sdlc,
-  snmp_ifType_ds1,                    /* T-1 */
-  snmp_ifType_e1,                     /* european equiv. of T-1 */
-  snmp_ifType_basicISDN,
-  snmp_ifType_primaryISDN,            /* proprietary serial */
-  snmp_ifType_propPointToPointSerial,
-  snmp_ifType_ppp,
-  snmp_ifType_softwareLoopback,
-  snmp_ifType_eon,                    /* CLNP over IP [11] */
-  snmp_ifType_ethernet_3Mbit,
-  snmp_ifType_nsip,                   /* XNS over IP */
-  snmp_ifType_slip,                   /* generic SLIP */
-  snmp_ifType_ultra,                  /* ULTRA technologies */
-  snmp_ifType_ds3,                    /* T-3 */
-  snmp_ifType_sip,                    /* SMDS */
-  snmp_ifType_frame_relay
-};
-
-/** This macro has a precision of ~49 days because sys_now returns u32_t. \#define your own if you want ~490 days. */
-#ifndef MIB2_COPY_SYSUPTIME_TO
-#define MIB2_COPY_SYSUPTIME_TO(ptrToVal) (*(ptrToVal) = (sys_now() / 10))
-#endif
-
-/**
- * @ingroup netif_mib2
- * Increment stats member for SNMP MIB2 stats (struct stats_mib2_netif_ctrs)
- */
-#define MIB2_STATS_NETIF_INC(n, x)      do { ++(n)->mib2_counters.x; } while(0)
-/**
- * @ingroup netif_mib2
- * Add value to stats member for SNMP MIB2 stats (struct stats_mib2_netif_ctrs)
- */
-#define MIB2_STATS_NETIF_ADD(n, x, val) do { (n)->mib2_counters.x += (val); } while(0)
-
-/**
- * @ingroup netif_mib2
- * Init MIB2 statistic counters in netif
- * @param netif Netif to init
- * @param type one of enum @ref snmp_ifType
- * @param speed your link speed here (units: bits per second)
- */
-#define MIB2_INIT_NETIF(netif, type, speed) do { \
-  (netif)->link_type = (type);  \
-  (netif)->link_speed = (speed);\
-  (netif)->ts = 0;              \
-  (netif)->mib2_counters.ifinoctets = 0;      \
-  (netif)->mib2_counters.ifinucastpkts = 0;   \
-  (netif)->mib2_counters.ifinnucastpkts = 0;  \
-  (netif)->mib2_counters.ifindiscards = 0;    \
-  (netif)->mib2_counters.ifinerrors = 0;    \
-  (netif)->mib2_counters.ifinunknownprotos = 0;    \
-  (netif)->mib2_counters.ifoutoctets = 0;     \
-  (netif)->mib2_counters.ifoutucastpkts = 0;  \
-  (netif)->mib2_counters.ifoutnucastpkts = 0; \
-  (netif)->mib2_counters.ifoutdiscards = 0; \
-  (netif)->mib2_counters.ifouterrors = 0; } while(0)
-#else /* MIB2_STATS */
-#ifndef MIB2_COPY_SYSUPTIME_TO
-#define MIB2_COPY_SYSUPTIME_TO(ptrToVal)
-#endif
-#define MIB2_INIT_NETIF(netif, type, speed)
-#define MIB2_STATS_NETIF_INC(n, x)
-#define MIB2_STATS_NETIF_ADD(n, x, val)
-#endif /* MIB2_STATS */
-
-/* LWIP MIB2 callbacks */
-#if LWIP_MIB2_CALLBACKS /* don't build if not configured for use in lwipopts.h */
-/* network interface */
-void mib2_netif_added(struct netif *ni);
-void mib2_netif_removed(struct netif *ni);
-
-#if LWIP_IPV4 && LWIP_ARP
-/* ARP (for atTable and ipNetToMediaTable) */
-void mib2_add_arp_entry(struct netif *ni, ip4_addr_t *ip);
-void mib2_remove_arp_entry(struct netif *ni, ip4_addr_t *ip);
-#else /* LWIP_IPV4 && LWIP_ARP */
-#define mib2_add_arp_entry(ni,ip)
-#define mib2_remove_arp_entry(ni,ip)
-#endif /* LWIP_IPV4 && LWIP_ARP */
-
-/* IP */
-#if LWIP_IPV4
-void mib2_add_ip4(struct netif *ni);
-void mib2_remove_ip4(struct netif *ni);
-void mib2_add_route_ip4(u8_t dflt, struct netif *ni);
-void mib2_remove_route_ip4(u8_t dflt, struct netif *ni);
-#endif /* LWIP_IPV4 */
-
-/* UDP */
-#if LWIP_UDP
-void mib2_udp_bind(struct udp_pcb *pcb);
-void mib2_udp_unbind(struct udp_pcb *pcb);
-#endif /* LWIP_UDP */
-
-#else /* LWIP_MIB2_CALLBACKS */
-/* LWIP_MIB2_CALLBACKS support not available */
-/* define everything to be empty */
-
-/* network interface */
-#define mib2_netif_added(ni)
-#define mib2_netif_removed(ni)
-
-/* ARP */
-#define mib2_add_arp_entry(ni,ip)
-#define mib2_remove_arp_entry(ni,ip)
-
-/* IP */
-#define mib2_add_ip4(ni)
-#define mib2_remove_ip4(ni)
-#define mib2_add_route_ip4(dflt, ni)
-#define mib2_remove_route_ip4(dflt, ni)
-
-/* UDP */
-#define mib2_udp_bind(pcb)
-#define mib2_udp_unbind(pcb)
-#endif /* LWIP_MIB2_CALLBACKS */
-
-/* for source-code compatibility reasons only, can be removed (not used internally) */
-#define NETIF_INIT_SNMP                MIB2_INIT_NETIF
-#define snmp_add_ifinoctets(ni,value)  MIB2_STATS_NETIF_ADD(ni, ifinoctets, value)
-#define snmp_inc_ifinucastpkts(ni)     MIB2_STATS_NETIF_INC(ni, ifinucastpkts)
-#define snmp_inc_ifinnucastpkts(ni)    MIB2_STATS_NETIF_INC(ni, ifinnucastpkts)
-#define snmp_inc_ifindiscards(ni)      MIB2_STATS_NETIF_INC(ni, ifindiscards)
-#define snmp_inc_ifinerrors(ni)        MIB2_STATS_NETIF_INC(ni, ifinerrors)
-#define snmp_inc_ifinunknownprotos(ni) MIB2_STATS_NETIF_INC(ni, ifinunknownprotos)
-#define snmp_add_ifoutoctets(ni,value) MIB2_STATS_NETIF_ADD(ni, ifoutoctets, value)
-#define snmp_inc_ifoutucastpkts(ni)    MIB2_STATS_NETIF_INC(ni, ifoutucastpkts)
-#define snmp_inc_ifoutnucastpkts(ni)   MIB2_STATS_NETIF_INC(ni, ifoutnucastpkts)
-#define snmp_inc_ifoutdiscards(ni)     MIB2_STATS_NETIF_INC(ni, ifoutdiscards)
-#define snmp_inc_ifouterrors(ni)       MIB2_STATS_NETIF_INC(ni, ifouterrors)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_SNMP_H */
diff --git a/sys/include/net/sockets.h b/sys/include/net/sockets.h
deleted file mode 100644
index a094de2..0000000
--- a/sys/include/net/sockets.h
+++ /dev/null
@@ -1,592 +0,0 @@
-/**
- * @file
- * Socket API (to be used from non-TCPIP threads)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-
-#ifndef LWIP_HDR_SOCKETS_H
-#define LWIP_HDR_SOCKETS_H
-
-#include <net/opt.h>
-
-#if LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
-
-#include <net/ip_addr.h>
-#include <net/err.h>
-#include <net/inet.h>
-#include <net/errno.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* If your port already typedef's sa_family_t, define SA_FAMILY_T_DEFINED
-   to prevent this code from redefining it. */
-#if !defined(sa_family_t) && !defined(SA_FAMILY_T_DEFINED)
-typedef u8_t sa_family_t;
-#endif
-/* If your port already typedef's in_port_t, define IN_PORT_T_DEFINED
-   to prevent this code from redefining it. */
-#if !defined(in_port_t) && !defined(IN_PORT_T_DEFINED)
-typedef u16_t in_port_t;
-#endif
-
-#if LWIP_IPV4
-/* members are in network byte order */
-struct sockaddr_in {
-  u8_t            sin_len;
-  sa_family_t     sin_family;
-  in_port_t       sin_port;
-  struct in_addr  sin_addr;
-#define SIN_ZERO_LEN 8
-  char            sin_zero[SIN_ZERO_LEN];
-};
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-struct sockaddr_in6 {
-  u8_t            sin6_len;      /* length of this structure    */
-  sa_family_t     sin6_family;   /* AF_INET6                    */
-  in_port_t       sin6_port;     /* Transport layer port #      */
-  u32_t           sin6_flowinfo; /* IPv6 flow information       */
-  struct in6_addr sin6_addr;     /* IPv6 address                */
-  u32_t           sin6_scope_id; /* Set of interfaces for scope */
-};
-#endif /* LWIP_IPV6 */
-
-struct sockaddr {
-  u8_t        sa_len;
-  sa_family_t sa_family;
-  char        sa_data[14];
-};
-
-struct sockaddr_storage {
-  u8_t        s2_len;
-  sa_family_t ss_family;
-  char        s2_data1[2];
-  u32_t       s2_data2[3];
-#if LWIP_IPV6
-  u32_t       s2_data3[3];
-#endif /* LWIP_IPV6 */
-};
-
-/* If your port already typedef's socklen_t, define SOCKLEN_T_DEFINED
-   to prevent this code from redefining it. */
-#if !defined(socklen_t) && !defined(SOCKLEN_T_DEFINED)
-typedef u32_t socklen_t;
-#endif
-
-struct lwip_sock;
-
-#if !LWIP_TCPIP_CORE_LOCKING
-/** Maximum optlen used by setsockopt/getsockopt */
-#define LWIP_SETGETSOCKOPT_MAXOPTLEN 16
-
-/** This struct is used to pass data to the set/getsockopt_internal
- * functions running in tcpip_thread context (only a void* is allowed) */
-struct lwip_setgetsockopt_data {
-  /** socket index for which to change options */
-  int s;
-  /** level of the option to process */
-  int level;
-  /** name of the option to process */
-  int optname;
-  /** set: value to set the option to
-    * get: value of the option is stored here */
-#if LWIP_MPU_COMPATIBLE
-  u8_t optval[LWIP_SETGETSOCKOPT_MAXOPTLEN];
-#else
-  union {
-     void *p;
-     const void *pc;
-  } optval;
-#endif
-  /** size of *optval */
-  socklen_t optlen;
-  /** if an error occurs, it is temporarily stored here */
-  err_t err;
-  /** semaphore to wake up the calling task */
-  void* completed_sem;
-};
-#endif /* !LWIP_TCPIP_CORE_LOCKING */
-
-#if !defined(iovec)
-struct iovec {
-  void  *iov_base;
-  size_t iov_len;
-};
-#endif
-
-struct msghdr {
-  void         *msg_name;
-  socklen_t     msg_namelen;
-  struct iovec *msg_iov;
-  int           msg_iovlen;
-  void         *msg_control;
-  socklen_t     msg_controllen;
-  int           msg_flags;
-};
-
-/* Socket protocol types (TCP/UDP/RAW) */
-#define SOCK_STREAM     1
-#define SOCK_DGRAM      2
-#define SOCK_RAW        3
-
-/*
- * Option flags per-socket. These must match the SOF_ flags in ip.h (checked in init.c)
- */
-#define SO_REUSEADDR   0x0004 /* Allow local address reuse */
-#define SO_KEEPALIVE   0x0008 /* keep connections alive */
-#define SO_BROADCAST   0x0020 /* permit to send and to receive broadcast messages (see IP_SOF_BROADCAST option) */
-
-
-/*
- * Additional options, not kept in so_options.
- */
-#define SO_DEBUG       0x0001 /* Unimplemented: turn on debugging info recording */
-#define SO_ACCEPTCONN  0x0002 /* socket has had listen() */
-#define SO_DONTROUTE   0x0010 /* Unimplemented: just use interface addresses */
-#define SO_USELOOPBACK 0x0040 /* Unimplemented: bypass hardware when possible */
-#define SO_LINGER      0x0080 /* linger on close if data present */
-#define SO_DONTLINGER  ((int)(~SO_LINGER))
-#define SO_OOBINLINE   0x0100 /* Unimplemented: leave received OOB data in line */
-#define SO_REUSEPORT   0x0200 /* Unimplemented: allow local address & port reuse */
-#define SO_SNDBUF      0x1001 /* Unimplemented: send buffer size */
-#define SO_RCVBUF      0x1002 /* receive buffer size */
-#define SO_SNDLOWAT    0x1003 /* Unimplemented: send low-water mark */
-#define SO_RCVLOWAT    0x1004 /* Unimplemented: receive low-water mark */
-#define SO_SNDTIMEO    0x1005 /* send timeout */
-#define SO_RCVTIMEO    0x1006 /* receive timeout */
-#define SO_ERROR       0x1007 /* get error status and clear */
-#define SO_TYPE        0x1008 /* get socket type */
-#define SO_CONTIMEO    0x1009 /* Unimplemented: connect timeout */
-#define SO_NO_CHECK    0x100a /* don't create UDP checksum */
-
-
-/*
- * Structure used for manipulating linger option.
- */
-struct linger {
-       int l_onoff;                /* option on/off */
-       int l_linger;               /* linger time in seconds */
-};
-
-/*
- * Level number for (get/set)sockopt() to apply to socket itself.
- */
-#define  SOL_SOCKET  0xfff    /* options for socket level */
-
-
-#define AF_UNSPEC       0
-#define AF_INET         2
-#if LWIP_IPV6
-#define AF_INET6        10
-#else /* LWIP_IPV6 */
-#define AF_INET6        AF_UNSPEC
-#endif /* LWIP_IPV6 */
-#define PF_INET         AF_INET
-#define PF_INET6        AF_INET6
-#define PF_UNSPEC       AF_UNSPEC
-
-#define IPPROTO_IP      0
-#define IPPROTO_ICMP    1
-#define IPPROTO_TCP     6
-#define IPPROTO_UDP     17
-#if LWIP_IPV6
-#define IPPROTO_IPV6    41
-#define IPPROTO_ICMPV6  58
-#endif /* LWIP_IPV6 */
-#define IPPROTO_UDPLITE 136
-#define IPPROTO_RAW     255
-
-/* Flags we can use with send and recv. */
-#define MSG_PEEK       0x01    /* Peeks at an incoming message */
-#define MSG_WAITALL    0x02    /* Unimplemented: Requests that the function block until the full amount of data requested can be returned */
-#define MSG_OOB        0x04    /* Unimplemented: Requests out-of-band data. The significance and semantics of out-of-band data are protocol-specific */
-#define MSG_DONTWAIT   0x08    /* Nonblocking i/o for this operation only */
-#define MSG_MORE       0x10    /* Sender will send more */
-
-
-/*
- * Options for level IPPROTO_IP
- */
-#define IP_TOS             1
-#define IP_TTL             2
-
-#if LWIP_TCP
-/*
- * Options for level IPPROTO_TCP
- */
-#define TCP_NODELAY    0x01    /* don't delay send to coalesce packets */
-#define TCP_KEEPALIVE  0x02    /* send KEEPALIVE probes when idle for pcb->keep_idle milliseconds */
-#define TCP_KEEPIDLE   0x03    /* set pcb->keep_idle  - Same as TCP_KEEPALIVE, but use seconds for get/setsockopt */
-#define TCP_KEEPINTVL  0x04    /* set pcb->keep_intvl - Use seconds for get/setsockopt */
-#define TCP_KEEPCNT    0x05    /* set pcb->keep_cnt   - Use number of probes sent for get/setsockopt */
-#endif /* LWIP_TCP */
-
-#if LWIP_IPV6
-/*
- * Options for level IPPROTO_IPV6
- */
-#define IPV6_CHECKSUM       7  /* RFC3542: calculate and insert the ICMPv6 checksum for raw sockets. */
-#define IPV6_V6ONLY         27 /* RFC3493: boolean control to restrict AF_INET6 sockets to IPv6 communications only. */
-#endif /* LWIP_IPV6 */
-
-#if LWIP_UDP && LWIP_UDPLITE
-/*
- * Options for level IPPROTO_UDPLITE
- */
-#define UDPLITE_SEND_CSCOV 0x01 /* sender checksum coverage */
-#define UDPLITE_RECV_CSCOV 0x02 /* minimal receiver checksum coverage */
-#endif /* LWIP_UDP && LWIP_UDPLITE*/
-
-
-#if LWIP_MULTICAST_TX_OPTIONS
-/*
- * Options and types for UDP multicast traffic handling
- */
-#define IP_MULTICAST_TTL   5
-#define IP_MULTICAST_IF    6
-#define IP_MULTICAST_LOOP  7
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-
-#if LWIP_IGMP
-/*
- * Options and types related to multicast membership
- */
-#define IP_ADD_MEMBERSHIP  3
-#define IP_DROP_MEMBERSHIP 4
-
-typedef struct ip_mreq {
-    struct in_addr imr_multiaddr; /* IP multicast address of group */
-    struct in_addr imr_interface; /* local IP address of interface */
-} ip_mreq;
-#endif /* LWIP_IGMP */
-
-/*
- * The Type of Service provides an indication of the abstract
- * parameters of the quality of service desired.  These parameters are
- * to be used to guide the selection of the actual service parameters
- * when transmitting a datagram through a particular network.  Several
- * networks offer service precedence, which somehow treats high
- * precedence traffic as more important than other traffic (generally
- * by accepting only traffic above a certain precedence at time of high
- * load).  The major choice is a three way tradeoff between low-delay,
- * high-reliability, and high-throughput.
- * The use of the Delay, Throughput, and Reliability indications may
- * increase the cost (in some sense) of the service.  In many networks
- * better performance for one of these parameters is coupled with worse
- * performance on another.  Except for very unusual cases at most two
- * of these three indications should be set.
- */
-#define IPTOS_TOS_MASK          0x1E
-#define IPTOS_TOS(tos)          ((tos) & IPTOS_TOS_MASK)
-#define IPTOS_LOWDELAY          0x10
-#define IPTOS_THROUGHPUT        0x08
-#define IPTOS_RELIABILITY       0x04
-#define IPTOS_LOWCOST           0x02
-#define IPTOS_MINCOST           IPTOS_LOWCOST
-
-/*
- * The Network Control precedence designation is intended to be used
- * within a network only.  The actual use and control of that
- * designation is up to each network. The Internetwork Control
- * designation is intended for use by gateway control originators only.
- * If the actual use of these precedence designations is of concern to
- * a particular network, it is the responsibility of that network to
- * control the access to, and use of, those precedence designations.
- */
-#define IPTOS_PREC_MASK                 0xe0
-#define IPTOS_PREC(tos)                ((tos) & IPTOS_PREC_MASK)
-#define IPTOS_PREC_NETCONTROL           0xe0
-#define IPTOS_PREC_INTERNETCONTROL      0xc0
-#define IPTOS_PREC_CRITIC_ECP           0xa0
-#define IPTOS_PREC_FLASHOVERRIDE        0x80
-#define IPTOS_PREC_FLASH                0x60
-#define IPTOS_PREC_IMMEDIATE            0x40
-#define IPTOS_PREC_PRIORITY             0x20
-#define IPTOS_PREC_ROUTINE              0x00
-
-
-/*
- * Commands for ioctlsocket(),  taken from the BSD file fcntl.h.
- * lwip_ioctl only supports FIONREAD and FIONBIO, for now
- *
- * Ioctl's have the command encoded in the lower word,
- * and the size of any in or out parameters in the upper
- * word.  The high 2 bits of the upper word are used
- * to encode the in/out status of the parameter; for now
- * we restrict parameters to at most 128 bytes.
- */
-#if !defined(FIONREAD) || !defined(FIONBIO)
-#define IOCPARM_MASK    0x7fU           /* parameters must be < 128 bytes */
-#define IOC_VOID        0x20000000UL    /* no parameters */
-#define IOC_OUT         0x40000000UL    /* copy out parameters */
-#define IOC_IN          0x80000000UL    /* copy in parameters */
-#define IOC_INOUT       (IOC_IN|IOC_OUT)
-                                        /* 0x20000000 distinguishes new &
-                                           old ioctl's */
-#define _IO(x,y)        (IOC_VOID|((x)<<8)|(y))
-
-#define _IOR(x,y,t)     (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-
-#define _IOW(x,y,t)     (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-#endif /* !defined(FIONREAD) || !defined(FIONBIO) */
-
-#ifndef FIONREAD
-#define FIONREAD    _IOR('f', 127, unsigned long) /* get # bytes to read */
-#endif
-#ifndef FIONBIO
-#define FIONBIO     _IOW('f', 126, unsigned long) /* set/clear non-blocking i/o */
-#endif
-
-/* Socket I/O Controls: unimplemented */
-#ifndef SIOCSHIWAT
-#define SIOCSHIWAT  _IOW('s',  0, unsigned long)  /* set high watermark */
-#define SIOCGHIWAT  _IOR('s',  1, unsigned long)  /* get high watermark */
-#define SIOCSLOWAT  _IOW('s',  2, unsigned long)  /* set low watermark */
-#define SIOCGLOWAT  _IOR('s',  3, unsigned long)  /* get low watermark */
-#define SIOCATMARK  _IOR('s',  7, unsigned long)  /* at oob mark? */
-#endif
-
-/* commands for fnctl */
-#ifndef F_GETFL
-#define F_GETFL 3
-#endif
-#ifndef F_SETFL
-#define F_SETFL 4
-#endif
-
-/* File status flags and file access modes for fnctl,
-   these are bits in an int. */
-#ifndef O_NONBLOCK
-#define O_NONBLOCK  1 /* nonblocking I/O */
-#endif
-#ifndef O_NDELAY
-#define O_NDELAY    1 /* same as O_NONBLOCK, for compatibility */
-#endif
-
-#ifndef SHUT_RD
-  #define SHUT_RD   0
-  #define SHUT_WR   1
-  #define SHUT_RDWR 2
-#endif
-
-/* FD_SET used for lwip_select */
-#ifndef FD_SET
-#undef  FD_SETSIZE
-/* Make FD_SETSIZE match NUM_SOCKETS in socket.c */
-#define FD_SETSIZE    MEMP_NUM_NETCONN
-#define FDSETSAFESET(n, code) do { \
-  if (((n) - LWIP_SOCKET_OFFSET < MEMP_NUM_NETCONN) && (((int)(n) - LWIP_SOCKET_OFFSET) >= 0)) { \
-  code; }} while(0)
-#define FDSETSAFEGET(n, code) (((n) - LWIP_SOCKET_OFFSET < MEMP_NUM_NETCONN) && (((int)(n) - LWIP_SOCKET_OFFSET) >= 0) ?\
-  (code) : 0)
-#define FD_SET(n, p)  FDSETSAFESET(n, (p)->fd_bits[((n)-LWIP_SOCKET_OFFSET)/8] |=  (1 << (((n)-LWIP_SOCKET_OFFSET) & 7)))
-#define FD_CLR(n, p)  FDSETSAFESET(n, (p)->fd_bits[((n)-LWIP_SOCKET_OFFSET)/8] &= ~(1 << (((n)-LWIP_SOCKET_OFFSET) & 7)))
-#define FD_ISSET(n,p) FDSETSAFEGET(n, (p)->fd_bits[((n)-LWIP_SOCKET_OFFSET)/8] &   (1 << (((n)-LWIP_SOCKET_OFFSET) & 7)))
-#define FD_ZERO(p)    memset((void*)(p), 0, sizeof(*(p)))
-
-typedef struct fd_set
-{
-  unsigned char fd_bits [(FD_SETSIZE+7)/8];
-} fd_set;
-
-#elif LWIP_SOCKET_OFFSET
-#error LWIP_SOCKET_OFFSET does not work with external FD_SET!
-#elif FD_SETSIZE < MEMP_NUM_NETCONN
-#error "external FD_SETSIZE too small for number of sockets"
-#endif /* FD_SET */
-
-/** LWIP_TIMEVAL_PRIVATE: if you want to use the struct timeval provided
- * by your system, set this to 0 and include <sys/time.h> in cc.h */
-#ifndef LWIP_TIMEVAL_PRIVATE
-#define LWIP_TIMEVAL_PRIVATE 1
-#endif
-
-#if LWIP_TIMEVAL_PRIVATE
-struct timeval {
-  long    tv_sec;         /* seconds */
-  long    tv_usec;        /* and microseconds */
-};
-#endif /* LWIP_TIMEVAL_PRIVATE */
-
-#define lwip_socket_init() /* Compatibility define, no init needed. */
-void lwip_socket_thread_init(void); /* LWIP_NETCONN_SEM_PER_THREAD==1: initialize thread-local semaphore */
-void lwip_socket_thread_cleanup(void); /* LWIP_NETCONN_SEM_PER_THREAD==1: destroy thread-local semaphore */
-
-#if LWIP_COMPAT_SOCKETS == 2
-/* This helps code parsers/code completion by not having the COMPAT functions as defines */
-#define lwip_accept       accept
-#define lwip_bind         bind
-#define lwip_shutdown     shutdown
-#define lwip_getpeername  getpeername
-#define lwip_getsockname  getsockname
-#define lwip_setsockopt   setsockopt
-#define lwip_getsockopt   getsockopt
-#define lwip_close        closesocket
-#define lwip_connect      connect
-#define lwip_listen       listen
-#define lwip_recv         recv
-#define lwip_recvfrom     recvfrom
-#define lwip_send         send
-#define lwip_sendmsg      sendmsg
-#define lwip_sendto       sendto
-#define lwip_socket       socket
-#define lwip_select       select
-#define lwip_ioctlsocket  ioctl
-
-#if LWIP_POSIX_SOCKETS_IO_NAMES
-#define lwip_read         read
-#define lwip_write        write
-#define lwip_writev       writev
-#undef lwip_close
-#define lwip_close        close
-#define closesocket(s)    close(s)
-#define lwip_fcntl        fcntl
-#define lwip_ioctl        ioctl
-#endif /* LWIP_POSIX_SOCKETS_IO_NAMES */
-#endif /* LWIP_COMPAT_SOCKETS == 2 */
-
-int lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen);
-int lwip_bind(int s, const struct sockaddr *name, socklen_t namelen);
-int lwip_shutdown(int s, int how);
-int lwip_getpeername (int s, struct sockaddr *name, socklen_t *namelen);
-int lwip_getsockname (int s, struct sockaddr *name, socklen_t *namelen);
-int lwip_getsockopt (int s, int level, int optname, void *optval, socklen_t *optlen);
-int lwip_setsockopt (int s, int level, int optname, const void *optval, socklen_t optlen);
-int lwip_close(int s);
-int lwip_connect(int s, const struct sockaddr *name, socklen_t namelen);
-int lwip_listen(int s, int backlog);
-int lwip_recv(int s, void *mem, size_t len, int flags);
-int lwip_read(int s, void *mem, size_t len);
-int lwip_recvfrom(int s, void *mem, size_t len, int flags,
-      struct sockaddr *from, socklen_t *fromlen);
-int lwip_send(int s, const void *dataptr, size_t size, int flags);
-int lwip_sendmsg(int s, const struct msghdr *message, int flags);
-int lwip_sendto(int s, const void *dataptr, size_t size, int flags,
-    const struct sockaddr *to, socklen_t tolen);
-int lwip_socket(int domain, int type, int protocol);
-int lwip_write(int s, const void *dataptr, size_t size);
-int lwip_writev(int s, const struct iovec *iov, int iovcnt);
-int lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset, struct timeval *timeout);
-int lwip_ioctl(int s, long cmd, void *argp);
-int lwip_fcntl(int s, int cmd, int val);
-
-#if LWIP_COMPAT_SOCKETS
-#if LWIP_COMPAT_SOCKETS != 2
-/** @ingroup socket */
-#define accept(s,addr,addrlen)                    lwip_accept(s,addr,addrlen)
-/** @ingroup socket */
-#define bind(s,name,namelen)                      lwip_bind(s,name,namelen)
-/** @ingroup socket */
-#define shutdown(s,how)                           lwip_shutdown(s,how)
-/** @ingroup socket */
-#define getpeername(s,name,namelen)               lwip_getpeername(s,name,namelen)
-/** @ingroup socket */
-#define getsockname(s,name,namelen)               lwip_getsockname(s,name,namelen)
-/** @ingroup socket */
-#define setsockopt(s,level,optname,opval,optlen)  lwip_setsockopt(s,level,optname,opval,optlen)
-/** @ingroup socket */
-#define getsockopt(s,level,optname,opval,optlen)  lwip_getsockopt(s,level,optname,opval,optlen)
-/** @ingroup socket */
-#define closesocket(s)                            lwip_close(s)
-/** @ingroup socket */
-#define connect(s,name,namelen)                   lwip_connect(s,name,namelen)
-/** @ingroup socket */
-#define listen(s,backlog)                         lwip_listen(s,backlog)
-/** @ingroup socket */
-#define recv(s,mem,len,flags)                     lwip_recv(s,mem,len,flags)
-/** @ingroup socket */
-#define recvfrom(s,mem,len,flags,from,fromlen)    lwip_recvfrom(s,mem,len,flags,from,fromlen)
-/** @ingroup socket */
-#define send(s,dataptr,size,flags)                lwip_send(s,dataptr,size,flags)
-/** @ingroup socket */
-#define sendmsg(s,message,flags)                  lwip_sendmsg(s,message,flags)
-/** @ingroup socket */
-#define sendto(s,dataptr,size,flags,to,tolen)     lwip_sendto(s,dataptr,size,flags,to,tolen)
-/** @ingroup socket */
-#define socket(domain,type,protocol)              lwip_socket(domain,type,protocol)
-/** @ingroup socket */
-#define select(maxfdp1,readset,writeset,exceptset,timeout)     lwip_select(maxfdp1,readset,writeset,exceptset,timeout)
-/** @ingroup socket */
-#define ioctlsocket(s,cmd,argp)                   lwip_ioctl(s,cmd,argp)
-
-#if LWIP_POSIX_SOCKETS_IO_NAMES
-/** @ingroup socket */
-#define read(s,mem,len)                           lwip_read(s,mem,len)
-/** @ingroup socket */
-#define write(s,dataptr,len)                      lwip_write(s,dataptr,len)
-/** @ingroup socket */
-#define writev(s,iov,iovcnt)                      lwip_writev(s,iov,iovcnt)
-/** @ingroup socket */
-#define close(s)                                  lwip_close(s)
-/** @ingroup socket */
-#define fcntl(s,cmd,val)                          lwip_fcntl(s,cmd,val)
-/** @ingroup socket */
-#define ioctl(s,cmd,argp)                         lwip_ioctl(s,cmd,argp)
-#endif /* LWIP_POSIX_SOCKETS_IO_NAMES */
-#endif /* LWIP_COMPAT_SOCKETS != 2 */
-
-#if LWIP_IPV4 && LWIP_IPV6
-/** @ingroup socket */
-#define inet_ntop(af,src,dst,size) \
-    (((af) == AF_INET6) ? ip6addr_ntoa_r((const ip6_addr_t*)(src),(dst),(size)) \
-     : (((af) == AF_INET) ? ip4addr_ntoa_r((const ip4_addr_t*)(src),(dst),(size)) : NULL))
-/** @ingroup socket */
-#define inet_pton(af,src,dst) \
-    (((af) == AF_INET6) ? ip6addr_aton((src),(ip6_addr_t*)(dst)) \
-     : (((af) == AF_INET) ? ip4addr_aton((src),(ip4_addr_t*)(dst)) : 0))
-#elif LWIP_IPV4 /* LWIP_IPV4 && LWIP_IPV6 */
-#define inet_ntop(af,src,dst,size) \
-    (((af) == AF_INET) ? ip4addr_ntoa_r((const ip4_addr_t*)(src),(dst),(size)) : NULL)
-#define inet_pton(af,src,dst) \
-    (((af) == AF_INET) ? ip4addr_aton((src),(ip4_addr_t*)(dst)) : 0)
-#else /* LWIP_IPV4 && LWIP_IPV6 */
-#define inet_ntop(af,src,dst,size) \
-    (((af) == AF_INET6) ? ip6addr_ntoa_r((const ip6_addr_t*)(src),(dst),(size)) : NULL)
-#define inet_pton(af,src,dst) \
-    (((af) == AF_INET6) ? ip6addr_aton((src),(ip6_addr_t*)(dst)) : 0)
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-#endif /* LWIP_COMPAT_SOCKETS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_SOCKET */
-
-#endif /* LWIP_HDR_SOCKETS_H */
diff --git a/sys/include/net/stats.h b/sys/include/net/stats.h
deleted file mode 100644
index 6cec14a..0000000
--- a/sys/include/net/stats.h
+++ /dev/null
@@ -1,491 +0,0 @@
-/**
- * @file
- * Statistics API (to be used from TCPIP thread)
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_STATS_H
-#define LWIP_HDR_STATS_H
-
-#include <net/opt.h>
-
-#include <net/mem.h>
-#include <net/memp.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_STATS
-
-#ifndef LWIP_STATS_LARGE
-#define LWIP_STATS_LARGE 0
-#endif
-
-#if LWIP_STATS_LARGE
-#define STAT_COUNTER     u32_t
-#define STAT_COUNTER_F   U32_F
-#else
-#define STAT_COUNTER     u16_t
-#define STAT_COUNTER_F   U16_F
-#endif
-
-/** Protocol related stats */
-struct stats_proto {
-  STAT_COUNTER xmit;             /* Transmitted packets. */
-  STAT_COUNTER recv;             /* Received packets. */
-  STAT_COUNTER fw;               /* Forwarded packets. */
-  STAT_COUNTER drop;             /* Dropped packets. */
-  STAT_COUNTER chkerr;           /* Checksum error. */
-  STAT_COUNTER lenerr;           /* Invalid length error. */
-  STAT_COUNTER memerr;           /* Out of memory error. */
-  STAT_COUNTER rterr;            /* Routing error. */
-  STAT_COUNTER proterr;          /* Protocol error. */
-  STAT_COUNTER opterr;           /* Error in options. */
-  STAT_COUNTER err;              /* Misc error. */
-  STAT_COUNTER cachehit;
-};
-
-/** IGMP stats */
-struct stats_igmp {
-  STAT_COUNTER xmit;             /* Transmitted packets. */
-  STAT_COUNTER recv;             /* Received packets. */
-  STAT_COUNTER drop;             /* Dropped packets. */
-  STAT_COUNTER chkerr;           /* Checksum error. */
-  STAT_COUNTER lenerr;           /* Invalid length error. */
-  STAT_COUNTER memerr;           /* Out of memory error. */
-  STAT_COUNTER proterr;          /* Protocol error. */
-  STAT_COUNTER rx_v1;            /* Received v1 frames. */
-  STAT_COUNTER rx_group;         /* Received group-specific queries. */
-  STAT_COUNTER rx_general;       /* Received general queries. */
-  STAT_COUNTER rx_report;        /* Received reports. */
-  STAT_COUNTER tx_join;          /* Sent joins. */
-  STAT_COUNTER tx_leave;         /* Sent leaves. */
-  STAT_COUNTER tx_report;        /* Sent reports. */
-};
-
-/** Memory stats */
-struct stats_mem {
-#if defined(LWIP_DEBUG) || LWIP_STATS_DISPLAY
-  const char *name;
-#endif /* defined(LWIP_DEBUG) || LWIP_STATS_DISPLAY */
-  STAT_COUNTER err;
-  mem_size_t avail;
-  mem_size_t used;
-  mem_size_t max;
-  STAT_COUNTER illegal;
-};
-
-/** System element stats */
-struct stats_syselem {
-  STAT_COUNTER used;
-  STAT_COUNTER max;
-  STAT_COUNTER err;
-};
-
-/** System stats */
-struct stats_sys {
-  struct stats_syselem sem;
-  struct stats_syselem mutex;
-  struct stats_syselem mbox;
-};
-
-/** SNMP MIB2 stats */
-struct stats_mib2 {
-  /* IP */
-  u32_t ipinhdrerrors;
-  u32_t ipinaddrerrors;
-  u32_t ipinunknownprotos;
-  u32_t ipindiscards;
-  u32_t ipindelivers;
-  u32_t ipoutrequests;
-  u32_t ipoutdiscards;
-  u32_t ipoutnoroutes;
-  u32_t ipreasmoks;
-  u32_t ipreasmfails;
-  u32_t ipfragoks;
-  u32_t ipfragfails;
-  u32_t ipfragcreates;
-  u32_t ipreasmreqds;
-  u32_t ipforwdatagrams;
-  u32_t ipinreceives;
-
-  /* TCP */
-  u32_t tcpactiveopens;
-  u32_t tcppassiveopens;
-  u32_t tcpattemptfails;
-  u32_t tcpestabresets;
-  u32_t tcpoutsegs;
-  u32_t tcpretranssegs;
-  u32_t tcpinsegs;
-  u32_t tcpinerrs;
-  u32_t tcpoutrsts;
-
-  /* UDP */
-  u32_t udpindatagrams;
-  u32_t udpnoports;
-  u32_t udpinerrors;
-  u32_t udpoutdatagrams;
-
-  /* ICMP */
-  u32_t icmpinmsgs;
-  u32_t icmpinerrors;
-  u32_t icmpindestunreachs;
-  u32_t icmpintimeexcds;
-  u32_t icmpinparmprobs;
-  u32_t icmpinsrcquenchs;
-  u32_t icmpinredirects;
-  u32_t icmpinechos;
-  u32_t icmpinechoreps;
-  u32_t icmpintimestamps;
-  u32_t icmpintimestampreps;
-  u32_t icmpinaddrmasks;
-  u32_t icmpinaddrmaskreps;
-  u32_t icmpoutmsgs;
-  u32_t icmpouterrors;
-  u32_t icmpoutdestunreachs;
-  u32_t icmpouttimeexcds;
-  u32_t icmpoutechos; /* can be incremented by user application ('ping') */
-  u32_t icmpoutechoreps;
-};
-
-/**
- * @ingroup netif_mib2
- * SNMP MIB2 interface stats
- */
-struct stats_mib2_netif_ctrs {
-  /** The total number of octets received on the interface, including framing characters */
-  u32_t ifinoctets;
-  /** The number of packets, delivered by this sub-layer to a higher (sub-)layer, which were
-   * not addressed to a multicast or broadcast address at this sub-layer */
-  u32_t ifinucastpkts;
-  /** The number of packets, delivered by this sub-layer to a higher (sub-)layer, which were
-   * addressed to a multicast or broadcast address at this sub-layer */
-  u32_t ifinnucastpkts;
-  /** The number of inbound packets which were chosen to be discarded even though no errors had
-   * been detected to prevent their being deliverable to a higher-layer protocol. One possible
-   * reason for discarding such a packet could be to free up buffer space */
-  u32_t ifindiscards;
-  /** For packet-oriented interfaces, the number of inbound packets that contained errors
-   * preventing them from being deliverable to a higher-layer protocol.  For character-
-   * oriented or fixed-length interfaces, the number of inbound transmission units that
-   * contained errors preventing them from being deliverable to a higher-layer protocol. */
-  u32_t ifinerrors;
-  /** For packet-oriented interfaces, the number of packets received via the interface which
-   * were discarded because of an unknown or unsupported protocol.  For character-oriented
-   * or fixed-length interfaces that support protocol multiplexing the number of transmission
-   * units received via the interface which were discarded because of an unknown or unsupported
-   * protocol. For any interface that does not support protocol multiplexing, this counter will
-   * always be 0 */
-  u32_t ifinunknownprotos;
-  /** The total number of octets transmitted out of the interface, including framing characters. */
-  u32_t ifoutoctets;
-  /** The total number of packets that higher-level protocols requested be transmitted, and
-   * which were not addressed to a multicast or broadcast address at this sub-layer, including
-   * those that were discarded or not sent. */
-  u32_t ifoutucastpkts;
-  /** The total number of packets that higher-level protocols requested be transmitted, and which
-   * were addressed to a multicast or broadcast address at this sub-layer, including
-   * those that were discarded or not sent. */
-  u32_t ifoutnucastpkts;
-  /** The number of outbound packets which were chosen to be discarded even though no errors had
-   * been detected to prevent their being transmitted.  One possible reason for discarding
-   * such a packet could be to free up buffer space. */
-  u32_t ifoutdiscards;
-  /** For packet-oriented interfaces, the number of outbound packets that could not be transmitted
-   * because of errors. For character-oriented or fixed-length interfaces, the number of outbound
-   * transmission units that could not be transmitted because of errors. */
-  u32_t ifouterrors;
-};
-
-/** lwIP stats container */
-struct stats_ {
-#if LINK_STATS
-  /** Link level */
-  struct stats_proto link;
-#endif
-#if ETHARP_STATS
-  /** ARP */
-  struct stats_proto etharp;
-#endif
-#if IPFRAG_STATS
-  /** Fragmentation */
-  struct stats_proto ip_frag;
-#endif
-#if IP_STATS
-  /** IP */
-  struct stats_proto ip;
-#endif
-#if ICMP_STATS
-  /** ICMP */
-  struct stats_proto icmp;
-#endif
-#if IGMP_STATS
-  /** IGMP */
-  struct stats_igmp igmp;
-#endif
-#if UDP_STATS
-  /** UDP */
-  struct stats_proto udp;
-#endif
-#if TCP_STATS
-  /** TCP */
-  struct stats_proto tcp;
-#endif
-#if MEM_STATS
-  /** Heap */
-  struct stats_mem mem;
-#endif
-#if MEMP_STATS
-  /** Internal memory pools */
-  struct stats_mem *memp[MEMP_MAX];
-#endif
-#if SYS_STATS
-  /** System */
-  struct stats_sys sys;
-#endif
-#if IP6_STATS
-  /** IPv6 */
-  struct stats_proto ip6;
-#endif
-#if ICMP6_STATS
-  /** ICMP6 */
-  struct stats_proto icmp6;
-#endif
-#if IP6_FRAG_STATS
-  /** IPv6 fragmentation */
-  struct stats_proto ip6_frag;
-#endif
-#if MLD6_STATS
-  /** Multicast listener discovery */
-  struct stats_igmp mld6;
-#endif
-#if ND6_STATS
-  /** Neighbor discovery */
-  struct stats_proto nd6;
-#endif
-#if MIB2_STATS
-  /** SNMP MIB2 */
-  struct stats_mib2 mib2;
-#endif
-};
-
-/** Global variable containing lwIP internal statistics. Add this to your debugger's watchlist. */
-extern struct stats_ lwip_stats;
-
-/** Init statistics */
-void stats_init(void);
-
-#define STATS_INC(x) ++lwip_stats.x
-#define STATS_DEC(x) --lwip_stats.x
-#define STATS_INC_USED(x, y) do { lwip_stats.x.used += y; \
-                                if (lwip_stats.x.max < lwip_stats.x.used) { \
-                                    lwip_stats.x.max = lwip_stats.x.used; \
-                                } \
-                             } while(0)
-#define STATS_GET(x) lwip_stats.x
-#else /* LWIP_STATS */
-#define stats_init()
-#define STATS_INC(x)
-#define STATS_DEC(x)
-#define STATS_INC_USED(x)
-#endif /* LWIP_STATS */
-
-#if TCP_STATS
-#define TCP_STATS_INC(x) STATS_INC(x)
-#define TCP_STATS_DISPLAY() stats_display_proto(&lwip_stats.tcp, "TCP")
-#else
-#define TCP_STATS_INC(x)
-#define TCP_STATS_DISPLAY()
-#endif
-
-#if UDP_STATS
-#define UDP_STATS_INC(x) STATS_INC(x)
-#define UDP_STATS_DISPLAY() stats_display_proto(&lwip_stats.udp, "UDP")
-#else
-#define UDP_STATS_INC(x)
-#define UDP_STATS_DISPLAY()
-#endif
-
-#if ICMP_STATS
-#define ICMP_STATS_INC(x) STATS_INC(x)
-#define ICMP_STATS_DISPLAY() stats_display_proto(&lwip_stats.icmp, "ICMP")
-#else
-#define ICMP_STATS_INC(x)
-#define ICMP_STATS_DISPLAY()
-#endif
-
-#if IGMP_STATS
-#define IGMP_STATS_INC(x) STATS_INC(x)
-#define IGMP_STATS_DISPLAY() stats_display_igmp(&lwip_stats.igmp, "IGMP")
-#else
-#define IGMP_STATS_INC(x)
-#define IGMP_STATS_DISPLAY()
-#endif
-
-#if IP_STATS
-#define IP_STATS_INC(x) STATS_INC(x)
-#define IP_STATS_DISPLAY() stats_display_proto(&lwip_stats.ip, "IP")
-#else
-#define IP_STATS_INC(x)
-#define IP_STATS_DISPLAY()
-#endif
-
-#if IPFRAG_STATS
-#define IPFRAG_STATS_INC(x) STATS_INC(x)
-#define IPFRAG_STATS_DISPLAY() stats_display_proto(&lwip_stats.ip_frag, "IP_FRAG")
-#else
-#define IPFRAG_STATS_INC(x)
-#define IPFRAG_STATS_DISPLAY()
-#endif
-
-#if ETHARP_STATS
-#define ETHARP_STATS_INC(x) STATS_INC(x)
-#define ETHARP_STATS_DISPLAY() stats_display_proto(&lwip_stats.etharp, "ETHARP")
-#else
-#define ETHARP_STATS_INC(x)
-#define ETHARP_STATS_DISPLAY()
-#endif
-
-#if LINK_STATS
-#define LINK_STATS_INC(x) STATS_INC(x)
-#define LINK_STATS_DISPLAY() stats_display_proto(&lwip_stats.link, "LINK")
-#else
-#define LINK_STATS_INC(x)
-#define LINK_STATS_DISPLAY()
-#endif
-
-#if MEM_STATS
-#define MEM_STATS_AVAIL(x, y) lwip_stats.mem.x = y
-#define MEM_STATS_INC(x) SYS_ARCH_INC(lwip_stats.mem.x, 1)
-#define MEM_STATS_INC_USED(x, y) SYS_ARCH_INC(lwip_stats.mem.x, y)
-#define MEM_STATS_DEC_USED(x, y) SYS_ARCH_DEC(lwip_stats.mem.x, y)
-#define MEM_STATS_DISPLAY() stats_display_mem(&lwip_stats.mem, "HEAP")
-#else
-#define MEM_STATS_AVAIL(x, y)
-#define MEM_STATS_INC(x)
-#define MEM_STATS_INC_USED(x, y)
-#define MEM_STATS_DEC_USED(x, y)
-#define MEM_STATS_DISPLAY()
-#endif
-
- #if MEMP_STATS
-#define MEMP_STATS_DEC(x, i) STATS_DEC(memp[i]->x)
-#define MEMP_STATS_DISPLAY(i) stats_display_memp(lwip_stats.memp[i], i)
-#define MEMP_STATS_GET(x, i) STATS_GET(memp[i]->x)
- #else
-#define MEMP_STATS_DEC(x, i)
-#define MEMP_STATS_DISPLAY(i)
-#define MEMP_STATS_GET(x, i) 0
-#endif
-
-#if SYS_STATS
-#define SYS_STATS_INC(x) STATS_INC(sys.x)
-#define SYS_STATS_DEC(x) STATS_DEC(sys.x)
-#define SYS_STATS_INC_USED(x) STATS_INC_USED(sys.x, 1)
-#define SYS_STATS_DISPLAY() stats_display_sys(&lwip_stats.sys)
-#else
-#define SYS_STATS_INC(x)
-#define SYS_STATS_DEC(x)
-#define SYS_STATS_INC_USED(x)
-#define SYS_STATS_DISPLAY()
-#endif
-
-#if IP6_STATS
-#define IP6_STATS_INC(x) STATS_INC(x)
-#define IP6_STATS_DISPLAY() stats_display_proto(&lwip_stats.ip6, "IPv6")
-#else
-#define IP6_STATS_INC(x)
-#define IP6_STATS_DISPLAY()
-#endif
-
-#if ICMP6_STATS
-#define ICMP6_STATS_INC(x) STATS_INC(x)
-#define ICMP6_STATS_DISPLAY() stats_display_proto(&lwip_stats.icmp6, "ICMPv6")
-#else
-#define ICMP6_STATS_INC(x)
-#define ICMP6_STATS_DISPLAY()
-#endif
-
-#if IP6_FRAG_STATS
-#define IP6_FRAG_STATS_INC(x) STATS_INC(x)
-#define IP6_FRAG_STATS_DISPLAY() stats_display_proto(&lwip_stats.ip6_frag, "IPv6 FRAG")
-#else
-#define IP6_FRAG_STATS_INC(x)
-#define IP6_FRAG_STATS_DISPLAY()
-#endif
-
-#if MLD6_STATS
-#define MLD6_STATS_INC(x) STATS_INC(x)
-#define MLD6_STATS_DISPLAY() stats_display_igmp(&lwip_stats.mld6, "MLDv1")
-#else
-#define MLD6_STATS_INC(x)
-#define MLD6_STATS_DISPLAY()
-#endif
-
-#if ND6_STATS
-#define ND6_STATS_INC(x) STATS_INC(x)
-#define ND6_STATS_DISPLAY() stats_display_proto(&lwip_stats.nd6, "ND")
-#else
-#define ND6_STATS_INC(x)
-#define ND6_STATS_DISPLAY()
-#endif
-
-#if MIB2_STATS
-#define MIB2_STATS_INC(x) STATS_INC(x)
-#else
-#define MIB2_STATS_INC(x)
-#endif
-
-/* Display of statistics */
-#if LWIP_STATS_DISPLAY
-void stats_display(void);
-void stats_display_proto(struct stats_proto *proto, const char *name);
-void stats_display_igmp(struct stats_igmp *igmp, const char *name);
-void stats_display_mem(struct stats_mem *mem, const char *name);
-void stats_display_memp(struct stats_mem *mem, int index);
-void stats_display_sys(struct stats_sys *sys);
-#else /* LWIP_STATS_DISPLAY */
-#define stats_display()
-#define stats_display_proto(proto, name)
-#define stats_display_igmp(igmp, name)
-#define stats_display_mem(mem, name)
-#define stats_display_memp(mem, index)
-#define stats_display_sys(sys)
-#endif /* LWIP_STATS_DISPLAY */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_STATS_H */
diff --git a/sys/include/net/sys.h b/sys/include/net/sys.h
deleted file mode 100644
index c7e73fa..0000000
--- a/sys/include/net/sys.h
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- */
-
-#ifndef NET_HDR_SYS_H
-#define NET_HDR_SYS_H
-
-#include <net/opt.h>
-#include <net/arch/sys_arch.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if NO_SYS
-
-#else /* NO_SYS */
-
-/** Return code for timeouts from sys_arch_mbox_fetch and sys_arch_sem_wait */
-#define SYS_ARCH_TIMEOUT 0xffffffffUL
-
-/** sys_mbox_tryfetch() returns SYS_MBOX_EMPTY if appropriate.
- * For now we use the same magic value, but we allow this to change in future.
- */
-#define SYS_MBOX_EMPTY SYS_ARCH_TIMEOUT
-
-#include "net/err.h"
-#include "net/arch/sys_arch.h"
-
-/** Function prototype for thread functions */
-typedef void (*lwip_thread_fn)(void *arg);
-
-/* Function prototypes for functions to be implemented by platform ports
-   (in sys_arch.c) */
-
-/* Mutex functions: */
-
-/** Define LWIP_COMPAT_MUTEX if the port has no mutexes and binary semaphores
-    should be used instead */
-#ifndef LWIP_COMPAT_MUTEX
-#define LWIP_COMPAT_MUTEX 0
-#endif
-
-#if LWIP_COMPAT_MUTEX
-/* for old ports that don't have mutexes: define them to binary semaphores */
-#define sys_mutex_t                   sys_sem_t
-#define sys_mutex_new(mutex)          sys_sem_new(mutex, 1)
-#define sys_mutex_lock(mutex)         sys_sem_wait(mutex)
-#define sys_mutex_unlock(mutex)       sys_sem_signal(mutex)
-#define sys_mutex_free(mutex)         sys_sem_free(mutex)
-#define sys_mutex_valid(mutex)        sys_sem_valid(mutex)
-#define sys_mutex_set_invalid(mutex)  sys_sem_set_invalid(mutex)
-
-#else /* LWIP_COMPAT_MUTEX */
-
-/**
- * @ingroup sys_mutex
- * Create a new mutex.
- * Note that mutexes are expected to not be taken recursively by the lwIP code,
- * so both implementation types (recursive or non-recursive) should work.
- * @param mutex pointer to the mutex to create
- * @return ERR_OK if successful, another err_t otherwise
- */
-err_t sys_mutex_new(sys_mutex_t *mutex);
-/**
- * @ingroup sys_mutex
- * Lock a mutex
- * @param mutex the mutex to lock
- */
-void sys_mutex_lock(sys_mutex_t *mutex);
-/**
- * @ingroup sys_mutex
- * Unlock a mutex
- * @param mutex the mutex to unlock
- */
-void sys_mutex_unlock(sys_mutex_t *mutex);
-/**
- * @ingroup sys_mutex
- * Delete a semaphore
- * @param mutex the mutex to delete
- */
-void sys_mutex_free(sys_mutex_t *mutex);
-#ifndef sys_mutex_valid
-/**
- * @ingroup sys_mutex
- * Check if a mutex is valid/allocated: return 1 for valid, 0 for invalid
- */
-int sys_mutex_valid(sys_mutex_t *mutex);
-#endif
-#ifndef sys_mutex_set_invalid
-/**
- * @ingroup sys_mutex
- * Set a mutex invalid so that sys_mutex_valid returns 0
- */
-void sys_mutex_set_invalid(sys_mutex_t *mutex);
-#endif
-#endif /* LWIP_COMPAT_MUTEX */
-
-/* Semaphore functions: */
-
-/**
- * @ingroup sys_sem
- * Create a new semaphore
- * @param sem pointer to the semaphore to create
- * @param count initial count of the semaphore
- * @return ERR_OK if successful, another err_t otherwise
- */
-err_t sys_sem_new(sys_sem_t **sem, u8_t count);
-/**
- * @ingroup sys_sem
- * Signals a semaphore
- * @param sem the semaphore to signal
- */
-void sys_sem_signal(struct sys_sem **s);
-/**
- * @ingroup sys_sem
- * Wait for a semaphore for the specified timeout
- * @param sem the semaphore to wait for
- * @param timeout timeout in milliseconds to wait (0 = wait forever)
- * @return time (in milliseconds) waited for the semaphore
- *         or SYS_ARCH_TIMEOUT on timeout
- */
-uint32_t sys_arch_sem_wait(struct sys_sem **s, uint32_t timeout);
-/**
- * @ingroup sys_sem
- * Delete a semaphore
- * @param sem semaphore to delete
- */
-void sys_sem_free(sys_sem_t **sem);
-/** Wait for a semaphore - forever/no timeout */
-#define sys_sem_wait(sem)                  sys_arch_sem_wait(sem, 0)
-#ifndef sys_sem_valid
-/**
- * @ingroup sys_sem
- * Check if a semaphore is valid/allocated: return 1 for valid, 0 for invalid
- */
-int sys_sem_valid(struct sys_sem **s);
-#endif
-#ifndef sys_sem_set_invalid
-/**
- * @ingroup sys_sem
- * Set a semaphore invalid so that sys_sem_valid returns 0
- */
-void sys_sem_set_invalid(struct sys_sem **s);
-#endif
-#ifndef sys_sem_valid_val
-/**
- * Same as sys_sem_valid() but taking a value, not a pointer
- */
-#define sys_sem_valid_val(sem)       sys_sem_valid(&(sem))
-#endif
-#ifndef sys_sem_set_invalid_val
-/**
- * Same as sys_sem_set_invalid() but taking a value, not a pointer
- */
-#define sys_sem_set_invalid_val(sem) sys_sem_set_invalid(&(sem))
-#endif
-
-#ifndef sys_msleep
-/**
- * @ingroup sys_misc
- * Sleep for specified number of ms
- */
-void sys_msleep(u32_t ms); /* only has a (close to) 1 ms resolution. */
-#endif
-
-/* Mailbox functions. */
-
-/**
- * @ingroup sys_mbox
- * Create a new mbox of specified size
- * @param mbox pointer to the mbox to create
- * @param size (minimum) number of messages in this mbox
- * @return ERR_OK if successful, another err_t otherwise
- */
-err_t sys_mbox_new(struct sys_mbox **mb, int size);
-/**
- * @ingroup sys_mbox
- * Post a message to an mbox - may not fail
- * -> blocks if full, only used from tasks not from ISR
- * @param mbox mbox to posts the message
- * @param msg message to post (ATTENTION: can be NULL)
- */
-void sys_mbox_post(struct sys_mbox **mb, void *msg);
-/**
- * @ingroup sys_mbox
- * Try to post a message to an mbox - may fail if full or ISR
- * @param mbox mbox to posts the message
- * @param msg message to post (ATTENTION: can be NULL)
- */
-err_t sys_mbox_trypost(struct sys_mbox **mb, void *msg);
-/**
- * @ingroup sys_mbox
- * Wait for a new message to arrive in the mbox
- * @param mbox mbox to get a message from
- * @param msg pointer where the message is stored
- * @param timeout maximum time (in milliseconds) to wait for a message (0 = wait forever)
- * @return time (in milliseconds) waited for a message, may be 0 if not waited
-           or SYS_ARCH_TIMEOUT on timeout
- *         The returned time has to be accurate to prevent timer jitter!
- */
-uint32_t sys_arch_mbox_fetch(struct sys_mbox **mb, void **msg, uint32_t timeout);
-/* Allow port to override with a macro, e.g. special timeout for sys_arch_mbox_fetch() */
-#ifndef sys_arch_mbox_tryfetch
-/**
- * @ingroup sys_mbox
- * Wait for a new message to arrive in the mbox
- * @param mbox mbox to get a message from
- * @param msg pointer where the message is stored
- * @return 0 (milliseconds) if a message has been received
- *         or SYS_MBOX_EMPTY if the mailbox is empty
- */
-uint32_t sys_arch_mbox_tryfetch(struct sys_mbox **mb, void **msg);
-#endif
-/**
- * For now, we map straight to sys_arch implementation.
- */
-#define sys_mbox_tryfetch(mbox, msg) sys_arch_mbox_tryfetch(mbox, msg)
-/**
- * @ingroup sys_mbox
- * Delete an mbox
- * @param mbox mbox to delete
- */
-void sys_mbox_free(struct sys_mbox **mb);
-#define sys_mbox_fetch(mbox, msg) sys_arch_mbox_fetch(mbox, msg, 0)
-#ifndef sys_mbox_valid
-/**
- * @ingroup sys_mbox
- * Check if an mbox is valid/allocated: return 1 for valid, 0 for invalid
- */
-int sys_mbox_valid(struct sys_mbox **mb);
-#endif
-#ifndef sys_mbox_set_invalid
-/**
- * @ingroup sys_mbox
- * Set an mbox invalid so that sys_mbox_valid returns 0
- */
-void sys_mbox_set_invalid(struct sys_mbox **mb);
-#endif
-#ifndef sys_mbox_valid_val
-/**
- * Same as sys_mbox_valid() but taking a value, not a pointer
- */
-#define sys_mbox_valid_val(mbox)       sys_mbox_valid(&(mbox))
-#endif
-#ifndef sys_mbox_set_invalid_val
-/**
- * Same as sys_mbox_set_invalid() but taking a value, not a pointer
- */
-#define sys_mbox_set_invalid_val(mbox) sys_mbox_set_invalid(&(mbox))
-#endif
-
-
-/**
- * @ingroup sys_misc
- * The only thread function:
- * Creates a new thread
- * ATTENTION: although this function returns a value, it MUST NOT FAIL (ports have to assert this!)
- * @param name human-readable name for the thread (used for debugging purposes)
- * @param thread thread-function
- * @param arg parameter passed to 'thread'
- * @param stacksize stack size in bytes for the new thread (may be ignored by ports)
- * @param prio priority of the new thread (may be ignored by ports) */
-sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, int stacksize, int prio);
-
-#endif /* NO_SYS */
-
-/* sys_init() must be called before anything else. */
-void sys_init(void);
-
-#ifndef sys_jiffies
-/**
- * Ticks/jiffies since power up.
- */
-u32_t sys_jiffies(void);
-#endif
-
-/**
- * @ingroup sys_time
- * Returns the current time in milliseconds,
- * may be the same as sys_jiffies or at least based on it.
- */
-u32_t sys_now(void);
-
-/* Critical Region Protection */
-/* These functions must be implemented in the sys_arch.c file.
-   In some implementations they can provide a more light-weight protection
-   mechanism than using semaphores. Otherwise semaphores can be used for
-   implementation */
-#ifndef SYS_ARCH_PROTECT
-/** SYS_LIGHTWEIGHT_PROT
- * define SYS_LIGHTWEIGHT_PROT in lwipopts.h if you want inter-task protection
- * for certain critical regions during buffer allocation, deallocation and memory
- * allocation and deallocation.
- */
-#if SYS_LIGHTWEIGHT_PROT
-
-/**
- * @ingroup sys_prot
- * SYS_ARCH_DECL_PROTECT
- * declare a protection variable. This macro will default to defining a variable of
- * type sys_prot_t. If a particular port needs a different implementation, then
- * this macro may be defined in sys_arch.h.
- */
-#define SYS_ARCH_DECL_PROTECT(lev) sys_prot_t lev
-/**
- * @ingroup sys_prot
- * SYS_ARCH_PROTECT
- * Perform a "fast" protect. This could be implemented by
- * disabling interrupts for an embedded system or by using a semaphore or
- * mutex. The implementation should allow calling SYS_ARCH_PROTECT when
- * already protected. The old protection level is returned in the variable
- * "lev". This macro will default to calling the sys_arch_protect() function
- * which should be implemented in sys_arch.c. If a particular port needs a
- * different implementation, then this macro may be defined in sys_arch.h
- */
-#define SYS_ARCH_PROTECT(lev) lev = sys_arch_protect()
-/**
- * @ingroup sys_prot
- * SYS_ARCH_UNPROTECT
- * Perform a "fast" set of the protection level to "lev". This could be
- * implemented by setting the interrupt level to "lev" within the MACRO or by
- * using a semaphore or mutex.  This macro will default to calling the
- * sys_arch_unprotect() function which should be implemented in
- * sys_arch.c. If a particular port needs a different implementation, then
- * this macro may be defined in sys_arch.h
- */
-#define SYS_ARCH_UNPROTECT(lev) sys_arch_unprotect(lev)
-sys_prot_t sys_arch_protect(void);
-void sys_arch_unprotect(sys_prot_t pval);
-
-#else
-
-#define SYS_ARCH_DECL_PROTECT(lev)
-#define SYS_ARCH_PROTECT(lev)
-#define SYS_ARCH_UNPROTECT(lev)
-
-#endif /* SYS_LIGHTWEIGHT_PROT */
-
-#endif /* SYS_ARCH_PROTECT */
-
-/*
- * Macros to set/get and increase/decrease variables in a thread-safe way.
- * Use these for accessing variable that are used from more than one thread.
- */
-
-#ifndef SYS_ARCH_INC
-#define SYS_ARCH_INC(var, val) do { \
-                                SYS_ARCH_DECL_PROTECT(old_level); \
-                                SYS_ARCH_PROTECT(old_level); \
-                                var += val; \
-                                SYS_ARCH_UNPROTECT(old_level); \
-                              } while(0)
-#endif /* SYS_ARCH_INC */
-
-#ifndef SYS_ARCH_DEC
-#define SYS_ARCH_DEC(var, val) do { \
-                                SYS_ARCH_DECL_PROTECT(old_level); \
-                                SYS_ARCH_PROTECT(old_level); \
-                                var -= val; \
-                                SYS_ARCH_UNPROTECT(old_level); \
-                              } while(0)
-#endif /* SYS_ARCH_DEC */
-
-#ifndef SYS_ARCH_GET
-#define SYS_ARCH_GET(var, ret) do { \
-                                SYS_ARCH_DECL_PROTECT(old_level); \
-                                SYS_ARCH_PROTECT(old_level); \
-                                ret = var; \
-                                SYS_ARCH_UNPROTECT(old_level); \
-                              } while(0)
-#endif /* SYS_ARCH_GET */
-
-#ifndef SYS_ARCH_SET
-#define SYS_ARCH_SET(var, val) do { \
-                                SYS_ARCH_DECL_PROTECT(old_level); \
-                                SYS_ARCH_PROTECT(old_level); \
-                                var = val; \
-                                SYS_ARCH_UNPROTECT(old_level); \
-                              } while(0)
-#endif /* SYS_ARCH_SET */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* NET_HDR_SYS_H */
diff --git a/sys/include/net/tcp.h b/sys/include/net/tcp.h
deleted file mode 100644
index 4f321fb..0000000
--- a/sys/include/net/tcp.h
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
- * @file
- * TCP API (to be used from TCPIP thread)\n
- * See also @ref tcp_raw
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_TCP_H
-#define LWIP_HDR_TCP_H
-
-#include "net/opt.h"
-
-#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/mem.h"
-#include "net/pbuf.h"
-#include "net/ip.h"
-#include "net/icmp.h"
-#include "net/err.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct tcp_pcb;
-
-/** Function prototype for tcp accept callback functions. Called when a new
- * connection can be accepted on a listening pcb.
- *
- * @param arg Additional argument to pass to the callback function (@see tcp_arg())
- * @param newpcb The new connection pcb
- * @param err An error code if there has been an error accepting.
- *            Only return ERR_ABRT if you have called tcp_abort from within the
- *            callback function!
- */
-typedef err_t (*tcp_accept_fn)(void *arg, struct tcp_pcb *newpcb, err_t err);
-
-/** Function prototype for tcp receive callback functions. Called when data has
- * been received.
- *
- * @param arg Additional argument to pass to the callback function (@see tcp_arg())
- * @param tpcb The connection pcb which received data
- * @param p The received data (or NULL when the connection has been closed!)
- * @param err An error code if there has been an error receiving
- *            Only return ERR_ABRT if you have called tcp_abort from within the
- *            callback function!
- */
-typedef err_t (*tcp_recv_fn)(void *arg, struct tcp_pcb *tpcb,
-                             struct pbuf *p, err_t err);
-
-/** Function prototype for tcp sent callback functions. Called when sent data has
- * been acknowledged by the remote side. Use it to free corresponding resources.
- * This also means that the pcb has now space available to send new data.
- *
- * @param arg Additional argument to pass to the callback function (@see tcp_arg())
- * @param tpcb The connection pcb for which data has been acknowledged
- * @param len The amount of bytes acknowledged
- * @return ERR_OK: try to send some data by calling tcp_output
- *            Only return ERR_ABRT if you have called tcp_abort from within the
- *            callback function!
- */
-typedef err_t (*tcp_sent_fn)(void *arg, struct tcp_pcb *tpcb,
-                              u16_t len);
-
-/** Function prototype for tcp poll callback functions. Called periodically as
- * specified by @see tcp_poll.
- *
- * @param arg Additional argument to pass to the callback function (@see tcp_arg())
- * @param tpcb tcp pcb
- * @return ERR_OK: try to send some data by calling tcp_output
- *            Only return ERR_ABRT if you have called tcp_abort from within the
- *            callback function!
- */
-typedef err_t (*tcp_poll_fn)(void *arg, struct tcp_pcb *tpcb);
-
-/** Function prototype for tcp error callback functions. Called when the pcb
- * receives a RST or is unexpectedly closed for any other reason.
- *
- * @note The corresponding pcb is already freed when this callback is called!
- *
- * @param arg Additional argument to pass to the callback function (@see tcp_arg())
- * @param err Error code to indicate why the pcb has been closed
- *            ERR_ABRT: aborted through tcp_abort or by a TCP timer
- *            ERR_RST: the connection was reset by the remote host
- */
-typedef void  (*tcp_err_fn)(void *arg, err_t err);
-
-/** Function prototype for tcp connected callback functions. Called when a pcb
- * is connected to the remote side after initiating a connection attempt by
- * calling tcp_connect().
- *
- * @param arg Additional argument to pass to the callback function (@see tcp_arg())
- * @param tpcb The connection pcb which is connected
- * @param err An unused error code, always ERR_OK currently ;-) @todo!
- *            Only return ERR_ABRT if you have called tcp_abort from within the
- *            callback function!
- *
- * @note When a connection attempt fails, the error callback is currently called!
- */
-typedef err_t (*tcp_connected_fn)(void *arg, struct tcp_pcb *tpcb, err_t err);
-
-#if LWIP_WND_SCALE
-#define RCV_WND_SCALE(pcb, wnd) (((wnd) >> (pcb)->rcv_scale))
-#define SND_WND_SCALE(pcb, wnd) (((wnd) << (pcb)->snd_scale))
-#define TCPWND16(x)             ((u16_t)LWIP_MIN((x), 0xFFFF))
-#define TCP_WND_MAX(pcb)        ((tcpwnd_size_t)(((pcb)->flags & TF_WND_SCALE) ? TCP_WND : TCPWND16(TCP_WND)))
-typedef u32_t tcpwnd_size_t;
-#else
-#define RCV_WND_SCALE(pcb, wnd) (wnd)
-#define SND_WND_SCALE(pcb, wnd) (wnd)
-#define TCPWND16(x)             (x)
-#define TCP_WND_MAX(pcb)        TCP_WND
-typedef u16_t tcpwnd_size_t;
-#endif
-
-#if LWIP_WND_SCALE || TCP_LISTEN_BACKLOG || LWIP_TCP_TIMESTAMPS
-typedef u16_t tcpflags_t;
-#else
-typedef u8_t tcpflags_t;
-#endif
-
-enum tcp_state {
-  CLOSED      = 0,
-  LISTEN      = 1,
-  SYN_SENT    = 2,
-  SYN_RCVD    = 3,
-  ESTABLISHED = 4,
-  FIN_WAIT_1  = 5,
-  FIN_WAIT_2  = 6,
-  CLOSE_WAIT  = 7,
-  CLOSING     = 8,
-  LAST_ACK    = 9,
-  TIME_WAIT   = 10
-};
-
-/**
- * members common to struct tcp_pcb and struct tcp_listen_pcb
- */
-#define TCP_PCB_COMMON(type) \
-  type *next; /* for the linked list */ \
-  void *callback_arg; \
-  enum tcp_state state; /* TCP state */ \
-  u8_t prio; \
-  /* ports are in host byte order */ \
-  u16_t local_port
-
-
-/** the TCP protocol control block for listening pcbs */
-struct tcp_pcb_listen {
-/** Common members of all PCB types */
-  IP_PCB;
-/** Protocol specific PCB members */
-  TCP_PCB_COMMON(struct tcp_pcb_listen);
-
-#if LWIP_CALLBACK_API
-  /* Function to call when a listener has been connected. */
-  tcp_accept_fn accept;
-#endif /* LWIP_CALLBACK_API */
-
-#if TCP_LISTEN_BACKLOG
-  u8_t backlog;
-  u8_t accepts_pending;
-#endif /* TCP_LISTEN_BACKLOG */
-};
-
-
-/** the TCP protocol control block */
-struct tcp_pcb {
-/** common PCB members */
-  IP_PCB;
-/** protocol specific PCB members */
-  TCP_PCB_COMMON(struct tcp_pcb);
-
-  /* ports are in host byte order */
-  u16_t remote_port;
-
-  tcpflags_t flags;
-#define TF_ACK_DELAY   0x01U   /* Delayed ACK. */
-#define TF_ACK_NOW     0x02U   /* Immediate ACK. */
-#define TF_INFR        0x04U   /* In fast recovery. */
-#define TF_CLOSEPEND   0x08U   /* If this is set, tcp_close failed to enqueue the FIN (retried in tcp_tmr) */
-#define TF_RXCLOSED    0x10U   /* rx closed by tcp_shutdown */
-#define TF_FIN         0x20U   /* Connection was closed locally (FIN segment enqueued). */
-#define TF_NODELAY     0x40U   /* Disable Nagle algorithm */
-#define TF_NAGLEMEMERR 0x80U   /* nagle enabled, memerr, try to output to prevent delayed ACK to happen */
-#if LWIP_WND_SCALE
-#define TF_WND_SCALE   0x0100U /* Window Scale option enabled */
-#endif
-#if TCP_LISTEN_BACKLOG
-#define TF_BACKLOGPEND 0x0200U /* If this is set, a connection pcb has increased the backlog on its listener */
-#endif
-#if LWIP_TCP_TIMESTAMPS
-#define TF_TIMESTAMP   0x0400U   /* Timestamp option enabled */
-#endif
-
-  /* the rest of the fields are in host byte order
-     as we have to do some math with them */
-
-  /* Timers */
-  u8_t polltmr, pollinterval;
-  u8_t last_timer;
-  u32_t tmr;
-
-  /* receiver variables */
-  u32_t rcv_nxt;   /* next seqno expected */
-  tcpwnd_size_t rcv_wnd;   /* receiver window available */
-  tcpwnd_size_t rcv_ann_wnd; /* receiver window to announce */
-  u32_t rcv_ann_right_edge; /* announced right edge of window */
-
-  /* Retransmission timer. */
-  s16_t rtime;
-
-  u16_t mss;   /* maximum segment size */
-
-  /* RTT (round trip time) estimation variables */
-  u32_t rttest; /* RTT estimate in 500ms ticks */
-  u32_t rtseq;  /* sequence number being timed */
-  s16_t sa, sv; /* @todo document this */
-
-  s16_t rto;    /* retransmission time-out */
-  u8_t nrtx;    /* number of retransmissions */
-
-  /* fast retransmit/recovery */
-  u8_t dupacks;
-  u32_t lastack; /* Highest acknowledged seqno. */
-
-  /* congestion avoidance/control variables */
-  tcpwnd_size_t cwnd;
-  tcpwnd_size_t ssthresh;
-
-  /* sender variables */
-  u32_t snd_nxt;   /* next new seqno to be sent */
-  u32_t snd_wl1, snd_wl2; /* Sequence and acknowledgement numbers of last
-                             window update. */
-  u32_t snd_lbb;       /* Sequence number of next byte to be buffered. */
-  tcpwnd_size_t snd_wnd;   /* sender window */
-  tcpwnd_size_t snd_wnd_max; /* the maximum sender window announced by the remote host */
-
-  tcpwnd_size_t snd_buf;   /* Available buffer space for sending (in bytes). */
-#define TCP_SNDQUEUELEN_OVERFLOW (0xffffU-3)
-  u16_t snd_queuelen; /* Number of pbufs currently in the send buffer. */
-
-#if TCP_OVERSIZE
-  /* Extra bytes available at the end of the last pbuf in unsent. */
-  u16_t unsent_oversize;
-#endif /* TCP_OVERSIZE */
-
-  /* These are ordered by sequence number: */
-  struct tcp_seg *unsent;   /* Unsent (queued) segments. */
-  struct tcp_seg *unacked;  /* Sent but unacknowledged segments. */
-#if TCP_QUEUE_OOSEQ
-  struct tcp_seg *ooseq;    /* Received out of sequence segments. */
-#endif /* TCP_QUEUE_OOSEQ */
-
-  struct pbuf *refused_data; /* Data previously received but not yet taken by upper layer */
-
-#if LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG
-  struct tcp_pcb_listen* listener;
-#endif /* LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG */
-
-#if LWIP_CALLBACK_API
-  /* Function to be called when more send buffer space is available. */
-  tcp_sent_fn sent;
-  /* Function to be called when (in-sequence) data has arrived. */
-  tcp_recv_fn recv;
-  /* Function to be called when a connection has been set up. */
-  tcp_connected_fn connected;
-  /* Function which is called periodically. */
-  tcp_poll_fn poll;
-  /* Function to be called whenever a fatal error occurs. */
-  tcp_err_fn errf;
-#endif /* LWIP_CALLBACK_API */
-
-#if LWIP_TCP_TIMESTAMPS
-  u32_t ts_lastacksent;
-  u32_t ts_recent;
-#endif /* LWIP_TCP_TIMESTAMPS */
-
-  /* idle time before KEEPALIVE is sent */
-  u32_t keep_idle;
-#if LWIP_TCP_KEEPALIVE
-  u32_t keep_intvl;
-  u32_t keep_cnt;
-#endif /* LWIP_TCP_KEEPALIVE */
-
-  /* Persist timer counter */
-  u8_t persist_cnt;
-  /* Persist timer back-off */
-  u8_t persist_backoff;
-
-  /* KEEPALIVE counter */
-  u8_t keep_cnt_sent;
-
-#if LWIP_WND_SCALE
-  u8_t snd_scale;
-  u8_t rcv_scale;
-#endif
-};
-
-#if LWIP_EVENT_API
-
-enum lwip_event {
-  LWIP_EVENT_ACCEPT,
-  LWIP_EVENT_SENT,
-  LWIP_EVENT_RECV,
-  LWIP_EVENT_CONNECTED,
-  LWIP_EVENT_POLL,
-  LWIP_EVENT_ERR
-};
-
-err_t lwip_tcp_event(void *arg, struct tcp_pcb *pcb,
-         enum lwip_event,
-         struct pbuf *p,
-         u16_t size,
-         err_t err);
-
-#endif /* LWIP_EVENT_API */
-
-/* Application program's interface: */
-struct tcp_pcb * tcp_new     (void);
-struct tcp_pcb * tcp_new_ip_type (u8_t type);
-
-void             tcp_arg     (struct tcp_pcb *pcb, void *arg);
-#if LWIP_CALLBACK_API
-void             tcp_recv    (struct tcp_pcb *pcb, tcp_recv_fn recv);
-void             tcp_sent    (struct tcp_pcb *pcb, tcp_sent_fn sent);
-void             tcp_err     (struct tcp_pcb *pcb, tcp_err_fn err);
-void             tcp_accept  (struct tcp_pcb *pcb, tcp_accept_fn accept);
-#endif /* LWIP_CALLBACK_API */
-void             tcp_poll    (struct tcp_pcb *pcb, tcp_poll_fn poll, u8_t interval);
-
-#if LWIP_TCP_TIMESTAMPS
-#define          tcp_mss(pcb)             (((pcb)->flags & TF_TIMESTAMP) ? ((pcb)->mss - 12)  : (pcb)->mss)
-#else /* LWIP_TCP_TIMESTAMPS */
-#define          tcp_mss(pcb)             ((pcb)->mss)
-#endif /* LWIP_TCP_TIMESTAMPS */
-#define          tcp_sndbuf(pcb)          (TCPWND16((pcb)->snd_buf))
-#define          tcp_sndqueuelen(pcb)     ((pcb)->snd_queuelen)
-/** @ingroup tcp_raw */
-#define          tcp_nagle_disable(pcb)   ((pcb)->flags |= TF_NODELAY)
-/** @ingroup tcp_raw */
-#define          tcp_nagle_enable(pcb)    ((pcb)->flags = (tcpflags_t)((pcb)->flags & ~TF_NODELAY))
-/** @ingroup tcp_raw */
-#define          tcp_nagle_disabled(pcb)  (((pcb)->flags & TF_NODELAY) != 0)
-
-#if TCP_LISTEN_BACKLOG
-#define          tcp_backlog_set(pcb, new_backlog) do { \
-  LWIP_ASSERT("pcb->state == LISTEN (called for wrong pcb?)", (pcb)->state == LISTEN); \
-  ((struct tcp_pcb_listen *)(pcb))->backlog = ((new_backlog) ? (new_backlog) : 1); } while(0)
-void             tcp_backlog_delayed(struct tcp_pcb* pcb);
-void             tcp_backlog_accepted(struct tcp_pcb* pcb);
-#else  /* TCP_LISTEN_BACKLOG */
-#define          tcp_backlog_set(pcb, new_backlog)
-#define          tcp_backlog_delayed(pcb)
-#define          tcp_backlog_accepted(pcb)
-#endif /* TCP_LISTEN_BACKLOG */
-#define          tcp_accepted(pcb) /* compatibility define, not needed any more */
-
-void             tcp_recved  (struct tcp_pcb *pcb, u16_t len);
-err_t            tcp_bind    (struct tcp_pcb *pcb, const ip_addr_t *ipaddr,
-                              u16_t port);
-err_t            tcp_connect (struct tcp_pcb *pcb, const ip_addr_t *ipaddr,
-                              u16_t port, tcp_connected_fn connected);
-
-struct tcp_pcb * tcp_listen_with_backlog_and_err(struct tcp_pcb *pcb, u8_t backlog, err_t *err);
-struct tcp_pcb * tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog);
-/** @ingroup tcp_raw */
-#define          tcp_listen(pcb) tcp_listen_with_backlog(pcb, TCP_DEFAULT_LISTEN_BACKLOG)
-
-void             tcp_abort (struct tcp_pcb *pcb);
-err_t            tcp_close   (struct tcp_pcb *pcb);
-err_t            tcp_shutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx);
-
-/* Flags for "apiflags" parameter in tcp_write */
-#define TCP_WRITE_FLAG_COPY 0x01
-#define TCP_WRITE_FLAG_MORE 0x02
-
-err_t            tcp_write   (struct tcp_pcb *pcb, const void *dataptr, u16_t len,
-                              u8_t apiflags);
-
-void             tcp_setprio (struct tcp_pcb *pcb, u8_t prio);
-
-#define TCP_PRIO_MIN    1
-#define TCP_PRIO_NORMAL 64
-#define TCP_PRIO_MAX    127
-
-err_t            tcp_output  (struct tcp_pcb *pcb);
-
-
-const char* tcp_debug_state_str(enum tcp_state s);
-
-/* for compatibility with older implementation */
-#define tcp_new_ip6() tcp_new_ip_type(IPADDR_TYPE_V6)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_TCP */
-
-#endif /* LWIP_HDR_TCP_H */
diff --git a/sys/include/net/tcpip.h b/sys/include/net/tcpip.h
deleted file mode 100644
index a4c91e6..0000000
--- a/sys/include/net/tcpip.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @file
- * Functions to sync with TCPIP thread
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_TCPIP_H
-#define LWIP_HDR_TCPIP_H
-
-#include "net/opt.h"
-
-#if !NO_SYS /* don't build if not configured for use in lwipopts.h */
-
-#include "net/err.h"
-#include "net/timeouts.h"
-#include "net/netif.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_TCPIP_CORE_LOCKING
-/** The global semaphore to lock the stack. */
-extern sys_mutex_t lock_tcpip_core;
-/** Lock lwIP core mutex (needs @ref LWIP_TCPIP_CORE_LOCKING 1) */
-#define LOCK_TCPIP_CORE()     sys_mutex_lock(&lock_tcpip_core)
-/** Unlock lwIP core mutex (needs @ref LWIP_TCPIP_CORE_LOCKING 1) */
-#define UNLOCK_TCPIP_CORE()   sys_mutex_unlock(&lock_tcpip_core)
-#else /* LWIP_TCPIP_CORE_LOCKING */
-#define LOCK_TCPIP_CORE()
-#define UNLOCK_TCPIP_CORE()
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-
-struct pbuf;
-struct netif;
-
-/** Function prototype for the init_done function passed to tcpip_init */
-typedef void (*tcpip_init_done_fn)(void *arg);
-/** Function prototype for functions passed to tcpip_callback() */
-typedef void (*tcpip_callback_fn)(void *ctx);
-
-/* Forward declarations */
-struct tcpip_callback_msg;
-
-void   tcpip_init(tcpip_init_done_fn tcpip_init_done, void *arg);
-
-err_t  tcpip_inpkt(struct pbuf *p, struct netif *inp, netif_input_fn input_fn);
-err_t  tcpip_input(struct pbuf *p, struct netif *inp);
-
-err_t  tcpip_callback_with_block(tcpip_callback_fn function, void *ctx, u8_t block);
-/**
- * @ingroup lwip_os
- * @see tcpip_callback_with_block
- */
-#define tcpip_callback(f, ctx)  tcpip_callback_with_block(f, ctx, 1)
-
-struct tcpip_callback_msg* tcpip_callbackmsg_new(tcpip_callback_fn function, void *ctx);
-void   tcpip_callbackmsg_delete(struct tcpip_callback_msg* msg);
-err_t  tcpip_trycallback(struct tcpip_callback_msg* msg);
-
-/* free pbufs or heap memory from another context without blocking */
-err_t  pbuf_free_callback(struct pbuf *p);
-err_t  mem_free_callback(void *m);
-
-#if LWIP_TCPIP_TIMEOUT && LWIP_TIMERS
-err_t  tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg);
-err_t  tcpip_untimeout(sys_timeout_handler h, void *arg);
-#endif /* LWIP_TCPIP_TIMEOUT && LWIP_TIMERS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !NO_SYS */
-
-#endif /* LWIP_HDR_TCPIP_H */
diff --git a/sys/include/net/timeouts.h b/sys/include/net/timeouts.h
deleted file mode 100644
index e0e4b52..0000000
--- a/sys/include/net/timeouts.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * @file
- * Timer implementations
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *         Simon Goldschmidt
- *
- */
-#ifndef LWIP_HDR_TIMEOUTS_H
-#define LWIP_HDR_TIMEOUTS_H
-
-#include "net/opt.h"
-#include "net/err.h"
-#if !NO_SYS
-#include "net/sys.h"
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef LWIP_DEBUG_TIMERNAMES
-#ifdef LWIP_DEBUG
-#define LWIP_DEBUG_TIMERNAMES SYS_DEBUG
-#else /* LWIP_DEBUG */
-#define LWIP_DEBUG_TIMERNAMES 0
-#endif /* LWIP_DEBUG*/
-#endif
-
-/** Function prototype for a stack-internal timer function that has to be
- * called at a defined interval */
-typedef void (* lwip_cyclic_timer_handler)(void);
-
-/** This struct contains information about a stack-internal timer function
- that has to be called at a defined interval */
-struct lwip_cyclic_timer {
-  u32_t interval_ms;
-  lwip_cyclic_timer_handler handler;
-#if LWIP_DEBUG_TIMERNAMES
-  const char* handler_name;
-#endif /* LWIP_DEBUG_TIMERNAMES */
-};
-
-/** This array contains all stack-internal cyclic timers. To get the number of
- * timers, use LWIP_ARRAYSIZE() */
-extern const struct lwip_cyclic_timer lwip_cyclic_timers[];
-
-#if LWIP_TIMERS
-
-/** Function prototype for a timeout callback function. Register such a function
- * using sys_timeout().
- *
- * @param arg Additional argument to pass to the function - set up by sys_timeout()
- */
-typedef void (* sys_timeout_handler)(void *arg);
-
-struct sys_timeo {
-  struct sys_timeo *next;
-  u32_t time;
-  sys_timeout_handler h;
-  void *arg;
-#if LWIP_DEBUG_TIMERNAMES
-  const char* handler_name;
-#endif /* LWIP_DEBUG_TIMERNAMES */
-};
-
-void sys_timeouts_init(void);
-
-#if LWIP_DEBUG_TIMERNAMES
-void sys_timeout_debug(u32_t msecs, sys_timeout_handler handler, void *arg, const char* handler_name);
-#define sys_timeout(msecs, handler, arg) sys_timeout_debug(msecs, handler, arg, #handler)
-#else /* LWIP_DEBUG_TIMERNAMES */
-void sys_timeout(u32_t msecs, sys_timeout_handler handler, void *arg);
-#endif /* LWIP_DEBUG_TIMERNAMES */
-
-void sys_untimeout(sys_timeout_handler handler, void *arg);
-void sys_restart_timeouts(void);
-#if NO_SYS
-void sys_check_timeouts(void);
-u32_t sys_timeouts_sleeptime(void);
-#else /* NO_SYS */
-void sys_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg);
-#endif /* NO_SYS */
-
-
-#endif /* LWIP_TIMERS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_TIMEOUTS_H */
diff --git a/sys/include/net/udp.h b/sys/include/net/udp.h
deleted file mode 100644
index 129d380..0000000
--- a/sys/include/net/udp.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
- * @file
- * UDP API (to be used from TCPIP thread)\n
- * See also @ref udp_raw
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_UDP_H
-#define LWIP_HDR_UDP_H
-
-#include "net/opt.h"
-
-#if LWIP_UDP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/pbuf.h"
-#include "net/netif.h"
-#include "net/ip_addr.h"
-#include "net/ip.h"
-#include "net/ip6_addr.h"
-#include "net/prot/udp.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define UDP_FLAGS_NOCHKSUM       0x01U
-#define UDP_FLAGS_UDPLITE        0x02U
-#define UDP_FLAGS_CONNECTED      0x04U
-#define UDP_FLAGS_MULTICAST_LOOP 0x08U
-
-struct udp_pcb;
-
-/** Function prototype for udp pcb receive callback functions
- * addr and port are in same byte order as in the pcb
- * The callback is responsible for freeing the pbuf
- * if it's not used any more.
- *
- * ATTENTION: Be aware that 'addr' might point into the pbuf 'p' so freeing this pbuf
- *            can make 'addr' invalid, too.
- *
- * @param arg user supplied argument (udp_pcb.recv_arg)
- * @param pcb the udp_pcb which received data
- * @param p the packet buffer that was received
- * @param addr the remote IP address from which the packet was received
- * @param port the remote port from which the packet was received
- */
-typedef void (*udp_recv_fn)(void *arg, struct udp_pcb *pcb, struct pbuf *p,
-    const ip_addr_t *addr, u16_t port);
-
-/** the UDP protocol control block */
-struct udp_pcb {
-/** Common members of all PCB types */
-  IP_PCB;
-
-/* Protocol specific PCB members */
-
-  struct udp_pcb *next;
-
-  u8_t flags;
-  /** ports are in host byte order */
-  u16_t local_port, remote_port;
-
-#if LWIP_MULTICAST_TX_OPTIONS
-  /** outgoing network interface for multicast packets */
-  ip_addr_t multicast_ip;
-  /** TTL for outgoing multicast packets */
-  u8_t mcast_ttl;
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-
-#if LWIP_UDPLITE
-  /** used for UDP_LITE only */
-  u16_t chksum_len_rx, chksum_len_tx;
-#endif /* LWIP_UDPLITE */
-
-  /** receive callback function */
-  udp_recv_fn recv;
-  /** user-supplied argument for the recv callback */
-  void *recv_arg;
-};
-/* udp_pcbs export for external reference (e.g. SNMP agent) */
-extern struct udp_pcb *udp_pcbs;
-
-/* The following functions is the application layer interface to the
-   UDP code. */
-struct udp_pcb * udp_new        (void);
-struct udp_pcb * udp_new_ip_type(u8_t type);
-void             udp_remove     (struct udp_pcb *pcb);
-err_t            udp_bind       (struct udp_pcb *pcb, const ip_addr_t *ipaddr,
-                                 u16_t port);
-err_t            udp_connect    (struct udp_pcb *pcb, const ip_addr_t *ipaddr,
-                                 u16_t port);
-void             udp_disconnect (struct udp_pcb *pcb);
-void             udp_recv       (struct udp_pcb *pcb, udp_recv_fn recv,
-                                 void *recv_arg);
-err_t            udp_sendto_if  (struct udp_pcb *pcb, struct pbuf *p,
-                                 const ip_addr_t *dst_ip, u16_t dst_port,
-                                 struct netif *netif);
-err_t            udp_sendto_if_src(struct udp_pcb *pcb, struct pbuf *p,
-                                 const ip_addr_t *dst_ip, u16_t dst_port,
-                                 struct netif *netif, const ip_addr_t *src_ip);
-err_t            udp_sendto     (struct udp_pcb *pcb, struct pbuf *p,
-                                 const ip_addr_t *dst_ip, u16_t dst_port);
-err_t            udp_send       (struct udp_pcb *pcb, struct pbuf *p);
-
-#if LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP
-err_t            udp_sendto_if_chksum(struct udp_pcb *pcb, struct pbuf *p,
-                                 const ip_addr_t *dst_ip, u16_t dst_port,
-                                 struct netif *netif, u8_t have_chksum,
-                                 u16_t chksum);
-err_t            udp_sendto_chksum(struct udp_pcb *pcb, struct pbuf *p,
-                                 const ip_addr_t *dst_ip, u16_t dst_port,
-                                 u8_t have_chksum, u16_t chksum);
-err_t            udp_send_chksum(struct udp_pcb *pcb, struct pbuf *p,
-                                 u8_t have_chksum, u16_t chksum);
-err_t            udp_sendto_if_src_chksum(struct udp_pcb *pcb, struct pbuf *p,
-                                 const ip_addr_t *dst_ip, u16_t dst_port, struct netif *netif,
-                                 u8_t have_chksum, u16_t chksum, const ip_addr_t *src_ip);
-#endif /* LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP */
-
-#define          udp_flags(pcb) ((pcb)->flags)
-#define          udp_setflags(pcb, f)  ((pcb)->flags = (f))
-
-/* The following functions are the lower layer interface to UDP. */
-void             udp_input      (struct pbuf *p, struct netif *inp);
-
-void             udp_init       (void);
-
-/* for compatibility with older implementation */
-#define udp_new_ip6() udp_new_ip_type(IPADDR_TYPE_V6)
-
-#if LWIP_MULTICAST_TX_OPTIONS
-#define udp_set_multicast_netif_addr(pcb, ip4addr) ip_addr_copy_from_ip4((pcb)->multicast_ip, *(ip4addr))
-#define udp_get_multicast_netif_addr(pcb)          ip_2_ip4(&(pcb)->multicast_ip)
-#define udp_set_multicast_ttl(pcb, value)      do { (pcb)->mcast_ttl = value; } while(0)
-#define udp_get_multicast_ttl(pcb)                 ((pcb)->mcast_ttl)
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-
-#if UDP_DEBUG
-void udp_debug_print(struct udp_hdr *udphdr);
-#else
-#define udp_debug_print(udphdr)
-#endif
-
-void udp_netif_ip_addr_changed(const ip_addr_t* old_addr, const ip_addr_t* new_addr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_UDP */
-
-#endif /* LWIP_HDR_UDP_H */
diff --git a/sys/include/netif/etharp.h b/sys/include/netif/etharp.h
deleted file mode 100644
index 993e07c..0000000
--- a/sys/include/netif/etharp.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* ARP has been moved to core/ipv4, provide this #include for compatibility only */
-#include "net/etharp.h"
-#include "netif/ethernet.h"
diff --git a/sys/include/netif/ethernet.h b/sys/include/netif/ethernet.h
deleted file mode 100644
index 1cf4811..0000000
--- a/sys/include/netif/ethernet.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * @file
- * Ethernet input function - handles INCOMING ethernet level traffic
- * To be used in most low-level netif implementations
- */
-
-/*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
- * Copyright (c) 2003-2004 Leon Woestenberg <leon.woestenberg@axon.tv>
- * Copyright (c) 2003-2004 Axon Digital Design B.V., The Netherlands.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#ifndef LWIP_HDR_NETIF_ETHERNET_H
-#define LWIP_HDR_NETIF_ETHERNET_H
-
-#include "net/opt.h"
-
-#include "net/pbuf.h"
-#include "net/netif.h"
-#include "net/prot/ethernet.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if LWIP_ARP || LWIP_ETHERNET
-
-/** Define this to 1 and define LWIP_ARP_FILTER_NETIF_FN(pbuf, netif, type)
- * to a filter function that returns the correct netif when using multiple
- * netifs on one hardware interface where the netif's low-level receive
- * routine cannot decide for the correct netif (e.g. when mapping multiple
- * IP addresses to one hardware interface).
- */
-#ifndef LWIP_ARP_FILTER_NETIF
-#define LWIP_ARP_FILTER_NETIF 0
-#endif
-
-err_t ethernet_input(struct pbuf *p, struct netif *netif);
-err_t ethernet_output(struct netif* netif, struct pbuf* p, const struct eth_addr* src, const struct eth_addr* dst, u16_t eth_type);
-
-extern const struct eth_addr ethbroadcast, ethzero;
-
-#endif /* LWIP_ARP || LWIP_ETHERNET */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_NETIF_ETHERNET_H */
diff --git a/sys/include/netif/ethernetif.h b/sys/include/netif/ethernetif.h
deleted file mode 100644
index 4444e01..0000000
--- a/sys/include/netif/ethernetif.h
+++ /dev/null
@@ -1 +0,0 @@
-err_t ethernetif_init(struct netif *netif);
diff --git a/sys/include/netif/lowpan6.h b/sys/include/netif/lowpan6.h
deleted file mode 100644
index e72add1..0000000
--- a/sys/include/netif/lowpan6.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * @file
- *
- * 6LowPAN output for IPv6. Uses ND tables for link-layer addressing. Fragments packets to 6LowPAN units.
- */
-
-/*
- * Copyright (c) 2015 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#ifndef LWIP_HDR_LOWPAN6_H
-#define LWIP_HDR_LOWPAN6_H
-
-#include "netif/lowpan6_opts.h"
-
-#if LWIP_IPV6 && LWIP_6LOWPAN /* don't build if not configured for use in lwipopts.h */
-
-#include "net/pbuf.h"
-#include "net/ip.h"
-#include "net/ip_addr.h"
-#include "net/netif.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** 1 second period */
-#define LOWPAN6_TMR_INTERVAL 1000
-
-void lowpan6_tmr(void);
-
-err_t lowpan6_set_context(u8_t index, const ip6_addr_t * context);
-err_t lowpan6_set_short_addr(u8_t addr_high, u8_t addr_low);
-
-#if LWIP_IPV4
-err_t lowpan4_output(struct netif *netif, struct pbuf *q, const ip4_addr_t *ipaddr);
-#endif /* LWIP_IPV4 */
-err_t lowpan6_output(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr);
-err_t lowpan6_input(struct pbuf * p, struct netif *netif);
-err_t lowpan6_if_init(struct netif *netif);
-
-/* pan_id in network byte order. */
-err_t lowpan6_set_pan_id(u16_t pan_id);
-
-#if !NO_SYS
-err_t tcpip_6lowpan_input(struct pbuf *p, struct netif *inp);
-#endif /* !NO_SYS */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_IPV6 && LWIP_6LOWPAN */
-
-#endif /* LWIP_HDR_LOWPAN6_H */
diff --git a/sys/include/netif/lowpan6_opts.h b/sys/include/netif/lowpan6_opts.h
deleted file mode 100644
index 19c64b6..0000000
--- a/sys/include/netif/lowpan6_opts.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * @file
- * 6LowPAN options list
- */
-
-/*
- * Copyright (c) 2015 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#ifndef LWIP_HDR_LOWPAN6_OPTS_H
-#define LWIP_HDR_LOWPAN6_OPTS_H
-
-#include "net/opt.h"
-
-#ifndef LWIP_6LOWPAN
-#define LWIP_6LOWPAN                     0
-#endif
-
-#ifndef LWIP_6LOWPAN_NUM_CONTEXTS
-#define LWIP_6LOWPAN_NUM_CONTEXTS        10
-#endif
-
-#ifndef LWIP_6LOWPAN_INFER_SHORT_ADDRESS
-#define LWIP_6LOWPAN_INFER_SHORT_ADDRESS 1
-#endif
-
-#ifndef LWIP_6LOWPAN_IPHC
-#define LWIP_6LOWPAN_IPHC                1
-#endif
-
-#ifndef LWIP_6LOWPAN_HW_CRC
-#define LWIP_6LOWPAN_HW_CRC              1
-#endif
-
-#ifndef LOWPAN6_DEBUG
-#define LOWPAN6_DEBUG                    LWIP_DBG_OFF
-#endif
-
-#endif /* LWIP_HDR_LOWPAN6_OPTS_H */
diff --git a/sys/include/netif/ppp/ccp.h b/sys/include/netif/ppp/ccp.h
deleted file mode 100644
index 14dd659..0000000
--- a/sys/include/netif/ppp/ccp.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * ccp.h - Definitions for PPP Compression Control Protocol.
- *
- * Copyright (c) 1994-2002 Paul Mackerras. 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. The name(s) of the authors of this software must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * 3. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Paul Mackerras
- *     <paulus@samba.org>".
- *
- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ccp.h,v 1.12 2004/11/04 10:02:26 paulus Exp $
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && CCP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-#ifndef CCP_H
-#define CCP_H
-
-/*
- * CCP codes.
- */
-
-#define CCP_CONFREQ	1
-#define CCP_CONFACK	2
-#define CCP_TERMREQ	5
-#define CCP_TERMACK	6
-#define CCP_RESETREQ	14
-#define CCP_RESETACK	15
-
-/*
- * Max # bytes for a CCP option
- */
-
-#define CCP_MAX_OPTION_LENGTH	32
-
-/*
- * Parts of a CCP packet.
- */
-
-#define CCP_CODE(dp)		((dp)[0])
-#define CCP_ID(dp)		((dp)[1])
-#define CCP_LENGTH(dp)		(((dp)[2] << 8) + (dp)[3])
-#define CCP_HDRLEN		4
-
-#define CCP_OPT_CODE(dp)	((dp)[0])
-#define CCP_OPT_LENGTH(dp)	((dp)[1])
-#define CCP_OPT_MINLEN		2
-
-#if BSDCOMPRESS_SUPPORT
-/*
- * Definitions for BSD-Compress.
- */
-
-#define CI_BSD_COMPRESS		21	/* config. option for BSD-Compress */
-#define CILEN_BSD_COMPRESS	3	/* length of config. option */
-
-/* Macros for handling the 3rd byte of the BSD-Compress config option. */
-#define BSD_NBITS(x)		((x) & 0x1F)	/* number of bits requested */
-#define BSD_VERSION(x)		((x) >> 5)	/* version of option format */
-#define BSD_CURRENT_VERSION	1		/* current version number */
-#define BSD_MAKE_OPT(v, n)	(((v) << 5) | (n))
-
-#define BSD_MIN_BITS		9	/* smallest code size supported */
-#define BSD_MAX_BITS		15	/* largest code size supported */
-#endif /* BSDCOMPRESS_SUPPORT */
-
-#if DEFLATE_SUPPORT
-/*
- * Definitions for Deflate.
- */
-
-#define CI_DEFLATE		26	/* config option for Deflate */
-#define CI_DEFLATE_DRAFT	24	/* value used in original draft RFC */
-#define CILEN_DEFLATE		4	/* length of its config option */
-
-#define DEFLATE_MIN_SIZE	9
-#define DEFLATE_MAX_SIZE	15
-#define DEFLATE_METHOD_VAL	8
-#define DEFLATE_SIZE(x)		(((x) >> 4) + 8)
-#define DEFLATE_METHOD(x)	((x) & 0x0F)
-#define DEFLATE_MAKE_OPT(w)	((((w) - 8) << 4) + DEFLATE_METHOD_VAL)
-#define DEFLATE_CHK_SEQUENCE	0
-#endif /* DEFLATE_SUPPORT */
-
-#if MPPE_SUPPORT
-/*
- * Definitions for MPPE.
- */
-
-#define CI_MPPE                18      /* config option for MPPE */
-#define CILEN_MPPE              6      /* length of config option */
-#endif /* MPPE_SUPPORT */
-
-#if PREDICTOR_SUPPORT
-/*
- * Definitions for other, as yet unsupported, compression methods.
- */
-
-#define CI_PREDICTOR_1		1	/* config option for Predictor-1 */
-#define CILEN_PREDICTOR_1	2	/* length of its config option */
-#define CI_PREDICTOR_2		2	/* config option for Predictor-2 */
-#define CILEN_PREDICTOR_2	2	/* length of its config option */
-#endif /* PREDICTOR_SUPPORT */
-
-typedef struct ccp_options {
-#if DEFLATE_SUPPORT
-    unsigned int deflate          :1; /* do Deflate? */
-    unsigned int deflate_correct  :1; /* use correct code for deflate? */
-    unsigned int deflate_draft    :1; /* use draft RFC code for deflate? */
-#endif /* DEFLATE_SUPPORT */
-#if BSDCOMPRESS_SUPPORT
-    unsigned int bsd_compress     :1; /* do BSD Compress? */
-#endif /* BSDCOMPRESS_SUPPORT */
-#if PREDICTOR_SUPPORT
-    unsigned int predictor_1      :1; /* do Predictor-1? */
-    unsigned int predictor_2      :1; /* do Predictor-2? */
-#endif /* PREDICTOR_SUPPORT */
-
-#if MPPE_SUPPORT
-    u8_t mppe;			/* MPPE bitfield */
-#endif /* MPPE_SUPPORT */
-#if BSDCOMPRESS_SUPPORT
-    u_short bsd_bits;		/* # bits/code for BSD Compress */
-#endif /* BSDCOMPRESS_SUPPORT */
-#if DEFLATE_SUPPORT
-    u_short deflate_size;	/* lg(window size) for Deflate */
-#endif /* DEFLATE_SUPPORT */
-    u8_t method;		/* code for chosen compression method */
-} ccp_options;
-
-extern const struct protent ccp_protent;
-
-void ccp_resetrequest(ppp_pcb *pcb);  /* Issue a reset-request. */
-
-#endif /* CCP_H */
-#endif /* PPP_SUPPORT && CCP_SUPPORT */
diff --git a/sys/include/netif/ppp/chap-md5.h b/sys/include/netif/ppp/chap-md5.h
deleted file mode 100644
index eb0269f..0000000
--- a/sys/include/netif/ppp/chap-md5.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * chap-md5.h - New CHAP/MD5 implementation.
- *
- * Copyright (c) 2003 Paul Mackerras. 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. The name(s) of the authors of this software must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * 3. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Paul Mackerras
- *     <paulus@samba.org>".
- *
- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && CHAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-extern const struct chap_digest_type md5_digest;
-
-#endif /* PPP_SUPPORT && CHAP_SUPPORT */
diff --git a/sys/include/netif/ppp/chap-new.h b/sys/include/netif/ppp/chap-new.h
deleted file mode 100644
index 64eae32..0000000
--- a/sys/include/netif/ppp/chap-new.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * chap-new.c - New CHAP implementation.
- *
- * Copyright (c) 2003 Paul Mackerras. 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. The name(s) of the authors of this software must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * 3. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Paul Mackerras
- *     <paulus@samba.org>".
- *
- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && CHAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-#ifndef CHAP_H
-#define CHAP_H
-
-#include "ppp.h"
-
-/*
- * CHAP packets begin with a standard header with code, id, len (2 bytes).
- */
-#define CHAP_HDRLEN	4
-
-/*
- * Values for the code field.
- */
-#define CHAP_CHALLENGE	1
-#define CHAP_RESPONSE	2
-#define CHAP_SUCCESS	3
-#define CHAP_FAILURE	4
-
-/*
- * CHAP digest codes.
- */
-#define CHAP_MD5		5
-#if MSCHAP_SUPPORT
-#define CHAP_MICROSOFT		0x80
-#define CHAP_MICROSOFT_V2	0x81
-#endif /* MSCHAP_SUPPORT */
-
-/*
- * Semi-arbitrary limits on challenge and response fields.
- */
-#define MAX_CHALLENGE_LEN	64
-#define MAX_RESPONSE_LEN	64
-
-/*
- * These limits apply to challenge and response packets we send.
- * The +4 is the +1 that we actually need rounded up.
- */
-#define CHAL_MAX_PKTLEN	(PPP_HDRLEN + CHAP_HDRLEN + 4 + MAX_CHALLENGE_LEN + MAXNAMELEN)
-#define RESP_MAX_PKTLEN	(PPP_HDRLEN + CHAP_HDRLEN + 4 + MAX_RESPONSE_LEN + MAXNAMELEN)
-
-/* bitmask of supported algorithms */
-#if MSCHAP_SUPPORT
-#define MDTYPE_MICROSOFT_V2	0x1
-#define MDTYPE_MICROSOFT	0x2
-#endif /* MSCHAP_SUPPORT */
-#define MDTYPE_MD5		0x4
-#define MDTYPE_NONE		0
-
-#if MSCHAP_SUPPORT
-/* Return the digest alg. ID for the most preferred digest type. */
-#define CHAP_DIGEST(mdtype) \
-    ((mdtype) & MDTYPE_MD5)? CHAP_MD5: \
-    ((mdtype) & MDTYPE_MICROSOFT_V2)? CHAP_MICROSOFT_V2: \
-    ((mdtype) & MDTYPE_MICROSOFT)? CHAP_MICROSOFT: \
-    0
-#else /* !MSCHAP_SUPPORT */
-#define CHAP_DIGEST(mdtype) \
-    ((mdtype) & MDTYPE_MD5)? CHAP_MD5: \
-    0
-#endif /* MSCHAP_SUPPORT */
-
-/* Return the bit flag (lsb set) for our most preferred digest type. */
-#define CHAP_MDTYPE(mdtype) ((mdtype) ^ ((mdtype) - 1)) & (mdtype)
-
-/* Return the bit flag for a given digest algorithm ID. */
-#if MSCHAP_SUPPORT
-#define CHAP_MDTYPE_D(digest) \
-    ((digest) == CHAP_MICROSOFT_V2)? MDTYPE_MICROSOFT_V2: \
-    ((digest) == CHAP_MICROSOFT)? MDTYPE_MICROSOFT: \
-    ((digest) == CHAP_MD5)? MDTYPE_MD5: \
-    0
-#else /* !MSCHAP_SUPPORT */
-#define CHAP_MDTYPE_D(digest) \
-    ((digest) == CHAP_MD5)? MDTYPE_MD5: \
-    0
-#endif /* MSCHAP_SUPPORT */
-
-/* Can we do the requested digest? */
-#if MSCHAP_SUPPORT
-#define CHAP_CANDIGEST(mdtype, digest) \
-    ((digest) == CHAP_MICROSOFT_V2)? (mdtype) & MDTYPE_MICROSOFT_V2: \
-    ((digest) == CHAP_MICROSOFT)? (mdtype) & MDTYPE_MICROSOFT: \
-    ((digest) == CHAP_MD5)? (mdtype) & MDTYPE_MD5: \
-    0
-#else /* !MSCHAP_SUPPORT */
-#define CHAP_CANDIGEST(mdtype, digest) \
-    ((digest) == CHAP_MD5)? (mdtype) & MDTYPE_MD5: \
-    0
-#endif /* MSCHAP_SUPPORT */
-
-/*
- * The code for each digest type has to supply one of these.
- */
-struct chap_digest_type {
-	int code;
-
-#if PPP_SERVER
-	/*
-	 * Note: challenge and response arguments below are formatted as
-	 * a length byte followed by the actual challenge/response data.
-	 */
-	void (*generate_challenge)(ppp_pcb *pcb, unsigned char *challenge);
-	int (*verify_response)(ppp_pcb *pcb, int id, const char *name,
-		const unsigned char *secret, int secret_len,
-		const unsigned char *challenge, const unsigned char *response,
-		char *message, int message_space);
-#endif /* PPP_SERVER */
-	void (*make_response)(ppp_pcb *pcb, unsigned char *response, int id, const char *our_name,
-		const unsigned char *challenge, const char *secret, int secret_len,
-		unsigned char *priv);
-	int (*check_success)(ppp_pcb *pcb, unsigned char *pkt, int len, unsigned char *priv);
-	void (*handle_failure)(ppp_pcb *pcb, unsigned char *pkt, int len);
-};
-
-/*
- * Each interface is described by chap structure.
- */
-#if CHAP_SUPPORT
-typedef struct chap_client_state {
-	u8_t flags;
-	const char *name;
-	const struct chap_digest_type *digest;
-	unsigned char priv[64];		/* private area for digest's use */
-} chap_client_state;
-
-#if PPP_SERVER
-typedef struct chap_server_state {
-	u8_t flags;
-	u8_t id;
-	const char *name;
-	const struct chap_digest_type *digest;
-	int challenge_xmits;
-	int challenge_pktlen;
-	unsigned char challenge[CHAL_MAX_PKTLEN];
-} chap_server_state;
-#endif /* PPP_SERVER */
-#endif /* CHAP_SUPPORT */
-
-#if 0 /* UNUSED */
-/* Hook for a plugin to validate CHAP challenge */
-extern int (*chap_verify_hook)(char *name, char *ourname, int id,
-			const struct chap_digest_type *digest,
-			unsigned char *challenge, unsigned char *response,
-			char *message, int message_space);
-#endif /* UNUSED */
-
-#if PPP_SERVER
-/* Called by authentication code to start authenticating the peer. */
-extern void chap_auth_peer(ppp_pcb *pcb, const char *our_name, int digest_code);
-#endif /* PPP_SERVER */
-
-/* Called by auth. code to start authenticating us to the peer. */
-extern void chap_auth_with_peer(ppp_pcb *pcb, const char *our_name, int digest_code);
-
-/* Represents the CHAP protocol to the main pppd code */
-extern const struct protent chap_protent;
-
-#endif /* CHAP_H */
-#endif /* PPP_SUPPORT && CHAP_SUPPORT */
diff --git a/sys/include/netif/ppp/chap_ms.h b/sys/include/netif/ppp/chap_ms.h
deleted file mode 100644
index 0795291..0000000
--- a/sys/include/netif/ppp/chap_ms.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * chap_ms.h - Challenge Handshake Authentication Protocol definitions.
- *
- * Copyright (c) 1995 Eric Rosenquist.  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(s) of the authors of this software must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: chap_ms.h,v 1.13 2004/11/15 22:13:26 paulus Exp $
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && MSCHAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-#ifndef CHAPMS_INCLUDE
-#define CHAPMS_INCLUDE
-
-extern const struct chap_digest_type chapms_digest;
-extern const struct chap_digest_type chapms2_digest;
-
-#endif /* CHAPMS_INCLUDE */
-
-#endif /* PPP_SUPPORT && MSCHAP_SUPPORT */
diff --git a/sys/include/netif/ppp/eap.h b/sys/include/netif/ppp/eap.h
deleted file mode 100644
index 3ee9aaf..0000000
--- a/sys/include/netif/ppp/eap.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * eap.h - Extensible Authentication Protocol for PPP (RFC 2284)
- *
- * Copyright (c) 2001 by Sun Microsystems, Inc.
- * All rights reserved.
- *
- * Non-exclusive rights to redistribute, modify, translate, and use
- * this software in source and binary forms, in whole or in part, is
- * hereby granted, provided that the above copyright notice is
- * duplicated in any source form, and that neither the name of the
- * copyright holder nor the author is used to endorse or promote
- * products derived from this software.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Original version by James Carlson
- *
- * $Id: eap.h,v 1.2 2003/06/11 23:56:26 paulus Exp $
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && EAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-#ifndef PPP_EAP_H
-#define	PPP_EAP_H
-
-#include "ppp.h"
-
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-/*
- * Packet header = Code, id, length.
- */
-#define	EAP_HEADERLEN	4
-
-
-/* EAP message codes. */
-#define	EAP_REQUEST	1
-#define	EAP_RESPONSE	2
-#define	EAP_SUCCESS	3
-#define	EAP_FAILURE	4
-
-/* EAP types */
-#define	EAPT_IDENTITY		1
-#define	EAPT_NOTIFICATION	2
-#define	EAPT_NAK		3	/* (response only) */
-#define	EAPT_MD5CHAP		4
-#define	EAPT_OTP		5	/* One-Time Password; RFC 1938 */
-#define	EAPT_TOKEN		6	/* Generic Token Card */
-/* 7 and 8 are unassigned. */
-#define	EAPT_RSA		9	/* RSA Public Key Authentication */
-#define	EAPT_DSS		10	/* DSS Unilateral */
-#define	EAPT_KEA		11	/* KEA */
-#define	EAPT_KEA_VALIDATE	12	/* KEA-VALIDATE	*/
-#define	EAPT_TLS		13	/* EAP-TLS */
-#define	EAPT_DEFENDER		14	/* Defender Token (AXENT) */
-#define	EAPT_W2K		15	/* Windows 2000 EAP */
-#define	EAPT_ARCOT		16	/* Arcot Systems */
-#define	EAPT_CISCOWIRELESS	17	/* Cisco Wireless */
-#define	EAPT_NOKIACARD		18	/* Nokia IP smart card */
-#define	EAPT_SRP		19	/* Secure Remote Password */
-/* 20 is deprecated */
-
-/* EAP SRP-SHA1 Subtypes */
-#define	EAPSRP_CHALLENGE	1	/* Request 1 - Challenge */
-#define	EAPSRP_CKEY		1	/* Response 1 - Client Key */
-#define	EAPSRP_SKEY		2	/* Request 2 - Server Key */
-#define	EAPSRP_CVALIDATOR	2	/* Response 2 - Client Validator */
-#define	EAPSRP_SVALIDATOR	3	/* Request 3 - Server Validator */
-#define	EAPSRP_ACK		3	/* Response 3 - final ack */
-#define	EAPSRP_LWRECHALLENGE	4	/* Req/resp 4 - Lightweight rechal */
-
-#define	SRPVAL_EBIT	0x00000001	/* Use shared key for ECP */
-
-#define	SRP_PSEUDO_ID	"pseudo_"
-#define	SRP_PSEUDO_LEN	7
-
-#define MD5_SIGNATURE_SIZE	16
-#define EAP_MIN_CHALLENGE_LENGTH	17
-#define EAP_MAX_CHALLENGE_LENGTH	24
-#define EAP_MIN_MAX_POWER_OF_TWO_CHALLENGE_LENGTH     3   /* 2^3-1 = 7, 17+7 = 24 */
-
-#define	EAP_STATES	\
-	"Initial", "Pending", "Closed", "Listen", "Identify", \
-	"SRP1", "SRP2", "SRP3", "MD5Chall", "Open", "SRP4", "BadAuth"
-
-#define	eap_client_active(pcb)	((pcb)->eap.es_client.ea_state == eapListen)
-#if PPP_SERVER
-#define	eap_server_active(pcb)	\
-	((pcb)->eap.es_server.ea_state >= eapIdentify && \
-	 (pcb)->eap.es_server.ea_state <= eapMD5Chall)
-#endif /* PPP_SERVER */
-
-/*
- * Complete EAP state for one PPP session.
- */
-enum eap_state_code {
-	eapInitial = 0,	/* No EAP authentication yet requested */
-	eapPending,	/* Waiting for LCP (no timer) */
-	eapClosed,	/* Authentication not in use */
-	eapListen,	/* Client ready (and timer running) */
-	eapIdentify,	/* EAP Identify sent */
-	eapSRP1,	/* Sent EAP SRP-SHA1 Subtype 1 */
-	eapSRP2,	/* Sent EAP SRP-SHA1 Subtype 2 */
-	eapSRP3,	/* Sent EAP SRP-SHA1 Subtype 3 */
-	eapMD5Chall,	/* Sent MD5-Challenge */
-	eapOpen,	/* Completed authentication */
-	eapSRP4,	/* Sent EAP SRP-SHA1 Subtype 4 */
-	eapBadAuth	/* Failed authentication */
-};
-
-struct eap_auth {
-	const char *ea_name;	/* Our name */
-	char ea_peer[MAXNAMELEN +1];	/* Peer's name */
-	void *ea_session;	/* Authentication library linkage */
-	u_char *ea_skey;	/* Shared encryption key */
-	u_short ea_namelen;	/* Length of our name */
-	u_short ea_peerlen;	/* Length of peer's name */
-	enum eap_state_code ea_state;
-	u_char ea_id;		/* Current id */
-	u_char ea_requests;	/* Number of Requests sent/received */
-	u_char ea_responses;	/* Number of Responses */
-	u_char ea_type;		/* One of EAPT_* */
-	u32_t ea_keyflags;	/* SRP shared key usage flags */
-};
-
-#ifndef EAP_MAX_CHALLENGE_LENGTH
-#define EAP_MAX_CHALLENGE_LENGTH	24
-#endif
-typedef struct eap_state {
-	struct eap_auth es_client;	/* Client (authenticatee) data */
-#if PPP_SERVER
-	struct eap_auth es_server;	/* Server (authenticator) data */
-#endif /* PPP_SERVER */
-	int es_savedtime;		/* Saved timeout */
-	int es_rechallenge;		/* EAP rechallenge interval */
-	int es_lwrechallenge;		/* SRP lightweight rechallenge inter */
-	u8_t es_usepseudo;		/* Use SRP Pseudonym if offered one */
-	int es_usedpseudo;		/* Set if we already sent PN */
-	int es_challen;			/* Length of challenge string */
-	u_char es_challenge[EAP_MAX_CHALLENGE_LENGTH];
-} eap_state;
-
-/*
- * Timeouts.
- */
-#if 0 /* moved to ppp_opts.h */
-#define	EAP_DEFTIMEOUT		3	/* Timeout (seconds) for rexmit */
-#define	EAP_DEFTRANSMITS	10	/* max # times to transmit */
-#define	EAP_DEFREQTIME		20	/* Time to wait for peer request */
-#define	EAP_DEFALLOWREQ		20	/* max # times to accept requests */
-#endif /* moved to ppp_opts.h */
-
-void eap_authwithpeer(ppp_pcb *pcb, const char *localname);
-void eap_authpeer(ppp_pcb *pcb, const char *localname);
-
-extern const struct protent eap_protent;
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* PPP_EAP_H */
-
-#endif /* PPP_SUPPORT && EAP_SUPPORT */
diff --git a/sys/include/netif/ppp/ecp.h b/sys/include/netif/ppp/ecp.h
deleted file mode 100644
index 5cdce29..0000000
--- a/sys/include/netif/ppp/ecp.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * ecp.h - Definitions for PPP Encryption Control Protocol.
- *
- * Copyright (c) 2002 Google, Inc.
- * 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(s) of the authors of this software must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ecp.h,v 1.2 2003/01/10 07:12:36 fcusack Exp $
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && ECP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-typedef struct ecp_options {
-    bool required;		/* Is ECP required? */
-    unsigned enctype;		/* Encryption type */
-} ecp_options;
-
-extern fsm ecp_fsm[];
-extern ecp_options ecp_wantoptions[];
-extern ecp_options ecp_gotoptions[];
-extern ecp_options ecp_allowoptions[];
-extern ecp_options ecp_hisoptions[];
-
-extern const struct protent ecp_protent;
-
-#endif /* PPP_SUPPORT && ECP_SUPPORT */
diff --git a/sys/include/netif/ppp/eui64.h b/sys/include/netif/ppp/eui64.h
deleted file mode 100644
index 20ac22e..0000000
--- a/sys/include/netif/ppp/eui64.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * eui64.h - EUI64 routines for IPv6CP.
- *
- * Copyright (c) 1999 Tommi Komulainen.  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(s) of the authors of this software must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Tommi Komulainen
- *     <Tommi.Komulainen@iki.fi>".
- *
- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: eui64.h,v 1.6 2002/12/04 23:03:32 paulus Exp $
-*/
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && PPP_IPV6_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-#ifndef EUI64_H
-#define EUI64_H
-
-/*
- * @todo:
- *
- * Maybe this should be done by processing struct in6_addr directly...
- */
-typedef union
-{
-    u8_t e8[8];
-    u16_t e16[4];
-    u32_t e32[2];
-} eui64_t;
-
-#define eui64_iszero(e)		(((e).e32[0] | (e).e32[1]) == 0)
-#define eui64_equals(e, o)	(((e).e32[0] == (o).e32[0]) && \
-				((e).e32[1] == (o).e32[1]))
-#define eui64_zero(e)		(e).e32[0] = (e).e32[1] = 0;
-
-#define eui64_copy(s, d)	memcpy(&(d), &(s), sizeof(eui64_t))
-
-#define eui64_magic(e)		do {			\
-				(e).e32[0] = magic();	\
-				(e).e32[1] = magic();	\
-				(e).e8[0] &= ~2;	\
-				} while (0)
-#define eui64_magic_nz(x)	do {				\
-				eui64_magic(x);			\
-				} while (eui64_iszero(x))
-#define eui64_magic_ne(x, y)	do {				\
-				eui64_magic(x);			\
-				} while (eui64_equals(x, y))
-
-#define eui64_get(ll, cp)	do {				\
-				eui64_copy((*cp), (ll));	\
-				(cp) += sizeof(eui64_t);	\
-				} while (0)
-
-#define eui64_put(ll, cp)	do {				\
-				eui64_copy((ll), (*cp));	\
-				(cp) += sizeof(eui64_t);	\
-				} while (0)
-
-#define eui64_set32(e, l)	do {			\
-				(e).e32[0] = 0;		\
-				(e).e32[1] = lwip_htonl(l);	\
-				} while (0)
-#define eui64_setlo32(e, l)	eui64_set32(e, l)
-
-char *eui64_ntoa(eui64_t);	/* Returns ascii representation of id */
-
-#endif /* EUI64_H */
-#endif /* PPP_SUPPORT && PPP_IPV6_SUPPORT */
diff --git a/sys/include/netif/ppp/fsm.h b/sys/include/netif/ppp/fsm.h
deleted file mode 100644
index b6915d3..0000000
--- a/sys/include/netif/ppp/fsm.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * fsm.h - {Link, IP} Control Protocol Finite State Machine definitions.
- *
- * Copyright (c) 1984-2000 Carnegie Mellon University. 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 "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Office of Technology Transfer
- *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: fsm.h,v 1.10 2004/11/13 02:28:15 paulus Exp $
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef FSM_H
-#define	FSM_H
-
-#include "ppp.h"
-
-/*
- * Packet header = Code, id, length.
- */
-#define HEADERLEN	4
-
-
-/*
- *  CP (LCP, IPCP, etc.) codes.
- */
-#define CONFREQ		1	/* Configuration Request */
-#define CONFACK		2	/* Configuration Ack */
-#define CONFNAK		3	/* Configuration Nak */
-#define CONFREJ		4	/* Configuration Reject */
-#define TERMREQ		5	/* Termination Request */
-#define TERMACK		6	/* Termination Ack */
-#define CODEREJ		7	/* Code Reject */
-
-
-/*
- * Each FSM is described by an fsm structure and fsm callbacks.
- */
-typedef struct fsm {
-    ppp_pcb *pcb;		/* PPP Interface */
-    const struct fsm_callbacks *callbacks;	/* Callback routines */
-    const char *term_reason;	/* Reason for closing protocol */
-    u8_t seen_ack;		/* Have received valid Ack/Nak/Rej to Req */
-				  /* -- This is our only flag, we might use u_int :1 if we have more flags */
-    u16_t protocol;		/* Data Link Layer Protocol field value */
-    u8_t state;			/* State */
-    u8_t flags;			/* Contains option bits */
-    u8_t id;			/* Current id */
-    u8_t reqid;			/* Current request id */
-    u8_t retransmits;		/* Number of retransmissions left */
-    u8_t nakloops;		/* Number of nak loops since last ack */
-    u8_t rnakloops;		/* Number of naks received */
-    u8_t maxnakloops;		/* Maximum number of nak loops tolerated
-				   (necessary because IPCP require a custom large max nak loops value) */
-    u8_t term_reason_len;	/* Length of term_reason */
-} fsm;
-
-
-typedef struct fsm_callbacks {
-    void (*resetci)		/* Reset our Configuration Information */
-		(fsm *);
-    int  (*cilen)		/* Length of our Configuration Information */
-		(fsm *);
-    void (*addci) 		/* Add our Configuration Information */
-		(fsm *, u_char *, int *);
-    int  (*ackci)		/* ACK our Configuration Information */
-		(fsm *, u_char *, int);
-    int  (*nakci)		/* NAK our Configuration Information */
-		(fsm *, u_char *, int, int);
-    int  (*rejci)		/* Reject our Configuration Information */
-		(fsm *, u_char *, int);
-    int  (*reqci)		/* Request peer's Configuration Information */
-		(fsm *, u_char *, int *, int);
-    void (*up)			/* Called when fsm reaches PPP_FSM_OPENED state */
-		(fsm *);
-    void (*down)		/* Called when fsm leaves PPP_FSM_OPENED state */
-		(fsm *);
-    void (*starting)		/* Called when we want the lower layer */
-		(fsm *);
-    void (*finished)		/* Called when we don't want the lower layer */
-		(fsm *);
-    void (*protreject)		/* Called when Protocol-Reject received */
-		(int);
-    void (*retransmit)		/* Retransmission is necessary */
-		(fsm *);
-    int  (*extcode)		/* Called when unknown code received */
-		(fsm *, int, int, u_char *, int);
-    const char *proto_name;	/* String name for protocol (for messages) */
-} fsm_callbacks;
-
-
-/*
- * Link states.
- */
-#define PPP_FSM_INITIAL		0	/* Down, hasn't been opened */
-#define PPP_FSM_STARTING	1	/* Down, been opened */
-#define PPP_FSM_CLOSED		2	/* Up, hasn't been opened */
-#define PPP_FSM_STOPPED		3	/* Open, waiting for down event */
-#define PPP_FSM_CLOSING		4	/* Terminating the connection, not open */
-#define PPP_FSM_STOPPING	5	/* Terminating, but open */
-#define PPP_FSM_REQSENT		6	/* We've sent a Config Request */
-#define PPP_FSM_ACKRCVD		7	/* We've received a Config Ack */
-#define PPP_FSM_ACKSENT		8	/* We've sent a Config Ack */
-#define PPP_FSM_OPENED		9	/* Connection available */
-
-
-/*
- * Flags - indicate options controlling FSM operation
- */
-#define OPT_PASSIVE	1	/* Don't die if we don't get a response */
-#define OPT_RESTART	2	/* Treat 2nd OPEN as DOWN, UP */
-#define OPT_SILENT	4	/* Wait for peer to speak first */
-
-
-/*
- * Timeouts.
- */
-#if 0 /* moved to ppp_opts.h */
-#define DEFTIMEOUT	3	/* Timeout time in seconds */
-#define DEFMAXTERMREQS	2	/* Maximum Terminate-Request transmissions */
-#define DEFMAXCONFREQS	10	/* Maximum Configure-Request transmissions */
-#define DEFMAXNAKLOOPS	5	/* Maximum number of nak loops */
-#endif /* moved to ppp_opts.h */
-
-
-/*
- * Prototypes
- */
-void fsm_init(fsm *f);
-void fsm_lowerup(fsm *f);
-void fsm_lowerdown(fsm *f);
-void fsm_open(fsm *f);
-void fsm_close(fsm *f, const char *reason);
-void fsm_input(fsm *f, u_char *inpacket, int l);
-void fsm_protreject(fsm *f);
-void fsm_sdata(fsm *f, u_char code, u_char id, const u_char *data, int datalen);
-
-
-#endif /* FSM_H */
-#endif /* PPP_SUPPORT */
diff --git a/sys/include/netif/ppp/ipcp.h b/sys/include/netif/ppp/ipcp.h
deleted file mode 100644
index 45f46b3..0000000
--- a/sys/include/netif/ppp/ipcp.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * ipcp.h - IP Control Protocol definitions.
- *
- * Copyright (c) 1984-2000 Carnegie Mellon University. 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 "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Office of Technology Transfer
- *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ipcp.h,v 1.14 2002/12/04 23:03:32 paulus Exp $
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && PPP_IPV4_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef IPCP_H
-#define	IPCP_H
-
-/*
- * Options.
- */
-#define CI_ADDRS	1	/* IP Addresses */
-#if VJ_SUPPORT
-#define CI_COMPRESSTYPE	2	/* Compression Type */
-#endif /* VJ_SUPPORT */
-#define	CI_ADDR		3
-
-#if LWIP_DNS
-#define CI_MS_DNS1      129	/* Primary DNS value */
-#define CI_MS_DNS2      131     /* Secondary DNS value */
-#endif /* LWIP_DNS */
-#if 0 /* UNUSED - WINS */
-#define CI_MS_WINS1     130     /* Primary WINS value */
-#define CI_MS_WINS2     132	/* Secondary WINS value */
-#endif /* UNUSED - WINS */
-
-#if VJ_SUPPORT
-#define MAX_STATES 16		/* from slcompress.h */
-
-#define IPCP_VJMODE_OLD 1	/* "old" mode (option # = 0x0037) */
-#define IPCP_VJMODE_RFC1172 2	/* "old-rfc"mode (option # = 0x002d) */
-#define IPCP_VJMODE_RFC1332 3	/* "new-rfc"mode (option # = 0x002d, */
-                                /*  maxslot and slot number compression) */
-
-#define IPCP_VJ_COMP 0x002d	/* current value for VJ compression option*/
-#define IPCP_VJ_COMP_OLD 0x0037	/* "old" (i.e, broken) value for VJ */
-				/* compression option*/ 
-#endif /* VJ_SUPPORT */
-
-typedef struct ipcp_options {
-    unsigned int neg_addr               :1; /* Negotiate IP Address? */
-    unsigned int old_addrs              :1; /* Use old (IP-Addresses) option? */
-    unsigned int req_addr               :1; /* Ask peer to send IP address? */
-#if 0 /* UNUSED */
-    unsigned int default_route          :1; /* Assign default route through interface? */
-    unsigned int replace_default_route  :1; /* Replace default route through interface? */
-#endif /* UNUSED */
-#if 0 /* UNUSED - PROXY ARP */
-    unsigned int proxy_arp              :1; /* Make proxy ARP entry for peer? */
-#endif /* UNUSED - PROXY ARP */
-#if VJ_SUPPORT
-    unsigned int neg_vj                 :1; /* Van Jacobson Compression? */
-    unsigned int old_vj                 :1; /* use old (short) form of VJ option? */
-    unsigned int cflag                  :1;
-#endif /* VJ_SUPPORT */
-    unsigned int accept_local           :1; /* accept peer's value for ouraddr */
-    unsigned int accept_remote          :1; /* accept peer's value for hisaddr */
-#if LWIP_DNS
-    unsigned int req_dns1               :1; /* Ask peer to send primary DNS address? */
-    unsigned int req_dns2               :1; /* Ask peer to send secondary DNS address? */
-#endif /* LWIP_DNS */
-
-    u32_t ouraddr, hisaddr;	/* Addresses in NETWORK BYTE ORDER */
-#if LWIP_DNS
-    u32_t dnsaddr[2];	/* Primary and secondary MS DNS entries */
-#endif /* LWIP_DNS */
-#if 0 /* UNUSED - WINS */
-    u32_t winsaddr[2];	/* Primary and secondary MS WINS entries */
-#endif /* UNUSED - WINS */
-
-#if VJ_SUPPORT
-    u16_t vj_protocol;		/* protocol value to use in VJ option */
-    u8_t  maxslotindex;		/* values for RFC1332 VJ compression neg. */
-#endif /* VJ_SUPPORT */
-} ipcp_options;
-
-#if 0 /* UNUSED, already defined by lwIP */
-char *ip_ntoa (u32_t);
-#endif /* UNUSED, already defined by lwIP */
-
-extern const struct protent ipcp_protent;
-
-#endif /* IPCP_H */
-#endif /* PPP_SUPPORT && PPP_IPV4_SUPPORT */
diff --git a/sys/include/netif/ppp/ipv6cp.h b/sys/include/netif/ppp/ipv6cp.h
deleted file mode 100644
index 07d1ae3..0000000
--- a/sys/include/netif/ppp/ipv6cp.h
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * ipv6cp.h - PPP IPV6 Control Protocol.
- *
- * Copyright (c) 1999 Tommi Komulainen.  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(s) of the authors of this software must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Tommi Komulainen
- *     <Tommi.Komulainen@iki.fi>".
- *
- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-/*  Original version, based on RFC2023 :
-
-    Copyright (c) 1995, 1996, 1997 Francis.Dupont@inria.fr, INRIA Rocquencourt,
-    Alain.Durand@imag.fr, IMAG,
-    Jean-Luc.Richier@imag.fr, IMAG-LSR.
-
-    Copyright (c) 1998, 1999 Francis.Dupont@inria.fr, GIE DYADE,
-    Alain.Durand@imag.fr, IMAG,
-    Jean-Luc.Richier@imag.fr, IMAG-LSR.
-
-    Ce travail a été fait au sein du GIE DYADE (Groupement d'Intérêt
-    Économique ayant pour membres BULL S.A. et l'INRIA).
-
-    Ce logiciel informatique est disponible aux conditions
-    usuelles dans la recherche, c'est-à-dire qu'il peut
-    être utilisé, copié, modifié, distribué à l'unique
-    condition que ce texte soit conservé afin que
-    l'origine de ce logiciel soit reconnue.
-
-    Le nom de l'Institut National de Recherche en Informatique
-    et en Automatique (INRIA), de l'IMAG, ou d'une personne morale
-    ou physique ayant participé à l'élaboration de ce logiciel ne peut
-    être utilisé sans son accord préalable explicite.
-
-    Ce logiciel est fourni tel quel sans aucune garantie,
-    support ou responsabilité d'aucune sorte.
-    Ce logiciel est dérivé de sources d'origine
-    "University of California at Berkeley" et
-    "Digital Equipment Corporation" couvertes par des copyrights.
-
-    L'Institut d'Informatique et de Mathématiques Appliquées de Grenoble (IMAG)
-    est une fédération d'unités mixtes de recherche du CNRS, de l'Institut National
-    Polytechnique de Grenoble et de l'Université Joseph Fourier regroupant
-    sept laboratoires dont le laboratoire Logiciels, Systèmes, Réseaux (LSR).
-
-    This work has been done in the context of GIE DYADE (joint R & D venture
-    between BULL S.A. and INRIA).
-
-    This software is available with usual "research" terms
-    with the aim of retain credits of the software. 
-    Permission to use, copy, modify and distribute this software for any
-    purpose and without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies,
-    and the name of INRIA, IMAG, or any contributor not be used in advertising
-    or publicity pertaining to this material without the prior explicit
-    permission. The software is provided "as is" without any
-    warranties, support or liabilities of any kind.
-    This software is derived from source code from
-    "University of California at Berkeley" and
-    "Digital Equipment Corporation" protected by copyrights.
-
-    Grenoble's Institute of Computer Science and Applied Mathematics (IMAG)
-    is a federation of seven research units funded by the CNRS, National
-    Polytechnic Institute of Grenoble and University Joseph Fourier.
-    The research unit in Software, Systems, Networks (LSR) is member of IMAG.
-*/
-
-/*
- * Derived from :
- *
- *
- * ipcp.h - IP Control Protocol definitions.
- *
- * Copyright (c) 1984-2000 Carnegie Mellon University. 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 "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Office of Technology Transfer
- *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: ipv6cp.h,v 1.7 2002/12/04 23:03:32 paulus Exp $
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && PPP_IPV6_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-#ifndef IPV6CP_H
-#define	IPV6CP_H
-
-#include "eui64.h"
-
-/*
- * Options.
- */
-#define CI_IFACEID	1	/* Interface Identifier */
-#ifdef IPV6CP_COMP
-#define CI_COMPRESSTYPE	2	/* Compression Type     */
-#endif /* IPV6CP_COMP */
-
-/* No compression types yet defined.
- *#define IPV6CP_COMP	0x004f
- */
-typedef struct ipv6cp_options {
-    unsigned int neg_ifaceid    :1;  /* Negotiate interface identifier? */
-    unsigned int req_ifaceid    :1;  /* Ask peer to send interface identifier? */
-    unsigned int accept_local   :1;  /* accept peer's value for iface id? */
-    unsigned int opt_local      :1;  /* ourtoken set by option */
-    unsigned int opt_remote     :1;  /* histoken set by option */
-    unsigned int use_ip         :1;  /* use IP as interface identifier */
-#if 0
-    unsigned int use_persistent :1;  /* use uniquely persistent value for address */
-#endif
-#ifdef IPV6CP_COMP
-    unsigned int neg_vj         :1;  /* Van Jacobson Compression? */
-#endif /* IPV6CP_COMP */
-
-#ifdef IPV6CP_COMP
-    u_short vj_protocol;        /* protocol value to use in VJ option */
-#endif /* IPV6CP_COMP */
-    eui64_t ourid, hisid;       /* Interface identifiers */
-} ipv6cp_options;
-
-extern const struct protent ipv6cp_protent;
-
-#endif /* IPV6CP_H */
-#endif /* PPP_SUPPORT && PPP_IPV6_SUPPORT */
diff --git a/sys/include/netif/ppp/lcp.h b/sys/include/netif/ppp/lcp.h
deleted file mode 100644
index 12e2a05..0000000
--- a/sys/include/netif/ppp/lcp.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * lcp.h - Link Control Protocol definitions.
- *
- * Copyright (c) 1984-2000 Carnegie Mellon University. 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 "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Office of Technology Transfer
- *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: lcp.h,v 1.20 2004/11/14 22:53:42 carlsonj Exp $
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef LCP_H
-#define	LCP_H
-
-#include "ppp.h"
-
-/*
- * Options.
- */
-#define CI_VENDOR	0	/* Vendor Specific */
-#define CI_MRU		1	/* Maximum Receive Unit */
-#define CI_ASYNCMAP	2	/* Async Control Character Map */
-#define CI_AUTHTYPE	3	/* Authentication Type */
-#define CI_QUALITY	4	/* Quality Protocol */
-#define CI_MAGICNUMBER	5	/* Magic Number */
-#define CI_PCOMPRESSION	7	/* Protocol Field Compression */
-#define CI_ACCOMPRESSION 8	/* Address/Control Field Compression */
-#define CI_FCSALTERN	9	/* FCS-Alternatives */
-#define CI_SDP		10	/* Self-Describing-Pad */
-#define CI_NUMBERED	11	/* Numbered-Mode */
-#define CI_CALLBACK	13	/* callback */
-#define CI_MRRU		17	/* max reconstructed receive unit; multilink */
-#define CI_SSNHF	18	/* short sequence numbers for multilink */
-#define CI_EPDISC	19	/* endpoint discriminator */
-#define CI_MPPLUS	22	/* Multi-Link-Plus-Procedure */
-#define CI_LDISC	23	/* Link-Discriminator */
-#define CI_LCPAUTH	24	/* LCP Authentication */
-#define CI_COBS		25	/* Consistent Overhead Byte Stuffing */
-#define CI_PREFELIS	26	/* Prefix Elision */
-#define CI_MPHDRFMT	27	/* MP Header Format */
-#define CI_I18N		28	/* Internationalization */
-#define CI_SDL		29	/* Simple Data Link */
-
-/*
- * LCP-specific packet types (code numbers).
- */
-#define PROTREJ		8	/* Protocol Reject */
-#define ECHOREQ		9	/* Echo Request */
-#define ECHOREP		10	/* Echo Reply */
-#define DISCREQ		11	/* Discard Request */
-#define IDENTIF		12	/* Identification */
-#define TIMEREM		13	/* Time Remaining */
-
-/* Value used as data for CI_CALLBACK option */
-#define CBCP_OPT	6	/* Use callback control protocol */
-
-#if 0 /* moved to ppp_opts.h */
-#define DEFMRU	1500		/* Try for this */
-#define MINMRU	128		/* No MRUs below this */
-#define MAXMRU	16384		/* Normally limit MRU to this */
-#endif /* moved to ppp_opts.h */
-
-/* An endpoint discriminator, used with multilink. */
-#define MAX_ENDP_LEN	20	/* maximum length of discriminator value */
-struct epdisc {
-    unsigned char	class_; /* -- The word "class" is reserved in C++. */
-    unsigned char	length;
-    unsigned char	value[MAX_ENDP_LEN];
-};
-
-/*
- * The state of options is described by an lcp_options structure.
- */
-typedef struct lcp_options {
-    unsigned int passive           :1; /* Don't die if we don't get a response */
-    unsigned int silent            :1; /* Wait for the other end to start first */
-#if 0 /* UNUSED */
-    unsigned int restart           :1; /* Restart vs. exit after close */
-#endif /* UNUSED */
-    unsigned int neg_mru           :1; /* Negotiate the MRU? */
-    unsigned int neg_asyncmap      :1; /* Negotiate the async map? */
-#if PAP_SUPPORT
-    unsigned int neg_upap          :1; /* Ask for UPAP authentication? */
-#endif /* PAP_SUPPORT */
-#if CHAP_SUPPORT
-    unsigned int neg_chap          :1; /* Ask for CHAP authentication? */
-#endif /* CHAP_SUPPORT */
-#if EAP_SUPPORT
-    unsigned int neg_eap           :1; /* Ask for EAP authentication? */
-#endif /* EAP_SUPPORT */
-    unsigned int neg_magicnumber   :1; /* Ask for magic number? */
-    unsigned int neg_pcompression  :1; /* HDLC Protocol Field Compression? */
-    unsigned int neg_accompression :1; /* HDLC Address/Control Field Compression? */
-#if LQR_SUPPORT
-    unsigned int neg_lqr           :1; /* Negotiate use of Link Quality Reports */
-#endif /* LQR_SUPPORT */
-    unsigned int neg_cbcp          :1; /* Negotiate use of CBCP */
-#ifdef HAVE_MULTILINK
-    unsigned int neg_mrru          :1; /* negotiate multilink MRRU */
-#endif /* HAVE_MULTILINK */
-    unsigned int neg_ssnhf         :1; /* negotiate short sequence numbers */
-    unsigned int neg_endpoint      :1; /* negotiate endpoint discriminator */
-
-    u16_t mru;			/* Value of MRU */
-#ifdef HAVE_MULTILINK
-    u16_t mrru;			/* Value of MRRU, and multilink enable */
-#endif /* MULTILINK */
-#if CHAP_SUPPORT
-    u8_t chap_mdtype;		/* which MD types (hashing algorithm) */
-#endif /* CHAP_SUPPORT */
-    u32_t asyncmap;		/* Value of async map */
-    u32_t magicnumber;
-    u8_t  numloops;		/* Number of loops during magic number neg. */
-#if LQR_SUPPORT
-    u32_t lqr_period;	/* Reporting period for LQR 1/100ths second */
-#endif /* LQR_SUPPORT */
-    struct epdisc endpoint;	/* endpoint discriminator */
-} lcp_options;
-
-void lcp_open(ppp_pcb *pcb);
-void lcp_close(ppp_pcb *pcb, const char *reason);
-void lcp_lowerup(ppp_pcb *pcb);
-void lcp_lowerdown(ppp_pcb *pcb);
-void lcp_sprotrej(ppp_pcb *pcb, u_char *p, int len);    /* send protocol reject */
-
-extern const struct protent lcp_protent;
-
-#if 0 /* moved to ppp_opts.h */
-/* Default number of times we receive our magic number from the peer
-   before deciding the link is looped-back. */
-#define DEFLOOPBACKFAIL	10
-#endif /* moved to ppp_opts.h */
-
-#endif /* LCP_H */
-#endif /* PPP_SUPPORT */
diff --git a/sys/include/netif/ppp/magic.h b/sys/include/netif/ppp/magic.h
deleted file mode 100644
index a2a9b53..0000000
--- a/sys/include/netif/ppp/magic.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * magic.h - PPP Magic Number definitions.
- *
- * Copyright (c) 1984-2000 Carnegie Mellon University. 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 "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Office of Technology Transfer
- *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: magic.h,v 1.5 2003/06/11 23:56:26 paulus Exp $
- */
-/*****************************************************************************
-* randm.h - Random number generator header file.
-*
-* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
-* Copyright (c) 1998 Global Election Systems Inc.
-*
-* The authors hereby grant permission to use, copy, modify, distribute,
-* and license this software and its documentation for any purpose, provided
-* that existing copyright notices are retained in all copies and that this
-* notice and the following disclaimer are included verbatim in any
-* distributions. No written agreement, license, or royalty fee is required
-* for any of the authorized uses.
-*
-* THIS SOFTWARE IS PROVIDED BY THE 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 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.
-*
-******************************************************************************
-* REVISION HISTORY
-*
-* 03-01-01 Marc Boucher <marc@mbsi.ca>
-*   Ported to lwIP.
-* 98-05-29 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
-*   Extracted from avos.
-*****************************************************************************/
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef MAGIC_H
-#define MAGIC_H
-
-/***********************
-*** PUBLIC FUNCTIONS ***
-***********************/
-
-/*
- * Initialize the random number generator.
- */
-void magic_init(void);
-
-/*
- * Randomize our random seed value.  To be called for truely random events
- * such as user operations and network traffic.
- */
-void magic_randomize(void);
-
-/*
- * Return a new random number.
- */
-u32_t magic(void);	/* Returns the next magic number */
-
-/*
- * Fill buffer with random bytes
- *
- * Use the random pool to generate random data.  This degrades to pseudo
- * random when used faster than randomness is supplied using magic_churnrand().
- * Thus it's important to make sure that the results of this are not
- * published directly because one could predict the next result to at
- * least some degree.  Also, it's important to get a good seed before
- * the first use.
- */
-void magic_random_bytes(unsigned char *buf, u32_t buf_len);
-
-/*
- * Return a new random number between 0 and (2^pow)-1 included.
- */
-u32_t magic_pow(u8_t pow);
-
-#endif /* MAGIC_H */
-
-#endif /* PPP_SUPPORT */
diff --git a/sys/include/netif/ppp/mppe.h b/sys/include/netif/ppp/mppe.h
deleted file mode 100644
index 1ae8a5d..0000000
--- a/sys/include/netif/ppp/mppe.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * mppe.h - Definitions for MPPE
- *
- * Copyright (c) 2008 Paul Mackerras. 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(s) of the authors of this software must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Paul Mackerras
- *     <paulus@samba.org>".
- *
- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && MPPE_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-#ifndef MPPE_H
-#define MPPE_H
-
-#include "netif/ppp/pppcrypt.h"
-
-#define MPPE_PAD		4	/* MPPE growth per frame */
-#define MPPE_MAX_KEY_LEN	16	/* largest key length (128-bit) */
-
-/* option bits for ccp_options.mppe */
-#define MPPE_OPT_40		0x01	/* 40 bit */
-#define MPPE_OPT_128		0x02	/* 128 bit */
-#define MPPE_OPT_STATEFUL	0x04	/* stateful mode */
-/* unsupported opts */
-#define MPPE_OPT_56		0x08	/* 56 bit */
-#define MPPE_OPT_MPPC		0x10	/* MPPC compression */
-#define MPPE_OPT_D		0x20	/* Unknown */
-#define MPPE_OPT_UNSUPPORTED (MPPE_OPT_56|MPPE_OPT_MPPC|MPPE_OPT_D)
-#define MPPE_OPT_UNKNOWN	0x40	/* Bits !defined in RFC 3078 were set */
-
-/*
- * This is not nice ... the alternative is a bitfield struct though.
- * And unfortunately, we cannot share the same bits for the option
- * names above since C and H are the same bit.  We could do a u_int32
- * but then we have to do a lwip_htonl() all the time and/or we still need
- * to know which octet is which.
- */
-#define MPPE_C_BIT		0x01	/* MPPC */
-#define MPPE_D_BIT		0x10	/* Obsolete, usage unknown */
-#define MPPE_L_BIT		0x20	/* 40-bit */
-#define MPPE_S_BIT		0x40	/* 128-bit */
-#define MPPE_M_BIT		0x80	/* 56-bit, not supported */
-#define MPPE_H_BIT		0x01	/* Stateless (in a different byte) */
-
-/* Does not include H bit; used for least significant octet only. */
-#define MPPE_ALL_BITS (MPPE_D_BIT|MPPE_L_BIT|MPPE_S_BIT|MPPE_M_BIT|MPPE_H_BIT)
-
-/* Build a CI from mppe opts (see RFC 3078) */
-#define MPPE_OPTS_TO_CI(opts, ci)		\
-    do {					\
-	u_char *ptr = ci; /* u_char[4] */	\
-						\
-	/* H bit */				\
-	if (opts & MPPE_OPT_STATEFUL)		\
-	    *ptr++ = 0x0;			\
-	else					\
-	    *ptr++ = MPPE_H_BIT;		\
-	*ptr++ = 0;				\
-	*ptr++ = 0;				\
-						\
-	/* S,L bits */				\
-	*ptr = 0;				\
-	if (opts & MPPE_OPT_128)		\
-	    *ptr |= MPPE_S_BIT;			\
-	if (opts & MPPE_OPT_40)			\
-	    *ptr |= MPPE_L_BIT;			\
-	/* M,D,C bits not supported */		\
-    } while (/* CONSTCOND */ 0)
-
-/* The reverse of the above */
-#define MPPE_CI_TO_OPTS(ci, opts)		\
-    do {					\
-	const u_char *ptr = ci; /* u_char[4] */	\
-						\
-	opts = 0;				\
-						\
-	/* H bit */				\
-	if (!(ptr[0] & MPPE_H_BIT))		\
-	    opts |= MPPE_OPT_STATEFUL;		\
-						\
-	/* S,L bits */				\
-	if (ptr[3] & MPPE_S_BIT)		\
-	    opts |= MPPE_OPT_128;		\
-	if (ptr[3] & MPPE_L_BIT)		\
-	    opts |= MPPE_OPT_40;		\
-						\
-	/* M,D,C bits */			\
-	if (ptr[3] & MPPE_M_BIT)		\
-	    opts |= MPPE_OPT_56;		\
-	if (ptr[3] & MPPE_D_BIT)		\
-	    opts |= MPPE_OPT_D;			\
-	if (ptr[3] & MPPE_C_BIT)		\
-	    opts |= MPPE_OPT_MPPC;		\
-						\
-	/* Other bits */			\
-	if (ptr[0] & ~MPPE_H_BIT)		\
-	    opts |= MPPE_OPT_UNKNOWN;		\
-	if (ptr[1] || ptr[2])			\
-	    opts |= MPPE_OPT_UNKNOWN;		\
-	if (ptr[3] & ~MPPE_ALL_BITS)		\
-	    opts |= MPPE_OPT_UNKNOWN;		\
-    } while (/* CONSTCOND */ 0)
-
-/* Shared MPPE padding between MSCHAP and MPPE */
-#define SHA1_PAD_SIZE 40
-
-static const u8_t mppe_sha1_pad1[SHA1_PAD_SIZE] = {
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-static const u8_t mppe_sha1_pad2[SHA1_PAD_SIZE] = {
-  0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2,
-  0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2,
-  0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2,
-  0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2
-};
-
-/*
- * State for an MPPE (de)compressor.
- */
-typedef struct ppp_mppe_state {
-	lwip_arc4_context arc4;
-	u8_t master_key[MPPE_MAX_KEY_LEN];
-	u8_t session_key[MPPE_MAX_KEY_LEN];
-	u8_t keylen;                /* key length in bytes */
-	/* NB: 128-bit == 16, 40-bit == 8!
-	 * If we want to support 56-bit, the unit has to change to bits
-	 */
-	u8_t bits;                  /* MPPE control bits */
-	u16_t ccount;               /* 12-bit coherency count (seqno)  */
-	u16_t sanity_errors;        /* take down LCP if too many */
-	unsigned int stateful  :1;  /* stateful mode flag */
-	unsigned int discard   :1;  /* stateful mode packet loss flag */
-} ppp_mppe_state;
-
-void mppe_set_key(ppp_pcb *pcb, ppp_mppe_state *state, u8_t *key);
-void mppe_init(ppp_pcb *pcb, ppp_mppe_state *state, u8_t options);
-void mppe_comp_reset(ppp_pcb *pcb, ppp_mppe_state *state);
-err_t mppe_compress(ppp_pcb *pcb, ppp_mppe_state *state, struct pbuf **pb, u16_t protocol);
-void mppe_decomp_reset(ppp_pcb *pcb, ppp_mppe_state *state);
-err_t mppe_decompress(ppp_pcb *pcb, ppp_mppe_state *state, struct pbuf **pb);
-
-#endif /* MPPE_H */
-#endif /* PPP_SUPPORT && MPPE_SUPPORT */
diff --git a/sys/include/netif/ppp/polarssl/arc4.h b/sys/include/netif/ppp/polarssl/arc4.h
deleted file mode 100644
index 863626d..0000000
--- a/sys/include/netif/ppp/polarssl/arc4.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * \file arc4.h
- *
- *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
- *
- *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot 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:
- *  
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * 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.
- *    * Neither the names of PolarSSL or XySSL 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 COPYRIGHT HOLDERS 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 COPYRIGHT
- *  OWNER 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.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if LWIP_INCLUDED_POLARSSL_ARC4
-
-#ifndef LWIP_INCLUDED_POLARSSL_ARC4_H
-#define LWIP_INCLUDED_POLARSSL_ARC4_H
-
-/**
- * \brief          ARC4 context structure
- */
-typedef struct
-{
-    int x;                      /*!< permutation index */
-    int y;                      /*!< permutation index */
-    unsigned char m[256];       /*!< permutation table */
-}
-arc4_context;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          ARC4 key schedule
- *
- * \param ctx      ARC4 context to be initialized
- * \param key      the secret key
- * \param keylen   length of the key
- */
-void arc4_setup( arc4_context *ctx, unsigned char *key, int keylen );
-
-/**
- * \brief          ARC4 cipher function
- *
- * \param ctx      ARC4 context
- * \param buf      buffer to be processed
- * \param buflen   amount of data in buf
- */
-void arc4_crypt( arc4_context *ctx, unsigned char *buf, int buflen );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_INCLUDED_POLARSSL_ARC4_H */
-
-#endif /* LWIP_INCLUDED_POLARSSL_ARC4 */
diff --git a/sys/include/netif/ppp/polarssl/des.h b/sys/include/netif/ppp/polarssl/des.h
deleted file mode 100644
index ad2f0a2..0000000
--- a/sys/include/netif/ppp/polarssl/des.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * \file des.h
- *
- *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
- *
- *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot 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:
- *  
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * 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.
- *    * Neither the names of PolarSSL or XySSL 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 COPYRIGHT HOLDERS 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 COPYRIGHT
- *  OWNER 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.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if LWIP_INCLUDED_POLARSSL_DES
-
-#ifndef LWIP_INCLUDED_POLARSSL_DES_H
-#define LWIP_INCLUDED_POLARSSL_DES_H
-
-#define DES_ENCRYPT     1
-#define DES_DECRYPT     0
-
-/**
- * \brief          DES context structure
- */
-typedef struct
-{
-    int mode;                   /*!<  encrypt/decrypt   */
-    unsigned long sk[32];       /*!<  DES subkeys       */
-}
-des_context;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          DES key schedule (56-bit, encryption)
- *
- * \param ctx      DES context to be initialized
- * \param key      8-byte secret key
- */
-void des_setkey_enc( des_context *ctx, unsigned char key[8] );
-
-/**
- * \brief          DES key schedule (56-bit, decryption)
- *
- * \param ctx      DES context to be initialized
- * \param key      8-byte secret key
- */
-void des_setkey_dec( des_context *ctx, unsigned char key[8] );
-
-/**
- * \brief          DES-ECB block encryption/decryption
- *
- * \param ctx      DES context
- * \param input    64-bit input block
- * \param output   64-bit output block
- */
-void des_crypt_ecb( des_context *ctx,
-                    const unsigned char input[8],
-                    unsigned char output[8] );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_INCLUDED_POLARSSL_DES_H */
-
-#endif /* LWIP_INCLUDED_POLARSSL_DES */
diff --git a/sys/include/netif/ppp/polarssl/md4.h b/sys/include/netif/ppp/polarssl/md4.h
deleted file mode 100644
index 2262995..0000000
--- a/sys/include/netif/ppp/polarssl/md4.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * \file md4.h
- *
- *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
- *
- *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot 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:
- *  
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * 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.
- *    * Neither the names of PolarSSL or XySSL 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 COPYRIGHT HOLDERS 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 COPYRIGHT
- *  OWNER 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.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if LWIP_INCLUDED_POLARSSL_MD4
-
-#ifndef LWIP_INCLUDED_POLARSSL_MD4_H
-#define LWIP_INCLUDED_POLARSSL_MD4_H
-
-/**
- * \brief          MD4 context structure
- */
-typedef struct
-{
-    unsigned long total[2];     /*!< number of bytes processed  */
-    unsigned long state[4];     /*!< intermediate digest state  */
-    unsigned char buffer[64];   /*!< data block being processed */
-}
-md4_context;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          MD4 context setup
- *
- * \param ctx      context to be initialized
- */
-void md4_starts( md4_context *ctx );
-
-/**
- * \brief          MD4 process buffer
- *
- * \param ctx      MD4 context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void md4_update( md4_context *ctx, const unsigned char *input, int ilen );
-
-/**
- * \brief          MD4 final digest
- *
- * \param ctx      MD4 context
- * \param output   MD4 checksum result
- */
-void md4_finish( md4_context *ctx, unsigned char output[16] );
-
-/**
- * \brief          Output = MD4( input buffer )
- *
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   MD4 checksum result
- */
-void md4( unsigned char *input, int ilen, unsigned char output[16] );
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_INCLUDED_POLARSSL_MD4_H */
-
-#endif /* LWIP_INCLUDED_POLARSSL_MD4 */
diff --git a/sys/include/netif/ppp/polarssl/md5.h b/sys/include/netif/ppp/polarssl/md5.h
deleted file mode 100644
index 3059e1d..0000000
--- a/sys/include/netif/ppp/polarssl/md5.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * \file md5.h
- *
- *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
- *
- *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot 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:
- *  
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * 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.
- *    * Neither the names of PolarSSL or XySSL 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 COPYRIGHT HOLDERS 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 COPYRIGHT
- *  OWNER 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.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if LWIP_INCLUDED_POLARSSL_MD5
-
-#ifndef LWIP_INCLUDED_POLARSSL_MD5_H
-#define LWIP_INCLUDED_POLARSSL_MD5_H
-
-/**
- * \brief          MD5 context structure
- */
-typedef struct
-{
-    unsigned long total[2];     /*!< number of bytes processed  */
-    unsigned long state[4];     /*!< intermediate digest state  */
-    unsigned char buffer[64];   /*!< data block being processed */
-}
-md5_context;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          MD5 context setup
- *
- * \param ctx      context to be initialized
- */
-void md5_starts( md5_context *ctx );
-
-/**
- * \brief          MD5 process buffer
- *
- * \param ctx      MD5 context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void md5_update( md5_context *ctx, const unsigned char *input, int ilen );
-
-/**
- * \brief          MD5 final digest
- *
- * \param ctx      MD5 context
- * \param output   MD5 checksum result
- */
-void md5_finish( md5_context *ctx, unsigned char output[16] );
-
-/**
- * \brief          Output = MD5( input buffer )
- *
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   MD5 checksum result
- */
-void md5( unsigned char *input, int ilen, unsigned char output[16] );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_INCLUDED_POLARSSL_MD5_H */
-
-#endif /* LWIP_INCLUDED_POLARSSL_MD5 */
diff --git a/sys/include/netif/ppp/polarssl/sha1.h b/sys/include/netif/ppp/polarssl/sha1.h
deleted file mode 100644
index 6d2a76e..0000000
--- a/sys/include/netif/ppp/polarssl/sha1.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * \file sha1.h
- *
- *  Based on XySSL: Copyright (C) 2006-2008  Christophe Devine
- *
- *  Copyright (C) 2009  Paul Bakker <polarssl_maintainer at polarssl dot 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:
- *  
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * 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.
- *    * Neither the names of PolarSSL or XySSL 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 COPYRIGHT HOLDERS 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 COPYRIGHT
- *  OWNER 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.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if LWIP_INCLUDED_POLARSSL_SHA1
-
-#ifndef LWIP_INCLUDED_POLARSSL_SHA1_H
-#define LWIP_INCLUDED_POLARSSL_SHA1_H
-
-/**
- * \brief          SHA-1 context structure
- */
-typedef struct
-{
-    unsigned long total[2];     /*!< number of bytes processed  */
-    unsigned long state[5];     /*!< intermediate digest state  */
-    unsigned char buffer[64];   /*!< data block being processed */
-}
-sha1_context;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * \brief          SHA-1 context setup
- *
- * \param ctx      context to be initialized
- */
-void sha1_starts( sha1_context *ctx );
-
-/**
- * \brief          SHA-1 process buffer
- *
- * \param ctx      SHA-1 context
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- */
-void sha1_update( sha1_context *ctx, const unsigned char *input, int ilen );
-
-/**
- * \brief          SHA-1 final digest
- *
- * \param ctx      SHA-1 context
- * \param output   SHA-1 checksum result
- */
-void sha1_finish( sha1_context *ctx, unsigned char output[20] );
-
-/**
- * \brief          Output = SHA-1( input buffer )
- *
- * \param input    buffer holding the  data
- * \param ilen     length of the input data
- * \param output   SHA-1 checksum result
- */
-void sha1( unsigned char *input, int ilen, unsigned char output[20] );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_INCLUDED_POLARSSL_SHA1_H */
-
-#endif /* LWIP_INCLUDED_POLARSSL_SHA1 */
diff --git a/sys/include/netif/ppp/ppp.h b/sys/include/netif/ppp/ppp.h
deleted file mode 100644
index d966a96..0000000
--- a/sys/include/netif/ppp/ppp.h
+++ /dev/null
@@ -1,690 +0,0 @@
-/*****************************************************************************
-* ppp.h - Network Point to Point Protocol header file.
-*
-* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
-* portions Copyright (c) 1997 Global Election Systems Inc.
-*
-* The authors hereby grant permission to use, copy, modify, distribute,
-* and license this software and its documentation for any purpose, provided
-* that existing copyright notices are retained in all copies and that this
-* notice and the following disclaimer are included verbatim in any 
-* distributions. No written agreement, license, or royalty fee is required
-* for any of the authorized uses.
-*
-* THIS SOFTWARE IS PROVIDED BY THE 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 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.
-*
-******************************************************************************
-* REVISION HISTORY
-*
-* 03-01-01 Marc Boucher <marc@mbsi.ca>
-*   Ported to lwIP.
-* 97-11-05 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
-*   Original derived from BSD codes.
-*****************************************************************************/
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef PPP_H
-#define PPP_H
-
-#include "net/def.h"
-#include "net/stats.h"
-#include "net/mem.h"
-#include "net/netif.h"
-#include "net/sys.h"
-#include "net/timeouts.h"
-#if PPP_IPV6_SUPPORT
-#include "net/ip6_addr.h"
-#endif /* PPP_IPV6_SUPPORT */
-
-/* Disable non-working or rarely used PPP feature, so rarely that we don't want to bloat ppp_opts.h with them */
-#ifndef PPP_OPTIONS
-#define PPP_OPTIONS         0
-#endif
-
-#ifndef PPP_NOTIFY
-#define PPP_NOTIFY          0
-#endif
-
-#ifndef PPP_REMOTENAME
-#define PPP_REMOTENAME      0
-#endif
-
-#ifndef PPP_IDLETIMELIMIT
-#define PPP_IDLETIMELIMIT   0
-#endif
-
-#ifndef PPP_LCP_ADAPTIVE
-#define PPP_LCP_ADAPTIVE    0
-#endif
-
-#ifndef PPP_MAXCONNECT
-#define PPP_MAXCONNECT      0
-#endif
-
-#ifndef PPP_ALLOWED_ADDRS
-#define PPP_ALLOWED_ADDRS   0
-#endif
-
-#ifndef PPP_PROTOCOLNAME
-#define PPP_PROTOCOLNAME    0
-#endif
-
-#ifndef PPP_STATS_SUPPORT
-#define PPP_STATS_SUPPORT   0
-#endif
-
-#ifndef DEFLATE_SUPPORT
-#define DEFLATE_SUPPORT     0
-#endif
-
-#ifndef BSDCOMPRESS_SUPPORT
-#define BSDCOMPRESS_SUPPORT 0
-#endif
-
-#ifndef PREDICTOR_SUPPORT
-#define PREDICTOR_SUPPORT   0
-#endif
-
-/*************************
-*** PUBLIC DEFINITIONS ***
-*************************/
-
-/*
- * The basic PPP frame.
- */
-#define PPP_HDRLEN	4	/* octets for standard ppp header */
-#define PPP_FCSLEN	2	/* octets for FCS */
-
-/*
- * Values for phase.
- */
-#define PPP_PHASE_DEAD          0
-#define PPP_PHASE_MASTER        1
-#define PPP_PHASE_HOLDOFF       2
-#define PPP_PHASE_INITIALIZE    3
-#define PPP_PHASE_SERIALCONN    4
-#define PPP_PHASE_DORMANT       5
-#define PPP_PHASE_ESTABLISH     6
-#define PPP_PHASE_AUTHENTICATE  7
-#define PPP_PHASE_CALLBACK      8
-#define PPP_PHASE_NETWORK       9
-#define PPP_PHASE_RUNNING       10
-#define PPP_PHASE_TERMINATE     11
-#define PPP_PHASE_DISCONNECT    12
-
-/* Error codes. */
-#define PPPERR_NONE         0  /* No error. */
-#define PPPERR_PARAM        1  /* Invalid parameter. */
-#define PPPERR_OPEN         2  /* Unable to open PPP session. */
-#define PPPERR_DEVICE       3  /* Invalid I/O device for PPP. */
-#define PPPERR_ALLOC        4  /* Unable to allocate resources. */
-#define PPPERR_USER         5  /* User interrupt. */
-#define PPPERR_CONNECT      6  /* Connection lost. */
-#define PPPERR_AUTHFAIL     7  /* Failed authentication challenge. */
-#define PPPERR_PROTOCOL     8  /* Failed to meet protocol. */
-#define PPPERR_PEERDEAD     9  /* Connection timeout */
-#define PPPERR_IDLETIMEOUT  10 /* Idle Timeout */
-#define PPPERR_CONNECTTIME  11 /* Max connect time reached */
-#define PPPERR_LOOPBACK     12 /* Loopback detected */
-
-/* Whether auth support is enabled at all */
-#define PPP_AUTH_SUPPORT (PAP_SUPPORT || CHAP_SUPPORT || EAP_SUPPORT)
-
-/************************
-*** PUBLIC DATA TYPES ***
-************************/
-
-/*
- * Other headers require ppp_pcb definition for prototypes, but ppp_pcb
- * require some structure definition from other headers as well, we are
- * fixing the dependency loop here by declaring the ppp_pcb type then
- * by including headers containing necessary struct definition for ppp_pcb
- */
-typedef struct ppp_pcb_s ppp_pcb;
-
-/* Type definitions for BSD code. */
-#ifndef __u_char_defined
-typedef unsigned long  u_long;
-typedef unsigned int   u_int;
-typedef unsigned short u_short;
-typedef unsigned char  u_char;
-#endif
-
-#include "fsm.h"
-#include "lcp.h"
-#if CCP_SUPPORT
-#include "ccp.h"
-#endif /* CCP_SUPPORT */
-#if MPPE_SUPPORT
-#include "mppe.h"
-#endif /* MPPE_SUPPORT */
-#if PPP_IPV4_SUPPORT
-#include "ipcp.h"
-#endif /* PPP_IPV4_SUPPORT */
-#if PPP_IPV6_SUPPORT
-#include "ipv6cp.h"
-#endif /* PPP_IPV6_SUPPORT */
-#if PAP_SUPPORT
-#include "upap.h"
-#endif /* PAP_SUPPORT */
-#if CHAP_SUPPORT
-#include "chap-new.h"
-#endif /* CHAP_SUPPORT */
-#if EAP_SUPPORT
-#include "eap.h"
-#endif /* EAP_SUPPORT */
-#if VJ_SUPPORT
-#include "vj.h"
-#endif /* VJ_SUPPORT */
-
-/* Link status callback function prototype */
-typedef void (*ppp_link_status_cb_fn)(ppp_pcb *pcb, int err_code, void *ctx);
-
-/*
- * PPP configuration.
- */
-typedef struct ppp_settings_s {
-
-#if PPP_SERVER && PPP_AUTH_SUPPORT
-  unsigned int  auth_required       :1;      /* Peer is required to authenticate */
-  unsigned int  null_login          :1;      /* Username of "" and a password of "" are acceptable */
-#endif /* PPP_SERVER && PPP_AUTH_SUPPORT */
-#if PPP_REMOTENAME
-  unsigned int  explicit_remote     :1;      /* remote_name specified with remotename opt */
-#endif /* PPP_REMOTENAME */
-#if PAP_SUPPORT
-  unsigned int  refuse_pap          :1;      /* Don't proceed auth. with PAP */
-#endif /* PAP_SUPPORT */
-#if CHAP_SUPPORT
-  unsigned int  refuse_chap         :1;      /* Don't proceed auth. with CHAP */
-#endif /* CHAP_SUPPORT */
-#if MSCHAP_SUPPORT
-  unsigned int  refuse_mschap       :1;      /* Don't proceed auth. with MS-CHAP */
-  unsigned int  refuse_mschap_v2    :1;      /* Don't proceed auth. with MS-CHAPv2 */
-#endif /* MSCHAP_SUPPORT */
-#if EAP_SUPPORT
-  unsigned int  refuse_eap          :1;      /* Don't proceed auth. with EAP */
-#endif /* EAP_SUPPORT */
-#if LWIP_DNS
-  unsigned int  usepeerdns          :1;      /* Ask peer for DNS adds */
-#endif /* LWIP_DNS */
-  unsigned int  persist             :1;      /* Persist mode, always try to open the connection */
-#if PRINTPKT_SUPPORT
-  unsigned int  hide_password       :1;      /* Hide password in dumped packets */
-#endif /* PRINTPKT_SUPPORT */
-  unsigned int  noremoteip          :1;      /* Let him have no IP address */
-  unsigned int  lax_recv            :1;      /* accept control chars in asyncmap */
-  unsigned int  noendpoint          :1;      /* don't send/accept endpoint discriminator */
-#if PPP_LCP_ADAPTIVE
-  unsigned int lcp_echo_adaptive    :1;      /* request echo only if the link was idle */
-#endif /* PPP_LCP_ADAPTIVE */
-#if MPPE_SUPPORT
-  unsigned int require_mppe         :1;      /* Require MPPE (Microsoft Point to Point Encryption) */
-  unsigned int refuse_mppe_40       :1;      /* Allow MPPE 40-bit mode? */
-  unsigned int refuse_mppe_128      :1;      /* Allow MPPE 128-bit mode? */
-  unsigned int refuse_mppe_stateful :1;      /* Allow MPPE stateful mode? */
-#endif /* MPPE_SUPPORT */
-
-  u16_t  listen_time;                 /* time to listen first (ms), waiting for peer to send LCP packet */
-
-#if PPP_IDLETIMELIMIT
-  u16_t  idle_time_limit;             /* Disconnect if idle for this many seconds */
-#endif /* PPP_IDLETIMELIMIT */
-#if PPP_MAXCONNECT
-  u32_t  maxconnect;                  /* Maximum connect time (seconds) */
-#endif /* PPP_MAXCONNECT */
-
-#if PPP_AUTH_SUPPORT
-  /* auth data */
-  const char  *user;                   /* Username for PAP */
-  const char  *passwd;                 /* Password for PAP, secret for CHAP */
-#if PPP_REMOTENAME
-  char  remote_name[MAXNAMELEN   + 1]; /* Peer's name for authentication */
-#endif /* PPP_REMOTENAME */
-
-#if PAP_SUPPORT
-  u8_t  pap_timeout_time;        /* Timeout (seconds) for auth-req retrans. */
-  u8_t  pap_max_transmits;       /* Number of auth-reqs sent */
-#if PPP_SERVER
-  u8_t  pap_req_timeout;         /* Time to wait for auth-req from peer */
-#endif /* PPP_SERVER */
-#endif /* PAP_SUPPPORT */
-
-#if CHAP_SUPPORT
-  u8_t  chap_timeout_time;       /* Timeout (seconds) for retransmitting req */
-  u8_t  chap_max_transmits;      /* max # times to send challenge */
-#if PPP_SERVER
-  u8_t  chap_rechallenge_time;   /* Time to wait for auth-req from peer */
-#endif /* PPP_SERVER */
-#endif /* CHAP_SUPPPORT */
-
-#if EAP_SUPPORT
-  u8_t  eap_req_time;            /* Time to wait (for retransmit/fail) */
-  u8_t  eap_allow_req;           /* Max Requests allowed */
-#if PPP_SERVER
-  u8_t  eap_timeout_time;        /* Time to wait (for retransmit/fail) */
-  u8_t  eap_max_transmits;       /* Max Requests allowed */
-#endif /* PPP_SERVER */
-#endif /* EAP_SUPPORT */
-
-#endif /* PPP_AUTH_SUPPORT */
-
-  u8_t  fsm_timeout_time;            /* Timeout time in seconds */
-  u8_t  fsm_max_conf_req_transmits;  /* Maximum Configure-Request transmissions */
-  u8_t  fsm_max_term_transmits;      /* Maximum Terminate-Request transmissions */
-  u8_t  fsm_max_nak_loops;           /* Maximum number of nak loops tolerated */
-
-  u8_t  lcp_loopbackfail;     /* Number of times we receive our magic number from the peer
-                                 before deciding the link is looped-back. */
-  u8_t  lcp_echo_interval;    /* Interval between LCP echo-requests */
-  u8_t  lcp_echo_fails;       /* Tolerance to unanswered echo-requests */
-
-} ppp_settings;
-
-#if PPP_SERVER
-struct ppp_addrs {
-#if PPP_IPV4_SUPPORT
-  ip4_addr_t our_ipaddr, his_ipaddr, netmask;
-#if LWIP_DNS
-  ip4_addr_t dns1, dns2;
-#endif /* LWIP_DNS */
-#endif /* PPP_IPV4_SUPPORT */
-#if PPP_IPV6_SUPPORT
-  ip6_addr_t our6_ipaddr, his6_ipaddr;
-#endif /* PPP_IPV6_SUPPORT */
-};
-#endif /* PPP_SERVER */
-
-/*
- * PPP interface control block.
- */
-struct ppp_pcb_s {
-  ppp_settings settings;
-  const struct link_callbacks *link_cb;
-  void *link_ctx_cb;
-  void (*link_status_cb)(ppp_pcb *pcb, int err_code, void *ctx);  /* Status change callback */
-#if PPP_NOTIFY_PHASE
-  void (*notify_phase_cb)(ppp_pcb *pcb, u8_t phase, void *ctx);   /* Notify phase callback */
-#endif /* PPP_NOTIFY_PHASE */
-  void *ctx_cb;                  /* Callbacks optional pointer */
-  struct netif *netif;           /* PPP interface */
-  u8_t phase;                    /* where the link is at */
-  u8_t err_code;                 /* Code indicating why interface is down. */
-
-  /* flags */
-#if PPP_IPV4_SUPPORT
-  unsigned int ask_for_local           :1; /* request our address from peer */
-  unsigned int ipcp_is_open            :1; /* haven't called np_finished() */
-  unsigned int ipcp_is_up              :1; /* have called ipcp_up() */
-  unsigned int if4_up                  :1; /* True when the IPv4 interface is up. */
-#if 0 /* UNUSED - PROXY ARP */
-  unsigned int proxy_arp_set           :1; /* Have created proxy arp entry */
-#endif /* UNUSED - PROXY ARP */
-#endif /* PPP_IPV4_SUPPORT */
-#if PPP_IPV6_SUPPORT
-  unsigned int ipv6cp_is_up            :1; /* have called ip6cp_up() */
-  unsigned int if6_up                  :1; /* True when the IPv6 interface is up. */
-#endif /* PPP_IPV6_SUPPORT */
-  unsigned int lcp_echo_timer_running  :1; /* set if a timer is running */
-#if VJ_SUPPORT
-  unsigned int vj_enabled              :1; /* Flag indicating VJ compression enabled. */
-#endif /* VJ_SUPPORT */
-#if CCP_SUPPORT
-  unsigned int ccp_all_rejected        :1; /* we rejected all peer's options */
-#endif /* CCP_SUPPORT */
-#if MPPE_SUPPORT
-  unsigned int mppe_keys_set           :1; /* Have the MPPE keys been set? */
-#endif /* MPPE_SUPPORT */
-
-#if PPP_AUTH_SUPPORT
-  /* auth data */
-#if PPP_SERVER && defined(HAVE_MULTILINK)
-  char peer_authname[MAXNAMELEN + 1]; /* The name by which the peer authenticated itself to us. */
-#endif /* PPP_SERVER && defined(HAVE_MULTILINK) */
-  u16_t auth_pending;        /* Records which authentication operations haven't completed yet. */
-  u16_t auth_done;           /* Records which authentication operations have been completed. */
-
-#if PAP_SUPPORT
-  upap_state upap;           /* PAP data */
-#endif /* PAP_SUPPORT */
-
-#if CHAP_SUPPORT
-  chap_client_state chap_client;  /* CHAP client data */
-#if PPP_SERVER
-  chap_server_state chap_server;  /* CHAP server data */
-#endif /* PPP_SERVER */
-#endif /* CHAP_SUPPORT */
-
-#if EAP_SUPPORT
-  eap_state eap;            /* EAP data */
-#endif /* EAP_SUPPORT */
-#endif /* PPP_AUTH_SUPPORT */
-
-  fsm lcp_fsm;                   /* LCP fsm structure */
-  lcp_options lcp_wantoptions;   /* Options that we want to request */
-  lcp_options lcp_gotoptions;    /* Options that peer ack'd */
-  lcp_options lcp_allowoptions;  /* Options we allow peer to request */
-  lcp_options lcp_hisoptions;    /* Options that we ack'd */
-  u16_t peer_mru;                /* currently negotiated peer MRU */
-  u8_t lcp_echos_pending;        /* Number of outstanding echo msgs */
-  u8_t lcp_echo_number;          /* ID number of next echo frame */
-
-  u8_t num_np_open;              /* Number of network protocols which we have opened. */
-  u8_t num_np_up;                /* Number of network protocols which have come up. */
-
-#if VJ_SUPPORT
-  struct vjcompress vj_comp;     /* Van Jacobson compression header. */
-#endif /* VJ_SUPPORT */
-
-#if CCP_SUPPORT
-  fsm ccp_fsm;                   /* CCP fsm structure */
-  ccp_options ccp_wantoptions;   /* what to request the peer to use */
-  ccp_options ccp_gotoptions;    /* what the peer agreed to do */
-  ccp_options ccp_allowoptions;  /* what we'll agree to do */
-  ccp_options ccp_hisoptions;    /* what we agreed to do */
-  u8_t ccp_localstate;           /* Local state (mainly for handling reset-reqs and reset-acks). */
-  u8_t ccp_receive_method;       /* Method chosen on receive path */
-  u8_t ccp_transmit_method;      /* Method chosen on transmit path */
-#if MPPE_SUPPORT
-  ppp_mppe_state mppe_comp;      /* MPPE "compressor" structure */
-  ppp_mppe_state mppe_decomp;    /* MPPE "decompressor" structure */
-#endif /* MPPE_SUPPORT */
-#endif /* CCP_SUPPORT */
-
-#if PPP_IPV4_SUPPORT
-  fsm ipcp_fsm;                   /* IPCP fsm structure */
-  ipcp_options ipcp_wantoptions;  /* Options that we want to request */
-  ipcp_options ipcp_gotoptions;   /* Options that peer ack'd */
-  ipcp_options ipcp_allowoptions; /* Options we allow peer to request */
-  ipcp_options ipcp_hisoptions;   /* Options that we ack'd */
-#endif /* PPP_IPV4_SUPPORT */
-
-#if PPP_IPV6_SUPPORT
-  fsm ipv6cp_fsm;                     /* IPV6CP fsm structure */
-  ipv6cp_options ipv6cp_wantoptions;  /* Options that we want to request */
-  ipv6cp_options ipv6cp_gotoptions;   /* Options that peer ack'd */
-  ipv6cp_options ipv6cp_allowoptions; /* Options we allow peer to request */
-  ipv6cp_options ipv6cp_hisoptions;   /* Options that we ack'd */
-#endif /* PPP_IPV6_SUPPORT */
-};
-
-/************************
- *** PUBLIC FUNCTIONS ***
- ************************/
-
-/*
- * WARNING: For multi-threads environment, all ppp_set_* functions most
- * only be called while the PPP is in the dead phase (i.e. disconnected).
- */
-
-#if PPP_AUTH_SUPPORT
-/*
- * Set PPP authentication.
- *
- * Warning: Using PPPAUTHTYPE_ANY might have security consequences.
- * RFC 1994 says:
- *
- * In practice, within or associated with each PPP server, there is a
- * database which associates "user" names with authentication
- * information ("secrets").  It is not anticipated that a particular
- * named user would be authenticated by multiple methods.  This would
- * make the user vulnerable to attacks which negotiate the least secure
- * method from among a set (such as PAP rather than CHAP).  If the same
- * secret was used, PAP would reveal the secret to be used later with
- * CHAP.
- *
- * Instead, for each user name there should be an indication of exactly
- * one method used to authenticate that user name.  If a user needs to
- * make use of different authentication methods under different
- * circumstances, then distinct user names SHOULD be employed, each of
- * which identifies exactly one authentication method.
- *
- * Default is none auth type, unset (NULL) user and passwd.
- */
-#define PPPAUTHTYPE_NONE      0x00
-#define PPPAUTHTYPE_PAP       0x01
-#define PPPAUTHTYPE_CHAP      0x02
-#define PPPAUTHTYPE_MSCHAP    0x04
-#define PPPAUTHTYPE_MSCHAP_V2 0x08
-#define PPPAUTHTYPE_EAP       0x10
-#define PPPAUTHTYPE_ANY       0xff
-void ppp_set_auth(ppp_pcb *pcb, u8_t authtype, const char *user, const char *passwd);
-
-/*
- * If set, peer is required to authenticate. This is mostly necessary for PPP server support.
- *
- * Default is false.
- */
-#define ppp_set_auth_required(ppp, boolval) (ppp->settings.auth_required = boolval)
-#endif /* PPP_AUTH_SUPPORT */
-
-#if PPP_IPV4_SUPPORT
-/*
- * Set PPP interface "our" and "his" IPv4 addresses. This is mostly necessary for PPP server
- * support but it can also be used on a PPP link where each side choose its own IP address.
- *
- * Default is unset (0.0.0.0).
- */
-#define ppp_set_ipcp_ouraddr(ppp, addr) do { ppp->ipcp_wantoptions.ouraddr = ip4_addr_get_u32(addr); \
-                                             ppp->ask_for_local = ppp->ipcp_wantoptions.ouraddr != 0; } while(0)
-#define ppp_set_ipcp_hisaddr(ppp, addr) (ppp->ipcp_wantoptions.hisaddr = ip4_addr_get_u32(addr))
-#if LWIP_DNS
-/*
- * Set DNS server addresses that are sent if the peer asks for them. This is mostly necessary
- * for PPP server support.
- *
- * Default is unset (0.0.0.0).
- */
-#define ppp_set_ipcp_dnsaddr(ppp, index, addr) (ppp->ipcp_allowoptions.dnsaddr[index] = ip4_addr_get_u32(addr))
-
-/*
- * If set, we ask the peer for up to 2 DNS server addresses. Received DNS server addresses are
- * registered using the dns_setserver() function.
- *
- * Default is false.
- */
-#define ppp_set_usepeerdns(ppp, boolval) (ppp->settings.usepeerdns = boolval)
-#endif /* LWIP_DNS */
-#endif /* PPP_IPV4_SUPPORT */
-
-#if MPPE_SUPPORT
-/* Disable MPPE (Microsoft Point to Point Encryption). This parameter is exclusive. */
-#define PPP_MPPE_DISABLE           0x00
-/* Require the use of MPPE (Microsoft Point to Point Encryption). */
-#define PPP_MPPE_ENABLE            0x01
-/* Allow MPPE to use stateful mode. Stateless mode is still attempted first. */
-#define PPP_MPPE_ALLOW_STATEFUL    0x02
-/* Refuse the use of MPPE with 40-bit encryption. Conflict with PPP_MPPE_REFUSE_128. */
-#define PPP_MPPE_REFUSE_40         0x04
-/* Refuse the use of MPPE with 128-bit encryption. Conflict with PPP_MPPE_REFUSE_40. */
-#define PPP_MPPE_REFUSE_128        0x08
-/*
- * Set MPPE configuration
- *
- * Default is disabled.
- */
-void ppp_set_mppe(ppp_pcb *pcb, u8_t flags);
-#endif /* MPPE_SUPPORT */
-
-/*
- * Wait for up to intval milliseconds for a valid PPP packet from the peer.
- * At the end of this  time, or when a valid PPP packet is received from the
- * peer, we commence negotiation by sending our first LCP packet.
- *
- * Default is 0.
- */
-#define ppp_set_listen_time(ppp, intval) (ppp->settings.listen_time = intval)
-
-/*
- * If set, we will attempt to initiate a connection but if no reply is received from
- * the peer, we will then just wait passively for a valid LCP packet from the peer.
- *
- * Default is false.
- */
-#define ppp_set_passive(ppp, boolval) (ppp->lcp_wantoptions.passive = boolval)
-
-/*
- * If set, we will not transmit LCP packets to initiate a connection until a valid
- * LCP packet is received from the peer. This is what we usually call the server mode.
- *
- * Default is false.
- */
-#define ppp_set_silent(ppp, boolval) (ppp->lcp_wantoptions.silent = boolval)
-
-/*
- * If set, enable protocol field compression negotiation in both the receive and
- * the transmit direction.
- *
- * Default is true.
- */
-#define ppp_set_neg_pcomp(ppp, boolval) (ppp->lcp_wantoptions.neg_pcompression = \
-                                         ppp->lcp_allowoptions.neg_pcompression = boolval)
-
-/*
- * If set, enable Address/Control compression in both the receive and the transmit
- * direction.
- *
- * Default is true.
- */
-#define ppp_set_neg_accomp(ppp, boolval) (ppp->lcp_wantoptions.neg_accompression = \
-                                          ppp->lcp_allowoptions.neg_accompression = boolval)
-
-/*
- * If set, enable asyncmap negotiation. Otherwise forcing all control characters to
- * be escaped for both the transmit and the receive direction.
- *
- * Default is true.
- */
-#define ppp_set_neg_asyncmap(ppp, boolval) (ppp->lcp_wantoptions.neg_asyncmap = \
-                                            ppp->lcp_allowoptions.neg_asyncmap = boolval)
-
-/*
- * This option sets the Async-Control-Character-Map (ACCM) for this end of the link.
- * The ACCM is a set of 32 bits, one for each of the ASCII control characters with
- * values from 0 to 31, where a 1 bit  indicates that the corresponding control
- * character should not be used in PPP packets sent to this system. The map is
- * an unsigned 32 bits integer where the least significant bit (00000001) represents
- * character 0 and the most significant bit (80000000) represents character 31.
- * We will then ask the peer to send these characters as a 2-byte escape sequence.
- *
- * Default is 0.
- */
-#define ppp_set_asyncmap(ppp, intval) (ppp->lcp_wantoptions.asyncmap = intval)
-
-/*
- * Set a PPP interface as the default network interface
- * (used to output all packets for which no specific route is found).
- */
-#define ppp_set_default(ppp)         netif_set_default(ppp->netif)
-
-#if PPP_NOTIFY_PHASE
-/*
- * Set a PPP notify phase callback.
- *
- * This can be used for example to set a LED pattern depending on the
- * current phase of the PPP session.
- */
-typedef void (*ppp_notify_phase_cb_fn)(ppp_pcb *pcb, u8_t phase, void *ctx);
-void ppp_set_notify_phase_callback(ppp_pcb *pcb, ppp_notify_phase_cb_fn notify_phase_cb);
-#endif /* PPP_NOTIFY_PHASE */
-
-/*
- * Initiate a PPP connection.
- *
- * This can only be called if PPP is in the dead phase.
- *
- * Holdoff is the time to wait (in seconds) before initiating
- * the connection.
- *
- * If this port connects to a modem, the modem connection must be
- * established before calling this.
- */
-err_t ppp_connect(ppp_pcb *pcb, u16_t holdoff);
-
-#if PPP_SERVER
-/*
- * Listen for an incoming PPP connection.
- *
- * This can only be called if PPP is in the dead phase.
- *
- * If this port connects to a modem, the modem connection must be
- * established before calling this.
- */
-err_t ppp_listen(ppp_pcb *pcb);
-#endif /* PPP_SERVER */
-
-/*
- * Initiate the end of a PPP connection.
- * Any outstanding packets in the queues are dropped.
- *
- * Setting nocarrier to 1 close the PPP connection without initiating the
- * shutdown procedure. Always using nocarrier = 0 is still recommended,
- * this is going to take a little longer time if your link is down, but
- * is a safer choice for the PPP state machine.
- *
- * Return 0 on success, an error code on failure.
- */
-err_t ppp_close(ppp_pcb *pcb, u8_t nocarrier);
-
-/*
- * Release the control block.
- *
- * This can only be called if PPP is in the dead phase.
- *
- * You must use ppp_close() before if you wish to terminate
- * an established PPP session.
- *
- * Return 0 on success, an error code on failure.
- */
-err_t ppp_free(ppp_pcb *pcb);
-
-/*
- * PPP IOCTL commands.
- *
- * Get the up status - 0 for down, non-zero for up.  The argument must
- * point to an int.
- */
-#define PPPCTLG_UPSTATUS 0
-
-/*
- * Get the PPP error code.  The argument must point to an int.
- * Returns a PPPERR_* value.
- */
-#define PPPCTLG_ERRCODE  1
-
-/*
- * Get the fd associated with a PPP over serial
- */
-#define PPPCTLG_FD       2
-
-/*
- * Get and set parameters for the given connection.
- * Return 0 on success, an error code on failure.
- */
-err_t ppp_ioctl(ppp_pcb *pcb, u8_t cmd, void *arg);
-
-/* Get the PPP netif interface */
-#define ppp_netif(ppp)               (ppp->netif)
-
-/* Set an lwIP-style status-callback for the selected PPP device */
-#define ppp_set_netif_statuscallback(ppp, status_cb)       \
-        netif_set_status_callback(ppp->netif, status_cb);
-
-/* Set an lwIP-style link-callback for the selected PPP device */
-#define ppp_set_netif_linkcallback(ppp, link_cb)           \
-        netif_set_link_callback(ppp->netif, link_cb);
-
-#endif /* PPP_H */
-
-#endif /* PPP_SUPPORT */
diff --git a/sys/include/netif/ppp/ppp_impl.h b/sys/include/netif/ppp/ppp_impl.h
deleted file mode 100644
index f5c2f04..0000000
--- a/sys/include/netif/ppp/ppp_impl.h
+++ /dev/null
@@ -1,629 +0,0 @@
-/*****************************************************************************
-* ppp.h - Network Point to Point Protocol header file.
-*
-* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
-* portions Copyright (c) 1997 Global Election Systems Inc.
-*
-* The authors hereby grant permission to use, copy, modify, distribute,
-* and license this software and its documentation for any purpose, provided
-* that existing copyright notices are retained in all copies and that this
-* notice and the following disclaimer are included verbatim in any
-* distributions. No written agreement, license, or royalty fee is required
-* for any of the authorized uses.
-*
-* THIS SOFTWARE IS PROVIDED BY THE 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 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.
-*
-******************************************************************************
-* REVISION HISTORY
-*
-* 03-01-01 Marc Boucher <marc@mbsi.ca>
-*   Ported to lwIP.
-* 97-11-05 Guy Lancaster <glanca@gesn.com>, Global Election Systems Inc.
-*   Original derived from BSD codes.
-*****************************************************************************/
-#ifndef LWIP_HDR_PPP_IMPL_H
-#define LWIP_HDR_PPP_IMPL_H
-
-#include "netif/ppp/ppp_opts.h"
-
-#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifdef PPP_INCLUDE_SETTINGS_HEADER
-#include "ppp_settings.h"
-#endif
-
-#include <stdio.h> /* formats */
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h> /* strtol() */
-
-#include "net/netif.h"
-#include "net/def.h"
-#include "net/timeouts.h"
-
-#include "ppp.h"
-#include "pppdebug.h"
-
-/*
- * Memory used for control packets.
- *
- * PPP_CTRL_PBUF_MAX_SIZE is the amount of memory we allocate when we
- * cannot figure out how much we are going to use before filling the buffer.
- */
-#if PPP_USE_PBUF_RAM
-#define PPP_CTRL_PBUF_TYPE       PBUF_RAM
-#define PPP_CTRL_PBUF_MAX_SIZE   512
-#else /* PPP_USE_PBUF_RAM */
-#define PPP_CTRL_PBUF_TYPE       PBUF_POOL
-#define PPP_CTRL_PBUF_MAX_SIZE   PBUF_POOL_BUFSIZE
-#endif /* PPP_USE_PBUF_RAM */
-
-/*
- * The basic PPP frame.
- */
-#define PPP_ADDRESS(p)	(((u_char *)(p))[0])
-#define PPP_CONTROL(p)	(((u_char *)(p))[1])
-#define PPP_PROTOCOL(p)	((((u_char *)(p))[2] << 8) + ((u_char *)(p))[3])
-
-/*
- * Significant octet values.
- */
-#define	PPP_ALLSTATIONS	0xff	/* All-Stations broadcast address */
-#define	PPP_UI		0x03	/* Unnumbered Information */
-#define	PPP_FLAG	0x7e	/* Flag Sequence */
-#define	PPP_ESCAPE	0x7d	/* Asynchronous Control Escape */
-#define	PPP_TRANS	0x20	/* Asynchronous transparency modifier */
-
-/*
- * Protocol field values.
- */
-#define PPP_IP		0x21	/* Internet Protocol */
-#if 0 /* UNUSED */
-#define PPP_AT		0x29	/* AppleTalk Protocol */
-#define PPP_IPX		0x2b	/* IPX protocol */
-#endif /* UNUSED */
-#if VJ_SUPPORT
-#define	PPP_VJC_COMP	0x2d	/* VJ compressed TCP */
-#define	PPP_VJC_UNCOMP	0x2f	/* VJ uncompressed TCP */
-#endif /* VJ_SUPPORT */
-#if PPP_IPV6_SUPPORT
-#define PPP_IPV6	0x57	/* Internet Protocol Version 6 */
-#endif /* PPP_IPV6_SUPPORT */
-#if CCP_SUPPORT
-#define PPP_COMP	0xfd	/* compressed packet */
-#endif /* CCP_SUPPORT */
-#define PPP_IPCP	0x8021	/* IP Control Protocol */
-#if 0 /* UNUSED */
-#define PPP_ATCP	0x8029	/* AppleTalk Control Protocol */
-#define PPP_IPXCP	0x802b	/* IPX Control Protocol */
-#endif /* UNUSED */
-#if PPP_IPV6_SUPPORT
-#define PPP_IPV6CP	0x8057	/* IPv6 Control Protocol */
-#endif /* PPP_IPV6_SUPPORT */
-#if CCP_SUPPORT
-#define PPP_CCP		0x80fd	/* Compression Control Protocol */
-#endif /* CCP_SUPPORT */
-#if ECP_SUPPORT
-#define PPP_ECP		0x8053	/* Encryption Control Protocol */
-#endif /* ECP_SUPPORT */
-#define PPP_LCP		0xc021	/* Link Control Protocol */
-#if PAP_SUPPORT
-#define PPP_PAP		0xc023	/* Password Authentication Protocol */
-#endif /* PAP_SUPPORT */
-#if LQR_SUPPORT
-#define PPP_LQR		0xc025	/* Link Quality Report protocol */
-#endif /* LQR_SUPPORT */
-#if CHAP_SUPPORT
-#define PPP_CHAP	0xc223	/* Cryptographic Handshake Auth. Protocol */
-#endif /* CHAP_SUPPORT */
-#if CBCP_SUPPORT
-#define PPP_CBCP	0xc029	/* Callback Control Protocol */
-#endif /* CBCP_SUPPORT */
-#if EAP_SUPPORT
-#define PPP_EAP		0xc227	/* Extensible Authentication Protocol */
-#endif /* EAP_SUPPORT */
-
-/*
- * The following struct gives the addresses of procedures to call
- * for a particular lower link level protocol.
- */
-struct link_callbacks {
-  /* Start a connection (e.g. Initiate discovery phase) */
-  void (*connect) (ppp_pcb *pcb, void *ctx);
-#if PPP_SERVER
-  /* Listen for an incoming connection (Passive mode) */
-  void (*listen) (ppp_pcb *pcb, void *ctx);
-#endif /* PPP_SERVER */
-  /* End a connection (i.e. initiate disconnect phase) */
-  void (*disconnect) (ppp_pcb *pcb, void *ctx);
-  /* Free lower protocol control block */
-  err_t (*free) (ppp_pcb *pcb, void *ctx);
-  /* Write a pbuf to a ppp link, only used from PPP functions to send PPP packets. */
-  err_t (*write)(ppp_pcb *pcb, void *ctx, struct pbuf *p);
-  /* Send a packet from lwIP core (IPv4 or IPv6) */
-  err_t (*netif_output)(ppp_pcb *pcb, void *ctx, struct pbuf *p, u_short protocol);
-  /* configure the transmit-side characteristics of the PPP interface */
-  void (*send_config)(ppp_pcb *pcb, void *ctx, u32_t accm, int pcomp, int accomp);
-  /* confire the receive-side characteristics of the PPP interface */
-  void (*recv_config)(ppp_pcb *pcb, void *ctx, u32_t accm, int pcomp, int accomp);
-};
-
-/*
- * What to do with network protocol (NP) packets.
- */
-enum NPmode {
-    NPMODE_PASS,		/* pass the packet through */
-    NPMODE_DROP,		/* silently drop the packet */
-    NPMODE_ERROR,		/* return an error */
-    NPMODE_QUEUE		/* save it up for later. */
-};
-
-/*
- * Statistics.
- */
-#if PPP_STATS_SUPPORT
-struct pppstat	{
-    unsigned int ppp_ibytes;	/* bytes received */
-    unsigned int ppp_ipackets;	/* packets received */
-    unsigned int ppp_ierrors;	/* receive errors */
-    unsigned int ppp_obytes;	/* bytes sent */
-    unsigned int ppp_opackets;	/* packets sent */
-    unsigned int ppp_oerrors;	/* transmit errors */
-};
-
-#if VJ_SUPPORT
-struct vjstat {
-    unsigned int vjs_packets;	/* outbound packets */
-    unsigned int vjs_compressed; /* outbound compressed packets */
-    unsigned int vjs_searches;	/* searches for connection state */
-    unsigned int vjs_misses;	/* times couldn't find conn. state */
-    unsigned int vjs_uncompressedin; /* inbound uncompressed packets */
-    unsigned int vjs_compressedin; /* inbound compressed packets */
-    unsigned int vjs_errorin;	/* inbound unknown type packets */
-    unsigned int vjs_tossed;	/* inbound packets tossed because of error */
-};
-#endif /* VJ_SUPPORT */
-
-struct ppp_stats {
-    struct pppstat p;		/* basic PPP statistics */
-#if VJ_SUPPORT
-    struct vjstat vj;		/* VJ header compression statistics */
-#endif /* VJ_SUPPORT */
-};
-
-#if CCP_SUPPORT
-struct compstat {
-    unsigned int unc_bytes;	/* total uncompressed bytes */
-    unsigned int unc_packets;	/* total uncompressed packets */
-    unsigned int comp_bytes;	/* compressed bytes */
-    unsigned int comp_packets;	/* compressed packets */
-    unsigned int inc_bytes;	/* incompressible bytes */
-    unsigned int inc_packets;	/* incompressible packets */
-    unsigned int ratio;		/* recent compression ratio << 8 */
-};
-
-struct ppp_comp_stats {
-    struct compstat c;		/* packet compression statistics */
-    struct compstat d;		/* packet decompression statistics */
-};
-#endif /* CCP_SUPPORT */
-
-#endif /* PPP_STATS_SUPPORT */
-
-#if PPP_IDLETIMELIMIT
-/*
- * The following structure records the time in seconds since
- * the last NP packet was sent or received.
- */
-struct ppp_idle {
-    time_t xmit_idle;		/* time since last NP packet sent */
-    time_t recv_idle;		/* time since last NP packet received */
-};
-#endif /* PPP_IDLETIMELIMIT */
-
-/* values for epdisc.class */
-#define EPD_NULL	0	/* null discriminator, no data */
-#define EPD_LOCAL	1
-#define EPD_IP		2
-#define EPD_MAC		3
-#define EPD_MAGIC	4
-#define EPD_PHONENUM	5
-
-/*
- * Global variables.
- */
-#ifdef HAVE_MULTILINK
-extern u8_t	multilink;	/* enable multilink operation */
-extern u8_t	doing_multilink;
-extern u8_t	multilink_master;
-extern u8_t	bundle_eof;
-extern u8_t	bundle_terminating;
-#endif
-
-#ifdef MAXOCTETS
-extern unsigned int maxoctets;	     /* Maximum octetes per session (in bytes) */
-extern int       maxoctets_dir;      /* Direction :
-				      0 - in+out (default)
-				      1 - in
-				      2 - out
-				      3 - max(in,out) */
-extern int       maxoctets_timeout;  /* Timeout for check of octets limit */
-#define PPP_OCTETS_DIRECTION_SUM        0
-#define PPP_OCTETS_DIRECTION_IN         1
-#define PPP_OCTETS_DIRECTION_OUT        2
-#define PPP_OCTETS_DIRECTION_MAXOVERAL  3
-/* same as previos, but little different on RADIUS side */
-#define PPP_OCTETS_DIRECTION_MAXSESSION 4
-#endif
-
-/* Data input may be used by CCP and ECP, remove this entry
- * from struct protent to save some flash
- */
-#define PPP_DATAINPUT 0
-
-/*
- * The following struct gives the addresses of procedures to call
- * for a particular protocol.
- */
-struct protent {
-    u_short protocol;		/* PPP protocol number */
-    /* Initialization procedure */
-    void (*init) (ppp_pcb *pcb);
-    /* Process a received packet */
-    void (*input) (ppp_pcb *pcb, u_char *pkt, int len);
-    /* Process a received protocol-reject */
-    void (*protrej) (ppp_pcb *pcb);
-    /* Lower layer has come up */
-    void (*lowerup) (ppp_pcb *pcb);
-    /* Lower layer has gone down */
-    void (*lowerdown) (ppp_pcb *pcb);
-    /* Open the protocol */
-    void (*open) (ppp_pcb *pcb);
-    /* Close the protocol */
-    void (*close) (ppp_pcb *pcb, const char *reason);
-#if PRINTPKT_SUPPORT
-    /* Print a packet in readable form */
-    int  (*printpkt) (const u_char *pkt, int len,
-			  void (*printer) (void *, const char *, ...),
-			  void *arg);
-#endif /* PRINTPKT_SUPPORT */
-#if PPP_DATAINPUT
-    /* Process a received data packet */
-    void (*datainput) (ppp_pcb *pcb, u_char *pkt, int len);
-#endif /* PPP_DATAINPUT */
-#if PRINTPKT_SUPPORT
-    const char *name;		/* Text name of protocol */
-    const char *data_name;	/* Text name of corresponding data protocol */
-#endif /* PRINTPKT_SUPPORT */
-#if PPP_OPTIONS
-    option_t *options;		/* List of command-line options */
-    /* Check requested options, assign defaults */
-    void (*check_options) (void);
-#endif /* PPP_OPTIONS */
-#if DEMAND_SUPPORT
-    /* Configure interface for demand-dial */
-    int  (*demand_conf) (int unit);
-    /* Say whether to bring up link for this pkt */
-    int  (*active_pkt) (u_char *pkt, int len);
-#endif /* DEMAND_SUPPORT */
-};
-
-/* Table of pointers to supported protocols */
-extern const struct protent* const protocols[];
-
-
-/* Values for auth_pending, auth_done */
-#if PAP_SUPPORT
-#define PAP_WITHPEER	0x1
-#define PAP_PEER	0x2
-#endif /* PAP_SUPPORT */
-#if CHAP_SUPPORT
-#define CHAP_WITHPEER	0x4
-#define CHAP_PEER	0x8
-#endif /* CHAP_SUPPORT */
-#if EAP_SUPPORT
-#define EAP_WITHPEER	0x10
-#define EAP_PEER	0x20
-#endif /* EAP_SUPPORT */
-
-/* Values for auth_done only */
-#if CHAP_SUPPORT
-#define CHAP_MD5_WITHPEER	0x40
-#define CHAP_MD5_PEER		0x80
-#if MSCHAP_SUPPORT
-#define CHAP_MS_SHIFT		8	/* LSB position for MS auths */
-#define CHAP_MS_WITHPEER	0x100
-#define CHAP_MS_PEER		0x200
-#define CHAP_MS2_WITHPEER	0x400
-#define CHAP_MS2_PEER		0x800
-#endif /* MSCHAP_SUPPORT */
-#endif /* CHAP_SUPPORT */
-
-/* Supported CHAP protocols */
-#if CHAP_SUPPORT
-
-#if MSCHAP_SUPPORT
-#define CHAP_MDTYPE_SUPPORTED (MDTYPE_MICROSOFT_V2 | MDTYPE_MICROSOFT | MDTYPE_MD5)
-#else /* MSCHAP_SUPPORT */
-#define CHAP_MDTYPE_SUPPORTED (MDTYPE_MD5)
-#endif /* MSCHAP_SUPPORT */
-
-#else /* CHAP_SUPPORT */
-#define CHAP_MDTYPE_SUPPORTED (MDTYPE_NONE)
-#endif /* CHAP_SUPPORT */
-
-#if PPP_STATS_SUPPORT
-/*
- * PPP statistics structure
- */
-struct pppd_stats {
-    unsigned int	bytes_in;
-    unsigned int	bytes_out;
-    unsigned int	pkts_in;
-    unsigned int	pkts_out;
-};
-#endif /* PPP_STATS_SUPPORT */
-
-
-/*
- * PPP private functions
- */
-
- 
-/*
- * Functions called from lwIP core.
- */
-
-/* initialize the PPP subsystem */
-int ppp_init(void);
-
-/*
- * Functions called from PPP link protocols.
- */
-
-/* Create a new PPP control block */
-ppp_pcb *ppp_new(struct netif *pppif, const struct link_callbacks *callbacks, void *link_ctx_cb,
-                 ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
-
-/* Initiate LCP open request */
-void ppp_start(ppp_pcb *pcb);
-
-/* Called when link failed to setup */
-void ppp_link_failed(ppp_pcb *pcb);
-
-/* Called when link is normally down (i.e. it was asked to end) */
-void ppp_link_end(ppp_pcb *pcb);
-
-/* function called to process input packet */
-void ppp_input(ppp_pcb *pcb, struct pbuf *pb);
-
-/* helper function, merge a pbuf chain into one pbuf */
-struct pbuf *ppp_singlebuf(struct pbuf *p);
-
-
-/*
- * Functions called by PPP protocols.
- */
-
-/* function called by all PPP subsystems to send packets */
-err_t ppp_write(ppp_pcb *pcb, struct pbuf *p);
-
-/* functions called by auth.c link_terminated() */
-void ppp_link_terminated(ppp_pcb *pcb);
-
-void new_phase(ppp_pcb *pcb, int p);
-
-int ppp_send_config(ppp_pcb *pcb, int mtu, u32_t accm, int pcomp, int accomp);
-int ppp_recv_config(ppp_pcb *pcb, int mru, u32_t accm, int pcomp, int accomp);
-
-#if PPP_IPV4_SUPPORT
-int sifaddr(ppp_pcb *pcb, u32_t our_adr, u32_t his_adr, u32_t netmask);
-int cifaddr(ppp_pcb *pcb, u32_t our_adr, u32_t his_adr);
-#if 0 /* UNUSED - PROXY ARP */
-int sifproxyarp(ppp_pcb *pcb, u32_t his_adr);
-int cifproxyarp(ppp_pcb *pcb, u32_t his_adr);
-#endif /* UNUSED - PROXY ARP */
-#if LWIP_DNS
-int sdns(ppp_pcb *pcb, u32_t ns1, u32_t ns2);
-int cdns(ppp_pcb *pcb, u32_t ns1, u32_t ns2);
-#endif /* LWIP_DNS */
-#if VJ_SUPPORT
-int sifvjcomp(ppp_pcb *pcb, int vjcomp, int cidcomp, int maxcid);
-#endif /* VJ_SUPPORT */
-int sifup(ppp_pcb *pcb);
-int sifdown (ppp_pcb *pcb);
-u32_t get_mask(u32_t addr);
-#endif /* PPP_IPV4_SUPPORT */
-
-#if PPP_IPV6_SUPPORT
-int sif6addr(ppp_pcb *pcb, eui64_t our_eui64, eui64_t his_eui64);
-int cif6addr(ppp_pcb *pcb, eui64_t our_eui64, eui64_t his_eui64);
-int sif6up(ppp_pcb *pcb);
-int sif6down (ppp_pcb *pcb);
-#endif /* PPP_IPV6_SUPPORT */
-
-#if DEMAND_SUPPORT
-int sifnpmode(ppp_pcb *pcb, int proto, enum NPmode mode);
-#endif /* DEMAND_SUPPORt */
-
-void netif_set_mtu(ppp_pcb *pcb, int mtu);
-int netif_get_mtu(ppp_pcb *pcb);
-
-#if CCP_SUPPORT
-#if 0 /* unused */
-int ccp_test(ppp_pcb *pcb, u_char *opt_ptr, int opt_len, int for_transmit);
-#endif /* unused */
-void ccp_set(ppp_pcb *pcb, u8_t isopen, u8_t isup, u8_t receive_method, u8_t transmit_method);
-void ccp_reset_comp(ppp_pcb *pcb);
-void ccp_reset_decomp(ppp_pcb *pcb);
-#if 0 /* unused */
-int ccp_fatal_error(ppp_pcb *pcb);
-#endif /* unused */
-#endif /* CCP_SUPPORT */
-
-#if PPP_IDLETIMELIMIT
-int get_idle_time(ppp_pcb *pcb, struct ppp_idle *ip);
-#endif /* PPP_IDLETIMELIMIT */
-
-#if DEMAND_SUPPORT
-int get_loop_output(void);
-#endif /* DEMAND_SUPPORT */
-
-/* Optional protocol names list, to make our messages a little more informative. */
-#if PPP_PROTOCOLNAME
-const char * protocol_name(int proto);
-#endif /* PPP_PROTOCOLNAME  */
-
-/* Optional stats support, to get some statistics on the PPP interface */
-#if PPP_STATS_SUPPORT
-void print_link_stats(void); /* Print stats, if available */
-void reset_link_stats(int u); /* Reset (init) stats when link goes up */
-void update_link_stats(int u); /* Get stats at link termination */
-#endif /* PPP_STATS_SUPPORT */
-
-
-
-/*
- * Inline versions of get/put char/short/long.
- * Pointer is advanced; we assume that both arguments
- * are lvalues and will already be in registers.
- * cp MUST be u_char *.
- */
-#define GETCHAR(c, cp) { \
-	(c) = *(cp)++; \
-}
-#define PUTCHAR(c, cp) { \
-	*(cp)++ = (u_char) (c); \
-}
-#define GETSHORT(s, cp) { \
-	(s) = *(cp)++ << 8; \
-	(s) |= *(cp)++; \
-}
-#define PUTSHORT(s, cp) { \
-	*(cp)++ = (u_char) ((s) >> 8); \
-	*(cp)++ = (u_char) (s); \
-}
-#define GETLONG(l, cp) { \
-	(l) = *(cp)++ << 8; \
-	(l) |= *(cp)++; (l) <<= 8; \
-	(l) |= *(cp)++; (l) <<= 8; \
-	(l) |= *(cp)++; \
-}
-#define PUTLONG(l, cp) { \
-	*(cp)++ = (u_char) ((l) >> 24); \
-	*(cp)++ = (u_char) ((l) >> 16); \
-	*(cp)++ = (u_char) ((l) >> 8); \
-	*(cp)++ = (u_char) (l); \
-}
-
-#define INCPTR(n, cp)	((cp) += (n))
-#define DECPTR(n, cp)	((cp) -= (n))
-
-/*
- * System dependent definitions for user-level 4.3BSD UNIX implementation.
- */
-#define TIMEOUT(f, a, t)        do { sys_untimeout((f), (a)); sys_timeout((t)*1000, (f), (a)); } while(0)
-#define TIMEOUTMS(f, a, t)      do { sys_untimeout((f), (a)); sys_timeout((t), (f), (a)); } while(0)
-#define UNTIMEOUT(f, a)         sys_untimeout((f), (a))
-
-#define BZERO(s, n)		memset(s, 0, n)
-#define	BCMP(s1, s2, l)		memcmp(s1, s2, l)
-
-#define PRINTMSG(m, l)		{ ppp_info("Remote message: %0.*v", l, m); }
-
-/*
- * MAKEHEADER - Add Header fields to a packet.
- */
-#define MAKEHEADER(p, t) { \
-    PUTCHAR(PPP_ALLSTATIONS, p); \
-    PUTCHAR(PPP_UI, p); \
-    PUTSHORT(t, p); }
-
-/* Procedures exported from auth.c */
-void link_required(ppp_pcb *pcb);     /* we are starting to use the link */
-void link_terminated(ppp_pcb *pcb);   /* we are finished with the link */
-void link_down(ppp_pcb *pcb);	      /* the LCP layer has left the Opened state */
-void upper_layers_down(ppp_pcb *pcb); /* take all NCPs down */
-void link_established(ppp_pcb *pcb);  /* the link is up; authenticate now */
-void start_networks(ppp_pcb *pcb);    /* start all the network control protos */
-void continue_networks(ppp_pcb *pcb); /* start network [ip, etc] control protos */
-#if PPP_AUTH_SUPPORT
-#if PPP_SERVER
-int auth_check_passwd(ppp_pcb *pcb, char *auser, int userlen, char *apasswd, int passwdlen, const char **msg, int *msglen);
-                                /* check the user name and passwd against configuration */
-void auth_peer_fail(ppp_pcb *pcb, int protocol);
-				/* peer failed to authenticate itself */
-void auth_peer_success(ppp_pcb *pcb, int protocol, int prot_flavor, const char *name, int namelen);
-				/* peer successfully authenticated itself */
-#endif /* PPP_SERVER */
-void auth_withpeer_fail(ppp_pcb *pcb, int protocol);
-				/* we failed to authenticate ourselves */
-void auth_withpeer_success(ppp_pcb *pcb, int protocol, int prot_flavor);
-				/* we successfully authenticated ourselves */
-#endif /* PPP_AUTH_SUPPORT */
-void np_up(ppp_pcb *pcb, int proto);    /* a network protocol has come up */
-void np_down(ppp_pcb *pcb, int proto);  /* a network protocol has gone down */
-void np_finished(ppp_pcb *pcb, int proto); /* a network protocol no longer needs link */
-#if PPP_AUTH_SUPPORT
-int get_secret(ppp_pcb *pcb, const char *client, const char *server, char *secret, int *secret_len, int am_server);
-				/* get "secret" for chap */
-#endif /* PPP_AUTH_SUPPORT */
-
-/* Procedures exported from ipcp.c */
-/* int parse_dotted_ip (char *, u32_t *); */
-
-/* Procedures exported from demand.c */
-#if DEMAND_SUPPORT
-void demand_conf (void);	/* config interface(s) for demand-dial */
-void demand_block (void);	/* set all NPs to queue up packets */
-void demand_unblock (void); /* set all NPs to pass packets */
-void demand_discard (void); /* set all NPs to discard packets */
-void demand_rexmit (int, u32_t); /* retransmit saved frames for an NP*/
-int  loop_chars (unsigned char *, int); /* process chars from loopback */
-int  loop_frame (unsigned char *, int); /* should we bring link up? */
-#endif /* DEMAND_SUPPORT */
-
-/* Procedures exported from multilink.c */
-#ifdef HAVE_MULTILINK
-void mp_check_options (void); /* Check multilink-related options */
-int  mp_join_bundle (void);  /* join our link to an appropriate bundle */
-void mp_exit_bundle (void);  /* have disconnected our link from bundle */
-void mp_bundle_terminated (void);
-char *epdisc_to_str (struct epdisc *); /* string from endpoint discrim. */
-int  str_to_epdisc (struct epdisc *, char *); /* endpt disc. from str */
-#else
-#define mp_bundle_terminated()	/* nothing */
-#define mp_exit_bundle()	/* nothing */
-#define doing_multilink		0
-#define multilink_master	0
-#endif
-
-/* Procedures exported from utils.c. */
-void ppp_print_string(const u_char *p, int len, void (*printer) (void *, const char *, ...), void *arg);   /* Format a string for output */
-int ppp_slprintf(char *buf, int buflen, const char *fmt, ...);            /* sprintf++ */
-int ppp_vslprintf(char *buf, int buflen, const char *fmt, va_list args);  /* vsprintf++ */
-size_t ppp_strlcpy(char *dest, const char *src, size_t len);        /* safe strcpy */
-size_t ppp_strlcat(char *dest, const char *src, size_t len);        /* safe strncpy */
-void ppp_dbglog(const char *fmt, ...);    /* log a debug message */
-void ppp_info(const char *fmt, ...);      /* log an informational message */
-void ppp_notice(const char *fmt, ...);    /* log a notice-level message */
-void ppp_warn(const char *fmt, ...);      /* log a warning message */
-void ppp_error(const char *fmt, ...);     /* log an error message */
-void ppp_fatal(const char *fmt, ...);     /* log an error message and die(1) */
-#if PRINTPKT_SUPPORT
-void ppp_dump_packet(ppp_pcb *pcb, const char *tag, unsigned char *p, int len);
-                                /* dump packet to debug log if interesting */
-#endif /* PRINTPKT_SUPPORT */
-
-
-#endif /* PPP_SUPPORT */
-#endif /* LWIP_HDR_PPP_IMPL_H */
diff --git a/sys/include/netif/ppp/ppp_opts.h b/sys/include/netif/ppp/ppp_opts.h
deleted file mode 100644
index 49c25b5..0000000
--- a/sys/include/netif/ppp/ppp_opts.h
+++ /dev/null
@@ -1,593 +0,0 @@
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-
-#ifndef LWIP_PPP_OPTS_H
-#define LWIP_PPP_OPTS_H
-
-#include "net/opt.h"
-
-/**
- * PPP_SUPPORT==1: Enable PPP.
- */
-#ifndef PPP_SUPPORT
-#define PPP_SUPPORT                     0
-#endif
-
-/**
- * PPPOE_SUPPORT==1: Enable PPP Over Ethernet
- */
-#ifndef PPPOE_SUPPORT
-#define PPPOE_SUPPORT                   0
-#endif
-
-/**
- * PPPOL2TP_SUPPORT==1: Enable PPP Over L2TP
- */
-#ifndef PPPOL2TP_SUPPORT
-#define PPPOL2TP_SUPPORT                0
-#endif
-
-/**
- * PPPOL2TP_AUTH_SUPPORT==1: Enable PPP Over L2TP Auth (enable MD5 support)
- */
-#ifndef PPPOL2TP_AUTH_SUPPORT
-#define PPPOL2TP_AUTH_SUPPORT           PPPOL2TP_SUPPORT
-#endif
-
-/**
- * PPPOS_SUPPORT==1: Enable PPP Over Serial
- */
-#ifndef PPPOS_SUPPORT
-#define PPPOS_SUPPORT                   PPP_SUPPORT
-#endif
-
-/**
- * LWIP_PPP_API==1: Enable PPP API (in pppapi.c)
- */
-#ifndef LWIP_PPP_API
-#define LWIP_PPP_API                    (PPP_SUPPORT && (NO_SYS == 0))
-#endif
-
-/**
- * MEMP_NUM_PPP_PCB: the number of simultaneously active PPP
- * connections (requires the PPP_SUPPORT option)
- */
-#ifndef MEMP_NUM_PPP_PCB
-#define MEMP_NUM_PPP_PCB       1
-#endif
-
-#if PPP_SUPPORT
-
-/**
- * MEMP_NUM_PPPOS_INTERFACES: the number of concurrently active PPPoS
- * interfaces (only used with PPPOS_SUPPORT==1)
- */
-#ifndef MEMP_NUM_PPPOS_INTERFACES
-#define MEMP_NUM_PPPOS_INTERFACES       MEMP_NUM_PPP_PCB
-#endif
-
-/**
- * MEMP_NUM_PPPOE_INTERFACES: the number of concurrently active PPPoE
- * interfaces (only used with PPPOE_SUPPORT==1)
- */
-#ifndef MEMP_NUM_PPPOE_INTERFACES
-#define MEMP_NUM_PPPOE_INTERFACES       1
-#endif
-
-/**
- * MEMP_NUM_PPPOL2TP_INTERFACES: the number of concurrently active PPPoL2TP
- * interfaces (only used with PPPOL2TP_SUPPORT==1)
- */
-#ifndef MEMP_NUM_PPPOL2TP_INTERFACES
-#define MEMP_NUM_PPPOL2TP_INTERFACES       1
-#endif
-
-/**
- * MEMP_NUM_PPP_API_MSG: Number of concurrent PPP API messages (in pppapi.c)
- */
-#ifndef MEMP_NUM_PPP_API_MSG
-#define MEMP_NUM_PPP_API_MSG 5
-#endif
-
-/**
- * PPP_DEBUG: Enable debugging for PPP.
- */
-#ifndef PPP_DEBUG
-#define PPP_DEBUG                       LWIP_DBG_OFF
-#endif
-
-/**
- * PPP_INPROC_IRQ_SAFE==1 call pppos_input() using tcpip_callback().
- *
- * Please read the "PPPoS input path" chapter in the PPP documentation about this option.
- */
-#ifndef PPP_INPROC_IRQ_SAFE
-#define PPP_INPROC_IRQ_SAFE             0
-#endif
-
-/**
- * PRINTPKT_SUPPORT==1: Enable PPP print packet support
- *
- * Mandatory for debugging, it displays exchanged packet content in debug trace.
- */
-#ifndef PRINTPKT_SUPPORT
-#define PRINTPKT_SUPPORT                0
-#endif
-
-/**
- * PPP_IPV4_SUPPORT==1: Enable PPP IPv4 support
- */
-#ifndef PPP_IPV4_SUPPORT
-#define PPP_IPV4_SUPPORT                (LWIP_IPV4)
-#endif
-
-/**
- * PPP_IPV6_SUPPORT==1: Enable PPP IPv6 support
- */
-#ifndef PPP_IPV6_SUPPORT
-#define PPP_IPV6_SUPPORT                (LWIP_IPV6)
-#endif
-
-/**
- * PPP_NOTIFY_PHASE==1: Support PPP notify phase support
- *
- * PPP notify phase support allows you to set a callback which is
- * called on change of the internal PPP state machine.
- *
- * This can be used for example to set a LED pattern depending on the
- * current phase of the PPP session.
- */
-#ifndef PPP_NOTIFY_PHASE
-#define PPP_NOTIFY_PHASE                0
-#endif
-
-/**
- * pbuf_type PPP is using for LCP, PAP, CHAP, EAP, CCP, IPCP and IP6CP packets.
- *
- * Memory allocated must be single buffered for PPP to works, it requires pbuf
- * that are not going to be chained when allocated. This requires setting
- * PBUF_POOL_BUFSIZE to at least 512 bytes, which is quite huge for small systems.
- *
- * Setting PPP_USE_PBUF_RAM to 1 makes PPP use memory from heap where continuous
- * buffers are required, allowing you to use a smaller PBUF_POOL_BUFSIZE.
- */
-#ifndef PPP_USE_PBUF_RAM
-#define PPP_USE_PBUF_RAM                0
-#endif
-
-/**
- * PPP_FCS_TABLE: Keep a 256*2 byte table to speed up FCS calculation for PPPoS
- */
-#ifndef PPP_FCS_TABLE
-#define PPP_FCS_TABLE                   1
-#endif
-
-/**
- * PAP_SUPPORT==1: Support PAP.
- */
-#ifndef PAP_SUPPORT
-#define PAP_SUPPORT                     0
-#endif
-
-/**
- * CHAP_SUPPORT==1: Support CHAP.
- */
-#ifndef CHAP_SUPPORT
-#define CHAP_SUPPORT                    0
-#endif
-
-/**
- * MSCHAP_SUPPORT==1: Support MSCHAP.
- */
-#ifndef MSCHAP_SUPPORT
-#define MSCHAP_SUPPORT                  0
-#endif
-#if MSCHAP_SUPPORT
-/* MSCHAP requires CHAP support */
-#undef CHAP_SUPPORT
-#define CHAP_SUPPORT                    1
-#endif /* MSCHAP_SUPPORT */
-
-/**
- * EAP_SUPPORT==1: Support EAP.
- */
-#ifndef EAP_SUPPORT
-#define EAP_SUPPORT                     0
-#endif
-
-/**
- * CCP_SUPPORT==1: Support CCP.
- */
-#ifndef CCP_SUPPORT
-#define CCP_SUPPORT                     0
-#endif
-
-/**
- * MPPE_SUPPORT==1: Support MPPE.
- */
-#ifndef MPPE_SUPPORT
-#define MPPE_SUPPORT                    0
-#endif
-#if MPPE_SUPPORT
-/* MPPE requires CCP support */
-#undef CCP_SUPPORT
-#define CCP_SUPPORT                     1
-/* MPPE requires MSCHAP support */
-#undef MSCHAP_SUPPORT
-#define MSCHAP_SUPPORT                  1
-/* MSCHAP requires CHAP support */
-#undef CHAP_SUPPORT
-#define CHAP_SUPPORT                    1
-#endif /* MPPE_SUPPORT */
-
-/**
- * CBCP_SUPPORT==1: Support CBCP. CURRENTLY NOT SUPPORTED! DO NOT SET!
- */
-#ifndef CBCP_SUPPORT
-#define CBCP_SUPPORT                    0
-#endif
-
-/**
- * ECP_SUPPORT==1: Support ECP. CURRENTLY NOT SUPPORTED! DO NOT SET!
- */
-#ifndef ECP_SUPPORT
-#define ECP_SUPPORT                     0
-#endif
-
-/**
- * DEMAND_SUPPORT==1: Support dial on demand. CURRENTLY NOT SUPPORTED! DO NOT SET!
- */
-#ifndef DEMAND_SUPPORT
-#define DEMAND_SUPPORT                  0
-#endif
-
-/**
- * LQR_SUPPORT==1: Support Link Quality Report. Do nothing except exchanging some LCP packets.
- */
-#ifndef LQR_SUPPORT
-#define LQR_SUPPORT                     0
-#endif
-
-/**
- * PPP_SERVER==1: Enable PPP server support (waiting for incoming PPP session).
- *
- * Currently only supported for PPPoS.
- */
-#ifndef PPP_SERVER
-#define PPP_SERVER                      0
-#endif
-
-#if PPP_SERVER
-/*
- * PPP_OUR_NAME: Our name for authentication purposes
- */
-#ifndef PPP_OUR_NAME
-#define PPP_OUR_NAME                    "lwIP"
-#endif
-#endif /* PPP_SERVER */
-
-/**
- * VJ_SUPPORT==1: Support VJ header compression.
- */
-#ifndef VJ_SUPPORT
-#define VJ_SUPPORT                      1
-#endif
-/* VJ compression is only supported for TCP over IPv4 over PPPoS. */
-#if !PPPOS_SUPPORT || !PPP_IPV4_SUPPORT || !LWIP_TCP
-#undef VJ_SUPPORT
-#define VJ_SUPPORT                      0
-#endif /* !PPPOS_SUPPORT */
-
-/**
- * PPP_MD5_RANDM==1: Use MD5 for better randomness.
- * Enabled by default if CHAP, EAP, or L2TP AUTH support is enabled.
- */
-#ifndef PPP_MD5_RANDM
-#define PPP_MD5_RANDM                   (CHAP_SUPPORT || EAP_SUPPORT || PPPOL2TP_AUTH_SUPPORT)
-#endif
-
-/**
- * PolarSSL embedded library
- *
- *
- * lwIP contains some files fetched from the latest BSD release of
- * the PolarSSL project (PolarSSL 0.10.1-bsd) for ciphers and encryption
- * methods we need for lwIP PPP support.
- *
- * The PolarSSL files were cleaned to contain only the necessary struct
- * fields and functions needed for lwIP.
- *
- * The PolarSSL API was not changed at all, so if you are already using
- * PolarSSL you can choose to skip the compilation of the included PolarSSL
- * library into lwIP.
- *
- * If you are not using the embedded copy you must include external
- * libraries into your arch/cc.h port file.
- *
- * Beware of the stack requirements which can be a lot larger if you are not
- * using our cleaned PolarSSL library.
- */
-
-/**
- * LWIP_USE_EXTERNAL_POLARSSL: Use external PolarSSL library
- */
-#ifndef LWIP_USE_EXTERNAL_POLARSSL
-#define LWIP_USE_EXTERNAL_POLARSSL      0
-#endif
-
-/**
- * LWIP_USE_EXTERNAL_MBEDTLS: Use external mbed TLS library
- */
-#ifndef LWIP_USE_EXTERNAL_MBEDTLS
-#define LWIP_USE_EXTERNAL_MBEDTLS       0
-#endif
-
-/*
- * PPP Timeouts
- */
-
-/**
- * FSM_DEFTIMEOUT: Timeout time in seconds
- */
-#ifndef FSM_DEFTIMEOUT
-#define FSM_DEFTIMEOUT                  6
-#endif
-
-/**
- * FSM_DEFMAXTERMREQS: Maximum Terminate-Request transmissions
- */
-#ifndef FSM_DEFMAXTERMREQS
-#define FSM_DEFMAXTERMREQS              2
-#endif
-
-/**
- * FSM_DEFMAXCONFREQS: Maximum Configure-Request transmissions
- */
-#ifndef FSM_DEFMAXCONFREQS
-#define FSM_DEFMAXCONFREQS              10
-#endif
-
-/**
- * FSM_DEFMAXNAKLOOPS: Maximum number of nak loops
- */
-#ifndef FSM_DEFMAXNAKLOOPS
-#define FSM_DEFMAXNAKLOOPS              5
-#endif
-
-/**
- * UPAP_DEFTIMEOUT: Timeout (seconds) for retransmitting req
- */
-#ifndef UPAP_DEFTIMEOUT
-#define UPAP_DEFTIMEOUT                 6
-#endif
-
-/**
- * UPAP_DEFTRANSMITS: Maximum number of auth-reqs to send
- */
-#ifndef UPAP_DEFTRANSMITS
-#define UPAP_DEFTRANSMITS               10
-#endif
-
-#if PPP_SERVER
-/**
- * UPAP_DEFREQTIME: Time to wait for auth-req from peer
- */
-#ifndef UPAP_DEFREQTIME
-#define UPAP_DEFREQTIME                 30
-#endif
-#endif /* PPP_SERVER */
-
-/**
- * CHAP_DEFTIMEOUT: Timeout (seconds) for retransmitting req
- */
-#ifndef CHAP_DEFTIMEOUT
-#define CHAP_DEFTIMEOUT                 6
-#endif
-
-/**
- * CHAP_DEFTRANSMITS: max # times to send challenge
- */
-#ifndef CHAP_DEFTRANSMITS
-#define CHAP_DEFTRANSMITS               10
-#endif
-
-#if PPP_SERVER
-/**
- * CHAP_DEFRECHALLENGETIME: If this option is > 0, rechallenge the peer every n seconds
- */
-#ifndef CHAP_DEFRECHALLENGETIME
-#define CHAP_DEFRECHALLENGETIME         0
-#endif
-#endif /* PPP_SERVER */
-
-/**
- * EAP_DEFREQTIME: Time to wait for peer request
- */
-#ifndef EAP_DEFREQTIME
-#define EAP_DEFREQTIME                  6
-#endif
-
-/**
- * EAP_DEFALLOWREQ: max # times to accept requests
- */
-#ifndef EAP_DEFALLOWREQ
-#define EAP_DEFALLOWREQ                 10
-#endif
-
-#if PPP_SERVER
-/**
- * EAP_DEFTIMEOUT: Timeout (seconds) for rexmit
- */
-#ifndef EAP_DEFTIMEOUT
-#define EAP_DEFTIMEOUT                  6
-#endif
-
-/**
- * EAP_DEFTRANSMITS: max # times to transmit
- */
-#ifndef EAP_DEFTRANSMITS
-#define EAP_DEFTRANSMITS                10
-#endif
-#endif /* PPP_SERVER */
-
-/**
- * LCP_DEFLOOPBACKFAIL: Default number of times we receive our magic number from the peer
- * before deciding the link is looped-back.
- */
-#ifndef LCP_DEFLOOPBACKFAIL
-#define LCP_DEFLOOPBACKFAIL             10
-#endif
-
-/**
- * LCP_ECHOINTERVAL: Interval in seconds between keepalive echo requests, 0 to disable.
- */
-#ifndef LCP_ECHOINTERVAL
-#define LCP_ECHOINTERVAL                0
-#endif
-
-/**
- * LCP_MAXECHOFAILS: Number of unanswered echo requests before failure.
- */
-#ifndef LCP_MAXECHOFAILS
-#define LCP_MAXECHOFAILS                3
-#endif
-
-/**
- * PPP_MAXIDLEFLAG: Max Xmit idle time (in ms) before resend flag char.
- */
-#ifndef PPP_MAXIDLEFLAG
-#define PPP_MAXIDLEFLAG                 100
-#endif
-
-/**
- * PPP Packet sizes
- */
-
-/**
- * PPP_MRU: Default MRU
- */
-#ifndef PPP_MRU
-#define PPP_MRU                         1500
-#endif
-
-/**
- * PPP_DEFMRU: Default MRU to try
- */
-#ifndef PPP_DEFMRU
-#define PPP_DEFMRU                      1500
-#endif
-
-/**
- * PPP_MAXMRU: Normally limit MRU to this (pppd default = 16384)
- */
-#ifndef PPP_MAXMRU
-#define PPP_MAXMRU                      1500
-#endif
-
-/**
- * PPP_MINMRU: No MRUs below this
- */
-#ifndef PPP_MINMRU
-#define PPP_MINMRU                      128
-#endif
-
-/**
- * PPPOL2TP_DEFMRU: Default MTU and MRU for L2TP
- * Default = 1500 - PPPoE(6) - PPP Protocol(2) - IPv4 header(20) - UDP Header(8)
- * - L2TP Header(6) - HDLC Header(2) - PPP Protocol(2) - MPPE Header(2) - PPP Protocol(2)
- */
-#if PPPOL2TP_SUPPORT
-#ifndef PPPOL2TP_DEFMRU
-#define PPPOL2TP_DEFMRU                 1450
-#endif
-#endif /* PPPOL2TP_SUPPORT */
-
-/**
- * MAXNAMELEN: max length of hostname or name for auth
- */
-#ifndef MAXNAMELEN
-#define MAXNAMELEN                      256
-#endif
-
-/**
- * MAXSECRETLEN: max length of password or secret
- */
-#ifndef MAXSECRETLEN
-#define MAXSECRETLEN                    256
-#endif
-
-/* ------------------------------------------------------------------------- */
-
-/*
- * Build triggers for embedded PolarSSL
- */
-#if !LWIP_USE_EXTERNAL_POLARSSL && !LWIP_USE_EXTERNAL_MBEDTLS
-
-/* CHAP, EAP, L2TP AUTH and MD5 Random require MD5 support */
-#if CHAP_SUPPORT || EAP_SUPPORT || PPPOL2TP_AUTH_SUPPORT || PPP_MD5_RANDM
-#define LWIP_INCLUDED_POLARSSL_MD5      1
-#endif /* CHAP_SUPPORT || EAP_SUPPORT || PPPOL2TP_AUTH_SUPPORT || PPP_MD5_RANDM */
-
-#if MSCHAP_SUPPORT
-
-/* MSCHAP require MD4 support */
-#define LWIP_INCLUDED_POLARSSL_MD4      1
-/* MSCHAP require SHA1 support */
-#define LWIP_INCLUDED_POLARSSL_SHA1     1
-/* MSCHAP require DES support */
-#define LWIP_INCLUDED_POLARSSL_DES      1
-
-/* MS-CHAP support is required for MPPE */
-#if MPPE_SUPPORT
-/* MPPE require ARC4 support */
-#define LWIP_INCLUDED_POLARSSL_ARC4     1
-#endif /* MPPE_SUPPORT */
-
-#endif /* MSCHAP_SUPPORT */
-
-#endif /* !LWIP_USE_EXTERNAL_POLARSSL && !LWIP_USE_EXTERNAL_MBEDTLS */
-
-/* Default value if unset */
-#ifndef LWIP_INCLUDED_POLARSSL_MD4
-#define LWIP_INCLUDED_POLARSSL_MD4      0
-#endif /* LWIP_INCLUDED_POLARSSL_MD4 */
-#ifndef LWIP_INCLUDED_POLARSSL_MD5
-#define LWIP_INCLUDED_POLARSSL_MD5      0
-#endif /* LWIP_INCLUDED_POLARSSL_MD5 */
-#ifndef LWIP_INCLUDED_POLARSSL_SHA1
-#define LWIP_INCLUDED_POLARSSL_SHA1     0
-#endif /* LWIP_INCLUDED_POLARSSL_SHA1 */
-#ifndef LWIP_INCLUDED_POLARSSL_DES
-#define LWIP_INCLUDED_POLARSSL_DES      0
-#endif /* LWIP_INCLUDED_POLARSSL_DES */
-#ifndef LWIP_INCLUDED_POLARSSL_ARC4
-#define LWIP_INCLUDED_POLARSSL_ARC4     0
-#endif /* LWIP_INCLUDED_POLARSSL_ARC4 */
-
-#endif /* PPP_SUPPORT */
-
-#endif /* LWIP_PPP_OPTS_H */
diff --git a/sys/include/netif/ppp/pppapi.h b/sys/include/netif/ppp/pppapi.h
deleted file mode 100644
index 8070491..0000000
--- a/sys/include/netif/ppp/pppapi.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-
-#ifndef LWIP_PPPAPI_H
-#define LWIP_PPPAPI_H
-
-#include "netif/ppp/ppp_opts.h"
-
-#if LWIP_PPP_API /* don't build if not configured for use in lwipopts.h */
-
-#include "net/sys.h"
-#include "net/netif.h"
-#include "net/priv/tcpip_priv.h"
-#include "netif/ppp/ppp.h"
-#if PPPOS_SUPPORT
-#include "netif/ppp/pppos.h"
-#endif /* PPPOS_SUPPORT */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct pppapi_msg_msg {
-  ppp_pcb *ppp;
-  union {
-#if PPP_NOTIFY_PHASE
-    struct {
-      ppp_notify_phase_cb_fn notify_phase_cb;
-    } setnotifyphasecb;
-#endif /* PPP_NOTIFY_PHASE */
-#if PPPOS_SUPPORT
-    struct {
-      struct netif *pppif;
-      pppos_output_cb_fn output_cb;
-      ppp_link_status_cb_fn link_status_cb;
-      void *ctx_cb;
-    } serialcreate;
-#endif /* PPPOS_SUPPORT */
-#if PPPOE_SUPPORT
-    struct {
-      struct netif *pppif;
-      struct netif *ethif;
-      const char *service_name;
-      const char *concentrator_name;
-      ppp_link_status_cb_fn link_status_cb;
-      void *ctx_cb;
-    } ethernetcreate;
-#endif /* PPPOE_SUPPORT */
-#if PPPOL2TP_SUPPORT
-    struct {
-      struct netif *pppif;
-      struct netif *netif;
-      API_MSG_M_DEF_C(ip_addr_t, ipaddr);
-      u16_t port;
-#if PPPOL2TP_AUTH_SUPPORT
-      const u8_t *secret;
-      u8_t secret_len;
-#endif /* PPPOL2TP_AUTH_SUPPORT */
-      ppp_link_status_cb_fn link_status_cb;
-      void *ctx_cb;
-    } l2tpcreate;
-#endif /* PPPOL2TP_SUPPORT */
-    struct {
-      u16_t holdoff;
-    } connect;
-    struct {
-      u8_t nocarrier;
-    } close;
-    struct {
-      u8_t cmd;
-      void *arg;
-    } ioctl;
-  } msg;
-};
-
-struct pppapi_msg {
-  struct tcpip_api_call_data call;
-  struct pppapi_msg_msg msg;
-};
-
-/* API for application */
-err_t pppapi_set_default(ppp_pcb *pcb);
-#if PPP_NOTIFY_PHASE
-err_t pppapi_set_notify_phase_callback(ppp_pcb *pcb, ppp_notify_phase_cb_fn notify_phase_cb);
-#endif /* PPP_NOTIFY_PHASE */
-#if PPPOS_SUPPORT
-ppp_pcb *pppapi_pppos_create(struct netif *pppif, pppos_output_cb_fn output_cb, ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
-#endif /* PPPOS_SUPPORT */
-#if PPPOE_SUPPORT
-ppp_pcb *pppapi_pppoe_create(struct netif *pppif, struct netif *ethif, const char *service_name,
-                                const char *concentrator_name, ppp_link_status_cb_fn link_status_cb,
-                                void *ctx_cb);
-#endif /* PPPOE_SUPPORT */
-#if PPPOL2TP_SUPPORT
-ppp_pcb *pppapi_pppol2tp_create(struct netif *pppif, struct netif *netif, ip_addr_t *ipaddr, u16_t port,
-                            const u8_t *secret, u8_t secret_len,
-                            ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
-#endif /* PPPOL2TP_SUPPORT */
-err_t pppapi_connect(ppp_pcb *pcb, u16_t holdoff);
-#if PPP_SERVER
-err_t pppapi_listen(ppp_pcb *pcb);
-#endif /* PPP_SERVER */
-err_t pppapi_close(ppp_pcb *pcb, u8_t nocarrier);
-err_t pppapi_free(ppp_pcb *pcb);
-err_t pppapi_ioctl(ppp_pcb *pcb, u8_t cmd, void *arg);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_PPP_API */
-
-#endif /* LWIP_PPPAPI_H */
diff --git a/sys/include/netif/ppp/pppcrypt.h b/sys/include/netif/ppp/pppcrypt.h
deleted file mode 100644
index 400a577..0000000
--- a/sys/include/netif/ppp/pppcrypt.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * pppcrypt.c - PPP/DES linkage for MS-CHAP and EAP SRP-SHA1
- *
- * Extracted from chap_ms.c by James Carlson.
- *
- * Copyright (c) 1995 Eric Rosenquist.  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(s) of the authors of this software must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission.
- *
- * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
- * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-/* This header file is included in all PPP modules needing hashes and/or ciphers */
-
-#ifndef PPPCRYPT_H
-#define	PPPCRYPT_H
-
-/*
- * If included PolarSSL copy is not used, user is expected to include
- * external libraries in arch/cc.h (which is included by lwip/arch.h).
- */
-#include "net/arch.h"
-
-/*
- * Map hashes and ciphers functions to PolarSSL
- */
-#if !LWIP_USE_EXTERNAL_MBEDTLS
-
-#include "netif/ppp/polarssl/md4.h"
-#define lwip_md4_context md4_context
-#define lwip_md4_init(context)
-#define lwip_md4_starts md4_starts
-#define lwip_md4_update md4_update
-#define lwip_md4_finish md4_finish
-#define lwip_md4_free(context)
-
-#include "netif/ppp/polarssl/md5.h"
-#define lwip_md5_context md5_context
-#define lwip_md5_init(context)
-#define lwip_md5_starts md5_starts
-#define lwip_md5_update md5_update
-#define lwip_md5_finish md5_finish
-#define lwip_md5_free(context)
-
-#include "netif/ppp/polarssl/sha1.h"
-#define lwip_sha1_context sha1_context
-#define lwip_sha1_init(context)
-#define lwip_sha1_starts sha1_starts
-#define lwip_sha1_update sha1_update
-#define lwip_sha1_finish sha1_finish
-#define lwip_sha1_free(context)
-
-#include "netif/ppp/polarssl/des.h"
-#define lwip_des_context des_context
-#define lwip_des_init(context)
-#define lwip_des_setkey_enc des_setkey_enc
-#define lwip_des_crypt_ecb des_crypt_ecb
-#define lwip_des_free(context)
-
-#include "netif/ppp/polarssl/arc4.h"
-#define lwip_arc4_context arc4_context
-#define lwip_arc4_init(context)
-#define lwip_arc4_setup arc4_setup
-#define lwip_arc4_crypt arc4_crypt
-#define lwip_arc4_free(context)
-
-#endif /* !LWIP_USE_EXTERNAL_MBEDTLS */
-
-/*
- * Map hashes and ciphers functions to mbed TLS
- */
-#if LWIP_USE_EXTERNAL_MBEDTLS
-
-#define lwip_md4_context mbedtls_md4_context
-#define lwip_md4_init mbedtls_md4_init
-#define lwip_md4_starts mbedtls_md4_starts
-#define lwip_md4_update mbedtls_md4_update
-#define lwip_md4_finish mbedtls_md4_finish
-#define lwip_md4_free mbedtls_md4_free
-
-#define lwip_md5_context mbedtls_md5_context
-#define lwip_md5_init mbedtls_md5_init
-#define lwip_md5_starts mbedtls_md5_starts
-#define lwip_md5_update mbedtls_md5_update
-#define lwip_md5_finish mbedtls_md5_finish
-#define lwip_md5_free mbedtls_md5_free
-
-#define lwip_sha1_context mbedtls_sha1_context
-#define lwip_sha1_init mbedtls_sha1_init
-#define lwip_sha1_starts mbedtls_sha1_starts
-#define lwip_sha1_update mbedtls_sha1_update
-#define lwip_sha1_finish mbedtls_sha1_finish
-#define lwip_sha1_free mbedtls_sha1_free
-
-#define lwip_des_context mbedtls_des_context
-#define lwip_des_init mbedtls_des_init
-#define lwip_des_setkey_enc mbedtls_des_setkey_enc
-#define lwip_des_crypt_ecb mbedtls_des_crypt_ecb
-#define lwip_des_free mbedtls_des_free
-
-#define lwip_arc4_context mbedtls_arc4_context
-#define lwip_arc4_init mbedtls_arc4_init
-#define lwip_arc4_setup mbedtls_arc4_setup
-#define lwip_arc4_crypt(context, buffer, length) mbedtls_arc4_crypt(context, length, buffer, buffer)
-#define lwip_arc4_free mbedtls_arc4_free
-
-#endif /* LWIP_USE_EXTERNAL_MBEDTLS */
-
-void pppcrypt_56_to_64_bit_key(u_char *key, u_char *des_key);
-
-#endif /* PPPCRYPT_H */
-
-#endif /* PPP_SUPPORT */
diff --git a/sys/include/netif/ppp/pppdebug.h b/sys/include/netif/ppp/pppdebug.h
deleted file mode 100644
index 7ead045..0000000
--- a/sys/include/netif/ppp/pppdebug.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****************************************************************************
-* pppdebug.h - System debugging utilities.
-*
-* Copyright (c) 2003 by Marc Boucher, Services Informatiques (MBSI) inc.
-* portions Copyright (c) 1998 Global Election Systems Inc.
-* portions Copyright (c) 2001 by Cognizant Pty Ltd.
-*
-* The authors hereby grant permission to use, copy, modify, distribute,
-* and license this software and its documentation for any purpose, provided
-* that existing copyright notices are retained in all copies and that this
-* notice and the following disclaimer are included verbatim in any 
-* distributions. No written agreement, license, or royalty fee is required
-* for any of the authorized uses.
-*
-* THIS SOFTWARE IS PROVIDED BY THE 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 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.
-*
-******************************************************************************
-* REVISION HISTORY (please don't use tabs!)
-*
-* 03-01-01 Marc Boucher <marc@mbsi.ca>
-*   Ported to lwIP.
-* 98-07-29 Guy Lancaster <lancasterg@acm.org>, Global Election Systems Inc.
-*   Original.
-*
-*****************************************************************************
-*/
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef PPPDEBUG_H
-#define PPPDEBUG_H
-
-/* Trace levels. */
-#define LOG_CRITICAL  (PPP_DEBUG | LWIP_DBG_LEVEL_SEVERE)
-#define LOG_ERR       (PPP_DEBUG | LWIP_DBG_LEVEL_SEVERE)
-#define LOG_NOTICE    (PPP_DEBUG | LWIP_DBG_LEVEL_WARNING)
-#define LOG_WARNING   (PPP_DEBUG | LWIP_DBG_LEVEL_WARNING)
-#define LOG_INFO      (PPP_DEBUG)
-#define LOG_DETAIL    (PPP_DEBUG)
-#define LOG_DEBUG     (PPP_DEBUG)
-
-#if PPP_DEBUG
-
-#define MAINDEBUG(a)    LWIP_DEBUGF(LWIP_DBG_LEVEL_WARNING, a)
-#define SYSDEBUG(a)     LWIP_DEBUGF(LWIP_DBG_LEVEL_WARNING, a)
-#define FSMDEBUG(a)     LWIP_DEBUGF(LWIP_DBG_LEVEL_WARNING, a)
-#define LCPDEBUG(a)     LWIP_DEBUGF(LWIP_DBG_LEVEL_WARNING, a)
-#define IPCPDEBUG(a)    LWIP_DEBUGF(LWIP_DBG_LEVEL_WARNING, a)
-#define IPV6CPDEBUG(a)  LWIP_DEBUGF(LWIP_DBG_LEVEL_WARNING, a)
-#define UPAPDEBUG(a)    LWIP_DEBUGF(LWIP_DBG_LEVEL_WARNING, a)
-#define CHAPDEBUG(a)    LWIP_DEBUGF(LWIP_DBG_LEVEL_WARNING, a)
-#define PPPDEBUG(a, b)  LWIP_DEBUGF(a, b)
-
-#else /* PPP_DEBUG */
-
-#define MAINDEBUG(a)
-#define SYSDEBUG(a)
-#define FSMDEBUG(a)
-#define LCPDEBUG(a)
-#define IPCPDEBUG(a)
-#define IPV6CPDEBUG(a)
-#define UPAPDEBUG(a)
-#define CHAPDEBUG(a)
-#define PPPDEBUG(a, b)
-
-#endif /* PPP_DEBUG */
-
-#endif /* PPPDEBUG_H */
-
-#endif /* PPP_SUPPORT */
diff --git a/sys/include/netif/ppp/pppoe.h b/sys/include/netif/ppp/pppoe.h
deleted file mode 100644
index 9f8f289..0000000
--- a/sys/include/netif/ppp/pppoe.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*****************************************************************************
-* pppoe.h - PPP Over Ethernet implementation for lwIP.
-*
-* Copyright (c) 2006 by Marc Boucher, Services Informatiques (MBSI) inc.
-*
-* The authors hereby grant permission to use, copy, modify, distribute,
-* and license this software and its documentation for any purpose, provided
-* that existing copyright notices are retained in all copies and that this
-* notice and the following disclaimer are included verbatim in any 
-* distributions. No written agreement, license, or royalty fee is required
-* for any of the authorized uses.
-*
-* THIS SOFTWARE IS PROVIDED BY THE 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 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.
-*
-******************************************************************************
-* REVISION HISTORY
-*
-* 06-01-01 Marc Boucher <marc@mbsi.ca>
-*   Ported to lwIP.
-*****************************************************************************/
-
-
-
-/* based on NetBSD: if_pppoe.c,v 1.64 2006/01/31 23:50:15 martin Exp */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <martin@NetBSD.org>.
- *
- * 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 NetBSD
- *        Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && PPPOE_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef PPP_OE_H
-#define PPP_OE_H
-
-#include "ppp.h"
-#include "lwip/etharp.h"
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct pppoehdr {
-  PACK_STRUCT_FLD_8(u8_t vertype);
-  PACK_STRUCT_FLD_8(u8_t code);
-  PACK_STRUCT_FIELD(u16_t session);
-  PACK_STRUCT_FIELD(u16_t plen);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct pppoetag {
-  PACK_STRUCT_FIELD(u16_t tag);
-  PACK_STRUCT_FIELD(u16_t len);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-
-#define PPPOE_STATE_INITIAL   0
-#define PPPOE_STATE_PADI_SENT 1
-#define PPPOE_STATE_PADR_SENT 2
-#define PPPOE_STATE_SESSION   3
-/* passive */
-#define PPPOE_STATE_PADO_SENT 1
-
-#define PPPOE_HEADERLEN       sizeof(struct pppoehdr)
-#define PPPOE_VERTYPE         0x11    /* VER=1, TYPE = 1 */
-
-#define PPPOE_TAG_EOL         0x0000  /* end of list */
-#define PPPOE_TAG_SNAME       0x0101  /* service name */
-#define PPPOE_TAG_ACNAME      0x0102  /* access concentrator name */
-#define PPPOE_TAG_HUNIQUE     0x0103  /* host unique */
-#define PPPOE_TAG_ACCOOKIE    0x0104  /* AC cookie */
-#define PPPOE_TAG_VENDOR      0x0105  /* vendor specific */
-#define PPPOE_TAG_RELAYSID    0x0110  /* relay session id */
-#define PPPOE_TAG_SNAME_ERR   0x0201  /* service name error */
-#define PPPOE_TAG_ACSYS_ERR   0x0202  /* AC system error */
-#define PPPOE_TAG_GENERIC_ERR 0x0203  /* gerneric error */
-
-#define PPPOE_CODE_PADI       0x09    /* Active Discovery Initiation */
-#define PPPOE_CODE_PADO       0x07    /* Active Discovery Offer */
-#define PPPOE_CODE_PADR       0x19    /* Active Discovery Request */
-#define PPPOE_CODE_PADS       0x65    /* Active Discovery Session confirmation */
-#define PPPOE_CODE_PADT       0xA7    /* Active Discovery Terminate */
-
-#ifndef PPPOE_MAX_AC_COOKIE_LEN
-#define PPPOE_MAX_AC_COOKIE_LEN   64
-#endif
-
-struct pppoe_softc {
-  struct pppoe_softc *next;
-  struct netif *sc_ethif;      /* ethernet interface we are using */
-  ppp_pcb *pcb;                /* PPP PCB */
-
-  struct eth_addr sc_dest;     /* hardware address of concentrator */
-  u16_t sc_session;            /* PPPoE session id */
-  u8_t sc_state;               /* discovery phase or session connected */
-
-#ifdef PPPOE_TODO
-  u8_t *sc_service_name;       /* if != NULL: requested name of service */
-  u8_t *sc_concentrator_name;  /* if != NULL: requested concentrator id */
-#endif /* PPPOE_TODO */
-  u8_t sc_ac_cookie[PPPOE_MAX_AC_COOKIE_LEN]; /* content of AC cookie we must echo back */
-  u8_t sc_ac_cookie_len;       /* length of cookie data */
-#ifdef PPPOE_SERVER
-  u8_t *sc_hunique;            /* content of host unique we must echo back */
-  u8_t sc_hunique_len;         /* length of host unique */
-#endif
-  u8_t sc_padi_retried;        /* number of PADI retries already done */
-  u8_t sc_padr_retried;        /* number of PADR retries already done */
-};
-
-
-#define pppoe_init() /* compatibility define, no initialization needed */
-
-ppp_pcb *pppoe_create(struct netif *pppif,
-       struct netif *ethif,
-       const char *service_name, const char *concentrator_name,
-       ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
-
-/*
- * Functions called from lwIP
- * DO NOT CALL FROM lwIP USER APPLICATION.
- */
-void pppoe_disc_input(struct netif *netif, struct pbuf *p);
-void pppoe_data_input(struct netif *netif, struct pbuf *p);
-
-#endif /* PPP_OE_H */
-
-#endif /* PPP_SUPPORT && PPPOE_SUPPORT */
diff --git a/sys/include/netif/ppp/pppol2tp.h b/sys/include/netif/ppp/pppol2tp.h
deleted file mode 100644
index f03950e..0000000
--- a/sys/include/netif/ppp/pppol2tp.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * @file
- * Network Point to Point Protocol over Layer 2 Tunneling Protocol header file.
- *
- */
-
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && PPPOL2TP_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef PPPOL2TP_H
-#define PPPOL2TP_H
-
-#include "ppp.h"
-
-/* Timeout */
-#define PPPOL2TP_CONTROL_TIMEOUT         (5*1000)  /* base for quick timeout calculation */
-#define PPPOL2TP_SLOW_RETRY              (60*1000) /* persistent retry interval */
-
-#define PPPOL2TP_MAXSCCRQ                4         /* retry SCCRQ four times (quickly) */
-#define PPPOL2TP_MAXICRQ                 4         /* retry IRCQ four times */
-#define PPPOL2TP_MAXICCN                 4         /* retry ICCN four times */
-
-/* L2TP header flags */
-#define PPPOL2TP_HEADERFLAG_CONTROL      0x8000
-#define PPPOL2TP_HEADERFLAG_LENGTH       0x4000
-#define PPPOL2TP_HEADERFLAG_SEQUENCE     0x0800
-#define PPPOL2TP_HEADERFLAG_OFFSET       0x0200
-#define PPPOL2TP_HEADERFLAG_PRIORITY     0x0100
-#define PPPOL2TP_HEADERFLAG_VERSION      0x0002
-
-/* Mandatory bits for control: Control, Length, Sequence, Version 2 */
-#define PPPOL2TP_HEADERFLAG_CONTROL_MANDATORY     (PPPOL2TP_HEADERFLAG_CONTROL|PPPOL2TP_HEADERFLAG_LENGTH|PPPOL2TP_HEADERFLAG_SEQUENCE|PPPOL2TP_HEADERFLAG_VERSION)
-/* Forbidden bits for control: Offset, Priority */
-#define PPPOL2TP_HEADERFLAG_CONTROL_FORBIDDEN     (PPPOL2TP_HEADERFLAG_OFFSET|PPPOL2TP_HEADERFLAG_PRIORITY)
-
-/* Mandatory bits for data: Version 2 */
-#define PPPOL2TP_HEADERFLAG_DATA_MANDATORY        (PPPOL2TP_HEADERFLAG_VERSION)
-
-/* AVP (Attribute Value Pair) header */
-#define PPPOL2TP_AVPHEADERFLAG_MANDATORY  0x8000
-#define PPPOL2TP_AVPHEADERFLAG_HIDDEN     0x4000
-#define PPPOL2TP_AVPHEADERFLAG_LENGTHMASK 0x03ff
-
-/* -- AVP - Message type */
-#define PPPOL2TP_AVPTYPE_MESSAGE      0 /* Message type */
-
-/* Control Connection Management */
-#define PPPOL2TP_MESSAGETYPE_SCCRQ    1 /* Start Control Connection Request */
-#define PPPOL2TP_MESSAGETYPE_SCCRP    2 /* Start Control Connection Reply */
-#define PPPOL2TP_MESSAGETYPE_SCCCN    3 /* Start Control Connection Connected */
-#define PPPOL2TP_MESSAGETYPE_STOPCCN  4 /* Stop Control Connection Notification */
-#define PPPOL2TP_MESSAGETYPE_HELLO    6 /* Hello */
-/* Call Management */
-#define PPPOL2TP_MESSAGETYPE_OCRQ     7 /* Outgoing Call Request */
-#define PPPOL2TP_MESSAGETYPE_OCRP     8 /* Outgoing Call Reply */
-#define PPPOL2TP_MESSAGETYPE_OCCN     9 /* Outgoing Call Connected */
-#define PPPOL2TP_MESSAGETYPE_ICRQ    10 /* Incoming Call Request */
-#define PPPOL2TP_MESSAGETYPE_ICRP    11 /* Incoming Call Reply */
-#define PPPOL2TP_MESSAGETYPE_ICCN    12 /* Incoming Call Connected */
-#define PPPOL2TP_MESSAGETYPE_CDN     14 /* Call Disconnect Notify */
-/* Error reporting */
-#define PPPOL2TP_MESSAGETYPE_WEN     15 /* WAN Error Notify */
-/* PPP Session Control */
-#define PPPOL2TP_MESSAGETYPE_SLI     16 /* Set Link Info */
-
-/* -- AVP - Result code */
-#define PPPOL2TP_AVPTYPE_RESULTCODE   1 /* Result code */
-#define PPPOL2TP_RESULTCODE           1 /* General request to clear control connection */
-
-/* -- AVP - Protocol version (!= L2TP Header version) */
-#define PPPOL2TP_AVPTYPE_VERSION      2
-#define PPPOL2TP_VERSION         0x0100 /* L2TP Protocol version 1, revision 0 */
-
-/* -- AVP - Framing capabilities */
-#define PPPOL2TP_AVPTYPE_FRAMINGCAPABILITIES           3 /* Bearer capabilities */
-#define PPPOL2TP_FRAMINGCAPABILITIES          0x00000003 /* Async + Sync framing */
-
-/* -- AVP - Bearer capabilities */
-#define PPPOL2TP_AVPTYPE_BEARERCAPABILITIES           4 /* Bearer capabilities */
-#define PPPOL2TP_BEARERCAPABILITIES          0x00000003 /* Analog + Digital Access */
-
-/* -- AVP - Tie breaker */
-#define PPPOL2TP_AVPTYPE_TIEBREAKER   5
-
-/* -- AVP - Host name */
-#define PPPOL2TP_AVPTYPE_HOSTNAME     7 /* Host name */
-#define PPPOL2TP_HOSTNAME        "lwIP" /* FIXME: make it configurable */
-
-/* -- AVP - Vendor name */
-#define PPPOL2TP_AVPTYPE_VENDORNAME   8 /* Vendor name */
-#define PPPOL2TP_VENDORNAME      "lwIP" /* FIXME: make it configurable */
-
-/* -- AVP - Assign tunnel ID */
-#define PPPOL2TP_AVPTYPE_TUNNELID     9 /* Assign Tunnel ID */
-
-/* -- AVP - Receive window size */
-#define PPPOL2TP_AVPTYPE_RECEIVEWINDOWSIZE  10 /* Receive window size */
-#define PPPOL2TP_RECEIVEWINDOWSIZE           8 /* FIXME: make it configurable */
-
-/* -- AVP - Challenge */
-#define PPPOL2TP_AVPTYPE_CHALLENGE   11 /* Challenge */
-
-/* -- AVP - Cause code */
-#define PPPOL2TP_AVPTYPE_CAUSECODE   12 /* Cause code*/
-
-/* -- AVP - Challenge response */
-#define PPPOL2TP_AVPTYPE_CHALLENGERESPONSE   13 /* Challenge response */
-#define PPPOL2TP_AVPTYPE_CHALLENGERESPONSE_SIZE  16
-
-/* -- AVP - Assign session ID */
-#define PPPOL2TP_AVPTYPE_SESSIONID   14 /* Assign Session ID */
-
-/* -- AVP - Call serial number */
-#define PPPOL2TP_AVPTYPE_CALLSERIALNUMBER   15 /* Call Serial Number */
-
-/* -- AVP - Framing type */
-#define PPPOL2TP_AVPTYPE_FRAMINGTYPE         19 /* Framing Type */
-#define PPPOL2TP_FRAMINGTYPE         0x00000001 /* Sync framing */
-
-/* -- AVP - TX Connect Speed */
-#define PPPOL2TP_AVPTYPE_TXCONNECTSPEED      24 /* TX Connect Speed */
-#define PPPOL2TP_TXCONNECTSPEED       100000000 /* Connect speed: 100 Mbits/s */
-
-/* L2TP Session state */
-#define PPPOL2TP_STATE_INITIAL     0
-#define PPPOL2TP_STATE_SCCRQ_SENT  1
-#define PPPOL2TP_STATE_ICRQ_SENT   2
-#define PPPOL2TP_STATE_ICCN_SENT   3
-#define PPPOL2TP_STATE_DATA        4
-
-#define PPPOL2TP_OUTPUT_DATA_HEADER_LEN   6 /* Our data header len */
-
-/*
- * PPPoL2TP interface control block.
- */
-typedef struct pppol2tp_pcb_s pppol2tp_pcb;
-struct pppol2tp_pcb_s {
-  ppp_pcb *ppp;                /* PPP PCB */
-  u8_t phase;                  /* L2TP phase */
-  struct udp_pcb *udp;         /* UDP L2TP Socket */
-  struct netif *netif;         /* Output interface, used as a default route */
-  ip_addr_t remote_ip;         /* LNS IP Address */
-  u16_t remote_port;           /* LNS port */
-#if PPPOL2TP_AUTH_SUPPORT
-  const u8_t *secret;          /* Secret string */
-  u8_t secret_len;             /* Secret string length */
-  u8_t secret_rv[16];          /* Random vector */
-  u8_t challenge_hash[16];     /* Challenge response */
-  u8_t send_challenge;         /* Boolean whether the next sent packet should contains a challenge response */
-#endif /* PPPOL2TP_AUTH_SUPPORT */
-
-  u16_t tunnel_port;           /* Tunnel port */
-  u16_t our_ns;                /* NS to peer */
-  u16_t peer_nr;               /* NR from peer */
-  u16_t peer_ns;               /* NS from peer */
-  u16_t source_tunnel_id;      /* Tunnel ID assigned by peer */
-  u16_t remote_tunnel_id;      /* Tunnel ID assigned to peer */
-  u16_t source_session_id;     /* Session ID assigned by peer */
-  u16_t remote_session_id;     /* Session ID assigned to peer */
-
-  u8_t sccrq_retried;          /* number of SCCRQ retries already done */
-  u8_t icrq_retried;           /* number of ICRQ retries already done */
-  u8_t iccn_retried;           /* number of ICCN retries already done */
-};
-
-
-/* Create a new L2TP session. */
-ppp_pcb *pppol2tp_create(struct netif *pppif,
-       struct netif *netif, const ip_addr_t *ipaddr, u16_t port,
-       const u8_t *secret, u8_t secret_len,
-       ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
-
-#endif /* PPPOL2TP_H */
-#endif /* PPP_SUPPORT && PPPOL2TP_SUPPORT */
diff --git a/sys/include/netif/ppp/pppos.h b/sys/include/netif/ppp/pppos.h
deleted file mode 100644
index 58adedb..0000000
--- a/sys/include/netif/ppp/pppos.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file
- * Network Point to Point Protocol over Serial header file.
- *
- */
-
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && PPPOS_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef PPPOS_H
-#define PPPOS_H
-
-#include "net/sys.h"
-
-#include "ppp.h"
-#include "vj.h"
-
-/* PPP packet parser states.  Current state indicates operation yet to be
- * completed. */
-enum {
-  PDIDLE = 0,  /* Idle state - waiting. */
-  PDSTART,     /* Process start flag. */
-  PDADDRESS,   /* Process address field. */
-  PDCONTROL,   /* Process control field. */
-  PDPROTOCOL1, /* Process protocol field 1. */
-  PDPROTOCOL2, /* Process protocol field 2. */
-  PDDATA       /* Process data byte. */
-};
-
-/* PPPoS serial output callback function prototype */
-typedef u32_t (*pppos_output_cb_fn)(ppp_pcb *pcb, u8_t *data, u32_t len, void *ctx);
-
-/*
- * Extended asyncmap - allows any character to be escaped.
- */
-typedef u8_t ext_accm[32];
-
-/*
- * PPPoS interface control block.
- */
-typedef struct pppos_pcb_s pppos_pcb;
-struct pppos_pcb_s {
-  /* -- below are data that will NOT be cleared between two sessions */
-  ppp_pcb *ppp;                    /* PPP PCB */
-  pppos_output_cb_fn output_cb;    /* PPP serial output callback */
-
-  /* -- below are data that will be cleared between two sessions
-   *
-   * last_xmit must be the first member of cleared members, because it is
-   * used to know which part must not be cleared.
-   */
-  u32_t last_xmit;                 /* Time of last transmission. */
-  ext_accm out_accm;               /* Async-Ctl-Char-Map for output. */
-
-  /* flags */
-  unsigned int open            :1; /* Set if PPPoS is open */
-  unsigned int pcomp           :1; /* Does peer accept protocol compression? */
-  unsigned int accomp          :1; /* Does peer accept addr/ctl compression? */
-
-  /* PPPoS rx */
-  ext_accm in_accm;                /* Async-Ctl-Char-Map for input. */
-  struct pbuf *in_head, *in_tail;  /* The input packet. */
-  u16_t in_protocol;               /* The input protocol code. */
-  u16_t in_fcs;                    /* Input Frame Check Sequence value. */
-  u8_t in_state;                   /* The input process state. */
-  u8_t in_escaped;                 /* Escape next character. */
-};
-
-/* Create a new PPPoS session. */
-ppp_pcb *pppos_create(struct netif *pppif, pppos_output_cb_fn output_cb,
-       ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
-
-#if !NO_SYS && !PPP_INPROC_IRQ_SAFE
-/* Pass received raw characters to PPPoS to be decoded through lwIP TCPIP thread. */
-err_t pppos_input_tcpip(ppp_pcb *ppp, u8_t *s, int l);
-#endif /* !NO_SYS && !PPP_INPROC_IRQ_SAFE */
-
-/* PPP over Serial: this is the input function to be called for received data. */
-void pppos_input(ppp_pcb *ppp, u8_t* data, int len);
-
-
-/*
- * Functions called from lwIP
- * DO NOT CALL FROM lwIP USER APPLICATION.
- */
-#if !NO_SYS && !PPP_INPROC_IRQ_SAFE
-err_t pppos_input_sys(struct pbuf *p, struct netif *inp);
-#endif /* !NO_SYS && !PPP_INPROC_IRQ_SAFE */
-
-#endif /* PPPOS_H */
-#endif /* PPP_SUPPORT && PPPOL2TP_SUPPORT */
diff --git a/sys/include/netif/ppp/upap.h b/sys/include/netif/ppp/upap.h
deleted file mode 100644
index 7da792e..0000000
--- a/sys/include/netif/ppp/upap.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * upap.h - User/Password Authentication Protocol definitions.
- *
- * Copyright (c) 1984-2000 Carnegie Mellon University. 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 "Carnegie Mellon University" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For permission or any legal
- *    details, please contact
- *      Office of Technology Transfer
- *      Carnegie Mellon University
- *      5000 Forbes Avenue
- *      Pittsburgh, PA  15213-3890
- *      (412) 268-4387, fax: (412) 268-7395
- *      tech-transfer@andrew.cmu.edu
- *
- * 4. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by Computing Services
- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- *
- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: upap.h,v 1.8 2002/12/04 23:03:33 paulus Exp $
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && PAP_SUPPORT  /* don't build if not configured for use in lwipopts.h */
-
-#ifndef UPAP_H
-#define UPAP_H
-
-#include "ppp.h"
-
-/*
- * Packet header = Code, id, length.
- */
-#define UPAP_HEADERLEN	4
-
-
-/*
- * UPAP codes.
- */
-#define UPAP_AUTHREQ	1	/* Authenticate-Request */
-#define UPAP_AUTHACK	2	/* Authenticate-Ack */
-#define UPAP_AUTHNAK	3	/* Authenticate-Nak */
-
-
-/*
- * Client states.
- */
-#define UPAPCS_INITIAL	0	/* Connection down */
-#define UPAPCS_CLOSED	1	/* Connection up, haven't requested auth */
-#define UPAPCS_PENDING	2	/* Connection down, have requested auth */
-#define UPAPCS_AUTHREQ	3	/* We've sent an Authenticate-Request */
-#define UPAPCS_OPEN	4	/* We've received an Ack */
-#define UPAPCS_BADAUTH	5	/* We've received a Nak */
-
-/*
- * Server states.
- */
-#define UPAPSS_INITIAL	0	/* Connection down */
-#define UPAPSS_CLOSED	1	/* Connection up, haven't requested auth */
-#define UPAPSS_PENDING	2	/* Connection down, have requested auth */
-#define UPAPSS_LISTEN	3	/* Listening for an Authenticate */
-#define UPAPSS_OPEN	4	/* We've sent an Ack */
-#define UPAPSS_BADAUTH	5	/* We've sent a Nak */
-
-
-/*
- * Timeouts.
- */
-#if 0 /* moved to ppp_opts.h */
-#define UPAP_DEFTIMEOUT	3	/* Timeout (seconds) for retransmitting req */
-#define UPAP_DEFREQTIME	30	/* Time to wait for auth-req from peer */
-#endif /* moved to ppp_opts.h */
-
-/*
- * Each interface is described by upap structure.
- */
-#if PAP_SUPPORT
-typedef struct upap_state {
-    const char *us_user;	/* User */
-    u8_t us_userlen;		/* User length */
-    const char *us_passwd;	/* Password */
-    u8_t us_passwdlen;		/* Password length */
-    u8_t us_clientstate;	/* Client state */
-#if PPP_SERVER
-    u8_t us_serverstate;	/* Server state */
-#endif /* PPP_SERVER */
-    u8_t us_id;		        /* Current id */
-    u8_t us_transmits;		/* Number of auth-reqs sent */
-} upap_state;
-#endif /* PAP_SUPPORT */
-
-
-void upap_authwithpeer(ppp_pcb *pcb, const char *user, const char *password);
-#if PPP_SERVER
-void upap_authpeer(ppp_pcb *pcb);
-#endif /* PPP_SERVER */
-
-extern const struct protent pap_protent;
-
-#endif /* UPAP_H */
-#endif /* PPP_SUPPORT && PAP_SUPPORT */
diff --git a/sys/include/netif/ppp/vj.h b/sys/include/netif/ppp/vj.h
deleted file mode 100644
index 43071ec..0000000
--- a/sys/include/netif/ppp/vj.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Definitions for tcp compression routines.
- *
- * $Id: vj.h,v 1.7 2010/02/22 17:52:09 goldsimon Exp $
- *
- * Copyright (c) 1989 Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Van Jacobson (van@helios.ee.lbl.gov), Dec 31, 1989:
- * - Initial distribution.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && VJ_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef VJ_H
-#define VJ_H
-
-#include "net/ip.h"
-#include "net/priv/tcp_priv.h"
-
-#define MAX_SLOTS 16 /* must be > 2 and < 256 */
-#define MAX_HDR   128
-
-/*
- * Compressed packet format:
- *
- * The first octet contains the packet type (top 3 bits), TCP
- * 'push' bit, and flags that indicate which of the 4 TCP sequence
- * numbers have changed (bottom 5 bits).  The next octet is a
- * conversation number that associates a saved IP/TCP header with
- * the compressed packet.  The next two octets are the TCP checksum
- * from the original datagram.  The next 0 to 15 octets are
- * sequence number changes, one change per bit set in the header
- * (there may be no changes and there are two special cases where
- * the receiver implicitly knows what changed -- see below).
- *
- * There are 5 numbers which can change (they are always inserted
- * in the following order): TCP urgent pointer, window,
- * acknowlegement, sequence number and IP ID.  (The urgent pointer
- * is different from the others in that its value is sent, not the
- * change in value.)  Since typical use of SLIP links is biased
- * toward small packets (see comments on MTU/MSS below), changes
- * use a variable length coding with one octet for numbers in the
- * range 1 - 255 and 3 octets (0, MSB, LSB) for numbers in the
- * range 256 - 65535 or 0.  (If the change in sequence number or
- * ack is more than 65535, an uncompressed packet is sent.)
- */
-
-/*
- * Packet types (must not conflict with IP protocol version)
- *
- * The top nibble of the first octet is the packet type.  There are
- * three possible types: IP (not proto TCP or tcp with one of the
- * control flags set); uncompressed TCP (a normal IP/TCP packet but
- * with the 8-bit protocol field replaced by an 8-bit connection id --
- * this type of packet syncs the sender & receiver); and compressed
- * TCP (described above).
- *
- * LSB of 4-bit field is TCP "PUSH" bit (a worthless anachronism) and
- * is logically part of the 4-bit "changes" field that follows.  Top
- * three bits are actual packet type.  For backward compatibility
- * and in the interest of conserving bits, numbers are chosen so the
- * IP protocol version number (4) which normally appears in this nibble
- * means "IP packet".
- */
-
-/* packet types */
-#define TYPE_IP               0x40
-#define TYPE_UNCOMPRESSED_TCP 0x70
-#define TYPE_COMPRESSED_TCP   0x80
-#define TYPE_ERROR            0x00
-
-/* Bits in first octet of compressed packet */
-#define NEW_C 0x40 /* flag bits for what changed in a packet */
-#define NEW_I 0x20
-#define NEW_S 0x08
-#define NEW_A 0x04
-#define NEW_W 0x02
-#define NEW_U 0x01
-
-/* reserved, special-case values of above */
-#define SPECIAL_I (NEW_S|NEW_W|NEW_U) /* echoed interactive traffic */
-#define SPECIAL_D (NEW_S|NEW_A|NEW_W|NEW_U) /* unidirectional data */
-#define SPECIALS_MASK (NEW_S|NEW_A|NEW_W|NEW_U)
-
-#define TCP_PUSH_BIT 0x10
-
-
-/*
- * "state" data for each active tcp conversation on the wire.  This is
- * basically a copy of the entire IP/TCP header from the last packet
- * we saw from the conversation together with a small identifier
- * the transmit & receive ends of the line use to locate saved header.
- */
-struct cstate {
-  struct cstate *cs_next; /* next most recently used state (xmit only) */
-  u16_t cs_hlen;        /* size of hdr (receive only) */
-  u8_t cs_id;           /* connection # associated with this state */
-  u8_t cs_filler;
-  union {
-    char csu_hdr[MAX_HDR];
-    struct ip_hdr csu_ip;     /* ip/tcp hdr from most recent packet */
-  } vjcs_u;
-};
-#define cs_ip vjcs_u.csu_ip
-#define cs_hdr vjcs_u.csu_hdr
-
-
-struct vjstat {
-  u32_t vjs_packets;        /* outbound packets */
-  u32_t vjs_compressed;     /* outbound compressed packets */
-  u32_t vjs_searches;       /* searches for connection state */
-  u32_t vjs_misses;         /* times couldn't find conn. state */
-  u32_t vjs_uncompressedin; /* inbound uncompressed packets */
-  u32_t vjs_compressedin;   /* inbound compressed packets */
-  u32_t vjs_errorin;        /* inbound unknown type packets */
-  u32_t vjs_tossed;         /* inbound packets tossed because of error */
-};
-
-/*
- * all the state data for one serial line (we need one of these per line).
- */
-struct vjcompress {
-  struct cstate *last_cs;          /* most recently used tstate */
-  u8_t last_recv;                /* last rcvd conn. id */
-  u8_t last_xmit;                /* last sent conn. id */
-  u16_t flags;
-  u8_t maxSlotIndex;
-  u8_t compressSlot;             /* Flag indicating OK to compress slot ID. */
-#if LINK_STATS
-  struct vjstat stats;
-#endif
-  struct cstate tstate[MAX_SLOTS]; /* xmit connection states */
-  struct cstate rstate[MAX_SLOTS]; /* receive connection states */
-};
-
-/* flag values */
-#define VJF_TOSS 1U /* tossing rcvd frames because of input err */
-
-extern void  vj_compress_init    (struct vjcompress *comp);
-extern u8_t  vj_compress_tcp     (struct vjcompress *comp, struct pbuf **pb);
-extern void  vj_uncompress_err   (struct vjcompress *comp);
-extern int   vj_uncompress_uncomp(struct pbuf *nb, struct vjcompress *comp);
-extern int   vj_uncompress_tcp   (struct pbuf **nb, struct vjcompress *comp);
-
-#endif /* VJ_H */
-
-#endif /* PPP_SUPPORT && VJ_SUPPORT */
diff --git a/sys/include/netif/slipif.h b/sys/include/netif/slipif.h
deleted file mode 100644
index 4f15303..0000000
--- a/sys/include/netif/slipif.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * @file
- *
- * SLIP netif API
- */
-
-/*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-#ifndef LWIP_HDR_NETIF_SLIPIF_H
-#define LWIP_HDR_NETIF_SLIPIF_H
-
-#include "net/opt.h"
-#include "net/netif.h"
-
-/** Set this to 1 to start a thread that blocks reading on the serial line
- * (using sio_read()).
- */
-#ifndef SLIP_USE_RX_THREAD
-#define SLIP_USE_RX_THREAD !NO_SYS
-#endif
-
-/** Set this to 1 to enable functions to pass in RX bytes from ISR context.
- * If enabled, slipif_received_byte[s]() process incoming bytes and put assembled
- * packets on a queue, which is fed into lwIP from slipif_poll().
- * If disabled, slipif_poll() polls the serial line (using sio_tryread()).
- */
-#ifndef SLIP_RX_FROM_ISR
-#define SLIP_RX_FROM_ISR 0
-#endif
-
-/** Set this to 1 (default for SLIP_RX_FROM_ISR) to queue incoming packets
- * received by slipif_received_byte[s]() as long as PBUF_POOL pbufs are available.
- * If disabled, packets will be dropped if more than one packet is received.
- */
-#ifndef SLIP_RX_QUEUE
-#define SLIP_RX_QUEUE SLIP_RX_FROM_ISR
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-err_t slipif_init(struct netif * netif);
-void slipif_poll(struct netif *netif);
-#if SLIP_RX_FROM_ISR
-void slipif_process_rxqueue(struct netif *netif);
-void slipif_received_byte(struct netif *netif, u8_t data);
-void slipif_received_bytes(struct netif *netif, u8_t *data, u8_t len);
-#endif /* SLIP_RX_FROM_ISR */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* LWIP_HDR_NETIF_SLIPIF_H */
-
diff --git a/sys/include/objgfx/ogDisplay_VESA.h b/sys/include/objgfx/ogDisplay_VESA.h
deleted file mode 100755
index 8c05fc1..0000000
--- a/sys/include/objgfx/ogDisplay_VESA.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef OGDISPLAY_VESA_H
-#define OGDISPLAY_VESA_H
-
-#include "objgfx30.h"
-
-struct TMode_Rec {
-    uInt16 ModeAttributes     __attribute__((packed));
-    uInt8  WindowAFlags       __attribute__((packed));
-    uInt8  WindowBFlags       __attribute__((packed));
-    uInt16 Granularity        __attribute__((packed));
-    uInt16 WindowSize         __attribute__((packed));
-    uInt16 WindowASeg         __attribute__((packed));
-    uInt16 WindowBSeg         __attribute__((packed));
-    void*  BankSwitch         __attribute__((packed));
-    uInt16 BytesPerLine       __attribute__((packed));
-    uInt16 xRes               __attribute__((packed));
-    uInt16 yRes               __attribute__((packed));
-    uInt8  CharWidth          __attribute__((packed));
-    uInt8  CharHeight         __attribute__((packed));
-    uInt8  NumBitPlanes       __attribute__((packed));
-    uInt8  BitsPerPixel       __attribute__((packed));
-    uInt8  NumberOfBanks      __attribute__((packed));
-    uInt8  MemoryModel        __attribute__((packed));
-    uInt8  BankSize           __attribute__((packed));
-    uInt8  NumOfImagePages    __attribute__((packed));
-    uInt8  Reserved           __attribute__((packed));
-    // Direct colour fields (required for Direct/6 and YUV/7 memory models
-    uInt8  RedMaskSize        __attribute__((packed));
-    uInt8  RedFieldPosition   __attribute__((packed));
-    uInt8  GreenMaskSize      __attribute__((packed));
-    uInt8  GreenFieldPosition __attribute__((packed));
-    uInt8  BlueMaskSize       __attribute__((packed));
-    uInt8  BlueFieldPosition  __attribute__((packed));
-    uInt8  AlphaMaskSize      __attribute__((packed));
-    uInt8  AlphaFieldPosition __attribute__((packed));
-    uInt8  DirectColourMode   __attribute__((packed));
-    // VESA 2.0 specific fields
-    uInt32 physBasePtr        __attribute__((packed));
-    void*  OffScreenMemOffset __attribute__((packed));
-    uInt16 OffScreenMemSize   __attribute__((packed));
-    uInt8  paddington[461]    __attribute__((packed));
-};
-
-struct TVESA_Rec {
-    char    VBESignature[4]   __attribute__((packed));
-    uInt8   minVersion        __attribute__((packed));
-    uInt8   majVersion        __attribute__((packed));
-    uInt32  OEMStringPtr      __attribute__((packed));
-    uInt32  Capabilities      __attribute__((packed));
-    uInt32  VideoModePtr      __attribute__((packed));
-    uInt16  TotalMemory       __attribute__((packed));
-    // VESA 2.0 specific fields
-    uInt16  OEMSoftwareRev    __attribute__((packed));
-    uInt32  OEMVendorNamePtr  __attribute__((packed));
-    uInt32  OEMProductNamePtr __attribute__((packed));
-    uInt32  OEMProductRevPtr  __attribute__((packed));
-    uInt8   paddington[474]   __attribute__((packed));
-};
-
-class ogDisplay_VESA : public ogSurface {
- protected:
-  uInt16       ScreenSelector;
-  TVESA_Rec*   VESARec;
-  TMode_Rec*   ModeRec;
-  bool         InGraphics;
-  uInt16       findMode(uInt32, uInt32, uInt32);
-  void         getModeInfo(uInt16);
-  void         getVESAInfo(void);
-  void         setMode(uInt16);
-  virtual uInt32 rawGetPixel(uInt32, uInt32);  
-  virtual void rawSetPixel(uInt32, uInt32, uInt32);
-  virtual void rawLine(uInt32, uInt32, uInt32, uInt32, uInt32);
-  void         setPal(void);
- public:
-               ogDisplay_VESA(void);
-  virtual bool ogAvail(void);
-  virtual bool ogAlias(ogSurface&, uInt32, uInt32, uInt32, uInt32);
-  virtual void ogClear(uInt32);
-  virtual bool ogClone(ogSurface&);
-  virtual void ogCopyLineTo(uInt32, uInt32, const void *, uInt32);
-  virtual void ogCopyLineFrom(uInt32, uInt32, void *, uInt32);
-  virtual void ogCopyPal(ogSurface&);
-  virtual bool ogCreate(uInt32, uInt32, ogPixelFmt);
-  virtual uInt32 ogGetPixel(int32, int32);
-  virtual void * ogGetPtr(uInt32, uInt32);
-  virtual void ogHLine(int32, int32, int32, uInt32);
-  virtual bool ogLoadPal(const char *);  
-  virtual void ogSetPixel(int32, int32, uInt32);
-  virtual void ogSetRGBPalette(uInt8, uInt8, uInt8, uInt8);  
-  virtual void ogVFlip(void);
-  virtual void ogVLine(int32, int32, int32, uInt32);
-  virtual      ~ogDisplay_VESA(void);
-}; // ogDisplay_VESA
-
-#endif
diff --git a/sys/include/pci/hd.h b/sys/include/pci/hd.h
deleted file mode 100644
index 6f6029d..0000000
--- a/sys/include/pci/hd.h
+++ /dev/null
@@ -1,524 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: hd.h 102 2016-01-12 03:59:34Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _HD_H_
-#define _HD_H_
-
-#include <sys/types.h>
-#include <ubixfs/ubixfs.h>
-
-#define hdData     0x0
-#define hdError    0x1
-#define hdSecCount 0x2
-#define hdSecNum   0x3
-#define hdCylLow   0x4
-#define hdCylHi    0x5
-#define hdHead     0x6
-#define hdStat     0x7
-#define hdCmd      0x7
-
-/* ATA Uhm? */
-#define ATA_IDENTIFY_COMMAND_SET_SUPPORTED1_48BIT_ENABLE 0x0400
-#define ATA_IDENTIFY_SECTOR_LARGER_THEN_512_ENABLE       0x0100
-
-/* ATA register defines */
-#define ATA_DATA                        0       /* (RW) data */
-
-#define ATA_FEATURE                     1       /* (W) feature */
-#define         ATA_F_DMA               0x01    /* enable DMA */
-#define         ATA_F_OVL               0x02    /* enable overlap */
-
-#define ATA_COUNT                       2       /* (W) sector count */
-
-#define ATA_SECTOR                      3       /* (RW) sector # */
-#define ATA_CYL_LSB                     4       /* (RW) cylinder# LSB */
-#define ATA_CYL_MSB                     5       /* (RW) cylinder# MSB */
-#define ATA_DRIVE                       6       /* (W) Sector/Drive/Head */
-#define         ATA_D_LBA               0x40    /* use LBA addressing */
-#define         ATA_D_IBM               0xa0    /* 512 byte sectors, ECC */
-
-#define ATA_COMMAND                     7       /* (W) command */
-
-#define ATA_ERROR                       8       /* (R) error */
-#define         ATA_E_ILI               0x01    /* illegal length */
-#define         ATA_E_NM                0x02    /* no media */
-#define         ATA_E_ABORT             0x04    /* command aborted */
-#define         ATA_E_MCR               0x08    /* media change request */
-#define         ATA_E_IDNF              0x10    /* ID not found */
-#define         ATA_E_MC                0x20    /* media changed */
-#define         ATA_E_UNC               0x40    /* uncorrectable data */
-#define         ATA_E_ICRC              0x80    /* UDMA crc error */
-#define         ATA_E_ATAPI_SENSE_MASK  0xf0    /* ATAPI sense key mask */
-
-#define ATA_IREASON                     9       /* (R) interrupt reason */
-#define         ATA_I_CMD               0x01    /* cmd (1) | data (0) */
-#define         ATA_I_IN                0x02    /* read (1) | write (0) */
-#define         ATA_I_RELEASE           0x04    /* released bus (1) */
-#define         ATA_I_TAGMASK           0xf8    /* tag mask */
-
-#define ATA_STATUS                      10      /* (R) status */
-#define ATA_ALTSTAT                     11      /* (R) alternate status */
-#define         ATA_S_ERROR             0x01    /* error */
-#define         ATA_S_INDEX             0x02    /* index */
-#define         ATA_S_CORR              0x04    /* data corrected */
-#define         ATA_S_DRQ               0x08    /* data request */
-#define         ATA_S_DSC               0x10    /* drive seek completed */
-#define         ATA_S_SERVICE           0x10    /* drive needs service */
-#define         ATA_S_DWF               0x20    /* drive write fault */
-#define         ATA_S_DMA               0x20    /* DMA ready */
-#define         ATA_S_READY             0x40    /* drive ready */
-#define         ATA_S_BUSY              0x80    /* busy */
-
-#define ATA_CONTROL                     12      /* (W) control */
-
-#define ATA_CTLOFFSET                   0x206   /* control register offset */
-#define ATA_PCCARD_CTLOFFSET            0x0e    /* do for PCCARD devices */
-#define ATA_PC98_CTLOFFSET              0x10c   /* do for PC98 devices */
-#define         ATA_A_IDS               0x02    /* disable interrupts */
-#define         ATA_A_RESET             0x04    /* RESET controller */
-#ifdef  ATA_LEGACY_SUPPORT
-#define         ATA_A_4BIT              0x08    /* 4 head bits: obsolete 1996 */
-#else
-#define         ATA_A_4BIT              0x00
-#endif
-#define         ATA_A_HOB               0x80    /* High Order Byte enable */
-
-/* ATA Commands */
-#define ATA_IDENTIFY                   0xEC
-#define ATA_CHECK_POWER_MODE           0xE5
-#define ATA_STANDBY                    0xE2
-#define ATA_STANDBY_IMMED              0xE0
-#define ATA_IDLE_IMMED                 0xE1
-#define ATA_IDLE                       0xE3
-#define ATA_FLUSH_CACHE                0xE7
-#define ATA_FLUSH_CACHE_EXT            0xEA
-#define ATA_READ_DMA_EXT               0x25
-#define ATA_READ_DMA                   0xC8
-#define ATA_READ_SECTORS_EXT           0x24
-#define ATA_READ_SECTORS               0x20
-#define ATA_WRITE_DMA_EXT              0x35
-#define ATA_WRITE_DMA                  0xCA
-#define ATA_WRITE_SECTORS_EXT          0x34
-#define ATA_WRITE_SECTORS              0x30
-#define ATA_WRITE_UNCORRECTABLE        0x45
-#define ATA_READ_VERIFY_SECTORS        0x40
-#define ATA_READ_VERIFY_SECTORS_EXT    0x42
-#define ATA_READ_BUFFER                0xE4
-#define ATA_WRITE_BUFFER               0xE8
-#define ATA_EXECUTE_DEVICE_DIAG        0x90
-#define ATA_SET_FEATURES               0xEF
-#define ATA_SMART                      0xB0
-#define ATA_PACKET_IDENTIFY            0xA1
-#define ATA_PACKET                     0xA0
-#define ATA_READ_FPDMA                 0x60
-#define ATA_WRITE_FPDMA                0x61
-#define ATA_READ_LOG_EXT               0x2F
-#define ATA_NOP                        0x00
-#define ATA_DEVICE_RESET               0x08
-#define ATA_MEDIA_EJECT                0xED
-#define ATA_SECURITY_UNLOCK            0xF2
-#define ATA_SECURITY_FREEZE_LOCK       0xF5
-#define ATA_DATA_SET_MANAGEMENT        0x06
-#define ATA_DOWNLOAD_MICROCODE         0x92
-#define ATA_WRITE_STREAM_DMA_EXT       0x3A
-#define ATA_READ_LOG_DMA_EXT           0x47
-#define ATA_READ_STREAM_DMA_EXT        0x2A
-#define ATA_WRITE_DMA_FUA              0x3D
-#define ATA_WRITE_LOG_DMA_EXT          0x57
-#define ATA_READ_DMA_QUEUED            0xC7
-#define ATA_READ_DMA_QUEUED_EXT        0x26
-#define ATA_WRITE_DMA_QUEUED           0xCC
-#define ATA_WRITE_DMA_QUEUED_EXT       0x36
-#define ATA_WRITE_DMA_QUEUED_FUA_EXT   0x3E
-#define ATA_READ_MULTIPLE              0xC4
-#define ATA_READ_MULTIPLE_EXT          0x29
-#define ATA_WRITE_MULTIPLE             0xC5
-#define ATA_WRITE_MULTIPLE_EXT         0x39
-#define ATA_WRITE_MULTIPLE_FUA_EXT     0xCE
-
-struct driveInfo {
-  struct driveDiskLabel *diskLabel;
-  struct ata_identify_data *ata_identify;
-  uint32_t lba_high;
-  uint32_t lba_low;
-  uint32_t sector_size;
-  char hdEnable;
-  char hdDev;
-  char hdFlags;
-  char hdShift;
-  long hdMask;
-  uint32_t hdMulti;
-  long hdPort;
-  long hdSize;
-  long hdCalc;
-  long parOffset;
-  int  part;
-  long lba_start;
-  long lba_end;
-};
-
-int initHardDisk();
-int hdWrite( struct driveInfo *hdd, void *, uInt32, uInt32 );
-int hdRead( struct driveInfo *hdd, void *, uInt32, uInt32 );
-int hdReset();
-int hdIoctl();
-int hdStart();
-int hdStop();
-int hdStandby();
-int hdInit( struct device_node *dev );
-
-struct dos_partition {
-  unsigned char dp_flag; /* bootstrap flags */
-  unsigned char dp_shd; /* starting head */
-  unsigned char dp_ssect; /* starting sector */
-  unsigned char dp_scyl; /* starting cylinder */
-  unsigned char dp_type; /* partition type */
-  unsigned char dp_ehd; /* end head */
-  unsigned char dp_esect; /* end sector */
-  unsigned char dp_ecyl; /* end cylinder */
-  uInt32 dp_start; /* absolute starting sector number */
-  uInt32 dp_size; /* partition size in sectors */
-};
-
-#define MAXPARTITIONS   8
-
-struct bsd_disklabel {
-  uint32_t d_magic; /* the magic number */
-  u_int16_t d_type; /* drive type */
-  u_int16_t d_subtype; /* controller/d_type specific */
-  char d_typename[16]; /* type name, e.g. "eagle" */
-
-  char d_packname[16]; /* pack identifier */
-
-  /* disk geometry: */
-  uint32_t d_secsize; /* # of bytes per sector */
-  uint32_t d_nsectors; /* # of data sectors per track */
-  uint32_t d_ntracks; /* # of tracks per cylinder */
-  uint32_t d_ncylinders; /* # of data cylinders per unit */
-  uint32_t d_secpercyl; /* # of data sectors per cylinder */
-  uint32_t d_secperunit; /* # of data sectors per unit */
-
-  /*
-   * Spares (bad sector replacements) below are not counted in
-   * d_nsectors or d_secpercyl.  Spare sectors are assumed to
-   * be physical sectors which occupy space at the end of each
-   * track and/or cylinder.
-   */
-  u_int16_t d_sparespertrack; /* # of spare sectors per track */
-  u_int16_t d_sparespercyl; /* # of spare sectors per cylinder */
-  /*
-   * Alternate cylinders include maintenance, replacement, configuration
-   * description areas, etc.
-   */
-  uint32_t d_acylinders; /* # of alt. cylinders per unit */
-
-  /* hardware characteristics: */
-  /*
-   * d_interleave, d_trackskew and d_cylskew describe perturbations
-   * in the media format used to compensate for a slow controller.
-   * Interleave is physical sector interleave, set up by the
-   * formatter or controller when formatting.  When interleaving is
-   * in use, logically adjacent sectors are not physically
-   * contiguous, but instead are separated by some number of
-   * sectors.  It is specified as the ratio of physical sectors
-   * traversed per logical sector.  Thus an interleave of 1:1
-   * implies contiguous layout, while 2:1 implies that logical
-   * sector 0 is separated by one sector from logical sector 1.
-   * d_trackskew is the offset of sector 0 on track N relative to
-   * sector 0 on track N-1 on the same cylinder.  Finally, d_cylskew
-   * is the offset of sector 0 on cylinder N relative to sector 0
-   * on cylinder N-1.
-   */
-  u_int16_t d_rpm; /* rotational speed */
-  u_int16_t d_interleave; /* hardware sector interleave */
-  u_int16_t d_trackskew; /* sector 0 skew, per track */
-  u_int16_t d_cylskew; /* sector 0 skew, per cylinder */
-  uint32_t d_headswitch; /* head switch time, usec */
-  uint32_t d_trkseek; /* track-to-track seek, usec */
-  uint32_t d_flags; /* generic flags */
-#define NDDATA 5
-  uint32_t d_drivedata[NDDATA]; /* drive-type specific information */
-#define NSPARE 5
-  uint32_t d_spare[NSPARE]; /* reserved for future use */
-  uint32_t d_magic2; /* the magic number (again) */
-  u_int16_t d_checksum; /* xor of data incl. partitions */
-
-  /* filesystem and partition information: */
-  u_int16_t d_npartitions; /* number of partitions in following */
-  uint32_t d_bbsize; /* size of boot area at sn0, bytes */
-  uint32_t d_sbsize; /* max size of fs superblock, bytes */
-  struct partition { /* the partition table */
-    uint32_t p_size; /* number of sectors in partition */
-    uint32_t p_offset; /* starting sector */
-    uint32_t p_fsize; /* filesystem basic fragment size */
-    u_int8_t p_fstype; /* filesystem type, see below */
-    u_int8_t p_frag; /* filesystem fragments per block */
-    u_int16_t p_cpg; /* filesystem cylinders per group */
-  } d_partitions[MAXPARTITIONS]; /* actually may be more */
-};
-
-static const char *fstypenames[] = { "unused", "swap", "Version 6", "Version 7", "System V", "4.1BSD", "Eighth Edition", "4.2BSD", "MSDOS", "4.4LFS", "unknown", "HPFS", "ISO9660", "boot", "vinum", "raid", "?", "?", "?", "?", "jfs", NULL };
-
-/**
- * @name ATA_IDENTIFY_DEVICE_FIELD_LENGTHS
- *
- * The following constants define the number of bytes contained in various
- * fields found in the IDENTIFY DEVICE data structure.
- */
-#define ATA_IDENTIFY_SERIAL_NUMBER_LEN        20
-#define ATA_IDENTIFY_MODEL_NUMBER_LEN         40
-#define ATA_IDENTIFY_FW_REVISION_LEN          8
-#define ATA_IDENTIFY_48_LBA_LEN               8
-#define ATA_IDENTIFY_MEDIA_SERIAL_NUMBER_LEN  30
-#define ATA_IDENTIFY_WWN_LEN                  8
-
-struct ata_identify_data {
-  u_int16_t general_config_bits;                             // word  00
-  u_int16_t obsolete0;                                       // word  01 (num cylinders)
-  u_int16_t vendor_specific_config_bits;                     // word  02
-  u_int16_t obsolete1;                                       // word  03 (num heads)
-  u_int16_t retired1[2];                                     // words 04-05
-  u_int16_t obsolete2;                                       // word  06 (sectors / track)
-  u_int16_t reserved_for_compact_flash1[2];                  // words 07-08
-  u_int16_t retired0;                                        // word  09
-  u_int8_t serial_number[ATA_IDENTIFY_SERIAL_NUMBER_LEN];   // word 10-19
-  u_int16_t retired2[2];                                     // words 20-21
-  u_int16_t obsolete4;                                       // word  22
-  u_int8_t firmware_revision[ATA_IDENTIFY_FW_REVISION_LEN]; // words 23-26
-  u_int8_t model_number[ATA_IDENTIFY_MODEL_NUMBER_LEN];     // words 27-46
-  u_int16_t max_sectors_per_multiple;                        // word  47
-  u_int16_t reserved0;                                       // word  48
-  u_int16_t capabilities1;                                   // word  49
-  u_int16_t capabilities2;                                   // word  50
-  u_int16_t obsolete5[2];                                    // words 51-52
-  u_int16_t validity_bits;                                   // word  53
-  u_int16_t obsolete6[5];                                    // words 54-58 Used to be:
-  // current cylinders,
-  // current heads,
-  // current sectors/Track,
-  // current capacity
-  u_int16_t current_max_sectors_per_multiple;                // word  59
-  u_int8_t total_num_sectors[4];                            // words 60-61
-  u_int16_t obsolete7;                                       // word  62
-  u_int16_t multi_word_dma_mode;                             // word  63
-  u_int16_t pio_modes_supported;                             // word  64
-  u_int16_t min_multiword_dma_transfer_cycle;                // word  65
-  u_int16_t rec_min_multiword_dma_transfer_cycle;            // word  66
-  u_int16_t min_pio_transfer_no_flow_ctrl;                   // word  67
-  u_int16_t min_pio_transfer_with_flow_ctrl;                 // word  68
-  u_int16_t additional_supported;                            // word  69
-  u_int16_t reserved1;                                       // word  70
-  u_int16_t reserved2[4];                                    // words 71-74
-  u_int16_t queue_depth;                                     // word  75
-  u_int16_t serial_ata_capabilities;                         // word  76
-  u_int16_t serial_ata_reserved;                             // word  77
-  u_int16_t serial_ata_features_supported;                   // word  78
-  u_int16_t serial_ata_features_enabled;                     // word  79
-  u_int16_t major_version_number;                            // word  80
-  u_int16_t minor_version_number;                            // word  81
-  u_int16_t command_set_supported0;                          // word  82
-  u_int16_t command_set_supported1;                          // word  83
-  u_int16_t command_set_supported_extention;                 // word  84
-  u_int16_t command_set_enabled0;                            // word  85
-  u_int16_t command_set_enabled1;                            // word  86
-  u_int16_t command_set_default;                             // word  87
-  u_int16_t ultra_dma_mode;                                  // word  88
-  u_int16_t security_erase_completion_time;                  // word  89
-  u_int16_t enhanced_security_erase_time;                    // word  90
-  u_int16_t current_power_mgmt_value;                        // word  91
-  u_int16_t master_password_revision;                        // word  92
-  u_int16_t hardware_reset_result;                           // word  93
-  u_int16_t current_acoustic_management_value;               // word  94
-  u_int16_t stream_min_request_size;                         // word  95
-  u_int16_t stream_transfer_time;                            // word  96
-  u_int16_t stream_access_latency;                           // word  97
-  u_int16_t stream_performance_granularity[2];               // words 98-99
-  u_int8_t max_48bit_lba[ATA_IDENTIFY_48_LBA_LEN];          // words 100-103
-  u_int16_t streaming_transfer_time;                         // word  104
-  u_int16_t max_lba_range_entry_blocks;                      // word  105
-  u_int16_t physical_logical_sector_info;                    // word  106
-  u_int16_t acoustic_test_interseek_delay;                   // word  107
-  u_int8_t world_wide_name[ATA_IDENTIFY_WWN_LEN];           // words 108-111
-  u_int8_t reserved_for_wwn_extention[ATA_IDENTIFY_WWN_LEN];           // words 112-115
-  u_int16_t reserved4;                                       // word  116
-  u_int8_t words_per_logical_sector[4];                     // words 117-118
-  u_int16_t command_set_supported2;                          // word  119
-  u_int16_t reserved5[7];                                    // words 120-126
-  u_int16_t removable_media_status;                          // word  127
-  u_int16_t security_status;                                 // word  128
-  u_int16_t vendor_specific1[31];                            // words 129-159
-  u_int16_t cfa_power_mode1;                                 // word  160
-  u_int16_t reserved_for_compact_flash2[7];                  // words 161-167
-  u_int16_t device_nominal_form_factor;                      // word  168
-  u_int16_t data_set_management;                             // word  169
-  u_int16_t reserved_for_compact_flash3[6];                  // words 170-175
-  u_int16_t current_media_serial_number[ATA_IDENTIFY_MEDIA_SERIAL_NUMBER_LEN];                  //words 176-205
-  u_int16_t reserved6[3];                                    // words 206-208
-  u_int16_t logical_sector_alignment;                        // words 209
-  u_int16_t reserved7[7];                                    // words 210-216
-  u_int16_t nominal_media_rotation_rate;                     // word  217
-  u_int16_t reserved8[16];                                   // words 218-233
-  u_int16_t min_num_blocks_per_microcode;                    // word  234
-  u_int16_t max_num_blocks_per_microcode;                    // word  235
-  u_int16_t reserved9[19];                                   // words 236-254
-  u_int16_t integrity_word;                                  // word  255
-};
-
-/*
- * A list of partition types, probably outdated.
- */
-static const char *const part_types[256] = {
-  [0x00] = "unused",
-  [0x01] = "Primary DOS with 12 bit FAT",
-  [0x02] = "XENIX / file system",
-  [0x03] = "XENIX /usr file system",
-  [0x04] = "Primary DOS with 16 bit FAT (< 32MB)",
-  [0x05] = "Extended DOS",
-  [0x06] = "Primary DOS, 16 bit FAT (>= 32MB)",
-  [0x07] = "NTFS, OS/2 HPFS, QNX-2 (16 bit) or Advanced UNIX",
-  [0x08] = "AIX file system or SplitDrive",
-  [0x09] = "AIX boot partition or Coherent",
-  [0x0A] = "OS/2 Boot Manager, OPUS or Coherent swap",
-  [0x0B] = "DOS or Windows 95 with 32 bit FAT",
-  [0x0C] = "DOS or Windows 95 with 32 bit FAT (LBA)",
-  [0x0E] = "Primary 'big' DOS (>= 32MB, LBA)",
-  [0x0F] = "Extended DOS (LBA)",
-  [0x10] = "OPUS",
-  [0x11] = "OS/2 BM: hidden DOS with 12-bit FAT",
-  [0x12] = "Compaq diagnostics",
-  [0x14] = "OS/2 BM: hidden DOS with 16-bit FAT (< 32MB)",
-  [0x16] = "OS/2 BM: hidden DOS with 16-bit FAT (>= 32MB)",
-  [0x17] = "OS/2 BM: hidden IFS (e.g. HPFS)",
-  [0x18] = "AST Windows swapfile",
-  [0x1b] = "ASUS Recovery partition (NTFS)",
-  [0x24] = "NEC DOS",
-  [0x3C] = "PartitionMagic recovery",
-  [0x39] = "plan9",
-  [0x40] = "VENIX 286",
-  [0x41] = "Linux/MINIX (sharing disk with DRDOS)",
-  [0x42] = "SFS or Linux swap (sharing disk with DRDOS)",
-  [0x43] = "Linux native (sharing disk with DRDOS)",
-  [0x4D] = "QNX 4.2 Primary",
-  [0x4E] = "QNX 4.2 Secondary",
-  [0x4F] = "QNX 4.2 Tertiary",
-  [0x50] = "DM (disk manager)",
-  [0x51] = "DM6 Aux1 (or Novell)",
-  [0x52] = "CP/M or Microport SysV/AT",
-  [0x53] = "DM6 Aux3",
-  [0x54] = "DM6",
-  [0x55] = "EZ-Drive (disk manager)",
-  [0x56] = "Golden Bow (disk manager)",
-  [0x5c] = "Priam Edisk (disk manager)", /* according to S. Widlake */
-  [0x61] = "SpeedStor",
-  [0x63] = "System V/386 (such as ISC UNIX), GNU HURD or Mach",
-  [0x64] = "Novell Netware/286 2.xx",
-  [0x65] = "Novell Netware/386 3.xx",
-  [0x70] = "DiskSecure Multi-Boot",
-  [0x75] = "PCIX",
-  [0x77] = "QNX4.x",
-  [0x78] = "QNX4.x 2nd part",
-  [0x79] = "QNX4.x 3rd part",
-  [0x80] = "Minix until 1.4a",
-  [0x81] = "Minix since 1.4b, early Linux partition or Mitac disk manager",
-  [0x82] = "Linux swap or Solaris x86",
-  [0x83] = "Linux native",
-  [0x84] = "OS/2 hidden C: drive",
-  [0x85] = "Linux extended",
-  [0x86] = "NTFS volume set??",
-  [0x87] = "NTFS volume set??",
-  [0x93] = "Amoeba file system",
-  [0x94] = "Amoeba bad block table",
-  [0x9F] = "BSD/OS",
-  [0xA0] = "Suspend to Disk",
-  [0xA5] = "FreeBSD/NetBSD/386BSD",
-  [0xA6] = "OpenBSD",
-  [0xA7] = "NeXTSTEP",
-  [0xA9] = "NetBSD",
-  [0xAC] = "IBM JFS",
-  [0xAF] = "HFS+",
-  [0xB7] = "BSDI BSD/386 file system",
-  [0xB8] = "BSDI BSD/386 swap",
-  [0xBE] = "Solaris x86 boot",
-  [0xBF] = "Solaris x86 (new)",
-  [0xC1] = "DRDOS/sec with 12-bit FAT",
-  [0xC4] = "DRDOS/sec with 16-bit FAT (< 32MB)",
-  [0xC6] = "DRDOS/sec with 16-bit FAT (>= 32MB)",
-  [0xC7] = "Syrinx",
-  [0xDB] = "CP/M, Concurrent CP/M, Concurrent DOS or CTOS",
-  [0xDE] = "DELL Utilities - FAT filesystem",
-  [0xE1] = "DOS access or SpeedStor with 12-bit FAT extended partition",
-  [0xE3] = "DOS R/O or SpeedStor",
-  [0xE4] = "SpeedStor with 16-bit FAT extended partition < 1024 cyl.",
-  [0xEB] = "BeOS file system",
-  [0xEE] = "EFI GPT",
-  [0xEF] = "EFI System Partition",
-  [0xF1] = "SpeedStor",
-  [0xF2] = "DOS 3.3+ Secondary",
-  [0xF4] = "SpeedStor large partition",
-  [0xFB] = "VMware VMFS",
-  [0xFE] = "SpeedStor >1024 cyl. or LANstep",
-  [0xFF] = "Xenix bad blocks table",
-};
-
-#endif
-
-/***
- $Log: hd.h,v $
- Revision 1.2  2006/10/09 02:58:05  reddawg
- Fixing UFS
-
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:50  reddawg
- no message
-
- Revision 1.7  2004/08/15 00:33:02  reddawg
- Wow the ide driver works again
-
- Revision 1.6  2004/07/21 10:02:09  reddawg
- devfs: renamed functions
- device system: renamed functions
- fdc: fixed a few potential bugs and cleaned up some unused variables
- strol: fixed definition
- endtask: made it print out freepage debug info
- kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost
- ld: fixed a pointer conversion
- file: cleaned up a few unused variables
- sched: broke task deletion
- kprintf: fixed ogPrintf definition
-
- Revision 1.5  2004/05/21 15:05:07  reddawg
- Cleaned up
-
- END
- ***/
diff --git a/sys/include/pci/lnc.h b/sys/include/pci/lnc.h
deleted file mode 100644
index b1a3c55..0000000
--- a/sys/include/pci/lnc.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*-
- * Copyright (c) 2002-2004 The UbixOS Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions, the following disclaimer and the list of authors.  Redistributions in binary
- * form must reproduce the above copyright notice, this list of conditions, the following
- * disclaimer and the list of authors in the documentation and/or other materials provided
- * with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * THIS 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 COPYRIGHT OWNER 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.
- */
-
-#ifndef _LNC_H
-#define _LNC_H
-
-#include <sys/types.h>
-
-// TEMP COMMENT FRESH
-#define RDP      0x10 // Register Data Port 16Bit
-#define RDP32    0x10 // Register Data Port 32Bit
-#define RAP      0x12 // Register Address Port 16Bit
-#define RAP32    0x14 // Register Address Port 32Bit
-#define RESET    0x14 // Reset Port 16Bit
-#define RESET32  0x18 // Reset Port 32Bit
-#define BDP      0x16 // 16Bit
-#define BDP32    0x1C // 32Bit
-
-// BCR18
-#define BCR18      18
-#define BCR18_DWIO 0x0080
-
-// BCR20
-#define BCR20        0x0014 
-
-// Modes
-#define MODE_16      0
-#define MODE_32      1
-#define MODE_INVALID 3
-
-
-// CSR0
-#define CSR0         0x0000
-#define CSR0_STOP    0x0004
-
-// CSR15
-#define CSR15         15
-#define CSR15_DXMTFCS 0x0008
-#define CSR15_DRTY    0x0020
-#define CSR15_PROM    0x8000
-
-// CSR58
-#define CSR58 0x003A
-
-struct mds {
-    uint16_t md0;
-    uint16_t md1;
-    short md2;
-    uint16_t md3;
-};
-
-struct hostRingEntry_old {
-  struct mds *md;
-  union {
-    //struct mbuf *mbuf;
-    char *data;
-  } buff;
-};
-
-struct hostRingEntry {
-  uint32_t addr;
-  uint16_t bcnt;
-  uint8_t  md[6];
-  uint32_t reserved;
-};
-
-struct arpcom {
-  //struct  ifnet ac_if;            /* network-visible interface */
-  uint8_t ac_enaddr[6]; /* ethernet hardware address */
-  int ac_multicnt; /* length of ac_multiaddrs list */
-  void *ac_netgraph; /* ng_ether(4) netgraph node info */
-};
-
-struct nicInfo {
-  int ident; /* Type of card */
-  int ic; /* Type of ic, Am7990, Am79C960 etc. */
-  int memMode;
-  int iobase;
-  int mode; /* Mode setting at initialization */
-};
-
-struct initBlock16 {
-  uint16_t mode;    // Mode register
-  uint8_t padr[6];  // Ethernet address
-  uint8_t ladrf[8]; // Logical address filter (multicast)
-  uint16_t rdra;    // Low order pointer to receive ring
-  uint16_t rlen;    // High order pointer and no. rings
-  uint16_t tdra;    // Low order pointer to transmit ring
-  uint16_t tlen;    // High order pointer and no rings
-};
-
-struct initBlock32 {
-  uint16_t mode;
-  uint8_t rlen;
-  uint8_t tlen;
-  uint8_t padr[6];
-  uint16_t res;
-  uint8_t ladrf[8];
-  uint32_t rdra;
-  uint32_t tdra;
-};
-
-
-struct lncInfo {
-    struct arpcom arpcom;
-    struct nicInfo nic;
-    struct hostRingEntry *rxRing;
-    char *rxBuffer;
-    struct hostRingEntry *txRing;
-    char *txBuffer;
-    struct initBlock32 init;
-    unsigned int ioAddr;
-    int nrdre;
-    int ntdre;
-    int bufferSize;
-    int txPtr;
-    int rxPtr;
-};
-
-/* Functions */
-void lnc_writeCSR(struct lncInfo *, uint16_t, uint16_t);
-void lnc_writeCSR32(struct lncInfo *, uint32_t, uint32_t);
-
-uint16_t lnc_readCSR(struct lncInfo *, uint16_t);
-uint32_t lnc_readCSR32(struct lncInfo *, uint32_t);
-
-void lnc_writeBCR(struct lncInfo *, uint16_t, uint16_t);
-void lnc_writeBCR32(struct lncInfo *, uint32_t, uint32_t);
-
-uint16_t lnc_readBCR(struct lncInfo *, uint16_t);
-uint32_t lnc_readBCR32(struct lncInfo *, uint32_t);
-
-void lnc_reset(struct lncInfo *);
-void lnc_reset32(struct lncInfo *);
-
-int lnc_probe(struct lncInfo *);
-
-int lnc_switchDWord(struct lncInfo *);
-
-int lnc_getMode(struct lncInfo *);
-
-void lnc_isr();
-int lnc_driverOwnsRX(struct lncInfo *);
-int lnc_driverOwnsRX(struct lncInfo *);
-
-void lnc_INT();
-void lnc_rxINT();
-void lnc_txINT();
-
-// OLD
-
-#define NDESC(len2)    (1 << len2)
-#define NORMAL         0
-#define MEM_SLEW       8
-#define TRANSBUFSIZE   1518
-#define RECVBUFSIZE    1518
-#define NRDRE          3
-#define NTDRE          3
-#define ETHER_ADDR_LEN 6
-#define NE2100_IOSIZE  24
-
-#define PCNET_VSW      0x18
-#define NE2100         2
-
-/* mem_mode values */
-#define DMA_FIXED       1
-#define DMA_MBUF        2
-#define SHMEM           4
-
-/********** Chip Types **********/
-#define UNKNOWN         0        /* Unknown  */
-#define LANCE           1        /* Am7990   */
-#define C_LANCE         2        /* Am79C90  */
-#define PCnet_ISA       3        /* Am79C960 */
-#define PCnet_ISAplus   4        /* Am79C961 */
-#define PCnet_ISA_II    5        /* Am79C961A */
-#define PCnet_32        6        /* Am79C965 */
-#define PCnet_PCI       7        /* Am79C970 */
-#define PCnet_PCI_II    8        /* Am79C970A */
-#define PCnet_FAST      9        /* Am79C971 */
-#define PCnet_FASTplus  10       /* Am79C972 */
-#define PCnet_Home      11       /* Am79C978 */
-
-/******** AM7990 Specifics **************/
-#define CSR1    1
-#define CSR2    2
-#define CSR3    3
-#define CSR88   88
-#define CSR89   89
-
-#define ERR     0x8000
-#define BABL    0x4000
-#define CERR    0x2000
-#define MISS    0x1000
-#define MERR    0x0800
-#define RINT    0x0400
-#define TINT    0x0200
-#define IDON    0x0100
-#define INTR    0x0080
-#define INEA    0x0040
-#define RXON    0x0020
-#define TXON    0x0010
-#define TDMD    0x0008
-
-#define STRT    0x0002
-#define INIT    0x0001
-
-/* CSR88-89: Chip ID masks */
-#define AMD_MASK  0x003
-#define PART_MASK 0xffff
-#define Am79C960  0x0003
-#define Am79C961  0x2260
-#define Am79C961A 0x2261
-#define Am79C965  0x2430
-#define Am79C970  0x0242
-#define Am79C970A 0x2621
-#define Am79C971  0x2623
-#define Am79C972  0x2624
-#define Am79C973  0x2625
-#define Am79C978  0x2626
-
-
-extern struct lncInfo *lnc;
-
-
-int initLNC();
-int probe(struct lncInfo *lnc);
-int lanceProbe(struct lncInfo *lnc);
-int lncAttach(struct lncInfo *lnc, int unit);
-
-void lncInt();
-void _lncInt();
-
-int lnc_sendPacket(struct lncInfo *lnc, void *packet, size_t len, uInt8 *dest);
-
-#endif
diff --git a/sys/include/pci/pci.h b/sys/include/pci/pci.h
deleted file mode 100644
index 684b7bb..0000000
--- a/sys/include/pci/pci.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: pci.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _PCI_H
-#define _PCI_H
-
-#include <sys/types.h>
-
-
-struct pciConfig {
-  uint16_t vendorID;
-  uint16_t deviceID;
-
-  uint16_t command;
-  uint16_t status;
-
-  uint8_t  revisionID;
-  uint8_t  progIf;
-  uint8_t  subClass;
-  uint8_t  classCode;
-
-  uint8_t  cacheLineSize;
-  uint8_t  latencyTimer;
-  uint8_t  headerType;
-  uint8_t  bist;
-
-  uint32_t bar[6];
-
-  uint32_t cbPointer;
-
-  uint16_t subsysVendorID;
-  uint16_t subsysID;
-
-  uint32_t epromAddr;
-
-  uint16_t capabilites;
-  uint16_t res1;
-
-  uint32_t res2;
-
-  uint8_t intLine;
-  uint8_t intPin;
-  uint8_t minGrant;
-  uint8_t maxLatency;
-
-  /* device info */
-  //uint8_t  bus;
-  //uint8_t  dev;
-  //uint8_t  func;
-  //uint8_t  irq;
-  //uint8_t irqLine;
-
-  /* base registers */
-  //uInt32 base[6];
-  //uInt32 size[6];
-
-  //uint16_t subsysVendor;
-  //uint16_t subsys;
-  
-  /* Device Info */
-  //Move this to anotther struct eventually
-  uint8_t bus;
-  uint8_t dev;
-  uint8_t func;
-
-  };
-
-struct confadd {
-  uint8_t reg:8;
-  uint8_t func:3;
-  uint8_t dev:5;
-  uint8_t bus:8;
-  uint8_t rsvd:7;
-  uint8_t enable:1;
-  };
-
-#define countof(a)     (sizeof(a) / sizeof(a[0]))
-  
-int pci_init();
-
-
-uint32_t pciProbe(int bus,int dev,int func);
-uInt32 pciRead(int bus, int dev, int func, int reg, int bytes);
-void pciWrite(int bus,int dev,int func,int reg,uInt32 v,int bytes);
-
-#endif
-
-/***
- $Log: pci.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:51  reddawg
- no message
-
- Revision 1.3  2004/08/20 16:49:11  reddawg
- PCI Updates - More to follow as PCI system gets revamped
-
- Revision 1.2  2004/05/21 15:05:07  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/sde/ogDisplay_UbixOS.h b/sys/include/sde/ogDisplay_UbixOS.h
deleted file mode 100755
index fa8022a..0000000
--- a/sys/include/sde/ogDisplay_UbixOS.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef OGDISPLAY_UBIXOS_H
-#define OGDISPLAY_UBIXOS_H
-
-#include <objgfx40/objgfx40.h>
-
-struct ogModeInfo {
-    uInt16 modeAttributes     __attribute__((packed));
-    uInt8  windowAFlags       __attribute__((packed));
-    uInt8  windowBFlags       __attribute__((packed));
-    uInt16 granularity        __attribute__((packed));
-    uInt16 windowSize         __attribute__((packed));
-    uInt16 windowASeg         __attribute__((packed));
-    uInt16 windowBSeg         __attribute__((packed));
-    void*  bankSwitch         __attribute__((packed));
-    uInt16 bytesPerLine       __attribute__((packed));
-    uInt16 xRes               __attribute__((packed));
-    uInt16 yRes               __attribute__((packed));
-    uInt8  charWidth          __attribute__((packed));
-    uInt8  charHeight         __attribute__((packed));
-    uInt8  numBitPlanes       __attribute__((packed));
-    uInt8  bitsPerPixel       __attribute__((packed));
-    uInt8  numberOfBanks      __attribute__((packed));
-    uInt8  memoryModel        __attribute__((packed));
-    uInt8  bankSize           __attribute__((packed));
-    uInt8  numOfImagePages    __attribute__((packed));
-    uInt8  reserved           __attribute__((packed));
-    // Direct colour fields (required for Direct/6 and YUV/7 memory models
-    uInt8  redMaskSize        __attribute__((packed));
-    uInt8  redFieldPosition   __attribute__((packed));
-    uInt8  greenMaskSize      __attribute__((packed));
-    uInt8  greenFieldPosition __attribute__((packed));
-    uInt8  blueMaskSize       __attribute__((packed));
-    uInt8  blueFieldPosition  __attribute__((packed));
-    uInt8  alphaMaskSize      __attribute__((packed));
-    uInt8  alphaFieldPosition __attribute__((packed));
-    uInt8  directColourMode   __attribute__((packed));
-    // VESA 2.0 specific fields
-    uInt32 physBasePtr        __attribute__((packed));
-    void*  offScreenMemOffset __attribute__((packed));
-    uInt16 offScreenMemSize   __attribute__((packed));
-    uInt8  paddington[461]    __attribute__((packed));
-};
-
-struct ogVESAInfo {
-    char    VBESignature[4]   __attribute__((packed));
-    uInt8   minVersion        __attribute__((packed));
-    uInt8   majVersion        __attribute__((packed));
-    uInt32  OEMStringPtr      __attribute__((packed));
-    uInt32  capabilities      __attribute__((packed));
-    uInt32  videoModePtr      __attribute__((packed));
-    uInt16  totalMemory       __attribute__((packed));
-    // VESA 2.0 specific fields
-    uInt16  OEMSoftwareRev    __attribute__((packed));
-    uInt32  OEMVendorNamePtr  __attribute__((packed));
-    uInt32  OEMProductNamePtr __attribute__((packed));
-    uInt32  OEMProductRevPtr  __attribute__((packed));
-    uInt8   paddington[474]   __attribute__((packed));
-};
-
-
-class ogDisplay_UbixOS : public ogSurface {
- protected:
-  void *         pages[2];
-  uInt32         activePage;
-  uInt32         visualPage;
-  ogVESAInfo *   VESAInfo;
-  ogModeInfo *   modeInfo;
-
-  uInt16         FindMode(uInt32, uInt32, uInt32);
-  void           GetModeInfo(uInt16);
-  void           GetVESAInfo(void);
-  void           SetMode(uInt16);
-  void           SetPal(void);
- public:
-                 ogDisplay_UbixOS(void);
-  virtual bool   ogAlias(ogSurface&, uInt32, uInt32, uInt32, uInt32);
-  virtual bool   ogClone(ogSurface&);
-  virtual void   ogCopyPalette(ogSurface&);
-  virtual bool   ogCreate(uInt32, uInt32, ogPixelFmt);
-  virtual bool   ogLoadPalette(const char *);
-  virtual void   ogSetPalette(const ogRGBA8[]);
-  virtual void   ogSetPalette(uInt8, uInt8, uInt8, uInt8);
-  virtual void   ogSetPalette(uInt8, uInt8, uInt8, uInt8, uInt8);
-  virtual        ~ogDisplay_UbixOS(void);
-}; // ogDisplay_UbixOS
-
-#endif
diff --git a/sys/include/sde/sde.h b/sys/include/sde/sde.h
deleted file mode 100644
index 24d3b8c..0000000
--- a/sys/include/sde/sde.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sde.h 79 2016-01-11 16:21:27Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _SDE_H_
-#define _SDE_H_
-
-#include <sys/types.h>
-
-#define registerWindow   1
-#define windowReady      2
-#define drawWindow       3
-#define killWindow       4
-
-#ifdef __cplusplus
-extern "C"
-#endif
-void sdeThread();
-
-#ifdef __cplusplus
-extern "C"
-#endif
-void sysSDE(uInt32 cmd,void *ptr);
-
-struct sdeWindows {
-  struct sdeWindows *next;
-  struct sdeWindows *prev;
-  void              *buf;
-  pidType            pid;
-  uInt8              status;
-  };
-
-extern struct sdeWindows *windows;  
-  
-#endif
-
diff --git a/sys/include/stdarg.h b/sys/include/stdarg.h
deleted file mode 100644
index 79ecda8..0000000
--- a/sys/include/stdarg.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: stdarg.h 75 2016-01-11 06:15:17Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _STDARG_H
-#define _STDARG_H
-
-typedef char *va_list;
-
-/*
- #define __va_size(type) (((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
- #define va_start(ap, last) ((ap) = (va_list)&(last) + __va_size(last))
- #define va_arg(ap,type) (*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
- #define va_end(ap) ( ap = (va_list)0 )
- */
-
-#define va_start(ap, last) \
-        __builtin_va_start((ap), (last))
-
-#define va_arg(ap, type) \
-        __builtin_va_arg((ap), type)
-
-#define __va_copy(dest, src) \
-        __builtin_va_copy((dest), (src))
-
-#define va_end(ap) \
-        __builtin_va_end(ap)
-
-int vsprintf( char *buf, const char *fmt, va_list args );
-
-#endif
-
-/***
- $Log: stdarg.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:36  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:38  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:22:35  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/stdatomic.h b/sys/include/stdatomic.h
deleted file mode 100644
index f03022f..0000000
--- a/sys/include/stdatomic.h
+++ /dev/null
@@ -1,392 +0,0 @@
-/*-
- * Copyright (c) 2011 Ed Schouten <ed@FreeBSD.org>
- *                    David Chisnall <theraven@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.
- *
- * 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: releng/11.1/sys/sys/stdatomic.h 263998 2014-04-01 14:46:11Z tijl $
- */
-
-#ifndef _STDATOMIC_H_
-#define	_STDATOMIC_H_
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-#if __has_extension(c_atomic) || __has_extension(cxx_atomic)
-#define	__CLANG_ATOMICS
-#elif __GNUC_PREREQ__(4, 7)
-#define	__GNUC_ATOMICS
-#elif defined(__GNUC__)
-#define	__SYNC_ATOMICS
-#else
-#error "stdatomic.h does not support your compiler"
-#endif
-
-/*
- * 7.17.1 Atomic lock-free macros.
- */
-
-#ifdef __GCC_ATOMIC_BOOL_LOCK_FREE
-#define	ATOMIC_BOOL_LOCK_FREE		__GCC_ATOMIC_BOOL_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_CHAR_LOCK_FREE
-#define	ATOMIC_CHAR_LOCK_FREE		__GCC_ATOMIC_CHAR_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#define	ATOMIC_CHAR16_T_LOCK_FREE	__GCC_ATOMIC_CHAR16_T_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#define	ATOMIC_CHAR32_T_LOCK_FREE	__GCC_ATOMIC_CHAR32_T_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#define	ATOMIC_WCHAR_T_LOCK_FREE	__GCC_ATOMIC_WCHAR_T_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_SHORT_LOCK_FREE
-#define	ATOMIC_SHORT_LOCK_FREE		__GCC_ATOMIC_SHORT_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_INT_LOCK_FREE
-#define	ATOMIC_INT_LOCK_FREE		__GCC_ATOMIC_INT_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_LONG_LOCK_FREE
-#define	ATOMIC_LONG_LOCK_FREE		__GCC_ATOMIC_LONG_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_LLONG_LOCK_FREE
-#define	ATOMIC_LLONG_LOCK_FREE		__GCC_ATOMIC_LLONG_LOCK_FREE
-#endif
-#ifdef __GCC_ATOMIC_POINTER_LOCK_FREE
-#define	ATOMIC_POINTER_LOCK_FREE	__GCC_ATOMIC_POINTER_LOCK_FREE
-#endif
-
-/*
- * 7.17.2 Initialization.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	 ATOMIC_VAR_INIT(value)		(value)
-#define	 atomic_init(obj, value)		__c11_atomic_init(obj, value)
-#else
-#define 	ATOMIC_VAR_INIT(value)		{ .__val = (value) }
-#define	 atomic_init(obj, value)		((void)((obj)->__val = (value)))
-#endif
-
-/*
- * Clang and recent GCC both provide predefined macros for the memory
- * orderings.  If we are using a compiler that doesn't define them, use the
- * clang values - these will be ignored in the fallback path.
- */
-
-#ifndef __ATOMIC_RELAXED
-#define __ATOMIC_RELAXED		0
-#endif
-#ifndef __ATOMIC_CONSUME
-#define __ATOMIC_CONSUME		1
-#endif
-#ifndef __ATOMIC_ACQUIRE
-#define __ATOMIC_ACQUIRE		2
-#endif
-#ifndef __ATOMIC_RELEASE
-#define __ATOMIC_RELEASE		3
-#endif
-#ifndef __ATOMIC_ACQ_REL
-#define __ATOMIC_ACQ_REL		4
-#endif
-#ifndef __ATOMIC_SEQ_CST
-#define __ATOMIC_SEQ_CST		5
-#endif
-
-/*
- * 7.17.3 Order and consistency.
- *
- * The memory_order_* constants that denote the barrier behaviour of the
- * atomic operations.
- */
-
-typedef enum {
-  memory_order_relaxed = __ATOMIC_RELAXED, memory_order_consume = __ATOMIC_CONSUME, memory_order_acquire = __ATOMIC_ACQUIRE, memory_order_release = __ATOMIC_RELEASE, memory_order_acq_rel = __ATOMIC_ACQ_REL, memory_order_seq_cst = __ATOMIC_SEQ_CST
-} memory_order;
-
-/*
- * 7.17.4 Fences.
- */
-
-static __inline void atomic_thread_fence(memory_order __order __unused) {
-
-#ifdef __CLANG_ATOMICS
-  __c11_atomic_thread_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-  __atomic_thread_fence(__order);
-#else
-  __sync_synchronize();
-#endif
-}
-
-static __inline void atomic_signal_fence(memory_order __order __unused) {
-
-#ifdef __CLANG_ATOMICS
-  __c11_atomic_signal_fence(__order);
-#elif defined(__GNUC_ATOMICS)
-  __atomic_signal_fence(__order);
-#else
-  __asm volatile ("" ::: "memory");
-#endif
-}
-
-/*
- * 7.17.5 Lock-free property.
- */
-
-#if defined(_KERNEL)
-/* Atomics in kernelspace are always lock-free. */
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), (_Bool)1)
-#elif defined(__CLANG_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__atomic_is_lock_free(sizeof(*(obj)), obj)
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_is_lock_free(obj) \
-	__atomic_is_lock_free(sizeof((obj)->__val), &(obj)->__val)
-#else
-#define	atomic_is_lock_free(obj) \
-	((void)(obj), sizeof((obj)->__val) <= sizeof(void *))
-#endif
-
-/*
- * 7.17.6 Atomic integer types.
- */
-
-typedef _Atomic(_Bool) atomic_bool;
-typedef _Atomic(char) atomic_char;
-typedef _Atomic(signed char) atomic_schar;
-typedef _Atomic(unsigned char) atomic_uchar;
-typedef _Atomic(short) atomic_short;
-typedef _Atomic(unsigned short) atomic_ushort;
-typedef _Atomic(int) atomic_int;
-typedef _Atomic(unsigned int) atomic_uint;
-typedef _Atomic(long) atomic_long;
-typedef _Atomic(unsigned long) atomic_ulong;
-typedef _Atomic(long long) atomic_llong;
-typedef _Atomic(unsigned long long) atomic_ullong;
-typedef _Atomic(__char16_t) atomic_char16_t;
-typedef _Atomic(__char32_t) atomic_char32_t;
-typedef _Atomic(___wchar_t) atomic_wchar_t;
-typedef _Atomic(__int_least8_t) atomic_int_least8_t;
-typedef _Atomic(__uint_least8_t) atomic_uint_least8_t;
-typedef _Atomic(__int_least16_t) atomic_int_least16_t;
-typedef _Atomic(__uint_least16_t) atomic_uint_least16_t;
-typedef _Atomic(__int_least32_t) atomic_int_least32_t;
-typedef _Atomic(__uint_least32_t) atomic_uint_least32_t;
-typedef _Atomic(__int_least64_t) atomic_int_least64_t;
-typedef _Atomic(__uint_least64_t) atomic_uint_least64_t;
-typedef _Atomic(__int_fast8_t) atomic_int_fast8_t;
-typedef _Atomic(__uint_fast8_t) atomic_uint_fast8_t;
-typedef _Atomic(__int_fast16_t) atomic_int_fast16_t;
-typedef _Atomic(__uint_fast16_t) atomic_uint_fast16_t;
-typedef _Atomic(__int_fast32_t) atomic_int_fast32_t;
-typedef _Atomic(__uint_fast32_t) atomic_uint_fast32_t;
-typedef _Atomic(__int_fast64_t) atomic_int_fast64_t;
-typedef _Atomic(__uint_fast64_t) atomic_uint_fast64_t;
-typedef _Atomic(__intptr_t) atomic_intptr_t;
-typedef _Atomic(__uintptr_t) atomic_uintptr_t;
-typedef _Atomic(__size_t) atomic_size_t;
-typedef _Atomic(__ptrdiff_t) atomic_ptrdiff_t;
-typedef _Atomic(__intmax_t) atomic_intmax_t;
-typedef _Atomic(__uintmax_t) atomic_uintmax_t;
-
-/*
- * 7.17.7 Operations on atomic types.
- */
-
-/*
- * Compiler-specific operations.
- */
-
-#if defined(__CLANG_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_strong(object, expected, desired,	\
-	    success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__c11_atomic_compare_exchange_weak(object, expected, desired,	\
-	    success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__c11_atomic_exchange(object, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__c11_atomic_fetch_add(object, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__c11_atomic_fetch_and(object, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__c11_atomic_fetch_or(object, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__c11_atomic_fetch_sub(object, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__c11_atomic_fetch_xor(object, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__c11_atomic_load(object, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__c11_atomic_store(object, desired, order)
-#elif defined(__GNUC_ATOMICS)
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 0, success, failure)
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	__atomic_compare_exchange_n(&(object)->__val, expected,		\
-	    desired, 1, success, failure)
-#define	atomic_exchange_explicit(object, desired, order)		\
-	__atomic_exchange_n(&(object)->__val, desired, order)
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	__atomic_fetch_add(&(object)->__val, operand, order)
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	__atomic_fetch_and(&(object)->__val, operand, order)
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	__atomic_fetch_or(&(object)->__val, operand, order)
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	__atomic_fetch_sub(&(object)->__val, operand, order)
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	__atomic_fetch_xor(&(object)->__val, operand, order)
-#define	atomic_load_explicit(object, order)				\
-	__atomic_load_n(&(object)->__val, order)
-#define	atomic_store_explicit(object, desired, order)			\
-	__atomic_store_n(&(object)->__val, desired, order)
-#else
-#define	__atomic_apply_stride(object, operand) \
-	(((__typeof__((object)->__val))0) + (operand))
-#define	atomic_compare_exchange_strong_explicit(object, expected,	\
-    desired, success, failure)	__extension__ ({			\
-	__typeof__(expected) __ep = (expected);				\
-	__typeof__(*__ep) __e = *__ep;					\
-	(void)(success); (void)(failure);				\
-	(_Bool)((*__ep = __sync_val_compare_and_swap(&(object)->__val,	\
-	    __e, desired)) == __e);					\
-})
-#define	atomic_compare_exchange_weak_explicit(object, expected,		\
-    desired, success, failure)						\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-		desired, success, failure)
-#if __has_builtin(__sync_swap)
-/* Clang provides a full-barrier atomic exchange - use it if available. */
-#define	atomic_exchange_explicit(object, desired, order)		\
-	((void)(order), __sync_swap(&(object)->__val, desired))
-#else
-/*
- * __sync_lock_test_and_set() is only an acquire barrier in theory (although in
- * practice it is usually a full barrier) so we need an explicit barrier before
- * it.
- */
-#define	atomic_exchange_explicit(object, desired, order)		\
-__extension__ ({							\
-	__typeof__(object) __o = (object);				\
-	__typeof__(desired) __d = (desired);				\
-	(void)(order);							\
-	__sync_synchronize();						\
-	__sync_lock_test_and_set(&(__o)->__val, __d);			\
-})
-#endif
-#define	atomic_fetch_add_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_add(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_and_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_and(&(object)->__val, operand))
-#define	atomic_fetch_or_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_or(&(object)->__val, operand))
-#define	atomic_fetch_sub_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_sub(&(object)->__val,		\
-	    __atomic_apply_stride(object, operand)))
-#define	atomic_fetch_xor_explicit(object, operand, order)		\
-	((void)(order), __sync_fetch_and_xor(&(object)->__val, operand))
-#define	atomic_load_explicit(object, order)				\
-	((void)(order), __sync_fetch_and_add(&(object)->__val, 0))
-#define	atomic_store_explicit(object, desired, order)			\
-	((void)atomic_exchange_explicit(object, desired, order))
-#endif
-
-/*
- * Convenience functions.
- *
- * Don't provide these in kernel space. In kernel space, we should be
- * disciplined enough to always provide explicit barriers.
- */
-
-#ifndef _KERNEL
-#define	atomic_compare_exchange_strong(object, expected, desired)	\
-	atomic_compare_exchange_strong_explicit(object, expected,	\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_compare_exchange_weak(object, expected, desired)		\
-	atomic_compare_exchange_weak_explicit(object, expected,		\
-	    desired, memory_order_seq_cst, memory_order_seq_cst)
-#define	atomic_exchange(object, desired)				\
-	atomic_exchange_explicit(object, desired, memory_order_seq_cst)
-#define	atomic_fetch_add(object, operand)				\
-	atomic_fetch_add_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_and(object, operand)				\
-	atomic_fetch_and_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_or(object, operand)				\
-	atomic_fetch_or_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_sub(object, operand)				\
-	atomic_fetch_sub_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_fetch_xor(object, operand)				\
-	atomic_fetch_xor_explicit(object, operand, memory_order_seq_cst)
-#define	atomic_load(object)						\
-	atomic_load_explicit(object, memory_order_seq_cst)
-#define	atomic_store(object, desired)					\
-	atomic_store_explicit(object, desired, memory_order_seq_cst)
-#endif /* !_KERNEL */
-
-/*
- * 7.17.8 Atomic flag type and operations.
- *
- * XXX: Assume atomic_bool can be used as an atomic_flag. Is there some
- * kind of compiler built-in type we could use?
- */
-
-typedef struct {
-    atomic_bool __flag;
-} atomic_flag;
-
-#define	ATOMIC_FLAG_INIT		{ ATOMIC_VAR_INIT(0) }
-
-static __inline _Bool atomic_flag_test_and_set_explicit(volatile atomic_flag *__object, memory_order __order) {
-  return (atomic_exchange_explicit(&__object->__flag, 1, __order));
-}
-
-static __inline void atomic_flag_clear_explicit(volatile atomic_flag *__object, memory_order __order) {
-
-  atomic_store_explicit(&__object->__flag, 0, __order);
-}
-
-#ifndef _KERNEL
-static __inline _Bool atomic_flag_test_and_set(volatile atomic_flag *__object) {
-
-  return (atomic_flag_test_and_set_explicit(__object, memory_order_seq_cst));
-}
-
-static __inline void atomic_flag_clear(volatile atomic_flag *__object) {
-
-  atomic_flag_clear_explicit(__object, memory_order_seq_cst);
-}
-#endif /* !_KERNEL */
-
-#endif /* !_STDATOMIC_H_ */
diff --git a/sys/include/string.h b/sys/include/string.h
deleted file mode 100644
index 9611096..0000000
--- a/sys/include/string.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: string.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _STRING_H
-#define _STRING_H
-
-#include <sys/types.h>
-
-char *strcpy(char *dst,const char *src);
-
-void *memcpy(void * dst, const void * src, size_t length);
-void *memset(void * dst, int c, size_t length);
-int strlen(const char * string);
-int strcmp(const char *,const char *);
-
-int sprintf(char * str, const char * format, ...);
-
-long strtol(const char * __restrict nptr, char ** __restrict endptr, int base);
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/sys/_types.h b/sys/include/sys/_types.h
deleted file mode 100644
index 6cfd882..0000000
--- a/sys/include/sys/_types.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*-
- * Copyright (c) 2002-2004, 2017 The UbixOS Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions, the following disclaimer and the list of authors.  Redistributions in binary
- * form must reproduce the above copyright notice, this list of conditions, the following
- * disclaimer and the list of authors in the documentation and/or other materials provided
- * with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#ifndef __TYPES_H
-#define __TYPES_H
-
-typedef char               __int8_t;
-typedef unsigned char      __uint8_t;
-typedef short              __int16_t;
-typedef unsigned short     __uint16_t;
-typedef int                __int32_t;
-typedef unsigned int       __uint32_t;
-typedef long long          __int64_t;
-typedef unsigned long long __uint64_t;
-
-typedef unsigned long __clock_t;
-typedef __uint32_t          __ino_t; typedef __int32_t           __ssize_t;/* stat types */
-typedef __uint32_t          __dev_t;/* device number */
-typedef __uint16_t          __mode_t; typedef __uint16_t          __nlink_t;/* link count */
-typedef __uint32_t          __uid_t; typedef __uint32_t          __gid_t; typedef __int32_t           __time_t; typedef __int64_t           __blkcnt_t;/* file block count */
-typedef __uint32_t          __blksize_t;/* file block size */
-typedef __uint32_t          __fflags_t;/* file flags */
-
-typedef       __int8_t       __int_fast8_t;
-typedef       __uint8_t      __uint_fast8_t;
-typedef       __int16_t       __int_fast16_t;
-typedef       __uint16_t      __uint_fast16_t;
-typedef       __int32_t       __int_fast32_t;
-typedef       __uint32_t      __uint_fast32_t;
-typedef       __int64_t       __int_fast64_t;
-typedef       __uint64_t      __uint_fast64_t;
-typedef       __int32_t      __intptr_t;
-typedef       __uint32_t      __uintptr_t;
-typedef       __uint32_t      __size_t;
-typedef       __int64_t       __intmax_t;
-typedef       __uint64_t       __uintmax_t;
-typedef       __int32_t       __ptrdiff_t;
-typedef       __uint8_t       __uint_least8_t;
-typedef       __uint16_t      __uint_least16_t;
-typedef       __uint32_t      __uint_least32_t;
-typedef       __uint64_t      __uint_least64_t;
-typedef       __int8_t       __int_least8_t;
-typedef       __int16_t      __int_least16_t;
-typedef       __int32_t      __int_least32_t;
-typedef       __int64_t      __int_least64_t;
-typedef       int             ___wchar_t;
-
-#if !defined(__clang__) || !defined(__cplusplus)
-typedef __uint_least16_t __char16_t;
-typedef __uint_least32_t __char32_t;
-#endif
-
-
-#endif
diff --git a/sys/include/sys/buf.h b/sys/include/sys/buf.h
deleted file mode 100644
index 695c9db..0000000
--- a/sys/include/sys/buf.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: buf.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _BUF_H
-#define _BUF_H
-
-#include <vfs/vfs.h>
-#include <sys/device.h>
-
-struct buf {
-  };
-
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/sys/cdefs.h b/sys/include/sys/cdefs.h
deleted file mode 100644
index 4117232..0000000
--- a/sys/include/sys/cdefs.h
+++ /dev/null
@@ -1,895 +0,0 @@
-/*-
- * Copyright (c) 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Berkeley Software Design, Inc.
- *
- * 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.
- * 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.
- *
- *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
- * $FreeBSD: releng/11.1/sys/sys/cdefs.h 317342 2017-04-23 20:32:46Z kib $
- */
-
-#ifndef	_SYS_CDEFS_H_
-#define	_SYS_CDEFS_H_
-
-/*
- * Testing against Clang-specific extensions.
- */
-#ifndef	__has_attribute
-#define	__has_attribute(x)	0
-#endif
-#ifndef	__has_extension
-#define	__has_extension		__has_feature
-#endif
-#ifndef	__has_feature
-#define	__has_feature(x)	0
-#endif
-#ifndef	__has_include
-#define	__has_include(x)	0
-#endif
-#ifndef	__has_builtin
-#define	__has_builtin(x)	0
-#endif
-
-#if defined(__cplusplus)
-#define	__BEGIN_DECLS	extern "C" {
-#define	__END_DECLS	}
-#else
-#define	__BEGIN_DECLS
-#define	__END_DECLS
-#endif
-
-/*
- * This code has been put in place to help reduce the addition of
- * compiler specific defines in FreeBSD code.  It helps to aid in
- * having a compiler-agnostic source tree.
- */
-
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-
-#if __GNUC__ >= 3 || defined(__INTEL_COMPILER)
-#define	__GNUCLIKE_ASM 3
-#define	__GNUCLIKE_MATH_BUILTIN_CONSTANTS
-#else
-#define	__GNUCLIKE_ASM 2
-#endif
-#define	__GNUCLIKE___TYPEOF 1
-#define	__GNUCLIKE___OFFSETOF 1
-#define	__GNUCLIKE___SECTION 1
-
-#ifndef __INTEL_COMPILER
-#define	__GNUCLIKE_CTOR_SECTION_HANDLING 1
-#endif
-
-#define	__GNUCLIKE_BUILTIN_CONSTANT_P 1
-#if defined(__INTEL_COMPILER) && defined(__cplusplus) && \
-   __INTEL_COMPILER < 800
-#undef __GNUCLIKE_BUILTIN_CONSTANT_P
-#endif
-
-#if (__GNUC_MINOR__ > 95 || __GNUC__ >= 3)
-#define	__GNUCLIKE_BUILTIN_VARARGS 1
-#define	__GNUCLIKE_BUILTIN_STDARG 1
-#define	__GNUCLIKE_BUILTIN_VAALIST 1
-#endif
-
-#if defined(__GNUC__)
-#define	__GNUC_VA_LIST_COMPATIBILITY 1
-#endif
-
-/*
- * Compiler memory barriers, specific to gcc and clang.
- */
-#if defined(__GNUC__)
-#define	__compiler_membar()	__asm __volatile(" " : : : "memory")
-#endif
-
-#ifndef __INTEL_COMPILER
-#define	__GNUCLIKE_BUILTIN_NEXT_ARG 1
-#define	__GNUCLIKE_MATH_BUILTIN_RELOPS
-#endif
-
-#define	__GNUCLIKE_BUILTIN_MEMCPY 1
-
-/* XXX: if __GNUC__ >= 2: not tested everywhere originally, where replaced */
-#define	__CC_SUPPORTS_INLINE 1
-#define	__CC_SUPPORTS___INLINE 1
-#define	__CC_SUPPORTS___INLINE__ 1
-
-#define	__CC_SUPPORTS___FUNC__ 1
-#define	__CC_SUPPORTS_WARNING 1
-
-#define	__CC_SUPPORTS_VARADIC_XXX 1 /* see varargs.h */
-
-#define	__CC_SUPPORTS_DYNAMIC_ARRAY_INIT 1
-
-#endif /* __GNUC__ || __INTEL_COMPILER */
-
-/*
- * Macro to test if we're using a specific version of gcc or later.
- */
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-#define	__GNUC_PREREQ__(ma, mi)	\
-	(__GNUC__ > (ma) || __GNUC__ == (ma) && __GNUC_MINOR__ >= (mi))
-#else
-#define	__GNUC_PREREQ__(ma, mi)	0
-#endif
-
-/*
- * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
- * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
- * The __CONCAT macro is a bit tricky to use if it must work in non-ANSI
- * mode -- there must be no spaces between its arguments, and for nested
- * __CONCAT's, all the __CONCAT's must be at the left.  __CONCAT can also
- * concatenate double-quoted strings produced by the __STRING macro, but
- * this only works with ANSI C.
- *
- * __XSTRING is like __STRING, but it expands any macros in its argument
- * first.  It is only available with ANSI C.
- */
-#if defined(__STDC__) || defined(__cplusplus)
-#define	__P(protos)	protos		/* full-blown ANSI C */
-#define	__CONCAT1(x,y)	x ## y
-#define	__CONCAT(x,y)	__CONCAT1(x,y)
-#define	__STRING(x)	#x		/* stringify without expanding x */
-#define	__XSTRING(x)	__STRING(x)	/* expand x, then stringify */
-
-#define	__const		const		/* define reserved names to standard */
-#define	__signed	signed
-#define	__volatile	volatile
-#if defined(__cplusplus)
-#define	__inline	inline		/* convert to C++ keyword */
-#else
-#if !(defined(__CC_SUPPORTS___INLINE))
-#define	__inline			/* delete GCC keyword */
-#endif /* ! __CC_SUPPORTS___INLINE */
-#endif /* !__cplusplus */
-
-#else	/* !(__STDC__ || __cplusplus) */
-#define	__P(protos)	()		/* traditional C preprocessor */
-#define	__CONCAT(x,y)	x/**/y
-#define	__STRING(x)	"x"
-
-#if !defined(__CC_SUPPORTS___INLINE)
-#define	__const				/* delete pseudo-ANSI C keywords */
-#define	__inline
-#define	__signed
-#define	__volatile
-/*
- * In non-ANSI C environments, new programs will want ANSI-only C keywords
- * deleted from the program and old programs will want them left alone.
- * When using a compiler other than gcc, programs using the ANSI C keywords
- * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
- * When using "gcc -traditional", we assume that this is the intent; if
- * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
- */
-#ifndef	NO_ANSI_KEYWORDS
-#define	const				/* delete ANSI C keywords */
-#define	inline
-#define	signed
-#define	volatile
-#endif	/* !NO_ANSI_KEYWORDS */
-#endif	/* !__CC_SUPPORTS___INLINE */
-#endif	/* !(__STDC__ || __cplusplus) */
-
-/*
- * Compiler-dependent macros to help declare dead (non-returning) and
- * pure (no side effects) functions, and unused variables.  They are
- * null except for versions of gcc that are known to support the features
- * properly (old versions of gcc-2 supported the dead and pure features
- * in a different (wrong) way).  If we do not provide an implementation
- * for a given compiler, let the compile fail if it is told to use
- * a feature that we cannot live without.
- */
-#ifdef lint
-#define	__dead2
-#define	__pure2
-#define	__unused
-#define	__packed
-#define	__aligned(x)
-#define	__alloc_align(x)
-#define	__alloc_size(x)
-#define	__section(x)
-#define	__weak_symbol
-#else
-#define	__weak_symbol	__attribute__((__weak__))
-#if !__GNUC_PREREQ__(2, 5) && !defined(__INTEL_COMPILER)
-#define	__dead2
-#define	__pure2
-#define	__unused
-#endif
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 5 && __GNUC_MINOR__ < 7 && !defined(__INTEL_COMPILER)
-#define	__dead2		__attribute__((__noreturn__))
-#define	__pure2		__attribute__((__const__))
-#define	__unused
-/* XXX Find out what to do for __packed, __aligned and __section */
-#endif
-#if __GNUC_PREREQ__(2, 7) || defined(__INTEL_COMPILER)
-#define	__dead2		__attribute__((__noreturn__))
-#define	__pure2		__attribute__((__const__))
-#define	__unused	__attribute__((__unused__))
-#define	__used		__attribute__((__used__))
-#define	__packed	__attribute__((__packed__))
-#define	__aligned(x)	__attribute__((__aligned__(x)))
-#define	__section(x)	__attribute__((__section__(x)))
-#endif
-#if __GNUC_PREREQ__(4, 3) || __has_attribute(__alloc_size__)
-#define	__alloc_size(x)	__attribute__((__alloc_size__(x)))
-#else
-#define	__alloc_size(x)
-#endif
-#if __GNUC_PREREQ__(4, 9) || __has_attribute(__alloc_align__)
-#define	__alloc_align(x)	__attribute__((__alloc_align__(x)))
-#else
-#define	__alloc_align(x)
-#endif
-#endif /* lint */
-
-#if !__GNUC_PREREQ__(2, 95)
-#define	__alignof(x)	__offsetof(struct { char __a; x __b; }, __b)
-#endif
-
-/*
- * Keywords added in C11.
- */
-
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112L || defined(lint)
-
-#if !__has_extension(c_alignas)
-#if (defined(__cplusplus) && __cplusplus >= 201103L) || \
-    __has_extension(cxx_alignas)
-#define	_Alignas(x)		alignas(x)
-#else
-/* XXX: Only emulates _Alignas(constant-expression); not _Alignas(type-name). */
-#define	_Alignas(x)		__aligned(x)
-#endif
-#endif
-
-#if defined(__cplusplus) && __cplusplus >= 201103L
-#define	_Alignof(x)		alignof(x)
-#else
-#define	_Alignof(x)		__alignof(x)
-#endif
-
-#if !defined(__cplusplus) && !__has_extension(c_atomic) && \
-    !__has_extension(cxx_atomic)
-/*
- * No native support for _Atomic(). Place object in structure to prevent
- * most forms of direct non-atomic access.
- */
-#define	_Atomic(T)		struct { T volatile __val; }
-#endif
-
-#if defined(__cplusplus) && __cplusplus >= 201103L
-#define	_Noreturn		[[noreturn]]
-#else
-#define	_Noreturn		__dead2
-#endif
-
-#if !__has_extension(c_static_assert)
-#if (defined(__cplusplus) && __cplusplus >= 201103L) || \
-    __has_extension(cxx_static_assert)
-#define	_Static_assert(x, y)	static_assert(x, y)
-#elif __GNUC_PREREQ__(4,6)
-/* Nothing, gcc 4.6 and higher has _Static_assert built-in */
-#elif defined(__COUNTER__)
-#define	_Static_assert(x, y)	__Static_assert(x, __COUNTER__)
-#define	__Static_assert(x, y)	___Static_assert(x, y)
-#define	___Static_assert(x, y)	typedef char __assert_ ## y[(x) ? 1 : -1] \
-				__unused
-#else
-#define	_Static_assert(x, y)	struct __hack
-#endif
-#endif
-
-#if !__has_extension(c_thread_local)
-/*
- * XXX: Some compilers (Clang 3.3, GCC 4.7) falsely announce C++11 mode
- * without actually supporting the thread_local keyword. Don't check for
- * the presence of C++11 when defining _Thread_local.
- */
-#if /* (defined(__cplusplus) && __cplusplus >= 201103L) || */ \
-    __has_extension(cxx_thread_local)
-#define	_Thread_local		thread_local
-#else
-#define	_Thread_local		__thread
-#endif
-#endif
-
-#endif /* __STDC_VERSION__ || __STDC_VERSION__ < 201112L */
-
-/*
- * Emulation of C11 _Generic().  Unlike the previously defined C11
- * keywords, it is not possible to implement this using exactly the same
- * syntax.  Therefore implement something similar under the name
- * __generic().  Unlike _Generic(), this macro can only distinguish
- * between a single type, so it requires nested invocations to
- * distinguish multiple cases.
- */
-
-#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \
-    __has_extension(c_generic_selections)
-#define	__generic(expr, t, yes, no)					\
-	_Generic(expr, t: yes, default: no)
-#elif __GNUC_PREREQ__(3, 1) && !defined(__cplusplus)
-#define	__generic(expr, t, yes, no)					\
-	__builtin_choose_expr(						\
-	    __builtin_types_compatible_p(__typeof(expr), t), yes, no)
-#endif
-
-/*
- * C99 Static array indices in function parameter declarations.  Syntax such as:
- * void bar(int myArray[static 10]);
- * is allowed in C99 but not in C++.  Define __min_size appropriately so
- * headers using it can be compiled in either language.  Use like this:
- * void bar(int myArray[__min_size(10)]);
- */
-#if !defined(__cplusplus) && \
-    (defined(__clang__) || __GNUC_PREREQ__(4, 6)) && \
-    (!defined(__STDC_VERSION__) || (__STDC_VERSION__ >= 199901))
-#define __min_size(x)	static (x)
-#else
-#define __min_size(x)	(x)
-#endif
-
-#if __GNUC_PREREQ__(2, 96)
-#define	__malloc_like	__attribute__((__malloc__))
-#define	__pure		__attribute__((__pure__))
-#else
-#define	__malloc_like
-#define	__pure
-#endif
-
-#if __GNUC_PREREQ__(3, 1) || (defined(__INTEL_COMPILER) && __INTEL_COMPILER >= 800)
-#define	__always_inline	__attribute__((__always_inline__))
-#else
-#define	__always_inline
-#endif
-
-#if __GNUC_PREREQ__(3, 1)
-#define	__noinline	__attribute__ ((__noinline__))
-#else
-#define	__noinline
-#endif
-
-#if __GNUC_PREREQ__(3, 3)
-#define	__nonnull(x)	__attribute__((__nonnull__(x)))
-#define	__nonnull_all	__attribute__((__nonnull__))
-#else
-#define	__nonnull(x)
-#define	__nonnull_all
-#endif
-
-#if __GNUC_PREREQ__(3, 4)
-#define	__fastcall	__attribute__((__fastcall__))
-#define	__result_use_check	__attribute__((__warn_unused_result__))
-#else
-#define	__fastcall
-#define	__result_use_check
-#endif
-
-#if __GNUC_PREREQ__(4, 1)
-#define	__returns_twice	__attribute__((__returns_twice__))
-#else
-#define	__returns_twice
-#endif
-
-#if __GNUC_PREREQ__(4, 6) || __has_builtin(__builtin_unreachable)
-#define	__unreachable()	__builtin_unreachable()
-#else
-#define	__unreachable()	((void)0)
-#endif
-
-/* XXX: should use `#if __STDC_VERSION__ < 199901'. */
-#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
-#define	__func__	NULL
-#endif
-
-#if (defined(__INTEL_COMPILER) || (defined(__GNUC__) && __GNUC__ >= 2)) && !defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901
-#define	__LONG_LONG_SUPPORTED
-#endif
-
-/* C++11 exposes a load of C99 stuff */
-#if defined(__cplusplus) && __cplusplus >= 201103L
-#define	__LONG_LONG_SUPPORTED
-#ifndef	__STDC_LIMIT_MACROS
-#define	__STDC_LIMIT_MACROS
-#endif
-#ifndef	__STDC_CONSTANT_MACROS
-#define	__STDC_CONSTANT_MACROS
-#endif
-#endif
-
-/*
- * GCC 2.95 provides `__restrict' as an extension to C90 to support the
- * C99-specific `restrict' type qualifier.  We happen to use `__restrict' as
- * a way to define the `restrict' type qualifier without disturbing older
- * software that is unaware of C99 keywords.
- */
-#if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 || defined(lint)
-#define	__restrict
-#else
-#define	__restrict	restrict
-#endif
-#endif
-
-/*
- * GNU C version 2.96 adds explicit branch prediction so that
- * the CPU back-end can hint the processor and also so that
- * code blocks can be reordered such that the predicted path
- * sees a more linear flow, thus improving cache behavior, etc.
- *
- * The following two macros provide us with a way to utilize this
- * compiler feature.  Use __predict_true() if you expect the expression
- * to evaluate to true, and __predict_false() if you expect the
- * expression to evaluate to false.
- *
- * A few notes about usage:
- *
- *	* Generally, __predict_false() error condition checks (unless
- *	  you have some _strong_ reason to do otherwise, in which case
- *	  document it), and/or __predict_true() `no-error' condition
- *	  checks, assuming you want to optimize for the no-error case.
- *
- *	* Other than that, if you don't know the likelihood of a test
- *	  succeeding from empirical or other `hard' evidence, don't
- *	  make predictions.
- *
- *	* These are meant to be used in places that are run `a lot'.
- *	  It is wasteful to make predictions in code that is run
- *	  seldomly (e.g. at subsystem initialization time) as the
- *	  basic block reordering that this affects can often generate
- *	  larger code.
- */
-#if __GNUC_PREREQ__(2, 96)
-#define	__predict_true(exp)     __builtin_expect((exp), 1)
-#define	__predict_false(exp)    __builtin_expect((exp), 0)
-#else
-#define	__predict_true(exp)     (exp)
-#define	__predict_false(exp)    (exp)
-#endif
-
-#if __GNUC_PREREQ__(4, 0)
-#define	__null_sentinel	__attribute__((__sentinel__))
-#define	__exported	__attribute__((__visibility__("default")))
-#define	__hidden	__attribute__((__visibility__("hidden")))
-#else
-#define	__null_sentinel
-#define	__exported
-#define	__hidden
-#endif
-
-/*
- * We define this here since <stddef.h>, <sys/queue.h>, and <sys/types.h>
- * require it.
- */
-#if __GNUC_PREREQ__(4, 1)
-#define	__offsetof(type, field)	 __builtin_offsetof(type, field)
-#else
-#ifndef __cplusplus
-#define	__offsetof(type, field) \
-	((__size_t)(__uintptr_t)((const volatile void *)&((type *)0)->field))
-#else
-#define	__offsetof(type, field)					\
-  (__offsetof__ (reinterpret_cast <__size_t>			\
-                 (&reinterpret_cast <const volatile char &>	\
-                  (static_cast<type *> (0)->field))))
-#endif
-#endif
-#define	__rangeof(type, start, end) \
-	(__offsetof(type, end) - __offsetof(type, start))
-
-/*
- * Given the pointer x to the member m of the struct s, return
- * a pointer to the containing structure.  When using GCC, we first
- * assign pointer x to a local variable, to check that its type is
- * compatible with member m.
- */
-#if __GNUC_PREREQ__(3, 1)
-#define	__containerof(x, s, m) ({					\
-	const volatile __typeof(((s *)0)->m) *__x = (x);		\
-	__DEQUALIFY(s *, (const volatile char *)__x - __offsetof(s, m));\
-})
-#else
-#define	__containerof(x, s, m)						\
-	__DEQUALIFY(s *, (const volatile char *)(x) - __offsetof(s, m))
-#endif
-
-/*
- * Compiler-dependent macros to declare that functions take printf-like
- * or scanf-like arguments.  They are null except for versions of gcc
- * that are known to support the features properly (old versions of gcc-2
- * didn't permit keeping the keywords out of the application namespace).
- */
-#if !__GNUC_PREREQ__(2, 7) && !defined(__INTEL_COMPILER)
-#define	__printflike(fmtarg, firstvararg)
-#define	__scanflike(fmtarg, firstvararg)
-#define	__format_arg(fmtarg)
-#define	__strfmonlike(fmtarg, firstvararg)
-#define	__strftimelike(fmtarg, firstvararg)
-#else
-#define	__printflike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
-#define	__scanflike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__scanf__, fmtarg, firstvararg)))
-#define	__format_arg(fmtarg)	__attribute__((__format_arg__ (fmtarg)))
-#define	__strfmonlike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__strfmon__, fmtarg, firstvararg)))
-#define	__strftimelike(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__strftime__, fmtarg, firstvararg)))
-#endif
-
-/* Compiler-dependent macros that rely on FreeBSD-specific extensions. */
-#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 && \
-    defined(__GNUC__) && !defined(__INTEL_COMPILER)
-#define	__printf0like(fmtarg, firstvararg) \
-	    __attribute__((__format__ (__printf0__, fmtarg, firstvararg)))
-#else
-#define	__printf0like(fmtarg, firstvararg)
-#endif
-
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-#ifndef __INTEL_COMPILER
-#define	__strong_reference(sym,aliassym)	\
-	extern __typeof (sym) aliassym __attribute__ ((__alias__ (#sym)))
-#endif
-#ifdef __STDC__
-#define	__weak_reference(sym,alias)	\
-	__asm__(".weak " #alias);	\
-	__asm__(".equ "  #alias ", " #sym)
-#define	__warn_references(sym,msg)	\
-	__asm__(".section .gnu.warning." #sym);	\
-	__asm__(".asciz \"" msg "\"");	\
-	__asm__(".previous")
-#define	__sym_compat(sym,impl,verid)	\
-	__asm__(".symver " #impl ", " #sym "@" #verid)
-#define	__sym_default(sym,impl,verid)	\
-	__asm__(".symver " #impl ", " #sym "@@" #verid)
-#else
-#define	__weak_reference(sym,alias)	\
-	__asm__(".weak alias");		\
-	__asm__(".equ alias, sym")
-#define	__warn_references(sym,msg)	\
-	__asm__(".section .gnu.warning.sym"); \
-	__asm__(".asciz \"msg\"");	\
-	__asm__(".previous")
-#define	__sym_compat(sym,impl,verid)	\
-	__asm__(".symver impl, sym@verid")
-#define	__sym_default(impl,sym,verid)	\
-	__asm__(".symver impl, sym@@verid")
-#endif	/* __STDC__ */
-#endif	/* __GNUC__ || __INTEL_COMPILER */
-
-#define	__GLOBL1(sym)	__asm__(".globl " #sym)
-#define	__GLOBL(sym)	__GLOBL1(sym)
-
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-#define	__IDSTRING(name,string)	__asm__(".ident\t\"" string "\"")
-#else
-/*
- * The following definition might not work well if used in header files,
- * but it should be better than nothing.  If you want a "do nothing"
- * version, then it should generate some harmless declaration, such as:
- *    #define	__IDSTRING(name,string)	struct __hack
- */
-#define	__IDSTRING(name,string)	static const char name[] __unused = string
-#endif
-
-/*
- * Embed the rcs id of a source file in the resulting library.  Note that in
- * more recent ELF binutils, we use .ident allowing the ID to be stripped.
- * Usage:
- *	__FBSDID("$FreeBSD: releng/11.1/sys/sys/cdefs.h 317342 2017-04-23 20:32:46Z kib $");
- */
-#ifndef	__FBSDID
-#if !defined(lint) && !defined(STRIP_FBSDID)
-#define	__FBSDID(s)	__IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-#else
-#define	__FBSDID(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__RCSID
-#ifndef	NO__RCSID
-#define	__RCSID(s)	__IDSTRING(__CONCAT(__rcsid_,__LINE__),s)
-#else
-#define	__RCSID(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__RCSID_SOURCE
-#ifndef	NO__RCSID_SOURCE
-#define	__RCSID_SOURCE(s)	__IDSTRING(__CONCAT(__rcsid_source_,__LINE__),s)
-#else
-#define	__RCSID_SOURCE(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__SCCSID
-#ifndef	NO__SCCSID
-#define	__SCCSID(s)	__IDSTRING(__CONCAT(__sccsid_,__LINE__),s)
-#else
-#define	__SCCSID(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__COPYRIGHT
-#ifndef	NO__COPYRIGHT
-#define	__COPYRIGHT(s)	__IDSTRING(__CONCAT(__copyright_,__LINE__),s)
-#else
-#define	__COPYRIGHT(s)	struct __hack
-#endif
-#endif
-
-#ifndef	__DECONST
-#define	__DECONST(type, var)	((type)(__uintptr_t)(const void *)(var))
-#endif
-
-#ifndef	__DEVOLATILE
-#define	__DEVOLATILE(type, var)	((type)(__uintptr_t)(volatile void *)(var))
-#endif
-
-#ifndef	__DEQUALIFY
-#define	__DEQUALIFY(type, var)	((type)(__uintptr_t)(const volatile void *)(var))
-#endif
-
-/*-
- * The following definitions are an extension of the behavior originally
- * implemented in <sys/_posix.h>, but with a different level of granularity.
- * POSIX.1 requires that the macros we test be defined before any standard
- * header file is included.
- *
- * Here's a quick run-down of the versions:
- *  defined(_POSIX_SOURCE)		1003.1-1988
- *  _POSIX_C_SOURCE == 1		1003.1-1990
- *  _POSIX_C_SOURCE == 2		1003.2-1992 C Language Binding Option
- *  _POSIX_C_SOURCE == 199309		1003.1b-1993
- *  _POSIX_C_SOURCE == 199506		1003.1c-1995, 1003.1i-1995,
- *					and the omnibus ISO/IEC 9945-1: 1996
- *  _POSIX_C_SOURCE == 200112		1003.1-2001
- *  _POSIX_C_SOURCE == 200809		1003.1-2008
- *
- * In addition, the X/Open Portability Guide, which is now the Single UNIX
- * Specification, defines a feature-test macro which indicates the version of
- * that specification, and which subsumes _POSIX_C_SOURCE.
- *
- * Our macros begin with two underscores to avoid namespace screwage.
- */
-
-/* Deal with IEEE Std. 1003.1-1990, in which _POSIX_C_SOURCE == 1. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 1
-#undef _POSIX_C_SOURCE		/* Probably illegal, but beyond caring now. */
-#define	_POSIX_C_SOURCE		199009
-#endif
-
-/* Deal with IEEE Std. 1003.2-1992, in which _POSIX_C_SOURCE == 2. */
-#if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE == 2
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		199209
-#endif
-
-/* Deal with various X/Open Portability Guides and Single UNIX Spec. */
-#ifdef _XOPEN_SOURCE
-#if _XOPEN_SOURCE - 0 >= 700
-#define	__XSI_VISIBLE		700
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		200809
-#elif _XOPEN_SOURCE - 0 >= 600
-#define	__XSI_VISIBLE		600
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		200112
-#elif _XOPEN_SOURCE - 0 >= 500
-#define	__XSI_VISIBLE		500
-#undef _POSIX_C_SOURCE
-#define	_POSIX_C_SOURCE		199506
-#endif
-#endif
-
-/*
- * Deal with all versions of POSIX.  The ordering relative to the tests above is
- * important.
- */
-#if defined(_POSIX_SOURCE) && !defined(_POSIX_C_SOURCE)
-#define	_POSIX_C_SOURCE		198808
-#endif
-#ifdef _POSIX_C_SOURCE
-#if _POSIX_C_SOURCE >= 200809
-#define	__POSIX_VISIBLE		200809
-#define	__ISO_C_VISIBLE		1999
-#elif _POSIX_C_SOURCE >= 200112
-#define	__POSIX_VISIBLE		200112
-#define	__ISO_C_VISIBLE		1999
-#elif _POSIX_C_SOURCE >= 199506
-#define	__POSIX_VISIBLE		199506
-#define	__ISO_C_VISIBLE		1990
-#elif _POSIX_C_SOURCE >= 199309
-#define	__POSIX_VISIBLE		199309
-#define	__ISO_C_VISIBLE		1990
-#elif _POSIX_C_SOURCE >= 199209
-#define	__POSIX_VISIBLE		199209
-#define	__ISO_C_VISIBLE		1990
-#elif _POSIX_C_SOURCE >= 199009
-#define	__POSIX_VISIBLE		199009
-#define	__ISO_C_VISIBLE		1990
-#else
-#define	__POSIX_VISIBLE		198808
-#define	__ISO_C_VISIBLE		0
-#endif /* _POSIX_C_SOURCE */
-#else
-/*-
- * Deal with _ANSI_SOURCE:
- * If it is defined, and no other compilation environment is explicitly
- * requested, then define our internal feature-test macros to zero.  This
- * makes no difference to the preprocessor (undefined symbols in preprocessing
- * expressions are defined to have value zero), but makes it more convenient for
- * a test program to print out the values.
- *
- * If a program mistakenly defines _ANSI_SOURCE and some other macro such as
- * _POSIX_C_SOURCE, we will assume that it wants the broader compilation
- * environment (and in fact we will never get here).
- */
-#if defined(_ANSI_SOURCE)	/* Hide almost everything. */
-#define	__POSIX_VISIBLE		0
-#define	__XSI_VISIBLE		0
-#define	__BSD_VISIBLE		0
-#define	__ISO_C_VISIBLE		1990
-#define	__EXT1_VISIBLE		0
-#elif defined(_C99_SOURCE)	/* Localism to specify strict C99 env. */
-#define	__POSIX_VISIBLE		0
-#define	__XSI_VISIBLE		0
-#define	__BSD_VISIBLE		0
-#define	__ISO_C_VISIBLE		1999
-#define	__EXT1_VISIBLE		0
-#elif defined(_C11_SOURCE)	/* Localism to specify strict C11 env. */
-#define	__POSIX_VISIBLE		0
-#define	__XSI_VISIBLE		0
-#define	__BSD_VISIBLE		0
-#define	__ISO_C_VISIBLE		2011
-#define	__EXT1_VISIBLE		0
-#else				/* Default environment: show everything. */
-#define	__POSIX_VISIBLE		200809
-#define	__XSI_VISIBLE		700
-#define	__BSD_VISIBLE		1
-#define	__ISO_C_VISIBLE		2011
-#define	__EXT1_VISIBLE		1
-#endif
-#endif
-
-/* User override __EXT1_VISIBLE */
-#if defined(__STDC_WANT_LIB_EXT1__)
-#undef	__EXT1_VISIBLE
-#if __STDC_WANT_LIB_EXT1__
-#define	__EXT1_VISIBLE		1
-#else
-#define	__EXT1_VISIBLE		0
-#endif
-#endif /* __STDC_WANT_LIB_EXT1__ */
-
-#if defined(__mips) || defined(__powerpc64__) || defined(__riscv__)
-#define	__NO_TLS 1
-#endif
-
-/*
- * Old versions of GCC use non-standard ARM arch symbols; acle-compat.h
- * translates them to __ARM_ARCH and the modern feature symbols defined by ARM.
- */
-#if defined(__arm__) && !defined(__ARM_ARCH)
-#include <machine/acle-compat.h>
-#endif
-
-/*
- * Nullability qualifiers: currently only supported by Clang.
- */
-#if !(defined(__clang__) && __has_feature(nullability))
-#define	_Nonnull
-#define	_Nullable
-#define	_Null_unspecified
-#define	__NULLABILITY_PRAGMA_PUSH
-#define	__NULLABILITY_PRAGMA_POP
-#else
-#define	__NULLABILITY_PRAGMA_PUSH _Pragma("clang diagnostic push")	\
-	_Pragma("clang diagnostic ignored \"-Wnullability-completeness\"")
-#define	__NULLABILITY_PRAGMA_POP _Pragma("clang diagnostic pop")
-#endif
-
-/*
- * Type Safety Checking
- *
- * Clang provides additional attributes to enable checking type safety
- * properties that cannot be enforced by the C type system. 
- */
-
-#if __has_attribute(__argument_with_type_tag__) && \
-    __has_attribute(__type_tag_for_datatype__) && !defined(lint)
-#define	__arg_type_tag(arg_kind, arg_idx, type_tag_idx) \
-	    __attribute__((__argument_with_type_tag__(arg_kind, arg_idx, type_tag_idx)))
-#define	__datatype_type_tag(kind, type) \
-	    __attribute__((__type_tag_for_datatype__(kind, type)))
-#else
-#define	__arg_type_tag(arg_kind, arg_idx, type_tag_idx)
-#define	__datatype_type_tag(kind, type)
-#endif
-
-/*
- * Lock annotations.
- *
- * Clang provides support for doing basic thread-safety tests at
- * compile-time, by marking which locks will/should be held when
- * entering/leaving a functions.
- *
- * Furthermore, it is also possible to annotate variables and structure
- * members to enforce that they are only accessed when certain locks are
- * held.
- */
-
-#if __has_extension(c_thread_safety_attributes)
-#define	__lock_annotate(x)	__attribute__((x))
-#else
-#define	__lock_annotate(x)
-#endif
-
-/* Structure implements a lock. */
-#define	__lockable		__lock_annotate(lockable)
-
-/* Function acquires an exclusive or shared lock. */
-#define	__locks_exclusive(...) \
-	__lock_annotate(exclusive_lock_function(__VA_ARGS__))
-#define	__locks_shared(...) \
-	__lock_annotate(shared_lock_function(__VA_ARGS__))
-
-/* Function attempts to acquire an exclusive or shared lock. */
-#define	__trylocks_exclusive(...) \
-	__lock_annotate(exclusive_trylock_function(__VA_ARGS__))
-#define	__trylocks_shared(...) \
-	__lock_annotate(shared_trylock_function(__VA_ARGS__))
-
-/* Function releases a lock. */
-#define	__unlocks(...)		__lock_annotate(unlock_function(__VA_ARGS__))
-
-/* Function asserts that an exclusive or shared lock is held. */
-#define	__asserts_exclusive(...) \
-	__lock_annotate(assert_exclusive_lock(__VA_ARGS__))
-#define	__asserts_shared(...) \
-	__lock_annotate(assert_shared_lock(__VA_ARGS__))
-
-/* Function requires that an exclusive or shared lock is or is not held. */
-#define	__requires_exclusive(...) \
-	__lock_annotate(exclusive_locks_required(__VA_ARGS__))
-#define	__requires_shared(...) \
-	__lock_annotate(shared_locks_required(__VA_ARGS__))
-#define	__requires_unlocked(...) \
-	__lock_annotate(locks_excluded(__VA_ARGS__))
-
-/* Function should not be analyzed. */
-#define	__no_lock_analysis	__lock_annotate(no_thread_safety_analysis)
-
-/* Guard variables and structure members by lock. */
-#define	__guarded_by(x)		__lock_annotate(guarded_by(x))
-#define	__pt_guarded_by(x)	__lock_annotate(pt_guarded_by(x))
-
-#endif /* !_SYS_CDEFS_H_ */
diff --git a/sys/include/sys/device.h b/sys/include/sys/device.h
deleted file mode 100644
index 415bff7..0000000
--- a/sys/include/sys/device.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: device.h 102 2016-01-12 03:59:34Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _DEVICE_H
-#define _DEVICE_H
-
-#include <sys/types.h>
-
-struct device_node {
-  struct device_node *prev;
-  struct device_node *next;
-  struct device_interface *devInfo;
-  struct device_resource *devRec;
-  char type;
-  int minor;
-};
-
-struct device_resource {
-  uInt8 irq;
-};
-
-struct device_interface {
-  uInt8 initialized;
-  uInt32 size;
-  int major;
-  void *info;
-  int (*read)( void *, void *, uInt32, uInt32 );
-  int (*write)( void *, void *, uInt32, uInt32 );
-  void (*reset)( void * );
-  int (*init)( void * );
-  void (*ioctl)( void * );
-  void (*stop)( void * );
-  void (*start)( void * );
-  void (*standby)( void * );
-};
-
-int device_add( int, char, struct device_interface * );
-struct device_node *device_find( int major, int minor );
-int device_remove( struct device_node * );
-#endif
-
-/***
- $Log: device.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:51  reddawg
- no message
-
- Revision 1.14  2004/08/15 00:33:02  reddawg
- Wow the ide driver works again
-
- Revision 1.13  2004/08/14 21:56:44  reddawg
- Added initialized byte to the device system to make it easy to add child devices which use parent hardware.
-
- Revision 1.12  2004/07/21 10:02:09  reddawg
- devfs: renamed functions
- device system: renamed functions
- fdc: fixed a few potential bugs and cleaned up some unused variables
- strol: fixed definition
- endtask: made it print out freepage debug info
- kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost
- ld: fixed a pointer conversion
- file: cleaned up a few unused variables
- sched: broke task deletion
- kprintf: fixed ogPrintf definition
-
- Revision 1.11  2004/05/22 02:40:04  ionix
-
-
- fixed typo in device.h and initialized previous in device.c :)
-
- Revision 1.10  2004/05/22 02:34:03  ionix
-
-
- Added proto
-
- Revision 1.9  2004/05/21 15:12:17  reddawg
- Cleaned up
-
-
- END
- ***/
-
diff --git a/sys/include/sys/device.old.h b/sys/include/sys/device.old.h
deleted file mode 100644
index 388a6ec..0000000
--- a/sys/include/sys/device.old.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: device.old.h 79 2016-01-11 16:21:27Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _DEVICE_H
-#define _DEVICE_H
-
-#include <sys/types.h>
-
-struct device {
-  struct net *net;
-  uInt16 ioAddr;
-  uInt32 irq;
-  struct ei_device *priv;
-  uInt32 mtu;
-  };
-
-struct net {
-  char mac[6];
-  char broadcast[6];
-  };
-
-struct ei_device {
-  int txStartPage;
-  int rxStartPage;
-  int stopPage;
-  int currentPage;
-  uInt16 word16;
-  uInt32 pingPong;
-  int tx1;
-  int tx2;
-  };
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/sys/dma.h b/sys/include/sys/dma.h
deleted file mode 100644
index afaabd1..0000000
--- a/sys/include/sys/dma.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: dma.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _DMA_H
-#define _DMA_H
-
-#include <sys/types.h>
-
-void dmaXfer(uInt8 channel,uInt32 address,uInt length,uInt8 read);
-void _dmaXfer(uInt8 dmaChannel,uInt8 page,uInt offset,uInt length,uInt8 mode);
-
-#endif
-
-/***
- $Log: dma.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:52  reddawg
- no message
-
- Revision 1.3  2004/05/21 15:12:17  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/sys/driver.h b/sys/include/sys/driver.h
deleted file mode 100644
index 75e85e8..0000000
--- a/sys/include/sys/driver.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: driver.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _DRIVER_H
-#define _DRIVER_H
-
-#include <ubixos/types.h>
-
-
-typedef struct devMethodType devMethod;
-
-struct devMethodType {
-  };
-
-struct driverType {
-  const char *devName;
-  devMethod *methods;
-  }
-
-
-
-
-#endif
-
-/***
- $Log: driver.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:52  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:12:17  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/sys/elf.h b/sys/include/sys/elf.h
deleted file mode 100644
index 348489a..0000000
--- a/sys/include/sys/elf.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: elf.h 171 2016-01-20 05:02:07Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _ELF_H_
-#define _ELF_H_
-
-#include <sys/types.h>
-#include <ubixos/sched.h>
-
-#define elfExecutable 0x002
-#define elfLibrary    0x003
-
-#define R_386_NONE      0 /* none    none        */
-#define R_386_32        1 /* word32  S + A       */
-#define R_386_PC32      2 /* word32  S + A - P   */
-#define R_386_GOT32     3 /* word32  G + A - P   */
-#define R_386_PLT32     4 /* word32  L + A - P   */
-#define R_386_COPY      5 /* none    none        */
-#define R_386_GLOB_DAT  6 /* word32  S           */
-#define R_386_JMP_SLOT  7 /* word32  S           */
-#define R_386_RELATIVE  8 /* word32  B + A       */
-#define R_386_GOTOFF    9 /* word32  S + A - GOT */
-#define R_386_GOTPC    10 /* word32  GOT + A - P */
-
-/* Elf Types */
-#define ET_NONE         0  // No file type
-#define ET_REL          1  // Relocatable file
-#define ET_EXEC         2  // Executable file
-#define ET_DYN          3  // Shared object file
-#define ET_CORE         4  // Core file
-#define ET_LOOS    0xfe00  // Operating System Specific
-#define ET_HIOF    0xfeff  // Operating System Specific
-#define ET_LOPROC  0xff00  // Processor Specific
-#define ET_HIPROC  0xffff  // PRocessor Specific
-/* End Elf Types */
-
-/* Elf Machine Types */
-#define EM_NONE       0  // No machine
-#define EM_M32        1  // AT&T WE 32100
-#define EM_SPARC      2  // SPARC
-#define EM_386        3  // Intel 80386
-#define EM_68K        4  // Motorola 68000
-#define EM_88K        5  // Motorola 88000
-#define EM_IAMCU      6  // Intel MCU
-#define EM_860        7  // Intel 80860
-#define EM_MIPS       8  // MIPS RS3000
-
-/* End Elf Machines Types */
-
-/* Elf Version */
-#define EV_NONE          0  // Invalid version
-#define EV_CURRENT       1  // Current version
-/* End Elf Version */
-
-/* Elf Program Header Types */
-#define PT_NULL          0
-#define PT_LOAD          1
-#define PT_DYNAMIC       2
-#define PT_INTERP  	 3
-#define PT_NOTE    	 4
-#define PT_SHLIB   	 5
-#define PT_PHDR    	 6
-#define PT_LOOS	   	 0x60000000
-#define PT_HIOS	   	 0x6fffffff
-#define PT_LOPROC  	 0x70000000
-#define PT_HIPROC  	 0x7fffffff
-#define PT_GNU_EH_FRAME	 0x6474e550
-#define PT_GNU_STACK	 (PT_LOOS + 0x474e551)
-#define PT_GNU_RELRO	 (PT_LOOS + 0x474e552)
-#define PT_PAX_FLAGS	 (PT_LOOS + 0x5041580)
-/* End Elf Program Header Types */
-
-/* ELF Identification Indexes */
-#define EI_MAG0        0 // File Identification
-#define EI_MAG1        1 // File Identification
-#define EI_MAG2        2 // File Identification
-#define EI_MAG3        3 // File Identification
-#define EI_CLASS       4 // File Class
-#define EI_DATA        5 // Data Encoding
-#define EI_VERSION     6 // File Version
-#define EI_OSABI       7 // Operating System/ABI Identification
-#define EI_ABIVERSION  8 // ABI Version
-#define EI_PAD         9 // Start Of Padding Bytes
-#define EI_NIDENT     16 // Size Of e_ident[]
-
-/* ELF Class Types */
-#define ELFCLASS_NONE 0 // Invalid Class
-#define ELFCLASS_32   1 // 32-Bit Objects
-#define EFLCLASS_64   2 // 32-Bit Objects
-
-/* ELF DATA Types */
-#define ELFDATA_NONE  0 // Invalid Data Type
-#define ELFDATA_LSB   1 // Least Significant Bit
-#define ELFDATA_MSB   2 // Most Significant Bit
-
-/* ELF OS ABI */
-#define ELFOSABI_NONE     0 // No Extensions
-#define ELFOSABI_LINUX    3 // Linux
-#define ELFOSABI_FREEBSD  9 // FreeBSD
-#define ELFOSABI_UBIXOS  17 // UbixOS
-
-/* ELF PH Flags */
-#define PF_X            0x1             /* Executable. */
-#define PF_W            0x2             /* Writable. */
-#define PF_R            0x4             /* Readable. */
-#define PF_MASKOS       0x0ff00000      /* Operating system-specific. */
-#define PF_MASKPROC     0xf0000000      /* Processor-specific. */
-
-typedef struct {
-    uInt8 eIdent[16]; /* File identification. */
-    uInt16 eType; /* File type. */
-    uInt16 eMachine; /* Machine architecture. */
-    uInt32 eVersion; /* ELF format version. */
-    uInt32 eEntry; /* Entry point. */
-    uInt32 ePhoff; /* Program header file offset. */
-    uInt32 eShoff; /* Section header file offset. */
-    uInt32 eFlags; /* Architecture-specific flags. */
-    uInt16 eEhsize; /* Size of ELF header in bytes. */
-    uInt16 ePhentsize; /* Size of program header entry. */
-    uInt16 ePhnum; /* Number of program header entries. */
-    uInt16 eShentsize; /* Size of section header entry. */
-    uInt16 eShnum; /* Number of section header entries. */
-    uInt16 eShstrndx; /* Section name strings section. */
-} elfHeader;
-
-typedef struct {
-    uInt32 phType; /* Entry type. */
-    uInt32 phOffset; /* File offset of contents. */
-    uInt32 phVaddr; /* Virtual address in memory image. */
-    uInt32 phPaddr; /* Physical address (not used). */
-    uInt32 phFilesz; /* Size of contents in file. */
-    uInt32 phMemsz; /* Size of contents in memory. */
-    uInt32 phFlags; /* Access permission flags. */
-    uInt32 phAlign; /* Alignment in memory and file. */
-} elfProgramHeader;
-
-typedef struct {
-    uInt32 shName; /* Section name (index into the section header string table). */
-    uInt32 shType; /* Section type. */
-    uInt32 shFlags; /* Section flags. */
-    uInt32 shAddr; /* Address in memory image. */
-    uInt32 shOffset; /* Offset in file. */
-    uInt32 shSize; /* Size in bytes. */
-    uInt32 shLink; /* Index of a related section. */
-    uInt32 shInfo; /* Depends on section type. */
-    uInt32 shAddralign; /* Alignment in bytes. */
-    uInt32 shEntsize; /* Size of each entry in section. */
-} elfSectionHeader;
-
-typedef struct {
-    uInt32 pltOffset;
-    uInt32 pltInfo;
-} elfPltInfo;
-
-typedef struct {
-    uInt32 dynName;
-    uInt32 dynValue;
-    uInt32 dynSize;
-    uInt32 dynInfo;
-} elfDynSym;
-
-typedef struct {
-    uInt32 dynVal;
-    uInt32 dynPtr;
-} elfDynamic;
-
-typedef struct {
-    int32_t execfd;
-    uint32_t phdr;
-    uint32_t phent;
-    uint32_t phnum;
-    uint32_t pagesz;
-    uint32_t base;
-    uint32_t flags;
-    uint32_t entry;
-    uint32_t trace;
-} Elf_Auxargs;
-
-char *elfGetShType( int );
-char *elfGetPhType( int );
-char *elfGetRelType( int );
-int elf_loadfile( kTask_t *p, const char *file, uint32_t *addr, uint32_t *entry );
-
-#define ELF32_R_SYM(i)      ((i)>>8)
-#define ELF32_R_TYPE(i)     ((unsigned char)(i))
-#define ELF32_R_INFO(s, t)  ((s)<<8+(unsigned char)(t))
-
-#endif
-
-/***
- $Log: elf.h,v $
- Revision 1.2  2006/12/15 15:43:46  reddawg
- Changes
-
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:54  reddawg
- no message
-
- Revision 1.7  2004/09/11 01:20:08  apwillia
- Clean up 'Unhandled Header' printfs when compiled in linux
-
- Revision 1.6  2004/06/16 14:04:51  reddawg
- Renamed a typedef
-
- Revision 1.5  2004/06/14 12:20:54  reddawg
- notes: many bugs repaired and ld works 100% now.
-
- Revision 1.4  2004/06/12 01:27:26  reddawg
- shared objects: yes we almost fully support shared objects
-
- Revision 1.3  2004/05/21 15:20:00  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/sys/gdt.h b/sys/include/sys/gdt.h
deleted file mode 100644
index bd795ed..0000000
--- a/sys/include/sys/gdt.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: gdt.h 204 2016-01-23 17:53:11Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _GDT_H_
-#define _GDT_H_
-
-#define SEL_GET_PL(sel)  ((sel)&3) /* Get Priority Level Of Selector */
-#define SEL_GET_LG(sel)  ((sel)&4) /* Return Local/Global Descriptor */
-#define SEL_GET_IDX(sel) (((sel)>>3) & 0x1FFF) /* Get Selector Index */
-
-#define SEL_PL_KERN 0x0
-#define SEL_PL_USER 0x3
-
-/* Descriptor Definitions */
-#define dCall 0x0C00 /* 386 Call Gate                */
-#define dCode 0x1800 /* Code Segment                 */
-#define dData 0x1000 /* Data Segment                 */
-#define dInt  0x0E00 /* 386 Interrupt Gate           */
-#define dLdt  0x200  /* Local Descriptor Table (LDT) */
-#define dTask 0x500  /* Task gate                    */
-#define dTrap 0x0F00 /* 386 Trap Gate                */
-#define dTss  0x900  /* Task State Segment (TSS)     */
-
-/* Descriptor Options */
-#define dDpl3     0x6000 /* DPL3 or mask for DPL             */
-#define dDpl2     0x4000 /* DPL2 or mask for DPL             */
-#define dDpl1     0x2000 /* DPL1 or mask for DPL             */
-#define dDpl0     0x0000 /* DPL0 or mask for DPL             */
-#define dPresent  0x8000 /* Present                          */
-#define dNpresent 0x8000 /* Not Present                      */
-#define dAcc      0x100  /* Accessed (Data or Code)          */
-#define dWrite    0x200  /* Writable (Data segments only)    */
-#define dRead     0x200  /* Readable (Code segments only)    */
-#define dBusy     0xB00  /* Busy (TSS only)    was 200       */
-#define dEexdown  0x400  /* Expand down (Data segments only) */
-#define dConform  0x400  /* Conforming (Code segments only)  */
-#define dBig      0x40   /* Default to 32 bit mode           */
-#define dBiglim   0x80   /* Limit is in 4K units             */
-
-/* GDT Descriptor */
-struct gdtDescriptor {
-    unsigned short limitLow; /* Limit 0..15    */
-    unsigned short baseLow; /* Base  0..15    */
-    unsigned char baseMed; /* Base  16..23   */
-    unsigned char access; /* Access Byte    */
-    unsigned int limitHigh :4; /* Limit 16..19   */
-    unsigned int granularity :4; /* Granularity    */
-    unsigned char baseHigh; /* Base 24..31    */
-}__attribute__ ((packed));
-
-struct gdtGate {
-    unsigned short offsetLow; /* Offset 0..15  */
-    unsigned short selector; /* Selector      */
-    unsigned short access; /* Access Flags  */
-    unsigned short offsetHigh; /* Offset 16..31 */
-}__attribute__ ((packed));
-
-union descriptorTableUnion {
-    struct gdtDescriptor descriptor; /* Normal descriptor */
-    struct gdtGate gate; /* Gate descriptor */
-    unsigned long dummy; /* Any other info */
-};
-
-#define ubixDescriptorTable(name, length) union descriptorTableUnion name[length] =
-#define ubixStandardDescriptor(base, limit, control) {.descriptor = {(limit & 0xffff), (base & 0xffff), ((base >> 16) & 0xff), ((control + dPresent) >> 8), (limit >> 16), ((control & 0xff) >> 4), (base >> 24)}}
-#define ubixGateDescriptor(offset, selector, control) {.gate = {(offset & 0xffff), selector, (control+dPresent), (offset >> 16) }}
-
-extern union descriptorTableUnion ubixGDT[11];
-
-#endif
-
-/***
- $Log: gdt.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:52  reddawg
- no message
-
- Revision 1.5  2004/08/15 16:47:49  reddawg
- Fixed
-
- Revision 1.4  2004/07/22 20:53:07  reddawg
- atkbd: fixed problem
-
- Revision 1.3  2004/05/21 15:12:17  reddawg
- Cleaned up
-
- END
- ***/
diff --git a/sys/include/sys/gen_calls.h b/sys/include/sys/gen_calls.h
deleted file mode 100644
index 62af9de..0000000
--- a/sys/include/sys/gen_calls.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: gen_calls.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _GEN_CALLS_H
-#define _GEN_CALLS_H
-
-#include <sys/thread.h>
-#include <sys/sysproto.h>
-
-int read(struct thread *td,struct read_args *uap);
-
-int getpid(struct thread *, struct getpid_args *);
-int issetugid(register struct thread *, struct issetugid_args *);
-int readlink(struct thread *,struct readlink_args *);
-int getuid(struct thread *, struct getuid_args *);
-int getgid(struct thread *, struct getgid_args *);
-int gettimeofday_new(struct thread *, struct gettimeofday_args *);
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/sys/idt.h b/sys/include/sys/idt.h
deleted file mode 100644
index 2cea10c..0000000
--- a/sys/include/sys/idt.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: idt.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _IDT_H
-#define _IDT_H
-
-#include <sys/types.h>
-#include <sys/gdt.h>
-
-#define EFLAG_TF         0x100
-#define EFLAG_IF         0x200
-#define EFLAG_IOPL3      0x3000
-#define EFLAG_VM         0x20000
-
-int idt_init();
-void setVector(void *handler, unsigned char interrupt, unsigned short controlMajor);
-void setTaskVector(uInt8 interrupt,uInt16 controlMajor,uInt8 selector);
-void intNull();
-
-void _int0();
-void _int1();
-void _int2();
-void _int3();
-void _int4();
-void _int5();
-void _int6();
-void _int7();
-void _int8();
-void _int9();
-void _int10();
-void _int11();
-void _int12();
-void _int13();
-void timerInt();
-
-#endif
-
-/***
- $Log: idt.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:52  reddawg
- no message
-
- Revision 1.5  2004/09/07 21:54:38  reddawg
- ok reverted back to old scheduling for now....
-
- Revision 1.3  2004/07/09 13:16:41  reddawg
- idt: idtInit to idt_init
- Adjusted Startup Routines
-
- Revision 1.2  2004/05/21 15:12:17  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/sys/io.h b/sys/include/sys/io.h
deleted file mode 100644
index 1fa648c..0000000
--- a/sys/include/sys/io.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: io.h 88 2016-01-12 00:11:29Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _IO_H_
-#define _IO_H_
-
-unsigned char inportByte( unsigned int );
-unsigned short inportWord( unsigned int );
-unsigned long inportDWord( unsigned int );
-
-void outportByte( unsigned int, unsigned char );
-void outportByteP( unsigned int port, unsigned char value );
-void outportWord( unsigned int, unsigned short );
-void outportDWord( unsigned int port, unsigned long value );
-
-#endif
-
-/***
- $Log: io.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:52  reddawg
- no message
-
- Revision 1.3  2004/07/22 20:14:34  reddawg
- still working here
-
- Revision 1.2  2004/05/21 15:12:17  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/sys/kern_descrip.h b/sys/include/sys/kern_descrip.h
deleted file mode 100644
index bfcddfa..0000000
--- a/sys/include/sys/kern_descrip.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kern_descrip.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _KERN_DESCRIP_H
-#define _KERN_DESCRIP_H
-
-#include <sys/thread.h>
-#include <sys/sysproto.h>
-
-#include <vfs/file.h>
-
-typedef  __mode_t        mode_t;
-typedef  __nlink_t       nlink_t;
-
-/* command values */
-#define F_DUPFD         0               /* duplicate file descriptor */
-#define F_GETFD         1               /* get file descriptor flags */
-#define F_SETFD         2               /* set file descriptor flags */
-#define F_GETFL         3               /* get file status flags */
-#define F_SETFL         4               /* set file status flags */
-#define F_GETOWN        5               /* get SIGIO/SIGURG proc/pgrp */
-#define F_SETOWN        6               /* set SIGIO/SIGURG proc/pgrp */
-#define F_GETLK         7               /* get record locking information */
-#define F_SETLK         8               /* set record locking information */
-#define F_SETLKW        9               /* F_SETLK; wait if blocked */
-
-/* Flag Values */
-#define FREAD           0x0001
-#define FWRITE          0x0002
-#define O_NONBLOCK      0x0004          /* no delay */
-#define O_APPEND        0x0008          /* set append mode */
-#define O_SHLOCK        0x0010          /* open with shared file lock */
-#define O_EXLOCK        0x0020          /* open with exclusive file lock */
-#define O_ASYNC         0x0040          /* signal pgrp when data ready */
-#define O_FSYNC         0x0080          /* synchronous writes */
-#define O_SYNC          0x0080          /* POSIX synonym for O_FSYNC */
-#define O_NOFOLLOW      0x0100          /* don't follow symlinks */
-#define O_CREAT         0x0200          /* create if nonexistent */
-#define O_TRUNC         0x0400          /* truncate to zero length */
-#define O_EXCL          0x0800          /* error if already exists */
-#define O_DIRECT        0x00010000
-#define O_RDONLY        0x0000          /* open for reading only */
-#define O_WRONLY        0x0001          /* open for writing only */
-#define O_RDWR          0x0002          /* open for reading and writing */
-#define O_ACCMODE       0x0003          /* mask for above modes */
-
-
-#define FHASLOCK        0x4000          /* descriptor holds advisory lock */
-
-
-/* F MAPPERS */
-#define FAPPEND         O_APPEND        /* kernel/compat */
-#define FASYNC          O_ASYNC         /* kernel/compat */
-#define FFSYNC          O_FSYNC         /* kernel */
-#define FNONBLOCK       O_NONBLOCK      /* kernel */
-#define FNDELAY         O_NONBLOCK      /* compat */
-#define O_NDELAY        O_NONBLOCK      /* compat */
-#define FPOSIXSHM       O_NOFOLLOW
-
-
-
-#define FCNTLFLAGS      (FAPPEND|FASYNC|FFSYNC|FNONBLOCK|FPOSIXSHM|O_DIRECT)
-
-#define FFLAGS(oflags)  ((oflags) + 1)
-#define OFLAGS(fflags)  ((fflags) - 1)
-
-struct file {
-  int f_flag;
-  char path[1024];
-  fileDescriptor *fd;
-  };
-
-/* TEMP */
-struct __timespec {
-        __time_t tv_sec;        /* seconds */
-        long    tv_nsec;        /* and nanoseconds */
-};
-
-struct stat {
-        __dev_t   st_dev;               /* inode's device */
-        ino_t     st_ino;               /* inode's number */
-        mode_t    st_mode;              /* inode protection mode */
-        nlink_t   st_nlink;             /* number of hard links */
-        uid_t     st_uid;               /* user ID of the file's owner */
-        gid_t     st_gid;               /* group ID of the file's group */
-        __dev_t   st_rdev;              /* device type */
-#if __BSD_VISIBLE
-        struct  timespec st_atimespec;  /* time of last access */
-        struct  timespec st_mtimespec;  /* time of last data modification */
-        struct  timespec st_ctimespec;  /* time of last file status change */
-#else
-        time_t    st_atime;             /* time of last access */
-        long      __st_atimensec;       /* nsec of last access */
-        time_t    st_mtime;             /* time of last data modification */
-        long      __st_mtimensec;       /* nsec of last data modification */
-        time_t    st_ctime;             /* time of last file status change */
-        long      __st_ctimensec;       /* nsec of last file status change */
-#endif
-        off_t     st_size;              /* file size, in bytes */
-        blkcnt_t st_blocks;             /* blocks allocated for file */
-        blksize_t st_blksize;           /* optimal blocksize for I/O */
-        fflags_t  st_flags;             /* user defined flags for file */
-        __uint32_t st_gen;              /* file generation number */
-        __int32_t st_lspare;
-#if __BSD_VISIBLE
-        struct timespec st_birthtimespec; /* time of file creation */
-        /*
-         * Explicitly pad st_birthtimespec to 16 bytes so that the size of
-         * struct stat is backwards compatible.  We use bitfields instead
-         * of an array of chars so that this doesn't require a C99 compiler
-         * to compile if the size of the padding is 0.  We use 2 bitfields
-         * to cover up to 64 bits on 32-bit machines.  We assume that
-         * CHAR_BIT is 8...
-         */
-        unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-        unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec));
-#else
-        time_t    st_birthtime;         /* time of file creation */
-        long      st_birthtimensec;     /* nsec of file creation */
-        unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
-        unsigned int :(8 / 2) * (16 - (int)sizeof(struct __timespec));
-#endif
-};
-
-
-int fcntl(struct thread *, struct fcntl_args *);
-int close(struct thread *,struct close_args *);
-int falloc(struct thread *, struct file **, int *);
-int getdtablesize(struct thread *, struct getdtablesize_args *);
-int fstat(struct thread *, struct fstat_args *);
-int ioctl(struct thread *, struct ioctl_args *);
-int getfd(struct thread *td,struct file **fp,int fd);
-
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/sys/kern_sig.h b/sys/include/sys/kern_sig.h
deleted file mode 100644
index dd5884b..0000000
--- a/sys/include/sys/kern_sig.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kern_sig.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _KERN_SIG_H
-#define _KERN_SIG_H
-
-#include <sys/thread.h>
-#include <sys/sysproto.h>
-
-int sigaction(struct thread *,struct sigaction_args *);
-int sigprocmask(struct thread *, struct sigprocmask_args *);
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/sys/kern_sysctl.h b/sys/include/sys/kern_sysctl.h
deleted file mode 100644
index b981b75..0000000
--- a/sys/include/sys/kern_sysctl.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kern_sysctl.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _KERNSYSCTL_H
-#define _KERNSYSCTL_H
-
-#include <sys/sysproto.h>
-#include <sys/thread.h>
-
-#define CTL_MAXNAME     24      /* largest number of components supported */
-
-/*
- * Top-level identifiers
- */
-#define CTL_UNSPEC          0           /* unused */
-#define CTL_KERN            1           /* "high kernel": proc, limits */
-#define CTL_VM              2           /* virtual memory */
-#define CTL_VFS             3           /* filesystem, mount type is next */
-#define CTL_NET             4           /* network, see socket.h */
-#define CTL_DEBUG           5           /* debugging parameters */
-#define CTL_HW              6           /* generic cpu/io */
-#define CTL_MACHDEP         7           /* machine dependent */
-#define CTL_USER            8           /* user-level */
-#define CTL_P1003_1B        9           /* POSIX 1003.1B */
-#define CTL_UBIX           10           /* ubixos */
-
-#define CTL_KERN_OPENFILES  1           /* kernel openfiles */
-
-#define EINVAL         -1               /* */
-
-struct sysctl_entry {
-  struct sysctl_entry *prev;
-  struct sysctl_entry *next;
-  struct sysctl_entry *children;
-  char                 name[32];
-  int                  id;
-  void                *value;
-  int                  val_len;
-  };
-
-int kern_sysctl(int *name,u_int namelen,void *old,size_t *oldlenp,void *new,size_t newlen,size_t *retval,int flags);
-int sysctl_add(int *,int,char *,void *,int);
-int sysctl_init();
-
-extern bool sysctl_enabled;
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/sys/pipe.h b/sys/include/sys/pipe.h
deleted file mode 100644
index 657e5ac..0000000
--- a/sys/include/sys/pipe.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: pipe.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _PIPE_H
-#define _PIPE_H
-
-#include <sys/thread.h>
-#include <sys/sysproto.h>
-
-int pipe(struct thread *, struct pipe_args *);
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/sys/signal.h b/sys/include/sys/signal.h
deleted file mode 100644
index 628e1da..0000000
--- a/sys/include/sys/signal.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: signal.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _SIGNAL_H
-#define _SIGNAL_H
-
-#include <sys/types.h>
-
-#define _SIG_WORDS      4
-#define _SIG_MAXSIG     128
-#define _SIG_IDX(sig)   ((sig) - 1)
-#define _SIG_WORD(sig)  (_SIG_IDX(sig) >> 5)
-#define _SIG_BIT(sig)   (1 << (_SIG_IDX(sig) & 31))
-#define _SIG_VALID(sig) ((sig) <= _SIG_MAXSIG && (sig) > 0)
-
-typedef struct __sigset {
-        __uint32_t __bits[_SIG_WORDS];
-  } __sigset_t;
-
-typedef __sigset_t sigset_t;
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/sys/sysproto.h b/sys/include/sys/sysproto.h
deleted file mode 100644
index e96fe4a..0000000
--- a/sys/include/sys/sysproto.h
+++ /dev/null
@@ -1,501 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sysproto.h 171 2016-01-20 05:02:07Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _SYSPROTO_H_
-#define _SYSPROTO_H_
-
-#include <sys/signal.h>
-#include <sys/thread.h>
-
-/* TEMP */
-#include <vfs/file.h>
-
-typedef int register_t;
-
-#define PAD_(t) (sizeof(register_t) <= sizeof(t) ? 0 : sizeof(register_t) - sizeof(t))
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-#define PADL_(t)        0
-#define PADR_(t)        PAD_(t)
-#else
-#define PADL_(t)        PAD_(t)
-#define PADR_(t)        0
-#endif
-
-//Protos
-struct sys_exit_args {
-    char status_l_[PADL_( int )];
-    int status;
-    char status_r_[PADR_( int )];
-};
-
-struct sys_fork_args {
-    char status_l_[PADL_( int )];
-    int status;
-    char status_r_[PADR_( int )];
-};
-
-struct sys_read_args {
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-    char buf_l_[PADL_( const void * )];
-    const void * buf;
-    char buf_r_[PADR_( const void * )];
-    char nbyte_l_[PADL_( size_t )];
-    size_t nbyte;
-    char nbyte_r_[PADR_( size_t )];
-};
-
-struct sys_write_args {
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-
-    char buf_l_[PADL_( const void * )];
-    const void * buf;
-    char buf_r_[PADR_( const void * )];
-
-    char nbyte_l_[PADL_( size_t )];
-    size_t nbyte;
-    char nbyte_r_[PADR_( size_t )];
-};
-
-struct sys_open_args {
-    char path_l_[PADL_( char * )];
-    char *path;
-    char path_r_[PADR_( char * )];
-
-    char flags_l_[PADL_( int )];
-    int flags;
-    char flags_r_[PADR_( int )];
-
-    char mode_l_[PADL_( int )];
-    int mode;
-    char mode_r_[PADR_( int )];
-};
-
-struct sys_close_args {
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-};
-
-struct sys_wait4_args {
-    char pid_l_[PADL_( int )];
-    int pid;
-    char pid_r_[PADR_( int )];
-
-    char status_l_[PADL_( int * )];
-    int *status;
-    char status_r_[PADR_( int * )];
-
-    char options_l_[PADL_( int )];
-    int options;
-    char options_r_[PADR_( int )];
-
-    char rusage_l_[PADL_( void * )];
-    void *rusage;
-    char rusage_r_[PADR_( void * )];
-};
-
-struct sys_chdir_args {
-    char path_l_[PADL_( char * )];
-    char *path;
-    char path_r_[PADR_( char * )];
-};
-
-struct sys_getcwd_args {
-    char buf_l_[PADL_( char * )];
-    char *buf;
-    char buf_r_[PADR_( char * )];
-    char size_l_[PADL_( uint32_t )];
-    uint32_t size;
-    char size_r_[PADR_( uint32_t )];
-};
-
-struct sys_setUID_args {
-    char uid_l_[PADL_( int )];
-    int uid;
-    char uid_r_[PADR_( int )];
-};
-
-struct sys_setGID_args {
-    char gid_l_[PADL_( int )];
-    int gid;
-    char gid_r_[PADR_( int )];
-};
-
-struct sys_execve_args {
-    char fname_l_[PADL_( char * )];
-    char *fname;
-    char fname_r_[PADR_( char * )];
-    char argv_l_[PADL_( char ** )];
-    char **argv;
-    char argv_r_[PADR_( char ** )];
-    char envp_l_[PADL_( char ** )];
-    char **envp;
-    char envp_r_[PADR_( char ** )];
-};
-
-struct sys_fopen_args {
-    char path_l_[PADL_( char * )];
-    char * path;
-    char path_r_[PADR_( char * )];
-    char mode_l_[PADL_( char * )];
-    char * mode;
-    char mode_r_[PADR_( char * )];
-    char FILE_l_[PADL_( userFileDescriptor * )];
-    userFileDescriptor *FILE;
-    char FILE_r_[PADR_( userFileDescriptor * )];
-};
-
-struct sys_fread_args {
-    char ptr_l_[PADL_( void * )];
-    void *ptr;
-    char ptr_r_[PADR_( void * )];
-    char size_l_[PADL_( long )];
-    long size;
-    char size_r_[PADR_( long )];
-    char nmemb_l_[PADL_( long )];
-    long nmemb;
-    char nmemb_r_[PADR_( long )];
-    char FILE_l_[PADL_( userFileDescriptor * )];
-    userFileDescriptor *FILE;
-    char FILE_r_[PADR_( userFileDescriptor * )];
-};
-
-struct sys_fclose_args {
-    char FILE_l_[PADL_( userFileDescriptor * )];
-    userFileDescriptor *FILE;
-    char FILE_r_[PADR_( userFileDescriptor * )];
-};
-
-struct sys_fgetc_args {
-    char FILE_l_[PADL_( userFileDescriptor * )];
-    userFileDescriptor *FILE;
-    char FILE_r_[PADR_( userFileDescriptor * )];
-};
-
-struct sys_fseek_args {
-    char FILE_l_[PADL_( userFileDescriptor * )];
-    userFileDescriptor *FILE;
-    char FILE_r_[PADR_( userFileDescriptor * )];
-    char offset_l_[PADL_( long )];
-    long offset;
-    char offset_r_[PADR_( long )];
-    char whence_l_[PADL_( int )];
-    int whence;
-    char whence_r_[PADR_( int )];
-};
-
-struct sys_sysctl_args {
-    char name_l_[PADL_( int * )];
-    int *name;
-    char name_r_[PADR_( int * )];
-    char namelen_l_[PADL_( u_int )];
-    u_int namelen;
-    char namelen_r_[PADR_( u_int )];
-    char oldp_l_[PADL_( void * )];
-    void *oldp;
-    char oldp_r_[PADR_( void * )];
-    char oldlenp_l_[PADL_( size_t * )];
-    size_t *oldlenp;
-    char oldlenp_r_[PADR_( size_t * )];
-    char newp_l_[PADL_( void * )];
-    void *newp;
-    char newp_r_[PADR_( void * )];
-    char newlenp_l_[PADL_( size_t )];
-    size_t newlenp;
-    char newlenp_r_[PADR_( size_t )];
-
-};
-
-/* OLD */
-
-struct setitimer_args {
-    char which_l_[PADL_( u_int )];
-    u_int which;
-    char which_r_[PADR_( u_int )];
-    char itv_l_[PADL_( struct itimerval * )];
-    struct itimerval * itv;
-    char itv_r_[PADR_( struct itimerval * )];
-    char oitv_l_[PADL_( struct itimerval * )];
-    struct itimerval * oitv;
-    char oitv_r_[PADR_( struct itimerval * )];
-};
-
-struct access_args {
-    char path_l_[PADL_( char * )];
-    char * path;
-    char path_r_[PADR_( char * )];
-    char flags_l_[PADL_( int )];
-    int flags;
-    char flags_r_[PADR_( int )];
-};
-
-struct fstatfs_args {
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-    char buf_l_[PADL_( struct statfs * )];
-    struct statfs * buf;
-    char buf_r_[PADR_( struct statfs * )];
-};
-
-struct mprotect_args {
-    char addr_l_[PADL_( const void * )];
-    const void * addr;
-    char addr_r_[PADR_( const void * )];
-    char len_l_[PADL_( size_t )];
-    size_t len;
-    char len_r_[PADR_( size_t )];
-    char prot_l_[PADL_( int )];
-    int prot;
-    char prot_r_[PADR_( int )];
-};
-
-//Old
-
-struct sysctl_args {
-    char name_l_[PADL_( int * )];
-    int * name;
-    char name_r_[PADR_( int * )];
-    char namelen_l_[PADL_( u_int )];
-    u_int namelen;
-    char namelen_r_[PADR_( u_int )];
-    char old_l_[PADL_( void * )];
-    void *old;
-    char old_r_[PADR_( void * )];
-    char oldlenp_l_[PADL_( size_t * )];
-    size_t * oldlenp;
-    char oldlenp_r_[PADR_( size_t * )];
-    char new_l_[PADL_( void * )];
-    void * new;
-    char new_r_[PADR_( void * )];
-    char newlen_l_[PADL_( size_t )];
-    size_t newlen;
-    char newlen_r_[PADR_( size_t )];
-};
-
-struct getpid_args {
-    register_t dummy;
-};
-struct issetugid_args {
-    register_t dummy;
-};
-struct fcntl_args {
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-    char cmd_l_[PADL_( int )];
-    int cmd;
-    char cmd_r_[PADR_( int )];
-    char arg_l_[PADL_( long )];
-    long arg;
-    char arg_r_[PADR_( long )];
-};
-
-struct pipe_args {
-    register_t dummy;
-};
-
-struct readlink_args {
-    char path_l_[PADL_( char * )];
-    char * path;
-    char path_r_[PADR_( char * )];
-    char buf_l_[PADL_( char * )];
-    char * buf;
-    char buf_r_[PADR_( char * )];
-    char count_l_[PADL_( int )];
-    int count;
-    char count_r_[PADR_( int )];
-};
-
-struct getuid_args {
-    register_t dummy;
-};
-
-struct getgid_args {
-    register_t dummy;
-};
-struct close_args {
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-};
-
-struct sys_mmap_args {
-    char addr_l_[PADL_( caddr_t )];
-    caddr_t addr;
-    char addr_r_[PADR_( caddr_t )];
-    char len_l_[PADL_( size_t )];
-    size_t len;
-    char len_r_[PADR_( size_t )];
-    char prot_l_[PADL_( int )];
-    int prot;
-    char prot_r_[PADR_( int )];
-    char flags_l_[PADL_( int )];
-    int flags;
-    char flags_r_[PADR_( int )];
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-    char pad_l_[PADL_( int )];
-    int pad;
-    char pad_r_[PADR_( int )];
-    char pos_l_[PADL_( off_t )];
-    off_t pos;
-    char pos_r_[PADR_( off_t )];
-};
-
-struct obreak_args {
-    char nsize_l_[PADL_( char * )];
-    char * nsize;
-    char nsize_r_[PADR_( char * )];
-};
-
-struct sigaction_args {
-    char sig_l_[PADL_( int )];
-    int sig;
-    char sig_r_[PADR_( int )];
-    char act_l_[PADL_( const struct sigaction * )];
-    const struct sigaction * act;
-    char act_r_[PADR_( const struct sigaction * )];
-    char oact_l_[PADL_( struct sigaction * )];
-    struct sigaction * oact;
-    char oact_r_[PADR_( struct sigaction * )];
-};
-
-struct getdtablesize_args {
-    register_t dummy;
-};
-
-struct munmap_args {
-    char addr_l_[PADL_( void * )];
-    void * addr;
-    char addr_r_[PADR_( void * )];
-    char len_l_[PADL_( size_t )];
-    size_t len;
-    char len_r_[PADR_( size_t )];
-};
-
-struct sigprocmask_args {
-    char how_l_[PADL_( int )];
-    int how;
-    char how_r_[PADR_( int )];
-    char set_l_[PADL_( const sigset_t * )];
-    const sigset_t * set;
-    char set_r_[PADR_( const sigset_t * )];
-    char oset_l_[PADL_( sigset_t * )];
-    sigset_t * oset;
-    char oset_r_[PADR_( sigset_t * )];
-};
-struct gettimeofday_args {
-    char tp_l_[PADL_( struct timeval * )];
-    struct timeval * tp;
-    char tp_r_[PADR_( struct timeval * )];
-    char tzp_l_[PADL_( struct timezone * )];
-    struct timezone * tzp;
-    char tzp_r_[PADR_( struct timezone * )];
-};
-struct fstat_args {
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-    char sb_l_[PADL_( struct stat * )];
-    struct stat * sb;
-    char sb_r_[PADR_( struct stat * )];
-};
-struct ioctl_args {
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-    char com_l_[PADL_( u_long )];
-    u_long com;
-    char com_r_[PADR_( u_long )];
-    char data_l_[PADL_( caddr_t )];
-    caddr_t data;
-    char data_r_[PADR_( caddr_t )];
-};
-
-struct read_args {
-    char fd_l_[PADL_( int )];
-    int fd;
-    char fd_r_[PADR_( int )];
-    char buf_l_[PADL_( void * )];
-    void * buf;
-    char buf_r_[PADR_( void * )];
-    char nbyte_l_[PADL_( size_t )];
-    size_t nbyte;
-    char nbyte_r_[PADR_( size_t )];
-};
-
-//Func Defs
-int sys_invalid( struct thread *, void * );
-int sys_exit( struct thread *, struct sys_exit_args * );
-int sys_fork( struct thread *, struct sys_fork_args * );
-int sys_read( struct thread *, struct sys_read_args * );
-int sys_write( struct thread *td, struct sys_write_args * );
-int sys_open( struct thread *td, struct sys_open_args * );
-int sys_close( struct thread *td, struct sys_close_args * );
-int sys_wait4( struct thread *td, struct sys_wait4_args * );
-int sys_chdir( struct thread *td, struct sys_chdir_args * );
-
-int sys_setUID( struct thread *td, struct sys_setUID_args * );
-int sys_getUID( struct thread *td, void * );
-int sys_setGID( struct thread *td, struct sys_setGID_args * );
-int sys_getGID( struct thread *td, void * );
-
-int sys_execve( struct thread *td, struct sys_execve_args * );
-
-int sys_fopen( struct thread *td, struct sys_fopen_args * );
-int sys_fread( struct thread *td, struct sys_fread_args * );
-int sys_fclose( struct thread *td, struct sys_fclose_args * );
-int sys_fgetc( struct thread *td, struct sys_fgetc_args * );
-int sys_fseek( struct thread *td, struct sys_fseek_args * );
-
-int sys_sched_yield( struct thread *td, void * );
-
-int sys_getcwd( struct thread *td, struct sys_getcwd_args * );
-
-int sys_mmap( struct thread *td, struct sys_mmap_args * );
-int sys_sysctl( struct thread *td, struct sys_sysctl_args * );
-
-int setitimer( struct thread *td, struct setitimer_args *uap );
-int access( struct thread *td, struct access_args *uap );
-int fstatfs( struct thread *td, struct fstatfs_args *uap );
-int mprotect( struct thread *td, struct mprotect_args *uap );
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/sys/thread.h b/sys/include/sys/thread.h
deleted file mode 100644
index 083a800..0000000
--- a/sys/include/sys/thread.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: thread.h 172 2016-01-20 13:57:36Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _THREAD_H_
-#define _THREAD_H_
-
-#include <sys/types.h>
-#include <sys/trap.h>
-
-#define O_FILES 64
-
-struct thread {
-    int td_retval[2];
-    void *o_files[O_FILES];
-    u_long vm_daddr;
-    u_long vm_dsize;
-    u_long vm_taddr;
-    u_long vm_tsize;
-    struct trapframe *frame;
-    int abi;
-};
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/sys/trap.h b/sys/include/sys/trap.h
deleted file mode 100644
index 262fa7f..0000000
--- a/sys/include/sys/trap.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: trap.h 205 2016-01-23 19:18:59Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _TRAP_H
-#define _TRAP_H
-
-#include <i386/cpu.h>
-
-struct trapframe {
-    int tf_gs;
-    int tf_fs;
-    int tf_es;
-    int tf_ds;
-    int tf_edi;
-    int tf_esi;
-    int tf_ebp;
-    int tf_isp;
-    int tf_ebx;
-    int tf_edx;
-    int tf_ecx;
-    int tf_eax;
-    int tf_trapno;
-    /* below portion defined in 386 hardware */
-    int tf_err;
-    int tf_eip;
-    int tf_cs;
-    int tf_eflags;
-    /* below only when crossing rings (e.g. user to kernel) */
-    int tf_esp;
-    int tf_ss;
-};
-
-void trap( struct trapframe * );
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/sys/tss.h b/sys/include/sys/tss.h
deleted file mode 100644
index 6cdf7ef..0000000
--- a/sys/include/sys/tss.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: tss.h 86 2016-01-11 20:33:10Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _TSS_H
-#define _TSS_H
-
-#include <sys/types.h>
-
-struct tssStruct {
-  short back_link;
-  short back_link_reserved;
-  long  esp0;
-  short ss0;
-  short ss0_reserved;
-  long  esp1;
-  short ss1;
-  short ss1_reserved;
-  long  esp2;
-  short ss2;
-  short ss2_reserved;
-  long  cr3;
-  long  eip;
-  long  eflags;
-  long  eax,ecx,edx,ebx;
-  long  esp;
-  long  ebp;
-  long  esi;
-  long  edi;
-  short es;
-  short es_reserved;
-  short cs;
-  short cs_reserved;
-  short ss;
-  short ss_reserved;
-  short ds;
-  short ds_reserved;
-  short fs;
-  short fs_reserved;
-  short gs;
-  short gs_reserved;
-  short ldt;
-  short ldt_reserved;
-  short trace_bitmap;
-  short io_map;
-  char  io_space[8192];
-  };
-
-struct i387Struct {
-  long cwd;
-  long swd;
-  long twd;
-  long fip;
-  long fcs;
-  long foo;
-  long fos;
-  long st_space[20];   /* 8*10 bytes for each FP-reg = 80 bytes */
-  };
-
-struct i386_frame {
-  uint32_t gs;
-  uint32_t fs;
-  uint32_t es;
-  uint32_t ds;
-  uint32_t ss;
-  uint32_t edi;
-  uint32_t esi;
-  uint32_t ebp;
-  uint32_t esp;
-  uint32_t ebx;
-  uint32_t edx;
-  uint32_t ecx;
-  uint32_t eax;
-  /*
-  uint32_t vector;
-  uint32_t error_code;
-  */
-  uint32_t eip;
-  uint32_t cs;
-  uint32_t flags;
-  uint32_t user_esp;
-  uint32_t user_ss;
-  };
-
-#endif
-
-/***
- $Log: tss.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:53  reddawg
- no message
-
- Revision 1.6  2004/07/27 07:42:29  reddawg
- *burp*
-
- Revision 1.5  2004/07/27 07:40:41  reddawg
- does it compile now?
-
- Revision 1.4  2004/07/27 07:27:50  reddawg
- chg: I was fooled thought we failed but it was a casting issue
-
- Revision 1.3  2004/07/22 20:53:07  reddawg
- atkbd: fixed problem
-
- Revision 1.2  2004/05/21 15:12:17  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/sys/types.h b/sys/include/sys/types.h
deleted file mode 100644
index fd73945..0000000
--- a/sys/include/sys/types.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: types.h 102 2016-01-12 03:59:34Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _SYS_TYPES_H
-#define _SYS_TYPES_H
-
-#include <sys/_types.h>
-
-#ifndef NULL
-#define NULL 0x0
-#endif
-
-/* unsigned integrals */
-typedef __uint8_t  uint8_t;
-typedef __uint16_t uint16_t;
-typedef __uint32_t uint32_t;
-typedef __uint64_t uint64_t;
-typedef __uint64_t uquad_t;
-
-/* unsigned integrals (deprecated) */
-typedef __uint8_t  u_int8_t;
-typedef __uint16_t u_int16_t;
-typedef __uint32_t u_int32_t;
-typedef __uint64_t u_int64_t;
-typedef __uint64_t u_quad_t;
-
-typedef __int64_t quad_t;
-
-typedef __int64_t       daddr_t;        /* disk address */
-typedef __uint32_t      u_daddr_t;      /* unsigned disk address */
-
-typedef unsigned char uInt8;
-typedef unsigned short uInt16;
-typedef unsigned int uInt32;
-typedef unsigned int uInt;
-typedef char Int8;
-typedef short Int16;
-typedef long Int32;
-
-
-typedef unsigned char u_char;
-typedef unsigned short u_short;
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-
-typedef int pidType;
-
-typedef int pid_t;
-typedef int size_t; /* standart */
-
-#ifndef NOBOOL
-#ifndef __cplusplus
-typedef enum {FALSE=0,TRUE=1}bool;
-#endif
-#else
-#ifndef __cplusplus
-#define FALSE 0
-#define TRUE  1
-typedef int bool;
-#endif
-#endif
-
-#ifndef _INO_T_DECLARED
-typedef __ino_t ino_t; /* inode number */
-#define _INO_T_DECLARED
-#endif
-
-#ifndef _INT8_T_DECLARED
-typedef __int8_t int8_t;
-#define _INT8_T_DECLARED
-#endif
-
-#ifndef _INT16_T_DECLARED
-typedef __int16_t int16_t;
-#define _INT16_T_DECLARED
-#endif
-
-#ifndef _INT32_T_DECLARED
-typedef __int32_t int32_t;
-#define _INT32_T_DECLARED
-#endif
-
-#ifndef _INT64_T_DECLARED
-typedef __int64_t int64_t;
-#define _INT64_T_DECLARED
-#endif
-
-typedef __ssize_t ssize_t;
-typedef char * caddr_t;
-typedef __int64_t off_t;
-typedef __uint32_t vm_offset_t;
-
-typedef __uid_t uid_t; /* user id */
-typedef __gid_t gid_t; /* group id */
-typedef __blkcnt_t blkcnt_t;
-typedef __blksize_t blksize_t;
-typedef __fflags_t fflags_t;
-
-#ifndef _TIME_T_DECLARED
-typedef __time_t time_t;
-#define _TIME_T_DECLARED
-#endif
-
-typedef uint32_t uintmax_t;
-typedef int32_t intmax_t;
-typedef int32_t ptrdiff_t;
-typedef uint32_t uintptr_t;
-
-#define __ULONG_MAX     0xffffffffUL
-#define __USHRT_MAX     0xffff          /* max value for an unsigned short */
-
-#define       ULONG_MAX       __ULONG_MAX
-#define       USHRT_MAX       __USHRT_MAX
-
-/* select a type for digits in base B: use unsigned short if they fit */
-#if ULONG_MAX == 0xffffffff && USHRT_MAX >= 0xffff
-typedef unsigned short digit;
-#else
-typedef u_long digit;
-#endif
-
-#define _QUAD_HIGHWORD 1
-#define _QUAD_LOWWORD 0
-
-#define H _QUAD_HIGHWORD
-#define L _QUAD_LOWWORD
-
-#define __CHAR_BIT 8
-#define CHAR_BIT        __CHAR_BIT
-
-#define QUAD_BITS       (sizeof(quad_t) * CHAR_BIT)
-#define LONG_BITS       (sizeof(long) * CHAR_BIT)
-#define HALF_BITS       (sizeof(long) * CHAR_BIT / 2)
-#define HHALF(x)        ((x) >> HALF_BITS)
-#define LHALF(x)        ((x) & ((1 << HALF_BITS) - 1))
-#define LHUP(x)         ((x) << HALF_BITS)
-
-typedef unsigned int qshift_t;
-
-#define B       (1 << HALF_BITS)        /* digit base */
-
-/* Combine two `digits' to make a single two-digit number. */
-#define COMBINE(a, b) (((u_long)(a) << HALF_BITS) | (b))
-
-#endif
diff --git a/sys/include/sys/uuid.h b/sys/include/sys/uuid.h
deleted file mode 100644
index 965b0a7..0000000
--- a/sys/include/sys/uuid.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * Copyright (c) 2002 Marcel Moolenaar
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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: releng/10.2/sys/sys/uuid.h 253590 2013-07-24 04:24:21Z marcel $
- */
-
-#ifndef _SYS_UUID_H_
-#define	_SYS_UUID_H_
-
-#include <sys/cdefs.h>
-#include <sys/types.h>
-
-/* Length of a node address (an IEEE 802 address). */
-#define	_UUID_NODE_LEN		6
-
-/*
- * See also:
- *      http://www.opengroup.org/dce/info/draft-leach-uuids-guids-01.txt
- *      http://www.opengroup.org/onlinepubs/009629399/apdxa.htm
- *
- * A DCE 1.1 compatible source representation of UUIDs.
- */
-struct uuid {
-	uint32_t	time_low;
-	uint16_t	time_mid;
-	uint16_t	time_hi_and_version;
-	uint8_t		clock_seq_hi_and_reserved;
-	uint8_t		clock_seq_low;
-	uint8_t		node[_UUID_NODE_LEN];
-};
-
-#ifdef _KERNEL
-
-#define	UUID_NODE_LEN	_UUID_NODE_LEN
-
-struct sbuf;
-
-struct uuid *kern_uuidgen(struct uuid *, size_t);
-
-int uuid_ether_add(const uint8_t *);
-int uuid_ether_del(const uint8_t *);
-
-int snprintf_uuid(char *, size_t, struct uuid *);
-int printf_uuid(struct uuid *);
-int sbuf_printf_uuid(struct sbuf *, struct uuid *);
-int parse_uuid(const char *, struct uuid *);
-
-void be_uuid_dec(void const *buf, struct uuid *uuid);
-void be_uuid_enc(void *buf, struct uuid const *uuid);
-void le_uuid_dec(void const *buf, struct uuid *uuid);
-void le_uuid_enc(void *buf, struct uuid const *uuid);
-
-#else	/* _KERNEL */
-
-/* XXX namespace pollution? */
-typedef struct uuid uuid_t;
-
-//__BEGIN_DECLS
-int	uuidgen(struct uuid *, int);
-//__END_DECLS
-
-#endif	/* _KERNEL */
-
-#endif /* _SYS_UUID_H_ */
diff --git a/sys/include/sys/video.h b/sys/include/sys/video.h
deleted file mode 100644
index dbcb1eb..0000000
--- a/sys/include/sys/video.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: video.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _VIDEO_H
-#define _VIDEO_H
-
-#include <sys/types.h>
-
-#define defaultColor 0x0F
-
-extern int printColor;
-
-void clearScreen();
-void kprint(char *string);
-void backSpace();
-
-#endif
-
-/***
- $Log: video.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:15  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:53  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:12:17  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/ubixfs/dirCache.h b/sys/include/ubixfs/dirCache.h
deleted file mode 100644
index c9a3ea5..0000000
--- a/sys/include/ubixfs/dirCache.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef DIRCACHE_H
-#define DIRCACHE_H
-
-/* #include "ubixfs.h" */
-#include <sys/types.h>
-
-struct cacheNode {
-  char * name;
-  struct cacheNode * prev;
-  struct cacheNode * next;
-  struct cacheNode * parent;
-  struct cacheNode * fileListHead;
-  struct cacheNode * fileListTail;
-  void             * info; 
-  int              * size;
-  int                present;
-  int                dirty;
-  uInt32           * startCluster;
-  uInt16           * attributes;
-  uInt16           * permissions;
-}; /* cacheNode */
-
-struct cacheNode * ubixfs_cacheFind(struct cacheNode *, char *);
-struct cacheNode * ubixfs_cacheNew(const char *);
-void ubixfs_cacheDelete(struct cacheNode **);
-struct cacheNode * ubixfs_cacheAdd(struct cacheNode *, struct cacheNode *);
-
-#endif /* !DIRCACHE_H */
diff --git a/sys/include/ubixfs/ubixfs.h b/sys/include/ubixfs/ubixfs.h
deleted file mode 100644
index 652957a..0000000
--- a/sys/include/ubixfs/ubixfs.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ubixfs.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _UBIXFS_H
-#define _UBIXFS_H
-
-#include <sys/types.h>
-#include <vfs/vfs.h>
-#include <sys/device.h>
-#include <mpi/mpi.h>
-#include <ubixfs/dirCache.h>
-
-
-#define UBIXFS_BLOCKSIZE_BYTES     blockSize*512
-#define UBIXFS_ALIGN(size) (size + ((((size) % (UBIXFS_BLOCKSIZE_BYTES)) == 0)? 0 : ((UBIXFS_BLOCKSIZE_BYTES) - ((size) % (UBIXFS_BLOCKSIZE_BYTES)))))
-
-#define UBIXDISKMAGIC     ((uInt32)0x45) /* The disk magic number */
-#define MAXUBIXPARTITIONS 16
-#define blockSize         8
-
-
-#define EOBC              -1
-
-
-#define typeFile      1
-#define typeContainer 2
-#define typeDirectory 4
-#define typeDeleted   8
-
-/* Start */
-struct directoryList {
-  char                  dirName[256];
-  char                 *dirCache;
-  uInt32                dirBlock;
-  struct directoryList *next;
-  struct directoryList *prev;
-  };
-
-typedef struct directoryList * dirList_t;
-
-dirList_t ubixFSLoadDir(char *);
-/* End   */
-
-//Partition Information
-struct ubixDiskLabel {
-  uInt32 magicNum;
-  uInt32 magicNum2;
-  uInt16 driveType;
-  uInt16 numPartitions;
-  struct  ubixPartitions {  //the partition table
-    uInt32 pSize;            //number of sectors in partition
-    uInt32 pOffset;          //starting sector
-    uInt32 pFsSize;          //filesystem basic fragment size
-    uInt32 pBatSize;         //BAT size
-    uInt8 pFsType;          //filesystem type, see below
-    uInt8 pFrag;            //filesystem fragments per block
-    } partitions[MAXUBIXPARTITIONS];
-  };
-
-
-struct partitionInformation {
-  uInt32 size;                 //Size In Sectors
-  uInt32 startSector;          //Base Sector Of Partition
-  uInt32 blockAllocationTable; //Base Sector Of BAT
-  uInt32 rootDirectory;        //Base Sector Of Root Directory
-  };
-
-//Block Allocation Table Entry
-struct blockAllocationTableEntry {
-  long attributes; //Block Attributes
-  long realSector; //Real Sector  
-  long nextBlock;  //Sector Of Next Block
-  long reserved;   //Reserved
-  };
-
-//UbixFS Directory Entry
-struct directoryEntry {
-  uInt32  startCluster;   //Starting Cluster Of File
-  uInt32  size;           //Size Of File
-  uInt32  creationDate;  //Date Created
-  uInt32  lastModified;  //Date Last Modified
-  uInt32  uid;           //UID Of Owner
-  uInt32  gid;           //GID Of Owner
-  uInt16 attributes;    //Files Attributes
-  uInt16 permissions;   //Files Permissions
-  char   fileName[256]; //File Name
-  };
-
-struct bootSect {
-  uInt8 jmp[4];
-  uInt8 id[6];
-  uInt16 version;
-  uInt16 tmp;
-  uInt16 fsStart;
-  uInt16 tmp2;
-  uInt32 krnl_start;
-  uInt BytesPerSector;
-  uInt SectersPerTrack;
-  uInt TotalHeads;
-  uInt32 TotalSectors;
-  uInt8 code[479];
-  };  
-
-struct ubixFSInfo {
-  struct blockAllocationTableEntry *blockAllocationTable;
-  struct cacheNode * dirCache;
-  uInt32 batEntries;
-  uInt32 rootDir;
-}; /* ubixFSInfo */
-
-int readFile(char *file);
-int writeFileByte(int ch,fileDescriptor *fd,long offset);
-//int openFileUbixFS(char *file,fileDescriptor *fd);
-int getFreeBlocks(int count,fileDescriptor *fd);
-//extern struct ubixDiskLabel *diskLabel;
-
-//Good Functions
-//void initUbixFS(struct mountPoints *mp);
-
-int readUbixFS(fileDescriptor *fd,char *data,uInt32,long size);
-int writeUbixFS(fileDescriptor *fd,char *data,long offset,long size);
-void syncBat(struct vfs_mountPoint *mp);
-int freeBlocks(int block,fileDescriptor *fd);
-int addDirEntry(struct directoryEntry *dir,fileDescriptor *fd);
-void ubixFSUnlink(char *path,struct vfs_mountPoint *mp);
-int ubixFSmkDir(char *dir,fileDescriptor *fd);
-
-int  ubixfs_init();
-int  ubixfs_initialize();
-void ubixfs_thread();
-
-
-#endif
-
-/***
- $Log: ubixfs.h,v $
- Revision 1.2  2006/12/05 14:10:21  reddawg
- Workign Distro
-
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:53  reddawg
- no message
-
- Revision 1.21  2004/09/14 20:57:01  reddawg
- Bug fixes: macro problem over opt a multiply
-
- Revision 1.20  2004/08/01 17:58:39  flameshadow
- chg: fixed string allocation bug in ubixfs_cacheNew()
-
- Revision 1.19  2004/07/27 12:02:01  reddawg
- chg: fixed marks bug readFile did a lookup which is why it looked like it was loopping so much
-
- Revision 1.18  2004/07/23 09:10:06  reddawg
- ubixfs: cleaned up some functions played with the caching a bit
- vfs:    renamed a bunch of functions
- cleaned up a few misc bugs
-
- Revision 1.17  2004/07/22 22:37:03  reddawg
- Caching is working now the FS is extremely fast but needs to be optimized to do 32bit copies over 8bit
-
- Revision 1.16  2004/07/20 21:28:16  flameshadow
- oops
-
- Revision 1.14  2004/07/20 19:36:49  reddawg
- UBU Tags
-
- Revision 1.13  2004/07/14 12:21:49  reddawg
- ubixfs: enableUbixFs to ubixfs_init
- Changed Startup Routines
-
- END
- ***/
diff --git a/sys/include/ubixos/access.h b/sys/include/ubixos/access.h
deleted file mode 100644
index 44de351..0000000
--- a/sys/include/ubixos/access.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vitals.h 54 2016-01-11 01:29:55Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _ACCESS_H_
-#define _ACCESS_H_
-
-#include <ubixos/ubthread.h>
-
-struct sys_setUID_args {
-  uint32_t uid;
-};
-
-struct sys_setGID_args {
-  uint32_t gid;
-};
-
-int sys_getUID( struct thread *, void * );
-int sys_getEUID( struct thread *, void * );
-int sys_setUID( struct thread *, struct sys_setUID_args * );
-
-int sys_getGID( struct thread *, void * );
-int sys_setGID( struct thread *, struct sys_setGID_args * );
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/ubixos/endtask.h b/sys/include/ubixos/endtask.h
deleted file mode 100644
index 8bbde73..0000000
--- a/sys/include/ubixos/endtask.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: endtask.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _ENDTASK_H
-#define _ENDTASK_H
-
-#include <sys/types.h>
-#include <ubixos/sched.h>
-
-void endTask(pidType);
-
-#endif
-
-/***
- $Log: endtask.h,v $
- Revision 1.2  2006/10/31 20:41:16  reddawg
- Includes
-
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:54  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:20:00  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/ubixos/exec.h b/sys/include/ubixos/exec.h
deleted file mode 100644
index b3fba3e..0000000
--- a/sys/include/ubixos/exec.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: exec.h 171 2016-01-20 05:02:07Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _EXEC_H
-#define _EXEC_H
-
-#include <sys/types.h>
-#include <ubixos/sched.h>
-
-uInt32 execThread( void (*tproc)( void ), uInt32, char * );
-void execFile( char *file, int argc, char **argv, int console );
-
-int sys_exec( struct thread *, char *, char **, char ** );
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/ubixos/fork.h b/sys/include/ubixos/fork.h
deleted file mode 100644
index 5369f6a..0000000
--- a/sys/include/ubixos/fork.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fork.h 145 2016-01-17 18:44:13Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _FORK_H
-#define _FORK_H
-
-#include <sys/types.h>
-#include <ubixos/sched.h>
-
-//void sysFork();
-int sysFork(struct thread *, void *);
-
-#endif
-
-/***
- $Log: fork.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:54  reddawg
- no message
-
- Revision 1.3  2004/09/11 13:06:39  reddawg
- fork: cleaned up comments in fork and made fork_copyProcess static
-
- Revision 1.2  2004/05/21 15:20:00  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/ubixos/init.h b/sys/include/ubixos/init.h
deleted file mode 100644
index 6c220a7..0000000
--- a/sys/include/ubixos/init.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: init.h 158 2016-01-19 02:08:13Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _INIT_H
-#define _INIT_H
-
-#include <vmm/vmm.h>
-#include <vfs/vfs.h>
-#include <isa/8259.h>
-#include <sys/idt.h>
-#include <ubixos/sched.h>
-#include <isa/pit.h>
-#include <isa/atkbd.h>
-#include <ubixos/time.h>
-#include <net/net.h>
-#include <isa/ne2k.h>
-#include <devfs/devfs.h>
-#include <pci/pci.h>
-#include <ubixfs/ubixfs.h>
-#include <isa/fdc.h>
-#include <ubixos/tty.h>
-#include <ufs/ufs.h>
-#include <ubixos/static.h>
-#include <pci/hd.h>
-#include <sys/kern_sysctl.h>
-#include <ubixos/vitals.h>
-#include <ubixos/syscalls.h>
-#include <pci/lnc.h>
-
-typedef int (*intFunctionPTR)( void );
-
-intFunctionPTR init_tasks[] = { vmm_init, static_constructors, i8259_init, idt_init, vitals_init, sysctl_init, vfs_init, sched_init, pit_init, atkbd_init, time_init,
-    pci_init, devfs_init, tty_init, ufs_init, initHardDisk, initLNC, net_init };
-
-//ne2k_init,
-//ubixfs_init,
-//fdc_init,
-
-int init_tasksTotal = sizeof(init_tasks) / sizeof(intFunctionPTR);
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/ubixos/kmod.h b/sys/include/ubixos/kmod.h
deleted file mode 100644
index adf8256..0000000
--- a/sys/include/ubixos/kmod.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kmod.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _KMOD_H
-#define _KMOD_H
-
-#include <sys/types.h>
-
-#define LD_START 0x1000000
-
-typedef struct kmod_struct {
-  struct kmod_struct *next;
-  struct kmod_struct *prev;
-  uInt16              id;
-  uInt16              refs;
-  uInt32              address;
-  char                name[128];
-} kmod_t;
-  
-
-uInt32 kmod_load(const char *);
-uInt32 kmod_add(const char *, const char *name);
-
-#endif
-
-/***
- $Log: kmod.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:55  reddawg
- no message
-
- Revision 1.5  2005/08/04 20:35:19  fsdfs
-
- various updates. mostly kprints, tabbing code to look cleaner
-
- Revision 1.4  2004/09/26 20:46:13  reddawg
- ok time for bed added kmod_add keeps modules listed now
-
- Revision 1.3  2004/09/26 20:40:51  reddawg
- Added baseAddr to the kmod_t
-
- Revision 1.2  2004/09/26 20:39:19  reddawg
- Added kmod struct type kmod_t
-
- Revision 1.1  2004/09/20 07:33:10  reddawg
- Start of kernel modules will make it much more flexable - These modules can be either in kernel threads or system services...
-
- END
- ***/
diff --git a/sys/include/ubixos/kpanic.h b/sys/include/ubixos/kpanic.h
deleted file mode 100644
index 9f3586b..0000000
--- a/sys/include/ubixos/kpanic.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kpanic.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _KPANIC_H
-#define _KPANIC_H
-
-#define K_PANIC(msg) kpanic("Error: (%s), File: %s, Line: %i\n",msg ,__FILE__,__LINE__);
-
-void kpanic(const char *fmt, ...);
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/ubixos/ld.h b/sys/include/ubixos/ld.h
deleted file mode 100644
index 70f5167..0000000
--- a/sys/include/ubixos/ld.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ld.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _LD_H
-#define _LD_H
-
-#include <sys/types.h>
-
-#define LD_START 0x1000000
-
-uInt32 ldEnable();
-
-#endif
-
-/***
- $Log: ld.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:55  reddawg
- no message
-
- Revision 1.10  2004/06/17 12:20:32  reddawg
- Try this now solarwind
-
- Revision 1.9  2004/06/17 02:19:29  reddawg
- Cleaning out dead code
-
- Revision 1.8  2004/06/16 17:32:14  reddawg
- Removed Dead LD Code now part of ld.so
-
- Revision 1.7  2004/06/16 17:04:13  reddawg
- ld.so: rest of the commit
-
- Revision 1.4  2004/06/13 03:05:15  reddawg
- we now have a dynamic linker
-
- Revision 1.3  2004/06/12 01:27:26  reddawg
- shared objects: yes we almost fully support shared objects
-
- Revision 1.2  2004/05/21 15:20:00  reddawg
- Cleaned up
-
- END
- ***/
diff --git a/sys/include/ubixos/lists.h b/sys/include/ubixos/lists.h
deleted file mode 100644
index ab3dedd..0000000
--- a/sys/include/ubixos/lists.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#define IN
-#define STATUS_FAILURE -1
-#define STATUS_SUCCESS 0
-
-typedef struct _item_t Item_t;
-typedef struct _list_t List_t;
-struct _item_t
-{
-	Item_t		*Previous;
-	Item_t		*Next;
-	void		*data;
-};
-
-struct _list_t
-{
-	Item_t	*First;
-	Item_t	*Last;
-};
-
-List_t * 
-InitializeList();
-Item_t *
-CreateItem();
-int
-InsertItemAtFront(	IN List_t * TList,
-			IN Item_t * kItem);
-int
-InsertItemBetweenItems(	IN List_t * TList,
-				IN Item_t * Previous,
-				IN Item_t * Next,
-				IN Item_t * Insert);
-int
-RemoveItem(	IN List_t * 	TList,
-		IN Item_t * 	kItem);
-int
-DestroyItemsInList(IN List_t * ItemList);
-int
-DestroyItemList(IN List_t * ItemList);
-Item_t *
-GetFirstItem(IN List_t * kItem);
-
-Item_t *
-GetLastItem(IN List_t * kItem);
-List_t *
-RemoveItemListBetweenItems(	IN Item_t *	Previous,
-					IN Item_t *	Next);
-
-void
-InsertItemListBetweenItems(	IN Item_t *	Previous,
-					IN Item_t *	Next,
-					IN List_t *	Insert);
diff --git a/sys/include/ubixos/sched.h b/sys/include/ubixos/sched.h
deleted file mode 100644
index b6649d7..0000000
--- a/sys/include/ubixos/sched.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sched.h 146 2016-01-17 18:55:56Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _SCHED_H
-#define _SCHED_H
-
-#include <sys/types.h>
-//#include <ubixos/elf.h>
-#include <ubixos/tty.h>
-#include <vfs/file.h>
-#include <sys/tss.h>
-#include <sys/thread.h>
-
-typedef enum {
-  PLACEHOLDER = -2, DEAD = -1, NEW = 0, READY = 1, RUNNING = 2, IDLE = 3, FORK = 4, WAIT = 5
-} tState;
-
-struct osInfo {
-  uInt8 timer;
-  uInt8 v86Task;
-  bool v86If;
-  uInt32 vmStart;
-  uInt32 stdinSize;
-  uInt32 controlKeys;
-  char *stdin;
-  char cwd[1024]; /* current working dir */
-};
-
-typedef struct taskStruct {
-  pidType id;
-  struct taskStruct *prev;
-  struct taskStruct *next;
-  struct tssStruct tss;
-  struct i387Struct i387;
-  struct osInfo oInfo;
-  fileDescriptor *imageFd;
-  tState state;
-  uint32_t gid;
-  uint32_t uid;
-  uInt16 usedMath;
-  tty_term *term;
-  struct thread td;
-} kTask_t;
-
-int sched_init();
-int sched_setStatus( pidType, tState );
-int sched_deleteTask( pidType );
-int sched_addDelTask( kTask_t * );
-kTask_t *sched_getDelTask();
-void sched_yield();
-void sched();
-
-void schedEndTask( pidType pid );
-kTask_t *schedNewTask();
-kTask_t *schedFindTask( uInt32 id );
-
-extern kTask_t *_current;
-extern kTask_t *_usedMath;
-
-#endif
-
-/***
- $Log: sched.h,v $
- Revision 1.3  2006/12/15 15:43:46  reddawg
- Changes
-
- Revision 1.2  2006/10/27 16:42:42  reddawg
- Testing
-
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:55  reddawg
- no message
-
- Revision 1.30  2004/09/11 22:21:11  reddawg
- oInfo.cwd is now an array no longer a pointer..
-
- Revision 1.29  2004/09/08 23:19:58  reddawg
- hmm
-
- Revision 1.28  2004/09/08 22:16:02  reddawg
- Fixens
-
- Revision 1.27  2004/09/08 21:19:32  reddawg
- All good now
-
- Revision 1.26  2004/09/07 21:54:38  reddawg
- ok reverted back to old scheduling for now....
-
- Revision 1.20  2004/08/09 12:58:05  reddawg
- let me know when you got the surce
-
- Revision 1.19  2004/08/06 22:43:04  reddawg
- ok
-
- Revision 1.18  2004/08/06 22:32:16  reddawg
- Ubix Works Again
-
- Revision 1.16  2004/08/04 08:17:57  reddawg
- tty: we have primative ttys try f1-f5 so it is easier to use and debug
- ubixos
-
- Revision 1.15  2004/07/29 21:32:16  reddawg
- My quick lunchs breaks worth of updates....
-
- Revision 1.14  2004/07/21 17:15:02  reddawg
- removed garbage
-
- Revision 1.13  2004/07/21 14:43:14  flameshadow
- add: added cwc (current working container) to the osInfo strut
-
- Revision 1.12  2004/07/19 02:32:21  reddawg
- sched: we now set task status to dead which then makes the scheduler do some clean it could be some minor overhead but i feel this is our most efficient approach right now to prevent corruption of the queues
-
- Revision 1.11  2004/07/19 02:08:27  reddawg
- Cleaned out the rest of debuging code also temporarily disabled the ip stack to improve boot time
-
- Revision 1.10  2004/07/18 05:24:15  reddawg
- Fixens
-
- Revision 1.9  2004/07/09 13:23:20  reddawg
- sched: schedInit to sched_init
- Adjusted initialization routines
-
- Revision 1.8  2004/06/22 14:02:14  solar
- Added the PLACEHOLDER state for a task
-
- Revision 1.7  2004/06/18 13:01:47  solar
- Added nice and timeSlice members to the kTask_t type
-
- Revision 1.6  2004/06/17 02:12:57  reddawg
- Cleaned Out Dead Code
-
- Revision 1.5  2004/06/16 14:04:51  reddawg
- Renamed a typedef
-
- Revision 1.4  2004/06/14 12:20:54  reddawg
- notes: many bugs repaired and ld works 100% now.
-
- Revision 1.3  2004/05/21 15:49:13  reddawg
- The os does better housekeeping now when a task is exited
-
- Revision 1.2  2004/05/21 15:20:00  reddawg
- Cleaned up
-
-
- END
- ***/
-
diff --git a/sys/include/ubixos/sem.h b/sys/include/ubixos/sem.h
deleted file mode 100644
index 0e648e4..0000000
--- a/sys/include/ubixos/sem.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sem.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _SEM_H
-#define _SEM_H
-
-#endif
-
-/***
- $Log: sem.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:55  reddawg
- no message
-
- Revision 1.1  2004/07/20 18:58:24  reddawg
- Few fixes
-
- END
- ***/
-
diff --git a/sys/include/ubixos/smp.h b/sys/include/ubixos/smp.h
deleted file mode 100644
index 4862656..0000000
--- a/sys/include/ubixos/smp.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: smp.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _SMP_H
-#define _SMP_H
-
-#include <sys/types.h>
-
-struct cpuinfo_t {
-  uInt8  id;
-  uInt8  ok;  // 1=Ok, 0=Bad
-  uInt8  apic_id,apic_ver;
-  uInt32 signature; // Family, Model, Stepping
-  uInt32 feature;
-  uInt32 max;
-  char   brand[49];  // Brand name
-  char   ident[17];
-  };
-
-
-void smpInit();
-void cpuidDetect();
-uInt8 cpuInfo();
-uInt32 getEflags();
-void setEflags(uInt32);
-void cpuid(uInt32,uInt32 *);
-void apicMagic();
-
-#endif
-
-/***
- $Log: smp.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:56  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:20:00  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/ubixos/spinlock.h b/sys/include/ubixos/spinlock.h
deleted file mode 100644
index 3cf8e5d..0000000
--- a/sys/include/ubixos/spinlock.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: spinlock.h 79 2016-01-11 16:21:27Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _SPINLOCK_H
-#define _SPINLOCK_H
-
-#include <sys/types.h>
-
-#define LOCKED   1
-#define UNLOCKED 0
-#define SPIN_LOCK_INITIALIZER {NULL, 0}
-#define LLOCK_FLAG (void *)1
-
-//typedef volatile int spinLock_t;
-
-struct spinLock {
-    struct spinLock *next;
-    int locked;
-};
-
-typedef struct spinLock *spinLock_t;
-
-extern struct spinLock Master;
-
-void spinLockInit(spinLock_t);
-void spinUnlock(spinLock_t);
-int spinTryLock(spinLock_t);
-void spinLock(spinLock_t);
-
-void spinLock_scheduler(spinLock_t *); /* Only use this spinlock in the sched. */
-
-int spinLockLocked(spinLock_t *);
-
-/* Atomic exchange (of various sizes) */
-static inline u_long xchg_64(volatile uint32_t *ptr, u_long x) {
-  __asm__ __volatile__("xchgq %1,%0"
-    :"+r" (x),
-    "+m" (*ptr));
-
-  return x;
-}
-
-static inline unsigned xchg_32(volatile uint32_t *ptr, uint32_t x) {
-  __asm__ __volatile__("xchgl %1,%0"
-    :"+r" (x),
-    "+m" (*ptr));
-
-  return x;
-}
-
-static inline unsigned short xchg_16(volatile uint32_t *ptr, uint16_t x) {
-  __asm__ __volatile__("xchgw %1,%0"
-    :"+r" (x),
-    "+m" (*ptr));
-
-  return x;
-}
-
-/* Test and set a bit */
-static inline char atomic_bitsetandtest(void *ptr, int x) {
-  char out;
-  __asm__ __volatile__("lock; bts %2,%1\n"
-    "sbb %0,%0\n"
-    :"=r" (out), "=m" (*(volatile long long *)ptr)
-    :"Ir" (x)
-    :"memory");
-
-  return out;
-}
-
-#endif
diff --git a/sys/include/ubixos/static.h b/sys/include/ubixos/static.h
deleted file mode 100644
index 94fe513..0000000
--- a/sys/include/ubixos/static.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _UBIXOS_STATIC_H
-#define _UBIXOS_STATIC_H
-
-int static_constructors(void);
-
-#endif
diff --git a/sys/include/ubixos/syscall.h b/sys/include/ubixos/syscall.h
deleted file mode 100644
index 2143020..0000000
--- a/sys/include/ubixos/syscall.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: syscall.h 142 2016-01-17 02:23:20Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _SYSCALL_H
-#define _SYSCALL_H
-
-#include <sys/types.h>
-
-void _sysCall();
-void _sysCall_new();
-int invalidCall();
-void invalidCallINT(int);
-
-#endif
-
-/***
- $Log: syscall.h,v $
- Revision 1.2  2006/10/26 23:52:02  reddawg
- Cleaned
-
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:56  reddawg
- no message
-
- Revision 1.3  2004/07/05 23:06:32  reddawg
- Fixens
-
- Revision 1.2  2004/05/21 15:20:00  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/ubixos/syscalls.h b/sys/include/ubixos/syscalls.h
deleted file mode 100644
index 95b3869..0000000
--- a/sys/include/ubixos/syscalls.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: syscalls.h 160 2016-01-19 04:01:03Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _SYSCALLS_H
-#define _SYSCALLS_H
-
-#include <ubixos/sched.h>
-#include <vfs/file.h>
-#include <ubixos/syscall.h>
-
-#define SYSCALLS_MAX 495
-
-#define  PSL_C           0x00000001      /* carry bit */
-#define  EJUSTRETURN     (-2)            /* don't modify regs, just return */
-#define  ERESTART        (-1)            /* restart syscall */
-
-#define ARG_COUNT(name) (sizeof(struct name) / sizeof(register_t))
-
-#define SYSCALL_INVALID 0
-#define SYSCALL_VALID   1
-#define SYSCALL_DUMMY   2
-
-typedef int sys_call_t( struct thread *, void * );
-
-struct syscall_entry {
-  int sc_args;
-  char *sc_name;
-  sys_call_t *sc_entry;
-  int sc_status;
-};
-
-/*
- *
- * Revamped Calls To C Function Style
- *
- */
-
-/*
- * Delete
- */
-
-int sysFwrite();
-
-/*
- *
- * Old Style Calls Need Updates
- *
- */
-int sysAuth();
-int sysPasswd();
-int sysAddModule();
-int sysRmModule();
-int sysGetpid();
-int sysExit();
-int sysExec();
-
-int sysCheckPid();
-int sysGetFreePage();
-
-int sysFgetc();
-int sysFopen();
-int sysFclose();
-int sysFseek();
-int sysMkDir();
-int sysRmDir();
-
-int sysSDE();
-int sysGetDrives();
-int sysGetCwd();
-int sysChDir();
-int sysGetUptime();
-int sysGetTime();
-int sysStartSDE();
-int sysUnlink();
-int sysMpiCreateMbox();
-int sysMpiDestroyMbox();
-int sysMpiPostMessage();
-int sysMpiFetchMessage();
-int sysMpiSpam();
-
-/* MrOlsen (2016-01-11) TEMP: */
-int freebsd6_mmap();
-
-typedef int (*functionPTR)();
-
-extern int totalCalls_old;
-extern functionPTR systemCalls_Old[];
-
-extern int totalCalls;
-extern struct syscall_entry systemCalls[];
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/ubixos/syscalls_new.h b/sys/include/ubixos/syscalls_new.h
deleted file mode 100644
index 9c41a52..0000000
--- a/sys/include/ubixos/syscalls_new.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: syscalls_new.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _SYSCALLS_NEW_H
-#define _SYSCALLS_NEW_H
-
-#include <sys/sysproto.h>
-
-int sysExit();
-int read();
-int getpid();
-int fcntl();
-int issetugid();
-int __sysctl();
-int pipe();
-int readlink();
-int getuid();
-int getgid();
-int close();
-int mmap();
-int obreak();
-int sigaction();
-int getdtablesize();
-int munmap();
-int sigprocmask();
-int gettimeofday_new();
-int fstat();
-int ioctl();
-
-#define  invalid_call    0x0
-#define  PSL_C           0x00000001      /* carry bit */
-#define  EJUSTRETURN     (-2)            /* don't modify regs, just return */
-#define  ERESTART        (-1)            /* restart syscall */
-
-typedef int (*functionPTR)();
-
-/*!
- * \brief Mast System Call List
- */
-functionPTR systemCalls_new[] = {
-  invalid_call,		/**   0 **/
-  sysExit,		/**   1 **/
-  invalid_call,		/**   2 **/
-  read,			/**   3 **/
-  sys_write,		/**   4 **/
-  sys_open,		/**   5 **/
-  close,		/**   6 **/
-  invalid_call,		/**   7 **/
-  invalid_call,		/** 8 **/
-  invalid_call,		/** 9 **/
-  invalid_call,		/** 10 **/
-  invalid_call,		/** 11 **/
-  invalid_call,		/** 12 **/
-  invalid_call,		/** 13 **/
-  invalid_call,		/** 14 **/
-  invalid_call,		/** 15 **/
-  invalid_call,		/** 16 **/
-  obreak,		/** 17 **/
-  invalid_call,		/** 18 **/
-  invalid_call,		/** 19 **/
-  getpid,		/** 20 **/
-  invalid_call,		/** 21 **/
-  invalid_call,		/** 22 **/
-  invalid_call,		/** 23 **/
-  getuid,		/** 24 **/
-  invalid_call,		/** 25 **/
-  invalid_call,		/** 26 **/
-  invalid_call,		/** 27 **/
-  invalid_call,		/** 28 **/
-  invalid_call,		/** 29 **/
-  invalid_call,		/** 30 **/
-  invalid_call,		/** 31 **/
-  invalid_call,		/** 32 **/
-  access,		/** 33 **/
-  invalid_call,		/** 34 **/
-  invalid_call,		/** 35 **/
-  invalid_call,		/** 36 **/
-  invalid_call,		/** 37 **/
-  invalid_call,		/** 38 **/
-  invalid_call,		/** 39 **/
-  invalid_call,		/** 40 **/
-  invalid_call,		/** 41 **/
-  pipe,			/** 42 **/
-  invalid_call,		/** 43 **/
-  invalid_call,		/** 44 **/
-  invalid_call,		/** 45 **/
-  invalid_call,		/** 46 **/
-  getgid,		/** 47 **/
-  invalid_call,		/** 48 **/
-  invalid_call,		/** 49 **/
-  invalid_call,		/** 50 **/
-  invalid_call,		/** 51 **/
-  invalid_call,		/** 52 **/
-  invalid_call,		/** 53 **/
-  ioctl,		/** 54 **/
-  invalid_call,		/** 55 **/
-  invalid_call,		/** 56 **/
-  invalid_call,		/** 57 **/
-  readlink,		/** 58 **/
-  invalid_call,		/** 59 **/
-  invalid_call,		/** 60 **/
-  invalid_call,		/** 61 **/
-  invalid_call,		/** 62 **/
-  invalid_call,		/** 63 **/
-  invalid_call,		/** 64 **/
-  invalid_call,		/** 65 **/
-  invalid_call,		/** 66 **/
-  invalid_call,		/** 67 **/
-  invalid_call,		/** 68 **/
-  invalid_call,		/** 69 **/
-  invalid_call,		/** 70 **/
-  invalid_call,		/** 71 **/
-  invalid_call,		/** 72 **/
-  munmap,		/** 73 **/
-  mprotect,		/** 74 **/
-  invalid_call,		/** 75 **/
-  invalid_call,		/** 76 **/
-  invalid_call,		/** 77 **/
-  invalid_call,		/** 78 **/
-  invalid_call,		/** 79 **/
-  invalid_call,		/** 80 **/
-  invalid_call,		/** 81 **/
-  invalid_call,		/** 82 **/
-  setitimer,		/** 83 **/
-  invalid_call,		/** 84 **/
-  invalid_call,		/** 85 **/
-  invalid_call,		/** 86 **/
-  invalid_call,		/** 87 **/
-  invalid_call,		/** 88 **/
-  getdtablesize,	/** 89 **/
-  invalid_call,		/** 90 **/
-  invalid_call,		/** 91 **/
-  fcntl,		/** 92 **/
-  invalid_call,		/** 93 **/
-  invalid_call,		/** 94 **/
-  invalid_call,		/** 95 **/
-  invalid_call,		/** 96 **/
-  invalid_call,		/** 97 **/
-  invalid_call,		/** 98 **/
-  invalid_call,		/** 99 **/
-  invalid_call,		/** 100 **/
-  invalid_call,		/** 101 **/
-  invalid_call,		/** 102 **/
-  invalid_call,		/** 103 **/
-  invalid_call,		/** 104 **/
-  invalid_call,		/** 105 **/
-  invalid_call,		/** 106 **/
-  invalid_call,		/** 107 **/
-  invalid_call,		/** 108 **/
-  invalid_call,		/** 109 **/
-  invalid_call,		/** 110 **/
-  invalid_call,		/** 111 **/
-  invalid_call,		/** 112 **/
-  invalid_call,		/** 113 **/
-  invalid_call,		/** 114 **/
-  invalid_call,		/** 115 **/
-  gettimeofday_new,	/** 116 **/
-  invalid_call,		/** 117 **/
-  invalid_call,		/** 118 **/
-  invalid_call,		/** 119 **/
-  invalid_call,		/** 120 **/
-  invalid_call,		/** 121 **/
-  invalid_call,		/** 122 **/
-  invalid_call,		/** 123 **/
-  invalid_call,		/** 124 **/
-  invalid_call,		/** 125 **/
-  invalid_call,		/** 126 **/
-  invalid_call,		/** 127 **/
-  invalid_call,		/** 128 **/
-  invalid_call,		/** 129 **/
-  invalid_call,		/** 130 **/
-  invalid_call,		/** 131 **/
-  invalid_call,		/** 132 **/
-  invalid_call,		/** 133 **/
-  invalid_call,		/** 134 **/
-  invalid_call,		/** 135 **/
-  invalid_call,		/** 136 **/
-  invalid_call,		/** 137 **/
-  invalid_call,		/** 138 **/
-  invalid_call,		/** 139 **/
-  invalid_call,		/** 140 **/
-  invalid_call,		/** 141 **/
-  invalid_call,		/** 142 **/
-  invalid_call,		/** 143 **/
-  invalid_call,		/** 144 **/
-  invalid_call,		/** 145 **/
-  invalid_call,		/** 146 **/
-  invalid_call,		/** 147 **/
-  invalid_call,		/** 148 **/
-  invalid_call,		/** 149 **/
-  invalid_call,		/** 150 **/
-  invalid_call,		/** 151 **/
-  invalid_call,		/** 152 **/
-  invalid_call,		/** 153 **/
-  invalid_call,		/** 154 **/
-  invalid_call,		/** 155 **/
-  invalid_call,		/** 156 **/
-  invalid_call,		/** 157 **/
-  invalid_call,		/** 158 **/
-  invalid_call,		/** 159 **/
-  invalid_call,		/** 160 **/
-  invalid_call,		/** 161 **/
-  invalid_call,		/** 162 **/
-  invalid_call,		/** 163 **/
-  invalid_call,		/** 164 **/
-  invalid_call,		/** 165 **/
-  invalid_call,		/** 166 **/
-  invalid_call,		/** 167 **/
-  invalid_call,		/** 168 **/
-  invalid_call,		/** 169 **/
-  invalid_call,		/** 170 **/
-  invalid_call,		/** 171 **/
-  invalid_call,		/** 172 **/
-  invalid_call,		/** 173 **/
-  invalid_call,		/** 174 **/
-  invalid_call,		/** 175 **/
-  invalid_call,		/** 176 **/
-  invalid_call,		/** 177 **/
-  invalid_call,		/** 178 **/
-  invalid_call,		/** 179 **/
-  invalid_call,		/** 180 **/
-  invalid_call,		/** 181 **/
-  invalid_call,		/** 182 **/
-  invalid_call,		/** 183 **/
-  invalid_call,		/** 184 **/
-  invalid_call,		/** 185 **/
-  invalid_call,		/** 186 **/
-  invalid_call,		/** 187 **/
-  invalid_call,		/** 188 **/
-  fstat,		/** 189 **/
-  invalid_call,		/** 190 **/
-  invalid_call,		/** 191 **/
-  invalid_call,		/** 192 **/
-  invalid_call,		/** 193 **/
-  invalid_call,		/** 194 **/
-  invalid_call,		/** 195 **/
-  invalid_call,		/** 196 **/
-  mmap,			/** 197 **/
-  invalid_call,		/** 198 **/
-  invalid_call,		/** 199 **/
-  invalid_call,		/** 200 **/
-  invalid_call,		/** 201 **/
-  __sysctl,		/** 202 **/
-  invalid_call,		/** 203 **/
-  invalid_call,		/** 204 **/
-  invalid_call,		/** 205 **/
-  invalid_call,		/** 206 **/
-  invalid_call,		/** 207 **/
-  invalid_call,		/** 208 **/
-  invalid_call,		/** 209 **/
-  invalid_call,		/** 210 **/
-  invalid_call,		/** 211 **/
-  invalid_call,		/** 212 **/
-  invalid_call,		/** 213 **/
-  invalid_call,		/** 214 **/
-  invalid_call,		/** 215 **/
-  invalid_call,		/** 216 **/
-  invalid_call,		/** 217 **/
-  invalid_call,		/** 218 **/
-  invalid_call,		/** 219 **/
-  invalid_call,		/** 220 **/
-  invalid_call,		/** 221 **/
-  invalid_call,		/** 222 **/
-  invalid_call,		/** 223 **/
-  invalid_call,		/** 224 **/
-  invalid_call,		/** 225 **/
-  invalid_call,		/** 226 **/
-  invalid_call,		/** 227 **/
-  invalid_call,		/** 228 **/
-  invalid_call,		/** 229 **/
-  invalid_call,		/** 230 **/
-  invalid_call,		/** 231 **/
-  invalid_call,		/** 232 **/
-  invalid_call,		/** 233 **/
-  invalid_call,		/** 234 **/
-  invalid_call,		/** 235 **/
-  invalid_call,		/** 236 **/
-  invalid_call,		/** 237 **/
-  invalid_call,		/** 238 **/
-  invalid_call,		/** 239 **/
-  invalid_call,		/** 240 **/
-  invalid_call,		/** 241 **/
-  invalid_call,		/** 242 **/
-  invalid_call,		/** 243 **/
-  invalid_call,		/** 244 **/
-  invalid_call,		/** 245 **/
-  invalid_call,		/** 246 **/
-  invalid_call,		/** 247 **/
-  invalid_call,		/** 248 **/
-  invalid_call,		/** 249 **/
-  invalid_call,		/** 250 **/
-  invalid_call,		/** 251 **/
-  invalid_call,		/** 252 **/
-  issetugid,		/** 253 **/
-  invalid_call,		/** 254 **/
-  invalid_call,		/** 255 **/
-  invalid_call,		/** 256 **/
-  invalid_call,		/** 257 **/
-  invalid_call,		/** 258 **/
-  invalid_call,		/** 259 **/
-  invalid_call,		/** 260 **/
-  invalid_call,		/** 261 **/
-  invalid_call,		/** 262 **/
-  invalid_call,		/** 263 **/
-  invalid_call,		/** 264 **/
-  invalid_call,		/** 265 **/
-  invalid_call,		/** 266 **/
-  invalid_call,		/** 267 **/
-  invalid_call,		/** 268 **/
-  invalid_call,		/** 269 **/
-  invalid_call,		/** 270 **/
-  invalid_call,		/** 271 **/
-  invalid_call,		/** 272 **/
-  invalid_call,		/** 273 **/
-  invalid_call,		/** 274 **/
-  invalid_call,		/** 275 **/
-  invalid_call,		/** 276 **/
-  invalid_call,		/** 277 **/
-  invalid_call,		/** 278 **/
-  invalid_call,		/** 279 **/
-  invalid_call,		/** 280 **/
-  invalid_call,		/** 281 **/
-  invalid_call,		/** 282 **/
-  invalid_call,		/** 283 **/
-  invalid_call,		/** 284 **/
-  invalid_call,		/** 285 **/
-  invalid_call,		/** 286 **/
-  invalid_call,		/** 287 **/
-  invalid_call,		/** 288 **/
-  invalid_call,		/** 289 **/
-  invalid_call,		/** 290 **/
-  invalid_call,		/** 291 **/
-  invalid_call,		/** 292 **/
-  invalid_call,		/** 293 **/
-  invalid_call,		/** 294 **/
-  invalid_call,		/** 295 **/
-  invalid_call,		/** 296 **/
-  invalid_call,		/** 297 **/
-  invalid_call,		/** 298 **/
-  invalid_call,		/** 299 **/
-  invalid_call,		/** 300 **/
-  invalid_call,		/** 301 **/
-  invalid_call,		/** 302 **/
-  invalid_call,		/** 303 **/
-  invalid_call,		/** 304 **/
-  invalid_call,		/** 305 **/
-  invalid_call,		/** 306 **/
-  invalid_call,		/** 307 **/
-  invalid_call,		/** 308 **/
-  invalid_call,		/** 309 **/
-  invalid_call,		/** 310 **/
-  invalid_call,		/** 311 **/
-  invalid_call,		/** 312 **/
-  invalid_call,		/** 313 **/
-  invalid_call,		/** 314 **/
-  invalid_call,		/** 315 **/
-  invalid_call,		/** 316 **/
-  invalid_call,		/** 317 **/
-  invalid_call,		/** 318 **/
-  invalid_call,		/** 319 **/
-  invalid_call,		/** 320 **/
-  invalid_call,		/** 321 **/
-  invalid_call,		/** 322 **/
-  invalid_call,		/** 323 **/
-  invalid_call,		/** 324 **/
-  invalid_call,		/** 325 **/
-  invalid_call,		/** 326 **/
-  invalid_call,		/** 327 **/
-  invalid_call,		/** 328 **/
-  invalid_call,		/** 329 **/
-  invalid_call,		/** 330 **/
-  invalid_call,		/** 331 **/
-  invalid_call,		/** 332 **/
-  invalid_call,		/** 333 **/
-  invalid_call,		/** 334 **/
-  invalid_call,		/** 335 **/
-  invalid_call,		/** 336 **/
-  invalid_call,		/** 337 **/
-  invalid_call,		/** 338 **/
-  invalid_call,		/** 339 **/
-  sigprocmask,		/** 340 **/
-  invalid_call,		/** 341 **/
-  invalid_call,		/** 342 **/
-  invalid_call,		/** 343 **/
-  invalid_call,		/** 344 **/
-  invalid_call,		/** 345 **/
-  invalid_call,		/** 346 **/
-  invalid_call,		/** 347 **/
-  invalid_call,		/** 348 **/
-  invalid_call,		/** 349 **/
-  invalid_call,		/** 350 **/
-  invalid_call,		/** 351 **/
-  invalid_call,		/** 352 **/
-  invalid_call,		/** 353 **/
-  invalid_call,		/** 354 **/
-  invalid_call,		/** 355 **/
-  invalid_call,		/** 356 **/
-  invalid_call,		/** 357 **/
-  invalid_call,		/** 358 **/
-  invalid_call,		/** 359 **/
-  invalid_call,		/** 360 **/
-  invalid_call,		/** 361 **/
-  invalid_call,		/** 362 **/
-  invalid_call,		/** 363 **/
-  invalid_call,		/** 364 **/
-  invalid_call,		/** 365 **/
-  invalid_call,		/** 366 **/
-  invalid_call,		/** 367 **/
-  invalid_call,		/** 368 **/
-  invalid_call,		/** 369 **/
-  invalid_call,		/** 370 **/
-  invalid_call,		/** 371 **/
-  invalid_call,		/** 372 **/
-  invalid_call,		/** 373 **/
-  invalid_call,		/** 374 **/
-  invalid_call,		/** 375 **/
-  invalid_call,		/** 376 **/
-  invalid_call,		/** 377 **/
-  invalid_call,		/** 378 **/
-  invalid_call,		/** 379 **/
-  invalid_call,		/** 380 **/
-  invalid_call,		/** 381 **/
-  invalid_call,		/** 382 **/
-  invalid_call,		/** 383 **/
-  invalid_call,		/** 384 **/
-  invalid_call,		/** 385 **/
-  invalid_call,		/** 386 **/
-  invalid_call,		/** 387 **/
-  invalid_call,		/** 388 **/
-  invalid_call,		/** 389 **/
-  invalid_call,		/** 390 **/
-  invalid_call,		/** 391 **/
-  invalid_call,		/** 392 **/
-  invalid_call,		/** 393 **/
-  invalid_call,		/** 394 **/
-  invalid_call,		/** 395 **/
-  invalid_call,		/** 396 **/
-  fstatfs,		/** 397 **/
-  invalid_call,		/** 398 **/
-  invalid_call,		/** 399 **/
-  invalid_call,		/** 400 **/
-  invalid_call,		/** 401 **/
-  invalid_call,		/** 402 **/
-  invalid_call,		/** 403 **/
-  invalid_call,		/** 404 **/
-  invalid_call,		/** 405 **/
-  invalid_call,		/** 406 **/
-  invalid_call,		/** 407 **/
-  invalid_call,		/** 408 **/
-  invalid_call,		/** 409 **/
-  invalid_call,		/** 410 **/
-  invalid_call,		/** 411 **/
-  invalid_call,		/** 412 **/
-  invalid_call,		/** 413 **/
-  invalid_call,		/** 414 **/
-  invalid_call,		/** 415 **/
-  sigaction,		/** 416 **/
-  invalid_call,		/** 417 **/
-  invalid_call,		/** 418 **/
-  invalid_call,		/** 419 **/
-  invalid_call,		/** 420 **/
-  invalid_call,		/** 421 **/
-  invalid_call,		/** 422 **/
-  invalid_call,		/** 423 **/
-  invalid_call,		/** 424 **/
-  invalid_call,		/** 425 **/
-  invalid_call,		/** 426 **/
-  invalid_call,		/** 427 **/
-  invalid_call,		/** 428 **/
-  invalid_call,		/** 429 **/
-  invalid_call,		/** 430 **/
-  invalid_call,		/** 431 **/
-  invalid_call,		/** 432 **/
-  invalid_call,		/** 433 **/
-  invalid_call,		/** 434 **/
-  invalid_call,		/** 435 **/
-  invalid_call,		/** 436 **/
-  invalid_call,		/** 437 **/
-  invalid_call,		/** 438 **/
-  invalid_call,		/** 439 **/
-  invalid_call,		/** 440 **/
-  invalid_call,		/** 441 **/
-  invalid_call,		/** 442 **/
-  invalid_call,		/** 443 **/
-  invalid_call,		/** 444 **/
-  invalid_call,		/** 445 **/
-  invalid_call,		/** 446 **/
-  invalid_call,		/** 447 **/
-  invalid_call,		/** 448 **/
-  invalid_call,		/** 449 **/
-  invalid_call,		/** 450 **/
-  invalid_call,		/** 451 **/
-  invalid_call,		/** 452 **/
-  invalid_call,		/** 453 **/
-  invalid_call,		/** 454 **/
-  invalid_call,		/** 455 **/
-  };
-
-int totalCalls_new = sizeof(systemCalls_new)/sizeof(functionPTR);
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/ubixos/systemtask.h b/sys/include/ubixos/systemtask.h
deleted file mode 100644
index 0f9a4c8..0000000
--- a/sys/include/ubixos/systemtask.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: systemtask.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _SYSTEMTASK_H
-#define _SYSTEMTASK_H
-
-#include <sys/types.h>
-
-void systemTask();
-
-#endif
-
-/***
- $Log: systemtask.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:56  reddawg
- no message
-
- Revision 1.2  2004/06/04 17:49:32  reddawg
- Wont work with out the makefile updated
-
- Revision 1.1  2004/06/04 17:33:33  reddawg
- Changed idle task to system task
-
- Revision 1.2  2004/05/21 15:20:00  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/ubixos/time.h b/sys/include/ubixos/time.h
deleted file mode 100644
index 6ad86ff..0000000
--- a/sys/include/ubixos/time.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: time.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _TIME_H
-#define _TIME_H
-
-#include <sys/types.h>
-#include <sys/io.h>
-
-typedef long suseconds_t;
-
-#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
-
-#define MINUTE 60
-#define HOUR (60*MINUTE)
-#define DAY (24*HOUR)
-#define YEAR (365*DAY)
-
-#ifndef _TIME_T_DECLARED
-typedef __time_t        time_t;
-#define _TIME_T_DECLARED
-#endif
-
-struct timespec {
-        time_t  tv_sec;         /* seconds */
-        long    tv_nsec;        /* and nanoseconds */
-};
-
-
-
-struct timeStruct {
-  int sec;
-  int min;
-  int hour;
-  int day;
-  int mon;
-  int year;
-  };
-
-
-struct timezone {
-  int     tz_minuteswest; /* minutes west of Greenwich */
-  int     tz_dsttime;     /* type of dst correction */
-  };
-
-struct timeval {
-  long            tv_sec;         /* seconds (XXX should be time_t) */
-  suseconds_t     tv_usec;        /* and microseconds */
-  };
-
-int gettimeofday(struct timeval *tp,struct timezone *tzp);
-
-
-
-int time_init();
-uInt32 timeMake(struct timeStruct *time);
-
-#endif
-
-/***
- $Log: time.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:56  reddawg
- no message
-
- Revision 1.4  2004/07/09 13:37:30  reddawg
- time: timeInit to time_init
- Adjusted initialization routines
-
- Revision 1.3  2004/06/29 11:41:44  reddawg
- Fixed some global variables
-
- Revision 1.2  2004/05/21 15:20:00  reddawg
- Cleaned up
-
- END
- ***/
diff --git a/sys/include/ubixos/times.h b/sys/include/ubixos/times.h
deleted file mode 100644
index 9736c20..0000000
--- a/sys/include/ubixos/times.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: times.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _TIMES_H
-#define _TIMES_H
-
-#include <sys/types.h>
-
-#ifndef _CLOCK_T_DECLARED
-typedef __clock_t       clock_t;
-#define _CLOCK_T_DECLARED
-#endif
-
-struct tms {
-        clock_t tms_utime;      /* User CPU time */
-        clock_t tms_stime;      /* System CPU time */
-        clock_t tms_cutime;     /* User CPU time of terminated child procs */
-        clock_t tms_cstime;     /* System CPU time of terminated child procs */
-};
-
-#endif
-
-/***
- $Log: times.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:57  reddawg
- no message
-
- Revision 1.2  2004/05/21 15:20:00  reddawg
- Cleaned up
-
-
- END
- ***/
diff --git a/sys/include/ubixos/tty.h b/sys/include/ubixos/tty.h
deleted file mode 100644
index 3923ed1..0000000
--- a/sys/include/ubixos/tty.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: tty.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _TTY_H
-#define _TTY_H
-
-#include <sys/types.h>
-
-#define TTY_MAX_TERMS 5
-
-typedef struct tty_termNode {
-  char    *tty_buffer;
-  char    *tty_pointer;
-  uInt8    tty_colour;
-  uInt16   tty_x;
-  uInt16   tty_y;
-  pidType  owner;
-  char     stdin[512];
-  int      stdinSize;
-  } tty_term;
-
-int tty_init();
-int tty_change(uInt16);
-tty_term *tty_find(uInt16);
-int tty_print(char *,tty_term *);
-
-extern tty_term *tty_foreground;
-
-#endif
-
-/***
- $Log: tty.h,v $
- Revision 1.1.1.1  2006/06/01 12:46:14  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:23:57  reddawg
- no message
-
- Revision 1.8  2004/09/06 22:11:29  reddawg
- tty: now each tty has a stdin....
-
- Revision 1.7  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.6  2004/08/09 12:58:05  reddawg
- let me know when you got the surce
-
- Revision 1.5  2004/08/09 05:40:31  reddawg
- tty: removed current and made a foreground
-
- Revision 1.4  2004/08/06 22:32:16  reddawg
- Ubix Works Again
-
- Revision 1.2  2004/08/04 08:17:57  reddawg
- tty: we have primative ttys try f1-f5 so it is easier to use and debug
-      ubixos
-
- Revision 1.1  2004/08/03 21:44:24  reddawg
- ttys
-
- END
- ***/
-
diff --git a/sys/include/ubixos/ubthread.h b/sys/include/ubixos/ubthread.h
deleted file mode 100644
index 88a1324..0000000
--- a/sys/include/ubixos/ubthread.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ubthread.h 79 2016-01-11 16:21:27Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _UBTHREAD_H
-#define _UBTHREAD_H
-
-#include <sys/types.h>
-#include <stdatomic.h>
-#include <ubixos/sched.h>
-#include <ubixos/time.h>
-
-#ifndef ETIMEDOUT
-#define ETIMEDOUT -1
-#endif
-
-#define LOCKED     1
-#define UNLOCKED   0
-
-typedef struct ubthread *ubthread_t;
-typedef struct ubthread_cond *ubthread_cond_t;
-typedef struct ubthread_mutex *ubthread_mutex_t;
-
-struct ubthread {
-    kTask_t *task;
-};
-
-struct ubthread_cond {
-    int id;
-    bool lock;
-};
-
-struct ubthread_mutex {
-    int id;
-    bool lock;
-    pidType pid;
-};
-
-struct ubthread_list {
-    struct ubthread_list *next;
-    ubthread_t thread;
-};
-
-struct ubthread_cond_list {
-    struct ubthread_cond_list *next;
-    ubthread_cond_t *cond;
-};
-
-struct ubthread_mutex_list {
-    struct ubthread_mutex_list *next;
-    ubthread_mutex_t *mutex;
-};
-
-kTask_t *ubthread_self();
-int ubthread_cond_init(ubthread_cond_t *cond, const uInt32 attr);
-int ubthread_mutex_init(ubthread_mutex_t *mutex, const uInt32 attr);
-int ubthread_cond_destroy(ubthread_cond_t *cond);
-int ubthread_mutex_destroy(ubthread_mutex_t *mutex);
-int ubthread_create(kTask_t **thread, const uInt32 *attr, void (*tproc)(void), void *arg);
-int ubthread_mutex_lock(ubthread_mutex_t *mutex);
-int ubthread_mutex_unlock(ubthread_mutex_t *mutex);
-int ubthread_cond_timedwait(ubthread_cond_t *cond, ubthread_mutex_t *mutex, const struct timespec *abstime);
-int ubthread_cond_wait(ubthread_cond_t *cond, ubthread_mutex_t *mutex);
-int ubthread_cond_signal(ubthread_cond_t *cond);
-int ubthread_cond_broadcast(ubthread_cond_t *cond);
-
-#endif
diff --git a/sys/include/ubixos/vitals.h b/sys/include/ubixos/vitals.h
deleted file mode 100644
index 02eaf8f..0000000
--- a/sys/include/ubixos/vitals.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vitals.h 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _VITALS_H
-#define _VITALS_H
-
-//#include <ubixos/types.h>
-#include <ubixos/ubthread.h>
-//#include <vfs/mount.h>
-#include <vfs/vfs.h>
-
-typedef struct vitalsStruct {
-  uInt32                 openFiles;
-  uInt32                 sysTicks;
-  uInt32                 sysUptime;
-  uInt32                 quantum;
-  uInt32                 dQuantum;
-  uInt32                 freePages;
-  struct fileSystem     *fileSystems;
-  struct vfs_mountPoint *mountPoints;
-  uInt32                 timeStart;
-  void                  *screen;
-  void                  *font;
-  char                  *packet;
-  uInt32                 packetLength;
-  } vitalsNode;
-
-extern vitalsNode *systemVitals;
-
-int vitals_init();
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/ufs/ffs.h b/sys/include/ufs/ffs.h
deleted file mode 100644
index 76790c7..0000000
--- a/sys/include/ufs/ffs.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ffs.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _FFS_H
-#define _FFS_H
-
-#include <sys/types.h>
-#include <vfs/vfs.h>
-#include <sys/device.h>
-
-int ffs_read(fileDescriptor *,char *,uInt32,long);
-
-#endif
-
-/***
- END
- ***/
-
diff --git a/sys/include/ufs/ufs.h b/sys/include/ufs/ufs.h
deleted file mode 100644
index e17c93c..0000000
--- a/sys/include/ufs/ufs.h
+++ /dev/null
@@ -1,280 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2017 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ufs.h 141 2016-01-17 02:05:18Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _UFS_H
-#define _UFS_H
-
-#include <sys/types.h>
-#include <vfs/vfs.h>
-#include <sys/device.h>
-
-#define DT_REG        8
-#define MAXNAMLEN     255
-#define ROOTINO       ((ino_t)2)
-#define DT_DIR        4
-#define DEV_BSHIFT    9               /* log2(DEV_BSIZE) */
-#define DEV_BSIZE     (1<<DEV_BSHIFT)
-#define SBLOCK_FLOPPY 0
-#define SBLOCK_UFS1   8192
-#define SBLOCK_UFS2   65536
-#define SBLOCK_PIGGY  262144
-#define SBLOCKSIZE    8192
-#define SBLOCKSEARCH  { SBLOCK_UFS2, SBLOCK_UFS1, SBLOCK_FLOPPY, SBLOCK_PIGGY, -1 }
-#define FS_UFS1_MAGIC 0x011954        /* UFS1 fast filesystem magic number */
-#define FS_UFS2_MAGIC 0x19540119      /* UFS2 fast filesystem magic number */
-#define MAXMNTLEN     468
-#define MAXVOLLEN     32
-#define NOCSPTRS      ((128 / sizeof(void *)) - 4)
-#define FSMAXSNAP     20
-#define MAXBSIZE      65536
-#define NINDIR(fs)    ((fs)->fs_nindir)
-
-/*
- * Cylinder group macros to locate things in cylinder groups.
- * They calc filesystem addresses of cylinder group data structures.
- */
-#define cgbase(fs, c)   (((ufs2_daddr_t)(fs)->fs_fpg) * (c))
-#define cgdmin(fs, c)   (cgstart(fs, c) + (fs)->fs_dblkno)      /* 1st data */
-#define cgimin(fs, c)   (cgstart(fs, c) + (fs)->fs_iblkno)      /* inode blk */
-#define cgsblock(fs, c) (cgstart(fs, c) + (fs)->fs_sblkno)      /* super blk */
-#define cgtod(fs, c)    (cgstart(fs, c) + (fs)->fs_cblkno)      /* cg block */
-#define cgstart(fs, c)  ((fs)->fs_magic == FS_UFS2_MAGIC ? cgbase(fs, c) : (cgbase(fs, c) + (fs)->fs_old_cgoffset * ((c) & ~((fs)->fs_old_cgmask))))
-
-#define fsbtodb(fs, b)  ((daddr_t)(b) << (fs)->fs_fsbtodb)
-#define dbtofsb(fs, b)  ((b) >> (fs)->fs_fsbtodb)
-
-/*
- * Macros for handling inode numbers:
- *     inode number to filesystem block offset.
- *     inode number to cylinder group number.
- *     inode number to filesystem block address.
- */
-#define ino_to_cg(fs, x)   ((x) / (fs)->fs_ipg)
-#define ino_to_fsba(fs, x) ((ufs2_daddr_t)(cgimin(fs, ino_to_cg(fs, x)) + (blkstofrags((fs), (((x) % (fs)->fs_ipg) / INOPB(fs))))))
-#define ino_to_fsbo(fs, x) ((x) % INOPB(fs))
-
-#define blkoff(fs, loc) ((loc) & (fs)->fs_qbmask) // calculates (loc % fs->fs_bsize)
-#define lblkno(fs, loc) ((loc) >> (fs)->fs_bshift) // calculates (loc / fs->fs_bsize)
-#define fragroundup(fs, size) (((size) + (fs)->fs_qfmask) & (fs)->fs_fmask)    // calculates roundup(size, fs->fs_fsize)
-
-#define sblksize(fs, size, lbn) (((lbn) >= NDADDR || (size) >= ((lbn) + 1) << (fs)->fs_bshift) ? (fs)->fs_bsize : (fragroundup(fs, blkoff(fs, (size)))))
-
-typedef int32_t ufs1_daddr_t;
-typedef int64_t ufs2_daddr_t;
-typedef int64_t ufs_lbn_t;
-typedef int64_t ufs_time_t;
-// MrOlsen (2016-01-16) NOTE: typedef        __int64_t       daddr_t;
-
-struct dirent {
-    __uint32_t d_fileno; /* file number of entry */
-    __uint16_t d_reclen; /* length of this record */
-    __uint8_t d_type; /* file type, see below */
-    __uint8_t d_namlen; /* length of string in d_name */
-    char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */
-};
-
-#define NXADDR  2                       /* External addresses in inode. */
-#define NDADDR  12                      /* Direct addresses in inode. */
-#define NIADDR  3                       /* Indirect addresses in inode. */
-
-struct ufs2_dinode {
-    u_int16_t di_mode; /*   0: IFMT, permissions; see below. */
-    int16_t di_nlink; /*   2: File link count. */
-    uint32_t di_uid; /*   4: File owner. */
-    uint32_t di_gid; /*   8: File group. */
-    uint32_t di_blksize; /*  12: Inode blocksize. */
-    u_int64_t di_size; /*  16: File byte count. */
-    u_int64_t di_blocks; /*  24: Bytes actually held. */
-    ufs_time_t di_atime; /*  32: Last access time. */
-    ufs_time_t di_mtime; /*  40: Last modified time. */
-    ufs_time_t di_ctime; /*  48: Last inode change time. */
-    ufs_time_t di_birthtime; /*  56: Inode creation time. */
-    int32_t di_mtimensec; /*  64: Last modified time. */
-    int32_t di_atimensec; /*  68: Last access time. */
-    int32_t di_ctimensec; /*  72: Last inode change time. */
-    int32_t di_birthnsec; /*  76: Inode creation time. */
-    int32_t di_gen; /*  80: Generation number. */
-    uint32_t di_kernflags; /*  84: Kernel flags. */
-    uint32_t di_flags; /*  88: Status flags (chflags). */
-    int32_t di_extsize; /*  92: External attributes block. */
-    ufs2_daddr_t di_extb[NXADDR];/*  96: External attributes block. */
-    ufs2_daddr_t di_db[NDADDR]; /* 112: Direct disk blocks. */
-    ufs2_daddr_t di_ib[NIADDR]; /* 208: Indirect disk blocks. */
-    int64_t di_spare[3]; /* 232: Reserved; currently unused */
-};
-
-struct ufs1_dinode {
-    u_int16_t di_mode; /*   0: IFMT, permissions; see below. */
-    int16_t di_nlink; /*   2: File link count. */
-    union {
-        u_int16_t oldids[2]; /*   4: Ffs: old user and group ids. */
-    } di_u;
-    u_int64_t di_size; /*   8: File byte count. */
-    int32_t di_atime; /*  16: Last access time. */
-    int32_t di_atimensec; /*  20: Last access time. */
-    int32_t di_mtime; /*  24: Last modified time. */
-    int32_t di_mtimensec; /*  28: Last modified time. */
-    int32_t di_ctime; /*  32: Last inode change time. */
-    int32_t di_ctimensec; /*  36: Last inode change time. */
-    ufs1_daddr_t di_db[NDADDR]; /*  40: Direct disk blocks. */
-    ufs1_daddr_t di_ib[NIADDR]; /*  88: Indirect disk blocks. */
-    uint32_t di_flags; /* 100: Status flags (chflags). */
-    int32_t di_blocks; /* 104: Blocks actually held. */
-    int32_t di_gen; /* 108: Generation number. */
-    uint32_t di_uid; /* 112: File owner. */
-    uint32_t di_gid; /* 116: File group. */
-    int32_t di_spare[2]; /* 120: Reserved; currently unused */
-};
-
-struct csum {
-    int32_t cs_ndir; /* number of directories */
-    int32_t cs_nbfree; /* number of free blocks */
-    int32_t cs_nifree; /* number of free inodes */
-    int32_t cs_nffree; /* number of free frags */
-};
-struct csum_total {
-    int64_t cs_ndir; /* number of directories */
-    int64_t cs_nbfree; /* number of free blocks */
-    int64_t cs_nifree; /* number of free inodes */
-    int64_t cs_nffree; /* number of free frags */
-    int64_t cs_numclusters; /* number of free clusters */
-    int64_t cs_spare[3]; /* future expansion */
-};
-
-struct fs {
-    int32_t fs_firstfield; /* historic filesystem linked list, */
-    int32_t fs_unused_1; /*     used for incore super blocks */
-    int32_t fs_sblkno; /* offset of super-block in filesys */
-    int32_t fs_cblkno; /* offset of cyl-block in filesys */
-    int32_t fs_iblkno; /* offset of inode-blocks in filesys */
-    int32_t fs_dblkno; /* offset of first data after cg */
-    int32_t fs_old_cgoffset; /* cylinder group offset in cylinder */
-    int32_t fs_old_cgmask; /* used to calc mod fs_ntrak */
-    int32_t fs_old_time; /* last time written */
-    int32_t fs_old_size; /* number of blocks in fs */
-    int32_t fs_old_dsize; /* number of data blocks in fs */
-    int32_t fs_ncg; /* number of cylinder groups */
-    int32_t fs_bsize; /* size of basic blocks in fs */
-    int32_t fs_fsize; /* size of frag blocks in fs */
-    int32_t fs_frag; /* number of frags in a block in fs */
-    /* these are configuration parameters */
-    int32_t fs_minfree; /* minimum percentage of free blocks */
-    int32_t fs_old_rotdelay; /* num of ms for optimal next block */
-    int32_t fs_old_rps; /* disk revolutions per second */
-    /* these fields can be computed from the others */
-    int32_t fs_bmask; /* ``blkoff'' calc of blk offsets */
-    int32_t fs_fmask; /* ``fragoff'' calc of frag offsets */
-    int32_t fs_bshift; /* ``lblkno'' calc of logical blkno */
-    int32_t fs_fshift; /* ``numfrags'' calc number of frags */
-    /* these are configuration parameters */
-    int32_t fs_maxcontig; /* max number of contiguous blks */
-    int32_t fs_maxbpg; /* max number of blks per cyl group */
-    /* these fields can be computed from the others */
-    int32_t fs_fragshift; /* block to frag shift */
-    int32_t fs_fsbtodb; /* fsbtodb and dbtofsb shift constant */
-    int32_t fs_sbsize; /* actual size of super block */
-    int32_t fs_spare1[2]; /* old fs_csmask */
-    /* old fs_csshift */
-    int32_t fs_nindir; /* value of NINDIR */
-    int32_t fs_inopb; /* value of INOPB */
-    int32_t fs_old_nspf; /* value of NSPF */
-    /* yet another configuration parameter */
-    int32_t fs_optim; /* optimization preference, see below */
-    int32_t fs_old_npsect; /* # sectors/track including spares */
-    int32_t fs_old_interleave; /* hardware sector interleave */
-    int32_t fs_old_trackskew; /* sector 0 skew, per track */
-    int32_t fs_id[2]; /* unique filesystem id */
-    /* sizes determined by number of cylinder groups and their sizes */
-    int32_t fs_old_csaddr; /* blk addr of cyl grp summary area */
-    int32_t fs_cssize; /* size of cyl grp summary area */
-    int32_t fs_cgsize; /* cylinder group size */
-    int32_t fs_spare2; /* old fs_ntrak */
-    int32_t fs_old_nsect; /* sectors per track */
-    int32_t fs_old_spc; /* sectors per cylinder */
-    int32_t fs_old_ncyl; /* cylinders in filesystem */
-    int32_t fs_old_cpg; /* cylinders per group */
-    int32_t fs_ipg; /* inodes per group */
-    int32_t fs_fpg; /* blocks per group * fs_frag */
-    /* this data must be re-computed after crashes */
-    struct csum fs_old_cstotal; /* cylinder summary information */
-    /* these fields are cleared at mount time */
-    int8_t fs_fmod; /* super block modified flag */
-    int8_t fs_clean; /* filesystem is clean flag */
-    int8_t fs_ronly; /* mounted read-only flag */
-    int8_t fs_old_flags; /* old FS_ flags */
-    u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */
-    u_char fs_volname[MAXVOLLEN]; /* volume name */
-    u_int64_t fs_swuid; /* system-wide uid */
-    int32_t fs_pad; /* due to alignment of fs_swuid */
-    /* these fields retain the current block allocation info */
-    int32_t fs_cgrotor; /* last cg searched */
-    void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */
-    u_int8_t *fs_contigdirs; /* (u) # of contig. allocated dirs */
-    struct csum *fs_csp; /* (u) cg summary info buffer */
-    int32_t *fs_maxcluster; /* (u) max cluster in each cyl group */
-    u_int *fs_active; /* (u) used by snapshots to track fs */
-    int32_t fs_old_cpc; /* cyl per cycle in postbl */
-    int32_t fs_maxbsize; /* maximum blocking factor permitted */
-    int64_t fs_sparecon64[17]; /* old rotation block list head */
-    int64_t fs_sblockloc; /* byte offset of standard superblock */
-    struct csum_total fs_cstotal; /* (u) cylinder summary information */
-    ufs_time_t fs_time; /* last time written */
-    int64_t fs_size; /* number of blocks in fs */
-    int64_t fs_dsize; /* number of data blocks in fs */
-    ufs2_daddr_t fs_csaddr; /* blk addr of cyl grp summary area */
-    int64_t fs_pendingblocks; /* (u) blocks being freed */
-    int32_t fs_pendinginodes; /* (u) inodes being freed */
-    int32_t fs_snapinum[FSMAXSNAP];/* list of snapshot inode numbers */
-    int32_t fs_avgfilesize; /* expected average file size */
-    int32_t fs_avgfpdir; /* expected # of files per directory */
-    int32_t fs_save_cgsize; /* save real cg size to use fs_bsize */
-    int32_t fs_sparecon32[26]; /* reserved for future constants */
-    int32_t fs_flags; /* see FS_ flags below */
-    int32_t fs_contigsumsize; /* size of cluster summary array */
-    int32_t fs_maxsymlinklen; /* max length of an internal symlink */
-    int32_t fs_old_inodefmt; /* format of on-disk inodes */
-    u_int64_t fs_maxfilesize; /* maximum representable file size */
-    int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */
-    int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */
-    int32_t fs_state; /* validate fs_clean field */
-    int32_t fs_old_postblformat; /* format of positional layout tables */
-    int32_t fs_old_nrpos; /* number of rotational positions */
-    int32_t fs_spare5[2]; /* old fs_postbloff */
-    /* old fs_rotbloff */
-    int32_t fs_magic; /* magic number */
-};
-
-int ufs_init();
-int ufs_initialize();
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/vfs/file.h b/sys/include/vfs/file.h
deleted file mode 100644
index f2718ae..0000000
--- a/sys/include/vfs/file.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: file.h 159 2016-01-19 03:07:04Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _FILE_H
-#define _FILE_H
-
-#include <sys/types.h>
-#include <ubixfs/dirCache.h>
-#include <sys/thread.h>
-#include <vfs/mount.h>
-
-/* HACK */
-int getchar();
-
-
-#define SEEK_SET 0x0
-
-#define VBLKSHIFT       12
-#define VBLKSIZE        (1 << VBLKSHIFT)
-#define SBLOCKSIZE      8192
-#define      DEV_BSHIFT      9               /* log2(DEV_BSIZE) */
-#define      DEV_BSIZE       (1<<DEV_BSHIFT)
-
-
-struct dmadat {
-  char blkbuf[VBLKSIZE];  /* filesystem blocks */
-  char indbuf[VBLKSIZE];  /* indir blocks */
-  char sbbuf[SBLOCKSIZE]; /* superblock */
-  char secbuf[DEV_BSIZE]; /* for MBR/disklabel */
-  };
-
-typedef struct fileDescriptorStruct {
-  struct fileDescriptorStruct *prev;
-  struct fileDescriptorStruct *next;
-  struct vfs_mountPoint       *mp;
-  uInt16                       status;
-  uInt16                       mode;
-  uInt32                       offset;
-  uInt32                       size;
-  uInt16                       length;
-  uInt32                       start;
-  char                         fileName[512];
-  char                        *buffer;
-  uInt32                       ino;
-  struct cacheNode            *cacheNode;
-  uInt32                       perms;
-  struct dmadat               *dmadat;
-  int                          dsk_meta;
-  uInt32                       resid;
-  } fileDescriptor;
-
-
-typedef struct userFileDescriptorStruct {
-  struct fileDescriptorStruct *fd;
-  uInt32                       fdSize;
-  } userFileDescriptor;
-
-extern fileDescriptor *fdTable;
-
-fileDescriptor *fopen(const char *,const char *);
-int             fclose(fileDescriptor *);
-
-/* UBU */
-struct sys_fwrite_args {
-  void *buf;
-  size_t nbytes;
-  size_t nmemb;
-  userFileDescriptor *fd;
-};
-
-
-
-int unlink(const char *path);
-int feof(fileDescriptor *fd);
-int fgetc(fileDescriptor *fd);
-size_t fread(void *ptr,size_t size,size_t nmemb,fileDescriptor *fd);
-size_t fwrite(void *ptr,int size,int nmemb,fileDescriptor *fd);
-int fseek(fileDescriptor *,long,int);
-
-int sysFseek(userFileDescriptor *,long,int);
-
-//Good
-//int sysChDir(const char *path);
-//void chDir(const char *path);
-char *verifyDir(const char *path);
-
-/* New Syscall */
-int sys_fwrite(struct thread *, struct sys_fwrite_args *);
-
-#endif
diff --git a/sys/include/vfs/mount.h b/sys/include/vfs/mount.h
deleted file mode 100644
index d9e1a65..0000000
--- a/sys/include/vfs/mount.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mount.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _MOUNT_H
-#define _MOUNT_H
-
-#include <sys/types.h>
-
-#define MFSNAMELEN      16              /* length of type name including null */
-#define MNAMELEN        88              /* size of on/from name bufs */
-
-typedef struct fsid { int32_t val[2]; } fsid_t;        /* filesystem id type */
-
-struct statfs {
-  uint32_t f_version;             /* structure version number */
-  uint32_t f_type;                /* type of filesystem */
-  u_int64_t f_flags;               /* copy of mount exported flags */
-  u_int64_t f_bsize;               /* filesystem fragment size */
-  u_int64_t f_iosize;              /* optimal transfer block size */
-  u_int64_t f_blocks;              /* total data blocks in filesystem */
-  u_int64_t f_bfree;               /* free blocks in filesystem */
-  int64_t  f_bavail;              /* free blocks avail to non-superuser */
-  u_int64_t f_files;               /* total file nodes in filesystem */
-  int64_t  f_ffree;               /* free nodes avail to non-superuser */
-  u_int64_t f_syncwrites;          /* count of sync writes since mount */
-  u_int64_t f_asyncwrites;         /* count of async writes since mount */
-  u_int64_t f_syncreads;           /* count of sync reads since mount */
-  u_int64_t f_asyncreads;          /* count of async reads since mount */
-  u_int64_t f_spare[10];           /* unused spare */
-  uint32_t f_namemax;             /* maximum filename length */
-  uid_t     f_owner;              /* user that mounted the filesystem */
-  fsid_t    f_fsid;               /* filesystem id */
-  char      f_charspare[80];          /* spare string space */
-  char      f_fstypename[MFSNAMELEN]; /* filesystem type name */
-  char      f_mntfromname[MNAMELEN];  /* mounted filesystem */
-  char      f_mntonname[MNAMELEN];    /* directory on which mounted */
-  };
-
-struct vfs_mountPoint {
-  struct vfs_mountPoint   *prev;
-  struct vfs_mountPoint   *next;
-  struct fileSystem       *fs;
-  struct device_node      *device;
-  struct ubixDiskLabel   *diskLabel;
-  void               *fsInfo;
-  int                partition;
-  char               mountPoint[1024];
-  char               perms;
-  };
-
-int vfs_mount(int major,int minor,int partition,int fsType,char *mountPoint,char *perms);
-int vfs_addMount(struct vfs_mountPoint *mp);
-struct vfs_mountPoint *vfs_findMount(char *mountPoint);
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/vfs/vfs.h b/sys/include/vfs/vfs.h
deleted file mode 100644
index 027b802..0000000
--- a/sys/include/vfs/vfs.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vfs.h 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#ifndef _VFS_H
-#define _VFS_H
-
-#include <sys/types.h>
-#include <vfs/file.h>
-#include <vfs/mount.h>
-#include <sys/sysproto.h>
-#include <sys/thread.h>
-
-#define maxFd   32
-#define fdAvail 1
-#define fdOpen  2
-#define fdRead  3
-#define fdEof   4
-
-
-#define fileRead    0x0001
-#define fileWrite   0x0002
-#define fileBinary  0x0004
-#define fileAppend  0x0008
-
-/*!
-  \brief filesSystem Structure
-
-  not sure if we should allow function to point to NULL
-*/
-struct fileSystem {
-  struct fileSystem *prev;
-  struct fileSystem *next;
-  int               (*vfsInitFS)(void *); /*!< pointer to inialization routine */
-  int               (*vfsRead)(void *,char *,long,long); /*!< pointer to read routine */
-  int               (*vfsWrite)(void *,char *,long,long); /*!< pointer to write routine */
-  int               (*vfsOpenFile)(void *,void *); /*!< pointer to openfile routine */
-  int               (*vfsUnlink)(char *,void *); /*!< pointer to unlink routine */
-  int               (*vfsMakeDir)(char *,void *); /*!< pointer to makedir routine */
-  int               (*vfsRemDir)(char *); /*!< pointer to remdir routine */
-  int               (*vfsSync)(void); /*!< pointer to sync routine */
-  int               vfsType; /*!< vfs type id */
-  };
-
-
-/* VFS Functions */
-int vfs_init();
-int vfsRegisterFS(struct fileSystem);
-struct fileSystem *vfs_findFS(int);
-
-#endif
-
-/***
- END
- ***/
diff --git a/sys/include/vmm/paging.h b/sys/include/vmm/paging.h
deleted file mode 100644
index aec6434..0000000
--- a/sys/include/vmm/paging.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*-
- * Copyright (c) 2002-2004, 2016, 2017 The UbixOS Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions, the following disclaimer and the list of authors.  Redistributions in binary
- * form must reproduce the above copyright notice, this list of conditions, the following
- * disclaimer and the list of authors in the documentation and/or other materials provided
- * with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#ifndef _VMM_PAGING_H_
-#define _VMM_PAGING_H_
-
-#include <sys/types.h>
-#include <sys/sysproto.h>
-#include <sys/thread.h>
-
-#define PAGE_SHIFT      12              // Page Shift
-#define PAGE_SIZE       0x1000          // Page Size
-#define PAGE_MASK       (PAGE_SIZE-1)   // Page Mask
-
-#define PD_INDEX(v_addr)  (v_addr >> 22)                        // Calc Page Directory Index
-#define PD_OFFSET(v_addr) (v_addr >> 0xA)                       // Calc Page Directory OFfset
-#define PT_INDEX(v_addr)  ((v_addr >> 12) & 0x03FF)             // Calc Page Table Offset
-#define PD_BASE_ADDR2     ((PAGE_SIZE << 0xA) + VMM_KERN_START) // Find Out What This Was For
-
-#define PD_BASE_ADDR      0xC0400000 //Page Directory Base Address
-#define PT_BASE_ADDR      0xC0000000 // Page Table Base Address
-
-#define PD_ENTRIES        (PAGE_SIZE/4) //Return Page Directory Entries
-#define PT_ENTRIES        (PAGE_SIZE/4) //Return Page Table Entries
-
-#define VM_THRD           0 // Thread
-#define VM_TASK           1 // Task
-
-
-// Page Flags
-#define PAGE_PRESENT        0x00000001
-#define PAGE_WRITE          0x00000002
-#define PAGE_USER           0x00000004
-#define PAGE_WRITE_THROUGH  0x00000008
-#define PAGE_CACHE_DISABLED 0x00000010
-#define PAGE_ACCESSED       0x00000020
-#define PAGE_DIRTY          0x00000040
-#define PAGE_GLOBAL         0x00000080
-#define PAGE_               0x00000100
-#define PAGE_COW            0x00000200
-#define PAGE_STACK          0x00000400
-#define PAGE_WIRED          0x00000800
-
-#define PAGE_DEFAULT        (PAGE_PRESENT|PAGE_WRITE|PAGE_USER)
-#define KERNEL_PAGE_DEFAULT (PAGE_PRESENT|PAGE_WRITE)
-
-#define trunc_page(x)   ((x) & ~PAGE_MASK)
-#define round_page(x)   (((x) + PAGE_MASK) & ~PAGE_MASK)
-
-#define ctob(x)         ((x)<<PAGE_SHIFT)
-#define btoc(x)         (((vm_offset_t)(x)+PAGE_MASK)>>PAGE_SHIFT)
-
-
-int vmmClearVirtualPage(uInt32 pageAddr);
-
-void vmm_unmapPage(uInt32, int);
-void vmm_unmapPages(void *, uInt32);
-void *vmm_mapFromTask(pidType, void *, uInt32);
-void *vmm_copyVirtualSpace(pidType);
-void *vmm_getFreePage(pidType);
-void *vmmGetFreeKernelPage(pidType pid, uInt16 count);
-void *vmm_createVirtualSpace(pidType);
-void *vmm_getFreeVirtualPage(pidType, int, int);
-
-uint32_t vmm_getPhysicalAddr(uint32_t);
-uint32_t vmm_getRealAddr(uint32_t);
-int vmm_setPageAttributes(uInt32, uInt16);
-int vmm_remapPage(uInt32, uInt32, uInt16);
-int vmm_pagingInit();
-void *vmm_getFreeMallocPage(uInt16 count);
-//void vmm_pageFault( uInt32, uInt32, uInt32 );
-void vmm_pageFault(struct trapframe *, uint32_t);
-void _vmm_pageFault();
-int mmap(struct thread *, struct sys_mmap_args *);
-int obreak(struct thread *, struct obreak_args *);
-int munmap(struct thread *, struct munmap_args *);
-
-int vmm_cleanVirtualSpace(uint32_t);
-
-extern uInt32 *kernelPageDirectory;
-
-#endif
diff --git a/sys/include/vmm/vmm.h b/sys/include/vmm/vmm.h
deleted file mode 100644
index 5695526..0000000
--- a/sys/include/vmm/vmm.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vmm.h 232 2016-01-24 01:47:12Z reddawg $
-
- *****************************************************************************************/
-
-#ifndef _VMM_VMM_H_
-#define _VMM_VMM_H_
-
-#include <sys/types.h>
-#include <vmm/paging.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define memAvail     1
-#define memNotavail  2
-#define vmmID       -3
-
-/*
- #define vmmMemoryMapAddr 0xE6667000
- #define VMM_MMAP_ADDR_PMODE2 0xE6667000
- */
-
-#define VMM_MMAP_ADDR_PMODE  VMM_KERN_START /* (PD_BASE_ADDR + PAGE_SIZE) */
-#define VMM_MMAP_ADDR_RMODE  0x101000
-
-#define VMM_KERN_END   0xFFFFFFFF
-#define VMM_KERN_START 0xC0800000
-
-#define VMM_USER_END   0xBFFFFFFF
-#define VMM_USER_START 0x00000000
-
-struct freebsd6_mmap_args {
-    char addr_l_[PADL_( caddr_t )];
-    caddr_t addr;
-    char addr_r_[PADR_( caddr_t )];
-
-    char len_l_[PADL_( size_t )];
-    size_t len;
-    char len_r_[PADR_( size_t )];
-
-    char prot_l_[PADL_(int)];
-    int prot;char prot_r_[PADR_(int)];
-    char flags_l_[PADL_(int)];
-
-    int flags;char flags_r_[PADR_(int)];
-    char fd_l_[PADL_(int)];
-    int fd;char fd_r_[PADR_(int)];
-
-    char pad_l_[PADL_(int)];
-    int pad;
-    char pad_r_[PADR_(int)];
-
-    char pos_l_[PADL_( off_t )];
-    off_t pos;
-    char pos_r_[PADR_( off_t )];
-};
-
-typedef struct {
-    uint32_t pageAddr;
-    u_int16_t status;
-    u_int16_t reserved;
-    pid_t pid;
-    int cowCounter;
-} mMap;
-
-extern int numPages;
-extern mMap *vmmMemoryMap;
-
-int vmm_init();
-int vmm_memMapInit();
-int countMemory();
-uint32_t vmm_findFreePage( pidType pid );
-int freePage( uInt32 pageAddr );
-int adjustCowCounter( uInt32 baseAddr, int adjustment );
-void vmm_freeProcessPages( pidType pid );
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _VMM_VMM_H
diff --git a/sys/init/Makefile b/sys/init/Makefile
deleted file mode 100644
index 91a2c4a..0000000
--- a/sys/init/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002-2004 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = start.o main.o static.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/init/main.c b/sys/init/main.c
deleted file mode 100644
index 9828773..0000000
--- a/sys/init/main.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2005, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: main.c 162 2016-01-19 15:16:01Z reddawg $
-
- *****************************************************************************************/
-
-#include <ubixos/init.h>
-#include <sys/gdt.h>
-#include <sys/video.h>
-#include <sys/tss.h>
-#include <ubixos/exec.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/systemtask.h>
-#include <vfs/mount.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-
-#define B_ADAPTORSHIFT          24
-#define B_ADAPTORMASK           0x0f
-#define B_ADAPTOR(val)          (((val) >> B_ADAPTORSHIFT) & B_ADAPTORMASK)
-#define B_CONTROLLERSHIFT       20
-#define B_CONTROLLERMASK        0xf
-#define B_CONTROLLER(val)       (((val)>>B_CONTROLLERSHIFT) & B_CONTROLLERMASK)
-#define B_SLICESHIFT            20
-#define B_SLICEMASK             0xff
-#define B_SLICE(val)            (((val)>>B_SLICESHIFT) & B_SLICEMASK)
-#define B_UNITSHIFT             16
-#define B_UNITMASK              0xf
-#define B_UNIT(val)             (((val) >> B_UNITSHIFT) & B_UNITMASK)
-#define B_PARTITIONSHIFT        8
-#define B_PARTITIONMASK         0xff
-#define B_PARTITION(val)        (((val) >> B_PARTITIONSHIFT) & B_PARTITIONMASK)
-#define B_TYPESHIFT             0
-#define B_TYPEMASK              0xff
-#define B_TYPE(val)             (((val) >> B_TYPESHIFT) & B_TYPEMASK)
-
-/*****************************************************************************************
- Desc: The Kernels Descriptor table:
- 0 - 0x00 - Dummy Entry
- 1 - 0x08 - Ring 0 CS
- 2 - 0x10 - Ring 0 DS
- 3 - 0x18 - Dummy LDT
- 4 - 0x20 - Scheduler TSS
- 5 - 0x28 - Ring 3 CS
- 6 - 0x30 - Ring 3 DS
- 7 - 0x38 - GPF TSS
- 8 - 0x40 - Stack Fault TSS
- 9 - 0x48 - SMP Private Data
- 10 - 0x50 - USER %GS (Stack!)
-
- Notes:
-
- *****************************************************************************************/
-ubixDescriptorTable(ubixGDT, 11) {
-{ .dummy = 0},
-ubixStandardDescriptor(0x0000, 0xFFFFF, (dCode + dRead + dBig + dBiglim)),
-ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim)),
-ubixStandardDescriptor(0x0000, 0xFFFFF, (dLdt)),
-ubixStandardDescriptor(0x4200, (sizeof(struct tssStruct)), (dTss + dDpl3)),
-ubixStandardDescriptor(0x0000, 0xFFFFF, (dCode + dRead + dBig + dBiglim + dDpl3)),
-ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim + dDpl3)),
-ubixStandardDescriptor(0x4200, (sizeof(struct tssStruct)), (dTss)),
-ubixStandardDescriptor(0x6200, (sizeof(struct tssStruct)), (dTss)),
-ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim + dDpl0)),
-ubixStandardDescriptor(0x0000, 0xFFFFF, (dData + dWrite + dBig + dBiglim + dDpl3)),
-};
-
-struct {
-  unsigned short limit __attribute__ ((packed));
-  union descriptorTableUnion *gdt __attribute__ ((packed));
-} loadGDT = { (11 * sizeof(union descriptorTableUnion) - 1), ubixGDT };
-
-/**
- * \brief This is the entry point into the os where all of the kernels sub systems are started up.
- *
- * \param rootdev address of root device structure
- */
-int kmain(uInt32 rootdev) {
-  /* Set up counter for startup routine */
-  int i = 0x0;
-  uInt32 *sysTask = 0x0;
-
-  /* Do A Clear Screen Just To Make The TEXT Buffer Nice And Empty */
-  clearScreen();
-
-  /* Modify src/sys/include/ubixos/init.h to add a startup routine */
-  for (i = 0x0; i < init_tasksTotal; i++) {
-    if (init_tasks[i]() != 0x0)
-      kpanic("Error: Initializing System Task[%i].\n", i);
-  }
-
-  /* New Root Mount Point */
-  //Old 2 new 10
-  kprintf("[0x%X][0x%X:0x%X:0x%X:0x%X:0x%X:0x%X]\n", B_ADAPTOR(rootdev), B_CONTROLLER(rootdev), B_SLICE(rootdev), B_UNIT(rootdev), B_PARTITION(rootdev), B_TYPE(rootdev));
-  //if ( vfs_mount( 0x1, B_PARTITION(rootdev) + 2, 0x0, 0xAA, "sys", "rw" ) != 0x0 ) {
-  if (vfs_mount(0x1, 0x2, 0x0, 0xAA, "sys", "rw") != 0x0) {
-    kprintf("Problem Mounting sys Mount Point\n");
-  } else
-    kprintf("Mounted sys\n");
-
-  /* Do our mounting */
-  /*
-   if (vfs_mount(0x0,0x0,0x0,0x0,"sys","rw") != 0x0) {
-   kprintf("Problem Mounting sys Mount Point\n");
-   }
-   if (vfs_mount(0x0,0x0,0x1,0x0,"tmp","rw") != 0x0) {
-   kprintf("Problem Mounting tmp Mount Point\n");
-   }
-   */
-
-  /* Initialize the system */
-  kprintf("Free Pages: [%i]\n", systemVitals->freePages);
-  kprintf("MemoryMap:  [0x%X]\n", vmmMemoryMap);
-  kprintf("Starting OS\n");
-
-  sysTask = kmalloc(0x2000);
-
-  if (sysTask == 0x0)
-    kprintf("OS: Unable to allocate memory\n");
-
-  execThread(systemTask, (uInt32) sysTask + 0x2000, 0x0);
-  kprintf("Thread Start!\n");
-
-  execFile("sys:/bin/init", 0x0, 0x0, 0x0); /* OS Initializer    */
-  //execFile( "sys:/bin/login", 0x0, 0x0, 0x0 ); /* OS Initializer    */
-
-  irqEnable(0x0);
-
-  while (0x1)
-    asm("hlt");
-
-  /* Keep haulting until the scheduler reacts */
-
-  /* Return to start however we should never get this far */
-  return (0x0);
-}
-
-/***
- END
- ***/
diff --git a/sys/init/start.S b/sys/init/start.S
deleted file mode 100644
index 8f1fc16..0000000
--- a/sys/init/start.S
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: start.S 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-.globl _start
-.text
-.code32
-_start:
-  movw  $0x1234,0x472
-  pushl %ebp
-  movl  %esp,%ebp
-  pushl $0x00000002
-  popfl
-  /* Clear the BSS */
-  movl  $(_end),%ecx
-  movl  $(__bss_start),%edi
-  subl  %edi,%ecx
-  xorl  %eax,%eax
-  cld
-  rep
-  stosb
- 
-  /* Load GDT */
-  lgdtl (loadGDT)
-  mov   $0x10,%eax 
-  mov   %eax,%ds
-  mov   %eax,%es
-  mov   %eax,%fs
-  mov   %eax,%gs
-  mov   %eax,%ss
-  mov   $kStack,%eax
-  addl  $0x2000,%eax
-  mov   %esp,%edx
-  mov   %eax,%esp
-  mov   %eax,%ebp 
-  mov   $0x18,%ax
-  lldt  %ax
-  mov   $0x20,%ax
-  ltr   %ax
-  ljmp  $0x08,$start_next
-start_next:
-  push 8(%edx)
-  call kmain
-
-.data
-.comm kStack,0x2000
-
-/***
- END
- ***/
diff --git a/sys/init/static.c b/sys/init/static.c
deleted file mode 100644
index 8f1f844..0000000
--- a/sys/init/static.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: static.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <lib/kprintf.h>
-
-/**
- * \brief Sets up the ctors
- */
-
-int static_constructors(void) {
-  extern void (* __ctor_list)();
-  void (** l_ctor)() = &__ctor_list;
-  int l_ctorCount = *(int *)l_ctor;
-
-//  kprintf("Calling static constructors\n");
-  l_ctor++;
-  while(l_ctorCount) {
-    (*l_ctor)();
-    l_ctorCount--;
-    l_ctor++;
-    }
-    return(0x0);
-  }
-
-/***
- END
- ***/
diff --git a/sys/isa/8259.c b/sys/isa/8259.c
deleted file mode 100644
index 8f98456..0000000
--- a/sys/isa/8259.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: 8259.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <isa/8259.h>
-#include <sys/io.h>
-#include <lib/kprintf.h>
-
-static unsigned int irqMask = 0xFFFF;
-
-/*!
- * \brief initialize the 8259 PIC
- *
- * This will initialize both PICs for all of our IRQs
- *
- */
-int i8259_init() {
-  outportByte(mPic,   icw1); /* Initialize Master PIC           */
-  outportByte(sPic,   icw1); /* Initialize Seconary PIC         */
-  outportByte(mPic+1, mVec); /* Master Interrup Vector          */
-  outportByte(sPic+1, sVec); /* Secondary Interrupt Vector      */
-  outportByte(mPic+1, 1<<2); /* Bitmask for cascade on IRQ 2    */
-  outportByte(sPic+1, 2);    /* Cascade on IRQ 2                */
-  outportByte(mPic+1, icw4); /* Finish Primary Initialization   */
-  outportByte(sPic+1, icw4); /* Finish Seconary Initialization  */
-  outportByte(mImr,   0xff); /* Mask All Primary Interrupts     */
-  outportByte(sImr,   0xff); /* Mask All Seconary Interrupts    */
-
-  /* Print out the system info for this */
-  kprintf("pic0 - Port: [0x%X]\n",mPic);
-  kprintf("pic1 - Port: [0x%X]\n",sPic);
-
-  /* Return so the system knows it went well */
-  return(0x0);
-  }
-
-/*!
- * \brief enable specified IRQ
- *
- * \param irqNo IRQ to enable
- */
-void irqEnable_old(u_int16_t irqNo) {
-  irqMask &= ~(1 << irqNo);
-  if (irqNo >= 8) {
-    irqMask &= ~(1 << 2);
-    }
-  outportByte(mPic+1, irqMask & 0xFF);
-  outportByte(sPic+1, (irqMask >> 8) & 0xFF);
-  }
-
-void irqEnable(uint16_t irqNo) {
-  uint16_t port;
-  uint8_t value;
- 
-  if(irqNo < 8) {
-    port = mImr;
-  }
-  else {
-    port = sImr;
-    irqNo -= 8;
-  }
-  value = inportByte(port) & ~(1 << irqNo);
-  outportByte(port, value);
-}
-
-/*!
- * \brief disable specified IRQ
- *
- * \param irqNo IRQ to disable
- */
-void irqDisable_old(u_int16_t irqNo) {
-  irqMask |= (1 << irqNo);
-  if ((irqMask & 0xFF00)==0xFF00) {
-    irqMask |= (1 << 2);
-    }
-  outportByte(mPic+1, irqMask & 0xFF);
-  outportByte(sPic+1, (irqMask >> 8) & 0xFF);
-  }
-
-void irqDisable(uint16_t irqNo) {
-  uint16_t port;
-  uint8_t value;
- 
-  if (irqNo < 8) {
-    port = mImr;
-  }
-  else {
-    port = sImr;
-    irqNo -= 8;
-  }
-  value = inportByte(port) | (1 << irqNo);
-  outportByte(port, value);        
-}
-
-/***
- END
- ***/
diff --git a/sys/isa/Makefile b/sys/isa/Makefile
deleted file mode 100644
index 83f6b5c..0000000
--- a/sys/isa/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = mouse.o atkbd.o fdc.o 8259.o pit.o
-# ne2k.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/isa/atkbd.c b/sys/isa/atkbd.c
deleted file mode 100644
index 371621e..0000000
--- a/sys/isa/atkbd.c
+++ /dev/null
@@ -1,503 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: atkbd.c 159 2016-01-19 03:07:04Z reddawg $
-
- *****************************************************************************************/
-
-#include <isa/atkbd.h>
-#include <isa/8259.h>
-#include <sys/video.h>
-#include <sys/idt.h>
-#include <sys/gdt.h>
-#include <sys/io.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <ubixos/sched.h>
-#include <ubixos/endtask.h>
-#include <ubixos/tty.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/vitals.h>
-
-static int atkbd_scan();
-
-static unsigned int keyMap = 0x0;
-static unsigned int ledStatus = 0x0;
-static char stdinBuffer[512];
-static uInt16 stdinSize;
-static uInt32 controlKeys = 0x0;
-
-static struct spinLock atkbdSpinLock = SPIN_LOCK_INITIALIZER;
-
-static unsigned int keyboardMap[255][8] = {
-/*           Ascii,  Shift,   Ctrl,    Alt,    Num,   Caps, Shift Caps, Shift Num */
-{ 0, 0, 0, 0, 0, 0, 0, 0 },
-/* ESC */{ 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B },
-/* 1,! */{ 0x31, 0x21, 0, 0, 0x31, 0x31, 0x21, 0x21 },
-/* 2,@ */{ 0x32, 0x40, 0, 0, 0x32, 0x32, 0x40, 0x40 },
-/* 3,# */{ 0x33, 0x23, 0, 0, 0x33, 0x33, 0x23, 0x23 },
-/* 4,$ */{ 0x34, 0x24, 0, 0, 0x34, 0x34, 0x24, 0x24 },
-/* 5,% */{ 0x35, 0x25, 0, 0, 0x35, 0x35, 0x25, 0x25 },
-/* 6,^ */{ 0x36, 0x5E, 0, 0, 0x36, 0x36, 0x5E, 0x5E },
-/* 7,& */{ 0x37, 0x26, 0, 0, 0x37, 0x37, 0x26, 0x26 },
-/* 8,* */{ 0x38, 0x2A, 0, 0, 0x38, 0x38, 0x2A, 0x2A },
-/* 9.( */{ 0x39, 0x28, 0, 0, 0x39, 0x39, 0x28, 0x28 },
-/* 0,) */{ 0x30, 0x29, 0, 0, 0x30, 0x30, 0x29, 0x29 },
-/* -,_ */{ 0x2D, 0x5F, 0, 0, 0x2D, 0x2D, 0x5F, 0x5F },
-/* =,+ */{ 0x3D, 0x2B, 0, 0, 0x3D, 0x3D, 0x2B, 0x2B },
-/*  14 */{ 0x08, 0x08, 0x8, 0x8, 0x08, 0x08, 0x08, 0x08 },
-/*  15 */{ 0x09, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x71, 0x51, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x77, 0x57, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x65, 0x45, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x72, 0x52, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x74, 0x54, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x79, 0x59, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x75, 0x55, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x69, 0x49, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x6F, 0x4F, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x70, 0x50, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x5B, 0x7B, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x5D, 0x7D, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x0A, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0, 0, 0, 0, 0, 0, 0, 0 },
-/* a,A */{ 0x61, 0x41, 0x41, 0, 0, 0, 0, 0 },
-/*     */{ 0x73, 0x53, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x64, 0x44, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x66, 0x46, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x67, 0x47, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x68, 0x48, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x6A, 0x4A, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x6B, 0x4B, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x6C, 0x4C, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x3B, 0x3A, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x27, 0x22, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x60, 0x7E, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x2A, 0x0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x5C, 0x3C, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x7A, 0x5A, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x78, 0x58, 0, 0, 0, 0, 0, 0 },
-/* c,C */{ 0x63, 0x43, 0x3, 0x9, 0, 0, 0, 0 },
-/*     */{ 0x76, 0x56, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x62, 0x42, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x6E, 0x4E, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x6D, 0x4D, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x2C, 0x3C, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x2E, 0x3E, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x2F, 0x3F, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x20, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0, 0, 0, 0, 0, 0, 0, 0 },
-/* F1  */{ 0x3000, 0, 0, 0x3000, 0, 0, 0, 0 },
-/*     */{ 0x3001, 0, 0, 0x3001, 0, 0, 0, 0 },
-/*     */{ 0x3002, 0, 0, 0x3002, 0, 0, 0, 0 },
-/*     */{ 0x3003, 0, 0, 0x3003, 0, 0, 0, 0 },
-/*     */{ 0x3004, 0, 0, 0x3004, 0, 0, 0, 0 },
-/*     */{ 0x4000, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4100, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4200, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4300, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4400, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4700, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4800, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4900, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x2D, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4B00, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4C00, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4D00, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x2B, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x4F00, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x5000, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x5100, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x5200, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0x5300, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0, 0, 0, 0, 0, 0, 0, 0 },
-/*     */{ 0, 0, 0, 0, 0, 0, 0, 0 } };
-
-/************************************************************************
-
- Function: int atkbd_init
-
- Description: This function is used to turn on the keyboard
-
- Notes:
-
- 02/20/2004 - Approved for quality
-
- ************************************************************************/
-int atkbd_init() {
-  /* Insert the IDT vector for the keyboard handler */
-  setVector( &atkbd_isr, mVec + 0x1, dPresent + dInt + dDpl0 );
-
-  /* Set the LEDS to their defaults */
-  setLED();
-
-  /* Clear Keyboard */
-  atkbd_scan();
-
-  /* Turn on the keyboard vector */
-  irqEnable( 0x1 );
-
-  /* Print out information on keyboard */
-  kprintf( "atkbd0 - Address: [0x%X], Keyboard Buffer: [0x%X], Buffer Size [%i]\n", &atkbd_isr, &stdinBuffer, 512 );
-
-  /* Return so we know everything went well */
-  return ( 0x0 );
-}
-
-/*
- * 2-23-2004 mji  I think the pusha/popa should be pushal/popal
- */
-
-asm(
-    ".globl atkbd_isr       \n"
-    "atkbd_isr:             \n"
-    "  pusha                \n" /* Save all registers           */
-    "  push %ss             \n"
-    "  push %ds             \n"
-    "  push %es             \n"
-    "  push %fs             \n"
-    "  push %gs             \n"
-    "  call keyboardHandler \n"
-    "  mov $0x20,%dx        \n"
-    "  mov $0x20,%ax        \n"
-    "  outb %al,%dx         \n"
-    "  pop %gs              \n"
-    "  pop %fs              \n"
-    "  pop %es              \n"
-    "  pop %ds              \n"
-    "  pop %ss              \n"
-    "  popa                 \n"
-    "  iret                 \n" /* Exit interrupt                           */
-);
-
-static int atkbd_scan() {
-  int code = 0x0;
-  int val = 0x0;
-
-  code = inportByte( 0x60 );
-  val = inportByte( 0x61 );
-
-  outportByte( 0x61, val | 0x80 );
-  outportByte( 0x61, val );
-
-  return ( code );
-}
-
-void keyboardHandler() {
-  int key = 0x0;
-
-  if ( spinTryLock( &atkbdSpinLock ) )
-    return;
-
-  key = atkbd_scan();
-
-  if ( key > 255 )
-    return;
-
-  /* Control Key */
-  if ( key == 0x1D && !( controlKeys & controlKey ) ) {
-    controlKeys |= controlKey;
-  }
-  if ( key == 0x80 + 0x1D ) {
-    controlKeys &= ( 0xFF - controlKey );
-  }
-  /* ALT Key */
-  if ( key == 0x38 && !( controlKeys & altKey ) ) {
-    controlKeys |= altKey;
-  }
-  if ( key == 0x80 + 0x38 ) {
-    controlKeys &= ( 0xFF - altKey );
-  }
-  /* Shift Key */
-  if ( ( key == 0x2A || key == 0x36 ) && !( controlKeys & shiftKey ) ) {
-    controlKeys |= shiftKey;
-  }
-  if ( ( key == 0x80 + 0x2A ) || ( key == 0x80 + 0x36 ) ) {
-    controlKeys &= ( 0xFF - shiftKey );
-  }
-  /* Caps Lock */
-  if ( key == 0x3A ) {
-    ledStatus ^= ledCapslock;
-    setLED();
-  }
-  /* Num Lock */
-  if ( key == 0x45 ) {
-    ledStatus ^= ledNumlock;
-    setLED();
-  }
-  /* Scroll Lock */
-  if ( key == 0x46 ) {
-    ledStatus ^= ledScrolllock;
-    setLED();
-  }
-  /* Pick Which Key Map */
-  if ( controlKeys == 0 ) {
-    keyMap = 0;
-  }
-  else if ( controlKeys == 1 ) {
-    keyMap = 1;
-  }
-  else if ( controlKeys == 2 ) {
-    keyMap = 2;
-  }
-  else if ( controlKeys == 4 ) {
-    keyMap = 3;
-  }
-  /* If Key Is Not Null Add It To Handler */
-  if ( ( ( uInt )( keyboardMap[key][keyMap] ) > 0 ) && ( ( uInt32 )( keyboardMap[key][keyMap] ) < 0xFF ) ) {
-    switch ( (uInt32) keyboardMap[key][keyMap] ) {
-      case 8:
-        backSpace();
-        if ( tty_foreground == 0x0 ) {
-          stdinBuffer[stdinSize] = keyboardMap[key][keyMap];
-          stdinSize++;
-        }
-        else {
-          tty_foreground->stdin[tty_foreground->stdinSize] = keyboardMap[key][keyMap];
-          tty_foreground->stdinSize++;
-        }
-        break;
-      case 0x3:
-        //if (tty_foreground != 0x0)
-        //  endTask(tty_foreground->owner);
-        //K_PANIC( "CTRL-C pressed\n" );
-        kprintf( "FreePages: [0x%X]\n", systemVitals->freePages );
-        break;
-      case 0x9:
-        kprintf( "REBOOTING" );
-        while ( inportByte( 0x64 ) & 0x02 )
-          ;
-        outportByte( 0x64, 0xFE );
-        break;
-      default:
-        if ( tty_foreground == 0x0 ) {
-          stdinBuffer[stdinSize] = keyboardMap[key][keyMap];
-          stdinSize++;
-        }
-        else {
-          tty_foreground->stdin[tty_foreground->stdinSize] = keyboardMap[key][keyMap];
-          tty_foreground->stdinSize++;
-        }
-        break;
-    }
-  }
-  else {
-    switch ( ( keyboardMap[key][keyMap] >> 8 ) ) {
-      case 0x30:
-        tty_change( keyboardMap[key][keyMap] & 0xFF );
-        //kprintf("Changing Consoles[0x%X:0x%X]\n",_current->id,_current);
-        break;
-      default:
-        break;
-    }
-  }
-
-  /* Return */
-  spinUnlock( &atkbdSpinLock );
-  return;
-}
-
-void setLED() {
-  outportByte( 0x60, 0xED );
-  while ( inportByte( 0x64 ) & 2 )
-    ;
-  outportByte( 0x60, ledStatus );
-  while ( inportByte( 0x64 ) & 2 )
-    ;
-}
-
-/* Temp */
-int getchar() {
-  //uInt8 retKey = 0x0;
-  int retKey = 0x0;
-  uInt32 i = 0x0;
-
-  /*
-   if ((stdinSize <= 0) && (tty_foreground == 0x0)) {
-   sched_yield();
-   }
-   if ((tty_foreground != 0x0) && (tty_foreground->stdinSize <= 0x0)) {
-   sched_yield();
-   }
-   */
-
-  /*
-   if (spinTryLock(&atkbdSpinLock))
-   return(0x0);
-   */
-
-  if ( tty_foreground == 0x0 ) {
-    if ( stdinSize == 0x0 ) {
-      //  spinUnlock(&atkbdSpinLock);
-      return ( 0x0 );
-    }
-
-    retKey = stdinBuffer[0];
-    stdinSize--;
-
-    for ( i = 0x0; i < stdinSize ; i++ ) {
-      stdinBuffer[i] = stdinBuffer[i + 0x1];
-    }
-  }
-  else {
-    if ( tty_foreground->stdinSize == 0x0 ) {
-      //   spinUnlock(&atkbdSpinLock);
-      return ( 0x0 );
-    }
-
-    retKey = tty_foreground->stdin[0];
-    tty_foreground->stdinSize--;
-
-    for ( i = 0x0; i < tty_foreground->stdinSize ; i++ ) {
-      tty_foreground->stdin[i] = tty_foreground->stdin[i + 0x1];
-    }
-  }
-  //spinUnlock(&atkbdSpinLock);
-  return ( retKey );
-}
-
-/***
-
- $Log: atkbd.c,v $
- Revision 1.5  2006/12/05 17:01:15  reddawg
- Modified kpanic
-
- Revision 1.4  2006/12/05 14:10:21  reddawg
- Workign Distro
-
- Revision 1.3  2006/12/01 05:12:35  reddawg
- We're almost there... :)
-
- Revision 1.2  2006/10/19 17:52:17  reddawg
- Working On Userland
-
- Revision 1.1.1.1  2006/06/01 12:46:12  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:01  reddawg
- no message
-
- Revision 1.29  2004/09/11 21:38:00  reddawg
- Fixed a few problems
-
- Revision 1.28  2004/09/08 23:19:58  reddawg
- hmm
-
- Revision 1.27  2004/09/07 21:54:38  reddawg
- ok reverted back to old scheduling for now....
-
- Revision 1.26  2004/09/06 22:18:52  reddawg
- ok bed time
-
- Revision 1.25  2004/09/06 22:11:29  reddawg
- tty: now each tty has a stdin....
-
- Revision 1.24  2004/09/06 15:13:25  reddawg
- Last commit before FreeBSD 6.0
-
- Revision 1.23  2004/08/21 23:47:50  reddawg
- *** empty log message ***
-
- Revision 1.22  2004/08/09 12:58:05  reddawg
- let me know when you got the surce
-
- Revision 1.21  2004/08/06 22:32:16  reddawg
- Ubix Works Again
-
- Revision 1.19  2004/08/03 18:31:19  reddawg
- virtual terms
-
- Revision 1.18  2004/07/29 21:32:16  reddawg
- My quick lunchs breaks worth of updates....
-
- Revision 1.17  2004/07/28 18:45:39  reddawg
- movement of files
-
- Revision 1.16  2004/07/28 17:07:25  reddawg
- MPI: moved the syscalls
-
- Revision 1.15  2004/07/26 19:15:49  reddawg
- test code, fixes and the like
-
- Revision 1.14  2004/07/25 05:32:58  reddawg
- fixed
-
- Revision 1.13  2004/07/25 05:24:39  reddawg
- atkbd: removed sti... does it still miss keys
-
- Revision 1.12  2004/07/24 20:00:51  reddawg
- Lots of changes to the vmm subsystem.... Page faults have been adjust to now be blocking on a per thread basis not system wide. This has resulted in no more deadlocks.. also the addition of per thread locking has removed segfaults as a result of COW in which two tasks fault the same COW page and try to modify it.
-
- Revision 1.11  2004/07/24 15:12:56  reddawg
- Now I'm current
-
- Revision 1.10  2004/07/23 17:49:58  reddawg
- atkbd: adjust the timing issue on the driver hopefully it will work fine now
-
- Revision 1.9  2004/07/23 17:37:35  reddawg
- Fix
-
- Revision 1.8  2004/07/23 09:10:06  reddawg
- ubixfs: cleaned up some functions played with the caching a bit
- vfs:    renamed a bunch of functions
- cleaned up a few misc bugs
-
- Revision 1.7  2004/07/22 20:53:07  reddawg
- atkbd: fixed problem
-
- Revision 1.6  2004/07/09 13:34:51  reddawg
- keyboard: keyboardInit to atkbd_init
- Adjusted initialization routines
-
- Revision 1.5  2004/06/17 14:49:14  reddawg
- atkbd: converted some variables to static
-
- Revision 1.4  2004/06/04 10:19:42  reddawg
- notes: we compile again, thank g-d anyways i was about to cry
-
- Revision 1.3  2004/05/19 04:07:42  reddawg
- kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
-
- Revision 1.2  2004/05/10 02:23:24  reddawg
- Minor Changes To Source Code To Prepare It For Open Source Release
-
- Revision 1.1.1.1  2004/04/15 12:07:09  reddawg
- UbixOS v1.0
-
- Revision 1.19  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
-
diff --git a/sys/isa/fdc.c b/sys/isa/fdc.c
deleted file mode 100644
index 8824f96..0000000
--- a/sys/isa/fdc.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: fdc.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <isa/fdc.h>
-#include <isa/8259.h>
-#include <sys/video.h>
-#include <sys/gdt.h>
-#include <sys/idt.h>
-#include <ubixos/spinlock.h>
-#include <sys/io.h>
-#include <sys/dma.h>
-#include <sys/device.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <devfs/devfs.h>
-
-static struct spinLock fdcSpinLock = SPIN_LOCK_INITIALIZER;
-
-static volatile bool done = FALSE;
-static drvGeom geometry = { dg144Heads,dg144Tracks,dg144Spt };
-static bool diskChange = FALSE;
-static bool motor = FALSE;
-static volatile Int8 fdcTrack = 0xff;
-static Int8 sr0 = 0;
-static volatile int timeOut = 0;
-static Int8 statSize = 0;
-static Int8 status[7] = { 0 };
-
-unsigned long tbaddr = 0x80000L;
-
-int fdcInit2(struct device_node *dev) {
-  dev->devInfo->size = (1024 * 1450);
-  return(0x0);
-  }
-
-int fdc_init() {
-  struct device_interface *devInfo = (struct device_interface *)kmalloc(sizeof(struct device_interface));
-  setVector(floppyIsr, mVec+6, (dInt+dPresent));
-  irqEnable(6);
-  reset();
-  devInfo->major = 0x0;
-  devInfo->init  = (void *)&fdcInit2;
-  devInfo->read  = fdcRead;
-  devInfo->write = fdcWrite;
-  devInfo->reset = (void *)reset;
-  
-  device_add(0,'c',devInfo);
-  devfs_makeNode("fd0",'b',0x0,0x0);
-  return(0x0);
-  }
-
-asm(
-  ".globl floppyIsr      \n"
-  "floppyIsr:            \n"
-  "  pusha               \n"
-  "  push %ss            \n"
-  "  push %ds            \n"
-  "  push %es            \n"
-  "  push %fs            \n"
-  "  push %gs            \n"
-  "  call floppyIsrhndlr \n"
-  "  pop %gs             \n"
-  "  pop %fs             \n" 
-  "  pop %es             \n"
-  "  pop %ds             \n"
-  "  pop %ss             \n"
-  "  popa                \n"
-  "  iret                \n"
-  );
-
-void floppyIsrhndlr() {
-  done = TRUE;
-  outportByte(0x20,0x20);
-  }
-
-void sendByte(int Int8) {
-  volatile int msr;
-  int tmo;
-  for (tmo=0;tmo<128;tmo++) {
-    msr = inportByte(fdcMsr);
-    if ((msr & 0xc0) == 0x80) {
-      outportByte(fdcData,Int8);
-      return;
-      }
-    inportByte(0x80);
-    }
-  }
-
-int getByte() {
-  volatile int msr;
-  int tmo;
-  for (tmo=0;tmo<128;tmo++) {
-    msr = inportByte(fdcMsr);
-    if ((msr & 0xd0) == 0xd0) {
-      return inportByte(fdcData);
-      }
-    inportByte(0x80);
-    }
-  return(-1);
-  }
-
-bool fdcRw(int block,unsigned char *blockBuffer,bool read,unsigned long numSectors) {
-  int head = 0x0,track = 0x0,sector = 0x0,tries= 0x0, copyCount = 0x0;
-  unsigned char *p_tbaddr = (unsigned char *)0x80000;
-  unsigned char *p_blockbuff = blockBuffer;
-  //kprintf("Block: [%i]\n",block);
-  block2Hts(block,&head,&track,&sector);
-  motorOn();
-  if (!read && blockBuffer) {
-    /* copy data from data buffer into track buffer */
-    for (copyCount=0; copyCount<(numSectors*512); copyCount++) {
-      *p_tbaddr = *p_blockbuff;
-      p_blockbuff++;
-      p_tbaddr++;
-      }
-    }
-  for (tries = 0;tries < 3;tries++) {
-    if (inportByte(fdcDir) & 0x80) {
-      diskChange = TRUE;
-      seek(1);  /* clear "disk change" status */
-      recalibrate();
-      motorOff();
-      kprint("FDC: Disk change detected. Trying again.\n");
-      return fdcRw(block, blockBuffer, read, numSectors);
-      }
-    if (!seek(track)) {
-      motorOff();
-      kprintf("FDC: Error seeking to track [%i]\n",block);
-      return FALSE;
-      }
-    outportByte(fdcCcr,0);
-    if (read) {
-      dmaXfer(2,tbaddr,numSectors*512,FALSE);
-      sendByte(cmdRead);
-      }
-    else {
-      dmaXfer(2,tbaddr,numSectors*512,TRUE);
-      sendByte(cmdWrite);
-      }
-    sendByte(head << 2);
-    sendByte(track);
-    sendByte(head);
-    sendByte(sector);
-    sendByte(2);               /* 512 Int8s/sector */
-    sendByte(geometry.spt);
-    if (geometry.spt == dg144Spt) {
-      sendByte(dg144Gap3rw);  /* gap 3 size for 1.44M read/write */
-      }
-    else {
-      sendByte(dg168Gap3rw);  /* gap 3 size for 1.68M read/write */
-      }
-    sendByte(0xff);            /* DTL = unused */
-    if (!waitFdc(TRUE)) {
-      kprint("Timed out, trying operation again after reset()\n");
-      reset();
-      return fdcRw(block, blockBuffer, read, numSectors);
-      }
-    if ((status[0] & 0xc0) == 0) break;   /* worked! outta here! */
-    recalibrate();  /* oops, try again... */
-    }
-  motorOff();
-  if (read && blockBuffer) {
-    p_blockbuff = blockBuffer;
-    p_tbaddr = (unsigned char *) 0x80000;
-    for (copyCount=0x0; copyCount<(numSectors*512); copyCount++) {
-      *p_blockbuff = *p_tbaddr;
-      p_blockbuff++;
-      p_tbaddr++;
-      }
-    }
-  return (tries != 3);
-  }
-
-void block2Hts(int block,int *head,int *track,int *sector) {
-  *head = (block % (geometry.spt * geometry.heads)) / (geometry.spt);
-  *track = block / (geometry.spt * geometry.heads);
-  *sector = block % geometry.spt + 1;
-  }
-
-void motorOn(void) {
-  if (motor == FALSE) {
-    outportByte(fdcDor,0x1c);
-    motor = TRUE;
-    }
-  }
-
-void motorOff(void) {
-  if (motor == TRUE) {
-    //outportByte(fdcDor,0x0);
-    //outportByte(fdcDor,0x0C);
-    motor = FALSE;
-    }
-  }
-
-bool seek(int track) {
-  if (fdcTrack == track) {
-    return(TRUE);
-    }
-  sendByte(cmdSeek);
-  sendByte(0);
-  sendByte(track);
-  if (!waitFdc(TRUE)) {
-    kprintf("wait fdc failed\n");
-    return(FALSE);
-    }
-  if ((sr0 != 0x20) || (fdcTrack != track)) {
-    return(FALSE);
-    }
-  else {
-    return(TRUE);
-    }
-  }
-
-bool readBlock(int block,Int8 *blockBuffer, unsigned long numSectors) {
-  int result = 0x0,loop = 0x0;
-  if (numSectors > 1) {
-    for (loop=0; loop<numSectors; loop++) {
-      result = fdcRw(block+loop, blockBuffer+(loop*512), TRUE, 1);
-      }
-    return result;
-    }
-  return fdcRw(block,blockBuffer,TRUE,numSectors);
-  }
-
-bool writeBlock(int block,Int8 *blockBuffer, unsigned long numSectors) {
-  return fdcRw(block,blockBuffer,FALSE, numSectors);
-  }
-
-bool waitFdc(bool sensei) {
-  timeOut = 50000;
-  while (!done && timeOut);
-  statSize = 0;
-  while ((statSize < 7) && (inportByte(fdcMsr) & (1<<4))) {
-    status[(int)statSize++] = getByte();
-    }
-  if (sensei) {
-    sendByte(cmdSensei);
-    sr0 = getByte();
-    fdcTrack = getByte();
-    }
-  done = FALSE;
-  if (!timeOut) {
-    if (inportByte(fdcDir) & 0x80) {
-      diskChange = TRUE;
-      }
-    return(FALSE);
-    }
-  else {
-    return(TRUE);
-    }
-  }
-
-void recalibrate(void) {
-  motorOn();
-  sendByte(cmdRecal);
-  sendByte(0);
-  waitFdc(TRUE);
-  motorOff();
-  }
-
-void reset(void) {
-  outportByte(fdcDor,0);
-  motor = FALSE;
-  outportByte(fdcDor,0x0c);
-  done = TRUE;
-  waitFdc(TRUE);
-  sendByte(cmdSpecify);
-  sendByte(0xdf);
-  sendByte(0x02);
-  seek(1);
-  recalibrate();
-  diskChange = FALSE;
-  return;
-  }
-
-void fdcRead(void *info,void *baseAddr,uInt32 startSector,uInt32 sectorCount) {
-  spinLock(&fdcSpinLock);
-  readBlock(startSector,baseAddr,sectorCount);
-  spinUnlock(&fdcSpinLock);
-  return;
-  }
-void fdcWrite(void *info,void *baseAddr,uInt32 startSector,uInt32 sectorCount){
-  writeBlock(startSector,baseAddr,sectorCount);
-  return;
-  }
-
-/***
-
- $Log: fdc.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:12  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:01  reddawg
- no message
-
- Revision 1.24  2004/09/07 21:54:38  reddawg
- ok reverted back to old scheduling for now....
-
- Revision 1.23  2004/09/06 15:13:25  reddawg
- Last commit before FreeBSD 6.0
-
- Revision 1.22  2004/08/21 20:06:28  reddawg
- ok check out exec.c
-
- Revision 1.21  2004/08/15 16:47:49  reddawg
- Fixed
-
- Revision 1.20  2004/08/15 00:33:02  reddawg
- Wow the ide driver works again
-
- Revision 1.19  2004/08/01 20:40:45  reddawg
- Net related fixes
-
- Revision 1.18  2004/07/29 21:32:16  reddawg
- My quick lunchs breaks worth of updates....
-
- Revision 1.17  2004/07/27 08:03:36  reddawg
- chg: stopped push all these extra registers I can't find a good reason as to why I was doing it
-
- Revision 1.16  2004/07/22 17:32:25  reddawg
- I broke it hopefully
-
- Revision 1.15  2004/07/21 10:02:09  reddawg
- devfs: renamed functions
- device system: renamed functions
- fdc: fixed a few potential bugs and cleaned up some unused variables
- strol: fixed definition
- endtask: made it print out freepage debug info
- kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost
- ld: fixed a pointer conversion
- file: cleaned up a few unused variables
- sched: broke task deletion
- kprintf: fixed ogPrintf definition
-
- Revision 1.14  2004/07/17 02:38:31  reddawg
- Fixed a few problems
-
- Revision 1.13  2004/07/14 12:42:46  reddawg
- fdc: fdcInit to fdc_init
- Changed Startup Routines
-
- Revision 1.12  2004/06/04 10:19:42  reddawg
- notes: we compile again, thank g-d anyways i was about to cry
-
- Revision 1.11  2004/05/20 22:51:09  reddawg
- Cleaned Up Warnings
-
- Revision 1.10  2004/05/19 23:36:52  reddawg
- Bug Fixes
-
- Revision 1.9  2004/05/19 15:31:27  reddawg
- Fixed up the rest of the references
-
- Revision 1.8  2004/05/19 15:26:33  reddawg
- Fixed reference issues due to changes in driver subsystem
-
- Revision 1.7  2004/05/10 02:23:24  reddawg
- Minor Changes To Source Code To Prepare It For Open Source Release
-
- Revision 1.6  2004/04/30 14:16:04  reddawg
- Fixed all the datatypes to be consistant uInt8,uInt16,uInt32,Int8,Int16,Int32
-
- Revision 1.5  2004/04/29 15:29:20  reddawg
- Fixed All Running Issues
-
- Revision 1.4  2004/04/28 02:22:54  reddawg
- This is a fiarly large commit but we are starting to use new driver model
- all around
-
- Revision 1.3  2004/04/26 22:22:33  reddawg
- DevFS now uses correct size of device
-
- Revision 1.2  2004/04/22 21:20:05  reddawg
- FDC now adds drives to the devfs
-
- Revision 1.1.1.1  2004/04/15 12:07:09  reddawg
- UbixOS v1.0
-
- Revision 1.6  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
-
diff --git a/sys/isa/mouse.c b/sys/isa/mouse.c
deleted file mode 100644
index c667e11..0000000
--- a/sys/isa/mouse.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: mouse.c 79 2016-01-11 16:21:27Z reddawg $
-
- *****************************************************************************************/
-
-#include <isa/mouse.h>
-#include <isa/8259.h>
-#include <sys/idt.h>
-#include <sys/gdt.h>
-#include <sys/io.h>
-#include <lib/kprintf.h>
-
-static uInt8 kbdRead() {
-  unsigned long Timeout;
-  uInt8 Stat, Data;
-
-  for ( Timeout = 50000L; Timeout != 0 ; Timeout-- ) {
-    Stat = inportByte( 0x64 );
-
-    /* loop until 8042 output buffer full */
-    if ( ( Stat & 0x01 ) != 0 ) {
-      Data = inportByte( 0x60 );
-
-      /* loop if parity error or receive timeout */
-      if ( ( Stat & 0xC0 ) == 0 )
-        return Data;
-    }
-  }
-  return -1;
-}
-
-static void kbdWrite( uInt16 port, uInt8 data ) {
-  uInt32 timeout;
-  uInt8 stat;
-
-  for ( timeout = 500000L; timeout != 0 ; timeout-- ) {
-    stat = inportByte( 0x64 );
-
-    if ( ( stat & 0x02 ) == 0 )
-      break;
-  }
-
-  if ( timeout != 0 )
-    outportByte( port, data );
-}
-
-static uInt8 kbdWriteRead( uInt16 port, uInt8 data, const char* expect ) {
-  int RetVal;
-
-  kbdWrite( port, data );
-  for ( ; *expect ; expect++ ) {
-    RetVal = kbdRead();
-    if ( ( uInt8 ) * expect != RetVal ) {
-      return RetVal;
-    }
-  }
-
-  return 0;
-}
-
-int mouseInit() {
-  static uInt8 s1[] = { 0xF3, 0xC8, 0xF3, 0x64, 0xF3, 0x50, 0 };
-  static uInt8 s2[] = { 0xF6, 0xE6, 0xF4, 0xF3, 0x64, 0xE8, 0x03, 0 };
-  const uInt8* ch;
-  Int8 cmd = 0x0;
-
-  kbdWrite( 0x64, 0xA8 );
-  for ( ch = s1; *ch ; ch++ ) {
-    kbdWrite( 0x64, 0xD4 );
-    kbdWriteRead( 0x60, *ch, "\xFA" );
-  }
-  for ( ch = s2; *ch ; ch++ ) {
-    kbdWrite( 0x64, 0xD4 );
-    kbdWriteRead( 0x60, *ch, "\xFA" );
-  }
-  kbdWrite( 0x64, 0xD4 );
-  if ( kbdWriteRead( 0x60, 0xF2, "\xFA" ) != 0x0 ) {
-    kprintf( "Error With Mouse\n" );
-  }
-  cmd = kbdRead();
-  kprintf( "CMD: [0x%X]\n", cmd );
-  kbdWrite( 0x64, 0xD4 );
-  kbdWriteRead( 0x60, 0xF4, "\xFA" );
-
-  setVector( &mouseISR, mVec + 12, dPresent + dInt + dDpl3 );
-
-  outportByte( mPic, eoi );
-  outportByte( sPic, eoi );
-  irqEnable( 12 );
-  outportByte( mPic, eoi );
-  outportByte( sPic, eoi );
-
-  kprintf( "psm0 - Address: [0x%X]\n", &mouseISR );
-
-  /* Return so we know everything went well */
-  return ( 0x0 );
-}
-
-asm(
-    ".globl mouseISR \n"
-    "mouseISR:       \n"
-    "  pusha         \n" /* Save all registers           */
-    "  call mouseHandler \n"
-    "  popa          \n"
-    "  iret          \n" /* Exit interrupt               */
-);
-
-void mouseHandler() {
-  kprintf( "MOUSE!!!\n" );
-
-  outportByte( mPic, eoi );
-  outportByte( sPic, eoi );
-  /* Return */
-  return;
-}
-
-/***
- $Log: mouse.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:12  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:02  reddawg
- no message
-
- Revision 1.3  2004/09/07 21:54:38  reddawg
- ok reverted back to old scheduling for now....
-
- Revision 1.2  2004/09/06 15:13:25  reddawg
- Last commit before FreeBSD 6.0
-
- Revision 1.1  2004/06/04 10:20:53  reddawg
- mouse drive: fixed a few bugs works a bit better now
-
- END
- ***/
-
diff --git a/sys/isa/ne2k.c b/sys/isa/ne2k.c
deleted file mode 100644
index cda23ce..0000000
--- a/sys/isa/ne2k.c
+++ /dev/null
@@ -1,419 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ne2k.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <isa/ne2k.h>
-#include <isa/8259.h>
-#include <sys/device.old.h>
-#include <sys/io.h>
-#include <sys/idt.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <string.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/vitals.h>
-#include <ubixos/spinlock.h>
-#include <assert.h>
-
-
-static struct spinLock ne2k_spinLock = SPIN_LOCK_INITIALIZER;
-
-static int dp_pkt2user(struct device *dev,int page,int length);
-static void getblock(struct device *dev,int page,size_t offset,size_t size,void *dst);
-static int dp_recv(struct device *);
-
-static struct nicBuffer *ne2kBuffer = 0x0;
-static struct device    *mDev        = 0x0;
-
-asm(
-  ".globl ne2kISR         \n"
-  "ne2kISR:               \n"
-  "  pusha                \n" /* Save all registers           */
-  "  call ne2kHandler     \n"
-  "  popa                 \n"
-  "  iret                 \n" /* Exit interrupt               */
-  );
-
-/************************************************************************
-
-Function: int ne2kInit(uInt32 ioAddr)
-Description: This Function Will Initialize The Programmable Timer
-
-Notes:
-
-************************************************************************/
-int ne2k_init() {
-  mDev = (struct device *)kmalloc(sizeof(struct device));
-  mDev->ioAddr = 0x280;
-  mDev->irq    = 10;
-  setVector(&ne2kISR, mVec+10, dPresent + dInt + dDpl0);
-  irqEnable(10);
-//  kprintf("ne0 - irq: %i, ioAddr: 0x%X MAC: %X:%X:%X:%X:%X:%X\n",dev->irq,dev->ioAddr,dev->net->mac[0] & 0xFF,dev->net->mac[1] & 0xFF,dev->net->mac[2] & 0xFF,dev->net->mac[3] & 0xFF,dev->net->mac[4] & 0xFF,dev->net->mac[5] & 0xFF);
-
-  outportByte(mDev->ioAddr + NE_CMD, 0x21);        // stop mode
-  outportByte(mDev->ioAddr + NE_DCR,0x29);         // 0x29 data config reg
-  outportByte(mDev->ioAddr + NE_RBCR0,0x00);       // LOW byte count (remote)
-  outportByte(mDev->ioAddr + NE_RBCR1,0x00);       // HIGH byte count (remote)
-  outportByte(mDev->ioAddr + NE_RCR,0x3C);         // receive config reg
-  outportByte(mDev->ioAddr + NE_TCR,0x02);         // LOOP mode (temp)
-  outportByte(mDev->ioAddr + NE_PSTART,startPage); // 0x26 PAGE start
-  outportByte(mDev->ioAddr + NE_BNRY,startPage);   // 0x26 BOUNDARY
-  outportByte(mDev->ioAddr + NE_PSTOP,stopPage);   // 0x40 PAGE stop
-  outportByte(mDev->ioAddr + NE_ISR,0xFF);         // interrupt status reg
-  outportByte(mDev->ioAddr + NE_IMR,0x0B);
-  outportByte(mDev->ioAddr + NE_CMD,0x61);         // PAGE 1 regs
-
-  outportByte(mDev->ioAddr + DP_MAR0, 0xFF);
-  outportByte(mDev->ioAddr + DP_MAR1, 0xFF);
-  outportByte(mDev->ioAddr + DP_MAR2, 0xFF);
-  outportByte(mDev->ioAddr + DP_MAR3, 0xFF);
-  outportByte(mDev->ioAddr + DP_MAR4, 0xFF);
-  outportByte(mDev->ioAddr + DP_MAR5, 0xFF);
-  outportByte(mDev->ioAddr + DP_MAR6, 0xFF);
-  outportByte(mDev->ioAddr + DP_MAR7, 0xFF);
-  outportByte(mDev->ioAddr + DP_CURR, startPage + 1);
-  outportByte(mDev->ioAddr + NE_CMD,  0x20);
-  inportByte(mDev->ioAddr + DP_CNTR0);                /* reset counters by reading */
-  inportByte(mDev->ioAddr + DP_CNTR1);
-  inportByte(mDev->ioAddr + DP_CNTR2);
-
-  outportByte(mDev->ioAddr + NE_TCR,  0x00);
-
-  outportByte(mDev->ioAddr + NE_CMD, 0x0);
-  outportByte(mDev->ioAddr + NE_DCR, 0x29);
-
-  kprintf("Initialized");
-  /* Return so we know everything went well */
-  return(0x0);
-  }
-
-int PCtoNIC(struct device *dev,void *packet,int length) {
-  int     i        = 0x0;
-  uInt16 *packet16 = (uInt16 *)packet;
-  uInt8  *packet8  = (uInt8  *)packet;
-  uInt8   word16   = 0x1;
-
-  if ((inportByte(dev->ioAddr) & 0x04) == 0x04) {
-    kpanic("Device Not Ready\n");
-    }
-
-  assert(length);
-  if ((word16 == 1) && (length & 0x01)) {
-    length++;
-    }
-
-  outportByte(dev->ioAddr+EN0_RCNTLO,(length & 0xFF));
-  outportByte(dev->ioAddr+EN0_RCNTHI,(length >> 8));
-
-  outportByte(dev->ioAddr+EN0_RSARLO,0x0);
-  outportByte(dev->ioAddr+EN0_RSARHI,0x41);
-
-  outportByte(dev->ioAddr,E8390_RWRITE+E8390_START);
-
-  if (word16 != 0x0) {
-    for(i=0;i<length/2;i++){
-      outportWord(dev->ioAddr + NE_DATAPORT,packet16[i]);
-      }
-    }
-  else {
-    for(i=0;i<length;i++){
-      outportByte(dev->ioAddr + NE_DATAPORT,packet8[i]);
-      }
-    }
-  
-  for (i = 0;i<=100;i++) {
-    if ((inportByte(dev->ioAddr+EN0_ISR) & 0x40) == 0x40) {
-      break;
-      }
-    }
-
-  outportByte(dev->ioAddr+EN0_ISR,0x40);
-  outportByte(dev->ioAddr+EN0_TPSR,0x41);//ei_local->txStartPage);
-  outportByte(dev->ioAddr+0x05,(length & 0xFF));
-  outportByte(dev->ioAddr+0x06,(length >> 8));
-  outportByteP(dev->ioAddr,0x26);
-  //kprintf("SENT\n");
-  return(length);
-  }
-
-int NICtoPC(struct device *dev,void *packet,int length,int nic_addr) {
-  int i = 0x0;
-  uInt16 *packet16 = (uInt16 *)packet;
-
-  assert(length);
-  
-  if (length & 0x01)
-    length++;
-
-   
-
-  outportByte(dev->ioAddr+EN0_RCNTLO,(length & 0xFF));
-  outportByte(dev->ioAddr+EN0_RCNTHI,(length >> 8));
-
-  outportByte(dev->ioAddr+EN0_RSARLO,nic_addr & 0xFF);
-  outportByte(dev->ioAddr+EN0_RSARHI,nic_addr >> 8);
-
-  outportByte(dev->ioAddr,0x0A);
-
-  for(i=0;i<length/2;i++){
-    packet16[i] = inportWord(dev->ioAddr + NE_DATAPORT);
-    }
-
-  outportByte(dev->ioAddr+EN0_ISR,0x40);
-  return(length);
-  }
-
-void ne2kHandler() {
-  uInt16 isr    = 0x0;
-  uInt16 status = 0x0;
-  
-  irqDisable(10);
-  outportByte(mPic, eoi);
-  outportByte(sPic, eoi);
-  
-  asm("sti");
-
-  isr = inportByte(mDev->ioAddr + NE_ISR);
-  
-  if ((isr & 0x02) == 0x02) {
-    outportByte(mDev->ioAddr + NE_ISR, 0x0A);
-    status = inportByte(0x280 + NE_TPSR);
-    } 
-  if ((isr & 0x01) == 0x01) {
-    if (dp_recv(mDev)) {
-      kprintf("Error Getting Packet\n");
-      }
-    outportByte(mDev->ioAddr + NE_ISR, 0x05);
-    }
-    
-  outportByte(mDev->ioAddr + NE_IMR,0x0);
-  outportByte(mDev->ioAddr + NE_IMR,0x0B);
-  
-  asm("cli");
-  irqEnable(10);
-
-  return;
-  }
-
-static int dp_recv(struct device *dev) {
-  dp_rcvhdr_t header;
-  unsigned int pageno = 0x0, curr = 0x0, next = 0x0;
-  int packet_processed = 0x0, r = 0x0;
-  uInt16 eth_type = 0x0;  
-
-  uInt32 length = 0x0;
-
-  pageno = inportByte(dev->ioAddr + NE_BNRY) + 1;
-  if (pageno == stopPage) pageno = startPage;
-
-  do {
-    outportByte(dev->ioAddr + NE_CMD, 0x40);
-    curr = inportByte(dev->ioAddr + NE_CURRENT);
-    outportByte(dev->ioAddr, 0x0);
-    if (curr == pageno) break;
-    getblock(dev, pageno, (size_t)0, sizeof(header), &header);
-    getblock(dev, pageno, sizeof(header) + 2*sizeof(ether_addr_t), sizeof(eth_type), &eth_type);
-
-    length = (header.dr_rbcl | (header.dr_rbch << 8)) - sizeof(dp_rcvhdr_t);
-    next = header.dr_next;
-
-    //kprintf("length: [0x%X:0x%X:0x%X]\n",header.dr_next,header.dr_status,length);
-
-    if (length < 60 || length > 1514) {
-      kprintf("dp8390: packet with strange length arrived: %d\n",length);
-      next= curr;
-      }
-    else if (next < startPage || next >= stopPage) {
-      kprintf("dp8390: strange next page\n");
-      next= curr;
-      }
-    else if (header.dr_status & RSR_FO) {
-      kpanic("dp8390: fifo overrun, resetting receive buffer\n");
-      next = curr;
-      }
-    else if (header.dr_status & RSR_PRX) {
-      r = dp_pkt2user(dev, pageno, length);
-      if (r != OK) {
-        kprintf("FRUIT");
-        return(0x0);
-        }
-
-      packet_processed = 0x1;
-      }
-    if (next == startPage)
-      outportByte(dev->ioAddr + NE_BNRY, stopPage - 1);
-    else
-      outportByte(dev->ioAddr + NE_BNRY, next - 1);
-
-    pageno = next;
-
-    } while (packet_processed == 0x0);
-  return(0x0);
-  }
-
-static void getblock(struct device *dev,int page,size_t offset,size_t size,void *dst) {
-        uInt16 *ha = 0x0;
-        int i      = 0x0;
-
-        ha = (uInt16 *) dst;
-        offset = page * DP_PAGESIZE + offset;
-        outportByte(dev->ioAddr + NE_RBCR0, size & 0xFF);
-        outportByte(dev->ioAddr + NE_RBCR1, size >> 8);
-        outportByte(dev->ioAddr + EN0_RSARLO, offset & 0xFF);
-        outportByte(dev->ioAddr + EN0_RSARHI, offset >> 8);
-        outportByte(dev->ioAddr + NE_CMD, E8390_RREAD | E8390_START);
-
-        size /= 2;
-        for (i= 0; i<size; i++)
-                ha[i]= inportWord(dev->ioAddr + NE_DATAPORT);
-  outportByte(dev->ioAddr+EN0_ISR,0x40);
-  }
-  
-static int dp_pkt2user(struct device *dev,int page,int length) {
-  int last = 0x0;
-  struct nicBuffer *tmpBuf = 0x0;
- 
-  last = page + (length - 1) / DP_PAGESIZE;
-
-  if (last >= stopPage) {
-    kprintf("FOOK STOP PAGE!!!");
-    }
-  else {
-    tmpBuf = ne2kAllocBuffer(length);
-    NICtoPC(dev,tmpBuf->buffer,length,page * DP_PAGESIZE + sizeof(dp_rcvhdr_t));
-    }
-  return(OK);
-  }
-
-struct nicBuffer *ne2kAllocBuffer(int length) {
-  struct nicBuffer *tmpBuf = 0x0;
-  
-  spinLock(&ne2k_spinLock);
-  
-  if (ne2kBuffer == 0x0) {
-    ne2kBuffer = (struct nicBuffer *)kmalloc(sizeof(struct nicBuffer));
-    ne2kBuffer->next   = 0x0;
-    ne2kBuffer->length = length;
-    ne2kBuffer->buffer = (char *)kmalloc(length);
-    spinUnlock(&ne2k_spinLock);
-    return(ne2kBuffer);
-    }
-  else {
-    for (tmpBuf = ne2kBuffer;tmpBuf->next != 0x0;tmpBuf = tmpBuf->next);
-    
-    tmpBuf->next   = (struct nicBuffer *)kmalloc(sizeof(struct nicBuffer));
-    tmpBuf         = tmpBuf->next;
-    tmpBuf->next   = 0x0;
-    tmpBuf->length = length;
-    tmpBuf->buffer = (char *)kmalloc(length);
-    spinUnlock(&ne2k_spinLock);
-    return(tmpBuf);
-    }
-  spinUnlock(&ne2k_spinLock);
-  return(0x0);
-  }
-
-struct nicBuffer *ne2kGetBuffer() {
-  struct nicBuffer *tmpBuf = 0x0;
-  
-  if (ne2k_spinLock == 0x1)
-    return(0x0);
-    
-  tmpBuf     = ne2kBuffer;
-  if (ne2kBuffer != 0x0)
-    ne2kBuffer = ne2kBuffer->next;
-  return(tmpBuf);
-  }
-
-void ne2kFreeBuffer(struct nicBuffer *buf) {
-  kfree(buf->buffer);
-  kfree(buf);
-  return;
-  }
-
-/***
-
- $Log: ne2k.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:12  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:02  reddawg
- no message
-
- Revision 1.24  2004/09/28 21:47:56  reddawg
- Fixed deadlock now safe to use in bochs
-
- Revision 1.23  2004/09/16 22:35:28  reddawg
- Demo Release
-
- Revision 1.22  2004/09/15 21:25:33  reddawg
- Fixens
-
- Revision 1.21  2004/09/11 19:15:37  reddawg
- here you go irq 10 io 240 for your ne2k nic
-
- Revision 1.20  2004/09/07 22:26:04  reddawg
- synced in
-
- Revision 1.19  2004/09/07 21:54:38  reddawg
- ok reverted back to old scheduling for now....
-
- Revision 1.18  2004/09/06 15:13:25  reddawg
- Last commit before FreeBSD 6.0
-
- Revision 1.17  2004/08/01 20:40:45  reddawg
- Net related fixes
-
- Revision 1.16  2004/07/28 22:23:02  reddawg
- make sure it still works before I goto bed
-
- Revision 1.15  2004/07/17 17:04:47  reddawg
- ne2k: added assert hopefully it will help me solve this dma size 0 random error
-
- Revision 1.14  2004/07/14 12:03:50  reddawg
- ne2k: ne2kInit to ne2k_init
- Changed Startup Routines
-
- Revision 1.13  2004/06/04 10:19:42  reddawg
- notes: we compile again, thank g-d anyways i was about to cry
-
- Revision 1.12  2004/05/21 12:48:22  reddawg
- Cleaned up
-
- Revision 1.11  2004/05/19 04:07:42  reddawg
- kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
-
- Revision 1.10  2004/05/10 02:23:24  reddawg
- Minor Changes To Source Code To Prepare It For Open Source Release
-
- END
- ***/
-
diff --git a/sys/isa/pit.c b/sys/isa/pit.c
deleted file mode 100644
index c22a238..0000000
--- a/sys/isa/pit.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: pit.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <isa/pit.h>
-#include <sys/io.h>
-#include <lib/kprintf.h>
-
-/*****************************************************************************************
-
- Function: int pitInit()
-
- Description: This Function Will Initialize The Programmable Timer
-
- Notes:
-
- 0040	r/w	PIT  counter 0, counter divisor	      (XT, AT, PS/2)
- 0041	r/w	PIT  counter 1, RAM refresh counter   (XT, AT)
- 0042	r/w	PIT  counter 2, cassette & speaker    (XT, AT, PS/2)
- 0043	r/w	PIT  mode port, control word register for counters 0-2
-
-		 bit 7-6 = 00  counter 0 select
-			 = 01  counter 1 select	  (not PS/2)
-			 = 10  counter 2 select
-		 bit 5-4 = 00  counter latch command
-			 = 01  read/write counter bits 0-7 only
-			 = 10  read/write counter bits 8-15 only
-			 = 11  read/write counter bits 0-7 first, then 8-15
-		 bit 3-1 = 000 mode 0 select
-			 = 001 mode 1 select - programmable one shot
-			 = x10 mode 2 select - rate generator
-			 = x11 mode 3 select - square wave generator
-			 = 100 mode 4 select - software triggered strobe
-			 = 101 mode 5 select - hardware triggered strobe
-		 bit 0	 = 0   binary counter 16 bits
-			 = 1   BCD counter
-
-*****************************************************************************************/
-int pit_init() {
-  outportByteP(0x43,0x36);
-  outportByteP(0x40,((1193180/PIT_TIMER) & 0xFF));
-  outportByte(0x40,(((1193180/PIT_TIMER) >> 8) & 0xFF));
-
-  /* Print out information on the PIT */
-  kprintf("pit0 - Port [0x%X], Timer Hz: [%iHz]\n",0x43,PIT_TIMER);
-
-  /* Return so we know everything went well */
-  return(0x0);
-  }
-
-/***
- $Log: pit.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:12  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:03  reddawg
- no message
-
- Revision 1.7  2004/07/16 04:06:32  reddawg
- Tune ups this stuff should of been taken care of months ago
-
- Revision 1.6  2004/07/16 01:08:58  reddawg
- Whew we work once again
-
- Revision 1.5  2004/07/09 13:29:15  reddawg
- pit: pitInit to pit_init
- Adjusted initialization routines
-
- Revision 1.4  2004/05/21 12:48:22  reddawg
- Cleaned up
-
- Revision 1.3  2004/05/20 22:51:09  reddawg
- Cleaned Up Warnings
-
- Revision 1.2  2004/05/10 02:23:24  reddawg
- Minor Changes To Source Code To Prepare It For Open Source Release
-
- END
- ***/
-
diff --git a/sys/isa/rs232.c b/sys/isa/rs232.c
deleted file mode 100644
index 496af5e..0000000
--- a/sys/isa/rs232.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: rs232.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-void rs232Init() {
-  return;
-  }
-
-/***
-
- $Log: rs232.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:12  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:03  reddawg
- no message
-
- Revision 1.2  2004/05/10 02:23:24  reddawg
- Minor Changes To Source Code To Prepare It For Open Source Release
-
-
- END
- ***/
-
diff --git a/sys/kernel/Makefile b/sys/kernel/Makefile
deleted file mode 100644
index 9fff977..0000000
--- a/sys/kernel/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 150 2016-01-18 19:59:43Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = tty.o kern_sig.o pipe.o kern_descrip.o kern_sysctl.o gen_calls.o endtask.o ld.o time.o syscall_new.o elf.o ubthread.o vitals.o access.o syscalls.o
-#OBJS += ../${_ARCH}/schedyield.o ../${_ARCH}/kpanic.o ../${_ARCH}/timer.o ../${_ARCH}/spinlock.o ../${_ARCH}/exec.o ../${_ARCH}/sys_call_new.o ../${_ARCH}/sys_call.o ../${_ARCH}/bioscall.o ../${_ARCH}/fork.o ../${_ARCH}/syscall.o ../${_ARCH}/systemtask.o ../${_ARCH}/sched.o ../${_ARCH}/cpu.o 
-# ap-boot.o smp.o vitals.o(obsolete)
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) -DNOBOOL $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX) -DNOBOOL $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/kernel/access.c b/sys/kernel/access.c
deleted file mode 100644
index 0c5d901..0000000
--- a/sys/kernel/access.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: access.c 159 2016-01-19 03:07:04Z reddawg $
-
- *****************************************************************************************/
-
-#include <ubixos/access.h>
-
-/************************************************************************
-
- Function: sys_setUID();
-
- Description: This will set the UID of the task
-
- Notes:
-
- 2016/01/17 - This is very basic and will set any UID if you're 0
- need to change later.
-
-
- ************************************************************************/
-int sys_setUID( struct thread *td, struct sys_setUID_args *args ) {
-  if ( _current->uid == 0x0 ) {
-    _current->uid = args->uid;
-    return (0);
-  }
-  return (-1);
-}
-
-int sys_getUID( struct thread *td, void *uap ) {
-  return (_current->uid);
-}
-
-int sys_getEUID( struct thread *td, void *uap ) {
-  return (_current->uid);
-}
-
-int sys_getGID( struct thread *td, void *uap ) {
-  return (_current->gid);
-}
-
-int sys_setGID( struct thread *td, struct sys_setGID_args *uap ) {
-
-  if ( _current->gid == 0x0 ) {
-
-    _current->gid = uap->gid;
-
-    return (0);
-
-  }
-
-  return (-1);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/elf.c b/sys/kernel/elf.c
deleted file mode 100644
index 455a8e7..0000000
--- a/sys/kernel/elf.c
+++ /dev/null
@@ -1,192 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: elf.c 141 2016-01-17 02:05:18Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/elf.h>
-#include <ubixos/kpanic.h>
-#include <lib/kmalloc.h>
-#include <vmm/vmm.h>
-#include <lib/kprintf.h>
-#include <string.h>
-
-const struct {
-  char  *elfTypeName;
-  uInt32 id;
-  } elfType[] = {
-    { "ET_NONE",         0 },
-    { "ET_REL",          1 },
-    { "ET_EXEC",         2 },
-    { "ET_DYN",          3 },
-    { "ET_CORE",         4 },
-    { "ET_LOPROC",  0xff00 },
-    { "ET_HIPROC",  0xffff },
-    };
-
-const struct {
-  char   *phTypeName;
-  uInt32 id;
-  } elfPhType[] = {
-    { "PT_NULL",              0 },
-    { "PT_LOAD",              1 },
-    { "PT_DYNAMIC",           2 },
-    { "PT_INTERP",            3 },
-    { "PT_NOTE",              4 },
-    { "PT_SHLIB",             5 },
-    { "PT_PHDR",              6 },
-    { "PT_LOPROC",   0x70000000 },
-    { "PT_HIPROC",   0x7fffffff },
-    };
-
-const struct {
-  char   *shTypeName;
-  uInt32 id;
-  } elfShType[] = {
-    {"SHT_NULL",     0 },
-    {"SHT_PROGBITS", 1 },
-    {"SHT_SYMTAB",   2 },
-    {"SHT_STRTAB",   3 },
-    {"SHT_RELA",     4 },
-    {"SHT_HASH",     5 },
-    {"SHT_DYNAMIC",  6 },
-    {"SHT_NOTE",     7 },
-    {"SHT_NOBITS",   8 },
-    {"SHT_REL",      9 },
-    {"SHT_SHLIB",   10 },
-    {"SHT_DYNSYM",  11 },
-    };
-
-const struct {
-  char *relTypeName;
-  uInt32 id;
-  } elfRelType[] = {
-    {"R_386_NONE",        0 },
-    {"R_386_32",          1 },
-    {"R_386_PC32",        2 },
-    {"R_386_GOT32",       3 },
-    {"R_386_PLT32",       4 },
-    {"R_386_COPY",        5 },
-    {"R_386_GLOB_DAT",    6 },
-    {"R_386_JMP_SLOT",    7 },
-    {"R_386_RELATIVE",    8 },
-    {"R_386_GOTOFF",      9 },
-    {"R_386_GOTPC",      10 },
-    };
-
-
-char *elfGetShType(int shType) {
-  return((char *)elfShType[shType].shTypeName);
-  }
-
-char *elfGetPhType(int phType) {
-  return((char *)elfPhType[phType].phTypeName);
-  }
-
-char *elfGetRelType(int relType) {
-  return((char *)elfRelType[relType].relTypeName);
-  }
-
-int elf_loadfile(kTask_t *p,const char *file,uint32_t *addr,uint32_t *entry) {
-  int                i             = 0x0;
-  int                x             = 0x0;
-  int                numsegs       = 0x0;
-  uint32_t          base          = 0x0;
-  uint32_t          base_addr     = 0x0;
-  elfHeader         *binaryHeader  = 0x0;
-  elfProgramHeader  *programHeader = 0x0;
-  fileDescriptor    *exec_fd       = 0x0;
-
-  exec_fd = fopen(file,"r");
-  if (exec_fd == 0x0)
-    return(-1);
-kprintf("MOO");
-  /* Load the ELF header */
-  if ((binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader))) == 0x0) 
-    K_PANIC("malloc failed!");
-  fread(binaryHeader,sizeof(elfHeader),1,exec_fd);
-
-  /* Check If App Is A Real Application */
-  if ((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) {
-    kfree(binaryHeader);
-    fclose(exec_fd);
-    return(-1);
-    }
-
-  if (binaryHeader->eType == ET_DYN)
-    base = *addr;
-  else if (binaryHeader->eType == ET_EXEC)
-    base = 0x0;
-  else
-    return(-1);
-
-  /* Load The Program Header(s) */
-  if ((programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum)) == 0x0)
-    K_PANIC("malloc failed!");
-  fseek(exec_fd,binaryHeader->ePhoff,0);
-  fread(programHeader,(sizeof(elfProgramHeader)*binaryHeader->ePhnum),1,exec_fd);
-kprintf("MEW: [0x%X]",base);
-  for (i = 0x0;i < binaryHeader->ePhnum;i++) {
-    switch (programHeader[i].phType) {
-      case PT_LOAD:
-        /*
-        Allocate Memory Im Going To Have To Make This Load Memory With Correct
-        Settings so it helps us in the future
-        */
-        for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) {
-          /* Make readonly and read/write */
-          if (vmm_remapPage(vmm_findFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x + base),PAGE_DEFAULT) == 0x0)
-            K_PANIC("Error: Remap Page Failed");
-          memset((void *)((programHeader[i].phVaddr & 0xFFFFF000) + x + base),0x0,0x1000);
-          }
-
-        /* Now Load Section To Memory */
-        fseek(exec_fd,programHeader[i].phOffset,0);
-        fread((void *)programHeader[i].phVaddr + base,programHeader[i].phFilesz,1,exec_fd);
-
-        if ((programHeader[i].phFlags & 0x2) != 0x2) {
-          for (x = 0x0;x < (programHeader[i].phMemsz);x += 0x1000) {
-            if ((vmm_setPageAttributes((programHeader[i].phVaddr & 0xFFFFF000) + x + base,PAGE_PRESENT | PAGE_USER)) != 0x0)
-              K_PANIC("vmm_setPageAttributes failed");
-            }
-          }
-        if (numsegs == 0x0)
-          base_addr = (programHeader[i].phVaddr & 0xFFFFF000) + base;
-        numsegs++;
-        break;
-      }
-    }
-  *addr  = base_addr;
-  kprintf("entry: [0x%X]\n",*entry);
-  *entry = binaryHeader->eEntry + base;
-  kprintf("entry: [0x%X]\n",*entry);
-  return(0x0);
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/endtask.c b/sys/kernel/endtask.c
deleted file mode 100644
index f204767..0000000
--- a/sys/kernel/endtask.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: endtask.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/types.h>
-#include <ubixos/sched.h>
-#include <ubixos/vitals.h>
-#include <vmm/vmm.h>
-#include <lib/kprintf.h>
-#include <isa/8259.h>
-
-/************************************************************************
-
-Function: endTask(pidType pid)
-
-Description: This will do cleanup for an ending task
-
-Notes:
-
-************************************************************************/ 
-void endTask(pidType pid) {
-  //kTask_t *tmpTask = 0x0;
-
-  /* Don't mess with scheduler structures from outside the scheduler! */
-  /* Just set status to dead, and let the scheduler clean up itself */
-  sched_setStatus(pid,DEAD);
-  //tmpTask = schedFindTask(pid);
-  //if (sched_deleteTask(pid) != 0x0)
-  //  kpanic("sched_deleteTask: Failed\n");
-  //kprintf("Ending Task: (%i:0x%X)\n",tmpTask->id,tmpTask);
-  //sched_addDelTask(tmpTask);
-  //tmpTask->state = DEAD;
-
-  //tmpTask->term->owner = tmpTask->parentPid;
-
-  if (pid == _current->id)
-    while(1)
-      sched_yield();
-  sched_yield();
-
-  return;
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/gen_calls.c b/sys/kernel/gen_calls.c
deleted file mode 100644
index 10c1949..0000000
--- a/sys/kernel/gen_calls.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: gen_calls.c 169 2016-01-20 01:10:22Z reddawg $
-
- *****************************************************************************************/
-
-#include <sys/gen_calls.h>
-#include <sys/thread.h>
-#include <sys/kern_descrip.h>
-#include <ubixos/sched.h>
-#include <ubixos/endtask.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <string.h>
-#include <assert.h>
-
-/* Exit Syscall */
-int sys_exit( struct thread *td, struct sys_exit_args *args ) {
-  endTask( _current->id );
-  return (0x0);
-}
-
-/* return the process id */
-int getpid( struct thread *td, struct getpid_args *uap ) {
-#ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-#endif
-  td->td_retval[0] = _current->id;
-  return (0);
-}
-
-/* return the process user id */
-int getuid( struct thread *td, struct getuid_args *uap ) {
-#ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-#endif
-  td->td_retval[0] = _current->uid;
-  return (0);
-}
-
-/* return the process group id */
-int getgid( struct thread *td, struct getgid_args *uap ) {
-#ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-#endif
-  td->td_retval[0] = _current->gid;
-  return (0);
-}
-
-int sys_write( struct thread *td, struct sys_write_args *uap ) {
-  char *buffer = 0x0;
-  char *in = 0x0;
-
-#ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-#endif
-
-  if ( uap->fd == 2 ) {
-    kprintf( "stderr: %s", uap->buf );
-  }
-
-  if ( uap->fd == 1 ) {
-    /* This is Horrible! */
-    in = (char *) uap->buf;
-    buffer = kmalloc( 1024 );
-    memcpy( buffer, uap->buf, uap->nbyte );
-    kprintf( "%s", buffer );
-    kfree( buffer );
-    td->td_retval[0] = uap->nbyte;
-  }
-  else {
-    kprintf( "[%i]", uap->nbyte );
-    buffer = kmalloc( uap->nbyte );
-    memcpy( buffer, uap->buf, uap->nbyte );
-    //kprint(buffer);
-    kfree( buffer );
-    kprintf( "(%i) %s", uap->fd, uap->buf );
-    td->td_retval[0] = uap->nbyte;
-  }
-  return (0x0);
-}
-
-int issetugid( register struct thread *td, struct issetugid_args *uap ) {
-#ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-#endif
-  td->td_retval[0] = 0;
-  return (0);
-}
-
-int readlink( struct thread *td, struct readlink_args *uap ) {
-#ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-#endif
-  kprintf( "readlink: [%s:%i]\n", uap->path, uap->count );
-  td->td_retval[0] = -1;
-  td->td_retval[1] = 0x0;
-  return (0x0);
-}
-
-int gettimeofday_new( struct thread *td, struct gettimeofday_args *uap ) {
-#ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-#endif
-  return (0x0);
-}
-
-int read( struct thread *td, struct read_args *uap ) {
-  int error = 0x0;
-  size_t count = 0x0;
-  struct file *fd = 0x0;
-
-#ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-#endif
-
-  error = getfd( td, &fd, uap->fd );
-
-  if ( error )
-    return (error);
-
-  count = fread( uap->buf, uap->nbyte, 0x1, fd->fd );
-  kprintf( "count: %i\n", count );
-  td->td_retval[0] = count;
-
-  return (error);
-}
-
-/*!
- * \brief place holder for now functionality to be added later
- */
-int setitimer( struct thread *td, struct setitimer_args *uap ) {
-  int error = 0x0;
-
-  return (error);
-}
-
-int access( struct thread *td, struct access_args *uap ) {
-  int error = 0x0;
-  kprintf( "name: [%s]\n", uap->path );
-  return (error);
-}
-
-int mprotect( struct thread *td, struct mprotect_args *uap ) {
-  int error = 0x0;
-  return (error);
-}
-
-/* MrOlsen 2016-01-18 */
-int sys_invalid( struct thread *td, void *args ) {
-  kprintf( "Invalid System Call #[%i]\n", td->frame->tf_eax );
-//kpanic("PID: %i, File: %s, Line: %i", _current->id, __FILE__, __LINE__);
-  return (0);
-}
-
-int sys_read( struct thread *td, struct sys_read_args *args ) {
-  kprintf( "DUMMY FUNC FIX ME! sys_read" );
-  return (0);
-}
-
-int sys_wait4( struct thread *td, struct sys_wait4_args *args ) {
-  //kprintf("DUMMY FUNC FIX ME! sys_wait4");
-  kTask_t *tmpTask = schedFindTask( args->pid );
-  if ( tmpTask != 0x0 )
-    return (tmpTask->state);
-  return (0);
-}
-
-int sys_close( struct thread *td, struct sys_close_args *args ) {
-  kprintf( "DUMMY FUNC FIX ME! sys_close" );
-  return (0);
-}
-
-/***
- END
- ***/
diff --git a/sys/kernel/kern_descrip.c b/sys/kernel/kern_descrip.c
deleted file mode 100644
index 04bbbf0..0000000
--- a/sys/kernel/kern_descrip.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kern_descrip.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/kern_descrip.h>
-#include <sys/sysproto.h>
-#include <sys/thread.h>
-#include <lib/kprintf.h>
-#include <ubixos/endtask.h>
-#include <lib/kmalloc.h>
-#include <assert.h>
-
-int fcntl(struct thread *td, struct fcntl_args *uap) {
-  struct file *fp = 0x0;
-
-  #ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-  #endif
-
-  if (td->o_files[uap->fd] == 0x0) {
-    kprintf("ERROR!!!\n");
-    return(-1);
-    }
-
-  fp = (struct file *)td->o_files[uap->fd];
-  switch (uap->cmd) {
-    case 3:
-      td->td_retval[0] = fp->f_flag;
-      break;
-    case 4:
-       fp->f_flag &= ~FCNTLFLAGS;
-       fp->f_flag |= FFLAGS(uap->arg & ~O_ACCMODE) & FCNTLFLAGS;
-       break;
-    default:
-      kprintf("ERROR DEFAULT");
-    }
-
-  return(0x0);
-  }
-
-int falloc(struct thread *td,struct file **resultfp, int *resultfd) {
-  struct file *fp = 0x0;
-  int i = 0;
-
-  #ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-  #endif
-
-  fp = (struct file *)kmalloc(sizeof(struct file));
-  /* First 5 Descriptors Are Reserved */
-  for (i = 5;i<1024;i++) {
-    if (td->o_files[i] == 0x0) {
-       td->o_files[i] = (void *)fp;
-       if (resultfd)
-         *resultfd = i;
-       if (resultfp)
-         *resultfp = fp;
-      break;
-      }
-    } 
-  return(0x0);
-  }
-
-int close(struct thread *td,struct close_args *uap) {
-  #ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-  #endif
-  kfree((void *)td->o_files[uap->fd]);
-  td->o_files[uap->fd] = 0x0;
-  td->td_retval[0] = 0x0;  
-  return(0x0);
-  }
-
-/*!
- * \brief return data table size
- */
-int getdtablesize(struct thread *td, struct getdtablesize_args *uap) {
-  #ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-  #endif
-  td->td_retval[0] = O_FILES;
-  return (0);
-  }
-
-/* HACK */
-int fstat(struct thread *td,struct fstat_args *uap) {
-  struct file *fp = 0x0;
-
-  #ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-  #endif
-
-  fp = (struct file *)_current->td.o_files[uap->fd];
-  uap->sb->st_mode    = 0x2180;
-  uap->sb->st_blksize = 0x1000;
-  kprintf("fstat: %i",uap->fd);
-  return(0x0);
-  }
-
-/*!
- * \brief ioctl functionality not implimented yet
- *
- * \returns NULL for now
- */
-int ioctl(struct thread *td, struct ioctl_args *uap) {
-  td->td_retval[0] = 0x0;
-  return(0x0);
-  }
-
-/*!
- * \brief get pointer to file fd in specified thread
- *
- * \return returns fp
- */
-int getfd(struct thread *td,struct file **fp,int fd) {
-  int error = 0x0;
-
-  #ifdef DEBUG
-  kprintf("[%s:%i]",__FILE__,__LINE__);
-  #endif
-
-  *fp = (struct file *)td->o_files[fd];
-
-  if (fp == 0x0)
-    error = -1;
-
-  return(error);
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/kern_sig.c b/sys/kernel/kern_sig.c
deleted file mode 100644
index 86bc9ee..0000000
--- a/sys/kernel/kern_sig.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kern_sig.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/kern_sig.h>
-#include <sys/sysproto.h>
-#include <sys/thread.h>
-#include <lib/kprintf.h>
-#include <ubixos/endtask.h>
-#include <lib/kmalloc.h>
-#include <assert.h>
-
-int sigaction(struct thread *td,register struct sigaction_args *uap) {
-  return(0x0);
-  }
-
-int sigprocmask(register struct thread *td, struct sigprocmask_args *uap) {
-  return (0x0);
-  }
-
-
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/kern_sysctl.c b/sys/kernel/kern_sysctl.c
deleted file mode 100644
index 2daf858..0000000
--- a/sys/kernel/kern_sysctl.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kern_sysctl.c 168 2016-01-20 00:41:47Z reddawg $
-
- *****************************************************************************************/
-
-#include <sys/kern_sysctl.h>
-#include <sys/sysproto.h>
-#include <sys/thread.h>
-#include <ubixos/endtask.h>
-#include <ubixos/kpanic.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <assert.h>
-#include <string.h>
-
-static struct sysctl_entry *ctls = 0x0;
-
-static struct sysctl_entry *sysctl_find( int *, int );
-
-/* This is a cheat for now */
-static void def_ctls() {
-  int name[CTL_MAXNAME], name_len;
-  uInt32 page_val = 0x1000;
-  name[0] = 6;
-  name[1] = 7;
-  name_len = 2;
-  sysctl_add( name, name_len, "page_size", &page_val, sizeof(uInt32) );
-
-  /* Clock Rate */
-  name[0] = 1;
-  name[1] = 12;
-  page_val = 0x3E8;
-  sysctl_add( name, name_len, "page_size", &page_val, sizeof(uInt32) );
-
-  /* KERN: OS Release */
-  name[0] = 1;
-  name[1] = 24;
-  page_val = 101000;
-  sysctl_add( name, name_len, "kern.osreldate", &page_val, sizeof(uInt32) );
-
-  /* KERN: User Stack */
-  name[0] = 1;
-  name[1] = 33;
-  page_val = 0xCBE8000;
-  sysctl_add( name, name_len, "page_size", &page_val, sizeof(uInt32) );
-
-  /* KERN: ARND */
-  name[0] = 1;
-  name[1] = 37;
-  page_val = 0x1;
-  sysctl_add( name, name_len, "kern_arnd", &page_val, sizeof(uint32_t) );
-
-  /* HW: NCPU */
-  name[0] = 6;
-  name[1] = 3;
-  page_val = 0x1;
-  sysctl_add( name, name_len, "hw.ncpu", &page_val, sizeof(uint32_t) );
-}
-
-int sysctl_init() {
-  struct sysctl_entry *tmpCtl = 0x0;
-  if ( ctls != 0x0 ) {
-    kprintf( "sysctl already Initialized\n" );
-    while ( 1 )
-      ;
-  }
-
-  ctls = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  ctls->prev = 0x0;
-  ctls->id = CTL_UNSPEC;
-  ctls->children = 0x0;
-  sprintf( ctls->name, "unspec" );
-
-  tmpCtl = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->prev = ctls;
-  tmpCtl->id = CTL_KERN;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "kern" );
-  ctls->next = tmpCtl;
-
-  tmpCtl->next = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->next->prev = tmpCtl;
-  tmpCtl = tmpCtl->next;
-  tmpCtl->id = CTL_VM;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "vm" );
-
-  tmpCtl->next = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->next->prev = tmpCtl;
-  tmpCtl = tmpCtl->next;
-  tmpCtl->id = CTL_VFS;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "vfs" );
-
-  tmpCtl->next = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->next->prev = tmpCtl;
-  tmpCtl = tmpCtl->next;
-  tmpCtl->id = CTL_NET;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "net" );
-
-  tmpCtl->next = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->next->prev = tmpCtl;
-  tmpCtl = tmpCtl->next;
-  tmpCtl->id = CTL_DEBUG;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "debug" );
-
-  tmpCtl->next = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->next->prev = tmpCtl;
-  tmpCtl = tmpCtl->next;
-  tmpCtl->id = CTL_HW;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "hw" );
-
-  tmpCtl->next = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->next->prev = tmpCtl;
-  tmpCtl = tmpCtl->next;
-  tmpCtl->id = CTL_MACHDEP;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "machdep" );
-
-  tmpCtl->next = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->next->prev = tmpCtl;
-  tmpCtl = tmpCtl->next;
-  tmpCtl->id = CTL_USER;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "user" );
-
-  tmpCtl->next = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->next->prev = tmpCtl;
-  tmpCtl = tmpCtl->next;
-  tmpCtl->id = CTL_P1003_1B;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "p1003_1b" );
-
-  tmpCtl->next = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-  tmpCtl->next->prev = tmpCtl;
-  tmpCtl = tmpCtl->next;
-  tmpCtl->id = CTL_UBIX;
-  tmpCtl->children = 0x0;
-  sprintf( tmpCtl->name, "ubix" );
-
-  def_ctls();
-
-  return (0x0);
-}
-
-int __sysctl( struct thread *td, struct sysctl_args *uap ) {
-  struct sysctl_entry *tmpCtl = 0x0;
-  int i = 0;
-
-  if ( ctls == 0x0 )
-    K_PANIC( "sysctl not initialized" );
-
-  if ( uap->newlen < 0 ) {
-    kprintf( "Changing Not supported yet.\n" );
-    endTask( _current->id );
-  }
-
-  tmpCtl = sysctl_find( uap->name, uap->namelen );
-  if ( tmpCtl == 0x0 ) {
-    kprintf( "Invalid CTL\n" );
-    for ( i = 0x0; i < uap->namelen; i++ )
-      kprintf( "(%i)", uap->name[i] );
-    kprintf( "\n" );
-    endTask( _current->id );
-  }
-
-  if ( (uint32_t) uap->oldlenp < tmpCtl->val_len )
-    memcpy( uap->old, tmpCtl->value, (uInt32) uap->oldlenp );
-  else
-    memcpy( uap->old, tmpCtl->value, tmpCtl->val_len );
-
-  td->td_retval[0] = 0x0;
-
-  return (0x0);
-}
-
-int sys_sysctl( struct thread *td, struct sys_sysctl_args *args ) {
-  struct sysctl_entry *tmpCtl = 0x0;
-  int i = 0;
-
-  if ( ctls == 0x0 )
-    K_PANIC( "sysctl not initialized" );
-
-  if ( args->newlenp < 0 ) {
-    kprintf( "Changing Not supported yet.\n" );
-    endTask( _current->id );
-  }
-
-  tmpCtl = sysctl_find( args->name, args->namelen );
-
-  if ( tmpCtl == 0x0 ) {
-    kprintf( "Invalid CTL\n" );
-    for ( i = 0x0; i < args->namelen; i++ )
-      kprintf( "(%i)", args->name[i] );
-    kprintf( "\n" );
-    //endTask(_current->id);
-    return (-1);
-  }
-
-  if ( (uint32_t) args->oldlenp < tmpCtl->val_len )
-    memcpy( args->oldp, tmpCtl->value, (uInt32) args->oldlenp );
-  else
-    memcpy( args->oldp, tmpCtl->value, tmpCtl->val_len );
-
-  //td->td_retval[0] = 0x0;
-
-  return (0x0);
-}
-
-static struct sysctl_entry *sysctl_find( int *name, int namelen ) {
-  int i = 0x0;
-  struct sysctl_entry *tmpCtl = 0x0;
-  struct sysctl_entry *lCtl = ctls;
-
-  /* Loop Name Len */
-  for ( i = 0x0; i < namelen; i++ ) {
-    for ( tmpCtl = lCtl; tmpCtl != 0x0; tmpCtl = tmpCtl->next ) {
-      //kprintf("ctlName: [%s], ctlId; [%i]\n",tmpCtl->name,tmpCtl->id);
-      if ( tmpCtl->id == name[i] ) {
-        if ( (i + 1) == namelen ) {
-          return (tmpCtl);
-        }
-        lCtl = tmpCtl->children;
-        break;
-      }
-    }
-  }
-  return (0x0);
-}
-
-int sysctl_add( int *name, int namelen, char *str_name, void *buf, int buf_size ) {
-  struct sysctl_entry *tmpCtl = 0x0;
-  struct sysctl_entry *newCtl = 0x0;
-
-  /* Check if it exists */
-  tmpCtl = sysctl_find( name, namelen );
-  if ( tmpCtl != 0x0 ) {
-    kprintf( "Node Exists!\n" );
-    while ( 1 )
-      ;
-  }
-
-  /* Get Parent Node */
-  tmpCtl = sysctl_find( name, namelen - 1 );
-  if ( tmpCtl == 0x0 ) {
-    kprintf( "Parent Node Non Existant\n" );
-    return (-1);
-  }
-  if ( tmpCtl->children == 0x0 ) {
-    tmpCtl->children = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-    tmpCtl->children->children = 0x0;
-    tmpCtl->children->prev = 0x0;
-    tmpCtl->children->next = 0x0;
-    tmpCtl->children->id = name[namelen - 1];
-    sprintf( tmpCtl->children->name, str_name );
-    tmpCtl->children->value = (void *) kmalloc( buf_size );
-    memcpy( tmpCtl->children->value, buf, buf_size );
-    tmpCtl->children->val_len = buf_size;
-  }
-  else {
-    newCtl = (struct sysctl_entry *) kmalloc( sizeof(struct sysctl_entry) );
-    newCtl->prev = 0x0;
-    newCtl->next = tmpCtl->children;
-    newCtl->children = 0x0;
-    newCtl->id = name[namelen - 1];
-    sprintf( newCtl->name, str_name );
-    newCtl->value = (void *) kmalloc( buf_size );
-    memcpy( newCtl->value, buf, buf_size );
-    newCtl->val_len = buf_size;
-    tmpCtl->children->prev = newCtl;
-    tmpCtl->children = newCtl;
-  }
-
-  return (0x0);
-}
-
-/***
- END
- ***/
diff --git a/sys/kernel/ld.c b/sys/kernel/ld.c
deleted file mode 100644
index 6d4eae0..0000000
--- a/sys/kernel/ld.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ld.c 141 2016-01-17 02:05:18Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/ld.h>
-#include <ubixos/sched.h>
-#include <sys/elf.h>
-#include <ubixos/kpanic.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <vfs/vfs.h>
-#include <vmm/vmm.h>
-#include <string.h>
-#include <assert.h>
-
-uInt32 ldEnable() {
-  int               i             = 0x0;
-  int               x             = 0x0;
-  int               rel           = 0x0;
-  int               sym           = 0x0;
-  char             *newLoc        = 0x0; 
-  char             *shStr         = 0x0;
-  char             *dynStr        = 0x0;
-  uInt32           *reMap         = 0x0;
-  fileDescriptor   *ldFd          = 0x0;
-  elfHeader        *binaryHeader  = 0x0;
-  elfProgramHeader *programHeader = 0x0;
-  elfSectionHeader *sectionHeader = 0x0;
-  elfDynSym        *relSymTab     = 0x0;
-  elfPltInfo       *elfRel        = 0x0;
-
-  /* Open our dynamic linker */
-  ldFd = fopen("sys:/libexec/ld.so","rb");
-
-  if (ldFd == 0x0) {
-    kprintf("Can not open ld.so\n");
-    }
- 
-  fseek(ldFd,0x0,0x0);
-  binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader));
-  assert(binaryHeader);
-  fread(binaryHeader,sizeof(elfHeader),1,ldFd);
-
-  programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum);
-  assert(programHeader);
-  fseek(ldFd,binaryHeader->ePhoff,0);
-  fread(programHeader,sizeof(elfSectionHeader),binaryHeader->ePhnum,ldFd);
-
-  sectionHeader = (elfSectionHeader *)kmalloc(sizeof(elfSectionHeader)*binaryHeader->eShnum);
-  assert(sectionHeader);
-  fseek(ldFd,binaryHeader->eShoff,0);
-  fread(sectionHeader,sizeof(elfSectionHeader),binaryHeader->eShnum,ldFd);
-
-  shStr = (char *)kmalloc(sectionHeader[binaryHeader->eShstrndx].shSize);
-  fseek(ldFd,sectionHeader[binaryHeader->eShstrndx].shOffset,0);
-  fread(shStr,sectionHeader[binaryHeader->eShstrndx].shSize,1,ldFd);
-
-  for (i = 0x0;i < binaryHeader->ePhnum;i++) {
-    switch (programHeader[i].phType) {
-      case PT_LOAD:
-        newLoc = (char *)programHeader[i].phVaddr + LD_START;
-        /*
-        Allocate Memory Im Going To Have To Make This Load Memory With Correct
-        Settings so it helps us in the future
-        */
-        for (x=0;x < (programHeader[i].phMemsz);x += 0x1000) {
-          /* make r/w or ro */
-          if ((vmm_remapPage(vmm_findFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x + LD_START),PAGE_DEFAULT)) == 0x0) 
-	    K_PANIC("vmmRemapPage: ld");
-          memset((void *)((programHeader[i].phVaddr & 0xFFFFF000) + x + LD_START),0x0,0x1000);
-          }
-        /* Now Load Section To Memory */
-        fseek(ldFd,programHeader[i].phOffset,0x0);
-        fread(newLoc,programHeader[i].phFilesz,1,ldFd);
-
-        break;
-      case PT_DYNAMIC:
-        /* Now Load Section To Memory */
-        fseek(ldFd,programHeader[i].phOffset,0x0);
-        fread(newLoc,programHeader[i].phFilesz,1,ldFd);
-        break;
-      case PT_GNU_STACK:
-        /* Tells us if the stack should be executable.  Failsafe to executable
-	   until we add checking */
-      	break;
-      case PT_PAX_FLAGS:
-      	/* Not sure... */
-	break;
-      default:
-        kprintf("Unhandled Header (kernel) : %08x\n", programHeader[i].phType);
-        break;
-      }
-    }
-
-  for (i=0x0;i<binaryHeader->eShnum;i++) {
-    switch (sectionHeader[i].shType) {
-     case 3:
-        if (!strcmp((shStr + sectionHeader[i].shName),".dynstr")) {
-          dynStr = (char *)kmalloc(sectionHeader[i].shSize);
-          fseek(ldFd,sectionHeader[i].shOffset,0x0);
-          fread(dynStr,sectionHeader[i].shSize,1,ldFd);
-          }
-        break;
-      case 9:
-        elfRel = (elfPltInfo *)kmalloc(sectionHeader[i].shSize);
-        fseek(ldFd,sectionHeader[i].shOffset,0x0);
-        fread(elfRel,sectionHeader[i].shSize,1,ldFd);
-
-        for (x=0x0;x<sectionHeader[i].shSize/sizeof(elfPltInfo);x++) {
-          rel = ELF32_R_SYM(elfRel[x].pltInfo);
-          reMap = (uInt32 *)((uInt32)LD_START + elfRel[x].pltOffset);
-          switch (ELF32_R_TYPE(elfRel[x].pltInfo)) {
-            case R_386_32:
-              *reMap += ((uInt32)LD_START + relSymTab[rel].dynValue);
-              break;
-            case R_386_PC32:
-              *reMap += ((uInt32)LD_START + relSymTab[rel].dynValue) - (uInt32)reMap;
-              break;
-            case R_386_RELATIVE:
-              *reMap += (uInt32)LD_START;
-              break;
-            default:
-              kprintf("[0x%X][0x%X](%i)[%s]\n",elfRel[x].pltOffset,elfRel[x].pltInfo,rel,elfGetRelType(ELF32_R_TYPE(elfRel[x].pltInfo)));
-              kprintf("relTab [%s][0x%X][0x%X]\n",dynStr + relSymTab[rel].dynName,relSymTab[rel].dynValue,relSymTab[rel].dynName);
-              break;
-            }
-          }
-        kfree(elfRel);
-        break;
-      case 11:
-        relSymTab = (elfDynSym *)kmalloc(sectionHeader[i].shSize);
-        fseek(ldFd,sectionHeader[i].shOffset,0x0);
-        fread(relSymTab,sectionHeader[i].shSize,1,ldFd);
-        sym = i;
-        break;
-      }
-    }
-
-  i = binaryHeader->eEntry + LD_START;
-
-  kfree(dynStr);
-  kfree(shStr);
-  kfree(relSymTab);
-  kfree(sectionHeader);
-  kfree(programHeader);
-  kfree(binaryHeader);
-  fclose(ldFd);
-
-  return((uInt32)i);
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/pipe.c b/sys/kernel/pipe.c
deleted file mode 100644
index 9945db0..0000000
--- a/sys/kernel/pipe.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: pipe.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/pipe.h>
-#include <sys/sysproto.h>
-#include <sys/thread.h>
-#include <sys/kern_descrip.h>
-#include <lib/kprintf.h>
-#include <assert.h>
-
-/**
-  HACK
-*/
-int pipe(struct thread *td, struct pipe_args *uap) {
-  struct file *rf, *wf;
-  int fd = 0x0;
-  falloc(td,&rf,&fd);
-  rf->f_flag = FREAD | FWRITE;
-  td->td_retval[0] = fd;
-  falloc(td,&wf,&fd);
-  wf->f_flag = FREAD | FWRITE;
-  td->td_retval[1] = fd;
-  return(0x0);
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/sem.c b/sys/kernel/sem.c
deleted file mode 100644
index 842f832..0000000
--- a/sys/kernel/sem.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sem.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/sem.h>
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/smp.c b/sys/kernel/smp.c
deleted file mode 100644
index 1c9f986..0000000
--- a/sys/kernel/smp.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: smp.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/smp.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/kpanic.h>
-#include <lib/kprintf.h>
-#include <lib/string.h>
-#include <sys/io.h>
-
-static struct spinLock initSpinLock = SPIN_LOCK_INITIALIZER;
-static struct spinLock cpuInfoLock = SPIN_LOCK_INITIALIZER;
-static uInt32 cpus = 0;
-struct cpuinfo_t cpuinfo[8];
-
-uInt8 kernel_function(void);
-uInt8 *vram = (uInt8 *)0xB8000;
-
-static inline unsigned int apicRead(address) {
-  return *(volatile unsigned int *) (0xFEE00000 + address);
-  }
-
-static inline void apicWrite(unsigned int address,unsigned int data) {
-  *(volatile unsigned int *) (0xFEE00000 + address) = data;
-  }
-
-static __inline__ void setDr3 (void *dr3) {
-  register uInt32 value = (uInt32)dr3;
-  __asm__ __volatile__ ("mov %0, %%dr3" :: "r" (value));
-  }
-
-static __inline__ uInt32 getDr3 (void) {
-  register uInt32 value;
-  __asm__ __volatile__ ("mov %%dr3, %0" : "=r" (value));
-  return value;
-  }
-
-struct gdt_descr {
-  uInt16  limit;
-  uInt32 *base __attribute__ ((packed));
-};
-
-static void GDT_fixer() {
-  struct gdt_descr  gdt_descr;
-  uInt32 *gdt = (uInt32 *)0x20000; // 128KB
-
-  gdt[0] = 0;
-  gdt[1] = 0;
-  gdt[2] = 0x0000ffff; // seg 0x8  -- DPL 0 4GB code
-  gdt[3] = 0x00cf9a00;
-  gdt[4] = 0x0000ffff; // seg 0x10 -- DPL 0 4GB data
-  gdt[5] = 0x00cf9200;
-  gdt[6] = 0x0000ffff; // seg 0x1b -- DPL 3 4GB code
-  gdt[7] = 0x00cffa00;
-  gdt[8] = 0x0000ffff; // seg 0x23 -- DPL 3 4GB data
-  gdt[9] = 0x00cff200;
-
-  gdt_descr.limit = 32 * 4;
-  gdt_descr.base  = gdt;
-
-  /*
-  asm("lgdt %0;" : : "m" (gdt_descr));
-  __asm__ __volatile__ ("ljmp %0,$1f; 1:" :: "i" (0x08));
-  __asm__ __volatile__ ("movw %w0,%%ds" :: "r" (0x10));
-  __asm__ __volatile__ ("movw %w0,%%es" :: "r" (0x10));
-  __asm__ __volatile__ ("movw %w0,%%ss" :: "r" (0x10));
-  */
-  }
-
-
-void cpu0_thread(void) {
-  for(;;) {
-    vram[40+640] = kernel_function();
-    vram[42+640]++;
-  }
-}
-void cpu1_thread(void) {
-  for(;;) {
-    vram[60+640] = kernel_function();
-    vram[62+640]++;
-  }
-}
-void cpu2_thread(void) {
-  for(;;) {
-    vram[80+640] = kernel_function();
-    vram[82+640]++;
-  }
-}
-void cpu3_thread(void) {
-  for(;;) {
-    vram[100+640] = kernel_function();
-    vram[102+640]++;
-  }
-}
-
-static struct spinLock bkl = SPIN_LOCK_INITIALIZER;
-uInt8 kernel_function(void) {
-  struct cpuinfo_t *cpu;
-
-  spinLock(&bkl);
-
-
-  cpu = (struct cpuinfo_t *)getDr3();
-
-  spinUnlock(&bkl);
-
-  return('0' + cpu->id);
-}
-
-
-void c_ap_boot(void) {
-
-  while(spinLockLocked(&initSpinLock));
-
-  switch(cpuInfo()) {
-  case 1:
-    cpu1_thread();
-    break;
-  case 2:
-    cpu2_thread();
-    break;
-  case 3:
-    cpu3_thread();
-    break;
-  }
-
-  outportByte(0xe9,'5');
-
-  for(;;) {
-    asm("nop");
-  }
-}
-
-
-void smpInit() {
-  spinLock(&initSpinLock);
-  GDT_fixer();
-  cpuidDetect();
-  cpuInfo();
-  apicMagic();
-  spinUnlock(&initSpinLock);
-
-  //cpu0_thread(); 
- 
-  }
-
-void cpuidDetect() {
-  if (!(getEflags() & (1<<21)) ) {
-    setEflags(getEflags() | (1<<21));
-    if( !(getEflags() & (1<<21)) ) {
-      kpanic("CPU doesn't support CPUID, get a newer machine\n");
-      }
-    }
-  }
-
-uInt8 cpuInfo() {
-  uInt32 data[4],i;
-
-  if( !(getEflags() & (1<<21)) ) {       // If the cpuid bit in eflags not set..
-    setEflags(getEflags() | (1<<21));   // ..try and set it to see if it comes on..
-    if( !(getEflags() & (1<<21)) ) {     // It didn't.. This CPU suck
-      kpanic("CPU doesn't support CPUID, get a newer machine\n");
-    }
-  }
-
-  spinLock(&cpuInfoLock);
-  cpuinfo[cpus].ok = 1;
-  cpuinfo[cpus].apic_id  = apicRead(0x20) >> 24;
-  cpuinfo[cpus].apic_ver = apicRead(0x30) & 0xFF;
-
-  cpuid(0,data);
-  *(uInt32 *)&cpuinfo[cpus].ident[0] = data[1];
-  *(uInt32 *)&cpuinfo[cpus].ident[4] = data[3];
-  *(uInt32 *)&cpuinfo[cpus].ident[8] = data[2];
-  cpuinfo[cpus].ident[17] = 0;
-  cpuinfo[cpus].max = data[0];
-
-  cpuid(1,data);
-  cpuinfo[cpus].signature = data[0];
-  cpuinfo[cpus].feature   = data[3];
-
-  cpuid(0x80000000,data);
-  if(data[0]>=0x80000004) {
-    for(i=0;i<3;i++) {
-      cpuid(0x80000002 + i,data);
-
-      *(unsigned int *)&cpuinfo[cpus].brand[16*i+0]  = data[0];
-      *(unsigned int *)&cpuinfo[cpus].brand[16*i+4]  = data[1];
-      *(unsigned int *)&cpuinfo[cpus].brand[16*i+8]  = data[2];
-      *(unsigned int *)&cpuinfo[cpus].brand[16*i+12] = data[3];
-    }
-    cpuinfo[cpus].brand[48] = 0;
-  } else {
-    cpuinfo[cpus].brand[0] = 0;
-  }
-
-  setDr3(&cpuinfo[cpus]); // DR3 always points to the cpu-struct for that CPU (should be thread-struct of current thread)
-  cpuinfo[cpus].id = cpus;
-
-  cpus++;
-
-  spinUnlock(&cpuInfoLock);
-
-  return(cpus - 1);
-  }
-
-extern void ap_trampoline_start(),ap_trampoline_end();
-void apicMagic(void) {
-  uInt32 tmp;
-
-  kprintf("Copying %u bytes from 0x%x to 0x00\n",ap_trampoline_end - ap_trampoline_start,ap_trampoline_start);
-  memcpy(0x0,(char *)ap_trampoline_start,ap_trampoline_end - ap_trampoline_start);
-  apicWrite(0x280,0);
-  apicRead(0x280);
-
-  apicWrite(0x300,0x000C4500);  // INIT IPI to all CPUs
-  for(tmp=0;tmp<800000;tmp++) asm("nop"); // Sleep a little (should be 10ms)
-  apicWrite(0x300,0x000C4600);  // INIT SIPI to all CPUs
-  for(tmp=0;tmp<800000;tmp++) asm("nop"); // Sleep a little (should be 200ms)
-  apicWrite(0x300,0x000C4600);  // Second INIT SIPI
-  for(tmp=0;tmp<800000;tmp++) asm("nop"); // Sleep a little (should be 200ms)
-  }
-
-
-
-uInt32 getEflags() {
-  uInt32 eflags = 0x0;
-  asm(
-    "pushfl     \n"
-    "popl %%eax \n"
-    : "=a" (eflags)
-    );
-  return(eflags);
-  }
-
-void setEflags(uInt32 eflags) {
-  asm(
-    "pushl %%eax \n"
-    "popfl       \n"
-    :
-    : "a" (eflags)
-    );
-  }
-
-asm(
-  ".globl cpuid            \n"
-  "cpuid:                  \n"
-  "  pushl   %ebx          \n"
-  "  pushl   %edi          \n"
-  "  movl    12(%esp),%eax \n"
-  "  movl    16(%esp),%edi \n"
-  "  cpuid                 \n"
-  "  movl    %eax,0(%edi)  \n"
-  "  movl    %ebx,4(%edi)  \n"
-  "  movl    %ecx,8(%edi)  \n"
-  "  movl    %edx,12(%edi) \n"
-  "  popl    %edi          \n"
-  "  popl    %ebx          \n"
-  "  ret                   \n"
-  );
- 
-/***
- END
- ***/
-
diff --git a/sys/kernel/syscall_new.c b/sys/kernel/syscall_new.c
deleted file mode 100644
index 88f4a28..0000000
--- a/sys/kernel/syscall_new.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: syscall_new.c 172 2016-01-20 13:57:36Z reddawg $
-
- *****************************************************************************************/
-
-#include <ubixos/syscalls.h>
-#include <ubixos/syscall.h>
-#include <ubixos/sched.h>
-#include <ubixos/endtask.h>
-#include <ubixos/spinlock.h>
-#include <sys/trap.h>
-#include <sys/elf.h>
-#include <lib/string.h>
-#include <lib/kprintf.h>
-
-struct spinLock Master = SPIN_LOCK_INITIALIZER;
-
-void syscall( struct trapframe *frame ) {
-  uint32_t code = 0x0;
-  caddr_t params;
-
-  struct thread *td = &_current->td;
-
-  td->frame = frame;
-
-  int args[8];
-  int error = 0x0;
-
-  params = (caddr_t) frame->tf_esp + sizeof(int);
-
-  code = frame->tf_eax;
-
-  if ( code == 198 ) {
-    memcpy( &code, params, sizeof(int) );
-    params += sizeof(quad_t);
-  }
-
-  if ( code > totalCalls ) {
-    kprintf( "Invalid Call: [%i]\n", frame->tf_eax );
-    kpanic("PID: %i", _current->id);
-  }
-  else if ( (uint32_t) systemCalls[code].sc_status == SYSCALL_INVALID ) {
-    kprintf( "Invalid Call: [%i][0x%X]\n", code, (uint32_t) systemCalls[code].sc_name );
-    frame->tf_eax = -1;
-    frame->tf_edx = 0x0;
-  }
-  else {
-    //memcpy( args, params, 8 * sizeof(int) );
-
-    td->td_retval[0] = 0;
-    td->td_retval[1] = frame->tf_edx;
-
-    if ( systemCalls[code].sc_status == SYSCALL_DUMMY )
-      kprintf( "Syscall->abi: [%i], PID: [%i], Code: %i, Call: %s\n", td->abi, _current->id, frame->tf_eax, systemCalls[code].sc_name );
-
-    /*
-     if ( td->abi == ELFOSABI_UBIXOS )
-     error = (int) systemCalls[code].sc_entry( frame->tf_ebx, frame->tf_ecx, frame->tf_edx );
-     */
-
-    if ( td->abi == ELFOSABI_FREEBSD )
-      error = (int) systemCalls[code].sc_entry( td, params );
-    else
-      error = (int) systemCalls[code].sc_entry( td, params );
-
-if ( systemCalls[code].sc_status == SYSCALL_DUMMY ) {
-  kprintf("RET1");
-return;
-}
-
-    switch ( error ) {
-      case 0:
-        frame->tf_eax = td->td_retval[0];
-        frame->tf_edx = td->td_retval[1];
-        frame->tf_eflags &= ~PSL_C;
-if ( systemCalls[code].sc_status == SYSCALL_DUMMY )
-  kprintf("RET3");
-        break;
-/*
-      case ERESTART:
-        frame->tf_eip -= frame->tf_err;
-        break;
-*/
-      case EJUSTRETURN:
-        break;
-      default:
-        frame->tf_eax = error;
-        frame->tf_eflags |= PSL_C;
-        break;
-
-if ( systemCalls[code].sc_status == SYSCALL_DUMMY )
-  kprintf("RET2");
-if ( systemCalls[code].sc_status == SYSCALL_DUMMY )
-  kprintf("RET2.1");
-    }
-  }
-}
-
-int invalidCall() {
-  int sys_call;
-
-  asm(
-      "nop"
-      : "=a" (sys_call)
-      :
-  );
-
-  kprintf( "Invalid System Call #[%i]\n", sys_call );
-  kpanic("PID: %i", _current->id);
-  return (0);
-}
diff --git a/sys/kernel/syscalls.c b/sys/kernel/syscalls.c
deleted file mode 100644
index 02c26b2..0000000
--- a/sys/kernel/syscalls.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: elf.c 141 2016-01-17 02:05:18Z reddawg $
-
- *****************************************************************************************/
-
-#include <ubixos/syscalls.h>
-#include <sys/sysproto.h>
-
-/* System Calls List */
-struct syscall_entry systemCalls[] = {
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 0 - Invalid */
-    { ARG_COUNT( sys_exit_args ), "exit", (sys_call_t *)sys_exit ,2},
-    { ARG_COUNT( sys_fork_args ), "fork", (sys_call_t *)sys_fork , SYSCALL_VALID},
-    { ARG_COUNT( sys_read_args ), "read", (sys_call_t *)sys_read ,2 },
-    { ARG_COUNT( sys_write_args ), "write", (sys_call_t *)sys_write ,SYSCALL_VALID},
-    { ARG_COUNT( sys_open_args ), "open", (sys_call_t *)sys_open ,2 },
-    { ARG_COUNT( sys_close_args ), "close", (sys_call_t *)sys_close ,2 },
-    { ARG_COUNT( sys_wait4_args ), "wiat4", (sys_call_t *)sys_wait4 , 1},
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*   8 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*   9 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  10 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  11 - Invalid */
-    { ARG_COUNT(sys_chdir_args), "Change Dir", (sys_call_t *)sys_chdir, SYSCALL_VALID },         /*  12 - CH Dir */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  13 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  14 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  15 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  16 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  17 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  18 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  19 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  20 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  21 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  22 - Invalid */
-    { ARG_COUNT( sys_setUID_args), "Set UID", (sys_call_t *)sys_setUID, SYSCALL_VALID },         /*  23 - Set UID */
-    { 0, "Get UID", sys_getUID, SYSCALL_VALID },                                   /*  24 - sys_getUID */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  25 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  26 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  27 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  28 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  29 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  30 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  31 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  32 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  33 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  34 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  35 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  36 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  37 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  38 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  39 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  40 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  41 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  42 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  43 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  44 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  45 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  46 - Invalid */
-    { 0, "getuid", sys_getGID, SYSCALL_VALID },                                    /*  47 - sys_getGID  */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  48 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  49 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  50 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  51 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  52 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  53 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  54 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  55 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  56 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  57 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  58 - Invalid */
-    { ARG_COUNT( sys_execve_args), "Exec VE", (sys_call_t *)sys_execve, SYSCALL_DUMMY },                                  /*  59 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  60 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  61 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  62 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  63 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  64 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  65 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  66 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  67 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  68 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  69 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  70 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  71 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  72 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  73 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  74 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  75 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  76 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  77 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  78 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  79 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  80 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  81 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  82 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  83 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  84 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  85 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  86 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  87 - Invalid */
-    { 0, "Get Free Page", (sys_call_t *)sysGetFreePage, SYSCALL_VALID },                         /*  88 - getFreePage TEMP */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  89 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  90 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  91 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  92 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  93 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  94 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  95 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  96 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  97 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  98 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /*  99 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 100 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 101 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 102 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 103 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 104 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 105 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 106 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 107 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 108 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 109 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 110 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 111 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 112 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 113 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 114 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 115 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 116 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 117 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 118 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 119 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 120 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 121 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 122 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 123 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 124 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 125 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 126 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 127 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 128 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 129 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 130 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 131 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 132 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 133 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 134 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 135 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 136 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 137 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 138 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 139 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 140 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 141 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 142 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 143 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 144 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 145 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 146 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 147 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 148 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 149 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 150 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 151 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 152 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 153 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 154 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 155 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 156 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 157 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 158 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 159 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 160 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 161 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 162 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 163 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 164 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 165 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 166 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 167 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 168 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 169 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 170 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 171 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 172 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 173 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 174 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 175 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 176 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 177 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 178 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 179 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 180 - Invalid */
-    { ARG_COUNT(sys_setGID_args), "Set GID", (sys_call_t *)sys_setGID, SYSCALL_VALID },          /* 181 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 182 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 183 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 184 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 185 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 186 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 187 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 188 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 189 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 190 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 191 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 192 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 193 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 194 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 195 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 196 - Invalid */
-    { ARG_COUNT(sys_mmap_args), "MMAP", (sys_call_t *)sys_mmap, SYSCALL_VALID },                                  /* 197 - sys_mmap */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 198 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 199 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 200 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 201 - Invalid */
-    { ARG_COUNT(sys_sysctl_args), "SYS CTL", (sys_call_t *)sys_sysctl, SYSCALL_VALID },          /* 202 - sys_sysctl */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 203 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 204 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 205 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 206 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 207 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 208 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 209 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 210 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 211 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 212 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 213 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 214 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 215 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 216 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 217 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 218 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 219 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 220 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 221 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 222 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 223 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 224 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 225 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 226 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 227 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 228 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 229 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 230 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 231 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 232 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 233 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 234 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 235 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 236 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 237 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 238 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 239 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 240 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 241 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 242 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 243 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 244 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 245 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 246 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 247 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 248 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 249 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 250 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 251 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 252 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 253 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 254 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 255 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 256 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 257 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 258 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 259 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 260 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 261 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 262 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 263 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 264 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 265 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 266 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 267 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 268 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 269 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 270 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 271 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 272 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 273 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 274 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 275 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 276 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 277 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 278 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 279 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 280 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 281 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 282 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 283 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 284 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 285 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 286 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 287 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 288 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 289 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 290 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 291 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 292 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 293 - Invalid */
-    { ARG_COUNT(sys_fseek_args), "FILE Seek", (sys_call_t *)sys_fseek, SYSCALL_VALID },       /* 294 - sys_fseek */
-    { ARG_COUNT(sys_fgetc_args), "FILE Get Char", (sys_call_t *)sys_fgetc, SYSCALL_VALID },       /* 295 - sys_fread */
-    { ARG_COUNT(sys_fclose_args), "FILE Close", (sys_call_t *)sys_fclose, SYSCALL_VALID },       /* 296 - sys_fread */
-    { ARG_COUNT(sys_fread_args), "FILE Read", (sys_call_t *)sys_fread, SYSCALL_VALID },                                  /* 297 - sys_fread */
-    { ARG_COUNT(sys_fopen_args), "FILE Open", (sys_call_t *)sys_fopen, SYSCALL_VALID },                                  /* 298 - sys_fopen */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 299 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 300 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 301 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 302 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 303 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 304 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 305 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 306 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 307 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 308 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 309 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 310 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 311 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 312 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 313 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 314 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 315 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 316 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 317 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 318 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 319 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 320 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 321 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 322 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 323 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 324 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 325 - Invalid */
-    { ARG_COUNT(sys_getcwd_args), "Get CWD", (sys_call_t *)sys_getcwd, SYSCALL_VALID },                                  /* 326 - sys_getcwd */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 327 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 328 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 329 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 330 - Invalid */
-    { 0, "Sched Yield", sys_sched_yield, SYSCALL_VALID },                          /* 331 - sys_sched_yield */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 332 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 333 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 334 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 335 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 336 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 337 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 338 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 339 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 340 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 341 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 342 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 343 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 344 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 345 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 346 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 347 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 348 - Invalid */
-    { 0, "No Call", sys_invalid, SYSCALL_VALID },                                  /* 349 - Invalid */
-};
-
-int totalCalls = sizeof(systemCalls) / sizeof(struct syscall_entry);
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/time.c b/sys/kernel/time.c
deleted file mode 100644
index 9f106db..0000000
--- a/sys/kernel/time.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: time.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/time.h>
-#include <ubixos/vitals.h>
-#include <lib/kprintf.h>
-#include <assert.h>
-
-static int month[12] = {
-        0,
-        DAY*(31),
-        DAY*(31+29),
-        DAY*(31+29+31),
-        DAY*(31+29+31+30),
-        DAY*(31+29+31+30+31),
-        DAY*(31+29+31+30+31+30),
-        DAY*(31+29+31+30+31+30+31),
-        DAY*(31+29+31+30+31+30+31+31),
-        DAY*(31+29+31+30+31+30+31+31+30),
-        DAY*(31+29+31+30+31+30+31+31+30+31),
-        DAY*(31+29+31+30+31+30+31+31+30+31+30)
-};
-
-static int timeCmosRead(int addr) {
-  outportByteP(0x70,addr);
-  return((int)inportByte(0x71));
-  }
-
-int time_init() {
-  int i;
-  struct timeStruct time;
- 
-  for (i = 0 ; i < 1000000 ; i++) {
-    if (!(timeCmosRead(10) & 0x80)) {
-      break;
-      }
-    }
-
-  do {
-    time.sec = timeCmosRead(0);
-    time.min = timeCmosRead(2);
-    time.hour = timeCmosRead(4);
-    time.day = timeCmosRead(7);
-    time.mon = timeCmosRead(8);
-    time.year = timeCmosRead(9);
-    } while (time.sec != timeCmosRead(0));
-
-  BCD_TO_BIN(time.sec);
-  BCD_TO_BIN(time.min);
-  BCD_TO_BIN(time.hour);
-  BCD_TO_BIN(time.day);
-  BCD_TO_BIN(time.mon);
-  BCD_TO_BIN(time.year);
-
-  /* Set up our start time in seconds */
-  systemVitals->timeStart = timeMake(&time);
-
-  kprintf("%i/%i/%i %i:%i.%i\n",time.mon,time.day,time.year,time.hour,time.min,time.sec);
-
-  
-  /* Return so we know all went well */
-  return(0x0);
-  }
-
-uInt32 timeMake(struct timeStruct *time) {
-  uInt32 res;
-  int year;
-
-  year = (time->year+100) - 70;
-  /* magic offsets (y+1) needed to get leapyears right.*/
-  res = YEAR*year + DAY*((year+1)/4);
-  res += month[time->mon];
-  /* and (y+2) here. If it wasn't a leap-year, we have to adjust */
-  if (time->mon>1 && ((year+2)%4))
-    res -= DAY;
-  res += DAY*(time->day-1);
-  res += HOUR*time->hour;
-  res += MINUTE*time->min;
-  res += time->sec;
-  return(res);
-  }
-
-int gettimeofday(struct timeval *tp,struct timezone *tzp) {
-  //tp->tv_sec  = systemVitals->timeStart + systemVitals->sysUptime;
-  tp->tv_sec    = 0x0;//systemVitals->sysUptime;
-  tp->tv_usec = 0x0;
-  return(0x0);
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/kernel/tty.c b/sys/kernel/tty.c
deleted file mode 100644
index c1094a4..0000000
--- a/sys/kernel/tty.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: tty.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/tty.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/spinlock.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <sys/io.h>
-#include <string.h>
-
-static tty_term  *terms          = 0x0;
-tty_term         *tty_foreground = 0x0;
-static struct spinLock tty_spinLock   = SPIN_LOCK_INITIALIZER;
-
-int tty_init() {
-  int i = 0x0;
-
-  /* Allocate memory for terminals */
-  terms = (tty_term *)kmalloc(sizeof(tty_term)*TTY_MAX_TERMS);
-  if (terms == 0x0)
-    kpanic("tty_init: Failed to allocate memory. File: %s, Line: %i\n",__FILE__,__LINE__);
-
-  /* Set up all default terminal information */
-  for (i = 0;i < TTY_MAX_TERMS;i++) {
-    terms[i].tty_buffer = (char *)kmalloc(80*60*2);
-    if (terms[i].tty_buffer == 0x0)
-      kpanic("tty_init: Failed to allocate buffer memory. File: %s, Line: %i\n",__FILE__,__LINE__);
-
-    terms[i].tty_pointer = terms[i].tty_buffer;   /* Set up tty pointer to internal buffer */
-    terms[i].tty_x       = 0x0;                   /* Set up default X position             */
-    terms[i].tty_y       = 0x0;                   /* Set up default Y position             */
-    terms[i].tty_colour  = 0x0A + i;              /* Set up default tty text colour        */
-    }
-
-  /* Read tty0 current position (to migrate from kprintf). */
-  outportByte(0x3D4, 0x0e);
-  terms[0].tty_y = inportByte(0x3D5);
-  outportByte(0x3D4, 0x0f);
-  terms[0].tty_x = inportByte(0x3D5);
-
-
-  /* Set up pointer for the foreground tty */
-  tty_foreground = &terms[0];
-
-  /* Set up the foreground ttys information */
-  tty_foreground->tty_pointer = (char *)0xB8000;
-
-  /* Return to let kernel know initialization is complete */
-  kprintf("tty0 - Initialized\n");
-
-  return(0x0);
-  }
-
-
- /*
-  This will change the specified tty. It ultimately copies the screen
-  to the foreground buffer copies the new ttys buffer to the screen and
-  adjusts a couple pointers and we are good to go.
- */
-int tty_change(uInt16 tty) {
-
-  if (tty > TTY_MAX_TERMS)
-    kpanic("Error: Changing to an invalid tty. File: %s, Line: %i\n",__FILE__,__LINE__);
-
-  /* Copy display buffer to tty buffer */
-  memcpy(tty_foreground->tty_buffer,(char *)0xB8000,(80*60*2));
-
-  /* Copy new tty buffer to display buffer */
-  memcpy((char *)0xB8000,terms[tty].tty_buffer,(80*60*2));
-
-  /*
-   Set the tty_pointer to the internal buffer so I can continue 
-   writing to what it believes is the screen
-  */
-  tty_foreground->tty_pointer = tty_foreground->tty_buffer;
-
-  terms[tty].tty_pointer = (char *)0xB8000;
-
-  /* set new foreground tty */
-  tty_foreground = &terms[tty];
-
-  /* Adjust cursor when we change consoles */
-  outportByte(0x3D4, 0x0F);
-  outportByte(0x3D5, tty_foreground->tty_x);
-  outportByte(0x3D4, 0x0E);
-  outportByte(0x3D5, tty_foreground->tty_y);
-
-  return(0x0);
-  }
-
-int tty_print(char *string,tty_term *term) {
-  unsigned int    bufferOffset = 0x0, character = 0x0, i = 0x0;
-  spinLock(&tty_spinLock);
-
-  /* We Need To Get The Y Position */
-  bufferOffset = term->tty_y;
-  bufferOffset <<= 8;
-
-  /* Then We Need To Add The X Position */
-  bufferOffset += term->tty_x;
-  bufferOffset <<= 1;
-
-  while ((character = *string++)) {
-    switch (character) {
-    case '\n':
-      bufferOffset = (bufferOffset / 160) * 160 + 160;
-      break;
-    default:
-      term->tty_pointer[bufferOffset++] = character;
-      term->tty_pointer[bufferOffset++] = term->tty_colour;
-      break;
-    }  /* switch */
-
-    /* Check To See If We Are Out Of Bounds */
-    if (bufferOffset >= 160 * 25) {
-      for (i = 0; i < 160 * 24; i++) {
-        term->tty_pointer[i] = term->tty_pointer[i + 160];
-        }
-      for (i = 0; i < 80; i++) {
-        term->tty_pointer[(160 * 24) + (i * 2)] = 0x20;
-        term->tty_pointer[(160 * 24) + (i * 2) + 1] = term->tty_colour;
-        }
-      bufferOffset -= 160;
-      }
-    }
-
-  bufferOffset >>= 1;  /* Set the new cursor position  */
-  term->tty_x = (bufferOffset &  0xFF);
-  term->tty_y = (bufferOffset >> 0x8);
-
-  if (term == tty_foreground) {
-    outportByte(0x3D4, 0x0f);
-    outportByte(0x3D5, term->tty_x);
-    outportByte(0x3D4, 0x0e);
-    outportByte(0x3D5, term->tty_y);
-    }
-
-  spinUnlock(&tty_spinLock);
-
-  return(0x0);
-  }
-
-tty_term *tty_find(uInt16 tty) {
-  return(&terms[tty]);
-  }
-
-/***
- END
- ***/
diff --git a/sys/kernel/ubthread.c b/sys/kernel/ubthread.c
deleted file mode 100644
index ef179cc..0000000
--- a/sys/kernel/ubthread.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2017 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ubthread.c 54 2016-01-11 01:29:55Z reddawg $
-
- *****************************************************************************************/
-
-/* All these must be converted to be done atomically */
-
-#include <ubixos/ubthread.h>
-#include <ubixos/exec.h>
-#include <ubixos/sched.h>
-#include <ubixos/time.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/vitals.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-
-struct ubthread_cond_list *conds = 0x0;
-struct ubthread_mutex_list *mutex = 0x0;
-
-kTask_t *ubthread_self() {
-  return (_current);
-}
-
-int ubthread_cond_init(ubthread_cond_t *cond, const uint32_t attr) {
-  ubthread_cond_t ubcond = kmalloc(sizeof(struct ubthread_cond));
-  memset(ubcond, 0x0, sizeof(struct ubthread_cond));
-
-  ubcond->id = (int) cond;
-  ubcond->lock = ATOMIC_VAR_INIT(0);
-
-  *cond = ubcond;
-  return (0x0);
-}
-
-int ubthread_mutex_init(ubthread_mutex_t *mutex, const uint32_t attr) {
-  ubthread_mutex_t ubmutex = kmalloc(sizeof(struct ubthread_mutex));
-  memset(ubmutex, 0x0, sizeof(struct ubthread_mutex));
-
-  ubmutex->id = (int) mutex;
-  ubmutex->lock = ATOMIC_VAR_INIT(0);
-
-  *mutex = ubmutex;
-  return (0x0);
-}
-
-int ubthread_cond_destroy(ubthread_cond_t *cond) {
-  kfree(*cond);
-  *cond = 0x0;
-  return (0x0);
-}
-
-int ubthread_mutex_destroy(ubthread_mutex_t *mutex) {
-  kfree(*mutex);
-  *mutex = 0x0;
-  return (0x0);
-}
-
-int ubthread_create(kTask_t **thread, const uInt32 *attr, void (*tproc)(void), void *arg) {
-  *thread = (void *) execThread(tproc, (int) (kmalloc(0x2000) + 0x2000), arg);
-  return (0x0);
-}
-
-int ubthread_mutex_lock(ubthread_mutex_t *mutex) {
-  ubthread_mutex_t ubmutex = *mutex;
-
-  if (ubmutex->lock == TRUE && ubmutex->pid == _current->id) {
-    kprintf("Mutex Already Locked By This Thread");
-    kpanic("WHY?");
-    return (0x0);
-  }
-
-  while (1) {
-    if (xchg_32(&ubmutex->lock, TRUE) == FALSE)
-      break;
-
-    while (ubmutex->lock == TRUE)
-      sched_yield();
-  }
-
-  ubmutex->pid = _current->id;
-  return (0x0);
-}
-
-int ubthread_mutex_unlock(ubthread_mutex_t *mutex) {
-  ubthread_mutex_t ubmutex = *mutex;
-
-  if (ubmutex->lock != TRUE)
-    kpanic("NOT LOCKED?");
-
-  if (ubmutex->pid != _current->id)
-    kprintf("Trying To Unlock Mutex From No Locking Thread[%i - %i:0x%X]\n", ubmutex->pid, _current->id, *ubmutex);
-
-  while (1) {
-    if (xchg_32(&ubmutex->lock, FALSE) == TRUE)
-      break;
-    while (ubmutex->lock == FALSE)
-      sched_yield();
-  }
-
-  ubmutex->pid = 0x0;
-  return (0x0);
-}
-
-int ubthread_cond_timedwait(ubthread_cond_t *cond, ubthread_mutex_t *mutex, const struct timespec *abstime) {
-  ubthread_cond_t ubcond = *cond;
-  ubthread_mutex_t ubmutex = *mutex;
-
-  uint32_t enterTime = systemVitals->sysUptime + 20;
-
-  ubthread_mutex_unlock(mutex);
-
-  while (enterTime > systemVitals->sysUptime) {
-    if (ubcond->lock == FALSE)
-      break;
-    sched_yield();
-  }
-
-  ubthread_mutex_lock(mutex);
-
-  return (0x0);
-}
-
-int ubthread_cond_wait(ubthread_cond_t *cond, ubthread_mutex_t *mutex) {
-  ubthread_cond_t ubcond = *cond;
-  ubthread_mutex_unlock(mutex);
-  while (ubcond->lock == TRUE)
-    sched_yield();
-  ubthread_mutex_lock(mutex);
-  return (0x0);
-}
-
-int ubthread_cond_signal(ubthread_cond_t *cond) {
-  ubthread_cond_t ubcond = *cond;
-  while (xchg_32(&ubcond->lock, FALSE))
-    sched_yield();
-  return (0x0);
-}
-
-int ubthread_cond_broadcast(ubthread_cond_t *cond) {
-  ubthread_cond_t ubcond = *cond;
-  while (xchg_32(&ubcond->lock, FALSE))
-    sched_yield();
-  return (0x0);
-}
-
diff --git a/sys/kernel/vitals.c b/sys/kernel/vitals.c
deleted file mode 100644
index 1a94fb5..0000000
--- a/sys/kernel/vitals.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vitals.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/vitals.h>
-#include <ubixos/kpanic.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <string.h>
-
-vitalsNode *systemVitals = 0x0;
-
-/************************************************************************
-
-Function: vitals_init();
-Description: This will enable the vitals subsystem for ubixos
-
-Notes:
-
-02/20/2004 - Approved Its Quality
-
-************************************************************************/
-int vitals_init() {
-	/* Initialize Memory For The System Vitals Node */
-	systemVitals = (vitalsNode *) kmalloc(sizeof(vitalsNode));
-
-	/* If malloc Failed Then Error */
-	if (systemVitals == 0x0)
-	{
-		kpanic("Error: kmalloc Failed In initVitals\n");
-	}
-
-	/* Set all default values */
-	memset(systemVitals,0x0,sizeof(vitalsNode));
-  
-	systemVitals->quantum     = 8;
-	systemVitals->dQuantum    = 8;
-
-	/* Print Out Info For Vitals: */
-	kprintf("vitals0 - Address: [0x%X]\n",systemVitals);
-
-	/* Return so kernel knows that there is no problem */
-	return(0x0);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/kmods/Makefile b/sys/kmods/Makefile
deleted file mode 100644
index a4e01b8..0000000
--- a/sys/kmods/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002-2004 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = kmod.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX)-DNOBOOL $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX)-DNOBOOL $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/kmods/kmod.c b/sys/kmods/kmod.c
deleted file mode 100644
index 9d9f698..0000000
--- a/sys/kmods/kmod.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2005 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kmod.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <ubixos/types.h>
-#include <ubixos/kmod.h>
-#include <ubixos/sched.h>
-#include <ubixos/elf.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/lists.h>
-#include <ubixos/spinlock.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <vfs/vfs.h>
-#include <vmm/vmm.h>
-#include <string.h>
-#include <assert.h>
-
-List_t *List = 0x0;
-
-uInt32 kmod_add(const char *kmod_file, const char *name)
-{
-	uInt32 addr = 0x0;
-	Item_t *tmp;
-	kmod_t *kmods;
-
-	
-	addr = kmod_load(kmod_file);
-	if (addr == 0x0)
-		return 0x0;
-
-	if(List == 0x0)
-	{
-		List = InitializeList();
-	}
-
-	tmp = CreateItem();
-	InsertItemAtFront(List, tmp);
-	kmods = kmalloc(sizeof *kmods);
-	tmp->data = kmods;
-	if(kmods == NULL)
-	{
-		kprintf("kmod_add: unable to allocate memory!\n");
-		return 0x0;
-	}
-		
-	return 0x0;
-}
-
-uInt32 kmod_load(const char *kmod_file) {
-  int               i             = 0x0;
-  int               x             = 0x0;
-  int               rel           = 0x0;
-  int               sym           = 0x0;
-  char             *newLoc        = 0x0; 
-  char             *shStr         = 0x0;
-  char             *dynStr        = 0x0;
-  uInt32           *reMap         = 0x0;
-  fileDescriptor   *kmod_fd       = 0x0;
-  elfHeader        *binaryHeader  = 0x0;
-  elfProgramHeader *programHeader = 0x0;
-  elfSectionHeader *sectionHeader = 0x0;
-  elfDynSym        *relSymTab     = 0x0;
-  elfPltInfo       *elfRel        = 0x0;
-
-  /* Open kernel module */
-  kmod_fd = fopen(kmod_file,"rb");
-  if (kmod_fd == 0x0) {
-    kprintf("Can not open %s\n",kmod_file);
-      return 0x0;
-    }
- 
-  /* load module header */
-  fseek(kmod_fd,0x0,0x0);
-  binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader));
-  if(binaryHeader == 0x0)
-  {
-	kprintf("kmod: out of memory\n");
-	return 0x0;
-  }
-	
-  assert(binaryHeader);
-  fread(binaryHeader,sizeof(elfHeader),1,kmod_fd);
-
-  programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum);
-  assert(programHeader);
-  fseek(kmod_fd,binaryHeader->ePhoff,0);
-  fread(programHeader,sizeof(elfSectionHeader),binaryHeader->ePhnum,kmod_fd);
-
-  sectionHeader = (elfSectionHeader *)kmalloc(sizeof(elfSectionHeader)*binaryHeader->eShnum);
-  assert(sectionHeader);
-  fseek(kmod_fd,binaryHeader->eShoff,0);
-  fread(sectionHeader,sizeof(elfSectionHeader),binaryHeader->eShnum,kmod_fd);
-
-  shStr = (char *)kmalloc(sectionHeader[binaryHeader->eShstrndx].shSize);
-  fseek(kmod_fd,sectionHeader[binaryHeader->eShstrndx].shOffset,0);
-  fread(shStr,sectionHeader[binaryHeader->eShstrndx].shSize,1,kmod_fd);
-
-  for (i=0;i<binaryHeader->ePhnum;i++) {
-    switch (programHeader[i].phType) {
-      case PT_LOAD:
-      case PT_DYNAMIC:
-        newLoc = (char *)programHeader[i].phVaddr + LD_START;
-        /*
-        Allocate Memory Im Going To Have To Make This Load Memory With Correct
-        Settings so it helps us in the future
-        */
-        for (x=0;x < ((programHeader[i].phMemsz)+4095);x += 0x1000) {
-          /* make r/w or ro */
-          if ((vmm_remapPage(vmm_findFreePage(_current->id),((programHeader[i].phVaddr & 0xFFFFF000) + x + LD_START),PAGE_DEFAULT)) == 0x0) 
-	    kpanic("vmmRemapPage: ld\n");
-          memset((void *)((programHeader[i].phVaddr & 0xFFFFF000) + x + LD_START),0x0,0x1000);
-          }
-        /* Now Load Section To Memory */
-        fseek(kmod_fd,programHeader[i].phOffset,0x0);
-        fread(newLoc,programHeader[i].phFilesz,1,kmod_fd);
-        break;
-      case PT_GNU_STACK:
-        /* Tells us if the stack should be executable.  Failsafe to executable
-	   until we add checking */
-      	break;
-      case PT_PAX_FLAGS:
-      	/* Not sure... */
-	break;
-      default:
-        kprintf("Unhandled Header : %08x\n", programHeader[i].phType);
-        break;
-      }
-    }
-
-  for (i=0x0;i<binaryHeader->eShnum;i++) {
-    switch (sectionHeader[i].shType) {
-     case 3:
-        if (!strcmp((shStr + sectionHeader[i].shName),".dynstr")) {
-          dynStr = (char *)kmalloc(sectionHeader[i].shSize);
-          fseek(kmod_fd,sectionHeader[i].shOffset,0x0);
-          fread(dynStr,sectionHeader[i].shSize,1,kmod_fd);
-          }
-        break;
-      case 9:
-        elfRel = (elfPltInfo *)kmalloc(sectionHeader[i].shSize);
-        fseek(kmod_fd,sectionHeader[i].shOffset,0x0);
-        fread(elfRel,sectionHeader[i].shSize,1,kmod_fd);
-
-        for (x=0x0;x<sectionHeader[i].shSize/sizeof(elfPltInfo);x++) {
-          rel = ELF32_R_SYM(elfRel[x].pltInfo);
-          reMap = (uInt32 *)((uInt32)LD_START + elfRel[x].pltOffset);
-          switch (ELF32_R_TYPE(elfRel[x].pltInfo)) {
-            case R_386_32:
-              *reMap += ((uInt32)LD_START + relSymTab[rel].dynValue);
-              break;
-            case R_386_PC32:
-              *reMap += ((uInt32)LD_START + relSymTab[rel].dynValue) - (uInt32)reMap;
-              break;
-            case R_386_RELATIVE:
-              *reMap += (uInt32)LD_START;
-              break;
-            default:
-              kprintf("[0x%X][0x%X](%i)[%s]\n",elfRel[x].pltOffset,elfRel[x].pltInfo,rel,elfGetRelType(ELF32_R_TYPE(elfRel[x].pltInfo)));
-              kprintf("relTab [%s][0x%X][0x%X]\n",dynStr + relSymTab[rel].dynName,relSymTab[rel].dynValue,relSymTab[rel].dynName);
-              break;
-            }
-          }
-        kfree(elfRel);
-        break;
-      case 11:
-        relSymTab = (elfDynSym *)kmalloc(sectionHeader[i].shSize);
-        fseek(kmod_fd,sectionHeader[i].shOffset,0x0);
-        fread(relSymTab,sectionHeader[i].shSize,1,kmod_fd);
-        sym = i;
-        break;
-      }
-    }
-
-  i = binaryHeader->eEntry + LD_START;
-
-  kfree(dynStr);
-  kfree(shStr);
-  kfree(relSymTab);
-  kfree(sectionHeader);
-  kfree(programHeader);
-  kfree(binaryHeader);
-  fclose(kmod_fd);
-
-  return((uInt32)i);
-  }
-
-/***
- END
- ***/
diff --git a/sys/lib/Makefile b/sys/lib/Makefile
deleted file mode 100644
index 3c103e1..0000000
--- a/sys/lib/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-INCLUDES += -I../../lib/objgfx40/
-
-#  Objects
-OBJS = strcpy.o strlen.o memcpy.o memset.o assert.o sqrt.o atan.o divdi3.o libcpp.o strtok.o kmalloc.o kprintf.o vsprintf.o string.o net.o strtol.o
-#ogprintf.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cpp.o:
-	$(CXX) -DNOBOOL $(CFLAGS) -fno-rtti $(INCLUDES) -c -o $@ $<
-.cc.o:
-	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__ $(CFLAGS) -fno-rtti $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC)  $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC)  $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC)  $(CFLAGS) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/lib/assert.c b/sys/lib/assert.c
deleted file mode 100644
index f914131..0000000
--- a/sys/lib/assert.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: assert.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <assert.h>
-#include <lib/kprintf.h>
-#include <ubixos/kpanic.h>
-
-/*!
- * \brief The underlying assertion call which is wrapped by assert()
- *
- */
-void __assert(const char *func,const char *file,int line,const char *failedexpr) {
-  if (func == NULL)
-    kprintf("Assertion failed: (%s), file %s, line %d.\n", failedexpr, file, line);
-  else
-    kprintf("Assertion failed: (%s), function %s, file %s, line %d.\n", failedexpr, func, file, line);
-
-  K_PANIC("Asserted\n");
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/lib/atan.c b/sys/lib/atan.c
deleted file mode 100644
index 9c68b98..0000000
--- a/sys/lib/atan.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: atan.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <math.h>
-
-double atan(double x) {
-  return(x); /* Quick Hack To Make This Work */
-  }
-
-/***
- $Log: atan.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:10  reddawg
- no message
-
- Revision 1.3  2004/05/19 04:07:43  reddawg
- kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
-
- Revision 1.2  2004/05/19 03:46:32  reddawg
- A Few Quick Hacks To Make Things Work
-
- Revision 1.1.1.1  2004/04/15 12:07:10  reddawg
- UbixOS v1.0
-
- Revision 1.2  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
-
diff --git a/sys/lib/bcopy.c b/sys/lib/bcopy.c
deleted file mode 100644
index ac7c8ca..0000000
--- a/sys/lib/bcopy.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Chris Torek.
- *
- * 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.
- *
- * $ID: $
- */
-
-#include <sys/types.h>
-
-/*
- * sizeof(word) MUST BE A POWER OF TWO
- * SO THAT wmask BELOW IS ALL ONES
- */
-typedef	int word;		/* "word" used for optimal copy speed */
-typedef uint32_t uintptr_t;
-
-#define	wsize	sizeof(word)
-#define	wmask	(wsize - 1)
-
-/*
- * Copy a block of memory, handling overlap.
- * This is the routine that actually implements
- * (the portable versions of) bcopy, memcpy, and memmove.
- */
-#if defined(MEMCOPY) || defined(MEMMOVE)
-#include <string.h>
-
-void *
-#ifdef MEMCOPY
-memcpy
-#else
-memmove
-#endif
-(void *dst0, const void *src0, size_t length)
-#else
-#include <strings.h>
-
-void
-bcopy(const void *src0, void *dst0, size_t length)
-#endif
-{
-	char *dst = dst0;
-	const char *src = src0;
-	size_t t;
-
-	if (length == 0 || dst == src)		/* nothing to do */
-		goto done;
-
-	/*
-	 * Macros: loop-t-times; and loop-t-times, t>0
-	 */
-#define	TLOOP(s) if (t) TLOOP1(s)
-#define	TLOOP1(s) do { s; } while (--t)
-
-	if ((unsigned long)dst < (unsigned long)src) {
-		/*
-		 * Copy forward.
-		 */
-		t = (uintptr_t)src;	/* only need low bits */
-		if ((t | (uintptr_t)dst) & wmask) {
-			/*
-			 * Try to align operands.  This cannot be done
-			 * unless the low bits match.
-			 */
-			if ((t ^ (uintptr_t)dst) & wmask || length < wsize)
-				t = length;
-			else
-				t = wsize - (t & wmask);
-			length -= t;
-			TLOOP1(*dst++ = *src++);
-		}
-		/*
-		 * Copy whole words, then mop up any trailing bytes.
-		 */
-		t = length / wsize;
-		TLOOP(*(word *)dst = *(word *)src; src += wsize; dst += wsize);
-		t = length & wmask;
-		TLOOP(*dst++ = *src++);
-	} else {
-		/*
-		 * Copy backwards.  Otherwise essentially the same.
-		 * Alignment works as before, except that it takes
-		 * (t&wmask) bytes to align, not wsize-(t&wmask).
-		 */
-		src += length;
-		dst += length;
-		t = (uintptr_t)src;
-		if ((t | (uintptr_t)dst) & wmask) {
-			if ((t ^ (uintptr_t)dst) & wmask || length <= wsize)
-				t = length;
-			else
-				t &= wmask;
-			length -= t;
-			TLOOP1(*--dst = *--src);
-		}
-		t = length / wsize;
-		TLOOP(src -= wsize; dst -= wsize; *(word *)dst = *(word *)src);
-		t = length & wmask;
-		TLOOP(*--dst = *--src);
-	}
-done:
-#if defined(MEMCOPY) || defined(MEMMOVE)
-	return (dst0);
-#else
-	return;
-#endif
-}
diff --git a/sys/lib/divdi3.c b/sys/lib/divdi3.c
deleted file mode 100644
index cd33f1e..0000000
--- a/sys/lib/divdi3.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: divdi3.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <math.h>
-
-u_quad_t __udivdi3(u_quad_t a,u_quad_t b) {
-  return(0); /* Quick Hack */
-  }
-
-quad_t __divdi3(quad_t a,quad_t b) {
-  return(0); /* Quick Hack */
-  }
-
-/***
- $Log: divdi3.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:10  reddawg
- no message
-
- Revision 1.2  2004/05/19 03:46:32  reddawg
- A Few Quick Hacks To Make Things Work
-
- Revision 1.1.1.1  2004/04/15 12:07:10  reddawg
- UbixOS v1.0
-
- Revision 1.2  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
-
diff --git a/sys/lib/kmalloc.c b/sys/lib/kmalloc.c
deleted file mode 100644
index 94531b4..0000000
--- a/sys/lib/kmalloc.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kmalloc.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/sched.h>
-#include <ubixos/spinlock.h>
-#include <vmm/vmm.h>
-#include <string.h>
-#include <assert.h>
-
-/*
- Set up three descriptor tables:
- 
- kernDesc      - The inuse descriptor table 
- freeKernDesc  - The free descriptor table (descriptors with memory backing just not in use)
- emptyKernDesc - The empty descriptor table (descriptors with out a memory backing)
- 
-*/
-static struct memDescriptor *usedKernDesc  = 0x0;
-static struct memDescriptor *freeKernDesc  = 0x0;
-static struct memDescriptor *emptyKernDesc = 0x0;
-
-/*
- Set up our spinlocks so we do not corrupt linked lists if we have re-entrancy
-*/
-static struct spinLock mallocSpinLock    = SPIN_LOCK_INITIALIZER;
-static struct spinLock emptyDescSpinLock = SPIN_LOCK_INITIALIZER;
-
-/************************************************************************
-
-Function: void *getEmptyDesc()
-Description: Find An Empty Descriptor
-
-Notes:
-
-02/17/03 - Is This Efficient?
-
-************************************************************************/    
-static void *getEmptyDesc() {
-  int i = 0x0;
-  struct memDescriptor *tmpDesc = 0x0;
-
-  spinLock(&emptyDescSpinLock);
-  
-  tmpDesc = emptyKernDesc;
-  
-  if (tmpDesc != 0x0) {
-    emptyKernDesc       = tmpDesc->next;
-    if (emptyKernDesc != 0x0) 
-      emptyKernDesc->prev = 0x0;
-      
-     
-    tmpDesc->next       = 0x0;
-    tmpDesc->prev       = 0x0;
-    spinUnlock(&emptyDescSpinLock);
-    return(tmpDesc);
-    }
-  if ((emptyKernDesc = (struct memDescriptor *)vmm_getFreeMallocPage(4)) == 0x0)
-    kpanic("Error: vmmGetFreeKernelPage returned NULL\n");
-    
-  /* zero out the memory so we know there is no garbage */
-  memset(emptyKernDesc,0x0,0x4000);
-
-  emptyKernDesc[0].next = &emptyKernDesc[1];
-
-  for (i = 0x1;i < ((0x4000/sizeof(struct memDescriptor)));i++) {
-    if (i+1 < (0x4000/sizeof(struct memDescriptor)))
-      emptyKernDesc[i].next = &emptyKernDesc[i+1];
-    else
-      emptyKernDesc[i].next = 0x0;
-    emptyKernDesc[i].prev = &emptyKernDesc[i-1];
-    }
-
-  tmpDesc = &emptyKernDesc[0];
-
-  emptyKernDesc       = tmpDesc->next;
-  emptyKernDesc->prev = 0x0;
-  tmpDesc->next       = 0x0;
-  tmpDesc->prev       = 0x0;
-  spinUnlock(&emptyDescSpinLock);
-  return(tmpDesc);
-  }
-
-/************************************************************************
-
-Function: void insertFreeDesc(struct memDescriptor *freeDesc)
-Description: This Function Inserts A Free Descriptor On The List Which Is
-             Kept In Size Order
-
-Notes:
-
-02/17/03 - This Was Inspired By TCA's Great Wisdom -
-           "[20:20:59] <TCA> You should just insert it in order"
-
-************************************************************************/
-static int insertFreeDesc(struct memDescriptor *freeDesc) {
-  struct memDescriptor *tmpDesc = 0x0;
-  assert(freeDesc);
-  
-  if (freeDesc->limit <= 0x0)
-    kpanic("Inserting Descriptor with no limit\n");
-  
-  if (freeKernDesc != 0x0) {
- 
-    #if 0
-    freeDesc->next = freeKernDesc;
-    freeDesc->prev = 0x0;
-    freeKernDesc->prev = freeDesc;
-    freeKernDesc = freeDesc;
-    #endif 
-    
-    for (tmpDesc = freeKernDesc;tmpDesc != 0x0;tmpDesc = tmpDesc->next) {
-      if (freeDesc->limit <= tmpDesc->limit) {
-      
-        freeDesc->prev = tmpDesc->prev;
-        if (tmpDesc->prev != 0x0)
-          tmpDesc->prev->next = freeDesc;
-
-        
-        tmpDesc->prev  = freeDesc;
-        freeDesc->next = tmpDesc;
-        
-        if (tmpDesc == freeKernDesc)
-          freeKernDesc = freeDesc;
-        return(0x0);
-        }
-       if (tmpDesc->next == 0x0) {
-         tmpDesc->next = freeDesc;
-         freeDesc->prev = tmpDesc;
-         freeDesc->next = 0x0;
-         return(0x0);
-         }
-      }
-    kpanic("didnt Insert\n");
-    return(0x0);
-    }
-  else {
-    freeDesc->prev = 0x0;
-    freeDesc->next = 0x0;
-    freeKernDesc = freeDesc;
-    return(0x0);
-    }
-
-  return(0x1);
-  }
-
-/************************************************************************
-
-Function: void mergeMemBlocks()
-Description: This Function Will Merge Free Blocks And Free Pages
-
-Notes:
-
-03/05/03 - We Have A Problem It Seems The First Block Is Limit 0x0
-
-************************************************************************/
-static void mergeMemBlocks() {
-  struct memDescriptor *tmpDesc1 = 0x0;
-  struct memDescriptor *tmpDesc2 = 0x0;
-  uInt32               baseAddr  = 0x0;
-
-  return;
-
-  //Loop The Free Descriptors See If We Can Merge Them
-  mergeStart:
-  for (tmpDesc1=freeKernDesc;tmpDesc1 != 0x0;tmpDesc1=tmpDesc1->next) {
-    /*
-     Compare The Base Addr With The Other Descriptors If You Find The One
-     That You Are Looking For Lets Merge Them
-    */
-    if (tmpDesc1->limit != 0x0) {
-      baseAddr = (uInt32)tmpDesc1->baseAddr + (uInt32)tmpDesc1->limit;
-      for (tmpDesc2=freeKernDesc;tmpDesc2;tmpDesc2=tmpDesc2->next) {
-        if ((uInt32)tmpDesc2->baseAddr == baseAddr) {
-          tmpDesc1->limit += tmpDesc2->limit;
-          tmpDesc2->baseAddr = 0x0;
-          tmpDesc2->limit    = 0x0;
-          if (tmpDesc2->prev) {
-            tmpDesc2->prev->next = tmpDesc2->next;
-            }
-          if (tmpDesc2->next) {
-            tmpDesc2->next->prev = tmpDesc2->prev;
-            }
-          tmpDesc2->prev      = 0x0;
-          tmpDesc2->next      = emptyKernDesc;
-          emptyKernDesc->prev = tmpDesc2;
-          emptyKernDesc       = tmpDesc2;
-          if (tmpDesc1->prev) {
-            tmpDesc1->prev->next = tmpDesc1->next;
-            }
-          if (tmpDesc1->next) {
-            tmpDesc1->next->prev = tmpDesc1->prev;
-            }
-          tmpDesc1->prev = 0x0;
-          tmpDesc1->next = 0x0;
-	  kprintf("mergememBlocks: [%i]\n",tmpDesc1->limit);
-          insertFreeDesc(tmpDesc1);
-          //tmpDesc1 = freeKernDesc;
-	  goto mergeStart;
-          break;
-          }
-        }
-      }
-    }
-  return;
-  }
-
-
-/************************************************************************
-
-Function: void *kmalloc(uInt32 len)
-Description: Allocate Kernel Memory
-
-Notes:
-
-02/17/03 - Do I Still Need To Pass In The Pid?
-
-************************************************************************/    
-void *kmalloc(uInt32 len) {
-  struct memDescriptor *tmpDesc1 = 0x0;
-  struct memDescriptor *tmpDesc2 = 0x0;
-  char                 *buf      = 0x0;
-  int                   i        = 0x0;
-  uInt16                pages    = 0x0;
-
-
-  spinLock(&mallocSpinLock);
-  
-  len = MALLOC_ALIGN(len);
-
-  
-  if (len == 0x0) {
-    spinUnlock(&mallocSpinLock);
-	kprintf("kmalloc: len = 0!\n");
-    return(0x0);
-    }
-  for (tmpDesc1 = freeKernDesc;tmpDesc1 != 0x0;tmpDesc1=tmpDesc1->next) {
-    assert(tmpDesc1);
-    if (tmpDesc1->limit >= len) {
-      if (tmpDesc1->prev != 0x0)
-        tmpDesc1->prev->next = tmpDesc1->next;
-      if (tmpDesc1->next != 0x0)
-        tmpDesc1->next->prev = tmpDesc1->prev;
-
-      if (tmpDesc1 == freeKernDesc)
-        freeKernDesc = tmpDesc1->next;
-
-      tmpDesc1->prev = 0x0;
-      tmpDesc1->next = usedKernDesc;
-      if (usedKernDesc != 0x0)
-        usedKernDesc->prev = tmpDesc1;
-      usedKernDesc = tmpDesc1; 
-      if (tmpDesc1->limit > len) {
-        tmpDesc2 = getEmptyDesc();
-        assert(tmpDesc2);
-        tmpDesc2->limit = tmpDesc1->limit - len;
-        tmpDesc1->limit = len;
-        tmpDesc2->baseAddr = tmpDesc1->baseAddr + len;
-        tmpDesc2->next = 0x0;
-        tmpDesc2->prev = 0x0;
-        insertFreeDesc(tmpDesc2);
-        }
-      buf = (char *)tmpDesc1->baseAddr;
-      for (i=0;i<tmpDesc1->limit;i++) {
-        buf[i] = (char)0x0;
-        }
-      spinUnlock(&mallocSpinLock);
-      //kprintf("m1[%i:%i:0x%X]",tmpDesc1->limit,len,tmpDesc1->baseAddr);
-	assert(tmpDesc1->baseAddr);
-      return(tmpDesc1->baseAddr);
-      }
-    }
-  tmpDesc1 = getEmptyDesc();
-  //kprintf("no empty desc\n");
-  if (tmpDesc1 != 0x0) {
-    pages = ((len + 4095)/4096);
-    tmpDesc1->baseAddr = (struct memDescriptor *)vmm_getFreeMallocPage(pages);
-    tmpDesc1->limit    = len;
-    tmpDesc1->next     = usedKernDesc;
-    tmpDesc1->prev     = 0x0;
-    if (usedKernDesc != 0x0)
-      usedKernDesc->prev       = tmpDesc1;
-    usedKernDesc             = tmpDesc1;
-
-    if (((pages * 4096)-len) > 0x0) {
-      tmpDesc2           = getEmptyDesc();
-      assert(tmpDesc2);
-      tmpDesc2->baseAddr = tmpDesc1->baseAddr + tmpDesc1->limit;
-      tmpDesc2->limit    = ((pages * 4096)-len);
-      tmpDesc2->prev     = 0x0;
-      tmpDesc2->next     = 0x0;
-      if (tmpDesc2->limit <= 0x0)
-        kprintf("kmalloc-2 tmpDesc2: [%i]\n",tmpDesc2->limit);
-      insertFreeDesc(tmpDesc2);
-      }
-
-      buf = (char *)tmpDesc1->baseAddr;
-      for (i=0;i<tmpDesc1->limit;i++) {
-        buf[i] = (char)0x0;
-        }
-    spinUnlock(&mallocSpinLock);
-    //kprintf("baseAddr2[0x%X:0x%X]",tmpDesc1,tmpDesc1->baseAddr);
-    //kprintf("m2[%i:%i:0x%X]",tmpDesc1->limit,len,tmpDesc1->baseAddr);
-	assert(tmpDesc1->baseAddr);
-    return(tmpDesc1->baseAddr);
-    }
-  //Return Null If Unable To Malloc
-  spinUnlock(&mallocSpinLock);
-  //kprintf("baseAddr3[0x0]");
-  return(0x0);
-  }
-  
-/************************************************************************
-
-Function: void kfree(void *baseAddr)
-Description: This Will Find The Descriptor And Free It
-
-Notes:
-
-02/17/03 - I need To Make It Join Descriptors
-
-************************************************************************/
-void kfree(void *baseAddr) {
-  struct memDescriptor *tmpDesc = 0x0;
-
-  if (baseAddr == 0x0) return; 
-  assert(baseAddr);
-
-  assert(usedKernDesc);
-  spinLock(&mallocSpinLock);
-  
-  for (tmpDesc = usedKernDesc;tmpDesc != 0x0;tmpDesc = tmpDesc->next) {
-    
-    if (tmpDesc->baseAddr == baseAddr) {
-      memset(tmpDesc->baseAddr,0xBE,tmpDesc->limit);
-    
-      if (usedKernDesc == tmpDesc)
-        usedKernDesc = tmpDesc->next;
-
-      if (tmpDesc->prev != 0x0)
-        tmpDesc->prev->next = tmpDesc->next;
-
-      if (tmpDesc->next != 0x0)
-        tmpDesc->next->prev = tmpDesc->prev;
-
-
-      tmpDesc->next = 0x0;
-      tmpDesc->prev = 0x0;
-      
-      if (tmpDesc->limit <= 0x0)
-        kprintf("kfree tmpDesc1: [%i]\n",tmpDesc->limit);
-      //kprintf("{0x%X}",tmpDesc->baseAddr);
-      insertFreeDesc(tmpDesc);
-
-     // mergeMemBlocks();
-      spinUnlock(&mallocSpinLock);
-      return;
-      }
-    }
-  spinUnlock(&mallocSpinLock);
-  kprintf("Kernel: Error Freeing Descriptor! [0x%X]\n",(uInt32)baseAddr);
-  return;
-  }
-
-/***
- $Log: kmalloc.c,v $
- Revision 1.3  2006/12/05 14:10:21  reddawg
- Workign Distro
-
- Revision 1.2  2006/10/06 15:48:01  reddawg
- Starting to make ubixos work with UFS2
-
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.4  2006/06/01 12:42:09  reddawg
- Getting back to the basics
-
- Revision 1.3  2006/06/01 03:58:33  reddawg
- wondering about this stuff here
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:11  reddawg
- no message
-
- Revision 1.35  2005/08/04 18:32:59  fsdfs
-
- added error reporting
-
- Revision 1.34  2005/08/04 18:23:41  reddawg
- BUG: Assert has issues that must be looked into
-
- Revision 1.33  2005/08/04 17:11:11  fsdfs
-
- ----------------------------------------
-
- -------------------
-
- Revision 1.32  2004/09/28 21:50:04  reddawg
- kmalloc: now when we kfree memory is filled with 0xBE so it is easy to debug if we continue to use free'd memory
-
- Revision 1.31  2004/09/19 16:17:25  reddawg
- fixed memory leak we now lose no memory....
-
- Revision 1.30  2004/09/14 21:51:24  reddawg
- Debug info
-
- Revision 1.29  2004/09/11 23:39:31  reddawg
- ok time for bed
-
- Revision 1.28  2004/09/11 23:21:26  reddawg
- run now do you get fegfaults with BB?
-
- Revision 1.27  2004/09/11 22:49:28  reddawg
- pat look at lines 276-285  does the math seem right?
-
- Revision 1.26  2004/09/11 22:33:13  reddawg
- minor changes
-
- Revision 1.25  2004/09/11 12:11:11  reddawg
- Cleaning up the VFS more changes to follow...
-
- Revision 1.24  2004/09/08 23:19:58  reddawg
- hmm
-
- Revision 1.23  2004/09/06 15:13:25  reddawg
- Last commit before FreeBSD 6.0
-
- Revision 1.22  2004/08/26 22:51:18  reddawg
- TCA touched me :( i think he likes men....
-
-
- sched.h:        kTask_t added parentPid
- endtask.c:     fixed term back to parentPid
- exec.c:          cleaned warnings
- fork.c:            fixed term to childPid
- sched.c:         clean up for dead tasks
- systemtask.c: clean up dead tasks
- kmalloc.c:       cleaned up warnings
- udp.c:            cleaned up warnings
- bot.c:             cleaned up warnings
- shell.c:           cleaned up warnings
- tcpdump.c:     took a dump
- hd.c:             cleaned up warnings
- ubixfs.c:        stopped prning debug info
-
- Revision 1.21  2004/07/28 15:05:43  reddawg
- Major:
-   Pages now have strict security enforcement.
-   Many null dereferences have been resolved.
-   When apps loaded permissions set for pages rw and ro
-
- Revision 1.20  2004/07/28 00:17:05  reddawg
- Major:
-   Disconnected page 0x0 from the system... Unfortunately this broke many things
-   all of which have been fixed. This was good because nothing deferences NULL
-   any more.
-
- Things affected:
-   malloc,kmalloc,getfreepage,getfreevirtualpage,pagefault,fork,exec,ld,ld.so,exec,file
-
- Revision 1.19  2004/07/26 19:15:49  reddawg
- test code, fixes and the like
-
- Revision 1.18  2004/07/26 16:52:45  reddawg
- here we go
-
- Revision 1.17  2004/07/24 23:04:44  reddawg
- Changes... mark let me know if you fault at pid 185 when you type stress
-
- Revision 1.16  2004/07/21 10:02:09  reddawg
- devfs: renamed functions
- device system: renamed functions
- fdc: fixed a few potential bugs and cleaned up some unused variables
- strol: fixed definition
- endtask: made it print out freepage debug info
- kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost
- ld: fixed a pointer conversion
- file: cleaned up a few unused variables
- sched: broke task deletion
- kprintf: fixed ogPrintf definition
-
- Revision 1.15  2004/07/20 23:20:50  reddawg
- kmalloc: forgot to remove an assert
-
- Revision 1.14  2004/07/20 23:18:11  reddawg
- Made malloc a little more robust but we have a serious memory leak somewhere
-
- Revision 1.13  2004/07/20 22:29:55  reddawg
- assert: remade assert
-
- Revision 1.12  2004/07/20 18:58:24  reddawg
- Few fixes
-
- Revision 1.11  2004/07/18 05:24:15  reddawg
- Fixens
-
- Revision 1.10  2004/07/17 18:00:47  reddawg
- kmalloc: added assert()
-
- Revision 1.9  2004/07/17 15:54:52  reddawg
- kmalloc: added assert()
- bioscall: fixed some potential problem by not making 16bit code
- paging: added assert()
-
- Revision 1.8  2004/06/17 14:50:32  reddawg
- kmalloc: converted some variables to static
-
- Revision 1.7  2004/06/17 02:54:54  flameshadow
- chg: fixed cast
-
- Revision 1.6  2004/05/26 11:56:51  reddawg
- kmalloc: fixed memrgeMemBlocks hopefully it will prevent future segfault issues
-          by not having any more overlapping blocks
-
- Revision 1.5  2004/05/25 14:01:14  reddawg
- Implimented Better Spinlocking No More Issues With KMALLOC which actually
- was causing bizzare problems
-
- END
- ***/
-
diff --git a/sys/lib/kprintf.c b/sys/lib/kprintf.c
deleted file mode 100644
index f19d4ce..0000000
--- a/sys/lib/kprintf.c
+++ /dev/null
@@ -1,685 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: kprintf.c 81 2016-01-11 16:30:47Z reddawg $
-
- *****************************************************************************************/
-
-#include <lib/kprintf.h>
-#include <lib/string.h>
-#include <sys/video.h>
-#include <ubixos/kpanic.h>
-
-static char *ksprintn( char *nbuf, uintmax_t num, int base, int *lenp, int upper );
-
-static __inline int imax( int a, int b ) {
-  return (a > b ? a : b);
-}
-
-union uu {
-  quad_t q; /* as a (signed) quad */
-  quad_t uq; /* as an unsigned quad */
-  long sl[2]; /* as two signed longs */
-  u_long ul[2]; /* as two unsigned longs */
-};
-
-static void __shl( register digit *p, register int len, register int sh ) {
-  register int i;
-
-  for ( i = 0; i < len; i++ )
-    p[i] = LHALF( p[i] << sh ) | (p[i + 1] >> (HALF_BITS - sh));
-
-  p[i] = LHALF( p[i] << sh );
-}
-
-u_quad_t __qdivrem( u_quad_t uq, u_quad_t vq, u_quad_t *arq ) {
-  union uu tmp;
-  digit *u, *v, *q;
-  register digit v1, v2;
-  u_long qhat, rhat, t;
-  int m, n, d, j, i;
-  digit uspace[5], vspace[5], qspace[5];
-
-  /*
-   * Take care of special cases: divide by zero, and u < v.
-   */
-  if ( vq == 0 ) {
-    /* divide by zero. */
-    static volatile const unsigned int zero = 0;
-
-    tmp.ul[H] = tmp.ul[L] = 1 / zero;
-    if ( arq )
-      *arq = uq;
-    return (tmp.q);
-  }
-  if ( uq < vq ) {
-    if ( arq )
-      *arq = uq;
-    return (0);
-  }
-  u = &uspace[0];
-  v = &vspace[0];
-  q = &qspace[0];
-
-  /*
-   * Break dividend and divisor into digits in base B, then
-   * count leading zeros to determine m and n.  When done, we
-   * will have:
-   *      u = (u[1]u[2]...u[m+n]) sub B
-   *      v = (v[1]v[2]...v[n]) sub B
-   *      v[1] != 0
-   *      1 < n <= 4 (if n = 1, we use a different division algorithm)
-   *      m >= 0 (otherwise u < v, which we already checked)
-   *      m + n = 4
-   * and thus
-   *      m = 4 - n <= 2
-   */
-  tmp.uq = uq;
-  u[0] = 0;
-  u[1] = HHALF( tmp.ul[H] );
-  u[2] = LHALF( tmp.ul[H] );
-  u[3] = HHALF( tmp.ul[L] );
-  u[4] = LHALF( tmp.ul[L] );
-  tmp.uq = vq;
-  v[1] = HHALF( tmp.ul[H] );
-  v[2] = LHALF( tmp.ul[H] );
-  v[3] = HHALF( tmp.ul[L] );
-  v[4] = LHALF( tmp.ul[L] );
-  for ( n = 4; v[1] == 0; v++ ) {
-    if ( --n == 1 ) {
-      u_long rbj; /* r*B+u[j] (not root boy jim) */
-      digit q1, q2, q3, q4;
-
-      /*
-       * Change of plan, per exercise 16.
-       *      r = 0;
-       *      for j = 1..4:
-       *              q[j] = floor((r*B + u[j]) / v),
-       *              r = (r*B + u[j]) % v;
-       * We unroll this completely here.
-       */
-      t = v[2]; /* nonzero, by definition */
-      q1 = u[1] / t;
-      rbj = COMBINE( u[1] % t, u[2] );
-      q2 = rbj / t;
-      rbj = COMBINE( rbj % t, u[3] );
-      q3 = rbj / t;
-      rbj = COMBINE( rbj % t, u[4] );
-      q4 = rbj / t;
-      if ( arq )
-        *arq = rbj % t;
-      tmp.ul[H] = COMBINE( q1, q2 );
-      tmp.ul[L] = COMBINE( q3, q4 );
-      return (tmp.q);
-    }
-  }
-  /*
-   * By adjusting q once we determine m, we can guarantee that
-   * there is a complete four-digit quotient at &qspace[1] when
-   * we finally stop.
-   */
-  for ( m = 4 - n; u[1] == 0; u++ )
-    m--;
-  for ( i = 4 - m; --i >= 0; )
-    q[i] = 0;
-  q += 4 - m;
-
-  /*
-   * Here we run Program D, translated from MIX to C and acquiring
-   * a few minor changes.
-   *
-   * D1: choose multiplier 1 << d to ensure v[1] >= B/2.
-   */
-  d = 0;
-  for ( t = v[1]; t < B / 2; t <<= 1 )
-    d++;
-  if ( d > 0 ) {
-    __shl( &u[0], m + n, d ); /* u <<= d */
-    __shl( &v[1], n - 1, d ); /* v <<= d */
-  }
-  /*
-   * D2: j = 0.
-   */
-  j = 0;
-  v1 = v[1]; /* for D3 -- note that v[1..n] are constant */
-  v2 = v[2]; /* for D3 */
-  do {
-    register digit uj0, uj1, uj2;
-
-    /*
-     * D3: Calculate qhat (\^q, in TeX notation).
-     * Let qhat = min((u[j]*B + u[j+1])/v[1], B-1), and
-     * let rhat = (u[j]*B + u[j+1]) mod v[1].
-     * While rhat < B and v[2]*qhat > rhat*B+u[j+2],
-     * decrement qhat and increase rhat correspondingly.
-     * Note that if rhat >= B, v[2]*qhat < rhat*B.
-     */
-    uj0 = u[j + 0]; /* for D3 only -- note that u[j+...] change */
-    uj1 = u[j + 1]; /* for D3 only */
-    uj2 = u[j + 2]; /* for D3 only */
-    if ( uj0 == v1 ) {
-      qhat = B;
-      rhat = uj1;
-      goto qhat_too_big;
-    }
-    else {
-      u_long nn = COMBINE( uj0, uj1 );
-      qhat = nn / v1;
-      rhat = nn % v1;
-    }
-    while ( v2 * qhat > COMBINE( rhat, uj2 ) ) {
-      qhat_too_big: qhat--;
-      if ( (rhat += v1) >= B )
-        break;
-    }
-    /*
-     * D4: Multiply and subtract.
-     * The variable `t' holds any borrows across the loop.
-     * We split this up so that we do not require v[0] = 0,
-     * and to eliminate a final special case.
-     */
-    for ( t = 0, i = n; i > 0; i-- ) {
-      t = u[i + j] - v[i] * qhat - t;
-      u[i + j] = LHALF( t );
-      t = (B - HHALF( t )) & (B - 1);
-    }
-    t = u[j] - t;
-    u[j] = LHALF( t );
-    /*
-     * D5: test remainder.
-     * There is a borrow if and only if HHALF(t) is nonzero;
-     * in that (rare) case, qhat was too large (by exactly 1).
-     * Fix it by adding v[1..n] to u[j..j+n].
-     */
-    if ( HHALF( t ) ) {
-      qhat--;
-      for ( t = 0, i = n; i > 0; i-- ) { /* D6: add back. */
-        t += u[i + j] + v[i];
-        u[i + j] = LHALF( t );
-        t = HHALF( t );
-      }
-      u[j] = LHALF( u[j] + t );
-    }
-    q[j] = qhat;
-  } while ( ++j <= m ); /* D7: loop on j. */
-
-  /*
-   * If caller wants the remainder, we have to calculate it as
-   * u[m..m+n] >> d (this is at most n digits and thus fits in
-   * u[m+1..m+n], but we may need more source digits).
-   */
-  if ( arq ) {
-    if ( d ) {
-      for ( i = m + n; i > m; --i )
-        u[i] = (u[i] >> d) | LHALF( u[i - 1] << (HALF_BITS - d) );
-      u[i] = 0;
-    }
-    tmp.ul[H] = COMBINE( uspace[1], uspace[2] );
-    tmp.ul[L] = COMBINE( uspace[3], uspace[4] );
-    *arq = tmp.q;
-  }
-
-  tmp.ul[H] = COMBINE( qspace[1], qspace[2] );
-  tmp.ul[L] = COMBINE( qspace[3], qspace[4] );
-  return (tmp.q);
-}
-
-u_quad_t
-__umoddi3( a, b )
-u_quad_t a, b;
-{
-  u_quad_t r;
-
-  (void)__qdivrem(a, b, &r);
-  return (r);
-}
-
-int printOff = 0x0;
-int ogprintOff = 0x1;
-
-int kprintf( const char *fmt, ... ) {
-  va_list ap;
-  int retval;
-  char buf[1024];
-
-  va_start( ap, fmt );
-
-  retval = kvprintf( fmt, NULL, &buf, 10, ap );
-  buf[retval] = '\0';
-  va_end( ap );
-
-  kprint( buf );
-
-  return (retval);
-}
-
-int sprintf( char *buf, const char *fmt, ... ) {
-  va_list args;
-  int i;
-  va_start( args, fmt );
-//i = vsprintf( buf, fmt, args );
-  i = kvprintf( fmt, NULL, buf, 10, args );
-  va_end( args );
-  return (i);
-}
-
-/*
- * Scaled down version of printf(3).
- *
- * Two additional formats:
- *
- * The format %b is supported to decode error registers.
- * Its usage is:
- *
- *      printf("reg=%b\n", regval, "<base><arg>*");
- *
- * where <base> is the output base expressed as a control character, e.g.
- * \10 gives octal; \20 gives hex.  Each arg is a sequence of characters,
- * the first of which gives the bit number to be inspected (origin 1), and
- * the next characters (up to a control character, i.e. a character <= 32),
- * give the name of the register.  Thus:
- *
- *      kvprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
- *
- * would produce output:
- *
- *      reg=3<BITTWO,BITONE>
- *
- * XXX:  %D  -- Hexdump, takes pointer and separator string:
- *              ("%6D", ptr, ":")   -> XX:XX:XX:XX:XX:XX
- *              ("%*D", len, ptr, " " -> XX XX XX XX ...
- */
-
-int kvprintf( char const *fmt, void (*func)( int, void* ), void *arg, int radix, va_list ap ) {
-#define PCHAR(c) {int cc=(c); if (func) (*func)(cc,arg); else *d++ = cc; retval++; }
-  char nbuf[MAXNBUF];
-  char *d;
-  const char *p, *percent, *q;
-  u_char *up;
-  int ch, n;
-  uintmax_t num;
-  int base, lflag, qflag, tmp, width, ladjust, sharpflag, neg, sign, dot;
-  int cflag, hflag, jflag, tflag, zflag;
-  int dwidth, upper;
-  char padc;
-  int stop = 0, retval = 0;
-
-  num = 0;
-  if ( !func )
-    d = (char *) arg;
-  else
-    d = NULL;
-
-  if ( fmt == NULL )
-    fmt = "(fmt null)\n";
-
-  if ( radix < 2 || radix > 36 )
-    radix = 10;
-
-  for ( ;; ) {
-    padc = ' ';
-    width = 0;
-    while ( (ch = (u_char) * fmt++) != '%' || stop ) {
-      if ( ch == '\0' )
-        return (retval);
-      PCHAR( ch );
-    }
-    percent = fmt - 1;
-    qflag = 0;
-    lflag = 0;
-    ladjust = 0;
-    sharpflag = 0;
-    neg = 0;
-    sign = 0;
-    dot = 0;
-    dwidth = 0;
-    upper = 0;
-    cflag = 0;
-    hflag = 0;
-    jflag = 0;
-    tflag = 0;
-    zflag = 0;
-    reswitch: switch ( ch = (u_char) * fmt++ ) {
-    case '.':
-      dot = 1;
-      goto reswitch;
-    case '#':
-      sharpflag = 1;
-      goto reswitch;
-    case '+':
-      sign = 1;
-      goto reswitch;
-    case '-':
-      ladjust = 1;
-      goto reswitch;
-    case '%':
-      PCHAR( ch )
-      ;
-      break;
-    case '*':
-      if ( !dot ) {
-        width = va_arg(ap, int);
-        if ( width < 0 ) {
-          ladjust = !ladjust;
-          width = -width;
-        }
-      }
-      else {
-      dwidth = va_arg(ap, int);
-    }
-    goto reswitch;
-  case '0':
-    if ( !dot ) {
-      padc = '0';
-      goto reswitch;
-    }
-  case '1':
-  case '2':
-  case '3':
-  case '4':
-  case '5':
-  case '6':
-  case '7':
-  case '8':
-  case '9':
-    for ( n = 0;; ++fmt ) {
-      n = n * 10 + ch - '0';
-      ch = *fmt;
-      if ( ch < '0' || ch > '9' )
-        break;
-    }
-    if ( dot )
-      dwidth = n;
-    else
-      width = n;
-    goto reswitch;
-  case 'b':
-    num = (u_int)
-    va_arg(ap, int);
-    p = va_arg(ap, char *);
-    for ( q = ksprintn( nbuf, num, *p++, NULL, 0 ); *q; )
-      PCHAR( *q-- )
-    ;
-
-    if ( num == 0 )
-      break;
-
-    for ( tmp = 0; *p; ) {
-      n = *p++;
-      if ( num & (1 << (n - 1)) ) {
-        PCHAR( tmp ? ',' : '<' );
-        for ( ; (n = *p) > ' '; ++p )
-          PCHAR( n );
-        tmp = 1;
-      }
-      else
-        for ( ; *p > ' '; ++p )
-          continue;
-    }
-    if ( tmp )
-      PCHAR( '>' )
-    ;
-    break;
-  case 'c':
-    PCHAR( va_arg(ap, int) )
-    ;
-    break;
-  case 'D':
-    up = va_arg(ap, u_char *);
-    p = va_arg(ap, char *);
-    if ( !width )
-      width = 16;
-    while ( width-- ) {
-      PCHAR( hex2ascii( *up >> 4 ) );
-      PCHAR( hex2ascii( *up & 0x0f ) );
-      up++;
-      if ( width )
-        for ( q = p; *q; q++ )
-          PCHAR( *q );
-    }
-    break;
-  case 'd':
-  case 'i':
-    base = 10;
-    sign = 1;
-    goto handle_sign;
-  case 'h':
-    if ( hflag ) {
-      hflag = 0;
-      cflag = 1;
-    }
-    else
-      hflag = 1;
-    goto reswitch;
-  case 'j':
-    jflag = 1;
-    goto reswitch;
-  case 'l':
-    if ( lflag ) {
-      lflag = 0;
-      qflag = 1;
-    }
-    else
-      lflag = 1;
-    goto reswitch;
-  case 'n':
-    if (jflag)
-    *(va_arg(ap, intmax_t *)) = retval;
-    else if (qflag)
-    *(va_arg(ap, quad_t *)) = retval;
-    else if (lflag)
-    *(va_arg(ap, long *)) = retval;
-    else if (zflag)
-    *(va_arg(ap, size_t *)) = retval;
-    else if (hflag)
-    *(va_arg(ap, short *)) = retval;
-    else if (cflag)
-    *(va_arg(ap, char *)) = retval;
-    else
-    *(va_arg(ap, int *)) = retval;
-    break;
-  case 'o':
-    base = 8;
-    goto handle_nosign;
-  case 'p':
-    base = 16;
-    sharpflag = (width == 0);
-    sign = 0;
-    num = (uintptr_t)
-    va_arg(ap, void *);
-    goto number;
-  case 'q':
-    qflag = 1;
-    goto reswitch;
-  case 'r':
-    base = radix;
-    if ( sign )
-      goto handle_sign;
-    goto handle_nosign;
-  case 's':
-    p = va_arg(ap, char *);
-    if ( p == NULL )
-      p = "(null)";
-    if ( !dot )
-      n = strlen( p );
-    else
-      for ( n = 0; n < dwidth && p[n]; n++ )
-        continue;
-
-    width -= n;
-
-    if ( !ladjust && width > 0 )
-      while ( width-- )
-        PCHAR( padc )
-    ;
-    while ( n-- )
-      PCHAR( *p++ )
-    ;
-    if ( ladjust && width > 0 )
-      while ( width-- )
-        PCHAR( padc )
-    ;
-    break;
-  case 't':
-    tflag = 1;
-    goto reswitch;
-  case 'u':
-    base = 10;
-    goto handle_nosign;
-  case 'X':
-    upper = 1;
-  case 'x':
-    base = 16;
-    goto handle_nosign;
-  case 'y':
-    base = 16;
-    sign = 1;
-    goto handle_sign;
-  case 'z':
-    zflag = 1;
-    goto reswitch;
-    handle_nosign: sign = 0;
-    if (jflag)
-    num = va_arg(ap, uintmax_t);
-    else if (qflag)
-    num = va_arg(ap, u_quad_t);
-    else if (tflag)
-    num = va_arg(ap, ptrdiff_t);
-    else if (lflag)
-    num = va_arg(ap, u_long);
-    else if (zflag)
-    num = va_arg(ap, size_t);
-    else if (hflag)
-    num = (u_short)
-    va_arg(ap, int);
-    else if (cflag)
-    num = (u_char)va_arg(ap, int);
-    else
-    num = va_arg(ap, u_int);
-    goto number;
-    handle_sign:
-    if (jflag)
-    num = va_arg(ap, intmax_t);
-    else if (qflag)
-    num = va_arg(ap, quad_t);
-    else if (tflag)
-    num = va_arg(ap, ptrdiff_t);
-    else if (lflag)
-    num = va_arg(ap, long);
-    else if (zflag)
-    num = va_arg(ap, ssize_t);
-    else if (hflag)
-    num = (short)va_arg(ap, int);
-    else if (cflag)
-    num = (char)va_arg(ap, int);
-    else
-    num = va_arg(ap, int);
-    number: if ( sign && (intmax_t) num < 0 ) {
-      neg = 1;
-      num = -(intmax_t) num;
-    }
-    p = ksprintn( nbuf, num, base, &n, upper );
-    tmp = 0;
-    if ( sharpflag && num != 0 ) {
-      if ( base == 8 )
-        tmp++;
-      else if ( base == 16 )
-        tmp += 2;
-    }
-    if ( neg )
-      tmp++;
-
-    if ( !ladjust && padc == '0' )
-      dwidth = width - tmp;
-    width -= tmp + imax( dwidth, n );
-    dwidth -= n;
-    if ( !ladjust )
-      while ( width-- > 0 )
-        PCHAR( ' ' )
-    ;
-    if ( neg )
-      PCHAR( '-' )
-    ;
-    if ( sharpflag && num != 0 ) {
-      if ( base == 8 ) {
-        PCHAR( '0' );
-      }
-      else if ( base == 16 ) {
-        PCHAR( '0' );
-        PCHAR( 'x' );
-      }
-    }
-    while ( dwidth-- > 0 )
-      PCHAR( '0' )
-    ;
-
-    while ( *p )
-      PCHAR( *p-- )
-    ;
-
-    if ( ladjust )
-      while ( width-- > 0 )
-        PCHAR( ' ' )
-    ;
-
-    break;
-  default:
-    while ( percent < fmt )
-      PCHAR( *percent++ )
-    ;
-    /*
-     * Since we ignore a formatting argument it is no
-     * longer safe to obey the remaining formatting
-     * arguments as the arguments will no longer match
-     * the format specs.
-     */
-    stop = 1;
-    break;
-    }
-  }
-#undef PCHAR
-}
-
-static char *ksprintn( char *nbuf, uintmax_t num, int base, int *lenp, int upper ) {
-  char *p, c;
-
-  p = nbuf;
-  *p = '\0';
-
-  do {
-    c = hex2ascii( num % base );
-    *++p = upper ? toupper( c ) : c;
-  } while ( num /= base );
-
-  if ( lenp )
-    *lenp = p - nbuf;
-
-  return (p);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/lib/libcpp.cc b/sys/lib/libcpp.cc
deleted file mode 100644
index d0bad9a..0000000
--- a/sys/lib/libcpp.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: libcpp.cc 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-extern "C" 
-{	
-#include <lib/kmalloc.h>
-#include <sys/video.h>
-void __pure_virtual() { while(1); }
-
-void __cxa_pure_virtual() { while(1); }
-
-/* Don't plan on exiting the kernel...so do nothing. */
-int __cxa_atexit(void (*func)(void *), void * arg, void * d) { return 0; }
-
-void __dso_handle() { while(1); }
-}
-
-#include <lib/libcpp.h>
-
-void * operator new[](unsigned size)
-{
-    return kmalloc(size);
-}
-
-void operator delete[](void * ptr)
-{
-    kfree(ptr);
-
-    return;
-}
-
-void * operator new(unsigned size)
-{
-    void * ptr = kmalloc(size);
-    return ptr;
-}
-
-void operator delete(void * ptr)
-{
-    kfree(ptr);
-    return;
-}
-
-/***
- $Log: libcpp.cc,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:12  reddawg
- no message
-
- Revision 1.5  2004/09/08 22:04:10  apwillia
- Added calling of static constructors, commented out tty_printf in kprintf (due to deadlock)
-
- Revision 1.4  2004/07/20 22:58:33  reddawg
- retiring to the laptop for the night must sync in work to resume from there
-
- Revision 1.3  2004/07/02 12:28:24  reddawg
- Changes for new libc, someone please test that the kernel still works
-
- Revision 1.2  2004/05/19 04:07:43  reddawg
- kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
-
- Revision 1.1.1.1  2004/04/15 12:07:10  reddawg
- UbixOS v1.0
-
- Revision 1.2  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
diff --git a/sys/lib/memcpy.c b/sys/lib/memcpy.c
deleted file mode 100644
index ee11504..0000000
--- a/sys/lib/memcpy.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define	MEMCOPY
-#include "bcopy.c"
diff --git a/sys/lib/memset.c b/sys/lib/memset.c
deleted file mode 100644
index cc177cd..0000000
--- a/sys/lib/memset.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: memset.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <string.h>
-
-#define wsize   sizeof(uInt)
-#define wmask   (wsize - 1)
-#define VAL     c0
-#define WIDEVAL c
-
-void *memset(void *dst0, int c0, size_t length) {
-  size_t t;
-  uInt c;
-  uInt8 *dst;
-
-  dst = dst0;
-
-        if (length < 3 * wsize) {
-                while (length != 0) {
-                        *dst++ = VAL;
-                        --length;
-                }
-                return(dst0);
-        }
-
-        if ((c = (uInt8)c0) != 0) {    /* Fill the word. */
-                c = (c << 8) | c;       /* u_int is 16 bits. */
-                c = (c << 16) | c;      /* u_int is 32 bits. */
-        }
-
-        /* Align destination by filling in bytes. */
-        if ((t = (long)dst & wmask) != 0) {
-                t = wsize - t;
-                length -= t;
-                do {
-                        *dst++ = VAL;
-                } while (--t != 0);
-        }
-
-        /* Fill words.  Length was >= 2*words so we know t >= 1 here. */
-        t = length / wsize;
-        do {
-                *(u_int *)dst = WIDEVAL;
-                dst += wsize;
-        } while (--t != 0);
-
-        /* Mop up trailing bytes, if any. */
-        t = length & wmask;
-        if (t != 0)
-                do {
-                        *dst++ = VAL;
-                } while (--t != 0);
-        return(dst0);
-  }
-
-
-/***
- $Log: memset.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:12  reddawg
- no message
-
- Revision 1.1  2004/07/28 16:20:10  reddawg
- forgot this file
-
- END
- ***/
-
diff --git a/sys/lib/net.c b/sys/lib/net.c
deleted file mode 100644
index 9937904..0000000
--- a/sys/lib/net.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-*****************************************************************************************/
-
-#include <sys/types.h>
-#include <net/inet.h>
-#include <net/sockets.h>
-#include <string.h>
-
-#include "lib/kprintf.h"
-
-#ifndef _IN_ADDR_T_DECLARED
-typedef uInt32        in_addr_t;
-#define _IN_ADDR_T_DECLARED
-#endif
-
-/*
-uInt32 htonl(uInt32 n) {
-  uInt32 retVal = 0x0;
-  retVal += ((n & 0xff) << 24); 
-  retVal += ((n & 0xff00) << 8);
-  retVal += ((n & 0xff0000) >> 8);
-  retVal += ((n & 0xff000000) >> 24);
-  return(retVal);
-  }
-*/
-
-/*
-uInt32 htons(uInt32 n) {
-  uInt32 retVal = 0x0;
-  retVal = (((n & 0xff) << 8) | ((n & 0xff00) >> 8));
-  return(retVal);
-  }
-*/
-
-void bcopy(const void *src, void *dest, int len) {
-  memcpy(dest,src,len);
-  }
-
-void bzero(void *data, int n) {
-  memset(data, 0, n);
-  }
-
-#ifdef _INET_ATON
-int inet_aton(cp, addr)
-        const char *cp;
-        struct in_addr *addr;
-{
-        uInt32 parts[4];
-        in_addr_t val;
-        char *c;
-        char *endptr;
-        int gotend, n;
-
-        c = (char *)cp;
-        n = 0;
-        /*
-         * Run through the string, grabbing numbers until
-         * the end of the string, or some error
-         */
-        gotend = 0;
-        while (!gotend) {
-                //errno = 0;
-                val = strtol(c, &endptr, 0);
-                kprintf("VAL: [%x]",val);
-
-                //if (errno == ERANGE)    /* Fail completely if it overflowed. */
-                //        return (0);
-
-                /*
-                 * If the whole string is invalid, endptr will equal
-                 * c.. this way we can make sure someone hasn't
-                 * gone '.12' or something which would get past
-                 * the next check.
-                 */
-                if (endptr == c)
-                        return (0);
-                parts[n] = val;
-                c = endptr;
-
-                /* Check the next character past the previous number's end */
-                switch (*c) {
-                case '.' :
-                        /* Make sure we only do 3 dots .. */
-                        if (n == 3)     /* Whoops. Quit. */
-                                return (0);
-                        n++;
-                        c++;
-                        break;
-
-                case '\0':
-                        gotend = 1;
-                        break;
-
-                default:
-                       /*
-                        if (isspace((unsigned char)*c)) {
-                                gotend = 1;
-                                break;
-                        } else
-                       */
-                                return (0);     /* Invalid character, so fail */
-                }
-
-        }
-
-        /*
-         * Concoct the address according to
-         * the number of parts specified.
-         */
-
-        switch (n) {
-        case 0:                         /* a -- 32 bits */
-                /*
-                 * Nothing is necessary here.  Overflow checking was
-                 * already done in strtoul().
-                 */
-                break;
-        case 1:                         /* a.b -- 8.24 bits */
-                if (val > 0xffffff || parts[0] > 0xff)
-                        return (0);
-                val |= parts[0] << 24;
-                break;
-
-        case 2:                         /* a.b.c -- 8.8.16 bits */
-                if (val > 0xffff || parts[0] > 0xff || parts[1] > 0xff)
-                        return (0);
-                val |= (parts[0] << 24) | (parts[1] << 16);
-                break;
-
-        case 3:                         /* a.b.c.d -- 8.8.8.8 bits */
-                if (val > 0xff || parts[0] > 0xff || parts[1] > 0xff ||
-                    parts[2] > 0xff)
-                        return (0);
-                val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-                break;
-        }
-
-        if (addr != NULL)
-                addr->s_addr = htonl(val);
-        return (1);
-}
-#endif
-
-/***
- END
- ***/
-  
diff --git a/sys/lib/ogprintf.cc b/sys/lib/ogprintf.cc
deleted file mode 100644
index 398b2b9..0000000
--- a/sys/lib/ogprintf.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ogprintf.cc 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <objgfx40/objgfx40.h>
-#include <objgfx40/ogFont.h>
-#include <sde/ogDisplay_UbixOS.h>
-
-extern "C" {
-
-#include <ubixos/vitals.h>
-
-
-static int screenRow  = 0x0;
-static int screenCol  = 0x1;
-  
-int ogPrintf(char *s) {
-  int i = 0x0;
-  int bufHeight;
-  ogSurface *screen = (ogDisplay_UbixOS *)systemVitals->screen;
-  ogBitFont *font   = (ogBitFont *)systemVitals->font; 
-
-
-  while ('\0' != s[i]) {
-    switch (s[i]) {
-    case '\t':
-      screenCol += 3;
-      break;
-    case '\b':
-      if (screenCol > 0) --screenCol;
-    case '\n':
-      screenCol = 0;
-
-      bufHeight = ((screen->ogGetMaxY()+1) / font->GetHeight())-1;
-      if (screenRow < bufHeight) 
-        ++screenRow;
-      else {
-        screen->ogCopyBuf(0, 0,
-                          *screen,
-                          0, font->GetHeight(),
-                          screen->ogGetMaxX(), screen->ogGetMaxY());
-        screen->ogFillRect(0, bufHeight * font->GetHeight()+1,
-                           screen->ogGetMaxX(), screen->ogGetMaxY(),
-                           screen->ogPack(122, 140, 163));
-      }
-      break;
-    default:
-      font->PutChar(*screen,
-                    screenCol * font->GetWidth(),
-                    screenRow * font->GetHeight(),
-                    s[i]);
-      break;
-    }                           /* switch */
-    ++screenCol;
-    ++i;
-  } /* while */
-
-  return 0;
-} // ogPrintf
-
-}
-
-/***
- $Log: ogprintf.cc,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:13  reddawg
- no message
-
- Revision 1.7  2004/07/20 22:58:33  reddawg
- retiring to the laptop for the night must sync in work to resume from there
-
- Revision 1.6  2004/07/17 14:24:22  reddawg
- compile: changes to the way we link the kernel should prevent future errors
-
- Revision 1.5  2004/05/23 23:30:34  reddawg
- Fixens
-
- Revision 1.4  2004/05/23 01:40:19  reddawg
- Spinlock
-
- Revision 1.3  2004/05/19 17:09:50  flameshadow
- chg: Undid previous renaming. This now restores me as the EOOUIAD.
-
- Revision 1.2  2004/04/26 12:56:01  reddawg
- Made src/sys/sde Copy and Make the ogPixelFormat.cpp
-
- Revision 1.1.1.1  2004/04/15 12:07:10  reddawg
- UbixOS v1.0
-
- Revision 1.19  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
diff --git a/sys/lib/sqrt.c b/sys/lib/sqrt.c
deleted file mode 100644
index 8cb7150..0000000
--- a/sys/lib/sqrt.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: sqrt.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-double sqrt(double x) {
-  return(x); /* Quick Hack */
-  }
-
-/***
- $Log: sqrt.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:13  reddawg
- no message
-
- Revision 1.2  2004/05/19 03:46:32  reddawg
- A Few Quick Hacks To Make Things Work
-
- Revision 1.1.1.1  2004/04/15 12:07:11  reddawg
- UbixOS v1.0
-
- Revision 1.2  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
-
diff --git a/sys/lib/strcpy.S b/sys/lib/strcpy.S
deleted file mode 100644
index 655eb91..0000000
--- a/sys/lib/strcpy.S
+++ /dev/null
@@ -1,44 +0,0 @@
-.globl strcpy
-strcpy:
-        movl    4(%esp),%ecx            /* dst address */
-        movl    8(%esp),%edx            /* src address */
-        pushl   %ecx                    /* push dst address */
-
-        .align 2,0x90
-L1:     movb    (%edx),%al              /* unroll loop, but not too much */
-        movb    %al,(%ecx)
-        testb   %al,%al
-        je      L2
-        movb    1(%edx),%al
-        movb    %al,1(%ecx)
-        testb   %al,%al
-        je      L2
-        movb    2(%edx),%al
-        movb    %al,2(%ecx)
-        testb   %al,%al
-        je      L2
-        movb    3(%edx),%al
-        movb    %al,3(%ecx)
-        testb   %al,%al
-        je      L2
-        movb    4(%edx),%al
-        movb    %al,4(%ecx)
-        testb   %al,%al
-        je      L2
-        movb    5(%edx),%al
-        movb    %al,5(%ecx)
-        testb   %al,%al
-        je      L2
-        movb    6(%edx),%al
-        movb    %al,6(%ecx)
-        testb   %al,%al
-        je      L2
-        movb    7(%edx),%al
-        movb    %al,7(%ecx)
-        addl    $8,%edx
-        addl    $8,%ecx
-        testb   %al,%al
-        jne     L1
-L2:     popl    %eax                    /* pop dst address */
-        ret
-
diff --git a/sys/lib/string.c b/sys/lib/string.c
deleted file mode 100644
index 04409b4..0000000
--- a/sys/lib/string.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: string.c 80 2016-01-11 16:24:44Z reddawg $
-
- *****************************************************************************************/
-
-#include <lib/string.h>
-
-u_char const bcd2bin_data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 0, 0, 0, 0, 0, 0, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 0, 0, 0, 0, 0, 0, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 0, 0, 0, 0, 0, 0, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 0, 0, 0, 0, 0, 0, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 0, 0, 0, 0, 0, 0, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 0, 0, 0, 0, 0, 0, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 0, 0, 0, 0, 0, 0, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 0, 0, 0, 0, 0, 0, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99 };
-
-u_char const bin2bcd_data[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99 };
-
-/* This is actually used with radix [2..36] */
-char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-
-int strcmp( const char *str1, const char *str2 ) {
-  while ( (*str1 == *str2) && (*str1 != 0x0) && (*str2 != 0x0) ) {
-    str1++;
-    str2++;
-  }
-  if ( *str1 == *str2 ) {
-    return (0);
-  }
-  else if ( *str1 > *str2 ) {
-    return (1);
-  }
-  else {
-    return (-1);
-  }
-}
-
-int strncmp( const char * a, const char * b, size_t c ) {
-  int i = 0;
-  while ( i < c ) {
-    if ( (a[i] != b[i]) || (a[i] == '\0') || (b[i] == '\0') )
-      return a[i] - b[i];
-    i++;
-  }
-  return 0;
-}
-
-void *memcpyold( const void *dst, const void * src, size_t length ) {
-  //size_t x = length >> 2;
-  //size_t y = length;// & 0xf;
-  size_t i;
-  /*
-   for (i = 0; i < x; i++) {
-   ((unsigned long *)dst)[i] = ((unsigned long *)src)[i];
-   }
-   */
-  /*
-   for (i = 0; i < y; i++) {
-   ((char *) dst)[length-y+i] = ((char *) src)[length-y+i];
-   }
-   */
-  for ( i = 0x0; i < length; i++ )
-    ((char *) dst)[i] = ((char *) src)[i];
-
-  return ((void *) dst);
-}
-
-int memcmp( const void * dst, const void * src, size_t length ) {
-  size_t x = length >> 2;
-  size_t y = length & 0xf;
-  size_t i;
-
-  for ( i = 0; i < x; i++ ) {
-    if ( ((unsigned long *) dst)[i] > ((unsigned long *) src)[i] )
-      return 1;
-    if ( ((unsigned long *) dst)[i] < ((unsigned long *) src)[i] )
-      return -1;
-  }
-
-  for ( i = 0; i < y; i++ ) {
-    if ( ((char *) dst)[length - y + i] > ((char *) src)[length - y + i] )
-      return 1;
-    if ( ((char *) dst)[length - y + i] < ((char *) src)[length - y + i] )
-      return -1;
-  }
-
-  return 0;
-}
-
-void strncpy( char * dest, const char * src, size_t size ) {
-  if ( size == 0 )
-    return;
-  do {
-    *dest = *src;
-    dest++;
-    src++;
-    size--;
-  } while ( ('\0' != *(src - 1)) && (size) );
-}
-
-char *strstr( const char *s, char *find ) {
-  char c, sc;
-  size_t len;
-
-  if ( (c = *find++) != 0 ) {
-    len = strlen( find );
-    do {
-      do {
-        if ( (sc = *s++) == 0 )
-          return (NULL);
-      } while ( sc != c );
-    } while ( strncmp( s, find, len ) != 0 );
-    s--;
-  }
-  return ((char *) s);
-}
-
-/***
- $Log: string.c,v $
- Revision 1.3  2006/12/12 14:09:18  reddawg
- Changes
-
- Revision 1.2  2006/12/05 14:10:21  reddawg
- Workign Distro
-
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:13  reddawg
- no message
-
- Revision 1.6  2004/07/28 15:05:43  reddawg
- Major:
- Pages now have strict security enforcement.
- Many null dereferences have been resolved.
- When apps loaded permissions set for pages rw and ro
-
- Revision 1.5  2004/07/20 18:42:41  flameshadow
- add: strcpy()
- chg: modified dirCache.c to use strcpy()
-
- Revision 1.4  2004/07/05 23:06:32  reddawg
- Fixens
-
- Revision 1.3  2004/06/28 23:12:58  reddawg
- file format now container:/path/to/file
-
- Revision 1.2  2004/05/19 14:40:58  reddawg
- Cleaned up some warning from leaving out typedefs
-
- Revision 1.1.1.1  2004/04/15 12:07:11  reddawg
- UbixOS v1.0
-
- Revision 1.5  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
-
diff --git a/sys/lib/strlen.S b/sys/lib/strlen.S
deleted file mode 100644
index d301949..0000000
--- a/sys/lib/strlen.S
+++ /dev/null
@@ -1,13 +0,0 @@
-.globl strlen
-strlen:
-        pushl   %edi
-        movl    8(%esp),%edi            /* string address */
-        cld                             /* set search forward */
-        xorl    %eax,%eax               /* set search for null terminator */
-        movl    $-1,%ecx                /* set search for lots of characters */
-        repne                           /* search! */
-        scasb
-        notl    %ecx                    /* get length by taking complement */
-        leal    -1(%ecx),%eax           /* and subtracting one */
-        popl    %edi
-        ret
diff --git a/sys/lib/strtok.c b/sys/lib/strtok.c
deleted file mode 100644
index 27d639c..0000000
--- a/sys/lib/strtok.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: strtok.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <lib/string.h>
-#include <sys/types.h>
-
-char *strtok_r(char *s, const char *delim, char **last) {
-  char *spanp;
-  int c, sc;
-  char *tok;
-
-  if ((s == NULL) && ((s = *last) == NULL)) {
-    return(NULL);
-    }
-
-cont:
-  c = *s++;
-  for (spanp = (char *)delim; (sc = *spanp++) != 0; ) {
-    if (c == sc) {
-      goto cont;
-      }
-    }
-  if (c == 0) {
-    *last = NULL;
-    return(NULL);
-    }
-  tok = s - 1;
-
-  for (;;) {
-    c = *s++;
-    spanp = (char *)delim;
-    do {
-      if ((sc = *spanp++) == c) {
-        if (c == 0) {
-          s = NULL;
-          }
-        else {
-          char *w = s - 1;
-          *w = '\0';
-          }
-        *last = s;
-        return(tok);
-        }
-      } while (sc != 0);
-    }
-  }
-
-char *strtok(char *s, const char *delim) {
-  static char *last;
-  return (strtok_r(s, delim, &last));
-  }
-
-/***
- $Log: strtok.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:13  reddawg
- no message
-
- Revision 1.2  2004/05/19 03:46:32  reddawg
- A Few Quick Hacks To Make Things Work
-
- Revision 1.1.1.1  2004/04/15 12:07:11  reddawg
- UbixOS v1.0
-
- Revision 1.2  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
-
-
diff --git a/sys/lib/strtol.c b/sys/lib/strtol.c
deleted file mode 100644
index 3b7114f..0000000
--- a/sys/lib/strtol.c
+++ /dev/null
@@ -1,103 +0,0 @@
-#include <sys/cdefs.h>
-//#include <limits.h>
-//#include <ctype.h>
-//#include <stdlib.h>
-
-#define LONG_MIN      (-0x7fffffffL - 1)
-#define LONG_MAX      0x7fffffffL
-
-
-
-long
-strtol(const char * __restrict nptr, char ** __restrict endptr, int base)
-{
-	const char *s;
-	unsigned long acc;
-	char c = 0x0;  /* to remove warning */
-	unsigned long cutoff;
-	int neg, any, cutlim;
-
-	/*
-	 * Skip white space and pick up leading +/- sign if any.
-	 * If base is 0, allow 0x for hex and 0 for octal, else
-	 * assume decimal; if base is already 16, allow 0x.
-	 */
-	s = nptr;
-        /*
-	do {
-		c = *s++;
-	} while (isspace((unsigned char)c));
-        */
-	if (c == '-') {
-		neg = 1;
-		c = *s++;
-	} else {
-		neg = 0;
-		if (c == '+')
-			c = *s++;
-	}
-	if ((base == 0 || base == 16) &&
-	    c == '0' && (*s == 'x' || *s == 'X')) {
-		c = s[1];
-		s += 2;
-		base = 16;
-	}
-	if (base == 0)
-		base = c == '0' ? 8 : 10;
-	acc = any = 0;
-	if (base < 2 || base > 36)
-		goto noconv;
-
-	/*
-	 * Compute the cutoff value between legal numbers and illegal
-	 * numbers.  That is the largest legal value, divided by the
-	 * base.  An input number that is greater than this value, if
-	 * followed by a legal input character, is too big.  One that
-	 * is equal to this value may be valid or not; the limit
-	 * between valid and invalid numbers is then based on the last
-	 * digit.  For instance, if the range for longs is
-	 * [-2147483648..2147483647] and the input base is 10,
-	 * cutoff will be set to 214748364 and cutlim to either
-	 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
-	 * a value > 214748364, or equal but the next digit is > 7 (or 8),
-	 * the number is too big, and we will return a range error.
-	 *
-	 * Set 'any' if any `digits' consumed; make it negative to indicate
-	 * overflow.
-	 */
-	cutoff = neg ? (unsigned long)-(LONG_MIN + LONG_MAX) + LONG_MAX
-	    : LONG_MAX;
-	cutlim = cutoff % base;
-	cutoff /= base;
-	for ( ; ; c = *s++) {
-		if (c >= '0' && c <= '9')
-			c -= '0';
-		else if (c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
-		else if (c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
-		else
-			break;
-		if (c >= base)
-			break;
-		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
-		else {
-			any = 1;
-			acc *= base;
-			acc += c;
-		}
-	}
-	if (any < 0) {
-		acc = neg ? LONG_MIN : LONG_MAX;
-		//errno = ERANGE;
-	} else if (!any) {
-noconv:
-		//errno = EINVAL;
-        cutoff = 0x0;//UBU
-	} else if (neg)
-		acc = -acc;
-	if (endptr != 0x0)
-		*endptr = (char *)(any ? s - 1 : nptr);
-	return (acc);
-}
diff --git a/sys/lib/vsprintf.c b/sys/lib/vsprintf.c
deleted file mode 100644
index 2c6b901..0000000
--- a/sys/lib/vsprintf.c
+++ /dev/null
@@ -1,285 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Log: vsprintf.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:14  reddawg
- no message
-
- Revision 1.2  2004/06/28 23:12:58  reddawg
- file format now container:/path/to/file
-
- Revision 1.1.1.1  2004/04/15 12:07:11  reddawg
- UbixOS v1.0
-
- Revision 1.3  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
-
-
- $Id: vsprintf.c 65 2016-01-11 04:42:59Z reddawg $
-
-*****************************************************************************************/
-
-/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */
-/*
- * Wirzenius wrote this portably, Torvalds fucked it up :-)
- */
-
-#include <stdarg.h>
-#include <lib/string.h>
-
-/* we use this so that we can do without the ctype library */
-#define is_digit(c)	((c) >= '0' && (c) <= '9')
-
-static int skip_atoi(const char **s)
-{
-	int i=0;
-
-	while (is_digit(**s))
-		i = i*10 + *((*s)++) - '0';
-	return i;
-}
-
-#define ZEROPAD	1		/* pad with zero */
-#define SIGN	2		/* unsigned/signed long */
-#define PLUS	4		/* show plus */
-#define SPACE	8		/* space if plus */
-#define LEFT	16		/* left justified */
-#define SPECIAL	32		/* 0x */
-#define SMALL	64		/* use 'abcdef' instead of 'ABCDEF' */
-
-#define do_div(n,base) ({ \
-int __res; \
-__asm__("divl %4":"=a" (n),"=d" (__res):"0" (n),"1" (0),"r" (base)); \
-__res; })
-
-static char * number(char * str, int num, int base, int size, int precision
-	,int type)
-{
-	char c,sign,tmp[36];
-	const char *digits="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	int i;
-
-	if (type&SMALL) digits="0123456789abcdefghijklmnopqrstuvwxyz";
-	if (type&LEFT) type &= ~ZEROPAD;
-	if (base<2 || base>36)
-		return 0;
-	c = (type & ZEROPAD) ? '0' : ' ' ;
-	if (type&SIGN && num<0) {
-		sign='-';
-		num = -num;
-	} else
-		sign=(type&PLUS) ? '+' : ((type&SPACE) ? ' ' : 0);
-	if (sign) size--;
-	if (type&SPECIAL) {
-	  if (base==16) { size -= 2; }
-		else if (base==8) { size--; }
-          }
-	i=0;
-	if (num==0)
-		tmp[i++]='0';
-	else while (num!=0)
-		tmp[i++]=digits[do_div(num,base)];
-	if (i>precision) precision=i;
-	size -= precision;
-	if (!(type&(ZEROPAD+LEFT)))
-		while(size-->0)
-			*str++ = ' ';
-	if (sign)
-		*str++ = sign;
-	if (type&SPECIAL) {
-	  if (base==8) {
-            *str++ = '0';
-            }
-          else if (base==16) {
-		*str++ = '0';
-		*str++ = digits[33];
-		}
-          }
-	if (!(type&LEFT))
-		while(size-->0)
-			*str++ = c;
-	while(i<precision--)
-		*str++ = '0';
-	while(i-->0)
-		*str++ = tmp[i];
-	while(size-->0)
-		*str++ = ' ';
-	return str;
-}
-
-int vsprintf(char *buf, const char *fmt, va_list args)
-{
-	int len;
-	int i;
-	char * str;
-	char *s;
-	int *ip;
-
-	int flags;		/* flags to number() */
-
-	int field_width;	/* width of output field */
-	int precision;		/* min. # of digits for integers; max
-				   number of chars for from string */
-	int qualifier;		/* 'h', 'l', or 'L' for integer fields */
-
-	for (str=buf ; *fmt ; ++fmt) {
-		if (*fmt != '%') {
-			*str++ = *fmt;
-			continue;
-		}
-			
-		/* process flags */
-		flags = 0;
-		repeat:
-			++fmt;		/* this also skips first '%' */
-			switch (*fmt) {
-				case '-': flags |= LEFT; goto repeat;
-				case '+': flags |= PLUS; goto repeat;
-				case ' ': flags |= SPACE; goto repeat;
-				case '#': flags |= SPECIAL; goto repeat;
-				case '0': flags |= ZEROPAD; goto repeat;
-				}
-		
-		/* get field width */
-		field_width = -1;
-		if (is_digit(*fmt))
-			field_width = skip_atoi(&fmt);
-		else if (*fmt == '*') {
-			/* it's the next argument */
-			field_width = va_arg(args, int);
-			if (field_width < 0) {
-				field_width = -field_width;
-				flags |= LEFT;
-			}
-		}
-
-		/* get the precision */
-		precision = -1;
-		if (*fmt == '.') {
-			++fmt;	
-			if (is_digit(*fmt))
-				precision = skip_atoi(&fmt);
-			else if (*fmt == '*') {
-				/* it's the next argument */
-				precision = va_arg(args, int);
-			}
-			if (precision < 0)
-				precision = 0;
-		}
-
-		/* get the conversion qualifier */
-		qualifier = -1;
-		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L') {
-			qualifier = *fmt;
-			++fmt;
-		}
-
-		switch (*fmt) {
-		case 'c':
-			if (!(flags & LEFT))
-				while (--field_width > 0)
-					*str++ = ' ';
-			*str++ = (unsigned char) va_arg(args, int);
-			while (--field_width > 0)
-				*str++ = ' ';
-			break;
-
-		case 's':
-			s = va_arg(args, char *);
-			len = strlen(s);
-			if (precision < 0)
-				precision = len;
-			else if (len > precision)
-				len = precision;
-
-			if (!(flags & LEFT))
-				while (len < field_width--)
-					*str++ = ' ';
-			for (i = 0; i < len; ++i)
-				*str++ = *s++;
-			while (len < field_width--)
-				*str++ = ' ';
-			break;
-
-		case 'o':
-			str = number(str, va_arg(args, unsigned long), 8,
-				field_width, precision, flags);
-			break;
-
-		case 'p':
-			if (field_width == -1) {
-				field_width = 8;
-				flags |= ZEROPAD;
-			}
-			str = number(str,
-				(unsigned long) va_arg(args, void *), 16,
-				field_width, precision, flags);
-			break;
-
-		case 'x':
-			flags |= SMALL;
-		case 'X':
-			str = number(str, va_arg(args, unsigned long), 16,
-				field_width, precision, flags);
-			break;
-
-		case 'd':
-		case 'i':
-			flags |= SIGN;
-		case 'u':
-			str = number(str, va_arg(args, unsigned long), 10,
-				field_width, precision, flags);
-			break;
-
-		case 'n':
-			ip = va_arg(args, int *);
-			*ip = (str - buf);
-			break;
-
-		default:
-			if (*fmt != '%')
-				*str++ = '%';
-			if (*fmt)
-				*str++ = *fmt;
-			else
-				--fmt;
-			break;
-		}
-	}
-	*str = '\0';
-	return str-buf;
-}
-
-/***
- END
- ***/
-
diff --git a/sys/mpi/Makefile b/sys/mpi/Makefile
deleted file mode 100644
index 23e7f72..0000000
--- a/sys/mpi/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002-2004 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = system.o message.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX)-DNOBOOL $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX)-DNOBOOL $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/mpi/message.c b/sys/mpi/message.c
deleted file mode 100644
index 33e7862..0000000
--- a/sys/mpi/message.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: message.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <mpi/mpi.h>
-
-void sysMpiCreateMbox(uInt32 *status,char *name) {
-  if (status && name)
-    *status = mpi_createMbox(name); 
-  return;
-  }
-
-void sysMpiDestroyMbox(uInt32 *status,char *name) {
-  if (status && name)
-    *status = mpi_destroyMbox(name);
-  return;
-  }
-
-void sysMpiPostMessage(char *name,uInt32 *type,mpi_message_t *data) {
-  if (type && name && data)
-    *type = mpi_postMessage(name,*type,data);
-  return;
-  }
-
-void sysMpiFetchMessage(char *name,mpi_message_t *msg,uInt32 *status) {
-  if (status && name && msg)
-    *status = mpi_fetchMessage(name,msg);
-  return;
-  }
-
-void sysMpiSpam(uInt32 type,void *data,uInt32 *status) {
-  if (status && data)
-    *status = mpi_spam(type,data);
-  return;
-  }
-
-/***
- $Log: message.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:14  reddawg
- no message
-
- Revision 1.12  2004/08/14 11:23:02  reddawg
- Changes
-
- Revision 1.11  2004/07/28 17:07:25  reddawg
- MPI: moved the syscalls
-
- END
- ***/
-
diff --git a/sys/mpi/system.c b/sys/mpi/system.c
deleted file mode 100644
index f80b3f6..0000000
--- a/sys/mpi/system.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2005 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: system.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <mpi/mpi.h>
-#include <lib/kmalloc.h>
-#include <lib/string.h>
-#include <ubixos/spinlock.h>
-
-static mpi_mbox_t  *mboxList    = 0x0;
-static struct spinLock  mpiSpinLock = SPIN_LOCK_INITIALIZER;
-
-/*****************************************************************************************
-
- Function: static mpiMbox_t * mpiFindMbox(char *name)
-
- Description: This function will find a mail box that matches the supplied name
-
- Notes: This function is not task-safe!  Lock must be done before call.
-
-*****************************************************************************************/
-static mpi_mbox_t * mpi_findMbox(char *name) {
-  mpi_mbox_t *mbox = 0x0;
-  
-  for (mbox = mboxList;mbox;mbox = mbox->next) {
-    if (!strcmp(mbox->name,name)) {
-       return(mbox);
-       }
-    }
-
-  return(0x0);
-  }
-
-/*****************************************************************************************
-
- Function: int mpiCreateMbox(char *name)
-
- Description: This function will create a new mailbox if it fails it will return -1
-              otherwise it returns 0x0
-
- Notes:
-
-*****************************************************************************************/
-int mpi_createMbox(char *name) {
-  mpi_mbox_t *mbox = 0x0;
-
-  spinLock(&mpiSpinLock);
-  if (mpi_findMbox(name) != 0x0) {
-    spinUnlock(&mpiSpinLock);
-    return(-1);
-    }
-
-  mbox = (mpi_mbox_t *)kmalloc(sizeof(mpi_mbox_t));
-
-  sprintf(mbox->name,name);
-  mbox->pid = _current->id;
-
-  if (mboxList == 0x0) {
-    mbox->prev = 0x0;
-    mbox->next = 0x0;
-    mboxList   = mbox;
-    }
-  else {
-    mbox->next     = mboxList;
-    mbox->prev     = 0x0;
-    mboxList->prev = mbox;
-    mboxList       = mbox;
-    }
-
-  spinUnlock(&mpiSpinLock);
-  return(0x0);
-  }
-
-/*****************************************************************************************
-
- Function: int mpiSpam(uInt32 type,void *data)
-
- Description: This function will send a message to every mailbox
-
- Notes:
-
-*****************************************************************************************/
-int mpi_spam(uInt32 type,void *data) {
-  mpi_mbox_t    *mbox    = 0x0;
-  mpi_message_t *message = 0x0;
- 
-  spinLock(&mpiSpinLock);
-
-  for (mbox = mboxList;mbox;mbox = mbox->next) {
-    message = (mpi_message_t *)kmalloc(sizeof(mpi_message_t));
-
-    message->header = type;
-    memcpy(message->data,data,MESSAGE_LENGTH);
-    message->next = 0x0;
-
-    if (mbox->msg == 0x0) {
-      mbox->msg       = message;
-      }
-    else {
-      mbox->msgLast->next = message;
-      mbox->msgLast       = message;
-      }
-    }
-
-  spinUnlock(&mpiSpinLock);
-  return(0x0);
-  }
-
-/*****************************************************************************************
-
- Function: int mpiPostMessage(char *name,uInt32 type,void *data)
-
- Description: This function will post a message to specified mailbox
-
- Notes:
-
-*****************************************************************************************/
-int mpi_postMessage(char *name,uInt32 type,mpi_message_t *msg) {
-  mpi_mbox_t    *mbox    = 0x0;
-  mpi_message_t *message = 0x0;
-
-  spinLock(&mpiSpinLock);
-
-  mbox = mpi_findMbox(name);
-
-  if (mbox == 0x0) {
-    spinUnlock(&mpiSpinLock);
-    return(0x1);
-    }
-
-  message = (mpi_message_t *)kmalloc(sizeof(mpi_message_t));
-
-  message->header = msg->header;
-  memcpy(message->data,msg->data,MESSAGE_LENGTH);
-  message->pid    = _current->id;
-  message->next = 0x0;
-
-  if (mbox->msg == 0x0) {
-    mbox->msg       = message;
-    }
-  else {
-    mbox->msgLast->next = message;
-    mbox->msgLast       = message;
-    }
-
-  spinUnlock(&mpiSpinLock);
-  
-  if (type == 0x2) {
-    while (mbox->msgLast != 0x0);
-    }
-    
-  return(0x0);
-  }
-
-/*****************************************************************************************
-
- Function: int mpiFetchMessage(char *name,mpiMessage_t *msg)
-
- Description: This function will fetch the next message out of the specified mailbox
-
- Notes:
-
-*****************************************************************************************/
-int mpi_fetchMessage(char *name,mpi_message_t *msg) {
-  mpi_mbox_t    *mbox   = 0x0;
-  mpi_message_t *tmpMsg = 0x0;
-
-  spinLock(&mpiSpinLock);
-
-  mbox = mpi_findMbox(name);
-
-  if (mbox == 0x0) {
-    spinUnlock(&mpiSpinLock);
-    return(-1);
-    }
-
-  if (mbox->msg == 0x0) {
-    spinUnlock(&mpiSpinLock);
-    return(-1);
-    }
-
-  if (mbox->pid != _current->id) {
-    spinUnlock(&mpiSpinLock);
-    return(-1);
-    }
-
-  msg->header = mbox->msg->header;
-  memcpy(msg->data,mbox->msg->data,MESSAGE_LENGTH);
-  msg->pid    = mbox->msg->pid;
-
-  tmpMsg    = mbox->msg;
-  mbox->msg = mbox->msg->next;
-  
-  kfree(tmpMsg);
-
-  spinUnlock(&mpiSpinLock);
-  return(0x0);
-  }
-
-/*****************************************************************************************
-
- Function: int mpiDestroyMbox(char *name)
-
- Description: This function will fetch the next message out of the specified mailbox
-
- Notes:
-
-*****************************************************************************************/
-int mpi_destroyMbox(char *name) {
-  mpi_mbox_t    *mbox   = 0x0;
-
-  spinLock(&mpiSpinLock);
-
-  for (mbox = mboxList;mbox;mbox=mbox->next) {
-    if (!strcmp(mbox->name,name)) {
-      if (mbox->pid != _current->id) {
-        spinUnlock(&mpiSpinLock);
-        return(-1);
-        }
-      mbox->prev->next = mbox->next;
-      mbox->next->prev = mbox->prev;
-      kfree(mbox);
-      spinUnlock(&mpiSpinLock);
-      return(0x0);
-      }
-    }
-
-  spinUnlock(&mpiSpinLock);
-  return(-1);
-  }
-
-/***
- END
- ***/
diff --git a/sys/net/Makefile b/sys/net/Makefile
deleted file mode 100644
index daccaf4..0000000
--- a/sys/net/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-# The System Makefile (C) 2002 The UbixOS Project
-
-all: core-code ipv4-code ipv6-code net-code api-code netif-code
-
-core-code: core
-	(cd core;make)
-
-ipv4-code: core/ipv4
-	(cd core/ipv4;make)
-
-ipv6-code: core/ipv6
-	(cd core/ipv6;make)
-
-net-code: net
-	(cd net;make)
-
-api-code: api
-	(cd api;make)
-
-netif-code: netif
-	(cd netif;make)
-
-clean:
-	(cd core;make clean)
-	(cd core/ipv4;make clean)
-	(cd core/ipv6;make clean)
-	(cd net;make clean)
-	(cd api;make clean)
-	(cd netif;make clean)
diff --git a/sys/net/api/Makefile b/sys/net/api/Makefile
deleted file mode 100644
index 20ec808..0000000
--- a/sys/net/api/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#  Objects
-OBJS = api_lib.o api_msg.o err.o sockets.o tcpip.o netbuf.o 
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -S -o $@ $<
-.c.o:
-	$(CC) ${CFLAGS} -I../../include -c -o $@ $<
-.c.s:
-	$(CC) ${CFLAGS}-I../../include -S -o $@ $<
-.S.o:
-	$(CC) ${CFLAGS}-c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/net/api/api_lib.c b/sys/net/api/api_lib.c
deleted file mode 100644
index a50b00b..0000000
--- a/sys/net/api/api_lib.c
+++ /dev/null
@@ -1,1010 +0,0 @@
-/**
- * @file
- * Sequential API External module
- * 
- * @defgroup netconn Netconn API
- * @ingroup sequential_api
- * Thread-safe, to be called from non-TCPIP threads only.
- * TX/RX handling based on @ref netbuf (containing @ref pbuf)
- * to avoid copying data around.
- * 
- * @defgroup netconn_common Common functions
- * @ingroup netconn
- * For use with TCP and UDP
- * 
- * @defgroup netconn_tcp TCP only
- * @ingroup netconn
- * TCP only functions
- * 
- * @defgroup netconn_udp UDP only
- * @ingroup netconn
- * UDP only functions
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- */
-
-/* This is the part of the API that is linked with
-   the application */
-
-#include <net/opt.h>
-
-#if LWIP_NETCONN /* don't build if not configured for use in lwipopts.h */
-
-#include <net/api.h>
-#include <net/memp.h>
-
-#include <net/ip.h>
-#include <net/raw.h>
-#include <net/udp.h>
-#include <net/priv/api_msg.h>
-#include <net/priv/tcp_priv.h>
-#include <net/priv/tcpip_priv.h>
-
-#include <string.h>
-
-#define API_MSG_VAR_REF(name)               API_VAR_REF(name)
-#define API_MSG_VAR_DECLARE(name)           API_VAR_DECLARE(struct api_msg, name)
-#define API_MSG_VAR_ALLOC(name)             API_VAR_ALLOC(struct api_msg, MEMP_API_MSG, name, ERR_MEM)
-#define API_MSG_VAR_ALLOC_RETURN_NULL(name) API_VAR_ALLOC(struct api_msg, MEMP_API_MSG, name, NULL)
-#define API_MSG_VAR_FREE(name)              API_VAR_FREE(MEMP_API_MSG, name)
-
-static err_t netconn_close_shutdown(struct netconn *conn, u8_t how);
-
-/**
- * Call the lower part of a netconn_* function
- * This function is then running in the thread context
- * of tcpip_thread and has exclusive access to lwIP core code.
- *
- * @param fn function to call
- * @param apimsg a struct containing the function to call and its parameters
- * @return ERR_OK if the function was called, another err_t if not
- */
-static err_t
-netconn_apimsg(tcpip_callback_fn fn, struct api_msg *apimsg)
-{
-  err_t err;
-
-#ifdef LWIP_DEBUG
-  /* catch functions that don't set err */
-  apimsg->err = ERR_VAL;
-#endif /* LWIP_DEBUG */
-
-#if LWIP_NETCONN_SEM_PER_THREAD
-  apimsg->op_completed_sem = LWIP_NETCONN_THREAD_SEM_GET();
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-  err = tcpip_send_msg_wait_sem(fn, apimsg, LWIP_API_MSG_SEM(apimsg));
-  if (err == ERR_OK) {
-    return apimsg->err;
-  }
-  return err;
-}
-
-/**
- * Create a new netconn (of a specific type) that has a callback function.
- * The corresponding pcb is also created.
- *
- * @param t the type of 'connection' to create (@see enum netconn_type)
- * @param proto the IP protocol for RAW IP pcbs
- * @param callback a function to call on status changes (RX available, TX'ed)
- * @return a newly allocated struct netconn or
- *         NULL on memory error
- */
-struct netconn*
-netconn_new_with_proto_and_callback(enum netconn_type t, u8_t proto, netconn_callback callback)
-{
-  struct netconn *conn;
-  API_MSG_VAR_DECLARE(msg);
-  API_MSG_VAR_ALLOC_RETURN_NULL(msg);
-
-  conn = netconn_alloc(t, callback);
-  if (conn != NULL) {
-    err_t err;
-
-    API_MSG_VAR_REF(msg).msg.n.proto = proto;
-    API_MSG_VAR_REF(msg).conn = conn;
-    err = netconn_apimsg(lwip_netconn_do_newconn, &API_MSG_VAR_REF(msg));
-    if (err != ERR_OK) {
-      LWIP_ASSERT("freeing conn without freeing pcb", conn->pcb.tcp == NULL);
-      LWIP_ASSERT("conn has no recvmbox", sys_mbox_valid(&conn->recvmbox));
-#if LWIP_TCP
-      LWIP_ASSERT("conn->acceptmbox shouldn't exist", !sys_mbox_valid(&conn->acceptmbox));
-#endif /* LWIP_TCP */
-#if !LWIP_NETCONN_SEM_PER_THREAD
-      LWIP_ASSERT("conn has no op_completed", sys_sem_valid(&conn->op_completed));
-      sys_sem_free(&conn->op_completed);
-#endif /* !LWIP_NETCONN_SEM_PER_THREAD */
-      sys_mbox_free(&conn->recvmbox);
-      memp_free(MEMP_NETCONN, conn);
-      API_MSG_VAR_FREE(msg);
-      return NULL;
-    }
-  }
-  API_MSG_VAR_FREE(msg);
-  return conn;
-}
-
-/**
- * @ingroup netconn_common
- * Close a netconn 'connection' and free its resources.
- * UDP and RAW connection are completely closed, TCP pcbs might still be in a waitstate
- * after this returns.
- *
- * @param conn the netconn to delete
- * @return ERR_OK if the connection was deleted
- */
-err_t
-netconn_delete(struct netconn *conn)
-{
-  err_t err;
-  API_MSG_VAR_DECLARE(msg);
-
-  /* No ASSERT here because possible to get a (conn == NULL) if we got an accept error */
-  if (conn == NULL) {
-    return ERR_OK;
-  }
-
-  API_MSG_VAR_ALLOC(msg);
-  API_MSG_VAR_REF(msg).conn = conn;
-#if LWIP_SO_SNDTIMEO || LWIP_SO_LINGER
-  /* get the time we started, which is later compared to
-     sys_now() + conn->send_timeout */
-  API_MSG_VAR_REF(msg).msg.sd.time_started = sys_now();
-#else /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
-#if LWIP_TCP
-  API_MSG_VAR_REF(msg).msg.sd.polls_left =
-    ((LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT + TCP_SLOW_INTERVAL - 1) / TCP_SLOW_INTERVAL) + 1;
-#endif /* LWIP_TCP */
-#endif /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
-  err = netconn_apimsg(lwip_netconn_do_delconn, &API_MSG_VAR_REF(msg));
-  API_MSG_VAR_FREE(msg);
-
-  if (err != ERR_OK) {
-    return err;
-  }
-
-  netconn_free(conn);
-
-  return ERR_OK;
-}
-
-/**
- * Get the local or remote IP address and port of a netconn.
- * For RAW netconns, this returns the protocol instead of a port!
- *
- * @param conn the netconn to query
- * @param addr a pointer to which to save the IP address
- * @param port a pointer to which to save the port (or protocol for RAW)
- * @param local 1 to get the local IP address, 0 to get the remote one
- * @return ERR_CONN for invalid connections
- *         ERR_OK if the information was retrieved
- */
-err_t
-netconn_getaddr(struct netconn *conn, ip_addr_t *addr, u16_t *port, u8_t local)
-{
-  API_MSG_VAR_DECLARE(msg);
-  err_t err;
-
-  LWIP_ERROR("netconn_getaddr: invalid conn", (conn != NULL), return ERR_ARG;);
-  LWIP_ERROR("netconn_getaddr: invalid addr", (addr != NULL), return ERR_ARG;);
-  LWIP_ERROR("netconn_getaddr: invalid port", (port != NULL), return ERR_ARG;);
-
-  API_MSG_VAR_ALLOC(msg);
-  API_MSG_VAR_REF(msg).conn = conn;
-  API_MSG_VAR_REF(msg).msg.ad.local = local;
-#if LWIP_MPU_COMPATIBLE
-  err = netconn_apimsg(lwip_netconn_do_getaddr, &API_MSG_VAR_REF(msg));
-  *addr = msg->msg.ad.ipaddr;
-  *port = msg->msg.ad.port;
-#else /* LWIP_MPU_COMPATIBLE */
-  msg.msg.ad.ipaddr = addr;
-  msg.msg.ad.port = port;
-  err = netconn_apimsg(lwip_netconn_do_getaddr, &msg);
-#endif /* LWIP_MPU_COMPATIBLE */
-  API_MSG_VAR_FREE(msg);
-
-  return err;
-}
-
-/**
- * @ingroup netconn_common
- * Bind a netconn to a specific local IP address and port.
- * Binding one netconn twice might not always be checked correctly!
- *
- * @param conn the netconn to bind
- * @param addr the local IP address to bind the netconn to 
- *             (use IP4_ADDR_ANY/IP6_ADDR_ANY to bind to all addresses)
- * @param port the local port to bind the netconn to (not used for RAW)
- * @return ERR_OK if bound, any other err_t on failure
- */
-err_t
-netconn_bind(struct netconn *conn, const ip_addr_t *addr, u16_t port)
-{
-  API_MSG_VAR_DECLARE(msg);
-  err_t err;
-  
-  LWIP_ERROR("netconn_bind: invalid conn", (conn != NULL), return ERR_ARG;);
-
-#if LWIP_IPV4
-  /* Don't propagate NULL pointer (IP_ADDR_ANY alias) to subsequent functions */
-  if (addr == NULL) {
-    addr = IP4_ADDR_ANY;
-  }
-#endif /* LWIP_IPV4 */
-  
-#if LWIP_IPV4 && LWIP_IPV6
-  /* "Socket API like" dual-stack support: If IP to bind to is IP6_ADDR_ANY,
-   * and NETCONN_FLAG_IPV6_V6ONLY is 0, use IP_ANY_TYPE to bind
-   */
-  if ((netconn_get_ipv6only(conn) == 0) &&
-     ip_addr_cmp(addr, IP6_ADDR_ANY)) {
-    addr = IP_ANY_TYPE;
-  }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-  API_MSG_VAR_ALLOC(msg);
-  API_MSG_VAR_REF(msg).conn = conn;
-  API_MSG_VAR_REF(msg).msg.bc.ipaddr = API_MSG_VAR_REF(addr);
-  API_MSG_VAR_REF(msg).msg.bc.port = port;
-  err = netconn_apimsg(lwip_netconn_do_bind, &API_MSG_VAR_REF(msg));
-  API_MSG_VAR_FREE(msg);
-
-  return err;
-}
-
-/**
- * @ingroup netconn_common
- * Connect a netconn to a specific remote IP address and port.
- *
- * @param conn the netconn to connect
- * @param addr the remote IP address to connect to
- * @param port the remote port to connect to (no used for RAW)
- * @return ERR_OK if connected, return value of tcp_/udp_/raw_connect otherwise
- */
-err_t
-netconn_connect(struct netconn *conn, const ip_addr_t *addr, u16_t port)
-{
-  API_MSG_VAR_DECLARE(msg);
-  err_t err;
-
-  LWIP_ERROR("netconn_connect: invalid conn", (conn != NULL), return ERR_ARG;);
-
-#if LWIP_IPV4
-  /* Don't propagate NULL pointer (IP_ADDR_ANY alias) to subsequent functions */
-  if (addr == NULL) {
-    addr = IP4_ADDR_ANY;
-  }
-#endif /* LWIP_IPV4 */
-
-  API_MSG_VAR_ALLOC(msg);
-  API_MSG_VAR_REF(msg).conn = conn;
-  API_MSG_VAR_REF(msg).msg.bc.ipaddr = API_MSG_VAR_REF(addr);
-  API_MSG_VAR_REF(msg).msg.bc.port = port;
-  err = netconn_apimsg(lwip_netconn_do_connect, &API_MSG_VAR_REF(msg));
-  API_MSG_VAR_FREE(msg);
-
-  return err;
-}
-
-/**
- * @ingroup netconn_udp
- * Disconnect a netconn from its current peer (only valid for UDP netconns).
- *
- * @param conn the netconn to disconnect
- * @return See @ref err_t
- */
-err_t
-netconn_disconnect(struct netconn *conn)
-{
-  API_MSG_VAR_DECLARE(msg);
-  err_t err;
-
-  LWIP_ERROR("netconn_disconnect: invalid conn", (conn != NULL), return ERR_ARG;);
-
-  API_MSG_VAR_ALLOC(msg);
-  API_MSG_VAR_REF(msg).conn = conn;
-  err = netconn_apimsg(lwip_netconn_do_disconnect, &API_MSG_VAR_REF(msg));
-  API_MSG_VAR_FREE(msg);
-
-  return err;
-}
-
-/**
- * @ingroup netconn_tcp
- * Set a TCP netconn into listen mode
- *
- * @param conn the tcp netconn to set to listen mode
- * @param backlog the listen backlog, only used if TCP_LISTEN_BACKLOG==1
- * @return ERR_OK if the netconn was set to listen (UDP and RAW netconns
- *         don't return any error (yet?))
- */
-err_t
-netconn_listen_with_backlog(struct netconn *conn, u8_t backlog)
-{
-#if LWIP_TCP
-  API_MSG_VAR_DECLARE(msg);
-  err_t err;
-
-  /* This does no harm. If TCP_LISTEN_BACKLOG is off, backlog is unused. */
-  LWIP_UNUSED_ARG(backlog);
-
-  LWIP_ERROR("netconn_listen: invalid conn", (conn != NULL), return ERR_ARG;);
-
-  API_MSG_VAR_ALLOC(msg);
-  API_MSG_VAR_REF(msg).conn = conn;
-#if TCP_LISTEN_BACKLOG
-  API_MSG_VAR_REF(msg).msg.lb.backlog = backlog;
-#endif /* TCP_LISTEN_BACKLOG */
-  err = netconn_apimsg(lwip_netconn_do_listen, &API_MSG_VAR_REF(msg));
-  API_MSG_VAR_FREE(msg);
-
-  return err;
-#else /* LWIP_TCP */
-  LWIP_UNUSED_ARG(conn);
-  LWIP_UNUSED_ARG(backlog);
-  return ERR_ARG;
-#endif /* LWIP_TCP */
-}
-
-/**
- * @ingroup netconn_tcp
- * Accept a new connection on a TCP listening netconn.
- *
- * @param conn the TCP listen netconn
- * @param new_conn pointer where the new connection is stored
- * @return ERR_OK if a new connection has been received or an error
- *                code otherwise
- */
-err_t
-netconn_accept(struct netconn *conn, struct netconn **new_conn)
-{
-#if LWIP_TCP
-  void *accept_ptr;
-  struct netconn *newconn;
-#if TCP_LISTEN_BACKLOG
-  API_MSG_VAR_DECLARE(msg);
-#endif /* TCP_LISTEN_BACKLOG */
-
-  LWIP_ERROR("netconn_accept: invalid pointer",    (new_conn != NULL),                  return ERR_ARG;);
-  *new_conn = NULL;
-  LWIP_ERROR("netconn_accept: invalid conn",       (conn != NULL),                      return ERR_ARG;);
-
-  if (ERR_IS_FATAL(conn->last_err)) {
-    /* don't recv on fatal errors: this might block the application task
-       waiting on acceptmbox forever! */
-    return conn->last_err;
-  }
-  if (!sys_mbox_valid(&conn->acceptmbox)) {
-    return ERR_CLSD;
-  }
-
-#if TCP_LISTEN_BACKLOG
-  API_MSG_VAR_ALLOC(msg);
-#endif /* TCP_LISTEN_BACKLOG */
-
-#if LWIP_SO_RCVTIMEO
-  if (sys_arch_mbox_fetch(&conn->acceptmbox, &accept_ptr, conn->recv_timeout) == SYS_ARCH_TIMEOUT) {
-#if TCP_LISTEN_BACKLOG
-    API_MSG_VAR_FREE(msg);
-#endif /* TCP_LISTEN_BACKLOG */
-    return ERR_TIMEOUT;
-  }
-#else
-  sys_arch_mbox_fetch(&conn->acceptmbox, &accept_ptr, 0);
-#endif /* LWIP_SO_RCVTIMEO*/
-  newconn = (struct netconn *)accept_ptr;
-  /* Register event with callback */
-  API_EVENT(conn, NETCONN_EVT_RCVMINUS, 0);
-
-  if (accept_ptr == &netconn_aborted) {
-    /* a connection has been aborted: out of pcbs or out of netconns during accept */
-    /* @todo: set netconn error, but this would be fatal and thus block further accepts */
-#if TCP_LISTEN_BACKLOG
-    API_MSG_VAR_FREE(msg);
-#endif /* TCP_LISTEN_BACKLOG */
-    return ERR_ABRT;
-  }
-  if (newconn == NULL) {
-    /* connection has been aborted */
-    /* in this special case, we set the netconn error from application thread, as
-       on a ready-to-accept listening netconn, there should not be anything running
-       in tcpip_thread */
-    NETCONN_SET_SAFE_ERR(conn, ERR_CLSD);
-#if TCP_LISTEN_BACKLOG
-    API_MSG_VAR_FREE(msg);
-#endif /* TCP_LISTEN_BACKLOG */
-    return ERR_CLSD;
-  }
-#if TCP_LISTEN_BACKLOG
-  /* Let the stack know that we have accepted the connection. */
-  API_MSG_VAR_REF(msg).conn = newconn;
-  /* don't care for the return value of lwip_netconn_do_recv */
-  netconn_apimsg(lwip_netconn_do_accepted, &API_MSG_VAR_REF(msg));
-  API_MSG_VAR_FREE(msg);
-#endif /* TCP_LISTEN_BACKLOG */
-
-  *new_conn = newconn;
-  /* don't set conn->last_err: it's only ERR_OK, anyway */
-  return ERR_OK;
-#else /* LWIP_TCP */
-  LWIP_UNUSED_ARG(conn);
-  LWIP_UNUSED_ARG(new_conn);
-  return ERR_ARG;
-#endif /* LWIP_TCP */
-}
-
-/**
- * @ingroup netconn_common
- * Receive data: actual implementation that doesn't care whether pbuf or netbuf
- * is received
- *
- * @param conn the netconn from which to receive data
- * @param new_buf pointer where a new pbuf/netbuf is stored when received data
- * @return ERR_OK if data has been received, an error code otherwise (timeout,
- *                memory error or another error)
- */
-static err_t
-netconn_recv_data(struct netconn *conn, void **new_buf)
-{
-  void *buf = NULL;
-  u16_t len;
-#if LWIP_TCP
-  API_MSG_VAR_DECLARE(msg);
-#if LWIP_MPU_COMPATIBLE
-  msg = NULL;
-#endif
-#endif /* LWIP_TCP */
-
-  LWIP_ERROR("netconn_recv: invalid pointer", (new_buf != NULL), return ERR_ARG;);
-  *new_buf = NULL;
-  LWIP_ERROR("netconn_recv: invalid conn",    (conn != NULL),    return ERR_ARG;);
-#if LWIP_TCP
-#if (LWIP_UDP || LWIP_RAW)
-  if (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP)
-#endif /* (LWIP_UDP || LWIP_RAW) */
-  {
-    if (!sys_mbox_valid(&conn->recvmbox)) {
-      /* This happens when calling this function after receiving FIN */
-      return sys_mbox_valid(&conn->acceptmbox) ? ERR_CONN : ERR_CLSD;
-    }
-  }
-#endif /* LWIP_TCP */
-  LWIP_ERROR("netconn_recv: invalid recvmbox", sys_mbox_valid(&conn->recvmbox), return ERR_CONN;);
-
-  if (ERR_IS_FATAL(conn->last_err)) {
-    /* don't recv on fatal errors: this might block the application task
-       waiting on recvmbox forever! */
-    /* @todo: this does not allow us to fetch data that has been put into recvmbox
-       before the fatal error occurred - is that a problem? */
-    return conn->last_err;
-  }
-#if LWIP_TCP
-#if (LWIP_UDP || LWIP_RAW)
-  if (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP)
-#endif /* (LWIP_UDP || LWIP_RAW) */
-  {
-    API_MSG_VAR_ALLOC(msg);
-  }
-#endif /* LWIP_TCP */
-
-#if LWIP_SO_RCVTIMEO
-  if (sys_arch_mbox_fetch(&conn->recvmbox, &buf, conn->recv_timeout) == SYS_ARCH_TIMEOUT) {
-#if LWIP_TCP
-#if (LWIP_UDP || LWIP_RAW)
-    if (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP)
-#endif /* (LWIP_UDP || LWIP_RAW) */
-    {
-      API_MSG_VAR_FREE(msg);
-    }
-#endif /* LWIP_TCP */
-    return ERR_TIMEOUT;
-  }
-#else
-  sys_arch_mbox_fetch(&conn->recvmbox, &buf, 0);
-#endif /* LWIP_SO_RCVTIMEO*/
-
-#if LWIP_TCP
-#if (LWIP_UDP || LWIP_RAW)
-  if (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP)
-#endif /* (LWIP_UDP || LWIP_RAW) */
-  {
-    /* Let the stack know that we have taken the data. */
-    /* @todo: Speedup: Don't block and wait for the answer here
-       (to prevent multiple thread-switches). */
-    API_MSG_VAR_REF(msg).conn = conn;
-    if (buf != NULL) {
-      API_MSG_VAR_REF(msg).msg.r.len = ((struct pbuf *)buf)->tot_len;
-    } else {
-      API_MSG_VAR_REF(msg).msg.r.len = 1;
-    }
-
-    /* don't care for the return value of lwip_netconn_do_recv */
-    netconn_apimsg(lwip_netconn_do_recv, &API_MSG_VAR_REF(msg));
-    API_MSG_VAR_FREE(msg);
-
-    /* If we are closed, we indicate that we no longer wish to use the socket */
-    if (buf == NULL) {
-      API_EVENT(conn, NETCONN_EVT_RCVMINUS, 0);
-      if (conn->pcb.ip == NULL) {
-        /* race condition: RST during recv */
-        return conn->last_err == ERR_OK ? ERR_RST : conn->last_err;
-      }
-      /* RX side is closed, so deallocate the recvmbox */
-      netconn_close_shutdown(conn, NETCONN_SHUT_RD);
-      /* Don' store ERR_CLSD as conn->err since we are only half-closed */
-      return ERR_CLSD;
-    }
-    len = ((struct pbuf *)buf)->tot_len;
-  }
-#endif /* LWIP_TCP */
-#if LWIP_TCP && (LWIP_UDP || LWIP_RAW)
-  else
-#endif /* LWIP_TCP && (LWIP_UDP || LWIP_RAW) */
-#if (LWIP_UDP || LWIP_RAW)
-  {
-    LWIP_ASSERT("buf != NULL", buf != NULL);
-    len = netbuf_len((struct netbuf*)buf);
-  }
-#endif /* (LWIP_UDP || LWIP_RAW) */
-
-#if LWIP_SO_RCVBUF
-  SYS_ARCH_DEC(conn->recv_avail, len);
-#endif /* LWIP_SO_RCVBUF */
-  /* Register event with callback */
-  API_EVENT(conn, NETCONN_EVT_RCVMINUS, len);
-
-  LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_recv_data: received %p, len=%"U16_F"\n", buf, len));
-
-  *new_buf = buf;
-  /* don't set conn->last_err: it's only ERR_OK, anyway */
-  return ERR_OK;
-}
-
-/**
- * @ingroup netconn_tcp
- * Receive data (in form of a pbuf) from a TCP netconn
- *
- * @param conn the netconn from which to receive data
- * @param new_buf pointer where a new pbuf is stored when received data
- * @return ERR_OK if data has been received, an error code otherwise (timeout,
- *                memory error or another error)
- *         ERR_ARG if conn is not a TCP netconn
- */
-err_t
-netconn_recv_tcp_pbuf(struct netconn *conn, struct pbuf **new_buf)
-{
-  LWIP_ERROR("netconn_recv: invalid conn", (conn != NULL) &&
-             NETCONNTYPE_GROUP(netconn_type(conn)) == NETCONN_TCP, return ERR_ARG;);
-
-  return netconn_recv_data(conn, (void **)new_buf);
-}
-
-/**
- * @ingroup netconn_common
- * Receive data (in form of a netbuf containing a packet buffer) from a netconn
- *
- * @param conn the netconn from which to receive data
- * @param new_buf pointer where a new netbuf is stored when received data
- * @return ERR_OK if data has been received, an error code otherwise (timeout,
- *                memory error or another error)
- */
-err_t
-netconn_recv(struct netconn *conn, struct netbuf **new_buf)
-{
-#if LWIP_TCP
-  struct netbuf *buf = NULL;
-  err_t err;
-#endif /* LWIP_TCP */
-
-  LWIP_ERROR("netconn_recv: invalid pointer", (new_buf != NULL), return ERR_ARG;);
-  *new_buf = NULL;
-  LWIP_ERROR("netconn_recv: invalid conn",    (conn != NULL),    return ERR_ARG;);
-
-#if LWIP_TCP
-#if (LWIP_UDP || LWIP_RAW)
-  if (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP)
-#endif /* (LWIP_UDP || LWIP_RAW) */
-  {
-    struct pbuf *p = NULL;
-    /* This is not a listening netconn, since recvmbox is set */
-
-    buf = (struct netbuf *)memp_malloc(MEMP_NETBUF);
-    if (buf == NULL) {
-      return ERR_MEM;
-    }
-
-    err = netconn_recv_data(conn, (void **)&p);
-    if (err != ERR_OK) {
-      memp_free(MEMP_NETBUF, buf);
-      return err;
-    }
-    LWIP_ASSERT("p != NULL", p != NULL);
-
-    buf->p = p;
-    buf->ptr = p;
-    buf->port = 0;
-    ip_addr_set_zero(&buf->addr);
-    *new_buf = buf;
-    /* don't set conn->last_err: it's only ERR_OK, anyway */
-    return ERR_OK;
-  }
-#endif /* LWIP_TCP */
-#if LWIP_TCP && (LWIP_UDP || LWIP_RAW)
-  else
-#endif /* LWIP_TCP && (LWIP_UDP || LWIP_RAW) */
-  {
-#if (LWIP_UDP || LWIP_RAW)
-    return netconn_recv_data(conn, (void **)new_buf);
-#endif /* (LWIP_UDP || LWIP_RAW) */
-  }
-}
-
-/**
- * @ingroup netconn_udp
- * Send data (in form of a netbuf) to a specific remote IP address and port.
- * Only to be used for UDP and RAW netconns (not TCP).
- *
- * @param conn the netconn over which to send data
- * @param buf a netbuf containing the data to send
- * @param addr the remote IP address to which to send the data
- * @param port the remote port to which to send the data
- * @return ERR_OK if data was sent, any other err_t on error
- */
-err_t
-netconn_sendto(struct netconn *conn, struct netbuf *buf, const ip_addr_t *addr, u16_t port)
-{
-  if (buf != NULL) {
-    ip_addr_set(&buf->addr, addr);
-    buf->port = port;
-    return netconn_send(conn, buf);
-  }
-  return ERR_VAL;
-}
-
-/**
- * @ingroup netconn_udp
- * Send data over a UDP or RAW netconn (that is already connected).
- *
- * @param conn the UDP or RAW netconn over which to send data
- * @param buf a netbuf containing the data to send
- * @return ERR_OK if data was sent, any other err_t on error
- */
-err_t
-netconn_send(struct netconn *conn, struct netbuf *buf)
-{
-  API_MSG_VAR_DECLARE(msg);
-  err_t err;
-
-  LWIP_ERROR("netconn_send: invalid conn",  (conn != NULL), return ERR_ARG;);
-
-  LWIP_DEBUGF(API_LIB_DEBUG, ("netconn_send: sending %"U16_F" bytes\n", buf->p->tot_len));
-
-  API_MSG_VAR_ALLOC(msg);
-  API_MSG_VAR_REF(msg).conn = conn;
-  API_MSG_VAR_REF(msg).msg.b = buf;
-  err = netconn_apimsg(lwip_netconn_do_send, &API_MSG_VAR_REF(msg));
-  API_MSG_VAR_FREE(msg);
-
-  return err;
-}
-
-/**
- * @ingroup netconn_tcp
- * Send data over a TCP netconn.
- *
- * @param conn the TCP netconn over which to send data
- * @param dataptr pointer to the application buffer that contains the data to send
- * @param size size of the application data to send
- * @param apiflags combination of following flags :
- * - NETCONN_COPY: data will be copied into memory belonging to the stack
- * - NETCONN_MORE: for TCP connection, PSH flag will be set on last segment sent
- * - NETCONN_DONTBLOCK: only write the data if all data can be written at once
- * @param bytes_written pointer to a location that receives the number of written bytes
- * @return ERR_OK if data was sent, any other err_t on error
- */
-err_t
-netconn_write_partly(struct netconn *conn, const void *dataptr, size_t size,
-                     u8_t apiflags, size_t *bytes_written)
-{
-  API_MSG_VAR_DECLARE(msg);
-  err_t err;
-  u8_t dontblock;
-
-  LWIP_ERROR("netconn_write: invalid conn",  (conn != NULL), return ERR_ARG;);
-  LWIP_ERROR("netconn_write: invalid conn->type",  (NETCONNTYPE_GROUP(conn->type)== NETCONN_TCP), return ERR_VAL;);
-  if (size == 0) {
-    return ERR_OK;
-  }
-  dontblock = netconn_is_nonblocking(conn) || (apiflags & NETCONN_DONTBLOCK);
-#if LWIP_SO_SNDTIMEO
-  if (conn->send_timeout != 0) {
-    dontblock = 1;
-  }
-#endif /* LWIP_SO_SNDTIMEO */
-  if (dontblock && !bytes_written) {
-    /* This implies netconn_write() cannot be used for non-blocking send, since
-       it has no way to return the number of bytes written. */
-    return ERR_VAL;
-  }
-
-  API_MSG_VAR_ALLOC(msg);
-  /* non-blocking write sends as much  */
-  API_MSG_VAR_REF(msg).conn = conn;
-  API_MSG_VAR_REF(msg).msg.w.dataptr = dataptr;
-  API_MSG_VAR_REF(msg).msg.w.apiflags = apiflags;
-  API_MSG_VAR_REF(msg).msg.w.len = size;
-#if LWIP_SO_SNDTIMEO
-  if (conn->send_timeout != 0) {
-    /* get the time we started, which is later compared to
-        sys_now() + conn->send_timeout */
-    API_MSG_VAR_REF(msg).msg.w.time_started = sys_now();
-  } else {
-    API_MSG_VAR_REF(msg).msg.w.time_started = 0;
-  }
-#endif /* LWIP_SO_SNDTIMEO */
-
-  /* For locking the core: this _can_ be delayed on low memory/low send buffer,
-     but if it is, this is done inside api_msg.c:do_write(), so we can use the
-     non-blocking version here. */
-  err = netconn_apimsg(lwip_netconn_do_write, &API_MSG_VAR_REF(msg));
-  if ((err == ERR_OK) && (bytes_written != NULL)) {
-    if (dontblock) {
-      /* nonblocking write: maybe the data has been sent partly */
-      *bytes_written = API_MSG_VAR_REF(msg).msg.w.len;
-    } else {
-      /* blocking call succeeded: all data has been sent if it */
-      *bytes_written = size;
-    }
-  }
-  API_MSG_VAR_FREE(msg);
-
-  return err;
-}
-
-/**
- * @ingroup netconn_tcp
- * Close or shutdown a TCP netconn (doesn't delete it).
- *
- * @param conn the TCP netconn to close or shutdown
- * @param how fully close or only shutdown one side?
- * @return ERR_OK if the netconn was closed, any other err_t on error
- */
-static err_t
-netconn_close_shutdown(struct netconn *conn, u8_t how)
-{
-  API_MSG_VAR_DECLARE(msg);
-  err_t err;
-  LWIP_UNUSED_ARG(how);
-
-  LWIP_ERROR("netconn_close: invalid conn",  (conn != NULL), return ERR_ARG;);
-
-  API_MSG_VAR_ALLOC(msg);
-  API_MSG_VAR_REF(msg).conn = conn;
-#if LWIP_TCP
-  /* shutting down both ends is the same as closing */
-  API_MSG_VAR_REF(msg).msg.sd.shut = how;
-#if LWIP_SO_SNDTIMEO || LWIP_SO_LINGER
-  /* get the time we started, which is later compared to
-     sys_now() + conn->send_timeout */
-  API_MSG_VAR_REF(msg).msg.sd.time_started = sys_now();
-#else /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
-  API_MSG_VAR_REF(msg).msg.sd.polls_left =
-    ((LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT + TCP_SLOW_INTERVAL - 1) / TCP_SLOW_INTERVAL) + 1;
-#endif /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
-#endif /* LWIP_TCP */
-  err = netconn_apimsg(lwip_netconn_do_close, &API_MSG_VAR_REF(msg));
-  API_MSG_VAR_FREE(msg);
-
-  return err;
-}
-
-/**
- * @ingroup netconn_tcp
- * Close a TCP netconn (doesn't delete it).
- *
- * @param conn the TCP netconn to close
- * @return ERR_OK if the netconn was closed, any other err_t on error
- */
-err_t
-netconn_close(struct netconn *conn)
-{
-  /* shutting down both ends is the same as closing */
-  return netconn_close_shutdown(conn, NETCONN_SHUT_RDWR);
-}
-
-/**
- * @ingroup netconn_tcp
- * Shut down one or both sides of a TCP netconn (doesn't delete it).
- *
- * @param conn the TCP netconn to shut down
- * @param shut_rx shut down the RX side (no more read possible after this)
- * @param shut_tx shut down the TX side (no more write possible after this)
- * @return ERR_OK if the netconn was closed, any other err_t on error
- */
-err_t
-netconn_shutdown(struct netconn *conn, u8_t shut_rx, u8_t shut_tx)
-{
-  return netconn_close_shutdown(conn, (shut_rx ? NETCONN_SHUT_RD : 0) | (shut_tx ? NETCONN_SHUT_WR : 0));
-}
-
-#if LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD)
-/**
- * @ingroup netconn_udp
- * Join multicast groups for UDP netconns.
- *
- * @param conn the UDP netconn for which to change multicast addresses
- * @param multiaddr IP address of the multicast group to join or leave
- * @param netif_addr the IP address of the network interface on which to send
- *                  the igmp message
- * @param join_or_leave flag whether to send a join- or leave-message
- * @return ERR_OK if the action was taken, any err_t on error
- */
-err_t
-netconn_join_leave_group(struct netconn *conn,
-                         const ip_addr_t *multiaddr,
-                         const ip_addr_t *netif_addr,
-                         enum netconn_igmp join_or_leave)
-{
-  API_MSG_VAR_DECLARE(msg);
-  err_t err;
-
-  LWIP_ERROR("netconn_join_leave_group: invalid conn",  (conn != NULL), return ERR_ARG;);
-
-  API_MSG_VAR_ALLOC(msg);
-
-#if LWIP_IPV4
-  /* Don't propagate NULL pointer (IP_ADDR_ANY alias) to subsequent functions */
-  if (multiaddr == NULL) {
-    multiaddr = IP4_ADDR_ANY;
-  }
-  if (netif_addr == NULL) {
-    netif_addr = IP4_ADDR_ANY;
-  }
-#endif /* LWIP_IPV4 */
-
-  API_MSG_VAR_REF(msg).conn = conn;
-  API_MSG_VAR_REF(msg).msg.jl.multiaddr = API_MSG_VAR_REF(multiaddr);
-  API_MSG_VAR_REF(msg).msg.jl.netif_addr = API_MSG_VAR_REF(netif_addr);
-  API_MSG_VAR_REF(msg).msg.jl.join_or_leave = join_or_leave;
-  err = netconn_apimsg(lwip_netconn_do_join_leave_group, &API_MSG_VAR_REF(msg));
-  API_MSG_VAR_FREE(msg);
-
-  return err;
-}
-#endif /* LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD) */
-
-#if LWIP_DNS
-/**
- * @ingroup netconn_common
- * Execute a DNS query, only one IP address is returned
- *
- * @param name a string representation of the DNS host name to query
- * @param addr a preallocated ip_addr_t where to store the resolved IP address
- * @param dns_addrtype IP address type (IPv4 / IPv6)
- * @return ERR_OK: resolving succeeded
- *         ERR_MEM: memory error, try again later
- *         ERR_ARG: dns client not initialized or invalid hostname
- *         ERR_VAL: dns server response was invalid
- */
-#if LWIP_IPV4 && LWIP_IPV6
-err_t
-netconn_gethostbyname_addrtype(const char *name, ip_addr_t *addr, u8_t dns_addrtype)
-#else
-err_t
-netconn_gethostbyname(const char *name, ip_addr_t *addr)
-#endif
-{
-  API_VAR_DECLARE(struct dns_api_msg, msg);
-#if !LWIP_MPU_COMPATIBLE
-  sys_sem_t sem;
-#endif /* LWIP_MPU_COMPATIBLE */
-  err_t err;
-  err_t cberr;
-
-  LWIP_ERROR("netconn_gethostbyname: invalid name", (name != NULL), return ERR_ARG;);
-  LWIP_ERROR("netconn_gethostbyname: invalid addr", (addr != NULL), return ERR_ARG;);
-#if LWIP_MPU_COMPATIBLE
-  if (strlen(name) >= DNS_MAX_NAME_LENGTH) {
-    return ERR_ARG;
-  }
-#endif
-
-  API_VAR_ALLOC(struct dns_api_msg, MEMP_DNS_API_MSG, msg, ERR_MEM);
-#if LWIP_MPU_COMPATIBLE
-  strncpy(API_VAR_REF(msg).name, name, DNS_MAX_NAME_LENGTH-1);
-  API_VAR_REF(msg).name[DNS_MAX_NAME_LENGTH-1] = 0;
-#else /* LWIP_MPU_COMPATIBLE */
-  msg.err = &err;
-  msg.sem = &sem;
-  API_VAR_REF(msg).addr = API_VAR_REF(addr);
-  API_VAR_REF(msg).name = name;
-#endif /* LWIP_MPU_COMPATIBLE */
-#if LWIP_IPV4 && LWIP_IPV6
-  API_VAR_REF(msg).dns_addrtype = dns_addrtype;
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-#if LWIP_NETCONN_SEM_PER_THREAD
-  API_VAR_REF(msg).sem = LWIP_NETCONN_THREAD_SEM_GET();
-#else /* LWIP_NETCONN_SEM_PER_THREAD*/
-  err = sys_sem_new(API_EXPR_REF(API_VAR_REF(msg).sem), 0);
-  if (err != ERR_OK) {
-    API_VAR_FREE(MEMP_DNS_API_MSG, msg);
-    return err;
-  }
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-  cberr = tcpip_callback(lwip_netconn_do_gethostbyname, &API_VAR_REF(msg));
-  if (cberr != ERR_OK) {
-#if !LWIP_NETCONN_SEM_PER_THREAD
-    sys_sem_free(API_EXPR_REF(API_VAR_REF(msg).sem));
-#endif /* !LWIP_NETCONN_SEM_PER_THREAD */
-    API_VAR_FREE(MEMP_DNS_API_MSG, msg);
-    return cberr;
-  }
-  sys_sem_wait(API_EXPR_REF_SEM(API_VAR_REF(msg).sem));
-#if !LWIP_NETCONN_SEM_PER_THREAD
-  sys_sem_free(API_EXPR_REF(API_VAR_REF(msg).sem));
-#endif /* !LWIP_NETCONN_SEM_PER_THREAD */
-
-#if LWIP_MPU_COMPATIBLE
-  *addr = msg->addr;
-  err = msg->err;
-#endif /* LWIP_MPU_COMPATIBLE */
-
-  API_VAR_FREE(MEMP_DNS_API_MSG, msg);
-  return err;
-}
-#endif /* LWIP_DNS*/
-
-#if LWIP_NETCONN_SEM_PER_THREAD
-void
-netconn_thread_init(void)
-{
-  sys_sem_t *sem = LWIP_NETCONN_THREAD_SEM_GET();
-  if ((sem == NULL) || !sys_sem_valid(sem)) {
-    /* call alloc only once */
-    LWIP_NETCONN_THREAD_SEM_ALLOC();
-    LWIP_ASSERT("LWIP_NETCONN_THREAD_SEM_ALLOC() failed", sys_sem_valid(LWIP_NETCONN_THREAD_SEM_GET()));
-  }
-}
-
-void
-netconn_thread_cleanup(void)
-{
-  sys_sem_t *sem = LWIP_NETCONN_THREAD_SEM_GET();
-  if ((sem != NULL) && sys_sem_valid(sem)) {
-    /* call free only once */
-    LWIP_NETCONN_THREAD_SEM_FREE();
-  }
-}
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-#endif /* LWIP_NETCONN */
diff --git a/sys/net/api/api_msg.c b/sys/net/api/api_msg.c
deleted file mode 100644
index 81e7a79..0000000
--- a/sys/net/api/api_msg.c
+++ /dev/null
@@ -1,1953 +0,0 @@
-/**
- * @file
- * Sequential API Internal module
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include <net/opt.h>
-
-#if LWIP_NETCONN /* don't build if not configured for use in lwipopts.h */
-
-#include <net/priv/api_msg.h>
-
-#include <net/ip.h>
-#include <net/ip_addr.h>
-#include <net/udp.h>
-#include <net/tcp.h>
-#include <net/raw.h>
-
-#include <net/memp.h>
-#include <net/igmp.h>
-#include <net/dns.h>
-#include <net/mld6.h>
-#include <net/priv/tcpip_priv.h>
-
-#include <string.h>
-
-/* netconns are polled once per second (e.g. continue write on memory error) */
-#define NETCONN_TCP_POLL_INTERVAL 2
-
-#define SET_NONBLOCKING_CONNECT(conn, val)  do { if (val) { \
-  (conn)->flags |= NETCONN_FLAG_IN_NONBLOCKING_CONNECT; \
-} else { \
-  (conn)->flags &= ~ NETCONN_FLAG_IN_NONBLOCKING_CONNECT; }} while(0)
-#define IN_NONBLOCKING_CONNECT(conn) (((conn)->flags & NETCONN_FLAG_IN_NONBLOCKING_CONNECT) != 0)
-
-/* forward declarations */
-#if LWIP_TCP
-#if LWIP_TCPIP_CORE_LOCKING
-#define WRITE_DELAYED         , 1
-#define WRITE_DELAYED_PARAM   , u8_t delayed
-#else /* LWIP_TCPIP_CORE_LOCKING */
-#define WRITE_DELAYED
-#define WRITE_DELAYED_PARAM
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-static err_t lwip_netconn_do_writemore(struct netconn *conn  WRITE_DELAYED_PARAM);
-static err_t lwip_netconn_do_close_internal(struct netconn *conn  WRITE_DELAYED_PARAM);
-#endif
-
-#if LWIP_TCPIP_CORE_LOCKING
-#define TCPIP_APIMSG_ACK(m)   NETCONN_SET_SAFE_ERR((m)->conn, (m)->err)
-#else /* LWIP_TCPIP_CORE_LOCKING */
-#define TCPIP_APIMSG_ACK(m)   do { NETCONN_SET_SAFE_ERR((m)->conn, (m)->err); sys_sem_signal(LWIP_API_MSG_SEM(m)); } while(0)
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-
-#if LWIP_TCP
-u8_t netconn_aborted;
-#endif /* LWIP_TCP */
-
-#if LWIP_RAW
-/**
- * Receive callback function for RAW netconns.
- * Doesn't 'eat' the packet, only copies it and sends it to
- * conn->recvmbox
- *
- * @see raw.h (struct raw_pcb.recv) for parameters and return value
- */
-static u8_t
-recv_raw(void *arg, struct raw_pcb *pcb, struct pbuf *p,
-    const ip_addr_t *addr)
-{
-  struct pbuf *q;
-  struct netbuf *buf;
-  struct netconn *conn;
-
-  LWIP_UNUSED_ARG(addr);
-  conn = (struct netconn *)arg;
-
-  if ((conn != NULL) && sys_mbox_valid(&conn->recvmbox)) {
-#if LWIP_SO_RCVBUF
-    int recv_avail;
-    SYS_ARCH_GET(conn->recv_avail, recv_avail);
-    if ((recv_avail + (int)(p->tot_len)) > conn->recv_bufsize) {
-      return 0;
-    }
-#endif /* LWIP_SO_RCVBUF */
-    /* copy the whole packet into new pbufs */
-    q = pbuf_alloc(PBUF_RAW, p->tot_len, PBUF_RAM);
-    if (q != NULL) {
-      if (pbuf_copy(q, p) != ERR_OK) {
-        pbuf_free(q);
-        q = NULL;
-      }
-    }
-
-    if (q != NULL) {
-      u16_t len;
-      buf = (struct netbuf *)memp_malloc(MEMP_NETBUF);
-      if (buf == NULL) {
-        pbuf_free(q);
-        return 0;
-      }
-
-      buf->p = q;
-      buf->ptr = q;
-      ip_addr_copy(buf->addr, *ip_current_src_addr());
-      buf->port = pcb->protocol;
-
-      len = q->tot_len;
-      if (sys_mbox_trypost(&conn->recvmbox, buf) != ERR_OK) {
-        netbuf_delete(buf);
-        return 0;
-      } else {
-#if LWIP_SO_RCVBUF
-        SYS_ARCH_INC(conn->recv_avail, len);
-#endif /* LWIP_SO_RCVBUF */
-        /* Register event with callback */
-        API_EVENT(conn, NETCONN_EVT_RCVPLUS, len);
-      }
-    }
-  }
-
-  return 0; /* do not eat the packet */
-}
-#endif /* LWIP_RAW*/
-
-#if LWIP_UDP
-/**
- * Receive callback function for UDP netconns.
- * Posts the packet to conn->recvmbox or deletes it on memory error.
- *
- * @see udp.h (struct udp_pcb.recv) for parameters
- */
-static void
-recv_udp(void *arg, struct udp_pcb *pcb, struct pbuf *p,
-   const ip_addr_t *addr, u16_t port)
-{
-  struct netbuf *buf;
-  struct netconn *conn;
-  u16_t len;
-#if LWIP_SO_RCVBUF
-  int recv_avail;
-#endif /* LWIP_SO_RCVBUF */
-
-  LWIP_UNUSED_ARG(pcb); /* only used for asserts... */
-  LWIP_ASSERT("recv_udp must have a pcb argument", pcb != NULL);
-  LWIP_ASSERT("recv_udp must have an argument", arg != NULL);
-  conn = (struct netconn *)arg;
-
-  if (conn == NULL) {
-    pbuf_free(p);
-    return;
-  }
-
-  LWIP_ASSERT("recv_udp: recv for wrong pcb!", conn->pcb.udp == pcb);
-
-#if LWIP_SO_RCVBUF
-  SYS_ARCH_GET(conn->recv_avail, recv_avail);
-  if (!sys_mbox_valid(&conn->recvmbox) ||
-      ((recv_avail + (int)(p->tot_len)) > conn->recv_bufsize)) {
-#else  /* LWIP_SO_RCVBUF */
-  if (!sys_mbox_valid(&conn->recvmbox)) {
-#endif /* LWIP_SO_RCVBUF */
-    pbuf_free(p);
-    return;
-  }
-
-  buf = (struct netbuf *)memp_malloc(MEMP_NETBUF);
-  if (buf == NULL) {
-    pbuf_free(p);
-    return;
-  } else {
-    buf->p = p;
-    buf->ptr = p;
-    ip_addr_set(&buf->addr, addr);
-    buf->port = port;
-#if LWIP_NETBUF_RECVINFO
-    {
-      /* get the UDP header - always in the first pbuf, ensured by udp_input */
-      const struct udp_hdr* udphdr = (const struct udp_hdr*)ip_next_header_ptr();
-#if LWIP_CHECKSUM_ON_COPY
-      buf->flags = NETBUF_FLAG_DESTADDR;
-#endif /* LWIP_CHECKSUM_ON_COPY */
-      ip_addr_set(&buf->toaddr, ip_current_dest_addr());
-      buf->toport_chksum = udphdr->dest;
-    }
-#endif /* LWIP_NETBUF_RECVINFO */
-  }
-
-  len = p->tot_len;
-  if (sys_mbox_trypost(&conn->recvmbox, buf) != ERR_OK) {
-    netbuf_delete(buf);
-    return;
-  } else {
-#if LWIP_SO_RCVBUF
-    SYS_ARCH_INC(conn->recv_avail, len);
-#endif /* LWIP_SO_RCVBUF */
-    /* Register event with callback */
-    API_EVENT(conn, NETCONN_EVT_RCVPLUS, len);
-  }
-}
-#endif /* LWIP_UDP */
-
-#if LWIP_TCP
-/**
- * Receive callback function for TCP netconns.
- * Posts the packet to conn->recvmbox, but doesn't delete it on errors.
- *
- * @see tcp.h (struct tcp_pcb.recv) for parameters and return value
- */
-static err_t
-recv_tcp(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
-{
-  struct netconn *conn;
-  u16_t len;
-
-  LWIP_UNUSED_ARG(pcb);
-  LWIP_ASSERT("recv_tcp must have a pcb argument", pcb != NULL);
-  LWIP_ASSERT("recv_tcp must have an argument", arg != NULL);
-  conn = (struct netconn *)arg;
-
-  if (conn == NULL) {
-    return ERR_VAL;
-  }
-  LWIP_ASSERT("recv_tcp: recv for wrong pcb!", conn->pcb.tcp == pcb);
-
-  if (!sys_mbox_valid(&conn->recvmbox)) {
-    /* recvmbox already deleted */
-    if (p != NULL) {
-      tcp_recved(pcb, p->tot_len);
-      pbuf_free(p);
-    }
-    return ERR_OK;
-  }
-  /* Unlike for UDP or RAW pcbs, don't check for available space
-     using recv_avail since that could break the connection
-     (data is already ACKed) */
-
-  /* don't overwrite fatal errors! */
-  if (err != ERR_OK) {
-    NETCONN_SET_SAFE_ERR(conn, err);
-  }
-
-  if (p != NULL) {
-    len = p->tot_len;
-  } else {
-    len = 0;
-  }
-
-  if (sys_mbox_trypost(&conn->recvmbox, p) != ERR_OK) {
-    /* don't deallocate p: it is presented to us later again from tcp_fasttmr! */
-    return ERR_MEM;
-  } else {
-#if LWIP_SO_RCVBUF
-    SYS_ARCH_INC(conn->recv_avail, len);
-#endif /* LWIP_SO_RCVBUF */
-    /* Register event with callback */
-    API_EVENT(conn, NETCONN_EVT_RCVPLUS, len);
-  }
-
-  return ERR_OK;
-}
-
-/**
- * Poll callback function for TCP netconns.
- * Wakes up an application thread that waits for a connection to close
- * or data to be sent. The application thread then takes the
- * appropriate action to go on.
- *
- * Signals the conn->sem.
- * netconn_close waits for conn->sem if closing failed.
- *
- * @see tcp.h (struct tcp_pcb.poll) for parameters and return value
- */
-static err_t
-poll_tcp(void *arg, struct tcp_pcb *pcb)
-{
-  struct netconn *conn = (struct netconn *)arg;
-
-  LWIP_UNUSED_ARG(pcb);
-  LWIP_ASSERT("conn != NULL", (conn != NULL));
-
-  if (conn->state == NETCONN_WRITE) {
-    lwip_netconn_do_writemore(conn  WRITE_DELAYED);
-  } else if (conn->state == NETCONN_CLOSE) {
-#if !LWIP_SO_SNDTIMEO && !LWIP_SO_LINGER
-    if (conn->current_msg && conn->current_msg->msg.sd.polls_left) {
-      conn->current_msg->msg.sd.polls_left--;
-    }
-#endif /* !LWIP_SO_SNDTIMEO && !LWIP_SO_LINGER */
-    lwip_netconn_do_close_internal(conn  WRITE_DELAYED);
-  }
-  /* @todo: implement connect timeout here? */
-
-  /* Did a nonblocking write fail before? Then check available write-space. */
-  if (conn->flags & NETCONN_FLAG_CHECK_WRITESPACE) {
-    /* If the queued byte- or pbuf-count drops below the configured low-water limit,
-       let select mark this pcb as writable again. */
-    if ((conn->pcb.tcp != NULL) && (tcp_sndbuf(conn->pcb.tcp) > TCP_SNDLOWAT) &&
-      (tcp_sndqueuelen(conn->pcb.tcp) < TCP_SNDQUEUELOWAT)) {
-      conn->flags &= ~NETCONN_FLAG_CHECK_WRITESPACE;
-      API_EVENT(conn, NETCONN_EVT_SENDPLUS, 0);
-    }
-  }
-
-  return ERR_OK;
-}
-
-/**
- * Sent callback function for TCP netconns.
- * Signals the conn->sem and calls API_EVENT.
- * netconn_write waits for conn->sem if send buffer is low.
- *
- * @see tcp.h (struct tcp_pcb.sent) for parameters and return value
- */
-static err_t
-sent_tcp(void *arg, struct tcp_pcb *pcb, u16_t len)
-{
-  struct netconn *conn = (struct netconn *)arg;
-
-  LWIP_UNUSED_ARG(pcb);
-  LWIP_ASSERT("conn != NULL", (conn != NULL));
-
-  if (conn) {
-    if (conn->state == NETCONN_WRITE) {
-      lwip_netconn_do_writemore(conn  WRITE_DELAYED);
-    } else if (conn->state == NETCONN_CLOSE) {
-      lwip_netconn_do_close_internal(conn  WRITE_DELAYED);
-    }
-
-    /* If the queued byte- or pbuf-count drops below the configured low-water limit,
-       let select mark this pcb as writable again. */
-    if ((conn->pcb.tcp != NULL) && (tcp_sndbuf(conn->pcb.tcp) > TCP_SNDLOWAT) &&
-      (tcp_sndqueuelen(conn->pcb.tcp) < TCP_SNDQUEUELOWAT)) {
-      conn->flags &= ~NETCONN_FLAG_CHECK_WRITESPACE;
-      API_EVENT(conn, NETCONN_EVT_SENDPLUS, len);
-    }
-  }
-
-  return ERR_OK;
-}
-
-/**
- * Error callback function for TCP netconns.
- * Signals conn->sem, posts to all conn mboxes and calls API_EVENT.
- * The application thread has then to decide what to do.
- *
- * @see tcp.h (struct tcp_pcb.err) for parameters
- */
-static void
-err_tcp(void *arg, err_t err)
-{
-  struct netconn *conn;
-  enum netconn_state old_state;
-
-  conn = (struct netconn *)arg;
-  LWIP_ASSERT("conn != NULL", (conn != NULL));
-
-  conn->pcb.tcp = NULL;
-
-  /* reset conn->state now before waking up other threads */
-  old_state = conn->state;
-  conn->state = NETCONN_NONE;
-
-  if (old_state == NETCONN_CLOSE) {
-    /* RST during close: let close return success & dealloc the netconn */
-    err = ERR_OK;
-    NETCONN_SET_SAFE_ERR(conn, ERR_OK);
-  } else {
-    /* no check since this is always fatal! */
-    SYS_ARCH_SET(conn->last_err, err);
-  }
-
-  /* @todo: the type of NETCONN_EVT created should depend on 'old_state' */
-
-  /* Notify the user layer about a connection error. Used to signal select. */
-  API_EVENT(conn, NETCONN_EVT_ERROR, 0);
-  /* Try to release selects pending on 'read' or 'write', too.
-     They will get an error if they actually try to read or write. */
-  API_EVENT(conn, NETCONN_EVT_RCVPLUS, 0);
-  API_EVENT(conn, NETCONN_EVT_SENDPLUS, 0);
-
-  /* pass NULL-message to recvmbox to wake up pending recv */
-  if (sys_mbox_valid(&conn->recvmbox)) {
-    /* use trypost to prevent deadlock */
-    sys_mbox_trypost(&conn->recvmbox, NULL);
-  }
-  /* pass NULL-message to acceptmbox to wake up pending accept */
-  if (sys_mbox_valid(&conn->acceptmbox)) {
-    /* use trypost to preven deadlock */
-    sys_mbox_trypost(&conn->acceptmbox, NULL);
-  }
-
-  if ((old_state == NETCONN_WRITE) || (old_state == NETCONN_CLOSE) ||
-      (old_state == NETCONN_CONNECT)) {
-    /* calling lwip_netconn_do_writemore/lwip_netconn_do_close_internal is not necessary
-       since the pcb has already been deleted! */
-    int was_nonblocking_connect = IN_NONBLOCKING_CONNECT(conn);
-    SET_NONBLOCKING_CONNECT(conn, 0);
-
-    if (!was_nonblocking_connect) {
-      sys_sem_t* op_completed_sem;
-      /* set error return code */
-      LWIP_ASSERT("conn->current_msg != NULL", conn->current_msg != NULL);
-      conn->current_msg->err = err;
-      op_completed_sem = LWIP_API_MSG_SEM(conn->current_msg);
-      LWIP_ASSERT("inavlid op_completed_sem", sys_sem_valid(op_completed_sem));
-      conn->current_msg = NULL;
-      /* wake up the waiting task */
-      NETCONN_SET_SAFE_ERR(conn, err);
-      sys_sem_signal(op_completed_sem);
-    }
-  } else {
-    LWIP_ASSERT("conn->current_msg == NULL", conn->current_msg == NULL);
-  }
-}
-
-/**
- * Setup a tcp_pcb with the correct callback function pointers
- * and their arguments.
- *
- * @param conn the TCP netconn to setup
- */
-static void
-setup_tcp(struct netconn *conn)
-{
-  struct tcp_pcb *pcb;
-
-  pcb = conn->pcb.tcp;
-  tcp_arg(pcb, conn);
-  tcp_recv(pcb, recv_tcp);
-  tcp_sent(pcb, sent_tcp);
-  tcp_poll(pcb, poll_tcp, NETCONN_TCP_POLL_INTERVAL);
-  tcp_err(pcb, err_tcp);
-}
-
-/**
- * Accept callback function for TCP netconns.
- * Allocates a new netconn and posts that to conn->acceptmbox.
- *
- * @see tcp.h (struct tcp_pcb_listen.accept) for parameters and return value
- */
-static err_t
-accept_function(void *arg, struct tcp_pcb *newpcb, err_t err)
-{
-  struct netconn *newconn;
-  struct netconn *conn = (struct netconn *)arg;
-
-  if (conn == NULL) {
-    return ERR_VAL;
-  }
-  if (!sys_mbox_valid(&conn->acceptmbox)) {
-    LWIP_DEBUGF(API_MSG_DEBUG, ("accept_function: acceptmbox already deleted\n"));
-    return ERR_VAL;
-  }
-
-  if (newpcb == NULL) {
-    /* out-of-pcbs during connect: pass on this error to the application */
-    if (sys_mbox_trypost(&conn->acceptmbox, &netconn_aborted) == ERR_OK) {
-      /* Register event with callback */
-      API_EVENT(conn, NETCONN_EVT_RCVPLUS, 0);
-    }
-    return ERR_VAL;
-  }
-
-  LWIP_DEBUGF(API_MSG_DEBUG, ("accept_function: newpcb->tate: %s\n", tcp_debug_state_str(newpcb->state)));
-
-  /* We have to set the callback here even though
-   * the new socket is unknown. newconn->socket is marked as -1. */
-  newconn = netconn_alloc(conn->type, conn->callback);
-  if (newconn == NULL) {
-    /* outof netconns: pass on this error to the application */
-    if (sys_mbox_trypost(&conn->acceptmbox, &netconn_aborted) == ERR_OK) {
-      /* Register event with callback */
-      API_EVENT(conn, NETCONN_EVT_RCVPLUS, 0);
-    }
-    return ERR_MEM;
-  }
-  newconn->pcb.tcp = newpcb;
-  setup_tcp(newconn);
-  /* no protection: when creating the pcb, the netconn is not yet known
-     to the application thread */
-  newconn->last_err = err;
-
-  /* handle backlog counter */
-  tcp_backlog_delayed(newpcb);
-
-  if (sys_mbox_trypost(&conn->acceptmbox, newconn) != ERR_OK) {
-    /* When returning != ERR_OK, the pcb is aborted in tcp_process(),
-       so do nothing here! */
-    /* remove all references to this netconn from the pcb */
-    struct tcp_pcb* pcb = newconn->pcb.tcp;
-    tcp_arg(pcb, NULL);
-    tcp_recv(pcb, NULL);
-    tcp_sent(pcb, NULL);
-    tcp_poll(pcb, NULL, 0);
-    tcp_err(pcb, NULL);
-    /* remove reference from to the pcb from this netconn */
-    newconn->pcb.tcp = NULL;
-    /* no need to drain since we know the recvmbox is empty. */
-    sys_mbox_free(&newconn->recvmbox);
-    sys_mbox_set_invalid(&newconn->recvmbox);
-    netconn_free(newconn);
-    return ERR_MEM;
-  } else {
-    /* Register event with callback */
-    API_EVENT(conn, NETCONN_EVT_RCVPLUS, 0);
-  }
-
-  return ERR_OK;
-}
-#endif /* LWIP_TCP */
-
-/**
- * Create a new pcb of a specific type.
- * Called from lwip_netconn_do_newconn().
- *
- * @param msg the api_msg_msg describing the connection type
- */
-static void
-pcb_new(struct api_msg *msg)
-{
-  enum lwip_ip_addr_type iptype = IPADDR_TYPE_V4;
-
-  LWIP_ASSERT("pcb_new: pcb already allocated", msg->conn->pcb.tcp == NULL);
- 
-#if LWIP_IPV6 && LWIP_IPV4
-  /* IPv6: Dual-stack by default, unless netconn_set_ipv6only() is called */
-  if(NETCONNTYPE_ISIPV6(netconn_type(msg->conn))) {
-    iptype = IPADDR_TYPE_ANY;
-  }
-#endif
-  
-  /* Allocate a PCB for this connection */
-  switch(NETCONNTYPE_GROUP(msg->conn->type)) {
-#if LWIP_RAW
-  case NETCONN_RAW:
-    msg->conn->pcb.raw = raw_new_ip_type(iptype, msg->msg.n.proto);
-    if (msg->conn->pcb.raw != NULL) {
-#if LWIP_IPV6
-      /* ICMPv6 packets should always have checksum calculated by the stack as per RFC 3542 chapter 3.1 */
-      if (NETCONNTYPE_ISIPV6(msg->conn->type) && msg->conn->pcb.raw->protocol == IP6_NEXTH_ICMP6) {
-        msg->conn->pcb.raw->chksum_reqd = 1;
-        msg->conn->pcb.raw->chksum_offset = 2;
-      }
-#endif /* LWIP_IPV6 */
-      raw_recv(msg->conn->pcb.raw, recv_raw, msg->conn);
-    }
-    break;
-#endif /* LWIP_RAW */
-#if LWIP_UDP
-  case NETCONN_UDP:
-    msg->conn->pcb.udp = udp_new_ip_type(iptype);
-    if (msg->conn->pcb.udp != NULL) {
-#if LWIP_UDPLITE
-      if (NETCONNTYPE_ISUDPLITE(msg->conn->type)) {
-        udp_setflags(msg->conn->pcb.udp, UDP_FLAGS_UDPLITE);
-      }
-#endif /* LWIP_UDPLITE */
-      if (NETCONNTYPE_ISUDPNOCHKSUM(msg->conn->type)) {
-        udp_setflags(msg->conn->pcb.udp, UDP_FLAGS_NOCHKSUM);
-      }
-      udp_recv(msg->conn->pcb.udp, recv_udp, msg->conn);
-    }
-    break;
-#endif /* LWIP_UDP */
-#if LWIP_TCP
-  case NETCONN_TCP:
-    msg->conn->pcb.tcp = tcp_new_ip_type(iptype);
-    if (msg->conn->pcb.tcp != NULL) {
-      setup_tcp(msg->conn);
-    }
-    break;
-#endif /* LWIP_TCP */
-  default:
-    /* Unsupported netconn type, e.g. protocol disabled */
-    msg->err = ERR_VAL;
-    return;
-  }
-  if (msg->conn->pcb.ip == NULL) {
-    msg->err = ERR_MEM;
-  }
-}
-
-/**
- * Create a new pcb of a specific type inside a netconn.
- * Called from netconn_new_with_proto_and_callback.
- *
- * @param m the api_msg_msg describing the connection type
- */
-void
-lwip_netconn_do_newconn(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  msg->err = ERR_OK;
-  if (msg->conn->pcb.tcp == NULL) {
-    pcb_new(msg);
-  }
-  /* Else? This "new" connection already has a PCB allocated. */
-  /* Is this an error condition? Should it be deleted? */
-  /* We currently just are happy and return. */
-
-  TCPIP_APIMSG_ACK(msg);
-}
-
-/**
- * Create a new netconn (of a specific type) that has a callback function.
- * The corresponding pcb is NOT created!
- *
- * @param t the type of 'connection' to create (@see enum netconn_type)
- * @param callback a function to call on status changes (RX available, TX'ed)
- * @return a newly allocated struct netconn or
- *         NULL on memory error
- */
-struct netconn*
-netconn_alloc(enum netconn_type t, netconn_callback callback)
-{
-  struct netconn *conn;
-  int size;
-
-  conn = (struct netconn *)memp_malloc(MEMP_NETCONN);
-  if (conn == NULL) {
-    return NULL;
-  }
-
-  conn->last_err = ERR_OK;
-  conn->type = t;
-  conn->pcb.tcp = NULL;
-
-  /* If all sizes are the same, every compiler should optimize this switch to nothing */
-  switch(NETCONNTYPE_GROUP(t)) {
-#if LWIP_RAW
-  case NETCONN_RAW:
-    size = DEFAULT_RAW_RECVMBOX_SIZE;
-    break;
-#endif /* LWIP_RAW */
-#if LWIP_UDP
-  case NETCONN_UDP:
-    size = DEFAULT_UDP_RECVMBOX_SIZE;
-    break;
-#endif /* LWIP_UDP */
-#if LWIP_TCP
-  case NETCONN_TCP:
-    size = DEFAULT_TCP_RECVMBOX_SIZE;
-    break;
-#endif /* LWIP_TCP */
-  default:
-    LWIP_ASSERT("netconn_alloc: undefined netconn_type", 0);
-    goto free_and_return;
-  }
-
-  if (sys_mbox_new(&conn->recvmbox, size) != ERR_OK) {
-    goto free_and_return;
-  }
-#if !LWIP_NETCONN_SEM_PER_THREAD
-  if (sys_sem_new(&conn->op_completed, 0) != ERR_OK) {
-    sys_mbox_free(&conn->recvmbox);
-    goto free_and_return;
-  }
-#endif
-
-#if LWIP_TCP
-  sys_mbox_set_invalid(&conn->acceptmbox);
-#endif
-  conn->state        = NETCONN_NONE;
-#if LWIP_SOCKET
-  /* initialize socket to -1 since 0 is a valid socket */
-  conn->socket       = -1;
-#endif /* LWIP_SOCKET */
-  conn->callback     = callback;
-#if LWIP_TCP
-  conn->current_msg  = NULL;
-  conn->write_offset = 0;
-#endif /* LWIP_TCP */
-#if LWIP_SO_SNDTIMEO
-  conn->send_timeout = 0;
-#endif /* LWIP_SO_SNDTIMEO */
-#if LWIP_SO_RCVTIMEO
-  conn->recv_timeout = 0;
-#endif /* LWIP_SO_RCVTIMEO */
-#if LWIP_SO_RCVBUF
-  conn->recv_bufsize = RECV_BUFSIZE_DEFAULT;
-  conn->recv_avail   = 0;
-#endif /* LWIP_SO_RCVBUF */
-#if LWIP_SO_LINGER
-  conn->linger = -1;
-#endif /* LWIP_SO_LINGER */
-  conn->flags = 0;
-  return conn;
-free_and_return:
-  memp_free(MEMP_NETCONN, conn);
-  return NULL;
-}
-
-/**
- * Delete a netconn and all its resources.
- * The pcb is NOT freed (since we might not be in the right thread context do this).
- *
- * @param conn the netconn to free
- */
-void
-netconn_free(struct netconn *conn)
-{
-  LWIP_ASSERT("PCB must be deallocated outside this function", conn->pcb.tcp == NULL);
-  LWIP_ASSERT("recvmbox must be deallocated before calling this function",
-    !sys_mbox_valid(&conn->recvmbox));
-#if LWIP_TCP
-  LWIP_ASSERT("acceptmbox must be deallocated before calling this function",
-    !sys_mbox_valid(&conn->acceptmbox));
-#endif /* LWIP_TCP */
-
-#if !LWIP_NETCONN_SEM_PER_THREAD
-  sys_sem_free(&conn->op_completed);
-  sys_sem_set_invalid(&conn->op_completed);
-#endif
-
-  memp_free(MEMP_NETCONN, conn);
-}
-
-/**
- * Delete rcvmbox and acceptmbox of a netconn and free the left-over data in
- * these mboxes
- *
- * @param conn the netconn to free
- * @bytes_drained bytes drained from recvmbox
- * @accepts_drained pending connections drained from acceptmbox
- */
-static void
-netconn_drain(struct netconn *conn)
-{
-  void *mem;
-#if LWIP_TCP
-  struct pbuf *p;
-#endif /* LWIP_TCP */
-
-  /* This runs in tcpip_thread, so we don't need to lock against rx packets */
-
-  /* Delete and drain the recvmbox. */
-  if (sys_mbox_valid(&conn->recvmbox)) {
-    while (sys_mbox_tryfetch(&conn->recvmbox, &mem) != SYS_MBOX_EMPTY) {
-#if LWIP_TCP
-      if (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP) {
-        if (mem != NULL) {
-          p = (struct pbuf*)mem;
-          /* pcb might be set to NULL already by err_tcp() */
-          if (conn->pcb.tcp != NULL) {
-            tcp_recved(conn->pcb.tcp, p->tot_len);
-          }
-          pbuf_free(p);
-        }
-      } else
-#endif /* LWIP_TCP */
-      {
-        netbuf_delete((struct netbuf *)mem);
-      }
-    }
-    sys_mbox_free(&conn->recvmbox);
-    sys_mbox_set_invalid(&conn->recvmbox);
-  }
-
-  /* Delete and drain the acceptmbox. */
-#if LWIP_TCP
-  if (sys_mbox_valid(&conn->acceptmbox)) {
-    while (sys_mbox_tryfetch(&conn->acceptmbox, &mem) != SYS_MBOX_EMPTY) {
-      if (mem != &netconn_aborted) {
-        struct netconn *newconn = (struct netconn *)mem;
-        /* Only tcp pcbs have an acceptmbox, so no need to check conn->type */
-        /* pcb might be set to NULL already by err_tcp() */
-        /* drain recvmbox */
-        netconn_drain(newconn);
-        if (newconn->pcb.tcp != NULL) {
-          tcp_abort(newconn->pcb.tcp);
-          newconn->pcb.tcp = NULL;
-        }
-        netconn_free(newconn);
-      }
-    }
-    sys_mbox_free(&conn->acceptmbox);
-    sys_mbox_set_invalid(&conn->acceptmbox);
-  }
-#endif /* LWIP_TCP */
-}
-
-#if LWIP_TCP
-/**
- * Internal helper function to close a TCP netconn: since this sometimes
- * doesn't work at the first attempt, this function is called from multiple
- * places.
- *
- * @param conn the TCP netconn to close
- */
-static err_t
-lwip_netconn_do_close_internal(struct netconn *conn  WRITE_DELAYED_PARAM)
-{
-  err_t err;
-  u8_t shut, shut_rx, shut_tx, close;
-  u8_t close_finished = 0;
-  struct tcp_pcb* tpcb;
-#if LWIP_SO_LINGER
-  u8_t linger_wait_required = 0;
-#endif /* LWIP_SO_LINGER */
-
-  LWIP_ASSERT("invalid conn", (conn != NULL));
-  LWIP_ASSERT("this is for tcp netconns only", (NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP));
-  LWIP_ASSERT("conn must be in state NETCONN_CLOSE", (conn->state == NETCONN_CLOSE));
-  LWIP_ASSERT("pcb already closed", (conn->pcb.tcp != NULL));
-  LWIP_ASSERT("conn->current_msg != NULL", conn->current_msg != NULL);
-
-  tpcb = conn->pcb.tcp;
-  shut = conn->current_msg->msg.sd.shut;
-  shut_rx = shut & NETCONN_SHUT_RD;
-  shut_tx = shut & NETCONN_SHUT_WR;
-  /* shutting down both ends is the same as closing
-     (also if RD or WR side was shut down before already) */
-  if (shut == NETCONN_SHUT_RDWR) {
-    close = 1;
-  } else if (shut_rx &&
-             ((tpcb->state == FIN_WAIT_1) ||
-              (tpcb->state == FIN_WAIT_2) ||
-              (tpcb->state == CLOSING))) {
-    close = 1;
-  } else if (shut_tx && ((tpcb->flags & TF_RXCLOSED) != 0)) {
-    close = 1;
-  } else {
-    close = 0;
-  }
-
-  /* Set back some callback pointers */
-  if (close) {
-    tcp_arg(tpcb, NULL);
-  }
-  if (tpcb->state == LISTEN) {
-    tcp_accept(tpcb, NULL);
-  } else {
-    /* some callbacks have to be reset if tcp_close is not successful */
-    if (shut_rx) {
-      tcp_recv(tpcb, NULL);
-      tcp_accept(tpcb, NULL);
-    }
-    if (shut_tx) {
-      tcp_sent(tpcb, NULL);
-    }
-    if (close) {
-      tcp_poll(tpcb, NULL, 0);
-      tcp_err(tpcb, NULL);
-    }
-  }
-  /* Try to close the connection */
-  if (close) {
-#if LWIP_SO_LINGER
-    /* check linger possibilites before calling tcp_close */
-    err = ERR_OK;
-    /* linger enabled/required at all? (i.e. is there untransmitted data left?) */
-    if ((conn->linger >= 0) && (conn->pcb.tcp->unsent || conn->pcb.tcp->unacked)) {
-      if ((conn->linger == 0)) {
-        /* data left but linger prevents waiting */
-        tcp_abort(tpcb);
-        tpcb = NULL;
-      } else if (conn->linger > 0) {
-        /* data left and linger says we should wait */
-        if (netconn_is_nonblocking(conn)) {
-          /* data left on a nonblocking netconn -> cannot linger */
-          err = ERR_WOULDBLOCK;
-        } else if ((s32_t)(sys_now() - conn->current_msg->msg.sd.time_started) >=
-          (conn->linger * 1000)) {
-          /* data left but linger timeout has expired (this happens on further
-             calls to this function through poll_tcp */
-          tcp_abort(tpcb);
-          tpcb = NULL;
-        } else {
-          /* data left -> need to wait for ACK after successful close */
-          linger_wait_required = 1;
-        }
-      }
-    }
-    if ((err == ERR_OK) && (tpcb != NULL))
-#endif /* LWIP_SO_LINGER */
-    {
-      err = tcp_close(tpcb);
-    }
-  } else {
-    err = tcp_shutdown(tpcb, shut_rx, shut_tx);
-  }
-  if (err == ERR_OK) {
-    close_finished = 1;
-#if LWIP_SO_LINGER
-    if (linger_wait_required) {
-      /* wait for ACK of all unsent/unacked data by just getting called again */
-      close_finished = 0;
-      err = ERR_INPROGRESS;
-    }
-#endif /* LWIP_SO_LINGER */
-  } else {
-    if (err == ERR_MEM) {
-      /* Closing failed because of memory shortage, try again later. Even for
-         nonblocking netconns, we have to wait since no standard socket application
-         is prepared for close failing because of resource shortage.
-         Check the timeout: this is kind of an lwip addition to the standard sockets:
-         we wait for some time when failing to allocate a segment for the FIN */
-#if LWIP_SO_SNDTIMEO || LWIP_SO_LINGER
-      s32_t close_timeout = LWIP_TCP_CLOSE_TIMEOUT_MS_DEFAULT;
-#if LWIP_SO_SNDTIMEO
-      if (conn->send_timeout > 0) {
-        close_timeout = conn->send_timeout;
-      }
-#endif /* LWIP_SO_SNDTIMEO */
-#if LWIP_SO_LINGER
-      if (conn->linger >= 0) {
-        /* use linger timeout (seconds) */
-        close_timeout = conn->linger * 1000U;
-      }
-#endif
-      if ((s32_t)(sys_now() - conn->current_msg->msg.sd.time_started) >= close_timeout) {
-#else /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
-      if (conn->current_msg->msg.sd.polls_left == 0) {
-#endif /* LWIP_SO_SNDTIMEO || LWIP_SO_LINGER */
-        close_finished = 1;
-        if (close) {
-          /* in this case, we want to RST the connection */
-          tcp_abort(tpcb);
-          err = ERR_OK;
-        }
-      }
-    } else {
-      /* Closing failed for a non-memory error: give up */
-      close_finished = 1;
-    }
-  }
-  if (close_finished) {
-    /* Closing done (succeeded, non-memory error, nonblocking error or timeout) */
-    sys_sem_t* op_completed_sem = LWIP_API_MSG_SEM(conn->current_msg);
-    conn->current_msg->err = err;
-    conn->current_msg = NULL;
-    conn->state = NETCONN_NONE;
-    if (err == ERR_OK) {
-      if (close) {
-        /* Set back some callback pointers as conn is going away */
-        conn->pcb.tcp = NULL;
-        /* Trigger select() in socket layer. Make sure everybody notices activity
-         on the connection, error first! */
-        API_EVENT(conn, NETCONN_EVT_ERROR, 0);
-      }
-      if (shut_rx) {
-        API_EVENT(conn, NETCONN_EVT_RCVPLUS, 0);
-      }
-      if (shut_tx) {
-        API_EVENT(conn, NETCONN_EVT_SENDPLUS, 0);
-      }
-    }
-    NETCONN_SET_SAFE_ERR(conn, err);
-#if LWIP_TCPIP_CORE_LOCKING
-    if (delayed)
-#endif
-    {
-      /* wake up the application task */
-      sys_sem_signal(op_completed_sem);
-    }
-    return ERR_OK;
-  }
-  if (!close_finished) {
-    /* Closing failed and we want to wait: restore some of the callbacks */
-    /* Closing of listen pcb will never fail! */
-    LWIP_ASSERT("Closing a listen pcb may not fail!", (tpcb->state != LISTEN));
-    if (shut_tx) {
-      tcp_sent(tpcb, sent_tcp);
-    }
-    /* when waiting for close, set up poll interval to 500ms */
-    tcp_poll(tpcb, poll_tcp, 1);
-    tcp_err(tpcb, err_tcp);
-    tcp_arg(tpcb, conn);
-    /* don't restore recv callback: we don't want to receive any more data */
-  }
-  /* If closing didn't succeed, we get called again either
-     from poll_tcp or from sent_tcp */
-  LWIP_ASSERT("err != ERR_OK", err != ERR_OK);
-  return err;
-}
-#endif /* LWIP_TCP */
-
-/**
- * Delete the pcb inside a netconn.
- * Called from netconn_delete.
- *
- * @param m the api_msg_msg pointing to the connection
- */
-void
-lwip_netconn_do_delconn(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  enum netconn_state state = msg->conn->state;
-  LWIP_ASSERT("netconn state error", /* this only happens for TCP netconns */
-    (state == NETCONN_NONE) || (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_TCP));
-#if LWIP_NETCONN_FULLDUPLEX
-  /* In full duplex mode, blocking write/connect is aborted with ERR_CLSD */
-  if (state != NETCONN_NONE) {
-    if ((state == NETCONN_WRITE) ||
-        ((state == NETCONN_CONNECT) && !IN_NONBLOCKING_CONNECT(msg->conn))) {
-      /* close requested, abort running write/connect */
-      sys_sem_t* op_completed_sem;
-      LWIP_ASSERT("msg->conn->current_msg != NULL", msg->conn->current_msg != NULL);
-      op_completed_sem = LWIP_API_MSG_SEM(msg->conn->current_msg);
-      msg->conn->current_msg->err = ERR_CLSD;
-      msg->conn->current_msg = NULL;
-      msg->conn->write_offset = 0;
-      msg->conn->state = NETCONN_NONE;
-      NETCONN_SET_SAFE_ERR(msg->conn, ERR_CLSD);
-      sys_sem_signal(op_completed_sem);
-    }
-  }
-#else /* LWIP_NETCONN_FULLDUPLEX */
-  if (((state != NETCONN_NONE) &&
-       (state != NETCONN_LISTEN) &&
-       (state != NETCONN_CONNECT)) ||
-      ((state == NETCONN_CONNECT) && !IN_NONBLOCKING_CONNECT(msg->conn))) {
-    /* This means either a blocking write or blocking connect is running
-       (nonblocking write returns and sets state to NONE) */
-    msg->err = ERR_INPROGRESS;
-  } else
-#endif /* LWIP_NETCONN_FULLDUPLEX */
-  {
-    LWIP_ASSERT("blocking connect in progress",
-      (state != NETCONN_CONNECT) || IN_NONBLOCKING_CONNECT(msg->conn));
-    msg->err = ERR_OK;
-    /* Drain and delete mboxes */
-    netconn_drain(msg->conn);
-
-    if (msg->conn->pcb.tcp != NULL) {
-
-      switch (NETCONNTYPE_GROUP(msg->conn->type)) {
-#if LWIP_RAW
-      case NETCONN_RAW:
-        raw_remove(msg->conn->pcb.raw);
-        break;
-#endif /* LWIP_RAW */
-#if LWIP_UDP
-      case NETCONN_UDP:
-        msg->conn->pcb.udp->recv_arg = NULL;
-        udp_remove(msg->conn->pcb.udp);
-        break;
-#endif /* LWIP_UDP */
-#if LWIP_TCP
-      case NETCONN_TCP:
-        LWIP_ASSERT("already writing or closing", msg->conn->current_msg == NULL &&
-          msg->conn->write_offset == 0);
-        msg->conn->state = NETCONN_CLOSE;
-        msg->msg.sd.shut = NETCONN_SHUT_RDWR;
-        msg->conn->current_msg = msg;
-#if LWIP_TCPIP_CORE_LOCKING
-        if (lwip_netconn_do_close_internal(msg->conn, 0) != ERR_OK) {
-          LWIP_ASSERT("state!", msg->conn->state == NETCONN_CLOSE);
-          UNLOCK_TCPIP_CORE();
-          sys_arch_sem_wait(LWIP_API_MSG_SEM(msg), 0);
-          LOCK_TCPIP_CORE();
-          LWIP_ASSERT("state!", msg->conn->state == NETCONN_NONE);
-        }
-#else /* LWIP_TCPIP_CORE_LOCKING */
-        lwip_netconn_do_close_internal(msg->conn);
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-        /* API_EVENT is called inside lwip_netconn_do_close_internal, before releasing
-           the application thread, so we can return at this point! */
-        return;
-#endif /* LWIP_TCP */
-      default:
-        break;
-      }
-      msg->conn->pcb.tcp = NULL;
-    }
-    /* tcp netconns don't come here! */
-
-    /* @todo: this lets select make the socket readable and writable,
-       which is wrong! errfd instead? */
-    API_EVENT(msg->conn, NETCONN_EVT_RCVPLUS, 0);
-    API_EVENT(msg->conn, NETCONN_EVT_SENDPLUS, 0);
-  }
-  if (sys_sem_valid(LWIP_API_MSG_SEM(msg))) {
-    TCPIP_APIMSG_ACK(msg);
-  }
-}
-
-/**
- * Bind a pcb contained in a netconn
- * Called from netconn_bind.
- *
- * @param m the api_msg_msg pointing to the connection and containing
- *          the IP address and port to bind to
- */
-void
-lwip_netconn_do_bind(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  if (ERR_IS_FATAL(msg->conn->last_err)) {
-    msg->err = msg->conn->last_err;
-  } else {
-    msg->err = ERR_VAL;
-    if (msg->conn->pcb.tcp != NULL) {
-      switch (NETCONNTYPE_GROUP(msg->conn->type)) {
-#if LWIP_RAW
-      case NETCONN_RAW:
-        msg->err = raw_bind(msg->conn->pcb.raw, API_EXPR_REF(msg->msg.bc.ipaddr));
-        break;
-#endif /* LWIP_RAW */
-#if LWIP_UDP
-      case NETCONN_UDP:
-        msg->err = udp_bind(msg->conn->pcb.udp, API_EXPR_REF(msg->msg.bc.ipaddr), msg->msg.bc.port);
-        break;
-#endif /* LWIP_UDP */
-#if LWIP_TCP
-      case NETCONN_TCP:
-        msg->err = tcp_bind(msg->conn->pcb.tcp, API_EXPR_REF(msg->msg.bc.ipaddr), msg->msg.bc.port);
-        break;
-#endif /* LWIP_TCP */
-      default:
-        break;
-      }
-    }
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-
-#if LWIP_TCP
-/**
- * TCP callback function if a connection (opened by tcp_connect/lwip_netconn_do_connect) has
- * been established (or reset by the remote host).
- *
- * @see tcp.h (struct tcp_pcb.connected) for parameters and return values
- */
-static err_t
-lwip_netconn_do_connected(void *arg, struct tcp_pcb *pcb, err_t err)
-{
-  struct netconn *conn;
-  int was_blocking;
-  sys_sem_t* op_completed_sem = NULL;
-
-  LWIP_UNUSED_ARG(pcb);
-
-  conn = (struct netconn *)arg;
-
-  if (conn == NULL) {
-    return ERR_VAL;
-  }
-
-  LWIP_ASSERT("conn->state == NETCONN_CONNECT", conn->state == NETCONN_CONNECT);
-  LWIP_ASSERT("(conn->current_msg != NULL) || conn->in_non_blocking_connect",
-    (conn->current_msg != NULL) || IN_NONBLOCKING_CONNECT(conn));
-
-  if (conn->current_msg != NULL) {
-    conn->current_msg->err = err;
-    op_completed_sem = LWIP_API_MSG_SEM(conn->current_msg);
-  }
-  if ((NETCONNTYPE_GROUP(conn->type) == NETCONN_TCP) && (err == ERR_OK)) {
-    setup_tcp(conn);
-  }
-  was_blocking = !IN_NONBLOCKING_CONNECT(conn);
-  SET_NONBLOCKING_CONNECT(conn, 0);
-  LWIP_ASSERT("blocking connect state error",
-    (was_blocking && op_completed_sem != NULL) ||
-    (!was_blocking && op_completed_sem == NULL));
-  conn->current_msg = NULL;
-  conn->state = NETCONN_NONE;
-  NETCONN_SET_SAFE_ERR(conn, ERR_OK);
-  API_EVENT(conn, NETCONN_EVT_SENDPLUS, 0);
-
-  if (was_blocking) {
-    sys_sem_signal(op_completed_sem);
-  }
-  return ERR_OK;
-}
-#endif /* LWIP_TCP */
-
-/**
- * Connect a pcb contained inside a netconn
- * Called from netconn_connect.
- *
- * @param m the api_msg_msg pointing to the connection and containing
- *          the IP address and port to connect to
- */
-void
-lwip_netconn_do_connect(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  if (msg->conn->pcb.tcp == NULL) {
-    /* This may happen when calling netconn_connect() a second time */
-    msg->err = ERR_CLSD;
-  } else {
-    switch (NETCONNTYPE_GROUP(msg->conn->type)) {
-#if LWIP_RAW
-    case NETCONN_RAW:
-      msg->err = raw_connect(msg->conn->pcb.raw, API_EXPR_REF(msg->msg.bc.ipaddr));
-      break;
-#endif /* LWIP_RAW */
-#if LWIP_UDP
-    case NETCONN_UDP:
-      msg->err = udp_connect(msg->conn->pcb.udp, API_EXPR_REF(msg->msg.bc.ipaddr), msg->msg.bc.port);
-      break;
-#endif /* LWIP_UDP */
-#if LWIP_TCP
-    case NETCONN_TCP:
-      /* Prevent connect while doing any other action. */
-      if (msg->conn->state == NETCONN_CONNECT) {
-        msg->err = ERR_ALREADY;
-      } else if (msg->conn->state != NETCONN_NONE) {
-        msg->err = ERR_ISCONN;
-      } else {
-        setup_tcp(msg->conn);
-        msg->err = tcp_connect(msg->conn->pcb.tcp, API_EXPR_REF(msg->msg.bc.ipaddr),
-          msg->msg.bc.port, lwip_netconn_do_connected);
-        if (msg->err == ERR_OK) {
-          u8_t non_blocking = netconn_is_nonblocking(msg->conn);
-          msg->conn->state = NETCONN_CONNECT;
-          SET_NONBLOCKING_CONNECT(msg->conn, non_blocking);
-          if (non_blocking) {
-            msg->err = ERR_INPROGRESS;
-          } else {
-            msg->conn->current_msg = msg;
-            /* sys_sem_signal() is called from lwip_netconn_do_connected (or err_tcp()),
-               when the connection is established! */
-#if LWIP_TCPIP_CORE_LOCKING
-            LWIP_ASSERT("state!", msg->conn->state == NETCONN_CONNECT);
-            UNLOCK_TCPIP_CORE();
-            sys_arch_sem_wait(LWIP_API_MSG_SEM(msg), 0);
-            LOCK_TCPIP_CORE();
-            LWIP_ASSERT("state!", msg->conn->state != NETCONN_CONNECT);
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-            return;
-          }
-        }
-      }
-      break;
-#endif /* LWIP_TCP */
-    default:
-      LWIP_ERROR("Invalid netconn type", 0, do{ msg->err = ERR_VAL; }while(0));
-      break;
-    }
-  }
-  /* For all other protocols, netconn_connect() calls TCPIP_APIMSG(),
-     so use TCPIP_APIMSG_ACK() here. */
-  TCPIP_APIMSG_ACK(msg);
-}
-
-/**
- * Disconnect a pcb contained inside a netconn
- * Only used for UDP netconns.
- * Called from netconn_disconnect.
- *
- * @param m the api_msg_msg pointing to the connection to disconnect
- */
-void
-lwip_netconn_do_disconnect(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-#if LWIP_UDP
-  if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) {
-    udp_disconnect(msg->conn->pcb.udp);
-    msg->err = ERR_OK;
-  } else
-#endif /* LWIP_UDP */
-  {
-    msg->err = ERR_VAL;
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-
-#if LWIP_TCP
-/**
- * Set a TCP pcb contained in a netconn into listen mode
- * Called from netconn_listen.
- *
- * @param m the api_msg_msg pointing to the connection
- */
-void
-lwip_netconn_do_listen(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  if (ERR_IS_FATAL(msg->conn->last_err)) {
-    msg->err = msg->conn->last_err;
-  } else {
-    msg->err = ERR_CONN;
-    if (msg->conn->pcb.tcp != NULL) {
-      if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_TCP) {
-        if (msg->conn->state == NETCONN_NONE) {
-          struct tcp_pcb* lpcb;
-          if (msg->conn->pcb.tcp->state != CLOSED) {
-            /* connection is not closed, cannot listen */
-            msg->err = ERR_VAL;
-          } else {
-            err_t err;
-            u8_t backlog;
-#if TCP_LISTEN_BACKLOG
-            backlog = msg->msg.lb.backlog;
-#else  /* TCP_LISTEN_BACKLOG */
-            backlog = TCP_DEFAULT_LISTEN_BACKLOG;
-#endif /* TCP_LISTEN_BACKLOG */
-#if LWIP_IPV4 && LWIP_IPV6
-            /* "Socket API like" dual-stack support: If IP to listen to is IP6_ADDR_ANY,
-             * and NETCONN_FLAG_IPV6_V6ONLY is NOT set, use IP_ANY_TYPE to listen
-             */
-            if (ip_addr_cmp(&msg->conn->pcb.ip->local_ip, IP6_ADDR_ANY) &&
-                (netconn_get_ipv6only(msg->conn) == 0)) {
-              /* change PCB type to IPADDR_TYPE_ANY */
-              IP_SET_TYPE_VAL(msg->conn->pcb.tcp->local_ip,  IPADDR_TYPE_ANY);
-              IP_SET_TYPE_VAL(msg->conn->pcb.tcp->remote_ip, IPADDR_TYPE_ANY);
-            }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-            lpcb = tcp_listen_with_backlog_and_err(msg->conn->pcb.tcp, backlog, &err);
-
-            if (lpcb == NULL) {
-              /* in this case, the old pcb is still allocated */
-              msg->err = err;
-            } else {
-              /* delete the recvmbox and allocate the acceptmbox */
-              if (sys_mbox_valid(&msg->conn->recvmbox)) {
-                /** @todo: should we drain the recvmbox here? */
-                sys_mbox_free(&msg->conn->recvmbox);
-                sys_mbox_set_invalid(&msg->conn->recvmbox);
-              }
-              msg->err = ERR_OK;
-              if (!sys_mbox_valid(&msg->conn->acceptmbox)) {
-                msg->err = sys_mbox_new(&msg->conn->acceptmbox, DEFAULT_ACCEPTMBOX_SIZE);
-              }
-              if (msg->err == ERR_OK) {
-                msg->conn->state = NETCONN_LISTEN;
-                msg->conn->pcb.tcp = lpcb;
-                tcp_arg(msg->conn->pcb.tcp, msg->conn);
-                tcp_accept(msg->conn->pcb.tcp, accept_function);
-              } else {
-                /* since the old pcb is already deallocated, free lpcb now */
-                tcp_close(lpcb);
-                msg->conn->pcb.tcp = NULL;
-              }
-            }
-          }
-        } else if (msg->conn->state == NETCONN_LISTEN) {
-          /* already listening, allow updating of the backlog */
-          msg->err = ERR_OK;
-          tcp_backlog_set(msg->conn->pcb.tcp, msg->msg.lb.backlog);
-        }
-      } else {
-        msg->err = ERR_ARG;
-      }
-    }
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-#endif /* LWIP_TCP */
-
-/**
- * Send some data on a RAW or UDP pcb contained in a netconn
- * Called from netconn_send
- *
- * @param m the api_msg_msg pointing to the connection
- */
-void
-lwip_netconn_do_send(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  if (ERR_IS_FATAL(msg->conn->last_err)) {
-    msg->err = msg->conn->last_err;
-  } else {
-    msg->err = ERR_CONN;
-    if (msg->conn->pcb.tcp != NULL) {
-      switch (NETCONNTYPE_GROUP(msg->conn->type)) {
-#if LWIP_RAW
-      case NETCONN_RAW:
-        if (ip_addr_isany(&msg->msg.b->addr) || IP_IS_ANY_TYPE_VAL(msg->msg.b->addr)) {
-          msg->err = raw_send(msg->conn->pcb.raw, msg->msg.b->p);
-        } else {
-          msg->err = raw_sendto(msg->conn->pcb.raw, msg->msg.b->p, &msg->msg.b->addr);
-        }
-        break;
-#endif
-#if LWIP_UDP
-      case NETCONN_UDP:
-#if LWIP_CHECKSUM_ON_COPY
-        if (ip_addr_isany(&msg->msg.b->addr) || IP_IS_ANY_TYPE_VAL(msg->msg.b->addr)) {
-          msg->err = udp_send_chksum(msg->conn->pcb.udp, msg->msg.b->p,
-            msg->msg.b->flags & NETBUF_FLAG_CHKSUM, msg->msg.b->toport_chksum);
-        } else {
-          msg->err = udp_sendto_chksum(msg->conn->pcb.udp, msg->msg.b->p,
-            &msg->msg.b->addr, msg->msg.b->port,
-            msg->msg.b->flags & NETBUF_FLAG_CHKSUM, msg->msg.b->toport_chksum);
-        }
-#else /* LWIP_CHECKSUM_ON_COPY */
-        if (ip_addr_isany_val(msg->msg.b->addr) || IP_IS_ANY_TYPE_VAL(msg->msg.b->addr)) {
-          msg->err = udp_send(msg->conn->pcb.udp, msg->msg.b->p);
-        } else {
-          msg->err = udp_sendto(msg->conn->pcb.udp, msg->msg.b->p, &msg->msg.b->addr, msg->msg.b->port);
-        }
-#endif /* LWIP_CHECKSUM_ON_COPY */
-        break;
-#endif /* LWIP_UDP */
-      default:
-        break;
-      }
-    }
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-
-#if LWIP_TCP
-/**
- * Indicate data has been received from a TCP pcb contained in a netconn
- * Called from netconn_recv
- *
- * @param m the api_msg_msg pointing to the connection
- */
-void
-lwip_netconn_do_recv(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  msg->err = ERR_OK;
-  if (msg->conn->pcb.tcp != NULL) {
-    if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_TCP) {
-      u32_t remaining = msg->msg.r.len;
-      do {
-        u16_t recved = (remaining > 0xffff) ? 0xffff : (u16_t)remaining;
-        tcp_recved(msg->conn->pcb.tcp, recved);
-        remaining -= recved;
-      } while (remaining != 0);
-    }
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-
-#if TCP_LISTEN_BACKLOG
-/** Indicate that a TCP pcb has been accepted
- * Called from netconn_accept
- *
- * @param m the api_msg_msg pointing to the connection
- */
-void
-lwip_netconn_do_accepted(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  msg->err = ERR_OK;
-  if (msg->conn->pcb.tcp != NULL) {
-    if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_TCP) {
-      tcp_backlog_accepted(msg->conn->pcb.tcp);
-    }
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-#endif /* TCP_LISTEN_BACKLOG */
-
-/**
- * See if more data needs to be written from a previous call to netconn_write.
- * Called initially from lwip_netconn_do_write. If the first call can't send all data
- * (because of low memory or empty send-buffer), this function is called again
- * from sent_tcp() or poll_tcp() to send more data. If all data is sent, the
- * blocking application thread (waiting in netconn_write) is released.
- *
- * @param conn netconn (that is currently in state NETCONN_WRITE) to process
- * @return ERR_OK
- *         ERR_MEM if LWIP_TCPIP_CORE_LOCKING=1 and sending hasn't yet finished
- */
-static err_t
-lwip_netconn_do_writemore(struct netconn *conn  WRITE_DELAYED_PARAM)
-{
-  err_t err;
-  const void *dataptr;
-  u16_t len, available;
-  u8_t write_finished = 0;
-  size_t diff;
-  u8_t dontblock;
-  u8_t apiflags;
-
-  LWIP_ASSERT("conn != NULL", conn != NULL);
-  LWIP_ASSERT("conn->state == NETCONN_WRITE", (conn->state == NETCONN_WRITE));
-  LWIP_ASSERT("conn->current_msg != NULL", conn->current_msg != NULL);
-  LWIP_ASSERT("conn->pcb.tcp != NULL", conn->pcb.tcp != NULL);
-  LWIP_ASSERT("conn->write_offset < conn->current_msg->msg.w.len",
-    conn->write_offset < conn->current_msg->msg.w.len);
-
-  apiflags = conn->current_msg->msg.w.apiflags;
-  dontblock = netconn_is_nonblocking(conn) || (apiflags & NETCONN_DONTBLOCK);
-
-#if LWIP_SO_SNDTIMEO
-  if ((conn->send_timeout != 0) &&
-      ((s32_t)(sys_now() - conn->current_msg->msg.w.time_started) >= conn->send_timeout)) {
-    write_finished = 1;
-    if (conn->write_offset == 0) {
-      /* nothing has been written */
-      err = ERR_WOULDBLOCK;
-      conn->current_msg->msg.w.len = 0;
-    } else {
-      /* partial write */
-      err = ERR_OK;
-      conn->current_msg->msg.w.len = conn->write_offset;
-      conn->write_offset = 0;
-    }
-  } else
-#endif /* LWIP_SO_SNDTIMEO */
-  {
-    dataptr = (const u8_t*)conn->current_msg->msg.w.dataptr + conn->write_offset;
-    diff = conn->current_msg->msg.w.len - conn->write_offset;
-    if (diff > 0xffffUL) { /* max_u16_t */
-      len = 0xffff;
-      apiflags |= TCP_WRITE_FLAG_MORE;
-    } else {
-      len = (u16_t)diff;
-    }
-    available = tcp_sndbuf(conn->pcb.tcp);
-    if (available < len) {
-      /* don't try to write more than sendbuf */
-      len = available;
-      if (dontblock) {
-        if (!len) {
-          err = ERR_WOULDBLOCK;
-          goto err_mem;
-        }
-      } else {
-        apiflags |= TCP_WRITE_FLAG_MORE;
-      }
-    }
-    LWIP_ASSERT("lwip_netconn_do_writemore: invalid length!", ((conn->write_offset + len) <= conn->current_msg->msg.w.len));
-    err = tcp_write(conn->pcb.tcp, dataptr, len, apiflags);
-    /* if OK or memory error, check available space */
-    if ((err == ERR_OK) || (err == ERR_MEM)) {
-err_mem:
-      if (dontblock && (len < conn->current_msg->msg.w.len)) {
-        /* non-blocking write did not write everything: mark the pcb non-writable
-           and let poll_tcp check writable space to mark the pcb writable again */
-        API_EVENT(conn, NETCONN_EVT_SENDMINUS, len);
-        conn->flags |= NETCONN_FLAG_CHECK_WRITESPACE;
-      } else if ((tcp_sndbuf(conn->pcb.tcp) <= TCP_SNDLOWAT) ||
-                 (tcp_sndqueuelen(conn->pcb.tcp) >= TCP_SNDQUEUELOWAT)) {
-        /* The queued byte- or pbuf-count exceeds the configured low-water limit,
-           let select mark this pcb as non-writable. */
-        API_EVENT(conn, NETCONN_EVT_SENDMINUS, len);
-      }
-    }
-
-    if (err == ERR_OK) {
-      err_t out_err;
-      conn->write_offset += len;
-      if ((conn->write_offset == conn->current_msg->msg.w.len) || dontblock) {
-        /* return sent length */
-        conn->current_msg->msg.w.len = conn->write_offset;
-        /* everything was written */
-        write_finished = 1;
-      }
-      out_err = tcp_output(conn->pcb.tcp);
-      if (ERR_IS_FATAL(out_err) || (out_err == ERR_RTE)) {
-        /* If tcp_output fails with fatal error or no route is found,
-           don't try writing any more but return the error
-           to the application thread. */
-        err = out_err;
-        write_finished = 1;
-        conn->current_msg->msg.w.len = 0;
-      }
-    } else if (err == ERR_MEM) {
-      /* If ERR_MEM, we wait for sent_tcp or poll_tcp to be called.
-         For blocking sockets, we do NOT return to the application
-         thread, since ERR_MEM is only a temporary error! Non-blocking
-         will remain non-writable until sent_tcp/poll_tcp is called */
-
-      /* tcp_write returned ERR_MEM, try tcp_output anyway */
-      err_t out_err = tcp_output(conn->pcb.tcp);
-      if (ERR_IS_FATAL(out_err) || (out_err == ERR_RTE)) {
-        /* If tcp_output fails with fatal error or no route is found,
-           don't try writing any more but return the error
-           to the application thread. */
-        err = out_err;
-        write_finished = 1;
-        conn->current_msg->msg.w.len = 0;
-      } else if (dontblock) {
-        /* non-blocking write is done on ERR_MEM */
-        err = ERR_WOULDBLOCK;
-        write_finished = 1;
-        conn->current_msg->msg.w.len = 0;
-      }
-    } else {
-      /* On errors != ERR_MEM, we don't try writing any more but return
-         the error to the application thread. */
-      write_finished = 1;
-      conn->current_msg->msg.w.len = 0;
-    }
-  }
-  if (write_finished) {
-    /* everything was written: set back connection state
-       and back to application task */
-    sys_sem_t* op_completed_sem = LWIP_API_MSG_SEM(conn->current_msg);
-    conn->current_msg->err = err;
-    conn->current_msg = NULL;
-    conn->write_offset = 0;
-    conn->state = NETCONN_NONE;
-    NETCONN_SET_SAFE_ERR(conn, err);
-#if LWIP_TCPIP_CORE_LOCKING
-    if (delayed)
-#endif
-    {
-      sys_sem_signal(op_completed_sem);
-    }
-  }
-#if LWIP_TCPIP_CORE_LOCKING
-  else {
-    return ERR_MEM;
-  }
-#endif
-  return ERR_OK;
-}
-#endif /* LWIP_TCP */
-
-/**
- * Send some data on a TCP pcb contained in a netconn
- * Called from netconn_write
- *
- * @param m the api_msg_msg pointing to the connection
- */
-void
-lwip_netconn_do_write(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  if (ERR_IS_FATAL(msg->conn->last_err)) {
-    msg->err = msg->conn->last_err;
-  } else {
-    if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_TCP) {
-#if LWIP_TCP
-      if (msg->conn->state != NETCONN_NONE) {
-        /* netconn is connecting, closing or in blocking write */
-        msg->err = ERR_INPROGRESS;
-      } else if (msg->conn->pcb.tcp != NULL) {
-        msg->conn->state = NETCONN_WRITE;
-        /* set all the variables used by lwip_netconn_do_writemore */
-        LWIP_ASSERT("already writing or closing", msg->conn->current_msg == NULL &&
-          msg->conn->write_offset == 0);
-        LWIP_ASSERT("msg->msg.w.len != 0", msg->msg.w.len != 0);
-        msg->conn->current_msg = msg;
-        msg->conn->write_offset = 0;
-#if LWIP_TCPIP_CORE_LOCKING
-        if (lwip_netconn_do_writemore(msg->conn, 0) != ERR_OK) {
-          LWIP_ASSERT("state!", msg->conn->state == NETCONN_WRITE);
-          UNLOCK_TCPIP_CORE();
-          sys_arch_sem_wait(LWIP_API_MSG_SEM(msg), 0);
-          LOCK_TCPIP_CORE();
-          LWIP_ASSERT("state!", msg->conn->state != NETCONN_WRITE);
-        }
-#else /* LWIP_TCPIP_CORE_LOCKING */
-        lwip_netconn_do_writemore(msg->conn);
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-        /* for both cases: if lwip_netconn_do_writemore was called, don't ACK the APIMSG
-           since lwip_netconn_do_writemore ACKs it! */
-        return;
-      } else {
-        msg->err = ERR_CONN;
-      }
-#else /* LWIP_TCP */
-      msg->err = ERR_VAL;
-#endif /* LWIP_TCP */
-#if (LWIP_UDP || LWIP_RAW)
-    } else {
-      msg->err = ERR_VAL;
-#endif /* (LWIP_UDP || LWIP_RAW) */
-    }
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-
-/**
- * Return a connection's local or remote address
- * Called from netconn_getaddr
- *
- * @param m the api_msg_msg pointing to the connection
- */
-void
-lwip_netconn_do_getaddr(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  if (msg->conn->pcb.ip != NULL) {
-    if (msg->msg.ad.local) {
-      ip_addr_copy(API_EXPR_DEREF(msg->msg.ad.ipaddr),
-        msg->conn->pcb.ip->local_ip);
-    } else {
-      ip_addr_copy(API_EXPR_DEREF(msg->msg.ad.ipaddr),
-        msg->conn->pcb.ip->remote_ip);
-    }
-
-    msg->err = ERR_OK;
-    switch (NETCONNTYPE_GROUP(msg->conn->type)) {
-#if LWIP_RAW
-    case NETCONN_RAW:
-      if (msg->msg.ad.local) {
-        API_EXPR_DEREF(msg->msg.ad.port) = msg->conn->pcb.raw->protocol;
-      } else {
-        /* return an error as connecting is only a helper for upper layers */
-        msg->err = ERR_CONN;
-      }
-      break;
-#endif /* LWIP_RAW */
-#if LWIP_UDP
-    case NETCONN_UDP:
-      if (msg->msg.ad.local) {
-        API_EXPR_DEREF(msg->msg.ad.port) = msg->conn->pcb.udp->local_port;
-      } else {
-        if ((msg->conn->pcb.udp->flags & UDP_FLAGS_CONNECTED) == 0) {
-          msg->err = ERR_CONN;
-        } else {
-          API_EXPR_DEREF(msg->msg.ad.port) = msg->conn->pcb.udp->remote_port;
-        }
-      }
-      break;
-#endif /* LWIP_UDP */
-#if LWIP_TCP
-    case NETCONN_TCP:
-      if ((msg->msg.ad.local == 0) &&
-          ((msg->conn->pcb.tcp->state == CLOSED) || (msg->conn->pcb.tcp->state == LISTEN))) {
-        /* pcb is not connected and remote name is requested */
-        msg->err = ERR_CONN;
-      } else {
-        API_EXPR_DEREF(msg->msg.ad.port) = (msg->msg.ad.local ? msg->conn->pcb.tcp->local_port : msg->conn->pcb.tcp->remote_port);
-      }
-      break;
-#endif /* LWIP_TCP */
-    default:
-      LWIP_ASSERT("invalid netconn_type", 0);
-      break;
-    }
-  } else {
-    msg->err = ERR_CONN;
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-
-/**
- * Close or half-shutdown a TCP pcb contained in a netconn
- * Called from netconn_close
- * In contrast to closing sockets, the netconn is not deallocated.
- *
- * @param m the api_msg_msg pointing to the connection
- */
-void
-lwip_netconn_do_close(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-#if LWIP_TCP
-  enum netconn_state state = msg->conn->state;
-  /* First check if this is a TCP netconn and if it is in a correct state
-      (LISTEN doesn't support half shutdown) */
-  if ((msg->conn->pcb.tcp != NULL) &&
-      (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_TCP) &&
-      ((msg->msg.sd.shut == NETCONN_SHUT_RDWR) || (state != NETCONN_LISTEN))) {
-    /* Check if we are in a connected state */
-    if (state == NETCONN_CONNECT) {
-      /* TCP connect in progress: cannot shutdown */
-      msg->err = ERR_CONN;
-    } else if (state == NETCONN_WRITE) {
-#if LWIP_NETCONN_FULLDUPLEX
-      if (msg->msg.sd.shut & NETCONN_SHUT_WR) {
-        /* close requested, abort running write */
-        sys_sem_t* write_completed_sem;
-        LWIP_ASSERT("msg->conn->current_msg != NULL", msg->conn->current_msg != NULL);
-        write_completed_sem = LWIP_API_MSG_SEM(msg->conn->current_msg);
-        msg->conn->current_msg->err = ERR_CLSD;
-        msg->conn->current_msg = NULL;
-        msg->conn->write_offset = 0;
-        msg->conn->state = NETCONN_NONE;
-        state = NETCONN_NONE;
-        NETCONN_SET_SAFE_ERR(msg->conn, ERR_CLSD);
-        sys_sem_signal(write_completed_sem);
-      } else {
-        LWIP_ASSERT("msg->msg.sd.shut == NETCONN_SHUT_RD", msg->msg.sd.shut == NETCONN_SHUT_RD);
-        /* In this case, let the write continue and do not interfere with
-           conn->current_msg or conn->state! */
-        msg->err = tcp_shutdown(msg->conn->pcb.tcp, 1, 0);
-      }
-    }
-    if (state == NETCONN_NONE) {
-#else /* LWIP_NETCONN_FULLDUPLEX */
-      msg->err = ERR_INPROGRESS;
-    } else {
-#endif /* LWIP_NETCONN_FULLDUPLEX */
-      if (msg->msg.sd.shut & NETCONN_SHUT_RD) {
-        /* Drain and delete mboxes */
-        netconn_drain(msg->conn);
-      }
-      LWIP_ASSERT("already writing or closing", msg->conn->current_msg == NULL &&
-        msg->conn->write_offset == 0);
-      msg->conn->state = NETCONN_CLOSE;
-      msg->conn->current_msg = msg;
-#if LWIP_TCPIP_CORE_LOCKING
-      if (lwip_netconn_do_close_internal(msg->conn, 0) != ERR_OK) {
-        LWIP_ASSERT("state!", msg->conn->state == NETCONN_CLOSE);
-        UNLOCK_TCPIP_CORE();
-        sys_arch_sem_wait(LWIP_API_MSG_SEM(msg), 0);
-        LOCK_TCPIP_CORE();
-        LWIP_ASSERT("state!", msg->conn->state == NETCONN_NONE);
-      }
-#else /* LWIP_TCPIP_CORE_LOCKING */
-      lwip_netconn_do_close_internal(msg->conn);
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-      /* for tcp netconns, lwip_netconn_do_close_internal ACKs the message */
-      return;
-    }
-  } else
-#endif /* LWIP_TCP */
-  {
-    msg->err = ERR_CONN;
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-
-#if LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD)
-/**
- * Join multicast groups for UDP netconns.
- * Called from netconn_join_leave_group
- *
- * @param m the api_msg_msg pointing to the connection
- */
-void
-lwip_netconn_do_join_leave_group(void *m)
-{
-  struct api_msg *msg = (struct api_msg*)m;
-
-  if (ERR_IS_FATAL(msg->conn->last_err)) {
-    msg->err = msg->conn->last_err;
-  } else {
-    if (msg->conn->pcb.tcp != NULL) {
-      if (NETCONNTYPE_GROUP(msg->conn->type) == NETCONN_UDP) {
-#if LWIP_UDP
-#if LWIP_IPV6 && LWIP_IPV6_MLD
-        if (NETCONNTYPE_ISIPV6(msg->conn->type)) {
-          if (msg->msg.jl.join_or_leave == NETCONN_JOIN) {
-            msg->err = mld6_joingroup(ip_2_ip6(API_EXPR_REF(msg->msg.jl.netif_addr)),
-              ip_2_ip6(API_EXPR_REF(msg->msg.jl.multiaddr)));
-          } else {
-            msg->err = mld6_leavegroup(ip_2_ip6(API_EXPR_REF(msg->msg.jl.netif_addr)),
-              ip_2_ip6(API_EXPR_REF(msg->msg.jl.multiaddr)));
-          }
-        }
-        else
-#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
-        {
-#if LWIP_IGMP
-          if (msg->msg.jl.join_or_leave == NETCONN_JOIN) {
-            msg->err = igmp_joingroup(ip_2_ip4(API_EXPR_REF(msg->msg.jl.netif_addr)),
-              ip_2_ip4(API_EXPR_REF(msg->msg.jl.multiaddr)));
-          } else {
-            msg->err = igmp_leavegroup(ip_2_ip4(API_EXPR_REF(msg->msg.jl.netif_addr)),
-              ip_2_ip4(API_EXPR_REF(msg->msg.jl.multiaddr)));
-          }
-#endif /* LWIP_IGMP */
-        }
-#endif /* LWIP_UDP */
-#if (LWIP_TCP || LWIP_RAW)
-      } else {
-        msg->err = ERR_VAL;
-#endif /* (LWIP_TCP || LWIP_RAW) */
-      }
-    } else {
-      msg->err = ERR_CONN;
-    }
-  }
-  TCPIP_APIMSG_ACK(msg);
-}
-#endif /* LWIP_IGMP || (LWIP_IPV6 && LWIP_IPV6_MLD) */
-
-#if LWIP_DNS
-/**
- * Callback function that is called when DNS name is resolved
- * (or on timeout). A waiting application thread is waked up by
- * signaling the semaphore.
- */
-static void
-lwip_netconn_do_dns_found(const char *name, const ip_addr_t *ipaddr, void *arg)
-{
-  struct dns_api_msg *msg = (struct dns_api_msg*)arg;
-
-  /* we trust the internal implementation to be correct :-) */
-  LWIP_UNUSED_ARG(name);
-
-  if (ipaddr == NULL) {
-    /* timeout or memory error */
-    API_EXPR_DEREF(msg->err) = ERR_VAL;
-  } else {
-    /* address was resolved */
-    API_EXPR_DEREF(msg->err) = ERR_OK;
-    API_EXPR_DEREF(msg->addr) = *ipaddr;
-  }
-  /* wake up the application task waiting in netconn_gethostbyname */
-  sys_sem_signal(API_EXPR_REF_SEM(msg->sem));
-}
-
-/**
- * Execute a DNS query
- * Called from netconn_gethostbyname
- *
- * @param arg the dns_api_msg pointing to the query
- */
-void
-lwip_netconn_do_gethostbyname(void *arg)
-{
-  struct dns_api_msg *msg = (struct dns_api_msg*)arg;
-  u8_t addrtype =
-#if LWIP_IPV4 && LWIP_IPV6
-    msg->dns_addrtype;
-#else
-    LWIP_DNS_ADDRTYPE_DEFAULT;
-#endif
-
-  API_EXPR_DEREF(msg->err) = dns_gethostbyname_addrtype(msg->name,
-    API_EXPR_REF(msg->addr), lwip_netconn_do_dns_found, msg, addrtype);
-  if (API_EXPR_DEREF(msg->err) != ERR_INPROGRESS) {
-    /* on error or immediate success, wake up the application
-     * task waiting in netconn_gethostbyname */
-    sys_sem_signal(API_EXPR_REF_SEM(msg->sem));
-  }
-}
-#endif /* LWIP_DNS */
-
-#endif /* LWIP_NETCONN */
diff --git a/sys/net/api/err.c b/sys/net/api/err.c
deleted file mode 100644
index 25677a8..0000000
--- a/sys/net/api/err.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * @file
- * Error Management module
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include <net/err.h>
-#include <net/def.h>
-#include <net/sys.h>
-
-#include <net/errno.h>
-
-int errno;
-
-#if !NO_SYS
-/** Table to quickly map an lwIP error (err_t) to a socket error
-  * by using -err as an index */
-static const int err_to_errno_table[] = {
-  0,             /* ERR_OK          0      No error, everything OK. */
-  ENOMEM,        /* ERR_MEM        -1      Out of memory error.     */
-  ENOBUFS,       /* ERR_BUF        -2      Buffer error.            */
-  EWOULDBLOCK,   /* ERR_TIMEOUT    -3      Timeout                  */
-  EHOSTUNREACH,  /* ERR_RTE        -4      Routing problem.         */
-  EINPROGRESS,   /* ERR_INPROGRESS -5      Operation in progress    */
-  EINVAL,        /* ERR_VAL        -6      Illegal value.           */
-  EWOULDBLOCK,   /* ERR_WOULDBLOCK -7      Operation would block.   */
-  EADDRINUSE,    /* ERR_USE        -8      Address in use.          */
-  EALREADY,      /* ERR_ALREADY    -9      Already connecting.      */
-  EISCONN,       /* ERR_ISCONN     -10     Conn already established.*/
-  ENOTCONN,      /* ERR_CONN       -11     Not connected.           */
-  -1,            /* ERR_IF         -12     Low-level netif error    */
-  ECONNABORTED,  /* ERR_ABRT       -13     Connection aborted.      */
-  ECONNRESET,    /* ERR_RST        -14     Connection reset.        */
-  ENOTCONN,      /* ERR_CLSD       -15     Connection closed.       */
-  EIO            /* ERR_ARG        -16     Illegal argument.        */
-};
-
-int
-err_to_errno(err_t err)
-{
-  if ((err > 0) || (-err >= (err_t)LWIP_ARRAYSIZE(err_to_errno_table))) {
-    return EIO;
-  }
-  return err_to_errno_table[-err];
-}
-#endif /* !NO_SYS */
-
-#ifdef LWIP_DEBUG
-
-static const char *err_strerr[] = {
-           "Ok.",                    /* ERR_OK          0  */
-           "Out of memory error.",   /* ERR_MEM        -1  */
-           "Buffer error.",          /* ERR_BUF        -2  */
-           "Timeout.",               /* ERR_TIMEOUT    -3  */
-           "Routing problem.",       /* ERR_RTE        -4  */
-           "Operation in progress.", /* ERR_INPROGRESS -5  */
-           "Illegal value.",         /* ERR_VAL        -6  */
-           "Operation would block.", /* ERR_WOULDBLOCK -7  */
-           "Address in use.",        /* ERR_USE        -8  */
-           "Already connecting.",    /* ERR_ALREADY    -9  */
-           "Already connected.",     /* ERR_ISCONN     -10 */
-           "Not connected.",         /* ERR_CONN       -11 */
-           "Low-level netif error.", /* ERR_IF         -12 */
-           "Connection aborted.",    /* ERR_ABRT       -13 */
-           "Connection reset.",      /* ERR_RST        -14 */
-           "Connection closed.",     /* ERR_CLSD       -15 */
-           "Illegal argument."       /* ERR_ARG        -16 */
-};
-
-/**
- * Convert an lwip internal error to a string representation.
- *
- * @param err an lwip internal err_t
- * @return a string representation for err
- */
-const char *
-lwip_strerr(err_t err)
-{
-  if ((err > 0) || (-err >= (err_t)LWIP_ARRAYSIZE(err_strerr))) {
-    return "Unknown error.";
-  }
-  return err_strerr[-err];
-}
-
-#endif /* LWIP_DEBUG */
diff --git a/sys/net/api/netbuf.c b/sys/net/api/netbuf.c
deleted file mode 100644
index 1d99096..0000000
--- a/sys/net/api/netbuf.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- * @file
- * Network buffer management
- *
- * @defgroup netbuf Network buffers
- * @ingroup netconn
- * Network buffer descriptor for @ref netconn. Based on @ref pbuf internally
- * to avoid copying data around.\n
- * Buffers must not be shared accross multiple threads, all functions except
- * netbuf_new() and netbuf_delete() are not thread-safe.
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_NETCONN /* don't build if not configured for use in lwipopts.h */
-
-#include "net/netbuf.h"
-#include "net/memp.h"
-
-#include <string.h>
-
-/**
- * @ingroup netbuf
- * Create (allocate) and initialize a new netbuf.
- * The netbuf doesn't yet contain a packet buffer!
- *
- * @return a pointer to a new netbuf
- *         NULL on lack of memory
- */
-struct
-netbuf *netbuf_new(void)
-{
-  struct netbuf *buf;
-
-  buf = (struct netbuf *)memp_malloc(MEMP_NETBUF);
-  if (buf != NULL) {
-    memset(buf, 0, sizeof(struct netbuf));
-  }
-  return buf;
-}
-
-/**
- * @ingroup netbuf
- * Deallocate a netbuf allocated by netbuf_new().
- *
- * @param buf pointer to a netbuf allocated by netbuf_new()
- */
-void
-netbuf_delete(struct netbuf *buf)
-{
-  if (buf != NULL) {
-    if (buf->p != NULL) {
-      pbuf_free(buf->p);
-      buf->p = buf->ptr = NULL;
-    }
-    memp_free(MEMP_NETBUF, buf);
-  }
-}
-
-/**
- * @ingroup netbuf
- * Allocate memory for a packet buffer for a given netbuf.
- *
- * @param buf the netbuf for which to allocate a packet buffer
- * @param size the size of the packet buffer to allocate
- * @return pointer to the allocated memory
- *         NULL if no memory could be allocated
- */
-void *
-netbuf_alloc(struct netbuf *buf, u16_t size)
-{
-  LWIP_ERROR("netbuf_alloc: invalid buf", (buf != NULL), return NULL;);
-
-  /* Deallocate any previously allocated memory. */
-  if (buf->p != NULL) {
-    pbuf_free(buf->p);
-  }
-  buf->p = pbuf_alloc(PBUF_TRANSPORT, size, PBUF_RAM);
-  if (buf->p == NULL) {
-     return NULL;
-  }
-  LWIP_ASSERT("check that first pbuf can hold size",
-             (buf->p->len >= size));
-  buf->ptr = buf->p;
-  return buf->p->payload;
-}
-
-/**
- * @ingroup netbuf
- * Free the packet buffer included in a netbuf
- *
- * @param buf pointer to the netbuf which contains the packet buffer to free
- */
-void
-netbuf_free(struct netbuf *buf)
-{
-  LWIP_ERROR("netbuf_free: invalid buf", (buf != NULL), return;);
-  if (buf->p != NULL) {
-    pbuf_free(buf->p);
-  }
-  buf->p = buf->ptr = NULL;
-}
-
-/**
- * @ingroup netbuf
- * Let a netbuf reference existing (non-volatile) data.
- *
- * @param buf netbuf which should reference the data
- * @param dataptr pointer to the data to reference
- * @param size size of the data
- * @return ERR_OK if data is referenced
- *         ERR_MEM if data couldn't be referenced due to lack of memory
- */
-err_t
-netbuf_ref(struct netbuf *buf, const void *dataptr, u16_t size)
-{
-  LWIP_ERROR("netbuf_ref: invalid buf", (buf != NULL), return ERR_ARG;);
-  if (buf->p != NULL) {
-    pbuf_free(buf->p);
-  }
-  buf->p = pbuf_alloc(PBUF_TRANSPORT, 0, PBUF_REF);
-  if (buf->p == NULL) {
-    buf->ptr = NULL;
-    return ERR_MEM;
-  }
-  ((struct pbuf_rom*)buf->p)->payload = dataptr;
-  buf->p->len = buf->p->tot_len = size;
-  buf->ptr = buf->p;
-  return ERR_OK;
-}
-
-/**
- * @ingroup netbuf
- * Chain one netbuf to another (@see pbuf_chain)
- *
- * @param head the first netbuf
- * @param tail netbuf to chain after head, freed by this function, may not be reference after returning
- */
-void
-netbuf_chain(struct netbuf *head, struct netbuf *tail)
-{
-  LWIP_ERROR("netbuf_chain: invalid head", (head != NULL), return;);
-  LWIP_ERROR("netbuf_chain: invalid tail", (tail != NULL), return;);
-  pbuf_cat(head->p, tail->p);
-  head->ptr = head->p;
-  memp_free(MEMP_NETBUF, tail);
-}
-
-/**
- * @ingroup netbuf
- * Get the data pointer and length of the data inside a netbuf.
- *
- * @param buf netbuf to get the data from
- * @param dataptr pointer to a void pointer where to store the data pointer
- * @param len pointer to an u16_t where the length of the data is stored
- * @return ERR_OK if the information was retrieved,
- *         ERR_BUF on error.
- */
-err_t
-netbuf_data(struct netbuf *buf, void **dataptr, u16_t *len)
-{
-  LWIP_ERROR("netbuf_data: invalid buf", (buf != NULL), return ERR_ARG;);
-  LWIP_ERROR("netbuf_data: invalid dataptr", (dataptr != NULL), return ERR_ARG;);
-  LWIP_ERROR("netbuf_data: invalid len", (len != NULL), return ERR_ARG;);
-
-  if (buf->ptr == NULL) {
-    return ERR_BUF;
-  }
-  *dataptr = buf->ptr->payload;
-  *len = buf->ptr->len;
-  return ERR_OK;
-}
-
-/**
- * @ingroup netbuf
- * Move the current data pointer of a packet buffer contained in a netbuf
- * to the next part.
- * The packet buffer itself is not modified.
- *
- * @param buf the netbuf to modify
- * @return -1 if there is no next part
- *         1  if moved to the next part but now there is no next part
- *         0  if moved to the next part and there are still more parts
- */
-s8_t
-netbuf_next(struct netbuf *buf)
-{
-  LWIP_ERROR("netbuf_next: invalid buf", (buf != NULL), return -1;);
-  if (buf->ptr->next == NULL) {
-    return -1;
-  }
-  buf->ptr = buf->ptr->next;
-  if (buf->ptr->next == NULL) {
-    return 1;
-  }
-  return 0;
-}
-
-/**
- * @ingroup netbuf
- * Move the current data pointer of a packet buffer contained in a netbuf
- * to the beginning of the packet.
- * The packet buffer itself is not modified.
- *
- * @param buf the netbuf to modify
- */
-void
-netbuf_first(struct netbuf *buf)
-{
-  LWIP_ERROR("netbuf_first: invalid buf", (buf != NULL), return;);
-  buf->ptr = buf->p;
-}
-
-#endif /* LWIP_NETCONN */
diff --git a/sys/net/api/netdb.c b/sys/net/api/netdb.c
deleted file mode 100644
index deff495..0000000
--- a/sys/net/api/netdb.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/**
- * @file
- * API functions for name resolving
- *
- * @defgroup netdbapi NETDB API
- * @ingroup socket
- */
-
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Simon Goldschmidt
- *
- */
-
-#include "lwip/netdb.h"
-
-#if LWIP_DNS && LWIP_SOCKET
-
-#include "lwip/err.h"
-#include "lwip/mem.h"
-#include "lwip/memp.h"
-#include "lwip/ip_addr.h"
-#include "lwip/api.h"
-#include "lwip/dns.h"
-
-#include <string.h> /* memset */
-#include <stdlib.h> /* atoi */
-
-/** helper struct for gethostbyname_r to access the char* buffer */
-struct gethostbyname_r_helper {
-  ip_addr_t *addr_list[2];
-  ip_addr_t addr;
-  char *aliases;
-};
-
-/** h_errno is exported in netdb.h for access by applications. */
-#if LWIP_DNS_API_DECLARE_H_ERRNO
-int h_errno;
-#endif /* LWIP_DNS_API_DECLARE_H_ERRNO */
-
-/** define "hostent" variables storage: 0 if we use a static (but unprotected)
- * set of variables for lwip_gethostbyname, 1 if we use a local storage */
-#ifndef LWIP_DNS_API_HOSTENT_STORAGE
-#define LWIP_DNS_API_HOSTENT_STORAGE 0
-#endif
-
-/** define "hostent" variables storage */
-#if LWIP_DNS_API_HOSTENT_STORAGE
-#define HOSTENT_STORAGE
-#else
-#define HOSTENT_STORAGE static
-#endif /* LWIP_DNS_API_STATIC_HOSTENT */
-
-/**
- * Returns an entry containing addresses of address family AF_INET
- * for the host with name name.
- * Due to dns_gethostbyname limitations, only one address is returned.
- *
- * @param name the hostname to resolve
- * @return an entry containing addresses of address family AF_INET
- *         for the host with name name
- */
-struct hostent*
-lwip_gethostbyname(const char *name)
-{
-  err_t err;
-  ip_addr_t addr;
-
-  /* buffer variables for lwip_gethostbyname() */
-  HOSTENT_STORAGE struct hostent s_hostent;
-  HOSTENT_STORAGE char *s_aliases;
-  HOSTENT_STORAGE ip_addr_t s_hostent_addr;
-  HOSTENT_STORAGE ip_addr_t *s_phostent_addr[2];
-  HOSTENT_STORAGE char s_hostname[DNS_MAX_NAME_LENGTH + 1];
-
-  /* query host IP address */
-  err = netconn_gethostbyname(name, &addr);
-  if (err != ERR_OK) {
-    LWIP_DEBUGF(DNS_DEBUG, ("lwip_gethostbyname(%s) failed, err=%d\n", name, err));
-    h_errno = HOST_NOT_FOUND;
-    return NULL;
-  }
-
-  /* fill hostent */
-  s_hostent_addr = addr;
-  s_phostent_addr[0] = &s_hostent_addr;
-  s_phostent_addr[1] = NULL;
-  strncpy(s_hostname, name, DNS_MAX_NAME_LENGTH);
-  s_hostname[DNS_MAX_NAME_LENGTH] = 0;
-  s_hostent.h_name = s_hostname;
-  s_aliases = NULL;
-  s_hostent.h_aliases = &s_aliases;
-  s_hostent.h_addrtype = AF_INET;
-  s_hostent.h_length = sizeof(ip_addr_t);
-  s_hostent.h_addr_list = (char**)&s_phostent_addr;
-
-#if DNS_DEBUG
-  /* dump hostent */
-  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_name           == %s\n", s_hostent.h_name));
-  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_aliases        == %p\n", (void*)s_hostent.h_aliases));
-  /* h_aliases are always empty */
-  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_addrtype       == %d\n", s_hostent.h_addrtype));
-  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_length         == %d\n", s_hostent.h_length));
-  LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_addr_list      == %p\n", (void*)s_hostent.h_addr_list));
-  if (s_hostent.h_addr_list != NULL) {
-    u8_t idx;
-    for (idx=0; s_hostent.h_addr_list[idx]; idx++) {
-      LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_addr_list[%i]   == %p\n", idx, s_hostent.h_addr_list[idx]));
-      LWIP_DEBUGF(DNS_DEBUG, ("hostent.h_addr_list[%i]-> == %s\n", idx, ipaddr_ntoa((ip_addr_t*)s_hostent.h_addr_list[idx])));
-    }
-  }
-#endif /* DNS_DEBUG */
-
-#if LWIP_DNS_API_HOSTENT_STORAGE
-  /* this function should return the "per-thread" hostent after copy from s_hostent */
-  return sys_thread_hostent(&s_hostent);
-#else
-  return &s_hostent;
-#endif /* LWIP_DNS_API_HOSTENT_STORAGE */
-}
-
-/**
- * Thread-safe variant of lwip_gethostbyname: instead of using a static
- * buffer, this function takes buffer and errno pointers as arguments
- * and uses these for the result.
- *
- * @param name the hostname to resolve
- * @param ret pre-allocated struct where to store the result
- * @param buf pre-allocated buffer where to store additional data
- * @param buflen the size of buf
- * @param result pointer to a hostent pointer that is set to ret on success
- *               and set to zero on error
- * @param h_errnop pointer to an int where to store errors (instead of modifying
- *                 the global h_errno)
- * @return 0 on success, non-zero on error, additional error information
- *         is stored in *h_errnop instead of h_errno to be thread-safe
- */
-int
-lwip_gethostbyname_r(const char *name, struct hostent *ret, char *buf,
-                size_t buflen, struct hostent **result, int *h_errnop)
-{
-  err_t err;
-  struct gethostbyname_r_helper *h;
-  char *hostname;
-  size_t namelen;
-  int lh_errno;
-
-  if (h_errnop == NULL) {
-    /* ensure h_errnop is never NULL */
-    h_errnop = &lh_errno;
-  }
-
-  if (result == NULL) {
-    /* not all arguments given */
-    *h_errnop = EINVAL;
-    return -1;
-  }
-  /* first thing to do: set *result to nothing */
-  *result = NULL;
-  if ((name == NULL) || (ret == NULL) || (buf == NULL)) {
-    /* not all arguments given */
-    *h_errnop = EINVAL;
-    return -1;
-  }
-
-  namelen = strlen(name);
-  if (buflen < (sizeof(struct gethostbyname_r_helper) + namelen + 1 + (MEM_ALIGNMENT - 1))) {
-    /* buf can't hold the data needed + a copy of name */
-    *h_errnop = ERANGE;
-    return -1;
-  }
-
-  h = (struct gethostbyname_r_helper*)LWIP_MEM_ALIGN(buf);
-  hostname = ((char*)h) + sizeof(struct gethostbyname_r_helper);
-
-  /* query host IP address */
-  err = netconn_gethostbyname(name, &h->addr);
-  if (err != ERR_OK) {
-    LWIP_DEBUGF(DNS_DEBUG, ("lwip_gethostbyname(%s) failed, err=%d\n", name, err));
-    *h_errnop = HOST_NOT_FOUND;
-    return -1;
-  }
-
-  /* copy the hostname into buf */
-  MEMCPY(hostname, name, namelen);
-  hostname[namelen] = 0;
-
-  /* fill hostent */
-  h->addr_list[0] = &h->addr;
-  h->addr_list[1] = NULL;
-  h->aliases = NULL;
-  ret->h_name = hostname;
-  ret->h_aliases = &h->aliases;
-  ret->h_addrtype = AF_INET;
-  ret->h_length = sizeof(ip_addr_t);
-  ret->h_addr_list = (char**)&h->addr_list;
-
-  /* set result != NULL */
-  *result = ret;
-
-  /* return success */
-  return 0;
-}
-
-/**
- * Frees one or more addrinfo structures returned by getaddrinfo(), along with
- * any additional storage associated with those structures. If the ai_next field
- * of the structure is not null, the entire list of structures is freed.
- *
- * @param ai struct addrinfo to free
- */
-void
-lwip_freeaddrinfo(struct addrinfo *ai)
-{
-  struct addrinfo *next;
-
-  while (ai != NULL) {
-    next = ai->ai_next;
-    memp_free(MEMP_NETDB, ai);
-    ai = next;
-  }
-}
-
-/**
- * Translates the name of a service location (for example, a host name) and/or
- * a service name and returns a set of socket addresses and associated
- * information to be used in creating a socket with which to address the
- * specified service.
- * Memory for the result is allocated internally and must be freed by calling
- * lwip_freeaddrinfo()!
- *
- * Due to a limitation in dns_gethostbyname, only the first address of a
- * host is returned.
- * Also, service names are not supported (only port numbers)!
- *
- * @param nodename descriptive name or address string of the host
- *                 (may be NULL -> local address)
- * @param servname port number as string of NULL
- * @param hints structure containing input values that set socktype and protocol
- * @param res pointer to a pointer where to store the result (set to NULL on failure)
- * @return 0 on success, non-zero on failure
- *
- * @todo: implement AI_V4MAPPED, AI_ADDRCONFIG
- */
-int
-lwip_getaddrinfo(const char *nodename, const char *servname,
-       const struct addrinfo *hints, struct addrinfo **res)
-{
-  err_t err;
-  ip_addr_t addr;
-  struct addrinfo *ai;
-  struct sockaddr_storage *sa = NULL;
-  int port_nr = 0;
-  size_t total_size;
-  size_t namelen = 0;
-  int ai_family;
-
-  if (res == NULL) {
-    return EAI_FAIL;
-  }
-  *res = NULL;
-  if ((nodename == NULL) && (servname == NULL)) {
-    return EAI_NONAME;
-  }
-
-  if (hints != NULL) {
-    ai_family = hints->ai_family;
-    if ((ai_family != AF_UNSPEC)
-#if LWIP_IPV4
-      && (ai_family != AF_INET)
-#endif /* LWIP_IPV4 */
-#if LWIP_IPV6
-      && (ai_family != AF_INET6)
-#endif /* LWIP_IPV6 */
-      ) {
-      return EAI_FAMILY;
-    }
-  } else {
-    ai_family = AF_UNSPEC;
-  }
-
-  if (servname != NULL) {
-    /* service name specified: convert to port number
-     * @todo?: currently, only ASCII integers (port numbers) are supported (AI_NUMERICSERV)! */
-    port_nr = atoi(servname);
-    if ((port_nr <= 0) || (port_nr > 0xffff)) {
-      return EAI_SERVICE;
-    }
-  }
-
-  if (nodename != NULL) {
-    /* service location specified, try to resolve */
-    if ((hints != NULL) && (hints->ai_flags & AI_NUMERICHOST)) {
-      /* no DNS lookup, just parse for an address string */
-      if (!ipaddr_aton(nodename, &addr)) {
-        return EAI_NONAME;
-      }
-#if LWIP_IPV4 && LWIP_IPV6
-      if ((IP_IS_V6_VAL(addr) && ai_family == AF_INET) ||
-          (IP_IS_V4_VAL(addr) && ai_family == AF_INET6)) {
-        return EAI_NONAME;
-      }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-    } else {
-#if LWIP_IPV4 && LWIP_IPV6
-      /* AF_UNSPEC: prefer IPv4 */
-      u8_t type = NETCONN_DNS_IPV4_IPV6;
-      if (ai_family == AF_INET) {
-        type = NETCONN_DNS_IPV4;
-      } else if (ai_family == AF_INET6) {
-        type = NETCONN_DNS_IPV6;
-      }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-      err = netconn_gethostbyname_addrtype(nodename, &addr, type);
-      if (err != ERR_OK) {
-        return EAI_FAIL;
-      }
-    }
-  } else {
-    /* service location specified, use loopback address */
-    if ((hints != NULL) && (hints->ai_flags & AI_PASSIVE)) {
-      ip_addr_set_any(ai_family == AF_INET6, &addr);
-    } else {
-      ip_addr_set_loopback(ai_family == AF_INET6, &addr);
-    }
-  }
-
-  total_size = sizeof(struct addrinfo) + sizeof(struct sockaddr_storage);
-  if (nodename != NULL) {
-    namelen = strlen(nodename);
-    if (namelen > DNS_MAX_NAME_LENGTH) {
-      /* invalid name length */
-      return EAI_FAIL;
-    }
-    LWIP_ASSERT("namelen is too long", total_size + namelen + 1 > total_size);
-    total_size += namelen + 1;
-  }
-  /* If this fails, please report to lwip-devel! :-) */
-  LWIP_ASSERT("total_size <= NETDB_ELEM_SIZE: please report this!",
-    total_size <= NETDB_ELEM_SIZE);
-  ai = (struct addrinfo *)memp_malloc(MEMP_NETDB);
-  if (ai == NULL) {
-    return EAI_MEMORY;
-  }
-  memset(ai, 0, total_size);
-  /* cast through void* to get rid of alignment warnings */
-  sa = (struct sockaddr_storage *)(void*)((u8_t*)ai + sizeof(struct addrinfo));
-  if (IP_IS_V6_VAL(addr)) {
-#if LWIP_IPV6
-    struct sockaddr_in6 *sa6 = (struct sockaddr_in6*)sa;
-    /* set up sockaddr */
-    inet6_addr_from_ip6addr(&sa6->sin6_addr, ip_2_ip6(&addr));
-    sa6->sin6_family = AF_INET6;
-    sa6->sin6_len = sizeof(struct sockaddr_in6);
-    sa6->sin6_port = lwip_htons((u16_t)port_nr);
-    ai->ai_family = AF_INET6;
-#endif /* LWIP_IPV6 */
-  } else {
-#if LWIP_IPV4
-    struct sockaddr_in *sa4 = (struct sockaddr_in*)sa;
-    /* set up sockaddr */
-    inet_addr_from_ip4addr(&sa4->sin_addr, ip_2_ip4(&addr));
-    sa4->sin_family = AF_INET;
-    sa4->sin_len = sizeof(struct sockaddr_in);
-    sa4->sin_port = lwip_htons((u16_t)port_nr);
-    ai->ai_family = AF_INET;
-#endif /* LWIP_IPV4 */
-  }
-
-  /* set up addrinfo */
-  if (hints != NULL) {
-    /* copy socktype & protocol from hints if specified */
-    ai->ai_socktype = hints->ai_socktype;
-    ai->ai_protocol = hints->ai_protocol;
-  }
-  if (nodename != NULL) {
-    /* copy nodename to canonname if specified */
-    ai->ai_canonname = ((char*)ai + sizeof(struct addrinfo) + sizeof(struct sockaddr_storage));
-    MEMCPY(ai->ai_canonname, nodename, namelen);
-    ai->ai_canonname[namelen] = 0;
-  }
-  ai->ai_addrlen = sizeof(struct sockaddr_storage);
-  ai->ai_addr = (struct sockaddr*)sa;
-
-  *res = ai;
-
-  return 0;
-}
-
-#endif /* LWIP_DNS && LWIP_SOCKET */
diff --git a/sys/net/api/netifapi.c b/sys/net/api/netifapi.c
deleted file mode 100644
index aac0975..0000000
--- a/sys/net/api/netifapi.c
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * @file
- * Network Interface Sequential API module
- *
- * @defgroup netifapi NETIF API
- * @ingroup sequential_api
- * Thread-safe functions to be called from non-TCPIP threads
- * 
- * @defgroup netifapi_netif NETIF related
- * @ingroup netifapi
- * To be called from non-TCPIP threads 
- */
-
-/*
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-
-#include "lwip/opt.h"
-
-#if LWIP_NETIF_API /* don't build if not configured for use in lwipopts.h */
-
-#include "lwip/netifapi.h"
-#include "lwip/memp.h"
-#include "lwip/priv/tcpip_priv.h"
-
-#define NETIFAPI_VAR_REF(name)      API_VAR_REF(name)
-#define NETIFAPI_VAR_DECLARE(name)  API_VAR_DECLARE(struct netifapi_msg, name)
-#define NETIFAPI_VAR_ALLOC(name)    API_VAR_ALLOC(struct netifapi_msg, MEMP_NETIFAPI_MSG, name, ERR_MEM)
-#define NETIFAPI_VAR_FREE(name)     API_VAR_FREE(MEMP_NETIFAPI_MSG, name)
-
-/**
- * Call netif_add() inside the tcpip_thread context.
- */
-static err_t
-netifapi_do_netif_add(struct tcpip_api_call_data *m)
-{
-  /* cast through void* to silence alignment warnings. 
-   * We know it works because the structs have been instantiated as struct netifapi_msg */
-  struct netifapi_msg *msg = (struct netifapi_msg*)(void*)m;
-  
-  if (!netif_add( msg->netif,
-#if LWIP_IPV4
-                  API_EXPR_REF(msg->msg.add.ipaddr),
-                  API_EXPR_REF(msg->msg.add.netmask),
-                  API_EXPR_REF(msg->msg.add.gw),
-#endif /* LWIP_IPV4 */
-                  msg->msg.add.state,
-                  msg->msg.add.init,
-                  msg->msg.add.input)) {
-    return ERR_IF;
-  } else {
-    return ERR_OK;
-  }
-}
-
-#if LWIP_IPV4
-/**
- * Call netif_set_addr() inside the tcpip_thread context.
- */
-static err_t
-netifapi_do_netif_set_addr(struct tcpip_api_call_data *m)
-{
-  /* cast through void* to silence alignment warnings. 
-   * We know it works because the structs have been instantiated as struct netifapi_msg */
-  struct netifapi_msg *msg = (struct netifapi_msg*)(void*)m;
-
-  netif_set_addr( msg->netif,
-                  API_EXPR_REF(msg->msg.add.ipaddr),
-                  API_EXPR_REF(msg->msg.add.netmask),
-                  API_EXPR_REF(msg->msg.add.gw));
-  return ERR_OK;
-}
-#endif /* LWIP_IPV4 */
-
-/**
- * Call the "errtfunc" (or the "voidfunc" if "errtfunc" is NULL) inside the
- * tcpip_thread context.
- */
-static err_t
-netifapi_do_netif_common(struct tcpip_api_call_data *m)
-{
-  /* cast through void* to silence alignment warnings. 
-   * We know it works because the structs have been instantiated as struct netifapi_msg */
-  struct netifapi_msg *msg = (struct netifapi_msg*)(void*)m;
-
-  if (msg->msg.common.errtfunc != NULL) {
-    return msg->msg.common.errtfunc(msg->netif);
-  } else {
-    msg->msg.common.voidfunc(msg->netif);
-    return ERR_OK;
-  }
-}
-
-/**
- * @ingroup netifapi_netif
- * Call netif_add() in a thread-safe way by running that function inside the
- * tcpip_thread context.
- *
- * @note for params @see netif_add()
- */
-err_t
-netifapi_netif_add(struct netif *netif,
-#if LWIP_IPV4
-                   const ip4_addr_t *ipaddr, const ip4_addr_t *netmask, const ip4_addr_t *gw,
-#endif /* LWIP_IPV4 */
-                   void *state, netif_init_fn init, netif_input_fn input)
-{
-  err_t err;
-  NETIFAPI_VAR_DECLARE(msg);
-  NETIFAPI_VAR_ALLOC(msg);
-
-#if LWIP_IPV4
-  if (ipaddr == NULL) {
-    ipaddr = IP4_ADDR_ANY4;
-  }
-  if (netmask == NULL) {
-    netmask = IP4_ADDR_ANY4;
-  }
-  if (gw == NULL) {
-    gw = IP4_ADDR_ANY4;
-  }
-#endif /* LWIP_IPV4 */
-
-  NETIFAPI_VAR_REF(msg).netif = netif;
-#if LWIP_IPV4
-  NETIFAPI_VAR_REF(msg).msg.add.ipaddr  = NETIFAPI_VAR_REF(ipaddr);
-  NETIFAPI_VAR_REF(msg).msg.add.netmask = NETIFAPI_VAR_REF(netmask);
-  NETIFAPI_VAR_REF(msg).msg.add.gw      = NETIFAPI_VAR_REF(gw);
-#endif /* LWIP_IPV4 */
-  NETIFAPI_VAR_REF(msg).msg.add.state   = state;
-  NETIFAPI_VAR_REF(msg).msg.add.init    = init;
-  NETIFAPI_VAR_REF(msg).msg.add.input   = input;
-  err = tcpip_api_call(netifapi_do_netif_add, &API_VAR_REF(msg).call);
-  NETIFAPI_VAR_FREE(msg);
-  return err;
-}
-
-#if LWIP_IPV4
-/**
- * @ingroup netifapi_netif
- * Call netif_set_addr() in a thread-safe way by running that function inside the
- * tcpip_thread context.
- *
- * @note for params @see netif_set_addr()
- */
-err_t
-netifapi_netif_set_addr(struct netif *netif,
-                        const ip4_addr_t *ipaddr,
-                        const ip4_addr_t *netmask,
-                        const ip4_addr_t *gw)
-{
-  err_t err;
-  NETIFAPI_VAR_DECLARE(msg);
-  NETIFAPI_VAR_ALLOC(msg);
-
-  if (ipaddr == NULL) {
-    ipaddr = IP4_ADDR_ANY4;
-  }
-  if (netmask == NULL) {
-    netmask = IP4_ADDR_ANY4;
-  }
-  if (gw == NULL) {
-    gw = IP4_ADDR_ANY4;
-  }
-
-  NETIFAPI_VAR_REF(msg).netif = netif;
-  NETIFAPI_VAR_REF(msg).msg.add.ipaddr  = NETIFAPI_VAR_REF(ipaddr);
-  NETIFAPI_VAR_REF(msg).msg.add.netmask = NETIFAPI_VAR_REF(netmask);
-  NETIFAPI_VAR_REF(msg).msg.add.gw      = NETIFAPI_VAR_REF(gw);
-  err = tcpip_api_call(netifapi_do_netif_set_addr, &API_VAR_REF(msg).call);
-  NETIFAPI_VAR_FREE(msg);
-  return err;
-}
-#endif /* LWIP_IPV4 */
-
-/**
- * call the "errtfunc" (or the "voidfunc" if "errtfunc" is NULL) in a thread-safe
- * way by running that function inside the tcpip_thread context.
- *
- * @note use only for functions where there is only "netif" parameter.
- */
-err_t
-netifapi_netif_common(struct netif *netif, netifapi_void_fn voidfunc,
-                       netifapi_errt_fn errtfunc)
-{
-  err_t err;
-  NETIFAPI_VAR_DECLARE(msg);
-  NETIFAPI_VAR_ALLOC(msg);
-
-  NETIFAPI_VAR_REF(msg).netif = netif;
-  NETIFAPI_VAR_REF(msg).msg.common.voidfunc = voidfunc;
-  NETIFAPI_VAR_REF(msg).msg.common.errtfunc = errtfunc;
-  err = tcpip_api_call(netifapi_do_netif_common, &API_VAR_REF(msg).call);
-  NETIFAPI_VAR_FREE(msg);
-  return err;
-}
-
-#endif /* LWIP_NETIF_API */
diff --git a/sys/net/api/sockets.c b/sys/net/api/sockets.c
deleted file mode 100644
index 884922b..0000000
--- a/sys/net/api/sockets.c
+++ /dev/null
@@ -1,2824 +0,0 @@
-/**
- * @file
- * Sockets BSD-Like API module
- *
- * @defgroup socket Socket API
- * @ingroup sequential_api
- * BSD-style socket API.\n
- * Thread-safe, to be called from non-TCPIP threads only.\n
- * Can be activated by defining @ref LWIP_SOCKET to 1.\n
- * Header is in posix/sys/socket.h\b
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- * Improved by Marc Boucher <marc@mbsi.ca> and David Haas <dhaas@alum.rpi.edu>
- *
- */
-
-#include <net/opt.h>
-
-#if LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
-
-#include <net/sockets.h>
-#include <net/api.h>
-#include <net/sys.h>
-#include <net/igmp.h>
-#include <net/inet.h>
-#include <net/tcp.h>
-#include <net/raw.h>
-#include <net/udp.h>
-#include <net/memp.h>
-#include <net/pbuf.h>
-#include <net/priv/tcpip_priv.h>
-#if LWIP_CHECKSUM_ON_COPY
-#include <net/inet_chksum.h>
-#endif
-
-#include <string.h>
-
-/* If the netconn API is not required publicly, then we include the necessary
-   files here to get the implementation */
-#if !LWIP_NETCONN
-#undef LWIP_NETCONN
-#define LWIP_NETCONN 1
-#include "api_msg.c"
-#include "api_lib.c"
-#include "netbuf.c"
-#undef LWIP_NETCONN
-#define LWIP_NETCONN 0
-#endif
-
-#if LWIP_IPV4
-#define IP4ADDR_PORT_TO_SOCKADDR(sin, ipaddr, port) do { \
-      (sin)->sin_len = sizeof(struct sockaddr_in); \
-      (sin)->sin_family = AF_INET; \
-      (sin)->sin_port = lwip_htons((port)); \
-      inet_addr_from_ip4addr(&(sin)->sin_addr, ipaddr); \
-      memset((sin)->sin_zero, 0, SIN_ZERO_LEN); }while(0)
-#define SOCKADDR4_TO_IP4ADDR_PORT(sin, ipaddr, port) do { \
-    inet_addr_to_ip4addr(ip_2_ip4(ipaddr), &((sin)->sin_addr)); \
-    (port) = lwip_ntohs((sin)->sin_port); }while(0)
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-#define IP6ADDR_PORT_TO_SOCKADDR(sin6, ipaddr, port) do { \
-      (sin6)->sin6_len = sizeof(struct sockaddr_in6); \
-      (sin6)->sin6_family = AF_INET6; \
-      (sin6)->sin6_port = lwip_htons((port)); \
-      (sin6)->sin6_flowinfo = 0; \
-      inet6_addr_from_ip6addr(&(sin6)->sin6_addr, ipaddr); \
-      (sin6)->sin6_scope_id = 0; }while(0)
-#define SOCKADDR6_TO_IP6ADDR_PORT(sin6, ipaddr, port) do { \
-    inet6_addr_to_ip6addr(ip_2_ip6(ipaddr), &((sin6)->sin6_addr)); \
-    (port) = lwip_ntohs((sin6)->sin6_port); }while(0)
-#endif /* LWIP_IPV6 */
-
-#if LWIP_IPV4 && LWIP_IPV6
-static void sockaddr_to_ipaddr_port(const struct sockaddr* sockaddr, ip_addr_t* ipaddr, u16_t* port);
-
-#define IS_SOCK_ADDR_LEN_VALID(namelen)  (((namelen) == sizeof(struct sockaddr_in)) || \
-                                         ((namelen) == sizeof(struct sockaddr_in6)))
-#define IS_SOCK_ADDR_TYPE_VALID(name)    (((name)->sa_family == AF_INET) || \
-                                         ((name)->sa_family == AF_INET6))
-#define SOCK_ADDR_TYPE_MATCH(name, sock) \
-       ((((name)->sa_family == AF_INET) && !(NETCONNTYPE_ISIPV6((sock)->conn->type))) || \
-       (((name)->sa_family == AF_INET6) && (NETCONNTYPE_ISIPV6((sock)->conn->type))))
-#define IPADDR_PORT_TO_SOCKADDR(sockaddr, ipaddr, port) do { \
-    if (IP_IS_V6(ipaddr)) { \
-      IP6ADDR_PORT_TO_SOCKADDR((struct sockaddr_in6*)(void*)(sockaddr), ip_2_ip6(ipaddr), port); \
-    } else { \
-      IP4ADDR_PORT_TO_SOCKADDR((struct sockaddr_in*)(void*)(sockaddr), ip_2_ip4(ipaddr), port); \
-    } } while(0)
-#define SOCKADDR_TO_IPADDR_PORT(sockaddr, ipaddr, port) sockaddr_to_ipaddr_port(sockaddr, ipaddr, &(port))
-#define DOMAIN_TO_NETCONN_TYPE(domain, type) (((domain) == AF_INET) ? \
-  (type) : (enum netconn_type)((type) | NETCONN_TYPE_IPV6))
-#elif LWIP_IPV6 /* LWIP_IPV4 && LWIP_IPV6 */
-#define IS_SOCK_ADDR_LEN_VALID(namelen)  ((namelen) == sizeof(struct sockaddr_in6))
-#define IS_SOCK_ADDR_TYPE_VALID(name)    ((name)->sa_family == AF_INET6)
-#define SOCK_ADDR_TYPE_MATCH(name, sock) 1
-#define IPADDR_PORT_TO_SOCKADDR(sockaddr, ipaddr, port) \
-        IP6ADDR_PORT_TO_SOCKADDR((struct sockaddr_in6*)(void*)(sockaddr), ip_2_ip6(ipaddr), port)
-#define SOCKADDR_TO_IPADDR_PORT(sockaddr, ipaddr, port) \
-        SOCKADDR6_TO_IP6ADDR_PORT((const struct sockaddr_in6*)(const void*)(sockaddr), ipaddr, port)
-#define DOMAIN_TO_NETCONN_TYPE(domain, netconn_type) (netconn_type)
-#else /*-> LWIP_IPV4: LWIP_IPV4 && LWIP_IPV6 */
-#define IS_SOCK_ADDR_LEN_VALID(namelen)  ((namelen) == sizeof(struct sockaddr_in))
-#define IS_SOCK_ADDR_TYPE_VALID(name)    ((name)->sa_family == AF_INET)
-#define SOCK_ADDR_TYPE_MATCH(name, sock) 1
-#define IPADDR_PORT_TO_SOCKADDR(sockaddr, ipaddr, port) \
-        IP4ADDR_PORT_TO_SOCKADDR((struct sockaddr_in*)(void*)(sockaddr), ip_2_ip4(ipaddr), port)
-#define SOCKADDR_TO_IPADDR_PORT(sockaddr, ipaddr, port) \
-        SOCKADDR4_TO_IP4ADDR_PORT((const struct sockaddr_in*)(const void*)(sockaddr), ipaddr, port)
-#define DOMAIN_TO_NETCONN_TYPE(domain, netconn_type) (netconn_type)
-#endif /* LWIP_IPV6 */
-
-#define IS_SOCK_ADDR_TYPE_VALID_OR_UNSPEC(name)    (((name)->sa_family == AF_UNSPEC) || \
-                                                    IS_SOCK_ADDR_TYPE_VALID(name))
-#define SOCK_ADDR_TYPE_MATCH_OR_UNSPEC(name, sock) (((name)->sa_family == AF_UNSPEC) || \
-                                                    SOCK_ADDR_TYPE_MATCH(name, sock))
-#define IS_SOCK_ADDR_ALIGNED(name)      ((((mem_ptr_t)(name)) % 4) == 0)
-
-
-#define LWIP_SOCKOPT_CHECK_OPTLEN(optlen, opttype) do { if ((optlen) < sizeof(opttype)) { return EINVAL; }}while(0)
-#define LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, optlen, opttype) do { \
-  LWIP_SOCKOPT_CHECK_OPTLEN(optlen, opttype); \
-  if ((sock)->conn == NULL) { return EINVAL; } }while(0)
-#define LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, optlen, opttype) do { \
-  LWIP_SOCKOPT_CHECK_OPTLEN(optlen, opttype); \
-  if (((sock)->conn == NULL) || ((sock)->conn->pcb.tcp == NULL)) { return EINVAL; } }while(0)
-#define LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, opttype, netconntype) do { \
-  LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, optlen, opttype); \
-  if (NETCONNTYPE_GROUP(netconn_type((sock)->conn)) != netconntype) { return ENOPROTOOPT; } }while(0)
-
-
-#define LWIP_SETGETSOCKOPT_DATA_VAR_REF(name)     API_VAR_REF(name)
-#define LWIP_SETGETSOCKOPT_DATA_VAR_DECLARE(name) API_VAR_DECLARE(struct lwip_setgetsockopt_data, name)
-#define LWIP_SETGETSOCKOPT_DATA_VAR_FREE(name)    API_VAR_FREE(MEMP_SOCKET_SETGETSOCKOPT_DATA, name)
-#if LWIP_MPU_COMPATIBLE
-#define LWIP_SETGETSOCKOPT_DATA_VAR_ALLOC(name, sock) do { \
-  name = (struct lwip_setgetsockopt_data *)memp_malloc(MEMP_SOCKET_SETGETSOCKOPT_DATA); \
-  if (name == NULL) { \
-    sock_set_errno(sock, ENOMEM); \
-    return -1; \
-  } }while(0)
-#else /* LWIP_MPU_COMPATIBLE */
-#define LWIP_SETGETSOCKOPT_DATA_VAR_ALLOC(name, sock)
-#endif /* LWIP_MPU_COMPATIBLE */
-
-#if LWIP_SO_SNDRCVTIMEO_NONSTANDARD
-#define LWIP_SO_SNDRCVTIMEO_OPTTYPE int
-#define LWIP_SO_SNDRCVTIMEO_SET(optval, val) (*(int *)(optval) = (val))
-#define LWIP_SO_SNDRCVTIMEO_GET_MS(optval)   ((s32_t)*(const int*)(optval))
-#else
-#define LWIP_SO_SNDRCVTIMEO_OPTTYPE struct timeval
-#define LWIP_SO_SNDRCVTIMEO_SET(optval, val)  do { \
-  s32_t loc = (val); \
-  ((struct timeval *)(optval))->tv_sec = (loc) / 1000U; \
-  ((struct timeval *)(optval))->tv_usec = ((loc) % 1000U) * 1000U; }while(0)
-#define LWIP_SO_SNDRCVTIMEO_GET_MS(optval) ((((const struct timeval *)(optval))->tv_sec * 1000U) + (((const struct timeval *)(optval))->tv_usec / 1000U))
-#endif
-
-#define NUM_SOCKETS MEMP_NUM_NETCONN
-
-/** This is overridable for the rare case where more than 255 threads
- * select on the same socket...
- */
-#ifndef SELWAIT_T
-#define SELWAIT_T u8_t
-#endif
-
-/** Contains all internal pointers and states used for a socket */
-struct lwip_sock {
-  /** sockets currently are built on netconns, each socket has one netconn */
-  struct netconn *conn;
-  /** data that was left from the previous read */
-  void *lastdata;
-  /** offset in the data that was left from the previous read */
-  u16_t lastoffset;
-  /** number of times data was received, set by event_callback(),
-      tested by the receive and select functions */
-  s16_t rcvevent;
-  /** number of times data was ACKed (free send buffer), set by event_callback(),
-      tested by select */
-  u16_t sendevent;
-  /** error happened for this socket, set by event_callback(), tested by select */
-  u16_t errevent;
-  /** last error that occurred on this socket (in fact, all our errnos fit into an u8_t) */
-  u8_t err;
-  /** counter of how many threads are waiting for this socket using select */
-  SELWAIT_T select_waiting;
-};
-
-#if LWIP_NETCONN_SEM_PER_THREAD
-#define SELECT_SEM_T        sys_sem_t*
-#define SELECT_SEM_PTR(sem) (sem)
-#else /* LWIP_NETCONN_SEM_PER_THREAD */
-#define SELECT_SEM_T        sys_sem_t
-#define SELECT_SEM_PTR(sem) (&(sem))
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-/** Description for a task waiting in select */
-struct lwip_select_cb {
-  /** Pointer to the next waiting task */
-  struct lwip_select_cb *next;
-  /** Pointer to the previous waiting task */
-  struct lwip_select_cb *prev;
-  /** readset passed to select */
-  fd_set *readset;
-  /** writeset passed to select */
-  fd_set *writeset;
-  /** unimplemented: exceptset passed to select */
-  fd_set *exceptset;
-  /** don't signal the same semaphore twice: set to 1 when signalled */
-  int sem_signalled;
-  /** semaphore to wake up a task waiting for select */
-  SELECT_SEM_T sem;
-};
-
-/** A struct sockaddr replacement that has the same alignment as sockaddr_in/
- *  sockaddr_in6 if instantiated.
- */
-union sockaddr_aligned {
-   struct sockaddr sa;
-#if LWIP_IPV6
-   struct sockaddr_in6 sin6;
-#endif /* LWIP_IPV6 */
-#if LWIP_IPV4
-   struct sockaddr_in sin;
-#endif /* LWIP_IPV4 */
-};
-
-#if LWIP_IGMP
-/* Define the number of IPv4 multicast memberships, default is one per socket */
-#ifndef LWIP_SOCKET_MAX_MEMBERSHIPS
-#define LWIP_SOCKET_MAX_MEMBERSHIPS NUM_SOCKETS
-#endif
-
-/* This is to keep track of IP_ADD_MEMBERSHIP calls to drop the membership when
-   a socket is closed */
-struct lwip_socket_multicast_pair {
-  /** the socket */
-  struct lwip_sock* sock;
-  /** the interface address */
-  ip4_addr_t if_addr;
-  /** the group address */
-  ip4_addr_t multi_addr;
-};
-
-struct lwip_socket_multicast_pair socket_ipv4_multicast_memberships[LWIP_SOCKET_MAX_MEMBERSHIPS];
-
-static int  lwip_socket_register_membership(int s, const ip4_addr_t *if_addr, const ip4_addr_t *multi_addr);
-static void lwip_socket_unregister_membership(int s, const ip4_addr_t *if_addr, const ip4_addr_t *multi_addr);
-static void lwip_socket_drop_registered_memberships(int s);
-#endif /* LWIP_IGMP */
-
-/** The global array of available sockets */
-static struct lwip_sock sockets[NUM_SOCKETS];
-/** The global list of tasks waiting for select */
-static struct lwip_select_cb *select_cb_list;
-/** This counter is increased from lwip_select when the list is changed
-    and checked in event_callback to see if it has changed. */
-static volatile int select_cb_ctr;
-
-#if LWIP_SOCKET_SET_ERRNO
-#ifndef set_errno
-#define set_errno(err) do { if (err) { errno = (err); } } while(0)
-#endif
-#else /* LWIP_SOCKET_SET_ERRNO */
-#define set_errno(err)
-#endif /* LWIP_SOCKET_SET_ERRNO */
-
-#define sock_set_errno(sk, e) do { \
-  const int sockerr = (e); \
-  sk->err = (u8_t)sockerr; \
-  set_errno(sockerr); \
-} while (0)
-
-/* Forward declaration of some functions */
-static void event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len);
-#if !LWIP_TCPIP_CORE_LOCKING
-static void lwip_getsockopt_callback(void *arg);
-static void lwip_setsockopt_callback(void *arg);
-#endif
-static u8_t lwip_getsockopt_impl(int s, int level, int optname, void *optval, socklen_t *optlen);
-static u8_t lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_t optlen);
-
-#if LWIP_IPV4 && LWIP_IPV6
-static void
-sockaddr_to_ipaddr_port(const struct sockaddr* sockaddr, ip_addr_t* ipaddr, u16_t* port)
-{
-  if ((sockaddr->sa_family) == AF_INET6) {
-    SOCKADDR6_TO_IP6ADDR_PORT((const struct sockaddr_in6*)(const void*)(sockaddr), ipaddr, *port);
-    ipaddr->type = IPADDR_TYPE_V6;
-  } else {
-    SOCKADDR4_TO_IP4ADDR_PORT((const struct sockaddr_in*)(const void*)(sockaddr), ipaddr, *port);
-    ipaddr->type = IPADDR_TYPE_V4;
-  }
-}
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-/** LWIP_NETCONN_SEM_PER_THREAD==1: initialize thread-local semaphore */
-void
-lwip_socket_thread_init(void)
-{
-   netconn_thread_init();
-}
-
-/** LWIP_NETCONN_SEM_PER_THREAD==1: destroy thread-local semaphore */
-void
-lwip_socket_thread_cleanup(void)
-{
-   netconn_thread_cleanup();
-}
-
-/**
- * Map a externally used socket index to the internal socket representation.
- *
- * @param s externally used socket index
- * @return struct lwip_sock for the socket or NULL if not found
- */
-static struct lwip_sock *
-get_socket(int s)
-{
-  struct lwip_sock *sock;
-
-  s -= LWIP_SOCKET_OFFSET;
-
-  if ((s < 0) || (s >= NUM_SOCKETS)) {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("get_socket(%d): invalid\n", s + LWIP_SOCKET_OFFSET));
-    set_errno(EBADF);
-    return NULL;
-  }
-
-  sock = &sockets[s];
-
-  if (!sock->conn) {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("get_socket(%d): not active\n", s + LWIP_SOCKET_OFFSET));
-    set_errno(EBADF);
-    return NULL;
-  }
-
-  return sock;
-}
-
-/**
- * Same as get_socket but doesn't set errno
- *
- * @param s externally used socket index
- * @return struct lwip_sock for the socket or NULL if not found
- */
-static struct lwip_sock *
-tryget_socket(int s)
-{
-  s -= LWIP_SOCKET_OFFSET;
-  if ((s < 0) || (s >= NUM_SOCKETS)) {
-    return NULL;
-  }
-  if (!sockets[s].conn) {
-    return NULL;
-  }
-  return &sockets[s];
-}
-
-/**
- * Allocate a new socket for a given netconn.
- *
- * @param newconn the netconn for which to allocate a socket
- * @param accepted 1 if socket has been created by accept(),
- *                 0 if socket has been created by socket()
- * @return the index of the new socket; -1 on error
- */
-static int
-alloc_socket(struct netconn *newconn, int accepted)
-{
-  int i;
-  SYS_ARCH_DECL_PROTECT(lev);
-
-  /* allocate a new socket identifier */
-  for (i = 0; i < NUM_SOCKETS; ++i) {
-    /* Protect socket array */
-    SYS_ARCH_PROTECT(lev);
-    if (!sockets[i].conn && (sockets[i].select_waiting == 0)) {
-      sockets[i].conn       = newconn;
-      /* The socket is not yet known to anyone, so no need to protect
-         after having marked it as used. */
-      SYS_ARCH_UNPROTECT(lev);
-      sockets[i].lastdata   = NULL;
-      sockets[i].lastoffset = 0;
-      sockets[i].rcvevent   = 0;
-      /* TCP sendbuf is empty, but the socket is not yet writable until connected
-       * (unless it has been created by accept()). */
-      sockets[i].sendevent  = (NETCONNTYPE_GROUP(newconn->type) == NETCONN_TCP ? (accepted != 0) : 1);
-      sockets[i].errevent   = 0;
-      sockets[i].err        = 0;
-      return i + LWIP_SOCKET_OFFSET;
-    }
-    SYS_ARCH_UNPROTECT(lev);
-  }
-  return -1;
-}
-
-/** Free a socket. The socket's netconn must have been
- * delete before!
- *
- * @param sock the socket to free
- * @param is_tcp != 0 for TCP sockets, used to free lastdata
- */
-static void
-free_socket(struct lwip_sock *sock, int is_tcp)
-{
-  void *lastdata;
-
-  lastdata         = sock->lastdata;
-  sock->lastdata   = NULL;
-  sock->lastoffset = 0;
-  sock->err        = 0;
-
-  /* Protect socket array */
-  SYS_ARCH_SET(sock->conn, NULL);
-  /* don't use 'sock' after this line, as another task might have allocated it */
-
-  if (lastdata != NULL) {
-    if (is_tcp) {
-      pbuf_free((struct pbuf *)lastdata);
-    } else {
-      netbuf_delete((struct netbuf *)lastdata);
-    }
-  }
-}
-
-/* Below this, the well-known socket functions are implemented.
- * Use google.com or opengroup.org to get a good description :-)
- *
- * Exceptions are documented!
- */
-
-int
-lwip_accept(int s, struct sockaddr *addr, socklen_t *addrlen)
-{
-  struct lwip_sock *sock, *nsock;
-  struct netconn *newconn;
-  ip_addr_t naddr;
-  u16_t port = 0;
-  int newsock;
-  err_t err;
-  SYS_ARCH_DECL_PROTECT(lev);
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d)...\n", s));
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  if (netconn_is_nonblocking(sock->conn) && (sock->rcvevent <= 0)) {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d): returning EWOULDBLOCK\n", s));
-    set_errno(EWOULDBLOCK);
-    return -1;
-  }
-
-  /* wait for a new connection */
-  err = netconn_accept(sock->conn, &newconn);
-  if (err != ERR_OK) {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d): netconn_acept failed, err=%d\n", s, err));
-    if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) != NETCONN_TCP) {
-      sock_set_errno(sock, EOPNOTSUPP);
-    } else if (err == ERR_CLSD) {
-      sock_set_errno(sock, EINVAL);
-    } else {
-      sock_set_errno(sock, err_to_errno(err));
-    }
-    return -1;
-  }
-  LWIP_ASSERT("newconn != NULL", newconn != NULL);
-
-  newsock = alloc_socket(newconn, 1);
-  if (newsock == -1) {
-    netconn_delete(newconn);
-    sock_set_errno(sock, ENFILE);
-    return -1;
-  }
-  LWIP_ASSERT("invalid socket index", (newsock >= LWIP_SOCKET_OFFSET) && (newsock < NUM_SOCKETS + LWIP_SOCKET_OFFSET));
-  LWIP_ASSERT("newconn->callback == event_callback", newconn->callback == event_callback);
-  nsock = &sockets[newsock - LWIP_SOCKET_OFFSET];
-
-  /* See event_callback: If data comes in right away after an accept, even
-   * though the server task might not have created a new socket yet.
-   * In that case, newconn->socket is counted down (newconn->socket--),
-   * so nsock->rcvevent is >= 1 here!
-   */
-  SYS_ARCH_PROTECT(lev);
-  nsock->rcvevent += (s16_t)(-1 - newconn->socket);
-  newconn->socket = newsock;
-  SYS_ARCH_UNPROTECT(lev);
-
-  /* Note that POSIX only requires us to check addr is non-NULL. addrlen must
-   * not be NULL if addr is valid.
-   */
-  if (addr != NULL) {
-    union sockaddr_aligned tempaddr;
-    /* get the IP address and port of the remote host */
-    err = netconn_peer(newconn, &naddr, &port);
-    if (err != ERR_OK) {
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d): netconn_peer failed, err=%d\n", s, err));
-      netconn_delete(newconn);
-      free_socket(nsock, 1);
-      sock_set_errno(sock, err_to_errno(err));
-      return -1;
-    }
-    LWIP_ASSERT("addr valid but addrlen NULL", addrlen != NULL);
-
-    IPADDR_PORT_TO_SOCKADDR(&tempaddr, &naddr, port);
-    if (*addrlen > tempaddr.sa.sa_len) {
-      *addrlen = tempaddr.sa.sa_len;
-    }
-    MEMCPY(addr, &tempaddr, *addrlen);
-
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d) returning new sock=%d addr=", s, newsock));
-    ip_addr_debug_print_val(SOCKETS_DEBUG, naddr);
-    LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F"\n", port));
-  } else {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_accept(%d) returning new sock=%d", s, newsock));
-  }
-
-  sock_set_errno(sock, 0);
-  return newsock;
-}
-
-int
-lwip_bind(int s, const struct sockaddr *name, socklen_t namelen)
-{
-  struct lwip_sock *sock;
-  ip_addr_t local_addr;
-  u16_t local_port;
-  err_t err;
-
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  if (!SOCK_ADDR_TYPE_MATCH(name, sock)) {
-    /* sockaddr does not match socket type (IPv4/IPv6) */
-    sock_set_errno(sock, err_to_errno(ERR_VAL));
-    return -1;
-  }
-
-  /* check size, family and alignment of 'name' */
-  LWIP_ERROR("lwip_bind: invalid address", (IS_SOCK_ADDR_LEN_VALID(namelen) &&
-             IS_SOCK_ADDR_TYPE_VALID(name) && IS_SOCK_ADDR_ALIGNED(name)),
-             sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
-  LWIP_UNUSED_ARG(namelen);
-
-  SOCKADDR_TO_IPADDR_PORT(name, &local_addr, local_port);
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_bind(%d, addr=", s));
-  ip_addr_debug_print_val(SOCKETS_DEBUG, local_addr);
-  LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F")\n", local_port));
-
-#if LWIP_IPV4 && LWIP_IPV6
-  /* Dual-stack: Unmap IPv4 mapped IPv6 addresses */
-  if (IP_IS_V6_VAL(local_addr) && ip6_addr_isipv4mappedipv6(ip_2_ip6(&local_addr))) {
-    unmap_ipv4_mapped_ipv6(ip_2_ip4(&local_addr), ip_2_ip6(&local_addr));
-    IP_SET_TYPE_VAL(local_addr, IPADDR_TYPE_V4);
-  }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-  err = netconn_bind(sock->conn, &local_addr, local_port);
-
-  if (err != ERR_OK) {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_bind(%d) failed, err=%d\n", s, err));
-    sock_set_errno(sock, err_to_errno(err));
-    return -1;
-  }
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_bind(%d) succeeded\n", s));
-  sock_set_errno(sock, 0);
-  return 0;
-}
-
-int
-lwip_close(int s)
-{
-  struct lwip_sock *sock;
-  int is_tcp = 0;
-  err_t err;
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_close(%d)\n", s));
-
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  if (sock->conn != NULL) {
-    is_tcp = NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP;
-  } else {
-    LWIP_ASSERT("sock->lastdata == NULL", sock->lastdata == NULL);
-  }
-
-#if LWIP_IGMP
-  /* drop all possibly joined IGMP memberships */
-  lwip_socket_drop_registered_memberships(s);
-#endif /* LWIP_IGMP */
-
-  err = netconn_delete(sock->conn);
-  if (err != ERR_OK) {
-    sock_set_errno(sock, err_to_errno(err));
-    return -1;
-  }
-
-  free_socket(sock, is_tcp);
-  set_errno(0);
-  return 0;
-}
-
-int
-lwip_connect(int s, const struct sockaddr *name, socklen_t namelen)
-{
-  struct lwip_sock *sock;
-  err_t err;
-
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  if (!SOCK_ADDR_TYPE_MATCH_OR_UNSPEC(name, sock)) {
-    /* sockaddr does not match socket type (IPv4/IPv6) */
-    sock_set_errno(sock, err_to_errno(ERR_VAL));
-    return -1;
-  }
-
-  LWIP_UNUSED_ARG(namelen);
-  if (name->sa_family == AF_UNSPEC) {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_connect(%d, AF_UNSPEC)\n", s));
-    err = netconn_disconnect(sock->conn);
-  } else {
-    ip_addr_t remote_addr;
-    u16_t remote_port;
-
-    /* check size, family and alignment of 'name' */
-    LWIP_ERROR("lwip_connect: invalid address", IS_SOCK_ADDR_LEN_VALID(namelen) &&
-               IS_SOCK_ADDR_TYPE_VALID_OR_UNSPEC(name) && IS_SOCK_ADDR_ALIGNED(name),
-               sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
-
-    SOCKADDR_TO_IPADDR_PORT(name, &remote_addr, remote_port);
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_connect(%d, addr=", s));
-    ip_addr_debug_print_val(SOCKETS_DEBUG, remote_addr);
-    LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F")\n", remote_port));
-
-#if LWIP_IPV4 && LWIP_IPV6
-    /* Dual-stack: Unmap IPv4 mapped IPv6 addresses */
-    if (IP_IS_V6_VAL(remote_addr) && ip6_addr_isipv4mappedipv6(ip_2_ip6(&remote_addr))) {
-      unmap_ipv4_mapped_ipv6(ip_2_ip4(&remote_addr), ip_2_ip6(&remote_addr));
-      IP_SET_TYPE_VAL(remote_addr, IPADDR_TYPE_V4);
-    }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-    err = netconn_connect(sock->conn, &remote_addr, remote_port);
-  }
-
-  if (err != ERR_OK) {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_connect(%d) failed, err=%d\n", s, err));
-    sock_set_errno(sock, err_to_errno(err));
-    return -1;
-  }
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_connect(%d) succeeded\n", s));
-  sock_set_errno(sock, 0);
-  return 0;
-}
-
-/**
- * Set a socket into listen mode.
- * The socket may not have been used for another connection previously.
- *
- * @param s the socket to set to listening mode
- * @param backlog (ATTENTION: needs TCP_LISTEN_BACKLOG=1)
- * @return 0 on success, non-zero on failure
- */
-int
-lwip_listen(int s, int backlog)
-{
-  struct lwip_sock *sock;
-  err_t err;
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_listen(%d, backlog=%d)\n", s, backlog));
-
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  /* limit the "backlog" parameter to fit in an u8_t */
-  backlog = LWIP_MIN(LWIP_MAX(backlog, 0), 0xff);
-
-  err = netconn_listen_with_backlog(sock->conn, (u8_t)backlog);
-
-  if (err != ERR_OK) {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_listen(%d) failed, err=%d\n", s, err));
-    if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) != NETCONN_TCP) {
-      sock_set_errno(sock, EOPNOTSUPP);
-      return -1;
-    }
-    sock_set_errno(sock, err_to_errno(err));
-    return -1;
-  }
-
-  sock_set_errno(sock, 0);
-  return 0;
-}
-
-int
-lwip_recvfrom(int s, void *mem, size_t len, int flags,
-              struct sockaddr *from, socklen_t *fromlen)
-{
-  struct lwip_sock *sock;
-  void             *buf = NULL;
-  struct pbuf      *p;
-  u16_t            buflen, copylen;
-  int              off = 0;
-  u8_t             done = 0;
-  err_t            err;
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d, %p, %"SZT_F", 0x%x, ..)\n", s, mem, len, flags));
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  do {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: top while sock->lastdata=%p\n", sock->lastdata));
-    /* Check if there is data left from the last recv operation. */
-    if (sock->lastdata) {
-      buf = sock->lastdata;
-    } else {
-      /* If this is non-blocking call, then check first */
-      if (((flags & MSG_DONTWAIT) || netconn_is_nonblocking(sock->conn)) &&
-          (sock->rcvevent <= 0)) {
-        if (off > 0) {
-          /* already received data, return that */
-          sock_set_errno(sock, 0);
-          return off;
-        }
-        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): returning EWOULDBLOCK\n", s));
-        set_errno(EWOULDBLOCK);
-        return -1;
-      }
-
-      /* No data was left from the previous operation, so we try to get
-         some from the network. */
-      if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) {
-        err = netconn_recv_tcp_pbuf(sock->conn, (struct pbuf **)&buf);
-      } else {
-        err = netconn_recv(sock->conn, (struct netbuf **)&buf);
-      }
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: netconn_recv err=%d, netbuf=%p\n",
-        err, buf));
-
-      if (err != ERR_OK) {
-        if (off > 0) {
-          if (err == ERR_CLSD) {
-            /* closed but already received data, ensure select gets the FIN, too */
-            event_callback(sock->conn, NETCONN_EVT_RCVPLUS, 0);
-          }
-          /* already received data, return that */
-          sock_set_errno(sock, 0);
-          return off;
-        }
-        /* We should really do some error checking here. */
-        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): buf == NULL, error is \"%s\"!\n",
-          s, lwip_strerr(err)));
-        sock_set_errno(sock, err_to_errno(err));
-        if (err == ERR_CLSD) {
-          return 0;
-        } else {
-          return -1;
-        }
-      }
-      LWIP_ASSERT("buf != NULL", buf != NULL);
-      sock->lastdata = buf;
-    }
-
-    if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) {
-      p = (struct pbuf *)buf;
-    } else {
-      p = ((struct netbuf *)buf)->p;
-    }
-    buflen = p->tot_len;
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: buflen=%"U16_F" len=%"SZT_F" off=%d sock->lastoffset=%"U16_F"\n",
-      buflen, len, off, sock->lastoffset));
-
-    buflen -= sock->lastoffset;
-
-    if (len > buflen) {
-      copylen = buflen;
-    } else {
-      copylen = (u16_t)len;
-    }
-
-    /* copy the contents of the received buffer into
-    the supplied memory pointer mem */
-    pbuf_copy_partial(p, (u8_t*)mem + off, copylen, sock->lastoffset);
-
-    off += copylen;
-
-    if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) {
-      LWIP_ASSERT("invalid copylen, len would underflow", len >= copylen);
-      len -= copylen;
-      if ((len <= 0) ||
-          (p->flags & PBUF_FLAG_PUSH) ||
-          (sock->rcvevent <= 0) ||
-          ((flags & MSG_PEEK) != 0)) {
-        done = 1;
-      }
-    } else {
-      done = 1;
-    }
-
-    /* Check to see from where the data was.*/
-    if (done) {
-#if !SOCKETS_DEBUG
-      if (from && fromlen)
-#endif /* !SOCKETS_DEBUG */
-      {
-        u16_t port;
-        ip_addr_t tmpaddr;
-        ip_addr_t *fromaddr;
-        union sockaddr_aligned saddr;
-        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom(%d): addr=", s));
-        if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) {
-          fromaddr = &tmpaddr;
-          netconn_getaddr(sock->conn, fromaddr, &port, 0);
-        } else {
-          port = netbuf_fromport((struct netbuf *)buf);
-          fromaddr = netbuf_fromaddr((struct netbuf *)buf);
-        }
-
-#if LWIP_IPV4 && LWIP_IPV6
-        /* Dual-stack: Map IPv4 addresses to IPv4 mapped IPv6 */
-        if (NETCONNTYPE_ISIPV6(netconn_type(sock->conn)) && IP_IS_V4(fromaddr)) {
-          ip4_2_ipv4_mapped_ipv6(ip_2_ip6(fromaddr), ip_2_ip4(fromaddr));
-          IP_SET_TYPE(fromaddr, IPADDR_TYPE_V6);
-        }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-        IPADDR_PORT_TO_SOCKADDR(&saddr, fromaddr, port);
-        ip_addr_debug_print(SOCKETS_DEBUG, fromaddr);
-        LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F" len=%d\n", port, off));
-#if SOCKETS_DEBUG
-        if (from && fromlen)
-#endif /* SOCKETS_DEBUG */
-        {
-          if (*fromlen > saddr.sa.sa_len) {
-            *fromlen = saddr.sa.sa_len;
-          }
-          MEMCPY(from, &saddr, *fromlen);
-        }
-      }
-    }
-
-    /* If we don't peek the incoming message... */
-    if ((flags & MSG_PEEK) == 0) {
-      /* If this is a TCP socket, check if there is data left in the
-         buffer. If so, it should be saved in the sock structure for next
-         time around. */
-      if ((NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) && (buflen - copylen > 0)) {
-        sock->lastdata = buf;
-        sock->lastoffset += copylen;
-        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: lastdata now netbuf=%p\n", buf));
-      } else {
-        sock->lastdata = NULL;
-        sock->lastoffset = 0;
-        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_recvfrom: deleting netbuf=%p\n", buf));
-        if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) {
-          pbuf_free((struct pbuf *)buf);
-        } else {
-          netbuf_delete((struct netbuf *)buf);
-        }
-        buf = NULL;
-      }
-    }
-  } while (!done);
-
-  sock_set_errno(sock, 0);
-  return off;
-}
-
-int
-lwip_read(int s, void *mem, size_t len)
-{
-  return lwip_recvfrom(s, mem, len, 0, NULL, NULL);
-}
-
-int
-lwip_recv(int s, void *mem, size_t len, int flags)
-{
-  return lwip_recvfrom(s, mem, len, flags, NULL, NULL);
-}
-
-int
-lwip_send(int s, const void *data, size_t size, int flags)
-{
-  struct lwip_sock *sock;
-  err_t err;
-  u8_t write_flags;
-  size_t written;
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_send(%d, data=%p, size=%"SZT_F", flags=0x%x)\n",
-                              s, data, size, flags));
-
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) != NETCONN_TCP) {
-#if (LWIP_UDP || LWIP_RAW)
-    return lwip_sendto(s, data, size, flags, NULL, 0);
-#else /* (LWIP_UDP || LWIP_RAW) */
-    sock_set_errno(sock, err_to_errno(ERR_ARG));
-    return -1;
-#endif /* (LWIP_UDP || LWIP_RAW) */
-  }
-
-  write_flags = NETCONN_COPY |
-    ((flags & MSG_MORE)     ? NETCONN_MORE      : 0) |
-    ((flags & MSG_DONTWAIT) ? NETCONN_DONTBLOCK : 0);
-  written = 0;
-  err = netconn_write_partly(sock->conn, data, size, write_flags, &written);
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_send(%d) err=%d written=%"SZT_F"\n", s, err, written));
-  sock_set_errno(sock, err_to_errno(err));
-  return (err == ERR_OK ? (int)written : -1);
-}
-
-int
-lwip_sendmsg(int s, const struct msghdr *msg, int flags)
-{
-  struct lwip_sock *sock;
-  int i;
-#if LWIP_TCP
-  u8_t write_flags;
-  size_t written;
-#endif
-  int size = 0;
-  err_t err = ERR_OK;
-
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  LWIP_ERROR("lwip_sendmsg: invalid msghdr", msg != NULL,
-             sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
-
-  LWIP_UNUSED_ARG(msg->msg_control);
-  LWIP_UNUSED_ARG(msg->msg_controllen);
-  LWIP_UNUSED_ARG(msg->msg_flags);
-  LWIP_ERROR("lwip_sendmsg: invalid msghdr iov", (msg->msg_iov != NULL && msg->msg_iovlen != 0),
-             sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
-
-  if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) {
-#if LWIP_TCP
-    write_flags = NETCONN_COPY |
-    ((flags & MSG_MORE)     ? NETCONN_MORE      : 0) |
-    ((flags & MSG_DONTWAIT) ? NETCONN_DONTBLOCK : 0);
-
-    for (i = 0; i < msg->msg_iovlen; i++) {
-      u8_t apiflags = write_flags;
-      if (i + 1 < msg->msg_iovlen) {
-        apiflags |= NETCONN_MORE;
-      }
-      written = 0;
-      err = netconn_write_partly(sock->conn, msg->msg_iov[i].iov_base, msg->msg_iov[i].iov_len, write_flags, &written);
-      if (err == ERR_OK) {
-        size += written;
-        /* check that the entire IO vector was accepected, if not return a partial write */
-        if (written != msg->msg_iov[i].iov_len)
-          break;
-      }
-      /* none of this IO vector was accepted, but previous was, return partial write and conceal ERR_WOULDBLOCK */
-      else if (err == ERR_WOULDBLOCK && size > 0) {
-        err = ERR_OK;
-        /* let ERR_WOULDBLOCK persist on the netconn since we are returning ERR_OK */
-        break;
-      } else {
-        size = -1;
-        break;
-      }
-    }
-    sock_set_errno(sock, err_to_errno(err));
-    return size;
-#else /* LWIP_TCP */
-    sock_set_errno(sock, err_to_errno(ERR_ARG));
-    return -1;
-#endif /* LWIP_TCP */
-  }
-  /* else, UDP and RAW NETCONNs */
-#if LWIP_UDP || LWIP_RAW
-  {
-    struct netbuf *chain_buf;
-
-    LWIP_UNUSED_ARG(flags);
-    LWIP_ERROR("lwip_sendmsg: invalid msghdr name", (((msg->msg_name == NULL) && (msg->msg_namelen == 0)) ||
-               IS_SOCK_ADDR_LEN_VALID(msg->msg_namelen)) ,
-               sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
-
-    /* initialize chain buffer with destination */
-    chain_buf = netbuf_new();
-    if (!chain_buf) {
-      sock_set_errno(sock, err_to_errno(ERR_MEM));
-      return -1;
-    }
-    if (msg->msg_name) {
-      u16_t remote_port;
-      SOCKADDR_TO_IPADDR_PORT((const struct sockaddr *)msg->msg_name, &chain_buf->addr, remote_port);
-      netbuf_fromport(chain_buf) = remote_port;
-    }
-#if LWIP_NETIF_TX_SINGLE_PBUF
-    for (i = 0; i < msg->msg_iovlen; i++) {
-      size += msg->msg_iov[i].iov_len;
-    }
-    /* Allocate a new netbuf and copy the data into it. */
-    if (netbuf_alloc(chain_buf, (u16_t)size) == NULL) {
-       err = ERR_MEM;
-    } else {
-      /* flatten the IO vectors */
-      size_t offset = 0;
-      for (i = 0; i < msg->msg_iovlen; i++) {
-        MEMCPY(&((u8_t*)chain_buf->p->payload)[offset], msg->msg_iov[i].iov_base, msg->msg_iov[i].iov_len);
-        offset += msg->msg_iov[i].iov_len;
-      }
-#if LWIP_CHECKSUM_ON_COPY
-      {
-        /* This can be improved by using LWIP_CHKSUM_COPY() and aggregating the checksum for each IO vector */
-        u16_t chksum = ~inet_chksum_pbuf(chain_buf->p);
-        netbuf_set_chksum(chain_buf, chksum);
-      }
-#endif /* LWIP_CHECKSUM_ON_COPY */
-      err = ERR_OK;
-    }
-#else /* LWIP_NETIF_TX_SINGLE_PBUF */
-    /* create a chained netbuf from the IO vectors. NOTE: we assemble a pbuf chain
-       manually to avoid having to allocate, chain, and delete a netbuf for each iov */
-    for (i = 0; i < msg->msg_iovlen; i++) {
-      struct pbuf *p = pbuf_alloc(PBUF_TRANSPORT, 0, PBUF_REF);
-      if (p == NULL) {
-        err = ERR_MEM; /* let netbuf_delete() cleanup chain_buf */
-        break;
-      }
-      p->payload = msg->msg_iov[i].iov_base;
-      LWIP_ASSERT("iov_len < u16_t", msg->msg_iov[i].iov_len <= 0xFFFF);
-      p->len = p->tot_len = (u16_t)msg->msg_iov[i].iov_len;
-      /* netbuf empty, add new pbuf */
-      if (chain_buf->p == NULL) {
-        chain_buf->p = chain_buf->ptr = p;
-        /* add pbuf to existing pbuf chain */
-      } else {
-        pbuf_cat(chain_buf->p, p);
-      }
-    }
-    /* save size of total chain */
-    if (err == ERR_OK) {
-      size = netbuf_len(chain_buf);
-    }
-#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
-
-    if (err == ERR_OK) {
-#if LWIP_IPV4 && LWIP_IPV6
-      /* Dual-stack: Unmap IPv4 mapped IPv6 addresses */
-      if (IP_IS_V6_VAL(chain_buf->addr) && ip6_addr_isipv4mappedipv6(ip_2_ip6(&chain_buf->addr))) {
-        unmap_ipv4_mapped_ipv6(ip_2_ip4(&chain_buf->addr), ip_2_ip6(&chain_buf->addr));
-        IP_SET_TYPE_VAL(chain_buf->addr, IPADDR_TYPE_V4);
-      }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-      /* send the data */
-      err = netconn_send(sock->conn, chain_buf);
-    }
-
-    /* deallocated the buffer */
-    netbuf_delete(chain_buf);
-
-    sock_set_errno(sock, err_to_errno(err));
-    return (err == ERR_OK ? size : -1);
-  }
-#else /* LWIP_UDP || LWIP_RAW */
-  sock_set_errno(sock, err_to_errno(ERR_ARG));
-  return -1;
-#endif /* LWIP_UDP || LWIP_RAW */
-}
-
-int
-lwip_sendto(int s, const void *data, size_t size, int flags,
-       const struct sockaddr *to, socklen_t tolen)
-{
-  struct lwip_sock *sock;
-  err_t err;
-  u16_t short_size;
-  u16_t remote_port;
-  struct netbuf buf;
-
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) == NETCONN_TCP) {
-#if LWIP_TCP
-    return lwip_send(s, data, size, flags);
-#else /* LWIP_TCP */
-    LWIP_UNUSED_ARG(flags);
-    sock_set_errno(sock, err_to_errno(ERR_ARG));
-    return -1;
-#endif /* LWIP_TCP */
-  }
-
-  /* @todo: split into multiple sendto's? */
-  LWIP_ASSERT("lwip_sendto: size must fit in u16_t", size <= 0xffff);
-  short_size = (u16_t)size;
-  LWIP_ERROR("lwip_sendto: invalid address", (((to == NULL) && (tolen == 0)) ||
-             (IS_SOCK_ADDR_LEN_VALID(tolen) &&
-             IS_SOCK_ADDR_TYPE_VALID(to) && IS_SOCK_ADDR_ALIGNED(to))),
-             sock_set_errno(sock, err_to_errno(ERR_ARG)); return -1;);
-  LWIP_UNUSED_ARG(tolen);
-
-  /* initialize a buffer */
-  buf.p = buf.ptr = NULL;
-#if LWIP_CHECKSUM_ON_COPY
-  buf.flags = 0;
-#endif /* LWIP_CHECKSUM_ON_COPY */
-  if (to) {
-    SOCKADDR_TO_IPADDR_PORT(to, &buf.addr, remote_port);
-  } else {
-    remote_port = 0;
-    ip_addr_set_any(NETCONNTYPE_ISIPV6(netconn_type(sock->conn)), &buf.addr);
-  }
-  netbuf_fromport(&buf) = remote_port;
-
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_sendto(%d, data=%p, short_size=%"U16_F", flags=0x%x to=",
-              s, data, short_size, flags));
-  ip_addr_debug_print(SOCKETS_DEBUG, &buf.addr);
-  LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F"\n", remote_port));
-
-  /* make the buffer point to the data that should be sent */
-#if LWIP_NETIF_TX_SINGLE_PBUF
-  /* Allocate a new netbuf and copy the data into it. */
-  if (netbuf_alloc(&buf, short_size) == NULL) {
-    err = ERR_MEM;
-  } else {
-#if LWIP_CHECKSUM_ON_COPY
-    if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) != NETCONN_RAW) {
-      u16_t chksum = LWIP_CHKSUM_COPY(buf.p->payload, data, short_size);
-      netbuf_set_chksum(&buf, chksum);
-    } else
-#endif /* LWIP_CHECKSUM_ON_COPY */
-    {
-      MEMCPY(buf.p->payload, data, short_size);
-    }
-    err = ERR_OK;
-  }
-#else /* LWIP_NETIF_TX_SINGLE_PBUF */
-  err = netbuf_ref(&buf, data, short_size);
-#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
-  if (err == ERR_OK) {
-#if LWIP_IPV4 && LWIP_IPV6
-    /* Dual-stack: Unmap IPv4 mapped IPv6 addresses */
-    if (IP_IS_V6_VAL(buf.addr) && ip6_addr_isipv4mappedipv6(ip_2_ip6(&buf.addr))) {
-      unmap_ipv4_mapped_ipv6(ip_2_ip4(&buf.addr), ip_2_ip6(&buf.addr));
-      IP_SET_TYPE_VAL(buf.addr, IPADDR_TYPE_V4);
-    }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-    /* send the data */
-    err = netconn_send(sock->conn, &buf);
-  }
-
-  /* deallocated the buffer */
-  netbuf_free(&buf);
-
-  sock_set_errno(sock, err_to_errno(err));
-  return (err == ERR_OK ? short_size : -1);
-}
-
-int
-lwip_socket(int domain, int type, int protocol)
-{
-  struct netconn *conn;
-  int i;
-
-  LWIP_UNUSED_ARG(domain); /* @todo: check this */
-
-  /* create a netconn */
-  switch (type) {
-  case SOCK_RAW:
-    conn = netconn_new_with_proto_and_callback(DOMAIN_TO_NETCONN_TYPE(domain, NETCONN_RAW),
-                                               (u8_t)protocol, event_callback);
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_socket(%s, SOCK_RAW, %d) = ",
-                                 domain == PF_INET ? "PF_INET" : "UNKNOWN", protocol));
-    break;
-  case SOCK_DGRAM:
-    conn = netconn_new_with_callback(DOMAIN_TO_NETCONN_TYPE(domain,
-                 ((protocol == IPPROTO_UDPLITE) ? NETCONN_UDPLITE : NETCONN_UDP)) ,
-                 event_callback);
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_socket(%s, SOCK_DGRAM, %d) = ",
-                                 domain == PF_INET ? "PF_INET" : "UNKNOWN", protocol));
-    break;
-  case SOCK_STREAM:
-    conn = netconn_new_with_callback(DOMAIN_TO_NETCONN_TYPE(domain, NETCONN_TCP), event_callback);
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_socket(%s, SOCK_STREAM, %d) = ",
-                                 domain == PF_INET ? "PF_INET" : "UNKNOWN", protocol));
-    break;
-  default:
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_socket(%d, %d/UNKNOWN, %d) = -1\n",
-                                 domain, type, protocol));
-    set_errno(EINVAL);
-    return -1;
-  }
-
-  if (!conn) {
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("-1 / ENOBUFS (could not create netconn)\n"));
-    set_errno(ENOBUFS);
-    return -1;
-  }
-
-  i = alloc_socket(conn, 0);
-
-  if (i == -1) {
-    netconn_delete(conn);
-    set_errno(ENFILE);
-    return -1;
-  }
-  conn->socket = i;
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("%d\n", i));
-  set_errno(0);
-  return i;
-}
-
-int
-lwip_write(int s, const void *data, size_t size)
-{
-  return lwip_send(s, data, size, 0);
-}
-
-int
-lwip_writev(int s, const struct iovec *iov, int iovcnt)
-{
-  struct msghdr msg;
-
-  msg.msg_name = NULL;
-  msg.msg_namelen = 0;
-  /* Hack: we have to cast via number to cast from 'const' pointer to non-const.
-     Blame the opengroup standard for this inconsistency. */
-  msg.msg_iov = LWIP_CONST_CAST(struct iovec *, iov);
-  msg.msg_iovlen = iovcnt;
-  msg.msg_control = NULL;
-  msg.msg_controllen = 0;
-  msg.msg_flags = 0;
-  return lwip_sendmsg(s, &msg, 0);
-}
-
-/**
- * Go through the readset and writeset lists and see which socket of the sockets
- * set in the sets has events. On return, readset, writeset and exceptset have
- * the sockets enabled that had events.
- *
- * @param maxfdp1 the highest socket index in the sets
- * @param readset_in    set of sockets to check for read events
- * @param writeset_in   set of sockets to check for write events
- * @param exceptset_in  set of sockets to check for error events
- * @param readset_out   set of sockets that had read events
- * @param writeset_out  set of sockets that had write events
- * @param exceptset_out set os sockets that had error events
- * @return number of sockets that had events (read/write/exception) (>= 0)
- */
-static int
-lwip_selscan(int maxfdp1, fd_set *readset_in, fd_set *writeset_in, fd_set *exceptset_in,
-             fd_set *readset_out, fd_set *writeset_out, fd_set *exceptset_out)
-{
-  int i, nready = 0;
-  fd_set lreadset, lwriteset, lexceptset;
-  struct lwip_sock *sock;
-  SYS_ARCH_DECL_PROTECT(lev);
-
-  FD_ZERO(&lreadset);
-  FD_ZERO(&lwriteset);
-  FD_ZERO(&lexceptset);
-
-  /* Go through each socket in each list to count number of sockets which
-     currently match */
-  for (i = LWIP_SOCKET_OFFSET; i < maxfdp1; i++) {
-    /* if this FD is not in the set, continue */
-    if (!(readset_in && FD_ISSET(i, readset_in)) &&
-        !(writeset_in && FD_ISSET(i, writeset_in)) &&
-        !(exceptset_in && FD_ISSET(i, exceptset_in))) {
-      continue;
-    }
-    /* First get the socket's status (protected)... */
-    SYS_ARCH_PROTECT(lev);
-    sock = tryget_socket(i);
-    if (sock != NULL) {
-      void* lastdata = sock->lastdata;
-      s16_t rcvevent = sock->rcvevent;
-      u16_t sendevent = sock->sendevent;
-      u16_t errevent = sock->errevent;
-      SYS_ARCH_UNPROTECT(lev);
-
-      /* ... then examine it: */
-      /* See if netconn of this socket is ready for read */
-      if (readset_in && FD_ISSET(i, readset_in) && ((lastdata != NULL) || (rcvevent > 0))) {
-        FD_SET(i, &lreadset);
-        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_selscan: fd=%d ready for reading\n", i));
-        nready++;
-      }
-      /* See if netconn of this socket is ready for write */
-      if (writeset_in && FD_ISSET(i, writeset_in) && (sendevent != 0)) {
-        FD_SET(i, &lwriteset);
-        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_selscan: fd=%d ready for writing\n", i));
-        nready++;
-      }
-      /* See if netconn of this socket had an error */
-      if (exceptset_in && FD_ISSET(i, exceptset_in) && (errevent != 0)) {
-        FD_SET(i, &lexceptset);
-        LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_selscan: fd=%d ready for exception\n", i));
-        nready++;
-      }
-    } else {
-      SYS_ARCH_UNPROTECT(lev);
-      /* continue on to next FD in list */
-    }
-  }
-  /* copy local sets to the ones provided as arguments */
-  *readset_out = lreadset;
-  *writeset_out = lwriteset;
-  *exceptset_out = lexceptset;
-
-  LWIP_ASSERT("nready >= 0", nready >= 0);
-  return nready;
-}
-
-int lwip_select(int maxfdp1, fd_set *readset, fd_set *writeset, fd_set *exceptset, struct timeval *timeout) {
-  u32_t waitres = 0;
-  int nready;
-  fd_set lreadset, lwriteset, lexceptset;
-  u32_t msectimeout;
-  struct lwip_select_cb select_cb;
-  int i;
-  int maxfdp2;
-#if LWIP_NETCONN_SEM_PER_THREAD
-  int waited = 0;
-#endif
-  SYS_ARCH_DECL_PROTECT(lev);
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select(%d, %p, %p, %p, tvsec=%"S32_F" tvusec=%"S32_F")\n",
-                  maxfdp1, (void *)readset, (void *) writeset, (void *) exceptset,
-                  timeout ? (s32_t)timeout->tv_sec : (s32_t)-1,
-                  timeout ? (s32_t)timeout->tv_usec : (s32_t)-1));
-
-  /* Go through each socket in each list to count number of sockets which
-     currently match */
-  nready = lwip_selscan(maxfdp1, readset, writeset, exceptset, &lreadset, &lwriteset, &lexceptset);
-
-  /* If we don't have any current events, then suspend if we are supposed to */
-  if (!nready) {
-    if (timeout && timeout->tv_sec == 0 && timeout->tv_usec == 0) {
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select: no timeout, returning 0\n"));
-      /* This is OK as the local fdsets are empty and nready is zero,
-         or we would have returned earlier. */
-      goto return_copy_fdsets;
-    }
-
-    /* None ready: add our semaphore to list:
-       We don't actually need any dynamic memory. Our entry on the
-       list is only valid while we are in this function, so it's ok
-       to use local variables. */
-
-    select_cb.next = NULL;
-    select_cb.prev = NULL;
-    select_cb.readset = readset;
-    select_cb.writeset = writeset;
-    select_cb.exceptset = exceptset;
-    select_cb.sem_signalled = 0;
-#if LWIP_NETCONN_SEM_PER_THREAD
-    select_cb.sem = LWIP_NETCONN_THREAD_SEM_GET();
-#else /* LWIP_NETCONN_SEM_PER_THREAD */
-    if (sys_sem_new(&select_cb.sem, 0) != ERR_OK) {
-      /* failed to create semaphore */
-      set_errno(ENOMEM);
-      return -1;
-    }
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-    /* Protect the select_cb_list */
-    SYS_ARCH_PROTECT(lev);
-
-    /* Put this select_cb on top of list */
-    select_cb.next = select_cb_list;
-    if (select_cb_list != NULL) {
-      select_cb_list->prev = &select_cb;
-    }
-    select_cb_list = &select_cb;
-    /* Increasing this counter tells event_callback that the list has changed. */
-    select_cb_ctr++;
-
-    /* Now we can safely unprotect */
-    SYS_ARCH_UNPROTECT(lev);
-
-    /* Increase select_waiting for each socket we are interested in */
-    maxfdp2 = maxfdp1;
-    for (i = LWIP_SOCKET_OFFSET; i < maxfdp1; i++) {
-      if ((readset && FD_ISSET(i, readset)) ||
-          (writeset && FD_ISSET(i, writeset)) ||
-          (exceptset && FD_ISSET(i, exceptset))) {
-        struct lwip_sock *sock;
-        SYS_ARCH_PROTECT(lev);
-        sock = tryget_socket(i);
-        if (sock != NULL) {
-          sock->select_waiting++;
-          LWIP_ASSERT("sock->select_waiting > 0", sock->select_waiting > 0);
-        } else {
-          /* Not a valid socket */
-          nready = -1;
-          maxfdp2 = i;
-          SYS_ARCH_UNPROTECT(lev);
-          break;
-        }
-        SYS_ARCH_UNPROTECT(lev);
-      }
-    }
-
-    if (nready >= 0) {
-      /* Call lwip_selscan again: there could have been events between
-         the last scan (without us on the list) and putting us on the list! */
-      nready = lwip_selscan(maxfdp1, readset, writeset, exceptset, &lreadset, &lwriteset, &lexceptset);
-      if (!nready) {
-        /* Still none ready, just wait to be woken */
-        if (timeout == 0) {
-          /* Wait forever */
-          msectimeout = 0;
-        } else {
-          msectimeout =  ((timeout->tv_sec * 1000) + ((timeout->tv_usec + 500)/1000));
-          if (msectimeout == 0) {
-            /* Wait 1ms at least (0 means wait forever) */
-            msectimeout = 1;
-          }
-        }
-
-        waitres = sys_arch_sem_wait(SELECT_SEM_PTR(select_cb.sem), msectimeout);
-#if LWIP_NETCONN_SEM_PER_THREAD
-        waited = 1;
-#endif
-      }
-    }
-
-    /* Decrease select_waiting for each socket we are interested in */
-    for (i = LWIP_SOCKET_OFFSET; i < maxfdp2; i++) {
-      if ((readset && FD_ISSET(i, readset)) ||
-          (writeset && FD_ISSET(i, writeset)) ||
-          (exceptset && FD_ISSET(i, exceptset))) {
-        struct lwip_sock *sock;
-        SYS_ARCH_PROTECT(lev);
-        sock = tryget_socket(i);
-        if (sock != NULL) {
-          /* for now, handle select_waiting==0... */
-          LWIP_ASSERT("sock->select_waiting > 0", sock->select_waiting > 0);
-          if (sock->select_waiting > 0) {
-            sock->select_waiting--;
-          }
-        } else {
-          /* Not a valid socket */
-          nready = -1;
-        }
-        SYS_ARCH_UNPROTECT(lev);
-      }
-    }
-    /* Take us off the list */
-    SYS_ARCH_PROTECT(lev);
-    if (select_cb.next != NULL) {
-      select_cb.next->prev = select_cb.prev;
-    }
-    if (select_cb_list == &select_cb) {
-      LWIP_ASSERT("select_cb.prev == NULL", select_cb.prev == NULL);
-      select_cb_list = select_cb.next;
-    } else {
-      LWIP_ASSERT("select_cb.prev != NULL", select_cb.prev != NULL);
-      select_cb.prev->next = select_cb.next;
-    }
-    /* Increasing this counter tells event_callback that the list has changed. */
-    select_cb_ctr++;
-    SYS_ARCH_UNPROTECT(lev);
-
-#if LWIP_NETCONN_SEM_PER_THREAD
-    if (select_cb.sem_signalled && (!waited || (waitres == SYS_ARCH_TIMEOUT))) {
-      /* don't leave the thread-local semaphore signalled */
-      sys_arch_sem_wait(select_cb.sem, 1);
-    }
-#else /* LWIP_NETCONN_SEM_PER_THREAD */
-    sys_sem_free(&select_cb.sem);
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-    if (nready < 0) {
-      /* This happens when a socket got closed while waiting */
-      set_errno(EBADF);
-      return -1;
-    }
-
-    if (waitres == SYS_ARCH_TIMEOUT) {
-      /* Timeout */
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select: timeout expired\n"));
-      /* This is OK as the local fdsets are empty and nready is zero,
-         or we would have returned earlier. */
-      goto return_copy_fdsets;
-    }
-
-    /* See what's set */
-    nready = lwip_selscan(maxfdp1, readset, writeset, exceptset, &lreadset, &lwriteset, &lexceptset);
-  }
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_select: nready=%d\n", nready));
-return_copy_fdsets:
-  set_errno(0);
-  if (readset) {
-    *readset = lreadset;
-  }
-  if (writeset) {
-    *writeset = lwriteset;
-  }
-  if (exceptset) {
-    *exceptset = lexceptset;
-  }
-  return nready;
-}
-
-/**
- * Callback registered in the netconn layer for each socket-netconn.
- * Processes recvevent (data available) and wakes up tasks waiting for select.
- */
-static void
-event_callback(struct netconn *conn, enum netconn_evt evt, u16_t len)
-{
-  int s;
-  struct lwip_sock *sock;
-  struct lwip_select_cb *scb;
-  int last_select_cb_ctr;
-  SYS_ARCH_DECL_PROTECT(lev);
-
-  LWIP_UNUSED_ARG(len);
-
-  /* Get socket */
-  if (conn) {
-    s = conn->socket;
-    if (s < 0) {
-      /* Data comes in right away after an accept, even though
-       * the server task might not have created a new socket yet.
-       * Just count down (or up) if that's the case and we
-       * will use the data later. Note that only receive events
-       * can happen before the new socket is set up. */
-      SYS_ARCH_PROTECT(lev);
-      if (conn->socket < 0) {
-        if (evt == NETCONN_EVT_RCVPLUS) {
-          conn->socket--;
-        }
-        SYS_ARCH_UNPROTECT(lev);
-        return;
-      }
-      s = conn->socket;
-      SYS_ARCH_UNPROTECT(lev);
-    }
-
-    sock = get_socket(s);
-    if (!sock) {
-      return;
-    }
-  } else {
-    return;
-  }
-
-  SYS_ARCH_PROTECT(lev);
-  /* Set event as required */
-  switch (evt) {
-    case NETCONN_EVT_RCVPLUS:
-      sock->rcvevent++;
-      break;
-    case NETCONN_EVT_RCVMINUS:
-      sock->rcvevent--;
-      break;
-    case NETCONN_EVT_SENDPLUS:
-      sock->sendevent = 1;
-      break;
-    case NETCONN_EVT_SENDMINUS:
-      sock->sendevent = 0;
-      break;
-    case NETCONN_EVT_ERROR:
-      sock->errevent = 1;
-      break;
-    default:
-      LWIP_ASSERT("unknown event", 0);
-      break;
-  }
-
-  if (sock->select_waiting == 0) {
-    /* noone is waiting for this socket, no need to check select_cb_list */
-    SYS_ARCH_UNPROTECT(lev);
-    return;
-  }
-
-  /* Now decide if anyone is waiting for this socket */
-  /* NOTE: This code goes through the select_cb_list list multiple times
-     ONLY IF a select was actually waiting. We go through the list the number
-     of waiting select calls + 1. This list is expected to be small. */
-
-  /* At this point, SYS_ARCH is still protected! */
-again:
-  for (scb = select_cb_list; scb != NULL; scb = scb->next) {
-    /* remember the state of select_cb_list to detect changes */
-    last_select_cb_ctr = select_cb_ctr;
-    if (scb->sem_signalled == 0) {
-      /* semaphore not signalled yet */
-      int do_signal = 0;
-      /* Test this select call for our socket */
-      if (sock->rcvevent > 0) {
-        if (scb->readset && FD_ISSET(s, scb->readset)) {
-          do_signal = 1;
-        }
-      }
-      if (sock->sendevent != 0) {
-        if (!do_signal && scb->writeset && FD_ISSET(s, scb->writeset)) {
-          do_signal = 1;
-        }
-      }
-      if (sock->errevent != 0) {
-        if (!do_signal && scb->exceptset && FD_ISSET(s, scb->exceptset)) {
-          do_signal = 1;
-        }
-      }
-      if (do_signal) {
-        scb->sem_signalled = 1;
-        /* Don't call SYS_ARCH_UNPROTECT() before signaling the semaphore, as this might
-           lead to the select thread taking itself off the list, invalidating the semaphore. */
-        sys_sem_signal(SELECT_SEM_PTR(scb->sem));
-      }
-    }
-    /* unlock interrupts with each step */
-    SYS_ARCH_UNPROTECT(lev);
-    /* this makes sure interrupt protection time is short */
-    SYS_ARCH_PROTECT(lev);
-    if (last_select_cb_ctr != select_cb_ctr) {
-      /* someone has changed select_cb_list, restart at the beginning */
-      goto again;
-    }
-  }
-  SYS_ARCH_UNPROTECT(lev);
-}
-
-/**
- * Close one end of a full-duplex connection.
- */
-int
-lwip_shutdown(int s, int how)
-{
-  struct lwip_sock *sock;
-  err_t err;
-  u8_t shut_rx = 0, shut_tx = 0;
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_shutdown(%d, how=%d)\n", s, how));
-
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  if (sock->conn != NULL) {
-    if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) != NETCONN_TCP) {
-      sock_set_errno(sock, EOPNOTSUPP);
-      return -1;
-    }
-  } else {
-    sock_set_errno(sock, ENOTCONN);
-    return -1;
-  }
-
-  if (how == SHUT_RD) {
-    shut_rx = 1;
-  } else if (how == SHUT_WR) {
-    shut_tx = 1;
-  } else if (how == SHUT_RDWR) {
-    shut_rx = 1;
-    shut_tx = 1;
-  } else {
-    sock_set_errno(sock, EINVAL);
-    return -1;
-  }
-  err = netconn_shutdown(sock->conn, shut_rx, shut_tx);
-
-  sock_set_errno(sock, err_to_errno(err));
-  return (err == ERR_OK ? 0 : -1);
-}
-
-static int
-lwip_getaddrname(int s, struct sockaddr *name, socklen_t *namelen, u8_t local)
-{
-  struct lwip_sock *sock;
-  union sockaddr_aligned saddr;
-  ip_addr_t naddr;
-  u16_t port;
-  err_t err;
-
-  sock = get_socket(s);
-  if (!sock) {
-    return -1;
-  }
-
-  /* get the IP address and port */
-  err = netconn_getaddr(sock->conn, &naddr, &port, local);
-  if (err != ERR_OK) {
-    sock_set_errno(sock, err_to_errno(err));
-    return -1;
-  }
-
-#if LWIP_IPV4 && LWIP_IPV6
-  /* Dual-stack: Map IPv4 addresses to IPv4 mapped IPv6 */
-  if (NETCONNTYPE_ISIPV6(netconn_type(sock->conn)) &&
-      IP_IS_V4_VAL(naddr)) {
-    ip4_2_ipv4_mapped_ipv6(ip_2_ip6(&naddr), ip_2_ip4(&naddr));
-    IP_SET_TYPE_VAL(naddr, IPADDR_TYPE_V6);
-  }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-  IPADDR_PORT_TO_SOCKADDR(&saddr, &naddr, port);
-
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getaddrname(%d, addr=", s));
-  ip_addr_debug_print_val(SOCKETS_DEBUG, naddr);
-  LWIP_DEBUGF(SOCKETS_DEBUG, (" port=%"U16_F")\n", port));
-
-  if (*namelen > saddr.sa.sa_len) {
-    *namelen = saddr.sa.sa_len;
-  }
-  MEMCPY(name, &saddr, *namelen);
-
-  sock_set_errno(sock, 0);
-  return 0;
-}
-
-int
-lwip_getpeername(int s, struct sockaddr *name, socklen_t *namelen)
-{
-  return lwip_getaddrname(s, name, namelen, 0);
-}
-
-int
-lwip_getsockname(int s, struct sockaddr *name, socklen_t *namelen)
-{
-  return lwip_getaddrname(s, name, namelen, 1);
-}
-
-int
-lwip_getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen)
-{
-  u8_t err;
-  struct lwip_sock *sock = get_socket(s);
-#if !LWIP_TCPIP_CORE_LOCKING
-  LWIP_SETGETSOCKOPT_DATA_VAR_DECLARE(data);
-#endif /* !LWIP_TCPIP_CORE_LOCKING */
-
-  if (!sock) {
-    return -1;
-  }
-
-  if ((NULL == optval) || (NULL == optlen)) {
-    sock_set_errno(sock, EFAULT);
-    return -1;
-  }
-
-#if LWIP_TCPIP_CORE_LOCKING
-  /* core-locking can just call the -impl function */
-  LOCK_TCPIP_CORE();
-  err = lwip_getsockopt_impl(s, level, optname, optval, optlen);
-  UNLOCK_TCPIP_CORE();
-
-#else /* LWIP_TCPIP_CORE_LOCKING */
-
-#if LWIP_MPU_COMPATIBLE
-  /* MPU_COMPATIBLE copies the optval data, so check for max size here */
-  if (*optlen > LWIP_SETGETSOCKOPT_MAXOPTLEN) {
-    sock_set_errno(sock, ENOBUFS);
-    return -1;
-  }
-#endif /* LWIP_MPU_COMPATIBLE */
-
-  LWIP_SETGETSOCKOPT_DATA_VAR_ALLOC(data, sock);
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).s = s;
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).level = level;
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optname = optname;
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optlen = *optlen;
-#if !LWIP_MPU_COMPATIBLE
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optval.p = optval;
-#endif /* !LWIP_MPU_COMPATIBLE */
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).err = 0;
-#if LWIP_NETCONN_SEM_PER_THREAD
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).completed_sem = LWIP_NETCONN_THREAD_SEM_GET();
-#else
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).completed_sem = &sock->conn->op_completed;
-#endif
-  err = tcpip_callback(lwip_getsockopt_callback, &LWIP_SETGETSOCKOPT_DATA_VAR_REF(data));
-  if (err != ERR_OK) {
-    LWIP_SETGETSOCKOPT_DATA_VAR_FREE(data);
-    sock_set_errno(sock, err_to_errno(err));
-    return -1;
-  }
-  sys_arch_sem_wait((sys_sem_t*)(LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).completed_sem), 0);
-
-  /* write back optlen and optval */
-  *optlen = LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optlen;
-#if LWIP_MPU_COMPATIBLE
-  MEMCPY(optval, LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optval,
-    LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optlen);
-#endif /* LWIP_MPU_COMPATIBLE */
-
-  /* maybe lwip_getsockopt_internal has changed err */
-  err = LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).err;
-  LWIP_SETGETSOCKOPT_DATA_VAR_FREE(data);
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-
-  sock_set_errno(sock, err);
-  return err ? -1 : 0;
-}
-
-#if !LWIP_TCPIP_CORE_LOCKING
-/** lwip_getsockopt_callback: only used without CORE_LOCKING
- * to get into the tcpip_thread
- */
-static void
-lwip_getsockopt_callback(void *arg)
-{
-  struct lwip_setgetsockopt_data *data;
-  LWIP_ASSERT("arg != NULL", arg != NULL);
-  data = (struct lwip_setgetsockopt_data*)arg;
-
-  data->err = lwip_getsockopt_impl(data->s, data->level, data->optname,
-#if LWIP_MPU_COMPATIBLE
-    data->optval,
-#else /* LWIP_MPU_COMPATIBLE */
-    data->optval.p,
-#endif /* LWIP_MPU_COMPATIBLE */
-    &data->optlen);
-
-  sys_sem_signal((sys_sem_t*)(data->completed_sem));
-}
-#endif  /* LWIP_TCPIP_CORE_LOCKING */
-
-/** lwip_getsockopt_impl: the actual implementation of getsockopt:
- * same argument as lwip_getsockopt, either called directly or through callback
- */
-static u8_t
-lwip_getsockopt_impl(int s, int level, int optname, void *optval, socklen_t *optlen)
-{
-  u8_t err = 0;
-  struct lwip_sock *sock = tryget_socket(s);
-  if (!sock) {
-    return EBADF;
-  }
-
-  switch (level) {
-
-/* Level: SOL_SOCKET */
-  case SOL_SOCKET:
-    switch (optname) {
-
-#if LWIP_TCP
-    case SO_ACCEPTCONN:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, *optlen, int);
-      if (NETCONNTYPE_GROUP(sock->conn->type) != NETCONN_TCP) {
-        return ENOPROTOOPT;
-      }
-      if ((sock->conn->pcb.tcp != NULL) && (sock->conn->pcb.tcp->state == LISTEN)) {
-        *(int*)optval = 1;
-      } else {
-        *(int*)optval = 0;
-      }
-      break;
-#endif /* LWIP_TCP */
-
-    /* The option flags */
-    case SO_BROADCAST:
-    case SO_KEEPALIVE:
-#if SO_REUSE
-    case SO_REUSEADDR:
-#endif /* SO_REUSE */
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, *optlen, int);
-      *(int*)optval = ip_get_option(sock->conn->pcb.ip, optname);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, optname=0x%x, ..) = %s\n",
-                                  s, optname, (*(int*)optval?"on":"off")));
-      break;
-
-    case SO_TYPE:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, *optlen, int);
-      switch (NETCONNTYPE_GROUP(netconn_type(sock->conn))) {
-      case NETCONN_RAW:
-        *(int*)optval = SOCK_RAW;
-        break;
-      case NETCONN_TCP:
-        *(int*)optval = SOCK_STREAM;
-        break;
-      case NETCONN_UDP:
-        *(int*)optval = SOCK_DGRAM;
-        break;
-      default: /* unrecognized socket type */
-        *(int*)optval = netconn_type(sock->conn);
-        LWIP_DEBUGF(SOCKETS_DEBUG,
-                    ("lwip_getsockopt(%d, SOL_SOCKET, SO_TYPE): unrecognized socket type %d\n",
-                    s, *(int *)optval));
-      }  /* switch (netconn_type(sock->conn)) */
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, SO_TYPE) = %d\n",
-                  s, *(int *)optval));
-      break;
-
-    case SO_ERROR:
-      LWIP_SOCKOPT_CHECK_OPTLEN(*optlen, int);
-      /* only overwrite ERR_OK or temporary errors */
-      if (((sock->err == 0) || (sock->err == EINPROGRESS)) && (sock->conn != NULL)) {
-        sock_set_errno(sock, err_to_errno(sock->conn->last_err));
-      }
-      *(int *)optval = (sock->err == 0xFF ? (int)-1 : (int)sock->err);
-      sock->err = 0;
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, SO_ERROR) = %d\n",
-                  s, *(int *)optval));
-      break;
-
-#if LWIP_SO_SNDTIMEO
-    case SO_SNDTIMEO:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, *optlen, LWIP_SO_SNDRCVTIMEO_OPTTYPE);
-      LWIP_SO_SNDRCVTIMEO_SET(optval, netconn_get_sendtimeout(sock->conn));
-      break;
-#endif /* LWIP_SO_SNDTIMEO */
-#if LWIP_SO_RCVTIMEO
-    case SO_RCVTIMEO:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, *optlen, LWIP_SO_SNDRCVTIMEO_OPTTYPE);
-      LWIP_SO_SNDRCVTIMEO_SET(optval, netconn_get_recvtimeout(sock->conn));
-      break;
-#endif /* LWIP_SO_RCVTIMEO */
-#if LWIP_SO_RCVBUF
-    case SO_RCVBUF:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, *optlen, int);
-      *(int *)optval = netconn_get_recvbufsize(sock->conn);
-      break;
-#endif /* LWIP_SO_RCVBUF */
-#if LWIP_SO_LINGER
-    case SO_LINGER:
-      {
-        s16_t conn_linger;
-        struct linger* linger = (struct linger*)optval;
-        LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, *optlen, struct linger);
-        conn_linger = sock->conn->linger;
-        if (conn_linger >= 0) {
-          linger->l_onoff = 1;
-          linger->l_linger = (int)conn_linger;
-        } else {
-          linger->l_onoff = 0;
-          linger->l_linger = 0;
-        }
-      }
-      break;
-#endif /* LWIP_SO_LINGER */
-#if LWIP_UDP
-    case SO_NO_CHECK:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, *optlen, int, NETCONN_UDP);
-#if LWIP_UDPLITE
-      if ((udp_flags(sock->conn->pcb.udp) & UDP_FLAGS_UDPLITE) != 0) {
-        /* this flag is only available for UDP, not for UDP lite */
-        return EAFNOSUPPORT;
-      }
-#endif /* LWIP_UDPLITE */
-      *(int*)optval = (udp_flags(sock->conn->pcb.udp) & UDP_FLAGS_NOCHKSUM) ? 1 : 0;
-      break;
-#endif /* LWIP_UDP*/
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, SOL_SOCKET, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-
-/* Level: IPPROTO_IP */
-  case IPPROTO_IP:
-    switch (optname) {
-    case IP_TTL:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, *optlen, int);
-      *(int*)optval = sock->conn->pcb.ip->ttl;
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_TTL) = %d\n",
-                  s, *(int *)optval));
-      break;
-    case IP_TOS:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, *optlen, int);
-      *(int*)optval = sock->conn->pcb.ip->tos;
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_TOS) = %d\n",
-                  s, *(int *)optval));
-      break;
-#if LWIP_MULTICAST_TX_OPTIONS
-    case IP_MULTICAST_TTL:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, *optlen, u8_t);
-      if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) != NETCONN_UDP) {
-        return ENOPROTOOPT;
-      }
-      *(u8_t*)optval = udp_get_multicast_ttl(sock->conn->pcb.udp);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_MULTICAST_TTL) = %d\n",
-                  s, *(int *)optval));
-      break;
-    case IP_MULTICAST_IF:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, *optlen, struct in_addr);
-      if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) != NETCONN_UDP) {
-        return ENOPROTOOPT;
-      }
-      inet_addr_from_ip4addr((struct in_addr*)optval, udp_get_multicast_netif_addr(sock->conn->pcb.udp));
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_MULTICAST_IF) = 0x%"X32_F"\n",
-                  s, *(u32_t *)optval));
-      break;
-    case IP_MULTICAST_LOOP:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, *optlen, u8_t);
-      if ((sock->conn->pcb.udp->flags & UDP_FLAGS_MULTICAST_LOOP) != 0) {
-        *(u8_t*)optval = 1;
-      } else {
-        *(u8_t*)optval = 0;
-      }
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, IP_MULTICAST_LOOP) = %d\n",
-                  s, *(int *)optval));
-      break;
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IP, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-
-#if LWIP_TCP
-/* Level: IPPROTO_TCP */
-  case IPPROTO_TCP:
-    /* Special case: all IPPROTO_TCP option take an int */
-    LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, *optlen, int, NETCONN_TCP);
-    if (sock->conn->pcb.tcp->state == LISTEN) {
-      return EINVAL;
-    }
-    switch (optname) {
-    case TCP_NODELAY:
-      *(int*)optval = tcp_nagle_disabled(sock->conn->pcb.tcp);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, TCP_NODELAY) = %s\n",
-                  s, (*(int*)optval)?"on":"off") );
-      break;
-    case TCP_KEEPALIVE:
-      *(int*)optval = (int)sock->conn->pcb.tcp->keep_idle;
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, TCP_KEEPALIVE) = %d\n",
-                  s, *(int *)optval));
-      break;
-
-#if LWIP_TCP_KEEPALIVE
-    case TCP_KEEPIDLE:
-      *(int*)optval = (int)(sock->conn->pcb.tcp->keep_idle/1000);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, TCP_KEEPIDLE) = %d\n",
-                  s, *(int *)optval));
-      break;
-    case TCP_KEEPINTVL:
-      *(int*)optval = (int)(sock->conn->pcb.tcp->keep_intvl/1000);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, TCP_KEEPINTVL) = %d\n",
-                  s, *(int *)optval));
-      break;
-    case TCP_KEEPCNT:
-      *(int*)optval = (int)sock->conn->pcb.tcp->keep_cnt;
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, TCP_KEEPCNT) = %d\n",
-                  s, *(int *)optval));
-      break;
-#endif /* LWIP_TCP_KEEPALIVE */
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_TCP, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-#endif /* LWIP_TCP */
-
-#if LWIP_IPV6
-/* Level: IPPROTO_IPV6 */
-  case IPPROTO_IPV6:
-    switch (optname) {
-    case IPV6_V6ONLY:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, *optlen, int);
-      *(int*)optval = (netconn_get_ipv6only(sock->conn) ? 1 : 0);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IPV6, IPV6_V6ONLY) = %d\n",
-                  s, *(int *)optval));
-      break;
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_IPV6, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-#endif /* LWIP_IPV6 */
-
-#if LWIP_UDP && LWIP_UDPLITE
-  /* Level: IPPROTO_UDPLITE */
-  case IPPROTO_UDPLITE:
-    /* Special case: all IPPROTO_UDPLITE option take an int */
-    LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, *optlen, int);
-    /* If this is no UDP lite socket, ignore any options. */
-    if (!NETCONNTYPE_ISUDPLITE(netconn_type(sock->conn))) {
-      return ENOPROTOOPT;
-    }
-    switch (optname) {
-    case UDPLITE_SEND_CSCOV:
-      *(int*)optval = sock->conn->pcb.udp->chksum_len_tx;
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_UDPLITE, UDPLITE_SEND_CSCOV) = %d\n",
-                  s, (*(int*)optval)) );
-      break;
-    case UDPLITE_RECV_CSCOV:
-      *(int*)optval = sock->conn->pcb.udp->chksum_len_rx;
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_UDPLITE, UDPLITE_RECV_CSCOV) = %d\n",
-                  s, (*(int*)optval)) );
-      break;
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_UDPLITE, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-#endif /* LWIP_UDP */
-  /* Level: IPPROTO_RAW */
-  case IPPROTO_RAW:
-    switch (optname) {
-#if LWIP_IPV6 && LWIP_RAW
-    case IPV6_CHECKSUM:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, *optlen, int, NETCONN_RAW);
-      if (sock->conn->pcb.raw->chksum_reqd == 0) {
-        *(int *)optval = -1;
-      } else {
-        *(int *)optval = sock->conn->pcb.raw->chksum_offset;
-      }
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_RAW, IPV6_CHECKSUM) = %d\n",
-                  s, (*(int*)optval)) );
-      break;
-#endif /* LWIP_IPV6 && LWIP_RAW */
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, IPPROTO_RAW, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-  default:
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_getsockopt(%d, level=0x%x, UNIMPL: optname=0x%x, ..)\n",
-                                s, level, optname));
-    err = ENOPROTOOPT;
-    break;
-  } /* switch (level) */
-
-  return err;
-}
-
-int
-lwip_setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen)
-{
-  u8_t err = 0;
-  struct lwip_sock *sock = get_socket(s);
-#if !LWIP_TCPIP_CORE_LOCKING
-  LWIP_SETGETSOCKOPT_DATA_VAR_DECLARE(data);
-#endif /* !LWIP_TCPIP_CORE_LOCKING */
-
-  if (!sock) {
-    return -1;
-  }
-
-  if (NULL == optval) {
-    sock_set_errno(sock, EFAULT);
-    return -1;
-  }
-
-#if LWIP_TCPIP_CORE_LOCKING
-  /* core-locking can just call the -impl function */
-  LOCK_TCPIP_CORE();
-  err = lwip_setsockopt_impl(s, level, optname, optval, optlen);
-  UNLOCK_TCPIP_CORE();
-
-#else /* LWIP_TCPIP_CORE_LOCKING */
-
-#if LWIP_MPU_COMPATIBLE
-  /* MPU_COMPATIBLE copies the optval data, so check for max size here */
-  if (optlen > LWIP_SETGETSOCKOPT_MAXOPTLEN) {
-    sock_set_errno(sock, ENOBUFS);
-    return -1;
-  }
-#endif /* LWIP_MPU_COMPATIBLE */
-
-  LWIP_SETGETSOCKOPT_DATA_VAR_ALLOC(data, sock);
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).s = s;
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).level = level;
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optname = optname;
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optlen = optlen;
-#if LWIP_MPU_COMPATIBLE
-  MEMCPY(LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optval, optval, optlen);
-#else /* LWIP_MPU_COMPATIBLE */
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).optval.pc = (const void*)optval;
-#endif /* LWIP_MPU_COMPATIBLE */
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).err = 0;
-#if LWIP_NETCONN_SEM_PER_THREAD
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).completed_sem = LWIP_NETCONN_THREAD_SEM_GET();
-#else
-  LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).completed_sem = &sock->conn->op_completed;
-#endif
-  err = tcpip_callback(lwip_setsockopt_callback, &LWIP_SETGETSOCKOPT_DATA_VAR_REF(data));
-  if (err != ERR_OK) {
-    LWIP_SETGETSOCKOPT_DATA_VAR_FREE(data);
-    sock_set_errno(sock, err_to_errno(err));
-    return -1;
-  }
-  sys_arch_sem_wait((sys_sem_t*)(LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).completed_sem), 0);
-
-  /* maybe lwip_getsockopt_internal has changed err */
-  err = LWIP_SETGETSOCKOPT_DATA_VAR_REF(data).err;
-  LWIP_SETGETSOCKOPT_DATA_VAR_FREE(data);
-#endif  /* LWIP_TCPIP_CORE_LOCKING */
-
-  sock_set_errno(sock, err);
-  return err ? -1 : 0;
-}
-
-#if !LWIP_TCPIP_CORE_LOCKING
-/** lwip_setsockopt_callback: only used without CORE_LOCKING
- * to get into the tcpip_thread
- */
-static void
-lwip_setsockopt_callback(void *arg)
-{
-  struct lwip_setgetsockopt_data *data;
-  LWIP_ASSERT("arg != NULL", arg != NULL);
-  data = (struct lwip_setgetsockopt_data*)arg;
-
-  data->err = lwip_setsockopt_impl(data->s, data->level, data->optname,
-#if LWIP_MPU_COMPATIBLE
-    data->optval,
-#else /* LWIP_MPU_COMPATIBLE */
-    data->optval.pc,
-#endif /* LWIP_MPU_COMPATIBLE */
-    data->optlen);
-
-  sys_sem_signal((sys_sem_t*)(data->completed_sem));
-}
-#endif  /* LWIP_TCPIP_CORE_LOCKING */
-
-/** lwip_setsockopt_impl: the actual implementation of setsockopt:
- * same argument as lwip_setsockopt, either called directly or through callback
- */
-static u8_t
-lwip_setsockopt_impl(int s, int level, int optname, const void *optval, socklen_t optlen)
-{
-  u8_t err = 0;
-  struct lwip_sock *sock = tryget_socket(s);
-  if (!sock) {
-    return EBADF;
-  }
-
-  switch (level) {
-
-/* Level: SOL_SOCKET */
-  case SOL_SOCKET:
-    switch (optname) {
-
-    /* SO_ACCEPTCONN is get-only */
-
-    /* The option flags */
-    case SO_BROADCAST:
-    case SO_KEEPALIVE:
-#if SO_REUSE
-    case SO_REUSEADDR:
-#endif /* SO_REUSE */
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, optlen, int);
-      if (*(const int*)optval) {
-        ip_set_option(sock->conn->pcb.ip, optname);
-      } else {
-        ip_reset_option(sock->conn->pcb.ip, optname);
-      }
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, SOL_SOCKET, optname=0x%x, ..) -> %s\n",
-                  s, optname, (*(const int*)optval?"on":"off")));
-      break;
-
-    /* SO_TYPE is get-only */
-    /* SO_ERROR is get-only */
-
-#if LWIP_SO_SNDTIMEO
-    case SO_SNDTIMEO:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, optlen, LWIP_SO_SNDRCVTIMEO_OPTTYPE);
-      netconn_set_sendtimeout(sock->conn, LWIP_SO_SNDRCVTIMEO_GET_MS(optval));
-      break;
-#endif /* LWIP_SO_SNDTIMEO */
-#if LWIP_SO_RCVTIMEO
-    case SO_RCVTIMEO:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, optlen, LWIP_SO_SNDRCVTIMEO_OPTTYPE);
-      netconn_set_recvtimeout(sock->conn, (int)LWIP_SO_SNDRCVTIMEO_GET_MS(optval));
-      break;
-#endif /* LWIP_SO_RCVTIMEO */
-#if LWIP_SO_RCVBUF
-    case SO_RCVBUF:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, optlen, int);
-      netconn_set_recvbufsize(sock->conn, *(const int*)optval);
-      break;
-#endif /* LWIP_SO_RCVBUF */
-#if LWIP_SO_LINGER
-    case SO_LINGER:
-      {
-        const struct linger* linger = (const struct linger*)optval;
-        LWIP_SOCKOPT_CHECK_OPTLEN_CONN(sock, optlen, struct linger);
-        if (linger->l_onoff) {
-          int lingersec = linger->l_linger;
-          if (lingersec < 0) {
-            return EINVAL;
-          }
-          if (lingersec > 0xFFFF) {
-            lingersec = 0xFFFF;
-          }
-          sock->conn->linger = (s16_t)lingersec;
-        } else {
-          sock->conn->linger = -1;
-        }
-      }
-      break;
-#endif /* LWIP_SO_LINGER */
-#if LWIP_UDP
-    case SO_NO_CHECK:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, int, NETCONN_UDP);
-#if LWIP_UDPLITE
-      if ((udp_flags(sock->conn->pcb.udp) & UDP_FLAGS_UDPLITE) != 0) {
-        /* this flag is only available for UDP, not for UDP lite */
-        return EAFNOSUPPORT;
-      }
-#endif /* LWIP_UDPLITE */
-      if (*(const int*)optval) {
-        udp_setflags(sock->conn->pcb.udp, udp_flags(sock->conn->pcb.udp) | UDP_FLAGS_NOCHKSUM);
-      } else {
-        udp_setflags(sock->conn->pcb.udp, udp_flags(sock->conn->pcb.udp) & ~UDP_FLAGS_NOCHKSUM);
-      }
-      break;
-#endif /* LWIP_UDP */
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, SOL_SOCKET, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-
-/* Level: IPPROTO_IP */
-  case IPPROTO_IP:
-    switch (optname) {
-    case IP_TTL:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, optlen, int);
-      sock->conn->pcb.ip->ttl = (u8_t)(*(const int*)optval);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IP, IP_TTL, ..) -> %d\n",
-                  s, sock->conn->pcb.ip->ttl));
-      break;
-    case IP_TOS:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, optlen, int);
-      sock->conn->pcb.ip->tos = (u8_t)(*(const int*)optval);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IP, IP_TOS, ..)-> %d\n",
-                  s, sock->conn->pcb.ip->tos));
-      break;
-#if LWIP_MULTICAST_TX_OPTIONS
-    case IP_MULTICAST_TTL:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, u8_t, NETCONN_UDP);
-      udp_set_multicast_ttl(sock->conn->pcb.udp, (u8_t)(*(const u8_t*)optval));
-      break;
-    case IP_MULTICAST_IF:
-      {
-        ip4_addr_t if_addr;
-        LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, struct in_addr, NETCONN_UDP);
-        inet_addr_to_ip4addr(&if_addr, (const struct in_addr*)optval);
-        udp_set_multicast_netif_addr(sock->conn->pcb.udp, &if_addr);
-      }
-      break;
-    case IP_MULTICAST_LOOP:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, u8_t, NETCONN_UDP);
-      if (*(const u8_t*)optval) {
-        udp_setflags(sock->conn->pcb.udp, udp_flags(sock->conn->pcb.udp) | UDP_FLAGS_MULTICAST_LOOP);
-      } else {
-        udp_setflags(sock->conn->pcb.udp, udp_flags(sock->conn->pcb.udp) & ~UDP_FLAGS_MULTICAST_LOOP);
-      }
-      break;
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-#if LWIP_IGMP
-    case IP_ADD_MEMBERSHIP:
-    case IP_DROP_MEMBERSHIP:
-      {
-        /* If this is a TCP or a RAW socket, ignore these options. */
-        /* @todo: assign membership to this socket so that it is dropped when closing the socket */
-        err_t igmp_err;
-        const struct ip_mreq *imr = (const struct ip_mreq *)optval;
-        ip4_addr_t if_addr;
-        ip4_addr_t multi_addr;
-        LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, struct ip_mreq, NETCONN_UDP);
-        inet_addr_to_ip4addr(&if_addr, &imr->imr_interface);
-        inet_addr_to_ip4addr(&multi_addr, &imr->imr_multiaddr);
-        if (optname == IP_ADD_MEMBERSHIP) {
-          if (!lwip_socket_register_membership(s, &if_addr, &multi_addr)) {
-            /* cannot track membership (out of memory) */
-            err = ENOMEM;
-            igmp_err = ERR_OK;
-          } else {
-            igmp_err = igmp_joingroup(&if_addr, &multi_addr);
-          }
-        } else {
-          igmp_err = igmp_leavegroup(&if_addr, &multi_addr);
-          lwip_socket_unregister_membership(s, &if_addr, &multi_addr);
-        }
-        if (igmp_err != ERR_OK) {
-          err = EADDRNOTAVAIL;
-        }
-      }
-      break;
-#endif /* LWIP_IGMP */
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IP, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-
-#if LWIP_TCP
-/* Level: IPPROTO_TCP */
-  case IPPROTO_TCP:
-    /* Special case: all IPPROTO_TCP option take an int */
-    LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, int, NETCONN_TCP);
-    if (sock->conn->pcb.tcp->state == LISTEN) {
-      return EINVAL;
-    }
-    switch (optname) {
-    case TCP_NODELAY:
-      if (*(const int*)optval) {
-        tcp_nagle_disable(sock->conn->pcb.tcp);
-      } else {
-        tcp_nagle_enable(sock->conn->pcb.tcp);
-      }
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_NODELAY) -> %s\n",
-                  s, (*(const int *)optval)?"on":"off") );
-      break;
-    case TCP_KEEPALIVE:
-      sock->conn->pcb.tcp->keep_idle = (u32_t)(*(const int*)optval);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_KEEPALIVE) -> %"U32_F"\n",
-                  s, sock->conn->pcb.tcp->keep_idle));
-      break;
-
-#if LWIP_TCP_KEEPALIVE
-    case TCP_KEEPIDLE:
-      sock->conn->pcb.tcp->keep_idle = 1000*(u32_t)(*(const int*)optval);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_KEEPIDLE) -> %"U32_F"\n",
-                  s, sock->conn->pcb.tcp->keep_idle));
-      break;
-    case TCP_KEEPINTVL:
-      sock->conn->pcb.tcp->keep_intvl = 1000*(u32_t)(*(const int*)optval);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_KEEPINTVL) -> %"U32_F"\n",
-                  s, sock->conn->pcb.tcp->keep_intvl));
-      break;
-    case TCP_KEEPCNT:
-      sock->conn->pcb.tcp->keep_cnt = (u32_t)(*(const int*)optval);
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, TCP_KEEPCNT) -> %"U32_F"\n",
-                  s, sock->conn->pcb.tcp->keep_cnt));
-      break;
-#endif /* LWIP_TCP_KEEPALIVE */
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_TCP, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-#endif /* LWIP_TCP*/
-
-#if LWIP_IPV6
-/* Level: IPPROTO_IPV6 */
-  case IPPROTO_IPV6:
-    switch (optname) {
-    case IPV6_V6ONLY:
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, int, NETCONN_TCP);
-      if (*(const int*)optval) {
-        netconn_set_ipv6only(sock->conn, 1);
-      } else {
-        netconn_set_ipv6only(sock->conn, 0);
-      }
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IPV6, IPV6_V6ONLY, ..) -> %d\n",
-                  s, (netconn_get_ipv6only(sock->conn) ? 1 : 0)));
-      break;
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IPV6, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-#endif /* LWIP_IPV6 */
-
-#if LWIP_UDP && LWIP_UDPLITE
-  /* Level: IPPROTO_UDPLITE */
-  case IPPROTO_UDPLITE:
-    /* Special case: all IPPROTO_UDPLITE option take an int */
-    LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB(sock, optlen, int);
-    /* If this is no UDP lite socket, ignore any options. */
-    if (!NETCONNTYPE_ISUDPLITE(netconn_type(sock->conn))) {
-      return ENOPROTOOPT;
-    }
-    switch (optname) {
-    case UDPLITE_SEND_CSCOV:
-      if ((*(const int*)optval != 0) && ((*(const int*)optval < 8) || (*(const int*)optval > 0xffff))) {
-        /* don't allow illegal values! */
-        sock->conn->pcb.udp->chksum_len_tx = 8;
-      } else {
-        sock->conn->pcb.udp->chksum_len_tx = (u16_t)*(const int*)optval;
-      }
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_UDPLITE, UDPLITE_SEND_CSCOV) -> %d\n",
-                  s, (*(const int*)optval)) );
-      break;
-    case UDPLITE_RECV_CSCOV:
-      if ((*(const int*)optval != 0) && ((*(const int*)optval < 8) || (*(const int*)optval > 0xffff))) {
-        /* don't allow illegal values! */
-        sock->conn->pcb.udp->chksum_len_rx = 8;
-      } else {
-        sock->conn->pcb.udp->chksum_len_rx = (u16_t)*(const int*)optval;
-      }
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_UDPLITE, UDPLITE_RECV_CSCOV) -> %d\n",
-                  s, (*(const int*)optval)) );
-      break;
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_UDPLITE, UNIMPL: optname=0x%x, ..)\n",
-                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-#endif /* LWIP_UDP */
-  /* Level: IPPROTO_RAW */
-  case IPPROTO_RAW:
-    switch (optname) {
-#if LWIP_IPV6 && LWIP_RAW
-    case IPV6_CHECKSUM:
-      /* It should not be possible to disable the checksum generation with ICMPv6
-       * as per RFC 3542 chapter 3.1 */
-      if(sock->conn->pcb.raw->protocol == IPPROTO_ICMPV6) {
-        return EINVAL;
-      }
-
-      LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, int, NETCONN_RAW);
-      if (*(const int *)optval < 0) {
-        sock->conn->pcb.raw->chksum_reqd = 0;
-      } else if (*(const int *)optval & 1) {
-        /* Per RFC3542, odd offsets are not allowed */
-        return EINVAL;
-      } else {
-        sock->conn->pcb.raw->chksum_reqd = 1;
-        sock->conn->pcb.raw->chksum_offset = (u16_t)*(const int *)optval;
-      }
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_RAW, IPV6_CHECKSUM, ..) -> %d\n",
-                  s, sock->conn->pcb.raw->chksum_reqd));
-      break;
-#endif /* LWIP_IPV6 && LWIP_RAW */
-    default:
-      LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_RAW, UNIMPL: optname=0x%x, ..)\n",
-                                  s, optname));
-      err = ENOPROTOOPT;
-      break;
-    }  /* switch (optname) */
-    break;
-  default:
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, level=0x%x, UNIMPL: optname=0x%x, ..)\n",
-                s, level, optname));
-    err = ENOPROTOOPT;
-    break;
-  }  /* switch (level) */
-
-  return err;
-}
-
-int
-lwip_ioctl(int s, long cmd, void *argp)
-{
-  struct lwip_sock *sock = get_socket(s);
-  u8_t val;
-#if LWIP_SO_RCVBUF
-  u16_t buflen = 0;
-  int recv_avail;
-#endif /* LWIP_SO_RCVBUF */
-
-  if (!sock) {
-    return -1;
-  }
-
-  switch (cmd) {
-#if LWIP_SO_RCVBUF || LWIP_FIONREAD_LINUXMODE
-  case FIONREAD:
-    if (!argp) {
-      sock_set_errno(sock, EINVAL);
-      return -1;
-    }
-#if LWIP_FIONREAD_LINUXMODE
-    if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) != NETCONN_TCP) {
-      struct pbuf *p;
-      if (sock->lastdata) {
-        p = ((struct netbuf *)sock->lastdata)->p;
-        *((int*)argp) = p->tot_len - sock->lastoffset;
-      } else {
-        struct netbuf *rxbuf;
-        err_t err;
-        if (sock->rcvevent <= 0) {
-          *((int*)argp) = 0;
-        } else {
-          err = netconn_recv(sock->conn, &rxbuf);
-          if (err != ERR_OK) {
-            *((int*)argp) = 0;
-          } else {
-            sock->lastdata = rxbuf;
-            sock->lastoffset = 0;
-            *((int*)argp) = rxbuf->p->tot_len;
-          }
-        }
-      }
-      return 0;
-    }
-#endif /* LWIP_FIONREAD_LINUXMODE */
-
-#if LWIP_SO_RCVBUF
-    /* we come here if either LWIP_FIONREAD_LINUXMODE==0 or this is a TCP socket */
-    SYS_ARCH_GET(sock->conn->recv_avail, recv_avail);
-    if (recv_avail < 0) {
-      recv_avail = 0;
-    }
-    *((int*)argp) = recv_avail;
-
-    /* Check if there is data left from the last recv operation. /maq 041215 */
-    if (sock->lastdata) {
-      struct pbuf *p = (struct pbuf *)sock->lastdata;
-      if (NETCONNTYPE_GROUP(netconn_type(sock->conn)) != NETCONN_TCP) {
-        p = ((struct netbuf *)p)->p;
-      }
-      buflen = p->tot_len;
-      buflen -= sock->lastoffset;
-
-      *((int*)argp) += buflen;
-    }
-
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_ioctl(%d, FIONREAD, %p) = %"U16_F"\n", s, argp, *((u16_t*)argp)));
-    sock_set_errno(sock, 0);
-    return 0;
-#else /* LWIP_SO_RCVBUF */
-    break;
-#endif /* LWIP_SO_RCVBUF */
-#endif /* LWIP_SO_RCVBUF || LWIP_FIONREAD_LINUXMODE */
-
-  case (long)FIONBIO:
-    val = 0;
-    if (argp && *(u32_t*)argp) {
-      val = 1;
-    }
-    netconn_set_nonblocking(sock->conn, val);
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_ioctl(%d, FIONBIO, %d)\n", s, val));
-    sock_set_errno(sock, 0);
-    return 0;
-
-  default:
-    break;
-  } /* switch (cmd) */
-  LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_ioctl(%d, UNIMPL: 0x%lx, %p)\n", s, cmd, argp));
-  sock_set_errno(sock, ENOSYS); /* not yet implemented */
-  return -1;
-}
-
-/** A minimal implementation of fcntl.
- * Currently only the commands F_GETFL and F_SETFL are implemented.
- * Only the flag O_NONBLOCK is implemented.
- */
-int
-lwip_fcntl(int s, int cmd, int val)
-{
-  struct lwip_sock *sock = get_socket(s);
-  int ret = -1;
-
-  if (!sock) {
-    return -1;
-  }
-
-  switch (cmd) {
-  case F_GETFL:
-    ret = netconn_is_nonblocking(sock->conn) ? O_NONBLOCK : 0;
-    sock_set_errno(sock, 0);
-    break;
-  case F_SETFL:
-    if ((val & ~O_NONBLOCK) == 0) {
-      /* only O_NONBLOCK, all other bits are zero */
-      netconn_set_nonblocking(sock->conn, val & O_NONBLOCK);
-      ret = 0;
-      sock_set_errno(sock, 0);
-    } else {
-      sock_set_errno(sock, ENOSYS); /* not yet implemented */
-    }
-    break;
-  default:
-    LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_fcntl(%d, UNIMPL: %d, %d)\n", s, cmd, val));
-    sock_set_errno(sock, ENOSYS); /* not yet implemented */
-    break;
-  }
-  return ret;
-}
-
-#if LWIP_IGMP
-/** Register a new IGMP membership. On socket close, the membership is dropped automatically.
- *
- * ATTENTION: this function is called from tcpip_thread (or under CORE_LOCK).
- *
- * @return 1 on success, 0 on failure
- */
-static int
-lwip_socket_register_membership(int s, const ip4_addr_t *if_addr, const ip4_addr_t *multi_addr)
-{
-  struct lwip_sock *sock = get_socket(s);
-  int i;
-
-  if (!sock) {
-    return 0;
-  }
-
-  for (i = 0; i < LWIP_SOCKET_MAX_MEMBERSHIPS; i++) {
-    if (socket_ipv4_multicast_memberships[i].sock == NULL) {
-      socket_ipv4_multicast_memberships[i].sock = sock;
-      ip4_addr_copy(socket_ipv4_multicast_memberships[i].if_addr, *if_addr);
-      ip4_addr_copy(socket_ipv4_multicast_memberships[i].multi_addr, *multi_addr);
-      return 1;
-    }
-  }
-  return 0;
-}
-
-/** Unregister a previously registered membership. This prevents dropping the membership
- * on socket close.
- *
- * ATTENTION: this function is called from tcpip_thread (or under CORE_LOCK).
- */
-static void
-lwip_socket_unregister_membership(int s, const ip4_addr_t *if_addr, const ip4_addr_t *multi_addr)
-{
-  struct lwip_sock *sock = get_socket(s);
-  int i;
-
-  if (!sock) {
-    return;
-  }
-
-  for (i = 0; i < LWIP_SOCKET_MAX_MEMBERSHIPS; i++) {
-    if ((socket_ipv4_multicast_memberships[i].sock == sock) &&
-        ip4_addr_cmp(&socket_ipv4_multicast_memberships[i].if_addr, if_addr) &&
-        ip4_addr_cmp(&socket_ipv4_multicast_memberships[i].multi_addr, multi_addr)) {
-      socket_ipv4_multicast_memberships[i].sock = NULL;
-      ip4_addr_set_zero(&socket_ipv4_multicast_memberships[i].if_addr);
-      ip4_addr_set_zero(&socket_ipv4_multicast_memberships[i].multi_addr);
-      return;
-    }
-  }
-}
-
-/** Drop all memberships of a socket that were not dropped explicitly via setsockopt.
- *
- * ATTENTION: this function is NOT called from tcpip_thread (or under CORE_LOCK).
- */
-static void
-lwip_socket_drop_registered_memberships(int s)
-{
-  struct lwip_sock *sock = get_socket(s);
-  int i;
-
-  if (!sock) {
-    return;
-  }
-
-  for (i = 0; i < LWIP_SOCKET_MAX_MEMBERSHIPS; i++) {
-    if (socket_ipv4_multicast_memberships[i].sock == sock) {
-      ip_addr_t multi_addr, if_addr;
-      ip_addr_copy_from_ip4(multi_addr, socket_ipv4_multicast_memberships[i].multi_addr);
-      ip_addr_copy_from_ip4(if_addr, socket_ipv4_multicast_memberships[i].if_addr);
-      socket_ipv4_multicast_memberships[i].sock = NULL;
-      ip4_addr_set_zero(&socket_ipv4_multicast_memberships[i].if_addr);
-      ip4_addr_set_zero(&socket_ipv4_multicast_memberships[i].multi_addr);
-
-      netconn_join_leave_group(sock->conn, &multi_addr, &if_addr, NETCONN_LEAVE);
-    }
-  }
-}
-#endif /* LWIP_IGMP */
-#endif /* LWIP_SOCKET */
diff --git a/sys/net/api/tcpip.c b/sys/net/api/tcpip.c
deleted file mode 100644
index ae5708b..0000000
--- a/sys/net/api/tcpip.c
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include <net/opt.h>
-
-#if !NO_SYS /* don't build if not configured for use in lwipopts.h */
-
-#include <net/priv/tcpip_priv.h>
-#include <net/sys.h>
-#include <net/memp.h>
-#include <net/mem.h>
-#include <net/init.h>
-#include <net/ip.h>
-#include <net/pbuf.h>
-#include <net/etharp.h>
-#include <netif/ethernet.h>
-
-#define TCPIP_MSG_VAR_REF(name)     API_VAR_REF(name)
-#define TCPIP_MSG_VAR_DECLARE(name) API_VAR_DECLARE(struct tcpip_msg, name)
-#define TCPIP_MSG_VAR_ALLOC(name)   API_VAR_ALLOC(struct tcpip_msg, MEMP_TCPIP_MSG_API, name, ERR_MEM)
-#define TCPIP_MSG_VAR_FREE(name)    API_VAR_FREE(MEMP_TCPIP_MSG_API, name)
-
-/* global variables */
-static tcpip_init_done_fn tcpip_init_done;
-static void *tcpip_init_done_arg;
-static sys_mbox_t mbox;
-
-#if LWIP_TCPIP_CORE_LOCKING
-/** The global semaphore to lock the stack. */
-sys_mutex_t lock_tcpip_core;
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-
-#if LWIP_TIMERS
-/* wait for a message, timeouts are processed while waiting */
-#define TCPIP_MBOX_FETCH(mbox, msg) sys_timeouts_mbox_fetch(mbox, msg)
-#else /* LWIP_TIMERS */
-/* wait for a message with timers disabled (e.g. pass a timer-check trigger into tcpip_thread) */
-#define TCPIP_MBOX_FETCH(mbox, msg) sys_mbox_fetch(mbox, msg)
-#endif /* LWIP_TIMERS */
-
-/**
- * The main lwIP thread. This thread has exclusive access to lwIP core functions
- * (unless access to them is not locked). Other threads communicate with this
- * thread using message boxes.
- *
- * It also starts all the timers to make sure they are running in the right
- * thread context.
- *
- * @param arg unused argument
- */
-static void tcpip_thread(void *arg) {
-  struct tcpip_msg *msg;
-  LWIP_UNUSED_ARG(arg);
-
-  if (tcpip_init_done != NULL) {
-    tcpip_init_done(tcpip_init_done_arg);
-  }
-
-  LOCK_TCPIP_CORE();
-  while (1) { /* MAIN Loop */
-    UNLOCK_TCPIP_CORE();
-    LWIP_TCPIP_THREAD_ALIVE();
-    /* wait for a message, timeouts are processed while waiting */
-    TCPIP_MBOX_FETCH(&mbox, (void ** )&msg);
-    LOCK_TCPIP_CORE();
-    if (msg == NULL) {
-      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: invalid message: NULL\n"));
-      LWIP_ASSERT("tcpip_thread: invalid message", 0);
-      continue;
-    }
-//kprintf("MSG->TYPE: 0x%X]", msg->type);
-    switch (msg->type) {
-#if !LWIP_TCPIP_CORE_LOCKING
-      case TCPIP_MSG_API:
-      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: API message %p\n", (void *)msg));
-      msg->msg.api_msg.function(msg->msg.api_msg.msg);
-      break;
-      case TCPIP_MSG_API_CALL:
-      LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: API CALL message %p\n", (void *)msg));
-      msg->msg.api_call.arg->err = msg->msg.api_call.function(msg->msg.api_call.arg);
-      sys_sem_signal(msg->msg.api_call.sem);
-      break;
-#endif /* !LWIP_TCPIP_CORE_LOCKING */
-
-#if !LWIP_TCPIP_CORE_LOCKING_INPUT
-      case TCPIP_MSG_INPKT:
-        LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: PACKET %p\n", (void *)msg));
-        msg->msg.inp.input_fn(msg->msg.inp.p, msg->msg.inp.netif);
-        memp_free(MEMP_TCPIP_MSG_INPKT, msg);
-      break;
-#endif /* !LWIP_TCPIP_CORE_LOCKING_INPUT */
-
-#if LWIP_TCPIP_TIMEOUT && LWIP_TIMERS
-        case TCPIP_MSG_TIMEOUT:
-        LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: TIMEOUT %p\n", (void *)msg));
-        sys_timeout(msg->msg.tmo.msecs, msg->msg.tmo.h, msg->msg.tmo.arg);
-        memp_free(MEMP_TCPIP_MSG_API, msg);
-        break;
-        case TCPIP_MSG_UNTIMEOUT:
-        LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: UNTIMEOUT %p\n", (void *)msg));
-        sys_untimeout(msg->msg.tmo.h, msg->msg.tmo.arg);
-        memp_free(MEMP_TCPIP_MSG_API, msg);
-        break;
-#endif /* LWIP_TCPIP_TIMEOUT && LWIP_TIMERS */
-
-      case TCPIP_MSG_CALLBACK:
-        LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: CALLBACK %p\n", (void *)msg));
-        msg->msg.cb.function(msg->msg.cb.ctx);
-        memp_free(MEMP_TCPIP_MSG_API, msg);
-      break;
-
-      case TCPIP_MSG_CALLBACK_STATIC:
-        LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: CALLBACK_STATIC %p\n", (void *)msg));
-        msg->msg.cb.function(msg->msg.cb.ctx);
-      break;
-
-      default:
-        LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: invalid message: %d\n", msg->type));
-        LWIP_ASSERT("tcpip_thread: invalid message", 0);
-      break;
-    }
-  }
-}
-
-/**
- * Pass a received packet to tcpip_thread for input processing
- *
- * @param p the received packet
- * @param inp the network interface on which the packet was received
- * @param input_fn input function to call
- */
-err_t tcpip_inpkt(struct pbuf *p, struct netif *inp, netif_input_fn input_fn) {
-#if LWIP_TCPIP_CORE_LOCKING_INPUT
-  err_t ret;
-  LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_inpkt: PACKET %p/%p\n", (void *)p, (void *)inp));
-  LOCK_TCPIP_CORE();
-  ret = input_fn(p, inp);
-  UNLOCK_TCPIP_CORE();
-  return ret;
-#else /* LWIP_TCPIP_CORE_LOCKING_INPUT */
-  struct tcpip_msg *msg;
-
-  LWIP_ASSERT("Invalid mbox", sys_mbox_valid_val(mbox));
-
-  msg = (struct tcpip_msg *) memp_malloc(MEMP_TCPIP_MSG_INPKT);
-  if (msg == NULL) {
-    return ERR_MEM;
-  }
-
-  msg->type = TCPIP_MSG_INPKT;
-  msg->msg.inp.p = p;
-  msg->msg.inp.netif = inp;
-  msg->msg.inp.input_fn = input_fn;
-  if (sys_mbox_trypost(&mbox, msg) != ERR_OK) {
-    kprintf("INPKT %i\n", __LINE__);
-    memp_free(MEMP_TCPIP_MSG_INPKT, msg);
-    kprintf("INPKT %i\n", __LINE__);
-    return ERR_MEM;
-  }
-  return ERR_OK;
-#endif /* LWIP_TCPIP_CORE_LOCKING_INPUT */
-}
-
-/**
- * @ingroup lwip_os
- * Pass a received packet to tcpip_thread for input processing with
- * ethernet_input or ip_input. Don't call directly, pass to netif_add()
- * and call netif->input().
- *
- * @param p the received packet, p->payload pointing to the Ethernet header or
- *          to an IP header (if inp doesn't have NETIF_FLAG_ETHARP or
- *          NETIF_FLAG_ETHERNET flags)
- * @param inp the network interface on which the packet was received
- */
-err_t tcpip_input(struct pbuf *p, struct netif *inp) {
-#if LWIP_ETHERNET
-  //kprintf("tcpip_input0\n");
-  if (inp->flags & (NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET)) {
-    //kprintf("tcpip_input1\n");
-    return tcpip_inpkt(p, inp, ethernet_input);
-  }
-  else
-#endif /* LWIP_ETHERNET */
-    //kprintf("tcpip_input2\n");
-    return tcpip_inpkt(p, inp, ip_input);
-  //kprintf("tcpip_input3\n");
-}
-
-/**
- * Call a specific function in the thread context of
- * tcpip_thread for easy access synchronization.
- * A function called in that way may access lwIP core code
- * without fearing concurrent access.
- *
- * @param function the function to call
- * @param ctx parameter passed to f
- * @param block 1 to block until the request is posted, 0 to non-blocking mode
- * @return ERR_OK if the function was called, another err_t if not
- */
-err_t tcpip_callback_with_block(tcpip_callback_fn function, void *ctx, u8_t block) {
-  struct tcpip_msg *msg;
-
-  LWIP_ASSERT("Invalid mbox", sys_mbox_valid_val(mbox));
-
-  msg = (struct tcpip_msg *) memp_malloc(MEMP_TCPIP_MSG_API);
-  if (msg == NULL) {
-    return ERR_MEM;
-  }
-
-  msg->type = TCPIP_MSG_CALLBACK;
-  msg->msg.cb.function = function;
-  msg->msg.cb.ctx = ctx;
-  if (block) {
-    sys_mbox_post(&mbox, msg);
-  }
-  else {
-    if (sys_mbox_trypost(&mbox, msg) != ERR_OK) {
-      memp_free(MEMP_TCPIP_MSG_API, msg);
-      return ERR_MEM;
-    }
-  }
-  return ERR_OK;
-}
-
-#if LWIP_TCPIP_TIMEOUT && LWIP_TIMERS
-/**
- * call sys_timeout in tcpip_thread
- *
- * @param msecs time in milliseconds for timeout
- * @param h function to be called on timeout
- * @param arg argument to pass to timeout function h
- * @return ERR_MEM on memory error, ERR_OK otherwise
- */
-err_t
-tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg)
-{
-  struct tcpip_msg *msg;
-
-  LWIP_ASSERT("Invalid mbox", sys_mbox_valid_val(mbox));
-
-  msg = (struct tcpip_msg *)memp_malloc(MEMP_TCPIP_MSG_API);
-  if (msg == NULL) {
-    return ERR_MEM;
-  }
-
-  msg->type = TCPIP_MSG_TIMEOUT;
-  msg->msg.tmo.msecs = msecs;
-  msg->msg.tmo.h = h;
-  msg->msg.tmo.arg = arg;
-  sys_mbox_post(&mbox, msg);
-  return ERR_OK;
-}
-
-/**
- * call sys_untimeout in tcpip_thread
- *
- * @param h function to be called on timeout
- * @param arg argument to pass to timeout function h
- * @return ERR_MEM on memory error, ERR_OK otherwise
- */
-err_t
-tcpip_untimeout(sys_timeout_handler h, void *arg)
-{
-  struct tcpip_msg *msg;
-
-  LWIP_ASSERT("Invalid mbox", sys_mbox_valid_val(mbox));
-
-  msg = (struct tcpip_msg *)memp_malloc(MEMP_TCPIP_MSG_API);
-  if (msg == NULL) {
-    return ERR_MEM;
-  }
-
-  msg->type = TCPIP_MSG_UNTIMEOUT;
-  msg->msg.tmo.h = h;
-  msg->msg.tmo.arg = arg;
-  sys_mbox_post(&mbox, msg);
-  return ERR_OK;
-}
-#endif /* LWIP_TCPIP_TIMEOUT && LWIP_TIMERS */
-
-/**
- * Sends a message to TCPIP thread to call a function. Caller thread blocks on
- * on a provided semaphore, which ist NOT automatically signalled by TCPIP thread,
- * this has to be done by the user.
- * It is recommended to use LWIP_TCPIP_CORE_LOCKING since this is the way
- * with least runtime overhead.
- *
- * @param fn function to be called from TCPIP thread
- * @param apimsg argument to API function
- * @param sem semaphore to wait on
- * @return ERR_OK if the function was called, another err_t if not
- */
-err_t tcpip_send_msg_wait_sem(tcpip_callback_fn fn, void *apimsg, sys_sem_t* sem) {
-#if LWIP_TCPIP_CORE_LOCKING
-  LWIP_UNUSED_ARG(sem);
-  LOCK_TCPIP_CORE();
-  fn(apimsg);
-  UNLOCK_TCPIP_CORE();
-  return ERR_OK;
-#else /* LWIP_TCPIP_CORE_LOCKING */
-  TCPIP_MSG_VAR_DECLARE(msg);
-
-  LWIP_ASSERT("semaphore not initialized", sys_sem_valid(sem));
-  LWIP_ASSERT("Invalid mbox", sys_mbox_valid_val(mbox));
-
-  TCPIP_MSG_VAR_ALLOC(msg);
-  TCPIP_MSG_VAR_REF(msg).type = TCPIP_MSG_API;
-  TCPIP_MSG_VAR_REF(msg).msg.api_msg.function = fn;
-  TCPIP_MSG_VAR_REF(msg).msg.api_msg.msg = apimsg;
-  sys_mbox_post(&mbox, &TCPIP_MSG_VAR_REF(msg));
-  sys_arch_sem_wait(sem, 0);
-  TCPIP_MSG_VAR_FREE(msg);
-  return ERR_OK;
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-}
-
-/**
- * Synchronously calls function in TCPIP thread and waits for its completion.
- * It is recommended to use LWIP_TCPIP_CORE_LOCKING (preferred) or
- * LWIP_NETCONN_SEM_PER_THREAD. 
- * If not, a semaphore is created and destroyed on every call which is usually
- * an expensive/slow operation.
- * @param fn Function to call
- * @param call Call parameters
- * @return Return value from tcpip_api_call_fn
- */
-err_t tcpip_api_call(tcpip_api_call_fn fn, struct tcpip_api_call_data *call) {
-#if LWIP_TCPIP_CORE_LOCKING
-  err_t err;
-  LOCK_TCPIP_CORE();
-  err = fn(call);
-  UNLOCK_TCPIP_CORE();
-  return err;
-#else /* LWIP_TCPIP_CORE_LOCKING */
-  TCPIP_MSG_VAR_DECLARE(msg);
-
-#if !LWIP_NETCONN_SEM_PER_THREAD
-  err_t err = sys_sem_new(&call->sem, 0);
-  if (err != ERR_OK) {
-    return err;
-  }
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-  LWIP_ASSERT("Invalid mbox", sys_mbox_valid_val(mbox));
-
-  TCPIP_MSG_VAR_ALLOC(msg);
-  TCPIP_MSG_VAR_REF(msg).type = TCPIP_MSG_API_CALL;
-  TCPIP_MSG_VAR_REF(msg).msg.api_call.arg = call;
-  TCPIP_MSG_VAR_REF(msg).msg.api_call.function = fn;
-#if LWIP_NETCONN_SEM_PER_THREAD
-  TCPIP_MSG_VAR_REF(msg).msg.api_call.sem = LWIP_NETCONN_THREAD_SEM_GET();
-#else /* LWIP_NETCONN_SEM_PER_THREAD */
-  TCPIP_MSG_VAR_REF(msg).msg.api_call.sem = &call->sem;
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-  sys_mbox_post(&mbox, &TCPIP_MSG_VAR_REF(msg));
-  sys_arch_sem_wait(TCPIP_MSG_VAR_REF(msg).msg.api_call.sem, 0);
-  TCPIP_MSG_VAR_FREE(msg);
-
-#if !LWIP_NETCONN_SEM_PER_THREAD
-  sys_sem_free(&call->sem);
-#endif /* LWIP_NETCONN_SEM_PER_THREAD */
-
-  return call->err;
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-}
-
-/**
- * Allocate a structure for a static callback message and initialize it.
- * This is intended to be used to send "static" messages from interrupt context.
- *
- * @param function the function to call
- * @param ctx parameter passed to function
- * @return a struct pointer to pass to tcpip_trycallback().
- */
-struct tcpip_callback_msg*
-tcpip_callbackmsg_new(tcpip_callback_fn function, void *ctx) {
-  struct tcpip_msg *msg = (struct tcpip_msg *) memp_malloc(MEMP_TCPIP_MSG_API);
-  if (msg == NULL) {
-    return NULL;
-  }
-  msg->type = TCPIP_MSG_CALLBACK_STATIC;
-  msg->msg.cb.function = function;
-  msg->msg.cb.ctx = ctx;
-  return (struct tcpip_callback_msg*) msg;
-}
-
-/**
- * Free a callback message allocated by tcpip_callbackmsg_new().
- *
- * @param msg the message to free
- */
-void tcpip_callbackmsg_delete(struct tcpip_callback_msg* msg) {
-  memp_free(MEMP_TCPIP_MSG_API, msg);
-}
-
-/**
- * Try to post a callback-message to the tcpip_thread mbox
- * This is intended to be used to send "static" messages from interrupt context.
- *
- * @param msg pointer to the message to post
- * @return sys_mbox_trypost() return code
- */
-err_t tcpip_trycallback(struct tcpip_callback_msg* msg) {
-  LWIP_ASSERT("Invalid mbox", sys_mbox_valid_val(mbox));
-  return sys_mbox_trypost(&mbox, msg);
-}
-
-/**
- * @ingroup lwip_os
- * Initialize this module:
- * - initialize all sub modules
- * - start the tcpip_thread
- *
- * @param initfunc a function to call when tcpip_thread is running and finished initializing
- * @param arg argument to pass to initfunc
- */
-void tcpip_init(tcpip_init_done_fn initfunc, void *arg) {
-  lwip_init();
-
-  tcpip_init_done = initfunc;
-  tcpip_init_done_arg = arg;
-  if (sys_mbox_new(&mbox, TCPIP_MBOX_SIZE) != ERR_OK) {
-    LWIP_ASSERT("failed to create tcpip_thread mbox", 0);
-  }
-#if LWIP_TCPIP_CORE_LOCKING
-  if (sys_mutex_new(&lock_tcpip_core) != ERR_OK) {
-    LWIP_ASSERT("failed to create lock_tcpip_core", 0);
-  }
-#endif /* LWIP_TCPIP_CORE_LOCKING */
-
-  sys_thread_new(TCPIP_THREAD_NAME, tcpip_thread, NULL, TCPIP_THREAD_STACKSIZE, TCPIP_THREAD_PRIO);
-}
-
-/**
- * Simple callback function used with tcpip_callback to free a pbuf
- * (pbuf_free has a wrong signature for tcpip_callback)
- *
- * @param p The pbuf (chain) to be dereferenced.
- */
-static void pbuf_free_int(void *p) {
-  struct pbuf *q = (struct pbuf *) p;
-  pbuf_free(q);
-}
-
-/**
- * A simple wrapper function that allows you to free a pbuf from interrupt context.
- *
- * @param p The pbuf (chain) to be dereferenced.
- * @return ERR_OK if callback could be enqueued, an err_t if not
- */
-err_t pbuf_free_callback(struct pbuf *p) {
-  return tcpip_callback_with_block(pbuf_free_int, p, 0);
-}
-
-/**
- * A simple wrapper function that allows you to free heap memory from
- * interrupt context.
- *
- * @param m the heap memory to free
- * @return ERR_OK if callback could be enqueued, an err_t if not
- */
-err_t mem_free_callback(void *m) {
-  return tcpip_callback_with_block(mem_free, m, 0);
-}
-
-#endif /* !NO_SYS */
diff --git a/sys/net/core/Makefile b/sys/net/core/Makefile
deleted file mode 100644
index 103838a..0000000
--- a/sys/net/core/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile,v 1.2 2004/07/20 21:17:05 reddawg Exp $
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#  Objects
-OBJS = def.o dns.o inet_chksum.o init.o ip.o mem.o memp.o netif.o pbuf.o raw.o stats.o sys.o tcp.o tcp_in.o tcp_out.o timeouts.o udp.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -S -o $@ $<
-.c.o:
-	$(CC) ${CFLAGS} -I../../include -c -o $@ $<
-.c.s:
-	$(CC) ${CFLAGS} -I../../include -S -o $@ $<
-.S.o:
-	$(CC) ${CFLAGS} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-	
diff --git a/sys/net/core/def.c b/sys/net/core/def.c
deleted file mode 100644
index bfa98af..0000000
--- a/sys/net/core/def.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * @file
- * Common functions used throughout the stack.
- *
- * These are reference implementations of the byte swapping functions.
- * Again with the aim of being simple, correct and fully portable.
- * Byte swapping is the second thing you would want to optimize. You will
- * need to port it to your architecture and in your cc.h:
- *
- * \#define lwip_htons(x) your_htons
- * \#define lwip_htonl(x) your_htonl
- *
- * Note lwip_ntohs() and lwip_ntohl() are merely references to the htonx counterparts.
- * 
- * If you \#define them to htons() and htonl(), you should
- * \#define LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS to prevent lwIP from
- * defining htonx/ntohx compatibility macros.
-
- * @defgroup sys_nonstandard Non-standard functions
- * @ingroup sys_layer
- * lwIP provides default implementations for non-standard functions.
- * These can be mapped to OS functions to reduce code footprint if desired.
- * All defines related to this section must not be placed in lwipopts.h,
- * but in arch/cc.h!
- * These options cannot be \#defined in lwipopts.h since they are not options
- * of lwIP itself, but options of the lwIP port to your system.
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Simon Goldschmidt
- *
- */
-
-#include "net/opt.h"
-#include "net/def.h"
-
-#include <string.h>
-
-#if BYTE_ORDER == LITTLE_ENDIAN
-
-#if !defined(lwip_htons)
-/**
- * Convert an u16_t from host- to network byte order.
- *
- * @param n u16_t in host byte order
- * @return n in network byte order
- */
-u16_t
-lwip_htons(u16_t n)
-{
-  return (u16_t)PP_HTONS(n);
-}
-#endif /* lwip_htons */
-
-#if !defined(lwip_htonl)
-/**
- * Convert an u32_t from host- to network byte order.
- *
- * @param n u32_t in host byte order
- * @return n in network byte order
- */
-u32_t
-lwip_htonl(u32_t n)
-{
-  return (u32_t)PP_HTONL(n);
-}
-#endif /* lwip_htonl */
-
-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
-
-#ifndef lwip_strnstr
-/**
- * @ingroup sys_nonstandard
- * lwIP default implementation for strnstr() non-standard function.
- * This can be \#defined to strnstr() depending on your platform port.
- */
-char*
-lwip_strnstr(const char* buffer, const char* token, size_t n)
-{
-  const char* p;
-  size_t tokenlen = strlen(token);
-  if (tokenlen == 0) {
-    return LWIP_CONST_CAST(char *, buffer);
-  }
-  for (p = buffer; *p && (p + tokenlen <= buffer + n); p++) {
-    if ((*p == *token) && (strncmp(p, token, tokenlen) == 0)) {
-      return LWIP_CONST_CAST(char *, p);
-    }
-  }
-  return NULL;
-}
-#endif
-
-#ifndef lwip_stricmp
-/**
- * @ingroup sys_nonstandard
- * lwIP default implementation for stricmp() non-standard function.
- * This can be \#defined to stricmp() depending on your platform port.
- */
-int
-lwip_stricmp(const char* str1, const char* str2)
-{
-  char c1, c2;
-
-  do {
-    c1 = *str1++;
-    c2 = *str2++;
-    if (c1 != c2) {
-      char c1_upc = c1 | 0x20;
-      if ((c1_upc >= 'a') && (c1_upc <= 'z')) {
-        /* characters are not equal an one is in the alphabet range:
-        downcase both chars and check again */
-        char c2_upc = c2 | 0x20;
-        if (c1_upc != c2_upc) {
-          /* still not equal */
-          /* don't care for < or > */
-          return 1;
-        }
-      } else {
-        /* characters are not equal but none is in the alphabet range */
-        return 1;
-      }
-    }
-  } while (c1 != 0);
-  return 0;
-}
-#endif
-
-#ifndef lwip_strnicmp
-/**
- * @ingroup sys_nonstandard
- * lwIP default implementation for strnicmp() non-standard function.
- * This can be \#defined to strnicmp() depending on your platform port.
- */
-int
-lwip_strnicmp(const char* str1, const char* str2, size_t len)
-{
-  char c1, c2;
-
-  do {
-    c1 = *str1++;
-    c2 = *str2++;
-    if (c1 != c2) {
-      char c1_upc = c1 | 0x20;
-      if ((c1_upc >= 'a') && (c1_upc <= 'z')) {
-        /* characters are not equal an one is in the alphabet range:
-        downcase both chars and check again */
-        char c2_upc = c2 | 0x20;
-        if (c1_upc != c2_upc) {
-          /* still not equal */
-          /* don't care for < or > */
-          return 1;
-        }
-      } else {
-        /* characters are not equal but none is in the alphabet range */
-        return 1;
-      }
-    }
-  } while (len-- && c1 != 0);
-  return 0;
-}
-#endif
-
-#ifndef lwip_itoa
-/**
- * @ingroup sys_nonstandard
- * lwIP default implementation for itoa() non-standard function.
- * This can be \#defined to itoa() or snprintf(result, bufsize, "%d", number) depending on your platform port.
- */
-void
-lwip_itoa(char* result, size_t bufsize, int number)
-{
-  const int base = 10;
-  char* ptr = result, *ptr1 = result, tmp_char;
-  int tmp_value;
-  LWIP_UNUSED_ARG(bufsize);
-
-  do {
-    tmp_value = number;
-    number /= base;
-    *ptr++ = "zyxwvutsrqponmlkjihgfedcba9876543210123456789abcdefghijklmnopqrstuvwxyz"[35 + (tmp_value - number * base)];
-  } while(number);
-
-   /* Apply negative sign */
-  if (tmp_value < 0) {
-     *ptr++ = '-';
-  }
-  *ptr-- = '\0';
-  while(ptr1 < ptr) {
-    tmp_char = *ptr;
-    *ptr--= *ptr1;
-    *ptr1++ = tmp_char;
-  }
-}
-#endif
diff --git a/sys/net/core/dns.c b/sys/net/core/dns.c
deleted file mode 100644
index f092ec5..0000000
--- a/sys/net/core/dns.c
+++ /dev/null
@@ -1,1573 +0,0 @@
-/**
- * @file
- * DNS - host name to IP address resolver.
- *
- * @defgroup dns DNS
- * @ingroup callbackstyle_api
- *
- * Implements a DNS host name to IP address resolver.
- *
- * The lwIP DNS resolver functions are used to lookup a host name and
- * map it to a numerical IP address. It maintains a list of resolved
- * hostnames that can be queried with the dns_lookup() function.
- * New hostnames can be resolved using the dns_query() function.
- *
- * The lwIP version of the resolver also adds a non-blocking version of
- * gethostbyname() that will work with a raw API application. This function
- * checks for an IP address string first and converts it if it is valid.
- * gethostbyname() then does a dns_lookup() to see if the name is
- * already in the table. If so, the IP is returned. If not, a query is
- * issued and the function returns with a ERR_INPROGRESS status. The app
- * using the dns client must then go into a waiting state.
- *
- * Once a hostname has been resolved (or found to be non-existent),
- * the resolver code calls a specified callback function (which
- * must be implemented by the module that uses the resolver).
- * 
- * Multicast DNS queries are supported for names ending on ".local".
- * However, only "One-Shot Multicast DNS Queries" are supported (RFC 6762
- * chapter 5.1), this is not a fully compliant implementation of continuous
- * mDNS querying!
- *
- * All functions must be called from TCPIP thread.
- * 
- * @see @ref netconn_common for thread-safe access.
- */
-
-/*
- * Port to lwIP from uIP
- * by Jim Pettinato April 2007
- *
- * security fixes and more by Simon Goldschmidt
- *
- * uIP version Copyright (c) 2002-2003, Adam Dunkels.
- * 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 ``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 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.
- */
-
-/*-----------------------------------------------------------------------------
- * RFC 1035 - Domain names - implementation and specification
- * RFC 2181 - Clarifications to the DNS Specification
- *----------------------------------------------------------------------------*/
-
-/** @todo: define good default values (rfc compliance) */
-/** @todo: improve answer parsing, more checkings... */
-/** @todo: check RFC1035 - 7.3. Processing responses */
-/** @todo: one-shot mDNS: dual-stack fallback to another IP version */
-
-/*-----------------------------------------------------------------------------
- * Includes
- *----------------------------------------------------------------------------*/
-
-#include "net/opt.h"
-
-#if LWIP_DNS /* don't build if not configured for use in lwipopts.h */
-
-#include "net/def.h"
-#include "net/udp.h"
-#include "net/mem.h"
-#include "net/memp.h"
-#include "net/dns.h"
-#include "net/prot/dns.h"
-
-#include <string.h>
-
-/** Random generator function to create random TXIDs and source ports for queries */
-#ifndef DNS_RAND_TXID
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_XID) != 0)
-#define DNS_RAND_TXID LWIP_RAND
-#else
-static u16_t dns_txid;
-#define DNS_RAND_TXID() (++dns_txid)
-#endif
-#endif
-
-/** Limits the source port to be >= 1024 by default */
-#ifndef DNS_PORT_ALLOWED
-#define DNS_PORT_ALLOWED(port) ((port) >= 1024)
-#endif
-
-/** DNS maximum number of retries when asking for a name, before "timeout". */
-#ifndef DNS_MAX_RETRIES
-#define DNS_MAX_RETRIES           4
-#endif
-
-/** DNS resource record max. TTL (one week as default) */
-#ifndef DNS_MAX_TTL
-#define DNS_MAX_TTL               604800
-#elif DNS_MAX_TTL > 0x7FFFFFFF
-#error DNS_MAX_TTL must be a positive 32-bit value
-#endif
-
-#if DNS_TABLE_SIZE > 255
-#error DNS_TABLE_SIZE must fit into an u8_t
-#endif
-#if DNS_MAX_SERVERS > 255
-#error DNS_MAX_SERVERS must fit into an u8_t
-#endif
-
-/* The number of parallel requests (i.e. calls to dns_gethostbyname
- * that cannot be answered from the DNS table.
- * This is set to the table size by default.
- */
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_NO_MULTIPLE_OUTSTANDING) != 0)
-#ifndef DNS_MAX_REQUESTS
-#define DNS_MAX_REQUESTS          DNS_TABLE_SIZE
-#else
-#if DNS_MAX_REQUESTS > 255
-#error DNS_MAX_REQUESTS must fit into an u8_t
-#endif
-#endif
-#else
-/* In this configuration, both arrays have to have the same size and are used
- * like one entry (used/free) */
-#define DNS_MAX_REQUESTS          DNS_TABLE_SIZE
-#endif
-
-/* The number of UDP source ports used in parallel */
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) != 0)
-#ifndef DNS_MAX_SOURCE_PORTS
-#define DNS_MAX_SOURCE_PORTS      DNS_MAX_REQUESTS
-#else
-#if DNS_MAX_SOURCE_PORTS > 255
-#error DNS_MAX_SOURCE_PORTS must fit into an u8_t
-#endif
-#endif
-#else
-#ifdef DNS_MAX_SOURCE_PORTS
-#undef DNS_MAX_SOURCE_PORTS
-#endif
-#define DNS_MAX_SOURCE_PORTS      1
-#endif
-
-#if LWIP_IPV4 && LWIP_IPV6
-#define LWIP_DNS_ADDRTYPE_IS_IPV6(t) (((t) == LWIP_DNS_ADDRTYPE_IPV6_IPV4) || ((t) == LWIP_DNS_ADDRTYPE_IPV6))
-#define LWIP_DNS_ADDRTYPE_MATCH_IP(t, ip) (IP_IS_V6_VAL(ip) ? LWIP_DNS_ADDRTYPE_IS_IPV6(t) : (!LWIP_DNS_ADDRTYPE_IS_IPV6(t)))
-#define LWIP_DNS_ADDRTYPE_ARG(x) , x
-#define LWIP_DNS_ADDRTYPE_ARG_OR_ZERO(x) x
-#define LWIP_DNS_SET_ADDRTYPE(x, y) do { x = y; } while(0)
-#else
-#if LWIP_IPV6
-#define LWIP_DNS_ADDRTYPE_IS_IPV6(t) 1
-#else
-#define LWIP_DNS_ADDRTYPE_IS_IPV6(t) 0
-#endif
-#define LWIP_DNS_ADDRTYPE_MATCH_IP(t, ip) 1
-#define LWIP_DNS_ADDRTYPE_ARG(x)
-#define LWIP_DNS_ADDRTYPE_ARG_OR_ZERO(x) 0
-#define LWIP_DNS_SET_ADDRTYPE(x, y)
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-#if LWIP_DNS_SUPPORT_MDNS_QUERIES
-#define LWIP_DNS_ISMDNS_ARG(x) , x
-#else
-#define LWIP_DNS_ISMDNS_ARG(x)
-#endif
-
-/** DNS query message structure.
-    No packing needed: only used locally on the stack. */
-struct dns_query {
-  /* DNS query record starts with either a domain name or a pointer
-     to a name already present somewhere in the packet. */
-  u16_t type;
-  u16_t cls;
-};
-#define SIZEOF_DNS_QUERY 4
-
-/** DNS answer message structure.
-    No packing needed: only used locally on the stack. */
-struct dns_answer {
-  /* DNS answer record starts with either a domain name or a pointer
-     to a name already present somewhere in the packet. */
-  u16_t type;
-  u16_t cls;
-  u32_t ttl;
-  u16_t len;
-};
-#define SIZEOF_DNS_ANSWER 10
-/* maximum allowed size for the struct due to non-packed */
-#define SIZEOF_DNS_ANSWER_ASSERT 12
-
-/* DNS table entry states */
-typedef enum {
-  DNS_STATE_UNUSED           = 0,
-  DNS_STATE_NEW              = 1,
-  DNS_STATE_ASKING           = 2,
-  DNS_STATE_DONE             = 3
-} dns_state_enum_t;
-
-/** DNS table entry */
-struct dns_table_entry {
-  u32_t ttl;
-  ip_addr_t ipaddr;
-  u16_t txid;
-  u8_t  state;
-  u8_t  server_idx;
-  u8_t  tmr;
-  u8_t  retries;
-  u8_t  seqno;
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) != 0)
-  u8_t pcb_idx;
-#endif
-  char name[DNS_MAX_NAME_LENGTH];
-#if LWIP_IPV4 && LWIP_IPV6
-  u8_t reqaddrtype;
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-#if LWIP_DNS_SUPPORT_MDNS_QUERIES
-  u8_t is_mdns;
-#endif
-};
-
-/** DNS request table entry: used when dns_gehostbyname cannot answer the
- * request from the DNS table */
-struct dns_req_entry {
-  /* pointer to callback on DNS query done */
-  dns_found_callback found;
-  /* argument passed to the callback function */
-  void *arg;
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_NO_MULTIPLE_OUTSTANDING) != 0)
-  u8_t dns_table_idx;
-#endif
-#if LWIP_IPV4 && LWIP_IPV6
-  u8_t reqaddrtype;
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-};
-
-#if DNS_LOCAL_HOSTLIST
-
-#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
-/** Local host-list. For hostnames in this list, no
- *  external name resolution is performed */
-static struct local_hostlist_entry *local_hostlist_dynamic;
-#else /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-
-/** Defining this allows the local_hostlist_static to be placed in a different
- * linker section (e.g. FLASH) */
-#ifndef DNS_LOCAL_HOSTLIST_STORAGE_PRE
-#define DNS_LOCAL_HOSTLIST_STORAGE_PRE static
-#endif /* DNS_LOCAL_HOSTLIST_STORAGE_PRE */
-/** Defining this allows the local_hostlist_static to be placed in a different
- * linker section (e.g. FLASH) */
-#ifndef DNS_LOCAL_HOSTLIST_STORAGE_POST
-#define DNS_LOCAL_HOSTLIST_STORAGE_POST
-#endif /* DNS_LOCAL_HOSTLIST_STORAGE_POST */
-DNS_LOCAL_HOSTLIST_STORAGE_PRE struct local_hostlist_entry local_hostlist_static[]
-  DNS_LOCAL_HOSTLIST_STORAGE_POST = DNS_LOCAL_HOSTLIST_INIT;
-
-#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-
-static void dns_init_local(void);
-static err_t dns_lookup_local(const char *hostname, ip_addr_t *addr LWIP_DNS_ADDRTYPE_ARG(u8_t dns_addrtype));
-#endif /* DNS_LOCAL_HOSTLIST */
-
-
-/* forward declarations */
-static void dns_recv(void *s, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port);
-static void dns_check_entries(void);
-static void dns_call_found(u8_t idx, ip_addr_t* addr);
-
-/*-----------------------------------------------------------------------------
- * Globals
- *----------------------------------------------------------------------------*/
-
-/* DNS variables */
-static struct udp_pcb        *dns_pcbs[DNS_MAX_SOURCE_PORTS];
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) != 0)
-static u8_t                   dns_last_pcb_idx;
-#endif
-static u8_t                   dns_seqno;
-static struct dns_table_entry dns_table[DNS_TABLE_SIZE];
-static struct dns_req_entry   dns_requests[DNS_MAX_REQUESTS];
-static ip_addr_t              dns_servers[DNS_MAX_SERVERS];
-
-#if LWIP_IPV4
-const ip_addr_t dns_mquery_v4group = DNS_MQUERY_IPV4_GROUP_INIT;
-#endif /* LWIP_IPV4 */
-#if LWIP_IPV6
-const ip_addr_t dns_mquery_v6group = DNS_MQUERY_IPV6_GROUP_INIT;
-#endif /* LWIP_IPV6 */
-
-/**
- * Initialize the resolver: set up the UDP pcb and configure the default server
- * (if DNS_SERVER_ADDRESS is set).
- */
-void
-dns_init(void)
-{
-#ifdef DNS_SERVER_ADDRESS
-  /* initialize default DNS server address */
-  ip_addr_t dnsserver;
-  DNS_SERVER_ADDRESS(&dnsserver);
-  dns_setserver(0, &dnsserver);
-#endif /* DNS_SERVER_ADDRESS */
-
-  LWIP_ASSERT("sanity check SIZEOF_DNS_QUERY",
-    sizeof(struct dns_query) == SIZEOF_DNS_QUERY);
-  LWIP_ASSERT("sanity check SIZEOF_DNS_ANSWER",
-    sizeof(struct dns_answer) <= SIZEOF_DNS_ANSWER_ASSERT);
-
-  LWIP_DEBUGF(DNS_DEBUG, ("dns_init: initializing\n"));
-
-  /* if dns client not yet initialized... */
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) == 0)
-  if (dns_pcbs[0] == NULL) {
-    dns_pcbs[0] = udp_new_ip_type(IPADDR_TYPE_ANY);
-    LWIP_ASSERT("dns_pcbs[0] != NULL", dns_pcbs[0] != NULL);
-
-    /* initialize DNS table not needed (initialized to zero since it is a
-     * global variable) */
-    LWIP_ASSERT("For implicit initialization to work, DNS_STATE_UNUSED needs to be 0",
-      DNS_STATE_UNUSED == 0);
-
-    /* initialize DNS client */
-    udp_bind(dns_pcbs[0], IP_ANY_TYPE, 0);
-    udp_recv(dns_pcbs[0], dns_recv, NULL);
-  }
-#endif
-
-#if DNS_LOCAL_HOSTLIST
-  dns_init_local();
-#endif
-}
-
-/**
- * @ingroup dns
- * Initialize one of the DNS servers.
- *
- * @param numdns the index of the DNS server to set must be < DNS_MAX_SERVERS
- * @param dnsserver IP address of the DNS server to set
- */
-void
-dns_setserver(u8_t numdns, const ip_addr_t *dnsserver)
-{
-  if (numdns < DNS_MAX_SERVERS) {
-    if (dnsserver != NULL) {
-      dns_servers[numdns] = (*dnsserver);
-    } else {
-      dns_servers[numdns] = *IP_ADDR_ANY;
-    }
-  }
-}
-
-/**
- * @ingroup dns
- * Obtain one of the currently configured DNS server.
- *
- * @param numdns the index of the DNS server
- * @return IP address of the indexed DNS server or "ip_addr_any" if the DNS
- *         server has not been configured.
- */
-const ip_addr_t*
-dns_getserver(u8_t numdns)
-{
-  if (numdns < DNS_MAX_SERVERS) {
-    return &dns_servers[numdns];
-  } else {
-    return IP_ADDR_ANY;
-  }
-}
-
-/**
- * The DNS resolver client timer - handle retries and timeouts and should
- * be called every DNS_TMR_INTERVAL milliseconds (every second by default).
- */
-void
-dns_tmr(void)
-{
-  LWIP_DEBUGF(DNS_DEBUG, ("dns_tmr: dns_check_entries\n"));
-  dns_check_entries();
-}
-
-#if DNS_LOCAL_HOSTLIST
-static void
-dns_init_local(void)
-{
-#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC && defined(DNS_LOCAL_HOSTLIST_INIT)
-  size_t i;
-  struct local_hostlist_entry *entry;
-  /* Dynamic: copy entries from DNS_LOCAL_HOSTLIST_INIT to list */
-  struct local_hostlist_entry local_hostlist_init[] = DNS_LOCAL_HOSTLIST_INIT;
-  size_t namelen;
-  for (i = 0; i < LWIP_ARRAYSIZE(local_hostlist_init); i++) {
-    struct local_hostlist_entry *init_entry = &local_hostlist_init[i];
-    LWIP_ASSERT("invalid host name (NULL)", init_entry->name != NULL);
-    namelen = strlen(init_entry->name);
-    LWIP_ASSERT("namelen <= DNS_LOCAL_HOSTLIST_MAX_NAMELEN", namelen <= DNS_LOCAL_HOSTLIST_MAX_NAMELEN);
-    entry = (struct local_hostlist_entry *)memp_malloc(MEMP_LOCALHOSTLIST);
-    LWIP_ASSERT("mem-error in dns_init_local", entry != NULL);
-    if (entry != NULL) {
-      char* entry_name = (char*)entry + sizeof(struct local_hostlist_entry);
-      MEMCPY(entry_name, init_entry->name, namelen);
-      entry_name[namelen] = 0;
-      entry->name = entry_name;
-      entry->addr = init_entry->addr;
-      entry->next = local_hostlist_dynamic;
-      local_hostlist_dynamic = entry;
-    }
-  }
-#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC && defined(DNS_LOCAL_HOSTLIST_INIT) */
-}
-
-/**
- * @ingroup dns
- * Iterate the local host-list for a hostname.
- *
- * @param iterator_fn a function that is called for every entry in the local host-list
- * @param iterator_arg 3rd argument passed to iterator_fn
- * @return the number of entries in the local host-list
- */
-size_t
-dns_local_iterate(dns_found_callback iterator_fn, void *iterator_arg)
-{
-  size_t i;
-#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
-  struct local_hostlist_entry *entry = local_hostlist_dynamic;
-  i = 0;
-  while (entry != NULL) {
-    if (iterator_fn != NULL) {
-      iterator_fn(entry->name, &entry->addr, iterator_arg);
-    }
-    i++;
-    entry = entry->next;
-  }
-#else /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-  for (i = 0; i < LWIP_ARRAYSIZE(local_hostlist_static); i++) {
-    if (iterator_fn != NULL) {
-      iterator_fn(local_hostlist_static[i].name, &local_hostlist_static[i].addr, iterator_arg);
-    }
-  }
-#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-  return i;
-}
-
-/**
- * @ingroup dns
- * Scans the local host-list for a hostname.
- *
- * @param hostname Hostname to look for in the local host-list
- * @param addr the first IP address for the hostname in the local host-list or
- *         IPADDR_NONE if not found.
- * @param dns_addrtype - LWIP_DNS_ADDRTYPE_IPV4_IPV6: try to resolve IPv4 (ATTENTION: no fallback here!)
- *                     - LWIP_DNS_ADDRTYPE_IPV6_IPV4: try to resolve IPv6 (ATTENTION: no fallback here!)
- *                     - LWIP_DNS_ADDRTYPE_IPV4: try to resolve IPv4 only
- *                     - LWIP_DNS_ADDRTYPE_IPV6: try to resolve IPv6 only
- * @return ERR_OK if found, ERR_ARG if not found
- */
-err_t
-dns_local_lookup(const char *hostname, ip_addr_t *addr, u8_t dns_addrtype)
-{
-  LWIP_UNUSED_ARG(dns_addrtype);
-  return dns_lookup_local(hostname, addr LWIP_DNS_ADDRTYPE_ARG(dns_addrtype));
-}
-
-/* Internal implementation for dns_local_lookup and dns_lookup */
-static err_t
-dns_lookup_local(const char *hostname, ip_addr_t *addr LWIP_DNS_ADDRTYPE_ARG(u8_t dns_addrtype))
-{
-#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
-  struct local_hostlist_entry *entry = local_hostlist_dynamic;
-  while (entry != NULL) {
-    if ((lwip_stricmp(entry->name, hostname) == 0) &&
-        LWIP_DNS_ADDRTYPE_MATCH_IP(dns_addrtype, entry->addr)) {
-      if (addr) {
-        ip_addr_copy(*addr, entry->addr);
-      }
-      return ERR_OK;
-    }
-    entry = entry->next;
-  }
-#else /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-  size_t i;
-  for (i = 0; i < LWIP_ARRAYSIZE(local_hostlist_static); i++) {
-    if ((lwip_stricmp(local_hostlist_static[i].name, hostname) == 0) &&
-        LWIP_DNS_ADDRTYPE_MATCH_IP(dns_addrtype, local_hostlist_static[i].addr)) {
-      if (addr) {
-        ip_addr_copy(*addr, local_hostlist_static[i].addr);
-      }
-      return ERR_OK;
-    }
-  }
-#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC */
-  return ERR_ARG;
-}
-
-#if DNS_LOCAL_HOSTLIST_IS_DYNAMIC
-/**
- * @ingroup dns
- * Remove all entries from the local host-list for a specific hostname
- * and/or IP address
- *
- * @param hostname hostname for which entries shall be removed from the local
- *                 host-list
- * @param addr address for which entries shall be removed from the local host-list
- * @return the number of removed entries
- */
-int
-dns_local_removehost(const char *hostname, const ip_addr_t *addr)
-{
-  int removed = 0;
-  struct local_hostlist_entry *entry = local_hostlist_dynamic;
-  struct local_hostlist_entry *last_entry = NULL;
-  while (entry != NULL) {
-    if (((hostname == NULL) || !lwip_stricmp(entry->name, hostname)) &&
-        ((addr == NULL) || ip_addr_cmp(&entry->addr, addr))) {
-      struct local_hostlist_entry *free_entry;
-      if (last_entry != NULL) {
-        last_entry->next = entry->next;
-      } else {
-        local_hostlist_dynamic = entry->next;
-      }
-      free_entry = entry;
-      entry = entry->next;
-      memp_free(MEMP_LOCALHOSTLIST, free_entry);
-      removed++;
-    } else {
-      last_entry = entry;
-      entry = entry->next;
-    }
-  }
-  return removed;
-}
-
-/**
- * @ingroup dns
- * Add a hostname/IP address pair to the local host-list.
- * Duplicates are not checked.
- *
- * @param hostname hostname of the new entry
- * @param addr IP address of the new entry
- * @return ERR_OK if succeeded or ERR_MEM on memory error
- */
-err_t
-dns_local_addhost(const char *hostname, const ip_addr_t *addr)
-{
-  struct local_hostlist_entry *entry;
-  size_t namelen;
-  char* entry_name;
-  LWIP_ASSERT("invalid host name (NULL)", hostname != NULL);
-  namelen = strlen(hostname);
-  LWIP_ASSERT("namelen <= DNS_LOCAL_HOSTLIST_MAX_NAMELEN", namelen <= DNS_LOCAL_HOSTLIST_MAX_NAMELEN);
-  entry = (struct local_hostlist_entry *)memp_malloc(MEMP_LOCALHOSTLIST);
-  if (entry == NULL) {
-    return ERR_MEM;
-  }
-  entry_name = (char*)entry + sizeof(struct local_hostlist_entry);
-  MEMCPY(entry_name, hostname, namelen);
-  entry_name[namelen] = 0;
-  entry->name = entry_name;
-  ip_addr_copy(entry->addr, *addr);
-  entry->next = local_hostlist_dynamic;
-  local_hostlist_dynamic = entry;
-  return ERR_OK;
-}
-#endif /* DNS_LOCAL_HOSTLIST_IS_DYNAMIC*/
-#endif /* DNS_LOCAL_HOSTLIST */
-
-/**
- * @ingroup dns
- * Look up a hostname in the array of known hostnames.
- *
- * @note This function only looks in the internal array of known
- * hostnames, it does not send out a query for the hostname if none
- * was found. The function dns_enqueue() can be used to send a query
- * for a hostname.
- *
- * @param name the hostname to look up
- * @param addr the hostname's IP address, as u32_t (instead of ip_addr_t to
- *         better check for failure: != IPADDR_NONE) or IPADDR_NONE if the hostname
- *         was not found in the cached dns_table.
- * @return ERR_OK if found, ERR_ARG if not found
- */
-static err_t
-dns_lookup(const char *name, ip_addr_t *addr LWIP_DNS_ADDRTYPE_ARG(u8_t dns_addrtype))
-{
-  u8_t i;
-#if DNS_LOCAL_HOSTLIST || defined(DNS_LOOKUP_LOCAL_EXTERN)
-#endif /* DNS_LOCAL_HOSTLIST || defined(DNS_LOOKUP_LOCAL_EXTERN) */
-#if DNS_LOCAL_HOSTLIST
-  if (dns_lookup_local(name, addr LWIP_DNS_ADDRTYPE_ARG(dns_addrtype)) == ERR_OK) {
-    return ERR_OK;
-  }
-#endif /* DNS_LOCAL_HOSTLIST */
-#ifdef DNS_LOOKUP_LOCAL_EXTERN
-  if (DNS_LOOKUP_LOCAL_EXTERN(name, addr, LWIP_DNS_ADDRTYPE_ARG_OR_ZERO(dns_addrtype)) == ERR_OK) {
-    return ERR_OK;
-  }
-#endif /* DNS_LOOKUP_LOCAL_EXTERN */
-
-  /* Walk through name list, return entry if found. If not, return NULL. */
-  for (i = 0; i < DNS_TABLE_SIZE; ++i) {
-    if ((dns_table[i].state == DNS_STATE_DONE) &&
-        (lwip_strnicmp(name, dns_table[i].name, sizeof(dns_table[i].name)) == 0) &&
-        LWIP_DNS_ADDRTYPE_MATCH_IP(dns_addrtype, dns_table[i].ipaddr)) {
-      LWIP_DEBUGF(DNS_DEBUG, ("dns_lookup: \"%s\": found = ", name));
-      ip_addr_debug_print(DNS_DEBUG, &(dns_table[i].ipaddr));
-      LWIP_DEBUGF(DNS_DEBUG, ("\n"));
-      if (addr) {
-        ip_addr_copy(*addr, dns_table[i].ipaddr);
-      }
-      return ERR_OK;
-    }
-  }
-
-  return ERR_ARG;
-}
-
-/**
- * Compare the "dotted" name "query" with the encoded name "response"
- * to make sure an answer from the DNS server matches the current dns_table
- * entry (otherwise, answers might arrive late for hostname not on the list
- * any more).
- *
- * @param query hostname (not encoded) from the dns_table
- * @param p pbuf containing the encoded hostname in the DNS response
- * @param start_offset offset into p where the name starts
- * @return 0xFFFF: names differ, other: names equal -> offset behind name
- */
-static u16_t
-dns_compare_name(const char *query, struct pbuf* p, u16_t start_offset)
-{
-  int n;
-  u16_t response_offset = start_offset;
-
-  do {
-    n = pbuf_try_get_at(p, response_offset++);
-    if (n < 0) {
-      return 0xFFFF;
-    }
-    /** @see RFC 1035 - 4.1.4. Message compression */
-    if ((n & 0xc0) == 0xc0) {
-      /* Compressed name: cannot be equal since we don't send them */
-      return 0xFFFF;
-    } else {
-      /* Not compressed name */
-      while (n > 0) {
-        int c = pbuf_try_get_at(p, response_offset);
-        if (c < 0) {
-          return 0xFFFF;
-        }
-        if ((*query) != (u8_t)c) {
-          return 0xFFFF;
-        }
-        ++response_offset;
-        ++query;
-        --n;
-      }
-      ++query;
-    }
-    n = pbuf_try_get_at(p, response_offset);
-    if (n < 0) {
-      return 0xFFFF;
-    }
-  } while (n != 0);
-
-  return response_offset + 1;
-}
-
-/**
- * Walk through a compact encoded DNS name and return the end of the name.
- *
- * @param p pbuf containing the name
- * @param query_idx start index into p pointing to encoded DNS name in the DNS server response
- * @return index to end of the name
- */
-static u16_t
-dns_skip_name(struct pbuf* p, u16_t query_idx)
-{
-  int n;
-  u16_t offset = query_idx;
-
-  do {
-    n = pbuf_try_get_at(p, offset++);
-    if (n < 0) {
-      return 0xFFFF;
-    }
-    /** @see RFC 1035 - 4.1.4. Message compression */
-    if ((n & 0xc0) == 0xc0) {
-      /* Compressed name: since we only want to skip it (not check it), stop here */
-      break;
-    } else {
-      /* Not compressed name */
-      if (offset + n >= p->tot_len) {
-        return 0xFFFF;
-      }
-      offset = (u16_t)(offset + n);
-    }
-    n = pbuf_try_get_at(p, offset);
-    if (n < 0) {
-      return 0xFFFF;
-    }
-  } while (n != 0);
-
-  return offset + 1;
-}
-
-/**
- * Send a DNS query packet.
- *
- * @param idx the DNS table entry index for which to send a request
- * @return ERR_OK if packet is sent; an err_t indicating the problem otherwise
- */
-static err_t
-dns_send(u8_t idx)
-{
-  err_t err;
-  struct dns_hdr hdr;
-  struct dns_query qry;
-  struct pbuf *p;
-  u16_t query_idx, copy_len;
-  const char *hostname, *hostname_part;
-  u8_t n;
-  u8_t pcb_idx;
-  struct dns_table_entry* entry = &dns_table[idx];
-
-  LWIP_DEBUGF(DNS_DEBUG, ("dns_send: dns_servers[%"U16_F"] \"%s\": request\n",
-              (u16_t)(entry->server_idx), entry->name));
-  LWIP_ASSERT("dns server out of array", entry->server_idx < DNS_MAX_SERVERS);
-  if (ip_addr_isany_val(dns_servers[entry->server_idx])
-#if LWIP_DNS_SUPPORT_MDNS_QUERIES
-      && !entry->is_mdns
-#endif
-    ) {
-    /* DNS server not valid anymore, e.g. PPP netif has been shut down */
-    /* call specified callback function if provided */
-    dns_call_found(idx, NULL);
-    /* flush this entry */
-    entry->state = DNS_STATE_UNUSED;
-    return ERR_OK;
-  }
-
-  /* if here, we have either a new query or a retry on a previous query to process */
-  p = pbuf_alloc(PBUF_TRANSPORT, (u16_t)(SIZEOF_DNS_HDR + strlen(entry->name) + 2 +
-                 SIZEOF_DNS_QUERY), PBUF_RAM);
-  if (p != NULL) {
-    const ip_addr_t* dst;
-    u16_t dst_port;
-    /* fill dns header */
-    memset(&hdr, 0, SIZEOF_DNS_HDR);
-    hdr.id = lwip_htons(entry->txid);
-    hdr.flags1 = DNS_FLAG1_RD;
-    hdr.numquestions = PP_HTONS(1);
-    pbuf_take(p, &hdr, SIZEOF_DNS_HDR);
-    hostname = entry->name;
-    --hostname;
-
-    /* convert hostname into suitable query format. */
-    query_idx = SIZEOF_DNS_HDR;
-    do {
-      ++hostname;
-      hostname_part = hostname;
-      for (n = 0; *hostname != '.' && *hostname != 0; ++hostname) {
-        ++n;
-      }
-      copy_len = (u16_t)(hostname - hostname_part);
-      pbuf_put_at(p, query_idx, n);
-      pbuf_take_at(p, hostname_part, copy_len, query_idx + 1);
-      query_idx += n + 1;
-    } while (*hostname != 0);
-    pbuf_put_at(p, query_idx, 0);
-    query_idx++;
-
-    /* fill dns query */
-    if (LWIP_DNS_ADDRTYPE_IS_IPV6(entry->reqaddrtype)) {
-      qry.type = PP_HTONS(DNS_RRTYPE_AAAA);
-    } else {
-      qry.type = PP_HTONS(DNS_RRTYPE_A);
-    }
-    qry.cls = PP_HTONS(DNS_RRCLASS_IN);
-    pbuf_take_at(p, &qry, SIZEOF_DNS_QUERY, query_idx);
-
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) != 0)
-    pcb_idx = entry->pcb_idx;
-#else
-    pcb_idx = 0;
-#endif
-    /* send dns packet */
-    LWIP_DEBUGF(DNS_DEBUG, ("sending DNS request ID %d for name \"%s\" to server %d\r\n",
-      entry->txid, entry->name, entry->server_idx));
-#if LWIP_DNS_SUPPORT_MDNS_QUERIES
-    if (entry->is_mdns) {
-      dst_port = DNS_MQUERY_PORT;
-#if LWIP_IPV6
-      if (LWIP_DNS_ADDRTYPE_IS_IPV6(entry->reqaddrtype))
-      {
-        dst = &dns_mquery_v6group;
-      }
-#endif
-#if LWIP_IPV4 && LWIP_IPV6
-      else
-#endif
-#if LWIP_IPV4
-      {
-        dst = &dns_mquery_v4group;
-      }
-#endif
-    } else
-#endif /* LWIP_DNS_SUPPORT_MDNS_QUERIES */
-    {
-      dst_port = DNS_SERVER_PORT;
-      dst = &dns_servers[entry->server_idx];
-    }
-    err = udp_sendto(dns_pcbs[pcb_idx], p, dst, dst_port);
-
-    /* free pbuf */
-    pbuf_free(p);
-  } else {
-    err = ERR_MEM;
-  }
-
-  return err;
-}
-
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) != 0)
-static struct udp_pcb*
-dns_alloc_random_port(void)
-{
-  err_t err;
-  struct udp_pcb* ret;
-
-  ret = udp_new_ip_type(IPADDR_TYPE_ANY);
-  if (ret == NULL) {
-    /* out of memory, have to reuse an existing pcb */
-    return NULL;
-  }
-  do {
-    u16_t port = (u16_t)DNS_RAND_TXID();
-    if (!DNS_PORT_ALLOWED(port)) {
-      /* this port is not allowed, try again */
-      err = ERR_USE;
-      continue;
-    }
-    err = udp_bind(ret, IP_ANY_TYPE, port);
-  } while (err == ERR_USE);
-  if (err != ERR_OK) {
-    udp_remove(ret);
-    return NULL;
-  }
-  udp_recv(ret, dns_recv, NULL);
-  return ret;
-}
-
-/**
- * dns_alloc_pcb() - allocates a new pcb (or reuses an existing one) to be used
- * for sending a request
- *
- * @return an index into dns_pcbs
- */
-static u8_t
-dns_alloc_pcb(void)
-{
-  u8_t i;
-  u8_t idx;
-
-  for (i = 0; i < DNS_MAX_SOURCE_PORTS; i++) {
-    if (dns_pcbs[i] == NULL) {
-      break;
-    }
-  }
-  if (i < DNS_MAX_SOURCE_PORTS) {
-    dns_pcbs[i] = dns_alloc_random_port();
-    if (dns_pcbs[i] != NULL) {
-      /* succeeded */
-      dns_last_pcb_idx = i;
-      return i;
-    }
-  }
-  /* if we come here, creating a new UDP pcb failed, so we have to use
-     an already existing one */
-  for (i = 0, idx = dns_last_pcb_idx + 1; i < DNS_MAX_SOURCE_PORTS; i++, idx++) {
-    if (idx >= DNS_MAX_SOURCE_PORTS) {
-      idx = 0;
-    }
-    if (dns_pcbs[idx] != NULL) {
-      dns_last_pcb_idx = idx;
-      return idx;
-    }
-  }
-  return DNS_MAX_SOURCE_PORTS;
-}
-#endif /* ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) != 0) */
-
-/**
- * dns_call_found() - call the found callback and check if there are duplicate
- * entries for the given hostname. If there are any, their found callback will
- * be called and they will be removed.
- *
- * @param idx dns table index of the entry that is resolved or removed
- * @param addr IP address for the hostname (or NULL on error or memory shortage)
- */
-static void
-dns_call_found(u8_t idx, ip_addr_t* addr)
-{
-#if ((LWIP_DNS_SECURE & (LWIP_DNS_SECURE_NO_MULTIPLE_OUTSTANDING | LWIP_DNS_SECURE_RAND_SRC_PORT)) != 0)
-  u8_t i;
-#endif
-
-#if LWIP_IPV4 && LWIP_IPV6
-  if (addr != NULL) {
-    /* check that address type matches the request and adapt the table entry */
-    if (IP_IS_V6_VAL(*addr)) {
-      LWIP_ASSERT("invalid response", LWIP_DNS_ADDRTYPE_IS_IPV6(dns_table[idx].reqaddrtype));
-      dns_table[idx].reqaddrtype = LWIP_DNS_ADDRTYPE_IPV6;
-    } else {
-      LWIP_ASSERT("invalid response", !LWIP_DNS_ADDRTYPE_IS_IPV6(dns_table[idx].reqaddrtype));
-      dns_table[idx].reqaddrtype = LWIP_DNS_ADDRTYPE_IPV4;
-    }
-  }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_NO_MULTIPLE_OUTSTANDING) != 0)
-  for (i = 0; i < DNS_MAX_REQUESTS; i++) {
-    if (dns_requests[i].found && (dns_requests[i].dns_table_idx == idx)) {
-      (*dns_requests[i].found)(dns_table[idx].name, addr, dns_requests[i].arg);
-      /* flush this entry */
-      dns_requests[i].found = NULL;
-    }
-  }
-#else
-  if (dns_requests[idx].found) {
-    (*dns_requests[idx].found)(dns_table[idx].name, addr, dns_requests[idx].arg);
-  }
-  dns_requests[idx].found = NULL;
-#endif
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) != 0)
-  /* close the pcb used unless other request are using it */
-  for (i = 0; i < DNS_MAX_REQUESTS; i++) {
-    if (i == idx) {
-      continue; /* only check other requests */
-    }
-    if (dns_table[i].state == DNS_STATE_ASKING) {
-      if (dns_table[i].pcb_idx == dns_table[idx].pcb_idx) {
-        /* another request is still using the same pcb */
-        dns_table[idx].pcb_idx = DNS_MAX_SOURCE_PORTS;
-        break;
-      }
-    }
-  }
-  if (dns_table[idx].pcb_idx < DNS_MAX_SOURCE_PORTS) {
-    /* if we come here, the pcb is not used any more and can be removed */
-    udp_remove(dns_pcbs[dns_table[idx].pcb_idx]);
-    dns_pcbs[dns_table[idx].pcb_idx] = NULL;
-    dns_table[idx].pcb_idx = DNS_MAX_SOURCE_PORTS;
-  }
-#endif
-}
-
-/* Create a query transmission ID that is unique for all outstanding queries */
-static u16_t
-dns_create_txid(void)
-{
-  u16_t txid;
-  u8_t i;
-
-again:
-  txid = (u16_t)DNS_RAND_TXID();
-
-  /* check whether the ID is unique */
-  for (i = 0; i < DNS_TABLE_SIZE; i++) {
-    if ((dns_table[i].state == DNS_STATE_ASKING) &&
-        (dns_table[i].txid == txid)) {
-      /* ID already used by another pending query */
-      goto again;
-    }
-  }
-
-  return txid;
-}
-
-/**
- * dns_check_entry() - see if entry has not yet been queried and, if so, sends out a query.
- * Check an entry in the dns_table:
- * - send out query for new entries
- * - retry old pending entries on timeout (also with different servers)
- * - remove completed entries from the table if their TTL has expired
- *
- * @param i index of the dns_table entry to check
- */
-static void
-dns_check_entry(u8_t i)
-{
-  err_t err;
-  struct dns_table_entry *entry = &dns_table[i];
-
-  LWIP_ASSERT("array index out of bounds", i < DNS_TABLE_SIZE);
-
-  switch (entry->state) {
-    case DNS_STATE_NEW:
-      /* initialize new entry */
-      entry->txid = dns_create_txid();
-      entry->state = DNS_STATE_ASKING;
-      entry->server_idx = 0;
-      entry->tmr = 1;
-      entry->retries = 0;
-
-      /* send DNS packet for this entry */
-      err = dns_send(i);
-      if (err != ERR_OK) {
-        LWIP_DEBUGF(DNS_DEBUG | LWIP_DBG_LEVEL_WARNING,
-                    ("dns_send returned error: %s\n", lwip_strerr(err)));
-      }
-      break;
-    case DNS_STATE_ASKING:
-      if (--entry->tmr == 0) {
-        if (++entry->retries == DNS_MAX_RETRIES) {
-          if ((entry->server_idx + 1 < DNS_MAX_SERVERS) && !ip_addr_isany_val(dns_servers[entry->server_idx + 1])
-#if LWIP_DNS_SUPPORT_MDNS_QUERIES
-            && !entry->is_mdns
-#endif /* LWIP_DNS_SUPPORT_MDNS_QUERIES */
-            ) {
-            /* change of server */
-            entry->server_idx++;
-            entry->tmr = 1;
-            entry->retries = 0;
-          } else {
-            LWIP_DEBUGF(DNS_DEBUG, ("dns_check_entry: \"%s\": timeout\n", entry->name));
-            /* call specified callback function if provided */
-            dns_call_found(i, NULL);
-            /* flush this entry */
-            entry->state = DNS_STATE_UNUSED;
-            break;
-          }
-        } else {
-          /* wait longer for the next retry */
-          entry->tmr = entry->retries;
-        }
-
-        /* send DNS packet for this entry */
-        err = dns_send(i);
-        if (err != ERR_OK) {
-          LWIP_DEBUGF(DNS_DEBUG | LWIP_DBG_LEVEL_WARNING,
-                      ("dns_send returned error: %s\n", lwip_strerr(err)));
-        }
-      }
-      break;
-    case DNS_STATE_DONE:
-      /* if the time to live is nul */
-      if ((entry->ttl == 0) || (--entry->ttl == 0)) {
-        LWIP_DEBUGF(DNS_DEBUG, ("dns_check_entry: \"%s\": flush\n", entry->name));
-        /* flush this entry, there cannot be any related pending entries in this state */
-        entry->state = DNS_STATE_UNUSED;
-      }
-      break;
-    case DNS_STATE_UNUSED:
-      /* nothing to do */
-      break;
-    default:
-      LWIP_ASSERT("unknown dns_table entry state:", 0);
-      break;
-  }
-}
-
-/**
- * Call dns_check_entry for each entry in dns_table - check all entries.
- */
-static void
-dns_check_entries(void)
-{
-  u8_t i;
-
-  for (i = 0; i < DNS_TABLE_SIZE; ++i) {
-    dns_check_entry(i);
-  }
-}
-
-/**
- * Save TTL and call dns_call_found for correct response.
- */
-static void
-dns_correct_response(u8_t idx, u32_t ttl)
-{
-  struct dns_table_entry *entry = &dns_table[idx];
-
-  entry->state = DNS_STATE_DONE;
-
-  LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": response = ", entry->name));
-  ip_addr_debug_print(DNS_DEBUG, (&(entry->ipaddr)));
-  LWIP_DEBUGF(DNS_DEBUG, ("\n"));
-
-  /* read the answer resource record's TTL, and maximize it if needed */
-  entry->ttl = ttl;
-  if (entry->ttl > DNS_MAX_TTL) {
-    entry->ttl = DNS_MAX_TTL;
-  }
-  dns_call_found(idx, &entry->ipaddr);
-
-  if (entry->ttl == 0) {
-    /* RFC 883, page 29: "Zero values are
-       interpreted to mean that the RR can only be used for the
-       transaction in progress, and should not be cached."
-       -> flush this entry now */
-    /* entry reused during callback? */
-    if (entry->state == DNS_STATE_DONE) {
-      entry->state = DNS_STATE_UNUSED;
-    }
-  }
-}
-/**
- * Receive input function for DNS response packets arriving for the dns UDP pcb.
- */
-static void
-dns_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port)
-{
-  u8_t i;
-  u16_t txid;
-  u16_t res_idx;
-  struct dns_hdr hdr;
-  struct dns_answer ans;
-  struct dns_query qry;
-  u16_t nquestions, nanswers;
-
-  LWIP_UNUSED_ARG(arg);
-  LWIP_UNUSED_ARG(pcb);
-  LWIP_UNUSED_ARG(port);
-
-  /* is the dns message big enough ? */
-  if (p->tot_len < (SIZEOF_DNS_HDR + SIZEOF_DNS_QUERY)) {
-    LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: pbuf too small\n"));
-    /* free pbuf and return */
-    goto memerr;
-  }
-
-  /* copy dns payload inside static buffer for processing */
-  if (pbuf_copy_partial(p, &hdr, SIZEOF_DNS_HDR, 0) == SIZEOF_DNS_HDR) {
-    /* Match the ID in the DNS header with the name table. */
-    txid = lwip_htons(hdr.id);
-    for (i = 0; i < DNS_TABLE_SIZE; i++) {
-      const struct dns_table_entry *entry = &dns_table[i];
-      if ((entry->state == DNS_STATE_ASKING) &&
-          (entry->txid == txid)) {
-
-        /* We only care about the question(s) and the answers. The authrr
-           and the extrarr are simply discarded. */
-        nquestions = lwip_htons(hdr.numquestions);
-        nanswers   = lwip_htons(hdr.numanswers);
-
-        /* Check for correct response. */
-        if ((hdr.flags1 & DNS_FLAG1_RESPONSE) == 0) {
-          LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": not a response\n", entry->name));
-          goto memerr; /* ignore this packet */
-        }
-        if (nquestions != 1) {
-          LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": response not match to query\n", entry->name));
-          goto memerr; /* ignore this packet */
-        }
-
-#if LWIP_DNS_SUPPORT_MDNS_QUERIES
-        if (!entry->is_mdns)
-#endif /* LWIP_DNS_SUPPORT_MDNS_QUERIES */
-        {
-          /* Check whether response comes from the same network address to which the
-             question was sent. (RFC 5452) */
-          if (!ip_addr_cmp(addr, &dns_servers[entry->server_idx])) {
-            goto memerr; /* ignore this packet */
-          }
-        }
-
-        /* Check if the name in the "question" part match with the name in the entry and
-           skip it if equal. */
-        res_idx = dns_compare_name(entry->name, p, SIZEOF_DNS_HDR);
-        if (res_idx == 0xFFFF) {
-          LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": response not match to query\n", entry->name));
-          goto memerr; /* ignore this packet */
-        }
-
-        /* check if "question" part matches the request */
-        if (pbuf_copy_partial(p, &qry, SIZEOF_DNS_QUERY, res_idx) != SIZEOF_DNS_QUERY) {
-          goto memerr; /* ignore this packet */
-        }
-        if ((qry.cls != PP_HTONS(DNS_RRCLASS_IN)) ||
-          (LWIP_DNS_ADDRTYPE_IS_IPV6(entry->reqaddrtype) && (qry.type != PP_HTONS(DNS_RRTYPE_AAAA))) ||
-          (!LWIP_DNS_ADDRTYPE_IS_IPV6(entry->reqaddrtype) && (qry.type != PP_HTONS(DNS_RRTYPE_A)))) {
-          LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": response not match to query\n", entry->name));
-          goto memerr; /* ignore this packet */
-        }
-        /* skip the rest of the "question" part */
-        res_idx += SIZEOF_DNS_QUERY;
-
-        /* Check for error. If so, call callback to inform. */
-        if (hdr.flags2 & DNS_FLAG2_ERR_MASK) {
-          LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": error in flags\n", entry->name));
-        } else {
-          while ((nanswers > 0) && (res_idx < p->tot_len)) {
-            /* skip answer resource record's host name */
-            res_idx = dns_skip_name(p, res_idx);
-            if (res_idx == 0xFFFF) {
-              goto memerr; /* ignore this packet */
-            }
-
-            /* Check for IP address type and Internet class. Others are discarded. */
-            if (pbuf_copy_partial(p, &ans, SIZEOF_DNS_ANSWER, res_idx) != SIZEOF_DNS_ANSWER) {
-              goto memerr; /* ignore this packet */
-            }
-            res_idx += SIZEOF_DNS_ANSWER;
-
-            if (ans.cls == PP_HTONS(DNS_RRCLASS_IN)) {
-#if LWIP_IPV4
-              if ((ans.type == PP_HTONS(DNS_RRTYPE_A)) && (ans.len == PP_HTONS(sizeof(ip4_addr_t)))) {
-#if LWIP_IPV4 && LWIP_IPV6
-                if (!LWIP_DNS_ADDRTYPE_IS_IPV6(entry->reqaddrtype))
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-                {
-                  ip4_addr_t ip4addr;
-                  /* read the IP address after answer resource record's header */
-                  if (pbuf_copy_partial(p, &ip4addr, sizeof(ip4_addr_t), res_idx) != sizeof(ip4_addr_t)) {
-                    goto memerr; /* ignore this packet */
-                  }
-                  ip_addr_copy_from_ip4(dns_table[i].ipaddr, ip4addr);
-                  pbuf_free(p);
-                  /* handle correct response */
-                  dns_correct_response(i, lwip_ntohl(ans.ttl));
-                  return;
-                }
-              }
-#endif /* LWIP_IPV4 */
-#if LWIP_IPV6
-              if ((ans.type == PP_HTONS(DNS_RRTYPE_AAAA)) && (ans.len == PP_HTONS(sizeof(ip6_addr_t)))) {
-#if LWIP_IPV4 && LWIP_IPV6
-                if (LWIP_DNS_ADDRTYPE_IS_IPV6(entry->reqaddrtype))
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-                {
-                  ip6_addr_t ip6addr;
-                  /* read the IP address after answer resource record's header */
-                  if (pbuf_copy_partial(p, &ip6addr, sizeof(ip6_addr_t), res_idx) != sizeof(ip6_addr_t)) {
-                    goto memerr; /* ignore this packet */
-                  }
-                  ip_addr_copy_from_ip6(dns_table[i].ipaddr, ip6addr);
-                  pbuf_free(p);
-                  /* handle correct response */
-                  dns_correct_response(i, lwip_ntohl(ans.ttl));
-                  return;
-                }
-              }
-#endif /* LWIP_IPV6 */
-            }
-            /* skip this answer */
-            if ((int)(res_idx + lwip_htons(ans.len)) > 0xFFFF) {
-              goto memerr; /* ignore this packet */
-            }
-            res_idx += lwip_htons(ans.len);
-            --nanswers;
-          }
-#if LWIP_IPV4 && LWIP_IPV6
-          if ((entry->reqaddrtype == LWIP_DNS_ADDRTYPE_IPV4_IPV6) ||
-              (entry->reqaddrtype == LWIP_DNS_ADDRTYPE_IPV6_IPV4)) {
-            if (entry->reqaddrtype == LWIP_DNS_ADDRTYPE_IPV4_IPV6) {
-              /* IPv4 failed, try IPv6 */
-              dns_table[i].reqaddrtype = LWIP_DNS_ADDRTYPE_IPV6;
-            } else {
-              /* IPv6 failed, try IPv4 */
-              dns_table[i].reqaddrtype = LWIP_DNS_ADDRTYPE_IPV4;
-            }
-            pbuf_free(p);
-            dns_table[i].state = DNS_STATE_NEW;
-            dns_check_entry(i);
-            return;
-          }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-          LWIP_DEBUGF(DNS_DEBUG, ("dns_recv: \"%s\": error in response\n", entry->name));
-        }
-        /* call callback to indicate error, clean up memory and return */
-        pbuf_free(p);
-        dns_call_found(i, NULL);
-        dns_table[i].state = DNS_STATE_UNUSED;
-        return;
-      }
-    }
-  }
-
-memerr:
-  /* deallocate memory and return */
-  pbuf_free(p);
-  return;
-}
-
-/**
- * Queues a new hostname to resolve and sends out a DNS query for that hostname
- *
- * @param name the hostname that is to be queried
- * @param hostnamelen length of the hostname
- * @param found a callback function to be called on success, failure or timeout
- * @param callback_arg argument to pass to the callback function
- * @return err_t return code.
- */
-static err_t
-dns_enqueue(const char *name, size_t hostnamelen, dns_found_callback found,
-            void *callback_arg LWIP_DNS_ADDRTYPE_ARG(u8_t dns_addrtype) LWIP_DNS_ISMDNS_ARG(u8_t is_mdns))
-{
-  u8_t i;
-  u8_t lseq, lseqi;
-  struct dns_table_entry *entry = NULL;
-  size_t namelen;
-  struct dns_req_entry* req;
-
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_NO_MULTIPLE_OUTSTANDING) != 0)
-  u8_t r;
-  /* check for duplicate entries */
-  for (i = 0; i < DNS_TABLE_SIZE; i++) {
-    if ((dns_table[i].state == DNS_STATE_ASKING) &&
-        (lwip_strnicmp(name, dns_table[i].name, sizeof(dns_table[i].name)) == 0)) {
-#if LWIP_IPV4 && LWIP_IPV6
-      if (dns_table[i].reqaddrtype != dns_addrtype) {
-        /* requested address types don't match
-           this can lead to 2 concurrent requests, but mixing the address types
-           for the same host should not be that common */
-        continue;
-      }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-      /* this is a duplicate entry, find a free request entry */
-      for (r = 0; r < DNS_MAX_REQUESTS; r++) {
-        if (dns_requests[r].found == 0) {
-          dns_requests[r].found = found;
-          dns_requests[r].arg = callback_arg;
-          dns_requests[r].dns_table_idx = i;
-          LWIP_DNS_SET_ADDRTYPE(dns_requests[r].reqaddrtype, dns_addrtype);
-          LWIP_DEBUGF(DNS_DEBUG, ("dns_enqueue: \"%s\": duplicate request\n", name));
-          return ERR_INPROGRESS;
-        }
-      }
-    }
-  }
-  /* no duplicate entries found */
-#endif
-
-  /* search an unused entry, or the oldest one */
-  lseq = 0;
-  lseqi = DNS_TABLE_SIZE;
-  for (i = 0; i < DNS_TABLE_SIZE; ++i) {
-    entry = &dns_table[i];
-    /* is it an unused entry ? */
-    if (entry->state == DNS_STATE_UNUSED) {
-      break;
-    }
-    /* check if this is the oldest completed entry */
-    if (entry->state == DNS_STATE_DONE) {
-      u8_t age = dns_seqno - entry->seqno;
-      if (age > lseq) {
-        lseq = age;
-        lseqi = i;
-      }
-    }
-  }
-
-  /* if we don't have found an unused entry, use the oldest completed one */
-  if (i == DNS_TABLE_SIZE) {
-    if ((lseqi >= DNS_TABLE_SIZE) || (dns_table[lseqi].state != DNS_STATE_DONE)) {
-      /* no entry can be used now, table is full */
-      LWIP_DEBUGF(DNS_DEBUG, ("dns_enqueue: \"%s\": DNS entries table is full\n", name));
-      return ERR_MEM;
-    } else {
-      /* use the oldest completed one */
-      i = lseqi;
-      entry = &dns_table[i];
-    }
-  }
-
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_NO_MULTIPLE_OUTSTANDING) != 0)
-  /* find a free request entry */
-  req = NULL;
-  for (r = 0; r < DNS_MAX_REQUESTS; r++) {
-    if (dns_requests[r].found == NULL) {
-      req = &dns_requests[r];
-      break;
-    }
-  }
-  if (req == NULL) {
-    /* no request entry can be used now, table is full */
-    LWIP_DEBUGF(DNS_DEBUG, ("dns_enqueue: \"%s\": DNS request entries table is full\n", name));
-    return ERR_MEM;
-  }
-  req->dns_table_idx = i;
-#else
-  /* in this configuration, the entry index is the same as the request index */
-  req = &dns_requests[i];
-#endif
-
-  /* use this entry */
-  LWIP_DEBUGF(DNS_DEBUG, ("dns_enqueue: \"%s\": use DNS entry %"U16_F"\n", name, (u16_t)(i)));
-
-  /* fill the entry */
-  entry->state = DNS_STATE_NEW;
-  entry->seqno = dns_seqno;
-  LWIP_DNS_SET_ADDRTYPE(entry->reqaddrtype, dns_addrtype);
-  LWIP_DNS_SET_ADDRTYPE(req->reqaddrtype, dns_addrtype);
-  req->found = found;
-  req->arg   = callback_arg;
-  namelen = LWIP_MIN(hostnamelen, DNS_MAX_NAME_LENGTH-1);
-  MEMCPY(entry->name, name, namelen);
-  entry->name[namelen] = 0;
-
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) != 0)
-  entry->pcb_idx = dns_alloc_pcb();
-  if (entry->pcb_idx >= DNS_MAX_SOURCE_PORTS) {
-    /* failed to get a UDP pcb */
-    LWIP_DEBUGF(DNS_DEBUG, ("dns_enqueue: \"%s\": failed to allocate a pcb\n", name));
-    entry->state = DNS_STATE_UNUSED;
-    req->found = NULL;
-    return ERR_MEM;
-  }
-  LWIP_DEBUGF(DNS_DEBUG, ("dns_enqueue: \"%s\": use DNS pcb %"U16_F"\n", name, (u16_t)(entry->pcb_idx)));
-#endif
-
-#if LWIP_DNS_SUPPORT_MDNS_QUERIES
-  entry->is_mdns = is_mdns;
-#endif
-
-  dns_seqno++;
-
-  /* force to send query without waiting timer */
-  dns_check_entry(i);
-
-  /* dns query is enqueued */
-  return ERR_INPROGRESS;
-}
-
-/**
- * @ingroup dns
- * Resolve a hostname (string) into an IP address.
- * NON-BLOCKING callback version for use with raw API!!!
- *
- * Returns immediately with one of err_t return codes:
- * - ERR_OK if hostname is a valid IP address string or the host
- *   name is already in the local names table.
- * - ERR_INPROGRESS enqueue a request to be sent to the DNS server
- *   for resolution if no errors are present.
- * - ERR_ARG: dns client not initialized or invalid hostname
- *
- * @param hostname the hostname that is to be queried
- * @param addr pointer to a ip_addr_t where to store the address if it is already
- *             cached in the dns_table (only valid if ERR_OK is returned!)
- * @param found a callback function to be called on success, failure or timeout (only if
- *              ERR_INPROGRESS is returned!)
- * @param callback_arg argument to pass to the callback function
- * @return a err_t return code.
- */
-err_t
-dns_gethostbyname(const char *hostname, ip_addr_t *addr, dns_found_callback found,
-                  void *callback_arg)
-{
-  return dns_gethostbyname_addrtype(hostname, addr, found, callback_arg, LWIP_DNS_ADDRTYPE_DEFAULT);
-}
-
-/**
- * @ingroup dns
- * Like dns_gethostbyname, but returned address type can be controlled:
- * @param hostname the hostname that is to be queried
- * @param addr pointer to a ip_addr_t where to store the address if it is already
- *             cached in the dns_table (only valid if ERR_OK is returned!)
- * @param found a callback function to be called on success, failure or timeout (only if
- *              ERR_INPROGRESS is returned!)
- * @param callback_arg argument to pass to the callback function
- * @param dns_addrtype - LWIP_DNS_ADDRTYPE_IPV4_IPV6: try to resolve IPv4 first, try IPv6 if IPv4 fails only
- *                     - LWIP_DNS_ADDRTYPE_IPV6_IPV4: try to resolve IPv6 first, try IPv4 if IPv6 fails only
- *                     - LWIP_DNS_ADDRTYPE_IPV4: try to resolve IPv4 only
- *                     - LWIP_DNS_ADDRTYPE_IPV6: try to resolve IPv6 only
- */
-err_t
-dns_gethostbyname_addrtype(const char *hostname, ip_addr_t *addr, dns_found_callback found,
-                           void *callback_arg, u8_t dns_addrtype)
-{
-  size_t hostnamelen;
-#if LWIP_DNS_SUPPORT_MDNS_QUERIES
-  u8_t is_mdns;
-#endif
-  /* not initialized or no valid server yet, or invalid addr pointer
-   * or invalid hostname or invalid hostname length */
-  if ((addr == NULL) ||
-      (!hostname) || (!hostname[0])) {
-    return ERR_ARG;
-  }
-#if ((LWIP_DNS_SECURE & LWIP_DNS_SECURE_RAND_SRC_PORT) == 0)
-  if (dns_pcbs[0] == NULL) {
-    return ERR_ARG;
-  }
-#endif
-  hostnamelen = strlen(hostname);
-  if (hostnamelen >= DNS_MAX_NAME_LENGTH) {
-    LWIP_DEBUGF(DNS_DEBUG, ("dns_gethostbyname: name too long to resolve"));
-    return ERR_ARG;
-  }
-
-
-#if LWIP_HAVE_LOOPIF
-  if (strcmp(hostname, "localhost") == 0) {
-    ip_addr_set_loopback(LWIP_DNS_ADDRTYPE_IS_IPV6(dns_addrtype), addr);
-    return ERR_OK;
-  }
-#endif /* LWIP_HAVE_LOOPIF */
-
-  /* host name already in octet notation? set ip addr and return ERR_OK */
-  if (ipaddr_aton(hostname, addr)) {
-#if LWIP_IPV4 && LWIP_IPV6
-    if ((IP_IS_V6(addr) && (dns_addrtype != LWIP_DNS_ADDRTYPE_IPV4)) ||
-        (IP_IS_V4(addr) && (dns_addrtype != LWIP_DNS_ADDRTYPE_IPV6)))
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-    {
-      return ERR_OK;
-    }
-  }
-  /* already have this address cached? */
-  if (dns_lookup(hostname, addr LWIP_DNS_ADDRTYPE_ARG(dns_addrtype)) == ERR_OK) {
-    return ERR_OK;
-  }
-#if LWIP_IPV4 && LWIP_IPV6
-  if ((dns_addrtype == LWIP_DNS_ADDRTYPE_IPV4_IPV6) || (dns_addrtype == LWIP_DNS_ADDRTYPE_IPV6_IPV4)) {
-    /* fallback to 2nd IP type and try again to lookup */
-    u8_t fallback;
-    if (dns_addrtype == LWIP_DNS_ADDRTYPE_IPV4_IPV6) {
-      fallback = LWIP_DNS_ADDRTYPE_IPV6;
-    } else {
-      fallback = LWIP_DNS_ADDRTYPE_IPV4;
-    }
-    if (dns_lookup(hostname, addr LWIP_DNS_ADDRTYPE_ARG(fallback)) == ERR_OK) {
-      return ERR_OK;
-    }
-  }
-#else /* LWIP_IPV4 && LWIP_IPV6 */
-  LWIP_UNUSED_ARG(dns_addrtype);
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-#if LWIP_DNS_SUPPORT_MDNS_QUERIES
-  if (strstr(hostname, ".local") == &hostname[hostnamelen] - 6) {
-    is_mdns = 1;
-  } else {
-    is_mdns = 0;
-  }
-
-  if (!is_mdns)
-#endif /* LWIP_DNS_SUPPORT_MDNS_QUERIES */
-  {
-    /* prevent calling found callback if no server is set, return error instead */
-    if (ip_addr_isany_val(dns_servers[0])) {
-      return ERR_VAL;
-    }
-  }
-
-  /* queue query with specified callback */
-  return dns_enqueue(hostname, hostnamelen, found, callback_arg LWIP_DNS_ADDRTYPE_ARG(dns_addrtype)
-     LWIP_DNS_ISMDNS_ARG(is_mdns));
-}
-
-#endif /* LWIP_DNS */
diff --git a/sys/net/core/inet_chksum.c b/sys/net/core/inet_chksum.c
deleted file mode 100644
index 9b78584..0000000
--- a/sys/net/core/inet_chksum.c
+++ /dev/null
@@ -1,609 +0,0 @@
-/**
- * @file
- * Incluse internet checksum functions.\n
- *
- * These are some reference implementations of the checksum algorithm, with the
- * aim of being simple, correct and fully portable. Checksumming is the
- * first thing you would want to optimize for your platform. If you create
- * your own version, link it in and in your cc.h put:
- *
- * \#define LWIP_CHKSUM your_checksum_routine
- * 
- * Or you can select from the implementations below by defining
- * LWIP_CHKSUM_ALGORITHM to 1, 2 or 3.
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#include "net/inet_chksum.h"
-#include "net/def.h"
-#include "net/ip_addr.h"
-
-#include <string.h>
-
-#ifndef LWIP_CHKSUM
-# define LWIP_CHKSUM lwip_standard_chksum
-# ifndef LWIP_CHKSUM_ALGORITHM
-#  define LWIP_CHKSUM_ALGORITHM 2
-# endif
-u16_t lwip_standard_chksum(const void *dataptr, int len);
-#endif
-/* If none set: */
-#ifndef LWIP_CHKSUM_ALGORITHM
-# define LWIP_CHKSUM_ALGORITHM 0
-#endif
-
-#if (LWIP_CHKSUM_ALGORITHM == 1) /* Version #1 */
-/**
- * lwip checksum
- *
- * @param dataptr points to start of data to be summed at any boundary
- * @param len length of data to be summed
- * @return host order (!) lwip checksum (non-inverted Internet sum)
- *
- * @note accumulator size limits summable length to 64k
- * @note host endianess is irrelevant (p3 RFC1071)
- */
-u16_t
-lwip_standard_chksum(const void *dataptr, int len)
-{
-  u32_t acc;
-  u16_t src;
-  const u8_t *octetptr;
-
-  acc = 0;
-  /* dataptr may be at odd or even addresses */
-  octetptr = (const u8_t*)dataptr;
-  while (len > 1) {
-    /* declare first octet as most significant
-       thus assume network order, ignoring host order */
-    src = (*octetptr) << 8;
-    octetptr++;
-    /* declare second octet as least significant */
-    src |= (*octetptr);
-    octetptr++;
-    acc += src;
-    len -= 2;
-  }
-  if (len > 0) {
-    /* accumulate remaining octet */
-    src = (*octetptr) << 8;
-    acc += src;
-  }
-  /* add deferred carry bits */
-  acc = (acc >> 16) + (acc & 0x0000ffffUL);
-  if ((acc & 0xffff0000UL) != 0) {
-    acc = (acc >> 16) + (acc & 0x0000ffffUL);
-  }
-  /* This maybe a little confusing: reorder sum using lwip_htons()
-     instead of lwip_ntohs() since it has a little less call overhead.
-     The caller must invert bits for Internet sum ! */
-  return lwip_htons((u16_t)acc);
-}
-#endif
-
-#if (LWIP_CHKSUM_ALGORITHM == 2) /* Alternative version #2 */
-/*
- * Curt McDowell
- * Broadcom Corp.
- * csm@broadcom.com
- *
- * IP checksum two bytes at a time with support for
- * unaligned buffer.
- * Works for len up to and including 0x20000.
- * by Curt McDowell, Broadcom Corp. 12/08/2005
- *
- * @param dataptr points to start of data to be summed at any boundary
- * @param len length of data to be summed
- * @return host order (!) lwip checksum (non-inverted Internet sum)
- */
-u16_t
-lwip_standard_chksum(const void *dataptr, int len)
-{
-  const u8_t *pb = (const u8_t *)dataptr;
-  const u16_t *ps;
-  u16_t t = 0;
-  u32_t sum = 0;
-  int odd = ((mem_ptr_t)pb & 1);
-
-  /* Get aligned to u16_t */
-  if (odd && len > 0) {
-    ((u8_t *)&t)[1] = *pb++;
-    len--;
-  }
-
-  /* Add the bulk of the data */
-  ps = (const u16_t *)(const void *)pb;
-  while (len > 1) {
-    sum += *ps++;
-    len -= 2;
-  }
-
-  /* Consume left-over byte, if any */
-  if (len > 0) {
-    ((u8_t *)&t)[0] = *(const u8_t *)ps;
-  }
-
-  /* Add end bytes */
-  sum += t;
-
-  /* Fold 32-bit sum to 16 bits
-     calling this twice is probably faster than if statements... */
-  sum = FOLD_U32T(sum);
-  sum = FOLD_U32T(sum);
-
-  /* Swap if alignment was odd */
-  if (odd) {
-    sum = SWAP_BYTES_IN_WORD(sum);
-  }
-
-  return (u16_t)sum;
-}
-#endif
-
-#if (LWIP_CHKSUM_ALGORITHM == 3) /* Alternative version #3 */
-/**
- * An optimized checksum routine. Basically, it uses loop-unrolling on
- * the checksum loop, treating the head and tail bytes specially, whereas
- * the inner loop acts on 8 bytes at a time.
- *
- * @arg start of buffer to be checksummed. May be an odd byte address.
- * @len number of bytes in the buffer to be checksummed.
- * @return host order (!) lwip checksum (non-inverted Internet sum)
- *
- * by Curt McDowell, Broadcom Corp. December 8th, 2005
- */
-u16_t
-lwip_standard_chksum(const void *dataptr, int len)
-{
-  const u8_t *pb = (const u8_t *)dataptr;
-  const u16_t *ps;
-  u16_t t = 0;
-  const u32_t *pl;
-  u32_t sum = 0, tmp;
-  /* starts at odd byte address? */
-  int odd = ((mem_ptr_t)pb & 1);
-
-  if (odd && len > 0) {
-    ((u8_t *)&t)[1] = *pb++;
-    len--;
-  }
-
-  ps = (const u16_t *)(const void*)pb;
-
-  if (((mem_ptr_t)ps & 3) && len > 1) {
-    sum += *ps++;
-    len -= 2;
-  }
-
-  pl = (const u32_t *)(const void*)ps;
-
-  while (len > 7)  {
-    tmp = sum + *pl++;          /* ping */
-    if (tmp < sum) {
-      tmp++;                    /* add back carry */
-    }
-
-    sum = tmp + *pl++;          /* pong */
-    if (sum < tmp) {
-      sum++;                    /* add back carry */
-    }
-
-    len -= 8;
-  }
-
-  /* make room in upper bits */
-  sum = FOLD_U32T(sum);
-
-  ps = (const u16_t *)pl;
-
-  /* 16-bit aligned word remaining? */
-  while (len > 1) {
-    sum += *ps++;
-    len -= 2;
-  }
-
-  /* dangling tail byte remaining? */
-  if (len > 0) {                /* include odd byte */
-    ((u8_t *)&t)[0] = *(const u8_t *)ps;
-  }
-
-  sum += t;                     /* add end bytes */
-
-  /* Fold 32-bit sum to 16 bits
-     calling this twice is probably faster than if statements... */
-  sum = FOLD_U32T(sum);
-  sum = FOLD_U32T(sum);
-
-  if (odd) {
-    sum = SWAP_BYTES_IN_WORD(sum);
-  }
-
-  return (u16_t)sum;
-}
-#endif
-
-/** Parts of the pseudo checksum which are common to IPv4 and IPv6 */
-static u16_t
-inet_cksum_pseudo_base(struct pbuf *p, u8_t proto, u16_t proto_len, u32_t acc)
-{
-  struct pbuf *q;
-  u8_t swapped = 0;
-
-  /* iterate through all pbuf in chain */
-  for (q = p; q != NULL; q = q->next) {
-    LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): checksumming pbuf %p (has next %p) \n",
-      (void *)q, (void *)q->next));
-    acc += LWIP_CHKSUM(q->payload, q->len);
-    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): unwrapped lwip_chksum()=%"X32_F" \n", acc));*/
-    /* just executing this next line is probably faster that the if statement needed
-       to check whether we really need to execute it, and does no harm */
-    acc = FOLD_U32T(acc);
-    if (q->len % 2 != 0) {
-      swapped = 1 - swapped;
-      acc = SWAP_BYTES_IN_WORD(acc);
-    }
-    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): wrapped lwip_chksum()=%"X32_F" \n", acc));*/
-  }
-
-  if (swapped) {
-    acc = SWAP_BYTES_IN_WORD(acc);
-  }
-
-  acc += (u32_t)lwip_htons((u16_t)proto);
-  acc += (u32_t)lwip_htons(proto_len);
-
-  /* Fold 32-bit sum to 16 bits
-     calling this twice is probably faster than if statements... */
-  acc = FOLD_U32T(acc);
-  acc = FOLD_U32T(acc);
-  LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): pbuf chain lwip_chksum()=%"X32_F"\n", acc));
-  return (u16_t)~(acc & 0xffffUL);
-}
-
-#if LWIP_IPV4
-/* inet_chksum_pseudo:
- *
- * Calculates the IPv4 pseudo Internet checksum used by TCP and UDP for a pbuf chain.
- * IP addresses are expected to be in network byte order.
- *
- * @param p chain of pbufs over that a checksum should be calculated (ip data part)
- * @param src source ip address (used for checksum of pseudo header)
- * @param dst destination ip address (used for checksum of pseudo header)
- * @param proto ip protocol (used for checksum of pseudo header)
- * @param proto_len length of the ip data part (used for checksum of pseudo header)
- * @return checksum (as u16_t) to be saved directly in the protocol header
- */
-u16_t
-inet_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
-       const ip4_addr_t *src, const ip4_addr_t *dest)
-{
-  u32_t acc;
-  u32_t addr;
-
-  addr = ip4_addr_get_u32(src);
-  acc = (addr & 0xffffUL);
-  acc += ((addr >> 16) & 0xffffUL);
-  addr = ip4_addr_get_u32(dest);
-  acc += (addr & 0xffffUL);
-  acc += ((addr >> 16) & 0xffffUL);
-  /* fold down to 16 bits */
-  acc = FOLD_U32T(acc);
-  acc = FOLD_U32T(acc);
-
-  return inet_cksum_pseudo_base(p, proto, proto_len, acc);
-}
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-/**
- * Calculates the checksum with IPv6 pseudo header used by TCP and UDP for a pbuf chain.
- * IPv6 addresses are expected to be in network byte order.
- *
- * @param p chain of pbufs over that a checksum should be calculated (ip data part)
- * @param proto ipv6 protocol/next header (used for checksum of pseudo header)
- * @param proto_len length of the ipv6 payload (used for checksum of pseudo header)
- * @param src source ipv6 address (used for checksum of pseudo header)
- * @param dest destination ipv6 address (used for checksum of pseudo header)
- * @return checksum (as u16_t) to be saved directly in the protocol header
- */
-u16_t
-ip6_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
-       const ip6_addr_t *src, const ip6_addr_t *dest)
-{
-  u32_t acc = 0;
-  u32_t addr;
-  u8_t addr_part;
-
-  for (addr_part = 0; addr_part < 4; addr_part++) {
-    addr = src->addr[addr_part];
-    acc += (addr & 0xffffUL);
-    acc += ((addr >> 16) & 0xffffUL);
-    addr = dest->addr[addr_part];
-    acc += (addr & 0xffffUL);
-    acc += ((addr >> 16) & 0xffffUL);
-  }
-  /* fold down to 16 bits */
-  acc = FOLD_U32T(acc);
-  acc = FOLD_U32T(acc);
-
-  return inet_cksum_pseudo_base(p, proto, proto_len, acc);
-}
-#endif /* LWIP_IPV6 */
-
-/* ip_chksum_pseudo:
- *
- * Calculates the IPv4 or IPv6 pseudo Internet checksum used by TCP and UDP for a pbuf chain.
- * IP addresses are expected to be in network byte order.
- *
- * @param p chain of pbufs over that a checksum should be calculated (ip data part)
- * @param src source ip address (used for checksum of pseudo header)
- * @param dst destination ip address (used for checksum of pseudo header)
- * @param proto ip protocol (used for checksum of pseudo header)
- * @param proto_len length of the ip data part (used for checksum of pseudo header)
- * @return checksum (as u16_t) to be saved directly in the protocol header
- */
-u16_t
-ip_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
-       const ip_addr_t *src, const ip_addr_t *dest)
-{
-#if LWIP_IPV6
-  if (IP_IS_V6(dest)) {
-    return ip6_chksum_pseudo(p, proto, proto_len, ip_2_ip6(src), ip_2_ip6(dest));
-  }
-#endif /* LWIP_IPV6 */
-#if LWIP_IPV4 && LWIP_IPV6
-  else
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-#if LWIP_IPV4
-  {
-    return inet_chksum_pseudo(p, proto, proto_len, ip_2_ip4(src), ip_2_ip4(dest));
-  }
-#endif /* LWIP_IPV4 */
-}
-
-/** Parts of the pseudo checksum which are common to IPv4 and IPv6 */
-static u16_t
-inet_cksum_pseudo_partial_base(struct pbuf *p, u8_t proto, u16_t proto_len,
-       u16_t chksum_len, u32_t acc)
-{
-  struct pbuf *q;
-  u8_t swapped = 0;
-  u16_t chklen;
-
-  /* iterate through all pbuf in chain */
-  for (q = p; (q != NULL) && (chksum_len > 0); q = q->next) {
-    LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): checksumming pbuf %p (has next %p) \n",
-      (void *)q, (void *)q->next));
-    chklen = q->len;
-    if (chklen > chksum_len) {
-      chklen = chksum_len;
-    }
-    acc += LWIP_CHKSUM(q->payload, chklen);
-    chksum_len -= chklen;
-    LWIP_ASSERT("delete me", chksum_len < 0x7fff);
-    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): unwrapped lwip_chksum()=%"X32_F" \n", acc));*/
-    /* fold the upper bit down */
-    acc = FOLD_U32T(acc);
-    if (q->len % 2 != 0) {
-      swapped = 1 - swapped;
-      acc = SWAP_BYTES_IN_WORD(acc);
-    }
-    /*LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): wrapped lwip_chksum()=%"X32_F" \n", acc));*/
-  }
-
-  if (swapped) {
-    acc = SWAP_BYTES_IN_WORD(acc);
-  }
-
-  acc += (u32_t)lwip_htons((u16_t)proto);
-  acc += (u32_t)lwip_htons(proto_len);
-
-  /* Fold 32-bit sum to 16 bits
-     calling this twice is probably faster than if statements... */
-  acc = FOLD_U32T(acc);
-  acc = FOLD_U32T(acc);
-  LWIP_DEBUGF(INET_DEBUG, ("inet_chksum_pseudo(): pbuf chain lwip_chksum()=%"X32_F"\n", acc));
-  return (u16_t)~(acc & 0xffffUL);
-}
-
-#if LWIP_IPV4
-/* inet_chksum_pseudo_partial:
- *
- * Calculates the IPv4 pseudo Internet checksum used by TCP and UDP for a pbuf chain.
- * IP addresses are expected to be in network byte order.
- *
- * @param p chain of pbufs over that a checksum should be calculated (ip data part)
- * @param src source ip address (used for checksum of pseudo header)
- * @param dst destination ip address (used for checksum of pseudo header)
- * @param proto ip protocol (used for checksum of pseudo header)
- * @param proto_len length of the ip data part (used for checksum of pseudo header)
- * @return checksum (as u16_t) to be saved directly in the protocol header
- */
-u16_t
-inet_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
-       u16_t chksum_len, const ip4_addr_t *src, const ip4_addr_t *dest)
-{
-  u32_t acc;
-  u32_t addr;
-
-  addr = ip4_addr_get_u32(src);
-  acc = (addr & 0xffffUL);
-  acc += ((addr >> 16) & 0xffffUL);
-  addr = ip4_addr_get_u32(dest);
-  acc += (addr & 0xffffUL);
-  acc += ((addr >> 16) & 0xffffUL);
-  /* fold down to 16 bits */
-  acc = FOLD_U32T(acc);
-  acc = FOLD_U32T(acc);
-
-  return inet_cksum_pseudo_partial_base(p, proto, proto_len, chksum_len, acc);
-}
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-/**
- * Calculates the checksum with IPv6 pseudo header used by TCP and UDP for a pbuf chain.
- * IPv6 addresses are expected to be in network byte order. Will only compute for a
- * portion of the payload.
- *
- * @param p chain of pbufs over that a checksum should be calculated (ip data part)
- * @param proto ipv6 protocol/next header (used for checksum of pseudo header)
- * @param proto_len length of the ipv6 payload (used for checksum of pseudo header)
- * @param chksum_len number of payload bytes used to compute chksum
- * @param src source ipv6 address (used for checksum of pseudo header)
- * @param dest destination ipv6 address (used for checksum of pseudo header)
- * @return checksum (as u16_t) to be saved directly in the protocol header
- */
-u16_t
-ip6_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
-       u16_t chksum_len, const ip6_addr_t *src, const ip6_addr_t *dest)
-{
-  u32_t acc = 0;
-  u32_t addr;
-  u8_t addr_part;
-
-  for (addr_part = 0; addr_part < 4; addr_part++) {
-    addr = src->addr[addr_part];
-    acc += (addr & 0xffffUL);
-    acc += ((addr >> 16) & 0xffffUL);
-    addr = dest->addr[addr_part];
-    acc += (addr & 0xffffUL);
-    acc += ((addr >> 16) & 0xffffUL);
-  }
-  /* fold down to 16 bits */
-  acc = FOLD_U32T(acc);
-  acc = FOLD_U32T(acc);
-
-  return inet_cksum_pseudo_partial_base(p, proto, proto_len, chksum_len, acc);
-}
-#endif /* LWIP_IPV6 */
-
-/* ip_chksum_pseudo_partial:
- *
- * Calculates the IPv4 or IPv6 pseudo Internet checksum used by TCP and UDP for a pbuf chain.
- *
- * @param p chain of pbufs over that a checksum should be calculated (ip data part)
- * @param src source ip address (used for checksum of pseudo header)
- * @param dst destination ip address (used for checksum of pseudo header)
- * @param proto ip protocol (used for checksum of pseudo header)
- * @param proto_len length of the ip data part (used for checksum of pseudo header)
- * @return checksum (as u16_t) to be saved directly in the protocol header
- */
-u16_t
-ip_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
-       u16_t chksum_len, const ip_addr_t *src, const ip_addr_t *dest)
-{
-#if LWIP_IPV6
-  if (IP_IS_V6(dest)) {
-    return ip6_chksum_pseudo_partial(p, proto, proto_len, chksum_len, ip_2_ip6(src), ip_2_ip6(dest));
-  }
-#endif /* LWIP_IPV6 */
-#if LWIP_IPV4 && LWIP_IPV6
-  else
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-#if LWIP_IPV4
-  {
-    return inet_chksum_pseudo_partial(p, proto, proto_len, chksum_len, ip_2_ip4(src), ip_2_ip4(dest));
-  }
-#endif /* LWIP_IPV4 */
-}
-
-/* inet_chksum:
- *
- * Calculates the Internet checksum over a portion of memory. Used primarily for IP
- * and ICMP.
- *
- * @param dataptr start of the buffer to calculate the checksum (no alignment needed)
- * @param len length of the buffer to calculate the checksum
- * @return checksum (as u16_t) to be saved directly in the protocol header
- */
-
-u16_t
-inet_chksum(const void *dataptr, u16_t len)
-{
-  return (u16_t)~(unsigned int)LWIP_CHKSUM(dataptr, len);
-}
-
-/**
- * Calculate a checksum over a chain of pbufs (without pseudo-header, much like
- * inet_chksum only pbufs are used).
- *
- * @param p pbuf chain over that the checksum should be calculated
- * @return checksum (as u16_t) to be saved directly in the protocol header
- */
-u16_t
-inet_chksum_pbuf(struct pbuf *p)
-{
-  u32_t acc;
-  struct pbuf *q;
-  u8_t swapped;
-
-  acc = 0;
-  swapped = 0;
-  for (q = p; q != NULL; q = q->next) {
-    acc += LWIP_CHKSUM(q->payload, q->len);
-    acc = FOLD_U32T(acc);
-    if (q->len % 2 != 0) {
-      swapped = 1 - swapped;
-      acc = SWAP_BYTES_IN_WORD(acc);
-    }
-  }
-
-  if (swapped) {
-    acc = SWAP_BYTES_IN_WORD(acc);
-  }
-  return (u16_t)~(acc & 0xffffUL);
-}
-
-/* These are some implementations for LWIP_CHKSUM_COPY, which copies data
- * like MEMCPY but generates a checksum at the same time. Since this is a
- * performance-sensitive function, you might want to create your own version
- * in assembly targeted at your hardware by defining it in lwipopts.h:
- *   #define LWIP_CHKSUM_COPY(dst, src, len) your_chksum_copy(dst, src, len)
- */
-
-#if (LWIP_CHKSUM_COPY_ALGORITHM == 1) /* Version #1 */
-/** Safe but slow: first call MEMCPY, then call LWIP_CHKSUM.
- * For architectures with big caches, data might still be in cache when
- * generating the checksum after copying.
- */
-u16_t
-lwip_chksum_copy(void *dst, const void *src, u16_t len)
-{
-  MEMCPY(dst, src, len);
-  return LWIP_CHKSUM(dst, len);
-}
-#endif /* (LWIP_CHKSUM_COPY_ALGORITHM == 1) */
diff --git a/sys/net/core/init.c b/sys/net/core/init.c
deleted file mode 100644
index 09ef246..0000000
--- a/sys/net/core/init.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- */
-
-#include "net/opt.h"
-
-#include "net/init.h"
-#include "net/stats.h"
-#include "net/sys.h"
-#include "net/mem.h"
-#include "net/memp.h"
-#include "net/pbuf.h"
-#include "net/netif.h"
-#include "net/sockets.h"
-#include "net/ip.h"
-#include "net/raw.h"
-#include "net/udp.h"
-#include "net/priv/tcp_priv.h"
-#include "net/igmp.h"
-#include "net/dns.h"
-#include "net/timeouts.h"
-#include "net/etharp.h"
-#include "net/ip6.h"
-#include "net/nd6.h"
-#include "net/mld6.h"
-#include "net/api.h"
-
-#include "netif/ppp/ppp_opts.h"
-#include "netif/ppp/ppp_impl.h"
-
-#ifndef LWIP_SKIP_PACKING_CHECK
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct packed_struct_test
-{
-  PACK_STRUCT_FLD_8(u8_t  dummy1);
-  PACK_STRUCT_FIELD(u32_t dummy2);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-#define PACKED_STRUCT_TEST_EXPECTED_SIZE 5
-
-#endif
-
-/* Compile-time sanity checks for configuration errors.
- * These can be done independently of LWIP_DEBUG, without penalty.
- */
-#ifndef BYTE_ORDER
-  #error "BYTE_ORDER is not defined, you have to define it in your cc.h"
-#endif
-#if (!IP_SOF_BROADCAST && IP_SOF_BROADCAST_RECV)
-  #error "If you want to use broadcast filter per pcb on recv operations, you have to define IP_SOF_BROADCAST=1 in your lwipopts.h"
-#endif
-#if (!LWIP_UDP && LWIP_UDPLITE)
-  #error "If you want to use UDP Lite, you have to define LWIP_UDP=1 in your lwipopts.h"
-#endif
-#if (!LWIP_UDP && LWIP_DHCP)
-  #error "If you want to use DHCP, you have to define LWIP_UDP=1 in your lwipopts.h"
-#endif
-#if (!LWIP_UDP && LWIP_MULTICAST_TX_OPTIONS)
-  #error "If you want to use IGMP/LWIP_MULTICAST_TX_OPTIONS, you have to define LWIP_UDP=1 in your lwipopts.h"
-#endif
-#if (!LWIP_UDP && LWIP_DNS)
-  #error "If you want to use DNS, you have to define LWIP_UDP=1 in your lwipopts.h"
-#endif
-#if !MEMP_MEM_MALLOC /* MEMP_NUM_* checks are disabled when not using the pool allocator */
-#if (LWIP_ARP && ARP_QUEUEING && (MEMP_NUM_ARP_QUEUE<=0))
-  #error "If you want to use ARP Queueing, you have to define MEMP_NUM_ARP_QUEUE>=1 in your lwipopts.h"
-#endif
-#if (LWIP_RAW && (MEMP_NUM_RAW_PCB<=0))
-  #error "If you want to use RAW, you have to define MEMP_NUM_RAW_PCB>=1 in your lwipopts.h"
-#endif
-#if (LWIP_UDP && (MEMP_NUM_UDP_PCB<=0))
-  #error "If you want to use UDP, you have to define MEMP_NUM_UDP_PCB>=1 in your lwipopts.h"
-#endif
-#if (LWIP_TCP && (MEMP_NUM_TCP_PCB<=0))
-  #error "If you want to use TCP, you have to define MEMP_NUM_TCP_PCB>=1 in your lwipopts.h"
-#endif
-#if (LWIP_IGMP && (MEMP_NUM_IGMP_GROUP<=1))
-  #error "If you want to use IGMP, you have to define MEMP_NUM_IGMP_GROUP>1 in your lwipopts.h"
-#endif
-#if (LWIP_IGMP && !LWIP_MULTICAST_TX_OPTIONS)
-  #error "If you want to use IGMP, you have to define LWIP_MULTICAST_TX_OPTIONS==1 in your lwipopts.h"
-#endif
-#if (LWIP_IGMP && !LWIP_IPV4)
-  #error "IGMP needs LWIP_IPV4 enabled in your lwipopts.h"
-#endif
-#if (LWIP_MULTICAST_TX_OPTIONS && !LWIP_IPV4)
-  #error "LWIP_MULTICAST_TX_OPTIONS needs LWIP_IPV4 enabled in your lwipopts.h"
-#endif
-#if ((LWIP_NETCONN || LWIP_SOCKET) && (MEMP_NUM_TCPIP_MSG_API<=0))
-  #error "If you want to use Sequential API, you have to define MEMP_NUM_TCPIP_MSG_API>=1 in your lwipopts.h"
-#endif
-/* There must be sufficient timeouts, taking into account requirements of the subsystems. */
-#if LWIP_TIMERS && (MEMP_NUM_SYS_TIMEOUT < (LWIP_TCP + IP_REASSEMBLY + LWIP_ARP + (2*LWIP_DHCP) + LWIP_AUTOIP + LWIP_IGMP + LWIP_DNS + PPP_SUPPORT + (LWIP_IPV6 ? (1 + LWIP_IPV6_REASS + LWIP_IPV6_MLD) : 0)))
-  #error "MEMP_NUM_SYS_TIMEOUT is too low to accomodate all required timeouts"
-#endif
-#if (IP_REASSEMBLY && (MEMP_NUM_REASSDATA > IP_REASS_MAX_PBUFS))
-  #error "MEMP_NUM_REASSDATA > IP_REASS_MAX_PBUFS doesn't make sense since each struct ip_reassdata must hold 2 pbufs at least!"
-#endif
-#endif /* !MEMP_MEM_MALLOC */
-#if LWIP_WND_SCALE
-#if (LWIP_TCP && (TCP_WND > 0xffffffff))
-  #error "If you want to use TCP, TCP_WND must fit in an u32_t, so, you have to reduce it in your lwipopts.h"
-#endif
-#if (LWIP_TCP && (TCP_RCV_SCALE > 14))
-  #error "The maximum valid window scale value is 14!"
-#endif
-#if (LWIP_TCP && (TCP_WND > (0xFFFFU << TCP_RCV_SCALE)))
-  #error "TCP_WND is bigger than the configured LWIP_WND_SCALE allows!"
-#endif
-#if (LWIP_TCP && ((TCP_WND >> TCP_RCV_SCALE) == 0))
-  #error "TCP_WND is too small for the configured LWIP_WND_SCALE (results in zero window)!"
-#endif
-#else /* LWIP_WND_SCALE */
-#if (LWIP_TCP && (TCP_WND > 0xffff))
-  #error "If you want to use TCP, TCP_WND must fit in an u16_t, so, you have to reduce it in your lwipopts.h (or enable window scaling)"
-#endif
-#endif /* LWIP_WND_SCALE */
-#if (LWIP_TCP && (TCP_SND_QUEUELEN > 0xffff))
-  #error "If you want to use TCP, TCP_SND_QUEUELEN must fit in an u16_t, so, you have to reduce it in your lwipopts.h"
-#endif
-#if (LWIP_TCP && (TCP_SND_QUEUELEN < 2))
-  #error "TCP_SND_QUEUELEN must be at least 2 for no-copy TCP writes to work"
-#endif
-#if (LWIP_TCP && ((TCP_MAXRTX > 12) || (TCP_SYNMAXRTX > 12)))
-  #error "If you want to use TCP, TCP_MAXRTX and TCP_SYNMAXRTX must less or equal to 12 (due to tcp_backoff table), so, you have to reduce them in your lwipopts.h"
-#endif
-#if (LWIP_TCP && TCP_LISTEN_BACKLOG && ((TCP_DEFAULT_LISTEN_BACKLOG < 0) || (TCP_DEFAULT_LISTEN_BACKLOG > 0xff)))
-  #error "If you want to use TCP backlog, TCP_DEFAULT_LISTEN_BACKLOG must fit into an u8_t"
-#endif
-#if (LWIP_NETIF_API && (NO_SYS==1))
-  #error "If you want to use NETIF API, you have to define NO_SYS=0 in your lwipopts.h"
-#endif
-#if ((LWIP_SOCKET || LWIP_NETCONN) && (NO_SYS==1))
-  #error "If you want to use Sequential API, you have to define NO_SYS=0 in your lwipopts.h"
-#endif
-#if (LWIP_PPP_API && (NO_SYS==1))
-  #error "If you want to use PPP API, you have to define NO_SYS=0 in your lwipopts.h"
-#endif
-#if (LWIP_PPP_API && (PPP_SUPPORT==0))
-  #error "If you want to use PPP API, you have to enable PPP_SUPPORT in your lwipopts.h"
-#endif
-#if (((!LWIP_DHCP) || (!LWIP_AUTOIP)) && LWIP_DHCP_AUTOIP_COOP)
-  #error "If you want to use DHCP/AUTOIP cooperation mode, you have to define LWIP_DHCP=1 and LWIP_AUTOIP=1 in your lwipopts.h"
-#endif
-#if (((!LWIP_DHCP) || (!LWIP_ARP)) && DHCP_DOES_ARP_CHECK)
-  #error "If you want to use DHCP ARP checking, you have to define LWIP_DHCP=1 and LWIP_ARP=1 in your lwipopts.h"
-#endif
-#if (!LWIP_ARP && LWIP_AUTOIP)
-  #error "If you want to use AUTOIP, you have to define LWIP_ARP=1 in your lwipopts.h"
-#endif
-#if (LWIP_TCP && ((LWIP_EVENT_API && LWIP_CALLBACK_API) || (!LWIP_EVENT_API && !LWIP_CALLBACK_API)))
-  #error "One and exactly one of LWIP_EVENT_API and LWIP_CALLBACK_API has to be enabled in your lwipopts.h"
-#endif
-#if (MEM_LIBC_MALLOC && MEM_USE_POOLS)
-  #error "MEM_LIBC_MALLOC and MEM_USE_POOLS may not both be simultaneously enabled in your lwipopts.h"
-#endif
-#if (MEM_USE_POOLS && !MEMP_USE_CUSTOM_POOLS)
-  #error "MEM_USE_POOLS requires custom pools (MEMP_USE_CUSTOM_POOLS) to be enabled in your lwipopts.h"
-#endif
-#if (PBUF_POOL_BUFSIZE <= MEM_ALIGNMENT)
-  #error "PBUF_POOL_BUFSIZE must be greater than MEM_ALIGNMENT or the offset may take the full first pbuf"
-#endif
-#if (DNS_LOCAL_HOSTLIST && !DNS_LOCAL_HOSTLIST_IS_DYNAMIC && !(defined(DNS_LOCAL_HOSTLIST_INIT)))
-  #error "you have to define define DNS_LOCAL_HOSTLIST_INIT {{'host1', 0x123}, {'host2', 0x234}} to initialize DNS_LOCAL_HOSTLIST"
-#endif
-#if PPP_SUPPORT && !PPPOS_SUPPORT && !PPPOE_SUPPORT && !PPPOL2TP_SUPPORT
-  #error "PPP_SUPPORT needs at least one of PPPOS_SUPPORT, PPPOE_SUPPORT or PPPOL2TP_SUPPORT turned on"
-#endif
-#if PPP_SUPPORT && !PPP_IPV4_SUPPORT && !PPP_IPV6_SUPPORT
-  #error "PPP_SUPPORT needs PPP_IPV4_SUPPORT and/or PPP_IPV6_SUPPORT turned on"
-#endif
-#if PPP_SUPPORT && PPP_IPV4_SUPPORT && !LWIP_IPV4
-  #error "PPP_IPV4_SUPPORT needs LWIP_IPV4 turned on"
-#endif
-#if PPP_SUPPORT && PPP_IPV6_SUPPORT && !LWIP_IPV6
-  #error "PPP_IPV6_SUPPORT needs LWIP_IPV6 turned on"
-#endif
-#if !LWIP_ETHERNET && (LWIP_ARP || PPPOE_SUPPORT)
-  #error "LWIP_ETHERNET needs to be turned on for LWIP_ARP or PPPOE_SUPPORT"
-#endif
-#if LWIP_TCPIP_CORE_LOCKING_INPUT && !LWIP_TCPIP_CORE_LOCKING
-  #error "When using LWIP_TCPIP_CORE_LOCKING_INPUT, LWIP_TCPIP_CORE_LOCKING must be enabled, too"
-#endif
-#if LWIP_TCP && LWIP_NETIF_TX_SINGLE_PBUF && !TCP_OVERSIZE
-  #error "LWIP_NETIF_TX_SINGLE_PBUF needs TCP_OVERSIZE enabled to create single-pbuf TCP packets"
-#endif
-#if LWIP_NETCONN && LWIP_TCP
-#if NETCONN_COPY != TCP_WRITE_FLAG_COPY
-  #error "NETCONN_COPY != TCP_WRITE_FLAG_COPY"
-#endif
-#if NETCONN_MORE != TCP_WRITE_FLAG_MORE
-  #error "NETCONN_MORE != TCP_WRITE_FLAG_MORE"
-#endif
-#endif /* LWIP_NETCONN && LWIP_TCP */
-#if LWIP_SOCKET
-/* Check that the SO_* socket options and SOF_* lwIP-internal flags match */
-#if SO_REUSEADDR != SOF_REUSEADDR
-  #error "WARNING: SO_REUSEADDR != SOF_REUSEADDR"
-#endif
-#if SO_KEEPALIVE != SOF_KEEPALIVE
-  #error "WARNING: SO_KEEPALIVE != SOF_KEEPALIVE"
-#endif
-#if SO_BROADCAST != SOF_BROADCAST
-  #error "WARNING: SO_BROADCAST != SOF_BROADCAST"
-#endif
-#endif /* LWIP_SOCKET */
-
-
-/* Compile-time checks for deprecated options.
- */
-#ifdef MEMP_NUM_TCPIP_MSG
-  #error "MEMP_NUM_TCPIP_MSG option is deprecated. Remove it from your lwipopts.h."
-#endif
-#ifdef TCP_REXMIT_DEBUG
-  #error "TCP_REXMIT_DEBUG option is deprecated. Remove it from your lwipopts.h."
-#endif
-#ifdef RAW_STATS
-  #error "RAW_STATS option is deprecated. Remove it from your lwipopts.h."
-#endif
-#ifdef ETHARP_QUEUE_FIRST
-  #error "ETHARP_QUEUE_FIRST option is deprecated. Remove it from your lwipopts.h."
-#endif
-#ifdef ETHARP_ALWAYS_INSERT
-  #error "ETHARP_ALWAYS_INSERT option is deprecated. Remove it from your lwipopts.h."
-#endif
-#if !NO_SYS && LWIP_TCPIP_CORE_LOCKING && LWIP_COMPAT_MUTEX && !defined(LWIP_COMPAT_MUTEX_ALLOWED)
-  #error "LWIP_COMPAT_MUTEX cannot prevent priority inversion. It is recommended to implement priority-aware mutexes. (Define LWIP_COMPAT_MUTEX_ALLOWED to disable this error.)"
-#endif
-
-#ifndef LWIP_DISABLE_TCP_SANITY_CHECKS
-#define LWIP_DISABLE_TCP_SANITY_CHECKS  0
-#endif
-#ifndef LWIP_DISABLE_MEMP_SANITY_CHECKS
-#define LWIP_DISABLE_MEMP_SANITY_CHECKS 0
-#endif
-
-/* MEMP sanity checks */
-#if MEMP_MEM_MALLOC
-#if !LWIP_DISABLE_MEMP_SANITY_CHECKS
-#if LWIP_NETCONN || LWIP_SOCKET
-#if !MEMP_NUM_NETCONN && LWIP_SOCKET
-#error "lwip_sanity_check: WARNING: MEMP_NUM_NETCONN cannot be 0 when using sockets!"
-#endif
-#else /* MEMP_MEM_MALLOC */
-#if MEMP_NUM_NETCONN > (MEMP_NUM_TCP_PCB+MEMP_NUM_TCP_PCB_LISTEN+MEMP_NUM_UDP_PCB+MEMP_NUM_RAW_PCB)
-#error "lwip_sanity_check: WARNING: MEMP_NUM_NETCONN should be less than the sum of MEMP_NUM_{TCP,RAW,UDP}_PCB+MEMP_NUM_TCP_PCB_LISTEN. If you know what you are doing, define LWIP_DISABLE_MEMP_SANITY_CHECKS to 1 to disable this error."
-#endif
-#endif /* LWIP_NETCONN || LWIP_SOCKET */
-#endif /* !LWIP_DISABLE_MEMP_SANITY_CHECKS */
-#if MEM_USE_POOLS
-#error "MEMP_MEM_MALLOC and MEM_USE_POOLS cannot be enabled at the same time"
-#endif
-#ifdef LWIP_HOOK_MEMP_AVAILABLE
-#error "LWIP_HOOK_MEMP_AVAILABLE doesn't make sense with MEMP_MEM_MALLOC"
-#endif
-#endif /* MEMP_MEM_MALLOC */
-
-/* TCP sanity checks */
-#if !LWIP_DISABLE_TCP_SANITY_CHECKS
-#if LWIP_TCP
-#if !MEMP_MEM_MALLOC && (MEMP_NUM_TCP_SEG < TCP_SND_QUEUELEN)
-  #error "lwip_sanity_check: WARNING: MEMP_NUM_TCP_SEG should be at least as big as TCP_SND_QUEUELEN. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
-#endif
-#if TCP_SND_BUF < (2 * TCP_MSS)
-  #error "lwip_sanity_check: WARNING: TCP_SND_BUF must be at least as much as (2 * TCP_MSS) for things to work smoothly. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
-#endif
-#if TCP_SND_QUEUELEN < (2 * (TCP_SND_BUF / TCP_MSS))
-  #error "lwip_sanity_check: WARNING: TCP_SND_QUEUELEN must be at least as much as (2 * TCP_SND_BUF/TCP_MSS) for things to work. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
-#endif
-#if TCP_SNDLOWAT >= TCP_SND_BUF
-  #error "lwip_sanity_check: WARNING: TCP_SNDLOWAT must be less than TCP_SND_BUF. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
-#endif
-#if TCP_SNDLOWAT >= (0xFFFF - (4 * TCP_MSS))
-  #error "lwip_sanity_check: WARNING: TCP_SNDLOWAT must at least be 4*MSS below u16_t overflow!"
-#endif
-#if TCP_SNDQUEUELOWAT >= TCP_SND_QUEUELEN
-  #error "lwip_sanity_check: WARNING: TCP_SNDQUEUELOWAT must be less than TCP_SND_QUEUELEN. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
-#endif
-#if !MEMP_MEM_MALLOC && PBUF_POOL_SIZE && (PBUF_POOL_BUFSIZE <= (PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN))
-  #error "lwip_sanity_check: WARNING: PBUF_POOL_BUFSIZE does not provide enough space for protocol headers. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
-#endif
-#if !MEMP_MEM_MALLOC && PBUF_POOL_SIZE && (TCP_WND > (PBUF_POOL_SIZE * (PBUF_POOL_BUFSIZE - (PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN))))
-  #error "lwip_sanity_check: WARNING: TCP_WND is larger than space provided by PBUF_POOL_SIZE * (PBUF_POOL_BUFSIZE - protocol headers). If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
-#endif
-#if TCP_WND < TCP_MSS
-  #error "lwip_sanity_check: WARNING: TCP_WND is smaller than MSS. If you know what you are doing, define LWIP_DISABLE_TCP_SANITY_CHECKS to 1 to disable this error."
-#endif
-#endif /* LWIP_TCP */
-#endif /* !LWIP_DISABLE_TCP_SANITY_CHECKS */
-
-/**
- * @ingroup lwip_nosys
- * Initialize all modules.
- * Use this in NO_SYS mode. Use tcpip_init() otherwise.
- */
-void
-lwip_init(void)
-{
-#ifndef LWIP_SKIP_CONST_CHECK
-  int a = 0;
-  LWIP_UNUSED_ARG(a);
-  LWIP_ASSERT("LWIP_CONST_CAST not implemented correctly. Check your lwIP port.", LWIP_CONST_CAST(void*, &a) == &a);
-#endif
-#ifndef LWIP_SKIP_PACKING_CHECK
-  LWIP_ASSERT("Struct packing not implemented correctly. Check your lwIP port.", sizeof(struct packed_struct_test) == PACKED_STRUCT_TEST_EXPECTED_SIZE);
-#endif
-
-  /* Modules initialization */
-  stats_init();
-#if !NO_SYS
-  sys_init();
-#endif /* !NO_SYS */
-  mem_init();
-  memp_init();
-  pbuf_init();
-  netif_init();
-#if LWIP_IPV4
-  ip_init();
-#if LWIP_ARP
-  etharp_init();
-#endif /* LWIP_ARP */
-#endif /* LWIP_IPV4 */
-#if LWIP_RAW
-  raw_init();
-#endif /* LWIP_RAW */
-#if LWIP_UDP
-  udp_init();
-#endif /* LWIP_UDP */
-#if LWIP_TCP
-  tcp_init();
-#endif /* LWIP_TCP */
-#if LWIP_IGMP
-  igmp_init();
-#endif /* LWIP_IGMP */
-#if LWIP_DNS
-  dns_init();
-#endif /* LWIP_DNS */
-#if PPP_SUPPORT
-  ppp_init();
-#endif
- 
-#if LWIP_TIMERS
-  sys_timeouts_init();
-#endif /* LWIP_TIMERS */
-}
diff --git a/sys/net/core/ip.c b/sys/net/core/ip.c
deleted file mode 100644
index 3c1e4af..0000000
--- a/sys/net/core/ip.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * @file
- * Common IPv4 and IPv6 code
- *
- * @defgroup ip IP
- * @ingroup callbackstyle_api
- * 
- * @defgroup ip4 IPv4
- * @ingroup ip
- *
- * @defgroup ip6 IPv6
- * @ingroup ip
- * 
- * @defgroup ipaddr IP address handling
- * @ingroup infrastructure
- * 
- * @defgroup ip4addr IPv4 only
- * @ingroup ipaddr
- * 
- * @defgroup ip6addr IPv6 only
- * @ingroup ipaddr
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV4 || LWIP_IPV6
-
-#include "net/ip_addr.h"
-#include "net/ip.h"
-
-/** Global data for both IPv4 and IPv6 */
-struct ip_globals ip_data;
-
-#if LWIP_IPV4 && LWIP_IPV6
-
-const ip_addr_t ip_addr_any_type = IPADDR_ANY_TYPE_INIT;
-
-/**
- * @ingroup ipaddr
- * Convert IP address string (both versions) to numeric.
- * The version is auto-detected from the string.
- *
- * @param cp IP address string to convert
- * @param addr conversion result is stored here
- * @return 1 on success, 0 on error
- */
-int
-ipaddr_aton(const char *cp, ip_addr_t *addr)
-{
-  if (cp != NULL) {
-    const char* c;
-    for (c = cp; *c != 0; c++) {
-      if (*c == ':') {
-        /* contains a colon: IPv6 address */
-        if (addr) {
-          IP_SET_TYPE_VAL(*addr, IPADDR_TYPE_V6);
-        }
-        return ip6addr_aton(cp, ip_2_ip6(addr));
-      } else if (*c == '.') {
-        /* contains a dot: IPv4 address */
-        break;
-      }
-    }
-    /* call ip4addr_aton as fallback or if IPv4 was found */
-    if (addr) {
-      IP_SET_TYPE_VAL(*addr, IPADDR_TYPE_V4);
-    }
-    return ip4addr_aton(cp, ip_2_ip4(addr));
-  }
-  return 0;
-}
-
-/**
- * @ingroup lwip_nosys
- * If both IP versions are enabled, this function can dispatch packets to the correct one.
- * Don't call directly, pass to netif_add() and call netif->input().
- */
-err_t
-ip_input(struct pbuf *p, struct netif *inp)
-{
-  if (p != NULL) {
-    if (IP_HDR_GET_VERSION(p->payload) == 6) {
-      return ip6_input(p, inp);
-    }
-    return ip4_input(p, inp);
-  }
-  return ERR_VAL;
-}
-
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-#endif /* LWIP_IPV4 || LWIP_IPV6 */
diff --git a/sys/net/core/ipv4/Makefile b/sys/net/core/ipv4/Makefile
deleted file mode 100644
index 008e01a..0000000
--- a/sys/net/core/ipv4/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile,v 1.2 2004/07/20 21:17:05 reddawg Exp $
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-
-#  Objects
-OBJS = autoip.o dhcp.o etharp.o icmp.o igmp.o ip4.o ip4_addr.o ip4_frag.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../../include -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../../include -S -o $@ $<
-.c.o:
-	$(CC) ${CFLAGS} -I../../../include -c -o $@ $<
-.c.s:
-	$(CC) ${CFLAGS} -I../../../include -S -o $@ $<
-.S.o:
-	$(CC) ${CFLAGS} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/net/core/ipv4/autoip.c b/sys/net/core/ipv4/autoip.c
deleted file mode 100644
index 7aec3fc..0000000
--- a/sys/net/core/ipv4/autoip.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/**
- * @file
- * AutoIP Automatic LinkLocal IP Configuration
- *
- * This is a AutoIP implementation for the lwIP TCP/IP stack. It aims to conform
- * with RFC 3927.
- *
- * @defgroup autoip AUTOIP
- * @ingroup ip4
- * AUTOIP related functions
- * USAGE:
- *
- * define @ref LWIP_AUTOIP 1 in your lwipopts.h
- * Options:
- * AUTOIP_TMR_INTERVAL msecs,
- *   I recommend a value of 100. The value must divide 1000 with a remainder almost 0.
- *   Possible values are 1000, 500, 333, 250, 200, 166, 142, 125, 111, 100 ....
- *
- * Without DHCP:
- * - Call autoip_start() after netif_add().
- *
- * With DHCP:
- * - define @ref LWIP_DHCP_AUTOIP_COOP 1 in your lwipopts.h.
- * - Configure your DHCP Client.
- * 
- * @see netifapi_autoip
- */
-
-/*
- *
- * Copyright (c) 2007 Dominik Spies <kontakt@dspies.de>
- * 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 ``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 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.
- *
- * Author: Dominik Spies <kontakt@dspies.de>
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV4 && LWIP_AUTOIP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/mem.h"
-/* #include "net/udp.h" */
-#include "net/ip_addr.h"
-#include "net/netif.h"
-#include "net/autoip.h"
-#include "net/etharp.h"
-#include "net/prot/autoip.h"
-
-#include <string.h>
-
-/** Pseudo random macro based on netif informations.
- * You could use "rand()" from the C Library if you define LWIP_AUTOIP_RAND in lwipopts.h */
-#ifndef LWIP_AUTOIP_RAND
-#define LWIP_AUTOIP_RAND(netif) ( (((u32_t)((netif->hwaddr[5]) & 0xff) << 24) | \
-                                   ((u32_t)((netif->hwaddr[3]) & 0xff) << 16) | \
-                                   ((u32_t)((netif->hwaddr[2]) & 0xff) << 8) | \
-                                   ((u32_t)((netif->hwaddr[4]) & 0xff))) + \
-                                   (netif_autoip_data(netif)? netif_autoip_data(netif)->tried_llipaddr : 0))
-#endif /* LWIP_AUTOIP_RAND */
-
-/**
- * Macro that generates the initial IP address to be tried by AUTOIP.
- * If you want to override this, define it to something else in lwipopts.h.
- */
-#ifndef LWIP_AUTOIP_CREATE_SEED_ADDR
-#define LWIP_AUTOIP_CREATE_SEED_ADDR(netif) \
-  lwip_htonl(AUTOIP_RANGE_START + ((u32_t)(((u8_t)(netif->hwaddr[4])) | \
-                 ((u32_t)((u8_t)(netif->hwaddr[5]))) << 8)))
-#endif /* LWIP_AUTOIP_CREATE_SEED_ADDR */
-
-/* static functions */
-static err_t autoip_arp_announce(struct netif *netif);
-static void autoip_start_probing(struct netif *netif);
-
-/**
- * @ingroup autoip 
- * Set a statically allocated struct autoip to work with.
- * Using this prevents autoip_start to allocate it using mem_malloc.
- *
- * @param netif the netif for which to set the struct autoip
- * @param autoip (uninitialised) autoip struct allocated by the application
- */
-void
-autoip_set_struct(struct netif *netif, struct autoip *autoip)
-{
-  LWIP_ASSERT("netif != NULL", netif != NULL);
-  LWIP_ASSERT("autoip != NULL", autoip != NULL);
-  LWIP_ASSERT("netif already has a struct autoip set",
-              netif_autoip_data(netif) == NULL);
-
-  /* clear data structure */
-  memset(autoip, 0, sizeof(struct autoip));
-  /* autoip->state = AUTOIP_STATE_OFF; */
-  netif_set_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_AUTOIP, autoip);
-}
-
-/** Restart AutoIP client and check the next address (conflict detected)
- *
- * @param netif The netif under AutoIP control
- */
-static void
-autoip_restart(struct netif *netif)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-  autoip->tried_llipaddr++;
-  autoip_start(netif);
-}
-
-/**
- * Handle a IP address conflict after an ARP conflict detection
- */
-static void
-autoip_handle_arp_conflict(struct netif *netif)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-
-  /* RFC3927, 2.5 "Conflict Detection and Defense" allows two options where
-     a) means retreat on the first conflict and
-     b) allows to keep an already configured address when having only one
-        conflict in 10 seconds
-     We use option b) since it helps to improve the chance that one of the two
-     conflicting hosts may be able to retain its address. */
-
-  if (autoip->lastconflict > 0) {
-    /* retreat, there was a conflicting ARP in the last DEFEND_INTERVAL seconds */
-    LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-      ("autoip_handle_arp_conflict(): we are defending, but in DEFEND_INTERVAL, retreating\n"));
-
-    /* Active TCP sessions are aborted when removing the ip addresss */
-    autoip_restart(netif);
-  } else {
-    LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-      ("autoip_handle_arp_conflict(): we are defend, send ARP Announce\n"));
-    autoip_arp_announce(netif);
-    autoip->lastconflict = DEFEND_INTERVAL * AUTOIP_TICKS_PER_SECOND;
-  }
-}
-
-/**
- * Create an IP-Address out of range 169.254.1.0 to 169.254.254.255
- *
- * @param netif network interface on which create the IP-Address
- * @param ipaddr ip address to initialize
- */
-static void
-autoip_create_addr(struct netif *netif, ip4_addr_t *ipaddr)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-
-  /* Here we create an IP-Address out of range 169.254.1.0 to 169.254.254.255
-   * compliant to RFC 3927 Section 2.1
-   * We have 254 * 256 possibilities */
-
-  u32_t addr = lwip_ntohl(LWIP_AUTOIP_CREATE_SEED_ADDR(netif));
-  addr += autoip->tried_llipaddr;
-  addr = AUTOIP_NET | (addr & 0xffff);
-  /* Now, 169.254.0.0 <= addr <= 169.254.255.255 */
-
-  if (addr < AUTOIP_RANGE_START) {
-    addr += AUTOIP_RANGE_END - AUTOIP_RANGE_START + 1;
-  }
-  if (addr > AUTOIP_RANGE_END) {
-    addr -= AUTOIP_RANGE_END - AUTOIP_RANGE_START + 1;
-  }
-  LWIP_ASSERT("AUTOIP address not in range", (addr >= AUTOIP_RANGE_START) &&
-    (addr <= AUTOIP_RANGE_END));
-  ip4_addr_set_u32(ipaddr, lwip_htonl(addr));
-
-  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-    ("autoip_create_addr(): tried_llipaddr=%"U16_F", %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-    (u16_t)(autoip->tried_llipaddr), ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr),
-    ip4_addr3_16(ipaddr), ip4_addr4_16(ipaddr)));
-}
-
-/**
- * Sends an ARP probe from a network interface
- *
- * @param netif network interface used to send the probe
- */
-static err_t
-autoip_arp_probe(struct netif *netif)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-  /* this works because netif->ip_addr is ANY */
-  return etharp_request(netif, &autoip->llipaddr);
-}
-
-/**
- * Sends an ARP announce from a network interface
- *
- * @param netif network interface used to send the announce
- */
-static err_t
-autoip_arp_announce(struct netif *netif)
-{
-  return etharp_gratuitous(netif);
-}
-
-/**
- * Configure interface for use with current LL IP-Address
- *
- * @param netif network interface to configure with current LL IP-Address
- */
-static err_t
-autoip_bind(struct netif *netif)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-  ip4_addr_t sn_mask, gw_addr;
-
-  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
-    ("autoip_bind(netif=%p) %c%c%"U16_F" %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-    (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num,
-    ip4_addr1_16(&autoip->llipaddr), ip4_addr2_16(&autoip->llipaddr),
-    ip4_addr3_16(&autoip->llipaddr), ip4_addr4_16(&autoip->llipaddr)));
-
-  IP4_ADDR(&sn_mask, 255, 255, 0, 0);
-  IP4_ADDR(&gw_addr, 0, 0, 0, 0);
-
-  netif_set_addr(netif, &autoip->llipaddr, &sn_mask, &gw_addr);
-  /* interface is used by routing now that an address is set */
-
-  return ERR_OK;
-}
-
-/**
- * @ingroup autoip 
- * Start AutoIP client
- *
- * @param netif network interface on which start the AutoIP client
- */
-err_t
-autoip_start(struct netif *netif)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-  err_t result = ERR_OK;
-
-  LWIP_ERROR("netif is not up, old style port?", netif_is_up(netif), return ERR_ARG;);
-
-  /* Set IP-Address, Netmask and Gateway to 0 to make sure that
-   * ARP Packets are formed correctly
-   */
-  netif_set_addr(netif, IP4_ADDR_ANY4, IP4_ADDR_ANY4, IP4_ADDR_ANY4);
-
-  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-    ("autoip_start(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0],
-    netif->name[1], (u16_t)netif->num));
-  if (autoip == NULL) {
-    /* no AutoIP client attached yet? */
-    LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
-      ("autoip_start(): starting new AUTOIP client\n"));
-    autoip = (struct autoip *)mem_malloc(sizeof(struct autoip));
-    if (autoip == NULL) {
-      LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
-        ("autoip_start(): could not allocate autoip\n"));
-      return ERR_MEM;
-    }
-    memset(autoip, 0, sizeof(struct autoip));
-    /* store this AutoIP client in the netif */
-    netif_set_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_AUTOIP, autoip);
-    LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE, ("autoip_start(): allocated autoip"));
-  } else {
-    autoip->state = AUTOIP_STATE_OFF;
-    autoip->ttw = 0;
-    autoip->sent_num = 0;
-    ip4_addr_set_zero(&autoip->llipaddr);
-    autoip->lastconflict = 0;
-  }
-
-  autoip_create_addr(netif, &(autoip->llipaddr));
-  autoip_start_probing(netif);
-
-  return result;
-}
-
-static void
-autoip_start_probing(struct netif *netif)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-
-  autoip->state = AUTOIP_STATE_PROBING;
-  autoip->sent_num = 0;
-  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-     ("autoip_start_probing(): changing state to PROBING: %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-      ip4_addr1_16(&autoip->llipaddr), ip4_addr2_16(&autoip->llipaddr),
-      ip4_addr3_16(&autoip->llipaddr), ip4_addr4_16(&autoip->llipaddr)));
-
-  /* time to wait to first probe, this is randomly
-   * chosen out of 0 to PROBE_WAIT seconds.
-   * compliant to RFC 3927 Section 2.2.1
-   */
-  autoip->ttw = (u16_t)(LWIP_AUTOIP_RAND(netif) % (PROBE_WAIT * AUTOIP_TICKS_PER_SECOND));
-
-  /*
-   * if we tried more then MAX_CONFLICTS we must limit our rate for
-   * acquiring and probing address
-   * compliant to RFC 3927 Section 2.2.1
-   */
-  if (autoip->tried_llipaddr > MAX_CONFLICTS) {
-    autoip->ttw = RATE_LIMIT_INTERVAL * AUTOIP_TICKS_PER_SECOND;
-  }
-}
-
-/**
- * Handle a possible change in the network configuration.
- *
- * If there is an AutoIP address configured, take the interface down
- * and begin probing with the same address.
- */
-void
-autoip_network_changed(struct netif *netif)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-
-  if (autoip && (autoip->state != AUTOIP_STATE_OFF)) {
-    autoip_start_probing(netif);
-  }
-}
-
-/**
- * @ingroup autoip 
- * Stop AutoIP client
- *
- * @param netif network interface on which stop the AutoIP client
- */
-err_t
-autoip_stop(struct netif *netif)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-
-  if (autoip != NULL) {
-    autoip->state = AUTOIP_STATE_OFF;
-    if (ip4_addr_islinklocal(netif_ip4_addr(netif))) {
-      netif_set_addr(netif, IP4_ADDR_ANY4, IP4_ADDR_ANY4, IP4_ADDR_ANY4);
-    }
-  }
-  return ERR_OK;
-}
-
-/**
- * Has to be called in loop every AUTOIP_TMR_INTERVAL milliseconds
- */
-void
-autoip_tmr(void)
-{
-  struct netif *netif = netif_list;
-  /* loop through netif's */
-  while (netif != NULL) {
-    struct autoip* autoip = netif_autoip_data(netif);
-    /* only act on AutoIP configured interfaces */
-    if (autoip != NULL) {
-      if (autoip->lastconflict > 0) {
-        autoip->lastconflict--;
-      }
-
-      LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE,
-        ("autoip_tmr() AutoIP-State: %"U16_F", ttw=%"U16_F"\n",
-        (u16_t)(autoip->state), autoip->ttw));
-
-      if (autoip->ttw > 0) {
-        autoip->ttw--;
-      }
-
-      switch(autoip->state) {
-        case AUTOIP_STATE_PROBING:
-          if (autoip->ttw == 0) {
-            if (autoip->sent_num >= PROBE_NUM) {
-              /* Switch to ANNOUNCING: now we can bind to an IP address and use it */
-              autoip->state = AUTOIP_STATE_ANNOUNCING;
-              autoip_bind(netif);
-              /* autoip_bind() calls netif_set_addr(): this triggers a gratuitous ARP
-                 which counts as an announcement */
-              autoip->sent_num = 1;
-              autoip->ttw = ANNOUNCE_WAIT * AUTOIP_TICKS_PER_SECOND;
-              LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-                 ("autoip_tmr(): changing state to ANNOUNCING: %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-                  ip4_addr1_16(&autoip->llipaddr), ip4_addr2_16(&autoip->llipaddr),
-                  ip4_addr3_16(&autoip->llipaddr), ip4_addr4_16(&autoip->llipaddr)));
-            } else {
-              autoip_arp_probe(netif);
-              LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE, ("autoip_tmr() PROBING Sent Probe\n"));
-              autoip->sent_num++;
-              if (autoip->sent_num == PROBE_NUM) {
-                /* calculate time to wait to for announce */
-                autoip->ttw = ANNOUNCE_WAIT * AUTOIP_TICKS_PER_SECOND;
-              } else {
-                /* calculate time to wait to next probe */
-                autoip->ttw = (u16_t)((LWIP_AUTOIP_RAND(netif) %
-                  ((PROBE_MAX - PROBE_MIN) * AUTOIP_TICKS_PER_SECOND) ) +
-                  PROBE_MIN * AUTOIP_TICKS_PER_SECOND);
-              }
-            }
-          }
-          break;
-
-        case AUTOIP_STATE_ANNOUNCING:
-          if (autoip->ttw == 0) {
-            autoip_arp_announce(netif);
-            LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE, ("autoip_tmr() ANNOUNCING Sent Announce\n"));
-            autoip->ttw = ANNOUNCE_INTERVAL * AUTOIP_TICKS_PER_SECOND;
-            autoip->sent_num++;
-
-            if (autoip->sent_num >= ANNOUNCE_NUM) {
-                autoip->state = AUTOIP_STATE_BOUND;
-                autoip->sent_num = 0;
-                autoip->ttw = 0;
-                 LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-                    ("autoip_tmr(): changing state to BOUND: %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-                     ip4_addr1_16(&autoip->llipaddr), ip4_addr2_16(&autoip->llipaddr),
-                     ip4_addr3_16(&autoip->llipaddr), ip4_addr4_16(&autoip->llipaddr)));
-            }
-          }
-          break;
-
-        default:
-          /* nothing to do in other states */
-          break;
-      }
-    }
-    /* proceed to next network interface */
-    netif = netif->next;
-  }
-}
-
-/**
- * Handles every incoming ARP Packet, called by etharp_input().
- *
- * @param netif network interface to use for autoip processing
- * @param hdr Incoming ARP packet
- */
-void
-autoip_arp_reply(struct netif *netif, struct etharp_hdr *hdr)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-
-  LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE, ("autoip_arp_reply()\n"));
-  if ((autoip != NULL) && (autoip->state != AUTOIP_STATE_OFF)) {
-   /* when ip.src == llipaddr && hw.src != netif->hwaddr
-    *
-    * when probing  ip.dst == llipaddr && hw.src != netif->hwaddr
-    * we have a conflict and must solve it
-    */
-    ip4_addr_t sipaddr, dipaddr;
-    struct eth_addr netifaddr;
-    ETHADDR16_COPY(netifaddr.addr, netif->hwaddr);
-
-    /* Copy struct ip4_addr2 to aligned ip4_addr, to support compilers without
-     * structure packing (not using structure copy which breaks strict-aliasing rules).
-     */
-    IPADDR2_COPY(&sipaddr, &hdr->sipaddr);
-    IPADDR2_COPY(&dipaddr, &hdr->dipaddr);
-
-    if (autoip->state == AUTOIP_STATE_PROBING) {
-     /* RFC 3927 Section 2.2.1:
-      * from beginning to after ANNOUNCE_WAIT
-      * seconds we have a conflict if
-      * ip.src == llipaddr OR
-      * ip.dst == llipaddr && hw.src != own hwaddr
-      */
-      if ((ip4_addr_cmp(&sipaddr, &autoip->llipaddr)) ||
-          (ip4_addr_isany_val(sipaddr) &&
-           ip4_addr_cmp(&dipaddr, &autoip->llipaddr) &&
-           !eth_addr_cmp(&netifaddr, &hdr->shwaddr))) {
-        LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE | LWIP_DBG_LEVEL_WARNING,
-          ("autoip_arp_reply(): Probe Conflict detected\n"));
-        autoip_restart(netif);
-      }
-    } else {
-     /* RFC 3927 Section 2.5:
-      * in any state we have a conflict if
-      * ip.src == llipaddr && hw.src != own hwaddr
-      */
-      if (ip4_addr_cmp(&sipaddr, &autoip->llipaddr) &&
-          !eth_addr_cmp(&netifaddr, &hdr->shwaddr)) {
-        LWIP_DEBUGF(AUTOIP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE | LWIP_DBG_LEVEL_WARNING,
-          ("autoip_arp_reply(): Conflicting ARP-Packet detected\n"));
-        autoip_handle_arp_conflict(netif);
-      }
-    }
-  }
-}
-
-/** check if AutoIP supplied netif->ip_addr
- *
- * @param netif the netif to check
- * @return 1 if AutoIP supplied netif->ip_addr (state BOUND or ANNOUNCING),
- *         0 otherwise
- */
-u8_t
-autoip_supplied_address(const struct netif *netif)
-{
-  if ((netif != NULL) && (netif_autoip_data(netif) != NULL)) {
-    struct autoip* autoip = netif_autoip_data(netif);
-    return (autoip->state == AUTOIP_STATE_BOUND) || (autoip->state == AUTOIP_STATE_ANNOUNCING);
-  }
-  return 0;
-}
-
-u8_t
-autoip_accept_packet(struct netif *netif, const ip4_addr_t *addr)
-{
-  struct autoip* autoip = netif_autoip_data(netif);
-  return (autoip != NULL) && ip4_addr_cmp(addr, &(autoip->llipaddr));
-}
-
-#endif /* LWIP_IPV4 && LWIP_AUTOIP */
diff --git a/sys/net/core/ipv4/dhcp.c b/sys/net/core/ipv4/dhcp.c
deleted file mode 100644
index 48062ec..0000000
--- a/sys/net/core/ipv4/dhcp.c
+++ /dev/null
@@ -1,1951 +0,0 @@
-/**
- * @file
- * Dynamic Host Configuration Protocol client
- *
- * @defgroup dhcp4 DHCPv4
- * @ingroup ip4
- * DHCP (IPv4) related functions
- * This is a DHCP client for the lwIP TCP/IP stack. It aims to conform
- * with RFC 2131 and RFC 2132.
- *
- * @todo:
- * - Support for interfaces other than Ethernet (SLIP, PPP, ...)
- *
- * Options:
- * @ref DHCP_COARSE_TIMER_SECS (recommended 60 which is a minute)
- * @ref DHCP_FINE_TIMER_MSECS (recommended 500 which equals TCP coarse timer)
- *
- * dhcp_start() starts a DHCP client instance which
- * configures the interface by obtaining an IP address lease and maintaining it.
- *
- * Use dhcp_release() to end the lease and use dhcp_stop()
- * to remove the DHCP client.
- *
- * @see netifapi_dhcp4
- */
-
-/*
- * Copyright (c) 2001-2004 Leon Woestenberg <leon.woestenberg@gmx.net>
- * Copyright (c) 2001-2004 Axon Digital Design B.V., The Netherlands.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- * The Swedish Institute of Computer Science and Adam Dunkels
- * are specifically granted permission to redistribute this
- * source code.
- *
- * Author: Leon Woestenberg <leon.woestenberg@gmx.net>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV4 && LWIP_DHCP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/stats.h"
-#include "net/mem.h"
-#include "net/udp.h"
-#include "net/ip_addr.h"
-#include "net/netif.h"
-#include "net/def.h"
-#include "net/dhcp.h"
-#include "net/autoip.h"
-#include "net/dns.h"
-#include "net/etharp.h"
-#include "net/prot/dhcp.h"
-
-#include <string.h>
-
-/** DHCP_CREATE_RAND_XID: if this is set to 1, the xid is created using
- * LWIP_RAND() (this overrides DHCP_GLOBAL_XID)
- */
-#ifndef DHCP_CREATE_RAND_XID
-#define DHCP_CREATE_RAND_XID        1
-#endif
-
-/** Default for DHCP_GLOBAL_XID is 0xABCD0000
- * This can be changed by defining DHCP_GLOBAL_XID and DHCP_GLOBAL_XID_HEADER, e.g.
- *  \#define DHCP_GLOBAL_XID_HEADER "stdlib.h"
- *  \#define DHCP_GLOBAL_XID rand()
- */
-#ifdef DHCP_GLOBAL_XID_HEADER
-#include DHCP_GLOBAL_XID_HEADER /* include optional starting XID generation prototypes */
-#endif
-
-/** DHCP_OPTION_MAX_MSG_SIZE is set to the MTU
- * MTU is checked to be big enough in dhcp_start */
-#define DHCP_MAX_MSG_LEN(netif)        (netif->mtu)
-#define DHCP_MAX_MSG_LEN_MIN_REQUIRED  576
-/** Minimum length for reply before packet is parsed */
-#define DHCP_MIN_REPLY_LEN             44
-
-#define REBOOT_TRIES                2
-
-#if LWIP_DNS && LWIP_DHCP_MAX_DNS_SERVERS
-#if DNS_MAX_SERVERS > LWIP_DHCP_MAX_DNS_SERVERS
-#define LWIP_DHCP_PROVIDE_DNS_SERVERS LWIP_DHCP_MAX_DNS_SERVERS
-#else
-#define LWIP_DHCP_PROVIDE_DNS_SERVERS DNS_MAX_SERVERS
-#endif
-#else
-#define LWIP_DHCP_PROVIDE_DNS_SERVERS 0
-#endif
-
-/** Option handling: options are parsed in dhcp_parse_reply
- * and saved in an array where other functions can load them from.
- * This might be moved into the struct dhcp (not necessarily since
- * lwIP is single-threaded and the array is only used while in recv
- * callback). */
-enum dhcp_option_idx {
-  DHCP_OPTION_IDX_OVERLOAD = 0,
-  DHCP_OPTION_IDX_MSG_TYPE,
-  DHCP_OPTION_IDX_SERVER_ID,
-  DHCP_OPTION_IDX_LEASE_TIME,
-  DHCP_OPTION_IDX_T1,
-  DHCP_OPTION_IDX_T2,
-  DHCP_OPTION_IDX_SUBNET_MASK,
-  DHCP_OPTION_IDX_ROUTER,
-#if LWIP_DHCP_PROVIDE_DNS_SERVERS
-  DHCP_OPTION_IDX_DNS_SERVER,
-  DHCP_OPTION_IDX_DNS_SERVER_LAST = DHCP_OPTION_IDX_DNS_SERVER + LWIP_DHCP_PROVIDE_DNS_SERVERS - 1,
-#endif /* LWIP_DHCP_PROVIDE_DNS_SERVERS */
-#if LWIP_DHCP_GET_NTP_SRV
-  DHCP_OPTION_IDX_NTP_SERVER,
-  DHCP_OPTION_IDX_NTP_SERVER_LAST = DHCP_OPTION_IDX_NTP_SERVER + LWIP_DHCP_MAX_NTP_SERVERS - 1,
-#endif /* LWIP_DHCP_GET_NTP_SRV */
-  DHCP_OPTION_IDX_MAX
-};
-
-/** Holds the decoded option values, only valid while in dhcp_recv.
-    @todo: move this into struct dhcp? */
-u32_t dhcp_rx_options_val[DHCP_OPTION_IDX_MAX];
-/** Holds a flag which option was received and is contained in dhcp_rx_options_val,
-    only valid while in dhcp_recv.
-    @todo: move this into struct dhcp? */
-u8_t  dhcp_rx_options_given[DHCP_OPTION_IDX_MAX];
-
-static u8_t dhcp_discover_request_options[] = {
-  DHCP_OPTION_SUBNET_MASK,
-  DHCP_OPTION_ROUTER,
-  DHCP_OPTION_BROADCAST
-#if LWIP_DHCP_PROVIDE_DNS_SERVERS
-  , DHCP_OPTION_DNS_SERVER
-#endif /* LWIP_DHCP_PROVIDE_DNS_SERVERS */
-#if LWIP_DHCP_GET_NTP_SRV
-  , DHCP_OPTION_NTP
-#endif /* LWIP_DHCP_GET_NTP_SRV */
-  };
-
-#ifdef DHCP_GLOBAL_XID
-static u32_t xid;
-static u8_t xid_initialised;
-#endif /* DHCP_GLOBAL_XID */
-
-#define dhcp_option_given(dhcp, idx)          (dhcp_rx_options_given[idx] != 0)
-#define dhcp_got_option(dhcp, idx)            (dhcp_rx_options_given[idx] = 1)
-#define dhcp_clear_option(dhcp, idx)          (dhcp_rx_options_given[idx] = 0)
-#define dhcp_clear_all_options(dhcp)          (memset(dhcp_rx_options_given, 0, sizeof(dhcp_rx_options_given)))
-#define dhcp_get_option_value(dhcp, idx)      (dhcp_rx_options_val[idx])
-#define dhcp_set_option_value(dhcp, idx, val) (dhcp_rx_options_val[idx] = (val))
-
-static struct udp_pcb *dhcp_pcb;
-static u8_t dhcp_pcb_refcount;
-
-/* DHCP client state machine functions */
-static err_t dhcp_discover(struct netif *netif);
-static err_t dhcp_select(struct netif *netif);
-static void dhcp_bind(struct netif *netif);
-#if DHCP_DOES_ARP_CHECK
-static err_t dhcp_decline(struct netif *netif);
-#endif /* DHCP_DOES_ARP_CHECK */
-static err_t dhcp_rebind(struct netif *netif);
-static err_t dhcp_reboot(struct netif *netif);
-static void dhcp_set_state(struct dhcp *dhcp, u8_t new_state);
-
-/* receive, unfold, parse and free incoming messages */
-static void dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port);
-
-/* set the DHCP timers */
-static void dhcp_timeout(struct netif *netif);
-static void dhcp_t1_timeout(struct netif *netif);
-static void dhcp_t2_timeout(struct netif *netif);
-
-/* build outgoing messages */
-/* create a DHCP message, fill in common headers */
-static err_t dhcp_create_msg(struct netif *netif, struct dhcp *dhcp, u8_t message_type);
-/* free a DHCP request */
-static void dhcp_delete_msg(struct dhcp *dhcp);
-/* add a DHCP option (type, then length in bytes) */
-static void dhcp_option(struct dhcp *dhcp, u8_t option_type, u8_t option_len);
-/* add option values */
-static void dhcp_option_byte(struct dhcp *dhcp, u8_t value);
-static void dhcp_option_short(struct dhcp *dhcp, u16_t value);
-static void dhcp_option_long(struct dhcp *dhcp, u32_t value);
-#if LWIP_NETIF_HOSTNAME
-static void dhcp_option_hostname(struct dhcp *dhcp, struct netif *netif);
-#endif /* LWIP_NETIF_HOSTNAME */
-/* always add the DHCP options trailer to end and pad */
-static void dhcp_option_trailer(struct dhcp *dhcp);
-
-/** Ensure DHCP PCB is allocated and bound */
-static err_t
-dhcp_inc_pcb_refcount(void)
-{
-  if (dhcp_pcb_refcount == 0) {
-    LWIP_ASSERT("dhcp_inc_pcb_refcount(): memory leak", dhcp_pcb == NULL);
-
-    /* allocate UDP PCB */
-    dhcp_pcb = udp_new();
-
-    if (dhcp_pcb == NULL) {
-      return ERR_MEM;
-    }
-
-    ip_set_option(dhcp_pcb, SOF_BROADCAST);
-
-    /* set up local and remote port for the pcb -> listen on all interfaces on all src/dest IPs */
-    udp_bind(dhcp_pcb, IP4_ADDR_ANY, DHCP_CLIENT_PORT);
-    udp_connect(dhcp_pcb, IP4_ADDR_ANY, DHCP_SERVER_PORT);
-    udp_recv(dhcp_pcb, dhcp_recv, NULL);
-  }
-
-  dhcp_pcb_refcount++;
-
-  return ERR_OK;
-}
-
-/** Free DHCP PCB if the last netif stops using it */
-static void
-dhcp_dec_pcb_refcount(void)
-{
-  LWIP_ASSERT("dhcp_pcb_refcount(): refcount error", (dhcp_pcb_refcount > 0));
-  dhcp_pcb_refcount--;
-
-  if (dhcp_pcb_refcount == 0) {
-    udp_remove(dhcp_pcb);
-    dhcp_pcb = NULL;
-  }
-}
-
-/**
- * Back-off the DHCP client (because of a received NAK response).
- *
- * Back-off the DHCP client because of a received NAK. Receiving a
- * NAK means the client asked for something non-sensible, for
- * example when it tries to renew a lease obtained on another network.
- *
- * We clear any existing set IP address and restart DHCP negotiation
- * afresh (as per RFC2131 3.2.3).
- *
- * @param netif the netif under DHCP control
- */
-static void
-dhcp_handle_nak(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_handle_nak(netif=%p) %c%c%"U16_F"\n",
-    (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
-  /* Change to a defined state - set this before assigning the address
-     to ensure the callback can use dhcp_supplied_address() */
-  dhcp_set_state(dhcp, DHCP_STATE_BACKING_OFF);
-  /* remove IP address from interface (must no longer be used, as per RFC2131) */
-  netif_set_addr(netif, IP4_ADDR_ANY4, IP4_ADDR_ANY4, IP4_ADDR_ANY4);
-  /* We can immediately restart discovery */
-  dhcp_discover(netif);
-}
-
-#if DHCP_DOES_ARP_CHECK
-/**
- * Checks if the offered IP address is already in use.
- *
- * It does so by sending an ARP request for the offered address and
- * entering CHECKING state. If no ARP reply is received within a small
- * interval, the address is assumed to be free for use by us.
- *
- * @param netif the netif under DHCP control
- */
-static void
-dhcp_check(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-  err_t result;
-  u16_t msecs;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_check(netif=%p) %c%c\n", (void *)netif, (s16_t)netif->name[0],
-    (s16_t)netif->name[1]));
-  dhcp_set_state(dhcp, DHCP_STATE_CHECKING);
-  /* create an ARP query for the offered IP address, expecting that no host
-     responds, as the IP address should not be in use. */
-  result = etharp_query(netif, &dhcp->offered_ip_addr, NULL);
-  if (result != ERR_OK) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("dhcp_check: could not perform ARP query\n"));
-  }
-  if (dhcp->tries < 255) {
-    dhcp->tries++;
-  }
-  msecs = 500;
-  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_check(): set request timeout %"U16_F" msecs\n", msecs));
-}
-#endif /* DHCP_DOES_ARP_CHECK */
-
-/**
- * Remember the configuration offered by a DHCP server.
- *
- * @param netif the netif under DHCP control
- */
-static void
-dhcp_handle_offer(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_handle_offer(netif=%p) %c%c%"U16_F"\n",
-    (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
-  /* obtain the server address */
-  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_SERVER_ID)) {
-    ip_addr_set_ip4_u32(&dhcp->server_ip_addr, lwip_htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_SERVER_ID)));
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_handle_offer(): server 0x%08"X32_F"\n",
-      ip4_addr_get_u32(ip_2_ip4(&dhcp->server_ip_addr))));
-    /* remember offered address */
-    ip4_addr_copy(dhcp->offered_ip_addr, dhcp->msg_in->yiaddr);
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_handle_offer(): offer for 0x%08"X32_F"\n",
-      ip4_addr_get_u32(&dhcp->offered_ip_addr)));
-
-    dhcp_select(netif);
-  } else {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
-      ("dhcp_handle_offer(netif=%p) did not get server ID!\n", (void*)netif));
-  }
-}
-
-/**
- * Select a DHCP server offer out of all offers.
- *
- * Simply select the first offer received.
- *
- * @param netif the netif under DHCP control
- * @return lwIP specific error (see error.h)
- */
-static err_t
-dhcp_select(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-  err_t result;
-  u16_t msecs;
-  u8_t i;
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_select(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
-  dhcp_set_state(dhcp, DHCP_STATE_REQUESTING);
-
-  /* create and initialize the DHCP message header */
-  result = dhcp_create_msg(netif, dhcp, DHCP_REQUEST);
-  if (result == ERR_OK) {
-    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
-    dhcp_option_short(dhcp, DHCP_MAX_MSG_LEN(netif));
-
-    /* MUST request the offered IP address */
-    dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
-    dhcp_option_long(dhcp, lwip_ntohl(ip4_addr_get_u32(&dhcp->offered_ip_addr)));
-
-    dhcp_option(dhcp, DHCP_OPTION_SERVER_ID, 4);
-    dhcp_option_long(dhcp, lwip_ntohl(ip4_addr_get_u32(ip_2_ip4(&dhcp->server_ip_addr))));
-
-    dhcp_option(dhcp, DHCP_OPTION_PARAMETER_REQUEST_LIST, LWIP_ARRAYSIZE(dhcp_discover_request_options));
-    for (i = 0; i < LWIP_ARRAYSIZE(dhcp_discover_request_options); i++) {
-      dhcp_option_byte(dhcp, dhcp_discover_request_options[i]);
-    }
-
-#if LWIP_NETIF_HOSTNAME
-    dhcp_option_hostname(dhcp, netif);
-#endif /* LWIP_NETIF_HOSTNAME */
-
-    dhcp_option_trailer(dhcp);
-    /* shrink the pbuf to the actual content length */
-    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
-
-    /* send broadcast to any DHCP server */
-    udp_sendto_if_src(dhcp_pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif, IP4_ADDR_ANY);
-    dhcp_delete_msg(dhcp);
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_select: REQUESTING\n"));
-  } else {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("dhcp_select: could not allocate DHCP request\n"));
-  }
-  if (dhcp->tries < 255) {
-    dhcp->tries++;
-  }
-  msecs = (dhcp->tries < 6 ? 1 << dhcp->tries : 60) * 1000;
-  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_select(): set request timeout %"U16_F" msecs\n", msecs));
-  return result;
-}
-
-/**
- * The DHCP timer that checks for lease renewal/rebind timeouts.
- * Must be called once a minute (see @ref DHCP_COARSE_TIMER_SECS).
- */
-void
-dhcp_coarse_tmr(void)
-{
-  struct netif *netif = netif_list;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_coarse_tmr()\n"));
-  /* iterate through all network interfaces */
-  while (netif != NULL) {
-    /* only act on DHCP configured interfaces */
-    struct dhcp *dhcp = netif_dhcp_data(netif);
-    if ((dhcp != NULL) && (dhcp->state != DHCP_STATE_OFF)) {
-      /* compare lease time to expire timeout */
-      if (dhcp->t0_timeout && (++dhcp->lease_used == dhcp->t0_timeout)) {
-        LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_coarse_tmr(): t0 timeout\n"));
-        /* this clients' lease time has expired */
-        dhcp_release(netif);
-        dhcp_discover(netif);
-      /* timer is active (non zero), and triggers (zeroes) now? */
-      } else if (dhcp->t2_rebind_time && (dhcp->t2_rebind_time-- == 1)) {
-        LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_coarse_tmr(): t2 timeout\n"));
-        /* this clients' rebind timeout triggered */
-        dhcp_t2_timeout(netif);
-      /* timer is active (non zero), and triggers (zeroes) now */
-      } else if (dhcp->t1_renew_time && (dhcp->t1_renew_time-- == 1)) {
-        LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_coarse_tmr(): t1 timeout\n"));
-        /* this clients' renewal timeout triggered */
-        dhcp_t1_timeout(netif);
-      }
-    }
-    /* proceed to next netif */
-    netif = netif->next;
-  }
-}
-
-/**
- * DHCP transaction timeout handling (this function must be called every 500ms,
- * see @ref DHCP_FINE_TIMER_MSECS).
- *
- * A DHCP server is expected to respond within a short period of time.
- * This timer checks whether an outstanding DHCP request is timed out.
- */
-void
-dhcp_fine_tmr(void)
-{
-  struct netif *netif = netif_list;
-  /* loop through netif's */
-  while (netif != NULL) {
-    struct dhcp *dhcp = netif_dhcp_data(netif);
-    /* only act on DHCP configured interfaces */
-    if (dhcp != NULL) {
-      /* timer is active (non zero), and is about to trigger now */
-      if (dhcp->request_timeout > 1) {
-        dhcp->request_timeout--;
-      }
-      else if (dhcp->request_timeout == 1) {
-        dhcp->request_timeout--;
-        /* { netif->dhcp->request_timeout == 0 } */
-        LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_fine_tmr(): request timeout\n"));
-        /* this client's request timeout triggered */
-        dhcp_timeout(netif);
-      }
-    }
-    /* proceed to next network interface */
-    netif = netif->next;
-  }
-}
-
-/**
- * A DHCP negotiation transaction, or ARP request, has timed out.
- *
- * The timer that was started with the DHCP or ARP request has
- * timed out, indicating no response was received in time.
- *
- * @param netif the netif under DHCP control
- */
-static void
-dhcp_timeout(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_timeout()\n"));
-  /* back-off period has passed, or server selection timed out */
-  if ((dhcp->state == DHCP_STATE_BACKING_OFF) || (dhcp->state == DHCP_STATE_SELECTING)) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_timeout(): restarting discovery\n"));
-    dhcp_discover(netif);
-  /* receiving the requested lease timed out */
-  } else if (dhcp->state == DHCP_STATE_REQUESTING) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): REQUESTING, DHCP request timed out\n"));
-    if (dhcp->tries <= 5) {
-      dhcp_select(netif);
-    } else {
-      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): REQUESTING, releasing, restarting\n"));
-      dhcp_release(netif);
-      dhcp_discover(netif);
-    }
-#if DHCP_DOES_ARP_CHECK
-  /* received no ARP reply for the offered address (which is good) */
-  } else if (dhcp->state == DHCP_STATE_CHECKING) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_timeout(): CHECKING, ARP request timed out\n"));
-    if (dhcp->tries <= 1) {
-      dhcp_check(netif);
-    /* no ARP replies on the offered address,
-       looks like the IP address is indeed free */
-    } else {
-      /* bind the interface to the offered address */
-      dhcp_bind(netif);
-    }
-#endif /* DHCP_DOES_ARP_CHECK */
-  } else if (dhcp->state == DHCP_STATE_REBOOTING) {
-    if (dhcp->tries < REBOOT_TRIES) {
-      dhcp_reboot(netif);
-    } else {
-      dhcp_discover(netif);
-    }
-  }
-}
-
-/**
- * The renewal period has timed out.
- *
- * @param netif the netif under DHCP control
- */
-static void
-dhcp_t1_timeout(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_t1_timeout()\n"));
-  if ((dhcp->state == DHCP_STATE_REQUESTING) || (dhcp->state == DHCP_STATE_BOUND) ||
-      (dhcp->state == DHCP_STATE_RENEWING)) {
-    /* just retry to renew - note that the rebind timer (t2) will
-     * eventually time-out if renew tries fail. */
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-                ("dhcp_t1_timeout(): must renew\n"));
-    /* This slightly different to RFC2131: DHCPREQUEST will be sent from state
-       DHCP_STATE_RENEWING, not DHCP_STATE_BOUND */
-    dhcp_renew(netif);
-    /* Calculate next timeout */
-    if (((dhcp->t2_timeout - dhcp->lease_used) / 2) >= ((60 + DHCP_COARSE_TIMER_SECS / 2) / DHCP_COARSE_TIMER_SECS))
-    {
-       dhcp->t1_renew_time = ((dhcp->t2_timeout - dhcp->lease_used) / 2);
-    }
-  }
-}
-
-/**
- * The rebind period has timed out.
- *
- * @param netif the netif under DHCP control
- */
-static void
-dhcp_t2_timeout(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_t2_timeout()\n"));
-  if ((dhcp->state == DHCP_STATE_REQUESTING) || (dhcp->state == DHCP_STATE_BOUND) ||
-      (dhcp->state == DHCP_STATE_RENEWING) || (dhcp->state == DHCP_STATE_REBINDING)) {
-    /* just retry to rebind */
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-                ("dhcp_t2_timeout(): must rebind\n"));
-    /* This slightly different to RFC2131: DHCPREQUEST will be sent from state
-       DHCP_STATE_REBINDING, not DHCP_STATE_BOUND */
-    dhcp_rebind(netif);
-    /* Calculate next timeout */
-    if (((dhcp->t0_timeout - dhcp->lease_used) / 2) >= ((60 + DHCP_COARSE_TIMER_SECS / 2) / DHCP_COARSE_TIMER_SECS))
-    {
-       dhcp->t2_rebind_time = ((dhcp->t0_timeout - dhcp->lease_used) / 2);
-    }
-  }
-}
-
-/**
- * Handle a DHCP ACK packet
- *
- * @param netif the netif under DHCP control
- */
-static void
-dhcp_handle_ack(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-
-#if LWIP_DHCP_PROVIDE_DNS_SERVERS || LWIP_DHCP_GET_NTP_SRV
-  u8_t n;
-#endif /* LWIP_DHCP_PROVIDE_DNS_SERVERS || LWIP_DHCP_GET_NTP_SRV */
-#if LWIP_DHCP_GET_NTP_SRV
-  ip4_addr_t ntp_server_addrs[LWIP_DHCP_MAX_NTP_SERVERS];
-#endif
-
-  /* clear options we might not get from the ACK */
-  ip4_addr_set_zero(&dhcp->offered_sn_mask);
-  ip4_addr_set_zero(&dhcp->offered_gw_addr);
-#if LWIP_DHCP_BOOTP_FILE
-  ip4_addr_set_zero(&dhcp->offered_si_addr);
-#endif /* LWIP_DHCP_BOOTP_FILE */
-
-  /* lease time given? */
-  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_LEASE_TIME)) {
-    /* remember offered lease time */
-    dhcp->offered_t0_lease = dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_LEASE_TIME);
-  }
-  /* renewal period given? */
-  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_T1)) {
-    /* remember given renewal period */
-    dhcp->offered_t1_renew = dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_T1);
-  } else {
-    /* calculate safe periods for renewal */
-    dhcp->offered_t1_renew = dhcp->offered_t0_lease / 2;
-  }
-
-  /* renewal period given? */
-  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_T2)) {
-    /* remember given rebind period */
-    dhcp->offered_t2_rebind = dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_T2);
-  } else {
-    /* calculate safe periods for rebinding (offered_t0_lease * 0.875 -> 87.5%)*/
-    dhcp->offered_t2_rebind = (dhcp->offered_t0_lease * 7U) / 8U;
-  }
-
-  /* (y)our internet address */
-  ip4_addr_copy(dhcp->offered_ip_addr, dhcp->msg_in->yiaddr);
-
-#if LWIP_DHCP_BOOTP_FILE
-  /* copy boot server address,
-     boot file name copied in dhcp_parse_reply if not overloaded */
-  ip4_addr_copy(dhcp->offered_si_addr, dhcp->msg_in->siaddr);
-#endif /* LWIP_DHCP_BOOTP_FILE */
-
-  /* subnet mask given? */
-  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_SUBNET_MASK)) {
-    /* remember given subnet mask */
-    ip4_addr_set_u32(&dhcp->offered_sn_mask, lwip_htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_SUBNET_MASK)));
-    dhcp->subnet_mask_given = 1;
-  } else {
-    dhcp->subnet_mask_given = 0;
-  }
-
-  /* gateway router */
-  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_ROUTER)) {
-    ip4_addr_set_u32(&dhcp->offered_gw_addr, lwip_htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_ROUTER)));
-  }
-
-#if LWIP_DHCP_GET_NTP_SRV
-  /* NTP servers */
-  for (n = 0; (n < LWIP_DHCP_MAX_NTP_SERVERS) && dhcp_option_given(dhcp, DHCP_OPTION_IDX_NTP_SERVER + n); n++) {
-    ip4_addr_set_u32(&ntp_server_addrs[n], lwip_htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_NTP_SERVER + n)));
-  }
-  dhcp_set_ntp_servers(n, ntp_server_addrs);
-#endif /* LWIP_DHCP_GET_NTP_SRV */
-
-#if LWIP_DHCP_PROVIDE_DNS_SERVERS
-  /* DNS servers */
-  for (n = 0; (n < LWIP_DHCP_PROVIDE_DNS_SERVERS) && dhcp_option_given(dhcp, DHCP_OPTION_IDX_DNS_SERVER + n); n++) {
-    ip_addr_t dns_addr;
-    ip_addr_set_ip4_u32(&dns_addr, lwip_htonl(dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_DNS_SERVER + n)));
-    dns_setserver(n, &dns_addr);
-  }
-#endif /* LWIP_DHCP_PROVIDE_DNS_SERVERS */
-}
-
-/**
- * @ingroup dhcp4
- * Set a statically allocated struct dhcp to work with.
- * Using this prevents dhcp_start to allocate it using mem_malloc.
- *
- * @param netif the netif for which to set the struct dhcp
- * @param dhcp (uninitialised) dhcp struct allocated by the application
- */
-void
-dhcp_set_struct(struct netif *netif, struct dhcp *dhcp)
-{
-  LWIP_ASSERT("netif != NULL", netif != NULL);
-  LWIP_ASSERT("dhcp != NULL", dhcp != NULL);
-  LWIP_ASSERT("netif already has a struct dhcp set", netif_dhcp_data(netif) == NULL);
-
-  /* clear data structure */
-  memset(dhcp, 0, sizeof(struct dhcp));
-  /* dhcp_set_state(&dhcp, DHCP_STATE_OFF); */
-  netif_set_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_DHCP, dhcp);
-}
-
-/**
- * @ingroup dhcp4
- * Removes a struct dhcp from a netif.
- *
- * ATTENTION: Only use this when not using dhcp_set_struct() to allocate the
- *            struct dhcp since the memory is passed back to the heap.
- *
- * @param netif the netif from which to remove the struct dhcp
- */
-void dhcp_cleanup(struct netif *netif)
-{
-  LWIP_ASSERT("netif != NULL", netif != NULL);
-
-  if (netif_dhcp_data(netif) != NULL) {
-    mem_free(netif_dhcp_data(netif));
-    netif_set_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_DHCP, NULL);
-  }
-}
-
-/**
- * @ingroup dhcp4
- * Start DHCP negotiation for a network interface.
- *
- * If no DHCP client instance was attached to this interface,
- * a new client is created first. If a DHCP client instance
- * was already present, it restarts negotiation.
- *
- * @param netif The lwIP network interface
- * @return lwIP error code
- * - ERR_OK - No error
- * - ERR_MEM - Out of memory
- */
-err_t
-dhcp_start(struct netif *netif)
-{
-  struct dhcp *dhcp;
-  err_t result;
-
-  LWIP_ERROR("netif != NULL", (netif != NULL), return ERR_ARG;);
-  LWIP_ERROR("netif is not up, old style port?", netif_is_up(netif), return ERR_ARG;);
-  dhcp = netif_dhcp_data(netif);
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_start(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
-
-  /* check MTU of the netif */
-  if (netif->mtu < DHCP_MAX_MSG_LEN_MIN_REQUIRED) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): Cannot use this netif with DHCP: MTU is too small\n"));
-    return ERR_MEM;
-  }
-
-  /* no DHCP client attached yet? */
-  if (dhcp == NULL) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): mallocing new DHCP client\n"));
-    dhcp = (struct dhcp *)mem_malloc(sizeof(struct dhcp));
-    if (dhcp == NULL) {
-      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): could not allocate dhcp\n"));
-      return ERR_MEM;
-    }
-
-    /* store this dhcp client in the netif */
-    netif_set_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_DHCP, dhcp);
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): allocated dhcp"));
-  /* already has DHCP client attached */
-  } else {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_start(): restarting DHCP configuration\n"));
-    LWIP_ASSERT("pbuf p_out wasn't freed", dhcp->p_out == NULL);
-    LWIP_ASSERT("reply wasn't freed", dhcp->msg_in == NULL );
-
-    if (dhcp->pcb_allocated != 0) {
-      dhcp_dec_pcb_refcount(); /* free DHCP PCB if not needed any more */
-    }
-    /* dhcp is cleared below, no need to reset flag*/
-  }
-
-  /* clear data structure */
-  memset(dhcp, 0, sizeof(struct dhcp));
-  /* dhcp_set_state(&dhcp, DHCP_STATE_OFF); */
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_start(): starting DHCP configuration\n"));
-
-  if (dhcp_inc_pcb_refcount() != ERR_OK) { /* ensure DHCP PCB is allocated */
-    return ERR_MEM;
-  }
-  dhcp->pcb_allocated = 1;
-
-#if LWIP_DHCP_CHECK_LINK_UP
-  if (!netif_is_link_up(netif)) {
-    /* set state INIT and wait for dhcp_network_changed() to call dhcp_discover() */
-    dhcp_set_state(dhcp, DHCP_STATE_INIT);
-    return ERR_OK;
-  }
-#endif /* LWIP_DHCP_CHECK_LINK_UP */
-
-
-  /* (re)start the DHCP negotiation */
-  result = dhcp_discover(netif);
-  if (result != ERR_OK) {
-    /* free resources allocated above */
-    dhcp_stop(netif);
-    return ERR_MEM;
-  }
-  return result;
-}
-
-/**
- * @ingroup dhcp4
- * Inform a DHCP server of our manual configuration.
- *
- * This informs DHCP servers of our fixed IP address configuration
- * by sending an INFORM message. It does not involve DHCP address
- * configuration, it is just here to be nice to the network.
- *
- * @param netif The lwIP network interface
- */
-void
-dhcp_inform(struct netif *netif)
-{
-  struct dhcp dhcp;
-  err_t result = ERR_OK;
-
-  LWIP_ERROR("netif != NULL", (netif != NULL), return;);
-
-  if (dhcp_inc_pcb_refcount() != ERR_OK) { /* ensure DHCP PCB is allocated */
-    return;
-  }
-
-  memset(&dhcp, 0, sizeof(struct dhcp));
-  dhcp_set_state(&dhcp, DHCP_STATE_INFORMING);
-
-  /* create and initialize the DHCP message header */
-  result = dhcp_create_msg(netif, &dhcp, DHCP_INFORM);
-  if (result == ERR_OK) {
-    dhcp_option(&dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
-    dhcp_option_short(&dhcp, DHCP_MAX_MSG_LEN(netif));
-
-    dhcp_option_trailer(&dhcp);
-
-    pbuf_realloc(dhcp.p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp.options_out_len);
-
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_inform: INFORMING\n"));
-
-    udp_sendto_if(dhcp_pcb, dhcp.p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif);
-
-    dhcp_delete_msg(&dhcp);
-  } else {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_inform: could not allocate DHCP request\n"));
-  }
-
-  dhcp_dec_pcb_refcount(); /* delete DHCP PCB if not needed any more */
-}
-
-/** Handle a possible change in the network configuration.
- *
- * This enters the REBOOTING state to verify that the currently bound
- * address is still valid.
- */
-void
-dhcp_network_changed(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-
-  if (!dhcp)
-    return;
-  switch (dhcp->state) {
-  case DHCP_STATE_REBINDING:
-  case DHCP_STATE_RENEWING:
-  case DHCP_STATE_BOUND:
-  case DHCP_STATE_REBOOTING:
-    dhcp->tries = 0;
-    dhcp_reboot(netif);
-    break;
-  case DHCP_STATE_OFF:
-    /* stay off */
-    break;
-  default:
-    /* INIT/REQUESTING/CHECKING/BACKING_OFF restart with new 'rid' because the
-       state changes, SELECTING: continue with current 'rid' as we stay in the
-       same state */
-#if LWIP_DHCP_AUTOIP_COOP
-    if (dhcp->autoip_coop_state == DHCP_AUTOIP_COOP_STATE_ON) {
-      autoip_stop(netif);
-      dhcp->autoip_coop_state = DHCP_AUTOIP_COOP_STATE_OFF;
-    }
-#endif /* LWIP_DHCP_AUTOIP_COOP */
-    /* ensure we start with short timeouts, even if already discovering */
-    dhcp->tries = 0;
-    dhcp_discover(netif);
-    break;
-  }
-}
-
-#if DHCP_DOES_ARP_CHECK
-/**
- * Match an ARP reply with the offered IP address:
- * check whether the offered IP address is not in use using ARP
- *
- * @param netif the network interface on which the reply was received
- * @param addr The IP address we received a reply from
- */
-void
-dhcp_arp_reply(struct netif *netif, const ip4_addr_t *addr)
-{
-  struct dhcp *dhcp;
-
-  LWIP_ERROR("netif != NULL", (netif != NULL), return;);
-  dhcp = netif_dhcp_data(netif);
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_arp_reply()\n"));
-  /* is a DHCP client doing an ARP check? */
-  if ((dhcp != NULL) && (dhcp->state == DHCP_STATE_CHECKING)) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_arp_reply(): CHECKING, arp reply for 0x%08"X32_F"\n",
-      ip4_addr_get_u32(addr)));
-    /* did a host respond with the address we
-       were offered by the DHCP server? */
-    if (ip4_addr_cmp(addr, &dhcp->offered_ip_addr)) {
-      /* we will not accept the offered address */
-      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE | LWIP_DBG_LEVEL_WARNING,
-        ("dhcp_arp_reply(): arp reply matched with offered address, declining\n"));
-      dhcp_decline(netif);
-    }
-  }
-}
-
-/**
- * Decline an offered lease.
- *
- * Tell the DHCP server we do not accept the offered address.
- * One reason to decline the lease is when we find out the address
- * is already in use by another host (through ARP).
- *
- * @param netif the netif under DHCP control
- */
-static err_t
-dhcp_decline(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-  err_t result = ERR_OK;
-  u16_t msecs;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_decline()\n"));
-  dhcp_set_state(dhcp, DHCP_STATE_BACKING_OFF);
-  /* create and initialize the DHCP message header */
-  result = dhcp_create_msg(netif, dhcp, DHCP_DECLINE);
-  if (result == ERR_OK) {
-    dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
-    dhcp_option_long(dhcp, lwip_ntohl(ip4_addr_get_u32(&dhcp->offered_ip_addr)));
-
-    dhcp_option_trailer(dhcp);
-    /* resize pbuf to reflect true size of options */
-    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
-
-    /* per section 4.4.4, broadcast DECLINE messages */
-    udp_sendto_if_src(dhcp_pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif, IP4_ADDR_ANY);
-    dhcp_delete_msg(dhcp);
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_decline: BACKING OFF\n"));
-  } else {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
-      ("dhcp_decline: could not allocate DHCP request\n"));
-  }
-  if (dhcp->tries < 255) {
-    dhcp->tries++;
-  }
-  msecs = 10*1000;
-  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_decline(): set request timeout %"U16_F" msecs\n", msecs));
-  return result;
-}
-#endif /* DHCP_DOES_ARP_CHECK */
-
-
-/**
- * Start the DHCP process, discover a DHCP server.
- *
- * @param netif the netif under DHCP control
- */
-static err_t
-dhcp_discover(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-  err_t result = ERR_OK;
-  u16_t msecs;
-  u8_t i;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover()\n"));
-  ip4_addr_set_any(&dhcp->offered_ip_addr);
-  dhcp_set_state(dhcp, DHCP_STATE_SELECTING);
-  /* create and initialize the DHCP message header */
-  result = dhcp_create_msg(netif, dhcp, DHCP_DISCOVER);
-  if (result == ERR_OK) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover: making request\n"));
-
-    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
-    dhcp_option_short(dhcp, DHCP_MAX_MSG_LEN(netif));
-
-    dhcp_option(dhcp, DHCP_OPTION_PARAMETER_REQUEST_LIST, LWIP_ARRAYSIZE(dhcp_discover_request_options));
-    for (i = 0; i < LWIP_ARRAYSIZE(dhcp_discover_request_options); i++) {
-      dhcp_option_byte(dhcp, dhcp_discover_request_options[i]);
-    }
-    dhcp_option_trailer(dhcp);
-
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover: realloc()ing\n"));
-    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
-
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover: sendto(DISCOVER, IP_ADDR_BROADCAST, DHCP_SERVER_PORT)\n"));
-    udp_sendto_if_src(dhcp_pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif, IP4_ADDR_ANY);
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_discover: deleting()ing\n"));
-    dhcp_delete_msg(dhcp);
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_discover: SELECTING\n"));
-  } else {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_discover: could not allocate DHCP request\n"));
-  }
-  if (dhcp->tries < 255) {
-    dhcp->tries++;
-  }
-#if LWIP_DHCP_AUTOIP_COOP
-  if (dhcp->tries >= LWIP_DHCP_AUTOIP_COOP_TRIES && dhcp->autoip_coop_state == DHCP_AUTOIP_COOP_STATE_OFF) {
-    dhcp->autoip_coop_state = DHCP_AUTOIP_COOP_STATE_ON;
-    autoip_start(netif);
-  }
-#endif /* LWIP_DHCP_AUTOIP_COOP */
-  msecs = (dhcp->tries < 6 ? 1 << dhcp->tries : 60) * 1000;
-  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_discover(): set request timeout %"U16_F" msecs\n", msecs));
-  return result;
-}
-
-
-/**
- * Bind the interface to the offered IP address.
- *
- * @param netif network interface to bind to the offered address
- */
-static void
-dhcp_bind(struct netif *netif)
-{
-  u32_t timeout;
-  struct dhcp *dhcp;
-  ip4_addr_t sn_mask, gw_addr;
-  LWIP_ERROR("dhcp_bind: netif != NULL", (netif != NULL), return;);
-  dhcp = netif_dhcp_data(netif);
-  LWIP_ERROR("dhcp_bind: dhcp != NULL", (dhcp != NULL), return;);
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_bind(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
-
-  /* reset time used of lease */
-  dhcp->lease_used = 0;
-
-  if (dhcp->offered_t0_lease != 0xffffffffUL) {
-     /* set renewal period timer */
-     LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_bind(): t0 renewal timer %"U32_F" secs\n", dhcp->offered_t0_lease));
-     timeout = (dhcp->offered_t0_lease + DHCP_COARSE_TIMER_SECS / 2) / DHCP_COARSE_TIMER_SECS;
-     if (timeout > 0xffff) {
-       timeout = 0xffff;
-     }
-     dhcp->t0_timeout = (u16_t)timeout;
-     if (dhcp->t0_timeout == 0) {
-       dhcp->t0_timeout = 1;
-     }
-     LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_bind(): set request timeout %"U32_F" msecs\n", dhcp->offered_t0_lease*1000));
-  }
-
-  /* temporary DHCP lease? */
-  if (dhcp->offered_t1_renew != 0xffffffffUL) {
-    /* set renewal period timer */
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_bind(): t1 renewal timer %"U32_F" secs\n", dhcp->offered_t1_renew));
-    timeout = (dhcp->offered_t1_renew + DHCP_COARSE_TIMER_SECS / 2) / DHCP_COARSE_TIMER_SECS;
-    if (timeout > 0xffff) {
-      timeout = 0xffff;
-    }
-    dhcp->t1_timeout = (u16_t)timeout;
-    if (dhcp->t1_timeout == 0) {
-      dhcp->t1_timeout = 1;
-    }
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_bind(): set request timeout %"U32_F" msecs\n", dhcp->offered_t1_renew*1000));
-    dhcp->t1_renew_time = dhcp->t1_timeout;
-  }
-  /* set renewal period timer */
-  if (dhcp->offered_t2_rebind != 0xffffffffUL) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_bind(): t2 rebind timer %"U32_F" secs\n", dhcp->offered_t2_rebind));
-    timeout = (dhcp->offered_t2_rebind + DHCP_COARSE_TIMER_SECS / 2) / DHCP_COARSE_TIMER_SECS;
-    if (timeout > 0xffff) {
-      timeout = 0xffff;
-    }
-    dhcp->t2_timeout = (u16_t)timeout;
-    if (dhcp->t2_timeout == 0) {
-      dhcp->t2_timeout = 1;
-    }
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_bind(): set request timeout %"U32_F" msecs\n", dhcp->offered_t2_rebind*1000));
-    dhcp->t2_rebind_time = dhcp->t2_timeout;
-  }
-
-  /* If we have sub 1 minute lease, t2 and t1 will kick in at the same time. */
-  if ((dhcp->t1_timeout >= dhcp->t2_timeout) && (dhcp->t2_timeout > 0)) {
-    dhcp->t1_timeout = 0;
-  }
-
-  if (dhcp->subnet_mask_given) {
-    /* copy offered network mask */
-    ip4_addr_copy(sn_mask, dhcp->offered_sn_mask);
-  } else {
-    /* subnet mask not given, choose a safe subnet mask given the network class */
-    u8_t first_octet = ip4_addr1(&dhcp->offered_ip_addr);
-    if (first_octet <= 127) {
-      ip4_addr_set_u32(&sn_mask, PP_HTONL(0xff000000UL));
-    } else if (first_octet >= 192) {
-      ip4_addr_set_u32(&sn_mask, PP_HTONL(0xffffff00UL));
-    } else {
-      ip4_addr_set_u32(&sn_mask, PP_HTONL(0xffff0000UL));
-    }
-  }
-
-  ip4_addr_copy(gw_addr, dhcp->offered_gw_addr);
-  /* gateway address not given? */
-  if (ip4_addr_isany_val(gw_addr)) {
-    /* copy network address */
-    ip4_addr_get_network(&gw_addr, &dhcp->offered_ip_addr, &sn_mask);
-    /* use first host address on network as gateway */
-    ip4_addr_set_u32(&gw_addr, ip4_addr_get_u32(&gw_addr) | PP_HTONL(0x00000001UL));
-  }
-
-#if LWIP_DHCP_AUTOIP_COOP
-  if (dhcp->autoip_coop_state == DHCP_AUTOIP_COOP_STATE_ON) {
-    autoip_stop(netif);
-    dhcp->autoip_coop_state = DHCP_AUTOIP_COOP_STATE_OFF;
-  }
-#endif /* LWIP_DHCP_AUTOIP_COOP */
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_bind(): IP: 0x%08"X32_F" SN: 0x%08"X32_F" GW: 0x%08"X32_F"\n",
-    ip4_addr_get_u32(&dhcp->offered_ip_addr), ip4_addr_get_u32(&sn_mask), ip4_addr_get_u32(&gw_addr)));
-  /* netif is now bound to DHCP leased address - set this before assigning the address
-     to ensure the callback can use dhcp_supplied_address() */
-  dhcp_set_state(dhcp, DHCP_STATE_BOUND);
-
-  netif_set_addr(netif, &dhcp->offered_ip_addr, &sn_mask, &gw_addr);
-  /* interface is used by routing now that an address is set */
-}
-
-/**
- * @ingroup dhcp4
- * Renew an existing DHCP lease at the involved DHCP server.
- *
- * @param netif network interface which must renew its lease
- */
-err_t
-dhcp_renew(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-  err_t result;
-  u16_t msecs;
-  u8_t i;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_renew()\n"));
-  dhcp_set_state(dhcp, DHCP_STATE_RENEWING);
-
-  /* create and initialize the DHCP message header */
-  result = dhcp_create_msg(netif, dhcp, DHCP_REQUEST);
-  if (result == ERR_OK) {
-    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
-    dhcp_option_short(dhcp, DHCP_MAX_MSG_LEN(netif));
-
-    dhcp_option(dhcp, DHCP_OPTION_PARAMETER_REQUEST_LIST, LWIP_ARRAYSIZE(dhcp_discover_request_options));
-    for (i = 0; i < LWIP_ARRAYSIZE(dhcp_discover_request_options); i++) {
-      dhcp_option_byte(dhcp, dhcp_discover_request_options[i]);
-    }
-
-#if LWIP_NETIF_HOSTNAME
-    dhcp_option_hostname(dhcp, netif);
-#endif /* LWIP_NETIF_HOSTNAME */
-
-    /* append DHCP message trailer */
-    dhcp_option_trailer(dhcp);
-
-    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
-
-    udp_sendto_if(dhcp_pcb, dhcp->p_out, &dhcp->server_ip_addr, DHCP_SERVER_PORT, netif);
-    dhcp_delete_msg(dhcp);
-
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_renew: RENEWING\n"));
-  } else {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_renew: could not allocate DHCP request\n"));
-  }
-  if (dhcp->tries < 255) {
-    dhcp->tries++;
-  }
-  /* back-off on retries, but to a maximum of 20 seconds */
-  msecs = dhcp->tries < 10 ? dhcp->tries * 2000 : 20 * 1000;
-  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_renew(): set request timeout %"U16_F" msecs\n", msecs));
-  return result;
-}
-
-/**
- * Rebind with a DHCP server for an existing DHCP lease.
- *
- * @param netif network interface which must rebind with a DHCP server
- */
-static err_t
-dhcp_rebind(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-  err_t result;
-  u16_t msecs;
-  u8_t i;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_rebind()\n"));
-  dhcp_set_state(dhcp, DHCP_STATE_REBINDING);
-
-  /* create and initialize the DHCP message header */
-  result = dhcp_create_msg(netif, dhcp, DHCP_REQUEST);
-  if (result == ERR_OK) {
-    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
-    dhcp_option_short(dhcp, DHCP_MAX_MSG_LEN(netif));
-
-    dhcp_option(dhcp, DHCP_OPTION_PARAMETER_REQUEST_LIST, LWIP_ARRAYSIZE(dhcp_discover_request_options));
-    for (i = 0; i < LWIP_ARRAYSIZE(dhcp_discover_request_options); i++) {
-      dhcp_option_byte(dhcp, dhcp_discover_request_options[i]);
-    }
-
-#if LWIP_NETIF_HOSTNAME
-    dhcp_option_hostname(dhcp, netif);
-#endif /* LWIP_NETIF_HOSTNAME */
-
-    dhcp_option_trailer(dhcp);
-
-    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
-
-    /* broadcast to server */
-    udp_sendto_if(dhcp_pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif);
-    dhcp_delete_msg(dhcp);
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_rebind: REBINDING\n"));
-  } else {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_rebind: could not allocate DHCP request\n"));
-  }
-  if (dhcp->tries < 255) {
-    dhcp->tries++;
-  }
-  msecs = dhcp->tries < 10 ? dhcp->tries * 1000 : 10 * 1000;
-  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_rebind(): set request timeout %"U16_F" msecs\n", msecs));
-  return result;
-}
-
-/**
- * Enter REBOOTING state to verify an existing lease
- *
- * @param netif network interface which must reboot
- */
-static err_t
-dhcp_reboot(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-  err_t result;
-  u16_t msecs;
-  u8_t i;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_reboot()\n"));
-  dhcp_set_state(dhcp, DHCP_STATE_REBOOTING);
-
-  /* create and initialize the DHCP message header */
-  result = dhcp_create_msg(netif, dhcp, DHCP_REQUEST);
-  if (result == ERR_OK) {
-    dhcp_option(dhcp, DHCP_OPTION_MAX_MSG_SIZE, DHCP_OPTION_MAX_MSG_SIZE_LEN);
-    dhcp_option_short(dhcp, DHCP_MAX_MSG_LEN_MIN_REQUIRED);
-
-    dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
-    dhcp_option_long(dhcp, lwip_ntohl(ip4_addr_get_u32(&dhcp->offered_ip_addr)));
-
-    dhcp_option(dhcp, DHCP_OPTION_PARAMETER_REQUEST_LIST, LWIP_ARRAYSIZE(dhcp_discover_request_options));
-    for (i = 0; i < LWIP_ARRAYSIZE(dhcp_discover_request_options); i++) {
-      dhcp_option_byte(dhcp, dhcp_discover_request_options[i]);
-    }
-
-    dhcp_option_trailer(dhcp);
-
-    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
-
-    /* broadcast to server */
-    udp_sendto_if(dhcp_pcb, dhcp->p_out, IP_ADDR_BROADCAST, DHCP_SERVER_PORT, netif);
-    dhcp_delete_msg(dhcp);
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_reboot: REBOOTING\n"));
-  } else {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_reboot: could not allocate DHCP request\n"));
-  }
-  if (dhcp->tries < 255) {
-    dhcp->tries++;
-  }
-  msecs = dhcp->tries < 10 ? dhcp->tries * 1000 : 10 * 1000;
-  dhcp->request_timeout = (msecs + DHCP_FINE_TIMER_MSECS - 1) / DHCP_FINE_TIMER_MSECS;
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_reboot(): set request timeout %"U16_F" msecs\n", msecs));
-  return result;
-}
-
-
-/**
- * @ingroup dhcp4
- * Release a DHCP lease (usually called before @ref dhcp_stop).
- *
- * @param netif network interface which must release its lease
- */
-err_t
-dhcp_release(struct netif *netif)
-{
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-  err_t result;
-  ip_addr_t server_ip_addr;
-  u8_t is_dhcp_supplied_address;
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_release()\n"));
-  if (dhcp == NULL) {
-    return ERR_ARG;
-  }
-  ip_addr_copy(server_ip_addr, dhcp->server_ip_addr);
-
-  is_dhcp_supplied_address = dhcp_supplied_address(netif);
-
-  /* idle DHCP client */
-  dhcp_set_state(dhcp, DHCP_STATE_OFF);
-  /* clean old DHCP offer */
-  ip_addr_set_zero_ip4(&dhcp->server_ip_addr);
-  ip4_addr_set_zero(&dhcp->offered_ip_addr);
-  ip4_addr_set_zero(&dhcp->offered_sn_mask);
-  ip4_addr_set_zero(&dhcp->offered_gw_addr);
-#if LWIP_DHCP_BOOTP_FILE
-  ip4_addr_set_zero(&dhcp->offered_si_addr);
-#endif /* LWIP_DHCP_BOOTP_FILE */
-  dhcp->offered_t0_lease = dhcp->offered_t1_renew = dhcp->offered_t2_rebind = 0;
-  dhcp->t1_renew_time = dhcp->t2_rebind_time = dhcp->lease_used = dhcp->t0_timeout = 0;
-
-  if (!is_dhcp_supplied_address) {
-    /* don't issue release message when address is not dhcp-assigned */
-    return ERR_OK;
-  }
-
-  /* create and initialize the DHCP message header */
-  result = dhcp_create_msg(netif, dhcp, DHCP_RELEASE);
-  if (result == ERR_OK) {
-    dhcp_option(dhcp, DHCP_OPTION_SERVER_ID, 4);
-    dhcp_option_long(dhcp, lwip_ntohl(ip4_addr_get_u32(ip_2_ip4(&server_ip_addr))));
-
-    dhcp_option_trailer(dhcp);
-
-    pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
-
-    udp_sendto_if(dhcp_pcb, dhcp->p_out, &server_ip_addr, DHCP_SERVER_PORT, netif);
-    dhcp_delete_msg(dhcp);
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_release: RELEASED, DHCP_STATE_OFF\n"));
-  } else {
-    /* sending release failed, but that's not a problem since the correct behaviour of dhcp does not rely on release */
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("dhcp_release: could not allocate DHCP request\n"));
-  }
-  /* remove IP address from interface (prevents routing from selecting this interface) */
-  netif_set_addr(netif, IP4_ADDR_ANY4, IP4_ADDR_ANY4, IP4_ADDR_ANY4);
-
-  return result;
-}
-
-/**
- * @ingroup dhcp4
- * Remove the DHCP client from the interface.
- *
- * @param netif The network interface to stop DHCP on
- */
-void
-dhcp_stop(struct netif *netif)
-{
-  struct dhcp *dhcp;
-  LWIP_ERROR("dhcp_stop: netif != NULL", (netif != NULL), return;);
-  dhcp = netif_dhcp_data(netif);
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_stop()\n"));
-  /* netif is DHCP configured? */
-  if (dhcp != NULL) {
-#if LWIP_DHCP_AUTOIP_COOP
-    if (dhcp->autoip_coop_state == DHCP_AUTOIP_COOP_STATE_ON) {
-      autoip_stop(netif);
-      dhcp->autoip_coop_state = DHCP_AUTOIP_COOP_STATE_OFF;
-    }
-#endif /* LWIP_DHCP_AUTOIP_COOP */
-
-    LWIP_ASSERT("reply wasn't freed", dhcp->msg_in == NULL);
-    dhcp_set_state(dhcp, DHCP_STATE_OFF);
-
-    if (dhcp->pcb_allocated != 0) {
-      dhcp_dec_pcb_refcount(); /* free DHCP PCB if not needed any more */
-      dhcp->pcb_allocated = 0;
-    }
-  }
-}
-
-/*
- * Set the DHCP state of a DHCP client.
- *
- * If the state changed, reset the number of tries.
- */
-static void
-dhcp_set_state(struct dhcp *dhcp, u8_t new_state)
-{
-  if (new_state != dhcp->state) {
-    dhcp->state = new_state;
-    dhcp->tries = 0;
-    dhcp->request_timeout = 0;
-  }
-}
-
-/*
- * Concatenate an option type and length field to the outgoing
- * DHCP message.
- *
- */
-static void
-dhcp_option(struct dhcp *dhcp, u8_t option_type, u8_t option_len)
-{
-  LWIP_ASSERT("dhcp_option: dhcp->options_out_len + 2 + option_len <= DHCP_OPTIONS_LEN", dhcp->options_out_len + 2U + option_len <= DHCP_OPTIONS_LEN);
-  dhcp->msg_out->options[dhcp->options_out_len++] = option_type;
-  dhcp->msg_out->options[dhcp->options_out_len++] = option_len;
-}
-/*
- * Concatenate a single byte to the outgoing DHCP message.
- *
- */
-static void
-dhcp_option_byte(struct dhcp *dhcp, u8_t value)
-{
-  LWIP_ASSERT("dhcp_option_byte: dhcp->options_out_len < DHCP_OPTIONS_LEN", dhcp->options_out_len < DHCP_OPTIONS_LEN);
-  dhcp->msg_out->options[dhcp->options_out_len++] = value;
-}
-
-static void
-dhcp_option_short(struct dhcp *dhcp, u16_t value)
-{
-  LWIP_ASSERT("dhcp_option_short: dhcp->options_out_len + 2 <= DHCP_OPTIONS_LEN", dhcp->options_out_len + 2U <= DHCP_OPTIONS_LEN);
-  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0xff00U) >> 8);
-  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t) (value & 0x00ffU);
-}
-
-static void
-dhcp_option_long(struct dhcp *dhcp, u32_t value)
-{
-  LWIP_ASSERT("dhcp_option_long: dhcp->options_out_len + 4 <= DHCP_OPTIONS_LEN", dhcp->options_out_len + 4U <= DHCP_OPTIONS_LEN);
-  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0xff000000UL) >> 24);
-  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0x00ff0000UL) >> 16);
-  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0x0000ff00UL) >> 8);
-  dhcp->msg_out->options[dhcp->options_out_len++] = (u8_t)((value & 0x000000ffUL));
-}
-
-#if LWIP_NETIF_HOSTNAME
-static void
-dhcp_option_hostname(struct dhcp *dhcp, struct netif *netif)
-{
-  if (netif->hostname != NULL) {
-    size_t namelen = strlen(netif->hostname);
-    if (namelen > 0) {
-      size_t len;
-      const char *p = netif->hostname;
-      /* Shrink len to available bytes (need 2 bytes for OPTION_HOSTNAME
-         and 1 byte for trailer) */
-      size_t available = DHCP_OPTIONS_LEN - dhcp->options_out_len - 3;
-      LWIP_ASSERT("DHCP: hostname is too long!", namelen <= available);
-      len = LWIP_MIN(namelen, available);
-      LWIP_ASSERT("DHCP: hostname is too long!", len <= 0xFF);
-      dhcp_option(dhcp, DHCP_OPTION_HOSTNAME, (u8_t)len);
-      while (len--) {
-        dhcp_option_byte(dhcp, *p++);
-      }
-    }
-  }
-}
-#endif /* LWIP_NETIF_HOSTNAME */
-
-/**
- * Extract the DHCP message and the DHCP options.
- *
- * Extract the DHCP message and the DHCP options, each into a contiguous
- * piece of memory. As a DHCP message is variable sized by its options,
- * and also allows overriding some fields for options, the easy approach
- * is to first unfold the options into a contiguous piece of memory, and
- * use that further on.
- *
- */
-static err_t
-dhcp_parse_reply(struct dhcp *dhcp, struct pbuf *p)
-{
-  u8_t *options;
-  u16_t offset;
-  u16_t offset_max;
-  u16_t options_idx;
-  u16_t options_idx_max;
-  struct pbuf *q;
-  int parse_file_as_options = 0;
-  int parse_sname_as_options = 0;
-
-  /* clear received options */
-  dhcp_clear_all_options(dhcp);
-  /* check that beginning of dhcp_msg (up to and including chaddr) is in first pbuf */
-  if (p->len < DHCP_SNAME_OFS) {
-    return ERR_BUF;
-  }
-  dhcp->msg_in = (struct dhcp_msg *)p->payload;
-#if LWIP_DHCP_BOOTP_FILE
-  /* clear boot file name */
-  dhcp->boot_file_name[0] = 0;
-#endif /* LWIP_DHCP_BOOTP_FILE */
-
-  /* parse options */
-
-  /* start with options field */
-  options_idx = DHCP_OPTIONS_OFS;
-  /* parse options to the end of the received packet */
-  options_idx_max = p->tot_len;
-again:
-  q = p;
-  while ((q != NULL) && (options_idx >= q->len)) {
-    options_idx -= q->len;
-    options_idx_max -= q->len;
-    q = q->next;
-  }
-  if (q == NULL) {
-    return ERR_BUF;
-  }
-  offset = options_idx;
-  offset_max = options_idx_max;
-  options = (u8_t*)q->payload;
-  /* at least 1 byte to read and no end marker, then at least 3 bytes to read? */
-  while ((q != NULL) && (offset < offset_max) && (options[offset] != DHCP_OPTION_END)) {
-    u8_t op = options[offset];
-    u8_t len;
-    u8_t decode_len = 0;
-    int decode_idx = -1;
-    u16_t val_offset = offset + 2;
-    /* len byte might be in the next pbuf */
-    if ((offset + 1) < q->len) {
-      len = options[offset + 1];
-    } else {
-      len = (q->next != NULL ? ((u8_t*)q->next->payload)[0] : 0);
-    }
-    /* LWIP_DEBUGF(DHCP_DEBUG, ("msg_offset=%"U16_F", q->len=%"U16_F, msg_offset, q->len)); */
-    decode_len = len;
-    switch(op) {
-      /* case(DHCP_OPTION_END): handled above */
-      case(DHCP_OPTION_PAD):
-        /* special option: no len encoded */
-        decode_len = len = 0;
-        /* will be increased below */
-        offset--;
-        break;
-      case(DHCP_OPTION_SUBNET_MASK):
-        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_SUBNET_MASK;
-        break;
-      case(DHCP_OPTION_ROUTER):
-        decode_len = 4; /* only copy the first given router */
-        LWIP_ERROR("len >= decode_len", len >= decode_len, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_ROUTER;
-        break;
-#if LWIP_DHCP_PROVIDE_DNS_SERVERS
-      case(DHCP_OPTION_DNS_SERVER):
-        /* special case: there might be more than one server */
-        LWIP_ERROR("len %% 4 == 0", len % 4 == 0, return ERR_VAL;);
-        /* limit number of DNS servers */
-        decode_len = LWIP_MIN(len, 4 * DNS_MAX_SERVERS);
-        LWIP_ERROR("len >= decode_len", len >= decode_len, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_DNS_SERVER;
-        break;
-#endif /* LWIP_DHCP_PROVIDE_DNS_SERVERS */
-      case(DHCP_OPTION_LEASE_TIME):
-        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_LEASE_TIME;
-        break;
-#if LWIP_DHCP_GET_NTP_SRV
-      case(DHCP_OPTION_NTP):
-        /* special case: there might be more than one server */
-        LWIP_ERROR("len %% 4 == 0", len % 4 == 0, return ERR_VAL;);
-        /* limit number of NTP servers */
-        decode_len = LWIP_MIN(len, 4 * LWIP_DHCP_MAX_NTP_SERVERS);
-        LWIP_ERROR("len >= decode_len", len >= decode_len, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_NTP_SERVER;
-        break;
-#endif /* LWIP_DHCP_GET_NTP_SRV*/
-      case(DHCP_OPTION_OVERLOAD):
-        LWIP_ERROR("len == 1", len == 1, return ERR_VAL;);
-        /* decode overload only in options, not in file/sname: invalid packet */
-        LWIP_ERROR("overload in file/sname", options_idx == DHCP_OPTIONS_OFS, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_OVERLOAD;
-        break;
-      case(DHCP_OPTION_MESSAGE_TYPE):
-        LWIP_ERROR("len == 1", len == 1, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_MSG_TYPE;
-        break;
-      case(DHCP_OPTION_SERVER_ID):
-        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_SERVER_ID;
-        break;
-      case(DHCP_OPTION_T1):
-        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_T1;
-        break;
-      case(DHCP_OPTION_T2):
-        LWIP_ERROR("len == 4", len == 4, return ERR_VAL;);
-        decode_idx = DHCP_OPTION_IDX_T2;
-        break;
-      default:
-        decode_len = 0;
-        LWIP_DEBUGF(DHCP_DEBUG, ("skipping option %"U16_F" in options\n", (u16_t)op));
-        break;
-    }
-    offset += len + 2;
-    if (decode_len > 0) {
-      u32_t value = 0;
-      u16_t copy_len;
-decode_next:
-      LWIP_ASSERT("check decode_idx", decode_idx >= 0 && decode_idx < DHCP_OPTION_IDX_MAX);
-      if (!dhcp_option_given(dhcp, decode_idx)) {
-        copy_len = LWIP_MIN(decode_len, 4);
-        if (pbuf_copy_partial(q, &value, copy_len, val_offset) != copy_len) {
-          return ERR_BUF;
-        }
-        if (decode_len > 4) {
-          /* decode more than one u32_t */
-          LWIP_ERROR("decode_len %% 4 == 0", decode_len % 4 == 0, return ERR_VAL;);
-          dhcp_got_option(dhcp, decode_idx);
-          dhcp_set_option_value(dhcp, decode_idx, lwip_htonl(value));
-          decode_len -= 4;
-          val_offset += 4;
-          decode_idx++;
-          goto decode_next;
-        } else if (decode_len == 4) {
-          value = lwip_ntohl(value);
-        } else {
-          LWIP_ERROR("invalid decode_len", decode_len == 1, return ERR_VAL;);
-          value = ((u8_t*)&value)[0];
-        }
-        dhcp_got_option(dhcp, decode_idx);
-        dhcp_set_option_value(dhcp, decode_idx, value);
-      }
-    }
-    if (offset >= q->len) {
-      offset -= q->len;
-      offset_max -= q->len;
-      if ((offset < offset_max) && offset_max) {
-        q = q->next;
-        LWIP_ERROR("next pbuf was null", q != NULL, return ERR_VAL;);
-        options = (u8_t*)q->payload;
-      } else {
-        /* We've run out of bytes, probably no end marker. Don't proceed. */
-        break;
-      }
-    }
-  }
-  /* is this an overloaded message? */
-  if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_OVERLOAD)) {
-    u32_t overload = dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_OVERLOAD);
-    dhcp_clear_option(dhcp, DHCP_OPTION_IDX_OVERLOAD);
-    if (overload == DHCP_OVERLOAD_FILE) {
-      parse_file_as_options = 1;
-      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("overloaded file field\n"));
-    } else if (overload == DHCP_OVERLOAD_SNAME) {
-      parse_sname_as_options = 1;
-      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("overloaded sname field\n"));
-    } else if (overload == DHCP_OVERLOAD_SNAME_FILE) {
-      parse_sname_as_options = 1;
-      parse_file_as_options = 1;
-      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("overloaded sname and file field\n"));
-    } else {
-      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("invalid overload option: %d\n", (int)overload));
-    }
-#if LWIP_DHCP_BOOTP_FILE
-    if (!parse_file_as_options) {
-      /* only do this for ACK messages */
-      if (dhcp_option_given(dhcp, DHCP_OPTION_IDX_MSG_TYPE) &&
-        (dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_MSG_TYPE) == DHCP_ACK))
-      /* copy bootp file name, don't care for sname (server hostname) */
-      if (pbuf_copy_partial(p, dhcp->boot_file_name, DHCP_FILE_LEN-1, DHCP_FILE_OFS) != (DHCP_FILE_LEN-1)) {
-        return ERR_BUF;
-      }
-      /* make sure the string is really NULL-terminated */
-      dhcp->boot_file_name[DHCP_FILE_LEN-1] = 0;
-    }
-#endif /* LWIP_DHCP_BOOTP_FILE */
-  }
-  if (parse_file_as_options) {
-    /* if both are overloaded, parse file first and then sname (RFC 2131 ch. 4.1) */
-    parse_file_as_options = 0;
-    options_idx = DHCP_FILE_OFS;
-    options_idx_max = DHCP_FILE_OFS + DHCP_FILE_LEN;
-    goto again;
-  } else if (parse_sname_as_options) {
-    parse_sname_as_options = 0;
-    options_idx = DHCP_SNAME_OFS;
-    options_idx_max = DHCP_SNAME_OFS + DHCP_SNAME_LEN;
-    goto again;
-  }
-  return ERR_OK;
-}
-
-/**
- * If an incoming DHCP message is in response to us, then trigger the state machine
- */
-static void
-dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port)
-{
-  struct netif *netif = ip_current_input_netif();
-  struct dhcp *dhcp = netif_dhcp_data(netif);
-  struct dhcp_msg *reply_msg = (struct dhcp_msg *)p->payload;
-  u8_t msg_type;
-  u8_t i;
-
-  LWIP_UNUSED_ARG(arg);
-
-  /* Caught DHCP message from netif that does not have DHCP enabled? -> not interested */
-  if ((dhcp == NULL) || (dhcp->pcb_allocated == 0)) {
-    goto free_pbuf_and_return;
-  }
-
-  LWIP_ASSERT("invalid server address type", IP_IS_V4(addr));
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("dhcp_recv(pbuf = %p) from DHCP server %"U16_F".%"U16_F".%"U16_F".%"U16_F" port %"U16_F"\n", (void*)p,
-    ip4_addr1_16(ip_2_ip4(addr)), ip4_addr2_16(ip_2_ip4(addr)), ip4_addr3_16(ip_2_ip4(addr)), ip4_addr4_16(ip_2_ip4(addr)), port));
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("pbuf->len = %"U16_F"\n", p->len));
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("pbuf->tot_len = %"U16_F"\n", p->tot_len));
-  /* prevent warnings about unused arguments */
-  LWIP_UNUSED_ARG(pcb);
-  LWIP_UNUSED_ARG(addr);
-  LWIP_UNUSED_ARG(port);
-
-  LWIP_ASSERT("reply wasn't freed", dhcp->msg_in == NULL);
-
-  if (p->len < DHCP_MIN_REPLY_LEN) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("DHCP reply message or pbuf too short\n"));
-    goto free_pbuf_and_return;
-  }
-
-  if (reply_msg->op != DHCP_BOOTREPLY) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("not a DHCP reply message, but type %"U16_F"\n", (u16_t)reply_msg->op));
-    goto free_pbuf_and_return;
-  }
-  /* iterate through hardware address and match against DHCP message */
-  for (i = 0; i < netif->hwaddr_len && i < NETIF_MAX_HWADDR_LEN && i < DHCP_CHADDR_LEN; i++) {
-    if (netif->hwaddr[i] != reply_msg->chaddr[i]) {
-      LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
-        ("netif->hwaddr[%"U16_F"]==%02"X16_F" != reply_msg->chaddr[%"U16_F"]==%02"X16_F"\n",
-        (u16_t)i, (u16_t)netif->hwaddr[i], (u16_t)i, (u16_t)reply_msg->chaddr[i]));
-      goto free_pbuf_and_return;
-    }
-  }
-  /* match transaction ID against what we expected */
-  if (lwip_ntohl(reply_msg->xid) != dhcp->xid) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
-      ("transaction id mismatch reply_msg->xid(%"X32_F")!=dhcp->xid(%"X32_F")\n",lwip_ntohl(reply_msg->xid),dhcp->xid));
-    goto free_pbuf_and_return;
-  }
-  /* option fields could be unfold? */
-  if (dhcp_parse_reply(dhcp, p) != ERR_OK) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
-      ("problem unfolding DHCP message - too short on memory?\n"));
-    goto free_pbuf_and_return;
-  }
-
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("searching DHCP_OPTION_MESSAGE_TYPE\n"));
-  /* obtain pointer to DHCP message type */
-  if (!dhcp_option_given(dhcp, DHCP_OPTION_IDX_MSG_TYPE)) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("DHCP_OPTION_MESSAGE_TYPE option not found\n"));
-    goto free_pbuf_and_return;
-  }
-
-  /* read DHCP message type */
-  msg_type = (u8_t)dhcp_get_option_value(dhcp, DHCP_OPTION_IDX_MSG_TYPE);
-  /* message type is DHCP ACK? */
-  if (msg_type == DHCP_ACK) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("DHCP_ACK received\n"));
-    /* in requesting state? */
-    if (dhcp->state == DHCP_STATE_REQUESTING) {
-      dhcp_handle_ack(netif);
-#if DHCP_DOES_ARP_CHECK
-      if ((netif->flags & NETIF_FLAG_ETHARP) != 0) {
-        /* check if the acknowledged lease address is already in use */
-        dhcp_check(netif);
-      } else {
-        /* bind interface to the acknowledged lease address */
-        dhcp_bind(netif);
-      }
-#else
-      /* bind interface to the acknowledged lease address */
-      dhcp_bind(netif);
-#endif
-    }
-    /* already bound to the given lease address? */
-    else if ((dhcp->state == DHCP_STATE_REBOOTING) || (dhcp->state == DHCP_STATE_REBINDING) ||
-             (dhcp->state == DHCP_STATE_RENEWING)) {
-      dhcp_handle_ack(netif);
-      dhcp_bind(netif);
-    }
-  }
-  /* received a DHCP_NAK in appropriate state? */
-  else if ((msg_type == DHCP_NAK) &&
-    ((dhcp->state == DHCP_STATE_REBOOTING) || (dhcp->state == DHCP_STATE_REQUESTING) ||
-     (dhcp->state == DHCP_STATE_REBINDING) || (dhcp->state == DHCP_STATE_RENEWING  ))) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("DHCP_NAK received\n"));
-    dhcp_handle_nak(netif);
-  }
-  /* received a DHCP_OFFER in DHCP_STATE_SELECTING state? */
-  else if ((msg_type == DHCP_OFFER) && (dhcp->state == DHCP_STATE_SELECTING)) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE, ("DHCP_OFFER received in DHCP_STATE_SELECTING state\n"));
-    dhcp->request_timeout = 0;
-    /* remember offered lease */
-    dhcp_handle_offer(netif);
-  }
-
-free_pbuf_and_return:
-  if (dhcp != NULL) {
-    dhcp->msg_in = NULL;
-  }
-  pbuf_free(p);
-}
-
-/**
- * Create a DHCP request, fill in common headers
- *
- * @param netif the netif under DHCP control
- * @param dhcp dhcp control struct
- * @param message_type message type of the request
- */
-static err_t
-dhcp_create_msg(struct netif *netif, struct dhcp *dhcp, u8_t message_type)
-{
-  u16_t i;
-#ifndef DHCP_GLOBAL_XID
-  /** default global transaction identifier starting value (easy to match
-   *  with a packet analyser). We simply increment for each new request.
-   *  Predefine DHCP_GLOBAL_XID to a better value or a function call to generate one
-   *  at runtime, any supporting function prototypes can be defined in DHCP_GLOBAL_XID_HEADER */
-#if DHCP_CREATE_RAND_XID && defined(LWIP_RAND)
-  static u32_t xid;
-#else /* DHCP_CREATE_RAND_XID && defined(LWIP_RAND) */
-  static u32_t xid = 0xABCD0000;
-#endif /* DHCP_CREATE_RAND_XID && defined(LWIP_RAND) */
-#else
-  if (!xid_initialised) {
-    xid = DHCP_GLOBAL_XID;
-    xid_initialised = !xid_initialised;
-  }
-#endif
-  LWIP_ERROR("dhcp_create_msg: netif != NULL", (netif != NULL), return ERR_ARG;);
-  LWIP_ERROR("dhcp_create_msg: dhcp != NULL", (dhcp != NULL), return ERR_VAL;);
-  LWIP_ASSERT("dhcp_create_msg: dhcp->p_out == NULL", dhcp->p_out == NULL);
-  LWIP_ASSERT("dhcp_create_msg: dhcp->msg_out == NULL", dhcp->msg_out == NULL);
-  dhcp->p_out = pbuf_alloc(PBUF_TRANSPORT, sizeof(struct dhcp_msg), PBUF_RAM);
-  if (dhcp->p_out == NULL) {
-    LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
-      ("dhcp_create_msg(): could not allocate pbuf\n"));
-    return ERR_MEM;
-  }
-  LWIP_ASSERT("dhcp_create_msg: check that first pbuf can hold struct dhcp_msg",
-           (dhcp->p_out->len >= sizeof(struct dhcp_msg)));
-
-  /* DHCP_REQUEST should reuse 'xid' from DHCPOFFER */
-  if ((message_type != DHCP_REQUEST) || (dhcp->state == DHCP_STATE_REBOOTING)) {
-    /* reuse transaction identifier in retransmissions */
-    if (dhcp->tries == 0) {
-#if DHCP_CREATE_RAND_XID && defined(LWIP_RAND)
-      xid = LWIP_RAND();
-#else /* DHCP_CREATE_RAND_XID && defined(LWIP_RAND) */
-      xid++;
-#endif /* DHCP_CREATE_RAND_XID && defined(LWIP_RAND) */
-    }
-    dhcp->xid = xid;
-  }
-  LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE,
-              ("transaction id xid(%"X32_F")\n", xid));
-
-  dhcp->msg_out = (struct dhcp_msg *)dhcp->p_out->payload;
-
-  dhcp->msg_out->op = DHCP_BOOTREQUEST;
-  /* @todo: make link layer independent */
-  dhcp->msg_out->htype = DHCP_HTYPE_ETH;
-  dhcp->msg_out->hlen = netif->hwaddr_len;
-  dhcp->msg_out->hops = 0;
-  dhcp->msg_out->xid = lwip_htonl(dhcp->xid);
-  dhcp->msg_out->secs = 0;
-  /* we don't need the broadcast flag since we can receive unicast traffic
-     before being fully configured! */
-  dhcp->msg_out->flags = 0;
-  ip4_addr_set_zero(&dhcp->msg_out->ciaddr);
-  /* set ciaddr to netif->ip_addr based on message_type and state */
-  if ((message_type == DHCP_INFORM) || (message_type == DHCP_DECLINE) || (message_type == DHCP_RELEASE) ||
-      ((message_type == DHCP_REQUEST) && /* DHCP_STATE_BOUND not used for sending! */
-       ((dhcp->state== DHCP_STATE_RENEWING) || dhcp->state== DHCP_STATE_REBINDING))) {
-    ip4_addr_copy(dhcp->msg_out->ciaddr, *netif_ip4_addr(netif));
-  }
-  ip4_addr_set_zero(&dhcp->msg_out->yiaddr);
-  ip4_addr_set_zero(&dhcp->msg_out->siaddr);
-  ip4_addr_set_zero(&dhcp->msg_out->giaddr);
-  for (i = 0; i < DHCP_CHADDR_LEN; i++) {
-    /* copy netif hardware address, pad with zeroes */
-    dhcp->msg_out->chaddr[i] = (i < netif->hwaddr_len && i < NETIF_MAX_HWADDR_LEN) ? netif->hwaddr[i] : 0/* pad byte*/;
-  }
-  for (i = 0; i < DHCP_SNAME_LEN; i++) {
-    dhcp->msg_out->sname[i] = 0;
-  }
-  for (i = 0; i < DHCP_FILE_LEN; i++) {
-    dhcp->msg_out->file[i] = 0;
-  }
-  dhcp->msg_out->cookie = PP_HTONL(DHCP_MAGIC_COOKIE);
-  dhcp->options_out_len = 0;
-  /* fill options field with an incrementing array (for debugging purposes) */
-  for (i = 0; i < DHCP_OPTIONS_LEN; i++) {
-    dhcp->msg_out->options[i] = (u8_t)i; /* for debugging only, no matter if truncated */
-  }
-  /* Add option MESSAGE_TYPE */
-  dhcp_option(dhcp, DHCP_OPTION_MESSAGE_TYPE, DHCP_OPTION_MESSAGE_TYPE_LEN);
-  dhcp_option_byte(dhcp, message_type);
-  return ERR_OK;
-}
-
-/**
- * Free previously allocated memory used to send a DHCP request.
- *
- * @param dhcp the dhcp struct to free the request from
- */
-static void
-dhcp_delete_msg(struct dhcp *dhcp)
-{
-  LWIP_ERROR("dhcp_delete_msg: dhcp != NULL", (dhcp != NULL), return;);
-  LWIP_ASSERT("dhcp_delete_msg: dhcp->p_out != NULL", dhcp->p_out != NULL);
-  LWIP_ASSERT("dhcp_delete_msg: dhcp->msg_out != NULL", dhcp->msg_out != NULL);
-  if (dhcp->p_out != NULL) {
-    pbuf_free(dhcp->p_out);
-  }
-  dhcp->p_out = NULL;
-  dhcp->msg_out = NULL;
-}
-
-/**
- * Add a DHCP message trailer
- *
- * Adds the END option to the DHCP message, and if
- * necessary, up to three padding bytes.
- *
- * @param dhcp DHCP state structure
- */
-static void
-dhcp_option_trailer(struct dhcp *dhcp)
-{
-  LWIP_ERROR("dhcp_option_trailer: dhcp != NULL", (dhcp != NULL), return;);
-  LWIP_ASSERT("dhcp_option_trailer: dhcp->msg_out != NULL\n", dhcp->msg_out != NULL);
-  LWIP_ASSERT("dhcp_option_trailer: dhcp->options_out_len < DHCP_OPTIONS_LEN\n", dhcp->options_out_len < DHCP_OPTIONS_LEN);
-  dhcp->msg_out->options[dhcp->options_out_len++] = DHCP_OPTION_END;
-  /* packet is too small, or not 4 byte aligned? */
-  while (((dhcp->options_out_len < DHCP_MIN_OPTIONS_LEN) || (dhcp->options_out_len & 3)) &&
-         (dhcp->options_out_len < DHCP_OPTIONS_LEN)) {
-    /* add a fill/padding byte */
-    dhcp->msg_out->options[dhcp->options_out_len++] = 0;
-  }
-}
-
-/** check if DHCP supplied netif->ip_addr
- *
- * @param netif the netif to check
- * @return 1 if DHCP supplied netif->ip_addr (states BOUND or RENEWING),
- *         0 otherwise
- */
-u8_t
-dhcp_supplied_address(const struct netif *netif)
-{
-  if ((netif != NULL) && (netif_dhcp_data(netif) != NULL)) {
-    struct dhcp* dhcp = netif_dhcp_data(netif);
-    return (dhcp->state == DHCP_STATE_BOUND) || (dhcp->state == DHCP_STATE_RENEWING) ||
-           (dhcp->state == DHCP_STATE_REBINDING);
-  }
-  return 0;
-}
-
-#endif /* LWIP_IPV4 && LWIP_DHCP */
diff --git a/sys/net/core/ipv4/etharp.c b/sys/net/core/ipv4/etharp.c
deleted file mode 100644
index bfccd4f..0000000
--- a/sys/net/core/ipv4/etharp.c
+++ /dev/null
@@ -1,1206 +0,0 @@
-/**
- * @file
- * Address Resolution Protocol module for IP over Ethernet
- *
- * Functionally, ARP is divided into two parts. The first maps an IP address
- * to a physical address when sending a packet, and the second part answers
- * requests from other machines for our physical address.
- *
- * This implementation complies with RFC 826 (Ethernet ARP). It supports
- * Gratuitious ARP from RFC3220 (IP Mobility Support for IPv4) section 4.6
- * if an interface calls etharp_gratuitous(our_netif) upon address change.
- */
-
-/*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
- * Copyright (c) 2003-2004 Leon Woestenberg <leon.woestenberg@axon.tv>
- * Copyright (c) 2003-2004 Axon Digital Design B.V., The Netherlands.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_ARP || LWIP_ETHERNET
-
-#include "net/etharp.h"
-#include "net/stats.h"
-#include "net/snmp.h"
-#include "net/dhcp.h"
-#include "net/autoip.h"
-#include "netif/ethernet.h"
-
-#include <string.h>
-
-#ifdef LWIP_HOOK_FILENAME
-#include LWIP_HOOK_FILENAME
-#endif
-
-#if LWIP_IPV4 && LWIP_ARP /* don't build if not configured for use in lwipopts.h */
-
-/** Re-request a used ARP entry 1 minute before it would expire to prevent
- *  breaking a steadily used connection because the ARP entry timed out. */
-#define ARP_AGE_REREQUEST_USED_UNICAST   (ARP_MAXAGE - 30)
-#define ARP_AGE_REREQUEST_USED_BROADCAST (ARP_MAXAGE - 15)
-
-/** the time an ARP entry stays pending after first request,
- *  for ARP_TMR_INTERVAL = 1000, this is
- *  10 seconds.
- *
- *  @internal Keep this number at least 2, otherwise it might
- *  run out instantly if the timeout occurs directly after a request.
- */
-#define ARP_MAXPENDING 5
-
-/** ARP states */
-enum etharp_state {
-  ETHARP_STATE_EMPTY = 0,
-  ETHARP_STATE_PENDING,
-  ETHARP_STATE_STABLE,
-  ETHARP_STATE_STABLE_REREQUESTING_1,
-  ETHARP_STATE_STABLE_REREQUESTING_2
-#if ETHARP_SUPPORT_STATIC_ENTRIES
-  ,ETHARP_STATE_STATIC
-#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
-};
-
-struct etharp_entry {
-#if ARP_QUEUEING
-  /** Pointer to queue of pending outgoing packets on this ARP entry. */
-  struct etharp_q_entry *q;
-#else /* ARP_QUEUEING */
-  /** Pointer to a single pending outgoing packet on this ARP entry. */
-  struct pbuf *q;
-#endif /* ARP_QUEUEING */
-  ip4_addr_t ipaddr;
-  struct netif *netif;
-  struct eth_addr ethaddr;
-  u16_t ctime;
-  u8_t state;
-};
-
-static struct etharp_entry arp_table[ARP_TABLE_SIZE];
-
-#if !LWIP_NETIF_HWADDRHINT
-static u8_t etharp_cached_entry;
-#endif /* !LWIP_NETIF_HWADDRHINT */
-
-/** Try hard to create a new entry - we want the IP address to appear in
-    the cache (even if this means removing an active entry or so). */
-#define ETHARP_FLAG_TRY_HARD     1
-#define ETHARP_FLAG_FIND_ONLY    2
-#if ETHARP_SUPPORT_STATIC_ENTRIES
-#define ETHARP_FLAG_STATIC_ENTRY 4
-#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
-
-#if LWIP_NETIF_HWADDRHINT
-#define ETHARP_SET_HINT(netif, hint)  if (((netif) != NULL) && ((netif)->addr_hint != NULL))  \
-                                      *((netif)->addr_hint) = (hint);
-#else /* LWIP_NETIF_HWADDRHINT */
-#define ETHARP_SET_HINT(netif, hint)  (etharp_cached_entry = (hint))
-#endif /* LWIP_NETIF_HWADDRHINT */
-
-
-/* Some checks, instead of etharp_init(): */
-#if (LWIP_ARP && (ARP_TABLE_SIZE > 0x7f))
-  #error "ARP_TABLE_SIZE must fit in an s8_t, you have to reduce it in your lwipopts.h"
-#endif
-
-
-static err_t etharp_request_dst(struct netif *netif, const ip4_addr_t *ipaddr, const struct eth_addr* hw_dst_addr);
-static err_t etharp_raw(struct netif *netif,
-                        const struct eth_addr *ethsrc_addr, const struct eth_addr *ethdst_addr,
-                        const struct eth_addr *hwsrc_addr, const ip4_addr_t *ipsrc_addr,
-                        const struct eth_addr *hwdst_addr, const ip4_addr_t *ipdst_addr,
-                        const u16_t opcode);
-
-#if ARP_QUEUEING
-/**
- * Free a complete queue of etharp entries
- *
- * @param q a qeueue of etharp_q_entry's to free
- */
-static void
-free_etharp_q(struct etharp_q_entry *q)
-{
-  struct etharp_q_entry *r;
-  LWIP_ASSERT("q != NULL", q != NULL);
-  LWIP_ASSERT("q->p != NULL", q->p != NULL);
-  while (q) {
-    r = q;
-    q = q->next;
-    LWIP_ASSERT("r->p != NULL", (r->p != NULL));
-    pbuf_free(r->p);
-    memp_free(MEMP_ARP_QUEUE, r);
-  }
-}
-#else /* ARP_QUEUEING */
-
-/** Compatibility define: free the queued pbuf */
-#define free_etharp_q(q) pbuf_free(q)
-
-#endif /* ARP_QUEUEING */
-
-/** Clean up ARP table entries */
-static void
-etharp_free_entry(int i)
-{
-  /* remove from SNMP ARP index tree */
-  mib2_remove_arp_entry(arp_table[i].netif, &arp_table[i].ipaddr);
-  /* and empty packet queue */
-  if (arp_table[i].q != NULL) {
-    /* remove all queued packets */
-    LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_free_entry: freeing entry %"U16_F", packet queue %p.\n", (u16_t)i, (void *)(arp_table[i].q)));
-    free_etharp_q(arp_table[i].q);
-    arp_table[i].q = NULL;
-  }
-  /* recycle entry for re-use */
-  arp_table[i].state = ETHARP_STATE_EMPTY;
-#ifdef LWIP_DEBUG
-  /* for debugging, clean out the complete entry */
-  arp_table[i].ctime = 0;
-  arp_table[i].netif = NULL;
-  ip4_addr_set_zero(&arp_table[i].ipaddr);
-  arp_table[i].ethaddr = ethzero;
-#endif /* LWIP_DEBUG */
-}
-
-/**
- * Clears expired entries in the ARP table.
- *
- * This function should be called every ARP_TMR_INTERVAL milliseconds (1 second),
- * in order to expire entries in the ARP table.
- */
-void
-etharp_tmr(void)
-{
-  u8_t i;
-
-  LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_timer\n"));
-  /* remove expired entries from the ARP table */
-  for (i = 0; i < ARP_TABLE_SIZE; ++i) {
-    u8_t state = arp_table[i].state;
-    if (state != ETHARP_STATE_EMPTY
-#if ETHARP_SUPPORT_STATIC_ENTRIES
-      && (state != ETHARP_STATE_STATIC)
-#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
-      ) {
-      arp_table[i].ctime++;
-      if ((arp_table[i].ctime >= ARP_MAXAGE) ||
-          ((arp_table[i].state == ETHARP_STATE_PENDING)  &&
-           (arp_table[i].ctime >= ARP_MAXPENDING))) {
-        /* pending or stable entry has become old! */
-        LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_timer: expired %s entry %"U16_F".\n",
-             arp_table[i].state >= ETHARP_STATE_STABLE ? "stable" : "pending", (u16_t)i));
-        /* clean up entries that have just been expired */
-        etharp_free_entry(i);
-      } else if (arp_table[i].state == ETHARP_STATE_STABLE_REREQUESTING_1) {
-        /* Don't send more than one request every 2 seconds. */
-        arp_table[i].state = ETHARP_STATE_STABLE_REREQUESTING_2;
-      } else if (arp_table[i].state == ETHARP_STATE_STABLE_REREQUESTING_2) {
-        /* Reset state to stable, so that the next transmitted packet will
-           re-send an ARP request. */
-        arp_table[i].state = ETHARP_STATE_STABLE;
-      } else if (arp_table[i].state == ETHARP_STATE_PENDING) {
-        /* still pending, resend an ARP query */
-        etharp_request(arp_table[i].netif, &arp_table[i].ipaddr);
-      }
-    }
-  }
-}
-
-/**
- * Search the ARP table for a matching or new entry.
- *
- * If an IP address is given, return a pending or stable ARP entry that matches
- * the address. If no match is found, create a new entry with this address set,
- * but in state ETHARP_EMPTY. The caller must check and possibly change the
- * state of the returned entry.
- *
- * If ipaddr is NULL, return a initialized new entry in state ETHARP_EMPTY.
- *
- * In all cases, attempt to create new entries from an empty entry. If no
- * empty entries are available and ETHARP_FLAG_TRY_HARD flag is set, recycle
- * old entries. Heuristic choose the least important entry for recycling.
- *
- * @param ipaddr IP address to find in ARP cache, or to add if not found.
- * @param flags See @ref etharp_state
- * @param netif netif related to this address (used for NETIF_HWADDRHINT)
- *
- * @return The ARP entry index that matched or is created, ERR_MEM if no
- * entry is found or could be recycled.
- */
-static s8_t
-etharp_find_entry(const ip4_addr_t *ipaddr, u8_t flags, struct netif* netif)
-{
-  s8_t old_pending = ARP_TABLE_SIZE, old_stable = ARP_TABLE_SIZE;
-  s8_t empty = ARP_TABLE_SIZE;
-  u8_t i = 0;
-  /* oldest entry with packets on queue */
-  s8_t old_queue = ARP_TABLE_SIZE;
-  /* its age */
-  u16_t age_queue = 0, age_pending = 0, age_stable = 0;
-
-  LWIP_UNUSED_ARG(netif);
-
-  /**
-   * a) do a search through the cache, remember candidates
-   * b) select candidate entry
-   * c) create new entry
-   */
-
-  /* a) in a single search sweep, do all of this
-   * 1) remember the first empty entry (if any)
-   * 2) remember the oldest stable entry (if any)
-   * 3) remember the oldest pending entry without queued packets (if any)
-   * 4) remember the oldest pending entry with queued packets (if any)
-   * 5) search for a matching IP entry, either pending or stable
-   *    until 5 matches, or all entries are searched for.
-   */
-
-  for (i = 0; i < ARP_TABLE_SIZE; ++i) {
-    u8_t state = arp_table[i].state;
-    /* no empty entry found yet and now we do find one? */
-    if ((empty == ARP_TABLE_SIZE) && (state == ETHARP_STATE_EMPTY)) {
-      LWIP_DEBUGF(ETHARP_DEBUG, ("etharp_find_entry: found empty entry %"U16_F"\n", (u16_t)i));
-      /* remember first empty entry */
-      empty = i;
-    } else if (state != ETHARP_STATE_EMPTY) {
-      LWIP_ASSERT("state == ETHARP_STATE_PENDING || state >= ETHARP_STATE_STABLE",
-        state == ETHARP_STATE_PENDING || state >= ETHARP_STATE_STABLE);
-      /* if given, does IP address match IP address in ARP entry? */
-      if (ipaddr && ip4_addr_cmp(ipaddr, &arp_table[i].ipaddr)
-#if ETHARP_TABLE_MATCH_NETIF
-          && ((netif == NULL) || (netif == arp_table[i].netif))
-#endif /* ETHARP_TABLE_MATCH_NETIF */
-        ) {
-        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: found matching entry %"U16_F"\n", (u16_t)i));
-        /* found exact IP address match, simply bail out */
-        return i;
-      }
-      /* pending entry? */
-      if (state == ETHARP_STATE_PENDING) {
-        /* pending with queued packets? */
-        if (arp_table[i].q != NULL) {
-          if (arp_table[i].ctime >= age_queue) {
-            old_queue = i;
-            age_queue = arp_table[i].ctime;
-          }
-        } else
-        /* pending without queued packets? */
-        {
-          if (arp_table[i].ctime >= age_pending) {
-            old_pending = i;
-            age_pending = arp_table[i].ctime;
-          }
-        }
-      /* stable entry? */
-      } else if (state >= ETHARP_STATE_STABLE) {
-#if ETHARP_SUPPORT_STATIC_ENTRIES
-        /* don't record old_stable for static entries since they never expire */
-        if (state < ETHARP_STATE_STATIC)
-#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
-        {
-          /* remember entry with oldest stable entry in oldest, its age in maxtime */
-          if (arp_table[i].ctime >= age_stable) {
-            old_stable = i;
-            age_stable = arp_table[i].ctime;
-          }
-        }
-      }
-    }
-  }
-  /* { we have no match } => try to create a new entry */
-
-  /* don't create new entry, only search? */
-  if (((flags & ETHARP_FLAG_FIND_ONLY) != 0) ||
-      /* or no empty entry found and not allowed to recycle? */
-      ((empty == ARP_TABLE_SIZE) && ((flags & ETHARP_FLAG_TRY_HARD) == 0))) {
-    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: no empty entry found and not allowed to recycle\n"));
-    return (s8_t)ERR_MEM;
-  }
-
-  /* b) choose the least destructive entry to recycle:
-   * 1) empty entry
-   * 2) oldest stable entry
-   * 3) oldest pending entry without queued packets
-   * 4) oldest pending entry with queued packets
-   *
-   * { ETHARP_FLAG_TRY_HARD is set at this point }
-   */
-
-  /* 1) empty entry available? */
-  if (empty < ARP_TABLE_SIZE) {
-    i = empty;
-    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: selecting empty entry %"U16_F"\n", (u16_t)i));
-  } else {
-    /* 2) found recyclable stable entry? */
-    if (old_stable < ARP_TABLE_SIZE) {
-      /* recycle oldest stable*/
-      i = old_stable;
-      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: selecting oldest stable entry %"U16_F"\n", (u16_t)i));
-      /* no queued packets should exist on stable entries */
-      LWIP_ASSERT("arp_table[i].q == NULL", arp_table[i].q == NULL);
-    /* 3) found recyclable pending entry without queued packets? */
-    } else if (old_pending < ARP_TABLE_SIZE) {
-      /* recycle oldest pending */
-      i = old_pending;
-      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: selecting oldest pending entry %"U16_F" (without queue)\n", (u16_t)i));
-    /* 4) found recyclable pending entry with queued packets? */
-    } else if (old_queue < ARP_TABLE_SIZE) {
-      /* recycle oldest pending (queued packets are free in etharp_free_entry) */
-      i = old_queue;
-      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: selecting oldest pending entry %"U16_F", freeing packet queue %p\n", (u16_t)i, (void *)(arp_table[i].q)));
-      /* no empty or recyclable entries found */
-    } else {
-      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_find_entry: no empty or recyclable entries found\n"));
-      return (s8_t)ERR_MEM;
-    }
-
-    /* { empty or recyclable entry found } */
-    LWIP_ASSERT("i < ARP_TABLE_SIZE", i < ARP_TABLE_SIZE);
-    etharp_free_entry(i);
-  }
-
-  LWIP_ASSERT("i < ARP_TABLE_SIZE", i < ARP_TABLE_SIZE);
-  LWIP_ASSERT("arp_table[i].state == ETHARP_STATE_EMPTY",
-    arp_table[i].state == ETHARP_STATE_EMPTY);
-
-  /* IP address given? */
-  if (ipaddr != NULL) {
-    /* set IP address */
-    ip4_addr_copy(arp_table[i].ipaddr, *ipaddr);
-  }
-  arp_table[i].ctime = 0;
-#if ETHARP_TABLE_MATCH_NETIF
-  arp_table[i].netif = netif;
-#endif /* ETHARP_TABLE_MATCH_NETIF*/
-  return (err_t)i;
-}
-
-/**
- * Update (or insert) a IP/MAC address pair in the ARP cache.
- *
- * If a pending entry is resolved, any queued packets will be sent
- * at this point.
- *
- * @param netif netif related to this entry (used for NETIF_ADDRHINT)
- * @param ipaddr IP address of the inserted ARP entry.
- * @param ethaddr Ethernet address of the inserted ARP entry.
- * @param flags See @ref etharp_state
- *
- * @return
- * - ERR_OK Successfully updated ARP cache.
- * - ERR_MEM If we could not add a new ARP entry when ETHARP_FLAG_TRY_HARD was set.
- * - ERR_ARG Non-unicast address given, those will not appear in ARP cache.
- *
- * @see pbuf_free()
- */
-static err_t
-etharp_update_arp_entry(struct netif *netif, const ip4_addr_t *ipaddr, struct eth_addr *ethaddr, u8_t flags)
-{
-  s8_t i;
-  LWIP_ASSERT("netif->hwaddr_len == ETH_HWADDR_LEN", netif->hwaddr_len == ETH_HWADDR_LEN);
-  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_update_arp_entry: %"U16_F".%"U16_F".%"U16_F".%"U16_F" - %02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F"\n",
-    ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr), ip4_addr3_16(ipaddr), ip4_addr4_16(ipaddr),
-    (u16_t)ethaddr->addr[0], (u16_t)ethaddr->addr[1], (u16_t)ethaddr->addr[2],
-    (u16_t)ethaddr->addr[3], (u16_t)ethaddr->addr[4], (u16_t)ethaddr->addr[5]));
-  /* non-unicast address? */
-  if (ip4_addr_isany(ipaddr) ||
-      ip4_addr_isbroadcast(ipaddr, netif) ||
-      ip4_addr_ismulticast(ipaddr)) {
-    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_update_arp_entry: will not add non-unicast IP address to ARP cache\n"));
-    return ERR_ARG;
-  }
-  /* find or create ARP entry */
-  i = etharp_find_entry(ipaddr, flags, netif);
-  /* bail out if no entry could be found */
-  if (i < 0) {
-    return (err_t)i;
-  }
-
-#if ETHARP_SUPPORT_STATIC_ENTRIES
-  if (flags & ETHARP_FLAG_STATIC_ENTRY) {
-    /* record static type */
-    arp_table[i].state = ETHARP_STATE_STATIC;
-  } else if (arp_table[i].state == ETHARP_STATE_STATIC) {
-    /* found entry is a static type, don't overwrite it */
-    return ERR_VAL;
-  } else
-#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
-  {
-    /* mark it stable */
-    arp_table[i].state = ETHARP_STATE_STABLE;
-  }
-
-  /* record network interface */
-  arp_table[i].netif = netif;
-  /* insert in SNMP ARP index tree */
-  mib2_add_arp_entry(netif, &arp_table[i].ipaddr);
-
-  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_update_arp_entry: updating stable entry %"S16_F"\n", (s16_t)i));
-  /* update address */
-  ETHADDR32_COPY(&arp_table[i].ethaddr, ethaddr);
-  /* reset time stamp */
-  arp_table[i].ctime = 0;
-  /* this is where we will send out queued packets! */
-#if ARP_QUEUEING
-  while (arp_table[i].q != NULL) {
-    struct pbuf *p;
-    /* remember remainder of queue */
-    struct etharp_q_entry *q = arp_table[i].q;
-    /* pop first item off the queue */
-    arp_table[i].q = q->next;
-    /* get the packet pointer */
-    p = q->p;
-    /* now queue entry can be freed */
-    memp_free(MEMP_ARP_QUEUE, q);
-#else /* ARP_QUEUEING */
-  if (arp_table[i].q != NULL) {
-    struct pbuf *p = arp_table[i].q;
-    arp_table[i].q = NULL;
-#endif /* ARP_QUEUEING */
-    /* send the queued IP packet */
-    ethernet_output(netif, p, (struct eth_addr*)(netif->hwaddr), ethaddr, ETHTYPE_IP);
-    /* free the queued IP packet */
-    pbuf_free(p);
-  }
-  return ERR_OK;
-}
-
-#if ETHARP_SUPPORT_STATIC_ENTRIES
-/** Add a new static entry to the ARP table. If an entry exists for the
- * specified IP address, this entry is overwritten.
- * If packets are queued for the specified IP address, they are sent out.
- *
- * @param ipaddr IP address for the new static entry
- * @param ethaddr ethernet address for the new static entry
- * @return See return values of etharp_add_static_entry
- */
-err_t
-etharp_add_static_entry(const ip4_addr_t *ipaddr, struct eth_addr *ethaddr)
-{
-  struct netif *netif;
-  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_add_static_entry: %"U16_F".%"U16_F".%"U16_F".%"U16_F" - %02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F"\n",
-    ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr), ip4_addr3_16(ipaddr), ip4_addr4_16(ipaddr),
-    (u16_t)ethaddr->addr[0], (u16_t)ethaddr->addr[1], (u16_t)ethaddr->addr[2],
-    (u16_t)ethaddr->addr[3], (u16_t)ethaddr->addr[4], (u16_t)ethaddr->addr[5]));
-
-  netif = ip4_route(ipaddr);
-  if (netif == NULL) {
-    return ERR_RTE;
-  }
-
-  return etharp_update_arp_entry(netif, ipaddr, ethaddr, ETHARP_FLAG_TRY_HARD | ETHARP_FLAG_STATIC_ENTRY);
-}
-
-/** Remove a static entry from the ARP table previously added with a call to
- * etharp_add_static_entry.
- *
- * @param ipaddr IP address of the static entry to remove
- * @return ERR_OK: entry removed
- *         ERR_MEM: entry wasn't found
- *         ERR_ARG: entry wasn't a static entry but a dynamic one
- */
-err_t
-etharp_remove_static_entry(const ip4_addr_t *ipaddr)
-{
-  s8_t i;
-  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_remove_static_entry: %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-    ip4_addr1_16(ipaddr), ip4_addr2_16(ipaddr), ip4_addr3_16(ipaddr), ip4_addr4_16(ipaddr)));
-
-  /* find or create ARP entry */
-  i = etharp_find_entry(ipaddr, ETHARP_FLAG_FIND_ONLY, NULL);
-  /* bail out if no entry could be found */
-  if (i < 0) {
-    return (err_t)i;
-  }
-
-  if (arp_table[i].state != ETHARP_STATE_STATIC) {
-    /* entry wasn't a static entry, cannot remove it */
-    return ERR_ARG;
-  }
-  /* entry found, free it */
-  etharp_free_entry(i);
-  return ERR_OK;
-}
-#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
-
-/**
- * Remove all ARP table entries of the specified netif.
- *
- * @param netif points to a network interface
- */
-void
-etharp_cleanup_netif(struct netif *netif)
-{
-  u8_t i;
-
-  for (i = 0; i < ARP_TABLE_SIZE; ++i) {
-    u8_t state = arp_table[i].state;
-    if ((state != ETHARP_STATE_EMPTY) && (arp_table[i].netif == netif)) {
-      etharp_free_entry(i);
-    }
-  }
-}
-
-/**
- * Finds (stable) ethernet/IP address pair from ARP table
- * using interface and IP address index.
- * @note the addresses in the ARP table are in network order!
- *
- * @param netif points to interface index
- * @param ipaddr points to the (network order) IP address index
- * @param eth_ret points to return pointer
- * @param ip_ret points to return pointer
- * @return table index if found, -1 otherwise
- */
-s8_t
-etharp_find_addr(struct netif *netif, const ip4_addr_t *ipaddr,
-         struct eth_addr **eth_ret, const ip4_addr_t **ip_ret)
-{
-  s8_t i;
-
-  LWIP_ASSERT("eth_ret != NULL && ip_ret != NULL",
-    eth_ret != NULL && ip_ret != NULL);
-
-  LWIP_UNUSED_ARG(netif);
-
-  i = etharp_find_entry(ipaddr, ETHARP_FLAG_FIND_ONLY, netif);
-  if ((i >= 0) && (arp_table[i].state >= ETHARP_STATE_STABLE)) {
-      *eth_ret = &arp_table[i].ethaddr;
-      *ip_ret = &arp_table[i].ipaddr;
-      return i;
-  }
-  return -1;
-}
-
-/**
- * Possibility to iterate over stable ARP table entries
- *
- * @param i entry number, 0 to ARP_TABLE_SIZE
- * @param ipaddr return value: IP address
- * @param netif return value: points to interface
- * @param eth_ret return value: ETH address
- * @return 1 on valid index, 0 otherwise
- */
-u8_t
-etharp_get_entry(u8_t i, ip4_addr_t **ipaddr, struct netif **netif, struct eth_addr **eth_ret)
-{
-  LWIP_ASSERT("ipaddr != NULL", ipaddr != NULL);
-  LWIP_ASSERT("netif != NULL", netif != NULL);
-  LWIP_ASSERT("eth_ret != NULL", eth_ret != NULL);
-
-  if((i < ARP_TABLE_SIZE) && (arp_table[i].state >= ETHARP_STATE_STABLE)) {
-    *ipaddr  = &arp_table[i].ipaddr;
-    *netif   = arp_table[i].netif;
-    *eth_ret = &arp_table[i].ethaddr;
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-/**
- * Responds to ARP requests to us. Upon ARP replies to us, add entry to cache
- * send out queued IP packets. Updates cache with snooped address pairs.
- *
- * Should be called for incoming ARP packets. The pbuf in the argument
- * is freed by this function.
- *
- * @param p The ARP packet that arrived on netif. Is freed by this function.
- * @param netif The lwIP network interface on which the ARP packet pbuf arrived.
- *
- * @see pbuf_free()
- */
-void
-etharp_input(struct pbuf *p, struct netif *netif)
-{
-  struct etharp_hdr *hdr;
-  /* these are aligned properly, whereas the ARP header fields might not be */
-  ip4_addr_t sipaddr, dipaddr;
-  u8_t for_us;
-
-  LWIP_ERROR("netif != NULL", (netif != NULL), return;);
-
-  hdr = (struct etharp_hdr *)p->payload;
-
-  /* RFC 826 "Packet Reception": */
-  if ((hdr->hwtype != PP_HTONS(HWTYPE_ETHERNET)) ||
-      (hdr->hwlen != ETH_HWADDR_LEN) ||
-      (hdr->protolen != sizeof(ip4_addr_t)) ||
-      (hdr->proto != PP_HTONS(ETHTYPE_IP)))  {
-    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
-      ("etharp_input: packet dropped, wrong hw type, hwlen, proto, protolen or ethernet type (%"U16_F"/%"U16_F"/%"U16_F"/%"U16_F")\n",
-      hdr->hwtype, (u16_t)hdr->hwlen, hdr->proto, (u16_t)hdr->protolen));
-    ETHARP_STATS_INC(etharp.proterr);
-    ETHARP_STATS_INC(etharp.drop);
-    pbuf_free(p);
-    return;
-  }
-  ETHARP_STATS_INC(etharp.recv);
-
-#if LWIP_AUTOIP
-  /* We have to check if a host already has configured our random
-   * created link local address and continuously check if there is
-   * a host with this IP-address so we can detect collisions */
-  autoip_arp_reply(netif, hdr);
-#endif /* LWIP_AUTOIP */
-
-  /* Copy struct ip4_addr2 to aligned ip4_addr, to support compilers without
-   * structure packing (not using structure copy which breaks strict-aliasing rules). */
-  IPADDR2_COPY(&sipaddr, &hdr->sipaddr);
-  IPADDR2_COPY(&dipaddr, &hdr->dipaddr);
-
-  /* this interface is not configured? */
-  if (ip4_addr_isany_val(*netif_ip4_addr(netif))) {
-    for_us = 0;
-  } else {
-    /* ARP packet directed to us? */
-    for_us = (u8_t)ip4_addr_cmp(&dipaddr, netif_ip4_addr(netif));
-  }
-
-  /* ARP message directed to us?
-      -> add IP address in ARP cache; assume requester wants to talk to us,
-         can result in directly sending the queued packets for this host.
-     ARP message not directed to us?
-      ->  update the source IP address in the cache, if present */
-  etharp_update_arp_entry(netif, &sipaddr, &(hdr->shwaddr),
-                   for_us ? ETHARP_FLAG_TRY_HARD : ETHARP_FLAG_FIND_ONLY);
-
-  /* now act on the message itself */
-  switch (hdr->opcode) {
-  /* ARP request? */
-  case PP_HTONS(ARP_REQUEST):
-    /* ARP request. If it asked for our address, we send out a
-     * reply. In any case, we time-stamp any existing ARP entry,
-     * and possibly send out an IP packet that was queued on it. */
-
-    LWIP_DEBUGF (ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_input: incoming ARP request\n"));
-    /* ARP request for our address? */
-    if (for_us) {
-      /* send ARP response */
-      etharp_raw(netif,
-                 (struct eth_addr *)netif->hwaddr, &hdr->shwaddr,
-                 (struct eth_addr *)netif->hwaddr, netif_ip4_addr(netif),
-                 &hdr->shwaddr, &sipaddr,
-                 ARP_REPLY);
-    /* we are not configured? */
-    } else if (ip4_addr_isany_val(*netif_ip4_addr(netif))) {
-      /* { for_us == 0 and netif->ip_addr.addr == 0 } */
-      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_input: we are unconfigured, ARP request ignored.\n"));
-    /* request was not directed to us */
-    } else {
-      /* { for_us == 0 and netif->ip_addr.addr != 0 } */
-      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_input: ARP request was not for us.\n"));
-    }
-    break;
-  case PP_HTONS(ARP_REPLY):
-    /* ARP reply. We already updated the ARP cache earlier. */
-    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_input: incoming ARP reply\n"));
-#if (LWIP_DHCP && DHCP_DOES_ARP_CHECK)
-    /* DHCP wants to know about ARP replies from any host with an
-     * IP address also offered to us by the DHCP server. We do not
-     * want to take a duplicate IP address on a single network.
-     * @todo How should we handle redundant (fail-over) interfaces? */
-    dhcp_arp_reply(netif, &sipaddr);
-#endif /* (LWIP_DHCP && DHCP_DOES_ARP_CHECK) */
-    break;
-  default:
-    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_input: ARP unknown opcode type %"S16_F"\n", lwip_htons(hdr->opcode)));
-    ETHARP_STATS_INC(etharp.err);
-    break;
-  }
-  /* free ARP packet */
-  pbuf_free(p);
-}
-
-/** Just a small helper function that sends a pbuf to an ethernet address
- * in the arp_table specified by the index 'arp_idx'.
- */
-static err_t
-etharp_output_to_arp_index(struct netif *netif, struct pbuf *q, u8_t arp_idx)
-{
-  LWIP_ASSERT("arp_table[arp_idx].state >= ETHARP_STATE_STABLE",
-              arp_table[arp_idx].state >= ETHARP_STATE_STABLE);
-  /* if arp table entry is about to expire: re-request it,
-     but only if its state is ETHARP_STATE_STABLE to prevent flooding the
-     network with ARP requests if this address is used frequently. */
-  if (arp_table[arp_idx].state == ETHARP_STATE_STABLE) {
-    if (arp_table[arp_idx].ctime >= ARP_AGE_REREQUEST_USED_BROADCAST) {
-      /* issue a standard request using broadcast */
-      if (etharp_request(netif, &arp_table[arp_idx].ipaddr) == ERR_OK) {
-        arp_table[arp_idx].state = ETHARP_STATE_STABLE_REREQUESTING_1;
-      }
-    } else if (arp_table[arp_idx].ctime >= ARP_AGE_REREQUEST_USED_UNICAST) {
-      /* issue a unicast request (for 15 seconds) to prevent unnecessary broadcast */
-      if (etharp_request_dst(netif, &arp_table[arp_idx].ipaddr, &arp_table[arp_idx].ethaddr) == ERR_OK) {
-        arp_table[arp_idx].state = ETHARP_STATE_STABLE_REREQUESTING_1;
-      }
-    }
-  }
-
-  return ethernet_output(netif, q, (struct eth_addr*)(netif->hwaddr), &arp_table[arp_idx].ethaddr, ETHTYPE_IP);
-}
-
-/**
- * Resolve and fill-in Ethernet address header for outgoing IP packet.
- *
- * For IP multicast and broadcast, corresponding Ethernet addresses
- * are selected and the packet is transmitted on the link.
- *
- * For unicast addresses, the packet is submitted to etharp_query(). In
- * case the IP address is outside the local network, the IP address of
- * the gateway is used.
- *
- * @param netif The lwIP network interface which the IP packet will be sent on.
- * @param q The pbuf(s) containing the IP packet to be sent.
- * @param ipaddr The IP address of the packet destination.
- *
- * @return
- * - ERR_RTE No route to destination (no gateway to external networks),
- * or the return type of either etharp_query() or ethernet_output().
- */
-err_t
-etharp_output(struct netif *netif, struct pbuf *q, const ip4_addr_t *ipaddr)
-{
-  const struct eth_addr *dest;
-  struct eth_addr mcastaddr;
-  const ip4_addr_t *dst_addr = ipaddr;
-
-  LWIP_ASSERT("netif != NULL", netif != NULL);
-  LWIP_ASSERT("q != NULL", q != NULL);
-  LWIP_ASSERT("ipaddr != NULL", ipaddr != NULL);
-
-  /* Determine on destination hardware address. Broadcasts and multicasts
-   * are special, other IP addresses are looked up in the ARP table. */
-
-  /* broadcast destination IP address? */
-  if (ip4_addr_isbroadcast(ipaddr, netif)) {
-    /* broadcast on Ethernet also */
-    dest = (const struct eth_addr *)&ethbroadcast;
-  /* multicast destination IP address? */
-  } else if (ip4_addr_ismulticast(ipaddr)) {
-    /* Hash IP multicast address to MAC address.*/
-    mcastaddr.addr[0] = LL_IP4_MULTICAST_ADDR_0;
-    mcastaddr.addr[1] = LL_IP4_MULTICAST_ADDR_1;
-    mcastaddr.addr[2] = LL_IP4_MULTICAST_ADDR_2;
-    mcastaddr.addr[3] = ip4_addr2(ipaddr) & 0x7f;
-    mcastaddr.addr[4] = ip4_addr3(ipaddr);
-    mcastaddr.addr[5] = ip4_addr4(ipaddr);
-    /* destination Ethernet address is multicast */
-    dest = &mcastaddr;
-  /* unicast destination IP address? */
-  } else {
-    s8_t i;
-    /* outside local network? if so, this can neither be a global broadcast nor
-       a subnet broadcast. */
-    if (!ip4_addr_netcmp(ipaddr, netif_ip4_addr(netif), netif_ip4_netmask(netif)) &&
-        !ip4_addr_islinklocal(ipaddr)) {
-#if LWIP_AUTOIP
-      struct ip_hdr *iphdr = LWIP_ALIGNMENT_CAST(struct ip_hdr*, q->payload);
-      /* According to RFC 3297, chapter 2.6.2 (Forwarding Rules), a packet with
-         a link-local source address must always be "directly to its destination
-         on the same physical link. The host MUST NOT send the packet to any
-         router for forwarding". */
-      if (!ip4_addr_islinklocal(&iphdr->src))
-#endif /* LWIP_AUTOIP */
-      {
-#ifdef LWIP_HOOK_ETHARP_GET_GW
-        /* For advanced routing, a single default gateway might not be enough, so get
-           the IP address of the gateway to handle the current destination address. */
-        dst_addr = LWIP_HOOK_ETHARP_GET_GW(netif, ipaddr);
-        if (dst_addr == NULL)
-#endif /* LWIP_HOOK_ETHARP_GET_GW */
-        {
-          /* interface has default gateway? */
-          if (!ip4_addr_isany_val(*netif_ip4_gw(netif))) {
-            /* send to hardware address of default gateway IP address */
-            dst_addr = netif_ip4_gw(netif);
-          /* no default gateway available */
-          } else {
-            /* no route to destination error (default gateway missing) */
-            return ERR_RTE;
-          }
-        }
-      }
-    }
-#if LWIP_NETIF_HWADDRHINT
-    if (netif->addr_hint != NULL) {
-      /* per-pcb cached entry was given */
-      u8_t etharp_cached_entry = *(netif->addr_hint);
-      if (etharp_cached_entry < ARP_TABLE_SIZE) {
-#endif /* LWIP_NETIF_HWADDRHINT */
-        if ((arp_table[etharp_cached_entry].state >= ETHARP_STATE_STABLE) &&
-#if ETHARP_TABLE_MATCH_NETIF
-            (arp_table[etharp_cached_entry].netif == netif) &&
-#endif
-            (ip4_addr_cmp(dst_addr, &arp_table[etharp_cached_entry].ipaddr))) {
-          /* the per-pcb-cached entry is stable and the right one! */
-          ETHARP_STATS_INC(etharp.cachehit);
-          return etharp_output_to_arp_index(netif, q, etharp_cached_entry);
-        }
-#if LWIP_NETIF_HWADDRHINT
-      }
-    }
-#endif /* LWIP_NETIF_HWADDRHINT */
-
-    /* find stable entry: do this here since this is a critical path for
-       throughput and etharp_find_entry() is kind of slow */
-    for (i = 0; i < ARP_TABLE_SIZE; i++) {
-      if ((arp_table[i].state >= ETHARP_STATE_STABLE) &&
-#if ETHARP_TABLE_MATCH_NETIF
-          (arp_table[i].netif == netif) &&
-#endif
-          (ip4_addr_cmp(dst_addr, &arp_table[i].ipaddr))) {
-        /* found an existing, stable entry */
-        ETHARP_SET_HINT(netif, i);
-        return etharp_output_to_arp_index(netif, q, i);
-      }
-    }
-    /* no stable entry found, use the (slower) query function:
-       queue on destination Ethernet address belonging to ipaddr */
-    return etharp_query(netif, dst_addr, q);
-  }
-
-  /* continuation for multicast/broadcast destinations */
-  /* obtain source Ethernet address of the given interface */
-  /* send packet directly on the link */
-  return ethernet_output(netif, q, (struct eth_addr*)(netif->hwaddr), dest, ETHTYPE_IP);
-}
-
-/**
- * Send an ARP request for the given IP address and/or queue a packet.
- *
- * If the IP address was not yet in the cache, a pending ARP cache entry
- * is added and an ARP request is sent for the given address. The packet
- * is queued on this entry.
- *
- * If the IP address was already pending in the cache, a new ARP request
- * is sent for the given address. The packet is queued on this entry.
- *
- * If the IP address was already stable in the cache, and a packet is
- * given, it is directly sent and no ARP request is sent out.
- *
- * If the IP address was already stable in the cache, and no packet is
- * given, an ARP request is sent out.
- *
- * @param netif The lwIP network interface on which ipaddr
- * must be queried for.
- * @param ipaddr The IP address to be resolved.
- * @param q If non-NULL, a pbuf that must be delivered to the IP address.
- * q is not freed by this function.
- *
- * @note q must only be ONE packet, not a packet queue!
- *
- * @return
- * - ERR_BUF Could not make room for Ethernet header.
- * - ERR_MEM Hardware address unknown, and no more ARP entries available
- *   to query for address or queue the packet.
- * - ERR_MEM Could not queue packet due to memory shortage.
- * - ERR_RTE No route to destination (no gateway to external networks).
- * - ERR_ARG Non-unicast address given, those will not appear in ARP cache.
- *
- */
-err_t
-etharp_query(struct netif *netif, const ip4_addr_t *ipaddr, struct pbuf *q)
-{
-  struct eth_addr * srcaddr = (struct eth_addr *)netif->hwaddr;
-  err_t result = ERR_MEM;
-  int is_new_entry = 0;
-  s8_t i; /* ARP entry index */
-
-  /* non-unicast address? */
-  if (ip4_addr_isbroadcast(ipaddr, netif) ||
-      ip4_addr_ismulticast(ipaddr) ||
-      ip4_addr_isany(ipaddr)) {
-    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: will not add non-unicast IP address to ARP cache\n"));
-    return ERR_ARG;
-  }
-
-  /* find entry in ARP cache, ask to create entry if queueing packet */
-  i = etharp_find_entry(ipaddr, ETHARP_FLAG_TRY_HARD, netif);
-
-  /* could not find or create entry? */
-  if (i < 0) {
-    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not create ARP entry\n"));
-    if (q) {
-      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: packet dropped\n"));
-      ETHARP_STATS_INC(etharp.memerr);
-    }
-    return (err_t)i;
-  }
-
-  /* mark a fresh entry as pending (we just sent a request) */
-  if (arp_table[i].state == ETHARP_STATE_EMPTY) {
-    is_new_entry = 1;
-    arp_table[i].state = ETHARP_STATE_PENDING;
-    /* record network interface for re-sending arp request in etharp_tmr */
-    arp_table[i].netif = netif;
-  }
-
-  /* { i is either a STABLE or (new or existing) PENDING entry } */
-  LWIP_ASSERT("arp_table[i].state == PENDING or STABLE",
-  ((arp_table[i].state == ETHARP_STATE_PENDING) ||
-   (arp_table[i].state >= ETHARP_STATE_STABLE)));
-
-  /* do we have a new entry? or an implicit query request? */
-  if (is_new_entry || (q == NULL)) {
-    /* try to resolve it; send out ARP request */
-    result = etharp_request(netif, ipaddr);
-    if (result != ERR_OK) {
-      /* ARP request couldn't be sent */
-      /* We don't re-send arp request in etharp_tmr, but we still queue packets,
-         since this failure could be temporary, and the next packet calling
-         etharp_query again could lead to sending the queued packets. */
-    }
-    if (q == NULL) {
-      return result;
-    }
-  }
-
-  /* packet given? */
-  LWIP_ASSERT("q != NULL", q != NULL);
-  /* stable entry? */
-  if (arp_table[i].state >= ETHARP_STATE_STABLE) {
-    /* we have a valid IP->Ethernet address mapping */
-    ETHARP_SET_HINT(netif, i);
-    /* send the packet */
-    result = ethernet_output(netif, q, srcaddr, &(arp_table[i].ethaddr), ETHTYPE_IP);
-  /* pending entry? (either just created or already pending */
-  } else if (arp_table[i].state == ETHARP_STATE_PENDING) {
-    /* entry is still pending, queue the given packet 'q' */
-    struct pbuf *p;
-    int copy_needed = 0;
-    /* IF q includes a PBUF_REF, PBUF_POOL or PBUF_RAM, we have no choice but
-     * to copy the whole queue into a new PBUF_RAM (see bug #11400)
-     * PBUF_ROMs can be left as they are, since ROM must not get changed. */
-    p = q;
-    while (p) {
-      LWIP_ASSERT("no packet queues allowed!", (p->len != p->tot_len) || (p->next == 0));
-      if (p->type != PBUF_ROM) {
-        copy_needed = 1;
-        break;
-      }
-      p = p->next;
-    }
-    if (copy_needed) {
-      /* copy the whole packet into new pbufs */
-      p = pbuf_alloc(PBUF_LINK, p->tot_len, PBUF_RAM);
-      if (p != NULL) {
-        if (pbuf_copy(p, q) != ERR_OK) {
-          pbuf_free(p);
-          p = NULL;
-        }
-      }
-    } else {
-      /* referencing the old pbuf is enough */
-      p = q;
-      pbuf_ref(p);
-    }
-    /* packet could be taken over? */
-    if (p != NULL) {
-      /* queue packet ... */
-#if ARP_QUEUEING
-      struct etharp_q_entry *new_entry;
-      /* allocate a new arp queue entry */
-      new_entry = (struct etharp_q_entry *)memp_malloc(MEMP_ARP_QUEUE);
-      if (new_entry != NULL) {
-        unsigned int qlen = 0;
-        new_entry->next = 0;
-        new_entry->p = p;
-        if (arp_table[i].q != NULL) {
-          /* queue was already existent, append the new entry to the end */
-          struct etharp_q_entry *r;
-          r = arp_table[i].q;
-          qlen++;
-          while (r->next != NULL) {
-            r = r->next;
-            qlen++;
-          }
-          r->next = new_entry;
-        } else {
-          /* queue did not exist, first item in queue */
-          arp_table[i].q = new_entry;
-        }
-#if ARP_QUEUE_LEN
-        if (qlen >= ARP_QUEUE_LEN) {
-          struct etharp_q_entry *old;
-          old = arp_table[i].q;
-          arp_table[i].q = arp_table[i].q->next;
-          pbuf_free(old->p);
-          memp_free(MEMP_ARP_QUEUE, old);
-        }
-#endif
-        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: queued packet %p on ARP entry %"S16_F"\n", (void *)q, (s16_t)i));
-        result = ERR_OK;
-      } else {
-        /* the pool MEMP_ARP_QUEUE is empty */
-        pbuf_free(p);
-        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not queue a copy of PBUF_REF packet %p (out of memory)\n", (void *)q));
-        result = ERR_MEM;
-      }
-#else /* ARP_QUEUEING */
-      /* always queue one packet per ARP request only, freeing a previously queued packet */
-      if (arp_table[i].q != NULL) {
-        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: dropped previously queued packet %p for ARP entry %"S16_F"\n", (void *)q, (s16_t)i));
-        pbuf_free(arp_table[i].q);
-      }
-      arp_table[i].q = p;
-      result = ERR_OK;
-      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: queued packet %p on ARP entry %"S16_F"\n", (void *)q, (s16_t)i));
-#endif /* ARP_QUEUEING */
-    } else {
-      ETHARP_STATS_INC(etharp.memerr);
-      LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_query: could not queue a copy of PBUF_REF packet %p (out of memory)\n", (void *)q));
-      result = ERR_MEM;
-    }
-  }
-  return result;
-}
-
-/**
- * Send a raw ARP packet (opcode and all addresses can be modified)
- *
- * @param netif the lwip network interface on which to send the ARP packet
- * @param ethsrc_addr the source MAC address for the ethernet header
- * @param ethdst_addr the destination MAC address for the ethernet header
- * @param hwsrc_addr the source MAC address for the ARP protocol header
- * @param ipsrc_addr the source IP address for the ARP protocol header
- * @param hwdst_addr the destination MAC address for the ARP protocol header
- * @param ipdst_addr the destination IP address for the ARP protocol header
- * @param opcode the type of the ARP packet
- * @return ERR_OK if the ARP packet has been sent
- *         ERR_MEM if the ARP packet couldn't be allocated
- *         any other err_t on failure
- */
-static err_t
-etharp_raw(struct netif *netif, const struct eth_addr *ethsrc_addr,
-           const struct eth_addr *ethdst_addr,
-           const struct eth_addr *hwsrc_addr, const ip4_addr_t *ipsrc_addr,
-           const struct eth_addr *hwdst_addr, const ip4_addr_t *ipdst_addr,
-           const u16_t opcode)
-{
-  struct pbuf *p;
-  err_t result = ERR_OK;
-  struct etharp_hdr *hdr;
-
-  LWIP_ASSERT("netif != NULL", netif != NULL);
-
-  /* allocate a pbuf for the outgoing ARP request packet */
-  p = pbuf_alloc(PBUF_LINK, SIZEOF_ETHARP_HDR, PBUF_RAM);
-  /* could allocate a pbuf for an ARP request? */
-  if (p == NULL) {
-    LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
-      ("etharp_raw: could not allocate pbuf for ARP request.\n"));
-    ETHARP_STATS_INC(etharp.memerr);
-    return ERR_MEM;
-  }
-  LWIP_ASSERT("check that first pbuf can hold struct etharp_hdr",
-              (p->len >= SIZEOF_ETHARP_HDR));
-
-  hdr = (struct etharp_hdr *)p->payload;
-  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_raw: sending raw ARP packet.\n"));
-  hdr->opcode = lwip_htons(opcode);
-
-  LWIP_ASSERT("netif->hwaddr_len must be the same as ETH_HWADDR_LEN for etharp!",
-              (netif->hwaddr_len == ETH_HWADDR_LEN));
-
-  /* Write the ARP MAC-Addresses */
-  ETHADDR16_COPY(&hdr->shwaddr, hwsrc_addr);
-  ETHADDR16_COPY(&hdr->dhwaddr, hwdst_addr);
-  /* Copy struct ip4_addr2 to aligned ip4_addr, to support compilers without
-   * structure packing. */
-  IPADDR2_COPY(&hdr->sipaddr, ipsrc_addr);
-  IPADDR2_COPY(&hdr->dipaddr, ipdst_addr);
-
-  hdr->hwtype = PP_HTONS(HWTYPE_ETHERNET);
-  hdr->proto = PP_HTONS(ETHTYPE_IP);
-  /* set hwlen and protolen */
-  hdr->hwlen = ETH_HWADDR_LEN;
-  hdr->protolen = sizeof(ip4_addr_t);
-
-  /* send ARP query */
-#if LWIP_AUTOIP
-  /* If we are using Link-Local, all ARP packets that contain a Link-Local
-   * 'sender IP address' MUST be sent using link-layer broadcast instead of
-   * link-layer unicast. (See RFC3927 Section 2.5, last paragraph) */
-  if(ip4_addr_islinklocal(ipsrc_addr)) {
-    ethernet_output(netif, p, ethsrc_addr, &ethbroadcast, ETHTYPE_ARP);
-  } else
-#endif /* LWIP_AUTOIP */
-  {
-    ethernet_output(netif, p, ethsrc_addr, ethdst_addr, ETHTYPE_ARP);
-  }
-
-  ETHARP_STATS_INC(etharp.xmit);
-  /* free ARP query packet */
-  pbuf_free(p);
-  p = NULL;
-  /* could not allocate pbuf for ARP request */
-
-  return result;
-}
-
-/**
- * Send an ARP request packet asking for ipaddr to a specific eth address.
- * Used to send unicast request to refresh the ARP table just before an entry
- * times out
- *
- * @param netif the lwip network interface on which to send the request
- * @param ipaddr the IP address for which to ask
- * @param hw_dst_addr the ethernet address to send this packet to
- * @return ERR_OK if the request has been sent
- *         ERR_MEM if the ARP packet couldn't be allocated
- *         any other err_t on failure
- */
-static err_t
-etharp_request_dst(struct netif *netif, const ip4_addr_t *ipaddr, const struct eth_addr* hw_dst_addr)
-{
-  return etharp_raw(netif, (struct eth_addr *)netif->hwaddr, hw_dst_addr,
-                    (struct eth_addr *)netif->hwaddr, netif_ip4_addr(netif), &ethzero,
-                    ipaddr, ARP_REQUEST);
-}
-
-/**
- * Send an ARP request packet asking for ipaddr.
- *
- * @param netif the lwip network interface on which to send the request
- * @param ipaddr the IP address for which to ask
- * @return ERR_OK if the request has been sent
- *         ERR_MEM if the ARP packet couldn't be allocated
- *         any other err_t on failure
- */
-err_t
-etharp_request(struct netif *netif, const ip4_addr_t *ipaddr)
-{
-  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("etharp_request: sending ARP request.\n"));
-  return etharp_request_dst(netif, ipaddr, &ethbroadcast);
-}
-#endif /* LWIP_IPV4 && LWIP_ARP */
-
-#endif /* LWIP_ARP || LWIP_ETHERNET */
diff --git a/sys/net/core/ipv4/icmp.c b/sys/net/core/ipv4/icmp.c
deleted file mode 100644
index ebb9254..0000000
--- a/sys/net/core/ipv4/icmp.c
+++ /dev/null
@@ -1,397 +0,0 @@
-/**
- * @file
- * ICMP - Internet Control Message Protocol
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-/* Some ICMP messages should be passed to the transport protocols. This
-   is not implemented. */
-
-#include "net/opt.h"
-
-#if LWIP_IPV4 && LWIP_ICMP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/icmp.h"
-#include "net/inet_chksum.h"
-#include "net/ip.h"
-#include "net/def.h"
-#include "net/stats.h"
-
-#include <string.h>
-
-#ifdef LWIP_HOOK_FILENAME
-#include LWIP_HOOK_FILENAME
-#endif
-
-/** Small optimization: set to 0 if incoming PBUF_POOL pbuf always can be
- * used to modify and send a response packet (and to 1 if this is not the case,
- * e.g. when link header is stripped of when receiving) */
-#ifndef LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN
-#define LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN 1
-#endif /* LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN */
-
-/* The amount of data from the original packet to return in a dest-unreachable */
-#define ICMP_DEST_UNREACH_DATASIZE 8
-
-static void icmp_send_response(struct pbuf *p, u8_t type, u8_t code);
-
-/**
- * Processes ICMP input packets, called from ip_input().
- *
- * Currently only processes icmp echo requests and sends
- * out the echo response.
- *
- * @param p the icmp echo request packet, p->payload pointing to the icmp header
- * @param inp the netif on which this packet was received
- */
-void
-icmp_input(struct pbuf *p, struct netif *inp)
-{
-  u8_t type;
-#ifdef LWIP_DEBUG
-  u8_t code;
-#endif /* LWIP_DEBUG */
-  struct icmp_echo_hdr *iecho;
-  const struct ip_hdr *iphdr_in;
-  u16_t hlen;
-  const ip4_addr_t* src;
-
-  ICMP_STATS_INC(icmp.recv);
-  MIB2_STATS_INC(mib2.icmpinmsgs);
-
-  iphdr_in = ip4_current_header();
-  hlen = IPH_HL(iphdr_in) * 4;
-  if (hlen < IP_HLEN) {
-    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: short IP header (%"S16_F" bytes) received\n", hlen));
-    goto lenerr;
-  }
-  if (p->len < sizeof(u16_t)*2) {
-    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: short ICMP (%"U16_F" bytes) received\n", p->tot_len));
-    goto lenerr;
-  }
-
-  type = *((u8_t *)p->payload);
-#ifdef LWIP_DEBUG
-  code = *(((u8_t *)p->payload)+1);
-#endif /* LWIP_DEBUG */
-  switch (type) {
-  case ICMP_ER:
-    /* This is OK, echo reply might have been parsed by a raw PCB
-       (as obviously, an echo request has been sent, too). */
-    MIB2_STATS_INC(mib2.icmpinechoreps);
-    break;
-  case ICMP_ECHO:
-    MIB2_STATS_INC(mib2.icmpinechos);
-    src = ip4_current_dest_addr();
-    /* multicast destination address? */
-    if (ip4_addr_ismulticast(ip4_current_dest_addr())) {
-#if LWIP_MULTICAST_PING
-      /* For multicast, use address of receiving interface as source address */
-      src = netif_ip4_addr(inp);
-#else /* LWIP_MULTICAST_PING */
-      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: Not echoing to multicast pings\n"));
-      goto icmperr;
-#endif /* LWIP_MULTICAST_PING */
-    }
-    /* broadcast destination address? */
-    if (ip4_addr_isbroadcast(ip4_current_dest_addr(), ip_current_netif())) {
-#if LWIP_BROADCAST_PING
-      /* For broadcast, use address of receiving interface as source address */
-      src = netif_ip4_addr(inp);
-#else /* LWIP_BROADCAST_PING */
-      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: Not echoing to broadcast pings\n"));
-      goto icmperr;
-#endif /* LWIP_BROADCAST_PING */
-    }
-    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ping\n"));
-    if (p->tot_len < sizeof(struct icmp_echo_hdr)) {
-      LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: bad ICMP echo received\n"));
-      goto lenerr;
-    }
-#if CHECKSUM_CHECK_ICMP
-    IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_CHECK_ICMP) {
-      if (inet_chksum_pbuf(p) != 0) {
-        LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: checksum failed for received ICMP echo\n"));
-        pbuf_free(p);
-        ICMP_STATS_INC(icmp.chkerr);
-        MIB2_STATS_INC(mib2.icmpinerrors);
-        return;
-      }
-    }
-#endif
-#if LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN
-    if (pbuf_header(p, (s16_t)(hlen + PBUF_LINK_HLEN + PBUF_LINK_ENCAPSULATION_HLEN))) {
-      /* p is not big enough to contain link headers
-       * allocate a new one and copy p into it
-       */
-      struct pbuf *r;
-      /* allocate new packet buffer with space for link headers */
-      r = pbuf_alloc(PBUF_LINK, p->tot_len + hlen, PBUF_RAM);
-      if (r == NULL) {
-        LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: allocating new pbuf failed\n"));
-        goto icmperr;
-      }
-      if (r->len < hlen + sizeof(struct icmp_echo_hdr)) {
-        LWIP_DEBUGF(ICMP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("first pbuf cannot hold the ICMP header"));
-        pbuf_free(r);
-        goto icmperr;
-      }
-      /* copy the ip header */
-      MEMCPY(r->payload, iphdr_in, hlen);
-      /* switch r->payload back to icmp header (cannot fail) */
-      if (pbuf_header(r, (s16_t)-hlen)) {
-        LWIP_ASSERT("icmp_input: moving r->payload to icmp header failed\n", 0);
-        pbuf_free(r);
-        goto icmperr;
-      }
-      /* copy the rest of the packet without ip header */
-      if (pbuf_copy(r, p) != ERR_OK) {
-        LWIP_DEBUGF(ICMP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("icmp_input: copying to new pbuf failed"));
-        pbuf_free(r);
-        goto icmperr;
-      }
-      /* free the original p */
-      pbuf_free(p);
-      /* we now have an identical copy of p that has room for link headers */
-      p = r;
-    } else {
-      /* restore p->payload to point to icmp header (cannot fail) */
-      if (pbuf_header(p, -(s16_t)(hlen + PBUF_LINK_HLEN + PBUF_LINK_ENCAPSULATION_HLEN))) {
-        LWIP_ASSERT("icmp_input: restoring original p->payload failed\n", 0);
-        goto icmperr;
-      }
-    }
-#endif /* LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN */
-    /* At this point, all checks are OK. */
-    /* We generate an answer by switching the dest and src ip addresses,
-     * setting the icmp type to ECHO_RESPONSE and updating the checksum. */
-    iecho = (struct icmp_echo_hdr *)p->payload;
-    if (pbuf_header(p, (s16_t)hlen)) {
-      LWIP_DEBUGF(ICMP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("Can't move over header in packet"));
-    } else {
-      err_t ret;
-      struct ip_hdr *iphdr = (struct ip_hdr*)p->payload;
-      ip4_addr_copy(iphdr->src, *src);
-      ip4_addr_copy(iphdr->dest, *ip4_current_src_addr());
-      ICMPH_TYPE_SET(iecho, ICMP_ER);
-#if CHECKSUM_GEN_ICMP
-      IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_GEN_ICMP) {
-        /* adjust the checksum */
-        if (iecho->chksum > PP_HTONS(0xffffU - (ICMP_ECHO << 8))) {
-          iecho->chksum += PP_HTONS(ICMP_ECHO << 8) + 1;
-        } else {
-          iecho->chksum += PP_HTONS(ICMP_ECHO << 8);
-        }
-      }
-#if LWIP_CHECKSUM_CTRL_PER_NETIF
-      else {
-        iecho->chksum = 0;
-      }
-#endif /* LWIP_CHECKSUM_CTRL_PER_NETIF */
-#else /* CHECKSUM_GEN_ICMP */
-      iecho->chksum = 0;
-#endif /* CHECKSUM_GEN_ICMP */
-
-      /* Set the correct TTL and recalculate the header checksum. */
-      IPH_TTL_SET(iphdr, ICMP_TTL);
-      IPH_CHKSUM_SET(iphdr, 0);
-#if CHECKSUM_GEN_IP
-      IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_GEN_IP) {
-        IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, hlen));
-      }
-#endif /* CHECKSUM_GEN_IP */
-
-      ICMP_STATS_INC(icmp.xmit);
-      /* increase number of messages attempted to send */
-      MIB2_STATS_INC(mib2.icmpoutmsgs);
-      /* increase number of echo replies attempted to send */
-      MIB2_STATS_INC(mib2.icmpoutechoreps);
-
-      /* send an ICMP packet */
-      ret = ip4_output_if(p, src, LWIP_IP_HDRINCL,
-                   ICMP_TTL, 0, IP_PROTO_ICMP, inp);
-      if (ret != ERR_OK) {
-        LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ip_output_if returned an error: %s\n", lwip_strerr(ret)));
-      }
-    }
-    break;
-  default:
-    if (type == ICMP_DUR) {
-      MIB2_STATS_INC(mib2.icmpindestunreachs);
-    } else if (type == ICMP_TE) {
-      MIB2_STATS_INC(mib2.icmpintimeexcds);
-    } else if (type == ICMP_PP) {
-      MIB2_STATS_INC(mib2.icmpinparmprobs);
-    } else if (type == ICMP_SQ) {
-      MIB2_STATS_INC(mib2.icmpinsrcquenchs);
-    } else if (type == ICMP_RD) {
-      MIB2_STATS_INC(mib2.icmpinredirects);
-    } else if (type == ICMP_TS) {
-      MIB2_STATS_INC(mib2.icmpintimestamps);
-    } else if (type == ICMP_TSR) {
-      MIB2_STATS_INC(mib2.icmpintimestampreps);
-    } else if (type == ICMP_AM) {
-      MIB2_STATS_INC(mib2.icmpinaddrmasks);
-    } else if (type == ICMP_AMR) {
-      MIB2_STATS_INC(mib2.icmpinaddrmaskreps);
-    }
-    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_input: ICMP type %"S16_F" code %"S16_F" not supported.\n",
-                (s16_t)type, (s16_t)code));
-    ICMP_STATS_INC(icmp.proterr);
-    ICMP_STATS_INC(icmp.drop);
-  }
-  pbuf_free(p);
-  return;
-lenerr:
-  pbuf_free(p);
-  ICMP_STATS_INC(icmp.lenerr);
-  MIB2_STATS_INC(mib2.icmpinerrors);
-  return;
-#if LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN || !LWIP_MULTICAST_PING || !LWIP_BROADCAST_PING
-icmperr:
-  pbuf_free(p);
-  ICMP_STATS_INC(icmp.err);
-  MIB2_STATS_INC(mib2.icmpinerrors);
-  return;
-#endif /* LWIP_ICMP_ECHO_CHECK_INPUT_PBUF_LEN || !LWIP_MULTICAST_PING || !LWIP_BROADCAST_PING */
-}
-
-/**
- * Send an icmp 'destination unreachable' packet, called from ip_input() if
- * the transport layer protocol is unknown and from udp_input() if the local
- * port is not bound.
- *
- * @param p the input packet for which the 'unreachable' should be sent,
- *          p->payload pointing to the IP header
- * @param t type of the 'unreachable' packet
- */
-void
-icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t)
-{
-  MIB2_STATS_INC(mib2.icmpoutdestunreachs);
-  icmp_send_response(p, ICMP_DUR, t);
-}
-
-#if IP_FORWARD || IP_REASSEMBLY
-/**
- * Send a 'time exceeded' packet, called from ip_forward() if TTL is 0.
- *
- * @param p the input packet for which the 'time exceeded' should be sent,
- *          p->payload pointing to the IP header
- * @param t type of the 'time exceeded' packet
- */
-void
-icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t)
-{
-  MIB2_STATS_INC(mib2.icmpouttimeexcds);
-  icmp_send_response(p, ICMP_TE, t);
-}
-
-#endif /* IP_FORWARD || IP_REASSEMBLY */
-
-/**
- * Send an icmp packet in response to an incoming packet.
- *
- * @param p the input packet for which the 'unreachable' should be sent,
- *          p->payload pointing to the IP header
- * @param type Type of the ICMP header
- * @param code Code of the ICMP header
- */
-static void
-icmp_send_response(struct pbuf *p, u8_t type, u8_t code)
-{
-  struct pbuf *q;
-  struct ip_hdr *iphdr;
-  /* we can use the echo header here */
-  struct icmp_echo_hdr *icmphdr;
-  ip4_addr_t iphdr_src;
-  struct netif *netif;
-
-  /* increase number of messages attempted to send */
-  MIB2_STATS_INC(mib2.icmpoutmsgs);
-
-  /* ICMP header + IP header + 8 bytes of data */
-  q = pbuf_alloc(PBUF_IP, sizeof(struct icmp_echo_hdr) + IP_HLEN + ICMP_DEST_UNREACH_DATASIZE,
-                 PBUF_RAM);
-  if (q == NULL) {
-    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded: failed to allocate pbuf for ICMP packet.\n"));
-    MIB2_STATS_INC(mib2.icmpouterrors);
-    return;
-  }
-  LWIP_ASSERT("check that first pbuf can hold icmp message",
-             (q->len >= (sizeof(struct icmp_echo_hdr) + IP_HLEN + ICMP_DEST_UNREACH_DATASIZE)));
-
-  iphdr = (struct ip_hdr *)p->payload;
-  LWIP_DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded from "));
-  ip4_addr_debug_print_val(ICMP_DEBUG, iphdr->src);
-  LWIP_DEBUGF(ICMP_DEBUG, (" to "));
-  ip4_addr_debug_print_val(ICMP_DEBUG, iphdr->dest);
-  LWIP_DEBUGF(ICMP_DEBUG, ("\n"));
-
-  icmphdr = (struct icmp_echo_hdr *)q->payload;
-  icmphdr->type = type;
-  icmphdr->code = code;
-  icmphdr->id = 0;
-  icmphdr->seqno = 0;
-
-  /* copy fields from original packet */
-  SMEMCPY((u8_t *)q->payload + sizeof(struct icmp_echo_hdr), (u8_t *)p->payload,
-          IP_HLEN + ICMP_DEST_UNREACH_DATASIZE);
-
-  ip4_addr_copy(iphdr_src, iphdr->src);
-#ifdef LWIP_HOOK_IP4_ROUTE_SRC
-  {
-    ip4_addr_t iphdr_dst;
-    ip4_addr_copy(iphdr_dst, iphdr->dest);
-    netif = ip4_route_src(&iphdr_src, &iphdr_dst);
-  }
-#else
-  netif = ip4_route(&iphdr_src);
-#endif
-  if (netif != NULL) {
-    /* calculate checksum */
-    icmphdr->chksum = 0;
-#if CHECKSUM_GEN_ICMP
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_ICMP) {
-      icmphdr->chksum = inet_chksum(icmphdr, q->len);
-    }
-#endif
-    ICMP_STATS_INC(icmp.xmit);
-    ip4_output_if(q, NULL, &iphdr_src, ICMP_TTL, 0, IP_PROTO_ICMP, netif);
-  }
-  pbuf_free(q);
-}
-
-#endif /* LWIP_IPV4 && LWIP_ICMP */
diff --git a/sys/net/core/ipv4/igmp.c b/sys/net/core/ipv4/igmp.c
deleted file mode 100644
index da1a4ab..0000000
--- a/sys/net/core/ipv4/igmp.c
+++ /dev/null
@@ -1,800 +0,0 @@
-/**
- * @file
- * IGMP - Internet Group Management Protocol
- *
- * @defgroup igmp IGMP
- * @ingroup ip4
- * To be called from TCPIP thread
- */
-
-/*
- * Copyright (c) 2002 CITEL Technologies Ltd.
- * 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. Neither the name of CITEL Technologies Ltd 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 CITEL TECHNOLOGIES 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 CITEL TECHNOLOGIES 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.
- *
- * This file is a contribution to the lwIP TCP/IP stack.
- * The Swedish Institute of Computer Science and Adam Dunkels
- * are specifically granted permission to redistribute this
- * source code.
-*/
-
-/*-------------------------------------------------------------
-Note 1)
-Although the rfc requires V1 AND V2 capability
-we will only support v2 since now V1 is very old (August 1989)
-V1 can be added if required
-
-a debug print and statistic have been implemented to
-show this up.
--------------------------------------------------------------
--------------------------------------------------------------
-Note 2)
-A query for a specific group address (as opposed to ALLHOSTS)
-has now been implemented as I am unsure if it is required
-
-a debug print and statistic have been implemented to
-show this up.
--------------------------------------------------------------
--------------------------------------------------------------
-Note 3)
-The router alert rfc 2113 is implemented in outgoing packets
-but not checked rigorously incoming
--------------------------------------------------------------
-Steve Reynolds
-------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * RFC 988  - Host extensions for IP multicasting                         - V0
- * RFC 1054 - Host extensions for IP multicasting                         -
- * RFC 1112 - Host extensions for IP multicasting                         - V1
- * RFC 2236 - Internet Group Management Protocol, Version 2               - V2  <- this code is based on this RFC (it's the "de facto" standard)
- * RFC 3376 - Internet Group Management Protocol, Version 3               - V3
- * RFC 4604 - Using Internet Group Management Protocol Version 3...       - V3+
- * RFC 2113 - IP Router Alert Option                                      -
- *----------------------------------------------------------------------------*/
-
-/*-----------------------------------------------------------------------------
- * Includes
- *----------------------------------------------------------------------------*/
-
-#include "net/opt.h"
-
-#if LWIP_IPV4 && LWIP_IGMP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/igmp.h"
-#include "net/debug.h"
-#include "net/def.h"
-#include "net/mem.h"
-#include "net/ip.h"
-#include "net/inet_chksum.h"
-#include "net/netif.h"
-#include "net/stats.h"
-#include "net/prot/igmp.h"
-
-#include "string.h"
-
-static struct igmp_group *igmp_lookup_group(struct netif *ifp, const ip4_addr_t *addr);
-static err_t  igmp_remove_group(struct netif* netif, struct igmp_group *group);
-static void   igmp_timeout(struct netif *netif, struct igmp_group *group);
-static void   igmp_start_timer(struct igmp_group *group, u8_t max_time);
-static void   igmp_delaying_member(struct igmp_group *group, u8_t maxresp);
-static err_t  igmp_ip_output_if(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest, struct netif *netif);
-static void   igmp_send(struct netif *netif, struct igmp_group *group, u8_t type);
-
-static ip4_addr_t     allsystems;
-static ip4_addr_t     allrouters;
-
-/**
- * Initialize the IGMP module
- */
-void
-igmp_init(void)
-{
-  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_init: initializing\n"));
-
-  IP4_ADDR(&allsystems, 224, 0, 0, 1);
-  IP4_ADDR(&allrouters, 224, 0, 0, 2);
-}
-
-/**
- * Start IGMP processing on interface
- *
- * @param netif network interface on which start IGMP processing
- */
-err_t
-igmp_start(struct netif *netif)
-{
-  struct igmp_group* group;
-
-  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_start: starting IGMP processing on if %p\n", (void*)netif));
-
-  group = igmp_lookup_group(netif, &allsystems);
-
-  if (group != NULL) {
-    group->group_state = IGMP_GROUP_IDLE_MEMBER;
-    group->use++;
-
-    /* Allow the igmp messages at the MAC level */
-    if (netif->igmp_mac_filter != NULL) {
-      LWIP_DEBUGF(IGMP_DEBUG, ("igmp_start: igmp_mac_filter(ADD "));
-      ip4_addr_debug_print_val(IGMP_DEBUG, allsystems);
-      LWIP_DEBUGF(IGMP_DEBUG, (") on if %p\n", (void*)netif));
-      netif->igmp_mac_filter(netif, &allsystems, NETIF_ADD_MAC_FILTER);
-    }
-
-    return ERR_OK;
-  }
-
-  return ERR_MEM;
-}
-
-/**
- * Stop IGMP processing on interface
- *
- * @param netif network interface on which stop IGMP processing
- */
-err_t
-igmp_stop(struct netif *netif)
-{
-  struct igmp_group *group = netif_igmp_data(netif);
-
-  netif_set_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_IGMP, NULL);
-
-  while (group != NULL) {
-    struct igmp_group *next = group->next; /* avoid use-after-free below */
-
-    /* disable the group at the MAC level */
-    if (netif->igmp_mac_filter != NULL) {
-      LWIP_DEBUGF(IGMP_DEBUG, ("igmp_stop: igmp_mac_filter(DEL "));
-      ip4_addr_debug_print(IGMP_DEBUG, &group->group_address);
-      LWIP_DEBUGF(IGMP_DEBUG, (") on if %p\n", (void*)netif));
-      netif->igmp_mac_filter(netif, &(group->group_address), NETIF_DEL_MAC_FILTER);
-    }
-
-    /* free group */
-    memp_free(MEMP_IGMP_GROUP, group);
-
-    /* move to "next" */
-    group = next;
-  }
-  return ERR_OK;
-}
-
-/**
- * Report IGMP memberships for this interface
- *
- * @param netif network interface on which report IGMP memberships
- */
-void
-igmp_report_groups(struct netif *netif)
-{
-  struct igmp_group *group = netif_igmp_data(netif);
-
-  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_report_groups: sending IGMP reports on if %p\n", (void*)netif));
-
-  /* Skip the first group in the list, it is always the allsystems group added in igmp_start() */
-  if(group != NULL) {
-    group = group->next;
-  }
-  
-  while (group != NULL) {
-    igmp_delaying_member(group, IGMP_JOIN_DELAYING_MEMBER_TMR);
-    group = group->next;
-  }
-}
-
-/**
- * Search for a group in the global igmp_group_list
- *
- * @param ifp the network interface for which to look
- * @param addr the group ip address to search for
- * @return a struct igmp_group* if the group has been found,
- *         NULL if the group wasn't found.
- */
-struct igmp_group *
-igmp_lookfor_group(struct netif *ifp, const ip4_addr_t *addr)
-{
-  struct igmp_group *group = netif_igmp_data(ifp);
-
-  while (group != NULL) {
-    if (ip4_addr_cmp(&(group->group_address), addr)) {
-      return group;
-    }
-    group = group->next;
-  }
-
-  /* to be clearer, we return NULL here instead of
-   * 'group' (which is also NULL at this point).
-   */
-  return NULL;
-}
-
-/**
- * Search for a specific igmp group and create a new one if not found-
- *
- * @param ifp the network interface for which to look
- * @param addr the group ip address to search
- * @return a struct igmp_group*,
- *         NULL on memory error.
- */
-static struct igmp_group *
-igmp_lookup_group(struct netif *ifp, const ip4_addr_t *addr)
-{
-  struct igmp_group *group;
-  struct igmp_group *list_head = netif_igmp_data(ifp);
-
-  /* Search if the group already exists */
-  group = igmp_lookfor_group(ifp, addr);
-  if (group != NULL) {
-    /* Group already exists. */
-    return group;
-  }
-  
-  /* Group doesn't exist yet, create a new one */
-  group = (struct igmp_group *)memp_malloc(MEMP_IGMP_GROUP);
-  if (group != NULL) {
-    ip4_addr_set(&(group->group_address), addr);
-    group->timer              = 0; /* Not running */
-    group->group_state        = IGMP_GROUP_NON_MEMBER;
-    group->last_reporter_flag = 0;
-    group->use                = 0;
-
-    /* Ensure allsystems group is always first in list */    
-    if (list_head == NULL) {
-      /* this is the first entry in linked list */
-      LWIP_ASSERT("igmp_lookup_group: first group must be allsystems",
-        (ip4_addr_cmp(addr, &allsystems) != 0));
-      group->next = NULL;
-      netif_set_client_data(ifp, LWIP_NETIF_CLIENT_DATA_INDEX_IGMP, group);
-    } else {
-      /* append _after_ first entry */
-      LWIP_ASSERT("igmp_lookup_group: all except first group must not be allsystems",
-        (ip4_addr_cmp(addr, &allsystems) == 0));
-      group->next = list_head->next;
-      list_head->next = group;
-    }
-  }
-
-  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_lookup_group: %sallocated a new group with address ", (group?"":"impossible to ")));
-  ip4_addr_debug_print(IGMP_DEBUG, addr);
-  LWIP_DEBUGF(IGMP_DEBUG, (" on if %p\n", (void*)ifp));
-
-  return group;
-}
-
-/**
- * Remove a group in the global igmp_group_list, but don't free it yet
- *
- * @param group the group to remove from the global igmp_group_list
- * @return ERR_OK if group was removed from the list, an err_t otherwise
- */
-static err_t
-igmp_remove_group(struct netif* netif, struct igmp_group *group)
-{
-  err_t err = ERR_OK;
-  struct igmp_group *tmp_group;
-
-  /* Skip the first group in the list, it is always the allsystems group added in igmp_start() */
-  for (tmp_group = netif_igmp_data(netif); tmp_group != NULL; tmp_group = tmp_group->next) {
-    if (tmp_group->next == group) {
-      tmp_group->next = group->next;
-      break;
-    }
-  }
-  /* Group not found in the global igmp_group_list */
-  if (tmp_group == NULL) {
-    err = ERR_ARG;
-  }
-
-  return err;
-}
-
-/**
- * Called from ip_input() if a new IGMP packet is received.
- *
- * @param p received igmp packet, p->payload pointing to the igmp header
- * @param inp network interface on which the packet was received
- * @param dest destination ip address of the igmp packet
- */
-void
-igmp_input(struct pbuf *p, struct netif *inp, const ip4_addr_t *dest)
-{
-  struct igmp_msg*   igmp;
-  struct igmp_group* group;
-  struct igmp_group* groupref;
-
-  IGMP_STATS_INC(igmp.recv);
-
-  /* Note that the length CAN be greater than 8 but only 8 are used - All are included in the checksum */
-  if (p->len < IGMP_MINLEN) {
-    pbuf_free(p);
-    IGMP_STATS_INC(igmp.lenerr);
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: length error\n"));
-    return;
-  }
-
-  LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: message from "));
-  ip4_addr_debug_print(IGMP_DEBUG, &(ip4_current_header()->src));
-  LWIP_DEBUGF(IGMP_DEBUG, (" to address "));
-  ip4_addr_debug_print(IGMP_DEBUG, &(ip4_current_header()->dest));
-  LWIP_DEBUGF(IGMP_DEBUG, (" on if %p\n", (void*)inp));
-
-  /* Now calculate and check the checksum */
-  igmp = (struct igmp_msg *)p->payload;
-  if (inet_chksum(igmp, p->len)) {
-    pbuf_free(p);
-    IGMP_STATS_INC(igmp.chkerr);
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: checksum error\n"));
-    return;
-  }
-
-  /* Packet is ok so find an existing group */
-  group = igmp_lookfor_group(inp, dest); /* use the destination IP address of incoming packet */
-
-  /* If group can be found or create... */
-  if (!group) {
-    pbuf_free(p);
-    IGMP_STATS_INC(igmp.drop);
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: IGMP frame not for us\n"));
-    return;
-  }
-
-  /* NOW ACT ON THE INCOMING MESSAGE TYPE... */
-  switch (igmp->igmp_msgtype) {
-  case IGMP_MEMB_QUERY:
-    /* IGMP_MEMB_QUERY to the "all systems" address ? */
-    if ((ip4_addr_cmp(dest, &allsystems)) && ip4_addr_isany(&igmp->igmp_group_address)) {
-      /* THIS IS THE GENERAL QUERY */
-      LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: General IGMP_MEMB_QUERY on \"ALL SYSTEMS\" address (224.0.0.1) [igmp_maxresp=%i]\n", (int)(igmp->igmp_maxresp)));
-
-      if (igmp->igmp_maxresp == 0) {
-        IGMP_STATS_INC(igmp.rx_v1);
-        LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: got an all hosts query with time== 0 - this is V1 and not implemented - treat as v2\n"));
-        igmp->igmp_maxresp = IGMP_V1_DELAYING_MEMBER_TMR;
-      } else {
-        IGMP_STATS_INC(igmp.rx_general);
-      }
-
-      groupref = netif_igmp_data(inp);
-      
-      /* Do not send messages on the all systems group address! */
-      /* Skip the first group in the list, it is always the allsystems group added in igmp_start() */
-      if(groupref != NULL) {
-        groupref = groupref->next;
-      }
-
-      while (groupref) {
-        igmp_delaying_member(groupref, igmp->igmp_maxresp);
-        groupref = groupref->next;
-      }
-    } else {
-      /* IGMP_MEMB_QUERY to a specific group ? */
-      if (!ip4_addr_isany(&igmp->igmp_group_address)) {
-        LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: IGMP_MEMB_QUERY to a specific group "));
-        ip4_addr_debug_print(IGMP_DEBUG, &igmp->igmp_group_address);
-        if (ip4_addr_cmp(dest, &allsystems)) {
-          ip4_addr_t groupaddr;
-          LWIP_DEBUGF(IGMP_DEBUG, (" using \"ALL SYSTEMS\" address (224.0.0.1) [igmp_maxresp=%i]\n", (int)(igmp->igmp_maxresp)));
-          /* we first need to re-look for the group since we used dest last time */
-          ip4_addr_copy(groupaddr, igmp->igmp_group_address);
-          group = igmp_lookfor_group(inp, &groupaddr);
-        } else {
-          LWIP_DEBUGF(IGMP_DEBUG, (" with the group address as destination [igmp_maxresp=%i]\n", (int)(igmp->igmp_maxresp)));
-        }
-
-        if (group != NULL) {
-          IGMP_STATS_INC(igmp.rx_group);
-          igmp_delaying_member(group, igmp->igmp_maxresp);
-        } else {
-          IGMP_STATS_INC(igmp.drop);
-        }
-      } else {
-        IGMP_STATS_INC(igmp.proterr);
-      }
-    }
-    break;
-  case IGMP_V2_MEMB_REPORT:
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: IGMP_V2_MEMB_REPORT\n"));
-    IGMP_STATS_INC(igmp.rx_report);
-    if (group->group_state == IGMP_GROUP_DELAYING_MEMBER) {
-      /* This is on a specific group we have already looked up */
-      group->timer = 0; /* stopped */
-      group->group_state = IGMP_GROUP_IDLE_MEMBER;
-      group->last_reporter_flag = 0;
-    }
-    break;
-  default:
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_input: unexpected msg %d in state %d on group %p on if %p\n",
-      igmp->igmp_msgtype, group->group_state, (void*)&group, (void*)inp));
-    IGMP_STATS_INC(igmp.proterr);
-    break;
-  }
-
-  pbuf_free(p);
-  return;
-}
-
-/**
- * @ingroup igmp
- * Join a group on one network interface.
- *
- * @param ifaddr ip address of the network interface which should join a new group
- * @param groupaddr the ip address of the group which to join
- * @return ERR_OK if group was joined on the netif(s), an err_t otherwise
- */
-err_t
-igmp_joingroup(const ip4_addr_t *ifaddr, const ip4_addr_t *groupaddr)
-{
-  err_t err = ERR_VAL; /* no matching interface */
-  struct netif *netif;
-
-  /* make sure it is multicast address */
-  LWIP_ERROR("igmp_joingroup: attempt to join non-multicast address", ip4_addr_ismulticast(groupaddr), return ERR_VAL;);
-  LWIP_ERROR("igmp_joingroup: attempt to join allsystems address", (!ip4_addr_cmp(groupaddr, &allsystems)), return ERR_VAL;);
-
-  /* loop through netif's */
-  netif = netif_list;
-  while (netif != NULL) {
-    /* Should we join this interface ? */
-    if ((netif->flags & NETIF_FLAG_IGMP) && ((ip4_addr_isany(ifaddr) || ip4_addr_cmp(netif_ip4_addr(netif), ifaddr)))) {
-      err = igmp_joingroup_netif(netif, groupaddr);
-      if (err != ERR_OK) {
-        /* Return an error even if some network interfaces are joined */
-        /** @todo undo any other netif already joined */
-        return err;
-      }
-    }
-    /* proceed to next network interface */
-    netif = netif->next;
-  }
-
-  return err;
-}
-
-/**
- * @ingroup igmp
- * Join a group on one network interface.
- *
- * @param netif the network interface which should join a new group
- * @param groupaddr the ip address of the group which to join
- * @return ERR_OK if group was joined on the netif, an err_t otherwise
- */
-err_t
-igmp_joingroup_netif(struct netif *netif, const ip4_addr_t *groupaddr)
-{
-  struct igmp_group *group;
-
-  /* make sure it is multicast address */
-  LWIP_ERROR("igmp_joingroup_netif: attempt to join non-multicast address", ip4_addr_ismulticast(groupaddr), return ERR_VAL;);
-  LWIP_ERROR("igmp_joingroup_netif: attempt to join allsystems address", (!ip4_addr_cmp(groupaddr, &allsystems)), return ERR_VAL;);
-
-  /* make sure it is an igmp-enabled netif */
-  LWIP_ERROR("igmp_joingroup_netif: attempt to join on non-IGMP netif", netif->flags & NETIF_FLAG_IGMP, return ERR_VAL;);
-
-  /* find group or create a new one if not found */
-  group = igmp_lookup_group(netif, groupaddr);
-
-  if (group != NULL) {
-    /* This should create a new group, check the state to make sure */
-    if (group->group_state != IGMP_GROUP_NON_MEMBER) {
-      LWIP_DEBUGF(IGMP_DEBUG, ("igmp_joingroup_netif: join to group not in state IGMP_GROUP_NON_MEMBER\n"));
-    } else {
-      /* OK - it was new group */
-      LWIP_DEBUGF(IGMP_DEBUG, ("igmp_joingroup_netif: join to new group: "));
-      ip4_addr_debug_print(IGMP_DEBUG, groupaddr);
-      LWIP_DEBUGF(IGMP_DEBUG, ("\n"));
-
-      /* If first use of the group, allow the group at the MAC level */
-      if ((group->use==0) && (netif->igmp_mac_filter != NULL)) {
-        LWIP_DEBUGF(IGMP_DEBUG, ("igmp_joingroup_netif: igmp_mac_filter(ADD "));
-        ip4_addr_debug_print(IGMP_DEBUG, groupaddr);
-        LWIP_DEBUGF(IGMP_DEBUG, (") on if %p\n", (void*)netif));
-        netif->igmp_mac_filter(netif, groupaddr, NETIF_ADD_MAC_FILTER);
-      }
-
-      IGMP_STATS_INC(igmp.tx_join);
-      igmp_send(netif, group, IGMP_V2_MEMB_REPORT);
-
-      igmp_start_timer(group, IGMP_JOIN_DELAYING_MEMBER_TMR);
-
-      /* Need to work out where this timer comes from */
-      group->group_state = IGMP_GROUP_DELAYING_MEMBER;
-    }
-    /* Increment group use */
-    group->use++;
-    /* Join on this interface */
-    return ERR_OK;
-  } else {
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_joingroup_netif: Not enough memory to join to group\n"));
-    return ERR_MEM;
-  }
-}
-
-/**
- * @ingroup igmp
- * Leave a group on one network interface.
- *
- * @param ifaddr ip address of the network interface which should leave a group
- * @param groupaddr the ip address of the group which to leave
- * @return ERR_OK if group was left on the netif(s), an err_t otherwise
- */
-err_t
-igmp_leavegroup(const ip4_addr_t *ifaddr, const ip4_addr_t *groupaddr)
-{
-  err_t err = ERR_VAL; /* no matching interface */
-  struct netif *netif;
-
-  /* make sure it is multicast address */
-  LWIP_ERROR("igmp_leavegroup: attempt to leave non-multicast address", ip4_addr_ismulticast(groupaddr), return ERR_VAL;);
-  LWIP_ERROR("igmp_leavegroup: attempt to leave allsystems address", (!ip4_addr_cmp(groupaddr, &allsystems)), return ERR_VAL;);
-
-  /* loop through netif's */
-  netif = netif_list;
-  while (netif != NULL) {
-    /* Should we leave this interface ? */
-    if ((netif->flags & NETIF_FLAG_IGMP) && ((ip4_addr_isany(ifaddr) || ip4_addr_cmp(netif_ip4_addr(netif), ifaddr)))) {
-      err_t res = igmp_leavegroup_netif(netif, groupaddr);
-      if (err != ERR_OK) {
-        /* Store this result if we have not yet gotten a success */
-        err = res;
-      }
-    }
-    /* proceed to next network interface */
-    netif = netif->next;
-  }
-
-  return err;
-}
-
-/**
- * @ingroup igmp
- * Leave a group on one network interface.
- *
- * @param netif the network interface which should leave a group
- * @param groupaddr the ip address of the group which to leave
- * @return ERR_OK if group was left on the netif, an err_t otherwise
- */
-err_t
-igmp_leavegroup_netif(struct netif *netif, const ip4_addr_t *groupaddr)
-{
-  struct igmp_group *group;
-
-  /* make sure it is multicast address */
-  LWIP_ERROR("igmp_leavegroup_netif: attempt to leave non-multicast address", ip4_addr_ismulticast(groupaddr), return ERR_VAL;);
-  LWIP_ERROR("igmp_leavegroup_netif: attempt to leave allsystems address", (!ip4_addr_cmp(groupaddr, &allsystems)), return ERR_VAL;);
-
-  /* make sure it is an igmp-enabled netif */
-  LWIP_ERROR("igmp_leavegroup_netif: attempt to leave on non-IGMP netif", netif->flags & NETIF_FLAG_IGMP, return ERR_VAL;);
-
-  /* find group */
-  group = igmp_lookfor_group(netif, groupaddr);
-
-  if (group != NULL) {
-    /* Only send a leave if the flag is set according to the state diagram */
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup_netif: Leaving group: "));
-    ip4_addr_debug_print(IGMP_DEBUG, groupaddr);
-    LWIP_DEBUGF(IGMP_DEBUG, ("\n"));
-
-    /* If there is no other use of the group */
-    if (group->use <= 1) {
-      /* Remove the group from the list */
-      igmp_remove_group(netif, group);
-
-      /* If we are the last reporter for this group */
-      if (group->last_reporter_flag) {
-        LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup_netif: sending leaving group\n"));
-        IGMP_STATS_INC(igmp.tx_leave);
-        igmp_send(netif, group, IGMP_LEAVE_GROUP);
-      }
-
-      /* Disable the group at the MAC level */
-      if (netif->igmp_mac_filter != NULL) {
-        LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup_netif: igmp_mac_filter(DEL "));
-        ip4_addr_debug_print(IGMP_DEBUG, groupaddr);
-        LWIP_DEBUGF(IGMP_DEBUG, (") on if %p\n", (void*)netif));
-        netif->igmp_mac_filter(netif, groupaddr, NETIF_DEL_MAC_FILTER);
-      }
-
-      /* Free group struct */
-      memp_free(MEMP_IGMP_GROUP, group);
-    } else {
-      /* Decrement group use */
-      group->use--;
-    }
-    return ERR_OK;
-  } else {
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_leavegroup_netif: not member of group\n"));
-    return ERR_VAL;
-  }
-}
-
-/**
- * The igmp timer function (both for NO_SYS=1 and =0)
- * Should be called every IGMP_TMR_INTERVAL milliseconds (100 ms is default).
- */
-void
-igmp_tmr(void)
-{
-  struct netif *netif = netif_list;
-
-  while (netif != NULL) {
-    struct igmp_group *group = netif_igmp_data(netif);
-
-    while (group != NULL) {
-      if (group->timer > 0) {
-        group->timer--;
-        if (group->timer == 0) {
-          igmp_timeout(netif, group);
-        }
-      }
-      group = group->next;
-    }
-    netif = netif->next;
-  }
-}
-
-/**
- * Called if a timeout for one group is reached.
- * Sends a report for this group.
- *
- * @param group an igmp_group for which a timeout is reached
- */
-static void
-igmp_timeout(struct netif *netif, struct igmp_group *group)
-{
-  /* If the state is IGMP_GROUP_DELAYING_MEMBER then we send a report for this group
-     (unless it is the allsystems group) */
-  if ((group->group_state == IGMP_GROUP_DELAYING_MEMBER) &&
-      (!(ip4_addr_cmp(&(group->group_address), &allsystems)))) {
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_timeout: report membership for group with address "));
-    ip4_addr_debug_print(IGMP_DEBUG, &(group->group_address));
-    LWIP_DEBUGF(IGMP_DEBUG, (" on if %p\n", (void*)netif));
-
-    group->group_state = IGMP_GROUP_IDLE_MEMBER;
-    
-    IGMP_STATS_INC(igmp.tx_report);
-    igmp_send(netif, group, IGMP_V2_MEMB_REPORT);
-  }
-}
-
-/**
- * Start a timer for an igmp group
- *
- * @param group the igmp_group for which to start a timer
- * @param max_time the time in multiples of IGMP_TMR_INTERVAL (decrease with
- *        every call to igmp_tmr())
- */
-static void
-igmp_start_timer(struct igmp_group *group, u8_t max_time)
-{
-#ifdef LWIP_RAND
-  group->timer = max_time > 2 ? (LWIP_RAND() % max_time) : 1;
-#else /* LWIP_RAND */
-  /* ATTENTION: use this only if absolutely necessary! */
-  group->timer = max_time / 2;
-#endif /* LWIP_RAND */
-
-  if (group->timer == 0) {
-    group->timer = 1;
-  }
-}
-
-/**
- * Delaying membership report for a group if necessary
- *
- * @param group the igmp_group for which "delaying" membership report
- * @param maxresp query delay
- */
-static void
-igmp_delaying_member(struct igmp_group *group, u8_t maxresp)
-{
-  if ((group->group_state == IGMP_GROUP_IDLE_MEMBER) ||
-     ((group->group_state == IGMP_GROUP_DELAYING_MEMBER) &&
-      ((group->timer == 0) || (maxresp < group->timer)))) {
-    igmp_start_timer(group, maxresp);
-    group->group_state = IGMP_GROUP_DELAYING_MEMBER;
-  }
-}
-
-
-/**
- * Sends an IP packet on a network interface. This function constructs the IP header
- * and calculates the IP header checksum. If the source IP address is NULL,
- * the IP address of the outgoing network interface is filled in as source address.
- *
- * @param p the packet to send (p->payload points to the data, e.g. next
-            protocol header; if dest == LWIP_IP_HDRINCL, p already includes an
-            IP header and p->payload points to that IP header)
- * @param src the source IP address to send from (if src == IP4_ADDR_ANY, the
- *         IP  address of the netif used to send is used as source address)
- * @param dest the destination IP address to send the packet to
- * @param netif the netif on which to send this packet
- * @return ERR_OK if the packet was sent OK
- *         ERR_BUF if p doesn't have enough space for IP/LINK headers
- *         returns errors returned by netif->output
- */
-static err_t
-igmp_ip_output_if(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest, struct netif *netif)
-{
-  /* This is the "router alert" option */
-  u16_t ra[2];
-  ra[0] = PP_HTONS(ROUTER_ALERT);
-  ra[1] = 0x0000; /* Router shall examine packet */
-  IGMP_STATS_INC(igmp.xmit);
-  return ip4_output_if_opt(p, src, dest, IGMP_TTL, 0, IP_PROTO_IGMP, netif, ra, ROUTER_ALERTLEN);
-}
-
-/**
- * Send an igmp packet to a specific group.
- *
- * @param group the group to which to send the packet
- * @param type the type of igmp packet to send
- */
-static void
-igmp_send(struct netif *netif, struct igmp_group *group, u8_t type)
-{
-  struct pbuf*     p    = NULL;
-  struct igmp_msg* igmp = NULL;
-  ip4_addr_t   src  = *IP4_ADDR_ANY4;
-  ip4_addr_t*  dest = NULL;
-
-  /* IP header + "router alert" option + IGMP header */
-  p = pbuf_alloc(PBUF_TRANSPORT, IGMP_MINLEN, PBUF_RAM);
-
-  if (p) {
-    igmp = (struct igmp_msg *)p->payload;
-    LWIP_ASSERT("igmp_send: check that first pbuf can hold struct igmp_msg",
-               (p->len >= sizeof(struct igmp_msg)));
-    ip4_addr_copy(src, *netif_ip4_addr(netif));
-
-    if (type == IGMP_V2_MEMB_REPORT) {
-      dest = &(group->group_address);
-      ip4_addr_copy(igmp->igmp_group_address, group->group_address);
-      group->last_reporter_flag = 1; /* Remember we were the last to report */
-    } else {
-      if (type == IGMP_LEAVE_GROUP) {
-        dest = &allrouters;
-        ip4_addr_copy(igmp->igmp_group_address, group->group_address);
-      }
-    }
-
-    if ((type == IGMP_V2_MEMB_REPORT) || (type == IGMP_LEAVE_GROUP)) {
-      igmp->igmp_msgtype  = type;
-      igmp->igmp_maxresp  = 0;
-      igmp->igmp_checksum = 0;
-      igmp->igmp_checksum = inet_chksum(igmp, IGMP_MINLEN);
-
-      igmp_ip_output_if(p, &src, dest, netif);
-    }
-
-    pbuf_free(p);
-  } else {
-    LWIP_DEBUGF(IGMP_DEBUG, ("igmp_send: not enough memory for igmp_send\n"));
-    IGMP_STATS_INC(igmp.memerr);
-  }
-}
-
-#endif /* LWIP_IPV4 && LWIP_IGMP */
diff --git a/sys/net/core/ipv4/ip4.c b/sys/net/core/ipv4/ip4.c
deleted file mode 100644
index bef5a85..0000000
--- a/sys/net/core/ipv4/ip4.c
+++ /dev/null
@@ -1,1091 +0,0 @@
-/**
- * @file
- * This is the IPv4 layer implementation for incoming and outgoing IP traffic.
- *
- * @see ip_frag.c
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV4
-
-#include "net/ip.h"
-#include "net/def.h"
-#include "net/mem.h"
-#include "net/ip4_frag.h"
-#include "net/inet_chksum.h"
-#include "net/netif.h"
-#include "net/icmp.h"
-#include "net/igmp.h"
-#include "net/raw.h"
-#include "net/udp.h"
-#include "net/priv/tcp_priv.h"
-#include "net/autoip.h"
-#include "net/stats.h"
-#include "net/prot/dhcp.h"
-
-#include <string.h>
-
-#ifdef LWIP_HOOK_FILENAME
-#include LWIP_HOOK_FILENAME
-#endif
-
-/** Set this to 0 in the rare case of wanting to call an extra function to
- * generate the IP checksum (in contrast to calculating it on-the-fly). */
-#ifndef LWIP_INLINE_IP_CHKSUM
-#if LWIP_CHECKSUM_CTRL_PER_NETIF
-#define LWIP_INLINE_IP_CHKSUM   0
-#else /* LWIP_CHECKSUM_CTRL_PER_NETIF */
-#define LWIP_INLINE_IP_CHKSUM   1
-#endif /* LWIP_CHECKSUM_CTRL_PER_NETIF */
-#endif
-
-#if LWIP_INLINE_IP_CHKSUM && CHECKSUM_GEN_IP
-#define CHECKSUM_GEN_IP_INLINE  1
-#else
-#define CHECKSUM_GEN_IP_INLINE  0
-#endif
-
-#if LWIP_DHCP || defined(LWIP_IP_ACCEPT_UDP_PORT)
-#define IP_ACCEPT_LINK_LAYER_ADDRESSING 1
-
-/** Some defines for DHCP to let link-layer-addressed packets through while the
- * netif is down.
- * To use this in your own application/protocol, define LWIP_IP_ACCEPT_UDP_PORT(port)
- * to return 1 if the port is accepted and 0 if the port is not accepted.
- */
-#if LWIP_DHCP && defined(LWIP_IP_ACCEPT_UDP_PORT)
-/* accept DHCP client port and custom port */
-#define IP_ACCEPT_LINK_LAYER_ADDRESSED_PORT(port) (((port) == PP_NTOHS(DHCP_CLIENT_PORT)) \
-         || (LWIP_IP_ACCEPT_UDP_PORT(port)))
-#elif defined(LWIP_IP_ACCEPT_UDP_PORT) /* LWIP_DHCP && defined(LWIP_IP_ACCEPT_UDP_PORT) */
-/* accept custom port only */
-#define IP_ACCEPT_LINK_LAYER_ADDRESSED_PORT(port) (LWIP_IP_ACCEPT_UDP_PORT(port))
-#else /* LWIP_DHCP && defined(LWIP_IP_ACCEPT_UDP_PORT) */
-/* accept DHCP client port only */
-#define IP_ACCEPT_LINK_LAYER_ADDRESSED_PORT(port) ((port) == PP_NTOHS(DHCP_CLIENT_PORT))
-#endif /* LWIP_DHCP && defined(LWIP_IP_ACCEPT_UDP_PORT) */
-
-#else /* LWIP_DHCP */
-#define IP_ACCEPT_LINK_LAYER_ADDRESSING 0
-#endif /* LWIP_DHCP */
-
-/** The IP header ID of the next outgoing IP packet */
-static u16_t ip_id;
-
-#if LWIP_MULTICAST_TX_OPTIONS
-/** The default netif used for multicast */
-static struct netif* ip4_default_multicast_netif;
-
-/**
- * @ingroup ip4
- * Set a default netif for IPv4 multicast. */
-void
-ip4_set_default_multicast_netif(struct netif* default_multicast_netif)
-{
-  ip4_default_multicast_netif = default_multicast_netif;
-}
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-
-#ifdef LWIP_HOOK_IP4_ROUTE_SRC
-/**
- * Source based IPv4 routing must be fully implemented in
- * LWIP_HOOK_IP4_ROUTE_SRC(). This function only provides he parameters.
- */
-struct netif *
-ip4_route_src(const ip4_addr_t *dest, const ip4_addr_t *src)
-{
-  if (src != NULL) {
-    /* when src==NULL, the hook is called from ip4_route(dest) */
-    struct netif *netif = LWIP_HOOK_IP4_ROUTE_SRC(dest, src);
-    if (netif != NULL) {
-      return netif;
-    }
-  }
-  return ip4_route(dest);
-}
-#endif /* LWIP_HOOK_IP4_ROUTE_SRC */
-
-/**
- * Finds the appropriate network interface for a given IP address. It
- * searches the list of network interfaces linearly. A match is found
- * if the masked IP address of the network interface equals the masked
- * IP address given to the function.
- *
- * @param dest the destination IP address for which to find the route
- * @return the netif on which to send to reach dest
- */
-struct netif *
-ip4_route(const ip4_addr_t *dest)
-{
-  struct netif *netif;
-
-#if LWIP_MULTICAST_TX_OPTIONS
-  /* Use administratively selected interface for multicast by default */
-  if (ip4_addr_ismulticast(dest) && ip4_default_multicast_netif) {
-    return ip4_default_multicast_netif;
-  }
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-
-  /* iterate through netifs */
-  for (netif = netif_list; netif != NULL; netif = netif->next) {
-    /* is the netif up, does it have a link and a valid address? */
-    if (netif_is_up(netif) && netif_is_link_up(netif) && !ip4_addr_isany_val(*netif_ip4_addr(netif))) {
-      /* network mask matches? */
-      if (ip4_addr_netcmp(dest, netif_ip4_addr(netif), netif_ip4_netmask(netif))) {
-        /* return netif on which to forward IP packet */
-        return netif;
-      }
-      /* gateway matches on a non broadcast interface? (i.e. peer in a point to point interface) */
-      if (((netif->flags & NETIF_FLAG_BROADCAST) == 0) && ip4_addr_cmp(dest, netif_ip4_gw(netif))) {
-        /* return netif on which to forward IP packet */
-        return netif;
-      }
-    }
-  }
-
-#if LWIP_NETIF_LOOPBACK && !LWIP_HAVE_LOOPIF
-  /* loopif is disabled, looopback traffic is passed through any netif */
-  if (ip4_addr_isloopback(dest)) {
-    /* don't check for link on loopback traffic */
-    if (netif_default != NULL && netif_is_up(netif_default)) {
-      return netif_default;
-    }
-    /* default netif is not up, just use any netif for loopback traffic */
-    for (netif = netif_list; netif != NULL; netif = netif->next) {
-      if (netif_is_up(netif)) {
-        return netif;
-      }
-    }
-    return NULL;
-  }
-#endif /* LWIP_NETIF_LOOPBACK && !LWIP_HAVE_LOOPIF */
-
-#ifdef LWIP_HOOK_IP4_ROUTE_SRC
-  netif = LWIP_HOOK_IP4_ROUTE_SRC(dest, NULL);
-  if (netif != NULL) {
-    return netif;
-  }
-#elif defined(LWIP_HOOK_IP4_ROUTE)
-  netif = LWIP_HOOK_IP4_ROUTE(dest);
-  if (netif != NULL) {
-    return netif;
-  }
-#endif
-
-  if ((netif_default == NULL) || !netif_is_up(netif_default) || !netif_is_link_up(netif_default) ||
-      ip4_addr_isany_val(*netif_ip4_addr(netif_default))) {
-    /* No matching netif found and default netif is not usable.
-       If this is not good enough for you, use LWIP_HOOK_IP4_ROUTE() */
-    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("ip4_route: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-      ip4_addr1_16(dest), ip4_addr2_16(dest), ip4_addr3_16(dest), ip4_addr4_16(dest)));
-    IP_STATS_INC(ip.rterr);
-    MIB2_STATS_INC(mib2.ipoutnoroutes);
-    return NULL;
-  }
-
-  return netif_default;
-}
-
-#if IP_FORWARD
-/**
- * Determine whether an IP address is in a reserved set of addresses
- * that may not be forwarded, or whether datagrams to that destination
- * may be forwarded.
- * @param p the packet to forward
- * @return 1: can forward 0: discard
- */
-static int
-ip4_canforward(struct pbuf *p)
-{
-  u32_t addr = lwip_htonl(ip4_addr_get_u32(ip4_current_dest_addr()));
-
-  if (p->flags & PBUF_FLAG_LLBCAST) {
-    /* don't route link-layer broadcasts */
-    return 0;
-  }
-  if ((p->flags & PBUF_FLAG_LLMCAST) && !IP_MULTICAST(addr)) {
-    /* don't route link-layer multicasts unless the destination address is an IP
-       multicast address */
-    return 0;
-  }
-  if (IP_EXPERIMENTAL(addr)) {
-    return 0;
-  }
-  if (IP_CLASSA(addr)) {
-    u32_t net = addr & IP_CLASSA_NET;
-    if ((net == 0) || (net == ((u32_t)IP_LOOPBACKNET << IP_CLASSA_NSHIFT))) {
-      /* don't route loopback packets */
-      return 0;
-    }
-  }
-  return 1;
-}
-
-/**
- * Forwards an IP packet. It finds an appropriate route for the
- * packet, decrements the TTL value of the packet, adjusts the
- * checksum and outputs the packet on the appropriate interface.
- *
- * @param p the packet to forward (p->payload points to IP header)
- * @param iphdr the IP header of the input packet
- * @param inp the netif on which this packet was received
- */
-static void
-ip4_forward(struct pbuf *p, struct ip_hdr *iphdr, struct netif *inp)
-{
-  struct netif *netif;
-
-  PERF_START;
-  LWIP_UNUSED_ARG(inp);
-
-  if (!ip4_canforward(p)) {
-    goto return_noroute;
-  }
-
-  /* RFC3927 2.7: do not forward link-local addresses */
-  if (ip4_addr_islinklocal(ip4_current_dest_addr())) {
-    LWIP_DEBUGF(IP_DEBUG, ("ip4_forward: not forwarding LLA %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-      ip4_addr1_16(ip4_current_dest_addr()), ip4_addr2_16(ip4_current_dest_addr()),
-      ip4_addr3_16(ip4_current_dest_addr()), ip4_addr4_16(ip4_current_dest_addr())));
-    goto return_noroute;
-  }
-
-  /* Find network interface where to forward this IP packet to. */
-  netif = ip4_route_src(ip4_current_dest_addr(), ip4_current_src_addr());
-  if (netif == NULL) {
-    LWIP_DEBUGF(IP_DEBUG, ("ip4_forward: no forwarding route for %"U16_F".%"U16_F".%"U16_F".%"U16_F" found\n",
-      ip4_addr1_16(ip4_current_dest_addr()), ip4_addr2_16(ip4_current_dest_addr()),
-      ip4_addr3_16(ip4_current_dest_addr()), ip4_addr4_16(ip4_current_dest_addr())));
-    /* @todo: send ICMP_DUR_NET? */
-    goto return_noroute;
-  }
-#if !IP_FORWARD_ALLOW_TX_ON_RX_NETIF
-  /* Do not forward packets onto the same network interface on which
-   * they arrived. */
-  if (netif == inp) {
-    LWIP_DEBUGF(IP_DEBUG, ("ip4_forward: not bouncing packets back on incoming interface.\n"));
-    goto return_noroute;
-  }
-#endif /* IP_FORWARD_ALLOW_TX_ON_RX_NETIF */
-
-  /* decrement TTL */
-  IPH_TTL_SET(iphdr, IPH_TTL(iphdr) - 1);
-  /* send ICMP if TTL == 0 */
-  if (IPH_TTL(iphdr) == 0) {
-    MIB2_STATS_INC(mib2.ipinhdrerrors);
-#if LWIP_ICMP
-    /* Don't send ICMP messages in response to ICMP messages */
-    if (IPH_PROTO(iphdr) != IP_PROTO_ICMP) {
-      icmp_time_exceeded(p, ICMP_TE_TTL);
-    }
-#endif /* LWIP_ICMP */
-    return;
-  }
-
-  /* Incrementally update the IP checksum. */
-  if (IPH_CHKSUM(iphdr) >= PP_HTONS(0xffffU - 0x100)) {
-    IPH_CHKSUM_SET(iphdr, IPH_CHKSUM(iphdr) + PP_HTONS(0x100) + 1);
-  } else {
-    IPH_CHKSUM_SET(iphdr, IPH_CHKSUM(iphdr) + PP_HTONS(0x100));
-  }
-
-  LWIP_DEBUGF(IP_DEBUG, ("ip4_forward: forwarding packet to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-    ip4_addr1_16(ip4_current_dest_addr()), ip4_addr2_16(ip4_current_dest_addr()),
-    ip4_addr3_16(ip4_current_dest_addr()), ip4_addr4_16(ip4_current_dest_addr())));
-
-  IP_STATS_INC(ip.fw);
-  MIB2_STATS_INC(mib2.ipforwdatagrams);
-  IP_STATS_INC(ip.xmit);
-
-  PERF_STOP("ip4_forward");
-  /* don't fragment if interface has mtu set to 0 [loopif] */
-  if (netif->mtu && (p->tot_len > netif->mtu)) {
-    if ((IPH_OFFSET(iphdr) & PP_NTOHS(IP_DF)) == 0) {
-#if IP_FRAG
-      ip4_frag(p, netif, ip4_current_dest_addr());
-#else /* IP_FRAG */
-      /* @todo: send ICMP Destination Unreachable code 13 "Communication administratively prohibited"? */
-#endif /* IP_FRAG */
-    } else {
-#if LWIP_ICMP
-      /* send ICMP Destination Unreachable code 4: "Fragmentation Needed and DF Set" */
-      icmp_dest_unreach(p, ICMP_DUR_FRAG);
-#endif /* LWIP_ICMP */
-    }
-    return;
-  }
-  /* transmit pbuf on chosen interface */
-  netif->output(netif, p, ip4_current_dest_addr());
-  return;
-return_noroute:
-  MIB2_STATS_INC(mib2.ipoutnoroutes);
-}
-#endif /* IP_FORWARD */
-
-/**
- * This function is called by the network interface device driver when
- * an IP packet is received. The function does the basic checks of the
- * IP header such as packet size being at least larger than the header
- * size etc. If the packet was not destined for us, the packet is
- * forwarded (using ip_forward). The IP checksum is always checked.
- *
- * Finally, the packet is sent to the upper layer protocol input function.
- *
- * @param p the received IP packet (p->payload points to IP header)
- * @param inp the netif on which this packet was received
- * @return ERR_OK if the packet was processed (could return ERR_* if it wasn't
- *         processed, but currently always returns ERR_OK)
- */
-err_t
-ip4_input(struct pbuf *p, struct netif *inp)
-{
-  struct ip_hdr *iphdr;
-  struct netif *netif;
-  u16_t iphdr_hlen;
-  u16_t iphdr_len;
-#if IP_ACCEPT_LINK_LAYER_ADDRESSING || LWIP_IGMP
-  int check_ip_src = 1;
-#endif /* IP_ACCEPT_LINK_LAYER_ADDRESSING || LWIP_IGMP */
-
-  IP_STATS_INC(ip.recv);
-  MIB2_STATS_INC(mib2.ipinreceives);
-
-  /* identify the IP header */
-  iphdr = (struct ip_hdr *)p->payload;
-  if (IPH_V(iphdr) != 4) {
-    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_WARNING, ("IP packet dropped due to bad version number %"U16_F"\n", (u16_t)IPH_V(iphdr)));
-    ip4_debug_print(p);
-    pbuf_free(p);
-    IP_STATS_INC(ip.err);
-    IP_STATS_INC(ip.drop);
-    MIB2_STATS_INC(mib2.ipinhdrerrors);
-    return ERR_OK;
-  }
-
-#ifdef LWIP_HOOK_IP4_INPUT
-  if (LWIP_HOOK_IP4_INPUT(p, inp)) {
-    /* the packet has been eaten */
-    return ERR_OK;
-  }
-#endif
-
-  /* obtain IP header length in number of 32-bit words */
-  iphdr_hlen = IPH_HL(iphdr);
-  /* calculate IP header length in bytes */
-  iphdr_hlen *= 4;
-  /* obtain ip length in bytes */
-  iphdr_len = lwip_ntohs(IPH_LEN(iphdr));
-
-  /* Trim pbuf. This is especially required for packets < 60 bytes. */
-  if (iphdr_len < p->tot_len) {
-    pbuf_realloc(p, iphdr_len);
-  }
-
-  /* header length exceeds first pbuf length, or ip length exceeds total pbuf length? */
-  if ((iphdr_hlen > p->len) || (iphdr_len > p->tot_len) || (iphdr_hlen < IP_HLEN)) {
-    if (iphdr_hlen < IP_HLEN) {
-      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-        ("ip4_input: short IP header (%"U16_F" bytes) received, IP packet dropped\n", iphdr_hlen));
-    }
-    if (iphdr_hlen > p->len) {
-      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-        ("IP header (len %"U16_F") does not fit in first pbuf (len %"U16_F"), IP packet dropped.\n",
-        iphdr_hlen, p->len));
-    }
-    if (iphdr_len > p->tot_len) {
-      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-        ("IP (len %"U16_F") is longer than pbuf (len %"U16_F"), IP packet dropped.\n",
-        iphdr_len, p->tot_len));
-    }
-    /* free (drop) packet pbufs */
-    pbuf_free(p);
-    IP_STATS_INC(ip.lenerr);
-    IP_STATS_INC(ip.drop);
-    MIB2_STATS_INC(mib2.ipindiscards);
-    return ERR_OK;
-  }
-
-  /* verify checksum */
-#if CHECKSUM_CHECK_IP
-  IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_CHECK_IP) {
-    if (inet_chksum(iphdr, iphdr_hlen) != 0) {
-
-      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-        ("Checksum (0x%"X16_F") failed, IP packet dropped.\n", inet_chksum(iphdr, iphdr_hlen)));
-      ip4_debug_print(p);
-      pbuf_free(p);
-      IP_STATS_INC(ip.chkerr);
-      IP_STATS_INC(ip.drop);
-      MIB2_STATS_INC(mib2.ipinhdrerrors);
-      return ERR_OK;
-    }
-  }
-#endif
-
-  /* copy IP addresses to aligned ip_addr_t */
-  ip_addr_copy_from_ip4(ip_data.current_iphdr_dest, iphdr->dest);
-  ip_addr_copy_from_ip4(ip_data.current_iphdr_src, iphdr->src);
-
-  /* match packet against an interface, i.e. is this packet for us? */
-  if (ip4_addr_ismulticast(ip4_current_dest_addr())) {
-#if LWIP_IGMP
-kpanic("A");
-    if ((inp->flags & NETIF_FLAG_IGMP) && (igmp_lookfor_group(inp, ip4_current_dest_addr()))) {
-      /* IGMP snooping switches need 0.0.0.0 to be allowed as source address (RFC 4541) */
-      ip4_addr_t allsystems;
-      IP4_ADDR(&allsystems, 224, 0, 0, 1);
-      if (ip4_addr_cmp(ip4_current_dest_addr(), &allsystems) &&
-          ip4_addr_isany(ip4_current_src_addr())) {
-        check_ip_src = 0;
-      }
-      netif = inp;
-    } else {
-      netif = NULL;
-    }
-#else /* LWIP_IGMP */
-kpanic("B");
-    if ((netif_is_up(inp)) && (!ip4_addr_isany_val(*netif_ip4_addr(inp)))) {
-      netif = inp;
-    } else {
-      netif = NULL;
-    }
-#endif /* LWIP_IGMP */
-  } else {
-    /* start trying with inp. if that's not acceptable, start walking the
-       list of configured netifs.
-       'first' is used as a boolean to mark whether we started walking the list */
-    int first = 1;
-    netif = inp;
-    do {
-if (ip4_addr_get_u32(&iphdr->dest)  == ip4_addr_get_u32(netif_ip4_addr(netif)))
-      LWIP_DEBUGF(IP_DEBUG, ("ip_input: iphdr->dest 0x%"X32_F" netif->ip_addr 0x%"X32_F" (0x%"X32_F", 0x%"X32_F", 0x%"X32_F")\n",
-          ip4_addr_get_u32(&iphdr->dest), ip4_addr_get_u32(netif_ip4_addr(netif)),
-          ip4_addr_get_u32(&iphdr->dest) & ip4_addr_get_u32(netif_ip4_netmask(netif)),
-          ip4_addr_get_u32(netif_ip4_addr(netif)) & ip4_addr_get_u32(netif_ip4_netmask(netif)),
-          ip4_addr_get_u32(&iphdr->dest) & ~ip4_addr_get_u32(netif_ip4_netmask(netif))));
-
-      /* interface is up and configured? */
-      if ((netif_is_up(netif)) && (!ip4_addr_isany_val(*netif_ip4_addr(netif)))) {
-        /* unicast to this interface address? */
-        if (ip4_addr_cmp(ip4_current_dest_addr(), netif_ip4_addr(netif)) ||
-            /* or broadcast on this interface network address? */
-            ip4_addr_isbroadcast(ip4_current_dest_addr(), netif)
-#if LWIP_NETIF_LOOPBACK && !LWIP_HAVE_LOOPIF
-            || (ip4_addr_get_u32(ip4_current_dest_addr()) == PP_HTONL(IPADDR_LOOPBACK))
-#endif /* LWIP_NETIF_LOOPBACK && !LWIP_HAVE_LOOPIF */
-            ) {
-          LWIP_DEBUGF(IP_DEBUG, ("ip4_input: packet accepted on interface %c%c\n",
-              netif->name[0], netif->name[1]));
-          /* break out of for loop */
-          break;
-        }
-#if LWIP_AUTOIP
-        /* connections to link-local addresses must persist after changing
-           the netif's address (RFC3927 ch. 1.9) */
-        if (autoip_accept_packet(netif, ip4_current_dest_addr())) {
-          LWIP_DEBUGF(IP_DEBUG, ("ip4_input: LLA packet accepted on interface %c%c\n",
-              netif->name[0], netif->name[1]));
-          /* break out of for loop */
-          break;
-        }
-#endif /* LWIP_AUTOIP */
-      }
-      if (first) {
-#if !LWIP_NETIF_LOOPBACK || LWIP_HAVE_LOOPIF
-        /* Packets sent to the loopback address must not be accepted on an
-         * interface that does not have the loopback address assigned to it,
-         * unless a non-loopback interface is used for loopback traffic. */
-        if (ip4_addr_isloopback(ip4_current_dest_addr())) {
-kpanic("D");
-          netif = NULL;
-          break;
-        }
-#endif /* !LWIP_NETIF_LOOPBACK || LWIP_HAVE_LOOPIF */
-        first = 0;
-        netif = netif_list;
-      } else {
-        netif = netif->next;
-      }
-      if (netif == inp) {
-        netif = netif->next;
-      }
-    } while (netif != NULL);
-  }
-
-#if IP_ACCEPT_LINK_LAYER_ADDRESSING
-  /* Pass DHCP messages regardless of destination address. DHCP traffic is addressed
-   * using link layer addressing (such as Ethernet MAC) so we must not filter on IP.
-   * According to RFC 1542 section 3.1.1, referred by RFC 2131).
-   *
-   * If you want to accept private broadcast communication while a netif is down,
-   * define LWIP_IP_ACCEPT_UDP_PORT(dst_port), e.g.:
-   *
-   * #define LWIP_IP_ACCEPT_UDP_PORT(dst_port) ((dst_port) == PP_NTOHS(12345))
-   */
-  if (netif == NULL) {
-    /* remote port is DHCP server? */
-    if (IPH_PROTO(iphdr) == IP_PROTO_UDP) {
-      struct udp_hdr *udphdr = (struct udp_hdr *)((u8_t *)iphdr + iphdr_hlen);
-      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_TRACE, ("ip4_input: UDP packet to DHCP client port %"U16_F"\n",
-        lwip_ntohs(udphdr->dest)));
-      if (IP_ACCEPT_LINK_LAYER_ADDRESSED_PORT(udphdr->dest)) {
-        LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_TRACE, ("ip4_input: DHCP packet accepted.\n"));
-        netif = inp;
-        check_ip_src = 0;
-      }
-    }
-  }
-#endif /* IP_ACCEPT_LINK_LAYER_ADDRESSING */
-
-  /* broadcast or multicast packet source address? Compliant with RFC 1122: 3.2.1.3 */
-#if LWIP_IGMP || IP_ACCEPT_LINK_LAYER_ADDRESSING
-  if (check_ip_src
-#if IP_ACCEPT_LINK_LAYER_ADDRESSING
-  /* DHCP servers need 0.0.0.0 to be allowed as source address (RFC 1.1.2.2: 3.2.1.3/a) */
-      && !ip4_addr_isany_val(*ip4_current_src_addr())
-#endif /* IP_ACCEPT_LINK_LAYER_ADDRESSING */
-     )
-#endif /* LWIP_IGMP || IP_ACCEPT_LINK_LAYER_ADDRESSING */
-  {
-    if ((ip4_addr_isbroadcast(ip4_current_src_addr(), inp)) ||
-        (ip4_addr_ismulticast(ip4_current_src_addr()))) {
-      /* packet source is not valid */
-      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING, ("ip4_input: packet source is not valid.\n"));
-      /* free (drop) packet pbufs */
-      pbuf_free(p);
-      IP_STATS_INC(ip.drop);
-      MIB2_STATS_INC(mib2.ipinaddrerrors);
-      MIB2_STATS_INC(mib2.ipindiscards);
-      return ERR_OK;
-    }
-  }
-
-  /* packet not for us? */
-  if (netif == NULL) {
-    /* packet not for us, route or discard */
-    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_TRACE, ("ip4_input: packet not for us.\n"));
-#if IP_FORWARD
-    /* non-broadcast packet? */
-    if (!ip4_addr_isbroadcast(ip4_current_dest_addr(), inp)) {
-      /* try to forward IP packet on (other) interfaces */
-      ip4_forward(p, iphdr, inp);
-    } else
-#endif /* IP_FORWARD */
-    {
-      IP_STATS_INC(ip.drop);
-      MIB2_STATS_INC(mib2.ipinaddrerrors);
-      MIB2_STATS_INC(mib2.ipindiscards);
-    }
-    pbuf_free(p);
-    return ERR_OK;
-  }
-  /* packet consists of multiple fragments? */
-  if ((IPH_OFFSET(iphdr) & PP_HTONS(IP_OFFMASK | IP_MF)) != 0) {
-#if IP_REASSEMBLY /* packet fragment reassembly code present? */
-    LWIP_DEBUGF(IP_DEBUG, ("IP packet is a fragment (id=0x%04"X16_F" tot_len=%"U16_F" len=%"U16_F" MF=%"U16_F" offset=%"U16_F"), calling ip4_reass()\n",
-      lwip_ntohs(IPH_ID(iphdr)), p->tot_len, lwip_ntohs(IPH_LEN(iphdr)), (u16_t)!!(IPH_OFFSET(iphdr) & PP_HTONS(IP_MF)), (u16_t)((lwip_ntohs(IPH_OFFSET(iphdr)) & IP_OFFMASK)*8)));
-    /* reassemble the packet*/
-    p = ip4_reass(p);
-    /* packet not fully reassembled yet? */
-    if (p == NULL) {
-      return ERR_OK;
-    }
-    iphdr = (struct ip_hdr *)p->payload;
-#else /* IP_REASSEMBLY == 0, no packet fragment reassembly code present */
-    pbuf_free(p);
-    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("IP packet dropped since it was fragmented (0x%"X16_F") (while IP_REASSEMBLY == 0).\n",
-      lwip_ntohs(IPH_OFFSET(iphdr))));
-    IP_STATS_INC(ip.opterr);
-    IP_STATS_INC(ip.drop);
-    /* unsupported protocol feature */
-    MIB2_STATS_INC(mib2.ipinunknownprotos);
-    return ERR_OK;
-#endif /* IP_REASSEMBLY */
-  }
-
-#if IP_OPTIONS_ALLOWED == 0 /* no support for IP options in the IP header? */
-
-#if LWIP_IGMP
-  /* there is an extra "router alert" option in IGMP messages which we allow for but do not police */
-  if ((iphdr_hlen > IP_HLEN) &&  (IPH_PROTO(iphdr) != IP_PROTO_IGMP)) {
-#else
-  if (iphdr_hlen > IP_HLEN) {
-#endif /* LWIP_IGMP */
-    LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("IP packet dropped since there were IP options (while IP_OPTIONS_ALLOWED == 0).\n"));
-    pbuf_free(p);
-    IP_STATS_INC(ip.opterr);
-    IP_STATS_INC(ip.drop);
-    /* unsupported protocol feature */
-    MIB2_STATS_INC(mib2.ipinunknownprotos);
-    return ERR_OK;
-  }
-#endif /* IP_OPTIONS_ALLOWED == 0 */
-
-  /* send to upper layers */
-  LWIP_DEBUGF(IP_DEBUG, ("ip4_input: \n"));
-  ip4_debug_print(p);
-  LWIP_DEBUGF(IP_DEBUG, ("ip4_input: p->len %"U16_F" p->tot_len %"U16_F"\n", p->len, p->tot_len));
-
-  ip_data.current_netif = netif;
-  ip_data.current_input_netif = inp;
-  ip_data.current_ip4_header = iphdr;
-  ip_data.current_ip_header_tot_len = IPH_HL(iphdr) * 4;
-
-#if LWIP_RAW
-  /* raw input did not eat the packet? */
-  if (raw_input(p, inp) == 0)
-#endif /* LWIP_RAW */
-  {
-    pbuf_header(p, -(s16_t)iphdr_hlen); /* Move to payload, no check necessary. */
-
-
-    switch (IPH_PROTO(iphdr)) {
-#if LWIP_UDP
-    case IP_PROTO_UDP:
-#if LWIP_UDPLITE
-    case IP_PROTO_UDPLITE:
-#endif /* LWIP_UDPLITE */
-      MIB2_STATS_INC(mib2.ipindelivers);
-      udp_input(p, inp);
-      break;
-#endif /* LWIP_UDP */
-#if LWIP_TCP
-    case IP_PROTO_TCP:
-      MIB2_STATS_INC(mib2.ipindelivers);
-      tcp_input(p, inp);
-      break;
-#endif /* LWIP_TCP */
-#if LWIP_ICMP
-    case IP_PROTO_ICMP:
-      MIB2_STATS_INC(mib2.ipindelivers);
-      icmp_input(p, inp);
-      break;
-#endif /* LWIP_ICMP */
-#if LWIP_IGMP
-    case IP_PROTO_IGMP:
-      igmp_input(p, inp, ip4_current_dest_addr());
-      break;
-#endif /* LWIP_IGMP */
-    default:
-#if LWIP_ICMP
-      /* send ICMP destination protocol unreachable unless is was a broadcast */
-      if (!ip4_addr_isbroadcast(ip4_current_dest_addr(), netif) &&
-          !ip4_addr_ismulticast(ip4_current_dest_addr())) {
-        pbuf_header_force(p, iphdr_hlen); /* Move to ip header, no check necessary. */
-        p->payload = iphdr;
-        icmp_dest_unreach(p, ICMP_DUR_PROTO);
-      }
-#endif /* LWIP_ICMP */
-      pbuf_free(p);
-
-      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("Unsupported transport protocol %"U16_F"\n", (u16_t)IPH_PROTO(iphdr)));
-
-      IP_STATS_INC(ip.proterr);
-      IP_STATS_INC(ip.drop);
-      MIB2_STATS_INC(mib2.ipinunknownprotos);
-    }
-  }
-
-  /* @todo: this is not really necessary... */
-  ip_data.current_netif = NULL;
-  ip_data.current_input_netif = NULL;
-  ip_data.current_ip4_header = NULL;
-  ip_data.current_ip_header_tot_len = 0;
-  ip4_addr_set_any(ip4_current_src_addr());
-  ip4_addr_set_any(ip4_current_dest_addr());
-
-  return ERR_OK;
-}
-
-/**
- * Sends an IP packet on a network interface. This function constructs
- * the IP header and calculates the IP header checksum. If the source
- * IP address is NULL, the IP address of the outgoing network
- * interface is filled in as source address.
- * If the destination IP address is LWIP_IP_HDRINCL, p is assumed to already
- * include an IP header and p->payload points to it instead of the data.
- *
- * @param p the packet to send (p->payload points to the data, e.g. next
-            protocol header; if dest == LWIP_IP_HDRINCL, p already includes an
-            IP header and p->payload points to that IP header)
- * @param src the source IP address to send from (if src == IP4_ADDR_ANY, the
- *         IP  address of the netif used to send is used as source address)
- * @param dest the destination IP address to send the packet to
- * @param ttl the TTL value to be set in the IP header
- * @param tos the TOS value to be set in the IP header
- * @param proto the PROTOCOL to be set in the IP header
- * @param netif the netif on which to send this packet
- * @return ERR_OK if the packet was sent OK
- *         ERR_BUF if p doesn't have enough space for IP/LINK headers
- *         returns errors returned by netif->output
- *
- * @note ip_id: RFC791 "some host may be able to simply use
- *  unique identifiers independent of destination"
- */
-err_t
-ip4_output_if(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-             u8_t ttl, u8_t tos,
-             u8_t proto, struct netif *netif)
-{
-#if IP_OPTIONS_SEND
-  return ip4_output_if_opt(p, src, dest, ttl, tos, proto, netif, NULL, 0);
-}
-
-/**
- * Same as ip_output_if() but with the possibility to include IP options:
- *
- * @ param ip_options pointer to the IP options, copied into the IP header
- * @ param optlen length of ip_options
- */
-err_t
-ip4_output_if_opt(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-       u8_t ttl, u8_t tos, u8_t proto, struct netif *netif, void *ip_options,
-       u16_t optlen)
-{
-#endif /* IP_OPTIONS_SEND */
-  const ip4_addr_t *src_used = src;
-  if (dest != LWIP_IP_HDRINCL) {
-    if (ip4_addr_isany(src)) {
-      src_used = netif_ip4_addr(netif);
-    }
-  }
-
-#if IP_OPTIONS_SEND
-  return ip4_output_if_opt_src(p, src_used, dest, ttl, tos, proto, netif,
-    ip_options, optlen);
-#else /* IP_OPTIONS_SEND */
-  return ip4_output_if_src(p, src_used, dest, ttl, tos, proto, netif);
-#endif /* IP_OPTIONS_SEND */
-}
-
-/**
- * Same as ip_output_if() but 'src' address is not replaced by netif address
- * when it is 'any'.
- */
-err_t
-ip4_output_if_src(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-             u8_t ttl, u8_t tos,
-             u8_t proto, struct netif *netif)
-{
-#if IP_OPTIONS_SEND
-  return ip4_output_if_opt_src(p, src, dest, ttl, tos, proto, netif, NULL, 0);
-}
-
-/**
- * Same as ip_output_if_opt() but 'src' address is not replaced by netif address
- * when it is 'any'.
- */
-err_t
-ip4_output_if_opt_src(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-       u8_t ttl, u8_t tos, u8_t proto, struct netif *netif, void *ip_options,
-       u16_t optlen)
-{
-#endif /* IP_OPTIONS_SEND */
-  struct ip_hdr *iphdr;
-  ip4_addr_t dest_addr;
-#if CHECKSUM_GEN_IP_INLINE
-  u32_t chk_sum = 0;
-#endif /* CHECKSUM_GEN_IP_INLINE */
-
-  LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
-
-  MIB2_STATS_INC(mib2.ipoutrequests);
-
-  /* Should the IP header be generated or is it already included in p? */
-  if (dest != LWIP_IP_HDRINCL) {
-    u16_t ip_hlen = IP_HLEN;
-#if IP_OPTIONS_SEND
-    u16_t optlen_aligned = 0;
-    if (optlen != 0) {
-#if CHECKSUM_GEN_IP_INLINE
-      int i;
-#endif /* CHECKSUM_GEN_IP_INLINE */
-      /* round up to a multiple of 4 */
-      optlen_aligned = ((optlen + 3) & ~3);
-      ip_hlen += optlen_aligned;
-      /* First write in the IP options */
-      if (pbuf_header(p, optlen_aligned)) {
-        LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("ip4_output_if_opt: not enough room for IP options in pbuf\n"));
-        IP_STATS_INC(ip.err);
-        MIB2_STATS_INC(mib2.ipoutdiscards);
-        return ERR_BUF;
-      }
-      MEMCPY(p->payload, ip_options, optlen);
-      if (optlen < optlen_aligned) {
-        /* zero the remaining bytes */
-        memset(((char*)p->payload) + optlen, 0, optlen_aligned - optlen);
-      }
-#if CHECKSUM_GEN_IP_INLINE
-      for (i = 0; i < optlen_aligned/2; i++) {
-        chk_sum += ((u16_t*)p->payload)[i];
-      }
-#endif /* CHECKSUM_GEN_IP_INLINE */
-    }
-#endif /* IP_OPTIONS_SEND */
-    /* generate IP header */
-    if (pbuf_header(p, IP_HLEN)) {
-      LWIP_DEBUGF(IP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("ip4_output: not enough room for IP header in pbuf\n"));
-
-      IP_STATS_INC(ip.err);
-      MIB2_STATS_INC(mib2.ipoutdiscards);
-      return ERR_BUF;
-    }
-
-    iphdr = (struct ip_hdr *)p->payload;
-    LWIP_ASSERT("check that first pbuf can hold struct ip_hdr",
-               (p->len >= sizeof(struct ip_hdr)));
-
-    IPH_TTL_SET(iphdr, ttl);
-    IPH_PROTO_SET(iphdr, proto);
-#if CHECKSUM_GEN_IP_INLINE
-    chk_sum += PP_NTOHS(proto | (ttl << 8));
-#endif /* CHECKSUM_GEN_IP_INLINE */
-
-    /* dest cannot be NULL here */
-    ip4_addr_copy(iphdr->dest, *dest);
-#if CHECKSUM_GEN_IP_INLINE
-    chk_sum += ip4_addr_get_u32(&iphdr->dest) & 0xFFFF;
-    chk_sum += ip4_addr_get_u32(&iphdr->dest) >> 16;
-#endif /* CHECKSUM_GEN_IP_INLINE */
-
-    IPH_VHL_SET(iphdr, 4, ip_hlen / 4);
-    IPH_TOS_SET(iphdr, tos);
-#if CHECKSUM_GEN_IP_INLINE
-    chk_sum += PP_NTOHS(tos | (iphdr->_v_hl << 8));
-#endif /* CHECKSUM_GEN_IP_INLINE */
-    IPH_LEN_SET(iphdr, lwip_htons(p->tot_len));
-#if CHECKSUM_GEN_IP_INLINE
-    chk_sum += iphdr->_len;
-#endif /* CHECKSUM_GEN_IP_INLINE */
-    IPH_OFFSET_SET(iphdr, 0);
-    IPH_ID_SET(iphdr, lwip_htons(ip_id));
-#if CHECKSUM_GEN_IP_INLINE
-    chk_sum += iphdr->_id;
-#endif /* CHECKSUM_GEN_IP_INLINE */
-    ++ip_id;
-
-    if (src == NULL) {
-      ip4_addr_copy(iphdr->src, *IP4_ADDR_ANY4);
-    } else {
-      /* src cannot be NULL here */
-      ip4_addr_copy(iphdr->src, *src);
-    }
-
-#if CHECKSUM_GEN_IP_INLINE
-    chk_sum += ip4_addr_get_u32(&iphdr->src) & 0xFFFF;
-    chk_sum += ip4_addr_get_u32(&iphdr->src) >> 16;
-    chk_sum = (chk_sum >> 16) + (chk_sum & 0xFFFF);
-    chk_sum = (chk_sum >> 16) + chk_sum;
-    chk_sum = ~chk_sum;
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_IP) {
-      iphdr->_chksum = (u16_t)chk_sum; /* network order */
-    }
-#if LWIP_CHECKSUM_CTRL_PER_NETIF
-    else {
-      IPH_CHKSUM_SET(iphdr, 0);
-    }
-#endif /* LWIP_CHECKSUM_CTRL_PER_NETIF*/
-#else /* CHECKSUM_GEN_IP_INLINE */
-    IPH_CHKSUM_SET(iphdr, 0);
-#if CHECKSUM_GEN_IP
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_IP) {
-      IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, ip_hlen));
-    }
-#endif /* CHECKSUM_GEN_IP */
-#endif /* CHECKSUM_GEN_IP_INLINE */
-  } else {
-    /* IP header already included in p */
-    iphdr = (struct ip_hdr *)p->payload;
-    ip4_addr_copy(dest_addr, iphdr->dest);
-    dest = &dest_addr;
-  }
-
-  IP_STATS_INC(ip.xmit);
-
-  LWIP_DEBUGF(IP_DEBUG, ("ip4_output_if: %c%c%"U16_F"\n", netif->name[0], netif->name[1], (u16_t)netif->num));
-  ip4_debug_print(p);
-
-#if ENABLE_LOOPBACK
-  if (ip4_addr_cmp(dest, netif_ip4_addr(netif))
-#if !LWIP_HAVE_LOOPIF
-      || ip4_addr_isloopback(dest)
-#endif /* !LWIP_HAVE_LOOPIF */
-      ) {
-    /* Packet to self, enqueue it for loopback */
-    LWIP_DEBUGF(IP_DEBUG, ("netif_loop_output()"));
-    return netif_loop_output(netif, p);
-  }
-#if LWIP_MULTICAST_TX_OPTIONS
-  if ((p->flags & PBUF_FLAG_MCASTLOOP) != 0) {
-    netif_loop_output(netif, p);
-  }
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-#endif /* ENABLE_LOOPBACK */
-#if IP_FRAG
-  /* don't fragment if interface has mtu set to 0 [loopif] */
-  if (netif->mtu && (p->tot_len > netif->mtu)) {
-    return ip4_frag(p, netif, dest);
-  }
-#endif /* IP_FRAG */
-
-  LWIP_DEBUGF(IP_DEBUG, ("ip4_output_if: call netif->output()\n"));
-  return netif->output(netif, p, dest);
-}
-
-/**
- * Simple interface to ip_output_if. It finds the outgoing network
- * interface and calls upon ip_output_if to do the actual work.
- *
- * @param p the packet to send (p->payload points to the data, e.g. next
-            protocol header; if dest == LWIP_IP_HDRINCL, p already includes an
-            IP header and p->payload points to that IP header)
- * @param src the source IP address to send from (if src == IP4_ADDR_ANY, the
- *         IP  address of the netif used to send is used as source address)
- * @param dest the destination IP address to send the packet to
- * @param ttl the TTL value to be set in the IP header
- * @param tos the TOS value to be set in the IP header
- * @param proto the PROTOCOL to be set in the IP header
- *
- * @return ERR_RTE if no route is found
- *         see ip_output_if() for more return values
- */
-err_t
-ip4_output(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-          u8_t ttl, u8_t tos, u8_t proto)
-{
-  struct netif *netif;
-
-  LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
-
-  if ((netif = ip4_route_src(dest, src)) == NULL) {
-    LWIP_DEBUGF(IP_DEBUG, ("ip4_output: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-      ip4_addr1_16(dest), ip4_addr2_16(dest), ip4_addr3_16(dest), ip4_addr4_16(dest)));
-    IP_STATS_INC(ip.rterr);
-    return ERR_RTE;
-  }
-
-  return ip4_output_if(p, src, dest, ttl, tos, proto, netif);
-}
-
-#if LWIP_NETIF_HWADDRHINT
-/** Like ip_output, but takes and addr_hint pointer that is passed on to netif->addr_hint
- *  before calling ip_output_if.
- *
- * @param p the packet to send (p->payload points to the data, e.g. next
-            protocol header; if dest == LWIP_IP_HDRINCL, p already includes an
-            IP header and p->payload points to that IP header)
- * @param src the source IP address to send from (if src == IP4_ADDR_ANY, the
- *         IP  address of the netif used to send is used as source address)
- * @param dest the destination IP address to send the packet to
- * @param ttl the TTL value to be set in the IP header
- * @param tos the TOS value to be set in the IP header
- * @param proto the PROTOCOL to be set in the IP header
- * @param addr_hint address hint pointer set to netif->addr_hint before
- *        calling ip_output_if()
- *
- * @return ERR_RTE if no route is found
- *         see ip_output_if() for more return values
- */
-err_t
-ip4_output_hinted(struct pbuf *p, const ip4_addr_t *src, const ip4_addr_t *dest,
-          u8_t ttl, u8_t tos, u8_t proto, u8_t *addr_hint)
-{
-  struct netif *netif;
-  err_t err;
-
-  LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
-
-  if ((netif = ip4_route_src(dest, src)) == NULL) {
-    LWIP_DEBUGF(IP_DEBUG, ("ip4_output: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-      ip4_addr1_16(dest), ip4_addr2_16(dest), ip4_addr3_16(dest), ip4_addr4_16(dest)));
-    IP_STATS_INC(ip.rterr);
-    return ERR_RTE;
-  }
-
-  NETIF_SET_HWADDRHINT(netif, addr_hint);
-  err = ip4_output_if(p, src, dest, ttl, tos, proto, netif);
-  NETIF_SET_HWADDRHINT(netif, NULL);
-
-  return err;
-}
-#endif /* LWIP_NETIF_HWADDRHINT*/
-
-#if IP_DEBUG
-/* Print an IP header by using LWIP_DEBUGF
- * @param p an IP packet, p->payload pointing to the IP header
- */
-void
-ip4_debug_print(struct pbuf *p)
-{
-  struct ip_hdr *iphdr = (struct ip_hdr *)p->payload;
-
-  LWIP_DEBUGF(IP_DEBUG, ("IP header:\n"));
-  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(IP_DEBUG, ("|%2"S16_F" |%2"S16_F" |  0x%02"X16_F" |     %5"U16_F"     | (v, hl, tos, len)\n",
-                    (u16_t)IPH_V(iphdr),
-                    (u16_t)IPH_HL(iphdr),
-                    (u16_t)IPH_TOS(iphdr),
-                    lwip_ntohs(IPH_LEN(iphdr))));
-  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(IP_DEBUG, ("|    %5"U16_F"      |%"U16_F"%"U16_F"%"U16_F"|    %4"U16_F"   | (id, flags, offset)\n",
-                    lwip_ntohs(IPH_ID(iphdr)),
-                    (u16_t)(lwip_ntohs(IPH_OFFSET(iphdr)) >> 15 & 1),
-                    (u16_t)(lwip_ntohs(IPH_OFFSET(iphdr)) >> 14 & 1),
-                    (u16_t)(lwip_ntohs(IPH_OFFSET(iphdr)) >> 13 & 1),
-                    (u16_t)(lwip_ntohs(IPH_OFFSET(iphdr)) & IP_OFFMASK)));
-  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(IP_DEBUG, ("|  %3"U16_F"  |  %3"U16_F"  |    0x%04"X16_F"     | (ttl, proto, chksum)\n",
-                    (u16_t)IPH_TTL(iphdr),
-                    (u16_t)IPH_PROTO(iphdr),
-                    lwip_ntohs(IPH_CHKSUM(iphdr))));
-  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(IP_DEBUG, ("|  %3"U16_F"  |  %3"U16_F"  |  %3"U16_F"  |  %3"U16_F"  | (src)\n",
-                    ip4_addr1_16(&iphdr->src),
-                    ip4_addr2_16(&iphdr->src),
-                    ip4_addr3_16(&iphdr->src),
-                    ip4_addr4_16(&iphdr->src)));
-  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(IP_DEBUG, ("|  %3"U16_F"  |  %3"U16_F"  |  %3"U16_F"  |  %3"U16_F"  | (dest)\n",
-                    ip4_addr1_16(&iphdr->dest),
-                    ip4_addr2_16(&iphdr->dest),
-                    ip4_addr3_16(&iphdr->dest),
-                    ip4_addr4_16(&iphdr->dest)));
-  LWIP_DEBUGF(IP_DEBUG, ("+-------------------------------+\n"));
-}
-#endif /* IP_DEBUG */
-
-#endif /* LWIP_IPV4 */
diff --git a/sys/net/core/ipv4/ip4_addr.c b/sys/net/core/ipv4/ip4_addr.c
deleted file mode 100644
index df3056e..0000000
--- a/sys/net/core/ipv4/ip4_addr.c
+++ /dev/null
@@ -1,331 +0,0 @@
-/**
- * @file
- * This is the IPv4 address tools implementation.
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV4
-
-#include "net/ip_addr.h"
-#include "net/netif.h"
-
-/* used by IP4_ADDR_ANY and IP_ADDR_BROADCAST in ip_addr.h */
-const ip_addr_t ip_addr_any = IPADDR4_INIT(IPADDR_ANY);
-const ip_addr_t ip_addr_broadcast = IPADDR4_INIT(IPADDR_BROADCAST);
-
-/**
- * Determine if an address is a broadcast address on a network interface
- *
- * @param addr address to be checked
- * @param netif the network interface against which the address is checked
- * @return returns non-zero if the address is a broadcast address
- */
-u8_t
-ip4_addr_isbroadcast_u32(u32_t addr, const struct netif *netif)
-{
-  ip4_addr_t ipaddr;
-  ip4_addr_set_u32(&ipaddr, addr);
-
-  /* all ones (broadcast) or all zeroes (old skool broadcast) */
-  if ((~addr == IPADDR_ANY) ||
-      (addr == IPADDR_ANY)) {
-    return 1;
-  /* no broadcast support on this network interface? */
-  } else if ((netif->flags & NETIF_FLAG_BROADCAST) == 0) {
-    /* the given address cannot be a broadcast address
-     * nor can we check against any broadcast addresses */
-    return 0;
-  /* address matches network interface address exactly? => no broadcast */
-  } else if (addr == ip4_addr_get_u32(netif_ip4_addr(netif))) {
-    return 0;
-  /*  on the same (sub) network... */
-  } else if (ip4_addr_netcmp(&ipaddr, netif_ip4_addr(netif), netif_ip4_netmask(netif))
-         /* ...and host identifier bits are all ones? =>... */
-          && ((addr & ~ip4_addr_get_u32(netif_ip4_netmask(netif))) ==
-           (IPADDR_BROADCAST & ~ip4_addr_get_u32(netif_ip4_netmask(netif))))) {
-    /* => network broadcast address */
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-/** Checks if a netmask is valid (starting with ones, then only zeros)
- *
- * @param netmask the IPv4 netmask to check (in network byte order!)
- * @return 1 if the netmask is valid, 0 if it is not
- */
-u8_t
-ip4_addr_netmask_valid(u32_t netmask)
-{
-  u32_t mask;
-  u32_t nm_hostorder = lwip_htonl(netmask);
-
-  /* first, check for the first zero */
-  for (mask = 1UL << 31 ; mask != 0; mask >>= 1) {
-    if ((nm_hostorder & mask) == 0) {
-      break;
-    }
-  }
-  /* then check that there is no one */
-  for (; mask != 0; mask >>= 1) {
-    if ((nm_hostorder & mask) != 0) {
-      /* there is a one after the first zero -> invalid */
-      return 0;
-    }
-  }
-  /* no one after the first zero -> valid */
-  return 1;
-}
-
-/* Here for now until needed in other places in lwIP */
-#ifndef isprint
-#define in_range(c, lo, up)  ((u8_t)c >= lo && (u8_t)c <= up)
-#define isprint(c)           in_range(c, 0x20, 0x7f)
-#define isdigit(c)           in_range(c, '0', '9')
-#define isxdigit(c)          (isdigit(c) || in_range(c, 'a', 'f') || in_range(c, 'A', 'F'))
-#define islower(c)           in_range(c, 'a', 'z')
-#define isspace(c)           (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v')
-#endif
-
-/**
- * Ascii internet address interpretation routine.
- * The value returned is in network order.
- *
- * @param cp IP address in ascii representation (e.g. "127.0.0.1")
- * @return ip address in network order
- */
-u32_t
-ipaddr_addr(const char *cp)
-{
-  ip4_addr_t val;
-
-  if (ip4addr_aton(cp, &val)) {
-    return ip4_addr_get_u32(&val);
-  }
-  return (IPADDR_NONE);
-}
-
-/**
- * Check whether "cp" is a valid ascii representation
- * of an Internet address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- * This replaces inet_addr, the return value from which
- * cannot distinguish between failure and a local broadcast address.
- *
- * @param cp IP address in ascii representation (e.g. "127.0.0.1")
- * @param addr pointer to which to save the ip address in network order
- * @return 1 if cp could be converted to addr, 0 on failure
- */
-int
-ip4addr_aton(const char *cp, ip4_addr_t *addr)
-{
-  u32_t val;
-  u8_t base;
-  char c;
-  u32_t parts[4];
-  u32_t *pp = parts;
-
-  c = *cp;
-  for (;;) {
-    /*
-     * Collect number up to ``.''.
-     * Values are specified as for C:
-     * 0x=hex, 0=octal, 1-9=decimal.
-     */
-    if (!isdigit(c)) {
-      return 0;
-    }
-    val = 0;
-    base = 10;
-    if (c == '0') {
-      c = *++cp;
-      if (c == 'x' || c == 'X') {
-        base = 16;
-        c = *++cp;
-      } else {
-        base = 8;
-      }
-    }
-    for (;;) {
-      if (isdigit(c)) {
-        val = (val * base) + (u32_t)(c - '0');
-        c = *++cp;
-      } else if (base == 16 && isxdigit(c)) {
-        val = (val << 4) | (u32_t)(c + 10 - (islower(c) ? 'a' : 'A'));
-        c = *++cp;
-      } else {
-        break;
-      }
-    }
-    if (c == '.') {
-      /*
-       * Internet format:
-       *  a.b.c.d
-       *  a.b.c   (with c treated as 16 bits)
-       *  a.b (with b treated as 24 bits)
-       */
-      if (pp >= parts + 3) {
-        return 0;
-      }
-      *pp++ = val;
-      c = *++cp;
-    } else {
-      break;
-    }
-  }
-  /*
-   * Check for trailing characters.
-   */
-  if (c != '\0' && !isspace(c)) {
-    return 0;
-  }
-  /*
-   * Concoct the address according to
-   * the number of parts specified.
-   */
-  switch (pp - parts + 1) {
-
-  case 0:
-    return 0;       /* initial nondigit */
-
-  case 1:             /* a -- 32 bits */
-    break;
-
-  case 2:             /* a.b -- 8.24 bits */
-    if (val > 0xffffffUL) {
-      return 0;
-    }
-    if (parts[0] > 0xff) {
-      return 0;
-    }
-    val |= parts[0] << 24;
-    break;
-
-  case 3:             /* a.b.c -- 8.8.16 bits */
-    if (val > 0xffff) {
-      return 0;
-    }
-    if ((parts[0] > 0xff) || (parts[1] > 0xff)) {
-      return 0;
-    }
-    val |= (parts[0] << 24) | (parts[1] << 16);
-    break;
-
-  case 4:             /* a.b.c.d -- 8.8.8.8 bits */
-    if (val > 0xff) {
-      return 0;
-    }
-    if ((parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff)) {
-      return 0;
-    }
-    val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
-    break;
-  default:
-    LWIP_ASSERT("unhandled", 0);
-    break;
-  }
-  if (addr) {
-    ip4_addr_set_u32(addr, lwip_htonl(val));
-  }
-  return 1;
-}
-
-/**
- * Convert numeric IP address into decimal dotted ASCII representation.
- * returns ptr to static buffer; not reentrant!
- *
- * @param addr ip address in network order to convert
- * @return pointer to a global static (!) buffer that holds the ASCII
- *         representation of addr
- */
-char*
-ip4addr_ntoa(const ip4_addr_t *addr)
-{
-  static char str[IP4ADDR_STRLEN_MAX];
-  return ip4addr_ntoa_r(addr, str, IP4ADDR_STRLEN_MAX);
-}
-
-/**
- * Same as ipaddr_ntoa, but reentrant since a user-supplied buffer is used.
- *
- * @param addr ip address in network order to convert
- * @param buf target buffer where the string is stored
- * @param buflen length of buf
- * @return either pointer to buf which now holds the ASCII
- *         representation of addr or NULL if buf was too small
- */
-char*
-ip4addr_ntoa_r(const ip4_addr_t *addr, char *buf, int buflen)
-{
-  u32_t s_addr;
-  char inv[3];
-  char *rp;
-  u8_t *ap;
-  u8_t rem;
-  u8_t n;
-  u8_t i;
-  int len = 0;
-
-  s_addr = ip4_addr_get_u32(addr);
-
-  rp = buf;
-  ap = (u8_t *)&s_addr;
-  for (n = 0; n < 4; n++) {
-    i = 0;
-    do {
-      rem = *ap % (u8_t)10;
-      *ap /= (u8_t)10;
-      inv[i++] = (char)('0' + rem);
-    } while (*ap);
-    while (i--) {
-      if (len++ >= buflen) {
-        return NULL;
-      }
-      *rp++ = inv[i];
-    }
-    if (len++ >= buflen) {
-      return NULL;
-    }
-    *rp++ = '.';
-    ap++;
-  }
-  *--rp = 0;
-  return buf;
-}
-
-#endif /* LWIP_IPV4 */
diff --git a/sys/net/core/ipv4/ip4_frag.c b/sys/net/core/ipv4/ip4_frag.c
deleted file mode 100644
index d92ba6e..0000000
--- a/sys/net/core/ipv4/ip4_frag.c
+++ /dev/null
@@ -1,864 +0,0 @@
-/**
- * @file
- * This is the IPv4 packet segmentation and reassembly implementation.
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Jani Monoses <jani@iv.ro>
- *         Simon Goldschmidt
- * original reassembly code by Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV4
-
-#include "net/ip4_frag.h"
-#include "net/def.h"
-#include "net/inet_chksum.h"
-#include "net/netif.h"
-#include "net/stats.h"
-#include "net/icmp.h"
-
-#include <string.h>
-
-#if IP_REASSEMBLY
-/**
- * The IP reassembly code currently has the following limitations:
- * - IP header options are not supported
- * - fragments must not overlap (e.g. due to different routes),
- *   currently, overlapping or duplicate fragments are thrown away
- *   if IP_REASS_CHECK_OVERLAP=1 (the default)!
- *
- * @todo: work with IP header options
- */
-
-/** Setting this to 0, you can turn off checking the fragments for overlapping
- * regions. The code gets a little smaller. Only use this if you know that
- * overlapping won't occur on your network! */
-#ifndef IP_REASS_CHECK_OVERLAP
-#define IP_REASS_CHECK_OVERLAP 1
-#endif /* IP_REASS_CHECK_OVERLAP */
-
-/** Set to 0 to prevent freeing the oldest datagram when the reassembly buffer is
- * full (IP_REASS_MAX_PBUFS pbufs are enqueued). The code gets a little smaller.
- * Datagrams will be freed by timeout only. Especially useful when MEMP_NUM_REASSDATA
- * is set to 1, so one datagram can be reassembled at a time, only. */
-#ifndef IP_REASS_FREE_OLDEST
-#define IP_REASS_FREE_OLDEST 1
-#endif /* IP_REASS_FREE_OLDEST */
-
-#define IP_REASS_FLAG_LASTFRAG 0x01
-
-#define IP_REASS_VALIDATE_TELEGRAM_FINISHED  1
-#define IP_REASS_VALIDATE_PBUF_QUEUED        0
-#define IP_REASS_VALIDATE_PBUF_DROPPED       -1
-
-/** This is a helper struct which holds the starting
- * offset and the ending offset of this fragment to
- * easily chain the fragments.
- * It has the same packing requirements as the IP header, since it replaces
- * the IP header in memory in incoming fragments (after copying it) to keep
- * track of the various fragments. (-> If the IP header doesn't need packing,
- * this struct doesn't need packing, too.)
- */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ip_reass_helper {
-  PACK_STRUCT_FIELD(struct pbuf *next_pbuf);
-  PACK_STRUCT_FIELD(u16_t start);
-  PACK_STRUCT_FIELD(u16_t end);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-#define IP_ADDRESSES_AND_ID_MATCH(iphdrA, iphdrB)  \
-  (ip4_addr_cmp(&(iphdrA)->src, &(iphdrB)->src) && \
-   ip4_addr_cmp(&(iphdrA)->dest, &(iphdrB)->dest) && \
-   IPH_ID(iphdrA) == IPH_ID(iphdrB)) ? 1 : 0
-
-/* global variables */
-static struct ip_reassdata *reassdatagrams;
-static u16_t ip_reass_pbufcount;
-
-/* function prototypes */
-static void ip_reass_dequeue_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev);
-static int ip_reass_free_complete_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev);
-
-/**
- * Reassembly timer base function
- * for both NO_SYS == 0 and 1 (!).
- *
- * Should be called every 1000 msec (defined by IP_TMR_INTERVAL).
- */
-void
-ip_reass_tmr(void)
-{
-  struct ip_reassdata *r, *prev = NULL;
-
-  r = reassdatagrams;
-  while (r != NULL) {
-    /* Decrement the timer. Once it reaches 0,
-     * clean up the incomplete fragment assembly */
-    if (r->timer > 0) {
-      r->timer--;
-      LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass_tmr: timer dec %"U16_F"\n",(u16_t)r->timer));
-      prev = r;
-      r = r->next;
-    } else {
-      /* reassembly timed out */
-      struct ip_reassdata *tmp;
-      LWIP_DEBUGF(IP_REASS_DEBUG, ("ip_reass_tmr: timer timed out\n"));
-      tmp = r;
-      /* get the next pointer before freeing */
-      r = r->next;
-      /* free the helper struct and all enqueued pbufs */
-      ip_reass_free_complete_datagram(tmp, prev);
-     }
-   }
-}
-
-/**
- * Free a datagram (struct ip_reassdata) and all its pbufs.
- * Updates the total count of enqueued pbufs (ip_reass_pbufcount),
- * SNMP counters and sends an ICMP time exceeded packet.
- *
- * @param ipr datagram to free
- * @param prev the previous datagram in the linked list
- * @return the number of pbufs freed
- */
-static int
-ip_reass_free_complete_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev)
-{
-  u16_t pbufs_freed = 0;
-  u16_t clen;
-  struct pbuf *p;
-  struct ip_reass_helper *iprh;
-
-  LWIP_ASSERT("prev != ipr", prev != ipr);
-  if (prev != NULL) {
-    LWIP_ASSERT("prev->next == ipr", prev->next == ipr);
-  }
-
-  MIB2_STATS_INC(mib2.ipreasmfails);
-#if LWIP_ICMP
-  iprh = (struct ip_reass_helper *)ipr->p->payload;
-  if (iprh->start == 0) {
-    /* The first fragment was received, send ICMP time exceeded. */
-    /* First, de-queue the first pbuf from r->p. */
-    p = ipr->p;
-    ipr->p = iprh->next_pbuf;
-    /* Then, copy the original header into it. */
-    SMEMCPY(p->payload, &ipr->iphdr, IP_HLEN);
-    icmp_time_exceeded(p, ICMP_TE_FRAG);
-    clen = pbuf_clen(p);
-    LWIP_ASSERT("pbufs_freed + clen <= 0xffff", pbufs_freed + clen <= 0xffff);
-    pbufs_freed += clen;
-    pbuf_free(p);
-  }
-#endif /* LWIP_ICMP */
-
-  /* First, free all received pbufs.  The individual pbufs need to be released
-     separately as they have not yet been chained */
-  p = ipr->p;
-  while (p != NULL) {
-    struct pbuf *pcur;
-    iprh = (struct ip_reass_helper *)p->payload;
-    pcur = p;
-    /* get the next pointer before freeing */
-    p = iprh->next_pbuf;
-    clen = pbuf_clen(pcur);
-    LWIP_ASSERT("pbufs_freed + clen <= 0xffff", pbufs_freed + clen <= 0xffff);
-    pbufs_freed += clen;
-    pbuf_free(pcur);
-  }
-  /* Then, unchain the struct ip_reassdata from the list and free it. */
-  ip_reass_dequeue_datagram(ipr, prev);
-  LWIP_ASSERT("ip_reass_pbufcount >= clen", ip_reass_pbufcount >= pbufs_freed);
-  ip_reass_pbufcount -= pbufs_freed;
-
-  return pbufs_freed;
-}
-
-#if IP_REASS_FREE_OLDEST
-/**
- * Free the oldest datagram to make room for enqueueing new fragments.
- * The datagram 'fraghdr' belongs to is not freed!
- *
- * @param fraghdr IP header of the current fragment
- * @param pbufs_needed number of pbufs needed to enqueue
- *        (used for freeing other datagrams if not enough space)
- * @return the number of pbufs freed
- */
-static int
-ip_reass_remove_oldest_datagram(struct ip_hdr *fraghdr, int pbufs_needed)
-{
-  /* @todo Can't we simply remove the last datagram in the
-   *       linked list behind reassdatagrams?
-   */
-  struct ip_reassdata *r, *oldest, *prev, *oldest_prev;
-  int pbufs_freed = 0, pbufs_freed_current;
-  int other_datagrams;
-
-  /* Free datagrams until being allowed to enqueue 'pbufs_needed' pbufs,
-   * but don't free the datagram that 'fraghdr' belongs to! */
-  do {
-    oldest = NULL;
-    prev = NULL;
-    oldest_prev = NULL;
-    other_datagrams = 0;
-    r = reassdatagrams;
-    while (r != NULL) {
-      if (!IP_ADDRESSES_AND_ID_MATCH(&r->iphdr, fraghdr)) {
-        /* Not the same datagram as fraghdr */
-        other_datagrams++;
-        if (oldest == NULL) {
-          oldest = r;
-          oldest_prev = prev;
-        } else if (r->timer <= oldest->timer) {
-          /* older than the previous oldest */
-          oldest = r;
-          oldest_prev = prev;
-        }
-      }
-      if (r->next != NULL) {
-        prev = r;
-      }
-      r = r->next;
-    }
-    if (oldest != NULL) {
-      pbufs_freed_current = ip_reass_free_complete_datagram(oldest, oldest_prev);
-      pbufs_freed += pbufs_freed_current;
-    }
-  } while ((pbufs_freed < pbufs_needed) && (other_datagrams > 1));
-  return pbufs_freed;
-}
-#endif /* IP_REASS_FREE_OLDEST */
-
-/**
- * Enqueues a new fragment into the fragment queue
- * @param fraghdr points to the new fragments IP hdr
- * @param clen number of pbufs needed to enqueue (used for freeing other datagrams if not enough space)
- * @return A pointer to the queue location into which the fragment was enqueued
- */
-static struct ip_reassdata*
-ip_reass_enqueue_new_datagram(struct ip_hdr *fraghdr, int clen)
-{
-  struct ip_reassdata* ipr;
-#if ! IP_REASS_FREE_OLDEST
-  LWIP_UNUSED_ARG(clen);
-#endif
-
-  /* No matching previous fragment found, allocate a new reassdata struct */
-  ipr = (struct ip_reassdata *)memp_malloc(MEMP_REASSDATA);
-  if (ipr == NULL) {
-#if IP_REASS_FREE_OLDEST
-    if (ip_reass_remove_oldest_datagram(fraghdr, clen) >= clen) {
-      ipr = (struct ip_reassdata *)memp_malloc(MEMP_REASSDATA);
-    }
-    if (ipr == NULL)
-#endif /* IP_REASS_FREE_OLDEST */
-    {
-      IPFRAG_STATS_INC(ip_frag.memerr);
-      LWIP_DEBUGF(IP_REASS_DEBUG,("Failed to alloc reassdata struct\n"));
-      return NULL;
-    }
-  }
-  memset(ipr, 0, sizeof(struct ip_reassdata));
-  ipr->timer = IP_REASS_MAXAGE;
-
-  /* enqueue the new structure to the front of the list */
-  ipr->next = reassdatagrams;
-  reassdatagrams = ipr;
-  /* copy the ip header for later tests and input */
-  /* @todo: no ip options supported? */
-  SMEMCPY(&(ipr->iphdr), fraghdr, IP_HLEN);
-  return ipr;
-}
-
-/**
- * Dequeues a datagram from the datagram queue. Doesn't deallocate the pbufs.
- * @param ipr points to the queue entry to dequeue
- */
-static void
-ip_reass_dequeue_datagram(struct ip_reassdata *ipr, struct ip_reassdata *prev)
-{
-  /* dequeue the reass struct  */
-  if (reassdatagrams == ipr) {
-    /* it was the first in the list */
-    reassdatagrams = ipr->next;
-  } else {
-    /* it wasn't the first, so it must have a valid 'prev' */
-    LWIP_ASSERT("sanity check linked list", prev != NULL);
-    prev->next = ipr->next;
-  }
-
-  /* now we can free the ip_reassdata struct */
-  memp_free(MEMP_REASSDATA, ipr);
-}
-
-/**
- * Chain a new pbuf into the pbuf list that composes the datagram.  The pbuf list
- * will grow over time as  new pbufs are rx.
- * Also checks that the datagram passes basic continuity checks (if the last
- * fragment was received at least once).
- * @param ipr points to the reassembly state
- * @param new_p points to the pbuf for the current fragment
- * @param is_last is 1 if this pbuf has MF==0 (ipr->flags not updated yet)
- * @return see IP_REASS_VALIDATE_* defines
- */
-static int
-ip_reass_chain_frag_into_datagram_and_validate(struct ip_reassdata *ipr, struct pbuf *new_p, int is_last)
-{
-  struct ip_reass_helper *iprh, *iprh_tmp, *iprh_prev=NULL;
-  struct pbuf *q;
-  u16_t offset, len;
-  struct ip_hdr *fraghdr;
-  int valid = 1;
-
-  /* Extract length and fragment offset from current fragment */
-  fraghdr = (struct ip_hdr*)new_p->payload;
-  len = lwip_ntohs(IPH_LEN(fraghdr)) - IPH_HL(fraghdr) * 4;
-  offset = (lwip_ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) * 8;
-
-  /* overwrite the fragment's ip header from the pbuf with our helper struct,
-   * and setup the embedded helper structure. */
-  /* make sure the struct ip_reass_helper fits into the IP header */
-  LWIP_ASSERT("sizeof(struct ip_reass_helper) <= IP_HLEN",
-              sizeof(struct ip_reass_helper) <= IP_HLEN);
-  iprh = (struct ip_reass_helper*)new_p->payload;
-  iprh->next_pbuf = NULL;
-  iprh->start = offset;
-  iprh->end = offset + len;
-
-  /* Iterate through until we either get to the end of the list (append),
-   * or we find one with a larger offset (insert). */
-  for (q = ipr->p; q != NULL;) {
-    iprh_tmp = (struct ip_reass_helper*)q->payload;
-    if (iprh->start < iprh_tmp->start) {
-      /* the new pbuf should be inserted before this */
-      iprh->next_pbuf = q;
-      if (iprh_prev != NULL) {
-        /* not the fragment with the lowest offset */
-#if IP_REASS_CHECK_OVERLAP
-        if ((iprh->start < iprh_prev->end) || (iprh->end > iprh_tmp->start)) {
-          /* fragment overlaps with previous or following, throw away */
-          goto freepbuf;
-        }
-#endif /* IP_REASS_CHECK_OVERLAP */
-        iprh_prev->next_pbuf = new_p;
-        if (iprh_prev->end != iprh->start) {
-          /* There is a fragment missing between the current
-           * and the previous fragment */
-          valid = 0;
-        }
-      } else {
-#if IP_REASS_CHECK_OVERLAP
-        if (iprh->end > iprh_tmp->start) {
-          /* fragment overlaps with following, throw away */
-          goto freepbuf;
-        }
-#endif /* IP_REASS_CHECK_OVERLAP */
-        /* fragment with the lowest offset */
-        ipr->p = new_p;
-      }
-      break;
-    } else if (iprh->start == iprh_tmp->start) {
-      /* received the same datagram twice: no need to keep the datagram */
-      goto freepbuf;
-#if IP_REASS_CHECK_OVERLAP
-    } else if (iprh->start < iprh_tmp->end) {
-      /* overlap: no need to keep the new datagram */
-      goto freepbuf;
-#endif /* IP_REASS_CHECK_OVERLAP */
-    } else {
-      /* Check if the fragments received so far have no holes. */
-      if (iprh_prev != NULL) {
-        if (iprh_prev->end != iprh_tmp->start) {
-          /* There is a fragment missing between the current
-           * and the previous fragment */
-          valid = 0;
-        }
-      }
-    }
-    q = iprh_tmp->next_pbuf;
-    iprh_prev = iprh_tmp;
-  }
-
-  /* If q is NULL, then we made it to the end of the list. Determine what to do now */
-  if (q == NULL) {
-    if (iprh_prev != NULL) {
-      /* this is (for now), the fragment with the highest offset:
-       * chain it to the last fragment */
-#if IP_REASS_CHECK_OVERLAP
-      LWIP_ASSERT("check fragments don't overlap", iprh_prev->end <= iprh->start);
-#endif /* IP_REASS_CHECK_OVERLAP */
-      iprh_prev->next_pbuf = new_p;
-      if (iprh_prev->end != iprh->start) {
-        valid = 0;
-      }
-    } else {
-#if IP_REASS_CHECK_OVERLAP
-      LWIP_ASSERT("no previous fragment, this must be the first fragment!",
-        ipr->p == NULL);
-#endif /* IP_REASS_CHECK_OVERLAP */
-      /* this is the first fragment we ever received for this ip datagram */
-      ipr->p = new_p;
-    }
-  }
-
-  /* At this point, the validation part begins: */
-  /* If we already received the last fragment */
-  if (is_last || ((ipr->flags & IP_REASS_FLAG_LASTFRAG) != 0)) {
-    /* and had no holes so far */
-    if (valid) {
-      /* then check if the rest of the fragments is here */
-      /* Check if the queue starts with the first datagram */
-      if ((ipr->p == NULL) || (((struct ip_reass_helper*)ipr->p->payload)->start != 0)) {
-        valid = 0;
-      } else {
-        /* and check that there are no holes after this datagram */
-        iprh_prev = iprh;
-        q = iprh->next_pbuf;
-        while (q != NULL) {
-          iprh = (struct ip_reass_helper*)q->payload;
-          if (iprh_prev->end != iprh->start) {
-            valid = 0;
-            break;
-          }
-          iprh_prev = iprh;
-          q = iprh->next_pbuf;
-        }
-        /* if still valid, all fragments are received
-         * (because to the MF==0 already arrived */
-        if (valid) {
-          LWIP_ASSERT("sanity check", ipr->p != NULL);
-          LWIP_ASSERT("sanity check",
-            ((struct ip_reass_helper*)ipr->p->payload) != iprh);
-          LWIP_ASSERT("validate_datagram:next_pbuf!=NULL",
-            iprh->next_pbuf == NULL);
-        }
-      }
-    }
-    /* If valid is 0 here, there are some fragments missing in the middle
-     * (since MF == 0 has already arrived). Such datagrams simply time out if
-     * no more fragments are received... */
-    return valid ? IP_REASS_VALIDATE_TELEGRAM_FINISHED : IP_REASS_VALIDATE_PBUF_QUEUED;
-  }
-  /* If we come here, not all fragments were received, yet! */
-  return IP_REASS_VALIDATE_PBUF_QUEUED; /* not yet valid! */
-#if IP_REASS_CHECK_OVERLAP
-freepbuf:
-  ip_reass_pbufcount -= pbuf_clen(new_p);
-  pbuf_free(new_p);
-  return IP_REASS_VALIDATE_PBUF_DROPPED;
-#endif /* IP_REASS_CHECK_OVERLAP */
-}
-
-/**
- * Reassembles incoming IP fragments into an IP datagram.
- *
- * @param p points to a pbuf chain of the fragment
- * @return NULL if reassembly is incomplete, ? otherwise
- */
-struct pbuf *
-ip4_reass(struct pbuf *p)
-{
-  struct pbuf *r;
-  struct ip_hdr *fraghdr;
-  struct ip_reassdata *ipr;
-  struct ip_reass_helper *iprh;
-  u16_t offset, len, clen;
-  int valid;
-  int is_last;
-
-  IPFRAG_STATS_INC(ip_frag.recv);
-  MIB2_STATS_INC(mib2.ipreasmreqds);
-
-  fraghdr = (struct ip_hdr*)p->payload;
-
-  if ((IPH_HL(fraghdr) * 4) != IP_HLEN) {
-    LWIP_DEBUGF(IP_REASS_DEBUG,("ip4_reass: IP options currently not supported!\n"));
-    IPFRAG_STATS_INC(ip_frag.err);
-    goto nullreturn;
-  }
-
-  offset = (lwip_ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) * 8;
-  len = lwip_ntohs(IPH_LEN(fraghdr)) - IPH_HL(fraghdr) * 4;
-
-  /* Check if we are allowed to enqueue more datagrams. */
-  clen = pbuf_clen(p);
-  if ((ip_reass_pbufcount + clen) > IP_REASS_MAX_PBUFS) {
-#if IP_REASS_FREE_OLDEST
-    if (!ip_reass_remove_oldest_datagram(fraghdr, clen) ||
-        ((ip_reass_pbufcount + clen) > IP_REASS_MAX_PBUFS))
-#endif /* IP_REASS_FREE_OLDEST */
-    {
-      /* No datagram could be freed and still too many pbufs enqueued */
-      LWIP_DEBUGF(IP_REASS_DEBUG,("ip4_reass: Overflow condition: pbufct=%d, clen=%d, MAX=%d\n",
-        ip_reass_pbufcount, clen, IP_REASS_MAX_PBUFS));
-      IPFRAG_STATS_INC(ip_frag.memerr);
-      /* @todo: send ICMP time exceeded here? */
-      /* drop this pbuf */
-      goto nullreturn;
-    }
-  }
-
-  /* Look for the datagram the fragment belongs to in the current datagram queue,
-   * remembering the previous in the queue for later dequeueing. */
-  for (ipr = reassdatagrams; ipr != NULL; ipr = ipr->next) {
-    /* Check if the incoming fragment matches the one currently present
-       in the reassembly buffer. If so, we proceed with copying the
-       fragment into the buffer. */
-    if (IP_ADDRESSES_AND_ID_MATCH(&ipr->iphdr, fraghdr)) {
-      LWIP_DEBUGF(IP_REASS_DEBUG, ("ip4_reass: matching previous fragment ID=%"X16_F"\n",
-        lwip_ntohs(IPH_ID(fraghdr))));
-      IPFRAG_STATS_INC(ip_frag.cachehit);
-      break;
-    }
-  }
-
-  if (ipr == NULL) {
-  /* Enqueue a new datagram into the datagram queue */
-    ipr = ip_reass_enqueue_new_datagram(fraghdr, clen);
-    /* Bail if unable to enqueue */
-    if (ipr == NULL) {
-      goto nullreturn;
-    }
-  } else {
-    if (((lwip_ntohs(IPH_OFFSET(fraghdr)) & IP_OFFMASK) == 0) &&
-      ((lwip_ntohs(IPH_OFFSET(&ipr->iphdr)) & IP_OFFMASK) != 0)) {
-      /* ipr->iphdr is not the header from the first fragment, but fraghdr is
-       * -> copy fraghdr into ipr->iphdr since we want to have the header
-       * of the first fragment (for ICMP time exceeded and later, for copying
-       * all options, if supported)*/
-      SMEMCPY(&ipr->iphdr, fraghdr, IP_HLEN);
-    }
-  }
-
-  /* At this point, we have either created a new entry or pointing
-   * to an existing one */
-
-  /* check for 'no more fragments', and update queue entry*/
-  is_last = (IPH_OFFSET(fraghdr) & PP_NTOHS(IP_MF)) == 0;
-  if (is_last) {
-    u16_t datagram_len = (u16_t)(offset + len);
-    if ((datagram_len < offset) || (datagram_len > (0xFFFF - IP_HLEN))) {
-      /* u16_t overflow, cannot handle this */
-      goto nullreturn;
-    }
-  }
-  /* find the right place to insert this pbuf */
-  /* @todo: trim pbufs if fragments are overlapping */
-  valid = ip_reass_chain_frag_into_datagram_and_validate(ipr, p, is_last);
-  if (valid == IP_REASS_VALIDATE_PBUF_DROPPED) {
-    goto nullreturn;
-  }
-  /* if we come here, the pbuf has been enqueued */
-
-  /* Track the current number of pbufs current 'in-flight', in order to limit
-     the number of fragments that may be enqueued at any one time
-     (overflow checked by testing against IP_REASS_MAX_PBUFS) */
-  ip_reass_pbufcount = (u16_t)(ip_reass_pbufcount + clen);
-  if (is_last) {
-    u16_t datagram_len = (u16_t)(offset + len);
-    ipr->datagram_len = datagram_len;
-    ipr->flags |= IP_REASS_FLAG_LASTFRAG;
-    LWIP_DEBUGF(IP_REASS_DEBUG,
-     ("ip4_reass: last fragment seen, total len %"S16_F"\n",
-      ipr->datagram_len));
-  }
-
-  if (valid == IP_REASS_VALIDATE_TELEGRAM_FINISHED) {
-    struct ip_reassdata *ipr_prev;
-    /* the totally last fragment (flag more fragments = 0) was received at least
-     * once AND all fragments are received */
-    ipr->datagram_len += IP_HLEN;
-
-    /* save the second pbuf before copying the header over the pointer */
-    r = ((struct ip_reass_helper*)ipr->p->payload)->next_pbuf;
-
-    /* copy the original ip header back to the first pbuf */
-    fraghdr = (struct ip_hdr*)(ipr->p->payload);
-    SMEMCPY(fraghdr, &ipr->iphdr, IP_HLEN);
-    IPH_LEN_SET(fraghdr, lwip_htons(ipr->datagram_len));
-    IPH_OFFSET_SET(fraghdr, 0);
-    IPH_CHKSUM_SET(fraghdr, 0);
-    /* @todo: do we need to set/calculate the correct checksum? */
-#if CHECKSUM_GEN_IP
-    IF__NETIF_CHECKSUM_ENABLED(ip_current_input_netif(), NETIF_CHECKSUM_GEN_IP) {
-      IPH_CHKSUM_SET(fraghdr, inet_chksum(fraghdr, IP_HLEN));
-    }
-#endif /* CHECKSUM_GEN_IP */
-
-    p = ipr->p;
-
-    /* chain together the pbufs contained within the reass_data list. */
-    while (r != NULL) {
-      iprh = (struct ip_reass_helper*)r->payload;
-
-      /* hide the ip header for every succeeding fragment */
-      pbuf_header(r, -IP_HLEN);
-      pbuf_cat(p, r);
-      r = iprh->next_pbuf;
-    }
-
-    /* find the previous entry in the linked list */
-    if (ipr == reassdatagrams) {
-      ipr_prev = NULL;
-    } else {
-      for (ipr_prev = reassdatagrams; ipr_prev != NULL; ipr_prev = ipr_prev->next) {
-        if (ipr_prev->next == ipr) {
-          break;
-        }
-      }
-    }
-
-    /* release the sources allocate for the fragment queue entry */
-    ip_reass_dequeue_datagram(ipr, ipr_prev);
-
-    /* and adjust the number of pbufs currently queued for reassembly. */
-    ip_reass_pbufcount -= pbuf_clen(p);
-
-    MIB2_STATS_INC(mib2.ipreasmoks);
-
-    /* Return the pbuf chain */
-    return p;
-  }
-  /* the datagram is not (yet?) reassembled completely */
-  LWIP_DEBUGF(IP_REASS_DEBUG,("ip_reass_pbufcount: %d out\n", ip_reass_pbufcount));
-  return NULL;
-
-nullreturn:
-  LWIP_DEBUGF(IP_REASS_DEBUG,("ip4_reass: nullreturn\n"));
-  IPFRAG_STATS_INC(ip_frag.drop);
-  pbuf_free(p);
-  return NULL;
-}
-#endif /* IP_REASSEMBLY */
-
-#if IP_FRAG
-#if !LWIP_NETIF_TX_SINGLE_PBUF
-/** Allocate a new struct pbuf_custom_ref */
-static struct pbuf_custom_ref*
-ip_frag_alloc_pbuf_custom_ref(void)
-{
-  return (struct pbuf_custom_ref*)memp_malloc(MEMP_FRAG_PBUF);
-}
-
-/** Free a struct pbuf_custom_ref */
-static void
-ip_frag_free_pbuf_custom_ref(struct pbuf_custom_ref* p)
-{
-  LWIP_ASSERT("p != NULL", p != NULL);
-  memp_free(MEMP_FRAG_PBUF, p);
-}
-
-/** Free-callback function to free a 'struct pbuf_custom_ref', called by
- * pbuf_free. */
-static void
-ipfrag_free_pbuf_custom(struct pbuf *p)
-{
-  struct pbuf_custom_ref *pcr = (struct pbuf_custom_ref*)p;
-  LWIP_ASSERT("pcr != NULL", pcr != NULL);
-  LWIP_ASSERT("pcr == p", (void*)pcr == (void*)p);
-  if (pcr->original != NULL) {
-    pbuf_free(pcr->original);
-  }
-  ip_frag_free_pbuf_custom_ref(pcr);
-}
-#endif /* !LWIP_NETIF_TX_SINGLE_PBUF */
-
-/**
- * Fragment an IP datagram if too large for the netif.
- *
- * Chop the datagram in MTU sized chunks and send them in order
- * by pointing PBUF_REFs into p.
- *
- * @param p ip packet to send
- * @param netif the netif on which to send
- * @param dest destination ip address to which to send
- *
- * @return ERR_OK if sent successfully, err_t otherwise
- */
-err_t
-ip4_frag(struct pbuf *p, struct netif *netif, const ip4_addr_t *dest)
-{
-  struct pbuf *rambuf;
-#if !LWIP_NETIF_TX_SINGLE_PBUF
-  struct pbuf *newpbuf;
-  u16_t newpbuflen = 0;
-  u16_t left_to_copy;
-#endif
-  struct ip_hdr *original_iphdr;
-  struct ip_hdr *iphdr;
-  const u16_t nfb = (netif->mtu - IP_HLEN) / 8;
-  u16_t left, fragsize;
-  u16_t ofo;
-  int last;
-  u16_t poff = IP_HLEN;
-  u16_t tmp;
-
-  original_iphdr = (struct ip_hdr *)p->payload;
-  iphdr = original_iphdr;
-  LWIP_ERROR("ip4_frag() does not support IP options", IPH_HL(iphdr) * 4 == IP_HLEN, return ERR_VAL);
-
-  /* Save original offset */
-  tmp = lwip_ntohs(IPH_OFFSET(iphdr));
-  ofo = tmp & IP_OFFMASK;
-  LWIP_ERROR("ip_frag(): MF already set", (tmp & IP_MF) == 0, return ERR_VAL);
-
-  left = p->tot_len - IP_HLEN;
-
-  while (left) {
-    /* Fill this fragment */
-    fragsize = LWIP_MIN(left, nfb * 8);
-
-#if LWIP_NETIF_TX_SINGLE_PBUF
-    rambuf = pbuf_alloc(PBUF_IP, fragsize, PBUF_RAM);
-    if (rambuf == NULL) {
-      goto memerr;
-    }
-    LWIP_ASSERT("this needs a pbuf in one piece!",
-      (rambuf->len == rambuf->tot_len) && (rambuf->next == NULL));
-    poff += pbuf_copy_partial(p, rambuf->payload, fragsize, poff);
-    /* make room for the IP header */
-    if (pbuf_header(rambuf, IP_HLEN)) {
-      pbuf_free(rambuf);
-      goto memerr;
-    }
-    /* fill in the IP header */
-    SMEMCPY(rambuf->payload, original_iphdr, IP_HLEN);
-    iphdr = (struct ip_hdr*)rambuf->payload;
-#else /* LWIP_NETIF_TX_SINGLE_PBUF */
-    /* When not using a static buffer, create a chain of pbufs.
-     * The first will be a PBUF_RAM holding the link and IP header.
-     * The rest will be PBUF_REFs mirroring the pbuf chain to be fragged,
-     * but limited to the size of an mtu.
-     */
-    rambuf = pbuf_alloc(PBUF_LINK, IP_HLEN, PBUF_RAM);
-    if (rambuf == NULL) {
-      goto memerr;
-    }
-    LWIP_ASSERT("this needs a pbuf in one piece!",
-                (p->len >= (IP_HLEN)));
-    SMEMCPY(rambuf->payload, original_iphdr, IP_HLEN);
-    iphdr = (struct ip_hdr *)rambuf->payload;
-
-    left_to_copy = fragsize;
-    while (left_to_copy) {
-      struct pbuf_custom_ref *pcr;
-      u16_t plen = p->len - poff;
-      newpbuflen = LWIP_MIN(left_to_copy, plen);
-      /* Is this pbuf already empty? */
-      if (!newpbuflen) {
-        poff = 0;
-        p = p->next;
-        continue;
-      }
-      pcr = ip_frag_alloc_pbuf_custom_ref();
-      if (pcr == NULL) {
-        pbuf_free(rambuf);
-        goto memerr;
-      }
-      /* Mirror this pbuf, although we might not need all of it. */
-      newpbuf = pbuf_alloced_custom(PBUF_RAW, newpbuflen, PBUF_REF, &pcr->pc,
-        (u8_t*)p->payload + poff, newpbuflen);
-      if (newpbuf == NULL) {
-        ip_frag_free_pbuf_custom_ref(pcr);
-        pbuf_free(rambuf);
-        goto memerr;
-      }
-      pbuf_ref(p);
-      pcr->original = p;
-      pcr->pc.custom_free_function = ipfrag_free_pbuf_custom;
-
-      /* Add it to end of rambuf's chain, but using pbuf_cat, not pbuf_chain
-       * so that it is removed when pbuf_dechain is later called on rambuf.
-       */
-      pbuf_cat(rambuf, newpbuf);
-      left_to_copy -= newpbuflen;
-      if (left_to_copy) {
-        poff = 0;
-        p = p->next;
-      }
-    }
-    poff += newpbuflen;
-#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
-
-    /* Correct header */
-    last = (left <= netif->mtu - IP_HLEN);
-
-    /* Set new offset and MF flag */
-    tmp = (IP_OFFMASK & (ofo));
-    if (!last) {
-      tmp = tmp | IP_MF;
-    }
-    IPH_OFFSET_SET(iphdr, lwip_htons(tmp));
-    IPH_LEN_SET(iphdr, lwip_htons(fragsize + IP_HLEN));
-    IPH_CHKSUM_SET(iphdr, 0);
-#if CHECKSUM_GEN_IP
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_IP) {
-      IPH_CHKSUM_SET(iphdr, inet_chksum(iphdr, IP_HLEN));
-    }
-#endif /* CHECKSUM_GEN_IP */
-
-    /* No need for separate header pbuf - we allowed room for it in rambuf
-     * when allocated.
-     */
-    netif->output(netif, rambuf, dest);
-    IPFRAG_STATS_INC(ip_frag.xmit);
-
-    /* Unfortunately we can't reuse rambuf - the hardware may still be
-     * using the buffer. Instead we free it (and the ensuing chain) and
-     * recreate it next time round the loop. If we're lucky the hardware
-     * will have already sent the packet, the free will really free, and
-     * there will be zero memory penalty.
-     */
-
-    pbuf_free(rambuf);
-    left -= fragsize;
-    ofo += nfb;
-  }
-  MIB2_STATS_INC(mib2.ipfragoks);
-  return ERR_OK;
-memerr:
-  MIB2_STATS_INC(mib2.ipfragfails);
-  return ERR_MEM;
-}
-#endif /* IP_FRAG */
-
-#endif /* LWIP_IPV4 */
diff --git a/sys/net/core/ipv6/Makefile b/sys/net/core/ipv6/Makefile
deleted file mode 100644
index 71d058c..0000000
--- a/sys/net/core/ipv6/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile,v 1.2 2004/07/20 21:17:05 reddawg Exp $
-
-# Include Global 'Source' Options
-include ../../../../Makefile.incl
-include ../../../Makefile.incl
-
-#  Objects
-OBJS = dhcp6.o ethip6.o icmp6.o inet6.o ip6.o ip6_addr.o ip6_frag.o mld6.o nd6.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../../include -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../../include -S -o $@ $<
-.c.o:
-	$(CC) ${CFLAGS} -I../../../include -c -o $@ $<
-.c.s:
-	$(CC) ${CFLAGS} -I../../../include -S -o $@ $<
-.S.o:
-	$(CC) ${CFLAGS} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
-	
diff --git a/sys/net/core/ipv6/dhcp6.c b/sys/net/core/ipv6/dhcp6.c
deleted file mode 100644
index 6fc0301..0000000
--- a/sys/net/core/ipv6/dhcp6.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * @file
- *
- * DHCPv6.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV6 && LWIP_IPV6_DHCP6 /* don't build if not configured for use in lwipopts.h */
-
-#include "lwip/ip6_addr.h"
-#include "lwip/def.h"
-
-
-#endif /* LWIP_IPV6 && LWIP_IPV6_DHCP6 */
diff --git a/sys/net/core/ipv6/ethip6.c b/sys/net/core/ipv6/ethip6.c
deleted file mode 100644
index eedfad3..0000000
--- a/sys/net/core/ipv6/ethip6.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * @file
- *
- * Ethernet output for IPv6. Uses ND tables for link-layer addressing.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV6 && LWIP_ETHERNET
-
-#include "net/ethip6.h"
-#include "net/nd6.h"
-#include "net/pbuf.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/inet_chksum.h"
-#include "net/netif.h"
-#include "net/icmp6.h"
-#include "net/prot/ethernet.h"
-#include "netif/ethernet.h"
-
-#include <string.h>
-
-/**
- * Resolve and fill-in Ethernet address header for outgoing IPv6 packet.
- *
- * For IPv6 multicast, corresponding Ethernet addresses
- * are selected and the packet is transmitted on the link.
- *
- * For unicast addresses, ask the ND6 module what to do. It will either let us
- * send the the packet right away, or queue the packet for later itself, unless
- * an error occurs.
- *
- * @todo anycast addresses
- *
- * @param netif The lwIP network interface which the IP packet will be sent on.
- * @param q The pbuf(s) containing the IP packet to be sent.
- * @param ip6addr The IP address of the packet destination.
- *
- * @return
- * - ERR_OK or the return value of @ref nd6_get_next_hop_addr_or_queue.
- */
-err_t
-ethip6_output(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr)
-{
-  struct eth_addr dest;
-  const u8_t *hwaddr;
-  err_t result;
-
-  /* multicast destination IP address? */
-  if (ip6_addr_ismulticast(ip6addr)) {
-    /* Hash IP multicast address to MAC address.*/
-    dest.addr[0] = 0x33;
-    dest.addr[1] = 0x33;
-    dest.addr[2] = ((const u8_t *)(&(ip6addr->addr[3])))[0];
-    dest.addr[3] = ((const u8_t *)(&(ip6addr->addr[3])))[1];
-    dest.addr[4] = ((const u8_t *)(&(ip6addr->addr[3])))[2];
-    dest.addr[5] = ((const u8_t *)(&(ip6addr->addr[3])))[3];
-
-    /* Send out. */
-    return ethernet_output(netif, q, (const struct eth_addr*)(netif->hwaddr), &dest, ETHTYPE_IPV6);
-  }
-
-  /* We have a unicast destination IP address */
-  /* @todo anycast? */
-
-  /* Ask ND6 what to do with the packet. */
-  result = nd6_get_next_hop_addr_or_queue(netif, q, ip6addr, &hwaddr);
-  if (result != ERR_OK) {
-    return result;
-  }
-
-  /* If no hardware address is returned, nd6 has queued the packet for later. */
-  if (hwaddr == NULL) {
-    return ERR_OK;
-  }
-
-  /* Send out the packet using the returned hardware address. */
-  SMEMCPY(dest.addr, hwaddr, 6);
-  return ethernet_output(netif, q, (const struct eth_addr*)(netif->hwaddr), &dest, ETHTYPE_IPV6);
-}
-
-#endif /* LWIP_IPV6 && LWIP_ETHERNET */
diff --git a/sys/net/core/ipv6/icmp6.c b/sys/net/core/ipv6/icmp6.c
deleted file mode 100644
index 1a4cf76..0000000
--- a/sys/net/core/ipv6/icmp6.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/**
- * @file
- *
- * IPv6 version of ICMP, as per RFC 4443.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#include "net/opt.h"
-
-#if LWIP_ICMP6 && LWIP_IPV6 /* don't build if not configured for use in lwipopts.h */
-
-#include "net/icmp6.h"
-#include "net/prot/icmp6.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/inet_chksum.h"
-#include "net/pbuf.h"
-#include "net/netif.h"
-#include "net/nd6.h"
-#include "net/mld6.h"
-#include "net/ip.h"
-#include "net/stats.h"
-
-#include <string.h>
-
-#ifndef LWIP_ICMP6_DATASIZE
-#define LWIP_ICMP6_DATASIZE   8
-#endif
-#if LWIP_ICMP6_DATASIZE == 0
-#define LWIP_ICMP6_DATASIZE   8
-#endif
-
-/* Forward declarations */
-static void icmp6_send_response(struct pbuf *p, u8_t code, u32_t data, u8_t type);
-
-
-/**
- * Process an input ICMPv6 message. Called by ip6_input.
- *
- * Will generate a reply for echo requests. Other messages are forwarded
- * to nd6_input, or mld6_input.
- *
- * @param p the mld packet, p->payload pointing to the icmpv6 header
- * @param inp the netif on which this packet was received
- */
-void
-icmp6_input(struct pbuf *p, struct netif *inp)
-{
-  struct icmp6_hdr *icmp6hdr;
-  struct pbuf *r;
-  const ip6_addr_t *reply_src;
-
-  ICMP6_STATS_INC(icmp6.recv);
-
-  /* Check that ICMPv6 header fits in payload */
-  if (p->len < sizeof(struct icmp6_hdr)) {
-    /* drop short packets */
-    pbuf_free(p);
-    ICMP6_STATS_INC(icmp6.lenerr);
-    ICMP6_STATS_INC(icmp6.drop);
-    return;
-  }
-
-  icmp6hdr = (struct icmp6_hdr *)p->payload;
-
-#if CHECKSUM_CHECK_ICMP6
-  IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_CHECK_ICMP6) {
-    if (ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->tot_len, ip6_current_src_addr(),
-                          ip6_current_dest_addr()) != 0) {
-      /* Checksum failed */
-      pbuf_free(p);
-      ICMP6_STATS_INC(icmp6.chkerr);
-      ICMP6_STATS_INC(icmp6.drop);
-      return;
-    }
-  }
-#endif /* CHECKSUM_CHECK_ICMP6 */
-
-  switch (icmp6hdr->type) {
-  case ICMP6_TYPE_NA: /* Neighbor advertisement */
-  case ICMP6_TYPE_NS: /* Neighbor solicitation */
-  case ICMP6_TYPE_RA: /* Router advertisement */
-  case ICMP6_TYPE_RD: /* Redirect */
-  case ICMP6_TYPE_PTB: /* Packet too big */
-    nd6_input(p, inp);
-    return;
-    break;
-  case ICMP6_TYPE_RS:
-#if LWIP_IPV6_FORWARD
-    /* @todo implement router functionality */
-#endif
-    break;
-#if LWIP_IPV6_MLD
-  case ICMP6_TYPE_MLQ:
-  case ICMP6_TYPE_MLR:
-  case ICMP6_TYPE_MLD:
-    mld6_input(p, inp);
-    return;
-    break;
-#endif
-  case ICMP6_TYPE_EREQ:
-#if !LWIP_MULTICAST_PING
-    /* multicast destination address? */
-    if (ip6_addr_ismulticast(ip6_current_dest_addr())) {
-      /* drop */
-      pbuf_free(p);
-      ICMP6_STATS_INC(icmp6.drop);
-      return;
-    }
-#endif /* LWIP_MULTICAST_PING */
-
-    /* Allocate reply. */
-    r = pbuf_alloc(PBUF_IP, p->tot_len, PBUF_RAM);
-    if (r == NULL) {
-      /* drop */
-      pbuf_free(p);
-      ICMP6_STATS_INC(icmp6.memerr);
-      return;
-    }
-
-    /* Copy echo request. */
-    if (pbuf_copy(r, p) != ERR_OK) {
-      /* drop */
-      pbuf_free(p);
-      pbuf_free(r);
-      ICMP6_STATS_INC(icmp6.err);
-      return;
-    }
-
-    /* Determine reply source IPv6 address. */
-#if LWIP_MULTICAST_PING
-    if (ip6_addr_ismulticast(ip6_current_dest_addr())) {
-      reply_src = ip_2_ip6(ip6_select_source_address(inp, ip6_current_src_addr()));
-      if (reply_src == NULL) {
-        /* drop */
-        pbuf_free(p);
-        pbuf_free(r);
-        ICMP6_STATS_INC(icmp6.rterr);
-        return;
-      }
-    }
-    else
-#endif /* LWIP_MULTICAST_PING */
-    {
-      reply_src = ip6_current_dest_addr();
-    }
-
-    /* Set fields in reply. */
-    ((struct icmp6_echo_hdr *)(r->payload))->type = ICMP6_TYPE_EREP;
-    ((struct icmp6_echo_hdr *)(r->payload))->chksum = 0;
-#if CHECKSUM_GEN_ICMP6
-    IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_GEN_ICMP6) {
-      ((struct icmp6_echo_hdr *)(r->payload))->chksum = ip6_chksum_pseudo(r,
-          IP6_NEXTH_ICMP6, r->tot_len, reply_src, ip6_current_src_addr());
-    }
-#endif /* CHECKSUM_GEN_ICMP6 */
-
-    /* Send reply. */
-    ICMP6_STATS_INC(icmp6.xmit);
-    ip6_output_if(r, reply_src, ip6_current_src_addr(),
-        LWIP_ICMP6_HL, 0, IP6_NEXTH_ICMP6, inp);
-    pbuf_free(r);
-
-    break;
-  default:
-    ICMP6_STATS_INC(icmp6.proterr);
-    ICMP6_STATS_INC(icmp6.drop);
-    break;
-  }
-
-  pbuf_free(p);
-}
-
-
-/**
- * Send an icmpv6 'destination unreachable' packet.
- *
- * @param p the input packet for which the 'unreachable' should be sent,
- *          p->payload pointing to the IPv6 header
- * @param c ICMPv6 code for the unreachable type
- */
-void
-icmp6_dest_unreach(struct pbuf *p, enum icmp6_dur_code c)
-{
-  icmp6_send_response(p, c, 0, ICMP6_TYPE_DUR);
-}
-
-/**
- * Send an icmpv6 'packet too big' packet.
- *
- * @param p the input packet for which the 'packet too big' should be sent,
- *          p->payload pointing to the IPv6 header
- * @param mtu the maximum mtu that we can accept
- */
-void
-icmp6_packet_too_big(struct pbuf *p, u32_t mtu)
-{
-  icmp6_send_response(p, 0, mtu, ICMP6_TYPE_PTB);
-}
-
-/**
- * Send an icmpv6 'time exceeded' packet.
- *
- * @param p the input packet for which the 'unreachable' should be sent,
- *          p->payload pointing to the IPv6 header
- * @param c ICMPv6 code for the time exceeded type
- */
-void
-icmp6_time_exceeded(struct pbuf *p, enum icmp6_te_code c)
-{
-  icmp6_send_response(p, c, 0, ICMP6_TYPE_TE);
-}
-
-/**
- * Send an icmpv6 'parameter problem' packet.
- *
- * @param p the input packet for which the 'param problem' should be sent,
- *          p->payload pointing to the IP header
- * @param c ICMPv6 code for the param problem type
- * @param pointer the pointer to the byte where the parameter is found
- */
-void
-icmp6_param_problem(struct pbuf *p, enum icmp6_pp_code c, u32_t pointer)
-{
-  icmp6_send_response(p, c, pointer, ICMP6_TYPE_PP);
-}
-
-/**
- * Send an ICMPv6 packet in response to an incoming packet.
- *
- * @param p the input packet for which the response should be sent,
- *          p->payload pointing to the IPv6 header
- * @param code Code of the ICMPv6 header
- * @param data Additional 32-bit parameter in the ICMPv6 header
- * @param type Type of the ICMPv6 header
- */
-static void
-icmp6_send_response(struct pbuf *p, u8_t code, u32_t data, u8_t type)
-{
-  struct pbuf *q;
-  struct icmp6_hdr *icmp6hdr;
-  const ip6_addr_t *reply_src;
-  ip6_addr_t *reply_dest;
-  ip6_addr_t reply_src_local, reply_dest_local;
-  struct ip6_hdr *ip6hdr;
-  struct netif *netif;
-
-  /* ICMPv6 header + IPv6 header + data */
-  q = pbuf_alloc(PBUF_IP, sizeof(struct icmp6_hdr) + IP6_HLEN + LWIP_ICMP6_DATASIZE,
-                 PBUF_RAM);
-  if (q == NULL) {
-    LWIP_DEBUGF(ICMP_DEBUG, ("icmp_time_exceeded: failed to allocate pbuf for ICMPv6 packet.\n"));
-    ICMP6_STATS_INC(icmp6.memerr);
-    return;
-  }
-  LWIP_ASSERT("check that first pbuf can hold icmp 6message",
-             (q->len >= (sizeof(struct icmp6_hdr) + IP6_HLEN + LWIP_ICMP6_DATASIZE)));
-
-  icmp6hdr = (struct icmp6_hdr *)q->payload;
-  icmp6hdr->type = type;
-  icmp6hdr->code = code;
-  icmp6hdr->data = data;
-
-  /* copy fields from original packet */
-  SMEMCPY((u8_t *)q->payload + sizeof(struct icmp6_hdr), (u8_t *)p->payload,
-          IP6_HLEN + LWIP_ICMP6_DATASIZE);
-
-  /* Get the destination address and netif for this ICMP message. */
-  if ((ip_current_netif() == NULL) ||
-      ((code == ICMP6_TE_FRAG) && (type == ICMP6_TYPE_TE))) {
-    /* Special case, as ip6_current_xxx is either NULL, or points
-     * to a different packet than the one that expired.
-     * We must use the addresses that are stored in the expired packet. */
-    ip6hdr = (struct ip6_hdr *)p->payload;
-    /* copy from packed address to aligned address */
-    ip6_addr_copy(reply_dest_local, ip6hdr->src);
-    ip6_addr_copy(reply_src_local, ip6hdr->dest);
-    reply_dest = &reply_dest_local;
-    reply_src = &reply_src_local;
-    netif = ip6_route(reply_src, reply_dest);
-    if (netif == NULL) {
-      /* drop */
-      pbuf_free(q);
-      ICMP6_STATS_INC(icmp6.rterr);
-      return;
-    }
-  }
-  else {
-    netif = ip_current_netif();
-    reply_dest = ip6_current_src_addr();
-
-    /* Select an address to use as source. */
-    reply_src = ip_2_ip6(ip6_select_source_address(netif, reply_dest));
-    if (reply_src == NULL) {
-      /* drop */
-      pbuf_free(q);
-      ICMP6_STATS_INC(icmp6.rterr);
-      return;
-    }
-  }
-
-  /* calculate checksum */
-  icmp6hdr->chksum = 0;
-#if CHECKSUM_GEN_ICMP6
-  IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_ICMP6) {
-    icmp6hdr->chksum = ip6_chksum_pseudo(q, IP6_NEXTH_ICMP6, q->tot_len,
-      reply_src, reply_dest);
-  }
-#endif /* CHECKSUM_GEN_ICMP6 */
-
-  ICMP6_STATS_INC(icmp6.xmit);
-  ip6_output_if(q, reply_src, reply_dest, LWIP_ICMP6_HL, 0, IP6_NEXTH_ICMP6, netif);
-  pbuf_free(q);
-}
-
-#endif /* LWIP_ICMP6 && LWIP_IPV6 */
diff --git a/sys/net/core/ipv6/inet6.c b/sys/net/core/ipv6/inet6.c
deleted file mode 100644
index 47c69e7..0000000
--- a/sys/net/core/ipv6/inet6.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * @file
- *
- * INET v6 addresses.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV6 && LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
-
-#include "net/def.h"
-#include "net/inet.h"
-
-/** This variable is initialized by the system to contain the wildcard IPv6 address.
- */
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-
-#endif /* LWIP_IPV6 */
diff --git a/sys/net/core/ipv6/ip6.c b/sys/net/core/ipv6/ip6.c
deleted file mode 100644
index 5457b1b..0000000
--- a/sys/net/core/ipv6/ip6.c
+++ /dev/null
@@ -1,1122 +0,0 @@
-/**
- * @file
- *
- * IPv6 layer.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
-
-#include "net/def.h"
-#include "net/mem.h"
-#include "net/netif.h"
-#include "net/ip.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/ip6_frag.h"
-#include "net/icmp6.h"
-#include "net/raw.h"
-#include "net/udp.h"
-#include "net/priv/tcp_priv.h"
-#include "net/dhcp6.h"
-#include "net/nd6.h"
-#include "net/mld6.h"
-#include "net/debug.h"
-#include "net/stats.h"
-
-#ifdef LWIP_HOOK_FILENAME
-#include LWIP_HOOK_FILENAME
-#endif
-
-/**
- * Finds the appropriate network interface for a given IPv6 address. It tries to select
- * a netif following a sequence of heuristics:
- * 1) if there is only 1 netif, return it
- * 2) if the destination is a link-local address, try to match the src address to a netif.
- *    this is a tricky case because with multiple netifs, link-local addresses only have
- *    meaning within a particular subnet/link.
- * 3) tries to match the destination subnet to a configured address
- * 4) tries to find a router
- * 5) tries to match the source address to the netif
- * 6) returns the default netif, if configured
- *
- * @param src the source IPv6 address, if known
- * @param dest the destination IPv6 address for which to find the route
- * @return the netif on which to send to reach dest
- */
-struct netif *
-ip6_route(const ip6_addr_t *src, const ip6_addr_t *dest)
-{
-  struct netif *netif;
-  s8_t i;
-
-  /* If single netif configuration, fast return. */
-  if ((netif_list != NULL) && (netif_list->next == NULL)) {
-    if (!netif_is_up(netif_list) || !netif_is_link_up(netif_list)) {
-      return NULL;
-    }
-    return netif_list;
-  }
-
-  /* Special processing for link-local addresses. */
-  if (ip6_addr_islinklocal(dest)) {
-    if (ip6_addr_isany(src)) {
-      /* Use default netif, if Up. */
-      if (netif_default == NULL || !netif_is_up(netif_default) ||
-          !netif_is_link_up(netif_default)) {
-        return NULL;
-      }
-      return netif_default;
-    }
-
-    /* Try to find the netif for the source address, checking that link is up. */
-    for (netif = netif_list; netif != NULL; netif = netif->next) {
-      if (!netif_is_up(netif) || !netif_is_link_up(netif)) {
-        continue;
-      }
-      for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-        if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-            ip6_addr_cmp(src, netif_ip6_addr(netif, i))) {
-          return netif;
-        }
-      }
-    }
-
-    /* netif not found, use default netif, if up */
-    if (netif_default == NULL || !netif_is_up(netif_default) ||
-        !netif_is_link_up(netif_default)) {
-      return NULL;
-    }
-    return netif_default;
-  }
-
-  /* we come here for non-link-local addresses */
-#ifdef LWIP_HOOK_IP6_ROUTE
-  netif = LWIP_HOOK_IP6_ROUTE(src, dest);
-  if (netif != NULL) {
-    return netif;
-  }
-#endif
-
-  /* See if the destination subnet matches a configured address. */
-  for (netif = netif_list; netif != NULL; netif = netif->next) {
-    if (!netif_is_up(netif) || !netif_is_link_up(netif)) {
-      continue;
-    }
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_netcmp(dest, netif_ip6_addr(netif, i))) {
-        return netif;
-      }
-    }
-  }
-
-  /* Get the netif for a suitable router. */
-  netif = nd6_find_route(dest);
-  if ((netif != NULL) && netif_is_up(netif) && netif_is_link_up(netif)) {
-    return netif;
-  }
-
-  /* try with the netif that matches the source address. */
-  if (!ip6_addr_isany(src)) {
-    for (netif = netif_list; netif != NULL; netif = netif->next) {
-      if (!netif_is_up(netif) || !netif_is_link_up(netif)) {
-        continue;
-      }
-      for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-        if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-            ip6_addr_cmp(src, netif_ip6_addr(netif, i))) {
-          return netif;
-        }
-      }
-    }
-  }
-
-#if LWIP_NETIF_LOOPBACK && !LWIP_HAVE_LOOPIF
-  /* loopif is disabled, loopback traffic is passed through any netif */
-  if (ip6_addr_isloopback(dest)) {
-    /* don't check for link on loopback traffic */
-    if (netif_default != NULL && netif_is_up(netif_default)) {
-      return netif_default;
-    }
-    /* default netif is not up, just use any netif for loopback traffic */
-    for (netif = netif_list; netif != NULL; netif = netif->next) {
-      if (netif_is_up(netif)) {
-        return netif;
-      }
-    }
-    return NULL;
-  }
-#endif /* LWIP_NETIF_LOOPBACK && !LWIP_HAVE_LOOPIF */
-
-  /* no matching netif found, use default netif, if up */
-  if ((netif_default == NULL) || !netif_is_up(netif_default) || !netif_is_link_up(netif_default)) {
-    return NULL;
-  }
-  return netif_default;
-}
-
-/**
- * @ingroup ip6
- * Select the best IPv6 source address for a given destination
- * IPv6 address. Loosely follows RFC 3484. "Strong host" behavior
- * is assumed.
- *
- * @param netif the netif on which to send a packet
- * @param dest the destination we are trying to reach
- * @return the most suitable source address to use, or NULL if no suitable
- *         source address is found
- */
-const ip_addr_t *
-ip6_select_source_address(struct netif *netif, const ip6_addr_t *dest)
-{
-  const ip_addr_t *src = NULL;
-  u8_t i;
-
-  /* If dest is link-local, choose a link-local source. */
-  if (ip6_addr_islinklocal(dest) || ip6_addr_ismulticast_linklocal(dest) || ip6_addr_ismulticast_iflocal(dest)) {
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_islinklocal(netif_ip6_addr(netif, i))) {
-        return netif_ip_addr6(netif, i);
-      }
-    }
-  }
-
-  /* Choose a site-local with matching prefix. */
-  if (ip6_addr_issitelocal(dest) || ip6_addr_ismulticast_sitelocal(dest)) {
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_issitelocal(netif_ip6_addr(netif, i)) &&
-          ip6_addr_netcmp(dest, netif_ip6_addr(netif, i))) {
-        return netif_ip_addr6(netif, i);
-      }
-    }
-  }
-
-  /* Choose a unique-local with matching prefix. */
-  if (ip6_addr_isuniquelocal(dest) || ip6_addr_ismulticast_orglocal(dest)) {
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_isuniquelocal(netif_ip6_addr(netif, i)) &&
-          ip6_addr_netcmp(dest, netif_ip6_addr(netif, i))) {
-        return netif_ip_addr6(netif, i);
-      }
-    }
-  }
-
-  /* Choose a global with best matching prefix. */
-  if (ip6_addr_isglobal(dest) || ip6_addr_ismulticast_global(dest)) {
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_isglobal(netif_ip6_addr(netif, i))) {
-        if (src == NULL) {
-          src = netif_ip_addr6(netif, i);
-        }
-        else {
-          /* Replace src only if we find a prefix match. */
-          /* @todo find longest matching prefix. */
-          if ((!(ip6_addr_netcmp(ip_2_ip6(src), dest))) &&
-              ip6_addr_netcmp(netif_ip6_addr(netif, i), dest)) {
-            src = netif_ip_addr6(netif, i);
-          }
-        }
-      }
-    }
-    if (src != NULL) {
-      return src;
-    }
-  }
-
-  /* Last resort: see if arbitrary prefix matches. */
-  for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-    if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-        ip6_addr_netcmp(dest, netif_ip6_addr(netif, i))) {
-      return netif_ip_addr6(netif, i);
-    }
-  }
-
-  return NULL;
-}
-
-#if LWIP_IPV6_FORWARD
-/**
- * Forwards an IPv6 packet. It finds an appropriate route for the
- * packet, decrements the HL value of the packet, and outputs
- * the packet on the appropriate interface.
- *
- * @param p the packet to forward (p->payload points to IP header)
- * @param iphdr the IPv6 header of the input packet
- * @param inp the netif on which this packet was received
- */
-static void
-ip6_forward(struct pbuf *p, struct ip6_hdr *iphdr, struct netif *inp)
-{
-  struct netif *netif;
-
-  /* do not forward link-local or loopback addresses */
-  if (ip6_addr_islinklocal(ip6_current_dest_addr()) ||
-      ip6_addr_isloopback(ip6_current_dest_addr())) {
-    LWIP_DEBUGF(IP6_DEBUG, ("ip6_forward: not forwarding link-local address.\n"));
-    IP6_STATS_INC(ip6.rterr);
-    IP6_STATS_INC(ip6.drop);
-    return;
-  }
-
-  /* Find network interface where to forward this IP packet to. */
-  netif = ip6_route(IP6_ADDR_ANY6, ip6_current_dest_addr());
-  if (netif == NULL) {
-    LWIP_DEBUGF(IP6_DEBUG, ("ip6_forward: no route for %"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F"\n",
-        IP6_ADDR_BLOCK1(ip6_current_dest_addr()),
-        IP6_ADDR_BLOCK2(ip6_current_dest_addr()),
-        IP6_ADDR_BLOCK3(ip6_current_dest_addr()),
-        IP6_ADDR_BLOCK4(ip6_current_dest_addr()),
-        IP6_ADDR_BLOCK5(ip6_current_dest_addr()),
-        IP6_ADDR_BLOCK6(ip6_current_dest_addr()),
-        IP6_ADDR_BLOCK7(ip6_current_dest_addr()),
-        IP6_ADDR_BLOCK8(ip6_current_dest_addr())));
-#if LWIP_ICMP6
-    /* Don't send ICMP messages in response to ICMP messages */
-    if (IP6H_NEXTH(iphdr) != IP6_NEXTH_ICMP6) {
-      icmp6_dest_unreach(p, ICMP6_DUR_NO_ROUTE);
-    }
-#endif /* LWIP_ICMP6 */
-    IP6_STATS_INC(ip6.rterr);
-    IP6_STATS_INC(ip6.drop);
-    return;
-  }
-  /* Do not forward packets onto the same network interface on which
-   * they arrived. */
-  if (netif == inp) {
-    LWIP_DEBUGF(IP6_DEBUG, ("ip6_forward: not bouncing packets back on incoming interface.\n"));
-    IP6_STATS_INC(ip6.rterr);
-    IP6_STATS_INC(ip6.drop);
-    return;
-  }
-
-  /* decrement HL */
-  IP6H_HOPLIM_SET(iphdr, IP6H_HOPLIM(iphdr) - 1);
-  /* send ICMP6 if HL == 0 */
-  if (IP6H_HOPLIM(iphdr) == 0) {
-#if LWIP_ICMP6
-    /* Don't send ICMP messages in response to ICMP messages */
-    if (IP6H_NEXTH(iphdr) != IP6_NEXTH_ICMP6) {
-      icmp6_time_exceeded(p, ICMP6_TE_HL);
-    }
-#endif /* LWIP_ICMP6 */
-    IP6_STATS_INC(ip6.drop);
-    return;
-  }
-
-  if (netif->mtu && (p->tot_len > netif->mtu)) {
-#if LWIP_ICMP6
-    /* Don't send ICMP messages in response to ICMP messages */
-    if (IP6H_NEXTH(iphdr) != IP6_NEXTH_ICMP6) {
-      icmp6_packet_too_big(p, netif->mtu);
-    }
-#endif /* LWIP_ICMP6 */
-    IP6_STATS_INC(ip6.drop);
-    return;
-  }
-
-  LWIP_DEBUGF(IP6_DEBUG, ("ip6_forward: forwarding packet to %"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F"\n",
-      IP6_ADDR_BLOCK1(ip6_current_dest_addr()),
-      IP6_ADDR_BLOCK2(ip6_current_dest_addr()),
-      IP6_ADDR_BLOCK3(ip6_current_dest_addr()),
-      IP6_ADDR_BLOCK4(ip6_current_dest_addr()),
-      IP6_ADDR_BLOCK5(ip6_current_dest_addr()),
-      IP6_ADDR_BLOCK6(ip6_current_dest_addr()),
-      IP6_ADDR_BLOCK7(ip6_current_dest_addr()),
-      IP6_ADDR_BLOCK8(ip6_current_dest_addr())));
-
-  /* transmit pbuf on chosen interface */
-  netif->output_ip6(netif, p, ip6_current_dest_addr());
-  IP6_STATS_INC(ip6.fw);
-  IP6_STATS_INC(ip6.xmit);
-  return;
-}
-#endif /* LWIP_IPV6_FORWARD */
-
-/**
- * This function is called by the network interface device driver when
- * an IPv6 packet is received. The function does the basic checks of the
- * IP header such as packet size being at least larger than the header
- * size etc. If the packet was not destined for us, the packet is
- * forwarded (using ip6_forward).
- *
- * Finally, the packet is sent to the upper layer protocol input function.
- *
- * @param p the received IPv6 packet (p->payload points to IPv6 header)
- * @param inp the netif on which this packet was received
- * @return ERR_OK if the packet was processed (could return ERR_* if it wasn't
- *         processed, but currently always returns ERR_OK)
- */
-err_t
-ip6_input(struct pbuf *p, struct netif *inp)
-{
-  struct ip6_hdr *ip6hdr;
-  struct netif *netif;
-  u8_t nexth;
-  u16_t hlen; /* the current header length */
-  u8_t i;
-#if 0 /*IP_ACCEPT_LINK_LAYER_ADDRESSING*/
-  @todo
-  int check_ip_src=1;
-#endif /* IP_ACCEPT_LINK_LAYER_ADDRESSING */
-
-  IP6_STATS_INC(ip6.recv);
-
-  /* identify the IP header */
-  ip6hdr = (struct ip6_hdr *)p->payload;
-  if (IP6H_V(ip6hdr) != 6) {
-    LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_WARNING, ("IPv6 packet dropped due to bad version number %"U32_F"\n",
-        IP6H_V(ip6hdr)));
-    pbuf_free(p);
-    IP6_STATS_INC(ip6.err);
-    IP6_STATS_INC(ip6.drop);
-    return ERR_OK;
-  }
-
-#ifdef LWIP_HOOK_IP6_INPUT
-  if (LWIP_HOOK_IP6_INPUT(p, inp)) {
-    /* the packet has been eaten */
-    return ERR_OK;
-  }
-#endif
-
-  /* header length exceeds first pbuf length, or ip length exceeds total pbuf length? */
-  if ((IP6_HLEN > p->len) || ((IP6H_PLEN(ip6hdr) + IP6_HLEN) > p->tot_len)) {
-    if (IP6_HLEN > p->len) {
-      LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-        ("IPv6 header (len %"U16_F") does not fit in first pbuf (len %"U16_F"), IP packet dropped.\n",
-            (u16_t)IP6_HLEN, p->len));
-    }
-    if ((IP6H_PLEN(ip6hdr) + IP6_HLEN) > p->tot_len) {
-      LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-        ("IPv6 (plen %"U16_F") is longer than pbuf (len %"U16_F"), IP packet dropped.\n",
-            (u16_t)(IP6H_PLEN(ip6hdr) + IP6_HLEN), p->tot_len));
-    }
-    /* free (drop) packet pbufs */
-    pbuf_free(p);
-    IP6_STATS_INC(ip6.lenerr);
-    IP6_STATS_INC(ip6.drop);
-    return ERR_OK;
-  }
-
-  /* Trim pbuf. This should have been done at the netif layer,
-   * but we'll do it anyway just to be sure that its done. */
-  pbuf_realloc(p, IP6_HLEN + IP6H_PLEN(ip6hdr));
-
-  /* copy IP addresses to aligned ip6_addr_t */
-  ip_addr_copy_from_ip6(ip_data.current_iphdr_dest, ip6hdr->dest);
-  ip_addr_copy_from_ip6(ip_data.current_iphdr_src, ip6hdr->src);
-
-  /* Don't accept virtual IPv4 mapped IPv6 addresses.
-   * Don't accept multicast source addresses. */
-  if (ip6_addr_isipv4mappedipv6(ip_2_ip6(&ip_data.current_iphdr_dest)) ||
-     ip6_addr_isipv4mappedipv6(ip_2_ip6(&ip_data.current_iphdr_src)) ||
-     ip6_addr_ismulticast(ip_2_ip6(&ip_data.current_iphdr_src))) {
-    IP6_STATS_INC(ip6.err);
-    IP6_STATS_INC(ip6.drop);
-    return ERR_OK;
-  }
-
-  /* current header pointer. */
-  ip_data.current_ip6_header = ip6hdr;
-
-  /* In netif, used in case we need to send ICMPv6 packets back. */
-  ip_data.current_netif = inp;
-  ip_data.current_input_netif = inp;
-
-  /* match packet against an interface, i.e. is this packet for us? */
-  if (ip6_addr_ismulticast(ip6_current_dest_addr())) {
-    /* Always joined to multicast if-local and link-local all-nodes group. */
-    if (ip6_addr_isallnodes_iflocal(ip6_current_dest_addr()) ||
-        ip6_addr_isallnodes_linklocal(ip6_current_dest_addr())) {
-      netif = inp;
-    }
-#if LWIP_IPV6_MLD
-    else if (mld6_lookfor_group(inp, ip6_current_dest_addr())) {
-      netif = inp;
-    }
-#else /* LWIP_IPV6_MLD */
-    else if (ip6_addr_issolicitednode(ip6_current_dest_addr())) {
-      /* Filter solicited node packets when MLD is not enabled
-       * (for Neighbor discovery). */
-      netif = NULL;
-      for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-        if (ip6_addr_isvalid(netif_ip6_addr_state(inp, i)) &&
-            ip6_addr_cmp_solicitednode(ip6_current_dest_addr(), netif_ip6_addr(inp, i))) {
-          netif = inp;
-          LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: solicited node packet accepted on interface %c%c\n",
-              netif->name[0], netif->name[1]));
-          break;
-        }
-      }
-    }
-#endif /* LWIP_IPV6_MLD */
-    else {
-      netif = NULL;
-    }
-  } else {
-    /* start trying with inp. if that's not acceptable, start walking the
-       list of configured netifs.
-       'first' is used as a boolean to mark whether we started walking the list */
-    int first = 1;
-    netif = inp;
-    do {
-      /* interface is up? */
-      if (netif_is_up(netif)) {
-        /* unicast to this interface address? address configured? */
-        for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-          if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-              ip6_addr_cmp(ip6_current_dest_addr(), netif_ip6_addr(netif, i))) {
-            /* exit outer loop */
-            goto netif_found;
-          }
-        }
-      }
-      if (first) {
-        if (ip6_addr_islinklocal(ip6_current_dest_addr())
-#if !LWIP_NETIF_LOOPBACK || LWIP_HAVE_LOOPIF
-            || ip6_addr_isloopback(ip6_current_dest_addr())
-#endif /* !LWIP_NETIF_LOOPBACK || LWIP_HAVE_LOOPIF */
-        ) {
-          /* Do not match link-local addresses to other netifs. The loopback
-           * address is to be considered link-local and packets to it should be
-           * dropped on other interfaces, as per RFC 4291 Sec. 2.5.3. This
-           * requirement cannot be implemented in the case that loopback
-           * traffic is sent across a non-loopback interface, however.
-           */
-          netif = NULL;
-          break;
-        }
-        first = 0;
-        netif = netif_list;
-      } else {
-        netif = netif->next;
-      }
-      if (netif == inp) {
-        netif = netif->next;
-      }
-    } while (netif != NULL);
-netif_found:
-    LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: packet accepted on interface %c%c\n",
-        netif ? netif->name[0] : 'X', netif? netif->name[1] : 'X'));
-  }
-
-  /* "::" packet source address? (used in duplicate address detection) */
-  if (ip6_addr_isany(ip6_current_src_addr()) &&
-      (!ip6_addr_issolicitednode(ip6_current_dest_addr()))) {
-    /* packet source is not valid */
-    /* free (drop) packet pbufs */
-    LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: packet with src ANY_ADDRESS dropped\n"));
-    pbuf_free(p);
-    IP6_STATS_INC(ip6.drop);
-    goto ip6_input_cleanup;
-  }
-
-  /* packet not for us? */
-  if (netif == NULL) {
-    /* packet not for us, route or discard */
-    LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_TRACE, ("ip6_input: packet not for us.\n"));
-#if LWIP_IPV6_FORWARD
-    /* non-multicast packet? */
-    if (!ip6_addr_ismulticast(ip6_current_dest_addr())) {
-      /* try to forward IP packet on (other) interfaces */
-      ip6_forward(p, ip6hdr, inp);
-    }
-#endif /* LWIP_IPV6_FORWARD */
-    pbuf_free(p);
-    goto ip6_input_cleanup;
-  }
-
-  /* current netif pointer. */
-  ip_data.current_netif = netif;
-
-  /* Save next header type. */
-  nexth = IP6H_NEXTH(ip6hdr);
-
-  /* Init header length. */
-  hlen = ip_data.current_ip_header_tot_len = IP6_HLEN;
-
-  /* Move to payload. */
-  pbuf_header(p, -IP6_HLEN);
-
-  /* Process known option extension headers, if present. */
-  while (nexth != IP6_NEXTH_NONE)
-  {
-    switch (nexth) {
-    case IP6_NEXTH_HOPBYHOP:
-      LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: packet with Hop-by-Hop options header\n"));
-      /* Get next header type. */
-      nexth = *((u8_t *)p->payload);
-
-      /* Get the header length. */
-      hlen = 8 * (1 + *((u8_t *)p->payload + 1));
-      ip_data.current_ip_header_tot_len += hlen;
-
-      /* Skip over this header. */
-      if (hlen > p->len) {
-        LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-          ("IPv6 options header (hlen %"U16_F") does not fit in first pbuf (len %"U16_F"), IPv6 packet dropped.\n",
-              hlen, p->len));
-        /* free (drop) packet pbufs */
-        pbuf_free(p);
-        IP6_STATS_INC(ip6.lenerr);
-        IP6_STATS_INC(ip6.drop);
-        goto ip6_input_cleanup;
-      }
-
-      pbuf_header(p, -(s16_t)hlen);
-      break;
-    case IP6_NEXTH_DESTOPTS:
-      LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: packet with Destination options header\n"));
-      /* Get next header type. */
-      nexth = *((u8_t *)p->payload);
-
-      /* Get the header length. */
-      hlen = 8 * (1 + *((u8_t *)p->payload + 1));
-      ip_data.current_ip_header_tot_len += hlen;
-
-      /* Skip over this header. */
-      if (hlen > p->len) {
-        LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-          ("IPv6 options header (hlen %"U16_F") does not fit in first pbuf (len %"U16_F"), IPv6 packet dropped.\n",
-              hlen, p->len));
-        /* free (drop) packet pbufs */
-        pbuf_free(p);
-        IP6_STATS_INC(ip6.lenerr);
-        IP6_STATS_INC(ip6.drop);
-        goto ip6_input_cleanup;
-      }
-
-      pbuf_header(p, -(s16_t)hlen);
-      break;
-    case IP6_NEXTH_ROUTING:
-      LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: packet with Routing header\n"));
-      /* Get next header type. */
-      nexth = *((u8_t *)p->payload);
-
-      /* Get the header length. */
-      hlen = 8 * (1 + *((u8_t *)p->payload + 1));
-      ip_data.current_ip_header_tot_len += hlen;
-
-      /* Skip over this header. */
-      if (hlen > p->len) {
-        LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-          ("IPv6 options header (hlen %"U16_F") does not fit in first pbuf (len %"U16_F"), IPv6 packet dropped.\n",
-              hlen, p->len));
-        /* free (drop) packet pbufs */
-        pbuf_free(p);
-        IP6_STATS_INC(ip6.lenerr);
-        IP6_STATS_INC(ip6.drop);
-        goto ip6_input_cleanup;
-      }
-
-      pbuf_header(p, -(s16_t)hlen);
-      break;
-
-    case IP6_NEXTH_FRAGMENT:
-    {
-      struct ip6_frag_hdr *frag_hdr;
-      LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: packet with Fragment header\n"));
-
-      frag_hdr = (struct ip6_frag_hdr *)p->payload;
-
-      /* Get next header type. */
-      nexth = frag_hdr->_nexth;
-
-      /* Fragment Header length. */
-      hlen = 8;
-      ip_data.current_ip_header_tot_len += hlen;
-
-      /* Make sure this header fits in current pbuf. */
-      if (hlen > p->len) {
-        LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-          ("IPv6 options header (hlen %"U16_F") does not fit in first pbuf (len %"U16_F"), IPv6 packet dropped.\n",
-              hlen, p->len));
-        /* free (drop) packet pbufs */
-        pbuf_free(p);
-        IP6_FRAG_STATS_INC(ip6_frag.lenerr);
-        IP6_FRAG_STATS_INC(ip6_frag.drop);
-        goto ip6_input_cleanup;
-      }
-
-      /* Offset == 0 and more_fragments == 0? */
-      if ((frag_hdr->_fragment_offset &
-           PP_HTONS(IP6_FRAG_OFFSET_MASK | IP6_FRAG_MORE_FLAG)) == 0) {
-        /* This is a 1-fragment packet, usually a packet that we have
-         * already reassembled. Skip this header anc continue. */
-        pbuf_header(p, -(s16_t)hlen);
-      } else {
-#if LWIP_IPV6_REASS
-
-        /* reassemble the packet */
-        p = ip6_reass(p);
-        /* packet not fully reassembled yet? */
-        if (p == NULL) {
-          goto ip6_input_cleanup;
-        }
-
-        /* Returned p point to IPv6 header.
-         * Update all our variables and pointers and continue. */
-        ip6hdr = (struct ip6_hdr *)p->payload;
-        nexth = IP6H_NEXTH(ip6hdr);
-        hlen = ip_data.current_ip_header_tot_len = IP6_HLEN;
-        pbuf_header(p, -IP6_HLEN);
-
-#else /* LWIP_IPV6_REASS */
-        /* free (drop) packet pbufs */
-        LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: packet with Fragment header dropped (with LWIP_IPV6_REASS==0)\n"));
-        pbuf_free(p);
-        IP6_STATS_INC(ip6.opterr);
-        IP6_STATS_INC(ip6.drop);
-        goto ip6_input_cleanup;
-#endif /* LWIP_IPV6_REASS */
-      }
-      break;
-    }
-    default:
-      goto options_done;
-      break;
-    }
-  }
-options_done:
-
-  /* p points to IPv6 header again. */
-  pbuf_header_force(p, (s16_t)ip_data.current_ip_header_tot_len);
-
-  /* send to upper layers */
-  LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: \n"));
-  ip6_debug_print(p);
-  LWIP_DEBUGF(IP6_DEBUG, ("ip6_input: p->len %"U16_F" p->tot_len %"U16_F"\n", p->len, p->tot_len));
-
-#if LWIP_RAW
-  /* raw input did not eat the packet? */
-  if (raw_input(p, inp) == 0)
-#endif /* LWIP_RAW */
-  {
-    switch (nexth) {
-    case IP6_NEXTH_NONE:
-      pbuf_free(p);
-      break;
-#if LWIP_UDP
-    case IP6_NEXTH_UDP:
-#if LWIP_UDPLITE
-    case IP6_NEXTH_UDPLITE:
-#endif /* LWIP_UDPLITE */
-      /* Point to payload. */
-      pbuf_header(p, -(s16_t)ip_data.current_ip_header_tot_len);
-      udp_input(p, inp);
-      break;
-#endif /* LWIP_UDP */
-#if LWIP_TCP
-    case IP6_NEXTH_TCP:
-      /* Point to payload. */
-      pbuf_header(p, -(s16_t)ip_data.current_ip_header_tot_len);
-      tcp_input(p, inp);
-      break;
-#endif /* LWIP_TCP */
-#if LWIP_ICMP6
-    case IP6_NEXTH_ICMP6:
-      /* Point to payload. */
-      pbuf_header(p, -(s16_t)ip_data.current_ip_header_tot_len);
-      icmp6_input(p, inp);
-      break;
-#endif /* LWIP_ICMP */
-    default:
-#if LWIP_ICMP6
-      /* send ICMP parameter problem unless it was a multicast or ICMPv6 */
-      if ((!ip6_addr_ismulticast(ip6_current_dest_addr())) &&
-          (IP6H_NEXTH(ip6hdr) != IP6_NEXTH_ICMP6)) {
-        icmp6_param_problem(p, ICMP6_PP_HEADER, ip_data.current_ip_header_tot_len - hlen);
-      }
-#endif /* LWIP_ICMP */
-      LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("ip6_input: Unsupported transport protocol %"U16_F"\n", (u16_t)IP6H_NEXTH(ip6hdr)));
-      pbuf_free(p);
-      IP6_STATS_INC(ip6.proterr);
-      IP6_STATS_INC(ip6.drop);
-      break;
-    }
-  }
-
-ip6_input_cleanup:
-  ip_data.current_netif = NULL;
-  ip_data.current_input_netif = NULL;
-  ip_data.current_ip6_header = NULL;
-  ip_data.current_ip_header_tot_len = 0;
-  ip6_addr_set_zero(ip6_current_src_addr());
-  ip6_addr_set_zero(ip6_current_dest_addr());
-
-  return ERR_OK;
-}
-
-
-/**
- * Sends an IPv6 packet on a network interface. This function constructs
- * the IPv6 header. If the source IPv6 address is NULL, the IPv6 "ANY" address is
- * used as source (usually during network startup). If the source IPv6 address it
- * IP6_ADDR_ANY, the most appropriate IPv6 address of the outgoing network
- * interface is filled in as source address. If the destination IPv6 address is
- * LWIP_IP_HDRINCL, p is assumed to already include an IPv6 header and
- * p->payload points to it instead of the data.
- *
- * @param p the packet to send (p->payload points to the data, e.g. next
-            protocol header; if dest == LWIP_IP_HDRINCL, p already includes an
-            IPv6 header and p->payload points to that IPv6 header)
- * @param src the source IPv6 address to send from (if src == IP6_ADDR_ANY, an
- *         IP address of the netif is selected and used as source address.
- *         if src == NULL, IP6_ADDR_ANY is used as source)
- * @param dest the destination IPv6 address to send the packet to
- * @param hl the Hop Limit value to be set in the IPv6 header
- * @param tc the Traffic Class value to be set in the IPv6 header
- * @param nexth the Next Header to be set in the IPv6 header
- * @param netif the netif on which to send this packet
- * @return ERR_OK if the packet was sent OK
- *         ERR_BUF if p doesn't have enough space for IPv6/LINK headers
- *         returns errors returned by netif->output
- */
-err_t
-ip6_output_if(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
-             u8_t hl, u8_t tc,
-             u8_t nexth, struct netif *netif)
-{
-  const ip6_addr_t *src_used = src;
-  if (dest != LWIP_IP_HDRINCL) {
-    if (src != NULL && ip6_addr_isany(src)) {
-      src_used = ip_2_ip6(ip6_select_source_address(netif, dest));
-      if ((src_used == NULL) || ip6_addr_isany(src_used)) {
-        /* No appropriate source address was found for this packet. */
-        LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("ip6_output: No suitable source address for packet.\n"));
-        IP6_STATS_INC(ip6.rterr);
-        return ERR_RTE;
-      }
-    }
-  }
-  return ip6_output_if_src(p, src_used, dest, hl, tc, nexth, netif);
-}
-
-/**
- * Same as ip6_output_if() but 'src' address is not replaced by netif address
- * when it is 'any'.
- */
-err_t
-ip6_output_if_src(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
-             u8_t hl, u8_t tc,
-             u8_t nexth, struct netif *netif)
-{
-  struct ip6_hdr *ip6hdr;
-  ip6_addr_t dest_addr;
-
-  LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
-
-  /* Should the IPv6 header be generated or is it already included in p? */
-  if (dest != LWIP_IP_HDRINCL) {
-    /* generate IPv6 header */
-    if (pbuf_header(p, IP6_HLEN)) {
-      LWIP_DEBUGF(IP6_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("ip6_output: not enough room for IPv6 header in pbuf\n"));
-      IP6_STATS_INC(ip6.err);
-      return ERR_BUF;
-    }
-
-    ip6hdr = (struct ip6_hdr *)p->payload;
-    LWIP_ASSERT("check that first pbuf can hold struct ip6_hdr",
-               (p->len >= sizeof(struct ip6_hdr)));
-
-    IP6H_HOPLIM_SET(ip6hdr, hl);
-    IP6H_NEXTH_SET(ip6hdr, nexth);
-
-    /* dest cannot be NULL here */
-    ip6_addr_copy(ip6hdr->dest, *dest);
-
-    IP6H_VTCFL_SET(ip6hdr, 6, tc, 0);
-    IP6H_PLEN_SET(ip6hdr, p->tot_len - IP6_HLEN);
-
-    if (src == NULL) {
-      src = IP6_ADDR_ANY6;
-    }
-    /* src cannot be NULL here */
-    ip6_addr_copy(ip6hdr->src, *src);
-
-  } else {
-    /* IP header already included in p */
-    ip6hdr = (struct ip6_hdr *)p->payload;
-    ip6_addr_copy(dest_addr, ip6hdr->dest);
-    dest = &dest_addr;
-  }
-
-  IP6_STATS_INC(ip6.xmit);
-
-  LWIP_DEBUGF(IP6_DEBUG, ("ip6_output_if: %c%c%"U16_F"\n", netif->name[0], netif->name[1], (u16_t)netif->num));
-  ip6_debug_print(p);
-
-#if ENABLE_LOOPBACK
-  {
-    int i;
-#if !LWIP_HAVE_LOOPIF
-    if (ip6_addr_isloopback(dest)) {
-      return netif_loop_output(netif, p);
-    }
-#endif /* !LWIP_HAVE_LOOPIF */
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-      if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-          ip6_addr_cmp(dest, netif_ip6_addr(netif, i))) {
-        /* Packet to self, enqueue it for loopback */
-        LWIP_DEBUGF(IP6_DEBUG, ("netif_loop_output()\n"));
-        return netif_loop_output(netif, p);
-      }
-    }
-  }
-#endif /* ENABLE_LOOPBACK */
-#if LWIP_IPV6_FRAG
-  /* don't fragment if interface has mtu set to 0 [loopif] */
-  if (netif->mtu && (p->tot_len > nd6_get_destination_mtu(dest, netif))) {
-    return ip6_frag(p, netif, dest);
-  }
-#endif /* LWIP_IPV6_FRAG */
-
-  LWIP_DEBUGF(IP6_DEBUG, ("netif->output_ip6()\n"));
-  return netif->output_ip6(netif, p, dest);
-}
-
-/**
- * Simple interface to ip6_output_if. It finds the outgoing network
- * interface and calls upon ip6_output_if to do the actual work.
- *
- * @param p the packet to send (p->payload points to the data, e.g. next
-            protocol header; if dest == LWIP_IP_HDRINCL, p already includes an
-            IPv6 header and p->payload points to that IPv6 header)
- * @param src the source IPv6 address to send from (if src == IP6_ADDR_ANY, an
- *         IP address of the netif is selected and used as source address.
- *         if src == NULL, IP6_ADDR_ANY is used as source)
- * @param dest the destination IPv6 address to send the packet to
- * @param hl the Hop Limit value to be set in the IPv6 header
- * @param tc the Traffic Class value to be set in the IPv6 header
- * @param nexth the Next Header to be set in the IPv6 header
- *
- * @return ERR_RTE if no route is found
- *         see ip_output_if() for more return values
- */
-err_t
-ip6_output(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
-          u8_t hl, u8_t tc, u8_t nexth)
-{
-  struct netif *netif;
-  struct ip6_hdr *ip6hdr;
-  ip6_addr_t src_addr, dest_addr;
-
-  LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
-
-  if (dest != LWIP_IP_HDRINCL) {
-    netif = ip6_route(src, dest);
-  } else {
-    /* IP header included in p, read addresses. */
-    ip6hdr = (struct ip6_hdr *)p->payload;
-    ip6_addr_copy(src_addr, ip6hdr->src);
-    ip6_addr_copy(dest_addr, ip6hdr->dest);
-    netif = ip6_route(&src_addr, &dest_addr);
-  }
-
-  if (netif == NULL) {
-    LWIP_DEBUGF(IP6_DEBUG, ("ip6_output: no route for %"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F"\n",
-        IP6_ADDR_BLOCK1(dest),
-        IP6_ADDR_BLOCK2(dest),
-        IP6_ADDR_BLOCK3(dest),
-        IP6_ADDR_BLOCK4(dest),
-        IP6_ADDR_BLOCK5(dest),
-        IP6_ADDR_BLOCK6(dest),
-        IP6_ADDR_BLOCK7(dest),
-        IP6_ADDR_BLOCK8(dest)));
-    IP6_STATS_INC(ip6.rterr);
-    return ERR_RTE;
-  }
-
-  return ip6_output_if(p, src, dest, hl, tc, nexth, netif);
-}
-
-
-#if LWIP_NETIF_HWADDRHINT
-/** Like ip6_output, but takes and addr_hint pointer that is passed on to netif->addr_hint
- *  before calling ip6_output_if.
- *
- * @param p the packet to send (p->payload points to the data, e.g. next
-            protocol header; if dest == LWIP_IP_HDRINCL, p already includes an
-            IPv6 header and p->payload points to that IPv6 header)
- * @param src the source IPv6 address to send from (if src == IP6_ADDR_ANY, an
- *         IP address of the netif is selected and used as source address.
- *         if src == NULL, IP6_ADDR_ANY is used as source)
- * @param dest the destination IPv6 address to send the packet to
- * @param hl the Hop Limit value to be set in the IPv6 header
- * @param tc the Traffic Class value to be set in the IPv6 header
- * @param nexth the Next Header to be set in the IPv6 header
- * @param addr_hint address hint pointer set to netif->addr_hint before
- *        calling ip_output_if()
- *
- * @return ERR_RTE if no route is found
- *         see ip_output_if() for more return values
- */
-err_t
-ip6_output_hinted(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
-          u8_t hl, u8_t tc, u8_t nexth, u8_t *addr_hint)
-{
-  struct netif *netif;
-  struct ip6_hdr *ip6hdr;
-  ip6_addr_t src_addr, dest_addr;
-  err_t err;
-
-  LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
-
-  if (dest != LWIP_IP_HDRINCL) {
-    netif = ip6_route(src, dest);
-  } else {
-    /* IP header included in p, read addresses. */
-    ip6hdr = (struct ip6_hdr *)p->payload;
-    ip6_addr_copy(src_addr, ip6hdr->src);
-    ip6_addr_copy(dest_addr, ip6hdr->dest);
-    netif = ip6_route(&src_addr, &dest_addr);
-  }
-
-  if (netif == NULL) {
-    LWIP_DEBUGF(IP6_DEBUG, ("ip6_output: no route for %"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F":%"X16_F"\n",
-        IP6_ADDR_BLOCK1(dest),
-        IP6_ADDR_BLOCK2(dest),
-        IP6_ADDR_BLOCK3(dest),
-        IP6_ADDR_BLOCK4(dest),
-        IP6_ADDR_BLOCK5(dest),
-        IP6_ADDR_BLOCK6(dest),
-        IP6_ADDR_BLOCK7(dest),
-        IP6_ADDR_BLOCK8(dest)));
-    IP6_STATS_INC(ip6.rterr);
-    return ERR_RTE;
-  }
-
-  NETIF_SET_HWADDRHINT(netif, addr_hint);
-  err = ip6_output_if(p, src, dest, hl, tc, nexth, netif);
-  NETIF_SET_HWADDRHINT(netif, NULL);
-
-  return err;
-}
-#endif /* LWIP_NETIF_HWADDRHINT*/
-
-#if LWIP_IPV6_MLD
-/**
- * Add a hop-by-hop options header with a router alert option and padding.
- *
- * Used by MLD when sending a Multicast listener report/done message.
- *
- * @param p the packet to which we will prepend the options header
- * @param nexth the next header protocol number (e.g. IP6_NEXTH_ICMP6)
- * @param value the value of the router alert option data (e.g. IP6_ROUTER_ALERT_VALUE_MLD)
- * @return ERR_OK if hop-by-hop header was added, ERR_* otherwise
- */
-err_t
-ip6_options_add_hbh_ra(struct pbuf *p, u8_t nexth, u8_t value)
-{
-  struct ip6_hbh_hdr *hbh_hdr;
-
-  /* Move pointer to make room for hop-by-hop options header. */
-  if (pbuf_header(p, sizeof(struct ip6_hbh_hdr))) {
-    LWIP_DEBUGF(IP6_DEBUG, ("ip6_options: no space for options header\n"));
-    IP6_STATS_INC(ip6.err);
-    return ERR_BUF;
-  }
-
-  hbh_hdr = (struct ip6_hbh_hdr *)p->payload;
-
-  /* Set fields. */
-  hbh_hdr->_nexth = nexth;
-  hbh_hdr->_hlen = 0;
-  hbh_hdr->_ra_opt_type = IP6_ROUTER_ALERT_OPTION;
-  hbh_hdr->_ra_opt_dlen = 2;
-  hbh_hdr->_ra_opt_data = value;
-  hbh_hdr->_padn_opt_type = IP6_PADN_ALERT_OPTION;
-  hbh_hdr->_padn_opt_dlen = 0;
-
-  return ERR_OK;
-}
-#endif /* LWIP_IPV6_MLD */
-
-#if IP6_DEBUG
-/* Print an IPv6 header by using LWIP_DEBUGF
- * @param p an IPv6 packet, p->payload pointing to the IPv6 header
- */
-void
-ip6_debug_print(struct pbuf *p)
-{
-  struct ip6_hdr *ip6hdr = (struct ip6_hdr *)p->payload;
-
-  LWIP_DEBUGF(IP6_DEBUG, ("IPv6 header:\n"));
-  LWIP_DEBUGF(IP6_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(IP6_DEBUG, ("| %2"U16_F" |  %3"U16_F"  |      %7"U32_F"     | (ver, class, flow)\n",
-                    IP6H_V(ip6hdr),
-                    IP6H_TC(ip6hdr),
-                    IP6H_FL(ip6hdr)));
-  LWIP_DEBUGF(IP6_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(IP6_DEBUG, ("|     %5"U16_F"     |  %3"U16_F"  |  %3"U16_F"  | (plen, nexth, hopl)\n",
-                    IP6H_PLEN(ip6hdr),
-                    IP6H_NEXTH(ip6hdr),
-                    IP6H_HOPLIM(ip6hdr)));
-  LWIP_DEBUGF(IP6_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(IP6_DEBUG, ("|  %4"X32_F" |  %4"X32_F" |  %4"X32_F" |  %4"X32_F" | (src)\n",
-                    IP6_ADDR_BLOCK1(&(ip6hdr->src)),
-                    IP6_ADDR_BLOCK2(&(ip6hdr->src)),
-                    IP6_ADDR_BLOCK3(&(ip6hdr->src)),
-                    IP6_ADDR_BLOCK4(&(ip6hdr->src))));
-  LWIP_DEBUGF(IP6_DEBUG, ("|  %4"X32_F" |  %4"X32_F" |  %4"X32_F" |  %4"X32_F" |\n",
-                    IP6_ADDR_BLOCK5(&(ip6hdr->src)),
-                    IP6_ADDR_BLOCK6(&(ip6hdr->src)),
-                    IP6_ADDR_BLOCK7(&(ip6hdr->src)),
-                    IP6_ADDR_BLOCK8(&(ip6hdr->src))));
-  LWIP_DEBUGF(IP6_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(IP6_DEBUG, ("|  %4"X32_F" |  %4"X32_F" |  %4"X32_F" |  %4"X32_F" | (dest)\n",
-                    IP6_ADDR_BLOCK1(&(ip6hdr->dest)),
-                    IP6_ADDR_BLOCK2(&(ip6hdr->dest)),
-                    IP6_ADDR_BLOCK3(&(ip6hdr->dest)),
-                    IP6_ADDR_BLOCK4(&(ip6hdr->dest))));
-  LWIP_DEBUGF(IP6_DEBUG, ("|  %4"X32_F" |  %4"X32_F" |  %4"X32_F" |  %4"X32_F" |\n",
-                    IP6_ADDR_BLOCK5(&(ip6hdr->dest)),
-                    IP6_ADDR_BLOCK6(&(ip6hdr->dest)),
-                    IP6_ADDR_BLOCK7(&(ip6hdr->dest)),
-                    IP6_ADDR_BLOCK8(&(ip6hdr->dest))));
-  LWIP_DEBUGF(IP6_DEBUG, ("+-------------------------------+\n"));
-}
-#endif /* IP6_DEBUG */
-
-#endif /* LWIP_IPV6 */
diff --git a/sys/net/core/ipv6/ip6_addr.c b/sys/net/core/ipv6/ip6_addr.c
deleted file mode 100644
index 75195be..0000000
--- a/sys/net/core/ipv6/ip6_addr.c
+++ /dev/null
@@ -1,292 +0,0 @@
-/**
- * @file
- *
- * IPv6 addresses.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- * Functions for handling IPv6 addresses.
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
-
-#include "net/ip_addr.h"
-#include "net/def.h"
-
-/* used by IP6_ADDR_ANY(6) in ip6_addr.h */
-const ip_addr_t ip6_addr_any = IPADDR6_INIT(0ul, 0ul, 0ul, 0ul);
-
-#ifndef isprint
-#define in_range(c, lo, up)  ((u8_t)c >= lo && (u8_t)c <= up)
-#define isprint(c)           in_range(c, 0x20, 0x7f)
-#define isdigit(c)           in_range(c, '0', '9')
-#define isxdigit(c)          (isdigit(c) || in_range(c, 'a', 'f') || in_range(c, 'A', 'F'))
-#define islower(c)           in_range(c, 'a', 'z')
-#define isspace(c)           (c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v')
-#define xchar(i)             ((i) < 10 ? '0' + (i) : 'A' + (i) - 10)
-#endif
-
-/**
- * Check whether "cp" is a valid ascii representation
- * of an IPv6 address and convert to a binary address.
- * Returns 1 if the address is valid, 0 if not.
- *
- * @param cp IPv6 address in ascii representation (e.g. "FF01::1")
- * @param addr pointer to which to save the ip address in network order
- * @return 1 if cp could be converted to addr, 0 on failure
- */
-int
-ip6addr_aton(const char *cp, ip6_addr_t *addr)
-{
-  u32_t addr_index, zero_blocks, current_block_index, current_block_value;
-  const char *s;
-
-  /* Count the number of colons, to count the number of blocks in a "::" sequence
-     zero_blocks may be 1 even if there are no :: sequences */
-  zero_blocks = 8;
-  for (s = cp; *s != 0; s++) {
-    if (*s == ':') {
-      zero_blocks--;
-    } else if (!isxdigit(*s)) {
-      break;
-    }
-  }
-
-  /* parse each block */
-  addr_index = 0;
-  current_block_index = 0;
-  current_block_value = 0;
-  for (s = cp; *s != 0; s++) {
-    if (*s == ':') {
-      if (addr) {
-        if (current_block_index & 0x1) {
-          addr->addr[addr_index++] |= current_block_value;
-        }
-        else {
-          addr->addr[addr_index] = current_block_value << 16;
-        }
-      }
-      current_block_index++;
-      current_block_value = 0;
-      if (current_block_index > 7) {
-        /* address too long! */
-        return 0;
-      }
-      if (s[1] == ':') {
-        if (s[2] == ':') {
-          /* invalid format: three successive colons */
-          return 0;
-        }
-        s++;
-        /* "::" found, set zeros */
-        while (zero_blocks > 0) {
-          zero_blocks--;
-          if (current_block_index & 0x1) {
-            addr_index++;
-          } else {
-            if (addr) {
-              addr->addr[addr_index] = 0;
-            }
-          }
-          current_block_index++;
-          if (current_block_index > 7) {
-            /* address too long! */
-            return 0;
-          }
-        }
-      }
-    } else if (isxdigit(*s)) {
-      /* add current digit */
-      current_block_value = (current_block_value << 4) +
-          (isdigit(*s) ? (u32_t)(*s - '0') :
-          (u32_t)(10 + (islower(*s) ? *s - 'a' : *s - 'A')));
-    } else {
-      /* unexpected digit, space? CRLF? */
-      break;
-    }
-  }
-
-  if (addr) {
-    if (current_block_index & 0x1) {
-      addr->addr[addr_index++] |= current_block_value;
-    }
-    else {
-      addr->addr[addr_index] = current_block_value << 16;
-    }
-  }
-
-  /* convert to network byte order. */
-  if (addr) {
-    for (addr_index = 0; addr_index < 4; addr_index++) {
-      addr->addr[addr_index] = lwip_htonl(addr->addr[addr_index]);
-    }
-  }
-
-  if (current_block_index != 7) {
-    return 0;
-  }
-
-  return 1;
-}
-
-/**
- * Convert numeric IPv6 address into ASCII representation.
- * returns ptr to static buffer; not reentrant!
- *
- * @param addr ip6 address in network order to convert
- * @return pointer to a global static (!) buffer that holds the ASCII
- *         representation of addr
- */
-char *
-ip6addr_ntoa(const ip6_addr_t *addr)
-{
-  static char str[40];
-  return ip6addr_ntoa_r(addr, str, 40);
-}
-
-/**
- * Same as ipaddr_ntoa, but reentrant since a user-supplied buffer is used.
- *
- * @param addr ip6 address in network order to convert
- * @param buf target buffer where the string is stored
- * @param buflen length of buf
- * @return either pointer to buf which now holds the ASCII
- *         representation of addr or NULL if buf was too small
- */
-char *
-ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen)
-{
-  u32_t current_block_index, current_block_value, next_block_value;
-  s32_t i;
-  u8_t zero_flag, empty_block_flag;
-
-  i = 0;
-  empty_block_flag = 0; /* used to indicate a zero chain for "::' */
-
-  for (current_block_index = 0; current_block_index < 8; current_block_index++) {
-    /* get the current 16-bit block */
-    current_block_value = lwip_htonl(addr->addr[current_block_index >> 1]);
-    if ((current_block_index & 0x1) == 0) {
-      current_block_value = current_block_value >> 16;
-    }
-    current_block_value &= 0xffff;
-
-    /* Check for empty block. */
-    if (current_block_value == 0) {
-      if (current_block_index == 7 && empty_block_flag == 1) {
-        /* special case, we must render a ':' for the last block. */
-        buf[i++] = ':';
-        if (i >= buflen) {
-          return NULL;
-        }
-        break;
-      }
-      if (empty_block_flag == 0) {
-        /* generate empty block "::", but only if more than one contiguous zero block,
-         * according to current formatting suggestions RFC 5952. */
-        next_block_value = lwip_htonl(addr->addr[(current_block_index + 1) >> 1]);
-        if ((current_block_index & 0x1) == 0x01) {
-            next_block_value = next_block_value >> 16;
-        }
-        next_block_value &= 0xffff;
-        if (next_block_value == 0) {
-          empty_block_flag = 1;
-          buf[i++] = ':';
-          if (i >= buflen) {
-            return NULL;
-          }
-          continue; /* move on to next block. */
-        }
-      } else if (empty_block_flag == 1) {
-        /* move on to next block. */
-        continue;
-      }
-    } else if (empty_block_flag == 1) {
-      /* Set this flag value so we don't produce multiple empty blocks. */
-      empty_block_flag = 2;
-    }
-
-    if (current_block_index > 0) {
-      buf[i++] = ':';
-      if (i >= buflen) {
-        return NULL;
-      }
-    }
-
-    if ((current_block_value & 0xf000) == 0) {
-      zero_flag = 1;
-    } else {
-      buf[i++] = xchar(((current_block_value & 0xf000) >> 12));
-      zero_flag = 0;
-      if (i >= buflen) {
-        return NULL;
-      }
-    }
-
-    if (((current_block_value & 0xf00) == 0) && (zero_flag)) {
-      /* do nothing */
-    } else {
-      buf[i++] = xchar(((current_block_value & 0xf00) >> 8));
-      zero_flag = 0;
-      if (i >= buflen) {
-        return NULL;
-      }
-    }
-
-    if (((current_block_value & 0xf0) == 0) && (zero_flag)) {
-      /* do nothing */
-    }
-    else {
-      buf[i++] = xchar(((current_block_value & 0xf0) >> 4));
-      zero_flag = 0;
-      if (i >= buflen) {
-        return NULL;
-      }
-    }
-
-    buf[i++] = xchar((current_block_value & 0xf));
-    if (i >= buflen) {
-      return NULL;
-    }
-  }
-
-  buf[i] = 0;
-
-  return buf;
-}
-
-#endif /* LWIP_IPV6 */
diff --git a/sys/net/core/ipv6/ip6_frag.c b/sys/net/core/ipv6/ip6_frag.c
deleted file mode 100644
index 9703acc..0000000
--- a/sys/net/core/ipv6/ip6_frag.c
+++ /dev/null
@@ -1,805 +0,0 @@
-/**
- * @file
- *
- * IPv6 fragmentation and reassembly.
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#include "net/opt.h"
-#include "net/ip6_frag.h"
-#include "net/ip6.h"
-#include "net/icmp6.h"
-#include "net/nd6.h"
-#include "net/ip.h"
-
-#include "net/pbuf.h"
-#include "net/memp.h"
-#include "net/stats.h"
-
-#include <string.h>
-
-#if LWIP_IPV6 && LWIP_IPV6_REASS  /* don't build if not configured for use in lwipopts.h */
-
-
-/** Setting this to 0, you can turn off checking the fragments for overlapping
- * regions. The code gets a little smaller. Only use this if you know that
- * overlapping won't occur on your network! */
-#ifndef IP_REASS_CHECK_OVERLAP
-#define IP_REASS_CHECK_OVERLAP 1
-#endif /* IP_REASS_CHECK_OVERLAP */
-
-/** Set to 0 to prevent freeing the oldest datagram when the reassembly buffer is
- * full (IP_REASS_MAX_PBUFS pbufs are enqueued). The code gets a little smaller.
- * Datagrams will be freed by timeout only. Especially useful when MEMP_NUM_REASSDATA
- * is set to 1, so one datagram can be reassembled at a time, only. */
-#ifndef IP_REASS_FREE_OLDEST
-#define IP_REASS_FREE_OLDEST 1
-#endif /* IP_REASS_FREE_OLDEST */
-
-#if IPV6_FRAG_COPYHEADER
-#define IPV6_FRAG_REQROOM ((s16_t)(sizeof(struct ip6_reass_helper) - IP6_FRAG_HLEN))
-#endif
-
-#define IP_REASS_FLAG_LASTFRAG 0x01
-
-/** This is a helper struct which holds the starting
- * offset and the ending offset of this fragment to
- * easily chain the fragments.
- * It has the same packing requirements as the IPv6 header, since it replaces
- * the Fragment Header in memory in incoming fragments to keep
- * track of the various fragments.
- */
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct ip6_reass_helper {
-  PACK_STRUCT_FIELD(struct pbuf *next_pbuf);
-  PACK_STRUCT_FIELD(u16_t start);
-  PACK_STRUCT_FIELD(u16_t end);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-#  include "arch/epstruct.h"
-#endif
-
-/* static variables */
-static struct ip6_reassdata *reassdatagrams;
-static u16_t ip6_reass_pbufcount;
-
-/* Forward declarations. */
-static void ip6_reass_free_complete_datagram(struct ip6_reassdata *ipr);
-#if IP_REASS_FREE_OLDEST
-static void ip6_reass_remove_oldest_datagram(struct ip6_reassdata *ipr, int pbufs_needed);
-#endif /* IP_REASS_FREE_OLDEST */
-
-void
-ip6_reass_tmr(void)
-{
-  struct ip6_reassdata *r, *tmp;
-
-#if !IPV6_FRAG_COPYHEADER
-  LWIP_ASSERT("sizeof(struct ip6_reass_helper) <= IP6_FRAG_HLEN, set IPV6_FRAG_COPYHEADER to 1",
-    sizeof(struct ip6_reass_helper) <= IP6_FRAG_HLEN);
-#endif /* !IPV6_FRAG_COPYHEADER */
-
-  r = reassdatagrams;
-  while (r != NULL) {
-    /* Decrement the timer. Once it reaches 0,
-     * clean up the incomplete fragment assembly */
-    if (r->timer > 0) {
-      r->timer--;
-      r = r->next;
-    } else {
-      /* reassembly timed out */
-      tmp = r;
-      /* get the next pointer before freeing */
-      r = r->next;
-      /* free the helper struct and all enqueued pbufs */
-      ip6_reass_free_complete_datagram(tmp);
-     }
-   }
-}
-
-/**
- * Free a datagram (struct ip6_reassdata) and all its pbufs.
- * Updates the total count of enqueued pbufs (ip6_reass_pbufcount),
- * sends an ICMP time exceeded packet.
- *
- * @param ipr datagram to free
- */
-static void
-ip6_reass_free_complete_datagram(struct ip6_reassdata *ipr)
-{
-  struct ip6_reassdata *prev;
-  u16_t pbufs_freed = 0;
-  u16_t clen;
-  struct pbuf *p;
-  struct ip6_reass_helper *iprh;
-
-#if LWIP_ICMP6
-  iprh = (struct ip6_reass_helper *)ipr->p->payload;
-  if (iprh->start == 0) {
-    /* The first fragment was received, send ICMP time exceeded. */
-    /* First, de-queue the first pbuf from r->p. */
-    p = ipr->p;
-    ipr->p = iprh->next_pbuf;
-    /* Then, move back to the original ipv6 header (we are now pointing to Fragment header).
-       This cannot fail since we already checked when receiving this fragment. */
-    if (pbuf_header_force(p, (s16_t)((u8_t*)p->payload - (u8_t*)IPV6_FRAG_HDRREF(ipr->iphdr)))) {
-      LWIP_ASSERT("ip6_reass_free: moving p->payload to ip6 header failed\n", 0);
-    }
-    else {
-      icmp6_time_exceeded(p, ICMP6_TE_FRAG);
-    }
-    clen = pbuf_clen(p);
-    LWIP_ASSERT("pbufs_freed + clen <= 0xffff", pbufs_freed + clen <= 0xffff);
-    pbufs_freed += clen;
-    pbuf_free(p);
-  }
-#endif /* LWIP_ICMP6 */
-
-  /* First, free all received pbufs.  The individual pbufs need to be released
-     separately as they have not yet been chained */
-  p = ipr->p;
-  while (p != NULL) {
-    struct pbuf *pcur;
-    iprh = (struct ip6_reass_helper *)p->payload;
-    pcur = p;
-    /* get the next pointer before freeing */
-    p = iprh->next_pbuf;
-    clen = pbuf_clen(pcur);
-    LWIP_ASSERT("pbufs_freed + clen <= 0xffff", pbufs_freed + clen <= 0xffff);
-    pbufs_freed += clen;
-    pbuf_free(pcur);
-  }
-
-  /* Then, unchain the struct ip6_reassdata from the list and free it. */
-  if (ipr == reassdatagrams) {
-    reassdatagrams = ipr->next;
-  } else {
-    prev = reassdatagrams;
-    while (prev != NULL) {
-      if (prev->next == ipr) {
-        break;
-      }
-      prev = prev->next;
-    }
-    if (prev != NULL) {
-      prev->next = ipr->next;
-    }
-  }
-  memp_free(MEMP_IP6_REASSDATA, ipr);
-
-  /* Finally, update number of pbufs in reassembly queue */
-  LWIP_ASSERT("ip_reass_pbufcount >= clen", ip6_reass_pbufcount >= pbufs_freed);
-  ip6_reass_pbufcount -= pbufs_freed;
-}
-
-#if IP_REASS_FREE_OLDEST
-/**
- * Free the oldest datagram to make room for enqueueing new fragments.
- * The datagram ipr is not freed!
- *
- * @param ipr ip6_reassdata for the current fragment
- * @param pbufs_needed number of pbufs needed to enqueue
- *        (used for freeing other datagrams if not enough space)
- */
-static void
-ip6_reass_remove_oldest_datagram(struct ip6_reassdata *ipr, int pbufs_needed)
-{
-  struct ip6_reassdata *r, *oldest;
-
-  /* Free datagrams until being allowed to enqueue 'pbufs_needed' pbufs,
-   * but don't free the current datagram! */
-  do {
-    r = oldest = reassdatagrams;
-    while (r != NULL) {
-      if (r != ipr) {
-        if (r->timer <= oldest->timer) {
-          /* older than the previous oldest */
-          oldest = r;
-        }
-      }
-      r = r->next;
-    }
-    if (oldest == ipr) {
-      /* nothing to free, ipr is the only element on the list */
-      return;
-    }
-    if (oldest != NULL) {
-      ip6_reass_free_complete_datagram(oldest);
-    }
-  } while (((ip6_reass_pbufcount + pbufs_needed) > IP_REASS_MAX_PBUFS) && (reassdatagrams != NULL));
-}
-#endif /* IP_REASS_FREE_OLDEST */
-
-/**
- * Reassembles incoming IPv6 fragments into an IPv6 datagram.
- *
- * @param p points to the IPv6 Fragment Header
- * @return NULL if reassembly is incomplete, pbuf pointing to
- *         IPv6 Header if reassembly is complete
- */
-struct pbuf *
-ip6_reass(struct pbuf *p)
-{
-  struct ip6_reassdata *ipr, *ipr_prev;
-  struct ip6_reass_helper *iprh, *iprh_tmp, *iprh_prev=NULL;
-  struct ip6_frag_hdr *frag_hdr;
-  u16_t offset, len;
-  u16_t clen;
-  u8_t valid = 1;
-  struct pbuf *q;
-
-  IP6_FRAG_STATS_INC(ip6_frag.recv);
-
-  if ((const void*)ip6_current_header() != ((u8_t*)p->payload) - IP6_HLEN) {
-    /* ip6_frag_hdr must be in the first pbuf, not chained */
-    IP6_FRAG_STATS_INC(ip6_frag.proterr);
-    IP6_FRAG_STATS_INC(ip6_frag.drop);
-    goto nullreturn;
-  }
-
-  frag_hdr = (struct ip6_frag_hdr *) p->payload;
-
-  clen = pbuf_clen(p);
-
-  offset = lwip_ntohs(frag_hdr->_fragment_offset);
-
-  /* Calculate fragment length from IPv6 payload length.
-   * Adjust for headers before Fragment Header.
-   * And finally adjust by Fragment Header length. */
-  len = lwip_ntohs(ip6_current_header()->_plen);
-  len -= (u16_t)(((u8_t*)p->payload - (const u8_t*)ip6_current_header()) - IP6_HLEN);
-  len -= IP6_FRAG_HLEN;
-
-  /* Look for the datagram the fragment belongs to in the current datagram queue,
-   * remembering the previous in the queue for later dequeueing. */
-  for (ipr = reassdatagrams, ipr_prev = NULL; ipr != NULL; ipr = ipr->next) {
-    /* Check if the incoming fragment matches the one currently present
-       in the reassembly buffer. If so, we proceed with copying the
-       fragment into the buffer. */
-    if ((frag_hdr->_identification == ipr->identification) &&
-        ip6_addr_cmp(ip6_current_src_addr(), &(IPV6_FRAG_HDRREF(ipr->iphdr)->src)) &&
-        ip6_addr_cmp(ip6_current_dest_addr(), &(IPV6_FRAG_HDRREF(ipr->iphdr)->dest))) {
-      IP6_FRAG_STATS_INC(ip6_frag.cachehit);
-      break;
-    }
-    ipr_prev = ipr;
-  }
-
-  if (ipr == NULL) {
-  /* Enqueue a new datagram into the datagram queue */
-    ipr = (struct ip6_reassdata *)memp_malloc(MEMP_IP6_REASSDATA);
-    if (ipr == NULL) {
-#if IP_REASS_FREE_OLDEST
-      /* Make room and try again. */
-      ip6_reass_remove_oldest_datagram(ipr, clen);
-      ipr = (struct ip6_reassdata *)memp_malloc(MEMP_IP6_REASSDATA);
-      if (ipr != NULL) {
-        /* re-search ipr_prev since it might have been removed */
-        for (ipr_prev = reassdatagrams; ipr_prev != NULL; ipr_prev = ipr_prev->next) {
-          if (ipr_prev->next == ipr) {
-            break;
-          }
-        }
-      } else
-#endif /* IP_REASS_FREE_OLDEST */
-      {
-        IP6_FRAG_STATS_INC(ip6_frag.memerr);
-        IP6_FRAG_STATS_INC(ip6_frag.drop);
-        goto nullreturn;
-      }
-    }
-
-    memset(ipr, 0, sizeof(struct ip6_reassdata));
-    ipr->timer = IP_REASS_MAXAGE;
-
-    /* enqueue the new structure to the front of the list */
-    ipr->next = reassdatagrams;
-    reassdatagrams = ipr;
-
-    /* Use the current IPv6 header for src/dest address reference.
-     * Eventually, we will replace it when we get the first fragment
-     * (it might be this one, in any case, it is done later). */
-#if IPV6_FRAG_COPYHEADER
-    MEMCPY(&ipr->iphdr, ip6_current_header(), IP6_HLEN);
-#else /* IPV6_FRAG_COPYHEADER */
-    /* need to use the none-const pointer here: */
-    ipr->iphdr = ip_data.current_ip6_header;
-#endif /* IPV6_FRAG_COPYHEADER */
-
-    /* copy the fragmented packet id. */
-    ipr->identification = frag_hdr->_identification;
-
-    /* copy the nexth field */
-    ipr->nexth = frag_hdr->_nexth;
-  }
-
-  /* Check if we are allowed to enqueue more datagrams. */
-  if ((ip6_reass_pbufcount + clen) > IP_REASS_MAX_PBUFS) {
-#if IP_REASS_FREE_OLDEST
-    ip6_reass_remove_oldest_datagram(ipr, clen);
-    if ((ip6_reass_pbufcount + clen) <= IP_REASS_MAX_PBUFS) {
-      /* re-search ipr_prev since it might have been removed */
-      for (ipr_prev = reassdatagrams; ipr_prev != NULL; ipr_prev = ipr_prev->next) {
-        if (ipr_prev->next == ipr) {
-          break;
-        }
-      }
-    } else
-#endif /* IP_REASS_FREE_OLDEST */
-    {
-      /* @todo: send ICMPv6 time exceeded here? */
-      /* drop this pbuf */
-      IP6_FRAG_STATS_INC(ip6_frag.memerr);
-      IP6_FRAG_STATS_INC(ip6_frag.drop);
-      goto nullreturn;
-    }
-  }
-
-  /* Overwrite Fragment Header with our own helper struct. */
-#if IPV6_FRAG_COPYHEADER
-  if (IPV6_FRAG_REQROOM > 0) {
-    /* Make room for struct ip6_reass_helper (only required if sizeof(void*) > 4).
-       This cannot fail since we already checked when receiving this fragment. */
-    u8_t hdrerr = pbuf_header_force(p, IPV6_FRAG_REQROOM);
-    LWIP_UNUSED_ARG(hdrerr); /* in case of LWIP_NOASSERT */
-    LWIP_ASSERT("no room for struct ip6_reass_helper", hdrerr == 0);
-  }
-#else /* IPV6_FRAG_COPYHEADER */
-  LWIP_ASSERT("sizeof(struct ip6_reass_helper) <= IP6_FRAG_HLEN, set IPV6_FRAG_COPYHEADER to 1",
-    sizeof(struct ip6_reass_helper) <= IP6_FRAG_HLEN);
-#endif /* IPV6_FRAG_COPYHEADER */
-  iprh = (struct ip6_reass_helper *)p->payload;
-  iprh->next_pbuf = NULL;
-  iprh->start = (offset & IP6_FRAG_OFFSET_MASK);
-  iprh->end = (offset & IP6_FRAG_OFFSET_MASK) + len;
-
-  /* find the right place to insert this pbuf */
-  /* Iterate through until we either get to the end of the list (append),
-   * or we find on with a larger offset (insert). */
-  for (q = ipr->p; q != NULL;) {
-    iprh_tmp = (struct ip6_reass_helper*)q->payload;
-    if (iprh->start < iprh_tmp->start) {
-#if IP_REASS_CHECK_OVERLAP
-      if (iprh->end > iprh_tmp->start) {
-        /* fragment overlaps with following, throw away */
-        IP6_FRAG_STATS_INC(ip6_frag.proterr);
-        IP6_FRAG_STATS_INC(ip6_frag.drop);
-        goto nullreturn;
-      }
-      if (iprh_prev != NULL) {
-        if (iprh->start < iprh_prev->end) {
-          /* fragment overlaps with previous, throw away */
-          IP6_FRAG_STATS_INC(ip6_frag.proterr);
-          IP6_FRAG_STATS_INC(ip6_frag.drop);
-          goto nullreturn;
-        }
-      }
-#endif /* IP_REASS_CHECK_OVERLAP */
-      /* the new pbuf should be inserted before this */
-      iprh->next_pbuf = q;
-      if (iprh_prev != NULL) {
-        /* not the fragment with the lowest offset */
-        iprh_prev->next_pbuf = p;
-      } else {
-        /* fragment with the lowest offset */
-        ipr->p = p;
-      }
-      break;
-    } else if (iprh->start == iprh_tmp->start) {
-      /* received the same datagram twice: no need to keep the datagram */
-      IP6_FRAG_STATS_INC(ip6_frag.drop);
-      goto nullreturn;
-#if IP_REASS_CHECK_OVERLAP
-    } else if (iprh->start < iprh_tmp->end) {
-      /* overlap: no need to keep the new datagram */
-      IP6_FRAG_STATS_INC(ip6_frag.proterr);
-      IP6_FRAG_STATS_INC(ip6_frag.drop);
-      goto nullreturn;
-#endif /* IP_REASS_CHECK_OVERLAP */
-    } else {
-      /* Check if the fragments received so far have no gaps. */
-      if (iprh_prev != NULL) {
-        if (iprh_prev->end != iprh_tmp->start) {
-          /* There is a fragment missing between the current
-           * and the previous fragment */
-          valid = 0;
-        }
-      }
-    }
-    q = iprh_tmp->next_pbuf;
-    iprh_prev = iprh_tmp;
-  }
-
-  /* If q is NULL, then we made it to the end of the list. Determine what to do now */
-  if (q == NULL) {
-    if (iprh_prev != NULL) {
-      /* this is (for now), the fragment with the highest offset:
-       * chain it to the last fragment */
-#if IP_REASS_CHECK_OVERLAP
-      LWIP_ASSERT("check fragments don't overlap", iprh_prev->end <= iprh->start);
-#endif /* IP_REASS_CHECK_OVERLAP */
-      iprh_prev->next_pbuf = p;
-      if (iprh_prev->end != iprh->start) {
-        valid = 0;
-      }
-    } else {
-#if IP_REASS_CHECK_OVERLAP
-      LWIP_ASSERT("no previous fragment, this must be the first fragment!",
-        ipr->p == NULL);
-#endif /* IP_REASS_CHECK_OVERLAP */
-      /* this is the first fragment we ever received for this ip datagram */
-      ipr->p = p;
-    }
-  }
-
-  /* Track the current number of pbufs current 'in-flight', in order to limit
-  the number of fragments that may be enqueued at any one time */
-  ip6_reass_pbufcount += clen;
-
-  /* Remember IPv6 header if this is the first fragment. */
-  if (iprh->start == 0) {
-#if IPV6_FRAG_COPYHEADER
-    if (iprh->next_pbuf != NULL) {
-      MEMCPY(&ipr->iphdr, ip6_current_header(), IP6_HLEN);
-    }
-#else /* IPV6_FRAG_COPYHEADER */
-    /* need to use the none-const pointer here: */
-    ipr->iphdr = ip_data.current_ip6_header;
-#endif /* IPV6_FRAG_COPYHEADER */
-  }
-
-  /* If this is the last fragment, calculate total packet length. */
-  if ((offset & IP6_FRAG_MORE_FLAG) == 0) {
-    ipr->datagram_len = iprh->end;
-  }
-
-  /* Additional validity tests: we have received first and last fragment. */
-  iprh_tmp = (struct ip6_reass_helper*)ipr->p->payload;
-  if (iprh_tmp->start != 0) {
-    valid = 0;
-  }
-  if (ipr->datagram_len == 0) {
-    valid = 0;
-  }
-
-  /* Final validity test: no gaps between current and last fragment. */
-  iprh_prev = iprh;
-  q = iprh->next_pbuf;
-  while ((q != NULL) && valid) {
-    iprh = (struct ip6_reass_helper*)q->payload;
-    if (iprh_prev->end != iprh->start) {
-      valid = 0;
-      break;
-    }
-    iprh_prev = iprh;
-    q = iprh->next_pbuf;
-  }
-
-  if (valid) {
-    /* All fragments have been received */
-    struct ip6_hdr* iphdr_ptr;
-
-    /* chain together the pbufs contained within the ip6_reassdata list. */
-    iprh = (struct ip6_reass_helper*) ipr->p->payload;
-    while (iprh != NULL) {
-      struct pbuf* next_pbuf = iprh->next_pbuf;
-      if (next_pbuf != NULL) {
-        /* Save next helper struct (will be hidden in next step). */
-        iprh_tmp = (struct ip6_reass_helper*)next_pbuf->payload;
-
-        /* hide the fragment header for every succeeding fragment */
-        pbuf_header(next_pbuf, -IP6_FRAG_HLEN);
-#if IPV6_FRAG_COPYHEADER
-        if (IPV6_FRAG_REQROOM > 0) {
-          /* hide the extra bytes borrowed from ip6_hdr for struct ip6_reass_helper */
-          u8_t hdrerr = pbuf_header(next_pbuf, -(s16_t)(IPV6_FRAG_REQROOM));
-          LWIP_UNUSED_ARG(hdrerr); /* in case of LWIP_NOASSERT */
-          LWIP_ASSERT("no room for struct ip6_reass_helper", hdrerr == 0);
-        }
-#endif
-        pbuf_cat(ipr->p, next_pbuf);
-      }
-      else {
-        iprh_tmp = NULL;
-      }
-
-      iprh = iprh_tmp;
-    }
-
-#if IPV6_FRAG_COPYHEADER
-    if (IPV6_FRAG_REQROOM > 0) {
-      /* get back room for struct ip6_reass_helper (only required if sizeof(void*) > 4) */
-      u8_t hdrerr = pbuf_header(ipr->p, -(s16_t)(IPV6_FRAG_REQROOM));
-      LWIP_UNUSED_ARG(hdrerr); /* in case of LWIP_NOASSERT */
-      LWIP_ASSERT("no room for struct ip6_reass_helper", hdrerr == 0);
-    }
-    iphdr_ptr = (struct ip6_hdr*)((u8_t*)ipr->p->payload - IP6_HLEN);
-    MEMCPY(iphdr_ptr, &ipr->iphdr, IP6_HLEN);
-#else
-    iphdr_ptr = ipr->iphdr;
-#endif
-
-    /* Adjust datagram length by adding header lengths. */
-    ipr->datagram_len += (u16_t)(((u8_t*)ipr->p->payload - (u8_t*)iphdr_ptr)
-                         + IP6_FRAG_HLEN
-                         - IP6_HLEN);
-
-    /* Set payload length in ip header. */
-    iphdr_ptr->_plen = lwip_htons(ipr->datagram_len);
-
-    /* Get the first pbuf. */
-    p = ipr->p;
-
-    /* Restore Fragment Header in first pbuf. Mark as "single fragment"
-     * packet. Restore nexth. */
-    frag_hdr = (struct ip6_frag_hdr *) p->payload;
-    frag_hdr->_nexth = ipr->nexth;
-    frag_hdr->reserved = 0;
-    frag_hdr->_fragment_offset = 0;
-    frag_hdr->_identification = 0;
-
-    /* release the sources allocate for the fragment queue entry */
-    if (reassdatagrams == ipr) {
-      /* it was the first in the list */
-      reassdatagrams = ipr->next;
-    } else {
-      /* it wasn't the first, so it must have a valid 'prev' */
-      LWIP_ASSERT("sanity check linked list", ipr_prev != NULL);
-      ipr_prev->next = ipr->next;
-    }
-    memp_free(MEMP_IP6_REASSDATA, ipr);
-
-    /* adjust the number of pbufs currently queued for reassembly. */
-    ip6_reass_pbufcount -= pbuf_clen(p);
-
-    /* Move pbuf back to IPv6 header.
-       This cannot fail since we already checked when receiving this fragment. */
-    if (pbuf_header_force(p, (s16_t)((u8_t*)p->payload - (u8_t*)iphdr_ptr))) {
-      LWIP_ASSERT("ip6_reass: moving p->payload to ip6 header failed\n", 0);
-      pbuf_free(p);
-      return NULL;
-    }
-
-    /* Return the pbuf chain */
-    return p;
-  }
-  /* the datagram is not (yet?) reassembled completely */
-  return NULL;
-
-nullreturn:
-  pbuf_free(p);
-  return NULL;
-}
-
-#endif /* LWIP_IPV6 && LWIP_IPV6_REASS */
-
-#if LWIP_IPV6 && LWIP_IPV6_FRAG
-
-#if !LWIP_NETIF_TX_SINGLE_PBUF
-/** Allocate a new struct pbuf_custom_ref */
-static struct pbuf_custom_ref*
-ip6_frag_alloc_pbuf_custom_ref(void)
-{
-  return (struct pbuf_custom_ref*)memp_malloc(MEMP_FRAG_PBUF);
-}
-
-/** Free a struct pbuf_custom_ref */
-static void
-ip6_frag_free_pbuf_custom_ref(struct pbuf_custom_ref* p)
-{
-  LWIP_ASSERT("p != NULL", p != NULL);
-  memp_free(MEMP_FRAG_PBUF, p);
-}
-
-/** Free-callback function to free a 'struct pbuf_custom_ref', called by
- * pbuf_free. */
-static void
-ip6_frag_free_pbuf_custom(struct pbuf *p)
-{
-  struct pbuf_custom_ref *pcr = (struct pbuf_custom_ref*)p;
-  LWIP_ASSERT("pcr != NULL", pcr != NULL);
-  LWIP_ASSERT("pcr == p", (void*)pcr == (void*)p);
-  if (pcr->original != NULL) {
-    pbuf_free(pcr->original);
-  }
-  ip6_frag_free_pbuf_custom_ref(pcr);
-}
-#endif /* !LWIP_NETIF_TX_SINGLE_PBUF */
-
-/**
- * Fragment an IPv6 datagram if too large for the netif or path MTU.
- *
- * Chop the datagram in MTU sized chunks and send them in order
- * by pointing PBUF_REFs into p
- *
- * @param p ipv6 packet to send
- * @param netif the netif on which to send
- * @param dest destination ipv6 address to which to send
- *
- * @return ERR_OK if sent successfully, err_t otherwise
- */
-err_t
-ip6_frag(struct pbuf *p, struct netif *netif, const ip6_addr_t *dest)
-{
-  struct ip6_hdr *original_ip6hdr;
-  struct ip6_hdr *ip6hdr;
-  struct ip6_frag_hdr *frag_hdr;
-  struct pbuf *rambuf;
-#if !LWIP_NETIF_TX_SINGLE_PBUF
-  struct pbuf *newpbuf;
-  u16_t newpbuflen = 0;
-  u16_t left_to_copy;
-#endif
-  static u32_t identification;
-  u16_t nfb;
-  u16_t left, cop;
-  u16_t mtu;
-  u16_t fragment_offset = 0;
-  u16_t last;
-  u16_t poff = IP6_HLEN;
-
-  identification++;
-
-  original_ip6hdr = (struct ip6_hdr *)p->payload;
-
-  mtu = nd6_get_destination_mtu(dest, netif);
-
-  /* @todo we assume there are no options in the unfragmentable part (IPv6 header). */
-  left = p->tot_len - IP6_HLEN;
-
-  nfb = (mtu - (IP6_HLEN + IP6_FRAG_HLEN)) & IP6_FRAG_OFFSET_MASK;
-
-  while (left) {
-    last = (left <= nfb);
-
-    /* Fill this fragment */
-    cop = last ? left : nfb;
-
-#if LWIP_NETIF_TX_SINGLE_PBUF
-    rambuf = pbuf_alloc(PBUF_IP, cop + IP6_FRAG_HLEN, PBUF_RAM);
-    if (rambuf == NULL) {
-      IP6_FRAG_STATS_INC(ip6_frag.memerr);
-      return ERR_MEM;
-    }
-    LWIP_ASSERT("this needs a pbuf in one piece!",
-      (rambuf->len == rambuf->tot_len) && (rambuf->next == NULL));
-    poff += pbuf_copy_partial(p, (u8_t*)rambuf->payload + IP6_FRAG_HLEN, cop, poff);
-    /* make room for the IP header */
-    if (pbuf_header(rambuf, IP6_HLEN)) {
-      pbuf_free(rambuf);
-      IP6_FRAG_STATS_INC(ip6_frag.memerr);
-      return ERR_MEM;
-    }
-    /* fill in the IP header */
-    SMEMCPY(rambuf->payload, original_ip6hdr, IP6_HLEN);
-    ip6hdr = (struct ip6_hdr *)rambuf->payload;
-    frag_hdr = (struct ip6_frag_hdr *)((u8_t*)rambuf->payload + IP6_HLEN);
-#else
-    /* When not using a static buffer, create a chain of pbufs.
-     * The first will be a PBUF_RAM holding the link, IPv6, and Fragment header.
-     * The rest will be PBUF_REFs mirroring the pbuf chain to be fragged,
-     * but limited to the size of an mtu.
-     */
-    rambuf = pbuf_alloc(PBUF_LINK, IP6_HLEN + IP6_FRAG_HLEN, PBUF_RAM);
-    if (rambuf == NULL) {
-      IP6_FRAG_STATS_INC(ip6_frag.memerr);
-      return ERR_MEM;
-    }
-    LWIP_ASSERT("this needs a pbuf in one piece!",
-                (p->len >= (IP6_HLEN)));
-    SMEMCPY(rambuf->payload, original_ip6hdr, IP6_HLEN);
-    ip6hdr = (struct ip6_hdr *)rambuf->payload;
-    frag_hdr = (struct ip6_frag_hdr *)((u8_t*)rambuf->payload + IP6_HLEN);
-
-    /* Can just adjust p directly for needed offset. */
-    p->payload = (u8_t *)p->payload + poff;
-    p->len -= poff;
-    p->tot_len -= poff;
-
-    left_to_copy = cop;
-    while (left_to_copy) {
-      struct pbuf_custom_ref *pcr;
-      newpbuflen = (left_to_copy < p->len) ? left_to_copy : p->len;
-      /* Is this pbuf already empty? */
-      if (!newpbuflen) {
-        p = p->next;
-        continue;
-      }
-      pcr = ip6_frag_alloc_pbuf_custom_ref();
-      if (pcr == NULL) {
-        pbuf_free(rambuf);
-        IP6_FRAG_STATS_INC(ip6_frag.memerr);
-        return ERR_MEM;
-      }
-      /* Mirror this pbuf, although we might not need all of it. */
-      newpbuf = pbuf_alloced_custom(PBUF_RAW, newpbuflen, PBUF_REF, &pcr->pc, p->payload, newpbuflen);
-      if (newpbuf == NULL) {
-        ip6_frag_free_pbuf_custom_ref(pcr);
-        pbuf_free(rambuf);
-        IP6_FRAG_STATS_INC(ip6_frag.memerr);
-        return ERR_MEM;
-      }
-      pbuf_ref(p);
-      pcr->original = p;
-      pcr->pc.custom_free_function = ip6_frag_free_pbuf_custom;
-
-      /* Add it to end of rambuf's chain, but using pbuf_cat, not pbuf_chain
-       * so that it is removed when pbuf_dechain is later called on rambuf.
-       */
-      pbuf_cat(rambuf, newpbuf);
-      left_to_copy -= newpbuflen;
-      if (left_to_copy) {
-        p = p->next;
-      }
-    }
-    poff = newpbuflen;
-#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
-
-    /* Set headers */
-    frag_hdr->_nexth = original_ip6hdr->_nexth;
-    frag_hdr->reserved = 0;
-    frag_hdr->_fragment_offset = lwip_htons((fragment_offset & IP6_FRAG_OFFSET_MASK) | (last ? 0 : IP6_FRAG_MORE_FLAG));
-    frag_hdr->_identification = lwip_htonl(identification);
-
-    IP6H_NEXTH_SET(ip6hdr, IP6_NEXTH_FRAGMENT);
-    IP6H_PLEN_SET(ip6hdr, cop + IP6_FRAG_HLEN);
-
-    /* No need for separate header pbuf - we allowed room for it in rambuf
-     * when allocated.
-     */
-    IP6_FRAG_STATS_INC(ip6_frag.xmit);
-    netif->output_ip6(netif, rambuf, dest);
-
-    /* Unfortunately we can't reuse rambuf - the hardware may still be
-     * using the buffer. Instead we free it (and the ensuing chain) and
-     * recreate it next time round the loop. If we're lucky the hardware
-     * will have already sent the packet, the free will really free, and
-     * there will be zero memory penalty.
-     */
-
-    pbuf_free(rambuf);
-    left -= cop;
-    fragment_offset += cop;
-  }
-  return ERR_OK;
-}
-
-#endif /* LWIP_IPV6 && LWIP_IPV6_FRAG */
diff --git a/sys/net/core/ipv6/mld6.c b/sys/net/core/ipv6/mld6.c
deleted file mode 100644
index 8f553e8..0000000
--- a/sys/net/core/ipv6/mld6.c
+++ /dev/null
@@ -1,588 +0,0 @@
-/**
- * @file
- * Multicast listener discovery
- *
- * @defgroup mld6 MLD6
- * @ingroup ip6
- * Multicast listener discovery for IPv6. Aims to be compliant with RFC 2710.
- * No support for MLDv2.\n
- * To be called from TCPIP thread
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-/* Based on igmp.c implementation of igmp v2 protocol */
-
-#include "net/opt.h"
-
-#if LWIP_IPV6 && LWIP_IPV6_MLD  /* don't build if not configured for use in lwipopts.h */
-
-#include "net/mld6.h"
-#include "net/prot/mld6.h"
-#include "net/icmp6.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/ip.h"
-#include "net/inet_chksum.h"
-#include "net/pbuf.h"
-#include "net/netif.h"
-#include "net/memp.h"
-#include "net/stats.h"
-
-#include <string.h>
-
-
-/*
- * MLD constants
- */
-#define MLD6_HL                           1
-#define MLD6_JOIN_DELAYING_MEMBER_TMR_MS  (500)
-
-#define MLD6_GROUP_NON_MEMBER             0
-#define MLD6_GROUP_DELAYING_MEMBER        1
-#define MLD6_GROUP_IDLE_MEMBER            2
-
-/* Forward declarations. */
-static struct mld_group *mld6_new_group(struct netif *ifp, const ip6_addr_t *addr);
-static err_t mld6_remove_group(struct netif *netif, struct mld_group *group);
-static void mld6_delayed_report(struct mld_group *group, u16_t maxresp);
-static void mld6_send(struct netif *netif, struct mld_group *group, u8_t type);
-
-
-/**
- * Stop MLD processing on interface
- *
- * @param netif network interface on which stop MLD processing
- */
-err_t
-mld6_stop(struct netif *netif)
-{
-  struct mld_group *group = netif_mld6_data(netif);
-
-  netif_set_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_MLD6, NULL);
-
-  while (group != NULL) {
-    struct mld_group *next = group->next; /* avoid use-after-free below */
-
-    /* disable the group at the MAC level */
-    if (netif->mld_mac_filter != NULL) {
-      netif->mld_mac_filter(netif, &(group->group_address), NETIF_DEL_MAC_FILTER);
-    }
-
-    /* free group */
-    memp_free(MEMP_MLD6_GROUP, group);
-
-    /* move to "next" */
-    group = next;
-  }
-  return ERR_OK;
-}
-
-/**
- * Report MLD memberships for this interface
- *
- * @param netif network interface on which report MLD memberships
- */
-void
-mld6_report_groups(struct netif *netif)
-{
-  struct mld_group *group = netif_mld6_data(netif);
-
-  while (group != NULL) {
-    mld6_delayed_report(group, MLD6_JOIN_DELAYING_MEMBER_TMR_MS);
-    group = group->next;
-  }
-}
-
-/**
- * Search for a group that is joined on a netif
- *
- * @param ifp the network interface for which to look
- * @param addr the group ipv6 address to search for
- * @return a struct mld_group* if the group has been found,
- *         NULL if the group wasn't found.
- */
-struct mld_group *
-mld6_lookfor_group(struct netif *ifp, const ip6_addr_t *addr)
-{
-  struct mld_group *group = netif_mld6_data(ifp);
-
-  while (group != NULL) {
-    if (ip6_addr_cmp(&(group->group_address), addr)) {
-      return group;
-    }
-    group = group->next;
-  }
-
-  return NULL;
-}
-
-
-/**
- * create a new group
- *
- * @param ifp the network interface for which to create
- * @param addr the new group ipv6
- * @return a struct mld_group*,
- *         NULL on memory error.
- */
-static struct mld_group *
-mld6_new_group(struct netif *ifp, const ip6_addr_t *addr)
-{
-  struct mld_group *group;
-
-  group = (struct mld_group *)memp_malloc(MEMP_MLD6_GROUP);
-  if (group != NULL) {
-    ip6_addr_set(&(group->group_address), addr);
-    group->timer              = 0; /* Not running */
-    group->group_state        = MLD6_GROUP_IDLE_MEMBER;
-    group->last_reporter_flag = 0;
-    group->use                = 0;
-    group->next               = netif_mld6_data(ifp);
-
-    netif_set_client_data(ifp, LWIP_NETIF_CLIENT_DATA_INDEX_MLD6, group);
-  }
-
-  return group;
-}
-
-/**
- * Remove a group from the mld_group_list, but do not free it yet
- *
- * @param group the group to remove
- * @return ERR_OK if group was removed from the list, an err_t otherwise
- */
-static err_t
-mld6_remove_group(struct netif *netif, struct mld_group *group)
-{
-  err_t err = ERR_OK;
-
-  /* Is it the first group? */
-  if (netif_mld6_data(netif) == group) {
-    netif_set_client_data(netif, LWIP_NETIF_CLIENT_DATA_INDEX_MLD6, group->next);
-  } else {
-    /* look for group further down the list */
-    struct mld_group *tmpGroup;
-    for (tmpGroup = netif_mld6_data(netif); tmpGroup != NULL; tmpGroup = tmpGroup->next) {
-      if (tmpGroup->next == group) {
-        tmpGroup->next = group->next;
-        break;
-      }
-    }
-    /* Group not find group */
-    if (tmpGroup == NULL) {
-      err = ERR_ARG;
-    }
-  }
-
-  return err;
-}
-
-
-/**
- * Process an input MLD message. Called by icmp6_input.
- *
- * @param p the mld packet, p->payload pointing to the icmpv6 header
- * @param inp the netif on which this packet was received
- */
-void
-mld6_input(struct pbuf *p, struct netif *inp)
-{
-  struct mld_header *mld_hdr;
-  struct mld_group *group;
-
-  MLD6_STATS_INC(mld6.recv);
-
-  /* Check that mld header fits in packet. */
-  if (p->len < sizeof(struct mld_header)) {
-    /* @todo debug message */
-    pbuf_free(p);
-    MLD6_STATS_INC(mld6.lenerr);
-    MLD6_STATS_INC(mld6.drop);
-    return;
-  }
-
-  mld_hdr = (struct mld_header *)p->payload;
-
-  switch (mld_hdr->type) {
-  case ICMP6_TYPE_MLQ: /* Multicast listener query. */
-    /* Is it a general query? */
-    if (ip6_addr_isallnodes_linklocal(ip6_current_dest_addr()) &&
-        ip6_addr_isany(&(mld_hdr->multicast_address))) {
-      MLD6_STATS_INC(mld6.rx_general);
-      /* Report all groups, except all nodes group, and if-local groups. */
-      group = netif_mld6_data(inp);
-      while (group != NULL) {
-        if ((!(ip6_addr_ismulticast_iflocal(&(group->group_address)))) &&
-            (!(ip6_addr_isallnodes_linklocal(&(group->group_address))))) {
-          mld6_delayed_report(group, mld_hdr->max_resp_delay);
-        }
-        group = group->next;
-      }
-    } else {
-      /* Have we joined this group?
-       * We use IP6 destination address to have a memory aligned copy.
-       * mld_hdr->multicast_address should be the same. */
-      MLD6_STATS_INC(mld6.rx_group);
-      group = mld6_lookfor_group(inp, ip6_current_dest_addr());
-      if (group != NULL) {
-        /* Schedule a report. */
-        mld6_delayed_report(group, mld_hdr->max_resp_delay);
-      }
-    }
-    break; /* ICMP6_TYPE_MLQ */
-  case ICMP6_TYPE_MLR: /* Multicast listener report. */
-    /* Have we joined this group?
-     * We use IP6 destination address to have a memory aligned copy.
-     * mld_hdr->multicast_address should be the same. */
-    MLD6_STATS_INC(mld6.rx_report);
-    group = mld6_lookfor_group(inp, ip6_current_dest_addr());
-    if (group != NULL) {
-      /* If we are waiting to report, cancel it. */
-      if (group->group_state == MLD6_GROUP_DELAYING_MEMBER) {
-        group->timer = 0; /* stopped */
-        group->group_state = MLD6_GROUP_IDLE_MEMBER;
-        group->last_reporter_flag = 0;
-      }
-    }
-    break; /* ICMP6_TYPE_MLR */
-  case ICMP6_TYPE_MLD: /* Multicast listener done. */
-    /* Do nothing, router will query us. */
-    break; /* ICMP6_TYPE_MLD */
-  default:
-    MLD6_STATS_INC(mld6.proterr);
-    MLD6_STATS_INC(mld6.drop);
-    break;
-  }
-
-  pbuf_free(p);
-}
-
-/**
- * @ingroup mld6
- * Join a group on a network interface.
- *
- * @param srcaddr ipv6 address of the network interface which should
- *                join a new group. If IP6_ADDR_ANY, join on all netifs
- * @param groupaddr the ipv6 address of the group to join
- * @return ERR_OK if group was joined on the netif(s), an err_t otherwise
- */
-err_t
-mld6_joingroup(const ip6_addr_t *srcaddr, const ip6_addr_t *groupaddr)
-{
-  err_t         err = ERR_VAL; /* no matching interface */
-  struct netif *netif;
-
-  /* loop through netif's */
-  netif = netif_list;
-  while (netif != NULL) {
-    /* Should we join this interface ? */
-    if (ip6_addr_isany(srcaddr) ||
-        netif_get_ip6_addr_match(netif, srcaddr) >= 0) {
-      err = mld6_joingroup_netif(netif, groupaddr);
-      if (err != ERR_OK) {
-        return err;
-      }
-    }
-
-    /* proceed to next network interface */
-    netif = netif->next;
-  }
-
-  return err;
-}
-
-/**
- * @ingroup mld6
- * Join a group on a network interface.
- *
- * @param netif the network interface which should join a new group.
- * @param groupaddr the ipv6 address of the group to join
- * @return ERR_OK if group was joined on the netif, an err_t otherwise
- */
-err_t
-mld6_joingroup_netif(struct netif *netif, const ip6_addr_t *groupaddr)
-{
-  struct mld_group *group;
-
-  /* find group or create a new one if not found */
-  group = mld6_lookfor_group(netif, groupaddr);
-
-  if (group == NULL) {
-    /* Joining a new group. Create a new group entry. */
-    group = mld6_new_group(netif, groupaddr);
-    if (group == NULL) {
-      return ERR_MEM;
-    }
-
-    /* Activate this address on the MAC layer. */
-    if (netif->mld_mac_filter != NULL) {
-      netif->mld_mac_filter(netif, groupaddr, NETIF_ADD_MAC_FILTER);
-    }
-
-    /* Report our membership. */
-    MLD6_STATS_INC(mld6.tx_report);
-    mld6_send(netif, group, ICMP6_TYPE_MLR);
-    mld6_delayed_report(group, MLD6_JOIN_DELAYING_MEMBER_TMR_MS);
-  }
-
-  /* Increment group use */
-  group->use++;
-  return ERR_OK;
-}
-
-/**
- * @ingroup mld6
- * Leave a group on a network interface.
- *
- * @param srcaddr ipv6 address of the network interface which should
- *                leave the group. If IP6_ISANY, leave on all netifs
- * @param groupaddr the ipv6 address of the group to leave
- * @return ERR_OK if group was left on the netif(s), an err_t otherwise
- */
-err_t
-mld6_leavegroup(const ip6_addr_t *srcaddr, const ip6_addr_t *groupaddr)
-{
-  err_t         err = ERR_VAL; /* no matching interface */
-  struct netif *netif;
-
-  /* loop through netif's */
-  netif = netif_list;
-  while (netif != NULL) {
-    /* Should we leave this interface ? */
-    if (ip6_addr_isany(srcaddr) ||
-        netif_get_ip6_addr_match(netif, srcaddr) >= 0) {
-      err_t res = mld6_leavegroup_netif(netif, groupaddr);
-      if (err != ERR_OK) {
-        /* Store this result if we have not yet gotten a success */
-        err = res;
-      }
-    }
-    /* proceed to next network interface */
-    netif = netif->next;
-  }
-
-  return err;
-}
-
-/**
- * @ingroup mld6
- * Leave a group on a network interface.
- *
- * @param netif the network interface which should leave the group.
- * @param groupaddr the ipv6 address of the group to leave
- * @return ERR_OK if group was left on the netif, an err_t otherwise
- */
-err_t
-mld6_leavegroup_netif(struct netif *netif, const ip6_addr_t *groupaddr)
-{
-  struct mld_group *group;
-
-  /* find group */
-  group = mld6_lookfor_group(netif, groupaddr);
-
-  if (group != NULL) {
-    /* Leave if there is no other use of the group */
-    if (group->use <= 1) {
-      /* Remove the group from the list */
-      mld6_remove_group(netif, group);
-
-      /* If we are the last reporter for this group */
-      if (group->last_reporter_flag) {
-        MLD6_STATS_INC(mld6.tx_leave);
-        mld6_send(netif, group, ICMP6_TYPE_MLD);
-      }
-
-      /* Disable the group at the MAC level */
-      if (netif->mld_mac_filter != NULL) {
-        netif->mld_mac_filter(netif, groupaddr, NETIF_DEL_MAC_FILTER);
-      }
-
-      /* free group struct */
-      memp_free(MEMP_MLD6_GROUP, group);
-    } else {
-      /* Decrement group use */
-      group->use--;
-    }
-
-    /* Left group */
-    return ERR_OK;
-  }
-
-  /* Group not found */
-  return ERR_VAL;
-}
-
-
-/**
- * Periodic timer for mld processing. Must be called every
- * MLD6_TMR_INTERVAL milliseconds (100).
- *
- * When a delaying member expires, a membership report is sent.
- */
-void
-mld6_tmr(void)
-{
-  struct netif *netif = netif_list;
-
-  while (netif != NULL) {
-    struct mld_group *group = netif_mld6_data(netif);
-
-    while (group != NULL) {
-      if (group->timer > 0) {
-        group->timer--;
-        if (group->timer == 0) {
-          /* If the state is MLD6_GROUP_DELAYING_MEMBER then we send a report for this group */
-          if (group->group_state == MLD6_GROUP_DELAYING_MEMBER) {
-            MLD6_STATS_INC(mld6.tx_report);
-            mld6_send(netif, group, ICMP6_TYPE_MLR);
-            group->group_state = MLD6_GROUP_IDLE_MEMBER;
-          }
-        }
-      }
-      group = group->next;
-    }
-    netif = netif->next;
-  }
-}
-
-/**
- * Schedule a delayed membership report for a group
- *
- * @param group the mld_group for which "delaying" membership report
- *              should be sent
- * @param maxresp the max resp delay provided in the query
- */
-static void
-mld6_delayed_report(struct mld_group *group, u16_t maxresp)
-{
-  /* Convert maxresp from milliseconds to tmr ticks */
-  maxresp = maxresp / MLD6_TMR_INTERVAL;
-  if (maxresp == 0) {
-    maxresp = 1;
-  }
-
-#ifdef LWIP_RAND
-  /* Randomize maxresp. (if LWIP_RAND is supported) */
-  maxresp = LWIP_RAND() % maxresp;
-  if (maxresp == 0) {
-    maxresp = 1;
-  }
-#endif /* LWIP_RAND */
-
-  /* Apply timer value if no report has been scheduled already. */
-  if ((group->group_state == MLD6_GROUP_IDLE_MEMBER) ||
-     ((group->group_state == MLD6_GROUP_DELAYING_MEMBER) &&
-      ((group->timer == 0) || (maxresp < group->timer)))) {
-    group->timer = maxresp;
-    group->group_state = MLD6_GROUP_DELAYING_MEMBER;
-  }
-}
-
-/**
- * Send a MLD message (report or done).
- *
- * An IPv6 hop-by-hop options header with a router alert option
- * is prepended.
- *
- * @param group the group to report or quit
- * @param type ICMP6_TYPE_MLR (report) or ICMP6_TYPE_MLD (done)
- */
-static void
-mld6_send(struct netif *netif, struct mld_group *group, u8_t type)
-{
-  struct mld_header *mld_hdr;
-  struct pbuf *p;
-  const ip6_addr_t *src_addr;
-
-  /* Allocate a packet. Size is MLD header + IPv6 Hop-by-hop options header. */
-  p = pbuf_alloc(PBUF_IP, sizeof(struct mld_header) + sizeof(struct ip6_hbh_hdr), PBUF_RAM);
-  if (p == NULL) {
-    MLD6_STATS_INC(mld6.memerr);
-    return;
-  }
-
-  /* Move to make room for Hop-by-hop options header. */
-  if (pbuf_header(p, -IP6_HBH_HLEN)) {
-    pbuf_free(p);
-    MLD6_STATS_INC(mld6.lenerr);
-    return;
-  }
-
-  /* Select our source address. */
-  if (!ip6_addr_isvalid(netif_ip6_addr_state(netif, 0))) {
-    /* This is a special case, when we are performing duplicate address detection.
-     * We must join the multicast group, but we don't have a valid address yet. */
-    src_addr = IP6_ADDR_ANY6;
-  } else {
-    /* Use link-local address as source address. */
-    src_addr = netif_ip6_addr(netif, 0);
-  }
-
-  /* MLD message header pointer. */
-  mld_hdr = (struct mld_header *)p->payload;
-
-  /* Set fields. */
-  mld_hdr->type = type;
-  mld_hdr->code = 0;
-  mld_hdr->chksum = 0;
-  mld_hdr->max_resp_delay = 0;
-  mld_hdr->reserved = 0;
-  ip6_addr_set(&(mld_hdr->multicast_address), &(group->group_address));
-
-#if CHECKSUM_GEN_ICMP6
-  IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_ICMP6) {
-    mld_hdr->chksum = ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->len,
-      src_addr, &(group->group_address));
-  }
-#endif /* CHECKSUM_GEN_ICMP6 */
-
-  /* Add hop-by-hop headers options: router alert with MLD value. */
-  ip6_options_add_hbh_ra(p, IP6_NEXTH_ICMP6, IP6_ROUTER_ALERT_VALUE_MLD);
-
-  if (type == ICMP6_TYPE_MLR) {
-    /* Remember we were the last to report */
-    group->last_reporter_flag = 1;
-  }
-
-  /* Send the packet out. */
-  MLD6_STATS_INC(mld6.xmit);
-  ip6_output_if(p, (ip6_addr_isany(src_addr)) ? NULL : src_addr, &(group->group_address),
-      MLD6_HL, 0, IP6_NEXTH_HOPBYHOP, netif);
-  pbuf_free(p);
-}
-
-#endif /* LWIP_IPV6 */
diff --git a/sys/net/core/ipv6/nd6.c b/sys/net/core/ipv6/nd6.c
deleted file mode 100644
index 1f2c49d..0000000
--- a/sys/net/core/ipv6/nd6.c
+++ /dev/null
@@ -1,2102 +0,0 @@
-/**
- * @file
- *
- * Neighbor discovery and stateless address autoconfiguration for IPv6.
- * Aims to be compliant with RFC 4861 (Neighbor discovery) and RFC 4862
- * (Address autoconfiguration).
- */
-
-/*
- * Copyright (c) 2010 Inico Technologies Ltd.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Ivan Delamer <delamer@inicotech.com>
- *
- *
- * Please coordinate changes and requests with Ivan Delamer
- * <delamer@inicotech.com>
- */
-
-#include "net/opt.h"
-
-#if LWIP_IPV6  /* don't build if not configured for use in lwipopts.h */
-
-#include "net/nd6.h"
-#include "net/priv/nd6_priv.h"
-#include "net/prot/nd6.h"
-#include "net/prot/icmp6.h"
-#include "net/pbuf.h"
-#include "net/mem.h"
-#include "net/memp.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/inet_chksum.h"
-#include "net/netif.h"
-#include "net/icmp6.h"
-#include "net/mld6.h"
-#include "net/ip.h"
-#include "net/stats.h"
-#include "net/dns.h"
-
-#include <string.h>
-
-#ifdef LWIP_HOOK_FILENAME
-#include LWIP_HOOK_FILENAME
-#endif
-
-#if LWIP_IPV6_DUP_DETECT_ATTEMPTS > IP6_ADDR_TENTATIVE_COUNT_MASK
-#error LWIP_IPV6_DUP_DETECT_ATTEMPTS > IP6_ADDR_TENTATIVE_COUNT_MASK
-#endif
-
-/* Router tables. */
-struct nd6_neighbor_cache_entry neighbor_cache[LWIP_ND6_NUM_NEIGHBORS];
-struct nd6_destination_cache_entry destination_cache[LWIP_ND6_NUM_DESTINATIONS];
-struct nd6_prefix_list_entry prefix_list[LWIP_ND6_NUM_PREFIXES];
-struct nd6_router_list_entry default_router_list[LWIP_ND6_NUM_ROUTERS];
-
-/* Default values, can be updated by a RA message. */
-u32_t reachable_time = LWIP_ND6_REACHABLE_TIME;
-u32_t retrans_timer = LWIP_ND6_RETRANS_TIMER; /* @todo implement this value in timer */
-
-/* Index for cache entries. */
-static u8_t nd6_cached_neighbor_index;
-static u8_t nd6_cached_destination_index;
-
-/* Multicast address holder. */
-static ip6_addr_t multicast_address;
-
-/* Static buffer to parse RA packet options (size of a prefix option, biggest option) */
-static u8_t nd6_ra_buffer[sizeof(struct prefix_option)];
-
-/* Forward declarations. */
-static s8_t nd6_find_neighbor_cache_entry(const ip6_addr_t *ip6addr);
-static s8_t nd6_new_neighbor_cache_entry(void);
-static void nd6_free_neighbor_cache_entry(s8_t i);
-static s8_t nd6_find_destination_cache_entry(const ip6_addr_t *ip6addr);
-static s8_t nd6_new_destination_cache_entry(void);
-static s8_t nd6_is_prefix_in_netif(const ip6_addr_t *ip6addr, struct netif *netif);
-static s8_t nd6_select_router(const ip6_addr_t *ip6addr, struct netif *netif);
-static s8_t nd6_get_router(const ip6_addr_t *router_addr, struct netif *netif);
-static s8_t nd6_new_router(const ip6_addr_t *router_addr, struct netif *netif);
-static s8_t nd6_get_onlink_prefix(ip6_addr_t *prefix, struct netif *netif);
-static s8_t nd6_new_onlink_prefix(ip6_addr_t *prefix, struct netif *netif);
-static s8_t nd6_get_next_hop_entry(const ip6_addr_t *ip6addr, struct netif *netif);
-static err_t nd6_queue_packet(s8_t neighbor_index, struct pbuf *q);
-
-#define ND6_SEND_FLAG_MULTICAST_DEST 0x01
-#define ND6_SEND_FLAG_ALLNODES_DEST 0x02
-static void nd6_send_ns(struct netif *netif, const ip6_addr_t *target_addr, u8_t flags);
-static void nd6_send_na(struct netif *netif, const ip6_addr_t *target_addr, u8_t flags);
-static void nd6_send_neighbor_cache_probe(struct nd6_neighbor_cache_entry *entry, u8_t flags);
-#if LWIP_IPV6_SEND_ROUTER_SOLICIT
-static err_t nd6_send_rs(struct netif *netif);
-#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
-
-#if LWIP_ND6_QUEUEING
-static void nd6_free_q(struct nd6_q_entry *q);
-#else /* LWIP_ND6_QUEUEING */
-#define nd6_free_q(q) pbuf_free(q)
-#endif /* LWIP_ND6_QUEUEING */
-static void nd6_send_q(s8_t i);
-
-
-/**
- * Process an incoming neighbor discovery message
- *
- * @param p the nd packet, p->payload pointing to the icmpv6 header
- * @param inp the netif on which this packet was received
- */
-void
-nd6_input(struct pbuf *p, struct netif *inp)
-{
-  u8_t msg_type;
-  s8_t i;
-
-  ND6_STATS_INC(nd6.recv);
-
-  msg_type = *((u8_t *)p->payload);
-  switch (msg_type) {
-  case ICMP6_TYPE_NA: /* Neighbor Advertisement. */
-  {
-    struct na_header *na_hdr;
-    struct lladdr_option *lladdr_opt;
-
-    /* Check that na header fits in packet. */
-    if (p->len < (sizeof(struct na_header))) {
-      /* @todo debug message */
-      pbuf_free(p);
-      ND6_STATS_INC(nd6.lenerr);
-      ND6_STATS_INC(nd6.drop);
-      return;
-    }
-
-    na_hdr = (struct na_header *)p->payload;
-
-    /* Unsolicited NA?*/
-    if (ip6_addr_ismulticast(ip6_current_dest_addr())) {
-      ip6_addr_t target_address;
-      
-      /* This is an unsolicited NA.
-       * link-layer changed?
-       * part of DAD mechanism? */
-
-      /* Create an aligned copy. */
-      ip6_addr_set(&target_address, &(na_hdr->target_address));
-
-#if LWIP_IPV6_DUP_DETECT_ATTEMPTS
-      /* If the target address matches this netif, it is a DAD response. */
-      for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-        if (!ip6_addr_isinvalid(netif_ip6_addr_state(inp, i)) &&
-            ip6_addr_cmp(&target_address, netif_ip6_addr(inp, i))) {
-          /* We are using a duplicate address. */
-          netif_ip6_addr_set_state(inp, i, IP6_ADDR_INVALID);
-
-#if LWIP_IPV6_AUTOCONFIG
-          /* Check to see if this address was autoconfigured. */
-          if (!ip6_addr_islinklocal(&target_address)) {
-            i = nd6_get_onlink_prefix(&target_address, inp);
-            if (i >= 0) {
-              /* Mark this prefix as duplicate, so that we don't use it
-               * to generate this address again. */
-              prefix_list[i].flags |= ND6_PREFIX_AUTOCONFIG_ADDRESS_DUPLICATE;
-            }
-          }
-#endif /* LWIP_IPV6_AUTOCONFIG */
-
-          pbuf_free(p);
-          return;
-        }
-      }
-#endif /* LWIP_IPV6_DUP_DETECT_ATTEMPTS */
-
-      /* Check that link-layer address option also fits in packet. */
-      if (p->len < (sizeof(struct na_header) + 2)) {
-        /* @todo debug message */
-        pbuf_free(p);
-        ND6_STATS_INC(nd6.lenerr);
-        ND6_STATS_INC(nd6.drop);
-        return;
-      }
-
-      lladdr_opt = (struct lladdr_option *)((u8_t*)p->payload + sizeof(struct na_header));
-
-      if (p->len < (sizeof(struct na_header) + (lladdr_opt->length << 3))) {
-        /* @todo debug message */
-        pbuf_free(p);
-        ND6_STATS_INC(nd6.lenerr);
-        ND6_STATS_INC(nd6.drop);
-        return;
-      }
-
-      /* This is an unsolicited NA, most likely there was a LLADDR change. */
-      i = nd6_find_neighbor_cache_entry(&target_address);
-      if (i >= 0) {
-        if (na_hdr->flags & ND6_FLAG_OVERRIDE) {
-          MEMCPY(neighbor_cache[i].lladdr, lladdr_opt->addr, inp->hwaddr_len);
-        }
-      }
-    } else {
-      ip6_addr_t target_address;
-
-      /* This is a solicited NA.
-       * neighbor address resolution response?
-       * neighbor unreachability detection response? */
-
-      /* Create an aligned copy. */
-      ip6_addr_set(&target_address, &(na_hdr->target_address));
-
-      /* Find the cache entry corresponding to this na. */
-      i = nd6_find_neighbor_cache_entry(&target_address);
-      if (i < 0) {
-        /* We no longer care about this target address. drop it. */
-        pbuf_free(p);
-        return;
-      }
-
-      /* Update cache entry. */
-      if ((na_hdr->flags & ND6_FLAG_OVERRIDE) ||
-          (neighbor_cache[i].state == ND6_INCOMPLETE)) {
-        /* Check that link-layer address option also fits in packet. */
-        if (p->len < (sizeof(struct na_header) + 2)) {
-          /* @todo debug message */
-          pbuf_free(p);
-          ND6_STATS_INC(nd6.lenerr);
-          ND6_STATS_INC(nd6.drop);
-          return;
-        }
-
-        lladdr_opt = (struct lladdr_option *)((u8_t*)p->payload + sizeof(struct na_header));
-
-        if (p->len < (sizeof(struct na_header) + (lladdr_opt->length << 3))) {
-          /* @todo debug message */
-          pbuf_free(p);
-          ND6_STATS_INC(nd6.lenerr);
-          ND6_STATS_INC(nd6.drop);
-          return;
-        }
-
-        MEMCPY(neighbor_cache[i].lladdr, lladdr_opt->addr, inp->hwaddr_len);
-      }
-
-      neighbor_cache[i].netif = inp;
-      neighbor_cache[i].state = ND6_REACHABLE;
-      neighbor_cache[i].counter.reachable_time = reachable_time;
-
-      /* Send queued packets, if any. */
-      if (neighbor_cache[i].q != NULL) {
-        nd6_send_q(i);
-      }
-    }
-
-    break; /* ICMP6_TYPE_NA */
-  }
-  case ICMP6_TYPE_NS: /* Neighbor solicitation. */
-  {
-    struct ns_header *ns_hdr;
-    struct lladdr_option *lladdr_opt;
-    u8_t accepted;
-
-    /* Check that ns header fits in packet. */
-    if (p->len < sizeof(struct ns_header)) {
-      /* @todo debug message */
-      pbuf_free(p);
-      ND6_STATS_INC(nd6.lenerr);
-      ND6_STATS_INC(nd6.drop);
-      return;
-    }
-
-    ns_hdr = (struct ns_header *)p->payload;
-
-    /* Check if there is a link-layer address provided. Only point to it if in this buffer. */
-    if (p->len >= (sizeof(struct ns_header) + 2)) {
-      lladdr_opt = (struct lladdr_option *)((u8_t*)p->payload + sizeof(struct ns_header));
-      if (p->len < (sizeof(struct ns_header) + (lladdr_opt->length << 3))) {
-        lladdr_opt = NULL;
-      }
-    } else {
-      lladdr_opt = NULL;
-    }
-
-    /* Check if the target address is configured on the receiving netif. */
-    accepted = 0;
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; ++i) {
-      if ((ip6_addr_isvalid(netif_ip6_addr_state(inp, i)) ||
-           (ip6_addr_istentative(netif_ip6_addr_state(inp, i)) &&
-            ip6_addr_isany(ip6_current_src_addr()))) &&
-          ip6_addr_cmp(&(ns_hdr->target_address), netif_ip6_addr(inp, i))) {
-        accepted = 1;
-        break;
-      }
-    }
-
-    /* NS not for us? */
-    if (!accepted) {
-      pbuf_free(p);
-      return;
-    }
-
-    /* Check for ANY address in src (DAD algorithm). */
-    if (ip6_addr_isany(ip6_current_src_addr())) {
-      /* Sender is validating this address. */
-      for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; ++i) {
-        if (!ip6_addr_isinvalid(netif_ip6_addr_state(inp, i)) &&
-            ip6_addr_cmp(&(ns_hdr->target_address), netif_ip6_addr(inp, i))) {
-          /* Send a NA back so that the sender does not use this address. */
-          nd6_send_na(inp, netif_ip6_addr(inp, i), ND6_FLAG_OVERRIDE | ND6_SEND_FLAG_ALLNODES_DEST);
-          if (ip6_addr_istentative(netif_ip6_addr_state(inp, i))) {
-            /* We shouldn't use this address either. */
-            netif_ip6_addr_set_state(inp, i, IP6_ADDR_INVALID);
-          }
-        }
-      }
-    } else {
-      ip6_addr_t target_address;
-      
-      /* Sender is trying to resolve our address. */
-      /* Verify that they included their own link-layer address. */
-      if (lladdr_opt == NULL) {
-        /* Not a valid message. */
-        pbuf_free(p);
-        ND6_STATS_INC(nd6.proterr);
-        ND6_STATS_INC(nd6.drop);
-        return;
-      }
-
-      i = nd6_find_neighbor_cache_entry(ip6_current_src_addr());
-      if (i>= 0) {
-        /* We already have a record for the solicitor. */
-        if (neighbor_cache[i].state == ND6_INCOMPLETE) {
-          neighbor_cache[i].netif = inp;
-          MEMCPY(neighbor_cache[i].lladdr, lladdr_opt->addr, inp->hwaddr_len);
-
-          /* Delay probe in case we get confirmation of reachability from upper layer (TCP). */
-          neighbor_cache[i].state = ND6_DELAY;
-          neighbor_cache[i].counter.delay_time = LWIP_ND6_DELAY_FIRST_PROBE_TIME / ND6_TMR_INTERVAL;
-        }
-      } else {
-        /* Add their IPv6 address and link-layer address to neighbor cache.
-         * We will need it at least to send a unicast NA message, but most
-         * likely we will also be communicating with this node soon. */
-        i = nd6_new_neighbor_cache_entry();
-        if (i < 0) {
-          /* We couldn't assign a cache entry for this neighbor.
-           * we won't be able to reply. drop it. */
-          pbuf_free(p);
-          ND6_STATS_INC(nd6.memerr);
-          return;
-        }
-        neighbor_cache[i].netif = inp;
-        MEMCPY(neighbor_cache[i].lladdr, lladdr_opt->addr, inp->hwaddr_len);
-        ip6_addr_set(&(neighbor_cache[i].next_hop_address), ip6_current_src_addr());
-
-        /* Receiving a message does not prove reachability: only in one direction.
-         * Delay probe in case we get confirmation of reachability from upper layer (TCP). */
-        neighbor_cache[i].state = ND6_DELAY;
-        neighbor_cache[i].counter.delay_time = LWIP_ND6_DELAY_FIRST_PROBE_TIME / ND6_TMR_INTERVAL;
-      }
-
-      /* Create an aligned copy. */
-      ip6_addr_set(&target_address, &(ns_hdr->target_address));
-
-      /* Send back a NA for us. Allocate the reply pbuf. */
-      nd6_send_na(inp, &target_address, ND6_FLAG_SOLICITED | ND6_FLAG_OVERRIDE);
-    }
-
-    break; /* ICMP6_TYPE_NS */
-  }
-  case ICMP6_TYPE_RA: /* Router Advertisement. */
-  {
-    struct ra_header *ra_hdr;
-    u8_t *buffer; /* Used to copy options. */
-    u16_t offset;
-#if LWIP_ND6_RDNSS_MAX_DNS_SERVERS
-    /* There can by multiple RDNSS options per RA */
-    u8_t rdnss_server_idx = 0;
-#endif /* LWIP_ND6_RDNSS_MAX_DNS_SERVERS */
-
-    /* Check that RA header fits in packet. */
-    if (p->len < sizeof(struct ra_header)) {
-      /* @todo debug message */
-      pbuf_free(p);
-      ND6_STATS_INC(nd6.lenerr);
-      ND6_STATS_INC(nd6.drop);
-      return;
-    }
-
-    ra_hdr = (struct ra_header *)p->payload;
-
-    /* If we are sending RS messages, stop. */
-#if LWIP_IPV6_SEND_ROUTER_SOLICIT
-    /* ensure at least one solicitation is sent */
-    if ((inp->rs_count < LWIP_ND6_MAX_MULTICAST_SOLICIT) ||
-        (nd6_send_rs(inp) == ERR_OK)) {
-      inp->rs_count = 0;
-    }
-#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
-
-    /* Get the matching default router entry. */
-    i = nd6_get_router(ip6_current_src_addr(), inp);
-    if (i < 0) {
-      /* Create a new router entry. */
-      i = nd6_new_router(ip6_current_src_addr(), inp);
-    }
-
-    if (i < 0) {
-      /* Could not create a new router entry. */
-      pbuf_free(p);
-      ND6_STATS_INC(nd6.memerr);
-      return;
-    }
-
-    /* Re-set invalidation timer. */
-    default_router_list[i].invalidation_timer = lwip_htons(ra_hdr->router_lifetime);
-
-    /* Re-set default timer values. */
-#if LWIP_ND6_ALLOW_RA_UPDATES
-    if (ra_hdr->retrans_timer > 0) {
-      retrans_timer = lwip_htonl(ra_hdr->retrans_timer);
-    }
-    if (ra_hdr->reachable_time > 0) {
-      reachable_time = lwip_htonl(ra_hdr->reachable_time);
-    }
-#endif /* LWIP_ND6_ALLOW_RA_UPDATES */
-
-    /* @todo set default hop limit... */
-    /* ra_hdr->current_hop_limit;*/
-
-    /* Update flags in local entry (incl. preference). */
-    default_router_list[i].flags = ra_hdr->flags;
-
-    /* Offset to options. */
-    offset = sizeof(struct ra_header);
-
-    /* Process each option. */
-    while ((p->tot_len - offset) > 0) {
-      if (p->len == p->tot_len) {
-        /* no need to copy from contiguous pbuf */
-        buffer = &((u8_t*)p->payload)[offset];
-      } else {
-        buffer = nd6_ra_buffer;
-        if (pbuf_copy_partial(p, buffer, sizeof(struct prefix_option), offset) != sizeof(struct prefix_option)) {
-          pbuf_free(p);
-          ND6_STATS_INC(nd6.lenerr);
-          ND6_STATS_INC(nd6.drop);
-          return;
-        }
-      }
-      if (buffer[1] == 0) {
-        /* zero-length extension. drop packet */
-        pbuf_free(p);
-        ND6_STATS_INC(nd6.lenerr);
-        ND6_STATS_INC(nd6.drop);
-        return;
-      }
-      switch (buffer[0]) {
-      case ND6_OPTION_TYPE_SOURCE_LLADDR:
-      {
-        struct lladdr_option *lladdr_opt;
-        lladdr_opt = (struct lladdr_option *)buffer;
-        if ((default_router_list[i].neighbor_entry != NULL) &&
-            (default_router_list[i].neighbor_entry->state == ND6_INCOMPLETE)) {
-          SMEMCPY(default_router_list[i].neighbor_entry->lladdr, lladdr_opt->addr, inp->hwaddr_len);
-          default_router_list[i].neighbor_entry->state = ND6_REACHABLE;
-          default_router_list[i].neighbor_entry->counter.reachable_time = reachable_time;
-        }
-        break;
-      }
-      case ND6_OPTION_TYPE_MTU:
-      {
-        struct mtu_option *mtu_opt;
-        mtu_opt = (struct mtu_option *)buffer;
-        if (lwip_htonl(mtu_opt->mtu) >= 1280) {
-#if LWIP_ND6_ALLOW_RA_UPDATES
-          inp->mtu = (u16_t)lwip_htonl(mtu_opt->mtu);
-#endif /* LWIP_ND6_ALLOW_RA_UPDATES */
-        }
-        break;
-      }
-      case ND6_OPTION_TYPE_PREFIX_INFO:
-      {
-        struct prefix_option *prefix_opt;
-        prefix_opt = (struct prefix_option *)buffer;
-
-        if ((prefix_opt->flags & ND6_PREFIX_FLAG_ON_LINK) &&
-            (prefix_opt->prefix_length == 64)  &&
-            !ip6_addr_islinklocal(&(prefix_opt->prefix))) {
-          /* Add to on-link prefix list. */
-          s8_t prefix;
-          ip6_addr_t prefix_addr;
-
-          /* Get a memory-aligned copy of the prefix. */
-          ip6_addr_set(&prefix_addr, &(prefix_opt->prefix));
-
-          /* find cache entry for this prefix. */
-          prefix = nd6_get_onlink_prefix(&prefix_addr, inp);
-          if (prefix < 0) {
-            /* Create a new cache entry. */
-            prefix = nd6_new_onlink_prefix(&prefix_addr, inp);
-          }
-          if (prefix >= 0) {
-            prefix_list[prefix].invalidation_timer = lwip_htonl(prefix_opt->valid_lifetime);
-
-#if LWIP_IPV6_AUTOCONFIG
-            if (prefix_opt->flags & ND6_PREFIX_FLAG_AUTONOMOUS) {
-              /* Mark prefix as autonomous, so that address autoconfiguration can take place.
-               * Only OR flag, so that we don't over-write other flags (such as ADDRESS_DUPLICATE)*/
-              prefix_list[prefix].flags |= ND6_PREFIX_AUTOCONFIG_AUTONOMOUS;
-            }
-#endif /* LWIP_IPV6_AUTOCONFIG */
-          }
-        }
-
-        break;
-      }
-      case ND6_OPTION_TYPE_ROUTE_INFO:
-        /* @todo implement preferred routes.
-        struct route_option * route_opt;
-        route_opt = (struct route_option *)buffer;*/
-
-        break;
-#if LWIP_ND6_RDNSS_MAX_DNS_SERVERS
-      case ND6_OPTION_TYPE_RDNSS:
-      {
-        u8_t num, n;
-        struct rdnss_option * rdnss_opt;
-
-        rdnss_opt = (struct rdnss_option *)buffer;
-        num = (rdnss_opt->length - 1) / 2;
-        for (n = 0; (rdnss_server_idx < DNS_MAX_SERVERS) && (n < num); n++) {
-          ip_addr_t rdnss_address;
-
-          /* Get a memory-aligned copy of the prefix. */
-          ip_addr_copy_from_ip6(rdnss_address, rdnss_opt->rdnss_address[n]);
-
-          if (htonl(rdnss_opt->lifetime) > 0) {
-            /* TODO implement Lifetime > 0 */
-            dns_setserver(rdnss_server_idx++, &rdnss_address);
-          } else {
-            /* TODO implement DNS removal in dns.c */
-            u8_t s;
-            for (s = 0; s < DNS_MAX_SERVERS; s++) {
-              const ip_addr_t *addr = dns_getserver(s);
-              if(ip_addr_cmp(addr, &rdnss_address)) {
-                dns_setserver(s, NULL);
-              }
-            }
-          }
-        }
-        break;
-      }
-#endif /* LWIP_ND6_RDNSS_MAX_DNS_SERVERS */
-      default:
-        /* Unrecognized option, abort. */
-        ND6_STATS_INC(nd6.proterr);
-        break;
-      }
-      /* option length is checked earlier to be non-zero to make sure loop ends */
-      offset += 8 * ((u16_t)buffer[1]);
-    }
-
-    break; /* ICMP6_TYPE_RA */
-  }
-  case ICMP6_TYPE_RD: /* Redirect */
-  {
-    struct redirect_header *redir_hdr;
-    struct lladdr_option *lladdr_opt;
-    ip6_addr_t tmp;
-
-    /* Check that Redir header fits in packet. */
-    if (p->len < sizeof(struct redirect_header)) {
-      /* @todo debug message */
-      pbuf_free(p);
-      ND6_STATS_INC(nd6.lenerr);
-      ND6_STATS_INC(nd6.drop);
-      return;
-    }
-
-    redir_hdr = (struct redirect_header *)p->payload;
-
-    if (p->len >= (sizeof(struct redirect_header) + 2)) {
-      lladdr_opt = (struct lladdr_option *)((u8_t*)p->payload + sizeof(struct redirect_header));
-      if (p->len < (sizeof(struct redirect_header) + (lladdr_opt->length << 3))) {
-        lladdr_opt = NULL;
-      }
-    } else {
-      lladdr_opt = NULL;
-    }
-
-    /* Copy original destination address to current source address, to have an aligned copy. */
-    ip6_addr_set(&tmp, &(redir_hdr->destination_address));
-
-    /* Find dest address in cache */
-    i = nd6_find_destination_cache_entry(&tmp);
-    if (i < 0) {
-      /* Destination not in cache, drop packet. */
-      pbuf_free(p);
-      return;
-    }
-
-    /* Set the new target address. */
-    ip6_addr_set(&(destination_cache[i].next_hop_addr), &(redir_hdr->target_address));
-
-    /* If Link-layer address of other router is given, try to add to neighbor cache. */
-    if (lladdr_opt != NULL) {
-      if (lladdr_opt->type == ND6_OPTION_TYPE_TARGET_LLADDR) {
-        /* Copy target address to current source address, to have an aligned copy. */
-        ip6_addr_set(&tmp, &(redir_hdr->target_address));
-
-        i = nd6_find_neighbor_cache_entry(&tmp);
-        if (i < 0) {
-          i = nd6_new_neighbor_cache_entry();
-          if (i >= 0) {
-            neighbor_cache[i].netif = inp;
-            MEMCPY(neighbor_cache[i].lladdr, lladdr_opt->addr, inp->hwaddr_len);
-            ip6_addr_set(&(neighbor_cache[i].next_hop_address), &tmp);
-
-            /* Receiving a message does not prove reachability: only in one direction.
-             * Delay probe in case we get confirmation of reachability from upper layer (TCP). */
-            neighbor_cache[i].state = ND6_DELAY;
-            neighbor_cache[i].counter.delay_time = LWIP_ND6_DELAY_FIRST_PROBE_TIME / ND6_TMR_INTERVAL;
-          }
-        }
-        if (i >= 0) {
-          if (neighbor_cache[i].state == ND6_INCOMPLETE) {
-            MEMCPY(neighbor_cache[i].lladdr, lladdr_opt->addr, inp->hwaddr_len);
-            /* Receiving a message does not prove reachability: only in one direction.
-             * Delay probe in case we get confirmation of reachability from upper layer (TCP). */
-            neighbor_cache[i].state = ND6_DELAY;
-            neighbor_cache[i].counter.delay_time = LWIP_ND6_DELAY_FIRST_PROBE_TIME / ND6_TMR_INTERVAL;
-          }
-        }
-      }
-    }
-    break; /* ICMP6_TYPE_RD */
-  }
-  case ICMP6_TYPE_PTB: /* Packet too big */
-  {
-    struct icmp6_hdr *icmp6hdr; /* Packet too big message */
-    struct ip6_hdr *ip6hdr; /* IPv6 header of the packet which caused the error */
-    u32_t pmtu;
-    ip6_addr_t tmp;
-
-    /* Check that ICMPv6 header + IPv6 header fit in payload */
-    if (p->len < (sizeof(struct icmp6_hdr) + IP6_HLEN)) {
-      /* drop short packets */
-      pbuf_free(p);
-      ND6_STATS_INC(nd6.lenerr);
-      ND6_STATS_INC(nd6.drop);
-      return;
-    }
-
-    icmp6hdr = (struct icmp6_hdr *)p->payload;
-    ip6hdr = (struct ip6_hdr *)((u8_t*)p->payload + sizeof(struct icmp6_hdr));
-
-    /* Copy original destination address to current source address, to have an aligned copy. */
-    ip6_addr_set(&tmp, &(ip6hdr->dest));
-
-    /* Look for entry in destination cache. */
-    i = nd6_find_destination_cache_entry(&tmp);
-    if (i < 0) {
-      /* Destination not in cache, drop packet. */
-      pbuf_free(p);
-      return;
-    }
-
-    /* Change the Path MTU. */
-    pmtu = lwip_htonl(icmp6hdr->data);
-    destination_cache[i].pmtu = (u16_t)LWIP_MIN(pmtu, 0xFFFF);
-
-    break; /* ICMP6_TYPE_PTB */
-  }
-
-  default:
-    ND6_STATS_INC(nd6.proterr);
-    ND6_STATS_INC(nd6.drop);
-    break; /* default */
-  }
-
-  pbuf_free(p);
-}
-
-
-/**
- * Periodic timer for Neighbor discovery functions:
- *
- * - Update neighbor reachability states
- * - Update destination cache entries age
- * - Update invalidation timers of default routers and on-link prefixes
- * - Perform duplicate address detection (DAD) for our addresses
- * - Send router solicitations
- */
-void
-nd6_tmr(void)
-{
-  s8_t i;
-  struct netif *netif;
-
-  /* Process neighbor entries. */
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    switch (neighbor_cache[i].state) {
-    case ND6_INCOMPLETE:
-      if ((neighbor_cache[i].counter.probes_sent >= LWIP_ND6_MAX_MULTICAST_SOLICIT) &&
-          (!neighbor_cache[i].isrouter)) {
-        /* Retries exceeded. */
-        nd6_free_neighbor_cache_entry(i);
-      } else {
-        /* Send a NS for this entry. */
-        neighbor_cache[i].counter.probes_sent++;
-        nd6_send_neighbor_cache_probe(&neighbor_cache[i], ND6_SEND_FLAG_MULTICAST_DEST);
-      }
-      break;
-    case ND6_REACHABLE:
-      /* Send queued packets, if any are left. Should have been sent already. */
-      if (neighbor_cache[i].q != NULL) {
-        nd6_send_q(i);
-      }
-      if (neighbor_cache[i].counter.reachable_time <= ND6_TMR_INTERVAL) {
-        /* Change to stale state. */
-        neighbor_cache[i].state = ND6_STALE;
-        neighbor_cache[i].counter.stale_time = 0;
-      } else {
-        neighbor_cache[i].counter.reachable_time -= ND6_TMR_INTERVAL;
-      }
-      break;
-    case ND6_STALE:
-      neighbor_cache[i].counter.stale_time++;
-      break;
-    case ND6_DELAY:
-      if (neighbor_cache[i].counter.delay_time <= 1) {
-        /* Change to PROBE state. */
-        neighbor_cache[i].state = ND6_PROBE;
-        neighbor_cache[i].counter.probes_sent = 0;
-      } else {
-        neighbor_cache[i].counter.delay_time--;
-      }
-      break;
-    case ND6_PROBE:
-      if ((neighbor_cache[i].counter.probes_sent >= LWIP_ND6_MAX_MULTICAST_SOLICIT) &&
-          (!neighbor_cache[i].isrouter)) {
-        /* Retries exceeded. */
-        nd6_free_neighbor_cache_entry(i);
-      } else {
-        /* Send a NS for this entry. */
-        neighbor_cache[i].counter.probes_sent++;
-        nd6_send_neighbor_cache_probe(&neighbor_cache[i], 0);
-      }
-      break;
-    case ND6_NO_ENTRY:
-    default:
-      /* Do nothing. */
-      break;
-    }
-  }
-
-  /* Process destination entries. */
-  for (i = 0; i < LWIP_ND6_NUM_DESTINATIONS; i++) {
-    destination_cache[i].age++;
-  }
-
-  /* Process router entries. */
-  for (i = 0; i < LWIP_ND6_NUM_ROUTERS; i++) {
-    if (default_router_list[i].neighbor_entry != NULL) {
-      /* Active entry. */
-      if (default_router_list[i].invalidation_timer > 0) {
-        default_router_list[i].invalidation_timer -= ND6_TMR_INTERVAL / 1000;
-      }
-      if (default_router_list[i].invalidation_timer < ND6_TMR_INTERVAL / 1000) {
-        /* Less than 1 second remaining. Clear this entry. */
-        default_router_list[i].neighbor_entry->isrouter = 0;
-        default_router_list[i].neighbor_entry = NULL;
-        default_router_list[i].invalidation_timer = 0;
-        default_router_list[i].flags = 0;
-      }
-    }
-  }
-
-  /* Process prefix entries. */
-  for (i = 0; i < LWIP_ND6_NUM_PREFIXES; i++) {
-    if (prefix_list[i].netif != NULL) {
-      if (prefix_list[i].invalidation_timer < ND6_TMR_INTERVAL / 1000) {
-        /* Entry timed out, remove it */
-        prefix_list[i].invalidation_timer = 0;
-
-#if LWIP_IPV6_AUTOCONFIG
-        /* If any addresses were configured with this prefix, remove them */
-        if (prefix_list[i].flags & ND6_PREFIX_AUTOCONFIG_ADDRESS_GENERATED) {
-          s8_t j;
-
-          for (j = 1; j < LWIP_IPV6_NUM_ADDRESSES; j++) {
-            if ((netif_ip6_addr_state(prefix_list[i].netif, j) != IP6_ADDR_INVALID) &&
-                ip6_addr_netcmp(&prefix_list[i].prefix, netif_ip6_addr(prefix_list[i].netif, j))) {
-              netif_ip6_addr_set_state(prefix_list[i].netif, j, IP6_ADDR_INVALID);
-              prefix_list[i].flags = 0;
-
-              /* Exit loop. */
-              break;
-            }
-          }
-        }
-#endif /* LWIP_IPV6_AUTOCONFIG */
-
-        prefix_list[i].netif = NULL;
-        prefix_list[i].flags = 0;
-      } else {
-        prefix_list[i].invalidation_timer -= ND6_TMR_INTERVAL / 1000;
-
-#if LWIP_IPV6_AUTOCONFIG
-        /* Initiate address autoconfiguration for this prefix, if conditions are met. */
-        if (prefix_list[i].netif->ip6_autoconfig_enabled &&
-            (prefix_list[i].flags & ND6_PREFIX_AUTOCONFIG_AUTONOMOUS) &&
-            !(prefix_list[i].flags & ND6_PREFIX_AUTOCONFIG_ADDRESS_GENERATED)) {
-          s8_t j;
-          /* Try to get an address on this netif that is invalid.
-           * Skip 0 index (link-local address) */
-          for (j = 1; j < LWIP_IPV6_NUM_ADDRESSES; j++) {
-            if (netif_ip6_addr_state(prefix_list[i].netif, j) == IP6_ADDR_INVALID) {
-              /* Generate an address using this prefix and interface ID from link-local address. */
-              netif_ip6_addr_set_parts(prefix_list[i].netif, j,
-                prefix_list[i].prefix.addr[0], prefix_list[i].prefix.addr[1],
-                netif_ip6_addr(prefix_list[i].netif, 0)->addr[2], netif_ip6_addr(prefix_list[i].netif, 0)->addr[3]);
-
-              /* Mark it as tentative (DAD will be performed if configured). */
-              netif_ip6_addr_set_state(prefix_list[i].netif, j, IP6_ADDR_TENTATIVE);
-
-              /* Mark this prefix with ADDRESS_GENERATED, so that we don't try again. */
-              prefix_list[i].flags |= ND6_PREFIX_AUTOCONFIG_ADDRESS_GENERATED;
-
-              /* Exit loop. */
-              break;
-            }
-          }
-        }
-#endif /* LWIP_IPV6_AUTOCONFIG */
-      }
-    }
-  }
-
-
-  /* Process our own addresses, if DAD configured. */
-  for (netif = netif_list; netif != NULL; netif = netif->next) {
-    for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; ++i) {
-      u8_t addr_state = netif_ip6_addr_state(netif, i);
-      if (ip6_addr_istentative(addr_state)) {
-        if ((addr_state & IP6_ADDR_TENTATIVE_COUNT_MASK) >= LWIP_IPV6_DUP_DETECT_ATTEMPTS) {
-          /* No NA received in response. Mark address as valid. */
-          netif_ip6_addr_set_state(netif, i, IP6_ADDR_PREFERRED);
-          /* @todo implement preferred and valid lifetimes. */
-        } else if (netif->flags & NETIF_FLAG_UP) {
-          /* Send a NS for this address. */
-          nd6_send_ns(netif, netif_ip6_addr(netif, i), ND6_SEND_FLAG_MULTICAST_DEST);
-          /* tentative: set next state by increasing by one */
-          netif_ip6_addr_set_state(netif, i, addr_state + 1);
-          /* @todo send max 1 NS per tmr call? enable return*/
-          /*return;*/
-        }
-      }
-    }
-  }
-
-#if LWIP_IPV6_SEND_ROUTER_SOLICIT
-  /* Send router solicitation messages, if necessary. */
-  for (netif = netif_list; netif != NULL; netif = netif->next) {
-    if ((netif->rs_count > 0) && (netif->flags & NETIF_FLAG_UP) &&
-        (!ip6_addr_isinvalid(netif_ip6_addr_state(netif, 0)))) {
-      if (nd6_send_rs(netif) == ERR_OK) {
-        netif->rs_count--;
-      }
-    }
-  }
-#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
-
-}
-
-/** Send a neighbor solicitation message for a specific neighbor cache entry
- *
- * @param entry the neightbor cache entry for wich to send the message
- * @param flags one of ND6_SEND_FLAG_*
- */
-static void
-nd6_send_neighbor_cache_probe(struct nd6_neighbor_cache_entry *entry, u8_t flags)
-{
-  nd6_send_ns(entry->netif, &entry->next_hop_address, flags);
-}
-
-/**
- * Send a neighbor solicitation message
- *
- * @param netif the netif on which to send the message
- * @param target_addr the IPv6 target address for the ND message
- * @param flags one of ND6_SEND_FLAG_*
- */
-static void
-nd6_send_ns(struct netif *netif, const ip6_addr_t *target_addr, u8_t flags)
-{
-  struct ns_header *ns_hdr;
-  struct pbuf *p;
-  const ip6_addr_t *src_addr;
-  u16_t lladdr_opt_len;
-
-  if (ip6_addr_isvalid(netif_ip6_addr_state(netif,0))) {
-    /* Use link-local address as source address. */
-    src_addr = netif_ip6_addr(netif, 0);
-    /* calculate option length (in 8-byte-blocks) */
-    lladdr_opt_len = ((netif->hwaddr_len + 2) + 7) >> 3;
-  } else {
-    src_addr = IP6_ADDR_ANY6;
-    /* Option "MUST NOT be included when the source IP address is the unspecified address." */
-    lladdr_opt_len = 0;
-  }
-
-  /* Allocate a packet. */
-  p = pbuf_alloc(PBUF_IP, sizeof(struct ns_header) + (lladdr_opt_len << 3), PBUF_RAM);
-  if (p == NULL) {
-    ND6_STATS_INC(nd6.memerr);
-    return;
-  }
-
-  /* Set fields. */
-  ns_hdr = (struct ns_header *)p->payload;
-
-  ns_hdr->type = ICMP6_TYPE_NS;
-  ns_hdr->code = 0;
-  ns_hdr->chksum = 0;
-  ns_hdr->reserved = 0;
-  ip6_addr_set(&(ns_hdr->target_address), target_addr);
-
-  if (lladdr_opt_len != 0) {
-    struct lladdr_option *lladdr_opt = (struct lladdr_option *)((u8_t*)p->payload + sizeof(struct ns_header));
-    lladdr_opt->type = ND6_OPTION_TYPE_SOURCE_LLADDR;
-    lladdr_opt->length = (u8_t)lladdr_opt_len;
-    SMEMCPY(lladdr_opt->addr, netif->hwaddr, netif->hwaddr_len);
-  }
-
-  /* Generate the solicited node address for the target address. */
-  if (flags & ND6_SEND_FLAG_MULTICAST_DEST) {
-    ip6_addr_set_solicitednode(&multicast_address, target_addr->addr[3]);
-    target_addr = &multicast_address;
-  }
-
-#if CHECKSUM_GEN_ICMP6
-  IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_ICMP6) {
-    ns_hdr->chksum = ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->len, src_addr,
-      target_addr);
-  }
-#endif /* CHECKSUM_GEN_ICMP6 */
-
-  /* Send the packet out. */
-  ND6_STATS_INC(nd6.xmit);
-  ip6_output_if(p, (src_addr == IP6_ADDR_ANY6) ? NULL : src_addr, target_addr,
-      LWIP_ICMP6_HL, 0, IP6_NEXTH_ICMP6, netif);
-  pbuf_free(p);
-}
-
-/**
- * Send a neighbor advertisement message
- *
- * @param netif the netif on which to send the message
- * @param target_addr the IPv6 target address for the ND message
- * @param flags one of ND6_SEND_FLAG_*
- */
-static void
-nd6_send_na(struct netif *netif, const ip6_addr_t *target_addr, u8_t flags)
-{
-  struct na_header *na_hdr;
-  struct lladdr_option *lladdr_opt;
-  struct pbuf *p;
-  const ip6_addr_t *src_addr;
-  const ip6_addr_t *dest_addr;
-  u16_t lladdr_opt_len;
-
-  /* Use link-local address as source address. */
-  /* src_addr = netif_ip6_addr(netif, 0); */
-  /* Use target address as source address. */
-  src_addr = target_addr;
-
-  /* Allocate a packet. */
-  lladdr_opt_len = ((netif->hwaddr_len + 2) >> 3) + (((netif->hwaddr_len + 2) & 0x07) ? 1 : 0);
-  p = pbuf_alloc(PBUF_IP, sizeof(struct na_header) + (lladdr_opt_len << 3), PBUF_RAM);
-  if (p == NULL) {
-    ND6_STATS_INC(nd6.memerr);
-    return;
-  }
-
-  /* Set fields. */
-  na_hdr = (struct na_header *)p->payload;
-  lladdr_opt = (struct lladdr_option *)((u8_t*)p->payload + sizeof(struct na_header));
-
-  na_hdr->type = ICMP6_TYPE_NA;
-  na_hdr->code = 0;
-  na_hdr->chksum = 0;
-  na_hdr->flags = flags & 0xf0;
-  na_hdr->reserved[0] = 0;
-  na_hdr->reserved[1] = 0;
-  na_hdr->reserved[2] = 0;
-  ip6_addr_set(&(na_hdr->target_address), target_addr);
-
-  lladdr_opt->type = ND6_OPTION_TYPE_TARGET_LLADDR;
-  lladdr_opt->length = (u8_t)lladdr_opt_len;
-  SMEMCPY(lladdr_opt->addr, netif->hwaddr, netif->hwaddr_len);
-
-  /* Generate the solicited node address for the target address. */
-  if (flags & ND6_SEND_FLAG_MULTICAST_DEST) {
-    ip6_addr_set_solicitednode(&multicast_address, target_addr->addr[3]);
-    dest_addr = &multicast_address;
-  } else if (flags & ND6_SEND_FLAG_ALLNODES_DEST) {
-    ip6_addr_set_allnodes_linklocal(&multicast_address);
-    dest_addr = &multicast_address;
-  } else {
-    dest_addr = ip6_current_src_addr();
-  }
-
-#if CHECKSUM_GEN_ICMP6
-  IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_ICMP6) {
-    na_hdr->chksum = ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->len, src_addr,
-      dest_addr);
-  }
-#endif /* CHECKSUM_GEN_ICMP6 */
-
-  /* Send the packet out. */
-  ND6_STATS_INC(nd6.xmit);
-  ip6_output_if(p, src_addr, dest_addr,
-      LWIP_ICMP6_HL, 0, IP6_NEXTH_ICMP6, netif);
-  pbuf_free(p);
-}
-
-#if LWIP_IPV6_SEND_ROUTER_SOLICIT
-/**
- * Send a router solicitation message
- *
- * @param netif the netif on which to send the message
- */
-static err_t
-nd6_send_rs(struct netif *netif)
-{
-  struct rs_header *rs_hdr;
-  struct lladdr_option *lladdr_opt;
-  struct pbuf *p;
-  const ip6_addr_t *src_addr;
-  err_t err;
-  u16_t lladdr_opt_len = 0;
-
-  /* Link-local source address, or unspecified address? */
-  if (ip6_addr_isvalid(netif_ip6_addr_state(netif, 0))) {
-    src_addr = netif_ip6_addr(netif, 0);
-  } else {
-    src_addr = IP6_ADDR_ANY6;
-  }
-
-  /* Generate the all routers target address. */
-  ip6_addr_set_allrouters_linklocal(&multicast_address);
-
-  /* Allocate a packet. */
-  if (src_addr != IP6_ADDR_ANY6) {
-    lladdr_opt_len = ((netif->hwaddr_len + 2) >> 3) + (((netif->hwaddr_len + 2) & 0x07) ? 1 : 0);
-  }
-  p = pbuf_alloc(PBUF_IP, sizeof(struct rs_header) + (lladdr_opt_len << 3), PBUF_RAM);
-  if (p == NULL) {
-    ND6_STATS_INC(nd6.memerr);
-    return ERR_BUF;
-  }
-
-  /* Set fields. */
-  rs_hdr = (struct rs_header *)p->payload;
-
-  rs_hdr->type = ICMP6_TYPE_RS;
-  rs_hdr->code = 0;
-  rs_hdr->chksum = 0;
-  rs_hdr->reserved = 0;
-
-  if (src_addr != IP6_ADDR_ANY6) {
-    /* Include our hw address. */
-    lladdr_opt = (struct lladdr_option *)((u8_t*)p->payload + sizeof(struct rs_header));
-    lladdr_opt->type = ND6_OPTION_TYPE_SOURCE_LLADDR;
-    lladdr_opt->length = (u8_t)lladdr_opt_len;
-    SMEMCPY(lladdr_opt->addr, netif->hwaddr, netif->hwaddr_len);
-  }
-
-#if CHECKSUM_GEN_ICMP6
-  IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_ICMP6) {
-    rs_hdr->chksum = ip6_chksum_pseudo(p, IP6_NEXTH_ICMP6, p->len, src_addr,
-      &multicast_address);
-  }
-#endif /* CHECKSUM_GEN_ICMP6 */
-
-  /* Send the packet out. */
-  ND6_STATS_INC(nd6.xmit);
-
-  err = ip6_output_if(p, (src_addr == IP6_ADDR_ANY6) ? NULL : src_addr, &multicast_address,
-      LWIP_ICMP6_HL, 0, IP6_NEXTH_ICMP6, netif);
-  pbuf_free(p);
-
-  return err;
-}
-#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
-
-/**
- * Search for a neighbor cache entry
- *
- * @param ip6addr the IPv6 address of the neighbor
- * @return The neighbor cache entry index that matched, -1 if no
- * entry is found
- */
-static s8_t
-nd6_find_neighbor_cache_entry(const ip6_addr_t *ip6addr)
-{
-  s8_t i;
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    if (ip6_addr_cmp(ip6addr, &(neighbor_cache[i].next_hop_address))) {
-      return i;
-    }
-  }
-  return -1;
-}
-
-/**
- * Create a new neighbor cache entry.
- *
- * If no unused entry is found, will try to recycle an old entry
- * according to ad-hoc "age" heuristic.
- *
- * @return The neighbor cache entry index that was created, -1 if no
- * entry could be created
- */
-static s8_t
-nd6_new_neighbor_cache_entry(void)
-{
-  s8_t i;
-  s8_t j;
-  u32_t time;
-
-
-  /* First, try to find an empty entry. */
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    if (neighbor_cache[i].state == ND6_NO_ENTRY) {
-      return i;
-    }
-  }
-
-  /* We need to recycle an entry. in general, do not recycle if it is a router. */
-
-  /* Next, try to find a Stale entry. */
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    if ((neighbor_cache[i].state == ND6_STALE) &&
-        (!neighbor_cache[i].isrouter)) {
-      nd6_free_neighbor_cache_entry(i);
-      return i;
-    }
-  }
-
-  /* Next, try to find a Probe entry. */
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    if ((neighbor_cache[i].state == ND6_PROBE) &&
-        (!neighbor_cache[i].isrouter)) {
-      nd6_free_neighbor_cache_entry(i);
-      return i;
-    }
-  }
-
-  /* Next, try to find a Delayed entry. */
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    if ((neighbor_cache[i].state == ND6_DELAY) &&
-        (!neighbor_cache[i].isrouter)) {
-      nd6_free_neighbor_cache_entry(i);
-      return i;
-    }
-  }
-
-  /* Next, try to find the oldest reachable entry. */
-  time = 0xfffffffful;
-  j = -1;
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    if ((neighbor_cache[i].state == ND6_REACHABLE) &&
-        (!neighbor_cache[i].isrouter)) {
-      if (neighbor_cache[i].counter.reachable_time < time) {
-        j = i;
-        time = neighbor_cache[i].counter.reachable_time;
-      }
-    }
-  }
-  if (j >= 0) {
-    nd6_free_neighbor_cache_entry(j);
-    return j;
-  }
-
-  /* Next, find oldest incomplete entry without queued packets. */
-  time = 0;
-  j = -1;
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    if (
-        (neighbor_cache[i].q == NULL) &&
-        (neighbor_cache[i].state == ND6_INCOMPLETE) &&
-        (!neighbor_cache[i].isrouter)) {
-      if (neighbor_cache[i].counter.probes_sent >= time) {
-        j = i;
-        time = neighbor_cache[i].counter.probes_sent;
-      }
-    }
-  }
-  if (j >= 0) {
-    nd6_free_neighbor_cache_entry(j);
-    return j;
-  }
-
-  /* Next, find oldest incomplete entry with queued packets. */
-  time = 0;
-  j = -1;
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    if ((neighbor_cache[i].state == ND6_INCOMPLETE) &&
-        (!neighbor_cache[i].isrouter)) {
-      if (neighbor_cache[i].counter.probes_sent >= time) {
-        j = i;
-        time = neighbor_cache[i].counter.probes_sent;
-      }
-    }
-  }
-  if (j >= 0) {
-    nd6_free_neighbor_cache_entry(j);
-    return j;
-  }
-
-  /* No more entries to try. */
-  return -1;
-}
-
-/**
- * Will free any resources associated with a neighbor cache
- * entry, and will mark it as unused.
- *
- * @param i the neighbor cache entry index to free
- */
-static void
-nd6_free_neighbor_cache_entry(s8_t i)
-{
-  if ((i < 0) || (i >= LWIP_ND6_NUM_NEIGHBORS)) {
-    return;
-  }
-  if (neighbor_cache[i].isrouter) {
-    /* isrouter needs to be cleared before deleting a neighbor cache entry */
-    return;
-  }
-
-  /* Free any queued packets. */
-  if (neighbor_cache[i].q != NULL) {
-    nd6_free_q(neighbor_cache[i].q);
-    neighbor_cache[i].q = NULL;
-  }
-
-  neighbor_cache[i].state = ND6_NO_ENTRY;
-  neighbor_cache[i].isrouter = 0;
-  neighbor_cache[i].netif = NULL;
-  neighbor_cache[i].counter.reachable_time = 0;
-  ip6_addr_set_zero(&(neighbor_cache[i].next_hop_address));
-}
-
-/**
- * Search for a destination cache entry
- *
- * @param ip6addr the IPv6 address of the destination
- * @return The destination cache entry index that matched, -1 if no
- * entry is found
- */
-static s8_t
-nd6_find_destination_cache_entry(const ip6_addr_t *ip6addr)
-{
-  s8_t i;
-  for (i = 0; i < LWIP_ND6_NUM_DESTINATIONS; i++) {
-    if (ip6_addr_cmp(ip6addr, &(destination_cache[i].destination_addr))) {
-      return i;
-    }
-  }
-  return -1;
-}
-
-/**
- * Create a new destination cache entry. If no unused entry is found,
- * will recycle oldest entry.
- *
- * @return The destination cache entry index that was created, -1 if no
- * entry was created
- */
-static s8_t
-nd6_new_destination_cache_entry(void)
-{
-  s8_t i, j;
-  u32_t age;
-
-  /* Find an empty entry. */
-  for (i = 0; i < LWIP_ND6_NUM_DESTINATIONS; i++) {
-    if (ip6_addr_isany(&(destination_cache[i].destination_addr))) {
-      return i;
-    }
-  }
-
-  /* Find oldest entry. */
-  age = 0;
-  j = LWIP_ND6_NUM_DESTINATIONS - 1;
-  for (i = 0; i < LWIP_ND6_NUM_DESTINATIONS; i++) {
-    if (destination_cache[i].age > age) {
-      j = i;
-    }
-  }
-
-  return j;
-}
-
-/**
- * Clear the destination cache.
- *
- * This operation may be necessary for consistency in the light of changing
- * local addresses and/or use of the gateway hook.
- */
-void
-nd6_clear_destination_cache(void)
-{
-  int i;
-
-  for (i = 0; i < LWIP_ND6_NUM_DESTINATIONS; i++) {
-    ip6_addr_set_any(&destination_cache[i].destination_addr);
-  }
-}
-
-/**
- * Determine whether an address matches an on-link prefix.
- *
- * @param ip6addr the IPv6 address to match
- * @return 1 if the address is on-link, 0 otherwise
- */
-static s8_t
-nd6_is_prefix_in_netif(const ip6_addr_t *ip6addr, struct netif *netif)
-{
-  s8_t i;
-  for (i = 0; i < LWIP_ND6_NUM_PREFIXES; i++) {
-    if ((prefix_list[i].netif == netif) &&
-        (prefix_list[i].invalidation_timer > 0) &&
-        ip6_addr_netcmp(ip6addr, &(prefix_list[i].prefix))) {
-      return 1;
-    }
-  }
-  /* Check to see if address prefix matches a (manually?) configured address. */
-  for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-    if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
-        ip6_addr_netcmp(ip6addr, netif_ip6_addr(netif, i))) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-/**
- * Select a default router for a destination.
- *
- * @param ip6addr the destination address
- * @param netif the netif for the outgoing packet, if known
- * @return the default router entry index, or -1 if no suitable
- *         router is found
- */
-static s8_t
-nd6_select_router(const ip6_addr_t *ip6addr, struct netif *netif)
-{
-  s8_t i;
-  /* last_router is used for round-robin router selection (as recommended
-   * in RFC). This is more robust in case one router is not reachable,
-   * we are not stuck trying to resolve it. */
-  static s8_t last_router;
-  (void)ip6addr; /* @todo match preferred routes!! (must implement ND6_OPTION_TYPE_ROUTE_INFO) */
-
-  /* @todo: implement default router preference */
-
-  /* Look for reachable routers. */
-  for (i = 0; i < LWIP_ND6_NUM_ROUTERS; i++) {
-    if (++last_router >= LWIP_ND6_NUM_ROUTERS) {
-      last_router = 0;
-    }
-    if ((default_router_list[i].neighbor_entry != NULL) &&
-        (netif != NULL ? netif == default_router_list[i].neighbor_entry->netif : 1) &&
-        (default_router_list[i].invalidation_timer > 0) &&
-        (default_router_list[i].neighbor_entry->state == ND6_REACHABLE)) {
-      return i;
-    }
-  }
-
-  /* Look for router in other reachability states, but still valid according to timer. */
-  for (i = 0; i < LWIP_ND6_NUM_ROUTERS; i++) {
-    if (++last_router >= LWIP_ND6_NUM_ROUTERS) {
-      last_router = 0;
-    }
-    if ((default_router_list[i].neighbor_entry != NULL) &&
-        (netif != NULL ? netif == default_router_list[i].neighbor_entry->netif : 1) &&
-        (default_router_list[i].invalidation_timer > 0)) {
-      return i;
-    }
-  }
-
-  /* Look for any router for which we have any information at all. */
-  for (i = 0; i < LWIP_ND6_NUM_ROUTERS; i++) {
-    if (++last_router >= LWIP_ND6_NUM_ROUTERS) {
-      last_router = 0;
-    }
-    if (default_router_list[i].neighbor_entry != NULL &&
-        (netif != NULL ? netif == default_router_list[i].neighbor_entry->netif : 1)) {
-      return i;
-    }
-  }
-
-  /* no suitable router found. */
-  return -1;
-}
-
-/**
- * Find a router-announced route to the given destination.
- *
- * The caller is responsible for checking whether the returned netif, if any,
- * is in a suitable state (up, link up) to be used for packet transmission.
- *
- * @param ip6addr the destination IPv6 address
- * @return the netif to use for the destination, or NULL if none found
- */
-struct netif *
-nd6_find_route(const ip6_addr_t *ip6addr)
-{
-  s8_t i;
-
-  i = nd6_select_router(ip6addr, NULL);
-  if (i >= 0) {
-    if (default_router_list[i].neighbor_entry != NULL) {
-      return default_router_list[i].neighbor_entry->netif; /* may be NULL */
-    }
-  }
-
-  return NULL;
-}
-
-/**
- * Find an entry for a default router.
- *
- * @param router_addr the IPv6 address of the router
- * @param netif the netif on which the router is found, if known
- * @return the index of the router entry, or -1 if not found
- */
-static s8_t
-nd6_get_router(const ip6_addr_t *router_addr, struct netif *netif)
-{
-  s8_t i;
-
-  /* Look for router. */
-  for (i = 0; i < LWIP_ND6_NUM_ROUTERS; i++) {
-    if ((default_router_list[i].neighbor_entry != NULL) &&
-        ((netif != NULL) ? netif == default_router_list[i].neighbor_entry->netif : 1) &&
-        ip6_addr_cmp(router_addr, &(default_router_list[i].neighbor_entry->next_hop_address))) {
-      return i;
-    }
-  }
-
-  /* router not found. */
-  return -1;
-}
-
-/**
- * Create a new entry for a default router.
- *
- * @param router_addr the IPv6 address of the router
- * @param netif the netif on which the router is connected, if known
- * @return the index on the router table, or -1 if could not be created
- */
-static s8_t
-nd6_new_router(const ip6_addr_t *router_addr, struct netif *netif)
-{
-  s8_t router_index;
-  s8_t free_router_index;
-  s8_t neighbor_index;
-
-  /* Do we have a neighbor entry for this router? */
-  neighbor_index = nd6_find_neighbor_cache_entry(router_addr);
-  if (neighbor_index < 0) {
-    /* Create a neighbor entry for this router. */
-    neighbor_index = nd6_new_neighbor_cache_entry();
-    if (neighbor_index < 0) {
-      /* Could not create neighbor entry for this router. */
-      return -1;
-    }
-    ip6_addr_set(&(neighbor_cache[neighbor_index].next_hop_address), router_addr);
-    neighbor_cache[neighbor_index].netif = netif;
-    neighbor_cache[neighbor_index].q = NULL;
-    neighbor_cache[neighbor_index].state = ND6_INCOMPLETE;
-    neighbor_cache[neighbor_index].counter.probes_sent = 1;
-    nd6_send_neighbor_cache_probe(&neighbor_cache[neighbor_index], ND6_SEND_FLAG_MULTICAST_DEST);
-  }
-
-  /* Mark neighbor as router. */
-  neighbor_cache[neighbor_index].isrouter = 1;
-
-  /* Look for empty entry. */
-  free_router_index = LWIP_ND6_NUM_ROUTERS;
-  for (router_index = LWIP_ND6_NUM_ROUTERS - 1; router_index >= 0; router_index--) {
-    /* check if router already exists (this is a special case for 2 netifs on the same subnet
-       - e.g. wifi and cable) */
-    if(default_router_list[router_index].neighbor_entry == &(neighbor_cache[neighbor_index])){ 
-      return router_index; 
-    } 
-    if (default_router_list[router_index].neighbor_entry == NULL) {
-      /* remember lowest free index to create a new entry */
-      free_router_index = router_index;
-    }
-  }
-  if (free_router_index < LWIP_ND6_NUM_ROUTERS) {
-    default_router_list[free_router_index].neighbor_entry = &(neighbor_cache[neighbor_index]);
-    return free_router_index;
-  }
-
-  /* Could not create a router entry. */
-
-  /* Mark neighbor entry as not-router. Entry might be useful as neighbor still. */
-  neighbor_cache[neighbor_index].isrouter = 0;
-
-  /* router not found. */
-  return -1;
-}
-
-/**
- * Find the cached entry for an on-link prefix.
- *
- * @param prefix the IPv6 prefix that is on-link
- * @param netif the netif on which the prefix is on-link
- * @return the index on the prefix table, or -1 if not found
- */
-static s8_t
-nd6_get_onlink_prefix(ip6_addr_t *prefix, struct netif *netif)
-{
-  s8_t i;
-
-  /* Look for prefix in list. */
-  for (i = 0; i < LWIP_ND6_NUM_PREFIXES; ++i) {
-    if ((ip6_addr_netcmp(&(prefix_list[i].prefix), prefix)) &&
-        (prefix_list[i].netif == netif)) {
-      return i;
-    }
-  }
-
-  /* Entry not available. */
-  return -1;
-}
-
-/**
- * Creates a new entry for an on-link prefix.
- *
- * @param prefix the IPv6 prefix that is on-link
- * @param netif the netif on which the prefix is on-link
- * @return the index on the prefix table, or -1 if not created
- */
-static s8_t
-nd6_new_onlink_prefix(ip6_addr_t *prefix, struct netif *netif)
-{
-  s8_t i;
-
-  /* Create new entry. */
-  for (i = 0; i < LWIP_ND6_NUM_PREFIXES; ++i) {
-    if ((prefix_list[i].netif == NULL) ||
-        (prefix_list[i].invalidation_timer == 0)) {
-      /* Found empty prefix entry. */
-      prefix_list[i].netif = netif;
-      ip6_addr_set(&(prefix_list[i].prefix), prefix);
-#if LWIP_IPV6_AUTOCONFIG
-      prefix_list[i].flags = 0;
-#endif /* LWIP_IPV6_AUTOCONFIG */
-      return i;
-    }
-  }
-
-  /* Entry not available. */
-  return -1;
-}
-
-/**
- * Determine the next hop for a destination. Will determine if the
- * destination is on-link, else a suitable on-link router is selected.
- *
- * The last entry index is cached for fast entry search.
- *
- * @param ip6addr the destination address
- * @param netif the netif on which the packet will be sent
- * @return the neighbor cache entry for the next hop, ERR_RTE if no
- *         suitable next hop was found, ERR_MEM if no cache entry
- *         could be created
- */
-static s8_t
-nd6_get_next_hop_entry(const ip6_addr_t *ip6addr, struct netif *netif)
-{
-#ifdef LWIP_HOOK_ND6_GET_GW
-  const ip6_addr_t *next_hop_addr;
-#endif /* LWIP_HOOK_ND6_GET_GW */
-  s8_t i;
-
-#if LWIP_NETIF_HWADDRHINT
-  if (netif->addr_hint != NULL) {
-    /* per-pcb cached entry was given */
-    u8_t addr_hint = *(netif->addr_hint);
-    if (addr_hint < LWIP_ND6_NUM_DESTINATIONS) {
-      nd6_cached_destination_index = addr_hint;
-    }
-  }
-#endif /* LWIP_NETIF_HWADDRHINT */
-
-  /* Look for ip6addr in destination cache. */
-  if (ip6_addr_cmp(ip6addr, &(destination_cache[nd6_cached_destination_index].destination_addr))) {
-    /* the cached entry index is the right one! */
-    /* do nothing. */
-    ND6_STATS_INC(nd6.cachehit);
-  } else {
-    /* Search destination cache. */
-    i = nd6_find_destination_cache_entry(ip6addr);
-    if (i >= 0) {
-      /* found destination entry. make it our new cached index. */
-      nd6_cached_destination_index = i;
-    } else {
-      /* Not found. Create a new destination entry. */
-      i = nd6_new_destination_cache_entry();
-      if (i >= 0) {
-        /* got new destination entry. make it our new cached index. */
-        nd6_cached_destination_index = i;
-      } else {
-        /* Could not create a destination cache entry. */
-        return ERR_MEM;
-      }
-
-      /* Copy dest address to destination cache. */
-      ip6_addr_set(&(destination_cache[nd6_cached_destination_index].destination_addr), ip6addr);
-
-      /* Now find the next hop. is it a neighbor? */
-      if (ip6_addr_islinklocal(ip6addr) ||
-          nd6_is_prefix_in_netif(ip6addr, netif)) {
-        /* Destination in local link. */
-        destination_cache[nd6_cached_destination_index].pmtu = netif->mtu;
-        ip6_addr_copy(destination_cache[nd6_cached_destination_index].next_hop_addr, destination_cache[nd6_cached_destination_index].destination_addr);
-#ifdef LWIP_HOOK_ND6_GET_GW
-      } else if ((next_hop_addr = LWIP_HOOK_ND6_GET_GW(netif, ip6addr)) != NULL) {
-        /* Next hop for destination provided by hook function. */
-        destination_cache[nd6_cached_destination_index].pmtu = netif->mtu;
-        ip6_addr_set(&destination_cache[nd6_cached_destination_index].next_hop_addr, next_hop_addr);
-#endif /* LWIP_HOOK_ND6_GET_GW */
-      } else {
-        /* We need to select a router. */
-        i = nd6_select_router(ip6addr, netif);
-        if (i < 0) {
-          /* No router found. */
-          ip6_addr_set_any(&(destination_cache[nd6_cached_destination_index].destination_addr));
-          return ERR_RTE;
-        }
-        destination_cache[nd6_cached_destination_index].pmtu = netif->mtu; /* Start with netif mtu, correct through ICMPv6 if necessary */
-        ip6_addr_copy(destination_cache[nd6_cached_destination_index].next_hop_addr, default_router_list[i].neighbor_entry->next_hop_address);
-      }
-    }
-  }
-
-#if LWIP_NETIF_HWADDRHINT
-  if (netif->addr_hint != NULL) {
-    /* per-pcb cached entry was given */
-    *(netif->addr_hint) = nd6_cached_destination_index;
-  }
-#endif /* LWIP_NETIF_HWADDRHINT */
-
-  /* Look in neighbor cache for the next-hop address. */
-  if (ip6_addr_cmp(&(destination_cache[nd6_cached_destination_index].next_hop_addr),
-                   &(neighbor_cache[nd6_cached_neighbor_index].next_hop_address))) {
-    /* Cache hit. */
-    /* Do nothing. */
-    ND6_STATS_INC(nd6.cachehit);
-  } else {
-    i = nd6_find_neighbor_cache_entry(&(destination_cache[nd6_cached_destination_index].next_hop_addr));
-    if (i >= 0) {
-      /* Found a matching record, make it new cached entry. */
-      nd6_cached_neighbor_index = i;
-    } else {
-      /* Neighbor not in cache. Make a new entry. */
-      i = nd6_new_neighbor_cache_entry();
-      if (i >= 0) {
-        /* got new neighbor entry. make it our new cached index. */
-        nd6_cached_neighbor_index = i;
-      } else {
-        /* Could not create a neighbor cache entry. */
-        return ERR_MEM;
-      }
-
-      /* Initialize fields. */
-      ip6_addr_copy(neighbor_cache[i].next_hop_address,
-                   destination_cache[nd6_cached_destination_index].next_hop_addr);
-      neighbor_cache[i].isrouter = 0;
-      neighbor_cache[i].netif = netif;
-      neighbor_cache[i].state = ND6_INCOMPLETE;
-      neighbor_cache[i].counter.probes_sent = 1;
-      nd6_send_neighbor_cache_probe(&neighbor_cache[i], ND6_SEND_FLAG_MULTICAST_DEST);
-    }
-  }
-
-  /* Reset this destination's age. */
-  destination_cache[nd6_cached_destination_index].age = 0;
-
-  return nd6_cached_neighbor_index;
-}
-
-/**
- * Queue a packet for a neighbor.
- *
- * @param neighbor_index the index in the neighbor cache table
- * @param q packet to be queued
- * @return ERR_OK if succeeded, ERR_MEM if out of memory
- */
-static err_t
-nd6_queue_packet(s8_t neighbor_index, struct pbuf *q)
-{
-  err_t result = ERR_MEM;
-  struct pbuf *p;
-  int copy_needed = 0;
-#if LWIP_ND6_QUEUEING
-  struct nd6_q_entry *new_entry, *r;
-#endif /* LWIP_ND6_QUEUEING */
-
-  if ((neighbor_index < 0) || (neighbor_index >= LWIP_ND6_NUM_NEIGHBORS)) {
-    return ERR_ARG;
-  }
-
-  /* IF q includes a PBUF_REF, PBUF_POOL or PBUF_RAM, we have no choice but
-   * to copy the whole queue into a new PBUF_RAM (see bug #11400)
-   * PBUF_ROMs can be left as they are, since ROM must not get changed. */
-  p = q;
-  while (p) {
-    if (p->type != PBUF_ROM) {
-      copy_needed = 1;
-      break;
-    }
-    p = p->next;
-  }
-  if (copy_needed) {
-    /* copy the whole packet into new pbufs */
-    p = pbuf_alloc(PBUF_LINK, q->tot_len, PBUF_RAM);
-    while ((p == NULL) && (neighbor_cache[neighbor_index].q != NULL)) {
-      /* Free oldest packet (as per RFC recommendation) */
-#if LWIP_ND6_QUEUEING
-      r = neighbor_cache[neighbor_index].q;
-      neighbor_cache[neighbor_index].q = r->next;
-      r->next = NULL;
-      nd6_free_q(r);
-#else /* LWIP_ND6_QUEUEING */
-      pbuf_free(neighbor_cache[neighbor_index].q);
-      neighbor_cache[neighbor_index].q = NULL;
-#endif /* LWIP_ND6_QUEUEING */
-      p = pbuf_alloc(PBUF_LINK, q->tot_len, PBUF_RAM);
-    }
-    if (p != NULL) {
-      if (pbuf_copy(p, q) != ERR_OK) {
-        pbuf_free(p);
-        p = NULL;
-      }
-    }
-  } else {
-    /* referencing the old pbuf is enough */
-    p = q;
-    pbuf_ref(p);
-  }
-  /* packet was copied/ref'd? */
-  if (p != NULL) {
-    /* queue packet ... */
-#if LWIP_ND6_QUEUEING
-    /* allocate a new nd6 queue entry */
-    new_entry = (struct nd6_q_entry *)memp_malloc(MEMP_ND6_QUEUE);
-    if ((new_entry == NULL) && (neighbor_cache[neighbor_index].q != NULL)) {
-      /* Free oldest packet (as per RFC recommendation) */
-      r = neighbor_cache[neighbor_index].q;
-      neighbor_cache[neighbor_index].q = r->next;
-      r->next = NULL;
-      nd6_free_q(r);
-      new_entry = (struct nd6_q_entry *)memp_malloc(MEMP_ND6_QUEUE);
-    }
-    if (new_entry != NULL) {
-      new_entry->next = NULL;
-      new_entry->p = p;
-      if (neighbor_cache[neighbor_index].q != NULL) {
-        /* queue was already existent, append the new entry to the end */
-        r = neighbor_cache[neighbor_index].q;
-        while (r->next != NULL) {
-          r = r->next;
-        }
-        r->next = new_entry;
-      } else {
-        /* queue did not exist, first item in queue */
-        neighbor_cache[neighbor_index].q = new_entry;
-      }
-      LWIP_DEBUGF(LWIP_DBG_TRACE, ("ipv6: queued packet %p on neighbor entry %"S16_F"\n", (void *)p, (s16_t)neighbor_index));
-      result = ERR_OK;
-    } else {
-      /* the pool MEMP_ND6_QUEUE is empty */
-      pbuf_free(p);
-      LWIP_DEBUGF(LWIP_DBG_TRACE, ("ipv6: could not queue a copy of packet %p (out of memory)\n", (void *)p));
-      /* { result == ERR_MEM } through initialization */
-    }
-#else /* LWIP_ND6_QUEUEING */
-    /* Queue a single packet. If an older packet is already queued, free it as per RFC. */
-    if (neighbor_cache[neighbor_index].q != NULL) {
-      pbuf_free(neighbor_cache[neighbor_index].q);
-    }
-    neighbor_cache[neighbor_index].q = p;
-    LWIP_DEBUGF(LWIP_DBG_TRACE, ("ipv6: queued packet %p on neighbor entry %"S16_F"\n", (void *)p, (s16_t)neighbor_index));
-    result = ERR_OK;
-#endif /* LWIP_ND6_QUEUEING */
-  } else {
-    LWIP_DEBUGF(LWIP_DBG_TRACE, ("ipv6: could not queue a copy of packet %p (out of memory)\n", (void *)q));
-    /* { result == ERR_MEM } through initialization */
-  }
-
-  return result;
-}
-
-#if LWIP_ND6_QUEUEING
-/**
- * Free a complete queue of nd6 q entries
- *
- * @param q a queue of nd6_q_entry to free
- */
-static void
-nd6_free_q(struct nd6_q_entry *q)
-{
-  struct nd6_q_entry *r;
-  LWIP_ASSERT("q != NULL", q != NULL);
-  LWIP_ASSERT("q->p != NULL", q->p != NULL);
-  while (q) {
-    r = q;
-    q = q->next;
-    LWIP_ASSERT("r->p != NULL", (r->p != NULL));
-    pbuf_free(r->p);
-    memp_free(MEMP_ND6_QUEUE, r);
-  }
-}
-#endif /* LWIP_ND6_QUEUEING */
-
-/**
- * Send queued packets for a neighbor
- *
- * @param i the neighbor to send packets to
- */
-static void
-nd6_send_q(s8_t i)
-{
-  struct ip6_hdr *ip6hdr;
-  ip6_addr_t dest;
-#if LWIP_ND6_QUEUEING
-  struct nd6_q_entry *q;
-#endif /* LWIP_ND6_QUEUEING */
-
-  if ((i < 0) || (i >= LWIP_ND6_NUM_NEIGHBORS)) {
-    return;
-  }
-
-#if LWIP_ND6_QUEUEING
-  while (neighbor_cache[i].q != NULL) {
-    /* remember first in queue */
-    q = neighbor_cache[i].q;
-    /* pop first item off the queue */
-    neighbor_cache[i].q = q->next;
-    /* Get ipv6 header. */
-    ip6hdr = (struct ip6_hdr *)(q->p->payload);
-    /* Create an aligned copy. */
-    ip6_addr_set(&dest, &(ip6hdr->dest));
-    /* send the queued IPv6 packet */
-    (neighbor_cache[i].netif)->output_ip6(neighbor_cache[i].netif, q->p, &dest);
-    /* free the queued IP packet */
-    pbuf_free(q->p);
-    /* now queue entry can be freed */
-    memp_free(MEMP_ND6_QUEUE, q);
-  }
-#else /* LWIP_ND6_QUEUEING */
-  if (neighbor_cache[i].q != NULL) {
-    /* Get ipv6 header. */
-    ip6hdr = (struct ip6_hdr *)(neighbor_cache[i].q->payload);
-    /* Create an aligned copy. */
-    ip6_addr_set(&dest, &(ip6hdr->dest));
-    /* send the queued IPv6 packet */
-    (neighbor_cache[i].netif)->output_ip6(neighbor_cache[i].netif, neighbor_cache[i].q, &dest);
-    /* free the queued IP packet */
-    pbuf_free(neighbor_cache[i].q);
-    neighbor_cache[i].q = NULL;
-  }
-#endif /* LWIP_ND6_QUEUEING */
-}
-
-/**
- * A packet is to be transmitted to a specific IPv6 destination on a specific
- * interface. Check if we can find the hardware address of the next hop to use
- * for the packet. If so, give the hardware address to the caller, which should
- * use it to send the packet right away. Otherwise, enqueue the packet for
- * later transmission while looking up the hardware address, if possible.
- *
- * As such, this function returns one of three different possible results:
- *
- * - ERR_OK with a non-NULL 'hwaddrp': the caller should send the packet now.
- * - ERR_OK with a NULL 'hwaddrp': the packet has been enqueued for later.
- * - not ERR_OK: something went wrong; forward the error upward in the stack.
- *
- * @param netif The lwIP network interface on which the IP packet will be sent.
- * @param q The pbuf(s) containing the IP packet to be sent.
- * @param ip6addr The destination IPv6 address of the packet.
- * @param hwaddrp On success, filled with a pointer to a HW address or NULL (meaning
- *        the packet has been queued).
- * @return
- * - ERR_OK on success, ERR_RTE if no route was found for the packet,
- * or ERR_MEM if low memory conditions prohibit sending the packet at all.
- */
-err_t
-nd6_get_next_hop_addr_or_queue(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr, const u8_t **hwaddrp)
-{
-  s8_t i;
-
-  /* Get next hop record. */
-  i = nd6_get_next_hop_entry(ip6addr, netif);
-  if (i < 0) {
-    /* failed to get a next hop neighbor record. */
-    return i;
-  }
-
-  /* Now that we have a destination record, send or queue the packet. */
-  if (neighbor_cache[i].state == ND6_STALE) {
-    /* Switch to delay state. */
-    neighbor_cache[i].state = ND6_DELAY;
-    neighbor_cache[i].counter.delay_time = LWIP_ND6_DELAY_FIRST_PROBE_TIME / ND6_TMR_INTERVAL;
-  }
-  /* @todo should we send or queue if PROBE? send for now, to let unicast NS pass. */
-  if ((neighbor_cache[i].state == ND6_REACHABLE) ||
-      (neighbor_cache[i].state == ND6_DELAY) ||
-      (neighbor_cache[i].state == ND6_PROBE)) {
-
-    /* Tell the caller to send out the packet now. */
-    *hwaddrp = neighbor_cache[i].lladdr;
-    return ERR_OK;
-  }
-
-  /* We should queue packet on this interface. */
-  *hwaddrp = NULL;
-  return nd6_queue_packet(i, q);
-}
-
-
-/**
- * Get the Path MTU for a destination.
- *
- * @param ip6addr the destination address
- * @param netif the netif on which the packet will be sent
- * @return the Path MTU, if known, or the netif default MTU
- */
-u16_t
-nd6_get_destination_mtu(const ip6_addr_t *ip6addr, struct netif *netif)
-{
-  s8_t i;
-
-  i = nd6_find_destination_cache_entry(ip6addr);
-  if (i >= 0) {
-    if (destination_cache[i].pmtu > 0) {
-      return destination_cache[i].pmtu;
-    }
-  }
-
-  if (netif != NULL) {
-    return netif->mtu;
-  }
-
-  return 1280; /* Minimum MTU */
-}
-
-
-#if LWIP_ND6_TCP_REACHABILITY_HINTS
-/**
- * Provide the Neighbor discovery process with a hint that a
- * destination is reachable. Called by tcp_receive when ACKs are
- * received or sent (as per RFC). This is useful to avoid sending
- * NS messages every 30 seconds.
- *
- * @param ip6addr the destination address which is know to be reachable
- *                by an upper layer protocol (TCP)
- */
-void
-nd6_reachability_hint(const ip6_addr_t *ip6addr)
-{
-  s8_t i;
-
-  /* Find destination in cache. */
-  if (ip6_addr_cmp(ip6addr, &(destination_cache[nd6_cached_destination_index].destination_addr))) {
-    i = nd6_cached_destination_index;
-    ND6_STATS_INC(nd6.cachehit);
-  } else {
-    i = nd6_find_destination_cache_entry(ip6addr);
-  }
-  if (i < 0) {
-    return;
-  }
-
-  /* Find next hop neighbor in cache. */
-  if (ip6_addr_cmp(&(destination_cache[i].next_hop_addr), &(neighbor_cache[nd6_cached_neighbor_index].next_hop_address))) {
-    i = nd6_cached_neighbor_index;
-    ND6_STATS_INC(nd6.cachehit);
-  } else {
-    i = nd6_find_neighbor_cache_entry(&(destination_cache[i].next_hop_addr));
-  }
-  if (i < 0) {
-    return;
-  }
-
-  /* For safety: don't set as reachable if we don't have a LL address yet. Misuse protection. */
-  if (neighbor_cache[i].state == ND6_INCOMPLETE || neighbor_cache[i].state == ND6_NO_ENTRY) {
-    return;
-  }
-
-  /* Set reachability state. */
-  neighbor_cache[i].state = ND6_REACHABLE;
-  neighbor_cache[i].counter.reachable_time = reachable_time;
-}
-#endif /* LWIP_ND6_TCP_REACHABILITY_HINTS */
-
-/**
- * Remove all prefix, neighbor_cache and router entries of the specified netif.
- *
- * @param netif points to a network interface
- */
-void
-nd6_cleanup_netif(struct netif *netif)
-{
-  u8_t i;
-  s8_t router_index;
-  for (i = 0; i < LWIP_ND6_NUM_PREFIXES; i++) {
-    if (prefix_list[i].netif == netif) {
-      prefix_list[i].netif = NULL;
-      prefix_list[i].flags = 0;
-    }
-  }
-  for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
-    if (neighbor_cache[i].netif == netif) {
-      for (router_index = 0; router_index < LWIP_ND6_NUM_ROUTERS; router_index++) {
-        if (default_router_list[router_index].neighbor_entry == &neighbor_cache[i]) {
-          default_router_list[router_index].neighbor_entry = NULL;
-          default_router_list[router_index].flags = 0;
-        }
-      }
-      neighbor_cache[i].isrouter = 0;
-      nd6_free_neighbor_cache_entry(i);
-    }
-  }
-}
-
-#if LWIP_IPV6_MLD
-/**
- * The state of a local IPv6 address entry is about to change. If needed, join
- * or leave the solicited-node multicast group for the address.
- *
- * @param netif The netif that owns the address.
- * @param addr_idx The index of the address.
- * @param new_state The new (IP6_ADDR_) state for the address.
- */
-void
-nd6_adjust_mld_membership(struct netif *netif, s8_t addr_idx, u8_t new_state)
-{
-  u8_t old_state, old_member, new_member;
-
-  old_state = netif_ip6_addr_state(netif, addr_idx);
-
-  /* Determine whether we were, and should be, a member of the solicited-node
-   * multicast group for this address. For tentative addresses, the group is
-   * not joined until the address enters the TENTATIVE_1 (or VALID) state. */
-  old_member = (old_state != IP6_ADDR_INVALID && old_state != IP6_ADDR_TENTATIVE);
-  new_member = (new_state != IP6_ADDR_INVALID && new_state != IP6_ADDR_TENTATIVE);
-
-  if (old_member != new_member) {
-    ip6_addr_set_solicitednode(&multicast_address, netif_ip6_addr(netif, addr_idx)->addr[3]);
-
-    if (new_member) {
-      mld6_joingroup_netif(netif, &multicast_address);
-    } else {
-      mld6_leavegroup_netif(netif, &multicast_address);
-    }
-  }
-}
-#endif /* LWIP_IPV6_MLD */
-
-#endif /* LWIP_IPV6 */
diff --git a/sys/net/core/mem.c b/sys/net/core/mem.c
deleted file mode 100644
index 353c9d7..0000000
--- a/sys/net/core/mem.c
+++ /dev/null
@@ -1,777 +0,0 @@
-/**
- * @file
- * Dynamic memory manager
- *
- * This is a lightweight replacement for the standard C library malloc().
- *
- * If you want to use the standard C library malloc() instead, define
- * MEM_LIBC_MALLOC to 1 in your lwipopts.h
- *
- * To let mem_malloc() use pools (prevents fragmentation and is much faster than
- * a heap but might waste some memory), define MEM_USE_POOLS to 1, define
- * MEMP_USE_CUSTOM_POOLS to 1 and create a file "lwippools.h" that includes a list
- * of pools like this (more pools can be added between _START and _END):
- *
- * Define three pools with sizes 256, 512, and 1512 bytes
- * LWIP_MALLOC_MEMPOOL_START
- * LWIP_MALLOC_MEMPOOL(20, 256)
- * LWIP_MALLOC_MEMPOOL(10, 512)
- * LWIP_MALLOC_MEMPOOL(5, 1512)
- * LWIP_MALLOC_MEMPOOL_END
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *         Simon Goldschmidt
- *
- */
-
-#include "net/opt.h"
-#include "net/mem.h"
-#include "net/def.h"
-#include "net/sys.h"
-#include "net/stats.h"
-#include "net/err.h"
-
-#include <string.h>
-
-#if MEM_LIBC_MALLOC
-#include <stdlib.h> /* for malloc()/free() */
-#endif
-
-#if MEM_LIBC_MALLOC || MEM_USE_POOLS
-
-/** mem_init is not used when using pools instead of a heap or using
- * C library malloc().
- */
-void
-mem_init(void)
-{
-}
-
-/** mem_trim is not used when using pools instead of a heap or using
- * C library malloc(): we can't free part of a pool element and the stack
- * support mem_trim() to return a different pointer
- */
-void*
-mem_trim(void *mem, mem_size_t size)
-{
-  LWIP_UNUSED_ARG(size);
-  return mem;
-}
-#endif /* MEM_LIBC_MALLOC || MEM_USE_POOLS */
-
-#if MEM_LIBC_MALLOC
-/* lwIP heap implemented using C library malloc() */
-
-/* in case C library malloc() needs extra protection,
- * allow these defines to be overridden.
- */
-#ifndef mem_clib_free
-#define mem_clib_free free
-#endif
-#ifndef mem_clib_malloc
-#define mem_clib_malloc malloc
-#endif
-#ifndef mem_clib_calloc
-#define mem_clib_calloc calloc
-#endif
-
-#if LWIP_STATS && MEM_STATS
-#define MEM_LIBC_STATSHELPER_SIZE LWIP_MEM_ALIGN_SIZE(sizeof(mem_size_t))
-#else
-#define MEM_LIBC_STATSHELPER_SIZE 0
-#endif
-
-/**
- * Allocate a block of memory with a minimum of 'size' bytes.
- *
- * @param size is the minimum size of the requested block in bytes.
- * @return pointer to allocated memory or NULL if no free memory was found.
- *
- * Note that the returned value must always be aligned (as defined by MEM_ALIGNMENT).
- */
-void *
-mem_malloc(mem_size_t size)
-{
-  void* ret = mem_clib_malloc(size + MEM_LIBC_STATSHELPER_SIZE);
-  if (ret == NULL) {
-    MEM_STATS_INC(err);
-  } else {
-    LWIP_ASSERT("malloc() must return aligned memory", LWIP_MEM_ALIGN(ret) == ret);
-#if LWIP_STATS && MEM_STATS
-    *(mem_size_t*)ret = size;
-    ret = (u8_t*)ret + MEM_LIBC_STATSHELPER_SIZE;
-    MEM_STATS_INC_USED(used, size);
-#endif
-  }
-  return ret;
-}
-
-/** Put memory back on the heap
- *
- * @param rmem is the pointer as returned by a previous call to mem_malloc()
- */
-void
-mem_free(void *rmem)
-{
-  LWIP_ASSERT("rmem != NULL", (rmem != NULL));
-  LWIP_ASSERT("rmem == MEM_ALIGN(rmem)", (rmem == LWIP_MEM_ALIGN(rmem)));
-#if LWIP_STATS && MEM_STATS
-  rmem = (u8_t*)rmem - MEM_LIBC_STATSHELPER_SIZE;
-  MEM_STATS_DEC_USED(used, *(mem_size_t*)rmem);
-#endif
-  mem_clib_free(rmem);
-}
-
-#elif MEM_USE_POOLS
-
-/* lwIP heap implemented with different sized pools */
-
-/**
- * Allocate memory: determine the smallest pool that is big enough
- * to contain an element of 'size' and get an element from that pool.
- *
- * @param size the size in bytes of the memory needed
- * @return a pointer to the allocated memory or NULL if the pool is empty
- */
-void *
-mem_malloc(mem_size_t size)
-{
-  void *ret;
-  struct memp_malloc_helper *element = NULL;
-  memp_t poolnr;
-  mem_size_t required_size = size + LWIP_MEM_ALIGN_SIZE(sizeof(struct memp_malloc_helper));
-
-  for (poolnr = MEMP_POOL_FIRST; poolnr <= MEMP_POOL_LAST; poolnr = (memp_t)(poolnr + 1)) {
-    /* is this pool big enough to hold an element of the required size
-       plus a struct memp_malloc_helper that saves the pool this element came from? */
-    if (required_size <= memp_pools[poolnr]->size) {
-      element = (struct memp_malloc_helper*)memp_malloc(poolnr);
-      if (element == NULL) {
-        /* No need to DEBUGF or ASSERT: This error is already taken care of in memp.c */
-#if MEM_USE_POOLS_TRY_BIGGER_POOL
-        /** Try a bigger pool if this one is empty! */
-        if (poolnr < MEMP_POOL_LAST) {
-          continue;
-        }
-#endif /* MEM_USE_POOLS_TRY_BIGGER_POOL */
-        MEM_STATS_INC(err);
-        return NULL;
-      }
-      break;
-    }
-  }
-  if (poolnr > MEMP_POOL_LAST) {
-    LWIP_ASSERT("mem_malloc(): no pool is that big!", 0);
-    MEM_STATS_INC(err);
-    return NULL;
-  }
-
-  /* save the pool number this element came from */
-  element->poolnr = poolnr;
-  /* and return a pointer to the memory directly after the struct memp_malloc_helper */
-  ret = (u8_t*)element + LWIP_MEM_ALIGN_SIZE(sizeof(struct memp_malloc_helper));
-
-#if MEMP_OVERFLOW_CHECK || (LWIP_STATS && MEM_STATS)
-  /* truncating to u16_t is safe because struct memp_desc::size is u16_t */
-  element->size = (u16_t)size;
-  MEM_STATS_INC_USED(used, element->size);
-#endif /* MEMP_OVERFLOW_CHECK || (LWIP_STATS && MEM_STATS) */
-#if MEMP_OVERFLOW_CHECK
-  /* initialize unused memory (diff between requested size and selected pool's size) */
-  memset((u8_t*)ret + size, 0xcd, memp_pools[poolnr]->size - size);
-#endif /* MEMP_OVERFLOW_CHECK */
-  return ret;
-}
-
-/**
- * Free memory previously allocated by mem_malloc. Loads the pool number
- * and calls memp_free with that pool number to put the element back into
- * its pool
- *
- * @param rmem the memory element to free
- */
-void
-mem_free(void *rmem)
-{
-  struct memp_malloc_helper *hmem;
-
-  LWIP_ASSERT("rmem != NULL", (rmem != NULL));
-  LWIP_ASSERT("rmem == MEM_ALIGN(rmem)", (rmem == LWIP_MEM_ALIGN(rmem)));
-
-  /* get the original struct memp_malloc_helper */
-  /* cast through void* to get rid of alignment warnings */
-  hmem = (struct memp_malloc_helper*)(void*)((u8_t*)rmem - LWIP_MEM_ALIGN_SIZE(sizeof(struct memp_malloc_helper)));
-
-  LWIP_ASSERT("hmem != NULL", (hmem != NULL));
-  LWIP_ASSERT("hmem == MEM_ALIGN(hmem)", (hmem == LWIP_MEM_ALIGN(hmem)));
-  LWIP_ASSERT("hmem->poolnr < MEMP_MAX", (hmem->poolnr < MEMP_MAX));
-
-  MEM_STATS_DEC_USED(used, hmem->size);
-#if MEMP_OVERFLOW_CHECK
-  {
-     u16_t i;
-     LWIP_ASSERT("MEM_USE_POOLS: invalid chunk size",
-        hmem->size <= memp_pools[hmem->poolnr]->size);
-     /* check that unused memory remained untouched (diff between requested size and selected pool's size) */
-     for (i = hmem->size; i < memp_pools[hmem->poolnr]->size; i++) {
-        u8_t data = *((u8_t*)rmem + i);
-        LWIP_ASSERT("MEM_USE_POOLS: mem overflow detected", data == 0xcd);
-     }
-  }
-#endif /* MEMP_OVERFLOW_CHECK */
-
-  /* and put it in the pool we saved earlier */
-  memp_free(hmem->poolnr, hmem);
-}
-
-#else /* MEM_USE_POOLS */
-/* lwIP replacement for your libc malloc() */
-
-/**
- * The heap is made up as a list of structs of this type.
- * This does not have to be aligned since for getting its size,
- * we only use the macro SIZEOF_STRUCT_MEM, which automatically aligns.
- */
-struct mem {
-  /** index (-> ram[next]) of the next struct */
-  mem_size_t next;
-  /** index (-> ram[prev]) of the previous struct */
-  mem_size_t prev;
-  /** 1: this area is used; 0: this area is unused */
-  u8_t used;
-};
-
-/** All allocated blocks will be MIN_SIZE bytes big, at least!
- * MIN_SIZE can be overridden to suit your needs. Smaller values save space,
- * larger values could prevent too small blocks to fragment the RAM too much. */
-#ifndef MIN_SIZE
-#define MIN_SIZE             12
-#endif /* MIN_SIZE */
-/* some alignment macros: we define them here for better source code layout */
-#define MIN_SIZE_ALIGNED     LWIP_MEM_ALIGN_SIZE(MIN_SIZE)
-#define SIZEOF_STRUCT_MEM    LWIP_MEM_ALIGN_SIZE(sizeof(struct mem))
-#define MEM_SIZE_ALIGNED     LWIP_MEM_ALIGN_SIZE(MEM_SIZE)
-
-/** If you want to relocate the heap to external memory, simply define
- * LWIP_RAM_HEAP_POINTER as a void-pointer to that location.
- * If so, make sure the memory at that location is big enough (see below on
- * how that space is calculated). */
-#ifndef LWIP_RAM_HEAP_POINTER
-/** the heap. we need one struct mem at the end and some room for alignment */
-LWIP_DECLARE_MEMORY_ALIGNED(ram_heap, MEM_SIZE_ALIGNED + (2U*SIZEOF_STRUCT_MEM));
-#define LWIP_RAM_HEAP_POINTER ram_heap
-#endif /* LWIP_RAM_HEAP_POINTER */
-
-/** pointer to the heap (ram_heap): for alignment, ram is now a pointer instead of an array */
-static u8_t *ram;
-/** the last entry, always unused! */
-static struct mem *ram_end;
-/** pointer to the lowest free block, this is used for faster search */
-static struct mem *lfree;
-
-/** concurrent access protection */
-#if !NO_SYS
-static sys_mutex_t mem_mutex;
-#endif
-
-#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
-
-static volatile u8_t mem_free_count;
-
-/* Allow mem_free from other (e.g. interrupt) context */
-#define LWIP_MEM_FREE_DECL_PROTECT()  SYS_ARCH_DECL_PROTECT(lev_free)
-#define LWIP_MEM_FREE_PROTECT()       SYS_ARCH_PROTECT(lev_free)
-#define LWIP_MEM_FREE_UNPROTECT()     SYS_ARCH_UNPROTECT(lev_free)
-#define LWIP_MEM_ALLOC_DECL_PROTECT() SYS_ARCH_DECL_PROTECT(lev_alloc)
-#define LWIP_MEM_ALLOC_PROTECT()      SYS_ARCH_PROTECT(lev_alloc)
-#define LWIP_MEM_ALLOC_UNPROTECT()    SYS_ARCH_UNPROTECT(lev_alloc)
-
-#else /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-
-/* Protect the heap only by using a semaphore */
-#define LWIP_MEM_FREE_DECL_PROTECT()
-#define LWIP_MEM_FREE_PROTECT()    sys_mutex_lock(&mem_mutex)
-#define LWIP_MEM_FREE_UNPROTECT()  sys_mutex_unlock(&mem_mutex)
-/* mem_malloc is protected using semaphore AND LWIP_MEM_ALLOC_PROTECT */
-#define LWIP_MEM_ALLOC_DECL_PROTECT()
-#define LWIP_MEM_ALLOC_PROTECT()
-#define LWIP_MEM_ALLOC_UNPROTECT()
-
-#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-
-
-/**
- * "Plug holes" by combining adjacent empty struct mems.
- * After this function is through, there should not exist
- * one empty struct mem pointing to another empty struct mem.
- *
- * @param mem this points to a struct mem which just has been freed
- * @internal this function is only called by mem_free() and mem_trim()
- *
- * This assumes access to the heap is protected by the calling function
- * already.
- */
-static void
-plug_holes(struct mem *mem)
-{
-  struct mem *nmem;
-  struct mem *pmem;
-
-  LWIP_ASSERT("plug_holes: mem >= ram", (u8_t *)mem >= ram);
-  LWIP_ASSERT("plug_holes: mem < ram_end", (u8_t *)mem < (u8_t *)ram_end);
-  LWIP_ASSERT("plug_holes: mem->used == 0", mem->used == 0);
-
-  /* plug hole forward */
-  LWIP_ASSERT("plug_holes: mem->next <= MEM_SIZE_ALIGNED", mem->next <= MEM_SIZE_ALIGNED);
-
-  nmem = (struct mem *)(void *)&ram[mem->next];
-  if (mem != nmem && nmem->used == 0 && (u8_t *)nmem != (u8_t *)ram_end) {
-    /* if mem->next is unused and not end of ram, combine mem and mem->next */
-    if (lfree == nmem) {
-      lfree = mem;
-    }
-    mem->next = nmem->next;
-    ((struct mem *)(void *)&ram[nmem->next])->prev = (mem_size_t)((u8_t *)mem - ram);
-  }
-
-  /* plug hole backward */
-  pmem = (struct mem *)(void *)&ram[mem->prev];
-  if (pmem != mem && pmem->used == 0) {
-    /* if mem->prev is unused, combine mem and mem->prev */
-    if (lfree == mem) {
-      lfree = pmem;
-    }
-    pmem->next = mem->next;
-    ((struct mem *)(void *)&ram[mem->next])->prev = (mem_size_t)((u8_t *)pmem - ram);
-  }
-}
-
-/**
- * Zero the heap and initialize start, end and lowest-free
- */
-void
-mem_init(void)
-{
-  struct mem *mem;
-
-  LWIP_ASSERT("Sanity check alignment",
-    (SIZEOF_STRUCT_MEM & (MEM_ALIGNMENT-1)) == 0);
-
-  /* align the heap */
-  ram = (u8_t *)LWIP_MEM_ALIGN(LWIP_RAM_HEAP_POINTER);
-  /* initialize the start of the heap */
-  mem = (struct mem *)(void *)ram;
-  mem->next = MEM_SIZE_ALIGNED;
-  mem->prev = 0;
-  mem->used = 0;
-  /* initialize the end of the heap */
-  ram_end = (struct mem *)(void *)&ram[MEM_SIZE_ALIGNED];
-  ram_end->used = 1;
-  ram_end->next = MEM_SIZE_ALIGNED;
-  ram_end->prev = MEM_SIZE_ALIGNED;
-
-  /* initialize the lowest-free pointer to the start of the heap */
-  lfree = (struct mem *)(void *)ram;
-
-  MEM_STATS_AVAIL(avail, MEM_SIZE_ALIGNED);
-
-  if (sys_mutex_new(&mem_mutex) != ERR_OK) {
-    LWIP_ASSERT("failed to create mem_mutex", 0);
-  }
-}
-
-/**
- * Put a struct mem back on the heap
- *
- * @param rmem is the data portion of a struct mem as returned by a previous
- *             call to mem_malloc()
- */
-void
-mem_free(void *rmem)
-{
-  struct mem *mem;
-  LWIP_MEM_FREE_DECL_PROTECT();
-
-  if (rmem == NULL) {
-    LWIP_DEBUGF(MEM_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("mem_free(p == NULL) was called.\n"));
-    return;
-  }
-  LWIP_ASSERT("mem_free: sanity check alignment", (((mem_ptr_t)rmem) & (MEM_ALIGNMENT-1)) == 0);
-
-  LWIP_ASSERT("mem_free: legal memory", (u8_t *)rmem >= (u8_t *)ram &&
-    (u8_t *)rmem < (u8_t *)ram_end);
-
-  if ((u8_t *)rmem < (u8_t *)ram || (u8_t *)rmem >= (u8_t *)ram_end) {
-    SYS_ARCH_DECL_PROTECT(lev);
-    LWIP_DEBUGF(MEM_DEBUG | LWIP_DBG_LEVEL_SEVERE, ("mem_free: illegal memory\n"));
-    /* protect mem stats from concurrent access */
-    SYS_ARCH_PROTECT(lev);
-    MEM_STATS_INC(illegal);
-    SYS_ARCH_UNPROTECT(lev);
-    return;
-  }
-  /* protect the heap from concurrent access */
-  LWIP_MEM_FREE_PROTECT();
-  /* Get the corresponding struct mem ... */
-  /* cast through void* to get rid of alignment warnings */
-  mem = (struct mem *)(void *)((u8_t *)rmem - SIZEOF_STRUCT_MEM);
-  /* ... which has to be in a used state ... */
-  LWIP_ASSERT("mem_free: mem->used", mem->used);
-  /* ... and is now unused. */
-  mem->used = 0;
-
-  if (mem < lfree) {
-    /* the newly freed struct is now the lowest */
-    lfree = mem;
-  }
-
-  MEM_STATS_DEC_USED(used, mem->next - (mem_size_t)(((u8_t *)mem - ram)));
-
-  /* finally, see if prev or next are free also */
-  plug_holes(mem);
-#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
-  mem_free_count = 1;
-#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-  LWIP_MEM_FREE_UNPROTECT();
-}
-
-/**
- * Shrink memory returned by mem_malloc().
- *
- * @param rmem pointer to memory allocated by mem_malloc the is to be shrinked
- * @param newsize required size after shrinking (needs to be smaller than or
- *                equal to the previous size)
- * @return for compatibility reasons: is always == rmem, at the moment
- *         or NULL if newsize is > old size, in which case rmem is NOT touched
- *         or freed!
- */
-void *
-mem_trim(void *rmem, mem_size_t newsize)
-{
-  mem_size_t size;
-  mem_size_t ptr, ptr2;
-  struct mem *mem, *mem2;
-  /* use the FREE_PROTECT here: it protects with sem OR SYS_ARCH_PROTECT */
-  LWIP_MEM_FREE_DECL_PROTECT();
-
-  /* Expand the size of the allocated memory region so that we can
-     adjust for alignment. */
-  newsize = LWIP_MEM_ALIGN_SIZE(newsize);
-
-  if (newsize < MIN_SIZE_ALIGNED) {
-    /* every data block must be at least MIN_SIZE_ALIGNED long */
-    newsize = MIN_SIZE_ALIGNED;
-  }
-
-  if (newsize > MEM_SIZE_ALIGNED) {
-    return NULL;
-  }
-
-  LWIP_ASSERT("mem_trim: legal memory", (u8_t *)rmem >= (u8_t *)ram &&
-   (u8_t *)rmem < (u8_t *)ram_end);
-
-  if ((u8_t *)rmem < (u8_t *)ram || (u8_t *)rmem >= (u8_t *)ram_end) {
-    SYS_ARCH_DECL_PROTECT(lev);
-    LWIP_DEBUGF(MEM_DEBUG | LWIP_DBG_LEVEL_SEVERE, ("mem_trim: illegal memory\n"));
-    /* protect mem stats from concurrent access */
-    SYS_ARCH_PROTECT(lev);
-    MEM_STATS_INC(illegal);
-    SYS_ARCH_UNPROTECT(lev);
-    return rmem;
-  }
-  /* Get the corresponding struct mem ... */
-  /* cast through void* to get rid of alignment warnings */
-  mem = (struct mem *)(void *)((u8_t *)rmem - SIZEOF_STRUCT_MEM);
-  /* ... and its offset pointer */
-  ptr = (mem_size_t)((u8_t *)mem - ram);
-
-  size = mem->next - ptr - SIZEOF_STRUCT_MEM;
-  LWIP_ASSERT("mem_trim can only shrink memory", newsize <= size);
-  if (newsize > size) {
-    /* not supported */
-    return NULL;
-  }
-  if (newsize == size) {
-    /* No change in size, simply return */
-    return rmem;
-  }
-
-  /* protect the heap from concurrent access */
-  LWIP_MEM_FREE_PROTECT();
-
-  mem2 = (struct mem *)(void *)&ram[mem->next];
-  if (mem2->used == 0) {
-    /* The next struct is unused, we can simply move it at little */
-    mem_size_t next;
-    /* remember the old next pointer */
-    next = mem2->next;
-    /* create new struct mem which is moved directly after the shrinked mem */
-    ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize;
-    if (lfree == mem2) {
-      lfree = (struct mem *)(void *)&ram[ptr2];
-    }
-    mem2 = (struct mem *)(void *)&ram[ptr2];
-    mem2->used = 0;
-    /* restore the next pointer */
-    mem2->next = next;
-    /* link it back to mem */
-    mem2->prev = ptr;
-    /* link mem to it */
-    mem->next = ptr2;
-    /* last thing to restore linked list: as we have moved mem2,
-     * let 'mem2->next->prev' point to mem2 again. but only if mem2->next is not
-     * the end of the heap */
-    if (mem2->next != MEM_SIZE_ALIGNED) {
-      ((struct mem *)(void *)&ram[mem2->next])->prev = ptr2;
-    }
-    MEM_STATS_DEC_USED(used, (size - newsize));
-    /* no need to plug holes, we've already done that */
-  } else if (newsize + SIZEOF_STRUCT_MEM + MIN_SIZE_ALIGNED <= size) {
-    /* Next struct is used but there's room for another struct mem with
-     * at least MIN_SIZE_ALIGNED of data.
-     * Old size ('size') must be big enough to contain at least 'newsize' plus a struct mem
-     * ('SIZEOF_STRUCT_MEM') with some data ('MIN_SIZE_ALIGNED').
-     * @todo we could leave out MIN_SIZE_ALIGNED. We would create an empty
-     *       region that couldn't hold data, but when mem->next gets freed,
-     *       the 2 regions would be combined, resulting in more free memory */
-    ptr2 = ptr + SIZEOF_STRUCT_MEM + newsize;
-    mem2 = (struct mem *)(void *)&ram[ptr2];
-    if (mem2 < lfree) {
-      lfree = mem2;
-    }
-    mem2->used = 0;
-    mem2->next = mem->next;
-    mem2->prev = ptr;
-    mem->next = ptr2;
-    if (mem2->next != MEM_SIZE_ALIGNED) {
-      ((struct mem *)(void *)&ram[mem2->next])->prev = ptr2;
-    }
-    MEM_STATS_DEC_USED(used, (size - newsize));
-    /* the original mem->next is used, so no need to plug holes! */
-  }
-  /* else {
-    next struct mem is used but size between mem and mem2 is not big enough
-    to create another struct mem
-    -> don't do anyhting.
-    -> the remaining space stays unused since it is too small
-  } */
-#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
-  mem_free_count = 1;
-#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-  LWIP_MEM_FREE_UNPROTECT();
-  return rmem;
-}
-
-/**
- * Allocate a block of memory with a minimum of 'size' bytes.
- *
- * @param size is the minimum size of the requested block in bytes.
- * @return pointer to allocated memory or NULL if no free memory was found.
- *
- * Note that the returned value will always be aligned (as defined by MEM_ALIGNMENT).
- */
-void *
-mem_malloc(mem_size_t size)
-{
-  mem_size_t ptr, ptr2;
-  struct mem *mem, *mem2;
-#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
-  u8_t local_mem_free_count = 0;
-#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-  LWIP_MEM_ALLOC_DECL_PROTECT();
-
-  if (size == 0) {
-    return NULL;
-  }
-
-  /* Expand the size of the allocated memory region so that we can
-     adjust for alignment. */
-  size = LWIP_MEM_ALIGN_SIZE(size);
-
-  if (size < MIN_SIZE_ALIGNED) {
-    /* every data block must be at least MIN_SIZE_ALIGNED long */
-    size = MIN_SIZE_ALIGNED;
-  }
-
-  if (size > MEM_SIZE_ALIGNED) {
-    return NULL;
-  }
-
-  /* protect the heap from concurrent access */
-  sys_mutex_lock(&mem_mutex);
-  LWIP_MEM_ALLOC_PROTECT();
-#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
-  /* run as long as a mem_free disturbed mem_malloc or mem_trim */
-  do {
-    local_mem_free_count = 0;
-#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-
-    /* Scan through the heap searching for a free block that is big enough,
-     * beginning with the lowest free block.
-     */
-    for (ptr = (mem_size_t)((u8_t *)lfree - ram); ptr < MEM_SIZE_ALIGNED - size;
-         ptr = ((struct mem *)(void *)&ram[ptr])->next) {
-      mem = (struct mem *)(void *)&ram[ptr];
-#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
-      mem_free_count = 0;
-      LWIP_MEM_ALLOC_UNPROTECT();
-      /* allow mem_free or mem_trim to run */
-      LWIP_MEM_ALLOC_PROTECT();
-      if (mem_free_count != 0) {
-        /* If mem_free or mem_trim have run, we have to restart since they
-           could have altered our current struct mem. */
-        local_mem_free_count = 1;
-        break;
-      }
-#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-
-      if ((!mem->used) &&
-          (mem->next - (ptr + SIZEOF_STRUCT_MEM)) >= size) {
-        /* mem is not used and at least perfect fit is possible:
-         * mem->next - (ptr + SIZEOF_STRUCT_MEM) gives us the 'user data size' of mem */
-
-        if (mem->next - (ptr + SIZEOF_STRUCT_MEM) >= (size + SIZEOF_STRUCT_MEM + MIN_SIZE_ALIGNED)) {
-          /* (in addition to the above, we test if another struct mem (SIZEOF_STRUCT_MEM) containing
-           * at least MIN_SIZE_ALIGNED of data also fits in the 'user data space' of 'mem')
-           * -> split large block, create empty remainder,
-           * remainder must be large enough to contain MIN_SIZE_ALIGNED data: if
-           * mem->next - (ptr + (2*SIZEOF_STRUCT_MEM)) == size,
-           * struct mem would fit in but no data between mem2 and mem2->next
-           * @todo we could leave out MIN_SIZE_ALIGNED. We would create an empty
-           *       region that couldn't hold data, but when mem->next gets freed,
-           *       the 2 regions would be combined, resulting in more free memory
-           */
-          ptr2 = ptr + SIZEOF_STRUCT_MEM + size;
-          /* create mem2 struct */
-          mem2 = (struct mem *)(void *)&ram[ptr2];
-          mem2->used = 0;
-          mem2->next = mem->next;
-          mem2->prev = ptr;
-          /* and insert it between mem and mem->next */
-          mem->next = ptr2;
-          mem->used = 1;
-
-          if (mem2->next != MEM_SIZE_ALIGNED) {
-            ((struct mem *)(void *)&ram[mem2->next])->prev = ptr2;
-          }
-          MEM_STATS_INC_USED(used, (size + SIZEOF_STRUCT_MEM));
-        } else {
-          /* (a mem2 struct does no fit into the user data space of mem and mem->next will always
-           * be used at this point: if not we have 2 unused structs in a row, plug_holes should have
-           * take care of this).
-           * -> near fit or exact fit: do not split, no mem2 creation
-           * also can't move mem->next directly behind mem, since mem->next
-           * will always be used at this point!
-           */
-          mem->used = 1;
-          MEM_STATS_INC_USED(used, mem->next - (mem_size_t)((u8_t *)mem - ram));
-        }
-#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
-mem_malloc_adjust_lfree:
-#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-        if (mem == lfree) {
-          struct mem *cur = lfree;
-          /* Find next free block after mem and update lowest free pointer */
-          while (cur->used && cur != ram_end) {
-#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
-            mem_free_count = 0;
-            LWIP_MEM_ALLOC_UNPROTECT();
-            /* prevent high interrupt latency... */
-            LWIP_MEM_ALLOC_PROTECT();
-            if (mem_free_count != 0) {
-              /* If mem_free or mem_trim have run, we have to restart since they
-                 could have altered our current struct mem or lfree. */
-              goto mem_malloc_adjust_lfree;
-            }
-#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-            cur = (struct mem *)(void *)&ram[cur->next];
-          }
-          lfree = cur;
-          LWIP_ASSERT("mem_malloc: !lfree->used", ((lfree == ram_end) || (!lfree->used)));
-        }
-        LWIP_MEM_ALLOC_UNPROTECT();
-        sys_mutex_unlock(&mem_mutex);
-        LWIP_ASSERT("mem_malloc: allocated memory not above ram_end.",
-         (mem_ptr_t)mem + SIZEOF_STRUCT_MEM + size <= (mem_ptr_t)ram_end);
-        LWIP_ASSERT("mem_malloc: allocated memory properly aligned.",
-         ((mem_ptr_t)mem + SIZEOF_STRUCT_MEM) % MEM_ALIGNMENT == 0);
-        LWIP_ASSERT("mem_malloc: sanity check alignment",
-          (((mem_ptr_t)mem) & (MEM_ALIGNMENT-1)) == 0);
-
-        return (u8_t *)mem + SIZEOF_STRUCT_MEM;
-      }
-    }
-#if LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT
-    /* if we got interrupted by a mem_free, try again */
-  } while (local_mem_free_count != 0);
-#endif /* LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT */
-  LWIP_DEBUGF(MEM_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("mem_malloc: could not allocate %"S16_F" bytes\n", (s16_t)size));
-  MEM_STATS_INC(err);
-  LWIP_MEM_ALLOC_UNPROTECT();
-  sys_mutex_unlock(&mem_mutex);
-  return NULL;
-}
-
-#endif /* MEM_USE_POOLS */
-
-#if MEM_LIBC_MALLOC && (!LWIP_STATS || !MEM_STATS)
-void *
-mem_calloc(mem_size_t count, mem_size_t size)
-{
-  return mem_clib_calloc(count, size);
-}
-
-#else /* MEM_LIBC_MALLOC && (!LWIP_STATS || !MEM_STATS) */
-/**
- * Contiguously allocates enough space for count objects that are size bytes
- * of memory each and returns a pointer to the allocated memory.
- *
- * The allocated memory is filled with bytes of value zero.
- *
- * @param count number of objects to allocate
- * @param size size of the objects to allocate
- * @return pointer to allocated memory / NULL pointer if there is an error
- */
-void *
-mem_calloc(mem_size_t count, mem_size_t size)
-{
-  void *p;
-
-  /* allocate 'count' objects of size 'size' */
-  p = mem_malloc(count * size);
-  if (p) {
-    /* zero the memory */
-    memset(p, 0, (size_t)count * (size_t)size);
-  }
-  return p;
-}
-#endif /* MEM_LIBC_MALLOC && (!LWIP_STATS || !MEM_STATS) */
diff --git a/sys/net/core/memp.c b/sys/net/core/memp.c
deleted file mode 100644
index eec9993..0000000
--- a/sys/net/core/memp.c
+++ /dev/null
@@ -1,496 +0,0 @@
-/**
- * @file
- * Dynamic pool memory manager
- *
- * lwIP has dedicated pools for many structures (netconn, protocol control blocks,
- * packet buffers, ...). All these pools are managed here.
- *
- * @defgroup mempool Memory pools
- * @ingroup infrastructure
- * Custom memory pools
-
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#include "net/memp.h"
-#include "net/sys.h"
-#include "net/stats.h"
-
-#include <string.h>
-
-/* Make sure we include everything we need for size calculation required by memp_std.h */
-#include "net/pbuf.h"
-#include "net/raw.h"
-#include "net/udp.h"
-#include "net/tcp.h"
-#include "net/priv/tcp_priv.h"
-#include "net/ip4_frag.h"
-#include "net/netbuf.h"
-#include "net/api.h"
-#include "net/priv/tcpip_priv.h"
-#include "net/priv/api_msg.h"
-#include "net/sockets.h"
-#include "net/netifapi.h"
-#include "net/etharp.h"
-#include "net/igmp.h"
-#include "net/timeouts.h"
-/* needed by default MEMP_NUM_SYS_TIMEOUT */
-#include "netif/ppp/ppp_opts.h"
-#include "net/netdb.h"
-#include "net/dns.h"
-#include "net/priv/nd6_priv.h"
-#include "net/ip6_frag.h"
-#include "net/mld6.h"
-
-#define LWIP_MEMPOOL(name,num,size,desc) LWIP_MEMPOOL_DECLARE(name,num,size,desc)
-#include "net/priv/memp_std.h"
-
-const struct memp_desc* const memp_pools[MEMP_MAX] = {
-#define LWIP_MEMPOOL(name,num,size,desc) &memp_ ## name,
-#include "net/priv/memp_std.h"
-};
-
-#ifdef LWIP_HOOK_FILENAME
-#include LWIP_HOOK_FILENAME
-#endif
-
-#if MEMP_MEM_MALLOC && MEMP_OVERFLOW_CHECK >= 2
-#undef MEMP_OVERFLOW_CHECK
-/* MEMP_OVERFLOW_CHECK >= 2 does not work with MEMP_MEM_MALLOC, use 1 instead */
-#define MEMP_OVERFLOW_CHECK 1
-#endif
-
-#if MEMP_SANITY_CHECK && !MEMP_MEM_MALLOC
-/**
- * Check that memp-lists don't form a circle, using "Floyd's cycle-finding algorithm".
- */
-static int
-memp_sanity(const struct memp_desc *desc)
-{
-  struct memp *t, *h;
-
-  t = *desc->tab;
-  if (t != NULL) {
-    for (h = t->next; (t != NULL) && (h != NULL); t = t->next,
-      h = ((h->next != NULL) ? h->next->next : NULL)) {
-      if (t == h) {
-        return 0;
-      }
-    }
-  }
-
-  return 1;
-}
-#endif /* MEMP_SANITY_CHECK && !MEMP_MEM_MALLOC */
-
-#if MEMP_OVERFLOW_CHECK
-/**
- * Check if a memp element was victim of an overflow
- * (e.g. the restricted area after it has been altered)
- *
- * @param p the memp element to check
- * @param desc the pool p comes from
- */
-static void
-memp_overflow_check_element_overflow(struct memp *p, const struct memp_desc *desc)
-{
-#if MEMP_SANITY_REGION_AFTER_ALIGNED > 0
-  u16_t k;
-  u8_t *m;
-  m = (u8_t*)p + MEMP_SIZE + desc->size;
-  for (k = 0; k < MEMP_SANITY_REGION_AFTER_ALIGNED; k++) {
-    if (m[k] != 0xcd) {
-      char errstr[128] = "detected memp overflow in pool ";
-      strcat(errstr, desc->desc);
-      LWIP_ASSERT(errstr, 0);
-    }
-  }
-#else /* MEMP_SANITY_REGION_AFTER_ALIGNED > 0 */
-  LWIP_UNUSED_ARG(p);
-  LWIP_UNUSED_ARG(desc);
-#endif /* MEMP_SANITY_REGION_AFTER_ALIGNED > 0 */
-}
-
-/**
- * Check if a memp element was victim of an underflow
- * (e.g. the restricted area before it has been altered)
- *
- * @param p the memp element to check
- * @param desc the pool p comes from
- */
-static void
-memp_overflow_check_element_underflow(struct memp *p, const struct memp_desc *desc)
-{
-#if MEMP_SANITY_REGION_BEFORE_ALIGNED > 0
-  u16_t k;
-  u8_t *m;
-  m = (u8_t*)p + MEMP_SIZE - MEMP_SANITY_REGION_BEFORE_ALIGNED;
-  for (k = 0; k < MEMP_SANITY_REGION_BEFORE_ALIGNED; k++) {
-    if (m[k] != 0xcd) {
-      char errstr[128] = "detected memp underflow in pool ";
-      strcat(errstr, desc->desc);
-      LWIP_ASSERT(errstr, 0);
-    }
-  }
-#else /* MEMP_SANITY_REGION_BEFORE_ALIGNED > 0 */
-  LWIP_UNUSED_ARG(p);
-  LWIP_UNUSED_ARG(desc);
-#endif /* MEMP_SANITY_REGION_BEFORE_ALIGNED > 0 */
-}
-
-/**
- * Initialize the restricted area of on memp element.
- */
-static void
-memp_overflow_init_element(struct memp *p, const struct memp_desc *desc)
-{
-#if MEMP_SANITY_REGION_BEFORE_ALIGNED > 0 || MEMP_SANITY_REGION_AFTER_ALIGNED > 0
-  u8_t *m;
-#if MEMP_SANITY_REGION_BEFORE_ALIGNED > 0
-  m = (u8_t*)p + MEMP_SIZE - MEMP_SANITY_REGION_BEFORE_ALIGNED;
-  memset(m, 0xcd, MEMP_SANITY_REGION_BEFORE_ALIGNED);
-#endif
-#if MEMP_SANITY_REGION_AFTER_ALIGNED > 0
-  m = (u8_t*)p + MEMP_SIZE + desc->size;
-  memset(m, 0xcd, MEMP_SANITY_REGION_AFTER_ALIGNED);
-#endif
-#else /* MEMP_SANITY_REGION_BEFORE_ALIGNED > 0 || MEMP_SANITY_REGION_AFTER_ALIGNED > 0 */
-  LWIP_UNUSED_ARG(p);
-  LWIP_UNUSED_ARG(desc);
-#endif /* MEMP_SANITY_REGION_BEFORE_ALIGNED > 0 || MEMP_SANITY_REGION_AFTER_ALIGNED > 0 */
-}
-
-#if MEMP_OVERFLOW_CHECK >= 2
-/**
- * Do an overflow check for all elements in every pool.
- *
- * @see memp_overflow_check_element for a description of the check
- */
-static void
-memp_overflow_check_all(void)
-{
-  u16_t i, j;
-  struct memp *p;
-  SYS_ARCH_DECL_PROTECT(old_level);
-  SYS_ARCH_PROTECT(old_level);
-
-  for (i = 0; i < MEMP_MAX; ++i) {
-    p = (struct memp*)LWIP_MEM_ALIGN(memp_pools[i]->base);
-    for (j = 0; j < memp_pools[i]->num; ++j) {
-      memp_overflow_check_element_overflow(p, memp_pools[i]);
-      memp_overflow_check_element_underflow(p, memp_pools[i]);
-      p = LWIP_ALIGNMENT_CAST(struct memp*, ((u8_t*)p + MEMP_SIZE + memp_pools[i]->size + MEMP_SANITY_REGION_AFTER_ALIGNED));
-    }
-  }
-  SYS_ARCH_UNPROTECT(old_level);
-}
-#endif /* MEMP_OVERFLOW_CHECK >= 2 */
-#endif /* MEMP_OVERFLOW_CHECK */
-
-/**
- * Initialize custom memory pool.
- * Related functions: memp_malloc_pool, memp_free_pool
- *
- * @param desc pool to initialize
- */
-void
-memp_init_pool(const struct memp_desc *desc)
-{
-#if MEMP_MEM_MALLOC
-  LWIP_UNUSED_ARG(desc);
-#else
-  int i;
-  struct memp *memp;
-
-  *desc->tab = NULL;
-  memp = (struct memp*)LWIP_MEM_ALIGN(desc->base);
-  /* create a linked list of memp elements */
-  for (i = 0; i < desc->num; ++i) {
-    memp->next = *desc->tab;
-    *desc->tab = memp;
-#if MEMP_OVERFLOW_CHECK
-    memp_overflow_init_element(memp, desc);
-#endif /* MEMP_OVERFLOW_CHECK */
-   /* cast through void* to get rid of alignment warnings */
-   memp = (struct memp *)(void *)((u8_t *)memp + MEMP_SIZE + desc->size
-#if MEMP_OVERFLOW_CHECK
-      + MEMP_SANITY_REGION_AFTER_ALIGNED
-#endif
-    );
-  }
-#if MEMP_STATS
-  desc->stats->avail = desc->num;
-#endif /* MEMP_STATS */
-#endif /* !MEMP_MEM_MALLOC */
-
-#if MEMP_STATS && (defined(LWIP_DEBUG) || LWIP_STATS_DISPLAY)
-  desc->stats->name  = desc->desc;
-#endif /* MEMP_STATS && (defined(LWIP_DEBUG) || LWIP_STATS_DISPLAY) */
-}
-
-/**
- * Initializes lwIP built-in pools.
- * Related functions: memp_malloc, memp_free
- *
- * Carves out memp_memory into linked lists for each pool-type.
- */
-void
-memp_init(void)
-{
-  u16_t i;
-
-  /* for every pool: */
-  for (i = 0; i < LWIP_ARRAYSIZE(memp_pools); i++) {
-    memp_init_pool(memp_pools[i]);
-
-#if LWIP_STATS && MEMP_STATS
-    lwip_stats.memp[i] = memp_pools[i]->stats;
-#endif
-  }
-
-#if MEMP_OVERFLOW_CHECK >= 2
-  /* check everything a first time to see if it worked */
-  memp_overflow_check_all();
-#endif /* MEMP_OVERFLOW_CHECK >= 2 */
-}
-
-static void*
-#if !MEMP_OVERFLOW_CHECK
-do_memp_malloc_pool(const struct memp_desc *desc)
-#else
-do_memp_malloc_pool_fn(const struct memp_desc *desc, const char* file, const int line)
-#endif
-{
-  struct memp *memp;
-  SYS_ARCH_DECL_PROTECT(old_level);
-
-#if MEMP_MEM_MALLOC
-  memp = (struct memp *)mem_malloc(MEMP_SIZE + MEMP_ALIGN_SIZE(desc->size));
-  SYS_ARCH_PROTECT(old_level);
-#else /* MEMP_MEM_MALLOC */
-  SYS_ARCH_PROTECT(old_level);
-
-  memp = *desc->tab;
-#endif /* MEMP_MEM_MALLOC */
-
-  if (memp != NULL) {
-#if !MEMP_MEM_MALLOC
-#if MEMP_OVERFLOW_CHECK == 1
-    memp_overflow_check_element_overflow(memp, desc);
-    memp_overflow_check_element_underflow(memp, desc);
-#endif /* MEMP_OVERFLOW_CHECK */
-
-    *desc->tab = memp->next;
-#if MEMP_OVERFLOW_CHECK
-    memp->next = NULL;
-#endif /* MEMP_OVERFLOW_CHECK */
-#endif /* !MEMP_MEM_MALLOC */
-#if MEMP_OVERFLOW_CHECK
-    memp->file = file;
-    memp->line = line;
-#if MEMP_MEM_MALLOC
-    memp_overflow_init_element(memp, desc);
-#endif /* MEMP_MEM_MALLOC */
-#endif /* MEMP_OVERFLOW_CHECK */
-    LWIP_ASSERT("memp_malloc: memp properly aligned",
-                ((mem_ptr_t)memp % MEM_ALIGNMENT) == 0);
-#if MEMP_STATS
-    desc->stats->used++;
-    if (desc->stats->used > desc->stats->max) {
-      desc->stats->max = desc->stats->used;
-    }
-#endif
-    SYS_ARCH_UNPROTECT(old_level);
-    /* cast through u8_t* to get rid of alignment warnings */
-    return ((u8_t*)memp + MEMP_SIZE);
-  } else {
-    LWIP_DEBUGF(MEMP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("memp_malloc: out of memory in pool %s\n", desc->desc));
-#if MEMP_STATS
-    desc->stats->err++;
-#endif
-  }
-
-  SYS_ARCH_UNPROTECT(old_level);
-  return NULL;
-}
-
-/**
- * Get an element from a custom pool.
- *
- * @param desc the pool to get an element from
- *
- * @return a pointer to the allocated memory or a NULL pointer on error
- */
-void *
-#if !MEMP_OVERFLOW_CHECK
-memp_malloc_pool(const struct memp_desc *desc)
-#else
-memp_malloc_pool_fn(const struct memp_desc *desc, const char* file, const int line)
-#endif
-{
-  LWIP_ASSERT("invalid pool desc", desc != NULL);
-  if (desc == NULL) {
-    return NULL;
-  }
-
-#if !MEMP_OVERFLOW_CHECK
-  return do_memp_malloc_pool(desc);
-#else
-  return do_memp_malloc_pool_fn(desc, file, line);
-#endif
-}
-
-/**
- * Get an element from a specific pool.
- *
- * @param type the pool to get an element from
- *
- * @return a pointer to the allocated memory or a NULL pointer on error
- */
-void *
-#if !MEMP_OVERFLOW_CHECK
-memp_malloc(memp_t type)
-#else
-memp_malloc_fn(memp_t type, const char* file, const int line)
-#endif
-{
-  void *memp;
-  LWIP_ERROR("memp_malloc: type < MEMP_MAX", (type < MEMP_MAX), return NULL;);
-
-#if MEMP_OVERFLOW_CHECK >= 2
-  memp_overflow_check_all();
-#endif /* MEMP_OVERFLOW_CHECK >= 2 */
-
-#if !MEMP_OVERFLOW_CHECK
-  memp = do_memp_malloc_pool(memp_pools[type]);
-#else
-  memp = do_memp_malloc_pool_fn(memp_pools[type], file, line);
-#endif
-
-  return memp;
-}
-
-static void
-do_memp_free_pool(const struct memp_desc* desc, void *mem)
-{
-  struct memp *memp;
-  SYS_ARCH_DECL_PROTECT(old_level);
-
-  LWIP_ASSERT("memp_free: mem properly aligned",
-                ((mem_ptr_t)mem % MEM_ALIGNMENT) == 0);
-
-  /* cast through void* to get rid of alignment warnings */
-  memp = (struct memp *)(void *)((u8_t*)mem - MEMP_SIZE);
-
-  SYS_ARCH_PROTECT(old_level);
-
-#if MEMP_OVERFLOW_CHECK == 1
-  memp_overflow_check_element_overflow(memp, desc);
-  memp_overflow_check_element_underflow(memp, desc);
-#endif /* MEMP_OVERFLOW_CHECK */
-
-#if MEMP_STATS
-  desc->stats->used--;
-#endif
-
-#if MEMP_MEM_MALLOC
-  LWIP_UNUSED_ARG(desc);
-  SYS_ARCH_UNPROTECT(old_level);
-  mem_free(memp);
-#else /* MEMP_MEM_MALLOC */
-  memp->next = *desc->tab;
-  *desc->tab = memp;
-
-#if MEMP_SANITY_CHECK
-  LWIP_ASSERT("memp sanity", memp_sanity(desc));
-#endif /* MEMP_SANITY_CHECK */
-
-  SYS_ARCH_UNPROTECT(old_level);
-#endif /* !MEMP_MEM_MALLOC */
-}
-
-/**
- * Put a custom pool element back into its pool.
- *
- * @param desc the pool where to put mem
- * @param mem the memp element to free
- */
-void
-memp_free_pool(const struct memp_desc* desc, void *mem)
-{
-  LWIP_ASSERT("invalid pool desc", desc != NULL);
-  if ((desc == NULL) || (mem == NULL)) {
-    return;
-  }
-
-  do_memp_free_pool(desc, mem);
-}
-
-/**
- * Put an element back into its pool.
- *
- * @param type the pool where to put mem
- * @param mem the memp element to free
- */
-void
-memp_free(memp_t type, void *mem)
-{
-#ifdef LWIP_HOOK_MEMP_AVAILABLE
-  struct memp *old_first;
-#endif
-
-  LWIP_ERROR("memp_free: type < MEMP_MAX", (type < MEMP_MAX), return;);
-
-  if (mem == NULL) {
-    return;
-  }
-
-#if MEMP_OVERFLOW_CHECK >= 2
-  memp_overflow_check_all();
-#endif /* MEMP_OVERFLOW_CHECK >= 2 */
-
-#ifdef LWIP_HOOK_MEMP_AVAILABLE
-  old_first = *memp_pools[type]->tab;
-#endif
-
-  do_memp_free_pool(memp_pools[type], mem);
-
-#ifdef LWIP_HOOK_MEMP_AVAILABLE
-  if (old_first == NULL) {
-    LWIP_HOOK_MEMP_AVAILABLE(type);
-  }
-#endif
-}
diff --git a/sys/net/core/netif.c b/sys/net/core/netif.c
deleted file mode 100644
index 1fa48a2..0000000
--- a/sys/net/core/netif.c
+++ /dev/null
@@ -1,1267 +0,0 @@
-/**
- * @file
- * lwIP network interface abstraction
- * 
- * @defgroup netif Network interface (NETIF)
- * @ingroup callbackstyle_api
- * 
- * @defgroup netif_ip4 IPv4 address handling
- * @ingroup netif
- * 
- * @defgroup netif_ip6 IPv6 address handling
- * @ingroup netif
- * 
- * @defgroup netif_cd Client data handling
- * Store data (void*) on a netif for application usage.
- * @see @ref LWIP_NUM_NETIF_CLIENT_DATA
- * @ingroup netif
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- */
-
-#include "net/opt.h"
-
-#include <string.h>
-
-#include "net/def.h"
-#include "net/ip_addr.h"
-#include "net/ip6_addr.h"
-#include "net/netif.h"
-#include "net/priv/tcp_priv.h"
-#include "net/udp.h"
-#include "net/raw.h"
-#include "net/snmp.h"
-#include "net/igmp.h"
-#include "net/etharp.h"
-#include "net/stats.h"
-#include "net/sys.h"
-#include "net/ip.h"
-#if ENABLE_LOOPBACK
-#if LWIP_NETIF_LOOPBACK_MULTITHREADING
-#include "net/tcpip.h"
-#endif /* LWIP_NETIF_LOOPBACK_MULTITHREADING */
-#endif /* ENABLE_LOOPBACK */
-
-#include "netif/ethernet.h"
-
-#if LWIP_AUTOIP
-#include "net/autoip.h"
-#endif /* LWIP_AUTOIP */
-#if LWIP_DHCP
-#include "net/dhcp.h"
-#endif /* LWIP_DHCP */
-#if LWIP_IPV6_DHCP6
-#include "net/dhcp6.h"
-#endif /* LWIP_IPV6_DHCP6 */
-#if LWIP_IPV6_MLD
-#include "net/mld6.h"
-#endif /* LWIP_IPV6_MLD */
-#if LWIP_IPV6
-#include "net/nd6.h"
-#endif
-
-#if LWIP_NETIF_STATUS_CALLBACK
-#define NETIF_STATUS_CALLBACK(n) do{ if (n->status_callback) { (n->status_callback)(n); }}while(0)
-#else
-#define NETIF_STATUS_CALLBACK(n)
-#endif /* LWIP_NETIF_STATUS_CALLBACK */
-
-#if LWIP_NETIF_LINK_CALLBACK
-#define NETIF_LINK_CALLBACK(n) do{ if (n->link_callback) { (n->link_callback)(n); }}while(0)
-#else
-#define NETIF_LINK_CALLBACK(n)
-#endif /* LWIP_NETIF_LINK_CALLBACK */
-
-struct netif *netif_list;
-struct netif *netif_default;
-
-static u8_t netif_num;
-
-#if LWIP_NUM_NETIF_CLIENT_DATA > 0
-static u8_t netif_client_id;
-#endif
-
-#define NETIF_REPORT_TYPE_IPV4  0x01
-#define NETIF_REPORT_TYPE_IPV6  0x02
-static void netif_issue_reports(struct netif* netif, u8_t report_type);
-
-#if LWIP_IPV6
-static err_t netif_null_output_ip6(struct netif *netif, struct pbuf *p, const ip6_addr_t *ipaddr);
-#endif /* LWIP_IPV6 */
-
-#if LWIP_HAVE_LOOPIF
-#if LWIP_IPV4
-static err_t netif_loop_output_ipv4(struct netif *netif, struct pbuf *p, const ip4_addr_t* addr);
-#endif
-#if LWIP_IPV6
-static err_t netif_loop_output_ipv6(struct netif *netif, struct pbuf *p, const ip6_addr_t* addr);
-#endif
-
-
-static struct netif loop_netif;
-
-/**
- * Initialize a lwip network interface structure for a loopback interface
- *
- * @param netif the lwip network interface structure for this loopif
- * @return ERR_OK if the loopif is initialized
- *         ERR_MEM if private data couldn't be allocated
- */
-static err_t
-netif_loopif_init(struct netif *netif)
-{
-  /* initialize the snmp variables and counters inside the struct netif
-   * ifSpeed: no assumption can be made!
-   */
-  MIB2_INIT_NETIF(netif, snmp_ifType_softwareLoopback, 0);
-
-  netif->name[0] = 'l';
-  netif->name[1] = 'o';
-#if LWIP_IPV4
-  netif->output = netif_loop_output_ipv4;
-#endif
-#if LWIP_IPV6
-  netif->output_ip6 = netif_loop_output_ipv6;
-#endif
-#if LWIP_LOOPIF_MULTICAST
-  netif->flags |= NETIF_FLAG_IGMP;
-#endif
-  return ERR_OK;
-}
-#endif /* LWIP_HAVE_LOOPIF */
-
-void
-netif_init(void)
-{
-#if LWIP_HAVE_LOOPIF
-#if LWIP_IPV4
-#define LOOPIF_ADDRINIT &loop_ipaddr, &loop_netmask, &loop_gw,
-  ip4_addr_t loop_ipaddr, loop_netmask, loop_gw;
-  IP4_ADDR(&loop_gw, 127,0,0,1);
-  IP4_ADDR(&loop_ipaddr, 127,0,0,1);
-  IP4_ADDR(&loop_netmask, 255,0,0,0);
-#else /* LWIP_IPV4 */
-#define LOOPIF_ADDRINIT
-#endif /* LWIP_IPV4 */
-
-#if NO_SYS
-  netif_add(&loop_netif, LOOPIF_ADDRINIT NULL, netif_loopif_init, ip_input);
-#else  /* NO_SYS */
-  netif_add(&loop_netif, LOOPIF_ADDRINIT NULL, netif_loopif_init, tcpip_input);
-#endif /* NO_SYS */
-
-#if LWIP_IPV6
-  IP_ADDR6_HOST(loop_netif.ip6_addr, 0, 0, 0, 0x00000001UL);
-  loop_netif.ip6_addr_state[0] = IP6_ADDR_VALID;
-#endif /* LWIP_IPV6 */
-
-  netif_set_link_up(&loop_netif);
-  netif_set_up(&loop_netif);
-
-#endif /* LWIP_HAVE_LOOPIF */
-}
-
-/**
- * @ingroup lwip_nosys
- * Forwards a received packet for input processing with
- * ethernet_input() or ip_input() depending on netif flags.
- * Don't call directly, pass to netif_add() and call
- * netif->input().
- * Only works if the netif driver correctly sets 
- * NETIF_FLAG_ETHARP and/or NETIF_FLAG_ETHERNET flag!
- */
-err_t
-netif_input(struct pbuf *p, struct netif *inp)
-{
-#if LWIP_ETHERNET
-  if (inp->flags & (NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET)) {
-    return ethernet_input(p, inp);
-  } else
-#endif /* LWIP_ETHERNET */
-  return ip_input(p, inp);
-}
-
-/**
- * @ingroup netif
- * Add a network interface to the list of lwIP netifs.
- *
- * @param netif a pre-allocated netif structure
- * @param ipaddr IP address for the new netif
- * @param netmask network mask for the new netif
- * @param gw default gateway IP address for the new netif
- * @param state opaque data passed to the new netif
- * @param init callback function that initializes the interface
- * @param input callback function that is called to pass
- * ingress packets up in the protocol layer stack.\n
- * It is recommended to use a function that passes the input directly
- * to the stack (netif_input(), NO_SYS=1 mode) or via sending a
- * message to TCPIP thread (tcpip_input(), NO_SYS=0 mode).\n
- * These functions use netif flags NETIF_FLAG_ETHARP and NETIF_FLAG_ETHERNET
- * to decide whether to forward to ethernet_input() or ip_input().
- * In other words, the functions only work when the netif
- * driver is implemented correctly!\n
- * Most members of struct netif should be be initialized by the 
- * netif init function = netif driver (init parameter of this function).\n
- * IPv6: Don't forget to call netif_create_ip6_linklocal_address() after
- * setting the MAC address in struct netif.hwaddr
- * (IPv6 requires a link-local address).
- * 
- * @return netif, or NULL if failed.
- */
-struct netif *
-netif_add(struct netif *netif,
-#if LWIP_IPV4
-          const ip4_addr_t *ipaddr, const ip4_addr_t *netmask, const ip4_addr_t *gw,
-#endif /* LWIP_IPV4 */
-          void *state, netif_init_fn init, netif_input_fn input)
-{
-#if LWIP_IPV6
-  s8_t i;
-#endif
-
-  LWIP_ASSERT("No init function given", init != NULL);
-
-  /* reset new interface configuration state */
-#if LWIP_IPV4
-  ip_addr_set_zero_ip4(&netif->ip_addr);
-  ip_addr_set_zero_ip4(&netif->netmask);
-  ip_addr_set_zero_ip4(&netif->gw);
-#endif /* LWIP_IPV4 */
-#if LWIP_IPV6
-  for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-    ip_addr_set_zero_ip6(&netif->ip6_addr[i]);
-    netif->ip6_addr_state[i] = IP6_ADDR_INVALID;
-  }
-  netif->output_ip6 = netif_null_output_ip6;
-#endif /* LWIP_IPV6 */
-  NETIF_SET_CHECKSUM_CTRL(netif, NETIF_CHECKSUM_ENABLE_ALL);
-  netif->flags = 0;
-#ifdef netif_get_client_data
-  memset(netif->client_data, 0, sizeof(netif->client_data));
-#endif /* LWIP_NUM_NETIF_CLIENT_DATA */
-#if LWIP_IPV6_AUTOCONFIG
-  /* IPv6 address autoconfiguration not enabled by default */
-  netif->ip6_autoconfig_enabled = 0;
-#endif /* LWIP_IPV6_AUTOCONFIG */
-#if LWIP_IPV6_SEND_ROUTER_SOLICIT
-  netif->rs_count = LWIP_ND6_MAX_MULTICAST_SOLICIT;
-#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
-#if LWIP_NETIF_STATUS_CALLBACK
-  netif->status_callback = NULL;
-#endif /* LWIP_NETIF_STATUS_CALLBACK */
-#if LWIP_NETIF_LINK_CALLBACK
-  netif->link_callback = NULL;
-#endif /* LWIP_NETIF_LINK_CALLBACK */
-#if LWIP_IGMP
-  netif->igmp_mac_filter = NULL;
-#endif /* LWIP_IGMP */
-#if LWIP_IPV6 && LWIP_IPV6_MLD
-  netif->mld_mac_filter = NULL;
-#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
-#if ENABLE_LOOPBACK
-  netif->loop_first = NULL;
-  netif->loop_last = NULL;
-#endif /* ENABLE_LOOPBACK */
-
-  /* remember netif specific state information data */
-  netif->state = state;
-  netif->num = netif_num++;
-  netif->input = input;
-
-  NETIF_SET_HWADDRHINT(netif, NULL);
-#if ENABLE_LOOPBACK && LWIP_LOOPBACK_MAX_PBUFS
-  netif->loop_cnt_current = 0;
-#endif /* ENABLE_LOOPBACK && LWIP_LOOPBACK_MAX_PBUFS */
-
-#if LWIP_IPV4
-  netif_set_addr(netif, ipaddr, netmask, gw);
-#endif /* LWIP_IPV4 */
-
-  /* call user specified initialization function for netif */
-  if (init(netif) != ERR_OK) {
-    return NULL;
-  }
-
-  /* add this netif to the list */
-  netif->next = netif_list;
-  netif_list = netif;
-  mib2_netif_added(netif);
-
-#if LWIP_IGMP
-  /* start IGMP processing */
-  if (netif->flags & NETIF_FLAG_IGMP) {
-    igmp_start(netif);
-  }
-#endif /* LWIP_IGMP */
-
-  LWIP_DEBUGF(NETIF_DEBUG, ("netif: added interface %c%c IP",
-    netif->name[0], netif->name[1]));
-#if LWIP_IPV4
-  LWIP_DEBUGF(NETIF_DEBUG, (" addr "));
-  ip4_addr_debug_print(NETIF_DEBUG, ipaddr);
-  LWIP_DEBUGF(NETIF_DEBUG, (" netmask "));
-  ip4_addr_debug_print(NETIF_DEBUG, netmask);
-  LWIP_DEBUGF(NETIF_DEBUG, (" gw "));
-  ip4_addr_debug_print(NETIF_DEBUG, gw);
-#endif /* LWIP_IPV4 */
-  LWIP_DEBUGF(NETIF_DEBUG, ("\n"));
-  return netif;
-}
-
-#if LWIP_IPV4
-/**
- * @ingroup netif_ip4
- * Change IP address configuration for a network interface (including netmask
- * and default gateway).
- *
- * @param netif the network interface to change
- * @param ipaddr the new IP address
- * @param netmask the new netmask
- * @param gw the new default gateway
- */
-void
-netif_set_addr(struct netif *netif, const ip4_addr_t *ipaddr, const ip4_addr_t *netmask,
-    const ip4_addr_t *gw)
-{
-  if (ip4_addr_isany(ipaddr)) {
-    /* when removing an address, we have to remove it *before* changing netmask/gw
-       to ensure that tcp RST segment can be sent correctly */
-    netif_set_ipaddr(netif, ipaddr);
-    netif_set_netmask(netif, netmask);
-    netif_set_gw(netif, gw);
-  } else {
-    netif_set_netmask(netif, netmask);
-    netif_set_gw(netif, gw);
-    /* set ipaddr last to ensure netmask/gw have been set when status callback is called */
-    netif_set_ipaddr(netif, ipaddr);
-  }
-}
-#endif /* LWIP_IPV4*/
-
-/**
- * @ingroup netif
- * Remove a network interface from the list of lwIP netifs.
- *
- * @param netif the network interface to remove
- */
-void
-netif_remove(struct netif *netif)
-{
-#if LWIP_IPV6
-  int i;
-#endif
-
-  if (netif == NULL) {
-    return;
-  }
-
-#if LWIP_IPV4
-  if (!ip4_addr_isany_val(*netif_ip4_addr(netif))) {
-#if LWIP_TCP
-    tcp_netif_ip_addr_changed(netif_ip_addr4(netif), NULL);
-#endif /* LWIP_TCP */
-#if LWIP_UDP
-    udp_netif_ip_addr_changed(netif_ip_addr4(netif), NULL);
-#endif /* LWIP_UDP */
-#if LWIP_RAW
-    raw_netif_ip_addr_changed(netif_ip_addr4(netif), NULL);
-#endif /* LWIP_RAW */
-  }
-
-#if LWIP_IGMP
-  /* stop IGMP processing */
-  if (netif->flags & NETIF_FLAG_IGMP) {
-    igmp_stop(netif);
-  }
-#endif /* LWIP_IGMP */
-#endif /* LWIP_IPV4*/
-
-#if LWIP_IPV6
-  for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-    if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i))) {
-#if LWIP_TCP
-      tcp_netif_ip_addr_changed(netif_ip_addr6(netif, i), NULL);
-#endif /* LWIP_TCP */
-#if LWIP_UDP
-      udp_netif_ip_addr_changed(netif_ip_addr6(netif, i), NULL);
-#endif /* LWIP_UDP */
-#if LWIP_RAW
-      raw_netif_ip_addr_changed(netif_ip_addr6(netif, i), NULL);
-#endif /* LWIP_RAW */
-    }
-  }
-#if LWIP_IPV6_MLD
-  /* stop MLD processing */
-  mld6_stop(netif);
-#endif /* LWIP_IPV6_MLD */
-#endif /* LWIP_IPV6 */
-  if (netif_is_up(netif)) {
-    /* set netif down before removing (call callback function) */
-    netif_set_down(netif);
-  }
-
-  mib2_remove_ip4(netif);
-
-  /* this netif is default? */
-  if (netif_default == netif) {
-    /* reset default netif */
-    netif_set_default(NULL);
-  }
-  /*  is it the first netif? */
-  if (netif_list == netif) {
-    netif_list = netif->next;
-  } else {
-    /*  look for netif further down the list */
-    struct netif * tmp_netif;
-    for (tmp_netif = netif_list; tmp_netif != NULL; tmp_netif = tmp_netif->next) {
-      if (tmp_netif->next == netif) {
-        tmp_netif->next = netif->next;
-        break;
-      }
-    }
-    if (tmp_netif == NULL) {
-      return; /* netif is not on the list */
-    }
-  }
-  mib2_netif_removed(netif);
-#if LWIP_NETIF_REMOVE_CALLBACK
-  if (netif->remove_callback) {
-    netif->remove_callback(netif);
-  }
-#endif /* LWIP_NETIF_REMOVE_CALLBACK */
-  LWIP_DEBUGF( NETIF_DEBUG, ("netif_remove: removed netif\n") );
-}
-
-/**
- * @ingroup netif
- * Find a network interface by searching for its name
- *
- * @param name the name of the netif (like netif->name) plus concatenated number
- * in ascii representation (e.g. 'en0')
- */
-struct netif *
-netif_find(const char *name)
-{
-  struct netif *netif;
-  u8_t num;
-
-  if (name == NULL) {
-    return NULL;
-  }
-
-  num = (u8_t)(name[2] - '0');
-
-  for (netif = netif_list; netif != NULL; netif = netif->next) {
-    if (num == netif->num &&
-       name[0] == netif->name[0] &&
-       name[1] == netif->name[1]) {
-      LWIP_DEBUGF(NETIF_DEBUG, ("netif_find: found %c%c\n", name[0], name[1]));
-      return netif;
-    }
-  }
-  LWIP_DEBUGF(NETIF_DEBUG, ("netif_find: didn't find %c%c\n", name[0], name[1]));
-  return NULL;
-}
-
-#if LWIP_IPV4
-/**
- * @ingroup netif_ip4
- * Change the IP address of a network interface
- *
- * @param netif the network interface to change
- * @param ipaddr the new IP address
- *
- * @note call netif_set_addr() if you also want to change netmask and
- * default gateway
- */
-void
-netif_set_ipaddr(struct netif *netif, const ip4_addr_t *ipaddr)
-{
-  ip_addr_t new_addr;
-  *ip_2_ip4(&new_addr) = (ipaddr ? *ipaddr : *IP4_ADDR_ANY4);
-  IP_SET_TYPE_VAL(new_addr, IPADDR_TYPE_V4);
-
-  /* address is actually being changed? */
-  if (ip4_addr_cmp(ip_2_ip4(&new_addr), netif_ip4_addr(netif)) == 0) {
-    LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_STATE, ("netif_set_ipaddr: netif address being changed\n"));
-#if LWIP_TCP
-    tcp_netif_ip_addr_changed(netif_ip_addr4(netif), &new_addr);
-#endif /* LWIP_TCP */
-#if LWIP_UDP
-    udp_netif_ip_addr_changed(netif_ip_addr4(netif), &new_addr);
-#endif /* LWIP_UDP */
-#if LWIP_RAW
-    raw_netif_ip_addr_changed(netif_ip_addr4(netif), &new_addr);
-#endif /* LWIP_RAW */
-
-    mib2_remove_ip4(netif);
-    mib2_remove_route_ip4(0, netif);
-    /* set new IP address to netif */
-    ip4_addr_set(ip_2_ip4(&netif->ip_addr), ipaddr);
-    IP_SET_TYPE_VAL(netif->ip_addr, IPADDR_TYPE_V4);
-    mib2_add_ip4(netif);
-    mib2_add_route_ip4(0, netif);
-
-    netif_issue_reports(netif, NETIF_REPORT_TYPE_IPV4);
-
-    NETIF_STATUS_CALLBACK(netif);
-  }
-
-  LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: IP address of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-    netif->name[0], netif->name[1],
-    ip4_addr1_16(netif_ip4_addr(netif)),
-    ip4_addr2_16(netif_ip4_addr(netif)),
-    ip4_addr3_16(netif_ip4_addr(netif)),
-    ip4_addr4_16(netif_ip4_addr(netif))));
-}
-
-/**
- * @ingroup netif_ip4
- * Change the default gateway for a network interface
- *
- * @param netif the network interface to change
- * @param gw the new default gateway
- *
- * @note call netif_set_addr() if you also want to change ip address and netmask
- */
-void
-netif_set_gw(struct netif *netif, const ip4_addr_t *gw)
-{
-  ip4_addr_set(ip_2_ip4(&netif->gw), gw);
-  IP_SET_TYPE_VAL(netif->gw, IPADDR_TYPE_V4);
-  LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: GW address of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-    netif->name[0], netif->name[1],
-    ip4_addr1_16(netif_ip4_gw(netif)),
-    ip4_addr2_16(netif_ip4_gw(netif)),
-    ip4_addr3_16(netif_ip4_gw(netif)),
-    ip4_addr4_16(netif_ip4_gw(netif))));
-}
-
-/**
- * @ingroup netif_ip4
- * Change the netmask of a network interface
- *
- * @param netif the network interface to change
- * @param netmask the new netmask
- *
- * @note call netif_set_addr() if you also want to change ip address and
- * default gateway
- */
-void
-netif_set_netmask(struct netif *netif, const ip4_addr_t *netmask)
-{
-  mib2_remove_route_ip4(0, netif);
-  /* set new netmask to netif */
-  ip4_addr_set(ip_2_ip4(&netif->netmask), netmask);
-  IP_SET_TYPE_VAL(netif->netmask, IPADDR_TYPE_V4);
-  mib2_add_route_ip4(0, netif);
-  LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: netmask of interface %c%c set to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
-    netif->name[0], netif->name[1],
-    ip4_addr1_16(netif_ip4_netmask(netif)),
-    ip4_addr2_16(netif_ip4_netmask(netif)),
-    ip4_addr3_16(netif_ip4_netmask(netif)),
-    ip4_addr4_16(netif_ip4_netmask(netif))));
-}
-#endif /* LWIP_IPV4 */
-
-/**
- * @ingroup netif
- * Set a network interface as the default network interface
- * (used to output all packets for which no specific route is found)
- *
- * @param netif the default network interface
- */
-void
-netif_set_default(struct netif *netif)
-{
-  if (netif == NULL) {
-    /* remove default route */
-    mib2_remove_route_ip4(1, netif);
-  } else {
-    /* install default route */
-    mib2_add_route_ip4(1, netif);
-  }
-  netif_default = netif;
-  LWIP_DEBUGF(NETIF_DEBUG, ("netif: setting default interface %c%c\n",
-           netif ? netif->name[0] : '\'', netif ? netif->name[1] : '\''));
-}
-
-/**
- * @ingroup netif
- * Bring an interface up, available for processing
- * traffic.
- */
-void
-netif_set_up(struct netif *netif)
-{
-  if (!(netif->flags & NETIF_FLAG_UP)) {
-    netif->flags |= NETIF_FLAG_UP;
-
-    MIB2_COPY_SYSUPTIME_TO(&netif->ts);
-
-    NETIF_STATUS_CALLBACK(netif);
-
-    if (netif->flags & NETIF_FLAG_LINK_UP) {
-      netif_issue_reports(netif, NETIF_REPORT_TYPE_IPV4|NETIF_REPORT_TYPE_IPV6);
-    }
-  }
-}
-
-/** Send ARP/IGMP/MLD/RS events, e.g. on link-up/netif-up or addr-change
- */
-static void
-netif_issue_reports(struct netif* netif, u8_t report_type)
-{
-#if LWIP_IPV4
-  if ((report_type & NETIF_REPORT_TYPE_IPV4) &&
-      !ip4_addr_isany_val(*netif_ip4_addr(netif))) {
-#if LWIP_ARP
-    /* For Ethernet network interfaces, we would like to send a "gratuitous ARP" */
-    if (netif->flags & (NETIF_FLAG_ETHARP)) {
-      etharp_gratuitous(netif);
-    }
-#endif /* LWIP_ARP */
-
-#if LWIP_IGMP
-    /* resend IGMP memberships */
-    if (netif->flags & NETIF_FLAG_IGMP) {
-      igmp_report_groups(netif);
-    }
-#endif /* LWIP_IGMP */
-  }
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-  if (report_type & NETIF_REPORT_TYPE_IPV6) {
-#if LWIP_IPV6_MLD
-    /* send mld memberships */
-    mld6_report_groups(netif);
-#endif /* LWIP_IPV6_MLD */
-#if LWIP_IPV6_SEND_ROUTER_SOLICIT
-    /* Send Router Solicitation messages. */
-    netif->rs_count = LWIP_ND6_MAX_MULTICAST_SOLICIT;
-#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
-  }
-#endif /* LWIP_IPV6 */
-}
-
-/**
- * @ingroup netif
- * Bring an interface down, disabling any traffic processing.
- */
-void
-netif_set_down(struct netif *netif)
-{
-  if (netif->flags & NETIF_FLAG_UP) {
-    netif->flags &= ~NETIF_FLAG_UP;
-    MIB2_COPY_SYSUPTIME_TO(&netif->ts);
-
-#if LWIP_IPV4 && LWIP_ARP
-    if (netif->flags & NETIF_FLAG_ETHARP) {
-      etharp_cleanup_netif(netif);
-    }
-#endif /* LWIP_IPV4 && LWIP_ARP */
-
-#if LWIP_IPV6
-    nd6_cleanup_netif(netif);
-#endif /* LWIP_IPV6 */
-
-    NETIF_STATUS_CALLBACK(netif);
-  }
-}
-
-#if LWIP_NETIF_STATUS_CALLBACK
-/**
- * @ingroup netif
- * Set callback to be called when interface is brought up/down or address is changed while up
- */
-void
-netif_set_status_callback(struct netif *netif, netif_status_callback_fn status_callback)
-{
-  if (netif) {
-    netif->status_callback = status_callback;
-  }
-}
-#endif /* LWIP_NETIF_STATUS_CALLBACK */
-
-#if LWIP_NETIF_REMOVE_CALLBACK
-/**
- * @ingroup netif
- * Set callback to be called when the interface has been removed
- */
-void
-netif_set_remove_callback(struct netif *netif, netif_status_callback_fn remove_callback)
-{
-  if (netif) {
-    netif->remove_callback = remove_callback;
-  }
-}
-#endif /* LWIP_NETIF_REMOVE_CALLBACK */
-
-/**
- * @ingroup netif
- * Called by a driver when its link goes up
- */
-void
-netif_set_link_up(struct netif *netif)
-{
-  if (!(netif->flags & NETIF_FLAG_LINK_UP)) {
-    netif->flags |= NETIF_FLAG_LINK_UP;
-
-#if LWIP_DHCP
-    dhcp_network_changed(netif);
-#endif /* LWIP_DHCP */
-
-#if LWIP_AUTOIP
-    autoip_network_changed(netif);
-#endif /* LWIP_AUTOIP */
-
-    if (netif->flags & NETIF_FLAG_UP) {
-      netif_issue_reports(netif, NETIF_REPORT_TYPE_IPV4|NETIF_REPORT_TYPE_IPV6);
-    }
-    NETIF_LINK_CALLBACK(netif);
-  }
-}
-
-/**
- * @ingroup netif
- * Called by a driver when its link goes down
- */
-void
-netif_set_link_down(struct netif *netif )
-{
-  if (netif->flags & NETIF_FLAG_LINK_UP) {
-    netif->flags &= ~NETIF_FLAG_LINK_UP;
-    NETIF_LINK_CALLBACK(netif);
-  }
-}
-
-#if LWIP_NETIF_LINK_CALLBACK
-/**
- * @ingroup netif
- * Set callback to be called when link is brought up/down
- */
-void
-netif_set_link_callback(struct netif *netif, netif_status_callback_fn link_callback)
-{
-  if (netif) {
-    netif->link_callback = link_callback;
-  }
-}
-#endif /* LWIP_NETIF_LINK_CALLBACK */
-
-#if ENABLE_LOOPBACK
-/**
- * @ingroup netif
- * Send an IP packet to be received on the same netif (loopif-like).
- * The pbuf is simply copied and handed back to netif->input.
- * In multithreaded mode, this is done directly since netif->input must put
- * the packet on a queue.
- * In callback mode, the packet is put on an internal queue and is fed to
- * netif->input by netif_poll().
- *
- * @param netif the lwip network interface structure
- * @param p the (IP) packet to 'send'
- * @return ERR_OK if the packet has been sent
- *         ERR_MEM if the pbuf used to copy the packet couldn't be allocated
- */
-err_t
-netif_loop_output(struct netif *netif, struct pbuf *p)
-{
-  struct pbuf *r;
-  err_t err;
-  struct pbuf *last;
-#if LWIP_LOOPBACK_MAX_PBUFS
-  u16_t clen = 0;
-#endif /* LWIP_LOOPBACK_MAX_PBUFS */
-  /* If we have a loopif, SNMP counters are adjusted for it,
-   * if not they are adjusted for 'netif'. */
-#if MIB2_STATS
-#if LWIP_HAVE_LOOPIF
-  struct netif *stats_if = &loop_netif;
-#else /* LWIP_HAVE_LOOPIF */
-  struct netif *stats_if = netif;
-#endif /* LWIP_HAVE_LOOPIF */
-#endif /* MIB2_STATS */
-  SYS_ARCH_DECL_PROTECT(lev);
-
-  /* Allocate a new pbuf */
-  r = pbuf_alloc(PBUF_LINK, p->tot_len, PBUF_RAM);
-  if (r == NULL) {
-    LINK_STATS_INC(link.memerr);
-    LINK_STATS_INC(link.drop);
-    MIB2_STATS_NETIF_INC(stats_if, ifoutdiscards);
-    return ERR_MEM;
-  }
-#if LWIP_LOOPBACK_MAX_PBUFS
-  clen = pbuf_clen(r);
-  /* check for overflow or too many pbuf on queue */
-  if (((netif->loop_cnt_current + clen) < netif->loop_cnt_current) ||
-     ((netif->loop_cnt_current + clen) > LWIP_LOOPBACK_MAX_PBUFS)) {
-    pbuf_free(r);
-    LINK_STATS_INC(link.memerr);
-    LINK_STATS_INC(link.drop);
-    MIB2_STATS_NETIF_INC(stats_if, ifoutdiscards);
-    return ERR_MEM;
-  }
-  netif->loop_cnt_current += clen;
-#endif /* LWIP_LOOPBACK_MAX_PBUFS */
-
-  /* Copy the whole pbuf queue p into the single pbuf r */
-  if ((err = pbuf_copy(r, p)) != ERR_OK) {
-    pbuf_free(r);
-    LINK_STATS_INC(link.memerr);
-    LINK_STATS_INC(link.drop);
-    MIB2_STATS_NETIF_INC(stats_if, ifoutdiscards);
-    return err;
-  }
-
-  /* Put the packet on a linked list which gets emptied through calling
-     netif_poll(). */
-
-  /* let last point to the last pbuf in chain r */
-  for (last = r; last->next != NULL; last = last->next) {
-    /* nothing to do here, just get to the last pbuf */
-  }
-
-  SYS_ARCH_PROTECT(lev);
-  if (netif->loop_first != NULL) {
-    LWIP_ASSERT("if first != NULL, last must also be != NULL", netif->loop_last != NULL);
-    netif->loop_last->next = r;
-    netif->loop_last = last;
-  } else {
-    netif->loop_first = r;
-    netif->loop_last = last;
-  }
-  SYS_ARCH_UNPROTECT(lev);
-
-  LINK_STATS_INC(link.xmit);
-  MIB2_STATS_NETIF_ADD(stats_if, ifoutoctets, p->tot_len);
-  MIB2_STATS_NETIF_INC(stats_if, ifoutucastpkts);
-
-#if LWIP_NETIF_LOOPBACK_MULTITHREADING
-  /* For multithreading environment, schedule a call to netif_poll */
-  tcpip_callback_with_block((tcpip_callback_fn)netif_poll, netif, 0);
-#endif /* LWIP_NETIF_LOOPBACK_MULTITHREADING */
-
-  return ERR_OK;
-}
-
-#if LWIP_HAVE_LOOPIF
-#if LWIP_IPV4
-static err_t
-netif_loop_output_ipv4(struct netif *netif, struct pbuf *p, const ip4_addr_t* addr)
-{
-  LWIP_UNUSED_ARG(addr);
-  return netif_loop_output(netif, p);
-}
-#endif /* LWIP_IPV4 */
-
-#if LWIP_IPV6
-static err_t
-netif_loop_output_ipv6(struct netif *netif, struct pbuf *p, const ip6_addr_t* addr)
-{
-  LWIP_UNUSED_ARG(addr);
-  return netif_loop_output(netif, p);
-}
-#endif /* LWIP_IPV6 */
-#endif /* LWIP_HAVE_LOOPIF */
-
-
-/**
- * Call netif_poll() in the main loop of your application. This is to prevent
- * reentering non-reentrant functions like tcp_input(). Packets passed to
- * netif_loop_output() are put on a list that is passed to netif->input() by
- * netif_poll().
- */
-void
-netif_poll(struct netif *netif)
-{
-  /* If we have a loopif, SNMP counters are adjusted for it,
-   * if not they are adjusted for 'netif'. */
-#if MIB2_STATS
-#if LWIP_HAVE_LOOPIF
-  struct netif *stats_if = &loop_netif;
-#else /* LWIP_HAVE_LOOPIF */
-  struct netif *stats_if = netif;
-#endif /* LWIP_HAVE_LOOPIF */
-#endif /* MIB2_STATS */
-  SYS_ARCH_DECL_PROTECT(lev);
-
-  /* Get a packet from the list. With SYS_LIGHTWEIGHT_PROT=1, this is protected */
-  SYS_ARCH_PROTECT(lev);
-  while (netif->loop_first != NULL) {
-    struct pbuf *in, *in_end;
-#if LWIP_LOOPBACK_MAX_PBUFS
-    u8_t clen = 1;
-#endif /* LWIP_LOOPBACK_MAX_PBUFS */
-
-    in = in_end = netif->loop_first;
-    while (in_end->len != in_end->tot_len) {
-      LWIP_ASSERT("bogus pbuf: len != tot_len but next == NULL!", in_end->next != NULL);
-      in_end = in_end->next;
-#if LWIP_LOOPBACK_MAX_PBUFS
-      clen++;
-#endif /* LWIP_LOOPBACK_MAX_PBUFS */
-    }
-#if LWIP_LOOPBACK_MAX_PBUFS
-    /* adjust the number of pbufs on queue */
-    LWIP_ASSERT("netif->loop_cnt_current underflow",
-      ((netif->loop_cnt_current - clen) < netif->loop_cnt_current));
-    netif->loop_cnt_current -= clen;
-#endif /* LWIP_LOOPBACK_MAX_PBUFS */
-
-    /* 'in_end' now points to the last pbuf from 'in' */
-    if (in_end == netif->loop_last) {
-      /* this was the last pbuf in the list */
-      netif->loop_first = netif->loop_last = NULL;
-    } else {
-      /* pop the pbuf off the list */
-      netif->loop_first = in_end->next;
-      LWIP_ASSERT("should not be null since first != last!", netif->loop_first != NULL);
-    }
-    /* De-queue the pbuf from its successors on the 'loop_' list. */
-    in_end->next = NULL;
-    SYS_ARCH_UNPROTECT(lev);
-
-    LINK_STATS_INC(link.recv);
-    MIB2_STATS_NETIF_ADD(stats_if, ifinoctets, in->tot_len);
-    MIB2_STATS_NETIF_INC(stats_if, ifinucastpkts);
-    /* loopback packets are always IP packets! */
-    if (ip_input(in, netif) != ERR_OK) {
-      pbuf_free(in);
-    }
-    SYS_ARCH_PROTECT(lev);
-  }
-  SYS_ARCH_UNPROTECT(lev);
-}
-
-#if !LWIP_NETIF_LOOPBACK_MULTITHREADING
-/**
- * Calls netif_poll() for every netif on the netif_list.
- */
-void
-netif_poll_all(void)
-{
-  struct netif *netif = netif_list;
-  /* loop through netifs */
-  while (netif != NULL) {
-    netif_poll(netif);
-    /* proceed to next network interface */
-    netif = netif->next;
-  }
-}
-#endif /* !LWIP_NETIF_LOOPBACK_MULTITHREADING */
-#endif /* ENABLE_LOOPBACK */
-
-#if LWIP_NUM_NETIF_CLIENT_DATA > 0
-/**
- * @ingroup netif_cd
- * Allocate an index to store data in client_data member of struct netif.
- * Returned value is an index in mentioned array.
- * @see LWIP_NUM_NETIF_CLIENT_DATA
- */
-u8_t
-netif_alloc_client_data_id(void)
-{
-  u8_t result = netif_client_id;
-  netif_client_id++;
-
-  LWIP_ASSERT("Increase LWIP_NUM_NETIF_CLIENT_DATA in lwipopts.h", result < LWIP_NUM_NETIF_CLIENT_DATA);
-  return result + LWIP_NETIF_CLIENT_DATA_INDEX_MAX;
-}
-#endif
-
-#if LWIP_IPV6
-/**
- * @ingroup netif_ip6
- * Change an IPv6 address of a network interface
- *
- * @param netif the network interface to change
- * @param addr_idx index of the IPv6 address
- * @param addr6 the new IPv6 address
- *
- * @note call netif_ip6_addr_set_state() to set the address valid/temptative
- */
-void
-netif_ip6_addr_set(struct netif *netif, s8_t addr_idx, const ip6_addr_t *addr6)
-{
-  LWIP_ASSERT("addr6 != NULL", addr6 != NULL);
-  netif_ip6_addr_set_parts(netif, addr_idx, addr6->addr[0], addr6->addr[1],
-    addr6->addr[2], addr6->addr[3]);
-}
-
-/*
- * Change an IPv6 address of a network interface (internal version taking 4 * u32_t)
- *
- * @param netif the network interface to change
- * @param addr_idx index of the IPv6 address
- * @param i0 word0 of the new IPv6 address
- * @param i1 word1 of the new IPv6 address
- * @param i2 word2 of the new IPv6 address
- * @param i3 word3 of the new IPv6 address
- */
-void
-netif_ip6_addr_set_parts(struct netif *netif, s8_t addr_idx, u32_t i0, u32_t i1, u32_t i2, u32_t i3)
-{
-  const ip6_addr_t *old_addr;
-  LWIP_ASSERT("netif != NULL", netif != NULL);
-  LWIP_ASSERT("invalid index", addr_idx < LWIP_IPV6_NUM_ADDRESSES);
-
-  old_addr = netif_ip6_addr(netif, addr_idx);
-  /* address is actually being changed? */
-  if ((old_addr->addr[0] != i0) || (old_addr->addr[1] != i1) ||
-      (old_addr->addr[2] != i2) || (old_addr->addr[3] != i3)) {
-    LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_STATE, ("netif_ip6_addr_set: netif address being changed\n"));
-
-    if (netif_ip6_addr_state(netif, addr_idx) & IP6_ADDR_VALID) {
-#if LWIP_TCP || LWIP_UDP
-      ip_addr_t new_ipaddr;
-      IP_ADDR6(&new_ipaddr, i0, i1, i2, i3);
-#endif /* LWIP_TCP || LWIP_UDP */
-#if LWIP_TCP
-      tcp_netif_ip_addr_changed(netif_ip_addr6(netif, addr_idx), &new_ipaddr);
-#endif /* LWIP_TCP */
-#if LWIP_UDP
-      udp_netif_ip_addr_changed(netif_ip_addr6(netif, addr_idx), &new_ipaddr);
-#endif /* LWIP_UDP */
-#if LWIP_RAW
-      raw_netif_ip_addr_changed(netif_ip_addr6(netif, addr_idx), &new_ipaddr);
-#endif /* LWIP_RAW */
-    }
-    /* @todo: remove/readd mib2 ip6 entries? */
-
-    IP6_ADDR(ip_2_ip6(&(netif->ip6_addr[addr_idx])), i0, i1, i2, i3);
-    IP_SET_TYPE_VAL(netif->ip6_addr[addr_idx], IPADDR_TYPE_V6);
-
-    if (netif_ip6_addr_state(netif, addr_idx) & IP6_ADDR_VALID) {
-      netif_issue_reports(netif, NETIF_REPORT_TYPE_IPV6);
-      NETIF_STATUS_CALLBACK(netif);
-    }
-  }
-
-  LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: IPv6 address %d of interface %c%c set to %s/0x%"X8_F"\n",
-    addr_idx, netif->name[0], netif->name[1], ip6addr_ntoa(netif_ip6_addr(netif, addr_idx)),
-    netif_ip6_addr_state(netif, addr_idx)));
-}
-
-/**
- * @ingroup netif_ip6
- * Change the state of an IPv6 address of a network interface
- * (INVALID, TEMPTATIVE, PREFERRED, DEPRECATED, where TEMPTATIVE
- * includes the number of checks done, see ip6_addr.h)
- *
- * @param netif the network interface to change
- * @param addr_idx index of the IPv6 address
- * @param state the new IPv6 address state
- */
-void
-netif_ip6_addr_set_state(struct netif* netif, s8_t addr_idx, u8_t state)
-{
-  u8_t old_state;
-  LWIP_ASSERT("netif != NULL", netif != NULL);
-  LWIP_ASSERT("invalid index", addr_idx < LWIP_IPV6_NUM_ADDRESSES);
-
-  old_state = netif_ip6_addr_state(netif, addr_idx);
-  /* state is actually being changed? */
-  if (old_state != state) {
-    u8_t old_valid = old_state & IP6_ADDR_VALID;
-    u8_t new_valid = state & IP6_ADDR_VALID;
-    LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_STATE, ("netif_ip6_addr_set_state: netif address state being changed\n"));
-
-#if LWIP_IPV6_MLD
-    /* Reevaluate solicited-node multicast group membership. */
-    if (netif->flags & NETIF_FLAG_MLD6) {
-      nd6_adjust_mld_membership(netif, addr_idx, state);
-    }
-#endif /* LWIP_IPV6_MLD */
-
-    if (old_valid && !new_valid) {
-      /* address about to be removed by setting invalid */
-#if LWIP_TCP
-      tcp_netif_ip_addr_changed(netif_ip_addr6(netif, addr_idx), NULL);
-#endif /* LWIP_TCP */
-#if LWIP_UDP
-      udp_netif_ip_addr_changed(netif_ip_addr6(netif, addr_idx), NULL);
-#endif /* LWIP_UDP */
-#if LWIP_RAW
-      raw_netif_ip_addr_changed(netif_ip_addr6(netif, addr_idx), NULL);
-#endif /* LWIP_RAW */
-      /* @todo: remove mib2 ip6 entries? */
-    }
-    netif->ip6_addr_state[addr_idx] = state;
-
-    if (!old_valid && new_valid) {
-      /* address added by setting valid */
-      /* @todo: add mib2 ip6 entries? */
-      netif_issue_reports(netif, NETIF_REPORT_TYPE_IPV6);
-    }
-    if ((old_state & IP6_ADDR_PREFERRED) != (state & IP6_ADDR_PREFERRED)) {
-      /* address state has changed (valid flag changed or switched between
-         preferred and deprecated) -> call the callback function */
-      NETIF_STATUS_CALLBACK(netif);
-    }
-  }
-
-  LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("netif: IPv6 address %d of interface %c%c set to %s/0x%"X8_F"\n",
-    addr_idx, netif->name[0], netif->name[1], ip6addr_ntoa(netif_ip6_addr(netif, addr_idx)),
-    netif_ip6_addr_state(netif, addr_idx)));
-}
-
-/**
- * Checks if a specific address is assigned to the netif and returns its
- * index.
- *
- * @param netif the netif to check
- * @param ip6addr the IPv6 address to find
- * @return >= 0: address found, this is its index
- *         -1: address not found on this netif
- */
-s8_t
-netif_get_ip6_addr_match(struct netif *netif, const ip6_addr_t *ip6addr)
-{
-  s8_t i;
-  for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-    if (!ip6_addr_isinvalid(netif_ip6_addr_state(netif, i)) &&
-        ip6_addr_cmp(netif_ip6_addr(netif, i), ip6addr)) {
-      return i;
-    }
-  }
-  return -1;
-}
-
-/**
- * @ingroup netif_ip6
- * Create a link-local IPv6 address on a netif (stored in slot 0)
- *
- * @param netif the netif to create the address on
- * @param from_mac_48bit if != 0, assume hwadr is a 48-bit MAC address (std conversion)
- *                       if == 0, use hwaddr directly as interface ID
- */
-void
-netif_create_ip6_linklocal_address(struct netif *netif, u8_t from_mac_48bit)
-{
-  u8_t i, addr_index;
-
-  /* Link-local prefix. */
-  ip_2_ip6(&netif->ip6_addr[0])->addr[0] = PP_HTONL(0xfe800000ul);
-  ip_2_ip6(&netif->ip6_addr[0])->addr[1] = 0;
-
-  /* Generate interface ID. */
-  if (from_mac_48bit) {
-    /* Assume hwaddr is a 48-bit IEEE 802 MAC. Convert to EUI-64 address. Complement Group bit. */
-    ip_2_ip6(&netif->ip6_addr[0])->addr[2] = lwip_htonl((((u32_t)(netif->hwaddr[0] ^ 0x02)) << 24) |
-        ((u32_t)(netif->hwaddr[1]) << 16) |
-        ((u32_t)(netif->hwaddr[2]) << 8) |
-        (0xff));
-    ip_2_ip6(&netif->ip6_addr[0])->addr[3] = lwip_htonl((0xfeul << 24) |
-        ((u32_t)(netif->hwaddr[3]) << 16) |
-        ((u32_t)(netif->hwaddr[4]) << 8) |
-        (netif->hwaddr[5]));
-  } else {
-    /* Use hwaddr directly as interface ID. */
-    ip_2_ip6(&netif->ip6_addr[0])->addr[2] = 0;
-    ip_2_ip6(&netif->ip6_addr[0])->addr[3] = 0;
-
-    addr_index = 3;
-    for (i = 0; (i < 8) && (i < netif->hwaddr_len); i++) {
-      if (i == 4) {
-        addr_index--;
-      }
-      ip_2_ip6(&netif->ip6_addr[0])->addr[addr_index] |= ((u32_t)(netif->hwaddr[netif->hwaddr_len - i - 1])) << (8 * (i & 0x03));
-    }
-  }
-
-  /* Set address state. */
-#if LWIP_IPV6_DUP_DETECT_ATTEMPTS
-  /* Will perform duplicate address detection (DAD). */
-  netif_ip6_addr_set_state(netif, 0, IP6_ADDR_TENTATIVE);
-#else
-  /* Consider address valid. */
-  netif_ip6_addr_set_state(netif, 0, IP6_ADDR_PREFERRED);
-#endif /* LWIP_IPV6_AUTOCONFIG */
-}
-
-/**
- * @ingroup netif_ip6
- * This function allows for the easy addition of a new IPv6 address to an interface.
- * It takes care of finding an empty slot and then sets the address tentative
- * (to make sure that all the subsequent processing happens).
- *
- * @param netif netif to add the address on
- * @param ip6addr address to add
- * @param chosen_idx if != NULL, the chosen IPv6 address index will be stored here
- */
-err_t
-netif_add_ip6_address(struct netif *netif, const ip6_addr_t *ip6addr, s8_t *chosen_idx)
-{
-  s8_t i;
-
-  i = netif_get_ip6_addr_match(netif, ip6addr);
-  if (i >= 0) {
-    /* Address already added */
-    if (chosen_idx != NULL) {
-      *chosen_idx = i;
-    }
-    return ERR_OK;
-  }
-
-  /* Find a free slot -- musn't be the first one (reserved for link local) */
-  for (i = 1; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
-    if (ip6_addr_isinvalid(netif_ip6_addr_state(netif, i))) {
-      ip_addr_copy_from_ip6(netif->ip6_addr[i], *ip6addr);
-      netif_ip6_addr_set_state(netif, i, IP6_ADDR_TENTATIVE);
-      if (chosen_idx != NULL) {
-        *chosen_idx = i;
-      }
-      return ERR_OK;
-    }
-  }
-
-  if (chosen_idx != NULL) {
-    *chosen_idx = -1;
-  }
-  return ERR_VAL;
-}
-
-/** Dummy IPv6 output function for netifs not supporting IPv6
- */
-static err_t
-netif_null_output_ip6(struct netif *netif, struct pbuf *p, const ip6_addr_t *ipaddr)
-{
-  LWIP_UNUSED_ARG(netif);
-  LWIP_UNUSED_ARG(p);
-  LWIP_UNUSED_ARG(ipaddr);
-
-  return ERR_IF;
-}
-#endif /* LWIP_IPV6 */
diff --git a/sys/net/core/pbuf.c b/sys/net/core/pbuf.c
deleted file mode 100644
index 26fd2d6..0000000
--- a/sys/net/core/pbuf.c
+++ /dev/null
@@ -1,1443 +0,0 @@
-/**
- * @file
- * Packet buffer management
- */
-
-/**
- * @defgroup pbuf Packet buffers (PBUF)
- * @ingroup infrastructure
- *
- * Packets are built from the pbuf data structure. It supports dynamic
- * memory allocation for packet contents or can reference externally
- * managed packet contents both in RAM and ROM. Quick allocation for
- * incoming packets is provided through pools with fixed sized pbufs.
- *
- * A packet may span over multiple pbufs, chained as a singly linked
- * list. This is called a "pbuf chain".
- *
- * Multiple packets may be queued, also using this singly linked list.
- * This is called a "packet queue".
- *
- * So, a packet queue consists of one or more pbuf chains, each of
- * which consist of one or more pbufs. CURRENTLY, PACKET QUEUES ARE
- * NOT SUPPORTED!!! Use helper structs to queue multiple packets.
- *
- * The differences between a pbuf chain and a packet queue are very
- * precise but subtle.
- *
- * The last pbuf of a packet has a ->tot_len field that equals the
- * ->len field. It can be found by traversing the list. If the last
- * pbuf of a packet has a ->next field other than NULL, more packets
- * are on the queue.
- *
- * Therefore, looping through a pbuf of a single packet, has an
- * loop end condition (tot_len == p->len), NOT (next == NULL).
- *
- * Example of custom pbuf usage for zero-copy RX:
-  @code{.c}
-typedef struct my_custom_pbuf
-{
-   struct pbuf_custom p;
-   void* dma_descriptor;
-} my_custom_pbuf_t;
-
-LWIP_MEMPOOL_DECLARE(RX_POOL, 10, sizeof(my_custom_pbuf_t), "Zero-copy RX PBUF pool");
-
-void my_pbuf_free_custom(void* p)
-{
-  my_custom_pbuf_t* my_puf = (my_custom_pbuf_t*)p;
-
-  LOCK_INTERRUPTS();
-  free_rx_dma_descriptor(my_pbuf->dma_descriptor);
-  LWIP_MEMPOOL_FREE(RX_POOL, my_pbuf);
-  UNLOCK_INTERRUPTS();
-}
-
-void eth_rx_irq()
-{
-  dma_descriptor*   dma_desc = get_RX_DMA_descriptor_from_ethernet();
-  my_custom_pbuf_t* my_pbuf  = (my_custom_pbuf_t*)LWIP_MEMPOOL_ALLOC(RX_POOL);
-
-  my_pbuf->p.custom_free_function = my_pbuf_free_custom;
-  my_pbuf->dma_descriptor         = dma_desc;
-
-  invalidate_cpu_cache(dma_desc->rx_data, dma_desc->rx_length);
-  
-  struct pbuf* p = pbuf_alloced_custom(PBUF_RAW,
-     dma_desc->rx_length,
-     PBUF_REF,
-     &my_pbuf->p,
-     dma_desc->rx_data,
-     dma_desc->max_buffer_size);
-
-  if(netif->input(p, netif) != ERR_OK) {
-    pbuf_free(p);
-  }
-}
-  @endcode
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#include "net/stats.h"
-#include "net/def.h"
-#include "net/mem.h"
-#include "net/memp.h"
-#include "net/pbuf.h"
-#include "net/sys.h"
-#if LWIP_TCP && TCP_QUEUE_OOSEQ
-#include "net/priv/tcp_priv.h"
-#endif
-#if LWIP_CHECKSUM_ON_COPY
-#include "net/inet_chksum.h"
-#endif
-
-#include <string.h>
-
-#define SIZEOF_STRUCT_PBUF        LWIP_MEM_ALIGN_SIZE(sizeof(struct pbuf))
-/* Since the pool is created in memp, PBUF_POOL_BUFSIZE will be automatically
-   aligned there. Therefore, PBUF_POOL_BUFSIZE_ALIGNED can be used here. */
-#define PBUF_POOL_BUFSIZE_ALIGNED LWIP_MEM_ALIGN_SIZE(PBUF_POOL_BUFSIZE)
-
-#if !LWIP_TCP || !TCP_QUEUE_OOSEQ || !PBUF_POOL_FREE_OOSEQ
-#define PBUF_POOL_IS_EMPTY()
-#else /* !LWIP_TCP || !TCP_QUEUE_OOSEQ || !PBUF_POOL_FREE_OOSEQ */
-
-#if !NO_SYS
-#ifndef PBUF_POOL_FREE_OOSEQ_QUEUE_CALL
-#include "net/tcpip.h"
-#define PBUF_POOL_FREE_OOSEQ_QUEUE_CALL()  do { \
-  if (tcpip_callback_with_block(pbuf_free_ooseq_callback, NULL, 0) != ERR_OK) { \
-      SYS_ARCH_PROTECT(old_level); \
-      pbuf_free_ooseq_pending = 0; \
-      SYS_ARCH_UNPROTECT(old_level); \
-  } } while(0)
-#endif /* PBUF_POOL_FREE_OOSEQ_QUEUE_CALL */
-#endif /* !NO_SYS */
-
-volatile u8_t pbuf_free_ooseq_pending;
-#define PBUF_POOL_IS_EMPTY() pbuf_pool_is_empty()
-
-/**
- * Attempt to reclaim some memory from queued out-of-sequence TCP segments
- * if we run out of pool pbufs. It's better to give priority to new packets
- * if we're running out.
- *
- * This must be done in the correct thread context therefore this function
- * can only be used with NO_SYS=0 and through tcpip_callback.
- */
-#if !NO_SYS
-static
-#endif /* !NO_SYS */
-void
-pbuf_free_ooseq(void)
-{
-  struct tcp_pcb* pcb;
-  SYS_ARCH_SET(pbuf_free_ooseq_pending, 0);
-
-  for (pcb = tcp_active_pcbs; NULL != pcb; pcb = pcb->next) {
-    if (NULL != pcb->ooseq) {
-      /** Free the ooseq pbufs of one PCB only */
-      LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free_ooseq: freeing out-of-sequence pbufs\n"));
-      tcp_segs_free(pcb->ooseq);
-      pcb->ooseq = NULL;
-      return;
-    }
-  }
-}
-
-#if !NO_SYS
-/**
- * Just a callback function for tcpip_callback() that calls pbuf_free_ooseq().
- */
-static void
-pbuf_free_ooseq_callback(void *arg)
-{
-  LWIP_UNUSED_ARG(arg);
-  pbuf_free_ooseq();
-}
-#endif /* !NO_SYS */
-
-/** Queue a call to pbuf_free_ooseq if not already queued. */
-static void
-pbuf_pool_is_empty(void)
-{
-#ifndef PBUF_POOL_FREE_OOSEQ_QUEUE_CALL
-  SYS_ARCH_SET(pbuf_free_ooseq_pending, 1);
-#else /* PBUF_POOL_FREE_OOSEQ_QUEUE_CALL */
-  u8_t queued;
-  SYS_ARCH_DECL_PROTECT(old_level);
-  SYS_ARCH_PROTECT(old_level);
-  queued = pbuf_free_ooseq_pending;
-  pbuf_free_ooseq_pending = 1;
-  SYS_ARCH_UNPROTECT(old_level);
-
-  if (!queued) {
-    /* queue a call to pbuf_free_ooseq if not already queued */
-    PBUF_POOL_FREE_OOSEQ_QUEUE_CALL();
-  }
-#endif /* PBUF_POOL_FREE_OOSEQ_QUEUE_CALL */
-}
-#endif /* !LWIP_TCP || !TCP_QUEUE_OOSEQ || !PBUF_POOL_FREE_OOSEQ */
-
-/**
- * @ingroup pbuf
- * Allocates a pbuf of the given type (possibly a chain for PBUF_POOL type).
- *
- * The actual memory allocated for the pbuf is determined by the
- * layer at which the pbuf is allocated and the requested size
- * (from the size parameter).
- *
- * @param layer flag to define header size
- * @param length size of the pbuf's payload
- * @param type this parameter decides how and where the pbuf
- * should be allocated as follows:
- *
- * - PBUF_RAM: buffer memory for pbuf is allocated as one large
- *             chunk. This includes protocol headers as well.
- * - PBUF_ROM: no buffer memory is allocated for the pbuf, even for
- *             protocol headers. Additional headers must be prepended
- *             by allocating another pbuf and chain in to the front of
- *             the ROM pbuf. It is assumed that the memory used is really
- *             similar to ROM in that it is immutable and will not be
- *             changed. Memory which is dynamic should generally not
- *             be attached to PBUF_ROM pbufs. Use PBUF_REF instead.
- * - PBUF_REF: no buffer memory is allocated for the pbuf, even for
- *             protocol headers. It is assumed that the pbuf is only
- *             being used in a single thread. If the pbuf gets queued,
- *             then pbuf_take should be called to copy the buffer.
- * - PBUF_POOL: the pbuf is allocated as a pbuf chain, with pbufs from
- *              the pbuf pool that is allocated during pbuf_init().
- *
- * @return the allocated pbuf. If multiple pbufs where allocated, this
- * is the first pbuf of a pbuf chain.
- */
-struct pbuf *
-pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type)
-{
-  struct pbuf *p, *q, *r;
-  u16_t offset;
-  s32_t rem_len; /* remaining length */
-  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc(length=%"U16_F")\n", length));
-
-  /* determine header offset */
-  switch (layer) {
-  case PBUF_TRANSPORT:
-    /* add room for transport (often TCP) layer header */
-    offset = PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN;
-    break;
-  case PBUF_IP:
-    /* add room for IP layer header */
-    offset = PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN + PBUF_IP_HLEN;
-    break;
-  case PBUF_LINK:
-    /* add room for link layer header */
-    offset = PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN;
-    break;
-  case PBUF_RAW_TX:
-    /* add room for encapsulating link layer headers (e.g. 802.11) */
-    offset = PBUF_LINK_ENCAPSULATION_HLEN;
-    break;
-  case PBUF_RAW:
-    /* no offset (e.g. RX buffers or chain successors) */
-    offset = 0;
-    break;
-  default:
-    LWIP_ASSERT("pbuf_alloc: bad pbuf layer", 0);
-    return NULL;
-  }
-
-  switch (type) {
-  case PBUF_POOL:
-    /* allocate head of pbuf chain into p */
-    p = (struct pbuf *)memp_malloc(MEMP_PBUF_POOL);
-    LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc: allocated pbuf %p\n", (void *)p));
-    if (p == NULL) {
-      PBUF_POOL_IS_EMPTY();
-      return NULL;
-    }
-    p->type = type;
-    p->next = NULL;
-
-    /* make the payload pointer point 'offset' bytes into pbuf data memory */
-    p->payload = LWIP_MEM_ALIGN((void *)((u8_t *)p + (SIZEOF_STRUCT_PBUF + offset)));
-    LWIP_ASSERT("pbuf_alloc: pbuf p->payload properly aligned",
-            ((mem_ptr_t)p->payload % MEM_ALIGNMENT) == 0);
-    /* the total length of the pbuf chain is the requested size */
-    p->tot_len = length;
-    /* set the length of the first pbuf in the chain */
-    p->len = LWIP_MIN(length, PBUF_POOL_BUFSIZE_ALIGNED - LWIP_MEM_ALIGN_SIZE(offset));
-    LWIP_ASSERT("check p->payload + p->len does not overflow pbuf",
-                ((u8_t*)p->payload + p->len <=
-                 (u8_t*)p + SIZEOF_STRUCT_PBUF + PBUF_POOL_BUFSIZE_ALIGNED));
-    LWIP_ASSERT("PBUF_POOL_BUFSIZE must be bigger than MEM_ALIGNMENT",
-      (PBUF_POOL_BUFSIZE_ALIGNED - LWIP_MEM_ALIGN_SIZE(offset)) > 0 );
-    /* set reference count (needed here in case we fail) */
-    p->ref = 1;
-
-    /* now allocate the tail of the pbuf chain */
-
-    /* remember first pbuf for linkage in next iteration */
-    r = p;
-    /* remaining length to be allocated */
-    rem_len = length - p->len;
-    /* any remaining pbufs to be allocated? */
-    while (rem_len > 0) {
-      q = (struct pbuf *)memp_malloc(MEMP_PBUF_POOL);
-      if (q == NULL) {
-        PBUF_POOL_IS_EMPTY();
-        /* free chain so far allocated */
-        pbuf_free(p);
-        /* bail out unsuccessfully */
-        return NULL;
-      }
-      q->type = type;
-      q->flags = 0;
-      q->next = NULL;
-      /* make previous pbuf point to this pbuf */
-      r->next = q;
-      /* set total length of this pbuf and next in chain */
-      LWIP_ASSERT("rem_len < max_u16_t", rem_len < 0xffff);
-      q->tot_len = (u16_t)rem_len;
-      /* this pbuf length is pool size, unless smaller sized tail */
-      q->len = LWIP_MIN((u16_t)rem_len, PBUF_POOL_BUFSIZE_ALIGNED);
-      q->payload = (void *)((u8_t *)q + SIZEOF_STRUCT_PBUF);
-      LWIP_ASSERT("pbuf_alloc: pbuf q->payload properly aligned",
-              ((mem_ptr_t)q->payload % MEM_ALIGNMENT) == 0);
-      LWIP_ASSERT("check p->payload + p->len does not overflow pbuf",
-                  ((u8_t*)p->payload + p->len <=
-                   (u8_t*)p + SIZEOF_STRUCT_PBUF + PBUF_POOL_BUFSIZE_ALIGNED));
-      q->ref = 1;
-      /* calculate remaining length to be allocated */
-      rem_len -= q->len;
-      /* remember this pbuf for linkage in next iteration */
-      r = q;
-    }
-    /* end of chain */
-    /*r->next = NULL;*/
-
-    break;
-  case PBUF_RAM:
-    {
-      mem_size_t alloc_len = LWIP_MEM_ALIGN_SIZE(SIZEOF_STRUCT_PBUF + offset) + LWIP_MEM_ALIGN_SIZE(length);
-      
-      /* bug #50040: Check for integer overflow when calculating alloc_len */
-      if (alloc_len < LWIP_MEM_ALIGN_SIZE(length)) {
-        return NULL;
-      }
-    
-      /* If pbuf is to be allocated in RAM, allocate memory for it. */
-      p = (struct pbuf*)mem_malloc(alloc_len);
-    }
-
-    if (p == NULL) {
-      return NULL;
-    }
-    /* Set up internal structure of the pbuf. */
-    p->payload = LWIP_MEM_ALIGN((void *)((u8_t *)p + SIZEOF_STRUCT_PBUF + offset));
-    p->len = p->tot_len = length;
-    p->next = NULL;
-    p->type = type;
-
-    LWIP_ASSERT("pbuf_alloc: pbuf->payload properly aligned",
-           ((mem_ptr_t)p->payload % MEM_ALIGNMENT) == 0);
-    break;
-  /* pbuf references existing (non-volatile static constant) ROM payload? */
-  case PBUF_ROM:
-  /* pbuf references existing (externally allocated) RAM payload? */
-  case PBUF_REF:
-    /* only allocate memory for the pbuf structure */
-    p = (struct pbuf *)memp_malloc(MEMP_PBUF);
-    if (p == NULL) {
-      LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-                  ("pbuf_alloc: Could not allocate MEMP_PBUF for PBUF_%s.\n",
-                  (type == PBUF_ROM) ? "ROM" : "REF"));
-      return NULL;
-    }
-    /* caller must set this field properly, afterwards */
-    p->payload = NULL;
-    p->len = p->tot_len = length;
-    p->next = NULL;
-    p->type = type;
-    break;
-  default:
-    LWIP_ASSERT("pbuf_alloc: erroneous type", 0);
-    return NULL;
-  }
-  /* set reference count */
-  p->ref = 1;
-  /* set flags */
-  p->flags = 0;
-  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc(length=%"U16_F") == %p\n", length, (void *)p));
-  return p;
-}
-
-#if LWIP_SUPPORT_CUSTOM_PBUF
-/**
- * @ingroup pbuf
- * Initialize a custom pbuf (already allocated).
- *
- * @param l flag to define header size
- * @param length size of the pbuf's payload
- * @param type type of the pbuf (only used to treat the pbuf accordingly, as
- *        this function allocates no memory)
- * @param p pointer to the custom pbuf to initialize (already allocated)
- * @param payload_mem pointer to the buffer that is used for payload and headers,
- *        must be at least big enough to hold 'length' plus the header size,
- *        may be NULL if set later.
- *        ATTENTION: The caller is responsible for correct alignment of this buffer!!
- * @param payload_mem_len the size of the 'payload_mem' buffer, must be at least
- *        big enough to hold 'length' plus the header size
- */
-struct pbuf*
-pbuf_alloced_custom(pbuf_layer l, u16_t length, pbuf_type type, struct pbuf_custom *p,
-                    void *payload_mem, u16_t payload_mem_len)
-{
-  u16_t offset;
-  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloced_custom(length=%"U16_F")\n", length));
-
-  /* determine header offset */
-  switch (l) {
-  case PBUF_TRANSPORT:
-    /* add room for transport (often TCP) layer header */
-    offset = PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN;
-    break;
-  case PBUF_IP:
-    /* add room for IP layer header */
-    offset = PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN + PBUF_IP_HLEN;
-    break;
-  case PBUF_LINK:
-    /* add room for link layer header */
-    offset = PBUF_LINK_ENCAPSULATION_HLEN + PBUF_LINK_HLEN;
-    break;
-  case PBUF_RAW_TX:
-    /* add room for encapsulating link layer headers (e.g. 802.11) */
-    offset = PBUF_LINK_ENCAPSULATION_HLEN;
-    break;
-  case PBUF_RAW:
-    offset = 0;
-    break;
-  default:
-    LWIP_ASSERT("pbuf_alloced_custom: bad pbuf layer", 0);
-    return NULL;
-  }
-
-  if (LWIP_MEM_ALIGN_SIZE(offset) + length > payload_mem_len) {
-    LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_LEVEL_WARNING, ("pbuf_alloced_custom(length=%"U16_F") buffer too short\n", length));
-    return NULL;
-  }
-
-  p->pbuf.next = NULL;
-  if (payload_mem != NULL) {
-    p->pbuf.payload = (u8_t *)payload_mem + LWIP_MEM_ALIGN_SIZE(offset);
-  } else {
-    p->pbuf.payload = NULL;
-  }
-  p->pbuf.flags = PBUF_FLAG_IS_CUSTOM;
-  p->pbuf.len = p->pbuf.tot_len = length;
-  p->pbuf.type = type;
-  p->pbuf.ref = 1;
-  return &p->pbuf;
-}
-#endif /* LWIP_SUPPORT_CUSTOM_PBUF */
-
-/**
- * @ingroup pbuf
- * Shrink a pbuf chain to a desired length.
- *
- * @param p pbuf to shrink.
- * @param new_len desired new length of pbuf chain
- *
- * Depending on the desired length, the first few pbufs in a chain might
- * be skipped and left unchanged. The new last pbuf in the chain will be
- * resized, and any remaining pbufs will be freed.
- *
- * @note If the pbuf is ROM/REF, only the ->tot_len and ->len fields are adjusted.
- * @note May not be called on a packet queue.
- *
- * @note Despite its name, pbuf_realloc cannot grow the size of a pbuf (chain).
- */
-void
-pbuf_realloc(struct pbuf *p, u16_t new_len)
-{
-  struct pbuf *q;
-  u16_t rem_len; /* remaining length */
-  s32_t grow;
-
-  LWIP_ASSERT("pbuf_realloc: p != NULL", p != NULL);
-  LWIP_ASSERT("pbuf_realloc: sane p->type", p->type == PBUF_POOL ||
-              p->type == PBUF_ROM ||
-              p->type == PBUF_RAM ||
-              p->type == PBUF_REF);
-
-  /* desired length larger than current length? */
-  if (new_len >= p->tot_len) {
-    /* enlarging not yet supported */
-    return;
-  }
-
-  /* the pbuf chain grows by (new_len - p->tot_len) bytes
-   * (which may be negative in case of shrinking) */
-  grow = new_len - p->tot_len;
-
-  /* first, step over any pbufs that should remain in the chain */
-  rem_len = new_len;
-  q = p;
-  /* should this pbuf be kept? */
-  while (rem_len > q->len) {
-    /* decrease remaining length by pbuf length */
-    rem_len -= q->len;
-    /* decrease total length indicator */
-    LWIP_ASSERT("grow < max_u16_t", grow < 0xffff);
-    q->tot_len += (u16_t)grow;
-    /* proceed to next pbuf in chain */
-    q = q->next;
-    LWIP_ASSERT("pbuf_realloc: q != NULL", q != NULL);
-  }
-  /* we have now reached the new last pbuf (in q) */
-  /* rem_len == desired length for pbuf q */
-
-  /* shrink allocated memory for PBUF_RAM */
-  /* (other types merely adjust their length fields */
-  if ((q->type == PBUF_RAM) && (rem_len != q->len)
-#if LWIP_SUPPORT_CUSTOM_PBUF
-      && ((q->flags & PBUF_FLAG_IS_CUSTOM) == 0)
-#endif /* LWIP_SUPPORT_CUSTOM_PBUF */
-     ) {
-    /* reallocate and adjust the length of the pbuf that will be split */
-    q = (struct pbuf *)mem_trim(q, (u16_t)((u8_t *)q->payload - (u8_t *)q) + rem_len);
-    LWIP_ASSERT("mem_trim returned q == NULL", q != NULL);
-  }
-  /* adjust length fields for new last pbuf */
-  q->len = rem_len;
-  q->tot_len = q->len;
-
-  /* any remaining pbufs in chain? */
-  if (q->next != NULL) {
-    /* free remaining pbufs in chain */
-    pbuf_free(q->next);
-  }
-  /* q is last packet in chain */
-  q->next = NULL;
-
-}
-
-/**
- * Adjusts the payload pointer to hide or reveal headers in the payload.
- * @see pbuf_header.
- *
- * @param p pbuf to change the header size.
- * @param header_size_increment Number of bytes to increment header size.
- * @param force Allow 'header_size_increment > 0' for PBUF_REF/PBUF_ROM types
- *
- * @return non-zero on failure, zero on success.
- *
- */
-static u8_t
-pbuf_header_impl(struct pbuf *p, s16_t header_size_increment, u8_t force)
-{
-  u16_t type;
-  void *payload;
-  u16_t increment_magnitude;
-
-  LWIP_ASSERT("p != NULL", p != NULL);
-  if ((header_size_increment == 0) || (p == NULL)) {
-    return 0;
-  }
-
-  if (header_size_increment < 0) {
-    increment_magnitude = (u16_t)-header_size_increment;
-    /* Check that we aren't going to move off the end of the pbuf */
-    LWIP_ERROR("increment_magnitude <= p->len", (increment_magnitude <= p->len), return 1;);
-  } else {
-    increment_magnitude = (u16_t)header_size_increment;
-#if 0
-    /* Can't assert these as some callers speculatively call
-         pbuf_header() to see if it's OK.  Will return 1 below instead. */
-    /* Check that we've got the correct type of pbuf to work with */
-    LWIP_ASSERT("p->type == PBUF_RAM || p->type == PBUF_POOL",
-                p->type == PBUF_RAM || p->type == PBUF_POOL);
-    /* Check that we aren't going to move off the beginning of the pbuf */
-    LWIP_ASSERT("p->payload - increment_magnitude >= p + SIZEOF_STRUCT_PBUF",
-                (u8_t *)p->payload - increment_magnitude >= (u8_t *)p + SIZEOF_STRUCT_PBUF);
-#endif
-  }
-
-  type = p->type;
-  /* remember current payload pointer */
-  payload = p->payload;
-
-  /* pbuf types containing payloads? */
-  if (type == PBUF_RAM || type == PBUF_POOL) {
-    /* set new payload pointer */
-    p->payload = (u8_t *)p->payload - header_size_increment;
-    /* boundary check fails? */
-    if ((u8_t *)p->payload < (u8_t *)p + SIZEOF_STRUCT_PBUF) {
-      LWIP_DEBUGF( PBUF_DEBUG | LWIP_DBG_TRACE,
-        ("pbuf_header: failed as %p < %p (not enough space for new header size)\n",
-        (void *)p->payload, (void *)((u8_t *)p + SIZEOF_STRUCT_PBUF)));
-      /* restore old payload pointer */
-      p->payload = payload;
-      /* bail out unsuccessfully */
-      return 1;
-    }
-  /* pbuf types referring to external payloads? */
-  } else if (type == PBUF_REF || type == PBUF_ROM) {
-    /* hide a header in the payload? */
-    if ((header_size_increment < 0) && (increment_magnitude <= p->len)) {
-      /* increase payload pointer */
-      p->payload = (u8_t *)p->payload - header_size_increment;
-    } else if ((header_size_increment > 0) && force) {
-      p->payload = (u8_t *)p->payload - header_size_increment;
-    } else {
-      /* cannot expand payload to front (yet!)
-       * bail out unsuccessfully */
-      return 1;
-    }
-  } else {
-    /* Unknown type */
-    LWIP_ASSERT("bad pbuf type", 0);
-    return 1;
-  }
-  /* modify pbuf length fields */
-  p->len += header_size_increment;
-  p->tot_len += header_size_increment;
-
-  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_header: old %p new %p (%"S16_F")\n",
-    (void *)payload, (void *)p->payload, header_size_increment));
-
-  return 0;
-}
-
-/**
- * Adjusts the payload pointer to hide or reveal headers in the payload.
- *
- * Adjusts the ->payload pointer so that space for a header
- * (dis)appears in the pbuf payload.
- *
- * The ->payload, ->tot_len and ->len fields are adjusted.
- *
- * @param p pbuf to change the header size.
- * @param header_size_increment Number of bytes to increment header size which
- * increases the size of the pbuf. New space is on the front.
- * (Using a negative value decreases the header size.)
- * If hdr_size_inc is 0, this function does nothing and returns successful.
- *
- * PBUF_ROM and PBUF_REF type buffers cannot have their sizes increased, so
- * the call will fail. A check is made that the increase in header size does
- * not move the payload pointer in front of the start of the buffer.
- * @return non-zero on failure, zero on success.
- *
- */
-u8_t
-pbuf_header(struct pbuf *p, s16_t header_size_increment)
-{
-   return pbuf_header_impl(p, header_size_increment, 0);
-}
-
-/**
- * Same as pbuf_header but does not check if 'header_size > 0' is allowed.
- * This is used internally only, to allow PBUF_REF for RX.
- */
-u8_t
-pbuf_header_force(struct pbuf *p, s16_t header_size_increment)
-{
-   return pbuf_header_impl(p, header_size_increment, 1);
-}
-
-/**
- * @ingroup pbuf
- * Dereference a pbuf chain or queue and deallocate any no-longer-used
- * pbufs at the head of this chain or queue.
- *
- * Decrements the pbuf reference count. If it reaches zero, the pbuf is
- * deallocated.
- *
- * For a pbuf chain, this is repeated for each pbuf in the chain,
- * up to the first pbuf which has a non-zero reference count after
- * decrementing. So, when all reference counts are one, the whole
- * chain is free'd.
- *
- * @param p The pbuf (chain) to be dereferenced.
- *
- * @return the number of pbufs that were de-allocated
- * from the head of the chain.
- *
- * @note MUST NOT be called on a packet queue (Not verified to work yet).
- * @note the reference counter of a pbuf equals the number of pointers
- * that refer to the pbuf (or into the pbuf).
- *
- * @internal examples:
- *
- * Assuming existing chains a->b->c with the following reference
- * counts, calling pbuf_free(a) results in:
- *
- * 1->2->3 becomes ...1->3
- * 3->3->3 becomes 2->3->3
- * 1->1->2 becomes ......1
- * 2->1->1 becomes 1->1->1
- * 1->1->1 becomes .......
- *
- */
-u8_t
-pbuf_free(struct pbuf *p)
-{
-  u16_t type;
-  struct pbuf *q;
-  u8_t count;
-
-  if (p == NULL) {
-    LWIP_ASSERT("p != NULL", p != NULL);
-    /* if assertions are disabled, proceed with debug output */
-    LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-      ("pbuf_free(p == NULL) was called.\n"));
-    return 0;
-  }
-
-  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free(%p)\n", (void *)p));
-
-  PERF_START;
-
-  LWIP_ASSERT("pbuf_free: sane type", p->type == PBUF_RAM || p->type == PBUF_ROM || p->type == PBUF_REF || p->type == PBUF_POOL);
-
-  count = 0;
-  /* de-allocate all consecutive pbufs from the head of the chain that
-   * obtain a zero reference count after decrementing*/
-
-  while (p != NULL) {
-    u16_t ref;
-    SYS_ARCH_DECL_PROTECT(old_level);
-    /* Since decrementing ref cannot be guaranteed to be a single machine operation
-     * we must protect it. We put the new ref into a local variable to prevent
-     * further protection. */
-    SYS_ARCH_PROTECT(old_level);
-    /* all pbufs in a chain are referenced at least once */
-    if (_current->id == 4)
-    LWIP_ASSERT("pbuf_free: p->ref > 0", p->ref > 0);
-    /* decrease reference count (number of pointers to pbuf) */
-    ref = --(p->ref);
-    SYS_ARCH_UNPROTECT(old_level);
-    /* this pbuf is no longer referenced to? */
-    if (ref == 0) {
-      /* remember next pbuf in chain for next iteration */
-      q = p->next;
-      LWIP_DEBUGF( PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free: deallocating %p\n", (void *)p));
-      type = p->type;
-#if LWIP_SUPPORT_CUSTOM_PBUF
-      /* is this a custom pbuf? */
-      if ((p->flags & PBUF_FLAG_IS_CUSTOM) != 0) {
-        struct pbuf_custom *pc = (struct pbuf_custom*)p;
-        LWIP_ASSERT("pc->custom_free_function != NULL", pc->custom_free_function != NULL);
-        pc->custom_free_function(p);
-      } else
-#endif /* LWIP_SUPPORT_CUSTOM_PBUF */
-      {
-        /* is this a pbuf from the pool? */
-        if (type == PBUF_POOL) {
-          memp_free(MEMP_PBUF_POOL, p);
-        /* is this a ROM or RAM referencing pbuf? */
-        } else if (type == PBUF_ROM || type == PBUF_REF) {
-          memp_free(MEMP_PBUF, p);
-        /* type == PBUF_RAM */
-        } else {
-          mem_free(p);
-        }
-      }
-      count++;
-      /* proceed to next pbuf */
-      p = q;
-    /* p->ref > 0, this pbuf is still referenced to */
-    /* (and so the remaining pbufs in chain as well) */
-    } else {
-      LWIP_DEBUGF( PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_free: %p has ref %"U16_F", ending here.\n", (void *)p, ref));
-      /* stop walking through the chain */
-      p = NULL;
-    }
-  }
-  PERF_STOP("pbuf_free");
-  /* return number of de-allocated pbufs */
-  return count;
-}
-
-/**
- * Count number of pbufs in a chain
- *
- * @param p first pbuf of chain
- * @return the number of pbufs in a chain
- */
-u16_t
-pbuf_clen(const struct pbuf *p)
-{
-  u16_t len;
-
-  len = 0;
-  while (p != NULL) {
-    ++len;
-    p = p->next;
-  }
-  return len;
-}
-
-/**
- * @ingroup pbuf
- * Increment the reference count of the pbuf.
- *
- * @param p pbuf to increase reference counter of
- *
- */
-void
-pbuf_ref(struct pbuf *p)
-{
-  /* pbuf given? */
-  if (p != NULL) {
-    SYS_ARCH_INC(p->ref, 1);
-    LWIP_ASSERT("pbuf ref overflow", p->ref > 0);
-  }
-}
-
-/**
- * @ingroup pbuf
- * Concatenate two pbufs (each may be a pbuf chain) and take over
- * the caller's reference of the tail pbuf.
- *
- * @note The caller MAY NOT reference the tail pbuf afterwards.
- * Use pbuf_chain() for that purpose.
- *
- * @see pbuf_chain()
- */
-void
-pbuf_cat(struct pbuf *h, struct pbuf *t)
-{
-  struct pbuf *p;
-
-  LWIP_ERROR("(h != NULL) && (t != NULL) (programmer violates API)",
-             ((h != NULL) && (t != NULL)), return;);
-
-  /* proceed to last pbuf of chain */
-  for (p = h; p->next != NULL; p = p->next) {
-    /* add total length of second chain to all totals of first chain */
-    p->tot_len += t->tot_len;
-  }
-  /* { p is last pbuf of first h chain, p->next == NULL } */
-  LWIP_ASSERT("p->tot_len == p->len (of last pbuf in chain)", p->tot_len == p->len);
-  LWIP_ASSERT("p->next == NULL", p->next == NULL);
-  /* add total length of second chain to last pbuf total of first chain */
-  p->tot_len += t->tot_len;
-  /* chain last pbuf of head (p) with first of tail (t) */
-  p->next = t;
-  /* p->next now references t, but the caller will drop its reference to t,
-   * so netto there is no change to the reference count of t.
-   */
-}
-
-/**
- * @ingroup pbuf
- * Chain two pbufs (or pbuf chains) together.
- *
- * The caller MUST call pbuf_free(t) once it has stopped
- * using it. Use pbuf_cat() instead if you no longer use t.
- *
- * @param h head pbuf (chain)
- * @param t tail pbuf (chain)
- * @note The pbufs MUST belong to the same packet.
- * @note MAY NOT be called on a packet queue.
- *
- * The ->tot_len fields of all pbufs of the head chain are adjusted.
- * The ->next field of the last pbuf of the head chain is adjusted.
- * The ->ref field of the first pbuf of the tail chain is adjusted.
- *
- */
-void
-pbuf_chain(struct pbuf *h, struct pbuf *t)
-{
-  pbuf_cat(h, t);
-  /* t is now referenced by h */
-  pbuf_ref(t);
-  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_chain: %p references %p\n", (void *)h, (void *)t));
-}
-
-/**
- * Dechains the first pbuf from its succeeding pbufs in the chain.
- *
- * Makes p->tot_len field equal to p->len.
- * @param p pbuf to dechain
- * @return remainder of the pbuf chain, or NULL if it was de-allocated.
- * @note May not be called on a packet queue.
- */
-struct pbuf *
-pbuf_dechain(struct pbuf *p)
-{
-  struct pbuf *q;
-  u8_t tail_gone = 1;
-  /* tail */
-  q = p->next;
-  /* pbuf has successor in chain? */
-  if (q != NULL) {
-    /* assert tot_len invariant: (p->tot_len == p->len + (p->next? p->next->tot_len: 0) */
-    LWIP_ASSERT("p->tot_len == p->len + q->tot_len", q->tot_len == p->tot_len - p->len);
-    /* enforce invariant if assertion is disabled */
-    q->tot_len = p->tot_len - p->len;
-    /* decouple pbuf from remainder */
-    p->next = NULL;
-    /* total length of pbuf p is its own length only */
-    p->tot_len = p->len;
-    /* q is no longer referenced by p, free it */
-    LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_dechain: unreferencing %p\n", (void *)q));
-    tail_gone = pbuf_free(q);
-    if (tail_gone > 0) {
-      LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE,
-                  ("pbuf_dechain: deallocated %p (as it is no longer referenced)\n", (void *)q));
-    }
-    /* return remaining tail or NULL if deallocated */
-  }
-  /* assert tot_len invariant: (p->tot_len == p->len + (p->next? p->next->tot_len: 0) */
-  LWIP_ASSERT("p->tot_len == p->len", p->tot_len == p->len);
-  return ((tail_gone > 0) ? NULL : q);
-}
-
-/**
- * @ingroup pbuf
- * Create PBUF_RAM copies of pbufs.
- *
- * Used to queue packets on behalf of the lwIP stack, such as
- * ARP based queueing.
- *
- * @note You MUST explicitly use p = pbuf_take(p);
- *
- * @note Only one packet is copied, no packet queue!
- *
- * @param p_to pbuf destination of the copy
- * @param p_from pbuf source of the copy
- *
- * @return ERR_OK if pbuf was copied
- *         ERR_ARG if one of the pbufs is NULL or p_to is not big
- *                 enough to hold p_from
- */
-err_t
-pbuf_copy(struct pbuf *p_to, const struct pbuf *p_from)
-{
-  u16_t offset_to=0, offset_from=0, len;
-
-  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_copy(%p, %p)\n",
-    (const void*)p_to, (const void*)p_from));
-
-  /* is the target big enough to hold the source? */
-  LWIP_ERROR("pbuf_copy: target not big enough to hold source", ((p_to != NULL) &&
-             (p_from != NULL) && (p_to->tot_len >= p_from->tot_len)), return ERR_ARG;);
-
-  /* iterate through pbuf chain */
-  do
-  {
-    /* copy one part of the original chain */
-    if ((p_to->len - offset_to) >= (p_from->len - offset_from)) {
-      /* complete current p_from fits into current p_to */
-      len = p_from->len - offset_from;
-    } else {
-      /* current p_from does not fit into current p_to */
-      len = p_to->len - offset_to;
-    }
-    MEMCPY((u8_t*)p_to->payload + offset_to, (u8_t*)p_from->payload + offset_from, len);
-    offset_to += len;
-    offset_from += len;
-    LWIP_ASSERT("offset_to <= p_to->len", offset_to <= p_to->len);
-    LWIP_ASSERT("offset_from <= p_from->len", offset_from <= p_from->len);
-    if (offset_from >= p_from->len) {
-      /* on to next p_from (if any) */
-      offset_from = 0;
-      p_from = p_from->next;
-    }
-    if (offset_to == p_to->len) {
-      /* on to next p_to (if any) */
-      offset_to = 0;
-      p_to = p_to->next;
-      LWIP_ERROR("p_to != NULL", (p_to != NULL) || (p_from == NULL) , return ERR_ARG;);
-    }
-
-    if ((p_from != NULL) && (p_from->len == p_from->tot_len)) {
-      /* don't copy more than one packet! */
-      LWIP_ERROR("pbuf_copy() does not allow packet queues!",
-                 (p_from->next == NULL), return ERR_VAL;);
-    }
-    if ((p_to != NULL) && (p_to->len == p_to->tot_len)) {
-      /* don't copy more than one packet! */
-      LWIP_ERROR("pbuf_copy() does not allow packet queues!",
-                  (p_to->next == NULL), return ERR_VAL;);
-    }
-  } while (p_from);
-  LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_copy: end of chain reached.\n"));
-  return ERR_OK;
-}
-
-/**
- * @ingroup pbuf
- * Copy (part of) the contents of a packet buffer
- * to an application supplied buffer.
- *
- * @param buf the pbuf from which to copy data
- * @param dataptr the application supplied buffer
- * @param len length of data to copy (dataptr must be big enough). No more
- * than buf->tot_len will be copied, irrespective of len
- * @param offset offset into the packet buffer from where to begin copying len bytes
- * @return the number of bytes copied, or 0 on failure
- */
-u16_t
-pbuf_copy_partial(const struct pbuf *buf, void *dataptr, u16_t len, u16_t offset)
-{
-  const struct pbuf *p;
-  u16_t left;
-  u16_t buf_copy_len;
-  u16_t copied_total = 0;
-
-  LWIP_ERROR("pbuf_copy_partial: invalid buf", (buf != NULL), return 0;);
-  LWIP_ERROR("pbuf_copy_partial: invalid dataptr", (dataptr != NULL), return 0;);
-
-  left = 0;
-
-  if ((buf == NULL) || (dataptr == NULL)) {
-    return 0;
-  }
-
-  /* Note some systems use byte copy if dataptr or one of the pbuf payload pointers are unaligned. */
-  for (p = buf; len != 0 && p != NULL; p = p->next) {
-    if ((offset != 0) && (offset >= p->len)) {
-      /* don't copy from this buffer -> on to the next */
-      offset -= p->len;
-    } else {
-      /* copy from this buffer. maybe only partially. */
-      buf_copy_len = p->len - offset;
-      if (buf_copy_len > len) {
-        buf_copy_len = len;
-      }
-      /* copy the necessary parts of the buffer */
-      MEMCPY(&((char*)dataptr)[left], &((char*)p->payload)[offset], buf_copy_len);
-      copied_total += buf_copy_len;
-      left += buf_copy_len;
-      len -= buf_copy_len;
-      offset = 0;
-    }
-  }
-  return copied_total;
-}
-
-#if LWIP_TCP && TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-/**
- * This method modifies a 'pbuf chain', so that its total length is
- * smaller than 64K. The remainder of the original pbuf chain is stored
- * in *rest.
- * This function never creates new pbufs, but splits an existing chain
- * in two parts. The tot_len of the modified packet queue will likely be
- * smaller than 64K.
- * 'packet queues' are not supported by this function.
- *
- * @param p the pbuf queue to be split
- * @param rest pointer to store the remainder (after the first 64K)
- */
-void pbuf_split_64k(struct pbuf *p, struct pbuf **rest)
-{
-  *rest = NULL;
-  if ((p != NULL) && (p->next != NULL)) {
-    u16_t tot_len_front = p->len;
-    struct pbuf *i = p;
-    struct pbuf *r = p->next;
-
-    /* continue until the total length (summed up as u16_t) overflows */
-    while ((r != NULL) && ((u16_t)(tot_len_front + r->len) > tot_len_front)) {
-      tot_len_front += r->len;
-      i = r;
-      r = r->next;
-    }
-    /* i now points to last packet of the first segment. Set next
-       pointer to NULL */
-    i->next = NULL;
-
-    if (r != NULL) {
-      /* Update the tot_len field in the first part */
-      for (i = p; i != NULL; i = i->next) {
-        i->tot_len -= r->tot_len;
-        LWIP_ASSERT("tot_len/len mismatch in last pbuf",
-                    (i->next != NULL) || (i->tot_len == i->len));
-      }
-      if (p->flags & PBUF_FLAG_TCP_FIN) {
-        r->flags |= PBUF_FLAG_TCP_FIN;
-      }
-
-      /* tot_len field in rest does not need modifications */
-      /* reference counters do not need modifications */
-      *rest = r;
-    }
-  }
-}
-#endif /* LWIP_TCP && TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-
-/* Actual implementation of pbuf_skip() but returning const pointer... */
-static const struct pbuf*
-pbuf_skip_const(const struct pbuf* in, u16_t in_offset, u16_t* out_offset)
-{
-  u16_t offset_left = in_offset;
-  const struct pbuf* q = in;
-
-  /* get the correct pbuf */
-  while ((q != NULL) && (q->len <= offset_left)) {
-    offset_left -= q->len;
-    q = q->next;
-  }
-  if (out_offset != NULL) {
-    *out_offset = offset_left;
-  }
-  return q;
-}
-
-/**
- * @ingroup pbuf
- * Skip a number of bytes at the start of a pbuf
- *
- * @param in input pbuf
- * @param in_offset offset to skip
- * @param out_offset resulting offset in the returned pbuf
- * @return the pbuf in the queue where the offset is
- */
-struct pbuf*
-pbuf_skip(struct pbuf* in, u16_t in_offset, u16_t* out_offset)
-{
-  const struct pbuf* out = pbuf_skip_const(in, in_offset, out_offset);
-  return LWIP_CONST_CAST(struct pbuf*, out);
-}
-
-/**
- * @ingroup pbuf
- * Copy application supplied data into a pbuf.
- * This function can only be used to copy the equivalent of buf->tot_len data.
- *
- * @param buf pbuf to fill with data
- * @param dataptr application supplied data buffer
- * @param len length of the application supplied data buffer
- *
- * @return ERR_OK if successful, ERR_MEM if the pbuf is not big enough
- */
-err_t
-pbuf_take(struct pbuf *buf, const void *dataptr, u16_t len)
-{
-  struct pbuf *p;
-  u16_t buf_copy_len;
-  u16_t total_copy_len = len;
-  u16_t copied_total = 0;
-
-  LWIP_ERROR("pbuf_take: invalid buf", (buf != NULL), return ERR_ARG;);
-  LWIP_ERROR("pbuf_take: invalid dataptr", (dataptr != NULL), return ERR_ARG;);
-  LWIP_ERROR("pbuf_take: buf not large enough", (buf->tot_len >= len), return ERR_MEM;);
-
-  if ((buf == NULL) || (dataptr == NULL) || (buf->tot_len < len)) {
-    return ERR_ARG;
-  }
-
-  /* Note some systems use byte copy if dataptr or one of the pbuf payload pointers are unaligned. */
-  for (p = buf; total_copy_len != 0; p = p->next) {
-    LWIP_ASSERT("pbuf_take: invalid pbuf", p != NULL);
-    buf_copy_len = total_copy_len;
-    if (buf_copy_len > p->len) {
-      /* this pbuf cannot hold all remaining data */
-      buf_copy_len = p->len;
-    }
-    /* copy the necessary parts of the buffer */
-    MEMCPY(p->payload, &((const char*)dataptr)[copied_total], buf_copy_len);
-    total_copy_len -= buf_copy_len;
-    copied_total += buf_copy_len;
-  }
-  LWIP_ASSERT("did not copy all data", total_copy_len == 0 && copied_total == len);
-  return ERR_OK;
-}
-
-/**
- * @ingroup pbuf
- * Same as pbuf_take() but puts data at an offset
- *
- * @param buf pbuf to fill with data
- * @param dataptr application supplied data buffer
- * @param len length of the application supplied data buffer
- * @param offset offset in pbuf where to copy dataptr to
- *
- * @return ERR_OK if successful, ERR_MEM if the pbuf is not big enough
- */
-err_t
-pbuf_take_at(struct pbuf *buf, const void *dataptr, u16_t len, u16_t offset)
-{
-  u16_t target_offset;
-  struct pbuf* q = pbuf_skip(buf, offset, &target_offset);
-
-  /* return requested data if pbuf is OK */
-  if ((q != NULL) && (q->tot_len >= target_offset + len)) {
-    u16_t remaining_len = len;
-    const u8_t* src_ptr = (const u8_t*)dataptr;
-    /* copy the part that goes into the first pbuf */
-    u16_t first_copy_len = LWIP_MIN(q->len - target_offset, len);
-    MEMCPY(((u8_t*)q->payload) + target_offset, dataptr, first_copy_len);
-    remaining_len -= first_copy_len;
-    src_ptr += first_copy_len;
-    if (remaining_len > 0) {
-      return pbuf_take(q->next, src_ptr, remaining_len);
-    }
-    return ERR_OK;
-  }
-  return ERR_MEM;
-}
-
-/**
- * @ingroup pbuf
- * Creates a single pbuf out of a queue of pbufs.
- *
- * @remark: Either the source pbuf 'p' is freed by this function or the original
- *          pbuf 'p' is returned, therefore the caller has to check the result!
- *
- * @param p the source pbuf
- * @param layer pbuf_layer of the new pbuf
- *
- * @return a new, single pbuf (p->next is NULL)
- *         or the old pbuf if allocation fails
- */
-struct pbuf*
-pbuf_coalesce(struct pbuf *p, pbuf_layer layer)
-{
-  struct pbuf *q;
-  err_t err;
-  if (p->next == NULL) {
-    return p;
-  }
-  q = pbuf_alloc(layer, p->tot_len, PBUF_RAM);
-  if (q == NULL) {
-    /* @todo: what do we do now? */
-    return p;
-  }
-  err = pbuf_copy(q, p);
-  LWIP_UNUSED_ARG(err); /* in case of LWIP_NOASSERT */
-  LWIP_ASSERT("pbuf_copy failed", err == ERR_OK);
-  pbuf_free(p);
-  return q;
-}
-
-#if LWIP_CHECKSUM_ON_COPY
-/**
- * Copies data into a single pbuf (*not* into a pbuf queue!) and updates
- * the checksum while copying
- *
- * @param p the pbuf to copy data into
- * @param start_offset offset of p->payload where to copy the data to
- * @param dataptr data to copy into the pbuf
- * @param len length of data to copy into the pbuf
- * @param chksum pointer to the checksum which is updated
- * @return ERR_OK if successful, another error if the data does not fit
- *         within the (first) pbuf (no pbuf queues!)
- */
-err_t
-pbuf_fill_chksum(struct pbuf *p, u16_t start_offset, const void *dataptr,
-                 u16_t len, u16_t *chksum)
-{
-  u32_t acc;
-  u16_t copy_chksum;
-  char *dst_ptr;
-  LWIP_ASSERT("p != NULL", p != NULL);
-  LWIP_ASSERT("dataptr != NULL", dataptr != NULL);
-  LWIP_ASSERT("chksum != NULL", chksum != NULL);
-  LWIP_ASSERT("len != 0", len != 0);
-
-  if ((start_offset >= p->len) || (start_offset + len > p->len)) {
-    return ERR_ARG;
-  }
-
-  dst_ptr = ((char*)p->payload) + start_offset;
-  copy_chksum = LWIP_CHKSUM_COPY(dst_ptr, dataptr, len);
-  if ((start_offset & 1) != 0) {
-    copy_chksum = SWAP_BYTES_IN_WORD(copy_chksum);
-  }
-  acc = *chksum;
-  acc += copy_chksum;
-  *chksum = FOLD_U32T(acc);
-  return ERR_OK;
-}
-#endif /* LWIP_CHECKSUM_ON_COPY */
-
-/**
- * @ingroup pbuf
- * Get one byte from the specified position in a pbuf
- * WARNING: returns zero for offset >= p->tot_len
- *
- * @param p pbuf to parse
- * @param offset offset into p of the byte to return
- * @return byte at an offset into p OR ZERO IF 'offset' >= p->tot_len
- */
-u8_t
-pbuf_get_at(const struct pbuf* p, u16_t offset)
-{
-  int ret = pbuf_try_get_at(p, offset);
-  if (ret >= 0) {
-    return (u8_t)ret;
-  }
-  return 0;
-}
-
-/**
- * @ingroup pbuf
- * Get one byte from the specified position in a pbuf
- *
- * @param p pbuf to parse
- * @param offset offset into p of the byte to return
- * @return byte at an offset into p [0..0xFF] OR negative if 'offset' >= p->tot_len
- */
-int
-pbuf_try_get_at(const struct pbuf* p, u16_t offset)
-{
-  u16_t q_idx;
-  const struct pbuf* q = pbuf_skip_const(p, offset, &q_idx);
-
-  /* return requested data if pbuf is OK */
-  if ((q != NULL) && (q->len > q_idx)) {
-    return ((u8_t*)q->payload)[q_idx];
-  }
-  return -1;
-}
-
-/**
- * @ingroup pbuf
- * Put one byte to the specified position in a pbuf
- * WARNING: silently ignores offset >= p->tot_len
- *
- * @param p pbuf to fill
- * @param offset offset into p of the byte to write
- * @param data byte to write at an offset into p
- */
-void
-pbuf_put_at(struct pbuf* p, u16_t offset, u8_t data)
-{
-  u16_t q_idx;
-  struct pbuf* q = pbuf_skip(p, offset, &q_idx);
-
-  /* write requested data if pbuf is OK */
-  if ((q != NULL) && (q->len > q_idx)) {
-    ((u8_t*)q->payload)[q_idx] = data;
-  }
-}
-
-/**
- * @ingroup pbuf
- * Compare pbuf contents at specified offset with memory s2, both of length n
- *
- * @param p pbuf to compare
- * @param offset offset into p at which to start comparing
- * @param s2 buffer to compare
- * @param n length of buffer to compare
- * @return zero if equal, nonzero otherwise
- *         (0xffff if p is too short, diffoffset+1 otherwise)
- */
-u16_t
-pbuf_memcmp(const struct pbuf* p, u16_t offset, const void* s2, u16_t n)
-{
-  u16_t start = offset;
-  const struct pbuf* q = p;
-  u16_t i;
- 
-  /* pbuf long enough to perform check? */
-  if(p->tot_len < (offset + n)) {
-    return 0xffff;
-  }
- 
-  /* get the correct pbuf from chain. We know it succeeds because of p->tot_len check above. */
-  while ((q != NULL) && (q->len <= start)) {
-    start -= q->len;
-    q = q->next;
-  }
- 
-  /* return requested data if pbuf is OK */
-  for (i = 0; i < n; i++) {
-    /* We know pbuf_get_at() succeeds because of p->tot_len check above. */
-    u8_t a = pbuf_get_at(q, start + i);
-    u8_t b = ((const u8_t*)s2)[i];
-    if (a != b) {
-      return i+1;
-    }
-  }
-  return 0;
-}
-
-/**
- * @ingroup pbuf
- * Find occurrence of mem (with length mem_len) in pbuf p, starting at offset
- * start_offset.
- *
- * @param p pbuf to search, maximum length is 0xFFFE since 0xFFFF is used as
- *        return value 'not found'
- * @param mem search for the contents of this buffer
- * @param mem_len length of 'mem'
- * @param start_offset offset into p at which to start searching
- * @return 0xFFFF if substr was not found in p or the index where it was found
- */
-u16_t
-pbuf_memfind(const struct pbuf* p, const void* mem, u16_t mem_len, u16_t start_offset)
-{
-  u16_t i;
-  u16_t max = p->tot_len - mem_len;
-  if (p->tot_len >= mem_len + start_offset) {
-    for (i = start_offset; i <= max; i++) {
-      u16_t plus = pbuf_memcmp(p, i, mem, mem_len);
-      if (plus == 0) {
-        return i;
-      }
-    }
-  }
-  return 0xFFFF;
-}
-
-/**
- * Find occurrence of substr with length substr_len in pbuf p, start at offset
- * start_offset
- * WARNING: in contrast to strstr(), this one does not stop at the first \0 in
- * the pbuf/source string!
- *
- * @param p pbuf to search, maximum length is 0xFFFE since 0xFFFF is used as
- *        return value 'not found'
- * @param substr string to search for in p, maximum length is 0xFFFE
- * @return 0xFFFF if substr was not found in p or the index where it was found
- */
-u16_t
-pbuf_strstr(const struct pbuf* p, const char* substr)
-{
-  size_t substr_len;
-  if ((substr == NULL) || (substr[0] == 0) || (p->tot_len == 0xFFFF)) {
-    return 0xFFFF;
-  }
-  substr_len = strlen(substr);
-  if (substr_len >= 0xFFFF) {
-    return 0xFFFF;
-  }
-  return pbuf_memfind(p, substr, (u16_t)substr_len, 0);
-}
diff --git a/sys/net/core/raw.c b/sys/net/core/raw.c
deleted file mode 100644
index db08c6d..0000000
--- a/sys/net/core/raw.c
+++ /dev/null
@@ -1,521 +0,0 @@
-/**
- * @file
- * Implementation of raw protocol PCBs for low-level handling of
- * different types of protocols besides (or overriding) those
- * already available in lwIP.\n
- * See also @ref raw_raw
- * 
- * @defgroup raw_raw RAW
- * @ingroup callbackstyle_api
- * Implementation of raw protocol PCBs for low-level handling of
- * different types of protocols besides (or overriding) those
- * already available in lwIP.\n
- * @see @ref raw_api
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_RAW /* don't build if not configured for use in lwipopts.h */
-
-#include "net/def.h"
-#include "net/memp.h"
-#include "net/ip_addr.h"
-#include "net/netif.h"
-#include "net/raw.h"
-#include "net/stats.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/inet_chksum.h"
-
-#include <string.h>
-
-/** The list of RAW PCBs */
-static struct raw_pcb *raw_pcbs;
-
-static u8_t
-raw_input_match(struct raw_pcb *pcb, u8_t broadcast)
-{
-  LWIP_UNUSED_ARG(broadcast); /* in IPv6 only case */
-
-#if LWIP_IPV4 && LWIP_IPV6
-  /* Dual-stack: PCBs listening to any IP type also listen to any IP address */
-  if (IP_IS_ANY_TYPE_VAL(pcb->local_ip)) {
-#if IP_SOF_BROADCAST_RECV
-    if ((broadcast != 0) && !ip_get_option(pcb, SOF_BROADCAST)) {
-      return 0;
-    }
-#endif /* IP_SOF_BROADCAST_RECV */
-    return 1;
-  }
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-
-  /* Only need to check PCB if incoming IP version matches PCB IP version */
-  if (IP_ADDR_PCB_VERSION_MATCH_EXACT(pcb, ip_current_dest_addr())) {
-#if LWIP_IPV4
-    /* Special case: IPv4 broadcast: receive all broadcasts
-     * Note: broadcast variable can only be 1 if it is an IPv4 broadcast */
-    if (broadcast != 0) {
-#if IP_SOF_BROADCAST_RECV
-      if (ip_get_option(pcb, SOF_BROADCAST))
-#endif /* IP_SOF_BROADCAST_RECV */
-      {
-        if (ip4_addr_isany(ip_2_ip4(&pcb->local_ip))) {
-          return 1;
-        }
-      }
-    } else
-#endif /* LWIP_IPV4 */
-    /* Handle IPv4 and IPv6: catch all or exact match */
-    if (ip_addr_isany(&pcb->local_ip) ||
-       ip_addr_cmp(&pcb->local_ip, ip_current_dest_addr())) {
-      return 1;
-    }
-  }
-
-  return 0;
-}
-
-/**
- * Determine if in incoming IP packet is covered by a RAW PCB
- * and if so, pass it to a user-provided receive callback function.
- *
- * Given an incoming IP datagram (as a chain of pbufs) this function
- * finds a corresponding RAW PCB and calls the corresponding receive
- * callback function.
- *
- * @param p pbuf to be demultiplexed to a RAW PCB.
- * @param inp network interface on which the datagram was received.
- * @return - 1 if the packet has been eaten by a RAW PCB receive
- *           callback function. The caller MAY NOT not reference the
- *           packet any longer, and MAY NOT call pbuf_free().
- * @return - 0 if packet is not eaten (pbuf is still referenced by the
- *           caller).
- *
- */
-u8_t
-raw_input(struct pbuf *p, struct netif *inp)
-{
-  struct raw_pcb *pcb, *prev;
-  s16_t proto;
-  u8_t eaten = 0;
-  u8_t broadcast = ip_addr_isbroadcast(ip_current_dest_addr(), ip_current_netif());
-
-  LWIP_UNUSED_ARG(inp);
-
-#if LWIP_IPV6
-#if LWIP_IPV4
-  if (IP_HDR_GET_VERSION(p->payload) == 6)
-#endif /* LWIP_IPV4 */
-  {
-    struct ip6_hdr *ip6hdr = (struct ip6_hdr *)p->payload;
-    proto = IP6H_NEXTH(ip6hdr);
-  }
-#if LWIP_IPV4
-  else
-#endif /* LWIP_IPV4 */
-#endif /* LWIP_IPV6 */
-#if LWIP_IPV4
-  {
-    proto = IPH_PROTO((struct ip_hdr *)p->payload);
-  }
-#endif /* LWIP_IPV4 */
-
-  prev = NULL;
-  pcb = raw_pcbs;
-  /* loop through all raw pcbs until the packet is eaten by one */
-  /* this allows multiple pcbs to match against the packet by design */
-  while ((eaten == 0) && (pcb != NULL)) {
-    if ((pcb->protocol == proto) && raw_input_match(pcb, broadcast)) {
-      /* receive callback function available? */
-      if (pcb->recv != NULL) {
-#ifndef LWIP_NOASSERT
-        void* old_payload = p->payload;
-#endif
-        /* the receive callback function did not eat the packet? */
-        eaten = pcb->recv(pcb->recv_arg, pcb, p, ip_current_src_addr());
-        if (eaten != 0) {
-          /* receive function ate the packet */
-          p = NULL;
-          eaten = 1;
-          if (prev != NULL) {
-          /* move the pcb to the front of raw_pcbs so that is
-             found faster next time */
-            prev->next = pcb->next;
-            pcb->next = raw_pcbs;
-            raw_pcbs = pcb;
-          }
-        } else {
-          /* sanity-check that the receive callback did not alter the pbuf */
-          LWIP_ASSERT("raw pcb recv callback altered pbuf payload pointer without eating packet",
-            p->payload == old_payload);
-        }
-      }
-      /* no receive callback function was set for this raw PCB */
-    }
-    /* drop the packet */
-    prev = pcb;
-    pcb = pcb->next;
-  }
-  return eaten;
-}
-
-/**
- * @ingroup raw_raw
- * Bind a RAW PCB.
- *
- * @param pcb RAW PCB to be bound with a local address ipaddr.
- * @param ipaddr local IP address to bind with. Use IP4_ADDR_ANY to
- * bind to all local interfaces.
- *
- * @return lwIP error code.
- * - ERR_OK. Successful. No error occurred.
- * - ERR_USE. The specified IP address is already bound to by
- * another RAW PCB.
- *
- * @see raw_disconnect()
- */
-err_t
-raw_bind(struct raw_pcb *pcb, const ip_addr_t *ipaddr)
-{
-  if ((pcb == NULL) || (ipaddr == NULL)) {
-    return ERR_VAL;
-  }
-  ip_addr_set_ipaddr(&pcb->local_ip, ipaddr);
-  return ERR_OK;
-}
-
-/**
- * @ingroup raw_raw
- * Connect an RAW PCB. This function is required by upper layers
- * of lwip. Using the raw api you could use raw_sendto() instead
- *
- * This will associate the RAW PCB with the remote address.
- *
- * @param pcb RAW PCB to be connected with remote address ipaddr and port.
- * @param ipaddr remote IP address to connect with.
- *
- * @return lwIP error code
- *
- * @see raw_disconnect() and raw_sendto()
- */
-err_t
-raw_connect(struct raw_pcb *pcb, const ip_addr_t *ipaddr)
-{
-  if ((pcb == NULL) || (ipaddr == NULL)) {
-    return ERR_VAL;
-  }
-  ip_addr_set_ipaddr(&pcb->remote_ip, ipaddr);
-  return ERR_OK;
-}
-
-/**
- * @ingroup raw_raw
- * Set the callback function for received packets that match the
- * raw PCB's protocol and binding.
- *
- * The callback function MUST either
- * - eat the packet by calling pbuf_free() and returning non-zero. The
- *   packet will not be passed to other raw PCBs or other protocol layers.
- * - not free the packet, and return zero. The packet will be matched
- *   against further PCBs and/or forwarded to another protocol layers.
- */
-void
-raw_recv(struct raw_pcb *pcb, raw_recv_fn recv, void *recv_arg)
-{
-  /* remember recv() callback and user data */
-  pcb->recv = recv;
-  pcb->recv_arg = recv_arg;
-}
-
-/**
- * @ingroup raw_raw
- * Send the raw IP packet to the given address. Note that actually you cannot
- * modify the IP headers (this is inconsistent with the receive callback where
- * you actually get the IP headers), you can only specify the IP payload here.
- * It requires some more changes in lwIP. (there will be a raw_send() function
- * then.)
- *
- * @param pcb the raw pcb which to send
- * @param p the IP payload to send
- * @param ipaddr the destination address of the IP packet
- *
- */
-err_t
-raw_sendto(struct raw_pcb *pcb, struct pbuf *p, const ip_addr_t *ipaddr)
-{
-  err_t err;
-  struct netif *netif;
-  const ip_addr_t *src_ip;
-  struct pbuf *q; /* q will be sent down the stack */
-  s16_t header_size;
-
-  if ((pcb == NULL) || (ipaddr == NULL) || !IP_ADDR_PCB_VERSION_MATCH(pcb, ipaddr)) {
-    return ERR_VAL;
-  }
-
-  LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_TRACE, ("raw_sendto\n"));
-
-  header_size = (
-#if LWIP_IPV4 && LWIP_IPV6
-    IP_IS_V6(ipaddr) ? IP6_HLEN : IP_HLEN);
-#elif LWIP_IPV4
-    IP_HLEN);
-#else
-    IP6_HLEN);
-#endif
-
-  /* not enough space to add an IP header to first pbuf in given p chain? */
-  if (pbuf_header(p, header_size)) {
-    /* allocate header in new pbuf */
-    q = pbuf_alloc(PBUF_IP, 0, PBUF_RAM);
-    /* new header pbuf could not be allocated? */
-    if (q == NULL) {
-      LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("raw_sendto: could not allocate header\n"));
-      return ERR_MEM;
-    }
-    if (p->tot_len != 0) {
-      /* chain header q in front of given pbuf p */
-      pbuf_chain(q, p);
-    }
-    /* { first pbuf q points to header pbuf } */
-    LWIP_DEBUGF(RAW_DEBUG, ("raw_sendto: added header pbuf %p before given pbuf %p\n", (void *)q, (void *)p));
-  } else {
-    /* first pbuf q equals given pbuf */
-    q = p;
-    if (pbuf_header(q, -header_size)) {
-      LWIP_ASSERT("Can't restore header we just removed!", 0);
-      return ERR_MEM;
-    }
-  }
-
-  if(IP_IS_ANY_TYPE_VAL(pcb->local_ip)) {
-    /* Don't call ip_route() with IP_ANY_TYPE */
-    netif = ip_route(IP46_ADDR_ANY(IP_GET_TYPE(ipaddr)), ipaddr);
-  } else {
-    netif = ip_route(&pcb->local_ip, ipaddr);
-  }
-
-  if (netif == NULL) {
-    LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_LEVEL_WARNING, ("raw_sendto: No route to "));
-    ip_addr_debug_print(RAW_DEBUG | LWIP_DBG_LEVEL_WARNING, ipaddr);
-    /* free any temporary header pbuf allocated by pbuf_header() */
-    if (q != p) {
-      pbuf_free(q);
-    }
-    return ERR_RTE;
-  }
-
-#if IP_SOF_BROADCAST
-  if (IP_IS_V4(ipaddr))
-  {
-    /* broadcast filter? */
-    if (!ip_get_option(pcb, SOF_BROADCAST) && ip_addr_isbroadcast(ipaddr, netif)) {
-      LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_LEVEL_WARNING, ("raw_sendto: SOF_BROADCAST not enabled on pcb %p\n", (void *)pcb));
-      /* free any temporary header pbuf allocated by pbuf_header() */
-      if (q != p) {
-        pbuf_free(q);
-      }
-      return ERR_VAL;
-    }
-  }
-#endif /* IP_SOF_BROADCAST */
-
-  if (ip_addr_isany(&pcb->local_ip)) {
-    /* use outgoing network interface IP address as source address */
-    src_ip = ip_netif_get_local_ip(netif, ipaddr);
-#if LWIP_IPV6
-    if (src_ip == NULL) {
-      if (q != p) {
-        pbuf_free(q);
-      }
-      return ERR_RTE;
-    }
-#endif /* LWIP_IPV6 */
-  } else {
-    /* use RAW PCB local IP address as source address */
-    src_ip = &pcb->local_ip;
-  }
-
-#if LWIP_IPV6
-  /* If requested, based on the IPV6_CHECKSUM socket option per RFC3542,
-     compute the checksum and update the checksum in the payload. */
-  if (IP_IS_V6(ipaddr) && pcb->chksum_reqd) {
-    u16_t chksum = ip6_chksum_pseudo(p, pcb->protocol, p->tot_len, ip_2_ip6(src_ip), ip_2_ip6(ipaddr));
-    LWIP_ASSERT("Checksum must fit into first pbuf", p->len >= (pcb->chksum_offset + 2));
-    SMEMCPY(((u8_t *)p->payload) + pcb->chksum_offset, &chksum, sizeof(u16_t));
-  }
-#endif
-
-  NETIF_SET_HWADDRHINT(netif, &pcb->addr_hint);
-  err = ip_output_if(q, src_ip, ipaddr, pcb->ttl, pcb->tos, pcb->protocol, netif);
-  NETIF_SET_HWADDRHINT(netif, NULL);
-
-  /* did we chain a header earlier? */
-  if (q != p) {
-    /* free the header */
-    pbuf_free(q);
-  }
-  return err;
-}
-
-/**
- * @ingroup raw_raw
- * Send the raw IP packet to the address given by raw_connect()
- *
- * @param pcb the raw pcb which to send
- * @param p the IP payload to send
- *
- */
-err_t
-raw_send(struct raw_pcb *pcb, struct pbuf *p)
-{
-  return raw_sendto(pcb, p, &pcb->remote_ip);
-}
-
-/**
- * @ingroup raw_raw
- * Remove an RAW PCB.
- *
- * @param pcb RAW PCB to be removed. The PCB is removed from the list of
- * RAW PCB's and the data structure is freed from memory.
- *
- * @see raw_new()
- */
-void
-raw_remove(struct raw_pcb *pcb)
-{
-  struct raw_pcb *pcb2;
-  /* pcb to be removed is first in list? */
-  if (raw_pcbs == pcb) {
-    /* make list start at 2nd pcb */
-    raw_pcbs = raw_pcbs->next;
-    /* pcb not 1st in list */
-  } else {
-    for (pcb2 = raw_pcbs; pcb2 != NULL; pcb2 = pcb2->next) {
-      /* find pcb in raw_pcbs list */
-      if (pcb2->next != NULL && pcb2->next == pcb) {
-        /* remove pcb from list */
-        pcb2->next = pcb->next;
-        break;
-      }
-    }
-  }
-  memp_free(MEMP_RAW_PCB, pcb);
-}
-
-/**
- * @ingroup raw_raw
- * Create a RAW PCB.
- *
- * @return The RAW PCB which was created. NULL if the PCB data structure
- * could not be allocated.
- *
- * @param proto the protocol number of the IPs payload (e.g. IP_PROTO_ICMP)
- *
- * @see raw_remove()
- */
-struct raw_pcb *
-raw_new(u8_t proto)
-{
-  struct raw_pcb *pcb;
-
-  LWIP_DEBUGF(RAW_DEBUG | LWIP_DBG_TRACE, ("raw_new\n"));
-
-  pcb = (struct raw_pcb *)memp_malloc(MEMP_RAW_PCB);
-  /* could allocate RAW PCB? */
-  if (pcb != NULL) {
-    /* initialize PCB to all zeroes */
-    memset(pcb, 0, sizeof(struct raw_pcb));
-    pcb->protocol = proto;
-    pcb->ttl = RAW_TTL;
-    pcb->next = raw_pcbs;
-    raw_pcbs = pcb;
-  }
-  return pcb;
-}
-
-/**
- * @ingroup raw_raw
- * Create a RAW PCB for specific IP type.
- *
- * @return The RAW PCB which was created. NULL if the PCB data structure
- * could not be allocated.
- *
- * @param type IP address type, see @ref lwip_ip_addr_type definitions.
- * If you want to listen to IPv4 and IPv6 (dual-stack) packets,
- * supply @ref IPADDR_TYPE_ANY as argument and bind to @ref IP_ANY_TYPE.
- * @param proto the protocol number (next header) of the IPv6 packet payload
- *              (e.g. IP6_NEXTH_ICMP6)
- *
- * @see raw_remove()
- */
-struct raw_pcb *
-raw_new_ip_type(u8_t type, u8_t proto)
-{
-  struct raw_pcb *pcb;
-  pcb = raw_new(proto);
-#if LWIP_IPV4 && LWIP_IPV6
-  if (pcb != NULL) {
-    IP_SET_TYPE_VAL(pcb->local_ip,  type);
-    IP_SET_TYPE_VAL(pcb->remote_ip, type);
-  }
-#else /* LWIP_IPV4 && LWIP_IPV6 */
-  LWIP_UNUSED_ARG(type);
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-  return pcb;
-}
-
-/** This function is called from netif.c when address is changed
- *
- * @param old_addr IP address of the netif before change
- * @param new_addr IP address of the netif after change
- */
-void raw_netif_ip_addr_changed(const ip_addr_t* old_addr, const ip_addr_t* new_addr)
-{
-  struct raw_pcb* rpcb;
-
-  if (!ip_addr_isany(old_addr) && !ip_addr_isany(new_addr)) {
-    for (rpcb = raw_pcbs; rpcb != NULL; rpcb = rpcb->next) {
-      /* PCB bound to current local interface address? */
-      if (ip_addr_cmp(&rpcb->local_ip, old_addr)) {
-        /* The PCB is bound to the old ipaddr and
-         * is set to bound to the new one instead */
-        ip_addr_copy(rpcb->local_ip, *new_addr);
-      }
-    }
-  }
-}
-
-#endif /* LWIP_RAW */
diff --git a/sys/net/core/stats.c b/sys/net/core/stats.c
deleted file mode 100644
index 6eb670b..0000000
--- a/sys/net/core/stats.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- * @file
- * Statistics module
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_STATS /* don't build if not configured for use in lwipopts.h */
-
-#include "net/def.h"
-#include "net/stats.h"
-#include "net/mem.h"
-#include "net/debug.h"
-
-#include <string.h>
-
-struct stats_ lwip_stats;
-
-void
-stats_init(void)
-{
-#ifdef LWIP_DEBUG
-#if MEM_STATS
-  lwip_stats.mem.name = "MEM";
-#endif /* MEM_STATS */
-#endif /* LWIP_DEBUG */
-}
-
-#if LWIP_STATS_DISPLAY
-void
-stats_display_proto(struct stats_proto *proto, const char *name)
-{
-  LWIP_PLATFORM_DIAG(("\n%s\n\t", name));
-  LWIP_PLATFORM_DIAG(("xmit: %"STAT_COUNTER_F"\n\t", proto->xmit));
-  LWIP_PLATFORM_DIAG(("recv: %"STAT_COUNTER_F"\n\t", proto->recv));
-  LWIP_PLATFORM_DIAG(("fw: %"STAT_COUNTER_F"\n\t", proto->fw));
-  LWIP_PLATFORM_DIAG(("drop: %"STAT_COUNTER_F"\n\t", proto->drop));
-  LWIP_PLATFORM_DIAG(("chkerr: %"STAT_COUNTER_F"\n\t", proto->chkerr));
-  LWIP_PLATFORM_DIAG(("lenerr: %"STAT_COUNTER_F"\n\t", proto->lenerr));
-  LWIP_PLATFORM_DIAG(("memerr: %"STAT_COUNTER_F"\n\t", proto->memerr));
-  LWIP_PLATFORM_DIAG(("rterr: %"STAT_COUNTER_F"\n\t", proto->rterr));
-  LWIP_PLATFORM_DIAG(("proterr: %"STAT_COUNTER_F"\n\t", proto->proterr));
-  LWIP_PLATFORM_DIAG(("opterr: %"STAT_COUNTER_F"\n\t", proto->opterr));
-  LWIP_PLATFORM_DIAG(("err: %"STAT_COUNTER_F"\n\t", proto->err));
-  LWIP_PLATFORM_DIAG(("cachehit: %"STAT_COUNTER_F"\n", proto->cachehit));
-}
-
-#if IGMP_STATS || MLD6_STATS
-void
-stats_display_igmp(struct stats_igmp *igmp, const char *name)
-{
-  LWIP_PLATFORM_DIAG(("\n%s\n\t", name));
-  LWIP_PLATFORM_DIAG(("xmit: %"STAT_COUNTER_F"\n\t", igmp->xmit));
-  LWIP_PLATFORM_DIAG(("recv: %"STAT_COUNTER_F"\n\t", igmp->recv));
-  LWIP_PLATFORM_DIAG(("drop: %"STAT_COUNTER_F"\n\t", igmp->drop));
-  LWIP_PLATFORM_DIAG(("chkerr: %"STAT_COUNTER_F"\n\t", igmp->chkerr));
-  LWIP_PLATFORM_DIAG(("lenerr: %"STAT_COUNTER_F"\n\t", igmp->lenerr));
-  LWIP_PLATFORM_DIAG(("memerr: %"STAT_COUNTER_F"\n\t", igmp->memerr));
-  LWIP_PLATFORM_DIAG(("proterr: %"STAT_COUNTER_F"\n\t", igmp->proterr));
-  LWIP_PLATFORM_DIAG(("rx_v1: %"STAT_COUNTER_F"\n\t", igmp->rx_v1));
-  LWIP_PLATFORM_DIAG(("rx_group: %"STAT_COUNTER_F"\n\t", igmp->rx_group));
-  LWIP_PLATFORM_DIAG(("rx_general: %"STAT_COUNTER_F"\n\t", igmp->rx_general));
-  LWIP_PLATFORM_DIAG(("rx_report: %"STAT_COUNTER_F"\n\t", igmp->rx_report));
-  LWIP_PLATFORM_DIAG(("tx_join: %"STAT_COUNTER_F"\n\t", igmp->tx_join));
-  LWIP_PLATFORM_DIAG(("tx_leave: %"STAT_COUNTER_F"\n\t", igmp->tx_leave));
-  LWIP_PLATFORM_DIAG(("tx_report: %"STAT_COUNTER_F"\n", igmp->tx_report));
-}
-#endif /* IGMP_STATS || MLD6_STATS */
-
-#if MEM_STATS || MEMP_STATS
-void
-stats_display_mem(struct stats_mem *mem, const char *name)
-{
-  LWIP_PLATFORM_DIAG(("\nMEM %s\n\t", name));
-  LWIP_PLATFORM_DIAG(("avail: %"U32_F"\n\t", (u32_t)mem->avail));
-  LWIP_PLATFORM_DIAG(("used: %"U32_F"\n\t", (u32_t)mem->used));
-  LWIP_PLATFORM_DIAG(("max: %"U32_F"\n\t", (u32_t)mem->max));
-  LWIP_PLATFORM_DIAG(("err: %"U32_F"\n", (u32_t)mem->err));
-}
-
-#if MEMP_STATS
-void
-stats_display_memp(struct stats_mem *mem, int index)
-{
-  if (index < MEMP_MAX) {
-    stats_display_mem(mem, mem->name);
-  }
-}
-#endif /* MEMP_STATS */
-#endif /* MEM_STATS || MEMP_STATS */
-
-#if SYS_STATS
-void
-stats_display_sys(struct stats_sys *sys)
-{
-  LWIP_PLATFORM_DIAG(("\nSYS\n\t"));
-  LWIP_PLATFORM_DIAG(("sem.used:  %"U32_F"\n\t", (u32_t)sys->sem.used));
-  LWIP_PLATFORM_DIAG(("sem.max:   %"U32_F"\n\t", (u32_t)sys->sem.max));
-  LWIP_PLATFORM_DIAG(("sem.err:   %"U32_F"\n\t", (u32_t)sys->sem.err));
-  LWIP_PLATFORM_DIAG(("mutex.used: %"U32_F"\n\t", (u32_t)sys->mutex.used));
-  LWIP_PLATFORM_DIAG(("mutex.max:  %"U32_F"\n\t", (u32_t)sys->mutex.max));
-  LWIP_PLATFORM_DIAG(("mutex.err:  %"U32_F"\n\t", (u32_t)sys->mutex.err));
-  LWIP_PLATFORM_DIAG(("mbox.used:  %"U32_F"\n\t", (u32_t)sys->mbox.used));
-  LWIP_PLATFORM_DIAG(("mbox.max:   %"U32_F"\n\t", (u32_t)sys->mbox.max));
-  LWIP_PLATFORM_DIAG(("mbox.err:   %"U32_F"\n", (u32_t)sys->mbox.err));
-}
-#endif /* SYS_STATS */
-
-void
-stats_display(void)
-{
-  s16_t i;
-
-  LINK_STATS_DISPLAY();
-  ETHARP_STATS_DISPLAY();
-  IPFRAG_STATS_DISPLAY();
-  IP6_FRAG_STATS_DISPLAY();
-  IP_STATS_DISPLAY();
-  ND6_STATS_DISPLAY();
-  IP6_STATS_DISPLAY();
-  IGMP_STATS_DISPLAY();
-  MLD6_STATS_DISPLAY();
-  ICMP_STATS_DISPLAY();
-  ICMP6_STATS_DISPLAY();
-  UDP_STATS_DISPLAY();
-  TCP_STATS_DISPLAY();
-  MEM_STATS_DISPLAY();
-  for (i = 0; i < MEMP_MAX; i++) {
-    MEMP_STATS_DISPLAY(i);
-  }
-  SYS_STATS_DISPLAY();
-}
-#endif /* LWIP_STATS_DISPLAY */
-
-#endif /* LWIP_STATS */
-
diff --git a/sys/net/core/sys.c b/sys/net/core/sys.c
deleted file mode 100644
index 0351ff8..0000000
--- a/sys/net/core/sys.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- * @file
- * lwIP Operating System abstraction
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-/**
- * @defgroup sys_layer Porting (system abstraction layer)
- * @ingroup lwip
- * @verbinclude "sys_arch.txt"
- *
- * @defgroup sys_os OS abstraction layer
- * @ingroup sys_layer
- * No need to implement functions in this section in NO_SYS mode.
- *
- * @defgroup sys_sem Semaphores
- * @ingroup sys_os
- *
- * @defgroup sys_mutex Mutexes
- * @ingroup sys_os
- * Mutexes are recommended to correctly handle priority inversion,
- * especially if you use LWIP_CORE_LOCKING .
- *
- * @defgroup sys_mbox Mailboxes
- * @ingroup sys_os
- *
- * @defgroup sys_time Time
- * @ingroup sys_layer
- *
- * @defgroup sys_prot Critical sections
- * @ingroup sys_layer
- * Used to protect short regions of code against concurrent access.
- * - Your system is a bare-metal system (probably with an RTOS)
- *   and interrupts are under your control:
- *   Implement this as LockInterrupts() / UnlockInterrupts()
- * - Your system uses an RTOS with deferred interrupt handling from a
- *   worker thread: Implement as a global mutex or lock/unlock scheduler
- * - Your system uses a high-level OS with e.g. POSIX signals:
- *   Implement as a global mutex
- *
- * @defgroup sys_misc Misc
- * @ingroup sys_os
- */
-
-#include "net/opt.h"
-
-#include "net/sys.h"
-
-/* Most of the functions defined in sys.h must be implemented in the
- * architecture-dependent file sys_arch.c */
-
-#if !NO_SYS
-
-#ifndef sys_msleep
-/**
- * Sleep for some ms. Timeouts are NOT processed while sleeping.
- *
- * @param ms number of milliseconds to sleep
- */
-void
-sys_msleep(u32_t ms)
-{
-  if (ms > 0) {
-    sys_sem_t delaysem;
-    err_t err = sys_sem_new(&delaysem, 0);
-    if (err == ERR_OK) {
-      sys_arch_sem_wait(&delaysem, ms);
-      sys_sem_free(&delaysem);
-    }
-  }
-}
-#endif /* sys_msleep */
-
-#endif /* !NO_SYS */
diff --git a/sys/net/core/tcp.c b/sys/net/core/tcp.c
deleted file mode 100644
index fb40817..0000000
--- a/sys/net/core/tcp.c
+++ /dev/null
@@ -1,2169 +0,0 @@
-/**
- * @file 
- * Transmission Control Protocol for IP
- * See also @ref tcp_raw
- *
- * @defgroup tcp_raw TCP
- * @ingroup callbackstyle_api
- * Transmission Control Protocol for IP\n
- * @see @ref raw_api and @ref netconn
- *
- * Common functions for the TCP implementation, such as functinos
- * for manipulating the data structures and the TCP timer functions. TCP functions
- * related to input and output is found in tcp_in.c and tcp_out.c respectively.\n
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/def.h"
-#include "net/mem.h"
-#include "net/memp.h"
-#include "net/tcp.h"
-#include "net/priv/tcp_priv.h"
-#include "net/debug.h"
-#include "net/stats.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/nd6.h"
-
-#include <string.h>
-
-#ifdef LWIP_HOOK_FILENAME
-#include LWIP_HOOK_FILENAME
-#endif
-
-#ifndef TCP_LOCAL_PORT_RANGE_START
-/* From http://www.iana.org/assignments/port-numbers:
-   "The Dynamic and/or Private Ports are those from 49152 through 65535" */
-#define TCP_LOCAL_PORT_RANGE_START        0xc000
-#define TCP_LOCAL_PORT_RANGE_END          0xffff
-#define TCP_ENSURE_LOCAL_PORT_RANGE(port) ((u16_t)(((port) & ~TCP_LOCAL_PORT_RANGE_START) + TCP_LOCAL_PORT_RANGE_START))
-#endif
-
-#if LWIP_TCP_KEEPALIVE
-#define TCP_KEEP_DUR(pcb)   ((pcb)->keep_cnt * (pcb)->keep_intvl)
-#define TCP_KEEP_INTVL(pcb) ((pcb)->keep_intvl)
-#else /* LWIP_TCP_KEEPALIVE */
-#define TCP_KEEP_DUR(pcb)   TCP_MAXIDLE
-#define TCP_KEEP_INTVL(pcb) TCP_KEEPINTVL_DEFAULT
-#endif /* LWIP_TCP_KEEPALIVE */
-
-/* As initial send MSS, we use TCP_MSS but limit it to 536. */
-#if TCP_MSS > 536
-#define INITIAL_MSS 536
-#else
-#define INITIAL_MSS TCP_MSS
-#endif
-
-static const char * const tcp_state_str[] = {
-  "CLOSED",
-  "LISTEN",
-  "SYN_SENT",
-  "SYN_RCVD",
-  "ESTABLISHED",
-  "FIN_WAIT_1",
-  "FIN_WAIT_2",
-  "CLOSE_WAIT",
-  "CLOSING",
-  "LAST_ACK",
-  "TIME_WAIT"
-};
-
-/* last local TCP port */
-static u16_t tcp_port = TCP_LOCAL_PORT_RANGE_START;
-
-/* Incremented every coarse grained timer shot (typically every 500 ms). */
-u32_t tcp_ticks;
-static const u8_t tcp_backoff[13] =
-    { 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7};
- /* Times per slowtmr hits */
-static const u8_t tcp_persist_backoff[7] = { 3, 6, 12, 24, 48, 96, 120 };
-
-/* The TCP PCB lists. */
-
-/** List of all TCP PCBs bound but not yet (connected || listening) */
-struct tcp_pcb *tcp_bound_pcbs;
-/** List of all TCP PCBs in LISTEN state */
-union tcp_listen_pcbs_t tcp_listen_pcbs;
-/** List of all TCP PCBs that are in a state in which
- * they accept or send data. */
-struct tcp_pcb *tcp_active_pcbs;
-/** List of all TCP PCBs in TIME-WAIT state */
-struct tcp_pcb *tcp_tw_pcbs;
-
-/** An array with all (non-temporary) PCB lists, mainly used for smaller code size */
-struct tcp_pcb ** const tcp_pcb_lists[] = {&tcp_listen_pcbs.pcbs, &tcp_bound_pcbs,
-  &tcp_active_pcbs, &tcp_tw_pcbs};
-
-u8_t tcp_active_pcbs_changed;
-
-/** Timer counter to handle calling slow-timer from tcp_tmr() */
-static u8_t tcp_timer;
-static u8_t tcp_timer_ctr;
-static u16_t tcp_new_port(void);
-
-static err_t tcp_close_shutdown_fin(struct tcp_pcb *pcb);
-
-/**
- * Initialize this module.
- */
-void
-tcp_init(void)
-{
-#if LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS && defined(LWIP_RAND)
-  tcp_port = TCP_ENSURE_LOCAL_PORT_RANGE(LWIP_RAND());
-#endif /* LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS && defined(LWIP_RAND) */
-}
-
-/**
- * Called periodically to dispatch TCP timers.
- */
-void
-tcp_tmr(void)
-{
-  /* Call tcp_fasttmr() every 250 ms */
-  tcp_fasttmr();
-
-  if (++tcp_timer & 1) {
-    /* Call tcp_slowtmr() every 500 ms, i.e., every other timer
-       tcp_tmr() is called. */
-    tcp_slowtmr();
-  }
-}
-
-#if LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG
-/** Called when a listen pcb is closed. Iterates one pcb list and removes the
- * closed listener pcb from pcb->listener if matching.
- */
-static void
-tcp_remove_listener(struct tcp_pcb *list, struct tcp_pcb_listen *lpcb)
-{
-   struct tcp_pcb *pcb;
-   for (pcb = list; pcb != NULL; pcb = pcb->next) {
-      if (pcb->listener == lpcb) {
-         pcb->listener = NULL;
-      }
-   }
-}
-#endif
-
-/** Called when a listen pcb is closed. Iterates all pcb lists and removes the
- * closed listener pcb from pcb->listener if matching.
- */
-static void
-tcp_listen_closed(struct tcp_pcb *pcb)
-{
-#if LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG
-  size_t i;
-  LWIP_ASSERT("pcb != NULL", pcb != NULL);
-  LWIP_ASSERT("pcb->state == LISTEN", pcb->state == LISTEN);
-  for (i = 1; i < LWIP_ARRAYSIZE(tcp_pcb_lists); i++) {
-    tcp_remove_listener(*tcp_pcb_lists[i], (struct tcp_pcb_listen*)pcb);
-  }
-#endif
-  LWIP_UNUSED_ARG(pcb);
-}
-
-#if TCP_LISTEN_BACKLOG
-/** @ingroup tcp_raw
- * Delay accepting a connection in respect to the listen backlog:
- * the number of outstanding connections is increased until
- * tcp_backlog_accepted() is called.
- *
- * ATTENTION: the caller is responsible for calling tcp_backlog_accepted()
- * or else the backlog feature will get out of sync!
- *
- * @param pcb the connection pcb which is not fully accepted yet
- */
-void
-tcp_backlog_delayed(struct tcp_pcb* pcb)
-{
-  LWIP_ASSERT("pcb != NULL", pcb != NULL);
-  if ((pcb->flags & TF_BACKLOGPEND) == 0) {
-    if (pcb->listener != NULL) {
-      pcb->listener->accepts_pending++;
-      LWIP_ASSERT("accepts_pending != 0", pcb->listener->accepts_pending != 0);
-      pcb->flags |= TF_BACKLOGPEND;
-    }
-  }
-}
-
-/** @ingroup tcp_raw
- * A delayed-accept a connection is accepted (or closed/aborted): decreases
- * the number of outstanding connections after calling tcp_backlog_delayed().
- *
- * ATTENTION: the caller is responsible for calling tcp_backlog_accepted()
- * or else the backlog feature will get out of sync!
- *
- * @param pcb the connection pcb which is now fully accepted (or closed/aborted)
- */
-void
-tcp_backlog_accepted(struct tcp_pcb* pcb)
-{
-  LWIP_ASSERT("pcb != NULL", pcb != NULL);
-  if ((pcb->flags & TF_BACKLOGPEND) != 0) {
-    if (pcb->listener != NULL) {
-      LWIP_ASSERT("accepts_pending != 0", pcb->listener->accepts_pending != 0);
-      pcb->listener->accepts_pending--;
-      pcb->flags &= ~TF_BACKLOGPEND;
-    }
-  }
-}
-#endif /* TCP_LISTEN_BACKLOG */
-
-/**
- * Closes the TX side of a connection held by the PCB.
- * For tcp_close(), a RST is sent if the application didn't receive all data
- * (tcp_recved() not called for all data passed to recv callback).
- *
- * Listening pcbs are freed and may not be referenced any more.
- * Connection pcbs are freed if not yet connected and may not be referenced
- * any more. If a connection is established (at least SYN received or in
- * a closing state), the connection is closed, and put in a closing state.
- * The pcb is then automatically freed in tcp_slowtmr(). It is therefore
- * unsafe to reference it.
- *
- * @param pcb the tcp_pcb to close
- * @return ERR_OK if connection has been closed
- *         another err_t if closing failed and pcb is not freed
- */
-static err_t
-tcp_close_shutdown(struct tcp_pcb *pcb, u8_t rst_on_unacked_data)
-{
-  if (rst_on_unacked_data && ((pcb->state == ESTABLISHED) || (pcb->state == CLOSE_WAIT))) {
-    if ((pcb->refused_data != NULL) || (pcb->rcv_wnd != TCP_WND_MAX(pcb))) {
-      /* Not all data received by application, send RST to tell the remote
-         side about this. */
-      LWIP_ASSERT("pcb->flags & TF_RXCLOSED", pcb->flags & TF_RXCLOSED);
-
-      /* don't call tcp_abort here: we must not deallocate the pcb since
-         that might not be expected when calling tcp_close */
-      tcp_rst(pcb->snd_nxt, pcb->rcv_nxt, &pcb->local_ip, &pcb->remote_ip,
-               pcb->local_port, pcb->remote_port);
-
-      tcp_pcb_purge(pcb);
-      TCP_RMV_ACTIVE(pcb);
-      if (pcb->state == ESTABLISHED) {
-        /* move to TIME_WAIT since we close actively */
-        pcb->state = TIME_WAIT;
-        TCP_REG(&tcp_tw_pcbs, pcb);
-      } else {
-        /* CLOSE_WAIT: deallocate the pcb since we already sent a RST for it */
-        if (tcp_input_pcb == pcb) {
-          /* prevent using a deallocated pcb: free it from tcp_input later */
-          tcp_trigger_input_pcb_close();
-        } else {
-          memp_free(MEMP_TCP_PCB, pcb);
-        }
-      }
-      return ERR_OK;
-    }
-  }
-
-  /* - states which free the pcb are handled here,
-     - states which send FIN and change state are handled in tcp_close_shutdown_fin() */
-  switch (pcb->state) {
-  case CLOSED:
-    /* Closing a pcb in the CLOSED state might seem erroneous,
-     * however, it is in this state once allocated and as yet unused
-     * and the user needs some way to free it should the need arise.
-     * Calling tcp_close() with a pcb that has already been closed, (i.e. twice)
-     * or for a pcb that has been used and then entered the CLOSED state
-     * is erroneous, but this should never happen as the pcb has in those cases
-     * been freed, and so any remaining handles are bogus. */
-    if (pcb->local_port != 0) {
-      TCP_RMV(&tcp_bound_pcbs, pcb);
-    }
-    memp_free(MEMP_TCP_PCB, pcb);
-    break;
-  case LISTEN:
-    tcp_listen_closed(pcb);
-    tcp_pcb_remove(&tcp_listen_pcbs.pcbs, pcb);
-    memp_free(MEMP_TCP_PCB_LISTEN, pcb);
-    break;
-  case SYN_SENT:
-    TCP_PCB_REMOVE_ACTIVE(pcb);
-    memp_free(MEMP_TCP_PCB, pcb);
-    MIB2_STATS_INC(mib2.tcpattemptfails);
-    break;
-  default:
-    return tcp_close_shutdown_fin(pcb);
-  }
-  return ERR_OK;
-}
-
-static err_t
-tcp_close_shutdown_fin(struct tcp_pcb *pcb)
-{
-  err_t err;
-  LWIP_ASSERT("pcb != NULL", pcb != NULL);
-
-  switch (pcb->state) {
-  case SYN_RCVD:
-    err = tcp_send_fin(pcb);
-    if (err == ERR_OK) {
-      tcp_backlog_accepted(pcb);
-      MIB2_STATS_INC(mib2.tcpattemptfails);
-      pcb->state = FIN_WAIT_1;
-    }
-    break;
-  case ESTABLISHED:
-    err = tcp_send_fin(pcb);
-    if (err == ERR_OK) {
-      MIB2_STATS_INC(mib2.tcpestabresets);
-      pcb->state = FIN_WAIT_1;
-    }
-    break;
-  case CLOSE_WAIT:
-    err = tcp_send_fin(pcb);
-    if (err == ERR_OK) {
-      MIB2_STATS_INC(mib2.tcpestabresets);
-      pcb->state = LAST_ACK;
-    }
-    break;
-  default:
-    /* Has already been closed, do nothing. */
-    return ERR_OK;
-  }
-
-  if (err == ERR_OK) {
-    /* To ensure all data has been sent when tcp_close returns, we have
-       to make sure tcp_output doesn't fail.
-       Since we don't really have to ensure all data has been sent when tcp_close
-       returns (unsent data is sent from tcp timer functions, also), we don't care
-       for the return value of tcp_output for now. */
-    tcp_output(pcb);
-  } else if (err == ERR_MEM) {
-    /* Mark this pcb for closing. Closing is retried from tcp_tmr. */
-    pcb->flags |= TF_CLOSEPEND;
-    /* We have to return ERR_OK from here to indicate to the callers that this
-       pcb should not be used any more as it will be freed soon via tcp_tmr.
-       This is OK here since sending FIN does not guarantee a time frime for
-       actually freeing the pcb, either (it is left in closure states for
-       remote ACK or timeout) */
-    return ERR_OK;
-  }
-  return err;
-}
-
-/**
- * @ingroup tcp_raw
- * Closes the connection held by the PCB.
- *
- * Listening pcbs are freed and may not be referenced any more.
- * Connection pcbs are freed if not yet connected and may not be referenced
- * any more. If a connection is established (at least SYN received or in
- * a closing state), the connection is closed, and put in a closing state.
- * The pcb is then automatically freed in tcp_slowtmr(). It is therefore
- * unsafe to reference it (unless an error is returned).
- *
- * @param pcb the tcp_pcb to close
- * @return ERR_OK if connection has been closed
- *         another err_t if closing failed and pcb is not freed
- */
-err_t
-tcp_close(struct tcp_pcb *pcb)
-{
-  LWIP_DEBUGF(TCP_DEBUG, ("tcp_close: closing in "));
-  tcp_debug_print_state(pcb->state);
-
-  if (pcb->state != LISTEN) {
-    /* Set a flag not to receive any more data... */
-    pcb->flags |= TF_RXCLOSED;
-  }
-  /* ... and close */
-  return tcp_close_shutdown(pcb, 1);
-}
-
-/**
- * @ingroup tcp_raw
- * Causes all or part of a full-duplex connection of this PCB to be shut down.
- * This doesn't deallocate the PCB unless shutting down both sides!
- * Shutting down both sides is the same as calling tcp_close, so if it succeds
- * (i.e. returns ER_OK), the PCB must not be referenced any more!
- *
- * @param pcb PCB to shutdown
- * @param shut_rx shut down receive side if this is != 0
- * @param shut_tx shut down send side if this is != 0
- * @return ERR_OK if shutdown succeeded (or the PCB has already been shut down)
- *         another err_t on error.
- */
-err_t
-tcp_shutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx)
-{
-  if (pcb->state == LISTEN) {
-    return ERR_CONN;
-  }
-  if (shut_rx) {
-    /* shut down the receive side: set a flag not to receive any more data... */
-    pcb->flags |= TF_RXCLOSED;
-    if (shut_tx) {
-      /* shutting down the tx AND rx side is the same as closing for the raw API */
-      return tcp_close_shutdown(pcb, 1);
-    }
-    /* ... and free buffered data */
-    if (pcb->refused_data != NULL) {
-      pbuf_free(pcb->refused_data);
-      pcb->refused_data = NULL;
-    }
-  }
-  if (shut_tx) {
-    /* This can't happen twice since if it succeeds, the pcb's state is changed.
-       Only close in these states as the others directly deallocate the PCB */
-    switch (pcb->state) {
-    case SYN_RCVD:
-    case ESTABLISHED:
-    case CLOSE_WAIT:
-      return tcp_close_shutdown(pcb, (u8_t)shut_rx);
-    default:
-      /* Not (yet?) connected, cannot shutdown the TX side as that would bring us
-        into CLOSED state, where the PCB is deallocated. */
-      return ERR_CONN;
-    }
-  }
-  return ERR_OK;
-}
-
-/**
- * Abandons a connection and optionally sends a RST to the remote
- * host.  Deletes the local protocol control block. This is done when
- * a connection is killed because of shortage of memory.
- *
- * @param pcb the tcp_pcb to abort
- * @param reset boolean to indicate whether a reset should be sent
- */
-void
-tcp_abandon(struct tcp_pcb *pcb, int reset)
-{
-  u32_t seqno, ackno;
-#if LWIP_CALLBACK_API
-  tcp_err_fn errf;
-#endif /* LWIP_CALLBACK_API */
-  void *errf_arg;
-
-  /* pcb->state LISTEN not allowed here */
-  LWIP_ASSERT("don't call tcp_abort/tcp_abandon for listen-pcbs",
-    pcb->state != LISTEN);
-  /* Figure out on which TCP PCB list we are, and remove us. If we
-     are in an active state, call the receive function associated with
-     the PCB with a NULL argument, and send an RST to the remote end. */
-  if (pcb->state == TIME_WAIT) {
-    tcp_pcb_remove(&tcp_tw_pcbs, pcb);
-    memp_free(MEMP_TCP_PCB, pcb);
-  } else {
-    int send_rst = 0;
-    u16_t local_port = 0;
-    enum tcp_state last_state;
-    seqno = pcb->snd_nxt;
-    ackno = pcb->rcv_nxt;
-#if LWIP_CALLBACK_API
-    errf = pcb->errf;
-#endif /* LWIP_CALLBACK_API */
-    errf_arg = pcb->callback_arg;
-    if (pcb->state == CLOSED) {
-      if (pcb->local_port != 0) {
-        /* bound, not yet opened */
-        TCP_RMV(&tcp_bound_pcbs, pcb);
-      }
-    } else {
-      send_rst = reset;
-      local_port = pcb->local_port;
-      TCP_PCB_REMOVE_ACTIVE(pcb);
-    }
-    if (pcb->unacked != NULL) {
-      tcp_segs_free(pcb->unacked);
-    }
-    if (pcb->unsent != NULL) {
-      tcp_segs_free(pcb->unsent);
-    }
-#if TCP_QUEUE_OOSEQ
-    if (pcb->ooseq != NULL) {
-      tcp_segs_free(pcb->ooseq);
-    }
-#endif /* TCP_QUEUE_OOSEQ */
-    tcp_backlog_accepted(pcb);
-    if (send_rst) {
-      LWIP_DEBUGF(TCP_RST_DEBUG, ("tcp_abandon: sending RST\n"));
-      tcp_rst(seqno, ackno, &pcb->local_ip, &pcb->remote_ip, local_port, pcb->remote_port);
-    }
-    last_state = pcb->state;
-    memp_free(MEMP_TCP_PCB, pcb);
-    TCP_EVENT_ERR(last_state, errf, errf_arg, ERR_ABRT);
-  }
-}
-
-/**
- * @ingroup tcp_raw
- * Aborts the connection by sending a RST (reset) segment to the remote
- * host. The pcb is deallocated. This function never fails.
- *
- * ATTENTION: When calling this from one of the TCP callbacks, make
- * sure you always return ERR_ABRT (and never return ERR_ABRT otherwise
- * or you will risk accessing deallocated memory or memory leaks!
- *
- * @param pcb the tcp pcb to abort
- */
-void
-tcp_abort(struct tcp_pcb *pcb)
-{
-  tcp_abandon(pcb, 1);
-}
-
-/**
- * @ingroup tcp_raw
- * Binds the connection to a local port number and IP address. If the
- * IP address is not given (i.e., ipaddr == NULL), the IP address of
- * the outgoing network interface is used instead.
- *
- * @param pcb the tcp_pcb to bind (no check is done whether this pcb is
- *        already bound!)
- * @param ipaddr the local ip address to bind to (use IP4_ADDR_ANY to bind
- *        to any local address
- * @param port the local port to bind to
- * @return ERR_USE if the port is already in use
- *         ERR_VAL if bind failed because the PCB is not in a valid state
- *         ERR_OK if bound
- */
-err_t
-tcp_bind(struct tcp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port)
-{
-  int i;
-  int max_pcb_list = NUM_TCP_PCB_LISTS;
-  struct tcp_pcb *cpcb;
-
-#if LWIP_IPV4
-  /* Don't propagate NULL pointer (IPv4 ANY) to subsequent functions */
-  if (ipaddr == NULL) {
-    ipaddr = IP4_ADDR_ANY;
-  }
-#endif /* LWIP_IPV4 */
-
-  /* still need to check for ipaddr == NULL in IPv6 only case */
-  if ((pcb == NULL) || (ipaddr == NULL)) {
-    return ERR_VAL;
-  }
-
-  LWIP_ERROR("tcp_bind: can only bind in state CLOSED", pcb->state == CLOSED, return ERR_VAL);
-
-#if SO_REUSE
-  /* Unless the REUSEADDR flag is set,
-     we have to check the pcbs in TIME-WAIT state, also.
-     We do not dump TIME_WAIT pcb's; they can still be matched by incoming
-     packets using both local and remote IP addresses and ports to distinguish.
-   */
-  if (ip_get_option(pcb, SOF_REUSEADDR)) {
-    max_pcb_list = NUM_TCP_PCB_LISTS_NO_TIME_WAIT;
-  }
-#endif /* SO_REUSE */
-
-  if (port == 0) {
-    port = tcp_new_port();
-    if (port == 0) {
-      return ERR_BUF;
-    }
-  } else {
-    /* Check if the address already is in use (on all lists) */
-    for (i = 0; i < max_pcb_list; i++) {
-      for (cpcb = *tcp_pcb_lists[i]; cpcb != NULL; cpcb = cpcb->next) {
-        if (cpcb->local_port == port) {
-#if SO_REUSE
-          /* Omit checking for the same port if both pcbs have REUSEADDR set.
-             For SO_REUSEADDR, the duplicate-check for a 5-tuple is done in
-             tcp_connect. */
-          if (!ip_get_option(pcb, SOF_REUSEADDR) ||
-              !ip_get_option(cpcb, SOF_REUSEADDR))
-#endif /* SO_REUSE */
-          {
-            /* @todo: check accept_any_ip_version */
-            if ((IP_IS_V6(ipaddr) == IP_IS_V6_VAL(cpcb->local_ip)) &&
-                (ip_addr_isany(&cpcb->local_ip) ||
-                ip_addr_isany(ipaddr) ||
-                ip_addr_cmp(&cpcb->local_ip, ipaddr))) {
-              return ERR_USE;
-            }
-          }
-        }
-      }
-    }
-  }
-
-  if (!ip_addr_isany(ipaddr)) {
-    ip_addr_set(&pcb->local_ip, ipaddr);
-  }
-  pcb->local_port = port;
-  TCP_REG(&tcp_bound_pcbs, pcb);
-  LWIP_DEBUGF(TCP_DEBUG, ("tcp_bind: bind to port %"U16_F"\n", port));
-  return ERR_OK;
-}
-#if LWIP_CALLBACK_API
-/**
- * Default accept callback if no accept callback is specified by the user.
- */
-static err_t
-tcp_accept_null(void *arg, struct tcp_pcb *pcb, err_t err)
-{
-  LWIP_UNUSED_ARG(arg);
-  LWIP_UNUSED_ARG(err);
-
-  tcp_abort(pcb);
-
-  return ERR_ABRT;
-}
-#endif /* LWIP_CALLBACK_API */
-
-/**
- * @ingroup tcp_raw
- * Set the state of the connection to be LISTEN, which means that it
- * is able to accept incoming connections. The protocol control block
- * is reallocated in order to consume less memory. Setting the
- * connection to LISTEN is an irreversible process.
- *
- * @param pcb the original tcp_pcb
- * @param backlog the incoming connections queue limit
- * @return tcp_pcb used for listening, consumes less memory.
- *
- * @note The original tcp_pcb is freed. This function therefore has to be
- *       called like this:
- *             tpcb = tcp_listen_with_backlog(tpcb, backlog);
- */
-struct tcp_pcb *
-tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog)
-{
-  return tcp_listen_with_backlog_and_err(pcb, backlog, NULL);
-}
-
-/**
- * @ingroup tcp_raw
- * Set the state of the connection to be LISTEN, which means that it
- * is able to accept incoming connections. The protocol control block
- * is reallocated in order to consume less memory. Setting the
- * connection to LISTEN is an irreversible process.
- *
- * @param pcb the original tcp_pcb
- * @param backlog the incoming connections queue limit
- * @param err when NULL is returned, this contains the error reason
- * @return tcp_pcb used for listening, consumes less memory.
- *
- * @note The original tcp_pcb is freed. This function therefore has to be
- *       called like this:
- *             tpcb = tcp_listen_with_backlog_and_err(tpcb, backlog, &err);
- */
-struct tcp_pcb *
-tcp_listen_with_backlog_and_err(struct tcp_pcb *pcb, u8_t backlog, err_t *err)
-{
-  struct tcp_pcb_listen *lpcb = NULL;
-  err_t res;
-
-  LWIP_UNUSED_ARG(backlog);
-  LWIP_ERROR("tcp_listen: pcb already connected", pcb->state == CLOSED, res = ERR_CLSD; goto done);
-
-  /* already listening? */
-  if (pcb->state == LISTEN) {
-    lpcb = (struct tcp_pcb_listen*)pcb;
-    res = ERR_ALREADY;
-    goto done;
-  }
-#if SO_REUSE
-  if (ip_get_option(pcb, SOF_REUSEADDR)) {
-    /* Since SOF_REUSEADDR allows reusing a local address before the pcb's usage
-       is declared (listen-/connection-pcb), we have to make sure now that
-       this port is only used once for every local IP. */
-    for (lpcb = tcp_listen_pcbs.listen_pcbs; lpcb != NULL; lpcb = lpcb->next) {
-      if ((lpcb->local_port == pcb->local_port) &&
-          ip_addr_cmp(&lpcb->local_ip, &pcb->local_ip)) {
-        /* this address/port is already used */
-        lpcb = NULL;
-        res = ERR_USE;
-        goto done;
-      }
-    }
-  }
-#endif /* SO_REUSE */
-  lpcb = (struct tcp_pcb_listen *)memp_malloc(MEMP_TCP_PCB_LISTEN);
-  if (lpcb == NULL) {
-    res = ERR_MEM;
-    goto done;
-  }
-  lpcb->callback_arg = pcb->callback_arg;
-  lpcb->local_port = pcb->local_port;
-  lpcb->state = LISTEN;
-  lpcb->prio = pcb->prio;
-  lpcb->so_options = pcb->so_options;
-  lpcb->ttl = pcb->ttl;
-  lpcb->tos = pcb->tos;
-#if LWIP_IPV4 && LWIP_IPV6
-  IP_SET_TYPE_VAL(lpcb->remote_ip, pcb->local_ip.type);
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-  ip_addr_copy(lpcb->local_ip, pcb->local_ip);
-  if (pcb->local_port != 0) {
-    TCP_RMV(&tcp_bound_pcbs, pcb);
-  }
-  memp_free(MEMP_TCP_PCB, pcb);
-#if LWIP_CALLBACK_API
-  lpcb->accept = tcp_accept_null;
-#endif /* LWIP_CALLBACK_API */
-#if TCP_LISTEN_BACKLOG
-  lpcb->accepts_pending = 0;
-  tcp_backlog_set(lpcb, backlog);
-#endif /* TCP_LISTEN_BACKLOG */
-  TCP_REG(&tcp_listen_pcbs.pcbs, (struct tcp_pcb *)lpcb);
-  res = ERR_OK;
-done:
-  if (err != NULL) {
-    *err = res;
-  }
-  return (struct tcp_pcb *)lpcb;
-}
-
-/**
- * Update the state that tracks the available window space to advertise.
- *
- * Returns how much extra window would be advertised if we sent an
- * update now.
- */
-u32_t
-tcp_update_rcv_ann_wnd(struct tcp_pcb *pcb)
-{
-  u32_t new_right_edge = pcb->rcv_nxt + pcb->rcv_wnd;
-
-  if (TCP_SEQ_GEQ(new_right_edge, pcb->rcv_ann_right_edge + LWIP_MIN((TCP_WND / 2), pcb->mss))) {
-    /* we can advertise more window */
-    pcb->rcv_ann_wnd = pcb->rcv_wnd;
-    return new_right_edge - pcb->rcv_ann_right_edge;
-  } else {
-    if (TCP_SEQ_GT(pcb->rcv_nxt, pcb->rcv_ann_right_edge)) {
-      /* Can happen due to other end sending out of advertised window,
-       * but within actual available (but not yet advertised) window */
-      pcb->rcv_ann_wnd = 0;
-    } else {
-      /* keep the right edge of window constant */
-      u32_t new_rcv_ann_wnd = pcb->rcv_ann_right_edge - pcb->rcv_nxt;
-#if !LWIP_WND_SCALE
-      LWIP_ASSERT("new_rcv_ann_wnd <= 0xffff", new_rcv_ann_wnd <= 0xffff);
-#endif
-      pcb->rcv_ann_wnd = (tcpwnd_size_t)new_rcv_ann_wnd;
-    }
-    return 0;
-  }
-}
-
-/**
- * @ingroup tcp_raw
- * This function should be called by the application when it has
- * processed the data. The purpose is to advertise a larger window
- * when the data has been processed.
- *
- * @param pcb the tcp_pcb for which data is read
- * @param len the amount of bytes that have been read by the application
- */
-void
-tcp_recved(struct tcp_pcb *pcb, u16_t len)
-{
-  int wnd_inflation;
-
-  /* pcb->state LISTEN not allowed here */
-  LWIP_ASSERT("don't call tcp_recved for listen-pcbs",
-    pcb->state != LISTEN);
-
-  pcb->rcv_wnd += len;
-  if (pcb->rcv_wnd > TCP_WND_MAX(pcb)) {
-    pcb->rcv_wnd = TCP_WND_MAX(pcb);
-  } else if (pcb->rcv_wnd == 0) {
-    /* rcv_wnd overflowed */
-    if ((pcb->state == CLOSE_WAIT) || (pcb->state == LAST_ACK)) {
-      /* In passive close, we allow this, since the FIN bit is added to rcv_wnd
-         by the stack itself, since it is not mandatory for an application
-         to call tcp_recved() for the FIN bit, but e.g. the netconn API does so. */
-      pcb->rcv_wnd = TCP_WND_MAX(pcb);
-    } else {
-      LWIP_ASSERT("tcp_recved: len wrapped rcv_wnd\n", 0);
-    }
-  }
-
-  wnd_inflation = tcp_update_rcv_ann_wnd(pcb);
-
-  /* If the change in the right edge of window is significant (default
-   * watermark is TCP_WND/4), then send an explicit update now.
-   * Otherwise wait for a packet to be sent in the normal course of
-   * events (or more window to be available later) */
-  if (wnd_inflation >= TCP_WND_UPDATE_THRESHOLD) {
-    tcp_ack_now(pcb);
-    tcp_output(pcb);
-  }
-
-  LWIP_DEBUGF(TCP_DEBUG, ("tcp_recved: received %"U16_F" bytes, wnd %"TCPWNDSIZE_F" (%"TCPWNDSIZE_F").\n",
-         len, pcb->rcv_wnd, (u16_t)(TCP_WND_MAX(pcb) - pcb->rcv_wnd)));
-}
-
-/**
- * Allocate a new local TCP port.
- *
- * @return a new (free) local TCP port number
- */
-static u16_t
-tcp_new_port(void)
-{
-  u8_t i;
-  u16_t n = 0;
-  struct tcp_pcb *pcb;
-
-again:
-  if (tcp_port++ == TCP_LOCAL_PORT_RANGE_END) {
-    tcp_port = TCP_LOCAL_PORT_RANGE_START;
-  }
-  /* Check all PCB lists. */
-  for (i = 0; i < NUM_TCP_PCB_LISTS; i++) {
-    for (pcb = *tcp_pcb_lists[i]; pcb != NULL; pcb = pcb->next) {
-      if (pcb->local_port == tcp_port) {
-        if (++n > (TCP_LOCAL_PORT_RANGE_END - TCP_LOCAL_PORT_RANGE_START)) {
-          return 0;
-        }
-        goto again;
-      }
-    }
-  }
-  return tcp_port;
-}
-
-/**
- * @ingroup tcp_raw
- * Connects to another host. The function given as the "connected"
- * argument will be called when the connection has been established.
- *
- * @param pcb the tcp_pcb used to establish the connection
- * @param ipaddr the remote ip address to connect to
- * @param port the remote tcp port to connect to
- * @param connected callback function to call when connected (on error,
-                    the err calback will be called)
- * @return ERR_VAL if invalid arguments are given
- *         ERR_OK if connect request has been sent
- *         other err_t values if connect request couldn't be sent
- */
-err_t
-tcp_connect(struct tcp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port,
-      tcp_connected_fn connected)
-{
-  err_t ret;
-  u32_t iss;
-  u16_t old_local_port;
-
-  if ((pcb == NULL) || (ipaddr == NULL)) {
-    return ERR_VAL;
-  }
-
-  LWIP_ERROR("tcp_connect: can only connect from state CLOSED", pcb->state == CLOSED, return ERR_ISCONN);
-
-  LWIP_DEBUGF(TCP_DEBUG, ("tcp_connect to port %"U16_F"\n", port));
-  ip_addr_set(&pcb->remote_ip, ipaddr);
-  pcb->remote_port = port;
-
-  /* check if we have a route to the remote host */
-  if (ip_addr_isany(&pcb->local_ip)) {
-    /* no local IP address set, yet. */
-    struct netif *netif;
-    const ip_addr_t *local_ip;
-    ip_route_get_local_ip(&pcb->local_ip, &pcb->remote_ip, netif, local_ip);
-    if ((netif == NULL) || (local_ip == NULL)) {
-      /* Don't even try to send a SYN packet if we have no route
-         since that will fail. */
-      return ERR_RTE;
-    }
-    /* Use the address as local address of the pcb. */
-    ip_addr_copy(pcb->local_ip, *local_ip);
-  }
-
-  old_local_port = pcb->local_port;
-  if (pcb->local_port == 0) {
-    pcb->local_port = tcp_new_port();
-    if (pcb->local_port == 0) {
-      return ERR_BUF;
-    }
-  } else {
-#if SO_REUSE
-    if (ip_get_option(pcb, SOF_REUSEADDR)) {
-      /* Since SOF_REUSEADDR allows reusing a local address, we have to make sure
-         now that the 5-tuple is unique. */
-      struct tcp_pcb *cpcb;
-      int i;
-      /* Don't check listen- and bound-PCBs, check active- and TIME-WAIT PCBs. */
-      for (i = 2; i < NUM_TCP_PCB_LISTS; i++) {
-        for (cpcb = *tcp_pcb_lists[i]; cpcb != NULL; cpcb = cpcb->next) {
-          if ((cpcb->local_port == pcb->local_port) &&
-              (cpcb->remote_port == port) &&
-              ip_addr_cmp(&cpcb->local_ip, &pcb->local_ip) &&
-              ip_addr_cmp(&cpcb->remote_ip, ipaddr)) {
-            /* linux returns EISCONN here, but ERR_USE should be OK for us */
-            return ERR_USE;
-          }
-        }
-      }
-    }
-#endif /* SO_REUSE */
-  }
-
-  iss = tcp_next_iss(pcb);
-  pcb->rcv_nxt = 0;
-  pcb->snd_nxt = iss;
-  pcb->lastack = iss - 1;
-  pcb->snd_wl2 = iss - 1;
-  pcb->snd_lbb = iss - 1;
-  /* Start with a window that does not need scaling. When window scaling is
-     enabled and used, the window is enlarged when both sides agree on scaling. */
-  pcb->rcv_wnd = pcb->rcv_ann_wnd = TCPWND_MIN16(TCP_WND);
-  pcb->rcv_ann_right_edge = pcb->rcv_nxt;
-  pcb->snd_wnd = TCP_WND;
-  /* As initial send MSS, we use TCP_MSS but limit it to 536.
-     The send MSS is updated when an MSS option is received. */
-  pcb->mss = INITIAL_MSS;
-#if TCP_CALCULATE_EFF_SEND_MSS
-  pcb->mss = tcp_eff_send_mss(pcb->mss, &pcb->local_ip, &pcb->remote_ip);
-#endif /* TCP_CALCULATE_EFF_SEND_MSS */
-  pcb->cwnd = 1;
-#if LWIP_CALLBACK_API
-  pcb->connected = connected;
-#else /* LWIP_CALLBACK_API */
-  LWIP_UNUSED_ARG(connected);
-#endif /* LWIP_CALLBACK_API */
-
-  /* Send a SYN together with the MSS option. */
-  ret = tcp_enqueue_flags(pcb, TCP_SYN);
-  if (ret == ERR_OK) {
-    /* SYN segment was enqueued, changed the pcbs state now */
-    pcb->state = SYN_SENT;
-    if (old_local_port != 0) {
-      TCP_RMV(&tcp_bound_pcbs, pcb);
-    }
-    TCP_REG_ACTIVE(pcb);
-    MIB2_STATS_INC(mib2.tcpactiveopens);
-
-    tcp_output(pcb);
-  }
-  return ret;
-}
-
-/**
- * Called every 500 ms and implements the retransmission timer and the timer that
- * removes PCBs that have been in TIME-WAIT for enough time. It also increments
- * various timers such as the inactivity timer in each PCB.
- *
- * Automatically called from tcp_tmr().
- */
-void
-tcp_slowtmr(void)
-{
-  struct tcp_pcb *pcb, *prev;
-  tcpwnd_size_t eff_wnd;
-  u8_t pcb_remove;      /* flag if a PCB should be removed */
-  u8_t pcb_reset;       /* flag if a RST should be sent when removing */
-  err_t err;
-
-  err = ERR_OK;
-
-  ++tcp_ticks;
-  ++tcp_timer_ctr;
-
-tcp_slowtmr_start:
-  /* Steps through all of the active PCBs. */
-  prev = NULL;
-  pcb = tcp_active_pcbs;
-  if (pcb == NULL) {
-    LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: no active pcbs\n"));
-  }
-  while (pcb != NULL) {
-    LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: processing active pcb\n"));
-    LWIP_ASSERT("tcp_slowtmr: active pcb->state != CLOSED\n", pcb->state != CLOSED);
-    LWIP_ASSERT("tcp_slowtmr: active pcb->state != LISTEN\n", pcb->state != LISTEN);
-    LWIP_ASSERT("tcp_slowtmr: active pcb->state != TIME-WAIT\n", pcb->state != TIME_WAIT);
-    if (pcb->last_timer == tcp_timer_ctr) {
-      /* skip this pcb, we have already processed it */
-      pcb = pcb->next;
-      continue;
-    }
-    pcb->last_timer = tcp_timer_ctr;
-
-    pcb_remove = 0;
-    pcb_reset = 0;
-
-    if (pcb->state == SYN_SENT && pcb->nrtx >= TCP_SYNMAXRTX) {
-      ++pcb_remove;
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: max SYN retries reached\n"));
-    }
-    else if (pcb->nrtx >= TCP_MAXRTX) {
-      ++pcb_remove;
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: max DATA retries reached\n"));
-    } else {
-      if (pcb->persist_backoff > 0) {
-        /* If snd_wnd is zero, use persist timer to send 1 byte probes
-         * instead of using the standard retransmission mechanism. */
-        u8_t backoff_cnt = tcp_persist_backoff[pcb->persist_backoff-1];
-        if (pcb->persist_cnt < backoff_cnt) {
-          pcb->persist_cnt++;
-        }
-        if (pcb->persist_cnt >= backoff_cnt) {
-          if (tcp_zero_window_probe(pcb) == ERR_OK) {
-            pcb->persist_cnt = 0;
-            if (pcb->persist_backoff < sizeof(tcp_persist_backoff)) {
-              pcb->persist_backoff++;
-            }
-          }
-        }
-      } else {
-        /* Increase the retransmission timer if it is running */
-        if (pcb->rtime >= 0) {
-          ++pcb->rtime;
-        }
-
-        if (pcb->unacked != NULL && pcb->rtime >= pcb->rto) {
-          /* Time for a retransmission. */
-          LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_slowtmr: rtime %"S16_F
-                                      " pcb->rto %"S16_F"\n",
-                                      pcb->rtime, pcb->rto));
-
-          /* Double retransmission time-out unless we are trying to
-           * connect to somebody (i.e., we are in SYN_SENT). */
-          if (pcb->state != SYN_SENT) {
-            u8_t backoff_idx = LWIP_MIN(pcb->nrtx, sizeof(tcp_backoff)-1);
-            pcb->rto = ((pcb->sa >> 3) + pcb->sv) << tcp_backoff[backoff_idx];
-          }
-
-          /* Reset the retransmission timer. */
-          pcb->rtime = 0;
-
-          /* Reduce congestion window and ssthresh. */
-          eff_wnd = LWIP_MIN(pcb->cwnd, pcb->snd_wnd);
-          pcb->ssthresh = eff_wnd >> 1;
-          if (pcb->ssthresh < (tcpwnd_size_t)(pcb->mss << 1)) {
-            pcb->ssthresh = (pcb->mss << 1);
-          }
-          pcb->cwnd = pcb->mss;
-          LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_slowtmr: cwnd %"TCPWNDSIZE_F
-                                       " ssthresh %"TCPWNDSIZE_F"\n",
-                                       pcb->cwnd, pcb->ssthresh));
-
-          /* The following needs to be called AFTER cwnd is set to one
-             mss - STJ */
-          tcp_rexmit_rto(pcb);
-        }
-      }
-    }
-    /* Check if this PCB has stayed too long in FIN-WAIT-2 */
-    if (pcb->state == FIN_WAIT_2) {
-      /* If this PCB is in FIN_WAIT_2 because of SHUT_WR don't let it time out. */
-      if (pcb->flags & TF_RXCLOSED) {
-        /* PCB was fully closed (either through close() or SHUT_RDWR):
-           normal FIN-WAIT timeout handling. */
-        if ((u32_t)(tcp_ticks - pcb->tmr) >
-            TCP_FIN_WAIT_TIMEOUT / TCP_SLOW_INTERVAL) {
-          ++pcb_remove;
-          LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: removing pcb stuck in FIN-WAIT-2\n"));
-        }
-      }
-    }
-
-    /* Check if KEEPALIVE should be sent */
-    if (ip_get_option(pcb, SOF_KEEPALIVE) &&
-       ((pcb->state == ESTABLISHED) ||
-        (pcb->state == CLOSE_WAIT))) {
-      if ((u32_t)(tcp_ticks - pcb->tmr) >
-         (pcb->keep_idle + TCP_KEEP_DUR(pcb)) / TCP_SLOW_INTERVAL)
-      {
-        LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: KEEPALIVE timeout. Aborting connection to "));
-        ip_addr_debug_print(TCP_DEBUG, &pcb->remote_ip);
-        LWIP_DEBUGF(TCP_DEBUG, ("\n"));
-
-        ++pcb_remove;
-        ++pcb_reset;
-      } else if ((u32_t)(tcp_ticks - pcb->tmr) >
-                (pcb->keep_idle + pcb->keep_cnt_sent * TCP_KEEP_INTVL(pcb))
-                / TCP_SLOW_INTERVAL)
-      {
-        err = tcp_keepalive(pcb);
-        if (err == ERR_OK) {
-          pcb->keep_cnt_sent++;
-        }
-      }
-    }
-
-    /* If this PCB has queued out of sequence data, but has been
-       inactive for too long, will drop the data (it will eventually
-       be retransmitted). */
-#if TCP_QUEUE_OOSEQ
-    if (pcb->ooseq != NULL &&
-        (u32_t)tcp_ticks - pcb->tmr >= pcb->rto * TCP_OOSEQ_TIMEOUT) {
-      tcp_segs_free(pcb->ooseq);
-      pcb->ooseq = NULL;
-      LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_slowtmr: dropping OOSEQ queued data\n"));
-    }
-#endif /* TCP_QUEUE_OOSEQ */
-
-    /* Check if this PCB has stayed too long in SYN-RCVD */
-    if (pcb->state == SYN_RCVD) {
-      if ((u32_t)(tcp_ticks - pcb->tmr) >
-          TCP_SYN_RCVD_TIMEOUT / TCP_SLOW_INTERVAL) {
-        ++pcb_remove;
-        LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: removing pcb stuck in SYN-RCVD\n"));
-      }
-    }
-
-    /* Check if this PCB has stayed too long in LAST-ACK */
-    if (pcb->state == LAST_ACK) {
-      if ((u32_t)(tcp_ticks - pcb->tmr) > 2 * TCP_MSL / TCP_SLOW_INTERVAL) {
-        ++pcb_remove;
-        LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: removing pcb stuck in LAST-ACK\n"));
-      }
-    }
-
-    /* If the PCB should be removed, do it. */
-    if (pcb_remove) {
-      struct tcp_pcb *pcb2;
-#if LWIP_CALLBACK_API
-      tcp_err_fn err_fn = pcb->errf;
-#endif /* LWIP_CALLBACK_API */
-      void *err_arg;
-      enum tcp_state last_state;
-      tcp_pcb_purge(pcb);
-      /* Remove PCB from tcp_active_pcbs list. */
-      if (prev != NULL) {
-        LWIP_ASSERT("tcp_slowtmr: middle tcp != tcp_active_pcbs", pcb != tcp_active_pcbs);
-        prev->next = pcb->next;
-      } else {
-        /* This PCB was the first. */
-        LWIP_ASSERT("tcp_slowtmr: first pcb == tcp_active_pcbs", tcp_active_pcbs == pcb);
-        tcp_active_pcbs = pcb->next;
-      }
-
-      if (pcb_reset) {
-        tcp_rst(pcb->snd_nxt, pcb->rcv_nxt, &pcb->local_ip, &pcb->remote_ip,
-                 pcb->local_port, pcb->remote_port);
-      }
-
-      err_arg = pcb->callback_arg;
-      last_state = pcb->state;
-      pcb2 = pcb;
-      pcb = pcb->next;
-      memp_free(MEMP_TCP_PCB, pcb2);
-
-      tcp_active_pcbs_changed = 0;
-      TCP_EVENT_ERR(last_state, err_fn, err_arg, ERR_ABRT);
-      if (tcp_active_pcbs_changed) {
-        goto tcp_slowtmr_start;
-      }
-    } else {
-      /* get the 'next' element now and work with 'prev' below (in case of abort) */
-      prev = pcb;
-      pcb = pcb->next;
-
-      /* We check if we should poll the connection. */
-      ++prev->polltmr;
-      if (prev->polltmr >= prev->pollinterval) {
-        prev->polltmr = 0;
-        LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: polling application\n"));
-        tcp_active_pcbs_changed = 0;
-        TCP_EVENT_POLL(prev, err);
-        if (tcp_active_pcbs_changed) {
-          goto tcp_slowtmr_start;
-        }
-        /* if err == ERR_ABRT, 'prev' is already deallocated */
-        if (err == ERR_OK) {
-          tcp_output(prev);
-        }
-      }
-    }
-  }
-
-
-  /* Steps through all of the TIME-WAIT PCBs. */
-  prev = NULL;
-  pcb = tcp_tw_pcbs;
-  while (pcb != NULL) {
-    LWIP_ASSERT("tcp_slowtmr: TIME-WAIT pcb->state == TIME-WAIT", pcb->state == TIME_WAIT);
-    pcb_remove = 0;
-
-    /* Check if this PCB has stayed long enough in TIME-WAIT */
-    if ((u32_t)(tcp_ticks - pcb->tmr) > 2 * TCP_MSL / TCP_SLOW_INTERVAL) {
-      ++pcb_remove;
-    }
-
-    /* If the PCB should be removed, do it. */
-    if (pcb_remove) {
-      struct tcp_pcb *pcb2;
-      tcp_pcb_purge(pcb);
-      /* Remove PCB from tcp_tw_pcbs list. */
-      if (prev != NULL) {
-        LWIP_ASSERT("tcp_slowtmr: middle tcp != tcp_tw_pcbs", pcb != tcp_tw_pcbs);
-        prev->next = pcb->next;
-      } else {
-        /* This PCB was the first. */
-        LWIP_ASSERT("tcp_slowtmr: first pcb == tcp_tw_pcbs", tcp_tw_pcbs == pcb);
-        tcp_tw_pcbs = pcb->next;
-      }
-      pcb2 = pcb;
-      pcb = pcb->next;
-      memp_free(MEMP_TCP_PCB, pcb2);
-    } else {
-      prev = pcb;
-      pcb = pcb->next;
-    }
-  }
-}
-
-/**
- * Is called every TCP_FAST_INTERVAL (250 ms) and process data previously
- * "refused" by upper layer (application) and sends delayed ACKs.
- *
- * Automatically called from tcp_tmr().
- */
-void
-tcp_fasttmr(void)
-{
-  struct tcp_pcb *pcb;
-
-  ++tcp_timer_ctr;
-
-tcp_fasttmr_start:
-  pcb = tcp_active_pcbs;
-
-  while (pcb != NULL) {
-    if (pcb->last_timer != tcp_timer_ctr) {
-      struct tcp_pcb *next;
-      pcb->last_timer = tcp_timer_ctr;
-      /* send delayed ACKs */
-      if (pcb->flags & TF_ACK_DELAY) {
-        LWIP_DEBUGF(TCP_DEBUG, ("tcp_fasttmr: delayed ACK\n"));
-        tcp_ack_now(pcb);
-        tcp_output(pcb);
-        pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW);
-      }
-      /* send pending FIN */
-      if (pcb->flags & TF_CLOSEPEND) {
-        LWIP_DEBUGF(TCP_DEBUG, ("tcp_fasttmr: pending FIN\n"));
-        pcb->flags &= ~(TF_CLOSEPEND);
-        tcp_close_shutdown_fin(pcb);
-      }
-
-      next = pcb->next;
-
-      /* If there is data which was previously "refused" by upper layer */
-      if (pcb->refused_data != NULL) {
-        tcp_active_pcbs_changed = 0;
-        tcp_process_refused_data(pcb);
-        if (tcp_active_pcbs_changed) {
-          /* application callback has changed the pcb list: restart the loop */
-          goto tcp_fasttmr_start;
-        }
-      }
-      pcb = next;
-    } else {
-      pcb = pcb->next;
-    }
-  }
-}
-
-/** Call tcp_output for all active pcbs that have TF_NAGLEMEMERR set */
-void
-tcp_txnow(void)
-{
-  struct tcp_pcb *pcb;
-
-  for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
-    if (pcb->flags & TF_NAGLEMEMERR) {
-      tcp_output(pcb);
-    }
-  }
-}
-
-/** Pass pcb->refused_data to the recv callback */
-err_t
-tcp_process_refused_data(struct tcp_pcb *pcb)
-{
-#if TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-  struct pbuf *rest;
-  while (pcb->refused_data != NULL)
-#endif /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-  {
-    err_t err;
-    u8_t refused_flags = pcb->refused_data->flags;
-    /* set pcb->refused_data to NULL in case the callback frees it and then
-       closes the pcb */
-    struct pbuf *refused_data = pcb->refused_data;
-#if TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-    pbuf_split_64k(refused_data, &rest);
-    pcb->refused_data = rest;
-#else /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-    pcb->refused_data = NULL;
-#endif /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-    /* Notify again application with data previously received. */
-    LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: notify kept packet\n"));
-    TCP_EVENT_RECV(pcb, refused_data, ERR_OK, err);
-    if (err == ERR_OK) {
-      /* did refused_data include a FIN? */
-      if (refused_flags & PBUF_FLAG_TCP_FIN
-#if TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-          && (rest == NULL)
-#endif /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-         ) {
-        /* correct rcv_wnd as the application won't call tcp_recved()
-           for the FIN's seqno */
-        if (pcb->rcv_wnd != TCP_WND_MAX(pcb)) {
-          pcb->rcv_wnd++;
-        }
-        TCP_EVENT_CLOSED(pcb, err);
-        if (err == ERR_ABRT) {
-          return ERR_ABRT;
-        }
-      }
-    } else if (err == ERR_ABRT) {
-      /* if err == ERR_ABRT, 'pcb' is already deallocated */
-      /* Drop incoming packets because pcb is "full" (only if the incoming
-         segment contains data). */
-      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: drop incoming packets, because pcb is \"full\"\n"));
-      return ERR_ABRT;
-    } else {
-      /* data is still refused, pbuf is still valid (go on for ACK-only packets) */
-#if TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-      if (rest != NULL) {
-        pbuf_cat(refused_data, rest);
-      }
-#endif /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-      pcb->refused_data = refused_data;
-      return ERR_INPROGRESS;
-    }
-  }
-  return ERR_OK;
-}
-
-/**
- * Deallocates a list of TCP segments (tcp_seg structures).
- *
- * @param seg tcp_seg list of TCP segments to free
- */
-void
-tcp_segs_free(struct tcp_seg *seg)
-{
-  while (seg != NULL) {
-    struct tcp_seg *next = seg->next;
-    tcp_seg_free(seg);
-    seg = next;
-  }
-}
-
-/**
- * Frees a TCP segment (tcp_seg structure).
- *
- * @param seg single tcp_seg to free
- */
-void
-tcp_seg_free(struct tcp_seg *seg)
-{
-  if (seg != NULL) {
-    if (seg->p != NULL) {
-      pbuf_free(seg->p);
-#if TCP_DEBUG
-      seg->p = NULL;
-#endif /* TCP_DEBUG */
-    }
-    memp_free(MEMP_TCP_SEG, seg);
-  }
-}
-
-/**
- * Sets the priority of a connection.
- *
- * @param pcb the tcp_pcb to manipulate
- * @param prio new priority
- */
-void
-tcp_setprio(struct tcp_pcb *pcb, u8_t prio)
-{
-  pcb->prio = prio;
-}
-
-#if TCP_QUEUE_OOSEQ
-/**
- * Returns a copy of the given TCP segment.
- * The pbuf and data are not copied, only the pointers
- *
- * @param seg the old tcp_seg
- * @return a copy of seg
- */
-struct tcp_seg *
-tcp_seg_copy(struct tcp_seg *seg)
-{
-  struct tcp_seg *cseg;
-
-  cseg = (struct tcp_seg *)memp_malloc(MEMP_TCP_SEG);
-  if (cseg == NULL) {
-    return NULL;
-  }
-  SMEMCPY((u8_t *)cseg, (const u8_t *)seg, sizeof(struct tcp_seg));
-  pbuf_ref(cseg->p);
-  return cseg;
-}
-#endif /* TCP_QUEUE_OOSEQ */
-
-#if LWIP_CALLBACK_API
-/**
- * Default receive callback that is called if the user didn't register
- * a recv callback for the pcb.
- */
-err_t
-tcp_recv_null(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err)
-{
-  LWIP_UNUSED_ARG(arg);
-  if (p != NULL) {
-    tcp_recved(pcb, p->tot_len);
-    pbuf_free(p);
-  } else if (err == ERR_OK) {
-    return tcp_close(pcb);
-  }
-  return ERR_OK;
-}
-#endif /* LWIP_CALLBACK_API */
-
-/**
- * Kills the oldest active connection that has the same or lower priority than
- * 'prio'.
- *
- * @param prio minimum priority
- */
-static void
-tcp_kill_prio(u8_t prio)
-{
-  struct tcp_pcb *pcb, *inactive;
-  u32_t inactivity;
-  u8_t mprio;
-
-  mprio = LWIP_MIN(TCP_PRIO_MAX, prio);
-
-  /* We kill the oldest active connection that has lower priority than prio. */
-  inactivity = 0;
-  inactive = NULL;
-  for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
-    if (pcb->prio <= mprio &&
-       (u32_t)(tcp_ticks - pcb->tmr) >= inactivity) {
-      inactivity = tcp_ticks - pcb->tmr;
-      inactive = pcb;
-      mprio = pcb->prio;
-    }
-  }
-  if (inactive != NULL) {
-    LWIP_DEBUGF(TCP_DEBUG, ("tcp_kill_prio: killing oldest PCB %p (%"S32_F")\n",
-           (void *)inactive, inactivity));
-    tcp_abort(inactive);
-  }
-}
-
-/**
- * Kills the oldest connection that is in specific state.
- * Called from tcp_alloc() for LAST_ACK and CLOSING if no more connections are available.
- */
-static void
-tcp_kill_state(enum tcp_state state)
-{
-  struct tcp_pcb *pcb, *inactive;
-  u32_t inactivity;
-
-  LWIP_ASSERT("invalid state", (state == CLOSING) || (state == LAST_ACK));
-
-  inactivity = 0;
-  inactive = NULL;
-  /* Go through the list of active pcbs and get the oldest pcb that is in state
-     CLOSING/LAST_ACK. */
-  for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
-    if (pcb->state == state) {
-      if ((u32_t)(tcp_ticks - pcb->tmr) >= inactivity) {
-        inactivity = tcp_ticks - pcb->tmr;
-        inactive = pcb;
-      }
-    }
-  }
-  if (inactive != NULL) {
-    LWIP_DEBUGF(TCP_DEBUG, ("tcp_kill_closing: killing oldest %s PCB %p (%"S32_F")\n",
-           tcp_state_str[state], (void *)inactive, inactivity));
-    /* Don't send a RST, since no data is lost. */
-    tcp_abandon(inactive, 0);
-  }
-}
-
-/**
- * Kills the oldest connection that is in TIME_WAIT state.
- * Called from tcp_alloc() if no more connections are available.
- */
-static void
-tcp_kill_timewait(void)
-{
-  struct tcp_pcb *pcb, *inactive;
-  u32_t inactivity;
-
-  inactivity = 0;
-  inactive = NULL;
-  /* Go through the list of TIME_WAIT pcbs and get the oldest pcb. */
-  for (pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) {
-    if ((u32_t)(tcp_ticks - pcb->tmr) >= inactivity) {
-      inactivity = tcp_ticks - pcb->tmr;
-      inactive = pcb;
-    }
-  }
-  if (inactive != NULL) {
-    LWIP_DEBUGF(TCP_DEBUG, ("tcp_kill_timewait: killing oldest TIME-WAIT PCB %p (%"S32_F")\n",
-           (void *)inactive, inactivity));
-    tcp_abort(inactive);
-  }
-}
-
-/**
- * Allocate a new tcp_pcb structure.
- *
- * @param prio priority for the new pcb
- * @return a new tcp_pcb that initially is in state CLOSED
- */
-struct tcp_pcb *
-tcp_alloc(u8_t prio)
-{
-  struct tcp_pcb *pcb;
-
-  pcb = (struct tcp_pcb *)memp_malloc(MEMP_TCP_PCB);
-  if (pcb == NULL) {
-    /* Try killing oldest connection in TIME-WAIT. */
-    LWIP_DEBUGF(TCP_DEBUG, ("tcp_alloc: killing off oldest TIME-WAIT connection\n"));
-    tcp_kill_timewait();
-    /* Try to allocate a tcp_pcb again. */
-    pcb = (struct tcp_pcb *)memp_malloc(MEMP_TCP_PCB);
-    if (pcb == NULL) {
-      /* Try killing oldest connection in LAST-ACK (these wouldn't go to TIME-WAIT). */
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_alloc: killing off oldest LAST-ACK connection\n"));
-      tcp_kill_state(LAST_ACK);
-      /* Try to allocate a tcp_pcb again. */
-      pcb = (struct tcp_pcb *)memp_malloc(MEMP_TCP_PCB);
-      if (pcb == NULL) {
-        /* Try killing oldest connection in CLOSING. */
-        LWIP_DEBUGF(TCP_DEBUG, ("tcp_alloc: killing off oldest CLOSING connection\n"));
-        tcp_kill_state(CLOSING);
-        /* Try to allocate a tcp_pcb again. */
-        pcb = (struct tcp_pcb *)memp_malloc(MEMP_TCP_PCB);
-        if (pcb == NULL) {
-          /* Try killing active connections with lower priority than the new one. */
-          LWIP_DEBUGF(TCP_DEBUG, ("tcp_alloc: killing connection with prio lower than %d\n", prio));
-          tcp_kill_prio(prio);
-          /* Try to allocate a tcp_pcb again. */
-          pcb = (struct tcp_pcb *)memp_malloc(MEMP_TCP_PCB);
-          if (pcb != NULL) {
-            /* adjust err stats: memp_malloc failed multiple times before */
-            MEMP_STATS_DEC(err, MEMP_TCP_PCB);
-          }
-        }
-        if (pcb != NULL) {
-          /* adjust err stats: memp_malloc failed multiple times before */
-          MEMP_STATS_DEC(err, MEMP_TCP_PCB);
-        }
-      }
-      if (pcb != NULL) {
-        /* adjust err stats: memp_malloc failed multiple times before */
-        MEMP_STATS_DEC(err, MEMP_TCP_PCB);
-      }
-    }
-    if (pcb != NULL) {
-      /* adjust err stats: memp_malloc failed above */
-      MEMP_STATS_DEC(err, MEMP_TCP_PCB);
-    }
-  }
-  if (pcb != NULL) {
-    /* zero out the whole pcb, so there is no need to initialize members to zero */
-    memset(pcb, 0, sizeof(struct tcp_pcb));
-    pcb->prio = prio;
-    pcb->snd_buf = TCP_SND_BUF;
-    /* Start with a window that does not need scaling. When window scaling is
-       enabled and used, the window is enlarged when both sides agree on scaling. */
-    pcb->rcv_wnd = pcb->rcv_ann_wnd = TCPWND_MIN16(TCP_WND);
-    pcb->ttl = TCP_TTL;
-    /* As initial send MSS, we use TCP_MSS but limit it to 536.
-       The send MSS is updated when an MSS option is received. */
-    pcb->mss = INITIAL_MSS;
-    pcb->rto = 3000 / TCP_SLOW_INTERVAL;
-    pcb->sv = 3000 / TCP_SLOW_INTERVAL;
-    pcb->rtime = -1;
-    pcb->cwnd = 1;
-    pcb->tmr = tcp_ticks;
-    pcb->last_timer = tcp_timer_ctr;
-
-    /* RFC 5681 recommends setting ssthresh abritrarily high and gives an example
-    of using the largest advertised receive window.  We've seen complications with
-    receiving TCPs that use window scaling and/or window auto-tuning where the
-    initial advertised window is very small and then grows rapidly once the
-    connection is established. To avoid these complications, we set ssthresh to the
-    largest effective cwnd (amount of in-flight data) that the sender can have. */
-    pcb->ssthresh = TCP_SND_BUF;
-
-#if LWIP_CALLBACK_API
-    pcb->recv = tcp_recv_null;
-#endif /* LWIP_CALLBACK_API */
-
-    /* Init KEEPALIVE timer */
-    pcb->keep_idle  = TCP_KEEPIDLE_DEFAULT;
-
-#if LWIP_TCP_KEEPALIVE
-    pcb->keep_intvl = TCP_KEEPINTVL_DEFAULT;
-    pcb->keep_cnt   = TCP_KEEPCNT_DEFAULT;
-#endif /* LWIP_TCP_KEEPALIVE */
-  }
-  return pcb;
-}
-
-/**
- * @ingroup tcp_raw
- * Creates a new TCP protocol control block but doesn't place it on
- * any of the TCP PCB lists.
- * The pcb is not put on any list until binding using tcp_bind().
- *
- * @internal: Maybe there should be a idle TCP PCB list where these
- * PCBs are put on. Port reservation using tcp_bind() is implemented but
- * allocated pcbs that are not bound can't be killed automatically if wanting
- * to allocate a pcb with higher prio (@see tcp_kill_prio())
- *
- * @return a new tcp_pcb that initially is in state CLOSED
- */
-struct tcp_pcb *
-tcp_new(void)
-{
-  return tcp_alloc(TCP_PRIO_NORMAL);
-}
-
-/**
- * @ingroup tcp_raw
- * Creates a new TCP protocol control block but doesn't
- * place it on any of the TCP PCB lists.
- * The pcb is not put on any list until binding using tcp_bind().
- *
- * @param type IP address type, see @ref lwip_ip_addr_type definitions.
- * If you want to listen to IPv4 and IPv6 (dual-stack) connections,
- * supply @ref IPADDR_TYPE_ANY as argument and bind to @ref IP_ANY_TYPE.
- * @return a new tcp_pcb that initially is in state CLOSED
- */
-struct tcp_pcb *
-tcp_new_ip_type(u8_t type)
-{
-  struct tcp_pcb * pcb;
-  pcb = tcp_alloc(TCP_PRIO_NORMAL);
-#if LWIP_IPV4 && LWIP_IPV6
-  if (pcb != NULL) {
-    IP_SET_TYPE_VAL(pcb->local_ip, type);
-    IP_SET_TYPE_VAL(pcb->remote_ip, type);
-  }
-#else
-  LWIP_UNUSED_ARG(type);
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-  return pcb;
-}
-
-/**
- * @ingroup tcp_raw
- * Used to specify the argument that should be passed callback
- * functions.
- *
- * @param pcb tcp_pcb to set the callback argument
- * @param arg void pointer argument to pass to callback functions
- */
-void
-tcp_arg(struct tcp_pcb *pcb, void *arg)
-{
-  /* This function is allowed to be called for both listen pcbs and
-     connection pcbs. */
-  if (pcb != NULL) {
-    pcb->callback_arg = arg;
-  }
-}
-#if LWIP_CALLBACK_API
-
-/**
- * @ingroup tcp_raw
- * Used to specify the function that should be called when a TCP
- * connection receives data.
- *
- * @param pcb tcp_pcb to set the recv callback
- * @param recv callback function to call for this pcb when data is received
- */
-void
-tcp_recv(struct tcp_pcb *pcb, tcp_recv_fn recv)
-{
-  if (pcb != NULL) {
-    LWIP_ASSERT("invalid socket state for recv callback", pcb->state != LISTEN);
-    pcb->recv = recv;
-  }
-}
-
-/**
- * @ingroup tcp_raw
- * Used to specify the function that should be called when TCP data
- * has been successfully delivered to the remote host.
- *
- * @param pcb tcp_pcb to set the sent callback
- * @param sent callback function to call for this pcb when data is successfully sent
- */
-void
-tcp_sent(struct tcp_pcb *pcb, tcp_sent_fn sent)
-{
-  if (pcb != NULL) {
-    LWIP_ASSERT("invalid socket state for sent callback", pcb->state != LISTEN);
-    pcb->sent = sent;
-  }
-}
-
-/**
- * @ingroup tcp_raw
- * Used to specify the function that should be called when a fatal error
- * has occurred on the connection.
- *
- * @note The corresponding pcb is already freed when this callback is called!
- * 
- * @param pcb tcp_pcb to set the err callback
- * @param err callback function to call for this pcb when a fatal error
- *        has occurred on the connection
- */
-void
-tcp_err(struct tcp_pcb *pcb, tcp_err_fn err)
-{
-  if (pcb != NULL) {
-    LWIP_ASSERT("invalid socket state for err callback", pcb->state != LISTEN);
-    pcb->errf = err;
-  }
-}
-
-/**
- * @ingroup tcp_raw
- * Used for specifying the function that should be called when a
- * LISTENing connection has been connected to another host.
- *
- * @param pcb tcp_pcb to set the accept callback
- * @param accept callback function to call for this pcb when LISTENing
- *        connection has been connected to another host
- */
-void
-tcp_accept(struct tcp_pcb *pcb, tcp_accept_fn accept)
-{
-  if ((pcb != NULL) && (pcb->state == LISTEN)) {
-    struct tcp_pcb_listen *lpcb = (struct tcp_pcb_listen*)pcb;
-    lpcb->accept = accept;
-  }
-}
-#endif /* LWIP_CALLBACK_API */
-
-
-/**
- * @ingroup tcp_raw
- * Used to specify the function that should be called periodically
- * from TCP. The interval is specified in terms of the TCP coarse
- * timer interval, which is called twice a second.
- *
- */
-void
-tcp_poll(struct tcp_pcb *pcb, tcp_poll_fn poll, u8_t interval)
-{
-  LWIP_ASSERT("invalid socket state for poll", pcb->state != LISTEN);
-#if LWIP_CALLBACK_API
-  pcb->poll = poll;
-#else /* LWIP_CALLBACK_API */
-  LWIP_UNUSED_ARG(poll);
-#endif /* LWIP_CALLBACK_API */
-  pcb->pollinterval = interval;
-}
-
-/**
- * Purges a TCP PCB. Removes any buffered data and frees the buffer memory
- * (pcb->ooseq, pcb->unsent and pcb->unacked are freed).
- *
- * @param pcb tcp_pcb to purge. The pcb itself is not deallocated!
- */
-void
-tcp_pcb_purge(struct tcp_pcb *pcb)
-{
-  if (pcb->state != CLOSED &&
-     pcb->state != TIME_WAIT &&
-     pcb->state != LISTEN) {
-
-    LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge\n"));
-
-    tcp_backlog_accepted(pcb);
-
-    if (pcb->refused_data != NULL) {
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge: data left on ->refused_data\n"));
-      pbuf_free(pcb->refused_data);
-      pcb->refused_data = NULL;
-    }
-    if (pcb->unsent != NULL) {
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge: not all data sent\n"));
-    }
-    if (pcb->unacked != NULL) {
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge: data left on ->unacked\n"));
-    }
-#if TCP_QUEUE_OOSEQ
-    if (pcb->ooseq != NULL) {
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_pcb_purge: data left on ->ooseq\n"));
-    }
-    tcp_segs_free(pcb->ooseq);
-    pcb->ooseq = NULL;
-#endif /* TCP_QUEUE_OOSEQ */
-
-    /* Stop the retransmission timer as it will expect data on unacked
-       queue if it fires */
-    pcb->rtime = -1;
-
-    tcp_segs_free(pcb->unsent);
-    tcp_segs_free(pcb->unacked);
-    pcb->unacked = pcb->unsent = NULL;
-#if TCP_OVERSIZE
-    pcb->unsent_oversize = 0;
-#endif /* TCP_OVERSIZE */
-  }
-}
-
-/**
- * Purges the PCB and removes it from a PCB list. Any delayed ACKs are sent first.
- *
- * @param pcblist PCB list to purge.
- * @param pcb tcp_pcb to purge. The pcb itself is NOT deallocated!
- */
-void
-tcp_pcb_remove(struct tcp_pcb **pcblist, struct tcp_pcb *pcb)
-{
-  TCP_RMV(pcblist, pcb);
-
-  tcp_pcb_purge(pcb);
-
-  /* if there is an outstanding delayed ACKs, send it */
-  if (pcb->state != TIME_WAIT &&
-     pcb->state != LISTEN &&
-     pcb->flags & TF_ACK_DELAY) {
-    pcb->flags |= TF_ACK_NOW;
-    tcp_output(pcb);
-  }
-
-  if (pcb->state != LISTEN) {
-    LWIP_ASSERT("unsent segments leaking", pcb->unsent == NULL);
-    LWIP_ASSERT("unacked segments leaking", pcb->unacked == NULL);
-#if TCP_QUEUE_OOSEQ
-    LWIP_ASSERT("ooseq segments leaking", pcb->ooseq == NULL);
-#endif /* TCP_QUEUE_OOSEQ */
-  }
-
-  pcb->state = CLOSED;
-  /* reset the local port to prevent the pcb from being 'bound' */
-  pcb->local_port = 0;
-
-  LWIP_ASSERT("tcp_pcb_remove: tcp_pcbs_sane()", tcp_pcbs_sane());
-}
-
-/**
- * Calculates a new initial sequence number for new connections.
- *
- * @return u32_t pseudo random sequence number
- */
-u32_t
-tcp_next_iss(struct tcp_pcb *pcb)
-{
-#ifdef LWIP_HOOK_TCP_ISN
-  return LWIP_HOOK_TCP_ISN(&pcb->local_ip, pcb->local_port, &pcb->remote_ip, pcb->remote_port);
-#else /* LWIP_HOOK_TCP_ISN */
-  static u32_t iss = 6510;
-
-  LWIP_UNUSED_ARG(pcb);
-
-  iss += tcp_ticks;       /* XXX */
-  return iss;
-#endif /* LWIP_HOOK_TCP_ISN */
-}
-
-#if TCP_CALCULATE_EFF_SEND_MSS
-/**
- * Calculates the effective send mss that can be used for a specific IP address
- * by using ip_route to determine the netif used to send to the address and
- * calculating the minimum of TCP_MSS and that netif's mtu (if set).
- */
-u16_t
-tcp_eff_send_mss_impl(u16_t sendmss, const ip_addr_t *dest
-#if LWIP_IPV6 || LWIP_IPV4_SRC_ROUTING
-                     , const ip_addr_t *src
-#endif /* LWIP_IPV6 || LWIP_IPV4_SRC_ROUTING */
-                     )
-{
-  u16_t mss_s;
-  struct netif *outif;
-  s16_t mtu;
-
-  outif = ip_route(src, dest);
-#if LWIP_IPV6
-#if LWIP_IPV4
-  if (IP_IS_V6(dest))
-#endif /* LWIP_IPV4 */
-  {
-    /* First look in destination cache, to see if there is a Path MTU. */
-    mtu = nd6_get_destination_mtu(ip_2_ip6(dest), outif);
-  }
-#if LWIP_IPV4
-  else
-#endif /* LWIP_IPV4 */
-#endif /* LWIP_IPV6 */
-#if LWIP_IPV4
-  {
-    if (outif == NULL) {
-      return sendmss;
-    }
-    mtu = outif->mtu;
-  }
-#endif /* LWIP_IPV4 */
-
-  if (mtu != 0) {
-#if LWIP_IPV6
-#if LWIP_IPV4
-    if (IP_IS_V6(dest))
-#endif /* LWIP_IPV4 */
-    {
-      mss_s = mtu - IP6_HLEN - TCP_HLEN;
-    }
-#if LWIP_IPV4
-    else
-#endif /* LWIP_IPV4 */
-#endif /* LWIP_IPV6 */
-#if LWIP_IPV4
-    {
-      mss_s = mtu - IP_HLEN - TCP_HLEN;
-    }
-#endif /* LWIP_IPV4 */
-    /* RFC 1122, chap 4.2.2.6:
-     * Eff.snd.MSS = min(SendMSS+20, MMS_S) - TCPhdrsize - IPoptionsize
-     * We correct for TCP options in tcp_write(), and don't support IP options.
-     */
-    sendmss = LWIP_MIN(sendmss, mss_s);
-  }
-  return sendmss;
-}
-#endif /* TCP_CALCULATE_EFF_SEND_MSS */
-
-/** Helper function for tcp_netif_ip_addr_changed() that iterates a pcb list */
-static void
-tcp_netif_ip_addr_changed_pcblist(const ip_addr_t* old_addr, struct tcp_pcb* pcb_list)
-{
-  struct tcp_pcb *pcb;
-  pcb = pcb_list;
-  while (pcb != NULL) {
-    /* PCB bound to current local interface address? */
-    if (ip_addr_cmp(&pcb->local_ip, old_addr)
-#if LWIP_AUTOIP
-      /* connections to link-local addresses must persist (RFC3927 ch. 1.9) */
-      && (!IP_IS_V4_VAL(pcb->local_ip) || !ip4_addr_islinklocal(ip_2_ip4(&pcb->local_ip)))
-#endif /* LWIP_AUTOIP */
-      ) {
-      /* this connection must be aborted */
-      struct tcp_pcb *next = pcb->next;
-      LWIP_DEBUGF(NETIF_DEBUG | LWIP_DBG_STATE, ("netif_set_ipaddr: aborting TCP pcb %p\n", (void *)pcb));
-      tcp_abort(pcb);
-      pcb = next;
-    } else {
-      pcb = pcb->next;
-    }
-  }
-}
-
-/** This function is called from netif.c when address is changed or netif is removed
- *
- * @param old_addr IP address of the netif before change
- * @param new_addr IP address of the netif after change or NULL if netif has been removed
- */
-void
-tcp_netif_ip_addr_changed(const ip_addr_t* old_addr, const ip_addr_t* new_addr)
-{
-  struct tcp_pcb_listen *lpcb, *next;
-
-  if (!ip_addr_isany(old_addr)) {
-    tcp_netif_ip_addr_changed_pcblist(old_addr, tcp_active_pcbs);
-    tcp_netif_ip_addr_changed_pcblist(old_addr, tcp_bound_pcbs);
-
-    if (!ip_addr_isany(new_addr)) {
-      /* PCB bound to current local interface address? */
-      for (lpcb = tcp_listen_pcbs.listen_pcbs; lpcb != NULL; lpcb = next) {
-        next = lpcb->next;
-        /* PCB bound to current local interface address? */
-        if (ip_addr_cmp(&lpcb->local_ip, old_addr)) {
-          /* The PCB is listening to the old ipaddr and
-            * is set to listen to the new one instead */
-          ip_addr_copy(lpcb->local_ip, *new_addr);
-        }
-      }
-    }
-  }
-}
-
-const char*
-tcp_debug_state_str(enum tcp_state s)
-{
-  return tcp_state_str[s];
-}
-
-#if TCP_DEBUG || TCP_INPUT_DEBUG || TCP_OUTPUT_DEBUG
-/**
- * Print a tcp header for debugging purposes.
- *
- * @param tcphdr pointer to a struct tcp_hdr
- */
-void
-tcp_debug_print(struct tcp_hdr *tcphdr)
-{
-  LWIP_DEBUGF(TCP_DEBUG, ("TCP header:\n"));
-  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(TCP_DEBUG, ("|    %5"U16_F"      |    %5"U16_F"      | (src port, dest port)\n",
-         lwip_ntohs(tcphdr->src), lwip_ntohs(tcphdr->dest)));
-  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(TCP_DEBUG, ("|           %010"U32_F"          | (seq no)\n",
-          lwip_ntohl(tcphdr->seqno)));
-  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(TCP_DEBUG, ("|           %010"U32_F"          | (ack no)\n",
-         lwip_ntohl(tcphdr->ackno)));
-  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(TCP_DEBUG, ("| %2"U16_F" |   |%"U16_F"%"U16_F"%"U16_F"%"U16_F"%"U16_F"%"U16_F"|     %5"U16_F"     | (hdrlen, flags (",
-       TCPH_HDRLEN(tcphdr),
-         (u16_t)(TCPH_FLAGS(tcphdr) >> 5 & 1),
-         (u16_t)(TCPH_FLAGS(tcphdr) >> 4 & 1),
-         (u16_t)(TCPH_FLAGS(tcphdr) >> 3 & 1),
-         (u16_t)(TCPH_FLAGS(tcphdr) >> 2 & 1),
-         (u16_t)(TCPH_FLAGS(tcphdr) >> 1 & 1),
-         (u16_t)(TCPH_FLAGS(tcphdr)      & 1),
-         lwip_ntohs(tcphdr->wnd)));
-  tcp_debug_print_flags(TCPH_FLAGS(tcphdr));
-  LWIP_DEBUGF(TCP_DEBUG, ("), win)\n"));
-  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(TCP_DEBUG, ("|    0x%04"X16_F"     |     %5"U16_F"     | (chksum, urgp)\n",
-         lwip_ntohs(tcphdr->chksum), lwip_ntohs(tcphdr->urgp)));
-  LWIP_DEBUGF(TCP_DEBUG, ("+-------------------------------+\n"));
-}
-
-/**
- * Print a tcp state for debugging purposes.
- *
- * @param s enum tcp_state to print
- */
-void
-tcp_debug_print_state(enum tcp_state s)
-{
-  LWIP_DEBUGF(TCP_DEBUG, ("State: %s\n", tcp_state_str[s]));
-}
-
-/**
- * Print tcp flags for debugging purposes.
- *
- * @param flags tcp flags, all active flags are printed
- */
-void
-tcp_debug_print_flags(u8_t flags)
-{
-  if (flags & TCP_FIN) {
-    LWIP_DEBUGF(TCP_DEBUG, ("FIN "));
-  }
-  if (flags & TCP_SYN) {
-    LWIP_DEBUGF(TCP_DEBUG, ("SYN "));
-  }
-  if (flags & TCP_RST) {
-    LWIP_DEBUGF(TCP_DEBUG, ("RST "));
-  }
-  if (flags & TCP_PSH) {
-    LWIP_DEBUGF(TCP_DEBUG, ("PSH "));
-  }
-  if (flags & TCP_ACK) {
-    LWIP_DEBUGF(TCP_DEBUG, ("ACK "));
-  }
-  if (flags & TCP_URG) {
-    LWIP_DEBUGF(TCP_DEBUG, ("URG "));
-  }
-  if (flags & TCP_ECE) {
-    LWIP_DEBUGF(TCP_DEBUG, ("ECE "));
-  }
-  if (flags & TCP_CWR) {
-    LWIP_DEBUGF(TCP_DEBUG, ("CWR "));
-  }
-  LWIP_DEBUGF(TCP_DEBUG, ("\n"));
-}
-
-/**
- * Print all tcp_pcbs in every list for debugging purposes.
- */
-void
-tcp_debug_print_pcbs(void)
-{
-  struct tcp_pcb *pcb;
-  struct tcp_pcb_listen *pcbl;
-
-  LWIP_DEBUGF(TCP_DEBUG, ("Active PCB states:\n"));
-  for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
-    LWIP_DEBUGF(TCP_DEBUG, ("Local port %"U16_F", foreign port %"U16_F" snd_nxt %"U32_F" rcv_nxt %"U32_F" ",
-                       pcb->local_port, pcb->remote_port,
-                       pcb->snd_nxt, pcb->rcv_nxt));
-    tcp_debug_print_state(pcb->state);
-  }
-
-  LWIP_DEBUGF(TCP_DEBUG, ("Listen PCB states:\n"));
-  for (pcbl = tcp_listen_pcbs.listen_pcbs; pcbl != NULL; pcbl = pcbl->next) {
-    LWIP_DEBUGF(TCP_DEBUG, ("Local port %"U16_F" ", pcbl->local_port));
-    tcp_debug_print_state(pcbl->state);
-  }
-
-  LWIP_DEBUGF(TCP_DEBUG, ("TIME-WAIT PCB states:\n"));
-  for (pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) {
-    LWIP_DEBUGF(TCP_DEBUG, ("Local port %"U16_F", foreign port %"U16_F" snd_nxt %"U32_F" rcv_nxt %"U32_F" ",
-                       pcb->local_port, pcb->remote_port,
-                       pcb->snd_nxt, pcb->rcv_nxt));
-    tcp_debug_print_state(pcb->state);
-  }
-}
-
-/**
- * Check state consistency of the tcp_pcb lists.
- */
-s16_t
-tcp_pcbs_sane(void)
-{
-  struct tcp_pcb *pcb;
-  for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
-    LWIP_ASSERT("tcp_pcbs_sane: active pcb->state != CLOSED", pcb->state != CLOSED);
-    LWIP_ASSERT("tcp_pcbs_sane: active pcb->state != LISTEN", pcb->state != LISTEN);
-    LWIP_ASSERT("tcp_pcbs_sane: active pcb->state != TIME-WAIT", pcb->state != TIME_WAIT);
-  }
-  for (pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) {
-    LWIP_ASSERT("tcp_pcbs_sane: tw pcb->state == TIME-WAIT", pcb->state == TIME_WAIT);
-  }
-  return 1;
-}
-#endif /* TCP_DEBUG */
-
-#endif /* LWIP_TCP */
diff --git a/sys/net/core/tcp_in.c b/sys/net/core/tcp_in.c
deleted file mode 100644
index 0c37e01..0000000
--- a/sys/net/core/tcp_in.c
+++ /dev/null
@@ -1,1837 +0,0 @@
-/**
- * @file
- * Transmission Control Protocol, incoming traffic
- *
- * The input processing functions of the TCP layer.
- *
- * These functions are generally called in the order (ip_input() ->)
- * tcp_input() -> * tcp_process() -> tcp_receive() (-> application).
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/priv/tcp_priv.h"
-#include "net/def.h"
-#include "net/ip_addr.h"
-#include "net/netif.h"
-#include "net/mem.h"
-#include "net/memp.h"
-#include "net/inet_chksum.h"
-#include "net/stats.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#if LWIP_ND6_TCP_REACHABILITY_HINTS
-#include "net/nd6.h"
-#endif /* LWIP_ND6_TCP_REACHABILITY_HINTS */
-
-/** Initial CWND calculation as defined RFC 2581 */
-#define LWIP_TCP_CALC_INITIAL_CWND(mss) LWIP_MIN((4U * (mss)), LWIP_MAX((2U * (mss)), 4380U));
-
-/* These variables are global to all functions involved in the input
-   processing of TCP segments. They are set by the tcp_input()
-   function. */
-static struct tcp_seg inseg;
-static struct tcp_hdr *tcphdr;
-static u16_t tcphdr_optlen;
-static u16_t tcphdr_opt1len;
-static u8_t* tcphdr_opt2;
-static u16_t tcp_optidx;
-static u32_t seqno, ackno;
-static tcpwnd_size_t recv_acked;
-static u16_t tcplen;
-static u8_t flags;
-
-static u8_t recv_flags;
-static struct pbuf *recv_data;
-
-struct tcp_pcb *tcp_input_pcb;
-
-/* Forward declarations. */
-static err_t tcp_process(struct tcp_pcb *pcb);
-static void tcp_receive(struct tcp_pcb *pcb);
-static void tcp_parseopt(struct tcp_pcb *pcb);
-
-static void tcp_listen_input(struct tcp_pcb_listen *pcb);
-static void tcp_timewait_input(struct tcp_pcb *pcb);
-
-static int tcp_input_delayed_close(struct tcp_pcb *pcb);
-
-/**
- * The initial input processing of TCP. It verifies the TCP header, demultiplexes
- * the segment between the PCBs and passes it on to tcp_process(), which implements
- * the TCP finite state machine. This function is called by the IP layer (in
- * ip_input()).
- *
- * @param p received TCP segment to process (p->payload pointing to the TCP header)
- * @param inp network interface on which this segment was received
- */
-void
-tcp_input(struct pbuf *p, struct netif *inp)
-{
-  struct tcp_pcb *pcb, *prev;
-  struct tcp_pcb_listen *lpcb;
-#if SO_REUSE
-  struct tcp_pcb *lpcb_prev = NULL;
-  struct tcp_pcb_listen *lpcb_any = NULL;
-#endif /* SO_REUSE */
-  u8_t hdrlen_bytes;
-  err_t err;
-
-  LWIP_UNUSED_ARG(inp);
-
-  PERF_START;
-
-  TCP_STATS_INC(tcp.recv);
-  MIB2_STATS_INC(mib2.tcpinsegs);
-
-  tcphdr = (struct tcp_hdr *)p->payload;
-
-#if TCP_INPUT_DEBUG
-  tcp_debug_print(tcphdr);
-#endif
-
-  /* Check that TCP header fits in payload */
-  if (p->len < TCP_HLEN) {
-    /* drop short packets */
-    LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: short packet (%"U16_F" bytes) discarded\n", p->tot_len));
-    TCP_STATS_INC(tcp.lenerr);
-    goto dropped;
-  }
-
-  /* Don't even process incoming broadcasts/multicasts. */
-  if (ip_addr_isbroadcast(ip_current_dest_addr(), ip_current_netif()) ||
-      ip_addr_ismulticast(ip_current_dest_addr())) {
-    TCP_STATS_INC(tcp.proterr);
-    goto dropped;
-  }
-
-#if CHECKSUM_CHECK_TCP
-  IF__NETIF_CHECKSUM_ENABLED(inp, NETIF_CHECKSUM_CHECK_TCP) {
-    /* Verify TCP checksum. */
-    u16_t chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len,
-                               ip_current_src_addr(), ip_current_dest_addr());
-    if (chksum != 0) {
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packet discarded due to failing checksum 0x%04"X16_F"\n",
-          chksum));
-      tcp_debug_print(tcphdr);
-      TCP_STATS_INC(tcp.chkerr);
-      goto dropped;
-    }
-  }
-#endif /* CHECKSUM_CHECK_TCP */
-
-  /* sanity-check header length */
-  hdrlen_bytes = TCPH_HDRLEN(tcphdr) * 4;
-  if ((hdrlen_bytes < TCP_HLEN) || (hdrlen_bytes > p->tot_len)) {
-    LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: invalid header length (%"U16_F")\n", (u16_t)hdrlen_bytes));
-    TCP_STATS_INC(tcp.lenerr);
-    goto dropped;
-  }
-
-  /* Move the payload pointer in the pbuf so that it points to the
-     TCP data instead of the TCP header. */
-  tcphdr_optlen = hdrlen_bytes - TCP_HLEN;
-  tcphdr_opt2 = NULL;
-  if (p->len >= hdrlen_bytes) {
-    /* all options are in the first pbuf */
-    tcphdr_opt1len = tcphdr_optlen;
-    pbuf_header(p, -(s16_t)hdrlen_bytes); /* cannot fail */
-  } else {
-    u16_t opt2len;
-    /* TCP header fits into first pbuf, options don't - data is in the next pbuf */
-    /* there must be a next pbuf, due to hdrlen_bytes sanity check above */
-    LWIP_ASSERT("p->next != NULL", p->next != NULL);
-
-    /* advance over the TCP header (cannot fail) */
-    pbuf_header(p, -TCP_HLEN);
-
-    /* determine how long the first and second parts of the options are */
-    tcphdr_opt1len = p->len;
-    opt2len = tcphdr_optlen - tcphdr_opt1len;
-
-    /* options continue in the next pbuf: set p to zero length and hide the
-        options in the next pbuf (adjusting p->tot_len) */
-    pbuf_header(p, -(s16_t)tcphdr_opt1len);
-
-    /* check that the options fit in the second pbuf */
-    if (opt2len > p->next->len) {
-      /* drop short packets */
-      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: options overflow second pbuf (%"U16_F" bytes)\n", p->next->len));
-      TCP_STATS_INC(tcp.lenerr);
-      goto dropped;
-    }
-
-    /* remember the pointer to the second part of the options */
-    tcphdr_opt2 = (u8_t*)p->next->payload;
-
-    /* advance p->next to point after the options, and manually
-        adjust p->tot_len to keep it consistent with the changed p->next */
-    pbuf_header(p->next, -(s16_t)opt2len);
-    p->tot_len -= opt2len;
-
-    LWIP_ASSERT("p->len == 0", p->len == 0);
-    LWIP_ASSERT("p->tot_len == p->next->tot_len", p->tot_len == p->next->tot_len);
-  }
-
-  /* Convert fields in TCP header to host byte order. */
-  tcphdr->src = lwip_ntohs(tcphdr->src);
-  tcphdr->dest = lwip_ntohs(tcphdr->dest);
-  seqno = tcphdr->seqno = lwip_ntohl(tcphdr->seqno);
-  ackno = tcphdr->ackno = lwip_ntohl(tcphdr->ackno);
-  tcphdr->wnd = lwip_ntohs(tcphdr->wnd);
-
-  flags = TCPH_FLAGS(tcphdr);
-  tcplen = p->tot_len + ((flags & (TCP_FIN | TCP_SYN)) ? 1 : 0);
-
-  /* Demultiplex an incoming segment. First, we check if it is destined
-     for an active connection. */
-  prev = NULL;
-
-  for (pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) {
-    LWIP_ASSERT("tcp_input: active pcb->state != CLOSED", pcb->state != CLOSED);
-    LWIP_ASSERT("tcp_input: active pcb->state != TIME-WAIT", pcb->state != TIME_WAIT);
-    LWIP_ASSERT("tcp_input: active pcb->state != LISTEN", pcb->state != LISTEN);
-    if (pcb->remote_port == tcphdr->src &&
-        pcb->local_port == tcphdr->dest &&
-        ip_addr_cmp(&pcb->remote_ip, ip_current_src_addr()) &&
-        ip_addr_cmp(&pcb->local_ip, ip_current_dest_addr())) {
-      /* Move this PCB to the front of the list so that subsequent
-         lookups will be faster (we exploit locality in TCP segment
-         arrivals). */
-      LWIP_ASSERT("tcp_input: pcb->next != pcb (before cache)", pcb->next != pcb);
-      if (prev != NULL) {
-        prev->next = pcb->next;
-        pcb->next = tcp_active_pcbs;
-        tcp_active_pcbs = pcb;
-      } else {
-        TCP_STATS_INC(tcp.cachehit);
-      }
-      LWIP_ASSERT("tcp_input: pcb->next != pcb (after cache)", pcb->next != pcb);
-      break;
-    }
-    prev = pcb;
-  }
-
-  if (pcb == NULL) {
-    /* If it did not go to an active connection, we check the connections
-       in the TIME-WAIT state. */
-    for (pcb = tcp_tw_pcbs; pcb != NULL; pcb = pcb->next) {
-      LWIP_ASSERT("tcp_input: TIME-WAIT pcb->state == TIME-WAIT", pcb->state == TIME_WAIT);
-      if (pcb->remote_port == tcphdr->src &&
-          pcb->local_port == tcphdr->dest &&
-          ip_addr_cmp(&pcb->remote_ip, ip_current_src_addr()) &&
-          ip_addr_cmp(&pcb->local_ip, ip_current_dest_addr())) {
-        /* We don't really care enough to move this PCB to the front
-           of the list since we are not very likely to receive that
-           many segments for connections in TIME-WAIT. */
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packed for TIME_WAITing connection.\n"));
-        tcp_timewait_input(pcb);
-        pbuf_free(p);
-        return;
-      }
-    }
-
-    /* Finally, if we still did not get a match, we check all PCBs that
-       are LISTENing for incoming connections. */
-    prev = NULL;
-    for (lpcb = tcp_listen_pcbs.listen_pcbs; lpcb != NULL; lpcb = lpcb->next) {
-      if (lpcb->local_port == tcphdr->dest) {
-        if (IP_IS_ANY_TYPE_VAL(lpcb->local_ip)) {
-          /* found an ANY TYPE (IPv4/IPv6) match */
-#if SO_REUSE
-          lpcb_any = lpcb;
-          lpcb_prev = prev;
-#else /* SO_REUSE */
-          break;
-#endif /* SO_REUSE */
-        } else if (IP_ADDR_PCB_VERSION_MATCH_EXACT(lpcb, ip_current_dest_addr())) {
-          if (ip_addr_cmp(&lpcb->local_ip, ip_current_dest_addr())) {
-            /* found an exact match */
-            break;
-          } else if (ip_addr_isany(&lpcb->local_ip)) {
-            /* found an ANY-match */
-#if SO_REUSE
-            lpcb_any = lpcb;
-            lpcb_prev = prev;
-#else /* SO_REUSE */
-            break;
- #endif /* SO_REUSE */
-          }
-        }
-      }
-      prev = (struct tcp_pcb *)lpcb;
-    }
-#if SO_REUSE
-    /* first try specific local IP */
-    if (lpcb == NULL) {
-      /* only pass to ANY if no specific local IP has been found */
-      lpcb = lpcb_any;
-      prev = lpcb_prev;
-    }
-#endif /* SO_REUSE */
-    if (lpcb != NULL) {
-      /* Move this PCB to the front of the list so that subsequent
-         lookups will be faster (we exploit locality in TCP segment
-         arrivals). */
-      if (prev != NULL) {
-        ((struct tcp_pcb_listen *)prev)->next = lpcb->next;
-              /* our successor is the remainder of the listening list */
-        lpcb->next = tcp_listen_pcbs.listen_pcbs;
-              /* put this listening pcb at the head of the listening list */
-        tcp_listen_pcbs.listen_pcbs = lpcb;
-      } else {
-        TCP_STATS_INC(tcp.cachehit);
-      }
-
-      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: packed for LISTENing connection.\n"));
-      tcp_listen_input(lpcb);
-      pbuf_free(p);
-      return;
-    }
-  }
-
-#if TCP_INPUT_DEBUG
-  LWIP_DEBUGF(TCP_INPUT_DEBUG, ("+-+-+-+-+-+-+-+-+-+-+-+-+-+- tcp_input: flags "));
-  tcp_debug_print_flags(TCPH_FLAGS(tcphdr));
-  LWIP_DEBUGF(TCP_INPUT_DEBUG, ("-+-+-+-+-+-+-+-+-+-+-+-+-+-+\n"));
-#endif /* TCP_INPUT_DEBUG */
-
-
-  if (pcb != NULL) {
-    /* The incoming segment belongs to a connection. */
-#if TCP_INPUT_DEBUG
-    tcp_debug_print_state(pcb->state);
-#endif /* TCP_INPUT_DEBUG */
-
-    /* Set up a tcp_seg structure. */
-    inseg.next = NULL;
-    inseg.len = p->tot_len;
-    inseg.p = p;
-    inseg.tcphdr = tcphdr;
-
-    recv_data = NULL;
-    recv_flags = 0;
-    recv_acked = 0;
-
-    if (flags & TCP_PSH) {
-      p->flags |= PBUF_FLAG_PUSH;
-    }
-
-    /* If there is data which was previously "refused" by upper layer */
-    if (pcb->refused_data != NULL) {
-      if ((tcp_process_refused_data(pcb) == ERR_ABRT) ||
-        ((pcb->refused_data != NULL) && (tcplen > 0))) {
-        /* pcb has been aborted or refused data is still refused and the new
-           segment contains data */
-        if (pcb->rcv_ann_wnd == 0) {
-          /* this is a zero-window probe, we respond to it with current RCV.NXT
-          and drop the data segment */
-          tcp_send_empty_ack(pcb);
-        }
-        TCP_STATS_INC(tcp.drop);
-        MIB2_STATS_INC(mib2.tcpinerrs);
-        goto aborted;
-      }
-    }
-    tcp_input_pcb = pcb;
-    err = tcp_process(pcb);
-    /* A return value of ERR_ABRT means that tcp_abort() was called
-       and that the pcb has been freed. If so, we don't do anything. */
-    if (err != ERR_ABRT) {
-      if (recv_flags & TF_RESET) {
-        /* TF_RESET means that the connection was reset by the other
-           end. We then call the error callback to inform the
-           application that the connection is dead before we
-           deallocate the PCB. */
-        TCP_EVENT_ERR(pcb->state, pcb->errf, pcb->callback_arg, ERR_RST);
-        tcp_pcb_remove(&tcp_active_pcbs, pcb);
-        memp_free(MEMP_TCP_PCB, pcb);
-      } else {
-        err = ERR_OK;
-        /* If the application has registered a "sent" function to be
-           called when new send buffer space is available, we call it
-           now. */
-        if (recv_acked > 0) {
-          u16_t acked16;
-#if LWIP_WND_SCALE
-          /* recv_acked is u32_t but the sent callback only takes a u16_t,
-             so we might have to call it multiple times. */
-          u32_t acked = recv_acked;
-          while (acked > 0) {
-            acked16 = (u16_t)LWIP_MIN(acked, 0xffffu);
-            acked -= acked16;
-#else
-          {
-            acked16 = recv_acked;
-#endif
-            TCP_EVENT_SENT(pcb, (u16_t)acked16, err);
-            if (err == ERR_ABRT) {
-              goto aborted;
-            }
-          }
-          recv_acked = 0;
-        }
-        if (tcp_input_delayed_close(pcb)) {
-          goto aborted;
-        }
-#if TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-        while (recv_data != NULL) {
-          struct pbuf *rest = NULL;
-          pbuf_split_64k(recv_data, &rest);
-#else /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-        if (recv_data != NULL) {
-#endif /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-
-          LWIP_ASSERT("pcb->refused_data == NULL", pcb->refused_data == NULL);
-          if (pcb->flags & TF_RXCLOSED) {
-            /* received data although already closed -> abort (send RST) to
-               notify the remote host that not all data has been processed */
-            pbuf_free(recv_data);
-#if TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-            if (rest != NULL) {
-              pbuf_free(rest);
-            }
-#endif /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-            tcp_abort(pcb);
-            goto aborted;
-          }
-
-          /* Notify application that data has been received. */
-          TCP_EVENT_RECV(pcb, recv_data, ERR_OK, err);
-          if (err == ERR_ABRT) {
-#if TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-            if (rest != NULL) {
-              pbuf_free(rest);
-            }
-#endif /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-            goto aborted;
-          }
-
-          /* If the upper layer can't receive this data, store it */
-          if (err != ERR_OK) {
-#if TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-            if (rest != NULL) {
-              pbuf_cat(recv_data, rest);
-            }
-#endif /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-            pcb->refused_data = recv_data;
-            LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_input: keep incoming packet, because pcb is \"full\"\n"));
-#if TCP_QUEUE_OOSEQ && LWIP_WND_SCALE
-            break;
-          } else {
-            /* Upper layer received the data, go on with the rest if > 64K */
-            recv_data = rest;
-#endif /* TCP_QUEUE_OOSEQ && LWIP_WND_SCALE */
-          }
-        }
-
-        /* If a FIN segment was received, we call the callback
-           function with a NULL buffer to indicate EOF. */
-        if (recv_flags & TF_GOT_FIN) {
-          if (pcb->refused_data != NULL) {
-            /* Delay this if we have refused data. */
-            pcb->refused_data->flags |= PBUF_FLAG_TCP_FIN;
-          } else {
-            /* correct rcv_wnd as the application won't call tcp_recved()
-               for the FIN's seqno */
-            if (pcb->rcv_wnd != TCP_WND_MAX(pcb)) {
-              pcb->rcv_wnd++;
-            }
-            TCP_EVENT_CLOSED(pcb, err);
-            if (err == ERR_ABRT) {
-              goto aborted;
-            }
-          }
-        }
-
-        tcp_input_pcb = NULL;
-        if (tcp_input_delayed_close(pcb)) {
-          goto aborted;
-        }
-        /* Try to send something out. */
-        tcp_output(pcb);
-#if TCP_INPUT_DEBUG
-#if TCP_DEBUG
-        tcp_debug_print_state(pcb->state);
-#endif /* TCP_DEBUG */
-#endif /* TCP_INPUT_DEBUG */
-      }
-    }
-    /* Jump target if pcb has been aborted in a callback (by calling tcp_abort()).
-       Below this line, 'pcb' may not be dereferenced! */
-aborted:
-    tcp_input_pcb = NULL;
-    recv_data = NULL;
-
-    /* give up our reference to inseg.p */
-    if (inseg.p != NULL)
-    {
-      pbuf_free(inseg.p);
-      inseg.p = NULL;
-    }
-  } else {
-
-    /* If no matching PCB was found, send a TCP RST (reset) to the
-       sender. */
-    LWIP_DEBUGF(TCP_RST_DEBUG, ("tcp_input: no PCB match found, resetting.\n"));
-    if (!(TCPH_FLAGS(tcphdr) & TCP_RST)) {
-      TCP_STATS_INC(tcp.proterr);
-      TCP_STATS_INC(tcp.drop);
-      tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(),
-        ip_current_src_addr(), tcphdr->dest, tcphdr->src);
-    }
-    pbuf_free(p);
-  }
-
-  LWIP_ASSERT("tcp_input: tcp_pcbs_sane()", tcp_pcbs_sane());
-  PERF_STOP("tcp_input");
-  return;
-dropped:
-  TCP_STATS_INC(tcp.drop);
-  MIB2_STATS_INC(mib2.tcpinerrs);
-  pbuf_free(p);
-}
-
-/** Called from tcp_input to check for TF_CLOSED flag. This results in closing
- * and deallocating a pcb at the correct place to ensure noone references it
- * any more.
- * @returns 1 if the pcb has been closed and deallocated, 0 otherwise
- */
-static int
-tcp_input_delayed_close(struct tcp_pcb *pcb)
-{
-  if (recv_flags & TF_CLOSED) {
-    /* The connection has been closed and we will deallocate the
-        PCB. */
-    if (!(pcb->flags & TF_RXCLOSED)) {
-      /* Connection closed although the application has only shut down the
-          tx side: call the PCB's err callback and indicate the closure to
-          ensure the application doesn't continue using the PCB. */
-      TCP_EVENT_ERR(pcb->state, pcb->errf, pcb->callback_arg, ERR_CLSD);
-    }
-    tcp_pcb_remove(&tcp_active_pcbs, pcb);
-    memp_free(MEMP_TCP_PCB, pcb);
-    return 1;
-  }
-  return 0;
-}
-
-/**
- * Called by tcp_input() when a segment arrives for a listening
- * connection (from tcp_input()).
- *
- * @param pcb the tcp_pcb_listen for which a segment arrived
- *
- * @note the segment which arrived is saved in global variables, therefore only the pcb
- *       involved is passed as a parameter to this function
- */
-static void
-tcp_listen_input(struct tcp_pcb_listen *pcb)
-{
-  struct tcp_pcb *npcb;
-  u32_t iss;
-  err_t rc;
-
-  if (flags & TCP_RST) {
-    /* An incoming RST should be ignored. Return. */
-    return;
-  }
-
-  /* In the LISTEN state, we check for incoming SYN segments,
-     creates a new PCB, and responds with a SYN|ACK. */
-  if (flags & TCP_ACK) {
-    /* For incoming segments with the ACK flag set, respond with a
-       RST. */
-    LWIP_DEBUGF(TCP_RST_DEBUG, ("tcp_listen_input: ACK in LISTEN, sending reset\n"));
-    tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(),
-      ip_current_src_addr(), tcphdr->dest, tcphdr->src);
-  } else if (flags & TCP_SYN) {
-    LWIP_DEBUGF(TCP_DEBUG, ("TCP connection request %"U16_F" -> %"U16_F".\n", tcphdr->src, tcphdr->dest));
-#if TCP_LISTEN_BACKLOG
-    if (pcb->accepts_pending >= pcb->backlog) {
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_listen_input: listen backlog exceeded for port %"U16_F"\n", tcphdr->dest));
-      return;
-    }
-#endif /* TCP_LISTEN_BACKLOG */
-    npcb = tcp_alloc(pcb->prio);
-    /* If a new PCB could not be created (probably due to lack of memory),
-       we don't do anything, but rely on the sender will retransmit the
-       SYN at a time when we have more memory available. */
-    if (npcb == NULL) {
-      err_t err;
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_listen_input: could not allocate PCB\n"));
-      TCP_STATS_INC(tcp.memerr);
-      TCP_EVENT_ACCEPT(pcb, NULL, pcb->callback_arg, ERR_MEM, err);
-      LWIP_UNUSED_ARG(err); /* err not useful here */
-      return;
-    }
-#if TCP_LISTEN_BACKLOG
-    pcb->accepts_pending++;
-    npcb->flags |= TF_BACKLOGPEND;
-#endif /* TCP_LISTEN_BACKLOG */
-    /* Set up the new PCB. */
-    ip_addr_copy(npcb->local_ip, *ip_current_dest_addr());
-    ip_addr_copy(npcb->remote_ip, *ip_current_src_addr());
-    npcb->local_port = pcb->local_port;
-    npcb->remote_port = tcphdr->src;
-    npcb->state = SYN_RCVD;
-    npcb->rcv_nxt = seqno + 1;
-    npcb->rcv_ann_right_edge = npcb->rcv_nxt;
-    iss = tcp_next_iss(npcb);
-    npcb->snd_wl2 = iss;
-    npcb->snd_nxt = iss;
-    npcb->lastack = iss;
-    npcb->snd_lbb = iss;
-    npcb->snd_wl1 = seqno - 1;/* initialise to seqno-1 to force window update */
-    npcb->callback_arg = pcb->callback_arg;
-#if LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG
-    npcb->listener = pcb;
-#endif /* LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG */
-    /* inherit socket options */
-    npcb->so_options = pcb->so_options & SOF_INHERITED;
-    /* Register the new PCB so that we can begin receiving segments
-       for it. */
-    TCP_REG_ACTIVE(npcb);
-
-    /* Parse any options in the SYN. */
-    tcp_parseopt(npcb);
-    npcb->snd_wnd = tcphdr->wnd;
-    npcb->snd_wnd_max = npcb->snd_wnd;
-
-#if TCP_CALCULATE_EFF_SEND_MSS
-    npcb->mss = tcp_eff_send_mss(npcb->mss, &npcb->local_ip, &npcb->remote_ip);
-#endif /* TCP_CALCULATE_EFF_SEND_MSS */
-
-    MIB2_STATS_INC(mib2.tcppassiveopens);
-
-    /* Send a SYN|ACK together with the MSS option. */
-    rc = tcp_enqueue_flags(npcb, TCP_SYN | TCP_ACK);
-    if (rc != ERR_OK) {
-      tcp_abandon(npcb, 0);
-      return;
-    }
-    tcp_output(npcb);
-  }
-  return;
-}
-
-/**
- * Called by tcp_input() when a segment arrives for a connection in
- * TIME_WAIT.
- *
- * @param pcb the tcp_pcb for which a segment arrived
- *
- * @note the segment which arrived is saved in global variables, therefore only the pcb
- *       involved is passed as a parameter to this function
- */
-static void
-tcp_timewait_input(struct tcp_pcb *pcb)
-{
-  /* RFC 1337: in TIME_WAIT, ignore RST and ACK FINs + any 'acceptable' segments */
-  /* RFC 793 3.9 Event Processing - Segment Arrives:
-   * - first check sequence number - we skip that one in TIME_WAIT (always
-   *   acceptable since we only send ACKs)
-   * - second check the RST bit (... return) */
-  if (flags & TCP_RST) {
-    return;
-  }
-  /* - fourth, check the SYN bit, */
-  if (flags & TCP_SYN) {
-    /* If an incoming segment is not acceptable, an acknowledgment
-       should be sent in reply */
-    if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt, pcb->rcv_nxt + pcb->rcv_wnd)) {
-      /* If the SYN is in the window it is an error, send a reset */
-      tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(),
-        ip_current_src_addr(), tcphdr->dest, tcphdr->src);
-      return;
-    }
-  } else if (flags & TCP_FIN) {
-    /* - eighth, check the FIN bit: Remain in the TIME-WAIT state.
-         Restart the 2 MSL time-wait timeout.*/
-    pcb->tmr = tcp_ticks;
-  }
-
-  if ((tcplen > 0)) {
-    /* Acknowledge data, FIN or out-of-window SYN */
-    pcb->flags |= TF_ACK_NOW;
-    tcp_output(pcb);
-  }
-  return;
-}
-
-/**
- * Implements the TCP state machine. Called by tcp_input. In some
- * states tcp_receive() is called to receive data. The tcp_seg
- * argument will be freed by the caller (tcp_input()) unless the
- * recv_data pointer in the pcb is set.
- *
- * @param pcb the tcp_pcb for which a segment arrived
- *
- * @note the segment which arrived is saved in global variables, therefore only the pcb
- *       involved is passed as a parameter to this function
- */
-static err_t
-tcp_process(struct tcp_pcb *pcb)
-{
-  struct tcp_seg *rseg;
-  u8_t acceptable = 0;
-  err_t err;
-
-  err = ERR_OK;
-
-  /* Process incoming RST segments. */
-  if (flags & TCP_RST) {
-    /* First, determine if the reset is acceptable. */
-    if (pcb->state == SYN_SENT) {
-      /* "In the SYN-SENT state (a RST received in response to an initial SYN),
-          the RST is acceptable if the ACK field acknowledges the SYN." */
-      if (ackno == pcb->snd_nxt) {
-        acceptable = 1;
-      }
-    } else {
-      /* "In all states except SYN-SENT, all reset (RST) segments are validated
-          by checking their SEQ-fields." */
-      if (seqno == pcb->rcv_nxt) {
-        acceptable = 1;
-      } else  if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt,
-                                  pcb->rcv_nxt + pcb->rcv_wnd)) {
-        /* If the sequence number is inside the window, we only send an ACK
-           and wait for a re-send with matching sequence number.
-           This violates RFC 793, but is required to protection against
-           CVE-2004-0230 (RST spoofing attack). */
-        tcp_ack_now(pcb);
-      }
-    }
-
-    if (acceptable) {
-      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_process: Connection RESET\n"));
-      LWIP_ASSERT("tcp_input: pcb->state != CLOSED", pcb->state != CLOSED);
-      recv_flags |= TF_RESET;
-      pcb->flags &= ~TF_ACK_DELAY;
-      return ERR_RST;
-    } else {
-      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_process: unacceptable reset seqno %"U32_F" rcv_nxt %"U32_F"\n",
-       seqno, pcb->rcv_nxt));
-      LWIP_DEBUGF(TCP_DEBUG, ("tcp_process: unacceptable reset seqno %"U32_F" rcv_nxt %"U32_F"\n",
-       seqno, pcb->rcv_nxt));
-      return ERR_OK;
-    }
-  }
-
-  if ((flags & TCP_SYN) && (pcb->state != SYN_SENT && pcb->state != SYN_RCVD)) {
-    /* Cope with new connection attempt after remote end crashed */
-    tcp_ack_now(pcb);
-    return ERR_OK;
-  }
-
-  if ((pcb->flags & TF_RXCLOSED) == 0) {
-    /* Update the PCB (in)activity timer unless rx is closed (see tcp_shutdown) */
-    pcb->tmr = tcp_ticks;
-  }
-  pcb->keep_cnt_sent = 0;
-
-  tcp_parseopt(pcb);
-
-  /* Do different things depending on the TCP state. */
-  switch (pcb->state) {
-  case SYN_SENT:
-    LWIP_DEBUGF(TCP_INPUT_DEBUG, ("SYN-SENT: ackno %"U32_F" pcb->snd_nxt %"U32_F" unacked %"U32_F"\n", ackno,
-     pcb->snd_nxt, lwip_ntohl(pcb->unacked->tcphdr->seqno)));
-    /* received SYN ACK with expected sequence number? */
-    if ((flags & TCP_ACK) && (flags & TCP_SYN)
-        && (ackno == pcb->lastack + 1)) {
-      pcb->rcv_nxt = seqno + 1;
-      pcb->rcv_ann_right_edge = pcb->rcv_nxt;
-      pcb->lastack = ackno;
-      pcb->snd_wnd = tcphdr->wnd;
-      pcb->snd_wnd_max = pcb->snd_wnd;
-      pcb->snd_wl1 = seqno - 1; /* initialise to seqno - 1 to force window update */
-      pcb->state = ESTABLISHED;
-
-#if TCP_CALCULATE_EFF_SEND_MSS
-      pcb->mss = tcp_eff_send_mss(pcb->mss, &pcb->local_ip, &pcb->remote_ip);
-#endif /* TCP_CALCULATE_EFF_SEND_MSS */
-
-      pcb->cwnd = LWIP_TCP_CALC_INITIAL_CWND(pcb->mss);
-      LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_process (SENT): cwnd %"TCPWNDSIZE_F
-                                   " ssthresh %"TCPWNDSIZE_F"\n",
-                                   pcb->cwnd, pcb->ssthresh));
-      LWIP_ASSERT("pcb->snd_queuelen > 0", (pcb->snd_queuelen > 0));
-      --pcb->snd_queuelen;
-      LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_process: SYN-SENT --queuelen %"TCPWNDSIZE_F"\n", (tcpwnd_size_t)pcb->snd_queuelen));
-      rseg = pcb->unacked;
-      if (rseg == NULL) {
-        /* might happen if tcp_output fails in tcp_rexmit_rto()
-           in which case the segment is on the unsent list */
-        rseg = pcb->unsent;
-        LWIP_ASSERT("no segment to free", rseg != NULL);
-        pcb->unsent = rseg->next;
-      } else {
-        pcb->unacked = rseg->next;
-      }
-      tcp_seg_free(rseg);
-
-      /* If there's nothing left to acknowledge, stop the retransmit
-         timer, otherwise reset it to start again */
-      if (pcb->unacked == NULL) {
-        pcb->rtime = -1;
-      } else {
-        pcb->rtime = 0;
-        pcb->nrtx = 0;
-      }
-
-      /* Call the user specified function to call when successfully
-       * connected. */
-      TCP_EVENT_CONNECTED(pcb, ERR_OK, err);
-      if (err == ERR_ABRT) {
-        return ERR_ABRT;
-      }
-      tcp_ack_now(pcb);
-    }
-    /* received ACK? possibly a half-open connection */
-    else if (flags & TCP_ACK) {
-      /* send a RST to bring the other side in a non-synchronized state. */
-      tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(),
-        ip_current_src_addr(), tcphdr->dest, tcphdr->src);
-      /* Resend SYN immediately (don't wait for rto timeout) to establish
-        connection faster, but do not send more SYNs than we otherwise would
-        have, or we might get caught in a loop on loopback interfaces. */
-      if (pcb->nrtx < TCP_SYNMAXRTX) {
-        pcb->rtime = 0;
-        tcp_rexmit_rto(pcb);
-      }
-    }
-    break;
-  case SYN_RCVD:
-    if (flags & TCP_ACK) {
-      /* expected ACK number? */
-      if (TCP_SEQ_BETWEEN(ackno, pcb->lastack+1, pcb->snd_nxt)) {
-        pcb->state = ESTABLISHED;
-        LWIP_DEBUGF(TCP_DEBUG, ("TCP connection established %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
-#if LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG
-#if LWIP_CALLBACK_API
-        LWIP_ASSERT("pcb->listener->accept != NULL",
-          (pcb->listener == NULL) || (pcb->listener->accept != NULL));
-#endif
-        if (pcb->listener == NULL) {
-          /* listen pcb might be closed by now */
-          err = ERR_VAL;
-        } else
-#endif /* LWIP_CALLBACK_API || TCP_LISTEN_BACKLOG */
-        {
-          tcp_backlog_accepted(pcb);
-          /* Call the accept function. */
-          TCP_EVENT_ACCEPT(pcb->listener, pcb, pcb->callback_arg, ERR_OK, err);
-        }
-        if (err != ERR_OK) {
-          /* If the accept function returns with an error, we abort
-           * the connection. */
-          /* Already aborted? */
-          if (err != ERR_ABRT) {
-            tcp_abort(pcb);
-          }
-          return ERR_ABRT;
-        }
-        /* If there was any data contained within this ACK,
-         * we'd better pass it on to the application as well. */
-        tcp_receive(pcb);
-
-        /* Prevent ACK for SYN to generate a sent event */
-        if (recv_acked != 0) {
-          recv_acked--;
-        }
-
-        pcb->cwnd = LWIP_TCP_CALC_INITIAL_CWND(pcb->mss);
-        LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_process (SYN_RCVD): cwnd %"TCPWNDSIZE_F
-                                     " ssthresh %"TCPWNDSIZE_F"\n",
-                                     pcb->cwnd, pcb->ssthresh));
-
-        if (recv_flags & TF_GOT_FIN) {
-          tcp_ack_now(pcb);
-          pcb->state = CLOSE_WAIT;
-        }
-      } else {
-        /* incorrect ACK number, send RST */
-        tcp_rst(ackno, seqno + tcplen, ip_current_dest_addr(),
-          ip_current_src_addr(), tcphdr->dest, tcphdr->src);
-      }
-    } else if ((flags & TCP_SYN) && (seqno == pcb->rcv_nxt - 1)) {
-      /* Looks like another copy of the SYN - retransmit our SYN-ACK */
-      tcp_rexmit(pcb);
-    }
-    break;
-  case CLOSE_WAIT:
-    /* FALLTHROUGH */
-  case ESTABLISHED:
-    tcp_receive(pcb);
-    if (recv_flags & TF_GOT_FIN) { /* passive close */
-      tcp_ack_now(pcb);
-      pcb->state = CLOSE_WAIT;
-    }
-    break;
-  case FIN_WAIT_1:
-    tcp_receive(pcb);
-    if (recv_flags & TF_GOT_FIN) {
-      if ((flags & TCP_ACK) && (ackno == pcb->snd_nxt) &&
-          pcb->unsent == NULL) {
-        LWIP_DEBUGF(TCP_DEBUG,
-          ("TCP connection closed: FIN_WAIT_1 %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
-        tcp_ack_now(pcb);
-        tcp_pcb_purge(pcb);
-        TCP_RMV_ACTIVE(pcb);
-        pcb->state = TIME_WAIT;
-        TCP_REG(&tcp_tw_pcbs, pcb);
-      } else {
-        tcp_ack_now(pcb);
-        pcb->state = CLOSING;
-      }
-    } else if ((flags & TCP_ACK) && (ackno == pcb->snd_nxt) &&
-               pcb->unsent == NULL) {
-      pcb->state = FIN_WAIT_2;
-    }
-    break;
-  case FIN_WAIT_2:
-    tcp_receive(pcb);
-    if (recv_flags & TF_GOT_FIN) {
-      LWIP_DEBUGF(TCP_DEBUG, ("TCP connection closed: FIN_WAIT_2 %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
-      tcp_ack_now(pcb);
-      tcp_pcb_purge(pcb);
-      TCP_RMV_ACTIVE(pcb);
-      pcb->state = TIME_WAIT;
-      TCP_REG(&tcp_tw_pcbs, pcb);
-    }
-    break;
-  case CLOSING:
-    tcp_receive(pcb);
-    if ((flags & TCP_ACK) && ackno == pcb->snd_nxt && pcb->unsent == NULL) {
-      LWIP_DEBUGF(TCP_DEBUG, ("TCP connection closed: CLOSING %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
-      tcp_pcb_purge(pcb);
-      TCP_RMV_ACTIVE(pcb);
-      pcb->state = TIME_WAIT;
-      TCP_REG(&tcp_tw_pcbs, pcb);
-    }
-    break;
-  case LAST_ACK:
-    tcp_receive(pcb);
-    if ((flags & TCP_ACK) && ackno == pcb->snd_nxt && pcb->unsent == NULL) {
-      LWIP_DEBUGF(TCP_DEBUG, ("TCP connection closed: LAST_ACK %"U16_F" -> %"U16_F".\n", inseg.tcphdr->src, inseg.tcphdr->dest));
-      /* bugfix #21699: don't set pcb->state to CLOSED here or we risk leaking segments */
-      recv_flags |= TF_CLOSED;
-    }
-    break;
-  default:
-    break;
-  }
-  return ERR_OK;
-}
-
-#if TCP_QUEUE_OOSEQ
-/**
- * Insert segment into the list (segments covered with new one will be deleted)
- *
- * Called from tcp_receive()
- */
-static void
-tcp_oos_insert_segment(struct tcp_seg *cseg, struct tcp_seg *next)
-{
-  struct tcp_seg *old_seg;
-
-  if (TCPH_FLAGS(cseg->tcphdr) & TCP_FIN) {
-    /* received segment overlaps all following segments */
-    tcp_segs_free(next);
-    next = NULL;
-  } else {
-    /* delete some following segments
-       oos queue may have segments with FIN flag */
-    while (next &&
-           TCP_SEQ_GEQ((seqno + cseg->len),
-                      (next->tcphdr->seqno + next->len))) {
-      /* cseg with FIN already processed */
-      if (TCPH_FLAGS(next->tcphdr) & TCP_FIN) {
-        TCPH_SET_FLAG(cseg->tcphdr, TCP_FIN);
-      }
-      old_seg = next;
-      next = next->next;
-      tcp_seg_free(old_seg);
-    }
-    if (next &&
-        TCP_SEQ_GT(seqno + cseg->len, next->tcphdr->seqno)) {
-      /* We need to trim the incoming segment. */
-      cseg->len = (u16_t)(next->tcphdr->seqno - seqno);
-      pbuf_realloc(cseg->p, cseg->len);
-    }
-  }
-  cseg->next = next;
-}
-#endif /* TCP_QUEUE_OOSEQ */
-
-/**
- * Called by tcp_process. Checks if the given segment is an ACK for outstanding
- * data, and if so frees the memory of the buffered data. Next, it places the
- * segment on any of the receive queues (pcb->recved or pcb->ooseq). If the segment
- * is buffered, the pbuf is referenced by pbuf_ref so that it will not be freed until
- * it has been removed from the buffer.
- *
- * If the incoming segment constitutes an ACK for a segment that was used for RTT
- * estimation, the RTT is estimated here as well.
- *
- * Called from tcp_process().
- */
-static void
-tcp_receive(struct tcp_pcb *pcb)
-{
-  struct tcp_seg *next;
-#if TCP_QUEUE_OOSEQ
-  struct tcp_seg *prev, *cseg;
-#endif /* TCP_QUEUE_OOSEQ */
-  s32_t off;
-  s16_t m;
-  u32_t right_wnd_edge;
-  u16_t new_tot_len;
-  int found_dupack = 0;
-#if TCP_OOSEQ_MAX_BYTES || TCP_OOSEQ_MAX_PBUFS
-  u32_t ooseq_blen;
-  u16_t ooseq_qlen;
-#endif /* TCP_OOSEQ_MAX_BYTES || TCP_OOSEQ_MAX_PBUFS */
-
-  LWIP_ASSERT("tcp_receive: wrong state", pcb->state >= ESTABLISHED);
-
-  if (flags & TCP_ACK) {
-    right_wnd_edge = pcb->snd_wnd + pcb->snd_wl2;
-
-    /* Update window. */
-    if (TCP_SEQ_LT(pcb->snd_wl1, seqno) ||
-       (pcb->snd_wl1 == seqno && TCP_SEQ_LT(pcb->snd_wl2, ackno)) ||
-       (pcb->snd_wl2 == ackno && (u32_t)SND_WND_SCALE(pcb, tcphdr->wnd) > pcb->snd_wnd)) {
-      pcb->snd_wnd = SND_WND_SCALE(pcb, tcphdr->wnd);
-      /* keep track of the biggest window announced by the remote host to calculate
-         the maximum segment size */
-      if (pcb->snd_wnd_max < pcb->snd_wnd) {
-        pcb->snd_wnd_max = pcb->snd_wnd;
-      }
-      pcb->snd_wl1 = seqno;
-      pcb->snd_wl2 = ackno;
-      if (pcb->snd_wnd == 0) {
-        if (pcb->persist_backoff == 0) {
-          /* start persist timer */
-          pcb->persist_cnt = 0;
-          pcb->persist_backoff = 1;
-        }
-      } else if (pcb->persist_backoff > 0) {
-        /* stop persist timer */
-          pcb->persist_backoff = 0;
-      }
-      LWIP_DEBUGF(TCP_WND_DEBUG, ("tcp_receive: window update %"TCPWNDSIZE_F"\n", pcb->snd_wnd));
-#if TCP_WND_DEBUG
-    } else {
-      if (pcb->snd_wnd != (tcpwnd_size_t)SND_WND_SCALE(pcb, tcphdr->wnd)) {
-        LWIP_DEBUGF(TCP_WND_DEBUG,
-                    ("tcp_receive: no window update lastack %"U32_F" ackno %"
-                     U32_F" wl1 %"U32_F" seqno %"U32_F" wl2 %"U32_F"\n",
-                     pcb->lastack, ackno, pcb->snd_wl1, seqno, pcb->snd_wl2));
-      }
-#endif /* TCP_WND_DEBUG */
-    }
-
-    /* (From Stevens TCP/IP Illustrated Vol II, p970.) Its only a
-     * duplicate ack if:
-     * 1) It doesn't ACK new data
-     * 2) length of received packet is zero (i.e. no payload)
-     * 3) the advertised window hasn't changed
-     * 4) There is outstanding unacknowledged data (retransmission timer running)
-     * 5) The ACK is == biggest ACK sequence number so far seen (snd_una)
-     *
-     * If it passes all five, should process as a dupack:
-     * a) dupacks < 3: do nothing
-     * b) dupacks == 3: fast retransmit
-     * c) dupacks > 3: increase cwnd
-     *
-     * If it only passes 1-3, should reset dupack counter (and add to
-     * stats, which we don't do in lwIP)
-     *
-     * If it only passes 1, should reset dupack counter
-     *
-     */
-
-    /* Clause 1 */
-    if (TCP_SEQ_LEQ(ackno, pcb->lastack)) {
-      /* Clause 2 */
-      if (tcplen == 0) {
-        /* Clause 3 */
-        if (pcb->snd_wl2 + pcb->snd_wnd == right_wnd_edge) {
-          /* Clause 4 */
-          if (pcb->rtime >= 0) {
-            /* Clause 5 */
-            if (pcb->lastack == ackno) {
-              found_dupack = 1;
-              if ((u8_t)(pcb->dupacks + 1) > pcb->dupacks) {
-                ++pcb->dupacks;
-              }
-              if (pcb->dupacks > 3) {
-                /* Inflate the congestion window, but not if it means that
-                   the value overflows. */
-                if ((tcpwnd_size_t)(pcb->cwnd + pcb->mss) > pcb->cwnd) {
-                  pcb->cwnd += pcb->mss;
-                }
-              } else if (pcb->dupacks == 3) {
-                /* Do fast retransmit */
-                tcp_rexmit_fast(pcb);
-              }
-            }
-          }
-        }
-      }
-      /* If Clause (1) or more is true, but not a duplicate ack, reset
-       * count of consecutive duplicate acks */
-      if (!found_dupack) {
-        pcb->dupacks = 0;
-      }
-    } else if (TCP_SEQ_BETWEEN(ackno, pcb->lastack+1, pcb->snd_nxt)) {
-      /* We come here when the ACK acknowledges new data. */
-
-      /* Reset the "IN Fast Retransmit" flag, since we are no longer
-         in fast retransmit. Also reset the congestion window to the
-         slow start threshold. */
-      if (pcb->flags & TF_INFR) {
-        pcb->flags &= ~TF_INFR;
-        pcb->cwnd = pcb->ssthresh;
-      }
-
-      /* Reset the number of retransmissions. */
-      pcb->nrtx = 0;
-
-      /* Reset the retransmission time-out. */
-      pcb->rto = (pcb->sa >> 3) + pcb->sv;
-
-      /* Reset the fast retransmit variables. */
-      pcb->dupacks = 0;
-      pcb->lastack = ackno;
-
-      /* Update the congestion control variables (cwnd and
-         ssthresh). */
-      if (pcb->state >= ESTABLISHED) {
-        if (pcb->cwnd < pcb->ssthresh) {
-          if ((tcpwnd_size_t)(pcb->cwnd + pcb->mss) > pcb->cwnd) {
-            pcb->cwnd += pcb->mss;
-          }
-          LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_receive: slow start cwnd %"TCPWNDSIZE_F"\n", pcb->cwnd));
-        } else {
-          tcpwnd_size_t new_cwnd = (pcb->cwnd + pcb->mss * pcb->mss / pcb->cwnd);
-          if (new_cwnd > pcb->cwnd) {
-            pcb->cwnd = new_cwnd;
-          }
-          LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_receive: congestion avoidance cwnd %"TCPWNDSIZE_F"\n", pcb->cwnd));
-        }
-      }
-      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: ACK for %"U32_F", unacked->seqno %"U32_F":%"U32_F"\n",
-                                    ackno,
-                                    pcb->unacked != NULL?
-                                    lwip_ntohl(pcb->unacked->tcphdr->seqno): 0,
-                                    pcb->unacked != NULL?
-                                    lwip_ntohl(pcb->unacked->tcphdr->seqno) + TCP_TCPLEN(pcb->unacked): 0));
-
-      /* Remove segment from the unacknowledged list if the incoming
-         ACK acknowledges them. */
-      while (pcb->unacked != NULL &&
-             TCP_SEQ_LEQ(lwip_ntohl(pcb->unacked->tcphdr->seqno) +
-                         TCP_TCPLEN(pcb->unacked), ackno)) {
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: removing %"U32_F":%"U32_F" from pcb->unacked\n",
-                                      lwip_ntohl(pcb->unacked->tcphdr->seqno),
-                                      lwip_ntohl(pcb->unacked->tcphdr->seqno) +
-                                      TCP_TCPLEN(pcb->unacked)));
-
-        next = pcb->unacked;
-        pcb->unacked = pcb->unacked->next;
-
-        LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_receive: queuelen %"TCPWNDSIZE_F" ... ", (tcpwnd_size_t)pcb->snd_queuelen));
-        LWIP_ASSERT("pcb->snd_queuelen >= pbuf_clen(next->p)", (pcb->snd_queuelen >= pbuf_clen(next->p)));
-
-        pcb->snd_queuelen -= pbuf_clen(next->p);
-        recv_acked += next->len;
-        tcp_seg_free(next);
-
-        LWIP_DEBUGF(TCP_QLEN_DEBUG, ("%"TCPWNDSIZE_F" (after freeing unacked)\n", (tcpwnd_size_t)pcb->snd_queuelen));
-        if (pcb->snd_queuelen != 0) {
-          LWIP_ASSERT("tcp_receive: valid queue length", pcb->unacked != NULL ||
-                      pcb->unsent != NULL);
-        }
-      }
-
-      /* If there's nothing left to acknowledge, stop the retransmit
-         timer, otherwise reset it to start again */
-      if (pcb->unacked == NULL) {
-        pcb->rtime = -1;
-      } else {
-        pcb->rtime = 0;
-      }
-
-      pcb->polltmr = 0;
-
-#if LWIP_IPV6 && LWIP_ND6_TCP_REACHABILITY_HINTS
-      if (ip_current_is_v6()) {
-        /* Inform neighbor reachability of forward progress. */
-        nd6_reachability_hint(ip6_current_src_addr());
-      }
-#endif /* LWIP_IPV6 && LWIP_ND6_TCP_REACHABILITY_HINTS*/
-    } else {
-      /* Out of sequence ACK, didn't really ack anything */
-      tcp_send_empty_ack(pcb);
-    }
-
-    /* We go through the ->unsent list to see if any of the segments
-       on the list are acknowledged by the ACK. This may seem
-       strange since an "unsent" segment shouldn't be acked. The
-       rationale is that lwIP puts all outstanding segments on the
-       ->unsent list after a retransmission, so these segments may
-       in fact have been sent once. */
-    while (pcb->unsent != NULL &&
-           TCP_SEQ_BETWEEN(ackno, lwip_ntohl(pcb->unsent->tcphdr->seqno) +
-                           TCP_TCPLEN(pcb->unsent), pcb->snd_nxt)) {
-      LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: removing %"U32_F":%"U32_F" from pcb->unsent\n",
-                                    lwip_ntohl(pcb->unsent->tcphdr->seqno), lwip_ntohl(pcb->unsent->tcphdr->seqno) +
-                                    TCP_TCPLEN(pcb->unsent)));
-
-      next = pcb->unsent;
-      pcb->unsent = pcb->unsent->next;
-#if TCP_OVERSIZE
-      if (pcb->unsent == NULL) {
-        pcb->unsent_oversize = 0;
-      }
-#endif /* TCP_OVERSIZE */
-      LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_receive: queuelen %"TCPWNDSIZE_F" ... ", (tcpwnd_size_t)pcb->snd_queuelen));
-      LWIP_ASSERT("pcb->snd_queuelen >= pbuf_clen(next->p)", (pcb->snd_queuelen >= pbuf_clen(next->p)));
-      /* Prevent ACK for FIN to generate a sent event */
-      pcb->snd_queuelen -= pbuf_clen(next->p);
-      recv_acked += next->len;
-      tcp_seg_free(next);
-      LWIP_DEBUGF(TCP_QLEN_DEBUG, ("%"TCPWNDSIZE_F" (after freeing unsent)\n", (tcpwnd_size_t)pcb->snd_queuelen));
-      if (pcb->snd_queuelen != 0) {
-        LWIP_ASSERT("tcp_receive: valid queue length",
-          pcb->unacked != NULL || pcb->unsent != NULL);
-      }
-    }
-    pcb->snd_buf += recv_acked;
-    /* End of ACK for new data processing. */
-
-    LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_receive: pcb->rttest %"U32_F" rtseq %"U32_F" ackno %"U32_F"\n",
-                                pcb->rttest, pcb->rtseq, ackno));
-
-    /* RTT estimation calculations. This is done by checking if the
-       incoming segment acknowledges the segment we use to take a
-       round-trip time measurement. */
-    if (pcb->rttest && TCP_SEQ_LT(pcb->rtseq, ackno)) {
-      /* diff between this shouldn't exceed 32K since this are tcp timer ticks
-         and a round-trip shouldn't be that long... */
-      m = (s16_t)(tcp_ticks - pcb->rttest);
-
-      LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_receive: experienced rtt %"U16_F" ticks (%"U16_F" msec).\n",
-                                  m, (u16_t)(m * TCP_SLOW_INTERVAL)));
-
-      /* This is taken directly from VJs original code in his paper */
-      m = m - (pcb->sa >> 3);
-      pcb->sa += m;
-      if (m < 0) {
-        m = -m;
-      }
-      m = m - (pcb->sv >> 2);
-      pcb->sv += m;
-      pcb->rto = (pcb->sa >> 3) + pcb->sv;
-
-      LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_receive: RTO %"U16_F" (%"U16_F" milliseconds)\n",
-                                  pcb->rto, (u16_t)(pcb->rto * TCP_SLOW_INTERVAL)));
-
-      pcb->rttest = 0;
-    }
-  }
-
-  /* If the incoming segment contains data, we must process it
-     further unless the pcb already received a FIN.
-     (RFC 793, chapter 3.9, "SEGMENT ARRIVES" in states CLOSE-WAIT, CLOSING,
-     LAST-ACK and TIME-WAIT: "Ignore the segment text.") */
-  if ((tcplen > 0) && (pcb->state < CLOSE_WAIT)) {
-    /* This code basically does three things:
-
-    +) If the incoming segment contains data that is the next
-    in-sequence data, this data is passed to the application. This
-    might involve trimming the first edge of the data. The rcv_nxt
-    variable and the advertised window are adjusted.
-
-    +) If the incoming segment has data that is above the next
-    sequence number expected (->rcv_nxt), the segment is placed on
-    the ->ooseq queue. This is done by finding the appropriate
-    place in the ->ooseq queue (which is ordered by sequence
-    number) and trim the segment in both ends if needed. An
-    immediate ACK is sent to indicate that we received an
-    out-of-sequence segment.
-
-    +) Finally, we check if the first segment on the ->ooseq queue
-    now is in sequence (i.e., if rcv_nxt >= ooseq->seqno). If
-    rcv_nxt > ooseq->seqno, we must trim the first edge of the
-    segment on ->ooseq before we adjust rcv_nxt. The data in the
-    segments that are now on sequence are chained onto the
-    incoming segment so that we only need to call the application
-    once.
-    */
-
-    /* First, we check if we must trim the first edge. We have to do
-       this if the sequence number of the incoming segment is less
-       than rcv_nxt, and the sequence number plus the length of the
-       segment is larger than rcv_nxt. */
-    /*    if (TCP_SEQ_LT(seqno, pcb->rcv_nxt)) {
-          if (TCP_SEQ_LT(pcb->rcv_nxt, seqno + tcplen)) {*/
-    if (TCP_SEQ_BETWEEN(pcb->rcv_nxt, seqno + 1, seqno + tcplen - 1)) {
-      /* Trimming the first edge is done by pushing the payload
-         pointer in the pbuf downwards. This is somewhat tricky since
-         we do not want to discard the full contents of the pbuf up to
-         the new starting point of the data since we have to keep the
-         TCP header which is present in the first pbuf in the chain.
-
-         What is done is really quite a nasty hack: the first pbuf in
-         the pbuf chain is pointed to by inseg.p. Since we need to be
-         able to deallocate the whole pbuf, we cannot change this
-         inseg.p pointer to point to any of the later pbufs in the
-         chain. Instead, we point the ->payload pointer in the first
-         pbuf to data in one of the later pbufs. We also set the
-         inseg.data pointer to point to the right place. This way, the
-         ->p pointer will still point to the first pbuf, but the
-         ->p->payload pointer will point to data in another pbuf.
-
-         After we are done with adjusting the pbuf pointers we must
-         adjust the ->data pointer in the seg and the segment
-         length.*/
-
-      struct pbuf *p = inseg.p;
-      off = pcb->rcv_nxt - seqno;
-      LWIP_ASSERT("inseg.p != NULL", inseg.p);
-      LWIP_ASSERT("insane offset!", (off < 0x7fff));
-      if (inseg.p->len < off) {
-        LWIP_ASSERT("pbuf too short!", (((s32_t)inseg.p->tot_len) >= off));
-        new_tot_len = (u16_t)(inseg.p->tot_len - off);
-        while (p->len < off) {
-          off -= p->len;
-          /* KJM following line changed (with addition of new_tot_len var)
-             to fix bug #9076
-             inseg.p->tot_len -= p->len; */
-          p->tot_len = new_tot_len;
-          p->len = 0;
-          p = p->next;
-        }
-        if (pbuf_header(p, (s16_t)-off)) {
-          /* Do we need to cope with this failing?  Assert for now */
-          LWIP_ASSERT("pbuf_header failed", 0);
-        }
-      } else {
-        if (pbuf_header(inseg.p, (s16_t)-off)) {
-          /* Do we need to cope with this failing?  Assert for now */
-          LWIP_ASSERT("pbuf_header failed", 0);
-        }
-      }
-      inseg.len -= (u16_t)(pcb->rcv_nxt - seqno);
-      inseg.tcphdr->seqno = seqno = pcb->rcv_nxt;
-    }
-    else {
-      if (TCP_SEQ_LT(seqno, pcb->rcv_nxt)) {
-        /* the whole segment is < rcv_nxt */
-        /* must be a duplicate of a packet that has already been correctly handled */
-
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: duplicate seqno %"U32_F"\n", seqno));
-        tcp_ack_now(pcb);
-      }
-    }
-
-    /* The sequence number must be within the window (above rcv_nxt
-       and below rcv_nxt + rcv_wnd) in order to be further
-       processed. */
-    if (TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt,
-                        pcb->rcv_nxt + pcb->rcv_wnd - 1)) {
-      if (pcb->rcv_nxt == seqno) {
-        /* The incoming segment is the next in sequence. We check if
-           we have to trim the end of the segment and update rcv_nxt
-           and pass the data to the application. */
-        tcplen = TCP_TCPLEN(&inseg);
-
-        if (tcplen > pcb->rcv_wnd) {
-          LWIP_DEBUGF(TCP_INPUT_DEBUG,
-                      ("tcp_receive: other end overran receive window"
-                       "seqno %"U32_F" len %"U16_F" right edge %"U32_F"\n",
-                       seqno, tcplen, pcb->rcv_nxt + pcb->rcv_wnd));
-          if (TCPH_FLAGS(inseg.tcphdr) & TCP_FIN) {
-            /* Must remove the FIN from the header as we're trimming
-             * that byte of sequence-space from the packet */
-            TCPH_FLAGS_SET(inseg.tcphdr, TCPH_FLAGS(inseg.tcphdr) & ~(unsigned int)TCP_FIN);
-          }
-          /* Adjust length of segment to fit in the window. */
-          TCPWND_CHECK16(pcb->rcv_wnd);
-          inseg.len = (u16_t)pcb->rcv_wnd;
-          if (TCPH_FLAGS(inseg.tcphdr) & TCP_SYN) {
-            inseg.len -= 1;
-          }
-          pbuf_realloc(inseg.p, inseg.len);
-          tcplen = TCP_TCPLEN(&inseg);
-          LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd\n",
-                      (seqno + tcplen) == (pcb->rcv_nxt + pcb->rcv_wnd));
-        }
-#if TCP_QUEUE_OOSEQ
-        /* Received in-sequence data, adjust ooseq data if:
-           - FIN has been received or
-           - inseq overlaps with ooseq */
-        if (pcb->ooseq != NULL) {
-          if (TCPH_FLAGS(inseg.tcphdr) & TCP_FIN) {
-            LWIP_DEBUGF(TCP_INPUT_DEBUG,
-                        ("tcp_receive: received in-order FIN, binning ooseq queue\n"));
-            /* Received in-order FIN means anything that was received
-             * out of order must now have been received in-order, so
-             * bin the ooseq queue */
-            while (pcb->ooseq != NULL) {
-              struct tcp_seg *old_ooseq = pcb->ooseq;
-              pcb->ooseq = pcb->ooseq->next;
-              tcp_seg_free(old_ooseq);
-            }
-          } else {
-            next = pcb->ooseq;
-            /* Remove all segments on ooseq that are covered by inseg already.
-             * FIN is copied from ooseq to inseg if present. */
-            while (next &&
-                   TCP_SEQ_GEQ(seqno + tcplen,
-                               next->tcphdr->seqno + next->len)) {
-              /* inseg cannot have FIN here (already processed above) */
-              if ((TCPH_FLAGS(next->tcphdr) & TCP_FIN) != 0 &&
-                  (TCPH_FLAGS(inseg.tcphdr) & TCP_SYN) == 0) {
-                TCPH_SET_FLAG(inseg.tcphdr, TCP_FIN);
-                tcplen = TCP_TCPLEN(&inseg);
-              }
-              prev = next;
-              next = next->next;
-              tcp_seg_free(prev);
-            }
-            /* Now trim right side of inseg if it overlaps with the first
-             * segment on ooseq */
-            if (next &&
-                TCP_SEQ_GT(seqno + tcplen,
-                           next->tcphdr->seqno)) {
-              /* inseg cannot have FIN here (already processed above) */
-              inseg.len = (u16_t)(next->tcphdr->seqno - seqno);
-              if (TCPH_FLAGS(inseg.tcphdr) & TCP_SYN) {
-                inseg.len -= 1;
-              }
-              pbuf_realloc(inseg.p, inseg.len);
-              tcplen = TCP_TCPLEN(&inseg);
-              LWIP_ASSERT("tcp_receive: segment not trimmed correctly to ooseq queue\n",
-                          (seqno + tcplen) == next->tcphdr->seqno);
-            }
-            pcb->ooseq = next;
-          }
-        }
-#endif /* TCP_QUEUE_OOSEQ */
-
-        pcb->rcv_nxt = seqno + tcplen;
-
-        /* Update the receiver's (our) window. */
-        LWIP_ASSERT("tcp_receive: tcplen > rcv_wnd\n", pcb->rcv_wnd >= tcplen);
-        pcb->rcv_wnd -= tcplen;
-
-        tcp_update_rcv_ann_wnd(pcb);
-
-        /* If there is data in the segment, we make preparations to
-           pass this up to the application. The ->recv_data variable
-           is used for holding the pbuf that goes to the
-           application. The code for reassembling out-of-sequence data
-           chains its data on this pbuf as well.
-
-           If the segment was a FIN, we set the TF_GOT_FIN flag that will
-           be used to indicate to the application that the remote side has
-           closed its end of the connection. */
-        if (inseg.p->tot_len > 0) {
-          recv_data = inseg.p;
-          /* Since this pbuf now is the responsibility of the
-             application, we delete our reference to it so that we won't
-             (mistakingly) deallocate it. */
-          inseg.p = NULL;
-        }
-        if (TCPH_FLAGS(inseg.tcphdr) & TCP_FIN) {
-          LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: received FIN.\n"));
-          recv_flags |= TF_GOT_FIN;
-        }
-
-#if TCP_QUEUE_OOSEQ
-        /* We now check if we have segments on the ->ooseq queue that
-           are now in sequence. */
-        while (pcb->ooseq != NULL &&
-               pcb->ooseq->tcphdr->seqno == pcb->rcv_nxt) {
-
-          cseg = pcb->ooseq;
-          seqno = pcb->ooseq->tcphdr->seqno;
-
-          pcb->rcv_nxt += TCP_TCPLEN(cseg);
-          LWIP_ASSERT("tcp_receive: ooseq tcplen > rcv_wnd\n",
-                      pcb->rcv_wnd >= TCP_TCPLEN(cseg));
-          pcb->rcv_wnd -= TCP_TCPLEN(cseg);
-
-          tcp_update_rcv_ann_wnd(pcb);
-
-          if (cseg->p->tot_len > 0) {
-            /* Chain this pbuf onto the pbuf that we will pass to
-               the application. */
-            /* With window scaling, this can overflow recv_data->tot_len, but
-               that's not a problem since we explicitly fix that before passing
-               recv_data to the application. */
-            if (recv_data) {
-              pbuf_cat(recv_data, cseg->p);
-            } else {
-              recv_data = cseg->p;
-            }
-            cseg->p = NULL;
-          }
-          if (TCPH_FLAGS(cseg->tcphdr) & TCP_FIN) {
-            LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_receive: dequeued FIN.\n"));
-            recv_flags |= TF_GOT_FIN;
-            if (pcb->state == ESTABLISHED) { /* force passive close or we can move to active close */
-              pcb->state = CLOSE_WAIT;
-            }
-          }
-
-          pcb->ooseq = cseg->next;
-          tcp_seg_free(cseg);
-        }
-#endif /* TCP_QUEUE_OOSEQ */
-
-
-        /* Acknowledge the segment(s). */
-        tcp_ack(pcb);
-
-#if LWIP_IPV6 && LWIP_ND6_TCP_REACHABILITY_HINTS
-        if (ip_current_is_v6()) {
-          /* Inform neighbor reachability of forward progress. */
-          nd6_reachability_hint(ip6_current_src_addr());
-        }
-#endif /* LWIP_IPV6 && LWIP_ND6_TCP_REACHABILITY_HINTS*/
-
-      } else {
-        /* We get here if the incoming segment is out-of-sequence. */
-        tcp_send_empty_ack(pcb);
-#if TCP_QUEUE_OOSEQ
-        /* We queue the segment on the ->ooseq queue. */
-        if (pcb->ooseq == NULL) {
-          pcb->ooseq = tcp_seg_copy(&inseg);
-        } else {
-          /* If the queue is not empty, we walk through the queue and
-             try to find a place where the sequence number of the
-             incoming segment is between the sequence numbers of the
-             previous and the next segment on the ->ooseq queue. That is
-             the place where we put the incoming segment. If needed, we
-             trim the second edges of the previous and the incoming
-             segment so that it will fit into the sequence.
-
-             If the incoming segment has the same sequence number as a
-             segment on the ->ooseq queue, we discard the segment that
-             contains less data. */
-
-          prev = NULL;
-          for (next = pcb->ooseq; next != NULL; next = next->next) {
-            if (seqno == next->tcphdr->seqno) {
-              /* The sequence number of the incoming segment is the
-                 same as the sequence number of the segment on
-                 ->ooseq. We check the lengths to see which one to
-                 discard. */
-              if (inseg.len > next->len) {
-                /* The incoming segment is larger than the old
-                   segment. We replace some segments with the new
-                   one. */
-                cseg = tcp_seg_copy(&inseg);
-                if (cseg != NULL) {
-                  if (prev != NULL) {
-                    prev->next = cseg;
-                  } else {
-                    pcb->ooseq = cseg;
-                  }
-                  tcp_oos_insert_segment(cseg, next);
-                }
-                break;
-              } else {
-                /* Either the lengths are the same or the incoming
-                   segment was smaller than the old one; in either
-                   case, we ditch the incoming segment. */
-                break;
-              }
-            } else {
-              if (prev == NULL) {
-                if (TCP_SEQ_LT(seqno, next->tcphdr->seqno)) {
-                  /* The sequence number of the incoming segment is lower
-                     than the sequence number of the first segment on the
-                     queue. We put the incoming segment first on the
-                     queue. */
-                  cseg = tcp_seg_copy(&inseg);
-                  if (cseg != NULL) {
-                    pcb->ooseq = cseg;
-                    tcp_oos_insert_segment(cseg, next);
-                  }
-                  break;
-                }
-              } else {
-                /*if (TCP_SEQ_LT(prev->tcphdr->seqno, seqno) &&
-                  TCP_SEQ_LT(seqno, next->tcphdr->seqno)) {*/
-                if (TCP_SEQ_BETWEEN(seqno, prev->tcphdr->seqno+1, next->tcphdr->seqno-1)) {
-                  /* The sequence number of the incoming segment is in
-                     between the sequence numbers of the previous and
-                     the next segment on ->ooseq. We trim trim the previous
-                     segment, delete next segments that included in received segment
-                     and trim received, if needed. */
-                  cseg = tcp_seg_copy(&inseg);
-                  if (cseg != NULL) {
-                    if (TCP_SEQ_GT(prev->tcphdr->seqno + prev->len, seqno)) {
-                      /* We need to trim the prev segment. */
-                      prev->len = (u16_t)(seqno - prev->tcphdr->seqno);
-                      pbuf_realloc(prev->p, prev->len);
-                    }
-                    prev->next = cseg;
-                    tcp_oos_insert_segment(cseg, next);
-                  }
-                  break;
-                }
-              }
-              /* If the "next" segment is the last segment on the
-                 ooseq queue, we add the incoming segment to the end
-                 of the list. */
-              if (next->next == NULL &&
-                  TCP_SEQ_GT(seqno, next->tcphdr->seqno)) {
-                if (TCPH_FLAGS(next->tcphdr) & TCP_FIN) {
-                  /* segment "next" already contains all data */
-                  break;
-                }
-                next->next = tcp_seg_copy(&inseg);
-                if (next->next != NULL) {
-                  if (TCP_SEQ_GT(next->tcphdr->seqno + next->len, seqno)) {
-                    /* We need to trim the last segment. */
-                    next->len = (u16_t)(seqno - next->tcphdr->seqno);
-                    pbuf_realloc(next->p, next->len);
-                  }
-                  /* check if the remote side overruns our receive window */
-                  if (TCP_SEQ_GT((u32_t)tcplen + seqno, pcb->rcv_nxt + (u32_t)pcb->rcv_wnd)) {
-                    LWIP_DEBUGF(TCP_INPUT_DEBUG,
-                                ("tcp_receive: other end overran receive window"
-                                 "seqno %"U32_F" len %"U16_F" right edge %"U32_F"\n",
-                                 seqno, tcplen, pcb->rcv_nxt + pcb->rcv_wnd));
-                    if (TCPH_FLAGS(next->next->tcphdr) & TCP_FIN) {
-                      /* Must remove the FIN from the header as we're trimming
-                       * that byte of sequence-space from the packet */
-                      TCPH_FLAGS_SET(next->next->tcphdr, TCPH_FLAGS(next->next->tcphdr) & ~TCP_FIN);
-                    }
-                    /* Adjust length of segment to fit in the window. */
-                    next->next->len = (u16_t)(pcb->rcv_nxt + pcb->rcv_wnd - seqno);
-                    pbuf_realloc(next->next->p, next->next->len);
-                    tcplen = TCP_TCPLEN(next->next);
-                    LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd\n",
-                                (seqno + tcplen) == (pcb->rcv_nxt + pcb->rcv_wnd));
-                  }
-                }
-                break;
-              }
-            }
-            prev = next;
-          }
-        }
-#if TCP_OOSEQ_MAX_BYTES || TCP_OOSEQ_MAX_PBUFS
-        /* Check that the data on ooseq doesn't exceed one of the limits
-           and throw away everything above that limit. */
-        ooseq_blen = 0;
-        ooseq_qlen = 0;
-        prev = NULL;
-        for (next = pcb->ooseq; next != NULL; prev = next, next = next->next) {
-          struct pbuf *p = next->p;
-          ooseq_blen += p->tot_len;
-          ooseq_qlen += pbuf_clen(p);
-          if ((ooseq_blen > TCP_OOSEQ_MAX_BYTES) ||
-              (ooseq_qlen > TCP_OOSEQ_MAX_PBUFS)) {
-             /* too much ooseq data, dump this and everything after it */
-             tcp_segs_free(next);
-             if (prev == NULL) {
-               /* first ooseq segment is too much, dump the whole queue */
-               pcb->ooseq = NULL;
-             } else {
-               /* just dump 'next' and everything after it */
-               prev->next = NULL;
-             }
-             break;
-          }
-        }
-#endif /* TCP_OOSEQ_MAX_BYTES || TCP_OOSEQ_MAX_PBUFS */
-#endif /* TCP_QUEUE_OOSEQ */
-      }
-    } else {
-      /* The incoming segment is not within the window. */
-      tcp_send_empty_ack(pcb);
-    }
-  } else {
-    /* Segments with length 0 is taken care of here. Segments that
-       fall out of the window are ACKed. */
-    if (!TCP_SEQ_BETWEEN(seqno, pcb->rcv_nxt, pcb->rcv_nxt + pcb->rcv_wnd - 1)) {
-      tcp_ack_now(pcb);
-    }
-  }
-}
-
-static u8_t
-tcp_getoptbyte(void)
-{
-  if ((tcphdr_opt2 == NULL) || (tcp_optidx < tcphdr_opt1len)) {
-    u8_t* opts = (u8_t *)tcphdr + TCP_HLEN;
-    return opts[tcp_optidx++];
-  } else {
-    u8_t idx = (u8_t)(tcp_optidx++ - tcphdr_opt1len);
-    return tcphdr_opt2[idx];
-  }
-}
-
-/**
- * Parses the options contained in the incoming segment.
- *
- * Called from tcp_listen_input() and tcp_process().
- * Currently, only the MSS option is supported!
- *
- * @param pcb the tcp_pcb for which a segment arrived
- */
-static void
-tcp_parseopt(struct tcp_pcb *pcb)
-{
-  u8_t data;
-  u16_t mss;
-#if LWIP_TCP_TIMESTAMPS
-  u32_t tsval;
-#endif
-
-  /* Parse the TCP MSS option, if present. */
-  if (tcphdr_optlen != 0) {
-    for (tcp_optidx = 0; tcp_optidx < tcphdr_optlen; ) {
-      u8_t opt = tcp_getoptbyte();
-      switch (opt) {
-      case LWIP_TCP_OPT_EOL:
-        /* End of options. */
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: EOL\n"));
-        return;
-      case LWIP_TCP_OPT_NOP:
-        /* NOP option. */
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: NOP\n"));
-        break;
-      case LWIP_TCP_OPT_MSS:
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: MSS\n"));
-        if (tcp_getoptbyte() != LWIP_TCP_OPT_LEN_MSS || (tcp_optidx - 2 + LWIP_TCP_OPT_LEN_MSS) > tcphdr_optlen) {
-          /* Bad length */
-          LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: bad length\n"));
-          return;
-        }
-        /* An MSS option with the right option length. */
-        mss = (tcp_getoptbyte() << 8);
-        mss |= tcp_getoptbyte();
-        /* Limit the mss to the configured TCP_MSS and prevent division by zero */
-        pcb->mss = ((mss > TCP_MSS) || (mss == 0)) ? TCP_MSS : mss;
-        break;
-#if LWIP_WND_SCALE
-      case LWIP_TCP_OPT_WS:
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: WND_SCALE\n"));
-        if (tcp_getoptbyte() != LWIP_TCP_OPT_LEN_WS || (tcp_optidx - 2 + LWIP_TCP_OPT_LEN_WS) > tcphdr_optlen) {
-          /* Bad length */
-          LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: bad length\n"));
-          return;
-        }
-        /* An WND_SCALE option with the right option length. */
-        data = tcp_getoptbyte();
-        /* If syn was received with wnd scale option,
-           activate wnd scale opt, but only if this is not a retransmission */
-        if ((flags & TCP_SYN) && !(pcb->flags & TF_WND_SCALE)) {
-          pcb->snd_scale = data;
-          if (pcb->snd_scale > 14U) {
-            pcb->snd_scale = 14U;
-          }
-          pcb->rcv_scale = TCP_RCV_SCALE;
-          pcb->flags |= TF_WND_SCALE;
-          /* window scaling is enabled, we can use the full receive window */
-          LWIP_ASSERT("window not at default value", pcb->rcv_wnd == TCPWND_MIN16(TCP_WND));
-          LWIP_ASSERT("window not at default value", pcb->rcv_ann_wnd == TCPWND_MIN16(TCP_WND));
-          pcb->rcv_wnd = pcb->rcv_ann_wnd = TCP_WND;
-        }
-        break;
-#endif
-#if LWIP_TCP_TIMESTAMPS
-      case LWIP_TCP_OPT_TS:
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: TS\n"));
-        if (tcp_getoptbyte() != LWIP_TCP_OPT_LEN_TS || (tcp_optidx - 2 + LWIP_TCP_OPT_LEN_TS) > tcphdr_optlen) {
-          /* Bad length */
-          LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: bad length\n"));
-          return;
-        }
-        /* TCP timestamp option with valid length */
-        tsval = tcp_getoptbyte();
-        tsval |= (tcp_getoptbyte() << 8);
-        tsval |= (tcp_getoptbyte() << 16);
-        tsval |= (tcp_getoptbyte() << 24);
-        if (flags & TCP_SYN) {
-          pcb->ts_recent = lwip_ntohl(tsval);
-          /* Enable sending timestamps in every segment now that we know
-             the remote host supports it. */
-          pcb->flags |= TF_TIMESTAMP;
-        } else if (TCP_SEQ_BETWEEN(pcb->ts_lastacksent, seqno, seqno+tcplen)) {
-          pcb->ts_recent = lwip_ntohl(tsval);
-        }
-        /* Advance to next option (6 bytes already read) */
-        tcp_optidx += LWIP_TCP_OPT_LEN_TS - 6;
-        break;
-#endif
-      default:
-        LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: other\n"));
-        data = tcp_getoptbyte();
-        if (data < 2) {
-          LWIP_DEBUGF(TCP_INPUT_DEBUG, ("tcp_parseopt: bad length\n"));
-          /* If the length field is zero, the options are malformed
-             and we don't process them further. */
-          return;
-        }
-        /* All other options have a length field, so that we easily
-           can skip past them. */
-        tcp_optidx += data - 2;
-      }
-    }
-  }
-}
-
-void
-tcp_trigger_input_pcb_close(void)
-{
-  recv_flags |= TF_CLOSED;
-}
-
-#endif /* LWIP_TCP */
diff --git a/sys/net/core/tcp_out.c b/sys/net/core/tcp_out.c
deleted file mode 100644
index 514afd9..0000000
--- a/sys/net/core/tcp_out.c
+++ /dev/null
@@ -1,1671 +0,0 @@
-/**
- * @file
- * Transmission Control Protocol, outgoing traffic
- *
- * The output functions of TCP.
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_TCP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/priv/tcp_priv.h"
-#include "net/def.h"
-#include "net/mem.h"
-#include "net/memp.h"
-#include "net/ip_addr.h"
-#include "net/netif.h"
-#include "net/inet_chksum.h"
-#include "net/stats.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#if LWIP_TCP_TIMESTAMPS
-#include "net/sys.h"
-#endif
-
-#include <string.h>
-
-/* Define some copy-macros for checksum-on-copy so that the code looks
-   nicer by preventing too many ifdef's. */
-#if TCP_CHECKSUM_ON_COPY
-#define TCP_DATA_COPY(dst, src, len, seg) do { \
-  tcp_seg_add_chksum(LWIP_CHKSUM_COPY(dst, src, len), \
-                     len, &seg->chksum, &seg->chksum_swapped); \
-  seg->flags |= TF_SEG_DATA_CHECKSUMMED; } while(0)
-#define TCP_DATA_COPY2(dst, src, len, chksum, chksum_swapped)  \
-  tcp_seg_add_chksum(LWIP_CHKSUM_COPY(dst, src, len), len, chksum, chksum_swapped);
-#else /* TCP_CHECKSUM_ON_COPY*/
-#define TCP_DATA_COPY(dst, src, len, seg)                     MEMCPY(dst, src, len)
-#define TCP_DATA_COPY2(dst, src, len, chksum, chksum_swapped) MEMCPY(dst, src, len)
-#endif /* TCP_CHECKSUM_ON_COPY*/
-
-/** Define this to 1 for an extra check that the output checksum is valid
- * (usefule when the checksum is generated by the application, not the stack) */
-#ifndef TCP_CHECKSUM_ON_COPY_SANITY_CHECK
-#define TCP_CHECKSUM_ON_COPY_SANITY_CHECK   0
-#endif
-/* Allow to override the failure of sanity check from warning to e.g. hard failure */
-#if TCP_CHECKSUM_ON_COPY_SANITY_CHECK
-#ifndef TCP_CHECKSUM_ON_COPY_SANITY_CHECK_FAIL
-#define TCP_CHECKSUM_ON_COPY_SANITY_CHECK_FAIL(msg) LWIP_DEBUGF(TCP_DEBUG | LWIP_DBG_LEVEL_WARNING, msg)
-#endif
-#endif
-
-#if TCP_OVERSIZE
-/** The size of segment pbufs created when TCP_OVERSIZE is enabled */
-#ifndef TCP_OVERSIZE_CALC_LENGTH
-#define TCP_OVERSIZE_CALC_LENGTH(length) ((length) + TCP_OVERSIZE)
-#endif
-#endif
-
-/* Forward declarations.*/
-static err_t tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb, struct netif *netif);
-
-/** Allocate a pbuf and create a tcphdr at p->payload, used for output
- * functions other than the default tcp_output -> tcp_output_segment
- * (e.g. tcp_send_empty_ack, etc.)
- *
- * @param pcb tcp pcb for which to send a packet (used to initialize tcp_hdr)
- * @param optlen length of header-options
- * @param datalen length of tcp data to reserve in pbuf
- * @param seqno_be seqno in network byte order (big-endian)
- * @return pbuf with p->payload being the tcp_hdr
- */
-static struct pbuf *
-tcp_output_alloc_header(struct tcp_pcb *pcb, u16_t optlen, u16_t datalen,
-                      u32_t seqno_be /* already in network byte order */)
-{
-  struct tcp_hdr *tcphdr;
-  struct pbuf *p = pbuf_alloc(PBUF_IP, TCP_HLEN + optlen + datalen, PBUF_RAM);
-  if (p != NULL) {
-    LWIP_ASSERT("check that first pbuf can hold struct tcp_hdr",
-                 (p->len >= TCP_HLEN + optlen));
-    tcphdr = (struct tcp_hdr *)p->payload;
-    tcphdr->src = lwip_htons(pcb->local_port);
-    tcphdr->dest = lwip_htons(pcb->remote_port);
-    tcphdr->seqno = seqno_be;
-    tcphdr->ackno = lwip_htonl(pcb->rcv_nxt);
-    TCPH_HDRLEN_FLAGS_SET(tcphdr, (5 + optlen / 4), TCP_ACK);
-    tcphdr->wnd = lwip_htons(TCPWND_MIN16(RCV_WND_SCALE(pcb, pcb->rcv_ann_wnd)));
-    tcphdr->chksum = 0;
-    tcphdr->urgp = 0;
-
-    /* If we're sending a packet, update the announced right window edge */
-    pcb->rcv_ann_right_edge = pcb->rcv_nxt + pcb->rcv_ann_wnd;
-  }
-  return p;
-}
-
-/**
- * Called by tcp_close() to send a segment including FIN flag but not data.
- *
- * @param pcb the tcp_pcb over which to send a segment
- * @return ERR_OK if sent, another err_t otherwise
- */
-err_t
-tcp_send_fin(struct tcp_pcb *pcb)
-{
-  /* first, try to add the fin to the last unsent segment */
-  if (pcb->unsent != NULL) {
-    struct tcp_seg *last_unsent;
-    for (last_unsent = pcb->unsent; last_unsent->next != NULL;
-         last_unsent = last_unsent->next);
-
-    if ((TCPH_FLAGS(last_unsent->tcphdr) & (TCP_SYN | TCP_FIN | TCP_RST)) == 0) {
-      /* no SYN/FIN/RST flag in the header, we can add the FIN flag */
-      TCPH_SET_FLAG(last_unsent->tcphdr, TCP_FIN);
-      pcb->flags |= TF_FIN;
-      return ERR_OK;
-    }
-  }
-  /* no data, no length, flags, copy=1, no optdata */
-  return tcp_enqueue_flags(pcb, TCP_FIN);
-}
-
-/**
- * Create a TCP segment with prefilled header.
- *
- * Called by tcp_write and tcp_enqueue_flags.
- *
- * @param pcb Protocol control block for the TCP connection.
- * @param p pbuf that is used to hold the TCP header.
- * @param flags TCP flags for header.
- * @param seqno TCP sequence number of this packet
- * @param optflags options to include in TCP header
- * @return a new tcp_seg pointing to p, or NULL.
- * The TCP header is filled in except ackno and wnd.
- * p is freed on failure.
- */
-static struct tcp_seg *
-tcp_create_segment(struct tcp_pcb *pcb, struct pbuf *p, u8_t flags, u32_t seqno, u8_t optflags)
-{
-  struct tcp_seg *seg;
-  u8_t optlen = LWIP_TCP_OPT_LENGTH(optflags);
-
-  if ((seg = (struct tcp_seg *)memp_malloc(MEMP_TCP_SEG)) == NULL) {
-    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("tcp_create_segment: no memory.\n"));
-    pbuf_free(p);
-    return NULL;
-  }
-  seg->flags = optflags;
-  seg->next = NULL;
-  seg->p = p;
-  LWIP_ASSERT("p->tot_len >= optlen", p->tot_len >= optlen);
-  seg->len = p->tot_len - optlen;
-#if TCP_OVERSIZE_DBGCHECK
-  seg->oversize_left = 0;
-#endif /* TCP_OVERSIZE_DBGCHECK */
-#if TCP_CHECKSUM_ON_COPY
-  seg->chksum = 0;
-  seg->chksum_swapped = 0;
-  /* check optflags */
-  LWIP_ASSERT("invalid optflags passed: TF_SEG_DATA_CHECKSUMMED",
-              (optflags & TF_SEG_DATA_CHECKSUMMED) == 0);
-#endif /* TCP_CHECKSUM_ON_COPY */
-
-  /* build TCP header */
-  if (pbuf_header(p, TCP_HLEN)) {
-    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("tcp_create_segment: no room for TCP header in pbuf.\n"));
-    TCP_STATS_INC(tcp.err);
-    tcp_seg_free(seg);
-    return NULL;
-  }
-  seg->tcphdr = (struct tcp_hdr *)seg->p->payload;
-  seg->tcphdr->src = lwip_htons(pcb->local_port);
-  seg->tcphdr->dest = lwip_htons(pcb->remote_port);
-  seg->tcphdr->seqno = lwip_htonl(seqno);
-  /* ackno is set in tcp_output */
-  TCPH_HDRLEN_FLAGS_SET(seg->tcphdr, (5 + optlen / 4), flags);
-  /* wnd and chksum are set in tcp_output */
-  seg->tcphdr->urgp = 0;
-  return seg;
-}
-
-/**
- * Allocate a PBUF_RAM pbuf, perhaps with extra space at the end.
- *
- * This function is like pbuf_alloc(layer, length, PBUF_RAM) except
- * there may be extra bytes available at the end.
- *
- * @param layer flag to define header size.
- * @param length size of the pbuf's payload.
- * @param max_length maximum usable size of payload+oversize.
- * @param oversize pointer to a u16_t that will receive the number of usable tail bytes.
- * @param pcb The TCP connection that will enqueue the pbuf.
- * @param apiflags API flags given to tcp_write.
- * @param first_seg true when this pbuf will be used in the first enqueued segment.
- */
-#if TCP_OVERSIZE
-static struct pbuf *
-tcp_pbuf_prealloc(pbuf_layer layer, u16_t length, u16_t max_length,
-                  u16_t *oversize, struct tcp_pcb *pcb, u8_t apiflags,
-                  u8_t first_seg)
-{
-  struct pbuf *p;
-  u16_t alloc = length;
-
-#if LWIP_NETIF_TX_SINGLE_PBUF
-  LWIP_UNUSED_ARG(max_length);
-  LWIP_UNUSED_ARG(pcb);
-  LWIP_UNUSED_ARG(apiflags);
-  LWIP_UNUSED_ARG(first_seg);
-  alloc = max_length;
-#else /* LWIP_NETIF_TX_SINGLE_PBUF */
-  if (length < max_length) {
-    /* Should we allocate an oversized pbuf, or just the minimum
-     * length required? If tcp_write is going to be called again
-     * before this segment is transmitted, we want the oversized
-     * buffer. If the segment will be transmitted immediately, we can
-     * save memory by allocating only length. We use a simple
-     * heuristic based on the following information:
-     *
-     * Did the user set TCP_WRITE_FLAG_MORE?
-     *
-     * Will the Nagle algorithm defer transmission of this segment?
-     */
-    if ((apiflags & TCP_WRITE_FLAG_MORE) ||
-        (!(pcb->flags & TF_NODELAY) &&
-         (!first_seg ||
-          pcb->unsent != NULL ||
-          pcb->unacked != NULL))) {
-      alloc = LWIP_MIN(max_length, LWIP_MEM_ALIGN_SIZE(TCP_OVERSIZE_CALC_LENGTH(length)));
-    }
-  }
-#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
-  p = pbuf_alloc(layer, alloc, PBUF_RAM);
-  if (p == NULL) {
-    return NULL;
-  }
-  LWIP_ASSERT("need unchained pbuf", p->next == NULL);
-  *oversize = p->len - length;
-  /* trim p->len to the currently used size */
-  p->len = p->tot_len = length;
-  return p;
-}
-#else /* TCP_OVERSIZE */
-#define tcp_pbuf_prealloc(layer, length, mx, os, pcb, api, fst) pbuf_alloc((layer), (length), PBUF_RAM)
-#endif /* TCP_OVERSIZE */
-
-#if TCP_CHECKSUM_ON_COPY
-/** Add a checksum of newly added data to the segment */
-static void
-tcp_seg_add_chksum(u16_t chksum, u16_t len, u16_t *seg_chksum,
-                   u8_t *seg_chksum_swapped)
-{
-  u32_t helper;
-  /* add chksum to old chksum and fold to u16_t */
-  helper = chksum + *seg_chksum;
-  chksum = FOLD_U32T(helper);
-  if ((len & 1) != 0) {
-    *seg_chksum_swapped = 1 - *seg_chksum_swapped;
-    chksum = SWAP_BYTES_IN_WORD(chksum);
-  }
-  *seg_chksum = chksum;
-}
-#endif /* TCP_CHECKSUM_ON_COPY */
-
-/** Checks if tcp_write is allowed or not (checks state, snd_buf and snd_queuelen).
- *
- * @param pcb the tcp pcb to check for
- * @param len length of data to send (checked agains snd_buf)
- * @return ERR_OK if tcp_write is allowed to proceed, another err_t otherwise
- */
-static err_t
-tcp_write_checks(struct tcp_pcb *pcb, u16_t len)
-{
-  /* connection is in invalid state for data transmission? */
-  if ((pcb->state != ESTABLISHED) &&
-      (pcb->state != CLOSE_WAIT) &&
-      (pcb->state != SYN_SENT) &&
-      (pcb->state != SYN_RCVD)) {
-    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_STATE | LWIP_DBG_LEVEL_SEVERE, ("tcp_write() called in invalid state\n"));
-    return ERR_CONN;
-  } else if (len == 0) {
-    return ERR_OK;
-  }
-
-  /* fail on too much data */
-  if (len > pcb->snd_buf) {
-    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SEVERE, ("tcp_write: too much data (len=%"U16_F" > snd_buf=%"TCPWNDSIZE_F")\n",
-      len, pcb->snd_buf));
-    pcb->flags |= TF_NAGLEMEMERR;
-    return ERR_MEM;
-  }
-
-  LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_write: queuelen: %"TCPWNDSIZE_F"\n", (tcpwnd_size_t)pcb->snd_queuelen));
-
-  /* If total number of pbufs on the unsent/unacked queues exceeds the
-   * configured maximum, return an error */
-  /* check for configured max queuelen and possible overflow */
-  if ((pcb->snd_queuelen >= TCP_SND_QUEUELEN) || (pcb->snd_queuelen > TCP_SNDQUEUELEN_OVERFLOW)) {
-    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SEVERE, ("tcp_write: too long queue %"U16_F" (max %"U16_F")\n",
-      pcb->snd_queuelen, (u16_t)TCP_SND_QUEUELEN));
-    TCP_STATS_INC(tcp.memerr);
-    pcb->flags |= TF_NAGLEMEMERR;
-    return ERR_MEM;
-  }
-  if (pcb->snd_queuelen != 0) {
-    LWIP_ASSERT("tcp_write: pbufs on queue => at least one queue non-empty",
-      pcb->unacked != NULL || pcb->unsent != NULL);
-  } else {
-    LWIP_ASSERT("tcp_write: no pbufs on queue => both queues empty",
-      pcb->unacked == NULL && pcb->unsent == NULL);
-  }
-  return ERR_OK;
-}
-
-/**
- * @ingroup tcp_raw
- * Write data for sending (but does not send it immediately).
- *
- * It waits in the expectation of more data being sent soon (as
- * it can send them more efficiently by combining them together).
- * To prompt the system to send data now, call tcp_output() after
- * calling tcp_write().
- *
- * @param pcb Protocol control block for the TCP connection to enqueue data for.
- * @param arg Pointer to the data to be enqueued for sending.
- * @param len Data length in bytes
- * @param apiflags combination of following flags :
- * - TCP_WRITE_FLAG_COPY (0x01) data will be copied into memory belonging to the stack
- * - TCP_WRITE_FLAG_MORE (0x02) for TCP connection, PSH flag will not be set on last segment sent,
- * @return ERR_OK if enqueued, another err_t on error
- */
-err_t
-tcp_write(struct tcp_pcb *pcb, const void *arg, u16_t len, u8_t apiflags)
-{
-  struct pbuf *concat_p = NULL;
-  struct tcp_seg *last_unsent = NULL, *seg = NULL, *prev_seg = NULL, *queue = NULL;
-  u16_t pos = 0; /* position in 'arg' data */
-  u16_t queuelen;
-  u8_t optlen = 0;
-  u8_t optflags = 0;
-#if TCP_OVERSIZE
-  u16_t oversize = 0;
-  u16_t oversize_used = 0;
-#if TCP_OVERSIZE_DBGCHECK
-  u16_t oversize_add = 0;
-#endif /* TCP_OVERSIZE_DBGCHECK*/
-#endif /* TCP_OVERSIZE */
-  u16_t extendlen = 0;
-#if TCP_CHECKSUM_ON_COPY
-  u16_t concat_chksum = 0;
-  u8_t concat_chksum_swapped = 0;
-  u16_t concat_chksummed = 0;
-#endif /* TCP_CHECKSUM_ON_COPY */
-  err_t err;
-  /* don't allocate segments bigger than half the maximum window we ever received */
-  u16_t mss_local = LWIP_MIN(pcb->mss, TCPWND_MIN16(pcb->snd_wnd_max/2));
-  mss_local = mss_local ? mss_local : pcb->mss;
-
-#if LWIP_NETIF_TX_SINGLE_PBUF
-  /* Always copy to try to create single pbufs for TX */
-  apiflags |= TCP_WRITE_FLAG_COPY;
-#endif /* LWIP_NETIF_TX_SINGLE_PBUF */
-
-  LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_write(pcb=%p, data=%p, len=%"U16_F", apiflags=%"U16_F")\n",
-    (void *)pcb, arg, len, (u16_t)apiflags));
-  LWIP_ERROR("tcp_write: arg == NULL (programmer violates API)",
-             arg != NULL, return ERR_ARG;);
-
-  err = tcp_write_checks(pcb, len);
-  if (err != ERR_OK) {
-    return err;
-  }
-  queuelen = pcb->snd_queuelen;
-
-#if LWIP_TCP_TIMESTAMPS
-  if ((pcb->flags & TF_TIMESTAMP)) {
-    /* Make sure the timestamp option is only included in data segments if we
-       agreed about it with the remote host. */
-    optflags = TF_SEG_OPTS_TS;
-    optlen = LWIP_TCP_OPT_LENGTH(TF_SEG_OPTS_TS);
-    /* ensure that segments can hold at least one data byte... */
-    mss_local = LWIP_MAX(mss_local, LWIP_TCP_OPT_LEN_TS + 1);
-  }
-#endif /* LWIP_TCP_TIMESTAMPS */
-
-
-  /*
-   * TCP segmentation is done in three phases with increasing complexity:
-   *
-   * 1. Copy data directly into an oversized pbuf.
-   * 2. Chain a new pbuf to the end of pcb->unsent.
-   * 3. Create new segments.
-   *
-   * We may run out of memory at any point. In that case we must
-   * return ERR_MEM and not change anything in pcb. Therefore, all
-   * changes are recorded in local variables and committed at the end
-   * of the function. Some pcb fields are maintained in local copies:
-   *
-   * queuelen = pcb->snd_queuelen
-   * oversize = pcb->unsent_oversize
-   *
-   * These variables are set consistently by the phases:
-   *
-   * seg points to the last segment tampered with.
-   *
-   * pos records progress as data is segmented.
-   */
-
-  /* Find the tail of the unsent queue. */
-  if (pcb->unsent != NULL) {
-    u16_t space;
-    u16_t unsent_optlen;
-
-    /* @todo: this could be sped up by keeping last_unsent in the pcb */
-    for (last_unsent = pcb->unsent; last_unsent->next != NULL;
-         last_unsent = last_unsent->next);
-
-    /* Usable space at the end of the last unsent segment */
-    unsent_optlen = LWIP_TCP_OPT_LENGTH(last_unsent->flags);
-    LWIP_ASSERT("mss_local is too small", mss_local >= last_unsent->len + unsent_optlen);
-    space = mss_local - (last_unsent->len + unsent_optlen);
-
-    /*
-     * Phase 1: Copy data directly into an oversized pbuf.
-     *
-     * The number of bytes copied is recorded in the oversize_used
-     * variable. The actual copying is done at the bottom of the
-     * function.
-     */
-#if TCP_OVERSIZE
-#if TCP_OVERSIZE_DBGCHECK
-    /* check that pcb->unsent_oversize matches last_unsent->oversize_left */
-    LWIP_ASSERT("unsent_oversize mismatch (pcb vs. last_unsent)",
-                pcb->unsent_oversize == last_unsent->oversize_left);
-#endif /* TCP_OVERSIZE_DBGCHECK */
-    oversize = pcb->unsent_oversize;
-    if (oversize > 0) {
-      LWIP_ASSERT("inconsistent oversize vs. space", oversize <= space);
-      seg = last_unsent;
-      oversize_used = LWIP_MIN(space, LWIP_MIN(oversize, len));
-      pos += oversize_used;
-      oversize -= oversize_used;
-      space -= oversize_used;
-    }
-    /* now we are either finished or oversize is zero */
-    LWIP_ASSERT("inconsistent oversize vs. len", (oversize == 0) || (pos == len));
-#endif /* TCP_OVERSIZE */
-
-    /*
-     * Phase 2: Chain a new pbuf to the end of pcb->unsent.
-     *
-     * As an exception when NOT copying the data, if the given data buffer
-     * directly follows the last unsent data buffer in memory, extend the last
-     * ROM pbuf reference to the buffer, thus saving a ROM pbuf allocation.
-     *
-     * We don't extend segments containing SYN/FIN flags or options
-     * (len==0). The new pbuf is kept in concat_p and pbuf_cat'ed at
-     * the end.
-     */
-    if ((pos < len) && (space > 0) && (last_unsent->len > 0)) {
-      u16_t seglen = LWIP_MIN(space, len - pos);
-      seg = last_unsent;
-
-      /* Create a pbuf with a copy or reference to seglen bytes. We
-       * can use PBUF_RAW here since the data appears in the middle of
-       * a segment. A header will never be prepended. */
-      if (apiflags & TCP_WRITE_FLAG_COPY) {
-        /* Data is copied */
-        if ((concat_p = tcp_pbuf_prealloc(PBUF_RAW, seglen, space, &oversize, pcb, apiflags, 1)) == NULL) {
-          LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-                      ("tcp_write : could not allocate memory for pbuf copy size %"U16_F"\n",
-                       seglen));
-          goto memerr;
-        }
-#if TCP_OVERSIZE_DBGCHECK
-        oversize_add = oversize;
-#endif /* TCP_OVERSIZE_DBGCHECK */
-        TCP_DATA_COPY2(concat_p->payload, (const u8_t*)arg + pos, seglen, &concat_chksum, &concat_chksum_swapped);
-#if TCP_CHECKSUM_ON_COPY
-        concat_chksummed += seglen;
-#endif /* TCP_CHECKSUM_ON_COPY */
-        queuelen += pbuf_clen(concat_p);
-      } else {
-        /* Data is not copied */
-        /* If the last unsent pbuf is of type PBUF_ROM, try to extend it. */
-        struct pbuf *p;
-        for (p = last_unsent->p; p->next != NULL; p = p->next);
-        if (p->type == PBUF_ROM && (const u8_t *)p->payload + p->len == (const u8_t *)arg) {
-          LWIP_ASSERT("tcp_write: ROM pbufs cannot be oversized", pos == 0);
-          extendlen = seglen;
-        } else {
-          if ((concat_p = pbuf_alloc(PBUF_RAW, seglen, PBUF_ROM)) == NULL) {
-            LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-                        ("tcp_write: could not allocate memory for zero-copy pbuf\n"));
-            goto memerr;
-          }
-          /* reference the non-volatile payload data */
-          ((struct pbuf_rom*)concat_p)->payload = (const u8_t*)arg + pos;
-          queuelen += pbuf_clen(concat_p);
-        }
-#if TCP_CHECKSUM_ON_COPY
-        /* calculate the checksum of nocopy-data */
-        tcp_seg_add_chksum(~inet_chksum((const u8_t*)arg + pos, seglen), seglen,
-          &concat_chksum, &concat_chksum_swapped);
-        concat_chksummed += seglen;
-#endif /* TCP_CHECKSUM_ON_COPY */
-      }
-
-      pos += seglen;
-    }
-  } else {
-#if TCP_OVERSIZE
-    LWIP_ASSERT("unsent_oversize mismatch (pcb->unsent is NULL)",
-                pcb->unsent_oversize == 0);
-#endif /* TCP_OVERSIZE */
-  }
-
-  /*
-   * Phase 3: Create new segments.
-   *
-   * The new segments are chained together in the local 'queue'
-   * variable, ready to be appended to pcb->unsent.
-   */
-  while (pos < len) {
-    struct pbuf *p;
-    u16_t left = len - pos;
-    u16_t max_len = mss_local - optlen;
-    u16_t seglen = LWIP_MIN(left, max_len);
-#if TCP_CHECKSUM_ON_COPY
-    u16_t chksum = 0;
-    u8_t chksum_swapped = 0;
-#endif /* TCP_CHECKSUM_ON_COPY */
-
-    if (apiflags & TCP_WRITE_FLAG_COPY) {
-      /* If copy is set, memory should be allocated and data copied
-       * into pbuf */
-      if ((p = tcp_pbuf_prealloc(PBUF_TRANSPORT, seglen + optlen, mss_local, &oversize, pcb, apiflags, queue == NULL)) == NULL) {
-        LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("tcp_write : could not allocate memory for pbuf copy size %"U16_F"\n", seglen));
-        goto memerr;
-      }
-      LWIP_ASSERT("tcp_write: check that first pbuf can hold the complete seglen",
-                  (p->len >= seglen));
-      TCP_DATA_COPY2((char *)p->payload + optlen, (const u8_t*)arg + pos, seglen, &chksum, &chksum_swapped);
-    } else {
-      /* Copy is not set: First allocate a pbuf for holding the data.
-       * Since the referenced data is available at least until it is
-       * sent out on the link (as it has to be ACKed by the remote
-       * party) we can safely use PBUF_ROM instead of PBUF_REF here.
-       */
-      struct pbuf *p2;
-#if TCP_OVERSIZE
-      LWIP_ASSERT("oversize == 0", oversize == 0);
-#endif /* TCP_OVERSIZE */
-      if ((p2 = pbuf_alloc(PBUF_TRANSPORT, seglen, PBUF_ROM)) == NULL) {
-        LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("tcp_write: could not allocate memory for zero-copy pbuf\n"));
-        goto memerr;
-      }
-#if TCP_CHECKSUM_ON_COPY
-      /* calculate the checksum of nocopy-data */
-      chksum = ~inet_chksum((const u8_t*)arg + pos, seglen);
-      if (seglen & 1) {
-        chksum_swapped = 1;
-        chksum = SWAP_BYTES_IN_WORD(chksum);
-      }
-#endif /* TCP_CHECKSUM_ON_COPY */
-      /* reference the non-volatile payload data */
-      ((struct pbuf_rom*)p2)->payload = (const u8_t*)arg + pos;
-
-      /* Second, allocate a pbuf for the headers. */
-      if ((p = pbuf_alloc(PBUF_TRANSPORT, optlen, PBUF_RAM)) == NULL) {
-        /* If allocation fails, we have to deallocate the data pbuf as
-         * well. */
-        pbuf_free(p2);
-        LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("tcp_write: could not allocate memory for header pbuf\n"));
-        goto memerr;
-      }
-      /* Concatenate the headers and data pbufs together. */
-      pbuf_cat(p/*header*/, p2/*data*/);
-    }
-
-    queuelen += pbuf_clen(p);
-
-    /* Now that there are more segments queued, we check again if the
-     * length of the queue exceeds the configured maximum or
-     * overflows. */
-    if ((queuelen > TCP_SND_QUEUELEN) || (queuelen > TCP_SNDQUEUELEN_OVERFLOW)) {
-      LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("tcp_write: queue too long %"U16_F" (%d)\n",
-        queuelen, (int)TCP_SND_QUEUELEN));
-      pbuf_free(p);
-      goto memerr;
-    }
-
-    if ((seg = tcp_create_segment(pcb, p, 0, pcb->snd_lbb + pos, optflags)) == NULL) {
-      goto memerr;
-    }
-#if TCP_OVERSIZE_DBGCHECK
-    seg->oversize_left = oversize;
-#endif /* TCP_OVERSIZE_DBGCHECK */
-#if TCP_CHECKSUM_ON_COPY
-    seg->chksum = chksum;
-    seg->chksum_swapped = chksum_swapped;
-    seg->flags |= TF_SEG_DATA_CHECKSUMMED;
-#endif /* TCP_CHECKSUM_ON_COPY */
-
-    /* first segment of to-be-queued data? */
-    if (queue == NULL) {
-      queue = seg;
-    } else {
-      /* Attach the segment to the end of the queued segments */
-      LWIP_ASSERT("prev_seg != NULL", prev_seg != NULL);
-      prev_seg->next = seg;
-    }
-    /* remember last segment of to-be-queued data for next iteration */
-    prev_seg = seg;
-
-    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_TRACE, ("tcp_write: queueing %"U32_F":%"U32_F"\n",
-      lwip_ntohl(seg->tcphdr->seqno),
-      lwip_ntohl(seg->tcphdr->seqno) + TCP_TCPLEN(seg)));
-
-    pos += seglen;
-  }
-
-  /*
-   * All three segmentation phases were successful. We can commit the
-   * transaction.
-   */
-#if TCP_OVERSIZE_DBGCHECK
-  if ((last_unsent != NULL) && (oversize_add != 0)) {
-    last_unsent->oversize_left += oversize_add;
-  }
-#endif /* TCP_OVERSIZE_DBGCHECK */
-
-  /*
-   * Phase 1: If data has been added to the preallocated tail of
-   * last_unsent, we update the length fields of the pbuf chain.
-   */
-#if TCP_OVERSIZE
-  if (oversize_used > 0) {
-    struct pbuf *p;
-    /* Bump tot_len of whole chain, len of tail */
-    for (p = last_unsent->p; p; p = p->next) {
-      p->tot_len += oversize_used;
-      if (p->next == NULL) {
-        TCP_DATA_COPY((char *)p->payload + p->len, arg, oversize_used, last_unsent);
-        p->len += oversize_used;
-      }
-    }
-    last_unsent->len += oversize_used;
-#if TCP_OVERSIZE_DBGCHECK
-    LWIP_ASSERT("last_unsent->oversize_left >= oversize_used",
-                last_unsent->oversize_left >= oversize_used);
-    last_unsent->oversize_left -= oversize_used;
-#endif /* TCP_OVERSIZE_DBGCHECK */
-  }
-  pcb->unsent_oversize = oversize;
-#endif /* TCP_OVERSIZE */
-
-  /*
-   * Phase 2: concat_p can be concatenated onto last_unsent->p, unless we
-   * determined that the last ROM pbuf can be extended to include the new data.
-   */
-  if (concat_p != NULL) {
-    LWIP_ASSERT("tcp_write: cannot concatenate when pcb->unsent is empty",
-      (last_unsent != NULL));
-    pbuf_cat(last_unsent->p, concat_p);
-    last_unsent->len += concat_p->tot_len;
-  } else if (extendlen > 0) {
-    struct pbuf *p;
-    LWIP_ASSERT("tcp_write: extension of reference requires reference",
-      last_unsent != NULL && last_unsent->p != NULL);
-    for (p = last_unsent->p; p->next != NULL; p = p->next) {
-      p->tot_len += extendlen;
-    }
-    p->tot_len += extendlen;
-    p->len += extendlen;
-    last_unsent->len += extendlen;
-  }
-
-#if TCP_CHECKSUM_ON_COPY
-  if (concat_chksummed) {
-    LWIP_ASSERT("tcp_write: concat checksum needs concatenated data",
-        concat_p != NULL || extendlen > 0);
-    /*if concat checksumm swapped - swap it back */
-    if (concat_chksum_swapped) {
-      concat_chksum = SWAP_BYTES_IN_WORD(concat_chksum);
-    }
-    tcp_seg_add_chksum(concat_chksum, concat_chksummed, &last_unsent->chksum,
-      &last_unsent->chksum_swapped);
-    last_unsent->flags |= TF_SEG_DATA_CHECKSUMMED;
-  }
-#endif /* TCP_CHECKSUM_ON_COPY */
-
-  /*
-   * Phase 3: Append queue to pcb->unsent. Queue may be NULL, but that
-   * is harmless
-   */
-  if (last_unsent == NULL) {
-    pcb->unsent = queue;
-  } else {
-    last_unsent->next = queue;
-  }
-
-  /*
-   * Finally update the pcb state.
-   */
-  pcb->snd_lbb += len;
-  pcb->snd_buf -= len;
-  pcb->snd_queuelen = queuelen;
-
-  LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_write: %"S16_F" (after enqueued)\n",
-    pcb->snd_queuelen));
-  if (pcb->snd_queuelen != 0) {
-    LWIP_ASSERT("tcp_write: valid queue length",
-                pcb->unacked != NULL || pcb->unsent != NULL);
-  }
-
-  /* Set the PSH flag in the last segment that we enqueued. */
-  if (seg != NULL && seg->tcphdr != NULL && ((apiflags & TCP_WRITE_FLAG_MORE)==0)) {
-    TCPH_SET_FLAG(seg->tcphdr, TCP_PSH);
-  }
-
-  return ERR_OK;
-memerr:
-  pcb->flags |= TF_NAGLEMEMERR;
-  TCP_STATS_INC(tcp.memerr);
-
-  if (concat_p != NULL) {
-    pbuf_free(concat_p);
-  }
-  if (queue != NULL) {
-    tcp_segs_free(queue);
-  }
-  if (pcb->snd_queuelen != 0) {
-    LWIP_ASSERT("tcp_write: valid queue length", pcb->unacked != NULL ||
-      pcb->unsent != NULL);
-  }
-  LWIP_DEBUGF(TCP_QLEN_DEBUG | LWIP_DBG_STATE, ("tcp_write: %"S16_F" (with mem err)\n", pcb->snd_queuelen));
-  return ERR_MEM;
-}
-
-/**
- * Enqueue TCP options for transmission.
- *
- * Called by tcp_connect(), tcp_listen_input(), and tcp_send_ctrl().
- *
- * @param pcb Protocol control block for the TCP connection.
- * @param flags TCP header flags to set in the outgoing segment.
- */
-err_t
-tcp_enqueue_flags(struct tcp_pcb *pcb, u8_t flags)
-{
-  struct pbuf *p;
-  struct tcp_seg *seg;
-  u8_t optflags = 0;
-  u8_t optlen = 0;
-
-  LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_enqueue_flags: queuelen: %"U16_F"\n", (u16_t)pcb->snd_queuelen));
-
-  LWIP_ASSERT("tcp_enqueue_flags: need either TCP_SYN or TCP_FIN in flags (programmer violates API)",
-              (flags & (TCP_SYN | TCP_FIN)) != 0);
-
-  /* check for configured max queuelen and possible overflow (FIN flag should always come through!) */
-  if (((pcb->snd_queuelen >= TCP_SND_QUEUELEN) || (pcb->snd_queuelen > TCP_SNDQUEUELEN_OVERFLOW)) &&
-      ((flags & TCP_FIN) == 0)) {
-    LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_LEVEL_SEVERE, ("tcp_enqueue_flags: too long queue %"U16_F" (max %"U16_F")\n",
-                                       pcb->snd_queuelen, (u16_t)TCP_SND_QUEUELEN));
-    TCP_STATS_INC(tcp.memerr);
-    pcb->flags |= TF_NAGLEMEMERR;
-    return ERR_MEM;
-  }
-
-  if (flags & TCP_SYN) {
-    optflags = TF_SEG_OPTS_MSS;
-#if LWIP_WND_SCALE
-    if ((pcb->state != SYN_RCVD) || (pcb->flags & TF_WND_SCALE)) {
-      /* In a <SYN,ACK> (sent in state SYN_RCVD), the window scale option may only
-         be sent if we received a window scale option from the remote host. */
-      optflags |= TF_SEG_OPTS_WND_SCALE;
-    }
-#endif /* LWIP_WND_SCALE */
-  }
-#if LWIP_TCP_TIMESTAMPS
-  if ((pcb->flags & TF_TIMESTAMP)) {
-    /* Make sure the timestamp option is only included in data segments if we
-       agreed about it with the remote host. */
-    optflags |= TF_SEG_OPTS_TS;
-  }
-#endif /* LWIP_TCP_TIMESTAMPS */
-  optlen = LWIP_TCP_OPT_LENGTH(optflags);
-
-  /* Allocate pbuf with room for TCP header + options */
-  if ((p = pbuf_alloc(PBUF_TRANSPORT, optlen, PBUF_RAM)) == NULL) {
-    pcb->flags |= TF_NAGLEMEMERR;
-    TCP_STATS_INC(tcp.memerr);
-    return ERR_MEM;
-  }
-  LWIP_ASSERT("tcp_enqueue_flags: check that first pbuf can hold optlen",
-              (p->len >= optlen));
-
-  /* Allocate memory for tcp_seg, and fill in fields. */
-  if ((seg = tcp_create_segment(pcb, p, flags, pcb->snd_lbb, optflags)) == NULL) {
-    pcb->flags |= TF_NAGLEMEMERR;
-    TCP_STATS_INC(tcp.memerr);
-    return ERR_MEM;
-  }
-  LWIP_ASSERT("seg->tcphdr not aligned", ((mem_ptr_t)seg->tcphdr % LWIP_MIN(MEM_ALIGNMENT, 4)) == 0);
-  LWIP_ASSERT("tcp_enqueue_flags: invalid segment length", seg->len == 0);
-
-  LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_TRACE,
-              ("tcp_enqueue_flags: queueing %"U32_F":%"U32_F" (0x%"X16_F")\n",
-               lwip_ntohl(seg->tcphdr->seqno),
-               lwip_ntohl(seg->tcphdr->seqno) + TCP_TCPLEN(seg),
-               (u16_t)flags));
-
-  /* Now append seg to pcb->unsent queue */
-  if (pcb->unsent == NULL) {
-    pcb->unsent = seg;
-  } else {
-    struct tcp_seg *useg;
-    for (useg = pcb->unsent; useg->next != NULL; useg = useg->next);
-    useg->next = seg;
-  }
-#if TCP_OVERSIZE
-  /* The new unsent tail has no space */
-  pcb->unsent_oversize = 0;
-#endif /* TCP_OVERSIZE */
-
-  /* SYN and FIN bump the sequence number */
-  if ((flags & TCP_SYN) || (flags & TCP_FIN)) {
-    pcb->snd_lbb++;
-    /* optlen does not influence snd_buf */
-  }
-  if (flags & TCP_FIN) {
-    pcb->flags |= TF_FIN;
-  }
-
-  /* update number of segments on the queues */
-  pcb->snd_queuelen += pbuf_clen(seg->p);
-  LWIP_DEBUGF(TCP_QLEN_DEBUG, ("tcp_enqueue_flags: %"S16_F" (after enqueued)\n", pcb->snd_queuelen));
-  if (pcb->snd_queuelen != 0) {
-    LWIP_ASSERT("tcp_enqueue_flags: invalid queue length",
-      pcb->unacked != NULL || pcb->unsent != NULL);
-  }
-
-  return ERR_OK;
-}
-
-#if LWIP_TCP_TIMESTAMPS
-/* Build a timestamp option (12 bytes long) at the specified options pointer)
- *
- * @param pcb tcp_pcb
- * @param opts option pointer where to store the timestamp option
- */
-static void
-tcp_build_timestamp_option(struct tcp_pcb *pcb, u32_t *opts)
-{
-  /* Pad with two NOP options to make everything nicely aligned */
-  opts[0] = PP_HTONL(0x0101080A);
-  opts[1] = lwip_htonl(sys_now());
-  opts[2] = lwip_htonl(pcb->ts_recent);
-}
-#endif
-
-#if LWIP_WND_SCALE
-/** Build a window scale option (3 bytes long) at the specified options pointer)
- *
- * @param opts option pointer where to store the window scale option
- */
-static void
-tcp_build_wnd_scale_option(u32_t *opts)
-{
-  /* Pad with one NOP option to make everything nicely aligned */
-  opts[0] = PP_HTONL(0x01030300 | TCP_RCV_SCALE);
-}
-#endif
-
-/**
- * Send an ACK without data.
- *
- * @param pcb Protocol control block for the TCP connection to send the ACK
- */
-err_t
-tcp_send_empty_ack(struct tcp_pcb *pcb)
-{
-  err_t err;
-  struct pbuf *p;
-  u8_t optlen = 0;
-  struct netif *netif;
-#if LWIP_TCP_TIMESTAMPS || CHECKSUM_GEN_TCP
-  struct tcp_hdr *tcphdr;
-#endif /* LWIP_TCP_TIMESTAMPS || CHECKSUM_GEN_TCP */
-
-#if LWIP_TCP_TIMESTAMPS
-  if (pcb->flags & TF_TIMESTAMP) {
-    optlen = LWIP_TCP_OPT_LENGTH(TF_SEG_OPTS_TS);
-  }
-#endif
-
-  p = tcp_output_alloc_header(pcb, optlen, 0, lwip_htonl(pcb->snd_nxt));
-  if (p == NULL) {
-    /* let tcp_fasttmr retry sending this ACK */
-    pcb->flags |= (TF_ACK_DELAY | TF_ACK_NOW);
-    LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: (ACK) could not allocate pbuf\n"));
-    return ERR_BUF;
-  }
-#if LWIP_TCP_TIMESTAMPS || CHECKSUM_GEN_TCP
-  tcphdr = (struct tcp_hdr *)p->payload;
-#endif /* LWIP_TCP_TIMESTAMPS || CHECKSUM_GEN_TCP */
-  LWIP_DEBUGF(TCP_OUTPUT_DEBUG,
-              ("tcp_output: sending ACK for %"U32_F"\n", pcb->rcv_nxt));
-
-  /* NB. MSS and window scale options are only sent on SYNs, so ignore them here */
-#if LWIP_TCP_TIMESTAMPS
-  pcb->ts_lastacksent = pcb->rcv_nxt;
-
-  if (pcb->flags & TF_TIMESTAMP) {
-    tcp_build_timestamp_option(pcb, (u32_t *)(tcphdr + 1));
-  }
-#endif
-
-  netif = ip_route(&pcb->local_ip, &pcb->remote_ip);
-  if (netif == NULL) {
-    err = ERR_RTE;
-  } else {
-#if CHECKSUM_GEN_TCP
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_TCP) {
-      tcphdr->chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len,
-        &pcb->local_ip, &pcb->remote_ip);
-    }
-#endif
-    NETIF_SET_HWADDRHINT(netif, &(pcb->addr_hint));
-    err = ip_output_if(p, &pcb->local_ip, &pcb->remote_ip,
-      pcb->ttl, pcb->tos, IP_PROTO_TCP, netif);
-    NETIF_SET_HWADDRHINT(netif, NULL);
-  }
-  pbuf_free(p);
-
-  if (err != ERR_OK) {
-    /* let tcp_fasttmr retry sending this ACK */
-    pcb->flags |= (TF_ACK_DELAY | TF_ACK_NOW);
-  } else {
-    /* remove ACK flags from the PCB, as we sent an empty ACK now */
-    pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW);
-  }
-
-  return err;
-}
-
-/**
- * @ingroup tcp_raw
- * Find out what we can send and send it
- *
- * @param pcb Protocol control block for the TCP connection to send data
- * @return ERR_OK if data has been sent or nothing to send
- *         another err_t on error
- */
-err_t
-tcp_output(struct tcp_pcb *pcb)
-{
-  struct tcp_seg *seg, *useg;
-  u32_t wnd, snd_nxt;
-  err_t err;
-  struct netif *netif;
-#if TCP_CWND_DEBUG
-  s16_t i = 0;
-#endif /* TCP_CWND_DEBUG */
-
-  /* pcb->state LISTEN not allowed here */
-  LWIP_ASSERT("don't call tcp_output for listen-pcbs",
-    pcb->state != LISTEN);
-
-  /* First, check if we are invoked by the TCP input processing
-     code. If so, we do not output anything. Instead, we rely on the
-     input processing code to call us when input processing is done
-     with. */
-  if (tcp_input_pcb == pcb) {
-    return ERR_OK;
-  }
-
-  wnd = LWIP_MIN(pcb->snd_wnd, pcb->cwnd);
-
-  seg = pcb->unsent;
-
-  /* If the TF_ACK_NOW flag is set and no data will be sent (either
-   * because the ->unsent queue is empty or because the window does
-   * not allow it), construct an empty ACK segment and send it.
-   *
-   * If data is to be sent, we will just piggyback the ACK (see below).
-   */
-  if (pcb->flags & TF_ACK_NOW &&
-     (seg == NULL ||
-      lwip_ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len > wnd)) {
-     return tcp_send_empty_ack(pcb);
-  }
-
-  /* useg should point to last segment on unacked queue */
-  useg = pcb->unacked;
-  if (useg != NULL) {
-    for (; useg->next != NULL; useg = useg->next);
-  }
-
-  netif = ip_route(&pcb->local_ip, &pcb->remote_ip);
-  if (netif == NULL) {
-    return ERR_RTE;
-  }
-
-  /* If we don't have a local IP address, we get one from netif */
-  if (ip_addr_isany(&pcb->local_ip)) {
-    const ip_addr_t *local_ip = ip_netif_get_local_ip(netif, &pcb->remote_ip);
-    if (local_ip == NULL) {
-      return ERR_RTE;
-    }
-    ip_addr_copy(pcb->local_ip, *local_ip);
-  }
-
-#if TCP_OUTPUT_DEBUG
-  if (seg == NULL) {
-    LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output: nothing to send (%p)\n",
-                                   (void*)pcb->unsent));
-  }
-#endif /* TCP_OUTPUT_DEBUG */
-#if TCP_CWND_DEBUG
-  if (seg == NULL) {
-    LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_output: snd_wnd %"TCPWNDSIZE_F
-                                 ", cwnd %"TCPWNDSIZE_F", wnd %"U32_F
-                                 ", seg == NULL, ack %"U32_F"\n",
-                                 pcb->snd_wnd, pcb->cwnd, wnd, pcb->lastack));
-  } else {
-    LWIP_DEBUGF(TCP_CWND_DEBUG,
-                ("tcp_output: snd_wnd %"TCPWNDSIZE_F", cwnd %"TCPWNDSIZE_F", wnd %"U32_F
-                 ", effwnd %"U32_F", seq %"U32_F", ack %"U32_F"\n",
-                 pcb->snd_wnd, pcb->cwnd, wnd,
-                 lwip_ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len,
-                 lwip_ntohl(seg->tcphdr->seqno), pcb->lastack));
-  }
-#endif /* TCP_CWND_DEBUG */
-  /* Check if we need to start the persistent timer when the next unsent segment
-   * does not fit within the remaining send window and RTO timer is not running (we
-   * have no in-flight data). A traditional approach would fill the remaining window
-   * with part of the unsent segment (which will engage zero-window probing upon
-   * reception of the zero window update from the receiver). This ensures the
-   * subsequent window update is reliably received. With the goal of being lightweight,
-   * we avoid splitting the unsent segment and treat the window as already zero.
-   */
-  if (seg != NULL &&
-      lwip_ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len > wnd &&
-      wnd > 0 && wnd == pcb->snd_wnd && pcb->unacked == NULL) {
-    /* Start the persist timer */
-    if (pcb->persist_backoff == 0) {
-      pcb->persist_cnt = 0;
-      pcb->persist_backoff = 1;
-    }
-    goto output_done;
-  }
-  /* data available and window allows it to be sent? */
-  while (seg != NULL &&
-         lwip_ntohl(seg->tcphdr->seqno) - pcb->lastack + seg->len <= wnd) {
-    LWIP_ASSERT("RST not expected here!",
-                (TCPH_FLAGS(seg->tcphdr) & TCP_RST) == 0);
-    /* Stop sending if the nagle algorithm would prevent it
-     * Don't stop:
-     * - if tcp_write had a memory error before (prevent delayed ACK timeout) or
-     * - if FIN was already enqueued for this PCB (SYN is always alone in a segment -
-     *   either seg->next != NULL or pcb->unacked == NULL;
-     *   RST is no sent using tcp_write/tcp_output.
-     */
-    if ((tcp_do_output_nagle(pcb) == 0) &&
-      ((pcb->flags & (TF_NAGLEMEMERR | TF_FIN)) == 0)) {
-      break;
-    }
-#if TCP_CWND_DEBUG
-    LWIP_DEBUGF(TCP_CWND_DEBUG, ("tcp_output: snd_wnd %"TCPWNDSIZE_F", cwnd %"TCPWNDSIZE_F", wnd %"U32_F", effwnd %"U32_F", seq %"U32_F", ack %"U32_F", i %"S16_F"\n",
-                            pcb->snd_wnd, pcb->cwnd, wnd,
-                            lwip_ntohl(seg->tcphdr->seqno) + seg->len -
-                            pcb->lastack,
-                            lwip_ntohl(seg->tcphdr->seqno), pcb->lastack, i));
-    ++i;
-#endif /* TCP_CWND_DEBUG */
-
-    if (pcb->state != SYN_SENT) {
-      TCPH_SET_FLAG(seg->tcphdr, TCP_ACK);
-    }
-
-#if TCP_OVERSIZE_DBGCHECK
-    seg->oversize_left = 0;
-#endif /* TCP_OVERSIZE_DBGCHECK */
-    err = tcp_output_segment(seg, pcb, netif);
-    if (err != ERR_OK) {
-      /* segment could not be sent, for whatever reason */
-      pcb->flags |= TF_NAGLEMEMERR;
-      return err;
-    }
-    pcb->unsent = seg->next;
-    if (pcb->state != SYN_SENT) {
-      pcb->flags &= ~(TF_ACK_DELAY | TF_ACK_NOW);
-    }
-    snd_nxt = lwip_ntohl(seg->tcphdr->seqno) + TCP_TCPLEN(seg);
-    if (TCP_SEQ_LT(pcb->snd_nxt, snd_nxt)) {
-      pcb->snd_nxt = snd_nxt;
-    }
-    /* put segment on unacknowledged list if length > 0 */
-    if (TCP_TCPLEN(seg) > 0) {
-      seg->next = NULL;
-      /* unacked list is empty? */
-      if (pcb->unacked == NULL) {
-        pcb->unacked = seg;
-        useg = seg;
-      /* unacked list is not empty? */
-      } else {
-        /* In the case of fast retransmit, the packet should not go to the tail
-         * of the unacked queue, but rather somewhere before it. We need to check for
-         * this case. -STJ Jul 27, 2004 */
-        if (TCP_SEQ_LT(lwip_ntohl(seg->tcphdr->seqno), lwip_ntohl(useg->tcphdr->seqno))) {
-          /* add segment to before tail of unacked list, keeping the list sorted */
-          struct tcp_seg **cur_seg = &(pcb->unacked);
-          while (*cur_seg &&
-            TCP_SEQ_LT(lwip_ntohl((*cur_seg)->tcphdr->seqno), lwip_ntohl(seg->tcphdr->seqno))) {
-              cur_seg = &((*cur_seg)->next );
-          }
-          seg->next = (*cur_seg);
-          (*cur_seg) = seg;
-        } else {
-          /* add segment to tail of unacked list */
-          useg->next = seg;
-          useg = useg->next;
-        }
-      }
-    /* do not queue empty segments on the unacked list */
-    } else {
-      tcp_seg_free(seg);
-    }
-    seg = pcb->unsent;
-  }
-output_done:
-#if TCP_OVERSIZE
-  if (pcb->unsent == NULL) {
-    /* last unsent has been removed, reset unsent_oversize */
-    pcb->unsent_oversize = 0;
-  }
-#endif /* TCP_OVERSIZE */
-
-  pcb->flags &= ~TF_NAGLEMEMERR;
-  return ERR_OK;
-}
-
-/**
- * Called by tcp_output() to actually send a TCP segment over IP.
- *
- * @param seg the tcp_seg to send
- * @param pcb the tcp_pcb for the TCP connection used to send the segment
- * @param netif the netif used to send the segment
- */
-static err_t
-tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb, struct netif *netif)
-{
-  err_t err;
-  u16_t len;
-  u32_t *opts;
-
-  if (seg->p->ref != 1) {
-    /* This can happen if the pbuf of this segment is still referenced by the
-       netif driver due to deferred transmission. Since this function modifies
-       p->len, we must not continue in this case. */
-    return ERR_OK;
-  }
-
-  /* The TCP header has already been constructed, but the ackno and
-   wnd fields remain. */
-  seg->tcphdr->ackno = lwip_htonl(pcb->rcv_nxt);
-
-  /* advertise our receive window size in this TCP segment */
-#if LWIP_WND_SCALE
-  if (seg->flags & TF_SEG_OPTS_WND_SCALE) {
-    /* The Window field in a SYN segment itself (the only type where we send
-       the window scale option) is never scaled. */
-    seg->tcphdr->wnd = lwip_htons(TCPWND_MIN16(pcb->rcv_ann_wnd));
-  } else
-#endif /* LWIP_WND_SCALE */
-  {
-    seg->tcphdr->wnd = lwip_htons(TCPWND_MIN16(RCV_WND_SCALE(pcb, pcb->rcv_ann_wnd)));
-  }
-
-  pcb->rcv_ann_right_edge = pcb->rcv_nxt + pcb->rcv_ann_wnd;
-
-  /* Add any requested options.  NB MSS option is only set on SYN
-     packets, so ignore it here */
-  /* cast through void* to get rid of alignment warnings */
-  opts = (u32_t *)(void *)(seg->tcphdr + 1);
-  if (seg->flags & TF_SEG_OPTS_MSS) {
-    u16_t mss;
-#if TCP_CALCULATE_EFF_SEND_MSS
-    mss = tcp_eff_send_mss(TCP_MSS, &pcb->local_ip, &pcb->remote_ip);
-#else /* TCP_CALCULATE_EFF_SEND_MSS */
-    mss = TCP_MSS;
-#endif /* TCP_CALCULATE_EFF_SEND_MSS */
-    *opts = TCP_BUILD_MSS_OPTION(mss);
-    opts += 1;
-  }
-#if LWIP_TCP_TIMESTAMPS
-  pcb->ts_lastacksent = pcb->rcv_nxt;
-
-  if (seg->flags & TF_SEG_OPTS_TS) {
-    tcp_build_timestamp_option(pcb, opts);
-    opts += 3;
-  }
-#endif
-#if LWIP_WND_SCALE
-  if (seg->flags & TF_SEG_OPTS_WND_SCALE) {
-    tcp_build_wnd_scale_option(opts);
-    opts += 1;
-  }
-#endif
-
-  /* Set retransmission timer running if it is not currently enabled
-     This must be set before checking the route. */
-  if (pcb->rtime < 0) {
-    pcb->rtime = 0;
-  }
-
-  if (pcb->rttest == 0) {
-    pcb->rttest = tcp_ticks;
-    pcb->rtseq = lwip_ntohl(seg->tcphdr->seqno);
-
-    LWIP_DEBUGF(TCP_RTO_DEBUG, ("tcp_output_segment: rtseq %"U32_F"\n", pcb->rtseq));
-  }
-  LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_output_segment: %"U32_F":%"U32_F"\n",
-          lwip_htonl(seg->tcphdr->seqno), lwip_htonl(seg->tcphdr->seqno) +
-          seg->len));
-
-  len = (u16_t)((u8_t *)seg->tcphdr - (u8_t *)seg->p->payload);
-  if (len == 0) {
-    /** Exclude retransmitted segments from this count. */
-    MIB2_STATS_INC(mib2.tcpoutsegs);
-  }
-
-  seg->p->len -= len;
-  seg->p->tot_len -= len;
-
-  seg->p->payload = seg->tcphdr;
-
-  seg->tcphdr->chksum = 0;
-#if CHECKSUM_GEN_TCP
-  IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_TCP) {
-#if TCP_CHECKSUM_ON_COPY
-    u32_t acc;
-#if TCP_CHECKSUM_ON_COPY_SANITY_CHECK
-    u16_t chksum_slow = ip_chksum_pseudo(seg->p, IP_PROTO_TCP,
-      seg->p->tot_len, &pcb->local_ip, &pcb->remote_ip);
-#endif /* TCP_CHECKSUM_ON_COPY_SANITY_CHECK */
-    if ((seg->flags & TF_SEG_DATA_CHECKSUMMED) == 0) {
-      LWIP_ASSERT("data included but not checksummed",
-        seg->p->tot_len == (TCPH_HDRLEN(seg->tcphdr) * 4));
-    }
-
-    /* rebuild TCP header checksum (TCP header changes for retransmissions!) */
-    acc = ip_chksum_pseudo_partial(seg->p, IP_PROTO_TCP,
-      seg->p->tot_len, TCPH_HDRLEN(seg->tcphdr) * 4, &pcb->local_ip, &pcb->remote_ip);
-    /* add payload checksum */
-    if (seg->chksum_swapped) {
-      seg->chksum = SWAP_BYTES_IN_WORD(seg->chksum);
-      seg->chksum_swapped = 0;
-    }
-    acc += (u16_t)~(seg->chksum);
-    seg->tcphdr->chksum = FOLD_U32T(acc);
-#if TCP_CHECKSUM_ON_COPY_SANITY_CHECK
-    if (chksum_slow != seg->tcphdr->chksum) {
-      TCP_CHECKSUM_ON_COPY_SANITY_CHECK_FAIL(
-                  ("tcp_output_segment: calculated checksum is %"X16_F" instead of %"X16_F"\n",
-                  seg->tcphdr->chksum, chksum_slow));
-      seg->tcphdr->chksum = chksum_slow;
-    }
-#endif /* TCP_CHECKSUM_ON_COPY_SANITY_CHECK */
-#else /* TCP_CHECKSUM_ON_COPY */
-    seg->tcphdr->chksum = ip_chksum_pseudo(seg->p, IP_PROTO_TCP,
-      seg->p->tot_len, &pcb->local_ip, &pcb->remote_ip);
-#endif /* TCP_CHECKSUM_ON_COPY */
-  }
-#endif /* CHECKSUM_GEN_TCP */
-  TCP_STATS_INC(tcp.xmit);
-
-  NETIF_SET_HWADDRHINT(netif, &(pcb->addr_hint));
-  err = ip_output_if(seg->p, &pcb->local_ip, &pcb->remote_ip, pcb->ttl,
-    pcb->tos, IP_PROTO_TCP, netif);
-  NETIF_SET_HWADDRHINT(netif, NULL);
-  return err;
-}
-
-/**
- * Send a TCP RESET packet (empty segment with RST flag set) either to
- * abort a connection or to show that there is no matching local connection
- * for a received segment.
- *
- * Called by tcp_abort() (to abort a local connection), tcp_input() (if no
- * matching local pcb was found), tcp_listen_input() (if incoming segment
- * has ACK flag set) and tcp_process() (received segment in the wrong state)
- *
- * Since a RST segment is in most cases not sent for an active connection,
- * tcp_rst() has a number of arguments that are taken from a tcp_pcb for
- * most other segment output functions.
- *
- * @param seqno the sequence number to use for the outgoing segment
- * @param ackno the acknowledge number to use for the outgoing segment
- * @param local_ip the local IP address to send the segment from
- * @param remote_ip the remote IP address to send the segment to
- * @param local_port the local TCP port to send the segment from
- * @param remote_port the remote TCP port to send the segment to
- */
-void
-tcp_rst(u32_t seqno, u32_t ackno,
-  const ip_addr_t *local_ip, const ip_addr_t *remote_ip,
-  u16_t local_port, u16_t remote_port)
-{
-  struct pbuf *p;
-  struct tcp_hdr *tcphdr;
-  struct netif *netif;
-  p = pbuf_alloc(PBUF_IP, TCP_HLEN, PBUF_RAM);
-  if (p == NULL) {
-    LWIP_DEBUGF(TCP_DEBUG, ("tcp_rst: could not allocate memory for pbuf\n"));
-    return;
-  }
-  LWIP_ASSERT("check that first pbuf can hold struct tcp_hdr",
-              (p->len >= sizeof(struct tcp_hdr)));
-
-  tcphdr = (struct tcp_hdr *)p->payload;
-  tcphdr->src = lwip_htons(local_port);
-  tcphdr->dest = lwip_htons(remote_port);
-  tcphdr->seqno = lwip_htonl(seqno);
-  tcphdr->ackno = lwip_htonl(ackno);
-  TCPH_HDRLEN_FLAGS_SET(tcphdr, TCP_HLEN/4, TCP_RST | TCP_ACK);
-#if LWIP_WND_SCALE
-  tcphdr->wnd = PP_HTONS(((TCP_WND >> TCP_RCV_SCALE) & 0xFFFF));
-#else
-  tcphdr->wnd = PP_HTONS(TCP_WND);
-#endif
-  tcphdr->chksum = 0;
-  tcphdr->urgp = 0;
-
-  TCP_STATS_INC(tcp.xmit);
-  MIB2_STATS_INC(mib2.tcpoutrsts);
-
-  netif = ip_route(local_ip, remote_ip);
-  if (netif != NULL) {
-#if CHECKSUM_GEN_TCP
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_TCP) {
-      tcphdr->chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len,
-                                        local_ip, remote_ip);
-    }
-#endif
-    /* Send output with hardcoded TTL/HL since we have no access to the pcb */
-    ip_output_if(p, local_ip, remote_ip, TCP_TTL, 0, IP_PROTO_TCP, netif);
-  }
-  pbuf_free(p);
-  LWIP_DEBUGF(TCP_RST_DEBUG, ("tcp_rst: seqno %"U32_F" ackno %"U32_F".\n", seqno, ackno));
-}
-
-/**
- * Requeue all unacked segments for retransmission
- *
- * Called by tcp_slowtmr() for slow retransmission.
- *
- * @param pcb the tcp_pcb for which to re-enqueue all unacked segments
- */
-void
-tcp_rexmit_rto(struct tcp_pcb *pcb)
-{
-  struct tcp_seg *seg;
-
-  if (pcb->unacked == NULL) {
-    return;
-  }
-
-  /* Move all unacked segments to the head of the unsent queue */
-  for (seg = pcb->unacked; seg->next != NULL; seg = seg->next);
-  /* concatenate unsent queue after unacked queue */
-  seg->next = pcb->unsent;
-#if TCP_OVERSIZE_DBGCHECK
-  /* if last unsent changed, we need to update unsent_oversize */
-  if (pcb->unsent == NULL) {
-    pcb->unsent_oversize = seg->oversize_left;
-  }
-#endif /* TCP_OVERSIZE_DBGCHECK */
-  /* unsent queue is the concatenated queue (of unacked, unsent) */
-  pcb->unsent = pcb->unacked;
-  /* unacked queue is now empty */
-  pcb->unacked = NULL;
-
-  /* increment number of retransmissions */
-  if (pcb->nrtx < 0xFF) {
-    ++pcb->nrtx;
-  }
-
-  /* Don't take any RTT measurements after retransmitting. */
-  pcb->rttest = 0;
-
-  /* Do the actual retransmission */
-  tcp_output(pcb);
-}
-
-/**
- * Requeue the first unacked segment for retransmission
- *
- * Called by tcp_receive() for fast retransmit.
- *
- * @param pcb the tcp_pcb for which to retransmit the first unacked segment
- */
-void
-tcp_rexmit(struct tcp_pcb *pcb)
-{
-  struct tcp_seg *seg;
-  struct tcp_seg **cur_seg;
-
-  if (pcb->unacked == NULL) {
-    return;
-  }
-
-  /* Move the first unacked segment to the unsent queue */
-  /* Keep the unsent queue sorted. */
-  seg = pcb->unacked;
-  pcb->unacked = seg->next;
-
-  cur_seg = &(pcb->unsent);
-  while (*cur_seg &&
-    TCP_SEQ_LT(lwip_ntohl((*cur_seg)->tcphdr->seqno), lwip_ntohl(seg->tcphdr->seqno))) {
-      cur_seg = &((*cur_seg)->next );
-  }
-  seg->next = *cur_seg;
-  *cur_seg = seg;
-#if TCP_OVERSIZE
-  if (seg->next == NULL) {
-    /* the retransmitted segment is last in unsent, so reset unsent_oversize */
-    pcb->unsent_oversize = 0;
-  }
-#endif /* TCP_OVERSIZE */
-
-  if (pcb->nrtx < 0xFF) {
-    ++pcb->nrtx;
-  }
-
-  /* Don't take any rtt measurements after retransmitting. */
-  pcb->rttest = 0;
-
-  /* Do the actual retransmission. */
-  MIB2_STATS_INC(mib2.tcpretranssegs);
-  /* No need to call tcp_output: we are always called from tcp_input()
-     and thus tcp_output directly returns. */
-}
-
-
-/**
- * Handle retransmission after three dupacks received
- *
- * @param pcb the tcp_pcb for which to retransmit the first unacked segment
- */
-void
-tcp_rexmit_fast(struct tcp_pcb *pcb)
-{
-  if (pcb->unacked != NULL && !(pcb->flags & TF_INFR)) {
-    /* This is fast retransmit. Retransmit the first unacked segment. */
-    LWIP_DEBUGF(TCP_FR_DEBUG,
-                ("tcp_receive: dupacks %"U16_F" (%"U32_F
-                 "), fast retransmit %"U32_F"\n",
-                 (u16_t)pcb->dupacks, pcb->lastack,
-                 lwip_ntohl(pcb->unacked->tcphdr->seqno)));
-    tcp_rexmit(pcb);
-
-    /* Set ssthresh to half of the minimum of the current
-     * cwnd and the advertised window */
-    pcb->ssthresh = LWIP_MIN(pcb->cwnd, pcb->snd_wnd) / 2;
-
-    /* The minimum value for ssthresh should be 2 MSS */
-    if (pcb->ssthresh < (2U * pcb->mss)) {
-      LWIP_DEBUGF(TCP_FR_DEBUG,
-                  ("tcp_receive: The minimum value for ssthresh %"TCPWNDSIZE_F
-                   " should be min 2 mss %"U16_F"...\n",
-                   pcb->ssthresh, (u16_t)(2*pcb->mss)));
-      pcb->ssthresh = 2*pcb->mss;
-    }
-
-    pcb->cwnd = pcb->ssthresh + 3 * pcb->mss;
-    pcb->flags |= TF_INFR;
-
-    /* Reset the retransmission timer to prevent immediate rto retransmissions */
-    pcb->rtime = 0;
-  }
-}
-
-
-/**
- * Send keepalive packets to keep a connection active although
- * no data is sent over it.
- *
- * Called by tcp_slowtmr()
- *
- * @param pcb the tcp_pcb for which to send a keepalive packet
- */
-err_t
-tcp_keepalive(struct tcp_pcb *pcb)
-{
-  err_t err;
-  struct pbuf *p;
-  struct netif *netif;
-
-  LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: sending KEEPALIVE probe to "));
-  ip_addr_debug_print(TCP_DEBUG, &pcb->remote_ip);
-  LWIP_DEBUGF(TCP_DEBUG, ("\n"));
-
-  LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: tcp_ticks %"U32_F"   pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n",
-                          tcp_ticks, pcb->tmr, (u16_t)pcb->keep_cnt_sent));
-
-  p = tcp_output_alloc_header(pcb, 0, 0, lwip_htonl(pcb->snd_nxt - 1));
-  if (p == NULL) {
-    LWIP_DEBUGF(TCP_DEBUG,
-                ("tcp_keepalive: could not allocate memory for pbuf\n"));
-    return ERR_MEM;
-  }
-  netif = ip_route(&pcb->local_ip, &pcb->remote_ip);
-  if (netif == NULL) {
-    err = ERR_RTE;
-  } else {
-#if CHECKSUM_GEN_TCP
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_TCP) {
-      struct tcp_hdr *tcphdr = (struct tcp_hdr *)p->payload;
-      tcphdr->chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len,
-        &pcb->local_ip, &pcb->remote_ip);
-    }
-#endif /* CHECKSUM_GEN_TCP */
-    TCP_STATS_INC(tcp.xmit);
-
-    /* Send output to IP */
-    NETIF_SET_HWADDRHINT(netif, &(pcb->addr_hint));
-    err = ip_output_if(p, &pcb->local_ip, &pcb->remote_ip, pcb->ttl, 0, IP_PROTO_TCP, netif);
-    NETIF_SET_HWADDRHINT(netif, NULL);
-  }
-  pbuf_free(p);
-
-  LWIP_DEBUGF(TCP_DEBUG, ("tcp_keepalive: seqno %"U32_F" ackno %"U32_F" err %d.\n",
-                          pcb->snd_nxt - 1, pcb->rcv_nxt, (int)err));
-  return err;
-}
-
-
-/**
- * Send persist timer zero-window probes to keep a connection active
- * when a window update is lost.
- *
- * Called by tcp_slowtmr()
- *
- * @param pcb the tcp_pcb for which to send a zero-window probe packet
- */
-err_t
-tcp_zero_window_probe(struct tcp_pcb *pcb)
-{
-  err_t err;
-  struct pbuf *p;
-  struct tcp_hdr *tcphdr;
-  struct tcp_seg *seg;
-  u16_t len;
-  u8_t is_fin;
-  u32_t snd_nxt;
-  struct netif *netif;
-
-  LWIP_DEBUGF(TCP_DEBUG, ("tcp_zero_window_probe: sending ZERO WINDOW probe to "));
-  ip_addr_debug_print(TCP_DEBUG, &pcb->remote_ip);
-  LWIP_DEBUGF(TCP_DEBUG, ("\n"));
-
-  LWIP_DEBUGF(TCP_DEBUG,
-              ("tcp_zero_window_probe: tcp_ticks %"U32_F
-               "   pcb->tmr %"U32_F" pcb->keep_cnt_sent %"U16_F"\n",
-               tcp_ticks, pcb->tmr, (u16_t)pcb->keep_cnt_sent));
-
-  seg = pcb->unacked;
-
-  if (seg == NULL) {
-    seg = pcb->unsent;
-  }
-  if (seg == NULL) {
-    /* nothing to send, zero window probe not needed */
-    return ERR_OK;
-  }
-
-  is_fin = ((TCPH_FLAGS(seg->tcphdr) & TCP_FIN) != 0) && (seg->len == 0);
-  /* we want to send one seqno: either FIN or data (no options) */
-  len = is_fin ? 0 : 1;
-
-  p = tcp_output_alloc_header(pcb, 0, len, seg->tcphdr->seqno);
-  if (p == NULL) {
-    LWIP_DEBUGF(TCP_DEBUG, ("tcp_zero_window_probe: no memory for pbuf\n"));
-    return ERR_MEM;
-  }
-  tcphdr = (struct tcp_hdr *)p->payload;
-
-  if (is_fin) {
-    /* FIN segment, no data */
-    TCPH_FLAGS_SET(tcphdr, TCP_ACK | TCP_FIN);
-  } else {
-    /* Data segment, copy in one byte from the head of the unacked queue */
-    char *d = ((char *)p->payload + TCP_HLEN);
-    /* Depending on whether the segment has already been sent (unacked) or not
-       (unsent), seg->p->payload points to the IP header or TCP header.
-       Ensure we copy the first TCP data byte: */
-    pbuf_copy_partial(seg->p, d, 1, seg->p->tot_len - seg->len);
-  }
-
-  /* The byte may be acknowledged without the window being opened. */
-  snd_nxt = lwip_ntohl(seg->tcphdr->seqno) + 1;
-  if (TCP_SEQ_LT(pcb->snd_nxt, snd_nxt)) {
-    pcb->snd_nxt = snd_nxt;
-  }
-
-  netif = ip_route(&pcb->local_ip, &pcb->remote_ip);
-  if (netif == NULL) {
-    err = ERR_RTE;
-  } else {
-#if CHECKSUM_GEN_TCP
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_TCP) {
-      tcphdr->chksum = ip_chksum_pseudo(p, IP_PROTO_TCP, p->tot_len,
-        &pcb->local_ip, &pcb->remote_ip);
-    }
-#endif
-    TCP_STATS_INC(tcp.xmit);
-
-    /* Send output to IP */
-    NETIF_SET_HWADDRHINT(netif, &(pcb->addr_hint));
-    err = ip_output_if(p, &pcb->local_ip, &pcb->remote_ip, pcb->ttl,
-      0, IP_PROTO_TCP, netif);
-    NETIF_SET_HWADDRHINT(netif, NULL);
-  }
-
-  pbuf_free(p);
-
-  LWIP_DEBUGF(TCP_DEBUG, ("tcp_zero_window_probe: seqno %"U32_F
-                          " ackno %"U32_F" err %d.\n",
-                          pcb->snd_nxt - 1, pcb->rcv_nxt, (int)err));
-  return err;
-}
-#endif /* LWIP_TCP */
diff --git a/sys/net/core/timeouts.c b/sys/net/core/timeouts.c
deleted file mode 100644
index 144e231..0000000
--- a/sys/net/core/timeouts.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/**
- * @file
- * Stack-internal timers implementation.
- * This file includes timer callbacks for stack-internal timers as well as
- * functions to set up or stop timers and check for expired timers.
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *         Simon Goldschmidt
- *
- */
-
-#include "net/opt.h"
-
-#include "net/timeouts.h"
-#include "net/priv/tcp_priv.h"
-
-#include "net/def.h"
-#include "net/memp.h"
-#include "net/priv/tcpip_priv.h"
-
-#include "net/ip4_frag.h"
-#include "net/etharp.h"
-#include "net/dhcp.h"
-#include "net/autoip.h"
-#include "net/igmp.h"
-#include "net/dns.h"
-#include "net/nd6.h"
-#include "net/ip6_frag.h"
-#include "net/mld6.h"
-#include "net/sys.h"
-#include "net/pbuf.h"
-
-#if LWIP_DEBUG_TIMERNAMES
-#define HANDLER(x) x, #x
-#else /* LWIP_DEBUG_TIMERNAMES */
-#define HANDLER(x) x
-#endif /* LWIP_DEBUG_TIMERNAMES */
-
-/** This array contains all stack-internal cyclic timers. To get the number of
- * timers, use LWIP_ARRAYSIZE() */
-const struct lwip_cyclic_timer lwip_cyclic_timers[] = {
-#if LWIP_TCP
-  /* The TCP timer is a special case: it does not have to run always and
-     is triggered to start from TCP using tcp_timer_needed() */
-  {TCP_TMR_INTERVAL, HANDLER(tcp_tmr)},
-#endif /* LWIP_TCP */
-#if LWIP_IPV4
-#if IP_REASSEMBLY
-  {IP_TMR_INTERVAL, HANDLER(ip_reass_tmr)},
-#endif /* IP_REASSEMBLY */
-#if LWIP_ARP
-  {ARP_TMR_INTERVAL, HANDLER(etharp_tmr)},
-#endif /* LWIP_ARP */
-#if LWIP_DHCP
-  {DHCP_COARSE_TIMER_MSECS, HANDLER(dhcp_coarse_tmr)},
-  {DHCP_FINE_TIMER_MSECS, HANDLER(dhcp_fine_tmr)},
-#endif /* LWIP_DHCP */
-#if LWIP_AUTOIP
-  {AUTOIP_TMR_INTERVAL, HANDLER(autoip_tmr)},
-#endif /* LWIP_AUTOIP */
-#if LWIP_IGMP
-  {IGMP_TMR_INTERVAL, HANDLER(igmp_tmr)},
-#endif /* LWIP_IGMP */
-#endif /* LWIP_IPV4 */
-#if LWIP_DNS
-  {DNS_TMR_INTERVAL, HANDLER(dns_tmr)},
-#endif /* LWIP_DNS */
-#if LWIP_IPV6
-  {ND6_TMR_INTERVAL, HANDLER(nd6_tmr)},
-#if LWIP_IPV6_REASS
-  {IP6_REASS_TMR_INTERVAL, HANDLER(ip6_reass_tmr)},
-#endif /* LWIP_IPV6_REASS */
-#if LWIP_IPV6_MLD
-  {MLD6_TMR_INTERVAL, HANDLER(mld6_tmr)},
-#endif /* LWIP_IPV6_MLD */
-#endif /* LWIP_IPV6 */
-};
-
-#if LWIP_TIMERS && !LWIP_TIMERS_CUSTOM
-
-/** The one and only timeout list */
-static struct sys_timeo *next_timeout;
-static u32_t timeouts_last_time;
-
-#if LWIP_TCP
-/** global variable that shows if the tcp timer is currently scheduled or not */
-static int tcpip_tcp_timer_active;
-
-/**
- * Timer callback function that calls tcp_tmr() and reschedules itself.
- *
- * @param arg unused argument
- */
-static void
-tcpip_tcp_timer(void *arg)
-{
-  LWIP_UNUSED_ARG(arg);
-
-  /* call TCP timer handler */
-  tcp_tmr();
-  /* timer still needed? */
-  if (tcp_active_pcbs || tcp_tw_pcbs) {
-    /* restart timer */
-    sys_timeout(TCP_TMR_INTERVAL, tcpip_tcp_timer, NULL);
-  } else {
-    /* disable timer */
-    tcpip_tcp_timer_active = 0;
-  }
-}
-
-/**
- * Called from TCP_REG when registering a new PCB:
- * the reason is to have the TCP timer only running when
- * there are active (or time-wait) PCBs.
- */
-void
-tcp_timer_needed(void)
-{
-  /* timer is off but needed again? */
-  if (!tcpip_tcp_timer_active && (tcp_active_pcbs || tcp_tw_pcbs)) {
-    /* enable and start timer */
-    tcpip_tcp_timer_active = 1;
-    sys_timeout(TCP_TMR_INTERVAL, tcpip_tcp_timer, NULL);
-  }
-}
-#endif /* LWIP_TCP */
-
-/**
- * Timer callback function that calls mld6_tmr() and reschedules itself.
- *
- * @param arg unused argument
- */
-static void
-cyclic_timer(void *arg)
-{
-  const struct lwip_cyclic_timer* cyclic = (const struct lwip_cyclic_timer*)arg;
-#if LWIP_DEBUG_TIMERNAMES
-  LWIP_DEBUGF(TIMERS_DEBUG, ("tcpip: %s()\n", cyclic->handler_name));
-#endif
-  cyclic->handler();
-  sys_timeout(cyclic->interval_ms, cyclic_timer, arg);
-}
-
-/** Initialize this module */
-void sys_timeouts_init(void)
-{
-  size_t i;
-  /* tcp_tmr() at index 0 is started on demand */
-  for (i = (LWIP_TCP ? 1 : 0); i < LWIP_ARRAYSIZE(lwip_cyclic_timers); i++) {
-    /* we have to cast via size_t to get rid of const warning
-      (this is OK as cyclic_timer() casts back to const* */
-    sys_timeout(lwip_cyclic_timers[i].interval_ms, cyclic_timer, LWIP_CONST_CAST(void*, &lwip_cyclic_timers[i]));
-  }
-
-  /* Initialise timestamp for sys_check_timeouts */
-  timeouts_last_time = sys_now();
-}
-
-/**
- * Create a one-shot timer (aka timeout). Timeouts are processed in the
- * following cases:
- * - while waiting for a message using sys_timeouts_mbox_fetch()
- * - by calling sys_check_timeouts() (NO_SYS==1 only)
- *
- * @param msecs time in milliseconds after that the timer should expire
- * @param handler callback function to call when msecs have elapsed
- * @param arg argument to pass to the callback function
- */
-#if LWIP_DEBUG_TIMERNAMES
-void
-sys_timeout_debug(u32_t msecs, sys_timeout_handler handler, void *arg, const char* handler_name)
-#else /* LWIP_DEBUG_TIMERNAMES */
-void
-sys_timeout(u32_t msecs, sys_timeout_handler handler, void *arg)
-#endif /* LWIP_DEBUG_TIMERNAMES */
-{
-  struct sys_timeo *timeout, *t;
-  u32_t now, diff;
-
-  timeout = (struct sys_timeo *)memp_malloc(MEMP_SYS_TIMEOUT);
-  if (timeout == NULL) {
-    LWIP_ASSERT("sys_timeout: timeout != NULL, pool MEMP_SYS_TIMEOUT is empty", timeout != NULL);
-    return;
-  }
-
-  now = sys_now();
-  if (next_timeout == NULL) {
-    diff = 0;
-    timeouts_last_time = now;
-  } else {
-    diff = now - timeouts_last_time;
-  }
-
-  timeout->next = NULL;
-  timeout->h = handler;
-  timeout->arg = arg;
-  timeout->time = msecs + diff;
-#if LWIP_DEBUG_TIMERNAMES
-  timeout->handler_name = handler_name;
-  LWIP_DEBUGF(TIMERS_DEBUG, ("sys_timeout: %p msecs=%"U32_F" handler=%s arg=%p\n",
-    (void *)timeout, msecs, handler_name, (void *)arg));
-#endif /* LWIP_DEBUG_TIMERNAMES */
-
-  if (next_timeout == NULL) {
-    next_timeout = timeout;
-    return;
-  }
-
-  if (next_timeout->time > msecs) {
-    next_timeout->time -= msecs;
-    timeout->next = next_timeout;
-    next_timeout = timeout;
-  } else {
-    for (t = next_timeout; t != NULL; t = t->next) {
-      timeout->time -= t->time;
-      if (t->next == NULL || t->next->time > timeout->time) {
-        if (t->next != NULL) {
-          t->next->time -= timeout->time;
-        } else if (timeout->time > msecs) {
-          /* If this is the case, 'timeouts_last_time' and 'now' differs too much.
-             This can be due to sys_check_timeouts() not being called at the right
-             times, but also when stopping in a breakpoint. Anyway, let's assume
-             this is not wanted, so add the first timer's time instead of 'diff' */
-          timeout->time = msecs + next_timeout->time;
-        }
-        timeout->next = t->next;
-        t->next = timeout;
-        break;
-      }
-    }
-  }
-}
-
-/**
- * Go through timeout list (for this task only) and remove the first matching
- * entry (subsequent entries remain untouched), even though the timeout has not
- * triggered yet.
- *
- * @param handler callback function that would be called by the timeout
- * @param arg callback argument that would be passed to handler
-*/
-void
-sys_untimeout(sys_timeout_handler handler, void *arg)
-{
-  struct sys_timeo *prev_t, *t;
-
-  if (next_timeout == NULL) {
-    return;
-  }
-
-  for (t = next_timeout, prev_t = NULL; t != NULL; prev_t = t, t = t->next) {
-    if ((t->h == handler) && (t->arg == arg)) {
-      /* We have a match */
-      /* Unlink from previous in list */
-      if (prev_t == NULL) {
-        next_timeout = t->next;
-      } else {
-        prev_t->next = t->next;
-      }
-      /* If not the last one, add time of this one back to next */
-      if (t->next != NULL) {
-        t->next->time += t->time;
-      }
-      memp_free(MEMP_SYS_TIMEOUT, t);
-      return;
-    }
-  }
-  return;
-}
-
-/**
- * @ingroup lwip_nosys
- * Handle timeouts for NO_SYS==1 (i.e. without using
- * tcpip_thread/sys_timeouts_mbox_fetch(). Uses sys_now() to call timeout
- * handler functions when timeouts expire.
- *
- * Must be called periodically from your main loop.
- */
-#if !NO_SYS && !defined __DOXYGEN__
-static
-#endif /* !NO_SYS */
-void
-sys_check_timeouts(void)
-{
-  if (next_timeout) {
-    struct sys_timeo *tmptimeout;
-    u32_t diff;
-    sys_timeout_handler handler;
-    void *arg;
-    u8_t had_one;
-    u32_t now;
-
-    now = sys_now();
-    /* this cares for wraparounds */
-    diff = now - timeouts_last_time;
-    do {
-      PBUF_CHECK_FREE_OOSEQ();
-      had_one = 0;
-      tmptimeout = next_timeout;
-      if (tmptimeout && (tmptimeout->time <= diff)) {
-        /* timeout has expired */
-        had_one = 1;
-        timeouts_last_time += tmptimeout->time;
-        diff -= tmptimeout->time;
-        next_timeout = tmptimeout->next;
-        handler = tmptimeout->h;
-        arg = tmptimeout->arg;
-#if LWIP_DEBUG_TIMERNAMES
-        if (handler != NULL) {
-          LWIP_DEBUGF(TIMERS_DEBUG, ("sct calling h=%s arg=%p\n",
-            tmptimeout->handler_name, arg));
-        }
-#endif /* LWIP_DEBUG_TIMERNAMES */
-        memp_free(MEMP_SYS_TIMEOUT, tmptimeout);
-        if (handler != NULL) {
-#if !NO_SYS
-          /* For LWIP_TCPIP_CORE_LOCKING, lock the core before calling the
-             timeout handler function. */
-          LOCK_TCPIP_CORE();
-#endif /* !NO_SYS */
-          handler(arg);
-#if !NO_SYS
-          UNLOCK_TCPIP_CORE();
-#endif /* !NO_SYS */
-        }
-        LWIP_TCPIP_THREAD_ALIVE();
-      }
-    /* repeat until all expired timers have been called */
-    } while (had_one);
-  }
-}
-
-/** Set back the timestamp of the last call to sys_check_timeouts()
- * This is necessary if sys_check_timeouts() hasn't been called for a long
- * time (e.g. while saving energy) to prevent all timer functions of that
- * period being called.
- */
-void
-sys_restart_timeouts(void)
-{
-  timeouts_last_time = sys_now();
-}
-
-/** Return the time left before the next timeout is due. If no timeouts are
- * enqueued, returns 0xffffffff
- */
-#if !NO_SYS
-static
-#endif /* !NO_SYS */
-u32_t
-sys_timeouts_sleeptime(void)
-{
-  u32_t diff;
-  if (next_timeout == NULL) {
-    return 0xffffffff;
-  }
-  diff = sys_now() - timeouts_last_time;
-  if (diff > next_timeout->time) {
-    return 0;
-  } else {
-    return next_timeout->time - diff;
-  }
-}
-
-#if !NO_SYS
-
-/**
- * Wait (forever) for a message to arrive in an mbox.
- * While waiting, timeouts are processed.
- *
- * @param mbox the mbox to fetch the message from
- * @param msg the place to store the message
- */
-void
-sys_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg)
-{
-  u32_t sleeptime;
-
-again:
-  if (!next_timeout) {
-    sys_arch_mbox_fetch(mbox, msg, 0);
-    return;
-  }
-
-  sleeptime = sys_timeouts_sleeptime();
-  if (sleeptime == 0 || sys_arch_mbox_fetch(mbox, msg, sleeptime) == SYS_ARCH_TIMEOUT) {
-    /* If a SYS_ARCH_TIMEOUT value is returned, a timeout occurred
-       before a message could be fetched. */
-    sys_check_timeouts();
-    /* We try again to fetch a message from the mbox. */
-    goto again;
-  }
-}
-
-#endif /* NO_SYS */
-
-#else /* LWIP_TIMERS && !LWIP_TIMERS_CUSTOM */
-/* Satisfy the TCP code which calls this function */
-void
-tcp_timer_needed(void)
-{
-}
-#endif /* LWIP_TIMERS && !LWIP_TIMERS_CUSTOM */
diff --git a/sys/net/core/udp.c b/sys/net/core/udp.c
deleted file mode 100644
index 08f3ab4..0000000
--- a/sys/net/core/udp.c
+++ /dev/null
@@ -1,1191 +0,0 @@
-/**
- * @file
- * User Datagram Protocol module\n
- * The code for the User Datagram Protocol UDP & UDPLite (RFC 3828).\n
- * See also @ref udp_raw
- * 
- * @defgroup udp_raw UDP
- * @ingroup callbackstyle_api
- * User Datagram Protocol module\n
- * @see @ref raw_api and @ref netconn
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-/* @todo Check the use of '(struct udp_pcb).chksum_len_rx'!
- */
-
-#include "net/opt.h"
-
-#if LWIP_UDP /* don't build if not configured for use in lwipopts.h */
-
-#include "net/udp.h"
-#include "net/def.h"
-#include "net/memp.h"
-#include "net/inet_chksum.h"
-#include "net/ip_addr.h"
-#include "net/ip6.h"
-#include "net/ip6_addr.h"
-#include "net/netif.h"
-#include "net/icmp.h"
-#include "net/icmp6.h"
-#include "net/stats.h"
-#include "net/snmp.h"
-#include "net/dhcp.h"
-
-#include <string.h>
-
-#ifndef UDP_LOCAL_PORT_RANGE_START
-/* From http://www.iana.org/assignments/port-numbers:
-   "The Dynamic and/or Private Ports are those from 49152 through 65535" */
-#define UDP_LOCAL_PORT_RANGE_START  0xc000
-#define UDP_LOCAL_PORT_RANGE_END    0xffff
-#define UDP_ENSURE_LOCAL_PORT_RANGE(port) ((u16_t)(((port) & ~UDP_LOCAL_PORT_RANGE_START) + UDP_LOCAL_PORT_RANGE_START))
-#endif
-
-/* last local UDP port */
-static u16_t udp_port = UDP_LOCAL_PORT_RANGE_START;
-
-/* The list of UDP PCBs */
-/* exported in udp.h (was static) */
-struct udp_pcb *udp_pcbs;
-
-/**
- * Initialize this module.
- */
-void
-udp_init(void)
-{
-#if LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS && defined(LWIP_RAND)
-  udp_port = UDP_ENSURE_LOCAL_PORT_RANGE(LWIP_RAND());
-#endif /* LWIP_RANDOMIZE_INITIAL_LOCAL_PORTS && defined(LWIP_RAND) */
-}
-
-/**
- * Allocate a new local UDP port.
- *
- * @return a new (free) local UDP port number
- */
-static u16_t
-udp_new_port(void)
-{
-  u16_t n = 0;
-  struct udp_pcb *pcb;
-
-again:
-  if (udp_port++ == UDP_LOCAL_PORT_RANGE_END) {
-    udp_port = UDP_LOCAL_PORT_RANGE_START;
-  }
-  /* Check all PCBs. */
-  for (pcb = udp_pcbs; pcb != NULL; pcb = pcb->next) {
-    if (pcb->local_port == udp_port) {
-      if (++n > (UDP_LOCAL_PORT_RANGE_END - UDP_LOCAL_PORT_RANGE_START)) {
-        return 0;
-      }
-      goto again;
-    }
-  }
-  return udp_port;
-}
-
-/** Common code to see if the current input packet matches the pcb
- * (current input packet is accessed via ip(4/6)_current_* macros)
- *
- * @param pcb pcb to check
- * @param inp network interface on which the datagram was received (only used for IPv4)
- * @param broadcast 1 if his is an IPv4 broadcast (global or subnet-only), 0 otherwise (only used for IPv4)
- * @return 1 on match, 0 otherwise
- */
-static u8_t
-udp_input_local_match(struct udp_pcb *pcb, struct netif *inp, u8_t broadcast)
-{
-  LWIP_UNUSED_ARG(inp);       /* in IPv6 only case */
-  LWIP_UNUSED_ARG(broadcast); /* in IPv6 only case */
-
-  /* Dual-stack: PCBs listening to any IP type also listen to any IP address */
-  if (IP_IS_ANY_TYPE_VAL(pcb->local_ip)) {
-#if LWIP_IPV4 && IP_SOF_BROADCAST_RECV
-    if ((broadcast != 0) && !ip_get_option(pcb, SOF_BROADCAST)) {
-      return 0;
-    }
-#endif /* LWIP_IPV4 && IP_SOF_BROADCAST_RECV */
-    return 1;
-  }
-
-  /* Only need to check PCB if incoming IP version matches PCB IP version */
-  if (IP_ADDR_PCB_VERSION_MATCH_EXACT(pcb, ip_current_dest_addr())) {
-#if LWIP_IPV4
-    /* Special case: IPv4 broadcast: all or broadcasts in my subnet
-     * Note: broadcast variable can only be 1 if it is an IPv4 broadcast */
-    if (broadcast != 0) {
-#if IP_SOF_BROADCAST_RECV
-      if (ip_get_option(pcb, SOF_BROADCAST))
-#endif /* IP_SOF_BROADCAST_RECV */
-      {
-        if (ip4_addr_isany(ip_2_ip4(&pcb->local_ip)) ||
-          ((ip4_current_dest_addr()->addr == IPADDR_BROADCAST)) ||
-           ip4_addr_netcmp(ip_2_ip4(&pcb->local_ip), ip4_current_dest_addr(), netif_ip4_netmask(inp))) {
-          return 1;
-        }
-      }
-    } else
-#endif /* LWIP_IPV4 */
-    /* Handle IPv4 and IPv6: all or exact match */
-    if (ip_addr_isany(&pcb->local_ip) || ip_addr_cmp(&pcb->local_ip, ip_current_dest_addr())) {
-      return 1;
-    }
-  }
-
-  return 0;
-}
-
-/**
- * Process an incoming UDP datagram.
- *
- * Given an incoming UDP datagram (as a chain of pbufs) this function
- * finds a corresponding UDP PCB and hands over the pbuf to the pcbs
- * recv function. If no pcb is found or the datagram is incorrect, the
- * pbuf is freed.
- *
- * @param p pbuf to be demultiplexed to a UDP PCB (p->payload pointing to the UDP header)
- * @param inp network interface on which the datagram was received.
- *
- */
-void
-udp_input(struct pbuf *p, struct netif *inp)
-{
-  struct udp_hdr *udphdr;
-  struct udp_pcb *pcb, *prev;
-  struct udp_pcb *uncon_pcb;
-  u16_t src, dest;
-  u8_t broadcast;
-  u8_t for_us = 0;
-
-  LWIP_UNUSED_ARG(inp);
-
-  PERF_START;
-
-  UDP_STATS_INC(udp.recv);
-
-  /* Check minimum length (UDP header) */
-  if (p->len < UDP_HLEN) {
-    /* drop short packets */
-    LWIP_DEBUGF(UDP_DEBUG,
-                ("udp_input: short UDP datagram (%"U16_F" bytes) discarded\n", p->tot_len));
-    UDP_STATS_INC(udp.lenerr);
-    UDP_STATS_INC(udp.drop);
-    MIB2_STATS_INC(mib2.udpinerrors);
-    pbuf_free(p);
-    goto end;
-  }
-
-  udphdr = (struct udp_hdr *)p->payload;
-
-  /* is broadcast packet ? */
-  broadcast = ip_addr_isbroadcast(ip_current_dest_addr(), ip_current_netif());
-
-  LWIP_DEBUGF(UDP_DEBUG, ("udp_input: received datagram of length %"U16_F"\n", p->tot_len));
-
-  /* convert src and dest ports to host byte order */
-  src = lwip_ntohs(udphdr->src);
-  dest = lwip_ntohs(udphdr->dest);
-
-  udp_debug_print(udphdr);
-
-  /* print the UDP source and destination */
-  LWIP_DEBUGF(UDP_DEBUG, ("udp ("));
-  ip_addr_debug_print(UDP_DEBUG, ip_current_dest_addr());
-  LWIP_DEBUGF(UDP_DEBUG, (", %"U16_F") <-- (", lwip_ntohs(udphdr->dest)));
-  ip_addr_debug_print(UDP_DEBUG, ip_current_src_addr());
-  LWIP_DEBUGF(UDP_DEBUG, (", %"U16_F")\n", lwip_ntohs(udphdr->src)));
-
-  pcb = NULL;
-  prev = NULL;
-  uncon_pcb = NULL;
-  /* Iterate through the UDP pcb list for a matching pcb.
-   * 'Perfect match' pcbs (connected to the remote port & ip address) are
-   * preferred. If no perfect match is found, the first unconnected pcb that
-   * matches the local port and ip address gets the datagram. */
-  for (pcb = udp_pcbs; pcb != NULL; pcb = pcb->next) {
-    /* print the PCB local and remote address */
-    LWIP_DEBUGF(UDP_DEBUG, ("pcb ("));
-    ip_addr_debug_print(UDP_DEBUG, &pcb->local_ip);
-    LWIP_DEBUGF(UDP_DEBUG, (", %"U16_F") <-- (", pcb->local_port));
-    ip_addr_debug_print(UDP_DEBUG, &pcb->remote_ip);
-    LWIP_DEBUGF(UDP_DEBUG, (", %"U16_F")\n", pcb->remote_port));
-
-    /* compare PCB local addr+port to UDP destination addr+port */
-    if ((pcb->local_port == dest) &&
-        (udp_input_local_match(pcb, inp, broadcast) != 0)) {
-      if (((pcb->flags & UDP_FLAGS_CONNECTED) == 0) &&
-          ((uncon_pcb == NULL)
-#if SO_REUSE
-          /* prefer specific IPs over cath-all */
-          || !ip_addr_isany(&pcb->local_ip)
-#endif /* SO_REUSE */
-          )) {
-        /* the first unconnected matching PCB */
-        uncon_pcb = pcb;
-      }
-
-      /* compare PCB remote addr+port to UDP source addr+port */
-      if ((pcb->remote_port == src) &&
-          (ip_addr_isany_val(pcb->remote_ip) ||
-          ip_addr_cmp(&pcb->remote_ip, ip_current_src_addr()))) {
-        /* the first fully matching PCB */
-        if (prev != NULL) {
-          /* move the pcb to the front of udp_pcbs so that is
-             found faster next time */
-          prev->next = pcb->next;
-          pcb->next = udp_pcbs;
-          udp_pcbs = pcb;
-        } else {
-          UDP_STATS_INC(udp.cachehit);
-        }
-        break;
-      }
-    }
-
-    prev = pcb;
-  }
-  /* no fully matching pcb found? then look for an unconnected pcb */
-  if (pcb == NULL) {
-    pcb = uncon_pcb;
-  }
-
-  /* Check checksum if this is a match or if it was directed at us. */
-  if (pcb != NULL) {
-    for_us = 1;
-  } else {
-#if LWIP_IPV6
-    if (ip_current_is_v6()) {
-      for_us = netif_get_ip6_addr_match(inp, ip6_current_dest_addr()) >= 0;
-    }
-#endif /* LWIP_IPV6 */
-#if LWIP_IPV4
-    if (!ip_current_is_v6()) {
-      for_us = ip4_addr_cmp(netif_ip4_addr(inp), ip4_current_dest_addr());
-    }
-#endif /* LWIP_IPV4 */
-  }
-
-  if (for_us) {
-    LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_input: calculating checksum\n"));
-#if CHECKSUM_CHECK_UDP
-    IF__NETIF_CHECKSUM_ENABLED(inp, CHECKSUM_CHECK_UDP) {
-#if LWIP_UDPLITE
-      if (ip_current_header_proto() == IP_PROTO_UDPLITE) {
-        /* Do the UDP Lite checksum */
-        u16_t chklen = lwip_ntohs(udphdr->len);
-        if (chklen < sizeof(struct udp_hdr)) {
-          if (chklen == 0) {
-            /* For UDP-Lite, checksum length of 0 means checksum
-               over the complete packet (See RFC 3828 chap. 3.1) */
-            chklen = p->tot_len;
-          } else {
-            /* At least the UDP-Lite header must be covered by the
-               checksum! (Again, see RFC 3828 chap. 3.1) */
-            goto chkerr;
-          }
-        }
-        if (ip_chksum_pseudo_partial(p, IP_PROTO_UDPLITE,
-                     p->tot_len, chklen,
-                     ip_current_src_addr(), ip_current_dest_addr()) != 0) {
-          goto chkerr;
-        }
-      } else
-#endif /* LWIP_UDPLITE */
-      {
-        if (udphdr->chksum != 0) {
-          if (ip_chksum_pseudo(p, IP_PROTO_UDP, p->tot_len,
-                               ip_current_src_addr(),
-                               ip_current_dest_addr()) != 0) {
-            goto chkerr;
-          }
-        }
-      }
-    }
-#endif /* CHECKSUM_CHECK_UDP */
-    if (pbuf_header(p, -UDP_HLEN)) {
-      /* Can we cope with this failing? Just assert for now */
-      LWIP_ASSERT("pbuf_header failed\n", 0);
-      UDP_STATS_INC(udp.drop);
-      MIB2_STATS_INC(mib2.udpinerrors);
-      pbuf_free(p);
-      goto end;
-    }
-
-    if (pcb != NULL) {
-      MIB2_STATS_INC(mib2.udpindatagrams);
-#if SO_REUSE && SO_REUSE_RXTOALL
-      if (ip_get_option(pcb, SOF_REUSEADDR) &&
-          (broadcast || ip_addr_ismulticast(ip_current_dest_addr()))) {
-        /* pass broadcast- or multicast packets to all multicast pcbs
-           if SOF_REUSEADDR is set on the first match */
-        struct udp_pcb *mpcb;
-        u8_t p_header_changed = 0;
-        s16_t hdrs_len = (s16_t)(ip_current_header_tot_len() + UDP_HLEN);
-        for (mpcb = udp_pcbs; mpcb != NULL; mpcb = mpcb->next) {
-          if (mpcb != pcb) {
-            /* compare PCB local addr+port to UDP destination addr+port */
-            if ((mpcb->local_port == dest) &&
-                (udp_input_local_match(mpcb, inp, broadcast) != 0)) {
-              /* pass a copy of the packet to all local matches */
-              if (mpcb->recv != NULL) {
-                struct pbuf *q;
-                /* for that, move payload to IP header again */
-                if (p_header_changed == 0) {
-                  pbuf_header_force(p, hdrs_len);
-                  p_header_changed = 1;
-                }
-                q = pbuf_alloc(PBUF_RAW, p->tot_len, PBUF_RAM);
-                if (q != NULL) {
-                  err_t err = pbuf_copy(q, p);
-                  if (err == ERR_OK) {
-                    /* move payload to UDP data */
-                    pbuf_header(q, -hdrs_len);
-                    mpcb->recv(mpcb->recv_arg, mpcb, q, ip_current_src_addr(), src);
-                  }
-                }
-              }
-            }
-          }
-        }
-        if (p_header_changed) {
-          /* and move payload to UDP data again */
-          pbuf_header(p, -hdrs_len);
-        }
-      }
-#endif /* SO_REUSE && SO_REUSE_RXTOALL */
-      /* callback */
-      if (pcb->recv != NULL) {
-        /* now the recv function is responsible for freeing p */
-        pcb->recv(pcb->recv_arg, pcb, p, ip_current_src_addr(), src);
-      } else {
-        /* no recv function registered? then we have to free the pbuf! */
-        pbuf_free(p);
-        goto end;
-      }
-    } else {
-      LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_input: not for us.\n"));
-
-#if LWIP_ICMP || LWIP_ICMP6
-      /* No match was found, send ICMP destination port unreachable unless
-         destination address was broadcast/multicast. */
-      if (!broadcast && !ip_addr_ismulticast(ip_current_dest_addr())) {
-        /* move payload pointer back to ip header */
-        pbuf_header_force(p, (s16_t)(ip_current_header_tot_len() + UDP_HLEN));
-        icmp_port_unreach(ip_current_is_v6(), p);
-      }
-#endif /* LWIP_ICMP || LWIP_ICMP6 */
-      UDP_STATS_INC(udp.proterr);
-      UDP_STATS_INC(udp.drop);
-      MIB2_STATS_INC(mib2.udpnoports);
-      pbuf_free(p);
-    }
-  } else {
-    pbuf_free(p);
-  }
-end:
-  PERF_STOP("udp_input");
-  return;
-#if CHECKSUM_CHECK_UDP
-chkerr:
-  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-              ("udp_input: UDP (or UDP Lite) datagram discarded due to failing checksum\n"));
-  UDP_STATS_INC(udp.chkerr);
-  UDP_STATS_INC(udp.drop);
-  MIB2_STATS_INC(mib2.udpinerrors);
-  pbuf_free(p);
-  PERF_STOP("udp_input");
-#endif /* CHECKSUM_CHECK_UDP */
-}
-
-/**
- * @ingroup udp_raw
- * Send data using UDP.
- *
- * @param pcb UDP PCB used to send the data.
- * @param p chain of pbuf's to be sent.
- *
- * The datagram will be sent to the current remote_ip & remote_port
- * stored in pcb. If the pcb is not bound to a port, it will
- * automatically be bound to a random port.
- *
- * @return lwIP error code.
- * - ERR_OK. Successful. No error occurred.
- * - ERR_MEM. Out of memory.
- * - ERR_RTE. Could not find route to destination address.
- * - ERR_VAL. No PCB or PCB is dual-stack
- * - More errors could be returned by lower protocol layers.
- *
- * @see udp_disconnect() udp_sendto()
- */
-err_t
-udp_send(struct udp_pcb *pcb, struct pbuf *p)
-{
-  if ((pcb == NULL) || IP_IS_ANY_TYPE_VAL(pcb->remote_ip)) {
-    return ERR_VAL;
-  }
-
-  /* send to the packet using remote ip and port stored in the pcb */
-  return udp_sendto(pcb, p, &pcb->remote_ip, pcb->remote_port);
-}
-
-#if LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP
-/** @ingroup udp_raw
- * Same as udp_send() but with checksum
- */
-err_t
-udp_send_chksum(struct udp_pcb *pcb, struct pbuf *p,
-                u8_t have_chksum, u16_t chksum)
-{
-  if ((pcb == NULL) || IP_IS_ANY_TYPE_VAL(pcb->remote_ip)) {
-    return ERR_VAL;
-  }
-
-  /* send to the packet using remote ip and port stored in the pcb */
-  return udp_sendto_chksum(pcb, p, &pcb->remote_ip, pcb->remote_port,
-    have_chksum, chksum);
-}
-#endif /* LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP */
-
-/**
- * @ingroup udp_raw
- * Send data to a specified address using UDP.
- *
- * @param pcb UDP PCB used to send the data.
- * @param p chain of pbuf's to be sent.
- * @param dst_ip Destination IP address.
- * @param dst_port Destination UDP port.
- *
- * dst_ip & dst_port are expected to be in the same byte order as in the pcb.
- *
- * If the PCB already has a remote address association, it will
- * be restored after the data is sent.
- *
- * @return lwIP error code (@see udp_send for possible error codes)
- *
- * @see udp_disconnect() udp_send()
- */
-err_t
-udp_sendto(struct udp_pcb *pcb, struct pbuf *p,
-  const ip_addr_t *dst_ip, u16_t dst_port)
-{
-#if LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP
-  return udp_sendto_chksum(pcb, p, dst_ip, dst_port, 0, 0);
-}
-
-/** @ingroup udp_raw
- * Same as udp_sendto(), but with checksum */
-err_t
-udp_sendto_chksum(struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *dst_ip,
-                  u16_t dst_port, u8_t have_chksum, u16_t chksum)
-{
-#endif /* LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP */
-  struct netif *netif;
-  const ip_addr_t *dst_ip_route = dst_ip;
-
-  if ((pcb == NULL) || (dst_ip == NULL) || !IP_ADDR_PCB_VERSION_MATCH(pcb, dst_ip)) {
-    return ERR_VAL;
-  }
-
-  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_send\n"));
-
-#if LWIP_IPV6 || (LWIP_IPV4 && LWIP_MULTICAST_TX_OPTIONS)
-  if (ip_addr_ismulticast(dst_ip_route)) {
-#if LWIP_IPV6
-    if (IP_IS_V6(dst_ip)) {
-      /* For multicast, find a netif based on source address. */
-      dst_ip_route = &pcb->local_ip;
-    } else
-#endif /* LWIP_IPV6 */
-    {
-#if LWIP_IPV4 && LWIP_MULTICAST_TX_OPTIONS
-      /* IPv4 does not use source-based routing by default, so we use an
-         administratively selected interface for multicast by default.
-         However, this can be overridden by setting an interface address
-         in pcb->multicast_ip that is used for routing. */
-      if (!ip_addr_isany_val(pcb->multicast_ip) &&
-          !ip4_addr_cmp(ip_2_ip4(&pcb->multicast_ip), IP4_ADDR_BROADCAST)) {
-        dst_ip_route = &pcb->multicast_ip;
-      }
-#endif /* LWIP_IPV4 && LWIP_MULTICAST_TX_OPTIONS */
-    }
-  }
-#endif /* LWIP_IPV6 || (LWIP_IPV4 && LWIP_MULTICAST_TX_OPTIONS) */
-
-  /* find the outgoing network interface for this packet */
-  if(IP_IS_ANY_TYPE_VAL(pcb->local_ip)) {
-    /* Don't call ip_route() with IP_ANY_TYPE */
-    netif = ip_route(IP46_ADDR_ANY(IP_GET_TYPE(dst_ip_route)), dst_ip_route);
-  } else {
-    netif = ip_route(&pcb->local_ip, dst_ip_route);
-  }
-
-  /* no outgoing network interface could be found? */
-  if (netif == NULL) {
-    LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, ("udp_send: No route to "));
-    ip_addr_debug_print(UDP_DEBUG | LWIP_DBG_LEVEL_SERIOUS, dst_ip);
-    LWIP_DEBUGF(UDP_DEBUG, ("\n"));
-    UDP_STATS_INC(udp.rterr);
-    return ERR_RTE;
-  }
-#if LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP
-  return udp_sendto_if_chksum(pcb, p, dst_ip, dst_port, netif, have_chksum, chksum);
-#else /* LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP */
-  return udp_sendto_if(pcb, p, dst_ip, dst_port, netif);
-#endif /* LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP */
-}
-
-/**
- * @ingroup udp_raw
- * Send data to a specified address using UDP.
- * The netif used for sending can be specified.
- *
- * This function exists mainly for DHCP, to be able to send UDP packets
- * on a netif that is still down.
- *
- * @param pcb UDP PCB used to send the data.
- * @param p chain of pbuf's to be sent.
- * @param dst_ip Destination IP address.
- * @param dst_port Destination UDP port.
- * @param netif the netif used for sending.
- *
- * dst_ip & dst_port are expected to be in the same byte order as in the pcb.
- *
- * @return lwIP error code (@see udp_send for possible error codes)
- *
- * @see udp_disconnect() udp_send()
- */
-err_t
-udp_sendto_if(struct udp_pcb *pcb, struct pbuf *p,
-  const ip_addr_t *dst_ip, u16_t dst_port, struct netif *netif)
-{
-#if LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP
-  return udp_sendto_if_chksum(pcb, p, dst_ip, dst_port, netif, 0, 0);
-}
-
-/** Same as udp_sendto_if(), but with checksum */
-err_t
-udp_sendto_if_chksum(struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *dst_ip,
-                     u16_t dst_port, struct netif *netif, u8_t have_chksum,
-                     u16_t chksum)
-{
-#endif /* LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP */
-  const ip_addr_t *src_ip;
-
-  if ((pcb == NULL) || (dst_ip == NULL) || !IP_ADDR_PCB_VERSION_MATCH(pcb, dst_ip)) {
-    return ERR_VAL;
-  }
-
-  /* PCB local address is IP_ANY_ADDR? */
-#if LWIP_IPV6
-  if (IP_IS_V6(dst_ip)) {
-    if (ip6_addr_isany(ip_2_ip6(&pcb->local_ip))) {
-      src_ip = ip6_select_source_address(netif, ip_2_ip6(dst_ip));
-      if (src_ip == NULL) {
-        /* No suitable source address was found. */
-        return ERR_RTE;
-      }
-    } else {
-      /* use UDP PCB local IPv6 address as source address, if still valid. */
-      if (netif_get_ip6_addr_match(netif, ip_2_ip6(&pcb->local_ip)) < 0) {
-        /* Address isn't valid anymore. */
-        return ERR_RTE;
-      }
-      src_ip = &pcb->local_ip;
-    }
-  }
-#endif /* LWIP_IPV6 */
-#if LWIP_IPV4 && LWIP_IPV6
-  else
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-#if LWIP_IPV4
-  if (ip4_addr_isany(ip_2_ip4(&pcb->local_ip)) ||
-      ip4_addr_ismulticast(ip_2_ip4(&pcb->local_ip))) {
-    /* if the local_ip is any or multicast
-     * use the outgoing network interface IP address as source address */
-    src_ip = netif_ip_addr4(netif);
-  } else {
-    /* check if UDP PCB local IP address is correct
-     * this could be an old address if netif->ip_addr has changed */
-    if (!ip4_addr_cmp(ip_2_ip4(&(pcb->local_ip)), netif_ip4_addr(netif))) {
-      /* local_ip doesn't match, drop the packet */
-      return ERR_RTE;
-    }
-    /* use UDP PCB local IP address as source address */
-    src_ip = &pcb->local_ip;
-  }
-#endif /* LWIP_IPV4 */
-#if LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP
-  return udp_sendto_if_src_chksum(pcb, p, dst_ip, dst_port, netif, have_chksum, chksum, src_ip);
-#else /* LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP */
-  return udp_sendto_if_src(pcb, p, dst_ip, dst_port, netif, src_ip);
-#endif /* LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP */
-}
-
-/** @ingroup udp_raw
- * Same as @ref udp_sendto_if, but with source address */
-err_t
-udp_sendto_if_src(struct udp_pcb *pcb, struct pbuf *p,
-  const ip_addr_t *dst_ip, u16_t dst_port, struct netif *netif, const ip_addr_t *src_ip)
-{
-#if LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP
-  return udp_sendto_if_src_chksum(pcb, p, dst_ip, dst_port, netif, 0, 0, src_ip);
-}
-
-/** Same as udp_sendto_if_src(), but with checksum */
-err_t
-udp_sendto_if_src_chksum(struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *dst_ip,
-                     u16_t dst_port, struct netif *netif, u8_t have_chksum,
-                     u16_t chksum, const ip_addr_t *src_ip)
-{
-#endif /* LWIP_CHECKSUM_ON_COPY && CHECKSUM_GEN_UDP */
-  struct udp_hdr *udphdr;
-  err_t err;
-  struct pbuf *q; /* q will be sent down the stack */
-  u8_t ip_proto;
-  u8_t ttl;
-
-  if ((pcb == NULL) || (dst_ip == NULL) || !IP_ADDR_PCB_VERSION_MATCH(pcb, src_ip) ||
-      !IP_ADDR_PCB_VERSION_MATCH(pcb, dst_ip)) {
-    return ERR_VAL;
-  }
-
-#if LWIP_IPV4 && IP_SOF_BROADCAST
-  /* broadcast filter? */
-  if (!ip_get_option(pcb, SOF_BROADCAST) &&
-#if LWIP_IPV6
-      IP_IS_V4(dst_ip) &&
-#endif /* LWIP_IPV6 */
-      ip_addr_isbroadcast(dst_ip, netif)) {
-    LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_LEVEL_SERIOUS,
-      ("udp_sendto_if: SOF_BROADCAST not enabled on pcb %p\n", (void *)pcb));
-    return ERR_VAL;
-  }
-#endif /* LWIP_IPV4 && IP_SOF_BROADCAST */
-
-  /* if the PCB is not yet bound to a port, bind it here */
-  if (pcb->local_port == 0) {
-    LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_send: not yet bound to a port, binding now\n"));
-    err = udp_bind(pcb, &pcb->local_ip, pcb->local_port);
-    if (err != ERR_OK) {
-      LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("udp_send: forced port bind failed\n"));
-      return err;
-    }
-  }
-
-  /* not enough space to add an UDP header to first pbuf in given p chain? */
-  if (pbuf_header(p, UDP_HLEN)) {
-    /* allocate header in a separate new pbuf */
-    q = pbuf_alloc(PBUF_IP, UDP_HLEN, PBUF_RAM);
-    /* new header pbuf could not be allocated? */
-    if (q == NULL) {
-      LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS, ("udp_send: could not allocate header\n"));
-      return ERR_MEM;
-    }
-    if (p->tot_len != 0) {
-      /* chain header q in front of given pbuf p (only if p contains data) */
-      pbuf_chain(q, p);
-    }
-    /* first pbuf q points to header pbuf */
-    LWIP_DEBUGF(UDP_DEBUG,
-                ("udp_send: added header pbuf %p before given pbuf %p\n", (void *)q, (void *)p));
-  } else {
-    /* adding space for header within p succeeded */
-    /* first pbuf q equals given pbuf */
-    q = p;
-    LWIP_DEBUGF(UDP_DEBUG, ("udp_send: added header in given pbuf %p\n", (void *)p));
-  }
-  LWIP_ASSERT("check that first pbuf can hold struct udp_hdr",
-              (q->len >= sizeof(struct udp_hdr)));
-  /* q now represents the packet to be sent */
-  udphdr = (struct udp_hdr *)q->payload;
-  udphdr->src = lwip_htons(pcb->local_port);
-  udphdr->dest = lwip_htons(dst_port);
-  /* in UDP, 0 checksum means 'no checksum' */
-  udphdr->chksum = 0x0000;
-
-  /* Multicast Loop? */
-#if (LWIP_IPV4 && LWIP_MULTICAST_TX_OPTIONS) || (LWIP_IPV6 && LWIP_IPV6_MLD)
-  if (((pcb->flags & UDP_FLAGS_MULTICAST_LOOP) != 0) && ip_addr_ismulticast(dst_ip)) {
-    q->flags |= PBUF_FLAG_MCASTLOOP;
-  }
-#endif /* (LWIP_IPV4 && LWIP_MULTICAST_TX_OPTIONS) || (LWIP_IPV6 && LWIP_IPV6_MLD) */
-
-  LWIP_DEBUGF(UDP_DEBUG, ("udp_send: sending datagram of length %"U16_F"\n", q->tot_len));
-
-#if LWIP_UDPLITE
-  /* UDP Lite protocol? */
-  if (pcb->flags & UDP_FLAGS_UDPLITE) {
-    u16_t chklen, chklen_hdr;
-    LWIP_DEBUGF(UDP_DEBUG, ("udp_send: UDP LITE packet length %"U16_F"\n", q->tot_len));
-    /* set UDP message length in UDP header */
-    chklen_hdr = chklen = pcb->chksum_len_tx;
-    if ((chklen < sizeof(struct udp_hdr)) || (chklen > q->tot_len)) {
-      if (chklen != 0) {
-        LWIP_DEBUGF(UDP_DEBUG, ("udp_send: UDP LITE pcb->chksum_len is illegal: %"U16_F"\n", chklen));
-      }
-      /* For UDP-Lite, checksum length of 0 means checksum
-         over the complete packet. (See RFC 3828 chap. 3.1)
-         At least the UDP-Lite header must be covered by the
-         checksum, therefore, if chksum_len has an illegal
-         value, we generate the checksum over the complete
-         packet to be safe. */
-      chklen_hdr = 0;
-      chklen = q->tot_len;
-    }
-    udphdr->len = lwip_htons(chklen_hdr);
-    /* calculate checksum */
-#if CHECKSUM_GEN_UDP
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_UDP) {
-#if LWIP_CHECKSUM_ON_COPY
-      if (have_chksum) {
-        chklen = UDP_HLEN;
-      }
-#endif /* LWIP_CHECKSUM_ON_COPY */
-      udphdr->chksum = ip_chksum_pseudo_partial(q, IP_PROTO_UDPLITE,
-        q->tot_len, chklen, src_ip, dst_ip);
-#if LWIP_CHECKSUM_ON_COPY
-      if (have_chksum) {
-        u32_t acc;
-        acc = udphdr->chksum + (u16_t)~(chksum);
-        udphdr->chksum = FOLD_U32T(acc);
-      }
-#endif /* LWIP_CHECKSUM_ON_COPY */
-
-      /* chksum zero must become 0xffff, as zero means 'no checksum' */
-      if (udphdr->chksum == 0x0000) {
-        udphdr->chksum = 0xffff;
-      }
-    }
-#endif /* CHECKSUM_GEN_UDP */
-
-    ip_proto = IP_PROTO_UDPLITE;
-  } else
-#endif /* LWIP_UDPLITE */
-  {      /* UDP */
-    LWIP_DEBUGF(UDP_DEBUG, ("udp_send: UDP packet length %"U16_F"\n", q->tot_len));
-    udphdr->len = lwip_htons(q->tot_len);
-    /* calculate checksum */
-#if CHECKSUM_GEN_UDP
-    IF__NETIF_CHECKSUM_ENABLED(netif, NETIF_CHECKSUM_GEN_UDP) {
-      /* Checksum is mandatory over IPv6. */
-      if (IP_IS_V6(dst_ip) || (pcb->flags & UDP_FLAGS_NOCHKSUM) == 0) {
-        u16_t udpchksum;
-#if LWIP_CHECKSUM_ON_COPY
-        if (have_chksum) {
-          u32_t acc;
-          udpchksum = ip_chksum_pseudo_partial(q, IP_PROTO_UDP,
-            q->tot_len, UDP_HLEN, src_ip, dst_ip);
-          acc = udpchksum + (u16_t)~(chksum);
-          udpchksum = FOLD_U32T(acc);
-        } else
-#endif /* LWIP_CHECKSUM_ON_COPY */
-        {
-          udpchksum = ip_chksum_pseudo(q, IP_PROTO_UDP, q->tot_len,
-            src_ip, dst_ip);
-        }
-
-        /* chksum zero must become 0xffff, as zero means 'no checksum' */
-        if (udpchksum == 0x0000) {
-          udpchksum = 0xffff;
-        }
-        udphdr->chksum = udpchksum;
-      }
-    }
-#endif /* CHECKSUM_GEN_UDP */
-    ip_proto = IP_PROTO_UDP;
-  }
-
-  /* Determine TTL to use */
-#if LWIP_MULTICAST_TX_OPTIONS
-  ttl = (ip_addr_ismulticast(dst_ip) ? udp_get_multicast_ttl(pcb) : pcb->ttl);
-#else /* LWIP_MULTICAST_TX_OPTIONS */
-  ttl = pcb->ttl;
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-
-  LWIP_DEBUGF(UDP_DEBUG, ("udp_send: UDP checksum 0x%04"X16_F"\n", udphdr->chksum));
-  LWIP_DEBUGF(UDP_DEBUG, ("udp_send: ip_output_if (,,,,0x%02"X16_F",)\n", (u16_t)ip_proto));
-  /* output to IP */
-  NETIF_SET_HWADDRHINT(netif, &(pcb->addr_hint));
-  err = ip_output_if_src(q, src_ip, dst_ip, ttl, pcb->tos, ip_proto, netif);
-  NETIF_SET_HWADDRHINT(netif, NULL);
-
-  /* @todo: must this be increased even if error occurred? */
-  MIB2_STATS_INC(mib2.udpoutdatagrams);
-
-  /* did we chain a separate header pbuf earlier? */
-  if (q != p) {
-    /* free the header pbuf */
-    pbuf_free(q);
-    q = NULL;
-    /* p is still referenced by the caller, and will live on */
-  }
-
-  UDP_STATS_INC(udp.xmit);
-  return err;
-}
-
-/**
- * @ingroup udp_raw
- * Bind an UDP PCB.
- *
- * @param pcb UDP PCB to be bound with a local address ipaddr and port.
- * @param ipaddr local IP address to bind with. Use IP4_ADDR_ANY to
- * bind to all local interfaces.
- * @param port local UDP port to bind with. Use 0 to automatically bind
- * to a random port between UDP_LOCAL_PORT_RANGE_START and
- * UDP_LOCAL_PORT_RANGE_END.
- *
- * ipaddr & port are expected to be in the same byte order as in the pcb.
- *
- * @return lwIP error code.
- * - ERR_OK. Successful. No error occurred.
- * - ERR_USE. The specified ipaddr and port are already bound to by
- * another UDP PCB.
- *
- * @see udp_disconnect()
- */
-err_t
-udp_bind(struct udp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port)
-{
-  struct udp_pcb *ipcb;
-  u8_t rebind;
-
-#if LWIP_IPV4
-  /* Don't propagate NULL pointer (IPv4 ANY) to subsequent functions */
-  if (ipaddr == NULL) {
-    ipaddr = IP4_ADDR_ANY;
-  }
-#endif /* LWIP_IPV4 */
-
-  /* still need to check for ipaddr == NULL in IPv6 only case */
-  if ((pcb == NULL) || (ipaddr == NULL)) {
-    return ERR_VAL;
-  }
-
-  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, ("udp_bind(ipaddr = "));
-  ip_addr_debug_print(UDP_DEBUG | LWIP_DBG_TRACE, ipaddr);
-  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE, (", port = %"U16_F")\n", port));
-
-  rebind = 0;
-  /* Check for double bind and rebind of the same pcb */
-  for (ipcb = udp_pcbs; ipcb != NULL; ipcb = ipcb->next) {
-    /* is this UDP PCB already on active list? */
-    if (pcb == ipcb) {
-      rebind = 1;
-      break;
-    }
-  }
-
-  /* no port specified? */
-  if (port == 0) {
-    port = udp_new_port();
-    if (port == 0) {
-      /* no more ports available in local range */
-      LWIP_DEBUGF(UDP_DEBUG, ("udp_bind: out of free UDP ports\n"));
-      return ERR_USE;
-    }
-  } else {
-    for (ipcb = udp_pcbs; ipcb != NULL; ipcb = ipcb->next) {
-      if (pcb != ipcb) {
-      /* By default, we don't allow to bind to a port that any other udp
-         PCB is already bound to, unless *all* PCBs with that port have tha
-         REUSEADDR flag set. */
-#if SO_REUSE
-        if (!ip_get_option(pcb, SOF_REUSEADDR) ||
-            !ip_get_option(ipcb, SOF_REUSEADDR))
-#endif /* SO_REUSE */
-        {
-          /* port matches that of PCB in list and REUSEADDR not set -> reject */
-          if ((ipcb->local_port == port) &&
-              /* IP address matches? */
-              ip_addr_cmp(&ipcb->local_ip, ipaddr)) {
-            /* other PCB already binds to this local IP and port */
-            LWIP_DEBUGF(UDP_DEBUG,
-                        ("udp_bind: local port %"U16_F" already bound by another pcb\n", port));
-            return ERR_USE;
-          }
-        }
-      }
-    }
-  }
-
-  ip_addr_set_ipaddr(&pcb->local_ip, ipaddr);
-
-  pcb->local_port = port;
-  mib2_udp_bind(pcb);
-  /* pcb not active yet? */
-  if (rebind == 0) {
-    /* place the PCB on the active list if not already there */
-    pcb->next = udp_pcbs;
-    udp_pcbs = pcb;
-  }
-  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("udp_bind: bound to "));
-  ip_addr_debug_print(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, &pcb->local_ip);
-  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, (", port %"U16_F")\n", pcb->local_port));
-  return ERR_OK;
-}
-
-/**
- * @ingroup udp_raw
- * Connect an UDP PCB.
- *
- * This will associate the UDP PCB with the remote address.
- *
- * @param pcb UDP PCB to be connected with remote address ipaddr and port.
- * @param ipaddr remote IP address to connect with.
- * @param port remote UDP port to connect with.
- *
- * @return lwIP error code
- *
- * ipaddr & port are expected to be in the same byte order as in the pcb.
- *
- * The udp pcb is bound to a random local port if not already bound.
- *
- * @see udp_disconnect()
- */
-err_t
-udp_connect(struct udp_pcb *pcb, const ip_addr_t *ipaddr, u16_t port)
-{
-  struct udp_pcb *ipcb;
-
-  if ((pcb == NULL) || (ipaddr == NULL)) {
-    return ERR_VAL;
-  }
-
-  if (pcb->local_port == 0) {
-    err_t err = udp_bind(pcb, &pcb->local_ip, pcb->local_port);
-    if (err != ERR_OK) {
-      return err;
-    }
-  }
-
-  ip_addr_set_ipaddr(&pcb->remote_ip, ipaddr);
-  pcb->remote_port = port;
-  pcb->flags |= UDP_FLAGS_CONNECTED;
-
-  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("udp_connect: connected to "));
-  ip_addr_debug_print(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE,
-                      &pcb->remote_ip);
-  LWIP_DEBUGF(UDP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, (", port %"U16_F")\n", pcb->remote_port));
-
-  /* Insert UDP PCB into the list of active UDP PCBs. */
-  for (ipcb = udp_pcbs; ipcb != NULL; ipcb = ipcb->next) {
-    if (pcb == ipcb) {
-      /* already on the list, just return */
-      return ERR_OK;
-    }
-  }
-  /* PCB not yet on the list, add PCB now */
-  pcb->next = udp_pcbs;
-  udp_pcbs = pcb;
-  return ERR_OK;
-}
-
-/**
- * @ingroup udp_raw
- * Disconnect a UDP PCB
- *
- * @param pcb the udp pcb to disconnect.
- */
-void
-udp_disconnect(struct udp_pcb *pcb)
-{
-  /* reset remote address association */
-#if LWIP_IPV4 && LWIP_IPV6
-  if (IP_IS_ANY_TYPE_VAL(pcb->local_ip)) {
-    ip_addr_copy(pcb->remote_ip, *IP_ANY_TYPE);
-  } else {
-#endif
-    ip_addr_set_any(IP_IS_V6_VAL(pcb->remote_ip), &pcb->remote_ip);
-#if LWIP_IPV4 && LWIP_IPV6
-  }
-#endif
-  pcb->remote_port = 0;
-  /* mark PCB as unconnected */
-  pcb->flags &= ~UDP_FLAGS_CONNECTED;
-}
-
-/**
- * @ingroup udp_raw
- * Set a receive callback for a UDP PCB
- *
- * This callback will be called when receiving a datagram for the pcb.
- *
- * @param pcb the pcb for which to set the recv callback
- * @param recv function pointer of the callback function
- * @param recv_arg additional argument to pass to the callback function
- */
-void
-udp_recv(struct udp_pcb *pcb, udp_recv_fn recv, void *recv_arg)
-{
-  /* remember recv() callback and user data */
-  pcb->recv = recv;
-  pcb->recv_arg = recv_arg;
-}
-
-/**
- * @ingroup udp_raw
- * Remove an UDP PCB.
- *
- * @param pcb UDP PCB to be removed. The PCB is removed from the list of
- * UDP PCB's and the data structure is freed from memory.
- *
- * @see udp_new()
- */
-void
-udp_remove(struct udp_pcb *pcb)
-{
-  struct udp_pcb *pcb2;
-
-  mib2_udp_unbind(pcb);
-  /* pcb to be removed is first in list? */
-  if (udp_pcbs == pcb) {
-    /* make list start at 2nd pcb */
-    udp_pcbs = udp_pcbs->next;
-    /* pcb not 1st in list */
-  } else {
-    for (pcb2 = udp_pcbs; pcb2 != NULL; pcb2 = pcb2->next) {
-      /* find pcb in udp_pcbs list */
-      if (pcb2->next != NULL && pcb2->next == pcb) {
-        /* remove pcb from list */
-        pcb2->next = pcb->next;
-        break;
-      }
-    }
-  }
-  memp_free(MEMP_UDP_PCB, pcb);
-}
-
-/**
- * @ingroup udp_raw
- * Create a UDP PCB.
- *
- * @return The UDP PCB which was created. NULL if the PCB data structure
- * could not be allocated.
- *
- * @see udp_remove()
- */
-struct udp_pcb *
-udp_new(void)
-{
-  struct udp_pcb *pcb;
-  pcb = (struct udp_pcb *)memp_malloc(MEMP_UDP_PCB);
-  /* could allocate UDP PCB? */
-  if (pcb != NULL) {
-    /* UDP Lite: by initializing to all zeroes, chksum_len is set to 0
-     * which means checksum is generated over the whole datagram per default
-     * (recommended as default by RFC 3828). */
-    /* initialize PCB to all zeroes */
-    memset(pcb, 0, sizeof(struct udp_pcb));
-    pcb->ttl = UDP_TTL;
-#if LWIP_MULTICAST_TX_OPTIONS
-    udp_set_multicast_ttl(pcb, UDP_TTL);
-#endif /* LWIP_MULTICAST_TX_OPTIONS */
-  }
-  return pcb;
-}
-
-/**
- * @ingroup udp_raw
- * Create a UDP PCB for specific IP type.
- *
- * @param type IP address type, see @ref lwip_ip_addr_type definitions.
- * If you want to listen to IPv4 and IPv6 (dual-stack) packets,
- * supply @ref IPADDR_TYPE_ANY as argument and bind to @ref IP_ANY_TYPE.
- * @return The UDP PCB which was created. NULL if the PCB data structure
- * could not be allocated.
- *
- * @see udp_remove()
- */
-struct udp_pcb *
-udp_new_ip_type(u8_t type)
-{
-  struct udp_pcb *pcb;
-  pcb = udp_new();
-#if LWIP_IPV4 && LWIP_IPV6
-  if (pcb != NULL) {
-    IP_SET_TYPE_VAL(pcb->local_ip,  type);
-    IP_SET_TYPE_VAL(pcb->remote_ip, type);
-  }
-#else
-  LWIP_UNUSED_ARG(type);
-#endif /* LWIP_IPV4 && LWIP_IPV6 */
-  return pcb;
-}
-
-/** This function is called from netif.c when address is changed
- *
- * @param old_addr IP address of the netif before change
- * @param new_addr IP address of the netif after change
- */
-void udp_netif_ip_addr_changed(const ip_addr_t* old_addr, const ip_addr_t* new_addr)
-{
-  struct udp_pcb* upcb;
-
-  if (!ip_addr_isany(old_addr) && !ip_addr_isany(new_addr)) {
-    for (upcb = udp_pcbs; upcb != NULL; upcb = upcb->next) {
-      /* PCB bound to current local interface address? */
-      if (ip_addr_cmp(&upcb->local_ip, old_addr)) {
-        /* The PCB is bound to the old ipaddr and
-         * is set to bound to the new one instead */
-        ip_addr_copy(upcb->local_ip, *new_addr);
-      }
-    }
-  }
-}
-
-#if UDP_DEBUG
-/**
- * Print UDP header information for debug purposes.
- *
- * @param udphdr pointer to the udp header in memory.
- */
-void
-udp_debug_print(struct udp_hdr *udphdr)
-{
-  LWIP_DEBUGF(UDP_DEBUG, ("UDP header:\n"));
-  LWIP_DEBUGF(UDP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(UDP_DEBUG, ("|     %5"U16_F"     |     %5"U16_F"     | (src port, dest port)\n",
-                          lwip_ntohs(udphdr->src), lwip_ntohs(udphdr->dest)));
-  LWIP_DEBUGF(UDP_DEBUG, ("+-------------------------------+\n"));
-  LWIP_DEBUGF(UDP_DEBUG, ("|     %5"U16_F"     |     0x%04"X16_F"    | (len, chksum)\n",
-                          lwip_ntohs(udphdr->len), lwip_ntohs(udphdr->chksum)));
-  LWIP_DEBUGF(UDP_DEBUG, ("+-------------------------------+\n"));
-}
-#endif /* UDP_DEBUG */
-
-#endif /* LWIP_UDP */
diff --git a/sys/net/net/Makefile b/sys/net/net/Makefile
deleted file mode 100644
index a3489aa..0000000
--- a/sys/net/net/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#  Objects
-OBJS = sys_arch.o init.o shell.o
-#shell.o udpecho.o init.o sys_arch.o bot.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} -DNOBOOL-I../../include -S -o $@ $<
-.c.o:
-	$(CC) ${CFLAGS} -I../../include -c -o $@ $<
-.c.s:
-	$(CC) ${CFLAGS} -I../../include -S -o $@ $<
-.S.o:
-	$(CC) ${CFLAGS} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/net/net/bot.c b/sys/net/net/bot.c
deleted file mode 100644
index eea161e..0000000
--- a/sys/net/net/bot.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. 
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Adam Dunkels <adam@sics.se>
- *
- * $Id: bot.c 54 2016-01-11 01:29:55Z reddawg $
- */
-
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <string.h>
-
-#include "net/mem.h"
-#include "net/debug.h"
-#include "net/def.h"
-#include "net/api.h"
-#include "net/stats.h"
-
-/* UBU
-static void sendstr(const char *str, struct netconn *conn) {
-  netconn_write(conn, (void *)str, strlen(str), NETCONN_NOCOPY);
-  }
-
-static void botErr() {
-  kprintf("ERRROR\n");
-  }
-*/
-
-static void bot_thread(void *arg) {
-  struct netconn *conn;
-  int len;
-  char bufr[1500];
-  struct ip_addr ipaddr;
-  struct netbuf *buf = 0x0;
-  
-  IP4_ADDR(&ipaddr,216,152,77,10);
-  conn = netconn_new(NETCONN_TCP);
-  kprintf("Starting UbixOS Bot\n");
-  while(1) {
-    kprintf("[A");
-    kprintf("\n\nCONNECT: [%i]\n",netconn_connect(conn,&ipaddr,6667));
-    kprintf("B]");
-    while (1);
-    if (buf != NULL) {
-      buf = netconn_recv(conn);
-      netbuf_copy(buf, bufr, 1024);
-      len = netbuf_len(buf);
-      netbuf_delete(buf);
-      bufr[len-2] = '\0';
-      kprintf("Bufr: [%s:%i]",bufr,len);
-      //sendstr("BLah\n",conn);
-      }
-    }
-  }
-
-void bot_init(void)     {
-  sys_thread_new(bot_thread, NULL);
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/net/net/init.c b/sys/net/net/init.c
deleted file mode 100644
index 56139b5..0000000
--- a/sys/net/net/init.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: init.c 54 2016-01-11 01:29:55Z reddawg $
-
- *****************************************************************************************/
-
-#include <sys/types.h>
-#include <ubixos/sched.h>
-#include <ubixos/endtask.h>
-
-#include <net/sys.h>
-#include <net/mem.h>
-#include <net/memp.h>
-#include <net/tcpip.h>
-#include <net/ip_addr.h>
-
-#include <netif/ethernet.h>
-#include <netif/ethernetif.h>
-
-#include <ubixos/exec.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-
-void lnc_thread();
-void shell_thread(void *);
-
-struct netif lnc_netif;
-
-int net_init() {
-  ip_addr_t ipaddr, netmask, gw;
-
-  tcpip_init(NULL, NULL);
-
-  IP4_ADDR(&gw, 10, 50, 0, 1);
-  IP4_ADDR(&ipaddr, 10, 50, 0, 7);
-  IP4_ADDR(&netmask, 255, 255, 0, 0);
-
-  netif_add(&lnc_netif, &ipaddr, &netmask, &gw, NULL, ethernetif_init, tcpip_input);
-  netif_set_link_up(&lnc_netif);
-  netif_set_up(&lnc_netif);
-
-  netif_set_default(&lnc_netif);
-  sys_thread_new("lncThread", (void *) lnc_thread, 0x0, 0x1000, 0x0);
-  sys_thread_new("shellThread", (void *) shell_thread, 0x0, 0x1000, 0x0);
-
-  return(0x0);
-}
diff --git a/sys/net/net/shell.c b/sys/net/net/shell.c
deleted file mode 100644
index eddaa8b..0000000
--- a/sys/net/net/shell.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. 
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Adam Dunkels <adam@sics.se>
- *
- * $Id: shell.c 54 2016-01-11 01:29:55Z reddawg $
- */
-
-#include <lib/kmalloc.h>
-#include <ubixos/fork.h>
-#include <string.h>
-
-#include "net/mem.h"
-#include "net/debug.h"
-#include "net/def.h"
-#include <net/api.h>
-#include "net/stats.h"
-
-#include "lib/kprintf.h"
-char *buffer = 0x0;
-
-#define ESUCCESS 0
-#define ESYNTAX -1
-#define ETOOFEW -2
-#define ETOOMANY -3
-#define ECLOSED -4
-
-#define NCONNS 10
-// UBU static struct netconn *conns[NCONNS];
-
-static void sendstr(const char *str, struct netconn *conn) {
-  netconn_write(conn, (void *) str, strlen(str), NETCONN_COPY);
-}
-
-static void prompt(struct netconn *conn) {
-  sendstr("uBixCube:@sys> ", conn);
-}
-
-static void shell_main(struct netconn *conn) {
-  struct netbuf *buf = 0x0;
-  uInt32 len;
-  uInt32 err = 0;
-  // UBU int i;
-  // UBU char bufr[1500];
-  buf = kmalloc(1500);
-  prompt(conn);
-  while (1) {
-    err = netconn_recv(conn, &buf);
-    if (buf != 0x0)
-      netbuf_copy(buf, buffer, 1024);
-    len = netbuf_len(buf);
-    netbuf_delete(buf);
-    buffer[len - 2] = '\0';
-    if (!strcmp(buffer, "quit")) {
-      netconn_close(conn);
-      break;
-    }
-    else if (!strcmp(buffer, "ls")) {
-      sendstr("no\nfiles\nhere\n", conn);
-    }
-    else if (!strcmp(buffer, "uname")) {
-      sendstr("UbixOS v1.0 reddawg@devel.ubixos.com:/ubix.elf\n", conn);
-    }
-    prompt(conn);
-  }
-}
-
-void shell_thread(void *arg) {
-  struct netconn *conn = 0x0, *newconn = 0x0;
-
-  buffer = (char *) kmalloc(1024);
-
-  conn = netconn_new(NETCONN_TCP);
-
-  netconn_bind(conn, IP4_ADDR_ANY, 23);
-  netconn_listen(conn);
-
-  while (1) {
-    netconn_accept(conn,&newconn);
-    shell_main(newconn);
-    //netconn_delete(newconn);
-  }
-}
diff --git a/sys/net/net/shell.h b/sys/net/net/shell.h
deleted file mode 100644
index c68f278..0000000
--- a/sys/net/net/shell.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. 
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Adam Dunkels <adam@sics.se>
- *
- * $Id: shell.h 54 2016-01-11 01:29:55Z reddawg $
- */
-#ifndef __SHELL_H__
-#define __SHELL_H__
-
-void shell_init(void);
-
-#endif /* __SHELL_H__ */
diff --git a/sys/net/net/sys_arch.c b/sys/net/net/sys_arch.c
deleted file mode 100644
index 63890bc..0000000
--- a/sys/net/net/sys_arch.c
+++ /dev/null
@@ -1,482 +0,0 @@
-#include <sys/types.h>
-#include <ubixos/sched.h>
-#include <ubixos/ubthread.h>
-#include <ubixos/kpanic.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-
-#include "net/debug.h"
-#include "net/sys.h"
-#include "net/opt.h"
-#include "net/stats.h"
-#include <net/arch/sys_arch.h>
-
-#include <ubixos/spinlock.h>
-
-/* Get Definitions For These */
-#define ERR_NOT_READY 0
-#define ERR_TIMED_OUT 1
-#define INFINITE_TIME 0
-
-static struct timeval starttime;
-static struct spinLock netThreadSpinlock = SPIN_LOCK_INITIALIZER;
-static struct sys_thread *threads = 0x0;
-
-static uint32_t cond_wait(ubthread_cond_t *cond, ubthread_mutex_t *mutex, uint32_t timeout);
-static void sys_sem_free_internal(struct sys_sem *sem);
-
-/* sys_arch layer initializer */
-void sys_init() {
-  struct timezone tz;
-  gettimeofday(&starttime, &tz);
-}
-
-static struct sys_sem *sys_sem_new_internal(uint8_t count) {
-  struct sys_sem *sem;
-
-  sem = (struct sys_sem *) kmalloc(sizeof(struct sys_sem));
-  if (sem != NULL) {
-    sem->signaled = count;
-    ubthread_cond_init(&(sem->cond), NULL);
-    ubthread_mutex_init(&(sem->mutex), NULL);
-  }
-  return sem;
-}
-
-/* Create a new semaphore */
-err_t sys_sem_new(sys_sem_t **sem, uint8_t count) {
-  sys_sem_t *newSem = 0x0;
-
-  newSem = kmalloc(sizeof(struct sys_sem));
-  newSem->signaled = count;
-
-  ubthread_cond_init(&(newSem->cond), NULL);
-  ubthread_mutex_init(&(newSem->mutex), NULL);
-
-  if (*sem != 0)
-    kpanic("UH OH!");
-
-  *sem = newSem;
-
-  return (ERR_OK);
-}
-
-/* Deallocate semaphore */
-void sys_sem_free(struct sys_sem **sem) {
-  if ((sem != NULL) && (*sem != SYS_SEM_NULL)) {
-    sys_sem_free_internal(*sem);
-  }
-}
-
-/* Signal semaphore */
-void sys_sem_signal(struct sys_sem **s) {
-  struct sys_sem *sem;
-  LWIP_ASSERT("invalid sem", (s != NULL) && (*s != NULL));
-  sem = *s;
-
-  ubthread_mutex_lock(&(sem->mutex));
-  sem->signaled++;
-
-  if (sem->signaled > 1) {
-    sem->signaled = 1;
-  }
-
-  ubthread_cond_broadcast(&(sem->cond));
-  ubthread_mutex_unlock(&(sem->mutex));
-}
-
-static void sys_sem_free_internal(struct sys_sem *sem) {
-  ubthread_cond_destroy(&(sem->cond));
-  ubthread_mutex_destroy(&(sem->mutex));
-  kfree(sem);
-}
-
-uint32_t sys_arch_sem_wait(struct sys_sem **s, uint32_t timeout) {
-  uint32_t time_needed = 0;
-  struct sys_sem *sem;
-  LWIP_ASSERT("invalid sem", (s != NULL) && (*s != NULL));
-  sem = *s;
-
-  ubthread_mutex_lock(&(sem->mutex));
-  while (sem->signaled <= 0) {
-    if (timeout > 0) {
-      time_needed = cond_wait(&(sem->cond), &(sem->mutex), timeout);
-
-      if (time_needed == SYS_ARCH_TIMEOUT) {
-        ubthread_mutex_unlock(&(sem->mutex));
-        return SYS_ARCH_TIMEOUT;
-      }
-      /*      ubthread_mutex_unlock(&(sem->mutex));
-       return time_needed; */
-    }
-    else {
-      cond_wait(&(sem->cond), &(sem->mutex), 0);
-    }
-  }
-  sem->signaled--;
-  ubthread_mutex_unlock(&(sem->mutex));
-  return time_needed;
-}
-
-int sys_sem_valid(struct sys_sem **s) {
-  struct sys_sem *sem = *s;
-  if (sem == 0)
-    return 0;
-  else
-    return 1;
-}
-
-void sys_sem_set_invalid(struct sys_sem **s) {
-  *s = 0x0;
-}
-
-err_t sys_mutex_new(sys_mutex_t *mutex) {
-  ubthread_mutex_init(&(mutex->mutex), NULL);
-  return ERR_OK;
-}
-
-void sys_mutex_free(sys_mutex_t *mutex) {
-  ubthread_mutex_destroy(&(mutex->mutex));
-}
-
-void sys_mutex_lock(sys_mutex_t *mutex) {
-  ubthread_mutex_lock(&(mutex->mutex));
-}
-
-void sys_mutex_unlock(sys_mutex_t *mutex) {
-  ubthread_mutex_unlock(&(mutex->mutex));
-}
-
-err_t sys_mbox_new(struct sys_mbox **mb, int size) {
-  struct sys_mbox *mbox = 0x0;
-  LWIP_UNUSED_ARG(size);
-
-  mbox = (struct sys_mbox *) kmalloc(sizeof(struct sys_mbox));
-
-  if (mbox == NULL)
-    return (ERR_MEM);
-
-  mbox->head = 0;
-  mbox->tail = 0;
-  mbox->wait_send = 0;
-  //mbox->size = size;
-
-  //Pass By Reference It's a Pointer
-  //ubthread_mutex_init(&mbox->lock, NULL);
-
-  //Pass By Reference It's a Pointer
-  sys_sem_new(&mbox->lock, 1);
-  sys_sem_new(&mbox->empty, 0);
-  sys_sem_new(&mbox->full, 0);
-
-  //mbox->queue = kmalloc(sizeof(void *) * size);//calloc(size, sizeof(void *));
-
-  //if (!mbox->queue) {
-  //  return ERR_MEM;
-  //}
-
-  *mb = mbox;
-  return (ERR_OK);
-}
-
-void sys_mbox_free(struct sys_mbox **mb) {
-  if ((mb != NULL) && (*mb != SYS_MBOX_NULL)) {
-    struct sys_mbox *mbox = *mb;
-    sys_arch_sem_wait(&mbox->lock, 0);
-
-    sys_sem_free_internal(mbox->full);
-    sys_sem_free_internal(mbox->empty);
-    sys_sem_free_internal(mbox->lock);
-    mbox->full = mbox->empty = mbox->lock = NULL;
-    kfree(mbox);
-  }
-  //kfree(mbox->queue);
-  //mbox->queue = NULL;
-}
-
-void sys_mbox_post(struct sys_mbox **mb, void *msg) {
-  uint8_t head;
-  struct sys_mbox *mbox;
-  LWIP_ASSERT("invalid mbox", (mb != NULL) && (*mb != NULL));
-  mbox = *mb;
-
-  sys_arch_sem_wait(&mbox->lock, 0);
-
-  LWIP_DEBUGF(SYS_DEBUG, ("sys_mbox_post: mbox %p msg %p\n", (void *)mbox, (void *)msg));
-
-  while ((mbox->tail + 1) >= (mbox->head + SYS_MBOX_SIZE)) {
-    mbox->wait_send++;
-    sys_sem_signal(&mbox->lock);
-    sys_arch_sem_wait(&mbox->empty, 0);
-    sys_arch_sem_wait(&mbox->lock, 0);
-    mbox->wait_send--;
-  }
-
-  mbox->msgs[mbox->tail % SYS_MBOX_SIZE] = msg;
-
-  if (mbox->tail == mbox->head) {
-    head = 1;
-  }
-  else {
-    head = 0;
-  }
-
-  mbox->tail++;
-
-  if (head) {
-    sys_sem_signal(&mbox->full);
-  }
-
-  sys_sem_signal(&mbox->lock);
-}
-
-err_t sys_mbox_trypost(struct sys_mbox **mb, void *msg) {
-  uint8_t head;
-  struct sys_mbox *mbox;
-  LWIP_ASSERT("invalid mbox", (mb != NULL) && (*mb != NULL));
-  mbox = *mb;
-
-  sys_arch_sem_wait(&mbox->lock, 0);
-
-  LWIP_DEBUGF(SYS_DEBUG, ("sys_mbox_trypost: mbox %p msg %p\n",
-      (void *)mbox, (void *)msg));
-
-  if ((mbox->tail + 1) >= (mbox->head + SYS_MBOX_SIZE)) {
-    sys_sem_signal(&mbox->lock);
-    return ERR_MEM;
-  }
-
-  mbox->msgs[mbox->tail % SYS_MBOX_SIZE] = msg;
-
-  if (mbox->tail == mbox->head) {
-    head = 1;
-  }
-  else {
-    head = 0;
-  }
-
-  mbox->tail++;
-
-  if (head) {
-    sys_sem_signal(&mbox->full);
-  }
-
-  sys_sem_signal(&mbox->lock);
-
-  return ERR_OK;
-}
-
-uint32_t sys_arch_mbox_fetch(struct sys_mbox **mb, void **msg, uint32_t timeout) {
-  uint32_t time_needed = 0x0;
-  struct sys_mbox *mbox = 0x0;
-
-  LWIP_ASSERT("invalid mbox", (mb != NULL) && (*mb != NULL));
-  mbox = *mb;
-
-  /* The mutex lock is quick so we don't bother with the timeout
-   stuff here. */
-  sys_arch_sem_wait(&mbox->lock, 0);
-
-  while (mbox->head == mbox->tail) {
-    sys_sem_signal(&mbox->lock);
-
-    /* We block while waiting for a mail to arrive in the mailbox. We
-     must be prepared to timeout. */
-    if (timeout != 0) {
-      time_needed = sys_arch_sem_wait(&mbox->full, timeout);
-
-      if (time_needed == SYS_ARCH_TIMEOUT) {
-        return SYS_ARCH_TIMEOUT;
-      }
-    }
-    else {
-      sys_arch_sem_wait(&mbox->full, 0);
-    }
-
-    sys_arch_sem_wait(&mbox->lock, 0);
-  }
-
-  if (msg != NULL) {
-    LWIP_DEBUGF(SYS_DEBUG, ("sys_mbox_fetch: mbox %p msg %p\n", (void *)mbox, *msg));
-    *msg = mbox->msgs[mbox->head % SYS_MBOX_SIZE];
-  }
-  else {
-    LWIP_DEBUGF(SYS_DEBUG, ("sys_mbox_fetch: mbox %p, null msg\n", (void *)mbox));
-  }
-
-  mbox->head++;
-
-  if (mbox->wait_send) {
-    sys_sem_signal(&mbox->empty);
-  }
-
-  sys_sem_signal(&mbox->lock);
-
-  return time_needed;
-}
-
-uint32_t sys_arch_mbox_tryfetch(struct sys_mbox **mb, void **msg) {
-  struct sys_mbox *mbox;
-  LWIP_ASSERT("invalid mbox", (mb != NULL) && (*mb != NULL));
-  mbox = *mb;
-
-  sys_arch_sem_wait(&mbox->lock, 0);
-
-  if (mbox->head == mbox->tail) {
-    sys_sem_signal(&mbox->lock);
-    return SYS_MBOX_EMPTY;
-  }
-
-  if (msg != NULL) {
-    LWIP_DEBUGF(SYS_DEBUG, ("sys_mbox_tryfetch: mbox %p msg %p\n", (void *)mbox, *msg));
-    *msg = mbox->msgs[mbox->head % SYS_MBOX_SIZE];
-  }
-  else {
-    LWIP_DEBUGF(SYS_DEBUG, ("sys_mbox_tryfetch: mbox %p, null msg\n", (void *)mbox));
-  }
-
-  mbox->head++;
-
-  if (mbox->wait_send) {
-    sys_sem_signal(&mbox->empty);
-  }
-
-  sys_sem_signal(&mbox->lock);
-
-  return 0;
-}
-
-int sys_mbox_valid(struct sys_mbox **mb) {
-  struct sys_mbox *mbox = *mb;
-  if (mbox == NULL)
-    return(0);
-  else
-    return(1);
-}
-
-void sys_mbox_set_invalid(struct sys_mbox **mb) {
-  *mb = 0x0;
-}
-
-sys_thread_t sys_thread_new(const char *name, void (*thread)(void *arg), void *arg, int stacksize, int prio) {
-  //void sys_thread_new(void (*function)(void), void *arg) {
-  struct sys_thread *new_thread = 0x0;
-  //struct thread_start_param *thread_param;
-  prio = 1;
-  LWIP_ASSERT("Non-positive prio", prio > 0);
-  LWIP_ASSERT("Prio is too big", prio < 20);
-
-  new_thread = kmalloc(sizeof(struct sys_thread));
-  memset(new_thread, 0x0, sizeof(struct sys_thread));
-
-  spinLock(&netThreadSpinlock);
-  new_thread->next = threads;
-  new_thread->timeouts.next = NULL;
-  new_thread->ubthread = 0x0;
-  threads = new_thread;
-  spinUnlock(&netThreadSpinlock);
-
-  /*
-   thread_param = kmalloc(sizeof(struct thread_start_param));
-
-   thread_param->function = function;
-   thread_param->arg = arg;
-   thread_param->thread = thread;
-   */
-  //execThread((void *)function,0x0,0x0);
-  if (ubthread_create(&new_thread->ubthread, 0x0, (void *) (thread), arg) != 0x0) {
-    kpanic("sys_thread_new: ubthread_create");
-  }
-  return (new_thread);
-}
-
-/* OLD */
-
-struct thread_start_param {
-  struct sys_thread *thread;
-  void (*function)(void *);
-  void *arg;
-};
-
-static uint32_t cond_wait(ubthread_cond_t *cond, ubthread_mutex_t *mutex, uint32_t timeout) {
-  unsigned int tdiff;
-  unsigned long sec, usec;
-  struct timeval rtime1, rtime2;
-  struct timespec ts;
-  struct timezone tz;
-  int retval;
-
-  if (timeout > 0) {
-    /* Get a timestamp and add the timeout value. */
-    gettimeofday(&rtime1, &tz);
-    sec = rtime1.tv_sec;
-    usec = rtime1.tv_usec;
-    usec += timeout % 1000 * 1000;
-    sec += (int) (timeout / 1000) + (int) (usec / 1000000);
-    usec = usec % 1000000;
-    ts.tv_nsec = usec * 1000;
-    ts.tv_sec = sec;
-
-    retval = ubthread_cond_timedwait(cond, mutex, &ts);
-    if (retval == ETIMEDOUT) {
-      return 0;
-    }
-    else {
-      /* Calculate for how long we waited for the cond. */
-      gettimeofday(&rtime2, &tz);
-      tdiff = (rtime2.tv_sec - rtime1.tv_sec) * 1000 + (rtime2.tv_usec - rtime1.tv_usec) / 1000;
-      if (tdiff == 0) {
-        return 1;
-      }
-      return tdiff;
-    }
-  }
-  else {
-    ubthread_cond_wait(cond, mutex);
-    return 0;
-  }
-}
-
-static struct sys_thread *current_thread(void) {
-  struct sys_thread *st;
-  kTask_t *pt;
-  pt = ubthread_self();
-  spinLock(&netThreadSpinlock);
-  for (st = threads; st != NULL; st = st->next) {
-    if (st->ubthread == pt) {
-      spinUnlock(&netThreadSpinlock);
-      return st;
-    }
-  }
-  spinUnlock(&netThreadSpinlock);
-  kprintf("sys: current_thread: could not find current thread!\n");
-  kprintf("This is due to a race condition in the LinuxThreads\n");
-  kprintf("ubthreads implementation. Start the program again.\n");
-
-  kpanic("ABORT");
-  return (0x0);
-}
-
-struct sys_timeouts *sys_arch_timeouts(void) {
-  struct sys_thread *thread;
-  thread = current_thread();
-  return (&thread->timeouts);
-}
-
-unsigned long sys_unix_now() {
-  struct timeval tv;
-  struct timezone tz;
-  long sec, usec;
-  unsigned long msec;
-
-  gettimeofday(&tv, &tz);
-
-  sec = tv.tv_sec - starttime.tv_sec;
-  usec = tv.tv_usec - starttime.tv_usec;
-  msec = sec * 1000 + usec / 1000;
-  return msec;
-}
-
-uint32_t sys_now() {
-  return (sys_unix_now());
-}
diff --git a/sys/net/net/udpecho.c b/sys/net/net/udpecho.c
deleted file mode 100644
index 228717a..0000000
--- a/sys/net/net/udpecho.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. 
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Adam Dunkels <adam@sics.se>
- *
- * $Id: udpecho.c 54 2016-01-11 01:29:55Z reddawg $
- */
-
-#include <sys/types.h>
-#include <lib/kprintf.h>
-
-#include "net/api.h"
-#include "net/sys.h"
-
-/*-----------------------------------------------------------------------------------*/
-void udpecho_thread(void *arg) {
-  static struct netconn *conn;
-  static struct netbuf *buf;
-  static struct ip_addr *addr;
-  static unsigned short port;
-  char buffer[4096];
-
-  conn = netconn_new(NETCONN_UDP);
-  netconn_bind(conn, NULL, 7);
-
-  while (1) {
-    buf = netconn_recv(conn);
-    addr = netbuf_fromaddr(buf);
-    port = netbuf_fromport(buf);
-    netconn_connect(conn, addr, port);
-    netconn_send(conn, buf);
-    netbuf_copy(buf, buffer, sizeof(buffer));
-    netbuf_delete(buf);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-void udpecho_init(void) {
-  sys_thread_new(udpecho_thread, NULL);
-}
diff --git a/sys/net/net/udpecho.h b/sys/net/net/udpecho.h
deleted file mode 100644
index af8b424..0000000
--- a/sys/net/net/udpecho.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. 
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Adam Dunkels <adam@sics.se>
- *
- * $Id: udpecho.h 54 2016-01-11 01:29:55Z reddawg $
- */
-#ifndef __UDPECHO_H__
-#define __UDPECHO_H__
-
-void udpecho_init(void);
-
-#endif /* __UDPECHO_H__ */
diff --git a/sys/net/netif/Makefile b/sys/net/netif/Makefile
deleted file mode 100755
index d90ab2f..0000000
--- a/sys/net/netif/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../../Makefile.incl
-include ../../Makefile.incl
-
-#  Objects
-OBJS = ethernet.o ethernetif.o
-# loopif.o arp.o tcpdump.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} -DNOBOOL -I../../include -S -o $@ $<
-.c.o:
-	$(CC) ${CFLAGS} -I../../include -c -o $@ $<
-.c.s:
-	$(CC) ${CFLAGS} -I../../include -S -o $@ $<
-.S.o:
-	$(CC) ${CFLAGS} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/net/netif/arp.c b/sys/net/netif/arp.c
deleted file mode 100644
index 31b87e2..0000000
--- a/sys/net/netif/arp.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. 
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Adam Dunkels <adam@sics.se>
- *
- * $Id: arp.c 54 2016-01-11 01:29:55Z reddawg $
- *
- */
-
-#include <sys/types.h>
-#include <lib/kprintf.h>
-
-#include "net/debug.h"
-#include "net/ipv4/inet.h"
-#include "netif/arp.h"
-#include "net/ipv4/ip.h"
-
-
-#define ARP_MAXAGE 2  /* 120 * 10 seconds = 20 minutes. */
-
-#define HWTYPE_ETHERNET 1
-
-#define ARP_REQUEST 1
-#define ARP_REPLY 2
-
-/* MUST be compiled with "pack structs" or equivalent! */
-PACK_STRUCT_BEGIN
-struct arp_hdr {
-  PACK_STRUCT_FIELD(struct eth_hdr ethhdr);
-  PACK_STRUCT_FIELD(uInt16 hwtype);
-  PACK_STRUCT_FIELD(uInt16 proto);
-  PACK_STRUCT_FIELD(uInt16 _hwlen_protolen);
-  PACK_STRUCT_FIELD(uInt16 opcode);
-  PACK_STRUCT_FIELD(struct eth_addr shwaddr);
-  PACK_STRUCT_FIELD(struct ip_addr sipaddr);
-  PACK_STRUCT_FIELD(struct eth_addr dhwaddr);
-  PACK_STRUCT_FIELD(struct ip_addr dipaddr);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-
-#define ARPH_HWLEN(hdr) (NTOHS((hdr)->_hwlen_protolen) >> 8)
-#define ARPH_PROTOLEN(hdr) (NTOHS((hdr)->_hwlen_protolen) & 0xff)
-
-
-#define ARPH_HWLEN_SET(hdr, len) (hdr)->_hwlen_protolen = HTONS(ARPH_PROTOLEN(hdr) | ((len) << 8))
-#define ARPH_PROTOLEN_SET(hdr, len) (hdr)->_hwlen_protolen = HTONS((len) | (ARPH_HWLEN(hdr) << 8))
-
-PACK_STRUCT_BEGIN
-struct ethip_hdr {
-  PACK_STRUCT_FIELD(struct eth_hdr eth);
-  PACK_STRUCT_FIELD(struct ip_hdr ip);
-};
-PACK_STRUCT_END
-
-struct arp_entry {
-  struct ip_addr ipaddr;
-  struct eth_addr ethaddr;
-  uInt8 ctime;
-};
-
-static struct arp_entry arp_table[ARP_TABLE_SIZE];
-static uInt8 ctime;
-
-/*-----------------------------------------------------------------------------------*/
-void
-arp_init(void)
-{
-  uInt8 i;
-  
-  for(i = 0; i < ARP_TABLE_SIZE; ++i) {
-    ip_addr_set(&(arp_table[i].ipaddr),
-		IP_ADDR_ANY);
-  }
-}
-/*-----------------------------------------------------------------------------------*/
-void
-arp_tmr(void)
-{
-  uInt8 i;
-  
-  ++ctime;
-  for(i = 0; i < ARP_TABLE_SIZE; ++i) {
-    if(!ip_addr_isany(&arp_table[i].ipaddr) &&       
-       ctime - arp_table[i].ctime >= ARP_MAXAGE) {
-      DEBUGF(ARP_DEBUG, ("arp_timer: expired entry %d.\n", i));
-      ip_addr_set(&(arp_table[i].ipaddr),
-		  IP_ADDR_ANY);
-    }
-  }  
-}
-/*-----------------------------------------------------------------------------------*/
-static void
-add_arp_entry(struct ip_addr *ipaddr, struct eth_addr *ethaddr)
-{
-  uInt8 i, j, k;
-  uInt8 maxtime;
-  
-  /* Walk through the ARP mapping table and try to find an entry to
-     update. If none is found, the IP -> MAC address mapping is
-     inserted in the ARP table. */
-  for(i = 0; i < ARP_TABLE_SIZE; ++i) {
-    
-    /* Only check those entries that are actually in use. */
-    if(!ip_addr_isany(&arp_table[i].ipaddr)) {
-      /* Check if the source IP address of the incoming packet matches
-         the IP address in this ARP table entry. */
-      if(ip_addr_cmp(ipaddr, &arp_table[i].ipaddr)) {
-	/* An old entry found, update this and return. */
-	for(k = 0; k < 6; ++k) {
-	  arp_table[i].ethaddr.addr[k] = ethaddr->addr[k];
-	}
-	arp_table[i].ctime = ctime;
-	return;
-      }
-    }
-  }
-
-  /* If we get here, no existing ARP table entry was found, so we
-     create one. */
-
-  /* First, we try to find an unused entry in the ARP table. */
-  for(i = 0; i < ARP_TABLE_SIZE; ++i) {
-    if(ip_addr_isany(&arp_table[i].ipaddr)) {
-      break;
-    }
-  }
-
-  /* If no unused entry is found, we try to find the oldest entry and
-     throw it away. */
-  if(i == ARP_TABLE_SIZE) {
-    maxtime = 0;
-    j = 0;
-    for(i = 0; i < ARP_TABLE_SIZE; ++i) {
-      if(ctime - arp_table[i].ctime > maxtime) {
-	maxtime = ctime - arp_table[i].ctime;
-	j = i;
-      }
-    }
-    i = j;
-  }
-
-  /* Now, i is the ARP table entry which we will fill with the new
-     information. */
-  ip_addr_set(&arp_table[i].ipaddr, ipaddr);
-  for(k = 0; k < 6; ++k) {
-    arp_table[i].ethaddr.addr[k] = ethaddr->addr[k];
-  }
-  arp_table[i].ctime = ctime;
-  return;
-
-}
-/*-----------------------------------------------------------------------------------*/
-void
-arp_ip_input(struct netif *netif, struct pbuf *p)
-{
-  struct ethip_hdr *hdr;
-  
-  hdr = p->payload;
-  
-  /* Only insert/update an entry if the source IP address of the
-     incoming IP packet comes from a host on the local network. */
-  if(!ip_addr_maskcmp(&(hdr->ip.src), &(netif->ip_addr), &(netif->netmask))) {
-    return;
-  }
-  DEBUGF(ARP_DEBUG, ("arp_ip_input: updating ARP table.\n"));
-  add_arp_entry(&(hdr->ip.src), &(hdr->eth.src));
-}
-/*-----------------------------------------------------------------------------------*/
-struct pbuf *
-arp_arp_input(struct netif *netif, struct eth_addr *ethaddr, struct pbuf *p)
-{
-  struct arp_hdr *hdr;
-  uInt8 i;
-  
-  if(p->tot_len < sizeof(struct arp_hdr)) {
-    kprintf("arp_arp_input: packet too short (%d/%d)\n", p->tot_len, sizeof(struct arp_hdr));
-    pbuf_free(p);
-    return NULL;
-  }
-
-  hdr = p->payload;
-
-  //kprintf("HDR->OPCODE: [0x%X]\n", hdr->opcode);
-  
-  switch(htons(hdr->opcode)) {
-  case ARP_REQUEST:
- //   kprintf("ARP_REQUEST");
-//ip_addr_debug_print(&hdr->dipaddr);
-//ip_addr_debug_print(&netif->ip_addr);
-    /* ARP request. If it asked for our address, we send out a
-       reply. */
-    if(ip_addr_cmp(&(hdr->dipaddr), &(netif->ip_addr))) {
-//kprintf("MATCHED!\n");
-      hdr->opcode = htons(ARP_REPLY);
-
-      ip_addr_set(&(hdr->dipaddr), &(hdr->sipaddr));
-      ip_addr_set(&(hdr->sipaddr), &(netif->ip_addr));
-
-      for(i = 0; i < 6; ++i) {
-	hdr->dhwaddr.addr[i] = hdr->shwaddr.addr[i];
-	hdr->shwaddr.addr[i] = ethaddr->addr[i];
-	hdr->ethhdr.dest.addr[i] = hdr->dhwaddr.addr[i];
-	hdr->ethhdr.src.addr[i] = ethaddr->addr[i];
-      }
-
-      hdr->hwtype = htons(HWTYPE_ETHERNET);
-      ARPH_HWLEN_SET(hdr, 6);
-      
-      hdr->proto = htons(ETHTYPE_IP);
-      ARPH_PROTOLEN_SET(hdr, sizeof(struct ip_addr));      
-      
-      hdr->ethhdr.type = htons(ETHTYPE_ARP);      
-      return p;
-    }
-    break;
-  case ARP_REPLY:    
-    kprintf("ARP_RREPLY");
-    /* ARP reply. We insert or update the ARP table. */
-    if(ip_addr_cmp(&(hdr->dipaddr), &(netif->ip_addr))) {
-      add_arp_entry(&(hdr->sipaddr), &(hdr->shwaddr));
-    }
-    break;
-  default:
-    kprintf("arp_arp_input: unknown type %d\n", htons(hdr->opcode));
-    break;
-  }
-
-  pbuf_free(p);
-  return NULL;
-}
-/*-----------------------------------------------------------------------------------*/
-struct eth_addr *
-arp_lookup(struct ip_addr *ipaddr)
-{
-  uInt8 i;
-  
-  for(i = 0; i < ARP_TABLE_SIZE; ++i) {
-    if(ip_addr_cmp(ipaddr, &arp_table[i].ipaddr)) {
-      return &arp_table[i].ethaddr;
-    }
-  }
-  return NULL;  
-}
-/*-----------------------------------------------------------------------------------*/
-struct pbuf *
-arp_query(struct netif *netif, struct eth_addr *ethaddr, struct ip_addr *ipaddr)
-{
-  struct arp_hdr *hdr;
-  struct pbuf *p;
-  uInt8 i;
-
-  p = pbuf_alloc(PBUF_LINK, sizeof(struct arp_hdr), PBUF_RAM);
-  if(p == NULL) {
-    return NULL;
-  }
-
-  hdr = p->payload;
-  
-  hdr->opcode = htons(ARP_REQUEST);
-
-  for(i = 0; i < 6; ++i) {
-    hdr->dhwaddr.addr[i] = 0x00;
-    hdr->shwaddr.addr[i] = ethaddr->addr[i];
-  }
-  
-  ip_addr_set(&(hdr->dipaddr), ipaddr);
-  ip_addr_set(&(hdr->sipaddr), &(netif->ip_addr));
-
-  hdr->hwtype = htons(HWTYPE_ETHERNET);
-  ARPH_HWLEN_SET(hdr, 6);
-
-  hdr->proto = htons(ETHTYPE_IP);
-  ARPH_PROTOLEN_SET(hdr, sizeof(struct ip_addr));
-
-  for(i = 0; i < 6; ++i) {
-    hdr->ethhdr.dest.addr[i] = 0xff;
-    hdr->ethhdr.src.addr[i] = ethaddr->addr[i];
-  }
-  
-  hdr->ethhdr.type = htons(ETHTYPE_ARP);      
-  return p;
-}
-/*-----------------------------------------------------------------------------------*/
-
-
-
-
diff --git a/sys/net/netif/ethernet.c b/sys/net/netif/ethernet.c
deleted file mode 100644
index c9f31b4..0000000
--- a/sys/net/netif/ethernet.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/**
- * @file
- * Ethernet common functions
- * 
- * @defgroup ethernet Ethernet
- * @ingroup callbackstyle_api
- */
-
-/*
- * Copyright (c) 2001-2003 Swedish Institute of Computer Science.
- * Copyright (c) 2003-2004 Leon Woestenberg <leon.woestenberg@axon.tv>
- * Copyright (c) 2003-2004 Axon Digital Design B.V., The Netherlands.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- */
-
-#include "net/opt.h"
-
-#if LWIP_ARP || LWIP_ETHERNET
-
-#include "netif/ethernet.h"
-#include "net/def.h"
-#include "net/stats.h"
-#include "net/etharp.h"
-#include "net/ip.h"
-#include "net/snmp.h"
-
-#include <string.h>
-
-#include "netif/ppp/ppp_opts.h"
-#if PPPOE_SUPPORT
-#include "netif/ppp/pppoe.h"
-#endif /* PPPOE_SUPPORT */
-
-#ifdef LWIP_HOOK_FILENAME
-#include LWIP_HOOK_FILENAME
-#endif
-
-const struct eth_addr ethbroadcast = {{0xff,0xff,0xff,0xff,0xff,0xff}};
-const struct eth_addr ethzero = {{0,0,0,0,0,0}};
-
-/**
- * @ingroup lwip_nosys
- * Process received ethernet frames. Using this function instead of directly
- * calling ip_input and passing ARP frames through etharp in ethernetif_input,
- * the ARP cache is protected from concurrent access.\n
- * Don't call directly, pass to netif_add() and call netif->input().
- *
- * @param p the received packet, p->payload pointing to the ethernet header
- * @param netif the network interface on which the packet was received
- * 
- * @see LWIP_HOOK_UNKNOWN_ETH_PROTOCOL
- * @see ETHARP_SUPPORT_VLAN
- * @see LWIP_HOOK_VLAN_CHECK
- */
-err_t
-ethernet_input(struct pbuf *p, struct netif *netif)
-{
-  struct eth_hdr* ethhdr;
-  u16_t type;
-#if LWIP_ARP || ETHARP_SUPPORT_VLAN || LWIP_IPV6
-  s16_t ip_hdr_offset = SIZEOF_ETH_HDR;
-#endif /* LWIP_ARP || ETHARP_SUPPORT_VLAN */
-
-  if (p->len <= SIZEOF_ETH_HDR) {
-    kprintf("BAD HEADER");
-    /* a packet with only an ethernet header (or less) is not valid for us */
-    ETHARP_STATS_INC(etharp.proterr);
-    ETHARP_STATS_INC(etharp.drop);
-    MIB2_STATS_NETIF_INC(netif, ifinerrors);
-    goto free_and_return;
-  }
-
-  /* points to packet payload, which starts with an Ethernet header */
-  ethhdr = (struct eth_hdr *)p->payload;
-  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE,
-    ("ethernet_input: dest:%"X8_F":%"X8_F":%"X8_F":%"X8_F":%"X8_F":%"X8_F", src:%"X8_F":%"X8_F":%"X8_F":%"X8_F":%"X8_F":%"X8_F", type:%"X16_F"\n",
-     (unsigned)ethhdr->dest.addr[0], (unsigned)ethhdr->dest.addr[1], (unsigned)ethhdr->dest.addr[2],
-     (unsigned)ethhdr->dest.addr[3], (unsigned)ethhdr->dest.addr[4], (unsigned)ethhdr->dest.addr[5],
-     (unsigned)ethhdr->src.addr[0],  (unsigned)ethhdr->src.addr[1],  (unsigned)ethhdr->src.addr[2],
-     (unsigned)ethhdr->src.addr[3],  (unsigned)ethhdr->src.addr[4],  (unsigned)ethhdr->src.addr[5],
-     lwip_htons(ethhdr->type)));
-
-  type = ethhdr->type;
-#if ETHARP_SUPPORT_VLAN
-  if (type == PP_HTONS(ETHTYPE_VLAN)) {
-    struct eth_vlan_hdr *vlan = (struct eth_vlan_hdr*)(((char*)ethhdr) + SIZEOF_ETH_HDR);
-    if (p->len <= SIZEOF_ETH_HDR + SIZEOF_VLAN_HDR) {
-      /* a packet with only an ethernet/vlan header (or less) is not valid for us */
-      ETHARP_STATS_INC(etharp.proterr);
-      ETHARP_STATS_INC(etharp.drop);
-      MIB2_STATS_NETIF_INC(netif, ifinerrors);
-      goto free_and_return;
-    }
-#if defined(LWIP_HOOK_VLAN_CHECK) || defined(ETHARP_VLAN_CHECK) || defined(ETHARP_VLAN_CHECK_FN) /* if not, allow all VLANs */
-#ifdef LWIP_HOOK_VLAN_CHECK
-    if (!LWIP_HOOK_VLAN_CHECK(netif, ethhdr, vlan)) {
-#elif defined(ETHARP_VLAN_CHECK_FN)
-    if (!ETHARP_VLAN_CHECK_FN(ethhdr, vlan)) {
-#elif defined(ETHARP_VLAN_CHECK)
-    if (VLAN_ID(vlan) != ETHARP_VLAN_CHECK) {
-#endif
-      /* silently ignore this packet: not for our VLAN */
-      pbuf_free(p);
-      return ERR_OK;
-    }
-#endif /* defined(LWIP_HOOK_VLAN_CHECK) || defined(ETHARP_VLAN_CHECK) || defined(ETHARP_VLAN_CHECK_FN) */
-    type = vlan->tpid;
-    ip_hdr_offset = SIZEOF_ETH_HDR + SIZEOF_VLAN_HDR;
-  }
-#endif /* ETHARP_SUPPORT_VLAN */
-
-#if LWIP_ARP_FILTER_NETIF
-  netif = LWIP_ARP_FILTER_NETIF_FN(p, netif, lwip_htons(type));
-#endif /* LWIP_ARP_FILTER_NETIF*/
-
-  if (ethhdr->dest.addr[0] & 1) {
-    /* this might be a multicast or broadcast packet */
-    if (ethhdr->dest.addr[0] == LL_IP4_MULTICAST_ADDR_0) {
-#if LWIP_IPV4
-      if ((ethhdr->dest.addr[1] == LL_IP4_MULTICAST_ADDR_1) &&
-          (ethhdr->dest.addr[2] == LL_IP4_MULTICAST_ADDR_2)) {
-        /* mark the pbuf as link-layer multicast */
-        p->flags |= PBUF_FLAG_LLMCAST;
-      }
-#endif /* LWIP_IPV4 */
-    }
-#if LWIP_IPV6
-    else if ((ethhdr->dest.addr[0] == LL_IP6_MULTICAST_ADDR_0) &&
-             (ethhdr->dest.addr[1] == LL_IP6_MULTICAST_ADDR_1)) {
-        /* mark the pbuf as link-layer multicast */
-        p->flags |= PBUF_FLAG_LLMCAST;
-    }
-#endif /* LWIP_IPV6 */
-    else if (eth_addr_cmp(&ethhdr->dest, &ethbroadcast)) {
-      /* mark the pbuf as link-layer broadcast */
-      p->flags |= PBUF_FLAG_LLBCAST;
-    }
-  }
-
-  switch (type) {
-#if LWIP_IPV4 && LWIP_ARP
-    /* IP packet? */
-    case PP_HTONS(ETHTYPE_IP):
-      if (!(netif->flags & NETIF_FLAG_ETHARP)) {
-        goto free_and_return;
-      }
-      /* skip Ethernet header */
-      if ((p->len < ip_hdr_offset) || pbuf_header(p, (s16_t)-ip_hdr_offset)) {
-        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
-          ("ethernet_input: IPv4 packet dropped, too short (%"S16_F"/%"S16_F")\n",
-          p->tot_len, ip_hdr_offset));
-        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("Can't move over header in packet"));
-        goto free_and_return;
-      } else {
-        /* pass to IP layer */
-        ip4_input(p, netif);
-      }
-      break;
-
-    case PP_HTONS(ETHTYPE_ARP):
-      if (!(netif->flags & NETIF_FLAG_ETHARP)) {
-        goto free_and_return;
-      }
-      /* skip Ethernet header */
-      if ((p->len < ip_hdr_offset) || pbuf_header(p, (s16_t)-ip_hdr_offset)) {
-        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
-          ("ethernet_input: ARP response packet dropped, too short (%"S16_F"/%"S16_F")\n",
-          p->tot_len, ip_hdr_offset));
-        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("Can't move over header in packet"));
-        ETHARP_STATS_INC(etharp.lenerr);
-        ETHARP_STATS_INC(etharp.drop);
-        goto free_and_return;
-      } else {
-        /* pass p to ARP module */
-        etharp_input(p, netif);
-      }
-      break;
-#endif /* LWIP_IPV4 && LWIP_ARP */
-#if PPPOE_SUPPORT
-    case PP_HTONS(ETHTYPE_PPPOEDISC): /* PPP Over Ethernet Discovery Stage */
-      pppoe_disc_input(netif, p);
-      break;
-
-    case PP_HTONS(ETHTYPE_PPPOE): /* PPP Over Ethernet Session Stage */
-      pppoe_data_input(netif, p);
-      break;
-#endif /* PPPOE_SUPPORT */
-
-#if LWIP_IPV6
-    case PP_HTONS(ETHTYPE_IPV6): /* IPv6 */
-      /* skip Ethernet header */
-      if ((p->len < ip_hdr_offset) || pbuf_header(p, (s16_t)-ip_hdr_offset)) {
-        LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_WARNING,
-          ("ethernet_input: IPv6 packet dropped, too short (%"S16_F"/%"S16_F")\n",
-          p->tot_len, ip_hdr_offset));
-        goto free_and_return;
-      } else {
-        /* pass to IPv6 layer */
-        ip6_input(p, netif);
-      }
-      break;
-#endif /* LWIP_IPV6 */
-
-    default:
-#ifdef LWIP_HOOK_UNKNOWN_ETH_PROTOCOL
-      if(LWIP_HOOK_UNKNOWN_ETH_PROTOCOL(p, netif) == ERR_OK) {
-        break;
-      }
-#endif
-      ETHARP_STATS_INC(etharp.proterr);
-      ETHARP_STATS_INC(etharp.drop);
-      MIB2_STATS_NETIF_INC(netif, ifinunknownprotos);
-      goto free_and_return;
-  }
-
-  /* This means the pbuf is freed or consumed,
-     so the caller doesn't have to free it again */
-  return ERR_OK;
-
-free_and_return:
-  pbuf_free(p);
-  return ERR_OK;
-}
-
-/**
- * @ingroup ethernet
- * Send an ethernet packet on the network using netif->linkoutput().
- * The ethernet header is filled in before sending.
- *
- * @see LWIP_HOOK_VLAN_SET
- *
- * @param netif the lwIP network interface on which to send the packet
- * @param p the packet to send. pbuf layer must be @ref PBUF_LINK.
- * @param src the source MAC address to be copied into the ethernet header
- * @param dst the destination MAC address to be copied into the ethernet header
- * @param eth_type ethernet type (@ref eth_type)
- * @return ERR_OK if the packet was sent, any other err_t on failure
- */
-err_t
-ethernet_output(struct netif* netif, struct pbuf* p,
-                const struct eth_addr* src, const struct eth_addr* dst,
-                u16_t eth_type)
-{
-  struct eth_hdr* ethhdr;
-  u16_t eth_type_be = lwip_htons(eth_type);
-
-#if ETHARP_SUPPORT_VLAN && defined(LWIP_HOOK_VLAN_SET)
-  s32_t vlan_prio_vid = LWIP_HOOK_VLAN_SET(netif, p, src, dst, eth_type);
-  if (vlan_prio_vid >= 0) {
-    struct eth_vlan_hdr* vlanhdr;
-
-    LWIP_ASSERT("prio_vid must be <= 0xFFFF", vlan_prio_vid <= 0xFFFF);
-
-    if (pbuf_header(p, SIZEOF_ETH_HDR + SIZEOF_VLAN_HDR) != 0) {
-      goto pbuf_header_failed;
-    }
-    vlanhdr = (struct eth_vlan_hdr*)(((u8_t*)p->payload) + SIZEOF_ETH_HDR);
-    vlanhdr->tpid     = eth_type_be;
-    vlanhdr->prio_vid = lwip_htons((u16_t)vlan_prio_vid);
-
-    eth_type_be = PP_HTONS(ETHTYPE_VLAN);
-  } else
-#endif /* ETHARP_SUPPORT_VLAN && defined(LWIP_HOOK_VLAN_SET) */
-  {
-    if (pbuf_header(p, SIZEOF_ETH_HDR) != 0) {
-      goto pbuf_header_failed;
-    }
-  }
-
-  ethhdr = (struct eth_hdr*)p->payload;
-  ethhdr->type = eth_type_be;
-  ETHADDR32_COPY(&ethhdr->dest, dst);
-  ETHADDR16_COPY(&ethhdr->src,  src);
-
-  LWIP_ASSERT("netif->hwaddr_len must be 6 for ethernet_output!",
-    (netif->hwaddr_len == ETH_HWADDR_LEN));
-  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE,
-    ("ethernet_output: sending packet %p\n", (void *)p));
-
-  /* send the packet */
-  return netif->linkoutput(netif, p);
-
-pbuf_header_failed:
-  LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_LEVEL_SERIOUS,
-    ("ethernet_output: could not allocate room for header.\n"));
-  LINK_STATS_INC(link.lenerr);
-  return ERR_BUF;
-}
-
-#endif /* LWIP_ARP || LWIP_ETHERNET */
-
diff --git a/sys/net/netif/ethernetif.c b/sys/net/netif/ethernetif.c
deleted file mode 100644
index 925a515..0000000
--- a/sys/net/netif/ethernetif.c
+++ /dev/null
@@ -1,344 +0,0 @@
-/**
- * @file
- * Ethernet Interface Skeleton
- *
- */
-
-/*
- * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
- * 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 ``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 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.
- *
- * This file is part of the lwIP TCP/IP stack.
- *
- * Author: Adam Dunkels <adam@sics.se>
- *
- */
-
-/*
- * This file is a skeleton for developing Ethernet network interface
- * drivers for lwIP. Add code to the low_level functions and do a
- * search-and-replace for the word "ethernetif" to replace it with
- * something that better describes your network interface.
- */
-#include <pci/lnc.h>
-#include "net/opt.h"
-
-#include <net/tcpip.h> //TMP
-
-#include "net/def.h"
-#include "net/mem.h"
-#include "net/pbuf.h"
-#include "net/stats.h"
-#include "net/snmp.h"
-#include "net/ethip6.h"
-#include "net/etharp.h"
-//#include "net/ppp/pppoe.h"
-
-/* Define those to better describe your network interface. */
-#define IFNAME0 'e'
-#define IFNAME1 'n'
-
-struct nicBuffer *tmpBuf = 0x0;
-
-/**
- * Helper struct to hold private data used to operate your ethernet interface.
- * Keeping the ethernet address of the MAC in this struct is not necessary
- * as it is already kept in the struct netif.
- * But this is only an example, anyway...
- */
-struct ethernetif {
-  struct eth_addr *ethaddr;
-  /* Add whatever per-interface state that is needed here. */
-};
-
-/* Forward declarations. */
-//MrOlsen 2017-12-17 LWIP static void ethernetif_input(struct netif *netif);
-
-/**
- * In this function, the hardware should be initialized.
- * Called from ethernetif_init().
- *
- * @param netif the already initialized lwip network interface structure
- *        for this ethernetif
- */
-static void
-low_level_init(struct netif *netif)
-{
-  struct ethernetif *ethernetif = netif->state;
-
-  /* set MAC hardware address length */
-  netif->hwaddr_len = ETHARP_HWADDR_LEN;
-
-  /* set MAC hardware address */
-  netif->hwaddr[0] = 0x08;
-  netif->hwaddr[1] = 0x00;
-  netif->hwaddr[2] = 0x27;
-  netif->hwaddr[3] = 0x73;
-  netif->hwaddr[4] = 0xC1;
-  netif->hwaddr[5] = 0xB6;
-
-  /* maximum transfer unit */
-  netif->mtu = 1500;
-
-  /* device capabilities */
-  /* don't set NETIF_FLAG_ETHARP if this device is not an ethernet one */
-  netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP;
-
-#if LWIP_IPV6 && LWIP_IPV6_MLD
-  /*
-   * For hardware/netifs that implement MAC filtering.
-   * All-nodes link-local is handled by default, so we must let the hardware know
-   * to allow multicast packets in.
-   * Should set mld_mac_filter previously. */
-  if (netif->mld_mac_filter != NULL) {
-    ip6_addr_t ip6_allnodes_ll;
-    ip6_addr_set_allnodes_linklocal(&ip6_allnodes_ll);
-    netif->mld_mac_filter(netif, &ip6_allnodes_ll, NETIF_ADD_MAC_FILTER);
-  }
-#endif /* LWIP_IPV6 && LWIP_IPV6_MLD */
-
-  /* Do whatever else is needed to initialize interface. */
-}
-
-/**
- * This function should do the actual transmission of the packet. The packet is
- * contained in the pbuf that is passed to the function. This pbuf
- * might be chained.
- *
- * @param netif the lwip network interface structure for this ethernetif
- * @param p the MAC packet to send (e.g. IP packet including MAC addresses and type)
- * @return ERR_OK if the packet could be sent
- *         an err_t value if the packet couldn't be sent
- *
- * @note Returning ERR_MEM here if a DMA queue of your MAC is full can lead to
- *       strange results. You might consider waiting for space in the DMA queue
- *       to become available since the stack doesn't retry to send a packet
- *       dropped because of memory failure (except for the TCP timers).
- */
-
-static err_t
-low_level_output(struct netif *netif, struct pbuf *p)
-{
-  struct ethernetif *ethernetif = netif->state;
-  struct pbuf *q;
-
-  //MrOlsen 2017-12-17 LWIP initiate transfer();
-
-#if ETH_PAD_SIZE
-  pbuf_header(p, -ETH_PAD_SIZE); /* drop the padding word */
-#endif
-
-  for (q = p; q != NULL; q = q->next) {
-    /* Send the data from the pbuf to the interface, one pbuf at a
-     time. The size of the data in each pbuf is kept in the ->len
-     variable. */
-    //send data from(q->payload, q->len);
-    lnc_sendPacket(lnc, q->payload, q->len,0x0);
-  }
-
-  //signal that packet should be sent();
-
-  MIB2_STATS_NETIF_ADD(netif, ifoutoctets, p->tot_len);
-  if (((u8_t*)p->payload)[0] & 1) {
-    /* broadcast or multicast packet*/
-    MIB2_STATS_NETIF_INC(netif, ifoutnucastpkts);
-  }
-  else {
-    /* unicast packet */
-    MIB2_STATS_NETIF_INC(netif, ifoutucastpkts);
-  }
-  /* increase ifoutdiscards or ifouterrors on error */
-
-#if ETH_PAD_SIZE
-  pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */
-#endif
-
-  LINK_STATS_INC(link.xmit);
-
-  return ERR_OK;
-}
-
-/**
- * Should allocate a pbuf and transfer the bytes of the incoming
- * packet from the interface into the pbuf.
- *
- * @param netif the lwip network interface structure for this ethernetif
- * @return a pbuf filled with the received packet (including MAC header)
- *         NULL on memory error
- */
-static struct pbuf *
-low_level_input(struct netif *netif)
-{
-  struct ethernetif *ethernetif = netif->state;
-  struct pbuf *p, *q;
-  uint16_t len;
-  char *bufPtr;
-
-  /* Obtain the size of the packet and put it into the "len"
-   variable. */
-  len = tmpBuf->length;
-  bufPtr = tmpBuf->buffer;
-
-#if ETH_PAD_SIZE
-  len += ETH_PAD_SIZE; /* allow room for Ethernet padding */
-#endif
-
-  /* We allocate a pbuf chain of pbufs from the pool. */
-  p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
-
-  if (p != NULL) {
-
-#if ETH_PAD_SIZE
-    pbuf_header(p, -ETH_PAD_SIZE); /* drop the padding word */
-#endif
-
-    /* We iterate over the pbuf chain until we have read the entire
-     * packet into the pbuf. */
-    for (q = p; q != NULL; q = q->next) {
-      /* Read enough bytes to fill this pbuf in the chain. The
-       * available data in the pbuf is given by the q->len
-       * variable.
-       * This does not necessarily have to be a memcpy, you can also preallocate
-       * pbufs for a DMA-enabled MAC and after receiving truncate it to the
-       * actually received size. In this case, ensure the tot_len member of the
-       * pbuf is the sum of the chained pbuf len members.
-       */
-      //read data into(q->payload, q->len);
-      bcopy(bufPtr, q->payload, q->len);
-      bufPtr += q->len;
-    }
-    //acknowledge that packet has been read();
-
-    MIB2_STATS_NETIF_ADD(netif, ifinoctets, p->tot_len);
-    if (((u8_t*)p->payload)[0] & 1) {
-      /* broadcast or multicast packet*/
-      MIB2_STATS_NETIF_INC(netif, ifinnucastpkts);
-    }
-    else {
-      /* unicast packet*/
-      MIB2_STATS_NETIF_INC(netif, ifinucastpkts);
-    }
-#if ETH_PAD_SIZE
-    pbuf_header(p, ETH_PAD_SIZE); /* reclaim the padding word */
-#endif
-
-    LINK_STATS_INC(link.recv);
-  }
-  else {
-    //MrOlsen 2017-12-17 LWIP drop packet();
-    LINK_STATS_INC(link.memerr);
-    LINK_STATS_INC(link.drop);
-    MIB2_STATS_NETIF_INC(netif, ifindiscards);
-  }
-
-  return p;
-}
-
-/**
- * This function should be called when a packet is ready to be read
- * from the interface. It uses the function low_level_input() that
- * should handle the actual reception of bytes from the network
- * interface. Then the type of the received packet is determined and
- * the appropriate input function is called.
- *
- * @param netif the lwip network interface structure for this ethernetif
- */
-/* MrOlsen 2017-12-17 LWIP */
-//static void ethernetif_input(struct netif *netif) {
-void ethernetif_input(struct netif *netif) {
-  struct ethernetif *ethernetif;
-  struct eth_hdr *ethhdr;
-  struct pbuf *p;
-
-  ethernetif = netif->state;
-
-  /* move received packet into a new pbuf */
-  p = low_level_input(netif);
-  /* if no packet could be read, silently ignore this */
-  if (p != NULL) {
-    /* pass all packets to ethernet_input, which decides what packets it supports */
-    if (netif->input(p, netif) != ERR_OK) {
-      LWIP_DEBUGF(NETIF_DEBUG, ("ethernetif_input: IP input error\n"));
-      pbuf_free(p);
-      p = NULL;
-    }
-  }
-}
-
-/**
- * Should be called at the beginning of the program to set up the
- * network interface. It calls the function low_level_init() to do the
- * actual setup of the hardware.
- *
- * This function should be passed as a parameter to netif_add().
- *
- * @param netif the lwip network interface structure for this ethernetif
- * @return ERR_OK if the loopif is initialized
- *         ERR_MEM if private data couldn't be allocated
- *         any other err_t on error
- */
-err_t ethernetif_init(struct netif *netif) {
-  struct ethernetif *ethernetif;
-
-  LWIP_ASSERT("netif != NULL", (netif != NULL));
-
-  ethernetif = mem_malloc(sizeof(struct ethernetif));
-  if (ethernetif == NULL) {
-    LWIP_DEBUGF(NETIF_DEBUG, ("ethernetif_init: out of memory\n"));
-    return ERR_MEM;
-  }
-
-#if LWIP_NETIF_HOSTNAME
-  /* Initialize interface hostname */
-  netif->hostname = "lwip";
-#endif /* LWIP_NETIF_HOSTNAME */
-
-  /*
-   * Initialize the snmp variables and counters inside the struct netif.
-   * The last argument should be replaced with your link speed, in units
-   * of bits per second.
-   */
-  //MrOlsen 2017-12-17 LWIP MIB2_INIT_NETIF(netif, snmp_ifType_ethernet_csmacd, LINK_SPEED_OF_YOUR_NETIF_IN_BPS);
-
-  netif->state = ethernetif;
-  netif->name[0] = IFNAME0;
-  netif->name[1] = IFNAME1;
-  /* We directly use etharp_output() here to save a function call.
-   * You can instead declare your own function an call etharp_output()
-   * from it if you have to do some checks before sending (e.g. if link
-   * is available...) */
-  netif->output = etharp_output;
-#if LWIP_IPV6
-  netif->output_ip6 = ethip6_output;
-#endif /* LWIP_IPV6 */
-  netif->linkoutput = low_level_output;
-
-  ethernetif->ethaddr = (struct eth_addr *)&(netif->hwaddr[0]);
-
-  /* initialize the hardware */
-  low_level_init(netif);
-
-  return ERR_OK;
-}
diff --git a/sys/net/netif/loopif.c b/sys/net/netif/loopif.c
deleted file mode 100644
index 1462da6..0000000
--- a/sys/net/netif/loopif.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. 
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Adam Dunkels <adam@sics.se>
- *
- * $Id: loopif.c 54 2016-01-11 01:29:55Z reddawg $
- */
-#include "net/debug.h"
-#include "net/mem.h"
-#include "net/opt.h"
-#include "netif/loopif.h"
-#include "netif/tcpdump.h"
-
-#include "net/tcp.h"
-#include "net/ipv4/ip.h"
-
-/*-----------------------------------------------------------------------------------*/
-static err_t
-loopif_output(struct netif *netif, struct pbuf *p,
-	     struct ip_addr *ipaddr)
-{
-  struct pbuf *q, *r;
-  char *ptr;
-
-#ifdef LWIP_DEBUG
-  tcpdump(p);
-#endif /* LWIP_DEBUG */
-  
-  r = pbuf_alloc(PBUF_RAW, p->tot_len, PBUF_RAM);
-  if(r != NULL) {
-    ptr = r->payload;
-    
-    for(q = p; q != NULL; q = q->next) {
-      bcopy(q->payload, ptr, q->len);
-      ptr += q->len;
-    }
-    netif->input(r, netif);
-    return ERR_OK;    
-  }
-  return ERR_MEM;
-}
-/*-----------------------------------------------------------------------------------*/
-void
-loopif_init(struct netif *netif)
-{
-  netif->name[0] = 'l';
-  netif->name[1] = 'o';
-  netif->output = loopif_output;
-}
-/*-----------------------------------------------------------------------------------*/
-
-
-
-
-
-
-
diff --git a/sys/net/netif/tcpdump.c b/sys/net/netif/tcpdump.c
deleted file mode 100644
index ce5f6b4..0000000
--- a/sys/net/netif/tcpdump.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 2001, Swedish Institute of Computer Science.
- * 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. Neither the name of the Institute 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 INSTITUTE 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 INSTITUTE 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. 
- *
- * This file is part of the lwIP TCP/IP stack.
- * 
- * Author: Adam Dunkels <adam@sics.se>
- *
- * $Id: tcpdump.c 54 2016-01-11 01:29:55Z reddawg $
- */
-
-#include <vfs/file.h>
-#include <ubixos/kpanic.h>
-  
-#include "netif/tcpdump.h"
-#include "net/ipv4/ip.h"
-#include "net/tcp.h"
-#include "net/udp.h"
-#include "net/ipv4/inet.h"
-
-fileDescriptor *file = NULL;
-
-void tcpdump_init(void) {
-  char *fname;
-
-  fname = "tcpdump";
-  file = fopen(fname, "wb");
-  if(file == NULL) {
-    kpanic("tcpdump_init: fopen\n");
-    }
-  }
-
-void tcpdump(struct pbuf *p) {
-/*
-  struct ip_hdr *iphdr;
-  struct tcp_hdr *tcphdr;
-  struct udp_hdr *udphdr;
-  char flags[5];
-  int i;
-  int len;
-  int offset;
-*/
-  if (file == NULL) {
-    return;
-    }
-  
-  /*
-  iphdr = p->payload;
-  switch(IPH_PROTO(iphdr)) {
-  case IP_PROTO_TCP:    
-    tcphdr = (struct tcp_hdr *)((char *)iphdr + IP_HLEN);
-    
-    pbuf_header(p, -IP_HLEN);
-    if(inet_chksum_pseudo(p, (struct ip_addr *)&(iphdr->src),
-			  (struct ip_addr *)&(iphdr->dest),
-			  IP_PROTO_TCP, p->tot_len) != 0) {
-      DEBUGF(TCPDUMP_DEBUG, ("tcpdump: IP checksum failed!\n"));
-      fprintf(file, "!chksum ");
-    }
-    
-    i = 0;
-    if(TCPH_FLAGS(tcphdr) & TCP_SYN) {
-      flags[i++] = 'S';
-    }
-    if(TCPH_FLAGS(tcphdr) & TCP_PSH) {
-      flags[i++] = 'P';
-    }
-    if(TCPH_FLAGS(tcphdr) & TCP_FIN) {
-      flags[i++] = 'F';
-    }
-    if(TCPH_FLAGS(tcphdr) & TCP_RST) {
-      flags[i++] = 'R';
-    }
-    if(i == 0) {
-      flags[i++] = '.';
-    }
-    flags[i++] = 0;    
-
-    
-    
-    fprintf(file, "%d.%d.%d.%d.%u > %d.%d.%d.%d.%u: ",
-	    (int)(ntohl(iphdr->src.addr) >> 24) & 0xff,
-	    (int)(ntohl(iphdr->src.addr) >> 16) & 0xff,
-	    (int)(ntohl(iphdr->src.addr) >> 8) & 0xff,
-	    (int)(ntohl(iphdr->src.addr) >> 0) & 0xff,
-	    ntohs(tcphdr->src),
-	  (int)(ntohl(iphdr->dest.addr) >> 24) & 0xff,
-	    (int)(ntohl(iphdr->dest.addr) >> 16) & 0xff,
-	    (int)(ntohl(iphdr->dest.addr) >> 8) & 0xff,
-	    (int)(ntohl(iphdr->dest.addr) >> 0) & 0xff,
-	    ntohs(tcphdr->dest));
-    offset = TCPH_OFFSET(tcphdr) >> 4;
-    
-    len = ntohs(IPH_LEN(iphdr)) - offset * 4 - IP_HLEN;
-    if(len != 0 || flags[0] != '.') {
-      fprintf(file, "%s %lu:%lu(%u) ",
-	      flags,
-	      ntohl(tcphdr->seqno),
-	      ntohl(tcphdr->seqno) + len,
-	      len);
-    }
-    if(TCPH_FLAGS(tcphdr) & TCP_ACK) {
-      fprintf(file, "ack %lu ",
-	      ntohl(tcphdr->ackno));
-    }
-    fprintf(file, "wnd %u\n",
-	    ntohs(tcphdr->wnd));
-    
-    fflush(file);
-    
-    pbuf_header(p, IP_HLEN);
-    break;
-    
-  case IP_PROTO_UDP:    
-    udphdr = (struct udp_hdr *)((char *)iphdr + IP_HLEN);
-    
-    pbuf_header(p, -IP_HLEN);
-    if(inet_chksum_pseudo(p, (struct ip_addr *)&(iphdr->src),
-			  (struct ip_addr *)&(iphdr->dest),
-			  IP_PROTO_UDP, p->tot_len) != 0) {
-      kprintf("tcpdump: IP checksum failed!\n");
-      fprintf(file, "!chksum ");
-    }
-    
-    fprintf(file, "%d.%d.%d.%d.%u > %d.%d.%d.%d.%u: ",
-	    (int)(ntohl(iphdr->src.addr) >> 24) & 0xff,
-	    (int)(ntohl(iphdr->src.addr) >> 16) & 0xff,
-	    (int)(ntohl(iphdr->src.addr) >> 8) & 0xff,
-	    (int)(ntohl(iphdr->src.addr) >> 0) & 0xff,
-	    ntohs(udphdr->src),
-	  (int)(ntohl(iphdr->dest.addr) >> 24) & 0xff,
-	    (int)(ntohl(iphdr->dest.addr) >> 16) & 0xff,
-	    (int)(ntohl(iphdr->dest.addr) >> 8) & 0xff,
-	    (int)(ntohl(iphdr->dest.addr) >> 0) & 0xff,
-	    ntohs(udphdr->dest));
-    fprintf(file, "U ");
-    len = ntohs(IPH_LEN(iphdr)) - sizeof(struct udp_hdr) - IP_HLEN;
-    fprintf(file, " %d\n", len);
-    
-    fflush(file);
-    
-    pbuf_header(p, IP_HLEN);
-    break;
-
-  }
-  */
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/pci/Makefile b/sys/pci/Makefile
deleted file mode 100644
index 2647058..0000000
--- a/sys/pci/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 54 2016-01-11 01:29:55Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = hd.o pci.o lnc.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC) $(CFLAGS) $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC) -Wall -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/pci/hd.c b/sys/pci/hd.c
deleted file mode 100644
index 5d2ce27..0000000
--- a/sys/pci/hd.c
+++ /dev/null
@@ -1,569 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: hd.c 130 2016-01-14 15:45:44Z reddawg $
-
- *****************************************************************************************/
-
-#include <pci/hd.h>
-#include <sys/io.h>
-#include <sys/device.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <devfs/devfs.h>
-#include <string.h>
-#include <fs/common/gpt.h>
-
-static const uuid_t freebsd_ufs_uuid = GPT_ENT_TYPE_FREEBSD_UFS;
-
-int initHardDisk() {
-  int i = 0x0;
-  int x = 0x0;
-  int minor = 0x0;
-  struct device_interface *devInfo = 0x0;
-  struct device_interface *devInfo2 = 0x0;
-  struct dos_partition *d = 0x0;
-  struct driveInfo *hdd = 0x0;
-  struct driveInfo *hdd2 = 0x0;
-  char *data = 0x0;
-  char *data2 = 0x0;
-  char name[16];
-  struct bsd_disklabel *bsdd = 0x0;
-
-  //GPT
-  char *secbuf = 0x0;
-
-  hdd = (struct driveInfo *) kmalloc(sizeof(struct driveInfo));
-  hdd->ata_identify = (struct ata_identify_data *) kmalloc(sizeof(struct ata_identify_data));
-  hdd->hdPort = 0x1F0;
-  hdd->hdDev = 0x40;
-  hdd->parOffset = 0x0;
-  hdd->part = 0x2;
-
-  /* Alloc memory for device structure and set it up correctly */
-  devInfo = (struct device_interface *) kmalloc(sizeof(struct device_interface));
-  devInfo->read = (void *) &hdRead;
-  devInfo->write = (void *) &hdWrite;
-  devInfo->reset = (void *) &hdReset;
-  devInfo->init = (void *) &hdInit;
-  devInfo->ioctl = (void *) &hdIoctl;
-  devInfo->stop = (void *) &hdStop;
-  devInfo->start = (void *) &hdStart;
-  devInfo->standby = (void *) &hdStandby;
-  devInfo->info = hdd;
-
-  devInfo->major = 0x1;
-
-  data = (char *) kmalloc(512);
-  d = (struct dos_partition *) (data + 0x1BE);
-
-  data2 = (char *) kmalloc(512);
-  bsdd = (struct bsd_disklabel *) data2;
-
-  if (device_add(0, 'c', devInfo) == 0x0) {
-    kprintf("ad0 - Start: [0x0], Size: [0x%x/0x%X]\n", hdd->hdSize, hdd->hdSize * 512);
-    devfs_makeNode("ad0", 'b', 0x1, 0x0);
-    hdRead(devInfo->info, data, 0x0, 0x1);
-
-    if (d[0].dp_type == 0xEE) {
-      // MrOlsen (2016-01-14) DEBUG: This was just to help debug
-      //kprintf( "%s - Type: [0x%X - %s], Start: [0x%X], Size: [0x%X]\n", name, d[0].dp_type, (d[0].dp_type >= 0 && d[0].dp_type <= 255) ? part_types[d[0].dp_type] : "Unknown", d[0].dp_start, d[0].dp_size );
-
-      secbuf = (char *) kmalloc(65536);
-
-      if (gptread(&freebsd_ufs_uuid, devInfo, secbuf) == -1) {
-        kprintf("%s: unable to load GPT\n", "KERNEL");
-        //return (-1);
-      } else {
-        devInfo2 = (struct device_interface *) kmalloc(sizeof(struct device_interface));
-        hdd2 = (struct driveInfo *) kmalloc(sizeof(struct driveInfo));
-        memcpy(devInfo2, devInfo, sizeof(struct device_interface));
-        memcpy(hdd2, hdd, sizeof(struct driveInfo));
-        //hdd2->parOffset = d[i].dp_start;
-        devInfo2->info = hdd2;
-        minor++;
-
-        if (gptfind(&freebsd_ufs_uuid, devInfo2, hdd->part) == -1) {
-          //MrOlsen (2016-01-11) FIX: I am using "1" as partition 1
-          kprintf("%s: no UFS partition was found\n", "KERNEL");
-          //return (-1);
-        }
-
-//MrOlsen (2016-01-14) DEBUG: This was just debugging code
-//kprintf("[%i - %i]\n", hdd->parOffset, hdd2->parOffset);
-
-        if (device_add(minor, 'c', devInfo2) == 0x0) {
-          sprintf(name, "ad0p%i", hdd->part);
-          kprintf("%s - Type: [0x%X - %s], Start: [%i], Offset: [%i], Size: [%i]\n", name, d[0].dp_type, (d[0].dp_type >= 0 && d[0].dp_type <= 255) ? part_types[d[0].dp_type] : "Unknown", hdd2->lba_start, hdd2->parOffset, hdd2->lba_end - hdd2->lba_start);
-          devfs_makeNode(name, 'c', 0x1, minor);
-        }
-      }
-
-    } else {
-
-      for (i = 0x0; i < 0x4; i++) {
-
-        //MrOlsen (2016-01-14) DEBUG: This was just debugging code
-        //kprintf( "Type: 0x%X\n", d[i].dp_type );
-
-        if (d[i].dp_type == 0xEE)
-          kprintf("Motherfucker Jones! We're GPT.... Lick My Nuts Now Bitch!\n");
-
-        if (d[i].dp_type != 0x0) {
-          devInfo2 = (struct device_interface *) kmalloc(sizeof(struct device_interface));
-          hdd2 = (struct driveInfo *) kmalloc(sizeof(struct driveInfo));
-          memcpy(devInfo2, devInfo, sizeof(struct device_interface));
-          memcpy(hdd2, hdd, sizeof(struct driveInfo));
-          hdd2->parOffset = d[i].dp_start;
-          devInfo2->info = hdd2;
-          minor++;
-
-          if (device_add(minor, 'c', devInfo2) == 0x0) {
-            sprintf(name, "ad0s%i", i + 1);
-            kprintf("%s - Type: [0x%X - %s], Start: [0x%X], Size: [0x%X]\n", name, d[i].dp_type, (d[i].dp_type >= 0 && d[i].dp_type <= 255) ? part_types[d[i].dp_type] : "Unknown", d[i].dp_start, d[i].dp_size);
-            devfs_makeNode(name, 'c', 0x1, minor);
-
-            if (d[i].dp_type == 0xA5) {
-              //Why do i need to add 1?
-              hdRead(devInfo->info, data2, d[i].dp_start + 1, 0x1);
-
-              for (x = 0; x < bsdd->d_npartitions; x++) {
-                if (bsdd->d_partitions[x].p_size > 0) {
-                  sprintf(name, "ad0s%i%c", i + 1, 'a' + x);
-                  //New Nodes
-                  devInfo2 = (struct device_interface *) kmalloc(sizeof(struct device_interface));
-                  hdd2 = (struct driveInfo *) kmalloc(sizeof(struct driveInfo));
-                  memcpy(devInfo2, devInfo, sizeof(struct device_interface));
-                  memcpy(hdd2, hdd, sizeof(struct driveInfo));
-                  //hdd2->parOffset = d[i].dp_start + bsdd->d_partitions[x].p_offset;
-                  hdd2->lba_start = d[i].dp_start;
-                  hdd2->parOffset = bsdd->d_partitions[x].p_offset;
-                  devInfo2->info = hdd2;
-                  minor++;
-                  device_add(minor, 'c', devInfo2);
-                  devfs_makeNode(name, 'c', 0x1, minor);
-                  kprintf("%s - Type: [%s], Start: [0x%X], Size: [0x%X], MM: [%i:%i]\n", name, fstypenames[bsdd->d_partitions[x].p_fstype], bsdd->d_partitions[x].p_offset, bsdd->d_partitions[x].p_size, devInfo->major, minor);
-                }
-
-              }
-
-            }
-
-          }
-
-        }
-
-      }
-    }
-  }
-  kfree(data);
-  return (0x0);
-}
-
-int hdStandby() {
-  /* Not Implemented */
-  return (0x0);
-}
-
-int hdStart() {
-  /* Not Implemented */
-  return (0x0);
-}
-
-int hdStop() {
-  /* Not Implemented */
-  return (0x0);
-}
-
-int hdIoctl() {
-  /* Not Implemented */
-  return (0x0);
-}
-
-int hdReset() {
-  /* Not Implemented */
-  return (0x0);
-}
-
-int hdInit(struct device_node *dev) {
-  u_int8_t retVal = 0x0;
-  int counter = 0x0;
-  u_int16_t *tmp = 0x0;
-  struct driveInfo *hdd = dev->devInfo->info;
-
-  for (counter = 1000000; counter >= 0; counter--) {
-    retVal = inportByte(hdd->hdPort + ATA_COMMAND) & ATA_S_BUSY;
-
-    if (!retVal)
-      goto ready;
-
-  }
-
-  kprintf("Error Initializing Drive\n");
-  return (1);
-
-  ready:
-
-  outportByte(hdd->hdPort + ATA_DRIVE, hdd->hdDev);
-  outportByte(hdd->hdPort + ATA_COMMAND, ATA_IDENTIFY);
-
-  for (counter = 1000000; counter >= 0; counter--) {
-    retVal = inportByte(hdd->hdPort + ATA_COMMAND);
-    if ((retVal & 1) != 0x0) {
-      kprintf("Error Drive Not Available\n");
-      return (1);
-    }
-    if ((retVal & 8) != 0x0) {
-      goto go;
-    }
-  }
-
-  kprintf("Time Out Waiting On Drive\n");
-  return (1);
-
-  go:
-
-  tmp = (u_int16_t *) hdd->ata_identify;
-
-  for (counter = 0; counter < 256; counter++) {
-    tmp[counter] = inportWord(hdd->hdPort + ATA_DATA);
-  }
-
-  retVal = tmp[0x2F] & 0xFF;
-
-  switch (retVal) {
-  case 0:
-    hdd->hdShift = 0;
-    hdd->hdMulti = 1;
-    break;
-  case 2:
-    hdd->hdShift = 1;
-    hdd->hdMulti = retVal;
-    break;
-  case 4:
-    hdd->hdShift = 2;
-    hdd->hdMulti = retVal;
-    break;
-  case 8:
-    hdd->hdShift = 3;
-    hdd->hdMulti = retVal;
-    break;
-  case 16:
-    hdd->hdShift = 4;
-    hdd->hdMulti = retVal;
-    break;
-  case 32:
-    hdd->hdShift = 5;
-    hdd->hdMulti = retVal;
-    break;
-  case 64:
-    hdd->hdShift = 6;
-    hdd->hdMulti = retVal;
-    break;
-  case 128:
-    hdd->hdShift = 7;
-    hdd->hdMulti = retVal;
-    break;
-  default:
-    kprintf("Error BLOCK Mode Unavailable: [%x]\n", retVal);
-    return (1);
-  }
-
-  if (hdd->ata_identify->command_set_enabled1 & ATA_IDENTIFY_COMMAND_SET_SUPPORTED1_48BIT_ENABLE) {
-    hdd->lba_high = hdd->ata_identify->max_48bit_lba[7] << 24;
-    hdd->lba_high |= hdd->ata_identify->max_48bit_lba[6] << 16;
-    hdd->lba_high |= hdd->ata_identify->max_48bit_lba[5] << 8;
-    hdd->lba_high |= hdd->ata_identify->max_48bit_lba[4];
-
-    hdd->lba_low = hdd->ata_identify->max_48bit_lba[3] << 24;
-    hdd->lba_low |= hdd->ata_identify->max_48bit_lba[2] << 16;
-    hdd->lba_low |= hdd->ata_identify->max_48bit_lba[1] << 8;
-    hdd->lba_low |= hdd->ata_identify->max_48bit_lba[0];
-  } else {
-    hdd->lba_high = 0;
-    hdd->lba_low = hdd->ata_identify->total_num_sectors[3] << 24;
-    hdd->lba_low |= hdd->ata_identify->total_num_sectors[2] << 16;
-    hdd->lba_low |= hdd->ata_identify->total_num_sectors[1] << 8;
-    hdd->lba_low |= hdd->ata_identify->total_num_sectors[0];
-  }
-
-  // If the ATA device reports its sector size (bit 12 of Word 106), then use that instead.
-  if (hdd->ata_identify->physical_logical_sector_info & ATA_IDENTIFY_SECTOR_LARGER_THEN_512_ENABLE) {
-    hdd->sector_size = hdd->ata_identify->words_per_logical_sector[3] << 24;
-    hdd->sector_size |= hdd->ata_identify->words_per_logical_sector[2] << 16;
-    hdd->sector_size |= hdd->ata_identify->words_per_logical_sector[1] << 8;
-    hdd->sector_size |= hdd->ata_identify->words_per_logical_sector[0];
-  } else {
-    // Default the sector size to 512 bytes
-    hdd->sector_size = 512;
-  }
-
-  kprintf("LBA [0x%X - 0x%X], LBA_HIGH: %i, LBA_LOW: %i, SECTOR_SIZE: %i\n", hdd->ata_identify->command_set_enabled1, hdd->ata_identify->command_set_enabled1 & ATA_IDENTIFY_COMMAND_SET_SUPPORTED1_48BIT_ENABLE, hdd->lba_high, hdd->lba_low, hdd->sector_size);
-
-  outportByte(hdd->hdPort + hdSecCount, retVal);
-  outportByte(hdd->hdPort + hdHead, hdd->hdDev);
-  outportByte(hdd->hdPort + hdCmd, 0xC6);
-
-  hdd->hdMask = retVal;
-  //hdd->hdSize = (hdd->hdSector[0x7B] * 256 * 256 * 256) + (hdd->hdSector[0x7A] * 256 * 256) + (hdd->hdSector[0x79] * 256) + hdd->hdSector[0x78];
-
-  // MrOlsen (2016-01-11) NOTE: Must phase out hdSize
-  hdd->hdSize = hdd->lba_low + hdd->lba_high;
-  hdd->hdEnable = 1;
-
-  kprintf("Drive: [0x%X/0x%X], Size: [%i Sectors/%i MB]\n", hdd->hdPort, hdd->hdDev, hdd->hdSize, hdd->hdSize / 2048);
-  dev->devInfo->size = hdd->hdSize * 512;
-  dev->devInfo->initialized = 0x1;
-  return (0x0);
-}
-
-int hdWrite(struct driveInfo *hdd, void *baseAddr, uInt32 startSector, uInt32 sectorCount) {
-  long counter = 0x0;
-  long retVal = 0x0;
-  short transactionCount = 0x0;
-  short *tmp = (short *) baseAddr;
-  if (hdd->lba_start == 0)
-    startSector += hdd->parOffset;
-  else
-  startSector += hdd->lba_start;
-
-  if (hdd->hdEnable == 0x0) {
-    kprintf("Invalid Drive\n");
-    return (1);
-  }
-  if ((sectorCount >> hdd->hdShift) == 0x0) {
-    hdd->hdCalc = sectorCount; /* hdd->hdMask; */
-    transactionCount = 1;
-  } else {
-    hdd->hdCalc = hdd->hdMulti;
-    transactionCount = sectorCount >> hdd->hdShift;
-  }
-  for (; transactionCount > 0; transactionCount--) {
-    for (counter = 1000000; counter >= 0; counter--) {
-      retVal = inportByte(hdd->hdPort + hdStat) & 0x80;
-      if (!retVal)
-        goto ready;
-    }
-    kprintf("Time Out Waiting On Drive\n");
-    return (1);
-    ready: outportByte(hdd->hdPort + hdSecCount, hdd->hdCalc);
-    outportByte(hdd->hdPort + hdSecNum, (startSector & 0xFF));
-    retVal = startSector >> 8;
-    outportByte(hdd->hdPort + hdCylLow, (retVal & 0xFF));
-    retVal >>= 8;
-    outportByte(hdd->hdPort + hdCylHi, (retVal & 0xFF));
-    retVal >>= 8;
-    retVal &= 0x0F;
-    retVal |= (hdd->hdDev | 0xA0); //Test As Per TJ
-    outportByte(hdd->hdPort + hdHead, (retVal & 0xFF));
-    if (hdd->hdShift > 0)
-      outportByte(hdd->hdPort + hdCmd, 0xC5);
-    else
-      outportByte(hdd->hdPort + hdCmd, 0x30);
-    for (counter = 1000000; counter >= 0; counter--) {
-      retVal = inportByte(hdd->hdPort + hdStat);
-      if ((retVal & 1) != 0x0) {
-        kprintf("HD Write Error\n");
-        return (1);
-      }
-      if ((retVal & 8) != 0x0) {
-        goto go;
-      }
-    }
-    kprintf("Time Out Waiting On Drive\n");
-    return (1);
-    go: for (counter = 0; counter < (hdd->hdCalc << 8); counter++) {
-      outportWord(hdd->hdPort + hdData, (short) tmp[counter]);
-    }
-    tmp += (counter + 0);
-    startSector += hdd->hdCalc;
-  }
-  return (0);
-}
-
-int hdRead(struct driveInfo *hdd, void *baseAddr, uInt32 startSector, uInt32 sectorCount) {
-  long counter = 0x0;
-  long retVal = 0x0;
-  short transactionCount = 0x0;
-  short *tmp = (short *) baseAddr;
-  startSector += hdd->parOffset;
-  startSector += hdd->lba_start;
-
-
-
-  if (hdd->hdEnable == 0x0) {
-    kprintf("Invalid Drive\n");
-    return (1);
-  }
-  if ((sectorCount >> hdd->hdShift) == 0x0) {
-    hdd->hdCalc = sectorCount; /* hdd->hdMask); */
-    transactionCount = 1;
-  } else {
-    hdd->hdCalc = hdd->hdMulti;
-    transactionCount = sectorCount >> hdd->hdShift;
-  }
-  for (; transactionCount > 0; transactionCount--) {
-    for (counter = 1000000; counter >= 0; counter--) {
-      retVal = inportByte(hdd->hdPort + hdStat) & 0x80;
-      if (!retVal)
-        goto ready;
-    }
-    kprintf("Time Out Waiting On Drive\n");
-    return (1);
-    ready: outportByte(hdd->hdPort + hdSecCount, hdd->hdCalc);
-    outportByte(hdd->hdPort + hdSecNum, (startSector & 0xFF));
-    retVal = startSector >> 8;
-    outportByte(hdd->hdPort + hdCylLow, (retVal & 0xFF));
-    retVal >>= 8;
-    outportByte(hdd->hdPort + hdCylHi, (retVal & 0xFF));
-    retVal >>= 8;
-    retVal &= 0x0F;
-    retVal |= (hdd->hdDev | 0xA0); //Test as per TJ
-    //retVal |= hdd->hdDev; //retVal |= (hdd->hdDev | 0xA0); //Test as per TJ
-    outportByte(hdd->hdPort + hdHead, (retVal & 0xFF));
-    if (hdd->hdShift > 0)
-      outportByte(hdd->hdPort + hdCmd, 0xC4);
-    else
-      outportByte(hdd->hdPort + hdCmd, 0x20);
-    for (counter = 1000000; counter >= 0; counter--) {
-      retVal = inportByte(hdd->hdPort + hdStat);
-      if ((retVal & 1) != 0x0) {
-        kprintf("HD Read Error: [%i:0x%X:%i]\n", counter, (uInt32) baseAddr, startSector);
-        return (1);
-      }
-      if ((retVal & 8) != 0x0) {
-        goto go;
-      }
-    }
-    kprintf("Error: Time Out Waiting On Drive\n");
-    return (1);
-    go: for (counter = 0; counter < (hdd->hdCalc << 8); counter++) {
-      tmp[counter] = inportWord(hdd->hdPort + hdData);
-//kprintf("[0x%X]", tmp[counter]);
-    }
-    tmp += (counter + 0);
-    startSector += hdd->hdCalc;
-  }
-  return (0);
-}
-
-/***
- $Log: hd.c,v $
- Revision 1.5  2006/10/12 15:00:26  reddawg
- More changes
-
- Revision 1.4  2006/10/10 14:14:01  reddawg
- UFS Reading
-
- Revision 1.3  2006/10/09 02:58:05  reddawg
- Fixing UFS
-
- Revision 1.2  2006/10/06 15:48:01  reddawg
- Starting to make ubixos work with UFS2
-
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:34  reddawg
- no message
-
- Revision 1.16  2004/08/26 22:51:19  reddawg
- TCA touched me :( i think he likes men....
-
-
- sched.h:        kTask_t added parentPid
- endtask.c:     fixed term back to parentPid
- exec.c:          cleaned warnings
- fork.c:            fixed term to childPid
- sched.c:         clean up for dead tasks
- systemtask.c: clean up dead tasks
- kmalloc.c:       cleaned up warnings
- udp.c:            cleaned up warnings
- bot.c:             cleaned up warnings
- shell.c:           cleaned up warnings
- tcpdump.c:     took a dump
- hd.c:             cleaned up warnings
- ubixfs.c:        stopped prning debug info
-
- Revision 1.15  2004/08/15 00:33:02  reddawg
- Wow the ide driver works again
-
- Revision 1.14  2004/08/14 21:56:44  reddawg
- Added initialized byte to the device system to make it easy to add child devices which use parent hardware.
-
- Revision 1.13  2004/08/02 11:43:17  reddawg
- Fixens
-
- Revision 1.12  2004/07/21 10:02:09  reddawg
- devfs: renamed functions
- device system: renamed functions
- fdc: fixed a few potential bugs and cleaned up some unused variables
- strol: fixed definition
- endtask: made it print out freepage debug info
- kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost
- ld: fixed a pointer conversion
- file: cleaned up a few unused variables
- sched: broke task deletion
- kprintf: fixed ogPrintf definition
-
- Revision 1.11  2004/05/19 23:36:52  reddawg
- Bug Fixes
-
- Revision 1.10  2004/05/19 15:20:06  reddawg
- Fixed reference problems due to changes in drive subsystem
-
- Revision 1.9  2004/05/19 15:07:59  reddawg
- Typo defInfo should of been devInfo
-
- Revision 1.7  2004/05/19 04:07:43  reddawg
- kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
-
- Revision 1.6  2004/04/28 21:10:40  reddawg
- Lots Of changes to make it work with existing os
-
- Revision 1.5  2004/04/28 02:37:34  reddawg
- More updates for using the new driver subsystem
-
- Revision 1.4  2004/04/28 02:22:54  reddawg
- This is a fiarly large commit but we are starting to use new driver model
- all around
-
- Revision 1.3  2004/04/27 21:05:19  reddawg
- Updating drivers to use new model
-
- Revision 1.2  2004/04/26 22:22:33  reddawg
- DevFS now uses correct size of device
-
- Revision 1.1.1.1  2004/04/15 12:07:16  reddawg
- UbixOS v1.0
-
- Revision 1.12  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
diff --git a/sys/pci/lnc.c b/sys/pci/lnc.c
deleted file mode 100644
index 2b36bbc..0000000
--- a/sys/pci/lnc.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/*-
- * Copyright (c) 2002, 2017 The UbixOS Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions, the following disclaimer and the list of authors.  Redistributions in binary
- * form must reproduce the above copyright notice, this list of conditions, the following
- * disclaimer and the list of authors in the documentation and/or other materials provided
- * with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
- * THIS 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 COPYRIGHT OWNER 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.
- */
-
-#include <pci/lnc.h>
-#include <sys/io.h>
-#include <sys/types.h>
-#include <sys/idt.h>
-#include <sys/gdt.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <sys/video.h>
-#include <isa/8259.h>
-#include <net/net.h>
-#include <net/netif.h>
-#include <ubixos/spinlock.h>
-
-struct lncInfo *lnc = 0x0;
-
-static struct spinLock lnc_intSpinLock = SPIN_LOCK_INITIALIZER;
-
-static char const * const nicIdent[] = { "Unknown", "BICC", "NE2100", "DEPCA", "CNET98S" };
-
-static char const * const icIdent[] = { "Unknown", "LANCE", "C-LANCE", "PCnet-ISA", "PCnet-ISA+", "PCnet-ISA II", "PCnet-32 VL-Bus", "PCnet-PCI", "PCnet-PCI II", "PCnet-FAST", "PCnet-FAST+", "PCnet-Home", };
-
-void lnc_writeCSR(struct lncInfo *lnc, uint16_t port, uint16_t val) {
-  outportWord(lnc->ioAddr + RAP, port);
-  outportWord(lnc->ioAddr + RDP, val);
-}
-
-void lnc_writeCSR32(struct lncInfo *lnc, uint32_t port, uint32_t val) {
-  outportDWord(lnc->ioAddr + RAP32, port);
-  outportDWord(lnc->ioAddr + RDP32, val);
-}
-
-uint16_t lnc_readCSR(struct lncInfo *lnc, uint16_t port) {
-  outportWord(lnc->ioAddr + RAP, port);
-  return (inportWord(lnc->ioAddr + RDP));
-}
-
-uint32_t lnc_readCSR32(struct lncInfo *lnc, uint32_t port) {
-  outportDWord(lnc->ioAddr + RAP32, port);
-  return (inportDWord(lnc->ioAddr + RDP32));
-}
-
-void lnc_writeBCR(struct lncInfo *lnc, uint16_t port, uint16_t val) {
-  outportWord(lnc->ioAddr + RAP, port);
-  outportWord(lnc->ioAddr + BDP, val);
-}
-
-void lnc_writeBCR32(struct lncInfo *lnc, uint32_t port, uint32_t val) {
-  outportDWord(lnc->ioAddr + RAP32, port);
-  outportDWord(lnc->ioAddr + BDP32, val);
-}
-
-uint16_t lnc_readBCR(struct lncInfo *lnc, uint16_t port) {
-  outportWord(lnc->ioAddr + RAP, port);
-  return (inportWord(lnc->ioAddr + BDP));
-}
-
-uint32_t lnc_readBCR32(struct lncInfo *lnc, uint32_t port) {
-  outportDWord(lnc->ioAddr + RAP32, port);
-  return (inportDWord(lnc->ioAddr + BDP32));
-}
-
-int initLNC() {
-  int i = 0x0;
-
-  char data[64] = "abcDEFghiJKLmnoPQRstuVWXyz";
-
-  lnc = kmalloc(sizeof(struct lncInfo));
-  memset(lnc, 0x0, sizeof(struct lncInfo));
-
-  lnc->bufferSize = 1548;
-  lnc->ioAddr = 0xD020;
-
-
-  lnc->nic.ic = lnc_probe(lnc);
-
-  if ((lnc->nic.ic > 0) && (lnc->nic.ic >= PCnet_32)) {
-    lnc->nic.ident = NE2100;
-    lnc->nic.memMode = DMA_FIXED;
-
-    lnc->nrdre = NRDRE;
-    lnc->ntdre = NTDRE;
-
-    /* Extract MAC address from PROM */
-    for (i = 0; i < ETHER_ADDR_LEN; i++) {
-      lnc->arpcom.ac_enaddr[i] = inportByte(lnc->ioAddr + i);
-    }
-  }
-  else {
-    return (-1);
-  }
-
-  lncAttach(lnc, 0);
-
-  i = lnc_getMode(lnc);
-  if (i == MODE_16)
-    kprintf("16 Bit");
-  else if (i == MODE_32)
-    kprintf("32 Bit");
-  else
-    kprintf("Invalid Mode: [%i]", i);
-
-  lnc_switchDWord(lnc);
-
-  uint32_t iW = 0;
-
-  iW = lnc_readBCR32(lnc, 0x2);
-  iW |= 0x2;
-  lnc_writeBCR32(lnc, 0x2, iW);
-  //kprintf("BCR2: [0x%X]", lnc_readBCR32(lnc, 0x2));
-
-  lnc->init.mode = 0x0;
-
-  lnc->init.padr[0] = lnc->arpcom.ac_enaddr[0];
-  lnc->init.padr[1] = lnc->arpcom.ac_enaddr[1];
-  lnc->init.padr[2] = lnc->arpcom.ac_enaddr[2];
-  lnc->init.padr[3] = lnc->arpcom.ac_enaddr[3];
-  lnc->init.padr[4] = lnc->arpcom.ac_enaddr[4];
-  lnc->init.padr[5] = lnc->arpcom.ac_enaddr[5];
-
-  lnc->init.rdra = (uint32_t) vmm_getRealAddr(lnc->rxRing);
-  lnc->init.rlen = 3 << 4;
-  //kprintf("Virt Addr: 0x%X, Real Addr: 0x%X", lnc->rxRing, vmm_getRealAddr(lnc->rxRing));
-
-  lnc->init.tdra = (uint32_t) vmm_getRealAddr(lnc->txRing);
-  lnc->init.tlen = 3 << 4;
-  //kprintf("Virt Addr: 0x%X, Real Addr: 0x%X", lnc->txRing, vmm_getRealAddr(lnc->txRing));
-
-  //kprintf("Virt Addr: 0x%X, Real Addr: 0x%X", &lnc->init, vmm_getRealAddr(&lnc->init));
-
-  iW = vmm_getRealAddr(&lnc->init);
-
-  lnc_writeCSR32(lnc, CSR1, iW & 0xFFFF);
-  lnc_writeCSR32(lnc, CSR2, (iW >> 16) & 0xFFFF);
-
-  lnc_writeCSR32(lnc, CSR3, 0);
-  lnc_writeCSR32(lnc, CSR0, INIT);
-
-  for (i = 0; i < 1000; i++)
-    if (lnc_readCSR32(lnc, CSR0) & IDON)
-      break;
-
-  if (lnc_readCSR32(lnc, CSR0) & IDON) {
-    setVector(&lnc_isr, sVec + 0x1, (dInt + dPresent + dDpl3));
-    irqEnable(2);
-    //irqEnable(0x9);
-    lnc_writeCSR32(lnc, CSR0, STRT | INEA);
-  }
-  else {
-    kprintf("LNC: init Error\n");
-    return (-1);
-  }
-
-  return (0);
-}
-
-int lnc_probe(struct lncInfo *lnc) {
-
-  uInt32 chipId = 0x0;
-  int type = 0x0;
-
-  if ((type = lanceProbe(lnc))) {
-    //kprintf("Type: [0x%X]", type);
-    chipId = lnc_readCSR(lnc, CSR89);
-    chipId <<= 16;
-    chipId |= lnc_readCSR(lnc, CSR88);
-    if (chipId & AMD_MASK) {
-      chipId >>= 12;
-      switch (chipId & PART_MASK) {
-        case Am79C960:
-          return (PCnet_ISA);
-        case Am79C961:
-          return (PCnet_ISAplus);
-        case Am79C961A:
-          return (PCnet_ISA_II);
-        case Am79C965:
-          return (PCnet_32);
-        case Am79C970:
-          return (PCnet_PCI);
-        case Am79C970A:
-          return (PCnet_PCI_II);
-        case Am79C971:
-          return (PCnet_FAST);
-        case Am79C972:
-        case Am79C973:
-          return (PCnet_FASTplus);
-        case Am79C978:
-          return (PCnet_Home);
-        default:
-        break;
-      }
-    }
-  }
-  return (type);
-}
-
-int lanceProbe(struct lncInfo *lnc) {
-  uInt16 inW = 0;
-
-  lnc_writeCSR(lnc, CSR0, CSR0_STOP);
-
-  inW = inportWord(lnc->ioAddr + RDP);
-
-  if ((inW & CSR0_STOP) && !(lnc_readCSR(lnc, CSR3))) {
-
-    lnc_writeCSR(lnc, CSR0, INEA);
-
-    if (lnc_readCSR(lnc, CSR0) & INEA) {
-      return (C_LANCE);
-    }
-    else {
-      return (LANCE);
-    }
-  }
-  else {
-    return (UNKNOWN);
-  }
-}
-
-void lnc_INT() {
-  uint16_t csr0 = 0x0;
-
-  //kprintf("\nINTR\n");
-  //while ((csr0 = lnc_readCSR32(lnc, CSR0)) & INTR) {
-    //kprintf("CSR0: [0x%X]\n", csr0);
-    if (csr0 & ERR) {
-      kprintf("Error: [0x%X]\n", csr0);
-    }
-    if (csr0 & RINT) {
-      asm("nop");
-      //lnc_rxINT();
-    }
-    if (csr0 & TINT) {
-      asm("nop");
-       //kprintf("TINT");
-       //lnc_txINT();
-    }
- //   kprintf("CSR0.1: [0x%X]\n", lnc_readCSR32(lnc, CSR0));
-//  }
-  lnc_writeCSR32(lnc, CSR0, 0x7940);//csr0);
-//  kprintf("INT DONE");
-}
-
-void lnc_thread() {
-  int i = 0;
-
-  if (tmpBuf == 0x0) {
-    tmpBuf = (struct nicBuffer *)kmalloc(sizeof(struct nicBuffer));
-    memset(tmpBuf,0x0,sizeof(struct nicBuffer));
-  }
-  else {
-    memset(tmpBuf,0x0,sizeof(struct nicBuffer));
-  }
-  while (1) {
-  while (lnc_driverOwnsRX(lnc)) {
-    //uint16_t plen = 0 + (uint16_t)lnc->rxRing[lnc->rxPtr].md[2];
-    int plen = (lnc->rxRing[lnc->rxPtr].md[2] & 0x0fff ) - 4;
-
-    tmpBuf->length = plen;
-    tmpBuf->buffer = (void *)(lnc->rxBuffer + (lnc->rxPtr * lnc->bufferSize)); //(char *)kmalloc(length);
-
-    ethernetif_input(&lnc_netif);
-    lnc->rxRing[lnc->rxPtr].md[1] = 0x80;
-    lnc_nextRxPtr(lnc);
-  }
-
-  sched_yield();
-  }
-}
-
-
-void lnc_rxINT() {
-  int i = 0;
-
-  if (tmpBuf == 0x0) {
-    tmpBuf = (struct nicBuffer *)kmalloc(sizeof(struct nicBuffer));
-    memset(tmpBuf,0x0,sizeof(struct nicBuffer));
-  }
-  else {
-    memset(tmpBuf,0x0,sizeof(struct nicBuffer));
-  }
-
-  while (lnc_driverOwnsRX(lnc)) {
-    //uint16_t plen = 0 + (uint16_t)lnc->rxRing[lnc->rxPtr].md[2];
-    int plen = (lnc->rxRing[lnc->rxPtr].md[2] & 0x0fff ) - 4;
-/*
-    if (plen > 0)
-      kprintf("plen.0: [0x%X]", plen);
-*/
-
-    tmpBuf->length = plen;
-    tmpBuf->buffer = (void *)(lnc->rxBuffer + (lnc->rxPtr * lnc->bufferSize)); //(char *)kmalloc(length);
-
- // kprintf("RINT2\n");
-    //ethernetif_input(netif_default);
-  //kprintf("RINT3\n");
-  //kprintf("RINT-LOOP[%i][0x%X][0x%X]", lnc->rxPtr,lnc->rxRing[lnc->rxPtr].md[1],plen);
-    lnc->rxRing[lnc->rxPtr].md[1] = 0x80;
-  //kprintf("RINT-LOOP[%i][0x%X][0x%X]", lnc->rxPtr,lnc->rxRing[lnc->rxPtr].md[1],plen);
-    lnc_nextRxPtr(lnc);
-  //kprintf("RINT-LOOP[%i][0x%X][0x%X]\n", lnc->rxPtr,lnc->rxRing[lnc->rxPtr].md[1],plen);
-  }
- // kprintf("RINT-DONE[%i][0x%X]\n", lnc->rxPtr,lnc->rxRing[lnc->rxPtr].md[1]);
-//while(1);
-  
-}
-
-void lnc_txINT() {
-  uint16_t status = 0x0;
-
-
-  kprintf("TINT\n");
-  status = lnc->txRing[lnc->txPtr].md[1] + (lnc->txRing[lnc->txPtr].md[1] << 16); 
-  kprintf("Status: [0x%X]\n", status);
-
-  while (!lnc_driverOwnsTX(lnc)) {
-    status = lnc->txRing[lnc->txPtr].md[1] + (lnc->txRing[lnc->txPtr].md[1] << 16); 
-     kprintf("md[1]: 0x%X(%i)[0x%X]\n", lnc->txRing[lnc->txPtr].md[1], lnc->txPtr, status);
-     lnc->txRing[lnc->txPtr].md[1] = 0x0;
-     lnc_nextTxPtr(lnc);
-  }
-  kprintf("TINT-DONE\n");
-}
-
-void lncInt() {
-  while (1) {
-  kprintf("Finished!!!\n");
-  }
-  outportByte(0x20, 0x20);
-  return;
-  uInt16 csr0 = 0x0;
-  while ((csr0 = inportWord(lnc->ioAddr + RDP)) & INTR) {
-    outportWord(lnc->ioAddr + RDP, csr0);
-    kprintf("CSR0: [0x%X]\n", csr0);
-    if (csr0 & ERR) {
-      kprintf("Error: [0x%X]\n", csr0);
-    }
-    if (csr0 & RINT) {
-      kprintf("RINT\n");
-    }
-    if (csr0 & TINT) {
-      kprintf("TINT\n");
-    }
-    outportWord(lnc->ioAddr + RDP, csr0);
-    kprintf("CSR0: [0x%X]\n", csr0);
-  }
-  kprintf("Finished!!!\n");
-  return;
-}
-
-asm(
-  ".globl lnc_isr       \n"
-  "lnc_isr:             \n"
-  "  pusha                \n" /* Save all registers           */
-  "  push %ss             \n"
-  "  push %ds             \n"
-  "  push %es             \n"
-  "  push %fs             \n"
-  "  push %gs             \n"
-  "  call lnc_INT         \n"
-  "  mov $0xA0,%dx        \n"
-  "  mov $0x20,%ax        \n"
-  "  outb %al,%dx         \n"
-  "  mov $0x20,%dx        \n"
-  "  mov $0x20,%ax        \n"
-  "  outb %al,%dx         \n"
-  "  pop %gs              \n"
-  "  pop %fs              \n"
-  "  pop %es              \n"
-  "  pop %ds              \n"
-  "  pop %ss              \n"
-  "  popa                 \n"
-  "  iret                 \n" /* Exit interrupt                           */
-);
-
-int lncAttach(struct lncInfo *lnc, int unit) {
-  int i = 0;
-  uint32_t lncSize = 0x0;
-  uint16_t bcnt = 0x0;
-
-  /* Initialize rxRing */
-  lncSize = (NDESC(lnc->nrdre) * sizeof(struct hostRingEntry));
-  //kprintf("rxRing Size: [%i]", lncSize);
-  lnc->rxRing = kmalloc(lncSize);
-
-  if (!lnc->rxRing) {
-    kprintf("lnc%d: Couldn't allocate memory for rxRing\n", unit);
-    return (-1);
-  }
-
-  memset(lnc->rxRing, 0x0, lncSize);
-
-  /* Initialize rxBuffer */
-  lncSize = (NDESC(lnc->nrdre) * lnc->bufferSize);
-  //kprintf("rxBuffer Size: [%i]\n", lncSize);
-  lnc->rxBuffer = kmalloc(lncSize);
-  if (!lnc->rxBuffer) {
-    kprintf("lnc%d: Couldn't allocate memory for rXBuffer\n", unit);
-    return (-1);
-  }
-  memset(lnc->rxBuffer, 0x0, lncSize);
-
-  /* Setup the RX Ring */
-  for (i = 0; i < NDESC(lnc->nrdre); i++) {
-    lnc->rxRing[i].addr = (uint32_t) vmm_getRealAddr((uint32_t) lnc->rxBuffer + (i * lnc->bufferSize));
-    bcnt = (uint16_t) (-lnc->bufferSize);
-    bcnt &= 0x0FFF;
-    bcnt |= 0xF000;
-    //kprintf("rxR[%i].addr = 0x%X, BCNT 0x%X", i, lnc->rxRing[i].addr,bcnt);
-    lnc->rxRing[i].bcnt = bcnt;
-    lnc->rxRing[i].md[1] = 0x80;
-  }
-
-  /* Initialize txRing */
-  lncSize = (NDESC(lnc->ntdre) * sizeof(struct hostRingEntry));
-  //kprintf("txRing Size: [%i]", lncSize);
-  lnc->txRing = kmalloc(lncSize);
-
-  if (!lnc->txRing) {
-    kprintf("lnc%d: Couldn't allocate memory for txRing\n", unit);
-    return (-1);
-  }
-
-  memset(lnc->txRing, 0x0, lncSize);
-
-  /* Initialize txBuffer */
-  lncSize = (NDESC(lnc->ntdre) * lnc->bufferSize);
-  //kprintf("txBuffer Size: [%i]\n", lncSize);
-  lnc->txBuffer = kmalloc(lncSize);
-  if (!lnc->txBuffer) {
-    kprintf("lnc%d: Couldn't allocate memory for txBuffer\n", unit);
-    return (-1);
-  }
-  memset(lnc->txBuffer, 0x0, lncSize);
-
-  /* Setup the TX Ring */
-  for (i = 0; i < NDESC(lnc->ntdre); i++) {
-    lnc->txRing[i].addr = (uint32_t) vmm_getRealAddr((uint32_t) lnc->txBuffer + (i * lnc->bufferSize));
-    bcnt = (uint16_t) (-lnc->bufferSize);
-    bcnt &= 0x0FFF;
-    bcnt |= 0xF000;
-    //kprintf("txR[%i].addr = 0x%X, BCNT 0x%X", i, lnc->txRing[i].addr,bcnt);
-    lnc->txRing[i].bcnt = bcnt;
-  }
-
-  /* MrOlsen 2017-12-16
-   if (lnc->nic.memMode != SHMEM)
-   lncMemSize += sizeof(struct initBlock) + (sizeof(struct mds) * (NDESC(lnc->nrdre) + NDESC(lnc->ntdre))) + MEM_SLEW;
-   if (lnc->nic.memMode == DMA_FIXED)
-   lncMemSize += (NDESC(lnc->nrdre) * RECVBUFSIZE) + (NDESC(lnc->ntdre) * TRANSBUFSIZE);
-   */
-
-  if (lnc->nic.memMode != SHMEM)
-    if (lnc->nic.ic < PCnet_32)
-      kprintf("ISA Board\n");
-    else
-      kprintf("PCI Board\n");
-
-  lnc->nic.mode = NORMAL;
-
-  kprintf("lnc%d: ", unit);
-  if (lnc->nic.ic == LANCE || lnc->nic.ic == C_LANCE)
-    kprintf("%s (%s)", nicIdent[lnc->nic.ident], icIdent[lnc->nic.ic]);
-  else
-    kprintf("%s", icIdent[lnc->nic.ic]);
-
-  kprintf(" address %x:%x:%x:%x:%x:%x\n", lnc->arpcom.ac_enaddr[0], lnc->arpcom.ac_enaddr[1], lnc->arpcom.ac_enaddr[2], lnc->arpcom.ac_enaddr[3], lnc->arpcom.ac_enaddr[4], lnc->arpcom.ac_enaddr[5]);
-  return (1);
-}
-
-int lnc_driverOwnsTX(struct lncInfo *lnc) {
-  return (lnc->txRing[lnc->txPtr].md[1] & 0x80) == 0;
-}
-
-int lnc_driverOwnsRX(struct lncInfo *lnc) {
-  return (lnc->rxRing[lnc->rxPtr].md[1] & 0x80) == 0;
-}
-
-int lnc_nextTxPtr(struct lncInfo *lnc) {
-  int ret = lnc->txPtr + 1;
-
-  if (ret == NDESC(lnc->ntdre)) {
-    ret = 0;
-  }
-
-  lnc->txPtr = ret;
-
-  return(0);
-}
-
-int lnc_nextRxPtr(struct lncInfo *lnc) {
-  int ret = lnc->rxPtr + 1;
-
-  if (ret == NDESC(lnc->nrdre)) {
-    ret = 0;
-  }
-
-  lnc->rxPtr = ret;
-
-  return(0);
-}
-
-
-int lnc_sendPacket(struct lncInfo *lnc, void *packet, size_t len, uint8_t *dest) {
-  //kprintf("SEND PACKET1![%i]\n", lnc->txPtr);
-  if (!lnc_driverOwnsTX(lnc)) {
-    kpanic("NO TX BUFFERS");
-    return (0);
-  }
-
-  //kprintf("SEND PACKET2![%i]\n", lnc->txPtr);
-
-  memcpy((void *) (lnc->txBuffer + (lnc->txPtr * lnc->bufferSize)), packet, len);
-
-  lnc->txRing[lnc->txPtr].md[1] |= 0x2;
-  lnc->txRing[lnc->txPtr].md[1] |= 0x1;
-
-  uint16_t bcnt = (uint16_t) (-len);
-  bcnt &= 0xFFF;
-  bcnt |= 0xF000;
-  lnc->txRing[lnc->txPtr].bcnt = bcnt;
-
-  lnc->txRing[lnc->txPtr].md[1] |= 0x80;
-
-  lnc_nextTxPtr(lnc);
-
-  //kprintf("SEND PACKET3![%i]\n", lnc->txPtr);
-  return (len);
-}
-
-int lnc_getMode(struct lncInfo *lnc) {
-  lnc_reset32(lnc);
-  if (lnc_readCSR32(lnc, CSR0) == CSR0_STOP)
-    return MODE_32;
-
-  lnc_reset(lnc);
-  if (lnc_readCSR(lnc, CSR0) == CSR0_STOP)
-    return MODE_16;
-
-  return (MODE_INVALID);
-}
-
-void lnc_reset(struct lncInfo *lnc) {
-  inportWord(lnc->ioAddr + RESET);
-}
-
-void lnc_reset32(struct lncInfo *lnc) {
-  inportDWord(lnc->ioAddr + RESET32);
-}
-
-int lnc_switchDWord(struct lncInfo *lnc) {
-  inportDWord(lnc->ioAddr + RESET32);
-  inportWord(lnc->ioAddr + RESET);
-  outportDWord(lnc->ioAddr + RDP, 0);
-
-  /* a dword write to RDP sets controller into 32-bit I/O mode */
-  if (!(lnc_readBCR32(lnc, BCR18) & BCR18_DWIO)) {
-    kprintf("Cannot Swithc To 32 Bit");
-  }
-  uint32_t _csr58 = lnc_readCSR32(lnc, CSR58);
-  _csr58 &= 0xFFF0;
-  _csr58 |= 2;
-  lnc_writeCSR32(lnc, CSR58, _csr58);
-
-  return (0);
-
-}
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
deleted file mode 100644
index 7b44a9f..0000000
--- a/sys/pci/pci.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: pci.c 79 2016-01-11 16:21:27Z reddawg $
-
- *****************************************************************************************/
-
-#include <pci/pci.h>
-#include <sys/io.h>
-#include <lib/kprintf.h>
-
-const struct {
-  uInt8 baseClass;
-  uInt8 subClass;
-  uInt8 interface;
-  const char* name;
-} pciClasses[] = { { 0x00, 0x00, 0x00, "Undefined" }, { 0x00, 0x01, 0x00, "VGA" },
-
-{ 0x01, 0x00, 0x00, "SCSI" }, { 0x01, 0x01, 0x00, "IDE" }, { 0x01, 0x01, 0x8A, "IDE" }, { 0x01, 0x02, 0x00, "Floppy" }, { 0x01, 0x03, 0x00, "IPI" }, { 0x01, 0x04, 0x00, "RAID" }, { 0x01, 0x80, 0x00, "Other" },
-
-{ 0x02, 0x00, 0x00, "Ethernet" }, { 0x02, 0x01, 0x00, "Token Ring" }, { 0x02, 0x02, 0x00, "FDDI" }, { 0x02, 0x03, 0x00, "ATM" }, { 0x02, 0x04, 0x00, "ISDN" }, { 0x02, 0x80, 0x00, "Other" },
-
-{ 0x03, 0x00, 0x00, "VGA" }, { 0x03, 0x00, 0x01, "VGA+8514" }, { 0x03, 0x01, 0x00, "XGA" }, { 0x03, 0x02, 0x00, "3D" }, { 0x03, 0x80, 0x00, "VGA Other" },
-
-{ 0x04, 0x00, 0x00, "Video" }, { 0x04, 0x01, 0x00, "Audio" }, { 0x04, 0x02, 0x00, "Telephony" }, { 0x04, 0x80, 0x00, "Other" },
-
-{ 0x05, 0x00, 0x00, "RAM" }, { 0x05, 0x01, 0x00, "Flash" }, { 0x05, 0x80, 0x00, "Other" },
-
-{ 0x06, 0x00, 0x00, "PCI to HOST" }, { 0x06, 0x01, 0x00, "PCI to ISA" }, { 0x06, 0x02, 0x00, "PCI to EISA" }, { 0x06, 0x03, 0x00, "PCI to MCA" }, { 0x06, 0x04, 0x00, "PCI to PCI" }, { 0x06, 0x04, 0x01, "PCI to PCI (Subtractive Decode)" }, { 0x06, 0x05, 0x00, "PCI to PCMCIA" }, { 0x06, 0x06, 0x00, "PCI to NuBUS" }, { 0x06, 0x07, 0x00, "PCI to Cardbus" }, { 0x06, 0x08, 0x00, "PCI to RACEway" }, { 0x06, 0x09, 0x00, "PCI to PCI" }, { 0x06, 0x0A, 0x00, "PCI to InfiBand" }, { 0x06, 0x80, 0x00, "PCI to Other" },
-
-{ 0x07, 0x00, 0x00, "Serial" }, { 0x07, 0x00, 0x01, "Serial - 16450" }, { 0x07, 0x00, 0x02, "Serial - 16550" }, { 0x07, 0x00, 0x03, "Serial - 16650" }, { 0x07, 0x00, 0x04, "Serial - 16750" }, { 0x07, 0x00, 0x05, "Serial - 16850" }, { 0x07, 0x00, 0x06, "Serial - 16950" }, { 0x07, 0x01, 0x00, "Parallel" }, { 0x07, 0x01, 0x01, "Parallel - BiDir" }, { 0x07, 0x01, 0x02, "Parallel - ECP" }, { 0x07, 0x01, 0x03, "Parallel - IEEE1284" }, { 0x07, 0x01, 0xFE, "Parallel - IEEE1284 Target" }, { 0x07, 0x02, 0x00, "Multiport Serial" }, { 0x07, 0x03, 0x00, "Hayes Compatible Modem" }, { 0x07, 0x03, 0x01, "Hayes Compatible Modem, 16450" }, { 0x07, 0x03, 0x02, "Hayes Compatible Modem, 16550" }, { 0x07, 0x03, 0x03, "Hayes Compatible Modem, 16650" }, { 0x07, 0x03, 0x04, "Hayes Compatible Modem, 16750" }, { 0x07, 0x80, 0x00, "Other" },
-
-{ 0x08, 0x00, 0x00, "PIC" }, { 0x08, 0x00, 0x01, "ISA PIC" }, { 0x08, 0x00, 0x02, "EISA PIC" }, { 0x08, 0x00, 0x10, "I/O APIC" }, { 0x08, 0x00, 0x20, "I/O(x) APIC" }, { 0x08, 0x01, 0x00, "DMA" }, { 0x08, 0x01, 0x01, "ISA DMA" }, { 0x08, 0x01, 0x02, "EISA DMA" }, { 0x08, 0x02, 0x00, "Timer" }, { 0x08, 0x02, 0x01, "ISA Timer" }, { 0x08, 0x02, 0x02, "EISA Timer" }, { 0x08, 0x03, 0x00, "RTC" }, { 0x08, 0x03, 0x00, "ISA RTC" }, { 0x08, 0x03, 0x00, "Hot-Plug" }, { 0x08, 0x80, 0x00, "Other" },
-
-{ 0x09, 0x00, 0x00, "Keyboard" }, { 0x09, 0x01, 0x00, "Pen" }, { 0x09, 0x02, 0x00, "Mouse" }, { 0x09, 0x03, 0x00, "Scanner" }, { 0x09, 0x04, 0x00, "Game Port" }, { 0x09, 0x80, 0x00, "Other" },
-
-{ 0x0a, 0x00, 0x00, "Generic" }, { 0x0a, 0x80, 0x00, "Other" },
-
-{ 0x0b, 0x00, 0x00, "386" }, { 0x0b, 0x01, 0x00, "486" }, { 0x0b, 0x02, 0x00, "Pentium" }, { 0x0b, 0x03, 0x00, "PentiumPro" }, { 0x0b, 0x10, 0x00, "DEC Alpha" }, { 0x0b, 0x20, 0x00, "PowerPC" }, { 0x0b, 0x30, 0x00, "MIPS" }, { 0x0b, 0x40, 0x00, "Coprocessor" }, { 0x0b, 0x80, 0x00, "Other" },
-
-{ 0x0c, 0x00, 0x00, "FireWire" }, { 0x0c, 0x00, 0x10, "OHCI FireWire" }, { 0x0c, 0x01, 0x00, "Access.bus" }, { 0x0c, 0x02, 0x00, "SSA" }, { 0x0c, 0x03, 0x00, "USB (UHCI)" }, { 0x0c, 0x03, 0x10, "USB (OHCI)" }, { 0x0c, 0x03, 0x80, "USB" }, { 0x0c, 0x03, 0xFE, "USB Device" }, { 0x0c, 0x04, 0x00, "Fiber" }, { 0x0c, 0x05, 0x00, "SMBus Controller" }, { 0x0c, 0x06, 0x00, "InfiniBand" }, { 0x0c, 0x80, 0x00, "Other" },
-
-{ 0x0d, 0x00, 0x00, "iRDA" }, { 0x0d, 0x01, 0x00, "Consumer IR" }, { 0x0d, 0x10, 0x00, "RF" }, { 0x0d, 0x80, 0x00, "Other" },
-
-{ 0x0e, 0x00, 0x00, "I2O" }, { 0x0e, 0x80, 0x00, "Other" },
-
-{ 0x0f, 0x01, 0x00, "TV" }, { 0x0f, 0x02, 0x00, "Audio" }, { 0x0f, 0x03, 0x00, "Voice" }, { 0x0f, 0x04, 0x00, "Data" }, { 0x0f, 0x80, 0x00, "Other" },
-
-{ 0x10, 0x00, 0x00, "Network" }, { 0x10, 0x10, 0x00, "Entertainment" }, { 0x10, 0x80, 0x00, "Other" },
-
-{ 0x11, 0x00, 0x00, "DPIO Modules" }, { 0x11, 0x01, 0x00, "Performance Counters" }, { 0x11, 0x10, 0x00, "Comm Sync, Time+Frequency Measurement" }, { 0x11, 0x80, 0x00, "Other" },
-
-};
-
-uInt32 pciRead(int bus, int dev, int func, int reg, int bytes) {
-  uInt16 base;
-
-  union {
-    struct confadd c;
-    uInt32 n;
-  } u;
-
-  u.n = 0;
-  u.c.enable = 1;
-  u.c.rsvd = 0;
-  u.c.bus = bus;
-  u.c.dev = dev;
-  u.c.func = func;
-  u.c.reg = reg & 0xFC;
-
-  outportDWord(0xCF8, u.n);
-
-  base = 0xCFC + (reg & 0x03);
-
-  switch (bytes) {
-    case 1:
-      return (inportByte(base));
-    case 2:
-      return (inportWord(base));
-    case 4:
-      return (inportDWord(base));
-    default:
-      return 0;
-  }
-}
-
-void pciWrite(int bus, int dev, int func, int reg, uInt32 v, int bytes) {
-  uInt16 base;
-
-  union {
-    struct confadd c;
-    uInt32 n;
-  } u;
-
-  u.n = 0;
-  u.c.enable = 1;
-  u.c.rsvd = 0;
-  u.c.bus = bus;
-  u.c.dev = dev;
-  u.c.func = func;
-  u.c.reg = reg & 0xFC;
-
-  base = 0xCFC + (reg & 0x03);
-  outportDWord(0xCF8, u.n);
-  switch (bytes) {
-    case 1:
-      outportByte(base, (uInt8) v);
-    break;
-    case 2:
-      outportWord(base, (uInt16) v);
-    break;
-    case 4:
-      outportDWord(base, v);
-    break;
-  }
-}
-
-uint32_t pciProbe(int bus, int dev, int func) {
-  struct pciConfig *cfg = 0x0;
-  uint32_t v;
-  int i;
-
-  cfg = kmalloc(sizeof(struct pciConfig));
-  memset(cfg, 0x0, sizeof(struct pciConfig));
-
-  uint32_t *word = (uint32_t *)cfg;
-
-  for (i = 0; i < 4; i++) {
-    word[i] = pciRead(bus, dev, func, 4 * i, 4);
-
-    /* This is TEMPORARY */
-    if (cfg->vendorID == 0x1022 && i == 1) {
-      kprintf("got it: 0x%X", word[i]);
-      word[i] &= 0xffff0000;
-      word[i] |= 0x5; //0x1 //0x5;
-      pciWrite(bus, dev, func, 4 * i, word[i], 4);
-      kprintf("set it: 0x%X\n", word[i]);
-    }
-  }
-
-  if (cfg->vendorID == 0xffff) {
-    kfree(cfg);
-    return 0x0;
-  }
-
-  if (cfg->vendorID == 0x0) {
-    kfree(cfg);
-    return 0x0;
-  }
-
-  cfg->bus = bus;
-  cfg->dev = dev;
-  cfg->func = func;
-
-  /*
-  if (cfg->vendorID == 0x1022)
-    pciWrite(bus, dev, func, 0x3C, 0x5,1);
-  */
-
-  switch(cfg->headerType & 0x7F) {
-    case 0x0: /* normal device */
-      for (i = 4;i<=16;i++) {
-        word[i] = pciRead(bus, dev, func, 4 * i, 4);
-      }
-      if (cfg->vendorID == 0x1022) {
-        kprintf("Device Info: /bus/pci/%d/%d/%d\n", bus, dev, func);
-        kprintf("  * Vendor: %X   Device: %X  Class/SubClass/Interface %X/%X/%X\n", cfg->vendorID, cfg->deviceID, cfg->classCode, cfg->subClass, cfg->progIf);
-        kprintf("  * Status: %X  Command: %X  BIST/Type/Lat/CLS: %X/%X/%X/%X\n", cfg->status, cfg->command, cfg->bist, cfg->headerType, cfg->latencyTimer, cfg->cacheLineSize);
-        kprintf("  * IRQ: 0x%X.0x%X, BAR[0]: 0x%X\n", cfg->intLine, cfg->intPin, cfg->bar[0]);
-      }
-      break;
-    case 0x1:
-      kprintf("  * PCI <-> PCI Bridge\n");
-      break;
-    case 0x2:
-      kprintf("  * PCI <-> CardBus Bridge\n");
-      break;
-    default:
-      kprintf("  * Unknown Header Type\n");
-      break;
-
-  }
-
-
-  /*
-  switch (cfg->headerType & 0x7F) {
-    case 0: // normal device
-      for (i = 0; i < 6; i++) {
-        v = pciRead(bus, dev, func, i * 4 + 0x10, 4);
-        if (v) {
-          int v2;
-          pciWrite(bus, dev, func, i * 4 + 0x10, 0xffffffff, 4);
-          v2 = pciRead(bus, dev, func, i * 4 + 0x10, 4) & 0xfffffff0;
-          pciWrite(bus, dev, func, i * 4 + 0x10, v, 4);
-          v2 = 1 + ~v2;
-          if (v & 1) {
-            cfg->base[i] = v & 0xffff;
-            cfg->size[i] = v2 & 0xffff;
-          }
-          else {
-            cfg->base[i] = v;
-            cfg->size[i] = v2;
-          }
-        }
-        else {
-          cfg->base[i] = 0;
-          cfg->size[i] = 0;
-        }
-      }
-      v = pciRead(bus, dev, func, 0x3c, 1);
-      cfg->irq = (v == 0xff ? 0 : v);
-      v = pciRead(bus, dev, func, 0x40, 1);
-      cfg->irqLine = (v == 0xff ? 0 : v);
-    break;
-    case 1:
-
-
-  }
-  */
-
-  return ((uint32_t)cfg);
-}
-
-int pci_init() {
-  uint16_t bus, dev, func;
-
-  int i = 0x0;
-
-  struct pciConfig *pcfg;
-
-  for (bus = 0x0; bus < 0x2; bus++) {
-    for (dev = 0; dev < 32; dev++) { 
-      for (func = 0; func < 8; func++) {
-        pcfg = (struct pciConfig *)pciProbe(bus, dev, func);
-        if (pcfg != 0x0) {
-          for (i = 0x0; i < countof(pciClasses); i++) {
-            if (pcfg->classCode == pciClasses[i].baseClass && pcfg->subClass == pciClasses[i].subClass && pcfg->progIf == pciClasses[i].interface) {
-              if (pcfg->vendorID == 0x1022) {
-                kprintf("PCI Device: %s @ IRQ: 0x%X.0x%X\n", pciClasses[i].name, pcfg->intPin, pcfg->intLine);
-              }
-              break;
-            }
-          }
-        }
-      }
-    }
-  }
-  return (0x0);
-}
diff --git a/sys/sde/Makefile b/sys/sde/Makefile
deleted file mode 100644
index 1be27ce..0000000
--- a/sys/sde/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Linker
-LINKER = ld
-
-#  Remove
-REMOVE = rm -fr
-
-#  Objects
-OBJS = ogFont.o ogPixelFmt.o ogPixCon.o objgfx40.o ogDisplay_UbixOS.o main.o sde.o
-# colours.o
-
-CFLAGS += -fno-rtti
-
-all:
-	(cp ../../lib/objgfx40/objgfx40.cpp ./)
-	(cp ../../lib/objgfx40/ogFont.cpp ./)
-	(cp ../../lib/objgfx40/ogPixCon.cpp ./)
-	(cp ../../lib/objgfx40/ogPixelFmt.cpp ./)
-	(make allBuild)
-
-allBuild: $(OBJS)
-
-#  Compile Types
-.cpp.o:
-	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__ $(CFLAGS) ${INCLUDES} -I../../lib/objgfx40 -c -o $@ $<
-.cc.o:
-	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__  $(CFLAGS) ${INCLUDES} -I../../lib/objgfx40 -c -o $@ $<
-.cc.s:
-	$(CXX) -DNOBOOL -D__UBIXOS_KERNEL__ ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.c.o:
-	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.c.s:
-	$(CC) ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.S.o:
-	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) objgfx40.cpp ogFont.cpp ogPixCon.cpp ogPixelFmt.cpp
diff --git a/sys/sde/colours.cc b/sys/sde/colours.cc
deleted file mode 100644
index 8526456..0000000
--- a/sys/sde/colours.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Log: colours.cc,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:36  reddawg
- no message
-
- Revision 1.2  2004/05/19 17:09:50  flameshadow
- chg: Undid previous renaming. This now restores me as the EOOUIAD.
-
- Revision 1.1.1.1  2004/04/15 12:07:16  reddawg
- UbixOS v1.0
-
- Revision 1.23  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
-
-
- $Id: colours.cc 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <sde/sde.h>
-#include <sde/ogDisplay_UbixOS.h>
-#include <objgfx40/objgfx40.h>
-
-extern "C" {
-  #include <sys/video.h>
-  #include <vmm/paging.h>
-  #include <lib/string.h>
-  #include <lib/kprintf.h>
-  #include <lib/kmalloc.h>
-  #include <ubixos/sched.h>
-  #include <ubixos/vitals.h>
-  }
-
-extern "C" {
-void sdeTestThread() {
-//  uInt32 count, i = 0x0;
-  uInt8 r, g, b;
-  ogSurface *screen = 0x0;
-  ogPoint2d points[4];
-  ogRGBA8 colours[4];
-  r = g = b = 0;
-  while (screen == 0x0) {
-    screen  = (ogDisplay_UbixOS *)systemVitals->screen;
-    }
-  while (!screen->ogAvail());
-
-  points[0].x = screen->ogGetMaxX() - 150;
-  points[0].y = 0;
-  points[1].x = screen->ogGetMaxX();
-  points[1].y = 0;
-  points[2].x = screen->ogGetMaxX();
-  points[2].y = 150;
-  points[3].x = screen->ogGetMaxX() - 250;
-  points[3].y = 250;
-
-  colours[0].red = 255;
-  colours[0].green = 0;
-  colours[0].blue = 0;
-  colours[0].alpha = 255;
-  colours[1].red = 0;
-  colours[1].green = 255;
-  colours[1].blue = 128;
-  colours[1].alpha = 255;
-  colours[2].red = 128;
-  colours[2].green = 255;
-  colours[2].blue = 128;
-  colours[2].alpha = 255;
-  colours[3].red = 63;
-  colours[3].green = 63;
-  colours[3].blue = 63;
-  colours[3].alpha = 255;
-  screen->ogSetAntiAliasing(true);
-
-  while (true) {
-#if 0
-    for (count = 150; count > 0; count--) {
-      screen->Line(screen->GetMaxX() / 2, screen->GetMaxY() / 2,
-                     screen->GetMaxX(), count*8,
-                     screen->RGB(r, g, b));
-      screen->FillCircle(screen->GetMaxX() - 50, 50, count, 
-                           screen->RGB(r, g, b));
-                         
-//      screen->FillRect(screen->GetMaxX() - 50 - count, count, 
-//                     screen->GetMaxX() - count, 100 - count,
-//                     screen->RGB(r, g, b));
-      r -= 8;
-      g += 8;
-      b -= 8;
-    } // for
-#endif
-  screen->ogFillGouraudPolygon(4, points, colours);
-  //kprintf("colours(0)[0x%X]\n",colours[0]);
-  colours[0].red   -= 8;
-  colours[0].green += 8;
-  colours[0].blue -= 8;
-  colours[1].red  += 8;
-  colours[1].green += 8;
-  colours[1].blue -= 8;
-  colours[2].red += 8;
-  colours[2].green -= 8;
-  colours[2].blue += 8;
-  colours[3].red += 8;
-  colours[3].green += 8;
-  colours[3].blue += 8;
-
-  } // while
-
-} // sdeTestThread
-
-}
-
-/***
- END
- ***/
-
diff --git a/sys/sde/main.cc b/sys/sde/main.cc
deleted file mode 100644
index 9d0c05f..0000000
--- a/sys/sde/main.cc
+++ /dev/null
@@ -1,147 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Log: main.cc,v $
- Revision 1.1.1.1  2006/06/01 12:46:16  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:36  reddawg
- no message
-
- Revision 1.3  2004/11/16 18:38:27  reddawg
- Oh Man
-
- Revision 1.2  2004/05/19 17:09:50  flameshadow
- chg: Undid previous renaming. This now restores me as the EOOUIAD.
-
- Revision 1.1.1.1  2004/04/15 12:07:16  reddawg
- UbixOS v1.0
-
- Revision 1.29  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
-
-
- $Id: main.cc 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-extern "C" {
-  #include <ubixos/sched.h>
-  #include <vmm/vmm.h>
-  #include <lib/kmalloc.h>
-  #include <lib/kprintf.h>
-  #include <ubixos/vitals.h>
-  }
-
-#include <sde/sde.h>
-#include <objgfx40/objgfx40.h>
-#include <sde/ogDisplay_UbixOS.h>
-#include <objgfx40/ogFont.h>
-
-extern "C" void sdeThread() {
-  ogSurface *screen = new ogDisplay_UbixOS();
-  struct sdeWindows *tmp = 0x0;
-  ogSurface         *buf = 0x0;
-  ogBitFont * font = new ogBitFont();
-
-  font->Load("ROM8X14.DPF",0);
-  font->SetFGColor(255, 255, 255, 255);
-  font->SetBGColor(0, 0, 0, 255);
-
-  printOff = 0x1;
-
-  screen->ogCreate(800,600,OG_PIXFMT_16BPP);
-  screen->ogClear(screen->ogPack(122,140,163));
-
-  systemVitals->screen = screen;
-  systemVitals->font   = font;
-
-  ogprintOff = (int)0x0;
-
-  screen->ogSetAntiAliasing(false);
- 
-  while (1) {
-    for (tmp = windows;tmp;tmp=tmp->next) {
-      switch (tmp->status) {
-        case registerWindow:
-          buf = (ogSurface *)tmp->buf;
-          buf->buffer = (void *)vmmMapFromTask(tmp->pid,buf->buffer,buf->bSize);
-          if (buf->buffer == 0x0) {
-            kprintf("Error: buf->buffer\n");
-            while (1);
-            }
-          buf->lineOfs = (uInt32 *)vmmMapFromTask(tmp->pid,buf->lineOfs,buf->lSize);
-          if (buf->lineOfs == 0x0) {
-            kprintf("Error: buf->lineOfs\n");
-            while (1);
-            }
-          tmp->status = windowReady;
-          //kprintf("Window Registered!\n");
-          break;
-        case drawWindow:
-          buf = (ogSurface *)tmp->buf;
-          screen->ogCopyBuf(screen->ogGetMaxX() - buf->ogGetMaxX(), 
-                          screen->ogGetMaxY() - buf->ogGetMaxY(), *buf,0, 0, 
-                          buf->ogGetMaxX(), buf->ogGetMaxY());
-          tmp->status = windowReady;
-          //kprintf("Draw Window Routines Here\n");
-          break;
-        case killWindow:
-          //kprintf("Killed Window\n");
-          if (tmp->next != 0x0) {
-            tmp->next->prev = tmp->prev;
-            if (tmp->prev != 0x0)
-              tmp->prev->next = tmp->next;
-            }
-          else if (tmp->prev != 0x0) {
-            tmp->prev->next = tmp->next;
-            if (tmp->next != 0x0)
-              tmp->next->prev = tmp->prev;
-              }
-          else {
-            windows = 0x0;
-            }
-          vmm_unmapPages(buf->buffer,buf->bSize);
-          vmm_unmapPages(buf->lineOfs,buf->lSize);
-        //  kfree(tmp->buf);
-          kfree(tmp);
-          tmp = 0x0;
-          break;
-        default:
-          break;
-        }
-      }
-    //sched_yield();
-    }
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/sde/ogDisplay_UbixOS.cc b/sys/sde/ogDisplay_UbixOS.cc
deleted file mode 100755
index 6175f1b..0000000
--- a/sys/sde/ogDisplay_UbixOS.cc
+++ /dev/null
@@ -1,337 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Log: ogDisplay_UbixOS.cc,v $
- Revision 1.1.1.1  2006/06/01 12:46:17  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:37  reddawg
- no message
-
- Revision 1.3  2004/07/28 15:05:43  reddawg
- Major:
-   Pages now have strict security enforcement.
-   Many null dereferences have been resolved.
-   When apps loaded permissions set for pages rw and ro
-
- Revision 1.2  2004/05/19 17:09:50  flameshadow
- chg: Undid previous renaming. This now restores me as the EOOUIAD.
-
- Revision 1.1.1.1  2004/04/15 12:07:17  reddawg
- UbixOS v1.0
-
- Revision 1.20  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
-
-
- $Id: ogDisplay_UbixOS.cc 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-#include <objgfx40/objgfx40.h>
-#include <objgfx40/defpal.inc>
-#include <sde/ogDisplay_UbixOS.h>
-
-extern "C" {
-  #include <lib/bioscall.h>
-  #include <vmm/paging.h>
-  #include <lib/kprintf.h>
-  #include <sys/io.h>
-  #include <lib/string.h>
-  #include <ubixos/sched.h>
-  #include <ubixos/kpanic.h>
-  }
-
-/*
- *
- *              ogDisplay methods
- *
- */
-
-void
-initVESAMode(uInt16 mode) {
-  //kprintf("Pre-initVESAMode\n");
-  biosCall(0x10,0x4F02,mode,0x0,0x0,0x0,0x0,0x0,0x0);
-  //kprintf("Post-initVESAMode\n");
-  return;
-}
-
-ogDisplay_UbixOS::ogDisplay_UbixOS(void) {
-  pages[0] = pages[1] = NULL;
-  activePage = visualPage = 0;
-  pal = new ogRGBA8[256];
-  attributes = new ogAttributes();
-
-  VESAInfo = (ogVESAInfo *)0x11000;
-  modeInfo = (ogModeInfo *)0x11200;
-  GetVESAInfo();
-  return;
-} // ogDisplay_UbixOS::ogDisplay_UbixOS
-
-void
-ogDisplay_UbixOS::GetModeInfo(uInt16 mode) {
-  //kprintf("Pre-getModeInfo\n");
-  biosCall(0x10,0x4F01,0x0,mode,0x0,0x0,0x0,0x1120,0x0);
-  //kprintf("Post-getModeInfo\n");
-  return;
-} // ogDisplay_UbixOS::GetModeInfo
-
-void
-ogDisplay_UbixOS::GetVESAInfo(void) {
-  VESAInfo->VBESignature[0] = 'V'; // First off initialize the structure.
-  VESAInfo->VBESignature[1] = 'B';
-  VESAInfo->VBESignature[2] = 'E';
-  VESAInfo->VBESignature[3] = '2';
-  //kprintf("Pre-getVESAInfo\n");
-  biosCall(0x10,0x4F00,0x0,0x0,0x0,0x0,0x0,0x1100,0x0);
-  //kprintf("Post-getVESAInfo\n");
-  return;
-  } // ogDisplay_UbixOS::GetVESAInfo
-
-uInt16
-ogDisplay_UbixOS::FindMode(uInt32 _xRes, uInt32 _yRes, uInt32 _BPP) {
-  uInt16 mode;
-
-  if ((_xRes == 320) && (_yRes == 200) && (_BPP == 8)) return 0x13;
-
-//  if ((VESAInfo==NULL) || (VESAInfo->videoModePtr==NULL)) return 0;
-  if (modeInfo == NULL) return 0;
-
-  for (mode = 0x100; mode < 0x1FF; mode++) {
-    GetModeInfo(mode);
-    if ((modeInfo->xRes >= _xRes) && (modeInfo->yRes >= _yRes) &&
-        (modeInfo->bitsPerPixel == _BPP))
-      return mode;
-  }
-
-  return 0;
-} // ogDisplay_UbixOS::FindMode
-
-void ogDisplay_UbixOS::SetMode(uInt16 mode) {
-
-  uInt32 size = 0x0, count = 0x0, i = 0x0;
-  
-  if (mode == 0x13) {
-  
-    xRes = 320;
-    yRes = 200;
-    maxX = 319;
-    maxY = 199;
-    BPP  = 8;
-    bytesPerPix = 1;
-
-    redFieldPosition = 0;
-    greenFieldPosition = 0;
-    blueFieldPosition = 0;
-    alphaFieldPosition = 0;
-    
-    redShifter = 0;
-    greenShifter = 0;
-    blueShifter = 0;
-    alphaFieldPosition = 0;
-
-    // UBU, THIS IS NULL BECAUSE WE DON'T EVER USE 320x200x256c!
-    // THIS COMMENT WILL COME BACK TO BITE YOU ON THE ASS
-    buffer = NULL;
- 
-  } else {
-    buffer = NULL;
-    mode |= 0x4000;  // attempt lfb
-    GetModeInfo(mode);
-    if (modeInfo->physBasePtr == 0) return;
-    buffer = (void *)modeInfo->physBasePtr;    
-    size = (modeInfo->yRes*modeInfo->bytesPerLine+4095);
-    
-    xRes = modeInfo->bytesPerLine;
-    yRes = modeInfo->yRes;
-    maxX = modeInfo->xRes-1;
-    maxY = yRes-1;
-
-    BPP = modeInfo->bitsPerPixel;
-    bytesPerPix = (BPP + 7) >> 3;
-
-    redFieldPosition   = modeInfo->redFieldPosition;
-    greenFieldPosition = modeInfo->greenFieldPosition;
-    blueFieldPosition  = modeInfo->blueFieldPosition;
-    alphaFieldPosition = modeInfo->alphaFieldPosition;
-
-    if (bytesPerPix == 4) {
-      modeInfo->alphaMaskSize = 8;
-      while ((alphaFieldPosition == redFieldPosition) ||
-             (alphaFieldPosition == greenFieldPosition) ||
-             (alphaFieldPosition == blueFieldPosition))
-        alphaFieldPosition += 8;
-    } // if
-    
-    redShifter   = 8-modeInfo->redMaskSize;
-    greenShifter = 8-modeInfo->greenMaskSize;
-    blueShifter  = 8-modeInfo->blueMaskSize;
-    alphaShifter = 8-modeInfo->alphaMaskSize;
-
-    if (modeInfo->alphaMaskSize != 0)
-      alphaMasker = ~(OG_MASKS[modeInfo->alphaMaskSize] << alphaFieldPosition);
-    else
-      alphaMasker = ~0;
-
-  } // else not mode 0x13
-  
-  printOff = 0;
-  for (i = 0x0; i < ((size)/4096); i++) {
-    if ((vmm_remapPage(modeInfo->physBasePtr + (i * 0x1000),modeInfo->physBasePtr + (i * 0x1000),KERNEL_PAGE_DEFAULT)) == 0x0)
-      kpanic("Error: vmm_remapPage failed\n");
-  } // for i
-
-  owner = this;
-  dataState = ogAliasing;
-
-  initVESAMode(mode);
-
-  if ((lineOfs != NULL) && (lSize != 0)) delete [] lineOfs;
-  lSize = yRes*sizeof(uInt32);
-  lineOfs = new uInt32[yRes];;
-  if (lineOfs == NULL) return;
-  
-  lineOfs[0] = 0;
-  for (count = 1; count < yRes; count++)
-    lineOfs[count] = lineOfs[count-1]+xRes;
-
-  if (1 == bytesPerPix) {
-    pixFmtID = 0x08080808;
-  } else {
-    pixFmtID = (redFieldPosition) |
-               (greenFieldPosition << 8) |
-               (blueFieldPosition << 16) |
-               (alphaFieldPosition << 24);
-  } // else
-
-  ogSetAntiAliasing(BPP > 8);
-  if (pal == NULL) pal = new ogRGBA8[256];  
-  ogSetPalette(DEFAULT_PALETTE);
-  
-  return;
-} // ogDisplay_UbixOS::SetMode
-
-void
-ogDisplay_UbixOS::ogSetPalette(const ogRGBA8 newPal[256]) {
-  ogSurface::ogSetPalette(newPal);
-  SetPal();
-  return;
-} // ogDisplay_UbixOS::ogSetPalette
-
-void ogDisplay_UbixOS::SetPal(void) {
-  if (bytesPerPix != 1) return;
-  outportByte(0x3c8,0);
-  for (uInt32 c = 0; c < 256; c++) {
-    outportByte(0x3c9, pal[c].red >> 2);
-    outportByte(0x3c9, pal[c].green >> 2);
-    outportByte(0x3c9, pal[c].blue >> 2);
-  } // for
-  return;
-} // ogDisplay_UbixOS::SetPal
-
-bool
-ogDisplay_UbixOS::ogAlias(ogSurface& SrcObject, uInt32 x1,
-                          uInt32 y1, uInt32 x2, uInt32 y2) {
-  ogSetLastError(ogNoAliasing);
-  return false;
-} // ogDisplay_UbixOS::ogAlias
-
-bool
-ogDisplay_UbixOS::ogCreate(uInt32 _xRes, uInt32 _yRes,ogPixelFmt _pixFormat) {
-  uInt16 mode;
-  mode = 0x114;  // was 0x111
-  SetMode(mode);
-  /*
-  mode = FindMode(_xRes, _yRes, _pixFormat.BPP);
-  if ((mode == 0) && ((_pixFormat.BPP==24) || (_pixFormat.BPP==32))) {
-    if (_pixFormat.BPP==24) _pixFormat.BPP=32; else _pixFormat.BPP=24;
-    mode=FindMode(_xRes,_yRes,_pixFormat.BPP);
-  } // if
-  if (mode!=0) SetMode(mode);
-  */
-  return (mode!=0);
-} // ogDisplay_UbixOS::ogCreate
-
-bool
-ogDisplay_UbixOS::ogClone(ogSurface& SrcObject) {
-  ogSetLastError(ogNoCloning);
-  return false;
-} // ogDisplay_UbixOS::ogClone
-
-void
-ogDisplay_UbixOS::ogCopyPalette(ogSurface& SrcObject) {
-  ogSurface::ogCopyPalette(SrcObject);
-  SetPal();
-  return;
-} // ogDisplay_UbixOS::ogCopyPalette
-
-bool
-ogDisplay_UbixOS::ogLoadPalette(const char *palfile) {
-  bool result;
-  if ((result = ogSurface::ogLoadPalette(palfile))==true) SetPal();
-  return result;
-} // ogDisplay_UbixOS::ogLoadPalette
-
-void
-ogDisplay_UbixOS::ogSetPalette(uInt8 colour, uInt8 red, uInt8 green, uInt8 blue) {
-  if (pal == NULL) return;
-  ogSurface::ogSetPalette(colour, red, green, blue);
-  outportByte(0x3c8, colour);
-  outportByte(0x3c9, red >> 2);
-  outportByte(0x3c9, green >> 2);
-  outportByte(0x3c9, blue >> 2);
-  
-  return;
-} // ogDisplay_UbixOS::ogSetPalette
-
-void
-ogDisplay_UbixOS::ogSetPalette(uInt8 colour, uInt8 red, uInt8 green,
-                                   uInt8 blue, uInt8 alpha) {
-  if (pal == NULL) return;
-  ogSurface::ogSetPalette(colour, red, green, blue, alpha);
-  outportByte(0x3c8, colour);
-  outportByte(0x3c9, red >> 2);
-  outportByte(0x3c9, green >> 2);
-  outportByte(0x3c9, blue >> 2);
-  
-  return;
-} // ogDisplay_UbixOS::ogSetPalette
-
-ogDisplay_UbixOS::~ogDisplay_UbixOS(void) {
-  delete attributes;
-  delete pal;
-//mji  delete VESAInfo;
-//mji  delete modeInfo;
-  return;
-} // ogDisplay_UbixOS::~ogDisplay_UbixOS
-
-/***
- END
- ***/
-
diff --git a/sys/sde/sde.cc b/sys/sde/sde.cc
deleted file mode 100644
index 2848a58..0000000
--- a/sys/sde/sde.cc
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Log: sde.cc,v $
- Revision 1.1.1.1  2006/06/01 12:46:17  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:37  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:37  reddawg
- no message
-
- Revision 1.3  2004/08/21 23:47:50  reddawg
- *** empty log message ***
-
- Revision 1.2  2004/05/19 04:07:43  reddawg
- kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been
-
- Revision 1.1.1.1  2004/04/15 12:07:17  reddawg
- UbixOS v1.0
-
- Revision 1.12  2004/04/13 16:36:33  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
-
-
- $Id: sde.cc 89 2016-01-12 00:20:40Z reddawg $
-
-*****************************************************************************************/
-
-extern "C" {
-  #include <ubixos/types.h>
-  #include <sys/video.h>
-  #include <vmm/paging.h>
-  #include <lib/string.h>
-  #include <lib/kprintf.h>
-  #include <lib/kmalloc.h>
-  #include <ubixos/sched.h>
-  #include <sde/sde.h>
-}
-#include <objgfx40/objgfx40.h>
-
-struct sdeWindows *windows = 0x0;
-
-extern "C" void sysSDE(uInt32 cmd,void *ptr) {
-  ogSurface *newBuf = 0x0;
-  ogSurface *oldBuf = (ogSurface *)ptr;
-  struct sdeWindows *tmp = 0x0;
-  
-  for (tmp=windows;tmp;tmp=tmp->next) {
-    if (tmp->pid == (int)_current->id)
-      break;
-    }
-    
-  if (tmp != 0x0) {
-    while (tmp->status != windowReady)
-      asm("hlt");
-      //sched_yield();
-    }
-  else if (tmp == 0x0 && cmd != registerWindow) {
-    kprintf("Invalid Window\n");
-    return;
-    }
-
-  switch (cmd) {
-    case drawWindow:
-      tmp->status = drawWindow;
-      while (tmp->status != windowReady) {
-        //sched();
-        //asm("hlt");
-        }
-      break;
-    case killWindow:
-      tmp->status = killWindow;
-      break;
-    case registerWindow:
-      if (oldBuf->buffer != 0x0) {
-        newBuf                     = new ogSurface();
-        newBuf->version            = oldBuf->version;
-        newBuf->buffer             = oldBuf->buffer;
-        newBuf->owner              = oldBuf->owner;
-        newBuf->lineOfs            = oldBuf->lineOfs;
-        newBuf->pal                = oldBuf->pal;
-        newBuf->attributes         = oldBuf->attributes;
-        newBuf->xRes               = oldBuf->xRes;
-        newBuf->yRes               = oldBuf->yRes;
-        newBuf->maxX               = oldBuf->maxX;
-        newBuf->maxY               = oldBuf->maxY;
-        newBuf->bSize              = oldBuf->bSize;
-        newBuf->lSize              = oldBuf->lSize; 
-        newBuf->BPP                = oldBuf->BPP;  
-        newBuf->bytesPerPix        = oldBuf->bytesPerPix;
-        newBuf->pixFmtID           = oldBuf->pixFmtID;
-        newBuf->redFieldPosition   = oldBuf->redFieldPosition;
-        newBuf->greenFieldPosition = oldBuf->greenFieldPosition;
-        newBuf->blueFieldPosition  = oldBuf->blueFieldPosition;
-        newBuf->alphaFieldPosition = oldBuf->alphaFieldPosition;
-        newBuf->redShifter         = oldBuf->redShifter;
-        newBuf->greenShifter       = oldBuf->greenShifter;
-        newBuf->blueShifter        = oldBuf->blueShifter;
-        newBuf->alphaShifter       = oldBuf->alphaShifter;
-        newBuf->lastError          = oldBuf->lastError;
-        newBuf->dataState          = oldBuf->dataState;
-        tmp = (struct sdeWindows *)kmalloc(sizeof(struct sdeWindows));
-        tmp->buf    = newBuf;
-        tmp->status = registerWindow;
-        tmp->pid    = _current->id;
-        tmp->prev   = 0x0;
-        if (windows == 0x0) {
-          windows   = tmp;
-          tmp->next = 0x0;
-          }
-        else {
-          tmp->next = windows;
-          windows->prev = tmp;
-          windows = tmp;
-          }
-        }
-      else {
-        kprintf("Invalid Window\n");
-        }
-      break;
-    default:
-      kprintf("Invalid SDE Command [0x%X]\n",ptr);
-      break;
-    }
-  return;
-  }
-
-/***
- END
- ***/
-
diff --git a/sys/sys/Makefile b/sys/sys/Makefile
deleted file mode 100644
index 4581027..0000000
--- a/sys/sys/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 140 2016-01-17 01:36:09Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = dma.o idt.o io.o video.o device.o elf.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.c.o:
-	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-.c.s:
-	$(CC) ${CFLAGS} ${INCLUDES} -S -o $@ $<
-.S.o:
-	$(CC) ${CFLAGS} ${INCLUDES} -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/sys/device.c b/sys/sys/device.c
deleted file mode 100644
index 1239459..0000000
--- a/sys/sys/device.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2005 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: device.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/device.h>
-#include <ubixos/spinlock.h>
-#include <lib/kmalloc.h>
-#include <lib/kprintf.h>
-#include <assert.h>
-
-/* Linked list of drivers loaded in the system accessable by the subsystem only */
-static struct device_node *devices = 0x0;
-static struct spinLock deviceSpinLock = SPIN_LOCK_INITIALIZER;
-
-/*****************************************************************************************
-
- Function: int deviceAdd(int minor,char type,struct device_interface *devInfo);
-
- Description: This will add a device to the system
-
- Notes: 
-
- 05/19/2004 - Improving Upon the spec
-
-*****************************************************************************************/
-int device_add(int minor,char type,struct device_interface *devInfo) {
-  struct device_node *tmpDev = 0x0;
-  
-  
-  tmpDev = (struct device_node *)kmalloc(sizeof(struct device_node));
-  if(tmpDev == NULL)
-	kprintf("Error Adding Device: memory failure\n");
-
-  tmpDev->prev    = 0x0;
-  tmpDev->minor   = minor;
-  tmpDev->type    = type;
-  tmpDev->devInfo = devInfo;
-
-  spinLock(&deviceSpinLock);
-  tmpDev->next    = devices;
-  devices         = tmpDev;
-  spinUnlock(&deviceSpinLock);
-
-  if (tmpDev->devInfo->initialized == 0x0)
-    return(tmpDev->devInfo->init(tmpDev));
-  else
-    return(0x0);
-  }
-
-/*****************************************************************************************
-
- Function: struct device_node *deviceFind(int major,int minor);
-
- Description: This will find a device based on major minor
-
- Notes: 
-
- 05/19/2004 - Improving Upon the spec
-
-*****************************************************************************************/
-struct device_node *device_find(int major,int minor) {
-  struct device_node *tmpDev = 0x0;
- 
-  spinLock(&deviceSpinLock);
-
-  for (tmpDev = devices;tmpDev;tmpDev=tmpDev->next) {
-    if ((tmpDev->devInfo->major == major) && (tmpDev->minor == minor)) {
-      spinUnlock(&deviceSpinLock);
-      return(tmpDev);
-      }
-    }
-
-  spinUnlock(&deviceSpinLock);
-  return(0x0);
-  }  
-
-
-/********************************************************************************************
-
-Function: int deviceRemove(struct *device_node);
-
-Description: This will remove a device based on it's pointer
-
-*********************************************************************************************/
-int device_remove(struct device_node *deviceToDelete)
-{
-struct device_node *current, *previous;
-
-
-current = devices;
-previous=NULL;
-spinLock(&deviceSpinLock);
-               while(current != NULL)
-               {
-                  if(current==deviceToDelete) break;
-                  else
-                  {
-                     previous = current;
-                     current = current->next;
-                  }
-               }
-               if(current == NULL) 
-		{
-		  spinUnlock(&deviceSpinLock);
-		  return 1;
-		}
-               else
-               {
-                  if(current == devices) 
-			devices = devices->next;
-                  else 
-			previous->next = current->next;
-                  kfree(current);
-                  spinUnlock(&deviceSpinLock);
-                  return 1;
-               }
-
-  spinUnlock(&deviceSpinLock);
-return 0x0;
-}
-
-
-/***
- END
- ***/
diff --git a/sys/sys/dma.c b/sys/sys/dma.c
deleted file mode 100644
index 1128036..0000000
--- a/sys/sys/dma.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2005 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: dma.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/dma.h>
-#include <sys/io.h>
-
-#define lowByte(x)  (x & 0x00FF)
-#define highByte(x) ((x & 0xFF00) >> 8)
-   
-static uInt8 maskReg[8]   = { 0x0A, 0x0A, 0x0A, 0x0A, 0xD4, 0xD4, 0xD4, 0xD4 };
-static uInt8 clearReg[8]  = { 0x0C, 0x0C, 0x0C, 0x0C, 0xD8, 0xD8, 0xD8, 0xD8 };
-static uInt8 modeReg[8]   = { 0x0B, 0x0B, 0x0B, 0x0B, 0xD6, 0xD6, 0xD6, 0xD6 };
-static uInt8 addrPort[8]  = { 0x00, 0x02, 0x04, 0x06, 0xC0, 0xC4, 0xC8, 0xCC };
-static uInt8 pagePort[8]  = { 0x87, 0x83, 0x81, 0x82, 0x8F, 0x8B, 0x89, 0x8A };
-static uInt8 countPort[8] = { 0x01, 0x03, 0x05, 0x07, 0xC2, 0xC6, 0xCA, 0xCE };
-
-void dmaXfer(uInt8 channel,uInt32 address,uInt length,uInt8 read) {
-  unsigned char page=0, mode=0;
-  unsigned int offset = 0;
-  if (read) {
-    mode = 0x48 + channel;
-    }
-  else {
-    mode = 0x44 + channel;
-    }
-  page = address >> 16;
-  offset = address & 0xFFFF;
-  length--;
-  _dmaXfer(channel, page, offset, length, mode);
-  }
-
-void _dmaXfer(uInt8 dmaChannel,uInt8 page,uInt offset,uInt length,uInt8 mode) {
-  //asm("cli");
-  outportByte(maskReg[dmaChannel], 0x04 | dmaChannel);
-  outportByte(clearReg[dmaChannel], 0x00);
-  outportByte(modeReg[dmaChannel], mode);
-  outportByte(addrPort[dmaChannel], lowByte(offset));
-  outportByte(addrPort[dmaChannel], highByte(offset));
-  outportByte(pagePort[dmaChannel], page);
-  outportByte(countPort[dmaChannel], lowByte(length));
-  outportByte(countPort[dmaChannel], highByte(length));
-  outportByte(maskReg[dmaChannel], dmaChannel);
-  //asm("sti");
-  }
-
-/***
- END
- ***/
diff --git a/sys/sys/elf.c b/sys/sys/elf.c
deleted file mode 100644
index d32a3b1..0000000
--- a/sys/sys/elf.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2005 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: device.c 54 2016-01-11 01:29:55Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/elf.h>
-
-/***
- END
- ***/
diff --git a/sys/sys/idt.c b/sys/sys/idt.c
deleted file mode 100644
index 9b6aa65..0000000
--- a/sys/sys/idt.c
+++ /dev/null
@@ -1,467 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2005 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: idt.c 135 2016-01-15 22:22:55Z reddawg $
-
- *****************************************************************************************/
-
-#include <sys/idt.h>
-#include <sys/gdt.h>
-#include <sys/io.h>
-#include <ubixos/sched.h>
-#include <isa/8259.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <vmm/vmm.h>
-#include <ubixos/syscall.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/endtask.h>
-#include <string.h>
-
-#define FP_TO_LINEAR(seg, off) ((void*) ((((uInt16) (seg)) << 4) + ((uInt16) (off))))
-
-static ubixDescriptorTable(ubixIDT, 256) {};
-
-static struct {
-  unsigned short limit __attribute__((packed));
-  union descriptorTableUnion *idt __attribute__((packed));
-} loadidt = { (256 * sizeof(union descriptorTableUnion) - 1), ubixIDT };
-
-/************************************************************************
-
- Function: int idtInit()
- Description: This function is used to enable our IDT subsystem
- Notes:
-
- 02/20/2004 - Approved for quality
-
- ************************************************************************/
-int idt_init() {
-  int i = 0x0;
-
-  struct tssStruct *sfTSS = (struct tssStruct *) 0x6200;
-  struct tssStruct *gpfTSS = (struct tssStruct *) 0x4200;
-
-  /* Set up default vector table for all possible 256 interrupts */
-
-  for ( i = 0x0; i < 256; i++ ) {
-    setVector( intNull, i, dPresent + dInt + dDpl3 );
-  }
-
-  /* Load the IDT into the system */
-  asm volatile(
-      "cli                      \n"
-      "lidt (%0)                \n" /* Load the IDT                */
-      "pushfl                   \n" /* Clear the NT flag           */
-      "andl $0xffffbfff,(%%esp)  \n"
-      "popfl                    \n"
-      "sti                      \n"
-      :
-      : "r" ((char *)&loadidt)
-  );
-
-  /* Set up the basic vectors for the reserved ints */
-  setVector( _int0, 0, dPresent + dInt + dDpl0 );
-  setVector( _int1, 1, dPresent + dInt + dDpl0 );
-  setVector( _int2, 2, dPresent + dInt + dDpl0 );
-  setVector( _int3, 3, dPresent + dInt + dDpl0 );
-  setVector( _int4, 4, dPresent + dInt + dDpl0 );
-  setVector( _int5, 5, dPresent + dInt + dDpl0 );
-  setVector( _int6, 6, dPresent + dInt + dDpl0 );
-  setVector( _int7, 7, dPresent + dInt + dDpl0 );
-  setTaskVector( 8, dPresent + dTask + dDpl0, 0x40 );
-  setVector( _int9, 9, dPresent + dInt + dDpl0 );
-  setVector( _int10, 10, dPresent + dInt + dDpl0 );
-  setVector( _int11, 11, dPresent + dInt + dDpl0 );
-  setVector( _int12, 12, dPresent + dInt + dDpl0 );
-  setTaskVector( 13, dPresent + dTask + dDpl0, 0x38 );
-  setVector( _vmm_pageFault, 14, dPresent + dInt + dDpl0 );
-  setVector( _sysCall, 0x80, dPresent + dTrap + dDpl3 );
-  setVector( _sysCall_new, 0x81, dPresent + dTrap + dDpl3 );
-  //setVector(_sysCallNew, 0x90, dPresent + dTrap + dDpl3);
-  setVector( timerInt, 0x68, (dInt + dPresent + dDpl0) );
-
-  gpfTSS->back_link = 0x0;
-  gpfTSS->esp0 = 0x0;
-  gpfTSS->ss0 = 0x0;
-  gpfTSS->esp1 = 0x0;
-  gpfTSS->ss1 = 0x0;
-  gpfTSS->esp2 = 0x0;
-  gpfTSS->ss2 = 0x0;
-  gpfTSS->cr3 = (unsigned int) kernelPageDirectory;
-  gpfTSS->eip = (unsigned int) &_int13;
-  gpfTSS->eflags = 0x206;
-  gpfTSS->esp = 0x1D000;
-  gpfTSS->ebp = 0x1D000;
-  gpfTSS->esi = 0x0;
-  gpfTSS->edi = 0x0;
-  gpfTSS->es = 0x10;
-  gpfTSS->cs = 0x08;
-  gpfTSS->ss = 0x10;
-  gpfTSS->ds = 0x10;
-  gpfTSS->fs = 0x10;
-  gpfTSS->gs = 0x10;
-  gpfTSS->ldt = 0x0;
-  gpfTSS->trace_bitmap = 0x0000;
-  gpfTSS->io_map = 0x8000;
-
-  memset( sfTSS, 0x0, sizeof(struct tssStruct) );
-  sfTSS->cr3 = (unsigned int) kernelPageDirectory;
-  sfTSS->eip = (unsigned int) &_int8;
-  sfTSS->eflags = 0x206;
-  sfTSS->esp = 0x1C000;
-  sfTSS->ebp = 0x1C000;
-  sfTSS->es = 0x10;
-  sfTSS->cs = 0x08;
-  sfTSS->ss = 0x10;
-  sfTSS->ds = 0x10;
-  sfTSS->fs = 0x10;
-  sfTSS->gs = 0x10;
-  sfTSS->io_map = 0x8000;
-
-  /* Print out information for the IDT */
-  kprintf( "idt0 - Address: [0x%X]\n", &ubixIDT );
-
-  /* Return so we know all went well */
-  return (0x0);
-}
-
-/* Sets Up IDT Vector */
-void setVector( void *handler, unsigned char interrupt, unsigned short controlMajor ) {
-  unsigned short codesegment = 0x08;
-  asm volatile ("movw %%cs,%0":"=g" (codesegment));
-
-  ubixIDT[interrupt].gate.offsetLow = (unsigned short) (((unsigned long) handler) & 0xffff);
-  ubixIDT[interrupt].gate.selector = codesegment;
-  ubixIDT[interrupt].gate.access = controlMajor;
-  ubixIDT[interrupt].gate.offsetHigh = (unsigned short) (((unsigned long) handler) >> 16);
-}
-
-/************************************************************************
-
- Function: void setTaskVector(uInt8,uInt16,uInt8);
- Description: This Function Sets Up An IDT Task Vector
- Notes:
-
- ************************************************************************/
-void setTaskVector( uInt8 interrupt, uInt16 controlMajor, uInt8 selector ) {
-  uInt16 codesegment = 0x08;
-  asm volatile ("movw %%cs,%0":"=g" (codesegment));
-
-  ubixIDT[interrupt].gate.offsetLow = 0x0;
-  ubixIDT[interrupt].gate.selector = selector;
-  ubixIDT[interrupt].gate.access = controlMajor;
-  ubixIDT[interrupt].gate.offsetHigh = 0x0;
-}
-
-/* Null Intterupt Descriptor */
-void intNull() {
-  kprintf( "Invalid Interrupt[%i]\n", _current->id );
-  /*
-   kpanic("Invalid Interrupt[%i]\n",_current->id);
-   while (1);
-   endTask(_current->id);
-   sched_yield();
-   */
-}
-
-void _int0() {
-  kpanic( "int0: Divide-by-Zero [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int1() {
-  kpanic( "int1: Debug exception [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int2() {
-  kpanic( "int2: unknown error [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int3() {
-  kpanic( "int3: Breakpoint [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int4() {
-  kpanic( "int4: Overflow [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int5() {
-  kpanic( "int5: Bounds check [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int6() {
-  kpanic( "int6: Invalid opcode! [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int8() {
-  struct tssStruct *sfTSS = (struct tssStruct *) 0x6200;
-  kpanic( "int8: Double Fault! [%i]\n", _current->id );
-  sfTSS->cr3 = (unsigned int) kernelPageDirectory;
-  sfTSS->eip = (unsigned int) &_int8;
-  sfTSS->eflags = 0x206;
-  sfTSS->esp = 0x1C000;
-  sfTSS->ebp = 0x1C000;
-  sfTSS->es = 0x10;
-  sfTSS->cs = 0x08;
-  sfTSS->ss = 0x10;
-  sfTSS->ds = 0x10;
-  sfTSS->fs = 0x10;
-  sfTSS->gs = 0x10;
-  sfTSS->io_map = 0x8000;
-  while ( 1 )
-    asm("nop");
-}
-
-void _int9() {
-  kpanic( "int9: Coprocessor Segment Overrun! [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int10() {
-  kpanic( "int10: Invalid TSS! [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int11() {
-  kpanic( "int11: Segment Not Present! [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int12() {
-  kpanic( "int12: Stack-Segment Fault! [%i]\n", _current->id );
-  endTask( _current->id );
-  sched_yield();
-}
-
-void _int13() {
-  uInt8 *ip = 0x0;
-  uInt16 *stack = 0x0, *ivt = 0x0;
-  uInt32 *stack32 = 0x0;
-  bool isOperand32 = FALSE, isAddress32 = FALSE;
-  struct tssStruct *gpfTSS = (struct tssStruct *) 0x4200;
-
-  irqDisable( 0x0 );
-
-  gpfTSS->eip = (unsigned int) &_int13;
-  gpfTSS->esp = 0x1D000;
-  gpfTSS->ebp = 0x1D000;
-  gpfTSS->eflags = 0x206;
-
-  ip = FP_TO_LINEAR( _current->tss.cs, _current->tss.eip );
-  ivt = (uInt16 *) 0x0;
-  stack = (uInt16 *) FP_TO_LINEAR( _current->tss.ss, _current->tss.esp );
-  stack32 = (uInt32 *) stack;
-
-  gpfStart: switch ( ip[0] ) {
-  case 0xCD: /* INT n */
-    switch ( ip[1] ) {
-    case 0x69:
-      kprintf( "Exit Bios [0x%X]\n", _current->id );
-      _current->state = DEAD;
-      break;
-    case 0x20:
-    case 0x21:
-      kpanic( "GPF OP 0x20/0x21\n" );
-      break;
-    default:
-      stack -= 3;
-      _current->tss.esp = ((_current->tss.esp & 0xffff) - 6) & 0xffff;
-      stack[0] = (uInt16)( _current->tss.eip + 2 );
-      stack[1] = _current->tss.cs;
-      stack[2] = (uInt16) _current->tss.eflags;
-      if ( _current->oInfo.v86If )
-        stack[2] |= EFLAG_IF;
-      else
-        stack[2] &= ~EFLAG_IF;
-      _current->tss.cs = ivt[ip[1] * 2 + 1] & 0xFFFF;
-      _current->tss.eip = ivt[ip[1] * 2] & 0xFFFF;
-      break;
-    }
-    break;
-  case 0x66:
-    isOperand32 = TRUE;
-    ip++;
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    goto gpfStart;
-    break;
-  case 0x67:
-    isAddress32 = TRUE;
-    ip++;
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    goto gpfStart;
-    break;
-  case 0xF0:
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    kpanic( "GPF OP 0xF0\n" );
-    break;
-  case 0x9C:
-    if ( isOperand32 == TRUE ) {
-      _current->tss.esp = ((_current->tss.esp & 0xffff) - 4) & 0xffff;
-      stack32--;
-      stack32[0] = _current->tss.eflags & 0xDFF;
-      if ( _current->oInfo.v86If == TRUE )
-        stack32[0] |= EFLAG_IF;
-      else
-        stack32[0] &= ~EFLAG_IF;
-    }
-    else {
-      _current->tss.esp = ((_current->tss.esp & 0xffff) - 2) & 0xffff;
-      stack--;
-
-      stack[0] = (uInt16) _current->tss.eflags;
-      if ( _current->oInfo.v86If == TRUE )
-        stack[0] |= EFLAG_IF;
-      else
-        stack[0] &= ~EFLAG_IF;
-      _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-
-    }
-    break;
-  case 0x9D:
-    if ( isOperand32 == TRUE ) {
-      _current->tss.eflags = EFLAG_IF | EFLAG_VM | (stack32[0] & 0xDFF);
-      _current->oInfo.v86If = (stack32[0] & EFLAG_IF) != 0;
-      _current->tss.esp = ((_current->tss.esp & 0xffff) + 4) & 0xffff;
-    }
-    else {
-      _current->tss.eflags = EFLAG_IF | EFLAG_VM | stack[0];
-      _current->oInfo.v86If = (stack[0] & EFLAG_IF) != 0;
-      _current->tss.esp = ((_current->tss.esp & 0xffff) + 2) & 0xffff;
-    }
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    /* kprintf("popf [0x%X]\n",_current->id); */
-    break;
-  case 0xFA:
-    _current->oInfo.v86If = FALSE;
-    _current->tss.eflags &= ~EFLAG_IF;
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    _current->oInfo.timer = 0x1;
-    break;
-  case 0xFB:
-    _current->oInfo.v86If = TRUE;
-    _current->tss.eflags |= EFLAG_IF;
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    _current->oInfo.timer = 0x0;
-    /* kprintf("sti [0x%X]\n",_current->id); */
-    break;
-  case 0xCF:
-    _current->tss.eip = stack[0];
-    _current->tss.cs = stack[1];
-    _current->tss.eflags = EFLAG_IF | EFLAG_VM | stack[2];
-    _current->oInfo.v86If = (stack[2] & EFLAG_IF) != 0;
-    _current->tss.esp = ((_current->tss.esp & 0xffff) + 6) & 0xffff;
-    /* kprintf("iret [0x%X]\n",_current->id); */
-    break;
-  case 0xEC: /* IN AL,DX */
-    _current->tss.eax = (_current->tss.eax & ~0xFF) | inportByte( _current->tss.edx );
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    break;
-  case 0xED: /* IN AX,DX */
-    _current->tss.eax = (_current->tss.eax & ~0xFFFF) | inportWord( _current->tss.edx );
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    break;
-  case 0xEE: /* OUT DX,AL */
-    outportByte( _current->tss.edx, _current->tss.eax & 0xFF );
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    break;
-  case 0xEF:
-    outportWord( _current->tss.edx, _current->tss.eax );
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    break;
-  case 0xF4:
-    _current->tss.eip = (uInt16)( _current->tss.eip + 1 );
-    break;
-  default: /* something wrong */
-    kprintf( "NonHandled OpCode [0x%X:0x%X]\n", _current->id, ip[0] );
-    _current->state = DEAD;
-    break;
-  }
-  irqEnable( 0 );
-  while ( 1 )
-    ;
-}
-
-/* Removed static however this is the only place it's called from */
-void mathStateRestore() {
-  if ( _usedMath != 0x0 ) {
-    asm(
-        "fnsave %0"
-        :
-        : "m" (_usedMath->i387)
-    );
-  }
-  if ( _current->usedMath != 0x0 ) {
-    asm(
-        "frstor %0"
-        :
-        : "m" (_current->i387)
-    );
-  }
-  else {
-    asm("fninit");
-    _current->usedMath = 0x1;
-  }
-
-  _usedMath = _current;
-
-  //Return
-}
-
-void _int7();
-
-asm(
-    ".globl _int7              \n"
-    "_int7:                    \n"
-    "  pushl %eax              \n"
-    "  clts                    \n"
-    "  movl _current,%eax      \n"
-    "  cmpl _usedMath,%eax     \n"
-    "  je mathDone             \n"
-    "  call mathStateRestore   \n"
-    "mathDone:                 \n"
-    "  popl %eax               \n"
-    "  iret                    \n"
-);
-
-/***
- END
- ***/
diff --git a/sys/sys/io.c b/sys/sys/io.c
deleted file mode 100644
index 82f3207..0000000
--- a/sys/sys/io.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2005, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: io.c 88 2016-01-12 00:11:29Z reddawg $
-
- *****************************************************************************************/
-
-#include <sys/io.h>
-
-/*!
- * \brief input one byte from specified port
- *
- * \param port address of port for reading
- * \return returns unsigned char value
- *
- */
-unsigned char inportByte( unsigned int port ) {
-  unsigned char retVal;
-  asm volatile(
-      "inb %%dx,%%al"
-      : "=a" (retVal)
-      : "d" (port)
-  );
-  return (retVal);
-}
-
-/*!
- * \brief input one word from specified port
- *
- * \param port address of port for reading
- * \return returns unsigned short value
- *
- */
-unsigned short inportWord( unsigned int port ) {
-  unsigned short retVal;
-  asm volatile(
-      "inw %%dx,%%ax"
-      : "=a" (retVal)
-      : "d" (port)
-  );
-  return (retVal);
-}
-
-/*!
- * \brief outputut one byte to specified port
- *
- * \param port address of port for writing
- * \param value byte to output to port
- *
- */
-void outportByte( unsigned int port, unsigned char value ) {
-  asm volatile(
-      "outb %%al,%%dx"
-      :
-      : "d" (port), "a" (value)
-  );
-}
-
-/*!
- * \brief outputut one byte to specified port with a delay
- *
- * \param port address of port for writing
- * \param value byte to output to port
- *
- */
-void outportByteP( unsigned int port, unsigned char value ) {
-  asm volatile(
-      "outb %%al,%%dx\n"
-      "outb %%al,$0x80\n"
-      :
-      : "d" (port), "a" (value)
-  );
-}
-
-/*!
- * \brief outputut one word to specified port
- *
- * \param port address of port for writing
- * \param value word to output to port
- *
- */
-void outportWord( unsigned int port, unsigned short value ) {
-  asm volatile(
-      "outw %%ax,%%dx"
-      :
-      : "d" (port), "a" (value)
-  );
-}
-
-/*!
- * \brief outputut one double word to specified port
- *
- * \param port address of port for writing
- * \param value double word to output to port
- *
- */
-void outportDWord( unsigned int port, unsigned long value ) {
-  asm volatile(
-      "outl %%eax,%%dx"
-      :
-      : "d" (port), "a" (value)
-  );
-}
-
-/*!
- * \brief input one double word from specified port
- *
- * \param port address of port for reading
- * \return returns unsigned double word value
- *
- */
-unsigned long inportDWord( unsigned int port ) {
-  unsigned long retVal;
-  asm volatile(
-      "inl %%dx,%%eax"
-      : "=a" (retVal)
-      : "d" (port)
-  );
-  return (retVal);
-}
-
-/***
- END
- ***/
diff --git a/sys/sys/video.c b/sys/sys/video.c
deleted file mode 100644
index c35911a..0000000
--- a/sys/sys/video.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2005 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: video.c 79 2016-01-11 16:21:27Z reddawg $
-
-*****************************************************************************************/
-
-#include <sys/io.h>
-#include <sys/video.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/tty.h>
-
-static unsigned char  *videoBuffer = (unsigned char *)0xB8000;
-int                    printColor = defaultColor;
-
-
-void backSpace() {
-  uInt32 bufferOffset = 0x0;
-  outportByte(0x3d4, 0x0e);
-  bufferOffset = inportByte(0x3d5);
-  bufferOffset <<= 0x8; /* Shift Address Left 8 Bits */
-  outportByte(0x3d4, 0x0f);
-  bufferOffset += inportByte(0x3d5);
-  bufferOffset <<= 0x1; /* Shift Address Left 1 Bits */
-  videoBuffer[bufferOffset--] = 0x20;
-  videoBuffer[bufferOffset--] = printColor;
-  videoBuffer[bufferOffset]   = 0x20;
-  bufferOffset >>= 0x1;
-  tty_foreground->tty_x = (bufferOffset &  0xFF);
-  tty_foreground->tty_y = (bufferOffset >> 0x8);
-  outportByte(0x3D4, 0x0f);
-  outportByte(0x3D5, tty_foreground->tty_x);
-  outportByte(0x3D4, 0x0e);
-  outportByte(0x3D5, tty_foreground->tty_y);
-  return;
-  }
-
-void 
-kprint(char *string)
-{
-
-  unsigned int    bufferOffset = 0x0, character = 0x0, i = 0x0;
-
-  /* Short circuit if we're in tty mode */
-  if (NULL != tty_foreground)
-  {
-      tty_print(string,tty_find(0));
-      return;
-  }
-
-  /* We Need To Get The Y Position */
-  outportByte(0x3D4, 0x0e);
-  bufferOffset = inportByte(0x3D5);
-  bufferOffset <<= 8;		/* Shift Address Left 8 Bits */
-  /* Then We Need To Add The X Position */
-  outportByte(0x3D4, 0x0f);
-  bufferOffset += inportByte(0x3D5);
-  bufferOffset <<= 1;		/* Shift Address Left 1 Bits */
-
-  while ((character = *string++)) {
-    switch (character) {
-    case '\n':
-      bufferOffset = (bufferOffset / 160) * 160 + 160;
-      break;
-    default:
-      videoBuffer[bufferOffset++] = character;
-      videoBuffer[bufferOffset++] = printColor;
-      break;
-    }				/* switch */
-    /* Check To See If We Are Out Of Bounds */
-    if (bufferOffset >= 160 * 25) {
-      for (i = 0; i < 160 * 24; i++) {
-	videoBuffer[i] = videoBuffer[i + 160];
-      }				/* for */
-      for (i = 0; i < 80; i++) {
-	videoBuffer[(160 * 24) + (i * 2)] = 0x20;
-	videoBuffer[(160 * 24) + (i * 2) + 1] = printColor;
-      }				/* for */
-      bufferOffset -= 160;
-    }				/* if */
-  }				/* while */
-  bufferOffset >>= 1;		/* Set the new cursor position  */
-  outportByte(0x3D4, 0x0f);
-  outportByte(0x3D5, ((bufferOffset & 0x0ff) & 0xFF));
-  outportByte(0x3D4, 0x0e);
-  outportByte(0x3D5, ((bufferOffset >> 8) & 0xFF));
-
-  return;
-}
-
-/* Clears The Screen */
-void clearScreen() {
-  short i = 0x0;
-
-  for (i = 0x0; i < (80 * 25); i++) {
-    videoBuffer[i * 2] = 0x20;
-    videoBuffer[i * 2 + 1] = defaultColor;
-    }
-  outportByte(0x3D4, 0x0f);
-  outportByte(0x3D5, 0);
-  outportByte(0x3D4, 0x0e);
-  outportByte(0x3D5, 0);
-  }
-
-/***
- END
- ***/
diff --git a/sys/vmm/Makefile b/sys/vmm/Makefile
deleted file mode 100644
index 9b4b704..0000000
--- a/sys/vmm/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  (C) 2002 The UbixOS Project
-#  $Id: Makefile 132 2016-01-15 14:30:19Z reddawg $
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#  Objects
-OBJS = page_fault.o pagefault.o getfreevirtualpage.o copyvirtualspace.o setpageattributes.o unmappage.o getphysicaladdr.o getfreepage.o createvirtualspace.o vmm_memory.o paging.o vmm_init.o vmm_mmap.o
-
-all: $(OBJS)
-
-#  Compile Types
-.cc.o:
-	$(CXX) ${CFLAGS} $(INCLUDES) -c -o $@ $<
-.cc.s:
-	$(CXX) ${CFLAGS} $(INCLUDES) -S -o $@ $<
-.c.o:
-	$(CC)  ${CFLAGS} $(INCLUDES) -c -o $@ $<
-.c.s:
-	$(CC)  ${CFLAGS} $(INCLUDES) -S -o $@ $<
-.S.o:
-	$(CC)  ${CFLAGS} $(INCLUDES) -c -o $@ $<
-
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS)
diff --git a/sys/vmm/README b/sys/vmm/README
deleted file mode 100644
index 68fd016..0000000
--- a/sys/vmm/README
+++ /dev/null
@@ -1,2 +0,0 @@
-UbixOS VMM (c) 2002-2004 UbixOS 
-
diff --git a/sys/vmm/copyvirtualspace.c b/sys/vmm/copyvirtualspace.c
deleted file mode 100644
index e843351..0000000
--- a/sys/vmm/copyvirtualspace.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: copyvirtualspace.c 232 2016-01-24 01:47:12Z reddawg $
-
- *****************************************************************************************/
-
-#include <vmm/vmm.h>
-#include <sys/kern_sysctl.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/kpanic.h>
-#include <string.h>
-
-static struct spinLock cvsSpinLock = SPIN_LOCK_INITIALIZER;
-
-/************************************************************************
-
- Function: void *vmmCopyVirtualSpace(pidType pid);
-
- Description: Creates A Copy Of A Virtual Space And Set All NON Kernel
- Space To COW For A Fork This Will Also Alter The Parents
- VM Space To Make That COW As Well
-
- Notes:
-
- 08/02/02 - Added Passing Of pidType pid So We Can Better Keep Track Of
- Which Task Has Which Physical Pages
-
- ************************************************************************/
-void *vmm_copyVirtualSpace(pidType pid) {
-  void *newPageDirectoryAddress = 0x0;
-  uInt32 *parentPageDirectory = 0x0, *newPageDirectory = 0x0;
-  uInt32 *parentPageTable = 0x0, *newPageTable = 0x0;
-  uInt32 *parentStackPage = 0x0, *newStackPage = 0x0;
-  uInt16 x = 0, i = 0, s = 0;
-
-  spinLock(&cvsSpinLock);
-
-  /* Set Address Of Parent Page Directory */
-  parentPageDirectory = (uInt32 *) PD_BASE_ADDR;
-
-  /* Allocate A New Page For The New Page Directory */
-  if ((newPageDirectory = (uInt32 *) vmm_getFreeKernelPage(pid, 1)) == 0x0)
-    kpanic("Error: newPageDirectory == NULL, File: %s, Line: %i\n", __FILE__, __LINE__);
-
-  /* Set newPageDirectoryAddress To The Newly Created Page Directories Page */
-  newPageDirectoryAddress = (void *) vmm_getPhysicalAddr((uInt32) newPageDirectory);
-
-  /* First Set Up A Flushed Page Directory */
-  memset(newPageDirectory, 0x0, 0x1000);
-
-  /* Map The Top 1GB Region Of The VM Space */
-  for (x = 768; x < PD_ENTRIES; x++)
-    newPageDirectory[x] = parentPageDirectory[x];
-
-  /*
-   * Now For The Fun Stuff For Page Tables 1-766 We Must Map These And Set
-   * The Permissions On Every Mapped Pages To COW This Will Conserve Memory
-   * Because The Two VM Spaces Will Be Sharing Some Pages
-   */
-
-  for (x = 0x1; x <= PD_INDEX(VMM_USER_END); x++) {
-    /* If Page Table Exists Map It */
-    if ((parentPageDirectory[x] & PAGE_PRESENT) == PAGE_PRESENT) {
-
-      /* Set Parent  To Propper Page Table */
-      parentPageTable = (uInt32 *) (PT_BASE_ADDR + (0x1000 * x));
-
-      /* Allocate A New Page Table */
-      if ((newPageTable = (uInt32 *) vmm_getFreeKernelPage(pid, 1)) == 0x0)
-        kpanic("Error: newPageTable == NULL, File: %s, Line: %i\n", __FILE__, __LINE__);
-
-      /* Set Parent And New Pages To COW */
-      for (i = 0; i < PD_ENTRIES; i++) {
-
-        /* If Page Is Mapped */
-        if ((parentPageTable[i] & PAGE_PRESENT) == PAGE_PRESENT) {
-
-          /* Check To See If Its A Stack Page */
-          if (((uInt32) parentPageTable[i] & PAGE_STACK) == PAGE_STACK) {
-            /* Alloc A New Page For This Stack Page */
-            if ((newStackPage = (uInt32 *) vmm_getFreeKernelPage(pid, 1)) == 0x0)
-              kpanic("Error: newStackPage == NULL, File: %s, Line: %i\n", __FILE__, __LINE__);
-
-            /* Set Pointer To Parents Stack Page */
-            parentStackPage = (uInt32 *) (((1024 * 4096) * x) + (4096 * i));
-
-            /* Copy The Tack Byte For Byte (I Should Find A Faster Way) */
-            for (s = 0x0; s < PD_ENTRIES; s++) {
-              newStackPage[s] = parentStackPage[s];
-            }
-
-            /* Insert New Stack Into Page Table */
-            newPageTable[i] = (vmm_getPhysicalAddr((uInt32) newStackPage) | PAGE_DEFAULT | PAGE_STACK);
-            /* Unmap From Kernel Space */
-            vmm_unmapPage((uInt32) newStackPage, 1);
-
-          }
-          else {
-
-            /* Set Page To COW In Parent And Child Space */
-            newPageTable[i] = (((uInt32) parentPageTable[i] & 0xFFFFF000) | (PAGE_DEFAULT | PAGE_COW));
-            /* Increment The COW Counter For This Page */
-            if (((uInt32) parentPageTable[i] & PAGE_COW) == PAGE_COW) {
-              adjustCowCounter(((uInt32) parentPageTable[i] & 0xFFFFF000), 1);
-            }
-            else {
-              adjustCowCounter(((uInt32) parentPageTable[i] & 0xFFFFF000), 2);
-              parentPageTable[i] = newPageTable[i];
-            }
-          }
-        }
-        else {
-          newPageTable[i] = (uInt32) 0x0;
-        }
-      }
-
-      /* Put New Page Table Into New Page Directory */
-      newPageDirectory[x] = (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT);
-      /* Unmap Page From Kernel Space But Keep It Marked As Not Avail */
-      vmm_unmapPage((uInt32) newPageTable, 1);
-    }
-    else {
-      newPageDirectory[x] = (uInt32) 0x0;
-    }
-  }
-
-  /*
-   * Allocate A New Page For The The First Page Table Where We Will Map The
-   * Lower Region
-   */
-  if ((newPageTable = (uInt32 *) vmm_getFreeKernelPage(pid, 1)) == 0x0)
-    kpanic("Error: newPageTable == NULL, File: %s, Line: %i\n", __FILE__, __LINE__);
-
-  /* Flush The Page From Garbage In Memory */
-  memset(newPageTable, 0x0, 0x1000);
-
-  /* Map This Into The Page Directory */
-  newPageDirectory[0] = (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT);
-  /* Set Address Of Parents Page Table */
-  parentPageTable = (uInt32 *) PT_BASE_ADDR;
-  /* Map The First 1MB Worth Of Pages */
-  for (x = 0; x < (PD_ENTRIES / 4); x++) {
-    newPageTable[x] = parentPageTable[x];
-  }
-
-  /* Map The Next 3MB Worth Of Pages But Make Them COW */
-  for (x = (PD_ENTRIES / 4) + 1; x < PD_ENTRIES; x++) {
-    /* If Page Is Avaiable Map It */
-    if ((parentPageTable[x] & 0xFFFFF000) != 0x0) {
-      /* Set Pages To COW */
-      newPageTable[x] = (((uInt32) parentPageTable[x] & 0xFFFFF000) | (PAGE_DEFAULT | PAGE_COW));
-      /* Increment The COW Counter For This Page */
-      if (((uInt32) parentPageTable[x] & PAGE_COW) == PAGE_COW) {
-        adjustCowCounter(((uInt32) parentPageTable[x] & 0xFFFFF000), 1);
-      }
-      else {
-        adjustCowCounter(((uInt32) parentPageTable[x] & 0xFFFFF000), 2);
-        parentPageTable[x] = newPageTable[x];
-      }
-    }
-    else {
-      newPageTable[x] = (uInt32) 0x0;
-    }
-  }
-
-  /*
-   *
-   * Map Page Directory Into VM Space
-   * First Page After Page Tables
-   * This must be mapped into the page directory before we map all 1024 page directories into the memory space
-   */
-  newPageTable = (uInt32 *) vmm_getFreePage(pid);
-
-  newPageDirectory[PD_INDEX(PD_BASE_ADDR)] = (uint32_t) (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT);
-
-  newPageTable[0] = (uint32_t) ((uint32_t) (newPageDirectoryAddress) | PAGE_DEFAULT);
-  //MrOlsen (2017-12-15) - kprintf( "PD3: %i - 0x%X - 0x%X\n", PD_INDEX( PD_BASE_ADDR ), newPageDirectoryAddress, newPageTable[0] );
-
-  vmm_unmapPage((uInt32) newPageTable, 1);
-
-  /*
-   *
-   * Map Page Tables Into VM Space
-   * The First Page Table (4MB) Maps To All Page Directories
-   *
-   */
-
-  newPageTable = (uInt32 *) vmm_getFreePage(pid);
-
-  newPageDirectory[PD_INDEX(PT_BASE_ADDR)] = (uint32_t) (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT);
-
-  /* Flush The Page From Garbage In Memory */
-  for (x = 0; x < PD_ENTRIES; x++)
-    newPageTable[x] = (uInt32) 0x0;
-
-  for (x = 0; x < PD_ENTRIES; x++)
-    newPageTable[x] = newPageDirectory[x];
-
-  /* Unmap Page From Virtual Space */
-  vmm_unmapPage((uInt32) newPageTable, 1);
-
-  /* Now We Are Done With The Page Directory So Lets Unmap That Too */
-
-  vmm_unmapPage((uInt32) newPageDirectory, 1);
-
-  spinUnlock(&cvsSpinLock);
-
-  /* Return Physical Address Of Page Directory */
-  return (newPageDirectoryAddress);
-}
diff --git a/sys/vmm/createvirtualspace.c b/sys/vmm/createvirtualspace.c
deleted file mode 100644
index feecaac..0000000
--- a/sys/vmm/createvirtualspace.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: createvirtualspace.c 232 2016-01-24 01:47:12Z reddawg $
-
- *****************************************************************************************/
-
-#include <vmm/vmm.h>
-
-/************************************************************************
-
- Function: void *vmmCreateVirtualSpace(pid_t);
- Description: Creates A Virtual Space For A New Task
- Notes:
-
- 07/30/02 - This Is Going To Create A New VM Space However Its Going To
- Share The Same Top 1GB Space With The Kernels VM And Lower
- 1MB Of VM Space With The Kernel
-
- 07/30/02 - Note This Is Going To Get The Top 1Gig And Lower 1MB Region
- From The Currently Loaded Page Directory This Is Safe Because
- All VM Spaces Will Share These Regions
-
- 07/30/02 - Note I Realized A Mistake The First Page Table Will Need To Be
- A Copy But The Page Tables For The Top 1GB Will Not Reason For
- This Is That We Just Share The First 1MB In The First Page Table
- So We Will Just Share Physical Pages.
-
- 08/02/02 - Added Passing Of pid_t pid For Better Tracking Of Who Has Which
- Set Of Pages
-
- ************************************************************************/
-void *vmm_createVirtualSpace(pid_t pid) {
-  void *newPageDirectoryAddress = 0x0;
-  uInt32 *parentPageDirectory = 0x0, *newPageDirectory = 0x0;
-  uInt32 *parentPageTable = 0x0, *newPageTable = 0x0;
-  int x = 0;
-
-  /* Set Address Of Parent Page Directory */
-  parentPageDirectory = (uInt32 *) PD_BASE_ADDR;
-
-  /* Allocate A New Page For The New Page Directory */
-
-  newPageDirectory = (uInt32 *) vmm_getFreePage(pid);
-
-  /* Set newPageDirectoryAddress To The Newly Created Page Directories Page */
-
-  newPageDirectoryAddress = (void *) vmm_getPhysicalAddr((uInt32) newPageDirectory);
-
-  /* First Set Up A Flushed Page Directory */
-  for (x = 0; x < PD_ENTRIES; x++) {
-    newPageDirectory[x] = (uInt32) 0x0;
-  }
-
-  /* Map The Top Kernel (APPROX 1GB) Region Of The VM Space */
-  for (x = PD_INDEX(VMM_KERN_START); x < PD_ENTRIES; x++) {
-    newPageDirectory[x] = parentPageDirectory[x];
-  }
-
-  /*
-   * Allocate A New Page For The The First Page Table Where We Will Map The
-   * Lower Region
-   */
-
-  newPageTable = (uInt32 *) vmm_getFreePage(pid);
-
-  /* Flush The Page From Garbage In Memory */
-  for (x = 0; x < PD_ENTRIES; x++) {
-    newPageTable[x] = (uInt32) 0x0;
-  }
-
-  /* Map This Into The Page Directory */
-  newPageDirectory[0] = (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT);
-
-  /* Set Address Of Parents Page Table */
-  parentPageTable = (uInt32 *) PT_BASE_ADDR;
-
-  /* Map The First 1MB Worth Of Pages */
-  for (x = 0; x < (PD_ENTRIES / 4); x++) {
-    newPageTable[x] = parentPageTable[x];
-  }
-
-  /* Unmap Page From Virtual Space */
-  vmm_unmapPage((uInt32) newPageTable, 1);
-
-  /*
-   *
-   * Map Page Directory Into VM Space
-   * First Page After Page Tables
-   * This must be mapped into the page directory before we map all 1024 page directories into the memory space
-   */
-  newPageTable = (uInt32 *) vmm_getFreePage(pid);
-
-  newPageDirectory[PD_INDEX(PD_BASE_ADDR)] = (uint32_t) (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT);
-
-  newPageTable[0] = (uint32_t) ((uint32_t) (newPageDirectoryAddress) | PAGE_DEFAULT);
-  //MrOlsen 2017-12-15 kprintf( "PD3: %i - 0x%X - 0x%X\n", PD_INDEX( PD_BASE_ADDR ), newPageDirectoryAddress, newPageTable[0] );
-
-  vmm_unmapPage((uInt32) newPageTable, 1);
-
-  /*
-   *
-   * Map Page Tables Into VM Space
-   * The First Page Table (4MB) Maps To All Page Directories
-   *
-   */
-
-  newPageTable = (uInt32 *) vmm_getFreePage(pid);
-
-  newPageDirectory[PD_INDEX(PT_BASE_ADDR)] = (uint32_t) (vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT);
-
-  /* Flush The Page From Garbage In Memory */
-  for (x = 0; x < PD_ENTRIES; x++)
-    newPageTable[x] = (uInt32) 0x0;
-
-  for (x = 0; x < PD_ENTRIES; x++)
-    newPageTable[x] = newPageDirectory[x];
-
-  /* Unmap Page From Virtual Space */
-  vmm_unmapPage((uInt32) newPageTable, 1);
-
-  /* Now We Are Done With The Page Directory So Lets Unmap That Too */
-
-  vmm_unmapPage((uInt32) newPageDirectory, 1);
-  /* Return Physical Address Of Page Directory */
-  return (newPageDirectoryAddress);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/vmm/getfreepage.c b/sys/vmm/getfreepage.c
deleted file mode 100644
index da85df1..0000000
--- a/sys/vmm/getfreepage.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getfreepage.c 188 2016-01-23 03:09:10Z reddawg $
-
- *****************************************************************************************/
-
-#include <vmm/vmm.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/spinlock.h>
-
-static struct spinLock vmmGFPlock = SPIN_LOCK_INITIALIZER;
-
-/************************************************************************
-
- Function: void *vmm_getFreePage(pidType pid);
-
- Description: Returns A Free Page Mapped To The VM Space
-
- Notes:
-
- 07/30/02 - This Returns A Free Page In The Top 1GB For The Kernel
-
- ************************************************************************/
-void *vmm_getFreePage( pidType pid ) {
-  uInt16 x = 0x0, y = 0x0;
-  uInt32 *pageTableSrc = 0x0;
-
-  spinLock( &vmmGFPlock );
-
-  /* Lets Search For A Free Page */
-  for ( x = 768; x < 1024; x++ ) {
-
-    /* Set Page Table Address */
-    pageTableSrc = (uInt32 *) (PT_BASE_ADDR + (0x1000 * x));
-    for ( y = 0x0; y < 1024; y++ ) {
-      /* Loop Through The Page Table Find An UnAllocated Page */
-      if ( (uInt32) pageTableSrc[y] == (uInt32) 0x0 ) {
-        /* Map A Physical Page To The Virtual Page */
-        if ( (vmm_remapPage( vmm_findFreePage( pid ), ((x * 0x400000) + (y * 0x1000)), KERNEL_PAGE_DEFAULT )) == 0x0 )
-          kpanic( "vmmRemapPage: vmm_getFreePage\n" );
-        /* Clear This Page So No Garbage Is There */
-        vmm_clearVirtualPage( (uInt32)( (x * 0x400000) + (y * 0x1000) ) );
-        /* Return The Address Of The Newly Allocate Page */
-        spinUnlock( &vmmGFPlock );
-        return ((void *) ((x * 0x400000) + (y * 0x1000)));
-      }
-    }
-  }
-
-  /* If No Free Page Was Found Return NULL */
-  spinUnlock( &vmmGFPlock );
-  return (0x0);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/vmm/getfreevirtualpage.c b/sys/vmm/getfreevirtualpage.c
deleted file mode 100644
index 152dce2..0000000
--- a/sys/vmm/getfreevirtualpage.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getfreevirtualpage.c 230 2016-01-24 01:36:51Z reddawg $
-
- *****************************************************************************************/
-
-#include <vmm/vmm.h>
-#include <ubixos/sched.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/spinlock.h>
-#include <lib/kprintf.h>
-
-static struct spinLock fvpSpinLock = SPIN_LOCK_INITIALIZER;
-
-/************************************************************************
-
- Function: void *vmmGetFreeVirtualPage(pidType pid,int count);
- Description: Returns A Free Page Mapped To The VM Space
- Notes:
-
- 2016-01-21 MrOlsen - I'm not 100% happy with this, i know I can make the calculations much faster
-
- 08/11/02 - This Will Return Next Avilable Free Page Of Tasks VM Space
-
- ************************************************************************/
-void *vmmGetFreeVirtualPage( pidType pid, int count, int type ) {
-  int y = 0, counter = 0, pdI = 0x0, ptI = 0x0;
-  uint32_t *pageTableSrc = 0x0;
-  uint32_t *pageDir = 0x0;
-  uint32_t start_page = 0x0;
-
-  spinLock( &fvpSpinLock );
-
-  pageDir = (uInt32 *) PD_BASE_ADDR;
-
-  /* Lets Search For A Free Page */
-  if ( _current->oInfo.vmStart <= 0x100000 )
-    kpanic( "Invalid vmStart\n" );
-
-  /* Get Our Starting Address */
-  if ( type == VM_THRD ) {
-    start_page = (uint32_t)( _current->td.vm_daddr + ctob( _current->td.vm_dsize ) );
-  }
-  else if ( type == VM_TASK ) {
-    //kprintf("vmStart");
-    start_page = _current->oInfo.vmStart;
-  }
-  else
-    K_PANIC( "Invalid Type" );
-
-  //kprintf( "Entering MMAP: Type: %i, Returning %i Pages At Address: 0x%X\n", type, count, start_page );
-
-  /*
-   *
-   * I Need To Write Some Function For Space That Is Returned Maybe A Malloc Type Map
-   *
-   */
-
-  /*
-   * Lets Start Allocating Pages
-   */
-
-  for ( counter = 0; counter < count; counter++ ) {
-    /* Locate Initial Page Table */
-    pdI = ((start_page + (counter * 0x1000)) / 0x400000);
-
-    /* If Page Directory Is Not Yet Allocated Allocate It */
-    if ( (pageDir[pdI] & PAGE_PRESENT) != PAGE_PRESENT ) {
-      pageDir[pdI] = (uInt32) vmm_findFreePage( _current->id ) | PAGE_DEFAULT;
-
-      /* Also Add It To Virtual Space So We Can Make Changes Later */
-      pageTableSrc = (uInt32 *) (PT_BASE_ADDR + (4096 * 767));
-      pageTableSrc[pdI] = pageDir[pdI];
-
-      /* Reload Page Directory */
-      asm(
-          "movl %cr3,%eax\n"
-          "movl %eax,%cr3\n"
-      );
-
-      pageTableSrc = (uInt32 *) (PT_BASE_ADDR + (0x1000 * pdI));
-
-      /* Initialize The New Page Table To Prevent Dirty Bits */
-      for ( y = 0x0; y < PD_ENTRIES; y++ ) {
-        pageTableSrc[y] = (uInt32) 0x0;
-      }
-
-    }
-    else {
-      pageTableSrc = (uInt32 *) (PT_BASE_ADDR + (0x1000 * pdI));
-    }
-
-    ptI = ((start_page - (pdI * 0x400000)) / 0x1000);
-
-    for ( y = ptI; y < 1024 && counter < count; y++ ) {
-
-      /* Loop Through The Page Table Find An UnAllocated Page */
-      if ( (pageTableSrc[y] & PAGE_COW) == PAGE_COW ) {
-        kprintf( "COW PAGE NOT CLEANED!" );
-      }
-      else if ( (uInt32) pageTableSrc[y] == (uInt32) 0x0 ) {
-        if ( (vmm_remapPage( (uInt32) vmm_findFreePage( pid ), ((pdI * (1024 * 4096)) + (y * 4096)), PAGE_DEFAULT )) == 0x0 )
-          kpanic( "vmmRemapPage: getFreeVirtualPage-1: (%i)[0x%X]\n", type, ((pdI * (1024 * 4096)) + (y * 4096)) );
-        vmm_clearVirtualPage( (uInt32)( (pdI * (1024 * 4096)) + (y * 4096) ) );
-      }
-      else {
-        kprintf( "-> y: %i, ptI: 0x%X, pdI: 0x%X pTS: 0x%X ??\n", y, ptI, pdI, pageTableSrc[y] );
-        K_PANIC( "UHM HOW DO WE HAVE AN ALLOCATED PAGE HERE!!\n" );
-      }
-      counter++;
-
-    }
-  }
-
-  if ( type == VM_THRD ) {
-    _current->td.vm_dsize += btoc( count * 0x1000 );
-    //kprintf( "vm_dsize: [0x%X]][0x%X]\n", ctob( _current->td.vm_dsize ), _current->td.vm_dsize );
-  }
-  else if ( type == VM_TASK )
-    _current->oInfo.vmStart += count * 0x1000;
-
-  /*
-   * MMAP Return
-   */
-
-  //kprintf( "mmap: [0x%x]\n", start_page );
-  /* If No Free Page Was Found Return NULL */
-  spinUnlock( &fvpSpinLock );
-  return (start_page);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/vmm/getphysicaladdr.c b/sys/vmm/getphysicaladdr.c
deleted file mode 100644
index 1ccdb86..0000000
--- a/sys/vmm/getphysicaladdr.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getphysicaladdr.c 188 2016-01-23 03:09:10Z reddawg $
-
-*****************************************************************************************/
-
-#include <vmm/vmm.h>
-
-/*!
-
-Function: void *vmmGetPhysicalAddr();
-Description: Returns The Physical Address Of The Virtual Page
-Notes:
-
-*/
-
-uint32_t vmm_getPhysicalAddr(uInt32 pageAddr) {
-  int             pageDirectoryIndex = 0x0, pageTableIndex = 0x0;
-  uInt32         *pageTable = 0x0;
-
-  //Calculate The Page Directory Index
-  pageDirectoryIndex = (pageAddr >> 22);
-  
-  //Calculate The Page Table Index
-  pageTableIndex = ((pageAddr >> 12) & 0x3FF);
-  
-  /* Set pageTable To The Virtual Address Of Table */
-  pageTable = (uInt32 *) (PT_BASE_ADDR + (0x1000 * pageDirectoryIndex));
-  /* Return The Physical Address Of The Page */
-  return ((uInt32)(pageTable[pageTableIndex] & 0xFFFFF000));
-  }
-
-
-uint32_t vmm_getRealAddr(uint32_t addr) {
-  int       pageDirectoryIndex = 0x0, pageTableIndex = 0x0;
-  uint32_t *pageTable = 0x0;
-
-  //Calculate The Page Directory Index
-  pageDirectoryIndex = (addr >> 22);
-
-  //Calculate The Page Table Index
-  pageTableIndex = ((addr >> 12) & 0x3FF);
-
-  /* Set pageTable To The Virtual Address Of Table */
-  pageTable = (uint32_t *) (PT_BASE_ADDR + (0x1000 * pageDirectoryIndex));
-  /* Return The Physical Address Of The Page */
-  return ((uint32_t)(pageTable[pageTableIndex] & 0xFFFFF000) + (addr & 0xFFF));
-  }
-
-/***
- END
- ***/
diff --git a/sys/vmm/page_fault.S b/sys/vmm/page_fault.S
deleted file mode 100644
index 8a7607d..0000000
--- a/sys/vmm/page_fault.S
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: page_fault.S 205 2016-01-23 19:18:59Z reddawg $
-
- *****************************************************************************************/
-
-/*
- Page fault wrapper this will aquire some values we need for later use
- */
-
-.globl _vmm_pageFault2
-.text
-.code32
-_vmm_pageFault2:
-xchgl %eax,(%esp) /* Save EAX                                         */
-movl 4(%esp),%eax /* Move EIP into EAX to use later                   */
-pushl %ebx /* Save EBX                                         */
-movl 20(%esp),%ebx /* Save ESP for ring 3 to use later                 */
-pushl %ecx /* Save ECX,EDX                                     */
-pushl %edx
-push %ebx /* Push ESP                                         */
-push %eax /* Push EIP                                         */
-movl %cr2,%eax /* Push the faulted address                         */
-pushl %eax
-sti /* Turn interrupts back on we are now entrant safe  */
-call vmm_pageFault /* Call our page fault handler                      */
-addl $0xC,%esp /* Adjust the stack to compensate for pushed values */
-popl %edx /* Restore EAX,EBX,ECX,EDX                          */
-popl %ecx
-popl %ebx
-popl %eax
-iret /* Return from the interrupt                        */
-
-.globl _vmm_pageFault
-.text
-.code32
-
-_BALLS:
-_B3:
-nop
-
-_ast:
-
-_astRet:
-
-_vmm_pageFault:
-pushl $0xC
-pushal
-push %ds
-push %es
-push %fs
-push %gs
-mov $0x10,%eax
-mov %eax,%ds
-mov %eax,%es
-mov %eax,%fs
-cld
-push %esp
-call trap
-notyet:
-pushl %eax
-sti
-call vmm_pageFault
-/* call syscall */
-add $0x4,%esp
-cmpb $0x13,0x38(%esp)
-je _BALLS
-testl $0x2000,0x3c(%esp) /* Test If VM */
-jz _notVM
-jmp _isVM
-_notVM:
-testb $0x3,0x38(%esp) /* See If We're In User CS (GDT Entry 5) */
-jz _popFS
-cli
-mov %fs:0x0,%eax
-testl $0x10800,0x80(%eax) /* Document This */
-je _popFS
-sti
-push %esp
-call _ast
-add $0x4,%esp
-jmp _astRet
-_isVM:
-hlt
-
-_popFS:
-pop %gs
-pop %fs
-pop %es
-pop %ds
-popa
-add $0x8,%esp
-iret
-
-/***
- END
- ***/
diff --git a/sys/vmm/pagefault.c b/sys/vmm/pagefault.c
deleted file mode 100644
index b800544..0000000
--- a/sys/vmm/pagefault.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: pagefault.c 230 2016-01-24 01:36:51Z reddawg $
-
- *****************************************************************************************/
-
-#include <vmm/vmm.h>
-#include <ubixos/sched.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/spinlock.h>
-#include <lib/kprintf.h>
-#include <sys/trap.h>
-
-static struct spinLock pageFaultSpinLock = SPIN_LOCK_INITIALIZER;
-
-/*****************************************************************************************
-
- Function:    void vmm_pageFault(uInt32 memAddr,uInt32 eip,uInt32 esp);
- Description: This is the page fault handler, it will handle COW and trap all other
- exceptions and segfault the thread.
-
- Notes:
-
- 07/30/02 - Fixed COW However I Need To Think Of A Way To Impliment
- A Paging System Also Start To Add Security Levels
-
- 07/27/04 - Added spin locking to ensure that we are thread safe. I know that spining a
- cpu is a waste of resources but for now it prevents errors.
-
- *****************************************************************************************/
-/* void vmm_pageFault(uInt32 memAddr,uInt32 eip,uInt32 esp) { */
-void vmm_pageFault(struct trapframe *frame, uint32_t cr2) {
-  uInt32 i = 0x0, pageTableIndex = 0x0, pageDirectoryIndex = 0x0;
-  uInt32 *pageDir = 0x0, *pageTable = 0x0;
-  uInt32 *src = 0x0, *dst = 0x0;
-
-  uint32_t esp = frame->tf_esp;
-  uint32_t eip = frame->tf_eip;
-  uint32_t memAddr = cr2;
-
-//MrOlsen 2017-12-15 - 
-kprintf("CR2: [0x%X], EIP: 0x%X, ERR: 0x%X\n", cr2, frame->tf_eip, frame->tf_err);
-
-  /* Try to aquire lock otherwise spin till we do */
-  spinLock(&pageFaultSpinLock);
-
-  /* Set page dir pointer to the address of the visable page directory */
-  pageDir = (uInt32 *) PD_BASE_ADDR;
-
-  /* UBU - This is a temp panic for 0x0 read write later on I will handle this differently */
-  if (memAddr == 0x0) {
-    kprintf("Segfault At Address: [0x%X], ESP: [0x%X], PID: [%i], EIP: [0x%X]\n", memAddr, esp, _current->id, eip);
-    kpanic("Error We Wrote To 0x0\n");
-  }
-
-  /* Calculate The Page Directory Index */
-  pageDirectoryIndex = (memAddr >> 22);
-
-  /* Calculate The Page Table Index     */
-  pageTableIndex = ((memAddr >> 12) & 0x3FF);
-
-  /* UBU - This is a temporary routine for handling access to a page of a non existant page table */
-  if (pageDir[pageDirectoryIndex] == 0x0) {
-    kprintf("Segfault At Address: [0x%X][0x%X][%i][0x%X], Not A Valid Page Table\n", memAddr, esp, _current->id, eip);
-    spinUnlock(&pageFaultSpinLock);
-    endTask(_current->id);
-  } else {
-    /* Set pageTable To Point To Virtual Address Of Page Table */
-    pageTable = (uInt32 *) (PT_BASE_ADDR + (0x1000 * pageDirectoryIndex));
-
-    /* Test if this is a COW on page */
-    if (((uInt32) pageTable[pageTableIndex] & PAGE_COW) == PAGE_COW) {
-      /* Set Src To Base Address Of Page To Copy */
-      src = (uInt32 *) (memAddr & 0xFFFFF000);
-      /* Allocate A Free Page For Destination */
-      /* USE vmInfo */
-      dst = (uInt32 *) vmmGetFreeVirtualPage(_current->id, 1, 0x1);
-      /* Copy Memory */
-      for (i = 0; i < PD_ENTRIES; i++) {
-        dst[i] = src[i];
-      }
-      /* Adjust The COW Counter For Physical Page */
-      adjustCowCounter(((uInt32) pageTable[pageTableIndex] & 0xFFFFF000), -1);
-      /* Remap In New Page */
-      pageTable[pageTableIndex] = (uInt32) (vmm_getPhysicalAddr((uInt32) dst) | (memAddr & 0xFFF));
-      /* Unlink From Memory Map Allocated Page */
-      vmm_unmapPage((uInt32) dst, 1);
-    } else if (pageTable[pageTableIndex] != 0x0) {
-      kprintf("Security failed pagetable not user permission\n");
-      kprintf("pageDir: [0x%X]\n", pageDir[pageDirectoryIndex]);
-      kprintf("pageTable: [0x%X:0x%X:0x%X:0x%X]\n", pageTable[pageTableIndex], pageTableIndex, pageDirectoryIndex, eip);
-      kprintf("Segfault At Address: [0x%X][0x%X][%i][0x%X] Non Mapped\n", memAddr, esp, _current->id, eip);
-      spinUnlock(&pageFaultSpinLock);
-      endTask(_current->id);
-    } else if (memAddr < (_current->td.vm_dsize + _current->td.vm_daddr)) {
-kprintf("THIS IS BAD");
-      pageTable[pageTableIndex] = (uInt32) vmm_findFreePage(_current->id) | PAGE_DEFAULT;
-    } else {
-      spinUnlock(&pageFaultSpinLock);
-      /* Need To Create A Routine For Attempting To Access Non Mapped Memory */
-      kprintf("pageDir: [0x%X]\n", pageDir[pageDirectoryIndex]);
-      kprintf("pageTable: [0x%X:0x%X:0x%X:0x%X]\n", pageTable[pageTableIndex], pageTableIndex, pageDirectoryIndex, eip);
-      kprintf("Segfault At Address: [0x%X][0x%X][%i][0x%X] Non Mapped\n", memAddr, esp, _current->id, eip);
-      kprintf("Out Of Stack Space: [0x%X]\n", memAddr & 0xFF0000);
-      spinUnlock(&pageFaultSpinLock);
-      endTask(_current->id);
-    }
-  }
-  asm volatile(
-      "movl %cr3,%eax\n"
-      "movl %eax,%cr3\n"
-  );
-
-  /* Release the spin lock */
-  spinUnlock(&pageFaultSpinLock);
-kprintf("CR2-RET");
-  return;
-}
-
-/***
- $Log: pagefault.c,v $
- Revision 1.6  2006/12/05 14:10:21  reddawg
- Workign Distro
-
- Revision 1.5  2006/12/01 05:12:35  reddawg
- We're almost there... :)
-
- Revision 1.4  2006/11/21 13:25:49  reddawg
- A handful of changes ;)
-
- Revision 1.3  2006/11/06 19:10:12  reddawg
- Lots Of Updates... Still having issues with brk();
-
- Revision 1.2  2006/10/31 20:44:19  reddawg
- Lots of changes
-
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:38  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:52  reddawg
- no message
-
- Revision 1.14  2004/08/25 22:02:41  reddawg
- task switching - We now are using software switching to be consistant with the rest of the world because all of this open source freaks gave me a hard time about something I liked. There doesn't seem to be any gain in performance but it is working fine and flawlessly
-
- Revision 1.13  2004/08/24 05:24:37  reddawg
- TCA Is A BONER!!!!
-
- Revision 1.12  2004/08/14 11:23:03  reddawg
- Changes
-
- Revision 1.11  2004/07/28 15:05:43  reddawg
- Major:
- Pages now have strict security enforcement.
- Many null dereferences have been resolved.
- When apps loaded permissions set for pages rw and ro
-
- Revision 1.10  2004/07/28 00:22:56  reddawg
- bah
-
- Revision 1.9  2004/07/28 00:17:05  reddawg
- Major:
- Disconnected page 0x0 from the system... Unfortunately this broke many things
- all of which have been fixed. This was good because nothing deferences NULL
- any more.
-
- Things affected:
- malloc,kmalloc,getfreepage,getfreevirtualpage,pagefault,fork,exec,ld,ld.so,exec,file
-
- Revision 1.8  2004/07/27 07:09:38  reddawg
- Put in a test for 0x0
-
- Revision 1.7  2004/07/26 19:15:49  reddawg
- test code, fixes and the like
-
- Revision 1.6  2004/07/24 23:04:44  reddawg
- Changes... mark let me know if you fault at pid 185 when you type stress
-
- Revision 1.5  2004/07/24 20:00:51  reddawg
- Lots of changes to the vmm subsystem.... Page faults have been adjust to now be blocking on a per thread basis not system wide. This has resulted in no more deadlocks.. also the addition of per thread locking has removed segfaults as a result of COW in which two tasks fault the same COW page and try to modify it.
-
- Revision 1.4  2004/07/24 17:47:28  reddawg
- vmm_pageFault: deadlock resolved thanks to a propper solution suggested by geist
-
- Revision 1.3  2004/07/19 02:05:26  reddawg
- vmmPageFault: had a potential memory leak here for one page it was still using sysID on certain COW scenarios
-
- Revision 1.2  2004/06/10 22:23:56  reddawg
- Volatiles
-
- Revision 1.1.1.1  2004/04/15 12:06:52  reddawg
- UbixOS v1.0
-
- Revision 1.4  2004/04/13 16:36:34  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
diff --git a/sys/vmm/paging.c b/sys/vmm/paging.c
deleted file mode 100644
index 63c89ef..0000000
--- a/sys/vmm/paging.c
+++ /dev/null
@@ -1,654 +0,0 @@
-/*-
- * Copyright (c) 2002-2004, 2016, 2017 The UbixOS Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this list of
- * conditions, the following disclaimer and the list of authors.  Redistributions in binary
- * form must reproduce the above copyright notice, this list of conditions, the following
- * disclaimer and the list of authors in the documentation and/or other materials provided
- * with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
- */
-
-#include <vmm/vmm.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/sched.h>
-#include <ubixos/spinlock.h>
-#include <sys/kern_descrip.h>
-#include <string.h>
-#include <assert.h>
-
-uint32_t *kernelPageDirectory = 0x0; // Pointer To Kernel Page Directory
-
-static struct spinLock fkpSpinLock = SPIN_LOCK_INITIALIZER;
-static struct spinLock rmpSpinLock = SPIN_LOCK_INITIALIZER;
-
-/*****************************************************************************************
- Function: int vmm_pagingInit();
-
- Description: This Function Will Initialize The Operating Systems Paging
- Abilities.
-
- Notes:
- 02/20/2004 - Looked Over Code And Have Approved Its Quality
- 07/28/3004 - All pages are set for ring-0 only no more user accessable
-
- *****************************************************************************************/
-
-int vmm_pagingInit() {
-  uint32_t i = 0x0;
-  uint32_t *pageTable = 0x0;
-
-  /* Allocate A Page Of Memory For Kernels Page Directory */
-  kernelPageDirectory = (uint32_t *) vmm_findFreePage( sysID);
-
-  if (kernelPageDirectory == 0x0) {
-    K_PANIC("Error: vmm_findFreePage Failed");
-  } /* end if */
-
-  /* Clear The Memory To Ensure There Is No Garbage */
-  for (i = 0; i < PD_ENTRIES; i++) {
-    kernelPageDirectory[i] = (uint32_t) 0x0;
-  } /* end for */
-
-  /* Allocate a page for the first 4MB of memory */
-  if ((pageTable = (uint32_t *) vmm_findFreePage( sysID)) == 0x0)
-    K_PANIC("Error: vmm_findFreePage Failed");
-
-  /* Make Sure The Page Table Is Clean */
-  memset(pageTable, 0x0, 0x1000);
-
-  kernelPageDirectory[0] = (uint32_t) ((uint32_t) (pageTable) | PAGE_DEFAULT);
-
-  /*
-   * Map the first 1MB of Memory to the kernel MM space because our kernel starts
-   * at 0x30000
-   * Do not map page at address 0x0 this is reserved for null...
-   */
-
-  /* MrOlsen (2016-01-15) NOTE: I'm Mappying It For Now Until I Can Figure Out Why FS:0x0 */
-  for (i = 0x0; i < (PD_ENTRIES / 0x4); i++) {
-    pageTable[i] = (uint32_t) ((i * 0x1000) | PAGE_DEFAULT);
-  } /* end for */
-
-  /*
-   * Create page tables for the top 1GB of VM space. This space is set aside
-   * for kernel space and will be shared with each process
-   */
-
-  kprintf("PD: %i\n", PD_INDEX(VMM_KERN_START));
-
-  for (i = PD_INDEX(VMM_KERN_START); i < PD_ENTRIES; i++) {
-    if ((pageTable = (uint32_t *) vmm_findFreePage( sysID)) == 0x0)
-      K_PANIC("Error: vmm_findFreePage Failed");
-
-    /* Make Sure The Page Table Is Clean */
-    memset(pageTable, 0x0, 0x1000);
-
-    /* Map In The Page Directory */
-    kernelPageDirectory[i] = (uint32_t) ((uint32_t) (pageTable) | KERNEL_PAGE_DEFAULT | PAGE_GLOBAL);
-  } /* end for */
-
-  /*
-   * Map Page Tables Into VM Space
-   * The First Page Table (4MB) Maps To All Page Directories
-   */
-  if (kernelPageDirectory[PD_INDEX(PT_BASE_ADDR)] == 0) {
-    if ((pageTable = (uint32_t *) vmm_findFreePage( sysID)) == 0x0)
-      K_PANIC("Error: vmm_findFreePage Failed");
-
-    kernelPageDirectory[PD_INDEX(PT_BASE_ADDR)] = (uint32_t) ((uint32_t) (pageTable) | KERNEL_PAGE_DEFAULT);
-  }
-
-  kprintf("PD2: %i\n", PD_INDEX(PT_BASE_ADDR));
-  pageTable = (uint32_t *) (kernelPageDirectory[PD_INDEX(PT_BASE_ADDR)] & 0xFFFFF000);
-
-  for (i = 0; i < PD_ENTRIES; i++) {
-    pageTable[i] = kernelPageDirectory[i];
-  } /* end for */
-
-  /*
-   * Map Page Directory Into VM Space
-   * First Page After Page Tables
-   */
-  kprintf("PPD3: %i\n", PD_INDEX(PD_BASE_ADDR));
-  if (kernelPageDirectory[PD_INDEX(PD_BASE_ADDR)] == 0) {
-    if ((pageTable = (uint32_t *) vmm_findFreePage( sysID)) == 0x0)
-      K_PANIC("Error: vmm_findFreePage Failed");
-
-    kernelPageDirectory[PD_INDEX(PD_BASE_ADDR)] = (uint32_t) ((uint32_t) (pageTable) | KERNEL_PAGE_DEFAULT);
-  }
-
-  pageTable = (uint32_t *) (kernelPageDirectory[PD_INDEX(PD_BASE_ADDR)] & 0xFFFFF000);
-  pageTable[0] = (uint32_t) ((uint32_t) (kernelPageDirectory) | PAGE_DEFAULT);
-
-  /* Also Set Up Page Directory To Be The The First Page In 0xE0400000 */
-  /*
-   pageTable = (uint32_t *) (kernelPageDirectory[0] & 0xFFFFF000);
-
-   pageTable[256] = (uint32_t)( (uint32_t)( kernelPageDirectory ) | PAGE_DEFAULT );
-   */
-
-  /* Now Lets Turn On Paging With This Initial Page Table */
-  asm volatile(
-    "movl %0,%%eax          \n"
-    "movl %%eax,%%cr3       \n"
-    "movl %%cr0,%%eax       \n"
-    "orl  $0x80010000,%%eax \n" /* Turn on memory protection */
-    "movl %%eax,%%cr0       \n"
-    :
-    : "d"((uint32_t *) (kernelPageDirectory))
-  );
-
-  /* Remap The Memory List */
-  for (i = 0x101000; i <= (0x101000 + (numPages * sizeof(mMap))); i += 0x1000) {
-    if ((vmm_remapPage(i, (VMM_MMAP_ADDR_PMODE + (i - 0x101000)), PAGE_DEFAULT)) == 0x0)
-      K_PANIC("vmmRemapPage failed\n");
-  }
-
-  /* Set New Address For Memory Map Since Its Relocation */
-  vmmMemoryMap = (mMap *) VMM_MMAP_ADDR_PMODE;
-
-  /* Print information on paging */
-  kprintf("paging0 - Address: [0x%X], PagingISR Address: [0x%X]\n", kernelPageDirectory, &_vmm_pageFault);
-
-  /* Return so we know everything went well */
-  return (0x0);
-} /* END */
-
-/*****************************************************************************************
- Function: int vmmRemapPage(Physical Source,Virtual Destination)
-
- Description: This Function Will Remap A Physical Page Into Virtual Space
-
- Notes:
- 07/29/02 - Rewrote This To Work With Our New Paging System
- 07/30/02 - Changed Address Of Page Tables And Page Directory
- 07/28/04 - If perms == 0x0 set to PAGE_DEFAULT
-
- *****************************************************************************************/
-int vmm_remapPage(uint32_t source, u_int dest, uInt16 perms) {
-  uInt16 destPageDirectoryIndex = 0x0, destPageTableIndex = 0x0;
-  u_int *pageDir = 0x0, *pageTable = 0x0;
-  short i = 0x0;
-
-  if (source == 0x0)
-    K_PANIC("source == 0x0");
-
-  if (dest == 0x0)
-    K_PANIC("dest == 0x0");
-
-  spinLock(&rmpSpinLock);
-
-  if (perms == 0x0)
-    perms = KERNEL_PAGE_DEFAULT;
-
-  /* Set Pointer pageDirectory To Point To The Virtual Mapping Of The Page Directory */
-  pageDir = PD_BASE_ADDR;
-
-  /* Get Index Into The Page Directory */
-  destPageDirectoryIndex = PD_INDEX(dest);
-
-  if ((pageDir[destPageDirectoryIndex] & PAGE_PRESENT) != PAGE_PRESENT) {
-    //kprintf("Page Not Present: 0x%X, Source: 0x%X, Dest: 0x%X, dPDI: 0x%X\n", dest, source, dest, destPageDirectoryIndex);
-    /* If Page Table Is Non Existant Then Set It Up */
-    /* UBU Why does the page table need to be user writable? */
-    pageDir[destPageDirectoryIndex] = (uint32_t) vmm_findFreePage(_current->id) | PAGE_DEFAULT;
-
-    /* Also Add It To Virtual Space So We Can Make Changes Later */
-    pageTable = (uint32_t *) (PT_BASE_ADDR + (PD_INDEX( PT_BASE_ADDR ) * 0x1000)); /* Table that maps that 4b */
-    pageTable[destPageDirectoryIndex] = (pageDir[destPageDirectoryIndex] & 0xFFFFF000) | PAGE_DEFAULT; /* Is This Why Page Needs To Be User As Well? */
-
-    pageTable = (PT_BASE_ADDR + (destPageDirectoryIndex * 0x1000));
-
-    /* Need To Figure Out invlpg */
-    asm volatile(
-      "push %eax       \n"
-      "mov  %cr3,%eax  \n"
-      "mov  %eax,%cr3  \n"
-      "pop  %eax       \n"
-    );
-
-    memset(pageTable, 0x0, 0x1000);
-
-  }
-
-  /* Set Address To Page Table */
-  pageTable = (uint32_t *) (PT_BASE_ADDR + (0x1000 * destPageDirectoryIndex));
-
-  /* Get The Index To The Page Table */
-  destPageTableIndex = PT_INDEX(dest); //((dest - (destPageDirectoryIndex * 0x400000)) / 0x1000);
-
-  /* If The Page Is Mapped In Free It Before We Remap */
-  if ((pageTable[destPageTableIndex] & PAGE_PRESENT) == PAGE_PRESENT) {
-    if ((pageTable[destPageTableIndex] & PAGE_STACK) == PAGE_STACK)
-      kprintf("Stack Page: [0x%X]\n", dest);
-
-    if ((pageTable[destPageTableIndex] & PAGE_COW) != PAGE_COW) {
-      kprintf("Page NOT COW\n");
-      kprintf("Page Present: [0x%X][0x%X]", dest, pageTable[destPageTableIndex]);
-      source = 0x0;
-      goto rmDone;
-    }
-
-    /* Clear The Page First For Security Reasons */
-    freePage(((uint32_t) pageTable[destPageTableIndex] & 0xFFFFF000));
-
-  }
-
-  /* Set The Source Address In The Destination */
-  pageTable[destPageTableIndex] = (uint32_t) (source | perms);
-
-  /* Reload The Page Table; */
-  asm volatile(
-    "push %eax     \n"
-    "movl %cr3,%eax\n"
-    "movl %eax,%cr3\n"
-    "pop  %eax     \n"
-  );
-
-  rmDone:
-  /* Return */
-  spinUnlock(&rmpSpinLock);
-  return (source);
-}
-
-/************************************************************************
-
- Function: void *vmmGetFreeKernelPage(pidType pid);
- Description: Returns A Free Page Mapped To The VM Space
- Notes:
-
- 07/30/02 - This Returns A Free Page In The Top 1GB For The Kernel
-
- ************************************************************************/
-void *vmm_getFreeKernelPage(pidType pid, uint16_t count) {
-  int x = 0, y = 0, c = 0;
-  uint32_t *pageTableSrc = 0x0;
-
-  spinLock(&fkpSpinLock);
-
-  /* Lets Search For A Free Page */
-  for (x = 768; x < 1024; x++) {
-
-    /* Set Page Table Address */
-    pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (4096 * x));
-
-    for (y = 0; y < 1024; y++) {
-
-      /* Loop Through The Page Table Find An UnAllocated Page */
-      if ((uint32_t) pageTableSrc[y] == (uint32_t) 0x0) {
-        if (count > 1) {
-          for (c = 0; c < count; c++) {
-            if (y + c < 1024) {
-              if ((uint32_t) pageTableSrc[y + c] != (uint32_t) 0x0) {
-                c = -1;
-                break;
-              }
-            }
-          }
-          if (c != -1) {
-            for (c = 0; c < count; c++) {
-              if ((vmm_remapPage((uint32_t) vmm_findFreePage(pid), ((x * (1024 * 4096)) + ((y + c) * 4096)), KERNEL_PAGE_DEFAULT)) == 0x0)
-                K_PANIC("vmmRemapPage failed: gfkp-1\n");
-              vmm_clearVirtualPage((uint32_t) ((x * (1024 * 4096)) + ((y + c) * 4096)));
-            }
-            spinUnlock(&fkpSpinLock);
-            return ((void *) ((x * (1024 * 4096)) + (y * 4096)));
-          }
-        }
-        else {
-          /* Map A Physical Page To The Virtual Page */
-
-          if ((vmm_remapPage((uint32_t) vmm_findFreePage(pid), ((x * (1024 * 4096)) + (y * 4096)), KERNEL_PAGE_DEFAULT)) == 0x0)
-            K_PANIC("vmmRemapPage failed: gfkp-2\n");
-
-          /* Clear This Page So No Garbage Is There */
-          vmm_clearVirtualPage((uint32_t) ((x * (1024 * 4096)) + (y * 4096)));
-
-          spinUnlock(&fkpSpinLock);
-          /* Return The Address Of The Newly Allocate Page */
-          return ((void *) ((x * (1024 * 4096)) + (y * 4096)));
-        }
-      }
-    }
-  }
-
-  /* If No Free Page Was Found Return NULL */
-  spinUnlock(&fkpSpinLock);
-  return (0x0);
-}
-
-/************************************************************************
-
- Function: void vmm_clearVirtualPage(uint32_t pageAddr);
-
- Description: This Will Null Out A Page Of Memory
-
- Notes:
-
- ************************************************************************/
-int vmm_clearVirtualPage(uint32_t pageAddr) {
-  uint32_t *src = 0x0;
-  int counter = 0x0;
-
-  /* Set Source Pointer To Virtual Page Address */
-  src = (uint32_t *) pageAddr;
-
-  /* Clear Out The Page */
-  for (counter = 0x0; counter < PD_ENTRIES; counter++) {
-    src[counter] = (uint32_t) 0x0;
-  }
-
-  /* Return */
-  return (0x0);
-}
-
-void *vmm_mapFromTask(pidType pid, void *ptr, uint32_t size) {
-  kTask_t *child = 0x0;
-  uint32_t i = 0x0, x = 0x0, y = 0x0, count = ((size + 4095) / 0x1000), c = 0x0;
-  uInt16 dI = 0x0, tI = 0x0;
-  uint32_t baseAddr = 0x0, offset = 0x0;
-  uint32_t *childPageDir = (uint32_t *) 0x5A00000;
-  uint32_t *childPageTable = 0x0;
-  uint32_t *pageTableSrc = 0x0;
-  offset = (uint32_t) ptr & 0xFFF;
-  baseAddr = (uint32_t) ptr & 0xFFFFF000;
-  child = schedFindTask(pid);
-  //Calculate The Page Table Index And Page Directory Index
-  dI = (baseAddr / (1024 * 4096));
-  tI = ((baseAddr - (dI * (1024 * 4096))) / 4096);
-
-  if (vmm_remapPage(child->tss.cr3, 0x5A00000, KERNEL_PAGE_DEFAULT) == 0x0)
-    K_PANIC("vmm_remapPage: Failed");
-
-  for (i = 0; i < 0x1000; i++) {
-    if (vmm_remapPage(childPageDir[i], 0x5A01000 + (i * 0x1000), KERNEL_PAGE_DEFAULT) == 0x0)
-      K_PANIC("Returned NULL");
-  }
-  for (x = (_current->oInfo.vmStart / (1024 * 4096)); x < 1024; x++) {
-
-    pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (4096 * x));
-
-    for (y = 0; y < 1024; y++) {
-
-      //Loop Through The Page Table Find An UnAllocated Page
-      if ((uint32_t) pageTableSrc[y] == (uint32_t) 0x0) {
-
-        if (count > 1) {
-
-          for (c = 0; ((c < count) && (y + c < 1024)); c++) {
-
-            if ((uint32_t) pageTableSrc[y + c] != (uint32_t) 0x0) {
-
-              c = -1;
-              break;
-
-            }
-
-          }
-
-          if (c != -1) {
-
-            for (c = 0; c < count; c++) {
-
-              if ((tI + c) >= 0x1000) {
-
-                dI++;
-                tI = 0 - c;
-
-              }
-
-              childPageTable = (uint32_t *) (0x5A01000 + (0x1000 * dI));
-
-              if (vmm_remapPage(childPageTable[tI + c], ((x * (1024 * 4096)) + ((y + c) * 4096)), KERNEL_PAGE_DEFAULT) == 0x0)
-                K_PANIC("remap == NULL");
-
-            }
-
-            vmm_unmapPage(0x5A00000, 1);
-
-            for (i = 0; i < 0x1000; i++) {
-              vmm_unmapPage((0x5A01000 + (i * 0x1000)), 1);
-            }
-
-            return ((void *) ((x * (1024 * 4096)) + (y * 4096) + offset));
-
-          }
-
-        }
-        else {
-
-          //Map A Physical Page To The Virtual Page
-          childPageTable = (uint32_t *) (0x5A01000 + (0x1000 * dI));
-
-          if (vmm_remapPage(childPageTable[tI], ((x * (1024 * 4096)) + (y * 4096)), KERNEL_PAGE_DEFAULT) == 0x0)
-            K_PANIC("remap Failed");
-
-          //Return The Address Of The Mapped In Memory
-          vmm_unmapPage(0x5A00000, 1);
-
-          for (i = 0; i < 0x1000; i++) {
-            vmm_unmapPage((0x5A01000 + (i * 0x1000)), 1);
-          }
-
-          return ((void *) ((x * (1024 * 4096)) + (y * 4096) + offset));
-
-        }
-
-      }
-
-    }
-
-  }
-
-  return (0x0);
-}
-
-void *vmm_getFreeMallocPage(uInt16 count) {
-  uInt16 x = 0x0, y = 0x0;
-  int c = 0x0;
-  uint32_t *pageTableSrc = 0x0;
-
-  spinLock(&fkpSpinLock);
-  /* Lets Search For A Free Page */
-  for (x = 960; x < 1024; x++) {
-    /* Set Page Table Address */
-    pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (0x1000 * x));
-    for (y = 0; y < 1024; y++) {
-      /* Loop Through The Page Table Find An UnAllocated Page */
-      if ((uint32_t) pageTableSrc[y] == (uint32_t) 0x0) {
-        if (count > 1) {
-          for (c = 0; c < count; c++) {
-            if (y + c < 1024) {
-              if ((uint32_t) pageTableSrc[y + c] != (uint32_t) 0x0) {
-                c = -1;
-                break;
-              }
-            }
-          }
-          if (c != -1) {
-            for (c = 0; c < count; c++) {
-              if (vmm_remapPage((uint32_t) vmm_findFreePage( sysID), ((x * 0x400000) + ((y + c) * 0x1000)), KERNEL_PAGE_DEFAULT) == 0x0)
-                K_PANIC("remap Failed");
-
-              vmm_clearVirtualPage((uint32_t) ((x * 0x400000) + ((y + c) * 0x1000)));
-            }
-            spinUnlock(&fkpSpinLock);
-            return ((void *) ((x * 0x400000) + (y * 0x1000)));
-          }
-        }
-        else {
-          /* Map A Physical Page To The Virtual Page */
-          if (vmm_remapPage((uint32_t) vmm_findFreePage( sysID), ((x * 0x400000) + (y * 0x1000)), KERNEL_PAGE_DEFAULT) == 0x0)
-            K_PANIC("Failed");
-
-          /* Clear This Page So No Garbage Is There */
-          vmm_clearVirtualPage((uint32_t) ((x * 0x400000) + (y * 0x1000)));
-          /* Return The Address Of The Newly Allocate Page */
-          spinUnlock(&fkpSpinLock);
-          return ((void *) ((x * 0x400000) + (y * 0x1000)));
-        }
-      }
-    }
-  }
-  /* If No Free Page Was Found Return NULL */
-  spinUnlock(&fkpSpinLock);
-  return (0x0);
-}
-
-int sys_mmap(struct thread *td, struct sys_mmap_args *uap) {
-  vm_offset_t addr = 0x0;
-  char *tmp = 0x0;
-  struct file *fd = 0x0;
-
-  addr = (vm_offset_t) uap->addr;
-
-  /*
-   #ifdef _VMM_DEBUG
-   */
-  if (uap->addr != 0x0) {
-    kprintf("Address hints are not supported yet.\n");
-  }
-  kprintf("uap->flags: [0x%X]\n", uap->flags);
-  kprintf("uap->addr:  [0x%X]\n", uap->addr);
-  kprintf("uap->len:   [0x%X]\n", uap->len);
-  kprintf("uap->prot:  [0x%X]\n", uap->prot);
-  kprintf("uap->fd:    [%i]\n", uap->fd);
-  kprintf("uap->pad:   [0x%X]\n", uap->pad);
-  kprintf("uap->pos:   [0x%X]\n", uap->pos);
-  /*
-   #endif
-   */
-
-  if (uap->fd == -1) {
-    //td->td_retval[0] = (int) vmmGetFreeVirtualPage( _current->id, uap->len / 0x1000, VM_TASK );
-    //td->td_retval[0] = (int)
-    return (vmmGetFreeVirtualPage(_current->id, round_page( uap->len ) / 0x1000, VM_THRD));
-  }
-  else {
-    kprintf("uap->flags: [0x%X]\n", uap->flags);
-    kprintf("uap->addr:  [0x%X]\n", uap->addr);
-    kprintf("uap->len:   [0x%X]\n", uap->len);
-    kprintf("uap->prot:  [0x%X]\n", uap->prot);
-    kprintf("uap->fd:    [%i]\n", uap->fd);
-    kprintf("uap->pad:   [0x%X]\n", uap->pad);
-    kprintf("uap->pos:   [0x%X]\n", uap->pos);
-    //K_PANIC("NOT YET\n");
-    getfd(td, &fd, uap->fd);
-    tmp = (char *) vmmGetFreeVirtualPage(_current->id, uap->len / 0x1000, VM_TASK);
-    fread(tmp, uap->len, 0x1, fd->fd);
-
-    td->td_retval[0] = (int) tmp;
-  }
-  return (0x0);
-}
-
-int obreak(struct thread *td, struct obreak_args *uap) {
-  uint32_t i = 0x0;
-  vm_offset_t old = 0x0;
-  vm_offset_t base = 0x0;
-  vm_offset_t new = 0x0;
-
-  /*
-   #ifdef _VMM_DEBUG
-   */
-  kprintf("vm_offset_t: [%i]\n", sizeof(vm_offset_t));
-  kprintf("nsize:    [0x%X]\n", uap->nsize);
-  kprintf("vm_daddr: [0x%X]\n", td->vm_daddr);
-  kprintf("vm_dsize: [0x%X]\n", td->vm_dsize);
-  kprintf("total:    [0x%X]\n", td->vm_daddr + td->vm_dsize);
-  /*
-   #endif
-   */
-
-  new = round_page((vm_offset_t )uap->nsize);
-
-  base = round_page((vm_offset_t ) td->vm_daddr);
-
-  old = base + ctob(td->vm_dsize);
-
-  if (new < base)
-    K_PANIC("EINVAL");
-
-  if (new > old) {
-    for (i = old; i < new; i += 0x1000) {
-      if (vmm_remapPage(vmm_findFreePage(_current->id), i, PAGE_DEFAULT) == 0x0)
-        K_PANIC("remap Failed");
-    }
-    td->vm_dsize += btoc(new - old);
-  }
-  else if (new < old) {
-    K_PANIC("new < old");
-    td->vm_dsize -= btoc(old - new);
-  }
-
-  return (0x0);
-}
-
-int munmap(struct thread *td, struct munmap_args *uap) {
-  /* HACK */
-  kprintf("munmap");
-  return (0x0);
-}
-
-int vmm_cleanVirtualSpace(uint32_t addr) {
-  int x = 0x0;
-  int y = 0x0;
-
-  uint32_t *pageTableSrc = 0x0;
-  uint32_t *pageDir = 0x0;
-
-  pageDir = (uint32_t *) PD_BASE_ADDR;
-
-  for (x = (addr / (1024 * 4096)); x < PD_INDEX(VMM_USER_END); x++) {
-    if ((pageDir[x] & PAGE_PRESENT) == PAGE_PRESENT) {
-      pageTableSrc = (uint32_t *) (PT_BASE_ADDR + (0x1000 * x));
-      for (y = 0; y < 1024; y++) {
-        if ((pageTableSrc[y] & PAGE_PRESENT) == PAGE_PRESENT) {
-          if ((pageTableSrc[y] & PAGE_COW) == PAGE_COW) {
-            //kprintf( "COW: 0x%X", (x * 0x400000) + (y * 0x1000) );
-            pageTableSrc[y] = 0x0;
-          }
-          else if ((pageTableSrc[y] & PAGE_STACK) == PAGE_STACK) {
-            //kprintf("Page Stack!: 0x%X", (x * 0x400000) + (y * 0x1000));
-            // pageTableSrc[y] = 0x0;
-            //MrOlsen (2016-01-18) NOTE: WHat should I Do Here? kprintf( "STACK: (%i:%i)", x, y );
-          }
-          else {
-            //MrOlsen 2017-12-15 -  kprintf( "Page Regular!: 0x%X", (x * 0x400000) + (y * 0x1000) );
-            pageTableSrc[y] = 0x0;
-          }
-        }
-      }
-    }
-  }
-
-  asm(
-    "movl %cr3,%eax\n"
-    "movl %eax,%cr3\n"
-  );
-
-  return (0x0);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/vmm/setpageattributes.c b/sys/vmm/setpageattributes.c
deleted file mode 100644
index ccb690c..0000000
--- a/sys/vmm/setpageattributes.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions, the following disclaimer and the list of authors.  Redistributions in binary
-form must reproduce the above copyright notice, this list of conditions, the following
-disclaimer and the list of authors in the documentation and/or other materials provided
-with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: setpageattributes.c 188 2016-01-23 03:09:10Z reddawg $
-
-*****************************************************************************************/
-
-#include <vmm/vmm.h>
-#include <ubixos/kpanic.h>
-
-/************************************************************************
-
-Function: void vmmSetPageAttributes(uInt32 pageAddr,int attributes;
-Description: This Function Will Set The Page Attributes Such As
-             A Read Only Page, Stack Page, COW Page, ETC.
-Notes:
-
-************************************************************************/
-int vmm_setPageAttributes(uInt32 memAddr,uInt16 attributes) {
-  uInt16          directoryIndex = 0x0, tableIndex = 0x0;
-  uInt32         *pageTable = 0x0;
-
-  /* Calculate The Page Directory Index */
-  directoryIndex = (memAddr >> 22);
-  
-  /* Calculate The Page Table Index */
-  tableIndex = ((memAddr >> 12) & 0x3FF);
-
-  /* Set Table Pointer */
-  if ((pageTable = (uInt32 *) (PT_BASE_ADDR + (0x1000 * directoryIndex))) == 0x0)
-    kpanic("Error: pageTable == NULL, File: %s, Line: %i\n",__FILE__,__LINE__);
-    
-  /* Set Attribute If Page Is Mapped */
-  if (pageTable[tableIndex] != 0x0)
-    pageTable[tableIndex] = ((pageTable[tableIndex] & 0xFFFFF000) | attributes);
-
-  /* Reload The Page Table; */
-  asm volatile(
-      "push %eax     \n"
-      "movl %cr3,%eax\n"
-      "movl %eax,%cr3\n"
-      "pop  %eax     \n"
-    );
-  /* Return */
-  return(0x0);
-  }
-
-/***
- $Log: setpageattributes.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:38  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:53  reddawg
- no message
-
- Revision 1.4  2004/07/28 15:05:43  reddawg
- Major:
-   Pages now have strict security enforcement.
-   Many null dereferences have been resolved.
-   When apps loaded permissions set for pages rw and ro
-
- Revision 1.3  2004/07/20 22:29:55  reddawg
- assert: remade assert
-
- Revision 1.2  2004/06/10 22:23:56  reddawg
- Volatiles
-
- Revision 1.1.1.1  2004/04/15 12:06:53  reddawg
- UbixOS v1.0
-
- Revision 1.6  2004/04/13 16:36:34  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
-
diff --git a/sys/vmm/unmappage.c b/sys/vmm/unmappage.c
deleted file mode 100644
index 4282e1e..0000000
--- a/sys/vmm/unmappage.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: unmappage.c 188 2016-01-23 03:09:10Z reddawg $
-
- *****************************************************************************************/
-
-#include <vmm/vmm.h>
-
-/************************************************************************
-
- Function: void vmm_unmapPage(uInt32 pageAddr,int flags);
- Description: This Function Will Unmap A Page From The Kernel VM Space
- The Flags Variable Decides If Its To Free The Page Or Not
- A Flag Of 0 Will Free It And A Flag Of 1 Will Keep It
- Notes:
-
- 07/30/02 - I Have Decided That This Should Free The Physical Page There
- Is No Reason To Keep It Marked As Not Available
-
- 07/30/02 - Ok A Found A Reason To Keep It Marked As Available I Admit
- Even I Am Not Perfect Ok The Case Where You Wouldn't Want To
- Free It Would Be On Something Like Where I Allocated A Page
- To Create A New Virtual Space So Now It Has A Flag
-
- ************************************************************************/
-void vmm_unmapPage(uInt32 pageAddr, int flags) {
-  int pageDirectoryIndex = 0, pageTableIndex = 0;
-  uInt32 *pageTable = 0x0;
-
-  /* Get The Index To The Page Directory */
-  pageDirectoryIndex = (pageAddr >> 22);
-
-  //Calculate The Page Table Index
-  pageTableIndex = ((pageAddr >> 12) & 0x3FF);
-
-  /* Set pageTable To The Virtual Address Of Table */
-  pageTable = (uInt32 *) (PT_BASE_ADDR + (0x1000 * pageDirectoryIndex));
-  /* Free The Physical Page If Flags Is 0 */
-  if (flags == 0) {
-
-    /*
-     * This is temp i think its still an issue clearVirtualPage(pageAddr);
-     * freePage((uInt32)(pageTable[pageTableIndex] & 0xFFFFF000));
-     */
-  }
-  /* Unmap The Page */
-  pageTable[pageTableIndex] = 0x0;
-  /* Rehash The Page Directory */
-  asm volatile(
-    "movl %cr3,%eax\n"
-    "movl %eax,%cr3\n"
-  );
-  /* Return */
-  return;
-}
-
-/************************************************************************
-
- Function: void vmm_unmapPages(uInt32 pageAddr,int flags);
- Description: This Function Will Unmap A Page From The Kernel VM Space
- The Flags Variable Decides If Its To Free The Page Or Not
- A Flag Of 0 Will Free It And A Flag Of 1 Will Keep It
- Notes:
-
- 07/30/02 - I Have Decided That This Should Free The Physical Page There
- Is No Reason To Keep It Marked As Not Available
-
- 07/30/02 - Ok A Found A Reason To Keep It Marked As Available I Admit
- Even I Am Not Perfect Ok The Case Where You Wouldn't Want To
- Free It Would Be On Something Like Where I Allocated A Page
- To Create A New Virtual Space So Now It Has A Flag
-
- ************************************************************************/
-void vmm_unmapPages(void *ptr, uint32_t size) {
-  uInt32 baseAddr = (uInt32) ptr & 0xFFFFF000;
-  uInt32 dI = 0x0, tI = 0x0;
-  uInt32 y = 0x0;
-  uInt32 *pageTable = 0x0;
-
-  dI = (baseAddr / (1024 * 4096));
-  tI = ((baseAddr - (dI * (1024 * 4096))) / 4096);
-  pageTable = (uInt32 *) (PT_BASE_ADDR + (4096 * dI));
-  for (y = tI; y < (tI + ((size + 4095) / 4096)); y++) {
-    pageTable[y] = 0x0;
-  }
-  return;
-}
-
-/***
- $Log: unmappage.c,v $
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.2  2005/10/12 00:13:38  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:54  reddawg
- no message
-
- Revision 1.4  2004/07/26 19:15:49  reddawg
- test code, fixes and the like
-
- Revision 1.3  2004/06/15 12:35:05  reddawg
- Cleaned Up
-
- Revision 1.2  2004/06/10 22:23:56  reddawg
- Volatiles
-
- Revision 1.1.1.1  2004/04/15 12:06:53  reddawg
- UbixOS v1.0
-
- Revision 1.7  2004/04/13 16:36:34  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
- END
- ***/
diff --git a/sys/vmm/vmm_init.c b/sys/vmm/vmm_init.c
deleted file mode 100644
index 24ea4ae..0000000
--- a/sys/vmm/vmm_init.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vmm_init.c 54 2016-01-11 01:29:55Z reddawg $
-
- *****************************************************************************************/
-
-#include <vmm/vmm.h>
-#include <ubixos/kpanic.h>
-
-/*!
- Function: int vmm_init()
-
- Description: Initializes the vmm subsystem
-
- Notes:
-
- */
-int vmm_init() {
-  if (vmm_memMapInit() != 0x0)
-    K_PANIC("Couldn't Initialize vmm_memMap");
-
-  if (vmm_pagingInit() != 0x0)
-    K_PANIC("Couldn't Initialize paging system");
-
-  return (0x0);
-}
-
-/***
- END
- ***/
-
diff --git a/sys/vmm/vmm_memory.c b/sys/vmm/vmm_memory.c
deleted file mode 100644
index 6c19060..0000000
--- a/sys/vmm/vmm_memory.c
+++ /dev/null
@@ -1,453 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002-2004, 2016 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: vmm_memory.c 230 2016-01-24 01:36:51Z reddawg $
-
- *****************************************************************************************/
-
-#include <vmm/vmm.h>
-#include <sys/io.h>
-#include <ubixos/kpanic.h>
-#include <lib/kprintf.h>
-#include <lib/kmalloc.h>
-#include <ubixos/vitals.h>
-#include <ubixos/spinlock.h>
-#include <assert.h>
-
-//MrOlsen (2016-01-11) NOTE: Need to Seperate Out CPU Specific Stuff Over Time
-#include <i386/cpu.h>
-
-static uInt32 freePages = 0;
-static struct spinLock vmmSpinLock = SPIN_LOCK_INITIALIZER;
-static struct spinLock vmmCowSpinLock = SPIN_LOCK_INITIALIZER;
-
-int numPages = 0x0;
-mMap *vmmMemoryMap = (mMap *) VMM_MMAP_ADDR_RMODE;
-
-/************************************************************************
-
- Function: void vmm_memMapInit();
- Description: This Function Initializes The Memory Map For the System
- Notes:
-
- 02/20/2004 - Made It Report Real And Available Memory
-
- ************************************************************************/
-int vmm_memMapInit() {
-  int i = 0x0;
-  int memStart = 0x0;
-
-  /* Count System Memory */
-  numPages = countMemory();
-
-  /* Set Memory Map To Point To First Physical Page That We Will Use */
-  vmmMemoryMap = (mMap *) VMM_MMAP_ADDR_RMODE;
-
-  /* Initialize Map Make All Pages Not Available */
-  for (i = 0x0; i < numPages; i++) {
-    vmmMemoryMap[i].cowCounter = 0x0;
-    vmmMemoryMap[i].status = memNotavail;
-    vmmMemoryMap[i].pid = vmmID;
-    vmmMemoryMap[i].pageAddr = i * 4096;
-  }
-
-  /* Calculate Start Of Free Memory */
-  memStart = (0x101000 / 0x1000);
-
-  memStart += (((sizeof(mMap) * numPages) + (sizeof(mMap) - 1)) / 0x1000);
-
-  /* Initialize All Free Pages To Available */
-  vmmMemoryMap[(0x100000 / 0x1000)].status = memAvail;
-
-  freePages++;
-
-  for (i = memStart; i < numPages; i++) {
-    vmmMemoryMap[i].status = memAvail;
-    freePages++;
-  }
-
-  if (systemVitals)
-    systemVitals->freePages = freePages;
-
-  /* Print Out Amount Of Memory */
-  kprintf("Real Memory:      %iKB\n", numPages * 4);
-  kprintf("Available Memory: %iKB\n", freePages * 4);
-
-  /* Return */
-  return (0);
-}
-
-/************************************************************************
-
- Function: int countMemory();
- Description: This Function Counts The Systems Physical Memory
- Notes:
-
- 02/20/2004 - Inspect For Quality And Approved
-
- ************************************************************************/
-int countMemory() {
-  register uInt32 *mem = 0x0;
-  unsigned long memCount = -1, tempMemory = 0x0;
-  unsigned short memKb = 8;
-  unsigned char irq1State, irq2State;
-  unsigned long cr0 = 0x0;
-
-  /*
-   * Save The States Of Both IRQ 1 And 2 So We Can Turn Them Off And Restore
-   * Them Later
-   */
-  irq1State = inportByte(0x21);
-  irq2State = inportByte(0xA1);
-
-  /* Turn Off IRQ 1 And 2 To Prevent Chances Of Faults While Examining Memory */
-  outportByte(0x21, 0xFF);
-  outportByte(0xA1, 0xFF);
-
-  /* Save The State Of Register CR0 */
-  cr0 = rcr0();
-  /*
-   asm volatile (
-   "movl %%cr0, %%ebx\n"
-   : "=a" (cr0)
-   :
-   : "ebx"
-   );
-   */
-
-  asm volatile ("wbinvd");
-
-  load_cr0(cr0 | 0x00000001 | 0x40000000 | 0x20000000);
-
-  /*
-   asm volatile (
-   "movl %%ebx, %%cr0\n"
-   :
-   : "a" (cr0 | 0x00000001 | 0x40000000 | 0x20000000)
-   : "ebx"
-   );
-   */
-
-  while (memKb < 4096 && memCount != 0) {
-    memKb++;
-
-    if (memCount == -1)
-      memCount = 8388608;
-    else
-      memCount += 1024 * 1024;
-
-    mem = (uInt32 *) memCount;
-
-    tempMemory = *mem;
-
-    *mem = 0x55AA55AA;
-
-    asm("": : :"memory");
-
-    if (*mem != 0x55AA55AA) {
-      memCount = 0;
-    }
-    else {
-      *mem = 0xAA55AA55;
-      asm("": : :"memory");
-      if (*mem != 0xAA55AA55) {
-        memCount = 0;
-      }
-    }
-    asm("": : :"memory");
-    *mem = tempMemory;
-  }
-
-  asm("nop");
-
-  //MrOlsen (2016-01-10) NOTE: I don't like this but I start incrementing form the start.
-  memKb--;
-
-  asm("nop");
-
-  load_cr0(cr0);
-
-  /*
-   asm volatile (
-   "movl %%ebx, %%cr0\n"
-   :
-   : "a" (cr0)
-   : "ebx"
-   );
-   */
-
-  asm("nop");
-
-  /* Restore States For Both IRQ 1 And 2 */
-  outportByte(0x21, irq1State);
-  outportByte(0xA1, irq2State);
-
-  asm("nop");
-
-  /* Return Amount Of Memory In Pages */
-  return ((memKb * 1024 * 1024) / 4096);
-}
-
-/************************************************************************
-
- Function: uInt32 vmm_findFreePage(pid_t pid);
-
- Description: This Returns A Free  Physical Page Address Then Marks It
- Not Available As Well As Setting The PID To The Proccess
- Allocating This Page
- Notes:
-
- ************************************************************************/
-uInt32 vmm_findFreePage(pidType pid) {
-  int i = 0x0;
-
-  /* Lets Look For A Free Page */
-  if (pid < sysID)
-    kpanic("Error: invalid PID %i\n", pid);
-
-  spinLock(&vmmSpinLock);
-
-  for (i = 0; i <= numPages; i++) {
-
-    /*
-     * If We Found A Free Page Set It To Not Available After That Set Its Own
-     * And Return The Address
-     */
-    if ((vmmMemoryMap[i].status == memAvail) && (vmmMemoryMap[i].cowCounter == 0)) {
-      vmmMemoryMap[i].status = memNotavail;
-      vmmMemoryMap[i].pid = pid;
-      freePages--;
-      if (systemVitals)
-        systemVitals->freePages = freePages;
-//kprintf("vFFP: 0x%X\n", vmmMemoryMap[i].pageAddr);
-
-      spinUnlock(&vmmSpinLock);
-      return (vmmMemoryMap[i].pageAddr);
-    }
-  }
-
-  /* If No Free Memory Is Found Return NULL */
-  kpanic("Out Of Memory!!!!");
-  return (0x0);
-}
-
-/************************************************************************
-
- Function: int freePage(uInt32 pageAddr);
-
- Description: This Function Marks The Page As Free
-
- Notes:
-
- ************************************************************************/
-int freePage(uInt32 pageAddr) {
-  int pageIndex = 0x0;
-  assert((pageAddr & 0xFFF) == 0x0);
-  spinLock(&vmmSpinLock);
-
-  /* Find The Page Index To The Memory Map */
-  pageIndex = (pageAddr / 4096);
-
-  /* Check If Page COW Is Greater Then 0 If It Is Dec It If Not Free It */
-  if (vmmMemoryMap[pageIndex].cowCounter == 0) {
-    /* Set Page As Avail So It Can Be Used Again */
-    vmmMemoryMap[pageIndex].status = memAvail;
-    vmmMemoryMap[pageIndex].cowCounter = 0x0;
-    vmmMemoryMap[pageIndex].pid = -2;
-    freePages++;
-    systemVitals->freePages = freePages;
-  }
-  else {
-    /* Adjust The COW Counter */
-    adjustCowCounter(((uInt32) vmmMemoryMap[pageIndex].pageAddr), -1);
-  }
-  spinUnlock(&vmmSpinLock);
-  /* Return */
-  return (0);
-}
-
-/************************************************************************
-
- Function: int adjustCowCounter(uInt32 baseAddr,int adjustment);
-
- Description: This Adjust The COW Counter For Page At baseAddr It Will
- Error If The Count Goes Below 0
-
- Notes:
-
- 08/01/02 - I Think If Counter Gets To 0 I Should Free The Page
-
- ************************************************************************/
-int adjustCowCounter(uInt32 baseAddr, int adjustment) {
-  int vmmMemoryMapIndex = (baseAddr / 4096);
-  assert((baseAddr & 0xFFF) == 0x0);
-  spinLock(&vmmCowSpinLock);
-  /* Adjust COW Counter */
-  vmmMemoryMap[vmmMemoryMapIndex].cowCounter += adjustment;
-
-  if (vmmMemoryMap[vmmMemoryMapIndex].cowCounter == 0) {
-    vmmMemoryMap[vmmMemoryMapIndex].cowCounter = 0x0;
-    vmmMemoryMap[vmmMemoryMapIndex].pid = vmmID;
-    vmmMemoryMap[vmmMemoryMapIndex].status = memAvail;
-    freePages++;
-    systemVitals->freePages = freePages;
-  }
-  spinUnlock(&vmmCowSpinLock);
-  /* Return */
-  return (0);
-}
-
-/************************************************************************
-
- Function: void vmmFreeProcessPages(pid_t pid);
-
- Description: This Function Will Free Up Memory For The Exiting Process
-
- Notes:
-
- 08/04/02 - Added Checking For COW Pages First
-
- ************************************************************************/
-void vmm_freeProcessPages(pidType pid) {
-  int i = 0, x = 0;
-  uInt32 *tmpPageTable = 0x0;
-  uInt32 *tmpPageDir = (uInt32 *) PD_BASE_ADDR;
-  spinLock(&vmmSpinLock);
-  /* Check Page Directory For An Avail Page Table */
-  for (i = 0; i <= 0x300; i++) {
-    if (tmpPageDir[i] != 0) {
-      /* Set Up Page Table Pointer */
-      tmpPageTable = (uInt32 *) (PT_BASE_ADDR + (i * 0x1000));
-      /* Check The Page Table For COW Pages */
-      for (x = 0; x < PD_ENTRIES; x++) {
-        /* If The Page Is COW Adjust COW Counter */
-        if (((uInt32) tmpPageTable[x] & PAGE_COW) == PAGE_COW) {
-          adjustCowCounter(((uInt32) tmpPageTable[x] & 0xFFFFF000), -1);
-        }
-      }
-    }
-  }
-
-  /* Loop Through Pages To Find Pages Owned By Process */
-  for (i = 0; i < numPages; i++) {
-    if (vmmMemoryMap[i].pid == pid) {
-      /* Check To See If The cowCounter Is Zero If So We Can Ree It */
-      if (vmmMemoryMap[i].cowCounter == 0) {
-        vmmMemoryMap[i].status = memAvail;
-        vmmMemoryMap[i].cowCounter = 0x0;
-        vmmMemoryMap[i].pid = vmmID;
-        freePages++;
-        systemVitals->freePages = freePages;
-      }
-    }
-  }
-  /* Return */
-  spinUnlock(&vmmSpinLock);
-  return;
-}
-
-/***
- $Log: vmm_memory.c,v $
- Revision 1.1  2006/12/01 18:46:19  reddawg
- renaming files
-
- Revision 1.2  2006/12/01 05:12:35  reddawg
- We're almost there... :)
-
- Revision 1.1.1.1  2006/06/01 12:46:13  reddawg
- ubix2
-
- Revision 1.5  2006/06/01 12:42:09  reddawg
- Getting back to the basics
-
- Revision 1.4  2006/06/01 04:15:32  reddawg
- Woot
-
- Revision 1.3  2006/06/01 03:58:33  reddawg
- wondering about this stuff here
-
- Revision 1.2  2005/10/12 00:13:38  reddawg
- Removed
-
- Revision 1.1.1.1  2005/09/26 17:24:51  reddawg
- no message
-
- Revision 1.15  2004/09/11 23:39:31  reddawg
- ok time for bed
-
- Revision 1.14  2004/09/11 16:39:19  apwillia
- Fix order in adjustCowCounter to prevent potential race condition
-
- Revision 1.13  2004/08/14 11:23:03  reddawg
- Changes
-
- Revision 1.12  2004/08/01 20:51:33  reddawg
- adjustCowCounter: we no longer need to debug unhandled adjustments they are normal situations now
-
- Revision 1.11  2004/07/28 00:17:05  reddawg
- Major:
- Disconnected page 0x0 from the system... Unfortunately this broke many things
- all of which have been fixed. This was good because nothing deferences NULL
- any more.
-
- Things affected:
- malloc,kmalloc,getfreepage,getfreevirtualpage,pagefault,fork,exec,ld,ld.so,exec,file
-
- Revision 1.10  2004/07/26 19:15:49  reddawg
- test code, fixes and the like
-
- Revision 1.9  2004/07/24 23:04:44  reddawg
- Changes... mark let me know if you fault at pid 185 when you type stress
-
- Revision 1.8  2004/07/24 17:47:28  reddawg
- vmm_pageFault: deadlock resolved thanks to a propper solution suggested by geist
-
- Revision 1.7  2004/07/19 02:04:32  reddawg
- memory.c: added spinlocks to vmm_findFreePage and vmmFreePage to prevent two tasks from possibly allocating the same page
-
- Revision 1.6  2004/06/14 12:20:54  reddawg
- notes: many bugs repaired and ld works 100% now.
-
- Revision 1.5  2004/05/21 15:34:23  reddawg
- Fixed a couple of typo
-
- Revision 1.4  2004/05/21 14:50:10  reddawg
- Cleaned up
-
- Revision 1.3  2004/05/19 17:28:28  reddawg
- Added the correct endTask Procedure
-
- Revision 1.2  2004/04/30 14:16:04  reddawg
- Fixed all the datatypes to be consistant uInt8,uInt16,uInt32,Int8,Int16,Int32
-
- Revision 1.1.1.1  2004/04/15 12:06:52  reddawg
- UbixOS v1.0
-
- Revision 1.27  2004/04/13 16:36:34  reddawg
- Changed our copyright, it is all now under a BSD-Style license
-
-
- END
- ***/
diff --git a/sys/vmm/vmm_mmap.c b/sys/vmm/vmm_mmap.c
deleted file mode 100644
index b36e96f..0000000
--- a/sys/vmm/vmm_mmap.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*****************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without modification, are
- permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice, this list of
- conditions, the following disclaimer and the list of authors.  Redistributions in binary
- form must reproduce the above copyright notice, this list of conditions, the following
- disclaimer and the list of authors in the documentation and/or other materials provided
- with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: getfreepage.c 54 2016-01-11 01:29:55Z reddawg $
-
- *****************************************************************************************/
-
-#include <vmm/vmm.h>
-#include <lib/kprintf.h>
-#include <ubixos/kpanic.h>
-#include <ubixos/spinlock.h>
-#include <ubixos/sched.h>
-
-/* MrOlsen (2016-01-15) TEMP: Put These somewhere else */
-typedef __uint32_t      __vm_size_t;
-typedef __vm_size_t     vm_size_t;
-#define        EINVAL          22              /* Invalid argument */
-#define MAP_ALIGNED(n)   ((n) << MAP_ALIGNMENT_SHIFT)
-#define MAP_ALIGNMENT_SHIFT     24
-#define MAP_ALIGNMENT_MASK      MAP_ALIGNED(0xff)
-#define MAP_ALIGNED_SUPER       MAP_ALIGNED(1) /* align on a superpage */
-#define        NBBY    8               /* number of bits in a byte */
-
-
-/* PROTs */
-#define PROT_NONE       0x00    /* no permissions */
-#define PROT_READ       0x01    /* pages can be read */
-#define PROT_WRITE      0x02    /* pages can be written */
-#define PROT_EXEC       0x04    /* pages can be executed */
-
-/* FLAGs */
-
-/*
- * Do I Need These?
- */
-#define MAP_SHARED      0x0001          /* share changes */
-#define MAP_PRIVATE     0x0002          /* changes are private */
-#define MAP_FIXED       0x0010 /* map addr must be exactly as requested */
-#define MAP_RENAME       0x0020 /* Sun: rename private pages to file */
-#define MAP_NORESERVE    0x0040 /* Sun: don't reserve needed swap area */
-#define MAP_RESERVED0080 0x0080 /* previously misimplemented MAP_INHERIT */
-#define MAP_RESERVED0100 0x0100 /* previously unimplemented MAP_NOEXTEND */
-#define MAP_HASSEMAPHORE 0x0200 /* region may contain semaphores */
-#define MAP_STACK        0x0400 /* region grows down, like a stack */
-#define MAP_NOSYNC       0x0800 /* page to but do not sync underlying file */
-
-/*
- * Mapping type
- */
-#define MAP_FILE         0x0000 /* map from file (default) */
-#define MAP_ANON         0x1000 /* allocated from memory, swap space */
-
-int freebsd6_mmap( struct thread *td, struct freebsd6_mmap_args *uap ) {
-  vm_size_t size, pageoff;
-  off_t pos;
-  int align, flags, error;
-  vm_offset_t addr;
-
-  int i;
-
-  error = 0;
-
-  size = uap->len;
-  flags = uap->flags;
-  pos = uap->pos;
-
-  kprintf( "uap->flags: [0x%X]\n", uap->flags );
-  kprintf( "uap->addr:  [0x%X]\n", uap->addr );
-  kprintf( "uap->len:   [0x%X]\n", uap->len );
-  kprintf( "uap->prot:  [0x%X]\n", uap->prot );
-  kprintf( "uap->fd:    [%i]\n", uap->fd );
-  kprintf( "uap->pad:   [0x%X]\n", uap->pad );
-  kprintf( "uap->pos:   [0x%X]\n", uap->pos );
-
-  if ( (uap->flags & MAP_ANON) != 0 )
-    pos = 0;
-
-  /*
-   * Align the file position to a page boundary,
-   * and save its page offset component.
-   */
-
-  pageoff = (pos & PAGE_MASK);
-  pos -= pageoff;
-
-  /* Adjust size for rounding (on both ends). */
-  size += pageoff;
-  size = (vm_size_t) round_page( size );
-
-  /* Ensure alignment is at least a page and fits in a pointer. */
-  align = flags & MAP_ALIGNMENT_MASK;
-  if ( align != 0 && align != MAP_ALIGNED_SUPER && (align >> MAP_ALIGNMENT_SHIFT >= sizeof(void *) * NBBY || align >> MAP_ALIGNMENT_SHIFT < PAGE_SHIFT) )
-    return (EINVAL);
-
-  if ( flags & MAP_FIXED ) {
-    kprintf( "FIXED NOT SUPPORTED YET" );
-    return (EINVAL);
-  }
-  else {
-    /* At Some Point I Need To  Proc Lock Incase It's Threaded */
-/* MrOlsen (2016-01-15) Temporary comment out
-    if ( addr == 0 || (addr >= round_page( (vm_offset_t) vms->vm_taddr ) && addr < round_page( (vm_offset_t) vms->vm_daddr + lim_max( td->td_proc, RLIMIT_DATA ) )) )
-      addr = round_page( (vm_offset_t) vms->vm_daddr + lim_max( td->td_proc, RLIMIT_DATA ) );
-*/
-  }
-
-  if ( flags & MAP_ANON ) {
-    /*
-     * Mapping blank space is trivial.
-     */
-
-    /*
-     handle = NULL;
-     handle_type = OBJT_DEFAULT;
-     maxprot = VM_PROT_ALL;
-     cap_maxprot = VM_PROT_ALL;
-     */
-    for ( i = addr; i < (addr + size); i += 0x1000 ) {
-      if ( vmm_remapPage( vmmFindFreePage( _current->id ), i, PAGE_DEFAULT ) == 0x0 )
-        K_PANIC( "remap Failed" );
-    }
-    kprintf( "td->vm_dsize should be adjust but isn't" );
-  }
-  else {
-    /* Mapping File */
-    kprintf( "File Mapping Not Supported Yet" );
-    return (EINVAL);
-  }
-
-  return (0x0);
-}
-
-/***
- END
- ***/
-
diff --git a/tools/Makefile b/tools/Makefile
deleted file mode 100644
index 7f94f5d..0000000
--- a/tools/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: Makefile 89 2016-01-12 00:20:40Z reddawg $
-# Kernel Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-include ../../Makefile.incl
-include ../Makefile.incl
-
-#CC=gcc
-
-#Kernel File Name
-#BINARY = format
-
-#Objects
-OBJS = format.o
-
-# Link the kernel statically with fixed text+data address @1M
-$(BINARY) : $(OBJS)
-	$(CC)  -o $@ $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -Wall -fomit-frame-pointer -O -I../sys/include -c -o $@ $<
- 
-.cc.s:
-	$(CXX)  -Wall -fomit-frame-pointer -O -I../sys/include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -O -c -o $@ $<
- 
-.c.s:
-	$(CC)  -Wall -fomit-frame-pointer -O -I../sys/include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall -fomit-frame-pointer -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(BINARY) *.core
-
-install-ubix:
-	(cp ../sys/compile/ubix.elf /mnts/ubix/boot/loader)
-	(cp ../bin/init/init /mnts/ubix/bin)
-	(cp ../bin/login/login /mnts/ubix/bin)
-	(cp ../bin/shell/shell /mnts/ubix/bin)
-	(cp ../bin/clock/clock /mnts/ubix/bin)
-	(cp ../bin/fdisk/fdisk /mnts/ubix/bin)
-	(cp ../bin/edit/edit /mnts/ubix/bin)
-	(cp ../bin/cat/cat /mnts/ubix/bin)
-	(cp ../bin/ld/ld.so /mnts/ubix/lib)
-	(cp ../bin/rtld-elf/ld-elf.so.1 /mnts/ubix/libexec)
-	(cp ../lib/libc_old/libc_old.so /mnts/ubix/lib)
-	(cp ../lib/libc/libc.so /mnts/ubix/lib)
-	(cp ../lib/ubix_api/ubix_api.so /mnts/ubix/lib)
-	(cp ./userdb /mnts/ubix/etc)
-	(cp ./motd /mnts/ubix/etc)
-
-format-dsk:
-	(cp ../sys/compile/ubix.elf ./)
-	(cp ../sys/compile/ubix.elf /ubixos)
-	(cp ../bin/init/init ./)
-	(cp ../bin/stat/stat ./)
-	(cp ../bin/login/login ./)
-	(cp ../bin/shell/shell ./)
-	(cp ../bin/ls/ls ./)
-	(cp ../bin/clock/clock ./)
-	(cp ../lib/libc_old/libc_old.so ./)
-	(cp ../bin/fdisk/fdisk ./)
-	(cp ../bin/cp/cp ./)
-	#(cp ../bin/format/format ./)
-	(cp ../bin/ubistry/ubistry ./)
-	(cp ../sys/boot/mbr/mbr ./)
-	(cp ../bin/ld/ld.so ./)
-	#(cp /lib/libc.so.5 ./)
-	(cp ../bin/ttyd/ttyd ./)
-	(./format 50 2000 ${FD_DEVICE} ubix.elf 0 login 3754 init 3754 stat 3754 ubistry 3754 shell 3754 userdb 3754 ls 3754 motd 3754 fdisk 3754 cp 3754 clock 3754 libc_old.so 3754 ld.so 3754 ttyd 3754 )
-#	(./format 50 7000 ${FD_DEVICE} ubix.elf 0 login 3754 init 3754 ubistry 3754 shell 3754 userdb 3754 motd 3754 libc_old.so 3754 ld.so 3754 test 3754 libc.so.5 3754)
-
-	#(./format 263 204361 /dev/md1 ubix.elf 0 format 3754 fdisk 3754 ROM8X14.DPF 3754 init 3754 login 3754 shell 3754 userdb 3754 ls 3754 motd 3754 cp 3754)
-	#(./format 1064 2000 ${FD_DEVICE} shell 3754 clock 3754)
-	#(./format 200 2000 /dev/md1 ubix.elf 0 shell 3754 motd 3754 libc_old.so 3754)
-	(rm -fr ubix.elf)
-	(rm -fr login)
-	(rm -fr init)
-	(rm -fr shell)
-	(rm -fr ls)
-	(rm -fr clock)
-	(rm -fr libc_old.so)
-	(rm -fr cp)
-	(rm -fr fdisk)
-	#(rm -fr format)
-	
-	(rm -fr ubistry)
-	(rm -fr ld.so)
-	(rm -fr libc.so.5)
-	(rm -fr ttyd)
diff --git a/tools/Makefile.old b/tools/Makefile.old
deleted file mode 100644
index 885cccb..0000000
--- a/tools/Makefile.old
+++ /dev/null
@@ -1,77 +0,0 @@
-# $Id: Makefile.old 89 2016-01-12 00:20:40Z reddawg $
-# Kernel Makefile (C) 2002 The UbixOS Project
-
-# Include Global 'Source' Options
-Makefile.incl
-
-CC=gcc
-
-#Kernel File Name
-BINARY = format
-
-#Objects
-OBJS = format.o
-
-# Link the kernel statically with fixed text+data address @1M
-$(BINARY) : $(OBJS)
-	$(CC)  -o $@ $(OBJS)
-
-# Compile the source files
-.cc.o:
-	$(CXX)  -Wall -fomit-frame-pointer -O -I../sys/include -c -o $@ $<
- 
-.cc.s:
-	$(CXX)  -Wall -fomit-frame-pointer -O -I../sys/include -S -o $@ $<
- 
-.c.o:
-	$(CC)  -Wall -O -c -o $@ $<
- 
-.c.s:
-	$(CC)  -Wall -fomit-frame-pointer -O -I../sys/include -S -o $@ $<
- 
-.S.o:
-	$(CC)  -Wall -fomit-frame-pointer -c -o $@ $<
- 
-# Clean up the junk
-clean:
-	$(REMOVE) $(OBJS) $(BINARY) *.core
-
-format-dsk:
-	(cp ../sys/compile/ubix.elf ./)
-	(cp ../sys/compile/ubix.elf /ubixos)
-	(cp ../bin/init/init ./)
-	(cp ../bin/stat/stat ./)
-	(cp ../bin/login/login ./)
-	(cp ../bin/shell/shell ./)
-	(cp ../bin/ls/ls ./)
-	(cp ../bin/clock/clock ./)
-	(cp ../lib/libc_old/libc_old.so ./)
-	(cp ../bin/fdisk/fdisk ./)
-	(cp ../bin/cp/cp ./)
-	#(cp ../bin/format/format ./)
-	(cp ../bin/ubistry/ubistry ./)
-	(cp ../sys/boot/mbr/mbr ./)
-	(cp ../bin/ld/ld.so ./)
-	#(cp /lib/libc.so.5 ./)
-	(cp ../bin/ttyd/ttyd ./)
-	(./format 50 2000 ${FD_DEVICE} ubix.elf 0 login 3754 init 3754 stat 3754 ubistry 3754 shell 3754 userdb 3754 ls 3754 motd 3754 fdisk 3754 cp 3754 clock 3754 libc_old.so 3754 ld.so 3754 ttyd 3754 )
-#	(./format 50 7000 ${FD_DEVICE} ubix.elf 0 login 3754 init 3754 ubistry 3754 shell 3754 userdb 3754 motd 3754 libc_old.so 3754 ld.so 3754 test 3754 libc.so.5 3754)
-
-	#(./format 263 204361 /dev/md1 ubix.elf 0 format 3754 fdisk 3754 ROM8X14.DPF 3754 init 3754 login 3754 shell 3754 userdb 3754 ls 3754 motd 3754 cp 3754)
-	#(./format 1064 2000 ${FD_DEVICE} shell 3754 clock 3754)
-	#(./format 200 2000 /dev/md1 ubix.elf 0 shell 3754 motd 3754 libc_old.so 3754)
-	(rm -fr ubix.elf)
-	(rm -fr login)
-	(rm -fr init)
-	(rm -fr shell)
-	(rm -fr ls)
-	(rm -fr clock)
-	(rm -fr libc_old.so)
-	(rm -fr cp)
-	(rm -fr fdisk)
-	#(rm -fr format)
-	
-	(rm -fr ubistry)
-	(rm -fr ld.so)
-	(rm -fr libc.so.5)
-	(rm -fr ttyd)
diff --git a/tools/OLDENG.DPF b/tools/OLDENG.DPF
deleted file mode 100644
index ca96601..0000000
--- a/tools/OLDENG.DPF
+++ /dev/null
Binary files differ
diff --git a/tools/PACMAN.DPF b/tools/PACMAN.DPF
deleted file mode 100644
index 4c8e853..0000000
--- a/tools/PACMAN.DPF
+++ /dev/null
Binary files differ
diff --git a/tools/ROM8X14.DPF b/tools/ROM8X14.DPF
deleted file mode 100644
index 25e7066..0000000
--- a/tools/ROM8X14.DPF
+++ /dev/null
Binary files differ
diff --git a/tools/SCRIPT.DPF b/tools/SCRIPT.DPF
deleted file mode 100755
index 4d2784f..0000000
--- a/tools/SCRIPT.DPF
+++ /dev/null
Binary files differ
diff --git a/tools/format.c b/tools/format.c
deleted file mode 100644
index 8de1291..0000000
--- a/tools/format.c
+++ /dev/null
@@ -1,156 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "./ubixfs.h"
-
-#define typeFile      1
-#define typeContainer 2
-#define typeDirectory 4
-
-
-//Michelle My Bell
-
-struct blockAllocationTableEntry *BAT = 0x0;
-
-int findFreeBlock(int cBlock,int size) {
-  int i = 0x0;
-  for (i=1;i<size;i++) {
-    if (BAT[i].attributes == 0x0) {
-      if (cBlock != -1) {
-        BAT[cBlock].nextBlock = i;
-        }
-      BAT[i].attributes = 1;
-      return(i);
-      }
-    }
-  return(0x0);
-  }
-
-int main(int argc,char **argv) {
-  FILE *driveFd,*fileFd;
-  int startSector = 0x0,size = 0x0,structSize = 0x0,i = 0x0,x = 0x4,block = 0x0,batSize = 0x0;
-  int blockCount = 0x0,file = 0x0;
-  unsigned long counter = 0x0;
-  struct directoryEntry *dirEntry = 0x0;
-  struct partitionInformation *partInfo = 0x0;
-  if (argc <= 4) {
-    printf("Error:\nformat start size files....\n");
-    exit(1);
-    }
-  driveFd = fopen(argv[3],"wb");
-  startSector = atoi(argv[1])-1;
-  size = atoi(argv[2])*512;
-  structSize = sizeof(struct blockAllocationTableEntry);
-  structSize *= (size/4096);
-  batSize = (((structSize+511)/512)*512);
-  BAT = (struct blockAllocationTableEntry *)malloc(structSize);
-  dirEntry = (struct directoryEntry *)malloc(0x4000);
-  memset(dirEntry,0x0,0x4000);
-  partInfo = (struct partitionInformation *)malloc(512);
-  partInfo->size = (size/512);
-  partInfo->startSector = (startSector+1);
-  partInfo->blockAllocationTable = (startSector+1);
-  partInfo->rootDirectory = ((startSector+1) + (batSize/512));
-  partInfo->rootDirectorySize = 0x4000/512;
-  fseek(driveFd,(startSector * 512),0);
-  fwrite(partInfo,512,1,driveFd);
-  startSector++;
-  dirEntry[0].attributes   = typeDirectory;
-  dirEntry[0].permissions  = 0xEAA;  
-  dirEntry[0].gid          = 0x0;
-  dirEntry[0].uid          = 0x0;
-  dirEntry[0].startCluster = 0x0;
-  dirEntry[0].size         = 0x4000;
-  sprintf(dirEntry[0].fileName,"/");  
-  dirEntry[1].attributes   = typeDirectory;
-  dirEntry[1].permissions  = 0xEAA;
-  dirEntry[1].gid          = 0x0;
-  dirEntry[1].uid          = 0x0;
-  dirEntry[1].startCluster = 0x0;
-  dirEntry[1].size         = 0x4000;
-  sprintf(dirEntry[1].fileName,"..");
-  BAT[0].nextBlock  = 0x1;
-  BAT[0].attributes = 1;
-  BAT[0].realSector = (batSize/512);
-  BAT[1].nextBlock  = 0x2;
-  BAT[1].attributes = 1;
-  BAT[1].realSector = ((batSize/512) + 1 * 8);
-  BAT[2].nextBlock  = 0x3;
-  BAT[2].attributes = 1;
-  BAT[2].realSector = ((batSize/512) + 2 * 8);
-  BAT[3].nextBlock  = -1;
-  BAT[3].attributes = 1;
-  BAT[3].realSector = ((batSize/512) + 3 * 8);      
-  
-  for (i=4;i<(size/4096);i++) {
-    BAT[i].nextBlock  =  -1;
-    BAT[i].attributes = 0x0;
-    BAT[i].realSector = ((batSize/512) + (i*8));
-    BAT[i].reserved   = 0x0;
-    }
-  file = 0x2;
-  while (x < argc) {
-    counter = 0x0;
-    blockCount = 0x0;
-    fileFd = fopen(argv[x],"rb");
-    block = findFreeBlock(-1,(size/4096));
-    dirEntry[file].startCluster = block;
-    dirEntry[file].attributes   = typeFile;
-    dirEntry[file].permissions  = atoi(argv[x+1]);
-    rewind(driveFd);
-    /* fseek(driveFd,((BAT[startSector].realSector * 512) + ((batSize/512)+(BAT[block].realSector*4096))),0); */
-    fseek(driveFd,((startSector + BAT[block].realSector) * 512),0);
-    while (!feof(fileFd)) {
-      if (4096 == (counter - (blockCount * 4096))) {
-        block = findFreeBlock(block,(size/4096));
-        printf("Block: [%i][%s]\n",block,argv[x]);
-        rewind(driveFd);
-        /* fseek(driveFd,((startSector * 512) + ((batSize/512)+(BAT[block].realSector*4096))),0); */
-        fseek(driveFd,((startSector + BAT[block].realSector) * 512),0);
-        blockCount++;
-        }
-      fputc(fgetc(fileFd),driveFd);
-      counter++;
-      }
-    i = 0;
-    while((counter + i)%512) {
-      fputc(0x0,driveFd);
-      i++;
-      }
-    fclose(fileFd);
-    dirEntry[file].size = (counter - 1);
-    dirEntry[file].uid  = 0x0;
-    dirEntry[file].gid  = 0x0;
-    sprintf(dirEntry[file].fileName,"%s",argv[x]);
-    x += 2;
-    file++;
-    }
-  dirEntry[1].attributes   = typeDirectory;
-  dirEntry[1].permissions  = 0xEAA;
-  dirEntry[1].gid          = 0x0;
-  dirEntry[1].uid          = 0x0;
-  dirEntry[1].startCluster = 0x0;
-  dirEntry[1].size         = 0x4000;
-  sprintf(dirEntry[1].fileName,"fakeDir");    
-  rewind(driveFd);  
-  fseek(driveFd,(long)(((startSector) * 512) + batSize),0);
-  fwrite(dirEntry,0x4000,1,driveFd);
-  rewind(driveFd);
-  fseek(driveFd,((startSector) * 512),0);
-  if (fwrite(BAT,batSize,1,driveFd) >= 1) {
-/*
- *    printf("size         [%i]\n",partInfo->size);
- *    printf("startSector: [%i]\n",partInfo->startSector);
- *    printf("bat:         [%i]\n",partInfo->blockAllocationTable);
- *    printf("rootDir:     [%i]\n",partInfo->rootDirectory);
- *    printf("sizeof:      [%i]\n",sizeof(struct blockAllocationTableEntry));
- *    printf("size:        [%i]\n",(size/4096));
- */
-    printf("Formatted!\n");
-    }
-  else {
-    printf("Error Formatting!!\n");
-    }
-  fclose(driveFd);
-  return(0);
-  }
diff --git a/tools/fstab b/tools/fstab
deleted file mode 100644
index 4e2a6e4..0000000
--- a/tools/fstab
+++ /dev/null
@@ -1,3 +0,0 @@
-fd0a@devfs,sys,ubixfs,rw
-fd0b@devfs,tmp,ubixfs,rw
-ad0a@devfs,hd,ubixfs,rw
diff --git a/tools/makeuser.c b/tools/makeuser.c
deleted file mode 100644
index 2214c3d..0000000
--- a/tools/makeuser.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-struct passwd {
-  char username[32];
-  char passwd[32];
-  int  uid;
-  int  gid;
-  char shell[128];
-  char realname[256];
-  char path[256];
-  };
-
-int main(int argc,char **argv) {
-  int i = 0x0;
-  struct passwd *password = 0x0;
-  FILE *out;
-  password = (struct passwd *)malloc(4096);
-  out = fopen("./userdb","wbb");
-  sprintf(password[0].username,"root");
-  sprintf(password[0].passwd,"user");
-  sprintf(password[0].shell,"sys:/bin/shell");
-  sprintf(password[0].realname,"Root User");
-  sprintf(password[0].path,"root");
-  password[0].uid = 0;
-  password[0].gid = 0;
-  sprintf(password[1].username,"guest");
-  sprintf(password[1].passwd,"user");
-  sprintf(password[1].shell,"sys:/bin/shell");
-  sprintf(password[1].realname,"Guest User");
-  sprintf(password[1].path,"guest");
-  password[1].uid = 1;
-  password[1].gid = 1;
-  sprintf(password[2].username,"reddawg");
-  sprintf(password[2].passwd,"temp123");
-  sprintf(password[2].shell,"sys:/bin/shell");
-  sprintf(password[2].realname,"Christopher");
-  sprintf(password[2].path,"reddawg");
-  password[2].uid = 1000;
-  password[2].gid = 1000;
-  fwrite(password,4096,1,out);
-  fclose(out);
-  for (i=0;i<3;i++) {
-    printf("User:  [%s]\n",password[i].username);
-    printf("Pass:  [%s]\n",password[i].passwd);
-    printf("UID:   [%i]\n",password[i].uid);
-    printf("GID:   [%i]\n",password[i].gid);
-    printf("Shell: [%s]\n",password[i].shell);
-    printf("Name:  [%s]\n",password[i].realname);
-    printf("Path:  [%s]\n",password[i].path);
-    }
-  return(0);
-  }
diff --git a/tools/mbr b/tools/mbr
deleted file mode 100755
index 873c534..0000000
--- a/tools/mbr
+++ /dev/null
Binary files differ
diff --git a/tools/mbr.img b/tools/mbr.img
deleted file mode 100644
index 10daca2..0000000
--- a/tools/mbr.img
+++ /dev/null
Binary files differ
diff --git a/tools/motd b/tools/motd
deleted file mode 100644
index e09c887..0000000
--- a/tools/motd
+++ /dev/null
@@ -1,9 +0,0 @@
-Welcome to UbixOS
-
-This is an experimental kernel so it has the potential
-to crash if it does please send us some info so we can
-fix it or if you have access to the source fix it and
-commit the changes.
-
-All reports can be sent to colsen@ubixos.com
-
diff --git a/tools/stat b/tools/stat
deleted file mode 100755
index 976ac15..0000000
--- a/tools/stat
+++ /dev/null
Binary files differ
diff --git a/tools/test.c b/tools/test.c
deleted file mode 100644
index 1d320c9..0000000
--- a/tools/test.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-
-int main(int argc,char **argv) {
-  printf("A\n");
-  }
diff --git a/tools/ubixfs.h b/tools/ubixfs.h
deleted file mode 100644
index bda471c..0000000
--- a/tools/ubixfs.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/**************************************************************************************
- Copyright (c) 2002 The UbixOS Project
- All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of conditions, the following disclaimer and the list of authors.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions, the following disclaimer and the list of authors
-in the documentation and/or other materials provided with the distribution. Neither the name of the UbixOS Project 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 COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
-
- $Id: ubixfs.h 89 2016-01-12 00:20:40Z reddawg $
-
-**************************************************************************************/
-
-#ifndef _UBIXFS_H
-#define _UBIXFS_H
-
-typedef unsigned long  uLong;
-typedef unsigned short uShort;
-typedef unsigned char  uChar;
-typedef unsigned int   uInt;
-
-//Partition Information
-struct partitionInformation {
-  uLong size;                 //Size In Sectors
-  uLong startSector;          //Base Sector Of Partition
-  uLong blockAllocationTable; //Base Sector Of BAT
-  uLong rootDirectory;        //Base Sector Of Root Directory
-  uLong rootDirectorySize;    /* Size In Sectors Of Root Directory */
-  };
-
-//Block Allocation Table Entry
-struct blockAllocationTableEntry {
-  long attributes; //Block Attributes
-  long realSector; //Real Sector  
-  long nextBlock;  //Sector Of Next Block
-  long reserved;   //Reserved
-  };
-
-//UbixFS Directory Entry
-struct directoryEntry {
-  uLong  startCluster;  //Starting Cluster Of File
-  uLong  size;          //Size Of File
-  uLong  creationDate;  //Date Created
-  uLong  lastModified;  //Date Last Modified
-  uLong  uid;           //UID Of Owner
-  uLong  gid;           //GID Of Owner
-  uShort attributes;    //Files Attributes
-  uShort permissions;   //Files Permissions
-  char   fileName[256]; //File Name
-  };
-
-
-struct bootSect {
-  uChar jmp[4];
-  uChar id[6];
-  uShort version;
-  uShort tmp;
-  uShort fsStart;
-  uShort tmp2;
-  uLong krnl_start;
-  uInt BytesPerSector;
-  uInt SectersPerTrack;
-  uInt TotalHeads;
-  uLong TotalSectors;
-  uChar code[479];
-  };
-
-#endif
diff --git a/tools/user.c b/tools/user.c
deleted file mode 100644
index 3004172..0000000
--- a/tools/user.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-struct passwd {
-  char username[32];
-  char passwd[32];
-  int  uid;
-  int  gid;
-  char shell[128];
-  char realname[256];
-  char path[256];
-  };
-
-int main(int argc,char **argv) {
-  int i = 0x0;
-  struct passwd *password = 0x0;
-  FILE *in;
-  password = (struct passwd *)malloc(4096);
-  in = fopen("./userdb","rb");
-  fread(password,4096,1,in);
-  fclose(in);
-  for (i=0;i<3;i++) {
-    printf("User:  [%s]\n",password[i].username);
-    printf("Pass:  [%s]\n",password[i].passwd);
-    printf("UID:   [%i]\n",password[i].uid);
-    printf("GID:   [%i]\n",password[i].gid);
-    printf("Shell: [%s]\n",password[i].shell);
-    printf("Name:  [%s]\n",password[i].realname);
-    printf("Path:  [%s]\n",password[i].path);
-    }
-  return(0);
-  }
diff --git a/tools/userdb b/tools/userdb
deleted file mode 100644
index ed464e7..0000000
--- a/tools/userdb
+++ /dev/null
Binary files differ